diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md
index 0f15bf02be..08522c6d15 100644
--- a/.github/CONTRIBUTING.md
+++ b/.github/CONTRIBUTING.md
@@ -73,7 +73,7 @@ Here is a checklist of steps you need to follow to submit a single file or user
 * If you want your contribution to be added as a user-contributed feature, and it is a single file (actually a `<name>.cpp` and `<name>.h` file) it can be rapidly added to the USER-MISC directory. Include the one-line entry to add to the USER-MISC/README file in that directory, along with the 2 source files. You can do this multiple times if you wish to contribute several individual features.
 * If you want your contribution to be added as a user-contribution and it is several related features, it is probably best to make it a user package directory with a name like USER-FOO. In addition to your new files, the directory should contain a README text file. The README should contain your name and contact information and a brief description of what your new package does. If your files depend on other LAMMPS style files also being installed (e.g. because your file is a derived class from the other LAMMPS class), then an Install.sh file is also needed to check for those dependencies. See other README and Install.sh files in other USER directories as examples. Send us a tarball of this USER-FOO directory.
 * Your new source files need to have the LAMMPS copyright, GPL notice, and your name and email address at the top, like other user-contributed LAMMPS source files. They need to create a class that is inside the LAMMPS namespace. If the file is for one of the USER packages, including USER-MISC, then we are not as picky about the coding style (see above). I.e. the files do not need to be in the same stylistic format and syntax as other LAMMPS files, though that would be nice for developers as well as users who try to read your code.
-* You **must** also create or extend a documentation file for each new command or style you are adding to LAMMPS. For simplicity and convenience, the documentation of groups of closely related commands or styles may be combined into a single file. This will be one file for a single-file feature. For a package, it might be several files. These are files in the [reStructuredText](https://docutils.sourceforge.io/rst.html) markup language, that are then converted to HTML and PDF. The tools for this conversion are included in the source distribution, and the translation can be as simple as doing "make html pdf" in the doc folder. Thus the documentation source files must be in the same format and style as other `<name>.rst` files in the lammps/doc/src directory for similar commands and styles; use one or more of them as a starting point. An introduction to reStructuredText can be found at [https://docutils.sourceforge.io/docs/user/rst/quickstart.html](https://docutils.sourceforge.io/docs/user/rst/quickstart.html). As appropriate, the text files can include mathematical expressions in MathJAX markup or links to equations (see doc/Eqs/*.tex for examples, we auto-create the associated JPG files), or figures (see doc/JPG for examples), or even additional PDF files with further details (see doc/PDF for examples). The doc page should also include literature citations as appropriate; see the bottom of doc/fix_nh.rst for examples and the earlier part of the same file for how to format the cite itself. The "Restrictions" section of the doc page should indicate that your command is only available if LAMMPS is built with the appropriate USER-MISC or USER-FOO package. See other user package doc files for examples of how to do this. The prerequisite for building the HTML format files are Python 3.x and virtualenv. Please run at least `make html` and `make spelling` and carefully inspect and proofread the resulting HTML format doc page as well as the output produced to the screen. Make sure that all spelling errors are fixed or the necessary false positives are added to the `doc/utils/sphinx-config/false_positives.txt` file.  For new styles, those usually also need to be added to lists on the respective overview pages. This can be checked for also with `make style_check`.
+* You **must** also create or extend a documentation file for each new command or style you are adding to LAMMPS. For simplicity and convenience, the documentation of groups of closely related commands or styles may be combined into a single file. This will be one file for a single-file feature. For a package, it might be several files. These are files in the [reStructuredText](https://docutils.sourceforge.io/rst.html) markup language, that are then converted to HTML and PDF. The tools for this conversion are included in the source distribution, and the translation can be as simple as doing "make html pdf" in the doc folder. Thus the documentation source files must be in the same format and style as other `<name>.rst` files in the lammps/doc/src directory for similar commands and styles; use one or more of them as a starting point. An introduction to reStructuredText can be found at [https://docutils.sourceforge.io/docs/user/rst/quickstart.html](https://docutils.sourceforge.io/docs/user/rst/quickstart.html). The text files can include mathematical expressions and symbol in ".. math::" sections or ":math:" expressions or figures (see doc/JPG for examples), or even additional PDF files with further details (see doc/PDF for examples). The doc page should also include literature citations as appropriate; see the bottom of doc/fix_nh.rst for examples and the earlier part of the same file for how to format the cite itself. The "Restrictions" section of the doc page should indicate that your command is only available if LAMMPS is built with the appropriate USER-MISC or USER-FOO package. See other user package doc files for examples of how to do this. The prerequisite for building the HTML format files are Python 3.x and virtualenv. Please run at least `make html`, `make pdf` and `make spelling` and carefully inspect and proofread the resulting HTML format doc page as well as the output produced to the screen. Make sure that all spelling errors are fixed or the necessary false positives are added to the `doc/utils/sphinx-config/false_positives.txt` file.  For new styles, those usually also need to be added to lists on the respective overview pages. This can be checked for also with `make style_check`.
 * For a new package (or even a single command) you should include one or more example scripts demonstrating its use. These should run in no more than a couple minutes, even on a single processor, and not require large data files as input. See directories under examples/USER for examples of input scripts other users provided for their packages. These example inputs are also required for validating memory accesses and testing for memory leaks with valgrind
 * If there is a paper of yours describing your feature (either the algorithm/science behind the feature itself, or its initial usage, or its implementation in LAMMPS), you can add the citation to the *.cpp source file. See src/USER-EFF/atom_vec_electron.cpp for an example. A LaTeX citation is stored in a variable at the top of the file and a single line of code that references the variable is added to the constructor of the class. Whenever a user invokes your feature from their input script, this will cause LAMMPS to output the citation to a log.cite file and prompt the user to examine the file. Note that you should only use this for a paper you or your group authored. E.g. adding a cite in the code for a paper by Nose and Hoover if you write a fix that implements their integrator is not the intended usage. That kind of citation should just be in the doc page you provide.
 
diff --git a/.gitignore b/.gitignore
index f9dda49da6..52b8212b13 100644
--- a/.gitignore
+++ b/.gitignore
@@ -26,6 +26,7 @@ vgcore.*
 .vagrant
 \#*#
 .#*
+.vscode
 
 .DS_Store
 .DS_Store?
diff --git a/cmake/2826.patch b/cmake/2826.patch
new file mode 100644
index 0000000000..397d1f772a
--- /dev/null
+++ b/cmake/2826.patch
@@ -0,0 +1,13 @@
+diff --git a/lib/kokkos/containers/src/Kokkos_ScatterView.hpp b/lib/kokkos/containers/src/Kokkos_ScatterView.hpp
+index a8c05e3..1d83aed 100644
+--- a/lib/kokkos/containers/src/Kokkos_ScatterView.hpp
++++ b/lib/kokkos/containers/src/Kokkos_ScatterView.hpp
+@@ -681,7 +681,7 @@ class ScatterView<DataType
+                    ,contribution>
+ {
+ public:
+-  typedef Kokkos::View<DataType, Layout, ExecSpace> original_view_type;
++  typedef Kokkos::View<DataType, Layout, Kokkos::Device<ExecSpace, Kokkos::Cuda::memory_space> > original_view_type;
+   typedef typename original_view_type::value_type original_value_type;
+   typedef typename original_view_type::reference_type original_reference_type;
+   friend class ScatterAccess<DataType, Op, ExecSpace, Layout, ScatterNonDuplicated, contribution, ScatterNonAtomic>;
diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt
index 0d8cc61a7b..36bed2d649 100644
--- a/cmake/CMakeLists.txt
+++ b/cmake/CMakeLists.txt
@@ -2,7 +2,7 @@
 # CMake build system
 # This file is part of LAMMPS
 # Created by Christoph Junghans and Richard Berger
-cmake_minimum_required(VERSION 2.8.12)
+cmake_minimum_required(VERSION 3.10)
 
 project(lammps CXX)
 set(SOVERSION 0)
@@ -36,7 +36,6 @@ get_lammps_version(${LAMMPS_SOURCE_DIR}/version.h LAMMPS_VERSION)
 include(PreventInSourceBuilds)
 
 if(NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CXX_FLAGS)
-  #release comes with -O3 by default
   set(CMAKE_BUILD_TYPE RelWithDebInfo CACHE STRING "Choose the type of build, options are: None Debug Release RelWithDebInfo MinSizeRel." FORCE)
 endif(NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CXX_FLAGS)
 string(TOUPPER "${CMAKE_BUILD_TYPE}" BTYPE)
@@ -52,39 +51,35 @@ check_for_autogen_files(${LAMMPS_SOURCE_DIR})
 include(CheckCCompilerFlag)
 include(CheckIncludeFileCXX)
 
+# set required compiler flags and compiler/CPU arch specific optimizations
 if(${CMAKE_CXX_COMPILER_ID} STREQUAL "Intel")
-  set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -restrict -std=c++11")
+  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -restrict")
+  if(CMAKE_CXX_COMPILER_VERSION VERSION_EQUAL 17.3 OR CMAKE_CXX_COMPILER_VERSION VERSION_EQUAL 17.4)
+    set(CMAKE_TUNE_DEFAULT "-xCOMMON-AVX512")
+  else()
+    set(CMAKE_TUNE_DEFAULT "-xHost")
+  endif()
 endif()
 
-option(DISABLE_CXX11_REQUIREMENT "Disable check that requires C++11 for compiling LAMMPS" OFF)
-if(DISABLE_CXX11_REQUIREMENT)
-  add_definitions(-DLAMMPS_CXX98)
-# else()
-#  set(CMAKE_CXX_STANDARD 11)
+if(${CMAKE_CXX_COMPILER_ID} STREQUAL "GNU")
+  set(CMAKE_TUNE_DEFAULT "-ffast-math -march=native")
 endif()
 
-# GNU compiler features
+if(${CMAKE_CXX_COMPILER_ID} STREQUAL "Clang")
+  set(CMAKE_TUNE_DEFAULT "-ffast-math -march=native")
+endif()
+
+# we require C++11
+set(CMAKE_CXX_STANDARD 11)
+set(CMAKE_CXX_STANDARD_REQUIRED ON)
+
+# GNU compiler specific features for testing
 if (${CMAKE_CXX_COMPILER_ID} STREQUAL "GNU")
-  option(ENABLE_COVERAGE "Enable code coverage" OFF)
+  option(ENABLE_COVERAGE "Enable collecting code coverage data" OFF)
   mark_as_advanced(ENABLE_COVERAGE)
   if(ENABLE_COVERAGE)
     set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} --coverage")
   endif()
-  option(ENABLE_SANITIZE_ADDRESS "Enable address sanitizer" OFF)
-  mark_as_advanced(ENABLE_SANITIZE_ADDRESS)
-  if(ENABLE_SANITIZE_ADDRESS)
-    set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fsanitize=address")
-  endif()
-  option(ENABLE_SANITIZE_UNDEFINED "Enable undefined behavior sanitizer" OFF)
-  mark_as_advanced(ENABLE_SANITIZE_UNDEFINED)
-  if(ENABLE_SANITIZE_UNDEFINED)
-    set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fsanitize=undefined")
-  endif()
-  option(ENABLE_SANITIZE_THREAD "Enable thread sanitizer" OFF)
-  mark_as_advanced(ENABLE_SANITIZE_THREAD)
-  if(ENABLE_SANITIZE_THREAD)
-    set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fsanitize=thread")
-  endif()
 endif()
 
 ########################################################################
@@ -129,12 +124,12 @@ set(LAMMPS_API_DEFINES)
 set(DEFAULT_PACKAGES ASPHERE BODY CLASS2 COLLOID COMPRESS CORESHELL DIPOLE
   GRANULAR KSPACE LATTE MANYBODY MC MESSAGE MISC MOLECULE PERI POEMS QEQ
   REPLICA RIGID SHOCK SPIN SNAP SRD KIM PYTHON MSCG MPIIO VORONOI
-  USER-ATC USER-AWPMD USER-BOCS USER-CGDNA USER-MESO USER-CGSDK USER-COLVARS
+  USER-ATC USER-AWPMD USER-BOCS USER-CGDNA USER-MESODPD USER-CGSDK USER-COLVARS
   USER-DIFFRACTION USER-DPD USER-DRUDE USER-EFF USER-FEP USER-H5MD USER-LB
   USER-MANIFOLD USER-MEAMC USER-MGPT USER-MISC USER-MOFFF USER-MOLFILE
-  USER-NETCDF USER-PHONON USER-PLUMED USER-PTM USER-QTB USER-REAXC
-  USER-SCAFACOS USER-SDPD USER-SMD USER-SMTBQ USER-SPH USER-TALLY USER-UEF
-  USER-VTK USER-QUIP USER-QMMM USER-YAFF USER-ADIOS)
+  USER-NETCDF USER-PHONON USER-PLUMED USER-PTM USER-QTB USER-REACTION
+  USER-REAXC USER-SCAFACOS USER-SDPD USER-SMD USER-SMTBQ USER-SPH USER-TALLY
+  USER-UEF USER-VTK USER-QUIP USER-QMMM USER-YAFF USER-ADIOS)
 set(ACCEL_PACKAGES USER-OMP KOKKOS OPT USER-INTEL GPU)
 foreach(PKG ${DEFAULT_PACKAGES} ${ACCEL_PACKAGES})
   option(PKG_${PKG} "Build ${PKG} Package" OFF)
@@ -172,17 +167,25 @@ if(PKG_USER-ADIOS)
   list(APPEND LAMMPS_LINK_LIBS adios2::adios2)
 endif()
 
-# do MPI detection after language activation, if MPI for these language is required
+# do MPI detection after language activation,
+# in case MPI for these languages is required
 set(MPI_CXX_SKIP_MPICXX TRUE)
 find_package(MPI QUIET)
 option(BUILD_MPI "Build MPI version" ${MPI_FOUND})
+
 if(BUILD_MPI)
-  find_package(MPI REQUIRED)
-  include_directories(${MPI_CXX_INCLUDE_PATH})
-  list(APPEND LAMMPS_LINK_LIBS ${MPI_CXX_LIBRARIES})
-  option(LAMMPS_LONGLONG_TO_LONG "Workaround if your system or MPI version does not recognize 'long long' data types" OFF)
-  if(LAMMPS_LONGLONG_TO_LONG)
-    add_definitions(-DLAMMPS_LONGLONG_TO_LONG)
+  # We use a non-standard procedure to compile with MPI on windows
+  if (CMAKE_SYSTEM_NAME STREQUAL Windows)
+    include(MPI4WIN)
+  else()
+    find_package(MPI REQUIRED)
+    include_directories(${MPI_CXX_INCLUDE_PATH})
+    add_definitions(-DMPICH_SKIP_MPICXX -DOMPI_SKIP_MPICXX=1)
+    list(APPEND LAMMPS_LINK_LIBS ${MPI_CXX_LIBRARIES})
+    option(LAMMPS_LONGLONG_TO_LONG "Workaround if your system or MPI version does not recognize 'long long' data types" OFF)
+    if(LAMMPS_LONGLONG_TO_LONG)
+      add_definitions(-DLAMMPS_LONGLONG_TO_LONG)
+    endif()
   endif()
 else()
   enable_language(C)
@@ -224,7 +227,15 @@ pkg_depends(USER-LB MPI)
 pkg_depends(USER-PHONON KSPACE)
 pkg_depends(USER-SCAFACOS MPI)
 
+# detect if we may enable OpenMP support by default
+set(BUILD_OMP_DEFAULT OFF)
 find_package(OpenMP QUIET)
+if(OpenMP_FOUND)
+  check_include_file_cxx(omp.h HAVE_OMP_H_INCLUDE)
+  if(HAVE_OMP_H_INCLUDE)
+    set(BUILD_OMP_DEFAULT ON)
+  endif()
+endif()
 
 # TODO: this is a temporary workaround until a better solution is found. AK 2019-05-30
 # GNU GCC 9.x uses settings incompatible with our use of 'default(none)' in OpenMP pragmas
@@ -234,14 +245,14 @@ find_package(OpenMP QUIET)
 if ((CMAKE_CXX_COMPILER_ID STREQUAL "GNU") AND (CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 8.99.9))
   option(BUILD_OMP "Build with OpenMP support" OFF)
 else()
-  option(BUILD_OMP "Build with OpenMP support" ${OpenMP_FOUND})
+  option(BUILD_OMP "Build with OpenMP support" ${BUILD_OMP_DEFAULT})
 endif()
 
 if(BUILD_OMP)
   find_package(OpenMP REQUIRED)
   check_include_file_cxx(omp.h HAVE_OMP_H_INCLUDE)
   if(NOT HAVE_OMP_H_INCLUDE)
-    message(FATAL_ERROR "Cannot find required 'omp.h' header file")
+    message(FATAL_ERROR "Cannot find the 'omp.h' header file required for full OpenMP support")
   endif()
   set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${OpenMP_C_FLAGS}")
   set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${OpenMP_CXX_FLAGS}")
@@ -252,14 +263,15 @@ if(PKG_MSCG OR PKG_USER-ATC OR PKG_USER-AWPMD OR PKG_USER-QUIP OR PKG_LATTE)
   find_package(LAPACK)
   find_package(BLAS)
   if(NOT LAPACK_FOUND OR NOT BLAS_FOUND)
-    if(CMAKE_GENERATOR STREQUAL "Ninja")
-      status(FATAL_ERROR "Cannot build internal linear algebra library with Ninja build tool due to lack for Fortran support")
+    include(CheckGeneratorSupport)
+    if(NOT CMAKE_GENERATOR_SUPPORT_FORTRAN)
+      status(FATAL_ERROR "Cannot build internal linear algebra library as CMake build tool lacks Fortran support")
     endif()
     enable_language(Fortran)
     file(GLOB LAPACK_SOURCES ${LAMMPS_LIB_SOURCE_DIR}/linalg/[^.]*.[fF])
     add_library(linalg STATIC ${LAPACK_SOURCES})
-    set(BLAS_LIBRARIES linalg)
-    set(LAPACK_LIBRARIES linalg)
+    set(BLAS_LIBRARIES "$<TARGET_FILE:linalg>")
+    set(LAPACK_LIBRARIES "$<TARGET_FILE:linalg>")
   else()
     list(APPEND LAPACK_LIBRARIES ${BLAS_LIBRARIES})
   endif()
@@ -338,11 +350,11 @@ include(Packages/MESSAGE)
 include(Packages/MSCG)
 include(Packages/COMPRESS)
 
-# the windows version of LAMMPS requires a couple extra libraries
-if(${CMAKE_SYSTEM_NAME} STREQUAL "Windows")
-  list(APPEND LAMMPS_LINK_LIBS -lwsock32 -lpsapi)
+set(CMAKE_TUNE_FLAGS "${CMAKE_TUNE_DEFAULT}" CACHE STRING "Compiler specific optimization or instrumentation")
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CMAKE_TUNE_FLAGS}")
+if(CMAKE_Fortran_COMPILER)
+  set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} ${CMAKE_TUNE_FLAGS}")
 endif()
-
 ########################################################################
 # Basic system tests (standard libraries, headers, functions, types)   #
 ########################################################################
@@ -356,9 +368,6 @@ endforeach(HEADER)
 set(MATH_LIBRARIES "m" CACHE STRING "math library")
 mark_as_advanced( MATH_LIBRARIES )
 include(CheckLibraryExists)
-if (CMAKE_VERSION VERSION_LESS "3.4")
-  enable_language(C) # check_library_exists isn't supported without a C compiler before v3.4
-endif()
 # RB: disabled this check because it breaks with KOKKOS CUDA enabled
 #foreach(FUNC sin cos)
 #  check_library_exists(${MATH_LIBRARIES} ${FUNC} "" FOUND_${FUNC}_${MATH_LIBRARIES})
@@ -420,7 +429,7 @@ endforeach()
 ##############################################
 # add lib sources of (simple) enabled packages
 ############################################
-foreach(SIMPLE_LIB POEMS USER-ATC USER-AWPMD USER-H5MD USER-QMMM)
+foreach(SIMPLE_LIB POEMS USER-ATC USER-AWPMD USER-H5MD)
   if(PKG_${SIMPLE_LIB})
     string(REGEX REPLACE "^USER-" "" PKG_LIB "${SIMPLE_LIB}")
     string(TOLOWER "${PKG_LIB}" PKG_LIB)
@@ -429,6 +438,9 @@ foreach(SIMPLE_LIB POEMS USER-ATC USER-AWPMD USER-H5MD USER-QMMM)
       ${LAMMPS_LIB_SOURCE_DIR}/${PKG_LIB}/[^.]*.c
       ${LAMMPS_LIB_SOURCE_DIR}/${PKG_LIB}/[^.]*.cpp)
     add_library(${PKG_LIB} STATIC ${${PKG_LIB}_SOURCES})
+    if(LAMMPS_USE_MPI4WIN)
+      add_dependencies(${PKG_LIB} mpi4win_build)
+    endif()
     list(APPEND LAMMPS_LINK_LIBS ${PKG_LIB})
     if(PKG_LIB STREQUAL awpmd)
       target_include_directories(awpmd PUBLIC ${LAMMPS_LIB_SOURCE_DIR}/awpmd/systems/interact ${LAMMPS_LIB_SOURCE_DIR}/awpmd/ivutils/include)
@@ -466,6 +478,18 @@ include(Packages/OPT)
 include(Packages/USER-INTEL)
 include(Packages/GPU)
 
+######################################################################
+# the windows version of LAMMPS requires a couple extra libraries
+# and the MPI library - if use - has to be linked right before those
+# and after everything else that is compiled locally
+######################################################################
+if(${CMAKE_SYSTEM_NAME} STREQUAL "Windows")
+  if(LAMMPS_USE_MPI4WIN)
+    list(APPEND LAMMPS_LINK_LIBS ${MPI4WIN_LIBRARIES})
+  endif()
+  list(APPEND LAMMPS_LINK_LIBS -lwsock32 -lpsapi)
+endif()
+
 ######################################################
 # Generate style headers based on global list of
 # styles registered during package selection
@@ -587,14 +611,14 @@ if(BUILD_TOOLS)
   add_executable(binary2txt ${LAMMPS_TOOLS_DIR}/binary2txt.cpp)
   install(TARGETS binary2txt DESTINATION ${CMAKE_INSTALL_BINDIR})
 
-  # ninja-build currently does not support fortran. thus we skip building this tool
-  if(CMAKE_GENERATOR STREQUAL "Ninja")
-    message(STATUS "Skipping building 'chain.x' with Ninja build tool due to lack of Fortran support")
-  else()
+  include(CheckGeneratorSupport)
+  if(CMAKE_GENERATOR_SUPPORT_FORTRAN)
     enable_language(Fortran)
     add_executable(chain.x ${LAMMPS_TOOLS_DIR}/chain.f)
     target_link_libraries(chain.x ${CMAKE_Fortran_IMPLICIT_LINK_LIBRARIES})
     install(TARGETS chain.x DESTINATION ${CMAKE_INSTALL_BINDIR})
+  else()
+    message(WARNING "CMake build doesn't support fortran, skipping building 'chain.x'")
   endif()
 
   enable_language(C)
@@ -682,10 +706,11 @@ endforeach()
 
 get_directory_property(CPPFLAGS DIRECTORY ${CMAKE_SOURCE_DIR} COMPILE_DEFINITIONS)
 include(FeatureSummary)
-feature_summary(DESCRIPTION "The following packages have been found:" WHAT PACKAGES_FOUND)
+feature_summary(DESCRIPTION "The following tools and libraries have been found and configured:" WHAT PACKAGES_FOUND)
 message(STATUS "<<< Build configuration >>>
    Build type       ${CMAKE_BUILD_TYPE}
    Install path     ${CMAKE_INSTALL_PREFIX}
+   Generator        ${CMAKE_GENERATOR} using ${CMAKE_MAKE_PROGRAM}
    Compilers and Flags:
    C++ Compiler     ${CMAKE_CXX_COMPILER}
        Type         ${CMAKE_CXX_COMPILER_ID}
@@ -702,7 +727,7 @@ if (${_index} GREATER -1)
 endif()
 list (FIND LANGUAGES "C" _index)
 if (${_index} GREATER -1)
-  message(STATUS "C Compiler ${CMAKE_C_COMPILER}
+  message(STATUS "C compiler ${CMAKE_C_COMPILER}
      Type     ${CMAKE_C_COMPILER_ID}
      Version  ${CMAKE_C_COMPILER_VERSION}
      C Flags  ${CMAKE_C_FLAGS} ${CMAKE_C_FLAGS_${BTYPE}}")
@@ -712,22 +737,22 @@ if(CMAKE_EXE_LINKER_FLAGS)
    Executable      ${CMAKE_EXE_LINKER_FLAGS}")
 endif()
 if(BUILD_SHARED_LIBS)
-  message(STATUS "Shared libraries  ${CMAKE_SHARED_LINKER_FLAGS}")
+  message(STATUS "Shared library flags:  ${CMAKE_SHARED_LINKER_FLAGS}")
 else()
-  message(STATUS "Static libraries  ${CMAKE_STATIC_LINKER_FLAGS}")
+  message(STATUS "Static library flags:  ${CMAKE_STATIC_LINKER_FLAGS}")
 endif()
 message(STATUS "Link libraries: ${LAMMPS_LINK_LIBS}")
 if(BUILD_MPI)
-  message(STATUS "Using mpi with headers in ${MPI_CXX_INCLUDE_PATH} and ${MPI_CXX_LIBRARIES}")
+  message(STATUS "Using MPI with headers in ${MPI_CXX_INCLUDE_PATH} and these libraries: ${MPI_CXX_LIBRARIES};${MPI_Fortran_LIBRARIES}")
 endif()
 if(PKG_GPU)
-  message(STATUS "GPU Api: ${GPU_API}")
+  message(STATUS "GPU API: ${GPU_API}")
   if(GPU_API STREQUAL "CUDA")
-    message(STATUS "GPU Arch: ${GPU_ARCH}")
+    message(STATUS "GPU architecture: ${GPU_ARCH}")
   elseif(GPU_API STREQUAL "OPENCL")
-    message(STATUS "OCL Tune: ${OCL_TUNE}")
+    message(STATUS "OpenCL parameter tuning: ${OCL_TUNE}")
   endif()
-  message(STATUS "GPU Precision: ${GPU_PREC}")
+  message(STATUS "GPU precision: ${GPU_PREC}")
 endif()
 if(PKG_KOKKOS)
   message(STATUS "Kokkos Arch: ${KOKKOS_ARCH}")
@@ -739,7 +764,7 @@ if(PKG_KSPACE)
   else()
     message(STATUS "Using double precision FFTs")
   endif()
-  if(FFT_FFTW_THREADS)
+  if(FFT_FFTW_THREADS OR FFT_MKL_THREADS)
     message(STATUS "Using threaded FFTs")
   else()
     message(STATUS "Using non-threaded FFTs")
diff --git a/cmake/Modules/CheckGeneratorSupport.cmake b/cmake/Modules/CheckGeneratorSupport.cmake
new file mode 100644
index 0000000000..62d33036a5
--- /dev/null
+++ b/cmake/Modules/CheckGeneratorSupport.cmake
@@ -0,0 +1,21 @@
+# ninja-build<1.10 does not support fortran.
+if(CMAKE_GENERATOR STREQUAL "Ninja")
+  set(CMAKE_GENERATOR_SUPPORT_FORTRAN FALSE)
+  execute_process(COMMAND "${CMAKE_MAKE_PROGRAM}" --version
+    OUTPUT_VARIABLE NINJA_VERSION
+    OUTPUT_STRIP_TRAILING_WHITESPACE
+    RESULT_VARIABLE _Ninja_version_result
+  )
+  if(_Ninja_version_result)
+    message(WARNING "Unable to determine ninja version: ${_Ninja_version_result}, assuming fortran isn't supported")
+  elseif(NINJA_VERSION VERSION_LESS "1.10")
+    message(WARNING "Ninja build tool too old, to compile Fortran code, please install ninja-1.10 or newer")
+  else()
+    set(CMAKE_GENERATOR_SUPPORT_FORTRAN TRUE)
+  endif()
+else()
+  set(CMAKE_GENERATOR_SUPPORT_FORTRAN TRUE)
+  if(NOT CMAKE_GENERATOR STREQUAL "Unix Makefiles")
+    message(WARNING "Assuming fortran is supported for ${CMAKE_GENERATOR}")
+  endif()
+endif()
diff --git a/cmake/Modules/FindQE.cmake b/cmake/Modules/FindQE.cmake
deleted file mode 100644
index 4484bd4db2..0000000000
--- a/cmake/Modules/FindQE.cmake
+++ /dev/null
@@ -1,29 +0,0 @@
-# - Find quantum-espresso
-# Find the native QE headers and libraries.
-#
-#  QE_INCLUDE_DIRS - where to find quantum-espresso.h, etc.
-#  QE_LIBRARIES    - List of libraries when using quantum-espresso.
-#  QE_FOUND        - True if quantum-espresso found.
-#
-
-find_path(QE_INCLUDE_DIR libqecouple.h PATH_SUFFIXES COUPLE/include)
-
-find_library(QECOUPLE_LIBRARY NAMES qecouple)
-find_library(PW_LIBRARY NAMES pw)
-find_library(QEMOD_LIBRARY NAMES qemod)
-find_library(QEFFT_LIBRARY NAMES qefft)
-find_library(QELA_LIBRARY NAMES qela)
-find_library(CLIB_LIBRARY NAMES clib)
-find_library(IOTK_LIBRARY NAMES iotk)
-
-
-set(QE_LIBRARIES ${QECOUPLE_LIBRARY} ${PW_LIBRARY} ${QEMOD_LIBRARY} ${QEFFT_LIBRARY} ${QELA_LIBRARY} ${CLIB_LIBRARY} ${IOTK_LIBRARY})
-set(QE_INCLUDE_DIRS ${QE_INCLUDE_DIR})
-
-include(FindPackageHandleStandardArgs)
-# handle the QUIETLY and REQUIRED arguments and set QE_FOUND to TRUE
-# if all listed variables are TRUE
-
-find_package_handle_standard_args(QE DEFAULT_MSG QECOUPLE_LIBRARY PW_LIBRARY QEMOD_LIBRARY QEFFT_LIBRARY QELA_LIBRARY CLIB_LIBRARY IOTK_LIBRARY QE_INCLUDE_DIR)
-
-mark_as_advanced(QE_INCLUDE_DIR QECOUPLE_LIBRARY PW_LIBRARY QEMOD_LIBRARY QEFFT_LIBRARY QELA_LIBRARY CLIB_LIBRARY IOTK_LIBRARY)
diff --git a/cmake/Modules/MPI4WIN.cmake b/cmake/Modules/MPI4WIN.cmake
new file mode 100644
index 0000000000..1f3195041a
--- /dev/null
+++ b/cmake/Modules/MPI4WIN.cmake
@@ -0,0 +1,23 @@
+# Download and configure custom MPICH files for Windows
+message(STATUS "Downloading and configuring MPICH-1.4.1 for Windows")
+include(ExternalProject)
+if (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
+  ExternalProject_Add(mpi4win_build
+    URL https://download.lammps.org/thirdparty/mpich2-win64-devel.tar.gz
+    URL_MD5 4939fdb59d13182fd5dd65211e469f14
+    CONFIGURE_COMMAND "" BUILD_COMMAND "" INSTALL_COMMAND ""
+    BUILD_BYPRODUCTS <SOURCE_DIR>/lib/libmpi.a)
+else()
+  ExternalProject_Add(mpi4win_build
+    URL https://download.lammps.org/thirdparty/mpich2-win32-devel.tar.gz
+    URL_MD5 a61d153500dce44e21b755ee7257e031
+    CONFIGURE_COMMAND "" BUILD_COMMAND "" INSTALL_COMMAND ""
+    BUILD_BYPRODUCTS <SOURCE_DIR>/lib/libmpi.a)
+endif()
+
+ExternalProject_get_property(mpi4win_build SOURCE_DIR)
+add_definitions(-DMPICH_SKIP_MPICXX)
+include_directories("${SOURCE_DIR}/include")
+set(MPI4WIN_LIBRARIES "${SOURCE_DIR}/lib/libmpi.a")
+list(APPEND LAMMPS_DEPS mpi4win_build)
+set(LAMMPS_USE_MPI4WIN ON)
diff --git a/cmake/Modules/Packages/GPU.cmake b/cmake/Modules/Packages/GPU.cmake
index dab9d51a3f..abbcb1f495 100644
--- a/cmake/Modules/Packages/GPU.cmake
+++ b/cmake/Modules/Packages/GPU.cmake
@@ -1,7 +1,4 @@
 if(PKG_GPU)
-    if (CMAKE_VERSION VERSION_LESS "3.1")
-      message(FATAL_ERROR "For the GPU package you need at least cmake-3.1")
-    endif()
     set(GPU_SOURCES_DIR ${LAMMPS_SOURCE_DIR}/GPU)
     set(GPU_SOURCES ${GPU_SOURCES_DIR}/gpu_extra.h
                     ${GPU_SOURCES_DIR}/fix_gpu.h
@@ -111,6 +108,9 @@ if(PKG_GPU)
       endif()
 
       list(APPEND LAMMPS_LINK_LIBS gpu)
+      if(LAMMPS_USE_MPI4WIN)
+        add_dependencies(gpu mpi4win_build)
+      endif()
 
       add_executable(nvc_get_devices ${LAMMPS_LIB_SOURCE_DIR}/gpu/geryon/ucl_get_devices.cpp)
       target_compile_definitions(nvc_get_devices PRIVATE -DUCL_CUDADR)
@@ -172,6 +172,9 @@ if(PKG_GPU)
       target_compile_definitions(gpu PRIVATE -DUSE_OPENCL)
 
       list(APPEND LAMMPS_LINK_LIBS gpu)
+      if(LAMMPS_USE_MPI4WIN)
+        add_dependencies(gpu mpi4win_build)
+      endif()
 
       add_executable(ocl_get_devices ${LAMMPS_LIB_SOURCE_DIR}/gpu/geryon/ucl_get_devices.cpp)
       target_compile_definitions(ocl_get_devices PRIVATE -DUCL_OPENCL)
diff --git a/cmake/Modules/Packages/KIM.cmake b/cmake/Modules/Packages/KIM.cmake
index a75e248097..617068ce13 100644
--- a/cmake/Modules/Packages/KIM.cmake
+++ b/cmake/Modules/Packages/KIM.cmake
@@ -34,30 +34,30 @@ if(PKG_KIM)
   endif()
   option(DOWNLOAD_KIM "Download KIM-API from OpenKIM instead of using an already installed one" ${DOWNLOAD_KIM_DEFAULT})
   if(DOWNLOAD_KIM)
-    if(CMAKE_GENERATOR STREQUAL "Ninja")
-      message(FATAL_ERROR "Cannot build downloaded KIM-API library with Ninja build tool")
-    endif()
     message(STATUS "KIM-API download requested - we will build our own")
-    include(CheckLanguage)
+    # Workaround for cross compilation with MinGW where ${CMAKE_INSTALL_LIBDIR}
+    # is a full path, so we need to remove the prefix
+    string(REPLACE ${CMAKE_INSTALL_PREFIX} "" _KIM_LIBDIR ${CMAKE_INSTALL_LIBDIR})
     include(ExternalProject)
     enable_language(C)
-    check_language(Fortran)
-    if(NOT CMAKE_Fortran_COMPILER)
-      message(FATAL_ERROR "Compiling the KIM-API library requires a Fortran compiler")
-    endif()
+    enable_language(Fortran)
     ExternalProject_Add(kim_build
       URL https://s3.openkim.org/kim-api/kim-api-2.1.3.txz
       URL_MD5 6ee829a1bbba5f8b9874c88c4c4ebff8
       BINARY_DIR build
-      CMAKE_ARGS -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER}
+      CMAKE_ARGS ${CMAKE_REQUEST_PIC}
+                 -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER}
                  -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER}
                  -DCMAKE_Fortran_COMPILER=${CMAKE_Fortran_COMPILER}
                  -DCMAKE_INSTALL_PREFIX=<INSTALL_DIR>
                  -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
+                 -DCMAKE_MAKE_PROGRAM=${CMAKE_MAKE_PROGRAM}
+                 -DCMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN_FILE}
+                 BUILD_BYPRODUCTS <INSTALL_DIR>/${_KIM_LIBDIR}/libkim-api${CMAKE_SHARED_LIBRARY_SUFFIX} 
       )
     ExternalProject_get_property(kim_build INSTALL_DIR)
     set(KIM-API_INCLUDE_DIRS ${INSTALL_DIR}/include/kim-api)
-    set(KIM-API_LDFLAGS ${INSTALL_DIR}/${CMAKE_INSTALL_LIBDIR}/libkim-api${CMAKE_SHARED_LIBRARY_SUFFIX})
+    set(KIM-API_LDFLAGS ${INSTALL_DIR}/${_KIM_LIBDIR}/libkim-api${CMAKE_SHARED_LIBRARY_SUFFIX})
     list(APPEND LAMMPS_DEPS kim_build)
   else()
     find_package(KIM-API ${KIM-API_MIN_VERSION} REQUIRED)
diff --git a/cmake/Modules/Packages/KOKKOS.cmake b/cmake/Modules/Packages/KOKKOS.cmake
index 29beaca957..949118863c 100644
--- a/cmake/Modules/Packages/KOKKOS.cmake
+++ b/cmake/Modules/Packages/KOKKOS.cmake
@@ -1,22 +1,38 @@
 if(PKG_KOKKOS)
-  # TODO: this option needs to be documented when this works with a
-  # regular release version of KOKKOS, and a version compatibility check
-  # of external KOKKOS lib versus what the KOKKOS package needs is required.
-  option(EXTERNAL_KOKKOS "Build against external kokkos library")
-  if(EXTERNAL_KOKKOS)
-    find_package(Kokkos REQUIRED)
-    list(APPEND LAMMPS_LINK_LIBS Kokkos::kokkos)
+  find_package(Kokkos 3 QUIET)
+  if(Kokkos_FOUND)
+    set(DOWNLOAD_KOKKOS_DEFAULT OFF)
   else()
-    set(LAMMPS_LIB_KOKKOS_SRC_DIR ${LAMMPS_LIB_SOURCE_DIR}/kokkos)
-    set(LAMMPS_LIB_KOKKOS_BIN_DIR ${LAMMPS_LIB_BINARY_DIR}/kokkos)
-    add_subdirectory(${LAMMPS_LIB_KOKKOS_SRC_DIR} ${LAMMPS_LIB_KOKKOS_BIN_DIR})
-
-    set(Kokkos_INCLUDE_DIRS ${LAMMPS_LIB_KOKKOS_SRC_DIR}/core/src
-                            ${LAMMPS_LIB_KOKKOS_SRC_DIR}/containers/src
-                            ${LAMMPS_LIB_KOKKOS_SRC_DIR}/algorithms/src
-                            ${LAMMPS_LIB_KOKKOS_BIN_DIR})
-    include_directories(${Kokkos_INCLUDE_DIRS})
-    list(APPEND LAMMPS_LINK_LIBS kokkos)
+    set(DOWNLOAD_KOKKOS_DEFAULT ON)
+  endif()
+  option(DOWNLOAD_KOKKOS "Download the KOKKOS library instead of using an already installed one" ${DOWNLOAD_KOKKOS_DEFAULT})
+  if(DOWNLOAD_KOKKOS)
+    message(STATUS "KOKKOS download requested - we will build our own")
+    # Workaround for cross compilation with MinGW where ${CMAKE_INSTALL_LIBDIR}
+    # is a full path, so we need to remove the prefix
+    string(REPLACE ${CMAKE_INSTALL_PREFIX} "" _KOKKOS_LIBDIR ${CMAKE_INSTALL_LIBDIR})
+    include(ExternalProject)
+    ExternalProject_Add(kokkos_build
+      URL https://github.com/kokkos/kokkos/archive/3.0.00.tar.gz
+      URL_MD5 281c7093aa3a603276e93abdf4be23b9
+      PATCH_COMMAND patch -p3 < ${CMAKE_CURRENT_SOURCE_DIR}/2826.patch
+      CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=<INSTALL_DIR> ${CMAKE_REQUEST_PIC}
+      -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
+      -DCMAKE_MAKE_PROGRAM=${CMAKE_MAKE_PROGRAM} -DCMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN_FILE}
+      BUILD_BYPRODUCTS <INSTALL_DIR>/${_KOKKOS_LIBDIR}/libkokkoscore.a
+    )
+    list(APPEND LAMMPS_DEPS kokkos_build)
+    ExternalProject_get_property(kokkos_build INSTALL_DIR)
+    set(KOKKOS_LIBRARIES ${INSTALL_DIR}/${_KOKKOS_LIBDIR}/libkokkoscore.a) 
+    set(KOKKOS_INCLUDE_DIRS ${INSTALL_DIR}/include)
+    include_directories(${KOKKOS_INCLUDE_DIRS})
+    list(APPEND LAMMPS_LINK_LIBS ${KOKKOS_LIBRARIES})
+  else()
+    find_package(Kokkos 3)
+    if(NOT Kokkos_FOUND)
+      message(FATAL_ERROR "KOKKOS library not found, help CMake to find it by setting KOKKOS_LIBRARY, or set DOWNLOAD_KOKKOS=ON to download it")
+    endif()
+    list(APPEND LAMMPS_LINK_LIBS Kokkos::kokkos)
   endif()
   add_definitions(-DLMP_KOKKOS)
 
diff --git a/cmake/Modules/Packages/KSPACE.cmake b/cmake/Modules/Packages/KSPACE.cmake
index 5786d7cb8a..07612447f9 100644
--- a/cmake/Modules/Packages/KSPACE.cmake
+++ b/cmake/Modules/Packages/KSPACE.cmake
@@ -22,7 +22,7 @@ if(PKG_KSPACE)
     include_directories(${${FFTW}_INCLUDE_DIRS})
     list(APPEND LAMMPS_LINK_LIBS ${${FFTW}_LIBRARIES})
     if(FFTW3_OMP_LIBRARY OR FFTW3F_OMP_LIBRARY)
-      option(FFT_FFTW_THREADS "Use threaded FFT library" ON)
+      option(FFT_FFTW_THREADS "Use threaded FFTW library" ON)
     else()
       option(FFT_FFTW_THREADS "Use threaded FFT library" OFF)
     endif()
@@ -38,6 +38,10 @@ if(PKG_KSPACE)
   elseif(FFT STREQUAL "MKL")
     find_package(MKL REQUIRED)
     add_definitions(-DFFT_MKL)
+    option(FFT_MKL_THREADS "Use threaded MKL FFT" ON)
+    if(FFT_MKL_THREADS)
+      add_definitions(-DFFT_MKL_THREADS)
+    endif()
     include_directories(${MKL_INCLUDE_DIRS})
     list(APPEND LAMMPS_LINK_LIBS ${MKL_LIBRARIES})
   else()
diff --git a/cmake/Modules/Packages/LATTE.cmake b/cmake/Modules/Packages/LATTE.cmake
index de7116780b..9f665d7f0e 100644
--- a/cmake/Modules/Packages/LATTE.cmake
+++ b/cmake/Modules/Packages/LATTE.cmake
@@ -8,13 +8,10 @@ if(PKG_LATTE)
   endif()
   option(DOWNLOAD_LATTE "Download the LATTE library instead of using an already installed one" ${DOWNLOAD_LATTE_DEFAULT})
   if(DOWNLOAD_LATTE)
-    if (CMAKE_VERSION VERSION_LESS "3.7") # due to SOURCE_SUBDIR
-      message(FATAL_ERROR "For downlading LATTE you need at least cmake-3.7")
-    endif()
-    if(CMAKE_GENERATOR STREQUAL "Ninja")
-      message(FATAL_ERROR "Cannot build downloaded LATTE library with Ninja build tool")
-    endif()
     message(STATUS "LATTE download requested - we will build our own")
+    # Workaround for cross compilation with MinGW where ${CMAKE_INSTALL_LIBDIR}
+    # is a full path, so we need to remove the prefix
+    string(REPLACE ${CMAKE_INSTALL_PREFIX} "" _LATTE_LIBDIR ${CMAKE_INSTALL_LIBDIR})
     include(ExternalProject)
     ExternalProject_Add(latte_build
       URL https://github.com/lanl/LATTE/archive/v1.2.1.tar.gz
@@ -24,15 +21,20 @@ if(PKG_LATTE)
       -DBLAS_LIBRARIES=${BLAS_LIBRARIES} -DLAPACK_LIBRARIES=${LAPACK_LIBRARIES}
       -DCMAKE_Fortran_COMPILER=${CMAKE_Fortran_COMPILER} -DCMAKE_Fortran_FLAGS=${CMAKE_Fortran_FLAGS}
       -DCMAKE_Fortran_FLAGS_${BTYPE}=${CMAKE_Fortran_FLAGS_${BTYPE}} -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
+      -DCMAKE_MAKE_PROGRAM=${CMAKE_MAKE_PROGRAM} -DCMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN_FILE}
+      BUILD_BYPRODUCTS <INSTALL_DIR>/${_LATTE_LIBDIR}/liblatte.a
     )
-    ExternalProject_get_property(latte_build INSTALL_DIR)
-    set(LATTE_LIBRARIES ${INSTALL_DIR}/${CMAKE_INSTALL_LIBDIR}/liblatte.a)
     list(APPEND LAMMPS_DEPS latte_build)
+    ExternalProject_get_property(latte_build INSTALL_DIR)
+    set(LATTE_LIBRARIES ${INSTALL_DIR}/${_LATTE_LIBDIR}/liblatte.a)
   else()
     find_package(LATTE)
     if(NOT LATTE_FOUND)
       message(FATAL_ERROR "LATTE library not found, help CMake to find it by setting LATTE_LIBRARY, or set DOWNLOAD_LATTE=ON to download it")
     endif()
   endif()
+  if(NOT LAPACK_FOUND)
+    add_dependencies(latte_build linalg)
+  endif()
   list(APPEND LAMMPS_LINK_LIBS ${LATTE_LIBRARIES} ${LAPACK_LIBRARIES})
 endif()
diff --git a/cmake/Modules/Packages/MSCG.cmake b/cmake/Modules/Packages/MSCG.cmake
index b442580583..35f0c57449 100644
--- a/cmake/Modules/Packages/MSCG.cmake
+++ b/cmake/Modules/Packages/MSCG.cmake
@@ -8,12 +8,6 @@ if(PKG_MSCG)
   endif()
   option(DOWNLOAD_MSCG "Download MSCG library instead of using an already installed one)" ${DOWNLOAD_MSCG_DEFAULT})
   if(DOWNLOAD_MSCG)
-    if (CMAKE_VERSION VERSION_LESS "3.7") # due to SOURCE_SUBDIR
-      message(FATAL_ERROR "For downlading MSCG you need at least cmake-3.7")
-    endif()
-    if(CMAKE_GENERATOR STREQUAL "Ninja")
-      message(FATAL_ERROR "Cannot build downloaded MSCG library with Ninja build tool")
-    endif()
     include(ExternalProject)
     if(NOT LAPACK_FOUND)
       set(EXTRA_MSCG_OPTS "-DLAPACK_LIBRARIES=${CMAKE_CURRENT_BINARY_DIR}/liblinalg.a")
@@ -22,8 +16,17 @@ if(PKG_MSCG)
       URL https://github.com/uchicago-voth/MSCG-release/archive/1.7.3.1.tar.gz
       URL_MD5 8c45e269ee13f60b303edd7823866a91
       SOURCE_SUBDIR src/CMake
-      CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=<INSTALL_DIR> ${CMAKE_REQUEST_PIC} ${EXTRA_MSCG_OPTS}
-      BUILD_COMMAND make mscg INSTALL_COMMAND ""
+      CMAKE_ARGS ${CMAKE_REQUEST_PIC} ${EXTRA_MSCG_OPTS}
+                 -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER}
+                 -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER}
+                 -DCMAKE_Fortran_COMPILER=${CMAKE_Fortran_COMPILER}
+                 -DCMAKE_INSTALL_PREFIX=<INSTALL_DIR>
+                 -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
+                 -DCMAKE_MAKE_PROGRAM=${CMAKE_MAKE_PROGRAM}
+                 -DCMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN_FILE}
+      BUILD_COMMAND ${CMAKE_COMMAND} --build . --target mscg
+      INSTALL_COMMAND ""
+      BUILD_BYPRODUCTS <BINARY_DIR>/libmscg.a
       )
     ExternalProject_get_property(mscg_build BINARY_DIR)
     set(MSCG_LIBRARIES ${BINARY_DIR}/libmscg.a)
diff --git a/cmake/Modules/Packages/USER-COLVARS.cmake b/cmake/Modules/Packages/USER-COLVARS.cmake
index b7fb91917c..a112fbb6aa 100644
--- a/cmake/Modules/Packages/USER-COLVARS.cmake
+++ b/cmake/Modules/Packages/USER-COLVARS.cmake
@@ -5,22 +5,7 @@ if(PKG_USER-COLVARS)
   file(GLOB COLVARS_SOURCES ${COLVARS_SOURCE_DIR}/[^.]*.cpp)
 
   # Build Lepton by default
-  set(COLVARS_LEPTON_DEFAULT ON)
-  # but not if C++11 is disabled per user request
-  if(DEFINED DISABLE_CXX11_REQUIREMENT)
-    if(DISABLE_CXX11_REQUIREMENT)
-      set(COLVARS_LEPTON_DEFAULT OFF)
-    endif()
-  endif()
-
-  option(COLVARS_LEPTON "Build and link the Lepton library" ${COLVARS_LEPTON_DEFAULT})
-
-  # Verify that the user's choice is consistent
-  if(DEFINED DISABLE_CXX11_REQUIREMENT)
-    if((DISABLE_CXX11_REQUIREMENT) AND (COLVARS_LEPTON))
-      message(FATAL_ERROR "Building the Lepton library requires C++11 or later.")
-    endif()
-  endif()
+  option(COLVARS_LEPTON "Build and link the Lepton library" ON)
 
   if(COLVARS_LEPTON)
     set(LEPTON_DIR ${LAMMPS_LIB_SOURCE_DIR}/colvars/lepton)
diff --git a/cmake/Modules/Packages/USER-INTEL.cmake b/cmake/Modules/Packages/USER-INTEL.cmake
index 3c0cc7ba24..9ae4333ee2 100644
--- a/cmake/Modules/Packages/USER-INTEL.cmake
+++ b/cmake/Modules/Packages/USER-INTEL.cmake
@@ -31,7 +31,7 @@ if(PKG_USER-INTEL)
     endif()
   endif()
   if(INTEL_LRT_MODE STREQUAL "C++11")
-    add_definitions(-DLMP_INTEL_USERLRT -DLMP_INTEL_LRT11)
+    add_definitions(-DLMP_INTEL_USELRT -DLMP_INTEL_LRT11)
   endif()
 
   if(CMAKE_CXX_COMPILER_ID STREQUAL "Intel")
@@ -74,11 +74,6 @@ if(PKG_USER-INTEL)
     add_definitions(-DLMP_INTEL_OFFLOAD)
   else()
     if(CMAKE_CXX_COMPILER_ID STREQUAL "Intel")
-      if(CMAKE_CXX_COMPILER_VERSION VERSION_EQUAL 17.3 OR CMAKE_CXX_COMPILER_VERSION VERSION_EQUAL 17.4)
-        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -xCOMMON-AVX512")
-      else()
-        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -xHost")
-      endif()
       include(CheckCXXCompilerFlag)
       foreach(_FLAG -O2 -fp-model fast=2 -no-prec-div -qoverride-limits -qopt-zmm-usage=high -qno-offload -fno-alias -ansi-alias -restrict)
         check_cxx_compiler_flag("${__FLAG}" COMPILER_SUPPORTS${_FLAG})
diff --git a/cmake/Modules/Packages/USER-MOLFILE.cmake b/cmake/Modules/Packages/USER-MOLFILE.cmake
index b8c4234d26..16ffc34994 100644
--- a/cmake/Modules/Packages/USER-MOLFILE.cmake
+++ b/cmake/Modules/Packages/USER-MOLFILE.cmake
@@ -1,8 +1,4 @@
 if(PKG_USER-MOLFILE)
-  if (CMAKE_VERSION VERSION_LESS "3.10") # due to INTERFACE without a library
-    message(FATAL_ERROR "For configuring USER-MOLFILE you need CMake 3.10 or later")
-  endif()
-
   set(MOLFILE_INCLUDE_DIRS "${LAMMPS_LIB_SOURCE_DIR}/molfile" CACHE STRING "Path to VMD molfile plugin headers")
   add_library(molfile INTERFACE)
   target_include_directories(molfile INTERFACE ${MOLFILE_INCLUDE_DIRS})
diff --git a/cmake/Modules/Packages/USER-NETCDF.cmake b/cmake/Modules/Packages/USER-NETCDF.cmake
index f60c046ab9..921156f1e0 100644
--- a/cmake/Modules/Packages/USER-NETCDF.cmake
+++ b/cmake/Modules/Packages/USER-NETCDF.cmake
@@ -1,6 +1,6 @@
 if(PKG_USER-NETCDF)
   # USER-NETCDF can use NetCDF, Parallel NetCDF (PNetCDF), or both. At least one necessary.
-  # NetCDF library enables dump sytle "netcdf", while PNetCDF enables dump style "netcdf/mpiio"
+  # NetCDF library enables dump style "netcdf", while PNetCDF enables dump style "netcdf/mpiio"
   find_package(NetCDF)
   if(NETCDF_FOUND)
     find_package(PNetCDF)
diff --git a/cmake/Modules/Packages/USER-PLUMED.cmake b/cmake/Modules/Packages/USER-PLUMED.cmake
index bf5c502d84..426ae2df2a 100644
--- a/cmake/Modules/Packages/USER-PLUMED.cmake
+++ b/cmake/Modules/Packages/USER-PLUMED.cmake
@@ -29,9 +29,6 @@ if(PKG_USER-PLUMED)
 
   option(DOWNLOAD_PLUMED "Download Plumed package instead of using an already installed one" ${DOWNLOAD_PLUMED_DEFAULT})
   if(DOWNLOAD_PLUMED)
-    if(CMAKE_GENERATOR STREQUAL "Ninja")
-      message(FATAL_ERROR "Cannot build downloaded Plumed library with Ninja build tool")
-    endif()
     if(BUILD_MPI)
       set(PLUMED_CONFIG_MPI "--enable-mpi")
       set(PLUMED_CONFIG_CC  ${CMAKE_MPI_C_COMPILER})
@@ -47,10 +44,17 @@ if(PKG_USER-PLUMED)
       set(PLUMED_CONFIG_OMP "--disable-openmp")
     endif()
     message(STATUS "PLUMED download requested - we will build our own")
+    if(PLUMED_MODE STREQUAL "STATIC")
+      set(PLUMED_BUILD_BYPRODUCTS "<INSTALL_DIR>/lib/libplumed.a")
+    elseif(PLUMED_MODE STREQUAL "SHARED")
+      set(PLUMED_BUILD_BYPRODUCTS "<INSTALL_DIR>/lib/libplumed${CMAKE_SHARED_LIBRARY_SUFFIX};<INSTALL_DIR>/lib/libplumedKernel${CMAKE_SHARED_LIBRARY_SUFFIX}")
+    elseif(PLUMED_MODE STREQUAL "RUNTIME")
+      set(PLUMED_BUILD_BYPRODUCTS "<INSTALL_DIR>/lib/libplumedWrapper.a")
+    endif()
     include(ExternalProject)
     ExternalProject_Add(plumed_build
-      URL https://github.com/plumed/plumed2/releases/download/v2.5.3/plumed-src-2.5.3.tgz
-      URL_MD5 de30d6e7c2dcc0973298e24a6da24286
+      URL https://github.com/plumed/plumed2/releases/download/v2.6.0/plumed-src-2.6.0.tgz
+      URL_MD5 204d2edae58d9b10ba3ad460cad64191
       BUILD_IN_SOURCE 1
       CONFIGURE_COMMAND <SOURCE_DIR>/configure --prefix=<INSTALL_DIR>
                                                ${CONFIGURE_REQUEST_PIC}
@@ -59,6 +63,7 @@ if(PKG_USER-PLUMED)
                                                ${PLUMED_CONFIG_OMP}
                                                CXX=${PLUMED_CONFIG_CXX}
                                                CC=${PLUMED_CONFIG_CC}
+      BUILD_BYPRODUCTS ${PLUMED_BUILD_BYPRODUCTS} 
     )
     ExternalProject_get_property(plumed_build INSTALL_DIR)
     set(PLUMED_INSTALL_DIR ${INSTALL_DIR})
diff --git a/cmake/Modules/Packages/USER-QMMM.cmake b/cmake/Modules/Packages/USER-QMMM.cmake
index e0ae1a46dc..544455868e 100644
--- a/cmake/Modules/Packages/USER-QMMM.cmake
+++ b/cmake/Modules/Packages/USER-QMMM.cmake
@@ -1,9 +1,13 @@
 if(PKG_USER-QMMM)
-  enable_language(Fortran)
   enable_language(C)
 
-  message(WARNING "Building QMMM with CMake is still experimental")
-  find_package(QE REQUIRED)
-  include_directories(${QE_INCLUDE_DIRS})
-  list(APPEND LAMMPS_LINK_LIBS ${QE_LIBRARIES})
+  if(NOT BUILD_LIB)
+    message(FATAL_ERROR "Building a QM/MM executable with USER-QMMM requires BUILD_LIB=yes")
+  endif()
+  if(NOT BUILD_SHARED_LIBS)
+    message(WARNING "It is recommended to use BUILD_SHARED_LIBS=yes with USER-QMMM")
+  endif()
+  add_library(qmmm STATIC ${LAMMPS_LIB_SOURCE_DIR}/qmmm/libqmmm.c)
+  list(APPEND LAMMPS_LINK_LIBS qmmm)
+  target_include_directories(qmmm PUBLIC ${LAMMPS_LIB_SOURCE_DIR}/qmmm)
 endif()
diff --git a/cmake/Modules/Packages/USER-SCAFACOS.cmake b/cmake/Modules/Packages/USER-SCAFACOS.cmake
index 475f2585c8..8bb9e63605 100644
--- a/cmake/Modules/Packages/USER-SCAFACOS.cmake
+++ b/cmake/Modules/Packages/USER-SCAFACOS.cmake
@@ -4,6 +4,7 @@ if(PKG_USER-SCAFACOS)
 
   find_package(GSL REQUIRED)
   find_package(PkgConfig QUIET)
+  find_package(MPI REQUIRED)
   set(DOWNLOAD_SCAFACOS_DEFAULT ON)
   if(PKG_CONFIG_FOUND)
     pkg_check_modules(SCAFACOS QUIET scafacos)
@@ -13,9 +14,6 @@ if(PKG_USER-SCAFACOS)
   endif()
   option(DOWNLOAD_SCAFACOS "Download ScaFaCoS library instead of using an already installed one" ${DOWNLOAD_SCAFACOS_DEFAULT})
   if(DOWNLOAD_SCAFACOS)
-    if(CMAKE_GENERATOR STREQUAL "Ninja")
-      message(FATAL_ERROR "Cannot build downloaded ScaFaCoS library with Ninja build tool")
-    endif()
     message(STATUS "ScaFaCoS download requested - we will build our own")
     include(ExternalProject)
     ExternalProject_Add(scafacos_build
@@ -29,6 +27,22 @@ if(PKG_USER-SCAFACOS)
                                                CXX=${CMAKE_MPI_CXX_COMPILER}
                                                CC=${CMAKE_MPI_C_COMPILER}
                                                F77=
+      BUILD_BYPRODUCTS 
+        <INSTALL_DIR>/lib/libfcs.a
+        <INSTALL_DIR>/lib/libfcs_direct.a
+        <INSTALL_DIR>/lib/libfcs_ewald.a
+        <INSTALL_DIR>/lib/libfcs_fmm.a
+        <INSTALL_DIR>/lib/libfcs_p2nfft.a
+        <INSTALL_DIR>/lib/libfcs_p3m.a
+        <INSTALL_DIR>/lib/libfcs_near.a
+        <INSTALL_DIR>/lib/libfcs_gridsort.a
+        <INSTALL_DIR>/lib/libfcs_resort.a
+        <INSTALL_DIR>/lib/libfcs_redist.a
+        <INSTALL_DIR>/lib/libfcs_common.a
+        <INSTALL_DIR>/lib/libfcs_pnfft.a
+        <INSTALL_DIR>/lib/libfcs_pfft.a
+        <INSTALL_DIR>/lib/libfcs_fftw3_mpi.a
+        <INSTALL_DIR>/lib/libfcs_fftw3.a
     )
     ExternalProject_get_property(scafacos_build INSTALL_DIR)
     set(SCAFACOS_BUILD_DIR ${INSTALL_DIR})
diff --git a/cmake/Modules/Packages/VORONOI.cmake b/cmake/Modules/Packages/VORONOI.cmake
index 89fa70bf98..5418132034 100644
--- a/cmake/Modules/Packages/VORONOI.cmake
+++ b/cmake/Modules/Packages/VORONOI.cmake
@@ -7,9 +7,6 @@ if(PKG_VORONOI)
   endif()
   option(DOWNLOAD_VORO "Download and compile the Voro++ library instead of using an already installed one" ${DOWNLOAD_VORO_DEFAULT})
   if(DOWNLOAD_VORO)
-    if(CMAKE_GENERATOR STREQUAL "Ninja")
-      message(FATAL_ERROR "Cannot build downloaded Voro++ library with Ninja build tool")
-    endif()
     message(STATUS "Voro++ download requested - we will build our own")
     include(ExternalProject)
 
@@ -29,6 +26,7 @@ if(PKG_VORONOI)
       URL https://download.lammps.org/thirdparty/voro++-0.4.6.tar.gz
       URL_MD5 2338b824c3b7b25590e18e8df5d68af9
       CONFIGURE_COMMAND "" BUILD_COMMAND make ${VORO_BUILD_OPTIONS} BUILD_IN_SOURCE 1 INSTALL_COMMAND ""
+      BUILD_BYPRODUCTS <SOURCE_DIR>/src/libvoro++.a
       )
     ExternalProject_get_property(voro_build SOURCE_DIR)
     set(VORO_LIBRARIES ${SOURCE_DIR}/src/libvoro++.a)
diff --git a/cmake/README.md b/cmake/README.md
index 6255307ef3..b9dd6d4373 100644
--- a/cmake/README.md
+++ b/cmake/README.md
@@ -217,7 +217,7 @@ cmake -C ../cmake/presets/all_on.cmake -C ../cmake/presets/nolib.cmake -D PKG_GP
 </tr>
 <tr>
   <td><code>CMAKE_VERBOSE_MAKEFILE</code></td>
-  <td>Enable verbose output from Makefile builds (useful for debugging), the same can be achived by adding `VERBOSE=1` to the `make` call.</td>
+  <td>Enable verbose output from Makefile builds (useful for debugging), the same can be achieved by adding `VERBOSE=1` to the `make` call.</td>
   <td>
   <dl>
     <dt><code>off</code> (default)</dt>
@@ -576,7 +576,7 @@ cmake -C ../cmake/presets/all_on.cmake -C ../cmake/presets/nolib.cmake -D PKG_GP
   Several fixes and a pair style that have Monte Carlo (MC) or MC-like
   attributes. These include fixes for creating, breaking, and swapping bonds,
   for performing atomic swaps, and performing grand-canonical MC (GCMC) in
-  conjuction with dynamics.
+  conjunction with dynamics.
   </td>
   <td>
   <dl>
@@ -1383,8 +1383,8 @@ cmake -C ../cmake/presets/all_on.cmake -C ../cmake/presets/nolib.cmake -D PKG_GP
   Some potentials that are also implemented in the Yet Another Force Field (YAFF) code.
   The expressions and their use are discussed in the following papers:
   <ul>
-    <li><a href="http://dx.doi.org/10.1002/jcc.23877" target="_blank">Vanduyfhuys et al., J. Comput. Chem., 36 (13), 1015-1027 (2015)</a></li>
-    <li><a href="http://dx.doi.org/10.1002/jcc.25173" target="_blank">Vanduyfhuys et al., J. Comput. Chem., 39 (16), 999-1011 (2018)</a></li>
+    <li><a href="https://doi.org/10.1002/jcc.23877" target="_blank">Vanduyfhuys et al., J. Comput. Chem., 36 (13), 1015-1027 (2015)</a></li>
+    <li><a href="https://doi.org/10.1002/jcc.25173" target="_blank">Vanduyfhuys et al., J. Comput. Chem., 39 (16), 999-1011 (2018)</a></li>
   </ul>
   </td>
   <td>
diff --git a/cmake/presets/all_off.cmake b/cmake/presets/all_off.cmake
index 9d03be99ec..6b589e3cd9 100644
--- a/cmake/presets/all_off.cmake
+++ b/cmake/presets/all_off.cmake
@@ -7,11 +7,11 @@ set(ALL_PACKAGES ASPHERE BODY CLASS2 COLLOID COMPRESS CORESHELL DIPOLE GPU
         SRD VORONOI
         USER-ADIOS USER-ATC USER-AWPMD USER-BOCS USER-CGDNA USER-CGSDK
         USER-COLVARS USER-DIFFRACTION USER-DPD USER-DRUDE USER-EFF USER-FEP
-        USER-H5MD USER-INTEL USER-LB USER-MANIFOLD USER-MEAMC USER-MESO
+        USER-H5MD USER-INTEL USER-LB USER-MANIFOLD USER-MEAMC USER-MESODPD
         USER-MGPT USER-MISC USER-MOFFF USER-MOLFILE USER-NETCDF USER-OMP
         USER-PHONON USER-PLUMED USER-PTM USER-QMMM USER-QTB USER-QUIP
-        USER-REAXC USER-SCAFACOS USER-SDPD USER-SMD USER-SMTBQ USER-SPH
-        USER-TALLY USER-UEF USER-VTK USER-YAFF)
+        USER-REACTION USER-REAXC USER-SCAFACOS USER-SDPD USER-SMD USER-SMTBQ
+        USER-SPH USER-TALLY USER-UEF USER-VTK USER-YAFF)
 
 foreach(PKG ${ALL_PACKAGES})
   set(PKG_${PKG} OFF CACHE BOOL "" FORCE)
diff --git a/cmake/presets/all_on.cmake b/cmake/presets/all_on.cmake
index 2ff107975a..e46157bb96 100644
--- a/cmake/presets/all_on.cmake
+++ b/cmake/presets/all_on.cmake
@@ -9,11 +9,11 @@ set(ALL_PACKAGES ASPHERE BODY CLASS2 COLLOID COMPRESS CORESHELL DIPOLE GPU
         SRD VORONOI
         USER-ADIOS USER-ATC USER-AWPMD USER-BOCS USER-CGDNA USER-CGSDK
         USER-COLVARS USER-DIFFRACTION USER-DPD USER-DRUDE USER-EFF USER-FEP
-        USER-H5MD USER-INTEL USER-LB USER-MANIFOLD USER-MEAMC USER-MESO
+        USER-H5MD USER-INTEL USER-LB USER-MANIFOLD USER-MEAMC USER-MESODPD
         USER-MGPT USER-MISC USER-MOFFF USER-MOLFILE USER-NETCDF USER-OMP
         USER-PHONON USER-PLUMED USER-PTM USER-QMMM USER-QTB USER-QUIP
-        USER-REAXC USER-SCAFACOS USER-SDPD USER-SMD USER-SMTBQ USER-SPH
-        USER-TALLY USER-UEF USER-VTK USER-YAFF)
+        USER-REACTION USER-REAXC USER-SCAFACOS USER-SDPD USER-SMD USER-SMTBQ
+        USER-SPH USER-TALLY USER-UEF USER-VTK USER-YAFF)
 
 foreach(PKG ${ALL_PACKAGES})
   set(PKG_${PKG} ON CACHE BOOL "" FORCE)
diff --git a/cmake/presets/clang.cmake b/cmake/presets/clang.cmake
index 828f359f54..e2b1e02cc9 100644
--- a/cmake/presets/clang.cmake
+++ b/cmake/presets/clang.cmake
@@ -13,5 +13,5 @@ set(OpenMP_C_LIB_NAMES "omp" CACHE STRING "" FORCE)
 set(OpenMP_CXX "clang++" CACHE STRING "" FORCE)
 set(OpenMP_CXX_FLAGS "-fopenmp" CACHE STRING "" FORCE)
 set(OpenMP_CXX_LIB_NAMES "omp" CACHE STRING "" FORCE)
-set(OpenMP_omp_LIBRARY "/usr/lib64/libomp.so" CACHE PATH "" FORCE)
+set(OpenMP_omp_LIBRARY "libomp.so" CACHE PATH "" FORCE)
 
diff --git a/cmake/presets/intel.cmake b/cmake/presets/intel.cmake
new file mode 100644
index 0000000000..869bf7bca2
--- /dev/null
+++ b/cmake/presets/intel.cmake
@@ -0,0 +1,17 @@
+# preset that will enable clang/clang++ with support for MPI and OpenMP (on Linux boxes)
+
+set(CMAKE_CXX_COMPILER "icpc" CACHE STRING "" FORCE)
+set(CMAKE_C_COMPILER "icc" CACHE STRING "" FORCE)
+set(CMAKE_CXX_FLAGS "-O3 -DNDEBG" CACHE STRING "" FORCE)
+set(MPI_CXX "icpc" CACHE STRING "" FORCE)
+set(MPI_CXX_COMPILER "mpicxx" CACHE STRING "" FORCE)
+unset(HAVE_OMP_H_INCLUDE CACHE)
+
+set(OpenMP_C "icc" CACHE STRING "" FORCE)
+set(OpenMP_C_FLAGS "-qopenmp" CACHE STRING "" FORCE)
+set(OpenMP_C_LIB_NAMES "omp" CACHE STRING "" FORCE)
+set(OpenMP_CXX "icpc" CACHE STRING "" FORCE)
+set(OpenMP_CXX_FLAGS "-qopenmp" CACHE STRING "" FORCE)
+set(OpenMP_CXX_LIB_NAMES "omp" CACHE STRING "" FORCE)
+set(OpenMP_omp_LIBRARY "libiomp5.so" CACHE PATH "" FORCE)
+
diff --git a/cmake/presets/mingw-cross.cmake b/cmake/presets/mingw-cross.cmake
index 920b377e48..a733142455 100644
--- a/cmake/presets/mingw-cross.cmake
+++ b/cmake/presets/mingw-cross.cmake
@@ -1,17 +1,28 @@
 set(WIN_PACKAGES ASPHERE BODY CLASS2 COLLOID COMPRESS CORESHELL DIPOLE GPU
-                 GRANULAR KSPACE MANYBODY MC MISC MOLECULE OPT PERI POEMS QEQ
-                 REPLICA RIGID SHOCK SNAP SPIN SRD VORONOI USER-ATC USER-AWPMD
-                 USER-BOCS USER-CGDNA USER-CGSDK USER-COLVARS USER-DIFFRACTION
-                 USER-DPD USER-DRUDE USER-EFF USER-FEP USER-INTEL USER-MANIFOLD
-                 USER-MEAMC USER-MESO USER-MISC USER-MGPT USER-MOFFF USER-MOLFILE
-                 USER-OMP USER-PHONON USER-PTM USER-QTB USER-REAXC USER-SDPD
-                 USER-SMD USER-SMTBQ USER-SPH USER-TALLY USER-UEF USER-YAFF)
+                 GRANULAR KSPACE LATTE MANYBODY MC MISC MOLECULE OPT PERI
+                 POEMS QEQ REPLICA RIGID SHOCK SNAP SPIN SRD VORONOI
+                 USER-ATC USER-AWPMD USER-BOCS USER-CGDNA USER-CGSDK
+                 USER-COLVARS USER-DIFFRACTION USER-DPD USER-DRUDE USER-EFF
+                 USER-FEP USER-INTEL USER-MANIFOLD USER-MEAMC USER-MESODPD
+                 USER-MISC USER-MGPT USER-MOFFF USER-MOLFILE USER-OMP
+                 USER-PHONON USER-PTM USER-QTB USER-REACTION USER-REAXC
+                 USER-SDPD USER-SMD USER-SMTBQ USER-SPH USER-TALLY USER-UEF
+                 USER-YAFF)
 
 foreach(PKG ${WIN_PACKAGES})
   set(PKG_${PKG} ON CACHE BOOL "" FORCE)
 endforeach()
 
+# these two packages require a full MPI implementation
+if(BUILD_MPI)
+  set(PKG_MPIIO ON CACHE BOOL "" FORCE)
+  set(PKG_USER-LB ON CACHE BOOL "" FORCE)
+endif()
+
 set(DOWNLOAD_VORO ON CACHE BOOL "" FORCE)
 set(DOWNLOAD_EIGEN3 ON CACHE BOOL "" FORCE)
 set(LAMMPS_MEMALIGN "0" CACHE STRING "" FORCE)
+set(CMAKE_TUNE_FLAGS "-Wno-missing-include-dirs" CACHE STRING "" FORCE)
+set(CMAKE_EXE_LINKER_FLAGS "--enable-stdcall-fixup" CACHE STRING "" FORCE)
+set(BUILD_TOOLS ON CACHE BOOL "" FORCE)
 set(CMAKE_INSTALL_PREFIX "${CMAKE_CURRENT_BINARY_DIR}/lammps-installer")
diff --git a/cmake/presets/most.cmake b/cmake/presets/most.cmake
index eed560b995..2f5b517526 100644
--- a/cmake/presets/most.cmake
+++ b/cmake/presets/most.cmake
@@ -2,14 +2,16 @@
 # external libraries. Compared to all_on.cmake some more unusual packages
 # are removed. The resulting binary should be able to run most inputs.
 
-set(ALL_PACKAGES ASPHERE CLASS2 COLLOID CORESHELL DIPOLE
-        GRANULAR KSPACE MANYBODY MC MISC MOLECULE OPT PERI
-        PYTHON QEQ REPLICA RIGID SHOCK SNAP SRD VORONOI
-        USER-CGDNA USER-CGSDK USER-COLVARS USER-DIFFRACTION USER-DPD
-        USER-DRUDE USER-FEP USER-MEAMC USER-MESO
-        USER-MISC USER-MOFFF USER-OMP USER-PHONON USER-REAXC
-        USER-SPH USER-SMD USER-UEF USER-YAFF)
+set(ALL_PACKAGES ASPHERE BODY CLASS2 COLLOID COMPRESS CORESHELL
+        DIPOLE GRANULAR KSPACE MANYBODY MC MISC MOLECULE OPT PERI
+        POEMS PYTHON QEQ REPLICA RIGID SHOCK SNAP SPIN SRD VORONOI
+        USER-CGDNA USER-CGSDK USER-COLVARS USER-DIFFRACTION
+        USER-DPD USER-DRUDE USER-FEP USER-MEAMC USER-MESODPD
+        USER-MISC USER-MOFFF USER-OMP USER-PHONON USER-REACTION
+        USER-REAXC USER-SPH USER-SMD USER-UEF USER-YAFF)
 
 foreach(PKG ${ALL_PACKAGES})
   set(PKG_${PKG} ON CACHE BOOL "" FORCE)
 endforeach()
+
+set(BUILD_TOOLS ON CACHE BOOL "" FORCE)
diff --git a/doc/.gitignore b/doc/.gitignore
index ca450f00f9..55b25960db 100644
--- a/doc/.gitignore
+++ b/doc/.gitignore
@@ -1,6 +1,8 @@
 /old
 /html
+/html-offline
 /latex
+/mathjax
 /spelling
 /LAMMPS.epub
 /LAMMPS.mobi
diff --git a/doc/Makefile b/doc/Makefile
index 82c099ff70..ff56226e83 100644
--- a/doc/Makefile
+++ b/doc/Makefile
@@ -4,6 +4,7 @@ SHELL         = /bin/bash
 BUILDDIR      = ${CURDIR}
 RSTDIR        = $(BUILDDIR)/src
 VENV          = $(BUILDDIR)/docenv
+MATHJAX       = $(BUILDDIR)/mathjax
 TXT2RST       = $(VENV)/bin/txt2rst
 ANCHORCHECK   = $(VENV)/bin/rst_anchor_check
 
@@ -28,62 +29,61 @@ endif
 
 SPHINXEXTRA = -j $(shell $(PYTHON) -c 'import multiprocessing;print(multiprocessing.cpu_count())')
 
-.PHONY: help clean-all clean epub mobi rst html pdf venv spelling anchor_check style_check
+.PHONY: help clean-all clean clean-spelling epub mobi rst html pdf spelling anchor_check style_check
 
 # ------------------------------------------
 
 help:
 	@echo "Please use \`make <target>' where <target> is one of"
-	@echo "  html       create HTML doc pages in html dir"
-	@echo "  pdf        create Developer.pdf and Manual.pdf in this dir"
-	@echo "  fetch      fetch HTML and PDF files from LAMMPS web site"
-	@echo "  epub       create ePUB format manual for e-book readers"
-	@echo "  mobi       convert ePUB to MOBI format manual for e-book readers (e.g. Kindle)"
+	@echo "  html          create HTML doc pages in html dir"
+	@echo "  pdf           create Developer.pdf and Manual.pdf in this dir"
+	@echo "  fetch         fetch HTML and PDF files from LAMMPS web site"
+	@echo "  epub          create ePUB format manual for e-book readers"
+	@echo "  mobi          convert ePUB to MOBI format manual for e-book readers (e.g. Kindle)"
 	@echo "                      (requires ebook-convert tool from calibre)"
-	@echo "  clean      remove all intermediate RST files"
-	@echo "  clean-all  reset the entire build environment"
+	@echo "  clean         remove all intermediate RST files"
+	@echo "  clean-all     reset the entire build environment"
 	@echo "  anchor_check  scan for duplicate anchor labels"
 	@echo "  style_check   check for complete and consistent style lists"
-	@echo "  spelling   spell-check the manual"
+	@echo "  package_check check for complete and consistent package lists"
+	@echo "  spelling      spell-check the manual"
 
 # ------------------------------------------
 
 clean-all: clean
-	rm -rf $(BUILDDIR)/docenv $(BUILDDIR)/doctrees
+	rm -rf $(BUILDDIR)/docenv $(BUILDDIR)/doctrees $(BUILDDIR)/mathjax
 
-clean:
+clean: clean-spelling
 	rm -rf html epub latex
-	rm -rf spelling
 
 clean-spelling:
 	rm -rf spelling
 
-rst: clean $(ANCHORCHECK)
-
-html: $(ANCHORCHECK)
+html: $(ANCHORCHECK) $(MATHJAX)
 	@(\
 		. $(VENV)/bin/activate ;\
 		sphinx-build $(SPHINXEXTRA) -b html -c utils/sphinx-config -d $(BUILDDIR)/doctrees $(RSTDIR) html ;\
 		echo "############################################" ;\
 		rst_anchor_check src/*.rst ;\
+		python utils/check-packages.py -s ../src -d src ;\
 		env LC_ALL=C grep -n '[^ -~]' $(RSTDIR)/*.rst ;\
 		python utils/check-styles.py -s ../src -d src ;\
 		echo "############################################" ;\
 		deactivate ;\
 	)
-	-rm html/searchindex.js
 	@rm -rf html/_sources
 	@rm -rf html/PDF
 	@rm -rf html/USER
+	@rm -rf html/JPG
 	@cp -r src/PDF html/PDF
-	@cp -r src/USER html/USER
+	@mkdir -p html/JPG
+	@cp `grep -A2 '\.\. .*image::' src/*.rst | grep ':target:' | sed -e 's,.*:target: JPG/,src/JPG/,' | sort | uniq` html/JPG/
 	@rm -rf html/PDF/.[sg]*
-	@rm -rf html/USER/.[sg]*
-	@rm -rf html/USER/*/.[sg]*
-	@rm -rf html/USER/*/*.[sg]*
+	@mkdir -p html/_static/mathjax
+	@cp -r $(MATHJAX)/es5 html/_static/mathjax/
 	@echo "Build finished. The HTML pages are in doc/html."
 
-spelling: utils/sphinx-config/false_positives.txt
+spelling: $(VENV) utils/sphinx-config/false_positives.txt
 	@(\
 		. $(VENV)/bin/activate ;\
 		pip install sphinxcontrib-spelling ;\
@@ -93,7 +93,7 @@ spelling: utils/sphinx-config/false_positives.txt
 	)
 	@echo "Spell check finished."
 
-epub:
+epub: $(VENV)
 	@mkdir -p epub/JPG
 	@rm -f LAMMPS.epub
 	@cp src/JPG/lammps-logo.png epub/
@@ -125,6 +125,7 @@ pdf: $(ANCHORCHECK)
 		sphinx-build $(SPHINXEXTRA) -b latex -c utils/sphinx-config -d $(BUILDDIR)/doctrees $(RSTDIR) latex ;\
 		echo "############################################" ;\
 		rst_anchor_check src/*.rst ;\
+		python utils/check-packages.py -s ../src -d src ;\
 		env LC_ALL=C grep -n '[^ -~]' $(RSTDIR)/*.rst ;\
 		python utils/check-styles.py -s ../src -d src ;\
 		echo "############################################" ;\
@@ -146,11 +147,7 @@ pdf: $(ANCHORCHECK)
 	@rm -rf latex/PDF
 	@rm -rf latex/USER
 	@cp -r src/PDF latex/PDF
-	@cp -r src/USER latex/USER
 	@rm -rf latex/PDF/.[sg]*
-	@rm -rf latex/USER/.[sg]*
-	@rm -rf latex/USER/*/.[sg]*
-	@rm -rf latex/USER/*/*.[sg]*
 	@echo "Build finished. Manual.pdf and Developer.pdf are in this directory."
 
 fetch:
@@ -168,13 +165,20 @@ anchor_check : $(ANCHORCHECK)
 		deactivate ;\
 	)
 
-style_check :
+style_check : $(VENV)
 	@(\
 		. $(VENV)/bin/activate ;\
 		python utils/check-styles.py -s ../src -d src ;\
 		deactivate ;\
 	)
 
+package_check : $(VENV)
+	@(\
+		. $(VENV)/bin/activate ;\
+		python utils/check-packages.py -s ../src -d src ;\
+		deactivate ;\
+	)
+
 # ------------------------------------------
 
 $(VENV):
@@ -187,6 +191,9 @@ $(VENV):
 		deactivate;\
 	)
 
+$(MATHJAX):
+	@git clone --depth 1 https://github.com/mathjax/MathJax.git mathjax
+
 $(TXT2RST) $(ANCHORCHECK): $(VENV)
 	@( \
 		. $(VENV)/bin/activate; \
diff --git a/doc/lammps.1 b/doc/lammps.1
index 5ffd888f05..d2851603c6 100644
--- a/doc/lammps.1
+++ b/doc/lammps.1
@@ -1,4 +1,4 @@
-.TH LAMMPS "24 January 2020" "2020-01-24"
+.TH LAMMPS "19 March 2020" "2020-03-19"
 .SH NAME
 .B LAMMPS
 \- Molecular Dynamics Simulator.
@@ -11,13 +11,18 @@ or
 
 mpirun \-np 2
 .B lmp
-<input file> [OPTIONS] ...
+\-in <input file> [OPTIONS] ...
 
 or
 
 .B lmp
 \-r2data file.restart file.data
 
+or
+
+.B lmp
+\-h
+
 .SH DESCRIPTION
 .B LAMMPS
 is a classical molecular dynamics code, and an acronym for \fBL\fRarge-scale
@@ -249,7 +254,7 @@ the chapter on errors in the
 manual gives some additional information about error messages, if possible.
 
 .SH COPYRIGHT
-© 2003--2019 Sandia Corporation
+© 2003--2020 Sandia Corporation
 
 This package is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License version 2 as
diff --git a/doc/msi2lmp.1 b/doc/msi2lmp.1
index 08a442e1de..e1a8c8a2f3 100644
--- a/doc/msi2lmp.1
+++ b/doc/msi2lmp.1
@@ -31,7 +31,7 @@ of benzene, you have to provide the files 'benzene.car' and 'benzene.mdf'
 in the current working directory.
 .B msi2lmp
 will then read and process those files according to its remaining settings.
-All other settins are optional and have defaults as listed.
+All other settings are optional and have defaults as listed.
 .TP
 \fB\-c <I,1,II,2,O,0>\fR, \fB\-class <I,1,II,2,O,0>\fR
 The \-c or \-class option selects the force field class, i.e which pair
diff --git a/doc/src/2001/README.html b/doc/src/2001/README.html
index d36aa917aa..d57897cd27 100644
--- a/doc/src/2001/README.html
+++ b/doc/src/2001/README.html
@@ -10,7 +10,7 @@ LAMMPS</H2>
 LAMMPS = Large-scale Atomic/Molecular Massively Parallel Simulator</P>
 <P>
 This is the documentation for the LAMMPS 2001 version, written in F90,
-which has been superceded by more current versions.  See the <A
+which has been superseded by more current versions.  See the <A
 HREF="http://www.cs.sandia.gov/~sjplimp/lammps.html">LAMMPS WWW
 Site</A> for more information.
 <P>
diff --git a/doc/src/2001/basics.html b/doc/src/2001/basics.html
index 24ac6de4ca..343fd8d129 100644
--- a/doc/src/2001/basics.html
+++ b/doc/src/2001/basics.html
@@ -47,7 +47,7 @@ directories: </P>
 <P>
 The src directory contains the F90 and C source files for LAMMPS as 
 well as several sample Makefiles for different machines. To make LAMMPS 
-for a specfic machine, you simply type</P>
+for a specific machine, you simply type</P>
 <P>
 make machine</P>
 <P>
diff --git a/doc/src/2001/input_commands.html b/doc/src/2001/input_commands.html
index 797d6bec4e..62ef5a5120 100644
--- a/doc/src/2001/input_commands.html
+++ b/doc/src/2001/input_commands.html
@@ -1079,7 +1079,7 @@ for style aveforce, average force on the group of fixed atoms is computed,
   to new total value -> has effect of applying same force to entire group
   of atoms
 thermostatting constraints (rescale, hoover/drag, langevin) cannot be used in
-  conjuction with global &quot;temp control&quot;, since they conflict and will
+  conjunction with global &quot;temp control&quot;, since they conflict and will
   cause atom velocities to be reset twice
 thermostatting constraints (rescale, hoover/drag, langevin) cannot be used
   when performing a minimization
@@ -1089,7 +1089,7 @@ meaning of rescale and Langevin thermostatting coefficients is same as in
   &quot;temp control&quot; command
 for rescale style, it can be used as a coarse temperature rescaler,
   for example &quot;rescale 200.0 300.0 100 10.0 1.0&quot; will ramp the temperature
-  up during the simulation, resetting it to the target temperatue as needed
+  up during the simulation, resetting it to the target temperature as needed
 for rescale style, it can be used to create an instantaneous
   drag force that slowly rescales the temperature without oscillation,
   for example &quot;rescale 300.0 300.0 1 0.0 0.0001&quot; will force (or keep) 
@@ -1952,7 +1952,7 @@ for rescale style, the amount of rescaling is contfolled by the fractional
   to halfway between the current and target temperature
 for rescale style, it can be used as a coarse temperature rescaler,
   for example "rescale 200.0 300.0 100 10.0 1.0" will ramp the temperature
-  up during the simulation, resetting it to the target temperatue as needed
+  up during the simulation, resetting it to the target temperature as needed
 for rescale style, it can be used to create an instantaneous
   drag force that slowly rescales the temperature without oscillation,
   for example "rescale 300.0 300.0 1 0.0 0.0001" will force (or keep) 
diff --git a/doc/src/99/README.html b/doc/src/99/README.html
index 528c1e161d..d85f23970f 100644
--- a/doc/src/99/README.html
+++ b/doc/src/99/README.html
@@ -10,7 +10,7 @@ LAMMPS</H2>
 LAMMPS = Large-scale Atomic/Molecular Massively Parallel Simulator</P>
 <P>
 This is the documentation for the LAMMPS 99 version, written in F77,
-which has been superceded by more current versions.  See the <A
+which has been superseded by more current versions.  See the <A
 HREF="http://www.cs.sandia.gov/~sjplimp/lammps.html">LAMMPS WWW
 Site</A> for more information.
 <P>
diff --git a/doc/src/99/basics.html b/doc/src/99/basics.html
index b6236f4bf9..ef85d35b14 100644
--- a/doc/src/99/basics.html
+++ b/doc/src/99/basics.html
@@ -45,7 +45,7 @@ directories: </P>
 <P>
 The src directory contains the F77 and C source files for LAMMPS as 
 well as several sample Makefiles for different machines. To make LAMMPS 
-for a specfic machine, you simply type</P>
+for a specific machine, you simply type</P>
 <P>
 make machine</P>
 <P>
diff --git a/doc/src/99/input_commands.html b/doc/src/99/input_commands.html
index baea02b5c2..5ece32d52b 100644
--- a/doc/src/99/input_commands.html
+++ b/doc/src/99/input_commands.html
@@ -430,7 +430,7 @@ accuracy criterion effectively determines how many k-space vectors are used
 for PPPM, accuracy criterion determines mesh spacing (see &quot;particle mesh&quot;
   command)
 for PPPM, must be running on power-of-2 number of processors for FFTs
-must use periodic boundary conditions in conjuction with Ewald and PPPM
+must use periodic boundary conditions in conjunction with Ewald and PPPM
 cannot use any styles other than none with nonbond style = lj/shift or
   nonbond style = soft
 Coulomb style = smooth should be used with nonbond style = lj/switch,
@@ -772,7 +772,7 @@ for style aveforce, average force on the group of fixed atoms is computed,
   to new total value -&gt; has effect of applying same force to entire group
   of atoms
 thermostatting constraints (rescale, langevin, nose/hoover) cannot be used in
-  conjuction with global &quot;temp control&quot;, since they conflict and will
+  conjunction with global &quot;temp control&quot;, since they conflict and will
   cause atom velocities to be reset twice
 if multiple Langevin constraints are specified the Marsaglia RNG will
   only use the last RNG seed specified for initialization
diff --git a/doc/src/Build.rst b/doc/src/Build.rst
index 2eba3ddd48..c96fb0b5b9 100644
--- a/doc/src/Build.rst
+++ b/doc/src/Build.rst
@@ -8,7 +8,6 @@ for use with GNU make or gmake, or a build environment generated by CMake
 alternative you can download a package with pre-built executables
 as described on the :doc:`Install <Install>` doc page.
 
-
 .. toctree::
    :maxdepth: 1
 
@@ -21,8 +20,3 @@ as described on the :doc:`Install <Install>` doc page.
    Build_extras
    Build_windows
    Build_development
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/Build_basics.rst b/doc/src/Build_basics.rst
index cf77c81e69..8ad48b0810 100644
--- a/doc/src/Build_basics.rst
+++ b/doc/src/Build_basics.rst
@@ -10,155 +10,186 @@ CMake and make:
 * :ref:`Build the LAMMPS documentation <doc>`
 * :ref:`Install LAMMPS after a build <install>`
 
-
 ----------
 
-
 .. _serial:
 
 Serial vs parallel build
 -------------------------------------
 
-LAMMPS can be built to run in parallel using the ubiquitous `MPI (message-passing interface) <https://en.wikipedia.org/wiki/Message_Passing_Interface>`_
-library.  Or it can built to run on a single processor (serial)
-without MPI.  It can also be built with support for OpenMP threading
-(see more discussion below).
+LAMMPS is written to use the ubiquitous `MPI (Message Passing Interface)
+<https://en.wikipedia.org/wiki/Message_Passing_Interface>`_ library API
+for distributed memory parallel computation.  You need to have such a
+library installed for building and running LAMMPS in parallel using a
+domain decomposition parallelization.  It is compatible with the MPI
+standard version 2.x and later.  LAMMPS can also be built into a
+"serial" executable for use with a single processor using the bundled
+MPI STUBS library.
 
-**CMake variables**\ :
+Independent of the distributed memory MPI parallelization, parts of
+LAMMPS are also written with support for shared memory parallelization
+using the OpenMP threading standard. A more detailed discussion of that
+is below.
 
+**CMake build**\ :
 
-.. parsed-literal::
+.. code-block:: bash
 
    -D BUILD_MPI=value        # yes or no, default is yes if CMake finds MPI, else no
-   -D BUILD_OMP=value        # yes or no (default)
+   -D BUILD_OMP=value        # yes or no, default is yes if a compatible compiler is detected
    -D LAMMPS_MACHINE=name    # name = mpi, serial, mybox, titan, laptop, etc
                              # no default value
 
-The executable created by CMake (after running make) is lmp\_name.  If
-the LAMMPS\_MACHINE variable is not specified, the executable is just
-lmp.  Using BUILD\_MPI=no will produce a serial executable.
+The executable created by CMake (after running make) is named ``lmp`` unless
+the LAMMPS_MACHINE option is set.  When setting ``LAMMPS_MACHINE=name``
+the executable will be called ``lmp_name``.  Using ``BUILD_MPI=no`` will
+enforce building a serial executable using the MPI STUBS library.
 
 **Traditional make**\ :
 
+The build with traditional makefiles has to be done inside the source folder ``src``.
 
-.. parsed-literal::
+.. code-block:: bash
 
-   cd lammps/src
    make mpi                # parallel build, produces lmp_mpi using Makefile.mpi
    make serial             # serial build, produces lmp_serial using Makefile/serial
-   make mybox          # uses Makefile.mybox to produce lmp_mybox
+   make mybox              # uses Makefile.mybox to produce lmp_mybox
 
-Serial build (see src/MAKE/Makefile.serial):
+Any "make machine" command will look up the make settings from a file
+Makefile.machine, create a folder Obj_machine with all objects and
+generated files and an executable called ``lmp_machine``\ .  The standard
+parallel build with ``make mpi`` assumes a standard MPI installation with
+MPI compiler wrappers where all necessary compiler and linker flags to
+get access and link with the suitable MPI headers and libraries are set
+by the wrapper programs.  For other cases or the serial build, you have
+to adjust the make file variables ``MPI_INC``, ``MPI_PATH``, ``MPI_LIB``
+as well as ``CC`` and ``LINK``\ .  To enable OpenMP threading usually
+a compiler specific flag needs to be added to the compile and link
+commands.  For the GNU compilers, this is ``-fopenmp``\ , which can be
+added to the ``CC`` and ``LINK`` makefile variables.
 
+For the serial build the following make variables are set (see src/MAKE/Makefile.serial):
 
-.. parsed-literal::
+.. code-block:: make
 
+   CC =            g++
+   LINK =          g++
    MPI_INC =       -I../STUBS
    MPI_PATH =      -L../STUBS
    MPI_LIB =       -lmpi_stubs
 
-For a parallel build, if MPI is installed on your system in the usual
-place (e.g. under /usr/local), you do not need to specify the 3
-variables MPI\_INC, MPI\_PATH, MPI\_LIB.  The MPI wrapper on the compiler
-(e.g. mpicxx, mpiCC) knows where to find the needed include and
-library files.  Failing this, these 3 variables can be used to specify
-where the mpi.h file (MPI\_INC), and the MPI library files (MPI\_PATH)
-are found, and the name of the library files (MPI\_LIB).
+You also need to build the STUBS library for your platform before making
+LAMMPS itself.  A ``make serial`` build does this for you automatically,
+otherwise, type ``make mpi-stubs`` from the src directory, or ``make`` from
+the src/STUBS dir.  If the build fails, you will need to edit the
+STUBS/Makefile for your platform.  The stubs library does not provide
+MPI/IO functions required by some LAMMPS packages, e.g. MPIIO or USER-LB,
+and thus is not compatible with those packages.
 
-For a serial build, you need to specify the 3 variables, as shown
-above.
+.. note::
 
-For a serial LAMMPS build, use the dummy MPI library provided in
-src/STUBS.  You also need to build the STUBS library for your platform
-before making LAMMPS itself.  A "make serial" build does this for.
-Otherwise, type "make mpi-stubs" from the src directory, or "make"
-from the src/STUBS dir.  If the build fails, you will need to edit the
-STUBS/Makefile for your platform.
+   The file ``src/STUBS/mpi.c`` provides a CPU timer function called
+   MPI_Wtime() that calls gettimeofday() .  If your operating system
+   does not support gettimeofday() , you will need to insert code to
+   call another timer.  Note that the ANSI-standard function clock()
+   rolls over after an hour or so, and is therefore insufficient for
+   timing long LAMMPS simulations.
 
-The file STUBS/mpi.c provides a CPU timer function called MPI\_Wtime()
-that calls gettimeofday() .  If your system doesn't support
-gettimeofday() , you'll need to insert code to call another timer.
-Note that the ANSI-standard function clock() rolls over after an hour
-or so, and is therefore insufficient for timing long LAMMPS
-simulations.
+**MPI and OpenMP support info**\ :
 
-**CMake and make info**\ :
+If you are installing MPI yourself to build a parallel LAMMPS
+executable, we recommend either MPICH or OpenMPI which are regularly
+used and tested with LAMMPS by the LAMMPS developers.  MPICH can be
+downloaded from the `MPICH home page <https://www.mpich.org>`_ and
+OpenMPI can be downloaded correspondingly from the `OpenMPI home page
+<https://www.open-mpi.org>`_.  Other MPI packages should also work.  No
+specific vendor provided and standard compliant MPI library is currently
+known to be incompatible with LAMMPS.  If you are running on a large
+parallel machine, your system admins or the vendor should have already
+installed a version of MPI, which is likely to be faster than a
+self-installed MPICH or OpenMPI, so you should study the provided
+documentation to find out how to build and link with it.
 
-If you are installing MPI yourself, we recommend MPICH2 from Argonne
-National Laboratory or OpenMPI.  MPICH can be downloaded from the
-`Argonne MPI site <http://www.mcs.anl.gov/research/projects/mpich2/>`_.
-OpenMPI can be downloaded from the `OpenMPI site <http://www.open-mpi.org>`_.  Other MPI packages should also work.
-If you are running on a large parallel machine, your system admins or
-the vendor should have already installed a version of MPI, which is
-likely to be faster than a self-installed MPICH or OpenMPI, so find
-out how to build and link with it.
-
-The majority of OpenMP (threading) support in LAMMPS is provided by
-the USER-OMP package; see the :doc:`Speed omp <Speed_omp>` doc page for
-details. The USER-INTEL package also provides OpenMP support (it is
+The majority of OpenMP (threading) support in LAMMPS is provided by the
+USER-OMP package; see the :doc:`Speed omp <Speed_omp>` doc page for
+details. The USER-INTEL package also includes OpenMP threading (it is
 compatible with USER-OMP) and adds vectorization support when compiled
-with the Intel compilers on top of that. Also, the KOKKOS package can
-be compiled for using OpenMP threading.
+with compatible compilers, in particular the Intel compilers on top of
+OpenMP. Also, the KOKKOS package can be compiled to include OpenMP
+threading.
 
-However, there are a few commands in LAMMPS that have native OpenMP
-support.  These are commands in the MPIIO, SNAP, USER-DIFFRACTION, and
-USER-DPD packages.  In addition some packages support OpenMP threading
-indirectly through the libraries they interface to: e.g. LATTE and
-USER-COLVARS.  See the :doc:`Packages details <Packages_details>` doc
-page for more info on these packages and the doc pages for their
-respective commands for OpenMP threading info.
+In addition, there are a few commands in LAMMPS that have native OpenMP
+support included as well.  These are commands in the MPIIO, SNAP,
+USER-DIFFRACTION, and USER-DPD packages.  In addition some packages
+support OpenMP threading indirectly through the libraries they interface
+to: e.g. LATTE and USER-COLVARS.  See the :doc:`Packages details
+<Packages_details>` doc page for more info on these packages and the doc
+pages for their respective commands for OpenMP threading info.
 
-For CMake, if you use BUILD\_OMP=yes, you can use these packages and
-turn on their native OpenMP support and turn on their native OpenMP
-support at run time, by setting the OMP\_NUM\_THREADS environment
+For CMake, if you use ``BUILD_OMP=yes``, you can use these packages
+and turn on their native OpenMP support and turn on their native OpenMP
+support at run time, by setting the ``OMP_NUM_THREADS`` environment
 variable before you launch LAMMPS.
 
-For building via conventional make, the CCFLAGS and LINKFLAGS
+For building via conventional make, the ``CCFLAGS`` and ``LINKFLAGS``
 variables in Makefile.machine need to include the compiler flag that
-enables OpenMP. For GNU compilers it is -fopenmp.  For (recent) Intel
-compilers it is -qopenmp.  If you are using a different compiler,
+enables OpenMP. For GNU compilers it is ``-fopenmp``\ .  For (recent) Intel
+compilers it is ``-qopenmp``\ .  If you are using a different compiler,
 please refer to its documentation.
 
 .. _default-none-issues:
 
-**OpenMP Compiler compatibility info**\ : 
+**OpenMP Compiler compatibility info**\ :
 
-Some compilers do not fully support the 'default(none)' directive
+Some compilers do not fully support the ``default(none)`` directive
 and others (e.g. GCC version 9 and beyond) may implement OpenMP 4.0
-semantics, which are incompatible with the OpenMP 3.1 directives used
+semantics, which are incompatible with the OpenMP 3.1 semantics used
 in LAMMPS (for maximal compatibility with compiler versions in use).
-In those case, all 'default(none)' directives (which aid in detecting
-incorrect and unwanted sharing) can be replaced with 'default(shared)'
-while dropping all 'shared()' directives. The script
-'src/USER-OMP/hack\_openmp\_for\_pgi\_gcc9.sh' can be used to automate
+In those case, all ``default(none)`` directives (which aid in detecting
+incorrect and unwanted sharing) can be replaced with ``default(shared)``
+while dropping all ``shared()`` directives. The script
+'src/USER-OMP/hack_openmp_for_pgi_gcc9.sh' can be used to automate
 this conversion.
 
-
 ----------
 
-
 .. _compile:
 
 Choice of compiler and compile/link options
 ---------------------------------------------------------
 
 The choice of compiler and compiler flags can be important for
-performance.  Vendor compilers can produce faster code than
-open-source compilers like GNU.  On boxes with Intel CPUs, we suggest
-trying the `Intel C++ compiler <intel_>`_.
+performance.  Vendor provided compilers for a specific hardware can
+produce faster code than open-source compilers like the GNU compilers.
+On x86 hardware most popular compilers are quite similar in performance
+of C/C++ code at high optimization levels.  When using the USER-INTEL
+package, there is a distinct advantage in using the `Intel C++ compiler
+<intel_>`_ due to much improved vectorization through SSE and AVX
+instructions on compatible hardware as the source code includes changes
+and compiler directives to enable high degrees of vectorization.
 
 .. _intel: https://software.intel.com/en-us/intel-compilers
 
+On parallel clusters or supercomputers which use "environment modules"
+for their compile/link environments, you can often access different
+compilers by simply loading the appropriate module before building
+LAMMPS.
 
+**CMake build**\ :
 
-On parallel clusters or supercomputers which use "modules" for their
-compile/link environments, you can often access different compilers by
-simply loading the appropriate module before building LAMMPS.
+By default CMake will use a compiler it finds and it will add
+optimization flags appropriate to that compiler and any
+:doc:`accelerator packages <Speed_packages>` you have included in the
+build.
 
-**CMake variables**\ :
+You can tell CMake to look for a specific compiler with these variable
+settings.  Likewise you can specify the corresponding ``CMAKE_*_FLAGS``
+variables if you want to experiment with alternate optimization flags.
+You should specify all 3 compilers, so that the small number of LAMMPS
+source files written in C or Fortran are built with a compiler consistent
+with the one used for all the C++ files:
 
-
-.. parsed-literal::
+.. code-block:: bash
 
    -D CMAKE_CXX_COMPILER=name            # name of C++ compiler
    -D CMAKE_C_COMPILER=name              # name of C compiler
@@ -168,42 +199,49 @@ simply loading the appropriate module before building LAMMPS.
    -D CMAKE_C_FLAGS=string               # flags to use with C compiler
    -D CMAKE_Fortran_FLAGS=string         # flags to use with Fortran compiler
 
-By default CMake will use a compiler it finds and it will add
-optimization flags appropriate to that compiler and any :doc:`accelerator packages <Speed_packages>` you have included in the build.
+A few example command lines are:
 
-You can tell CMake to look for a specific compiler with these variable
-settings.  Likewise you can specify the FLAGS variables if you want to
-experiment with alternate optimization flags.  You should specify all
-3 compilers, so that the small number of LAMMPS source files written
-in C or Fortran are built with a compiler consistent with the one used
-for all the C++ files:
+.. code-block:: bash
 
-
-.. parsed-literal::
-
-   Building with GNU Compilers:
+   # Building with GNU Compilers:
    cmake ../cmake -DCMAKE_C_COMPILER=gcc -DCMAKE_CXX_COMPILER=g++ -DCMAKE_Fortran_COMPILER=gfortran
-   Building with Intel Compilers:
+   # Building with Intel Compilers:
    cmake ../cmake -DCMAKE_C_COMPILER=icc -DCMAKE_CXX_COMPILER=icpc -DCMAKE_Fortran_COMPILER=ifort
-   Building with LLVM/Clang Compilers:
+   # Building with LLVM/Clang Compilers:
    cmake ../cmake -DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++ -DCMAKE_Fortran_COMPILER=flang
 
+For compiling with the Clang/LLVM compilers a special CMake preset is
+included that can be loaded with `-C ../cmake/presets/clang.cmake`.
+
+In addition you can set ``CMAKE_TUNE_FLAGS`` to specifically add compiler
+flags to tune for optimal performance on given hosts. By default these are
+initialized to some compiler specific flags, where known, to optimize the
+LAMMPS executable with optimizations and instructions available on the host
+where LAMMPS is compiled. For example, for Intel compilers this would be
+``-xHost`` and for GNU compilers this would be ``-march=native``. To turn
+these flags off, set ``-D CMAKE_TUNE_FLAGS=``.
+
 .. note::
 
-   When the cmake command completes, it prints info to the screen
-   as to which compilers it is using, and what flags will be used in the
-   compilation.  Note that if the top-level compiler is mpicxx, it is
-   simply a wrapper on a real compiler.  The underlying compiler info is
-   what will be listed in the CMake output.  You should check to insure
-   you are using the compiler and optimization flags are the ones you
-   want.
+   When the cmake command completes, it prints a summary to the screen
+   which compilers it is using and what flags and settings will be used
+   for the  compilation.  Note that if the top-level compiler is mpicxx,
+   it is simply a wrapper on a real compiler.  The underlying compiler
+   info is what CMake will try to determine and report.  You should check
+   to confirm you are using the compiler and optimization flags you want.
 
-**Makefile.machine settings**\ :
+**Makefile.machine settings for traditional make**\ :
+
+The "compiler/linker settings" section of a Makefile.machine lists
+compiler and linker settings for your C++ compiler, including
+optimization flags.  For a parallel build it is recommended to use
+mpicxx or mpiCC, since these compiler wrappers will include a variety of
+settings appropriate for your MPI installation and thus avoiding the
+guesswork of finding the right flags.
 
 Parallel build (see src/MAKE/Makefile.mpi):
 
-
-.. parsed-literal::
+.. code-block:: bash
 
    CC =            mpicxx
    CCFLAGS =       -g -O3
@@ -212,33 +250,26 @@ Parallel build (see src/MAKE/Makefile.mpi):
 
 Serial build (see src/MAKE/Makefile.serial):
 
-
-.. parsed-literal::
+.. code-block:: make
 
    CC =            g++
    CCFLAGS =       -g -O3
    LINK =          g++
    LINKFLAGS =     -g -O
 
-The "compiler/linker settings" section of a Makefile.machine lists
-compiler and linker settings for your C++ compiler, including
-optimization flags.  You should always use mpicxx or mpiCC for
-a parallel build, since these compiler wrappers will include
-a variety of settings appropriate for your MPI installation.
-
 .. note::
 
-   If you build LAMMPS with any :doc:`accelerator packages <Speed_packages>` included, they have specific
-   optimization flags that are either required or recommended for optimal
-   performance.  You need to include these in the CCFLAGS and LINKFLAGS
-   settings above.  For details, see the individual package doc pages
-   listed on the :doc:`Speed packages <Speed_packages>` doc page.  Or
-   examine these files in the src/MAKE/OPTIONS directory.  They
-   correspond to each of the 5 accelerator packages and their hardware
-   variants:
+   If you build LAMMPS with any :doc:`accelerator packages <Speed_packages>`
+   included, there may be specific optimization flags that are either
+   required or recommended to enable required features and to achieve
+   optimal performance.  You need to include these in the CCFLAGS and
+   LINKFLAGS settings above.  For details, see the individual package
+   doc pages listed on the :doc:`Speed packages <Speed_packages>` doc
+   page.  Or examine these files in the src/MAKE/OPTIONS directory.
+   They correspond to each of the 5 accelerator packages and their
+   hardware variants:
 
-
-.. parsed-literal::
+.. code-block:: bash
 
    Makefile.opt                   # OPT package
    Makefile.omp                   # USER-OMP package
@@ -249,10 +280,8 @@ a variety of settings appropriate for your MPI installation.
    Makefile.kokkos_omp            # KOKKOS package for CPUs (OpenMP)
    Makefile.kokkos_phi            # KOKKOS package for KNLs (OpenMP)
 
-
 ----------
 
-
 .. _exe:
 
 Build LAMMPS as an executable or a library
@@ -265,10 +294,13 @@ page for more info on coupling LAMMPS to other codes.  See the
 :doc:`Python <Python_head>` doc page for more info on wrapping and
 running LAMMPS from Python via its library interface.
 
-**CMake variables**\ :
+**CMake build**\ :
 
+For CMake builds, you can select through setting CMake variables which
+files the compilation produces during the configuration step.  If none
+are set, defaults are applied.
 
-.. parsed-literal::
+.. code-block:: bash
 
    -D BUILD_EXE=value           # yes (default) or no
    -D BUILD_LIB=value           # yes or no (default)
@@ -276,25 +308,32 @@ running LAMMPS from Python via its library interface.
    -D LAMMPS_LIB_SUFFIX=name    # name = mpi, serial, mybox, titan, laptop, etc
                                 # no default value
 
-Setting BUILD\_EXE=no will not produce an executable.  Setting
-BUILD\_LIB=yes will produce a static library named liblammps.a.
-Setting both BUILD\_LIB=yes and BUILD\_SHARED\_LIBS=yes will produce a
-shared library named liblammps.so. If LAMMPS\_LIB\_SUFFIX is set the generated
-libraries will be named liblammps\_name.a or liblammps\_name.so instead.
+Setting ``BUILD_EXE=no`` will not produce an executable.  Setting
+``BUILD_LIB=yes`` will produce a static library named ``liblammps.a``\ .
+Setting both ``BUILD_LIB=yes`` and ``BUILD_SHARED_LIBS=yes`` will produce a
+shared library named ``liblammps.so`` instead. If ``LAMMPS_LIB_SUFFIX=name``
+is set in addition, the name of the generated libraries will be changed to
+either ``liblammps_name.a`` or ``liblammps_name.so``\ , respectively.
 
 **Traditional make**\ :
 
+With the traditional makefile based build process, the choice of
+the generated executable or library depends on the "mode" setting.
+Several options are available and ``mode=exe`` is the default.
 
-.. parsed-literal::
+.. code-block:: bash
 
-   cd lammps/src
    make machine               # build LAMMPS executable lmp_machine
+   make mode=exe machine      # same as "make machine"
    make mode=lib machine      # build LAMMPS static lib liblammps_machine.a
    make mode=shlib machine    # build LAMMPS shared lib liblammps_machine.so
+   make mode=shexe machine    # same as "mode=exe" but uses objects from "mode=shlib"
 
-The two library builds also create generic soft links, named
-liblammps.a and liblammps.so, which point to the liblammps\_machine
-files.
+The two "exe" builds will generate and executable ``lmp_machine``\ ,
+while the two library builds will create a file ``liblammps_machine.a``
+or ``liblammps_machine.so``\ . They will also create generic soft links,
+named ``liblammps.a`` and ``liblammps.so``\ , which point to the specific
+``liblammps_machine.a/so`` files.
 
 **CMake and make info**\ :
 
@@ -302,76 +341,100 @@ Note that for a shared library to be usable by a calling program, all
 the auxiliary libraries it depends on must also exist as shared
 libraries.  This will be the case for libraries included with LAMMPS,
 such as the dummy MPI library in src/STUBS or any package libraries in
-the lib/packages directory, since they are always built as shared
-libraries using the -fPIC switch.  However, if a library like MPI or
-FFTW does not exist as a shared library, the shared library build will
-generate an error.  This means you will need to install a shared
-library version of the auxiliary library.  The build instructions for
-the library should tell you how to do this.
+the lib/packages directory, since they are always built in a shared
+library compatible way using the ``-fPIC`` switch.  However, if a library
+like MPI or FFTW does not exist as a shared library, the shared library
+build may generate an error.  This means you will need to install a
+shared library version of the auxiliary library.  The build instructions
+for the library should tell you how to do this.
 
-As an example, here is how to build and install the `MPICH library <mpich_>`_, a popular open-source version of MPI, distributed by
-Argonne National Lab, as a shared library in the default
-/usr/local/lib location:
+As an example, here is how to build and install the `MPICH library
+<mpich_>`_, a popular open-source version of MPI, as a shared library
+in the default /usr/local/lib location:
 
-.. _mpich: http://www-unix.mcs.anl.gov/mpi
+.. _mpich: https://www.mpich.org
 
-
-
-
-.. parsed-literal::
+.. code-block:: bash
 
    ./configure --enable-shared
    make
    make install
 
-You may need to use "sudo make install" in place of the last line if
-you do not have write privileges for /usr/local/lib.  The end result
-should be the file /usr/local/lib/libmpich.so.
+You may need to use ``sudo make install`` in place of the last line if you
+do not have write privileges for ``/usr/local/lib``.  The end result should
+be the file ``/usr/local/lib/libmpich.so``.  On many Linux installations the
+folder ``${HOME}/.local`` is an alternative to using ``/usr/local`` and does
+not require superuser or sudo access.  In that case the configuration
+step becomes:
 
+.. code-block:: bash
+
+  ./configure --enable-shared --prefix=${HOME}/.local
+
+Avoiding using "sudo" for custom software installation (i.e. from source
+and not through a package manager tool provided by the OS) is generally
+recommended to ensure the integrity of the system software installation.
 
 ----------
 
-
 .. _doc:
 
 Build the LAMMPS documentation
 ----------------------------------------
 
-**CMake variable**\ :
+The LAMMPS manual is written in `reStructuredText <rst_>`_ format which
+can be translated to different output format using the `Sphinx <sphinx_>`_
+document generator tool.  Currently the translation to HTML and PDF (via
+LaTeX) are supported.  For that to work a Python 3 interpreter and
+internet access is required.  For the documentation build a python
+based virtual environment is set up in the folder doc/docenv and various
+python packages are installed into that virtual environment via the pip
+tool.  The actual translation is then done via make commands.
 
+.. _rst: https://docutils.readthedocs.io/en/sphinx-docs/user/rst/quickstart.html
+.. _sphinx: https://sphinx-doc.org
 
-.. parsed-literal::
+**Documentation make option**\ :
 
-   -D BUILD_DOC=value       # yes or no (default)
+The following make commands can be issued in the doc folder of the
+LAMMPS source distribution.
 
-This will create the HTML doc pages within the CMake build directory.
-The reason to do this is if you want to "install" LAMMPS on a system
-after the CMake build via "make install", and include the doc pages in
-the install.
+.. code-block:: bash
 
-**Traditional make**\ :
+  make html          # create HTML doc pages in html directory
+  make pdf           # create Developer.pdf and Manual.pdf in this directory
+  make fetch         # fetch HTML and PDF files from LAMMPS web site
+  make clean         # remove all intermediate files
+  make clean-all     # reset the entire doc build environment
+  make anchor_check  # scan for duplicate anchor labels
+  make style_check   # check for complete and consistent style lists
+  make package_check # check for complete and consistent package lists
+  make spelling      # spell-check the manual
 
-
-.. parsed-literal::
-
-   cd lammps/doc
-   make html       # html doc pages
-   make pdf        # single Manual.pdf file
-
-This will create a lammps/doc/html dir with the HTML doc pages so that
-you can browse them locally on your system.  Type "make" from the
-lammps/doc dir to see other options.
+Thus "make html" will create a "doc/html" directory with the HTML format
+manual pages so that you can browse them with a web browser locally on
+your system.
 
 .. note::
 
    You can also download a tarball of the documentation for the
    current LAMMPS version (HTML and PDF files), from the website
-   `download page <http://lammps.sandia.gov/download.html>`_.
+   `download page <https://lammps.sandia.gov/download.html>`_.
 
+**CMake build option**\ :
+
+It is also possible to create the HTML version of the manual within
+the :doc:`CMake build directory <Build_cmake>`.  The reason for this
+option is to include the installation of the HTML manual pages into
+the "install" step when installing LAMMPS after the CMake build via
+``make install``.
+
+.. code-block:: bash
+
+   -D BUILD_DOC=value       # yes or no (default)
 
 ----------
 
-
 .. _tools:
 
 Build LAMMPS tools
@@ -380,19 +443,18 @@ Build LAMMPS tools
 Some tools described in :doc:`Auxiliary tools <Tools>` can be built directly
 using CMake or Make.
 
-**CMake variable**\ :
+**CMake build3**\ :
 
-
-.. parsed-literal::
+.. code-block:: bash
 
    -D BUILD_TOOLS=value       # yes or no (default)
 
-The generated binaries will also become part of the LAMMPS installation (see below)
+The generated binaries will also become part of the LAMMPS installation
+(see below).
 
 **Traditional make**\ :
 
-
-.. parsed-literal::
+.. code-block:: bash
 
    cd lammps/tools
    make all              # build all binaries of tools
@@ -401,10 +463,8 @@ The generated binaries will also become part of the LAMMPS installation (see bel
    make micelle2d        # build only micelle2d tool
    make thermo_extract   # build only thermo_extract tool
 
-
 ----------
 
-
 .. _install:
 
 Install LAMMPS after a build
@@ -416,10 +476,9 @@ a globally visible place on your system, for others to access.  Note
 that you may need super-user privileges (e.g. sudo) if the directory
 you want to copy files to is protected.
 
-**CMake variable**\ :
+**CMake build**\ :
 
-
-.. parsed-literal::
+.. code-block:: bash
 
    cmake -D CMAKE_INSTALL_PREFIX=path [options ...] ../cmake
    make                        # perform make after CMake command
@@ -427,11 +486,6 @@ you want to copy files to is protected.
 
 **Traditional make**\ :
 
-There is no "install" option in the src/Makefile for LAMMPS.  If you
-wish to do this you will need to first build LAMMPS, then manually
+There is no "install" option in the ``src/Makefile`` for LAMMPS.  If
+you wish to do this you will need to first build LAMMPS, then manually
 copy the desired LAMMPS files to the appropriate system directories.
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/Build_cmake.rst b/doc/src/Build_cmake.rst
index 78459bb990..7a60ffa437 100644
--- a/doc/src/Build_cmake.rst
+++ b/doc/src/Build_cmake.rst
@@ -9,68 +9,67 @@ Richard Berger (Temple U) has also written a `more comprehensive guide <https://
 for how to use CMake to build LAMMPS.  If you are new to CMake it is a
 good place to start.
 
-
 ----------
 
-
 Building LAMMPS with CMake is a two-step process.  First you use CMake
 to create a build environment in a new directory.  On Linux systems,
-this will be based on makefiles for use with make.  Then you use the
-make command to build LAMMPS, which uses the created
+this will be by default based on Unix-style makefiles for use with make.
+Then you use the *make* command to build LAMMPS, which uses the created
 Makefile(s). Example:
 
-
-.. parsed-literal::
+.. code-block:: bash
 
    cd lammps                        # change to the LAMMPS distribution directory
    mkdir build; cd build            # create a new directory (folder) for build
    cmake [options ...] ../cmake     # configuration with (command-line) cmake
-   make                             # compilation
+   cmake --build .                  # compilation (or type "make")
 
-The cmake command will detect available features, enable selected
+The ``cmake`` command will detect available features, enable selected
 packages and options, and will generate the build environment.  By default
 this build environment will be created for "Unix Makefiles" on most
 platforms and particularly on Linux.  However, alternate build tools
-(e.g. Ninja) and support files for Integrated Development Environments
-(IDE) like Eclipse, CodeBlocks, or Kate can be generated, too. This is
-selected via the "-G" command line flag. For the rest of the documentation
-we will assume that the build environment is generated for makefiles
-and thus the make command will be used to compile and link LAMMPS as
-indicated above, producing (by default) an executable called "lmp" and
-a library called "liblammps.a" in the "build" folder.  When generating
-a build environment for the "Ninja" build tool, the build command would
-be "ninja" instead of "make".
+(e.g. Ninja) and project files for Integrated Development Environments
+(IDEs) like Eclipse, CodeBlocks, or Kate can be generated, too. This is
+selected via the ``-G`` command line flag. Further details about features
+and settings for CMake are in the `CMake online documentation <cmake_doc_>`_
 
-If your machine has multiple CPU cores (most do these days), using a
-command like "make -jN" (with N being the number of available local
-CPU cores) can be much faster.  If you plan to do development on
-LAMMPS or need to re-compile LAMMPS repeatedly, installation of the
-ccache (= Compiler Cache) software may speed up repeated compilation
-even more.
+.. _cmake_doc: https://cmake.org/documentation/
+
+For the rest of the documentation
+we will assume that the build environment is generated for "Unix Makefiles"
+and thus the ``make`` command will be used to compile and link LAMMPS as
+indicated above, producing (by default) an executable called ``lmp`` and
+a library called ``liblammps.a`` in the ``build`` folder.
+
+If your machine has multiple CPU cores (most do these days), you can
+compile sources in parallel with a command like ``make -j N`` (with N
+being the maximum number of concurrently executed tasks).  Also
+installation of the ``ccache`` (= Compiler Cache) software may speed
+up repeated compilation, e.g. during code development, significantly.
 
 After compilation, you may optionally install the LAMMPS executable into
 your system with:
 
-
-.. parsed-literal::
+.. code-block:: bash
 
    make install    # optional, copy LAMMPS executable & library elsewhere
 
 This will install the lammps executable and library (if requested), some
 tools (if configured) and additional files like library API headers,
 manpages, potential and force field files. The location of the installation
-tree is set by the CMake variable "CMAKE\_INSTALL\_PREFIX" which defaults
+tree is set by the CMake variable "CMAKE_INSTALL_PREFIX" which defaults
 to ${HOME}/.local
 
-
 ----------
 
+.. _cmake_build:
 
-There are 3 variants of CMake: a command-line version (cmake), a text mode
-UI version (ccmake), and a graphical GUI version (cmake-GUI).  You can use
-any of them interchangeably to configure and create the LAMMPS build
-environment.  On Linux all the versions produce a Makefile as their
-output.  See more details on each below.
+There are 3 variants of the CMake command itself: a command-line version
+(``cmake`` or ``cmake3``), a text mode UI version (``ccmake`` or ``ccmake3``),
+and a graphical GUI version (``cmake-gui``).  You can use any of them
+interchangeably to configure and create the LAMMPS build environment.
+On Linux all the versions produce a Makefile as their output by default.
+See more details on each below.
 
 You can specify a variety of options with any of the 3 versions, which
 affect how the build is performed and what is included in the LAMMPS
@@ -80,7 +79,7 @@ the :doc:`Build <Build>` doc page.
 You must perform the CMake build system generation and compilation in
 a new directory you create.  It can be anywhere on your local machine.
 In these Build pages we assume that you are building in a directory
-called "lammps/build".  You can perform separate builds independently
+called ``lammps/build``.  You can perform separate builds independently
 with different options, so long as you perform each of them in a
 separate directory you create.  All the auxiliary files created by one
 build process (executable, object files, log files, etc) are stored in
@@ -88,17 +87,16 @@ this directory or sub-directories within it that CMake creates.
 
 .. note::
 
-   To perform a CMake build, no packages can be installed or a
-   build been previously attempted in the LAMMPS src directory by using
-   "make" commands to :doc:`perform a conventional LAMMPS build <Build_make>`.  CMake detects if this is the case and
-   generates an error, telling you to type "make no-all purge" in the src
-   directory to un-install all packages.  The purge removes all the \*.h
-   files auto-generated by make.
+   To perform a CMake build, no packages can be installed or a build
+   been previously attempted in the LAMMPS src directory by using ``make``
+   commands to :doc:`perform a conventional LAMMPS build <Build_make>`.
+   CMake detects if this is the case and generates an error, telling you
+   to type ``make no-all purge`` in the src directory to un-install all
+   packages.  The purge removes all the \*.h files auto-generated by
+   make.
 
-You must have CMake version 2.8 or later on your system to build
-LAMMPS.  A handful of LAMMPS packages (KOKKOS, LATTE, MSCG) require a
-later version.  CMake will print a message telling you if a later
-version is required.  Installation instructions for CMake are below.
+You must have CMake version 3.10 or later on your system to build
+LAMMPS.  Installation instructions for CMake are below.
 
 After the initial build, if you edit LAMMPS source files, or add your
 own new files to the source directory, you can just re-type make from
@@ -108,30 +106,28 @@ ccmake or cmake-gui) again from the same build directory and alter
 various options; see details below.  Or you can remove the entire build
 folder, recreate the directory and start over.
 
-
 ----------
 
-
 **Command-line version of CMake**\ :
 
+.. code-block:: bash
 
-.. parsed-literal::
-
-   cmake [options ...] /path/to/lammps/cmake  # build from any dir
-   cmake [options ...] ../cmake               # build from lammps/build
+   cmake  [options ...] /path/to/lammps/cmake  # build from any dir
+   cmake  [options ...] ../cmake               # build from lammps/build
+   cmake3 [options ...] ../cmake               # build from lammps/build
 
 The cmake command takes one required argument, which is the LAMMPS
 cmake directory which contains the CMakeLists.txt file.
 
-The argument can be preceeded or followed by various CMake
+The argument can be prefixed or followed by various CMake
 command-line options.  Several useful ones are:
 
-
-.. parsed-literal::
+.. code-block:: bash
 
    -D CMAKE_INSTALL_PREFIX=path  # where to install LAMMPS executable/lib if desired
    -D CMAKE_BUILD_TYPE=type      # type = RelWithDebInfo (default), Release, MinSizeRel, or Debug
-   -G output                     # style of output CMake generates
+   -G output                     # style of output CMake generates (e.g. "Unix Makefiles" or "Ninja")
+   -D CMAKE_MAKE_PROGRAM=builder # name of the builder executable (e.g. when using "gmake" instead of "make")
    -DVARIABLE=value              # setting for a LAMMPS feature to enable
    -D VARIABLE=value             # ditto, but cannot come after CMakeLists.txt dir
    -C path/to/preset/file        # load some CMake settings before configuring
@@ -139,13 +135,13 @@ command-line options.  Several useful ones are:
 All the LAMMPS-specific -D variables that a LAMMPS build supports are
 described on the pages linked to from the :doc:`Build <Build>` doc page.
 All of these variable names are upper-case and their values are
-lower-case, e.g. -D LAMMPS\_SIZES=smallbig.  For boolean values, any of
+lower-case, e.g. -D LAMMPS_SIZES=smallbig.  For boolean values, any of
 these forms can be used: yes/no, on/off, 1/0.
 
 On Unix/Linux machines, CMake generates a Makefile by default to
 perform the LAMMPS build.  Alternate forms of build info can be
 generated via the -G switch, e.g. Visual Studio on a Windows machine,
-Xcode on MacOS, or KDevelop on Linux.  Type "cmake --help" to see the
+Xcode on MacOS, or KDevelop on Linux.  Type ``cmake --help`` to see the
 "Generator" styles of output your system supports.
 
 .. note::
@@ -170,14 +166,11 @@ In these cases it is usually better to first remove all the
 files/directories in the build directory, or start with a fresh build
 directory.
 
-
 ----------
 
-
 **Curses version (terminal-style menu) of CMake**\ :
 
-
-.. parsed-literal::
+.. code-block:: bash
 
    ccmake ../cmake
 
@@ -188,14 +181,11 @@ required to edit some of the entries of CMake configuration variables
 in between.  Please see the `ccmake manual <https://cmake.org/cmake/help/latest/manual/ccmake.1.html>`_ for
 more information.
 
-
 ----------
 
-
 **GUI version of CMake**\ :
 
-
-.. parsed-literal::
+.. code-block:: bash
 
    cmake-gui ../cmake
 
@@ -207,16 +197,13 @@ edit some of the entries of CMake configuration variables in between.
 Please see the `cmake-gui manual <https://cmake.org/cmake/help/latest/manual/cmake-gui.1.html>`_
 for more information.
 
-
 ----------
 
-
 **Installing CMake**
 
 Check if your machine already has CMake installed:
 
-
-.. parsed-literal::
+.. code-block:: bash
 
    which cmake             # do you have it?
    which cmake3            # version 3 may have this name
@@ -225,11 +212,10 @@ Check if your machine already has CMake installed:
 On clusters or supercomputers which use environment modules to manage
 software packages, do this:
 
+.. code-block:: bash
 
-.. parsed-literal::
-
-   module list            # is a cmake module already loaded?
-   module avail           # is a cmake module available?
+   module list            # is a module for cmake already loaded?
+   module avail           # is a module for cmake available?
    module load cmake3     # load cmake module with appropriate name
 
 Most Linux distributions offer pre-compiled cmake packages through
@@ -238,8 +224,3 @@ enough version, you can download the latest version at
 `https://cmake.org/download/ <https://cmake.org/download/>`_.
 Instructions on how to install it on various platforms can be found
 `on this page <https://cmake.org/install/>`_.
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/Build_development.rst b/doc/src/Build_development.rst
index 7286caf7b3..21e99d69be 100644
--- a/doc/src/Build_development.rst
+++ b/doc/src/Build_development.rst
@@ -2,12 +2,10 @@ Development build options (CMake only)
 ======================================
 
 The CMake build of LAMMPS has a few extra options which are useful during
-development,  testing or debugging.
-
+development, testing or debugging.
 
 ----------
 
-
 .. _compilation:
 
 Verify compilation flags
@@ -17,47 +15,47 @@ Sometimes it is necessary to verify the complete sequence of compilation flags
 generated by the CMake build. To enable a more verbose output during
 compilation you can use the following option.
 
-
-.. parsed-literal::
+.. code-block:: bash
 
    -D CMAKE_VERBOSE_MAKEFILE=value    # value = no (default) or yes
 
 Another way of doing this without reconfiguration is calling make with variable VERBOSE set to 1:
 
-
-.. parsed-literal::
+.. code-block:: bash
 
    make VERBOSE=1
 
-
 ----------
 
-
 .. _sanitizer:
 
 Address, Undefined Behavior, and Thread Sanitizer Support
 -------------------------------------------------------------------------
 
-Compilers such as GCC and Clang support generating binaries which use different
-sanitizers to detect problems in code during run-time. They can detect `memory leaks <https://clang.llvm.org/docs/AddressSanitizer.html>`_,
-code that runs into `undefined behavior <https://clang.llvm.org/docs/UndefinedBehaviorSanitizer.html>`_ of the
-language and `data races <https://clang.llvm.org/docs/ThreadSanitizer.html>`_ in threaded code.
+Compilers such as GCC and Clang support generating instrumented binaries
+which use different sanitizer libraries to detect problems in code
+during run-time. They can detect issues like:
 
-The following settings allow you enable these features if your compiler supports
-it. Please note that they come with a performance hit. However, they are
-usually faster than using tools like Valgrind.
+ - `memory leaks <https://clang.llvm.org/docs/AddressSanitizer.html>`_
+ - `undefined behavior <https://clang.llvm.org/docs/UndefinedBehaviorSanitizer.html>`_
+ - `data races <https://clang.llvm.org/docs/ThreadSanitizer.html>`_
 
+Please note that this kind of instrumentation usually comes with a small
+performance hit (much less than using tools like `Valgrind <valgrind_>`_).
+The to enable these features additional compiler flags need to be added
+to the compilation and linking stages.  This is most easily done through
+setting the ``CMAKE_TUNE_FLAGS`` variable during configuration. Examples:
 
-.. parsed-literal::
+.. code-block:: bash
 
-   -D ENABLE_SANITIZE_ADDRESS=value    # enable Address Sanitizer, value = no (default) or yes
-   -D ENABLE_SANITIZE_UNDEFINED=value  # enable Undefined Behaviour Sanitizer, value = no (default) or yes
-   -D ENABLE_SANITIZE_THREAD=value     # enable Thread Sanitizer, value = no (default) or yes
+   -D CMAKE_TUNE_FLAGS=-fsanitize=address    # enable address sanitizer / memory leak checker
+   -D CMAKE_TUNE_FLAGS=-fsanitize=undefined  # enable undefined behavior sanitizer
+   -D CMAKE_TUNE_FLAGS=-fsanitize=thread     # enable thread sanitizer
 
+.. _valgrind: https://valgrind.org
 
 ----------
 
-
 .. _testing:
 
 Code Coverage and Testing
@@ -71,8 +69,7 @@ developers can run the tests directly on their workstation.
 
    this is incomplete and only represents a small subset of tests that we run
 
-
-.. parsed-literal::
+.. code-block:: bash
 
    -D ENABLE_TESTING=value               # enable simple run tests of LAMMPS, value = no (default) or yes
    -D LAMMPS_TESTING_SOURCE_DIR=path     # path to lammps-testing repository (option if in custom location)
@@ -80,8 +77,7 @@ developers can run the tests directly on their workstation.
 
 If you enable testing in the CMake build it will create an additional target called "test". You can run them with:
 
-
-.. parsed-literal::
+.. code-block:: bash
 
    make test
 
@@ -92,15 +88,13 @@ faster.
 You can also collect code coverage metrics while running the tests by enabling
 coverage support during building.
 
-
-.. parsed-literal::
+.. code-block:: bash
 
    -D ENABLE_COVERAGE=value  # enable coverage measurements, value = no (default) or yes
 
 This will also add the following targets to generate coverage reports after running the LAMMPS executable:
 
-
-.. parsed-literal::
+.. code-block:: bash
 
    make test               # run tests first!
    make gen_coverage_html  # generate coverage report in HTML format
@@ -108,13 +102,6 @@ This will also add the following targets to generate coverage reports after runn
 
 These reports require GCOVR to be installed. The easiest way to do this to install it via pip:
 
-
-.. parsed-literal::
+.. code-block:: bash
 
    pip install git+https://github.com/gcovr/gcovr.git
-
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/Build_extras.rst b/doc/src/Build_extras.rst
index 951e094c12..45c876d84a 100644
--- a/doc/src/Build_extras.rst
+++ b/doc/src/Build_extras.rst
@@ -4,13 +4,17 @@ Packages with extra build options
 When building with some packages, additional steps may be required,
 in addition to:
 
+.. code-block:: bash
 
-.. parsed-literal::
+   $ cmake -D PKG_NAME=yes
 
-   -D PKG_NAME=yes    # CMake
-   make yes-name      # make
+or
 
-as described on the :doc:`Build\_package <Build_package>` doc page.
+.. code-block:: bash
+
+   $ make yes-name
+
+as described on the :doc:`Build_package <Build_package>` doc page.
 
 For a CMake build there may be additional optional or required
 variables to set.  For a build with make, a provided library under the
@@ -20,22 +24,38 @@ You may need to tell LAMMPS where it is found on your system.
 
 This is the list of packages that may require additional steps.
 
-+----------------------------------+----------------------------------+------------------------------------+------------------------------+--------------------------------+--------------------------------------+
-| :ref:`COMPRESS <compress>`       | :ref:`GPU <gpu>`                 | :ref:`KIM <kim>`                   | :ref:`KOKKOS <kokkos>`       | :ref:`LATTE <latte>`           | :ref:`MESSAGE <message>`             |
-+----------------------------------+----------------------------------+------------------------------------+------------------------------+--------------------------------+--------------------------------------+
-| :ref:`MSCG <mscg>`               | :ref:`OPT <opt>`                 | :ref:`POEMS <poems>`               | :ref:`PYTHON <python>`       | :ref:`VORONOI <voronoi>`       | :ref:`USER-ADIOS <user-adios>`       |
-+----------------------------------+----------------------------------+------------------------------------+------------------------------+--------------------------------+--------------------------------------+
-| :ref:`USER-ATC <user-atc>`       | :ref:`USER-AWPMD <user-awpmd>`   | :ref:`USER-COLVARS <user-colvars>` | :ref:`USER-H5MD <user-h5md>` | :ref:`USER-INTEL <user-intel>` | :ref:`USER-MOLFILE <user-molfile>`   |
-+----------------------------------+----------------------------------+------------------------------------+------------------------------+--------------------------------+--------------------------------------+
-| :ref:`USER-NETCDF <user-netcdf>` | :ref:`USER-PLUMED <user-plumed>` | :ref:`USER-OMP <user-omp>`         | :ref:`USER-QMMM <user-qmmm>` | :ref:`USER-QUIP <user-quip>`   | :ref:`USER-SCAFACOS <user-scafacos>` |
-+----------------------------------+----------------------------------+------------------------------------+------------------------------+--------------------------------+--------------------------------------+
-| :ref:`USER-SMD <user-smd>`       | :ref:`USER-VTK <user-vtk>`       |                                    |                              |                                |                                      |
-+----------------------------------+----------------------------------+------------------------------------+------------------------------+--------------------------------+--------------------------------------+
+.. table_from_list::
+   :columns: 6
 
+   * :ref:`COMPRESS <compress>`
+   * :ref:`GPU <gpu>`
+   * :ref:`KIM <kim>`
+   * :ref:`KOKKOS <kokkos>`
+   * :ref:`LATTE <latte>`
+   * :ref:`MESSAGE <message>`
+   * :ref:`MSCG <mscg>`
+   * :ref:`OPT <opt>`
+   * :ref:`POEMS <poems>`
+   * :ref:`PYTHON <python>`
+   * :ref:`VORONOI <voronoi>`
+   * :ref:`USER-ADIOS <user-adios>`
+   * :ref:`USER-ATC <user-atc>`
+   * :ref:`USER-AWPMD <user-awpmd>`
+   * :ref:`USER-COLVARS <user-colvars>`
+   * :ref:`USER-H5MD <user-h5md>`
+   * :ref:`USER-INTEL <user-intel>`
+   * :ref:`USER-MOLFILE <user-molfile>`
+   * :ref:`USER-NETCDF <user-netcdf>`
+   * :ref:`USER-PLUMED <user-plumed>`
+   * :ref:`USER-OMP <user-omp>`
+   * :ref:`USER-QMMM <user-qmmm>`
+   * :ref:`USER-QUIP <user-quip>`
+   * :ref:`USER-SCAFACOS <user-scafacos>`
+   * :ref:`USER-SMD <user-smd>`
+   * :ref:`USER-VTK <user-vtk>`
 
 ----------
 
-
 .. _compress:
 
 COMPRESS package
@@ -48,22 +68,19 @@ available on your system.
 
 If CMake cannot find the library, you can set these variables:
 
-
-.. parsed-literal::
+.. code-block:: bash
 
    -D ZLIB_INCLUDE_DIR=path    # path to zlib.h header file
    -D ZLIB_LIBRARIES=path      # path to libz.a (.so) file
 
 **Traditional make**\ :
 
-If make cannot find the library, you can edit the
-lib/compress/Makefile.lammps file to specify the paths and library
+If make cannot find the library, you can edit the file
+lib/compress/Makefile.lammps to specify the paths and library
 name.
 
-
 ----------
 
-
 .. _gpu:
 
 GPU package
@@ -74,8 +91,7 @@ which GPU hardware to build for.
 
 **CMake build**\ :
 
-
-.. parsed-literal::
+.. code-block:: bash
 
    -D GPU_API=value          # value = opencl (default) or cuda
    -D GPU_PREC=value         # precision setting
@@ -91,46 +107,45 @@ which GPU hardware to build for.
    -D CUDA_MPS_SUPPORT=value # enables some tweaks required to run with active nvidia-cuda-mps daemon
                              # value = yes or no (default)
 
-GPU\_ARCH settings for different GPU hardware is as follows:
+GPU_ARCH settings for different GPU hardware is as follows:
 
-* sm\_12 or sm\_13 for GT200 (supported by CUDA 3.2 until CUDA 6.5)
-* sm\_20 or sm\_21 for Fermi (supported by CUDA 3.2 until CUDA 7.5)
-* sm\_30 or sm\_35 or sm\_37 for Kepler (supported since CUDA 5)
-* sm\_50 or sm\_52 for Maxwell (supported since CUDA 6)
-* sm\_60 or sm\_61 for Pascal (supported since CUDA 8)
-* sm\_70 for Volta (supported since CUDA 9)
-* sm\_75 for Turing (supported since CUDA 10)
+* sm_12 or sm_13 for GT200 (supported by CUDA 3.2 until CUDA 6.5)
+* sm_20 or sm_21 for Fermi (supported by CUDA 3.2 until CUDA 7.5)
+* sm_30 or sm_35 or sm_37 for Kepler (supported since CUDA 5)
+* sm_50 or sm_52 for Maxwell (supported since CUDA 6)
+* sm_60 or sm_61 for Pascal (supported since CUDA 8)
+* sm_70 for Volta (supported since CUDA 9)
+* sm_75 for Turing (supported since CUDA 10)
 
 A more detailed list can be found, for example,
 at `Wikipedia's CUDA article <https://en.wikipedia.org/wiki/CUDA#GPUs_supported>`_
 
 CMake can detect which version of the CUDA toolkit is used and thus can
 include support for **all** major GPU architectures supported by this toolkit.
-Thus the GPU\_ARCH setting is merely an optimization, to have code for
+Thus the GPU_ARCH setting is merely an optimization, to have code for
 the preferred GPU architecture directly included rather than having to wait
 for the JIT compiler of the CUDA driver to translate it.
 
 **Traditional make**\ :
 
-Before building LAMMPS, you must build the GPU library in lib/gpu.
+Before building LAMMPS, you must build the GPU library in ``lib/gpu``\ .
 You can do this manually if you prefer; follow the instructions in
-lib/gpu/README.  Note that the GPU library uses MPI calls, so you must
+``lib/gpu/README``.  Note that the GPU library uses MPI calls, so you must
 use the same MPI library (or the STUBS library) settings as the main
-LAMMPS code.  This also applies to the -DLAMMPS\_BIGBIG,
--DLAMMPS\_SMALLBIG, or -DLAMMPS\_SMALLSMALL settings in whichever
+LAMMPS code.  This also applies to the ``-DLAMMPS_BIGBIG``\ ,
+``-DLAMMPS_SMALLBIG``\ , or ``-DLAMMPS_SMALLSMALL`` settings in whichever
 Makefile you use.
 
-You can also build the library in one step from the lammps/src dir,
-using a command like these, which simply invoke the lib/gpu/Install.py
+You can also build the library in one step from the ``lammps/src`` dir,
+using a command like these, which simply invoke the ``lib/gpu/Install.py``
 script with the specified args:
 
+.. code-block:: bash
 
-.. parsed-literal::
-
-   make lib-gpu               # print help message
-   make lib-gpu args="-b"     # build GPU library with default Makefile.linux
-   make lib-gpu args="-m xk7 -p single -o xk7.single"  # create new Makefile.xk7.single, altered for single-precision
-   make lib-gpu args="-m mpi -a sm_60 -p mixed -b" # build GPU library with mixed precision and P100 using other settings in Makefile.mpi
+  $ make lib-gpu               # print help message
+  $ make lib-gpu args="-b"     # build GPU library with default Makefile.linux
+  $ make lib-gpu args="-m xk7 -p single -o xk7.single"  # create new Makefile.xk7.single, altered for single-precision
+  $ make lib-gpu args="-m mpi -a sm_60 -p mixed -b" # build GPU library with mixed precision and P100 using other settings in Makefile.mpi
 
 Note that this procedure starts with a Makefile.machine in lib/gpu, as
 specified by the "-m" switch.  For your convenience, machine makefiles
@@ -141,22 +156,22 @@ Makefile.machine you start from via the corresponding -c, -a, -p, -e
 switches (as in the examples above), and also save a copy of the new
 Makefile if desired:
 
-* CUDA\_HOME = where NVIDIA CUDA software is installed on your system
-* CUDA\_ARCH = sm\_XX, what GPU hardware you have, same as CMake GPU\_ARCH above
-* CUDA\_PRECISION = precision (double, mixed, single)
-* EXTRAMAKE = which Makefile.lammps.\* file to copy to Makefile.lammps
+* ``CUDA_HOME`` = where NVIDIA CUDA software is installed on your system
+* ``CUDA_ARCH`` = sm_XX, what GPU hardware you have, same as CMake GPU_ARCH above
+* ``CUDA_PRECISION`` = precision (double, mixed, single)
+* ``EXTRAMAKE`` = which Makefile.lammps.\* file to copy to Makefile.lammps
 
-The file Makefile.linux\_multi is set up to include support for multiple
+The file Makefile.linux_multi is set up to include support for multiple
 GPU architectures as supported by the CUDA toolkit in use. This is done
 through using the "--gencode " flag, which can be used multiple times and
 thus support all GPU architectures supported by your CUDA compiler.
 
 If the library build is successful, 3 files should be created:
-lib/gpu/libgpu.a, lib/gpu/nvc\_get\_devices, and
-lib/gpu/Makefile.lammps.  The latter has settings that enable LAMMPS
-to link with CUDA libraries.  If the settings in Makefile.lammps for
+``lib/gpu/libgpu.a``\ , ``lib/gpu/nvc_get_devices``\ , and
+``lib/gpu/Makefile.lammps``\ .  The latter has settings that enable LAMMPS
+to link with CUDA libraries.  If the settings in ``Makefile.lammps`` for
 your machine are not correct, the LAMMPS build will fail, and
-lib/gpu/Makefile.lammps may need to be edited.
+``lib/gpu/Makefile.lammps`` may need to be edited.
 
 .. note::
 
@@ -166,21 +181,34 @@ lib/gpu/Makefile.lammps may need to be edited.
    package uses the library settings from the lib/gpu/Makefile.machine
    used to build the GPU library.
 
-
 ----------
 
-
 .. _kim:
 
 KIM package
 ---------------------
 
 To build with this package, the KIM library with API v2 must be downloaded
-and built on your system.  It must include the KIM models that you want to
-use with LAMMPS. If you want to use the :doc:`kim_query <kim_commands>`
+and built on your system. It must include the KIM models that you want to
+use with LAMMPS.
+
+If you would like to use the :doc:`kim_query <kim_commands>`
 command, you also need to have libcurl installed with the matching
 development headers and the curl-config tool.
 
+If you would like to use the :doc:`kim_property <kim_commands>`
+command, you need to build LAMMPS with the Python 3.6 or later package
+installed. See the :doc:`Python <python>` doc page for more info on building
+LAMMPS with the version of Python on your system.
+After successfully building LAMMPS with Python, you need to
+install the kim-property Python package, which can be easily done using
+*pip* as ``pip install kim-property``, or from the *conda-forge* channel as
+``conda install kim-property`` if LAMMPS is built in Conda. More detailed
+information is available at:
+`kim-property installation <https://github.com/openkim/kim-property#installing-kim-property>`_.
+
+In addition to installing the KIM API, it is also necessary to install the
+library of KIM models (interatomic potentials).
 See `Obtaining KIM Models <http://openkim.org/doc/usage/obtaining-models>`_ to
 learn how to install a pre-build binary of the OpenKIM Repository of Models.
 See the list of all KIM models here: https://openkim.org/browse/models
@@ -191,58 +219,63 @@ minutes to hours) to build.  Of course you only need to do that once.)
 
 **CMake build**\ :
 
-
-.. parsed-literal::
+.. code-block:: bash
 
    -D DOWNLOAD_KIM=value           # download OpenKIM API v2 for build, value = no (default) or yes
    -D LMP_DEBUG_CURL=value         # set libcurl verbose mode on/off, value = off (default) or on
    -D LMP_NO_SSL_CHECK=value       # tell libcurl to not verify the peer, value = no (default) or yes
 
-If DOWNLOAD\_KIM is set, the KIM library will be downloaded and built
+If ``DOWNLOAD_KIM`` is set, the KIM library will be downloaded and built
 inside the CMake build directory.  If the KIM library is already on
-your system (in a location CMake cannot find it), set the PKG\_CONFIG\_PATH
+your system (in a location CMake cannot find it), set the ``PKG_CONFIG_PATH``
 environment variable so that libkim-api can be found.
 
-For using OpenKIM web queries in LAMMPS.
+*For using OpenKIM web queries in LAMMPS*\ :
 
-If LMP\_DEBUG\_CURL is set, the libcurl verbose mode will be on, and any
-libcurl calls within the KIM web query display a lot of information about
-libcurl operations. You hardly ever want this set in production use, you will
-almost always want this when you debug/report problems.
+If the ``LMP_DEBUG_CURL`` environment variable is set, the libcurl verbose
+mode will be on, and any libcurl calls within the KIM web query display a
+lot of information about libcurl operations.  You hardly ever want this
+set in production use, you will almost always want this when you debug or
+report problems.
 
 The libcurl performs peer SSL certificate verification by default. This
 verification is done using a CA certificate store that the SSL library can
 use to make sure the peer's server certificate is valid. If SSL reports an
 error ("certificate verify failed") during the handshake and thus refuses
-further communication with that server, you can set LMP\_NO\_SSL\_CHECK.
-If LMP\_NO\_SSL\_CHECK is set, libcurl does not verify the peer and connection
+further communication with that server, you can set ``LMP_NO_SSL_CHECK``\ .
+If ``LMP_NO_SSL_CHECK`` is set, libcurl does not verify the peer and connection
 succeeds regardless of the names in the certificate. This option is insecure.
 As an alternative, you can specify your own CA cert path by setting the
-environment variable CURL\_CA\_BUNDLE to the path of your choice. A call to the
-KIM web query would get this value from the environmental variable.
+environment variable ``CURL_CA_BUNDLE`` to the path of your choice. A call
+to the KIM web query would get this value from the environmental variable.
 
 **Traditional make**\ :
 
 You can download and build the KIM library manually if you prefer;
-follow the instructions in lib/kim/README.  You can also do it in one
+follow the instructions in ``lib/kim/README``\ .  You can also do it in one
 step from the lammps/src dir, using a command like these, which simply
-invoke the lib/kim/Install.py script with the specified args.
+invoke the ``lib/kim/Install.py`` script with the specified args.
 
+.. code-block:: bash
 
-.. parsed-literal::
+  $ make lib-kim              # print help message
+  $ make lib-kim args="-b "   # (re-)install KIM API lib with only example models
+  $ make lib-kim args="-b -a Glue_Ercolessi_Adams_Al__MO_324507536345_001"  # ditto plus one model
+  $ make lib-kim args="-b -a everything"     # install KIM API lib with all models
+  $ make lib-kim args="-n -a EAM_Dynamo_Ackland_W__MO_141627196590_002"       # add one model or model driver
+  $ make lib-kim args="-p /usr/local" # use an existing KIM API installation at the provided location
+  $ make lib-kim args="-p /usr/local -a EAM_Dynamo_Ackland_W__MO_141627196590_002" # ditto but add one model or driver
 
-   make lib-kim              # print help message
-   make lib-kim args="-b "   # (re-)install KIM API lib with only example models
-   make lib-kim args="-b -a Glue_Ercolessi_Adams_Al__MO_324507536345_001"  # ditto plus one model
-   make lib-kim args="-b -a everything"     # install KIM API lib with all models
-   make lib-kim args="-n -a EAM_Dynamo_Ackland_W__MO_141627196590_002"       # add one model or model driver
-   make lib-kim args="-p /usr/local" # use an existing KIM API installation at the provided location
-   make lib-kim args="-p /usr/local -a EAM_Dynamo_Ackland_W__MO_141627196590_002" # ditto but add one model or driver
+Settings for OpenKIM web queries discussed above need to be applied by adding
+them to the ``LMP_INC`` variable through editing the Makefile.machine you are
+using.  For example:
 
+.. code-block:: make
+
+   LMP_INC =       -DLMP_NO_SSL_CHECK
 
 ----------
 
-
 .. _kokkos:
 
 KOKKOS package
@@ -253,26 +286,33 @@ build for, either CPUs (multi-threading via OpenMP) or KNLs (OpenMP)
 or GPUs (NVIDIA Cuda).
 
 For a CMake or make build, these are the possible choices for the
-KOKKOS\_ARCH settings described below.  Note that for CMake, these are
+``KOKKOS_ARCH`` settings described below.  Note that for CMake, these are
 really Kokkos variables, not LAMMPS variables.  Hence you must use
 case-sensitive values, e.g. BDW, not bdw.
 
+* AMDAVX = AMD 64-bit x86 CPUs
+* EPYC   = AMD EPYC Zen class CPUs
 * ARMv80 = ARMv8.0 Compatible CPU
 * ARMv81 = ARMv8.1 Compatible CPU
 * ARMv8-ThunderX = ARMv8 Cavium ThunderX CPU
-* BGQ = IBM Blue Gene/Q CPUs
-* Power8 = IBM POWER8 CPUs
-* Power9 = IBM POWER9 CPUs
+* ARMv8-TX2 = ARMv8 Cavium ThunderX2 CPU
+* WSM = Intel Westmere CPUs
 * SNB = Intel Sandy/Ivy Bridge CPUs
 * HSW = Intel Haswell CPUs
 * BDW = Intel Broadwell Xeon E-class CPUs
 * SKX = Intel Sky Lake Xeon E-class HPC CPUs (AVX512)
 * KNC = Intel Knights Corner Xeon Phi
 * KNL = Intel Knights Landing Xeon Phi
+* BGQ = IBM Blue Gene/Q CPUs
+* Power7 = IBM POWER8 CPUs
+* Power8 = IBM POWER8 CPUs
+* Power9 = IBM POWER9 CPUs
+* Kepler = NVIDIA Kepler default (generation CC 3.5)
 * Kepler30 = NVIDIA Kepler generation CC 3.0
 * Kepler32 = NVIDIA Kepler generation CC 3.2
 * Kepler35 = NVIDIA Kepler generation CC 3.5
 * Kepler37 = NVIDIA Kepler generation CC 3.7
+* Maxwell = NVIDIA Maxwell default (generation CC 5.0)
 * Maxwell50 = NVIDIA Maxwell generation CC 5.0
 * Maxwell52 = NVIDIA Maxwell generation CC 5.2
 * Maxwell53 = NVIDIA Maxwell generation CC 5.3
@@ -286,24 +326,21 @@ case-sensitive values, e.g. BDW, not bdw.
 
 For multicore CPUs using OpenMP, set these 2 variables.
 
-
-.. parsed-literal::
+.. code-block:: bash
 
    -D KOKKOS_ARCH=archCPU         # archCPU = CPU from list above
    -D KOKKOS_ENABLE_OPENMP=yes
 
 For Intel KNLs using OpenMP, set these 2 variables:
 
-
-.. parsed-literal::
+.. code-block:: bash
 
    -D KOKKOS_ARCH=KNL
    -D KOKKOS_ENABLE_OPENMP=yes
 
 For NVIDIA GPUs using CUDA, set these 4 variables:
 
-
-.. parsed-literal::
+.. code-block:: bash
 
    -D KOKKOS_ARCH="archCPU;archGPU"   # archCPU = CPU from list above that is hosting the GPU
                                       # archGPU = GPU from list above
@@ -312,40 +349,36 @@ For NVIDIA GPUs using CUDA, set these 4 variables:
    -D CMAKE_CXX_COMPILER=wrapper      # wrapper = full path to Cuda nvcc wrapper
 
 The wrapper value is the Cuda nvcc compiler wrapper provided in the
-Kokkos library: lib/kokkos/bin/nvcc\_wrapper.  The setting should
+Kokkos library: ``lib/kokkos/bin/nvcc_wrapper``\ .  The setting should
 include the full path name to the wrapper, e.g.
 
-
-.. parsed-literal::
+.. code-block:: bash
 
    -D CMAKE_CXX_COMPILER=/home/username/lammps/lib/kokkos/bin/nvcc_wrapper
 
 **Traditional make**\ :
 
-Choose which hardware to support in Makefile.machine via
-KOKKOS\_DEVICES and KOKKOS\_ARCH settings.  See the
-src/MAKE/OPTIONS/Makefile.kokkos\* files for examples.
+Choose which hardware to support in ``Makefile.machine`` via
+``KOKKOS_DEVICES`` and ``KOKKOS_ARCH`` settings.  See the
+``src/MAKE/OPTIONS/Makefile.kokkos\*`` files for examples.
 
 For multicore CPUs using OpenMP:
 
-
-.. parsed-literal::
+.. code-block:: make
 
    KOKKOS_DEVICES = OpenMP
    KOKKOS_ARCH = archCPU      # archCPU = CPU from list above
 
 For Intel KNLs using OpenMP:
 
-
-.. parsed-literal::
+.. code-block:: make
 
    KOKKOS_DEVICES = OpenMP
    KOKKOS_ARCH = KNL
 
 For NVIDIA GPUs using CUDA:
 
-
-.. parsed-literal::
+.. code-block:: make
 
    KOKKOS_DEVICES = Cuda
    KOKKOS_ARCH = archCPU,archGPU    # archCPU = CPU from list above that is hosting the GPU
@@ -359,17 +392,14 @@ The 2 lines define a nvcc wrapper compiler, which will use nvcc for
 compiling CUDA files and use a C++ compiler for non-Kokkos, non-CUDA
 files.
 
-
-.. parsed-literal::
+.. code-block:: make
 
    KOKKOS_ABSOLUTE_PATH = $(shell cd $(KOKKOS_PATH); pwd)
    export OMPI_CXX = $(KOKKOS_ABSOLUTE_PATH)/config/nvcc_wrapper
    CC =            mpicxx
 
-
 ----------
 
-
 .. _latte:
 
 LATTE package
@@ -380,33 +410,31 @@ library.
 
 **CMake build**\ :
 
-
-.. parsed-literal::
+.. code-block:: bash
 
    -D DOWNLOAD_LATTE=value    # download LATTE for build, value = no (default) or yes
    -D LATTE_LIBRARY=path      # LATTE library file (only needed if a custom location)
 
-If DOWNLOAD\_LATTE is set, the LATTE library will be downloaded and
+If ``DOWNLOAD_LATTE`` is set, the LATTE library will be downloaded and
 built inside the CMake build directory.  If the LATTE library is
 already on your system (in a location CMake cannot find it),
-LATTE\_LIBRARY is the filename (plus path) of the LATTE library file,
+``LATTE_LIBRARY`` is the filename (plus path) of the LATTE library file,
 not the directory the library file is in.
 
 **Traditional make**\ :
 
 You can download and build the LATTE library manually if you prefer;
-follow the instructions in lib/latte/README.  You can also do it in
-one step from the lammps/src dir, using a command like these, which
-simply invokes the lib/latte/Install.py script with the specified
+follow the instructions in ``lib/latte/README``\ .  You can also do it in
+one step from the ``lammps/src`` dir, using a command like these, which
+simply invokes the ``lib/latte/Install.py`` script with the specified
 args:
 
+.. code-block:: bash
 
-.. parsed-literal::
-
-   make lib-latte                          # print help message
-   make lib-latte args="-b"                # download and build in lib/latte/LATTE-master
-   make lib-latte args="-p $HOME/latte"    # use existing LATTE installation in $HOME/latte
-   make lib-latte args="-b -m gfortran"    # download and build in lib/latte and
+  $ make lib-latte                          # print help message
+  $ make lib-latte args="-b"                # download and build in lib/latte/LATTE-master
+  $ make lib-latte args="-p $HOME/latte"    # use existing LATTE installation in $HOME/latte
+  $ make lib-latte args="-b -m gfortran"    # download and build in lib/latte and
                                            #   copy Makefile.lammps.gfortran to Makefile.lammps
 
 Note that 3 symbolic (soft) links, "includelink" and "liblink" and
@@ -415,10 +443,8 @@ dir.  When LAMMPS itself is built it will use these links.  You should
 also check that the Makefile.lammps file you create is appropriate for
 the compiler you use on your system to build LATTE.
 
-
 ----------
 
-
 .. _message:
 
 MESSAGE package
@@ -430,8 +456,7 @@ be installed on your system.
 
 **CMake build**\ :
 
-
-.. parsed-literal::
+.. code-block:: bash
 
    -D MESSAGE_ZMQ=value    # build with ZeroMQ support, value = no (default) or yes
    -D ZMQ_LIBRARY=path     # ZMQ library file (only needed if a custom location)
@@ -440,80 +465,73 @@ be installed on your system.
 **Traditional make**\ :
 
 Before building LAMMPS, you must build the CSlib library in
-lib/message.  You can build the CSlib library manually if you prefer;
-follow the instructions in lib/message/README.  You can also do it in
-one step from the lammps/src dir, using a command like these, which
-simply invoke the lib/message/Install.py script with the specified args:
+``lib/message``\ .  You can build the CSlib library manually if you prefer;
+follow the instructions in ``lib/message/README``\ .  You can also do it in
+one step from the ``lammps/src`` dir, using a command like these, which
+simply invoke the ``lib/message/Install.py`` script with the specified args:
 
+.. code-block:: bash
 
-.. parsed-literal::
+  $ make lib-message               # print help message
+  $ make lib-message args="-m -z"  # build with MPI and socket (ZMQ) support
+  $ make lib-message args="-s"     # build as serial lib with no ZMQ support
 
-   make lib-message               # print help message
-   make lib-message args="-m -z"  # build with MPI and socket (ZMQ) support
-   make lib-message args="-s"     # build as serial lib with no ZMQ support
-
-The build should produce two files: lib/message/cslib/src/libmessage.a
-and lib/message/Makefile.lammps.  The latter is copied from an
-existing Makefile.lammps.\* and has settings to link with the ZeroMQ
+The build should produce two files: ``lib/message/cslib/src/libmessage.a``
+and ``lib/message/Makefile.lammps``\ .  The latter is copied from an
+existing ``Makefile.lammps.\*`` and has settings to link with the ZeroMQ
 library if requested in the build.
 
-
 ----------
 
-
 .. _mscg:
 
 MSCG package
 -----------------------
 
 To build with this package, you must download and build the MS-CG
-library.  Building the MS-CG library and using it from LAMMPS requires
-a C++11 compatible compiler and that the GSL (GNU Scientific Library)
-headers and libraries are installed on your machine.  See the
-lib/mscg/README and MSCG/Install files for more details.
+library.  Building the MS-CG library requires that the GSL
+(GNU Scientific Library) headers and libraries are installed on your
+machine.  See the ``lib/mscg/README`` and ``MSCG/Install`` files for
+more details.
 
 **CMake build**\ :
 
-
-.. parsed-literal::
+.. code-block:: bash
 
    -D DOWNLOAD_MSCG=value    # download MSCG for build, value = no (default) or yes
    -D MSCG_LIBRARY=path      # MSCG library file (only needed if a custom location)
    -D MSCG_INCLUDE_DIR=path  # MSCG include directory (only needed if a custom location)
 
-If DOWNLOAD\_MSCG is set, the MSCG library will be downloaded and built
+If ``DOWNLOAD_MSCG`` is set, the MSCG library will be downloaded and built
 inside the CMake build directory.  If the MSCG library is already on
-your system (in a location CMake cannot find it), MSCG\_LIBRARY is the
+your system (in a location CMake cannot find it), ``MSCG_LIBRARY`` is the
 filename (plus path) of the MSCG library file, not the directory the
-library file is in.  MSCG\_INCLUDE\_DIR is the directory the MSCG
+library file is in.  ``MSCG_INCLUDE_DIR`` is the directory the MSCG
 include file is in.
 
 **Traditional make**\ :
 
 You can download and build the MS-CG library manually if you prefer;
-follow the instructions in lib/mscg/README.  You can also do it in one
-step from the lammps/src dir, using a command like these, which simply
-invoke the lib/mscg/Install.py script with the specified args:
+follow the instructions in ``lib/mscg/README``\ .  You can also do it in one
+step from the ``lammps/src`` dir, using a command like these, which simply
+invoke the ``lib/mscg/Install.py`` script with the specified args:
 
+.. code-block:: bash
 
-.. parsed-literal::
-
-   make lib-mscg             # print help message
-   make lib-mscg args="-b -m serial"   # download and build in lib/mscg/MSCG-release-master
+  $ make lib-mscg             # print help message
+  $ make lib-mscg args="-b -m serial"   # download and build in lib/mscg/MSCG-release-master
                                        # with the settings compatible with "make serial"
-   make lib-mscg args="-b -m mpi"      # download and build in lib/mscg/MSCG-release-master
+  $ make lib-mscg args="-b -m mpi"      # download and build in lib/mscg/MSCG-release-master
                                        # with the settings compatible with "make mpi"
-   make lib-mscg args="-p /usr/local/mscg-release" # use the existing MS-CG installation in /usr/local/mscg-release
+  $ make lib-mscg args="-p /usr/local/mscg-release" # use the existing MS-CG installation in /usr/local/mscg-release
 
 Note that 2 symbolic (soft) links, "includelink" and "liblink", will
-be created in lib/mscg to point to the MS-CG src/installation dir.
-When LAMMPS is built in src it will use these links.  You should not
-need to edit the lib/mscg/Makefile.lammps file.
-
+be created in ``lib/mscg`` to point to the MS-CG ``src/installation``
+dir.  When LAMMPS is built in src it will use these links.  You should
+not need to edit the ``lib/mscg/Makefile.lammps`` file.
 
 ----------
 
-
 .. _opt:
 
 OPT package
@@ -521,7 +539,7 @@ OPT package
 
 **CMake build**\ :
 
-No additional settings are needed besides "-D PKG\_OPT=yes".
+No additional settings are needed besides ``-D PKG_OPT=yes``
 
 **Traditional make**\ :
 
@@ -530,10 +548,8 @@ package when using Intel compilers.  It should be added to the CCFLAGS
 line of your Makefile.machine.  See src/MAKE/OPTIONS/Makefile.opt for
 an example.
 
-
 ----------
 
-
 .. _poems:
 
 POEMS package
@@ -541,71 +557,65 @@ POEMS package
 
 **CMake build**\ :
 
-No additional settings are needed besides "-D PKG\_OPT=yes".
+No additional settings are needed besides ``-D PKG_OPT=yes``
 
 **Traditional make**\ :
 
-Before building LAMMPS, you must build the POEMS library in lib/poems.
+Before building LAMMPS, you must build the POEMS library in ``lib/poems``\ .
 You can do this manually if you prefer; follow the instructions in
-lib/poems/README.  You can also do it in one step from the lammps/src
+``lib/poems/README``\ .  You can also do it in one step from the ``lammps/src``
 dir, using a command like these, which simply invoke the
-lib/poems/Install.py script with the specified args:
+``lib/poems/Install.py`` script with the specified args:
 
+.. code-block:: bash
 
-.. parsed-literal::
+  $ make lib-poems                   # print help message
+  $ make lib-poems args="-m serial"  # build with GNU g++ compiler (settings as with "make serial")
+  $ make lib-poems args="-m mpi"     # build with default MPI C++ compiler (settings as with "make mpi")
+  $ make lib-poems args="-m icc"     # build with Intel icc compiler
 
-   make lib-poems                   # print help message
-   make lib-poems args="-m serial"  # build with GNU g++ compiler (settings as with "make serial")
-   make lib-poems args="-m mpi"     # build with default MPI C++ compiler (settings as with "make mpi")
-   make lib-poems args="-m icc"     # build with Intel icc compiler
-
-The build should produce two files: lib/poems/libpoems.a and
-lib/poems/Makefile.lammps.  The latter is copied from an existing
-Makefile.lammps.\* and has settings needed to build LAMMPS with the
+The build should produce two files: ``lib/poems/libpoems.a`` and
+``lib/poems/Makefile.lammps``\ .  The latter is copied from an existing
+``Makefile.lammps.\*`` and has settings needed to build LAMMPS with the
 POEMS library (though typically the settings are just blank).  If
-necessary, you can edit/create a new lib/poems/Makefile.machine file
-for your system, which should define an EXTRAMAKE variable to specify
-a corresponding Makefile.lammps.machine file.
-
+necessary, you can edit/create a new ``lib/poems/Makefile.machine`` file
+for your system, which should define an ``EXTRAMAKE`` variable to specify
+a corresponding ``Makefile.lammps.machine`` file.
 
 ----------
 
-
 .. _python:
 
 PYTHON package
 ---------------------------
 
 Building with the PYTHON package requires you have a Python shared
-library available on your system, which needs to be a Python 2
-version, 2.6 or later.  Python 3 is not yet supported.  See
-lib/python/README for more details.
+library available on your system, which needs to be a Python 2.7
+version or a Python 3.x version.  See ``lib/python/README`` for more
+details.
 
 **CMake build**\ :
 
-
-.. parsed-literal::
+.. code-block:: bash
 
    -D PYTHON_EXECUTABLE=path   # path to Python executable to use
 
 Without this setting, CMake will guess the default Python on your
 system.  To use a different Python version, you can either create a
 virtualenv, activate it and then run cmake.  Or you can set the
-PYTHON\_EXECUTABLE variable to specify which Python interpreter should
+PYTHON_EXECUTABLE variable to specify which Python interpreter should
 be used.  Note note that you will also need to have the development
 headers installed for this version, e.g. python2-devel.
 
 **Traditional make**\ :
 
-The build uses the lib/python/Makefile.lammps file in the compile/link
+The build uses the ``lib/python/Makefile.lammps`` file in the compile/link
 process to find Python.  You should only need to create a new
-Makefile.lammps.\* file (and copy it to Makefile.lammps) if the LAMMPS
-build fails.
-
+``Makefile.lammps.\*`` file (and copy it to ``Makefile.lammps``\ ) if
+the LAMMPS build fails.
 
 ----------
 
-
 .. _voronoi:
 
 VORONOI package
@@ -615,22 +625,19 @@ To build with this package, you must download and build the `Voro++ library <vor
 
 .. _voro-home: http://math.lbl.gov/voro++
 
-
-
 **CMake build**\ :
 
-
-.. parsed-literal::
+.. code-block:: bash
 
    -D DOWNLOAD_VORO=value    # download Voro++ for build, value = no (default) or yes
    -D VORO_LIBRARY=path      # Voro++ library file (only needed if at custom location)
    -D VORO_INCLUDE_DIR=path  # Voro++ include directory (only needed if at custom location)
 
-If DOWNLOAD\_VORO is set, the Voro++ library will be downloaded and
+If DOWNLOAD_VORO is set, the Voro++ library will be downloaded and
 built inside the CMake build directory.  If the Voro++ library is
 already on your system (in a location CMake cannot find it),
-VORO\_LIBRARY is the filename (plus path) of the Voro++ library file,
-not the directory the library file is in.  VORO\_INCLUDE\_DIR is the
+VORO_LIBRARY is the filename (plus path) of the Voro++ library file,
+not the directory the library file is in.  VORO_INCLUDE_DIR is the
 directory the Voro++ include file is in.
 
 **Traditional make**\ :
@@ -641,23 +648,20 @@ one step from the lammps/src dir, using a command like these, which
 simply invoke the lib/voronoi/Install.py script with the specified
 args:
 
+.. code-block:: bash
 
-.. parsed-literal::
-
-   make lib-voronoi                          # print help message
-   make lib-voronoi args="-b"                # download and build the default version in lib/voronoi/voro++-<version>
-   make lib-voronoi args="-p $HOME/voro++"   # use existing Voro++ installation in $HOME/voro++
-   make lib-voronoi args="-b -v voro++0.4.6" # download and build the 0.4.6 version in lib/voronoi/voro++-0.4.6
+  $ make lib-voronoi                          # print help message
+  $ make lib-voronoi args="-b"                # download and build the default version in lib/voronoi/voro++-<version>
+  $ make lib-voronoi args="-p $HOME/voro++"   # use existing Voro++ installation in $HOME/voro++
+  $ make lib-voronoi args="-b -v voro++0.4.6" # download and build the 0.4.6 version in lib/voronoi/voro++-0.4.6
 
 Note that 2 symbolic (soft) links, "includelink" and "liblink", are
 created in lib/voronoi to point to the Voro++ src dir.  When LAMMPS
 builds in src it will use these links.  You should not need to edit
 the lib/voronoi/Makefile.lammps file.
 
-
 ----------
 
-
 .. _user-adios:
 
 USER-ADIOS package
@@ -667,13 +671,12 @@ The USER-ADIOS package requires the `ADIOS I/O library <https://github.com/ornla
 version 2.3.1 or newer. Make sure that you have ADIOS built either with or
 without MPI to match if you build LAMMPS with or without MPI.
 ADIOS compilation settings for LAMMPS are automatically detected, if the PATH
-and LD\_LIBRARY\_PATH environment variables have been updated for the local ADIOS
+and LD_LIBRARY_PATH environment variables have been updated for the local ADIOS
 installation and the instructions below are followed for the respective build systems.
 
 **CMake build**\ :
 
-
-.. parsed-literal::
+.. code-block:: bash
 
    -D ADIOS2_DIR=path        # path is where ADIOS 2.x is installed
    -D PKG_USER-ADIOS=yes
@@ -682,22 +685,18 @@ installation and the instructions below are followed for the respective build sy
 
 Turn on the USER-ADIOS package before building LAMMPS. If the ADIOS 2.x software is installed in PATH, there is nothing else to do:
 
+.. code-block:: bash
 
-.. parsed-literal::
+  $ make yes-user-adios
 
-   make yes-user-adios
+otherwise, set ADIOS2_DIR environment variable when turning on the package:
 
-otherwise, set ADIOS2\_DIR environment variable when turning on the package:
-
-
-.. parsed-literal::
-
-   ADIOS2_DIR=path make yes-user-adios   # path is where ADIOS 2.x is installed
+.. code-block:: bash
 
+  $ ADIOS2_DIR=path make yes-user-adios   # path is where ADIOS 2.x is installed
 
 ----------
 
-
 .. _user-atc:
 
 USER-ATC package
@@ -707,8 +706,8 @@ The USER-ATC package requires the MANYBODY package also be installed.
 
 **CMake build**\ :
 
-No additional settings are needed besides "-D PKG\_USER-ATC=yes"
-and "-D PKG\_MANYBODY=yes".
+No additional settings are needed besides "-D PKG_USER-ATC=yes"
+and "-D PKG_MANYBODY=yes".
 
 **Traditional make**\ :
 
@@ -718,13 +717,12 @@ lib/atc/README.  You can also do it in one step from the lammps/src
 dir, using a command like these, which simply invoke the
 lib/atc/Install.py script with the specified args:
 
+.. code-block:: bash
 
-.. parsed-literal::
-
-   make lib-atc                      # print help message
-   make lib-atc args="-m serial"     # build with GNU g++ compiler and MPI STUBS (settings as with "make serial")
-   make lib-atc args="-m mpi"        # build with default MPI compiler (settings as with "make mpi")
-   make lib-atc args="-m icc"        # build with Intel icc compiler
+  $ make lib-atc                      # print help message
+  $ make lib-atc args="-m serial"     # build with GNU g++ compiler and MPI STUBS (settings as with "make serial")
+  $ make lib-atc args="-m mpi"        # build with default MPI compiler (settings as with "make mpi")
+  $ make lib-atc args="-m icc"        # build with Intel icc compiler
 
 The build should produce two files: lib/atc/libatc.a and
 lib/atc/Makefile.lammps.  The latter is copied from an existing
@@ -740,18 +738,15 @@ can either exist on your system, or you can use the files provided in
 lib/linalg.  In the latter case you also need to build the library in
 lib/linalg with a command like these:
 
+.. code-block:: bash
 
-.. parsed-literal::
-
-   make lib-linalg                     # print help message
-   make lib-linalg args="-m serial"    # build with GNU Fortran compiler (settings as with "make serial")
-   make lib-linalg args="-m mpi"       # build with default MPI Fortran compiler (settings as with "make mpi")
-   make lib-linalg args="-m gfortran"  # build with GNU Fortran compiler
-
+  $ make lib-linalg                     # print help message
+  $ make lib-linalg args="-m serial"    # build with GNU Fortran compiler (settings as with "make serial")
+  $ make lib-linalg args="-m mpi"       # build with default MPI Fortran compiler (settings as with "make mpi")
+  $ make lib-linalg args="-m gfortran"  # build with GNU Fortran compiler
 
 ----------
 
-
 .. _user-awpmd:
 
 USER-AWPMD package
@@ -759,7 +754,7 @@ USER-AWPMD package
 
 **CMake build**\ :
 
-No additional settings are needed besides "-D PKG\_USER-AQPMD=yes".
+No additional settings are needed besides "-D PKG_USER-AQPMD=yes".
 
 **Traditional make**\ :
 
@@ -769,13 +764,12 @@ lib/awpmd/README.  You can also do it in one step from the lammps/src
 dir, using a command like these, which simply invoke the
 lib/awpmd/Install.py script with the specified args:
 
+.. code-block:: bash
 
-.. parsed-literal::
-
-   make lib-awpmd                   # print help message
-   make lib-awpmd args="-m serial"  # build with GNU g++ compiler and MPI STUBS (settings as with "make serial")
-   make lib-awpmd args="-m mpi"     # build with default MPI compiler (settings as with "make mpi")
-   make lib-awpmd args="-m icc"     # build with Intel icc compiler
+  $ make lib-awpmd                   # print help message
+  $ make lib-awpmd args="-m serial"  # build with GNU g++ compiler and MPI STUBS (settings as with "make serial")
+  $ make lib-awpmd args="-m mpi"     # build with default MPI compiler (settings as with "make mpi")
+  $ make lib-awpmd args="-m icc"     # build with Intel icc compiler
 
 The build should produce two files: lib/awpmd/libawpmd.a and
 lib/awpmd/Makefile.lammps.  The latter is copied from an existing
@@ -791,18 +785,15 @@ these can either exist on your system, or you can use the files
 provided in lib/linalg.  In the latter case you also need to build the
 library in lib/linalg with a command like these:
 
+.. code-block:: bash
 
-.. parsed-literal::
-
-   make lib-linalg                     # print help message
-   make lib-linalg args="-m serial"    # build with GNU Fortran compiler (settings as with "make serial")
-   make lib-linalg args="-m mpi"       # build with default MPI Fortran compiler (settings as with "make mpi")
-   make lib-linalg args="-m gfortran"  # build with GNU Fortran compiler
-
+  $ make lib-linalg                     # print help message
+  $ make lib-linalg args="-m serial"    # build with GNU Fortran compiler (settings as with "make serial")
+  $ make lib-linalg args="-m mpi"       # build with default MPI Fortran compiler (settings as with "make mpi")
+  $ make lib-linalg args="-m gfortran"  # build with GNU Fortran compiler
 
 ----------
 
-
 .. _user-colvars:
 
 USER-COLVARS package
@@ -824,12 +815,12 @@ C++11-only features.
 **CMake build**\ :
 
 This is the recommended build recipe: no additional settings are normally
-needed besides "-D PKG\_USER-COLVARS=yes".
+needed besides "-D PKG_USER-COLVARS=yes".
 
 Building and linking of Lepton (or other C++11-only features) is enabled
 automatically when compilation is carried out with C++11 support, and disabled
 otherwise.  Optionally, Lepton build may be manually controlled with the flag
-"-D COLVARS\_LEPTON=yes\|no".
+"-D COLVARS_LEPTON=yes\|no".
 
 **Traditional make**\ :
 
@@ -843,13 +834,12 @@ LAMMPS.  This is best carried out from the LAMMPS src directory using a
 command like these, which simply invoke the lib/colvars/Install.py script with
 the specified args:
 
+.. code-block:: bash
 
-.. parsed-literal::
-
-   make lib-colvars                      # print help message
-   make lib-colvars args="-m serial"     # build with GNU g++ compiler (settings as with "make serial")
-   make lib-colvars args="-m mpi"        # build with default MPI compiler (settings as with "make mpi")
-   make lib-colvars args="-m g++-debug"  # build with GNU g++ compiler and colvars debugging enabled
+  $ make lib-colvars                      # print help message
+  $ make lib-colvars args="-m serial"     # build with GNU g++ compiler (settings as with "make serial")
+  $ make lib-colvars args="-m mpi"        # build with default MPI compiler (settings as with "make mpi")
+  $ make lib-colvars args="-m g++-debug"  # build with GNU g++ compiler and colvars debugging enabled
 
 The "machine" argument of the "-m" flag is used to find a Makefile.machine to
 use as build recipe.  If it does not already exist in lib/colvars, it will be
@@ -858,29 +848,31 @@ core LAMMPS makefiles.
 
 Optional flags may be specified as environment variables:
 
-COLVARS\_DEBUG=yes make lib-colvars args="-m machine"  # Build with debug code (much slower)
-COLVARS\_LEPTON=no make lib-colvars args="-m machine"  # Build without Lepton (included otherwise)
+.. code-block:: bash
+
+    $ COLVARS_DEBUG=yes make lib-colvars args="-m machine"  # Build with debug code (much slower)
+    $ COLVARS_LEPTON=no make lib-colvars args="-m machine"  # Build without Lepton (included otherwise)
 
 The build should produce two files: the library lib/colvars/libcolvars.a
 (which also includes Lepton objects if enabled) and the specification file
 lib/colvars/Makefile.lammps.  The latter is auto-generated, and normally does
 not need to be edited.
 
-
 ----------
 
-
 .. _user-plumed:
 
 USER-PLUMED package
 -------------------------------------
 
-.. _plumedinstall: http://plumed.github.io/doc-master/user-doc/html/\_installation.html
+.. _plumedinstall: https://plumed.github.io/doc-master/user-doc/html/_installation.html
 
 Before building LAMMPS with this package, you must first build PLUMED.
 PLUMED can be built as part of the LAMMPS build or installed separately
 from LAMMPS using the generic `plumed installation instructions <plumedinstall_>`_.
-
+The USER-PLUMED package has been tested to work with Plumed versions
+2.4.x, 2.5.x, and 2.6.x and will error out, when trying to run calculations
+with a different version of the Plumed kernel.
 
 PLUMED can be linked into MD codes in three different modes: static,
 shared, and runtime.  With the "static" mode, all the code that PLUMED
@@ -895,7 +887,7 @@ LAMMPS uses can be updated without the need for a recompile of LAMMPS
 for as long as the shared PLUMED library is ABI-compatible.
 
 The third linkage mode is "runtime" which allows the user to specify
-which PLUMED kernel should be used at runtime by using the PLUMED\_KERNEL
+which PLUMED kernel should be used at runtime by using the PLUMED_KERNEL
 environment variable. This variable should point to the location of the
 libplumedKernel.so dynamical shared object, which is then loaded at
 runtime. This mode of linking is particularly convenient for doing
@@ -912,32 +904,31 @@ LAMMPS build.
 
 **CMake build**\ :
 
-When the "-D PKG\_USER-PLUMED" flag is included in the cmake command you
+When the "-D PKG_USER-PLUMED" flag is included in the cmake command you
 must ensure that GSL is installed in locations that are specified in
 your environment.  There are then two additional commands that control
 the manner in which PLUMED is obtained and linked into LAMMPS.
 
-
-.. parsed-literal::
+.. code-block:: bash
 
    -D DOWNLOAD_PLUMED=value   # download PLUMED for build, value = no (default) or yes
    -D PLUMED_MODE=value       # Linkage mode for PLUMED, value = static (default), shared, or runtime
 
-If DOWNLOAD\_PLUMED is set to "yes", the PLUMED library will be
+If DOWNLOAD_PLUMED is set to "yes", the PLUMED library will be
 downloaded (the version of PLUMED that will be downloaded is hard-coded
 to a vetted version of PLUMED, usually a recent stable release version)
-and built inside the CMake build directory.  If DOWNLOAD\_PLUMED is set
+and built inside the CMake build directory.  If DOWNLOAD_PLUMED is set
 to "no" (the default), CMake will try to detect and link to an installed
 version of PLUMED.  For this to work, the PLUMED library has to be
 installed into a location where the pkg-config tool can find it or the
-PKG\_CONFIG\_PATH environment variable has to be set up accordingly.
+PKG_CONFIG_PATH environment variable has to be set up accordingly.
 PLUMED should be installed in such a location if you compile it using
 the default make; make install commands.
 
-The PLUMED\_MODE setting determines the linkage mode for the PLUMED
+The PLUMED_MODE setting determines the linkage mode for the PLUMED
 library.  The allowed values for this flag are "static" (default),
 "shared", or "runtime".  For a discussion of PLUMED linkage modes,
-please see above.  When DOWNLOAD\_PLUMED is enabled the static linkage
+please see above.  When DOWNLOAD_PLUMED is enabled the static linkage
 mode is recommended.
 
 **Traditional make**\ :
@@ -953,13 +944,12 @@ discussion of PLUMED linkage modes, please see above.
 Download/compilation/configuration of the plumed library can be done
 from the src folder through the following make args:
 
+.. code-block:: bash
 
-.. parsed-literal::
-
-   make lib-plumed                         # print help message
-   make lib-plumed args="-b"               # download and build PLUMED in lib/plumed/plumed2
-   make lib-plumed args="-p $HOME/.local"  # use existing PLUMED installation in $HOME/.local
-   make lib-plumed args="-p /usr/local -m shared"  # use existing PLUMED installation in
+  $ make lib-plumed                         # print help message
+  $ make lib-plumed args="-b"               # download and build PLUMED in lib/plumed/plumed2
+  $ make lib-plumed args="-p $HOME/.local"  # use existing PLUMED installation in $HOME/.local
+  $ make lib-plumed args="-p /usr/local -m shared"  # use existing PLUMED installation in
                                                    # /usr/local and use shared linkage mode
 
 Note that 2 symbolic (soft) links, "includelink" and "liblink" are
@@ -969,16 +959,15 @@ suitable for LAMMPS to compile and link PLUMED using the desired linkage
 mode. After this step is completed, you can install the USER-PLUMED
 package and compile LAMMPS in the usual manner:
 
+.. code-block:: bash
 
-.. parsed-literal::
-
-   make yes-user-plumed
-   make machine
+  $ make yes-user-plumed
+  $ make machine
 
 Once this compilation completes you should be able to run LAMMPS in the
 usual way.  For shared linkage mode, libplumed.so must be found by the
 LAMMPS executable, which on many operating systems means, you have to
-set the LD\_LIBRARY\_PATH environment variable accordingly.
+set the LD_LIBRARY_PATH environment variable accordingly.
 
 Support for the different linkage modes in LAMMPS varies for different
 operating systems, using the static linkage is expected to be the most
@@ -989,10 +978,8 @@ lib-plumed" with the desired settings **and** do a re-install if the
 USER-PLUMED package with "make yes-user-plumed" to update the required
 makefile settings with the changes in the lib/plumed folder.
 
-
 ----------
 
-
 .. _user-h5md:
 
 USER-H5MD package
@@ -1004,7 +991,7 @@ the HDF5 library.
 
 **CMake build**\ :
 
-No additional settings are needed besides "-D PKG\_USER-H5MD=yes".
+No additional settings are needed besides "-D PKG_USER-H5MD=yes".
 
 This should auto-detect the H5MD library on your system.  Several
 advanced CMake H5MD options exist if you need to specify where it is
@@ -1020,11 +1007,10 @@ lib/h5md/README.  You can also do it in one step from the lammps/src
 dir, using a command like these, which simply invoke the
 lib/h5md/Install.py script with the specified args:
 
+.. code-block:: bash
 
-.. parsed-literal::
-
-   make lib-h5md                     # print help message
-   make lib-h5md args="-m h5cc"      # build with h5cc compiler
+  $ make lib-h5md                     # print help message
+  $ make lib-h5md args="-m h5cc"      # build with h5cc compiler
 
 The build should produce two files: lib/h5md/libch5md.a and
 lib/h5md/Makefile.lammps.  The latter is copied from an existing
@@ -1034,10 +1020,8 @@ lib/h5md/Makefile.machine file for your system, which should define an
 EXTRAMAKE variable to specify a corresponding Makefile.lammps.machine
 file.
 
-
 ----------
 
-
 .. _user-intel:
 
 USER-INTEL package
@@ -1051,8 +1035,7 @@ on the :doc:`Speed intel <Speed_intel>` doc page.
 
 **CMake build**\ :
 
-
-.. parsed-literal::
+.. code-block:: bash
 
    -D INTEL_ARCH=value     # value = cpu (default) or knl
    -D INTEL_LRT_MODE=value # value = threads, none, or c++11
@@ -1072,14 +1055,13 @@ runs with other compilers and without TBB and MKL.
 **Traditional make**\ :
 
 Choose which hardware to compile for in Makefile.machine via the
-following settings.  See src/MAKE/OPTIONS/Makefile.intel\_cpu\* and
+following settings.  See src/MAKE/OPTIONS/Makefile.intel_cpu\* and
 Makefile.knl files for examples. and src/USER-INTEL/README for
 additional information.
 
 For CPUs:
 
-
-.. parsed-literal::
+.. code-block:: make
 
    OPTFLAGS =      -xHost -O2 -fp-model fast=2 -no-prec-div -qoverride-limits -qopt-zmm-usage=high
    CCFLAGS =       -g -qopenmp -DLAMMPS_MEMALIGN=64 -no-offload -fno-alias -ansi-alias -restrict $(OPTFLAGS)
@@ -1088,18 +1070,15 @@ For CPUs:
 
 For KNLs:
 
-
-.. parsed-literal::
+.. code-block:: make
 
    OPTFLAGS =      -xMIC-AVX512 -O2 -fp-model fast=2 -no-prec-div -qoverride-limits
    CCFLAGS =       -g -qopenmp -DLAMMPS_MEMALIGN=64 -no-offload -fno-alias -ansi-alias -restrict $(OPTFLAGS)
    LINKFLAGS =     -g -qopenmp $(OPTFLAGS)
    LIB =           -ltbbmalloc
 
-
 ----------
 
-
 .. _user-molfile:
 
 USER-MOLFILE package
@@ -1107,14 +1086,13 @@ USER-MOLFILE package
 
 **CMake build**\ :
 
-
-.. parsed-literal::
+.. code-block:: bash
 
    -D MOLFILE_INCLUDE_DIRS=path   # (optional) path where VMD molfile plugin headers are installed
    -D PKG_USER-MOLFILE=yes
 
-Using "-D PKG\_USER-MOLFILE=yes" enables the package, and setting
-"-D MOLFILE\_INCLUDE DIRS" allows to provide a custom location for
+Using "-D PKG_USER-MOLFILE=yes" enables the package, and setting
+"-D MOLFILE_INCLUDE DIRS" allows to provide a custom location for
 the molfile plugin header files. These should match the ABI of the
 plugin files used, and thus one typically sets them to include
 folder of the local VMD installation in use. LAMMPS ships with a
@@ -1134,10 +1112,8 @@ default headers, but these are not compatible with all VMD versions,
 so it is often best to change this setting to the location of the
 same include files of the local VMD installation in use.
 
-
 ----------
 
-
 .. _user-netcdf:
 
 USER-NETCDF package
@@ -1148,7 +1124,7 @@ on your system.
 
 **CMake build**\ :
 
-No additional settings are needed besides "-D PKG\_USER-NETCDF=yes".
+No additional settings are needed besides "-D PKG_USER-NETCDF=yes".
 
 This should auto-detect the NETCDF library if it is installed on your
 system at standard locations.  Several advanced CMake NETCDF options
@@ -1163,10 +1139,8 @@ and library files which LAMMPS needs to build with this package.  If
 the settings are not valid for your system, you will need to edit the
 Makefile.lammps file.  See lib/netcdf/README for details.
 
-
 ----------
 
-
 .. _user-omp:
 
 USER-OMP package
@@ -1174,7 +1148,7 @@ USER-OMP package
 
 **CMake build**\ :
 
-No additional settings are required besides "-D PKG\_USER-OMP=yes".  If
+No additional settings are required besides "-D PKG_USER-OMP=yes".  If
 CMake detects OpenMP support, the USER-OMP code will be compiled with
 multi-threading support enabled, otherwise as optimized serial code.
 
@@ -1185,46 +1159,57 @@ styles supporting OpenMP) the following compile and link flags must
 be added to your Makefile.machine file.
 See src/MAKE/OPTIONS/Makefile.omp for an example.
 
-
 .. parsed-literal::
 
-   CCFLAGS: -fopenmp               # for GNU Compilers
+   CCFLAGS: -fopenmp               # for GNU and Clang Compilers
    CCFLAGS: -qopenmp -restrict     # for Intel compilers on Linux
-   LINKFLAGS: -fopenmp             # for GNU Compilers
+   LINKFLAGS: -fopenmp             # for GNU and Clang Compilers
    LINKFLAGS: -qopenmp             # for Intel compilers on Linux
 
 For other platforms and compilers, please consult the documentation
 about OpenMP support for your compiler. Please see the note about
 how to address compatibility :ref:`issues with the 'default(none)' directive <default-none-issues>` of some compilers.
 
-
 ----------
 
-
 .. _user-qmmm:
 
 USER-QMMM package
 ---------------------------------
 
-.. note::
-
-   The LAMMPS executable these steps produce is not yet functional
-   for a QM/MM simulation.  You must also build Quantum ESPRESSO and
-   create a new executable (pwqmmm.x) which links LAMMPS and Quantum
-   ESPRESSO together.  These are steps 3 and 4 described in the
-   lib/qmmm/README file.  Unfortunately, the Quantum ESPRESSO developers
-   have been breaking the interface that the QM/MM code in LAMMPS is using,
-   so that currently (Summer 2018) using this feature requires either
-   correcting the library interface feature in recent Quantum ESPRESSO
-   releases, or using an outdated version of QE. The last version of
-   Quantum ESPRESSO known to work with this QM/MM interface was version
-   5.4.1 from 2016.
+For using LAMMPS to do QM/MM simulations via the USER-QMMM package you
+need to build LAMMPS as a library.  A LAMMPS executable with fix qmmm
+included can be built, but will not be able to do a QM/MM simulation
+on as such.  You must also build a QM code - currently only Quantum
+ESPRESSO (QE) is supported - and create a new executable which links
+LAMMPS and the QM code together.  Details are given in the
+lib/qmmm/README file.  It is also recommended to read the instructions
+for :doc:`linking with LAMMPS as a library <Build_link>` for
+background information.  This requires compatible Quantum Espresso
+and LAMMPS versions.  The current interface and makefiles have last
+been verified to work in February 2020 with Quantum Espresso versions
+6.3 to 6.5.
 
 **CMake build**\ :
 
-The CMake build system currently does not support building the full
-QM/MM-capable hybrid executable of LAMMPS and QE called pwqmmm.x.
-You must use the traditional make build for this package.
+When using CMake, building a LAMMPS library is required and it is
+recommended to build a shared library, since any libraries built from
+the sources in the *lib* folder (including the essential libqmmm.a)
+are not included in the static LAMMPS library and (currently) not
+installed, while their code is included in the shared LAMMPS library.
+Thus a typical command line to configure building LAMMPS for USER-QMMM
+would be:
+
+.. code-block:: bash
+
+    cmake -C ../cmake/presets/minimal.cmake -D PKG_USER-QMMM=yes \
+            -D BUILD_LIB=yes -DBUILD_SHARED_LIBS=yes ../cmake
+
+After completing the LAMMPS build and also configuring and compiling
+Quantum ESPRESSO with external library support (via "make couple"),
+go back to the lib/qmmm folder and follow the instructions on the
+README file to build the combined LAMMPS/QE QM/MM executable
+(pwqmmm.x) in the lib/qmmm folder.  You need to make certain, that
 
 **Traditional make**\ :
 
@@ -1234,13 +1219,12 @@ explained in lib/qmmm/README.  You can also do it in one step from the
 lammps/src dir, using a command like these, which simply invoke the
 lib/qmmm/Install.py script with the specified args:
 
+.. code-block:: bash
 
-.. parsed-literal::
-
-   make lib-qmmm                      # print help message
-   make lib-qmmm args="-m serial"     # build with GNU Fortran compiler (settings as in "make serial")
-   make lib-qmmm args="-m mpi"        # build with default MPI compiler (settings as in "make mpi")
-   make lib-qmmm args="-m gfortran"   # build with GNU Fortran compiler
+  $ make lib-qmmm                      # print help message
+  $ make lib-qmmm args="-m serial"     # build with GNU Fortran compiler (settings as in "make serial")
+  $ make lib-qmmm args="-m mpi"        # build with default MPI compiler (settings as in "make mpi")
+  $ make lib-qmmm args="-m gfortran"   # build with GNU Fortran compiler
 
 The build should produce two files: lib/qmmm/libqmmm.a and
 lib/qmmm/Makefile.lammps.  The latter is copied from an existing
@@ -1252,14 +1236,13 @@ a corresponding Makefile.lammps.machine file.
 
 You can then install QMMM package and build LAMMPS in the usual
 manner.  After completing the LAMMPS build and compiling Quantum
-ESPRESSO with external library support, go back to the lib/qmmm folder
-and follow the instructions on the README file to build the combined
-LAMMPS/QE QM/MM executable (pwqmmm.x) in the lib/qmmm folder.
-
+ESPRESSO with external library support (via "make couple"), go back to
+the lib/qmmm folder and follow the instructions in the README file to
+build the combined LAMMPS/QE QM/MM executable (pwqmmm.x) in the
+lib/qmmm folder.
 
 ----------
 
-
 .. _user-quip:
 
 USER-QUIP package
@@ -1273,29 +1256,26 @@ lib/quip/README file for details on how to do this.
 
 **CMake build**\ :
 
-
-.. parsed-literal::
+.. code-block:: bash
 
    -D QUIP_LIBRARY=path     # path to libquip.a (only needed if a custom location)
 
 CMake will not download and build the QUIP library.  But once you have
-done that, a CMake build of LAMMPS with "-D PKG\_USER-QUIP=yes" should
-work.  Set QUIP\_LIBRARY if CMake cannot find the QUIP library.
+done that, a CMake build of LAMMPS with "-D PKG_USER-QUIP=yes" should
+work.  Set QUIP_LIBRARY if CMake cannot find the QUIP library.
 
 **Traditional make**\ :
 
 The download/build procedure for the QUIP library, described in
 lib/quip/README file requires setting two environment variables,
-QUIP\_ROOT and QUIP\_ARCH.  These are accessed by the
+QUIP_ROOT and QUIP_ARCH.  These are accessed by the
 lib/quip/Makefile.lammps file which is used when you compile and link
 LAMMPS with this package.  You should only need to edit
 Makefile.lammps if the LAMMPS build can not use its settings to
 successfully build on your system.
 
-
 ----------
 
-
 .. _user-scafacos:
 
 USER-SCAFACOS package
@@ -1305,22 +1285,19 @@ To build with this package, you must download and build the `ScaFaCoS Coulomb so
 
 .. _scafacos-home: http://www.scafacos.de
 
-
-
 **CMake build**\ :
 
-
-.. parsed-literal::
+.. code-block:: bash
 
    -D DOWNLOAD_SCAFACOS=value    # download ScaFaCoS for build, value = no (default) or yes
    -D SCAFACOS_LIBRARY=path      # ScaFaCos library file (only needed if at custom location)
    -D SCAFACOS_INCLUDE_DIR=path  # ScaFaCoS include directory (only needed if at custom location)
 
-If DOWNLOAD\_SCAFACOS is set, the ScaFaCoS library will be downloaded
+If DOWNLOAD_SCAFACOS is set, the ScaFaCoS library will be downloaded
 and built inside the CMake build directory.  If the ScaFaCoS library
 is already on your system (in a location CMake cannot find it),
-SCAFACOS\_LIBRARY is the filename (plus path) of the ScaFaCoS library
-file, not the directory the library file is in.  SCAFACOS\_INCLUDE\_DIR
+SCAFACOS_LIBRARY is the filename (plus path) of the ScaFaCoS library
+file, not the directory the library file is in.  SCAFACOS_INCLUDE_DIR
 is the directory the ScaFaCoS include file is in.
 
 **Traditional make**\ :
@@ -1340,10 +1317,8 @@ created in lib/scafacos to point to the ScaFaCoS src dir.  When LAMMPS
 builds in src it will use these links.  You should not need to edit
 the lib/scafacos/Makefile.lammps file.
 
-
 ----------
 
-
 .. _user-smd:
 
 USER-SMD package
@@ -1354,15 +1329,14 @@ Eigen3 is a template library, so you do not need to build it.
 
 **CMake build**\ :
 
-
-.. parsed-literal::
+.. code-block:: bash
 
    -D DOWNLOAD_EIGEN3            # download Eigen3, value = no (default) or yes
    -D EIGEN3_INCLUDE_DIR=path    # path to Eigen library (only needed if a custom location)
 
-If DOWNLOAD\_EIGEN3 is set, the Eigen3 library will be downloaded and
+If DOWNLOAD_EIGEN3 is set, the Eigen3 library will be downloaded and
 inside the CMake build directory.  If the Eigen3 library is already on
-your system (in a location CMake cannot find it), EIGEN3\_INCLUDE\_DIR
+your system (in a location CMake cannot find it), EIGEN3_INCLUDE_DIR
 is the directory the Eigen3++ include file is in.
 
 **Traditional make**\ :
@@ -1372,22 +1346,19 @@ instructions in lib/smd/README.  You can also do it in one step from
 the lammps/src dir, using a command like these, which simply invoke
 the lib/smd/Install.py script with the specified args:
 
+.. code-block:: bash
 
-.. parsed-literal::
-
-   make lib-smd                         # print help message
-   make lib-smd args="-b"               # download to lib/smd/eigen3
-   make lib-smd args="-p /usr/include/eigen3"    # use existing Eigen installation in /usr/include/eigen3
+  $ make lib-smd                         # print help message
+  $ make lib-smd args="-b"               # download to lib/smd/eigen3
+  $ make lib-smd args="-p /usr/include/eigen3"    # use existing Eigen installation in /usr/include/eigen3
 
 Note that a symbolic (soft) link named "includelink" is created in
 lib/smd to point to the Eigen dir.  When LAMMPS builds it will use
 this link.  You should not need to edit the lib/smd/Makefile.lammps
 file.
 
-
 ----------
 
-
 .. _user-vtk:
 
 USER-VTK package
@@ -1398,7 +1369,7 @@ your system.
 
 **CMake build**\ :
 
-No additional settings are needed besides "-D PKG\_USER-VTK=yes".
+No additional settings are needed besides "-D PKG_USER-VTK=yes".
 
 This should auto-detect the VTK library if it is installed on your
 system at standard locations.  Several advanced VTK options exist if
@@ -1414,8 +1385,3 @@ the settings are not valid for your system, check if one of the other
 lib/vtk/Makefile.lammps.\* files is compatible and copy it to
 Makefile.lammps.  If none of the provided files work, you will need to
 edit the Makefile.lammps file.  See lib/vtk/README for details.
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/Build_link.rst b/doc/src/Build_link.rst
index 8306fcb86f..b18dc49e38 100644
--- a/doc/src/Build_link.rst
+++ b/doc/src/Build_link.rst
@@ -3,89 +3,248 @@ Link LAMMPS as a library to another code
 
 LAMMPS can be used as a library by another application, including
 Python scripts.  The files src/library.cpp and library.h define the
-C-style API for using LAMMPS as a library.  See the :doc:`Howto library <Howto_library>` doc page for a description of the
-interface and how to extend it for your needs.
+C-style API for using LAMMPS as a library.  See the :doc:`Howto
+library <Howto_library>` doc page for a description of the interface
+and how to extend it for your needs.
 
 The :doc:`Build basics <Build_basics>` doc page explains how to build
 LAMMPS as either a shared or static library.  This results in one of
 these 2 files:
 
-liblammps.so      # shared library
-liblammps.a       # static library
+.. code-block:: bash
 
+   liblammps.so      # shared library
+   liblammps.a       # static library
+
+.. note::
+
+   Care should be taken to use the same MPI library for the calling
+   code and the LAMMPS library.  The library.h file includes mpi.h and
+   uses definitions from it so those need to be available and
+   consistent.  When LAMMPS is compiled with the MPI STUBS library,
+   then its mpi.h file needs to be included.  While it is technically
+   possible to use a full MPI library in the calling code and link to
+   a serial LAMMPS library compiled with MPI STUBS, it is recommended
+   to use the *same* MPI library for both, and then use MPI_Comm_split()
+   in the calling code to pass a suitable communicator with a subset
+   of MPI ranks to the function creating the LAMMPS instance.
 
 ----------
 
-
 **Link with LAMMPS as a static library**\ :
 
-The calling application can link to LAMMPS as a static library with a
-link command like this:
+The calling application can link to LAMMPS as a static library with
+compilation and link commands as in the examples shown below.  These
+are examples for a code written in C in the file *caller.c*.
+The benefit of linking to a static library is, that the resulting
+executable is independent of that library since all required
+executable code from the library is copied into the calling executable.
 
-g++ caller.o -L/home/sjplimp/lammps/src -llammps -o caller
+*CMake build*\ :
 
-The -L argument is the path to where the liblammps.a file is.  The
--llammps argument is shorthand for the file liblammps.a.
+This assumes that LAMMPS has been configured with "-D BUILD_LIB=yes"
+and installed with "make install" and the PKG_CONFIG_PATH environment
+variable updated to include the *liblammps.pc* file installed into the
+configured destination folder, if needed.  The commands to compile and
+link the coupled executable are then:
 
+.. code-block:: bash
+
+   mpicc -c -O $(pkgconf liblammps --cflags) caller.c
+   mpicxx -o caller caller.o -$(pkgconf liblammps --libs)
+
+*Traditional make*\ :
+
+This assumes that LAMMPS has been compiled in the folder
+"${HOME}/lammps/src" with "make mode=lib mpi". The commands to compile
+and link the coupled executable are then:
+
+.. code-block:: bash
+
+   mpicc -c -O -I${HOME}/lammps/src caller.c
+   mpicxx -o caller caller.o -L${HOME}/lammps/src -llammps
+
+The *-I* argument is the path to the location of the *library.h*
+header file containing the interface to the LAMMPS C-style library
+interface.  The *-L* argument is the path to where the *liblammps.a*
+file is located.  The *-llammps* argument is shorthand for telling the
+compiler to link the file *liblammps.a*\ .
+
+However, it is only as simple as shown above for the case of a plain
+LAMMPS library without any optional packages that depend on libraries
+(bundled or external).  Otherwise, you need to include all flags,
+libraries, and paths for the coupled executable, that are also
+required to link the LAMMPS executable.
+
+*CMake build*\ :
+
+When using CMake, additional libraries with sources in the lib folder
+are built, but not included in liblammps.a and (currently) not
+installed with "make install" and not included in the *pkgconfig*
+configuration file.  They can be found in the top level build folder,
+but you have to determine the necessary link flags manually.  It is
+therefore recommended to either use the traditional make procedure to
+build and link with a static library or build and link with a shared
+library instead.
+
+*Traditional make*\ :
+
+After you have compiled a static LAMMPS library using the conventional
+build system for example with "make mode=lib serial". And you also
+have installed the POEMS package after building its bundled library in
+lib/poems. Then the commands to build and link the coupled executable
+change to:
+
+.. code-block:: bash
+
+   gcc -c -O -I${HOME}/lammps/src/STUBS -I${HOME}/lammps/src -caller.c
+   g++ -o caller caller.o -L${HOME}/lammps/lib/poems \
+     -L${HOME}/lammps/src/STUBS -L${HOME}/lammps/src -llammps -lpoems -lmpi_stubs
+
+Note, that you need to link with "g++" instead of "gcc", since LAMMPS
+is C++ code.  You can display the currently applied settings for building
+LAMMPS for the "serial" machine target by using the command:
+
+.. code-block:: bash
+
+   make mode=print serial
+
+Which should output something like:
+
+.. code-block:: bash
+
+   # Compiler:
+   CXX=g++
+   # Linker:
+   LD=g++
+   # Compilation:
+   CXXFLAGS=-g -O3 -DLAMMPS_GZIP -DLAMMPS_MEMALIGN=64 -I${HOME}/lammps/lib/poems -I${HOME}/lammps/src/STUBS
+   # Linking:
+   LDFLAGS=-g -O
+   # Libraries:
+   LDLIBS=-L${HOME}/lammps/lib/poems -L${HOME}/lammps/src/STUBS -lpoems -lmpi_stubs
+
+From this you can gather the necessary paths and flags.  With
+makefiles for other *machine* configurations you need to do the
+equivalent and replace "serial" with the corresponding *machine* name
+of the makefile.
 
 ----------
 
-
 **Link with LAMMPS as a shared library**\ :
 
-If you wish to link to liblammps.so, the operating system finds shared
-libraries to load at run-time using the environment variable
-LD\_LIBRARY\_PATH.  To enable this you can do one of two things:
+When linking to LAMMPS built as a shared library, the situation
+becomes much simpler, as all dependent libraries and objects are
+included in the shared library, which is - technically speaking -
+effectively a regular LAMMPS executable that is missing the `main()`
+function.  Thus those libraries need not to be specified when linking
+the calling executable.  Only the *-I* flags are needed.  So the
+example case from above of the serial version static LAMMPS library
+with the POEMS package installed becomes:
 
-(1) Copy the liblammps.so file to a location the system can find it,
-such as /usr/local/lib.  I.e. a directory already listed in your
-LD\_LIBRARY\_PATH variable.  You can type
+*CMake build*\ :
 
+The commands with a shared LAMMPS library compiled with the CMake
+build process are the same as for the static library.
 
-.. parsed-literal::
+.. code-block:: bash
+
+   mpicc -c -O $(pkgconf liblammps --cflags) caller.c
+   mpicxx -o caller caller.o -$(pkgconf --libs)
+
+*Traditional make*\ :
+
+The commands with a shared LAMMPS library compiled with the
+traditional make build using "make mode=shlib serial" becomes:
+
+.. code-block:: bash
+
+   gcc -c -O -I${HOME}/lammps/src/STUBS -I${HOME}/lammps/src -caller.c
+   g++ -o caller caller.o -L${HOME}/lammps/src -llammps
+
+*Locating liblammps.so at runtime*\ :
+
+However, now the `liblammps.so` file is required at runtime and needs
+to be in a folder, where the shared linker program of the operating
+system can find it.  This would be either a folder like "/usr/local/lib64"
+or "${HOME}/.local/lib64" or a folder pointed to by the LD_LIBRARY_PATH
+environment variable. You can type
+
+.. code-block:: bash
 
    printenv LD_LIBRARY_PATH
 
 to see what directories are in that list.
 
-(2) Add the LAMMPS src directory (or the directory you perform CMake
-build in) to your LD\_LIBRARY\_PATH, so that the current version of the
-shared library is always available to programs that use it.
+Or you can add the LAMMPS src directory (or the directory you performed
+a CMake style build in) to your LD_LIBRARY_PATH, so that the current
+version of the shared library is always available to programs that use it.
 
-For the csh or tcsh shells, you would add something like this to your
-~/.cshrc file:
+For the Bourne or Korn shells (/bin/sh, /bin/ksh, /bin/bash etc.), you
+would add something like this to your ~/.profile file:
 
+.. code-block:: bash
 
-.. parsed-literal::
+   LD_LIBRARY_PATH ${LD_LIBRARY_PATH-/usr/lib64}:${HOME}/lammps/src
+   export LD_LIBRARY_PATH
 
-   setenv LD_LIBRARY_PATH ${LD_LIBRARY_PATH}:/home/sjplimp/lammps/src
+For the csh or tcsh shells, you would equivalently add something like this
+to your ~/.cshrc file:
 
+.. code-block:: csh
+
+   setenv LD_LIBRARY_PATH ${LD_LIBRARY_PATH}:${HOME}/lammps/src
+
+You can verify whether all required shared libraries are found with the
+`ldd` tool.  Example:
+
+.. code-block:: bash
+
+   $ LD_LIBRARY_PATH=/home/user/lammps/src ldd caller
+        linux-vdso.so.1 (0x00007ffe729e0000)
+        liblammps.so => /home/user/lammps/src/liblammps.so (0x00007fc91bb9e000)
+        libstdc++.so.6 => /lib64/libstdc++.so.6 (0x00007fc91b984000)
+        libm.so.6 => /lib64/libm.so.6 (0x00007fc91b83e000)
+        libgcc_s.so.1 => /lib64/libgcc_s.so.1 (0x00007fc91b824000)
+        libc.so.6 => /lib64/libc.so.6 (0x00007fc91b65b000)
+        /lib64/ld-linux-x86-64.so.2 (0x00007fc91c094000)
+
+If a required library is missing, you would get a 'not found' entry:
+
+.. code-block:: bash
+
+   $  ldd caller
+        linux-vdso.so.1 (0x00007ffd672fe000)
+        liblammps.so => not found
+        libstdc++.so.6 => /usr/lib64/libstdc++.so.6 (0x00007fb7c7e86000)
+        libm.so.6 => /usr/lib64/libm.so.6 (0x00007fb7c7d40000)
+        libgcc_s.so.1 => /usr/lib64/libgcc_s.so.1 (0x00007fb7c7d26000)
+        libc.so.6 => /usr/lib64/libc.so.6 (0x00007fb7c7b5d000)
+        /lib64/ld-linux-x86-64.so.2 (0x00007fb7c80a2000)
 
 ----------
 
-
 **Calling the LAMMPS library**\ :
 
 Either flavor of library (static or shared) allows one or more LAMMPS
-objects to be instantiated from the calling program.
+objects to be instantiated from the calling program. When used from a
+C++ program, most of the symbols and functions in LAMMPS are wrapped
+in a LAMMPS_NS namespace; you can safely use any of its classes and
+methods from within the calling code, as needed, and you will not incur
+conflicts with functions and variables in your code that share the name.
+This, however, does not extend to all additional libraries bundled with
+LAMMPS in the lib folder and some of the low-level code of some packages.
 
-When used from a C++ program, all of LAMMPS is wrapped in a LAMMPS\_NS
-namespace; you can safely use any of its classes and methods from
-within the calling code, as needed.
-
-When used from a C or Fortran program, the library has a simple
+To be compatible with C, Fortran, Python programs, the library has a simple
 C-style interface, provided in src/library.cpp and src/library.h.
 
 See the :doc:`Python library <Python_library>` doc page for a
 description of the Python interface to LAMMPS, which wraps the C-style
-interface.
+interface from a shared library through the `ctypes python module <ctypes_>`_.
 
 See the sample codes in examples/COUPLE/simple for examples of C++ and
 C and Fortran codes that invoke LAMMPS through its library interface.
 Other examples in the COUPLE directory use coupling ideas discussed on
 the :doc:`Howto couple <Howto_couple>` doc page.
 
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
+.. _ctypes: https://docs.python.org/3/library/ctypes.html
diff --git a/doc/src/Build_make.rst b/doc/src/Build_make.rst
index 8f1966f101..0379a8379a 100644
--- a/doc/src/Build_make.rst
+++ b/doc/src/Build_make.rst
@@ -7,18 +7,33 @@ src/MAKE/MACHINES, src/MAKE/OPTIONS, or src/MAKE/MINE directory (see
 below).  It can include various options for customizing your LAMMPS
 build with a number of global compilation options and features.
 
+Those makefiles are written for and tested with GNU make and may not
+be compatible with other make programs.  In most cases, if the "make"
+program is not GNU make, then there will be a GNU make program
+available under the name "gmake".  If GNU make or a compatible make is
+not available, you may have to first install it or switch to building
+with :doc:`CMake <Build_cmake>`.  The makefiles of the traditional
+make based build process and the scripts they are calling expect a few
+additional tools to be available and functioning.
+
+  * a Bourne shell compatible "Unix" shell program (often this is bash)
+  * a few shell utilities: ls, mv, ln, rm, grep, sed, tr, cat, touch, diff, dirname
+  * python (optional, required for "make lib-XXX" in the src folder)
+
 To include LAMMPS packages (i.e. optional commands and styles) you
-must install them first, as discussed on the :doc:`Build package <Build_package>` doc page.  If the packages require
-provided or external libraries, you must build those libraries before
-building LAMMPS.  Building :doc:`LAMMPS with CMake <Build_cmake>` can
-automate all of this for many types of machines, especially
-workstations, desktops and laptops, so we suggest you try it first.
+must enable them first, as discussed on the :doc:`Build package
+<Build_package>` doc page.  If a packages requires (provided or
+external) libraries, you must configure and build those libraries
+**before** building LAMMPS itself and especially **before** enabling
+such a package with "make yes-<package>".  Building :doc:`LAMMPS
+with CMake <Build_cmake>` can automate much of this for many types of
+machines, especially workstations, desktops, and laptops, so we suggest
+you try it first when building LAMMPS in those cases.
 
-These commands perform a default LAMMPS build, producing the LAMMPS
-executable lmp\_serial or lmp\_mpi in lammps/src:
+The commands below perform a default LAMMPS build, producing the LAMMPS
+executable lmp_serial and lmp_mpi in lammps/src:
 
-
-.. parsed-literal::
+.. code-block:: bash
 
    cd lammps/src
    make serial     # build a serial LAMMPS executable
@@ -42,21 +57,23 @@ re-compiled.
 
 .. note::
 
-   When you build LAMMPS for the first time, a long list of \*.d
-   files will be printed out rapidly.  This is not an error; it is the
-   Makefile doing its normal creation of dependencies.
-
+   Before the actual compilation starts, LAMMPS will perform several
+   steps to collect information from the configuration and setup that
+   is then embedded into the executable.  When you build LAMMPS for
+   the first time, it will also compile a tool to quickly assemble
+   a list of dependencies, that are required for the make program to
+   correctly detect which parts need to be recompiled after changes
+   were made to the sources.
 
 ----------
 
+The lammps/src/MAKE tree contains the Makefile.machine files included
+in the LAMMPS distribution.  Typing "make machine" uses
+*Makefile.machine*\ .  Thus the "make serial" or "make mpi" lines above
+use Makefile.serial and Makefile.mpi, respectively.  Other makefiles
+are in these directories:
 
-The lammps/src/MAKE tree contains all the Makefile.machine files
-included in the LAMMPS distribution.  Typing "make machine" uses
-Makefile.machine.  Thus the "make serial" or "make mpi" lines above
-use Makefile.serial and Makefile.mpi.  Others are in these dirs:
-
-
-.. parsed-literal::
+.. code-block:: bash
 
    OPTIONS      # Makefiles which enable specific options
    MACHINES     # Makefiles for specific machines
@@ -64,7 +81,7 @@ use Makefile.serial and Makefile.mpi.  Others are in these dirs:
 
 Typing "make" lists all the available Makefile.machine files.  A file
 with the same name can appear in multiple folders (not a good idea).
-The order the dirs are searched is as follows: src/MAKE/MINE,
+The order the directories are searched is as follows: src/MAKE/MINE,
 src/MAKE, src/MAKE/OPTIONS, src/MAKE/MACHINES.  This gives preference
 to a customized file you put in src/MAKE/MINE.
 
@@ -75,8 +92,7 @@ customized machine Makefile are contributed by users.  Since both
 compilers, OS configurations, and LAMMPS itself keep changing, their
 settings may become outdated:
 
-
-.. parsed-literal::
+.. code-block:: bash
 
    make mac             # build serial LAMMPS on a Mac
    make mac_mpi         # build parallel LAMMPS on a Mac
@@ -87,8 +103,3 @@ settings may become outdated:
    make kokkos_omp      # build with the KOKKOS package for OpenMP
    make kokkos_cuda_mpi # build with the KOKKOS package for GPUs
    make kokkos_phi      # build with the KOKKOS package for KNLs
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/Build_package.rst b/doc/src/Build_package.rst
index 9f56f3f329..2e0bea723a 100644
--- a/doc/src/Build_package.rst
+++ b/doc/src/Build_package.rst
@@ -14,10 +14,13 @@ package.  In general there is no need to include a package if you
 never plan to use its features.
 
 If you get a run-time error that a LAMMPS command or style is
-"Unknown", it is often because the command is contained in a package,
-and your build did not include that package.  Running LAMMPS with the
-:doc:`-h command-line switch <Run_options>` will print all the included
-packages and commands for that executable.
+"unknown", it is often because the command is contained in a package,
+and your build did not include that package.  If the command or style
+*is* available in a package included in the LAMMPS distribution,
+the error message will indicate which package would be needed.
+Running LAMMPS with the :doc:`-h command-line switch <Run_options>`
+will print *all* optional commands and packages that were enabled
+when building that executable.
 
 For the majority of packages, if you follow the single step below to
 include it, you can then build LAMMPS exactly the same as you would
@@ -42,17 +45,15 @@ packages:
 The mechanism for including packages is simple but different for CMake
 versus make.
 
-**CMake variables**\ :
+**CMake build**\ :
 
-
-.. parsed-literal::
+.. code-block:: csh
 
    -D PKG_NAME=value          # yes or no (default)
 
 Examples:
 
-
-.. parsed-literal::
+.. code-block:: csh
 
    -D PKG_MANYBODY=yes
    -D PKG_USER-INTEL=yes
@@ -73,8 +74,7 @@ once with CMake.
 
 **Traditional make**\ :
 
-
-.. parsed-literal::
+.. code-block:: bash
 
    cd lammps/src
    make ps                    # check which packages are currently installed
@@ -84,8 +84,7 @@ once with CMake.
 
 Examples:
 
-
-.. parsed-literal::
+.. code-block:: bash
 
    make no-rigid
    make yes-user-intel
@@ -119,7 +118,7 @@ are already included.  Likewise, if a package is excluded, other files
 dependent on that package are also excluded.
 
 When you download a LAMMPS tarball or download LAMMPS source files
-from the Git or SVN repositories, no packages are pre-installed in the
+from the git repository, no packages are pre-installed in the
 src directory.
 
 .. note::
@@ -129,16 +128,15 @@ src directory.
    That is no longer the case, so that CMake will build as-is without the
    need to un-install those packages.
 
-
 ----------
 
-
 **CMake shortcuts for installing many packages**\ :
 
 Instead of specifying all the CMake options via the command-line,
-CMake allows initializing the variable cache using script files. These
-are regular CMake files which can manipulate and set variables, and
-can also contain control flow constructs.
+CMake allows initializing its settings cache using script files.
+These are regular CMake files which can manipulate and set CMake
+variables (which represent selected options), and can also contain
+control flow constructs for more complex operations.
 
 LAMMPS includes several of these files to define configuration
 "presets", similar to the options that exist for the Make based
@@ -146,33 +144,27 @@ system. Using these files you can enable/disable portions of the
 available packages in LAMMPS. If you need a custom preset you can take
 one of them as a starting point and customize it to your needs.
 
-+-------------------------------------------------------------+-----------------------------------------------------------+
-| cmake -C ../cmake/presets/all\_on.cmake  [OPTIONS] ../cmake | enable all packages                                       |
-+-------------------------------------------------------------+-----------------------------------------------------------+
-| cmake -C ../cmake/presets/all\_off.cmake [OPTIONS] ../cmake | disable all packages                                      |
-+-------------------------------------------------------------+-----------------------------------------------------------+
-| cmake -C ../cmake/presets/minimal.cmake [OPTIONS] ../cmake  | enable just a few core packages                           |
-+-------------------------------------------------------------+-----------------------------------------------------------+
-| cmake -C ../cmake/presets/most.cmake    [OPTIONS] ../cmake  | enable most common packages                               |
-+-------------------------------------------------------------+-----------------------------------------------------------+
-| cmake -C ../cmake/presets/nolib.cmake   [OPTIONS] ../cmake  | disable packages that do require extra libraries or tools |
-+-------------------------------------------------------------+-----------------------------------------------------------+
-| cmake -C ../cmake/presets/clang.cmake   [OPTIONS] ../cmake  | change settings to use the Clang compilers by default     |
-+-------------------------------------------------------------+-----------------------------------------------------------+
-| cmake -C ../cmake/presets/mingw.cmake [OPTIONS] ../cmake    | enable all packages compatible with MinGW compilers       |
-+-------------------------------------------------------------+-----------------------------------------------------------+
+.. code-block:: bash
+
+    cmake -C ../cmake/presets/minimal.cmake [OPTIONS] ../cmake  # enable just a few core packages
+    cmake -C ../cmake/presets/most.cmake    [OPTIONS] ../cmake  # enable most packages
+    cmake -C ../cmake/presets/nolib.cmake   [OPTIONS] ../cmake  # disable packages that do require extra libraries or tools
+    cmake -C ../cmake/presets/clang.cmake   [OPTIONS] ../cmake  # change settings to use the Clang compilers by default
+    cmake -C ../cmake/presets/intel.cmake   [OPTIONS] ../cmake  # change settings to use the Intel compilers by default
+    cmake -C ../cmake/presets/all_on.cmake  [OPTIONS] ../cmake  # enable all packages
+    cmake -C ../cmake/presets/all_off.cmake [OPTIONS] ../cmake  # disable all packages
+    mingw64-cmake -C ../cmake/presets/mingw-cross.cmake [OPTIONS] ../cmake  #  compile with MinGW cross compilers
 
 .. note::
 
-   Running cmake this way manipulates the variable cache in your
+   Running cmake this way manipulates the CMake settings cache in your
    current build directory. You can combine multiple presets and options
    in a single cmake run, or change settings incrementally by running
    cmake with new flags.
 
 **Example:**
 
-
-.. parsed-literal::
+.. code-block:: bash
 
    # build LAMMPS with most commonly used packages, but then remove
    # those requiring additional library or tools, but still enable
@@ -188,49 +180,40 @@ one of them as a starting point and customize it to your needs.
    # but leaving all other settings untouched. You can run:
    cmake -C ../cmake/presets/no_all.cmake .
 
-
 ----------
 
-
 **Make shortcuts for installing many packages**\ :
 
 The following commands are useful for managing package source files
 and their installation when building LAMMPS via traditional make.
-Just type "make" in lammps/src to see a one-line summary.
+Just type ``make`` in lammps/src to see a one-line summary.
 
 These commands install/un-install sets of packages:
 
-+-----------------------------------+-----------------------------------------------------+
-| make yes-all                      | install all packages                                |
-+-----------------------------------+-----------------------------------------------------+
-| make no-all                       | un-install all packages                             |
-+-----------------------------------+-----------------------------------------------------+
-| make yes-standard or make yes-std | install standard packages                           |
-+-----------------------------------+-----------------------------------------------------+
-| make no-standard or make no-std   | un-install standard packages                        |
-+-----------------------------------+-----------------------------------------------------+
-| make yes-user                     | install user packages                               |
-+-----------------------------------+-----------------------------------------------------+
-| make no-user                      | un-install user packages                            |
-+-----------------------------------+-----------------------------------------------------+
-| make yes-lib                      | install packages that require extra libraries       |
-+-----------------------------------+-----------------------------------------------------+
-| make no-lib                       | un-install packages that require extra libraries    |
-+-----------------------------------+-----------------------------------------------------+
-| make yes-ext                      | install packages that require external libraries    |
-+-----------------------------------+-----------------------------------------------------+
-| make no-ext                       | un-install packages that require external libraries |
-+-----------------------------------+-----------------------------------------------------+
+.. code-block:: bash
 
-which install/un-install various sets of packages.  Typing "make
-package" will list all the these commands.
+    make yes-all                        # install all packages
+    make no-all                         # uninstall all packages
+    make yes-standard or make yes-std   # install standard packages
+    make no-standard or make no-std     # uninstall standard packages
+    make yes-user                       # install user packages
+    make no-user                        # uninstall user packages
+    make yes-lib                        # install packages that require extra libraries
+    make no-lib                         # uninstall packages that require extra libraries
+    make yes-ext                        # install packages that require external libraries
+    make no-ext                         # uninstall packages that require external libraries
+
+which install/un-install various sets of packages.  Typing ``make
+package`` will list all the these commands.
 
 .. note::
 
-   Installing or un-installing a package works by simply copying
-   files back and forth between the main src directory and
-   sub-directories with the package name (e.g. src/KSPACE, src/USER-ATC),
-   so that the files are included or excluded when LAMMPS is built.
+   Installing or un-installing a package for the make based build process
+   works by simply copying files back and forth between the main source
+   directory src and the sub-directories with the package name (e.g.
+   src/KSPACE, src/USER-ATC), so that the files are included or excluded
+   when LAMMPS is built.  Only source files in the src folder will be
+   compiled.
 
 The following make commands help manage files that exist in both the
 src directory and in package sub-directories.  You do not normally
@@ -238,28 +221,23 @@ need to use these commands unless you are editing LAMMPS files or are
 :doc:`installing a patch <Install_patch>` downloaded from the LAMMPS web
 site.
 
-Type "make package-status" or "make ps" to show which packages are
+Type ``make package-status`` or ``make ps`` to show which packages are
 currently installed.  For those that are installed, it will list any
 files that are different in the src directory and package
 sub-directory.
 
-Type "make package-installed" or "make pi" to show which packages are
+Type ``make package-installed`` or ``make pi`` to show which packages are
 currently installed, without listing the status of packages that are
 not installed.
 
-Type "make package-update" or "make pu" to overwrite src files with
+Type ``make package-update`` or ``make pu`` to overwrite src files with
 files from the package sub-directories if the package is installed.
 It should be used after a :doc:`patch has been applied <Install_patch>`,
 since patches only update the files in the package sub-directory, but
 not the src files.
 
-Type "make package-overwrite" to overwrite files in the package
+Type ``make package-overwrite`` to overwrite files in the package
 sub-directories with src files.
 
-Type "make package-diff" to list all differences between pairs of
-files in both the src dir and a package dir.
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
+Type ``make package-diff`` to list all differences between pairs of
+files in both the source directory and the package directory.
diff --git a/doc/src/Build_settings.rst b/doc/src/Build_settings.rst
index cdb8016f57..01792507e7 100644
--- a/doc/src/Build_settings.rst
+++ b/doc/src/Build_settings.rst
@@ -4,68 +4,35 @@ Optional build settings
 LAMMPS can be built with several optional settings.  Each sub-section
 explain how to do this for building both with CMake and make.
 
-| :ref:`C++11 standard compliance test <cxx11>` when building all of LAMMPS
-| :ref:`FFT library <fft>` for use with the :doc:`kspace_style pppm <kspace_style>` command
-| :ref:`Size of LAMMPS data types <size>`
-| :ref:`Read or write compressed files <gzip>`
-| :ref:`Output of JPG and PNG files <graphics>` via the :doc:`dump image <dump_image>` command
-| :ref:`Output of movie files <graphics>` via the :doc:`dump_movie <dump_image>` command
-| :ref:`Memory allocation alignment <align>`
-| :ref:`Workaround for long long integers <longlong>`
-| :ref:`Error handling exceptions <exceptions>` when using LAMMPS as a library 
-| 
-
+* :ref:`C++11 standard compliance <cxx11>` when building all of LAMMPS
+* :ref:`FFT library <fft>` for use with the :doc:`kspace_style pppm <kspace_style>` command
+* :ref:`Size of LAMMPS data types <size>`
+* :ref:`Read or write compressed files <gzip>`
+* :ref:`Output of JPG and PNG files <graphics>` via the :doc:`dump image <dump_image>` command
+* :ref:`Output of movie files <graphics>` via the :doc:`dump_movie <dump_image>` command
+* :ref:`Memory allocation alignment <align>`
+* :ref:`Workaround for long long integers <longlong>`
+* :ref:`Error handling exceptions <exceptions>` when using LAMMPS as a library
 
 ----------
 
-
 .. _cxx11:
 
-C++11 standard compliance test
+C++11 standard compliance
 ------------------------------------------
 
-The LAMMPS developers plan to transition to make the C++11 standard the
-minimum requirement for compiling LAMMPS.  Currently this only applies to
-some packages like KOKKOS while the rest aims to be compatible with the C++98
-standard.  Most currently used compilers are compatible with C++11; some need
-to set extra flags to switch.  To determine the impact of requiring C++11,
-we have added a simple compliance test to the source code, that will cause
-the compilation to abort, if C++11 compliance is not available or enabled.
-To bypass this check, you need to change a setting in the makefile or
-when calling CMake.
+A C++11 standard compatible compiler is a requirement for compiling LAMMPS.
+LAMMPS version 3 March 2020 is the last version compatible with the previous
+C++98 standard for the core code and most packages. Most currently used
+C++ compilers are compatible with C++11, but some older ones may need extra
+flags to enable C++11 compliance.  Example for GNU c++ 4.8.x:
 
-**CMake variable**\ :
-
-
-.. parsed-literal::
-
-   -D DISABLE_CXX11_REQUIREMENT=yes
-
-You can set additional C++ compiler flags (beyond those selected by CMake)
-through the CMAKE\_CXX\_FLAGS variable. Example for CentOS 7:
-
-
-.. parsed-literal::
-
-   -D CMAKE_CXX_FLAGS="-O3 -g -fopenmp -DNDEBUG -std=c++11"
-
-**Makefile.machine setting**\ to bypass the C++11 test and compile in C++98 mode:
-
-
-.. parsed-literal::
-
-   LMP_INC = -DLAMMPS_CXX98
-
-**Makefile.machine setting**\ to enable the C++11 with older (but not too old) GNU c++ (e.g. on CentOS 7):
-
-
-.. parsed-literal::
+.. code-block:: make
 
    CCFLAGS = -g -O3 -std=c++11
 
 ----------
 
-
 .. _fft:
 
 FFT library
@@ -79,8 +46,7 @@ LAMMPS can use them if they are available on your system.
 
 **CMake variables**\ :
 
-
-.. parsed-literal::
+.. code-block:: bash
 
    -D FFT=value              # FFTW3 or MKL or KISS, default is FFTW3 if found, else KISS
    -D FFT_SINGLE=value       # yes or no (default), no = double precision
@@ -99,42 +65,44 @@ OpenMP threads are enabled and a packages like KOKKOS or USER-OMP is
 used.  If CMake cannot detect the FFT library, you can set these variables
 to assist:
 
-
-.. parsed-literal::
+.. code-block:: bash
 
    -D FFTW3_INCLUDE_DIRS=path  # path to FFTW3 include files
    -D FFTW3_LIBRARIES=path     # path to FFTW3 libraries
    -D FFT_FFTW_THREADS=on      # enable using threaded FFTW3 libraries
    -D MKL_INCLUDE_DIRS=path    # ditto for Intel MKL library
+   -D FFT_MKL_THREADS=on       # enable using threaded FFTs with MKL libraries
    -D MKL_LIBRARIES=path
 
 **Makefile.machine settings**\ :
 
-
-.. parsed-literal::
+.. code-block:: make
 
    FFT_INC = -DFFT_FFTW3         # -DFFT_FFTW3, -DFFT_FFTW (same as -DFFT_FFTW3), -DFFT_MKL, or -DFFT_KISS
                                  # default is KISS if not specified
    FFT_INC = -DFFT_SINGLE        # do not specify for double precision
    FFT_INC = -DFFT_FFTW_THREADS  # enable using threaded FFTW3 libraries
+   FFT_INC = -DFFT_MKL_THREADS   # enable using threaded FFTs with MKL libraries
    FFT_INC = -DFFT_PACK_ARRAY    # or -DFFT_PACK_POINTER or -DFFT_PACK_MEMCPY
 
-# default is FFT\_PACK\_ARRAY if not specified
+# default is FFT_PACK_ARRAY if not specified
 
-
-.. parsed-literal::
+.. code-block:: make
 
    FFT_INC =       -I/usr/local/include
    FFT_PATH =      -L/usr/local/lib
    FFT_LIB =       -lfftw3             # FFTW3 double precision
    FFT_LIB =       -lfftw3 -lfftw3_omp # FFTW3 double precision with threads (needs -DFFT_FFTW_THREADS)
    FFT_LIB =       -lfftw3 -lfftw3f    # FFTW3 single precision
-   FFT_LIB =       -lmkl_intel_lp64 -lmkl_sequential -lmkl_core  # MKL with Intel compiler
-   FFT_LIB =       -lmkl_gf_lp64 -lmkl_sequential -lmkl_core     # MKL with GNU compier
+   FFT_LIB =       -lmkl_intel_lp64 -lmkl_sequential -lmkl_core   # MKL with Intel compiler, serial interface
+   FFT_LIB =       -lmkl_gf_lp64 -lmkl_sequential -lmkl_core      # MKL with GNU compiler, serial interface
+   FFT_LIB =       -lmkl_intel_lp64 -lmkl_intel_thread -lmkl_core # MKL with Intel compiler, threaded interface
+   FFT_LIB =       -lmkl_gf_lp64 -lmkl_gnu_thread -lmkl_core      # MKL with GNU compiler, threaded interface
+   FFT_LIB =       -lmkl_rt            # MKL with automatic runtime selection of interface libs
 
-As with CMake, you do not need to set paths in FFT\_INC or FFT\_PATH, if
-make can find the FFT header and library files.  You must specify
-FFT\_LIB with the appropriate FFT libraries to include in the link.
+As with CMake, you do not need to set paths in ``FFT_INC`` or ``FFT_PATH``, if
+the compiler can find the FFT header and library files in its default search path.
+You must specify ``FFT_LIB`` with the appropriate FFT libraries to include in the link.
 
 **CMake and make info**\ :
 
@@ -158,14 +126,15 @@ platform and can be faster than the KISS FFT library.  You can
 download it from `www.fftw.org <http://www.fftw.org>`_.  LAMMPS requires
 version 3.X; the legacy version 2.1.X is no longer supported.
 
-Building FFTW for your box should be as simple as ./configure; make;
-make install.  The install command typically requires root privileges
+Building FFTW for your box should be as simple as ``./configure; make;
+make install``\ .  The install command typically requires root privileges
 (e.g. invoke it via sudo), unless you specify a local directory with
-the "--prefix" option of configure.  Type "./configure --help" to see
+the "--prefix" option of configure.  Type ``./configure --help`` to see
 various options.
 
 The Intel MKL math library is part of the Intel compiler suite.  It
-can be used with the Intel or GNU compiler (see FFT\_LIB setting above).
+can be used with the Intel or GNU compiler (see the ``FFT_LIB`` setting
+above).
 
 Performing 3d FFTs in parallel can be time consuming due to data
 access and required communication.  This cost can be reduced by
@@ -174,33 +143,30 @@ precision means the real and imaginary parts of a complex datum are
 4-byte floats.  Double precision means they are 8-byte doubles.  Note
 that Fourier transform and related PPPM operations are somewhat less
 sensitive to floating point truncation errors and thus the resulting
-error is less than the difference in precision. Using the -DFFT\_SINGLE
+error is less than the difference in precision. Using the ``-DFFT_SINGLE``
 setting trades off a little accuracy for reduced memory use and
 parallel communication costs for transposing 3d FFT data.
 
-When using -DFFT\_SINGLE with FFTW3 you may need to build the FFTW
+When using ``-DFFT_SINGLE`` with FFTW3 you may need to build the FFTW
 library a second time with support for single-precision.
 
 For FFTW3, do the following, which should produce the additional
-library libfftw3f.a or libfftw3f.so.
+library ``libfftw3f.a`` or ``libfftw3f.so``\ .
 
-
-.. parsed-literal::
+.. code-block:: bash
 
    make clean
    ./configure --enable-single; make; make install
 
 Performing 3d FFTs requires communication to transpose the 3d FFT
 grid.  The data packing/unpacking for this can be done in one of 3
-modes (ARRAY, POINTER, MEMCPY) as set by the FFT\_PACK syntax above.
+modes (ARRAY, POINTER, MEMCPY) as set by the FFT_PACK syntax above.
 Depending on the machine, the size of the FFT grid, the number of
 processors used, one option may be slightly faster.  The default is
 ARRAY mode.
 
-
 ----------
 
-
 .. _size:
 
 Size of LAMMPS data types
@@ -212,19 +178,18 @@ adequate.
 
 **CMake variable**\ :
 
-
-.. parsed-literal::
+.. code-block:: bash
 
    -D LAMMPS_SIZES=value   # smallbig (default) or bigbig or smallsmall
 
 **Makefile.machine setting**\ :
 
-
-.. parsed-literal::
+.. code-block:: make
 
    LMP_INC = -DLAMMPS_SMALLBIG    # or -DLAMMPS_BIGBIG or -DLAMMPS_SMALLSMALL
 
-# default is LAMMPS\_SMALLBIG if not specified
+The default setting is ``-DLAMMPS_SMALLBIG`` if nothing is specified
+
 **CMake and make info**\ :
 
 The default "smallbig" setting allows for simulations with:
@@ -272,12 +237,10 @@ than crashing randomly or corrupting data.
 Also note that the GPU package requires its lib/gpu library to be
 compiled with the same size setting, or the link will fail.  A CMake
 build does this automatically.  When building with make, the setting
-in whichever lib/gpu/Makefile is used must be the same as above.
-
+in whichever ``lib/gpu/Makefile`` is used must be the same as above.
 
 ----------
 
-
 .. _graphics:
 
 Output of JPG, PNG, and movie files
@@ -290,22 +253,20 @@ following settings:
 
 **CMake variables**\ :
 
-
-.. parsed-literal::
+.. code-block:: bash
 
    -D WITH_JPEG=value      # yes or no
-                             # default = yes if CMake finds JPEG files, else no
+                           # default = yes if CMake finds JPEG files, else no
    -D WITH_PNG=value       # yes or no
-                             # default = yes if CMake finds PNG and ZLIB files, else no
+                           # default = yes if CMake finds PNG and ZLIB files, else no
    -D WITH_FFMPEG=value    # yes or no
-                             # default = yes if CMake can find ffmpeg, else no
+                           # default = yes if CMake can find ffmpeg, else no
 
 Usually these settings are all that is needed.  If CMake cannot find
 the graphics header, library, executable files, you can set these
 variables:
 
-
-.. parsed-literal::
+.. code-block:: bash
 
    -D JPEG_INCLUDE_DIR=path    # path to jpeglib.h header file
    -D JPEG_LIBRARIES=path      # path to libjpeg.a (.so) file
@@ -317,8 +278,7 @@ variables:
 
 **Makefile.machine settings**\ :
 
-
-.. parsed-literal::
+.. code-block:: make
 
    LMP_INC = -DLAMMPS_JPEG
    LMP_INC = -DLAMMPS_PNG
@@ -328,28 +288,27 @@ variables:
    JPG_PATH = -L/usr/lib            # paths to libjpeg.a, libpng.a, libz.a (.so) files if make cannot find them
    JPG_LIB = -ljpeg -lpng -lz       # library names
 
-As with CMake, you do not need to set JPG\_INC or JPG\_PATH, if make can
-find the graphics header and library files.  You must specify JPG\_LIB
+As with CMake, you do not need to set ``JPG_INC`` or ``JPG_PATH``,
+if make can find the graphics header and library files.  You must
+specify ``JPG_LIB``
 with a list of graphics libraries to include in the link.  You must
 insure ffmpeg is in a directory where LAMMPS can find it at runtime,
-i.e. a dir in your PATH environment variable.
+that is a directory in your PATH environment variable.
 
 **CMake and make info**\ :
 
-Using ffmpeg to output movie files requires that your machine
+Using ``ffmpeg`` to output movie files requires that your machine
 supports the "popen" function in the standard runtime library.
 
 .. note::
 
    On some clusters with high-speed networks, using the fork()
-   library calls (required by popen()) can interfere with the fast
+   library call (required by popen()) can interfere with the fast
    communication library and lead to simulations using ffmpeg to hang or
    crash.
 
-
 ----------
 
-
 .. _gzip:
 
 Read or write compressed files
@@ -361,8 +320,7 @@ gzip compression by several LAMMPS commands, including
 
 **CMake variables**\ :
 
-
-.. parsed-literal::
+.. code-block:: bash
 
    -D WITH_GZIP=value       # yes or no
                             # default is yes if CMake can find gzip, else no
@@ -370,8 +328,7 @@ gzip compression by several LAMMPS commands, including
 
 **Makefile.machine setting**\ :
 
-
-.. parsed-literal::
+.. code-block:: make
 
    LMP_INC = -DLAMMPS_GZIP
 
@@ -384,22 +341,20 @@ found by LAMMPS during a run.
 .. note::
 
    On some clusters with high-speed networks, using the fork()
-   library calls (required by popen()) can interfere with the fast
+   library call (required by popen()) can interfere with the fast
    communication library and lead to simulations using compressed output
    or input to hang or crash. For selected operations, compressed file
    I/O is also available using a compression library instead, which is
    what the :ref:`COMPRESS package <PKG-COMPRESS>` enables.
 
-
 ----------
 
-
 .. _align:
 
 Memory allocation alignment
 ---------------------------------------
 
-This setting enables the use of the posix\_memalign() call instead of
+This setting enables the use of the posix_memalign() call instead of
 malloc() when LAMMPS allocates large chunks or memory.  This can make
 vector instructions on CPUs more efficient, if dynamically allocated
 memory is aligned on larger-than-default byte boundaries.
@@ -410,33 +365,29 @@ aligned on 64-byte boundaries.
 
 **CMake variable**\ :
 
-
-.. parsed-literal::
+.. code-block:: bash
 
    -D LAMMPS_MEMALIGN=value            # 0, 8, 16, 32, 64 (default)
 
-Use a LAMMPS\_MEMALIGN value of 0 to disable using posix\_memalign()
+Use a ``LAMMPS_MEMALIGN`` value of 0 to disable using posix_memalign()
 and revert to using the malloc() C-library function instead.  When
 compiling LAMMPS for Windows systems, malloc() will always be used
 and this setting ignored.
 
 **Makefile.machine setting**\ :
 
-
-.. parsed-literal::
+.. code-block:: make
 
    LMP_INC = -DLAMMPS_MEMALIGN=value   # 8, 16, 32, 64
 
-Do not set -DLAMMPS\_MEMALIGN, if you want to have memory allocated
-with the malloc() function call instead. -DLAMMPS\_MEMALIGN **cannot**
+Do not set ``-DLAMMPS_MEMALIGN``, if you want to have memory allocated
+with the malloc() function call instead. ``-DLAMMPS_MEMALIGN`` **cannot**
 be used on Windows, as it does use different function calls for
 allocating aligned memory, that are not compatible with how LAMMPS
 manages its dynamical memory.
 
-
 ----------
 
-
 .. _longlong:
 
 Workaround for long long integers
@@ -449,47 +400,37 @@ those systems:
 
 **CMake variable**\ :
 
-
-.. parsed-literal::
+.. code-block:: bash
 
    -D LAMMPS_LONGLONG_TO_LONG=value     # yes or no (default)
 
 **Makefile.machine setting**\ :
 
-
-.. parsed-literal::
+.. code-block:: make
 
    LMP_INC = -DLAMMPS_LONGLONG_TO_LONG
 
-
 ----------
 
-
 .. _exceptions:
 
 Exception handling when using LAMMPS as a library
 ------------------------------------------------------------------
 
 This setting is useful when external codes drive LAMMPS as a library.
-With this option enabled LAMMPS errors do not kill the caller.
+With this option enabled, LAMMPS errors do not kill the calling code.
 Instead, the call stack is unwound and control returns to the caller,
-e.g. to Python.
+e.g. to Python. Of course the calling code has to be set up to
+*catch* exceptions from within LAMMPS.
 
 **CMake variable**\ :
 
-
-.. parsed-literal::
+.. code-block:: bash
 
    -D LAMMPS_EXCEPTIONS=value        # yes or no (default)
 
 **Makefile.machine setting**\ :
 
-
-.. parsed-literal::
+.. code-block:: make
 
    LMP_INC = -DLAMMPS_EXCEPTIONS
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/Build_windows.rst b/doc/src/Build_windows.rst
index fd96b37983..1ad9dee123 100644
--- a/doc/src/Build_windows.rst
+++ b/doc/src/Build_windows.rst
@@ -6,10 +6,8 @@ Notes for building LAMMPS on Windows
 * :ref:`Using GNU GCC ported to Windows <gnu>`
 * :ref:`Using a cross-compiler <cross>`
 
-
 ----------
 
-
 .. _generic:
 
 General remarks
@@ -17,9 +15,9 @@ General remarks
 
 LAMMPS is developed and tested primarily on Linux machines.  The vast
 majority of HPC clusters and supercomputers today runs on Linux as well.
-Thus portability to other platforms is desired, but not always achieved.
+While portability to other platforms is desired, it is not always achieved.
 The LAMMPS developers strongly rely on LAMMPS users giving feedback and
-providing assistance in resolving portability issues. This particularly
+providing assistance in resolving portability issues. This is particularly
 true for compiling LAMMPS on Windows, since this platform has significant
 differences with some low-level functionality.
 
@@ -31,18 +29,20 @@ Running Linux on Windows
 So before trying to build LAMMPS on Windows, please consider if using
 the pre-compiled Windows binary packages are sufficient for your needs
 (as an aside, those packages themselves are build on a Linux machine
-using cross-compilers).  If it is necessary for your to compile LAMMPS
+using cross-compilers).  If it is necessary for you to compile LAMMPS
 on a Windows machine (e.g. because it is your main desktop), please also
-consider using a virtual machine software and run a Linux virtual machine,
-or - if have a recently updated Windows 10 installation - consider using
-the Windows subsystem for Linux, which allows to run a bash shell from
-Ubuntu and from there on, you can pretty much use that shell like you
-are running on an Ubuntu Linux machine (e.g. installing software via
-apt-get). For more details on that, please see :doc:`this tutorial <Howto_bash>`
+consider using a virtual machine software and compile and run LAMMPS in
+a Linux virtual machine, or - if you have a recently updated Windows 10
+installation - consider using the Windows subsystem for Linux.  This
+optional Windows feature allows you to run the bash shell from Ubuntu
+from within Windows and from there on, you can pretty much use that
+shell like you are running on an Ubuntu Linux machine (e.g. installing
+software via apt-get and more). For more details on that, please
+see :doc:`this tutorial <Howto_bash>`
 
 .. _gnu:
 
-Using GNU GCC ported to Windows
+Using a GNU GCC ported to Windows
 -----------------------------------------
 
 One option for compiling LAMMPS on Windows natively, that has been known
@@ -55,8 +55,8 @@ and the corresponding new code. A machine makefile for using cygwin for
 the old build system is provided. Using CMake for this mode of compilation
 is untested and not likely to work.
 
-When compiling for Windows do **not** set the -DLAMMPS\_MEMALIGN define
-in the LMP\_INC makefile variable and add -lwsock32 -lpsapi to the linker
+When compiling for Windows do **not** set the -DLAMMPS_MEMALIGN define
+in the LMP_INC makefile variable and add -lwsock32 -lpsapi to the linker
 flags in LIB makefile variable. Try adding -static-libgcc or -static or
 both to the linker flags when your resulting LAMMPS Windows executable
 complains about missing .dll files. The CMake configuration should set
@@ -83,13 +83,19 @@ traditional build system, but CMake has also been successfully tested
 using the mingw32-cmake and mingw64-cmake wrappers that are bundled
 with the cross-compiler environment on Fedora machines. A CMake preset
 selecting all packages compatible with this cross-compilation build
-is provided. You likely need to disable the GPU package unless you
-download and install the contents of the pre-compiled `OpenCL ICD loader library <https://download.lammps.org/thirdparty/opencl-win-devel.tar.gz>`_
-into your MinGW64 cross-compiler environment. The cross-compilation
-currently will only produce non-MPI serial binaries.
+is provided.  The GPU package can only be compiled with OpenCL support
+and you need to download and install the pre-compiled
+`OpenCL ICD loader library <https://download.lammps.org/thirdparty/opencl-win-devel.tar.gz>`_
+into your MinGW64 cross-compiler environment.  With CMake this will be
+done transparently.  To compile with MPI support, a pre-compiled
+library and the corresponding header files are required.  There is
+`one package for 32-bit Windows <https://download.lammps.org/thirdparty/mpich2-win32-devel.tar.gz>`_
+and `a second package for 64-bit Windows <https://download.lammps.org/thirdparty/mpich2-win64-devel.tar.gz>`_.
+When building with CMake, the matching package will be downloaded
+automatically, but MPI support has to be explicitly enabled with ``-DBUILD_MPI=on``.
 
-Please keep in mind, though, that this only applies to compiling LAMMPS.
-Whether the resulting binaries do work correctly is no tested by the
+Please keep in mind, though, that this only applies to **compiling** LAMMPS.
+Whether the resulting binaries do work correctly is not tested by the
 LAMMPS developers.  We instead rely on the feedback of the users
 of these pre-compiled LAMMPS packages for Windows.  We will try to resolve
 issues to the best of our abilities if we become aware of them. However
@@ -104,8 +110,3 @@ Support for the Visual C++ compilers is currently not available. The
 CMake build system is capable of creating suitable a Visual Studio
 style build environment, but the LAMMPS code itself is not fully ported
 to support Visual C++. Volunteers to take on this task are welcome.
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/Commands.rst b/doc/src/Commands.rst
index f192d6a59d..72a98159ff 100644
--- a/doc/src/Commands.rst
+++ b/doc/src/Commands.rst
@@ -4,7 +4,6 @@ Commands
 These pages describe how a LAMMPS input script is formatted and the
 commands in it are used to define a LAMMPS simulation.
 
-
 .. toctree::
    :maxdepth: 1
 
diff --git a/doc/src/Commands_all.rst b/doc/src/Commands_all.rst
index 6e87ffbad6..92c0ba107a 100644
--- a/doc/src/Commands_all.rst
+++ b/doc/src/Commands_all.rst
@@ -17,7 +17,7 @@ General commands
 An alphabetic list of all general LAMMPS commands.
 
 .. table_from_list::
-   :columns: 6
+   :columns: 5
 
    * :doc:`angle_coeff <angle_coeff>`
    * :doc:`angle_style <angle_style>`
@@ -70,6 +70,7 @@ An alphabetic list of all general LAMMPS commands.
    * :doc:`kim_init <kim_commands>`
    * :doc:`kim_interactions <kim_commands>`
    * :doc:`kim_param <kim_commands>`
+   * :doc:`kim_property <kim_commands>`
    * :doc:`kim_query <kim_commands>`
    * :doc:`kspace_modify <kspace_modify>`
    * :doc:`kspace_style <kspace_style>`
@@ -136,4 +137,3 @@ An alphabetic list of all general LAMMPS commands.
    * :doc:`write_data <write_data>`
    * :doc:`write_dump <write_dump>`
    * :doc:`write_restart <write_restart>`
-
diff --git a/doc/src/Commands_bond.rst b/doc/src/Commands_bond.rst
index 19be6d8cbc..0cb1b723b8 100644
--- a/doc/src/Commands_bond.rst
+++ b/doc/src/Commands_bond.rst
@@ -99,7 +99,6 @@ have accelerated versions.  This is indicated by additional letters in
 parenthesis: g = GPU, i = USER-INTEL, k = KOKKOS, o = USER-OMP, t =
 OPT.
 
-
 .. table_from_list::
    :columns: 4
 
diff --git a/doc/src/Commands_category.rst b/doc/src/Commands_category.rst
index 6476c73bbb..da40ada999 100644
--- a/doc/src/Commands_category.rst
+++ b/doc/src/Commands_category.rst
@@ -7,126 +7,163 @@ alphabetically.  Style options for entries like fix, compute, pair etc.
 have their own pages where they are listed alphabetically.
 
 Initialization:
+------------------------------
 
-* :doc:`newton <newton>`,
-* :doc:`package <package>`,
-* :doc:`processors <processors>`,
-* :doc:`suffix <suffix>`,
-* :doc:`units <units>`
+.. table_from_list::
+   :columns: 5
+
+   * :doc:`newton <newton>`
+   * :doc:`package <package>`
+   * :doc:`processors <processors>`
+   * :doc:`suffix <suffix>`
+   * :doc:`units <units>`
 
 Setup simulation box:
+------------------------------
 
-* :doc:`boundary <boundary>`,
-* :doc:`box <box>`,
-* :doc:`change_box <change_box>`,
-* :doc:`create_box <create_box>`,
-* :doc:`dimension <dimension>`,
-* :doc:`lattice <lattice>`,
-* :doc:`region <region>`
+.. table_from_list::
+   :columns: 4
+
+   * :doc:`boundary <boundary>`
+   * :doc:`box <box>`
+   * :doc:`change_box <change_box>`
+   * :doc:`create_box <create_box>`
+   * :doc:`dimension <dimension>`
+   * :doc:`lattice <lattice>`
+   * :doc:`region <region>`
 
 Setup atoms:
+------------------------------
 
-* :doc:`atom_modify <atom_modify>`,
-* :doc:`atom_style <atom_style>`,
-* :doc:`balance <balance>`,
-* :doc:`create_atoms <create_atoms>`,
-* :doc:`create_bonds <create_bonds>`,
-* :doc:`delete_atoms <delete_atoms>`,
-* :doc:`delete_bonds <delete_bonds>`,
-* :doc:`displace_atoms <displace_atoms>`,
-* :doc:`group <group>`,
-* :doc:`mass <mass>`,
-* :doc:`molecule <molecule>`,
-* :doc:`read_data <read_data>`,
-* :doc:`read_dump <read_dump>`,
-* :doc:`read_restart <read_restart>`,
-* :doc:`replicate <replicate>`,
-* :doc:`set <set>`,
-* :doc:`velocity <velocity>`
+.. table_from_list::
+   :columns: 4
+
+   * :doc:`atom_modify <atom_modify>`
+   * :doc:`atom_style <atom_style>`
+   * :doc:`balance <balance>`
+   * :doc:`create_atoms <create_atoms>`
+   * :doc:`create_bonds <create_bonds>`
+   * :doc:`delete_atoms <delete_atoms>`
+   * :doc:`delete_bonds <delete_bonds>`
+   * :doc:`displace_atoms <displace_atoms>`
+   * :doc:`group <group>`
+   * :doc:`mass <mass>`
+   * :doc:`molecule <molecule>`
+   * :doc:`read_data <read_data>`
+   * :doc:`read_dump <read_dump>`
+   * :doc:`read_restart <read_restart>`
+   * :doc:`replicate <replicate>`
+   * :doc:`set <set>`
+   * :doc:`velocity <velocity>`
 
 Force fields:
+------------------------------
 
-* :doc:`angle_coeff <angle_coeff>`,
-* :doc:`angle_style <angle_style>`,
-* :doc:`bond_coeff <bond_coeff>`,
-* :doc:`bond_style <bond_style>`,
-* :doc:`bond_write <bond_write>`,
-* :doc:`dielectric <dielectric>`,
-* :doc:`dihedral_coeff <dihedral_coeff>`,
-* :doc:`dihedral_style <dihedral_style>`,
-* :doc:`improper_coeff <improper_coeff>`,
-* :doc:`improper_style <improper_style>`,
-* :doc:`kspace_modify <kspace_modify>`,
-* :doc:`kspace_style <kspace_style>`,
-* :doc:`pair_coeff <pair_coeff>`,
-* :doc:`pair_modify <pair_modify>`,
-* :doc:`pair_style <pair_style>`,
-* :doc:`pair_write <pair_write>`,
-* :doc:`special_bonds <special_bonds>`
+.. table_from_list::
+   :columns: 4
+
+   * :doc:`angle_coeff <angle_coeff>`
+   * :doc:`angle_style <angle_style>`
+   * :doc:`bond_coeff <bond_coeff>`
+   * :doc:`bond_style <bond_style>`
+   * :doc:`bond_write <bond_write>`
+   * :doc:`dielectric <dielectric>`
+   * :doc:`dihedral_coeff <dihedral_coeff>`
+   * :doc:`dihedral_style <dihedral_style>`
+   * :doc:`improper_coeff <improper_coeff>`
+   * :doc:`improper_style <improper_style>`
+   * :doc:`kspace_modify <kspace_modify>`
+   * :doc:`kspace_style <kspace_style>`
+   * :doc:`pair_coeff <pair_coeff>`
+   * :doc:`pair_modify <pair_modify>`
+   * :doc:`pair_style <pair_style>`
+   * :doc:`pair_write <pair_write>`
+   * :doc:`special_bonds <special_bonds>`
 
 Settings:
+------------------------------
 
-* :doc:`comm_modify <comm_modify>`,
-* :doc:`comm_style <comm_style>`,
-* :doc:`info <info>`,
-* :doc:`min_modify <min_modify>`,
-* :doc:`min_style <min_style>`,
-* :doc:`neigh_modify <neigh_modify>`,
-* :doc:`neighbor <neighbor>`,
-* :doc:`partition <partition>`,
-* :doc:`reset_timestep <reset_timestep>`,
-* :doc:`run_style <run_style>`,
-* :doc:`timer <timer>`,
-* :doc:`timestep <timestep>`
+.. table_from_list::
+   :columns: 4
+
+   * :doc:`comm_modify <comm_modify>`
+   * :doc:`comm_style <comm_style>`
+   * :doc:`info <info>`
+   * :doc:`min_modify <min_modify>`
+   * :doc:`min_style <min_style>`
+   * :doc:`neigh_modify <neigh_modify>`
+   * :doc:`neighbor <neighbor>`
+   * :doc:`partition <partition>`
+   * :doc:`reset_timestep <reset_timestep>`
+   * :doc:`run_style <run_style>`
+   * :doc:`timer <timer>`
+   * :doc:`timestep <timestep>`
 
 Operations within timestepping (fixes) and diagnostics (computes):
+------------------------------------------------------------------------------------------
 
-* :doc:`compute <compute>`,
-* :doc:`compute_modify <compute_modify>`,
-* :doc:`fix <fix>`,
-* :doc:`fix_modify <fix_modify>`,
-* :doc:`uncompute <uncompute>`,
-* :doc:`unfix <unfix>`
+.. table_from_list::
+   :columns: 4
+
+   * :doc:`compute <compute>`
+   * :doc:`compute_modify <compute_modify>`
+   * :doc:`fix <fix>`
+   * :doc:`fix_modify <fix_modify>`
+   * :doc:`uncompute <uncompute>`
+   * :doc:`unfix <unfix>`
 
 Output:
+------------------------------
 
-* :doc:`dump image <dump_image>`,
-* :doc:`dump movie <dump_image>`,
-* :doc:`dump <dump>`,
-* :doc:`dump_modify <dump_modify>`,
-* :doc:`restart <restart>`,
-* :doc:`thermo <thermo>`,
-* :doc:`thermo_modify <thermo_modify>`,
-* :doc:`thermo_style <thermo_style>`,
-* :doc:`undump <undump>`,
-* :doc:`write_coeff <write_coeff>`,
-* :doc:`write_data <write_data>`,
-* :doc:`write_dump <write_dump>`,
-* :doc:`write_restart <write_restart>`
+.. table_from_list::
+   :columns: 4
+
+   * :doc:`dump image <dump_image>`
+   * :doc:`dump movie <dump_image>`
+   * :doc:`dump <dump>`
+   * :doc:`dump_modify <dump_modify>`
+   * :doc:`restart <restart>`
+   * :doc:`thermo <thermo>`
+   * :doc:`thermo_modify <thermo_modify>`
+   * :doc:`thermo_style <thermo_style>`
+   * :doc:`undump <undump>`
+   * :doc:`write_coeff <write_coeff>`
+   * :doc:`write_data <write_data>`
+   * :doc:`write_dump <write_dump>`
+   * :doc:`write_restart <write_restart>`
 
 Actions:
+------------------------------
 
-* :doc:`minimize <minimize>`,
-* :doc:`neb <neb>`,
-* :doc:`neb_spin <neb_spin>`,
-* :doc:`prd <prd>`,
-* :doc:`rerun <rerun>`,
-* :doc:`run <run>`,
-* :doc:`tad <tad>`,
-* :doc:`temper <temper>`
+.. table_from_list::
+   :columns: 6
+
+   * :doc:`minimize <minimize>`
+   * :doc:`neb <neb>`
+   * :doc:`neb_spin <neb_spin>`
+   * :doc:`prd <prd>`
+   * :doc:`rerun <rerun>`
+   * :doc:`run <run>`
+   * :doc:`tad <tad>`
+   * :doc:`temper <temper>`
 
 Input script control:
+------------------------------
 
-* :doc:`clear <clear>`,
-* :doc:`echo <echo>`,
-* :doc:`if <if>`,
-* :doc:`include <include>`,
-* :doc:`jump <jump>`,
-* :doc:`label <label>`,
-* :doc:`log <log>`,
-* :doc:`next <next>`,
-* :doc:`print <print>`,
-* :doc:`python <python>`,
-* :doc:`quit <quit>`,
-* :doc:`shell <shell>`,
-* :doc:`variable <variable>`
+.. table_from_list::
+   :columns: 7
+
+   * :doc:`clear <clear>`
+   * :doc:`echo <echo>`
+   * :doc:`if <if>`
+   * :doc:`include <include>`
+   * :doc:`info <info>`
+   * :doc:`jump <jump>`
+   * :doc:`label <label>`
+   * :doc:`log <log>`
+   * :doc:`next <next>`
+   * :doc:`print <print>`
+   * :doc:`python <python>`
+   * :doc:`quit <quit>`
+   * :doc:`shell <shell>`
+   * :doc:`variable <variable>`
diff --git a/doc/src/Commands_compute.rst b/doc/src/Commands_compute.rst
index 79f0e8d83f..13336fa89b 100644
--- a/doc/src/Commands_compute.rst
+++ b/doc/src/Commands_compute.rst
@@ -20,7 +20,7 @@ additional letters in parenthesis: g = GPU, i = USER-INTEL, k =
 KOKKOS, o = USER-OMP, t = OPT.
 
 .. table_from_list::
-   :columns: 6
+   :columns: 5
 
    * :doc:`ackland/atom <compute_ackland_atom>`
    * :doc:`adf <compute_adf>`
@@ -163,4 +163,3 @@ KOKKOS, o = USER-OMP, t = OPT.
    * :doc:`vcm/chunk <compute_vcm_chunk>`
    * :doc:`voronoi/atom <compute_voronoi_atom>`
    * :doc:`xrd <compute_xrd>`
-
diff --git a/doc/src/Commands_fix.rst b/doc/src/Commands_fix.rst
index 0b6b892b9d..ce7cade0f6 100644
--- a/doc/src/Commands_fix.rst
+++ b/doc/src/Commands_fix.rst
@@ -20,7 +20,7 @@ parenthesis: g = GPU, i = USER-INTEL, k = KOKKOS, o = USER-OMP, t =
 OPT.
 
 .. table_from_list::
-   :columns: 6
+   :columns: 5
 
    * :doc:`adapt <fix_adapt>`
    * :doc:`adapt/fep <fix_adapt_fep>`
@@ -119,6 +119,7 @@ OPT.
    * :doc:`npt/eff <fix_nh_eff>`
    * :doc:`npt/sphere (o) <fix_npt_sphere>`
    * :doc:`npt/uef <fix_nh_uef>`
+   * :doc:`numdiff <fix_numdiff>`
    * :doc:`nve (iko) <fix_nve>`
    * :doc:`nve/asphere (i) <fix_nve_asphere>`
    * :doc:`nve/asphere/noforce <fix_nve_asphere_noforce>`
diff --git a/doc/src/Commands_input.rst b/doc/src/Commands_input.rst
index 69d3393d08..f8de98c1a2 100644
--- a/doc/src/Commands_input.rst
+++ b/doc/src/Commands_input.rst
@@ -16,7 +16,6 @@ simulation with all the settings.  Rather, the input script is read
 one line at a time and each command takes effect when it is read.
 Thus this sequence of commands:
 
-
 .. code-block:: LAMMPS
 
    timestep 0.5
@@ -25,7 +24,6 @@ Thus this sequence of commands:
 
 does something different than this sequence:
 
-
 .. code-block:: LAMMPS
 
    run      100
@@ -48,7 +46,7 @@ is to have the desired effect.  For example, the
 :doc:`read_data <read_data>` command initializes the system by setting
 up the simulation box and assigning atoms to processors.  If default
 values are not desired, the :doc:`processors <processors>` and
-:doc:`boundary <boundary>` commands need to be used before read\_data to
+:doc:`boundary <boundary>` commands need to be used before read_data to
 tell LAMMPS how to map processors to the simulation box.
 
 Many input script errors are detected by LAMMPS and an ERROR or
diff --git a/doc/src/Commands_pair.rst b/doc/src/Commands_pair.rst
index 28f50bfd8e..34b04969f9 100644
--- a/doc/src/Commands_pair.rst
+++ b/doc/src/Commands_pair.rst
@@ -26,6 +26,10 @@ OPT.
    * :doc:`zero <pair_zero>`
    * :doc:`hybrid (k) <pair_hybrid>`
    * :doc:`hybrid/overlay (k) <pair_hybrid>`
+   * :doc:`kim <pair_kim>`
+   * :doc:`list <pair_list>`
+   *
+   *
    *
    *
    *
@@ -73,6 +77,8 @@ OPT.
    * :doc:`coul/long/cs (g) <pair_cs>`
    * :doc:`coul/long/soft (o) <pair_fep_soft>`
    * :doc:`coul/msm (o) <pair_coul>`
+   * :doc:`coul/slater/cut <pair_coul_slater>`
+   * :doc:`coul/slater/long <pair_coul_slater>`   
    * :doc:`coul/shield <pair_coul_shield>`
    * :doc:`coul/streitz <pair_coul>`
    * :doc:`coul/wolf (ko) <pair_coul>`
@@ -91,7 +97,7 @@ OPT.
    * :doc:`eam/fs (gikot) <pair_eam>`
    * :doc:`edip (o) <pair_edip>`
    * :doc:`edip/multi <pair_edip>`
-   * :doc:`edpd <pair_meso>`
+   * :doc:`edpd <pair_mesodpd>`
    * :doc:`eff/cut <pair_eff>`
    * :doc:`eim (o) <pair_eim>`
    * :doc:`exp6/rx (k) <pair_exp6_rx>`
@@ -108,14 +114,12 @@ OPT.
    * :doc:`hbond/dreiding/lj (o) <pair_hbond_dreiding>`
    * :doc:`hbond/dreiding/morse (o) <pair_hbond_dreiding>`
    * :doc:`ilp/graphene/hbn <pair_ilp_graphene_hbn>`
-   * :doc:`kim <pair_kim>`
    * :doc:`kolmogorov/crespi/full <pair_kolmogorov_crespi_full>`
    * :doc:`kolmogorov/crespi/z <pair_kolmogorov_crespi_z>`
    * :doc:`lcbop <pair_lcbop>`
    * :doc:`lebedeva/z <pair_lebedeva_z>`
    * :doc:`lennard/mdf <pair_mdf>`
    * :doc:`line/lj <pair_line_lj>`
-   * :doc:`list <pair_list>`
    * :doc:`lj/charmm/coul/charmm (iko) <pair_charmm>`
    * :doc:`lj/charmm/coul/charmm/implicit (ko) <pair_charmm>`
    * :doc:`lj/charmm/coul/long (gikot) <pair_charmm>`
@@ -169,8 +173,8 @@ OPT.
    * :doc:`lubricate/poly (o) <pair_lubricate>`
    * :doc:`lubricateU <pair_lubricateU>`
    * :doc:`lubricateU/poly <pair_lubricateU>`
-   * :doc:`mdpd <pair_meso>`
-   * :doc:`mdpd/rhosum <pair_meso>`
+   * :doc:`mdpd <pair_mesodpd>`
+   * :doc:`mdpd/rhosum <pair_mesodpd>`
    * :doc:`meam/c <pair_meamc>`
    * :doc:`meam/spline (o) <pair_meam_spline>`
    * :doc:`meam/sw/spline <pair_meam_sw_spline>`
@@ -240,7 +244,7 @@ OPT.
    * :doc:`sw (giko) <pair_sw>`
    * :doc:`table (gko) <pair_table>`
    * :doc:`table/rx (k) <pair_table_rx>`
-   * :doc:`tdpd <pair_meso>`
+   * :doc:`tdpd <pair_mesodpd>`
    * :doc:`tersoff (giko) <pair_tersoff>`
    * :doc:`tersoff/mod (gko) <pair_tersoff_mod>`
    * :doc:`tersoff/mod/c (o) <pair_tersoff_mod>`
diff --git a/doc/src/Commands_parse.rst b/doc/src/Commands_parse.rst
index ec1c8c1e46..37283823d7 100644
--- a/doc/src/Commands_parse.rst
+++ b/doc/src/Commands_parse.rst
@@ -9,134 +9,150 @@ file names or user-chosen ID strings.
 Here are 6 rules for how each line in the input script is parsed by
 LAMMPS:
 
-(1) If the last printable character on the line is a "&" character,
-the command is assumed to continue on the next line.  The next line is
-concatenated to the previous line by removing the "&" character and
-line break.  This allows long commands to be continued across two or
-more lines.  See the discussion of triple quotes in (6) for how to
-continue a command across multiple line without using "&" characters.
+.. _one:
 
-(2) All characters from the first "#" character onward are treated as
-comment and discarded.  See an exception in (6).  Note that a
-comment after a trailing "&" character will prevent the command from
-continuing on the next line.  Also note that for multi-line commands a
-single leading "#" will comment out the entire command.
+1. If the last printable character on the line is a "&" character, the
+   command is assumed to continue on the next line.  The next line is
+   concatenated to the previous line by removing the "&" character and
+   line break.  This allows long commands to be continued across two or
+   more lines.  See the discussion of triple quotes in :ref:`6 <six>`
+   for how to continue a command across multiple line without using "&"
+   characters.
 
-.. code-block:: LAMMPS
+.. _two:
 
-   # this is a comment
+2. All characters from the first "#" character onward are treated as
+   comment and discarded.  The exception to this rule is described in
+   :ref:`6 <six>`. Note that a comment after a trailing "&" character
+   will prevent the command from continuing on the next line.  Also note
+   that for multi-line commands a single leading "#" will comment out
+   the entire command.
 
-(3) The line is searched repeatedly for $ characters, which indicate
-variables that are replaced with a text string.  See an exception in
-(6).
+   .. code-block:: LAMMPS
 
-If the $ is followed by curly brackets, then the variable name is the
-text inside the curly brackets.  If no curly brackets follow the $,
-then the variable name is the single character immediately following
-the $.  Thus ${myTemp} and $x refer to variable names "myTemp" and
-"x".
+      # this is a comment
+      timestep  1.0   # this is also a comment
 
-How the variable is converted to a text string depends on what style
-of variable it is; see the :doc:`variable <variable>` doc page for details.
-It can be a variable that stores multiple text strings, and return one
-of them.  The returned text string can be multiple "words" (space
-separated) which will then be interpreted as multiple arguments in the
-input command.  The variable can also store a numeric formula which
-will be evaluated and its numeric result returned as a string.
+.. _three:
 
-As a special case, if the $ is followed by parenthesis, then the text
-inside the parenthesis is treated as an "immediate" variable and
-evaluated as an :doc:`equal-style variable <variable>`.  This is a way
-to use numeric formulas in an input script without having to assign
-them to variable names.  For example, these 3 input script lines:
+3. The line is searched repeatedly for $ characters, which indicate
+   variables that are replaced with a text string.  The exception to
+   this rule is described in :ref:`6 <six>`.
 
+   If the $ is followed by text in curly brackets '{}', then the
+   variable name is the text inside the curly brackets.  If no curly
+   brackets follow the $, then the variable name is the single character
+   immediately following the $.  Thus ${myTemp} and $x refer to variables
+   named "myTemp" and "x", while "$xx" will be interpreted as a variable
+   named "x" followed by an "x" character.
 
-.. code-block:: LAMMPS
+   How the variable is converted to a text string depends on what style
+   of variable it is; see the :doc:`variable <variable>` doc page for
+   details.  It can be a variable that stores multiple text strings, and
+   return one of them.  The returned text string can be multiple "words"
+   (space separated) which will then be interpreted as multiple
+   arguments in the input command.  The variable can also store a
+   numeric formula which will be evaluated and its numeric result
+   returned as a string.
 
-   variable X equal (xlo+xhi)/2+sqrt(v_area)
-   region 1 block $X 2 INF INF EDGE EDGE
-   variable X delete
+   As a special case, if the $ is followed by parenthesis "()", then the
+   text inside the parenthesis is treated as an "immediate" variable and
+   evaluated as an :doc:`equal-style variable <variable>`.  This is a
+   way to use numeric formulas in an input script without having to
+   assign them to variable names.  For example, these 3 input script
+   lines:
 
-can be replaced by
+   .. code-block:: LAMMPS
 
+      variable X equal (xlo+xhi)/2+sqrt(v_area)
+      region 1 block $X 2 INF INF EDGE EDGE
+      variable X delete
 
-.. code-block:: LAMMPS
+   can be replaced by:
 
-   region 1 block $((xlo+xhi)/2+sqrt(v_area)) 2 INF INF EDGE EDGE
+   .. code-block:: LAMMPS
 
-so that you do not have to define (or discard) a temporary variable X.
+      region 1 block $((xlo+xhi)/2+sqrt(v_area)) 2 INF INF EDGE EDGE
 
-Additionally, the "immediate" variable expression may be followed by a
-colon, followed by a C-style format string, e.g. ":%f" or ":%.10g".
-The format string must be appropriate for a double-precision
-floating-point value.  The format string is used to output the result
-of the variable expression evaluation.  If a format string is not
-specified a high-precision "%.20g" is used as the default.
+   so that you do not have to define (or discard) a temporary variable,
+   "X" in this case.
 
-This can be useful for formatting print output to a desired precision:
+   Additionally, the "immediate" variable expression may be followed by
+   a colon, followed by a C-style format string, e.g. ":%f" or ":%.10g".
+   The format string must be appropriate for a double-precision
+   floating-point value.  The format string is used to output the result
+   of the variable expression evaluation.  If a format string is not
+   specified a high-precision "%.20g" is used as the default.
 
+   This can be useful for formatting print output to a desired precision:
 
-.. code-block:: LAMMPS
+   .. code-block:: LAMMPS
 
-   print "Final energy per atom: $(pe/atoms:%10.3f) eV/atom"
+      print "Final energy per atom: $(pe/atoms:%10.3f) eV/atom"
 
-Note that neither the curly-bracket or immediate form of variables can
-contain nested $ characters for other variables to substitute for.
-Thus you cannot do this:
+   Note that neither the curly-bracket or immediate form of variables
+   can contain nested $ characters for other variables to substitute
+   for.  Thus you may **NOT** do this:
 
+   .. code-block:: LAMMPS
 
-.. code-block:: LAMMPS
+      variable        a equal 2
+      variable        b2 equal 4
+      print           "B2 = ${b$a}"
 
-   variable        a equal 2
-   variable        b2 equal 4
-   print           "B2 = ${b$a}"
+   Nor can you specify an expression like "$($x-1.0)" for an immediate
+   variable, but you could use $(v_x-1.0), since the latter is valid
+   syntax for an :doc:`equal-style variable <variable>`.
 
-Nor can you specify this $($x-1.0) for an immediate variable, but
-you could use $(v\_x-1.0), since the latter is valid syntax for an
-:doc:`equal-style variable <variable>`.
+   See the :doc:`variable <variable>` command for more details of how
+   strings are assigned to variables and evaluated, and how they can
+   be used in input script commands.
 
-See the :doc:`variable <variable>` command for more details of how
-strings are assigned to variables and evaluated, and how they can be
-used in input script commands.
+.. _four:
 
-(4) The line is broken into "words" separated by white-space (tabs,
-spaces).  Note that words can thus contain letters, digits,
-underscores, or punctuation characters.
+4. The line is broken into "words" separated by white-space (tabs,
+   spaces).  Note that words can thus contain letters, digits,
+   underscores, or punctuation characters.
 
-(5) The first word is the command name.  All successive words in the
-line are arguments.
+.. _five:
 
-(6) If you want text with spaces to be treated as a single argument,
-it can be enclosed in either single or double or triple quotes.  A
-long single argument enclosed in single or double quotes can span
-multiple lines if the "&" character is used, as described above.  When
-the lines are concatenated together (and the "&" characters and line
-breaks removed), the text will become a single line.  If you want
-multiple lines of an argument to retain their line breaks, the text
-can be enclosed in triple quotes, in which case "&" characters are not
-needed.  For example:
+5. The first word is the command name.  All successive words in the line
+   are arguments.
 
+.. _six:
 
-.. code-block:: LAMMPS
+6. If you want text with spaces to be treated as a single argument, it
+   can be enclosed in either single or double or triple quotes.  A long
+   single argument enclosed in single or double quotes can span multiple
+   lines if the "&" character is used, as described above.  When the
+   lines are concatenated together (and the "&" characters and line
+   breaks removed), the text will become a single line.  If you want
+   multiple lines of an argument to retain their line breaks, the text
+   can be enclosed in triple quotes, in which case "&" characters are
+   not needed.  For example:
 
-   print "Volume = $v"
-   print 'Volume = $v'
-   if "${steps} > 1000" then quit
-   variable a string "red green blue &
+   .. code-block:: LAMMPS
+
+      print "Volume = $v"
+      print 'Volume = $v'
+      if "${steps} > 1000" then quit
+      variable a string "red green blue &
                       purple orange cyan"
-   print """
-   System volume = $v
-   System temperature = $t
-   """
+      print """
+      System volume = $v
+      System temperature = $t
+      """
 
-In each case, the single, double, or triple quotes are removed when
-the single argument they enclose is stored internally.
+   In each case, the single, double, or triple quotes are removed when
+   the single argument they enclose is stored internally.
 
-See the :doc:`dump modify format <dump_modify>`, :doc:`print <print>`,
-:doc:`if <if>`, and :doc:`python <python>` commands for examples.
+   See the :doc:`dump modify format <dump_modify>`, :doc:`print
+   <print>`, :doc:`if <if>`, and :doc:`python <python>` commands for
+   examples.
 
-A "#" or "$" character that is between quotes will not be treated as a
-comment indicator in (2) or substituted for as a variable in (3).
+   A "#" or "$" character that is between quotes will not be treated as
+   a comment indicator in :ref:`2 <two>` or substituted for as a
+   variable in :ref:`3 <three>`.
 
 .. note::
 
diff --git a/doc/src/Commands_removed.rst b/doc/src/Commands_removed.rst
index b7f48a9c36..b749467d13 100644
--- a/doc/src/Commands_removed.rst
+++ b/doc/src/Commands_removed.rst
@@ -60,8 +60,3 @@ LAMMPS executable directly instead of having a separate tool.  A
 combination of the commands :doc:`read_restart <read_restart>` and
 :doc:`write_data <write_data>` can be used to the same effect.  For added
 convenience this conversion can also be triggered by :doc:`command line flags <Run_options>`
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/Commands_structure.rst b/doc/src/Commands_structure.rst
index cd96007bf2..98744efb2a 100644
--- a/doc/src/Commands_structure.rst
+++ b/doc/src/Commands_structure.rst
@@ -8,17 +8,20 @@ page.
 
 A LAMMPS input script typically has 4 parts:
 
-1. Initialization
-2. Atom definition
-3. Settings
-4. Run a simulation
+1. :ref:`Initialization <init>`
+2. :ref:`System definition <system>`
+3. :ref:`Simulation settings <settings>`
+4. :ref:`Run a simulation <run>`
 
 The last 2 parts can be repeated as many times as desired.  I.e. run a
 simulation, change some settings, run some more, etc.  Each of the 4
 parts is now described in more detail.  Remember that almost all
 commands need only be used if a non-default value is desired.
 
-(1) Initialization
+.. _init:
+
+Initialization
+------------------------------
 
 Set parameters that need to be defined before atoms are created or
 read-in from a file.
@@ -34,23 +37,33 @@ commands tell LAMMPS what kinds of force fields are being used:
 :doc:`angle_style <angle_style>`, :doc:`dihedral_style <dihedral_style>`,
 :doc:`improper_style <improper_style>`.
 
-(2) Atom definition
+.. _system:
 
-There are 3 ways to define atoms in LAMMPS.  Read them in from a data
-or restart file via the :doc:`read_data <read_data>` or
-:doc:`read_restart <read_restart>` commands.  These files can contain
-molecular topology information.  Or create atoms on a lattice (with no
-molecular topology), using these commands: :doc:`lattice <lattice>`,
-:doc:`region <region>`, :doc:`create_box <create_box>`,
-:doc:`create_atoms <create_atoms>`.  The entire set of atoms can be
-duplicated to make a larger simulation using the
-:doc:`replicate <replicate>` command.
+System definition
+------------------------------
 
-(3) Settings
+There are 3 ways to define the simulation cell and reserve space for
+force field info and fill it with atoms in LAMMPS.  Read them in from
+(1) a data file or (2) a restart file via the :doc:`read_data
+<read_data>` or :doc:`read_restart <read_restart>` commands,
+respectively.  These files can also contain molecular topology
+information.  Or (3) create a simulation cell and fill it with atoms on
+a lattice (with no molecular topology), using these commands:
+:doc:`lattice <lattice>`, :doc:`region <region>`, :doc:`create_box
+<create_box>`, :doc:`create_atoms <create_atoms>` or
+:doc:`read_dump <read_dump>`.
+
+The entire set of atoms can be duplicated to make a larger simulation
+using the :doc:`replicate <replicate>` command.
+
+.. _settings:
+
+Simulation settings
+------------------------------
 
 Once atoms and molecular topology are defined, a variety of settings
 can be specified: force field coefficients, simulation parameters,
-output options, etc.
+output options, and more.
 
 Force field coefficients are set by these commands (they can also be
 set in the read-in files): :doc:`pair_coeff <pair_coeff>`,
@@ -77,7 +90,10 @@ commands.
 Output options are set by the :doc:`thermo <thermo>`, :doc:`dump <dump>`,
 and :doc:`restart <restart>` commands.
 
-(4) Run a simulation
+.. _run:
+
+Run a simulation
+------------------------------
 
 A molecular dynamics simulation is run using the :doc:`run <run>`
 command.  Energy minimization (molecular statics) is performed using
diff --git a/doc/src/Eqs/angle_class2_p6.jpg b/doc/src/Eqs/angle_class2_p6.jpg
deleted file mode 100644
index c096f6922c..0000000000
Binary files a/doc/src/Eqs/angle_class2_p6.jpg and /dev/null differ
diff --git a/doc/src/Eqs/angle_class2_p6.tex b/doc/src/Eqs/angle_class2_p6.tex
deleted file mode 100644
index 37fd87e9ec..0000000000
--- a/doc/src/Eqs/angle_class2_p6.tex
+++ /dev/null
@@ -1,15 +0,0 @@
-\documentclass[12pt]{article}
-
-\pagestyle{empty}
-\begin{document}
-
-$$
-  E_{a} = K_2\left(\theta - \theta_0\right)^2 + K_3\left(\theta - \theta_0\right)^3 + K_4\left(\theta - \theta_0\right)^4 + K_5\left(\theta - \theta_0\right)^5 + K_6\left(\theta - \theta_0\right)^6
-$$
-
-\end{document}
-
-%%% Local Variables:
-%%% mode: latex
-%%% TeX-master: t
-%%% End:
diff --git a/doc/src/Eqs/box.jpg b/doc/src/Eqs/box.jpg
deleted file mode 100644
index 4cb43df953..0000000000
Binary files a/doc/src/Eqs/box.jpg and /dev/null differ
diff --git a/doc/src/Eqs/box.tex b/doc/src/Eqs/box.tex
deleted file mode 100644
index 8442ea85b6..0000000000
--- a/doc/src/Eqs/box.tex
+++ /dev/null
@@ -1,14 +0,0 @@
-\documentclass[12pt]{article}
-
-\begin{document}
-
-\begin{eqnarray*}
-a &=& {\rm lx} \\
-b^2 &=&  {\rm ly}^2 +  {\rm xy}^2 \\
-c^2 &=&  {\rm lz}^2 +  {\rm xz}^2 +  {\rm yz}^2 \\
-\cos{\alpha} &=& \frac{{\rm xy}*{\rm xz} + {\rm ly}*{\rm yz}}{b*c} \\
-\cos{\beta} &=& \frac{\rm xz}{c} \\
-\cos{\gamma} &=& \frac{\rm xy}{b} \\
-\end{eqnarray*}
-
-\end{document}
diff --git a/doc/src/Eqs/box_inverse.jpg b/doc/src/Eqs/box_inverse.jpg
deleted file mode 100644
index 5d0895b87e..0000000000
Binary files a/doc/src/Eqs/box_inverse.jpg and /dev/null differ
diff --git a/doc/src/Eqs/box_inverse.tex b/doc/src/Eqs/box_inverse.tex
deleted file mode 100644
index 68994f2868..0000000000
--- a/doc/src/Eqs/box_inverse.tex
+++ /dev/null
@@ -1,14 +0,0 @@
-\documentclass[12pt]{article}
-
-\begin{document}
-
-\begin{eqnarray*}
-{\rm lx} &=& a \\
-{\rm xy} &=& b \cos{\gamma}  \\
-{\rm xz} &=& c \cos{\beta}\\
-{\rm ly}^2 &=&   b^2 - {\rm xy}^2 \\
-{\rm yz} &=& \frac{b*c \cos{\alpha} - {\rm xy}*{\rm xz}}{\rm ly} \\
-{\rm lz}^2 &=&  c^2 - {\rm xz}^2 - {\rm yz}^2 \\
-\end{eqnarray*}
-
-\end{document}
diff --git a/doc/src/Eqs/centro_symmetry.jpg b/doc/src/Eqs/centro_symmetry.jpg
deleted file mode 100644
index 1e89d11a11..0000000000
Binary files a/doc/src/Eqs/centro_symmetry.jpg and /dev/null differ
diff --git a/doc/src/Eqs/centro_symmetry.tex b/doc/src/Eqs/centro_symmetry.tex
deleted file mode 100644
index 8d9a9a33e6..0000000000
--- a/doc/src/Eqs/centro_symmetry.tex
+++ /dev/null
@@ -1,9 +0,0 @@
-\documentclass[12pt]{article}
-
-\begin{document}
-
-$$
-   CS = \sum_{i = 1}^{N/2} | \vec{R}_i + \vec{R}_{i+N/2} |^2
-$$
-
-\end{document}
diff --git a/doc/src/Eqs/cna_cutoff1.jpg b/doc/src/Eqs/cna_cutoff1.jpg
deleted file mode 100644
index fae5c6b636..0000000000
Binary files a/doc/src/Eqs/cna_cutoff1.jpg and /dev/null differ
diff --git a/doc/src/Eqs/cna_cutoff1.tex b/doc/src/Eqs/cna_cutoff1.tex
deleted file mode 100644
index f74166e608..0000000000
--- a/doc/src/Eqs/cna_cutoff1.tex
+++ /dev/null
@@ -1,14 +0,0 @@
-\documentclass[12pt,article]{article}
-
-\usepackage{indentfirst}
-\usepackage{amsmath}
-
-\begin{document}
-
-\begin{eqnarray*}
-  r_{c}^{fcc} & = & \frac{1}{2} \left(\frac{\sqrt{2}}{2} + 1\right) \mathrm{a} \simeq 0.8536 \:\mathrm{a} \\
-  r_{c}^{bcc} & = & \frac{1}{2}(\sqrt{2} + 1) \mathrm{a} \simeq 1.207 \:\mathrm{a} \\
-  r_{c}^{hcp} & = & \frac{1}{2}\left(1+\sqrt{\frac{4+2x^{2}}{3}}\right) \mathrm{a}
-\end{eqnarray*}
-
-\end{document}
diff --git a/doc/src/Eqs/cna_cutoff2.jpg b/doc/src/Eqs/cna_cutoff2.jpg
deleted file mode 100644
index 744b61e9b4..0000000000
Binary files a/doc/src/Eqs/cna_cutoff2.jpg and /dev/null differ
diff --git a/doc/src/Eqs/cna_cutoff2.tex b/doc/src/Eqs/cna_cutoff2.tex
deleted file mode 100644
index fcec31fd24..0000000000
--- a/doc/src/Eqs/cna_cutoff2.tex
+++ /dev/null
@@ -1,12 +0,0 @@
-\documentclass[12pt,article]{article}
-
-\usepackage{indentfirst}
-\usepackage{amsmath}
-
-\begin{document}
-
-$$
-  Rc + Rs > 2*{\rm cutoff}
-$$
-
-\end{document}
diff --git a/doc/src/Eqs/cnp_cutoff.jpg b/doc/src/Eqs/cnp_cutoff.jpg
deleted file mode 100644
index fae5c6b636..0000000000
Binary files a/doc/src/Eqs/cnp_cutoff.jpg and /dev/null differ
diff --git a/doc/src/Eqs/cnp_cutoff.tex b/doc/src/Eqs/cnp_cutoff.tex
deleted file mode 100644
index f74166e608..0000000000
--- a/doc/src/Eqs/cnp_cutoff.tex
+++ /dev/null
@@ -1,14 +0,0 @@
-\documentclass[12pt,article]{article}
-
-\usepackage{indentfirst}
-\usepackage{amsmath}
-
-\begin{document}
-
-\begin{eqnarray*}
-  r_{c}^{fcc} & = & \frac{1}{2} \left(\frac{\sqrt{2}}{2} + 1\right) \mathrm{a} \simeq 0.8536 \:\mathrm{a} \\
-  r_{c}^{bcc} & = & \frac{1}{2}(\sqrt{2} + 1) \mathrm{a} \simeq 1.207 \:\mathrm{a} \\
-  r_{c}^{hcp} & = & \frac{1}{2}\left(1+\sqrt{\frac{4+2x^{2}}{3}}\right) \mathrm{a}
-\end{eqnarray*}
-
-\end{document}
diff --git a/doc/src/Eqs/cnp_cutoff2.jpg b/doc/src/Eqs/cnp_cutoff2.jpg
deleted file mode 100644
index 744b61e9b4..0000000000
Binary files a/doc/src/Eqs/cnp_cutoff2.jpg and /dev/null differ
diff --git a/doc/src/Eqs/cnp_cutoff2.tex b/doc/src/Eqs/cnp_cutoff2.tex
deleted file mode 100644
index fcec31fd24..0000000000
--- a/doc/src/Eqs/cnp_cutoff2.tex
+++ /dev/null
@@ -1,12 +0,0 @@
-\documentclass[12pt,article]{article}
-
-\usepackage{indentfirst}
-\usepackage{amsmath}
-
-\begin{document}
-
-$$
-  Rc + Rs > 2*{\rm cutoff}
-$$
-
-\end{document}
diff --git a/doc/src/Eqs/cnp_eq.jpg b/doc/src/Eqs/cnp_eq.jpg
deleted file mode 100644
index d421314442..0000000000
Binary files a/doc/src/Eqs/cnp_eq.jpg and /dev/null differ
diff --git a/doc/src/Eqs/cnp_eq.tex b/doc/src/Eqs/cnp_eq.tex
deleted file mode 100644
index e5f157e6ba..0000000000
--- a/doc/src/Eqs/cnp_eq.tex
+++ /dev/null
@@ -1,9 +0,0 @@
-\documentclass[12pt]{article}
-
-\begin{document}
-
-$$
-   Q_{i} = \frac{1}{n_i}\sum_{j = 1}^{n_i} | \sum_{k = 1}^{n_{ij}}  \vec{R}_{ik} + \vec{R}_{jk} |^2
-$$
-
-\end{document}
diff --git a/doc/src/Eqs/compute_dpd.jpg b/doc/src/Eqs/compute_dpd.jpg
deleted file mode 100644
index 549f259c6c..0000000000
Binary files a/doc/src/Eqs/compute_dpd.jpg and /dev/null differ
diff --git a/doc/src/Eqs/compute_dpd.tex b/doc/src/Eqs/compute_dpd.tex
deleted file mode 100644
index e46b0b4dd6..0000000000
--- a/doc/src/Eqs/compute_dpd.tex
+++ /dev/null
@@ -1,13 +0,0 @@
-\documentstyle[12pt]{article}
-\pagestyle{empty}
-\begin{document}
-
-\begin{eqnarray*}
-   U^{cond} = \displaystyle\sum_{i=1}^{N} u_{i}^{cond} \\ 
-   U^{mech} = \displaystyle\sum_{i=1}^{N} u_{i}^{mech} \\
-   U^{chem} = \displaystyle\sum_{i=1}^{N} u_{i}^{chem} \\
-   U = \displaystyle\sum_{i=1}^{N} (u_{i}^{cond} + u_{i}^{mech} + u_{i}^{chem}) \\
-   \theta_{avg} = (\frac{1}{N}\displaystyle\sum_{i=1}^{N} \frac{1}{\theta_{i}})^{-1} \\
-\end{eqnarray*}                           
-
-\end{document}
diff --git a/doc/src/Eqs/compute_fep_bar.jpg b/doc/src/Eqs/compute_fep_bar.jpg
deleted file mode 100644
index 772ec9c045..0000000000
Binary files a/doc/src/Eqs/compute_fep_bar.jpg and /dev/null differ
diff --git a/doc/src/Eqs/compute_fep_bar.tex b/doc/src/Eqs/compute_fep_bar.tex
deleted file mode 100644
index a40aa1c297..0000000000
--- a/doc/src/Eqs/compute_fep_bar.tex
+++ /dev/null
@@ -1,7 +0,0 @@
-\documentstyle[12pt]{article}
-
-\begin{document}
-
-\[ \left< \frac{1}{1 + \exp\left[\left(U_1 - U_0 - \Delta_0^1A \right) /kT \right]} \right>_0 = \left< \frac{1}{1 + \exp\left[\left(U_0 - U_1 + \Delta_0^1A \right) /kT \right]} \right>_1 \]
-
-\end{document}
diff --git a/doc/src/Eqs/compute_fep_fdti.jpg b/doc/src/Eqs/compute_fep_fdti.jpg
deleted file mode 100644
index ae8de241cc..0000000000
Binary files a/doc/src/Eqs/compute_fep_fdti.jpg and /dev/null differ
diff --git a/doc/src/Eqs/compute_fep_fdti.tex b/doc/src/Eqs/compute_fep_fdti.tex
deleted file mode 100644
index fdea6faa3d..0000000000
--- a/doc/src/Eqs/compute_fep_fdti.tex
+++ /dev/null
@@ -1,10 +0,0 @@
-\documentstyle[12pt]{article}
-
-\begin{document}
-
-\[ \Delta_0^1 A = \int_{\lambda=0}^{\lambda=1} \left( \frac{\partial
-    A(\lambda)}{\partial\lambda} \right)_\lambda \mathrm{d}\lambda
-\approx \sum_{i=0}^{n-1} w_i \frac{A(\lambda_{i} + \delta) -
-  A(\lambda_i)}{\delta} \]
-
-\end{document}
diff --git a/doc/src/Eqs/compute_fep_fep.jpg b/doc/src/Eqs/compute_fep_fep.jpg
deleted file mode 100644
index d84a76b0dd..0000000000
Binary files a/doc/src/Eqs/compute_fep_fep.jpg and /dev/null differ
diff --git a/doc/src/Eqs/compute_fep_fep.tex b/doc/src/Eqs/compute_fep_fep.tex
deleted file mode 100644
index 718aad3c40..0000000000
--- a/doc/src/Eqs/compute_fep_fep.tex
+++ /dev/null
@@ -1,9 +0,0 @@
-\documentstyle[12pt]{article}
-
-\begin{document}
-
-\[ \Delta_0^1 A = \sum_{i=0}^{n-1} \Delta_{\lambda_i}^{\lambda_{i+1}} A =
-- kT \sum_{i=0}^{n-1} \ln \left< \exp \left( - \frac{U(\lambda_{i+1}) -
-      U(\lambda_i)}{kT} \right) \right>_{\lambda_i} \]
-
-\end{document}
diff --git a/doc/src/Eqs/compute_fep_lambda.jpg b/doc/src/Eqs/compute_fep_lambda.jpg
deleted file mode 100644
index 5ef9e8b9f2..0000000000
Binary files a/doc/src/Eqs/compute_fep_lambda.jpg and /dev/null differ
diff --git a/doc/src/Eqs/compute_fep_lambda.tex b/doc/src/Eqs/compute_fep_lambda.tex
deleted file mode 100644
index 08c8faaa3c..0000000000
--- a/doc/src/Eqs/compute_fep_lambda.tex
+++ /dev/null
@@ -1,10 +0,0 @@
-\documentstyle[12pt]{article}
-
-\begin{document}
-
-\begin{eqnarray*}
-  \lambda = 0 \quad\Rightarrow\quad U = U_{\mathrm{bg}} + U_0 \\
-  \lambda = 1 \quad\Rightarrow\quad U = U_{\mathrm{bg}} + U_1 
-\end{eqnarray*}
-
-\end{document}
diff --git a/doc/src/Eqs/compute_fep_ti.jpg b/doc/src/Eqs/compute_fep_ti.jpg
deleted file mode 100644
index 6b0c8fdc19..0000000000
Binary files a/doc/src/Eqs/compute_fep_ti.jpg and /dev/null differ
diff --git a/doc/src/Eqs/compute_fep_ti.tex b/doc/src/Eqs/compute_fep_ti.tex
deleted file mode 100644
index 6222dbd503..0000000000
--- a/doc/src/Eqs/compute_fep_ti.tex
+++ /dev/null
@@ -1,10 +0,0 @@
-\documentstyle[12pt]{article}
-
-\begin{document}
-
-\[ \Delta_0^1 A = \int_{\lambda=0}^{\lambda=1} \left< \frac{\partial
-    U(\lambda)}{\partial\lambda} \right>_\lambda \mathrm{d}\lambda
-\approx \sum_{i=0}^{n-1} w_i \left< \frac{U(\lambda_{i} + \delta) -
-    U(\lambda_i)}{\delta} \right>_{\lambda_i} \]
-
-\end{document}
diff --git a/doc/src/Eqs/compute_fep_u.jpg b/doc/src/Eqs/compute_fep_u.jpg
deleted file mode 100644
index 62df5dd0c0..0000000000
Binary files a/doc/src/Eqs/compute_fep_u.jpg and /dev/null differ
diff --git a/doc/src/Eqs/compute_fep_u.tex b/doc/src/Eqs/compute_fep_u.tex
deleted file mode 100644
index e847a9ac44..0000000000
--- a/doc/src/Eqs/compute_fep_u.tex
+++ /dev/null
@@ -1,7 +0,0 @@
-\documentstyle[12pt]{article}
-
-\begin{document}
-
-\[  U(\lambda) = U_{\mathrm{bg}} + U_1(\lambda) + U_0(\lambda) \]
-
-\end{document}
diff --git a/doc/src/Eqs/compute_fep_vol.jpg b/doc/src/Eqs/compute_fep_vol.jpg
deleted file mode 100644
index a66facad39..0000000000
Binary files a/doc/src/Eqs/compute_fep_vol.jpg and /dev/null differ
diff --git a/doc/src/Eqs/compute_fep_vol.tex b/doc/src/Eqs/compute_fep_vol.tex
deleted file mode 100644
index 0301e39788..0000000000
--- a/doc/src/Eqs/compute_fep_vol.tex
+++ /dev/null
@@ -1,9 +0,0 @@
-\documentstyle[12pt]{article}
-
-\begin{document}
-
-\[ \Delta_0^1 A = - kT \sum_{i=0}^{n-1} \ln \frac{\left< V \exp \left( -
-    \frac{U(\lambda_{i+1}) - U(\lambda_i)}{kT} \right)
-\right>_{\lambda_i}}{\left< V \right>_{\lambda_i}} \]
-
-\end{document}
diff --git a/doc/src/Eqs/compute_gyration.jpg b/doc/src/Eqs/compute_gyration.jpg
deleted file mode 100644
index 2285444434..0000000000
Binary files a/doc/src/Eqs/compute_gyration.jpg and /dev/null differ
diff --git a/doc/src/Eqs/compute_gyration.tex b/doc/src/Eqs/compute_gyration.tex
deleted file mode 100644
index 97204f1ded..0000000000
--- a/doc/src/Eqs/compute_gyration.tex
+++ /dev/null
@@ -1,9 +0,0 @@
-\documentstyle[12pt]{article}
-
-\begin{document}
-
-$$
- {R_g}^2 = \frac{1}{M} \sum_i m_i (r_i - r_{cm})^2
-$$
-
-\end{document}
\ No newline at end of file
diff --git a/doc/src/Eqs/compute_msd_nongauss.jpg b/doc/src/Eqs/compute_msd_nongauss.jpg
deleted file mode 100644
index d57f6a4af8..0000000000
Binary files a/doc/src/Eqs/compute_msd_nongauss.jpg and /dev/null differ
diff --git a/doc/src/Eqs/compute_msd_nongauss.tex b/doc/src/Eqs/compute_msd_nongauss.tex
deleted file mode 100644
index 168d8f72ed..0000000000
--- a/doc/src/Eqs/compute_msd_nongauss.tex
+++ /dev/null
@@ -1,9 +0,0 @@
-\documentstyle[12pt]{article}
-
-\begin{document}
-
-$$
- NGP(t) = 3<(r(t)-r(0))^4>/(5<(r(t)-r(0))^2>^2) - 1
-$$
-
-\end{document}
diff --git a/doc/src/Eqs/compute_saed1.jpg b/doc/src/Eqs/compute_saed1.jpg
deleted file mode 100644
index 6bad3a6104..0000000000
Binary files a/doc/src/Eqs/compute_saed1.jpg and /dev/null differ
diff --git a/doc/src/Eqs/compute_saed1.tex b/doc/src/Eqs/compute_saed1.tex
deleted file mode 100644
index 0db2f55ecd..0000000000
--- a/doc/src/Eqs/compute_saed1.tex
+++ /dev/null
@@ -1,10 +0,0 @@
-\documentstyle[12pt]{article}
-
-\begin{document}
-
-$$ 
-  I=\frac{F^{*}F}{N}
-$$
-
-\end{document}
-
diff --git a/doc/src/Eqs/compute_saed2.jpg b/doc/src/Eqs/compute_saed2.jpg
deleted file mode 100644
index 2b3b0bc090..0000000000
Binary files a/doc/src/Eqs/compute_saed2.jpg and /dev/null differ
diff --git a/doc/src/Eqs/compute_saed2.tex b/doc/src/Eqs/compute_saed2.tex
deleted file mode 100644
index d005602339..0000000000
--- a/doc/src/Eqs/compute_saed2.tex
+++ /dev/null
@@ -1,9 +0,0 @@
-\documentstyle[12pt]{article}
-
-\begin{document}
-
-$$ 
-  F(\mathbf{k})=\sum_{j=1}^{N}f_j(\theta)exp(2\pi i \mathbf{k}\cdot \mathbf{r}_j)
-$$
-\end{document}
-
diff --git a/doc/src/Eqs/compute_saed3.jpg b/doc/src/Eqs/compute_saed3.jpg
deleted file mode 100644
index 1bbc920908..0000000000
Binary files a/doc/src/Eqs/compute_saed3.jpg and /dev/null differ
diff --git a/doc/src/Eqs/compute_saed3.tex b/doc/src/Eqs/compute_saed3.tex
deleted file mode 100644
index 5988a620c7..0000000000
--- a/doc/src/Eqs/compute_saed3.tex
+++ /dev/null
@@ -1,10 +0,0 @@
-\documentstyle[12pt]{article}
-
-\begin{document}
-
-$$ 
-  f_j\left ( \frac{sin(\theta)}{\lambda} \right )=\sum_{i}^{5}
-a_i exp\left ( -b_i \frac{sin^{2}(\theta)}{\lambda^{2}} \right )
-$$
-\end{document}
-
diff --git a/doc/src/Eqs/compute_shape_parameters.jpg b/doc/src/Eqs/compute_shape_parameters.jpg
deleted file mode 100644
index 9e2374561b..0000000000
Binary files a/doc/src/Eqs/compute_shape_parameters.jpg and /dev/null differ
diff --git a/doc/src/Eqs/compute_shape_parameters.tex b/doc/src/Eqs/compute_shape_parameters.tex
deleted file mode 100644
index 8298efc6e0..0000000000
--- a/doc/src/Eqs/compute_shape_parameters.tex
+++ /dev/null
@@ -1,13 +0,0 @@
-\documentclass[12pt]{article}
-
-\pagestyle{empty}
-\begin{document}
-
-\begin{eqnarray*}
- c = l_z - 0.5(l_y+l_x) \\
- b = l_y - l_x \\
- k = \frac{3}{2} \frac{l_x^2+l_y^2+l_z^2}{(l_x+l_y+l_z)^2} - \frac{1}{2} 
-\end{eqnarray*}
-
-\end{document}
-
diff --git a/doc/src/Eqs/compute_sna_atom1.jpg b/doc/src/Eqs/compute_sna_atom1.jpg
deleted file mode 100644
index fe4b641aa6..0000000000
Binary files a/doc/src/Eqs/compute_sna_atom1.jpg and /dev/null differ
diff --git a/doc/src/Eqs/compute_sna_atom1.tex b/doc/src/Eqs/compute_sna_atom1.tex
deleted file mode 100644
index 93e2709bf9..0000000000
--- a/doc/src/Eqs/compute_sna_atom1.tex
+++ /dev/null
@@ -1,11 +0,0 @@
-\documentclass[24pt]{article}
-
-\pagestyle{empty}
-
-\begin{document}
-
-\begin{eqnarray*}
-\theta_0 = {\tt rfac0} \frac{r-r_{min0}}{R_{ii'}-r_{min0}} \pi
-\end{eqnarray*}
-
-\end{document}
diff --git a/doc/src/Eqs/compute_sna_atom2.jpg b/doc/src/Eqs/compute_sna_atom2.jpg
deleted file mode 100644
index 7a4b2c2111..0000000000
Binary files a/doc/src/Eqs/compute_sna_atom2.jpg and /dev/null differ
diff --git a/doc/src/Eqs/compute_sna_atom2.tex b/doc/src/Eqs/compute_sna_atom2.tex
deleted file mode 100644
index 98d8f2efa6..0000000000
--- a/doc/src/Eqs/compute_sna_atom2.tex
+++ /dev/null
@@ -1,11 +0,0 @@
-\documentclass[24pt]{article}
-
-\pagestyle{empty}
-
-\begin{document}
-
-\begin{eqnarray*}
-u^j_{m,m'} = U^j_{m,m'}(0,0,0) + \sum_{r_{ii'} < R_{ii'}}{f_c(r_{ii'}) w_{i'} U^j_{m,m'}(\theta_0,\theta,\phi)} 
-\end{eqnarray*}
-
-\end{document}
diff --git a/doc/src/Eqs/compute_sna_atom3.jpg b/doc/src/Eqs/compute_sna_atom3.jpg
deleted file mode 100644
index 41d6774e9c..0000000000
Binary files a/doc/src/Eqs/compute_sna_atom3.jpg and /dev/null differ
diff --git a/doc/src/Eqs/compute_sna_atom3.tex b/doc/src/Eqs/compute_sna_atom3.tex
deleted file mode 100644
index 5e3212f7bd..0000000000
--- a/doc/src/Eqs/compute_sna_atom3.tex
+++ /dev/null
@@ -1,16 +0,0 @@
-\documentclass[24pt]{article}
-
-\pagestyle{empty}
-
-\begin{document}
-
-\newcommand{\hcoeff}[9]{H\!\!{\tiny\begin{array}{l}#1 #2 #3 \\ #4 #5 #6 \\ #7 #8 #9 \end{array}}}
-
-\begin{equation}
-B_{j_1,j_2,j}  = \\
-\sum_{m_1,m'_1=-j_1}^{j_1}\sum_{m_2,m'_2=-j_2}^{j_2}\sum_{m,m'=-j}^{j} (u^j_{m,m'})^*
-\hcoeff{j}{m}{m'}{j_1}{\!m_1}{\!m'_1}{j_2}{m_2}{m'_2}
-u^{j_1}_{m_1,m'_1} u^{j_2}_{m_2,m'_2}
-\end{equation}
-
-\end{document}
diff --git a/doc/src/Eqs/compute_sna_atom4.jpg b/doc/src/Eqs/compute_sna_atom4.jpg
deleted file mode 100644
index 5d53943bf4..0000000000
Binary files a/doc/src/Eqs/compute_sna_atom4.jpg and /dev/null differ
diff --git a/doc/src/Eqs/compute_sna_atom4.tex b/doc/src/Eqs/compute_sna_atom4.tex
deleted file mode 100644
index 3477d163e3..0000000000
--- a/doc/src/Eqs/compute_sna_atom4.tex
+++ /dev/null
@@ -1,14 +0,0 @@
-\documentclass[24pt]{article}
-
-\pagestyle{empty}
-
-\begin{document}
-
-\begin{eqnarray*}
-\label{eqn:f_c}
-f_c(r)  & = & \frac{1}{2}(\cos(\pi \frac{r-r_{min0}}{R_{ii'}-r_{min0}}) + 1), r \leq R_{ii'} \\
-& = & 0,  r > R_{ii'}
-\end{eqnarray*}
-
-
-\end{document}
diff --git a/doc/src/Eqs/compute_sna_atom5.jpg b/doc/src/Eqs/compute_sna_atom5.jpg
deleted file mode 100644
index 732731fe13..0000000000
Binary files a/doc/src/Eqs/compute_sna_atom5.jpg and /dev/null differ
diff --git a/doc/src/Eqs/compute_sna_atom5.tex b/doc/src/Eqs/compute_sna_atom5.tex
deleted file mode 100644
index 72f5a0fe7c..0000000000
--- a/doc/src/Eqs/compute_sna_atom5.tex
+++ /dev/null
@@ -1,12 +0,0 @@
-\documentclass[24pt]{article}
-
-\pagestyle{empty}
-
-\begin{document}
-
-
-\begin{equation}
-- \sum_{i' \in I} \frac{\partial {B^{i'}_{j_1,j_2,j}  }}{\partial {\bf r}_i}
-\end{equation}
-
-\end{document}
diff --git a/doc/src/Eqs/compute_sna_atom6.jpg b/doc/src/Eqs/compute_sna_atom6.jpg
deleted file mode 100644
index 963dd81416..0000000000
Binary files a/doc/src/Eqs/compute_sna_atom6.jpg and /dev/null differ
diff --git a/doc/src/Eqs/compute_sna_atom6.tex b/doc/src/Eqs/compute_sna_atom6.tex
deleted file mode 100644
index 7da589548b..0000000000
--- a/doc/src/Eqs/compute_sna_atom6.tex
+++ /dev/null
@@ -1,12 +0,0 @@
-\documentclass[24pt]{article}
-
-\pagestyle{empty}
-
-\begin{document}
-
-
-\begin{eqnarray*}
-- {\bf r}_i \otimes \sum_{i' \in I} \frac{\partial {B^{i'}_{j_1,j_2,j}}}{\partial {\bf r}_i}
-\end{eqnarray*}
-
-\end{document}
diff --git a/doc/src/Eqs/compute_xrd1.jpg b/doc/src/Eqs/compute_xrd1.jpg
deleted file mode 100644
index 8432fad4aa..0000000000
Binary files a/doc/src/Eqs/compute_xrd1.jpg and /dev/null differ
diff --git a/doc/src/Eqs/compute_xrd1.tex b/doc/src/Eqs/compute_xrd1.tex
deleted file mode 100644
index 6e749c768d..0000000000
--- a/doc/src/Eqs/compute_xrd1.tex
+++ /dev/null
@@ -1,10 +0,0 @@
-\documentstyle[12pt]{article}
-
-\begin{document}
-
-$$ 
-  I=Lp(\theta)\frac{F^{*}F}{N}
-$$
-
-\end{document}
-
diff --git a/doc/src/Eqs/compute_xrd2.jpg b/doc/src/Eqs/compute_xrd2.jpg
deleted file mode 100644
index 1bcf0494ea..0000000000
Binary files a/doc/src/Eqs/compute_xrd2.jpg and /dev/null differ
diff --git a/doc/src/Eqs/compute_xrd2.tex b/doc/src/Eqs/compute_xrd2.tex
deleted file mode 100644
index d005602339..0000000000
--- a/doc/src/Eqs/compute_xrd2.tex
+++ /dev/null
@@ -1,9 +0,0 @@
-\documentstyle[12pt]{article}
-
-\begin{document}
-
-$$ 
-  F(\mathbf{k})=\sum_{j=1}^{N}f_j(\theta)exp(2\pi i \mathbf{k}\cdot \mathbf{r}_j)
-$$
-\end{document}
-
diff --git a/doc/src/Eqs/compute_xrd3.jpg b/doc/src/Eqs/compute_xrd3.jpg
deleted file mode 100644
index 19f7aa99b5..0000000000
Binary files a/doc/src/Eqs/compute_xrd3.jpg and /dev/null differ
diff --git a/doc/src/Eqs/compute_xrd3.tex b/doc/src/Eqs/compute_xrd3.tex
deleted file mode 100644
index da0254134c..0000000000
--- a/doc/src/Eqs/compute_xrd3.tex
+++ /dev/null
@@ -1,9 +0,0 @@
-\documentstyle[12pt]{article}
-
-\begin{document}
-
-$$ 
-  Lp(\theta)=\frac{1+cos^{2}(2\theta)}{cos(\theta)sin^{2}(\theta)}
-$$
-\end{document}
-
diff --git a/doc/src/Eqs/compute_xrd4.jpg b/doc/src/Eqs/compute_xrd4.jpg
deleted file mode 100644
index 385bb1efd7..0000000000
Binary files a/doc/src/Eqs/compute_xrd4.jpg and /dev/null differ
diff --git a/doc/src/Eqs/compute_xrd4.tex b/doc/src/Eqs/compute_xrd4.tex
deleted file mode 100644
index d4deb7ca55..0000000000
--- a/doc/src/Eqs/compute_xrd4.tex
+++ /dev/null
@@ -1,9 +0,0 @@
-\documentstyle[12pt]{article}
-
-\begin{document}
-
-$$ 
-  \frac{sin(\theta)}{\lambda}=\frac{\left | \mathbf{k} \right |}{2}
-$$
-\end{document}
-
diff --git a/doc/src/Eqs/compute_xrd5.jpg b/doc/src/Eqs/compute_xrd5.jpg
deleted file mode 100644
index c6f0a2609a..0000000000
Binary files a/doc/src/Eqs/compute_xrd5.jpg and /dev/null differ
diff --git a/doc/src/Eqs/compute_xrd5.tex b/doc/src/Eqs/compute_xrd5.tex
deleted file mode 100644
index 2d97a3288b..0000000000
--- a/doc/src/Eqs/compute_xrd5.tex
+++ /dev/null
@@ -1,10 +0,0 @@
-\documentstyle[12pt]{article}
-
-\begin{document}
-
-$$ 
-  f_j\left ( \frac{sin(\theta)}{\lambda} \right )=\sum_{i}^{4} 
-a_i exp\left ( -b_i \frac{sin^{2}(\theta)}{\lambda^{2}} \right )+c
-$$
-\end{document}
-
diff --git a/doc/src/Eqs/dihedral_charmm.jpg b/doc/src/Eqs/dihedral_charmm.jpg
deleted file mode 100644
index 810afa3cd2..0000000000
Binary files a/doc/src/Eqs/dihedral_charmm.jpg and /dev/null differ
diff --git a/doc/src/Eqs/dihedral_charmm.tex b/doc/src/Eqs/dihedral_charmm.tex
deleted file mode 100644
index c3d860b265..0000000000
--- a/doc/src/Eqs/dihedral_charmm.tex
+++ /dev/null
@@ -1,9 +0,0 @@
-\documentclass[12pt]{article}
-
-\begin{document}
-
-$$  
-  E = K [ 1 + \cos (n \phi - d) ]
-$$
-
-\end{document}
\ No newline at end of file
diff --git a/doc/src/Eqs/dihedral_class2.jpg b/doc/src/Eqs/dihedral_class2.jpg
deleted file mode 100644
index 6a6780e769..0000000000
Binary files a/doc/src/Eqs/dihedral_class2.jpg and /dev/null differ
diff --git a/doc/src/Eqs/dihedral_class2.tex b/doc/src/Eqs/dihedral_class2.tex
deleted file mode 100644
index 02acc16fb9..0000000000
--- a/doc/src/Eqs/dihedral_class2.tex
+++ /dev/null
@@ -1,17 +0,0 @@
-\documentclass[12pt]{article}
-
-\begin{document}
-
-\begin{eqnarray*}
-  E & = & E_d + E_{mbt} + E_{ebt} + E_{at} + E_{aat} + E_{bb13} \\
-  E_d & = & \sum_{n=1}^{3} K_n [ 1 - \cos (n \phi - \phi_n) ] \\
-  E_{mbt} & = & (r_{jk} - r_2) [ A_1 \cos (\phi) + A_2 \cos (2\phi) + A_3 \cos (3\phi) ] \\
-  E_{ebt} & = & (r_{ij} - r_1) [ B_1 \cos (\phi) + B_2 \cos (2\phi) + B_3 \cos (3\phi) ] + \\
-  & & (r_{kl} - r_3) [ C_1 \cos (\phi) + C_2 \cos (2\phi) + C_3 \cos (3\phi) ] \\
-  E_{at} & = & (\theta_{ijk} - \theta_1) [ D_1 \cos (\phi) + D_2 \cos (2\phi) + D_3 \cos (3\phi) ] + \\
-  & & (\theta_{jkl} - \theta_2) [ E_1 \cos (\phi) + E_2 \cos (2\phi) + E_3 \cos (3\phi) ] \\
-  E_{aat} & = & M (\theta_{ijk} - \theta_1) (\theta_{jkl} - \theta_2) \cos (\phi) \\
-  E_{bb13} & = & N (r_{ij} - r_1) (r_{kl} - r_3)
-\end{eqnarray*}
-
-\end{document}
\ No newline at end of file
diff --git a/doc/src/Eqs/dihedral_cosine_shift_exp.jpg b/doc/src/Eqs/dihedral_cosine_shift_exp.jpg
deleted file mode 100644
index ea0a7550f8..0000000000
Binary files a/doc/src/Eqs/dihedral_cosine_shift_exp.jpg and /dev/null differ
diff --git a/doc/src/Eqs/dihedral_cosine_shift_exp.tex b/doc/src/Eqs/dihedral_cosine_shift_exp.tex
deleted file mode 100644
index 4afa01356c..0000000000
--- a/doc/src/Eqs/dihedral_cosine_shift_exp.tex
+++ /dev/null
@@ -1,13 +0,0 @@
-\documentstyle[12pt]{article}
-
-\begin{document}
-
-$$
-E=-U_{min} 
-\frac{e^{-a U(\theta,\theta_0)}-1}{e^a-1}
-\quad\mbox{with}\quad
-U(\theta,\theta_0)
-=-0.5 \left(1+\cos(\theta-\theta_0) \right)
-$$
-
-\end{document}
diff --git a/doc/src/Eqs/dihedral_fourier.jpg b/doc/src/Eqs/dihedral_fourier.jpg
deleted file mode 100644
index 663ac17ee6..0000000000
Binary files a/doc/src/Eqs/dihedral_fourier.jpg and /dev/null differ
diff --git a/doc/src/Eqs/dihedral_fourier.tex b/doc/src/Eqs/dihedral_fourier.tex
deleted file mode 100644
index 960d3a8ea8..0000000000
--- a/doc/src/Eqs/dihedral_fourier.tex
+++ /dev/null
@@ -1,9 +0,0 @@
-\documentclass[12pt]{article}
-
-\begin{document}
-
-$$  
-  E = \sum_{i=1,m} K_i  [ 1.0 + \cos ( n_i \phi - d_i ) ]
-$$
-
-\end{document}
diff --git a/doc/src/Eqs/dihedral_harmonic.jpg b/doc/src/Eqs/dihedral_harmonic.jpg
deleted file mode 100644
index cb5c16a8ca..0000000000
Binary files a/doc/src/Eqs/dihedral_harmonic.jpg and /dev/null differ
diff --git a/doc/src/Eqs/dihedral_harmonic.tex b/doc/src/Eqs/dihedral_harmonic.tex
deleted file mode 100644
index 9d02036fcc..0000000000
--- a/doc/src/Eqs/dihedral_harmonic.tex
+++ /dev/null
@@ -1,9 +0,0 @@
-\documentclass[12pt]{article}
-
-\begin{document}
-
-$$
-  E = K [ 1 + d  \cos (n \phi) ]
-$$
-
-\end{document}
\ No newline at end of file
diff --git a/doc/src/Eqs/dihedral_helix.jpg b/doc/src/Eqs/dihedral_helix.jpg
deleted file mode 100644
index 01a0ec982c..0000000000
Binary files a/doc/src/Eqs/dihedral_helix.jpg and /dev/null differ
diff --git a/doc/src/Eqs/dihedral_helix.tex b/doc/src/Eqs/dihedral_helix.tex
deleted file mode 100644
index ae25776f2c..0000000000
--- a/doc/src/Eqs/dihedral_helix.tex
+++ /dev/null
@@ -1,10 +0,0 @@
-\documentclass[12pt]{article}
-
-\begin{document}
-
-$$
-  E = A [1 - \cos(\theta)] + B [1 + \cos(3 \theta)] + 
-      C [1 + \cos(\theta + \frac{\pi}{4})]
-$$
-
-\end{document}
\ No newline at end of file
diff --git a/doc/src/Eqs/dihedral_multi_harmonic.jpg b/doc/src/Eqs/dihedral_multi_harmonic.jpg
deleted file mode 100644
index d066cd212b..0000000000
Binary files a/doc/src/Eqs/dihedral_multi_harmonic.jpg and /dev/null differ
diff --git a/doc/src/Eqs/dihedral_multi_harmonic.tex b/doc/src/Eqs/dihedral_multi_harmonic.tex
deleted file mode 100644
index 819aa7c57c..0000000000
--- a/doc/src/Eqs/dihedral_multi_harmonic.tex
+++ /dev/null
@@ -1,9 +0,0 @@
-\documentclass[12pt]{article}
-
-\begin{document}
-
-$$  
-  E = \sum_{n=1,5} A_n  \cos^{n-1}(\phi)
-$$
-
-\end{document}
\ No newline at end of file
diff --git a/doc/src/Eqs/dihedral_nharmonic.jpg b/doc/src/Eqs/dihedral_nharmonic.jpg
deleted file mode 100644
index 4f4928bdd5..0000000000
Binary files a/doc/src/Eqs/dihedral_nharmonic.jpg and /dev/null differ
diff --git a/doc/src/Eqs/dihedral_nharmonic.tex b/doc/src/Eqs/dihedral_nharmonic.tex
deleted file mode 100644
index 57a1d25284..0000000000
--- a/doc/src/Eqs/dihedral_nharmonic.tex
+++ /dev/null
@@ -1,9 +0,0 @@
-\documentclass[12pt]{article}
-
-\begin{document}
-
-$$  
-  E = \sum_{n=1,n} A_n  \cos^{n-1}(\phi)
-$$
-
-\end{document}
diff --git a/doc/src/Eqs/dihedral_opls.jpg b/doc/src/Eqs/dihedral_opls.jpg
deleted file mode 100644
index 0546aebfde..0000000000
Binary files a/doc/src/Eqs/dihedral_opls.jpg and /dev/null differ
diff --git a/doc/src/Eqs/dihedral_opls.tex b/doc/src/Eqs/dihedral_opls.tex
deleted file mode 100644
index 5e4aada53a..0000000000
--- a/doc/src/Eqs/dihedral_opls.tex
+++ /dev/null
@@ -1,10 +0,0 @@
-\documentclass[12pt]{article}
-
-\begin{document}
-
-$$
-  E = \frac{1}{2} K_1 [1 + \cos(\phi)] + \frac{1}{2} K_2 [1 - \cos(2 \phi)] +
-      \frac{1}{2} K_3 [1 + \cos(3 \phi)] + \frac{1}{2} K_4 [1 - \cos(4 \phi)]
-$$
-
-\end{document}
\ No newline at end of file
diff --git a/doc/src/Eqs/dihedral_quadratic.jpg b/doc/src/Eqs/dihedral_quadratic.jpg
deleted file mode 100644
index 8fb17622f8..0000000000
Binary files a/doc/src/Eqs/dihedral_quadratic.jpg and /dev/null differ
diff --git a/doc/src/Eqs/dihedral_quadratic.tex b/doc/src/Eqs/dihedral_quadratic.tex
deleted file mode 100644
index 049e4b2ec4..0000000000
--- a/doc/src/Eqs/dihedral_quadratic.tex
+++ /dev/null
@@ -1,9 +0,0 @@
-\documentclass[12pt]{article}
-
-\begin{document}
-
-$$
-  E = K (\phi - \phi_0)^2 
-$$
-
-\end{document}
diff --git a/doc/src/Eqs/dihedral_spherical.jpg b/doc/src/Eqs/dihedral_spherical.jpg
deleted file mode 100644
index 73a900762e..0000000000
Binary files a/doc/src/Eqs/dihedral_spherical.jpg and /dev/null differ
diff --git a/doc/src/Eqs/dihedral_spherical.tex b/doc/src/Eqs/dihedral_spherical.tex
deleted file mode 100644
index 690d278819..0000000000
--- a/doc/src/Eqs/dihedral_spherical.tex
+++ /dev/null
@@ -1,15 +0,0 @@
-\documentclass[12pt]{article}
-
-\begin{document}
-\pagestyle{empty}
-\begin{eqnarray*}
-E(\phi,\theta_1,\theta_2) & = &\sum_{i=1}^N\nolimits\ C_i\ \Phi_i(\phi)\ \Theta_{1i}(\theta_1)\ \Theta_{2i}(\theta_2)\\
-\Phi_{i}(\phi)        & = &  u_i - \mathrm{cos}((\phi   - a_i)K_i) \\
-\Theta_{1i}(\theta_1) & = &  v_i - \mathrm{cos}((\theta_1-b_i)L_i) \\
-\Theta_{2i}(\theta_2) & = &  w_i - \mathrm{cos}((\theta_2-c_i)M_i)
-\end{eqnarray*}
-
-% Check using: http://quicklatex.com/  (24pt font)
-\pagestyle{empty}
-\end{document}
-
diff --git a/doc/src/Eqs/dihedral_table_cut.jpg b/doc/src/Eqs/dihedral_table_cut.jpg
deleted file mode 100644
index c124184c17..0000000000
Binary files a/doc/src/Eqs/dihedral_table_cut.jpg and /dev/null differ
diff --git a/doc/src/Eqs/dihedral_table_cut.tex b/doc/src/Eqs/dihedral_table_cut.tex
deleted file mode 100644
index 3cc1d331a8..0000000000
--- a/doc/src/Eqs/dihedral_table_cut.tex
+++ /dev/null
@@ -1,11 +0,0 @@
-\documentclass[12pt]{article}
-\pagestyle{empty}
-\begin{document}
-
-\begin{eqnarray*}
-        f(\theta) & = & K \qquad\qquad\qquad\qquad\qquad\qquad \theta < \theta_1 \\
-        f(\theta) & = & K \left(1-\frac{(\theta - \theta_1)^2}{(\theta_2 - \theta_1)^2}\right) \qquad \theta_1 < \theta < \theta_2
-\end{eqnarray*}
-
-\end{document}
-
diff --git a/doc/src/Eqs/e3b.jpg b/doc/src/Eqs/e3b.jpg
deleted file mode 100644
index d3b07da409..0000000000
Binary files a/doc/src/Eqs/e3b.jpg and /dev/null differ
diff --git a/doc/src/Eqs/e3b.tex b/doc/src/Eqs/e3b.tex
deleted file mode 100644
index 550538bf35..0000000000
--- a/doc/src/Eqs/e3b.tex
+++ /dev/null
@@ -1,15 +0,0 @@
-\documentclass[12pt]{article}
-\usepackage{amsmath}
-\begin{document}
-
-\begin{align*}
-E =& E_2 \sum_{i,j}e^{-k_2 r_{ij}} + E_A \sum_{\substack{i,j,k,\ell \\\in \textrm{type A}}} f(r_{ij})f(r_{k\ell}) + E_B \sum_{\substack{i,j,k,\ell \\\in \textrm{type B}}} f(r_{ij})f(r_{k\ell}) + E_C \sum_{\substack{i,j,k,\ell \\\in \textrm{type C}}} f(r_{ij})f(r_{k\ell}) \\
-f(r) =& e^{-k_3 r}s(r) \\
-s(r) =& \begin{cases}
-  1 & r<R_s \\
-  \displaystyle\frac{(R_f-r)^2(R_f-3R_s+2r)}{(R_f-R_s)^3} & R_s\leq r\leq R_f \\
-  0 & r>R_f\\
-\end{cases}
-\end{align*}
-
-\end{document}
diff --git a/doc/src/Eqs/eff_ECP1.jpg b/doc/src/Eqs/eff_ECP1.jpg
deleted file mode 100644
index 3b8a3f8ff3..0000000000
Binary files a/doc/src/Eqs/eff_ECP1.jpg and /dev/null differ
diff --git a/doc/src/Eqs/eff_ECP1.tex b/doc/src/Eqs/eff_ECP1.tex
deleted file mode 100644
index ebd581163c..0000000000
--- a/doc/src/Eqs/eff_ECP1.tex
+++ /dev/null
@@ -1,9 +0,0 @@
-\documentstyle[12pt]{article}
-
-\begin{document}
-
-$$
-E_{Pauli(ECP_s)}=p_1\exp\left(-\frac{p_2r^2}{p_3+s^2} \right)
-$$
-
-\end{document}  
\ No newline at end of file
diff --git a/doc/src/Eqs/eff_ECP2.jpg b/doc/src/Eqs/eff_ECP2.jpg
deleted file mode 100644
index 195ed55e43..0000000000
Binary files a/doc/src/Eqs/eff_ECP2.jpg and /dev/null differ
diff --git a/doc/src/Eqs/eff_ECP2.tex b/doc/src/Eqs/eff_ECP2.tex
deleted file mode 100644
index 0c3c366562..0000000000
--- a/doc/src/Eqs/eff_ECP2.tex
+++ /dev/null
@@ -1,8 +0,0 @@
-\documentstyle[12pt]{article}
-
-\begin{document}
-
-$$
-E_{Pauli(ECP_p)}=p_1\left( \frac{2}{p_2/s+s/p_2} \right)\left( r-p_3s\right)^2\exp \left[ -\frac{p_4\left( r-p_3s \right)^2}{p_5+s^2} \right] 
-$$
-
\end{document}  
\ No newline at end of file
diff --git a/doc/src/Eqs/eff_KE.jpg b/doc/src/Eqs/eff_KE.jpg
deleted file mode 100644
index 40eed0df65..0000000000
Binary files a/doc/src/Eqs/eff_KE.jpg and /dev/null differ
diff --git a/doc/src/Eqs/eff_KE.tex b/doc/src/Eqs/eff_KE.tex
deleted file mode 100644
index 9f9af2fa25..0000000000
--- a/doc/src/Eqs/eff_KE.tex
+++ /dev/null
@@ -1,9 +0,0 @@
-\documentclass[12pt]{article}
-
-\begin{document}
-
-$$ 
-E_{KE}  = \frac{\hbar^2 }{{m_{e} }}\sum\limits_i {\frac{3}{{2s_i^2 }}}
-$$
-
-\end{document}
diff --git a/doc/src/Eqs/eff_NN.jpg b/doc/src/Eqs/eff_NN.jpg
deleted file mode 100644
index c3c52e19b4..0000000000
Binary files a/doc/src/Eqs/eff_NN.jpg and /dev/null differ
diff --git a/doc/src/Eqs/eff_NN.tex b/doc/src/Eqs/eff_NN.tex
deleted file mode 100644
index 4f9bb6d132..0000000000
--- a/doc/src/Eqs/eff_NN.tex
+++ /dev/null
@@ -1,9 +0,0 @@
-\documentclass[12pt]{article}
-
-\begin{document}
-
-$$ 
-E_{NN}  = \frac{1}{{4\pi \varepsilon _0 }}\sum\limits_{i < j} {\frac{{Z_i Z_j }}{{R_{ij} }}}
-$$
-
-\end{document}
diff --git a/doc/src/Eqs/eff_Ne.jpg b/doc/src/Eqs/eff_Ne.jpg
deleted file mode 100644
index e23ceacc88..0000000000
Binary files a/doc/src/Eqs/eff_Ne.jpg and /dev/null differ
diff --git a/doc/src/Eqs/eff_Ne.tex b/doc/src/Eqs/eff_Ne.tex
deleted file mode 100644
index e6813b125c..0000000000
--- a/doc/src/Eqs/eff_Ne.tex
+++ /dev/null
@@ -1,9 +0,0 @@
-\documentclass[12pt]{article}
-
-\begin{document}
-
-$$ 
-E_{Ne}  =  - \frac{1}{{4\pi \varepsilon _0 }}\sum\limits_{i,j} {\frac{{Z_i }}{{R_{ij} }}Erf\left( {\frac{{\sqrt 2 R_{ij} }}{{s_j }}} \right)}
-$$
-
-\end{document}
diff --git a/doc/src/Eqs/eff_Pauli.jpg b/doc/src/Eqs/eff_Pauli.jpg
deleted file mode 100644
index 61bb8652e3..0000000000
Binary files a/doc/src/Eqs/eff_Pauli.jpg and /dev/null differ
diff --git a/doc/src/Eqs/eff_Pauli.tex b/doc/src/Eqs/eff_Pauli.tex
deleted file mode 100644
index b6b8070cc7..0000000000
--- a/doc/src/Eqs/eff_Pauli.tex
+++ /dev/null
@@ -1,9 +0,0 @@
-\documentclass[12pt]{article}
-
-\begin{document}
-
-$$ 
-E_{Pauli}  = \sum\limits_{\sigma _i  = \sigma _j } {E\left( { \uparrow  \uparrow } \right)_{ij}}  + \sum\limits_{\sigma _i  \ne \sigma _j } {E\left( { \uparrow  \downarrow } \right)_{ij}}
-$$
-
-\end{document}
diff --git a/doc/src/Eqs/eff_ee.jpg b/doc/src/Eqs/eff_ee.jpg
deleted file mode 100644
index aef84d0fd4..0000000000
Binary files a/doc/src/Eqs/eff_ee.jpg and /dev/null differ
diff --git a/doc/src/Eqs/eff_ee.tex b/doc/src/Eqs/eff_ee.tex
deleted file mode 100644
index 5d17e5557b..0000000000
--- a/doc/src/Eqs/eff_ee.tex
+++ /dev/null
@@ -1,9 +0,0 @@
-\documentclass[12pt]{article}
-
-\begin{document}
-
-$$ 
-E_{ee}  = \frac{1}{{4\pi \varepsilon _0 }}\sum\limits_{i < j} {\frac{1}{{r_{ij} }}Erf\left( {\frac{{\sqrt 2 r_{ij} }}{{\sqrt {s_i^2  + s_j^2 } }}} \right)} 
-$$
-
-\end{document}
diff --git a/doc/src/Eqs/eff_energy_expression.jpg b/doc/src/Eqs/eff_energy_expression.jpg
deleted file mode 100644
index e06fe8ff2f..0000000000
Binary files a/doc/src/Eqs/eff_energy_expression.jpg and /dev/null differ
diff --git a/doc/src/Eqs/eff_energy_expression.tex b/doc/src/Eqs/eff_energy_expression.tex
deleted file mode 100644
index f56380f646..0000000000
--- a/doc/src/Eqs/eff_energy_expression.tex
+++ /dev/null
@@ -1,9 +0,0 @@
-\documentclass[12pt]{article}
-
-\begin{document}
-
-$$ 
-U\left(R,r,s\right) =  E_{NN} \left( R \right) + E_{Ne} \left( {R,r,s} \right) + E_{ee} \left( {r,s} \right) + E_{KE} \left( {r,s} \right) + E_{PR} \left( { \uparrow  \downarrow ,S} \right)
-$$
-
-\end{document}
diff --git a/doc/src/Eqs/fix_bond_react.jpg b/doc/src/Eqs/fix_bond_react.jpg
deleted file mode 100644
index d63b983230..0000000000
Binary files a/doc/src/Eqs/fix_bond_react.jpg and /dev/null differ
diff --git a/doc/src/Eqs/fix_bond_react.tex b/doc/src/Eqs/fix_bond_react.tex
deleted file mode 100644
index 9400656038..0000000000
--- a/doc/src/Eqs/fix_bond_react.tex
+++ /dev/null
@@ -1,9 +0,0 @@
-\documentstyle[12pt]{article}
-\pagestyle{empty}
-\begin{document}
-
-\begin{eqnarray*}
-   k = AT^{n}e^{\frac{-E_{a}}{k_{B}T}}
-\end{eqnarray*}                           
-
-\end{document}
diff --git a/doc/src/Eqs/fix_box_relax1.jpg b/doc/src/Eqs/fix_box_relax1.jpg
deleted file mode 100644
index d425526046..0000000000
Binary files a/doc/src/Eqs/fix_box_relax1.jpg and /dev/null differ
diff --git a/doc/src/Eqs/fix_box_relax1.tex b/doc/src/Eqs/fix_box_relax1.tex
deleted file mode 100644
index a332360666..0000000000
--- a/doc/src/Eqs/fix_box_relax1.tex
+++ /dev/null
@@ -1,9 +0,0 @@
-\documentclass[12pt]{article}
-
-\begin{document}
-
-$$
-E = U + P_t \left(V-V_0 \right) + E_{strain}
-$$
-
-\end{document}
diff --git a/doc/src/Eqs/fix_box_relax2.jpg b/doc/src/Eqs/fix_box_relax2.jpg
deleted file mode 100644
index 8fac42e0fa..0000000000
Binary files a/doc/src/Eqs/fix_box_relax2.jpg and /dev/null differ
diff --git a/doc/src/Eqs/fix_box_relax2.tex b/doc/src/Eqs/fix_box_relax2.tex
deleted file mode 100644
index bc9cddef4e..0000000000
--- a/doc/src/Eqs/fix_box_relax2.tex
+++ /dev/null
@@ -1,9 +0,0 @@
-\documentclass[12pt]{article}
-
-\begin{document}
-
-$$
-\mathbf P = P_t \mathbf I + {\mathbf S_t} \left( \mathbf h_0^{-1} \right)^t \mathbf h_{0d}
-$$
-
-\end{document}
diff --git a/doc/src/Eqs/fix_controller1.jpg b/doc/src/Eqs/fix_controller1.jpg
deleted file mode 100644
index 25f381543f..0000000000
Binary files a/doc/src/Eqs/fix_controller1.jpg and /dev/null differ
diff --git a/doc/src/Eqs/fix_controller1.tex b/doc/src/Eqs/fix_controller1.tex
deleted file mode 100644
index 14f98fc303..0000000000
--- a/doc/src/Eqs/fix_controller1.tex
+++ /dev/null
@@ -1,12 +0,0 @@
-\documentclass[24pt]{article}
-
-\pagestyle{empty}
-\Huge
-
-\begin{document}
-
-\begin{eqnarray*}
-\frac{dc}{dt}  &=&� -\alpha (K_p e + K_i \int_0^t e \, dt + K_d \frac{de}{dt} ) \\
-\end{eqnarray*}
-
-\end{document}
diff --git a/doc/src/Eqs/fix_controller2.jpg b/doc/src/Eqs/fix_controller2.jpg
deleted file mode 100644
index 178fd5a67e..0000000000
Binary files a/doc/src/Eqs/fix_controller2.jpg and /dev/null differ
diff --git a/doc/src/Eqs/fix_controller2.tex b/doc/src/Eqs/fix_controller2.tex
deleted file mode 100644
index 7bcaa333ad..0000000000
--- a/doc/src/Eqs/fix_controller2.tex
+++ /dev/null
@@ -1,12 +0,0 @@
-\documentclass[24pt]{article}
-
-\pagestyle{empty}
-\Huge
-
-\begin{document}
-
-\begin{eqnarray*}
-c_n  &=&� c_{n-1} -\alpha (K_p \tau e_n + K_i \tau^2 \sum_{i=1}^n e_i + K_d (e_n - e_{n-1}) )
-\end{eqnarray*}
-
-\end{document}
diff --git a/doc/src/Eqs/fix_ehex_eom.jpg b/doc/src/Eqs/fix_ehex_eom.jpg
deleted file mode 100644
index 67fa7c092a..0000000000
Binary files a/doc/src/Eqs/fix_ehex_eom.jpg and /dev/null differ
diff --git a/doc/src/Eqs/fix_ehex_eom.tex b/doc/src/Eqs/fix_ehex_eom.tex
deleted file mode 100644
index 344ebcef76..0000000000
--- a/doc/src/Eqs/fix_ehex_eom.tex
+++ /dev/null
@@ -1,8 +0,0 @@
-\documentclass[12pt]{article}
-\usepackage{amsmath}
-\begin{document}
-   \begin{align*}
-     \dot{\mathbf r}_i &= \mathbf v_i,  \\
-     \dot{\mathbf v}_i &= \frac{\mathbf f_i}{m_i} + \frac{\mathbf g_i}{m_i}.
-   \end{align*}
-\end{document}
diff --git a/doc/src/Eqs/fix_ehex_f.jpg b/doc/src/Eqs/fix_ehex_f.jpg
deleted file mode 100644
index b74a28d907..0000000000
Binary files a/doc/src/Eqs/fix_ehex_f.jpg and /dev/null differ
diff --git a/doc/src/Eqs/fix_ehex_f.tex b/doc/src/Eqs/fix_ehex_f.tex
deleted file mode 100644
index f6ffe1d720..0000000000
--- a/doc/src/Eqs/fix_ehex_f.tex
+++ /dev/null
@@ -1,12 +0,0 @@
-\documentclass[12pt]{article}
-\usepackage{amsmath}
-\begin{document}
- \begin{equation*}
-      \mathbf g_i = 
-      \begin{cases} \frac{m_i}{2}   \frac{ F_{\Gamma_{k(\mathbf r_i)}}}{ K_{\Gamma_{k(\mathbf r_i)}}} 
-               \left(\mathbf v_i -  \mathbf v_{\Gamma_{k(\mathbf r_i)}} \right) &  \mbox{$k(\mathbf r_i)> 0$ (inside a reservoir),} \\
-                  0                                     &  \mbox{otherwise, } 
-      \end{cases}
-  \end{equation*}
-\end{document}
-
diff --git a/doc/src/Eqs/fix_eos-cv.jpg b/doc/src/Eqs/fix_eos-cv.jpg
deleted file mode 100644
index 37eeac8e2d..0000000000
Binary files a/doc/src/Eqs/fix_eos-cv.jpg and /dev/null differ
diff --git a/doc/src/Eqs/fix_eos-cv.tex b/doc/src/Eqs/fix_eos-cv.tex
deleted file mode 100644
index e084bac9bc..0000000000
--- a/doc/src/Eqs/fix_eos-cv.tex
+++ /dev/null
@@ -1,9 +0,0 @@
-\documentstyle[12pt]{article}
-\pagestyle{empty}
-\begin{document}
-
-$$
-   u_{i} = u^{mech}_{i} + u^{cond}_{i} = C_{V} \theta_{i}
-$$
-
-\end{document}
diff --git a/doc/src/Eqs/fix_eos_table_rx.jpg b/doc/src/Eqs/fix_eos_table_rx.jpg
deleted file mode 100644
index 0172281b6c..0000000000
Binary files a/doc/src/Eqs/fix_eos_table_rx.jpg and /dev/null differ
diff --git a/doc/src/Eqs/fix_eos_table_rx.tex b/doc/src/Eqs/fix_eos_table_rx.tex
deleted file mode 100644
index b8b486387d..0000000000
--- a/doc/src/Eqs/fix_eos_table_rx.tex
+++ /dev/null
@@ -1,9 +0,0 @@
-\documentstyle[12pt]{article}
-\pagestyle{empty}
-\begin{document}
-
-\begin{eqnarray*}
-   U_{i} = \displaystyle\sum_{j=1}^{m} c_{i,j}(u_{j} + \Delta H_{f,j}) + \frac{3k_{b}T}{2} + Nk_{b}T \\ 
-\end{eqnarray*}                           
-
-\end{document}
diff --git a/doc/src/Eqs/fix_gcmc1.jpg b/doc/src/Eqs/fix_gcmc1.jpg
deleted file mode 100644
index 158cf8b61f..0000000000
Binary files a/doc/src/Eqs/fix_gcmc1.jpg and /dev/null differ
diff --git a/doc/src/Eqs/fix_gcmc1.tex b/doc/src/Eqs/fix_gcmc1.tex
deleted file mode 100644
index c4b0d62527..0000000000
--- a/doc/src/Eqs/fix_gcmc1.tex
+++ /dev/null
@@ -1,9 +0,0 @@
-\documentclass[12pt]{article}
-
-\begin{document}
-
-\begin{eqnarray*}
-\mu &=&\mu^{id} + \mu^{ex}
-\end{eqnarray*}
-
-\end{document}
\ No newline at end of file
diff --git a/doc/src/Eqs/fix_gcmc2.jpg b/doc/src/Eqs/fix_gcmc2.jpg
deleted file mode 100644
index d054f58430..0000000000
Binary files a/doc/src/Eqs/fix_gcmc2.jpg and /dev/null differ
diff --git a/doc/src/Eqs/fix_gcmc2.tex b/doc/src/Eqs/fix_gcmc2.tex
deleted file mode 100644
index fc4d90355d..0000000000
--- a/doc/src/Eqs/fix_gcmc2.tex
+++ /dev/null
@@ -1,10 +0,0 @@
-\documentclass[12pt]{article}
-
-\begin{document}
-
-\begin{eqnarray*}
-\mu^{id} &=& k T \ln{\rho \Lambda^3} \\
-&=& k T \ln{\frac{\phi P \Lambda^3}{k T}} 
-\end{eqnarray*}
-
-\end{document}
\ No newline at end of file
diff --git a/doc/src/Eqs/fix_gcmc3.jpg b/doc/src/Eqs/fix_gcmc3.jpg
deleted file mode 100644
index e87764afd9..0000000000
Binary files a/doc/src/Eqs/fix_gcmc3.jpg and /dev/null differ
diff --git a/doc/src/Eqs/fix_gcmc3.tex b/doc/src/Eqs/fix_gcmc3.tex
deleted file mode 100644
index 6aac2b9e1f..0000000000
--- a/doc/src/Eqs/fix_gcmc3.tex
+++ /dev/null
@@ -1,9 +0,0 @@
-\documentclass[12pt]{article}
-
-\begin{document}
-
-\begin{eqnarray*}
-\Lambda &=& \sqrt{ \frac{h^2}{2 \pi m k T}}
-\end{eqnarray*}
-
-\end{document}
\ No newline at end of file
diff --git a/doc/src/Eqs/fix_gld1.jpg b/doc/src/Eqs/fix_gld1.jpg
deleted file mode 100644
index d54ce57a6c..0000000000
Binary files a/doc/src/Eqs/fix_gld1.jpg and /dev/null differ
diff --git a/doc/src/Eqs/fix_gld1.tex b/doc/src/Eqs/fix_gld1.tex
deleted file mode 100644
index baa0f32a5b..0000000000
--- a/doc/src/Eqs/fix_gld1.tex
+++ /dev/null
@@ -1,13 +0,0 @@
-\documentclass[12pt]{article}
-
-\usepackage{amsmath}
-
-\begin{document}
- 
-\begin{align*}
- &{\bf F}_{j}(t) = {\bf F}^C_j(t)-\int \limits_{0}^{t} \Gamma_j(t-s) {\bf v}_j(s)~\text{d}s + {\bf F}^R_j(t) \\
- &\Gamma_j(t-s) = \sum \limits_{k=1}^{N_k} \frac{c_k}{\tau_k} e^{-(t-s)/\tau_k} \\ 
- &\langle{\bf F}^R_j(t),{\bf F}^R_j(s)\rangle = \text{k$_\text{B}$T} ~\Gamma_j(t-s)
-\end{align*}
-
-\end{document}
diff --git a/doc/src/Eqs/fix_grem.jpg b/doc/src/Eqs/fix_grem.jpg
deleted file mode 100644
index 666b4344a6..0000000000
Binary files a/doc/src/Eqs/fix_grem.jpg and /dev/null differ
diff --git a/doc/src/Eqs/fix_grem.tex b/doc/src/Eqs/fix_grem.tex
deleted file mode 100644
index c00ea696a3..0000000000
--- a/doc/src/Eqs/fix_grem.tex
+++ /dev/null
@@ -1,9 +0,0 @@
-\documentclass[12pt]{article}
-
-\begin{document}
-
-$$
-  T_{eff} = \lambda + \eta (H - H_0)
-$$
-
-\end{document}
\ No newline at end of file
diff --git a/doc/src/Eqs/fix_integration_spin_stdecomposition.tex b/doc/src/Eqs/fix_integration_spin_stdecomposition.tex
deleted file mode 100644
index 8c7baf296d..0000000000
--- a/doc/src/Eqs/fix_integration_spin_stdecomposition.tex
+++ /dev/null
@@ -1,40 +0,0 @@
-\documentclass[preview]{standalone}
-\usepackage{varwidth}
-\usepackage[utf8x]{inputenc}
-\usepackage{amsmath,amssymb,amsthm,bm,tikz}
-\usetikzlibrary{automata,arrows,shapes,snakes}
-\begin{document}
-\begin{varwidth}{50in}
-\begin{tikzpicture}
-
-%Global
-\node (v1) at (0,6.0) [draw,thick,minimum width=0.2cm,minimum height=0.2cm] { $\bm{v} \leftarrow \bm{v}+L_v.\Delta t/2$ };
-\node (s1) at (0,4.5) [draw,thick,minimum width=0.2cm,minimum height=0.2cm] { $\bm{s} \leftarrow \bm{s}+L_s.\Delta t/2$ };
-\node (r)  at (0,3.0) [draw,thick,minimum width=0.2cm,minimum height=0.2cm] { $\bm{r} \leftarrow \bm{r}+L_r.\Delta t$ };
-\node (s2) at (0,1.5) [draw,thick,minimum width=0.2cm,minimum height=0.2cm] { $\bm{s} \leftarrow \bm{s}+L_s.\Delta t/2$ };
-\node (v2) at (0,0.0) [draw,thick,minimum width=0.2cm,minimum height=0.2cm] { $\bm{v} \leftarrow \bm{v}+L_v.\Delta t/2$ };
-
-\draw[line width=2pt, ->] (v1) -- (s1);
-\draw[line width=2pt, ->] (s1) -- (r);
-\draw[line width=2pt, ->] (r) -- (s2);
-\draw[line width=2pt, ->] (s2) -- (v2);
-
-%Spin
-\node (s01) at (6,6.0) [draw,thick,minimum width=0.2cm,minimum height=0.2cm] {$\bm{s}_0 \leftarrow \bm{s}_0+L_{s_0}.\Delta t/4$ };
-\node (sN1) at (6,4.5) [draw,thick,minimum width=0.2cm,minimum height=0.2cm] {$\bm{s}_{\rm N-1}\leftarrow\bm{s}_{\rm N-1}+L_{s_{\rm N-1}}.\Delta t/4$};
-\node (sN)  at (6,3.0) [draw,thick,minimum width=0.2cm,minimum height=0.2cm] {$\bm{s}_{\rm N} \leftarrow \bm{s}_{\rm N}+L_{s_{\rm N}}.\Delta t/2$ };
-\node (sN2) at (6,1.5) [draw,thick,minimum width=0.2cm,minimum height=0.2cm] {$\bm{s}_{\rm N-1}\leftarrow\bm{s}_{\rm N-1}+L_{s_{\rm N-1}}.\Delta t/4$};
-\node (s02) at (6,0.0) [draw,thick,minimum width=0.2cm,minimum height=0.2cm] {$\bm{s}_0 \leftarrow \bm{s}_0+L_{s_0}.\Delta t/4$ };
-
-\draw[line width=2pt,dashed, ->] (s01) -- (sN1);
-\draw[line width=2pt, ->] (sN1) -- (sN);
-\draw[line width=2pt, ->] (sN) -- (sN2);
-\draw[line width=2pt,dashed, ->] (sN2) -- (s02);
-
-%from Global to Spin
-\draw[line width=2pt, dashed, ->] (s1) -- (s01.west);
-\draw[line width=2pt, dashed, ->] (s1) -- (s02.west);
-
-\end{tikzpicture}
-\end{varwidth}
-\end{document}
diff --git a/doc/src/Eqs/fix_langevin_spin_sLLG.jpg b/doc/src/Eqs/fix_langevin_spin_sLLG.jpg
deleted file mode 100644
index f83aadd9eb..0000000000
Binary files a/doc/src/Eqs/fix_langevin_spin_sLLG.jpg and /dev/null differ
diff --git a/doc/src/Eqs/fix_langevin_spin_sLLG.tex b/doc/src/Eqs/fix_langevin_spin_sLLG.tex
deleted file mode 100644
index 346dde9cec..0000000000
--- a/doc/src/Eqs/fix_langevin_spin_sLLG.tex
+++ /dev/null
@@ -1,14 +0,0 @@
-\documentclass[preview]{standalone}
-\usepackage{varwidth}
-\usepackage[utf8x]{inputenc}
-\usepackage{amsmath, amssymb, graphics, setspace}
-
-\begin{document}
-\begin{varwidth}{50in}
-  \begin{equation}
-    \frac{d \vec{s}_{i}}{dt} = \frac{1}{\left(1+\lambda^2 \right)} \left( \left(
-    \vec{\omega}_{i} +\vec{\eta} \right) \times \vec{s}_{i} + \lambda\, \vec{s}_{i}
-  \times\left( \vec{\omega}_{i} \times\vec{s}_{i} \right) \right), \nonumber
-  \end{equation}
-\end{varwidth}
-\end{document}
diff --git a/doc/src/Eqs/fix_lb_fluid_boltzmann.jpg b/doc/src/Eqs/fix_lb_fluid_boltzmann.jpg
deleted file mode 100644
index 9d82b40ecb..0000000000
Binary files a/doc/src/Eqs/fix_lb_fluid_boltzmann.jpg and /dev/null differ
diff --git a/doc/src/Eqs/fix_lb_fluid_boltzmann.tex b/doc/src/Eqs/fix_lb_fluid_boltzmann.tex
deleted file mode 100755
index 4a6ca6fe01..0000000000
--- a/doc/src/Eqs/fix_lb_fluid_boltzmann.tex
+++ /dev/null
@@ -1,14 +0,0 @@
-\documentclass[12pt]{article}
-
-\begin{document}
-
-$$ 
-\left(\partial_t + e_{i\alpha}\partial_{\alpha}\right)f_i = -\frac{1}{\tau}\left(f_i - f_i^{eq}\right) + W_i
-$$
-
-
-\end{document}
-
-
-
-
diff --git a/doc/src/Eqs/fix_lb_fluid_fluidforce.jpg b/doc/src/Eqs/fix_lb_fluid_fluidforce.jpg
deleted file mode 100644
index d3149616ca..0000000000
Binary files a/doc/src/Eqs/fix_lb_fluid_fluidforce.jpg and /dev/null differ
diff --git a/doc/src/Eqs/fix_lb_fluid_fluidforce.tex b/doc/src/Eqs/fix_lb_fluid_fluidforce.tex
deleted file mode 100755
index 8433c9264a..0000000000
--- a/doc/src/Eqs/fix_lb_fluid_fluidforce.tex
+++ /dev/null
@@ -1,14 +0,0 @@
-\documentclass[12pt]{article}
-
-\begin{document}
-
-$$ 
-{\bf F}_{j \alpha} = \gamma \left({\bf v}_n - {\bf u}_f \right) \zeta_{j\alpha}
-$$
-
-
-\end{document}
-
-
-
-
diff --git a/doc/src/Eqs/fix_lb_fluid_gammadefault.jpg b/doc/src/Eqs/fix_lb_fluid_gammadefault.jpg
deleted file mode 100644
index cd10239c9b..0000000000
Binary files a/doc/src/Eqs/fix_lb_fluid_gammadefault.jpg and /dev/null differ
diff --git a/doc/src/Eqs/fix_lb_fluid_gammadefault.tex b/doc/src/Eqs/fix_lb_fluid_gammadefault.tex
deleted file mode 100755
index 1af82c4972..0000000000
--- a/doc/src/Eqs/fix_lb_fluid_gammadefault.tex
+++ /dev/null
@@ -1,14 +0,0 @@
-\documentclass[12pt]{article}
-
-\begin{document}
-
-$$ 
-\gamma = \frac{2m_um_v}{m_u+m_v}\left(\frac{1}{\Delta t_{collision}}\right)
-$$
-
-
-\end{document}
-
-
-
-
diff --git a/doc/src/Eqs/fix_lb_fluid_navierstokes.jpg b/doc/src/Eqs/fix_lb_fluid_navierstokes.jpg
deleted file mode 100644
index 0a1c104141..0000000000
Binary files a/doc/src/Eqs/fix_lb_fluid_navierstokes.jpg and /dev/null differ
diff --git a/doc/src/Eqs/fix_lb_fluid_navierstokes.tex b/doc/src/Eqs/fix_lb_fluid_navierstokes.tex
deleted file mode 100755
index 41ca4674e9..0000000000
--- a/doc/src/Eqs/fix_lb_fluid_navierstokes.tex
+++ /dev/null
@@ -1,16 +0,0 @@
-\documentclass[12pt]{article}
-
-\begin{document}
-
-$$ 
-\partial_t \rho + \partial_{\beta}\left(\rho u_{\beta}\right)= 0
-$$
-$$
-\partial_t\left(\rho u_{\alpha}\right) + \partial_{\beta}\left(\rho u_{\alpha} u_{\beta}\right) = \partial_{\beta}\sigma_{\alpha \beta} + F_{\alpha} + \partial_{\beta}\left(\eta_{\alpha \beta \gamma \nu}\partial_{\gamma} u_{\nu}\right)
-$$
-
-\end{document}
-
-
-
-
diff --git a/doc/src/Eqs/fix_lb_fluid_properties.jpg b/doc/src/Eqs/fix_lb_fluid_properties.jpg
deleted file mode 100644
index 3d70cd7667..0000000000
Binary files a/doc/src/Eqs/fix_lb_fluid_properties.jpg and /dev/null differ
diff --git a/doc/src/Eqs/fix_lb_fluid_properties.tex b/doc/src/Eqs/fix_lb_fluid_properties.tex
deleted file mode 100755
index fe1290be12..0000000000
--- a/doc/src/Eqs/fix_lb_fluid_properties.tex
+++ /dev/null
@@ -1,17 +0,0 @@
-\documentclass[12pt]{article}
-
-\begin{document}
-
-$$ 
-\rho = \displaystyle\sum\limits_{i} f_i
-$$
-$$
-\rho u_{\alpha} = \displaystyle\sum\limits_{i} f_i e_{i\alpha}
-$$
-
-
-\end{document}
-
-
-
-
diff --git a/doc/src/Eqs/fix_lb_fluid_stress.jpg b/doc/src/Eqs/fix_lb_fluid_stress.jpg
deleted file mode 100644
index 8f730e9d70..0000000000
Binary files a/doc/src/Eqs/fix_lb_fluid_stress.jpg and /dev/null differ
diff --git a/doc/src/Eqs/fix_lb_fluid_stress.tex b/doc/src/Eqs/fix_lb_fluid_stress.tex
deleted file mode 100755
index b4e0982536..0000000000
--- a/doc/src/Eqs/fix_lb_fluid_stress.tex
+++ /dev/null
@@ -1,14 +0,0 @@
-\documentclass[12pt]{article}
-
-\begin{document}
-
-$$ 
-\sigma_{\alpha \beta} = -P_{\alpha \beta} = -\rho a_0 \delta_{\alpha \beta}
-$$
-
-
-\end{document}
-
-
-
-
diff --git a/doc/src/Eqs/fix_lb_fluid_viscosity.jpg b/doc/src/Eqs/fix_lb_fluid_viscosity.jpg
deleted file mode 100644
index 1816317ee6..0000000000
Binary files a/doc/src/Eqs/fix_lb_fluid_viscosity.jpg and /dev/null differ
diff --git a/doc/src/Eqs/fix_lb_fluid_viscosity.tex b/doc/src/Eqs/fix_lb_fluid_viscosity.tex
deleted file mode 100755
index d5925f213f..0000000000
--- a/doc/src/Eqs/fix_lb_fluid_viscosity.tex
+++ /dev/null
@@ -1,14 +0,0 @@
-\documentclass[12pt]{article}
-
-\begin{document}
-
-$$ 
-\eta_{\alpha \beta \gamma \nu} = \eta\left[\delta_{\alpha \gamma}\delta_{\beta \nu} + \delta_{\alpha \nu}\delta_{\beta \gamma} - \frac{2}{3}\delta_{\alpha \beta}\delta_{\gamma \nu}\right] + \Lambda \delta_{\alpha \beta}\delta_{\gamma \nu}
-$$
-
-
-\end{document}
-
-
-
-
diff --git a/doc/src/Eqs/fix_mvv_dpd.jpg b/doc/src/Eqs/fix_mvv_dpd.jpg
deleted file mode 100644
index b5f39bb470..0000000000
Binary files a/doc/src/Eqs/fix_mvv_dpd.jpg and /dev/null differ
diff --git a/doc/src/Eqs/fix_mvv_dpd.tex b/doc/src/Eqs/fix_mvv_dpd.tex
deleted file mode 100644
index 685d527763..0000000000
--- a/doc/src/Eqs/fix_mvv_dpd.tex
+++ /dev/null
@@ -1,21 +0,0 @@
-\documentclass[12pt]{article}
-
-\begin{document}
-
-$$
-  v(t+\frac{\Delta t}{2}) = v(t) + \frac{\Delta t}{2}\cdot a(t),
-$$
-
-$$
-  r(t+\Delta t) = r(t) + \Delta t\cdot v(t+\frac{\Delta t}{2}),
-$$
-
-$$
-  a(t+\Delta t) = \frac{1}{m}\cdot F\left[ r(t+\Delta t), v(t) +\lambda \cdot \Delta t\cdot a(t)\right],
-$$
-
-$$
-  v(t+\Delta t) = v(t+\frac{\Delta t}{2}) + \frac{\Delta t}{2}\cdot a(t+\Delta t)
-$$
-
-\end{document}
diff --git a/doc/src/Eqs/fix_nh1.jpg b/doc/src/Eqs/fix_nh1.jpg
deleted file mode 100644
index af07ea3a4b..0000000000
Binary files a/doc/src/Eqs/fix_nh1.jpg and /dev/null differ
diff --git a/doc/src/Eqs/fix_nh1.tex b/doc/src/Eqs/fix_nh1.tex
deleted file mode 100644
index 3e780f2772..0000000000
--- a/doc/src/Eqs/fix_nh1.tex
+++ /dev/null
@@ -1,36 +0,0 @@
-\documentclass[24pt]{article}
-
-\pagestyle{empty}
-\Huge
-
-\begin{document}
-
-\mathchardef\mhyphen="2D
-
-% The imaginary unit
-\providecommand*{\iu}%
-	{\ensuremath{{\rm i}}}
-
-
-\begin{eqnarray*}
-\exp \left(\iu{} L \Delta t \right) &=&�
-\exp \left(\iu{} L_{\rm T\mhyphen baro} \frac{\Delta t}{2} \right)
-\exp \left(\iu{} L_{\rm T\mhyphen part} \frac{\Delta t}{2} \right)
-\exp \left(\iu{} L_{\epsilon , 2} \frac{\Delta t}{2} \right)
-\exp \left(\iu{} L_{2}^{(2)} \frac{\Delta t}{2} \right) \\
-&&\times \left[ 
-\exp \left(\iu{} L_{2}^{(1)} \frac{\Delta t}{2n} \right)
-\exp \left(\iu{} L_{\epsilon , 1} \frac{\Delta t}{2n} \right)
-\exp \left(\iu{} L_1 \frac{\Delta t}{n} \right)
-\exp \left(\iu{} L_{\epsilon , 1} \frac{\Delta t}{2n} \right)
-\exp \left(\iu{} L_{2}^{(1)} \frac{\Delta t}{2n} \right)
-\right]^n \\
-&&\times
-\exp \left(\iu{} L_{2}^{(2)} \frac{\Delta t}{2} \right)
-\exp \left(\iu{} L_{\epsilon , 2} \frac{\Delta t}{2} \right) 
-\exp \left(\iu{} L_{\rm T\mhyphen part} \frac{\Delta t}{2} \right) 
-\exp \left(\iu{} L_{\rm T\mhyphen baro} \frac{\Delta t}{2} \right) \\
-&&+ \mathcal{O} \left(\Delta t^3 \right)
-\end{eqnarray*}
-
-\end{document}
diff --git a/doc/src/Eqs/fix_nphug.jpg b/doc/src/Eqs/fix_nphug.jpg
deleted file mode 100644
index a3a67e7b7b..0000000000
Binary files a/doc/src/Eqs/fix_nphug.jpg and /dev/null differ
diff --git a/doc/src/Eqs/fix_nphug.tex b/doc/src/Eqs/fix_nphug.tex
deleted file mode 100644
index 4e162b69b7..0000000000
--- a/doc/src/Eqs/fix_nphug.tex
+++ /dev/null
@@ -1,9 +0,0 @@
-\documentstyle[12pt]{article}
-
-\begin{document}
-
-$$
-T_t - T = \frac{\left(\frac{1}{2}\left(P + P_0\right)\left(V_0 - V\right) + E_0 - E\right)}{N_{dof} k_B } = Delta
-$$
-
-\end{document}
diff --git a/doc/src/Eqs/fix_orient_fcc.jpg b/doc/src/Eqs/fix_orient_fcc.jpg
deleted file mode 100644
index b22e6c9c20..0000000000
Binary files a/doc/src/Eqs/fix_orient_fcc.jpg and /dev/null differ
diff --git a/doc/src/Eqs/fix_orient_fcc.tex b/doc/src/Eqs/fix_orient_fcc.tex
deleted file mode 100644
index 5596848eb5..0000000000
--- a/doc/src/Eqs/fix_orient_fcc.tex
+++ /dev/null
@@ -1,30 +0,0 @@
-\newcommand{\br}{\mathbf{r}}
-
-\documentclass[12pt]{article}
-
-\begin{document}
-
-\begin{equation}
-  \xi_{i} = \sum_{j=1}^{12} \left| \br_{j} - \br_{j}^{\rm I} \right|
-\end{equation}
-
-\begin{equation}
-  \xi_{\rm IJ} = \sum_{j=1}^{12} \left| \br_{j}^{\rm J} - \br_{j}^{\rm I} \right|
-\end{equation}
-
-\begin{eqnarray}
-  \xi_{\rm low} &=& {\rm cutlo} \, \xi_{\rm IJ}  \\
-  \xi_{\rm high} &=& {\rm cuthi} \, \xi_{\rm IJ}
-\end{eqnarray}
-
-\begin{eqnarray}
-  \omega_{i} &=& \frac{\pi}{2} 
-       \frac{\xi_{i} - \xi_{\rm low}}{\xi_{\rm high} - \xi_{\rm low}} \\
-      \mbox{\hspace*{72pt}}  \nonumber \\
-  u_{i} &=& 0 \mbox{\hspace{84pt} for } \xi_{i} < \xi_{\rm low}  \nonumber \\
-        &=& {\rm dE}\,\frac{1 - \cos(2 \omega_{i})}{2}
-              \mbox{\hspace{10pt}  for } \xi_{\rm low} < \xi_{i} < \xi_{\rm high}  \\
-        &=& {\rm dE} \mbox{\hspace{80pt} for } \xi_{\rm high} < \xi_{i}
-                                                                \nonumber
-\end{eqnarray}
-\end{document}
diff --git a/doc/src/Eqs/fix_pimd.jpg b/doc/src/Eqs/fix_pimd.jpg
deleted file mode 100644
index b6e8f5831b..0000000000
Binary files a/doc/src/Eqs/fix_pimd.jpg and /dev/null differ
diff --git a/doc/src/Eqs/fix_pimd.tex b/doc/src/Eqs/fix_pimd.tex
deleted file mode 100644
index 983fead8e4..0000000000
--- a/doc/src/Eqs/fix_pimd.tex
+++ /dev/null
@@ -1,17 +0,0 @@
-\documentclass[12pt]{article}
-
-\begin{document}
-
-$$
-  Z = \int d{\bf q} d{\bf p} \cdot \textrm{exp} [ -\beta H_{eff} ]
-$$
-
-$$
-  H_{eff} = \bigg(\sum_{i=1}^P \frac{p_i^2}{2m_i}\bigg) + V_{eff}
-$$
-
-$$
-  V_{eff} = \sum_{i=1}^P \bigg[ \frac{mP}{2\beta^2 \hbar^2} (q_i - q_{i+1})^2 + \frac{1}{P} V(q_i)\bigg]
-$$
-
-\end{document}
diff --git a/doc/src/Eqs/fix_rattle_constraints.jpg b/doc/src/Eqs/fix_rattle_constraints.jpg
deleted file mode 100644
index 2ba86095cd..0000000000
Binary files a/doc/src/Eqs/fix_rattle_constraints.jpg and /dev/null differ
diff --git a/doc/src/Eqs/fix_rattle_constraints.tex b/doc/src/Eqs/fix_rattle_constraints.tex
deleted file mode 100644
index daff0ce775..0000000000
--- a/doc/src/Eqs/fix_rattle_constraints.tex
+++ /dev/null
@@ -1,9 +0,0 @@
-\documentclass[12pt]{article}
-\usepackage{amsmath}
-
-\begin{document}
-\begin{align*}
-\mathbf r^{n+1}_{ij} \cdot \mathbf r^{n+1}_{ij} &= d^2_{ij} \quad \text{and} \\
-\mathbf v^{n+1}_{ij} \cdot \mathbf r^{n+1}_{ij} &= 0, \label{eq:velcon}
-\end{align*}
-\end{document}
diff --git a/doc/src/Eqs/fix_rattle_rij.jpg b/doc/src/Eqs/fix_rattle_rij.jpg
deleted file mode 100644
index b08e2fe02e..0000000000
Binary files a/doc/src/Eqs/fix_rattle_rij.jpg and /dev/null differ
diff --git a/doc/src/Eqs/fix_rattle_rij.tex b/doc/src/Eqs/fix_rattle_rij.tex
deleted file mode 100644
index fae0457c60..0000000000
--- a/doc/src/Eqs/fix_rattle_rij.tex
+++ /dev/null
@@ -1,8 +0,0 @@
-\documentclass[12pt]{article}
-\usepackage{amsmath}
-\begin{document}
-$$
- \mathbf r^{n+1}_{ij} = \mathbf r^n_j - \mathbf r^n_i
-$$
-\end{document}
-
diff --git a/doc/src/Eqs/fix_rhok.jpg b/doc/src/Eqs/fix_rhok.jpg
deleted file mode 100644
index 829a866be4..0000000000
Binary files a/doc/src/Eqs/fix_rhok.jpg and /dev/null differ
diff --git a/doc/src/Eqs/fix_rhok.tex b/doc/src/Eqs/fix_rhok.tex
deleted file mode 100644
index a468dfedc9..0000000000
--- a/doc/src/Eqs/fix_rhok.tex
+++ /dev/null
@@ -1,11 +0,0 @@
-\documentclass[12pt]{article}
-
-\begin{document}
-
-\begin{eqnarray*}
- U &=&  \frac{1}{2} K (|\rho_{\vec{k}}| - a)^2 \\
- \rho_{\vec{k}} &=& \sum_j^N \exp(-i\vec{k} \cdot \vec{r}_j )/\sqrt{N} \\
- \vec{k} &=& (2\pi n_x /L_x , 2\pi n_y  /L_y , 2\pi n_z/L_z ) 
-\end{eqnarray*}
-
-\end{document}
diff --git a/doc/src/Eqs/fix_rx.jpg b/doc/src/Eqs/fix_rx.jpg
deleted file mode 100644
index d63b983230..0000000000
Binary files a/doc/src/Eqs/fix_rx.jpg and /dev/null differ
diff --git a/doc/src/Eqs/fix_rx.tex b/doc/src/Eqs/fix_rx.tex
deleted file mode 100644
index 9400656038..0000000000
--- a/doc/src/Eqs/fix_rx.tex
+++ /dev/null
@@ -1,9 +0,0 @@
-\documentstyle[12pt]{article}
-\pagestyle{empty}
-\begin{document}
-
-\begin{eqnarray*}
-   k = AT^{n}e^{\frac{-E_{a}}{k_{B}T}}
-\end{eqnarray*}                           
-
-\end{document}
diff --git a/doc/src/Eqs/fix_rx_localTemp.jpg b/doc/src/Eqs/fix_rx_localTemp.jpg
deleted file mode 100644
index 2b5147b930..0000000000
Binary files a/doc/src/Eqs/fix_rx_localTemp.jpg and /dev/null differ
diff --git a/doc/src/Eqs/fix_rx_localTemp.tex b/doc/src/Eqs/fix_rx_localTemp.tex
deleted file mode 100644
index cbb191f8f4..0000000000
--- a/doc/src/Eqs/fix_rx_localTemp.tex
+++ /dev/null
@@ -1,9 +0,0 @@
-\documentstyle[12pt]{article}
-\pagestyle{empty}
-\begin{document}
-
-\begin{eqnarray*}
-   \theta_i^{-1} = \frac{\sum_{j=1}\omega_{Lucy}\left(r_{ij}\right)\theta_j^{-1}}{\sum_{j=1}\omega_{Lucy}\left(r_{ij}\right)}
-\end{eqnarray*}                           
-
-\end{document}
diff --git a/doc/src/Eqs/fix_rx_localTemp2.jpg b/doc/src/Eqs/fix_rx_localTemp2.jpg
deleted file mode 100644
index c838d7d453..0000000000
Binary files a/doc/src/Eqs/fix_rx_localTemp2.jpg and /dev/null differ
diff --git a/doc/src/Eqs/fix_rx_localTemp2.tex b/doc/src/Eqs/fix_rx_localTemp2.tex
deleted file mode 100644
index 0b524adc00..0000000000
--- a/doc/src/Eqs/fix_rx_localTemp2.tex
+++ /dev/null
@@ -1,9 +0,0 @@
-\documentstyle[12pt]{article}
-\pagestyle{empty}
-\begin{document}
-
-\begin{eqnarray*}
-   \omega_{Lucy}\left(r_{ij}\right) = \left( 1 + \frac{3r_{ij}}{r_c} \right) \left( 1 - \frac{r_{ij}}{r_c} \right)^3
-\end{eqnarray*}                           
-
-\end{document}
diff --git a/doc/src/Eqs/fix_rx_reaction.jpg b/doc/src/Eqs/fix_rx_reaction.jpg
deleted file mode 100644
index e656cd8362..0000000000
Binary files a/doc/src/Eqs/fix_rx_reaction.jpg and /dev/null differ
diff --git a/doc/src/Eqs/fix_rx_reaction.tex b/doc/src/Eqs/fix_rx_reaction.tex
deleted file mode 100644
index e9515f1326..0000000000
--- a/doc/src/Eqs/fix_rx_reaction.tex
+++ /dev/null
@@ -1,9 +0,0 @@
-\documentstyle[12pt]{article}
-\pagestyle{empty}
-\begin{document}
-
-\begin{eqnarray*}
-   \nu_{A}A + \nu_{B}B \rightarrow \nu_{C}C
-\end{eqnarray*}                           
-
-\end{document}
diff --git a/doc/src/Eqs/fix_rx_reactionRate.jpg b/doc/src/Eqs/fix_rx_reactionRate.jpg
deleted file mode 100644
index cf79c36089..0000000000
Binary files a/doc/src/Eqs/fix_rx_reactionRate.jpg and /dev/null differ
diff --git a/doc/src/Eqs/fix_rx_reactionRate.tex b/doc/src/Eqs/fix_rx_reactionRate.tex
deleted file mode 100644
index 4974ece1cb..0000000000
--- a/doc/src/Eqs/fix_rx_reactionRate.tex
+++ /dev/null
@@ -1,9 +0,0 @@
-\documentstyle[12pt]{article}
-\pagestyle{empty}
-\begin{document}
-
-\begin{eqnarray*}
-   r = k(T)[A]^{\nu_{A}}[B]^{\nu_{B}}
-\end{eqnarray*}                           
-
-\end{document}
diff --git a/doc/src/Eqs/fix_spring_rg.jpg b/doc/src/Eqs/fix_spring_rg.jpg
deleted file mode 100644
index 313844f555..0000000000
Binary files a/doc/src/Eqs/fix_spring_rg.jpg and /dev/null differ
diff --git a/doc/src/Eqs/fix_spring_rg.tex b/doc/src/Eqs/fix_spring_rg.tex
deleted file mode 100644
index b772aaf652..0000000000
--- a/doc/src/Eqs/fix_spring_rg.tex
+++ /dev/null
@@ -1,19 +0,0 @@
-\documentstyle[12pt]{article}
-
-\begin{document}
-
-$$
-{R_G}^2 = \frac{1}{M}\sum_{i}^{N}{m_{i}\left( x_{i} -
-\frac{1}{M}\sum_{j}^{N}{m_{j}x_{j}} \right)^{2}}
-$$
-
-$$
- E = K\left( R_G - R_{G0} \right)^{2}
-$$
-
-$$
-F_{i} = 2K\frac{m_{i}}{M}\left( 1-\frac{R_{G0}}{R_G}
-\right)\left( x_{i} - \frac{1}{M}\sum_{j}^{N}{m_{j}x_{j}} \right)
-$$
-
-\end{document}
\ No newline at end of file
diff --git a/doc/src/Eqs/fix_ti_spring_force.jpg b/doc/src/Eqs/fix_ti_spring_force.jpg
deleted file mode 100644
index 584535a1bc..0000000000
Binary files a/doc/src/Eqs/fix_ti_spring_force.jpg and /dev/null differ
diff --git a/doc/src/Eqs/fix_ti_spring_force.tex b/doc/src/Eqs/fix_ti_spring_force.tex
deleted file mode 100644
index 356f7d3ccc..0000000000
--- a/doc/src/Eqs/fix_ti_spring_force.tex
+++ /dev/null
@@ -1,11 +0,0 @@
-\documentclass[12pt]{article}
-
-\usepackage{amsmath}
-
-\begin{document}
-
-$$
-  F = \left( 1-\lambda \right) F_{\text{solid}} + \lambda F_{\text{harm}}
-$$
-
-\end{document}
diff --git a/doc/src/Eqs/fix_ti_spring_function_1.jpg b/doc/src/Eqs/fix_ti_spring_function_1.jpg
deleted file mode 100644
index ef2698f34b..0000000000
Binary files a/doc/src/Eqs/fix_ti_spring_function_1.jpg and /dev/null differ
diff --git a/doc/src/Eqs/fix_ti_spring_function_1.tex b/doc/src/Eqs/fix_ti_spring_function_1.tex
deleted file mode 100644
index 0673410b00..0000000000
--- a/doc/src/Eqs/fix_ti_spring_function_1.tex
+++ /dev/null
@@ -1,9 +0,0 @@
-\documentclass[12pt]{article}
-
-\begin{document}
-
-$$
-  \lambda(\tau) = \tau
-$$
-
-\end{document}
diff --git a/doc/src/Eqs/fix_ti_spring_function_2.jpg b/doc/src/Eqs/fix_ti_spring_function_2.jpg
deleted file mode 100644
index 6f12b90c78..0000000000
Binary files a/doc/src/Eqs/fix_ti_spring_function_2.jpg and /dev/null differ
diff --git a/doc/src/Eqs/fix_ti_spring_function_2.tex b/doc/src/Eqs/fix_ti_spring_function_2.tex
deleted file mode 100644
index f2cb51e47d..0000000000
--- a/doc/src/Eqs/fix_ti_spring_function_2.tex
+++ /dev/null
@@ -1,9 +0,0 @@
-\documentclass[12pt]{article}
-
-\begin{document}
-
-$$
-  \lambda(\tau) = \tau^5 \left( 70 \tau^4 - 315 \tau^3 + 540 \tau^2 - 420 \tau + 126 \right)
-$$
-
-\end{document}
diff --git a/doc/src/Eqs/fix_ttm.jpg b/doc/src/Eqs/fix_ttm.jpg
deleted file mode 100644
index 8d9fac3fed..0000000000
Binary files a/doc/src/Eqs/fix_ttm.jpg and /dev/null differ
diff --git a/doc/src/Eqs/fix_ttm.tex b/doc/src/Eqs/fix_ttm.tex
deleted file mode 100644
index d5a3238f82..0000000000
--- a/doc/src/Eqs/fix_ttm.tex
+++ /dev/null
@@ -1,15 +0,0 @@
-\documentclass[12pt]{article}
-
-\begin{document}
-
-$$ 
-  C_e \rho_e \frac{\partial T_e}{\partial t} = 
-  \bigtriangledown (\kappa_e \bigtriangledown T_e) - 
-  g_p (T_e - T_a) + g_s T_a'
-$$
-
-\end{document}
-
-
-
-
diff --git a/doc/src/Eqs/fix_ttm_blast.jpg b/doc/src/Eqs/fix_ttm_blast.jpg
deleted file mode 100644
index d4ffe05f12..0000000000
Binary files a/doc/src/Eqs/fix_ttm_blast.jpg and /dev/null differ
diff --git a/doc/src/Eqs/fix_ttm_blast.tex b/doc/src/Eqs/fix_ttm_blast.tex
deleted file mode 100644
index 6871ed5cc6..0000000000
--- a/doc/src/Eqs/fix_ttm_blast.tex
+++ /dev/null
@@ -1,13 +0,0 @@
-\documentclass[12pt]{article}
-
-\begin{document}
-
-$$ 
-  {\vec F}_i = - \partial U / \partial {\vec r}_i + {\vec F}_{langevin} - \nabla P_e/n_{ion}
-$$
-
-\end{document}
-
-
-
-
diff --git a/doc/src/Eqs/fix_ttm_blast1.jpg b/doc/src/Eqs/fix_ttm_blast1.jpg
deleted file mode 100644
index 1106c627cb..0000000000
Binary files a/doc/src/Eqs/fix_ttm_blast1.jpg and /dev/null differ
diff --git a/doc/src/Eqs/fix_ttm_blast1.tex b/doc/src/Eqs/fix_ttm_blast1.tex
deleted file mode 100644
index 642afe4300..0000000000
--- a/doc/src/Eqs/fix_ttm_blast1.tex
+++ /dev/null
@@ -1,13 +0,0 @@
-\documentclass[12pt]{article}
-
-\begin{document}
-
-$$ 
-  \nabla_x P_e = \left[\frac{C_e{}T_e(x)\lambda}{(x+\lambda)^2} + \frac{x}{x+\lambda}\frac{(C_e{}T_e)_{x+\Delta x}-(C_e{}T_e)_{x}}{\Delta x} \right]
-$$
-
-\end{document}
-
-
-
-
diff --git a/doc/src/Eqs/fix_ttm_ce.jpg b/doc/src/Eqs/fix_ttm_ce.jpg
deleted file mode 100644
index 4f439e31e6..0000000000
Binary files a/doc/src/Eqs/fix_ttm_ce.jpg and /dev/null differ
diff --git a/doc/src/Eqs/fix_ttm_ce.tex b/doc/src/Eqs/fix_ttm_ce.tex
deleted file mode 100644
index f787590b8f..0000000000
--- a/doc/src/Eqs/fix_ttm_ce.tex
+++ /dev/null
@@ -1,13 +0,0 @@
-\documentclass[12pt]{article}
-
-\begin{document}
-
-$$ 
-  C_e = C_0 + (a_0 + a_1 X + a_2 X^2 + a_3 X^3 + a_4 X^4) \exp (-(AX)^2)
-$$
-
-\end{document}
-
-
-
-
diff --git a/doc/src/Eqs/fix_ttm_mod.jpg b/doc/src/Eqs/fix_ttm_mod.jpg
deleted file mode 100644
index 7cc67200f9..0000000000
Binary files a/doc/src/Eqs/fix_ttm_mod.jpg and /dev/null differ
diff --git a/doc/src/Eqs/fix_ttm_mod.tex b/doc/src/Eqs/fix_ttm_mod.tex
deleted file mode 100644
index d0a313e676..0000000000
--- a/doc/src/Eqs/fix_ttm_mod.tex
+++ /dev/null
@@ -1,15 +0,0 @@
-\documentclass[12pt]{article}
-
-\begin{document}
-
-$$ 
-  C_e \rho_e \frac{\partial T_e}{\partial t} = 
-  \bigtriangledown (\kappa_e \bigtriangledown T_e) - 
-  g_p (T_e - T_a) + g_s T_a' + \theta (x-x_{surface})I_0 \exp(-x/l_{skin})
-$$
-
-\end{document}
-
-
-
-
diff --git a/doc/src/Eqs/fix_wall_colloid.jpg b/doc/src/Eqs/fix_wall_colloid.jpg
deleted file mode 100644
index 8168d3a792..0000000000
Binary files a/doc/src/Eqs/fix_wall_colloid.jpg and /dev/null differ
diff --git a/doc/src/Eqs/fix_wall_colloid.tex b/doc/src/Eqs/fix_wall_colloid.tex
deleted file mode 100644
index 3ed716c263..0000000000
--- a/doc/src/Eqs/fix_wall_colloid.tex
+++ /dev/null
@@ -1,14 +0,0 @@
-\documentstyle[12pt]{article}
-
-\begin{document}
-
-\begin{eqnarray}
-E &=& \epsilon \left[ \frac{\sigma^{6}}{7560} 
-  \left(\frac{6R-D}{D^{7}} + \frac{D+8R}{(D+2R)^{7}} \right) - 
-  \frac{}{} \right. \nonumber \\
-  &&\qquad \left. \frac{1}{6} \left(\frac{2R(D+R) + D(D+2R)
-    \left[ \ln D - \ln (D+2R) \right]}{D(D+2R)} \right) \right] 
-\qquad r < r_c \nonumber
-\end{eqnarray}
-
-\end{document}
diff --git a/doc/src/Eqs/fix_wall_ees.jpg b/doc/src/Eqs/fix_wall_ees.jpg
deleted file mode 100644
index 0f99dae8f7..0000000000
Binary files a/doc/src/Eqs/fix_wall_ees.jpg and /dev/null differ
diff --git a/doc/src/Eqs/fix_wall_ees.tex b/doc/src/Eqs/fix_wall_ees.tex
deleted file mode 100644
index c8b62067a8..0000000000
--- a/doc/src/Eqs/fix_wall_ees.tex
+++ /dev/null
@@ -1,10 +0,0 @@
-\documentclass[12pt]{article}
-
-\begin{document}
-
-$$ 
-E = \epsilon \left[ \frac{2  \sigma_{LJ}^{12} \left(7 r^5+14 r^3 \sigma_{n}^2+3 r \sigma_{n}^4\right) }{945 \left(r^2-\sigma_{n}^2\right)^7} -\frac{ \sigma_{LJ}^6 \left(2 r \sigma_{n}^3+\sigma_{n}^2 \left(r^2-\sigma_{n}^2\right)\log{ \left[\frac{r-\sigma_{n}}{r+\sigma_{n}}\right]}\right) }{12 \sigma_{n}^5 \left(r^2-\sigma_{n}^2\right)} \right]\qquad \sigma_n < r < r_c
-$$
-
-
-\end{document}
diff --git a/doc/src/Eqs/fix_wall_harmonic.jpg b/doc/src/Eqs/fix_wall_harmonic.jpg
deleted file mode 100644
index 3c605690c3..0000000000
Binary files a/doc/src/Eqs/fix_wall_harmonic.jpg and /dev/null differ
diff --git a/doc/src/Eqs/fix_wall_harmonic.tex b/doc/src/Eqs/fix_wall_harmonic.tex
deleted file mode 100644
index 86dcb80a0e..0000000000
--- a/doc/src/Eqs/fix_wall_harmonic.tex
+++ /dev/null
@@ -1,9 +0,0 @@
-\documentstyle[12pt]{article}
-
-\begin{document}
-
-$$
- E = \epsilon \hspace{0.1cm} (r - r_c)^2 \qquad r < r_c
-$$
-
-\end{document}
diff --git a/doc/src/Eqs/fix_wall_lj1043.jpg b/doc/src/Eqs/fix_wall_lj1043.jpg
deleted file mode 100644
index 303743bf3e..0000000000
Binary files a/doc/src/Eqs/fix_wall_lj1043.jpg and /dev/null differ
diff --git a/doc/src/Eqs/fix_wall_lj1043.tex b/doc/src/Eqs/fix_wall_lj1043.tex
deleted file mode 100644
index 06fc4dd33e..0000000000
--- a/doc/src/Eqs/fix_wall_lj1043.tex
+++ /dev/null
@@ -1,12 +0,0 @@
-\documentstyle[12pt]{article}
-
-\begin{document}
-
-$$
- E = 2 \pi \epsilon \left[ \frac{2}{5} \left(\frac{\sigma}{r}\right)^{10} - 
-                       \left(\frac{\sigma}{r}\right)^4 -
-                       \frac{\sqrt(2)\sigma^3}{3\left(r+\left(0.61/\sqrt(2)\right)\sigma\right)^3}\right]
-                       \qquad r < r_c
-$$
-
-\end{document}
\ No newline at end of file
diff --git a/doc/src/Eqs/fix_wall_lj93.jpg b/doc/src/Eqs/fix_wall_lj93.jpg
deleted file mode 100644
index 18e502cfbf..0000000000
Binary files a/doc/src/Eqs/fix_wall_lj93.jpg and /dev/null differ
diff --git a/doc/src/Eqs/fix_wall_lj93.tex b/doc/src/Eqs/fix_wall_lj93.tex
deleted file mode 100644
index 7372e55c15..0000000000
--- a/doc/src/Eqs/fix_wall_lj93.tex
+++ /dev/null
@@ -1,11 +0,0 @@
-\documentstyle[12pt]{article}
-
-\begin{document}
-
-$$
- E = \epsilon \left[ \frac{2}{15} \left(\frac{\sigma}{r}\right)^{9} - 
-                       \left(\frac{\sigma}{r}\right)^3 \right]
-                       \qquad r < r_c
-$$
-
-\end{document}
\ No newline at end of file
diff --git a/doc/src/Eqs/fld.jpg b/doc/src/Eqs/fld.jpg
deleted file mode 100644
index 3d80d436ff..0000000000
Binary files a/doc/src/Eqs/fld.jpg and /dev/null differ
diff --git a/doc/src/Eqs/fld.tex b/doc/src/Eqs/fld.tex
deleted file mode 100644
index 7c75cfbe60..0000000000
--- a/doc/src/Eqs/fld.tex
+++ /dev/null
@@ -1,9 +0,0 @@
-\documentstyle[12pt]{article}
-
-\begin{document}
-
-$$
-F^{H} = -R_{FU}(U-U^{\infty}) + R_{FE}E^{\infty}
-$$
-
-\end{document}
diff --git a/doc/src/Eqs/fld2.jpg b/doc/src/Eqs/fld2.jpg
deleted file mode 100644
index 42de943c90..0000000000
Binary files a/doc/src/Eqs/fld2.jpg and /dev/null differ
diff --git a/doc/src/Eqs/fld2.tex b/doc/src/Eqs/fld2.tex
deleted file mode 100644
index 43adae11db..0000000000
--- a/doc/src/Eqs/fld2.tex
+++ /dev/null
@@ -1,9 +0,0 @@
-\documentstyle[12pt]{article}
-
-\begin{document}
-
-$$
--R_{FU}(U-U^{\infty}) = -R_{FE}E^{\infty} - F^{rest}
-$$
-
-\end{document}
diff --git a/doc/src/Eqs/heat_flux_J.jpg b/doc/src/Eqs/heat_flux_J.jpg
deleted file mode 100644
index cf3e220caa..0000000000
Binary files a/doc/src/Eqs/heat_flux_J.jpg and /dev/null differ
diff --git a/doc/src/Eqs/heat_flux_J.tex b/doc/src/Eqs/heat_flux_J.tex
deleted file mode 100644
index 53c0ff494a..0000000000
--- a/doc/src/Eqs/heat_flux_J.tex
+++ /dev/null
@@ -1,11 +0,0 @@
-\documentclass[12pt]{article}
-
-\begin{document}
-
-\begin{eqnarray*}
-\mathbf{J} & = & \frac{1}{V} \left[ \sum_i e_i \mathbf{v}_i - \sum_{i} \mathbf{S}_{i} \mathbf{v}_i \right] \\
-& = & \frac{1}{V} \left[ \sum_i e_i \mathbf{v}_i + \sum_{i<j} \left( \mathbf{f}_{ij} \cdot \mathbf{v}_j \right) \mathbf{x}_{ij} \right] \\
-& = & \frac{1}{V} \left[ \sum_i e_i \mathbf{v}_i + \frac{1}{2} \sum_{i<j} \left( \mathbf{f}_{ij} \cdot \left(\mathbf{v}_i + \mathbf{v}_j \right)  \right) \mathbf{x}_{ij} \right]
-\end{eqnarray*}
-
-\end{document}
diff --git a/doc/src/Eqs/heat_flux_k.jpg b/doc/src/Eqs/heat_flux_k.jpg
deleted file mode 100644
index 2fd4a19e5a..0000000000
Binary files a/doc/src/Eqs/heat_flux_k.jpg and /dev/null differ
diff --git a/doc/src/Eqs/heat_flux_k.tex b/doc/src/Eqs/heat_flux_k.tex
deleted file mode 100644
index f0621d4131..0000000000
--- a/doc/src/Eqs/heat_flux_k.tex
+++ /dev/null
@@ -1,11 +0,0 @@
-\documentclass[12pt]{article}
-
-\begin{document}
-
-$$
-\kappa  = \frac{V}{k_B T^2} \int_0^\infty \langle J_x(0)  J_x(t) \rangle \, dt
-= \frac{V}{3 k_B T^2} \int_0^\infty \langle \mathbf{J}(0) \cdot  \mathbf{J}(t)  \rangle \, dt
-$$
-
-\end{document}
-
diff --git a/doc/src/Eqs/hexorder.jpg b/doc/src/Eqs/hexorder.jpg
deleted file mode 100644
index dafa25cabe..0000000000
Binary files a/doc/src/Eqs/hexorder.jpg and /dev/null differ
diff --git a/doc/src/Eqs/hexorder.tex b/doc/src/Eqs/hexorder.tex
deleted file mode 100644
index 60e0b91034..0000000000
--- a/doc/src/Eqs/hexorder.tex
+++ /dev/null
@@ -1,8 +0,0 @@
-\documentclass[12pt]{article}
-\begin{document}
-
-$$
-   q_n = \frac{1}{nnn}\sum_{j = 1}^{nnn} e^{n i \theta({\bf r}_{ij})}
-$$
-
-\end{document}
diff --git a/doc/src/Eqs/improper_class2.jpg b/doc/src/Eqs/improper_class2.jpg
deleted file mode 100644
index ca0604f8d7..0000000000
Binary files a/doc/src/Eqs/improper_class2.jpg and /dev/null differ
diff --git a/doc/src/Eqs/improper_class2.tex b/doc/src/Eqs/improper_class2.tex
deleted file mode 100644
index 2c41df1a29..0000000000
--- a/doc/src/Eqs/improper_class2.tex
+++ /dev/null
@@ -1,13 +0,0 @@
-\documentclass[12pt]{article}
-
-\begin{document}
-
-\begin{eqnarray*}
-  E & = & E_i + E_{aa} \\
-  E_i & = & K [ \frac{\chi_{ijkl} + \chi_{kjli} + \chi_{ljik}}{3} - \chi_0 ]^2 \\
-  E_{aa} & = & M_1 (\theta_{ijk} - \theta_1) (\theta_{kjl} - \theta_3) + \\
-  & & M_2 (\theta_{ijk} - \theta_1) (\theta_{ijl} - \theta_2) + \\
-  & & M_3 (\theta_{ijl} - \theta_2) (\theta_{kjl} - \theta_3)
-\end{eqnarray*}
-
-\end{document}
\ No newline at end of file
diff --git a/doc/src/Eqs/improper_cossq.jpg b/doc/src/Eqs/improper_cossq.jpg
deleted file mode 100644
index bddcb3d867..0000000000
Binary files a/doc/src/Eqs/improper_cossq.jpg and /dev/null differ
diff --git a/doc/src/Eqs/improper_cossq.tex b/doc/src/Eqs/improper_cossq.tex
deleted file mode 100644
index 27e79c7b16..0000000000
--- a/doc/src/Eqs/improper_cossq.tex
+++ /dev/null
@@ -1,9 +0,0 @@
-\documentclass[12pt]{article}
-
-\begin{document}
-
-$$
-  E = \frac{1}{2} K \cos^2{\left(\chi - \chi_0\right)}
-$$
-
-\end{document}
diff --git a/doc/src/Eqs/improper_cvff.jpg b/doc/src/Eqs/improper_cvff.jpg
deleted file mode 100644
index 14be3ffa03..0000000000
Binary files a/doc/src/Eqs/improper_cvff.jpg and /dev/null differ
diff --git a/doc/src/Eqs/improper_cvff.tex b/doc/src/Eqs/improper_cvff.tex
deleted file mode 100644
index 3a038b6b8c..0000000000
--- a/doc/src/Eqs/improper_cvff.tex
+++ /dev/null
@@ -1,9 +0,0 @@
-\documentclass[12pt]{article}
-
-\begin{document}
-
-$$
-   E = K [1 + d  \cos (n \phi) ] 
-$$
-
-\end{document}
\ No newline at end of file
diff --git a/doc/src/Eqs/improper_dist-1.jpg b/doc/src/Eqs/improper_dist-1.jpg
deleted file mode 100644
index aeb761bfbb..0000000000
Binary files a/doc/src/Eqs/improper_dist-1.jpg and /dev/null differ
diff --git a/doc/src/Eqs/improper_dist-1.tex b/doc/src/Eqs/improper_dist-1.tex
deleted file mode 100644
index 8ef5b5f4c3..0000000000
--- a/doc/src/Eqs/improper_dist-1.tex
+++ /dev/null
@@ -1,9 +0,0 @@
-\documentclass[12pt]{article}
-
-\begin{document}
-
-$$
-   E = K_2 d^2 + K_4 d^4
-$$
-
-\end{document}
diff --git a/doc/src/Eqs/improper_distharm.jpg b/doc/src/Eqs/improper_distharm.jpg
deleted file mode 100644
index e55036b5bf..0000000000
Binary files a/doc/src/Eqs/improper_distharm.jpg and /dev/null differ
diff --git a/doc/src/Eqs/improper_distharm.tex b/doc/src/Eqs/improper_distharm.tex
deleted file mode 100644
index 218de6a0dd..0000000000
--- a/doc/src/Eqs/improper_distharm.tex
+++ /dev/null
@@ -1,9 +0,0 @@
-\documentclass[12pt]{article}
-
-\begin{document}
-\thispagestyle{empty}
-$$
-  E = K (d - d_0)^2
-$$
-
-\end{document}
diff --git a/doc/src/Eqs/improper_fourier.jpg b/doc/src/Eqs/improper_fourier.jpg
deleted file mode 100644
index 0a1b13baf8..0000000000
Binary files a/doc/src/Eqs/improper_fourier.jpg and /dev/null differ
diff --git a/doc/src/Eqs/improper_fourier.tex b/doc/src/Eqs/improper_fourier.tex
deleted file mode 100644
index 47ac58ef01..0000000000
--- a/doc/src/Eqs/improper_fourier.tex
+++ /dev/null
@@ -1,9 +0,0 @@
-\documentclass[12pt]{article}
-
-\begin{document}
-
-$$
-   E = K [C_0 + C_1 \cos ( \omega) + C_2 \cos( 2 \omega) ] 
-$$
-
-\end{document}
diff --git a/doc/src/Eqs/improper_harmonic.jpg b/doc/src/Eqs/improper_harmonic.jpg
deleted file mode 100644
index c2c1eb4663..0000000000
Binary files a/doc/src/Eqs/improper_harmonic.jpg and /dev/null differ
diff --git a/doc/src/Eqs/improper_harmonic.tex b/doc/src/Eqs/improper_harmonic.tex
deleted file mode 100644
index c47020cf9c..0000000000
--- a/doc/src/Eqs/improper_harmonic.tex
+++ /dev/null
@@ -1,9 +0,0 @@
-\documentclass[12pt]{article}
-
-\begin{document}
-
-$$
-  E = K (\chi - \chi_0)^2
-$$
-
-\end{document}
\ No newline at end of file
diff --git a/doc/src/Eqs/improper_inversion_harmonic.jpg b/doc/src/Eqs/improper_inversion_harmonic.jpg
deleted file mode 100644
index 793311e8ad..0000000000
Binary files a/doc/src/Eqs/improper_inversion_harmonic.jpg and /dev/null differ
diff --git a/doc/src/Eqs/improper_inversion_harmonic.tex b/doc/src/Eqs/improper_inversion_harmonic.tex
deleted file mode 100644
index a1607a1149..0000000000
--- a/doc/src/Eqs/improper_inversion_harmonic.tex
+++ /dev/null
@@ -1,15 +0,0 @@
-\documentclass[12pt]{article}
-
-\pagestyle{empty}
-\begin{document}
-
-$$
-  E = K \left(\theta - \theta_0\right)^2
-$$
-
-\end{document}
-
-%%% Local Variables:
-%%% mode: latex
-%%% TeX-master: t
-%%% End:
diff --git a/doc/src/Eqs/improper_ring.jpg b/doc/src/Eqs/improper_ring.jpg
deleted file mode 100644
index 81a79f7ce5..0000000000
Binary files a/doc/src/Eqs/improper_ring.jpg and /dev/null differ
diff --git a/doc/src/Eqs/improper_ring.tex b/doc/src/Eqs/improper_ring.tex
deleted file mode 100644
index b7bd553c37..0000000000
--- a/doc/src/Eqs/improper_ring.tex
+++ /dev/null
@@ -1,12 +0,0 @@
-\documentclass[12pt]{article}
-
-\begin{document}
-
-\begin{eqnarray*}
-   E & = &\frac{1}{6} K \left(\Delta_{ijl} + \Delta_{ijk} + \Delta_{kjl} \right)^6 \\
-   \Delta_{ijl} & = & \cos{\theta_{ijl} - \cos{\theta_0}} \\
-   \Delta_{ijk} & = & \cos{\theta_{ijk} - \cos{\theta_0}} \\
-   \Delta_{kjl} & = & \cos{\theta_{kjl} - \cos{\theta_0}}
-\end{eqnarray*}
-
-\end{document}
diff --git a/doc/src/Eqs/improper_sqdistharm.jpg b/doc/src/Eqs/improper_sqdistharm.jpg
deleted file mode 100644
index b1a84e995e..0000000000
Binary files a/doc/src/Eqs/improper_sqdistharm.jpg and /dev/null differ
diff --git a/doc/src/Eqs/improper_sqdistharm.tex b/doc/src/Eqs/improper_sqdistharm.tex
deleted file mode 100644
index 1b50a309a0..0000000000
--- a/doc/src/Eqs/improper_sqdistharm.tex
+++ /dev/null
@@ -1,9 +0,0 @@
-\documentclass[12pt]{article}
-
-\begin{document}
-\thispagestyle{empty}
-$$
-  E = K (d^2 - d_0^2)^2
-$$
-
-\end{document}
diff --git a/doc/src/Eqs/improper_umbrella.jpg b/doc/src/Eqs/improper_umbrella.jpg
deleted file mode 100644
index 8d6cbf81e7..0000000000
Binary files a/doc/src/Eqs/improper_umbrella.jpg and /dev/null differ
diff --git a/doc/src/Eqs/improper_umbrella.tex b/doc/src/Eqs/improper_umbrella.tex
deleted file mode 100644
index 53dfbf31d5..0000000000
--- a/doc/src/Eqs/improper_umbrella.tex
+++ /dev/null
@@ -1,13 +0,0 @@
-\documentclass[12pt]{article}
-
-\begin{document}
-
-$$
-E=\frac{1}{2}K\left( \frac{1}{\sin\omega_0}\right) ^2 \left( \cos\omega - \cos\omega_0\right) ^2 \qquad \omega_0 \neq 0^o
-$$
-
-$$
-E=K\left( 1-cos\omega\right)  \qquad \omega_0 = 0^o
-$$
-
-\end{document}
diff --git a/doc/src/Eqs/min_energy.jpg b/doc/src/Eqs/min_energy.jpg
deleted file mode 100644
index 7925d268ac..0000000000
Binary files a/doc/src/Eqs/min_energy.jpg and /dev/null differ
diff --git a/doc/src/Eqs/min_energy.tex b/doc/src/Eqs/min_energy.tex
deleted file mode 100644
index 78f8cae112..0000000000
--- a/doc/src/Eqs/min_energy.tex
+++ /dev/null
@@ -1,15 +0,0 @@
-\documentclass[12pt]{article}
-
-\begin{document}
-
-\begin{eqnarray*}
-E(r_1,r_2, \ldots ,r_N) & = & \sum_{i,j} E_{\it pair}(r_i,r_j) + 
-                              \sum_{ij} E_{\it bond}(r_i,r_j) +
-                              \sum_{ijk} E_{\it angle}(r_i,r_j,r_k) + \\
-                           && \sum_{ijkl} E_{\it dihedral}(r_i,r_j,r_k,r_l) +
-                              \sum_{ijkl} E_{\it improper}(r_i,r_j,r_k,r_l) +
-                              \sum_i E_{\it fix}(r_i) 
-\end{eqnarray*}
-
-\end{document}
-
diff --git a/doc/src/Eqs/min_spin_damping.jpg b/doc/src/Eqs/min_spin_damping.jpg
deleted file mode 100644
index 0c700cc678..0000000000
Binary files a/doc/src/Eqs/min_spin_damping.jpg and /dev/null differ
diff --git a/doc/src/Eqs/min_spin_damping.tex b/doc/src/Eqs/min_spin_damping.tex
deleted file mode 100644
index 88b05447d3..0000000000
--- a/doc/src/Eqs/min_spin_damping.tex
+++ /dev/null
@@ -1,13 +0,0 @@
-\documentclass[preview]{standalone}
-\usepackage{varwidth}
-\usepackage[utf8x]{inputenc}
-\usepackage{amsmath, amssymb, graphics, setspace}
-
-\begin{document}
-\begin{varwidth}{50in}
-  \begin{equation}
-    \frac{d \vec{s}_{i}}{dt} = \lambda\, \vec{s}_{i} \times\left( \vec{\omega}_{i} \times\vec{s}_{i} \right)
-    \nonumber
-  \end{equation}
-\end{varwidth}
-\end{document}
diff --git a/doc/src/Eqs/min_spin_timestep.jpg b/doc/src/Eqs/min_spin_timestep.jpg
deleted file mode 100644
index 0d8f8d07f9..0000000000
Binary files a/doc/src/Eqs/min_spin_timestep.jpg and /dev/null differ
diff --git a/doc/src/Eqs/min_spin_timestep.tex b/doc/src/Eqs/min_spin_timestep.tex
deleted file mode 100644
index b0f6e68e4d..0000000000
--- a/doc/src/Eqs/min_spin_timestep.tex
+++ /dev/null
@@ -1,14 +0,0 @@
-\documentclass[preview]{standalone}
-\usepackage{varwidth}
-\usepackage[utf8x]{inputenc}
-\usepackage{amsmath, amssymb, graphics, setspace}
-
-\begin{document}
-\begin{varwidth}{50in}
-  \begin{equation}
-    {\Delta t}_{\rm max} = \frac{2\pi}{\kappa
-    \left|\vec{\omega}_{\rm max} \right|} 
-    \nonumber
-  \end{equation}
-\end{varwidth}
-\end{document}
diff --git a/doc/src/Eqs/neb_spin_angle.jpg b/doc/src/Eqs/neb_spin_angle.jpg
deleted file mode 100644
index b7021c4f62..0000000000
Binary files a/doc/src/Eqs/neb_spin_angle.jpg and /dev/null differ
diff --git a/doc/src/Eqs/neb_spin_angle.tex b/doc/src/Eqs/neb_spin_angle.tex
deleted file mode 100644
index 03b133cd77..0000000000
--- a/doc/src/Eqs/neb_spin_angle.tex
+++ /dev/null
@@ -1,15 +0,0 @@
-\documentclass[preview]{standalone}
-\usepackage{varwidth}
-\usepackage[utf8x]{inputenc}
-\usepackage{amsmath, amssymb, graphics, setspace}
-
-\begin{document}
-\begin{varwidth}{50in}
-  \begin{equation}
-    \omega_i^{\nu} = 
-    (\nu - 1) \Delta \omega_i
-    {\rm ~~and~~} \Delta \omega_i = \frac{\omega_i}{Q-1}
-  , \nonumber
-  \end{equation}
-\end{varwidth}
-\end{document}
diff --git a/doc/src/Eqs/neb_spin_k.jpg b/doc/src/Eqs/neb_spin_k.jpg
deleted file mode 100644
index add309694f..0000000000
Binary files a/doc/src/Eqs/neb_spin_k.jpg and /dev/null differ
diff --git a/doc/src/Eqs/neb_spin_k.tex b/doc/src/Eqs/neb_spin_k.tex
deleted file mode 100644
index f0ce8e180e..0000000000
--- a/doc/src/Eqs/neb_spin_k.tex
+++ /dev/null
@@ -1,16 +0,0 @@
-\documentclass[preview]{standalone}
-\usepackage{varwidth}
-\usepackage[utf8x]{inputenc}
-\usepackage{amsmath, amssymb, graphics, setspace}
-
-\begin{document}
-\begin{varwidth}{50in}
-  \begin{equation}
-    \vec{k}_i =  
-    \frac{\vec{m}_i^I \times \vec{m}_i^F}{\left|\vec{m}_i^I 
-    \times \vec{m}_i^F\right|} 
-    %&{\rm ~if~}& \vec{m}_i^I \times \vec{m}_i^F  
-  , \nonumber
-  \end{equation}
-\end{varwidth}
-\end{document}
diff --git a/doc/src/Eqs/neb_spin_rodrigues_formula.jpg b/doc/src/Eqs/neb_spin_rodrigues_formula.jpg
deleted file mode 100644
index 66070f7bc5..0000000000
Binary files a/doc/src/Eqs/neb_spin_rodrigues_formula.jpg and /dev/null differ
diff --git a/doc/src/Eqs/neb_spin_rodrigues_formula.tex b/doc/src/Eqs/neb_spin_rodrigues_formula.tex
deleted file mode 100644
index 4a8347cd79..0000000000
--- a/doc/src/Eqs/neb_spin_rodrigues_formula.tex
+++ /dev/null
@@ -1,16 +0,0 @@
-\documentclass[preview]{standalone}
-\usepackage{varwidth}
-\usepackage[utf8x]{inputenc}
-\usepackage{amsmath, amssymb, graphics, setspace}
-
-\begin{document}
-\begin{varwidth}{50in}
-  \begin{equation}
-    \vec{m}_i^{\nu} = \vec{m}_i^{I} \cos(\omega_i^{\nu})
-    + (\vec{k}_i \times \vec{m}_i^{I}) \sin(\omega_i^{\nu})
-    + (1.0-\cos(\omega_i^{\nu})) \vec{k}_i (\vec{k}_i\cdot
-    \vec{m}_i^{I})
-  , \nonumber
-  \end{equation}
-\end{varwidth}
-\end{document}
diff --git a/doc/src/Eqs/norm_inf.jpg b/doc/src/Eqs/norm_inf.jpg
deleted file mode 100644
index 42a2afb3d2..0000000000
Binary files a/doc/src/Eqs/norm_inf.jpg and /dev/null differ
diff --git a/doc/src/Eqs/norm_inf.tex b/doc/src/Eqs/norm_inf.tex
deleted file mode 100644
index b97a9f88f7..0000000000
--- a/doc/src/Eqs/norm_inf.tex
+++ /dev/null
@@ -1,15 +0,0 @@
-\documentclass[preview]{standalone}
-\usepackage{varwidth}
-\usepackage[utf8x]{inputenc}
-\usepackage{amsmath, amssymb, graphics, setspace}
-
-\begin{document}
-\begin{varwidth}{50in}
-  \begin{equation}
-    || \vec{F} ||_{inf} 
-    = {\rm max}\left(|F_1^1|, |F_1^2|, |F_1^3| \cdots, 
-    |F_N^1|, |F_N^2|, |F_N^3|\right)
-    \nonumber
-  \end{equation}
-\end{varwidth}
-\end{document}
diff --git a/doc/src/Eqs/norm_max.jpg b/doc/src/Eqs/norm_max.jpg
deleted file mode 100644
index c10db9a531..0000000000
Binary files a/doc/src/Eqs/norm_max.jpg and /dev/null differ
diff --git a/doc/src/Eqs/norm_max.tex b/doc/src/Eqs/norm_max.tex
deleted file mode 100644
index 3b2198bdf0..0000000000
--- a/doc/src/Eqs/norm_max.tex
+++ /dev/null
@@ -1,15 +0,0 @@
-\documentclass[preview]{standalone}
-\usepackage{varwidth}
-\usepackage[utf8x]{inputenc}
-\usepackage{amsmath, amssymb, graphics, setspace}
-
-\begin{document}
-\begin{varwidth}{50in}
-  \begin{equation}
-    % \left| \left| \vec{F} \right| \right|_2 
-    || \vec{F} ||_{max} 
-    = {\rm max}\left(||\vec{F}_1||, \cdots, ||\vec{F}_N||\right)
-    \nonumber
-  \end{equation}
-\end{varwidth}
-\end{document}
diff --git a/doc/src/Eqs/norm_two.jpg b/doc/src/Eqs/norm_two.jpg
deleted file mode 100644
index 5554de32f9..0000000000
Binary files a/doc/src/Eqs/norm_two.jpg and /dev/null differ
diff --git a/doc/src/Eqs/norm_two.tex b/doc/src/Eqs/norm_two.tex
deleted file mode 100644
index d428081a49..0000000000
--- a/doc/src/Eqs/norm_two.tex
+++ /dev/null
@@ -1,15 +0,0 @@
-\documentclass[preview]{standalone}
-\usepackage{varwidth}
-\usepackage[utf8x]{inputenc}
-\usepackage{amsmath, amssymb, graphics, setspace}
-
-\begin{document}
-\begin{varwidth}{50in}
-  \begin{equation}
-    % \left| \left| \vec{F} \right| \right|_2 
-    || \vec{F} ||_{2} 
-    = \sqrt{\vec{F}_1+ \cdots + \vec{F}_N}
-    \nonumber
-  \end{equation}
-\end{varwidth}
-\end{document}
diff --git a/doc/src/Eqs/orientorder.jpg b/doc/src/Eqs/orientorder.jpg
deleted file mode 100644
index 5ec79964f0..0000000000
Binary files a/doc/src/Eqs/orientorder.jpg and /dev/null differ
diff --git a/doc/src/Eqs/orientorder.tex b/doc/src/Eqs/orientorder.tex
deleted file mode 100644
index a081a9eec3..0000000000
--- a/doc/src/Eqs/orientorder.tex
+++ /dev/null
@@ -1,12 +0,0 @@
-\documentclass[12pt]{article}
-\begin{document}
-
-$$
-   \bar{Y}_{lm} = \frac{1}{nnn}\sum_{j = 1}^{nnn} Y_{lm}( \theta( {\bf r}_{ij} ), \phi( {\bf r}_{ij} ) ) 
-$$
-
-$$
-   Q_l = \sqrt{\frac{4 \pi}{2 l + 1} \sum_{m = -l}^{m = l} \bar{Y}_{lm} \bar{Y}^*_{lm}}
-   $$
-
-\end{document}
diff --git a/doc/src/Eqs/pair_adp.jpg b/doc/src/Eqs/pair_adp.jpg
deleted file mode 100644
index accae4716e..0000000000
Binary files a/doc/src/Eqs/pair_adp.jpg and /dev/null differ
diff --git a/doc/src/Eqs/pair_adp.tex b/doc/src/Eqs/pair_adp.tex
deleted file mode 100644
index 07e441f3fa..0000000000
--- a/doc/src/Eqs/pair_adp.tex
+++ /dev/null
@@ -1,16 +0,0 @@
-\documentclass[12pt]{article}
-
-\begin{document}
-
-\begin{eqnarray*}
-E_i & = & F_\alpha \left( \sum_{j\neq i} \rho_\beta (r_{ij}) \right) + \frac{1}{2} \sum_{j\neq i}\phi_{\alpha\beta}(r_{ij})+ \frac{1}{2} \sum_s (\mu_i^s)^2 + \frac{1}{2} \sum_{s,t} (\lambda_i^{st})^2 - \frac{1}{6} \nu_i^2 \\
-%
-\mu_i^s & = & \sum_{j\neq i}u_{\alpha\beta}(r_{ij})r_{ij}^s\\
-%
-\lambda_i^{st} & = & \sum_{j\neq i}w_{\alpha\beta}(r_{ij})r_{ij}^sr_{ij}^t\\
-%
-\nu_i & = & \sum_s\lambda_i^{ss}
-\end{eqnarray*}
-
-\end{document}
-
diff --git a/doc/src/Eqs/pair_agni.jpg b/doc/src/Eqs/pair_agni.jpg
deleted file mode 100644
index e0842225c6..0000000000
Binary files a/doc/src/Eqs/pair_agni.jpg and /dev/null differ
diff --git a/doc/src/Eqs/pair_agni.tex b/doc/src/Eqs/pair_agni.tex
deleted file mode 100644
index b9aa7882fc..0000000000
--- a/doc/src/Eqs/pair_agni.tex
+++ /dev/null
@@ -1,18 +0,0 @@
-\documentclass[12pt]{article}
-
-\pagestyle{empty}
-\begin{document}
-
-\begin{eqnarray*}
-  F_i^u & = & \sum_t^{N_t}\alpha_t \cdot \exp\left[-\frac{\left(d_{i,t}^u\right)^2}{2l^2}\right] \\
-  d_{i,t}^u & = & \left|\left| V_i^u(\eta) - V_t^u(\eta) \right|\right| \\
-  V_i^u(\eta) & = & \sum_{j \neq i}\frac{r^u_{ij}}{r_{ij}} \cdot e^{-\left(\frac{r_{ij}}{\eta} \right)^2} \cdot f_d\left(r_{ij}\right) \\
-  f_d\left(r_{ij}\right) & = & \frac{1}{2} \left[\cos\left(\frac{\pi r_{ij}}{R_c}\right) + 1 \right]
-\end{eqnarray*}
-
-\end{document}
-
-%%% Local Variables:
-%%% mode: latex
-%%% TeX-master: t
-%%% End:
diff --git a/doc/src/Eqs/pair_airebo.jpg b/doc/src/Eqs/pair_airebo.jpg
deleted file mode 100644
index a3259879f1..0000000000
Binary files a/doc/src/Eqs/pair_airebo.jpg and /dev/null differ
diff --git a/doc/src/Eqs/pair_airebo.tex b/doc/src/Eqs/pair_airebo.tex
deleted file mode 100644
index 6c40b2ef58..0000000000
--- a/doc/src/Eqs/pair_airebo.tex
+++ /dev/null
@@ -1,11 +0,0 @@
-\documentclass[12pt]{article}
-
-\begin{document}
-
-$$ 
-  E = \frac{1}{2} \sum_i \sum_{j \neq i} 
-  \left[ E^{REBO}_{ij} + E^{LJ}_{ij} + 
-    \sum_{k \neq i,j} \sum_{l \neq i,j,k} E^{TORSION}_{kijl} \right] 
-$$
-
-\end{document}
\ No newline at end of file
diff --git a/doc/src/Eqs/pair_atm.jpg b/doc/src/Eqs/pair_atm.jpg
deleted file mode 100644
index d2e6d704e9..0000000000
Binary files a/doc/src/Eqs/pair_atm.jpg and /dev/null differ
diff --git a/doc/src/Eqs/pair_atm.tex b/doc/src/Eqs/pair_atm.tex
deleted file mode 100644
index fce1db99b8..0000000000
--- a/doc/src/Eqs/pair_atm.tex
+++ /dev/null
@@ -1,9 +0,0 @@
-\documentclass[12pt]{article}
-
-\begin{document}
-
-\begin{equation}
-E=\nu\frac{1+3\cos\gamma_1\cos\gamma_2\cos\gamma_3}{r_{12}^3r_{23}^3r_{31}^3}
-\end{equation}
-
-\end{document}
diff --git a/doc/src/Eqs/pair_beck.jpg b/doc/src/Eqs/pair_beck.jpg
deleted file mode 100644
index a6da8a87d1..0000000000
Binary files a/doc/src/Eqs/pair_beck.jpg and /dev/null differ
diff --git a/doc/src/Eqs/pair_beck.tex b/doc/src/Eqs/pair_beck.tex
deleted file mode 100644
index dde6b6ef51..0000000000
--- a/doc/src/Eqs/pair_beck.tex
+++ /dev/null
@@ -1,11 +0,0 @@
-\documentstyle[12pt]{article}
-
-\begin{document}
-
-$$
-E\left(r\right) = A \exp\left[-\alpha r - \beta r^6\right] -
-\frac{B}{\left(r^2+a^2\right)^3} \left(1+\frac{2.709+3a^2}{r^2+a^2}\right)
-   \qquad r < R_c 
-$$
-
-\end{document}
diff --git a/doc/src/Eqs/pair_body_rounded.jpg b/doc/src/Eqs/pair_body_rounded.jpg
deleted file mode 100644
index e7136ddd20..0000000000
Binary files a/doc/src/Eqs/pair_body_rounded.jpg and /dev/null differ
diff --git a/doc/src/Eqs/pair_body_rounded.tex b/doc/src/Eqs/pair_body_rounded.tex
deleted file mode 100644
index 54e095340f..0000000000
--- a/doc/src/Eqs/pair_body_rounded.tex
+++ /dev/null
@@ -1,13 +0,0 @@
-\documentstyle[12pt]{article}
-
-\begin{document}
-
-\begin{eqnarray*}
- F_n &=& k_n \delta_n - c_n v_n, \qquad \delta_n \le 0 \\
-     &=& -k_{na} \delta_n - c_n v_n, \qquad 0 < \delta_n \le r_c \\
-     &=& 0 \qquad \qquad \qquad \qquad \delta_n > r_c \\
- F_t &=& \mu k_n \delta_n - c_t v_t, \qquad \delta_n \le 0 \\
-     &=& 0 \qquad \qquad \qquad \qquad \delta_n > 0
-\end{eqnarray*}
-
-\end{document}
diff --git a/doc/src/Eqs/pair_bop.jpg b/doc/src/Eqs/pair_bop.jpg
deleted file mode 100644
index d1fbb14b09..0000000000
Binary files a/doc/src/Eqs/pair_bop.jpg and /dev/null differ
diff --git a/doc/src/Eqs/pair_bop.tex b/doc/src/Eqs/pair_bop.tex
deleted file mode 100644
index 371bc035f3..0000000000
--- a/doc/src/Eqs/pair_bop.tex
+++ /dev/null
@@ -1,9 +0,0 @@
-\documentclass[12pt]{article}
-
-\begin{document}
-
-$$
-  E = \frac{1}{2} \sum_{i=1}^{N} \sum_{j=i_1}^{i_N} \phi_{ij} \left( r_{ij} \right) - \sum_{i=1}^{N} \sum_{j=i_1}^{i_N} \beta_{\sigma,ij} \left( r_{ij} \right) \cdot \Theta_{\sigma,ij} - \sum_{i=1}^{N} \sum_{j=i_1}^{i_N} \beta_{\pi,ij} \left( r_{ij} \right) \cdot \Theta_{\pi,ij} + U_{prom}
-$$
-
-\end{document}
diff --git a/doc/src/Eqs/pair_born.jpg b/doc/src/Eqs/pair_born.jpg
deleted file mode 100644
index 5e6b6a729b..0000000000
Binary files a/doc/src/Eqs/pair_born.jpg and /dev/null differ
diff --git a/doc/src/Eqs/pair_born.tex b/doc/src/Eqs/pair_born.tex
deleted file mode 100644
index 9106b5e940..0000000000
--- a/doc/src/Eqs/pair_born.tex
+++ /dev/null
@@ -1,10 +0,0 @@
-\documentstyle[12pt]{article}
-
-\begin{document}
-
-$$
-E = A \exp \left(\frac{\sigma - r}{\rho} \right) - 
-    \frac{C}{r^6} + \frac{D}{r^8} \qquad r < r_c
-$$
-
-\end{document}
diff --git a/doc/src/Eqs/pair_buck.jpg b/doc/src/Eqs/pair_buck.jpg
deleted file mode 100644
index aaa5f7659a..0000000000
Binary files a/doc/src/Eqs/pair_buck.jpg and /dev/null differ
diff --git a/doc/src/Eqs/pair_buck.tex b/doc/src/Eqs/pair_buck.tex
deleted file mode 100644
index ef15af6901..0000000000
--- a/doc/src/Eqs/pair_buck.tex
+++ /dev/null
@@ -1,9 +0,0 @@
-\documentclass[12pt]{article}
-
-\begin{document}
-
-$$
-   E = A e^{-r / \rho} - \frac{C}{r^6} \qquad r < r_c
-$$
-
-\end{document}
\ No newline at end of file
diff --git a/doc/src/Eqs/pair_buck6d.jpg b/doc/src/Eqs/pair_buck6d.jpg
deleted file mode 100644
index ca7f071b03..0000000000
Binary files a/doc/src/Eqs/pair_buck6d.jpg and /dev/null differ
diff --git a/doc/src/Eqs/pair_buck6d.tex b/doc/src/Eqs/pair_buck6d.tex
deleted file mode 100644
index 903c0685be..0000000000
--- a/doc/src/Eqs/pair_buck6d.tex
+++ /dev/null
@@ -1,10 +0,0 @@
-\documentclass[12pt]{article}
-
-\begin{document}
-\pagestyle{empty}
-
-\begin{eqnarray*}
-  E = A e^{-\kappa r} - \frac{C}{r^6} \cdot \frac{1}{1 + D r^{14}} \qquad r < r_c \\
-\end{eqnarray*}
-
-\end{document}
diff --git a/doc/src/Eqs/pair_charmm.jpg b/doc/src/Eqs/pair_charmm.jpg
deleted file mode 100644
index 7d6c709ce5..0000000000
Binary files a/doc/src/Eqs/pair_charmm.jpg and /dev/null differ
diff --git a/doc/src/Eqs/pair_charmm.tex b/doc/src/Eqs/pair_charmm.tex
deleted file mode 100644
index 9544f01f0b..0000000000
--- a/doc/src/Eqs/pair_charmm.tex
+++ /dev/null
@@ -1,22 +0,0 @@
-\documentclass[12pt]{article}
-
-\begin{document}
-
-\begin{eqnarray*}
- E & = & LJ(r) \qquad \qquad \qquad r < r_{\rm in} \\
-   & = & S(r) * LJ(r) \qquad \qquad r_{\rm in} < r < r_{\rm out} \\
-   & = & 0 \qquad \qquad \qquad \qquad r > r_{\rm out} \\
- E & = & C(r) \qquad \qquad \qquad r < r_{\rm in} \\
-   & = & S(r) * C(r) \qquad \qquad r_{\rm in} < r < r_{\rm out} \\
-   & = & 0 \qquad \qquad \qquad \qquad r > r_{\rm out} \\
- LJ(r) & = & 4 \epsilon \left[ \left(\frac{\sigma}{r}\right)^{12} - 
-         \left(\frac{\sigma}{r}\right)^6 \right] \\
- C(r) & = & \frac{C q_i q_j}{ \epsilon r} \\
- S(r) & = & \frac{ \left[r_{\rm out}^2 - r^2\right]^2  
-   \left[r_{\rm out}^2 + 2r^2 - 3{r_{\rm in}^2}\right]} 
- { \left[r_{\rm out}^2 - {r_{\rm in}}^2\right]^3 }
-\end{eqnarray*}                           
-
-\end{document}
-
-
diff --git a/doc/src/Eqs/pair_class2.jpg b/doc/src/Eqs/pair_class2.jpg
deleted file mode 100644
index abec072e79..0000000000
Binary files a/doc/src/Eqs/pair_class2.jpg and /dev/null differ
diff --git a/doc/src/Eqs/pair_class2.tex b/doc/src/Eqs/pair_class2.tex
deleted file mode 100644
index e2acc00bb6..0000000000
--- a/doc/src/Eqs/pair_class2.tex
+++ /dev/null
@@ -1,11 +0,0 @@
-\documentstyle[12pt]{article}
-
-\begin{document}
-
-$$
-  E = \epsilon \left[ 2 \left(\frac{\sigma}{r}\right)^9 - 
-    3 \left(\frac{\sigma}{r}\right)^6 \right]
-  \qquad r < r_c
-$$
-
-\end{document}
\ No newline at end of file
diff --git a/doc/src/Eqs/pair_cmm.jpg b/doc/src/Eqs/pair_cmm.jpg
deleted file mode 100644
index 1ec60f7305..0000000000
Binary files a/doc/src/Eqs/pair_cmm.jpg and /dev/null differ
diff --git a/doc/src/Eqs/pair_cmm.tex b/doc/src/Eqs/pair_cmm.tex
deleted file mode 100644
index 9bab1e9002..0000000000
--- a/doc/src/Eqs/pair_cmm.tex
+++ /dev/null
@@ -1,16 +0,0 @@
-\documentclass[12pt]{article}
-
-\begin{document}
-
-\begin{eqnarray*}
- E = & \frac{27}{4} \epsilon \left[ \left(\frac{\sigma}{r}\right)^{9} - 
-                       \left(\frac{\sigma}{r}\right)^6 \right] &
-                       \qquad r < r_c \\
- E = & \frac{3\sqrt{3}}{2} \epsilon \left[ \left(\frac{\sigma}{r}\right)^{12} - 
-                       \left(\frac{\sigma}{r}\right)^4 \right] &
-                       \qquad r < r_c \\
- E = &  4 \epsilon  \left[ \left(\frac{\sigma}{r}\right)^{12} - 
-                       \left(\frac{\sigma}{r}\right)^6 \right] &
-                       \qquad r < r_c
-\end{eqnarray*}
-\end{document}
diff --git a/doc/src/Eqs/pair_colloid_cc.jpg b/doc/src/Eqs/pair_colloid_cc.jpg
deleted file mode 100644
index a64094ddad..0000000000
Binary files a/doc/src/Eqs/pair_colloid_cc.jpg and /dev/null differ
diff --git a/doc/src/Eqs/pair_colloid_cc.tex b/doc/src/Eqs/pair_colloid_cc.tex
deleted file mode 100644
index e1485d325a..0000000000
--- a/doc/src/Eqs/pair_colloid_cc.tex
+++ /dev/null
@@ -1,31 +0,0 @@
-\documentstyle[12pt]{article}
-
-\begin{document}
-
-\begin{eqnarray}
-U_A &=& - \frac{A_{cc}}{6} \left[
-  \frac{2 a_1 a_2}{r^2-\left(a_1+a_2\right)^2}
-  + \frac{2 a_1 a_2}{r^2 - \left(a_1 - a_2\right)^2}
-  + \mathrm{ln}
-  \left( 
-  \frac{r^2-\left(a_1+a_2\right)^2}{r^2-\left(a_1-a_2\right)^2}
-  \right)
-  \right] \nonumber \\
-\nonumber \\
-U_R &=& \frac{A_{cc}}{37800}  \frac{\sigma^6}{r}
-\left[ \frac{}{} \right. \nonumber \\
-  &&\qquad		\frac{r^2-7r\left(a_1+a_2\right)+6\left(a_1^2+7a_1a_2+a_2^2\right)}
-  {\left(r-a_1-a_2\right)^7} \nonumber \\
-  &&\qquad		+\frac{r^2+7r\left(a_1+a_2\right)+6\left(a_1^2+7a_1a_2+a_2^2\right)}
-  {\left(r+a_1+a_2\right)^7} \nonumber \\
-  &&\qquad		-\frac{r^2+7r\left(a_1-a_2\right)+6\left(a_1^2-7a_1a_2+a_2^2\right)}
-  {\left(r+a_1-a_2\right)^7} \nonumber \\
-  &&\qquad	\left.	-\frac{r^2-7r\left(a_1-a_2\right)+6\left(a_1^2-7a_1a_2+a_2^2\right)}
-  {\left(r-a_1+a_2\right)^7}
-  \right] \nonumber \\
-\nonumber \\
-U &=& U_A + U_R, \qquad r < r_c \nonumber
-\end{eqnarray}
-
-\end{document}
-
diff --git a/doc/src/Eqs/pair_colloid_cs.jpg b/doc/src/Eqs/pair_colloid_cs.jpg
deleted file mode 100644
index 8f5948fa54..0000000000
Binary files a/doc/src/Eqs/pair_colloid_cs.jpg and /dev/null differ
diff --git a/doc/src/Eqs/pair_colloid_cs.tex b/doc/src/Eqs/pair_colloid_cs.tex
deleted file mode 100644
index 760215ee08..0000000000
--- a/doc/src/Eqs/pair_colloid_cs.tex
+++ /dev/null
@@ -1,12 +0,0 @@
-\documentstyle[12pt]{article}
-
-\begin{document}
-
-\begin{eqnarray}
-	U &=& \frac{2 ~ a^3 ~ \sigma^3 ~ A_{cs}}{9 \left( a^2 - r^2 \right)^3} 
- \left[ 1 - \frac{\left(5 ~ a^6+45~a^4~r^2+63~a^2~r^4+15~r^6\right) \sigma^6}
- {15 \left(a-r\right)^6 \left( a+r \right)^6} \right], ~~ r < r_c \nonumber
-\end{eqnarray}
-
-\end{document}
-
diff --git a/doc/src/Eqs/pair_colloid_ss.jpg b/doc/src/Eqs/pair_colloid_ss.jpg
deleted file mode 100644
index 4ce19ba1e8..0000000000
Binary files a/doc/src/Eqs/pair_colloid_ss.jpg and /dev/null differ
diff --git a/doc/src/Eqs/pair_colloid_ss.tex b/doc/src/Eqs/pair_colloid_ss.tex
deleted file mode 100644
index 1cc511ed06..0000000000
--- a/doc/src/Eqs/pair_colloid_ss.tex
+++ /dev/null
@@ -1,12 +0,0 @@
-\documentstyle[12pt]{article}
-
-\begin{document}
-
-\begin{eqnarray}
-	U &=& \frac{A_{ss}}{36} \left[ \left( \frac{\sigma}{r}
-	\right)^{12} - \left( \frac{ \sigma}{r} \right)^6 \right], ~~
-	r < r_c \nonumber
-\end{eqnarray}
-
-\end{document}
-
diff --git a/doc/src/Eqs/pair_comb1.jpg b/doc/src/Eqs/pair_comb1.jpg
deleted file mode 100644
index e0711ca972..0000000000
Binary files a/doc/src/Eqs/pair_comb1.jpg and /dev/null differ
diff --git a/doc/src/Eqs/pair_comb1.tex b/doc/src/Eqs/pair_comb1.tex
deleted file mode 100644
index 82c6be056e..0000000000
--- a/doc/src/Eqs/pair_comb1.tex
+++ /dev/null
@@ -1,7 +0,0 @@
-\documentclass[12pt]{article}
-\begin{document} \large
-\begin{eqnarray*}
-E_T & = & \sum_i [ E_i^{self} (q_i) + \sum_{j>i} [E_{ij}^{short} (r_{ij}, q_i, q_j) + E_{ij}^{Coul} (r_{ij}, q_i, q_j)] + \\
-&& E^{polar} (q_i, r_{ij}) + E^{vdW} (r_{ij}) + E^{barr} (q_i) + E^{corr} (r_{ij}, \theta_{jik})] \\
-\end{eqnarray*}                           
-\end{document}
diff --git a/doc/src/Eqs/pair_comb2.jpg b/doc/src/Eqs/pair_comb2.jpg
deleted file mode 100644
index 8b0e5ba51a..0000000000
Binary files a/doc/src/Eqs/pair_comb2.jpg and /dev/null differ
diff --git a/doc/src/Eqs/pair_comb2.tex b/doc/src/Eqs/pair_comb2.tex
deleted file mode 100644
index 3ba72f0726..0000000000
--- a/doc/src/Eqs/pair_comb2.tex
+++ /dev/null
@@ -1,23 +0,0 @@
-\documentclass[10pt]{article}
-
-\begin{document}
-
-\begin{table}[h]
-\begin{tabular}{|c|c|c|c|c|c|c|c|c|}
-\hline
-   & $O$ & $Cu$ & $N$ & $C$ & $H$ & $Ti$ & $Zn$ & $Zr$ \\ \hline
-$O$	& F & F & F & F & F & F & F & F\\ \hline
-$Cu$	& F & F & P & F & F & P & F & P \\ \hline
-$N$ 	& F & P & F & M & F & P & P & P \\ \hline
-$C$   	& F & F & M & F & F & M & M & M \\ \hline
-$H$   	& F & F & F & F & F & M & M & F \\ \hline
-$Ti$   	& F & P & P & M & M & F & P & P \\ \hline
-$Zn$  	& F & F & P & M & M & P & F & P \\ \hline
-$Zr$  	& F & P & P & M & F & P & P & F \\ \hline
-\multicolumn{9}{l}{F: Fully optimized} \\
-\multicolumn{9}{l}{M: Only optimized for dimer molecule} \\
-\multicolumn{9}{l}{P: in Progress but have it from mixing rule} \\
-\end{tabular}
-\end{table}
-
-\end{document}
diff --git a/doc/src/Eqs/pair_cosine_squared.jpg b/doc/src/Eqs/pair_cosine_squared.jpg
deleted file mode 100644
index 682800652d..0000000000
Binary files a/doc/src/Eqs/pair_cosine_squared.jpg and /dev/null differ
diff --git a/doc/src/Eqs/pair_cosine_squared.tex b/doc/src/Eqs/pair_cosine_squared.tex
deleted file mode 100644
index 96ac6a305e..0000000000
--- a/doc/src/Eqs/pair_cosine_squared.tex
+++ /dev/null
@@ -1,16 +0,0 @@
-\documentclass[12pt]{article}
-
-\usepackage{amsmath}
-
-\begin{document}
-
-\begin{align*}
-E = 
-\begin{cases}
--\epsilon& \quad r < \sigma \\
--\epsilon\cos\left(\frac{\pi\left(r - \sigma\right)}{2\left(r_c - \sigma\right)}\right)&\quad \sigma \leq r < r_c \\
-0& \quad r \geq r_c
-\end{cases}
-\end{align*}
-
-\end{document}
diff --git a/doc/src/Eqs/pair_cosine_squared_wca.jpg b/doc/src/Eqs/pair_cosine_squared_wca.jpg
deleted file mode 100644
index 086bc63673..0000000000
Binary files a/doc/src/Eqs/pair_cosine_squared_wca.jpg and /dev/null differ
diff --git a/doc/src/Eqs/pair_cosine_squared_wca.tex b/doc/src/Eqs/pair_cosine_squared_wca.tex
deleted file mode 100644
index c086be9306..0000000000
--- a/doc/src/Eqs/pair_cosine_squared_wca.tex
+++ /dev/null
@@ -1,11 +0,0 @@
-\documentstyle[12pt]{article}
-
-\begin{document}
-
-$$
- E = \epsilon \left[ \left(\frac{\sigma}{r}\right)^{12} - 
-                       2\left(\frac{\sigma}{r}\right)^6 + 1\right]
-                       , \quad r < \sigma
-$$
-
-\end{document}
diff --git a/doc/src/Eqs/pair_coul_diel.jpg b/doc/src/Eqs/pair_coul_diel.jpg
deleted file mode 100644
index 70cb84f7a5..0000000000
Binary files a/doc/src/Eqs/pair_coul_diel.jpg and /dev/null differ
diff --git a/doc/src/Eqs/pair_coul_diel.tex b/doc/src/Eqs/pair_coul_diel.tex
deleted file mode 100644
index f0b893d887..0000000000
--- a/doc/src/Eqs/pair_coul_diel.tex
+++ /dev/null
@@ -1,9 +0,0 @@
-\documentclass[12pt]{article}
-\pagestyle{empty}
-\begin{document}
-
-\begin{eqnarray*}
- E & = & \frac{Cq_iq_j}{\epsilon r} \left( \frac{\epsilon}{\epsilon_D(r)}-1\right)                       \qquad r < r_c \\
- \epsilon_D(r) & = & \frac{5.2+\epsilon}{2} +  \frac{\epsilon-5.2}{2}\tanh\left(\frac{r-r_{me}}{\sigma_e}\right) 
-\end{eqnarray*}
-\end{document}
diff --git a/doc/src/Eqs/pair_coul_dsf.jpg b/doc/src/Eqs/pair_coul_dsf.jpg
deleted file mode 100644
index a891b3ad15..0000000000
Binary files a/doc/src/Eqs/pair_coul_dsf.jpg and /dev/null differ
diff --git a/doc/src/Eqs/pair_coul_dsf.tex b/doc/src/Eqs/pair_coul_dsf.tex
deleted file mode 100644
index ec69680fc8..0000000000
--- a/doc/src/Eqs/pair_coul_dsf.tex
+++ /dev/null
@@ -1,10 +0,0 @@
-\documentclass[12pt]{article}
-
-\begin{document}
-$$
-  E = 
-  q_iq_j \left[ \frac{\mbox{erfc} (\alpha r)}{r} -  \frac{\mbox{erfc} (\alpha r_c)}{r_c} + 
-  \left( \frac{\mbox{erfc} (\alpha r_c)}{r_c^2} +  \frac{2\alpha}{\sqrt{\pi}}\frac{\exp (-\alpha^2    r^2_c)}{r_c} \right)(r-r_c) \right] \qquad r < r_c 
-$$
-
-\end{document}
diff --git a/doc/src/Eqs/pair_coul_gauss.jpg b/doc/src/Eqs/pair_coul_gauss.jpg
deleted file mode 100644
index c286650eb2..0000000000
Binary files a/doc/src/Eqs/pair_coul_gauss.jpg and /dev/null differ
diff --git a/doc/src/Eqs/pair_coul_gauss.tex b/doc/src/Eqs/pair_coul_gauss.tex
deleted file mode 100644
index 1eb9c05a6f..0000000000
--- a/doc/src/Eqs/pair_coul_gauss.tex
+++ /dev/null
@@ -1,15 +0,0 @@
-\documentclass[12pt]{article}
-
-\pagestyle{empty}
-\begin{document}
-
-$$
-  E = \frac{C_{q_i q_j}}{\epsilon r_{ij}}\,\, \textrm{erf}\left(\alpha_{ij} r_{ij}\right)\quad\quad\quad r < r_c
-$$
-
-\end{document}
-
-%%% Local Variables:
-%%% mode: latex
-%%% TeX-master: t
-%%% End:
diff --git a/doc/src/Eqs/pair_coul_shield.jpg b/doc/src/Eqs/pair_coul_shield.jpg
deleted file mode 100644
index 83eb059ac8..0000000000
Binary files a/doc/src/Eqs/pair_coul_shield.jpg and /dev/null differ
diff --git a/doc/src/Eqs/pair_coul_shield.tex b/doc/src/Eqs/pair_coul_shield.tex
deleted file mode 100644
index bd92fb6801..0000000000
--- a/doc/src/Eqs/pair_coul_shield.tex
+++ /dev/null
@@ -1,33 +0,0 @@
-\documentclass[aps,pr,onecolumn,superscriptaddress,noshowpacs,a4paper,15pt]{revtex4}
-\pdfoutput=1
-\bibliographystyle{apsrev4}
-\usepackage{color}
-\usepackage{dcolumn} %Align table columns on decimal point
-\usepackage{amssymb}
-\usepackage{amsmath}
-\usepackage{amsthm}
-\usepackage{graphicx}
-\usepackage[pdftex]{hyperref}
-\hypersetup{colorlinks=true,citecolor=blue,linkcolor=red,urlcolor=blue}
-\usepackage[all]{hypcap}
-\newcommand{\red}{\color{red}}
-\newcommand{\blue}{\color{blue}}
-\definecolor{green}{rgb}{0,0.5,0}
-\newcommand{\green}{\color{green}}
-\newcommand{\white}{\color{white}}
-%\newcommand{\cite}[1]{\hspace{-1 ex} % \nocite{#1}\citenum{#1}}
-\thickmuskip=0.5\thickmuskip %shorter spaces in math
-
-\begin{document}
-\begingroup
-\Large
-\begin{eqnarray*}
-  E & = & \frac{1}{2} \sum_i \sum_{j \neq i} V_{ij} \\[15pt]
-  V_{ij} & = & {\rm Tap}(r_{ij})\frac{\kappa q_i q_j}{\sqrt[3]{r_{ij}^3+(1/\lambda_{ij})^3}}\\[15pt]
-  {\rm Tap}(r_{ij}) & = & 20\left ( \frac{r_{ij}}{R_{cut}} \right )^7 -
-                          70\left ( \frac{r_{ij}}{R_{cut}} \right )^6 +
-                          84\left ( \frac{r_{ij}}{R_{cut}} \right )^5 -
-                          35\left ( \frac{r_{ij}}{R_{cut}} \right )^4 + 1
-\end{eqnarray*}
-\endgroup
-\end{document}
diff --git a/doc/src/Eqs/pair_coul_soft.jpg b/doc/src/Eqs/pair_coul_soft.jpg
deleted file mode 100644
index dad9c745ba..0000000000
Binary files a/doc/src/Eqs/pair_coul_soft.jpg and /dev/null differ
diff --git a/doc/src/Eqs/pair_coul_soft.tex b/doc/src/Eqs/pair_coul_soft.tex
deleted file mode 100644
index 2ff42a25b6..0000000000
--- a/doc/src/Eqs/pair_coul_soft.tex
+++ /dev/null
@@ -1,10 +0,0 @@
-\documentstyle[12pt]{article}
-
-\begin{document}
-
-\[
-E = \lambda^n \frac{ C q_i q_j}{\epsilon
-\left[ \alpha_{\mathrm{C}} (1-\lambda)^2 + r^2 \right]^{1/2}} \qquad r < r_c
-\]
-
-\end{document}
diff --git a/doc/src/Eqs/pair_coul_wolf.jpg b/doc/src/Eqs/pair_coul_wolf.jpg
deleted file mode 100644
index fd64cb6c03..0000000000
Binary files a/doc/src/Eqs/pair_coul_wolf.jpg and /dev/null differ
diff --git a/doc/src/Eqs/pair_coul_wolf.tex b/doc/src/Eqs/pair_coul_wolf.tex
deleted file mode 100644
index 4a6592638f..0000000000
--- a/doc/src/Eqs/pair_coul_wolf.tex
+++ /dev/null
@@ -1,11 +0,0 @@
-\documentclass[12pt]{article}
-
-\begin{document}
-$$
-  E_i = \frac{1}{2} \sum_{j \neq i} 
-  \frac{q_i q_j {\rm erfc}(\alpha r_{ij})}{r_{ij}} + 
-  \frac{1}{2} \sum_{j \neq i} 
-  \frac{q_i q_j {\rm erf}(\alpha r_{ij})}{r_{ij}} \qquad r < r_c
-$$
-
-\end{document}
diff --git a/doc/src/Eqs/pair_coulgauss.jpg b/doc/src/Eqs/pair_coulgauss.jpg
deleted file mode 100644
index bf84d90c4a..0000000000
Binary files a/doc/src/Eqs/pair_coulgauss.jpg and /dev/null differ
diff --git a/doc/src/Eqs/pair_coulgauss.tex b/doc/src/Eqs/pair_coulgauss.tex
deleted file mode 100644
index 216d3b3360..0000000000
--- a/doc/src/Eqs/pair_coulgauss.tex
+++ /dev/null
@@ -1,9 +0,0 @@
-\documentclass[12pt]{article}
-
-\begin{document}
-  \thispagestyle{empty}
-\begin{eqnarray*}
-  E &=& \frac{q_i q_j \mathrm{erf}\left( r/\sqrt{\gamma_1^2+\gamma_2^2} \right) }{\epsilon r_{ij}}
-\end{eqnarray*}
-
-\end{document}
diff --git a/doc/src/Eqs/pair_coulomb.jpg b/doc/src/Eqs/pair_coulomb.jpg
deleted file mode 100644
index 39aaebac31..0000000000
Binary files a/doc/src/Eqs/pair_coulomb.jpg and /dev/null differ
diff --git a/doc/src/Eqs/pair_coulomb.tex b/doc/src/Eqs/pair_coulomb.tex
deleted file mode 100644
index 9dacdc1af3..0000000000
--- a/doc/src/Eqs/pair_coulomb.tex
+++ /dev/null
@@ -1,9 +0,0 @@
-\documentclass[12pt]{article}
-
-\begin{document}
-
-$$
-  E = \frac{C q_i q_j}{\epsilon  r} \qquad r < r_c
-$$
-
-\end{document}
\ No newline at end of file
diff --git a/doc/src/Eqs/pair_cs.jpg b/doc/src/Eqs/pair_cs.jpg
deleted file mode 100644
index b870a3bdf4..0000000000
Binary files a/doc/src/Eqs/pair_cs.jpg and /dev/null differ
diff --git a/doc/src/Eqs/pair_cs.tex b/doc/src/Eqs/pair_cs.tex
deleted file mode 100644
index b7eacb8d5b..0000000000
--- a/doc/src/Eqs/pair_cs.tex
+++ /dev/null
@@ -1,9 +0,0 @@
-\documentstyle[12pt]{article}
-
-\begin{document}
-
-$$
- E = \frac{C q_i q_j}{\epsilon (r + r_{min})} \qquad r \rightarrow 0
-$$
-
-\end{document}
diff --git a/doc/src/Eqs/pair_debye.jpg b/doc/src/Eqs/pair_debye.jpg
deleted file mode 100644
index 42bcb5cc63..0000000000
Binary files a/doc/src/Eqs/pair_debye.jpg and /dev/null differ
diff --git a/doc/src/Eqs/pair_debye.tex b/doc/src/Eqs/pair_debye.tex
deleted file mode 100644
index 392a6516ce..0000000000
--- a/doc/src/Eqs/pair_debye.tex
+++ /dev/null
@@ -1,8 +0,0 @@
-\documentclass[12pt]{article}
-
-\begin{document}
-$$
-  E = \frac{C q_i q_j}{\epsilon  r} \exp(- \kappa r) \qquad r < r_c
-$$
-
-\end{document}
diff --git a/doc/src/Eqs/pair_dipole.jpg b/doc/src/Eqs/pair_dipole.jpg
deleted file mode 100644
index e106c17c91..0000000000
Binary files a/doc/src/Eqs/pair_dipole.jpg and /dev/null differ
diff --git a/doc/src/Eqs/pair_dipole.tex b/doc/src/Eqs/pair_dipole.tex
deleted file mode 100644
index bc0ae82f80..0000000000
--- a/doc/src/Eqs/pair_dipole.tex
+++ /dev/null
@@ -1,38 +0,0 @@
-\documentclass[12pt]{article}
-
-\begin{document}
-
-\begin{eqnarray*}
-E_{LJ} & = & 4 \epsilon \left[ \left(\frac{\sigma}{r}\right)^{12} - 
-                        \left(\frac{\sigma}{r}\right)^6 \right] \\
-E_{qq} & = & \frac{q_i q_j}{r} \\
-E_{qp} & = & \frac{q}{r^3} (p \bullet \vec{r}) \\
-E_{pp} & = & \frac{1}{r^3} (\vec{p_i} \bullet \vec{p_j}) - 
-             \frac{3}{r^5} (\vec{p_i} \bullet \vec{r}) (\vec{p_j} \bullet \vec{r}) 
-\end{eqnarray*}                           
-
-\begin{eqnarray*}
-F_{qq} & = & \frac{q_i q_j}{r^3} \vec{r} \\
-F_{qp} & = & -\frac{q}{r^3} \vec{p} + \frac{3q}{r^5} 
-             (\vec{p} \bullet \vec{r}) \vec{r} \\
-F_{pp} & = & \frac{3}{r^5} (\vec{p_i} \bullet \vec{p_j}) \vec{r} -
-             \frac{15}{r^7} (\vec{p_i} \bullet \vec{r}) 
-	     (\vec{p_j} \bullet \vec{r}) \vec{r} + 
-             \frac{3}{r^5} \left[ (\vec{p_j} \bullet \vec{r}) \vec{p_i} + 
-             (\vec{p_i} \bullet \vec{r}) \vec{p_j} \right]
-\end{eqnarray*}                           
-
-\begin{eqnarray*}
-T_{pq} = T_{ij} & = & \frac{q_j}{r^3} (\vec{p_i} \times \vec{r}) \\
-T_{qp} = T_{ji} & = & - \frac{q_i}{r^3} (\vec{p_j} \times \vec{r}) \\
-T_{pp} = T_{ij} & = & -\frac{1}{r^3} (\vec{p_i} \times \vec{p_j}) + 
-                      \frac{3}{r^5} (\vec{p_j} \bullet \vec{r})
-		      (\vec{p_i} \times \vec{r}) \\
-T_{pp} = T_{ji} & = & -\frac{1}{r^3} (\vec{p_j} \times \vec{p_i}) + 
-                      \frac{3}{r^5} (\vec{p_i} \bullet \vec{r}) 
-		      (\vec{p_j} \times \vec{r}) \\
-\end{eqnarray*}                           
-
-\end{document}
-
-
diff --git a/doc/src/Eqs/pair_dipole_sf.jpg b/doc/src/Eqs/pair_dipole_sf.jpg
deleted file mode 100644
index c591534550..0000000000
Binary files a/doc/src/Eqs/pair_dipole_sf.jpg and /dev/null differ
diff --git a/doc/src/Eqs/pair_dipole_sf.tex b/doc/src/Eqs/pair_dipole_sf.tex
deleted file mode 100644
index c653a37740..0000000000
--- a/doc/src/Eqs/pair_dipole_sf.tex
+++ /dev/null
@@ -1,51 +0,0 @@
-\documentclass[12pt]{article}
-
-\begin{document}
-
-\begin{eqnarray*}
-E_{LJ} & = &  4\epsilon \left\{ \left[ \left( \frac{\sigma}{r} \right)^{\!12} -
-  \left( \frac{\sigma}{r} \right)^{\!6}  \right] +
-  \left[ 6\left( \frac{\sigma}{r_c} \right)^{\!12} - 
-  3\left(\frac{\sigma}{r_c}\right)^{\!6}\right]\left(\frac{r}{r_c}\right)^{\!2}
-  - 7\left( \frac{\sigma}{r_c} \right)^{\!12} +
-  4\left( \frac{\sigma}{r_c} \right)^{\!6}\right\} \\
-E_{qq} & = & \frac{q_i q_j}{r}\left(1-\frac{r}{r_c}\right)^{\!2} \\
-E_{pq} & = & E_{ji} = -\frac{q}{r^3} \left[ 1 -
-  3\left(\frac{r}{r_c}\right)^{\!2} +
-  2\left(\frac{r}{r_c}\right)^{\!3}\right] (\vec{p}\bullet\vec{r}) \\
-E_{qp} & = & E_{ij} = \frac{q}{r^3} \left[ 1 -
-  3\left(\frac{r}{r_c}\right)^{\!2} +
-  2\left(\frac{r}{r_c}\right)^{\!3}\right] (\vec{p}\bullet\vec{r}) \\
-E_{pp} & = & \left[1-4\left(\frac{r}{r_c}\right)^{\!3} +
-  3\left(\frac{r}{r_c}\right)^{\!4}\right]\left[\frac{1}{r^3} 
-  (\vec{p_i} \bullet \vec{p_j}) - \frac{3}{r^5} 
-  (\vec{p_i} \bullet \vec{r}) (\vec{p_j} \bullet \vec{r})\right] \\
-\end{eqnarray*}                           
-
-\begin{eqnarray*}
-F_{LJ} & = & \left\{\left[48\epsilon \left(\frac{\sigma}{r}\right)^{\!12} - 
-  24\epsilon \left(\frac{\sigma}{r}\right)^{\!6} \right]\frac{1}{r^2} - 
-  \left[48\epsilon \left(\frac{\sigma}{r_c}\right)^{\!12} - 24\epsilon 
-  \left(\frac{\sigma}{r_c}\right)^{\!6} \right]\frac{1}{r_c^2}\right\}\vec{r}\\
-F_{qq} & = & \frac{q_i q_j}{r}\left(\frac{1}{r^2} -
-  \frac{1}{r_c^2}\right)\vec{r} \\
-F_{pq} &=& F_{ij } =  -\frac{3q}{r^5} \left[ 1 -
-  \left(\frac{r}{r_c}\right)^{\!2}\right](\vec{p}\bullet\vec{r})\vec{r} +
-  \frac{q}{r^3}\left[1-3\left(\frac{r}{r_c}\right)^{\!2} +
-  2\left(\frac{r}{r_c}\right)^{\!3}\right] \vec{p} \\
-F_{qp} &=& F_{ij}  = \frac{3q}{r^5} \left[ 1 - 
-  \left(\frac{r}{r_c}\right)^{\!2}\right] (\vec{p}\bullet\vec{r})\vec{r} -
-  \frac{q}{r^3}\left[1-3\left(\frac{r}{r_c}\right)^{\!2} +
-  2\left(\frac{r}{r_c}\right)^{\!3}\right] \vec{p} \\
-F_{pp} & = &\frac{3}{r^5}\Bigg\{\left[1-\left(\frac{r}{r_c}\right)^{\!4}\right]
-  \left[(\vec{p_i}\bullet\vec{p_j}) - \frac{3}{r^2} (\vec{p_i}\bullet\vec{r}) 
-  (\vec{p_j} \bullet \vec{r})\right] \vec{r} + \\
-  & & \left[1 -
-  4\left(\frac{r}{r_c}\right)^{\!3}+3\left(\frac{r}{r_c}\right)^{\!4}\right]
-  \left[ (\vec{p_j} \bullet \vec{r}) \vec{p_i} + (\vec{p_i} \bullet \vec{r}) 
-  \vec{p_j} -\frac{2}{r^2} (\vec{p_i} \bullet \vec{r})
-  (\vec{p_j} \bullet \vec{r})\vec{r}\right] \Bigg\} \\
-\end{eqnarray*}                           
-
-\end{document}
-
diff --git a/doc/src/Eqs/pair_dipole_sf2.jpg b/doc/src/Eqs/pair_dipole_sf2.jpg
deleted file mode 100644
index b9e57becf6..0000000000
Binary files a/doc/src/Eqs/pair_dipole_sf2.jpg and /dev/null differ
diff --git a/doc/src/Eqs/pair_dipole_sf2.tex b/doc/src/Eqs/pair_dipole_sf2.tex
deleted file mode 100644
index 74758ba230..0000000000
--- a/doc/src/Eqs/pair_dipole_sf2.tex
+++ /dev/null
@@ -1,24 +0,0 @@
-\documentclass[12pt]{article}
-
-\begin{document}
-
-\begin{eqnarray*}
-T_{pq} = T_{ij} & = & \frac{q_j}{r^3} \left[ 1 - 
-  3\left(\frac{r}{r_c}\right)^{\!2} +
-  2\left(\frac{r}{r_c}\right)^{\!3}\right] (\vec{p_i}\times\vec{r}) \\
-T_{qp} = T_{ji} & = & - \frac{q_i}{r^3} \left[ 1 -
-  3\left(\frac{r}{r_c}\right)^{\!2} +
-  2\left(\frac{r}{r_c}\right)^{\!3} \right] (\vec{p_j}\times\vec{r}) \\
-T_{pp} = T_{ij} & = & -\frac{1}{r^3}\left[1-4\left(\frac{r}{r_c}\right)^{\!3} +
-  e3\left(\frac{r}{r_c}\right)^{\!4}\right] (\vec{p_i} \times \vec{p_j}) + \\
-  & & \frac{3}{r^5}\left[1-4\left(\frac{r}{r_c}\right)^{\!3} +
-  3\left(\frac{r}{r_c}\right)^{\!4}\right] (\vec{p_j}\bullet\vec{r})
-  (\vec{p_i} \times \vec{r}) \\
-T_{pp} = T_{ji} & = & -\frac{1}{r^3}\left[1-4\left(\frac{r}{r_c}\right)^{\!3} +
-  3\left(\frac{r}{r_c}\right)^{\!4}\right](\vec{p_j} \times \vec{p_i}) + \\
-  & & \frac{3}{r^5}\left[1-4\left(\frac{r}{r_c}\right)^{\!3} +
-  3\left(\frac{r}{r_c}\right)^{\!4}\right] (\vec{p_i} \bullet \vec{r}) 
-  (\vec{p_j} \times \vec{r}) \\
-\end{eqnarray*}                           
-
-\end{document}
diff --git a/doc/src/Eqs/pair_dpd.jpg b/doc/src/Eqs/pair_dpd.jpg
deleted file mode 100644
index e9bb8a69af..0000000000
Binary files a/doc/src/Eqs/pair_dpd.jpg and /dev/null differ
diff --git a/doc/src/Eqs/pair_dpd.tex b/doc/src/Eqs/pair_dpd.tex
deleted file mode 100644
index ba47f0d6b6..0000000000
--- a/doc/src/Eqs/pair_dpd.tex
+++ /dev/null
@@ -1,13 +0,0 @@
-\documentclass[12pt]{article}
-
-\begin{document}
-
-\begin{eqnarray*}
- \vec{f} & = & (F^C + F^D + F^R) \hat{r_{ij}} \qquad \qquad r < r_c \\
- F^C & = & A w(r) \\
- F^D & = & - \gamma w^2(r) (\hat{r_{ij}} \bullet \vec{v_{ij}}) \\
- F^R & = & \sigma w(r) \alpha (\Delta t)^{-1/2} \\
- w(r) & = & 1 - r/r_c
-\end{eqnarray*}                           
-
-\end{document}
diff --git a/doc/src/Eqs/pair_dpd_energy.jpg b/doc/src/Eqs/pair_dpd_energy.jpg
deleted file mode 100644
index 868a1cea01..0000000000
Binary files a/doc/src/Eqs/pair_dpd_energy.jpg and /dev/null differ
diff --git a/doc/src/Eqs/pair_dpd_energy.tex b/doc/src/Eqs/pair_dpd_energy.tex
deleted file mode 100644
index dc3d2759d3..0000000000
--- a/doc/src/Eqs/pair_dpd_energy.tex
+++ /dev/null
@@ -1,12 +0,0 @@
-\documentclass[12pt]{article}
-\pagestyle{empty}
-\begin{document}
-
-\begin{eqnarray*}
-  du_{i}^{cond} & = & \kappa_{ij}(\frac{1}{\theta_{i}}-\frac{1}{\theta_{j}})\omega_{ij}^{2} + \alpha_{ij}\omega_{ij}\zeta_{ij}^{q}(\Delta{t})^{-1/2} \\
-  du_{i}^{mech} & = & -\frac{1}{2}\gamma_{ij}\omega_{ij}^{2}(\frac{\vec{r_{ij}}}{r_{ij}}\bullet\vec{v_{ij}})^{2} - 
-  \frac{\sigma^{2}_{ij}}{4}(\frac{1}{m_{i}}+\frac{1}{m_{j}})\omega_{ij}^{2} - 
-  \frac{1}{2}\sigma_{ij}\omega_{ij}(\frac{\vec{r_{ij}}}{r_{ij}}\bullet\vec{v_{ij}})\zeta_{ij}(\Delta{t})^{-1/2} \\
-\end{eqnarray*}                           
-
-\end{document}
diff --git a/doc/src/Eqs/pair_dpd_energy_terms.jpg b/doc/src/Eqs/pair_dpd_energy_terms.jpg
deleted file mode 100644
index c717e15c76..0000000000
Binary files a/doc/src/Eqs/pair_dpd_energy_terms.jpg and /dev/null differ
diff --git a/doc/src/Eqs/pair_dpd_energy_terms.tex b/doc/src/Eqs/pair_dpd_energy_terms.tex
deleted file mode 100644
index c684cedc28..0000000000
--- a/doc/src/Eqs/pair_dpd_energy_terms.tex
+++ /dev/null
@@ -1,11 +0,0 @@
-\documentclass[12pt]{article}
-\pagestyle{empty}
-\begin{document}
-
-\begin{eqnarray*}
-  \alpha_{ij}^{2} & = & 2k_{B}\kappa_{ij} \\
-  \sigma^{2}_{ij} & = & 2\gamma_{ij}k_{B}\Theta_{ij} \\
-  \Theta_{ij}^{-1} & = & \frac{1}{2}(\frac{1}{\theta_{i}}+\frac{1}{\theta_{j}}) \\
-\end{eqnarray*}                           
-
-\end{document}
diff --git a/doc/src/Eqs/pair_dpd_omega.jpg b/doc/src/Eqs/pair_dpd_omega.jpg
deleted file mode 100644
index fd25f00f19..0000000000
Binary files a/doc/src/Eqs/pair_dpd_omega.jpg and /dev/null differ
diff --git a/doc/src/Eqs/pair_dpd_omega.tex b/doc/src/Eqs/pair_dpd_omega.tex
deleted file mode 100644
index fbd533abfa..0000000000
--- a/doc/src/Eqs/pair_dpd_omega.tex
+++ /dev/null
@@ -1,9 +0,0 @@
-\documentclass[12pt]{article}
-\pagestyle{empty}
-\begin{document}
-
-$$
- \omega_{ij} = 1 - \frac{r_{ij}}{r_{c}}
-$$
-
-\end{document}
diff --git a/doc/src/Eqs/pair_drip.jpg b/doc/src/Eqs/pair_drip.jpg
deleted file mode 100644
index a94b4141b0..0000000000
Binary files a/doc/src/Eqs/pair_drip.jpg and /dev/null differ
diff --git a/doc/src/Eqs/pair_drip.tex b/doc/src/Eqs/pair_drip.tex
deleted file mode 100644
index 079a2cdf84..0000000000
--- a/doc/src/Eqs/pair_drip.tex
+++ /dev/null
@@ -1,14 +0,0 @@
-\documentclass[12pt]{article}
-\usepackage{amsmath}
-\usepackage{bm}
-
-\begin{document}
-
-\begin{eqnarray*}
-E &=& \frac{1}{2} \sum_{i} \sum_{j\notin\text{layer}\,i} \phi_{ij} \\\phi_{ij} &=& f_\text{c}(x_r) \left[ e^{-\lambda(r_{ij} - z_0 )} \left[C+f(\rho_{ij})+  g(\rho_{ij}, \{\alpha_{ij}^{(m)}\}) \right]- A\left (\frac{z_0}{r_{ij}} \right)^6 \right] \\
-\end{eqnarray*}  
-
-
-
-                        
-\end{document}
\ No newline at end of file
diff --git a/doc/src/Eqs/pair_eam.jpg b/doc/src/Eqs/pair_eam.jpg
deleted file mode 100644
index 95c86b4ced..0000000000
Binary files a/doc/src/Eqs/pair_eam.jpg and /dev/null differ
diff --git a/doc/src/Eqs/pair_eam.tex b/doc/src/Eqs/pair_eam.tex
deleted file mode 100644
index 2ea20b2198..0000000000
--- a/doc/src/Eqs/pair_eam.tex
+++ /dev/null
@@ -1,10 +0,0 @@
-\documentclass[12pt]{article}
-
-\begin{document}
-
-$$
-   E_i = F_\alpha \left(\sum_{j \neq i}\ \rho_\beta (r_{ij})\right) + 
-   \frac{1}{2} \sum_{j \neq i} \phi_{\alpha\beta} (r_{ij})
-$$
-
-\end{document}
diff --git a/doc/src/Eqs/pair_eam_fs.jpg b/doc/src/Eqs/pair_eam_fs.jpg
deleted file mode 100644
index fa72f8fc73..0000000000
Binary files a/doc/src/Eqs/pair_eam_fs.jpg and /dev/null differ
diff --git a/doc/src/Eqs/pair_eam_fs.tex b/doc/src/Eqs/pair_eam_fs.tex
deleted file mode 100644
index 32ca605e2e..0000000000
--- a/doc/src/Eqs/pair_eam_fs.tex
+++ /dev/null
@@ -1,11 +0,0 @@
-\documentclass[12pt]{article}
-
-\begin{document}
-
-$$
-   E_i = F_\alpha \left(\sum_{j \neq i}\ 
-   \rho_{\alpha\beta} (r_{ij})\right) + 
-   \frac{1}{2} \sum_{j \neq i} \phi_{\alpha\beta} (r_{ij})
-$$
-
-\end{document}
\ No newline at end of file
diff --git a/doc/src/Eqs/pair_edip.jpg b/doc/src/Eqs/pair_edip.jpg
deleted file mode 100644
index 3933280480..0000000000
Binary files a/doc/src/Eqs/pair_edip.jpg and /dev/null differ
diff --git a/doc/src/Eqs/pair_edip.tex b/doc/src/Eqs/pair_edip.tex
deleted file mode 100644
index 27f5dd9eec..0000000000
--- a/doc/src/Eqs/pair_edip.tex
+++ /dev/null
@@ -1,22 +0,0 @@
-\documentclass[12pt]{article}
-
-\usepackage{amssymb,amsmath}
-
-\begin{document}
-
-\begin{eqnarray*}
-E & = & \sum_{j \ne i} \phi_{2}(R_{ij}, Z_{i}) + \sum_{j \ne i} \sum_{k \ne i,k > j} \phi_{3}(R_{ij}, R_{ik}, Z_{i}) \\
-\phi_{2}(r, Z) & = & A\left[\left(\frac{B}{r}\right)^{\rho} - e^{-\beta Z^2}\right]exp{\left(\frac{\sigma}{r-a}\right)} \\
-\phi_{3}(R_{ij}, R_{ik}, Z_i) & = & exp{\left(\frac{\gamma}{R_{ij}-a}\right)}exp{\left(\frac{\gamma}{R_{ik}-a}\right)}h(cos\theta_{ijk},Z_i) \\
-Z_i & = & \sum_{m \ne i} f(R_{im}) \qquad
-  f(r) = \begin{cases} 
-         1 & \quad r<c \\
-         \exp\left(\frac{\alpha}{1-x^{-3}}\right) & \quad c<r<a \\
-         0 & \quad r>a
-         \end{cases} \\
-h(l,Z) & = & \lambda [(1-e^{-Q(Z)(l+\tau(Z))^2}) + \eta Q(Z)(l+\tau(Z))^2 ] \\
-Q(Z) & = & Q_0 e^{-\mu Z} \qquad \tau(Z) = u_1 + u_2 (u_3 e^{-u_4 Z} - e^{-2u_4 Z})
-\end{eqnarray*}
-
-\end{document}
-
diff --git a/doc/src/Eqs/pair_edpd_force.jpg b/doc/src/Eqs/pair_edpd_force.jpg
deleted file mode 100644
index fabb6f772e..0000000000
Binary files a/doc/src/Eqs/pair_edpd_force.jpg and /dev/null differ
diff --git a/doc/src/Eqs/pair_edpd_force.tex b/doc/src/Eqs/pair_edpd_force.tex
deleted file mode 100644
index f6a0ca0d3c..0000000000
--- a/doc/src/Eqs/pair_edpd_force.tex
+++ /dev/null
@@ -1,33 +0,0 @@
-\documentclass[12pt]{article}
-
-\begin{document}
-
-$$
-  \mathbf{F}_{ij}^{C} = \alpha_{ij}{\omega_{C}}(r_{ij})\mathbf{e}_{ij},
-$$
-
-$$
-  \mathbf{F}_{ij}^{D} = -\gamma {\omega_{D}}(r_{ij})(\mathbf{e}_{ij} \cdot \mathbf{v}_{ij})\mathbf{e}_{ij},
-$$
-
-$$
-  \mathbf{F}_{ij}^{R} = \sigma {\omega_{R}}(r_{ij}){\xi_{ij}}\Delta t^{-1/2} \mathbf{e}_{ij},
-$$
-
-$$
-  \omega_{C}(r) = 1 - r/r_c,
-$$
-
-$$
-  \alpha_{ij} = A\cdot k_B(T_i + T_j)/2,
-$$
-
-$$  
-  \omega_{D}(r) = \omega^2_{R}(r) = (1-r/r_c)^s,
-$$
-
-$$  
-  \sigma_{ij}^2 = 4\gamma k_B T_i T_j/(T_i + T_j),
-$$
-
-\end{document}
diff --git a/doc/src/Eqs/pair_edpd_gov.jpg b/doc/src/Eqs/pair_edpd_gov.jpg
deleted file mode 100644
index 10b303a218..0000000000
Binary files a/doc/src/Eqs/pair_edpd_gov.jpg and /dev/null differ
diff --git a/doc/src/Eqs/pair_edpd_gov.tex b/doc/src/Eqs/pair_edpd_gov.tex
deleted file mode 100644
index 782cdec99e..0000000000
--- a/doc/src/Eqs/pair_edpd_gov.tex
+++ /dev/null
@@ -1,15 +0,0 @@
-\documentclass[12pt]{article}
-
-\begin{document}
-
-$$
-  \frac{\mathrm{d}^2 \mathbf{r}_i}{\mathrm{d} t^2}=
-  \frac{\mathrm{d} \mathbf{v}_i}{\mathrm{d} t}
-  =\mathbf{F}_{i}=\sum_{i\neq j}(\mathbf{F}_{ij}^{C}+\mathbf{F}_{ij}^{D}+\mathbf{F}_{ij}^{R}),
-$$
-
-$$
-  C_v\frac{\mathrm{d} T_i}{\mathrm{d} t}= q_{i} = \sum_{i\neq j}(q_{ij}^{C}+q_{ij}^{V}+q_{ij}^{R}),
-$$
-
-\end{document}
diff --git a/doc/src/Eqs/pair_edpd_heat.jpg b/doc/src/Eqs/pair_edpd_heat.jpg
deleted file mode 100644
index b9256a1d13..0000000000
Binary files a/doc/src/Eqs/pair_edpd_heat.jpg and /dev/null differ
diff --git a/doc/src/Eqs/pair_edpd_heat.tex b/doc/src/Eqs/pair_edpd_heat.tex
deleted file mode 100644
index 241a1bad64..0000000000
--- a/doc/src/Eqs/pair_edpd_heat.tex
+++ /dev/null
@@ -1,29 +0,0 @@
-\documentclass[12pt]{article}
-
-\begin{document}
-
-$$
-  q_i^C = \sum_{j \ne i} k_{ij} \omega_{CT}(r_{ij}) \left( \frac{1}{T_i} - \frac{1}{T_j} \right),
-$$  
-  
-$$
-  q_i^V = \frac{1}{2 C_v}\sum_{j \ne i}{ \left\{ \omega_D(r_{ij})\left[\gamma_{ij} \left( \mathbf{e}_{ij} \cdot \mathbf{v}_{ij} \right)^2 - \frac{\left( \sigma _{ij} \right)^2}{m}\right] - \sigma _{ij} \omega_R(r_{ij})\left( \mathbf{e}_{ij} \cdot \mathbf{v}_{ij} \right){\xi_{ij}} \right\} },
-$$  
-
-$$
-  q_i^R = \sum_{j \ne i} \beta _{ij} \omega_{RT}(r_{ij}) d {t^{ - 1/2}} \xi_{ij}^e,
-$$
-
-$$
-  \omega_{CT}(r)=\omega_{RT}^2(r)=\left(1-r/r_{ct}\right)^{s_T},
-$$
-
-$$
-  k_{ij}=C_v^2\kappa(T_i + T_j)^2/4k_B,
-$$
-
-$$
-  \beta_{ij}^2=2k_Bk_{ij},
-$$
-
-\end{document}
diff --git a/doc/src/Eqs/pair_edpd_kappa.jpg b/doc/src/Eqs/pair_edpd_kappa.jpg
deleted file mode 100644
index 158974d374..0000000000
Binary files a/doc/src/Eqs/pair_edpd_kappa.jpg and /dev/null differ
diff --git a/doc/src/Eqs/pair_edpd_kappa.tex b/doc/src/Eqs/pair_edpd_kappa.tex
deleted file mode 100644
index ac5ca9f740..0000000000
--- a/doc/src/Eqs/pair_edpd_kappa.tex
+++ /dev/null
@@ -1,9 +0,0 @@
-\documentclass[12pt]{article}
-
-\begin{document}
-
-$$
-  \kappa  = \frac{315k_B\upsilon }{2\pi \rho C_v r_{ct}^5}\frac{1}{Pr},
-$$
-
-\end{document}
diff --git a/doc/src/Eqs/pair_eim1.jpg b/doc/src/Eqs/pair_eim1.jpg
deleted file mode 100644
index c243120b2a..0000000000
Binary files a/doc/src/Eqs/pair_eim1.jpg and /dev/null differ
diff --git a/doc/src/Eqs/pair_eim1.tex b/doc/src/Eqs/pair_eim1.tex
deleted file mode 100644
index bfa5b6ebc4..0000000000
--- a/doc/src/Eqs/pair_eim1.tex
+++ /dev/null
@@ -1,9 +0,0 @@
-\documentstyle[12pt]{article}
-
-\begin{document}
-
-$$
-E = \frac{1}{2} \sum_{i=1}^{N} \sum_{j=i_1}^{i_N} \phi_{ij} \left(r_{ij}\right) + \sum_{i=1}^{N}E_i\left(q_i,\sigma_i\right)
-$$
-
-\end{document}
diff --git a/doc/src/Eqs/pair_eim2.jpg b/doc/src/Eqs/pair_eim2.jpg
deleted file mode 100644
index 4896f658f1..0000000000
Binary files a/doc/src/Eqs/pair_eim2.jpg and /dev/null differ
diff --git a/doc/src/Eqs/pair_eim2.tex b/doc/src/Eqs/pair_eim2.tex
deleted file mode 100644
index d8c4181342..0000000000
--- a/doc/src/Eqs/pair_eim2.tex
+++ /dev/null
@@ -1,11 +0,0 @@
-\documentstyle[12pt]{article}
-
-\begin{document}
-
-\begin{eqnarray*}
-q_i & = & \sum_{j=i_1}^{i_N} \eta_{ji}\left(r_{ij}\right) \\
-\sigma_i & = & \sum_{j=i_1}^{i_N} q_j \cdot \psi_{ij} \left(r_{ij}\right) \\
-E_i\left(q_i,\sigma_i\right) & = & \frac{1}{2} \cdot q_i \cdot \sigma_i
-\end{eqnarray*}
-
-\end{document}
diff --git a/doc/src/Eqs/pair_eim3.jpg b/doc/src/Eqs/pair_eim3.jpg
deleted file mode 100644
index 57366bc15d..0000000000
Binary files a/doc/src/Eqs/pair_eim3.jpg and /dev/null differ
diff --git a/doc/src/Eqs/pair_eim3.tex b/doc/src/Eqs/pair_eim3.tex
deleted file mode 100644
index 84343c6acf..0000000000
--- a/doc/src/Eqs/pair_eim3.tex
+++ /dev/null
@@ -1,25 +0,0 @@
-\documentstyle[12pt]{article}
-
-\begin{document}
-
-\begin{eqnarray*}
-\phi_{ij}\left(r\right) = \left\{ \begin{array}{lr}
-\left[\frac{E_{b,ij}\beta_{ij}}{\beta_{ij}-\alpha_{ij}}\exp\left(-\alpha_{ij} \frac{r-r_{e,ij}}{r_{e,ij}}\right)-\frac{E_{b,ij}\alpha_{ij}}{\beta_{ij}-\alpha_{ij}}\exp\left(-\beta_{ij} \frac{r-r_{e,ij}}{r_{e,ij}}\right)\right]f_c\left(r,r_{e,ij},r_{c,\phi,ij}\right),& p_{ij}=1 \\
-\left[\frac{E_{b,ij}\beta_{ij}}{\beta_{ij}-\alpha_{ij}} \left(\frac{r_{e,ij}}{r}\right)^{\alpha_{ij}}  -\frac{E_{b,ij}\alpha_{ij}}{\beta_{ij}-\alpha_{ij}} \left(\frac{r_{e,ij}}{r}\right)^{\beta_{ij}}\right]f_c\left(r,r_{e,ij},r_{c,\phi,ij}\right),& p_{ij}=2
-\end{array}
-\right.
-\end{eqnarray*}
-
-$$
-\eta_{ji} = A_{\eta,ij}\left(\chi_j-\chi_i\right)f_c\left(r,r_{s,\eta,ij},r_{c,\eta,ij}\right)
-$$
-
-$$
-\psi_{ij}\left(r\right) = A_{\psi,ij}\exp\left(-\zeta_{ij}r\right)f_c\left(r,r_{s,\psi,ij},r_{c,\psi,ij}\right)
-$$
-
-$$
-f_{c}\left(r,r_p,r_c\right) = 0.510204 erfc\left[\frac{1.64498\left(2r-r_p-r_c\right)}{r_c-r_p}\right] - 0.010204
-$$
-
-\end{document}
diff --git a/doc/src/Eqs/pair_entropy.jpg b/doc/src/Eqs/pair_entropy.jpg
deleted file mode 100644
index 44161e6aa0..0000000000
Binary files a/doc/src/Eqs/pair_entropy.jpg and /dev/null differ
diff --git a/doc/src/Eqs/pair_entropy.tex b/doc/src/Eqs/pair_entropy.tex
deleted file mode 100644
index 304c9d6138..0000000000
--- a/doc/src/Eqs/pair_entropy.tex
+++ /dev/null
@@ -1,10 +0,0 @@
-\documentclass[12pt]{article}
-
-\begin{document}
-\thispagestyle{empty}
-
-$$
-   s_S^i=-2\pi\rho k_B \int\limits_0^{r_m} \left [ g(r) \ln g(r) - g(r) + 1 \right ] r^2 dr ,
-$$
-
-\end{document}
diff --git a/doc/src/Eqs/pair_entropy2.jpg b/doc/src/Eqs/pair_entropy2.jpg
deleted file mode 100644
index db3dcb0ca7..0000000000
Binary files a/doc/src/Eqs/pair_entropy2.jpg and /dev/null differ
diff --git a/doc/src/Eqs/pair_entropy2.tex b/doc/src/Eqs/pair_entropy2.tex
deleted file mode 100644
index c91004840f..0000000000
--- a/doc/src/Eqs/pair_entropy2.tex
+++ /dev/null
@@ -1,10 +0,0 @@
-\documentclass[12pt]{article}
-
-\begin{document}
-\thispagestyle{empty}
-
-$$
-   g_m^i(r) = \frac{1}{4 \pi \rho r^2} \sum\limits_{j} \frac{1}{\sqrt{2 \pi \sigma^2}} e^{-(r-r_{ij})^2/(2\sigma^2)} ,
-$$
-
-\end{document}
diff --git a/doc/src/Eqs/pair_entropy3.jpg b/doc/src/Eqs/pair_entropy3.jpg
deleted file mode 100644
index 0d5e0025b7..0000000000
Binary files a/doc/src/Eqs/pair_entropy3.jpg and /dev/null differ
diff --git a/doc/src/Eqs/pair_entropy3.tex b/doc/src/Eqs/pair_entropy3.tex
deleted file mode 100644
index b0b3c76358..0000000000
--- a/doc/src/Eqs/pair_entropy3.tex
+++ /dev/null
@@ -1,10 +0,0 @@
-\documentclass[12pt]{article}
-
-\begin{document}
-\thispagestyle{empty}
-
-$$
-  \bar{s}_S^i  = \frac{\sum_j s_S^j + s_S^i}{N + 1} ,
-$$
-
-\end{document}
diff --git a/doc/src/Eqs/pair_exp6_rx.jpg b/doc/src/Eqs/pair_exp6_rx.jpg
deleted file mode 100644
index 6ee321ea6d..0000000000
Binary files a/doc/src/Eqs/pair_exp6_rx.jpg and /dev/null differ
diff --git a/doc/src/Eqs/pair_exp6_rx.tex b/doc/src/Eqs/pair_exp6_rx.tex
deleted file mode 100644
index fe36aeaa34..0000000000
--- a/doc/src/Eqs/pair_exp6_rx.tex
+++ /dev/null
@@ -1,9 +0,0 @@
-\documentclass[12pt]{article}
-\pagestyle{empty}
-\begin{document}
-
-$$
-U_{ij}(r) = \frac{\epsilon}{\alpha-6}\{6exp[\alpha(1-\frac{r_{ij}}{R_{m}})]-\alpha(\frac{R_{m}}{r_{ij}})^6\}
-$$
-
-\end{document}
diff --git a/doc/src/Eqs/pair_exp6_rx_oneFluid.jpg b/doc/src/Eqs/pair_exp6_rx_oneFluid.jpg
deleted file mode 100644
index 5059c02e90..0000000000
Binary files a/doc/src/Eqs/pair_exp6_rx_oneFluid.jpg and /dev/null differ
diff --git a/doc/src/Eqs/pair_exp6_rx_oneFluid.tex b/doc/src/Eqs/pair_exp6_rx_oneFluid.tex
deleted file mode 100644
index 2f2efd4fa1..0000000000
--- a/doc/src/Eqs/pair_exp6_rx_oneFluid.tex
+++ /dev/null
@@ -1,11 +0,0 @@
-\documentstyle[12pt]{article}
-\pagestyle{empty}
-\begin{document}
-
-\begin{eqnarray*}
-   R_{m}^{3} &=& \displaystyle\sum_{a}\displaystyle\sum_{b} x_{a}x_{b}R_{m,ab}^{3} \\
-   \epsilon  &=& \frac{1}{R_{m}^{3}}\displaystyle\sum_{a}\displaystyle\sum_{b} x_{a}x_{b}\epsilon_{ab}R_{m,ab}^{3} \\
-   \alpha    &=& \frac{1}{\epsilon R_{m}^{3}}\displaystyle\sum_{a}\displaystyle\sum_{b} x_{a}x_{b}\alpha_{ab}\epsilon_{ab}R_{m,ab}^{3} \\
-\end{eqnarray*}                           
-
-\end{document}
diff --git a/doc/src/Eqs/pair_exp6_rx_oneFluid2.jpg b/doc/src/Eqs/pair_exp6_rx_oneFluid2.jpg
deleted file mode 100644
index 7144aea4f4..0000000000
Binary files a/doc/src/Eqs/pair_exp6_rx_oneFluid2.jpg and /dev/null differ
diff --git a/doc/src/Eqs/pair_exp6_rx_oneFluid2.tex b/doc/src/Eqs/pair_exp6_rx_oneFluid2.tex
deleted file mode 100644
index 1d1214f229..0000000000
--- a/doc/src/Eqs/pair_exp6_rx_oneFluid2.tex
+++ /dev/null
@@ -1,11 +0,0 @@
-\documentstyle[12pt]{article}
-\pagestyle{empty}
-\begin{document}
-
-\begin{eqnarray*}
-   \epsilon_{ab} &=& \sqrt{\epsilon_{a}\epsilon_{b}} \\
-   R_{m,ab} &=& \frac{R_{m,a}+R_{m,b}}{2} \\ 
-   \alpha_{ab} &=& \sqrt{\alpha_{a}\alpha_{b}} \\
-\end{eqnarray*}                           
-
-\end{document}
diff --git a/doc/src/Eqs/pair_gauss.jpg b/doc/src/Eqs/pair_gauss.jpg
deleted file mode 100644
index 97c2f0ecb2..0000000000
Binary files a/doc/src/Eqs/pair_gauss.jpg and /dev/null differ
diff --git a/doc/src/Eqs/pair_gauss.tex b/doc/src/Eqs/pair_gauss.tex
deleted file mode 100644
index ed38e13943..0000000000
--- a/doc/src/Eqs/pair_gauss.tex
+++ /dev/null
@@ -1,9 +0,0 @@
-\documentclass[12pt]{article}
-\pagestyle{empty}
-\begin{document}
-
-$$
-   E = - A \exp(-B r^2) \qquad r < r_c
-$$
-
-\end{document}
diff --git a/doc/src/Eqs/pair_gauss_cut.jpg b/doc/src/Eqs/pair_gauss_cut.jpg
deleted file mode 100644
index e47bb8cc06..0000000000
Binary files a/doc/src/Eqs/pair_gauss_cut.jpg and /dev/null differ
diff --git a/doc/src/Eqs/pair_gauss_cut.tex b/doc/src/Eqs/pair_gauss_cut.tex
deleted file mode 100644
index 5d0bb430f3..0000000000
--- a/doc/src/Eqs/pair_gauss_cut.tex
+++ /dev/null
@@ -1,8 +0,0 @@
-\documentclass[12pt]{article}
-\pagestyle{empty}
-\begin{document}
-
-\begin{eqnarray*}
- E = & \frac{H}{\sigma_h\sqrt{2\pi}} \exp\left[-\frac{(r-r_{mh})^2}{2\sigma_h^2}\right]
-\end{eqnarray*}
-\end{document}
diff --git a/doc/src/Eqs/pair_gayberne.jpg b/doc/src/Eqs/pair_gayberne.jpg
deleted file mode 100644
index e9b1f3ca93..0000000000
Binary files a/doc/src/Eqs/pair_gayberne.jpg and /dev/null differ
diff --git a/doc/src/Eqs/pair_gayberne.tex b/doc/src/Eqs/pair_gayberne.tex
deleted file mode 100644
index d3c199e826..0000000000
--- a/doc/src/Eqs/pair_gayberne.tex
+++ /dev/null
@@ -1,14 +0,0 @@
-\documentstyle[12pt]{article}
-
-\begin{document}
-
-$$ U ( \mathbf{A}_1, \mathbf{A}_2, \mathbf{r}_{12} ) = U_r (
-\mathbf{A}_1, \mathbf{A}_2, \mathbf{r}_{12}, \gamma ) \cdot \eta_{12} (
-\mathbf{A}_1, \mathbf{A}_2, \upsilon ) \cdot \chi_{12} ( \mathbf{A}_1,
-\mathbf{A}_2, \mathbf{r}_{12}, \mu ) $$
-
-$$ U_r = 4 \epsilon ( \varrho^{12} - \varrho^6) $$
-
-$$ \varrho = \frac{\sigma}{ h_{12} + \gamma \sigma} $$
-
-\end{document}
diff --git a/doc/src/Eqs/pair_gayberne2.jpg b/doc/src/Eqs/pair_gayberne2.jpg
deleted file mode 100644
index a4e6c6f70f..0000000000
Binary files a/doc/src/Eqs/pair_gayberne2.jpg and /dev/null differ
diff --git a/doc/src/Eqs/pair_gayberne2.tex b/doc/src/Eqs/pair_gayberne2.tex
deleted file mode 100644
index 6efb755774..0000000000
--- a/doc/src/Eqs/pair_gayberne2.tex
+++ /dev/null
@@ -1,9 +0,0 @@
-\documentstyle[12pt]{article}
-
-\begin{document}
-
-$$ \epsilon_a = \sigma \cdot { \frac{a}{ b \cdot c } }; \epsilon_b =
-\sigma \cdot { \frac{b}{ a \cdot c } }; \epsilon_c = \sigma \cdot {
-\frac{c}{ a \cdot b } } $$
-
-\end{document}
diff --git a/doc/src/Eqs/pair_gran_hertz.jpg b/doc/src/Eqs/pair_gran_hertz.jpg
deleted file mode 100644
index 733875fee6..0000000000
Binary files a/doc/src/Eqs/pair_gran_hertz.jpg and /dev/null differ
diff --git a/doc/src/Eqs/pair_gran_hertz.tex b/doc/src/Eqs/pair_gran_hertz.tex
deleted file mode 100644
index d6e09493b2..0000000000
--- a/doc/src/Eqs/pair_gran_hertz.tex
+++ /dev/null
@@ -1,14 +0,0 @@
-\documentclass[12pt]{article}
-
-\begin{document}
-
-$$
-   F_{hz} = \sqrt{\delta} \sqrt{\frac{R_i R_j}{R_i + R_j}} F_{hk} = 
-     \sqrt{\delta} \sqrt{\frac{R_i R_j}{R_i + R_j}} 
-     \Big[ (k_n \delta \mathbf{n}_{ij} -  
-       m_{\mbox{\scriptsize{eff}}} \: \gamma_n \mathbf{ v}_n) -
-       (k_t \mathbf{ \Delta s}_t +
-       m_{\mbox{\scriptsize{eff}}} \: \gamma_t \mathbf{v}_t) \Big]
-$$
-
-\end{document}
diff --git a/doc/src/Eqs/pair_gran_hooke.jpg b/doc/src/Eqs/pair_gran_hooke.jpg
deleted file mode 100644
index 36f34db6c6..0000000000
Binary files a/doc/src/Eqs/pair_gran_hooke.jpg and /dev/null differ
diff --git a/doc/src/Eqs/pair_gran_hooke.tex b/doc/src/Eqs/pair_gran_hooke.tex
deleted file mode 100644
index e1901e66a3..0000000000
--- a/doc/src/Eqs/pair_gran_hooke.tex
+++ /dev/null
@@ -1,12 +0,0 @@
-\documentclass[12pt]{article}
-
-\begin{document}
-
-$$
-   F_{hk} = (k_n \delta \mathbf{n}_{ij} -  
-   m_{\mbox{\scriptsize{eff}}} \gamma_n\mathbf{ v}_n) - 
-   (k_t \mathbf{ \Delta s}_t +
-   m_{\mbox{\scriptsize{eff}}} \gamma_t \mathbf{v}_t)
-$$
-
-\end{document}
diff --git a/doc/src/Eqs/pair_gromacs.jpg b/doc/src/Eqs/pair_gromacs.jpg
deleted file mode 100644
index 885c059e65..0000000000
Binary files a/doc/src/Eqs/pair_gromacs.jpg and /dev/null differ
diff --git a/doc/src/Eqs/pair_gromacs.tex b/doc/src/Eqs/pair_gromacs.tex
deleted file mode 100644
index 88dbe15909..0000000000
--- a/doc/src/Eqs/pair_gromacs.tex
+++ /dev/null
@@ -1,17 +0,0 @@
-\documentstyle[12pt]{article}
-
-\begin{document}
-
-\begin{eqnarray*}
-E_{LJ} & = & 4 \epsilon \left[ \left(\frac{\sigma}{r}\right)^{12} - 
-                       \left(\frac{\sigma}{r}\right)^6 \right] + S_{LJ}(r)
-                       \qquad r < r_c \\
-E_C & = & \frac{C q_i q_j}{\epsilon  r} + S_C(r) \qquad r < r_c \\
-S(r) & = & C \qquad r < r_1 \\
-S(r) & = & \frac{A}{3} (r - r_1)^3 + \frac{B}{4} (r - r_1)^4 + C \qquad  r_1 < r < r_c \\
-A & = & (-3 E'(r_c) + (r_c - r_1) E''(r_c))/(r_c - r_1)^2 \\
-B & = & (2 E'(r_c) - (r_c - r_1) E''(r_c))/(r_c - r_1)^3 \\
-C & = & -E(r_c) + \frac{1}{2} (r_c - r_1) E'(r_c) - \frac{1}{12} (r_c - r_1)^2 E''(r_c)) \\
-\end{eqnarray*}                           
-
-\end{document}
diff --git a/doc/src/Eqs/pair_hbond_dreiding.jpg b/doc/src/Eqs/pair_hbond_dreiding.jpg
deleted file mode 100644
index b93044ed31..0000000000
Binary files a/doc/src/Eqs/pair_hbond_dreiding.jpg and /dev/null differ
diff --git a/doc/src/Eqs/pair_hbond_dreiding.tex b/doc/src/Eqs/pair_hbond_dreiding.tex
deleted file mode 100644
index 9663ee5608..0000000000
--- a/doc/src/Eqs/pair_hbond_dreiding.tex
+++ /dev/null
@@ -1,18 +0,0 @@
-\documentstyle[12pt]{article}
-
-\begin{document}
-\begin{eqnarray*}
- E & = & \left[LJ(r) | Morse(r) \right] \qquad \qquad \qquad r < r_{\rm in} \\
-   & = & S(r) * \left[LJ(r) | Morse(r) \right] \qquad \qquad r_{\rm in} < r < r_{\rm out} \\
-   & = & 0 \qquad \qquad \qquad \qquad \qquad \qquad \qquad r > r_{\rm out} \\
- LJ(r) & = & AR^{-12}-BR^{-10}cos^n\theta=
-         \epsilon\left\lbrace 5\left[ \frac{\sigma}{r}\right]^{12}-
-         6\left[ \frac{\sigma}{r}\right]^{10}  \right\rbrace cos^n\theta\\
- Morse(r) & = & D_0\left\lbrace \chi^2 - 2\chi\right\rbrace cos^n\theta=
-         D_{0}\left\lbrace e^{- 2 \alpha (r - r_0)} - 2 e^{- \alpha (r - r_0)} 
-         \right\rbrace cos^n\theta \\
- S(r) & = & \frac{ \left[r_{\rm out}^2 - r^2\right]^2  
-   \left[r_{\rm out}^2 + 2r^2 - 3{r_{\rm in}^2}\right]} 
- { \left[r_{\rm out}^2 - {r_{\rm in}}^2\right]^3 }
-\end{eqnarray*}
-\end{document}
diff --git a/doc/src/Eqs/pair_ilp_graphene_hbn.jpg b/doc/src/Eqs/pair_ilp_graphene_hbn.jpg
deleted file mode 100644
index b28c0c6dc9..0000000000
Binary files a/doc/src/Eqs/pair_ilp_graphene_hbn.jpg and /dev/null differ
diff --git a/doc/src/Eqs/pair_ilp_graphene_hbn.tex b/doc/src/Eqs/pair_ilp_graphene_hbn.tex
deleted file mode 100644
index 47ce30ac7c..0000000000
--- a/doc/src/Eqs/pair_ilp_graphene_hbn.tex
+++ /dev/null
@@ -1,42 +0,0 @@
-\documentclass[aps,pr,onecolumn,superscriptaddress,noshowpacs,a4paper,15pt]{revtex4}
-\pdfoutput=1
-\bibliographystyle{apsrev4}
-\usepackage{color}
-\usepackage{dcolumn} %Align table columns on decimal point
-\usepackage{amssymb}
-\usepackage{amsmath}
-\usepackage{amsthm}
-\usepackage{graphicx}
-\usepackage[pdftex]{hyperref}
-\hypersetup{colorlinks=true,citecolor=blue,linkcolor=red,urlcolor=blue}
-\usepackage[all]{hypcap}
-\newcommand{\red}{\color{red}}
-\newcommand{\blue}{\color{blue}}
-\definecolor{green}{rgb}{0,0.5,0}
-\newcommand{\green}{\color{green}}
-\newcommand{\white}{\color{white}}
-%\newcommand{\cite}[1]{\hspace{-1 ex} % \nocite{#1}\citenum{#1}}
-\thickmuskip=0.5\thickmuskip %shorter spaces in math
-%
-\begin{document}
-%
-\begingroup
-\Large
-\begin{eqnarray*}
-  E & = & \frac{1}{2} \sum_i \sum_{j \neq i} V_{ij} \\[15pt]
-  V_{ij} & = & {\rm Tap}(r_{ij})\left \{ e^{-\alpha (r_{ij}/\beta -1)} 
-               \left [ \epsilon + f(\rho_{ij}) + f(\rho_{ji})\right ] - 
-                \frac{1}{1+e^{-d\left [ \left ( r_{ij}/\left (s_R \cdot r^{eff} \right ) \right )-1 \right ]}}
-                \cdot \frac{C_6}{r^6_{ij}} \right \}\\[15pt]
-  \rho_{ij}^2 & = & r_{ij}^2 - ({\bf r}_{ij} \cdot {\bf n}_i)^2 \\[15pt]
-  \rho_{ji}^2 & = & r_{ij}^2 - ({\bf r}_{ij} \cdot {\bf n}_j)^2 \\[15pt]
-  f(\rho) & = &  C e^{ -( \rho / \delta )^2 }\\[15pt]
-  {\rm Tap}(r_{ij}) & = & 20\left ( \frac{r_{ij}}{R_{cut}} \right )^7 -
-                          70\left ( \frac{r_{ij}}{R_{cut}} \right )^6 +
-                          84\left ( \frac{r_{ij}}{R_{cut}} \right )^5 -
-                          35\left ( \frac{r_{ij}}{R_{cut}} \right )^4 + 1
-\end{eqnarray*}
-\endgroup
-%
-\end{document}
-%
diff --git a/doc/src/Eqs/pair_kolmogorov_crespi_full.jpg b/doc/src/Eqs/pair_kolmogorov_crespi_full.jpg
deleted file mode 100644
index 7ac14f3d0b..0000000000
Binary files a/doc/src/Eqs/pair_kolmogorov_crespi_full.jpg and /dev/null differ
diff --git a/doc/src/Eqs/pair_kolmogorov_crespi_full.tex b/doc/src/Eqs/pair_kolmogorov_crespi_full.tex
deleted file mode 100644
index 16bbc25abf..0000000000
--- a/doc/src/Eqs/pair_kolmogorov_crespi_full.tex
+++ /dev/null
@@ -1,33 +0,0 @@
-\documentclass[aps,pr,onecolumn,superscriptaddress,noshowpacs,a4paper,15pt]{revtex4}
-\pdfoutput=1
-\bibliographystyle{apsrev4}
-\usepackage{color}
-\usepackage{dcolumn} %Align table columns on decimal point
-\usepackage{amssymb}
-\usepackage{amsmath}
-\usepackage{amsthm}
-\usepackage{graphicx}
-\usepackage[pdftex]{hyperref}
-\hypersetup{colorlinks=true,citecolor=blue,linkcolor=red,urlcolor=blue}
-\usepackage[all]{hypcap}
-\newcommand{\red}{\color{red}}
-\newcommand{\blue}{\color{blue}}
-\definecolor{green}{rgb}{0,0.5,0}
-\newcommand{\green}{\color{green}}
-\newcommand{\white}{\color{white}}
-%\newcommand{\cite}[1]{\hspace{-1 ex} % \nocite{#1}\citenum{#1}}
-\thickmuskip=0.5\thickmuskip %shorter spaces in math
-
-\begin{document}
-
-\begingroup
-\Large
-\begin{eqnarray*}
-  E & = & \frac{1}{2} \sum_i \sum_{j \neq i} V_{ij} \\[15pt]
-  V_{ij} & = & e^{-\lambda (r_{ij} -z_0)} \left [ C + f(\rho_{ij}) + f(\rho_{ji}) - A \left ( \frac{r_{ij}}{z_0}\right )^{-6} \right ] \\
-  \rho_{ij}^2 & = & r_{ij}^2 - ({\bf r}_{ij}\cdot {\bf n}_{i})^2 \\[15pt]
-  \rho_{ji}^2 & = & r_{ij}^2 - ({\bf r}_{ij}\cdot  {\bf n}_{j})^2 \\[15pt]
-  f(\rho) & = &  e^{-(\rho/\delta)^2} \sum_{n=0}^2 C_{2n} { (\rho/\delta) }^{2n}
-\end{eqnarray*}
-\endgroup
-\end{document}
diff --git a/doc/src/Eqs/pair_kolmogorov_crespi_z.jpg b/doc/src/Eqs/pair_kolmogorov_crespi_z.jpg
deleted file mode 100644
index 3d37ff25be..0000000000
Binary files a/doc/src/Eqs/pair_kolmogorov_crespi_z.jpg and /dev/null differ
diff --git a/doc/src/Eqs/pair_kolmogorov_crespi_z.tex b/doc/src/Eqs/pair_kolmogorov_crespi_z.tex
deleted file mode 100644
index fb7ebf8dc4..0000000000
--- a/doc/src/Eqs/pair_kolmogorov_crespi_z.tex
+++ /dev/null
@@ -1,13 +0,0 @@
-\documentclass[12pt]{article}
-\thispagestyle{empty}
-
-\begin{document}
-
-\begin{eqnarray*}
-  E & = & \frac{1}{2} \sum_i \sum_{j \neq i} V_{ij} \\
-  V_{ij} & = & e^{-\lambda(r_{ij} -z_0}) \left[ C + f(\rho_{ij}) + f(\rho_{ji}) \right] - A \left( \frac{r_{ij}}{z_0}\right)^{-6} + A \left( \frac{\textrm{cutoff}}{z_0}\right)^{-6} \\
-  \rho_{ij}^2 = \rho_{ji}^2 & = &  x_{ij}^2 + y_{ij}^2 ~\hspace{2cm} (\mathbf{n_i}\equiv\hat \mathbf{z})\\
-  f(\rho) & = &  e^{-(\rho/\delta)^2} \sum_{n=0}^2 C_{2n} \left( \rho/\delta \right) ^{2n}
-\end{eqnarray*}
-
-\end{document}
diff --git a/doc/src/Eqs/pair_lebedeva.png b/doc/src/Eqs/pair_lebedeva.png
deleted file mode 100644
index af2ac87653..0000000000
Binary files a/doc/src/Eqs/pair_lebedeva.png and /dev/null differ
diff --git a/doc/src/Eqs/pair_lj.jpg b/doc/src/Eqs/pair_lj.jpg
deleted file mode 100644
index 49cf7f5eb9..0000000000
Binary files a/doc/src/Eqs/pair_lj.jpg and /dev/null differ
diff --git a/doc/src/Eqs/pair_lj.tex b/doc/src/Eqs/pair_lj.tex
deleted file mode 100644
index 011fb8b769..0000000000
--- a/doc/src/Eqs/pair_lj.tex
+++ /dev/null
@@ -1,11 +0,0 @@
-\documentstyle[12pt]{article}
-
-\begin{document}
-
-$$
- E = 4 \epsilon \left[ \left(\frac{\sigma}{r}\right)^{12} - 
-                       \left(\frac{\sigma}{r}\right)^6 \right]
-                       \qquad r < r_c
-$$
-
-\end{document}
diff --git a/doc/src/Eqs/pair_lj96.jpg b/doc/src/Eqs/pair_lj96.jpg
deleted file mode 100644
index 6462de180e..0000000000
Binary files a/doc/src/Eqs/pair_lj96.jpg and /dev/null differ
diff --git a/doc/src/Eqs/pair_lj96.tex b/doc/src/Eqs/pair_lj96.tex
deleted file mode 100644
index e970624892..0000000000
--- a/doc/src/Eqs/pair_lj96.tex
+++ /dev/null
@@ -1,11 +0,0 @@
-\documentstyle[12pt]{article}
-
-\begin{document}
-
-$$
- E = 4 \epsilon \left[ \left(\frac{\sigma}{r}\right)^{9} - 
-                       \left(\frac{\sigma}{r}\right)^6 \right]
-                       \qquad r < r_c
-$$
-
-\end{document}
diff --git a/doc/src/Eqs/pair_lj_cubic.jpg b/doc/src/Eqs/pair_lj_cubic.jpg
deleted file mode 100644
index 69ec4f6e84..0000000000
Binary files a/doc/src/Eqs/pair_lj_cubic.jpg and /dev/null differ
diff --git a/doc/src/Eqs/pair_lj_cubic.tex b/doc/src/Eqs/pair_lj_cubic.tex
deleted file mode 100644
index e2e1b67dd7..0000000000
--- a/doc/src/Eqs/pair_lj_cubic.tex
+++ /dev/null
@@ -1,12 +0,0 @@
-\documentstyle[12pt]{article}
-
-\begin{document}
-
-\begin{eqnarray*}
- E &=& u_{LJ}(r) \qquad r \leq r_s \\
-    &=&  u_{LJ}(r_s) + (r-r_s) u'_{LJ}(r_s) - \frac{1}{6} A_3 (r-r_s)^3 \qquad r_s < r \leq r_c \\
-    &=& 0 \qquad r > r_c 
-\end{eqnarray*}                           
-
-
-\end{document}
diff --git a/doc/src/Eqs/pair_lj_expand.jpg b/doc/src/Eqs/pair_lj_expand.jpg
deleted file mode 100644
index e274818892..0000000000
Binary files a/doc/src/Eqs/pair_lj_expand.jpg and /dev/null differ
diff --git a/doc/src/Eqs/pair_lj_expand.tex b/doc/src/Eqs/pair_lj_expand.tex
deleted file mode 100644
index 0aaa2f44d8..0000000000
--- a/doc/src/Eqs/pair_lj_expand.tex
+++ /dev/null
@@ -1,11 +0,0 @@
-\documentclass[12pt]{article}
-
-\begin{document}
-
-$$
-  E = 4 \epsilon \left[ \left(\frac{\sigma}{r - \Delta}\right)^{12} - 
-    \left(\frac{\sigma}{r - \Delta}\right)^6 \right]
-    \qquad r < r_c + \Delta
-$$
-
-\end{document}
\ No newline at end of file
diff --git a/doc/src/Eqs/pair_lj_smooth.jpg b/doc/src/Eqs/pair_lj_smooth.jpg
deleted file mode 100644
index d380fd345c..0000000000
Binary files a/doc/src/Eqs/pair_lj_smooth.jpg and /dev/null differ
diff --git a/doc/src/Eqs/pair_lj_smooth.tex b/doc/src/Eqs/pair_lj_smooth.tex
deleted file mode 100644
index 5aa5495c27..0000000000
--- a/doc/src/Eqs/pair_lj_smooth.tex
+++ /dev/null
@@ -1,15 +0,0 @@
-\documentclass[12pt]{article}
-
-\begin{document}
-
-\begin{eqnarray*}
- E & = & 4 \epsilon \left[ \left(\frac{\sigma}{r}\right)^{12} - 
-                       \left(\frac{\sigma}{r}\right)^6 \right]
-                       \qquad r < r_{in} \\
- F & = & C_1 + C_2 (r - r_{in}) + C_3 (r - r_{in})^2 + C_4 (r - r_{in})^3 
-                       \qquad r_{in} < r < r_c
-\end{eqnarray*}                           
-
-\end{document}
-
-
diff --git a/doc/src/Eqs/pair_lj_smooth_linear.jpg b/doc/src/Eqs/pair_lj_smooth_linear.jpg
deleted file mode 100644
index b0626abae1..0000000000
Binary files a/doc/src/Eqs/pair_lj_smooth_linear.jpg and /dev/null differ
diff --git a/doc/src/Eqs/pair_lj_smooth_linear.tex b/doc/src/Eqs/pair_lj_smooth_linear.tex
deleted file mode 100644
index b8980f8d25..0000000000
--- a/doc/src/Eqs/pair_lj_smooth_linear.tex
+++ /dev/null
@@ -1,13 +0,0 @@
-\documentclass[12pt]{article}
-
-\begin{document}
-
-\begin{eqnarray*}
-\phi\left(r\right) & = & 4 \epsilon \left[ \left(\frac{\sigma}{r}\right)^{12} - 
-                       \left(\frac{\sigma}{r}\right)^6 \right] \\
-E\left(r\right) & = & \phi\left(r\right)  - \phi\left(R_c\right) - \left(r - R_c\right) \left.\frac{d\phi}{d r} \right|_{r=R_c}       \qquad r < R_c 
-\end{eqnarray*}                           
-
-\end{document}
-
-
diff --git a/doc/src/Eqs/pair_lj_soft.jpg b/doc/src/Eqs/pair_lj_soft.jpg
deleted file mode 100644
index 856d6d5bbc..0000000000
Binary files a/doc/src/Eqs/pair_lj_soft.jpg and /dev/null differ
diff --git a/doc/src/Eqs/pair_lj_soft.tex b/doc/src/Eqs/pair_lj_soft.tex
deleted file mode 100644
index e32f11f0aa..0000000000
--- a/doc/src/Eqs/pair_lj_soft.tex
+++ /dev/null
@@ -1,15 +0,0 @@
-\documentstyle[12pt]{article}
-
-\begin{document}
-
-\[
-E = \lambda^n 4 \epsilon
-\left\{
-  \frac{1}{ \left[ \alpha_{\mathrm{LJ}} (1-\lambda)^2 +
-    \left( \displaystyle\frac{r}{\sigma} \right)^6 \right]^2 } -
-  \frac{1}{ \alpha_{\mathrm{LJ}} (1-\lambda)^2 +
-    \left( \displaystyle\frac{r}{\sigma} \right)^6 }
-\right\} \qquad r < r_c
- \]
-
-\end{document}
diff --git a/doc/src/Eqs/pair_lj_switch3.jpg b/doc/src/Eqs/pair_lj_switch3.jpg
deleted file mode 100644
index a1f98ea2c2..0000000000
Binary files a/doc/src/Eqs/pair_lj_switch3.jpg and /dev/null differ
diff --git a/doc/src/Eqs/pair_lj_switch3.tex b/doc/src/Eqs/pair_lj_switch3.tex
deleted file mode 100644
index 29161fb2ef..0000000000
--- a/doc/src/Eqs/pair_lj_switch3.tex
+++ /dev/null
@@ -1,11 +0,0 @@
-\documentclass[12pt]{article}
-
-\begin{document}
-  \thispagestyle{empty}
-
-\begin{eqnarray*}
-  E = 4\epsilon \left[ \left(\frac{\sigma}{r}\right)^{12}-\left(\frac{\sigma}{r}\right)^{6} \right]
-% \qquad r < r_c \\
-\end{eqnarray*}
-
-\end{document}
diff --git a/doc/src/Eqs/pair_local_density_energy.jpg b/doc/src/Eqs/pair_local_density_energy.jpg
deleted file mode 100644
index 68e44ce9d9..0000000000
Binary files a/doc/src/Eqs/pair_local_density_energy.jpg and /dev/null differ
diff --git a/doc/src/Eqs/pair_local_density_energy.tex b/doc/src/Eqs/pair_local_density_energy.tex
deleted file mode 100644
index a77b513051..0000000000
--- a/doc/src/Eqs/pair_local_density_energy.tex
+++ /dev/null
@@ -1,11 +0,0 @@
-\documentclass[12pt]{article}
-
-\begin{document}
-
-$$
- U_{LD} = \sum_i F(\rho_i)
-$$
-
-
-\end{document}
-~                  
diff --git a/doc/src/Eqs/pair_local_density_energy_implement.jpg b/doc/src/Eqs/pair_local_density_energy_implement.jpg
deleted file mode 100644
index bd1f65d542..0000000000
Binary files a/doc/src/Eqs/pair_local_density_energy_implement.jpg and /dev/null differ
diff --git a/doc/src/Eqs/pair_local_density_energy_implement.tex b/doc/src/Eqs/pair_local_density_energy_implement.tex
deleted file mode 100644
index 4b1f1c3df2..0000000000
--- a/doc/src/Eqs/pair_local_density_energy_implement.tex
+++ /dev/null
@@ -1,9 +0,0 @@
-\documentclass[12pt]{article}
-
-\begin{document}
-
-$$
-U_{LD} = \sum_k U_{LD}^{(k)} = \sum_i \left[ \sum_k a_\alpha^{(k)} F^{(k)} \left(\rho_i^{(k)}\right) \right] 
-$$
-
-\end{document}
diff --git a/doc/src/Eqs/pair_local_density_energy_multi.jpg b/doc/src/Eqs/pair_local_density_energy_multi.jpg
deleted file mode 100644
index df9dbfa5c8..0000000000
Binary files a/doc/src/Eqs/pair_local_density_energy_multi.jpg and /dev/null differ
diff --git a/doc/src/Eqs/pair_local_density_energy_multi.tex b/doc/src/Eqs/pair_local_density_energy_multi.tex
deleted file mode 100644
index 4ca0b7e8b9..0000000000
--- a/doc/src/Eqs/pair_local_density_energy_multi.tex
+++ /dev/null
@@ -1,9 +0,0 @@
-\documentclass[12pt]{article}
-
-\begin{document}
-
-$$
-U_{LD} = \sum_i a_\alpha F(\rho_i)
-$$
-
-\end{document}
diff --git a/doc/src/Eqs/pair_local_density_indicator_func.jpg b/doc/src/Eqs/pair_local_density_indicator_func.jpg
deleted file mode 100644
index e038b2884d..0000000000
Binary files a/doc/src/Eqs/pair_local_density_indicator_func.jpg and /dev/null differ
diff --git a/doc/src/Eqs/pair_local_density_indicator_func.tex b/doc/src/Eqs/pair_local_density_indicator_func.tex
deleted file mode 100644
index aa595c96dc..0000000000
--- a/doc/src/Eqs/pair_local_density_indicator_func.tex
+++ /dev/null
@@ -1,16 +0,0 @@
-\documentclass[12pt]{article}
-\usepackage[utf8]{inputenc}
-\usepackage{amsmath}
-\usepackage{amsfonts}
-
-\begin{document}
-\[
-  \varphi(r) = 
-    \begin{cases}
-       1 & r \le R_1 \\
-       c_0 + c_2r^2 + c_4r^4 + c_6r^6  & r \in (R_1, R_2) \\
-       0 & r \ge R_2
-  \end{cases}
-\]
-
-\end{document}
diff --git a/doc/src/Eqs/pair_local_density_ld.jpg b/doc/src/Eqs/pair_local_density_ld.jpg
deleted file mode 100644
index 9e6a8e1b72..0000000000
Binary files a/doc/src/Eqs/pair_local_density_ld.jpg and /dev/null differ
diff --git a/doc/src/Eqs/pair_local_density_ld.tex b/doc/src/Eqs/pair_local_density_ld.tex
deleted file mode 100644
index 1affa67cd3..0000000000
--- a/doc/src/Eqs/pair_local_density_ld.tex
+++ /dev/null
@@ -1,10 +0,0 @@
-\documentclass[12pt]{article}
-
-\begin{document}
-
-
-$$
-\rho_i = \sum_{j \neq i} \varphi(r_{ij})
-$$
-
-\end{document}
diff --git a/doc/src/Eqs/pair_local_density_ld_implement.jpg b/doc/src/Eqs/pair_local_density_ld_implement.jpg
deleted file mode 100644
index e8b98125a2..0000000000
Binary files a/doc/src/Eqs/pair_local_density_ld_implement.jpg and /dev/null differ
diff --git a/doc/src/Eqs/pair_local_density_ld_implement.tex b/doc/src/Eqs/pair_local_density_ld_implement.tex
deleted file mode 100644
index 85ee8bad21..0000000000
--- a/doc/src/Eqs/pair_local_density_ld_implement.tex
+++ /dev/null
@@ -1,10 +0,0 @@
-\documentstyle[12pt]{article}
-
-\begin{document}
-
-
-$$
-\rho_i^{(k)} = \sum_j b_\beta^{(k)} \varphi^{(k)} (r_{ij})
-$$
-
-\end{document}
diff --git a/doc/src/Eqs/pair_local_density_ld_multi.jpg b/doc/src/Eqs/pair_local_density_ld_multi.jpg
deleted file mode 100644
index feef991d49..0000000000
Binary files a/doc/src/Eqs/pair_local_density_ld_multi.jpg and /dev/null differ
diff --git a/doc/src/Eqs/pair_local_density_ld_multi.tex b/doc/src/Eqs/pair_local_density_ld_multi.tex
deleted file mode 100644
index c441288c5d..0000000000
--- a/doc/src/Eqs/pair_local_density_ld_multi.tex
+++ /dev/null
@@ -1,10 +0,0 @@
-\documentclass[12pt]{article}
-
-\begin{document}
-
-
-$$
-\rho_i = \sum_{j \neq i} b_\beta \varphi(r_{ij})
-$$
-
-\end{document}
diff --git a/doc/src/Eqs/pair_lubricate.jpg b/doc/src/Eqs/pair_lubricate.jpg
deleted file mode 100644
index 560591765a..0000000000
Binary files a/doc/src/Eqs/pair_lubricate.jpg and /dev/null differ
diff --git a/doc/src/Eqs/pair_lubricate.tex b/doc/src/Eqs/pair_lubricate.tex
deleted file mode 100644
index c7e3dd96ed..0000000000
--- a/doc/src/Eqs/pair_lubricate.tex
+++ /dev/null
@@ -1,17 +0,0 @@
-\documentclass[12pt]{article}
-
-\begin{document}
-
-\begin{eqnarray*}
-   W & = & - a_{sq} | (v_1 - v_2) \bullet \mathbf{nn} |^2 - 
-   a_{sh} | (\omega_1 + \omega_2) \bullet 
-   (\mathbf{I} - \mathbf{nn}) - 2 \Omega_N |^2 - \\
-   & & a_{pu} | (\omega_1 - \omega_2) \bullet (\mathbf{I} - \mathbf{nn}) |^2 -
-   a_{tw} | (\omega_1 - \omega_2) \bullet \mathbf{nn} |^2  \qquad r < r_c
-\end{eqnarray*}
-
-$$
-\Omega_N = \mathbf{n} \times (v_1 - v_2) / r
-$$
-
-\end{document}
diff --git a/doc/src/Eqs/pair_mdf-1.jpg b/doc/src/Eqs/pair_mdf-1.jpg
deleted file mode 100644
index fb0d9d644f..0000000000
Binary files a/doc/src/Eqs/pair_mdf-1.jpg and /dev/null differ
diff --git a/doc/src/Eqs/pair_mdf-1.tex b/doc/src/Eqs/pair_mdf-1.tex
deleted file mode 100644
index f3e6f36bcf..0000000000
--- a/doc/src/Eqs/pair_mdf-1.tex
+++ /dev/null
@@ -1,9 +0,0 @@
-\documentclass[12pt]{article}
-
-\begin{document}
-
-$$
-   E_{smooth}(r) = E(r)*f(r)
-$$
-
-\end{document}
diff --git a/doc/src/Eqs/pair_mdf-2.jpg b/doc/src/Eqs/pair_mdf-2.jpg
deleted file mode 100644
index ae6358e5cc..0000000000
Binary files a/doc/src/Eqs/pair_mdf-2.jpg and /dev/null differ
diff --git a/doc/src/Eqs/pair_mdf-2.tex b/doc/src/Eqs/pair_mdf-2.tex
deleted file mode 100644
index 9bb3be16c0..0000000000
--- a/doc/src/Eqs/pair_mdf-2.tex
+++ /dev/null
@@ -1,13 +0,0 @@
-\documentclass[12pt]{article}
-
-\begin{document}
-
-$$
-\begin{array}{lcl}
-f(r) = 1.0 &\mathrm{for}& r < r_m \\
-f(r) = (1 - x)^3*(1+3x+6x^2) &\mathrm{for}& r_m < r < r_{cut} \\
-f(r) = 0.0 &\mathrm{for}& r >= r_{cut} \\
-\end{array}
-$$
-
-\end{document}
diff --git a/doc/src/Eqs/pair_mdf-3.jpg b/doc/src/Eqs/pair_mdf-3.jpg
deleted file mode 100644
index 45a1a68e05..0000000000
Binary files a/doc/src/Eqs/pair_mdf-3.jpg and /dev/null differ
diff --git a/doc/src/Eqs/pair_mdf-3.tex b/doc/src/Eqs/pair_mdf-3.tex
deleted file mode 100644
index 6ba1444466..0000000000
--- a/doc/src/Eqs/pair_mdf-3.tex
+++ /dev/null
@@ -1,9 +0,0 @@
-\documentclass[12pt]{article}
-
-\begin{document}
-
-$$
-   x = \frac{(r-r_m)}{(r_{cut}-r_m)}
-$$
-
-\end{document}
diff --git a/doc/src/Eqs/pair_mdf-4.jpg b/doc/src/Eqs/pair_mdf-4.jpg
deleted file mode 100644
index 05d08c01a0..0000000000
Binary files a/doc/src/Eqs/pair_mdf-4.jpg and /dev/null differ
diff --git a/doc/src/Eqs/pair_mdf-4.tex b/doc/src/Eqs/pair_mdf-4.tex
deleted file mode 100644
index 948be2e40f..0000000000
--- a/doc/src/Eqs/pair_mdf-4.tex
+++ /dev/null
@@ -1,9 +0,0 @@
-\documentclass[12pt]{article}
-
-\begin{document}
-
-$$
-   E(r) = 4\epsilon\Big[\Big(\frac{\sigma}{r}\Big)^{12} - \Big(\frac{\sigma}{r}\Big)^6\Big]
-$$
-
-\end{document}
diff --git a/doc/src/Eqs/pair_mdf-5.jpg b/doc/src/Eqs/pair_mdf-5.jpg
deleted file mode 100644
index 9e047a50a8..0000000000
Binary files a/doc/src/Eqs/pair_mdf-5.jpg and /dev/null differ
diff --git a/doc/src/Eqs/pair_mdf-5.tex b/doc/src/Eqs/pair_mdf-5.tex
deleted file mode 100644
index 9b6a28c9d9..0000000000
--- a/doc/src/Eqs/pair_mdf-5.tex
+++ /dev/null
@@ -1,9 +0,0 @@
-\documentclass[12pt]{article}
-
-\begin{document}
-
-$$
-   E(r) = A e^{(-r/\rho)} -\frac{C}{r^6}
-$$
-
-\end{document}
diff --git a/doc/src/Eqs/pair_mdf-6.jpg b/doc/src/Eqs/pair_mdf-6.jpg
deleted file mode 100644
index 60bd7e3a9e..0000000000
Binary files a/doc/src/Eqs/pair_mdf-6.jpg and /dev/null differ
diff --git a/doc/src/Eqs/pair_mdf-6.tex b/doc/src/Eqs/pair_mdf-6.tex
deleted file mode 100644
index b80f6f69b5..0000000000
--- a/doc/src/Eqs/pair_mdf-6.tex
+++ /dev/null
@@ -1,9 +0,0 @@
-\documentclass[12pt]{article}
-\pagestyle{empty}
-\begin{document}
-
-$$
-   E(r) = \frac{A}{r^{12}} - \frac{B}{r^{6}}
-$$
-
-\end{document}
diff --git a/doc/src/Eqs/pair_mdpd_force.jpg b/doc/src/Eqs/pair_mdpd_force.jpg
deleted file mode 100644
index 9b0e573b79..0000000000
Binary files a/doc/src/Eqs/pair_mdpd_force.jpg and /dev/null differ
diff --git a/doc/src/Eqs/pair_mdpd_force.tex b/doc/src/Eqs/pair_mdpd_force.tex
deleted file mode 100644
index b5c8d9be4a..0000000000
--- a/doc/src/Eqs/pair_mdpd_force.tex
+++ /dev/null
@@ -1,17 +0,0 @@
-\documentclass[12pt]{article}
-
-\begin{document}
-
-$$
-  \mathbf{F}_{ij}^C = Aw_c(r_{ij})\mathbf{e}_{ij} + B(\rho_i+\rho_j)w_d(r_{ij})\mathbf{e}_{ij},
-$$
-
-$$
-  \mathbf{F}_{ij}^{D} = -\gamma {\omega_{D}}(r_{ij})(\mathbf{e}_{ij} \cdot \mathbf{v}_{ij})\mathbf{e}_{ij},
-$$
-
-$$
-  \mathbf{F}_{ij}^{R} = \sigma {\omega_{R}}(r_{ij}){\xi_{ij}}\Delta t^{-1/2} \mathbf{e}_{ij},
-$$
-
-\end{document}
diff --git a/doc/src/Eqs/pair_meam.jpg b/doc/src/Eqs/pair_meam.jpg
deleted file mode 100644
index f6de50a998..0000000000
Binary files a/doc/src/Eqs/pair_meam.jpg and /dev/null differ
diff --git a/doc/src/Eqs/pair_meam.tex b/doc/src/Eqs/pair_meam.tex
deleted file mode 100644
index cb9bb1702e..0000000000
--- a/doc/src/Eqs/pair_meam.tex
+++ /dev/null
@@ -1,10 +0,0 @@
-\documentclass[12pt]{article}
-
-\begin{document}
-
-$$
-  E = \sum_i \left\{ F_i(\bar{\rho}_i)
-      + \frac{1}{2} \sum_{i \neq j} \phi_{ij} (r_{ij}) \right\}
-$$
-
-\end{document}
\ No newline at end of file
diff --git a/doc/src/Eqs/pair_meam_spline.jpg b/doc/src/Eqs/pair_meam_spline.jpg
deleted file mode 100644
index fd396d75bc..0000000000
Binary files a/doc/src/Eqs/pair_meam_spline.jpg and /dev/null differ
diff --git a/doc/src/Eqs/pair_meam_spline.tex b/doc/src/Eqs/pair_meam_spline.tex
deleted file mode 100644
index b4f58381a4..0000000000
--- a/doc/src/Eqs/pair_meam_spline.tex
+++ /dev/null
@@ -1,14 +0,0 @@
-\documentclass[12pt]{article}
-\usepackage{amsmath}
-
-\begin{document}
-
-$$
-   E=\sum_{i<j}\phi(r_{ij})+\sum_{i}U(n_{i}),
-$$
-
-$$
-   n_{i}=\sum_{j}\rho(r_{ij})+\sum_{\substack{j<k,\\j,k\neq i}}f(r_{ij})f(r_{ik})g[\cos(\theta_{jik})]
-$$
-
-\end{document}
diff --git a/doc/src/Eqs/pair_meam_spline_multicomponent.jpg b/doc/src/Eqs/pair_meam_spline_multicomponent.jpg
deleted file mode 100644
index 3323284005..0000000000
Binary files a/doc/src/Eqs/pair_meam_spline_multicomponent.jpg and /dev/null differ
diff --git a/doc/src/Eqs/pair_meam_spline_multicomponent.tex b/doc/src/Eqs/pair_meam_spline_multicomponent.tex
deleted file mode 100644
index 31de1eee25..0000000000
--- a/doc/src/Eqs/pair_meam_spline_multicomponent.tex
+++ /dev/null
@@ -1,14 +0,0 @@
-\documentclass[12pt]{article}
-\usepackage{amsmath}
-
-\begin{document}
-
-$$
-   E=\sum_{i<j}\phi_{ij}(r_{ij})+\sum_{i}U_i(n_{i}),
-$$
-
-$$
-   n_{i}=\sum_{j\ne i}\rho_j(r_{ij})+\sum_{\substack{j<k,\\j,k\neq i}}f_{j}(r_{ij})f_{k}(r_{ik})g_{jk}[\cos(\theta_{jik})]
-$$
-
-\end{document}
diff --git a/doc/src/Eqs/pair_meam_sw_spline.jpg b/doc/src/Eqs/pair_meam_sw_spline.jpg
deleted file mode 100644
index 80078999d7..0000000000
Binary files a/doc/src/Eqs/pair_meam_sw_spline.jpg and /dev/null differ
diff --git a/doc/src/Eqs/pair_meam_sw_spline.tex b/doc/src/Eqs/pair_meam_sw_spline.tex
deleted file mode 100644
index 28abc433b5..0000000000
--- a/doc/src/Eqs/pair_meam_sw_spline.tex
+++ /dev/null
@@ -1,23 +0,0 @@
-\documentclass[showpacs,amsmath,amssymb,prb]{revtex4}
-
-
-\usepackage{graphicx}
-\usepackage{dcolumn}
-\usepackage{bm}
-
-\newcommand{\etal}{{\em et al.}}
-\newcommand{\OO}{{\mathcal{O}}}
-\newtheorem{theorem}{Theorem}
-
-\begin{document}
-
-\begin{eqnarray}
-E & = & E_{MEAM} + E_{SW} \nonumber \\
-E_{MEAM} & = & \sum _{IJ} \phi (r_{IJ}) + \sum _{I} U(\rho _I) \nonumber \\
-E_{SW} & = & \sum _{I} \sum _{JK} F(r_{IJ}) \, F(r_{IK}) \, G(\cos(\theta _{JIK})) \nonumber \\
-\rho _I & = & \sum _J \rho(r_{IJ}) + \sum _{JK} f(r_{IJ}) \, f(r_{IK}) \, g(\cos(\theta _{JIK})) \nonumber
-\end{eqnarray}
-
-\end{document}
-
-
diff --git a/doc/src/Eqs/pair_mgpt.jpg b/doc/src/Eqs/pair_mgpt.jpg
deleted file mode 100644
index 2bede7f90f..0000000000
Binary files a/doc/src/Eqs/pair_mgpt.jpg and /dev/null differ
diff --git a/doc/src/Eqs/pair_mgpt.tex b/doc/src/Eqs/pair_mgpt.tex
deleted file mode 100644
index 9c314df916..0000000000
--- a/doc/src/Eqs/pair_mgpt.tex
+++ /dev/null
@@ -1,12 +0,0 @@
-\documentclass[12pt]{article}
-
-\begin{document}
-
-$$
-   E_{\rm tot}({\bf R}_1 \ldots {\bf R}_N) = NE_{\rm vol}(\Omega ) 
-   + \frac{1}{2} \sum _{i,j} \mbox{}^\prime \ v_2(ij;\Omega ) 
-   + \frac{1}{6} \sum _{i,j,k} \mbox{}^\prime \ v_3(ijk;\Omega ) 
-   + \frac{1}{24} \sum _{i,j,k,l} \mbox{}^\prime \ v_4(ijkl;\Omega )
-$$
-
-\end{document}
diff --git a/doc/src/Eqs/pair_mie.jpg b/doc/src/Eqs/pair_mie.jpg
deleted file mode 100644
index 05a8221a93..0000000000
Binary files a/doc/src/Eqs/pair_mie.jpg and /dev/null differ
diff --git a/doc/src/Eqs/pair_mie.tex b/doc/src/Eqs/pair_mie.tex
deleted file mode 100644
index 2702ce9bcf..0000000000
--- a/doc/src/Eqs/pair_mie.tex
+++ /dev/null
@@ -1,10 +0,0 @@
-\documentstyle[12pt]{article}
-
-\begin{document}
-
-$$
- E =  C \epsilon \left[ \left(\frac{\sigma}{r}\right)^{\gamma_{rep}} - \left(\frac{\sigma}{r}\right)^{\gamma_{att}} \right]
-                       \qquad r < r_c
-$$
-
-\end{document}
diff --git a/doc/src/Eqs/pair_mie2.jpg b/doc/src/Eqs/pair_mie2.jpg
deleted file mode 100644
index 216ca1554a..0000000000
Binary files a/doc/src/Eqs/pair_mie2.jpg and /dev/null differ
diff --git a/doc/src/Eqs/pair_mie2.tex b/doc/src/Eqs/pair_mie2.tex
deleted file mode 100644
index 2ee9e9b34e..0000000000
--- a/doc/src/Eqs/pair_mie2.tex
+++ /dev/null
@@ -1,9 +0,0 @@
-\documentstyle[12pt]{article}
-
-\begin{document}
-
-$$
- C = \left(\frac{\gamma_{rep}}{\gamma_{rep}-\gamma_{att}}\right) \left(\frac{\gamma_{rep}}{\gamma_{att}}\right)^{\left(\frac{\gamma_{att}}{\gamma_{rep}-\gamma_{att}}\right)}
-$$
-
-\end{document}
diff --git a/doc/src/Eqs/pair_mm3_switch3.jpg b/doc/src/Eqs/pair_mm3_switch3.jpg
deleted file mode 100644
index 5d662584a7..0000000000
Binary files a/doc/src/Eqs/pair_mm3_switch3.jpg and /dev/null differ
diff --git a/doc/src/Eqs/pair_mm3_switch3.tex b/doc/src/Eqs/pair_mm3_switch3.tex
deleted file mode 100644
index a80278cce2..0000000000
--- a/doc/src/Eqs/pair_mm3_switch3.tex
+++ /dev/null
@@ -1,11 +0,0 @@
-\documentclass[12pt]{article}
-
-\begin{document}
-  \thispagestyle{empty}
-\begin{eqnarray*}
-  E &=& \epsilon_{ij} \left[ -2.25 \left(\frac{r_{v,ij}}{r_{ij}}\right)^6 + 1.84(10)^5 \exp\left[-12.0 r_{ij}/r_{v,ij}\right] \right] S_3(r_{ij}) \\
-  r_{v,ij} &=& r_{v,i} + r_{v,j} \\ 
-  \epsilon_{ij} &=& \sqrt{\epsilon_i \epsilon_j}
-\end{eqnarray*}
-
-\end{document}
diff --git a/doc/src/Eqs/pair_momb.jpg b/doc/src/Eqs/pair_momb.jpg
deleted file mode 100644
index 1e994c6e0f..0000000000
Binary files a/doc/src/Eqs/pair_momb.jpg and /dev/null differ
diff --git a/doc/src/Eqs/pair_momb.tex b/doc/src/Eqs/pair_momb.tex
deleted file mode 100644
index 4c66e3ce77..0000000000
--- a/doc/src/Eqs/pair_momb.tex
+++ /dev/null
@@ -1,13 +0,0 @@
-\documentclass[12pt,fleqn]{article}
-\usepackage{amsmath}
-\thispagestyle{empty}
-
-\begin{document}
-
-\setlength{\jot}{2ex}
-\begin{gather*}
-  E = D_0 [\exp^{-2 \alpha (r-r_0)} - 2\exp^{-\alpha (r-r_0)}] - s_6 \frac{C_6}{r^6} f_{damp}(r,R_r) \\
-  f_{damp}(r,R_r) = \frac{1}{1 + \exp^{-d(r/R_r - 1)}}
-\end{gather*}
-
-\end{document}
\ No newline at end of file
diff --git a/doc/src/Eqs/pair_morse.jpg b/doc/src/Eqs/pair_morse.jpg
deleted file mode 100644
index 5ebcdb2e1d..0000000000
Binary files a/doc/src/Eqs/pair_morse.jpg and /dev/null differ
diff --git a/doc/src/Eqs/pair_morse.tex b/doc/src/Eqs/pair_morse.tex
deleted file mode 100644
index 21204daa20..0000000000
--- a/doc/src/Eqs/pair_morse.tex
+++ /dev/null
@@ -1,10 +0,0 @@
-\documentclass[12pt]{article}
-
-\begin{document}
-
-$$
-   E = D_0 \left[ e^{- 2 \alpha (r - r_0)} - 2 e^{- \alpha (r - r_0)} \right]
-       \qquad r < r_c
-$$
-
-\end{document}
\ No newline at end of file
diff --git a/doc/src/Eqs/pair_morse_smooth_linear.jpg b/doc/src/Eqs/pair_morse_smooth_linear.jpg
deleted file mode 100644
index b951023609..0000000000
Binary files a/doc/src/Eqs/pair_morse_smooth_linear.jpg and /dev/null differ
diff --git a/doc/src/Eqs/pair_morse_smooth_linear.tex b/doc/src/Eqs/pair_morse_smooth_linear.tex
deleted file mode 100644
index f021d018f5..0000000000
--- a/doc/src/Eqs/pair_morse_smooth_linear.tex
+++ /dev/null
@@ -1,13 +0,0 @@
-\documentclass[12pt]{article}
-\pagestyle{empty}
-
-\begin{document}
-
-\begin{eqnarray*}
-\phi\left(r\right) & = &  D_0 \left[ e^{- 2 \alpha (r - r_0)} - 2 e^{- \alpha (r - r_0)} \right] \qquad r < r_c \\
-E\left(r\right) & = & \phi\left(r\right)  - \phi\left(R_c\right) - \left(r - R_c\right) \left.\frac{d\phi}{d r} \right|_{r=R_c}       \qquad r < R_c 
-\end{eqnarray*}                           
-
-\end{document}
-
-
diff --git a/doc/src/Eqs/pair_morse_soft.jpg b/doc/src/Eqs/pair_morse_soft.jpg
deleted file mode 100644
index 9c8321eba7..0000000000
Binary files a/doc/src/Eqs/pair_morse_soft.jpg and /dev/null differ
diff --git a/doc/src/Eqs/pair_morse_soft.tex b/doc/src/Eqs/pair_morse_soft.tex
deleted file mode 100644
index 5e724077e8..0000000000
--- a/doc/src/Eqs/pair_morse_soft.tex
+++ /dev/null
@@ -1,13 +0,0 @@
-\documentclass[12pt]{article}
-\usepackage{amsmath}
-
-\begin{document}
-
-
-\begin{align*}
- s(\lambda) =& (1 - \lambda) / (1 - \lambda_f), \qquad B = -2D e^{-2 \alpha r_0} (e^{\alpha r_0} - 1) / 3 \\
-  E =& D_0 \left[ e^{- 2 \alpha (r - r_0)} - 2 e^{- \alpha (r - r_0)} \right] +  s(\lambda) B e^{-3\alpha(r-r_0)}, \qquad \hspace{2.85em}\lambda \geq \lambda_f,\quad r < r_c \\
-  E =& \left( D_0 \left[ e^{- 2 \alpha (r - r_0)} - 2 e^{- \alpha (r - r_0)} \right] + B e^{-3\alpha(r-r_0)} \right)(\lambda/\lambda_f)^n, \qquad \lambda < \lambda_f,\quad r < r_c
-\end{align*}
-
-\end{document}
diff --git a/doc/src/Eqs/pair_multi_lucy.jpg b/doc/src/Eqs/pair_multi_lucy.jpg
deleted file mode 100644
index b73cc69236..0000000000
Binary files a/doc/src/Eqs/pair_multi_lucy.jpg and /dev/null differ
diff --git a/doc/src/Eqs/pair_multi_lucy.tex b/doc/src/Eqs/pair_multi_lucy.tex
deleted file mode 100644
index 7c310ab88b..0000000000
--- a/doc/src/Eqs/pair_multi_lucy.tex
+++ /dev/null
@@ -1,10 +0,0 @@
-\documentstyle[12pt]{article}
-
-\begin{document}
-
-$$
- F_{i}^{DD}(\rho_i,\rho_j,r_{ij}) = \frac{1}{2} \omega_{DD}\left(r_{ij}\right) 
-                       \left[A\left(\rho_i\right) + A\left(\rho_j\right)\right]e_{ij} 
-$$
-
-\end{document}
diff --git a/doc/src/Eqs/pair_multi_lucy2.jpg b/doc/src/Eqs/pair_multi_lucy2.jpg
deleted file mode 100644
index 2edf0b56fd..0000000000
Binary files a/doc/src/Eqs/pair_multi_lucy2.jpg and /dev/null differ
diff --git a/doc/src/Eqs/pair_multi_lucy2.tex b/doc/src/Eqs/pair_multi_lucy2.tex
deleted file mode 100644
index 0bd682ac90..0000000000
--- a/doc/src/Eqs/pair_multi_lucy2.tex
+++ /dev/null
@@ -1,9 +0,0 @@
-\documentstyle[12pt]{article}
-
-\begin{document}
-
-$$
- \omega_{DD}\left(r_{ij}\right) = \left(1+\frac{3r_{ij}}{r_{cut}}\right)\left(1+\frac{r_{ij}}{r_{cut}}\right)^3
-$$
-
-\end{document}
diff --git a/doc/src/Eqs/pair_multi_lucy_energy.jpg b/doc/src/Eqs/pair_multi_lucy_energy.jpg
deleted file mode 100644
index 4cd5251b6e..0000000000
Binary files a/doc/src/Eqs/pair_multi_lucy_energy.jpg and /dev/null differ
diff --git a/doc/src/Eqs/pair_multi_lucy_energy.tex b/doc/src/Eqs/pair_multi_lucy_energy.tex
deleted file mode 100644
index a4ec0b7c11..0000000000
--- a/doc/src/Eqs/pair_multi_lucy_energy.tex
+++ /dev/null
@@ -1,9 +0,0 @@
-\documentstyle[12pt]{article}
-
-\begin{document}
-
-$$
- u_{i}^{DD}\left(\rho_{i}\right) = \frac{\pi r_{cut}^4}{84} \int_{\rho_0}^{\rho_i} A\left(\rho^{'}\right) d\rho^{'}
-$$
-
-\end{document}
diff --git a/doc/src/Eqs/pair_nb3b_harmonic.jpg b/doc/src/Eqs/pair_nb3b_harmonic.jpg
deleted file mode 100644
index c8d23da042..0000000000
Binary files a/doc/src/Eqs/pair_nb3b_harmonic.jpg and /dev/null differ
diff --git a/doc/src/Eqs/pair_nb3b_harmonic.tex b/doc/src/Eqs/pair_nb3b_harmonic.tex
deleted file mode 100644
index 7f7aa8078e..0000000000
--- a/doc/src/Eqs/pair_nb3b_harmonic.tex
+++ /dev/null
@@ -1,9 +0,0 @@
-\documentclass[12pt]{article}
-
-\begin{document}
-
-$$
-   E = K (\theta - \theta_0)^2 
-$$
-
-\end{document}
diff --git a/doc/src/Eqs/pair_nm.jpg b/doc/src/Eqs/pair_nm.jpg
deleted file mode 100644
index 1e7fe0981c..0000000000
Binary files a/doc/src/Eqs/pair_nm.jpg and /dev/null differ
diff --git a/doc/src/Eqs/pair_nm.tex b/doc/src/Eqs/pair_nm.tex
deleted file mode 100644
index 4adf9331cc..0000000000
--- a/doc/src/Eqs/pair_nm.tex
+++ /dev/null
@@ -1,10 +0,0 @@
-\documentstyle[12pt]{article}
-
-\begin{document}
-
-$$
- E = \frac{E_0}{(n-m)} \left[ m \left(\frac{r_0}{r}\right)^n - 
-   n \left(\frac{r_0}{r}\right)^m \right] \qquad r < r_c
-$$
-
-\end{document}
diff --git a/doc/src/Eqs/pair_resquared.jpg b/doc/src/Eqs/pair_resquared.jpg
deleted file mode 100644
index c290c68dfd..0000000000
Binary files a/doc/src/Eqs/pair_resquared.jpg and /dev/null differ
diff --git a/doc/src/Eqs/pair_resquared.tex b/doc/src/Eqs/pair_resquared.tex
deleted file mode 100755
index e5c758aec0..0000000000
--- a/doc/src/Eqs/pair_resquared.tex
+++ /dev/null
@@ -1,7 +0,0 @@
-\documentstyle[12pt]{article}
-
-\begin{document}
-
-$$ A_{12} = 4\pi^2\epsilon_{\mathrm{LJ}}(\rho\sigma^3)^2 $$
-
-\end{document}
diff --git a/doc/src/Eqs/pair_resquared2.jpg b/doc/src/Eqs/pair_resquared2.jpg
deleted file mode 100644
index d2ed21a62a..0000000000
Binary files a/doc/src/Eqs/pair_resquared2.jpg and /dev/null differ
diff --git a/doc/src/Eqs/pair_resquared2.tex b/doc/src/Eqs/pair_resquared2.tex
deleted file mode 100755
index ff2c3ca749..0000000000
--- a/doc/src/Eqs/pair_resquared2.tex
+++ /dev/null
@@ -1,7 +0,0 @@
-\documentstyle[12pt]{article}
-
-\begin{document}
-
-$$ A_{12} = 4\pi^2\epsilon_{\mathrm{LJ}}(\rho\sigma^3) $$
-
-\end{document}
diff --git a/doc/src/Eqs/pair_resquared3.jpg b/doc/src/Eqs/pair_resquared3.jpg
deleted file mode 100644
index 3916062a1c..0000000000
Binary files a/doc/src/Eqs/pair_resquared3.jpg and /dev/null differ
diff --git a/doc/src/Eqs/pair_resquared3.tex b/doc/src/Eqs/pair_resquared3.tex
deleted file mode 100755
index 136bcf73dc..0000000000
--- a/doc/src/Eqs/pair_resquared3.tex
+++ /dev/null
@@ -1,7 +0,0 @@
-\documentstyle[12pt]{article}
-
-\begin{document}
-
-$$ A_{12} = \epsilon_{\mathrm{LJ}} $$
-
-\end{document}
diff --git a/doc/src/Eqs/pair_resquared4.jpg b/doc/src/Eqs/pair_resquared4.jpg
deleted file mode 100644
index 79ad067fa7..0000000000
Binary files a/doc/src/Eqs/pair_resquared4.jpg and /dev/null differ
diff --git a/doc/src/Eqs/pair_resquared4.tex b/doc/src/Eqs/pair_resquared4.tex
deleted file mode 100755
index 6efb755774..0000000000
--- a/doc/src/Eqs/pair_resquared4.tex
+++ /dev/null
@@ -1,9 +0,0 @@
-\documentstyle[12pt]{article}
-
-\begin{document}
-
-$$ \epsilon_a = \sigma \cdot { \frac{a}{ b \cdot c } }; \epsilon_b =
-\sigma \cdot { \frac{b}{ a \cdot c } }; \epsilon_c = \sigma \cdot {
-\frac{c}{ a \cdot b } } $$
-
-\end{document}
diff --git a/doc/src/Eqs/pair_smtbq1.jpg b/doc/src/Eqs/pair_smtbq1.jpg
deleted file mode 100644
index 6bfb07b778..0000000000
Binary files a/doc/src/Eqs/pair_smtbq1.jpg and /dev/null differ
diff --git a/doc/src/Eqs/pair_smtbq1.tex b/doc/src/Eqs/pair_smtbq1.tex
deleted file mode 100755
index 21ae0e9a49..0000000000
--- a/doc/src/Eqs/pair_smtbq1.tex
+++ /dev/null
@@ -1,13 +0,0 @@
-\documentclass[12pt]{article}
-
-\begin{document}
-
-\begin{eqnarray*}
-E_{tot} & = & E_{ES} + E_{OO} + E_{MO} \\
-E_{ES} & = & \sum_i{\Big[ \chi_{i}^{0}Q_i + \frac{1}{2}J_{i}^{0}Q_{i}^{2} +
- \frac{1}{2} \sum_{j\neq i}{ J_{ij}(r_{ij})f_{cut}^{R_{coul}}(r_{ij})Q_i Q_j } \Big] } \\
-E_{OO} & = & \sum_{i,j}^{i,j = O}{\Bigg[Cexp( -\frac{r_{ij}}{\rho} ) - Df_{cut}^{r_1^{OO}r_2^{OO}}(r_{ij}) exp(Br_{ij})\Bigg]}  \\
-E_{MO} & = & \sum_i{E_{cov}^{i} + \sum_{j\neq i}{ Af_{cut}^{r_{c1}r_{c2}}(r_{ij})exp\Big[-p(\frac{r_{ij}}{r_0} -1) \Big] } }  \\
-\end{eqnarray*}
-
-\end{document}
\ No newline at end of file
diff --git a/doc/src/Eqs/pair_smtbq2.jpg b/doc/src/Eqs/pair_smtbq2.jpg
deleted file mode 100644
index 0e20248788..0000000000
Binary files a/doc/src/Eqs/pair_smtbq2.jpg and /dev/null differ
diff --git a/doc/src/Eqs/pair_smtbq2.tex b/doc/src/Eqs/pair_smtbq2.tex
deleted file mode 100755
index 8524c2586c..0000000000
--- a/doc/src/Eqs/pair_smtbq2.tex
+++ /dev/null
@@ -1,12 +0,0 @@
-\documentclass[12pt]{article}
-
-\begin{document}
-
-\begin{eqnarray*}
-E_{cov}^{i(i=M,O)} & = & - \Bigg\{\eta_i(\mu \xi^{0})^2 f_{cut}^{r_{c1}r_{c2}}(r_{ij})
-\Bigg( \sum_{j(j=O,M)}{ exp[ -2q(\frac{r_{ij}}{r_0} - 1)] } \Bigg) 
-\delta Q_i \Big( 2\frac{n_0}{\eta_i} - \delta Q_i \Big) \Bigg\}^{1/2} \\
-\delta Q_i & = & | Q_i^{F} | - | Q_i |
-\end{eqnarray*}
-
-\end{document}
\ No newline at end of file
diff --git a/doc/src/Eqs/pair_smtbq3.jpg b/doc/src/Eqs/pair_smtbq3.jpg
deleted file mode 100644
index 1d60459165..0000000000
Binary files a/doc/src/Eqs/pair_smtbq3.jpg and /dev/null differ
diff --git a/doc/src/Eqs/pair_smtbq3.tex b/doc/src/Eqs/pair_smtbq3.tex
deleted file mode 100755
index 5bc6e465d1..0000000000
--- a/doc/src/Eqs/pair_smtbq3.tex
+++ /dev/null
@@ -1,10 +0,0 @@
-\documentclass[12pt]{article}
-
-\begin{document}
-
-\begin{eqnarray*}
-\xi^0 & = & \frac{\xi_O}{m} = \frac{\xi_C}{n} \\
-\frac{\beta_O}{\sqrt{m}} & = & \frac{\beta_C}{\sqrt{n}} = \xi^0 \frac{\sqrt{m}+\sqrt{n}}{2}\\
-\end{eqnarray*}
-
-\end{document}
\ No newline at end of file
diff --git a/doc/src/Eqs/pair_snap.jpg b/doc/src/Eqs/pair_snap.jpg
deleted file mode 100644
index af48357b5e..0000000000
Binary files a/doc/src/Eqs/pair_snap.jpg and /dev/null differ
diff --git a/doc/src/Eqs/pair_snap.tex b/doc/src/Eqs/pair_snap.tex
deleted file mode 100644
index d0a17de1fb..0000000000
--- a/doc/src/Eqs/pair_snap.tex
+++ /dev/null
@@ -1,9 +0,0 @@
-\documentclass[12pt]{article}
-
-\begin{document}
-
-$$
-E^i_{SNAP}(B_1^i,...,B_K^i) = \beta^{\alpha_i}_0 + \sum_{k=1}^K \beta_k^{\alpha_i} B_k^i
-$$
-
-\end{document}
\ No newline at end of file
diff --git a/doc/src/Eqs/pair_soft.jpg b/doc/src/Eqs/pair_soft.jpg
deleted file mode 100644
index e8a654e1ed..0000000000
Binary files a/doc/src/Eqs/pair_soft.jpg and /dev/null differ
diff --git a/doc/src/Eqs/pair_soft.tex b/doc/src/Eqs/pair_soft.tex
deleted file mode 100644
index c2db15c2ee..0000000000
--- a/doc/src/Eqs/pair_soft.tex
+++ /dev/null
@@ -1,10 +0,0 @@
-\documentclass[12pt]{article}
-
-\begin{document}
-
-$$
-   E = A \left[ 1 + \cos\left(\frac{\pi r}{r_c}\right) \right]
-   \qquad r < r_c
-$$
-
-\end{document}
\ No newline at end of file
diff --git a/doc/src/Eqs/pair_sph_ideal.jpg b/doc/src/Eqs/pair_sph_ideal.jpg
deleted file mode 100644
index 370b75fe94..0000000000
Binary files a/doc/src/Eqs/pair_sph_ideal.jpg and /dev/null differ
diff --git a/doc/src/Eqs/pair_sph_ideal.tex b/doc/src/Eqs/pair_sph_ideal.tex
deleted file mode 100644
index 91c64f00bc..0000000000
--- a/doc/src/Eqs/pair_sph_ideal.tex
+++ /dev/null
@@ -1,9 +0,0 @@
-\documentclass[12pt]{article}
-
-\begin{document}
-
-$$
-  p = (\gamma - 1) \rho e
-$$
-
-\end{document}
diff --git a/doc/src/Eqs/pair_sph_tait.jpg b/doc/src/Eqs/pair_sph_tait.jpg
deleted file mode 100644
index 8bbfe80512..0000000000
Binary files a/doc/src/Eqs/pair_sph_tait.jpg and /dev/null differ
diff --git a/doc/src/Eqs/pair_sph_tait.tex b/doc/src/Eqs/pair_sph_tait.tex
deleted file mode 100644
index 4e1fa9cfed..0000000000
--- a/doc/src/Eqs/pair_sph_tait.tex
+++ /dev/null
@@ -1,9 +0,0 @@
-\documentclass[12pt]{article}
-
-\begin{document}
-
-$$
-  p = B [(\frac{\rho}{\rho_0})^{\gamma} - 1]
-$$
-
-\end{document}
diff --git a/doc/src/Eqs/pair_spin_dipole.jpg b/doc/src/Eqs/pair_spin_dipole.jpg
deleted file mode 100644
index e648547ec3..0000000000
Binary files a/doc/src/Eqs/pair_spin_dipole.jpg and /dev/null differ
diff --git a/doc/src/Eqs/pair_spin_dipole.tex b/doc/src/Eqs/pair_spin_dipole.tex
deleted file mode 100644
index 27f0bc4d2d..0000000000
--- a/doc/src/Eqs/pair_spin_dipole.tex
+++ /dev/null
@@ -1,42 +0,0 @@
-\documentclass[preview]{standalone}
-\usepackage{varwidth}
-\usepackage[utf8x]{inputenc}
-\usepackage{amsmath,amssymb,graphics,bm,setspace}
-
-\begin{document}
-\begin{varwidth}{50in}
-  \begin{equation}
-    \mathcal{H}_{\rm long}= 
-    -\frac{\mu_{0} \left( \mu_B\right)^2}{4\pi} 
-    \sum_{i,j,i\neq j}^{N}
-    \frac{g_i g_j}{r_{ij}^3}
-    \Big(3 
-    \left(\bm{e}_{ij}\cdot \bm{s}_{i}\right) 
-    \left(\bm{e}_{ij}\cdot \bm{s}_{j}\right) 
-    -\bm{s}_i\cdot\bm{s}_j \Big)
-    \nonumber
-  \end{equation}
-  \begin{equation}
-    \bm{\omega}_i = 
-    \frac{\mu_0 (\mu_B)^2}{4\pi\hbar}\sum_{j}
-    \frac{g_i g_j}{r_{ij}^3}
-    \, \Big(
-    3\,(\bm{e}_{ij}\cdot\bm{s}_{j})\bm{e}_{ij}
-    -\bm{s}_{j} \Big) \nonumber
-  \end{equation}
-  \begin{equation}
-    \bm{F}_i =
-    \frac{3\, \mu_0 (\mu_B)^2}{4\pi} \sum_j
-    \frac{g_i g_j}{r_{ij}^4}
-    \Big[\big( (\bm{s}_i\cdot\bm{s}_j) 
-    -5(\bm{e}_{ij}\cdot\bm{s}_i)
-    (\bm{e}_{ij}\cdot\bm{s}_j)\big) \bm{e}_{ij}+
-    \big(
-    (\bm{e}_{ij}\cdot\bm{s}_i)\bm{s}_j+
-    (\bm{e}_{ij}\cdot\bm{s}_j)\bm{s}_i
-    \big)
-    \Big]
-    \nonumber
-  \end{equation}
-\end{varwidth}
-\end{document}
diff --git a/doc/src/Eqs/pair_spin_dmi_forces.jpg b/doc/src/Eqs/pair_spin_dmi_forces.jpg
deleted file mode 100644
index fba6a91cbf..0000000000
Binary files a/doc/src/Eqs/pair_spin_dmi_forces.jpg and /dev/null differ
diff --git a/doc/src/Eqs/pair_spin_dmi_forces.tex b/doc/src/Eqs/pair_spin_dmi_forces.tex
deleted file mode 100644
index 1c0c246db4..0000000000
--- a/doc/src/Eqs/pair_spin_dmi_forces.tex
+++ /dev/null
@@ -1,14 +0,0 @@
-\documentclass[preview]{standalone}
-\usepackage{varwidth}
-\usepackage[utf8x]{inputenc}
-\usepackage{amsmath,amssymb,amsthm,bm}
-\begin{document}
-\begin{varwidth}{50in}
-  \begin{equation}
-    \vec{\omega}_i = -\frac{1}{\hbar} \sum_{j}^{Neighb} \vec{s}_{j}\times \left(\vec{e}_{ij}\times \vec{D} \right) 
-    ~~{\rm and}~~
-    \vec{F}_i = -\sum_{j}^{Neighb} \frac{1}{r_{ij}} \vec{D} \times \left( \vec{s}_{i}\times \vec{s}_{j} \right) 
-    , \nonumber
-  \end{equation}
-\end{varwidth}
-\end{document}
diff --git a/doc/src/Eqs/pair_spin_dmi_interaction.jpg b/doc/src/Eqs/pair_spin_dmi_interaction.jpg
deleted file mode 100644
index 3eb24c67e3..0000000000
Binary files a/doc/src/Eqs/pair_spin_dmi_interaction.jpg and /dev/null differ
diff --git a/doc/src/Eqs/pair_spin_dmi_interaction.tex b/doc/src/Eqs/pair_spin_dmi_interaction.tex
deleted file mode 100644
index 79f63a333a..0000000000
--- a/doc/src/Eqs/pair_spin_dmi_interaction.tex
+++ /dev/null
@@ -1,16 +0,0 @@
-\documentclass[preview]{standalone}
-\usepackage{varwidth}
-\usepackage[utf8x]{inputenc}
-\usepackage{amsmath,amssymb,amsthm,bm}
-\begin{document}
-\begin{varwidth}{50in}
-  \begin{equation}
-    \bm{H}_{dm} = \sum_{{ i,j}=1,i\neq j}^{N} 
-    \left( \vec{e}_{ij} \times \vec{D} \right)
-    \cdot\left(\vec{s}_{i}\times \vec{s}_{j}\right), 
-    \nonumber
-  \end{equation}
-\end{varwidth}
-\end{document}
-    \vec{D}\left(r_{ij}\right) 
-    {\rm ~and~}  \vec{D}\left(r_{ij}\right) = \vec{e}_{ij} \times \vec{D}  
diff --git a/doc/src/Eqs/pair_spin_long_range.jpg b/doc/src/Eqs/pair_spin_long_range.jpg
deleted file mode 100644
index bc133d10cf..0000000000
Binary files a/doc/src/Eqs/pair_spin_long_range.jpg and /dev/null differ
diff --git a/doc/src/Eqs/pair_spin_long_range.tex b/doc/src/Eqs/pair_spin_long_range.tex
deleted file mode 100644
index 493879e4dd..0000000000
--- a/doc/src/Eqs/pair_spin_long_range.tex
+++ /dev/null
@@ -1,20 +0,0 @@
-\documentclass[preview]{standalone}
-\usepackage{varwidth}
-\usepackage[utf8x]{inputenc}
-\usepackage{amsmath,amssymb,graphics,bm,setspace}
-
-\begin{document}
-\begin{varwidth}{50in}
-  \begin{equation}
-    \mathcal{H}_{\rm long}= 
-    -\frac{\mu_{0} \left( \mu_B\right)^2}{4\pi} 
-    \sum_{i,j,i\neq j}^{N}
-    \frac{g_i g_j}{r_{ij}^3}
-    \Big(3 
-    \left(\bm{e}_{ij}\cdot \bm{s}_{i}\right) 
-    \left(\bm{e}_{ij}\cdot \bm{s}_{j}\right) 
-    -\bm{s}_i\cdot\bm{s}_j \Big)
-    \nonumber
-  \end{equation}
-\end{varwidth}
-\end{document}
diff --git a/doc/src/Eqs/pair_spin_long_range_force.jpg b/doc/src/Eqs/pair_spin_long_range_force.jpg
deleted file mode 100644
index 71d2acbe5a..0000000000
Binary files a/doc/src/Eqs/pair_spin_long_range_force.jpg and /dev/null differ
diff --git a/doc/src/Eqs/pair_spin_long_range_force.tex b/doc/src/Eqs/pair_spin_long_range_force.tex
deleted file mode 100644
index 62f8ce1374..0000000000
--- a/doc/src/Eqs/pair_spin_long_range_force.tex
+++ /dev/null
@@ -1,23 +0,0 @@
-\documentclass[preview]{standalone}
-\usepackage{varwidth}
-\usepackage[utf8x]{inputenc}
-\usepackage{amsmath,amssymb,graphics,bm,setspace}
-
-\begin{document}
-\begin{varwidth}{50in}
-  \begin{equation}
-    \bm{F}_i =
-    \frac{\mu_0 (\mu_B)^2}{4\pi} \sum_j
-    \frac{g_i g_j}{r_{ij}^4}
-    \Big[\big( (\bm{s}_i\cdot\bm{s}_j) 
-    -5(\bm{e}_{ij}\cdot\bm{s}_i)
-    (\bm{e}_{ij}\cdot\bm{s}_j)\big) \bm{e}_{ij}+
-    \big(
-    (\bm{e}_{ij}\cdot\bm{s}_i)\bm{s}_j+
-    (\bm{e}_{ij}\cdot\bm{s}_j)\bm{s}_i
-    \big)
-    \Big]
-    \nonumber
-  \end{equation}
-\end{varwidth}
-\end{document}
diff --git a/doc/src/Eqs/pair_spin_long_range_magforce.jpg b/doc/src/Eqs/pair_spin_long_range_magforce.jpg
deleted file mode 100644
index d6a83a0c27..0000000000
Binary files a/doc/src/Eqs/pair_spin_long_range_magforce.jpg and /dev/null differ
diff --git a/doc/src/Eqs/pair_spin_long_range_magforce.tex b/doc/src/Eqs/pair_spin_long_range_magforce.tex
deleted file mode 100644
index ad40cf9d8b..0000000000
--- a/doc/src/Eqs/pair_spin_long_range_magforce.tex
+++ /dev/null
@@ -1,17 +0,0 @@
-\documentclass[preview]{standalone}
-\usepackage{varwidth}
-\usepackage[utf8x]{inputenc}
-\usepackage{amsmath,amssymb,graphics,bm,setspace}
-
-\begin{document}
-\begin{varwidth}{50in}
-  \begin{equation}
-    \bm{\omega}_i = 
-    \frac{\mu_0 (\mu_B)^2}{4\pi\hbar}\sum_{j}
-    \frac{g_i g_j}{r_{ij}^3}
-    \, \Big(
-    3\,(\bm{e}_{ij}\cdot\bm{s}_{j})\bm{e}_{ij}
-    -\bm{s}_{j} \Big) \nonumber
-  \end{equation}
-\end{varwidth}
-\end{document}
diff --git a/doc/src/Eqs/pair_spin_me_forces.jpg b/doc/src/Eqs/pair_spin_me_forces.jpg
deleted file mode 100644
index d9ae440fb5..0000000000
Binary files a/doc/src/Eqs/pair_spin_me_forces.jpg and /dev/null differ
diff --git a/doc/src/Eqs/pair_spin_me_forces.tex b/doc/src/Eqs/pair_spin_me_forces.tex
deleted file mode 100644
index f9462fc3d5..0000000000
--- a/doc/src/Eqs/pair_spin_me_forces.tex
+++ /dev/null
@@ -1,13 +0,0 @@
-\documentclass[preview]{standalone}
-\usepackage{varwidth}
-\usepackage[utf8x]{inputenc}
-\usepackage{amsmath,amssymb,amsthm,bm}
-\begin{document}
-\begin{varwidth}{50in}
-  \begin{equation}
-    \vec{F}^{i} = -\sum_{j}^{Neighbor} \left( \vec{s}_{i}\times \vec{s}_{j} \right)
-    \times \vec{E} ~~{\rm and}~~ \vec{\omega}^{i} = -\frac{1}{\hbar} 
-    \sum_{j}^{Neighbor} \vec{s}_j \times \left(\vec{E}\times r_{ij} \right),\nonumber
-  \end{equation}
-\end{varwidth}
-\end{document}
diff --git a/doc/src/Eqs/pair_spin_me_interaction.jpg b/doc/src/Eqs/pair_spin_me_interaction.jpg
deleted file mode 100644
index 8ecddc9592..0000000000
Binary files a/doc/src/Eqs/pair_spin_me_interaction.jpg and /dev/null differ
diff --git a/doc/src/Eqs/pair_spin_me_interaction.tex b/doc/src/Eqs/pair_spin_me_interaction.tex
deleted file mode 100644
index 64501e9c2f..0000000000
--- a/doc/src/Eqs/pair_spin_me_interaction.tex
+++ /dev/null
@@ -1,12 +0,0 @@
-\documentclass[preview]{standalone}
-\usepackage{varwidth}
-\usepackage[utf8x]{inputenc}
-\usepackage{amsmath,amssymb,amsthm,bm}
-\begin{document}
-\begin{varwidth}{50in}
-  \begin{equation}
-    \vec{\omega}_i = -\frac{1}{\hbar} \sum_{j}^{Neighb} \vec{s}_{j}\times\vec{D}(r_{ij}) ~~{\rm and}~~
-    \vec{F}_i = -\sum_{j}^{Neighb} \frac{\partial D(r_{ij})}{\partial r_{ij}} \left(\vec{s}_{i}\times \vec{s}_{j} \right) \cdot \vec{r}_{ij}, \nonumber
-  \end{equation}
-\end{varwidth}
-\end{document}
diff --git a/doc/src/Eqs/pair_srp1.jpg b/doc/src/Eqs/pair_srp1.jpg
deleted file mode 100644
index bbbdc43e05..0000000000
Binary files a/doc/src/Eqs/pair_srp1.jpg and /dev/null differ
diff --git a/doc/src/Eqs/pair_srp1.tex b/doc/src/Eqs/pair_srp1.tex
deleted file mode 100644
index 45aa005d86..0000000000
--- a/doc/src/Eqs/pair_srp1.tex
+++ /dev/null
@@ -1,9 +0,0 @@
-\documentclass[12pt]{article}
-
-\begin{document}
-
-\begin{eqnarray*}
- F^{SRP}_{ij} & = & C(1-r/r_c)\hat{r}_{ij} \qquad r < r_c \\
-\end{eqnarray*}                           
-
-\end{document}
diff --git a/doc/src/Eqs/pair_srp2.jpg b/doc/src/Eqs/pair_srp2.jpg
deleted file mode 100644
index c5d20dc212..0000000000
Binary files a/doc/src/Eqs/pair_srp2.jpg and /dev/null differ
diff --git a/doc/src/Eqs/pair_srp2.tex b/doc/src/Eqs/pair_srp2.tex
deleted file mode 100644
index 19cb19ae72..0000000000
--- a/doc/src/Eqs/pair_srp2.tex
+++ /dev/null
@@ -1,10 +0,0 @@
-\documentclass[12pt]{article}
-
-\begin{document}
-
-\begin{eqnarray*}
- F_{i1}^{SRP} & = & F^{SRP}_{ij}(L) \\
- F_{i2}^{SRP} & = & F^{SRP}_{ij}(1-L)  
-\end{eqnarray*}                           
-
-\end{document}
diff --git a/doc/src/Eqs/pair_sw.jpg b/doc/src/Eqs/pair_sw.jpg
deleted file mode 100644
index f60f07fd27..0000000000
Binary files a/doc/src/Eqs/pair_sw.jpg and /dev/null differ
diff --git a/doc/src/Eqs/pair_sw.tex b/doc/src/Eqs/pair_sw.tex
deleted file mode 100644
index ebcc39d77b..0000000000
--- a/doc/src/Eqs/pair_sw.tex
+++ /dev/null
@@ -1,18 +0,0 @@
-\documentclass[12pt]{article}
-
-\begin{document}
-
-\begin{eqnarray*}
-  E & = & \sum_i \sum_{j > i} \phi_2 (r_{ij}) + 
-          \sum_i \sum_{j \neq i} \sum_{k > j} 
-          \phi_3 (r_{ij}, r_{ik}, \theta_{ijk}) \\
-  \phi_2(r_{ij}) & = & A_{ij} \epsilon_{ij} \left[ B_{ij} (\frac{\sigma_{ij}}{r_{ij}})^{p_{ij}} - 
-                    (\frac{\sigma_{ij}}{r_{ij}})^{q_{ij}} \right] 
-                    \exp \left( \frac{\sigma_{ij}}{r_{ij} - a_{ij} \sigma_{ij}} \right) \\
-  \phi_3(r_{ij},r_{ik},\theta_{ijk}) & = & \lambda_{ijk} \epsilon_{ijk} \left[ \cos \theta_{ijk} - 
-                    \cos \theta_{0ijk} \right]^2
-                    \exp \left( \frac{\gamma_{ij} \sigma_{ij}}{r_{ij} - a_{ij} \sigma_{ij}} \right)
-                    \exp \left( \frac{\gamma_{ik} \sigma_{ik}}{r_{ik} - a_{ik} \sigma_{ik}} \right)
-\end{eqnarray*}                           
-
-\end{document}
diff --git a/doc/src/Eqs/pair_switch3.jpg b/doc/src/Eqs/pair_switch3.jpg
deleted file mode 100644
index e6327ee5ff..0000000000
Binary files a/doc/src/Eqs/pair_switch3.jpg and /dev/null differ
diff --git a/doc/src/Eqs/pair_switch3.tex b/doc/src/Eqs/pair_switch3.tex
deleted file mode 100644
index 7ae67a5e65..0000000000
--- a/doc/src/Eqs/pair_switch3.tex
+++ /dev/null
@@ -1,14 +0,0 @@
-\documentclass[12pt]{article}
-
-\begin{document}
-\thispagestyle{empty}
-
-\begin{eqnarray*}
- S_3(r) = \left\lbrace \begin{array}{ll}
-                     1 & \quad\mathrm{if}\quad r < r_\mathrm{c} - w \\
-                     3x^2 - 2x^3 & \quad\mathrm{if}\quad r < r_\mathrm{c} \quad\mathrm{with\quad} x=\frac{r_\mathrm{c} - r}{w} \\
-                     0 & \quad\mathrm{if}\quad r >= r_\mathrm{c}
-                 \end{array} \right.
-\end{eqnarray*}
-
-\end{document}
diff --git a/doc/src/Eqs/pair_tdpd_flux.jpg b/doc/src/Eqs/pair_tdpd_flux.jpg
deleted file mode 100644
index 9da788ae9b..0000000000
Binary files a/doc/src/Eqs/pair_tdpd_flux.jpg and /dev/null differ
diff --git a/doc/src/Eqs/pair_tdpd_flux.tex b/doc/src/Eqs/pair_tdpd_flux.tex
deleted file mode 100644
index f753f16acf..0000000000
--- a/doc/src/Eqs/pair_tdpd_flux.tex
+++ /dev/null
@@ -1,21 +0,0 @@
-\documentclass[12pt]{article}
-
-\begin{document}
-
-$$
-  Q_{ij}^D = -\kappa_{ij} w_{DC}(r_{ij}) \left( C_i - C_j \right),
-$$  
-  
-$$  
-  Q_{ij}^R = \epsilon_{ij}\left( C_i + C_j \right) w_{RC}(r_{ij}) \xi_{ij},
-$$
-
-$$
-  w_{DC}(r_{ij})=w^2_{RC}(r_{ij}) = (1 - r/r_{cc})^{\rm power\_{cc}},
-$$
-
-$$
-  \epsilon_{ij}^2 = m_s^2\kappa_{ij}\rho,
-$$
-
-\end{document}
diff --git a/doc/src/Eqs/pair_tdpd_force.jpg b/doc/src/Eqs/pair_tdpd_force.jpg
deleted file mode 100644
index f6feb35397..0000000000
Binary files a/doc/src/Eqs/pair_tdpd_force.jpg and /dev/null differ
diff --git a/doc/src/Eqs/pair_tdpd_force.tex b/doc/src/Eqs/pair_tdpd_force.tex
deleted file mode 100644
index 49edff9700..0000000000
--- a/doc/src/Eqs/pair_tdpd_force.tex
+++ /dev/null
@@ -1,29 +0,0 @@
-\documentclass[12pt]{article}
-
-\begin{document}
-
-$$
-  \mathbf{F}_{ij}^{C} = A{\omega_{C}}(r_{ij})\mathbf{e}_{ij},
-$$
-
-$$
-  \mathbf{F}_{ij}^{D} = -\gamma {\omega_{D}}(r_{ij})(\mathbf{e}_{ij} \cdot \mathbf{v}_{ij})\mathbf{e}_{ij},
-$$
-
-$$
-  \mathbf{F}_{ij}^{R} = \sigma {\omega_{R}}(r_{ij}){\xi_{ij}}\Delta t^{-1/2} \mathbf{e}_{ij},
-$$
-
-$$
-  \omega_{C}(r) = 1 - r/r_c,
-$$
-
-$$
-  \omega_{D}(r) = \omega^2_{R}(r) = (1-r/r_c)^{\rm power\_f},
-$$
-
-$$
-  \sigma^2 = 2\gamma k_B T,
-$$
-
-\end{document}
diff --git a/doc/src/Eqs/pair_tdpd_gov.jpg b/doc/src/Eqs/pair_tdpd_gov.jpg
deleted file mode 100644
index 0ed793a132..0000000000
Binary files a/doc/src/Eqs/pair_tdpd_gov.jpg and /dev/null differ
diff --git a/doc/src/Eqs/pair_tdpd_gov.tex b/doc/src/Eqs/pair_tdpd_gov.tex
deleted file mode 100644
index e4b5f5790a..0000000000
--- a/doc/src/Eqs/pair_tdpd_gov.tex
+++ /dev/null
@@ -1,13 +0,0 @@
-\documentclass[12pt]{article}
-
-\begin{document}
-
-$$
-  \frac{\mathrm{d}^2 \mathbf{r}_i}{\mathrm{d} t^2} = \frac{\mathrm{d} \mathbf{v}_i}{\mathrm{d} t}=\mathbf{F}_{i}=\sum_{i\neq j}(\mathbf{F}_{ij}^{C}+\mathbf{F}_{ij}^{D}+\mathbf{F}_{ij}^{R}),
-$$
-
-$$
-  \frac{\mathrm{d} C_{i}}{\mathrm{d} t}= Q_{i} = \sum_{i\neq j}(Q_{ij}^{D}+Q_{ij}^{R}) + Q_{i}^{S}, 
-$$
-
-\end{document}
diff --git a/doc/src/Eqs/pair_tersoff.jpg b/doc/src/Eqs/pair_tersoff.jpg
deleted file mode 100644
index bd3e147192..0000000000
Binary files a/doc/src/Eqs/pair_tersoff.jpg and /dev/null differ
diff --git a/doc/src/Eqs/pair_tersoff_1.jpg b/doc/src/Eqs/pair_tersoff_1.jpg
deleted file mode 100644
index 79600b499c..0000000000
Binary files a/doc/src/Eqs/pair_tersoff_1.jpg and /dev/null differ
diff --git a/doc/src/Eqs/pair_tersoff_1.tex b/doc/src/Eqs/pair_tersoff_1.tex
deleted file mode 100644
index 7d34712491..0000000000
--- a/doc/src/Eqs/pair_tersoff_1.tex
+++ /dev/null
@@ -1,24 +0,0 @@
-\documentclass[12pt]{article}
-
-\begin{document}
-
-\begin{eqnarray*}
-  E & = & \frac{1}{2} \sum_i \sum_{j \neq i} V_{ij} \\
-  V_{ij} & = & f_C(r_{ij}) \left[ f_R(r_{ij}) + b_{ij} f_A(r_{ij}) \right] \\
-  f_C(r) & = & \left\{ \begin{array} {r@{\quad:\quad}l}
-    1 & r < R - D \\
-    \frac{1}{2} - \frac{1}{2} \sin \left( \frac{\pi}{2} \frac{r-R}{D} \right) &
-      R-D < r < R + D \\
-    0 & r > R + D
-    \end{array} \right. \\
-  f_R(r) & = & A \exp (-\lambda_1 r) \\
-  f_A(r) & = & -B \exp (-\lambda_2 r) \\
-  b_{ij} & = & \left( 1 + \beta^n {\zeta_{ij}}^n \right)^{-\frac{1}{2n}} \\
-  \zeta_{ij} & = & \sum_{k \neq i,j} f_C(r_{ik}) g(\theta_{ijk})
-                   \exp \left[ {\lambda_3}^m (r_{ij} - r_{ik})^m \right] \\
-  g(\theta) & = & \gamma_{ijk} \left( 1 + \frac{c^2}{d^2} - 
-                  \frac{c^2}{\left[ d^2 + 
-		  (\cos \theta - \cos \theta_0)^2\right]} \right)
-\end{eqnarray*}
-
-\end{document}
diff --git a/doc/src/Eqs/pair_tersoff_2.jpg b/doc/src/Eqs/pair_tersoff_2.jpg
deleted file mode 100644
index 6cb8778a09..0000000000
Binary files a/doc/src/Eqs/pair_tersoff_2.jpg and /dev/null differ
diff --git a/doc/src/Eqs/pair_tersoff_2.tex b/doc/src/Eqs/pair_tersoff_2.tex
deleted file mode 100644
index 7b5beb8ef3..0000000000
--- a/doc/src/Eqs/pair_tersoff_2.tex
+++ /dev/null
@@ -1,14 +0,0 @@
-\documentclass[12pt]{article}
-
-\begin{document}
-
-\begin{eqnarray*}
-\lambda_1^{i,j} &=& \frac{1}{2}(\lambda_1^i + \lambda_1^j)\\
-\lambda_2^{i,j} &=& \frac{1}{2}(\lambda_2^i + \lambda_2^j)\\
-A_{i,j} &=& (A_{i}A_{j})^{1/2}\\
-B_{i,j} &=& \chi_{ij}(B_{i}B_{j})^{1/2}\\
-R_{i,j} &=& (R_{i}R_{j})^{1/2}\\
-S_{i,j} &=& (S_{i}S_{j})^{1/2}\\
-\end{eqnarray*}                           
-
-\end{document}
\ No newline at end of file
diff --git a/doc/src/Eqs/pair_tersoff_mod.jpg b/doc/src/Eqs/pair_tersoff_mod.jpg
deleted file mode 100644
index 2618943d85..0000000000
Binary files a/doc/src/Eqs/pair_tersoff_mod.jpg and /dev/null differ
diff --git a/doc/src/Eqs/pair_tersoff_mod.tex b/doc/src/Eqs/pair_tersoff_mod.tex
deleted file mode 100644
index eafc4fdeeb..0000000000
--- a/doc/src/Eqs/pair_tersoff_mod.tex
+++ /dev/null
@@ -1,24 +0,0 @@
-\documentclass[12pt]{article}
-
-\begin{document}
-
-\begin{eqnarray*}
-  E & = & \frac{1}{2} \sum_i \sum_{j \neq i} V_{ij} \\
-  V_{ij} & = & f_C(r_{ij}) \left[ f_R(r_{ij}) + b_{ij} f_A(r_{ij}) \right] \\
-  f_C(r) & = & \left\{ \begin{array} {r@{\quad:\quad}l}
-    1 & r < R - D \\
-    \frac{1}{2} - \frac{9}{16} \sin \left( \frac{\pi}{2} \frac{r-R}{D} \right) - \frac{1}{16} \sin \left( \frac{3\pi}{2} \frac{r-R}{D} \right) &
-      R-D < r < R + D \\
-    0 & r > R + D
-    \end{array} \right. \\
-  f_R(r) & = & A \exp (-\lambda_1 r) \\
-  f_A(r) & = & -B \exp (-\lambda_2 r) \\
-  b_{ij} & = & \left( 1 + {\zeta_{ij}}^\eta \right)^{-\frac{1}{2n}} \\
-  \zeta_{ij} & = & \sum_{k \neq i,j} f_C(r_{ik}) g(\theta_{ijk})
-                   \exp \left[ \alpha (r_{ij} - r_{ik})^\beta \right] \\
-  g(\theta) & = & c_1 + g_o(\theta) g_a(\theta) \\
-  g_o(\theta) & = & \frac{c_2 (h - \cos \theta)^2}{c_3 + (h - \cos \theta)^2} \\
-  g_a(\theta) & = & 1 + c_4 \exp \left[ -c_5 (h - \cos \theta)^2 \right] \\
-\end{eqnarray*}
-
-\end{document}
diff --git a/doc/src/Eqs/pair_tersoff_mod_c.jpg b/doc/src/Eqs/pair_tersoff_mod_c.jpg
deleted file mode 100644
index 311ccc81eb..0000000000
Binary files a/doc/src/Eqs/pair_tersoff_mod_c.jpg and /dev/null differ
diff --git a/doc/src/Eqs/pair_tersoff_mod_c.tex b/doc/src/Eqs/pair_tersoff_mod_c.tex
deleted file mode 100644
index 8cea2d382c..0000000000
--- a/doc/src/Eqs/pair_tersoff_mod_c.tex
+++ /dev/null
@@ -1,10 +0,0 @@
-\documentclass[12pt]{article}
-\pagestyle{empty}
-
-\begin{document}
-
-\begin{eqnarray*}
-  V_{ij}  & =  & f_C(r_{ij}) \left[ f_R(r_{ij}) + b_{ij} f_A(r_{ij}) + c_0 \right]
-\end{eqnarray*}
-
-\end{document}
diff --git a/doc/src/Eqs/pair_tersoff_zbl.jpg b/doc/src/Eqs/pair_tersoff_zbl.jpg
deleted file mode 100644
index 20d60d2256..0000000000
Binary files a/doc/src/Eqs/pair_tersoff_zbl.jpg and /dev/null differ
diff --git a/doc/src/Eqs/pair_tersoff_zbl.tex b/doc/src/Eqs/pair_tersoff_zbl.tex
deleted file mode 100644
index 902819aa1b..0000000000
--- a/doc/src/Eqs/pair_tersoff_zbl.tex
+++ /dev/null
@@ -1,33 +0,0 @@
-\documentclass[12pt]{article}
-
-\begin{document}
-
-\begin{eqnarray*}
-  E & = & \frac{1}{2} \sum_i \sum_{j \neq i} V_{ij} \\
-  V_{ij} & = & (1 - f_F(r_{ij})) V^{ZBL}_{ij} + f_F(r_{ij}) V^{Tersoff}_{ij} \\
-f_F(r_{ij}) & = & \frac{1}{1 + e^{-A_F(r_{ij} - r_C)}}\\
-  \\
-  \\
-  V^{ZBL}_{ij} & = & \frac{1}{4\pi\epsilon_0} \frac{Z_1 Z_2 \,e^2}{r_{ij}} \phi(r_{ij}/a) \\
-  a & = & \frac{0.8854\,a_0}{Z_{1}^{0.23} + Z_{2}^{0.23}}\\
-  \phi(x) & = & 0.1818e^{-3.2x} + 0.5099e^{-0.9423x} + 0.2802e^{-0.4029x} + 0.02817e^{-0.2016x}\\
-  \\
-  \\
-  V^{Tersoff}_{ij} & = & f_C(r_{ij}) \left[ f_R(r_{ij}) + b_{ij} f_A(r_{ij}) \right] \\
-  f_C(r) & = & \left\{ \begin{array} {r@{\quad:\quad}l}
-    1 & r < R - D \\
-    \frac{1}{2} - \frac{1}{2} \sin \left( \frac{\pi}{2} \frac{r-R}{D} \right) &
-      R-D < r < R + D \\
-    0 & r > R + D
-    \end{array} \right. \\
-  f_R(r) & = & A \exp (-\lambda_1 r) \\
-  f_A(r) & = & -B \exp (-\lambda_2 r) \\
-  b_{ij} & = & \left( 1 + \beta^n {\zeta_{ij}}^n \right)^{-\frac{1}{2n}} \\
-  \zeta_{ij} & = & \sum_{k \neq i,j} f_C(r_{ik}) g(\theta_{ijk})
-                   \exp \left[ {\lambda_3}^m (r_{ij} - r_{ik})^m \right] \\
-  g(\theta) & = & \gamma_{ijk} \left( 1 + \frac{c^2}{d^2} - 
-                  \frac{c^2}{\left[ d^2 + 
-		  (\cos \theta - \cos \theta_0)^2\right]} \right)
-\end{eqnarray*}                           
-
-\end{document}
diff --git a/doc/src/Eqs/pair_ufm.jpg b/doc/src/Eqs/pair_ufm.jpg
deleted file mode 100644
index 40273da680..0000000000
Binary files a/doc/src/Eqs/pair_ufm.jpg and /dev/null differ
diff --git a/doc/src/Eqs/pair_ufm.tex b/doc/src/Eqs/pair_ufm.tex
deleted file mode 100644
index 8a6dde5520..0000000000
--- a/doc/src/Eqs/pair_ufm.tex
+++ /dev/null
@@ -1,14 +0,0 @@
-\documentclass[12pt]{article}
-
-\begin{document}
-
-$$
-	E = -\varepsilon\, \ln{\left[1-\exp{\left(-r^{2}/\sigma^{2}\right)}\right]} \qquad  r < r_c
-$$
-
-$$
-  \varepsilon = p\,k_B\,T
-$$
-
-\end{document}
-
diff --git a/doc/src/Eqs/pair_vashishta.jpg b/doc/src/Eqs/pair_vashishta.jpg
deleted file mode 100644
index ca5f118a87..0000000000
Binary files a/doc/src/Eqs/pair_vashishta.jpg and /dev/null differ
diff --git a/doc/src/Eqs/pair_vashishta.tex b/doc/src/Eqs/pair_vashishta.tex
deleted file mode 100644
index b65056a254..0000000000
--- a/doc/src/Eqs/pair_vashishta.tex
+++ /dev/null
@@ -1,22 +0,0 @@
-\documentclass[12pt]{article}
-
-\begin{document}
-
-\begin{eqnarray*}
-  U & = & \sum_i^N \sum_{j > i}^N U_{ij}^{(2)} (r_{ij}) + 
-          \sum_i^N \sum_{j \neq i}^N \sum_{k > j, k \neq i}^N 
-          U_{ijk}^{(3)} (r_{ij}, r_{ik}, \theta_{ijk}) 
-          \\
-  U_{ij}^{(2)} (r) & = &  \frac{H_{ij}}{r^{\eta_{ij}}}
-  	                        + \frac{Z_i Z_j}{r}\exp(-r/\lambda_{1,ij})
-  	                        - \frac{D_{ij}}{r^4}\exp(-r/\lambda_{4,ij})
-	                        - \frac{W_{ij}}{r^6}, r < r_{c,{ij}}
-                   \\
-  U_{ijk}^{(3)}(r_{ij},r_{ik},\theta_{ijk}) & = & B_{ijk} 
-                    \frac{\left[ \cos \theta_{ijk} - \cos \theta_{0ijk} \right]^2}
-                    {1+C_{ijk}\left[ \cos \theta_{ijk} - \cos \theta_{0ijk} \right]^2} \times \\
-&  &                     \exp \left( \frac{\gamma_{ij}}{r_{ij} - r_{0,ij}} \right)
-                    \exp \left( \frac{\gamma_{ik}}{r_{ik} - r_{0,ik}} \right), r_{ij} < r_{0,ij}, r_{ik} < r_{0,ik}
-\end{eqnarray*}                           
-
-\end{document}
diff --git a/doc/src/Eqs/pair_yukawa.jpg b/doc/src/Eqs/pair_yukawa.jpg
deleted file mode 100644
index 103edc6043..0000000000
Binary files a/doc/src/Eqs/pair_yukawa.jpg and /dev/null differ
diff --git a/doc/src/Eqs/pair_yukawa.tex b/doc/src/Eqs/pair_yukawa.tex
deleted file mode 100644
index 382cf249a8..0000000000
--- a/doc/src/Eqs/pair_yukawa.tex
+++ /dev/null
@@ -1,9 +0,0 @@
-\documentclass[12pt]{article}
-
-\begin{document}
-
-$$
-   E = A \frac{e^{- \kappa r}}{r} \qquad r < r_c
-$$
-
-\end{document}
diff --git a/doc/src/Eqs/pair_yukawa_colloid.jpg b/doc/src/Eqs/pair_yukawa_colloid.jpg
deleted file mode 100644
index 1d83624757..0000000000
Binary files a/doc/src/Eqs/pair_yukawa_colloid.jpg and /dev/null differ
diff --git a/doc/src/Eqs/pair_yukawa_colloid.tex b/doc/src/Eqs/pair_yukawa_colloid.tex
deleted file mode 100644
index dbdbbcd140..0000000000
--- a/doc/src/Eqs/pair_yukawa_colloid.tex
+++ /dev/null
@@ -1,9 +0,0 @@
-\documentclass[12pt]{article}
-
-\begin{document}
-
-$$
-   E = \frac{A}{\kappa} e^{- \kappa (r - (r_i + r_j))} \qquad r < r_c
-$$
-
-\end{document}
diff --git a/doc/src/Eqs/pair_zbl.jpg b/doc/src/Eqs/pair_zbl.jpg
deleted file mode 100644
index 88656af5eb..0000000000
Binary files a/doc/src/Eqs/pair_zbl.jpg and /dev/null differ
diff --git a/doc/src/Eqs/pair_zbl.tex b/doc/src/Eqs/pair_zbl.tex
deleted file mode 100644
index 3d68dbed23..0000000000
--- a/doc/src/Eqs/pair_zbl.tex
+++ /dev/null
@@ -1,11 +0,0 @@
-\documentclass[12pt]{article}
-
-\begin{document}
-
-\begin{eqnarray*}
-  E^{ZBL}_{ij} & = & \frac{1}{4\pi\epsilon_0} \frac{Z_i Z_j \,e^2}{r_{ij}} \phi(r_{ij}/a)+ S(r_{ij})\\
-  a & = & \frac{0.46850}{Z_{i}^{0.23} + Z_{j}^{0.23}}\\
-  \phi(x) & = & 0.18175e^{-3.19980x} + 0.50986e^{-0.94229x} + 0.28022e^{-0.40290x} + 0.02817e^{-0.20162x}\\
- \end{eqnarray*}                           
-
-\end{document}
diff --git a/doc/src/Eqs/polymorphic1.jpg b/doc/src/Eqs/polymorphic1.jpg
deleted file mode 100644
index 4757cb7ad8..0000000000
Binary files a/doc/src/Eqs/polymorphic1.jpg and /dev/null differ
diff --git a/doc/src/Eqs/polymorphic1.tex b/doc/src/Eqs/polymorphic1.tex
deleted file mode 100644
index b4b925ccf8..0000000000
--- a/doc/src/Eqs/polymorphic1.tex
+++ /dev/null
@@ -1,9 +0,0 @@
-\documentclass[12pt]{article}
-
-\begin{document}
-
-$$
-E=\frac{1}{2}\sum_{i=1}^{i=N}\sum_{j=1}^{j=N}\left[\left(1-\delta_{ij}\right)\cdot U_{IJ}\left(r_{ij}\right)-\left(1-\eta_{ij}\right)\cdot F_{IJ}\left(r_{ij}\right)\cdot V_{IJ}\left(r_{ij}\right)\right]
-$$
-
-\end{document}
diff --git a/doc/src/Eqs/polymorphic2.jpg b/doc/src/Eqs/polymorphic2.jpg
deleted file mode 100644
index 05133f4849..0000000000
Binary files a/doc/src/Eqs/polymorphic2.jpg and /dev/null differ
diff --git a/doc/src/Eqs/polymorphic2.tex b/doc/src/Eqs/polymorphic2.tex
deleted file mode 100644
index 80b1c93821..0000000000
--- a/doc/src/Eqs/polymorphic2.tex
+++ /dev/null
@@ -1,10 +0,0 @@
-\documentclass[12pt]{article}
-
-\begin{document}
-
-$$
-X_{ij}=\sum_{k=i_1,k\neq i,j}^{i_N}W_{IK}\left(r_{ik}\right)\cdot G_{JIK}\left(\theta_{jik}\right)\cdot P_{IK}\left(\Delta r_{jik}\right)
-\label{X_eq2}
-$$
-
-\end{document}
diff --git a/doc/src/Eqs/polymorphic3.jpg b/doc/src/Eqs/polymorphic3.jpg
deleted file mode 100644
index ba748e63c5..0000000000
Binary files a/doc/src/Eqs/polymorphic3.jpg and /dev/null differ
diff --git a/doc/src/Eqs/polymorphic3.tex b/doc/src/Eqs/polymorphic3.tex
deleted file mode 100644
index 71db8d81b0..0000000000
--- a/doc/src/Eqs/polymorphic3.tex
+++ /dev/null
@@ -1,10 +0,0 @@
-\documentclass[12pt]{article}
-
-\begin{document}
-
-$$
-\Delta r_{jik}=r_{ij}-\xi_{IJ}\cdot r_{ik}
-\label{Dr_eq3}
-$$
-
-\end{document}
diff --git a/doc/src/Eqs/polymorphic4.jpg b/doc/src/Eqs/polymorphic4.jpg
deleted file mode 100644
index 7a094d6a21..0000000000
Binary files a/doc/src/Eqs/polymorphic4.jpg and /dev/null differ
diff --git a/doc/src/Eqs/polymorphic4.tex b/doc/src/Eqs/polymorphic4.tex
deleted file mode 100644
index b792df82a0..0000000000
--- a/doc/src/Eqs/polymorphic4.tex
+++ /dev/null
@@ -1,17 +0,0 @@
-\documentclass[12pt]{article}
-
-\begin{document}
-
-\begin{eqnarray*}
-\left\{\begin{array}{l}
-\eta_{ij}=\delta_{ij},\xi_{IJ}=0 \\
-U_{IJ}\left(r\right)=A_{IJ}\cdot\epsilon_{IJ}\cdot \left(\frac{\sigma_{IJ}}{r}\right)^q\cdot \left[B_{IJ}\cdot \left(\frac{\sigma_{IJ}}{r}\right)^{p-q}-1\right]\cdot exp\left(\frac{\sigma_{IJ}}{r-a_{IJ}\cdot \sigma_{IJ}}\right) \\
-V_{IJ}\left(r\right)=\sqrt{\lambda_{IJ}\cdot \epsilon_{IJ}}\cdot exp\left(\frac{\gamma_{IJ}\cdot \sigma_{IJ}}{r-a_{IJ}\cdot \sigma_{IJ}}\right) \\ 
-F_{IJ}\left(X\right)=-X \\
-P_{IJ}\left(\Delta r\right)=1 \\ 
-W_{IJ}\left(r\right)=\sqrt{\lambda_{IJ}\cdot \epsilon_{IJ}}\cdot exp\left(\frac{\gamma_{IJ}\cdot \sigma_{IJ}}{r-a_{IJ}\cdot \sigma_{IJ}}\right) \\
-G_{JIK}\left(\theta\right)=\left(cos\theta+\frac{1}{3}\right)^2
-\end{array}\right.
-\end{eqnarray*} 
-
-\end{document}
diff --git a/doc/src/Eqs/polymorphic5.jpg b/doc/src/Eqs/polymorphic5.jpg
deleted file mode 100644
index 500238b2a9..0000000000
Binary files a/doc/src/Eqs/polymorphic5.jpg and /dev/null differ
diff --git a/doc/src/Eqs/polymorphic5.tex b/doc/src/Eqs/polymorphic5.tex
deleted file mode 100644
index a5451b98d6..0000000000
--- a/doc/src/Eqs/polymorphic5.tex
+++ /dev/null
@@ -1,17 +0,0 @@
-\documentclass[12pt]{article}
-
-\begin{document}
-
-\begin{eqnarray*}
-\left\{\begin{array}{l}
-\eta_{ij}=\delta_{ij},\xi_{IJ}=1 \\
-U_{IJ}\left(r\right)=\frac{D_{e,IJ}}{S_{IJ}-1}\cdot exp\left[-\beta_{IJ}\sqrt{2S_{IJ}\left(r-r_{e,IJ}\right)}\right]\cdot f_{c,IJ}\left(r\right) \\
-V_{IJ}\left(r\right)=\frac{S_{IJ}\cdot D_{e,IJ}}{S_{IJ}-1}\cdot exp\left[-\beta_{IJ}\sqrt{\frac{2}{S_{IJ}}\left(r-r_{e,IJ}\right)}\right]\cdot f_{c,IJ}\left(r\right) \\
-F_{IJ}\left(X\right)=\left(1+X\right)^{-\frac{1}{2}} \\
-P_{IJ}\left(\Delta r\right)=exp\left(2\mu_{IK}\cdot \Delta r\right) \\ 
-W_{IJ}\left(r\right)=f_{c,IK}\left(r\right) \\
-G_{JIK}\left(\theta\right)=\gamma_{IK}\left[1+\frac{c_{IK}^2}{d_{IK}^2}-\frac{c_{IK}^2}{d_{IK}^2+\left(h_{IK}+cos\theta\right)^2}\right]
-\end{array}\right.
-\end{eqnarray*} 
-
-\end{document}
diff --git a/doc/src/Eqs/polymorphic6.jpg b/doc/src/Eqs/polymorphic6.jpg
deleted file mode 100644
index 65ea78bf21..0000000000
Binary files a/doc/src/Eqs/polymorphic6.jpg and /dev/null differ
diff --git a/doc/src/Eqs/polymorphic6.tex b/doc/src/Eqs/polymorphic6.tex
deleted file mode 100644
index c8f9f2f25b..0000000000
--- a/doc/src/Eqs/polymorphic6.tex
+++ /dev/null
@@ -1,13 +0,0 @@
-\documentclass[12pt]{article}
-
-\begin{document}
-
-\begin{eqnarray*}
-f_{c,IJ}=\left\{\begin{array}{lr}
-1, & r\leq r_{s,IJ} \\
-\frac{1}{2}+\frac{1}{2} cos \left[\frac{\pi \left(r-r_{s,IJ}\right)}{r_{c,IJ}-r_{s,IJ}}\right], & r_{s,IJ}<r<r_{c,IJ} \\
-0, & r \geq r_{c,IJ} \\
-\end{array}\right.
-\end{eqnarray*} 
-
-\end{document}
diff --git a/doc/src/Eqs/polymorphic7.jpg b/doc/src/Eqs/polymorphic7.jpg
deleted file mode 100644
index 0749d537dd..0000000000
Binary files a/doc/src/Eqs/polymorphic7.jpg and /dev/null differ
diff --git a/doc/src/Eqs/polymorphic7.tex b/doc/src/Eqs/polymorphic7.tex
deleted file mode 100644
index 80e9914405..0000000000
--- a/doc/src/Eqs/polymorphic7.tex
+++ /dev/null
@@ -1,25 +0,0 @@
-\documentclass[12pt]{article}
-
-\begin{document}
-
-\begin{eqnarray*}
-\left\{\begin{array}{l}
-\eta_{ij}=\delta_{ij},\xi_{IJ}=1 \\
-U_{IJ}\left(r\right)=\left\{\begin{array}{lr}
-A_{IJ}\cdot exp\left(-\lambda_{1,IJ}\cdot r\right)\cdot f_{c,IJ}\left(r\right), & r\leq r_{s,1,IJ} \\
-A_{IJ}\cdot exp\left(-\lambda_{1,IJ}\cdot r\right)\cdot f_{c,IJ}\left(r\right)\cdot f_{c,1,IJ}\left(r\right), & r_{s,1,IJ}<r<r_{c,1,IJ} \\
-0, & r\ge r_{c,1,IJ}
-\end{array}\right. \\
-V_{IJ}\left(r\right)=\left\{\begin{array}{lr}
-B_{IJ} \cdot exp\left(-\lambda_{2,IJ}\cdot r\right)\cdot f_{c,IJ}\left(r\right), & r\le r_{s,1,IJ} \\
-B_{IJ} \cdot exp\left(-\lambda_{2,IJ}\cdot r\right)\cdot f_{c,IJ}\left(r\right)+A_{IJ}\cdot exp\left(-\lambda_{1,IJ}\cdot r\right)\cdot & \\ ~~~~~~ f_{c,IJ}\left(r\right)\cdot \left[1-f_{c,1,IJ}\left(r\right)\right], & r_{s,1,IJ}<r<r_{c,1,IJ} \\
-B_{IJ} \cdot exp\left(-\lambda_{2,IJ}\cdot r\right)\cdot f_{c,IJ}\left(r\right)+A_{IJ}\cdot exp\left(-\lambda_{1,IJ}\cdot r\right)\cdot & \\ ~~~~~~ f_{c,IJ}\left(r\right) & r \ge r_{c,1,IJ}
-\end{array}\right. \\
-F_{IJ}\left(X\right)=\left[1+\left(\beta_{IJ}\cdot X\right)^{n_{IJ}}\right]^{-\frac{1}{2n_{IJ}}} \\
-P_{IJ}\left(\Delta r\right)=exp\left(\lambda_{3,IK}\cdot \Delta r^3\right) \\ 
-W_{IJ}\left(r\right)=f_{c,IK}\left(r\right) \\
-G_{JIK}\left(\theta\right)=1+\frac{c_{IK}^2}{d_{IK}^2}-\frac{c_{IK}^2}{d_{IK}^2+\left(h_{IK}+cos\theta\right)^2}
-\end{array}\right.
-\end{eqnarray*} 
-
-\end{document}
diff --git a/doc/src/Eqs/polymorphic8.jpg b/doc/src/Eqs/polymorphic8.jpg
deleted file mode 100644
index f88d486a53..0000000000
Binary files a/doc/src/Eqs/polymorphic8.jpg and /dev/null differ
diff --git a/doc/src/Eqs/polymorphic8.tex b/doc/src/Eqs/polymorphic8.tex
deleted file mode 100644
index 7d2c872dfc..0000000000
--- a/doc/src/Eqs/polymorphic8.tex
+++ /dev/null
@@ -1,13 +0,0 @@
-\documentclass[12pt]{article}
-
-\begin{document}
-
-\begin{eqnarray*}
-f_{c,1,IJ}=\left\{\begin{array}{lr}
-1, & r\leq r_{s,1,IJ} \\
-\frac{1}{2}+\frac{1}{2} cos \left[\frac{\pi \left(r-r_{s,1,IJ}\right)}{r_{c,1,IJ}-r_{s,1,IJ}}\right], & r_{s,1,IJ}<r<r_{c,1,IJ} \\
-0, & r \geq r_{c,1,IJ} \\
-\end{array}\right.
-\end{eqnarray*} 
-
-\end{document}
diff --git a/doc/src/Eqs/polymorphic9.jpg b/doc/src/Eqs/polymorphic9.jpg
deleted file mode 100644
index e538487c90..0000000000
Binary files a/doc/src/Eqs/polymorphic9.jpg and /dev/null differ
diff --git a/doc/src/Eqs/polymorphic9.tex b/doc/src/Eqs/polymorphic9.tex
deleted file mode 100644
index 3d62b12eca..0000000000
--- a/doc/src/Eqs/polymorphic9.tex
+++ /dev/null
@@ -1,17 +0,0 @@
-\documentclass[12pt]{article}
-
-\begin{document}
-
-\begin{eqnarray*}
-\left\{\begin{array}{l}
-\eta_{ij}=1-\delta_{ij},\xi_{IJ}=0 \\
-U_{IJ}\left(r\right)=\phi_{IJ}\left(r\right) \\
-V_{IJ}\left(r\right)=1 \\
-F_{II}\left(X\right)=-2F_I\left(X\right) \\
-P_{IJ}\left(\Delta r\right)=1 \\ 
-W_{IJ}\left(r\right)=f_{K}\left(r\right) \\
-G_{JIK}\left(\theta\right)=1
-\end{array}\right.
-\end{eqnarray*} 
-
-\end{document}
diff --git a/doc/src/Eqs/pressure.jpg b/doc/src/Eqs/pressure.jpg
deleted file mode 100644
index 525d8a75ee..0000000000
Binary files a/doc/src/Eqs/pressure.jpg and /dev/null differ
diff --git a/doc/src/Eqs/pressure.tex b/doc/src/Eqs/pressure.tex
deleted file mode 100644
index 346b64715a..0000000000
--- a/doc/src/Eqs/pressure.tex
+++ /dev/null
@@ -1,9 +0,0 @@
-\documentclass[12pt]{article}
-
-\begin{document}
-
-$$
-   P = \frac{N k_B T}{V} + \frac{\sum_{i}^{N'} r_i \bullet f_i}{dV}
-$$
-
-\end{document}
\ No newline at end of file
diff --git a/doc/src/Eqs/pressure_tensor.jpg b/doc/src/Eqs/pressure_tensor.jpg
deleted file mode 100644
index 665037f365..0000000000
Binary files a/doc/src/Eqs/pressure_tensor.jpg and /dev/null differ
diff --git a/doc/src/Eqs/pressure_tensor.tex b/doc/src/Eqs/pressure_tensor.tex
deleted file mode 100644
index 5fdb723979..0000000000
--- a/doc/src/Eqs/pressure_tensor.tex
+++ /dev/null
@@ -1,10 +0,0 @@
-\documentclass[12pt]{article}
-
-\begin{document}
-
-$$
-   P_{IJ} = \frac{\sum_{k}^{N} m_k v_{k_I} v_{k_J}}{V} + 
-   \frac{\sum_{k}^{N'} r_{k_I} f_{k_J}}{V}
-$$
-
-\end{document}
diff --git a/doc/src/Eqs/ptm_rmsd.jpg b/doc/src/Eqs/ptm_rmsd.jpg
deleted file mode 100644
index 2d20da706e..0000000000
Binary files a/doc/src/Eqs/ptm_rmsd.jpg and /dev/null differ
diff --git a/doc/src/Eqs/ptm_rmsd.tex b/doc/src/Eqs/ptm_rmsd.tex
deleted file mode 100644
index a9c29ce189..0000000000
--- a/doc/src/Eqs/ptm_rmsd.tex
+++ /dev/null
@@ -1,21 +0,0 @@
-\documentclass[12pt,article]{article}
-
-\usepackage{indentfirst}
-\usepackage{amsmath}
-
-\newcommand{\set}[1]{\ensuremath{\mathbf{#1}}}
-\newcommand{\mean}[1]{\ensuremath{\overline{#1}}}
-\newcommand{\norm}[1]{\ensuremath{\left|\left|{#1}\right|\right|}}
-
-\begin{document}
-
-\begin{equation*}
-\text{RMSD}(\set{u}, \set{v}) = \min_{s, \set{Q}} \sqrt{\frac{1}{N} \sum\limits_{i=1}^{N}
-\norm{
-s[\vec{u_i} - \mean{\set{u}}]
--
-\set{Q} \vec{v_i}
-}^2}
-\end{equation*}
-
-\end{document}
diff --git a/doc/src/Eqs/rotate.jpg b/doc/src/Eqs/rotate.jpg
deleted file mode 100644
index 42b46bfa9e..0000000000
Binary files a/doc/src/Eqs/rotate.jpg and /dev/null differ
diff --git a/doc/src/Eqs/rotate.tex b/doc/src/Eqs/rotate.tex
deleted file mode 100644
index 46fa592a6f..0000000000
--- a/doc/src/Eqs/rotate.tex
+++ /dev/null
@@ -1,26 +0,0 @@
-\documentclass[12pt]{article}
-
-\usepackage{amsmath}
-
-\begin{document}
-
-\begin{eqnarray*}
-\mathbf{x}
- &=& 
-\begin{pmatrix}
-\mathbf{a}  &
-\mathbf{b}  &
-\mathbf{c} 
-\end{pmatrix}
-\cdot 
- \frac{1}{V}
- \begin{pmatrix}
-\mathbf{B \times C}  \\
-\mathbf{C \times A}  \\
-\mathbf{A \times B} 
-\end{pmatrix}
-\cdot 
-\mathbf{X}
-\end{eqnarray*}
-
-\end{document}
diff --git a/doc/src/Eqs/stress_tensor.jpg b/doc/src/Eqs/stress_tensor.jpg
deleted file mode 100644
index a62d6aa973..0000000000
Binary files a/doc/src/Eqs/stress_tensor.jpg and /dev/null differ
diff --git a/doc/src/Eqs/stress_tensor.tex b/doc/src/Eqs/stress_tensor.tex
deleted file mode 100644
index f0d046ca23..0000000000
--- a/doc/src/Eqs/stress_tensor.tex
+++ /dev/null
@@ -1,20 +0,0 @@
-\documentclass[12pt]{article}
-
-\begin{document}
-
-\begin{eqnarray*}
-S_{ab} & = & - \left[ m v_a v_b + 
-   \frac{1}{2} \sum_{n = 1}^{N_p} (r_{1_a} F_{1_b} + r_{2_a} F_{2_b}) +
-   \frac{1}{2} \sum_{n = 1}^{N_b} (r_{1_a} F_{1_b} + r_{2_a} F_{2_b}) + \right. \\
-&& \left. \frac{1}{3} \sum_{n = 1}^{N_a} (r_{1_a} F_{1_b} + r_{2_a} F_{2_b} + 
-                                           r_{3_a} F_{3_b}) + 
-   \frac{1}{4} \sum_{n = 1}^{N_d} (r_{1_a} F_{1_b} + r_{2_a} F_{2_b} + 
-				   r_{3_a} F_{3_b} + r_{4_a} F_{4_b}) + \right. \\
-&& \left. \frac{1}{4} \sum_{n = 1}^{N_i} (r_{1_a} F_{1_b} + r_{2_a} F_{2_b} + 
-                                          r_{3_a} F_{3_b} + r_{4_a} F_{4_b}) +
-   {\rm Kspace}(r_{i_a},F_{i_b}) + 
-   \sum_{n = 1}^{N_f} r_{i_a} F_{i_b} \right]
-\end{eqnarray*}
-
-\end{document}
-
diff --git a/doc/src/Eqs/transform.jpg b/doc/src/Eqs/transform.jpg
deleted file mode 100644
index 4c591c4f9b..0000000000
Binary files a/doc/src/Eqs/transform.jpg and /dev/null differ
diff --git a/doc/src/Eqs/transform.tex b/doc/src/Eqs/transform.tex
deleted file mode 100644
index 744d7af117..0000000000
--- a/doc/src/Eqs/transform.tex
+++ /dev/null
@@ -1,27 +0,0 @@
-\documentclass[12pt]{article}
-
-\usepackage{amsmath}
-
-\begin{document}
-
-\begin{eqnarray*}
-\begin{pmatrix}
-\mathbf{a}  &
-\mathbf{b}  &
-\mathbf{c} 
-\end{pmatrix}
-& = &
-\begin{pmatrix}
-a_x & b_x & c_x \\
-0 & b_y & c_y \\
-0 & 0 & c_z \\
-\end{pmatrix} \\
-a_x &=& A \\
-b_x &=& \mathbf{B} \cdot \mathbf{\hat{A}} \quad = \quad B \cos{\gamma} \\
-b_y &=& |\mathbf{\hat{A}} \times \mathbf{B}| \quad = \quad B \sin{\gamma} \quad =  \quad  \sqrt{B^2 - {b_x}^2} \\
-c_x &=& \mathbf{C} \cdot \mathbf{\hat{A}} \quad = \quad C \cos{\beta} \\
-c_y &=& \mathbf{C} \cdot \widehat{(\mathbf{A} \times \mathbf{B})} \times \mathbf{\hat{A}} \quad = \quad \frac{\mathbf{B} \cdot \mathbf{C} - b_x c_x}{b_y} \\
-c_z &=& |\mathbf{C} \cdot \widehat{(\mathbf{A} \times \mathbf{B})}|\quad = \quad \sqrt{C^2 - {c_x}^2 - {c_y}^2} \\
-\end{eqnarray*}
-
-\end{document}
diff --git a/doc/src/Errors.rst b/doc/src/Errors.rst
index eccb94b7b0..896dfbcbef 100644
--- a/doc/src/Errors.rst
+++ b/doc/src/Errors.rst
@@ -7,7 +7,6 @@ and warnings doc pages give complete lists of all the messages the
 code may generate (except those generated by USER packages), with
 additional details for many of them.
 
-
 .. toctree::
    :maxdepth: 1
 
@@ -15,8 +14,3 @@ additional details for many of them.
    Errors_bugs
    Errors_messages
    Errors_warnings
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/Errors_bugs.rst b/doc/src/Errors_bugs.rst
index 5c297a3a1a..e169b93d81 100644
--- a/doc/src/Errors_bugs.rst
+++ b/doc/src/Errors_bugs.rst
@@ -1,32 +1,45 @@
 Reporting bugs
 ==============
 
-If you are confident that you have found a bug in LAMMPS, follow these
-steps.
+If you are confident that you have found a bug in LAMMPS, please follow the steps outlined below:
 
-Check the `New features and bug fixes <http://lammps.sandia.gov/bug.html>`_ section of the `LAMMPS WWW site <lws_>`_ to see if the bug has already been reported or fixed or the
-`Unfixed bug <http://lammps.sandia.gov/unbug.html>`_ to see if a fix is
-pending.
+ * Check the `New features and bug fixes
+   <https://lammps.sandia.gov/bug.html>`_ section of the `LAMMPS WWW site
+   <lws_>`_ to see if the bug has already been addressed in a patch.
+ * Check that your issue can be reproduced with the latest development
+   version of LAMMPS.
+ * Check the manual carefully to verify that the unexpected behavior you
+   are observing is indeed in conflict with the documentation
+ * Check the `GitHub Issue page <gip_>`_
+   if your issue has already been reported and if it is still open.
+ * Check the `GitHub Pull Requests page <https://github.com/lammps/pulls>`_
+   if there is already a fix for your bug pending.
+ * Check the `mailing list archives <https://lammps.sandia.gov/mail.html>`_
+   to see if the issue has been discussed before.
 
-Check the `mailing list <http://lammps.sandia.gov/mail.html>`_ to see if
-it has been discussed before.
+If none of these steps yields any useful information, please file
+a new bug report on the `GitHub Issue page <gip_>`_\ .
+The website will offer you to select a suitable template with explanations
+and then you should replace those explanations with the information
+that you can provide to reproduce your issue.
 
-If not, send an email to the mailing list describing the problem with
-any ideas you have as to what is causing it or where in the code the
-problem might be.  The developers will ask for more info if needed,
-such as an input script or data files.
+The most useful thing you can do to help us verify and fix a bug is to
+isolate the problem.  Run it on the smallest number of atoms and fewest
+number of processors with the simplest input script that reproduces the
+bug.  Try to identify what command or combination of commands is
+causing the problem and upload the complete input deck as a tar or zip
+archive.  Please avoid using binary restart files unless the issue requires
+it.  In the latter case you should also include an input deck to quickly
+generate this restart from a data file or a simple additional input.
 
-The most useful thing you can do to help us fix the bug is to isolate
-the problem.  Run it on the smallest number of atoms and fewest number
-of processors and with the simplest input script that reproduces the
-bug and try to identify what command or combination of commands is
-causing the problem.
+You may also send an email to the LAMMPS mailing list at
+"lammps-users at lists.sourceforge.net" describing the problem with the
+same kind of information.  The mailing list can provide a faster response,
+especially if the bug reported is actually expected behavior.  But because
+of the high volume of the mailing list, it can happen that your e-mail
+is overlooked and then forgotten.  Issues on GitHub have to be explicitly
+closed, so that will *guarantee* that at least one LAMMPS developer will
+have looked at it.
 
-.. note::
-
-   this page needs to have GitHub issues info added
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
+.. _lws: https://lammps.sandia.gov
+.. _gip: https://github.com/lammps/issues
diff --git a/doc/src/Errors_common.rst b/doc/src/Errors_common.rst
index 2da3e623dc..34567db385 100644
--- a/doc/src/Errors_common.rst
+++ b/doc/src/Errors_common.rst
@@ -38,8 +38,8 @@ input script command that it was processing.  Of course, LAMMPS cannot
 figure out your physics or numerical mistakes, like choosing too big a
 timestep, specifying erroneous force field coefficients, or putting 2
 atoms on top of each other!  If you run into errors that LAMMPS
-doesn't catch that you think it should flag, please send an email to
-the `developers <http://lammps.sandia.gov/authors.html>`_.
+does not catch that you think it should flag, please send an email to
+the `developers <https://lammps.sandia.gov/authors.html>`_.
 
 If you get an error message about an invalid command in your input
 script, you can determine what command is causing the problem by
@@ -63,25 +63,23 @@ is an integer or floating-point number, respectively, and reject the
 input with an error message (for instance, when an integer is required,
 but a floating-point number 1.0 is provided):
 
-
 .. parsed-literal::
 
    ERROR: Expected integer parameter instead of '1.0' in input script or data file
 
 Some commands allow for using variable references in place of numeric
 constants so that the value can be evaluated and may change over the
-course of a run.  This is typically done with the syntax *v\_name* for a
+course of a run.  This is typically done with the syntax *v_name* for a
 parameter, where name is the name of the variable. On the other hand,
-immediate variable expansion with the syntax $\ *name* is performed while
+immediate variable expansion with the syntax ${name} is performed while
 reading the input and before parsing commands,
 
 .. note::
 
-   Using a variable reference (i.e. *v\_name*) is only allowed if
+   Using a variable reference (i.e. *v_name*) is only allowed if
    the documentation of the corresponding command explicitly says it is.
    Otherwise, you will receive an error message of this kind:
 
-
 .. parsed-literal::
 
    ERROR: Expected floating point parameter instead of 'v_name' in input script or data file
@@ -98,13 +96,13 @@ cases:
 
 LAMMPS runs in the available memory a processor allows to be
 allocated.  Most reasonable MD runs are compute limited, not memory
-limited, so this shouldn't be a bottleneck on most platforms.  Almost
+limited, so this should not be a bottleneck on most platforms.  Almost
 all large memory allocations in the code are done via C-style malloc's
 which will generate an error message if you run out of memory.
 Smaller chunks of memory are allocated via C++ "new" statements.  If
 you are unlucky you could run out of memory just when one of these
 small requests is made, in which case the code will crash or hang (in
-parallel), since LAMMPS doesn't trap on those errors.
+parallel), since LAMMPS does not trap on those errors.
 
 Illegal arithmetic can cause LAMMPS to run slow or crash.  This is
 typically due to invalid physics and numerics that your simulation is
@@ -121,8 +119,3 @@ implementations handle buffering of messages.  If the code hangs
 without an error message, it may be that you need to specify an MPI
 setting or two (usually via an environment variable) to enable
 buffering or boost the sizes of messages that can be buffered.
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/Errors_messages.rst b/doc/src/Errors_messages.rst
index 8c457bba83..7f2b88d1fc 100644
--- a/doc/src/Errors_messages.rst
+++ b/doc/src/Errors_messages.rst
@@ -7,7 +7,6 @@ documentation for the offending command may help.  Error messages also
 list the source file and line number where the error was generated.
 For example, a message like this:
 
-
 .. parsed-literal::
 
    ERROR: Illegal velocity command (velocity.cpp:78)
@@ -16,17 +15,13 @@ means that line #78 in the file src/velocity.cpp generated the error.
 Looking in the source code may help you figure out what went wrong.
 
 Note that error messages from :doc:`user-contributed packages <Packages_user>` are not listed here.  If such an error
-occurs and is not self-explanatory, you'll need to look in the source
+occurs and is not self-explanatory, you will need to look in the source
 code or contact the author of the package.
 
 Doc page with :doc:`WARNING messages <Errors_warnings>`
 
-
 ----------
 
-
-
-
 *1-3 bond count is inconsistent*
    An inconsistency was detected when computing the number of 1-3
    neighbors for each atom.  This likely means something is wrong with
@@ -44,9 +39,9 @@ Doc page with :doc:`WARNING messages <Errors_warnings>`
 
 *All angle coeffs are not set*
    All angle coefficients must be set in the data file or by the
-   angle\_coeff command before running a simulation.
+   angle_coeff command before running a simulation.
 
-*All atom IDs = 0 but atom\_modify id = yes*
+*All atom IDs = 0 but atom_modify id = yes*
    Self-explanatory.
 
 *All atoms of a swapped type must have same charge.*
@@ -57,15 +52,15 @@ Doc page with :doc:`WARNING messages <Errors_warnings>`
 
 *All bond coeffs are not set*
    All bond coefficients must be set in the data file or by the
-   bond\_coeff command before running a simulation.
+   bond_coeff command before running a simulation.
 
 *All dihedral coeffs are not set*
    All dihedral coefficients must be set in the data file or by the
-   dihedral\_coeff command before running a simulation.
+   dihedral_coeff command before running a simulation.
 
 *All improper coeffs are not set*
    All improper coefficients must be set in the data file or by the
-   improper\_coeff command before running a simulation.
+   improper_coeff command before running a simulation.
 
 *All masses are not set*
    For atom styles that define masses for each atom type, all masses must
@@ -81,9 +76,9 @@ Doc page with :doc:`WARNING messages <Errors_warnings>`
 
 *All pair coeffs are not set*
    All pair coefficients must be set in the data file or by the
-   pair\_coeff command before running a simulation.
+   pair_coeff command before running a simulation.
 
-*All read\_dump x,y,z fields must be specified for scaled, triclinic coords*
+*All read_dump x,y,z fields must be specified for scaled, triclinic coords*
    For triclinic boxes and scaled coordinates you must specify all 3 of
    the x,y,z fields, else LAMMPS cannot reconstruct the unscaled
    coordinates.
@@ -94,8 +89,8 @@ Doc page with :doc:`WARNING messages <Errors_warnings>`
 *All variables in next command must be same style*
    Self-explanatory.
 
-*Angle atom missing in delete\_bonds*
-   The delete\_bonds command cannot find one or more atoms in a particular
+*Angle atom missing in delete_bonds*
+   The delete_bonds command cannot find one or more atoms in a particular
    angle on a particular processor.  The pairwise cutoff is too short or
    the atoms are too far apart to make a valid angle.
 
@@ -118,20 +113,20 @@ Doc page with :doc:`WARNING messages <Errors_warnings>`
 
 *Angle coeff for hybrid has invalid style*
    Angle style hybrid uses another angle style as one of its
-   coefficients.  The angle style used in the angle\_coeff command or read
+   coefficients.  The angle style used in the angle_coeff command or read
    from a restart file is not recognized.
 
 *Angle coeffs are not set*
    No angle coefficients have been assigned in the data file or via the
-   angle\_coeff command.
+   angle_coeff command.
 
 *Angle extent > half of periodic box length*
-   This error was detected by the neigh\_modify check yes setting.  It is
+   This error was detected by the neigh_modify check yes setting.  It is
    an error because the angle atoms are so far apart it is ambiguous how
    it should be defined.
 
 *Angle potential must be defined for SHAKE*
-   When shaking angles, an angle\_style potential must be used.
+   When shaking angles, an angle_style potential must be used.
 
 *Angle style hybrid cannot have hybrid as an argument*
    Self-explanatory.
@@ -148,18 +143,18 @@ Doc page with :doc:`WARNING messages <Errors_warnings>`
 *Angle table parameters did not set N*
    List of angle table parameters must include N setting.
 
-*Angle\_coeff command before angle\_style is defined*
-   Coefficients cannot be set in the data file or via the angle\_coeff
-   command until an angle\_style has been assigned.
+*Angle_coeff command before angle_style is defined*
+   Coefficients cannot be set in the data file or via the angle_coeff
+   command until an angle_style has been assigned.
 
-*Angle\_coeff command before simulation box is defined*
-   The angle\_coeff command cannot be used before a read\_data,
-   read\_restart, or create\_box command.
+*Angle_coeff command before simulation box is defined*
+   The angle_coeff command cannot be used before a read_data,
+   read_restart, or create_box command.
 
-*Angle\_coeff command when no angles allowed*
+*Angle_coeff command when no angles allowed*
    The chosen atom style does not allow for angles to be defined.
 
-*Angle\_style command when no angles allowed*
+*Angle_style command when no angles allowed*
    The chosen atom style does not allow for angles to be defined.
 
 *Angles assigned incorrectly*
@@ -216,7 +211,7 @@ Doc page with :doc:`WARNING messages <Errors_warnings>`
    This is probably because you have lost some atoms.
 
 *Atom in too many rigid bodies - boost MAXBODY*
-   Fix poems has a parameter MAXBODY (in fix\_poems.cpp) which determines
+   Fix poems has a parameter MAXBODY (in fix_poems.cpp) which determines
    the maximum number of rigid bodies a single atom can belong to (i.e. a
    multibody joint).  The bodies you have defined exceed this limit.
 
@@ -247,25 +242,25 @@ Doc page with :doc:`WARNING messages <Errors_warnings>`
    Atom-style variables generate one value per atom which is not allowed
    in an equal-style variable.
 
-*Atom\_modify id command after simulation box is defined*
-   The atom\_modify id command cannot be used after a read\_data,
-   read\_restart, or create\_box command.
+*Atom_modify id command after simulation box is defined*
+   The atom_modify id command cannot be used after a read_data,
+   read_restart, or create_box command.
 
-*Atom\_modify map command after simulation box is defined*
-   The atom\_modify map command cannot be used after a read\_data,
-   read\_restart, or create\_box command.
+*Atom_modify map command after simulation box is defined*
+   The atom_modify map command cannot be used after a read_data,
+   read_restart, or create_box command.
 
-*Atom\_modify sort and first options cannot be used together*
+*Atom_modify sort and first options cannot be used together*
    Self-explanatory.
 
-*Atom\_style command after simulation box is defined*
-   The atom\_style command cannot be used after a read\_data,
-   read\_restart, or create\_box command.
+*Atom_style command after simulation box is defined*
+   The atom_style command cannot be used after a read_data,
+   read_restart, or create_box command.
 
-*Atom\_style line can only be used in 2d simulations*
+*Atom_style line can only be used in 2d simulations*
    Self-explanatory.
 
-*Atom\_style tri can only be used in 3d simulations*
+*Atom_style tri can only be used in 3d simulations*
    Self-explanatory.
 
 *Atomfile variable could not read values*
@@ -306,17 +301,17 @@ Doc page with :doc:`WARNING messages <Errors_warnings>`
    Specified bond type is not valid.
 
 *Bad fix ID in fix append/atoms command*
-   The value of the fix\_id for keyword spatial must start with 'f\_'.
+   The value of the fix_id for keyword spatial must start with "f\_".
 
 *Bad grid of processors*
    The 3d grid of processors defined by the processors command does not
    match the number of processors LAMMPS is being run on.
 
-*Bad kspace\_modify kmax/ewald parameter*
-   Kspace\_modify values for the kmax/ewald keyword must be integers > 0
+*Bad kspace_modify kmax/ewald parameter*
+   Kspace_modify values for the kmax/ewald keyword must be integers > 0
 
-*Bad kspace\_modify slab parameter*
-   Kspace\_modify value for the slab/volume keyword must be >= 2.0.
+*Bad kspace_modify slab parameter*
+   Kspace_modify value for the slab/volume keyword must be >= 2.0.
 
 *Bad matrix inversion in mldivide3*
    This error should not occur unless the matrix is badly formed.
@@ -336,16 +331,16 @@ Doc page with :doc:`WARNING messages <Errors_warnings>`
    the Newton-Rhaphson method, but found a non-positive or NaN cutoff
 
 *Balance command before simulation box is defined*
-   The balance command cannot be used before a read\_data, read\_restart,
-   or create\_box command.
+   The balance command cannot be used before a read_data, read_restart,
+   or create_box command.
 
 *Balance produced bad splits*
    This should not occur.  It means two or more cutting plane locations
    are on top of each other or out of order.  Report the problem to the
    developers.
 
-*Balance rcb cannot be used with comm\_style brick*
-   Comm\_style tiled must be used instead.
+*Balance rcb cannot be used with comm_style brick*
+   Comm_style tiled must be used instead.
 
 *Balance shift string is invalid*
    The string can only contain the characters "x", "y", or "z".
@@ -372,10 +367,10 @@ Doc page with :doc:`WARNING messages <Errors_warnings>`
 
 *Bitmapped lookup tables require int/float be same size*
    Cannot use pair tables on this machine, because of word sizes.  Use
-   the pair\_modify command with table 0 instead.
+   the pair_modify command with table 0 instead.
 
 *Bitmapped table in file does not match requested table*
-   Setting for bitmapped table in pair\_coeff command must match table
+   Setting for bitmapped table in pair_coeff command must match table
    in file exactly.
 
 *Bitmapped table is incorrect length in table file*
@@ -390,8 +385,8 @@ Doc page with :doc:`WARNING messages <Errors_warnings>`
    processor.  Typically this is because the pairwise cutoff is set too
    short or the bond has blown apart and an atom is too far away.
 
-*Bond atom missing in delete\_bonds*
-   The delete\_bonds command cannot find one or more atoms in a particular
+*Bond atom missing in delete_bonds*
+   The delete_bonds command cannot find one or more atoms in a particular
    bond on a particular processor.  The pairwise cutoff is too short or
    the atoms are too far apart to make a valid bond.
 
@@ -417,15 +412,15 @@ Doc page with :doc:`WARNING messages <Errors_warnings>`
 
 *Bond coeff for hybrid has invalid style*
    Bond style hybrid uses another bond style as one of its coefficients.
-   The bond style used in the bond\_coeff command or read from a restart
+   The bond style used in the bond_coeff command or read from a restart
    file is not recognized.
 
 *Bond coeffs are not set*
    No bond coefficients have been assigned in the data file or via the
-   bond\_coeff command.
+   bond_coeff command.
 
 *Bond extent > half of periodic box length*
-   This error was detected by the neigh\_modify check yes setting.  It is
+   This error was detected by the neigh_modify check yes setting.  It is
    an error because the bond atoms are so far apart it is ambiguous how
    it should be defined.
 
@@ -449,7 +444,7 @@ Doc page with :doc:`WARNING messages <Errors_warnings>`
    This bond style can change the bond topology which is not
    allowed with this atom style.
 
-*Bond style quartic requires special\_bonds = 1,1,1*
+*Bond style quartic requires special_bonds = 1,1,1*
    This is a restriction of the current bond quartic implementation.
 
 *Bond table parameters did not set N*
@@ -464,18 +459,18 @@ Doc page with :doc:`WARNING messages <Errors_warnings>`
 *BondBond coeff for hybrid angle has invalid format*
    No "bb" field should appear in data file entry.
 
-*Bond\_coeff command before bond\_style is defined*
-   Coefficients cannot be set in the data file or via the bond\_coeff
-   command until an bond\_style has been assigned.
+*Bond_coeff command before bond_style is defined*
+   Coefficients cannot be set in the data file or via the bond_coeff
+   command until an bond_style has been assigned.
 
-*Bond\_coeff command before simulation box is defined*
-   The bond\_coeff command cannot be used before a read\_data,
-   read\_restart, or create\_box command.
+*Bond_coeff command before simulation box is defined*
+   The bond_coeff command cannot be used before a read_data,
+   read_restart, or create_box command.
 
-*Bond\_coeff command when no bonds allowed*
+*Bond_coeff command when no bonds allowed*
    The chosen atom style does not allow for bonds to be defined.
 
-*Bond\_style command when no bonds allowed*
+*Bond_style command when no bonds allowed*
    The chosen atom style does not allow for bonds to be defined.
 
 *Bonds assigned incorrectly*
@@ -486,7 +481,7 @@ Doc page with :doc:`WARNING messages <Errors_warnings>`
    The data file header lists bonds but no bond types.
 
 *Bond/react: Cannot use fix bond/react with non-molecular systems*
-   Only systems with bonds that can be changed can be used. Atom\_style
+   Only systems with bonds that can be changed can be used. Atom_style
    template does not qualify.
 
 *Bond/react: Invalid template atom ID in map file*
@@ -509,16 +504,16 @@ Doc page with :doc:`WARNING messages <Errors_warnings>`
 
 *Bond/react: Atom affected by reaction too close to template edge*
    This means an atom which changes type or connectivity during the
-   reaction is too close to an 'edge' atom defined in the superimpose
+   reaction is too close to an 'edge' atom defined in the map
    file. This could cause incorrect assignment of bonds, angle, etc.
    Generally, this means you must include more atoms in your templates,
    such that there are at least two atoms between each atom involved in
    the reaction and an edge atom.
 
 *Bond/react: Fix bond/react needs ghost atoms from farther away*
-   This is because a processor needs to superimpose the entire unreacted
+   This is because a processor needs to map the entire unreacted
    molecule template onto simulation atoms it knows about. The
-   comm\_modify cutoff command can be used to extend the communication
+   comm_modify cutoff command can be used to extend the communication
    range.
 
 *Bond/react: A deleted atom cannot remain bonded to an atom that is not deleted*
@@ -536,12 +531,12 @@ Doc page with :doc:`WARNING messages <Errors_warnings>`
 
 *Bond/react special bond generation overflow*
    The number of special bonds per-atom created by a reaction exceeds the
-   system setting. See the read\_data or create\_box command for how to
+   system setting. See the read_data or create_box command for how to
    specify this value.
 
 *Bond/react topology/atom exceed system topology/atom*
    The number of bonds, angles etc per-atom created by a reaction exceeds
-   the system setting. See the read\_data or create\_box command for how to
+   the system setting. See the read_data or create_box command for how to
    specify this value.
 
 *Both restart files must use % or neither*
@@ -555,16 +550,16 @@ Doc page with :doc:`WARNING messages <Errors_warnings>`
    be periodic on both sides.
 
 *Boundary command after simulation box is defined*
-   The boundary command cannot be used after a read\_data, read\_restart,
-   or create\_box command.
+   The boundary command cannot be used after a read_data, read_restart,
+   or create_box command.
 
 *Box bounds are invalid*
-   The box boundaries specified in the read\_data file are invalid.  The
+   The box boundaries specified in the read_data file are invalid.  The
    lo value must be less than the hi value for all 3 dimensions.
 
 *Box command after simulation box is defined*
-   The box command cannot be used after a read\_data, read\_restart, or
-   create\_box command.
+   The box command cannot be used after a read_data, read_restart, or
+   create_box command.
 
 *CPU neighbor lists must be used for ellipsoid/sphere mix.*
    When using Gay-Berne or RE-squared pair styles with both ellipsoidal and
@@ -614,7 +609,7 @@ Doc page with :doc:`WARNING messages <Errors_warnings>`
 *Cannot (yet) use PPPM with triclinic box and TIP4P*
    This feature is not yet supported.
 
-*Cannot (yet) use PPPM with triclinic box and kspace\_modify diff ad*
+*Cannot (yet) use PPPM with triclinic box and kspace_modify diff ad*
    This feature is not yet supported.
 
 *Cannot (yet) use PPPM with triclinic box and slab correction*
@@ -623,10 +618,10 @@ Doc page with :doc:`WARNING messages <Errors_warnings>`
 *Cannot (yet) use kspace slab correction with long-range dipoles and non-neutral systems or per-atom energy*
    This feature is not yet supported.
 
-*Cannot (yet) use kspace\_modify diff ad with compute group/group*
+*Cannot (yet) use kspace_modify diff ad with compute group/group*
    This option is not yet supported.
 
-*Cannot (yet) use kspace\_style pppm/stagger with triclinic systems*
+*Cannot (yet) use kspace_style pppm/stagger with triclinic systems*
    This feature is not yet supported.
 
 *Cannot (yet) use molecular templates with Kokkos*
@@ -641,7 +636,7 @@ Doc page with :doc:`WARNING messages <Errors_warnings>`
 *Cannot (yet) use rigid bodies with fix nh and Kokkos*
    Self-explanatory.
 
-*Cannot (yet) use single precision with MSM (remove -DFFT\_SINGLE from Makefile and re-compile)*
+*Cannot (yet) use single precision with MSM (remove -DFFT_SINGLE from Makefile and re-compile)*
    Single precision cannot be used with MSM.
 
 *Cannot add atoms to fix move variable*
@@ -673,10 +668,10 @@ Doc page with :doc:`WARNING messages <Errors_warnings>`
 *Cannot change box z boundary to non-periodic for a 2d simulation*
    Self-explanatory.
 
-*Cannot change dump\_modify every for dump dcd*
+*Cannot change dump_modify every for dump dcd*
    The frequency of writing dump dcd snapshots cannot be changed.
 
-*Cannot change dump\_modify every for dump xtc*
+*Cannot change dump_modify every for dump xtc*
    The frequency of writing dump xtc snapshots cannot be changed.
 
 *Cannot change timestep once fix srd is setup*
@@ -687,18 +682,18 @@ Doc page with :doc:`WARNING messages <Errors_warnings>`
    This is because fix pour pre-computes the time delay for particles to
    fall out of the insertion volume due to gravity.
 
-*Cannot change to comm\_style brick from tiled layout*
+*Cannot change to comm_style brick from tiled layout*
    Self-explanatory.
 
-*Cannot change\_box after reading restart file with per-atom info*
+*Cannot change_box after reading restart file with per-atom info*
    This is because the restart file info cannot be migrated with the
    atoms.  You can get around this by performing a 0-timestep run which
    will assign the restart file info to actual atoms.
 
-*Cannot change\_box in xz or yz for 2d simulation*
+*Cannot change_box in xz or yz for 2d simulation*
    Self-explanatory.
 
-*Cannot change\_box in z dimension for 2d simulation*
+*Cannot change_box in z dimension for 2d simulation*
    Self-explanatory.
 
 *Cannot clear group all*
@@ -708,8 +703,8 @@ Doc page with :doc:`WARNING messages <Errors_warnings>`
    This error was generated by MPI when reading/writing an MPI-IO restart
    file.
 
-*Cannot compute initial g\_ewald\_disp*
-   LAMMPS failed to compute an initial guess for the PPPM\_disp g\_ewald\_6
+*Cannot compute initial g_ewald_disp*
+   LAMMPS failed to compute an initial guess for the PPPM_disp g_ewald_6
    factor that partitions the computation between real space and k-space
    for Dispersion interactions.
 
@@ -718,19 +713,19 @@ Doc page with :doc:`WARNING messages <Errors_warnings>`
    but the atoms that have been defined have no IDs.
 
 *Cannot create atoms with undefined lattice*
-   Must use the lattice command before using the create\_atoms
+   Must use the lattice command before using the create_atoms
    command.
 
 *Cannot create/grow a vector/array of pointers for %s*
    LAMMPS code is making an illegal call to the templated memory
    allocaters, to create a vector or array of pointers.
 
-*Cannot create\_atoms after reading restart file with per-atom info*
+*Cannot create_atoms after reading restart file with per-atom info*
    The per-atom info was stored to be used when by a fix that you may
    re-define.  If you add atoms before re-defining the fix, then there
    will not be a correct amount of per-atom info.
 
-*Cannot create\_box after simulation box is defined*
+*Cannot create_box after simulation box is defined*
    A simulation box can only be defined once.
 
 *Cannot currently use pair reax with pair hybrid*
@@ -751,24 +746,24 @@ Doc page with :doc:`WARNING messages <Errors_warnings>`
 *Cannot delete group currently used by a fix*
    Self-explanatory.
 
-*Cannot delete group currently used by atom\_modify first*
+*Cannot delete group currently used by atom_modify first*
    Self-explanatory.
 
-*Cannot delete\_atoms bond yes for non-molecular systems*
+*Cannot delete_atoms bond yes for non-molecular systems*
    Self-explanatory.
 
-*Cannot displace\_atoms after reading restart file with per-atom info*
+*Cannot displace_atoms after reading restart file with per-atom info*
    This is because the restart file info cannot be migrated with the
    atoms.  You can get around this by performing a 0-timestep run which
    will assign the restart file info to actual atoms.
 
-*Cannot do GCMC on atoms in atom\_modify first group*
+*Cannot do GCMC on atoms in atom_modify first group*
    This is a restriction due to the way atoms are organized in a list to
-   enable the atom\_modify first command.
+   enable the atom_modify first command.
 
-*Cannot do atom/swap on atoms in atom\_modify first group*
+*Cannot do atom/swap on atoms in atom_modify first group*
    This is a restriction due to the way atoms are organized in a list to
-   enable the atom\_modify first command.
+   enable the atom_modify first command.
 
 *Cannot dump sort on atom IDs with no atom IDs defined*
    Self-explanatory.
@@ -781,15 +776,15 @@ Doc page with :doc:`WARNING messages <Errors_warnings>`
    When running LAMMPS via Python through the LAMMPS library interface
    you cannot also user the input script python command.
 
-*Cannot evaporate atoms in atom\_modify first group*
+*Cannot evaporate atoms in atom_modify first group*
    This is a restriction due to the way atoms are organized in
-   a list to enable the atom\_modify first command.
+   a list to enable the atom_modify first command.
 
-*Cannot find create\_bonds group ID*
+*Cannot find create_bonds group ID*
    Self-explanatory.
 
-*Cannot find delete\_bonds group ID*
-   Group ID used in the delete\_bonds command does not exist.
+*Cannot find delete_bonds group ID*
+   Group ID used in the delete_bonds command does not exist.
 
 *Cannot find specified group ID for core particles*
    Self-explanatory.
@@ -797,7 +792,7 @@ Doc page with :doc:`WARNING messages <Errors_warnings>`
 *Cannot find specified group ID for shell particles*
    Self-explanatory.
 
-*Cannot have both pair\_modify shift and tail set to yes*
+*Cannot have both pair_modify shift and tail set to yes*
    These 2 options are contradictory.
 
 *Cannot intersect groups using a dynamic group*
@@ -963,7 +958,7 @@ Doc page with :doc:`WARNING messages <Errors_warnings>`
 
 *Cannot open gzipped file*
    LAMMPS was compiled without support for reading and writing gzipped
-   files through a pipeline to the gzip program with -DLAMMPS\_GZIP.
+   files through a pipeline to the gzip program with -DLAMMPS_GZIP.
 
 *Cannot open input script %s*
    Self-explanatory.
@@ -994,7 +989,7 @@ Doc page with :doc:`WARNING messages <Errors_warnings>`
    The specified potential file cannot be opened.  Check that the path
    and name are correct.
 
-*Cannot open pair\_write file*
+*Cannot open pair_write file*
    The specified output file for pair energies and forces cannot be
    opened.  Check that the path and name are correct.
 
@@ -1041,12 +1036,12 @@ Doc page with :doc:`WARNING messages <Errors_warnings>`
    This error was generated by MPI when reading/writing an MPI-IO restart
    file.
 
-*Cannot read\_data without add keyword after simulation box is defined*
+*Cannot read_data without add keyword after simulation box is defined*
    Self-explanatory.
 
-*Cannot read\_restart after simulation box is defined*
-   The read\_restart command cannot be used after a read\_data,
-   read\_restart, or create\_box command.
+*Cannot read_restart after simulation box is defined*
+   The read_restart command cannot be used after a read_data,
+   read_restart, or create_box command.
 
 *Cannot redefine variable as a different style*
    An equal-style variable can be re-defined but only if it was
@@ -1091,7 +1086,7 @@ Doc page with :doc:`WARNING messages <Errors_warnings>`
 *Cannot set dpd/theta for this atom style*
    Self-explanatory.
 
-*Cannot set dump\_modify flush for dump xtc*
+*Cannot set dump_modify flush for dump xtc*
    Self-explanatory.
 
 *Cannot set mass for this atom style*
@@ -1167,7 +1162,7 @@ Doc page with :doc:`WARNING messages <Errors_warnings>`
 
 *Cannot use Ewald with 2d simulation*
    The kspace style ewald cannot be used in 2d simulations.  You can use
-   2d Ewald in a 3d simulation; see the kspace\_modify command.
+   2d Ewald in a 3d simulation; see the kspace_modify command.
 
 *Cannot use Ewald/disp solver on system with no charge, dipole, or LJ particles*
    No atoms in system have a non-zero charge or dipole, or are LJ
@@ -1181,21 +1176,21 @@ Doc page with :doc:`WARNING messages <Errors_warnings>`
    Self-explanatory.
 
 *Cannot use NEB unless atom map exists*
-   Use the atom\_modify command to create an atom map.
+   Use the atom_modify command to create an atom map.
 
 *Cannot use NEB with a single replica*
    Self-explanatory.
 
-*Cannot use NEB with atom\_modify sort enabled*
+*Cannot use NEB with atom_modify sort enabled*
    This is current restriction for NEB implemented in LAMMPS.
 
 *Cannot use PPPM with 2d simulation*
    The kspace style pppm cannot be used in 2d simulations.  You can use
-   2d PPPM in a 3d simulation; see the kspace\_modify command.
+   2d PPPM in a 3d simulation; see the kspace_modify command.
 
 *Cannot use PPPMDisp with 2d simulation*
    The kspace style pppm/disp cannot be used in 2d simulations.  You can
-   use 2d pppm/disp in a 3d simulation; see the kspace\_modify command.
+   use 2d pppm/disp in a 3d simulation; see the kspace_modify command.
 
 *Cannot use PRD with a changing box*
    The current box dimensions are not copied between replicas
@@ -1206,20 +1201,20 @@ Doc page with :doc:`WARNING messages <Errors_warnings>`
 *Cannot use PRD with a time-dependent region defined*
    PRD alters the timestep in ways that will mess up these regions.
 
-*Cannot use PRD with atom\_modify sort enabled*
+*Cannot use PRD with atom_modify sort enabled*
    This is a current restriction of PRD.  You must turn off sorting,
-   which is enabled by default, via the atom\_modify command.
+   which is enabled by default, via the atom_modify command.
 
 *Cannot use PRD with multi-processor replicas unless atom map exists*
-   Use the atom\_modify command to create an atom map.
+   Use the atom_modify command to create an atom map.
 
 *Cannot use TAD unless atom map exists for NEB*
-   See atom\_modify map command to set this.
+   See atom_modify map command to set this.
 
 *Cannot use TAD with a single replica for NEB*
    NEB requires multiple replicas.
 
-*Cannot use TAD with atom\_modify sort enabled for NEB*
+*Cannot use TAD with atom_modify sort enabled for NEB*
    This is a current restriction of NEB.
 
 *Cannot use a damped dynamics min style with fix box/relax*
@@ -1235,7 +1230,7 @@ Doc page with :doc:`WARNING messages <Errors_warnings>`
    type p (periodic).
 
 *Cannot use atomfile-style variable unless atom map exists*
-   Self-explanatory.  See the atom\_modify command to create a map.
+   Self-explanatory.  See the atom_modify command to create a map.
 
 *Cannot use both com and bias with compute temp/chunk*
    Self-explanatory.
@@ -1327,34 +1322,34 @@ Doc page with :doc:`WARNING messages <Errors_warnings>`
 *Cannot use compute cluster/atom unless atoms have IDs*
    Atom IDs are used to identify clusters.
 
-*Cannot use create\_atoms rotate unless single style*
+*Cannot use create_atoms rotate unless single style*
    Self-explanatory.
 
-*Cannot use create\_bonds unless atoms have IDs*
+*Cannot use create_bonds unless atoms have IDs*
    This command requires a mapping from global atom IDs to local atoms,
    but the atoms that have been defined have no IDs.
 
-*Cannot use create\_bonds with non-molecular system*
+*Cannot use create_bonds with non-molecular system*
    Self-explanatory.
 
 *Cannot use cwiggle in variable formula between runs*
    This is a function of elapsed time.
 
-*Cannot use delete\_atoms bond yes with atom\_style template*
+*Cannot use delete_atoms bond yes with atom_style template*
    This is because the bonds for that atom style are hardwired in the
    molecule template.
 
-*Cannot use delete\_atoms unless atoms have IDs*
-   Your atoms do not have IDs, so the delete\_atoms command cannot be
+*Cannot use delete_atoms unless atoms have IDs*
+   Your atoms do not have IDs, so the delete_atoms command cannot be
    used.
 
-*Cannot use delete\_bonds with non-molecular system*
+*Cannot use delete_bonds with non-molecular system*
    Your choice of atom style does not have bonds.
 
-*Cannot use dump\_modify fileper without % in dump file name*
+*Cannot use dump_modify fileper without % in dump file name*
    Self-explanatory.
 
-*Cannot use dump\_modify nfile without % in dump file name*
+*Cannot use dump_modify nfile without % in dump file name*
    Self-explanatory.
 
 *Cannot use dynamic group with fix adapt atom*
@@ -1363,19 +1358,19 @@ Doc page with :doc:`WARNING messages <Errors_warnings>`
 *Cannot use fix TMD unless atom map exists*
    Using this fix requires the ability to lookup an atom index, which is
    provided by an atom map.  An atom map does not exist (by default) for
-   non-molecular problems.  Using the atom\_modify map command will force
+   non-molecular problems.  Using the atom_modify map command will force
    an atom map to be created.
 
 *Cannot use fix bond/break with non-molecular systems*
-   Only systems with bonds that can be changed can be used.  Atom\_style
+   Only systems with bonds that can be changed can be used.  Atom_style
    template does not qualify.
 
 *Cannot use fix bond/create with non-molecular systems*
-   Only systems with bonds that can be changed can be used.  Atom\_style
+   Only systems with bonds that can be changed can be used.  Atom_style
    template does not qualify.
 
 *Cannot use fix bond/swap with non-molecular systems*
-   Only systems with bonds that can be changed can be used.  Atom\_style
+   Only systems with bonds that can be changed can be used.  Atom_style
    template does not qualify.
 
 *Cannot use fix box/relax on a 2nd non-periodic dimension*
@@ -1482,7 +1477,7 @@ Doc page with :doc:`WARNING messages <Errors_warnings>`
 *Cannot use fix press/berendsen with triclinic box*
    Self-explanatory.
 
-*Cannot use fix reax/bonds without pair\_style reax*
+*Cannot use fix reax/bonds without pair_style reax*
    Self-explanatory.
 
 *Cannot use fix rigid npt/nph and fix deform on same component of stress tensor*
@@ -1536,10 +1531,10 @@ Doc page with :doc:`WARNING messages <Errors_warnings>`
 *Cannot use fix wall/srd zlo/zhi for a 2d simulation*
    Self-explanatory.
 
-*Cannot use fix\_deposit unless atoms have IDs*
+*Cannot use fix_deposit unless atoms have IDs*
    Self-explanatory.
 
-*Cannot use fix\_pour unless atoms have IDs*
+*Cannot use fix_pour unless atoms have IDs*
    Self-explanatory.
 
 *Cannot use include command within an if command*
@@ -1560,7 +1555,7 @@ Doc page with :doc:`WARNING messages <Errors_warnings>`
 *Cannot use multiple fix wall commands with pair lubricateU*
    Self-explanatory.
 
-*Cannot use neigh\_modify exclude with GPU neighbor builds*
+*Cannot use neigh_modify exclude with GPU neighbor builds*
    This is a current limitation of the GPU implementation
    in LAMMPS.
 
@@ -1710,22 +1705,22 @@ Doc page with :doc:`WARNING messages <Errors_warnings>`
 
 *Cannot use non-periodic boundaries with Ewald*
    For kspace style ewald, all 3 dimensions must have periodic boundaries
-   unless you use the kspace\_modify command to define a 2d slab with a
+   unless you use the kspace_modify command to define a 2d slab with a
    non-periodic z dimension.
 
 *Cannot use non-periodic boundaries with EwaldDisp*
    For kspace style ewald/disp, all 3 dimensions must have periodic
-   boundaries unless you use the kspace\_modify command to define a 2d
+   boundaries unless you use the kspace_modify command to define a 2d
    slab with a non-periodic z dimension.
 
 *Cannot use non-periodic boundaries with PPPM*
    For kspace style pppm, all 3 dimensions must have periodic boundaries
-   unless you use the kspace\_modify command to define a 2d slab with a
+   unless you use the kspace_modify command to define a 2d slab with a
    non-periodic z dimension.
 
 *Cannot use non-periodic boundaries with PPPMDisp*
    For kspace style pppm/disp, all 3 dimensions must have periodic
-   boundaries unless you use the kspace\_modify command to define a 2d
+   boundaries unless you use the kspace_modify command to define a 2d
    slab with a non-periodic z dimension.
 
 *Cannot use order greater than 8 with pppm/gpu.*
@@ -1743,21 +1738,21 @@ Doc page with :doc:`WARNING messages <Errors_warnings>`
 *Cannot use ramp in variable formula between runs*
    This is because the ramp() function is time dependent.
 
-*Cannot use read\_data add before simulation box is defined*
+*Cannot use read_data add before simulation box is defined*
    Self-explanatory.
 
-*Cannot use read\_data extra with add flag*
+*Cannot use read_data extra with add flag*
    Self-explanatory.
 
-*Cannot use read\_data offset without add flag*
+*Cannot use read_data offset without add flag*
    Self-explanatory.
 
-*Cannot use read\_data shift without add flag*
+*Cannot use read_data shift without add flag*
    Self-explanatory.
 
 *Cannot use region INF or EDGE when box does not exist*
    Regions that extend to the box boundaries can only be used after the
-   create\_box command has been used.
+   create_box command has been used.
 
 *Cannot use set atom with no atom IDs defined*
    Atom IDs are not defined, so they cannot be used to identify an atom.
@@ -1798,10 +1793,10 @@ Doc page with :doc:`WARNING messages <Errors_warnings>`
 *Cannot use wall in periodic dimension*
    Self-explanatory.
 
-*Cannot use write\_restart fileper without % in restart file name*
+*Cannot use write_restart fileper without % in restart file name*
    Self-explanatory.
 
-*Cannot use write\_restart nfile without % in restart file name*
+*Cannot use write_restart nfile without % in restart file name*
    Self-explanatory.
 
 *Cannot wiggle and shear fix wall/gran*
@@ -1814,10 +1809,10 @@ Doc page with :doc:`WARNING messages <Errors_warnings>`
 *Cannot yet use KSpace solver with grid with comm style tiled*
    This is current restriction in LAMMPS.
 
-*Cannot yet use comm\_style tiled with multi-mode comm*
+*Cannot yet use comm_style tiled with multi-mode comm*
    Self-explanatory.
 
-*Cannot yet use comm\_style tiled with triclinic box*
+*Cannot yet use comm_style tiled with triclinic box*
    Self-explanatory.
 
 *Cannot yet use compute tally with Kokkos*
@@ -1845,10 +1840,10 @@ Doc page with :doc:`WARNING messages <Errors_warnings>`
 *Cannot zero momentum of no atoms*
    Self-explanatory.
 
-*Change\_box command before simulation box is defined*
+*Change_box command before simulation box is defined*
    Self-explanatory.
 
-*Change\_box volume used incorrectly*
+*Change_box volume used incorrectly*
    The "dim volume" option must be used immediately following one or two
    settings for "dim1 ..." (and optionally "dim2 ...") and must be for a
    different dimension, i.e. dim != dim1 and dim != dim2.
@@ -1887,23 +1882,23 @@ Doc page with :doc:`WARNING messages <Errors_warnings>`
    Self-explanatory.
 
 *Comm tiled invalid index in box drop brick*
-   Internal error check in comm\_style tiled which should not occur.
+   Internal error check in comm_style tiled which should not occur.
    Contact the developers.
 
 *Comm tiled mis-match in box drop brick*
-   Internal error check in comm\_style tiled which should not occur.
+   Internal error check in comm_style tiled which should not occur.
    Contact the developers.
 
-*Comm\_modify group != atom\_modify first group*
+*Comm_modify group != atom_modify first group*
    Self-explanatory.
 
-*Communication cutoff for comm\_style tiled cannot exceed periodic box length*
+*Communication cutoff for comm_style tiled cannot exceed periodic box length*
    Self-explanatory.
 
 *Communication cutoff too small for SNAP micro load balancing*
-   This can happen if you change the neighbor skin after your pair\_style
+   This can happen if you change the neighbor skin after your pair_style
    command or if your box dimensions grow during a run. You can set the
-   cutoff explicitly via the comm\_modify cutoff command.
+   cutoff explicitly via the comm_modify cutoff command.
 
 *Compute %s does not allow use of dynamic group*
    Dynamic groups have not yet been enabled for this compute.
@@ -1941,6 +1936,9 @@ Doc page with :doc:`WARNING messages <Errors_warnings>`
 *Compute ID for fix ave/time does not exist*
    Self-explanatory.
 
+*Compute ID for fix numdiff does not exist*
+   Self-explanatory.
+
 *Compute ID for fix store/state does not exist*
    Self-explanatory.
 
@@ -2179,7 +2177,7 @@ Doc page with :doc:`WARNING messages <Errors_warnings>`
    The command is accessing a vector added by the fix property/atom
    command, that does not exist.
 
-*Compute property/atom for atom property that isn't allocated*
+*Compute property/atom for atom property that is not allocated*
    Self-explanatory.
 
 *Compute property/atom integer vector does not exist*
@@ -2193,10 +2191,10 @@ Doc page with :doc:`WARNING messages <Errors_warnings>`
    Only inputs that generate the same number of datums can be used
    together.  E.g. bond and angle quantities cannot be mixed.
 
-*Compute property/local does not (yet) work with atom\_style template*
+*Compute property/local does not (yet) work with atom_style template*
    Self-explanatory.
 
-*Compute property/local for property that isn't allocated*
+*Compute property/local for property that is not allocated*
    Self-explanatory.
 
 *Compute rdf requires a pair style be defined*
@@ -2311,7 +2309,7 @@ Doc page with :doc:`WARNING messages <Errors_warnings>`
    The style of the specified compute is not chunk/atom.
 
 *Compute temp/cs requires ghost atoms store velocity*
-   Use the comm\_modify vel yes command to enable this.
+   Use the comm_modify vel yes command to enable this.
 
 *Compute temp/cs used when bonds are not allowed*
    This compute only works on pairs of bonded particles.
@@ -2373,14 +2371,14 @@ Doc page with :doc:`WARNING messages <Errors_warnings>`
 *Core/shell partners were not all found*
    Could not find or more atoms in the bond pairs.
 
-*Could not adjust g\_ewald\_6*
+*Could not adjust g_ewald_6*
    The Newton-Raphson solver failed to converge to a good value for
-   g\_ewald.  This error should not occur for typical problems.  Please
+   g_ewald.  This error should not occur for typical problems.  Please
    send an email to the developers.
 
-*Could not compute g\_ewald*
+*Could not compute g_ewald*
    The Newton-Raphson solver failed to converge to a good value for
-   g\_ewald.  This error should not occur for typical problems.  Please
+   g_ewald.  This error should not occur for typical problems.  Please
    send an email to the developers.
 
 *Could not compute grid size*
@@ -2431,11 +2429,11 @@ Doc page with :doc:`WARNING messages <Errors_warnings>`
    The provided Python code was run successfully, but it not
    define a callable function with the required name.
 
-*Could not find atom\_modify first group ID*
+*Could not find atom_modify first group ID*
    Self-explanatory.
 
-*Could not find change\_box group ID*
-   Group ID used in the change\_box command does not exist.
+*Could not find change_box group ID*
+   Group ID used in the change_box command does not exist.
 
 *Could not find compute ID for PRD*
    Self-explanatory.
@@ -2479,20 +2477,20 @@ Doc page with :doc:`WARNING messages <Errors_warnings>`
 *Could not find compute/voronoi surface group ID*
    Self-explanatory.
 
-*Could not find compute\_modify ID*
+*Could not find compute_modify ID*
    Self-explanatory.
 
 *Could not find custom per-atom property ID*
    Self-explanatory.
 
-*Could not find delete\_atoms group ID*
-   Group ID used in the delete\_atoms command does not exist.
+*Could not find delete_atoms group ID*
+   Group ID used in the delete_atoms command does not exist.
 
-*Could not find delete\_atoms region ID*
-   Region ID used in the delete\_atoms command does not exist.
+*Could not find delete_atoms region ID*
+   Region ID used in the delete_atoms command does not exist.
 
-*Could not find displace\_atoms group ID*
-   Group ID used in the displace\_atoms command does not exist.
+*Could not find displace_atoms group ID*
+   Group ID used in the displace_atoms command does not exist.
 
 *Could not find dump custom compute ID*
    Self-explanatory.
@@ -2534,6 +2532,9 @@ Doc page with :doc:`WARNING messages <Errors_warnings>`
    This should not happen unless you explicitly deleted
    a secondary fix that fix adapt created internally.
 
+*Could not find fix halt variable name*
+   Self-explanatory.
+
 *Could not find fix gcmc exclusion group ID*
    Self-explanatory.
 
@@ -2558,13 +2559,13 @@ Doc page with :doc:`WARNING messages <Errors_warnings>`
 *Could not find fix srd group ID*
    Self-explanatory.
 
-*Could not find fix\_modify ID*
-   A fix ID used in the fix\_modify command does not exist.
+*Could not find fix_modify ID*
+   A fix ID used in the fix_modify command does not exist.
 
-*Could not find fix\_modify pressure ID*
+*Could not find fix_modify pressure ID*
    The compute ID for computing pressure does not exist.
 
-*Could not find fix\_modify temperature ID*
+*Could not find fix_modify temperature ID*
    The compute ID for computing temperature does not exist.
 
 *Could not find group clear group ID*
@@ -2584,7 +2585,7 @@ Doc page with :doc:`WARNING messages <Errors_warnings>`
    Self-explanatory.
 
 *Could not find thermo compute ID*
-   Compute ID specified in thermo\_style command does not exist.
+   Compute ID specified in thermo_style command does not exist.
 
 *Could not find thermo custom compute ID*
    The compute ID needed by thermo style custom to compute a requested
@@ -2598,16 +2599,16 @@ Doc page with :doc:`WARNING messages <Errors_warnings>`
    Self-explanatory.
 
 *Could not find thermo fix ID*
-   Fix ID specified in thermo\_style command does not exist.
+   Fix ID specified in thermo_style command does not exist.
 
 *Could not find thermo variable name*
    Self-explanatory.
 
-*Could not find thermo\_modify pressure ID*
+*Could not find thermo_modify pressure ID*
    The compute ID needed by thermo style custom to compute pressure does
    not exist.
 
-*Could not find thermo\_modify temperature ID*
+*Could not find thermo_modify temperature ID*
    The compute ID needed by thermo style custom to compute temperature does
    not exist.
 
@@ -2651,66 +2652,66 @@ Doc page with :doc:`WARNING messages <Errors_warnings>`
 
 *Coulomb PPPMDisp order has been reduced below minorder*
    The default minimum order is 2.  This can be reset by the
-   kspace\_modify minorder command.
+   kspace_modify minorder command.
 
-*Coulombic cutoff not supported in pair\_style buck/long/coul/coul*
+*Coulombic cutoff not supported in pair_style buck/long/coul/coul*
    Must use long-range Coulombic interactions.
 
-*Coulombic cutoff not supported in pair\_style lj/long/coul/long*
+*Coulombic cutoff not supported in pair_style lj/long/coul/long*
    Must use long-range Coulombic interactions.
 
-*Coulombic cutoff not supported in pair\_style lj/long/tip4p/long*
+*Coulombic cutoff not supported in pair_style lj/long/tip4p/long*
    Must use long-range Coulombic interactions.
 
 *Coulombic cutoffs of pair hybrid sub-styles do not match*
    If using a Kspace solver, all Coulombic cutoffs of long pair styles must
    be the same.
 
-*Coulombic cut not supported in pair\_style lj/long/dipole/long*
+*Coulombic cut not supported in pair_style lj/long/dipole/long*
    Must use long-range Coulombic interactions.
 
-*Cound not find dump\_modify ID*
+*Cound not find dump_modify ID*
    Self-explanatory.
 
-*Create\_atoms command before simulation box is defined*
-   The create\_atoms command cannot be used before a read\_data,
-   read\_restart, or create\_box command.
+*Create_atoms command before simulation box is defined*
+   The create_atoms command cannot be used before a read_data,
+   read_restart, or create_box command.
 
-*Create\_atoms molecule has atom IDs, but system does not*
-   The atom\_style id command can be used to force atom IDs to be stored.
+*Create_atoms molecule has atom IDs, but system does not*
+   The atom_style id command can be used to force atom IDs to be stored.
 
-*Create\_atoms molecule must have atom types*
+*Create_atoms molecule must have atom types*
    The defined molecule does not specify atom types.
 
-*Create\_atoms molecule must have coordinates*
+*Create_atoms molecule must have coordinates*
    The defined molecule does not specify coordinates.
 
-*Create\_atoms region ID does not exist*
-   A region ID used in the create\_atoms command does not exist.
+*Create_atoms region ID does not exist*
+   A region ID used in the create_atoms command does not exist.
 
-*Create\_bonds command before simulation box is defined*
+*Create_bonds command before simulation box is defined*
    Self-explanatory.
 
-*Create\_bonds command requires no kspace\_style be defined*
+*Create_bonds command requires no kspace_style be defined*
    This is so that atom pairs that are already bonded to not appear
    in the neighbor list.
 
-*Create\_bonds command requires special\_bonds 1-2 weights be 0.0*
+*Create_bonds command requires special_bonds 1-2 weights be 0.0*
    This is so that atom pairs that are already bonded to not appear in
    the neighbor list.
 
-*Create\_bonds max distance > neighbor cutoff*
+*Create_bonds max distance > neighbor cutoff*
    Can only create bonds for atom pairs that will be in neighbor list.
 
-*Create\_bonds requires a pair style be defined*
+*Create_bonds requires a pair style be defined*
    Self-explanatory.
 
-*Create\_box region ID does not exist*
+*Create_box region ID does not exist*
    Self-explanatory.
 
-*Create\_box region does not support a bounding box*
+*Create_box region does not support a bounding box*
    Not all regions represent bounded volumes.  You cannot use
-   such a region with the create\_box command.
+   such a region with the create_box command.
 
 *Custom floating point vector for fix store/state does not exist*
    The command is accessing a vector added by the fix property/atom
@@ -2726,13 +2727,13 @@ Doc page with :doc:`WARNING messages <Errors_warnings>`
 *Custom per-atom property ID is not integer*
    Self-explanatory.
 
-*Cut-offs missing in pair\_style lj/long/dipole/long*
+*Cut-offs missing in pair_style lj/long/dipole/long*
    Self-explanatory.
 
-*Cutoffs missing in pair\_style buck/long/coul/long*
+*Cutoffs missing in pair_style buck/long/coul/long*
    Self-explanatory.
 
-*Cutoffs missing in pair\_style lj/long/coul/long*
+*Cutoffs missing in pair_style lj/long/coul/long*
    Self-explanatory.
 
 *Cyclic loop in joint connections*
@@ -2745,26 +2746,26 @@ Doc page with :doc:`WARNING messages <Errors_warnings>`
 *Delete region ID does not exist*
    Self-explanatory.
 
-*Delete\_atoms command before simulation box is defined*
-   The delete\_atoms command cannot be used before a read\_data,
-   read\_restart, or create\_box command.
+*Delete_atoms command before simulation box is defined*
+   The delete_atoms command cannot be used before a read_data,
+   read_restart, or create_box command.
 
-*Delete\_atoms cutoff > max neighbor cutoff*
+*Delete_atoms cutoff > max neighbor cutoff*
    Can only delete atoms in atom pairs that will be in neighbor list.
 
-*Delete\_atoms mol yes requires atom attribute molecule*
+*Delete_atoms mol yes requires atom attribute molecule*
    Cannot use this option with a non-molecular system.
 
-*Delete\_atoms requires a pair style be defined*
+*Delete_atoms requires a pair style be defined*
    This is because atom deletion within a cutoff uses a pairwise
    neighbor list.
 
-*Delete\_bonds command before simulation box is defined*
-   The delete\_bonds command cannot be used before a read\_data,
-   read\_restart, or create\_box command.
+*Delete_bonds command before simulation box is defined*
+   The delete_bonds command cannot be used before a read_data,
+   read_restart, or create_box command.
 
-*Delete\_bonds command with no atoms existing*
-   No atoms are yet defined so the delete\_bonds command cannot be used.
+*Delete_bonds command with no atoms existing*
+   No atoms are yet defined so the delete_bonds command cannot be used.
 
 *Deposition region extends outside simulation box*
    Self-explanatory.
@@ -2778,20 +2779,20 @@ Doc page with :doc:`WARNING messages <Errors_warnings>`
    Atoms read in from the restart file were not assigned correctly to
    processors.  This is likely due to some atom coordinates being outside
    a non-periodic simulation box.  Normally this should not happen.  You
-   may wish to use the "remap" option on the read\_restart command to see
+   may wish to use the "remap" option on the read_restart command to see
    if this helps.
 
 *Did not find all elements in MEAM library file*
-   The requested elements were not found in the MEAM file.
+   Some requested elements were not found in the MEAM file. Check spelling etc.
 
 *Did not find fix shake partner info*
    Could not find bond partners implied by fix shake command.  This error
-   can be triggered if the delete\_bonds command was used before fix
+   can be triggered if the delete_bonds command was used before fix
    shake, and it removed bonds without resetting the 1-2, 1-3, 1-4
    weighting list via the special keyword.
 
 *Did not find keyword in table file*
-   Keyword used in pair\_coeff command was not found in table file.
+   Keyword used in pair_coeff command was not found in table file.
 
 *Did not set pressure for fix rigid/nph*
    The press keyword must be specified.
@@ -2808,8 +2809,8 @@ Doc page with :doc:`WARNING messages <Errors_warnings>`
 *Did not set temperature or pressure for fix rigid/npt*
    The temp and press keywords must be specified.
 
-*Dihedral atom missing in delete\_bonds*
-   The delete\_bonds command cannot find one or more atoms in a particular
+*Dihedral atom missing in delete_bonds*
+   The delete_bonds command cannot find one or more atoms in a particular
    dihedral on a particular processor.  The pairwise cutoff is too short
    or the atoms are too far apart to make a valid dihedral.
 
@@ -2836,12 +2837,12 @@ Doc page with :doc:`WARNING messages <Errors_warnings>`
 
 *Dihedral coeff for hybrid has invalid style*
    Dihedral style hybrid uses another dihedral style as one of its
-   coefficients.  The dihedral style used in the dihedral\_coeff command
+   coefficients.  The dihedral style used in the dihedral_coeff command
    or read from a restart file is not recognized.
 
 *Dihedral coeffs are not set*
    No dihedral coefficients have been assigned in the data file or via
-   the dihedral\_coeff command.
+   the dihedral_coeff command.
 
 *Dihedral style hybrid cannot have hybrid as an argument*
    Self-explanatory.
@@ -2853,22 +2854,22 @@ Doc page with :doc:`WARNING messages <Errors_warnings>`
    Self-explanatory.
 
 *Dihedral/improper extent > half of periodic box length*
-   This error was detected by the neigh\_modify check yes setting.  It is
+   This error was detected by the neigh_modify check yes setting.  It is
    an error because the dihedral atoms are so far apart it is ambiguous
    how it should be defined.
 
-*Dihedral\_coeff command before dihedral\_style is defined*
-   Coefficients cannot be set in the data file or via the dihedral\_coeff
-   command until an dihedral\_style has been assigned.
+*Dihedral_coeff command before dihedral_style is defined*
+   Coefficients cannot be set in the data file or via the dihedral_coeff
+   command until an dihedral_style has been assigned.
 
-*Dihedral\_coeff command before simulation box is defined*
-   The dihedral\_coeff command cannot be used before a read\_data,
-   read\_restart, or create\_box command.
+*Dihedral_coeff command before simulation box is defined*
+   The dihedral_coeff command cannot be used before a read_data,
+   read_restart, or create_box command.
 
-*Dihedral\_coeff command when no dihedrals allowed*
+*Dihedral_coeff command when no dihedrals allowed*
    The chosen atom style does not allow for dihedrals to be defined.
 
-*Dihedral\_style command when no dihedrals allowed*
+*Dihedral_style command when no dihedrals allowed*
    The chosen atom style does not allow for dihedrals to be defined.
 
 *Dihedrals assigned incorrectly*
@@ -2880,16 +2881,19 @@ Doc page with :doc:`WARNING messages <Errors_warnings>`
    The data file header lists dihedrals but no dihedral types.
 
 *Dimension command after simulation box is defined*
-   The dimension command cannot be used after a read\_data,
-   read\_restart, or create\_box command.
+   The dimension command cannot be used after a read_data,
+   read_restart, or create_box command.
+
+*Disk limit not supported by OS or illegal path*
+   Self-explanatory.
 
 *Dispersion PPPMDisp order has been reduced below minorder*
    The default minimum order is 2.  This can be reset by the
-   kspace\_modify minorder command.
+   kspace_modify minorder command.
 
-*Displace\_atoms command before simulation box is defined*
-   The displace\_atoms command cannot be used before a read\_data,
-   read\_restart, or create\_box command.
+*Displace_atoms command before simulation box is defined*
+   The displace_atoms command cannot be used before a read_data,
+   read_restart, or create_box command.
 
 *Distance must be > 0 for compute event/displace*
    Self-explanatory.
@@ -2968,7 +2972,7 @@ Doc page with :doc:`WARNING messages <Errors_warnings>`
    Every snapshot written by dump dcd must contain the same # of atoms.
 
 *Dump dcd requires sorting by atom ID*
-   Use the dump\_modify sort command to enable this.
+   Use the dump_modify sort command to enable this.
 
 *Dump every variable returned a bad timestep*
    The variable must return a timestep greater than the current timestep.
@@ -3081,29 +3085,29 @@ Doc page with :doc:`WARNING messages <Errors_warnings>`
    Self-explanatory.
 
 *Dump xtc requires sorting by atom ID*
-   Use the dump\_modify sort command to enable this.
+   Use the dump_modify sort command to enable this.
 
 *Dump xyz/gz only writes compressed files*
    The dump xyz/gz output file name must have a .gz suffix.
 
-*Dump\_modify buffer yes not allowed for this style*
+*Dump_modify buffer yes not allowed for this style*
    Self-explanatory.
 
-*Dump\_modify format string is too short*
+*Dump_modify format string is too short*
    There are more fields to be dumped in a line of output than your
    format string specifies.
 
-*Dump\_modify region ID does not exist*
+*Dump_modify region ID does not exist*
    Self-explanatory.
 
-*Dumping an atom property that isn't allocated*
+*Dumping an atom property that is not allocated*
    The chosen atom style does not define the per-atom quantity being
    dumped.
 
 *Duplicate atom IDs exist*
    Self-explanatory.
 
-*Duplicate fields in read\_dump command*
+*Duplicate fields in read_dump command*
    Self-explanatory.
 
 *Duplicate particle in PeriDynamic bond - simulation box is too small*
@@ -3122,7 +3126,7 @@ Doc page with :doc:`WARNING messages <Errors_warnings>`
 
 *Energy was not tallied on needed timestep*
    You are using a thermo keyword that requires potentials to
-   have tallied energy, but they didn't on this timestep.  See the
+   have tallied energy, but they did not on this timestep.  See the
    variable doc page for ideas on how to make this work.
 
 *Epsilon or sigma reference not set by pair style in PPPMDisp*
@@ -3131,6 +3135,9 @@ Doc page with :doc:`WARNING messages <Errors_warnings>`
 *Epsilon or sigma reference not set by pair style in ewald/n*
    The pair style is not providing the needed epsilon or sigma values.
 
+*Error in MEAM parameter file: keyword %s (further information)*
+   Self-explanatory. Check the parameter file.
+
 *Error in vdw spline: inner radius > outer radius*
    A pre-tabulated spline is invalid.  Likely a problem with the
    potential parameters.
@@ -3210,7 +3217,7 @@ Doc page with :doc:`WARNING messages <Errors_warnings>`
 *Fix ID for fix vector does not exist*
    Self-explanatory.
 
-*Fix ID for read\_data does not exist*
+*Fix ID for read_data does not exist*
    Self-explanatory.
 
 *Fix ID for velocity does not exist*
@@ -3232,7 +3239,7 @@ Doc page with :doc:`WARNING messages <Errors_warnings>`
    conservative settings.
 
 *Fix SRD: too many big particles in bin*
-   Reset the ATOMPERBIN parameter at the top of fix\_srd.cpp
+   Reset the ATOMPERBIN parameter at the top of fix_srd.cpp
    to a larger value, and re-compile the code.
 
 *Fix SRD: too many walls in bin*
@@ -3478,15 +3485,15 @@ Doc page with :doc:`WARNING messages <Errors_warnings>`
 *Fix ave/time variable is not equal-style variable*
    Self-explanatory.
 
-*Fix balance rcb cannot be used with comm\_style brick*
-   Comm\_style tiled must be used instead.
+*Fix balance rcb cannot be used with comm_style brick*
+   Comm_style tiled must be used instead.
 
 *Fix balance shift string is invalid*
    The string can only contain the characters "x", "y", or "z".
 
 *Fix bond/break needs ghost atoms from further away*
    This is because the fix needs to walk bonds to a certain distance to
-   acquire needed info, The comm\_modify cutoff command can be used to
+   acquire needed info, The comm_modify cutoff command can be used to
    extend the communication range.
 
 *Fix bond/create angle type is invalid*
@@ -3503,13 +3510,13 @@ Doc page with :doc:`WARNING messages <Errors_warnings>`
    Self-explanatory.
 
 *Fix bond/create induced too many angles/dihedrals/impropers per atom*
-   See the read\_data command for info on using the "extra/angle/per/atom",
+   See the read_data command for info on using the "extra/angle/per/atom",
    (or dihedral, improper) keywords to allow for additional
    angles, dihedrals, and impropers to be formed.
 
 *Fix bond/create needs ghost atoms from further away*
    This is because the fix needs to walk bonds to a certain distance to
-   acquire needed info, The comm\_modify cutoff command can be used to
+   acquire needed info, The comm_modify cutoff command can be used to
    extend the communication range.
 
 *Fix bond/swap cannot use dihedral or improper styles*
@@ -3518,7 +3525,7 @@ Doc page with :doc:`WARNING messages <Errors_warnings>`
 *Fix bond/swap requires pair and bond styles*
    Self-explanatory.
 
-*Fix bond/swap requires special\_bonds = 0,1,1*
+*Fix bond/swap requires special_bonds = 0,1,1*
    Self-explanatory.
 
 *Fix box/relax generated negative box length*
@@ -3526,8 +3533,8 @@ Doc page with :doc:`WARNING messages <Errors_warnings>`
    it incrementally, to build to the high pressure.
 
 *Fix command before simulation box is defined*
-   The fix command cannot be used before a read\_data, read\_restart, or
-   create\_box command.
+   The fix command cannot be used before a read_data, read_restart, or
+   create_box command.
 
 *Fix deform cannot use yz variable with xy*
    The yz setting cannot be a variable if xy deformation is also
@@ -3558,8 +3565,8 @@ Doc page with :doc:`WARNING messages <Errors_warnings>`
 *Fix deposit molecule must have coordinates*
    The defined molecule does not specify coordinates.
 
-*Fix deposit molecule template ID must be same as atom\_style template ID*
-   When using atom\_style template, you cannot deposit molecules that are
+*Fix deposit molecule template ID must be same as atom_style template ID*
+   When using atom_style template, you cannot deposit molecules that are
    not in that template.
 
 *Fix deposit region cannot be dynamic*
@@ -3630,7 +3637,7 @@ Doc page with :doc:`WARNING messages <Errors_warnings>`
    molecule.  The user has specified atomic (non-molecular) gas
    exchanges, but an atom belonging to a molecule could be deleted.
 
-*Fix gcmc does not (yet) work with atom\_style template*
+*Fix gcmc does not (yet) work with atom_style template*
    Self-explanatory.
 
 *Fix gcmc molecule command requires that atoms have molecule attributes*
@@ -3647,8 +3654,8 @@ Doc page with :doc:`WARNING messages <Errors_warnings>`
 *Fix gcmc molecule must have coordinates*
    The defined molecule does not specify coordinates.
 
-*Fix gcmc molecule template ID must be same as atom\_style template ID*
-   When using atom\_style template, you cannot insert molecules that are
+*Fix gcmc molecule template ID must be same as atom_style template ID*
+   When using atom_style template, you cannot insert molecules that are
    not in that template.
 
 *Fix gcmc put atom outside box*
@@ -3694,6 +3701,9 @@ Doc page with :doc:`WARNING messages <Errors_warnings>`
 *Fix gld tau coefficients must be > 0*
    Self-explanatory.
 
+*Fix halt variable is not equal-style variable*
+   Self-explanatory.
+
 *Fix heat group has no atoms*
    Self-explanatory.
 
@@ -3779,6 +3789,14 @@ Doc page with :doc:`WARNING messages <Errors_warnings>`
    Self-explanatory.  The change in the box tilt is too extreme
    on a short timescale.
 
+*Fix numdiff requires an atom map, see atom_modify*
+   Self-explanatory. Efficient loop over all atoms for numerical
+   difference requires an atom map.
+
+*Fix numdiff requires consecutive atom IDs*
+   Self-explanatory. Efficient loop over all atoms for numerical
+   difference requires consecutive atom IDs.
+
 *Fix nve/asphere requires extended particles*
    This fix can only be used for particles with a shape setting.
 
@@ -3850,7 +3868,7 @@ Doc page with :doc:`WARNING messages <Errors_warnings>`
 *Fix orient/fcc found self twice*
    The neighbor lists used by fix orient/fcc are messed up.  If this
    error occurs, it is likely a bug, so send an email to the
-   `developers <http://lammps.sandia.gov/authors.html>`_.
+   `developers <https://lammps.sandia.gov/authors.html>`_.
 
 *Fix peri neigh does not exist*
    Somehow a fix that the pair style defines has been deleted.
@@ -3871,7 +3889,7 @@ Doc page with :doc:`WARNING messages <Errors_warnings>`
    The defined molecule does not specify coordinates.
 
 *Fix pour molecule template ID must be same as atom style template ID*
-   When using atom\_style template, you cannot pour molecules that are
+   When using atom_style template, you cannot pour molecules that are
    not in that template.
 
 *Fix pour polydisperse fractions do not sum to 1.0*
@@ -3905,10 +3923,10 @@ Doc page with :doc:`WARNING messages <Errors_warnings>`
 *Fix property/atom cannot specify q twice*
    Self-explanatory.
 
-*Fix property/atom mol when atom\_style already has molecule attribute*
+*Fix property/atom mol when atom_style already has molecule attribute*
    Self-explanatory.
 
-*Fix property/atom q when atom\_style already has charge attribute*
+*Fix property/atom q when atom_style already has charge attribute*
    Self-explanatory.
 
 *Fix property/atom vector name already exists*
@@ -3940,7 +3958,7 @@ Doc page with :doc:`WARNING messages <Errors_warnings>`
 
 *Fix qeq/point has insufficient QEq matrix size*
    Occurs when number of neighbor atoms for an atom increased too much
-   during a run.  Increase SAFE\_ZONE and MIN\_CAP in fix\_qeq.h and
+   during a run.  Increase SAFE_ZONE and MIN_CAP in fix_qeq.h and
    re-compile.
 
 *Fix qeq/point requires atom attribute q*
@@ -3951,7 +3969,7 @@ Doc page with :doc:`WARNING messages <Errors_warnings>`
 
 *Fix qeq/shielded has insufficient QEq matrix size*
    Occurs when number of neighbor atoms for an atom increased too much
-   during a run.  Increase SAFE\_ZONE and MIN\_CAP in fix\_qeq.h and
+   during a run.  Increase SAFE_ZONE and MIN_CAP in fix_qeq.h and
    re-compile.
 
 *Fix qeq/shielded requires atom attribute q*
@@ -3965,20 +3983,20 @@ Doc page with :doc:`WARNING messages <Errors_warnings>`
 
 *Fix qeq/slater has insufficient QEq matrix size*
    Occurs when number of neighbor atoms for an atom increased too much
-   during a run.  Increase SAFE\_ZONE and MIN\_CAP in fix\_qeq.h and
+   during a run.  Increase SAFE_ZONE and MIN_CAP in fix_qeq.h and
    re-compile.
 
 *Fix qeq/slater requires atom attribute q*
    Self-explanatory.
 
-*Fix reax/bonds numbonds > nsbmax\_most*
+*Fix reax/bonds numbonds > nsbmax_most*
    The limit of the number of bonds expected by the ReaxFF force field
    was exceeded.
 
 *Fix recenter group has no atoms*
    Self-explanatory.
 
-*Fix restrain requires an atom map, see atom\_modify*
+*Fix restrain requires an atom map, see atom_modify*
    Self-explanatory.
 
 *Fix rigid atom has non-zero image flag in a non-periodic dimension*
@@ -4002,22 +4020,22 @@ Doc page with :doc:`WARNING messages <Errors_warnings>`
 *Fix rigid npt/nph period must be > 0.0*
    Self-explanatory.
 
-*Fix rigid npt/small t\_chain should not be less than 1*
+*Fix rigid npt/small t_chain should not be less than 1*
    Self-explanatory.
 
-*Fix rigid npt/small t\_order must be 3 or 5*
+*Fix rigid npt/small t_order must be 3 or 5*
    Self-explanatory.
 
 *Fix rigid nvt/npt/nph damping parameters must be > 0.0*
    Self-explanatory.
 
-*Fix rigid nvt/small t\_chain should not be less than 1*
+*Fix rigid nvt/small t_chain should not be less than 1*
    Self-explanatory.
 
-*Fix rigid nvt/small t\_iter should not be less than 1*
+*Fix rigid nvt/small t_iter should not be less than 1*
    Self-explanatory.
 
-*Fix rigid nvt/small t\_order must be 3 or 5*
+*Fix rigid nvt/small t_order must be 3 or 5*
    Self-explanatory.
 
 *Fix rigid xy torque cannot be on for 2d simulation*
@@ -4065,7 +4083,7 @@ Doc page with :doc:`WARNING messages <Errors_warnings>`
 *Fix rigid/small nvt/npt/nph dilate group ID does not exist*
    Self-explanatory.
 
-*Fix rigid/small requires an atom map, see atom\_modify*
+*Fix rigid/small requires an atom map, see atom_modify*
    Self-explanatory.
 
 *Fix rigid/small requires atom attribute molecule*
@@ -4085,7 +4103,7 @@ Doc page with :doc:`WARNING messages <Errors_warnings>`
 *Fix spring couple group ID does not exist*
    Self-explanatory.
 
-*Fix srd can only currently be used with comm\_style brick*
+*Fix srd can only currently be used with comm_style brick*
    This is a current restriction in LAMMPS.
 
 *Fix srd lamda must be >= 0.6 of SRD grid size*
@@ -4099,7 +4117,7 @@ Doc page with :doc:`WARNING messages <Errors_warnings>`
    Self-explanatory.
 
 *Fix srd requires ghost atoms store velocity*
-   Use the comm\_modify vel yes command to enable this.
+   Use the comm_modify vel yes command to enable this.
 
 *Fix srd requires newton pair on*
    Self-explanatory.
@@ -4130,7 +4148,7 @@ Doc page with :doc:`WARNING messages <Errors_warnings>`
    Fixes that calculate global or local quantities cannot be used with
    fix store/state.
 
-*Fix store/state for atom property that isn't allocated*
+*Fix store/state for atom property that is not allocated*
    Self-explanatory.
 
 *Fix store/state variable is not atom-style variable*
@@ -4174,25 +4192,25 @@ Doc page with :doc:`WARNING messages <Errors_warnings>`
 *Fix ttm electron temperatures must be > 0.0*
    Self-explanatory.
 
-*Fix ttm electronic\_density must be > 0.0*
+*Fix ttm electronic_density must be > 0.0*
    Self-explanatory.
 
-*Fix ttm electronic\_specific\_heat must be > 0.0*
+*Fix ttm electronic_specific_heat must be > 0.0*
    Self-explanatory.
 
-*Fix ttm electronic\_thermal\_conductivity must be >= 0.0*
+*Fix ttm electronic_thermal_conductivity must be >= 0.0*
    Self-explanatory.
 
-*Fix ttm gamma\_p must be > 0.0*
+*Fix ttm gamma_p must be > 0.0*
    Self-explanatory.
 
-*Fix ttm gamma\_s must be >= 0.0*
+*Fix ttm gamma_s must be >= 0.0*
    Self-explanatory.
 
 *Fix ttm number of nodes must be > 0*
    Self-explanatory.
 
-*Fix ttm v\_0 must be >= 0.0*
+*Fix ttm v_0 must be >= 0.0*
    Self-explanatory.
 
 *Fix used in compute chunk/atom not computed at compatible time*
@@ -4266,10 +4284,10 @@ Doc page with :doc:`WARNING messages <Errors_warnings>`
 *Fix wall/region cutoff <= 0.0*
    Self-explanatory.
 
-*Fix\_modify pressure ID does not compute pressure*
+*Fix_modify pressure ID does not compute pressure*
    The compute ID assigned to the fix must compute pressure.
 
-*Fix\_modify temperature ID does not compute temperature*
+*Fix_modify temperature ID does not compute temperature*
    The compute ID assigned to the fix must compute temperature.
 
 *For triclinic deformation, specified target stress must be hydrostatic*
@@ -4282,7 +4300,7 @@ Doc page with :doc:`WARNING messages <Errors_warnings>`
 *GPU library not compiled for this accelerator*
    Self-explanatory.
 
-*GPU package does not (yet) work with atom\_style template*
+*GPU package does not (yet) work with atom_style template*
    Self-explanatory.
 
 *GPU particle split must be set to 1 for this pair style.*
@@ -4320,8 +4338,8 @@ Doc page with :doc:`WARNING messages <Errors_warnings>`
    This operation is not allowed.
 
 *Group command before simulation box is defined*
-   The group command cannot be used before a read\_data, read\_restart, or
-   create\_box command.
+   The group command cannot be used before a read_data, read_restart, or
+   create_box command.
 
 *Group dynamic cannot reference itself*
    Self-explanatory.
@@ -4335,8 +4353,8 @@ Doc page with :doc:`WARNING messages <Errors_warnings>`
 *Group region ID does not exist*
    A region ID used in the group command does not exist.
 
-*If read\_dump purges it cannot replace or trim*
-   These operations are not compatible.  See the read\_dump doc
+*If read_dump purges it cannot replace or trim*
+   These operations are not compatible.  See the read_dump doc
    page for details.
 
 *Illegal ... command*
@@ -4371,10 +4389,10 @@ Doc page with :doc:`WARNING messages <Errors_warnings>`
    One or more of the coefficients defined in the potential file is
    invalid.
 
-*Illegal dump\_modify sfactor value (must be > 0.0)*
+*Illegal dump_modify sfactor value (must be > 0.0)*
    Self-explanatory.
 
-*Illegal dump\_modify tfactor value (must be > 0.0)*
+*Illegal dump_modify tfactor value (must be > 0.0)*
    Self-explanatory.
 
 *Illegal fix gcmc gas mass <= 0*
@@ -4428,8 +4446,8 @@ Doc page with :doc:`WARNING messages <Errors_warnings>`
    Format of imageint stored in restart file is not consistent with
    LAMMPS version you are running.  See the settings in src/lmptype.h
 
-*Improper atom missing in delete\_bonds*
-   The delete\_bonds command cannot find one or more atoms in a particular
+*Improper atom missing in delete_bonds*
+   The delete_bonds command cannot find one or more atoms in a particular
    improper on a particular processor.  The pairwise cutoff is too short
    or the atoms are too far apart to make a valid improper.
 
@@ -4452,12 +4470,12 @@ Doc page with :doc:`WARNING messages <Errors_warnings>`
 
 *Improper coeff for hybrid has invalid style*
    Improper style hybrid uses another improper style as one of its
-   coefficients.  The improper style used in the improper\_coeff command
+   coefficients.  The improper style used in the improper_coeff command
    or read from a restart file is not recognized.
 
 *Improper coeffs are not set*
    No improper coefficients have been assigned in the data file or via
-   the improper\_coeff command.
+   the improper_coeff command.
 
 *Improper style hybrid cannot have hybrid as an argument*
    Self-explanatory.
@@ -4468,18 +4486,18 @@ Doc page with :doc:`WARNING messages <Errors_warnings>`
 *Improper style hybrid cannot use same improper style twice*
    Self-explanatory.
 
-*Improper\_coeff command before improper\_style is defined*
-   Coefficients cannot be set in the data file or via the improper\_coeff
-   command until an improper\_style has been assigned.
+*Improper_coeff command before improper_style is defined*
+   Coefficients cannot be set in the data file or via the improper_coeff
+   command until an improper_style has been assigned.
 
-*Improper\_coeff command before simulation box is defined*
-   The improper\_coeff command cannot be used before a read\_data,
-   read\_restart, or create\_box command.
+*Improper_coeff command before simulation box is defined*
+   The improper_coeff command cannot be used before a read_data,
+   read_restart, or create_box command.
 
-*Improper\_coeff command when no impropers allowed*
+*Improper_coeff command when no impropers allowed*
    The chosen atom style does not allow for impropers to be defined.
 
-*Improper\_style command when no impropers allowed*
+*Improper_style command when no impropers allowed*
    The chosen atom style does not allow for impropers to be defined.
 
 *Impropers assigned incorrectly*
@@ -4498,7 +4516,7 @@ Doc page with :doc:`WARNING messages <Errors_warnings>`
    The selected unit style is not compatible with the requested KIM
    Simulator Model.
 
-*Incomplete use of variables in create\_atoms command*
+*Incomplete use of variables in create_atoms command*
    The var and set options must be used together.
 
 *Inconsistent iparam/jparam values in fix bond/create command*
@@ -4545,7 +4563,7 @@ Doc page with :doc:`WARNING messages <Errors_warnings>`
 *Incorrect args for pair coefficients*
    Self-explanatory.  Check the input script or data file.
 
-*Incorrect args in pair\_style command*
+*Incorrect args in pair_style command*
    Self-explanatory.
 
 *Incorrect atom format in data file*
@@ -4556,7 +4574,7 @@ Doc page with :doc:`WARNING messages <Errors_warnings>`
    The number of fields per line is not what expected.
 
 *Incorrect bonus data format in data file*
-   See the read\_data doc page for a description of how various kinds of
+   See the read_data doc page for a description of how various kinds of
    bonus data must be formatted for certain atom styles.
 
 *Incorrect boundaries with slab Ewald*
@@ -4596,7 +4614,7 @@ Doc page with :doc:`WARNING messages <Errors_warnings>`
 *Incorrect format in COMB3 potential file*
    Incorrect number of words per line in the potential file.
 
-*Incorrect format in MEAM potential file*
+*Incorrect format in MEAM library file*
    Incorrect number of words per line in the potential file.
 
 *Incorrect format in SNAP coefficient file*
@@ -4657,7 +4675,7 @@ Doc page with :doc:`WARNING messages <Errors_warnings>`
 *Indexed per-atom vector in variable formula without atom map*
    Accessing a value from an atom vector requires the ability to lookup
    an atom index, which is provided by an atom map.  An atom map does not
-   exist (by default) for non-molecular problems.  Using the atom\_modify
+   exist (by default) for non-molecular problems.  Using the atom_modify
    map command will force an atom map to be created.
 
 *Initial temperatures not all set in fix ttm*
@@ -4689,7 +4707,7 @@ Doc page with :doc:`WARNING messages <Errors_warnings>`
    There is insufficient memory on one of the devices specified for the gpu
    package
 
-*Internal error in atom\_style body*
+*Internal error in atom_style body*
    This error should not occur.  Contact the developers.
 
 *Invalid -reorder N value*
@@ -4724,11 +4742,17 @@ Doc page with :doc:`WARNING messages <Errors_warnings>`
 
 *Invalid LAMMPS restart file*
    The file does not appear to be a LAMMPS restart file since
-   it doesn't contain the correct magic string at the beginning.
+   it does not contain the correct magic string at the beginning.
 
 *Invalid Masses section in molecule file*
    Self-explanatory.
 
+*Invalid molecule ID in molecule file*
+   Molecule ID must be a non-zero positive integer.
+
+*Invalid Molecules section in molecule file*
+   Self-explanatory.
+
 *Invalid REAX atom type*
    There is a mis-match between LAMMPS atom types and the elements
    listed in the ReaxFF force field file.
@@ -4756,7 +4780,7 @@ Doc page with :doc:`WARNING messages <Errors_warnings>`
    Self-explanatory.
 
 *Invalid args for non-hybrid pair coefficients*
-   "NULL" is only supported in pair\_coeff calls when using pair hybrid
+   "NULL" is only supported in pair_coeff calls when using pair hybrid
 
 *Invalid argument to factorial %d*
    N must be >= 0 and <= 167, otherwise the factorial result is too
@@ -4795,6 +4819,9 @@ Doc page with :doc:`WARNING messages <Errors_warnings>`
    Atom IDs must be positive integers and within range of defined
    atoms.
 
+*Invalid atom ID in Fragments section of molecule file*
+   Self-explanatory.
+
 *Invalid atom ID in Impropers section of data file*
    Atom IDs must be positive integers and within range of defined
    atoms.
@@ -4827,13 +4854,13 @@ Doc page with :doc:`WARNING messages <Errors_warnings>`
 *Invalid atom type in Atoms section of data file*
    Atom types must range from 1 to specified # of types.
 
-*Invalid atom type in create\_atoms command*
-   The create\_box command specified the range of valid atom types.
+*Invalid atom type in create_atoms command*
+   The create_box command specified the range of valid atom types.
    An invalid type is being requested.
 
-*Invalid atom type in create\_atoms mol command*
+*Invalid atom type in create_atoms mol command*
    The atom types in the defined molecule are added to the value
-   specified in the create\_atoms command, as an offset.  The final value
+   specified in the create_atoms command, as an offset.  The final value
    for each atom must be between 1 to N, where N is the number of atom
    types.
 
@@ -4848,7 +4875,7 @@ Doc page with :doc:`WARNING messages <Errors_warnings>`
 
 *Invalid atom type in fix deposit mol command*
    The atom types in the defined molecule are added to the value
-   specified in the create\_atoms command, as an offset.  The final value
+   specified in the create_atoms command, as an offset.  The final value
    for each atom must be between 1 to N, where N is the number of atom
    types.
 
@@ -4860,7 +4887,7 @@ Doc page with :doc:`WARNING messages <Errors_warnings>`
 
 *Invalid atom type in fix pour mol command*
    The atom types in the defined molecule are added to the value
-   specified in the create\_atoms command, as an offset.  The final value
+   specified in the create_atoms command, as an offset.  The final value
    for each atom must be between 1 to N, where N is the number of atom
    types.
 
@@ -4873,16 +4900,16 @@ Doc page with :doc:`WARNING messages <Errors_warnings>`
 *Invalid atom type index for fix shake*
    Atom types must range from 1 to Ntypes inclusive.
 
-*Invalid atom types in pair\_write command*
+*Invalid atom types in pair_write command*
    Atom types must range from 1 to Ntypes inclusive.
 
 *Invalid atom vector in variable formula*
    The atom vector is not recognized.
 
-*Invalid atom\_style body command*
+*Invalid atom_style body command*
    No body style argument was provided.
 
-*Invalid atom\_style command*
+*Invalid atom_style command*
    Self-explanatory.
 
 *Invalid attribute in dump custom command*
@@ -4894,7 +4921,7 @@ Doc page with :doc:`WARNING messages <Errors_warnings>`
 *Invalid attribute in dump modify command*
    Self-explanatory.
 
-*Invalid basis setting in create\_atoms command*
+*Invalid basis setting in create_atoms command*
    The basis index must be between 1 to N where N is the number of basis
    atoms in the lattice.  The type index must be between 1 to N where N
    is the number of atom types.
@@ -4926,7 +4953,7 @@ Doc page with :doc:`WARNING messages <Errors_warnings>`
 *Invalid bond type in Bonds section of molecule file*
    Self-explanatory.
 
-*Invalid bond type in create\_bonds command*
+*Invalid bond type in create_bonds command*
    Self-explanatory.
 
 *Invalid bond type in fix bond/break command*
@@ -4941,9 +4968,9 @@ Doc page with :doc:`WARNING messages <Errors_warnings>`
 *Invalid coeffs for this dihedral style*
    Cannot set class 2 coeffs in data file for this dihedral style.
 
-*Invalid color in dump\_modify command*
+*Invalid color in dump_modify command*
    The specified color name was not in the list of recognized colors.
-   See the dump\_modify doc page.
+   See the dump_modify doc page.
 
 *Invalid color map min/max values*
    The min/max values are not consistent with either each other or
@@ -4956,17 +4983,17 @@ Doc page with :doc:`WARNING messages <Errors_warnings>`
 *Invalid compute ID in variable formula*
    The compute is not recognized.
 
-*Invalid create\_atoms rotation vector for 2d model*
+*Invalid create_atoms rotation vector for 2d model*
    The rotation vector can only have a z component.
 
 *Invalid custom OpenCL parameter string.*
    There are not enough or too many parameters in the custom string for package
    GPU.
 
-*Invalid cutoff in comm\_modify command*
+*Invalid cutoff in comm_modify command*
    Specified cutoff must be >= 0.0.
 
-*Invalid cutoffs in pair\_write command*
+*Invalid cutoffs in pair_write command*
    Inner cutoff must be larger than 0.0 and less than outer cutoff.
 
 *Invalid d1 or d2 value for pair colloid coeff*
@@ -5032,7 +5059,7 @@ Doc page with :doc:`WARNING messages <Errors_warnings>`
 *Invalid data file section: Triangles*
    Atom style does not allow triangles.
 
-*Invalid delta\_conf in tad command*
+*Invalid delta_conf in tad command*
    The value must be between 0 and 1 inclusive.
 
 *Invalid density in Atoms section of data file*
@@ -5057,7 +5084,7 @@ Doc page with :doc:`WARNING messages <Errors_warnings>`
 *Invalid dipole length in set command*
    Self-explanatory.
 
-*Invalid displace\_atoms rotate axis for 2d*
+*Invalid displace_atoms rotate axis for 2d*
    Axis must be in z direction.
 
 *Invalid dump dcd filename*
@@ -5069,7 +5096,7 @@ Doc page with :doc:`WARNING messages <Errors_warnings>`
 
 *Invalid dump image element name*
    The specified element name was not in the standard list of elements.
-   See the dump\_modify doc page.
+   See the dump_modify doc page.
 
 *Invalid dump image filename*
    The file produced by dump image cannot be binary and must
@@ -5096,7 +5123,7 @@ Doc page with :doc:`WARNING messages <Errors_warnings>`
    Filenames used with the dump xyz style cannot be binary or cause files
    to be written by each processor.
 
-*Invalid dump\_modify threshold operator*
+*Invalid dump_modify threshold operator*
    Operator keyword used for threshold specification in not recognized.
 
 *Invalid entry in -reorder file*
@@ -5118,6 +5145,12 @@ Doc page with :doc:`WARNING messages <Errors_warnings>`
 *Invalid fix box/relax pressure settings*
    Settings for coupled dimensions must be the same.
 
+*Invalid fix halt attribute*
+   Self-explanatory.
+
+*Invalid fix halt operator*
+   Self-explanatory.
+
 *Invalid fix nvt/npt/nph command for a 2d simulation*
    Cannot control z dimension in a 2d model.
 
@@ -5166,13 +5199,13 @@ Doc page with :doc:`WARNING messages <Errors_warnings>`
 *Invalid frequency in temper command*
    Nevery must be > 0.
 
-*Invalid group ID in neigh\_modify command*
-   A group ID used in the neigh\_modify command does not exist.
+*Invalid group ID in neigh_modify command*
+   A group ID used in the neigh_modify command does not exist.
 
 *Invalid group function in variable formula*
    Group function is not recognized.
 
-*Invalid group in comm\_modify command*
+*Invalid group in comm_modify command*
    Self-explanatory.
 
 *Invalid image up vector*
@@ -5197,13 +5230,13 @@ Doc page with :doc:`WARNING messages <Errors_warnings>`
 *Invalid index in compute body/local command*
    Self-explanatory.
 
-*Invalid is\_active() function in variable formula*
+*Invalid is_active() function in variable formula*
    Self-explanatory.
 
-*Invalid is\_available() function in variable formula*
+*Invalid is_available() function in variable formula*
    Self-explanatory.
 
-*Invalid is\_defined() function in variable formula*
+*Invalid is_defined() function in variable formula*
    Self-explanatory.
 
 *Invalid keyword in angle table parameters*
@@ -5271,7 +5304,7 @@ Doc page with :doc:`WARNING messages <Errors_warnings>`
    kspace, etc.
 
 *Invalid pair table cutoff*
-   Cutoffs in pair\_coeff command are not valid with read-in pair table.
+   Cutoffs in pair_coeff command are not valid with read-in pair table.
 
 *Invalid pair table length*
    Length of read-in pair table is invalid
@@ -5359,16 +5392,16 @@ Doc page with :doc:`WARNING messages <Errors_warnings>`
 *Invalid special function in variable formula*
    Self-explanatory.
 
-*Invalid style in pair\_write command*
+*Invalid style in pair_write command*
    Self-explanatory.  Check the input script.
 
 *Invalid syntax in variable formula*
    Self-explanatory.
 
-*Invalid t\_event in prd command*
+*Invalid t_event in prd command*
    Self-explanatory.
 
-*Invalid t\_event in tad command*
+*Invalid t_event in tad command*
    The value must be greater than 0.
 
 *Invalid template atom in Atoms section of data file*
@@ -5382,8 +5415,8 @@ Doc page with :doc:`WARNING messages <Errors_warnings>`
 *Invalid thermo keyword in variable formula*
    The keyword is not recognized.
 
-*Invalid threads\_per\_atom specified.*
-   For 3-body potentials on the GPU, the threads\_per\_atom setting cannot be
+*Invalid threads_per_atom specified.*
+   For 3-body potentials on the GPU, the threads_per_atom setting cannot be
    greater than 4 for NVIDIA GPUs.
 
 *Invalid timestep reset for fix ave/atom*
@@ -5478,10 +5511,10 @@ Doc page with :doc:`WARNING messages <Errors_warnings>`
    Model.  Please contact the OpenKIM database maintainers to verify
    and potentially correct this.
 
-*KOKKOS package does not yet support comm\_style tiled*
+*KOKKOS package does not yet support comm_style tiled*
    Self-explanatory.
 
-*KOKKOS package requires a kokkos enabled atom\_style*
+*KOKKOS package requires a kokkos enabled atom_style*
    Self-explanatory.
 
 *KSpace accuracy must be > 0*
@@ -5489,7 +5522,7 @@ Doc page with :doc:`WARNING messages <Errors_warnings>`
 
 *KSpace accuracy too large to estimate G vector*
    Reduce the accuracy request or specify gewald explicitly
-   via the kspace\_modify command.
+   via the kspace_modify command.
 
 *KSpace accuracy too low*
    Requested accuracy must be less than 1.0.
@@ -5502,7 +5535,7 @@ Doc page with :doc:`WARNING messages <Errors_warnings>`
    simulation boxes.
 
 *KSpace style has not yet been set*
-   Cannot use kspace\_modify command until a kspace style is set.
+   Cannot use kspace_modify command until a kspace style is set.
 
 *KSpace style is incompatible with Pair style*
    Setting a kspace style requires that a pair style with matching
@@ -5514,11 +5547,11 @@ Doc page with :doc:`WARNING messages <Errors_warnings>`
 *Kokkos has been compiled for CUDA but no GPUs are requested*
    One or more GPUs must be used when Kokkos is compiled for CUDA.
 
-*Kspace\_modify mesh parameter must be all zero or all positive*
+*Kspace_modify mesh parameter must be all zero or all positive*
    Valid kspace mesh parameters are >0. The code will try to auto-detect
    suitable values when all three mesh sizes are set to zero (the default).
 
-*Kspace\_modify mesh/disp parameter must be all zero or all positive*
+*Kspace_modify mesh/disp parameter must be all zero or all positive*
    Valid kspace mesh/disp parameters are >0. The code will try to auto-detect
    suitable values when all three mesh sizes are set to zero **and**
    the required accuracy via *force/disp/real* as well as
@@ -5536,17 +5569,17 @@ Doc page with :doc:`WARNING messages <Errors_warnings>`
 *Kspace style requires atom attribute q*
    The atom style defined does not have these attributes.
 
-*Kspace\_modify eigtol must be smaller than one*
+*Kspace_modify eigtol must be smaller than one*
    Self-explanatory.
 
 *LAMMPS is not built with Python embedded*
    This is done by including the PYTHON package before LAMMPS is built.
    This is required to use python-style variables.
 
-*LAMMPS unit\_style lj not supported by KIM models*
+*LAMMPS unit_style lj not supported by KIM models*
    Self-explanatory. Check the input script or data file.
 
-*LJ6 off not supported in pair\_style buck/long/coul/long*
+*LJ6 off not supported in pair_style buck/long/coul/long*
    Self-explanatory.
 
 *Label wasn't found in input script*
@@ -5583,7 +5616,7 @@ Doc page with :doc:`WARNING messages <Errors_warnings>`
 
 *Lost atoms: original %ld current %ld*
    Lost atoms are checked for each time thermo output is done.  See the
-   thermo\_modify lost command for options.  Lost atoms usually indicate
+   thermo_modify lost command for options.  Lost atoms usually indicate
    bad dynamics, e.g. atoms have been blown far out of the simulation
    box, or moved further than one processor's sub-domain away before
    reneighboring.
@@ -5591,13 +5624,13 @@ Doc page with :doc:`WARNING messages <Errors_warnings>`
 *MEAM library error %d*
    A call to the MEAM Fortran library returned an error.
 
-*MPI\_LMP\_BIGINT and bigint in lmptype.h are not compatible*
+*MPI_LMP_BIGINT and bigint in lmptype.h are not compatible*
    The size of the MPI datatype does not match the size of a bigint.
 
-*MPI\_LMP\_TAGINT and tagint in lmptype.h are not compatible*
+*MPI_LMP_TAGINT and tagint in lmptype.h are not compatible*
    The size of the MPI datatype does not match the size of a tagint.
 
-*MSM can only currently be used with comm\_style brick*
+*MSM can only currently be used with comm_style brick*
    This is a current restriction in LAMMPS.
 
 *MSM grid is too large*
@@ -5610,23 +5643,23 @@ Doc page with :doc:`WARNING messages <Errors_warnings>`
    the MSM order can only be 4, 6, 8, or 10.
 
 *Mass command before simulation box is defined*
-   The mass command cannot be used before a read\_data, read\_restart, or
-   create\_box command.
+   The mass command cannot be used before a read_data, read_restart, or
+   create_box command.
 
 *Matrix factorization to split dispersion coefficients failed*
    This should not normally happen.  Contact the developers.
 
-*Min\_style command before simulation box is defined*
-   The min\_style command cannot be used before a read\_data, read\_restart,
-   or create\_box command.
+*Min_style command before simulation box is defined*
+   The min_style command cannot be used before a read_data, read_restart,
+   or create_box command.
 
-*Minimization could not find thermo\_pe compute*
+*Minimization could not find thermo_pe compute*
    This compute is created by the thermo command.  It must have been
    explicitly deleted by a uncompute command.
 
 *Minimize command before simulation box is defined*
-   The minimize command cannot be used before a read\_data, read\_restart,
-   or create\_box command.
+   The minimize command cannot be used before a read_data, read_restart,
+   or create_box command.
 
 *Mismatched brackets in variable*
    Self-explanatory.
@@ -5639,6 +5672,9 @@ Doc page with :doc:`WARNING messages <Errors_warnings>`
    A fix is referenced incorrectly or a fix that produces per-atom
    values is used in an equal-style variable formula.
 
+*Mismatched parameter in MEAM library file: z!=lat*
+   The coordination number and lattice do not match, check that consistent values are given.
+
 *Mismatched variable in variable formula*
    A variable is referenced incorrectly or an atom-style variable that
    produces per-atom values is used in an equal-style variable
@@ -5708,10 +5744,10 @@ Doc page with :doc:`WARNING messages <Errors_warnings>`
 *Molecule sizescale must be 1.0 for body particle*
    Self-explanatory.
 
-*Molecule template ID for atom\_style template does not exist*
+*Molecule template ID for atom_style template does not exist*
    Self-explanatory.
 
-*Molecule template ID for create\_atoms does not exist*
+*Molecule template ID for create_atoms does not exist*
    Self-explanatory.
 
 *Molecule template ID for fix deposit does not exist*
@@ -5734,12 +5770,12 @@ Doc page with :doc:`WARNING messages <Errors_warnings>`
 
 *Molecule topology/atom exceeds system topology/atom*
    The number of bonds, angles, etc per-atom in the molecule exceeds the
-   system setting.  See the create\_box command for how to specify these
+   system setting.  See the create_box command for how to specify these
    values.
 
 *Molecule topology type exceeds system topology type*
    The number of bond, angle, etc types in the molecule exceeds the
-   system setting.  See the create\_box command for how to specify these
+   system setting.  See the create_box command for how to specify these
    values.
 
 *More than one fix deform*
@@ -5755,60 +5791,60 @@ Doc page with :doc:`WARNING messages <Errors_warnings>`
 *Mu not allowed when not using semi-grand in fix atom/swap command*
    Self-explanatory.
 
-*Must define angle\_style before Angle Coeffs*
-   Must use an angle\_style command before reading a data file that
+*Must define angle_style before Angle Coeffs*
+   Must use an angle_style command before reading a data file that
    defines Angle Coeffs.
 
-*Must define angle\_style before BondAngle Coeffs*
-   Must use an angle\_style command before reading a data file that
+*Must define angle_style before BondAngle Coeffs*
+   Must use an angle_style command before reading a data file that
    defines Angle Coeffs.
 
-*Must define angle\_style before BondBond Coeffs*
-   Must use an angle\_style command before reading a data file that
+*Must define angle_style before BondBond Coeffs*
+   Must use an angle_style command before reading a data file that
    defines Angle Coeffs.
 
-*Must define bond\_style before Bond Coeffs*
-   Must use a bond\_style command before reading a data file that
+*Must define bond_style before Bond Coeffs*
+   Must use a bond_style command before reading a data file that
    defines Bond Coeffs.
 
-*Must define dihedral\_style before AngleAngleTorsion Coeffs*
-   Must use a dihedral\_style command before reading a data file that
+*Must define dihedral_style before AngleAngleTorsion Coeffs*
+   Must use a dihedral_style command before reading a data file that
    defines AngleAngleTorsion Coeffs.
 
-*Must define dihedral\_style before AngleTorsion Coeffs*
-   Must use a dihedral\_style command before reading a data file that
+*Must define dihedral_style before AngleTorsion Coeffs*
+   Must use a dihedral_style command before reading a data file that
    defines AngleTorsion Coeffs.
 
-*Must define dihedral\_style before BondBond13 Coeffs*
-   Must use a dihedral\_style command before reading a data file that
+*Must define dihedral_style before BondBond13 Coeffs*
+   Must use a dihedral_style command before reading a data file that
    defines BondBond13 Coeffs.
 
-*Must define dihedral\_style before Dihedral Coeffs*
-   Must use a dihedral\_style command before reading a data file that
+*Must define dihedral_style before Dihedral Coeffs*
+   Must use a dihedral_style command before reading a data file that
    defines Dihedral Coeffs.
 
-*Must define dihedral\_style before EndBondTorsion Coeffs*
-   Must use a dihedral\_style command before reading a data file that
+*Must define dihedral_style before EndBondTorsion Coeffs*
+   Must use a dihedral_style command before reading a data file that
    defines EndBondTorsion Coeffs.
 
-*Must define dihedral\_style before MiddleBondTorsion Coeffs*
-   Must use a dihedral\_style command before reading a data file that
+*Must define dihedral_style before MiddleBondTorsion Coeffs*
+   Must use a dihedral_style command before reading a data file that
    defines MiddleBondTorsion Coeffs.
 
-*Must define improper\_style before AngleAngle Coeffs*
-   Must use an improper\_style command before reading a data file that
+*Must define improper_style before AngleAngle Coeffs*
+   Must use an improper_style command before reading a data file that
    defines AngleAngle Coeffs.
 
-*Must define improper\_style before Improper Coeffs*
-   Must use an improper\_style command before reading a data file that
+*Must define improper_style before Improper Coeffs*
+   Must use an improper_style command before reading a data file that
    defines Improper Coeffs.
 
-*Must define pair\_style before Pair Coeffs*
-   Must use a pair\_style command before reading a data file that defines
+*Must define pair_style before Pair Coeffs*
+   Must use a pair_style command before reading a data file that defines
    Pair Coeffs.
 
-*Must define pair\_style before PairIJ Coeffs*
-   Must use a pair\_style command before reading a data file that defines
+*Must define pair_style before PairIJ Coeffs*
+   Must use a pair_style command before reading a data file that defines
    PairIJ Coeffs.
 
 *Must have more than one processor partition to temper*
@@ -5845,9 +5881,9 @@ Doc page with :doc:`WARNING messages <Errors_warnings>`
    The Atoms section of a data file must come before a Velocities
    section.
 
-*Must re-specify non-restarted pair style (xxx) after read\_restart*
+*Must re-specify non-restarted pair style (xxx) after read_restart*
    For pair styles, that do not store their settings in a restart file,
-   it must be defined with a new 'pair\_style' command after read\_restart.
+   it must be defined with a new 'pair_style' command after read_restart.
 
 *Must set both respa inner and outer*
    Cannot use just the inner or outer option with respa without using the
@@ -5855,7 +5891,7 @@ Doc page with :doc:`WARNING messages <Errors_warnings>`
 
 *Must set number of threads via package omp command*
    Because you are using the USER-OMP package, set the number of threads
-   via its settings, not by the pair\_style snap nthreads setting.
+   via its settings, not by the pair_style snap nthreads setting.
 
 *Must shrink-wrap piston boundary*
    The boundary style of the face where the piston is applied must be of
@@ -5870,30 +5906,30 @@ Doc page with :doc:`WARNING messages <Errors_warnings>`
 *Must specify at least 2 types in fix atom/swap command*
    Self-explanatory.
 
-*Must use 'kim\_style init' command before simulation box is defined*
+*Must use 'kim_style init' command before simulation box is defined*
    Self-explanatory.
 
-*Must use 'kim\_style define' command after simulation box is defined*
+*Must use 'kim_style define' command after simulation box is defined*
    Self-explanatory.
 
-*Must use 'kim\_style init' command before 'kim\_style define'*
+*Must use 'kim_style init' command before 'kim_style define'*
    Self-explanatory.
 
-*Must use 'kspace\_modify pressure/scalar no' for rRESPA with kspace\_style MSM*
+*Must use 'kspace_modify pressure/scalar no' for rRESPA with kspace_style MSM*
    The kspace scalar pressure option cannot (yet) be used with rRESPA.
 
-*Must use 'kspace\_modify pressure/scalar no' for tensor components with kspace\_style msm*
-   Otherwise MSM will compute only a scalar pressure.  See the kspace\_modify
+*Must use 'kspace_modify pressure/scalar no' for tensor components with kspace_style msm*
+   Otherwise MSM will compute only a scalar pressure.  See the kspace_modify
    command for details on this setting.
 
-*Must use 'kspace\_modify pressure/scalar no' to obtain per-atom virial with kspace\_style MSM*
+*Must use 'kspace_modify pressure/scalar no' to obtain per-atom virial with kspace_style MSM*
    The kspace scalar pressure option cannot be used to obtain per-atom virial.
 
-*Must use 'kspace\_modify pressure/scalar no' with GPU MSM Pair styles*
+*Must use 'kspace_modify pressure/scalar no' with GPU MSM Pair styles*
    The kspace scalar pressure option is not (yet) compatible with GPU MSM Pair styles.
 
-*Must use 'kspace\_modify pressure/scalar no' with kspace\_style msm/cg*
-   The kspace scalar pressure option is not compatible with kspace\_style msm/cg.
+*Must use 'kspace_modify pressure/scalar no' with kspace_style msm/cg*
+   The kspace scalar pressure option is not compatible with kspace_style msm/cg.
 
 *Must use -in switch with multiple partitions*
    A multi-partition simulation cannot read the input script from stdin.
@@ -5923,12 +5959,12 @@ Doc page with :doc:`WARNING messages <Errors_warnings>`
    command.
 
 *Must use atom map style array with Kokkos*
-   See the atom\_modify map command.
+   See the atom_modify map command.
 
 *Must use atom style with molecule IDs with fix bond/swap*
    Self-explanatory.
 
-*Must use pair\_style comb or comb3 with fix qeq/comb*
+*Must use pair_style comb or comb3 with fix qeq/comb*
    Self-explanatory.
 
 *Must use variable energy with fix addforce*
@@ -5955,29 +5991,29 @@ Doc page with :doc:`WARNING messages <Errors_warnings>`
    Self-explanatory.
 
 *Needed bonus data not in data file*
-   Some atom styles require bonus data.  See the read\_data doc page for
+   Some atom styles require bonus data.  See the read_data doc page for
    details.
 
 *Needed molecular topology not in data file*
    The header of the data file indicated bonds, angles, etc would be
    included, but they are not present.
 
-*Neigh\_modify exclude molecule requires atom attribute molecule*
+*Neigh_modify exclude molecule requires atom attribute molecule*
    Self-explanatory.
 
-*Neigh\_modify include group != atom\_modify first group*
+*Neigh_modify include group != atom_modify first group*
    Self-explanatory.
 
 *Neighbor delay must be 0 or multiple of every setting*
-   The delay and every parameters set via the neigh\_modify command are
+   The delay and every parameters set via the neigh_modify command are
    inconsistent.  If the delay setting is non-zero, then it must be a
    multiple of the every setting.
 
 *Neighbor include group not allowed with ghost neighbors*
    This is a current restriction within LAMMPS.
 
-*Neighbor list overflow, boost neigh\_modify one*
-   There are too many neighbors of a single atom.  Use the neigh\_modify
+*Neighbor list overflow, boost neigh_modify one*
+   There are too many neighbors of a single atom.  Use the neigh_modify
    command to increase the max number of neighbors allowed for one atom.
    You may also want to boost the page size.
 
@@ -5996,23 +6032,23 @@ Doc page with :doc:`WARNING messages <Errors_warnings>`
 *New atom IDs exceed maximum allowed ID*
    See the setting for tagint in the src/lmptype.h file.
 
-*New bond exceeded bonds per atom in create\_bonds*
-See the read\_data command for info on using the "extra/bond/per/atom"
+*New bond exceeded bonds per atom in create_bonds*
+See the read_data command for info on using the "extra/bond/per/atom"
 keyword to allow for additional bonds to be formed
 
 *New bond exceeded bonds per atom in fix bond/create*
-   See the read\_data command for info on using the "extra/bond/per/atom"
+   See the read_data command for info on using the "extra/bond/per/atom"
    keyword to allow for additional bonds to be formed
 
 *New bond exceeded special list size in fix bond/create*
-   See the "read\_data extra/special/per/atom" command
-   (or the "create\_box extra/special/per/atom" command)
+   See the "read_data extra/special/per/atom" command
+   (or the "create_box extra/special/per/atom" command)
    for info on how to leave space in the special bonds
    list to allow for additional bonds to be formed.
 
 *Newton bond change after simulation box is defined*
    The newton command cannot be used to change the newton bond value
-   after a read\_data, read\_restart, or create\_box command.
+   after a read_data, read_restart, or create_box command.
 
 *Next command must list all universe and uloop variables*
    This is to insure they stay in sync.
@@ -6095,7 +6131,7 @@ keyword to allow for additional bonds to be formed
    The data file cannot specify the number of bonds, angles, etc,
    because this info if inferred from the molecule templates.
 
-*No overlap of box and region for create\_atoms*
+*No overlap of box and region for create_atoms*
    Self-explanatory.
 
 *No pair coul/streitz for fix qeq/slater*
@@ -6135,10 +6171,10 @@ keyword to allow for additional bonds to be formed
 *Non-numeric box dimensions - simulation unstable*
    The box size has apparently blown up.
 
-*Non-zero atom IDs with atom\_modify id = no*
+*Non-zero atom IDs with atom_modify id = no*
    Self-explanatory.
 
-*Non-zero read\_data shift z value for 2d simulation*
+*Non-zero read_data shift z value for 2d simulation*
    Self-explanatory.
 
 *Nprocs not a multiple of N for -reorder*
@@ -6244,7 +6280,7 @@ keyword to allow for additional bonds to be formed
    NPT/NPH fix must be defined in input script after all poems fixes,
    else the fix contribution to the pressure virial is incorrect.
 
-*PPPM can only currently be used with comm\_style brick*
+*PPPM can only currently be used with comm_style brick*
    This is a current restriction in LAMMPS.
 
 *PPPM grid is too large*
@@ -6253,11 +6289,11 @@ keyword to allow for additional bonds to be formed
    requested accuracy.
 
 *PPPM grid stencil extends beyond nearest neighbor processor*
-   This is not allowed if the kspace\_modify overlap setting is no.
+   This is not allowed if the kspace_modify overlap setting is no.
 
 *PPPM order < minimum allowed order*
    The default minimum order is 2.  This can be reset by the
-   kspace\_modify minorder command.
+   kspace_modify minorder command.
 
 *PPPM order cannot be < 2 or > than %d*
    This is a limitation of the PPPM implementation in LAMMPS.
@@ -6272,28 +6308,28 @@ keyword to allow for additional bonds to be formed
    OFFSET is currently set to 4096.  You likely need to decrease the
    requested accuracy.
 
-*PPPMDisp can only currently be used with comm\_style brick*
+*PPPMDisp can only currently be used with comm_style brick*
    This is a current restriction in LAMMPS.
 
 *PPPMDisp coulomb order cannot be greater than %d*
    This is a limitation of the PPPM implementation in LAMMPS.
 
 *PPPMDisp used but no parameters set, for further information please see the pppm/disp documentation*
-   An efficient and accurate usage of the pppm/disp requires settings via the kspace\_modify command. Please see the pppm/disp documentation for further instructions.
+   An efficient and accurate usage of the pppm/disp requires settings via the kspace_modify command. Please see the pppm/disp documentation for further instructions.
 
 *PRD command before simulation box is defined*
-   The prd command cannot be used before a read\_data,
-   read\_restart, or create\_box command.
+   The prd command cannot be used before a read_data,
+   read_restart, or create_box command.
 
-*PRD nsteps must be multiple of t\_event*
+*PRD nsteps must be multiple of t_event*
    Self-explanatory.
 
-*PRD t\_corr must be multiple of t\_event*
+*PRD t_corr must be multiple of t_event*
    Self-explanatory.
 
 *Package command after simulation box is defined*
-   The package command cannot be used after a read\_data, read\_restart, or
-   create\_box command.
+   The package command cannot be used after a read_data, read_restart, or
+   create_box command.
 
 *Package gpu command without GPU package installed*
    The GPU package must be installed via "make yes-gpu" before LAMMPS is
@@ -6336,7 +6372,7 @@ keyword to allow for additional bonds to be formed
    Self-explanatory.
 
 *Pair coeff for hybrid has invalid style*
-   Style in pair coeff must have been listed in pair\_style command.
+   Style in pair coeff must have been listed in pair_style command.
 
 *Pair coul/wolf requires atom attribute q*
    The atom style defined does not have this attribute.
@@ -6364,10 +6400,10 @@ keyword to allow for additional bonds to be formed
    Two atoms are further apart than the pairwise table allows.
 
 *Pair dpd requires ghost atoms store velocity*
-   Use the comm\_modify vel yes command to enable this.
+   Use the comm_modify vel yes command to enable this.
 
 *Pair gayberne epsilon a,b,c coeffs are not all set*
-   Each atom type involved in pair\_style gayberne must
+   Each atom type involved in pair_style gayberne must
    have these 3 coefficients set at least once.
 
 *Pair gayberne requires atom style ellipsoid*
@@ -6386,7 +6422,7 @@ keyword to allow for additional bonds to be formed
    The atom style defined does not have these attributes.
 
 *Pair granular requires ghost atoms store velocity*
-   Use the comm\_modify vel yes command to enable this.
+   Use the comm_modify vel yes command to enable this.
 
 *Pair granular with shear history requires newton pair off*
    This is a current restriction of the implementation of pair
@@ -6397,10 +6433,10 @@ keyword to allow for additional bonds to be formed
 
 *Pair hybrid sub-style does not support single call*
    You are attempting to invoke a single() call on a pair style
-   that doesn't support it.
+   that does not support it.
 
 *Pair hybrid sub-style is not used*
-   No pair\_coeff command used a sub-style specified in the pair\_style
+   No pair_coeff command used a sub-style specified in the pair_style
    command.
 
 *Pair inner cutoff < Respa interior cutoff*
@@ -6420,7 +6456,7 @@ keyword to allow for additional bonds to be formed
    Self-explanatory.
 
 *Pair lubricate requires ghost atoms store velocity*
-   Use the comm\_modify vel yes command to enable this.
+   Use the comm_modify vel yes command to enable this.
 
 *Pair lubricate requires monodisperse particles*
    All particles must be the same finite size.
@@ -6432,7 +6468,7 @@ keyword to allow for additional bonds to be formed
    One of the particles has radius 0.0.
 
 *Pair lubricate/poly requires ghost atoms store velocity*
-   Use the comm\_modify vel yes command to enable this.
+   Use the comm_modify vel yes command to enable this.
 
 *Pair lubricate/poly requires newton pair off*
    Self-explanatory.
@@ -6441,13 +6477,13 @@ keyword to allow for additional bonds to be formed
    Self-explanatory.
 
 *Pair lubricateU requires ghost atoms store velocity*
-   Use the comm\_modify vel yes command to enable this.
+   Use the comm_modify vel yes command to enable this.
 
 *Pair lubricateU requires monodisperse particles*
    All particles must be the same finite size.
 
 *Pair lubricateU/poly requires ghost atoms store velocity*
-   Use the comm\_modify vel yes command to enable this.
+   Use the comm_modify vel yes command to enable this.
 
 *Pair lubricateU/poly requires newton pair off*
    Self-explanatory.
@@ -6458,9 +6494,9 @@ keyword to allow for additional bonds to be formed
 *Pair peri requires a lattice be defined*
    Use the lattice command for this purpose.
 
-*Pair peri requires an atom map, see atom\_modify*
+*Pair peri requires an atom map, see atom_modify*
    Even for atomic systems, an atom map is required to find Peridynamic
-   bonds.  Use the atom\_modify command to define one.
+   bonds.  Use the atom_modify command to define one.
 
 *Pair resquared epsilon a,b,c coeffs are not all set*
    Self-explanatory.
@@ -6600,12 +6636,12 @@ keyword to allow for additional bonds to be formed
    The pair style does not support the pN value requested by the compute
    pair/local command.
 
-*Pair style does not support bond\_style quartic*
+*Pair style does not support bond_style quartic*
    The pair style does not have a single() function, so it can
-   not be invoked by bond\_style quartic.
+   not be invoked by bond_style quartic.
 
 *Pair style does not support compute group/group*
-   The pair\_style does not have a single() function, so it cannot be
+   The pair_style does not have a single() function, so it cannot be
    invoked by the compute group/group command.
 
 *Pair style does not support compute pair/local*
@@ -6620,7 +6656,7 @@ keyword to allow for additional bonds to be formed
    The pair style does not have a single() function, so it can
    not be invoked by fix bond/swap.
 
-*Pair style does not support pair\_write*
+*Pair style does not support pair_write*
    The pair style does not have a single() function, so it can
    not be invoked by pair write.
 
@@ -6632,7 +6668,7 @@ keyword to allow for additional bonds to be formed
    Atoms in the simulation do not have IDs, so history effects
    cannot be tracked by the granular pair potential.
 
-*Pair style hbond/dreiding requires an atom map, see atom\_modify*
+*Pair style hbond/dreiding requires an atom map, see atom_modify*
    Self-explanatory.
 
 *Pair style hbond/dreiding requires atom IDs*
@@ -6718,7 +6754,7 @@ keyword to allow for additional bonds to be formed
    molecule adds forces to atoms owned by other processors.
 
 *Pair style lj/gromacs/coul/gromacs requires atom attribute q*
-   An atom\_style with this attribute is needed.
+   An atom_style with this attribute is needed.
 
 *Pair style lj/long/dipole/long does not currently support respa*
    This feature is not yet supported.
@@ -6771,7 +6807,7 @@ keyword to allow for additional bonds to be formed
 *Pair style requires a KSpace style*
    No kspace style is defined.
 
-*Pair style requires use of kspace\_style ewald/disp*
+*Pair style requires use of kspace_style ewald/disp*
    Self-explanatory.
 
 *Pair style sw/gpu requires atom IDs*
@@ -6841,21 +6877,21 @@ keyword to allow for additional bonds to be formed
 *PairKIM only works with 3D problems*
    This is a current limitation.
 
-*Pair\_coeff command before pair\_style is defined*
+*Pair_coeff command before pair_style is defined*
    Self-explanatory.
 
-*Pair\_coeff command before simulation box is defined*
-   The pair\_coeff command cannot be used before a read\_data,
-   read\_restart, or create\_box command.
+*Pair_coeff command before simulation box is defined*
+   The pair_coeff command cannot be used before a read_data,
+   read_restart, or create_box command.
 
-*Pair\_modify command before pair\_style is defined*
+*Pair_modify command before pair_style is defined*
    Self-explanatory.
 
-*Pair\_modify special setting for pair hybrid incompatible with global special\_bonds setting*
+*Pair_modify special setting for pair hybrid incompatible with global special_bonds setting*
    Cannot override a setting of 0.0 or 1.0 or change a setting between
    0.0 and 1.0.
 
-*Pair\_write command before pair\_style is defined*
+*Pair_write command before pair_style is defined*
    Self-explanatory.
 
 *Particle on or inside fix wall surface*
@@ -6871,7 +6907,7 @@ keyword to allow for additional bonds to be formed
 
 *Per-atom energy was not tallied on needed timestep*
    You are using a thermo keyword that requires potentials to
-   have tallied energy, but they didn't on this timestep.  See the
+   have tallied energy, but they did not on this timestep.  See the
    variable doc page for ideas on how to make this work.
 
 *Per-atom fix in equal-style variable formula*
@@ -6879,7 +6915,7 @@ keyword to allow for additional bonds to be formed
 
 *Per-atom virial was not tallied on needed timestep*
    You are using a thermo keyword that requires potentials to have
-   tallied the virial, but they didn't on this timestep.  See the
+   tallied the virial, but they did not on this timestep.  See the
    variable doc page for ideas on how to make this work.
 
 *Per-processor system is too big*
@@ -6976,8 +7012,8 @@ keyword to allow for additional bonds to be formed
    of processors LAMMPS is running on.
 
 *Processors command after simulation box is defined*
-   The processors command cannot be used after a read\_data, read\_restart,
-   or create\_box command.
+   The processors command cannot be used after a read_data, read_restart,
+   or create_box command.
 
 *Processors custom grid file is inconsistent*
    The vales in the custom file are not consistent with the number of
@@ -7040,7 +7076,7 @@ keyword to allow for additional bonds to be formed
    It cannot be larger than the size of atom IDs, e.g. the maximum 32-bit
    integer.
 
-*Read dump of atom property that isn't allocated*
+*Read dump of atom property that is not allocated*
    Self-explanatory.
 
 *Read rerun dump file timestep > specified stop*
@@ -7050,35 +7086,35 @@ keyword to allow for additional bonds to be formed
    This is because a % signifies one file per processor and MPI-IO
    creates one large file for all processors.
 
-*Read\_data shrink wrap did not assign all atoms correctly*
+*Read_data shrink wrap did not assign all atoms correctly*
    This is typically because the box-size specified in the data file is
    large compared to the actual extent of atoms in a shrink-wrapped
    dimension.  When LAMMPS shrink-wraps the box atoms will be lost if the
    processor they are re-assigned to is too far away.  Choose a box
    size closer to the actual extent of the atoms.
 
-*Read\_dump command before simulation box is defined*
-   The read\_dump command cannot be used before a read\_data, read\_restart,
-   or create\_box command.
+*Read_dump command before simulation box is defined*
+   The read_dump command cannot be used before a read_data, read_restart,
+   or create_box command.
 
-*Read\_dump field not found in dump file*
+*Read_dump field not found in dump file*
    Self-explanatory.
 
-*Read\_dump triclinic status does not match simulation*
+*Read_dump triclinic status does not match simulation*
    Both the dump snapshot and the current LAMMPS simulation must
    be using either an orthogonal or triclinic box.
 
-*Read\_dump xyz fields do not have consistent scaling/wrapping*
+*Read_dump xyz fields do not have consistent scaling/wrapping*
    Self-explanatory.
 
 *Reading from MPI-IO filename when MPIIO package is not installed*
    Self-explanatory.
 
-*Reax\_defs.h setting for NATDEF is too small*
+*Reax_defs.h setting for NATDEF is too small*
    Edit the setting in the ReaxFF library and re-compile the
    library and re-build LAMMPS.
 
-*Reax\_defs.h setting for NNEIGHMAXDEF is too small*
+*Reax_defs.h setting for NNEIGHMAXDEF is too small*
    Edit the setting in the ReaxFF library and re-compile the
    library and re-build LAMMPS.
 
@@ -7159,8 +7195,8 @@ keyword to allow for additional bonds to be formed
    when you do not intend to.
 
 *Replicate command before simulation box is defined*
-   The replicate command cannot be used before a read\_data, read\_restart,
-   or create\_box command.
+   The replicate command cannot be used before a read_data, read_restart,
+   or create_box command.
 
 *Replicate did not assign all atoms correctly*
    Atoms replicated by the replicate command were not assigned correctly
@@ -7178,8 +7214,8 @@ keyword to allow for additional bonds to be formed
    by Kokkos.
 
 *Rerun command before simulation box is defined*
-   The rerun command cannot be used before a read\_data, read\_restart, or
-   create\_box command.
+   The rerun command cannot be used before a read_data, read_restart, or
+   create_box command.
 
 *Rerun dump file does not contain requested snapshot*
    Self-explanatory.
@@ -7201,7 +7237,7 @@ keyword to allow for additional bonds to be formed
    creates one large file for all processors.
 
 *Restart file byte ordering is not recognized*
-   The file does not appear to be a LAMMPS restart file since it doesn't
+   The file does not appear to be a LAMMPS restart file since it does not
    contain a recognized byte-ordering flag at the beginning.
 
 *Restart file byte ordering is swapped*
@@ -7278,8 +7314,8 @@ keyword to allow for additional bonds to be formed
    Rmask is per-atom operation.
 
 *Run command before simulation box is defined*
-   The run command cannot be used before a read\_data, read\_restart, or
-   create\_box command.
+   The run command cannot be used before a read_data, read_restart, or
+   create_box command.
 
 *Run command start value is after start of run*
    Self-explanatory.
@@ -7287,9 +7323,9 @@ keyword to allow for additional bonds to be formed
 *Run command stop value is before end of run*
    Self-explanatory.
 
-*Run\_style command before simulation box is defined*
-   The run\_style command cannot be used before a read\_data,
-   read\_restart, or create\_box command.
+*Run_style command before simulation box is defined*
+   The run_style command cannot be used before a read_data,
+   read_restart, or create_box command.
 
 *SRD bin size for fix srd differs from user request*
    Fix SRD had to adjust the bin size to fit the simulation box.  See the
@@ -7314,8 +7350,8 @@ keyword to allow for additional bonds to be formed
    Cannot specify a partition to be a sender twice.
 
 *Set command before simulation box is defined*
-   The set command cannot be used before a read\_data, read\_restart,
-   or create\_box command.
+   The set command cannot be used before a read_data, read_restart,
+   or create_box command.
 
 *Set command floating point vector does not exist*
    Self-explanatory.
@@ -7365,8 +7401,8 @@ keyword to allow for additional bonds to be formed
    NPT fix must be defined in input script after SHAKE fix, else the
    SHAKE fix contribution to the pressure virial is incorrect.
 
-*Shear history overflow, boost neigh\_modify one*
-   There are too many neighbors of a single atom.  Use the neigh\_modify
+*Shear history overflow, boost neigh_modify one*
+   There are too many neighbors of a single atom.  Use the neigh_modify
    command to increase the max number of neighbors allowed for one atom.
    You may also want to boost the page size.
 
@@ -7383,13 +7419,13 @@ keyword to allow for additional bonds to be formed
    you are running.
 
 *Special list size exceeded in fix bond/create*
-   See the "read\_data extra/special/per/atom" command
-   (or the "create\_box extra/special/per/atom" command)
+   See the "read_data extra/special/per/atom" command
+   (or the "create_box extra/special/per/atom" command)
    for info on how to leave space in the special bonds
    list to allow for additional bonds to be formed.
 
 *Species XXX is not supported by this KIM Simulator Model*
-   The kim\_style define command was referencing a species that is not
+   The kim_style define command was referencing a species that is not
    present in the requested KIM Simulator Model.
 
 *Specified processors != physical processors*
@@ -7403,33 +7439,33 @@ keyword to allow for additional bonds to be formed
    Self-explanatory.
 
 *Subsequent read data induced too many angles per atom*
-   See the extra/angle/per/atom keyword for the create\_box
-   or the read\_data command to set this limit larger
+   See the extra/angle/per/atom keyword for the create_box
+   or the read_data command to set this limit larger
 
 *Subsequent read data induced too many bonds per atom*
-   See the extra/bond/per/atom keyword for the create\_box
-   or the read\_data command to set this limit larger
+   See the extra/bond/per/atom keyword for the create_box
+   or the read_data command to set this limit larger
 
 *Subsequent read data induced too many dihedrals per atom*
-   See the extra/dihedral/per/atom keyword for the create\_box
-   or the read\_data command to set this limit larger
+   See the extra/dihedral/per/atom keyword for the create_box
+   or the read_data command to set this limit larger
 
 *Subsequent read data induced too many impropers per atom*
-   See the extra/improper/per/atom keyword for the create\_box
-   or the read\_data command to set this limit larger
+   See the extra/improper/per/atom keyword for the create_box
+   or the read_data command to set this limit larger
 
 *Substitution for illegal variable*
    Input script line contained a variable that could not be substituted
    for.
 
 *Support for writing images in JPEG format not included*
-   LAMMPS was not built with the -DLAMMPS\_JPEG switch in the Makefile.
+   LAMMPS was not built with the -DLAMMPS_JPEG switch in the Makefile.
 
 *Support for writing images in PNG format not included*
-   LAMMPS was not built with the -DLAMMPS\_PNG switch in the Makefile.
+   LAMMPS was not built with the -DLAMMPS_PNG switch in the Makefile.
 
 *Support for writing movies not included*
-   LAMMPS was not built with the -DLAMMPS\_FFMPEG switch in the Makefile
+   LAMMPS was not built with the -DLAMMPS_FFMPEG switch in the Makefile
 
 *System in data file is too big*
    See the setting for bigint in the src/lmptype.h file.
@@ -7438,7 +7474,7 @@ keyword to allow for additional bonds to be formed
    The total charge on all atoms on the system is not 0.0.
    For some KSpace solvers this is an error.
 
-*TAD nsteps must be multiple of t\_event*
+*TAD nsteps must be multiple of t_event*
    Self-explanatory.
 
 *TIP4P hydrogen has incorrect atom type*
@@ -7485,8 +7521,8 @@ keyword to allow for additional bonds to be formed
    Self-explanatory.
 
 *Temper command before simulation box is defined*
-   The temper command cannot be used before a read\_data, read\_restart, or
-   create\_box command.
+   The temper command cannot be used before a read_data, read_restart, or
+   create_box command.
 
 *Temperature ID for fix bond/swap does not exist*
    Self-explanatory.
@@ -7567,7 +7603,7 @@ keyword to allow for additional bonds to be formed
 *Temperature for fix nvt/sllod does not have a bias*
    The specified compute must compute temperature with a bias.
 
-*Tempering could not find thermo\_pe compute*
+*Tempering could not find thermo_pe compute*
    This compute is created by the thermo command.  It must have been
    explicitly deleted by a uncompute command.
 
@@ -7578,7 +7614,7 @@ keyword to allow for additional bonds to be formed
    The fix specified by the temper command is not one that controls
    temperature (nvt or langevin).
 
-*Test\_descriptor\_string already allocated*
+*Test_descriptor_string already allocated*
    This is an internal error.  Contact the developers.
 
 *The package gpu command is required for gpu styles*
@@ -7644,34 +7680,34 @@ keyword to allow for additional bonds to be formed
    your thermo output.
 
 *Thermo style does not use press*
-   Cannot use thermo\_modify to set this parameter since the thermo\_style
+   Cannot use thermo_modify to set this parameter since the thermo_style
    is not computing this quantity.
 
 *Thermo style does not use temp*
-   Cannot use thermo\_modify to set this parameter since the thermo\_style
+   Cannot use thermo_modify to set this parameter since the thermo_style
    is not computing this quantity.
 
-*Thermo\_modify every variable returned a bad timestep*
+*Thermo_modify every variable returned a bad timestep*
    The returned timestep is less than or equal to the current timestep.
 
-*Thermo\_modify int format does not contain d character*
+*Thermo_modify int format does not contain d character*
    Self-explanatory.
 
-*Thermo\_modify pressure ID does not compute pressure*
+*Thermo_modify pressure ID does not compute pressure*
    The specified compute ID does not compute pressure.
 
-*Thermo\_modify temperature ID does not compute temperature*
+*Thermo_modify temperature ID does not compute temperature*
    The specified compute ID does not compute temperature.
 
-*Thermo\_style command before simulation box is defined*
-   The thermo\_style command cannot be used before a read\_data,
-   read\_restart, or create\_box command.
+*Thermo_style command before simulation box is defined*
+   The thermo_style command cannot be used before a read_data,
+   read_restart, or create_box command.
 
 *This variable thermo keyword cannot be used between runs*
    Keywords that refer to time (such as cpu, elapsed) do not
    make sense in between runs.
 
-*Threshhold for an atom property that isn't allocated*
+*Threshold for an atom property that is not allocated*
    A dump threshold has been requested on a quantity that is
    not defined by the atom style used in this simulation.
 
@@ -7688,7 +7724,7 @@ keyword to allow for additional bonds to be formed
    The timestep must fit in a 32-bit integer to use this dump style.
 
 *Too few bits for lookup table*
-   Table size specified via pair\_modify command does not work with your
+   Table size specified via pair_modify command does not work with your
    machine's floating point representation.
 
 *Too few lines in %s section of data file*
@@ -7734,20 +7770,23 @@ keyword to allow for additional bonds to be formed
 *Too many atoms to dump sort*
    Cannot sort when running with more than 2\^31 atoms.
 
+*Too many elements extracted from MEAM library.*
+   Increase 'maxelt' in meam.h and recompile.
+
 *Too many exponent bits for lookup table*
-   Table size specified via pair\_modify command does not work with your
+   Table size specified via pair_modify command does not work with your
    machine's floating point representation.
 
 *Too many groups*
    The maximum number of atom groups (including the "all" group) is
-   given by MAX\_GROUP in group.cpp and is 32.
+   given by MAX_GROUP in group.cpp and is 32.
 
 *Too many iterations*
    You must use a number of iterations that fit in a 32-bit integer
    for minimization.
 
 *Too many lines in one body in data file - boost MAXBODY*
-   MAXBODY is a setting at the top of the src/read\_data.cpp file.
+   MAXBODY is a setting at the top of the src/read_data.cpp file.
    Set it larger and re-compile the code.
 
 *Too many local+ghost atoms for neighbor list*
@@ -7756,7 +7795,7 @@ keyword to allow for additional bonds to be formed
    removed for masking 1-2, 1-3, 1-4 neighbors.
 
 *Too many mantissa bits for lookup table*
-   Table size specified via pair\_modify command does not work with your
+   Table size specified via pair_modify command does not work with your
    machine's floating point representation.
 
 *Too many masses for fix shake*
@@ -7784,7 +7823,7 @@ keyword to allow for additional bonds to be formed
    See the setting for bigint in the src/lmptype.h file.
 
 *Too many total bits for bitmapped lookup table*
-   Table size specified via pair\_modify command is too large.  Note that
+   Table size specified via pair_modify command is too large.  Note that
    a value of N generates a 2\^N size table.
 
 *Too many values in body lines in data file*
@@ -7811,7 +7850,7 @@ keyword to allow for additional bonds to be formed
    +half of the x box length.  This constraint can be relaxed by using
    the box tilt command.
 
-*Tried to convert a double to int, but input\_double > INT\_MAX*
+*Tried to convert a double to int, but input_double > INT_MAX*
    Self-explanatory.
 
 *Trying to build an occasional neighbor list before initialization completed*
@@ -7873,8 +7912,8 @@ keyword to allow for additional bonds to be formed
    A read operation from the file failed.
 
 *Units command after simulation box is defined*
-   The units command cannot be used after a read\_data, read\_restart, or
-   create\_box command.
+   The units command cannot be used after a read_data, read_restart, or
+   create_box command.
 
 *Universe/uloop variable count < # of partitions*
    A universe or uloop style variable must specify a number of values >= to the
@@ -7892,13 +7931,13 @@ keyword to allow for additional bonds to be formed
 *Unrecognized bond style*
    The choice of bond style is unknown.
 
-*Unknown category for info is\_active()*
+*Unknown category for info is_active()*
    Self-explanatory.
 
-*Unknown category for info is\_available()*
+*Unknown category for info is_available()*
    Self-explanatory.
 
-*Unknown category for info is\_defined()*
+*Unknown category for info is_defined()*
    Self-explanatory.
 
 *Unrecognized command: %s*
@@ -7928,7 +7967,7 @@ keyword to allow for additional bonds to be formed
 *Unrecognized improper style*
    The choice of improper style is unknown.
 
-*Unknown keyword in thermo\_style custom command*
+*Unknown keyword in thermo_style custom command*
    One or more specified keywords are not recognized.
 
 *Unrecognized kspace style*
@@ -7946,7 +7985,7 @@ keyword to allow for additional bonds to be formed
 *Unrecognized pair style*
    The choice of pair style is unknown.
 
-*Unknown pair\_modify hybrid sub-style*
+*Unknown pair_modify hybrid sub-style*
    The choice of sub-style is unknown.
 
 *Unrecognized region style*
@@ -7961,32 +8000,35 @@ keyword to allow for additional bonds to be formed
 *Unknown table style in bond style table*
    Self-explanatory.
 
-*Unknown table style in pair\_style command*
-   Style of table is invalid for use with pair\_style table command.
+*Unknown table style in pair_style command*
+   Style of table is invalid for use with pair_style table command.
 
-*Unknown unit\_style*
+*Unknown unit_style*
    Self-explanatory. Check the input script or data file.
 
-*Unrecognized lattice type in MEAM file 1*
+*Unrecognized lattice type in MEAM library file*
    The lattice type in an entry of the MEAM library file is not
    valid.
 
-*Unrecognized lattice type in MEAM file 2*
+*Unrecognized lattice type in MEAM parameter file*
    The lattice type in an entry of the MEAM parameter file is not
    valid.
 
 *Unrecognized pair style in compute pair command*
    Self-explanatory.
 
-*Unsupported mixing rule in kspace\_style ewald/disp*
+*Unsupported mixing rule in kspace_style ewald/disp*
    Only geometric mixing is supported.
 
-*Unsupported order in kspace\_style ewald/disp*
+*Unsupported order in kspace_style ewald/disp*
    Only 1/r\^6 dispersion or dipole terms are supported.
 
-*Unsupported order in kspace\_style pppm/disp, pair\_style %s*
+*Unsupported order in kspace_style pppm/disp, pair_style %s*
    Only pair styles with 1/r and 1/r\^6 dependence are currently supported.
 
+*Unsupported parameter in MEAM library file*
+   Self-explanatory.
+
 *Use cutoff keyword to set cutoff in single mode*
    Mode is single so cutoff/multi keyword cannot be used.
 
@@ -8047,10 +8089,10 @@ keyword to allow for additional bonds to be formed
 *Variable for compute ti is invalid style*
    Self-explanatory.
 
-*Variable for create\_atoms is invalid style*
+*Variable for create_atoms is invalid style*
    The variables must be equal-style variables.
 
-*Variable for displace\_atoms is invalid style*
+*Variable for displace_atoms is invalid style*
    It must be an equal-style or atom-style variable.
 
 *Variable for dump every is invalid style*
@@ -8190,10 +8232,10 @@ keyword to allow for additional bonds to be formed
 *Variable name for compute ti does not exist*
    Self-explanatory.
 
-*Variable name for create\_atoms does not exist*
+*Variable name for create_atoms does not exist*
    Self-explanatory.
 
-*Variable name for displace\_atoms does not exist*
+*Variable name for displace_atoms does not exist*
    Self-explanatory.
 
 *Variable name for dump every does not exist*
@@ -8325,12 +8367,12 @@ keyword to allow for additional bonds to be formed
 *Variable name must be alphanumeric or underscore characters*
    Self-explanatory.
 
-*Variable uses atom property that isn't allocated*
+*Variable uses atom property that is not allocated*
    Self-explanatory.
 
 *Velocity command before simulation box is defined*
-   The velocity command cannot be used before a read\_data, read\_restart,
-   or create\_box command.
+   The velocity command cannot be used before a read_data, read_restart,
+   or create_box command.
 
 *Velocity command with no atoms existing*
    A velocity command has been used, but no atoms yet exist.
@@ -8348,7 +8390,7 @@ keyword to allow for additional bonds to be formed
    The compute ID given to the velocity command must compute
    temperature.
 
-*Verlet/split can only currently be used with comm\_style brick*
+*Verlet/split can only currently be used with comm_style brick*
    This is a current restriction in LAMMPS.
 
 *Verlet/split does not yet support TIP4P*
@@ -8366,7 +8408,7 @@ keyword to allow for additional bonds to be formed
 
 *Virial was not tallied on needed timestep*
    You are using a thermo keyword that requires potentials to
-   have tallied the virial, but they didn't on this timestep.  See the
+   have tallied the virial, but they did not on this timestep.  See the
    variable doc page for ideas on how to make this work.
 
 *Voro++ error: narea and neigh have a different size*
@@ -8393,21 +8435,21 @@ keyword to allow for additional bonds to be formed
    This is because LAMMPS does not compute the Lennard-Jones interactions
    with these particles for efficiency reasons.
 
-*World variable count doesn't match # of partitions*
+*World variable count does not match # of partitions*
    A world-style variable must specify a number of values equal to the
    number of processor partitions.
 
-*Write\_data command before simulation box is defined*
+*Write_data command before simulation box is defined*
    Self-explanatory.
 
-*Write\_restart command before simulation box is defined*
-   The write\_restart command cannot be used before a read\_data,
-   read\_restart, or create\_box command.
+*Write_restart command before simulation box is defined*
+   The write_restart command cannot be used before a read_data,
+   read_restart, or create_box command.
 
 *Writing to MPI-IO filename when MPIIO package is not installed*
    Self-explanatory.
 
-*Zero length rotation vector with displace\_atoms*
+*Zero length rotation vector with displace_atoms*
    Self-explanatory.
 
 *Zero length rotation vector with fix move*
@@ -8415,10 +8457,3 @@ keyword to allow for additional bonds to be formed
 
 *Zero-length lattice orient vector*
    Self-explanatory.
-
-
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/Errors_warnings.rst b/doc/src/Errors_warnings.rst
index 7b8f85dc9a..dbe830c8bf 100644
--- a/doc/src/Errors_warnings.rst
+++ b/doc/src/Errors_warnings.rst
@@ -7,7 +7,6 @@ documentation for the offending command may help.  Warning messages
 also list the source file and line number where the warning was
 generated.  For example, a message like this:
 
-
 .. parsed-literal::
 
    WARNING: Bond atom missing in box size check (domain.cpp:187)
@@ -16,17 +15,13 @@ means that line #187 in the file src/domain.cpp generated the error.
 Looking in the source code may help you figure out what went wrong.
 
 Note that warning messages from :doc:`user-contributed packages <Packages_user>` are not listed here.  If such a warning
-occurs and is not self-explanatory, you'll need to look in the source
+occurs and is not self-explanatory, you will need to look in the source
 code or contact the author of the package.
 
 Doc page with :doc:`ERROR messages <Errors_messages>`
 
-
 ----------
 
-
-
-
 *Adjusting Coulombic cutoff for MSM, new cutoff = %g*
    The adjust/cutoff command is turned on and the Coulombic cutoff has been
    adjusted to match the user-specified accuracy.
@@ -42,7 +37,7 @@ Doc page with :doc:`ERROR messages <Errors_messages>`
 
 *Angles are defined but no angle style is set*
    The topology contains angles, but there are no angle forces computed
-   since there was no angle\_style command.
+   since there was no angle_style command.
 
 *Atom style in data file differs from currently defined atom style*
    Self-explanatory.
@@ -67,7 +62,7 @@ Doc page with :doc:`ERROR messages <Errors_messages>`
 
 *Bonds are defined but no bond style is set*
    The topology contains bonds, but there are no bond forces computed
-   since there was no bond\_style command.
+   since there was no bond_style command.
 
 *Bond/angle/dihedral extent > half of periodic box length*
    This is a restriction because LAMMPS can be confused about which image
@@ -88,8 +83,8 @@ Doc page with :doc:`ERROR messages <Errors_messages>`
 *Both groups in compute group/group have a net charge; the Kspace boundary correction to energy will be non-zero*
    Self-explanatory.
 
-*Calling write\_dump before a full system init.*
-   The write\_dump command is used before the system has been fully
+*Calling write_dump before a full system init.*
+   The write_dump command is used before the system has been fully
    initialized as part of a 'run' or 'minimize' command. Not all dump
    styles and features are fully supported at this point and thus the
    command may fail or produce incomplete or incorrect output. Insert
@@ -136,11 +131,11 @@ Doc page with :doc:`ERROR messages <Errors_messages>`
    degrees-of-freedom for the atoms in those partial rigid bodies will
    not be accounted for.
 
-*Create\_bonds max distance > minimum neighbor cutoff*
+*Create_bonds max distance > minimum neighbor cutoff*
    This means atom pairs for some atom types may not be in the neighbor
    list and thus no bond can be created between them.
 
-*Delete\_atoms cutoff > minimum neighbor cutoff*
+*Delete_atoms cutoff > minimum neighbor cutoff*
    This means atom pairs for some atom types may not be in the neighbor
    list and thus an atom in that pair cannot be deleted.
 
@@ -163,7 +158,7 @@ Doc page with :doc:`ERROR messages <Errors_messages>`
 
 *Dihedrals are defined but no dihedral style is set*
    The topology contains dihedrals, but there are no dihedral forces computed
-   since there was no dihedral\_style command.
+   since there was no dihedral_style command.
 
 *Dump dcd/xtc timestamp may be wrong with fix dt/reset*
    If the fix changes the timestep, the dump dcd file will not
@@ -177,7 +172,7 @@ Doc page with :doc:`ERROR messages <Errors_messages>`
 *Estimated error in splitting of dispersion coeffs is %g*
    Error is greater than 0.0001 percent.
 
-*Ewald/disp Newton solver failed, using old method to estimate g\_ewald*
+*Ewald/disp Newton solver failed, using old method to estimate g_ewald*
    Self-explanatory. Choosing a different cutoff value may help.
 
 *FENE bond too long*
@@ -192,6 +187,9 @@ Doc page with :doc:`ERROR messages <Errors_messages>`
    A FENE bond has stretched dangerously far.  It's interaction strength
    will be truncated to attempt to prevent the bond from blowing up.
 
+*Fix halt condition for fix-id %s met on step %ld with value %g*
+   Self explanatory.
+
 *Fix SRD walls overlap but fix srd overlap not set*
    You likely want to set this in your input script.
 
@@ -214,8 +212,8 @@ Doc page with :doc:`ERROR messages <Errors_messages>`
    This is probably an error, since you should not delete only one atom
    of a molecule.
 
-*Fix gcmc using full\_energy option*
-   Fix gcmc has automatically turned on the full\_energy option since it
+*Fix gcmc using full_energy option*
+   Fix gcmc has automatically turned on the full_energy option since it
    is required for systems like the one specified by the user. User input
    included one or more of the following: kspace, triclinic, a hybrid
    pair style, an eam pair style, or no "single" function for the pair
@@ -270,19 +268,19 @@ This will most likely cause errors in kinetic fluctuations.
 *Fixes cannot send data in Kokkos communication, switching to classic communication*
    This is current restriction with Kokkos.
 
-*For better accuracy use 'pair\_modify table 0'*
+*For better accuracy use 'pair_modify table 0'*
    The user-specified force accuracy cannot be achieved unless the table
-   feature is disabled by using 'pair\_modify table 0'.
+   feature is disabled by using 'pair_modify table 0'.
 
 *Geometric mixing assumed for 1/r\^6 coefficients*
    Self-explanatory.
 
-*Group for fix\_modify temp != fix group*
-   The fix\_modify command is specifying a temperature computation that
+*Group for fix_modify temp != fix group*
+   The fix_modify command is specifying a temperature computation that
    computes a temperature on a different group of atoms than the fix
    itself operates on.  This is probably not what you want to do.
 
-*H matrix size has been exceeded: m\_fill=%d H.m=%d\n*
+*H matrix size has been exceeded: m_fill=%d H.m=%d\n*
    This is the size of the matrix.
 
 *Ignoring unknown or incorrect info command flag*
@@ -304,7 +302,7 @@ This will most likely cause errors in kinetic fluctuations.
 
 *Impropers are defined but no improper style is set*
    The topology contains impropers, but there are no improper forces computed
-   since there was no improper\_style command.
+   since there was no improper_style command.
 
 *Inconsistent image flags*
    The image flags for a pair on bonded atoms appear to be inconsistent.
@@ -339,22 +337,22 @@ This will most likely cause errors in kinetic fluctuations.
 *KIM Model does not provide 'particleVirial'; virial per atom will be zero*
    Self-explanatory.
 
-*Kspace\_modify slab param < 2.0 may cause unphysical behavior*
-   The kspace\_modify slab parameter should be larger to insure periodic
+*Kspace_modify slab param < 2.0 may cause unphysical behavior*
+   The kspace_modify slab parameter should be larger to insure periodic
    grids padded with empty space do not overlap.
 
 *Less insertions than requested*
    The fix pour command was unsuccessful at finding open space
    for as many particles as it tried to insert.
 
-*Library error in lammps\_gather\_atoms*
+*Library error in lammps_gather_atoms*
    This library function cannot be used if atom IDs are not defined
    or are not consecutively numbered.
 
-*Library error in lammps\_scatter\_atoms*
+*Library error in lammps_scatter_atoms*
    This library function cannot be used if atom IDs are not defined or
    are not consecutively numbered, or if no atom map is defined.  See the
-   atom\_modify command for details about atom maps.
+   atom_modify command for details about atom maps.
 
 *Likewise 1-2 special neighbor interactions != 1.0*
    The topology contains bonds, but there is no bond style defined
@@ -377,15 +375,15 @@ This will most likely cause errors in kinetic fluctuations.
    pairs in the neighbor list in expectation of interactions for
    those pairs being computed from the dihedral style.
 
-*Lost atoms via change\_box: original %ld current %ld*
+*Lost atoms via change_box: original %ld current %ld*
    The command options you have used caused atoms to be lost.
 
-*Lost atoms via displace\_atoms: original %ld current %ld*
+*Lost atoms via displace_atoms: original %ld current %ld*
    The command options you have used caused atoms to be lost.
 
 *Lost atoms: original %ld current %ld*
    Lost atoms are checked for each time thermo output is done.  See the
-   thermo\_modify lost command for options.  Lost atoms usually indicate
+   thermo_modify lost command for options.  Lost atoms usually indicate
    bad dynamics, e.g. atoms have been blown far out of the simulation
    box, or moved further than one processor's sub-domain away before
    reneighboring.
@@ -408,8 +406,8 @@ This will most likely cause errors in kinetic fluctuations.
    This means the bonded atoms will not be excluded in pair-wise
    interactions.
 
-*Molecule template for create\_atoms has multiple molecules*
-   The create\_atoms command will only create molecules of a single type,
+*Molecule template for create_atoms has multiple molecules*
+   The create_atoms command will only create molecules of a single type,
    i.e. the first molecule in the template.
 
 *Molecule template for fix gcmc has multiple molecules*
@@ -474,21 +472,21 @@ This will most likely cause errors in kinetic fluctuations.
 *Neighbor exclusions used with KSpace solver may give inconsistent Coulombic energies*
    This is because excluding specific pair interactions also excludes
    them from long-range interactions which may not be the desired effect.
-   The special\_bonds command handles this consistently by insuring
+   The special_bonds command handles this consistently by insuring
    excluded (or weighted) 1-2, 1-3, 1-4 interactions are treated
    consistently by both the short-range pair style and the long-range
    solver.  This is not done for exclusions of charged atom pairs via the
-   neigh\_modify exclude command.
+   neigh_modify exclude command.
 
-*New thermo\_style command, previous thermo\_modify settings will be lost*
-   If a thermo\_style command is used after a thermo\_modify command, the
-   settings changed by the thermo\_modify command will be reset to their
-   default values.  This is because the thermo\_modify command acts on
-   the currently defined thermo style, and a thermo\_style command creates
+*New thermo_style command, previous thermo_modify settings will be lost*
+   If a thermo_style command is used after a thermo_modify command, the
+   settings changed by the thermo_modify command will be reset to their
+   default values.  This is because the thermo_modify command acts on
+   the currently defined thermo style, and a thermo_style command creates
    a new style.
 
 *No Kspace calculation with verlet/split*
-   The 2nd partition performs a kspace calculation so the kspace\_style
+   The 2nd partition performs a kspace calculation so the kspace_style
    command must be used.
 
 *No automatic unit conversion to XTC file format conventions possible for units lj*
@@ -512,7 +510,7 @@ This will most likely cause errors in kinetic fluctuations.
    of two and the number of grid points in one or more directions have been
    adjusted to meet this requirement.
 
-*OMP\_NUM\_THREADS environment is not set.*
+*OMP_NUM_THREADS environment is not set.*
    This environment variable must be set appropriately to use the
    USER-OMP package.
 
@@ -546,10 +544,10 @@ This will most likely cause errors in kinetic fluctuations.
 *Pair dpd needs newton pair on for momentum conservation*
    Self-explanatory.
 
-*Pair dsmc: num\_of\_collisions > number\_of\_A*
+*Pair dsmc: num_of_collisions > number_of_A*
    Collision model in DSMC is breaking down.
 
-*Pair dsmc: num\_of\_collisions > number\_of\_B*
+*Pair dsmc: num_of_collisions > number_of_B*
    Collision model in DSMC is breaking down.
 
 *Pair style in data file differs from currently defined pair style*
@@ -574,15 +572,15 @@ This will most likely cause errors in kinetic fluctuations.
    sub-domain before reneighboring is triggered.
 
 *Reducing PPPM order b/c stencil extends beyond nearest neighbor processor*
-   This may lead to a larger grid than desired.  See the kspace\_modify overlap
+   This may lead to a larger grid than desired.  See the kspace_modify overlap
    command to prevent changing of the PPPM order.
 
 *Reducing PPPMDisp Coulomb order b/c stencil extends beyond neighbor processor*
-   This may lead to a larger grid than desired.  See the kspace\_modify overlap
+   This may lead to a larger grid than desired.  See the kspace_modify overlap
    command to prevent changing of the PPPM order.
 
 *Reducing PPPMDisp dispersion order b/c stencil extends beyond neighbor processor*
-   This may lead to a larger grid than desired.  See the kspace\_modify overlap
+   This may lead to a larger grid than desired.  See the kspace_modify overlap
    command to prevent changing of the PPPM order.
 
 *Replacing a fix, but new group != old group*
@@ -595,19 +593,19 @@ This will most likely cause errors in kinetic fluctuations.
    dimension to be replicated; this may cause unwanted behavior.
 
 *Resetting reneighboring criteria during PRD*
-   A PRD simulation requires that neigh\_modify settings be delay = 0,
+   A PRD simulation requires that neigh_modify settings be delay = 0,
    every = 1, check = yes.  Since these settings were not in place,
    LAMMPS changed them and will restore them to their original values
    after the PRD simulation.
 
 *Resetting reneighboring criteria during TAD*
-   A TAD simulation requires that neigh\_modify settings be delay = 0,
+   A TAD simulation requires that neigh_modify settings be delay = 0,
    every = 1, check = yes.  Since these settings were not in place,
    LAMMPS changed them and will restore them to their original values
    after the PRD simulation.
 
 *Resetting reneighboring criteria during minimization*
-   Minimization requires that neigh\_modify settings be delay = 0, every =
+   Minimization requires that neigh_modify settings be delay = 0, every =
    1, check = yes.  Since these settings were not in place, LAMMPS
    changed them and will restore them to their original values after the
    minimization.
@@ -711,7 +709,7 @@ This will most likely cause errors in kinetic fluctuations.
    which does operate on group all, so this may be inconsistent.
 
 *Temperature for thermo pressure is not for group all*
-   User-assigned temperature to thermo via the thermo\_modify command does
+   User-assigned temperature to thermo via the thermo_modify command does
    not compute temperature for all atoms.  Since thermo computes a global
    pressure, the kinetic energy contribution from the temperature is
    assumed to also be for all atoms.  Thus the pressure printed by thermo
@@ -743,12 +741,12 @@ This will most likely cause errors in kinetic fluctuations.
    LAMMPS simulation may be inefficient as a result.
 
 *Use special bonds = 0,1,1 with bond style fene*
-   Most FENE models need this setting for the special\_bonds command.
+   Most FENE models need this setting for the special_bonds command.
 
 *Use special bonds = 0,1,1 with bond style fene/expand*
-   Most FENE models need this setting for the special\_bonds command.
+   Most FENE models need this setting for the special_bonds command.
 
-*Using a many-body potential with bonds/angles/dihedrals and special\_bond exclusions*
+*Using a many-body potential with bonds/angles/dihedrals and special_bond exclusions*
    This is likely not what you want to do.  The exclusion settings will
    eliminate neighbors in the neighbor list, which the many-body potential
    needs to calculated its terms correctly.
@@ -777,13 +775,13 @@ This will most likely cause errors in kinetic fluctuations.
 *Using largest cutoff for lj/long/coul/long*
    Self-explanatory.
 
-*Using largest cutoff for pair\_style lj/long/tip4p/long*
+*Using largest cutoff for pair_style lj/long/tip4p/long*
    Self-explanatory.
 
 *Using package gpu without any pair style defined*
    Self-explanatory.
 
-*Using pair potential shift with pair\_modify compute no*
+*Using pair potential shift with pair_modify compute no*
    The shift effects will thus not be computed.
 
 *Using pair tail corrections with nonperiodic system*
@@ -791,15 +789,8 @@ This will most likely cause errors in kinetic fluctuations.
    computed by integrating the density of a periodic system out to
    infinity.
 
-*Using pair tail corrections with pair\_modify compute no*
+*Using pair tail corrections with pair_modify compute no*
    The tail corrections will thus not be computed.
 
-*pair style reax is now deprecated and will soon be retired. Users should switch to pair\_style reax/c*
+*pair style reax is now deprecated and will soon be retired. Users should switch to pair_style reax/c*
    Self-explanatory.
-
-
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/Examples.rst b/doc/src/Examples.rst
index 993090baf1..b94db208d9 100644
--- a/doc/src/Examples.rst
+++ b/doc/src/Examples.rst
@@ -18,7 +18,7 @@ files and image files.
 
 If you uncomment the :doc:`dump <dump>` command in the input script, a
 text dump file will be produced, which can be animated by various
-`visualization programs <http://lammps.sandia.gov/viz.html>`_.
+`visualization programs <https://lammps.sandia.gov/viz.html>`_.
 
 If you uncomment the :doc:`dump image <dump>` command in the input
 script, and assuming you have built LAMMPS with a JPG library, JPG
@@ -29,18 +29,17 @@ be quickly post-processed into a movie using commands described on the
 Animations of many of the examples can be viewed on the Movies section
 of the `LAMMPS web site <lws_>`_.
 
-There are two kinds of sub-directories in the examples dir.  Lowercase
-dirs contain one or a few simple, quick-to-run problems.  Uppercase
-dirs contain up to several complex scripts that illustrate a
-particular kind of simulation method or model.  Some of these run for
-longer times, e.g. to measure a particular quantity.
+There are two kinds of sub-directories in the examples folder.  Lower
+case named directories contain one or a few simple, quick-to-run
+problems.  Upper case named directories contain up to several complex
+scripts that illustrate a particular kind of simulation method or
+model.  Some of these run for longer times, e.g. to measure a
+particular quantity.
 
 Lists of both kinds of directories are given below.
 
-
 ----------
 
-
 Lowercase directories
 ---------------------
 
@@ -133,7 +132,7 @@ Lowercase directories
 +-------------+------------------------------------------------------------------+
 | reax        | RDX and TATB models using the ReaxFF                             |
 +-------------+------------------------------------------------------------------+
-| rerun       | use of rerun and read\_dump commands                             |
+| rerun       | use of rerun and read_dump commands                              |
 +-------------+------------------------------------------------------------------+
 | rigid       | rigid bodies modeled as independent or coupled                   |
 +-------------+------------------------------------------------------------------+
@@ -156,8 +155,7 @@ Lowercase directories
 
 Here is how you can run and visualize one of the sample problems:
 
-
-.. parsed-literal::
+.. code-block:: bash
 
    cd indent
    cp ../../src/lmp_linux .           # copy LAMMPS executable to this dir
@@ -166,28 +164,25 @@ Here is how you can run and visualize one of the sample problems:
 Running the simulation produces the files *dump.indent* and
 *log.lammps*\ .  You can visualize the dump file of snapshots with a
 variety of 3rd-party tools highlighted on the
-`Visualization <http://lammps.sandia.gov/viz.html>`_ page of the LAMMPS
+`Visualization <https://lammps.sandia.gov/viz.html>`_ page of the LAMMPS
 web site.
 
 If you uncomment the :doc:`dump image <dump_image>` line(s) in the input
 script a series of JPG images will be produced by the run (assuming
 you built LAMMPS with JPG support; see the
-:doc:`Build\_settings <Build_settings>` doc page for details).  These can
+:doc:`Build_settings <Build_settings>` doc page for details).  These can
 be viewed individually or turned into a movie or animated by tools
 like ImageMagick or QuickTime or various Windows-based tools.  See the
 :doc:`dump image <dump_image>` doc page for more details.  E.g. this
 Imagemagick command would create a GIF file suitable for viewing in a
 browser.
 
+.. code-block:: bash
 
-.. parsed-literal::
-
-   % convert -loop 1 \*.jpg foo.gif
-
+   % convert -loop 1 *.jpg foo.gif
 
 ----------
 
-
 Uppercase directories
 ---------------------
 
@@ -200,7 +195,7 @@ Uppercase directories
 +------------+--------------------------------------------------------------------------------------------------+
 | ELASTIC    | compute elastic constants at zero temperature                                                    |
 +------------+--------------------------------------------------------------------------------------------------+
-| ELASTIC\_T | compute elastic constants at finite temperature                                                  |
+| ELASTIC_T  | compute elastic constants at finite temperature                                                  |
 +------------+--------------------------------------------------------------------------------------------------+
 | HEAT       | compute thermal conductivity for LJ and water via fix ehex                                       |
 +------------+--------------------------------------------------------------------------------------------------+
@@ -224,14 +219,8 @@ The USER directory has a large number of sub-directories which
 correspond by name to a USER package.  They contain scripts that
 illustrate how to use the command(s) provided in that package.  Many
 of the sub-directories have their own README files which give further
-instructions.  See the :doc:`Packages\_details <Packages_details>` doc
+instructions.  See the :doc:`Packages_details <Packages_details>` doc
 page for more info on specific USER packages.
 
 .. _openkim: https://openkim.org
-
-
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
+.. _lws: https://lammps.sandia.gov
diff --git a/doc/src/Howto.rst b/doc/src/Howto.rst
index 9f310a4645..f4376898b1 100644
--- a/doc/src/Howto.rst
+++ b/doc/src/Howto.rst
@@ -3,16 +3,15 @@ Howto discussions
 
 These doc pages describe how to perform various tasks with LAMMPS,
 both for users and developers.  The
-`glossary <http://lammps.sandia.gov>`_ website page also lists MD
+`glossary <https://lammps.sandia.gov>`_ website page also lists MD
 terminology with links to corresponding LAMMPS manual pages.  The
-example input scripts included in the examples dir of the LAMMPS
+example input scripts included in the examples directory of the LAMMPS
 distribution and highlighted on the :doc:`Examples <Examples>` doc page
 also show how to setup and run various kinds of simulations.
 
 Tutorials howto
 ===============
 
-
 .. toctree::
    :name: tutorials
    :maxdepth: 1
@@ -24,7 +23,6 @@ Tutorials howto
 General howto
 =============
 
-
 .. toctree::
    :name: general_howto
    :maxdepth: 1
@@ -40,9 +38,8 @@ General howto
 Settings howto
 ==============
 
-
 .. toctree::
-   :name: settings
+   :name: settings_howto
    :maxdepth: 1
 
    Howto_2d
@@ -56,9 +53,8 @@ Settings howto
 Analysis howto
 ==============
 
-
 .. toctree::
-   :name: analysis
+   :name: analysis_howto
    :maxdepth: 1
 
    Howto_output
@@ -72,9 +68,8 @@ Analysis howto
 Force fields howto
 ==================
 
-
 .. toctree::
-   :name: force
+   :name: force_howto
    :maxdepth: 1
 
    Howto_bioFF
@@ -85,9 +80,8 @@ Force fields howto
 Packages howto
 ==============
 
-
 .. toctree::
-   :name: packages
+   :name: packages_howto
    :maxdepth: 1
 
    Howto_spherical
@@ -99,8 +93,3 @@ Packages howto
    Howto_drude2
    Howto_manifold
    Howto_spins
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/Howto_2d.rst b/doc/src/Howto_2d.rst
index d4fce71230..1b4be32106 100644
--- a/doc/src/Howto_2d.rst
+++ b/doc/src/Howto_2d.rst
@@ -8,17 +8,16 @@ command.  This is the default.
 
 If using the :doc:`create box <create_box>` command to define a
 simulation box, set the z dimensions narrow, but finite, so that the
-create\_atoms command will tile the 3d simulation box with a single z
+create_atoms command will tile the 3d simulation box with a single z
 plane of atoms - e.g.
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    :doc:`create box <create_box>` 1 -10 10 -10 10 -0.25 0.25
 
 If using the :doc:`read data <read_data>` command to read in a file of
 atom coordinates, set the "zlo zhi" values to be finite but narrow,
-similar to the create\_box command settings just described.  For each
+similar to the create_box command settings just described.  For each
 atom in the file, assign a z coordinate so it falls inside the
 z-boundaries of the box - e.g. 0.0.
 
@@ -41,8 +40,3 @@ are for 2d models.
    and the *disc* option for the :doc:`fix nve/sphere <fix_nve_sphere>`,
    :doc:`fix nvt/sphere <fix_nvt_sphere>`, :doc:`fix nph/sphere <fix_nph_sphere>`, :doc:`fix npt/sphere <fix_npt_sphere>`
    commands.
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/Howto_barostat.rst b/doc/src/Howto_barostat.rst
index 7f016e0c14..87dab8dd95 100644
--- a/doc/src/Howto_barostat.rst
+++ b/doc/src/Howto_barostat.rst
@@ -61,8 +61,3 @@ explicitly via the :doc:`thermo_style custom <thermo_style>` command.
 Or you can use the :doc:`thermo_modify <thermo_modify>` command to
 re-define what pressure compute is used for default thermodynamic
 output.
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/Howto_bash.rst b/doc/src/Howto_bash.rst
index 20d808f22a..b452f579d0 100644
--- a/doc/src/Howto_bash.rst
+++ b/doc/src/Howto_bash.rst
@@ -3,10 +3,8 @@ Using LAMMPS with Bash on Windows
 
 **written by Richard Berger**
 
-
 ----------
 
-
 Starting with Windows 10 you can install Linux tools directly in Windows. This
 allows you to compile LAMMPS following the same procedure as on a real Ubuntu
 Linux installation. Software can be easily installed using the package manager
@@ -14,6 +12,10 @@ via apt-get and all files are accessible in both the Windows Explorer and your
 Linux shell (bash). This avoids switching to a different operating system or
 installing a virtual machine. Everything runs on Windows.
 
+.. seealso::
+
+   You can find more detailed information at the `Windows Subsystem for Linux Installation Guide for Windows 10 <https://docs.microsoft.com/en-us/windows/wsl/install-win10>`_.
+
 Installing Bash on Windows
 --------------------------
 
@@ -82,10 +84,8 @@ Congratulations, you have installed **Bash on Ubuntu on Windows**\ .
 
 .. image:: JPG/bow_tutorial_10.png
 
-
 ----------
 
-
 Compiling LAMMPS in Bash on Windows
 -----------------------------------
 
@@ -97,8 +97,7 @@ Installing prerequisite packages
 
 First upgrade all existing packages using
 
-
-.. parsed-literal::
+.. code-block:: bash
 
    sudo apt update
    sudo apt upgrade -y
@@ -106,10 +105,9 @@ First upgrade all existing packages using
 Next install the following packages, which include compilers and libraries
 needed for various LAMMPS features:
 
+.. code-block:: bash
 
-.. parsed-literal::
-
-   sudo apt install -y build-essential ccache gfortran openmpi-bin libopenmpi-dev libfftw3-dev libjpeg-dev libpng12-dev python-dev python-virtualenv libblas-dev liblapack-dev libhdf5-serial-dev hdf5-tools
+   sudo apt install -y build-essential ccache gfortran openmpi-bin libopenmpi-dev libfftw3-dev libjpeg-dev libpng-dev python-dev python-virtualenv libblas-dev liblapack-dev libhdf5-serial-dev hdf5-tools
 
 Files in Ubuntu on Windows
 ^^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -126,18 +124,16 @@ Obtain a copy of the LAMMPS code and go into it using "cd"
 Option 1: Downloading LAMMPS tarball using wget
 """""""""""""""""""""""""""""""""""""""""""""""
 
+.. code-block:: bash
 
-.. parsed-literal::
-
-   wget http://lammps.sandia.gov/tars/lammps-stable.tar.gz
+   wget https://lammps.sandia.gov/tars/lammps-stable.tar.gz
    tar xvzf lammps-stable.tar.gz
    cd lammps-31Mar17
 
 Option 2: Obtaining LAMMPS code from GitHub
 """""""""""""""""""""""""""""""""""""""""""
 
-
-.. parsed-literal::
+.. code-block:: bash
 
    git clone https://github.com/lammps/lammps.git
    cd lammps
@@ -150,83 +146,71 @@ At this point you can compile LAMMPS like on Ubuntu Linux.
 Compiling serial version
 """"""""""""""""""""""""
 
-
-.. parsed-literal::
+.. code-block:: bash
 
    cd src/
    make -j 4 serial
 
-This will create an executable called lmp\_serial in the src/ directory
+This will create an executable called lmp_serial in the src/ directory
 
 Compiling MPI version
 """""""""""""""""""""
 
-
-.. parsed-literal::
+.. code-block:: bash
 
    cd src/
    make -j 4 mpi
 
-This will create an executable called lmp\_mpi in the src/ directory
-
+This will create an executable called lmp_mpi in the src/ directory
 
 ----------
 
-
 Finally, please note the absolute path of your src folder. You can get this using
 
-
-.. parsed-literal::
+.. code-block:: bash
 
    pwd
 
 or
 
-
-.. parsed-literal::
+.. code-block:: bash
 
    echo $PWD
 
 To run any examples you need the location of the executable. For now, let us
 save this location in a temporary variable
 
-
-.. parsed-literal::
+.. code-block:: bash
 
    LAMMPS_DIR=$PWD
 
-
 ----------
 
-
 Running an example script
 ^^^^^^^^^^^^^^^^^^^^^^^^^
 
 Once compiled you can execute some of the LAMMPS examples. Switch into the
 examples/melt folder
 
-
-.. parsed-literal::
+.. code-block:: bash
 
    cd ../examples/melt
 
-The full path of the serial executable is $LAMMPS\_DIR/lmp\_serial, while the mpi
-version is $LAMMPS\_DIR/lmp\_mpi. You can run the melt example with either
+The full path of the serial executable is $LAMMPS_DIR/lmp_serial, while the mpi
+version is $LAMMPS_DIR/lmp_mpi. You can run the melt example with either
 version as follows:
 
-
-.. parsed-literal::
+.. code-block:: bash
 
    $LAMMPS_DIR/lmp_serial -in in.melt
 
 or
 
-
-.. parsed-literal::
+.. code-block:: bash
 
    mpirun -np 4 $LAMMPS_DIR/lmp_mpi -in in.melt
 
-Note the use of our variable $LAMMPS\_DIR, which expands into the full path of
+Note the use of our variable $LAMMPS_DIR, which expands into the full path of
 the LAMMPS src folder we saved earlier.
 
 Adding your executable directory to your PATH
@@ -235,22 +219,19 @@ Adding your executable directory to your PATH
 You can avoid having to type the full path of your LAMMPS binary by adding its
 parent folder to the PATH environment variable as follows:
 
-
-.. parsed-literal::
+.. code-block:: bash
 
    export PATH=$LAMMPS_DIR:$PATH
 
 Input scripts can then be run like this:
 
-
-.. parsed-literal::
+.. code-block:: bash
 
    lmp_serial -in in.melt
 
 or
 
-
-.. parsed-literal::
+.. code-block:: bash
 
    mpirun -np 4 lmp_mpi -in in.melt
 
@@ -258,24 +239,21 @@ However, this PATH variable will not persist if you close your bash window.
 To persist this setting edit the $HOME/.bashrc file using your favorite editor
 and add this line
 
-
-.. parsed-literal::
+.. code-block:: bash
 
    export PATH=/full/path/to/your/lammps/src:$PATH
 
 **Example:**
 
-For an executable lmp\_serial with a full path
+For an executable lmp_serial with a full path
 
-
-.. parsed-literal::
+.. code-block:: bash
 
    /home/richard/lammps/src/lmp_serial
 
 the PATH variable should be
 
-
-.. parsed-literal::
+.. code-block:: bash
 
    export PATH=/home/richard/lammps/src:$PATH
 
@@ -284,8 +262,3 @@ the PATH variable should be
    This should give you a jump start when trying to run LAMMPS on Windows.
    To become effective in this environment I encourage you to look into Linux
    tutorials explaining Bash and Basic Unix commands (e.g., `Linux Journey <https://linuxjourney.com>`_)
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/Howto_bioFF.rst b/doc/src/Howto_bioFF.rst
index fe8f6482aa..e7bfcdfdb2 100644
--- a/doc/src/Howto_bioFF.rst
+++ b/doc/src/Howto_bioFF.rst
@@ -20,12 +20,8 @@ force field.
 
 .. _charmm: http://www.scripps.edu/brooks
 
-
-
 .. _amber: http://amber.scripps.edu
 
-
-
 The interaction styles listed below compute force field formulas that
 are consistent with common options in CHARMM or AMBER.  See each
 command's documentation for the formula it computes.
@@ -114,38 +110,23 @@ documentation for the formula it computes.
 
 * :doc:`special_bonds <special_bonds>` dreiding
 
-
 ----------
 
-
 .. _howto-MacKerell:
 
-
-
 **(MacKerell)** MacKerell, Bashford, Bellott, Dunbrack, Evanseck, Field,
 Fischer, Gao, Guo, Ha, et al, J Phys Chem, 102, 3586 (1998).
 
 .. _howto-Cornell:
 
-
-
 **(Cornell)** Cornell, Cieplak, Bayly, Gould, Merz, Ferguson,
 Spellmeyer, Fox, Caldwell, Kollman, JACS 117, 5179-5197 (1995).
 
 .. _howto-Sun:
 
-
-
 **(Sun)** Sun, J. Phys. Chem. B, 102, 7338-7364 (1998).
 
 .. _howto-Mayo:
 
-
-
 **(Mayo)** Mayo, Olfason, Goddard III, J Phys Chem, 94, 8897-8909
 (1990).
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/Howto_body.rst b/doc/src/Howto_body.rst
index f929b9f439..efb5a38a59 100644
--- a/doc/src/Howto_body.rst
+++ b/doc/src/Howto_body.rst
@@ -33,10 +33,8 @@ style are described below.
 More styles may be added in the future.  See the :doc:`Modify body <Modify_body>` doc page for details on how to add a new body
 style to the code.
 
-
 ----------
 
-
 **When to use body particles:**
 
 You should not use body particles to model a rigid body made of
@@ -104,10 +102,8 @@ particles of different styles
 The pair styles defined for use with specific body styles are listed
 in the sections below.
 
-
 ----------
 
-
 **Specifics of body style nparticle:**
 
 The *nparticle* body style represents body particles as a rigid body
@@ -116,10 +112,9 @@ vanilla, prototypical example of a body particle, although as
 mentioned above, the :doc:`fix rigid <fix_rigid>` command already
 duplicates its functionality.
 
-The atom\_style body command for this body style takes two additional
+The atom_style body command for this body style takes two additional
 arguments:
 
-
 .. parsed-literal::
 
    atom_style body nparticle Nmin Nmax
@@ -133,7 +128,6 @@ When the :doc:`read_data <read_data>` command reads a data file for this
 body style, the following information must be provided for each entry
 in the *Bodies* section of the data file:
 
-
 .. parsed-literal::
 
    atom-ID 1 M
@@ -170,7 +164,6 @@ For output purposes via the :doc:`compute body/local <compute_body_local>` and :
 commands, this body style produces one datum for each of the N
 sub-particles in a body particle.  The datum has 3 values:
 
-
 .. parsed-literal::
 
    1 = x position of sub-particle
@@ -188,26 +181,23 @@ collection of spheres, one for each sub-particle.  The size of each
 sphere is determined by the *bflag1* parameter for the *body* keyword.
 The *bflag2* argument is ignored.
 
-
 ----------
 
-
 **Specifics of body style rounded/polygon:**
 
 The *rounded/polygon* body style represents body particles as a 2d
 polygon with a variable number of N vertices.  This style can only be
 used for 2d models; see the :doc:`boundary <boundary>` command.  See the
-"pair\_style body/rounded/polygon" doc page for a diagram of two
+"pair_style body/rounded/polygon" doc page for a diagram of two
 squares with rounded circles at the vertices.  Special cases for N = 1
 (circle) and N = 2 (rod with rounded ends) can also be specified.
 
 One use of this body style is for 2d discrete element models, as
 described in :ref:`Fraige <body-Fraige>`.
 
-Similar to body style *nparticle*\ , the atom\_style body command for
+Similar to body style *nparticle*\ , the atom_style body command for
 this body style takes two additional arguments:
 
-
 .. parsed-literal::
 
    atom_style body rounded/polygon Nmin Nmax
@@ -221,7 +211,6 @@ When the :doc:`read_data <read_data>` command reads a data file for this
 body style, the following information must be provided for each entry
 in the *Bodies* section of the data file:
 
-
 .. parsed-literal::
 
    atom-ID 1 M
@@ -262,7 +251,6 @@ orientation of the square is aligned with the xy coordinate axes which
 is consistent with the 6 moments of inertia: ixx iyy izz ixy ixz iyz =
 1 1 4 0 0 0. Note that only Izz matters in 2D simulations.
 
-
 .. parsed-literal::
 
    3 1 27
@@ -281,7 +269,6 @@ is consistent with the 6 moments of inertia: ixx iyy izz ixy ixz iyz =
 A rod in 2D, whose length is 4.0, mass 1.0, rounded at two ends
 by circles of diameter 0.5, is specified as follows:
 
-
 .. parsed-literal::
 
    1 1 13
@@ -293,7 +280,6 @@ by circles of diameter 0.5, is specified as follows:
 
 A disk, whose diameter is 3.0, mass 1.0, is specified as follows:
 
-
 .. parsed-literal::
 
    1 1 10
@@ -308,16 +294,14 @@ interactions.  The :doc:`fix wall/body/polygon <fix_wall_body_polygon>`
 command can be used with this body style to compute the interaction of
 body particles with a wall.
 
-
 ----------
 
-
 **Specifics of body style rounded/polyhedron:**
 
 The *rounded/polyhedron* body style represents body particles as a 3d
 polyhedron with a variable number of N vertices, E edges and F faces.
 This style can only be used for 3d models; see the
-:doc:`boundary <boundary>` command.  See the "pair\_style
+:doc:`boundary <boundary>` command.  See the "pair_style
 body/rounded/polygon" doc page for a diagram of a two 2d squares with
 rounded circles at the vertices.  A 3d cube with rounded spheres at
 the 8 vertices and 12 rounded edges would be similar.  Special cases
@@ -327,10 +311,9 @@ specified.
 This body style is for 3d discrete element models, as described in
 :ref:`Wang <body-Wang>`.
 
-Similar to body style *rounded/polygon*\ , the atom\_style body command
+Similar to body style *rounded/polygon*\ , the atom_style body command
 for this body style takes two additional arguments:
 
-
 .. parsed-literal::
 
    atom_style body rounded/polyhedron Nmin Nmax
@@ -344,7 +327,6 @@ When the :doc:`read_data <read_data>` command reads a data file for this
 body style, the following information must be provided for each entry
 in the *Bodies* section of the data file:
 
-
 .. parsed-literal::
 
    atom-ID 3 M
@@ -401,7 +383,6 @@ The orientation of the cube is aligned with the xyz coordinate axes
 which is consistent with the 6 moments of inertia: ixx iyy izz ixy ixz
 iyz = 0.667 0.667 0.667 0 0 0.
 
-
 .. parsed-literal::
 
    1 3 79
@@ -438,7 +419,6 @@ iyz = 0.667 0.667 0.667 0 0 0.
 A rod in 3D, whose length is 4.0, mass 1.0 and rounded at two ends
 by circles of diameter 0.5, is specified as follows:
 
-
 .. parsed-literal::
 
    1 1 13
@@ -450,7 +430,6 @@ by circles of diameter 0.5, is specified as follows:
 
 A sphere whose diameter is 3.0 and mass 1.0, is specified as follows:
 
-
 .. parsed-literal::
 
    1 1 10
@@ -465,15 +444,12 @@ be used with this body style to compute body/body interactions.  The
 used with this body style to compute the interaction of body particles
 with a wall.
 
-
 ----------
 
-
 For output purposes via the :doc:`compute body/local <compute_body_local>` and :doc:`dump local <dump>`
 commands, this body style produces one datum for each of the N
 sub-particles in a body particle.  The datum has 3 values:
 
-
 .. parsed-literal::
 
    1 = x position of vertex
@@ -495,25 +471,14 @@ tangent to the spheres).  The drawn diameter of each line segment is
 determined by the *bflag1* parameter for the *body* keyword.  The
 *bflag2* argument is ignored.
 
-
 ----------
 
-
 .. _body-Fraige:
 
-
-
 **(Fraige)** F. Y. Fraige, P. A. Langston, A. J. Matchett, J. Dodds,
 Particuology, 6, 455 (2008).
 
 .. _body-Wang:
 
-
-
 **(Wang)** J. Wang, H. S. Yu, P. A. Langston, F. Y. Fraige, Granular
 Matter, 13, 1 (2011).
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/Howto_chunk.rst b/doc/src/Howto_chunk.rst
index 337a24c9b7..cdc0c30d9b 100644
--- a/doc/src/Howto_chunk.rst
+++ b/doc/src/Howto_chunk.rst
@@ -110,7 +110,7 @@ of a center of mass, which requires summing mass\*position over the
 atoms and then dividing by summed mass.
 
 All of these computes produce a global vector or global array as
-output, wih one or more values per chunk.  The output can be used in
+output, with one or more values per chunk.  The output can be used in
 various ways:
 
 * As input to the :doc:`fix ave/time <fix_ave_time>` command, which can
@@ -150,8 +150,7 @@ properties:
 
 (1) Average velocity in each of 1000 2d spatial bins:
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    compute cc1 all chunk/atom bin/2d x 0.0 0.1 y lower 0.01 units reduced
    fix 1 all ave/chunk 100 10 1000 cc1 vx vy file tmp.out
@@ -159,8 +158,7 @@ properties:
 (2) Temperature in each spatial bin, after subtracting a flow
 velocity:
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    compute cc1 all chunk/atom bin/2d x 0.0 0.1 y lower 0.1 units reduced
    compute vbias all temp/profile 1 0 0 y 10
@@ -168,17 +166,15 @@ velocity:
 
 (3) Center of mass of each molecule:
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    compute cc1 all chunk/atom molecule
    compute myChunk all com/chunk cc1
-   fix 1 all ave/time 100 1 100 c_myChunk[\*] file tmp.out mode vector
+   fix 1 all ave/time 100 1 100 c_myChunk[*] file tmp.out mode vector
 
 (4) Total force on each molecule and ave/max across all molecules:
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    compute cc1 all chunk/atom molecule
    fix 1 all ave/chunk 1000 1 1000 cc1 fx fy fz file tmp.out
@@ -189,8 +185,7 @@ velocity:
 
 (5) Histogram of cluster sizes:
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    compute cluster all cluster/atom 1.0
    compute cc1 all chunk/atom c_cluster compress yes
@@ -212,8 +207,3 @@ using the :doc:`fix ave/chunk <fix_ave_chunk>` command to calculate an
 average dipole moment vector for each bin.  This example is explained
 on the :doc:`compute chunk/spread/atom <compute_chunk_spread_atom>`
 command doc page.
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/Howto_client_server.rst b/doc/src/Howto_client_server.rst
index 26f14e8e5b..c22e1ca3ab 100644
--- a/doc/src/Howto_client_server.rst
+++ b/doc/src/Howto_client_server.rst
@@ -62,14 +62,14 @@ below.  The MESSAGE package also wraps a client/server library called
 CSlib which enables two codes to exchange messages in different ways,
 either via files, sockets, or MPI.  The CSlib is provided with LAMMPS
 in the lib/message dir.  The CSlib has its own
-`website <http://cslib.sandia.gov>`_ with documentation and test
+`website <https://cslib.sandia.gov>`_ with documentation and test
 programs.
 
 .. note::
 
    For client/server coupling to work between LAMMPS and another
-   code, the other code also has to use the CSlib.  This can often be
-   done without any modification to the other code by simply wrapping it
+   code, the other code also has to use the CSlib.  This can sometimes be
+   done without any modifications to the other code by simply wrapping it
    with a Python script that exchanges CSlib messages with LAMMPS and
    prepares input for or processes output from the other code.  The other
    code also has to implement a matching protocol for the format and
@@ -93,18 +93,24 @@ client or server code:
 
 * examples/message
 * examples/COUPLE/README
-* examples/COUPLE/lammps\_mc
-* examples/COUPLE/lammps\_vasp
+* examples/COUPLE/lammps_mc
+* examples/COUPLE/lammps_nwchem
+* examples/COUPLE/lammps_vasp
 
-The examples/message dir couples a client instance of LAMMPS to a
+The examples/message directory couples a client instance of LAMMPS to a
 server instance of LAMMPS.
 
-The lammps\_mc dir shows how to couple LAMMPS as a server to a simple
-Monte Carlo client code as the driver.
+The files in the *lammps_mc* folder show how to couple LAMMPS as
+a server to a simple Monte Carlo client code as the driver.
 
-The lammps\_vasp dir shows how to couple LAMMPS as a client code
-running MD timestepping to VASP acting as a server providing quantum
-DFT forces, through a Python wrapper script on VASP.
+The files in the *lammps_nwchem* folder show how to couple LAMMPS
+as a client code running MD timestepping to NWChem acting as a
+server providing quantum DFT forces, through a Python wrapper script
+on NWChem.
+
+The files in the *lammps_vasp* folder show how to couple LAMMPS as
+a client code running MD timestepping to VASP acting as a server
+providing quantum DFT forces, through a Python wrapper script on VASP.
 
 Here is how to launch a client and server code together for any of the
 4 modes of message exchange that the :doc:`message <message>` command
@@ -128,8 +134,7 @@ together to exchange MPI messages between them.
 
 For message exchange in *file*\ , *zmq*\ , or *mpi/two* modes:
 
-
-.. parsed-literal::
+.. code-block:: bash
 
    % mpirun -np 1 lmp_mpi -log log.client < in.client &
    % mpirun -np 2 lmp_mpi -log log.server < in.server
@@ -144,8 +149,7 @@ For message exchange in *mpi/one* mode:
 
 Launch both codes in a single mpirun command:
 
-
-.. parsed-literal::
+.. code-block:: bash
 
    mpirun -np 2 lmp_mpi -mpicolor 0 -in in.message.client -log log.client : -np 4 lmp_mpi -mpicolor 1 -in in.message.server -log log.server
 
@@ -157,8 +161,3 @@ command-line option as their its option, where color is an integer
 label that will be used to distinguish one executable from another in
 the multiple executables that the mpirun command launches.  In this
 example the client was colored with a 0, and the server with a 1.
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/Howto_coreshell.rst b/doc/src/Howto_coreshell.rst
index 8b2ba38306..94fb5b7b42 100644
--- a/doc/src/Howto_coreshell.rst
+++ b/doc/src/Howto_coreshell.rst
@@ -24,7 +24,6 @@ shell of a core/shell pair should be bonded to each other with a
 harmonic bond that provides the spring force. For example, a data file
 for NaCl, as found in examples/coreshell, has this format:
 
-
 .. parsed-literal::
 
    432   atoms  # core and shell atoms
@@ -87,11 +86,10 @@ Ewald solvers can be used.
 For the NaCL example problem, these pair style and bond style settings
 are used:
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    pair_style      born/coul/long/cs 20.0 20.0
-   pair_coeff      \* \*      0.0 1.000   0.00  0.00   0.00
+   pair_coeff      * *      0.0 1.000   0.00  0.00   0.00
    pair_coeff      3 3    487.0 0.23768 0.00  1.05   0.50 #Na-Na
    pair_coeff      3 4 145134.0 0.23768 0.00  6.99   8.70 #Na-Cl
    pair_coeff      4 4 405774.0 0.23768 0.00 72.40 145.40 #Cl-Cl
@@ -131,8 +129,7 @@ this temperature be output for the overall system.
 
 For the NaCl example, this can be done as follows:
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    group cores type 1 2
    group shells type 3 4
@@ -150,8 +147,7 @@ the default :doc:`temperature <compute_temp>` and specifying it as a
 second argument in :doc:`fix modify <fix_modify>` and
 :doc:`thermo_modify <thermo_modify>` resulting in:
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    (...)
    compute CSequ all temp/cs cores shells
@@ -174,8 +170,7 @@ the pairs.  This can be done by using the *bias* keyword of the
 :doc:`velocity create <velocity>` command and assigning the :doc:`compute temp/cs <compute_temp_cs>` command to the *temp* keyword of the
 :doc:`velocity <velocity>` command, e.g.
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    velocity all create 1427 134 bias yes temp CSequ
    velocity all scale 1427 temp CSequ
@@ -211,8 +206,7 @@ pairs as chunks.
 
 For example if core/shell pairs are the only molecules:
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    read_data NaCl_CS_x0.1_prop.data
    compute prop all property/atom molecule
@@ -222,8 +216,7 @@ For example if core/shell pairs are the only molecules:
 
 For example if core/shell pairs and other molecules are present:
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    fix csinfo all property/atom i_CSID                       # property/atom command
    read_data NaCl_CS_x0.1_prop.data fix csinfo NULL CS-Info  # atom property added in the data-file
@@ -232,7 +225,6 @@ For example if core/shell pairs and other molecules are present:
 
 The additional section in the date file would be formatted like this:
 
-
 .. parsed-literal::
 
    CS-Info         # header of additional section
@@ -247,25 +239,14 @@ The additional section in the date file would be formatted like this:
    8   4
    (...)
 
-
 ----------
 
-
 .. _MitchellFincham:
 
-
-
 **(Mitchell and Fincham)** Mitchell, Fincham, J Phys Condensed Matter,
 5, 1031-1038 (1993).
 
 .. _MitchellFincham2:
 
-
-
 **(Fincham)** Fincham, Mackrodt and Mitchell, J Phys Condensed Matter,
 6, 393-404 (1994).
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/Howto_couple.rst b/doc/src/Howto_couple.rst
index e92e985ab4..c652d4f599 100644
--- a/doc/src/Howto_couple.rst
+++ b/doc/src/Howto_couple.rst
@@ -9,13 +9,11 @@ nodal points, compute a FE solution, and return interpolated forces on
 MD atoms.
 
 LAMMPS can be coupled to other codes in at least 4 ways.  Each has
-advantages and disadvantages, which you'll have to think about in the
+advantages and disadvantages, which you will have to think about in the
 context of your application.
 
-
 ----------
 
-
 (1) Define a new :doc:`fix <fix>` command that calls the other code.  In
 this scenario, LAMMPS is the driver code.  During its timestepping,
 the fix is invoked, and can make library calls to the other code,
@@ -27,12 +25,8 @@ LAMMPS.
 
 .. _poems: http://www.rpi.edu/~anderk5/lab
 
-
-
-
 ----------
 
-
 (2) Define a new LAMMPS command that calls the other code.  This is
 conceptually similar to method (1), but in this case LAMMPS and the
 other code are on a more equal footing.  Note that now the other code
@@ -53,10 +47,8 @@ command writes and reads.
 See the :doc:`Modify command <Modify_command>` doc page for info on how
 to add a new command to LAMMPS.
 
-
 ----------
 
-
 (3) Use LAMMPS as a library called by another code.  In this case the
 other code is the driver and calls LAMMPS as needed.  Or a wrapper
 code could link and call both LAMMPS and another code as libraries.
@@ -70,21 +62,18 @@ examples/COUPLE/README for more details:
 
 * simple: simple driver programs in C++ and C which invoke LAMMPS as a
   library
-* lammps\_quest: coupling of LAMMPS and `Quest <quest_>`_, to run classical
+* plugin: simple driver program in C which invokes LAMMPS as a plugin
+  from a shared library.
+* lammps_quest: coupling of LAMMPS and `Quest <quest_>`_, to run classical
   MD with quantum forces calculated by a density functional code
-* lammps\_spparks: coupling of LAMMPS and `SPPARKS <spparks_>`_, to couple
+* lammps_spparks: coupling of LAMMPS and `SPPARKS <spparks_>`_, to couple
   a kinetic Monte Carlo model for grain growth using MD to calculate
   strain induced across grain boundaries
 
-
 .. _quest: http://dft.sandia.gov/Quest
 
-
-
 .. _spparks: http://www.sandia.gov/~sjplimp/spparks.html
 
-
-
 The :doc:`Build basics <Build_basics>` doc page describes how to build
 LAMMPS as a library.  Once this is done, you can interface with LAMMPS
 either via C++, C, Fortran, or Python (or any other language that
@@ -100,7 +89,7 @@ The files src/library.cpp and library.h contain the C-style interface
 to LAMMPS.  See the :doc:`Howto library <Howto_library>` doc page for a
 description of the interface and how to extend it for your needs.
 
-Note that the lammps\_open() function that creates an instance of
+Note that the lammps_open() function that creates an instance of
 LAMMPS takes an MPI communicator as an argument.  This means that
 instance of LAMMPS will run on the set of processors in the
 communicator.  Thus the calling code can run LAMMPS on all or a subset
@@ -111,15 +100,8 @@ LAMMPS and half to the other code and run both codes simultaneously
 before syncing them up periodically.  Or it might instantiate multiple
 instances of LAMMPS to perform different calculations.
 
-
 ----------
 
-
 (4) Couple LAMMPS with another code in a client/server mode.  This is
 described on the :doc:`Howto client/server <Howto_client_server>` doc
 page.
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/Howto_diffusion.rst b/doc/src/Howto_diffusion.rst
index 8c5dbd7a8f..5ee40d2cd3 100644
--- a/doc/src/Howto_diffusion.rst
+++ b/doc/src/Howto_diffusion.rst
@@ -21,12 +21,3 @@ diffusion coefficient.  The instantaneous VACF values can be
 accumulated in a vector via the :doc:`fix vector <fix_vector>` command,
 and time integrated via the :doc:`variable trap <variable>` function,
 and thus extract D.
-
-
-----------
-
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/Howto_dispersion.rst b/doc/src/Howto_dispersion.rst
index c6a0813516..a173e0cfbd 100644
--- a/doc/src/Howto_dispersion.rst
+++ b/doc/src/Howto_dispersion.rst
@@ -29,7 +29,7 @@ that provide fast and accurate simulations, there are two approaches,
 which both have their up- and downsides.
 
 The first approach is to set desired real-space an kspace accuracies
-via the *kspace\_modify force/disp/real* and *kspace\_modify
+via the *kspace_modify force/disp/real* and *kspace_modify
 force/disp/kspace* commands. Note that the accuracies have to be
 specified in force units and are thus dependent on the chosen unit
 settings. For real units, 0.0001 and 0.002 seem to provide reasonable
@@ -37,14 +37,14 @@ accurate and efficient computations for the real-space and kspace
 accuracies.  0.002 and 0.05 work well for most systems using lj
 units. PPPM parameters will be generated based on the desired
 accuracies. The upside of this approach is that it usually provides a
-good set of parameters and will work for both the *kspace\_modify diff
-ad* and *kspace\_modify diff ik* options.  The downside of the method
+good set of parameters and will work for both the *kspace_modify diff
+ad* and *kspace_modify diff ik* options.  The downside of the method
 is that setting the PPPM parameters will take some time during the
 initialization of the simulation.
 
 The second approach is to set the parameters for the pppm/disp
-explicitly using the *kspace\_modify mesh/disp*, *kspace\_modify
-order/disp*, and *kspace\_modify gewald/disp* commands. This approach
+explicitly using the *kspace_modify mesh/disp*, *kspace_modify
+order/disp*, and *kspace_modify gewald/disp* commands. This approach
 requires a more experienced user who understands well the impact of
 the choice of parameters on the simulation accuracy and
 performance. This approach provides a fast initialization of the
@@ -60,12 +60,12 @@ To avoid inaccurate or inefficient simulations, the pppm/disp stops
 simulations with an error message if no action is taken to control the
 PPPM parameters. If the automatic parameter generation is desired and
 real-space and kspace accuracies are desired to be equal, this error
-message can be suppressed using the *kspace\_modify disp/auto yes*
+message can be suppressed using the *kspace_modify disp/auto yes*
 command.
 
 A reasonable approach that combines the upsides of both methods is to
-make the first run using the *kspace\_modify force/disp/real* and
-*kspace\_modify force/disp/kspace* commands, write down the PPPM
+make the first run using the *kspace_modify force/disp/real* and
+*kspace_modify force/disp/kspace* commands, write down the PPPM
 parameters from the output, and specify these parameters using the
 second approach in subsequent runs (which have the same composition,
 force field, and approximately the same volume).
@@ -82,8 +82,8 @@ The second is that the mixing rule of the pair style has an impact on
 the computation time when using the pppm/disp. Fastest computations
 are achieved when using the geometric mixing rule. Using the
 arithmetic mixing rule substantially increases the computational cost.
-The computational overhead can be reduced using the *kspace\_modify
-mix/disp geom* and *kspace\_modify splittol* commands. The first
+The computational overhead can be reduced using the *kspace_modify
+mix/disp geom* and *kspace_modify splittol* commands. The first
 command simply enforces geometric mixing of the dispersion
 coefficients in kspace computations.  This introduces some error in
 the computations but will also significantly speed-up the
@@ -94,12 +94,7 @@ command, but will usually also not provide an equally good increase of
 efficiency.
 
 Finally, pppm/disp can also be used when no mixing rules apply.
-This can be achieved using the *kspace\_modify mix/disp none* command.
+This can be achieved using the *kspace_modify mix/disp none* command.
 Note that the code does not check automatically whether any mixing
 rule is fulfilled. If mixing rules do not apply, the user will have
 to specify this command explicitly.
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/Howto_drude.rst b/doc/src/Howto_drude.rst
index 78eb7ba49f..62659711c4 100644
--- a/doc/src/Howto_drude.rst
+++ b/doc/src/Howto_drude.rst
@@ -48,7 +48,7 @@ for a Langevin thermostat, or :doc:`fix drude/transform/\* <fix_drude_transform>
 thermostat. The former requires use of the command :doc:`comm_modify vel yes <comm_modify>`. The latter requires two separate integration
 fixes like *nvt* or *npt*\ . The correct temperatures of the reduced
 degrees of freedom can be calculated using the :doc:`compute temp/drude <compute_temp_drude>`. This requires also to use the
-command *comm\_modify vel yes*.
+command *comm_modify vel yes*.
 
 Short-range damping of the induced dipole interactions can be achieved
 using Thole functions through the :doc:`pair style thole <pair_thole>` in :doc:`pair_style hybrid/overlay <pair_hybrid>`
@@ -56,17 +56,8 @@ with a Coulomb pair style. It may be useful to use *coul/long/cs* or
 similar from the CORESHELL package if the core and Drude particle come
 too close, which can cause numerical issues.
 
-
 ----------
 
-
 .. _howto-Lamoureux:
 
-
-
 **(Lamoureux and Roux)** G. Lamoureux, B. Roux, J. Chem. Phys 119, 3025 (2003)
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/Howto_drude2.rst b/doc/src/Howto_drude2.rst
index e1572df6c6..cbdbc2d250 100644
--- a/doc/src/Howto_drude2.rst
+++ b/doc/src/Howto_drude2.rst
@@ -9,10 +9,8 @@ USER-DRUDE package activated. Then, the data file and input scripts
 have to be modified to include the Drude dipoles and how to handle
 them.
 
-
 ----------
 
-
 **Overview of Drude induced dipoles**
 
 Polarizable atoms acquire an induced electric dipole moment under the
@@ -32,10 +30,9 @@ zero. The (half-)stiffness of the :doc:`harmonic bond <bond_harmonic>`
 :math:`K_D = k_D/2` and the Drude charge :math:`q_D` are related to the atom
 polarizability :math:`\alpha` by
 
-
 .. math::
 
-   \begin{equation} K_D = \frac 1 2\, \frac {q_D^2} \alpha\end{equation}
+   K_D = \frac 1 2\, \frac {q_D^2} \alpha
 
 Ideally, the mass of the Drude particle should be small, and the
 stiffness of the harmonic bond should be large, so that the Drude
@@ -48,7 +45,6 @@ fields:
 * Alternately :ref:`Schroeder and Steinhauser <Schroeder>` suggest adopting a global charge :math:`q_D` = -1.0e and a global mass :math:`m_D` = 0.1 g/mol (or u) for all Drude particles, and to calculate the force constant for each type of core-Drude bond from equation (1). The timesteps used by these authors are between 0.5 and 2 fs, with the degrees of freedom of the Drude oscillators kept cold at 1 K.
 * In both these force fields hydrogen atoms are treated as non-polarizable.
 
-
 The motion of of the Drude particles can be calculated by minimizing
 the energy of the induced dipoles at each timestep, by an iterative,
 self-consistent procedure. The Drude particles can be massless and
@@ -75,23 +71,19 @@ important features:
 #. The possibility to thermostat the additional degrees of freedom associated with the induced dipoles at very low temperature, in terms of the reduced coordinates of the Drude particles with respect to their cores. This makes the trajectory close to that of relaxed induced dipoles.
 #. The Drude dipoles on covalently bonded atoms interact too strongly due to the short distances, so an atom may capture the Drude particle (shell) of a neighbor, or the induced dipoles within the same molecule may align too much.  To avoid this, damping at short of the interactions between the point charges composing the induced dipole can be done by :ref:`Thole <Thole2>` functions.
 
-
-
 ----------
 
-
 **Preparation of the data file**
 
 The data file is similar to a standard LAMMPS data file for
-*atom\_style full*.  The DPs and the *harmonic bonds* connecting them
+*atom_style full*.  The DPs and the *harmonic bonds* connecting them
 to their DC should appear in the data file as normal atoms and bonds.
 
 You can use the *polarizer* tool (Python script distributed with the
 USER-DRUDE package) to convert a non-polarizable data file (here
 *data.102494.lmp*\ ) to a polarizable data file (\ *data-p.lmp*\ )
 
-
-.. parsed-literal::
+.. code-block:: bash
 
    polarizer -q -f phenol.dff data.102494.lmp data-p.lmp
 
@@ -101,7 +93,6 @@ from *phenol.dff*\ , as well as the DC-DP bond constants.  The file
 *phenol.dff* contains the polarizabilities of the atom types
 and the mass of the Drude particles, for instance:
 
-
 .. parsed-literal::
 
    # units: kJ/mol, A, deg
@@ -118,7 +109,6 @@ have to be specified as comments at the end of lines of the *Masses*
 section.  You probably need to edit it to add these names. It should
 look like
 
-
 .. parsed-literal::
 
    Masses
@@ -129,10 +119,8 @@ look like
    4 1.008  # HA
    5 1.008  # HO
 
-
 ----------
 
-
 **Basic input file**
 
 The atom style should be set to (or derive from) *full*\ , so that you
@@ -143,8 +131,7 @@ script (the use of these lines will be explained below).  In order for
 LAMMPS to recognize that you are using Drude oscillators, you should
 use the fix *drude*\ . The command is
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    fix DRUDE all drude C C C N N D D D
 
@@ -164,8 +151,7 @@ command.  With our phenol, there is 1 more special neighbor for which
 space is required.  Otherwise LAMMPS crashes and gives the required
 value.
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    read_data data-p.lmp extra/special/per/atom 1
 
@@ -173,31 +159,28 @@ Let us assume we want to run a simple NVT simulation at 300 K.  Note
 that Drude oscillators need to be thermalized at a low temperature in
 order to approximate a self-consistent field (SCF), therefore it is not
 possible to simulate an NVE ensemble with this package.  Since dipoles
-are approximated by a charged DC-DP pair, the *pair\_style* must
+are approximated by a charged DC-DP pair, the *pair_style* must
 include Coulomb interactions, for instance *lj/cut/coul/long* with
-*kspace\_style pppm*. For example, with a cutoff of 10. and a precision
+*kspace_style pppm*. For example, with a cutoff of 10. and a precision
 1.e-4:
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    pair_style lj/cut/coul/long 10.0
    kspace_style pppm 1.0e-4
 
-As compared to the non-polarizable input file, *pair\_coeff* lines need
+As compared to the non-polarizable input file, *pair_coeff* lines need
 to be added for the DPs.  Since the DPs have no Lennard-Jones
-interactions, their *epsilon* is 0. so the only *pair\_coeff* line
+interactions, their :math:`\epsilon` is 0. so the only *pair_coeff* line
 that needs to be added is
 
+.. code-block:: LAMMPS
 
-.. parsed-literal::
-
-   pair_coeff \* 6\* 0.0 0.0 # All-DPs
+   pair_coeff * 6* 0.0 0.0 # All-DPs
 
 Now for the thermalization, the simplest choice is to use the :doc:`fix langevin/drude <fix_langevin_drude>`.
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    fix LANG all langevin/drude 300. 100 12435 1. 20 13977
 
@@ -210,8 +193,7 @@ atoms need to be in this fix's group.  LAMMPS will thermostat the DPs
 together with their DC.  For this, ghost atoms need to know their
 velocities. Thus you need to add the following command:
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    comm_modify vel yes
 
@@ -222,8 +204,7 @@ can add the *zero yes* option at the end of the fix line.
 If the fix *shake* is used to constrain the C-H bonds, it should be
 invoked after the fix *langevin/drude* for more accuracy.
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    fix SHAKE ATOMS shake 0.0001 20 0 t 4 5
 
@@ -236,47 +217,41 @@ Since the fix *langevin/drude* does not perform time integration (just
 modification of forces but no position/velocity updates), the fix
 *nve* should be used in conjunction.
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    fix NVE all nve
 
 Finally, do not forget to update the atom type elements if you use
-them in a *dump\_modify ... element ...* command, by adding the element
+them in a *dump_modify ... element ...* command, by adding the element
 type of the DPs. Here for instance
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    dump DUMP all custom 10 dump.lammpstrj id mol type element x y z ix iy iz
    dump_modify DUMP element C C O H H D D D
 
 The input file should now be ready for use!
 
-You will notice that the global temperature *thermo\_temp* computed by
+You will notice that the global temperature *thermo_temp* computed by
 LAMMPS is not 300. K as wanted.  This is because LAMMPS treats DPs as
 standard atoms in his default compute.  If you want to output the
 temperatures of the DC-DP pair centers of mass and of the DPs relative
-to their DCs, you should use the :doc:`compute temp\_drude <compute_temp_drude>`
+to their DCs, you should use the :doc:`compute temp_drude <compute_temp_drude>`
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    compute TDRUDE all temp/drude
 
 And then output the correct temperatures of the Drude oscillators
-using *thermo\_style custom* with respectively *c\_TDRUDE[1]* and
-*c\_TDRUDE[2]*. These should be close to 300.0 and 1.0 on average.
+using *thermo_style custom* with respectively *c_TDRUDE[1]* and
+*c_TDRUDE[2]*. These should be close to 300.0 and 1.0 on average.
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    thermo_style custom step temp c_TDRUDE[1] c_TDRUDE[2]
 
-
 ----------
 
-
 **Thole screening**
 
 Dipolar interactions represented by point charges on springs may not
@@ -288,30 +263,28 @@ between nearby dipoles on the same molecule may be exaggerated.  Often,
 special bond relations prevent bonded neighboring atoms to see the
 charge of each other's DP, so that the problem does not always appear.
 It is possible to use screened dipole-dipole interactions by using the
-:doc:`*pair\_style thole* <pair_thole>`.  This is implemented as a
-correction to the Coulomb pair\_styles, which dampens at short distance
+:doc:`*pair_style thole* <pair_thole>`.  This is implemented as a
+correction to the Coulomb pair_styles, which dampens at short distance
 the interactions between the charges representing the induced dipoles.
 It is to be used as *hybrid/overlay* with any standard *coul* pair
 style.  In our example, we would use
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    pair_style hybrid/overlay lj/cut/coul/long 10.0 thole 2.6 10.0
 
-This tells LAMMPS that we are using two pair\_styles.  The first one is
+This tells LAMMPS that we are using two pair_styles.  The first one is
 as above (\ *lj/cut/coul/long 10.0*\ ).  The second one is a *thole*
-pair\_style with default screening factor 2.6 (:ref:`Noskov <Noskov2>`) and
+pair_style with default screening factor 2.6 (:ref:`Noskov <Noskov2>`) and
 cutoff 10.0.
 
 Since *hybrid/overlay* does not support mixing rules, the interaction
 coefficients of all the pairs of atom types with i < j should be
 explicitly defined.  The output of the *polarizer* script can be used
-to complete the *pair\_coeff* section of the input file.  In our
+to complete the *pair_coeff* section of the input file.  In our
 example, this will look like:
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    pair_coeff    1    1 lj/cut/coul/long    0.0700   3.550
    pair_coeff    1    2 lj/cut/coul/long    0.0700   3.550
@@ -323,8 +296,8 @@ example, this will look like:
    pair_coeff    3    3 lj/cut/coul/long    0.1700   3.070
    pair_coeff    3    4 lj/cut/coul/long    0.0714   2.745
    pair_coeff    4    4 lj/cut/coul/long    0.0300   2.420
-   pair_coeff    \*    5 lj/cut/coul/long    0.0000   0.000
-   pair_coeff    \*   6\* lj/cut/coul/long    0.0000   0.000
+   pair_coeff    *    5 lj/cut/coul/long    0.0000   0.000
+   pair_coeff    *   6* lj/cut/coul/long    0.0000   0.000
    pair_coeff    1    1 thole   1.090   2.510
    pair_coeff    1    2 thole   1.218   2.510
    pair_coeff    1    3 thole   0.829   1.590
@@ -351,32 +324,28 @@ For the *thole* pair style the coefficients are
 
 #. the atom polarizability in units of cubic length
 #. the screening factor of the Thole function (optional, default value
-   specified by the pair\_style command)
-#. the cutoff (optional, default value defined by the pair\_style command)
-
+   specified by the pair_style command)
+#. the cutoff (optional, default value defined by the pair_style command)
 
 The special neighbors have charge-charge and charge-dipole
-interactions screened by the *coul* factors of the *special\_bonds*
+interactions screened by the *coul* factors of the *special_bonds*
 command (0.0, 0.0, and 0.5 in the example above).  Without using the
-pair\_style *thole*\ , dipole-dipole interactions are screened by the
-same factor.  By using the pair\_style *thole*\ , dipole-dipole
+pair_style *thole*\ , dipole-dipole interactions are screened by the
+same factor.  By using the pair_style *thole*\ , dipole-dipole
 interactions are screened by Thole's function, whatever their special
 relationship (except within each DC-DP pair of course).  Consider for
-example 1-2 neighbors: using the pair\_style *thole*\ , their dipoles
+example 1-2 neighbors: using the pair_style *thole*\ , their dipoles
 will see each other (despite the *coul* factor being 0.) and the
 interactions between these dipoles will be damped by Thole's function.
 
-
 ----------
 
-
 **Thermostats and barostats**
 
 Using a Nose-Hoover barostat with the *langevin/drude* thermostat is
 straightforward using fix *nph* instead of *nve*\ .  For example:
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    fix NPH all nph iso 1. 1. 500
 
@@ -390,8 +359,7 @@ with respect to their DC. The *fix drude/transform/inverse* performs
 the reverse transformation.  For a NVT simulation, with the DCs and
 atoms at 300 K and the DPs at 1 K relative to their DC one would use
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    fix DIRECT all drude/transform/direct
    fix NVT1 ATOMS nvt temp 300. 300. 100
@@ -400,22 +368,20 @@ atoms at 300 K and the DPs at 1 K relative to their DC one would use
 
 For our phenol example, the groups would be defined as
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    group ATOMS  type 1 2 3 4 5 # DCs and non-polarizable atoms
    group CORES  type 1 2 3     # DCs
    group DRUDES type 6 7 8     # DPs
 
 Note that with the fixes *drude/transform*\ , it is not required to
-specify *comm\_modify vel yes* because the fixes do it anyway (several
+specify *comm_modify vel yes* because the fixes do it anyway (several
 times and for the forces also).  To avoid the flying ice cube artifact
 :ref:`(Lamoureux) <Lamoureux2>`, where the atoms progressively freeze and the
 center of mass of the whole system drifts faster and faster, the *fix
 momentum* can be used. For instance:
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    fix MOMENTUM all momentum 100 linear 1 1 1
 
@@ -426,11 +392,10 @@ DPs should be *nvt* (or vice versa).  Second, the *fix npt* computes a
 global pressure and thus a global temperature whatever the fix group.
 We do want the pressure to correspond to the whole system, but we want
 the temperature to correspond to the fix group only.  We must then use
-the *fix\_modify* command for this.  In the end, the block of
+the *fix_modify* command for this.  In the end, the block of
 instructions for thermostatting and barostatting will look like
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    compute TATOMS ATOMS temp
    fix DIRECT all drude/transform/direct
@@ -439,10 +404,8 @@ instructions for thermostatting and barostatting will look like
    fix NVT DRUDES nvt temp 1. 1. 20
    fix INVERSE all drude/transform/inverse
 
-
 ----------
 
-
 **Rigid bodies**
 
 You may want to simulate molecules as rigid bodies (but polarizable).
@@ -453,8 +416,7 @@ review the different thermostats and ensemble combinations.
 
 NVT ensemble using Langevin thermostat:
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    comm_modify vel yes
    fix LANG all langevin/drude 300. 100 12435 1. 20 13977
@@ -463,8 +425,7 @@ NVT ensemble using Langevin thermostat:
 
 NVT ensemble using Nose-Hoover thermostat:
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    fix DIRECT all drude/transform/direct
    fix RIGID ATOMS rigid/nvt/small molecule temp 300. 300. 100
@@ -473,8 +434,7 @@ NVT ensemble using Nose-Hoover thermostat:
 
 NPT ensemble with Langevin thermostat:
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    comm_modify vel yes
    fix LANG all langevin/drude 300. 100 12435 1. 20 13977
@@ -483,8 +443,7 @@ NPT ensemble with Langevin thermostat:
 
 NPT ensemble using Nose-Hoover thermostat:
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    compute TATOM ATOMS temp
    fix DIRECT all drude/transform/direct
@@ -493,50 +452,31 @@ NPT ensemble using Nose-Hoover thermostat:
    fix NVT DRUDES nvt temp 1. 1. 20
    fix INVERSE all drude/transform/inverse
 
-
 ----------
 
-
 .. _Lamoureux2:
 
-
-
 **(Lamoureux)** Lamoureux and Roux, J Chem Phys, 119, 3025-3039 (2003)
 
 .. _Schroeder:
 
-
-
 **(Schroeder)**  Schroeder and Steinhauser, J Chem Phys, 133,
 154511 (2010).
 
 .. _Jiang2:
 
-
-
 **(Jiang)** Jiang, Hardy, Phillips, MacKerell, Schulten, and Roux,
  J Phys Chem Lett, 2, 87-92 (2011).
 
 .. _Thole2:
 
-
-
 **(Thole)** Chem Phys, 59, 341 (1981).
 
 .. _Noskov2:
 
-
-
 **(Noskov)** Noskov, Lamoureux and Roux, J Phys Chem B, 109, 6705 (2005).
 
 .. _SWM4-NDP:
 
-
-
 **(SWM4-NDP)** Lamoureux, Harder, Vorobyov, Roux, MacKerell, Chem Phys
 Let, 418, 245-249 (2006)
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/Howto_elastic.rst b/doc/src/Howto_elastic.rst
index 389c8e19de..4870942458 100644
--- a/doc/src/Howto_elastic.rst
+++ b/doc/src/Howto_elastic.rst
@@ -4,14 +4,14 @@ Calculate elastic constants
 Elastic constants characterize the stiffness of a material. The formal
 definition is provided by the linear relation that holds between the
 stress and strain tensors in the limit of infinitesimal deformation.
-In tensor notation, this is expressed as s\_ij = C\_ijkl \* e\_kl, where
-the repeated indices imply summation. s\_ij are the elements of the
-symmetric stress tensor. e\_kl are the elements of the symmetric strain
-tensor. C\_ijkl are the elements of the fourth rank tensor of elastic
+In tensor notation, this is expressed as s_ij = C_ijkl \* e_kl, where
+the repeated indices imply summation. s_ij are the elements of the
+symmetric stress tensor. e_kl are the elements of the symmetric strain
+tensor. C_ijkl are the elements of the fourth rank tensor of elastic
 constants. In three dimensions, this tensor has 3\^4=81 elements. Using
-Voigt notation, the tensor can be written as a 6x6 matrix, where C\_ij
-is now the derivative of s\_i w.r.t. e\_j. Because s\_i is itself a
-derivative w.r.t. e\_i, it follows that C\_ij is also symmetric, with at
+Voigt notation, the tensor can be written as a 6x6 matrix, where C_ij
+is now the derivative of s_i w.r.t. e_j. Because s_i is itself a
+derivative w.r.t. e_i, it follows that C_ij is also symmetric, with at
 most 7\*6/2 = 21 distinct elements.
 
 At zero temperature, it is easy to estimate these derivatives by
@@ -33,17 +33,8 @@ tensor. Another approach is to sample the triclinic cell fluctuations
 that occur in an NPT simulation. This method can also be slow to
 converge and requires careful post-processing :ref:`(Shinoda) <Shinoda1>`
 
-
 ----------
 
-
 .. _Shinoda1:
 
-
-
 **(Shinoda)** Shinoda, Shiga, and Mikami, Phys Rev B, 69, 134103 (2004).
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/Howto_github.rst b/doc/src/Howto_github.rst
index d4925a8324..795af96e0a 100644
--- a/doc/src/Howto_github.rst
+++ b/doc/src/Howto_github.rst
@@ -3,16 +3,14 @@ LAMMPS GitHub tutorial
 
 **written by Stefan Paquay**
 
-
 ----------
 
-
 This document describes the process of how to use GitHub to integrate
 changes or additions you have made to LAMMPS into the official LAMMPS
 distribution.  It uses the process of updating this very tutorial as
 an example to describe the individual steps and options.  You need to
 be familiar with git and you may want to have a look at the
-`Git book <http://git-scm.com/book/>`_ to reacquaint yourself with some
+`git book <http://git-scm.com/book/>`_ to reacquaint yourself with some
 of the more advanced git features used below.
 
 As of fall 2016, submitting contributions to LAMMPS via pull requests
@@ -24,10 +22,8 @@ and will reduce the time until the integration is complete. For more
 information on the requirements to have your code included into LAMMPS
 please see the :doc:`Modify contribute <Modify_contribute>` doc page.
 
-
 ----------
 
-
 **Making an account**
 
 First of all, you need a GitHub account. This is fairly simple, just
@@ -36,10 +32,8 @@ the "Sign up for GitHub" button. Once your account is created, you
 can sign in by clicking the button in the top left and filling in your
 username or e-mail address and password.
 
-
 ----------
 
-
 **Forking the repository**
 
 To get changes into LAMMPS, you need to first fork the `lammps/lammps`
@@ -65,10 +59,8 @@ At the same time, you can set things up, so you can include changes from
 upstream into your repository and thus keep it in sync with the ongoing
 LAMMPS development.
 
-
 ----------
 
-
 **Adding changes to your own fork**
 
 Additions to the upstream version of LAMMPS are handled using *feature
@@ -83,15 +75,13 @@ explained in more detail here: `feature branch workflow <https://www.atlassian.c
 First of all, create a clone of your version on github on your local
 machine via HTTPS:
 
-
-.. parsed-literal::
+.. code-block:: bash
 
      $ git clone https://github.com/<your user name>/lammps.git <some name>
 
 or, if you have set up your GitHub account for using SSH keys, via SSH:
 
-
-.. parsed-literal::
+.. code-block:: bash
 
      $ git clone git@github.com:<your user name>/lammps.git
 
@@ -110,8 +100,7 @@ test them without interfering with the repository on GitHub.
 To pull changes from upstream into this copy, you can go to the directory
 and use git pull:
 
-
-.. parsed-literal::
+.. code-block:: bash
 
      $ cd mylammps
      $ git checkout master
@@ -119,8 +108,7 @@ and use git pull:
 
 You can also add this URL as a remote:
 
-
-.. parsed-literal::
+.. code-block:: bash
 
      $ git remote add lammps_upstream https://www.github.com/lammps/lammps
 
@@ -129,8 +117,7 @@ branch for the feature you want to work on. This tutorial contains the
 workflow that updated this tutorial, and hence we will call the branch
 "github-tutorial-update":
 
-
-.. parsed-literal::
+.. code-block:: bash
 
     $ git checkout -b github-tutorial-update master
 
@@ -142,39 +129,37 @@ unrelated feature, you should switch branches!
 
 After everything is done, add the files to the branch and commit them:
 
-
-.. parsed-literal::
+.. code-block:: bash
 
     $ git add doc/src/Howto_github.txt
-    $ git add doc/src/JPG/tutorial\*.png
+    $ git add doc/src/JPG/tutorial*.png
 
 .. warning::
 
-   Do not use *git commit -a* (or *git add -A*\ ).  The -a
-   flag (or -A flag) will automatically include \_all\\_ modified or new files
+   Do not use *git commit -a* (or *git add -A*\ ).  The -a flag (or -A
+   flag) will automatically include **all** modified **and** new files
    and that is rarely the behavior you want.  It can easily lead to
-   accidentally adding unrelated and unwanted changes into the repository.
-   Instead it is preferable to explicitly use *git add*\ , *git rm*\ , *git mv*
-   for adding, removing, renaming individual files, respectively, and then
-   *git commit* to finalize the commit.  Carefully check all pending
-   changes with *git status* before committing them.  If you find doing
-   this on the command line too tedious, consider using a GUI, for example
-   the one included in git distributions written in Tk, i.e. use *git gui*
-   (on some Linux distributions it may be required to install an additional
-   package to use it).
+   accidentally adding unrelated and unwanted changes into the
+   repository.  Instead it is preferable to explicitly use *git add*\ ,
+   *git rm*\ , *git mv* for adding, removing, renaming individual files,
+   respectively, and then *git commit* to finalize the commit.
+   Carefully check all pending changes with *git status* before
+   committing them.  If you find doing this on the command line too
+   tedious, consider using a GUI, for example the one included in git
+   distributions written in Tk, i.e. use *git gui* (on some Linux
+   distributions it may be required to install an additional package to
+   use it).
 
 After adding all files, the change set can be committed with some
 useful message that explains the change.
 
-
-.. parsed-literal::
+.. code-block:: bash
 
      $ git commit -m 'Finally updated the github tutorial'
 
 After the commit, the changes can be pushed to the same branch on GitHub:
 
-
-.. parsed-literal::
+.. code-block:: bash
 
    $ git push
 
@@ -182,8 +167,7 @@ Git will ask you for your user name and password on GitHub if you have
 not configured anything. If your local branch is not present on GitHub yet,
 it will ask you to add it by running
 
-
-.. parsed-literal::
+.. code-block:: bash
 
      $ git push --set-upstream origin github-tutorial-update
 
@@ -193,22 +177,18 @@ password, the feature branch should be added to your fork on GitHub.
 If you want to make really sure you push to the right repository
 (which is good practice), you can provide it explicitly:
 
-
-.. parsed-literal::
+.. code-block:: bash
 
    $ git push origin
 
 or using an explicit URL:
 
-
-.. parsed-literal::
+.. code-block:: bash
 
    $ git push git@github.com:Pakketeretet2/lammps.git
 
-
 ----------
 
-
 **Filing a pull request**
 
 Up to this point in the tutorial, all changes were to *your* clones of
@@ -256,10 +236,8 @@ Now just write some nice comments and click on "Create pull request".
 .. image:: JPG/tutorial_create_new_pull_request2.png
    :align: center
 
-
 ----------
 
-
 **After filing a pull request**
 
 .. note::
@@ -309,10 +287,10 @@ After each push, the automated checks are run again.
 
 LAMMPS developers may add labels to your pull request to assign it to
 categories (mostly for bookkeeping purposes), but a few of them are
-important: needs\_work, work\_in\_progress, test-for-regression, and
+important: needs_work, work_in_progress, test-for-regression, and
 full-regression-test. The first two indicate, that your pull request
-is not considered to be complete. With "needs\_work" the burden is on
-exclusively on you; while "work\_in\_progress" can also mean, that a
+is not considered to be complete. With "needs_work" the burden is on
+exclusively on you; while "work_in_progress" can also mean, that a
 LAMMPS developer may want to add changes. Please watch the comments
 to the pull requests. The two "test" labels are used to trigger
 extended tests before the code is merged. This is sometimes done by
@@ -382,7 +360,7 @@ It looks something like this:
 .. image:: JPG/tutorial_reverse_pull_request.png
    :align: center
 
-For some reason, the highlighted button didn't work in my case, but I
+For some reason, the highlighted button did not work in my case, but I
 can go to my own repository and merge the pull request from there:
 
 .. image:: JPG/tutorial_reverse_pull_request2.png
@@ -409,11 +387,10 @@ Because the changes are OK with us, we are going to merge by clicking on
 Now, since in the meantime our local text for the tutorial also changed,
 we need to pull Axel's change back into our branch, and merge them:
 
-
-.. parsed-literal::
+.. code-block:: bash
 
     $ git add Howto_github.txt
-    $ git add JPG/tutorial_reverse_pull_request\*.png
+    $ git add JPG/tutorial_reverse_pull_request*.png
     $ git commit -m "Updated text and images on reverse pull requests"
     $ git pull
 
@@ -426,8 +403,7 @@ With Axel's changes merged in and some final text updates, our feature
 branch is now perfect as far as we are concerned, so we are going to
 commit and push again:
 
-
-.. parsed-literal::
+.. code-block:: bash
 
     $ git add Howto_github.txt
     $ git add JPG/tutorial_reverse_pull_request6.png
@@ -439,10 +415,8 @@ This merge also shows up on the lammps GitHub page:
 .. image:: JPG/tutorial_reverse_pull_request7.png
    :align: center
 
-
 ----------
 
-
 **After a merge**
 
 When everything is fine, the feature branch is merged into the master branch:
@@ -457,8 +431,7 @@ It is in principle safe to delete them from your own fork. This helps
 keep it a bit more tidy. Note that you first have to switch to another
 branch!
 
-
-.. parsed-literal::
+.. code-block:: bash
 
    $ git checkout master
    $ git pull master
@@ -473,8 +446,7 @@ first delete and then pull, everything should still be fine.
 Finally, if you delete the branch locally, you might want to push this
 to your remote(s) as well:
 
-
-.. parsed-literal::
+.. code-block:: bash
 
    $ git push origin :github-tutorial-update
 
@@ -486,14 +458,9 @@ should be submitted, there is now also an "unstable" and a "stable"
 branch; these have the same content as "master", but are only updated
 after a patch release or stable release was made.
 Furthermore, the naming of the patches now follow the pattern
-"patch\_<Day><Month><Year>" to simplify comparisons between releases.
+"patch_<Day><Month><Year>" to simplify comparisons between releases.
 Finally, all patches and submissions are subject to automatic testing
 and code checks to make sure they at the very least compile.
 
 A discussion of the LAMMPS developer GitHub workflow can be found in the file
 `doc/github-development-workflow.md <https://github.com/lammps/lammps/blob/master/doc/github-development-workflow.md>`_
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/Howto_granular.rst b/doc/src/Howto_granular.rst
index 0bd4fa0349..c696d44249 100644
--- a/doc/src/Howto_granular.rst
+++ b/doc/src/Howto_granular.rst
@@ -22,7 +22,7 @@ Use one of these 3 pair potentials, which compute forces and torques
 between interacting pairs of particles:
 
 * :doc:`pair_style <pair_style>` gran/history
-* :doc:`pair_style <pair_style>` gran/no\_history
+* :doc:`pair_style <pair_style>` gran/no_history
 * :doc:`pair_style <pair_style>` gran/hertzian
 
 These commands implement fix options specific to granular systems:
@@ -48,8 +48,3 @@ computations between frozen atoms by using this command:
    will be the same as in 3d.  If you wish to model granular particles in
    2d as 2d discs, see the note on this topic on the :doc:`Howto 2d <Howto_2d>`
    doc page, where 2d simulations are discussed.
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/Howto_kappa.rst b/doc/src/Howto_kappa.rst
index d7fb3b3ee2..08697ecc84 100644
--- a/doc/src/Howto_kappa.rst
+++ b/doc/src/Howto_kappa.rst
@@ -56,31 +56,20 @@ two preceding non-equilibrium methods, where energy flows continuously
 between hot and cold regions of the simulation box.
 
 The :doc:`compute heat/flux <compute_heat_flux>` command can calculate
-the needed heat flux and describes how to implement the Green\_Kubo
+the needed heat flux and describes how to implement the Green_Kubo
 formalism using additional LAMMPS commands, such as the :doc:`fix ave/correlate <fix_ave_correlate>` command to calculate the needed
 auto-correlation.  See the doc page for the :doc:`compute heat/flux <compute_heat_flux>` command for an example input script
 that calculates the thermal conductivity of solid Ar via the GK
 formalism.
 
-
 ----------
 
-
 .. _howto-Ikeshoji:
 
-
-
 **(Ikeshoji)** Ikeshoji and Hafskjold, Molecular Physics, 81, 251-261
 (1994).
 
 .. _howto-Wirnsberger:
 
-
-
 **(Wirnsberger)** Wirnsberger, Frenkel, and Dellago, J Chem Phys, 143, 124104
 (2015).
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/Howto_library.rst b/doc/src/Howto_library.rst
index b3ae917a6d..774d9838c1 100644
--- a/doc/src/Howto_library.rst
+++ b/doc/src/Howto_library.rst
@@ -12,7 +12,7 @@ functions therein have a C-style argument list, but contain C++ code
 you could write yourself in a C++ application that was invoking LAMMPS
 directly.  The C++ code in the functions illustrates how to invoke
 internal LAMMPS operations.  Note that LAMMPS classes are defined
-within a LAMMPS namespace (LAMMPS\_NS) if you use them from another C++
+within a LAMMPS namespace (LAMMPS_NS) if you use them from another C++
 application.
 
 The examples/COUPLE and python/examples directories have example C++
@@ -34,7 +34,7 @@ interface LAMMPS to Fortran libraries, or the code uses static variables
 
 Another major issue to deal with is to correctly handle MPI.  Creating
 a LAMMPS instance requires passing an MPI communicator, or it assumes
-the MPI\_COMM\_WORLD communicator, which spans all MPI processor ranks.
+the MPI_COMM_WORLD communicator, which spans all MPI processor ranks.
 When creating multiple LAMMPS object instances from different threads,
 this communicator has to be different for each thread or else collisions
 can happen, or it has to be guaranteed, that only one thread at a time
@@ -58,24 +58,23 @@ details.
    The added functions can access or change any internal LAMMPS data you
    wish.
 
+.. code-block:: c
 
-.. parsed-literal::
+   void lammps_open(int, char **, MPI_Comm, void **)
+   void lammps_open_no_mpi(int, char **, void **)
+   void lammps_close(void *)
+   int lammps_version(void *)
+   void lammps_file(void *, char *)
+   char *lammps_command(void *, char *)
+   void lammps_commands_list(void *, int, char **)
+   void lammps_commands_string(void *, char *)
+   void lammps_free(void *)
 
-   void lammps_open(int, char \*\*, MPI_Comm, void \*\*)
-   void lammps_open_no_mpi(int, char \*\*, void \*\*)
-   void lammps_close(void \*)
-   int lammps_version(void \*)
-   void lammps_file(void \*, char \*)
-   char \*lammps_command(void \*, char \*)
-   void lammps_commands_list(void \*, int, char \*\*)
-   void lammps_commands_string(void \*, char \*)
-   void lammps_free(void \*)
-
-The lammps\_open() function is used to initialize LAMMPS, passing in a
+The lammps_open() function is used to initialize LAMMPS, passing in a
 list of strings as if they were :doc:`command-line arguments <Run_options>` when LAMMPS is run in stand-alone mode
 from the command line, and a MPI communicator for LAMMPS to run under.
 It returns a ptr to the LAMMPS object that is created, and which is
-used in subsequent library calls.  The lammps\_open() function can be
+used in subsequent library calls.  The lammps_open() function can be
 called multiple times, to create multiple instances of LAMMPS.
 
 LAMMPS will run on the set of processors in the communicator.  This
@@ -87,14 +86,14 @@ half to the other code and run both codes simultaneously before
 syncing them up periodically.  Or it might instantiate multiple
 instances of LAMMPS to perform different calculations.
 
-The lammps\_open\_no\_mpi() function is similar except that no MPI
-communicator is passed from the caller.  Instead, MPI\_COMM\_WORLD is
+The lammps_open_no_mpi() function is similar except that no MPI
+communicator is passed from the caller.  Instead, MPI_COMM_WORLD is
 used to instantiate LAMMPS, and MPI is initialized if necessary.
 
-The lammps\_close() function is used to shut down an instance of LAMMPS
+The lammps_close() function is used to shut down an instance of LAMMPS
 and free all its memory.
 
-The lammps\_version() function can be used to determined the specific
+The lammps_version() function can be used to determined the specific
 version of the underlying LAMMPS code. This is particularly useful
 when loading LAMMPS as a shared library via dlopen(). The code using
 the library interface can than use this information to adapt to
@@ -102,8 +101,8 @@ changes to the LAMMPS command syntax between versions. The returned
 LAMMPS version code is an integer (e.g. 2 Sep 2015 results in
 20150902) that grows with every new LAMMPS version.
 
-The lammps\_file(), lammps\_command(), lammps\_commands\_list(), and
-lammps\_commands\_string() functions are used to pass one or more
+The lammps_file(), lammps_command(), lammps_commands_list(), and
+lammps_commands_string() functions are used to pass one or more
 commands to LAMMPS to execute, the same as if they were coming from an
 input script.
 
@@ -114,19 +113,19 @@ can interleave the command function calls with operations it performs,
 calls to extract information from or set information within LAMMPS, or
 calls to another code's library.
 
-The lammps\_file() function passes the filename of an input script.
-The lammps\_command() function passes a single command as a string.
-The lammps\_commands\_list() function passes multiple commands in a
-char\*\* list.  In both lammps\_command() and lammps\_commands\_list(),
+The lammps_file() function passes the filename of an input script.
+The lammps_command() function passes a single command as a string.
+The lammps_commands_list() function passes multiple commands in a
+char\*\* list.  In both lammps_command() and lammps_commands_list(),
 individual commands may or may not have a trailing newline.  The
-lammps\_commands\_string() function passes multiple commands
+lammps_commands_string() function passes multiple commands
 concatenated into one long string, separated by newline characters.
-In both lammps\_commands\_list() and lammps\_commands\_string(), a single
+In both lammps_commands_list() and lammps_commands_string(), a single
 command can be spread across multiple lines, if the last printable
 character of all but the last line is "&", the same as if the lines
 appeared in an input script.
 
-The lammps\_free() function is a clean-up function to free memory that
+The lammps_free() function is a clean-up function to free memory that
 the library allocated previously via other function calls.  See
 comments in src/library.cpp file for which other functions need this
 clean-up.
@@ -136,65 +135,62 @@ information from LAMMPS and setting value within LAMMPS.  Again, see
 the documentation in the src/library.cpp file for details, including
 which quantities can be queried by name:
 
+.. code-block:: c
 
-.. parsed-literal::
+   int lammps_extract_setting(void *, char *)
+   void *lammps_extract_global(void *, char *)
+   void lammps_extract_box(void *, double *, double *,
+                           double *, double *, double *, int *, int *)
+   void *lammps_extract_atom(void *, char *)
+   void *lammps_extract_compute(void *, char *, int, int)
+   void *lammps_extract_fix(void *, char *, int, int, int, int)
+   void *lammps_extract_variable(void *, char *, char *)
 
-   int lammps_extract_setting(void \*, char \*)
-   void \*lammps_extract_global(void \*, char \*)
-   void lammps_extract_box(void \*, double \*, double \*,
-                           double \*, double \*, double \*, int \*, int \*)
-   void \*lammps_extract_atom(void \*, char \*)
-   void \*lammps_extract_compute(void \*, char \*, int, int)
-   void \*lammps_extract_fix(void \*, char \*, int, int, int, int)
-   void \*lammps_extract_variable(void \*, char \*, char \*)
-
-The extract\_setting() function returns info on the size
+The extract_setting() function returns info on the size
 of data types (e.g. 32-bit or 64-bit atom IDs) used
 by the LAMMPS executable (a compile-time choice).
 
 The other extract functions return a pointer to various global or
 per-atom quantities stored in LAMMPS or to values calculated by a
 compute, fix, or variable.  The pointer returned by the
-extract\_global() function can be used as a permanent reference to a
-value which may change.  For the extract\_atom() method, see the
+extract_global() function can be used as a permanent reference to a
+value which may change.  For the extract_atom() method, see the
 extract() method in the src/atom.cpp file for a list of valid per-atom
 properties.  New names could easily be added if the property you want
 is not listed.  For the other extract functions, the underlying
 storage may be reallocated as LAMMPS runs, so you need to re-call the
 function to assure a current pointer or returned value(s).
 
+.. code-block:: c
 
-.. parsed-literal::
+   double lammps_get_thermo(void *, char *)
+   int lammps_get_natoms(void *)
 
-   double lammps_get_thermo(void \*, char \*)
-   int lammps_get_natoms(void \*)
+   int lammps_set_variable(void *, char *, char *)
+   void lammps_reset_box(void *, double *, double *, double, double, double)
 
-   int lammps_set_variable(void \*, char \*, char \*)
-   void lammps_reset_box(void \*, double \*, double \*, double, double, double)
-
-The lammps\_get\_thermo() function returns the current value of a thermo
+The lammps_get_thermo() function returns the current value of a thermo
 keyword as a double precision value.
 
-The lammps\_get\_natoms() function returns the total number of atoms in
+The lammps_get_natoms() function returns the total number of atoms in
 the system and can be used by the caller to allocate memory for the
-lammps\_gather\_atoms() and lammps\_scatter\_atoms() functions.
+lammps_gather_atoms() and lammps_scatter_atoms() functions.
 
-The lammps\_set\_variable() function can set an existing string-style
+The lammps_set_variable() function can set an existing string-style
 variable to a new string value, so that subsequent LAMMPS commands can
 access the variable.
 
-The lammps\_reset\_box() function resets the size and shape of the
+The lammps_reset_box() function resets the size and shape of the
 simulation box, e.g. as part of restoring a previously extracted and
 saved state of a simulation.
 
+.. code-block:: c
 
-.. parsed-literal::
-
-   void lammps_gather_atoms(void \*, char \*, int, int, void \*)
-   void lammps_gather_atoms_concat(void \*, char \*, int, int, void \*)
-   void lammps_gather_atoms_subset(void \*, char \*, int, int, int, int \*, void \*)
-   void lammps_scatter_atoms(void \*, char \*, int, int, void \*)
-   void lammps_scatter_atoms_subset(void \*, char \*, int, int, int, int \*, void \*)
+   void lammps_gather_atoms(void *, char *, int, int, void *)
+   void lammps_gather_atoms_concat(void *, char *, int, int, void *)
+   void lammps_gather_atoms_subset(void *, char *, int, int, int, int *, void *)
+   void lammps_scatter_atoms(void *, char *, int, int, void *)
+   void lammps_scatter_atoms_subset(void *, char *, int, int, int, int *, void *)
 
 The gather functions collect peratom info of the requested type (atom
 coords, atom types, forces, etc) from all processors, and returns the
@@ -206,17 +202,17 @@ owned by different processors.
 .. warning::
 
    These functions are not compatible with the
-   -DLAMMPS\_BIGBIG setting when compiling LAMMPS.  Dummy functions
+   -DLAMMPS_BIGBIG setting when compiling LAMMPS.  Dummy functions
    that result in an error message and abort will be substituted
    instead of resulting in random crashes and memory corruption.
 
-The lammps\_gather\_atoms() function does this for all N atoms in the
+The lammps_gather_atoms() function does this for all N atoms in the
 system, ordered by atom ID, from 1 to N.  The
-lammps\_gather\_atoms\_concat() function does it for all N atoms, but
+lammps_gather_atoms_concat() function does it for all N atoms, but
 simply concatenates the subset of atoms owned by each processor.  The
 resulting vector is not ordered by atom ID.  Atom IDs can be requested
 by the same function if the caller needs to know the ordering.  The
-lammps\_gather\_subset() function allows the caller to request values
+lammps_gather_subset() function allows the caller to request values
 for only a subset of atoms (identified by ID).
 For all 3 gather function, per-atom image flags can be retrieved in 2 ways.
 If the count is specified as 1, they are returned
@@ -224,29 +220,23 @@ in a packed format with all three image flags stored in a single integer.
 If the count is specified as 3, the values are unpacked into xyz flags
 by the library before returning them.
 
-The lammps\_scatter\_atoms() function takes a list of values for all N
+The lammps_scatter_atoms() function takes a list of values for all N
 atoms in the system, ordered by atom ID, from 1 to N, and assigns
 those values to each atom in the system.  The
-lammps\_scatter\_atoms\_subset() function takes a subset of IDs as an
+lammps_scatter_atoms_subset() function takes a subset of IDs as an
 argument and only scatters those values to the owning atoms.
 
+.. code-block:: c
 
-.. parsed-literal::
+   void lammps_create_atoms(void *, int, tagint *, int *, double *, double *,
+                            imageint *, int)
 
-   void lammps_create_atoms(void \*, int, tagint \*, int \*, double \*, double \*,
-                            imageint \*, int)
-
-The lammps\_create\_atoms() function takes a list of N atoms as input
+The lammps_create_atoms() function takes a list of N atoms as input
 with atom types and coords (required), an optionally atom IDs and
 velocities and image flags.  It uses the coords of each atom to assign
 it as a new atom to the processor that owns it.  This function is
 useful to add atoms to a simulation or (in tandem with
-lammps\_reset\_box()) to restore a previously extracted and saved state
+lammps_reset_box()) to restore a previously extracted and saved state
 of a simulation.  Additional properties for the new atoms can then be
-assigned via the lammps\_scatter\_atoms() or lammps\_extract\_atom()
+assigned via the lammps_scatter_atoms() or lammps_extract_atom()
 functions.
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/Howto_manifold.rst b/doc/src/Howto_manifold.rst
index 4e3893993f..41e1fb6a4c 100644
--- a/doc/src/Howto_manifold.rst
+++ b/doc/src/Howto_manifold.rst
@@ -19,17 +19,17 @@ to the relevant fixes.
 +----------------+----------------+----------------------------------------------------------------------------------------------------------------------------------------+------------------------------------------------------------------------------------------------------------------------------------+
 | cylinder       | R              | x\^2 + y\^2 - R\^2 = 0                                                                                                                 | Cylinder along z-axis, axis going through (0,0,0)                                                                                  |
 +----------------+----------------+----------------------------------------------------------------------------------------------------------------------------------------+------------------------------------------------------------------------------------------------------------------------------------+
-| cylinder\_dent | R l a          | x\^2 + y\^2 - r(z)\^2 = 0, r(x) = R if \| z \| > l, r(z) = R - a\*(1 + cos(z/l))/2 otherwise                                           | A cylinder with a dent around z = 0                                                                                                |
+| cylinder_dent  | R l a          | x\^2 + y\^2 - r(z)\^2 = 0, r(x) = R if \| z \| > l, r(z) = R - a\*(1 + cos(z/l))/2 otherwise                                           | A cylinder with a dent around z = 0                                                                                                |
 +----------------+----------------+----------------------------------------------------------------------------------------------------------------------------------------+------------------------------------------------------------------------------------------------------------------------------------+
 | dumbbell       | a A B c        | -( x\^2 + y\^2 ) + (a\^2 - z\^2/c\^2) \* ( 1 + (A\*sin(B\*z\^2))\^4) = 0                                                               | A dumbbell                                                                                                                         |
 +----------------+----------------+----------------------------------------------------------------------------------------------------------------------------------------+------------------------------------------------------------------------------------------------------------------------------------+
 | ellipsoid      | a  b c         | (x/a)\^2 + (y/b)\^2 + (z/c)\^2 = 0                                                                                                     | An ellipsoid                                                                                                                       |
 +----------------+----------------+----------------------------------------------------------------------------------------------------------------------------------------+------------------------------------------------------------------------------------------------------------------------------------+
-| gaussian\_bump | A l rc1 rc2    | if( x < rc1) -z + A \* exp( -x\^2 / (2 l\^2) ); else if( x < rc2 ) -z + a + b\*x + c\*x\^2 + d\*x\^3; else z                           | A Gaussian bump at x = y = 0, smoothly tapered to a flat plane z = 0.                                                              |
+| gaussian_bump  | A l rc1 rc2    | if( x < rc1) -z + A \* exp( -x\^2 / (2 l\^2) ); else if( x < rc2 ) -z + a + b\*x + c\*x\^2 + d\*x\^3; else z                           | A Gaussian bump at x = y = 0, smoothly tapered to a flat plane z = 0.                                                              |
 +----------------+----------------+----------------------------------------------------------------------------------------------------------------------------------------+------------------------------------------------------------------------------------------------------------------------------------+
 | plane          | a b c x0 y0 z0 | a\*(x-x0) + b\*(y-y0) + c\*(z-z0) = 0                                                                                                  | A plane with normal (a,b,c) going through point (x0,y0,z0)                                                                         |
 +----------------+----------------+----------------------------------------------------------------------------------------------------------------------------------------+------------------------------------------------------------------------------------------------------------------------------------+
-| plane\_wiggle  | a w            | z - a\*sin(w\*x) = 0                                                                                                                   | A plane with a sinusoidal modulation on z along x.                                                                                 |
+| plane_wiggle   | a w            | z - a\*sin(w\*x) = 0                                                                                                                   | A plane with a sinusoidal modulation on z along x.                                                                                 |
 +----------------+----------------+----------------------------------------------------------------------------------------------------------------------------------------+------------------------------------------------------------------------------------------------------------------------------------+
 | sphere         | R              | x\^2 + y\^2 + z\^2 - R\^2 = 0                                                                                                          | A sphere of radius R                                                                                                               |
 +----------------+----------------+----------------------------------------------------------------------------------------------------------------------------------------+------------------------------------------------------------------------------------------------------------------------------------+
@@ -37,7 +37,7 @@ to the relevant fixes.
 +----------------+----------------+----------------------------------------------------------------------------------------------------------------------------------------+------------------------------------------------------------------------------------------------------------------------------------+
 | spine          | a, A, B, B2, c | -(x\^2 + y\^2) + (a\^2 - z\^2/f(z)\^2)\*(1 + (A\*sin(g(z)\*z\^2))\^4), f(z) = c if z > 0, 1 otherwise; g(z) = B if z > 0, B2 otherwise | An approximation to a dendritic spine                                                                                              |
 +----------------+----------------+----------------------------------------------------------------------------------------------------------------------------------------+------------------------------------------------------------------------------------------------------------------------------------+
-| spine\_two     | a, A, B, B2, c | -(x\^2 + y\^2) + (a\^2 - z\^2/f(z)\^2)\*(1 + (A\*sin(g(z)\*z\^2))\^2), f(z) = c if z > 0, 1 otherwise; g(z) = B if z > 0, B2 otherwise | Another approximation to a dendritic spine                                                                                         |
+| spine_two      | a, A, B, B2, c | -(x\^2 + y\^2) + (a\^2 - z\^2/f(z)\^2)\*(1 + (A\*sin(g(z)\*z\^2))\^2), f(z) = c if z > 0, 1 otherwise; g(z) = B if z > 0, B2 otherwise | Another approximation to a dendritic spine                                                                                         |
 +----------------+----------------+----------------------------------------------------------------------------------------------------------------------------------------+------------------------------------------------------------------------------------------------------------------------------------+
 | thylakoid      | wB LB lB       | Various, see :ref:`(Paquay) <Paquay1>`                                                                                                 | A model grana thylakoid consisting of two block-like compartments connected by a bridge of width wB, length LB and taper length lB |
 +----------------+----------------+----------------------------------------------------------------------------------------------------------------------------------------+------------------------------------------------------------------------------------------------------------------------------------+
@@ -46,12 +46,5 @@ to the relevant fixes.
 
 .. _Paquay1:
 
-
-
 **(Paquay)** Paquay and Kusters, Biophys. J., 110, 6, (2016).
 preprint available at `arXiv:1411.3019 <http://arxiv.org/abs/1411.3019/>`_.
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/Howto_multiple.rst b/doc/src/Howto_multiple.rst
index 5f36863fa4..ec2729acf0 100644
--- a/doc/src/Howto_multiple.rst
+++ b/doc/src/Howto_multiple.rst
@@ -8,8 +8,7 @@ If "multiple simulations" means continue a previous simulation for
 more timesteps, then you simply use the :doc:`run <run>` command
 multiple times.  For example, this script
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    units lj
    atom_style atomic
@@ -27,8 +26,7 @@ If you wish to run totally different simulations, one after the other,
 the :doc:`clear <clear>` command can be used in between them to
 re-initialize LAMMPS.  For example, this script
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    units lj
    atom_style atomic
@@ -48,8 +46,7 @@ For large numbers of independent simulations, you can use
 multiple times with different settings.  For example, this
 script, named in.polymer
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    variable d index run1 run2 run3 run4 run5 run6 run7 run8
    shell cd $d
@@ -65,8 +62,7 @@ file in each directory.  The same concept could be used to run the
 same system at 8 different temperatures, using a temperature variable
 and storing the output in different log and dump files, for example
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    variable a loop 8
    variable t index 0.8 0.85 0.9 0.95 1.0 1.05 1.1 1.15
@@ -96,8 +92,3 @@ on the 3 partitions one after the other until all were finished.
 Initially, 3 simulations would be started simultaneously, one on each
 partition.  When one finished, that partition would then start
 the 4th simulation, and so forth, until all 8 were completed.
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/Howto_nemd.rst b/doc/src/Howto_nemd.rst
index c29065e672..f2be8ca444 100644
--- a/doc/src/Howto_nemd.rst
+++ b/doc/src/Howto_nemd.rst
@@ -43,18 +43,9 @@ NEMD simulations can also be used to measure transport properties of a fluid
 through a pore or channel. Simulations of steady-state flow can be performed
 using the :doc:`fix flow/gauss <fix_flow_gauss>` command.
 
-
 ----------
 
-
 .. _Daivis-nemd:
 
-
-
 **(Daivis and Todd)** Daivis and Todd, Nonequilibrium Molecular Dynamics (book),
 Cambridge University Press, https://doi.org/10.1017/9781139017848, (2017).
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/Howto_output.rst b/doc/src/Howto_output.rst
index 617447fc04..04e73c2272 100644
--- a/doc/src/Howto_output.rst
+++ b/doc/src/Howto_output.rst
@@ -12,7 +12,6 @@ There are four basic kinds of LAMMPS output:
   screen.
 * :doc:`Restart files <restart>`.
 
-
 A simulation prints one set of thermodynamic output and (optionally)
 restart files.  It can generate any number of dump files and fix
 output files, depending on what :doc:`dump <dump>` and :doc:`fix <fix>`
@@ -69,11 +68,11 @@ notation, where ID in this case is the ID of a compute.  The leading
 "c\_" would be replaced by "f\_" for a fix, or "v\_" for a variable:
 
 +-------------+--------------------------------------------+
-| c\_ID       | entire scalar, vector, or array            |
+| c_ID        | entire scalar, vector, or array            |
 +-------------+--------------------------------------------+
-| c\_ID[I]    | one element of vector, one column of array |
+| c_ID[I]     | one element of vector, one column of array |
 +-------------+--------------------------------------------+
-| c\_ID[I][J] | one element of array                       |
+| c_ID[I][J]  | one element of array                       |
 +-------------+--------------------------------------------+
 
 In other words, using one bracket reduces the dimension of the data
@@ -93,7 +92,7 @@ The frequency and format of thermodynamic output is set by the
 :doc:`thermo_style <thermo_style>` command also specifies what values
 are calculated and written out.  Pre-defined keywords can be specified
 (e.g. press, etotal, etc).  Three additional kinds of keywords can
-also be specified (c\_ID, f\_ID, v\_name), where a :doc:`compute <compute>`
+also be specified (c_ID, f_ID, v_name), where a :doc:`compute <compute>`
 or :doc:`fix <fix>` or :doc:`variable <variable>` provides the value to be
 output.  In each case, the compute, fix, or variable must generate
 global values for input to the :doc:`thermo_style custom <dump>`
@@ -122,7 +121,7 @@ pre-defined formats (dump atom, dump xtc, etc).
 There is also a :doc:`dump custom <dump>` format where the user
 specifies what values are output with each atom.  Pre-defined atom
 attributes can be specified (id, x, fx, etc).  Three additional kinds
-of keywords can also be specified (c\_ID, f\_ID, v\_name), where a
+of keywords can also be specified (c_ID, f_ID, v_name), where a
 :doc:`compute <compute>` or :doc:`fix <fix>` or :doc:`variable <variable>`
 provides the values to be output.  In each case, the compute, fix, or
 variable must generate per-atom values for input to the :doc:`dump custom <dump>` command.
@@ -130,7 +129,7 @@ variable must generate per-atom values for input to the :doc:`dump custom <dump>
 There is also a :doc:`dump local <dump>` format where the user specifies
 what local values to output.  A pre-defined index keyword can be
 specified to enumerate the local values.  Two additional kinds of
-keywords can also be specified (c\_ID, f\_ID), where a
+keywords can also be specified (c_ID, f_ID), where a
 :doc:`compute <compute>` or :doc:`fix <fix>` or :doc:`variable <variable>`
 provides the values to be output.  In each case, the compute or fix
 must generate local values for input to the :doc:`dump local <dump>`
@@ -342,8 +341,3 @@ vector input could be a column of an array.
 +--------------------------------------------------------+----------------------------------------------+-------------------------------------------+
 | :doc:`fix store/state <fix_store_state>`               | per-atom vectors                             | per-atom vector/array                     |
 +--------------------------------------------------------+----------------------------------------------+-------------------------------------------+
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/Howto_polarizable.rst b/doc/src/Howto_polarizable.rst
index e9bca43128..c1c6e1fc76 100644
--- a/doc/src/Howto_polarizable.rst
+++ b/doc/src/Howto_polarizable.rst
@@ -71,8 +71,3 @@ temperature is regulated using the velocities of the center of mass of
 core+shell (or Drude) pairs, but in the Drude model the actual
 relative core-Drude particle motion is thermostatted separately as
 well.
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/Howto_pylammps.rst b/doc/src/Howto_pylammps.rst
index 2711e26914..96d9acd994 100644
--- a/doc/src/Howto_pylammps.rst
+++ b/doc/src/Howto_pylammps.rst
@@ -6,19 +6,23 @@ PyLammps Tutorial
 Overview
 --------
 
-PyLammps is a Python wrapper class which can be created on its own or
-use an existing lammps Python object.  It creates a simpler,
-Python-like interface to common LAMMPS functionality, in contrast to
-the lammps.py wrapper on the C-style LAMMPS library interface which is
-written using Python ctypes.  The lammps.py wrapper is discussed on
-the :doc:`Python library <Python_library>` doc page.
+``PyLammps`` is a Python wrapper class for LAMMPS which can be created
+on its own or use an existing lammps Python object.  It creates a simpler,
+more "pythonic" interface to common LAMMPS functionality, in contrast to
+the ``lammps.py`` wrapper for the C-style LAMMPS library interface which
+is written using `Python ctypes <ctypes_>`_.  The ``lammps.py`` wrapper
+is discussed on the :doc:`Python library <Python_library>` doc page.
 
-Unlike the flat ctypes interface, PyLammps exposes a discoverable API.
-It no longer requires knowledge of the underlying C++ code
-implementation.  Finally, the IPyLammps wrapper builds on top of
-PyLammps and adds some additional features for IPython integration
-into IPython notebooks, e.g. for embedded visualization output from
-dump/image.
+Unlike the flat ``ctypes`` interface, PyLammps exposes a discoverable
+API.  It no longer requires knowledge of the underlying C++ code
+implementation.  Finally, the ``IPyLammps`` wrapper builds on top of
+``PyLammps`` and adds some additional features for
+`IPython integration <ipython_>`_ into `Jupyter notebooks <jupyter_>`_,
+e.g. for embedded visualization output from :doc:`dump style image <dump_image>`.
+
+.. _ctypes: https://docs.python.org/3/library/ctypes.html
+.. _ipython: https://ipython.org/
+.. _jupyter: https://jupyter.org/
 
 Comparison of lammps and PyLammps interfaces
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -26,7 +30,7 @@ Comparison of lammps and PyLammps interfaces
 lammps.lammps
 """""""""""""
 
-* uses C-Types
+* uses ``ctypes``
 * direct memory access to native C++ data
 * provides functions to send and receive data to LAMMPS
 * requires knowledge of how LAMMPS internally works (C pointers, etc)
@@ -34,7 +38,7 @@ lammps.lammps
 lammps.PyLammps
 """""""""""""""
 
-* higher-level abstraction built on top of original C-Types interface
+* higher-level abstraction built on top of original ctypes interface
 * manipulation of Python objects
 * communication with LAMMPS is hidden from API user
 * shorter, more concise Python
@@ -56,7 +60,6 @@ output support enabled.
 
 Step 1a: For the CMake based build system, the steps are:
 
-
 .. code-block:: bash
 
    mkdir $LAMMPS_DIR/build-shared
@@ -68,7 +71,6 @@ Step 1a: For the CMake based build system, the steps are:
 
 Step 1b: For the legacy, make based build system, the steps are:
 
-
 .. code-block:: bash
 
    cd $LAMMPS_DIR/src
@@ -85,7 +87,6 @@ Step 2: Installing the LAMMPS Python package
 PyLammps is part of the lammps Python package. To install it simply install
 that package into your current Python installation with:
 
-
 .. code-block:: bash
 
    make install-python
@@ -110,7 +111,6 @@ Benefits of using a virtualenv
 
 **Prerequisite (e.g. on Ubuntu)**
 
-
 .. code-block:: bash
 
    apt-get install python-virtualenv
@@ -118,7 +118,6 @@ Benefits of using a virtualenv
 Creating a virtualenv with lammps installed
 """""""""""""""""""""""""""""""""""""""""""
 
-
 .. code-block:: bash
 
    # create virtualenv named 'testing'
@@ -132,7 +131,6 @@ When using CMake and the shared library has already been build, you
 need to re-run CMake to update the location of the python executable
 to the location in the virtual environment with:
 
-
 .. code-block:: bash
 
    cmake . -DPYTHON_EXECUTABLE=$(which python)
@@ -154,7 +152,6 @@ Creating a new instance of PyLammps
 To create a PyLammps object you need to first import the class from the lammps
 module. By using the default constructor, a new *lammps* instance is created.
 
-
 .. code-block:: Python
 
    from lammps import PyLammps
@@ -162,7 +159,6 @@ module. By using the default constructor, a new *lammps* instance is created.
 
 You can also initialize PyLammps on top of this existing *lammps* object:
 
-
 .. code-block:: Python
 
    from lammps import lammps, PyLammps
@@ -177,7 +173,6 @@ the command method of the lammps object instance.
 
 For instance, let's take the following LAMMPS command:
 
-
 .. code-block:: LAMMPS
 
    region box block 0 10 0 5 -0.5 0.5
@@ -185,7 +180,6 @@ For instance, let's take the following LAMMPS command:
 In the original interface this command can be executed with the following
 Python code if *L* was a lammps instance:
 
-
 .. code-block:: Python
 
    L.command("region box block 0 10 0 5 -0.5 0.5")
@@ -193,7 +187,6 @@ Python code if *L* was a lammps instance:
 With the PyLammps interface, any command can be split up into arbitrary parts
 separated by white-space, passed as individual arguments to a region method.
 
-
 .. code-block:: Python
 
    L.region("box block", 0, 10, 0, 5, -0.5, 0.5)
@@ -206,7 +199,6 @@ The benefit of this approach is avoiding redundant command calls and easier
 parameterization. In the original interface parameterization needed to be done
 manually by creating formatted strings.
 
-
 .. code-block:: Python
 
    L.command("region box block %f %f %f %f %f %f" % (xlo, xhi, ylo, yhi, zlo, zhi))
@@ -214,7 +206,6 @@ manually by creating formatted strings.
 In contrast, methods of PyLammps accept parameters directly and will convert
 them automatically to a final command string.
 
-
 .. code-block:: Python
 
    L.region("box block", xlo, xhi, ylo, yhi, zlo, zhi)
@@ -225,8 +216,6 @@ System state
 In addition to dispatching commands directly through the PyLammps object, it
 also provides several properties which allow you to query the system state.
 
-
-
 L.system
    Is a dictionary describing the system such as the bounding box or number of atoms
 
@@ -260,8 +249,6 @@ L.dump
 L.groups
    List of groups present in the current system
 
-
-
 Working with LAMMPS variables
 -----------------------------
 
@@ -269,7 +256,6 @@ LAMMPS variables can be both defined and accessed via the PyLammps interface.
 
 To define a variable you can use the :doc:`variable <variable>` command:
 
-
 .. code-block:: Python
 
    L.variable("a index 2")
@@ -279,7 +265,6 @@ A dictionary of all variables is returned by L.variables
 you can access an individual variable by retrieving a variable object from the
 L.variables dictionary by name
 
-
 .. code-block:: Python
 
    a = L.variables['a']
@@ -287,7 +272,6 @@ L.variables dictionary by name
 The variable value can then be easily read and written by accessing the value
 property of this object.
 
-
 .. code-block:: Python
 
    print(a.value)
@@ -300,7 +284,6 @@ LAMMPS expressions can be immediately evaluated by using the eval method. The
 passed string parameter can be any expression containing global thermo values,
 variables, compute or fix data.
 
-
 .. code-block:: Python
 
    result = L.eval("ke") # kinetic energy
@@ -315,7 +298,6 @@ All atoms in the current simulation can be accessed by using the L.atoms list.
 Each element of this list is an object which exposes its properties (id, type,
 position, velocity, force, etc.).
 
-
 .. code-block:: Python
 
    # access first atom
@@ -329,7 +311,6 @@ position, velocity, force, etc.).
 
 Some properties can also be used to set:
 
-
 .. code-block:: Python
 
    # set position in 2D simulation
@@ -347,7 +328,6 @@ after a run via the L.runs list. This list contains a growing list of run data.
 The first element is the output of the first run, the second element that of
 the second run.
 
-
 .. code-block:: Python
 
    L.run(1000)
@@ -359,7 +339,6 @@ the second run.
 Each run contains a dictionary of all trajectories. Each trajectory is
 accessible through its thermo name:
 
-
 .. code-block:: Python
 
    L.runs[0].thermo.Step # list of time steps in first run
@@ -367,7 +346,6 @@ accessible through its thermo name:
 
 Together with matplotlib plotting data out of LAMMPS becomes simple:
 
-
 .. code-block:: Python
 
    import matplotlib.plot as plt
@@ -406,7 +384,6 @@ tutorials and showcasing your latest research.
 To launch an instance of Jupyter simply run the following command inside your
 Python environment (this assumes you followed the Quick Start instructions):
 
-
 .. code-block:: bash
 
    jupyter notebook
@@ -429,7 +406,6 @@ Four atoms are placed in the simulation and the dihedral potential is applied on
 them using a datafile. Then one of the atoms is rotated along the central axis by
 setting its position from Python, which changes the dihedral angle.
 
-
 .. code-block:: Python
 
    phi = [d \* math.pi / 180 for d in range(360)]
@@ -463,7 +439,6 @@ Initially, a 2D system is created in a state with minimal energy.
 
 It is then disordered by moving each atom by a random delta.
 
-
 .. code-block:: Python
 
    random.seed(27848)
@@ -483,7 +458,6 @@ It is then disordered by moving each atom by a random delta.
 Finally, the Monte Carlo algorithm is implemented in Python. It continuously
 moves random atoms by a random delta and only accepts certain moves.
 
-
 .. code-block:: Python
 
    estart = L.eval("pe")
@@ -536,7 +510,6 @@ Using PyLammps and mpi4py (Experimental)
 
 PyLammps can be run in parallel using mpi4py. This python package can be installed using
 
-
 .. code-block:: bash
 
    pip install mpi4py
@@ -544,7 +517,6 @@ PyLammps can be run in parallel using mpi4py. This python package can be install
 The following is a short example which reads in an existing LAMMPS input file and
 executes it in parallel.  You can find in.melt in the examples/melt folder.
 
-
 .. code-block:: Python
 
    from mpi4py import MPI
@@ -561,7 +533,6 @@ executes it in parallel.  You can find in.melt in the examples/melt folder.
 To run this script (melt.py) in parallel using 4 MPI processes we invoke the
 following mpirun command:
 
-
 .. code-block:: bash
 
    mpirun -np 4 python melt.py
@@ -577,8 +548,3 @@ If you find this Python interface useful, please feel free to provide feedback
 and ideas on how to improve it to Richard Berger (richard.berger@temple.edu). We also
 want to encourage people to write tutorial style IPython notebooks showcasing LAMMPS usage
 and maybe their latest research results.
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/Howto_replica.rst b/doc/src/Howto_replica.rst
index 885cdf050e..e9fba37dcd 100644
--- a/doc/src/Howto_replica.rst
+++ b/doc/src/Howto_replica.rst
@@ -37,8 +37,7 @@ replica.  The processors assigned to each replica are determined at
 run-time by using the :doc:`-partition command-line switch <Run_options>` to launch LAMMPS on multiple partitions,
 which in this context are the same as replicas.  E.g.  these commands:
 
-
-.. parsed-literal::
+.. code-block:: bash
 
    mpirun -np 16 lmp_linux -partition 8x2 -in in.temper
    mpirun -np 8 lmp_linux -partition 8x1 -in in.neb
@@ -53,8 +52,3 @@ processors.  Thus the above commands could be run on a
 single-processor (or few-processor) desktop so that you can run
 a multi-replica simulation on more replicas than you have
 physical processors.
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/Howto_restart.rst b/doc/src/Howto_restart.rst
index c6dc818816..6323ba4158 100644
--- a/doc/src/Howto_restart.rst
+++ b/doc/src/Howto_restart.rst
@@ -21,8 +21,7 @@ Look at the *in.chain* input script provided in the *bench* directory
 of the LAMMPS distribution to see the original script that these 2
 scripts are based on.  If that script had the line
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    restart         50 tmp.restart
 
@@ -32,8 +31,7 @@ and tmp.restart.100) as it ran.
 This script could be used to read the 1st restart file and re-run the
 last 50 timesteps:
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    read_restart    tmp.restart.50
 
@@ -48,8 +46,8 @@ last 50 timesteps:
    run             50
 
 Note that the following commands do not need to be repeated because
-their settings are included in the restart file: *units, atom\_style,
-special\_bonds, pair\_style, bond\_style*.  However these commands do
+their settings are included in the restart file: *units, atom_style,
+special_bonds, pair_style, bond_style*.  However these commands do
 need to be used, since their settings are not in the restart file:
 *neighbor, fix, timestep*\ .
 
@@ -62,15 +60,13 @@ uses random numbers in a way that does not allow for perfect restarts.
 As an alternate approach, the restart file could be converted to a data
 file as follows:
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    lmp_g++ -r tmp.restart.50 tmp.restart.data
 
 Then, this script could be used to re-run the last 50 steps:
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    units           lj
    atom_style      bond
@@ -93,13 +89,8 @@ Then, this script could be used to re-run the last 50 steps:
    run             50
 
 Note that nearly all the settings specified in the original *in.chain*
-script must be repeated, except the *pair\_coeff* and *bond\_coeff*
+script must be repeated, except the *pair_coeff* and *bond_coeff*
 commands since the new data file lists the force field coefficients.
 Also, the :doc:`reset_timestep <reset_timestep>` command is used to tell
 LAMMPS the current timestep.  This value is stored in restart files,
 but not in data files.
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/Howto_spc.rst b/doc/src/Howto_spc.rst
index 353f32c193..f7c2cf6142 100644
--- a/doc/src/Howto_spc.rst
+++ b/doc/src/Howto_spc.rst
@@ -15,43 +15,34 @@ atoms and the water molecule to run a rigid SPC model.
 | H mass = 1.008
 | O charge = -0.820
 | H charge = 0.410
-| LJ epsilon of OO = 0.1553
-| LJ sigma of OO = 3.166
-| LJ epsilon, sigma of OH, HH = 0.0
-| r0 of OH bond = 1.0
-| theta of HOH angle = 109.47
-| 
+| LJ :math:`\epsilon` of OO = 0.1553
+| LJ :math:`\sigma` of OO = 3.166
+| LJ :math:`\epsilon`, :math:`\sigma` of OH, HH = 0.0
+| :math:`r_0` of OH bond = 1.0
+| :math:`\theta` of HOH angle = 109.47\ :math:`^{\circ}`
+|
 
 Note that as originally proposed, the SPC model was run with a 9
-Angstrom cutoff for both LJ and Coulombic terms.  It can also be used
-with long-range Coulombics (Ewald or PPPM in LAMMPS), without changing
-any of the parameters above, though it becomes a different model in
-that mode of usage.
+Angstrom cutoff for both LJ and Coulomb terms.  It can also be used
+with long-range electrostatic solvers (e.g. Ewald or PPPM in LAMMPS)
+without changing any of the parameters above, although it becomes
+a different model in that mode of usage.
 
 The SPC/E (extended) water model is the same, except
 the partial charge assignments change:
 
 | O charge = -0.8476
 | H charge = 0.4238
-| 
+|
 
 See the :ref:`(Berendsen) <howto-Berendsen>` reference for more details on both
 the SPC and SPC/E models.
 
 Wikipedia also has a nice article on `water models <http://en.wikipedia.org/wiki/Water_model>`_.
 
-
 ----------
 
-
 .. _howto-Berendsen:
 
-
-
 **(Berendsen)** Berendsen, Grigera, Straatsma, J Phys Chem, 91,
 6269-6271 (1987).
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/Howto_spherical.rst b/doc/src/Howto_spherical.rst
index ec199c859b..7ca8a1b060 100644
--- a/doc/src/Howto_spherical.rst
+++ b/doc/src/Howto_spherical.rst
@@ -38,8 +38,7 @@ The dipole style does not actually define finite-size particles, but
 is often used in conjunction with spherical particles, via a command
 like
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    atom_style hybrid sphere dipole
 
@@ -116,7 +115,7 @@ such interactions.  These are the various :doc:`pair styles <pair_style>` that g
 
 * :doc:`pair_style gran/history <pair_gran>`
 * :doc:`pair_style gran/hertzian <pair_gran>`
-* :doc:`pair_style gran/no\_history <pair_gran>`
+* :doc:`pair_style gran/no_history <pair_gran>`
 * :doc:`pair_style dipole/cut <pair_dipole>`
 * :doc:`pair_style gayberne <pair_gayberne>`
 * :doc:`pair_style resquared <pair_resquared>`
@@ -236,8 +235,3 @@ as single particles, though they can store internal state, such as a
 list of sub-particles.  Individual body particles are typically treated
 as rigid bodies, and their motion integrated with a command like :doc:`fix nve/body <fix_nve_body>`.  Interactions between pairs of body
 particles are computed via a command like :doc:`pair_style body/nparticle <pair_body_nparticle>`.
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/Howto_spins.rst b/doc/src/Howto_spins.rst
index eb1cf1e956..0afcc12c91 100644
--- a/doc/src/Howto_spins.rst
+++ b/doc/src/Howto_spins.rst
@@ -56,18 +56,9 @@ the magnetic energy. The second command is :doc:`compute property/atom <compute_
 per atom magnetic quantities. Typically, the orientation of a given
 magnetic spin, or the magnetic force acting on this spin.
 
-
 ----------
 
-
 .. _Tranchida:
 
-
-
 **(Tranchida)** Tranchida, Plimpton, Thibaudeau and Thompson,
 Journal of Computational Physics, 372, 406-425, (2018).
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/Howto_temperature.rst b/doc/src/Howto_temperature.rst
index ec9cdae2e6..3082f3cded 100644
--- a/doc/src/Howto_temperature.rst
+++ b/doc/src/Howto_temperature.rst
@@ -31,8 +31,3 @@ They both allow for velocity biases indirectly, via an optional extra
 argument which is another temperature compute that subtracts a
 velocity bias.  This allows the translational velocity of spherical or
 aspherical particles to be adjusted in prescribed ways.
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/Howto_thermostat.rst b/doc/src/Howto_thermostat.rst
index 273876c9fd..77745efa57 100644
--- a/doc/src/Howto_thermostat.rst
+++ b/doc/src/Howto_thermostat.rst
@@ -82,18 +82,9 @@ specify them explicitly via the :doc:`thermo_style custom <thermo_style>` comman
 :doc:`thermo_modify <thermo_modify>` command to re-define what
 temperature compute is used for default thermodynamic output.
 
-
 ----------
 
-
 .. _Daivis-thermostat:
 
-
-
 **(Daivis and Todd)** Daivis and Todd, Nonequilibrium Molecular Dynamics (book),
 Cambridge University Press, https://doi.org/10.1017/9781139017848, (2017).
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/Howto_tip3p.rst b/doc/src/Howto_tip3p.rst
index a83fa0dd0d..7f7ddbdf2a 100644
--- a/doc/src/Howto_tip3p.rst
+++ b/doc/src/Howto_tip3p.rst
@@ -20,19 +20,19 @@ set to 0.0, it corresponds to the original 1983 TIP3P model
 | H mass = 1.008
 | O charge = -0.834
 | H charge = 0.417
-| LJ epsilon of OO = 0.1521
-| LJ sigma of OO = 3.1507
-| LJ epsilon of HH = 0.0460
-| LJ sigma of HH = 0.4000
-| LJ epsilon of OH = 0.0836
-| LJ sigma of OH = 1.7753
+| LJ :math:`\epsilon` of OO = 0.1521
+| LJ :math:`\sigma` of OO = 3.1507
+| LJ :math:`\epsilon` of HH = 0.0460
+| LJ :math:`\sigma` of HH = 0.4000
+| LJ :math:`\epsilon` of OH = 0.0836
+| LJ :math:`\sigma` of OH = 1.7753
 | K of OH bond = 450
-| r0 of OH bond = 0.9572
+| :math:`r_0` of OH bond = 0.9572
 | K of HOH angle = 55
-| theta of HOH angle = 104.52
-| 
+| :math:`\theta` of HOH angle = 104.52\ :math:`^{\circ}`
+|
 
-These are the parameters to use for TIP3P with a long-range Coulombic
+These are the parameters to use for TIP3P with a long-range Coulomb
 solver (e.g. Ewald or PPPM in LAMMPS), see :ref:`(Price) <Price1>` for
 details:
 
@@ -40,42 +40,29 @@ details:
 | H mass = 1.008
 | O charge = -0.830
 | H charge = 0.415
-| LJ epsilon of OO = 0.102
-| LJ sigma of OO = 3.188
-| LJ epsilon, sigma of OH, HH = 0.0
+| LJ :math:`\epsilon` of OO = 0.102
+| LJ :math:`\sigma` of OO = 3.188
+| LJ :math:`\epsilon`, :math:`\sigma` of OH, HH = 0.0
 | K of OH bond = 450
-| r0 of OH bond = 0.9572
+| :math:`r_0` of OH bond = 0.9572
 | K of HOH angle = 55
-| theta of HOH angle = 104.52
-| 
+| :math:`\theta` of HOH angle = 104.52\ :math:`^{\circ}`
+|
 
 Wikipedia also has a nice article on `water models <http://en.wikipedia.org/wiki/Water_model>`_.
 
-
 ----------
 
-
 .. _howto-tip3p:
 
-
-
 **(MacKerell)** MacKerell, Bashford, Bellott, Dunbrack, Evanseck, Field,
 Fischer, Gao, Guo, Ha, et al, J Phys Chem, 102, 3586 (1998).
 
 .. _Jorgensen1:
 
-
-
 **(Jorgensen)** Jorgensen, Chandrasekhar, Madura, Impey, Klein, J Chem
 Phys, 79, 926 (1983).
 
 .. _Price1:
 
-
-
 **(Price)** Price and Brooks, J Chem Phys, 121, 10096 (2004).
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/Howto_tip4p.rst b/doc/src/Howto_tip4p.rst
index c55e22ba60..1aa5712b19 100644
--- a/doc/src/Howto_tip4p.rst
+++ b/doc/src/Howto_tip4p.rst
@@ -11,7 +11,7 @@ angle style of *harmonic* or *charmm* should also be used.
 A TIP4P model is run with LAMMPS using either this command
 for a cutoff model:
 
-:doc:`pair_style lj/cut/tip4p/cut <pair_lj>`
+* :doc:`pair_style lj/cut/tip4p/cut <pair_lj>`
 
 or these two commands for a long-range model:
 
@@ -31,46 +31,46 @@ coefficients.
 | H mass = 1.008
 | O charge = -1.040
 | H charge = 0.520
-| r0 of OH bond = 0.9572
-| theta of HOH angle = 104.52
+| :math:`r_0` of OH bond = 0.9572
+| :math:`\theta` of HOH angle = 104.52\ :math:`^{\circ}`
 | OM distance = 0.15
-| LJ epsilon of O-O = 0.1550
-| LJ sigma of O-O = 3.1536
-| LJ epsilon, sigma of OH, HH = 0.0
-| Coulombic cutoff = 8.5
-| 
+| LJ :math:`\epsilon` of O-O = 0.1550
+| LJ :math:`\sigma` of O-O = 3.1536
+| LJ :math:`\epsilon`, :math:`\sigma` of OH, HH = 0.0
+| Coulomb cutoff = 8.5
+|
 
 For the TIP4/Ice model (J Chem Phys, 122, 234511 (2005);
-http://dx.doi.org/10.1063/1.1931662) these values can be used:
+https://doi.org/10.1063/1.1931662) these values can be used:
 
 | O mass = 15.9994
 | H mass =  1.008
 | O charge = -1.1794
 | H charge =  0.5897
-| r0 of OH bond = 0.9572
-| theta of HOH angle = 104.52
+| :math:`r_0` of OH bond = 0.9572
+| :math:`\theta` of HOH angle = 104.52\ :math:`^{\circ}`
 | OM distance = 0.1577
-| LJ epsilon of O-O = 0.21084
-| LJ sigma of O-O = 3.1668
-| LJ epsilon, sigma of OH, HH = 0.0
-| Coulombic cutoff = 8.5
-| 
+| LJ :math:`\epsilon` of O-O = 0.21084
+| LJ :math:`\sigma` of O-O = 3.1668
+| LJ :math:`\epsilon`, :math:`\sigma` of OH, HH = 0.0
+| Coulomb cutoff = 8.5
+|
 
 For the TIP4P/2005 model (J Chem Phys, 123, 234505 (2005);
-http://dx.doi.org/10.1063/1.2121687), these values can be used:
+https://doi.org/10.1063/1.2121687), these values can be used:
 
 | O mass = 15.9994
 | H mass =  1.008
 | O charge = -1.1128
 | H charge = 0.5564
-| r0 of OH bond = 0.9572
-| theta of HOH angle = 104.52
+| :math:`r_0` of OH bond = 0.9572
+| :math:`\theta` of HOH angle = 104.52\ :math:`^{\circ}`
 | OM distance = 0.1546
-| LJ epsilon of O-O = 0.1852
-| LJ sigma of O-O = 3.1589
-| LJ epsilon, sigma of OH, HH = 0.0
-| Coulombic cutoff = 8.5
-| 
+| LJ :math:`\epsilon` of O-O = 0.1852
+| LJ :math:`\sigma` of O-O = 3.1589
+| LJ :math:`\epsilon`, :math:`\sigma` of OH, HH = 0.0
+| Coulomb cutoff = 8.5
+|
 
 These are the parameters to use for TIP4P with a long-range Coulombic
 solver (e.g. Ewald or PPPM in LAMMPS):
@@ -79,13 +79,13 @@ solver (e.g. Ewald or PPPM in LAMMPS):
 | H mass = 1.008
 | O charge = -1.0484
 | H charge = 0.5242
-| r0 of OH bond = 0.9572
-| theta of HOH angle = 104.52
+| :math:`r_0` of OH bond = 0.9572
+| :math:`\theta` of HOH angle = 104.52\ :math:`^{\circ}`
 | OM distance = 0.1250
-| LJ epsilon of O-O = 0.16275
-| LJ sigma of O-O = 3.16435
-| LJ epsilon, sigma of OH, HH = 0.0
-| 
+| LJ :math:`\epsilon` of O-O = 0.16275
+| LJ :math:`\sigma` of O-O = 3.16435
+| LJ :math:`\epsilon`, :math:`\sigma` of OH, HH = 0.0
+|
 
 Note that the when using the TIP4P pair style, the neighbor list
 cutoff for Coulomb interactions is effectively extended by a distance
@@ -99,18 +99,9 @@ and Coulombic cutoffs are set in the :doc:`pair_style lj/cut/tip4p/long <pair_lj
 
 Wikipedia also has a nice article on `water models <http://en.wikipedia.org/wiki/Water_model>`_.
 
-
 ----------
 
-
 .. _Jorgensen5:
 
-
-
 **(Jorgensen)** Jorgensen, Chandrasekhar, Madura, Impey, Klein, J Chem
 Phys, 79, 926 (1983).
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/Howto_triclinic.rst b/doc/src/Howto_triclinic.rst
index 6667e9cf66..632d0364d5 100644
--- a/doc/src/Howto_triclinic.rst
+++ b/doc/src/Howto_triclinic.rst
@@ -1,17 +1,3 @@
-:doc:`Higher level section <Howto>` - `LAMMPS WWW Site <lws_>`_ - `LAMMPS Documentation <ld_>`_ - `LAMMPS Commands <lc_>`_ 
-
-.. _lws: http://lammps.sandia.gov
-
-
-
-.. _ld: Manual.html
-
-
-
-.. _lc: Commands\_all.html
-
-
-
 Triclinic (non-orthogonal) simulation boxes
 ===========================================
 
@@ -53,11 +39,23 @@ vectors of a general parallelepiped, where there is no restriction on
 **A** x **B** . **C** > 0.  The equivalent LAMMPS **a**\ ,\ **b**\ ,\ **c** are a linear
 rotation of **A**\ , **B**\ , and **C** and can be computed as follows:
 
-.. image:: Eqs/transform.jpg
-   :align: center
+.. math::
+
+  \begin{pmatrix} \mathbf{a}  & \mathbf{b}  & \mathbf{c} \end{pmatrix} = &
+  \begin{pmatrix}
+    a_x & b_x & c_x \\
+    0   & b_y & c_y \\
+    0   & 0   & c_z \\
+  \end{pmatrix} \\
+  a_x = & A \\
+  b_x = & \mathbf{B} \cdot \mathbf{\hat{A}} \quad = \quad B \cos{\gamma} \\
+  b_y = & |\mathbf{\hat{A}} \times \mathbf{B}| \quad = \quad B \sin{\gamma} \quad =  \quad  \sqrt{B^2 - {b_x}^2} \\
+  c_x = & \mathbf{C} \cdot \mathbf{\hat{A}} \quad = \quad C \cos{\beta} \\
+  c_y = & \mathbf{C} \cdot \widehat{(\mathbf{A} \times \mathbf{B})} \times \mathbf{\hat{A}} \quad = \quad \frac{\mathbf{B} \cdot \mathbf{C} - b_x c_x}{b_y} \\
+  c_z = & |\mathbf{C} \cdot \widehat{(\mathbf{A} \times \mathbf{B})}|\quad = \quad \sqrt{C^2 - {c_x}^2 - {c_y}^2}
 
 where A = \| **A** \| indicates the scalar length of **A**\ . The hat symbol (\^)
-indicates the corresponding unit vector. *beta* and *gamma* are angles
+indicates the corresponding unit vector. :math:`\beta` and :math:`\gamma` are angles
 between the vectors described below. Note that by construction,
 **a**\ , **b**\ , and **c** have strictly positive x, y, and z components, respectively.
 If it should happen that
@@ -74,8 +72,14 @@ fractional coordinates in the
 old basis and then converting to distance coordinates in the new basis.
 The transformation is given by the following equation:
 
-.. image:: Eqs/rotate.jpg
-   :align: center
+.. math::
+
+  \mathbf{x} = & \begin{pmatrix} \mathbf{a}  & \mathbf{b}  & \mathbf{c} \end{pmatrix} \cdot \frac{1}{V}
+    \begin{pmatrix}
+      \mathbf{B \times C}  \\
+      \mathbf{C \times A}  \\
+      \mathbf{A \times B}
+    \end{pmatrix} \cdot \mathbf{X}
 
 where *V* is the volume of the box, **X** is the original vector quantity and
 **x** is the vector in the LAMMPS basis.
@@ -156,23 +160,36 @@ For extreme values of tilt, LAMMPS may also lose atoms and generate an
 error.
 
 Triclinic crystal structures are often defined using three lattice
-constants *a*\ , *b*\ , and *c*\ , and three angles *alpha*\ , *beta* and
-*gamma*\ . Note that in this nomenclature, the a, b, and c lattice
-constants are the scalar lengths of the edge vectors **a**\ , **b**\ , and **c**
-defined above.  The relationship between these 6 quantities
-(a,b,c,alpha,beta,gamma) and the LAMMPS box sizes (lx,ly,lz) =
+constants *a*\ , *b*\ , and *c*\ , and three angles :math:`\alpha`,
+:math:`\beta`, and :math:`\gamma`. Note that in this nomenclature,
+the a, b, and c lattice constants are the scalar lengths of the edge
+vectors **a**\ , **b**\ , and **c** defined above.  The relationship
+between these 6 quantities (a, b, c, :math:`\alpha`, :math:`\beta`,
+:math:`\gamma`) and the LAMMPS box sizes (lx,ly,lz) =
 (xhi-xlo,yhi-ylo,zhi-zlo) and tilt factors (xy,xz,yz) is as follows:
 
-.. image:: Eqs/box.jpg
-   :align: center
+.. math::
+
+  a   = & {\rm lx} \\
+  b^2 = &  {\rm ly}^2 +  {\rm xy}^2 \\
+  c^2 = &  {\rm lz}^2 +  {\rm xz}^2 +  {\rm yz}^2 \\
+  \cos{\alpha} = & \frac{{\rm xy}*{\rm xz} + {\rm ly}*{\rm yz}}{b*c} \\
+  \cos{\beta}  = & \frac{\rm xz}{c} \\
+  \cos{\gamma} = & \frac{\rm xy}{b} \\
 
 The inverse relationship can be written as follows:
 
-.. image:: Eqs/box_inverse.jpg
-   :align: center
+.. math::
 
-The values of *a*\ , *b*\ , *c* , *alpha*\ , *beta* , and *gamma* can be printed
-out or accessed by computes using the
+  {\rm lx}   = & a \\
+  {\rm xy}   = & b \cos{\gamma}  \\
+  {\rm xz}   = & c \cos{\beta}\\
+  {\rm ly}^2 = & b^2 - {\rm xy}^2 \\
+  {\rm yz}   = & \frac{b*c \cos{\alpha} - {\rm xy}*{\rm xz}}{\rm ly} \\
+  {\rm lz}^2 = & c^2 - {\rm xz}^2 - {\rm yz}^2 \\
+
+The values of *a*\ , *b*\ , *c* , :math:`\alpha` , :math:`\beta`, and
+:math:`\gamma` can be printed out or accessed by computes using the
 :doc:`thermo_style custom <thermo_style>` keywords
 *cella*\ , *cellb*\ , *cellc*\ , *cellalpha*\ , *cellbeta*\ , *cellgamma*\ ,
 respectively.
@@ -183,7 +200,6 @@ an orthogonal bounding box which encloses the triclinic simulation box
 is output, along with the 3 tilt factors (xy, xz, yz) of the triclinic
 box, formatted as follows:
 
-
 .. parsed-literal::
 
    ITEM: BOX BOUNDS xy xz yz
@@ -195,7 +211,6 @@ This bounding box is convenient for many visualization programs and is
 calculated from the 9 triclinic box parameters
 (xlo,xhi,ylo,yhi,zlo,zhi,xy,xz,yz) as follows:
 
-
 .. parsed-literal::
 
    xlo_bound = xlo + MIN(0.0,xy,xz,xy+xz)
@@ -206,7 +221,7 @@ calculated from the 9 triclinic box parameters
    zhi_bound = zhi
 
 These formulas can be inverted if you need to convert the bounding box
-back into the triclinic box parameters, e.g. xlo = xlo\_bound -
+back into the triclinic box parameters, e.g. xlo = xlo_bound -
 MIN(0.0,xy,xz,xy+xz).
 
 One use of triclinic simulation boxes is to model solid-state crystals
@@ -225,4 +240,3 @@ material.  The :doc:`fix deform <fix_deform>` command can be used for
 this purpose.  It allows dynamic control of the xy, xz, yz tilt
 factors as a simulation runs.  This is discussed in the next section
 on non-equilibrium MD (NEMD) simulations.
-
diff --git a/doc/src/Howto_viscosity.rst b/doc/src/Howto_viscosity.rst
index 0b74784534..dff414ce9d 100644
--- a/doc/src/Howto_viscosity.rst
+++ b/doc/src/Howto_viscosity.rst
@@ -62,8 +62,7 @@ simulation box.
 Here is an example input script that calculates the viscosity of
 liquid Ar via the GK formalism:
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    # Sample LAMMPS input script for viscosity of liquid Ar
 
@@ -73,7 +72,7 @@ liquid Ar via the GK formalism:
    variable    dt equal 4.0
    variable    p equal 400     # correlation length
    variable    s equal 5       # sample interval
-   variable    d equal $p\*$s   # dump interval
+   variable    d equal $p*$s   # dump interval
 
    # convert from LAMMPS real units to SI
 
@@ -81,7 +80,7 @@ liquid Ar via the GK formalism:
    variable    atm2Pa equal 101325.0
    variable    A2m equal 1.0e-10
    variable    fs2s equal 1.0e-15
-   variable    convert equal ${atm2Pa}\*${atm2Pa}\*${fs2s}\*${A2m}\*${A2m}\*${A2m}
+   variable    convert equal ${atm2Pa}*${atm2Pa}*${fs2s}*${A2m}*${A2m}*${A2m}
 
    # setup problem
 
@@ -93,7 +92,7 @@ liquid Ar via the GK formalism:
    create_atoms 1 box
    mass         1 39.948
    pair_style   lj/cut 13.0
-   pair_coeff   \* \* 0.2381 3.405
+   pair_coeff   * * 0.2381 3.405
    timestep     ${dt}
    thermo       $d
 
@@ -114,15 +113,15 @@ liquid Ar via the GK formalism:
    variable     pyz equal pyz
    fix          SS all ave/correlate $s $p $d &
                 v_pxy v_pxz v_pyz type auto file S0St.dat ave running
-   variable     scale equal ${convert}/(${kB}\*$T)\*$V\*$s\*${dt}
-   variable     v11 equal trap(f_SS[3])\*${scale}
-   variable     v22 equal trap(f_SS[4])\*${scale}
-   variable     v33 equal trap(f_SS[5])\*${scale}
+   variable     scale equal ${convert}/(${kB}*$T)*$V*$s*${dt}
+   variable     v11 equal trap(f_SS[3])*${scale}
+   variable     v22 equal trap(f_SS[4])*${scale}
+   variable     v33 equal trap(f_SS[5])*${scale}
    thermo_style custom step temp press v_pxy v_pxz v_pyz v_v11 v_v22 v_v33
    run          100000
    variable     v equal (v_v11+v_v22+v_v33)/3.0
    variable     ndens equal count(all)/vol
-   print        "average viscosity: $v [Pa.s] @ $T K, ${ndens} /A\^3"
+   print        "average viscosity: $v [Pa.s] @ $T K, ${ndens} /A^3"
 
 The fifth method is related to the above Green-Kubo method,
 but uses the Einstein formulation, analogous to the Einstein
@@ -131,18 +130,9 @@ time-integrated momentum fluxes play the role of Cartesian
 coordinates, whose mean-square displacement increases linearly
 with time at sufficiently long times.
 
-
 ----------
 
-
 .. _Daivis-viscosity:
 
-
-
 **(Daivis and Todd)** Daivis and Todd, Nonequilibrium Molecular Dynamics (book),
 Cambridge University Press, https://doi.org/10.1017/9781139017848, (2017).
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/Howto_viz.rst b/doc/src/Howto_viz.rst
index c2cdc56b48..2eb009c185 100644
--- a/doc/src/Howto_viz.rst
+++ b/doc/src/Howto_viz.rst
@@ -19,25 +19,14 @@ A Python-based toolkit distributed by our group can read native LAMMPS
 dump files, including custom dump files with additional columns of
 user-specified atom information, and convert them to various formats
 or pipe them into visualization software directly.  See the `Pizza.py WWW site <pizza_>`_ for details.  Specifically, Pizza.py can convert
-LAMMPS dump files into PDB, XYZ, `Ensight <ensight_>`_, and VTK formats.
+LAMMPS dump files into PDB, XYZ, `EnSight <ensight_>`_, and VTK formats.
 Pizza.py can pipe LAMMPS dump files directly into the Raster3d and
 RasMol visualization programs.  Pizza.py has tools that do interactive
 3d OpenGL visualization and one that creates SVG images of dump file
 snapshots.
 
-.. _pizza: http://www.sandia.gov/~sjplimp/pizza.html
+.. _pizza: https://pizza.sandia.gov
 
+.. _ensight: https://www.ansys.com/products/fluids/ansys-ensight
 
-
-.. _ensight: http://www.ensight.com
-
-
-
-.. _atomeye: http://mt.seas.upenn.edu/Archive/Graphics/A
-
-
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
+.. _atomeye: http://li.mit.edu/Archive/Graphics/A/
diff --git a/doc/src/Howto_walls.rst b/doc/src/Howto_walls.rst
index eed28f2ed1..4d35cd66b3 100644
--- a/doc/src/Howto_walls.rst
+++ b/doc/src/Howto_walls.rst
@@ -69,8 +69,3 @@ The only frictional idealized walls currently in LAMMPS are flat or
 curved surfaces specified by the :doc:`fix wall/gran <fix_wall_gran>`
 command.  At some point we plan to allow regoin surfaces to be used as
 frictional walls, as well as triangulated surfaces.
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/Install.rst b/doc/src/Install.rst
index 4a403a336d..03a1551686 100644
--- a/doc/src/Install.rst
+++ b/doc/src/Install.rst
@@ -8,7 +8,6 @@ have more flexibility as to what features to include or exclude in the
 build.  If you plan to :doc:`modify or extend LAMMPS <Modify>`, then you
 need the source code.
 
-
 .. toctree::
    :maxdepth: 1
 
@@ -19,7 +18,6 @@ need the source code.
 
    Install_tarball
    Install_git
-   Install_svn
    Install_patch
 
 These are the files and sub-directories in the LAMMPS distribution:
@@ -51,8 +49,3 @@ These are the files and sub-directories in the LAMMPS distribution:
 You will have all of these if you download source.  You will only have
 some of them if you download executables, as explained on the pages
 listed above.
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/Install_conda.rst b/doc/src/Install_conda.rst
index 33188e2540..80ec64272e 100644
--- a/doc/src/Install_conda.rst
+++ b/doc/src/Install_conda.rst
@@ -1,21 +1,21 @@
 Download an executable for Linux or Mac via Conda
 =================================================
 
-Binaries are available for macOS or Linux via `Conda <conda_>`_.
+Binaries are available for MacOS or Linux via `Conda <conda_>`_.
 
 First, one must setup the Conda package manager on your system.  Follow the
 instructions to install `Miniconda <mini_conda_install_>`_, then create a conda
 environment (named `my-lammps-env` or whatever you prefer) for your lammps
 install:
 
-.. parsed-literal::
+.. code-block:: bash
 
    % conda config --add channels conda-forge
    % conda create -n my-lammps-env
 
 Then, you can install lammps on your system with the following command:
 
-.. parsed-literal::
+.. code-block:: bash
 
    % conda activate my-lammps-env
    % conda install lammps
@@ -25,8 +25,7 @@ results in Conda also installing the `kim-api` binaries when LAMMPS is
 installed.  In order to use potentials from `openkim.org <openkim_>`_, you can
 install the `openkim-models` package
 
-
-.. parsed-literal::
+.. code-block:: bash
 
    % conda install openkim-models
 
@@ -36,13 +35,6 @@ Thanks to Jan Janssen (Max-Planck-Institut fuer Eisenforschung) for setting
 up the Conda capability.
 
 .. _conda_forge_lammps: https://github.com/conda-forge/lammps-feedstock/issues
-
 .. _openkim: https://openkim.org
-
 .. _conda: https://docs.conda.io/en/latest/index.html
-
 .. _mini_conda_install: https://docs.conda.io/en/latest/miniconda.html
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/Install_git.rst b/doc/src/Install_git.rst
index 9d9d36f8f6..2f6e8096dc 100644
--- a/doc/src/Install_git.rst
+++ b/doc/src/Install_git.rst
@@ -1,5 +1,5 @@
-Download source via Git
-=======================
+Download the LAMMPS source with git
+===================================
 
 All LAMMPS development is coordinated through the "LAMMPS GitHub
 site".  If you clone the LAMMPS repository onto your local machine, it
@@ -11,33 +11,32 @@ has several advantages:
 * You can submit your new features back to GitHub for inclusion in
   LAMMPS.
 
-You must have `Git <git_>`_ installed on your system to communicate with
-the public Git server for LAMMPS.
+You must have `git <git_>`_ installed on your system to use the
+commands explained below to communicate with the git servers on
+GitHub.  For people still using subversion (svn), GitHub also
+provides `limited support for subversion clients <svn_>`_.
 
-.. warning::
+.. note::
 
-   As of Oct 2016, the official home of public LAMMPS
-   development is on GitHub.  The previously advertised LAMMPS git
-   repositories on git.lammps.org and bitbucket.org are now deprecated,
-   may not be up-to-date, and may go away at any time.
+   As of October 2016, the official home of public LAMMPS development is
+   on GitHub.  The previously advertised LAMMPS git repositories on
+   git.lammps.org and bitbucket.org are now deprecated or offline.
 
-.. _git: http://git-scm.com
+.. _git: https://git-scm.com
+.. _svn: https://help.github.com/en/github/importing-your-projects-to-github/working-with-subversion-on-github
 
-
-
-You can follow LAMMPS development on 3 different Git branches:
+You can follow LAMMPS development on 3 different git branches:
 
 * **stable**   :  this branch is updated with every stable release
 * **unstable** :  this branch is updated with every patch release
 * **master**   :  this branch continuously follows ongoing development
 
-To access the Git repositories on your box, use the clone command to
+To access the git repositories on your box, use the clone command to
 create a local copy of the LAMMPS repository with a command like:
 
+.. code-block:: bash
 
-.. parsed-literal::
-
-   git clone -b unstable https://github.com/lammps/lammps.git mylammps
+   $ git clone -b unstable https://github.com/lammps/lammps.git mylammps
 
 where "mylammps" is the name of the directory you wish to create on
 your machine and "unstable" is one of the 3 branches listed above.
@@ -53,33 +52,31 @@ typing "make html" from the doc directory.
 
 After initial cloning, as bug fixes and new features are added to
 LAMMPS, as listed on :doc:`this page <Errors_bugs>`, you can stay
-up-to-date by typing the following Git commands from within the
+up-to-date by typing the following git commands from within the
 "mylammps" directory:
 
+.. code-block:: bash
 
-.. parsed-literal::
-
-   git checkout unstable      # not needed if you always stay in this branch
-   git checkout stable        # use one of the 3 checkout commands
-   git checkout master
-   git pull
+   $ git checkout unstable      # not needed if you always stay in this branch
+   $ git checkout stable        # use one of the 3 checkout commands
+   $ git checkout master
+   $ git pull
 
 Doing a "pull" will not change any files you have added to the LAMMPS
 directory structure.  It will also not change any existing LAMMPS
 files you have edited, unless those files have changed in the
-repository.  In that case, Git will attempt to merge the new
+repository.  In that case, git will attempt to merge the new
 repository file with your version of the file and tell you if there
-are any conflicts.  See the Git documentation for details.
+are any conflicts.  See the git documentation for details.
 
 If you want to access a particular previous release version of LAMMPS,
 you can instead "checkout" any version with a published tag. See the
-output of "git tag -l" for the list of tags.  The Git command to do
+output of "git tag -l" for the list of tags.  The git command to do
 this is as follows.
 
+.. code-block:: bash
 
-.. parsed-literal::
-
-   git checkout tagID
+   $ git checkout tagID
 
 Stable versions and what tagID to use for a particular stable version
 are discussed on :doc:`this page <Errors_bugs>`.  Note that this command
@@ -92,12 +89,11 @@ Once you have updated your local files with a "git pull" (or "git
 checkout"), you still need to re-build LAMMPS if any source files have
 changed.  To do this, you should cd to the src directory and type:
 
+.. code-block:: bash
 
-.. parsed-literal::
-
-   make purge             # remove any deprecated src files
-   make package-update    # sync package files with src files
-   make foo               # re-build for your machine (mpi, serial, etc)
+   $ make purge             # remove any deprecated src files
+   $ make package-update    # sync package files with src files
+   $ make foo               # re-build for your machine (mpi, serial, etc)
 
 just as described on the :doc:`Install patch <Install_patch>` doc page,
 after a patch has been installed.
@@ -107,22 +103,17 @@ after a patch has been installed.
    If you wish to edit/change a src file that is from a
    package, you should edit the version of the file inside the package
    sub-directory with src, then re-install the package.  The version in
-   the src dir is merely a copy and will be wiped out if you type "make
+   the source directory is merely a copy and will be wiped out if you type "make
    package-update".
 
 .. warning::
 
    The GitHub servers support both the "git://" and
    "https://" access protocols for anonymous read-only access.  If you
-   have a correspondingly configured GitHub account, you may also use SSH
-   with "git@github.com:/lammps/lammps.git".
+   have a correspondingly configured GitHub account, you may also use
+   SSH access with the URL "git@github.com:lammps/lammps.git".
 
 The LAMMPS GitHub project is managed by Christoph Junghans (LANL,
 junghans at lanl.gov), Axel Kohlmeyer (Temple U, akohlmey at
 gmail.com) and Richard Berger (Temple U, richard.berger at
 temple.edu).
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/Install_linux.rst b/doc/src/Install_linux.rst
index e690afdd58..ec4f3fcc8e 100644
--- a/doc/src/Install_linux.rst
+++ b/doc/src/Install_linux.rst
@@ -8,13 +8,11 @@ Binaries are available for different versions of Linux:
 | :ref:`Pre-built EPEL Linux executables (RHEL, CentOS) <epel>`
 | :ref:`Pre-built OpenSuse Linux executables <opensuse>`
 | :ref:`Gentoo Linux executable <gentoo>`
-| :ref:`Arch Linux build-script <arch>` 
-| 
-
+| :ref:`Arch Linux build-script <arch>`
+|
 
 ----------
 
-
 .. _ubuntu:
 
 Pre-built Ubuntu Linux executables
@@ -29,42 +27,37 @@ operating system.
 To install the appropriate personal-package archive (PPA), do the
 following once:
 
+.. code-block:: bash
 
-.. parsed-literal::
-
-   sudo add-apt-repository ppa:gladky-anton/lammps
-   sudo apt-get update
+   $ sudo add-apt-repository ppa:gladky-anton/lammps
+   $ sudo apt-get update
 
 To install LAMMPS do the following once:
 
+.. code-block:: bash
 
-.. parsed-literal::
+   $ sudo apt-get install lammps-daily
 
-   sudo apt-get install lammps-daily
-
-This downloads an executable named "lmp\_daily" to your box, which
+This downloads an executable named "lmp_daily" to your box, which
 can then be used in the usual way to run input scripts:
 
+.. code-block:: bash
 
-.. parsed-literal::
-
-   lmp_daily -in in.lj
+   $ lmp_daily -in in.lj
 
 To update LAMMPS to the most current version, do the following:
 
+.. code-block:: bash
 
-.. parsed-literal::
-
-   sudo apt-get update
+   $ sudo apt-get update
 
 which will also update other packages on your system.
 
 To get a copy of the current documentation and examples:
 
+.. code-block:: bash
 
-.. parsed-literal::
-
-   sudo apt-get install lammps-daily-doc
+   $ sudo apt-get install lammps-daily-doc
 
 which will download the doc files in
 /usr/share/doc/lammps-daily-doc/doc and example problems in
@@ -75,26 +68,27 @@ files and auxiliary tools.
 
 To un-install LAMMPS, do the following:
 
+.. code-block:: bash
 
-.. parsed-literal::
-
-   sudo apt-get remove lammps-daily
+   $ sudo apt-get remove lammps-daily
 
 Note that the lammps-daily executable is built with the following
 sequence of make commands, as if you had done the same with the
 unpacked tarball files in the src directory:
 
-make yes-all; make no-lib; make openmpi
+.. code-block:: bash
+
+    $ make yes-all
+    $ make no-lib
+    $ make mpi
 
 Thus it builds with FFTW3 and OpenMPI.
 
 Thanks to Anton Gladky (gladky.anton at gmail.com) for setting up this
 Ubuntu package capability.
 
-
 ----------
 
-
 .. _fedora:
 
 Pre-built Fedora Linux executables
@@ -109,21 +103,20 @@ linking to the C library interface (lammps-devel, lammps-mpich-devel,
 lammps-openmpi-devel), the header for compiling programs using
 the C library interface (lammps-headers), and the LAMMPS python
 module for Python 3. All packages can be installed at the same
-time and the name of the LAMMPS executable is *lmp* and *lmp\_openmpi*
-or *lmp\_mpich* respectively.  By default, *lmp* will refer to the
+time and the name of the LAMMPS executable is *lmp* and *lmp_openmpi*
+or *lmp_mpich* respectively.  By default, *lmp* will refer to the
 serial executable, unless one of the MPI environment modules is loaded
-("module load mpi/mpich-x86\_64" or "module load mpi/openmpi-x86\_64").
+("module load mpi/mpich-x86_64" or "module load mpi/openmpi-x86_64").
 Then the corresponding parallel LAMMPS executable can be used.
 The same mechanism applies when loading the LAMMPS python module.
 
 To install LAMMPS with OpenMPI and run an input in.lj with 2 CPUs do:
 
+.. code-block:: bash
 
-.. parsed-literal::
-
-   dnf install lammps-openmpi
-   module load mpi/openmpi-x86_64
-   mpirun -np 2 lmp -in in.lj
+   $ dnf install lammps-openmpi
+   $ module load mpi/openmpi-x86_64
+   $ mpirun -np 2 lmp -in in.lj
 
 The "dnf install" command is needed only once. In case of a new LAMMPS
 stable release, "dnf update" will automatically update to the newer
@@ -132,21 +125,30 @@ mirrors. The "module load" command is needed once per (shell) session
 or shell terminal instance, unless it is automatically loaded from the
 shell profile.
 
+The LAMMPS binary is built with the :ref:`KIM package <kim>` which
+results in the above command also installing the `kim-api` binaries when LAMMPS
+is installed.  In order to use potentials from `openkim.org <openkim_>`_, you
+can install the `openkim-models` package
+
+.. code-block:: bash
+
+   $ dnf install openkim-models
+
 Please use "lmp -help" to see which compilation options, packages,
 and styles are included in the binary.
 
 Thanks to Christoph Junghans (LANL) for making LAMMPS available in Fedora.
 
+.. _openkim: https://openkim.org
 
 ----------
 
-
 .. _epel:
 
 Pre-built EPEL Linux executable
 ------------------------------------------
 
-Pre-built LAMMPS packages for stable releases are available
+Pre-built LAMMPS (and KIM) packages for stable releases are available
 in the `Extra Packages for Enterprise Linux (EPEL) repository <https://fedoraproject.org/wiki/EPEL>`_
 for use with Red Hat Enterprise Linux (RHEL) or CentOS version 7.x
 and compatible Linux distributions. Names of packages, executable,
@@ -159,10 +161,8 @@ and styles are included in the binary.
 
 Thanks to Christoph Junghans (LANL) for making LAMMPS available in EPEL.
 
-
 ----------
 
-
 .. _opensuse:
 
 Pre-built OpenSuse Linux executable
@@ -171,28 +171,33 @@ Pre-built OpenSuse Linux executable
 A pre-built LAMMPS package for stable releases is available
 in OpenSuse as of Leap 15.0. You can install the package with:
 
+.. code-block:: bash
 
-.. parsed-literal::
-
-   zypper install lammps
+   $ zypper install lammps
 
 This includes support for OpenMPI. The name of the LAMMPS executable
 is *lmp*\ . Thus to run an input in parallel on 2 CPUs you would do:
 
+.. code-block:: bash
 
-.. parsed-literal::
-
-   mpirun -np 2 lmp -in in.lj
+   $ mpirun -np 2 lmp -in in.lj
 
 Please use "lmp -help" to see which compilation options, packages,
 and styles are included in the binary.
 
+The LAMMPS binary is built with the :ref:`KIM package <kim>` which
+results in the above command also installing the `kim-api` binaries when LAMMPS
+is installed.  In order to use potentials from `openkim.org <openkim_>`_, you
+can install the `openkim-models` package
+
+.. code-block:: bash
+
+   $ zypper install openkim-models
+
 Thanks to Christoph Junghans (LANL) for making LAMMPS available in OpenSuse.
 
-
 ----------
 
-
 .. _gentoo:
 
 Gentoo Linux executable
@@ -201,8 +206,7 @@ Gentoo Linux executable
 LAMMPS is part of Gentoo's main package tree and can be installed by
 typing:
 
-
-.. parsed-literal::
+.. code-block:: bash
 
    % emerge --ask lammps
 
@@ -211,8 +215,7 @@ built on the your machine.
 
 Certain LAMMPS packages can be enable via USE flags, type
 
-
-.. parsed-literal::
+.. code-block:: bash
 
    % equery uses lammps
 
@@ -221,40 +224,32 @@ for details.
 Thanks to Nicolas Bock and Christoph Junghans (LANL) for setting up
 this Gentoo capability.
 
-
 ----------
 
-
 .. _arch:
 
 Archlinux build-script
 ---------------------------------
 
 LAMMPS is available via Arch's unofficial Arch User repository (AUR).
-
 There are three scripts available, named lammps, lammps-beta and lammps-git.
 They respectively package the stable, patch and git releases.
 
 To install, you will need to have the git package installed. You may use
 any of the above names in-place of lammps.
 
-
-.. parsed-literal::
+.. code-block:: bash
 
    $ git clone https://aur.archlinux.org/lammps.git
-
    $ cd lammps
-
    $ makepkg -s
-
-   # makepkg -i
+   $ makepkg -i
 
 To update, you may repeat the above, or change into the cloned directory,
 and execute the following, after which, if there are any changes, you may
 use makepkg as above.
 
-
-.. parsed-literal::
+.. code-block:: bash
 
    $ git pull
 
@@ -262,8 +257,3 @@ Alternatively, you may use an AUR helper to install these packages.
 
 Note that the AUR provides build-scripts that download the source and
 the build the package on your machine.
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/Install_mac.rst b/doc/src/Install_mac.rst
index cc8bbc9a92..41b53c0595 100644
--- a/doc/src/Install_mac.rst
+++ b/doc/src/Install_mac.rst
@@ -10,19 +10,17 @@ GPU, KOKKOS, LATTE, MSCG, MESSAGE, MPIIO POEMS VORONOI.
 After installing Homebrew, you can install LAMMPS on your system with
 the following commands:
 
-
-.. parsed-literal::
+.. code-block:: bash
 
    % brew install lammps
 
-This will install the executables "lammps\_serial" and "lammps\_mpi", as well as
+This will install the executables "lammps_serial" and "lammps_mpi", as well as
 the LAMMPS "doc", "potentials", "tools", "bench", and "examples" directories.
 
 Once LAMMPS is installed, you can test the installation with the
 Lennard-Jones benchmark file:
 
-
-.. parsed-literal::
+.. code-block:: bash
 
    % brew test lammps -v
 
@@ -31,8 +29,7 @@ results in Homebrew also installing the `kim-api` binaries when LAMMPS is
 installed.  In order to use potentials from `openkim.org <openkim_>`_, you can
 install the `openkim-models` package
 
-
-.. parsed-literal::
+.. code-block:: bash
 
    % brew install openkim-models
 
@@ -44,11 +41,4 @@ If you have problems with the installation you can post issues to
 Thanks to Derek Thomas (derekt at cello.t.u-tokyo.ac.jp) for setting
 up the Homebrew capability.
 
-
 .. _openkim: https://openkim.org
-
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/Install_patch.rst b/doc/src/Install_patch.rst
index 537d8ae4b9..3acd72753f 100644
--- a/doc/src/Install_patch.rst
+++ b/doc/src/Install_patch.rst
@@ -2,22 +2,22 @@ Applying patches
 ================
 
 It is easy to stay current with the most recent LAMMPS patch releases
-if you use Git or SVN to track LAMMPS development.  Instructions for
-how to stay current are on the :doc:`Install git <Install_git>` and
-:doc:`Install svn <Install_svn>` doc pages.
+if you use git to track the LAMMPS development.  Instructions for
+how to stay current are on the
+:doc:`Download the LAMMPS source with git <Install_git>` page.
 
 If you prefer to download a tarball, as described on the :doc:`Install git <Install_tarball>` doc page, you can stay current by
 downloading "patch files" when new patch releases are made.  A link to
-a patch file is posted on the `bug and feature page <http://lammps.sandia.gov/bug.html>`_ of the LAMMPS website, along
+a patch file is posted on the `bug and feature page <https://lammps.sandia.gov/bug.html>`_ of the LAMMPS website, along
 with a list of changed files and details about what is in the new patch
 release.  This page explains how to apply the patch file to your local
 LAMMPS directory.
 
 .. note::
 
-   You should not apply patch files to a local Git or SVN repo of
-   LAMMPS, only to an unpacked tarball.  Use Git and SVN commands to
-   update repo versions of LAMMPS.
+   You should not apply patch files to a local git checkout of
+   LAMMPS, only to an unpacked tarball.  Use git commands to
+   update such a version of the LAMMPS source code.
 
 Here are the steps to apply a patch file.  Note that if your version
 of LAMMPS is several patch releases behind, you need to apply all the
@@ -32,10 +32,10 @@ up to date.
 * Apply the patch by typing the following command from your top-level
   LAMMPS directory, where the redirected file is the name of the patch
   file.
-  
-  .. parsed-literal::
-  
-     patch -bp1 < patch.12Dec16
+
+  .. code-block:: bash
+
+     $ patch -bp1 < patch.12Dec16
 
 * A list of updated files print out to the screen.  The -b switch
   creates backup files of your originals (e.g. src/force.cpp.orig), so
@@ -46,23 +46,18 @@ up to date.
   successively, you only need to type this once at the end. The purge
   command removes deprecated src files if any were removed by the patch
   from package sub-directories.
-  
-  .. parsed-literal::
-  
-     make purge
-     make package-update
+
+  .. code-block:: bash
+
+     $ make purge
+     $ make package-update
 
 * Re-build LAMMPS via the "make" command.
 
 .. warning::
 
-   If you wish to edit/change a src file that is from a
-   package, you should edit the version of the file inside the package
-   sub-dir of src, then re-install the package.  The version in the src
-   dir is merely a copy and will be wiped out if you type "make
-   package-update".
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
+   If you wish to edit/change a source file that is part of a package,
+   you should edit the version of the file inside the package folder in
+   src, and then re-install or update the package.  The version in the
+   src directory is merely a copy and will be wiped out when you type
+   "make package-update".
diff --git a/doc/src/Install_svn.rst b/doc/src/Install_svn.rst
deleted file mode 100644
index 097caf5cce..0000000000
--- a/doc/src/Install_svn.rst
+++ /dev/null
@@ -1,102 +0,0 @@
-Download source via SVN
-=======================
-
-.. warning::
-
-   As of Oct 2016, SVN support is now implemented via a
-   git-to-subversion interface service on GitHub and no longer through a
-   mirror of the internal SVN repository at Sandia.
-
-You must have the `Subversion (SVN) client software <svn_>`_ installed on
-your system to communicate with the Git server in this mode.
-
-.. _svn: http://subversion.apache.org
-
-
-
-You can follow LAMMPS development on 3 different SVN branches:
-
-* **stable**   :  this branch is updated with every stable release
-* **unstable** :  this branch is updated with every patch release
-* **master**   :  this branch continuously follows ongoing development
-
-The corresponding command lines to do an initial checkout are as
-follows.  (Note that unlike Git, you must perform a separate checkout
-into a unique directory for each of the 3 branches.)
-
-
-.. parsed-literal::
-
-   svn checkout https://github.com/lammps/lammps.git/branches/unstable mylammps
-   svn checkout https://github.com/lammps/lammps.git/branches/stable mylammps
-   svn checkout https://github.com/lammps/lammps.git/trunk mylammps
-
-where "mylammps" is the name of the directory you wish to create on
-your machine.
-
-Once the command completes, your directory will contain the same files
-as if you unpacked a current LAMMPS tarball, with the exception, that
-the HTML documentation files are not included.  They can be fetched
-from the LAMMPS website by typing "make fetch" in the doc directory.
-Or they can be generated from the content provided in doc/src by
-typing "make html" from the doc directory.
-
-After initial checkout, as bug fixes and new features are added to
-LAMMPS, as listed on :doc:`this page <Errors_bugs>`, you can stay
-up-to-date by typing the following SVN commands from within the
-"mylammps" directory:
-
-
-.. parsed-literal::
-
-   svn update
-
-You can also check if there are any updates by typing:
-
-
-.. parsed-literal::
-
-   svn -qu status
-
-Doing an "update" will not change any files you have added to the
-LAMMPS directory structure.  It will also not change any existing
-LAMMPS files you have edited, unless those files have changed in the
-repository.  In that case, SVN will attempt to merge the new
-repository file with your version of the file and tell you if there
-are any conflicts.  See the SVN documentation for details.
-
-Please refer to the `subversion client support help pages on GitHub <https://help.github.com/articles/support-for-subversion-clients>`_
-if you want to use advanced features like accessing particular
-previous release versions via tags.
-
-Once you have updated your local files with an "svn update" (or "svn
-co"), you still need to re-build LAMMPS if any source files have
-changed.  To do this, you should cd to the src directory and type:
-
-
-.. parsed-literal::
-
-   make purge             # remove any deprecated src files
-   make package-update    # sync package files with src files
-   make foo               # re-build for your machine (mpi, serial, etc)
-
-just as described on the :doc:`Install patch <Install_patch>` doc page,
-after a patch has been installed.
-
-.. warning::
-
-   If you wish to edit/change a src file that is from a
-   package, you should edit the version of the file inside the package
-   sub-directory with src, then re-install the package.  The version in
-   the src dir is merely a copy and will be wiped out if you type "make
-   package-update".
-
-The LAMMPS GitHub project is managed by Christoph Junghans (LANL,
-junghans at lanl.gov), Axel Kohlmeyer (Temple U, akohlmey at
-gmail.com) and Richard Berger (Temple U, richard.berger at
-temple.edu).
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/Install_tarball.rst b/doc/src/Install_tarball.rst
index 37db83157a..d80fc14f76 100644
--- a/doc/src/Install_tarball.rst
+++ b/doc/src/Install_tarball.rst
@@ -4,17 +4,10 @@ Download source and documentation as a tarball
 You can download a current LAMMPS tarball from the `download page <download_>`_
 of the `LAMMPS website <lws_>`_.
 
-.. _download: http://lammps.sandia.gov/download.html
-
-
-
-.. _bug: http://lammps.sandia.gov/bug.html
-
-
-
-.. _older: http://lammps.sandia.gov/tars
-
-
+.. _download: https://lammps.sandia.gov/download.html
+.. _bug: https://lammps.sandia.gov/bug.html
+.. _older: https://lammps.sandia.gov/tars
+.. _lws: https://lammps.sandia.gov
 
 You have two choices of tarballs, either the most recent stable
 release or the most current patch release.  Stable releases occur a
@@ -31,27 +24,23 @@ Older versions of LAMMPS can also be downloaded from `this page <older_>`_.
 Once you have a tarball, unzip and untar it with the following
 command:
 
+.. code-block:: bash
 
-.. parsed-literal::
-
-   tar -xzvf lammps\*.tar.gz
+   $ tar -xzvf lammps*.tar.gz
 
 This will create a LAMMPS directory with the version date
 in its name, e.g. lammps-23Jun18.
 
-
 ----------
 
-
 You can also download a zip file via the "Clone or download" button on
 the `LAMMPS GitHub site <git_>`_.  The file name will be lammps-master.zip
 which can be unzipped with the following command, to create
 a lammps-master dir:
 
+.. code-block:: bash
 
-.. parsed-literal::
-
-   unzip lammps\*.zip
+   $ unzip lammps*.zip
 
 This version is the most up-to-date LAMMPS development version.  It
 will have the date of the most recent patch release (see the file
@@ -61,12 +50,8 @@ the next patch release tarball.
 
 .. _git: https://github.com/lammps/lammps
 
-
-
-
 ----------
 
-
 If you download a current LAMMPS tarball, one way to stay current as
 new patch tarballs are released, is to download a patch file which you
 can apply to your local directory to update it for each new patch
@@ -77,8 +62,3 @@ The patch files are posted on the `bug and feature page <bug_>`_ of the
 website, along with a list of changed files and details about what is
 in the new patch release.  Instructions for applying a patch file are
 on the :doc:`Install patch <Install_patch>` doc page.
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/Install_windows.rst b/doc/src/Install_windows.rst
index aed6d935c2..548f67e484 100644
--- a/doc/src/Install_windows.rst
+++ b/doc/src/Install_windows.rst
@@ -4,7 +4,9 @@ Download an executable for Windows
 Pre-compiled Windows installers which install LAMMPS executables on a
 Windows system can be downloaded from this site:
 
-`http://packages.lammps.org/windows.html <http://packages.lammps.org/windows.html>`_
+.. parsed-literal::
+
+  `http://packages.lammps.org/windows.html <http://packages.lammps.org/windows.html>`_
 
 Note that each installer package has a date in its name, which
 corresponds to the LAMMPS version of the same date.  Installers for
@@ -26,7 +28,7 @@ When you download the installer package, you run it on your Windows
 machine.  It will then prompt you with a dialog, where you can choose
 the installation directory, unpack and copy several executables,
 potential files, documentation pdfs, selected example files, etc.  It
-will then update a few system settings (e.g. PATH, LAMMPS\_POTENTIALS)
+will then update a few system settings (e.g. PATH, LAMMPS_POTENTIALS)
 and add an entry into the Start Menu (with references to the
 documentation, LAMMPS homepage and more).  From that menu, there is
 also a link to an uninstaller that removes the files and undoes the
@@ -42,8 +44,3 @@ automatically, so this should only be done for debugging purposes.
 
 Thanks to Axel Kohlmeyer (Temple U, akohlmey at gmail.com) for setting
 up this Windows capability.
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/Intro.rst b/doc/src/Intro.rst
index 218dd4653a..6d388aa87e 100644
--- a/doc/src/Intro.rst
+++ b/doc/src/Intro.rst
@@ -3,7 +3,6 @@ Introduction
 
 These pages provide a brief introduction to LAMMPS.
 
-
 .. toctree::
    :maxdepth: 1
 
@@ -14,8 +13,3 @@ These pages provide a brief introduction to LAMMPS.
    Intro_opensource
    Intro_authors
    Intro_website
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/Intro_authors.rst b/doc/src/Intro_authors.rst
index 26a6f6846e..fbf306a295 100644
--- a/doc/src/Intro_authors.rst
+++ b/doc/src/Intro_authors.rst
@@ -11,25 +11,20 @@ University:
 * Richard Berger, richard.berger at temple.edu
 
 .. _sjp: http://www.cs.sandia.gov/~sjplimp
-
-
+.. _lws: https://lammps.sandia.gov
 
 Past developers include Paul Crozier and Mark Stevens, both at Sandia,
 and Ray Shan, now at Materials Design.
 
-
 ----------
 
-
-The `Authors page <http://lammps.sandia.gov/authors.html>`_ of the
+The `Authors page <https://lammps.sandia.gov/authors.html>`_ of the
 `LAMMPS website <lws_>`_ has a comprehensive list of all the individuals
 who have contributed code for a new feature or command or tool to
 LAMMPS.
 
-
 ----------
 
-
 The following folks deserve special recognition.  Many of the packages
 they have written are unique for an MD code and LAMMPS would not be as
 general-purpose as it is without their expertise and efforts.
@@ -49,11 +44,9 @@ general-purpose as it is without their expertise and efforts.
 * Ilya Valuev (JIHT), USER-AWPMD package for wave packet MD
 * Greg Wagner (Northwestern U), MEAM package for MEAM potential
 
-
 ----------
 
-
-As discussed on the `History page <http://lammps.sandia.gov/history.html>`_ of the website, LAMMPS
+As discussed on the `History page <https://lammps.sandia.gov/history.html>`_ of the website, LAMMPS
 originated as a cooperative project between DOE labs and industrial
 partners.  Folks involved in the design and testing of the original
 version of LAMMPS were the following:
@@ -62,8 +55,3 @@ version of LAMMPS were the following:
 * Terry Stouch (Lexicon Pharmaceuticals, formerly at Bristol Myers Squibb)
 * Steve Lustig (Dupont)
 * Jim Belak and Roy Pollock (LLNL)
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/Intro_features.rst b/doc/src/Intro_features.rst
index d8dd0a0531..cff198da70 100644
--- a/doc/src/Intro_features.rst
+++ b/doc/src/Intro_features.rst
@@ -4,22 +4,20 @@ LAMMPS features
 LAMMPS is a classical molecular dynamics (MD) code with these general
 classes of functionality:
 
-* :ref:`General features <general>`
-* :ref:`Particle and model types <particle>`
-* :ref:`Interatomic potentials (force fields) <ff>`
-* :ref:`Atom creation <create>`
-* :ref:`Ensembles, constraints, and boundary conditions <ensemble>`
-* :ref:`Integrators <integrate>`
-* :ref:`Diagnostics <diag>`
-* :ref:`Output <output>`
-* :ref:`Multi-replica models <replica1>`
-* :ref:`Pre- and post-processing <prepost>`
-* :ref:`Specialized features (beyond MD itself) <special>`
-
+1. :ref:`General features <general>`
+2. :ref:`Particle and model types <particle>`
+3. :ref:`Interatomic potentials (force fields) <ff>`
+4. :ref:`Atom creation <create>`
+5. :ref:`Ensembles, constraints, and boundary conditions <ensemble>`
+6. :ref:`Integrators <integrate>`
+7. :ref:`Diagnostics <diag>`
+8. :ref:`Output <output>`
+9. :ref:`Multi-replica models <replica1>`
+10. :ref:`Pre- and post-processing <prepost>`
+11. :ref:`Specialized features (beyond MD itself) <special>`
 
 ----------
 
-
 .. _general:
 
 General features
@@ -87,7 +85,7 @@ commands)
 * water potentials: TIP3P, TIP4P, SPC
 * implicit solvent potentials: hydrodynamic lubrication, Debye
 * force-field compatibility with common CHARMM, AMBER, DREIDING,     OPLS, GROMACS, COMPASS options
-* access to the `OpenKIM Repository <http://openkim.org>`_ of potentials via     :doc:`kim\_init, kim\_interactions, and kim\_query <kim_commands>` commands
+* access to the `OpenKIM Repository <http://openkim.org>`_ of potentials via     :doc:`kim_init, kim_interactions, and kim_query <kim_commands>` commands
 * hybrid potentials: multiple pair, bond, angle, dihedral, improper     potentials can be used in one simulation
 * overlaid potentials: superposition of multiple pair potentials
 
@@ -189,14 +187,10 @@ Pre- and post-processing
   plotting, and visualization for LAMMPS simulations.  Pizza.py is
   written in `Python <python_>`_ and is available for download from `the Pizza.py WWW site <pizza_>`_.
 
-.. _pizza: http://www.sandia.gov/~sjplimp/pizza.html
-
-
+.. _pizza: https://pizza.sandia.gov
 
 .. _python: http://www.python.org
 
-
-
 .. _special:
 
 Specialized features
@@ -224,8 +218,3 @@ classical MD options:
 * :doc:`Lattice Boltzmann fluid <fix_lb_fluid>`
 * :doc:`targeted <fix_tmd>` and :doc:`steered <fix_smd>` molecular dynamics
 * :doc:`two-temperature electron model <fix_ttm>`
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/Intro_nonfeatures.rst b/doc/src/Intro_nonfeatures.rst
index 9c09eb0466..feb35c7198 100644
--- a/doc/src/Intro_nonfeatures.rst
+++ b/doc/src/Intro_nonfeatures.rst
@@ -14,8 +14,8 @@ Specifically, LAMMPS was not conceived and designed for:
 * visualize your MD simulation interactively
 * plot your output data
 
-Although over the years these limitations have been somewhat
-reduced through features added to LAMMPS or external tools
+Over the years some of these limitations have been reduced or
+removed, through features added to LAMMPS or external tools
 that either closely interface with LAMMPS or extend LAMMPS.
 
 Here are suggestions on how to perform these tasks:
@@ -66,7 +66,7 @@ Here are suggestions on how to perform these tasks:
   on-the-fly via its :doc:`dump image <dump_image>` command and pass
   them to an external program, `FFmpeg <https://www.ffmpeg.org>`_ to generate
   movies from them.  For high-quality, interactive visualization there are
-  many excellent and free tools available.  See the `Other Codes page <http://lammps.sandia.gov/viz.html>`_ page of the LAMMPS website for
+  many excellent and free tools available.  See the `Other Codes page <https://lammps.sandia.gov/viz.html>`_ page of the LAMMPS website for
   visualization packages that can use LAMMPS output data.
 * **Plotting:** See the next bullet about Pizza.py as well as the
   :doc:`Python <Python_head>` doc page for examples of plotting LAMMPS
@@ -75,13 +75,8 @@ Here are suggestions on how to perform these tasks:
   it easier to analyze and plot.  See the :doc:`Tools <Tools>` doc page
   for more discussion of the various tools.
 * **Pizza.py:** Our group has also written a separate toolkit called
-  `Pizza.py <http://pizza.sandia.gov>`_ which can do certain kinds of
+  `Pizza.py <https://pizza.sandia.gov>`_ which can do certain kinds of
   setup, analysis, plotting, and visualization (via OpenGL) for LAMMPS
   simulations.  It thus provides some functionality for several of the
   above bullets.  Pizza.py is written in `Python <http://www.python.org>`_
   and is available for download from `this page <http://www.cs.sandia.gov/~sjplimp/download.html>`_.
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/Intro_opensource.rst b/doc/src/Intro_opensource.rst
index 211e812eaa..2fd692c304 100644
--- a/doc/src/Intro_opensource.rst
+++ b/doc/src/Intro_opensource.rst
@@ -15,16 +15,10 @@ distribution.
 
 .. _gnu: http://www.gnu.org/copyleft/gpl.html
 
-
-
 .. _gnuorg: http://www.gnu.org
 
-
-
 .. _opensource: http://www.opensource.org
 
-
-
 Here is a summary of what the GPL means for LAMMPS users:
 
 (1) Anyone is free to use, modify, or extend LAMMPS in any way they
@@ -42,8 +36,3 @@ of the GPL.
 (4) If you give LAMMPS files to someone else, the GPL LICENSE file and
 source file headers (including the copyright and GPL notices) should
 remain part of the code.
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/Intro_overview.rst b/doc/src/Intro_overview.rst
index a97adc8235..776002354a 100644
--- a/doc/src/Intro_overview.rst
+++ b/doc/src/Intro_overview.rst
@@ -16,11 +16,10 @@ shared-memory boxes and distributed-memory clusters and
 supercomputers.
 
 .. _mpi: http://www-unix.mcs.anl.gov/mpi
-
-
+.. _lws: https://lammps.sandia.gov
 
 LAMMPS is written in C++.  Earlier versions were written in F77 and
-F90.  See the `History page <http://lammps.sandia.gov/history.html>`_ of
+F90.  See the `History page <https://lammps.sandia.gov/history.html>`_ of
 the website for details.  All versions can be downloaded from the
 `LAMMPS website <lws_>`_.
 
@@ -47,8 +46,3 @@ partition the simulation domain into small sub-domains of equal
 computational cost, one of which is assigned to each processor.
 Processors communicate and store "ghost" atom information for atoms
 that border their sub-domain.
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/Intro_website.rst b/doc/src/Intro_website.rst
index 6adbd05e8c..0999e90907 100644
--- a/doc/src/Intro_website.rst
+++ b/doc/src/Intro_website.rst
@@ -5,35 +5,32 @@ The `LAMMPS website <lws_>`_ has a variety of additional info about
 LAMMPS, beyond what is in this manual.  Some of the other pages in
 this Intr are included in this list.
 
-* `Brief intro and recently added significant features <lws_>`_
-* `List of features <http://lammps.sandia.gov/features.html>`_
-* `List of non-features <http://lammps.sandia.gov/non_features.html>`_
-* `Recent bug fixes and new features <http://lammps.sandia.gov/bug.html>`_
+.. _lws: https://lammps.sandia.gov
 
-* `Download info <http://lammps.sandia.gov/download.html>`_
+* `Brief intro and recently added significant features <lws_>`_
+* `List of features <https://lammps.sandia.gov/features.html>`_
+* `List of non-features <https://lammps.sandia.gov/non_features.html>`_
+* `Recent bug fixes and new features <https://lammps.sandia.gov/bug.html>`_
+
+* `Download info <https://lammps.sandia.gov/download.html>`_
 * `GitHub site <https://github.com/lammps/lammps>`_
 * `SourceForge site <https://sourceforge.net/projects/lammps>`_
-* `LAMMPS open-source license <http://lammps.sandia.gov/open_source.html>`_
+* `LAMMPS open-source license <https://lammps.sandia.gov/open_source.html>`_
 
-* `Glossary of MD terms relevant to LAMMPS <http://lammps.sandia.gov/glossary.html>`_
-* `LAMMPS highlights with images <http://lammps.sandia.gov/pictures.html>`_
-* `LAMMPS highlights with movies <http://lammps.sandia.gov/movies.html>`_
-* `Mail list <http://lammps.sandia.gov/mail.html>`_
-* `Workshops <http://lammps.sandia.gov/workshops.html>`_
-* `Tutorials <http://lammps.sandia.gov/tutorials.html>`_
-* `Developer guide <http://lammps.sandia.gov/Developer.pdf>`_
+* `Glossary of MD terms relevant to LAMMPS <https://lammps.sandia.gov/glossary.html>`_
+* `LAMMPS highlights with images <https://lammps.sandia.gov/pictures.html>`_
+* `LAMMPS highlights with movies <https://lammps.sandia.gov/movies.html>`_
+* `Mail list <https://lammps.sandia.gov/mail.html>`_
+* `Workshops <https://lammps.sandia.gov/workshops.html>`_
+* `Tutorials <https://lammps.sandia.gov/tutorials.html>`_
+* `Developer guide <https://lammps.sandia.gov/Developer.pdf>`_
 
-* `Pre- and post-processing tools for LAMMPS <http://lammps.sandia.gov/prepost.html>`_
-* `Other software usable with LAMMPS <http://lammps.sandia.gov/offsite.html>`_
-* `Viz tools usable with LAMMPS <http://lammps.sandia.gov/viz.html>`_
+* `Pre- and post-processing tools for LAMMPS <https://lammps.sandia.gov/prepost.html>`_
+* `Other software usable with LAMMPS <https://lammps.sandia.gov/offsite.html>`_
+* `Viz tools usable with LAMMPS <https://lammps.sandia.gov/viz.html>`_
 
-* `Benchmark performance <http://lammps.sandia.gov/bench.html>`_
-* `Publications that have cited LAMMPS <http://lammps.sandia.gov/papers.html>`_
-* `Authors of LAMMPS <http://lammps.sandia.gov/authors.html>`_
-* `History of LAMMPS development <http://lammps.sandia.gov/history.html>`_
-* `Funding for LAMMPS <http://lammps.sandia.gov/funding.html>`_
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
+* `Benchmark performance <https://lammps.sandia.gov/bench.html>`_
+* `Publications that have cited LAMMPS <https://lammps.sandia.gov/papers.html>`_
+* `Authors of LAMMPS <https://lammps.sandia.gov/authors.html>`_
+* `History of LAMMPS development <https://lammps.sandia.gov/history.html>`_
+* `Funding for LAMMPS <https://lammps.sandia.gov/funding.html>`_
diff --git a/doc/src/JPG/dynamical_matrix_dynmat.jpg b/doc/src/JPG/dynamical_matrix_dynmat.jpg
deleted file mode 100644
index 6c6adae72c..0000000000
Binary files a/doc/src/JPG/dynamical_matrix_dynmat.jpg and /dev/null differ
diff --git a/doc/src/JPG/dynamical_matrix_force_constant.jpg b/doc/src/JPG/dynamical_matrix_force_constant.jpg
deleted file mode 100644
index e1a0e50d14..0000000000
Binary files a/doc/src/JPG/dynamical_matrix_force_constant.jpg and /dev/null differ
diff --git a/doc/src/Eqs/fix_integration_spin_stdecomposition.jpg b/doc/src/JPG/fix_integration_spin_stdecomposition.jpg
similarity index 100%
rename from doc/src/Eqs/fix_integration_spin_stdecomposition.jpg
rename to doc/src/JPG/fix_integration_spin_stdecomposition.jpg
diff --git a/doc/src/JPG/lammps-logo.png b/doc/src/JPG/lammps-logo.png
index ae5ba2d8ad..438723b7f7 100644
Binary files a/doc/src/JPG/lammps-logo.png and b/doc/src/JPG/lammps-logo.png differ
diff --git a/doc/src/Manual.rst b/doc/src/Manual.rst
index dd67a13427..a9afb122ad 100644
--- a/doc/src/Manual.rst
+++ b/doc/src/Manual.rst
@@ -18,27 +18,24 @@ LAMMPS is an open-source code, distributed freely under the terms of
 the GNU Public License (GPL).
 
 The `LAMMPS website <lws_>`_ has a variety of information about the code.
-It includes links to an on-line version of this manual, a `mailing list <http://lammps.sandia.gov/mail.html>`_ where users can post
+It includes links to an on-line version of this manual, a `mailing list <https://lammps.sandia.gov/mail.html>`_ where users can post
 questions, and a `GitHub site <https://github.com/lammps/lammps>`_ where
 all LAMMPS development is coordinated.
 
-
 ----------
 
-
 The content for this manual is part of the LAMMPS distribution.  You
 can build a local copy of the Manual as HTML pages or a PDF file, by
 following the steps on the :doc:`Manual build <Manual_build>` doc page.
 There is also a `Developer.pdf <Developer.pdf>`_ document which gives
 a brief description of the basic code structure of LAMMPS.
 
-
 ----------
 
-
 Once you are familiar with LAMMPS, you may want to bookmark :doc:`this page <Commands>` since it gives quick access to a doc page for
 every LAMMPS command.
 
+.. _lws: https://lammps.sandia.gov
 
 .. toctree::
    :maxdepth: 2
@@ -75,18 +72,10 @@ every LAMMPS command.
    angles
    dihedrals
    impropers
+   fix_modify_atc_commands
 
 Indices and tables
 ==================
 
 * :ref:`genindex`
 * :ref:`search`
-
-.. raw:: html
-
-   </BODY>
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/Manual_build.rst b/doc/src/Manual_build.rst
index c1cd1aabb9..5d5b749678 100644
--- a/doc/src/Manual_build.rst
+++ b/doc/src/Manual_build.rst
@@ -1,68 +1,76 @@
 Building the LAMMPS manual
 **************************
 
-Depending on how you obtained LAMMPS, the doc directory has 2 or 3
-sub-directories and optionally 2 PDF files and 2 e-book format files:
+Depending on how you obtained LAMMPS, the doc directory has up
+to 6 sub-directories, 2 Nroff files, and optionally 2 PDF files
+plus 2 e-book format files:
 
-
-.. parsed-literal::
+.. code-block:: bash
 
    src             # content files for LAMMPS documentation
    html            # HTML version of the LAMMPS manual (see html/Manual.html)
-   tools           # tools and settings for building the documentation
+   utils           # tools and settings for building the documentation
+   docenv          # virtualenv for processing the manual sources
+   doctrees        # temporary data from processing the manual
+   mathjax         # code and fonts for rendering math in html
    Manual.pdf      # large PDF version of entire manual
    Developer.pdf   # small PDF with info about how LAMMPS is structured
    LAMMPS.epub     # Manual in ePUB e-book format
    LAMMPS.mobi     # Manual in MOBI e-book format
+   lammps.1        # man page for the lammps command
+   msi2lmp.1       # man page for the msi2lmp command
 
-If you downloaded LAMMPS as a tarball from the web site, all these
-directories and files should be included.
+If you downloaded LAMMPS as a tarball from the web site, the html folder
+and the PDF files should be included.
 
-If you downloaded LAMMPS from the public SVN or Git repositories, then
-the HTML and PDF files are not included.  Instead you need to create
-them, in one of two ways:
+If you downloaded LAMMPS from the public git repository, then the HTML
+and PDF files are not included.  Instead you need to create them, in one
+of two ways:
 
-a. You can "fetch" the current HTML and PDF files from the LAMMPS web site.
-   Just type "make fetch".  This should create a html\_www dir and
-   Manual\_www.pdf/Developer\_www.pdf files.  Note that if new LAMMPS features
-   have been added more recently than the date of your version, the fetched
-   documentation will include those changes (but your source code will not, unless
-   you update your local repository).
+a. You can "fetch" the current HTML and PDF files from the LAMMPS web
+   site.  Just type "make fetch".  This should download a html_www
+   directory and Manual_www.pdf/Developer_www.pdf files.  Note that if
+   new LAMMPS features have been added more recently than the date of
+   your LAMMPS version, the fetched documentation will include those
+   changes (but your source code will not, unless you update your local
+   repository).
 
-b. You can build the HTML and PDF files yourself, by typing "make
-   html" followed by "make pdf".  Note that the PDF make requires the
-   HTML files already exist.  This requires various tools including
-   Sphinx, which the build process will attempt to download and install
-   on your system, if not already available.  See more details below.
+b. You can build the HTML or PDF files yourself, by typing "make html"
+   or "make pdf".  This requires various tools including Sphinx, git,
+   and the MathJax javascript library, which the build process will attempt
+   to download automatically into a virtual environment in the folder
+   doc/docenv and the folder mathjax, respectively, if not already available.
+   This download is required only once, unless you type "make clean-all".
+   After that, viewing and  processing of the documentation can be done
+   without internet access.  To generate the PDF version of the manual,
+   the PDFLaTeX software and several LaTeX packages are required as well.
+   However, those cannot be installed automatically at the moment.
 
 ----------
 
-
 The generation of all documentation is managed by the Makefile in
-the doc dir.
-
+the doc directory.
 
 .. code-block:: bash
 
    Documentation Build Options:
 
-   make html         # generate HTML in html dir using Sphinx
-   make pdf          # generate 2 PDF files (Manual.pdf,Developer.pdf)
-                     #   in doc dir via htmldoc and pdflatex
-   make fetch        # fetch HTML doc pages and 2 PDF files from web site
-                     #   as a tarball and unpack into html dir and 2 PDFs
-   make epub         # generate LAMMPS.epub in ePUB format using Sphinx
-   make mobi         # generate LAMMPS.mobi in MOBI format using ebook-convert
-   make clean        # remove intermediate RST files created by HTML build
-   make clean-all    # remove entire build folder and any cached data
-   make anchor_check # check for duplicate anchor labels
-   style_check       # check for complete and consistent style lists
-   make spelling     # spell-check the manual
-
+   make html          # generate HTML in html dir using Sphinx
+   make pdf           # generate 2 PDF files (Manual.pdf,Developer.pdf)
+                      #   in doc dir via htmldoc and pdflatex
+   make fetch         # fetch HTML doc pages and 2 PDF files from web site
+                      #   as a tarball and unpack into html dir and 2 PDFs
+   make epub          # generate LAMMPS.epub in ePUB format using Sphinx
+   make mobi          # generate LAMMPS.mobi in MOBI format using ebook-convert
+   make clean         # remove intermediate RST files created by HTML build
+   make clean-all     # remove entire build folder and any cached data
+   make anchor_check  # check for duplicate anchor labels
+   make style_check   # check for complete and consistent style lists
+   make package_check # check for complete and consistent package lists
+   make spelling      # spell-check the manual
 
 ----------
 
-
 Installing prerequisites for HTML build
 =======================================
 
@@ -72,7 +80,6 @@ have to be installed.  Here are instructions for common setups:
 Ubuntu
 ------
 
-
 .. code-block:: bash
 
    sudo apt-get install python-virtualenv
@@ -80,7 +87,6 @@ Ubuntu
 Fedora (up to version 21) and Red Hat Enterprise Linux or CentOS (up to version 7.x)
 ------------------------------------------------------------------------------------
 
-
 .. code-block:: bash
 
    sudo yum install python3-virtualenv
@@ -88,7 +94,6 @@ Fedora (up to version 21) and Red Hat Enterprise Linux or CentOS (up to version
 Fedora (since version 22)
 -------------------------
 
-
 .. code-block:: bash
 
    sudo dnf install python3-virtualenv
@@ -109,33 +114,28 @@ virtualenv
 
 Once Python 3 is installed, open a Terminal and type
 
-
 .. code-block:: bash
 
    pip3 install virtualenv
 
 This will install virtualenv from the Python Package Index.
 
-
 ----------
 
-
 Installing prerequisites for epub build
 =======================================
 
 ePUB
 ----
 
-Same as for HTML. This uses the same tools and configuration
-files as the HTML tree.
+Same as for HTML. This uses mostly the same tools and configuration
+files as the HTML tree. In addition it uses LaTeX to convert embedded
+math expressions transparently into embedded images.
 
 For converting the generated ePUB file to a MOBI format file
-(for e-book readers like Kindle, that cannot read ePUB), you
+(for e-book readers, like Kindle, that cannot read ePUB), you
 also need to have the 'ebook-convert' tool from the "calibre"
 software installed. `http://calibre-ebook.com/ <http://calibre-ebook.com/>`_
 You first create the ePUB file and then convert it with 'make mobi'
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
+On the Kindle readers in particular, you also have support for
+PDF files, so you could download and view the PDF version as an alternative.
diff --git a/doc/src/Manual_version.rst b/doc/src/Manual_version.rst
index ca3819aed8..a9a395a14d 100644
--- a/doc/src/Manual_version.rst
+++ b/doc/src/Manual_version.rst
@@ -5,7 +5,7 @@ The LAMMPS "version" is the date when it was released, such as 1 May
 2014. LAMMPS is updated continuously.  Whenever we fix a bug or add a
 feature, we release it in the next *patch* release, which are
 typically made every couple of weeks.  Info on patch releases are on
-`this website page <http://lammps.sandia.gov/bug.html>`_. Every few
+`this website page <https://lammps.sandia.gov/bug.html>`_. Every few
 months, the latest patch release is subjected to more thorough testing
 and labeled as a *stable* version.
 
@@ -21,8 +21,3 @@ first page of the :doc:`manual <Manual>`.
   describe the most current patch release of LAMMPS.
 * If you browse the HTML doc pages included in your tarball, they
   describe the version you have, which may be older.
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/Modify.rst b/doc/src/Modify.rst
index f875084d50..531fb6b1f3 100644
--- a/doc/src/Modify.rst
+++ b/doc/src/Modify.rst
@@ -10,7 +10,6 @@ If you add a new feature to LAMMPS and think it will be of interest to
 general users, we encourage you to submit it for inclusion in LAMMPS
 as a pull request on our `GitHub site <https://github.com/lammps/lammps>`_, after reading the :doc:`Modify contribute <Modify_contribute>` doc page.
 
-
 .. toctree::
    :maxdepth: 1
 
@@ -33,8 +32,3 @@ as a pull request on our `GitHub site <https://github.com/lammps/lammps>`_, afte
    Modify_body
    Modify_thermo
    Modify_variable
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/Modify_atom.rst b/doc/src/Modify_atom.rst
index d44a805161..f863da3157 100644
--- a/doc/src/Modify_atom.rst
+++ b/doc/src/Modify_atom.rst
@@ -8,78 +8,78 @@ style can be created if one of the existing atom styles does not
 define all the attributes you need to store and communicate with
 atoms.
 
-Atom\_vec\_atomic.cpp is a simple example of an atom style.
+Atom_vec_atomic.cpp is a simple example of an atom style.
 
 Here is a brief description of methods you define in your new derived
-class.  See atom\_vec.h for details.
+class.  See atom_vec.h for details.
 
 +-------------------------+--------------------------------------------------------------------------------+
 | init                    | one time setup (optional)                                                      |
 +-------------------------+--------------------------------------------------------------------------------+
 | grow                    | re-allocate atom arrays to longer lengths (required)                           |
 +-------------------------+--------------------------------------------------------------------------------+
-| grow\_reset             | make array pointers in Atom and AtomVec classes consistent (required)          |
+| grow_reset              | make array pointers in Atom and AtomVec classes consistent (required)          |
 +-------------------------+--------------------------------------------------------------------------------+
 | copy                    | copy info for one atom to another atom's array locations (required)            |
 +-------------------------+--------------------------------------------------------------------------------+
-| pack\_comm              | store an atom's info in a buffer communicated every timestep (required)        |
+| pack_comm               | store an atom's info in a buffer communicated every timestep (required)        |
 +-------------------------+--------------------------------------------------------------------------------+
-| pack\_comm\_vel         | add velocity info to communication buffer (required)                           |
+| pack_comm_vel           | add velocity info to communication buffer (required)                           |
 +-------------------------+--------------------------------------------------------------------------------+
-| pack\_comm\_hybrid      | store extra info unique to this atom style (optional)                          |
+| pack_comm_hybrid        | store extra info unique to this atom style (optional)                          |
 +-------------------------+--------------------------------------------------------------------------------+
-| unpack\_comm            | retrieve an atom's info from the buffer (required)                             |
+| unpack_comm             | retrieve an atom's info from the buffer (required)                             |
 +-------------------------+--------------------------------------------------------------------------------+
-| unpack\_comm\_vel       | also retrieve velocity info (required)                                         |
+| unpack_comm_vel         | also retrieve velocity info (required)                                         |
 +-------------------------+--------------------------------------------------------------------------------+
-| unpack\_comm\_hybrid    | retrieve extra info unique to this atom style (optional)                       |
+| unpack_comm_hybrid      | retrieve extra info unique to this atom style (optional)                       |
 +-------------------------+--------------------------------------------------------------------------------+
-| pack\_reverse           | store an atom's info in a buffer communicating partial forces  (required)      |
+| pack_reverse            | store an atom's info in a buffer communicating partial forces  (required)      |
 +-------------------------+--------------------------------------------------------------------------------+
-| pack\_reverse\_hybrid   | store extra info unique to this atom style (optional)                          |
+| pack_reverse_hybrid     | store extra info unique to this atom style (optional)                          |
 +-------------------------+--------------------------------------------------------------------------------+
-| unpack\_reverse         | retrieve an atom's info from the buffer (required)                             |
+| unpack_reverse          | retrieve an atom's info from the buffer (required)                             |
 +-------------------------+--------------------------------------------------------------------------------+
-| unpack\_reverse\_hybrid | retrieve extra info unique to this atom style (optional)                       |
+| unpack_reverse_hybrid   | retrieve extra info unique to this atom style (optional)                       |
 +-------------------------+--------------------------------------------------------------------------------+
-| pack\_border            | store an atom's info in a buffer communicated on neighbor re-builds (required) |
+| pack_border             | store an atom's info in a buffer communicated on neighbor re-builds (required) |
 +-------------------------+--------------------------------------------------------------------------------+
-| pack\_border\_vel       | add velocity info to buffer (required)                                         |
+| pack_border_vel         | add velocity info to buffer (required)                                         |
 +-------------------------+--------------------------------------------------------------------------------+
-| pack\_border\_hybrid    | store extra info unique to this atom style (optional)                          |
+| pack_border_hybrid      | store extra info unique to this atom style (optional)                          |
 +-------------------------+--------------------------------------------------------------------------------+
-| unpack\_border          | retrieve an atom's info from the buffer (required)                             |
+| unpack_border           | retrieve an atom's info from the buffer (required)                             |
 +-------------------------+--------------------------------------------------------------------------------+
-| unpack\_border\_vel     | also retrieve velocity info (required)                                         |
+| unpack_border_vel       | also retrieve velocity info (required)                                         |
 +-------------------------+--------------------------------------------------------------------------------+
-| unpack\_border\_hybrid  | retrieve extra info unique to this atom style (optional)                       |
+| unpack_border_hybrid    | retrieve extra info unique to this atom style (optional)                       |
 +-------------------------+--------------------------------------------------------------------------------+
-| pack\_exchange          | store all an atom's info to migrate to another processor (required)            |
+| pack_exchange           | store all an atom's info to migrate to another processor (required)            |
 +-------------------------+--------------------------------------------------------------------------------+
-| unpack\_exchange        | retrieve an atom's info from the buffer (required)                             |
+| unpack_exchange         | retrieve an atom's info from the buffer (required)                             |
 +-------------------------+--------------------------------------------------------------------------------+
-| size\_restart           | number of restart quantities associated with proc's atoms (required)           |
+| size_restart            | number of restart quantities associated with proc's atoms (required)           |
 +-------------------------+--------------------------------------------------------------------------------+
-| pack\_restart           | pack atom quantities into a buffer (required)                                  |
+| pack_restart            | pack atom quantities into a buffer (required)                                  |
 +-------------------------+--------------------------------------------------------------------------------+
-| unpack\_restart         | unpack atom quantities from a buffer (required)                                |
+| unpack_restart          | unpack atom quantities from a buffer (required)                                |
 +-------------------------+--------------------------------------------------------------------------------+
-| create\_atom            | create an individual atom of this style (required)                             |
+| create_atom             | create an individual atom of this style (required)                             |
 +-------------------------+--------------------------------------------------------------------------------+
-| data\_atom              | parse an atom line from the data file (required)                               |
+| data_atom               | parse an atom line from the data file (required)                               |
 +-------------------------+--------------------------------------------------------------------------------+
-| data\_atom\_hybrid      | parse additional atom info unique to this atom style (optional)                |
+| data_atom_hybrid        | parse additional atom info unique to this atom style (optional)                |
 +-------------------------+--------------------------------------------------------------------------------+
-| data\_vel               | parse one line of velocity information from data file (optional)               |
+| data_vel                | parse one line of velocity information from data file (optional)               |
 +-------------------------+--------------------------------------------------------------------------------+
-| data\_vel\_hybrid       | parse additional velocity data unique to this atom style (optional)            |
+| data_vel_hybrid         | parse additional velocity data unique to this atom style (optional)            |
 +-------------------------+--------------------------------------------------------------------------------+
-| memory\_usage           | tally memory allocated by atom arrays (required)                               |
+| memory_usage            | tally memory allocated by atom arrays (required)                               |
 +-------------------------+--------------------------------------------------------------------------------+
 
 The constructor of the derived class sets values for several variables
 that you must set when defining a new atom style, which are documented
-in atom\_vec.h.  New atom arrays are defined in atom.cpp.  Search for
+in atom_vec.h.  New atom arrays are defined in atom.cpp.  Search for
 the word "customize" and you will find locations you will need to
 modify.
 
@@ -95,13 +95,12 @@ modify.
 New :doc:`pair styles <pair_style>`, :doc:`fixes <fix>`, or
 :doc:`computes <compute>` can be added to LAMMPS, as discussed below.
 The code for these classes can use the per-atom properties defined by
-fix property/atom.  The Atom class has a find\_custom() method that is
+fix property/atom.  The Atom class has a find_custom() method that is
 useful in this context:
 
+.. code-block:: c++
 
-.. parsed-literal::
-
-   int index = atom->find_custom(char \*name, int &flag);
+   int index = atom->find_custom(char *name, int &flag);
 
 The "name" of a custom attribute, as specified in the :doc:`fix property/atom <fix_property_atom>` command, is checked to verify
 that it exists and its index is returned.  The method also sets flag =
@@ -109,16 +108,10 @@ that it exists and its index is returned.  The method also sets flag =
 The vector of values associated with the attribute can then be
 accessed using the returned index as
 
+.. code-block:: c++
 
-.. parsed-literal::
-
-   int \*ivector = atom->ivector[index];
-   double \*dvector = atom->dvector[index];
+   int *ivector = atom->ivector[index];
+   double *dvector = atom->dvector[index];
 
 Ivector or dvector are vectors of length Nlocal = # of owned atoms,
 which store the attributes of individual atoms.
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/Modify_body.rst b/doc/src/Modify_body.rst
index 5e40e237fc..b923416bdc 100644
--- a/doc/src/Modify_body.rst
+++ b/doc/src/Modify_body.rst
@@ -10,14 +10,14 @@ See the :doc:`Howto body <Howto_body>` doc page for an overview of using
 body particles and the various body styles LAMMPS supports.  New
 styles can be created to add new kinds of body particles to LAMMPS.
 
-Body\_nparticle.cpp is an example of a body particle that is treated as
+Body_nparticle.cpp is an example of a body particle that is treated as
 a rigid body containing N sub-particles.
 
 Here is a brief description of methods you define in your new derived
 class.  See body.h for details.
 
 +----------------------+-----------------------------------------------------------+
-| data\_body           | process a line from the Bodies section of a data file     |
+| data_body            | process a line from the Bodies section of a data file     |
 +----------------------+-----------------------------------------------------------+
 | noutrow              | number of sub-particles output is generated for           |
 +----------------------+-----------------------------------------------------------+
@@ -25,16 +25,11 @@ class.  See body.h for details.
 +----------------------+-----------------------------------------------------------+
 | output               | output values for the Mth sub-particle                    |
 +----------------------+-----------------------------------------------------------+
-| pack\_comm\_body     | body attributes to communicate every timestep             |
+| pack_comm_body       | body attributes to communicate every timestep             |
 +----------------------+-----------------------------------------------------------+
-| unpack\_comm\_body   | unpacking of those attributes                             |
+| unpack_comm_body     | unpacking of those attributes                             |
 +----------------------+-----------------------------------------------------------+
-| pack\_border\_body   | body attributes to communicate when reneighboring is done |
+| pack_border_body     | body attributes to communicate when reneighboring is done |
 +----------------------+-----------------------------------------------------------+
-| unpack\_border\_body | unpacking of those attributes                             |
+| unpack_border_body   | unpacking of those attributes                             |
 +----------------------+-----------------------------------------------------------+
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/Modify_bond.rst b/doc/src/Modify_bond.rst
index f1fd0894a0..c2d220767e 100644
--- a/doc/src/Modify_bond.rst
+++ b/doc/src/Modify_bond.rst
@@ -5,7 +5,7 @@ Classes that compute molecular interactions are derived from the Bond,
 Angle, Dihedral, and Improper classes.  New styles can be created to
 add new potentials to LAMMPS.
 
-Bond\_harmonic.cpp is the simplest example of a bond style.  Ditto for
+Bond_harmonic.cpp is the simplest example of a bond style.  Ditto for
 the harmonic forms of the angle, dihedral, and improper style
 commands.
 
@@ -14,9 +14,9 @@ new derived class.  See bond.h, angle.h, dihedral.h, and improper.h
 for details and specific additional methods.
 
 +-----------------------+---------------------------------------------------------------------------+
-| init                  | check if all coefficients are set, calls *init\_style* (optional)         |
+| init                  | check if all coefficients are set, calls *init_style* (optional)          |
 +-----------------------+---------------------------------------------------------------------------+
-| init\_style           | check if style specific conditions are met (optional)                     |
+| init_style            | check if style specific conditions are met (optional)                     |
 +-----------------------+---------------------------------------------------------------------------+
 | compute               | compute the molecular interactions (required)                             |
 +-----------------------+---------------------------------------------------------------------------+
@@ -24,18 +24,13 @@ for details and specific additional methods.
 +-----------------------+---------------------------------------------------------------------------+
 | coeff                 | set coefficients for one type (required)                                  |
 +-----------------------+---------------------------------------------------------------------------+
-| equilibrium\_distance | length of bond, used by SHAKE (required, bond only)                       |
+| equilibrium_distance  | length of bond, used by SHAKE (required, bond only)                       |
 +-----------------------+---------------------------------------------------------------------------+
-| equilibrium\_angle    | opening of angle, used by SHAKE (required, angle only)                    |
+| equilibrium_angle     | opening of angle, used by SHAKE (required, angle only)                    |
 +-----------------------+---------------------------------------------------------------------------+
-| write & read\_restart | writes/reads coeffs to restart files (required)                           |
+| write & read_restart  | writes/reads coeffs to restart files (required)                           |
 +-----------------------+---------------------------------------------------------------------------+
 | single                | force and energy of a single bond or angle (required, bond or angle only) |
 +-----------------------+---------------------------------------------------------------------------+
-| memory\_usage         | tally memory allocated by the style (optional)                            |
+| memory_usage          | tally memory allocated by the style (optional)                            |
 +-----------------------+---------------------------------------------------------------------------+
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/Modify_command.rst b/doc/src/Modify_command.rst
index 9487f4c35b..2d0a1d99d9 100644
--- a/doc/src/Modify_command.rst
+++ b/doc/src/Modify_command.rst
@@ -2,8 +2,8 @@ Input script command style
 ==========================
 
 New commands can be added to LAMMPS input scripts by adding new
-classes that have a "command" method.  For example, the create\_atoms,
-read\_data, velocity, and run commands are all implemented in this
+classes that have a "command" method.  For example, the create_atoms,
+read_data, velocity, and run commands are all implemented in this
 fashion.  When such a command is encountered in the LAMMPS input
 script, LAMMPS simply creates a class with the corresponding name,
 invokes the "command" method of the class, and passes it the arguments
@@ -18,8 +18,3 @@ The single method your new class must define is as follows:
 
 Of course, the new class can define other methods and variables as
 needed.
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/Modify_compute.rst b/doc/src/Modify_compute.rst
index 81c55b5ed2..8fad775b3a 100644
--- a/doc/src/Modify_compute.rst
+++ b/doc/src/Modify_compute.rst
@@ -7,8 +7,8 @@ quantities like kinetic energy and the centro-symmetry parameter
 are derived from the Compute class.  New styles can be created
 to add new calculations to LAMMPS.
 
-Compute\_temp.cpp is a simple example of computing a scalar
-temperature.  Compute\_ke\_atom.cpp is a simple example of computing
+Compute_temp.cpp is a simple example of computing a scalar
+temperature.  Compute_ke_atom.cpp is a simple example of computing
 per-atom kinetic energy.
 
 Here is a brief description of methods you define in your new derived
@@ -17,46 +17,41 @@ class.  See compute.h for details.
 +-----------------------+------------------------------------------------------------------+
 | init                  | perform one time setup (required)                                |
 +-----------------------+------------------------------------------------------------------+
-| init\_list            | neighbor list setup, if needed (optional)                        |
+| init_list             | neighbor list setup, if needed (optional)                        |
 +-----------------------+------------------------------------------------------------------+
-| compute\_scalar       | compute a scalar quantity (optional)                             |
+| compute_scalar        | compute a scalar quantity (optional)                             |
 +-----------------------+------------------------------------------------------------------+
-| compute\_vector       | compute a vector of quantities (optional)                        |
+| compute_vector        | compute a vector of quantities (optional)                        |
 +-----------------------+------------------------------------------------------------------+
-| compute\_peratom      | compute one or more quantities per atom (optional)               |
+| compute_peratom       | compute one or more quantities per atom (optional)               |
 +-----------------------+------------------------------------------------------------------+
-| compute\_local        | compute one or more quantities per processor (optional)          |
+| compute_local         | compute one or more quantities per processor (optional)          |
 +-----------------------+------------------------------------------------------------------+
-| pack\_comm            | pack a buffer with items to communicate (optional)               |
+| pack_comm             | pack a buffer with items to communicate (optional)               |
 +-----------------------+------------------------------------------------------------------+
-| unpack\_comm          | unpack the buffer (optional)                                     |
+| unpack_comm           | unpack the buffer (optional)                                     |
 +-----------------------+------------------------------------------------------------------+
-| pack\_reverse         | pack a buffer with items to reverse communicate (optional)       |
+| pack_reverse          | pack a buffer with items to reverse communicate (optional)       |
 +-----------------------+------------------------------------------------------------------+
-| unpack\_reverse       | unpack the buffer (optional)                                     |
+| unpack_reverse        | unpack the buffer (optional)                                     |
 +-----------------------+------------------------------------------------------------------+
-| remove\_bias          | remove velocity bias from one atom (optional)                    |
+| remove_bias           | remove velocity bias from one atom (optional)                    |
 +-----------------------+------------------------------------------------------------------+
-| remove\_bias\_all     | remove velocity bias from all atoms in group (optional)          |
+| remove_bias_all       | remove velocity bias from all atoms in group (optional)          |
 +-----------------------+------------------------------------------------------------------+
-| restore\_bias         | restore velocity bias for one atom after remove\_bias (optional) |
+| restore_bias          | restore velocity bias for one atom after remove_bias (optional)  |
 +-----------------------+------------------------------------------------------------------+
-| restore\_bias\_all    | same as before, but for all atoms in group (optional)            |
+| restore_bias_all      | same as before, but for all atoms in group (optional)            |
 +-----------------------+------------------------------------------------------------------+
-| pair\_tally\_callback | callback function for *tally*\ -style computes (optional).       |
+| pair_tally_callback   | callback function for *tally*\ -style computes (optional).       |
 +-----------------------+------------------------------------------------------------------+
-| memory\_usage         | tally memory usage (optional)                                    |
+| memory_usage          | tally memory usage (optional)                                    |
 +-----------------------+------------------------------------------------------------------+
 
 Tally-style computes are a special case, as their computation is done
 in two stages: the callback function is registered with the pair style
-and then called from the Pair::ev\_tally() function, which is called for
+and then called from the Pair::ev_tally() function, which is called for
 each pair after force and energy has been computed for this pair. Then
-the tallied values are retrieved with the standard compute\_scalar or
-compute\_vector or compute\_peratom methods. The USER-TALLY package
-provides *examples*\ \_compute\_tally.html for utilizing this mechanism.
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
+the tallied values are retrieved with the standard compute_scalar or
+compute_vector or compute_peratom methods. The USER-TALLY package
+provides *examples*\ _compute_tally.html for utilizing this mechanism.
diff --git a/doc/src/Modify_contribute.rst b/doc/src/Modify_contribute.rst
index 740ddb555d..ed2ef783f4 100644
--- a/doc/src/Modify_contribute.rst
+++ b/doc/src/Modify_contribute.rst
@@ -2,7 +2,7 @@ Submitting new features for inclusion in LAMMPS
 ===============================================
 
 We encourage users to submit new features or modifications for LAMMPS
-to `the core developers <http://lammps.sandia.gov/authors.html>`_ so they
+to `the core developers <https://lammps.sandia.gov/authors.html>`_ so they
 can be added to the LAMMPS distribution. The preferred way to manage
 and coordinate this is as of Fall 2016 via the LAMMPS project on
 `GitHub <https://github.com/lammps/lammps>`_. An alternative is to
@@ -44,12 +44,12 @@ are listed and described on the :doc:`Packages details <Packages_details>` doc p
 
 Note that by providing us files to release, you are agreeing to make
 them open-source, i.e. we can release them under the terms of the GPL,
-used as a license for the rest of LAMMPS.  See the `Open source <http://lammps.sandia.gov/open_source.html>`_ page on the LAMMPS
+used as a license for the rest of LAMMPS.  See the `Open source <https://lammps.sandia.gov/open_source.html>`_ page on the LAMMPS
 website for details.
 
 With user packages and files, all we are really providing (aside from
 the fame and fortune that accompanies having your name in the source
-code and on the `Authors page <http://lammps.sandia.gov/authors.html>`_
+code and on the `Authors page <https://lammps.sandia.gov/authors.html>`_
 of the `LAMMPS WWW site <lws_>`_), is a means for you to distribute your
 work to the LAMMPS user community, and a mechanism for others to
 easily try out your new feature.  This may help you find bugs or make
@@ -63,33 +63,37 @@ unusual event).
    If you prefer to actively develop and support your add-on
    feature yourself, then you may wish to make it available for download
    from your own website, as a user package that LAMMPS users can add to
-   their copy of LAMMPS.  See the `Offsite LAMMPS packages and tools <http://lammps.sandia.gov/offsite.html>`_ page of the LAMMPS web
+   their copy of LAMMPS.  See the `Offsite LAMMPS packages and tools <https://lammps.sandia.gov/offsite.html>`_ page of the LAMMPS web
    site for examples of groups that do this.  We are happy to advertise
    your package and web site from that page.  Simply email the
-   `developers <http://lammps.sandia.gov/authors.html>`_ with info about
+   `developers <https://lammps.sandia.gov/authors.html>`_ with info about
    your package and we will post it there.
 
+.. _lws: https://lammps.sandia.gov
+
 The previous sections of this doc page describe how to add new "style"
 files of various kinds to LAMMPS.  Packages are simply collections of
 one or more new class files which are invoked as a new style within a
 LAMMPS input script.  If designed correctly, these additions typically
 do not require changes to the main core of LAMMPS; they are simply
 add-on files.  If you think your new feature requires non-trivial
-changes in core LAMMPS files, you'll need to `communicate with the developers <http://lammps.sandia.gov/authors.html>`_, since we may or may
-not want to make those changes.  An example of a trivial change is
-making a parent-class method "virtual" when you derive a new child
-class from it.
+changes in core LAMMPS files, you should `communicate with the
+developers <https://lammps.sandia.gov/authors.html>`_, since we may or
+may not want to include those changes for some reason.  An example of a
+trivial change is making a parent-class method "virtual" when you derive
+a new child class from it.
 
 Here is a checklist of steps you need to follow to submit a single file
 or user package for our consideration.  Following these steps will save
-both you and us time. See existing files in packages in the src dir for
-examples. If you are uncertain, please ask.
+both you and us time. Please have a look at the existing files in
+packages in the src directory for examples. If you are uncertain, please ask.
 
 * All source files you provide must compile with the most current
   version of LAMMPS with multiple configurations. In particular you
-  need to test compiling LAMMPS from scratch with -DLAMMPS\_BIGBIG
-  set in addition to the default -DLAMMPS\_SMALLBIG setting. Your code
+  need to test compiling LAMMPS from scratch with -DLAMMPS_BIGBIG
+  set in addition to the default -DLAMMPS_SMALLBIG setting. Your code
   will need to work correctly in serial and in parallel using MPI.
+
 * For consistency with the rest of LAMMPS and especially, if you want
   your contribution(s) to be added to main LAMMPS code or one of its
   standard packages, it needs to be written in a style compatible with
@@ -102,7 +106,7 @@ examples. If you are uncertain, please ask.
   (<cstdlib>, <cstdio>, or <cstring>) instead of the C-style names
   <stdlib.h>, <stdio.h>, or <string.h>), and forward declarations
   used where possible or needed to avoid including headers.
-  All added code should be placed into the LAMMPS\_NS namespace or a
+  All added code should be placed into the LAMMPS_NS namespace or a
   sub-namespace; global or static variables should be avoided, as they
   conflict with the modular nature of LAMMPS and the C++ class structure.
   Header files must **not** import namespaces with *using*\ .
@@ -112,12 +116,14 @@ examples. If you are uncertain, please ask.
   structures, performs its operations, and is formatted similar to other
   LAMMPS source files, including the use of the error class for error
   and warning messages.
+
 * If you want your contribution to be added as a user-contributed
   feature, and it's a single file (actually a \*.cpp and \*.h file) it can
   rapidly be added to the USER-MISC directory.  Send us the one-line
   entry to add to the USER-MISC/README file in that dir, along with the
   2 source files.  You can do this multiple times if you wish to
   contribute several individual features.
+
 * If you want your contribution to be added as a user-contribution and
   it is several related features, it is probably best to make it a user
   package directory with a name like USER-FOO.  In addition to your new
@@ -130,45 +136,50 @@ examples. If you are uncertain, please ask.
   and Install.sh files in other USER directories as examples.  Send us a
   tarball of this USER-FOO directory.
 
-  Your new source files need to have the LAMMPS copyright, GPL notice,
+* Your new source files need to have the LAMMPS copyright, GPL notice,
   and your name and email address at the top, like other
   user-contributed LAMMPS source files.  They need to create a class
   that is inside the LAMMPS namespace.  If the file is for one of the
-
-* USER packages, including USER-MISC, then we are not as picky about the
+  USER packages, including USER-MISC, then we are not as picky about the
   coding style (see above).  I.e. the files do not need to be in the
   same stylistic format and syntax as other LAMMPS files, though that
   would be nice for developers as well as users who try to read your
   code.
-* You **must** also create a **documentation** file for each new command or
-  style you are adding to LAMMPS. For simplicity and convenience, the
+
+* You **must** also create a **documentation** file for each new command
+  or style you are adding to LAMMPS. For simplicity and convenience, the
   documentation of groups of closely related commands or styles may be
   combined into a single file.  This will be one file for a single-file
-  feature.  For a package, it might be several files.  These are simple
-  text files with a specific markup language, that are then auto-converted
-  to HTML and PDF. The tools for this conversion are included in the
-  source distribution, and the translation can be as simple as doing
-  "make html pdf" in the doc folder.
-  Thus the documentation source files must be in the same format and
-  style as other \*.txt files in the lammps/doc/src directory for similar
-  commands and styles; use one or more of them as a starting point.
-  A description of the markup can also be found in
-  lammps/doc/utils/txt2html/README.html
-  As appropriate, the text files can include links to equations
-  (see doc/Eqs/\*.tex for examples, we auto-create the associated JPG
-  files), or figures (see doc/JPG for examples), or even additional PDF
-  files with further details (see doc/PDF for examples).  The doc page
-  should also include literature citations as appropriate; see the
-  bottom of doc/fix\_nh.txt for examples and the earlier part of the same
-  file for how to format the cite itself.  The "Restrictions" section of
-  the doc page should indicate that your command is only available if
-  LAMMPS is built with the appropriate USER-MISC or USER-FOO package.
-  See other user package doc files for examples of how to do this. The
-  prerequisite for building the HTML format files are Python 3.x and
-  virtualenv, the requirement for generating the PDF format manual
-  is the `htmldoc <http://www.htmldoc.org/>`_ software. Please run at least
-  "make html" and carefully inspect and proofread the resulting HTML format
-  doc page before submitting your code.
+  feature.  For a package, it might be several files.  These are text
+  files with a .rst extension using the `reStructuredText <rst_>`_
+  markup language, that are then converted to HTML and PDF using the
+  `Sphinx <sphinx_>`_ documentation generator tool.  Running Sphinx with
+  the included configuration requires Python 3.x.  Configuration
+  settings and custom extensions for this conversion are included in the
+  source distribution, and missing python packages will be transparently
+  downloaded into a virtual environment via pip. Thus, if your local
+  system is missing required packages, you need access to the
+  internet. The translation can be as simple as doing "make html pdf" in
+  the doc folder.  As appropriate, the text files can include inline
+  mathematical expression or figures (see doc/JPG for examples).
+  Additional PDF files with further details (see doc/PDF for examples)
+  may also be included.  The doc page should also include literature
+  citations as appropriate; see the bottom of doc/fix_nh.rst for
+  examples and the earlier part of the same file for how to format the
+  cite itself.  Citation labels must be unique across all .rst files.
+  The "Restrictions" section of the doc page should indicate if your
+  command is only available if LAMMPS is built with the appropriate
+  USER-MISC or USER-FOO package.  See other user package doc files for
+  examples of how to do this.  Please run at least "make html" and "make
+  spelling" and carefully inspect and proofread the resulting HTML
+  format doc page before submitting your code.  Upon submission of a
+  pull request, checks for error free completion of the HTML and PDF
+  build will be performed and also a spell check, a check for correct
+  anchors and labels, and a check for completeness of references all
+  styles in their corresponding tables and lists is run.  In case the
+  spell check reports false positives they can be added to the file
+  doc/utils/sphinx-config/false_positives.txt
+
 * For a new package (or even a single command) you should include one or
   more example scripts demonstrating its use.  These should run in no
   more than a couple minutes, even on a single processor, and not require
@@ -176,10 +187,11 @@ examples. If you are uncertain, please ask.
   examples of input scripts other users provided for their packages.
   These example inputs are also required for validating memory accesses
   and testing for memory leaks with valgrind
+
 * If there is a paper of yours describing your feature (either the
   algorithm/science behind the feature itself, or its initial usage, or
   its implementation in LAMMPS), you can add the citation to the \*.cpp
-  source file.  See src/USER-EFF/atom\_vec\_electron.cpp for an example.
+  source file.  See src/USER-EFF/atom_vec_electron.cpp for an example.
   A LaTeX citation is stored in a variable at the top of the file and a
   single line of code that references the variable is added to the
   constructor of the class.  Whenever a user invokes your feature from
@@ -191,13 +203,10 @@ examples. If you are uncertain, please ask.
   usage.  That kind of citation should just be in the doc page you
   provide.
 
-
 Finally, as a general rule-of-thumb, the more clear and
 self-explanatory you make your documentation and README files, and the
 easier you make it for people to get started, e.g. by providing example
 scripts, the more likely it is that users will try out your new feature.
 
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
+.. _rst: https://docutils.readthedocs.io/en/sphinx-docs/user/rst/quickstart.html
+.. _sphinx: https://sphinx-doc.org
diff --git a/doc/src/Modify_dump.rst b/doc/src/Modify_dump.rst
index c44aa0a96a..1379326d1e 100644
--- a/doc/src/Modify_dump.rst
+++ b/doc/src/Modify_dump.rst
@@ -4,21 +4,21 @@ Dump styles
 Classes that dump per-atom info to files are derived from the Dump
 class.  To dump new quantities or in a new format, a new derived dump
 class can be added, but it is typically simpler to modify the
-DumpCustom class contained in the dump\_custom.cpp file.
+DumpCustom class contained in the dump_custom.cpp file.
 
-Dump\_atom.cpp is a simple example of a derived dump class.
+Dump_atom.cpp is a simple example of a derived dump class.
 
 Here is a brief description of methods you define in your new derived
 class.  See dump.h for details.
 
 +---------------+---------------------------------------------------+
-| write\_header | write the header section of a snapshot of atoms   |
+| write_header  | write the header section of a snapshot of atoms   |
 +---------------+---------------------------------------------------+
 | count         | count the number of lines a processor will output |
 +---------------+---------------------------------------------------+
 | pack          | pack a proc's output data into a buffer           |
 +---------------+---------------------------------------------------+
-| write\_data   | write a proc's data to a file                     |
+| write_data    | write a proc's data to a file                     |
 +---------------+---------------------------------------------------+
 
 See the :doc:`dump <dump>` command and its *custom* style for a list of
@@ -30,8 +30,3 @@ new quantities to dump.
 Note that new keywords for atom properties are not typically
 added to the :doc:`dump custom <dump>` command.  Instead they are added
 to the :doc:`compute property/atom <compute_property_atom>` command.
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/Modify_fix.rst b/doc/src/Modify_fix.rst
index d4c4fa046f..9a97e30fbe 100644
--- a/doc/src/Modify_fix.rst
+++ b/doc/src/Modify_fix.rst
@@ -10,7 +10,7 @@ constraints or boundary conditions (SHAKE or walls), and diagnostics
 (compute a diffusion coefficient).  New styles can be created to add
 new options to LAMMPS.
 
-Fix\_setforce.cpp is a simple example of setting forces on atoms to
+Fix_setforce.cpp is a simple example of setting forces on atoms to
 prescribed values.  There are dozens of fix options already in LAMMPS;
 choose one as a template that is similar to what you want to
 implement.
@@ -23,105 +23,105 @@ derived class.  See fix.h for details.
 +---------------------------+--------------------------------------------------------------------------------------------+
 | init                      | initialization before a run (optional)                                                     |
 +---------------------------+--------------------------------------------------------------------------------------------+
-| setup\_pre\_exchange      | called before atom exchange in setup (optional)                                            |
+| setup_pre_exchange        | called before atom exchange in setup (optional)                                            |
 +---------------------------+--------------------------------------------------------------------------------------------+
-| setup\_pre\_force         | called before force computation in setup (optional)                                        |
+| setup_pre_force           | called before force computation in setup (optional)                                        |
 +---------------------------+--------------------------------------------------------------------------------------------+
 | setup                     | called immediately before the 1st timestep and after forces are computed (optional)        |
 +---------------------------+--------------------------------------------------------------------------------------------+
-| min\_setup\_pre\_force    | like setup\_pre\_force, but for minimizations instead of MD runs (optional)                |
+| min_setup_pre_force       | like setup_pre_force, but for minimizations instead of MD runs (optional)                  |
 +---------------------------+--------------------------------------------------------------------------------------------+
-| min\_setup                | like setup, but for minimizations instead of MD runs (optional)                            |
+| min_setup                 | like setup, but for minimizations instead of MD runs (optional)                            |
 +---------------------------+--------------------------------------------------------------------------------------------+
-| initial\_integrate        | called at very beginning of each timestep (optional)                                       |
+| initial_integrate         | called at very beginning of each timestep (optional)                                       |
 +---------------------------+--------------------------------------------------------------------------------------------+
-| pre\_exchange             | called before atom exchange on re-neighboring steps (optional)                             |
+| pre_exchange              | called before atom exchange on re-neighboring steps (optional)                             |
 +---------------------------+--------------------------------------------------------------------------------------------+
-| pre\_neighbor             | called before neighbor list build (optional)                                               |
+| pre_neighbor              | called before neighbor list build (optional)                                               |
 +---------------------------+--------------------------------------------------------------------------------------------+
-| pre\_force                | called before pair & molecular forces are computed (optional)                              |
+| pre_force                 | called before pair & molecular forces are computed (optional)                              |
 +---------------------------+--------------------------------------------------------------------------------------------+
-| post\_force               | called after pair & molecular forces are computed and communicated (optional)              |
+| post_force                | called after pair & molecular forces are computed and communicated (optional)              |
 +---------------------------+--------------------------------------------------------------------------------------------+
-| final\_integrate          | called at end of each timestep (optional)                                                  |
+| final_integrate           | called at end of each timestep (optional)                                                  |
 +---------------------------+--------------------------------------------------------------------------------------------+
-| end\_of\_step             | called at very end of timestep (optional)                                                  |
+| end_of_step               | called at very end of timestep (optional)                                                  |
 +---------------------------+--------------------------------------------------------------------------------------------+
-| write\_restart            | dumps fix info to restart file (optional)                                                  |
+| write_restart             | dumps fix info to restart file (optional)                                                  |
 +---------------------------+--------------------------------------------------------------------------------------------+
 | restart                   | uses info from restart file to re-initialize the fix (optional)                            |
 +---------------------------+--------------------------------------------------------------------------------------------+
-| grow\_arrays              | allocate memory for atom-based arrays used by fix (optional)                               |
+| grow_arrays               | allocate memory for atom-based arrays used by fix (optional)                               |
 +---------------------------+--------------------------------------------------------------------------------------------+
-| copy\_arrays              | copy atom info when an atom migrates to a new processor (optional)                         |
+| copy_arrays               | copy atom info when an atom migrates to a new processor (optional)                         |
 +---------------------------+--------------------------------------------------------------------------------------------+
-| pack\_exchange            | store atom's data in a buffer (optional)                                                   |
+| pack_exchange             | store atom's data in a buffer (optional)                                                   |
 +---------------------------+--------------------------------------------------------------------------------------------+
-| unpack\_exchange          | retrieve atom's data from a buffer (optional)                                              |
+| unpack_exchange           | retrieve atom's data from a buffer (optional)                                              |
 +---------------------------+--------------------------------------------------------------------------------------------+
-| pack\_restart             | store atom's data for writing to restart file (optional)                                   |
+| pack_restart              | store atom's data for writing to restart file (optional)                                   |
 +---------------------------+--------------------------------------------------------------------------------------------+
-| unpack\_restart           | retrieve atom's data from a restart file buffer (optional)                                 |
+| unpack_restart            | retrieve atom's data from a restart file buffer (optional)                                 |
 +---------------------------+--------------------------------------------------------------------------------------------+
-| size\_restart             | size of atom's data (optional)                                                             |
+| size_restart              | size of atom's data (optional)                                                             |
 +---------------------------+--------------------------------------------------------------------------------------------+
-| maxsize\_restart          | max size of atom's data (optional)                                                         |
+| maxsize_restart           | max size of atom's data (optional)                                                         |
 +---------------------------+--------------------------------------------------------------------------------------------+
-| setup\_pre\_force\_respa  | same as setup\_pre\_force, but for rRESPA (optional)                                       |
+| setup_pre_force_respa     | same as setup_pre_force, but for rRESPA (optional)                                         |
 +---------------------------+--------------------------------------------------------------------------------------------+
-| initial\_integrate\_respa | same as initial\_integrate, but for rRESPA (optional)                                      |
+| initial_integrate_respa   | same as initial_integrate, but for rRESPA (optional)                                       |
 +---------------------------+--------------------------------------------------------------------------------------------+
-| post\_integrate\_respa    | called after the first half integration step is done in rRESPA (optional)                  |
+| post_integrate_respa      | called after the first half integration step is done in rRESPA (optional)                  |
 +---------------------------+--------------------------------------------------------------------------------------------+
-| pre\_force\_respa         | same as pre\_force, but for rRESPA (optional)                                              |
+| pre_force_respa           | same as pre_force, but for rRESPA (optional)                                               |
 +---------------------------+--------------------------------------------------------------------------------------------+
-| post\_force\_respa        | same as post\_force, but for rRESPA (optional)                                             |
+| post_force_respa          | same as post_force, but for rRESPA (optional)                                              |
 +---------------------------+--------------------------------------------------------------------------------------------+
-| final\_integrate\_respa   | same as final\_integrate, but for rRESPA (optional)                                        |
+| final_integrate_respa     | same as final_integrate, but for rRESPA (optional)                                         |
 +---------------------------+--------------------------------------------------------------------------------------------+
-| min\_pre\_force           | called after pair & molecular forces are computed in minimizer (optional)                  |
+| min_pre_force             | called after pair & molecular forces are computed in minimizer (optional)                  |
 +---------------------------+--------------------------------------------------------------------------------------------+
-| min\_post\_force          | called after pair & molecular forces are computed and communicated in minimizer (optional) |
+| min_post_force            | called after pair & molecular forces are computed and communicated in minimizer (optional) |
 +---------------------------+--------------------------------------------------------------------------------------------+
-| min\_store                | store extra data for linesearch based minimization on a LIFO stack (optional)              |
+| min_store                 | store extra data for linesearch based minimization on a LIFO stack (optional)              |
 +---------------------------+--------------------------------------------------------------------------------------------+
-| min\_pushstore            | push the minimization LIFO stack one element down (optional)                               |
+| min_pushstore             | push the minimization LIFO stack one element down (optional)                               |
 +---------------------------+--------------------------------------------------------------------------------------------+
-| min\_popstore             | pop the minimization LIFO stack one element up (optional)                                  |
+| min_popstore              | pop the minimization LIFO stack one element up (optional)                                  |
 +---------------------------+--------------------------------------------------------------------------------------------+
-| min\_clearstore           | clear minimization LIFO stack (optional)                                                   |
+| min_clearstore            | clear minimization LIFO stack (optional)                                                   |
 +---------------------------+--------------------------------------------------------------------------------------------+
-| min\_step                 | reset or move forward on line search minimization (optional)                               |
+| min_step                  | reset or move forward on line search minimization (optional)                               |
 +---------------------------+--------------------------------------------------------------------------------------------+
-| min\_dof                  | report number of degrees of freedom *added* by this fix in minimization (optional)         |
+| min_dof                   | report number of degrees of freedom *added* by this fix in minimization (optional)         |
 +---------------------------+--------------------------------------------------------------------------------------------+
-| max\_alpha                | report maximum allowed step size during linesearch minimization (optional)                 |
+| max_alpha                 | report maximum allowed step size during linesearch minimization (optional)                 |
 +---------------------------+--------------------------------------------------------------------------------------------+
-| pack\_comm                | pack a buffer to communicate a per-atom quantity (optional)                                |
+| pack_comm                 | pack a buffer to communicate a per-atom quantity (optional)                                |
 +---------------------------+--------------------------------------------------------------------------------------------+
-| unpack\_comm              | unpack a buffer to communicate a per-atom quantity (optional)                              |
+| unpack_comm               | unpack a buffer to communicate a per-atom quantity (optional)                              |
 +---------------------------+--------------------------------------------------------------------------------------------+
-| pack\_reverse\_comm       | pack a buffer to reverse communicate a per-atom quantity (optional)                        |
+| pack_reverse_comm         | pack a buffer to reverse communicate a per-atom quantity (optional)                        |
 +---------------------------+--------------------------------------------------------------------------------------------+
-| unpack\_reverse\_comm     | unpack a buffer to reverse communicate a per-atom quantity (optional)                      |
+| unpack_reverse_comm       | unpack a buffer to reverse communicate a per-atom quantity (optional)                      |
 +---------------------------+--------------------------------------------------------------------------------------------+
 | dof                       | report number of degrees of freedom *removed* by this fix during MD (optional)             |
 +---------------------------+--------------------------------------------------------------------------------------------+
-| compute\_scalar           | return a global scalar property that the fix computes (optional)                           |
+| compute_scalar            | return a global scalar property that the fix computes (optional)                           |
 +---------------------------+--------------------------------------------------------------------------------------------+
-| compute\_vector           | return a component of a vector property that the fix computes (optional)                   |
+| compute_vector            | return a component of a vector property that the fix computes (optional)                   |
 +---------------------------+--------------------------------------------------------------------------------------------+
-| compute\_array            | return a component of an array property that the fix computes (optional)                   |
+| compute_array             | return a component of an array property that the fix computes (optional)                   |
 +---------------------------+--------------------------------------------------------------------------------------------+
 | deform                    | called when the box size is changed (optional)                                             |
 +---------------------------+--------------------------------------------------------------------------------------------+
-| reset\_target             | called when a change of the target temperature is requested during a run (optional)        |
+| reset_target              | called when a change of the target temperature is requested during a run (optional)        |
 +---------------------------+--------------------------------------------------------------------------------------------+
-| reset\_dt                 | is called when a change of the time step is requested during a run (optional)              |
+| reset_dt                  | is called when a change of the time step is requested during a run (optional)              |
 +---------------------------+--------------------------------------------------------------------------------------------+
-| modify\_param             | called when a fix\_modify request is executed (optional)                                   |
+| modify_param              | called when a fix_modify request is executed (optional)                                    |
 +---------------------------+--------------------------------------------------------------------------------------------+
-| memory\_usage             | report memory used by fix (optional)                                                       |
+| memory_usage              | report memory used by fix (optional)                                                       |
 +---------------------------+--------------------------------------------------------------------------------------------+
 | thermo                    | compute quantities for thermodynamic output (optional)                                     |
 +---------------------------+--------------------------------------------------------------------------------------------+
@@ -129,12 +129,12 @@ derived class.  See fix.h for details.
 Typically, only a small fraction of these methods are defined for a
 particular fix.  Setmask is mandatory, as it determines when the fix
 will be invoked during the timestep.  Fixes that perform time
-integration (\ *nve*\ , *nvt*\ , *npt*\ ) implement initial\_integrate() and
-final\_integrate() to perform velocity Verlet updates.  Fixes that
-constrain forces implement post\_force().
+integration (\ *nve*\ , *nvt*\ , *npt*\ ) implement initial_integrate() and
+final_integrate() to perform velocity Verlet updates.  Fixes that
+constrain forces implement post_force().
 
-Fixes that perform diagnostics typically implement end\_of\_step().  For
-an end\_of\_step fix, one of your fix arguments must be the variable
+Fixes that perform diagnostics typically implement end_of_step().  For
+an end_of_step fix, one of your fix arguments must be the variable
 "nevery" which is used to determine when to call the fix and you must
 set this variable in the constructor of your fix.  By convention, this
 is the first argument the fix defines (after the ID, group-ID, style).
@@ -142,17 +142,12 @@ is the first argument the fix defines (after the ID, group-ID, style).
 If the fix needs to store information for each atom that persists from
 timestep to timestep, it can manage that memory and migrate the info
 with the atoms as they move from processors to processor by
-implementing the grow\_arrays, copy\_arrays, pack\_exchange, and
-unpack\_exchange methods.  Similarly, the pack\_restart and
-unpack\_restart methods can be implemented to store information about
+implementing the grow_arrays, copy_arrays, pack_exchange, and
+unpack_exchange methods.  Similarly, the pack_restart and
+unpack_restart methods can be implemented to store information about
 the fix in restart files.  If you wish an integrator or force
 constraint fix to work with rRESPA (see the :doc:`run_style <run_style>`
-command), the initial\_integrate, post\_force\_integrate, and
-final\_integrate\_respa methods can be implemented.  The thermo method
+command), the initial_integrate, post_force_integrate, and
+final_integrate_respa methods can be implemented.  The thermo method
 enables a fix to contribute values to thermodynamic output, as printed
 quantities and/or to be summed to the potential energy of the system.
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/Modify_kspace.rst b/doc/src/Modify_kspace.rst
index 41ad5a3602..e1b10eac8d 100644
--- a/doc/src/Modify_kspace.rst
+++ b/doc/src/Modify_kspace.rst
@@ -17,10 +17,5 @@ class.  See kspace.h for details.
 +---------------+----------------------------------------------+
 | compute       | every-timestep computation                   |
 +---------------+----------------------------------------------+
-| memory\_usage | tally of memory usage                        |
+| memory_usage  | tally of memory usage                        |
 +---------------+----------------------------------------------+
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/Modify_min.rst b/doc/src/Modify_min.rst
index 2cdd620f0e..ed7c101a6c 100644
--- a/doc/src/Modify_min.rst
+++ b/doc/src/Modify_min.rst
@@ -5,7 +5,7 @@ Classes that perform energy minimization derived from the Min class.
 New styles can be created to add new minimization algorithms to
 LAMMPS.
 
-Min\_cg.cpp is an example of conjugate gradient minimization.
+Min_cg.cpp is an example of conjugate gradient minimization.
 
 Here is a brief description of methods you define in your new derived
 class.  See min.h for details.
@@ -15,10 +15,5 @@ class.  See min.h for details.
 +---------------+------------------------------------------+
 | run           | perform the minimization                 |
 +---------------+------------------------------------------+
-| memory\_usage | tally of memory usage                    |
+| memory_usage  | tally of memory usage                    |
 +---------------+------------------------------------------+
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/Modify_overview.rst b/doc/src/Modify_overview.rst
index 85a0677513..3ec05c4ddd 100644
--- a/doc/src/Modify_overview.rst
+++ b/doc/src/Modify_overview.rst
@@ -4,42 +4,40 @@ Overview
 The best way to add a new feature to LAMMPS is to find a similar
 feature and look at the corresponding source and header files to figure
 out what it does.  You will need some knowledge of C++ to be able to
-understand the hi-level structure of LAMMPS and its class
+understand the high-level structure of LAMMPS and its class
 organization, but functions (class methods) that do actual
 computations are written in vanilla C-style code and operate on simple
 C-style data structures (vectors and arrays).
 
 Most of the new features described on the :doc:`Modify <Modify>` doc
-page require you to write a new C++ derived class (except for
-exceptions described below, where you can make small edits to existing
-files).  Creating a new class requires 2 files, a source code file
-(\*.cpp) and a header file (\*.h).  The derived class must provide
-certain methods to work as a new option.  Depending on how different
-your new feature is compared to existing features, you can either
-derive from the base class itself, or from a derived class that
-already exists.  Enabling LAMMPS to invoke the new class is as simple
-as putting the two source files in the src dir and re-building LAMMPS.
+page require you to write a new C++ derived class (except for exceptions
+described below, where you can make small edits to existing files).
+Creating a new class requires 2 files, a source code file (\*.cpp) and a
+header file (\*.h).  The derived class must provide certain methods to
+work as a new option.  Depending on how different your new feature is
+compared to existing features, you can either derive from the base class
+itself, or from a derived class that already exists.  Enabling LAMMPS to
+invoke the new class is as simple as putting the two source files in the
+src directory and re-building LAMMPS.
 
 The advantage of C++ and its object-orientation is that all the code
 and variables needed to define the new feature are in the 2 files you
-write, and thus shouldn't make the rest of LAMMPS more complex or
+write, and thus should not make the rest of LAMMPS more complex or
 cause side-effect bugs.
 
-Here is a concrete example.  Suppose you write 2 files pair\_foo.cpp
-and pair\_foo.h that define a new class PairFoo that computes pairwise
+Here is a concrete example.  Suppose you write 2 files pair_foo.cpp
+and pair_foo.h that define a new class PairFoo that computes pairwise
 potentials described in the classic 1997 :ref:`paper <Foo>` by Foo, et al.
 If you wish to invoke those potentials in a LAMMPS input script with a
 command like
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    pair_style foo 0.1 3.5
 
-then your pair\_foo.h file should be structured as follows:
+then your pair_foo.h file should be structured as follows:
 
-
-.. parsed-literal::
+.. code-block:: c++
 
    #ifdef PAIR_CLASS
    PairStyle(foo,PairFoo)
@@ -49,16 +47,24 @@ then your pair\_foo.h file should be structured as follows:
    ...
    #endif
 
-where "foo" is the style keyword in the pair\_style command, and
-PairFoo is the class name defined in your pair\_foo.cpp and pair\_foo.h
+where "foo" is the style keyword in the pair_style command, and
+PairFoo is the class name defined in your pair_foo.cpp and pair_foo.h
 files.
 
 When you re-build LAMMPS, your new pairwise potential becomes part of
-the executable and can be invoked with a pair\_style command like the
+the executable and can be invoked with a pair_style command like the
 example above.  Arguments like 0.1 and 3.5 can be defined and
 processed by your new class.
 
-As illustrated by this pairwise example, many kinds of options are
+.. note:
+
+  With the traditional make process, simply adding the new files to the
+  src folder and compiling LAMMPS again for the desired configuration
+  with "make machine" is sufficient.  When using CMake, you need to
+  re-run CMake with "cmake ." in the build folder to have it recognize
+  the added files and include them into the build system.
+
+As illustrated by this example pair style, many kinds of options are
 referred to in the LAMMPS documentation as the "style" of a particular
 command.
 
@@ -66,14 +72,15 @@ The :doc:`Modify page <Modify>` lists all the common styles in LAMMPS,
 and discusses the header file for the base class that these styles are
 derived from.  Public variables in that file are ones used and set by
 the derived classes which are also used by the base class.  Sometimes
-they are also used by the rest of LAMMPS.  Virtual functions in the
-base class header file which are set = 0 are ones you must define in
-your new derived class to give it the functionality LAMMPS expects.
-Virtual functions that are not set to 0 are functions you can
-optionally define.
+they are also used by the rest of LAMMPS.  Pure functions, which means
+functions declared as virtual in the base class header file which are
+also set to 0, are functions you **must** implement in your new derived
+class to give it the functionality LAMMPS expects. Virtual functions
+that are not set to 0 are functions you may override or not.  Those
+are usually defined with an empty function body.
 
 Additionally, new output options can be added directly to the
-thermo.cpp, dump\_custom.cpp, and variable.cpp files.  These are also
+thermo.cpp, dump_custom.cpp, and variable.cpp files.  These are also
 listed on the :doc:`Modify page <Modify>`.
 
 Here are additional guidelines for modifying LAMMPS and adding new
@@ -82,26 +89,16 @@ functionality:
 * Think about whether what you want to do would be better as a pre- or
   post-processing step.  Many computations are more easily and more
   quickly done that way.
-* Don't do anything within the timestepping of a run that isn't
-  parallel.  E.g. don't accumulate a bunch of data on a single processor
-  and analyze it.  You run the risk of seriously degrading the parallel
-  efficiency.
+* Do not try to do anything within the timestepping of a run that is not
+  parallel.  For example do not accumulate a bunch of data on a single
+  processor and analyze it.  You run the risk of seriously degrading
+  the parallel efficiency this way.
 * If your new feature reads arguments or writes output, make sure you
   follow the unit conventions discussed by the :doc:`units <units>`
   command.
 
-
-
 ----------
 
-
 .. _Foo:
 
-
-
 **(Foo)** Foo, Morefoo, and Maxfoo, J of Classic Potentials, 75, 345 (1997).
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/Modify_pair.rst b/doc/src/Modify_pair.rst
index 84292bd10f..7263b8fd48 100644
--- a/doc/src/Modify_pair.rst
+++ b/doc/src/Modify_pair.rst
@@ -7,7 +7,7 @@ such as EAM or Tersoff where particles interact without a static bond
 topology.  New styles can be created to add new pair potentials to
 LAMMPS.
 
-Pair\_lj\_cut.cpp is a simple example of a Pair class, though it
+Pair_lj_cut.cpp is a simple example of a Pair class, though it
 includes some optional methods to enable its use with rRESPA.
 
 Here is a brief description of the class methods in pair.h:
@@ -19,22 +19,17 @@ Here is a brief description of the class methods in pair.h:
 +---------------------------------+-------------------------------------------------------------------+
 | coeff                           | set coefficients for one i,j type pair                            |
 +---------------------------------+-------------------------------------------------------------------+
-| init\_one                       | perform initialization for one i,j type pair                      |
+| init_one                        | perform initialization for one i,j type pair                      |
 +---------------------------------+-------------------------------------------------------------------+
-| init\_style                     | initialization specific to this pair style                        |
+| init_style                      | initialization specific to this pair style                        |
 +---------------------------------+-------------------------------------------------------------------+
-| write & read\_restart           | write/read i,j pair coeffs to restart files                       |
+| write & read_restart            | write/read i,j pair coeffs to restart files                       |
 +---------------------------------+-------------------------------------------------------------------+
-| write & read\_restart\_settings | write/read global settings to restart files                       |
+| write & read_restart_settings   | write/read global settings to restart files                       |
 +---------------------------------+-------------------------------------------------------------------+
 | single                          | force and energy of a single pairwise interaction between 2 atoms |
 +---------------------------------+-------------------------------------------------------------------+
-| compute\_inner/middle/outer     | versions of compute used by rRESPA                                |
+| compute_inner/middle/outer      | versions of compute used by rRESPA                                |
 +---------------------------------+-------------------------------------------------------------------+
 
 The inner/middle/outer routines are optional.
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/Modify_region.rst b/doc/src/Modify_region.rst
index 196f97c4ea..fa97df32c7 100644
--- a/doc/src/Modify_region.rst
+++ b/doc/src/Modify_region.rst
@@ -6,7 +6,7 @@ class.  Regions are used elsewhere in LAMMPS to group atoms, delete
 atoms to create a void, insert atoms in a specified region, etc.  New
 styles can be created to add new region shapes to LAMMPS.
 
-Region\_sphere.cpp is an example of a spherical region.
+Region_sphere.cpp is an example of a spherical region.
 
 Here is a brief description of methods you define in your new derived
 class.  See region.h for details.
@@ -14,14 +14,9 @@ class.  See region.h for details.
 +-------------------+---------------------------------------------------------------------+
 | inside            | determine whether a point is in the region                          |
 +-------------------+---------------------------------------------------------------------+
-| surface\_interior | determine if a point is within a cutoff distance inside of surface  |
+| surface_interior  | determine if a point is within a cutoff distance inside of surface  |
 +-------------------+---------------------------------------------------------------------+
-| surface\_exterior | determine if a point is within a cutoff distance outside of surface |
+| surface_exterior  | determine if a point is within a cutoff distance outside of surface |
 +-------------------+---------------------------------------------------------------------+
-| shape\_update     | change region shape if set by time-dependent variable               |
+| shape_update      | change region shape if set by time-dependent variable               |
 +-------------------+---------------------------------------------------------------------+
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/Modify_thermo.rst b/doc/src/Modify_thermo.rst
index d95b98ab40..564df9ec7a 100644
--- a/doc/src/Modify_thermo.rst
+++ b/doc/src/Modify_thermo.rst
@@ -25,8 +25,3 @@ for thermo output of quantities calculated by :doc:`fixes <fix>`,
 :doc:`computes <compute>`, and :doc:`variables <variable>`.  Thus, it may
 be simpler to compute what you wish via one of those constructs, than
 by adding a new keyword to the thermo command.
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/Modify_variable.rst b/doc/src/Modify_variable.rst
index 40e2e9e6a3..ded76af9da 100644
--- a/doc/src/Modify_variable.rst
+++ b/doc/src/Modify_variable.rst
@@ -9,7 +9,6 @@ via the :doc:`print <print>`, :doc:`fix print <fix_print>`, or
 "equal" can compute complex equations that involve the following types
 of arguments:
 
-
 .. parsed-literal::
 
    thermo keywords = ke, vol, atoms, ...
@@ -38,8 +37,3 @@ to find the appropriate location.
 
 Adding new :doc:`compute styles <compute>` (whose calculated values can
 then be accessed by variables) is discussed on the :doc:`Modify compute <Modify_compute>` doc page.
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/PDF/colvars-refman-lammps.pdf b/doc/src/PDF/colvars-refman-lammps.pdf
index 14deceeb87..c9a67d6a1d 100644
Binary files a/doc/src/PDF/colvars-refman-lammps.pdf and b/doc/src/PDF/colvars-refman-lammps.pdf differ
diff --git a/doc/src/Packages.rst b/doc/src/Packages.rst
index ded2ae27e0..042485eb4b 100644
--- a/doc/src/Packages.rst
+++ b/doc/src/Packages.rst
@@ -11,15 +11,9 @@ distribution.  The :doc:`Build package <Build_package>` doc page gives
 general info on how to install and un-install packages as part of the
 LAMMPS build process.
 
-
 .. toctree::
    :maxdepth: 1
 
    Packages_standard
    Packages_user
    Packages_details
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/Packages_details.rst b/doc/src/Packages_details.rst
index efdd222cf1..8251c5301e 100644
--- a/doc/src/Packages_details.rst
+++ b/doc/src/Packages_details.rst
@@ -10,7 +10,7 @@ scripts, and pictures/movies (if available) that illustrate use of the
 package.
 
 The majority of packages can be included in a LAMMPS build with a
-single setting (-D PGK\_NAME for CMake) or command ("make yes-name" for
+single setting (-D PGK_NAME for CMake) or command ("make yes-name" for
 make).  See the :doc:`Build package <Build_package>` doc page for more
 info.  A few packages may require additional steps; this is indicated
 in the descriptions below.  The :doc:`Build extras <Build_extras>` doc
@@ -24,40 +24,89 @@ page gives those details.
    pair, bond, angle, etc correspond to commands with the same style name
    as contained in the file name.
 
-+------------------------------+--------------------------------+--------------------------------+------------------------------+--------------------------------+----------------------------------+
-| :ref:`ASPHERE <PKG-ASPHERE>` | :ref:`BODY <PKG-BODY>`         | :ref:`CLASS2 <PKG-CLASS2>`     | :ref:`COLLOID <PKG-COLLOID>` | :ref:`COMPRESS <PKG-COMPRESS>` | :ref:`CORESHELL <PKG-CORESHELL>` |
-+------------------------------+--------------------------------+--------------------------------+------------------------------+--------------------------------+----------------------------------+
-| :ref:`DIPOLE <PKG-DIPOLE>`   | :ref:`GPU <PKG-GPU>`           | :ref:`GRANULAR <PKG-GRANULAR>` | :ref:`KIM <PKG-KIM>`         | :ref:`KOKKOS <PKG-KOKKOS>`     | :ref:`KSPACE <PKG-KSPACE>`       |
-+------------------------------+--------------------------------+--------------------------------+------------------------------+--------------------------------+----------------------------------+
-| :ref:`LATTE <PKG-LATTE>`     | :ref:`MANYBODY <PKG-MANYBODY>` | :ref:`MC <PKG-MC>`             | :ref:`MESSAGE <PKG-MESSAGE>` | :ref:`MISC <PKG-MISC>`         | :ref:`MOLECULE <PKG-MOLECULE>`   |
-+------------------------------+--------------------------------+--------------------------------+------------------------------+--------------------------------+----------------------------------+
-| :ref:`MPIIO <PKG-MPIIO>`     | :ref:`MSCG <PKG-MSCG>`         | :ref:`OPT <PKG-OPT>`           | :ref:`PERI <PKG-PERI>`       | :ref:`POEMS <PKG-POEMS>`       | :ref:`PYTHON <PKG-PYTHON>`       |
-+------------------------------+--------------------------------+--------------------------------+------------------------------+--------------------------------+----------------------------------+
-| :ref:`QEQ <PKG-QEQ>`         | :ref:`REPLICA <PKG-REPLICA2>`  | :ref:`RIGID <PKG-RIGID>`       | :ref:`SHOCK <PKG-SHOCK>`     | :ref:`SNAP <PKG-SNAP>`         | :ref:`SPIN <PKG-SPIN>`           |
-+------------------------------+--------------------------------+--------------------------------+------------------------------+--------------------------------+----------------------------------+
-| :ref:`SRD <PKG-SRD>`         | :ref:`VORONOI <PKG-VORONOI>`   |                                |                              |                                |                                  |
-+------------------------------+--------------------------------+--------------------------------+------------------------------+--------------------------------+----------------------------------+
+.. table_from_list::
+   :columns: 6
 
-+----------------------------------------+------------------------------------------------+------------------------------------+------------------------------------------+--------------------------------------+------------------------------------+
-| :ref:`USER-ADIOS <PKG-USER-ADIOS>`     | :ref:`USER-ATC <PKG-USER-ATC>`                 | :ref:`USER-AWPMD <PKG-USER-AWPMD>` | :ref:`USER-BOCS <PKG-USER-BOCS>`         | :ref:`USER-CGDNA <PKG-USER-CGDNA>`   | :ref:`USER-CGSDK <PKG-USER-CGSDK>` |
-+----------------------------------------+------------------------------------------------+------------------------------------+------------------------------------------+--------------------------------------+------------------------------------+
-| :ref:`USER-COLVARS <PKG-USER-COLVARS>` | :ref:`USER-DIFFRACTION <PKG-USER-DIFFRACTION>` | :ref:`USER-DPD <PKG-USER-DPD>`     | :ref:`USER-DRUDE <PKG-USER-DRUDE>`       | :ref:`USER-EFF <PKG-USER-EFF>`       | :ref:`USER-FEP <PKG-USER-FEP>`     |
-+----------------------------------------+------------------------------------------------+------------------------------------+------------------------------------------+--------------------------------------+------------------------------------+
-| :ref:`USER-H5MD <PKG-USER-H5MD>`       | :ref:`USER-INTEL <PKG-USER-INTEL>`             | :ref:`USER-LB <PKG-USER-LB>`       | :ref:`USER-MANIFOLD <PKG-USER-MANIFOLD>` | :ref:`USER-MEAMC <PKG-USER-MEAMC>`   | :ref:`USER-MESO <PKG-USER-MESO>`   |
-+----------------------------------------+------------------------------------------------+------------------------------------+------------------------------------------+--------------------------------------+------------------------------------+
-| :ref:`USER-MGPT <PKG-USER-MGPT>`       | :ref:`USER-MISC <PKG-USER-MISC>`               | :ref:`USER-MOFFF <PKG-USER-MOFFF>` | :ref:`USER-MOLFILE <PKG-USER-MOLFILE>`   | :ref:`USER-NETCDF <PKG-USER-NETCDF>` | :ref:`USER-OMP <PKG-USER-OMP>`     |
-+----------------------------------------+------------------------------------------------+------------------------------------+------------------------------------------+--------------------------------------+------------------------------------+
-| :ref:`USER-PHONON <PKG-USER-PHONON>`   | :ref:`USER-PLUMED <PKG-USER-PLUMED>`           | :ref:`USER-PTM <PKG-USER-PTM>`     | :ref:`USER-QMMM <PKG-USER-QMMM>`         | :ref:`USER-QTB <PKG-USER-QTB>`       | :ref:`USER-QUIP <PKG-USER-QUIP>`   |
-+----------------------------------------+------------------------------------------------+------------------------------------+------------------------------------------+--------------------------------------+------------------------------------+
-| :ref:`USER-REAXC <PKG-USER-REAXC>`     | :ref:`USER-SCAFACOS <PKG-USER-SCAFACOS>`       | :ref:`USER-SDPD <PKG-USER-SDPD>`   | :ref:`USER-SMD <PKG-USER-SMD>`           | :ref:`USER-SMTBQ <PKG-USER-SMTBQ>`   | :ref:`USER-SPH <PKG-USER-SPH>`     |
-+----------------------------------------+------------------------------------------------+------------------------------------+------------------------------------------+--------------------------------------+------------------------------------+
-| :ref:`USER-TALLY <PKG-USER-TALLY>`     | :ref:`USER-UEF <PKG-USER-UEF>`                 | :ref:`USER-VTK <PKG-USER-VTK>`     | :ref:`USER-YAFF <PKG-USER-YAFF>`         |                                      |                                    |
-+----------------------------------------+------------------------------------------------+------------------------------------+------------------------------------------+--------------------------------------+------------------------------------+
+   * :ref:`ASPHERE <PKG-ASPHERE>`
+   * :ref:`BODY <PKG-BODY>`
+   * :ref:`CLASS2 <PKG-CLASS2>`
+   * :ref:`COLLOID <PKG-COLLOID>`
+   * :ref:`COMPRESS <PKG-COMPRESS>`
+   * :ref:`CORESHELL <PKG-CORESHELL>`
+   * :ref:`DIPOLE <PKG-DIPOLE>`
+   * :ref:`GPU <PKG-GPU>`
+   * :ref:`GRANULAR <PKG-GRANULAR>`
+   * :ref:`KIM <PKG-KIM>`
+   * :ref:`KOKKOS <PKG-KOKKOS>`
+   * :ref:`KSPACE <PKG-KSPACE>`
+   * :ref:`LATTE <PKG-LATTE>`
+   * :ref:`MANYBODY <PKG-MANYBODY>`
+   * :ref:`MC <PKG-MC>`
+   * :ref:`MESSAGE <PKG-MESSAGE>`
+   * :ref:`MISC <PKG-MISC>`
+   * :ref:`MOLECULE <PKG-MOLECULE>`
+   * :ref:`MPIIO <PKG-MPIIO>`
+   * :ref:`MSCG <PKG-MSCG>`
+   * :ref:`OPT <PKG-OPT>`
+   * :ref:`PERI <PKG-PERI>`
+   * :ref:`POEMS <PKG-POEMS>`
+   * :ref:`PYTHON <PKG-PYTHON>`
+   * :ref:`QEQ <PKG-QEQ>`
+   * :ref:`REPLICA <PKG-REPLICA>`
+   * :ref:`RIGID <PKG-RIGID>`
+   * :ref:`SHOCK <PKG-SHOCK>`
+   * :ref:`SNAP <PKG-SNAP>`
+   * :ref:`SPIN <PKG-SPIN>`
+   * :ref:`SRD <PKG-SRD>`
+   * :ref:`VORONOI <PKG-VORONOI>`
 
+.. table_from_list::
+   :columns: 6
+
+   * :ref:`USER-ADIOS <PKG-USER-ADIOS>`
+   * :ref:`USER-ATC <PKG-USER-ATC>`
+   * :ref:`USER-AWPMD <PKG-USER-AWPMD>`
+   * :ref:`USER-BOCS <PKG-USER-BOCS>`
+   * :ref:`USER-CGDNA <PKG-USER-CGDNA>`
+   * :ref:`USER-CGSDK <PKG-USER-CGSDK>`
+   * :ref:`USER-COLVARS <PKG-USER-COLVARS>`
+   * :ref:`USER-DIFFRACTION <PKG-USER-DIFFRACTION>`
+   * :ref:`USER-DPD <PKG-USER-DPD>`
+   * :ref:`USER-DRUDE <PKG-USER-DRUDE>`
+   * :ref:`USER-EFF <PKG-USER-EFF>`
+   * :ref:`USER-FEP <PKG-USER-FEP>`
+   * :ref:`USER-H5MD <PKG-USER-H5MD>`
+   * :ref:`USER-INTEL <PKG-USER-INTEL>`
+   * :ref:`USER-LB <PKG-USER-LB>`
+   * :ref:`USER-MANIFOLD <PKG-USER-MANIFOLD>`
+   * :ref:`USER-MEAMC <PKG-USER-MEAMC>`
+   * :ref:`USER-MESODPD <PKG-USER-MESODPD>`
+   * :ref:`USER-MGPT <PKG-USER-MGPT>`
+   * :ref:`USER-MISC <PKG-USER-MISC>`
+   * :ref:`USER-MOFFF <PKG-USER-MOFFF>`
+   * :ref:`USER-MOLFILE <PKG-USER-MOLFILE>`
+   * :ref:`USER-NETCDF <PKG-USER-NETCDF>`
+   * :ref:`USER-OMP <PKG-USER-OMP>`
+   * :ref:`USER-PHONON <PKG-USER-PHONON>`
+   * :ref:`USER-PLUMED <PKG-USER-PLUMED>`
+   * :ref:`USER-PTM <PKG-USER-PTM>`
+   * :ref:`USER-QMMM <PKG-USER-QMMM>`
+   * :ref:`USER-QTB <PKG-USER-QTB>`
+   * :ref:`USER-QUIP <PKG-USER-QUIP>`
+   * :ref:`USER-REACTION <PKG-USER-REACTION>`
+   * :ref:`USER-REAXC <PKG-USER-REAXC>`
+   * :ref:`USER-SCAFACOS <PKG-USER-SCAFACOS>`
+   * :ref:`USER-SDPD <PKG-USER-SDPD>`
+   * :ref:`USER-SMD <PKG-USER-SMD>`
+   * :ref:`USER-SMTBQ <PKG-USER-SMTBQ>`
+   * :ref:`USER-SPH <PKG-USER-SPH>`
+   * :ref:`USER-TALLY <PKG-USER-TALLY>`
+   * :ref:`USER-UEF <PKG-USER-UEF>`
+   * :ref:`USER-VTK <PKG-USER-VTK>`
+   * :ref:`USER-YAFF <PKG-USER-YAFF>`
 
 ----------
 
-
 .. _PKG-ASPHERE:
 
 ASPHERE package
@@ -74,17 +123,15 @@ particle models including ellipsoids, 2d lines, and 3d triangles.
 * :doc:`Howto spherical <Howto_spherical>`
 * :doc:`pair_style gayberne <pair_gayberne>`
 * :doc:`pair_style resquared <pair_resquared>`
-* `doc/PDF/pair\_gayberne\_extra.pdf <PDF/pair_gayberne_extra.pdf>`_
-* `doc/PDF/pair\_resquared\_extra.pdf <PDF/pair_resquared_extra.pdf>`_
+* `doc/PDF/pair_gayberne_extra.pdf <PDF/pair_gayberne_extra.pdf>`_
+* `doc/PDF/pair_resquared_extra.pdf <PDF/pair_resquared_extra.pdf>`_
 * examples/ASPHERE
 * examples/ellipse
-* http://lammps.sandia.gov/movies.html#line
-* http://lammps.sandia.gov/movies.html#tri
-
+* https://lammps.sandia.gov/movies.html#line
+* https://lammps.sandia.gov/movies.html#tri
 
 ----------
 
-
 .. _PKG-BODY:
 
 BODY package
@@ -100,16 +147,14 @@ overview.
 **Supporting info:**
 
 * src/BODY filenames -> commands
-* :doc:`Howto\_body <Howto_body>`
+* :doc:`Howto_body <Howto_body>`
 * :doc:`atom_style body <atom_style>`
 * :doc:`fix nve/body <fix_nve_body>`
 * :doc:`pair_style body/nparticle <pair_body_nparticle>`
 * examples/body
 
-
 ----------
 
-
 .. _PKG-CLASS2:
 
 CLASS2 package
@@ -129,10 +174,8 @@ CLASS2 molecular force field.
 * :doc:`improper_style class2 <improper_class2>`
 * :doc:`pair_style lj/class2 <pair_class2>`
 
-
 ----------
 
-
 .. _PKG-COLLOID:
 
 COLLOID package
@@ -161,10 +204,8 @@ Higdon's group at UIUC.
 * examples/colloid
 * examples/srd
 
-
 ----------
 
-
 .. _PKG-COMPRESS:
 
 COMPRESS package
@@ -194,10 +235,8 @@ This package has :ref:`specific installation instructions <compress>` on the :do
 * :doc:`dump custom/gz <dump>`
 * :doc:`dump xyz/gz <dump>`
 
-
 ----------
 
-
 .. _PKG-CORESHELL:
 
 CORESHELL package
@@ -224,10 +263,8 @@ this package.
 * :doc:`pair_style lj/cut/coul/long/cs <pair_lj>`
 * examples/coreshell
 
-
 ----------
 
-
 .. _PKG-DIPOLE:
 
 DIPOLE package
@@ -247,10 +284,8 @@ short-range or long-range interactions.
 * :doc:`pair_style lj/long/dipole/long <pair_dipole>`
 * examples/dipole
 
-
 ----------
 
-
 .. _PKG-GPU:
 
 GPU package
@@ -285,13 +320,12 @@ This package has :ref:`specific installation instructions <gpu>` on the :doc:`Bu
 * :doc:`Section 2.6 -sf gpu <Run_options>`
 * :doc:`Section 2.6 -pk gpu <Run_options>`
 * :doc:`package gpu <package>`
-* `Commands all <lc_>`_ pages (pair,kspace) for styles followed by (g)
-* `Benchmarks page <http://lammps.sandia.gov/bench.html>`_ of web site
-
+* :doc:`Commands <Commands_all>` pages (:doc:`pair <Commands_pair>`, :doc:`kspace <Commands_kspace>`)
+  for styles followed by (g)
+* `Benchmarks page <https://lammps.sandia.gov/bench.html>`_ of web site
 
 ----------
 
-
 .. _PKG-GRANULAR:
 
 GRANULAR package
@@ -314,16 +348,14 @@ potentials.
 * examples/granregion
 * examples/pour
 * bench/in.chute
-* http://lammps.sandia.gov/pictures.html#jamming
-* http://lammps.sandia.gov/movies.html#hopper
-* http://lammps.sandia.gov/movies.html#dem
-* http://lammps.sandia.gov/movies.html#brazil
-* http://lammps.sandia.gov/movies.html#granregion
-
+* https://lammps.sandia.gov/pictures.html#jamming
+* https://lammps.sandia.gov/movies.html#hopper
+* https://lammps.sandia.gov/movies.html#dem
+* https://lammps.sandia.gov/movies.html#brazil
+* https://lammps.sandia.gov/movies.html#granregion
 
 ----------
 
-
 .. _PKG-KIM:
 
 KIM package
@@ -333,19 +365,24 @@ KIM package
 
 This package contains a set of commands that serve as a wrapper on the
 `Open Knowledgebase of Interatomic Models (OpenKIM) <https://openkim.org>`_
-repository of interatomic models (IMs)
-enabling compatible ones to be used in LAMMPS simulations.
-This includes :doc:`kim_init and kim\_interactions <kim_commands>`
-commands to select, initialize and instantiate the IM, and a
-:doc:`kim_query <kim_commands>` command to perform web queries
-for material property predictions of OpenKIM IMs.
+repository of interatomic models (IMs) enabling compatible ones to be used in
+LAMMPS simulations.
+
+This includes :doc:`kim_init <kim_commands>`, and
+:doc:`kim_interactions <kim_commands>` commands to select, initialize and
+instantiate the IM, a :doc:`kim_query <kim_commands>` command to perform web
+queries for material property predictions of OpenKIM IMs, a
+:doc:`kim_param <kim_commands>` command to access KIM Model Parameters from
+LAMMPS, and a :doc:`kim_property <kim_commands>` command to write material
+properties computed in LAMMPS to standard KIM property instance format.
+
 Support for KIM IMs that conform to the
 `KIM Application Programming Interface (API) <https://openkim.org/kim-api/>`_
 is provided by the :doc:`pair_style kim <pair_kim>` command.
 
 .. note::
 
-   The command *pair\_style kim* is called by *kim\_interactions* and
+   The command *pair_style kim* is called by *kim_interactions* and
    is not recommended to be directly used in input scripts.
 
 To use this package you must have the KIM API library available on your
@@ -360,13 +397,16 @@ The KIM project is led by Ellad Tadmor and Ryan Elliott (U Minnesota)
 and is funded by the `National Science Foundation <https://www.nsf.gov/>`_.
 
 **Authors:** Ryan Elliott (U Minnesota) is the main developer for the KIM
-API and the *pair\_style kim* command. Axel Kohlmeyer (Temple U) and
-Ellad Tadmor (U Minnesota) contributed to the :doc:`kim_commands <kim_commands>`
-interface in close collaboration with Ryan Elliott.
+API and the *pair_style kim* command. Yaser Afshar (U Minnesota),
+Axel Kohlmeyer (Temple U), Ellad Tadmor (U Minnesota), and
+Daniel Karls (U Minnesota) contributed to the
+:doc:`kim_commands <kim_commands>` interface in close collaboration with
+Ryan Elliott.
 
 **Install:**
 
-This package has :ref:`specific installation instructions <kim>` on the :doc:`Build extras <Build_extras>` doc page.
+This package has :ref:`specific installation instructions <kim>` on the
+:doc:`Build extras <Build_extras>` doc page.
 
 **Supporting info:**
 
@@ -377,10 +417,8 @@ This package has :ref:`specific installation instructions <kim>` on the :doc:`Bu
 * lib/kim/README
 * examples/kim
 
-
 ----------
 
-
 .. _PKG-KOKKOS:
 
 KOKKOS package
@@ -428,13 +466,13 @@ This package has :ref:`specific installation instructions <kokkos>` on the :doc:
 * :doc:`Section 2.6 -sf kk <Run_options>`
 * :doc:`Section 2.6 -pk kokkos <Run_options>`
 * :doc:`package kokkos <package>`
-* `Commands all <lc_>`_ pages (fix,compute,pair,etc) for styles followed by (k)
-* `Benchmarks page <http://lammps.sandia.gov/bench.html>`_ of web site
-
+* Search the :doc:`commands <Commands_all>` pages (:doc:`fix <Commands_fix>`, :doc:`compute <Commands_compute>`,
+  :doc:`pair <Commands_pair>`, :doc:`bond, angle, dihedral, improper <Commands_bond>`,
+  :doc:`kspace <Commands_kspace>`) for styles followed by (k)
+* `Benchmarks page <https://lammps.sandia.gov/bench.html>`_ of web site
 
 ----------
 
-
 .. _PKG-KSPACE:
 
 KSPACE package
@@ -464,14 +502,12 @@ different FFT options for your LAMPMS build.
 * :doc:`Howto tip4p <Howto_tip4p>`
 * :doc:`Howto spc <Howto_spc>`
 * :doc:`pair_style coul <pair_coul>`
-* :doc:`Commands pair <Commands_pair>` page for styles with "long" or "msm" in name
+* Search the :doc:`pair style <Commands_pair>` page for styles with "long" or "msm" in name
 * examples/peptide
 * bench/in.rhodo
 
-
 ----------
 
-
 .. _PKG-LATTE:
 
 LATTE package
@@ -489,8 +525,6 @@ description is given with the :doc:`fix latte <fix_latte>` command.
 
 .. _latte-home: https://github.com/lanl/LATTE
 
-
-
 **Authors:** Christian Negre (LANL) and Steve Plimpton (Sandia).  LATTE
 itself is developed at Los Alamos National Laboratory by Marc
 Cawkwell, Anders Niklasson, and Christian Negre.
@@ -508,10 +542,8 @@ This package has :ref:`specific installation instructions <latte>` on the :doc:`
 * examples/latte
 * `LAMMPS-LATTE tutorial <https://github.com/lanl/LATTE/wiki/Using-LATTE-through-LAMMPS>`_
 
-
 ----------
 
-
 .. _PKG-MANYBODY:
 
 MANYBODY package
@@ -525,7 +557,7 @@ A variety of many-body and bond-order potentials.  These include
 **Supporting info:**
 
 * src/MANYBODY: filenames -> commands
-* :doc:`Commands pair <Commands_pair>` page
+* :doc:`Pair style <Commands_pair>` page
 * examples/comb
 * examples/eim
 * examples/nb3d
@@ -534,10 +566,8 @@ A variety of many-body and bond-order potentials.  These include
 * examples/vashishta
 * bench/in.eam
 
-
 ----------
 
-
 .. _PKG-MC:
 
 MC package
@@ -559,12 +589,10 @@ bonds, for performing atomic swaps, and performing grand-canonical MC
 * :doc:`fix bond/swap <fix_bond_swap>`
 * :doc:`fix gcmc <fix_gcmc>`
 * :doc:`pair_style dsmc <pair_dsmc>`
-* http://lammps.sandia.gov/movies.html#gcmc
-
+* https://lammps.sandia.gov/movies.html#gcmc
 
 ----------
 
-
 .. _PKG-MESSAGE:
 
 MESSAGE package
@@ -589,10 +617,8 @@ This package has :ref:`specific installation instructions <message>` on the :doc
 * :doc:`server mc <server_mc>`
 * examples/message
 
-
 ----------
 
-
 .. _PKG-MISC:
 
 MISC package
@@ -620,13 +646,11 @@ listing, "ls src/MISC", to see the list of commands.
 * :doc:`fix viscosity <fix_viscosity>`
 * examples/KAPPA
 * examples/VISCOSITY
-* http://lammps.sandia.gov/pictures.html#ttm
-* http://lammps.sandia.gov/movies.html#evaporation
-
+* https://lammps.sandia.gov/pictures.html#ttm
+* https://lammps.sandia.gov/movies.html#evaporation
 
 ----------
 
-
 .. _PKG-MOLECULE:
 
 MOLECULE package
@@ -657,10 +681,8 @@ force fields, and a TIP4P water model.
 * bench/in.chain
 * bench/in.rhodo
 
-
 ----------
 
-
 .. _PKG-MPIIO:
 
 MPIIO package
@@ -681,10 +703,8 @@ written and read in parallel.
 * :doc:`write_restart <write_restart>`
 * :doc:`read_restart <read_restart>`
 
-
 ----------
 
-
 .. _PKG-mscg:
 
 MSCG package
@@ -697,8 +717,6 @@ Multi-Scale Coarse-Graining (MSCG) model using the open-source `MS-CG library <m
 
 .. _mscg-home: https://github.com/uchicago-voth/MSCG-release
 
-
-
 To use this package you must have the MS-CG library available on your
 system.
 
@@ -717,10 +735,8 @@ This package has :ref:`specific installation instructions <mscg>` on the :doc:`B
 * lib/mscg/README
 * examples/mscg
 
-
 ----------
 
-
 .. _PKG-OPT:
 
 OPT package
@@ -738,7 +754,7 @@ invoked at run time via the "-sf opt" or "-suffix opt" :doc:`command-line switch
 have styles optimized for CPU performance.
 
 **Authors:** James Fischer (High Performance Technologies), David Richie,
-and Vincent Natoli (Stone Ridge Technolgy).
+and Vincent Natoli (Stone Ridge Technology).
 
 **Install:**
 
@@ -750,13 +766,11 @@ This package has :ref:`specific installation instructions <opt>` on the :doc:`Bu
 * :doc:`Speed packages <Speed_packages>`
 * :doc:`Speed opt <Speed_opt>`
 * :doc:`Section 2.6 -sf opt <Run_options>`
-* :doc:`Commands pair <Commands_pair>` for styles followed by (t)
-* `Benchmarks page <http://lammps.sandia.gov/bench.html>`_ of web site
-
+* Search the :doc:`pair style <Commands_pair>` page for styles followed by (t)
+* `Benchmarks page <https://lammps.sandia.gov/bench.html>`_ of web site
 
 ----------
 
-
 .. _PKG-PERI:
 
 PERI package
@@ -776,20 +790,18 @@ Foster (UTSA).
 **Supporting info:**
 
 * src/PERI: filenames -> commands
-* `doc/PDF/PDLammps\_overview.pdf <PDF/PDLammps_overview.pdf>`_
-* `doc/PDF/PDLammps\_EPS.pdf <PDF/PDLammps_EPS.pdf>`_
-* `doc/PDF/PDLammps\_VES.pdf <PDF/PDLammps_VES.pdf>`_
+* `doc/PDF/PDLammps_overview.pdf <PDF/PDLammps_overview.pdf>`_
+* `doc/PDF/PDLammps_EPS.pdf <PDF/PDLammps_EPS.pdf>`_
+* `doc/PDF/PDLammps_VES.pdf <PDF/PDLammps_VES.pdf>`_
 * :doc:`atom_style peri <atom_style>`
 * :doc:`pair_style peri/\* <pair_peri>`
 * :doc:`compute damage/atom <compute_damage_atom>`
 * :doc:`compute plasticity/atom <compute_plasticity_atom>`
 * examples/peri
-* http://lammps.sandia.gov/movies.html#peri
-
+* https://lammps.sandia.gov/movies.html#peri
 
 ----------
 
-
 .. _PKG-POEMS:
 
 POEMS package
@@ -817,10 +829,8 @@ This package has :ref:`specific installation instructions <poems>` on the :doc:`
 * :doc:`fix poems <fix_poems>`
 * examples/rigid
 
-
 ----------
 
-
 .. _PKG-PYTHON:
 
 PYTHON package
@@ -852,10 +862,8 @@ This package has :ref:`specific installation instructions <python>` on the :doc:
 * lib/python/README
 * examples/python
 
-
 ----------
 
-
 .. _PKG-QEQ:
 
 QEQ package
@@ -874,11 +882,9 @@ part of their formulation.
 * examples/qeq
 * examples/streitz
 
-
 ----------
 
-
-.. _PKG-REPLICA2:
+.. _PKG-REPLICA:
 
 REPLICA package
 ---------------
@@ -907,10 +913,8 @@ another set.
 * examples/prd
 * examples/tad
 
-
 ----------
 
-
 .. _PKG-RIGID:
 
 RIGID package
@@ -927,19 +931,17 @@ Also several computes which calculate properties of rigid bodies.
 
 * src/RIGID: filenames -> commands
 * :doc:`compute erotate/rigid <compute_erotate_rigid>`
-* fix shake"_fix\_shake.html
+* :doc:`fix shake <fix_shake>`
 * :doc:`fix rattle <fix_shake>`
 * :doc:`fix rigid/\* <fix_rigid>`
 * examples/ASPHERE
 * examples/rigid
 * bench/in.rhodo
-* http://lammps.sandia.gov/movies.html#box
-* http://lammps.sandia.gov/movies.html#star
-
+* https://lammps.sandia.gov/movies.html#box
+* https://lammps.sandia.gov/movies.html#star
 
 ----------
 
-
 .. _PKG-SHOCK:
 
 SHOCK package
@@ -960,10 +962,8 @@ a material.
 * examples/hugoniostat
 * examples/msst
 
-
 ----------
 
-
 .. _PKG-SNAP:
 
 SNAP package
@@ -987,10 +987,8 @@ computes which analyze attributes of the potential.
 * :doc:`compute snav/atom <compute_sna_atom>`
 * examples/snap
 
-
 ----------
 
-
 .. _PKG-SPIN:
 
 SPIN package
@@ -1019,10 +1017,8 @@ the usual manner via MD.  Various pair, fix, and compute styles.
 * :doc:`neb/spin <neb_spin>`
 * examples/SPIN
 
-
 ----------
 
-
 .. _PKG-SRD:
 
 SRD package
@@ -1041,14 +1037,12 @@ colloidal particles.
 * :doc:`fix wall/srd <fix_wall_srd>`
 * examples/srd
 * examples/ASPHERE
-* http://lammps.sandia.gov/movies.html#tri
-* http://lammps.sandia.gov/movies.html#line
-* http://lammps.sandia.gov/movies.html#poly
-
+* https://lammps.sandia.gov/movies.html#tri
+* https://lammps.sandia.gov/movies.html#line
+* https://lammps.sandia.gov/movies.html#poly
 
 ----------
 
-
 .. _PKG-VORONOI:
 
 VORONOI package
@@ -1063,8 +1057,6 @@ neighbors.
 
 .. _voro-home: http://math.lbl.gov/voro++
 
-
-
 To use this package you must have the Voro++ library available on your
 system.
 
@@ -1084,10 +1076,8 @@ This package has :ref:`specific installation instructions <voronoi>` on the :doc
 * :doc:`compute voronoi/atom <compute_voronoi_atom>`
 * examples/voronoi
 
-
 ----------
 
-
 .. _PKG-USER-ADIOS:
 
 USER-ADIOS package
@@ -1116,11 +1106,8 @@ This package has :ref:`specific installation instructions <user-adios>` on the :
 * :doc:`dump custom/adios <dump_adios>`
 * :doc:`read_dump <read_dump>`
 
-
-
 ----------
 
-
 .. _PKG-USER-ATC:
 
 USER-ATC package
@@ -1144,12 +1131,10 @@ This package has :ref:`specific installation instructions <user-atc>` on the :do
 * src/USER-ATC/README
 * :doc:`fix atc <fix_atc>`
 * examples/USER/atc
-* http://lammps.sandia.gov/pictures.html#atc
-
+* https://lammps.sandia.gov/pictures.html#atc
 
 ----------
 
-
 .. _PKG-USER-AWPMD:
 
 USER-AWPMD package
@@ -1175,10 +1160,8 @@ This package has :ref:`specific installation instructions <user-awpmd>` on the :
 * :doc:`pair_style awpmd/cut <pair_awpmd>`
 * examples/USER/awpmd
 
-
 ----------
 
-
 .. _PKG-USER-BOCS:
 
 USER-BOCS package
@@ -1210,10 +1193,8 @@ J. Phys. Chem. B. 122, 13, 3363-3377 (2018).
 
 Example inputs are in the examples/USER/bocs folder.
 
-
 ----------
 
-
 .. _PKG-USER-CGDNA:
 
 USER-CGDNA package
@@ -1221,11 +1202,10 @@ USER-CGDNA package
 
 **Contents:**
 
-Several pair styles, a bond style, and integration fixes for
-coarse-grained models of single- and double-stranded DNA based on the
-oxDNA model of Doye, Louis and Ouldridge at the University of Oxford.
-This includes Langevin-type rigid-body integrators with improved
-stability.
+Several pair styles, bond styles, and integration fixes for coarse-grained
+modelling of single- and double-stranded DNA and RNA based on the oxDNA and
+oxRNA model of Doye, Louis and Ouldridge. The package includes Langevin-type
+rigid-body integrators with improved stability.
 
 **Author:** Oliver Henrich (University of Strathclyde, Glasgow).
 
@@ -1235,14 +1215,14 @@ stability.
 * /src/USER-CGDNA/README
 * :doc:`pair_style oxdna/\* <pair_oxdna>`
 * :doc:`pair_style oxdna2/\* <pair_oxdna2>`
+* :doc:`pair_style oxrna2/\* <pair_oxrna2>`
 * :doc:`bond_style oxdna/\* <bond_oxdna>`
 * :doc:`bond_style oxdna2/\* <bond_oxdna>`
+* :doc:`bond_style oxrna2/\* <bond_oxdna>`
 * :doc:`fix nve/dotc/langevin <fix_nve_dotc_langevin>`
 
-
 ----------
 
-
 .. _PKG-USER-CGSDK:
 
 USER-CGSDK package
@@ -1264,12 +1244,10 @@ acids.
 * :doc:`pair_style lj/sdk/\* <pair_sdk>`
 * :doc:`angle_style sdk <angle_sdk>`
 * examples/USER/cgsdk
-* http://lammps.sandia.gov/pictures.html#cg
-
+* https://lammps.sandia.gov/pictures.html#cg
 
 ----------
 
-
 .. _PKG-USER-COLVARS:
 
 USER-COLVARS package
@@ -1303,10 +1281,8 @@ This package has :ref:`specific installation instructions <user-colvars>` on the
 * :doc:`fix colvars <fix_colvars>`
 * examples/USER/colvars
 
-
 ----------
 
-
 .. _PKG-USER-PLUMED:
 
 USER-PLUMED package
@@ -1323,9 +1299,7 @@ script by using the :doc:`fix plumed <fix_plumed>` command.
 Massimilliano Bonomi, Giovanni Bussi, Carlo Camiloni and Gareth
 Tribello.
 
-.. _PLUMED: http://www.plumed.org
-
-
+.. _PLUMED: https://www.plumed.org
 
 **Install:**
 
@@ -1338,10 +1312,8 @@ This package has :ref:`specific installation instructions <user-plumed>` on the
 * :doc:`fix plumed <fix_plumed>`
 * examples/USER/plumed
 
-
 ----------
 
-
 .. _PKG-USER-DIFFRACTION:
 
 USER-DIFFRACTION package
@@ -1362,10 +1334,8 @@ intensities based on kinematic diffraction theory.
 * :doc:`fix saed/vtk <fix_saed_vtk>`
 * examples/USER/diffraction
 
-
 ----------
 
-
 .. _PKG-USER-DPD:
 
 USER-DPD package
@@ -1405,10 +1375,8 @@ Brennan (ARL).
 * :doc:`pair_style multi/lucy/rx <pair_multi_lucy_rx>`
 * examples/USER/dpd
 
-
 ----------
 
-
 .. _PKG-USER-DRUDE:
 
 USER-DRUDE package
@@ -1439,10 +1407,8 @@ Devemy (CNRS), and Agilio Padua (U Blaise Pascal).
 * examples/USER/drude
 * tools/drude
 
-
 ----------
 
-
 .. _PKG-USER-EFF:
 
 USER-EFF package
@@ -1475,12 +1441,10 @@ tools/eff; see its README file.
 * examples/USER/eff
 * tools/eff/README
 * tools/eff
-* http://lammps.sandia.gov/movies.html#eff
-
+* https://lammps.sandia.gov/movies.html#eff
 
 ----------
 
-
 .. _PKG-USER-FEP:
 
 USER-FEP package
@@ -1506,10 +1470,8 @@ for using this package in tools/fep; see its README file.
 * tools/fep/README
 * tools/fep
 
-
 ----------
 
-
 .. _PKG-USER-H5MD:
 
 USER-H5MD package
@@ -1525,8 +1487,6 @@ LAMMPS snapshots in this format.
 
 .. _HDF5: http://www.hdfgroup.org/HDF5
 
-
-
 To use this package you must have the HDF5 library available on your
 system.
 
@@ -1544,10 +1504,8 @@ This package has :ref:`specific installation instructions <user-h5md>` on the :d
 * lib/h5md/README
 * :doc:`dump h5md <dump_h5md>`
 
-
 ----------
 
-
 .. _PKG-USER-INTEL:
 
 USER-INTEL package
@@ -1588,14 +1546,13 @@ This package has :ref:`specific installation instructions <user-intel>` on the :
 * :doc:`Section 2.6 -sf intel <Run_options>`
 * :doc:`Section 2.6 -pk intel <Run_options>`
 * :doc:`package intel <package>`
-* `Commands all <lc_>`_ pages (fix,compute,pair,etc) for styles followed by (i)
+* Search the :doc:`commands <Commands_all>` pages (:doc:`fix <Commands_fix>`, :doc:`compute <Commands_compute>`,
+  :doc:`pair <Commands_pair>`, :doc:`bond, angle, dihedral, improper <Commands_bond>`, :doc:`kspace <Commands_kspace>`) for styles followed by (i)
 * src/USER-INTEL/TEST
-* `Benchmarks page <http://lammps.sandia.gov/bench.html>`_ of web site
-
+* `Benchmarks page <https://lammps.sandia.gov/bench.html>`_ of web site
 
 ----------
 
-
 .. _PKG-USER-LB:
 
 USER-LB package
@@ -1618,10 +1575,8 @@ Ontario).
 * :doc:`fix lb/viscous <fix_lb_viscous>`
 * examples/USER/lb
 
-
 ----------
 
-
 .. _PKG-USER-MGPT:
 
 USER-MGPT package
@@ -1647,10 +1602,8 @@ matrix-MGPT algorithm due to Tomas Oppelstrup at LLNL.
 * :doc:`pair_style mgpt <pair_mgpt>`
 * examples/USER/mgpt
 
-
 ----------
 
-
 .. _PKG-USER-MISC:
 
 USER-MISC package
@@ -1672,10 +1625,8 @@ src/USER-MISC/README file.
 * one doc page per individual command listed in src/USER-MISC/README
 * examples/USER/misc
 
-
 ----------
 
-
 .. _PKG-USER-MANIFOLD:
 
 USER-MANIFOLD package
@@ -1703,12 +1654,10 @@ Waltham, MA, USA)
 * :doc:`fix nve/manifold/rattle <fix_nve_manifold_rattle>`
 * :doc:`fix nvt/manifold/rattle <fix_nvt_manifold_rattle>`
 * examples/USER/manifold
-* http://lammps.sandia.gov/movies.html#manifold
-
+* https://lammps.sandia.gov/movies.html#manifold
 
 ----------
 
-
 .. _PKG-USER-MEAMC:
 
 USER-MEAMC package
@@ -1732,14 +1681,12 @@ Sandia.
 * :doc:`pair_style meam/c <pair_meamc>`
 * examples/meamc
 
-
 ----------
 
+.. _PKG-USER-MESODPD:
 
-.. _PKG-USER-MESO:
-
-USER-MESO package
------------------
+USER-MESODPD package
+--------------------
 
 **Contents:**
 
@@ -1755,20 +1702,18 @@ algorithm.
 
 **Supporting info:**
 
-* src/USER-MESO: filenames -> commands
-* src/USER-MESO/README
+* src/USER-MESODPD: filenames -> commands
+* src/USER-MESODPD/README
 * :doc:`atom_style edpd <atom_style>`
-* :doc:`pair_style edpd <pair_meso>`
-* :doc:`pair_style mdpd <pair_meso>`
-* :doc:`pair_style tdpd <pair_meso>`
+* :doc:`pair_style edpd <pair_mesodpd>`
+* :doc:`pair_style mdpd <pair_mesodpd>`
+* :doc:`pair_style tdpd <pair_mesodpd>`
 * :doc:`fix mvv/dpd <fix_mvv_dpd>`
-* examples/USER/meso
-* http://lammps.sandia.gov/movies.html#mesodpd
-
+* examples/USER/mesodpd
+* https://lammps.sandia.gov/movies.html#mesodpd
 
 ----------
 
-
 .. _PKG-USER-MOFFF:
 
 USER-MOFFF package
@@ -1787,8 +1732,6 @@ well as the `MOF+ <MOFplus_>`_ website.
 
 .. _MOFplus: https://www.mofplus.org/content/show/MOF-FF
 
-
-
 **Author:** Hendrik Heenen (Technical U of Munich),
 Rochus Schmid (Ruhr-University Bochum).
 
@@ -1802,10 +1745,8 @@ Rochus Schmid (Ruhr-University Bochum).
 * :doc:`improper_style inversion/harmonic <improper_inversion_harmonic>`
 * examples/USER/mofff
 
-
 ----------
 
-
 .. _PKG-USER-MOLFILE:
 
 USER-MOLFILE package
@@ -1846,10 +1787,8 @@ This package has :ref:`specific installation instructions <user-molfile>` on the
 * lib/molfile/README
 * :doc:`dump molfile <dump_molfile>`
 
-
 ----------
 
-
 .. _PKG-USER-NETCDF:
 
 USER-NETCDF package
@@ -1870,20 +1809,11 @@ tools:
 
 * `Ovito <ovito_>`_ (Ovito supports the AMBER convention and the extensions mentioned above)
 * `VMD <vmd-home_>`_
-* `AtomEye <atomeye_>`_ (the libAtoms version of AtomEye contains a NetCDF reader not present in the standard distribution)
 
 .. _ovito: http://www.ovito.org
 
-
-
 .. _vmd-home: https://www.ks.uiuc.edu/Research/vmd/
 
-
-
-.. _atomeye: http://www.libatoms.org
-
-
-
 **Author:** Lars Pastewka (Karlsruhe Institute of Technology).
 
 **Install:**
@@ -1897,10 +1827,8 @@ This package has :ref:`specific installation instructions <user-netcdf>` on the
 * lib/netcdf/README
 * :doc:`dump netcdf <dump_netcdf>`
 
-
 ----------
 
-
 .. _PKG-USER-OMP:
 
 USER-OMP package
@@ -1948,13 +1876,13 @@ This package has :ref:`specific installation instructions <user-omp>` on the :do
 * :doc:`Section 2.6 -sf omp <Run_options>`
 * :doc:`Section 2.6 -pk omp <Run_options>`
 * :doc:`package omp <package>`
-* `Commands all <lc_>`_ pages (fix,compute,pair,etc) for styles followed by (o)
-* `Benchmarks page <http://lammps.sandia.gov/bench.html>`_ of web site
-
+* Search the :doc:`commands <Commands_all>` pages (:doc:`fix <Commands_fix>`, :doc:`compute <Commands_compute>`,
+  :doc:`pair <Commands_pair>`, :doc:`bond, angle, dihedral, improper <Commands_bond>`,
+  :doc:`kspace <Commands_kspace>`) for styles followed by (o)
+* `Benchmarks page <https://lammps.sandia.gov/bench.html>`_ of web site
 
 ----------
 
-
 .. _PKG-USER-PHONON:
 
 USER-PHONON package
@@ -1970,7 +1898,7 @@ And a :doc:`dynamical_matrix <dynamical_matrix>` as well as a
 and third order tensor from finite differences.
 
 **Authors:** Ling-Ti Kong (Shanghai Jiao Tong University) for "fix phonon"
-and Charlie Sievers (UC Davis) for "dynamical\_matrix" and "third\_order"
+and Charlie Sievers (UC Davis) for "dynamical_matrix" and "third_order"
 
 **Supporting info:**
 
@@ -1981,10 +1909,8 @@ and Charlie Sievers (UC Davis) for "dynamical\_matrix" and "third\_order"
 * :doc:`third_order <third_order>`
 * examples/USER/phonon
 
-
 ----------
 
-
 .. _PKG-USER-PTM:
 
 USER-PTM package
@@ -2000,15 +1926,13 @@ Matching methodology.
 
 **Supporting info:**
 
-* src/USER-PTM: filenames not starting with ptm\\_ -> commands
-* src/USER-PTM: filenames starting with ptm\\_ -> supporting code
+* src/USER-PTM: filenames not starting with ptm\_ -> commands
+* src/USER-PTM: filenames starting with ptm\_ -> supporting code
 * src/USER-PTM/LICENSE
 * :doc:`compute ptm/atom <compute_ptm_atom>`
 
-
 ----------
 
-
 .. _PKG-USER-QMMM:
 
 USER-QMMM package
@@ -2016,27 +1940,32 @@ USER-QMMM package
 
 **Contents:**
 
-A :doc:`fix qmmm <fix_qmmm>` command which allows LAMMPS to be used in a
-QM/MM simulation, currently only in combination with the `Quantum ESPRESSO <espresso_>`_ package.
+A :doc:`fix qmmm <fix_qmmm>` command which allows LAMMPS to be used as
+the MM code in a QM/MM simulation.  This is currently only available
+in combination with the `Quantum ESPRESSO <espresso_>`_ package.
 
 .. _espresso: http://www.quantum-espresso.org
 
+To use this package you must have Quantum ESPRESSO (QE) available on
+your system and include its coupling library in the compilation and
+then compile LAMMPS as a library.  For QM/MM calculations you then
+build a custom binary with MPI support, that sets up 3 partitions with
+MPI sub-communicators (for inter- and intra-partition communication)
+and then calls the corresponding library interfaces on each partition
+(2x LAMMPS and 1x QE).
 
+The current implementation supports an ONIOM style mechanical coupling
+and a multi-pole based electrostatic coupling to the Quantum ESPRESSO
+plane wave DFT package.  The QM/MM interface has been written in a
+manner that coupling to other QM codes should be possible without
+changes to LAMMPS itself.
 
-To use this package you must have Quantum ESPRESSO available on your
-system.
-
-The current implementation only supports an ONIOM style mechanical
-coupling to the Quantum ESPRESSO plane wave DFT package.
-Electrostatic coupling is in preparation and the interface has been
-written in a manner that coupling to other QM codes should be possible
-without changes to LAMMPS itself.
-
-**Author:** Axel Kohlmeyer (Temple U).
+**Authors:** Axel Kohlmeyer (Temple U). Mariella Ippolito and Carlo Cavazzoni (CINECA, Italy)
 
 **Install:**
 
-This package has :ref:`specific installation instructions <user-qmmm>` on the :doc:`Build extras <Build_extras>` doc page.
+This package has :ref:`specific installation instructions <user-qmmm>`
+on the :doc:`Build extras <Build_extras>` doc page.
 
 **Supporting info:**
 
@@ -2047,10 +1976,8 @@ This package has :ref:`specific installation instructions <user-qmmm>` on the :d
 * lib/qmmm/example-ec/README
 * lib/qmmm/example-mc/README
 
-
 ----------
 
-
 .. _PKG-USER-QTB:
 
 USER-QTB package
@@ -2077,10 +2004,8 @@ simulation.
 * :doc:`fix qbmsst <fix_qbmsst>`
 * examples/USER/qtb
 
-
 ----------
 
-
 .. _PKG-USER-QUIP:
 
 USER-QUIP package
@@ -2094,8 +2019,6 @@ developed by the Cambridge University group.
 
 .. _quip: https://github.com/libAtoms/QUIP
 
-
-
 To use this package you must have the QUIP libAtoms library available
 on your system.
 
@@ -2112,9 +2035,38 @@ This package has :ref:`specific installation instructions <user-quip>` on the :d
 * :doc:`pair_style quip <pair_quip>`
 * examples/USER/quip
 
-
 ----------
 
+.. _PKG-USER-REACTION:
+
+USER-REACTION package
+---------------------
+
+**Contents:**
+
+This package allows for complex bond topology changes (reactions)
+during a running MD simulation, when using classical force fields.
+Topology changes are defined in pre- and post-reaction molecule
+templates and can include creation and deletion of bonds, angles,
+dihedrals, impropers, atom types, bond types, angle types, dihedral
+types, improper types, and/or atomic charges. Other options currently
+available include reaction constraints (e.g. angle and Arrhenius
+constraints), deletion of reaction byproducts or other small
+molecules, and chiral-sensitive reactions.
+
+**Author:** Jacob R. Gissinger (CU Boulder) while at NASA Langley Research Center.
+
+**Supporting info:**
+
+* src/USER-REACTION: filenames -> commands
+* src/USER-REACTION/README
+* :doc:`fix bond/react <fix_bond_react>`
+* examples/USER/reaction
+* `2017 LAMMPS Workshop <https://lammps.sandia.gov/workshops/Aug17/pdf/gissinger.pdf>`_
+* `2019 LAMMPS Workshop <https://lammps.sandia.gov/workshops/Aug19/talk_gissinger.pdf>`_
+* disarmmd.org
+
+----------
 
 .. _PKG-USER-REAXC:
 
@@ -2139,10 +2091,8 @@ for monitoring molecules as bonds are created and destroyed.
 * :doc:`fix reax/c/species <fix_reaxc_species>`
 * examples/reax
 
-
 ----------
 
-
 .. _PKG-USER-SCAFACOS:
 
 USER-SCAFACOS package
@@ -2176,10 +2126,8 @@ This package has :ref:`specific installation instructions <user-scafacos>` on th
 * :doc:`kspace_modify <kspace_modify>`
 * examples/USER/scafacos
 
-
 ----------
 
-
 .. _PKG-USER-SDPD:
 
 USER-SDPD package
@@ -2192,7 +2140,7 @@ is an extension of smoothed particle hydrodynamics (SPH) to mesoscale
 where thermal fluctuations are important (see the
 :ref:`USER-SPH package <PKG-USER-SPH>`).
 Also two fixes for moving and rigid body integration of SPH/SDPD particles
-(particles of atom\_style meso).
+(particles of atom_style meso).
 
 **Author:** Morteza Jalalvand (Institute for Advanced Studies in Basic
 Sciences, Iran).
@@ -2206,10 +2154,8 @@ Sciences, Iran).
 * :doc:`fix rigid/meso <fix_rigid_meso>`
 * examples/USER/sdpd
 
-
 ----------
 
-
 .. _PKG-USER-SMD:
 
 USER-SMD package
@@ -2242,14 +2188,12 @@ This package has :ref:`specific installation instructions <user-smd>` on the :do
 
 * src/USER-SMD: filenames -> commands
 * src/USER-SMD/README
-* doc/PDF/SMD\_LAMMPS\_userguide.pdf
+* doc/PDF/SMD_LAMMPS_userguide.pdf
 * examples/USER/smd
-* http://lammps.sandia.gov/movies.html#smd
-
+* https://lammps.sandia.gov/movies.html#smd
 
 ----------
 
-
 .. _PKG-USER-SMTBQ:
 
 USER-SMTBQ package
@@ -2271,10 +2215,8 @@ Tetot (LAAS-CNRS, France).
 * :doc:`pair_style smtbq <pair_smtbq>`
 * examples/USER/smtbq
 
-
 ----------
 
-
 .. _PKG-USER-SPH:
 
 USER-SPH package
@@ -2303,14 +2245,12 @@ Dynamics, Ernst Mach Institute, Germany).
 
 * src/USER-SPH: filenames -> commands
 * src/USER-SPH/README
-* doc/PDF/SPH\_LAMMPS\_userguide.pdf
+* doc/PDF/SPH_LAMMPS_userguide.pdf
 * examples/USER/sph
-* http://lammps.sandia.gov/movies.html#sph
-
+* https://lammps.sandia.gov/movies.html#sph
 
 ----------
 
-
 .. _PKG-USER-TALLY:
 
 USER-TALLY package
@@ -2331,10 +2271,8 @@ stress, etc) about individual interactions.
 * :doc:`compute \*/tally <compute_tally>`
 * examples/USER/tally
 
-
 ----------
 
-
 .. _PKG-USER-UEF:
 
 USER-UEF package
@@ -2359,10 +2297,8 @@ supporting compute styles and an output option.
 * :doc:`dump cfg/uef <dump_cfg_uef>`
 * examples/uef
 
-
 ----------
 
-
 .. _PKG-USER-VTK:
 
 USER-VTK package
@@ -2376,12 +2312,8 @@ other visualization packages.
 
 .. _vtk: http://www.vtk.org
 
-
-
 .. _paraview: http://www.paraview.org
 
-
-
 To use this package you must have VTK library available on your
 system.
 
@@ -2398,10 +2330,8 @@ This package has :ref:`specific installation instructions <user-vtk>` on the :do
 * lib/vtk/README
 * :doc:`dump vtk <dump_vtk>`
 
-
 ----------
 
-
 .. _PKG-USER-YAFF:
 
 USER-YAFF package
@@ -2417,22 +2347,11 @@ The expressions and their use are discussed in the following papers
 
 which discuss the `QuickFF <quickff_>`_ methodology.
 
-.. _vanduyfhuys2015: http://dx.doi.org/10.1002/jcc.23877
-
-
-
-.. _vanduyfhuys2018: http://dx.doi.org/10.1002/jcc.25173
-
-
-
+.. _vanduyfhuys2015: https://doi.org/10.1002/jcc.23877
+.. _vanduyfhuys2018: https://doi.org/10.1002/jcc.25173
 .. _quickff: http://molmod.github.io/QuickFF
-
-
-
 .. _yaff: https://github.com/molmod/yaff
 
-
-
 **Author:** Steven Vandenbrande.
 
 **Supporting info:**
@@ -2446,8 +2365,3 @@ which discuss the `QuickFF <quickff_>`_ methodology.
 * :doc:`pair_style mm3/switch3/coulgauss/long <pair_mm3_switch3_coulgauss_long>`
 * :doc:`pair_style lj/switch3/coulgauss/long <pair_lj_switch3_coulgauss_long>`
 * examples/USER/yaff
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/Packages_standard.rst b/doc/src/Packages_standard.rst
index c7993cf947..74a567e0b9 100644
--- a/doc/src/Packages_standard.rst
+++ b/doc/src/Packages_standard.rst
@@ -22,75 +22,70 @@ package:
 * int = internal library: provided with LAMMPS, but you may need to build it
 * ext = external library: you will need to download and install it on your machine
 
-+----------------------------------+--------------------------------------+----------------------------------------------------+-----------------------------------------------------+---------+
-| Package                          | Description                          | Doc page                                           | Example                                             | Library |
-+----------------------------------+--------------------------------------+----------------------------------------------------+-----------------------------------------------------+---------+
-| :ref:`ASPHERE <PKG-ASPHERE>`     | aspherical particle models           | :doc:`Howto spherical <Howto_spherical>`           | ellipse                                             | no      |
-+----------------------------------+--------------------------------------+----------------------------------------------------+-----------------------------------------------------+---------+
-| :ref:`BODY <PKG-BODY>`           | body-style particles                 | :doc:`Howto body <Howto_body>`                     | body                                                | no      |
-+----------------------------------+--------------------------------------+----------------------------------------------------+-----------------------------------------------------+---------+
-| :ref:`CLASS2 <PKG-CLASS2>`       | class 2 force fields                 | :doc:`pair_style lj/class2 <pair_class2>`          | n/a                                                 | no      |
-+----------------------------------+--------------------------------------+----------------------------------------------------+-----------------------------------------------------+---------+
-| :ref:`COLLOID <PKG-COLLOID>`     | colloidal particles                  | :doc:`atom_style colloid <atom_style>`             | colloid                                             | no      |
-+----------------------------------+--------------------------------------+----------------------------------------------------+-----------------------------------------------------+---------+
-| :ref:`COMPRESS <PKG-COMPRESS>`   | I/O compression                      | :doc:`dump \*/gz <dump>`                           | n/a                                                 | sys     |
-+----------------------------------+--------------------------------------+----------------------------------------------------+-----------------------------------------------------+---------+
-| :ref:`CORESHELL <PKG-CORESHELL>` | adiabatic core/shell model           | :doc:`Howto coreshell <Howto_coreshell>`           | coreshell                                           | no      |
-+----------------------------------+--------------------------------------+----------------------------------------------------+-----------------------------------------------------+---------+
-| :ref:`DIPOLE <PKG-DIPOLE>`       | point dipole particles               | :doc:`pair_style dipole/cut <pair_dipole>`         | dipole                                              | no      |
-+----------------------------------+--------------------------------------+----------------------------------------------------+-----------------------------------------------------+---------+
-| :ref:`GPU <PKG-GPU>`             | GPU-enabled styles                   | :doc:`Section gpu <Speed_gpu>`                     | `Benchmarks <http://lammps.sandia.gov/bench.html>`_ | int     |
-+----------------------------------+--------------------------------------+----------------------------------------------------+-----------------------------------------------------+---------+
-| :ref:`GRANULAR <PKG-GRANULAR>`   | granular systems                     | :doc:`Howto granular <Howto_granular>`             | pour                                                | no      |
-+----------------------------------+--------------------------------------+----------------------------------------------------+-----------------------------------------------------+---------+
-| :ref:`KIM <PKG-KIM>`             | OpenKIM wrapper                      | :doc:`pair_style kim <pair_kim>`                   | kim                                                 | ext     |
-+----------------------------------+--------------------------------------+----------------------------------------------------+-----------------------------------------------------+---------+
-| :ref:`KOKKOS <PKG-KOKKOS>`       | Kokkos-enabled styles                | :doc:`Speed kokkos <Speed_kokkos>`                 | `Benchmarks <http://lammps.sandia.gov/bench.html>`_ | no      |
-+----------------------------------+--------------------------------------+----------------------------------------------------+-----------------------------------------------------+---------+
-| :ref:`KSPACE <PKG-KSPACE>`       | long-range Coulombic solvers         | :doc:`kspace_style <kspace_style>`                 | peptide                                             | no      |
-+----------------------------------+--------------------------------------+----------------------------------------------------+-----------------------------------------------------+---------+
-| :ref:`LATTE <PKG-LATTE>`         | quantum DFTB forces via LATTE        | :doc:`fix latte <fix_latte>`                       | latte                                               | ext     |
-+----------------------------------+--------------------------------------+----------------------------------------------------+-----------------------------------------------------+---------+
-| :ref:`MANYBODY <PKG-MANYBODY>`   | many-body potentials                 | :doc:`pair_style tersoff <pair_tersoff>`           | shear                                               | no      |
-+----------------------------------+--------------------------------------+----------------------------------------------------+-----------------------------------------------------+---------+
-| :ref:`MC <PKG-MC>`               | Monte Carlo options                  | :doc:`fix gcmc <fix_gcmc>`                         | n/a                                                 | no      |
-+----------------------------------+--------------------------------------+----------------------------------------------------+-----------------------------------------------------+---------+
-| :ref:`MESSAGE <PKG-MESSAGE>`     | client/server messaging              | :doc:`message <message>`                           | message                                             | int     |
-+----------------------------------+--------------------------------------+----------------------------------------------------+-----------------------------------------------------+---------+
-| :ref:`MISC <PKG-MISC>`           | miscellaneous single-file commands   | n/a                                                | no                                                  | no      |
-+----------------------------------+--------------------------------------+----------------------------------------------------+-----------------------------------------------------+---------+
-| :ref:`MOLECULE <PKG-MOLECULE>`   | molecular system force fields        | :doc:`Howto bioFF <Howto_bioFF>`                   | peptide                                             | no      |
-+----------------------------------+--------------------------------------+----------------------------------------------------+-----------------------------------------------------+---------+
-| :ref:`MPIIO <PKG-MPIIO>`         | MPI parallel I/O dump and restart    | :doc:`dump <dump>`                                 | n/a                                                 | no      |
-+----------------------------------+--------------------------------------+----------------------------------------------------+-----------------------------------------------------+---------+
-| :ref:`MSCG <PKG-MSCG>`           | multi-scale coarse-graining wrapper  | :doc:`fix mscg <fix_mscg>`                         | mscg                                                | ext     |
-+----------------------------------+--------------------------------------+----------------------------------------------------+-----------------------------------------------------+---------+
-| :ref:`OPT <PKG-OPT>`             | optimized pair styles                | :doc:`Speed opt <Speed_opt>`                       | `Benchmarks <http://lammps.sandia.gov/bench.html>`_ | no      |
-+----------------------------------+--------------------------------------+----------------------------------------------------+-----------------------------------------------------+---------+
-| :ref:`PERI <PKG-PERI>`           | Peridynamics models                  | :doc:`pair_style peri <pair_peri>`                 | peri                                                | no      |
-+----------------------------------+--------------------------------------+----------------------------------------------------+-----------------------------------------------------+---------+
-| :ref:`POEMS <PKG-POEMS>`         | coupled rigid body motion            | :doc:`fix poems <fix_poems>`                       | rigid                                               | int     |
-+----------------------------------+--------------------------------------+----------------------------------------------------+-----------------------------------------------------+---------+
-| :ref:`PYTHON <PKG-PYTHON>`       | embed Python code in an input script | :doc:`python <python>`                             | python                                              | sys     |
-+----------------------------------+--------------------------------------+----------------------------------------------------+-----------------------------------------------------+---------+
-| :ref:`QEQ <PKG-QEQ>`             | QEq charge equilibration             | :doc:`fix qeq <fix_qeq>`                           | qeq                                                 | no      |
-+----------------------------------+--------------------------------------+----------------------------------------------------+-----------------------------------------------------+---------+
-| :ref:`REPLICA <PKG-REPLICA2>`    | multi-replica methods                | :doc:`Howto replica <Howto_replica>`               | tad                                                 | no      |
-+----------------------------------+--------------------------------------+----------------------------------------------------+-----------------------------------------------------+---------+
-| :ref:`RIGID <PKG-RIGID>`         | rigid bodies and constraints         | :doc:`fix rigid <fix_rigid>`                       | rigid                                               | no      |
-+----------------------------------+--------------------------------------+----------------------------------------------------+-----------------------------------------------------+---------+
-| :ref:`SHOCK <PKG-SHOCK>`         | shock loading methods                | :doc:`fix msst <fix_msst>`                         | n/a                                                 | no      |
-+----------------------------------+--------------------------------------+----------------------------------------------------+-----------------------------------------------------+---------+
-| :ref:`SNAP <PKG-SNAP>`           | quantum-fitted potential             | :doc:`pair_style snap <pair_snap>`                 | snap                                                | no      |
-+----------------------------------+--------------------------------------+----------------------------------------------------+-----------------------------------------------------+---------+
-| :ref:`SPIN <PKG-SPIN>`           | magnetic atomic spin dynamics        | :doc:`Howto spins <Howto_spins>`                   | SPIN                                                | no      |
-+----------------------------------+--------------------------------------+----------------------------------------------------+-----------------------------------------------------+---------+
-| :ref:`SRD <PKG-SRD>`             | stochastic rotation dynamics         | :doc:`fix srd <fix_srd>`                           | srd                                                 | no      |
-+----------------------------------+--------------------------------------+----------------------------------------------------+-----------------------------------------------------+---------+
-| :ref:`VORONOI <PKG-VORONOI>`     | Voronoi tesselation                  | :doc:`compute voronoi/atom <compute_voronoi_atom>` | n/a                                                 | ext     |
-+----------------------------------+--------------------------------------+----------------------------------------------------+-----------------------------------------------------+---------+
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
++----------------------------------+--------------------------------------+----------------------------------------------------+------------------------------------------------------+---------+
+| Package                          | Description                          | Doc page                                           | Example                                              | Library |
++----------------------------------+--------------------------------------+----------------------------------------------------+------------------------------------------------------+---------+
+| :ref:`ASPHERE <PKG-ASPHERE>`     | aspherical particle models           | :doc:`Howto spherical <Howto_spherical>`           | ellipse                                              | no      |
++----------------------------------+--------------------------------------+----------------------------------------------------+------------------------------------------------------+---------+
+| :ref:`BODY <PKG-BODY>`           | body-style particles                 | :doc:`Howto body <Howto_body>`                     | body                                                 | no      |
++----------------------------------+--------------------------------------+----------------------------------------------------+------------------------------------------------------+---------+
+| :ref:`CLASS2 <PKG-CLASS2>`       | class 2 force fields                 | :doc:`pair_style lj/class2 <pair_class2>`          | n/a                                                  | no      |
++----------------------------------+--------------------------------------+----------------------------------------------------+------------------------------------------------------+---------+
+| :ref:`COLLOID <PKG-COLLOID>`     | colloidal particles                  | :doc:`atom_style colloid <atom_style>`             | colloid                                              | no      |
++----------------------------------+--------------------------------------+----------------------------------------------------+------------------------------------------------------+---------+
+| :ref:`COMPRESS <PKG-COMPRESS>`   | I/O compression                      | :doc:`dump \*/gz <dump>`                           | n/a                                                  | sys     |
++----------------------------------+--------------------------------------+----------------------------------------------------+------------------------------------------------------+---------+
+| :ref:`CORESHELL <PKG-CORESHELL>` | adiabatic core/shell model           | :doc:`Howto coreshell <Howto_coreshell>`           | coreshell                                            | no      |
++----------------------------------+--------------------------------------+----------------------------------------------------+------------------------------------------------------+---------+
+| :ref:`DIPOLE <PKG-DIPOLE>`       | point dipole particles               | :doc:`pair_style dipole/cut <pair_dipole>`         | dipole                                               | no      |
++----------------------------------+--------------------------------------+----------------------------------------------------+------------------------------------------------------+---------+
+| :ref:`GPU <PKG-GPU>`             | GPU-enabled styles                   | :doc:`Section gpu <Speed_gpu>`                     | `Benchmarks <https://lammps.sandia.gov/bench.html>`_ | int     |
++----------------------------------+--------------------------------------+----------------------------------------------------+------------------------------------------------------+---------+
+| :ref:`GRANULAR <PKG-GRANULAR>`   | granular systems                     | :doc:`Howto granular <Howto_granular>`             | pour                                                 | no      |
++----------------------------------+--------------------------------------+----------------------------------------------------+------------------------------------------------------+---------+
+| :ref:`KIM <PKG-KIM>`             | OpenKIM wrapper                      | :doc:`pair_style kim <pair_kim>`                   | kim                                                  | ext     |
++----------------------------------+--------------------------------------+----------------------------------------------------+------------------------------------------------------+---------+
+| :ref:`KOKKOS <PKG-KOKKOS>`       | Kokkos-enabled styles                | :doc:`Speed kokkos <Speed_kokkos>`                 | `Benchmarks <https://lammps.sandia.gov/bench.html>`_ | no      |
++----------------------------------+--------------------------------------+----------------------------------------------------+------------------------------------------------------+---------+
+| :ref:`KSPACE <PKG-KSPACE>`       | long-range Coulombic solvers         | :doc:`kspace_style <kspace_style>`                 | peptide                                              | no      |
++----------------------------------+--------------------------------------+----------------------------------------------------+------------------------------------------------------+---------+
+| :ref:`LATTE <PKG-LATTE>`         | quantum DFTB forces via LATTE        | :doc:`fix latte <fix_latte>`                       | latte                                                | ext     |
++----------------------------------+--------------------------------------+----------------------------------------------------+------------------------------------------------------+---------+
+| :ref:`MANYBODY <PKG-MANYBODY>`   | many-body potentials                 | :doc:`pair_style tersoff <pair_tersoff>`           | shear                                                | no      |
++----------------------------------+--------------------------------------+----------------------------------------------------+------------------------------------------------------+---------+
+| :ref:`MC <PKG-MC>`               | Monte Carlo options                  | :doc:`fix gcmc <fix_gcmc>`                         | n/a                                                  | no      |
++----------------------------------+--------------------------------------+----------------------------------------------------+------------------------------------------------------+---------+
+| :ref:`MESSAGE <PKG-MESSAGE>`     | client/server messaging              | :doc:`message <message>`                           | message                                              | int     |
++----------------------------------+--------------------------------------+----------------------------------------------------+------------------------------------------------------+---------+
+| :ref:`MISC <PKG-MISC>`           | miscellaneous single-file commands   | n/a                                                | no                                                   | no      |
++----------------------------------+--------------------------------------+----------------------------------------------------+------------------------------------------------------+---------+
+| :ref:`MOLECULE <PKG-MOLECULE>`   | molecular system force fields        | :doc:`Howto bioFF <Howto_bioFF>`                   | peptide                                              | no      |
++----------------------------------+--------------------------------------+----------------------------------------------------+------------------------------------------------------+---------+
+| :ref:`MPIIO <PKG-MPIIO>`         | MPI parallel I/O dump and restart    | :doc:`dump <dump>`                                 | n/a                                                  | no      |
++----------------------------------+--------------------------------------+----------------------------------------------------+------------------------------------------------------+---------+
+| :ref:`MSCG <PKG-MSCG>`           | multi-scale coarse-graining wrapper  | :doc:`fix mscg <fix_mscg>`                         | mscg                                                 | ext     |
++----------------------------------+--------------------------------------+----------------------------------------------------+------------------------------------------------------+---------+
+| :ref:`OPT <PKG-OPT>`             | optimized pair styles                | :doc:`Speed opt <Speed_opt>`                       | `Benchmarks <https://lammps.sandia.gov/bench.html>`_ | no      |
++----------------------------------+--------------------------------------+----------------------------------------------------+------------------------------------------------------+---------+
+| :ref:`PERI <PKG-PERI>`           | Peridynamics models                  | :doc:`pair_style peri <pair_peri>`                 | peri                                                 | no      |
++----------------------------------+--------------------------------------+----------------------------------------------------+------------------------------------------------------+---------+
+| :ref:`POEMS <PKG-POEMS>`         | coupled rigid body motion            | :doc:`fix poems <fix_poems>`                       | rigid                                                | int     |
++----------------------------------+--------------------------------------+----------------------------------------------------+------------------------------------------------------+---------+
+| :ref:`PYTHON <PKG-PYTHON>`       | embed Python code in an input script | :doc:`python <python>`                             | python                                               | sys     |
++----------------------------------+--------------------------------------+----------------------------------------------------+------------------------------------------------------+---------+
+| :ref:`QEQ <PKG-QEQ>`             | QEq charge equilibration             | :doc:`fix qeq <fix_qeq>`                           | qeq                                                  | no      |
++----------------------------------+--------------------------------------+----------------------------------------------------+------------------------------------------------------+---------+
+| :ref:`REPLICA <PKG-REPLICA>`     | multi-replica methods                | :doc:`Howto replica <Howto_replica>`               | tad                                                  | no      |
++----------------------------------+--------------------------------------+----------------------------------------------------+------------------------------------------------------+---------+
+| :ref:`RIGID <PKG-RIGID>`         | rigid bodies and constraints         | :doc:`fix rigid <fix_rigid>`                       | rigid                                                | no      |
++----------------------------------+--------------------------------------+----------------------------------------------------+------------------------------------------------------+---------+
+| :ref:`SHOCK <PKG-SHOCK>`         | shock loading methods                | :doc:`fix msst <fix_msst>`                         | n/a                                                  | no      |
++----------------------------------+--------------------------------------+----------------------------------------------------+------------------------------------------------------+---------+
+| :ref:`SNAP <PKG-SNAP>`           | quantum-fitted potential             | :doc:`pair_style snap <pair_snap>`                 | snap                                                 | no      |
++----------------------------------+--------------------------------------+----------------------------------------------------+------------------------------------------------------+---------+
+| :ref:`SPIN <PKG-SPIN>`           | magnetic atomic spin dynamics        | :doc:`Howto spins <Howto_spins>`                   | SPIN                                                 | no      |
++----------------------------------+--------------------------------------+----------------------------------------------------+------------------------------------------------------+---------+
+| :ref:`SRD <PKG-SRD>`             | stochastic rotation dynamics         | :doc:`fix srd <fix_srd>`                           | srd                                                  | no      |
++----------------------------------+--------------------------------------+----------------------------------------------------+------------------------------------------------------+---------+
+| :ref:`VORONOI <PKG-VORONOI>`     | Voronoi tesselation                  | :doc:`compute voronoi/atom <compute_voronoi_atom>` | n/a                                                  | ext     |
++----------------------------------+--------------------------------------+----------------------------------------------------+------------------------------------------------------+---------+
diff --git a/doc/src/Packages_user.rst b/doc/src/Packages_user.rst
index d705c8273d..c30f5fffa3 100644
--- a/doc/src/Packages_user.rst
+++ b/doc/src/Packages_user.rst
@@ -28,93 +28,91 @@ package:
 * int = internal library: provided with LAMMPS, but you may need to build it
 * ext = external library: you will need to download and install it on your machine
 
-+------------------------------------------------+-----------------------------------------------------------------+-------------------------------------------------------------------------------+-----------------------------------------------------+---------+
-| Package                                        | Description                                                     | Doc page                                                                      | Example                                             | Library |
-+------------------------------------------------+-----------------------------------------------------------------+-------------------------------------------------------------------------------+-----------------------------------------------------+---------+
-| :ref:`USER-ADIOS <PKG-USER-ADIOS>`             | dump output via ADIOS                                           | :doc:`dump adios <dump_adios>`                                                | USER/adios                                          | ext     |
-+------------------------------------------------+-----------------------------------------------------------------+-------------------------------------------------------------------------------+-----------------------------------------------------+---------+
-| :ref:`USER-ATC <PKG-USER-ATC>`                 | Atom-to-Continuum coupling                                      | :doc:`fix atc <fix_atc>`                                                      | USER/atc                                            | int     |
-+------------------------------------------------+-----------------------------------------------------------------+-------------------------------------------------------------------------------+-----------------------------------------------------+---------+
-| :ref:`USER-AWPMD <PKG-USER-AWPMD>`             | wave packet MD                                                  | :doc:`pair_style awpmd/cut <pair_awpmd>`                                      | USER/awpmd                                          | int     |
-+------------------------------------------------+-----------------------------------------------------------------+-------------------------------------------------------------------------------+-----------------------------------------------------+---------+
-| :ref:`USER-BOCS <PKG-USER-BOCS>`               | BOCS bottom up coarse graining                                  | :doc:`fix bocs <fix_bocs>`                                                    | USER/bocs                                           | no      |
-+------------------------------------------------+-----------------------------------------------------------------+-------------------------------------------------------------------------------+-----------------------------------------------------+---------+
-| :ref:`USER-CGDNA <PKG-USER-CGDNA>`             | coarse-grained DNA force fields                                 | src/USER-CGDNA/README                                                         | USER/cgdna                                          | no      |
-+------------------------------------------------+-----------------------------------------------------------------+-------------------------------------------------------------------------------+-----------------------------------------------------+---------+
-| :ref:`USER-CGSDK <PKG-USER-CGSDK>`             | SDK coarse-graining model                                       | :doc:`pair_style lj/sdk <pair_sdk>`                                           | USER/cgsdk                                          | no      |
-+------------------------------------------------+-----------------------------------------------------------------+-------------------------------------------------------------------------------+-----------------------------------------------------+---------+
-| :ref:`USER-COLVARS <PKG-USER-COLVARS>`         | collective variables library                                    | :doc:`fix colvars <fix_colvars>`                                              | USER/colvars                                        | int     |
-+------------------------------------------------+-----------------------------------------------------------------+-------------------------------------------------------------------------------+-----------------------------------------------------+---------+
-| :ref:`USER-DIFFRACTION <PKG-USER-DIFFRACTION>` | virtual x-ray and electron diffraction                          | :doc:`compute xrd <compute_xrd>`                                              | USER/diffraction                                    | no      |
-+------------------------------------------------+-----------------------------------------------------------------+-------------------------------------------------------------------------------+-----------------------------------------------------+---------+
-| :ref:`USER-DPD <PKG-USER-DPD>`                 | reactive dissipative particle dynamics                          | src/USER-DPD/README                                                           | USER/dpd                                            | no      |
-+------------------------------------------------+-----------------------------------------------------------------+-------------------------------------------------------------------------------+-----------------------------------------------------+---------+
-| :ref:`USER-DRUDE <PKG-USER-DRUDE>`             | Drude oscillators                                               | :doc:`Howto drude <Howto_drude>`                                              | USER/drude                                          | no      |
-+------------------------------------------------+-----------------------------------------------------------------+-------------------------------------------------------------------------------+-----------------------------------------------------+---------+
-| :ref:`USER-EFF <PKG-USER-EFF>`                 | electron force field                                            | :doc:`pair_style eff/cut <pair_eff>`                                          | USER/eff                                            | no      |
-+------------------------------------------------+-----------------------------------------------------------------+-------------------------------------------------------------------------------+-----------------------------------------------------+---------+
-| :ref:`USER-FEP <PKG-USER-FEP>`                 | free energy perturbation                                        | :doc:`compute fep <compute_fep>`                                              | USER/fep                                            | no      |
-+------------------------------------------------+-----------------------------------------------------------------+-------------------------------------------------------------------------------+-----------------------------------------------------+---------+
-| :ref:`USER-H5MD <PKG-USER-H5MD>`               | dump output via HDF5                                            | :doc:`dump h5md <dump_h5md>`                                                  | n/a                                                 | ext     |
-+------------------------------------------------+-----------------------------------------------------------------+-------------------------------------------------------------------------------+-----------------------------------------------------+---------+
-| :ref:`USER-INTEL <PKG-USER-INTEL>`             | optimized Intel CPU and KNL styles                              | :doc:`Speed intel <Speed_intel>`                                              | `Benchmarks <http://lammps.sandia.gov/bench.html>`_ | no      |
-+------------------------------------------------+-----------------------------------------------------------------+-------------------------------------------------------------------------------+-----------------------------------------------------+---------+
-| :ref:`USER-LB <PKG-USER-LB>`                   | Lattice Boltzmann fluid                                         | :doc:`fix lb/fluid <fix_lb_fluid>`                                            | USER/lb                                             | no      |
-+------------------------------------------------+-----------------------------------------------------------------+-------------------------------------------------------------------------------+-----------------------------------------------------+---------+
-| :ref:`USER-MANIFOLD <PKG-USER-MANIFOLD>`       | motion on 2d surfaces                                           | :doc:`fix manifoldforce <fix_manifoldforce>`                                  | USER/manifold                                       | no      |
-+------------------------------------------------+-----------------------------------------------------------------+-------------------------------------------------------------------------------+-----------------------------------------------------+---------+
-| :ref:`USER-MEAMC <PKG-USER-MEAMC>`             | modified EAM potential (C++)                                    | :doc:`pair_style meam/c <pair_meamc>`                                         | meamc                                               | no      |
-+------------------------------------------------+-----------------------------------------------------------------+-------------------------------------------------------------------------------+-----------------------------------------------------+---------+
-| :ref:`USER-MESO <PKG-USER-MESO>`               | mesoscale DPD models                                            | :doc:`pair_style edpd <pair_meso>`                                            | USER/meso                                           | no      |
-+------------------------------------------------+-----------------------------------------------------------------+-------------------------------------------------------------------------------+-----------------------------------------------------+---------+
-| :ref:`USER-MGPT <PKG-USER-MGPT>`               | fast MGPT multi-ion potentials                                  | :doc:`pair_style mgpt <pair_mgpt>`                                            | USER/mgpt                                           | no      |
-+------------------------------------------------+-----------------------------------------------------------------+-------------------------------------------------------------------------------+-----------------------------------------------------+---------+
-| :ref:`USER-MISC <PKG-USER-MISC>`               | single-file contributions                                       | USER-MISC/README                                                              | USER/misc                                           | no      |
-+------------------------------------------------+-----------------------------------------------------------------+-------------------------------------------------------------------------------+-----------------------------------------------------+---------+
-| :ref:`USER-MOFFF <PKG-USER-MOFFF>`             | styles for `MOF-FF <MOFplus_>`_ force field                     | :doc:`pair_style buck6d/coul/gauss <pair_buck6d_coul_gauss>`                  | USER/mofff                                          | no      |
-+------------------------------------------------+-----------------------------------------------------------------+-------------------------------------------------------------------------------+-----------------------------------------------------+---------+
-| :ref:`USER-MOLFILE <PKG-USER-MOLFILE>`         | `VMD <https://www.ks.uiuc.edu/Research/vmd/>`_ molfile plug-ins | :doc:`dump molfile <dump_molfile>`                                            | n/a                                                 | ext     |
-+------------------------------------------------+-----------------------------------------------------------------+-------------------------------------------------------------------------------+-----------------------------------------------------+---------+
-| :ref:`USER-NETCDF <PKG-USER-NETCDF>`           | dump output via NetCDF                                          | :doc:`dump netcdf <dump_netcdf>`                                              | n/a                                                 | ext     |
-+------------------------------------------------+-----------------------------------------------------------------+-------------------------------------------------------------------------------+-----------------------------------------------------+---------+
-| :ref:`USER-OMP <PKG-USER-OMP>`                 | OpenMP-enabled styles                                           | :doc:`Speed omp <Speed_omp>`                                                  | `Benchmarks <http://lammps.sandia.gov/bench.html>`_ | no      |
-+------------------------------------------------+-----------------------------------------------------------------+-------------------------------------------------------------------------------+-----------------------------------------------------+---------+
-| :ref:`USER-PHONON <PKG-USER-PHONON>`           | phonon dynamical matrix                                         | :doc:`fix phonon <fix_phonon>`                                                | USER/phonon                                         | no      |
-+------------------------------------------------+-----------------------------------------------------------------+-------------------------------------------------------------------------------+-----------------------------------------------------+---------+
-| :ref:`USER-PLUMED <PKG-USER-PLUMED>`           | :ref:`PLUMED <PLUMED>` free energy library                      | :doc:`fix plumed <fix_plumed>`                                                | USER/plumed                                         | ext     |
-+------------------------------------------------+-----------------------------------------------------------------+-------------------------------------------------------------------------------+-----------------------------------------------------+---------+
-| :ref:`USER-PTM <PKG-USER-PTM>`                 | Polyhedral Template Matching                                    | :doc:`compute ptm/atom <compute_ptm_atom>`                                    | n/a                                                 | no      |
-+------------------------------------------------+-----------------------------------------------------------------+-------------------------------------------------------------------------------+-----------------------------------------------------+---------+
-| :ref:`USER-QMMM <PKG-USER-QMMM>`               | QM/MM coupling                                                  | :doc:`fix qmmm <fix_qmmm>`                                                    | USER/qmmm                                           | ext     |
-+------------------------------------------------+-----------------------------------------------------------------+-------------------------------------------------------------------------------+-----------------------------------------------------+---------+
-| :ref:`USER-QTB <PKG-USER-QTB>`                 | quantum nuclear effects                                         | :doc:`fix qtb <fix_qtb>` :doc:`fix qbmsst <fix_qbmsst>`                       | qtb                                                 | no      |
-+------------------------------------------------+-----------------------------------------------------------------+-------------------------------------------------------------------------------+-----------------------------------------------------+---------+
-| :ref:`USER-QUIP <PKG-USER-QUIP>`               | QUIP/libatoms interface                                         | :doc:`pair_style quip <pair_quip>`                                            | USER/quip                                           | ext     |
-+------------------------------------------------+-----------------------------------------------------------------+-------------------------------------------------------------------------------+-----------------------------------------------------+---------+
-| :ref:`USER-REAXC <PKG-USER-REAXC>`             | ReaxFF potential (C/C++)                                        | :doc:`pair_style reaxc <pair_reaxc>`                                          | reax                                                | no      |
-+------------------------------------------------+-----------------------------------------------------------------+-------------------------------------------------------------------------------+-----------------------------------------------------+---------+
-| :ref:`USER-SCAFACOS <PKG-USER-SCAFACOS>`       | wrapper on ScaFaCoS solver                                      | :doc:`kspace_style scafacos <kspace_style>`                                   | USER/scafacos                                       | ext     |
-+------------------------------------------------+-----------------------------------------------------------------+-------------------------------------------------------------------------------+-----------------------------------------------------+---------+
-| :ref:`USER-SDPD <PKG-USER-SDPD>`               | smoothed dissipative particle dynamics                          | :doc:`pair_style sdpd/taitwater/isothermal <pair_sdpd_taitwater_isothermal>`  | USER/sdpd                                           | no      |
-+------------------------------------------------+-----------------------------------------------------------------+-------------------------------------------------------------------------------+-----------------------------------------------------+---------+
-| :ref:`USER-SMD <PKG-USER-SMD>`                 | smoothed Mach dynamics                                          | `SMD User Guide <PDF/SMD_LAMMPS_userguide.pdf>`_                              | USER/smd                                            | ext     |
-+------------------------------------------------+-----------------------------------------------------------------+-------------------------------------------------------------------------------+-----------------------------------------------------+---------+
-| :ref:`USER-SMTBQ <PKG-USER-SMTBQ>`             | second moment tight binding QEq potential                       | :doc:`pair_style smtbq <pair_smtbq>`                                          | USER/smtbq                                          | no      |
-+------------------------------------------------+-----------------------------------------------------------------+-------------------------------------------------------------------------------+-----------------------------------------------------+---------+
-| :ref:`USER-SPH <PKG-USER-SPH>`                 | smoothed particle hydrodynamics                                 | `SPH User Guide <PDF/SPH_LAMMPS_userguide.pdf>`_                              | USER/sph                                            | no      |
-+------------------------------------------------+-----------------------------------------------------------------+-------------------------------------------------------------------------------+-----------------------------------------------------+---------+
-| :ref:`USER-TALLY <PKG-USER-TALLY>`             | pairwise tally computes                                         | :doc:`compute XXX/tally <compute_tally>`                                      | USER/tally                                          | no      |
-+------------------------------------------------+-----------------------------------------------------------------+-------------------------------------------------------------------------------+-----------------------------------------------------+---------+
-| :ref:`USER-UEF <PKG-USER-UEF>`                 | extensional flow                                                | :doc:`fix nvt/uef <fix_nh_uef>`                                               | USER/uef                                            | no      |
-+------------------------------------------------+-----------------------------------------------------------------+-------------------------------------------------------------------------------+-----------------------------------------------------+---------+
-| :ref:`USER-VTK <PKG-USER-VTK>`                 | dump output via VTK                                             | :doc:`compute vtk <dump_vtk>`                                                 | n/a                                                 | ext     |
-+------------------------------------------------+-----------------------------------------------------------------+-------------------------------------------------------------------------------+-----------------------------------------------------+---------+
-| :ref:`USER-YAFF <PKG-USER-YAFF>`               | additional styles implemented in YAFF                           | :doc:`angle_style cross <angle_cross>`                                        | USER/yaff                                           | no      |
-+------------------------------------------------+-----------------------------------------------------------------+-------------------------------------------------------------------------------+-----------------------------------------------------+---------+
++------------------------------------------------+-----------------------------------------------------------------+-------------------------------------------------------------------------------+------------------------------------------------------+---------+
+| Package                                        | Description                                                     | Doc page                                                                      | Example                                              | Library |
++------------------------------------------------+-----------------------------------------------------------------+-------------------------------------------------------------------------------+------------------------------------------------------+---------+
+| :ref:`USER-ADIOS <PKG-USER-ADIOS>`             | dump output via ADIOS                                           | :doc:`dump adios <dump_adios>`                                                | USER/adios                                           | ext     |
++------------------------------------------------+-----------------------------------------------------------------+-------------------------------------------------------------------------------+------------------------------------------------------+---------+
+| :ref:`USER-ATC <PKG-USER-ATC>`                 | Atom-to-Continuum coupling                                      | :doc:`fix atc <fix_atc>`                                                      | USER/atc                                             | int     |
++------------------------------------------------+-----------------------------------------------------------------+-------------------------------------------------------------------------------+------------------------------------------------------+---------+
+| :ref:`USER-AWPMD <PKG-USER-AWPMD>`             | wave packet MD                                                  | :doc:`pair_style awpmd/cut <pair_awpmd>`                                      | USER/awpmd                                           | int     |
++------------------------------------------------+-----------------------------------------------------------------+-------------------------------------------------------------------------------+------------------------------------------------------+---------+
+| :ref:`USER-BOCS <PKG-USER-BOCS>`               | BOCS bottom up coarse graining                                  | :doc:`fix bocs <fix_bocs>`                                                    | USER/bocs                                            | no      |
++------------------------------------------------+-----------------------------------------------------------------+-------------------------------------------------------------------------------+------------------------------------------------------+---------+
+| :ref:`USER-CGDNA <PKG-USER-CGDNA>`             | coarse-grained DNA force fields                                 | src/USER-CGDNA/README                                                         | USER/cgdna                                           | no      |
++------------------------------------------------+-----------------------------------------------------------------+-------------------------------------------------------------------------------+------------------------------------------------------+---------+
+| :ref:`USER-CGSDK <PKG-USER-CGSDK>`             | SDK coarse-graining model                                       | :doc:`pair_style lj/sdk <pair_sdk>`                                           | USER/cgsdk                                           | no      |
++------------------------------------------------+-----------------------------------------------------------------+-------------------------------------------------------------------------------+------------------------------------------------------+---------+
+| :ref:`USER-COLVARS <PKG-USER-COLVARS>`         | collective variables library                                    | :doc:`fix colvars <fix_colvars>`                                              | USER/colvars                                         | int     |
++------------------------------------------------+-----------------------------------------------------------------+-------------------------------------------------------------------------------+------------------------------------------------------+---------+
+| :ref:`USER-DIFFRACTION <PKG-USER-DIFFRACTION>` | virtual x-ray and electron diffraction                          | :doc:`compute xrd <compute_xrd>`                                              | USER/diffraction                                     | no      |
++------------------------------------------------+-----------------------------------------------------------------+-------------------------------------------------------------------------------+------------------------------------------------------+---------+
+| :ref:`USER-DPD <PKG-USER-DPD>`                 | reactive dissipative particle dynamics                          | src/USER-DPD/README                                                           | USER/dpd                                             | no      |
++------------------------------------------------+-----------------------------------------------------------------+-------------------------------------------------------------------------------+------------------------------------------------------+---------+
+| :ref:`USER-DRUDE <PKG-USER-DRUDE>`             | Drude oscillators                                               | :doc:`Howto drude <Howto_drude>`                                              | USER/drude                                           | no      |
++------------------------------------------------+-----------------------------------------------------------------+-------------------------------------------------------------------------------+------------------------------------------------------+---------+
+| :ref:`USER-EFF <PKG-USER-EFF>`                 | electron force field                                            | :doc:`pair_style eff/cut <pair_eff>`                                          | USER/eff                                             | no      |
++------------------------------------------------+-----------------------------------------------------------------+-------------------------------------------------------------------------------+------------------------------------------------------+---------+
+| :ref:`USER-FEP <PKG-USER-FEP>`                 | free energy perturbation                                        | :doc:`compute fep <compute_fep>`                                              | USER/fep                                             | no      |
++------------------------------------------------+-----------------------------------------------------------------+-------------------------------------------------------------------------------+------------------------------------------------------+---------+
+| :ref:`USER-H5MD <PKG-USER-H5MD>`               | dump output via HDF5                                            | :doc:`dump h5md <dump_h5md>`                                                  | n/a                                                  | ext     |
++------------------------------------------------+-----------------------------------------------------------------+-------------------------------------------------------------------------------+------------------------------------------------------+---------+
+| :ref:`USER-INTEL <PKG-USER-INTEL>`             | optimized Intel CPU and KNL styles                              | :doc:`Speed intel <Speed_intel>`                                              | `Benchmarks <https://lammps.sandia.gov/bench.html>`_ | no      |
++------------------------------------------------+-----------------------------------------------------------------+-------------------------------------------------------------------------------+------------------------------------------------------+---------+
+| :ref:`USER-LB <PKG-USER-LB>`                   | Lattice Boltzmann fluid                                         | :doc:`fix lb/fluid <fix_lb_fluid>`                                            | USER/lb                                              | no      |
++------------------------------------------------+-----------------------------------------------------------------+-------------------------------------------------------------------------------+------------------------------------------------------+---------+
+| :ref:`USER-MANIFOLD <PKG-USER-MANIFOLD>`       | motion on 2d surfaces                                           | :doc:`fix manifoldforce <fix_manifoldforce>`                                  | USER/manifold                                        | no      |
++------------------------------------------------+-----------------------------------------------------------------+-------------------------------------------------------------------------------+------------------------------------------------------+---------+
+| :ref:`USER-MEAMC <PKG-USER-MEAMC>`             | modified EAM potential (C++)                                    | :doc:`pair_style meam/c <pair_meamc>`                                         | meamc                                                | no      |
++------------------------------------------------+-----------------------------------------------------------------+-------------------------------------------------------------------------------+------------------------------------------------------+---------+
+| :ref:`USER-MESODPD <PKG-USER-MESODPD>`         | mesoscale DPD models                                            | :doc:`pair_style edpd <pair_mesodpd>`                                         | USER/mesodpd                                         | no      |
++------------------------------------------------+-----------------------------------------------------------------+-------------------------------------------------------------------------------+------------------------------------------------------+---------+
+| :ref:`USER-MGPT <PKG-USER-MGPT>`               | fast MGPT multi-ion potentials                                  | :doc:`pair_style mgpt <pair_mgpt>`                                            | USER/mgpt                                            | no      |
++------------------------------------------------+-----------------------------------------------------------------+-------------------------------------------------------------------------------+------------------------------------------------------+---------+
+| :ref:`USER-MISC <PKG-USER-MISC>`               | single-file contributions                                       | USER-MISC/README                                                              | USER/misc                                            | no      |
++------------------------------------------------+-----------------------------------------------------------------+-------------------------------------------------------------------------------+------------------------------------------------------+---------+
+| :ref:`USER-MOFFF <PKG-USER-MOFFF>`             | styles for `MOF-FF <MOFplus_>`_ force field                     | :doc:`pair_style buck6d/coul/gauss <pair_buck6d_coul_gauss>`                  | USER/mofff                                           | no      |
++------------------------------------------------+-----------------------------------------------------------------+-------------------------------------------------------------------------------+------------------------------------------------------+---------+
+| :ref:`USER-MOLFILE <PKG-USER-MOLFILE>`         | `VMD <https://www.ks.uiuc.edu/Research/vmd/>`_ molfile plug-ins | :doc:`dump molfile <dump_molfile>`                                            | n/a                                                  | ext     |
++------------------------------------------------+-----------------------------------------------------------------+-------------------------------------------------------------------------------+------------------------------------------------------+---------+
+| :ref:`USER-NETCDF <PKG-USER-NETCDF>`           | dump output via NetCDF                                          | :doc:`dump netcdf <dump_netcdf>`                                              | n/a                                                  | ext     |
++------------------------------------------------+-----------------------------------------------------------------+-------------------------------------------------------------------------------+------------------------------------------------------+---------+
+| :ref:`USER-OMP <PKG-USER-OMP>`                 | OpenMP-enabled styles                                           | :doc:`Speed omp <Speed_omp>`                                                  | `Benchmarks <https://lammps.sandia.gov/bench.html>`_ | no      |
++------------------------------------------------+-----------------------------------------------------------------+-------------------------------------------------------------------------------+------------------------------------------------------+---------+
+| :ref:`USER-PHONON <PKG-USER-PHONON>`           | phonon dynamical matrix                                         | :doc:`fix phonon <fix_phonon>`                                                | USER/phonon                                          | no      |
++------------------------------------------------+-----------------------------------------------------------------+-------------------------------------------------------------------------------+------------------------------------------------------+---------+
+| :ref:`USER-PLUMED <PKG-USER-PLUMED>`           | :ref:`PLUMED <PLUMED>` free energy library                      | :doc:`fix plumed <fix_plumed>`                                                | USER/plumed                                          | ext     |
++------------------------------------------------+-----------------------------------------------------------------+-------------------------------------------------------------------------------+------------------------------------------------------+---------+
+| :ref:`USER-PTM <PKG-USER-PTM>`                 | Polyhedral Template Matching                                    | :doc:`compute ptm/atom <compute_ptm_atom>`                                    | n/a                                                  | no      |
++------------------------------------------------+-----------------------------------------------------------------+-------------------------------------------------------------------------------+------------------------------------------------------+---------+
+| :ref:`USER-QMMM <PKG-USER-QMMM>`               | QM/MM coupling                                                  | :doc:`fix qmmm <fix_qmmm>`                                                    | USER/qmmm                                            | ext     |
++------------------------------------------------+-----------------------------------------------------------------+-------------------------------------------------------------------------------+------------------------------------------------------+---------+
+| :ref:`USER-QTB <PKG-USER-QTB>`                 | quantum nuclear effects                                         | :doc:`fix qtb <fix_qtb>` :doc:`fix qbmsst <fix_qbmsst>`                       | qtb                                                  | no      |
++------------------------------------------------+-----------------------------------------------------------------+-------------------------------------------------------------------------------+------------------------------------------------------+---------+
+| :ref:`USER-QUIP <PKG-USER-QUIP>`               | QUIP/libatoms interface                                         | :doc:`pair_style quip <pair_quip>`                                            | USER/quip                                            | ext     |
++------------------------------------------------+-----------------------------------------------------------------+-------------------------------------------------------------------------------+------------------------------------------------------+---------+
+| :ref:`USER-REACTION <PKG-USER-REACTION>`       | chemical reactions in classical MD                              | :doc:`fix bond/react <fix_bond_react>`                                        | USER/reaction                                        | no      |
++------------------------------------------------+-----------------------------------------------------------------+-------------------------------------------------------------------------------+------------------------------------------------------+---------+
+| :ref:`USER-REAXC <PKG-USER-REAXC>`             | ReaxFF potential (C/C++)                                        | :doc:`pair_style reaxc <pair_reaxc>`                                          | reax                                                 | no      |
++------------------------------------------------+-----------------------------------------------------------------+-------------------------------------------------------------------------------+------------------------------------------------------+---------+
+| :ref:`USER-SCAFACOS <PKG-USER-SCAFACOS>`       | wrapper on ScaFaCoS solver                                      | :doc:`kspace_style scafacos <kspace_style>`                                   | USER/scafacos                                        | ext     |
++------------------------------------------------+-----------------------------------------------------------------+-------------------------------------------------------------------------------+------------------------------------------------------+---------+
+| :ref:`USER-SDPD <PKG-USER-SDPD>`               | smoothed dissipative particle dynamics                          | :doc:`pair_style sdpd/taitwater/isothermal <pair_sdpd_taitwater_isothermal>`  | USER/sdpd                                            | no      |
++------------------------------------------------+-----------------------------------------------------------------+-------------------------------------------------------------------------------+------------------------------------------------------+---------+
+| :ref:`USER-SMD <PKG-USER-SMD>`                 | smoothed Mach dynamics                                          | `SMD User Guide <PDF/SMD_LAMMPS_userguide.pdf>`_                              | USER/smd                                             | ext     |
++------------------------------------------------+-----------------------------------------------------------------+-------------------------------------------------------------------------------+------------------------------------------------------+---------+
+| :ref:`USER-SMTBQ <PKG-USER-SMTBQ>`             | second moment tight binding QEq potential                       | :doc:`pair_style smtbq <pair_smtbq>`                                          | USER/smtbq                                           | no      |
++------------------------------------------------+-----------------------------------------------------------------+-------------------------------------------------------------------------------+------------------------------------------------------+---------+
+| :ref:`USER-SPH <PKG-USER-SPH>`                 | smoothed particle hydrodynamics                                 | `SPH User Guide <PDF/SPH_LAMMPS_userguide.pdf>`_                              | USER/sph                                             | no      |
++------------------------------------------------+-----------------------------------------------------------------+-------------------------------------------------------------------------------+------------------------------------------------------+---------+
+| :ref:`USER-TALLY <PKG-USER-TALLY>`             | pairwise tally computes                                         | :doc:`compute XXX/tally <compute_tally>`                                      | USER/tally                                           | no      |
++------------------------------------------------+-----------------------------------------------------------------+-------------------------------------------------------------------------------+------------------------------------------------------+---------+
+| :ref:`USER-UEF <PKG-USER-UEF>`                 | extensional flow                                                | :doc:`fix nvt/uef <fix_nh_uef>`                                               | USER/uef                                             | no      |
++------------------------------------------------+-----------------------------------------------------------------+-------------------------------------------------------------------------------+------------------------------------------------------+---------+
+| :ref:`USER-VTK <PKG-USER-VTK>`                 | dump output via VTK                                             | :doc:`compute vtk <dump_vtk>`                                                 | n/a                                                  | ext     |
++------------------------------------------------+-----------------------------------------------------------------+-------------------------------------------------------------------------------+------------------------------------------------------+---------+
+| :ref:`USER-YAFF <PKG-USER-YAFF>`               | additional styles implemented in YAFF                           | :doc:`angle_style cross <angle_cross>`                                        | USER/yaff                                            | no      |
++------------------------------------------------+-----------------------------------------------------------------+-------------------------------------------------------------------------------+------------------------------------------------------+---------+
 
 .. _MOFplus: https://www.mofplus.org/content/show/MOF-FF
-.. _PLUMED: http://www.plumed.org
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
+.. _PLUMED: https://www.plumed.org
diff --git a/doc/src/Python_call.rst b/doc/src/Python_call.rst
index 2ce0b88cb5..e0bcf70b9a 100644
--- a/doc/src/Python_call.rst
+++ b/doc/src/Python_call.rst
@@ -59,8 +59,7 @@ new potential.
 To use any of these commands, you only need to build LAMMPS with the
 PYTHON package installed:
 
-
-.. parsed-literal::
+.. code-block:: bash
 
    make yes-python
    make machine
@@ -77,8 +76,3 @@ If you want to write Python code with callbacks to LAMMPS, then you
 must also follow the steps summarized in the :doc:`Python run <Python_run>` doc page.  I.e. you must build LAMMPS as a shared
 library and insure that Python can find the python/lammps.py file and
 the shared library.
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/Python_examples.rst b/doc/src/Python_examples.rst
index f3d9e4983e..976358801e 100644
--- a/doc/src/Python_examples.rst
+++ b/doc/src/Python_examples.rst
@@ -20,45 +20,36 @@ distribution.
 +----------------------------------------------------------------+--------------------------------------------------+
 | GUI go/stop/temperature-slider to control LAMMPS               | plot.py                                          |
 +----------------------------------------------------------------+--------------------------------------------------+
-| real-time temperature plot with GnuPlot via Pizza.py           | viz\_tool.py                                     |
+| real-time temperature plot with GnuPlot via Pizza.py           | viz_tool.py                                      |
 +----------------------------------------------------------------+--------------------------------------------------+
-| real-time viz via some viz package                             | vizplotgui\_tool.py                              |
+| real-time viz via some viz package                             | vizplotgui_tool.py                               |
 +----------------------------------------------------------------+--------------------------------------------------+
-| combination of viz\_tool.py and plot.py and gui.py             |                                                  |
+| combination of viz_tool.py and plot.py and gui.py             |                                                   |
 +----------------------------------------------------------------+--------------------------------------------------+
 
-
 ----------
 
-
-For the viz\_tool.py and vizplotgui\_tool.py commands, replace "tool"
+For the viz_tool.py and vizplotgui_tool.py commands, replace "tool"
 with "gl" or "atomeye" or "pymol" or "vmd", depending on what
 visualization package you have installed.
 
 Note that for GL, you need to be able to run the Pizza.py GL tool,
 which is included in the pizza sub-directory.  See the `Pizza.py doc pages <pizza_>`_ for more info:
 
-.. _pizza: http://www.sandia.gov/~sjplimp/pizza.html
-
-
+.. _pizza: https://pizza.sandia.gov
 
 Note that for AtomEye, you need version 3, and there is a line in the
 scripts that specifies the path and name of the executable.  See the
 AtomEye WWW pages `here <atomeye_>`_ or `here <atomeye3_>`_ for more details:
 
-
 .. parsed-literal::
 
-   http://mt.seas.upenn.edu/Archive/Graphics/A
-   http://mt.seas.upenn.edu/Archive/Graphics/A3/A3.html
-
-.. _atomeye: http://mt.seas.upenn.edu/Archive/Graphics/A
-
-
-
-.. _atomeye3: http://mt.seas.upenn.edu/Archive/Graphics/A3/A3.html
+   http://li.mit.edu/Archive/Graphics/A/
+   http://li.mit.edu/Archive/Graphics/A3/A3.html
 
+.. _atomeye: http://li.mit.edu/Archive/Graphics/A/
 
+.. _atomeye3: http://li.mit.edu/Archive/Graphics/A3/A3.html
 
 The latter link is to AtomEye 3 which has the scripting
 capability needed by these Python scripts.
@@ -68,19 +59,14 @@ open-source version of PyMol in your Python, so that you can import it
 from a Python script.  See the PyMol WWW pages `here <pymolhome_>`_ or
 `here <pymolopen_>`_ for more details:
 
-
 .. parsed-literal::
 
-   http://www.pymol.org
-   http://sourceforge.net/scm/?type=svn&group_id=4546
-
-.. _pymolhome: http://www.pymol.org
-
-
-
-.. _pymolopen: http://sourceforge.net/scm/?type=svn&group\_id=4546
+   https://www.pymol.org
+   https://github.com/schrodinger/pymol-open-source
 
+.. _pymolhome: https://www.pymol.org
 
+.. _pymolopen: https://github.com/schrodinger/pymol-open-source
 
 The latter link is to the open-source version.
 
@@ -88,14 +74,12 @@ Note that for VMD, you need a fairly current version (1.8.7 works for
 me) and there are some lines in the pizza/vmd.py script for 4 PIZZA
 variables that have to match the VMD installation on your system.
 
-
 ----------
 
-
 See the python/README file for instructions on how to run them and the
 source code for individual scripts for comments about what they do.
 
-Here are screenshots of the vizplotgui\_tool.py script in action for
+Here are screenshots of the vizplotgui_tool.py script in action for
 different visualization package options.  Click to see larger images:
 
 .. image:: JPG/screenshot_gl_small.jpg
@@ -109,8 +93,3 @@ different visualization package options.  Click to see larger images:
 
 .. image:: JPG/screenshot_vmd_small.jpg
    :target: JPG/screenshot_vmd.jpg
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/Python_head.rst b/doc/src/Python_head.rst
index a9b79b5305..fc808489a5 100644
--- a/doc/src/Python_head.rst
+++ b/doc/src/Python_head.rst
@@ -4,7 +4,6 @@ Use Python with LAMMPS
 These doc pages describe various ways that LAMMPS and Python can be
 used together.
 
-
 .. toctree::
    :maxdepth: 1
 
@@ -28,7 +27,7 @@ its library interface, or to hook multiple pieces of software
 together, such as a simulation code plus a visualization tool, or to
 run a coupled multiscale or multiphysics model.
 
-See the :doc:`Howto\_couple <Howto_couple>` doc page for more ideas about
+See the :doc:`Howto_couple <Howto_couple>` doc page for more ideas about
 coupling LAMMPS to other codes.  See the :doc:`Howto library <Howto_library>` doc page for a description of the LAMMPS
 library interface provided in src/library.h and src/library.h.  That
 interface is exposed to Python either when calling LAMMPS from Python
@@ -42,8 +41,3 @@ interesting Python functions that can be called from a LAMMPS input
 script, that you think would be generally useful, please post them as
 a pull request to our `GitHub site <https://github.com/lammps/lammps>`_,
 and they can be added to the LAMMPS distribution or webpage.
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/Python_install.rst b/doc/src/Python_install.rst
index 83b9a4dd9d..8b2fe9c367 100644
--- a/doc/src/Python_install.rst
+++ b/doc/src/Python_install.rst
@@ -31,13 +31,12 @@ If you set the paths to these files as environment variables, you only
 have to do it once.  For the csh or tcsh shells, add something like
 this to your ~/.cshrc file, one line for each of the two files:
 
-
-.. parsed-literal::
+.. code-block:: csh
 
    setenv PYTHONPATH ${PYTHONPATH}:/home/sjplimp/lammps/python
    setenv LD_LIBRARY_PATH ${LD_LIBRARY_PATH}:/home/sjplimp/lammps/src
 
-On MacOSX you may also need to set DYLD\_LIBRARY\_PATH accordingly.
+On MacOSX you may also need to set DYLD_LIBRARY_PATH accordingly.
 For Bourne/Korn shells accordingly into the corresponding files using
 the "export" shell builtin.
 
@@ -49,7 +48,6 @@ files are updated with the new version.
 If the default settings of "make install-python" are not what you want,
 you can invoke install.py from the python directory manually as
 
-
 .. parsed-literal::
 
    % python install.py -m \<python module\> -l <shared library> -v <version.h file> [-d \<pydir\>]
@@ -60,16 +58,11 @@ you can invoke install.py from the python directory manually as
 * and the optional -d flag to a custom (legacy) installation folder
 
 If you use a legacy installation folder, you will need to set your
-PYTHONPATH and LD\_LIBRARY\_PATH (and/or DYLD\_LIBRARY\_PATH) environment
+PYTHONPATH and LD_LIBRARY_PATH (and/or DYLD_LIBRARY_PATH) environment
 variables accordingly, as described above.
 
 Note that if you want Python to be able to load different versions of
 the LAMMPS shared library (see :doc:`this section <Python_shlib>`), you will
-need to manually copy files like liblammps\_g++.so into the appropriate
-system directory.  This is not needed if you set the LD\_LIBRARY\_PATH
+need to manually copy files like liblammps_g++.so into the appropriate
+system directory.  This is not needed if you set the LD_LIBRARY_PATH
 environment variable as described above.
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/Python_library.rst b/doc/src/Python_library.rst
index e079df1a04..2100074c4e 100644
--- a/doc/src/Python_library.rst
+++ b/doc/src/Python_library.rst
@@ -8,7 +8,6 @@ methods that can be invoked on that object.  The sample Python code
 below assumes you have first imported the "lammps" module in your
 Python script, as follows:
 
-
 .. code-block:: Python
 
    from lammps import lammps
@@ -22,7 +21,6 @@ from a C++ or C or Fortran program, and which are described on the
 The python/examples directory has Python scripts which show how Python
 can run LAMMPS, grab data, change it, and put it back into LAMMPS.
 
-
 .. code-block:: Python
 
    lmp = lammps()           # create a LAMMPS object using the default liblammps.so library
@@ -93,13 +91,10 @@ can run LAMMPS, grab data, change it, and put it back into LAMMPS.
 
    lmp.create_atoms(n,ids,types,x,v,image,shrinkexceed)   # create N atoms with IDs, types, x, v, and image flags
 
-
 ----------
 
-
 The lines
 
-
 .. code-block:: Python
 
    from lammps import lammps
@@ -116,7 +111,6 @@ prompt.
 
 If the ptr argument is set like this:
 
-
 .. code-block:: Python
 
    lmp = lammps(ptr=lmpptr)
@@ -133,7 +127,6 @@ instance "lmp" to make calls to that instance of LAMMPS.  See the
 Note that you can create multiple LAMMPS objects in your Python
 script, and coordinate and run multiple simulations, e.g.
 
-
 .. code-block:: Python
 
    from lammps import lammps
@@ -142,21 +135,21 @@ script, and coordinate and run multiple simulations, e.g.
    lmp1.file("in.file1")
    lmp2.file("in.file2")
 
-The file(), command(), commands\_list(), commands\_string() methods
+The file(), command(), commands_list(), commands_string() methods
 allow an input script, a single command, or multiple commands to be
 invoked.
 
-The extract\_setting(), extract\_global(), extract\_box(),
-extract\_atom(), extract\_compute(), extract\_fix(), and
-extract\_variable() methods return values or pointers to data
+The extract_setting(), extract_global(), extract_box(),
+extract_atom(), extract_compute(), extract_fix(), and
+extract_variable() methods return values or pointers to data
 structures internal to LAMMPS.
 
-For extract\_global() see the src/library.cpp file for the list of
+For extract_global() see the src/library.cpp file for the list of
 valid names.  New names could easily be added.  A double or integer is
 returned.  You need to specify the appropriate data type via the type
 argument.
 
-For extract\_atom(), a pointer to internal LAMMPS atom-based data is
+For extract_atom(), a pointer to internal LAMMPS atom-based data is
 returned, which you can use via normal Python subscripting.  See the
 extract() method in the src/atom.cpp file for a list of valid names.
 Again, new names could easily be added if the property you want is not
@@ -164,7 +157,7 @@ listed.  A pointer to a vector of doubles or integers, or a pointer to
 an array of doubles (double \*\*) or integers (int \*\*) is returned.  You
 need to specify the appropriate data type via the type argument.
 
-For extract\_compute() and extract\_fix(), the global, per-atom, or
+For extract_compute() and extract_fix(), the global, per-atom, or
 local data calculated by the compute or fix can be accessed.  What is
 returned depends on whether the compute or fix calculates a scalar or
 vector or array.  For a scalar, a single double value is returned.  If
@@ -180,7 +173,7 @@ data types.  See the doc pages for individual :doc:`computes <compute>`
 and :doc:`fixes <fix>` for a description of what they calculate and
 store.
 
-For extract\_variable(), an :doc:`equal-style or atom-style variable <variable>` is evaluated and its result returned.
+For extract_variable(), an :doc:`equal-style or atom-style variable <variable>` is evaluated and its result returned.
 
 For equal-style variables a single double value is returned and the
 group argument is ignored.  For atom-style variables, a vector of
@@ -188,17 +181,17 @@ doubles is returned, one value per atom, which you can use via normal
 Python subscripting. The values will be zero for atoms not in the
 specified group.
 
-The get\_thermo() method returns the current value of a thermo
+The get_thermo() method returns the current value of a thermo
 keyword as a float.
 
-The get\_natoms() method returns the total number of atoms in the
+The get_natoms() method returns the total number of atoms in the
 simulation, as an int.
 
-The set\_variable() method sets an existing string-style variable to a
+The set_variable() method sets an existing string-style variable to a
 new string value, so that subsequent LAMMPS commands can access the
 variable.
 
-The reset\_box() method resets the size and shape of the simulation
+The reset_box() method resets the size and shape of the simulation
 box, e.g. as part of restoring a previously extracted and saved state
 of a simulation.
 
@@ -210,26 +203,25 @@ passed by all calling processors, to individual atoms, which may be
 owned by different processors.
 
 Note that the data returned by the gather methods,
-e.g. gather\_atoms("x"), is different from the data structure returned
-by extract\_atom("x") in four ways.  (1) Gather\_atoms() returns a
-vector which you index as x[i]; extract\_atom() returns an array
-which you index as x[i][j].  (2) Gather\_atoms() orders the atoms
-by atom ID while extract\_atom() does not.  (3) Gather\_atoms() returns
-a list of all atoms in the simulation; extract\_atoms() returns just
-the atoms local to each processor.  (4) Finally, the gather\_atoms()
+e.g. gather_atoms("x"), is different from the data structure returned
+by extract_atom("x") in four ways.  (1) Gather_atoms() returns a
+vector which you index as x[i]; extract_atom() returns an array
+which you index as x[i][j].  (2) Gather_atoms() orders the atoms
+by atom ID while extract_atom() does not.  (3) Gather_atoms() returns
+a list of all atoms in the simulation; extract_atoms() returns just
+the atoms local to each processor.  (4) Finally, the gather_atoms()
 data structure is a copy of the atom coords stored internally in
-LAMMPS, whereas extract\_atom() returns an array that effectively
+LAMMPS, whereas extract_atom() returns an array that effectively
 points directly to the internal data.  This means you can change
 values inside LAMMPS from Python by assigning a new values to the
-extract\_atom() array.  To do this with the gather\_atoms() vector, you
-need to change values in the vector, then invoke the scatter\_atoms()
+extract_atom() array.  To do this with the gather_atoms() vector, you
+need to change values in the vector, then invoke the scatter_atoms()
 method.
 
 For the scatter methods, the array of coordinates passed to must be a
 ctypes vector of ints or doubles, allocated and initialized something
 like this:
 
-
 .. code-block:: Python
 
    from ctypes import \*
@@ -247,10 +239,8 @@ like this:
 Alternatively, you can just change values in the vector returned by
 the gather methods, since they are also ctypes vectors.
 
-
 ----------
 
-
 As noted above, these Python class methods correspond one-to-one with
 the functions in the LAMMPS library interface in src/library.cpp and
 library.h.  This means you can extend the Python wrapper via the
@@ -264,7 +254,6 @@ following steps:
 * You should now be able to invoke the new interface function from a
   Python script.
 
-
 ----------
 
 .. autoclass:: lammps.lammps
@@ -274,7 +263,3 @@ following steps:
 .. autoclass:: lammps.NeighList
    :members:
    :no-undoc-members:
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/Python_mpi.rst b/doc/src/Python_mpi.rst
index b72a0161a2..02a62c89d0 100644
--- a/doc/src/Python_mpi.rst
+++ b/doc/src/Python_mpi.rst
@@ -18,8 +18,7 @@ LAMMPS instances on subsets of the total MPI ranks.
 To install mpi4py (version mpi4py-3.0.3 as of Nov 2019), unpack it
 and from its main directory, type
 
-
-.. parsed-literal::
+.. code-block:: bash
 
    python setup.py build
    sudo python setup.py install
@@ -28,31 +27,27 @@ Again, the "sudo" is only needed if required to copy mpi4py files into
 your Python distribution's site-packages directory. To install with
 user privilege into the user local directory type
 
-
-.. parsed-literal::
+.. code-block:: bash
 
    python setup.py install --user
 
 If you have successfully installed mpi4py, you should be able to run
 Python and type
 
-
-.. parsed-literal::
+.. code-block:: python
 
    from mpi4py import MPI
 
 without error.  You should also be able to run python in parallel
 on a simple test script
 
-
-.. parsed-literal::
+.. code-block:: bash
 
    % mpirun -np 4 python test.py
 
 where test.py contains the lines
 
-
-.. parsed-literal::
+.. code-block:: python
 
    from mpi4py import MPI
    comm = MPI.COMM_WORLD
@@ -66,16 +61,11 @@ and see one line of output for each processor you run on.
    insure both are using the same version of MPI.  If you only have one
    MPI installed on your system, this is not an issue, but it can be if
    you have multiple MPIs.  Your LAMMPS build is explicit about which MPI
-   it is using, since you specify the details in your lo-level
+   it is using, since you specify the details in your low-level
    src/MAKE/Makefile.foo file.  Mpi4py uses the "mpicc" command to find
    information about the MPI it uses to build against.  And it tries to
-   load "libmpi.so" from the LD\_LIBRARY\_PATH.  This may or may not find
+   load "libmpi.so" from the LD_LIBRARY_PATH.  This may or may not find
    the MPI library that LAMMPS is using.  If you have problems running
    both mpi4py and LAMMPS together, this is an issue you may need to
    address, e.g. by moving other MPI installations so that mpi4py finds
    the right one.
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/Python_overview.rst b/doc/src/Python_overview.rst
index 173ab06ade..a41de5d444 100644
--- a/doc/src/Python_overview.rst
+++ b/doc/src/Python_overview.rst
@@ -23,8 +23,3 @@ to query or change its attributes through the LAMMPS Python module
 mentioned above.  In Python lingo, this is "embedding" Python in
 LAMMPS.  When used in this mode, Python can perform script operations
 that the simple LAMMPS input script syntax can not.
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/Python_pylammps.rst b/doc/src/Python_pylammps.rst
index f8f653afae..ad34706f50 100644
--- a/doc/src/Python_pylammps.rst
+++ b/doc/src/Python_pylammps.rst
@@ -3,8 +3,3 @@ PyLammps interface
 
 PyLammps is a Python wrapper class which can be created on its own or
 use an existing lammps Python object.  It has its own :doc:`Howto pylammps <Howto_pylammps>` doc page.
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/Python_run.rst b/doc/src/Python_run.rst
index 31ce016612..9aab6da9c6 100644
--- a/doc/src/Python_run.rst
+++ b/doc/src/Python_run.rst
@@ -30,8 +30,3 @@ which auto-generates the interface code needed between Python and a
 set of C-style library functions.  Ctypes is part of standard Python
 for versions 2.5 and later.  You can check which version of Python you
 have by simply typing "python" at a shell prompt.
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/Python_shlib.rst b/doc/src/Python_shlib.rst
index 9dd1fbde6d..0c86362e12 100644
--- a/doc/src/Python_shlib.rst
+++ b/doc/src/Python_shlib.rst
@@ -5,20 +5,19 @@ Build LAMMPS as a shared library using make
 -------------------------------------------
 
 Instructions on how to build LAMMPS as a shared library are given on
-the :doc:`Build\_basics <Build_basics>` doc page.  A shared library is
+the :doc:`Build_basics <Build_basics>` doc page.  A shared library is
 one that is dynamically loadable, which is what Python requires to
 wrap LAMMPS.  On Linux this is a library file that ends in ".so", not
 ".a".
 
 From the src directory, type
 
-
-.. parsed-literal::
+.. code-block:: bash
 
    make foo mode=shlib
 
 where foo is the machine target name, such as mpi or serial.
-This should create the file liblammps\_foo.so in the src directory, as
+This should create the file liblammps_foo.so in the src directory, as
 well as a soft link liblammps.so, which is what the Python wrapper will
 load by default.  Note that if you are building multiple machine
 versions of the shared library, the soft link is always set to the
@@ -30,7 +29,7 @@ most recently built version.
    auxiliary libraries (used by various packages), then all of these
    extra libraries must also be shared libraries.  If the LAMMPS
    shared-library build fails with an error complaining about this, see
-   the :doc:`Build\_basics <Build_basics>` doc page.
+   the :doc:`Build_basics <Build_basics>` doc page.
 
 Build LAMMPS as a shared library using CMake
 --------------------------------------------
@@ -38,8 +37,7 @@ Build LAMMPS as a shared library using CMake
 When using CMake the following two options are necessary to generate the LAMMPS
 shared library:
 
-
-.. parsed-literal::
+.. code-block:: bash
 
    -D BUILD_LIB=on            # enable building LAMMPS as a library
    -D BUILD_SHARED_LIBS=on    # enable building of LAMMPS shared library (both options are needed!)
@@ -47,13 +45,12 @@ shared library:
 What this does is create a liblammps.so which contains the majority of LAMMPS
 code. The generated lmp binary also dynamically links to this library. This
 means that either this liblammps.so file has to be in the same directory, a system
-library path (e.g. /usr/lib64/) or in the LD\_LIBRARY\_PATH.
+library path (e.g. /usr/lib64/) or in the LD_LIBRARY_PATH.
 
 If you want to use the shared library with Python the recommended way is to create a virtualenv and use it as
-CMAKE\_INSTALL\_PREFIX.
+CMAKE_INSTALL_PREFIX.
 
-
-.. parsed-literal::
+.. code-block:: bash
 
    # create virtualenv
    virtualenv --python=$(which python3) myenv3
@@ -69,18 +66,12 @@ CMAKE\_INSTALL\_PREFIX.
    make install
 
 This will also install the Python module into your virtualenv. Since virtualenv
-doesn't change your LD\_LIBRARY\_PATH, you still need to add its lib64 folder to
+does not change your LD_LIBRARY_PATH, you still need to add its lib64 folder to
 it, which contains the installed liblammps.so.
 
-
-.. parsed-literal::
+.. code-block:: bash
 
    export LD_LIBRARY_PATH=$VIRTUAL_ENV/lib64:$LD_LIBRARY_PATH
 
 Starting Python outside (!) of your build directory, but with the virtualenv
-enabled and with the LD\_LIBRARY\_PATH set gives you access to LAMMPS via Python.
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
+enabled and with the LD_LIBRARY_PATH set gives you access to LAMMPS via Python.
diff --git a/doc/src/Python_test.rst b/doc/src/Python_test.rst
index 562ab88986..55a1c0a2d3 100644
--- a/doc/src/Python_test.rst
+++ b/doc/src/Python_test.rst
@@ -4,7 +4,6 @@ Test the Python/LAMMPS interface
 To test if LAMMPS is callable from Python, launch Python interactively
 and type:
 
-
 .. parsed-literal::
 
    >>> from lammps import lammps
@@ -13,7 +12,6 @@ and type:
 If you get no errors, you're ready to use LAMMPS from Python.  If the
 2nd command fails, the most common error to see is
 
-
 .. parsed-literal::
 
    OSError: Could not load LAMMPS dynamic library
@@ -27,24 +25,22 @@ should give you an indication of what went wrong.
 You can also test the load directly in Python as follows, without
 first importing from the lammps.py file:
 
-
 .. parsed-literal::
 
    >>> from ctypes import CDLL
    >>> CDLL("liblammps.so")
 
 If an error occurs, carefully go through the steps on the
-:doc:`Build\_basics <Build_basics>` doc page about building a shared
-library and the :doc:`Python\_install <Python_install>` doc page about
+:doc:`Build_basics <Build_basics>` doc page about building a shared
+library and the :doc:`Python_install <Python_install>` doc page about
 insuring Python can find the necessary two files it needs.
 
-**Test LAMMPS and Python in serial:**
+Test LAMMPS and Python in serial:
 -------------------------------------
 
 To run a LAMMPS test in serial, type these lines into Python
 interactively from the bench directory:
 
-
 .. parsed-literal::
 
    >>> from lammps import lammps
@@ -53,8 +49,7 @@ interactively from the bench directory:
 
 Or put the same lines in the file test.py and run it as
 
-
-.. parsed-literal::
+.. code-block:: bash
 
    % python test.py
 
@@ -62,20 +57,18 @@ Either way, you should see the results of running the in.lj benchmark
 on a single processor appear on the screen, the same as if you had
 typed something like:
 
-
 .. parsed-literal::
 
    lmp_g++ -in in.lj
 
-**Test LAMMPS and Python in parallel:**
+Test LAMMPS and Python in parallel:
 ---------------------------------------
 
 To run LAMMPS in parallel, assuming you have installed the
 `PyPar <https://github.com/daleroberts/pypar>`_ package as discussed
 above, create a test.py file containing these lines:
 
-
-.. parsed-literal::
+.. code-block:: python
 
    import pypar
    from lammps import lammps
@@ -88,8 +81,7 @@ To run LAMMPS in parallel, assuming you have installed the
 `mpi4py <https://bitbucket.org/mpi4py/mpi4py>`_ package as discussed
 above, create a test.py file containing these lines:
 
-
-.. parsed-literal::
+.. code-block:: python
 
    from mpi4py import MPI
    from lammps import lammps
@@ -102,15 +94,13 @@ above, create a test.py file containing these lines:
 
 You can either script in parallel as:
 
-
-.. parsed-literal::
+.. code-block:: bash
 
    % mpirun -np 4 python test.py
 
 and you should see the same output as if you had typed
 
-
-.. parsed-literal::
+.. code-block:: bash
 
    % mpirun -np 4 lmp_g++ -in in.lj
 
@@ -128,14 +118,13 @@ described in the PyPar documentation.  The last line of your Python
 script should be pypar.finalize(), to insure MPI is shut down
 correctly.
 
-**Running Python scripts:**
+Running Python scripts:
 ---------------------------
 
 Note that any Python script (not just for LAMMPS) can be invoked in
 one of several ways:
 
-
-.. parsed-literal::
+.. code-block:: bash
 
    % python foo.script
    % python -i foo.script
@@ -144,8 +133,7 @@ one of several ways:
 The last command requires that the first line of the script be
 something like this:
 
-
-.. parsed-literal::
+.. code-block:: bash
 
    #!/usr/local/bin/python
    #!/usr/local/bin/python -i
@@ -153,8 +141,7 @@ something like this:
 where the path points to where you have Python installed, and that you
 have made the script file executable:
 
-
-.. parsed-literal::
+.. code-block:: bash
 
    % chmod +x foo.script
 
@@ -163,8 +150,3 @@ With the "-i" flag, you will be left in the Python interpreter when
 the script finishes, so you can type subsequent commands.  As
 mentioned above, you can only run Python interactively when running
 Python on a single processor, not in parallel.
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/Run_basics.rst b/doc/src/Run_basics.rst
index fb5ca1736f..d02873a8be 100644
--- a/doc/src/Run_basics.rst
+++ b/doc/src/Run_basics.rst
@@ -1,25 +1,24 @@
 Basics of running LAMMPS
 ========================
 
-LAMMPS is run from the command line, reading commands from a
-file via the -in command line flag, or from standard input.
+LAMMPS is run from the command line, reading commands from a file via
+the -in command line flag, or from standard input.
 Using the "-in in.file" variant is recommended:
 
+.. code-block:: bash
 
-.. parsed-literal::
+   $ lmp_serial -in in.file
+   $ lmp_serial < in.file
+   $ /path/to/lammps/src/lmp_serial -i in.file
+   $ mpirun -np 4 lmp_mpi -in in.file
+   $ mpirun -np 8 /path/to/lammps/src/lmp_mpi -in in.file
+   $ mpirun -np 6 /usr/local/bin/lmp -in in.file
 
-   lmp_serial < in.file
-   lmp_serial -in in.file
-   /path/to/lammps/src/lmp_serial < in.file
-   mpirun -np 4 lmp_mpi -in in.file
-   mpirun -np 8 /path/to//lammps/src/lmp_mpi -in in.file
-   mpirun -np 6 /usr/local/bin/lmp -in in.file
-
-You normally run the LAMMPS command in the directory where your
-input script is located.  That is also where output files are
-produced by default, unless you provide specific other paths in
-your input script or on the command line.  As in some of the
-examples above, the LAMMPS executable itself can be placed elsewhere.
+You normally run the LAMMPS command in the directory where your input
+script is located.  That is also where output files are produced by
+default, unless you provide specific other paths in your input script or
+on the command line.  As in some of the examples above, the LAMMPS
+executable itself can be placed elsewhere.
 
 .. note::
 
@@ -27,7 +26,8 @@ examples above, the LAMMPS executable itself can be placed elsewhere.
    in parallel with mpirun; for those systems the -in form is required.
 
 As LAMMPS runs it prints info to the screen and a logfile named
-log.lammps.  More info about output is given on the :doc:`Run output <Run_output>` doc page.
+*log.lammps*\ .  More info about output is given on the
+:doc:`Run output <Run_output>` doc page.
 
 If LAMMPS encounters errors in the input script or while running a
 simulation it will print an ERROR message and stop or a WARNING
@@ -35,26 +35,27 @@ message and continue.  See the :doc:`Errors <Errors>` doc page for a
 discussion of the various kinds of errors LAMMPS can or can't detect,
 a list of all ERROR and WARNING messages, and what to do about them.
 
-
 ----------
 
-
-LAMMPS can run the same problem on any number of processors, including
-a single processor.  In theory you should get identical answers on any
+LAMMPS can run the same problem on any number of processors, including a
+single processor.  In theory you should get identical answers on any
 number of processors and on any machine.  In practice, numerical
-round-off can cause slight differences and eventual divergence of
-molecular dynamics phase space trajectories.  See the :doc:`Errors common <Errors_common>` doc page for discussion of this.
+round-off due to using floating-point math can cause slight differences
+and an eventual divergence of molecular dynamics trajectories.  See the
+:doc:`Errors common <Errors_common>` doc page for discussion of this.
 
-LAMMPS can run as large a problem as will fit in the physical memory
-of one or more processors.  If you run out of memory, you must run on
-more processors or define a smaller problem.
+LAMMPS can run as large a problem as will fit in the physical memory of
+one or more processors.  If you run out of memory, you must run on more
+processors or define a smaller problem.  The amount of memory needed and
+how well it can be distributed across processors may vary based
+on the models and settings and commands used.
 
 If you run LAMMPS in parallel via mpirun, you should be aware of the
-:doc:`processors <processors>` command which controls how MPI tasks are
-mapped to the simulation box, as well as mpirun options that control
-how MPI tasks are assigned to physical cores of the node(s) of the
-machine you are running on.  These settings can improve performance,
-though the defaults are often adequate.
+:doc:`processors <processors>` command, which controls how MPI tasks are
+mapped to the simulation box, as well as mpirun options that control how
+MPI tasks are assigned to physical cores of the node(s) of the machine
+you are running on.  These settings can improve performance, though the
+defaults are often adequate.
 
 For example, it is often important to bind MPI tasks (processes) to
 physical cores (processor affinity), so that the operating system does
@@ -64,13 +65,12 @@ or "-bind-to core" (MPICH) can be used.
 
 If the LAMMPS command(s) you are using support multi-threading, you
 can set the number of threads per MPI task via the environment
-variable OMP\_NUM\_THREADS, before you launch LAMMPS:
+variable OMP_NUM_THREADS, before you launch LAMMPS:
 
+.. code-block:: bash
 
-.. parsed-literal::
-
-   export OMP_NUM_THREADS=2     # bash
-   setenv OMP_NUM_THREADS 2     # csh or tcsh
+   $ export OMP_NUM_THREADS=2     # bash
+   $ setenv OMP_NUM_THREADS 2     # csh or tcsh
 
 This can also be done via the :doc:`package <package>` command or via
 the :doc:`-pk command-line switch <Run_options>` which invokes the
@@ -78,10 +78,8 @@ package command.  See the :doc:`package <package>` command or
 :doc:`Speed <Speed>` doc pages for more details about which accelerator
 packages and which commands support multi-threading.
 
-
 ----------
 
-
 You can experiment with running LAMMPS using any of the input scripts
 provided in the examples or bench directory.  Input scripts are named
 in.\* and sample outputs are named log.\*.P where P is the number of
@@ -89,8 +87,3 @@ processors it was run on.
 
 Some of the examples or benchmarks require LAMMPS to be built with
 optional packages.
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/Run_head.rst b/doc/src/Run_head.rst
index 02db16bf25..5da5942d9b 100644
--- a/doc/src/Run_head.rst
+++ b/doc/src/Run_head.rst
@@ -6,7 +6,6 @@ and :doc:`built an executable <Build>`.  The :doc:`Commands <Commands>`
 doc page describes how input scripts are structured and the commands
 they can contain.
 
-
 .. toctree::
    :maxdepth: 1
 
@@ -14,8 +13,3 @@ they can contain.
    Run_options
    Run_output
    Run_windows
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/Run_options.rst b/doc/src/Run_options.rst
index e45a4d3053..afdae20376 100644
--- a/doc/src/Run_options.rst
+++ b/doc/src/Run_options.rst
@@ -23,21 +23,18 @@ letter abbreviation can be used:
 * :ref:`-sf or -suffix <suffix>`
 * :ref:`-v or -var <var>`
 
-For example, the lmp\_mpi executable might be launched as follows:
+For example, the lmp_mpi executable might be launched as follows:
 
+.. code-block:: bash
 
-.. parsed-literal::
-
-   mpirun -np 16 lmp_mpi -v f tmp.out -l my.log -sc none -i in.alloy
-   mpirun -np 16 lmp_mpi -var f tmp.out -log my.log -screen none -in in.alloy
-
+   $ mpirun -np 16 lmp_mpi -v f tmp.out -l my.log -sc none -i in.alloy
+   $ mpirun -np 16 lmp_mpi -var f tmp.out -log my.log -screen none -in in.alloy
 
 ----------
 
-
 .. _echo:
 
-**-echo style** 
+**-echo style**
 
 Set the style of command echoing.  The style can be *none* or *screen*
 or *log* or *both*\ .  Depending on the style, each command read from
@@ -46,46 +43,40 @@ can be useful to figure out which line of your script is causing an
 input error.  The default value is *log*\ .  The echo style can also be
 set by using the :doc:`echo <echo>` command in the input script itself.
 
-
 ----------
 
-
 .. _help:
 
-**-help** 
+**-help**
 
 Print a brief help summary and a list of options compiled into this
-executable for each LAMMPS style (atom\_style, fix, compute,
-pair\_style, bond\_style, etc).  This can tell you if the command you
+executable for each LAMMPS style (atom_style, fix, compute,
+pair_style, bond_style, etc).  This can tell you if the command you
 want to use was included via the appropriate package at compile time.
 LAMMPS will print the info and immediately exit if this switch is
 used.
 
-
 ----------
 
-
 .. _file:
 
-**-in file** 
+**-in file**
 
 Specify a file to use as an input script.  This is an optional switch
 when running LAMMPS in one-partition mode.  If it is not specified,
 LAMMPS reads its script from standard input, typically from a script
-via I/O redirection; e.g. lmp\_linux < in.run.  I/O redirection should
+via I/O redirection; e.g. lmp_linux < in.run.  I/O redirection should
 also work in parallel, but if it does not (in the unlikely case that
 an MPI implementation does not support it), then use the -in flag.
 Note that this is a required switch when running LAMMPS in
 multi-partition mode, since multiple processors cannot all read from
 stdin.
 
-
 ----------
 
-
 .. _run-kokkos:
 
-**-kokkos on/off keyword/value ...** 
+**-kokkos on/off keyword/value ...**
 
 Explicitly enable or disable KOKKOS support, as provided by the KOKKOS
 package.  Even if LAMMPS is built with this package, as described
@@ -114,7 +105,6 @@ settings to use on different platforms is given on the :doc:`Speed kokkos <Speed
 * t or threads
 * n or numa
 
-
 .. parsed-literal::
 
    device Nd
@@ -127,7 +117,6 @@ have consecutive IDs numbered as 0,1,2,etc.  This setting allows you
 to launch multiple independent jobs on the node, each with a single
 MPI task per node, and assign each job to run on a different GPU.
 
-
 .. parsed-literal::
 
    gpus Ng Ns
@@ -144,7 +133,6 @@ Ng = 1 and Ns is not set.
 Depending on which flavor of MPI you are running, LAMMPS will look for
 one of these 4 environment variables
 
-
 .. parsed-literal::
 
    SLURM_LOCALID (various MPI variants compiled with SLURM support)
@@ -156,7 +144,6 @@ which are initialized by the "srun", "mpirun" or "mpiexec" commands.
 The environment variable setting for each MPI rank is used to assign a
 unique GPU ID to the MPI task.
 
-
 .. parsed-literal::
 
    threads Nt
@@ -169,7 +156,6 @@ the number of physical cores per node, to use your available hardware
 optimally.  This also sets the number of threads used by the host when
 LAMMPS is compiled with CUDA=yes.
 
-
 .. parsed-literal::
 
    numa Nm
@@ -184,34 +170,30 @@ its default value of 1. This is because letting a single process span
 multiple NUMA regions induces a significant amount of cross NUMA data
 traffic which is slow.
 
-
 ----------
 
-
 .. _log:
 
-**-log file** 
+**-log file**
 
 Specify a log file for LAMMPS to write status information to.  In
 one-partition mode, if the switch is not used, LAMMPS writes to the
 file log.lammps.  If this switch is used, LAMMPS writes to the
 specified file.  In multi-partition mode, if the switch is not used, a
-log.lammps file is created with hi-level status information.  Each
+log.lammps file is created with high-level status information.  Each
 partition also writes to a log.lammps.N file where N is the partition
-ID.  If the switch is specified in multi-partition mode, the hi-level
+ID.  If the switch is specified in multi-partition mode, the high-level
 logfile is named "file" and each partition also logs information to a
 file.N.  For both one-partition and multi-partition mode, if the
 specified file is "none", then no log files are created.  Using a
 :doc:`log <log>` command in the input script will override this setting.
 Option -plog will override the name of the partition log files file.N.
 
-
 ----------
 
-
 .. _mpicolor:
 
-**-mpicolor** color 
+**-mpicolor** color
 
 If used, this must be the first command-line argument after the LAMMPS
 executable name.  It is only used when LAMMPS is launched by an mpirun
@@ -219,8 +201,8 @@ command which also launches another executable(s) at the same time.
 (The other executable could be LAMMPS as well.)  The color is an
 integer value which should be different for each executable (another
 application may set this value in a different way).  LAMMPS and the
-other executable(s) perform an MPI\_Comm\_split() with their own colors
-to shrink the MPI\_COMM\_WORLD communication to be the subset of
+other executable(s) perform an MPI_Comm_split() with their own colors
+to shrink the MPI_COMM_WORLD communication to be the subset of
 processors they are actually running on.
 
 Currently, this is only used in LAMMPS to perform client/server
@@ -232,26 +214,22 @@ by the :doc:`message <message>` command and the CSlib library LAMMPS
 links with from the lib/message directory.  See the
 :doc:`message <message>` command for more details.
 
-
 ----------
 
-
 .. _nocite:
 
-**-nocite** 
+**-nocite**
 
 Disable writing the log.cite file which is normally written to list
 references for specific cite-able features used during a LAMMPS run.
-See the `citation page <http://lammps.sandia.gov/cite.html>`_ for more
+See the `citation page <https://lammps.sandia.gov/cite.html>`_ for more
 details.
 
-
 ----------
 
-
 .. _package:
 
-**-package style args ....** 
+**-package style args ....**
 
 Invoke the :doc:`package <package>` command with style and args.  The
 syntax is the same as if the command appeared at the top of the input
@@ -265,13 +243,11 @@ Along with the "-suffix" command-line switch, this is a convenient
 mechanism for invoking accelerator packages and their options without
 having to edit an input script.
 
-
 ----------
 
-
 .. _partition:
 
-**-partition 8x2 4 5 ...** 
+**-partition 8x2 4 5 ...**
 
 Invoke LAMMPS in multi-partition mode.  When LAMMPS is run on P
 processors and this switch is not used, LAMMPS runs in one partition,
@@ -296,13 +272,11 @@ multiple partitions, see the :doc:`Howto multiple <Howto_multiple>` doc
 page.  World- and universe-style :doc:`variables <variable>` are useful
 in this context.
 
-
 ----------
 
-
 .. _plog:
 
-**-plog file** 
+**-plog file**
 
 Specify the base name for the partition log files, so partition N
 writes log information to file.N. If file is none, then no partition
@@ -310,17 +284,15 @@ log files are created.  This overrides the filename specified in the
 -log command-line option.  This option is useful when working with
 large numbers of partitions, allowing the partition log files to be
 suppressed (-plog none) or placed in a sub-directory (-plog
-replica\_files/log.lammps) If this option is not used the log file for
+replica_files/log.lammps) If this option is not used the log file for
 partition N is log.lammps.N or whatever is specified by the -log
 command-line option.
 
-
 ----------
 
-
 .. _pscreen:
 
-**-pscreen file** 
+**-pscreen file**
 
 Specify the base name for the partition screen file, so partition N
 writes screen information to file.N. If file is none, then no
@@ -328,21 +300,18 @@ partition screen files are created.  This overrides the filename
 specified in the -screen command-line option.  This option is useful
 when working with large numbers of partitions, allowing the partition
 screen files to be suppressed (-pscreen none) or placed in a
-sub-directory (-pscreen replica\_files/screen).  If this option is not
+sub-directory (-pscreen replica_files/screen).  If this option is not
 used the screen file for partition N is screen.N or whatever is
 specified by the -screen command-line option.
 
-
 ----------
 
-
 .. _reorder:
 
-**-reorder** 
+**-reorder**
 
 This option has 2 forms:
 
-
 .. parsed-literal::
 
    -reorder nth N
@@ -371,21 +340,18 @@ This can boost performance.  For example, if you use "-reorder nth 4"
 and "-partition 9 3" and you are running on 12 processors, the
 processors will be reordered from
 
-
 .. parsed-literal::
 
    0 1 2 3 4 5 6 7 8 9 10 11
 
 to
 
-
 .. parsed-literal::
 
    0 1 2 4 5 6 8 9 10 3 7 11
 
 so that the processors in each partition will be
 
-
 .. parsed-literal::
 
    0 1 2 4 5 6 8 9 10
@@ -400,7 +366,6 @@ file is as follows.  Any number of initial blank or comment lines
 (starting with a "#" character) can be present.  These should be
 followed by P lines of the form:
 
-
 .. parsed-literal::
 
    I J
@@ -424,21 +389,17 @@ itself.  See the :doc:`processors out <processors>` command for how
 to output info on the final assignment of physical processors to
 the LAMMPS simulation domain.
 
-
 ----------
 
-
 .. _restart2data:
 
 **-restart2data restartfile [remap] datafile keyword value ...**
 
-
 Convert the restart file into a data file and immediately exit.  This
 is the same operation as if the following 2-line input script were
 run:
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    read_restart restartfile [remap]
    write_data datafile keyword value ...
@@ -461,7 +422,6 @@ should allow the data file to still be produced.
 
 The syntax following restartfile (or remap), namely
 
-
 .. parsed-literal::
 
    datafile keyword value ...
@@ -470,20 +430,17 @@ is identical to the arguments of the :doc:`write_data <write_data>`
 command.  See its doc page for details.  This includes its
 optional keyword/value settings.
 
-
 ----------
 
-
 .. _restart2dump:
 
-**-restart2dump restartfile [remap] group-ID dumpstyle dumpfile arg1 arg2 ...** 
+**-restart2dump restartfile [remap] group-ID dumpstyle dumpfile arg1 arg2 ...**
 
 Convert the restart file into a dump file and immediately exit.  This
 is the same operation as if the following 2-line input script were
 run:
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    read_restart restartfile [remap]
    write_dump group-ID dumpstyle dumpfile arg1 arg2 ...
@@ -506,46 +463,41 @@ dump file to still be produced.
 
 The syntax following restartfile (or remap), namely
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    group-ID dumpstyle dumpfile arg1 arg2 ...
 
 is identical to the arguments of the :doc:`write_dump <write_dump>`
 command.  See its doc page for details.  This includes what per-atom
-fields are written to the dump file and optional dump\_modify settings,
+fields are written to the dump file and optional dump_modify settings,
 including ones that affect how parallel dump files are written, e.g.
 the *nfile* and *fileper* keywords.  See the
 :doc:`dump_modify <dump_modify>` doc page for details.
 
-
 ----------
 
-
 .. _screen:
 
-**-screen file** 
+**-screen file**
 
 Specify a file for LAMMPS to write its screen information to.  In
 one-partition mode, if the switch is not used, LAMMPS writes to the
 screen.  If this switch is used, LAMMPS writes to the specified file
 instead and you will see no screen output.  In multi-partition mode,
-if the switch is not used, hi-level status information is written to
+if the switch is not used, high-level status information is written to
 the screen.  Each partition also writes to a screen.N file where N is
 the partition ID.  If the switch is specified in multi-partition mode,
-the hi-level screen dump is named "file" and each partition also
+the high-level screen dump is named "file" and each partition also
 writes screen information to a file.N.  For both one-partition and
 multi-partition mode, if the specified file is "none", then no screen
 output is performed. Option -pscreen will override the name of the
 partition screen files file.N.
 
-
 ----------
 
-
 .. _suffix:
 
-**-suffix style args** 
+**-suffix style args**
 
 Use variants of various styles if they exist.  The specified style can
 be *gpu*\ , *intel*\ , *kk*\ , *omp*\ , *opt*\ , or *hybrid*\ .  These
@@ -568,7 +520,7 @@ having to edit an input script.
 
 As an example, all of the packages provide a :doc:`pair_style lj/cut <pair_lj>` variant, with style names lj/cut/gpu,
 lj/cut/intel, lj/cut/kk, lj/cut/omp, and lj/cut/opt.  A variant style
-can be specified explicitly in your input script, e.g. pair\_style
+can be specified explicitly in your input script, e.g. pair_style
 lj/cut/gpu.  If the -suffix switch is used the specified suffix
 (gpu,intel,kk,omp,opt) is automatically appended whenever your input
 script command creates a new :doc:`atom <atom_style>`,
@@ -608,13 +560,11 @@ The :doc:`suffix <suffix>` command can also be used within an input
 script to set a suffix, or to turn off or back on any suffix setting
 made via the command line.
 
-
 ----------
 
-
 .. _var:
 
-**-var name value1 value2 ...** 
+**-var name value1 value2 ...**
 
 Specify a variable that will be defined for substitution purposes when
 the input script is read.  This switch can be used multiple times to
@@ -639,8 +589,3 @@ input scripts.
    multiple variable values if any of them start with a "-", e.g. a
    negative numeric value.  It is OK if the first value1 starts with a
    "-", since it is automatically skipped.
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/Run_output.rst b/doc/src/Run_output.rst
index b8cdf6cc29..d7d92dc5ee 100644
--- a/doc/src/Run_output.rst
+++ b/doc/src/Run_output.rst
@@ -14,7 +14,6 @@ thermodynamic state and a total run time for the simulation.  It also
 appends statistics about the CPU time and storage requirements for the
 simulation.  An example set of statistics is shown here:
 
-
 .. parsed-literal::
 
    Loop time of 2.81192 on 4 procs for 300 steps with 2004 atoms
@@ -47,10 +46,8 @@ simulation.  An example set of statistics is shown here:
    Neighbor list builds = 26
    Dangerous builds = 0
 
-
 ----------
 
-
 The first section provides a global loop timing summary. The *loop
 time* is the total wall-clock time for the simulation to run.  The
 *Performance* line is provided for convenience to help predict how
@@ -60,10 +57,8 @@ line provides the CPU utilization per MPI task; it should be close to
 Lower numbers correspond to delays due to file I/O or insufficient
 thread utilization.
 
-
 ----------
 
-
 The *MPI task* section gives the breakdown of the CPU run time (in
 seconds) into major categories:
 
@@ -96,7 +91,6 @@ only and thus, because the breakdown for MPI tasks can change from
 MPI rank to MPI rank, this breakdown can be very different for
 individual ranks. Here is an example output for this section:
 
-
 .. parsed-literal::
 
    Thread timings breakdown (MPI rank 0):
@@ -109,20 +103,16 @@ individual ranks. Here is an example output for this section:
    Neigh   \| 0.084778   \| 0.086969   \| 0.089161   \|   0.7 \| 12.70
    Reduce  \| 0.0036485  \| 0.003737   \| 0.0038254  \|   0.1 \|  0.55
 
-
 ----------
 
-
 The third section above lists the number of owned atoms (Nlocal),
 ghost atoms (Nghost), and pair-wise neighbors stored per processor.
 The max and min values give the spread of these values across
 processors with a 10-bin histogram showing the distribution. The total
 number of histogram counts is equal to the number of processors.
 
-
 ----------
 
-
 The last section gives aggregate statistics (across all processors)
 for pair-wise neighbors and special neighbors that LAMMPS keeps track
 of (see the :doc:`special_bonds <special_bonds>` command).  The number
@@ -135,15 +125,12 @@ non-zero you may wish to reduce the delay factor to insure no force
 interactions are missed by atoms moving beyond the neighbor skin
 distance before a rebuild takes place.
 
-
 ----------
 
-
 If an energy minimization was performed via the
 :doc:`minimize <minimize>` command, additional information is printed,
 e.g.
 
-
 .. parsed-literal::
 
    Minimization stats:
@@ -167,15 +154,12 @@ Multiple force evaluations are typically done at each iteration to
 perform a 1d line minimization in the search direction.  See the
 :doc:`minimize <minimize>` doc page for more details.
 
-
 ----------
 
-
 If a :doc:`kspace_style <kspace_style>` long-range Coulombics solver
 that performs FFTs was used during the run (PPPM, Ewald), then
 additional information is printed, e.g.
 
-
 .. parsed-literal::
 
    FFT time (% of Kspce) = 0.200313 (8.34477)
@@ -184,14 +168,9 @@ additional information is printed, e.g.
 The first line is the time spent doing 3d FFTs (several per timestep)
 and the fraction it represents of the total KSpace time (listed
 above).  Each 3d FFT requires computation (3 sets of 1d FFTs) and
-communication (transposes).  The total flops performed is 5Nlog\_2(N),
+communication (transposes).  The total flops performed is 5Nlog_2(N),
 where N is the number of points in the 3d grid.  The FFTs are timed
 with and without the communication and a Gflop rate is computed.  The
 3d rate is with communication; the 1d rate is without (just the 1d
 FFTs).  Thus you can estimate what fraction of your FFT time was spent
 in communication, roughly 75% in the example above.
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/Run_windows.rst b/doc/src/Run_windows.rst
index 7892079029..0343e123b9 100644
--- a/doc/src/Run_windows.rst
+++ b/doc/src/Run_windows.rst
@@ -7,22 +7,19 @@ To run a serial (non-MPI) executable, follow these steps:
   then typing "cmd".
 * Move to the directory where you have your input script,
   (e.g. by typing: cd "Documents").
-* At the command prompt, type "lmp\_serial -in in.file", where
+* At the command prompt, type "lmp_serial -in in.file", where
   in.file is the name of your LAMMPS input script.
 
 Note that the serial executable includes support for multi-threading
 parallelization from the styles in the USER-OMP packages.  To run with
 4 threads, you can type this:
 
-
-.. parsed-literal::
+.. code-block:: bash
 
    lmp_serial -in in.lj -pk omp 4 -sf omp
 
-
 ----------
 
-
 For the MPI executable, which allows you to run LAMMPS under Windows
 in parallel, follow these steps.
 
@@ -46,8 +43,7 @@ into the MPICH2 installation directory, then into the sub-directory
 
 Then type something like this:
 
-
-.. parsed-literal::
+.. code-block:: bash
 
    mpiexec -localonly 4 lmp_mpi -in in.file
    mpiexec -np 4 lmp_mpi -in in.file
@@ -62,20 +58,13 @@ patient before the output shows up.
 The parallel executable can also run on a single processor by typing
 something like this:
 
-
-.. parsed-literal::
+.. code-block:: bash
 
    lmp_mpi -in in.lj
 
 Note that the parallel executable also includes OpenMP
 multi-threading, which can be combined with MPI using something like:
 
-
-.. parsed-literal::
+.. code-block:: bash
 
    mpiexec -localonly 2 lmp_mpi -in in.lj -pk omp 2 -sf omp
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/Speed.rst b/doc/src/Speed.rst
index 4953a9fdda..0528ff32d8 100644
--- a/doc/src/Speed.rst
+++ b/doc/src/Speed.rst
@@ -12,14 +12,13 @@ accelerator packages provided with LAMMPS that contain code optimized
 for certain kinds of hardware, including multi-core CPUs, GPUs, and
 Intel Xeon Phi co-processors.
 
-The `Benchmark page <http://lammps.sandia.gov/bench.html>`_ of the LAMMPS
+The `Benchmark page <https://lammps.sandia.gov/bench.html>`_ of the LAMMPS
 web site gives performance results for the various accelerator
 packages discussed on the :doc:`Speed packages <Speed_packages>` doc
 page, for several of the standard LAMMPS benchmark problems, as a
 function of problem size and number of compute nodes, on different
 hardware platforms.
 
-
 .. toctree::
    :maxdepth: 1
 
@@ -28,8 +27,3 @@ hardware platforms.
    Speed_tips
    Speed_packages
    Speed_compare
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/Speed_bench.rst b/doc/src/Speed_bench.rst
index 8de5ee5d07..45b5b21d8a 100644
--- a/doc/src/Speed_bench.rst
+++ b/doc/src/Speed_bench.rst
@@ -1,7 +1,7 @@
 Benchmarks
 ==========
 
-Current LAMMPS performance is discussed on the `Benchmarks page <http://lammps.sandia.gov/bench.html>`_ of the `LAMMPS website <lws_>`_
+Current LAMMPS performance is discussed on the `Benchmarks page <https://lammps.sandia.gov/bench.html>`_ of the `LAMMPS website <lws_>`_
 where timings and parallel efficiency are listed.  The page has
 several sections, which are briefly described below:
 
@@ -26,7 +26,6 @@ The 5 standard problems are as follow:
    particle-particle particle-mesh (PPPM) for long-range Coulombics, NPT
    integration
 
-
 Input files for these 5 problems are provided in the bench directory
 of the LAMMPS distribution.  Each has 32,000 atoms and runs for 100
 timesteps.  The size of the problem (number of atoms) can be varied
@@ -36,27 +35,25 @@ scalability on your machine.
 
 The bench directory includes a few log.\* files that show performance
 of these 5 problems on 1 or 4 cores of Linux desktop.  The bench/FERMI
-and bench/KEPLER dirs have input files and scripts and instructions
+and bench/KEPLER directories have input files and scripts and instructions
 for running the same (or similar) problems using OpenMP or GPU or Xeon
-Phi acceleration options.  See the README files in those dirs and the
+Phi acceleration options.  See the README files in those directories and the
 :doc:`Speed packages <Speed_packages>` doc pages for instructions on how
 to build LAMMPS and run on that kind of hardware.
 
 The bench/POTENTIALS directory has input files which correspond to the
 table of results on the
-`Potentials <http://lammps.sandia.gov/bench.html#potentials>`_ section of
+`Potentials <https://lammps.sandia.gov/bench.html#potentials>`_ section of
 the Benchmarks web page.  So you can also run those test problems on
 your machine.
 
-The `billion-atom <http://lammps.sandia.gov/bench.html#billion>`_ section
+The `billion-atom <https://lammps.sandia.gov/bench.html#billion>`_ section
 of the Benchmarks web page has performance data for very large
 benchmark runs of simple Lennard-Jones (LJ) models, which use the
 bench/in.lj input script.
 
-
 ----------
 
-
 For all the benchmarks, a useful metric is the CPU cost per atom per
 timestep.  Since performance scales roughly linearly with problem size
 and timesteps for all LAMMPS models (i.e. interatomic or coarse-grained
@@ -76,7 +73,4 @@ estimate parallel performance for multi-node runs using the same logic
 as for all-MPI mode, except that now you will typically need many more
 atoms/node to achieve good scalability.
 
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
+.. _lws: https://lammps.sandia.gov
diff --git a/doc/src/Speed_compare.rst b/doc/src/Speed_compare.rst
index 4e97ecd264..d3947ec3ef 100644
--- a/doc/src/Speed_compare.rst
+++ b/doc/src/Speed_compare.rst
@@ -66,7 +66,7 @@ section below for examples where this has been done.
   acceleration and instead run it - concurrently with a GPU accelerated
   pair style - on the CPU. This can often be easily achieved with placing
   a *suffix off* command before and a *suffix on* command after the
-  *kspace\_style pppm* command.
+  *kspace_style pppm* command.
 * The KOKKOS/OpenMP and USER-OMP package have different thread management
   strategies, which should result in USER-OMP being more efficient for a
   small number of threads with increasing overhead as the number of threads
@@ -77,7 +77,6 @@ section below for examples where this has been done.
   to unlock this potential, an Intel compiler is required. The package code
   will compile with GNU gcc, but it will not be as efficient.
 
-
 **Differences between the GPU and KOKKOS packages:**
 
 * The GPU package accelerates only pair force, neighbor list, and (parts
@@ -93,9 +92,3 @@ section below for examples where this has been done.
 * OpenCL in the GPU package does theoretically also support Intel CPUs or
   Intel Xeon Phi, but the native support for those in KOKKOS (or USER-INTEL)
   is superior.
-
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/Speed_gpu.rst b/doc/src/Speed_gpu.rst
index f9ade13401..9981b22b03 100644
--- a/doc/src/Speed_gpu.rst
+++ b/doc/src/Speed_gpu.rst
@@ -27,7 +27,6 @@ It has the following general features:
   NVIDIA support as well as more general OpenCL support, so that the
   same functionality is supported on a variety of hardware.
 
-
 **Required hardware/software:**
 
 To compile and use this package in CUDA mode, you currently need
@@ -36,9 +35,9 @@ toolkit software on your system (this is primarily tested on Linux
 and completely unsupported on Windows):
 
 * Check if you have an NVIDIA GPU: cat /proc/driver/nvidia/gpus/\*/information
-* Go to http://www.nvidia.com/object/cuda\_get.html
+* Go to http://www.nvidia.com/object/cuda_get.html
 * Install a driver and toolkit appropriate for your system (SDK is not necessary)
-* Run lammps/lib/gpu/nvc\_get\_devices (after building the GPU library, see below) to
+* Run lammps/lib/gpu/nvc_get_devices (after building the GPU library, see below) to
   list supported devices and properties
 
 To compile and use this package in OpenCL mode, you currently need
@@ -48,7 +47,7 @@ installed. There can be multiple of them for the same or different hardware
 (GPUs, CPUs, Accelerators) installed at the same time. OpenCL refers to those
 as 'platforms'.  The GPU library will select the **first** suitable platform,
 but this can be overridden using the device option of the :doc:`package <package>`
-command. run lammps/lib/gpu/ocl\_get\_devices to get a list of available
+command. run lammps/lib/gpu/ocl_get_devices to get a list of available
 platforms and devices with a suitable ICD available.
 
 **Building LAMMPS with the GPU package:**
@@ -77,8 +76,7 @@ automatically append "gpu" to styles that support it.  Use the "-pk
 gpu Ng" :doc:`command-line switch <Run_options>` to set Ng = # of
 GPUs/node to use.
 
-
-.. parsed-literal::
+.. code-block:: bash
 
    lmp_machine -sf gpu -pk gpu 1 -in in.script                         # 1 MPI task uses 1 GPU
    mpirun -np 12 lmp_machine -sf gpu -pk gpu 2 -in in.script           # 12 MPI tasks share 2 GPUs on a single 16-core (or whatever) node
@@ -108,8 +106,7 @@ and use of multiple MPI tasks/GPU is the same.
 Use the :doc:`suffix gpu <suffix>` command, or you can explicitly add an
 "gpu" suffix to individual styles in your input script, e.g.
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    pair_style lj/cut/gpu 2.5
 
@@ -126,7 +123,7 @@ in OpenCL mode on CPUs (which uses vectorization and multithreading) is
 usually resulting in inferior performance compared to using LAMMPS' native
 threading and vectorization support in the USER-OMP and USER-INTEL packages.
 
-See the `Benchmark page <http://lammps.sandia.gov/bench.html>`_ of the
+See the `Benchmark page <https://lammps.sandia.gov/bench.html>`_ of the
 LAMMPS web site for performance of the GPU package on various
 hardware, including the Titan HPC platform at ORNL.
 
@@ -172,14 +169,7 @@ results, since they will typically be faster.
   This is the maximum memory used at one time on the GPU for data
   storage by a single MPI process.
 
-
 Restrictions
 """"""""""""
 
-
 None.
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/Speed_intel.rst b/doc/src/Speed_intel.rst
index 95a7ef9e6b..4658fb9584 100644
--- a/doc/src/Speed_intel.rst
+++ b/doc/src/Speed_intel.rst
@@ -25,7 +25,6 @@ LAMMPS to run on the CPU cores and co-processor cores simultaneously.
   rebo, sw, tersoff
 * K-Space Styles: pppm, pppm/disp
 
-
 .. warning::
 
    None of the styles in the USER-INTEL package currently
@@ -58,10 +57,8 @@ Skylake) with "June 2017" LAMMPS built with Intel Parallel Studio
 *src/USER-INTEL/TEST/README* for the raw simulation rates and
 instructions to reproduce.
 
-
 ----------
 
-
 **Accuracy and order of operations:**
 
 In most molecular dynamics software, parallelization parameters
@@ -82,13 +79,12 @@ order of operations compared to LAMMPS without acceleration:
 * The *newton* setting applies to all atoms, not just atoms shared
   between MPI tasks
 * Vectorization can change the order for adding pairwise forces
-* When using the -DLMP\_USE\_MKL\_RNG define (all included intel optimized
+* When using the -DLMP_USE_MKL_RNG define (all included intel optimized
   makefiles do) at build time, the random number generator for
   dissipative particle dynamics (pair style dpd/intel) uses the Mersenne
   Twister generator included in the Intel MKL library (that should be
   more robust than the default Masaglia random number generator)
 
-
 The precision mode (described below) used with the USER-INTEL
 package can change the *accuracy* of the calculations. For the
 default *mixed* precision option, calculations between pairs or
@@ -98,18 +94,16 @@ is performed in double precision to prevent the error from growing
 with the number of atoms in the simulation. *Single* precision
 mode should not be used without appropriate validation.
 
-
 ----------
 
-
 **Quick Start for Experienced Users:**
 
 LAMMPS should be built with the USER-INTEL package installed.
 Simulations should be run with 1 MPI task per physical *core*\ ,
 not *hardware thread*\ .
 
-* Edit src/MAKE/OPTIONS/Makefile.intel\_cpu\_intelmpi as necessary.
-* Set the environment variable KMP\_BLOCKTIME=0
+* Edit src/MAKE/OPTIONS/Makefile.intel_cpu_intelmpi as necessary.
+* Set the environment variable KMP_BLOCKTIME=0
 * "-pk intel 0 omp $t -sf intel" added to LAMMPS command-line
 * $t should be 2 for Intel Xeon CPUs and 2 or 4 for Intel Xeon Phi
 * For some of the simple 2-body potentials without long-range
@@ -117,37 +111,31 @@ not *hardware thread*\ .
   the "newton off" setting added to the input script
 * For simulations on higher node counts, add "processors \* \* \* grid
   numa" to the beginning of the input script for better scalability
-* If using *kspace\_style pppm* in the input script, add
-  "kspace\_modify diff ad" for better performance
-
+* If using *kspace_style pppm* in the input script, add
+  "kspace_modify diff ad" for better performance
 
 For Intel Xeon Phi CPUs:
 
 * Runs should be performed using MCDRAM.
 
-
-For simulations using *kspace\_style pppm* on Intel CPUs supporting
+For simulations using *kspace_style pppm* on Intel CPUs supporting
 AVX-512:
 
-* Add "kspace\_modify diff ad" to the input script
+* Add "kspace_modify diff ad" to the input script
 * The command-line option should be changed to
   "-pk intel 0 omp $r lrt yes -sf intel" where $r is the number of
   threads minus 1.
-* Do not use thread affinity (set KMP\_AFFINITY=none)
+* Do not use thread affinity (set KMP_AFFINITY=none)
 * The "newton off" setting may provide better scalability
 
-
 For Intel Xeon Phi co-processors (Offload):
 
-* Edit src/MAKE/OPTIONS/Makefile.intel\_co-processor as necessary
+* Edit src/MAKE/OPTIONS/Makefile.intel_co-processor as necessary
 * "-pk intel N omp 1" added to command-line where N is the number of
   co-processors per node.
 
-
-
 ----------
 
-
 **Required hardware/software:**
 
 In order to use offload to co-processors, an Intel Xeon Phi
@@ -204,8 +192,7 @@ will report every hardware thread as a separate core allowing one to
 determine the number of hardware threads available. On Linux systems,
 this information can normally be obtained with:
 
-
-.. parsed-literal::
+.. code-block:: bash
 
    cat /proc/cpuinfo
 
@@ -218,8 +205,7 @@ For building with make, several example Makefiles for building with
 the Intel compiler are included with LAMMPS in the src/MAKE/OPTIONS/
 directory:
 
-
-.. parsed-literal::
+.. code-block:: bash
 
    Makefile.intel_cpu_intelmpi # Intel Compiler, Intel MPI, No Offload
    Makefile.knl                # Intel Compiler, Intel MPI, No Offload
@@ -227,14 +213,13 @@ directory:
    Makefile.intel_cpu_openpmi  # Intel Compiler, OpenMPI, No Offload
    Makefile.intel_co-processor  # Intel Compiler, Intel MPI, Offload
 
-Makefile.knl is identical to Makefile.intel\_cpu\_intelmpi except that
+Makefile.knl is identical to Makefile.intel_cpu_intelmpi except that
 it explicitly specifies that vectorization should be for Intel Xeon
 Phi x200 processors making it easier to cross-compile. For users with
 recent installations of Intel Parallel Studio, the process can be as
 simple as:
 
-
-.. parsed-literal::
+.. code-block:: bash
 
    make yes-user-intel
    source /opt/intel/parallel_studio_xe_2016.3.067/psxevars.sh
@@ -249,12 +234,12 @@ without offload support will produce a smaller binary.
 The general requirements for Makefiles with the USER-INTEL package
 are as follows. When using Intel compilers, "-restrict" is required
 and "-qopenmp" is highly recommended for CCFLAGS and LINKFLAGS.
-CCFLAGS should include "-DLMP\_INTEL\_USELRT" (unless POSIX Threads
-are not supported in the build environment) and "-DLMP\_USE\_MKL\_RNG"
+CCFLAGS should include "-DLMP_INTEL_USELRT" (unless POSIX Threads
+are not supported in the build environment) and "-DLMP_USE_MKL_RNG"
 (unless Intel Math Kernel Library (MKL) is not available in the build
 environment). For Intel compilers, LIB should include "-ltbbmalloc"
-or if the library is not available, "-DLMP\_INTEL\_NO\_TBB" can be added
-to CCFLAGS. For builds supporting offload, "-DLMP\_INTEL\_OFFLOAD" is
+or if the library is not available, "-DLMP_INTEL_NO_TBB" can be added
+to CCFLAGS. For builds supporting offload, "-DLMP_INTEL_OFFLOAD" is
 required for CCFLAGS and "-qoffload" is required for LINKFLAGS. Other
 recommended CCFLAG options for best performance are "-O2 -fno-alias
 -ansi-alias -qoverride-limits fp-model fast=2 -no-prec-div".
@@ -312,9 +297,9 @@ almost all cases.
    OpenMP threads on the host (CPU) will be set by default on the host
    *when using offload to a co-processor*\ . In this case, it is unnecessary
    to use other methods to control affinity (e.g. taskset, numactl,
-   I\_MPI\_PIN\_DOMAIN, etc.). This can be disabled with the *no\_affinity*
+   I_MPI_PIN_DOMAIN, etc.). This can be disabled with the *no_affinity*
    option to the :doc:`package intel <package>` command or by disabling the
-   option at build time (by adding -DINTEL\_OFFLOAD\_NOAFFINITY to the
+   option at build time (by adding -DINTEL_OFFLOAD_NOAFFINITY to the
    CCFLAGS line of your Makefile). Disabling this option is not
    recommended, especially when running on a machine with Intel
    Hyper-Threading technology disabled.
@@ -328,7 +313,7 @@ editing the input script. This switch will automatically append
 :doc:`package intel 1 <package>`. This package command is used to set
 options for the USER-INTEL package.  The default package command will
 specify that USER-INTEL calculations are performed in mixed precision,
-that the number of OpenMP threads is specified by the OMP\_NUM\_THREADS
+that the number of OpenMP threads is specified by the OMP_NUM_THREADS
 environment variable, and that if co-processors are present and the
 binary was built with offload support, that 1 co-processor per node
 will be used with automatic balancing of work between the CPU and the
@@ -339,18 +324,17 @@ the "-pk intel Nphi" :doc:`command-line switch <Run_options>` with
 keyword/value pairs as specified in the documentation. Here, Nphi = #
 of Xeon Phi co-processors/node (ignored without offload
 support). Common options to the USER-INTEL package include *omp* to
-override any OMP\_NUM\_THREADS setting and specify the number of OpenMP
+override any OMP_NUM_THREADS setting and specify the number of OpenMP
 threads, *mode* to set the floating-point precision mode, and *lrt* to
 enable Long-Range Thread mode as described below. See the :doc:`package intel <package>` command for details, including the default values
 used for all its options if not specified, and how to set the number
-of OpenMP threads via the OMP\_NUM\_THREADS environment variable if
+of OpenMP threads via the OMP_NUM_THREADS environment variable if
 desired.
 
 Examples (see documentation for your MPI/Machine for differences in
 launching MPI applications):
 
-
-.. parsed-literal::
+.. code-block:: bash
 
    mpirun -np 72 -ppn 36 lmp_machine -sf intel -in in.script                                 # 2 nodes, 36 MPI tasks/node, $OMP_NUM_THREADS OpenMP Threads
    mpirun -np 72 -ppn 36 lmp_machine -sf intel -in in.script -pk intel 0 omp 2 mode double   # Don't use any co-processors that might be available, use 2 OpenMP threads for each task, use double precision
@@ -362,16 +346,14 @@ can be edited to enable the USER-INTEL package. This requires adding
 the :doc:`package intel <package>` command to the top of the input
 script. For the second example above, this would be:
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    package intel 0 omp 2 mode double
 
 To enable the USER-INTEL package only for individual styles, you can
 add an "intel" suffix to the individual style, e.g.:
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    pair_style lj/cut/intel 2.5
 
@@ -393,7 +375,7 @@ Long-Range Thread (LRT) mode is an option to the :doc:`package intel <package>`
 with SMT. It generates an extra pthread for each MPI task. The thread
 is dedicated to performing some of the PPPM calculations and MPI
 communications. This feature requires setting the pre-processor flag
--DLMP\_INTEL\_USELRT in the makefile when compiling LAMMPS. It is unset
+-DLMP_INTEL_USELRT in the makefile when compiling LAMMPS. It is unset
 in the default makefiles (\ *Makefile.mpi* and *Makefile.serial*\ ) but
 it is set in all makefiles tuned for the USER-INTEL package.  On Intel
 Xeon Phi x200 series CPUs, the LRT feature will likely improve
@@ -405,7 +387,7 @@ normally be used for the run and add the "lrt yes" option to the "-pk"
 command-line suffix or "package intel" command. For example, if a run
 would normally perform best with "-pk intel 0 omp 4", instead use
 "-pk intel 0 omp 3 lrt yes". When using LRT, you should set the
-environment variable "KMP\_AFFINITY=none". LRT mode is not supported
+environment variable "KMP_AFFINITY=none". LRT mode is not supported
 when using offload.
 
 .. note::
@@ -443,7 +425,7 @@ alternative to LRT mode and the two cannot be used together.
 
 Currently, when using Intel MPI with Intel Xeon Phi x200 series
 CPUs, better performance might be obtained by setting the
-environment variable "I\_MPI\_SHM\_LMT=shm" for Linux kernels that do
+environment variable "I_MPI_SHM_LMT=shm" for Linux kernels that do
 not yet have full support for AVX-512. Runs on Intel Xeon Phi x200
 series processors will always perform better using MCDRAM. Please
 consult your system documentation for the best approach to specify
@@ -527,12 +509,11 @@ MPI task.
 Restrictions
 """"""""""""
 
-
 When offloading to a co-processor, :doc:`hybrid <pair_hybrid>` styles
 that require skip lists for neighbor builds cannot be offloaded.
 Using :doc:`hybrid/overlay <pair_hybrid>` is allowed.  Only one intel
 accelerated style may be used with hybrid styles when offloading.
-:doc:`Special\_bonds <special_bonds>` exclusion lists are not currently
+:doc:`Special_bonds <special_bonds>` exclusion lists are not currently
 supported with offload, however, the same effect can often be
 accomplished by setting cutoffs for excluded atom types to 0.  None of
 the pair styles in the USER-INTEL package currently support the
@@ -545,9 +526,3 @@ supported.
 * Brown, W.M., Carrillo, J.-M.Y., Mishra, B., Gavhane, N., Thakkar, F.M., De Kraker, A.R., Yamada, M., Ang, J.A., Plimpton, S.J., "Optimizing Classical Molecular Dynamics in LAMMPS," in Intel Xeon Phi Processor High Performance Programming: Knights Landing Edition, J. Jeffers, J. Reinders, A. Sodani, Eds. Morgan Kaufmann.
 * Brown, W. M., Semin, A., Hebenstreit, M., Khvostov, S., Raman, K., Plimpton, S.J. `Increasing Molecular Dynamics Simulation Rates with an 8-Fold Increase in Electrical Power Efficiency. <http://dl.acm.org/citation.cfm?id=3014915>`_ 2016 High Performance Computing, Networking, Storage and Analysis, SC16: International Conference (pp. 82-95).
 * Brown, W.M., Carrillo, J.-M.Y., Gavhane, N., Thakkar, F.M., Plimpton, S.J. Optimizing Legacy Molecular Dynamics Software with Directive-Based Offload. Computer Physics Communications. 2015. 195: p. 95-101.
-
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/Speed_kokkos.rst b/doc/src/Speed_kokkos.rst
index 6d3828ee68..ab8444b845 100644
--- a/doc/src/Speed_kokkos.rst
+++ b/doc/src/Speed_kokkos.rst
@@ -9,8 +9,8 @@ different back end languages such as CUDA, OpenMP, or Pthreads.  The
 Kokkos library also provides data abstractions to adjust (at compile
 time) the memory layout of data structures like 2d and 3d arrays to
 optimize performance on different hardware. For more information on
-Kokkos, see `GitHub <https://github.com/kokkos/kokkos>`_. Kokkos is part
-of `Trilinos <http://trilinos.sandia.gov/packages/kokkos>`_. The Kokkos
+Kokkos, see `GitHub <https://github.com/kokkos/kokkos>`_. Kokkos is
+part of `Trilinos <https://www.trilinos.org/>`_. The Kokkos
 library was written primarily by Carter Edwards, Christian Trott, and
 Dan Sunderland (all Sandia).
 
@@ -21,7 +21,7 @@ package was developed primarily by Christian Trott (Sandia) and Stan
 Moore (Sandia) with contributions of various styles by others,
 including Sikandar Mashayak (UIUC), Ray Shan (Sandia), and Dan Ibanez
 (Sandia). For more information on developing using Kokkos abstractions
-see the Kokkos programmers' guide at /lib/kokkos/doc/Kokkos\_PG.pdf.
+see the Kokkos programmers' guide at /lib/kokkos/doc/Kokkos_PG.pdf.
 
 Kokkos currently provides support for 3 modes of execution (per MPI
 task). These are Serial (MPI-only for CPUs and Intel Phi), OpenMP
@@ -38,7 +38,7 @@ compatible with specific hardware.
 .. note::
 
    To build with Kokkos support for NVIDIA GPUs, NVIDIA CUDA
-   software version 7.5 or later must be installed on your system. See
+   software version 9.0 or later must be installed on your system. See
    the discussion for the :doc:`GPU package <Speed_gpu>` for details of how
    to check and do this.
 
@@ -71,8 +71,7 @@ Kokkos. E.g. the mpirun command in OpenMPI does this via its -np and
 Here is a quick overview of how to use the KOKKOS package
 for CPU acceleration, assuming one or more 16-core nodes.
 
-
-.. parsed-literal::
+.. code-block:: bash
 
    mpirun -np 16 lmp_kokkos_mpi_only -k on -sf kk -in in.lj        # 1 node, 16 MPI tasks/node, no multi-threading
    mpirun -np 2 -ppn 1 lmp_kokkos_omp -k on t 16 -sf kk -in in.lj  # 2 nodes, 1 MPI task/node, 16 threads/task
@@ -85,7 +84,6 @@ command.  You must use the "-k on" :doc:`command-line switch <Run_options>` to e
 additional arguments for hardware settings appropriate to your system.
 For OpenMP use:
 
-
 .. parsed-literal::
 
    -k on t Nt
@@ -110,8 +108,8 @@ below.
 .. note::
 
    When using a single OpenMP thread, the Kokkos Serial back end (i.e.
-   Makefile.kokkos\_mpi\_only) will give better performance than the OpenMP
-   back end (i.e. Makefile.kokkos\_omp) because some of the overhead to make
+   Makefile.kokkos_mpi_only) will give better performance than the OpenMP
+   back end (i.e. Makefile.kokkos_omp) because some of the overhead to make
    the code thread-safe is removed.
 
 .. note::
@@ -121,8 +119,7 @@ below.
    page for details and default settings. Experimenting with its options
    can provide a speed-up for specific calculations. For example:
 
-
-.. parsed-literal::
+.. code-block:: bash
 
    mpirun -np 16 lmp_kokkos_mpi_only -k on -sf kk -pk kokkos newton on neigh half comm no -in in.lj       # Newton on, Half neighbor list, non-threaded comm
 
@@ -137,8 +134,8 @@ small numbers of threads (i.e. 8 or less) but does increase memory
 footprint and is not scalable to large numbers of threads. An
 alternative to data duplication is to use thread-level atomic operations
 which do not require data duplication. The use of atomic operations can
-be enforced by compiling LAMMPS with the "-DLMP\_KOKKOS\_USE\_ATOMICS"
-pre-processor flag. Most but not all Kokkos-enabled pair\_styles support
+be enforced by compiling LAMMPS with the "-DLMP_KOKKOS_USE_ATOMICS"
+pre-processor flag. Most but not all Kokkos-enabled pair_styles support
 data duplication. Alternatively, full neighbor lists avoid the need for
 duplication or atomic operations but require more compute operations per
 atom.  When using the Kokkos Serial back end or the OpenMP back end with
@@ -154,7 +151,6 @@ they do not migrate during a simulation.
 If you are not certain MPI tasks are being bound (check the defaults
 for your MPI installation), binding can be forced with these flags:
 
-
 .. parsed-literal::
 
    OpenMPI 1.8: mpirun -np 2 --bind-to socket --map-by socket ./lmp_openmpi ...
@@ -163,9 +159,9 @@ for your MPI installation), binding can be forced with these flags:
 For binding threads with KOKKOS OpenMP, use thread affinity
 environment variables to force binding. With OpenMP 3.1 (gcc 4.7 or
 later, intel 12 or later) setting the environment variable
-OMP\_PROC\_BIND=true should be sufficient. In general, for best
-performance with OpenMP 4.0 or better set OMP\_PROC\_BIND=spread and
-OMP\_PLACES=threads.  For binding threads with the KOKKOS pthreads
+OMP_PROC_BIND=true should be sufficient. In general, for best
+performance with OpenMP 4.0 or better set OMP_PROC_BIND=spread and
+OMP_PLACES=threads.  For binding threads with the KOKKOS pthreads
 option, compile LAMMPS the KOKKOS HWLOC=yes option as described below.
 
 **Running on Knight's Landing (KNL) Intel Xeon Phi:**
@@ -184,10 +180,9 @@ tasks.
 
 Examples of mpirun commands that follow these rules are shown below.
 
+.. code-block:: bash
 
-.. parsed-literal::
-
-   Intel KNL node with 68 cores (272 threads/node via 4x hardware threading):
+   # Running on an Intel KNL node with 68 cores (272 threads/node via 4x hardware threading):
    mpirun -np 64 lmp_kokkos_phi -k on t 4 -sf kk -in in.lj      # 1 node, 64 MPI tasks/node, 4 threads/task
    mpirun -np 66 lmp_kokkos_phi -k on t 4 -sf kk -in in.lj      # 1 node, 66 MPI tasks/node, 4 threads/task
    mpirun -np 32 lmp_kokkos_phi -k on t 8 -sf kk -in in.lj      # 1 node, 32 MPI tasks/node, 8 threads/task
@@ -210,8 +205,7 @@ threads/task as Nt. The product of these two values should be N, i.e.
    details and default settings. Experimenting with its options can provide
    a speed-up for specific calculations. For example:
 
-
-.. parsed-literal::
+.. code-block:: bash
 
    mpirun -np 64 lmp_kokkos_phi -k on t 4 -sf kk -pk kokkos comm host -in in.reax      #  Newton on, half neighbor list, threaded comm
    mpirun -np 64 lmp_kokkos_phi -k on t 4 -sf kk -pk kokkos newton off neigh full comm no -in in.lj      # Newton off, full neighbor list, non-threaded comm
@@ -245,7 +239,6 @@ avoided by using :doc:`-pk kokkos cuda/aware no <package>`. As above for
 multi-core CPUs (and no GPU), if N is the number of physical cores/node,
 then the number of MPI tasks/node should not exceed N.
 
-
 .. parsed-literal::
 
    -k on g Ng
@@ -253,8 +246,7 @@ then the number of MPI tasks/node should not exceed N.
 Here are examples of how to use the KOKKOS package for GPUs, assuming
 one or more nodes, each with two GPUs:
 
-
-.. parsed-literal::
+.. code-block:: bash
 
    mpirun -np 2 lmp_kokkos_cuda_openmpi -k on g 2 -sf kk -in in.lj          # 1 node,   2 MPI tasks/node, 2 GPUs/node
    mpirun -np 32 -ppn 2 lmp_kokkos_cuda_openmpi -k on g 2 -sf kk -in in.lj  # 16 nodes, 2 MPI tasks/node, 2 GPUs/node (32 GPUs total)
@@ -274,8 +266,7 @@ one or more nodes, each with two GPUs:
    default settings. Experimenting with its options can provide a speed-up
    for specific calculations. For example:
 
-
-.. parsed-literal::
+.. code-block:: bash
 
    mpirun -np 2 lmp_kokkos_cuda_openmpi -k on g 2 -sf kk -pk kokkos newton on neigh half binsize 2.8 -in in.lj      # Newton on, half neighbor list, set binsize = neighbor ghost cutoff
 
@@ -299,7 +290,7 @@ one or more nodes, each with two GPUs:
 .. note::
 
    To get an accurate timing breakdown between time spend in pair,
-   kspace, etc., you must set the environment variable CUDA\_LAUNCH\_BLOCKING=1.
+   kspace, etc., you must set the environment variable CUDA_LAUNCH_BLOCKING=1.
    However, this will reduce performance and is not recommended for production runs.
 
 **Run with the KOKKOS package by editing an input script:**
@@ -317,8 +308,7 @@ hardware options appropriate to your system, as documented above.
 You can use the :doc:`suffix kk <suffix>` command, or you can explicitly add a
 "kk" suffix to individual styles in your input script, e.g.
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    pair_style lj/cut/kk 2.5
 
@@ -330,11 +320,10 @@ wish to change any of its option defaults, as set by the "-k on"
 
 With the KOKKOS package, both OpenMP multi-threading and GPUs can be
 used together in a few special cases. In the Makefile, the
-KOKKOS\_DEVICES variable must include both "Cuda" and "OpenMP", as is
-the case for /src/MAKE/OPTIONS/Makefile.kokkos\_cuda\_mpi
+KOKKOS_DEVICES variable must include both "Cuda" and "OpenMP", as is
+the case for /src/MAKE/OPTIONS/Makefile.kokkos_cuda_mpi
 
-
-.. parsed-literal::
+.. code-block:: bash
 
    KOKKOS_DEVICES=Cuda,OpenMP
 
@@ -345,15 +334,13 @@ style in the input script, the Kokkos OpenMP (CPU) version of that
 specific style will be used instead.  Set the number of OpenMP threads
 as "t Nt" and the number of GPUs as "g Ng"
 
-
 .. parsed-literal::
 
    -k on t Nt g Ng
 
 For example, the command to run with 1 GPU and 8 OpenMP threads is then:
 
-
-.. parsed-literal::
+.. code-block:: bash
 
    mpiexec -np 1 lmp_kokkos_cuda_openmpi -in in.lj -k on g 1 t 8 -sf kk
 
@@ -370,7 +357,7 @@ GPU. First compile with "--default-stream per-thread" added to CCFLAGS
 in the Kokkos CUDA Makefile.  Then explicitly use the "/kk/host"
 suffix for kspace and bonds, angles, etc.  in the input file and the
 "kk" suffix (equal to "kk/device") on the command line.  Also make
-sure the environment variable CUDA\_LAUNCH\_BLOCKING is not set to "1"
+sure the environment variable CUDA_LAUNCH_BLOCKING is not set to "1"
 so CPU/GPU overlap can occur.
 
 **Speed-ups to expect:**
@@ -394,8 +381,7 @@ Generally speaking, the following rules of thumb apply:
 * When running on Intel hardware, KOKKOS is not as fast as
   the USER-INTEL package, which is optimized for that hardware.
 
-
-See the `Benchmark page <http://lammps.sandia.gov/bench.html>`_ of the
+See the `Benchmark page <https://lammps.sandia.gov/bench.html>`_ of the
 LAMMPS web site for performance of the KOKKOS package on different
 hardware.
 
@@ -408,44 +394,38 @@ Makefile.machine, or they can be specified as CMake variables.  Each
 takes a value shown below.  The default value is listed, which is set
 in the lib/kokkos/Makefile.kokkos file.
 
-* KOKKOS\_DEBUG, values = *yes*\ , *no*\ , default = *no*
-* KOKKOS\_USE\_TPLS, values = *hwloc*\ , *librt*\ , *experimental\_memkind*, default = *none*
-* KOKKOS\_CXX\_STANDARD, values = *c++11*\ , *c++1z*\ , default = *c++11*
-* KOKKOS\_OPTIONS, values = *aggressive\_vectorization*, *disable\_profiling*, default = *none*
-* KOKKOS\_CUDA\_OPTIONS, values = *force\_uvm*, *use\_ldg*, *rdc*\ , *enable\_lambda*, default = *enable\_lambda*
+* KOKKOS_DEBUG, values = *yes*\ , *no*\ , default = *no*
+* KOKKOS_USE_TPLS, values = *hwloc*\ , *librt*\ , *experimental_memkind*, default = *none*
+* KOKKOS_CXX_STANDARD, values = *c++11*\ , *c++1z*\ , default = *c++11*
+* KOKKOS_OPTIONS, values = *aggressive_vectorization*, *disable_profiling*, default = *none*
+* KOKKOS_CUDA_OPTIONS, values = *force_uvm*, *use_ldg*, *rdc*\ , *enable_lambda*, default = *enable_lambda*
 
-KOKKOS\_USE\_TPLS=hwloc binds threads to hardware cores, so they do not
-migrate during a simulation. KOKKOS\_USE\_TPLS=hwloc should always be
-used if running with KOKKOS\_DEVICES=Pthreads for pthreads. It is not
-necessary for KOKKOS\_DEVICES=OpenMP for OpenMP, because OpenMP
+KOKKOS_USE_TPLS=hwloc binds threads to hardware cores, so they do not
+migrate during a simulation. KOKKOS_USE_TPLS=hwloc should always be
+used if running with KOKKOS_DEVICES=Pthreads for pthreads. It is not
+necessary for KOKKOS_DEVICES=OpenMP for OpenMP, because OpenMP
 provides alternative methods via environment variables for binding
 threads to hardware cores.  More info on binding threads to cores is
 given on the :doc:`Speed omp <Speed_omp>` doc page.
 
-KOKKOS\_USE\_TPLS=librt enables use of a more accurate timer mechanism
+KOKKOS_USE_TPLS=librt enables use of a more accurate timer mechanism
 on most Unix platforms. This library is not available on all
 platforms.
 
-KOKKOS\_DEBUG is only useful when developing a Kokkos-enabled style
-within LAMMPS. KOKKOS\_DEBUG=yes enables printing of run-time
+KOKKOS_DEBUG is only useful when developing a Kokkos-enabled style
+within LAMMPS. KOKKOS_DEBUG=yes enables printing of run-time
 debugging information that can be useful. It also enables runtime
 bounds checking on Kokkos data structures.
 
-KOKKOS\_CXX\_STANDARD and KOKKOS\_OPTIONS are typically not changed when
+KOKKOS_CXX_STANDARD and KOKKOS_OPTIONS are typically not changed when
 building LAMMPS.
 
-KOKKOS\_CUDA\_OPTIONS are additional options for CUDA. The LAMMPS KOKKOS
-package must be compiled with the *enable\_lambda* option when using
+KOKKOS_CUDA_OPTIONS are additional options for CUDA. The LAMMPS KOKKOS
+package must be compiled with the *enable_lambda* option when using
 GPUs.
 
 Restrictions
 """"""""""""
 
-
 Currently, there are no precision options with the KOKKOS package. All
 compilation and computation is performed in double precision.
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/Speed_measure.rst b/doc/src/Speed_measure.rst
index 9d538616eb..686fdb6adc 100644
--- a/doc/src/Speed_measure.rst
+++ b/doc/src/Speed_measure.rst
@@ -14,7 +14,7 @@ timings; you can simply extrapolate from short runs.
 
 For the set of runs, look at the timing data printed to the screen and
 log file at the end of each LAMMPS run.  The
-:doc:`Run\_output <Run_output>` doc page gives an overview.
+:doc:`Run_output <Run_output>` doc page gives an overview.
 
 Running on one (or a few processors) should give a good estimate of
 the serial performance and what portions of the timestep are taking
@@ -42,10 +42,5 @@ inaccurate relative timing data, because processors have to wait when
 communication occurs for other processors to catch up.  Thus the
 reported times for "Communication" or "Other" may be higher than they
 really are, due to load-imbalance.  If this is an issue, you can
-uncomment the MPI\_Barrier() lines in src/timer.cpp, and re-compile
+uncomment the MPI_Barrier() lines in src/timer.cpp, and re-compile
 LAMMPS, to obtain synchronized timings.
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/Speed_omp.rst b/doc/src/Speed_omp.rst
index 1b9a1caaf5..04e4366758 100644
--- a/doc/src/Speed_omp.rst
+++ b/doc/src/Speed_omp.rst
@@ -23,8 +23,7 @@ instructions.
 
 These examples assume one or more 16-core nodes.
 
-
-.. parsed-literal::
+.. code-block:: bash
 
    env OMP_NUM_THREADS=16 lmp_omp -sf omp -in in.script           # 1 MPI task, 16 threads according to OMP_NUM_THREADS
    lmp_mpi -sf omp -in in.script                                  # 1 MPI task, no threads, optimized kernels
@@ -44,14 +43,14 @@ node), otherwise performance will suffer.
 As in the lines above, use the "-sf omp" :doc:`command-line switch <Run_options>`, which will automatically append "omp" to
 styles that support it.  The "-sf omp" switch also issues a default
 :doc:`package omp 0 <package>` command, which will set the number of
-threads per MPI task via the OMP\_NUM\_THREADS environment variable.
+threads per MPI task via the OMP_NUM_THREADS environment variable.
 
 You can also use the "-pk omp Nt" :doc:`command-line switch <Run_options>`, to explicitly set Nt = # of OpenMP threads
 per MPI task to use, as well as additional options.  Its syntax is the
 same as the :doc:`package omp <package>` command whose doc page gives
 details, including the default values used if it is not specified.  It
 also gives more details on how to set the number of threads via the
-OMP\_NUM\_THREADS environment variable.
+OMP_NUM_THREADS environment variable.
 
 **Or run with the USER-OMP package by editing an input script:**
 
@@ -61,15 +60,14 @@ and threads/MPI task is the same.
 Use the :doc:`suffix omp <suffix>` command, or you can explicitly add an
 "omp" suffix to individual styles in your input script, e.g.
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    pair_style lj/cut/omp 2.5
 
 You must also use the :doc:`package omp <package>` command to enable the
 USER-OMP package.  When you do this you also specify how many threads
 per MPI task to use.  The command doc page explains other options and
-how to set the number of threads via the OMP\_NUM\_THREADS environment
+how to set the number of threads via the OMP_NUM_THREADS environment
 variable.
 
 **Speed-ups to expect:**
@@ -140,7 +138,6 @@ circumstances:
   with the USER-OMP package, is an alternative way to reduce the number
   of MPI tasks assigned to the KSpace calculation.
 
-
 Additional performance tips are as follows:
 
 * The best parallel efficiency from *omp* styles is typically achieved
@@ -154,14 +151,7 @@ Additional performance tips are as follows:
   one core and thus is likely to be counterproductive.  Instead, binding
   MPI tasks to a (multi-core) socket, should solve this issue.
 
-
 Restrictions
 """"""""""""
 
-
 None.
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/Speed_opt.rst b/doc/src/Speed_opt.rst
index 8e7b3e7ffd..297177f8d4 100644
--- a/doc/src/Speed_opt.rst
+++ b/doc/src/Speed_opt.rst
@@ -17,8 +17,7 @@ See the :ref:`Build extras <opt>` doc page for instructions.
 
 **Run with the OPT package from the command line:**
 
-
-.. parsed-literal::
+.. code-block:: bash
 
    lmp_mpi -sf opt -in in.script                # run in serial
    mpirun -np 4 lmp_mpi -sf opt -in in.script   # run in parallel
@@ -31,8 +30,7 @@ automatically append "opt" to styles that support it.
 Use the :doc:`suffix opt <suffix>` command, or you can explicitly add an
 "opt" suffix to individual styles in your input script, e.g.
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    pair_style lj/cut/opt 2.5
 
@@ -49,10 +47,4 @@ Just try out an OPT pair style to see how it performs.
 Restrictions
 """"""""""""
 
-
 None.
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/Speed_packages.rst b/doc/src/Speed_packages.rst
index 6c62d40706..ab02ba7f48 100644
--- a/doc/src/Speed_packages.rst
+++ b/doc/src/Speed_packages.rst
@@ -27,7 +27,6 @@ standard or user packages:
 | :doc:`OPT Package <Speed_opt>`          | generic CPU optimizations                             |
 +-----------------------------------------+-------------------------------------------------------+
 
-
 .. toctree::
    :maxdepth: 1
    :hidden:
@@ -71,7 +70,7 @@ Lennard-Jones :doc:`pair_style lj/cut <pair_lj>`:
 * :doc:`pair_style lj/cut/opt <pair_lj>`
 
 To see what accelerate styles are currently available for a particular
-style, find the style name in the `Commands\_all <lc_>`_
+style, find the style name in the :doc:`Commands <Commands_all>`
 style pages (fix,compute,pair,etc) and see what suffixes are listed
 (g,i,k,o,t) with it.  The doc pages for individual commands
 (e.g. :doc:`pair lj/cut <pair_lj>` or :doc:`fix nve <fix_nve>`) also list
@@ -91,13 +90,13 @@ listed above:
 +--------------------------------------------------------------------------------------------------------------------------------+----------------------------------------------------------------------+
 | re-build LAMMPS                                                                                                                | make machine                                                         |
 +--------------------------------------------------------------------------------------------------------------------------------+----------------------------------------------------------------------+
-| prepare and test a regular LAMMPS simulation                                                                                   | lmp\_machine -in in.script; mpirun -np 32 lmp\_machine -in in.script |
+| prepare and test a regular LAMMPS simulation                                                                                   | lmp_machine -in in.script; mpirun -np 32 lmp_machine -in in.script   |
 +--------------------------------------------------------------------------------------------------------------------------------+----------------------------------------------------------------------+
 | enable specific accelerator support via '-k on' :doc:`command-line switch <Run_options>`,                                      | only needed for KOKKOS package                                       |
 +--------------------------------------------------------------------------------------------------------------------------------+----------------------------------------------------------------------+
 | set any needed options for the package via "-pk" :doc:`command-line switch <Run_options>` or :doc:`package <package>` command, | only if defaults need to be changed                                  |
 +--------------------------------------------------------------------------------------------------------------------------------+----------------------------------------------------------------------+
-| use accelerated styles in your input via "-sf" :doc:`command-line switch <Run_options>` or :doc:`suffix <suffix>` command      | lmp\_machine -in in.script -sf gpu                                   |
+| use accelerated styles in your input via "-sf" :doc:`command-line switch <Run_options>` or :doc:`suffix <suffix>` command      | lmp_machine -in in.script -sf gpu                                    |
 +--------------------------------------------------------------------------------------------------------------------------------+----------------------------------------------------------------------+
 
 Note that the first 4 steps can be done as a single command with
@@ -133,8 +132,7 @@ packages.  As an example, here is a command that builds with all the
 GPU related packages installed (GPU, KOKKOS with Cuda), including
 settings to build the needed auxiliary GPU libraries for Kepler GPUs:
 
-
-.. parsed-literal::
+.. code-block:: bash
 
    Make.py -j 16 -p omp gpu kokkos -cc nvcc wrap=mpi   -gpu mode=double arch=35 -kokkos cuda arch=35 lib-all file mpi
 
@@ -145,9 +143,9 @@ details.
 Likewise, the bench directory has FERMI and KEPLER and PHI
 sub-directories with Make.py commands and input scripts for using all
 the accelerator packages on various machines.  See the README files in
-those dirs.
+those directories.
 
-As mentioned above, the `Benchmark page <http://lammps.sandia.gov/bench.html>`_ of the LAMMPS web site gives
+As mentioned above, the `Benchmark page <https://lammps.sandia.gov/bench.html>`_ of the LAMMPS web site gives
 performance results for the various accelerator packages for several
 of the standard LAMMPS benchmark problems, as a function of problem
 size and number of compute nodes, on different hardware platforms.
@@ -179,7 +177,6 @@ are in the individual accelerator sections.
   speed-up the pairwise calculations of your simulation by 5-25% on a
   CPU.
 
-
 The individual accelerator package doc pages explain:
 
 * what hardware and software the accelerated package requires
@@ -189,7 +186,3 @@ The individual accelerator package doc pages explain:
 * guidelines for best performance
 * restrictions
 
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/Speed_tips.rst b/doc/src/Speed_tips.rst
index ed7eef5b28..8798cce245 100644
--- a/doc/src/Speed_tips.rst
+++ b/doc/src/Speed_tips.rst
@@ -54,8 +54,3 @@ relative accuracy of slightly greater than 1e-5 and above.
    of energy and pressure as it does in forces, so some caution must be
    used if energy and/or pressure are quantities of interest, such as
    when using a barostat.
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/Tools.rst b/doc/src/Tools.rst
index 1f9661191f..8feb2afefa 100644
--- a/doc/src/Tools.rst
+++ b/doc/src/Tools.rst
@@ -6,21 +6,17 @@ molecular dynamics computations.  Additional pre- and post-processing
 steps are often necessary to setup and analyze a simulation.  A list
 of such tools can be found on the `LAMMPS webpage <lws_>`_ at these links:
 
-* `Pre/Post processing <http://lammps.sandia.gov/prepost.html>`_
-* `Offsite LAMMPS packages & tools <http://lammps.sandia.gov/offsite.html>`_
+* `Pre/Post processing <https://lammps.sandia.gov/prepost.html>`_
+* `Offsite LAMMPS packages & tools <https://lammps.sandia.gov/offsite.html>`_
 * `Pizza.py toolkit <pizza_>`_
 
 The last link for `Pizza.py <pizza_>`_ is a Python-based tool developed at
 Sandia which provides tools for doing setup, analysis, plotting, and
 visualization for LAMMPS simulations.
 
-.. _pizza: http://pizza.sandia.gov
-
-
-
-.. _python: http://www.python.org
-
-
+.. _lws: https://lammps.sandia.gov
+.. _pizza: https://pizza.sandia.gov
+.. _python: https://www.python.org
 
 Additional tools included in the LAMMPS distribution are described on
 this page.
@@ -39,45 +35,69 @@ to edit for your platform) which will build several of the tools which
 reside in that directory.  Most of them are larger packages in their
 own sub-directories with their own Makefiles and/or README files.
 
-
 ----------
 
-
 Pre-processing tools
 ====================
 
-+-----------------------------+------------------------+----------------------+----------------------------------+----------------------------------+-----------------------------+
-| :ref:`amber2lmp <amber>`    | :ref:`ch2lmp <charmm>` | :ref:`chain <chain>` | :ref:`createatoms <createatoms>` | :ref:`drude <drude>`             | :ref:`eam database <eamdb>` |
-+-----------------------------+------------------------+----------------------+----------------------------------+----------------------------------+-----------------------------+
-| :ref:`eam generate <eamgn>` | :ref:`eff <eff>`       | :ref:`ipp <ipp>`     | :ref:`micelle2d <micelle>`       | :ref:`moltemplate <moltemplate>` | :ref:`msi2lmp <msi>`        |
-+-----------------------------+------------------------+----------------------+----------------------------------+----------------------------------+-----------------------------+
-| :ref:`polybond <polybond>`  |                        |                      |                                  |                                  |                             |
-+-----------------------------+------------------------+----------------------+----------------------------------+----------------------------------+-----------------------------+
+.. table_from_list::
+   :columns: 6
+
+   * :ref:`amber2lmp <amber>`
+   * :ref:`ch2lmp <charmm>`
+   * :ref:`chain <chain>`
+   * :ref:`createatoms <createatoms>`
+   * :ref:`drude <drude>`
+   * :ref:`eam database <eamdb>`
+   * :ref:`eam generate <eamgn>`
+   * :ref:`eff <eff>`
+   * :ref:`ipp <ipp>`
+   * :ref:`micelle2d <micelle>`
+   * :ref:`moltemplate <moltemplate>`
+   * :ref:`msi2lmp <msi>`
+   * :ref:`polybond <polybond>`
+
 
 Post-processing tools
 =====================
 
-+--------------------------+----------------------------+------------------------+--------------------------+-------------------------------+-----------------------------+
-| :ref:`amber2lmp <amber>` | :ref:`binary2txt <binary>` | :ref:`ch2lmp <charmm>` | :ref:`colvars <colvars>` | :ref:`eff <eff>`              | :ref:`fep <fep>`            |
-+--------------------------+----------------------------+------------------------+--------------------------+-------------------------------+-----------------------------+
-| :ref:`lmp2arc <arc>`     | :ref:`lmp2cfg <cfg>`       | :ref:`matlab <matlab>` | :ref:`phonon <phonon>`   | :ref:`pymol_asphere <pymol>`  | :ref:`python <pythontools>` |
-+--------------------------+----------------------------+------------------------+--------------------------+-------------------------------+-----------------------------+
-| :ref:`reax <reax_tool>`  | :ref:`replica <replica>`   | :ref:`smd <smd>`       | :ref:`spin <spin>`       | :ref:`xmgrace <xmgrace>`      |                             |
-+--------------------------+----------------------------+------------------------+--------------------------+-------------------------------+-----------------------------+
+.. table_from_list::
+   :columns: 6
+
+   * :ref:`amber2lmp <amber>`
+   * :ref:`binary2txt <binary>`
+   * :ref:`ch2lmp <charmm>`
+   * :ref:`colvars <colvars>`
+   * :ref:`eff <eff>`
+   * :ref:`fep <fep>`
+   * :ref:`lmp2arc <arc>`
+   * :ref:`lmp2cfg <cfg>`
+   * :ref:`matlab <matlab>`
+   * :ref:`phonon <phonon>`
+   * :ref:`pymol_asphere <pymol>`
+   * :ref:`python <pythontools>`
+   * :ref:`reax <reax_tool>`
+   * :ref:`replica <replica>`
+   * :ref:`smd <smd>`
+   * :ref:`spin <spin>`
+   * :ref:`xmgrace <xmgrace>`
 
 Miscellaneous tools
 ===================
 
-+--------------------------+----------------------+-------------------+--------------------+---------------------------------------+
-| :ref:`doxygen <doxygen>` | :ref:`emacs <emacs>` | :ref:`i-pi <ipi>` | :ref:`kate <kate>` | :ref:`singularity <singularity_tool>` |
-+--------------------------+----------------------+-------------------+--------------------+---------------------------------------+
-| :ref:`vim <vim>`         |                      |                   |                    |                                       |
-+--------------------------+----------------------+-------------------+--------------------+---------------------------------------+
+.. table_from_list::
+   :columns: 6
 
+   * :ref:`CMake <cmake>`
+   * :ref:`doxygen <doxygen>`
+   * :ref:`emacs <emacs>`
+   * :ref:`i-pi <ipi>`
+   * :ref:`kate <kate>`
+   * :ref:`singularity <singularity_tool>`
+   * :ref:`vim <vim>`
 
 ----------
 
-
 Tool descriptions
 =================
 
@@ -94,13 +114,11 @@ These tools were written by Keir Novik while he was at Queen Mary
 University of London.  Keir is no longer there and cannot support
 these tools which are out-of-date with respect to the current LAMMPS
 version (and maybe with respect to AMBER as well).  Since we don't use
-these tools at Sandia, you'll need to experiment with them and make
+these tools at Sandia, you will need to experiment with them and make
 necessary modifications yourself.
 
-
 ----------
 
-
 .. _binary:
 
 binary2txt tool
@@ -109,8 +127,7 @@ binary2txt tool
 The file binary2txt.cpp converts one or more binary LAMMPS dump file
 into ASCII text files.  The syntax for running the tool is
 
-
-.. parsed-literal::
+.. code-block:: bash
 
    binary2txt file1 file2 ...
 
@@ -118,10 +135,8 @@ which creates file1.txt, file2.txt, etc.  This tool must be compiled
 on a platform that can read the binary file created by a LAMMPS run,
 since binary files are not compatible across all platforms.
 
-
 ----------
 
-
 .. _charmm:
 
 ch2lmp tool
@@ -148,10 +163,8 @@ Robert A. Latour (latourr at clemson.edu), David Hyde-Volpe, and
 Tigran Abramyan, (Clemson University) and
 Chris Lorenz (chris.lorenz at kcl.ac.uk), King's College London.
 
-
 ----------
 
-
 .. _chain:
 
 chain tool
@@ -164,8 +177,7 @@ chains and solvent atoms can strongly overlap, so LAMMPS needs to run
 the system initially with a "soft" pair potential to un-overlap it.
 The syntax for running the tool is
 
-
-.. parsed-literal::
+.. code-block:: bash
 
    chain < def.chain > data.file
 
@@ -173,9 +185,31 @@ See the def.chain or def.chain.ab files in the tools directory for
 examples of definition files.  This tool was used to create the system
 for the :doc:`chain benchmark <Speed_bench>`.
 
-
 ----------
 
+.. _cmake:
+
+CMake tools
+-----------
+
+The ``cmbuild`` script is a wrapper around using ``cmake --build <dir>
+--target`` and allows compiling LAMMPS in a :ref:`CMake build folder
+<cmake_build>` with a make-like syntax regardless of the actual build
+tool and the specific name of the program used (e.g. ``ninja-v1.10`` or
+``gmake``) when using ``-D CMAKE_MAKE_PROGRAM=<name>``.
+
+.. parsed-literal::
+
+  Usage: cmbuild [-v] [-h] [-C <dir>] [-j <num>] [<target>]
+
+  Options:
+    -h                print this message
+    -j <NUM>          allow processing of NUM concurrent tasks
+    -C DIRECTORY      execute build in folder DIRECTORY
+    -v                produce verbose output
+
+
+----------
 
 .. _colvars:
 
@@ -189,24 +223,21 @@ To compile the tools, edit the makefile for your system and run "make".
 Please report problems and issues the colvars library and its tools
 at: https://github.com/colvars/colvars/issues
 
-abf\_integrate:
+abf_integrate:
 
 MC-based integration of multidimensional free energy gradient
 Version 20110511
 
-
 .. parsed-literal::
 
-   Syntax: ./abf_integrate < filename > [-n < nsteps >] [-t < temp >] [-m [0\|1] (metadynamics)] [-h < hill_height >] [-f < variable_hill_factor >]
+   ./abf_integrate < filename > [-n < nsteps >] [-t < temp >] [-m [0\|1] (metadynamics)] [-h < hill_height >] [-f < variable_hill_factor >]
 
 The LAMMPS interface to the colvars collective variable library, as
 well as these tools, were created by Axel Kohlmeyer (akohlmey at
-gmail.com) at ICTP, Italy.
-
+gmail.com) while at ICTP, Italy.
 
 ----------
 
-
 .. _createatoms:
 
 createatoms tool
@@ -221,10 +252,8 @@ See the included Manual.pdf for details.
 
 The tool is authored by Xiaowang Zhou (Sandia), xzhou at sandia.gov.
 
-
 ----------
 
-
 .. _doxygen:
 
 doxygen tool
@@ -238,10 +267,8 @@ See the included README file for details.
 
 The tool is authored by Nandor Tamaskovics, numericalfreedom at googlemail.com.
 
-
 ----------
 
-
 .. _drude:
 
 drude tool
@@ -256,16 +283,14 @@ See the header of the polarizer.py file for details.
 The tool is authored by Agilio Padua and Alain Dequidt: agilio.padua
 at univ-bpclermont.fr, alain.dequidt at univ-bpclermont.fr
 
-
 ----------
 
-
 .. _eamdb:
 
 eam database tool
 -----------------------------
 
-The tools/eam\_database directory contains a Fortran program that will
+The tools/eam_database directory contains a Fortran program that will
 generate EAM alloy setfl potential files for any combination of 16
 elements: Cu, Ag, Au, Ni, Pd, Pt, Al, Pb, Fe, Mo, Ta, W, Mg, Co, Ti,
 Zr.  The files can then be used with the :doc:`pair_style eam/alloy <pair_eam>` command.
@@ -276,16 +301,14 @@ and is based on his paper:
 X. W. Zhou, R. A. Johnson, and H. N. G. Wadley, Phys. Rev. B, 69,
 144113 (2004).
 
-
 ----------
 
-
 .. _eamgn:
 
 eam generate tool
 -----------------------------
 
-The tools/eam\_generate directory contains several one-file C programs
+The tools/eam_generate directory contains several one-file C programs
 that convert an analytic formula into a tabulated :doc:`embedded atom method (EAM) <pair_eam>` setfl potential file.  The potentials they
 produce are in the potentials directory, and can be used with the
 :doc:`pair_style eam/alloy <pair_eam>` command.
@@ -293,10 +316,8 @@ produce are in the potentials directory, and can be used with the
 The source files and potentials were provided by Gerolf Ziegenhain
 (gerolf at ziegenhain.com).
 
-
 ----------
 
-
 .. _eff:
 
 eff tool
@@ -309,10 +330,8 @@ electron force field (eFF).
 These tools were provided by Andres Jaramillo-Botero at CalTech
 (ajaramil at wag.caltech.edu).
 
-
 ----------
 
-
 .. _emacs:
 
 emacs tool
@@ -325,10 +344,8 @@ with various highlighting options set up.
 These tools were provided by Aidan Thompson at Sandia
 (athomps at sandia.gov).
 
-
 ----------
 
-
 .. _fep:
 
 fep tool
@@ -343,10 +360,8 @@ Pascal Clermont-Ferrand), agilio.padua at univ-bpclermont.fr.
 
 See README file in the tools/fep directory.
 
-
 ----------
 
-
 .. _ipi:
 
 i-pi tool
@@ -365,10 +380,8 @@ See the tools/i-pi/manual.pdf file for an overview of i-PI, and the
 :doc:`fix ipi <fix_ipi>` doc page for further details on running PIMD
 calculations with LAMMPS.
 
-
 ----------
 
-
 .. _ipp:
 
 ipp tool
@@ -384,10 +397,8 @@ sandia.gov.
 See two examples in the tools/ipp directory.  One of them is for the
 tools/createatoms tool's input file.
 
-
 ----------
 
-
 .. _kate:
 
 kate tool
@@ -400,10 +411,8 @@ scripts.  See the README.txt file for details.
 The file was provided by Alessandro Luigi Sellerio
 (alessandro.sellerio at ieni.cnr.it).
 
-
 ----------
 
-
 .. _arc:
 
 lmp2arc tool
@@ -421,10 +430,8 @@ This tool was written by John Carpenter (Cray), Michael Peachey
 This tool was updated for the current LAMMPS C++ version by Jeff
 Greathouse at Sandia (jagreat at sandia.gov).
 
-
 ----------
 
-
 .. _cfg:
 
 lmp2cfg tool
@@ -432,15 +439,13 @@ lmp2cfg tool
 
 The lmp2cfg sub-directory contains a tool for converting LAMMPS output
 files into a series of \*.cfg files which can be read into the
-`AtomEye <http://mt.seas.upenn.edu/Archive/Graphics/A>`_ visualizer.  See
+`AtomEye <http://li.mit.edu/Archive/Graphics/A/>`_ visualizer.  See
 the README file for more information.
 
 This tool was written by Ara Kooser at Sandia (askoose at sandia.gov).
 
-
 ----------
 
-
 .. _matlab:
 
 matlab tool
@@ -450,7 +455,7 @@ The matlab sub-directory contains several `MATLAB <matlabhome_>`_ scripts for
 post-processing LAMMPS output.  The scripts include readers for log
 and dump files, a reader for EAM potential files, and a converter that
 reads LAMMPS dump files and produces CFG files that can be visualized
-with the `AtomEye <http://mt.seas.upenn.edu/Archive/Graphics/A>`_
+with the `AtomEye <http://li.mit.edu/Archive/Graphics/A/>`_
 visualizer.
 
 See the README.pdf file for more information.
@@ -460,12 +465,8 @@ These scripts were written by Arun Subramaniyan at Purdue Univ
 
 .. _matlabhome: http://www.mathworks.com
 
-
-
-
 ----------
 
-
 .. _micelle:
 
 micelle2d tool
@@ -478,8 +479,7 @@ atoms can strongly overlap, so LAMMPS needs to run the system
 initially with a "soft" pair potential to un-overlap it.  The syntax
 for running the tool is
 
-
-.. parsed-literal::
+.. code-block:: bash
 
    micelle2d < def.micelle2d > data.file
 
@@ -487,10 +487,8 @@ See the def.micelle2d file in the tools directory for an example of a
 definition file.  This tool was used to create the system for the
 :doc:`micelle example <Examples>`.
 
-
 ----------
 
-
 .. _moltemplate:
 
 moltemplate tool
@@ -504,13 +502,11 @@ See the README.txt file for more information.
 
 This tool was written by Andrew Jewett (jewett.aij at gmail.com), who
 supports it.  It has its own WWW page at
-`http://moltemplate.org <http://moltemplate.org>`_.
+`https://moltemplate.org <https://moltemplate.org>`_.
 The latest sources can be found `on its GitHub page <https://github.com/jewettaij/moltemplate/releases>`_
 
-
 ----------
 
-
 .. _msi:
 
 msi2lmp tool
@@ -529,10 +525,8 @@ development, so there are no changes except for the occasional bug fix.
 
 See the README file in the tools/msi2lmp folder for more information.
 
-
 ----------
 
-
 .. _phonon:
 
 phonon tool
@@ -549,10 +543,8 @@ for example problems that can be post-processed with this tool.
 This tool was written by Ling-Ti Kong at Shanghai Jiao Tong
 University.
 
-
 ----------
 
-
 .. _polybond:
 
 polybond tool
@@ -568,37 +560,29 @@ See the Manual.pdf for details and example scripts.
 
 This tool was written by Zachary Kraus at Georgia Tech.
 
-
 ----------
 
-
 .. _pymol:
 
-pymol\_asphere tool
+pymol_asphere tool
 -------------------------------
 
-The pymol\_asphere sub-directory contains a tool for converting a
+The pymol_asphere sub-directory contains a tool for converting a
 LAMMPS dump file that contains orientation info for ellipsoidal
 particles into an input file for the `PyMol visualization package <pymolhome_>`_ or its `open source variant <pymolopen_>`_.
 
-.. _pymolhome: http://www.pymol.org
-
-
-
-.. _pymolopen: http://sourceforge.net/scm/?type=svn&group\_id=4546
-
+.. _pymolhome: https://www.pymol.org
 
+.. _pymolopen: https://github.com/schrodinger/pymol-open-source
 
 Specifically, the tool triangulates the ellipsoids so they can be
 viewed as true ellipsoidal particles within PyMol.  See the README and
-examples directory within pymol\_asphere for more information.
+examples directory within pymol_asphere for more information.
 
 This tool was written by Mike Brown at Sandia.
 
-
 ----------
 
-
 .. _pythontools:
 
 python tool
@@ -616,31 +600,27 @@ that perform common LAMMPS post-processing tasks, such as:
 These are simple scripts built on `Pizza.py <pizza_>`_ modules.  See the
 README for more info on Pizza.py and how to use these scripts.
 
-
 ----------
 
-
 .. _replica:
 
 replica tool
 --------------------------
 
-The tools/replica directory contains the reorder\_remd\_traj python script which
-can be used to reorder the replica trajectories (resulting from the use of the 
+The tools/replica directory contains the reorder_remd_traj python script which
+can be used to reorder the replica trajectories (resulting from the use of the
 temper command) according to temperature. This will produce discontinuous
 trajectories with all frames at the same temperature in each trajectory.
 Additional options can be used to calculate the canonical configurational
 log-weight for each frame at each temperature using the pymbar package. See
 the README.md file for further details. Try out the peptide example provided.
 
-This tool was written by (and is maintained by) Tanmoy Sanyal, 
+This tool was written by (and is maintained by) Tanmoy Sanyal,
 while at the Shell lab at UC Santa Barbara. (tanmoy dot 7989 at gmail.com)
 
-
 ----------
 
-
-.. _reax\_tool:
+.. _reax_tool:
 
 reax tool
 --------------------------
@@ -652,16 +632,14 @@ the README.txt file for more info.
 
 These tools were written by Aidan Thompson at Sandia.
 
-
 ----------
 
-
 .. _smd:
 
 smd tool
 ------------------
 
-The smd sub-directory contains a C++ file dump2vtk\_tris.cpp and
+The smd sub-directory contains a C++ file dump2vtk_tris.cpp and
 Makefile which can be compiled and used to convert triangle output
 files created by the Smooth-Mach Dynamics (USER-SMD) package into a
 VTK-compatible unstructured grid file.  It could then be read in and
@@ -673,10 +651,8 @@ This tool was written by the USER-SMD package author, Georg
 Ganzenmuller at the Fraunhofer-Institute for High-Speed Dynamics,
 Ernst Mach Institute in Germany (georg.ganzenmueller at emi.fhg.de).
 
-
 ----------
 
-
 .. _spin:
 
 spin tool
@@ -686,17 +662,15 @@ The spin sub-directory contains a C file interpolate.c which can
 be compiled and used to perform a cubic polynomial interpolation of
 the MEP following a GNEB calculation.
 
-See the README file in tools/spin/interpolate\_gneb for more details.
+See the README file in tools/spin/interpolate_gneb for more details.
 
 This tool was written by the SPIN package author, Julien
 Tranchida at Sandia National Labs (jtranch at sandia.gov, and by Aleksei
 Ivanov, at University of Iceland (ali5 at hi.is).
 
-
 ----------
 
-
-.. _singularity\_tool:
+.. _singularity_tool:
 
 singularity tool
 ----------------------------------------
@@ -706,10 +680,8 @@ that can be used to build container images for building and testing
 LAMMPS on specific OS variants using the `Singularity <https://sylabs.io>`_
 container software. Contributions for additional variants are welcome.
 
-
 ----------
 
-
 .. _vim:
 
 vim tool
@@ -722,10 +694,8 @@ file for details.
 These files were provided by Gerolf Ziegenhain (gerolf at
 ziegenhain.com)
 
-
 ----------
 
-
 .. _xmgrace:
 
 xmgrace tool
@@ -741,8 +711,3 @@ simulation.
 See the README file for details.
 
 These files were provided by Vikas Varshney (vv0210 at gmail.com)
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/USER/atc/man_add_molecule.html b/doc/src/USER/atc/man_add_molecule.html
deleted file mode 100644
index 4e7810aa61..0000000000
--- a/doc/src/USER/atc/man_add_molecule.html
+++ /dev/null
@@ -1,57 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
-<title>ATC: fix_modify AtC add_molecule</title>
-<link href="tabs.css" rel="stylesheet" type="text/css"/>
-<link href="doxygen.css" rel="stylesheet" type="text/css"/>
-</head>
-<body>
-<center>
-  <a href="http://lammps.sandia.gov">LAMMPS Website</a> &nbsp; &nbsp;
-  <a href="../../Manual.html">LAMMPS Manual</a> &nbsp; &nbsp;
-  <a href="../../fix_atc.html">USER-AtC Manual</a> &nbsp; &nbsp;
-  <a href="../../Commands_all.html">Commands</a>
-</center>
-
-<hr>
-
-
-<!-- Generated by Doxygen 1.6.1 -->
-<div class="contents">
-
-
-<h3><a class="anchor" id="man_add_molecule">fix_modify AtC add_molecule </a></h3><h4><a class="anchor" id="syntax">
-syntax</a></h4>
-<p>fix_modify_AtC add_molecule &lt;small|large&gt; &lt;TAG&gt; &lt;GROUP_NAME&gt; <br/>
-</p>
-<ul>
-<li>small|large = can be small if molecule size &lt; cutoff radius, must be large otherwise <br/>
-</li>
-<li>&lt;TAG&gt; = tag for tracking a species <br/>
-</li>
-<li>&lt;GROUP_NAME&gt; = name of group that tracking will be applied to <br/>
- </li>
-</ul>
-<h4><a class="anchor" id="examples">
-examples</a></h4>
-<p><code> group WATERGROUP type 1 2 </code> <br/>
- <code> fix_modify AtC add_molecule small water WATERGROUP </code> <br/>
- </p>
-<h4><a class="anchor" id="description">
-description</a></h4>
-<p>Associates a tag with all molecules corresponding to a specified group. <br/>
- </p>
-<h4><a class="anchor" id="restrictions">
-restrictions</a></h4>
-<h4><a class="anchor" id="related">
-related</a></h4>
-<h4><a class="anchor" id="default">
-default</a></h4>
-<p>No defaults for this command. </p>
-</div>
-<hr size="1"/><address style="text-align: right;"><small>Generated on 21 Aug 2013 for ATC by&nbsp;
-<a href="http://www.doxygen.org/index.html">
-<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.6.1 </small></address>
-</body>
-</html>
diff --git a/doc/src/USER/atc/man_add_species.html b/doc/src/USER/atc/man_add_species.html
deleted file mode 100644
index a990ab626f..0000000000
--- a/doc/src/USER/atc/man_add_species.html
+++ /dev/null
@@ -1,57 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
-<title>ATC: fix_modify AtC add_species</title>
-<link href="tabs.css" rel="stylesheet" type="text/css"/>
-<link href="doxygen.css" rel="stylesheet" type="text/css"/>
-</head>
-<body>
-<center>
-  <a href="http://lammps.sandia.gov">LAMMPS Website</a> &nbsp; &nbsp;
-  <a href="../../Manual.html">LAMMPS Manual</a> &nbsp; &nbsp;
-  <a href="../../fix_atc.html">USER-AtC Manual</a> &nbsp; &nbsp;
-  <a href="../../Commands_all.html">Commands</a>
-</center>
-
-<hr>
-
-
-<!-- Generated by Doxygen 1.6.1 -->
-<div class="contents">
-
-
-<h3><a class="anchor" id="man_add_species">fix_modify AtC add_species </a></h3><h4><a class="anchor" id="syntax">
-syntax</a></h4>
-<p>fix_modify_AtC add_species &lt;TAG&gt; &lt;group|type&gt; &lt;ID&gt; <br/>
-</p>
-<ul>
-<li>&lt;TAG&gt; = tag for tracking a species <br/>
-</li>
-<li>group|type = LAMMPS defined group or type of atoms <br/>
-</li>
-<li>&lt;ID&gt; = name of group or type number <br/>
- </li>
-</ul>
-<h4><a class="anchor" id="examples">
-examples</a></h4>
-<p><code> fix_modify AtC add_species gold type 1 </code> <br/>
- <code> group GOLDGROUP type 1 </code> <br/>
- <code> fix_modify AtC add_species gold group GOLDGROUP </code> </p>
-<h4><a class="anchor" id="description">
-description</a></h4>
-<p>Associates a tag with all atoms of a specified type or within a specified group. <br/>
- </p>
-<h4><a class="anchor" id="restrictions">
-restrictions</a></h4>
-<h4><a class="anchor" id="related">
-related</a></h4>
-<h4><a class="anchor" id="default">
-default</a></h4>
-<p>No defaults for this command. </p>
-</div>
-<hr size="1"/><address style="text-align: right;"><small>Generated on 21 Aug 2013 for ATC by&nbsp;
-<a href="http://www.doxygen.org/index.html">
-<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.6.1 </small></address>
-</body>
-</html>
diff --git a/doc/src/USER/atc/man_atom_element_map.html b/doc/src/USER/atc/man_atom_element_map.html
deleted file mode 100644
index a5707d280e..0000000000
--- a/doc/src/USER/atc/man_atom_element_map.html
+++ /dev/null
@@ -1,50 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
-<title>ATC: fix_modify AtC atom_element_map</title>
-<link href="tabs.css" rel="stylesheet" type="text/css"/>
-<link href="doxygen.css" rel="stylesheet" type="text/css"/>
-</head>
-<body>
-<center>
-  <a href="http://lammps.sandia.gov">LAMMPS Website</a> &nbsp; &nbsp;
-  <a href="../../Manual.html">LAMMPS Manual</a> &nbsp; &nbsp;
-  <a href="../../fix_atc.html">USER-AtC Manual</a> &nbsp; &nbsp;
-  <a href="../../Commands_all.html">Commands</a>
-</center>
-
-<hr>
-
-
-<!-- Generated by Doxygen 1.6.1 -->
-<div class="contents">
-
-
-<h3><a class="anchor" id="man_atom_element_map">fix_modify AtC atom_element_map </a></h3><h4><a class="anchor" id="syntax">
-syntax</a></h4>
-<p>fix_modify AtC atom_element_map &lt;eulerian|lagrangian&gt; &lt;frequency&gt; <br/>
-</p>
-<ul>
-<li>frequency (int) : frequency of updating atom-to-continuum maps based on the current configuration - only for eulerian </li>
-</ul>
-<h4><a class="anchor" id="examples">
-examples</a></h4>
-<p><code> fix_modify atc atom_element_map eulerian 100 </code> </p>
-<h4><a class="anchor" id="description">
-description</a></h4>
-<p>Changes frame of reference from eulerian to lagrangian and sets the frequency for which the map from atoms to elements is reformed and all the attendant data is recalculated. </p>
-<h4><a class="anchor" id="restrictions">
-restrictions</a></h4>
-<p>Cannot change map type after initialization. </p>
-<h4><a class="anchor" id="related">
-related</a></h4>
-<h4><a class="anchor" id="default">
-default</a></h4>
-<p>lagrangian </p>
-</div>
-<hr size="1"/><address style="text-align: right;"><small>Generated on 21 Aug 2013 for ATC by&nbsp;
-<a href="http://www.doxygen.org/index.html">
-<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.6.1 </small></address>
-</body>
-</html>
diff --git a/doc/src/USER/atc/man_atom_weight.html b/doc/src/USER/atc/man_atom_weight.html
deleted file mode 100644
index 350ab13b92..0000000000
--- a/doc/src/USER/atc/man_atom_weight.html
+++ /dev/null
@@ -1,59 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
-<title>ATC: fix_modify AtC atom_weight</title>
-<link href="tabs.css" rel="stylesheet" type="text/css"/>
-<link href="doxygen.css" rel="stylesheet" type="text/css"/>
-</head>
-<body>
-<center>
-  <a href="http://lammps.sandia.gov">LAMMPS Website</a> &nbsp; &nbsp;
-  <a href="../../Manual.html">LAMMPS Manual</a> &nbsp; &nbsp;
-  <a href="../../fix_atc.html">USER-AtC Manual</a> &nbsp; &nbsp;
-  <a href="../../Commands_all.html">Commands</a>
-</center>
-
-<hr>
-
-
-<!-- Generated by Doxygen 1.6.1 -->
-<div class="contents">
-
-
-<h3><a class="anchor" id="man_atom_weight">fix_modify AtC atom_weight </a></h3><h4><a class="anchor" id="syntax">
-syntax</a></h4>
-<p>fix_modify AtC atom_weight &lt;method&gt; &lt;arguments&gt;</p>
-<ul>
-<li>&lt;method&gt; = <br/>
- value: atoms in specified group assigned constant value given <br/>
- lattice: volume per atom for specified lattice type (e.g. fcc) and parameter <br/>
- element: element volume divided among atoms within element <br/>
- region: volume per atom determined based on the atom count in the MD regions and their volumes. Note: meaningful only if atoms completely fill all the regions. <br/>
- group: volume per atom determined based on the atom count in a group and its volume<br/>
- read_in: list of values for atoms are read-in from specified file <br/>
- </li>
-</ul>
-<h4><a class="anchor" id="examples">
-examples</a></h4>
-<p><code> fix_modify atc atom_weight constant myatoms 11.8 </code> <br/>
- <code> fix_modify atc atom_weight lattice </code> <br/>
- <code> fix_modify atc atom_weight read-in atm_wt_file.txt </code> <br/>
- </p>
-<h4><a class="anchor" id="description">
-description</a></h4>
-<p>Command for assigning the value of atomic weights used for atomic integration in atom-continuum coupled simulations. </p>
-<h4><a class="anchor" id="restrictions">
-restrictions</a></h4>
-<p>Use of lattice option requires a lattice type and parameter is already specified. </p>
-<h4><a class="anchor" id="related">
-related</a></h4>
-<h4><a class="anchor" id="default">
-default</a></h4>
-<p>lattice </p>
-</div>
-<hr size="1"/><address style="text-align: right;"><small>Generated on 21 Aug 2013 for ATC by&nbsp;
-<a href="http://www.doxygen.org/index.html">
-<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.6.1 </small></address>
-</body>
-</html>
diff --git a/doc/src/USER/atc/man_atomic_charge.html b/doc/src/USER/atc/man_atomic_charge.html
deleted file mode 100644
index 17e854a37f..0000000000
--- a/doc/src/USER/atc/man_atomic_charge.html
+++ /dev/null
@@ -1,49 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
-<title>ATC: fix_modify AtC atomic_charge</title>
-<link href="tabs.css" rel="stylesheet" type="text/css"/>
-<link href="doxygen.css" rel="stylesheet" type="text/css"/>
-</head>
-<body>
-<center>
-  <a href="http://lammps.sandia.gov">LAMMPS Website</a> &nbsp; &nbsp;
-  <a href="../../Manual.html">LAMMPS Manual</a> &nbsp; &nbsp;
-  <a href="../../fix_atc.html">USER-AtC Manual</a> &nbsp; &nbsp;
-  <a href="../../Commands_all.html">Commands</a>
-</center>
-
-<hr>
-
-
-<!-- Generated by Doxygen 1.6.1 -->
-<div class="contents">
-
-
-<h3><a class="anchor" id="man_atomic_charge">fix_modify AtC atomic_charge </a></h3><h4><a class="anchor" id="syntax">
-syntax</a></h4>
-<p>fix_modify AtC &lt;include | omit&gt; atomic_charge</p>
-<ul>
-<li>&lt;include | omit&gt; = switch to activiate/deactiviate inclusion of intrinsic atomic charge in <a class="el" href="namespaceATC.html" title="owned field/s: MASS_DENSITY">ATC</a> </li>
-</ul>
-<h4><a class="anchor" id="examples">
-examples</a></h4>
-<p><code> fix_modify atc compute include atomic_charge </code> </p>
-<h4><a class="anchor" id="description">
-description</a></h4>
-<p>Determines whether AtC tracks the total charge as a finite element field </p>
-<h4><a class="anchor" id="restrictions">
-restrictions</a></h4>
-<p>Required for: electrostatics </p>
-<h4><a class="anchor" id="related">
-related</a></h4>
-<h4><a class="anchor" id="default">
-default</a></h4>
-<p>if the atom charge is defined, default is on, otherwise default is off </p>
-</div>
-<hr size="1"/><address style="text-align: right;"><small>Generated on 21 Aug 2013 for ATC by&nbsp;
-<a href="http://www.doxygen.org/index.html">
-<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.6.1 </small></address>
-</body>
-</html>
diff --git a/doc/src/USER/atc/man_boundary.html b/doc/src/USER/atc/man_boundary.html
deleted file mode 100644
index 8dcf328dd3..0000000000
--- a/doc/src/USER/atc/man_boundary.html
+++ /dev/null
@@ -1,46 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
-<title>ATC: fix_modify AtC boundary</title>
-<link href="tabs.css" rel="stylesheet" type="text/css"/>
-<link href="doxygen.css" rel="stylesheet" type="text/css"/>
-</head>
-<body>
-<center>
-  <a href="http://lammps.sandia.gov">LAMMPS Website</a> &nbsp; &nbsp;
-  <a href="../../Manual.html">LAMMPS Manual</a> &nbsp; &nbsp;
-  <a href="../../fix_atc.html">USER-AtC Manual</a> &nbsp; &nbsp;
-  <a href="../../Commands_all.html">Commands</a>
-</center>
-
-<hr>
-
-
-<!-- Generated by Doxygen 1.6.1 -->
-<div class="contents">
-
-
-<h3><a class="anchor" id="man_boundary">fix_modify AtC boundary </a></h3><h4><a class="anchor" id="syntax">
-syntax</a></h4>
-<p>fix_modify AtC boundary type &lt;atom-type-id&gt;</p>
-<ul>
-<li>&lt;atom-type-id&gt; = type id for atoms that represent a ficticious boundary internal to the FE mesh </li>
-</ul>
-<h4><a class="anchor" id="examples">
-examples</a></h4>
-<p><code> fix_modify AtC boundary type ghost_atoms </code> </p>
-<h4><a class="anchor" id="description">
-description</a></h4>
-<p>Command to define the atoms that represent the ficticious boundary internal to the FE mesh. For fully overlapped MD/FE domains with periodic boundary conditions no boundary atoms should be defined. </p>
-<h4><a class="anchor" id="restrictions">
-restrictions</a></h4>
-<h4><a class="anchor" id="default">
-default</a></h4>
-<p>none </p>
-</div>
-<hr size="1"/><address style="text-align: right;"><small>Generated on 21 Aug 2013 for ATC by&nbsp;
-<a href="http://www.doxygen.org/index.html">
-<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.6.1 </small></address>
-</body>
-</html>
diff --git a/doc/src/USER/atc/man_boundary_dynamics.html b/doc/src/USER/atc/man_boundary_dynamics.html
deleted file mode 100644
index 335ff2d209..0000000000
--- a/doc/src/USER/atc/man_boundary_dynamics.html
+++ /dev/null
@@ -1,44 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
-<title>ATC: fix_modify AtC boundary_dynamics</title>
-<link href="tabs.css" rel="stylesheet" type="text/css"/>
-<link href="doxygen.css" rel="stylesheet" type="text/css"/>
-</head>
-<body>
-<center>
-  <a href="http://lammps.sandia.gov">LAMMPS Website</a> &nbsp; &nbsp;
-  <a href="../../Manual.html">LAMMPS Manual</a> &nbsp; &nbsp;
-  <a href="../../fix_atc.html">USER-AtC Manual</a> &nbsp; &nbsp;
-  <a href="../../Commands_all.html">Commands</a>
-</center>
-
-<hr>
-
-
-<!-- Generated by Doxygen 1.6.1 -->
-<div class="contents">
-
-
-<h3><a class="anchor" id="man_boundary_dynamics">fix_modify AtC boundary_dynamics </a></h3><h4><a class="anchor" id="syntax">
-syntax</a></h4>
-<p>fix_modify AtC boundary_dynamics &lt; on | damped_harmonic | prescribed | coupled | none &gt; [args] <br/>
- </p>
-<h4><a class="anchor" id="description">
-description</a></h4>
-<p>Sets different schemes for controlling boundary atoms. On will integrate the boundary atoms using the velocity-verlet algorithm. Damped harmonic uses a mass/spring/dashpot for the boundary atoms with added arguments of the damping and spring constants followed by the ratio of the boundary type mass to the desired mass. Prescribed forces the boundary atoms to follow the finite element displacement. Coupled does the same. </p>
-<h4><a class="anchor" id="restrictions">
-restrictions</a></h4>
-<p>Boundary atoms must be specified. When using swaps between internal and boundary atoms, the initial configuration must have already correctly partitioned the two. </p>
-<h4><a class="anchor" id="related">
-related</a></h4>
-<h4><a class="anchor" id="default">
-default</a></h4>
-<p>prescribed on </p>
-</div>
-<hr size="1"/><address style="text-align: right;"><small>Generated on 21 Aug 2013 for ATC by&nbsp;
-<a href="http://www.doxygen.org/index.html">
-<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.6.1 </small></address>
-</body>
-</html>
diff --git a/doc/src/USER/atc/man_boundary_faceset.html b/doc/src/USER/atc/man_boundary_faceset.html
deleted file mode 100644
index 6c2fb84940..0000000000
--- a/doc/src/USER/atc/man_boundary_faceset.html
+++ /dev/null
@@ -1,45 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
-<title>ATC: fix_modify AtC boundary_faceset</title>
-<link href="tabs.css" rel="stylesheet" type="text/css"/>
-<link href="doxygen.css" rel="stylesheet" type="text/css"/>
-</head>
-<body>
-<center>
-  <a href="http://lammps.sandia.gov">LAMMPS Website</a> &nbsp; &nbsp;
-  <a href="../../Manual.html">LAMMPS Manual</a> &nbsp; &nbsp;
-  <a href="../../fix_atc.html">USER-AtC Manual</a> &nbsp; &nbsp;
-  <a href="../../Commands_all.html">Commands</a>
-</center>
-
-<hr>
-
-
-<!-- Generated by Doxygen 1.6.1 -->
-<div class="contents">
-
-
-<h3><a class="anchor" id="man_boundary_faceset">fix_modify AtC boundary_faceset </a></h3><h4><a class="anchor" id="syntax">
-syntax</a></h4>
-<p>fix_modify AtC boundary_faceset &lt;is | add&gt; [args] </p>
-<h4><a class="anchor" id="examples">
-examples</a></h4>
-<p>fix_modify AtC boundary_faceset is obndy </p>
-<h4><a class="anchor" id="description">
-description</a></h4>
-<p>This command species the faceset name when using a faceset to compute the MD/FE boundary fluxes. The faceset must already exist. </p>
-<h4><a class="anchor" id="restrictions">
-restrictions</a></h4>
-<p>This is only valid when fe_md_boundary is set to faceset. </p>
-<h4><a class="anchor" id="related">
-related</a></h4>
-<h4><a class="anchor" id="default">
-default</a></h4>
-</div>
-<hr size="1"/><address style="text-align: right;"><small>Generated on 21 Aug 2013 for ATC by&nbsp;
-<a href="http://www.doxygen.org/index.html">
-<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.6.1 </small></address>
-</body>
-</html>
diff --git a/doc/src/USER/atc/man_boundary_integral.html b/doc/src/USER/atc/man_boundary_integral.html
deleted file mode 100644
index c4b0d4865e..0000000000
--- a/doc/src/USER/atc/man_boundary_integral.html
+++ /dev/null
@@ -1,51 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
-<title>ATC: fix_modify AtC output boundary_integral</title>
-<link href="tabs.css" rel="stylesheet" type="text/css"/>
-<link href="doxygen.css" rel="stylesheet" type="text/css"/>
-</head>
-<body>
-<center>
-  <a href="http://lammps.sandia.gov">LAMMPS Website</a> &nbsp; &nbsp;
-  <a href="../../Manual.html">LAMMPS Manual</a> &nbsp; &nbsp;
-  <a href="../../fix_atc.html">USER-AtC Manual</a> &nbsp; &nbsp;
-  <a href="../../Commands_all.html">Commands</a>
-</center>
-
-<hr>
-
-
-<!-- Generated by Doxygen 1.6.1 -->
-<div class="contents">
-
-
-<h3><a class="anchor" id="man_boundary_integral">fix_modify AtC output boundary_integral </a></h3><h4><a class="anchor" id="syntax">
-syntax</a></h4>
-<p>fix_modify AtC output boundary_integral [field] faceset [name]</p>
-<ul>
-<li>field (string) : name of hardy field</li>
-<li>name (string) : name of faceset </li>
-</ul>
-<h4><a class="anchor" id="examples">
-examples</a></h4>
-<p><code> fix_modify AtC output boundary_integral stress faceset loop1 </code> <br/>
- </p>
-<h4><a class="anchor" id="description">
-description</a></h4>
-<p>Calculates a surface integral of the given field dotted with the outward normal of the faces and puts output in the "GLOBALS" file </p>
-<h4><a class="anchor" id="restrictions">
-restrictions</a></h4>
-<p>Must be used with the hardy/field type of AtC fix ( see <a class="el" href="../../fix_atc.html">fix atc command</a> ) </p>
-<h4><a class="anchor" id="related">
-related</a></h4>
-<h4><a class="anchor" id="default">
-default</a></h4>
-<p>none </p>
-</div>
-<hr size="1"/><address style="text-align: right;"><small>Generated on 21 Aug 2013 for ATC by&nbsp;
-<a href="http://www.doxygen.org/index.html">
-<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.6.1 </small></address>
-</body>
-</html>
diff --git a/doc/src/USER/atc/man_consistent_fe_initialization.html b/doc/src/USER/atc/man_consistent_fe_initialization.html
deleted file mode 100644
index baa306a1c8..0000000000
--- a/doc/src/USER/atc/man_consistent_fe_initialization.html
+++ /dev/null
@@ -1,49 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
-<title>ATC: fix_modify AtC consistent_fe_initialization</title>
-<link href="tabs.css" rel="stylesheet" type="text/css"/>
-<link href="doxygen.css" rel="stylesheet" type="text/css"/>
-</head>
-<body>
-<center>
-  <a href="http://lammps.sandia.gov">LAMMPS Website</a> &nbsp; &nbsp;
-  <a href="../../Manual.html">LAMMPS Manual</a> &nbsp; &nbsp;
-  <a href="../../fix_atc.html">USER-AtC Manual</a> &nbsp; &nbsp;
-  <a href="../../Commands_all.html">Commands</a>
-</center>
-
-<hr>
-
-
-<!-- Generated by Doxygen 1.6.1 -->
-<div class="contents">
-
-
-<h3><a class="anchor" id="man_consistent_fe_initialization">fix_modify AtC consistent_fe_initialization </a></h3><h4><a class="anchor" id="syntax">
-syntax</a></h4>
-<p>fix_modify AtC consistent_fe_initialization &lt;on | off&gt;</p>
-<ul>
-<li>&lt;on|off&gt; = switch to activiate/deactiviate the initial setting of FE intrinsic field to match the projected MD field </li>
-</ul>
-<h4><a class="anchor" id="examples">
-examples</a></h4>
-<p><code> fix_modify atc consistent_fe_initialization on </code> </p>
-<h4><a class="anchor" id="description">
-description</a></h4>
-<p>Determines whether AtC initializes FE intrinsic fields (e.g., temperature) to match the projected MD values. This is particularly useful for fully overlapping simulations. </p>
-<h4><a class="anchor" id="restrictions">
-restrictions</a></h4>
-<p>Can be used with: thermal, two_temperature. Cannot be used with time filtering on. Does not include boundary nodes. </p>
-<h4><a class="anchor" id="related">
-related</a></h4>
-<h4><a class="anchor" id="default">
-default</a></h4>
-<p>Default is off </p>
-</div>
-<hr size="1"/><address style="text-align: right;"><small>Generated on 21 Aug 2013 for ATC by&nbsp;
-<a href="http://www.doxygen.org/index.html">
-<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.6.1 </small></address>
-</body>
-</html>
diff --git a/doc/src/USER/atc/man_contour_integral.html b/doc/src/USER/atc/man_contour_integral.html
deleted file mode 100644
index 16f6d9abad..0000000000
--- a/doc/src/USER/atc/man_contour_integral.html
+++ /dev/null
@@ -1,52 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
-<title>ATC: fix_modify AtC output contour_integral</title>
-<link href="tabs.css" rel="stylesheet" type="text/css"/>
-<link href="doxygen.css" rel="stylesheet" type="text/css"/>
-</head>
-<body>
-<center>
-  <a href="http://lammps.sandia.gov">LAMMPS Website</a> &nbsp; &nbsp;
-  <a href="../../Manual.html">LAMMPS Manual</a> &nbsp; &nbsp;
-  <a href="../../fix_atc.html">USER-AtC Manual</a> &nbsp; &nbsp;
-  <a href="../../Commands_all.html">Commands</a>
-</center>
-
-<hr>
-
-
-<!-- Generated by Doxygen 1.6.1 -->
-<div class="contents">
-
-
-<h3><a class="anchor" id="man_contour_integral">fix_modify AtC output contour_integral </a></h3><h4><a class="anchor" id="syntax">
-syntax</a></h4>
-<p>fix_modify AtC output contour_integral [field] faceset [name] &lt;axis [x | y | z ]&gt;</p>
-<ul>
-<li>field (string) : name of hardy field</li>
-<li>name (string) : name of faceset</li>
-<li>axis (string) : x or y or z </li>
-</ul>
-<h4><a class="anchor" id="examples">
-examples</a></h4>
-<p><code> fix_modify AtC output contour_integral stress faceset loop1 </code> <br/>
- </p>
-<h4><a class="anchor" id="description">
-description</a></h4>
-<p>Calculates a surface integral of the given field dotted with the outward normal of the faces and puts output in the "GLOBALS" file </p>
-<h4><a class="anchor" id="restrictions">
-restrictions</a></h4>
-<p>Must be used with the hardy/field type of AtC fix ( see <a class="el" href="../../fix_atc.html">fix atc command</a> ) </p>
-<h4><a class="anchor" id="related">
-related</a></h4>
-<h4><a class="anchor" id="default">
-default</a></h4>
-<p>none </p>
-</div>
-<hr size="1"/><address style="text-align: right;"><small>Generated on 21 Aug 2013 for ATC by&nbsp;
-<a href="http://www.doxygen.org/index.html">
-<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.6.1 </small></address>
-</body>
-</html>
diff --git a/doc/src/USER/atc/man_control.html b/doc/src/USER/atc/man_control.html
deleted file mode 100644
index e94a9a52ef..0000000000
--- a/doc/src/USER/atc/man_control.html
+++ /dev/null
@@ -1,70 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
-<title>ATC: fix_modify AtC control</title>
-<link href="tabs.css" rel="stylesheet" type="text/css"/>
-<link href="doxygen.css" rel="stylesheet" type="text/css"/>
-</head>
-<body>
-<center>
-  <a href="http://lammps.sandia.gov">LAMMPS Website</a> &nbsp; &nbsp;
-  <a href="../../Manual.html">LAMMPS Manual</a> &nbsp; &nbsp;
-  <a href="../../fix_atc.html">USER-AtC Manual</a> &nbsp; &nbsp;
-  <a href="../../Commands_all.html">Commands</a>
-</center>
-
-<hr>
-
-
-<!-- Generated by Doxygen 1.6.1 -->
-<div class="contents">
-
-
-<h3><a class="anchor" id="man_control">fix_modify AtC control </a></h3><h4><a class="anchor" id="syntax">
-syntax</a></h4>
-<p>fix_modify AtC control &lt;physics_type&gt; &lt;solution_parameter&gt; </p>
-<p><br/>
-</p>
-<ul>
-<li>physics_type (string) = thermal | momentum<br/>
-</li>
-<li>solution_parameter (string) = max_iterations | tolerance<br/>
-</li>
-</ul>
-<p>fix_modify AtC transfer &lt;physics_type&gt; control max_iterations &lt;max_iterations&gt;<br/>
-</p>
-<ul>
-<li>max_iterations (int) = maximum number of iterations that will be used by iterative matrix solvers<br/>
-</li>
-</ul>
-<p>fix_modify AtC transfer &lt;physics_type&gt; control tolerance &lt;tolerance&gt; <br/>
-</p>
-<ul>
-<li>tolerance (float) = relative tolerance to which matrix equations will be solved<br/>
-</li>
-</ul>
-<h4><a class="anchor" id="examples">
-examples</a></h4>
-<p><code> fix_modify AtC control thermal max_iterations 10 </code> <br/>
- <code> fix_modify AtC control momentum tolerance 1.e-5 </code> <br/>
- </p>
-<h4><a class="anchor" id="description">
-description</a></h4>
-<p>Sets the numerical parameters for the matrix solvers used in the specified control algorithm. Many solution approaches require iterative solvers, and these methods enable users to provide the maximum number of iterations and the relative tolerance. </p>
-<h4><a class="anchor" id="restrictions">
-restrictions</a></h4>
-<p>only for be used with specific controllers : thermal, momentum <br/>
- They are ignored if a lumped solution is requested </p>
-<h4><a class="anchor" id="related">
-related</a></h4>
-<h4><a class="anchor" id="default">
-default</a></h4>
-<p>max_iterations is the number of rows in the matrix<br/>
- tolerance is 1.e-10 </p>
-</div>
-<hr size="1"/><address style="text-align: right;"><small>Generated on 21 Aug 2013 for ATC by&nbsp;
-<a href="http://www.doxygen.org/index.html">
-<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.6.1 </small></address>
-</body>
-</html>
diff --git a/doc/src/USER/atc/man_control_momentum.html b/doc/src/USER/atc/man_control_momentum.html
deleted file mode 100644
index e3074eae8f..0000000000
--- a/doc/src/USER/atc/man_control_momentum.html
+++ /dev/null
@@ -1,66 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
-<title>ATC: fix_modify AtC control momentum</title>
-<link href="tabs.css" rel="stylesheet" type="text/css"/>
-<link href="doxygen.css" rel="stylesheet" type="text/css"/>
-</head>
-<body>
-<center>
-  <a href="http://lammps.sandia.gov">LAMMPS Website</a> &nbsp; &nbsp;
-  <a href="../../Manual.html">LAMMPS Manual</a> &nbsp; &nbsp;
-  <a href="../../fix_atc.html">USER-AtC Manual</a> &nbsp; &nbsp;
-  <a href="../../Commands_all.html">Commands</a>
-</center>
-
-<hr>
-
-
-<!-- Generated by Doxygen 1.6.1 -->
-<div class="contents">
-
-
-<h3><a class="anchor" id="man_control_momentum">fix_modify AtC control momentum </a></h3><h4><a class="anchor" id="syntax">
-syntax</a></h4>
-<p>fix_modify AtC control momentum none <br/>
-</p>
-<p>fix_modify AtC control momentum rescale &lt;frequency&gt;<br/>
-</p>
-<ul>
-<li>frequency (int) = time step frequency for applying displacement and velocity rescaling <br/>
-</li>
-</ul>
-<p>fix_modify AtC control momentum glc_displacement <br/>
-</p>
-<p>fix_modify AtC control momentum glc_velocity <br/>
-</p>
-<p>fix_modify AtC control momentum hoover <br/>
-</p>
-<p>fix_modify AtC control momentum flux [faceset face_set_id, interpolate]</p>
-<ul>
-<li>face_set_id (string) = id of boundary face set, if not specified (or not possible when the atomic domain does not line up with mesh boundaries) defaults to an atomic-quadrature approximate evaulation<br/>
- </li>
-</ul>
-<h4><a class="anchor" id="examples">
-examples</a></h4>
-<p>fix_modify AtC control momentum glc_velocity <br/>
- fix_modify AtC control momentum flux faceset bndy_faces <br/>
- </p>
-<h4><a class="anchor" id="description">
-description</a></h4>
-<h4><a class="anchor" id="restrictions">
-restrictions</a></h4>
-<p>only to be used with specific transfers : elastic <br/>
- rescale not valid with time filtering activated </p>
-<h4><a class="anchor" id="related">
-related</a></h4>
-<h4><a class="anchor" id="default">
-default</a></h4>
-<p>none </p>
-</div>
-<hr size="1"/><address style="text-align: right;"><small>Generated on 21 Aug 2013 for ATC by&nbsp;
-<a href="http://www.doxygen.org/index.html">
-<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.6.1 </small></address>
-</body>
-</html>
diff --git a/doc/src/USER/atc/man_control_thermal.html b/doc/src/USER/atc/man_control_thermal.html
deleted file mode 100644
index 8d32f1c4f9..0000000000
--- a/doc/src/USER/atc/man_control_thermal.html
+++ /dev/null
@@ -1,74 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
-<title>ATC: fix_modify AtC control thermal</title>
-<link href="tabs.css" rel="stylesheet" type="text/css"/>
-<link href="doxygen.css" rel="stylesheet" type="text/css"/>
-</head>
-<body>
-<center>
-  <a href="http://lammps.sandia.gov">LAMMPS Website</a> &nbsp; &nbsp;
-  <a href="../../Manual.html">LAMMPS Manual</a> &nbsp; &nbsp;
-  <a href="../../fix_atc.html">USER-AtC Manual</a> &nbsp; &nbsp;
-  <a href="../../Commands_all.html">Commands</a>
-</center>
-
-<hr>
-
-
-<!-- Generated by Doxygen 1.6.1 -->
-<div class="contents">
-
-
-<h3><a class="anchor" id="man_control_thermal">fix_modify AtC control thermal </a></h3><h4><a class="anchor" id="syntax">
-syntax</a></h4>
-<p>fix_modify AtC control thermal &lt;control_type&gt; &lt;optional_args&gt;</p>
-<ul>
-<li>control_type (string) = none | rescale | hoover | flux<br/>
-</li>
-</ul>
-<p>fix_modify AtC control thermal rescale &lt;frequency&gt; <br/>
-</p>
-<ul>
-<li>frequency (int) = time step frequency for applying velocity rescaling <br/>
-</li>
-</ul>
-<p>fix_modify AtC control thermal hoover <br/>
-</p>
-<p>fix_modify AtC control thermal flux &lt;boundary_integration_type(optional)&gt; &lt;face_set_id(optional)&gt;<br/>
-</p>
-<ul>
-<li>boundary_integration_type (string) = faceset | interpolate<br/>
-</li>
-<li>face_set_id (string), optional = id of boundary face set, if not specified (or not possible when the atomic domain does not line up with mesh boundaries) defaults to an atomic-quadrature approximate evaulation, does not work with interpolate<br/>
- </li>
-</ul>
-<h4><a class="anchor" id="examples">
-examples</a></h4>
-<p><code> fix_modify AtC control thermal none </code> <br/>
- <code> fix_modify AtC control thermal rescale 10 </code> <br/>
- <code> fix_modify AtC control thermal hoover </code> <br/>
- <code> fix_modify AtC control thermal flux </code> <br/>
- <code> fix_modify AtC control thermal flux faceset bndy_faces </code> <br/>
- </p>
-<h4><a class="anchor" id="description">
-description</a></h4>
-<p>Sets the energy exchange mechansim from the finite elements to the atoms, managed through a control algorithm. Rescale computes a scale factor for each atom to match the finite element temperature. Hoover is a Gaussian least-constraint isokinetic thermostat enforces that the nodal restricted atomic temperature matches the finite element temperature. Flux is a similar mode, but rather adds energy to the atoms based on conservation of energy. Hoover and flux allows the prescription of sources or fixed temperatures on the atoms. </p>
-<h4><a class="anchor" id="restrictions">
-restrictions</a></h4>
-<p>only for be used with specific transfers : thermal (rescale, hoover, flux), two_temperature (flux) <br/>
- rescale not valid with time filtering activated </p>
-<h4><a class="anchor" id="related">
-related</a></h4>
-<h4><a class="anchor" id="default">
-default</a></h4>
-<p>none<br/>
- rescale frequency is 1<br/>
- flux boundary_integration_type is interpolate </p>
-</div>
-<hr size="1"/><address style="text-align: right;"><small>Generated on 21 Aug 2013 for ATC by&nbsp;
-<a href="http://www.doxygen.org/index.html">
-<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.6.1 </small></address>
-</body>
-</html>
diff --git a/doc/src/USER/atc/man_control_thermal_correction_max_iterations.html b/doc/src/USER/atc/man_control_thermal_correction_max_iterations.html
deleted file mode 100644
index d28ec334f5..0000000000
--- a/doc/src/USER/atc/man_control_thermal_correction_max_iterations.html
+++ /dev/null
@@ -1,51 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
-<title>ATC: fix_modify AtC control thermal correction_max_iterations</title>
-<link href="tabs.css" rel="stylesheet" type="text/css"/>
-<link href="doxygen.css" rel="stylesheet" type="text/css"/>
-</head>
-<body>
-<center>
-  <a href="http://lammps.sandia.gov">LAMMPS Website</a> &nbsp; &nbsp;
-  <a href="../../Manual.html">LAMMPS Manual</a> &nbsp; &nbsp;
-  <a href="../../fix_atc.html">USER-AtC Manual</a> &nbsp; &nbsp;
-  <a href="../../Commands_all.html">Commands</a>
-</center>
-
-<hr>
-
-
-<!-- Generated by Doxygen 1.6.1 -->
-<div class="contents">
-
-
-<h3><a class="anchor" id="man_control_thermal_correction_max_iterations">fix_modify AtC control thermal correction_max_iterations </a></h3><h4><a class="anchor" id="syntax">
-syntax</a></h4>
-<p>fix_modify AtC control thermal correction_max_iterations &lt;max_iterations&gt;</p>
-<ul>
-<li>max_iterations (int) = maximum number of iterations that will be used by iterative matrix solvers<br/>
-</li>
-</ul>
-<h4><a class="anchor" id="examples">
-examples</a></h4>
-<p><code> fix_modify AtC control thermal correction_max_iterations 10 </code> <br/>
- </p>
-<h4><a class="anchor" id="description">
-description</a></h4>
-<p>Sets the maximum number of iterations to compute the 2nd order in time correction term for lambda with the fractional step method. The method uses the same tolerance as the controller's matrix solver. </p>
-<h4><a class="anchor" id="restrictions">
-restrictions</a></h4>
-<p>only for use with thermal physics using the fractional step method. </p>
-<h4><a class="anchor" id="related">
-related</a></h4>
-<h4><a class="anchor" id="default">
-default</a></h4>
-<p>correction_max_iterations is 20 </p>
-</div>
-<hr size="1"/><address style="text-align: right;"><small>Generated on 21 Aug 2013 for ATC by&nbsp;
-<a href="http://www.doxygen.org/index.html">
-<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.6.1 </small></address>
-</body>
-</html>
diff --git a/doc/src/USER/atc/man_decomposition.html b/doc/src/USER/atc/man_decomposition.html
deleted file mode 100644
index 98eedafa6c..0000000000
--- a/doc/src/USER/atc/man_decomposition.html
+++ /dev/null
@@ -1,53 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
-<title>ATC: fix_modify AtC decomposition</title>
-<link href="tabs.css" rel="stylesheet" type="text/css"/>
-<link href="doxygen.css" rel="stylesheet" type="text/css"/>
-</head>
-<body>
-<center>
-  <a href="http://lammps.sandia.gov">LAMMPS Website</a> &nbsp; &nbsp;
-  <a href="../../Manual.html">LAMMPS Manual</a> &nbsp; &nbsp;
-  <a href="../../fix_atc.html">USER-AtC Manual</a> &nbsp; &nbsp;
-  <a href="../../Commands_all.html">Commands</a>
-</center>
-
-<hr>
-
-
-<!-- Generated by Doxygen 1.6.1 -->
-<div class="contents">
-
-
-<h3><a class="anchor" id="man_decomposition">fix_modify AtC decomposition </a></h3><h4><a class="anchor" id="syntax">
-syntax</a></h4>
-<p>fix_modify AtC decomposition &lt;type&gt;</p>
-<ul>
-<li>&lt;type&gt; = <br/>
- replicated_memory: nodal information replicated on each processor <br/>
- distributed_memory: only owned nodal information on processor <br/>
- </li>
-</ul>
-<h4><a class="anchor" id="examples">
-examples</a></h4>
-<p><code> fix_modify atc decomposition distributed_memory </code> <br/>
- </p>
-<h4><a class="anchor" id="description">
-description</a></h4>
-<p>Command for assigning the distribution of work and memory for parallel runs. </p>
-<h4><a class="anchor" id="restrictions">
-restrictions</a></h4>
-<p>replicated_memory is appropriate for simulations were the number of nodes &lt;&lt; number of atoms </p>
-<h4><a class="anchor" id="related">
-related</a></h4>
-<h4><a class="anchor" id="default">
-default</a></h4>
-<p>replicated_memory </p>
-</div>
-<hr size="1"/><address style="text-align: right;"><small>Generated on 21 Aug 2013 for ATC by&nbsp;
-<a href="http://www.doxygen.org/index.html">
-<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.6.1 </small></address>
-</body>
-</html>
diff --git a/doc/src/USER/atc/man_electron_integration.html b/doc/src/USER/atc/man_electron_integration.html
deleted file mode 100644
index 7cf40f6813..0000000000
--- a/doc/src/USER/atc/man_electron_integration.html
+++ /dev/null
@@ -1,54 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
-<title>ATC: fix_modify AtC extrinsic electron_integration</title>
-<link href="tabs.css" rel="stylesheet" type="text/css"/>
-<link href="doxygen.css" rel="stylesheet" type="text/css"/>
-</head>
-<body>
-<center>
-  <a href="http://lammps.sandia.gov">LAMMPS Website</a> &nbsp; &nbsp;
-  <a href="../../Manual.html">LAMMPS Manual</a> &nbsp; &nbsp;
-  <a href="../../fix_atc.html">USER-AtC Manual</a> &nbsp; &nbsp;
-  <a href="../../Commands_all.html">Commands</a>
-</center>
-
-<hr>
-
-
-<!-- Generated by Doxygen 1.6.1 -->
-<div class="contents">
-
-
-<h3><a class="anchor" id="man_electron_integration">fix_modify AtC extrinsic electron_integration </a></h3><h4><a class="anchor" id="syntax">
-syntax</a></h4>
-<p>fix_modify AtC extrinsic electron_integration &lt;integration_type&gt; &lt;num_subcyle_steps(optional)&gt; <br/>
-</p>
-<ul>
-<li>integration_type (string) = explicit | implicit | steady <br/>
-</li>
-<li>num_subcycle_steps (int), optional = number of subcycle steps for the electron time integration</li>
-</ul>
-<h4><a class="anchor" id="examples">
-examples</a></h4>
-<p><code> fix_modify AtC extrinsic electron_integration implicit </code> <br/>
- <code> fix_modify AtC extrinsic electron_integration explicit 100 </code> <br/>
-</p>
-<h4><a class="anchor" id="description">
-description</a></h4>
-<p>Switches between integration scheme for the electron temperature. The number of subcyling steps used to integrate the electron temperature 1 LAMMPS timestep can be manually adjusted to capture fast electron dynamics.</p>
-<h4><a class="anchor" id="restrictions">
-restrictions</a></h4>
-<p>For use only with two_temperature type of AtC fix ( see <a class="el" href="../../fix_atc.html">fix atc command</a> ) <br/>
- </p>
-<h4><a class="anchor" id="default">
-default</a></h4>
-<p>implicit<br/>
- subcycle_steps = 1 </p>
-</div>
-<hr size="1"/><address style="text-align: right;"><small>Generated on 21 Aug 2013 for ATC by&nbsp;
-<a href="http://www.doxygen.org/index.html">
-<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.6.1 </small></address>
-</body>
-</html>
diff --git a/doc/src/USER/atc/man_equilibrium_start.html b/doc/src/USER/atc/man_equilibrium_start.html
deleted file mode 100644
index 8c81ce5925..0000000000
--- a/doc/src/USER/atc/man_equilibrium_start.html
+++ /dev/null
@@ -1,48 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
-<title>ATC: fix_modify AtC equilibrium_start</title>
-<link href="tabs.css" rel="stylesheet" type="text/css"/>
-<link href="doxygen.css" rel="stylesheet" type="text/css"/>
-</head>
-<body>
-<center>
-  <a href="http://lammps.sandia.gov">LAMMPS Website</a> &nbsp; &nbsp;
-  <a href="../../Manual.html">LAMMPS Manual</a> &nbsp; &nbsp;
-  <a href="../../fix_atc.html">USER-AtC Manual</a> &nbsp; &nbsp;
-  <a href="../../Commands_all.html">Commands</a>
-</center>
-
-<hr>
-
-
-<!-- Generated by Doxygen 1.6.1 -->
-<div class="contents">
-
-
-<h3><a class="anchor" id="man_equilibrium_start">fix_modify AtC equilibrium_start </a></h3><h4><a class="anchor" id="syntax">
-syntax</a></h4>
-<p>fix_modify AtC equilibrium_start &lt;on|off&gt;</p>
-<h4><a class="anchor" id="examples">
-examples</a></h4>
-<p><code> fix_modify atc equilibrium_start on </code> <br/>
-</p>
-<h4><a class="anchor" id="description">
-description</a></h4>
-<p>Starts filtered calculations assuming they start in equilibrium, i.e. perfect finite element force balance.</p>
-<h4><a class="anchor" id="restrictions">
-restrictions</a></h4>
-<p>only needed before filtering is begun</p>
-<h4><a class="anchor" id="related">
-related</a></h4>
-<p>see <a class="el" href="man_time_filter.html">fix_modify AtC filter</a></p>
-<h4><a class="anchor" id="default">
-default</a></h4>
-<p>on </p>
-</div>
-<hr size="1"/><address style="text-align: right;"><small>Generated on 21 Aug 2013 for ATC by&nbsp;
-<a href="http://www.doxygen.org/index.html">
-<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.6.1 </small></address>
-</body>
-</html>
diff --git a/doc/src/USER/atc/man_extrinsic_exchange.html b/doc/src/USER/atc/man_extrinsic_exchange.html
deleted file mode 100644
index f4d1b01e88..0000000000
--- a/doc/src/USER/atc/man_extrinsic_exchange.html
+++ /dev/null
@@ -1,48 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
-<title>ATC: fix_modify AtC extrinsic exchange</title>
-<link href="tabs.css" rel="stylesheet" type="text/css"/>
-<link href="doxygen.css" rel="stylesheet" type="text/css"/>
-</head>
-<body>
-<center>
-  <a href="http://lammps.sandia.gov">LAMMPS Website</a> &nbsp; &nbsp;
-  <a href="../../Manual.html">LAMMPS Manual</a> &nbsp; &nbsp;
-  <a href="../../fix_atc.html">USER-AtC Manual</a> &nbsp; &nbsp;
-  <a href="../../Commands_all.html">Commands</a>
-</center>
-
-<hr>
-
-
-<!-- Generated by Doxygen 1.6.1 -->
-<div class="contents">
-
-
-<h3><a class="anchor" id="man_extrinsic_exchange">fix_modify AtC extrinsic exchange </a></h3><h4><a class="anchor" id="syntax">
-syntax</a></h4>
-<p>fix_modify AtC extrinsic exchange &lt;on|off&gt;</p>
-<h4><a class="anchor" id="examples">
-examples</a></h4>
-<p><code> fix_modify AtC extrinsic exchange on </code> <br/>
-</p>
-<h4><a class="anchor" id="description">
-description</a></h4>
-<p>Switches energy exchange between the MD system and electron system on and off</p>
-<h4><a class="anchor" id="restrictions">
-restrictions</a></h4>
-<p>Only valid for use with two_temperature type of AtC fix.</p>
-<h4><a class="anchor" id="related">
-related</a></h4>
-<p>see <a class="el" href="../../fix_atc.html">fix atc command</a></p>
-<h4><a class="anchor" id="default">
-default</a></h4>
-<p>on </p>
-</div>
-<hr size="1"/><address style="text-align: right;"><small>Generated on 21 Aug 2013 for ATC by&nbsp;
-<a href="http://www.doxygen.org/index.html">
-<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.6.1 </small></address>
-</body>
-</html>
diff --git a/doc/src/USER/atc/man_fe_md_boundary.html b/doc/src/USER/atc/man_fe_md_boundary.html
deleted file mode 100644
index e39ddd3cec..0000000000
--- a/doc/src/USER/atc/man_fe_md_boundary.html
+++ /dev/null
@@ -1,48 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
-<title>ATC: fix_modify AtC fe_md_boundary</title>
-<link href="tabs.css" rel="stylesheet" type="text/css"/>
-<link href="doxygen.css" rel="stylesheet" type="text/css"/>
-</head>
-<body>
-<center>
-  <a href="http://lammps.sandia.gov">LAMMPS Website</a> &nbsp; &nbsp;
-  <a href="../../Manual.html">LAMMPS Manual</a> &nbsp; &nbsp;
-  <a href="../../fix_atc.html">USER-AtC Manual</a> &nbsp; &nbsp;
-  <a href="../../Commands_all.html">Commands</a>
-</center>
-
-<hr>
-
-
-<!-- Generated by Doxygen 1.6.1 -->
-<div class="contents">
-
-
-<h3><a class="anchor" id="man_fe_md_boundary">fix_modify AtC fe_md_boundary </a></h3><h4><a class="anchor" id="syntax">
-syntax</a></h4>
-<p>fix_modify AtC fe_md_boundary &lt;faceset | interpolate | no_boundary&gt; [args] </p>
-<h4><a class="anchor" id="examples">
-examples</a></h4>
-<p><code> fix_modify atc fe_md_boundary interpolate </code> <br/>
- </p>
-<h4><a class="anchor" id="description">
-description</a></h4>
-<p>Specifies different methods for computing fluxes between between the MD and FE integration regions. Faceset defines a faceset separating the MD and FE regions and uses finite element face quadrature to compute the flux. Interpolate uses a reconstruction scheme to approximate the flux, which is more robust but less accurate if the MD/FE boundary does correspond to a faceset. No boundary results in no fluxes between the systems being computed. </p>
-<h4><a class="anchor" id="restrictions">
-restrictions</a></h4>
-<p>If faceset is used, all the AtC non-boundary atoms must lie within and completely fill the domain enclosed by the faceset. </p>
-<h4><a class="anchor" id="related">
-related</a></h4>
-<p>see  for how to specify the faceset name. </p>
-<h4><a class="anchor" id="default">
-default</a></h4>
-<p>Interpolate. </p>
-</div>
-<hr size="1"/><address style="text-align: right;"><small>Generated on 21 Aug 2013 for ATC by&nbsp;
-<a href="http://www.doxygen.org/index.html">
-<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.6.1 </small></address>
-</body>
-</html>
diff --git a/doc/src/USER/atc/man_fem_mesh.html b/doc/src/USER/atc/man_fem_mesh.html
deleted file mode 100644
index 485b8c95a0..0000000000
--- a/doc/src/USER/atc/man_fem_mesh.html
+++ /dev/null
@@ -1,46 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
-<title>ATC: fix_modify AtC fem create mesh</title>
-<link href="tabs.css" rel="stylesheet" type="text/css"/>
-<link href="doxygen.css" rel="stylesheet" type="text/css"/>
-</head>
-<body>
-<center>
-  <a href="http://lammps.sandia.gov">LAMMPS Website</a> &nbsp; &nbsp;
-  <a href="../../Manual.html">LAMMPS Manual</a> &nbsp; &nbsp;
-  <a href="../../fix_atc.html">USER-AtC Manual</a> &nbsp; &nbsp;
-  <a href="../../Commands_all.html">Commands</a>
-</center>
-
-<hr>
-
-
-<!-- Generated by Doxygen 1.6.1 -->
-<div class="contents">
-
-<h3><a class="anchor" id="man_fem_mesh">fix_modify AtC fem create mesh</a></h3><h4><a class="anchor" id="syntax">
-syntax</a></h4>
-fix_modify AtC fem create mesh &lt;nx&gt; &lt;ny&gt; &lt;nz&gt; &lt;region-id&gt; &lt;f|p&gt; &lt;f|p&gt; &lt;f|p&gt;<ul>
-<li>nx ny nz = number of elements in x, y, z</li><li>region-id = id of region that is to be meshed</li><li>f p p = perioidicity flags for x, y, z </li></ul>
-<h4><a class="anchor" id="examples">
-examples</a></h4>
-<p><code> fix_modify AtC fem create mesh 10 1 1 feRegion p p p </code> <br/>
-</p>
-<h4><a class="anchor" id="description">
-description</a></h4>
-<p>Creates a uniform mesh in a rectangular region</p>
-<h4><a class="anchor" id="restrictions">
-restrictions</a></h4>
-<p>creates only uniform rectangular grids in a rectangular region</p>
-<h4><a class="anchor" id="related">
-related</a></h4>
-<h4><a class="anchor" id="default">
-default</a></h4>
-none
-<hr size="1"><address style="align: right;"><small>Generated on Mon Aug 17 09:35:16 2009 for ATC by&nbsp;
-<a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.3.9.1 </small></address>
-</body>
-</html>
diff --git a/doc/src/USER/atc/man_filter_scale.html b/doc/src/USER/atc/man_filter_scale.html
deleted file mode 100644
index e2190dea21..0000000000
--- a/doc/src/USER/atc/man_filter_scale.html
+++ /dev/null
@@ -1,53 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
-<title>ATC: fix_modify AtC filter scale</title>
-<link href="tabs.css" rel="stylesheet" type="text/css"/>
-<link href="doxygen.css" rel="stylesheet" type="text/css"/>
-</head>
-<body>
-<center>
-  <a href="http://lammps.sandia.gov">LAMMPS Website</a> &nbsp; &nbsp;
-  <a href="../../Manual.html">LAMMPS Manual</a> &nbsp; &nbsp;
-  <a href="../../fix_atc.html">USER-AtC Manual</a> &nbsp; &nbsp;
-  <a href="../../Commands_all.html">Commands</a>
-</center>
-
-<hr>
-
-
-<!-- Generated by Doxygen 1.6.1 -->
-<div class="contents">
-
-
-<h3><a class="anchor" id="man_filter_scale">fix_modify AtC filter scale </a></h3><h4><a class="anchor" id="syntax">
-syntax</a></h4>
-<p>fix_modify AtC filter scale &lt;scale&gt; <br/>
-</p>
-<ul>
-<li>scale (real) = characteristic time scale of the filter <br/>
-</li>
-</ul>
-<h4><a class="anchor" id="examples">
-examples</a></h4>
-<p><code> fix_modify AtC filter scale 10.0 </code> <br/>
-</p>
-<h4><a class="anchor" id="description">
-description</a></h4>
-<p>Filters the MD dynamics to construct a more appropriate continuous field. Equilibrating first filters the time derivatives without changing the dynamics to provide a better initial condition to the filtered dynamics </p>
-<h4><a class="anchor" id="restrictions">
-restrictions</a></h4>
-<p>only for be used with specific transfers: thermal, two_temperature</p>
-<h4><a class="anchor" id="related">
-related</a></h4>
-<p><a class="el" href="man_time_filter.html">fix_modify AtC filter</a> <a class="el" href="man_filter_type.html">fix_modify AtC filter type</a></p>
-<h4><a class="anchor" id="default">
-default</a></h4>
-<p>0. </p>
-</div>
-<hr size="1"/><address style="text-align: right;"><small>Generated on 21 Aug 2013 for ATC by&nbsp;
-<a href="http://www.doxygen.org/index.html">
-<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.6.1 </small></address>
-</body>
-</html>
diff --git a/doc/src/USER/atc/man_filter_type.html b/doc/src/USER/atc/man_filter_type.html
deleted file mode 100644
index 0928139d7d..0000000000
--- a/doc/src/USER/atc/man_filter_type.html
+++ /dev/null
@@ -1,49 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
-<title>ATC: fix_modify AtC filter type</title>
-<link href="tabs.css" rel="stylesheet" type="text/css"/>
-<link href="doxygen.css" rel="stylesheet" type="text/css"/>
-</head>
-<body>
-<center>
-  <a href="http://lammps.sandia.gov">LAMMPS Website</a> &nbsp; &nbsp;
-  <a href="../../Manual.html">LAMMPS Manual</a> &nbsp; &nbsp;
-  <a href="../../fix_atc.html">USER-AtC Manual</a> &nbsp; &nbsp;
-  <a href="../../Commands_all.html">Commands</a>
-</center>
-
-<hr>
-
-
-<!-- Generated by Doxygen 1.6.1 -->
-<div class="contents">
-
-
-<h3><a class="anchor" id="man_filter_type">fix_modify AtC filter type </a></h3><h4><a class="anchor" id="syntax">
-syntax</a></h4>
-<p>fix_modify AtC filter type &lt;exponential | step | no_filter&gt; <br/>
-</p>
-<h4><a class="anchor" id="examples">
-examples</a></h4>
-<p><code> fix_modify AtC filter type exponential </code> <br/>
-</p>
-<h4><a class="anchor" id="description">
-description</a></h4>
-<p>Specifies the type of time filter used. </p>
-<h4><a class="anchor" id="restrictions">
-restrictions</a></h4>
-<p>only for be used with specific transfers: thermal, two_temperature</p>
-<h4><a class="anchor" id="related">
-related</a></h4>
-<p><a class="el" href="man_time_filter.html">fix_modify AtC filter</a> <a class="el" href="man_filter_scale.html">fix_modify AtC filter scale</a></p>
-<h4><a class="anchor" id="default">
-default</a></h4>
-<p>No default. </p>
-</div>
-<hr size="1"/><address style="text-align: right;"><small>Generated on 21 Aug 2013 for ATC by&nbsp;
-<a href="http://www.doxygen.org/index.html">
-<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.6.1 </small></address>
-</body>
-</html>
diff --git a/doc/src/USER/atc/man_fix_atc.html b/doc/src/USER/atc/man_fix_atc.html
deleted file mode 100644
index f6f7b43a38..0000000000
--- a/doc/src/USER/atc/man_fix_atc.html
+++ /dev/null
@@ -1,252 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
-<title>ATC: fix atc command</title>
-<link href="tabs.css" rel="stylesheet" type="text/css"/>
-<link href="doxygen.css" rel="stylesheet" type="text/css"/>
-</head>
-<body>
-<center>
-  <a href="http://lammps.sandia.gov">LAMMPS Website</a> &nbsp; &nbsp;
-  <a href="../../Manual.html">LAMMPS Manual</a> &nbsp; &nbsp;
-  <a href="../../fix_atc.html">USER-AtC Manual</a> &nbsp; &nbsp;
-  <a href="../../Commands_all.html">Commands</a>
-</center>
-
-<hr>
-
-
-<!-- Generated by Doxygen 1.6.1 -->
-<div class="contents">
-
-
-<h3><a class="anchor" id="man_fix_atc">fix atc command </a></h3><h4><a class="anchor" id="syntax">
-syntax</a></h4>
-<p>fix &lt;fixID&gt; &lt;group&gt; atc &lt;type&gt; &lt;parameter_file&gt;</p>
-<ul>
-<li>fixID = name of fix</li>
-<li>group = name of group fix is to be applied</li>
-<li>type<br/>
- = thermal : thermal coupling with fields: temperature <br/>
- = two_temperature : electron-phonon coupling with field: temperature and electron_temperature <br/>
- = hardy : on-the-fly post-processing using kernel localization functions (see "related" section for possible fields) <br/>
- = field : on-the-fly post-processing using mesh-based localization functions (see "related" section for possible fields) <br/>
-</li>
-<li>parameter_file = name of the file with material parameters. <br/>
- note: Neither hardy nor field requires a parameter file </li>
-</ul>
-<h4><a class="anchor" id="examples">
-examples</a></h4>
-<p><code> fix AtC internal atc thermal Ar_thermal.dat </code> <br/>
- <code> fix AtC internal atc two_temperature Ar_ttm.mat </code> <br/>
- <code> fix AtC internal atc hardy </code> <br/>
- <code> fix AtC internal atc field </code> <br/>
- </p>
-<h4><a class="anchor" id="description">
-description</a></h4>
-<p>This fix is the beginning to creating a coupled FE/MD simulation and/or an on-the-fly estimation of continuum fields. The coupled versions of this fix do Verlet integration and the /post-processing does not. After instantiating this fix, several other fix_modify commands will be needed to set up the problem, e.g. define the finite element mesh and prescribe initial and boundary conditions.</p>
-<p>The following coupling example is typical, but non-exhaustive:<br/>
-</p>
-<p><code> # ... commands to create and initialize the MD system <br/>
-</code></p>
-<p><code> # initial fix to designate coupling type and group to apply it to <br/>
- # tag group physics material_file <br/>
- fix AtC internal atc thermal Ar_thermal.mat<br/>
- <br/>
- # create a uniform 12 x 2 x 2 mesh that covers region contain the group <br/>
- # nx ny nz region periodicity <br/>
- fix_modify AtC mesh create 12 2 2 mdRegion f p p<br/>
- <br/>
- # specify the control method for the type of coupling <br/>
- # physics control_type <br/>
- fix_modify AtC thermal control flux <br/>
- <br/>
- # specify the initial values for the empirical field "temperature" <br/>
- # field node_group value <br/>
- fix_modify AtC initial temperature all 30.<br/>
- <br/>
- # create an output stream for nodal fields <br/>
- # filename output_frequency <br/>
- fix_modify AtC output atc_fe_output 100<br/>
- <br/>
-</code></p>
-<p><code> run 1000 <br/>
- </code></p>
-<p>likewise for this post-processing example: <br/>
-</p>
-<p><code> # ... commands to create and initialize the MD system <br/>
-</code></p>
-<p><code> # initial fix to designate post-processing and the group to apply it to <br/>
- # no material file is allowed nor required <br/>
- fix AtC internal atc hardy <br/>
- <br/>
- # for hardy fix, specific kernel function (function type and range) to # be used as a localization function <br/>
- fix AtC kernel quartic_sphere 10.0 <br/>
- <br/>
- # create a uniform 1 x 1 x 1 mesh that covers region contain the group <br/>
- # with periodicity this effectively creats a system average <br/>
- fix_modify AtC mesh create 1 1 1 box p p p <br/>
-<br/>
- # change from default lagrangian map to eulerian <br/>
- # refreshed every 100 steps <br/>
- fix_modify AtC atom_element_map eulerian 100 <br/>
- <br/>
- # start with no field defined <br/>
- # add mass density, potential energy density, stress and temperature <br/>
- fix_modify AtC fields add density energy stress temperature <br/>
-<br/>
- # create an output stream for nodal fields <br/>
- # filename output_frequency <br/>
- fix_modify AtC output nvtFE 100 text <br/>
-</code></p>
-<p><code> run 1000 <br/>
- </code></p>
-<p>the mesh's linear interpolation functions can be used as the localization function <br/>
- by using the field option: <br/>
-</p>
-<p><code> fix AtC internal atc field <br/>
- <br/>
- fix_modify AtC mesh create 1 1 1 box p p p <br/>
-<br/>
- ... <br/>
-<br/>
- </code></p>
-<p>Note coupling and post-processing can be combined in the same simulations using separate fixes. <br/>
- For detailed exposition of the theory and algorithms please see:<br/>
-</p>
-<ul>
-<li>Wagner, GJ; Jones, RE; Templeton, JA; Parks, MA, <em> An atomistic-to-continuum coupling method for heat transfer in solids. </em> Special Issue of Computer Methods and Applied Mechanics (2008) 197:3351. <br/>
-</li>
-<li>Zimmerman, JA; Webb, EB; Hoyt, JJ;. Jones, RE; Klein, PA; Bammann, DJ, <em> Calculation of stress in atomistic simulation. </em> Special Issue of Modelling and Simulation in Materials Science and Engineering (2004), 12:S319. <br/>
-</li>
-<li>Zimmerman, JA; Jones, RE; Templeton, JA, <em> A material frame approach for evaluating continuum variables in atomistic simulations. </em> Journal of Computational Physics (2010), 229:2364. <br/>
-</li>
-<li>Templeton, JA; Jones, RE; Wagner, GJ, <em> Application of a field-based method to spatially varying thermal transport problems in molecular dynamics. </em> Modelling and Simulation in Materials Science and Engineering (2010), 18:085007. <br/>
-</li>
-<li>Jones, RE; Templeton, JA; Wagner, GJ; Olmsted, D; Modine, JA, <em> Electron transport enhanced molecular dynamics for metals and semi-metals. </em> International Journal for Numerical Methods in Engineering (2010), 83:940. <br/>
-</li>
-<li>Templeton, JA; Jones, RE; Lee, JW; Zimmerman, JA; Wong, BM, <em> A long-range electric field solver for molecular dynamics based on atomistic-to-continuum modeling. </em> Journal of Chemical Theory and Computation (2011), 7:1736. <br/>
-</li>
-<li>Mandadapu, KK; Templeton, JA; Lee, JW, <em> Polarization as a field variable from molecular dynamics simulations. </em> Journal of Chemical Physics (2013), 139:054115. <br/>
-</li>
-</ul>
-<p>Please refer to the standard finite element (FE) texts, e.g. T.J.R Hughes <em> The finite element method </em>, Dover 2003, for the basics of FE simulation.</p>
-<h4><a class="anchor" id="restrictions">
-restrictions</a></h4>
-<p>Thermal and two_temperature (coupling) types use a Verlet time-integration algorithm. The hardy type does not contain its own time-integrator and must be used with a separate fix that does contain one, e.g. nve, nvt, etc.</p>
-<p>Currently,</p>
-<ul>
-<li>the coupling is restricted to thermal physics</li>
-<li>the FE computations are done in serial on each processor.</li>
-</ul>
-<h4><a class="anchor" id="related">
-related</a></h4>
-<p>fix_modify commands for setup: <br/>
-</p>
-<ul>
-<li><a class="el" href="man_mesh_create.html">fix_modify AtC mesh create</a></li>
-<li><a class="el" href="man_mesh_quadrature.html">fix_modify AtC mesh quadrature</a></li>
-<li><a class="el" href="man_mesh_read.html">fix_modify AtC mesh read</a></li>
-<li><a class="el" href="man_mesh_write.html">fix_modify AtC mesh write</a></li>
-<li><a class="el" href="man_mesh_create_nodeset.html">fix_modify AtC mesh create_nodeset</a></li>
-<li><a class="el" href="man_mesh_add_to_nodeset.html">fix_modify AtC mesh add_to_nodeset</a></li>
-<li><a class="el" href="man_mesh_create_faceset_box.html">fix_modify AtC mesh create_faceset box</a></li>
-<li><a class="el" href="man_mesh_create_faceset_plane.html">fix_modify AtC mesh create_faceset plane</a></li>
-<li><a class="el" href="man_mesh_create_elementset.html">fix_modify AtC mesh create_elementset</a></li>
-<li><a class="el" href="man_mesh_delete_elements.html">fix_modify AtC mesh delete_elements</a></li>
-<li><a class="el" href="man_mesh_nodeset_to_elementset.html">fix_modify AtC mesh nodeset_to_elementset</a></li>
-<li><a class="el" href="man_boundary.html">fix_modify AtC boundary</a></li>
-<li><a class="el" href="man_internal_quadrature.html">fix_modify AtC internal_quadrature</a></li>
-<li><a class="el" href="man_thermal_time_integration.html">fix_modify AtC time_integration (thermal)</a></li>
-<li><a class="el" href="man_momentum_time_integration.html">fix_modify AtC time_integration (momentum)</a></li>
-<li><a class="el" href="man_electron_integration.html">fix_modify AtC extrinsic electron_integration</a></li>
-<li><a class="el" href="man_internal_element_set.html">fix_modify AtC internal_element_set</a></li>
-<li><a class="el" href="man_decomposition.html">fix_modify AtC decomposition</a></li>
-</ul>
-<p>fix_modify commands for boundary and initial conditions:<br/>
-</p>
-<ul>
-<li><a class="el" href="man_initial.html">fix_modify AtC initial</a></li>
-<li><a class="el" href="man_fix_nodes.html">fix_modify AtC fix</a></li>
-<li><a class="el" href="man_unfix_nodes.html">fix_modify AtC unfix</a></li>
-<li><a class="el" href="man_fix_flux.html">fix_modify AtC fix_flux</a></li>
-<li><a class="el" href="man_unfix_flux.html">fix_modify AtC unfix_flux</a></li>
-<li><a class="el" href="man_source.html">fix_modify AtC source</a></li>
-<li><a class="el" href="man_remove_source.html">fix_modify AtC remove_source</a></li>
-</ul>
-<p>fix_modify commands for control and filtering: <br/>
-</p>
-<ul>
-<li><a class="el" href="man_control.html">fix_modify AtC control</a></li>
-<li><a class="el" href="man_control_thermal.html">fix_modify AtC control thermal</a></li>
-<li><a class="el" href="man_control_thermal_correction_max_iterations.html">fix_modify AtC control thermal correction_max_iterations</a></li>
-<li><a class="el" href="man_control_momentum.html">fix_modify AtC control momentum</a></li>
-<li><a class="el" href="man_localized_lambda.html">fix_modify AtC control localized_lambda</a></li>
-<li><a class="el" href="man_lumped_lambda_solve.html">fix_modify AtC control lumped_lambda_solve</a></li>
-<li><a class="el" href="man_mask_direction.html">fix_modify AtC control mask_direction</a></li>
-<li><a class="el" href="man_time_filter.html">fix_modify AtC filter</a></li>
-<li><a class="el" href="man_filter_scale.html">fix_modify AtC filter scale</a></li>
-<li><a class="el" href="man_filter_type.html">fix_modify AtC filter type</a></li>
-<li><a class="el" href="man_equilibrium_start.html">fix_modify AtC equilibrium_start</a></li>
-<li><a class="el" href="man_extrinsic_exchange.html">fix_modify AtC extrinsic exchange</a></li>
-<li><a class="el" href="man_poisson_solver.html">fix_modify AtC poisson_solver</a></li>
-</ul>
-<p>fix_modify commands for output: <br/>
-</p>
-<ul>
-<li><a class="el" href="man_output.html">fix_modify AtC output</a></li>
-<li><a class="el" href="man_output_nodeset.html">fix_modify AtC output nodeset</a></li>
-<li><a class="el" href="man_output_elementset.html">fix_modify AtC output elementset</a></li>
-<li><a class="el" href="man_boundary_integral.html">fix_modify AtC output boundary_integral</a></li>
-<li><a class="el" href="man_contour_integral.html">fix_modify AtC output contour_integral</a></li>
-<li><a class="el" href="man_mesh_output.html">fix_modify AtC mesh output</a></li>
-<li><a class="el" href="man_write_restart.html">fix_modify AtC write_restart</a></li>
-<li><a class="el" href="man_read_restart.html">fix_modify AtC read_restart</a></li>
-</ul>
-<p>fix_modify commands for post-processing: <br/>
-</p>
-<ul>
-<li><a class="el" href="man_hardy_kernel.html">fix_modify AtC kernel</a></li>
-<li><a class="el" href="man_hardy_fields.html">fix_modify AtC fields</a></li>
-<li><a class="el" href="man_hardy_gradients.html">fix_modify AtC gradients</a></li>
-<li><a class="el" href="man_hardy_rates.html">fix_modify AtC rates</a></li>
-<li><a class="el" href="man_hardy_computes.html">fix_modify AtC computes</a></li>
-<li><a class="el" href="man_hardy_on_the_fly.html">fix_modify AtC on_the_fly</a></li>
-<li><a class="el" href="man_pair_interactions.html">fix_modify AtC pair_interactions/bond_interactions</a></li>
-<li><a class="el" href="man_sample_frequency.html">fix_modify AtC sample_frequency</a></li>
-<li><a class="el" href="man_set.html">fix_modify AtC set</a></li>
-</ul>
-<p>miscellaneous fix_modify commands: <br/>
-</p>
-<ul>
-<li><a class="el" href="man_atom_element_map.html">fix_modify AtC atom_element_map</a></li>
-<li><a class="el" href="man_atom_weight.html">fix_modify AtC atom_weight</a></li>
-<li><a class="el" href="man_write_atom_weights.html">fix_modify AtC write_atom_weights</a></li>
-<li><a class="el" href="man_reset_time.html">fix_modify AtC reset_time</a></li>
-<li><a class="el" href="man_reset_atomic_reference_positions.html">fix_modify AtC reset_atomic_reference_positions</a></li>
-<li><a class="el" href="man_fe_md_boundary.html">fix_modify AtC fe_md_boundary</a></li>
-<li><a class="el" href="man_boundary_faceset.html">fix_modify AtC boundary_faceset</a></li>
-<li><a class="el" href="man_consistent_fe_initialization.html">fix_modify AtC consistent_fe_initialization</a></li>
-<li><a class="el" href="man_mass_matrix.html">fix_modify AtC mass_matrix</a></li>
-<li><a class="el" href="man_material.html">fix_modify AtC material</a></li>
-<li><a class="el" href="man_atomic_charge.html">fix_modify AtC atomic_charge</a></li>
-<li><a class="el" href="man_source_integration.html">fix_modify AtC source_integration</a></li>
-<li><a class="el" href="man_temperature_definition.html">fix_modify AtC temperature_definition</a></li>
-<li><a class="el" href="man_track_displacement.html">fix_modify AtC track_displacement</a></li>
-<li><a class="el" href="man_boundary_dynamics.html">fix_modify AtC boundary_dynamics</a></li>
-<li><a class="el" href="man_add_species.html">fix_modify AtC add_species</a></li>
-<li><a class="el" href="man_add_molecule.html">fix_modify AtC add_molecule</a></li>
-<li><a class="el" href="man_remove_species.html">fix_modify AtC remove_species</a></li>
-<li><a class="el" href="man_remove_molecule.html">fix_modify AtC remove_molecule</a></li>
-</ul>
-<p>Note: a set of example input files with the attendant material files are included with this package </p>
-<h4><a class="anchor" id="default">
-default</a></h4>
-<p>none </p>
-</div>
-<hr size="1"/><address style="text-align: right;"><small>Generated on 21 Aug 2013 for ATC by&nbsp;
-<a href="http://www.doxygen.org/index.html">
-<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.6.1 </small></address>
-</body>
-</html>
diff --git a/doc/src/USER/atc/man_fix_flux.html b/doc/src/USER/atc/man_fix_flux.html
deleted file mode 100644
index 31bd5619a3..0000000000
--- a/doc/src/USER/atc/man_fix_flux.html
+++ /dev/null
@@ -1,51 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
-<title>ATC: fix_modify AtC fix_flux</title>
-<link href="tabs.css" rel="stylesheet" type="text/css"/>
-<link href="doxygen.css" rel="stylesheet" type="text/css"/>
-</head>
-<body>
-<center>
-  <a href="http://lammps.sandia.gov">LAMMPS Website</a> &nbsp; &nbsp;
-  <a href="../../Manual.html">LAMMPS Manual</a> &nbsp; &nbsp;
-  <a href="../../fix_atc.html">USER-AtC Manual</a> &nbsp; &nbsp;
-  <a href="../../Commands_all.html">Commands</a>
-</center>
-
-<hr>
-
-
-<!-- Generated by Doxygen 1.6.1 -->
-<div class="contents">
-
-
-<h3><a class="anchor" id="man_fix_flux">fix_modify AtC fix_flux </a></h3><h4><a class="anchor" id="syntax">
-syntax</a></h4>
-<p>fix_modify AtC fix_flux &lt;field&gt; &lt;face_set&gt; &lt;value | function&gt;</p>
-<ul>
-<li>&lt;field&gt; = field name valid for type of physics, temperature | electron_temperature</li>
-<li>&lt;face_set&gt; = name of set of element faces </li>
-</ul>
-<h4><a class="anchor" id="examples">
-examples</a></h4>
-<p><code> fix_modify atc fix_flux temperature faceSet 10.0 </code> <br/>
-</p>
-<h4><a class="anchor" id="description">
-description</a></h4>
-<p>Command for fixing normal fluxes e.g. heat_flux. This command only prescribes the normal component of the physical flux, e.g. heat (energy) flux. The units are in AtC units, i.e. derived from the LAMMPS length, time, and mass scales. </p>
-<h4><a class="anchor" id="restrictions">
-restrictions</a></h4>
-<p>Only normal fluxes (Neumann data) can be prescribed. </p>
-<h4><a class="anchor" id="related">
-related</a></h4>
-<p>see <a class="el" href="man_unfix_flux.html">fix_modify AtC unfix_flux</a> </p>
-<h4><a class="anchor" id="default">
-default</a></h4>
-</div>
-<hr size="1"/><address style="text-align: right;"><small>Generated on 21 Aug 2013 for ATC by&nbsp;
-<a href="http://www.doxygen.org/index.html">
-<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.6.1 </small></address>
-</body>
-</html>
diff --git a/doc/src/USER/atc/man_fix_nodes.html b/doc/src/USER/atc/man_fix_nodes.html
deleted file mode 100644
index 2245e32607..0000000000
--- a/doc/src/USER/atc/man_fix_nodes.html
+++ /dev/null
@@ -1,54 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
-<title>ATC: fix_modify AtC fix</title>
-<link href="tabs.css" rel="stylesheet" type="text/css"/>
-<link href="doxygen.css" rel="stylesheet" type="text/css"/>
-</head>
-<body>
-<center>
-  <a href="http://lammps.sandia.gov">LAMMPS Website</a> &nbsp; &nbsp;
-  <a href="../../Manual.html">LAMMPS Manual</a> &nbsp; &nbsp;
-  <a href="../../fix_atc.html">USER-AtC Manual</a> &nbsp; &nbsp;
-  <a href="../../Commands_all.html">Commands</a>
-</center>
-
-<hr>
-
-
-<!-- Generated by Doxygen 1.6.1 -->
-<div class="contents">
-
-
-<h3><a class="anchor" id="man_fix_nodes">fix_modify AtC fix </a></h3><h4><a class="anchor" id="syntax">
-syntax</a></h4>
-<p>fix_modify AtC fix &lt;field&gt; &lt;nodeset&gt; &lt;constant | function&gt;</p>
-<ul>
-<li>&lt;field&gt; = field name valid for type of physics</li>
-<li>&lt;nodeset&gt; = name of set of nodes to apply boundary condition</li>
-<li>&lt;constant | function&gt; = value or name of function followed by its parameters </li>
-</ul>
-<h4><a class="anchor" id="examples">
-examples</a></h4>
-<p><code> fix_modify AtC fix temperature groupNAME 10. </code> <br/>
- <code> fix_modify AtC fix temperature groupNAME 0 0 0 10.0 0 0 1.0 </code> <br/>
- </p>
-<h4><a class="anchor" id="description">
-description</a></h4>
-<p>Creates a constraint on the values of the specified field at specified nodes. </p>
-<h4><a class="anchor" id="restrictions">
-restrictions</a></h4>
-<p>keyword 'all' reserved in nodeset name </p>
-<h4><a class="anchor" id="related">
-related</a></h4>
-<p>see <a class="el" href="man_unfix_nodes.html">fix_modify AtC unfix</a> </p>
-<h4><a class="anchor" id="default">
-default</a></h4>
-<p>none </p>
-</div>
-<hr size="1"/><address style="text-align: right;"><small>Generated on 21 Aug 2013 for ATC by&nbsp;
-<a href="http://www.doxygen.org/index.html">
-<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.6.1 </small></address>
-</body>
-</html>
diff --git a/doc/src/USER/atc/man_hardy_computes.html b/doc/src/USER/atc/man_hardy_computes.html
deleted file mode 100644
index ec2dc3ccb9..0000000000
--- a/doc/src/USER/atc/man_hardy_computes.html
+++ /dev/null
@@ -1,65 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
-<title>ATC: fix_modify AtC computes</title>
-<link href="tabs.css" rel="stylesheet" type="text/css"/>
-<link href="doxygen.css" rel="stylesheet" type="text/css"/>
-</head>
-<body>
-<center>
-  <a href="http://lammps.sandia.gov">LAMMPS Website</a> &nbsp; &nbsp;
-  <a href="../../Manual.html">LAMMPS Manual</a> &nbsp; &nbsp;
-  <a href="../../fix_atc.html">USER-AtC Manual</a> &nbsp; &nbsp;
-  <a href="../../Commands_all.html">Commands</a>
-</center>
-
-<hr>
-
-
-<!-- Generated by Doxygen 1.6.1 -->
-<div class="contents">
-
-
-<h3><a class="anchor" id="man_hardy_computes">fix_modify AtC computes </a></h3><h4><a class="anchor" id="syntax">
-syntax</a></h4>
-<p>fix_modify AtC computes &lt;add | delete&gt; [per-atom compute id] &lt;volume | number&gt; <br/>
-</p>
-<ul>
-<li>add | delete (keyword) = add or delete the calculation of an equivalent continuum field for the specified per-atom compute as volume or number density quantity <br/>
-</li>
-<li>per-atom compute id = name/id for per-atom compute, fields can be calculated for all per-atom computes available from LAMMPS <br/>
-</li>
-<li>volume | number (keyword) = field created is a per-unit-volume quantity or a per-atom quantity as weighted by kernel functions <br/>
-</li>
-</ul>
-<h4><a class="anchor" id="examples">
-examples</a></h4>
-<p><code> compute virial all stress/atom </code> <br/>
- <code> fix_modify AtC computes add virial volume </code> <br/>
- <code> fix_modify AtC computes delete virial </code> <br/>
- <br/>
- <code> compute centrosymmetry all centro/atom </code> <br/>
- <code> fix_modify AtC computes add centrosymmetry number </code> <br/>
- </p>
-<h4><a class="anchor" id="description">
-description</a></h4>
-<p>Calculates continuum fields corresponding to specified per-atom computes created by LAMMPS <br/>
- </p>
-<h4><a class="anchor" id="restrictions">
-restrictions</a></h4>
-<p>Must be used with the hardy/field type of AtC fix ( see <a class="el" href="../../fix_atc.html">fix atc command</a> ) <br/>
- Per-atom compute must be specified before corresponding continuum field can be requested <br/>
- </p>
-<h4><a class="anchor" id="related">
-related</a></h4>
-<p>See manual page for compute </p>
-<h4><a class="anchor" id="default">
-default</a></h4>
-<p>No defaults exist for this command </p>
-</div>
-<hr size="1"/><address style="text-align: right;"><small>Generated on 21 Aug 2013 for ATC by&nbsp;
-<a href="http://www.doxygen.org/index.html">
-<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.6.1 </small></address>
-</body>
-</html>
diff --git a/doc/src/USER/atc/man_hardy_fields.html b/doc/src/USER/atc/man_hardy_fields.html
deleted file mode 100644
index 483e5be6bd..0000000000
--- a/doc/src/USER/atc/man_hardy_fields.html
+++ /dev/null
@@ -1,81 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
-<title>ATC: fix_modify AtC fields</title>
-<link href="tabs.css" rel="stylesheet" type="text/css"/>
-<link href="doxygen.css" rel="stylesheet" type="text/css"/>
-</head>
-<body>
-<center>
-  <a href="http://lammps.sandia.gov">LAMMPS Website</a> &nbsp; &nbsp;
-  <a href="../../Manual.html">LAMMPS Manual</a> &nbsp; &nbsp;
-  <a href="../../fix_atc.html">USER-AtC Manual</a> &nbsp; &nbsp;
-  <a href="../../Commands_all.html">Commands</a>
-</center>
-
-<hr>
-
-
-<!-- Generated by Doxygen 1.6.1 -->
-<div class="contents">
-
-
-<h3><a class="anchor" id="man_hardy_fields">fix_modify AtC fields </a></h3><h4><a class="anchor" id="syntax">
-syntax</a></h4>
-<p>fix_modify AtC fields &lt;all | none&gt; <br/>
- fix_modify AtC fields &lt;add | delete&gt; &lt;list_of_fields&gt; <br/>
-</p>
-<ul>
-<li>all | none (keyword) = output all or no fields <br/>
-</li>
-<li>add | delete (keyword) = add or delete the listed output fields <br/>
-</li>
-<li>fields (keyword) = <br/>
- density : mass per unit volume <br/>
- displacement : displacement vector <br/>
- momentum : momentum per unit volume <br/>
- velocity : defined by momentum divided by density <br/>
- projected_velocity : simple kernel estimation of atomic velocities <br/>
- temperature : temperature derived from the relative atomic kinetic energy (as done by ) <br/>
- kinetic_temperature : temperature derived from the full kinetic energy <br/>
- number_density : simple kernel estimation of number of atoms per unit volume <br/>
- stress : Cauchy stress tensor for eulerian analysis (atom_element_map), or 1st Piola-Kirchhoff stress tensor for lagrangian analysis <br/>
- transformed_stress : 1st Piola-Kirchhoff stress tensor for eulerian analysis (atom_element_map), or Cauchy stress tensor for lagrangian analysis <br/>
- heat_flux : spatial heat flux vector for eulerian, or referential heat flux vector for lagrangian <br/>
- potential_energy : potential energy per unit volume <br/>
- kinetic_energy : kinetic energy per unit volume <br/>
- thermal_energy : thermal energy (kinetic energy - continuum kinetic energy) per unit volume <br/>
- internal_energy : total internal energy (potential + thermal) per unit volume <br/>
- energy : total energy (potential + kinetic) per unit volume <br/>
- number_density : number of atoms per unit volume <br/>
- eshelby_stress: configurational stress (energy-momentum) tensor defined by Eshelby [References: Philos. Trans. Royal Soc. London A, Math. Phys. Sci., Vol. 244, No. 877 (1951) pp. 87-112; J. Elasticity, Vol. 5, Nos. 3-4 (1975) pp. 321-335] <br/>
- vacancy_concentration: volume fraction of vacancy content <br/>
- type_concentration: volume fraction of a specific atom type <br/>
- </li>
-</ul>
-<h4><a class="anchor" id="examples">
-examples</a></h4>
-<p><code> fix_modify AtC fields add velocity temperature </code> </p>
-<h4><a class="anchor" id="description">
-description</a></h4>
-<p>Allows modification of the fields calculated and output by the transfer class. The commands are cumulative, e.g.<br/>
- <code> fix_modify AtC fields none </code> <br/>
- followed by <br/>
- <code> fix_modify AtC fields add velocity temperature </code> <br/>
- will only output the velocity and temperature fields. </p>
-<h4><a class="anchor" id="restrictions">
-restrictions</a></h4>
-<p>Must be used with the hardy/field type of AtC fix, see <a class="el" href="../../fix_atc.html">fix atc command</a>. Currently, the stress and heat flux formulas are only correct for central force potentials, e.g. Lennard-Jones and EAM but not Stillinger-Weber. </p>
-<h4><a class="anchor" id="related">
-related</a></h4>
-<p>See <a class="el" href="man_hardy_gradients.html">fix_modify AtC gradients</a> , <a class="el" href="man_hardy_rates.html">fix_modify AtC rates</a> and <a class="el" href="man_hardy_computes.html">fix_modify AtC computes</a> </p>
-<h4><a class="anchor" id="default">
-default</a></h4>
-<p>By default, no fields are output </p>
-</div>
-<hr size="1"/><address style="text-align: right;"><small>Generated on 21 Aug 2013 for ATC by&nbsp;
-<a href="http://www.doxygen.org/index.html">
-<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.6.1 </small></address>
-</body>
-</html>
diff --git a/doc/src/USER/atc/man_hardy_gradients.html b/doc/src/USER/atc/man_hardy_gradients.html
deleted file mode 100644
index 1874ad152e..0000000000
--- a/doc/src/USER/atc/man_hardy_gradients.html
+++ /dev/null
@@ -1,55 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
-<title>ATC: fix_modify AtC gradients</title>
-<link href="tabs.css" rel="stylesheet" type="text/css"/>
-<link href="doxygen.css" rel="stylesheet" type="text/css"/>
-</head>
-<body>
-<center>
-  <a href="http://lammps.sandia.gov">LAMMPS Website</a> &nbsp; &nbsp;
-  <a href="../../Manual.html">LAMMPS Manual</a> &nbsp; &nbsp;
-  <a href="../../fix_atc.html">USER-AtC Manual</a> &nbsp; &nbsp;
-  <a href="../../Commands_all.html">Commands</a>
-</center>
-
-<hr>
-
-
-<!-- Generated by Doxygen 1.6.1 -->
-<div class="contents">
-
-
-<h3><a class="anchor" id="man_hardy_gradients">fix_modify AtC gradients </a></h3><h4><a class="anchor" id="syntax">
-syntax</a></h4>
-<p>fix_modify AtC gradients &lt;add | delete&gt; &lt;list_of_fields&gt; <br/>
-</p>
-<ul>
-<li>add | delete (keyword) = add or delete the calculation of gradients for the listed output fields <br/>
-</li>
-<li>fields (keyword) = <br/>
- gradients can be calculated for all fields listed in <a class="el" href="man_hardy_fields.html">fix_modify AtC fields</a></li>
-</ul>
-<h4><a class="anchor" id="examples">
-examples</a></h4>
-<p><code> fix_modify AtC gradients add temperature velocity stress </code> <br/>
- <code> fix_modify AtC gradients delete velocity </code> <br/>
- </p>
-<h4><a class="anchor" id="description">
-description</a></h4>
-<p>Requests calculation and ouput of gradients of the fields from the transfer class. These gradients will be with regard to spatial or material coordinate for eulerian or lagrangian analysis, respectively, as specified by atom_element_map (see <a class="el" href="man_atom_element_map.html">fix_modify AtC atom_element_map</a> ) </p>
-<h4><a class="anchor" id="restrictions">
-restrictions</a></h4>
-<p>Must be used with the hardy/field type of AtC fix ( see <a class="el" href="../../fix_atc.html">fix atc command</a> ) </p>
-<h4><a class="anchor" id="related">
-related</a></h4>
-<h4><a class="anchor" id="default">
-default</a></h4>
-<p>No gradients are calculated by default </p>
-</div>
-<hr size="1"/><address style="text-align: right;"><small>Generated on 21 Aug 2013 for ATC by&nbsp;
-<a href="http://www.doxygen.org/index.html">
-<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.6.1 </small></address>
-</body>
-</html>
diff --git a/doc/src/USER/atc/man_hardy_kernel.html b/doc/src/USER/atc/man_hardy_kernel.html
deleted file mode 100644
index 620b9b1d36..0000000000
--- a/doc/src/USER/atc/man_hardy_kernel.html
+++ /dev/null
@@ -1,63 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
-<title>ATC: fix_modify AtC kernel</title>
-<link href="tabs.css" rel="stylesheet" type="text/css"/>
-<link href="doxygen.css" rel="stylesheet" type="text/css"/>
-</head>
-<body>
-<center>
-  <a href="http://lammps.sandia.gov">LAMMPS Website</a> &nbsp; &nbsp;
-  <a href="../../Manual.html">LAMMPS Manual</a> &nbsp; &nbsp;
-  <a href="../../fix_atc.html">USER-AtC Manual</a> &nbsp; &nbsp;
-  <a href="../../Commands_all.html">Commands</a>
-</center>
-
-<hr>
-
-
-<!-- Generated by Doxygen 1.6.1 -->
-<div class="contents">
-
-
-<h3><a class="anchor" id="man_hardy_kernel">fix_modify AtC kernel </a></h3><h4><a class="anchor" id="syntax">
-syntax</a></h4>
-<p>fix_modify AtC kernel &lt;type&gt; &lt;parameters&gt;</p>
-<ul>
-<li>type (keyword) = step, cell, cubic_bar, cubic_cylinder, cubic_sphere, quartic_bar, quartic_cylinder, quartic_sphere <br/>
-</li>
-<li>parameters :<br/>
- step = radius (double) <br/>
- cell = hx, hy, hz (double) or h (double) <br/>
- cubic_bar = half-width (double) <br/>
- cubic_cylinder = radius (double) <br/>
- cubic_sphere = radius (double) <br/>
- quartic_bar = half-width (double) <br/>
- quartic_cylinder = radius (double) <br/>
- quartic_sphere = radius (double) <br/>
- </li>
-</ul>
-<h4><a class="anchor" id="examples">
-examples</a></h4>
-<p><code> fix_modify AtC kernel cell 1.0 1.0 1.0 </code> <br/>
- <code> fix_modify AtC kernel quartic_sphere 10.0 </code> </p>
-<h4><a class="anchor" id="description">
-description</a></h4>
-<h4><a class="anchor" id="restrictions">
-restrictions</a></h4>
-<p>Must be used with the hardy AtC fix <br/>
- For bar kernel types, half-width oriented along x-direction <br/>
- For cylinder kernel types, cylindrical axis is assumed to be in z-direction <br/>
- ( see <a class="el" href="../../fix_atc.html">fix atc command</a> ) </p>
-<h4><a class="anchor" id="related">
-related</a></h4>
-<h4><a class="anchor" id="default">
-default</a></h4>
-<p>No default </p>
-</div>
-<hr size="1"/><address style="text-align: right;"><small>Generated on 21 Aug 2013 for ATC by&nbsp;
-<a href="http://www.doxygen.org/index.html">
-<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.6.1 </small></address>
-</body>
-</html>
diff --git a/doc/src/USER/atc/man_hardy_on_the_fly.html b/doc/src/USER/atc/man_hardy_on_the_fly.html
deleted file mode 100644
index 04d24ff029..0000000000
--- a/doc/src/USER/atc/man_hardy_on_the_fly.html
+++ /dev/null
@@ -1,58 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
-<title>ATC: fix_modify AtC on_the_fly</title>
-<link href="tabs.css" rel="stylesheet" type="text/css"/>
-<link href="doxygen.css" rel="stylesheet" type="text/css"/>
-</head>
-<body>
-<center>
-  <a href="http://lammps.sandia.gov">LAMMPS Website</a> &nbsp; &nbsp;
-  <a href="../../Manual.html">LAMMPS Manual</a> &nbsp; &nbsp;
-  <a href="../../fix_atc.html">USER-AtC Manual</a> &nbsp; &nbsp;
-  <a href="../../Commands_all.html">Commands</a>
-</center>
-
-<hr>
-
-
-<!-- Generated by Doxygen 1.6.1 -->
-<div class="contents">
-
-
-<h3><a class="anchor" id="man_hardy_on_the_fly">fix_modify AtC on_the_fly </a></h3><h4><a class="anchor" id="syntax">
-syntax</a></h4>
-<p>fix_modify AtC on_the_fly &lt;bond | kernel&gt; &lt;optional on | off&gt; <br/>
- - bond | kernel (keyword) = specifies on-the-fly calculation of bond or kernel matrix elements <br/>
-</p>
-<ul>
-<li>on | off (keyword) = activate or discontinue on-the-fly mode <br/>
- </li>
-</ul>
-<h4><a class="anchor" id="examples">
-examples</a></h4>
-<p><code> fix_modify AtC on_the_fly bond on </code> <br/>
- <code> fix_modify AtC on_the_fly kernel </code> <br/>
- <code> fix_modify AtC on_the_fly kernel off </code> <br/>
- </p>
-<h4><a class="anchor" id="description">
-description</a></h4>
-<p>Overrides normal mode of pre-calculating and storing bond pair-to-node a nd kernel atom-to-node matrices. If activated, will calculate elements of t hese matrices during repeated calls of field computations (i.e. "on-the-fly") and not store them for future use. <br/>
- on flag is optional - if omitted, on_the_fly will be activated for the s pecified matrix. Can be deactivated using off flag. <br/>
- </p>
-<h4><a class="anchor" id="restrictions">
-restrictions</a></h4>
-<p>Must be used with the hardy/field type of AtC fix ( see <a class="el" href="../../fix_atc.html">fix atc command</a> ) </p>
-<h4><a class="anchor" id="related">
-related</a></h4>
-<h4><a class="anchor" id="default">
-default</a></h4>
-<p>By default, on-the-fly calculation is not active (i.e. off). However, code does a memory allocation check to determine if it can store all needed bond and kernel matrix ele ments. If this allocation fails, on-the-fly is activated. <br/>
- </p>
-</div>
-<hr size="1"/><address style="text-align: right;"><small>Generated on 21 Aug 2013 for ATC by&nbsp;
-<a href="http://www.doxygen.org/index.html">
-<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.6.1 </small></address>
-</body>
-</html>
diff --git a/doc/src/USER/atc/man_hardy_rates.html b/doc/src/USER/atc/man_hardy_rates.html
deleted file mode 100644
index 337a92517e..0000000000
--- a/doc/src/USER/atc/man_hardy_rates.html
+++ /dev/null
@@ -1,56 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
-<title>ATC: fix_modify AtC rates</title>
-<link href="tabs.css" rel="stylesheet" type="text/css"/>
-<link href="doxygen.css" rel="stylesheet" type="text/css"/>
-</head>
-<body>
-<center>
-  <a href="http://lammps.sandia.gov">LAMMPS Website</a> &nbsp; &nbsp;
-  <a href="../../Manual.html">LAMMPS Manual</a> &nbsp; &nbsp;
-  <a href="../../fix_atc.html">USER-AtC Manual</a> &nbsp; &nbsp;
-  <a href="../../Commands_all.html">Commands</a>
-</center>
-
-<hr>
-
-
-<!-- Generated by Doxygen 1.6.1 -->
-<div class="contents">
-
-
-<h3><a class="anchor" id="man_hardy_rates">fix_modify AtC rates </a></h3><h4><a class="anchor" id="syntax">
-syntax</a></h4>
-<p>fix_modify AtC rates &lt;add | delete&gt; &lt;list_of_fields&gt; <br/>
-</p>
-<ul>
-<li>add | delete (keyword) = add or delete the calculation of rates (time derivatives) for the listed output fields <br/>
-</li>
-<li>fields (keyword) = <br/>
- rates can be calculated for all fields listed in <a class="el" href="man_hardy_fields.html">fix_modify AtC fields</a></li>
-</ul>
-<h4><a class="anchor" id="examples">
-examples</a></h4>
-<p><code> fix_modify AtC rates add temperature velocity stress </code> <br/>
- <code> fix_modify AtC rates delete stress </code> <br/>
- </p>
-<h4><a class="anchor" id="description">
-description</a></h4>
-<p>Requests calculation and ouput of rates (time derivatives) of the fields from the transfer class. For eulerian analysis (see <a class="el" href="man_atom_element_map.html">fix_modify AtC atom_element_map</a> ), these rates are the partial time derivatives of the nodal fields, not the full (material) time derivatives. <br/>
- </p>
-<h4><a class="anchor" id="restrictions">
-restrictions</a></h4>
-<p>Must be used with the hardy/field type of AtC fix ( see <a class="el" href="../../fix_atc.html">fix atc command</a> ) </p>
-<h4><a class="anchor" id="related">
-related</a></h4>
-<h4><a class="anchor" id="default">
-default</a></h4>
-<p>No rates are calculated by default </p>
-</div>
-<hr size="1"/><address style="text-align: right;"><small>Generated on 21 Aug 2013 for ATC by&nbsp;
-<a href="http://www.doxygen.org/index.html">
-<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.6.1 </small></address>
-</body>
-</html>
diff --git a/doc/src/USER/atc/man_initial.html b/doc/src/USER/atc/man_initial.html
deleted file mode 100644
index c8348c45ed..0000000000
--- a/doc/src/USER/atc/man_initial.html
+++ /dev/null
@@ -1,49 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
-<title>ATC: fix_modify AtC initial</title>
-<link href="tabs.css" rel="stylesheet" type="text/css"/>
-<link href="doxygen.css" rel="stylesheet" type="text/css"/>
-</head>
-<body>
-<center>
-  <a href="http://lammps.sandia.gov">LAMMPS Website</a> &nbsp; &nbsp;
-  <a href="../../Manual.html">LAMMPS Manual</a> &nbsp; &nbsp;
-  <a href="../../fix_atc.html">USER-AtC Manual</a> &nbsp; &nbsp;
-  <a href="../../Commands_all.html">Commands</a>
-</center>
-
-<hr>
-
-
-<!-- Generated by Doxygen 1.6.1 -->
-<div class="contents">
-
-
-<h3><a class="anchor" id="man_initial">fix_modify AtC initial </a></h3><h4><a class="anchor" id="syntax">
-syntax</a></h4>
-<p>fix_modify AtC initial &lt;field&gt; &lt;nodeset&gt; &lt;constant | function&gt;</p>
-<ul>
-<li>&lt;field&gt; = field name valid for type of physics, temperature | electron_temperature</li>
-<li>&lt;nodeset&gt; = name of set of nodes to apply initial condition</li>
-<li>&lt;constant | function&gt; = value or name of function followed by its parameters </li>
-</ul>
-<h4><a class="anchor" id="examples">
-examples</a></h4>
-<p><code> fix_modify atc initial temperature groupNAME 10. </code> </p>
-<h4><a class="anchor" id="description">
-description</a></h4>
-<p>Sets the initial values for the specified field at the specified nodes. </p>
-<h4><a class="anchor" id="restrictions">
-restrictions</a></h4>
-<p>keyword 'all' reserved in nodeset name </p>
-<h4><a class="anchor" id="default">
-default</a></h4>
-<p>none </p>
-</div>
-<hr size="1"/><address style="text-align: right;"><small>Generated on 21 Aug 2013 for ATC by&nbsp;
-<a href="http://www.doxygen.org/index.html">
-<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.6.1 </small></address>
-</body>
-</html>
diff --git a/doc/src/USER/atc/man_internal_atom_integrate.html b/doc/src/USER/atc/man_internal_atom_integrate.html
deleted file mode 100644
index f76607cc91..0000000000
--- a/doc/src/USER/atc/man_internal_atom_integrate.html
+++ /dev/null
@@ -1,38 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
-<title>ATC: fix_modify AtC internal_atom_integrate</title>
-<link href="tabs.css" rel="stylesheet" type="text/css"/>
-<link href="doxygen.css" rel="stylesheet" type="text/css"/>
-</head>
-<body>
-<center>
-  <a href="http://lammps.sandia.gov">LAMMPS Website</a> &nbsp; &nbsp;
-  <a href="../../Manual.html">LAMMPS Manual</a> &nbsp; &nbsp;
-  <a href="../../fix_atc.html">USER-AtC Manual</a> &nbsp; &nbsp;
-  <a href="../../Commands_all.html">Commands</a>
-</center>
-
-<hr>
-
-
-<!-- Generated by Doxygen 1.6.1 -->
-<div class="contents">
-
-
-<h3><a class="anchor" id="man_internal_atom_integrate">fix_modify AtC internal_atom_integrate </a></h3><h4><a class="anchor" id="syntax">
-syntax</a></h4>
-<p>fix_modify AtC internal_atom_integrate &lt;on | off&gt; <code> fix_modify AtC internal_atom_integrate on </code> </p>
-<h4><a class="anchor" id="description">
-description</a></h4>
-<p>Has AtC perform time integration for the atoms in the group on which it operates. This does not include boundary atoms. </p>
-<h4><a class="anchor" id="default">
-default</a></h4>
-<p>on for coupling methods, off for post-processors off </p>
-</div>
-<hr size="1"/><address style="text-align: right;"><small>Generated on 21 Aug 2013 for ATC by&nbsp;
-<a href="http://www.doxygen.org/index.html">
-<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.6.1 </small></address>
-</body>
-</html>
diff --git a/doc/src/USER/atc/man_internal_element_set.html b/doc/src/USER/atc/man_internal_element_set.html
deleted file mode 100644
index a5d893f2a3..0000000000
--- a/doc/src/USER/atc/man_internal_element_set.html
+++ /dev/null
@@ -1,50 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
-<title>ATC: fix_modify AtC internal_element_set</title>
-<link href="tabs.css" rel="stylesheet" type="text/css"/>
-<link href="doxygen.css" rel="stylesheet" type="text/css"/>
-</head>
-<body>
-<center>
-  <a href="http://lammps.sandia.gov">LAMMPS Website</a> &nbsp; &nbsp;
-  <a href="../../Manual.html">LAMMPS Manual</a> &nbsp; &nbsp;
-  <a href="../../fix_atc.html">USER-AtC Manual</a> &nbsp; &nbsp;
-  <a href="../../Commands_all.html">Commands</a>
-</center>
-
-<hr>
-
-
-<!-- Generated by Doxygen 1.6.1 -->
-<div class="contents">
-
-
-<h3><a class="anchor" id="man_internal_element_set">fix_modify AtC internal_element_set </a></h3><h4><a class="anchor" id="syntax">
-syntax</a></h4>
-<p>fix_modify AtC internal_element_set &lt;element-set-name&gt;</p>
-<ul>
-<li>&lt;element-set-name&gt; = name of element set defining internal region, or off </li>
-</ul>
-<h4><a class="anchor" id="examples">
-examples</a></h4>
-<p><code> fix_modify AtC internal_element_set myElementSet </code> <code> fix_modify AtC internal_element_set off </code> </p>
-<h4><a class="anchor" id="description">
-description</a></h4>
-<p>Enables AtC to base the region for internal atoms to be an element set. If no ghost atoms are used, all the AtC atoms must be constrained to remain in this element set by the user, e.g., with walls. If boundary atoms are used in conjunction with Eulerian atom maps AtC will partition all atoms of a boundary or internal type to be of type internal if they are in the internal region or to be of type boundary otherwise. </p>
-<h4><a class="anchor" id="restrictions">
-restrictions</a></h4>
-<p>If boundary atoms are used in conjunction with Eulerian atom maps, the Eulerian reset frequency must be an integer multiple of the Lammps reneighbor frequency </p>
-<h4><a class="anchor" id="related">
-related</a></h4>
-<p>see atom_element_map_type and boundary </p>
-<h4><a class="anchor" id="default">
-default</a></h4>
-<p>off </p>
-</div>
-<hr size="1"/><address style="text-align: right;"><small>Generated on 21 Aug 2013 for ATC by&nbsp;
-<a href="http://www.doxygen.org/index.html">
-<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.6.1 </small></address>
-</body>
-</html>
diff --git a/doc/src/USER/atc/man_internal_quadrature.html b/doc/src/USER/atc/man_internal_quadrature.html
deleted file mode 100644
index 6af543cbae..0000000000
--- a/doc/src/USER/atc/man_internal_quadrature.html
+++ /dev/null
@@ -1,48 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
-<title>ATC: fix_modify AtC internal_quadrature</title>
-<link href="tabs.css" rel="stylesheet" type="text/css"/>
-<link href="doxygen.css" rel="stylesheet" type="text/css"/>
-</head>
-<body>
-<center>
-  <a href="http://lammps.sandia.gov">LAMMPS Website</a> &nbsp; &nbsp;
-  <a href="../../Manual.html">LAMMPS Manual</a> &nbsp; &nbsp;
-  <a href="../../fix_atc.html">USER-AtC Manual</a> &nbsp; &nbsp;
-  <a href="../../Commands_all.html">Commands</a>
-</center>
-
-<hr>
-
-
-<!-- Generated by Doxygen 1.6.1 -->
-<div class="contents">
-
-
-<h3><a class="anchor" id="man_internal_quadrature">fix_modify AtC internal_quadrature </a></h3><h4><a class="anchor" id="syntax">
-syntax</a></h4>
-<p>fix_modify atc internal_quadrature &lt;on | off&gt; [region] </p>
-<h4><a class="anchor" id="examples">
-examples</a></h4>
-<p><code> fix_modify atc internal_quadrature off </code> </p>
-<h4><a class="anchor" id="description">
-description</a></h4>
-<p>Command to use or not use atomic quadrature on internal elements fully filled with atoms. By turning the internal quadrature off these elements do not contribute to the governing PDE and the fields at the internal nodes follow the weighted averages of the atomic data. </p>
-<h4><a class="anchor" id="optional">
-optional</a></h4>
-<p>Optional region tag specifies which finite element nodes will be treated as being within the MD region. This option is only valid with internal_quadrature off. </p>
-<h4><a class="anchor" id="restrictions">
-restrictions</a></h4>
-<h4><a class="anchor" id="related">
-related</a></h4>
-<h4><a class="anchor" id="default">
-default</a></h4>
-<p>on </p>
-</div>
-<hr size="1"/><address style="text-align: right;"><small>Generated on 21 Aug 2013 for ATC by&nbsp;
-<a href="http://www.doxygen.org/index.html">
-<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.6.1 </small></address>
-</body>
-</html>
diff --git a/doc/src/USER/atc/man_kernel_function.html b/doc/src/USER/atc/man_kernel_function.html
deleted file mode 100644
index cb02c05c23..0000000000
--- a/doc/src/USER/atc/man_kernel_function.html
+++ /dev/null
@@ -1,62 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
-<title>ATC: fix_modify AtC kernel</title>
-<link href="tabs.css" rel="stylesheet" type="text/css"/>
-<link href="doxygen.css" rel="stylesheet" type="text/css"/>
-</head>
-<body>
-<center>
-  <a href="http://lammps.sandia.gov">LAMMPS Website</a> &nbsp; &nbsp;
-  <a href="../../Manual.html">LAMMPS Manual</a> &nbsp; &nbsp;
-  <a href="../../fix_atc.html">USER-AtC Manual</a> &nbsp; &nbsp;
-  <a href="../../Commands_all.html">Commands</a>
-</center>
-
-<hr>
-
-
-<!-- Generated by Doxygen 1.6.1 -->
-<div class="contents">
-
-
-<h3><a class="anchor" id="man_kernel_function">fix_modify AtC kernel </a></h3><h4><a class="anchor" id="syntax">
-syntax</a></h4>
-<p>fix_modify AtC kernel &lt;type&gt; &lt;parameters&gt;</p>
-<ul>
-<li>type (keyword) = step, cell, cubic_bar, cubic_cylinder, cubic_sphere, quartic_bar, quartic_cylinder, quartic_sphere <br/>
-</li>
-<li>parameters :<br/>
- step = radius (double) <br/>
- cell = hx, hy, hz (double) or h (double) <br/>
- cubic_bar = half-width (double) <br/>
- cubic_cylinder = radius (double) <br/>
- cubic_sphere = radius (double) <br/>
- quartic_bar = half-width (double) <br/>
- quartic_cylinder = radius (double) <br/>
- quartic_sphere = radius (double) <br/>
- </li>
-</ul>
-<h4><a class="anchor" id="examples">
-examples</a></h4>
-<p>fix_modify AtC kernel cell 1.0 1.0 1.0 fix_modify AtC kernel quartic_sphere 10.0 </p>
-<h4><a class="anchor" id="description">
-description</a></h4>
-<h4><a class="anchor" id="restrictions">
-restrictions</a></h4>
-<p>Must be used with the hardy AtC fix <br/>
- For bar kernel types, half-width oriented along x-direction <br/>
- For cylinder kernel types, cylindrical axis is assumed to be in z-direction <br/>
- ( see <a class="el" href="../../fix_atc.html">fix atc command</a> ) </p>
-<h4><a class="anchor" id="related">
-related</a></h4>
-<h4><a class="anchor" id="default">
-default</a></h4>
-<p>No default </p>
-</div>
-<hr size="1"/><address style="text-align: right;"><small>Generated on 21 Aug 2013 for ATC by&nbsp;
-<a href="http://www.doxygen.org/index.html">
-<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.6.1 </small></address>
-</body>
-</html>
diff --git a/doc/src/USER/atc/man_localized_lambda.html b/doc/src/USER/atc/man_localized_lambda.html
deleted file mode 100644
index 88442d63a1..0000000000
--- a/doc/src/USER/atc/man_localized_lambda.html
+++ /dev/null
@@ -1,46 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
-<title>ATC: fix_modify AtC control localized_lambda</title>
-<link href="tabs.css" rel="stylesheet" type="text/css"/>
-<link href="doxygen.css" rel="stylesheet" type="text/css"/>
-</head>
-<body>
-<center>
-  <a href="http://lammps.sandia.gov">LAMMPS Website</a> &nbsp; &nbsp;
-  <a href="../../Manual.html">LAMMPS Manual</a> &nbsp; &nbsp;
-  <a href="../../fix_atc.html">USER-AtC Manual</a> &nbsp; &nbsp;
-  <a href="../../Commands_all.html">Commands</a>
-</center>
-
-<hr>
-
-
-<!-- Generated by Doxygen 1.6.1 -->
-<div class="contents">
-
-
-<h3><a class="anchor" id="man_localized_lambda">fix_modify AtC control localized_lambda </a></h3><h4><a class="anchor" id="syntax">
-syntax</a></h4>
-<p>fix_modify AtC control localized_lambda &lt;on|off&gt; </p>
-<h4><a class="anchor" id="examples">
-examples</a></h4>
-<p><code> fix_modify atc control localized_lambda on </code> <br/>
- </p>
-<h4><a class="anchor" id="description">
-description</a></h4>
-<p>Turns on localization algorithms for control algorithms to restrict the influence of FE coupling or boundary conditions to a region near the boundary of the MD region. Control algorithms will not affect atoms in elements not possessing faces on the boundary of the region. Flux-based control is localized via row-sum lumping while quantity control is done by solving a truncated matrix equation. </p>
-<h4><a class="anchor" id="restrictions">
-restrictions</a></h4>
-<h4><a class="anchor" id="related">
-related</a></h4>
-<h4><a class="anchor" id="default">
-default</a></h4>
-<p>Default is off. </p>
-</div>
-<hr size="1"/><address style="text-align: right;"><small>Generated on 21 Aug 2013 for ATC by&nbsp;
-<a href="http://www.doxygen.org/index.html">
-<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.6.1 </small></address>
-</body>
-</html>
diff --git a/doc/src/USER/atc/man_lumped_lambda_solve.html b/doc/src/USER/atc/man_lumped_lambda_solve.html
deleted file mode 100644
index 89aabebd3c..0000000000
--- a/doc/src/USER/atc/man_lumped_lambda_solve.html
+++ /dev/null
@@ -1,45 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
-<title>ATC: fix_modify AtC control lumped_lambda_solve</title>
-<link href="tabs.css" rel="stylesheet" type="text/css"/>
-<link href="doxygen.css" rel="stylesheet" type="text/css"/>
-</head>
-<body>
-<center>
-  <a href="http://lammps.sandia.gov">LAMMPS Website</a> &nbsp; &nbsp;
-  <a href="../../Manual.html">LAMMPS Manual</a> &nbsp; &nbsp;
-  <a href="../../fix_atc.html">USER-AtC Manual</a> &nbsp; &nbsp;
-  <a href="../../Commands_all.html">Commands</a>
-</center>
-
-<hr>
-
-
-<!-- Generated by Doxygen 1.6.1 -->
-<div class="contents">
-
-
-<h3><a class="anchor" id="man_lumped_lambda_solve">fix_modify AtC control lumped_lambda_solve </a></h3><h4><a class="anchor" id="syntax">
-syntax</a></h4>
-<p>fix_modify AtC control lumped_lambda_solve &lt;on|off&gt; </p>
-<h4><a class="anchor" id="examples">
-examples</a></h4>
-<p><code> fix_modify atc control lumped_lambda_solve on </code> <br/>
- </p>
-<h4><a class="anchor" id="description">
-description</a></h4>
-<p>Command to use or not use lumped matrix for lambda solve </p>
-<h4><a class="anchor" id="restrictions">
-restrictions</a></h4>
-<h4><a class="anchor" id="related">
-related</a></h4>
-<h4><a class="anchor" id="default">
-default</a></h4>
-</div>
-<hr size="1"/><address style="text-align: right;"><small>Generated on 21 Aug 2013 for ATC by&nbsp;
-<a href="http://www.doxygen.org/index.html">
-<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.6.1 </small></address>
-</body>
-</html>
diff --git a/doc/src/USER/atc/man_mask_direction.html b/doc/src/USER/atc/man_mask_direction.html
deleted file mode 100644
index ea5a6e357b..0000000000
--- a/doc/src/USER/atc/man_mask_direction.html
+++ /dev/null
@@ -1,45 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
-<title>ATC: fix_modify AtC control mask_direction</title>
-<link href="tabs.css" rel="stylesheet" type="text/css"/>
-<link href="doxygen.css" rel="stylesheet" type="text/css"/>
-</head>
-<body>
-<center>
-  <a href="http://lammps.sandia.gov">LAMMPS Website</a> &nbsp; &nbsp;
-  <a href="../../Manual.html">LAMMPS Manual</a> &nbsp; &nbsp;
-  <a href="../../fix_atc.html">USER-AtC Manual</a> &nbsp; &nbsp;
-  <a href="../../Commands_all.html">Commands</a>
-</center>
-
-<hr>
-
-
-<!-- Generated by Doxygen 1.6.1 -->
-<div class="contents">
-
-
-<h3><a class="anchor" id="man_mask_direction">fix_modify AtC control mask_direction </a></h3><h4><a class="anchor" id="syntax">
-syntax</a></h4>
-<p>fix_modify AtC control mask_direction &lt;direction&gt; &lt;on|off&gt; </p>
-<h4><a class="anchor" id="examples">
-examples</a></h4>
-<p><code> fix_modify atc control mask_direction 0 on </code> <br/>
- </p>
-<h4><a class="anchor" id="description">
-description</a></h4>
-<p>Command to mask out certain dimensions from the atomic regulator </p>
-<h4><a class="anchor" id="restrictions">
-restrictions</a></h4>
-<h4><a class="anchor" id="related">
-related</a></h4>
-<h4><a class="anchor" id="default">
-default</a></h4>
-</div>
-<hr size="1"/><address style="text-align: right;"><small>Generated on 21 Aug 2013 for ATC by&nbsp;
-<a href="http://www.doxygen.org/index.html">
-<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.6.1 </small></address>
-</body>
-</html>
diff --git a/doc/src/USER/atc/man_mass_matrix.html b/doc/src/USER/atc/man_mass_matrix.html
deleted file mode 100644
index fd744e5bbf..0000000000
--- a/doc/src/USER/atc/man_mass_matrix.html
+++ /dev/null
@@ -1,49 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
-<title>ATC: fix_modify AtC mass_matrix</title>
-<link href="tabs.css" rel="stylesheet" type="text/css"/>
-<link href="doxygen.css" rel="stylesheet" type="text/css"/>
-</head>
-<body>
-<center>
-  <a href="http://lammps.sandia.gov">LAMMPS Website</a> &nbsp; &nbsp;
-  <a href="../../Manual.html">LAMMPS Manual</a> &nbsp; &nbsp;
-  <a href="../../fix_atc.html">USER-AtC Manual</a> &nbsp; &nbsp;
-  <a href="../../Commands_all.html">Commands</a>
-</center>
-
-<hr>
-
-
-<!-- Generated by Doxygen 1.6.1 -->
-<div class="contents">
-
-
-<h3><a class="anchor" id="man_mass_matrix">fix_modify AtC mass_matrix </a></h3><h4><a class="anchor" id="syntax">
-syntax</a></h4>
-<p>fix_modify AtC mass_matrix &lt;fe | md_fe&gt;</p>
-<ul>
-<li>&lt;fe | md_fe&gt; = activiate/deactiviate using the FE mass matrix in the MD region </li>
-</ul>
-<h4><a class="anchor" id="examples">
-examples</a></h4>
-<p><code> fix_modify atc mass_matrix fe </code> </p>
-<h4><a class="anchor" id="description">
-description</a></h4>
-<p>Determines whether AtC uses the FE mass matrix based on Gaussian quadrature or based on atomic quadrature in the MD region. This is useful for fully overlapping simulations to improve efficiency. </p>
-<h4><a class="anchor" id="restrictions">
-restrictions</a></h4>
-<p>Should not be used unless the FE region is contained within the MD region, otherwise the method will be unstable and inaccurate </p>
-<h4><a class="anchor" id="related">
-related</a></h4>
-<h4><a class="anchor" id="default">
-default</a></h4>
-<p>Default is off </p>
-</div>
-<hr size="1"/><address style="text-align: right;"><small>Generated on 21 Aug 2013 for ATC by&nbsp;
-<a href="http://www.doxygen.org/index.html">
-<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.6.1 </small></address>
-</body>
-</html>
diff --git a/doc/src/USER/atc/man_material.html b/doc/src/USER/atc/man_material.html
deleted file mode 100644
index 1646abc671..0000000000
--- a/doc/src/USER/atc/man_material.html
+++ /dev/null
@@ -1,47 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
-<title>ATC: fix_modify AtC material</title>
-<link href="tabs.css" rel="stylesheet" type="text/css"/>
-<link href="doxygen.css" rel="stylesheet" type="text/css"/>
-</head>
-<body>
-<center>
-  <a href="http://lammps.sandia.gov">LAMMPS Website</a> &nbsp; &nbsp;
-  <a href="../../Manual.html">LAMMPS Manual</a> &nbsp; &nbsp;
-  <a href="../../fix_atc.html">USER-AtC Manual</a> &nbsp; &nbsp;
-  <a href="../../Commands_all.html">Commands</a>
-</center>
-
-<hr>
-
-
-<!-- Generated by Doxygen 1.6.1 -->
-<div class="contents">
-
-
-<h3><a class="anchor" id="man_material">fix_modify AtC material </a></h3><h4><a class="anchor" id="syntax">
-syntax</a></h4>
-<p>fix_modify AtC material [elementset_name] [material_id] <br/>
- </p>
-<h4><a class="anchor" id="examples">
-examples</a></h4>
-<p><code> fix_modify AtC material gap_region 2</code> </p>
-<h4><a class="anchor" id="description">
-description</a></h4>
-<p>Sets the material model in elementset_name to be of type material_id. </p>
-<h4><a class="anchor" id="restrictions">
-restrictions</a></h4>
-<p>The element set must already be created and the material must be specified in the material file given the the atc fix on construction </p>
-<h4><a class="anchor" id="related">
-related</a></h4>
-<h4><a class="anchor" id="default">
-default</a></h4>
-<p>All elements default to the first material in the material file. </p>
-</div>
-<hr size="1"/><address style="text-align: right;"><small>Generated on 21 Aug 2013 for ATC by&nbsp;
-<a href="http://www.doxygen.org/index.html">
-<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.6.1 </small></address>
-</body>
-</html>
diff --git a/doc/src/USER/atc/man_mesh_add_to_nodeset.html b/doc/src/USER/atc/man_mesh_add_to_nodeset.html
deleted file mode 100644
index c4976f699d..0000000000
--- a/doc/src/USER/atc/man_mesh_add_to_nodeset.html
+++ /dev/null
@@ -1,49 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
-<title>ATC: fix_modify AtC mesh add_to_nodeset</title>
-<link href="tabs.css" rel="stylesheet" type="text/css"/>
-<link href="doxygen.css" rel="stylesheet" type="text/css"/>
-</head>
-<body>
-<center>
-  <a href="http://lammps.sandia.gov">LAMMPS Website</a> &nbsp; &nbsp;
-  <a href="../../Manual.html">LAMMPS Manual</a> &nbsp; &nbsp;
-  <a href="../../fix_atc.html">USER-AtC Manual</a> &nbsp; &nbsp;
-  <a href="../../Commands_all.html">Commands</a>
-</center>
-
-<hr>
-
-
-<!-- Generated by Doxygen 1.6.1 -->
-<div class="contents">
-
-
-<h3><a class="anchor" id="man_mesh_add_to_nodeset">fix_modify AtC mesh add_to_nodeset </a></h3><h4><a class="anchor" id="syntax">
-syntax</a></h4>
-<p>fix_modify AtC mesh add_to_nodeset &lt;id&gt; &lt;xmin&gt; &lt;xmax&gt; &lt;ymin&gt; &lt;ymax&gt; &lt;zmin&gt; &lt;zmax&gt;</p>
-<ul>
-<li>&lt;id&gt; = id of FE nodeset to be added to</li>
-<li>&lt;xmin&gt; &lt;xmax&gt; &lt;ymin&gt; &lt;ymax&gt; &lt;zmin&gt; &lt;zmax&gt; = coordinates of the bounding box that contains the desired nodes to be added </li>
-</ul>
-<h4><a class="anchor" id="examples">
-examples</a></h4>
-<p><code> fix_modify AtC mesh add_to_nodeset lbc -11.9 -11 -12 12 -12 12 </code> </p>
-<h4><a class="anchor" id="description">
-description</a></h4>
-<p>Command to add nodes to an already existing FE nodeset. </p>
-<h4><a class="anchor" id="restrictions">
-restrictions</a></h4>
-<h4><a class="anchor" id="related">
-related</a></h4>
-<h4><a class="anchor" id="default">
-default</a></h4>
-<p>Coordinates are assumed to be in lattice units. </p>
-</div>
-<hr size="1"/><address style="text-align: right;"><small>Generated on 21 Aug 2013 for ATC by&nbsp;
-<a href="http://www.doxygen.org/index.html">
-<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.6.1 </small></address>
-</body>
-</html>
diff --git a/doc/src/USER/atc/man_mesh_create.html b/doc/src/USER/atc/man_mesh_create.html
deleted file mode 100644
index 98989bd015..0000000000
--- a/doc/src/USER/atc/man_mesh_create.html
+++ /dev/null
@@ -1,54 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
-<title>ATC: fix_modify AtC mesh create</title>
-<link href="tabs.css" rel="stylesheet" type="text/css"/>
-<link href="doxygen.css" rel="stylesheet" type="text/css"/>
-</head>
-<body>
-<center>
-  <a href="http://lammps.sandia.gov">LAMMPS Website</a> &nbsp; &nbsp;
-  <a href="../../Manual.html">LAMMPS Manual</a> &nbsp; &nbsp;
-  <a href="../../fix_atc.html">USER-AtC Manual</a> &nbsp; &nbsp;
-  <a href="../../Commands_all.html">Commands</a>
-</center>
-
-<hr>
-
-
-<!-- Generated by Doxygen 1.6.1 -->
-<div class="contents">
-
-
-<h3><a class="anchor" id="man_mesh_create">fix_modify AtC mesh create </a></h3><h4><a class="anchor" id="syntax">
-syntax</a></h4>
-<p>fix_modify AtC mesh create &lt;nx&gt; &lt;ny&gt; &lt;nz&gt; &lt;region-id&gt; &lt;f|p&gt; &lt;f|p&gt; &lt;f|p&gt; <br/>
-</p>
-<ul>
-<li>nx ny nz = number of elements in x, y, z</li>
-<li>region-id = id of region that is to be meshed</li>
-<li>f p p = periodicity flags for x, y, z </li>
-</ul>
-<h4><a class="anchor" id="examples">
-examples</a></h4>
-<p><code> fix_modify AtC mesh create 10 1 1 feRegion p p p </code> <br/>
- </p>
-<h4><a class="anchor" id="description">
-description</a></h4>
-<p>Creates a uniform mesh in a rectangular region </p>
-<h4><a class="anchor" id="restrictions">
-restrictions</a></h4>
-<p>Creates only uniform rectangular grids in a rectangular region </p>
-<h4><a class="anchor" id="related">
-related</a></h4>
-<p><a class="el" href="man_mesh_quadrature.html">fix_modify AtC mesh quadrature</a> </p>
-<h4><a class="anchor" id="default">
-default</a></h4>
-<p>When created, mesh defaults to gauss2 (2-point Gaussian) quadrature. Use "mesh quadrature" command to change quadrature style. </p>
-</div>
-<hr size="1"/><address style="text-align: right;"><small>Generated on 21 Aug 2013 for ATC by&nbsp;
-<a href="http://www.doxygen.org/index.html">
-<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.6.1 </small></address>
-</body>
-</html>
diff --git a/doc/src/USER/atc/man_mesh_create_elementset.html b/doc/src/USER/atc/man_mesh_create_elementset.html
deleted file mode 100644
index 735d462b73..0000000000
--- a/doc/src/USER/atc/man_mesh_create_elementset.html
+++ /dev/null
@@ -1,50 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
-<title>ATC: fix_modify AtC mesh create_elementset</title>
-<link href="tabs.css" rel="stylesheet" type="text/css"/>
-<link href="doxygen.css" rel="stylesheet" type="text/css"/>
-</head>
-<body>
-<center>
-  <a href="http://lammps.sandia.gov">LAMMPS Website</a> &nbsp; &nbsp;
-  <a href="../../Manual.html">LAMMPS Manual</a> &nbsp; &nbsp;
-  <a href="../../fix_atc.html">USER-AtC Manual</a> &nbsp; &nbsp;
-  <a href="../../Commands_all.html">Commands</a>
-</center>
-
-<hr>
-
-
-<!-- Generated by Doxygen 1.6.1 -->
-<div class="contents">
-
-
-<h3><a class="anchor" id="man_mesh_create_elementset">fix_modify AtC mesh create_elementset </a></h3><h4><a class="anchor" id="syntax">
-syntax</a></h4>
-<p>fix_modify AtC create_elementset &lt;id&gt; &lt;xmin&gt; &lt;xmax&gt; &lt;ymin&gt; &lt;ymax&gt; &lt;zmin&gt; &lt;zmax&gt;</p>
-<ul>
-<li>&lt;id&gt; = id to assign to the collection of FE element</li>
-<li>&lt;xmin&gt; &lt;xmax&gt; &lt;ymin&gt; &lt;ymax&gt; &lt;zmin&gt; &lt;zmax&gt; = coordinates of the bounding box that contains only the desired elements </li>
-</ul>
-<h4><a class="anchor" id="examples">
-examples</a></h4>
-<p><code> fix_modify AtC mesh create_elementset middle -4.1 4.1 -100 100 -100 1100 </code> </p>
-<h4><a class="anchor" id="description">
-description</a></h4>
-<p>Command to assign an id to a set of FE elements to be used subsequently in defining material and mesh-based operations. </p>
-<h4><a class="anchor" id="restrictions">
-restrictions</a></h4>
-<p>Only viable for rectangular grids. </p>
-<h4><a class="anchor" id="related">
-related</a></h4>
-<h4><a class="anchor" id="default">
-default</a></h4>
-<p>Coordinates are assumed to be in lattice units. </p>
-</div>
-<hr size="1"/><address style="text-align: right;"><small>Generated on 21 Aug 2013 for ATC by&nbsp;
-<a href="http://www.doxygen.org/index.html">
-<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.6.1 </small></address>
-</body>
-</html>
diff --git a/doc/src/USER/atc/man_mesh_create_faceset_box.html b/doc/src/USER/atc/man_mesh_create_faceset_box.html
deleted file mode 100644
index 0ae68435e5..0000000000
--- a/doc/src/USER/atc/man_mesh_create_faceset_box.html
+++ /dev/null
@@ -1,52 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
-<title>ATC: fix_modify AtC mesh create_faceset box</title>
-<link href="tabs.css" rel="stylesheet" type="text/css"/>
-<link href="doxygen.css" rel="stylesheet" type="text/css"/>
-</head>
-<body>
-<center>
-  <a href="http://lammps.sandia.gov">LAMMPS Website</a> &nbsp; &nbsp;
-  <a href="../../Manual.html">LAMMPS Manual</a> &nbsp; &nbsp;
-  <a href="../../fix_atc.html">USER-AtC Manual</a> &nbsp; &nbsp;
-  <a href="../../Commands_all.html">Commands</a>
-</center>
-
-<hr>
-
-
-<!-- Generated by Doxygen 1.6.1 -->
-<div class="contents">
-
-
-<h3><a class="anchor" id="man_mesh_create_faceset_box">fix_modify AtC mesh create_faceset box </a></h3><h4><a class="anchor" id="syntax">
-syntax</a></h4>
-<p>fix_modify AtC mesh create_faceset &lt;id&gt; box &lt;xmin&gt; &lt;xmax&gt; &lt;ymin&gt; &lt;ymax&gt; &lt;zmin&gt; &lt;zmax&gt; &lt;in|out&gt; [units]</p>
-<ul>
-<li>&lt;id&gt; = id to assign to the collection of FE faces</li>
-<li>&lt;xmin&gt; &lt;xmax&gt; &lt;ymin&gt; &lt;ymax&gt; &lt;zmin&gt; &lt;zmax&gt; = coordinates of the bounding box that is coincident with the desired FE faces</li>
-<li>&lt;in|out&gt; = "in" gives inner faces to the box, "out" gives the outer faces to the box</li>
-<li>units = option to specify real as opposed to lattice units </li>
-</ul>
-<h4><a class="anchor" id="examples">
-examples</a></h4>
-<p><code> fix_modify AtC mesh create_faceset obndy box -4.0 4.0 -12 12 -12 12 out </code> </p>
-<h4><a class="anchor" id="description">
-description</a></h4>
-<p>Command to assign an id to a set of FE faces. </p>
-<h4><a class="anchor" id="restrictions">
-restrictions</a></h4>
-<p>Only viable for rectangular grids. </p>
-<h4><a class="anchor" id="related">
-related</a></h4>
-<h4><a class="anchor" id="default">
-default</a></h4>
-<p>The default options are units = lattice and the use of outer faces </p>
-</div>
-<hr size="1"/><address style="text-align: right;"><small>Generated on 21 Aug 2013 for ATC by&nbsp;
-<a href="http://www.doxygen.org/index.html">
-<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.6.1 </small></address>
-</body>
-</html>
diff --git a/doc/src/USER/atc/man_mesh_create_faceset_plane.html b/doc/src/USER/atc/man_mesh_create_faceset_plane.html
deleted file mode 100644
index cd78816bae..0000000000
--- a/doc/src/USER/atc/man_mesh_create_faceset_plane.html
+++ /dev/null
@@ -1,52 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
-<title>ATC: fix_modify AtC mesh create_faceset plane</title>
-<link href="tabs.css" rel="stylesheet" type="text/css"/>
-<link href="doxygen.css" rel="stylesheet" type="text/css"/>
-</head>
-<body>
-<center>
-  <a href="http://lammps.sandia.gov">LAMMPS Website</a> &nbsp; &nbsp;
-  <a href="../../Manual.html">LAMMPS Manual</a> &nbsp; &nbsp;
-  <a href="../../fix_atc.html">USER-AtC Manual</a> &nbsp; &nbsp;
-  <a href="../../Commands_all.html">Commands</a>
-</center>
-
-<hr>
-
-
-<!-- Generated by Doxygen 1.6.1 -->
-<div class="contents">
-
-
-<h3><a class="anchor" id="man_mesh_create_faceset_plane">fix_modify AtC mesh create_faceset plane </a></h3><h4><a class="anchor" id="syntax">
-syntax</a></h4>
-<p>fix_modify AtC mesh create_faceset &lt;id&gt; plane &lt;x|y|z&gt; &lt;val1&gt; &lt;x|y|z&gt; &lt;lval2&gt; &lt;uval2&gt; [units]</p>
-<ul>
-<li>&lt;id&gt; = id to assign to the collection of FE faces</li>
-<li>&lt;x|y|z&gt; = coordinate directions that define plane on which faceset lies</li>
-<li>&lt;val1&gt;,&lt;lval2&gt;,&lt;uval2&gt; = plane is specified as the x|y|z=val1 plane bounded by the segments x|y|z = [lval2,uval2]</li>
-<li>units = option to specify real as opposed to lattice units </li>
-</ul>
-<h4><a class="anchor" id="examples">
-examples</a></h4>
-<p><code> fix_modify AtC mesh create_faceset xyplane plane y 0 x -4 0 </code> </p>
-<h4><a class="anchor" id="description">
-description</a></h4>
-<p>Command to assign an id to a set of FE faces. </p>
-<h4><a class="anchor" id="restrictions">
-restrictions</a></h4>
-<p>Only viable for rectangular grids. </p>
-<h4><a class="anchor" id="related">
-related</a></h4>
-<h4><a class="anchor" id="default">
-default</a></h4>
-<p>The default option is units = lattice. </p>
-</div>
-<hr size="1"/><address style="text-align: right;"><small>Generated on 21 Aug 2013 for ATC by&nbsp;
-<a href="http://www.doxygen.org/index.html">
-<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.6.1 </small></address>
-</body>
-</html>
diff --git a/doc/src/USER/atc/man_mesh_create_nodeset.html b/doc/src/USER/atc/man_mesh_create_nodeset.html
deleted file mode 100644
index 0e3624cf8a..0000000000
--- a/doc/src/USER/atc/man_mesh_create_nodeset.html
+++ /dev/null
@@ -1,49 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
-<title>ATC: fix_modify AtC mesh create_nodeset</title>
-<link href="tabs.css" rel="stylesheet" type="text/css"/>
-<link href="doxygen.css" rel="stylesheet" type="text/css"/>
-</head>
-<body>
-<center>
-  <a href="http://lammps.sandia.gov">LAMMPS Website</a> &nbsp; &nbsp;
-  <a href="../../Manual.html">LAMMPS Manual</a> &nbsp; &nbsp;
-  <a href="../../fix_atc.html">USER-AtC Manual</a> &nbsp; &nbsp;
-  <a href="../../Commands_all.html">Commands</a>
-</center>
-
-<hr>
-
-
-<!-- Generated by Doxygen 1.6.1 -->
-<div class="contents">
-
-
-<h3><a class="anchor" id="man_mesh_create_nodeset">fix_modify AtC mesh create_nodeset </a></h3><h4><a class="anchor" id="syntax">
-syntax</a></h4>
-<p>fix_modify AtC mesh create_nodeset &lt;id&gt; &lt;xmin&gt; &lt;xmax&gt; &lt;ymin&gt; &lt;ymax&gt; &lt;zmin&gt; &lt;zmax&gt;</p>
-<ul>
-<li>&lt;id&gt; = id to assign to the collection of FE nodes</li>
-<li>&lt;xmin&gt; &lt;xmax&gt; &lt;ymin&gt; &lt;ymax&gt; &lt;zmin&gt; &lt;zmax&gt; = coordinates of the bounding box that contains only the desired nodes </li>
-</ul>
-<h4><a class="anchor" id="examples">
-examples</a></h4>
-<p><code> fix_modify AtC mesh create_nodeset lbc -12.1 -11.9 -12 12 -12 12 </code> </p>
-<h4><a class="anchor" id="description">
-description</a></h4>
-<p>Command to assign an id to a set of FE nodes to be used subsequently in defining boundary conditions. </p>
-<h4><a class="anchor" id="restrictions">
-restrictions</a></h4>
-<h4><a class="anchor" id="related">
-related</a></h4>
-<h4><a class="anchor" id="default">
-default</a></h4>
-<p>Coordinates are assumed to be in lattice units. </p>
-</div>
-<hr size="1"/><address style="text-align: right;"><small>Generated on 21 Aug 2013 for ATC by&nbsp;
-<a href="http://www.doxygen.org/index.html">
-<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.6.1 </small></address>
-</body>
-</html>
diff --git a/doc/src/USER/atc/man_mesh_delete_elements.html b/doc/src/USER/atc/man_mesh_delete_elements.html
deleted file mode 100644
index e39cc54d41..0000000000
--- a/doc/src/USER/atc/man_mesh_delete_elements.html
+++ /dev/null
@@ -1,48 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
-<title>ATC: fix_modify AtC mesh delete_elements</title>
-<link href="tabs.css" rel="stylesheet" type="text/css"/>
-<link href="doxygen.css" rel="stylesheet" type="text/css"/>
-</head>
-<body>
-<center>
-  <a href="http://lammps.sandia.gov">LAMMPS Website</a> &nbsp; &nbsp;
-  <a href="../../Manual.html">LAMMPS Manual</a> &nbsp; &nbsp;
-  <a href="../../fix_atc.html">USER-AtC Manual</a> &nbsp; &nbsp;
-  <a href="../../Commands_all.html">Commands</a>
-</center>
-
-<hr>
-
-
-<!-- Generated by Doxygen 1.6.1 -->
-<div class="contents">
-
-
-<h3><a class="anchor" id="man_mesh_delete_elements">fix_modify AtC mesh delete_elements </a></h3><h4><a class="anchor" id="syntax">
-syntax</a></h4>
-<p>fix_modify AtC mesh delete_elements &lt;element_set&gt;</p>
-<ul>
-<li>&lt;element_set&gt; = name of an element set </li>
-</ul>
-<h4><a class="anchor" id="examples">
-examples</a></h4>
-<p><code> fix_modify AtC delete_elements gap </code> </p>
-<h4><a class="anchor" id="description">
-description</a></h4>
-<p>Deletes a group of elements from the mesh. </p>
-<h4><a class="anchor" id="restrictions">
-restrictions</a></h4>
-<h4><a class="anchor" id="related">
-related</a></h4>
-<h4><a class="anchor" id="default">
-default</a></h4>
-<p>none </p>
-</div>
-<hr size="1"/><address style="text-align: right;"><small>Generated on 21 Aug 2013 for ATC by&nbsp;
-<a href="http://www.doxygen.org/index.html">
-<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.6.1 </small></address>
-</body>
-</html>
diff --git a/doc/src/USER/atc/man_mesh_nodeset_to_elementset.html b/doc/src/USER/atc/man_mesh_nodeset_to_elementset.html
deleted file mode 100644
index 66b55a48fb..0000000000
--- a/doc/src/USER/atc/man_mesh_nodeset_to_elementset.html
+++ /dev/null
@@ -1,51 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
-<title>ATC: fix_modify AtC mesh nodeset_to_elementset</title>
-<link href="tabs.css" rel="stylesheet" type="text/css"/>
-<link href="doxygen.css" rel="stylesheet" type="text/css"/>
-</head>
-<body>
-<center>
-  <a href="http://lammps.sandia.gov">LAMMPS Website</a> &nbsp; &nbsp;
-  <a href="../../Manual.html">LAMMPS Manual</a> &nbsp; &nbsp;
-  <a href="../../fix_atc.html">USER-AtC Manual</a> &nbsp; &nbsp;
-  <a href="../../Commands_all.html">Commands</a>
-</center>
-
-<hr>
-
-
-<!-- Generated by Doxygen 1.6.1 -->
-<div class="contents">
-
-
-<h3><a class="anchor" id="man_mesh_nodeset_to_elementset">fix_modify AtC mesh nodeset_to_elementset </a></h3><h4><a class="anchor" id="syntax">
-syntax</a></h4>
-<p>fix_modify AtC nodeset_to_elementset &lt;nodeset_id&gt; &lt;elementset_id&gt; &lt;max/min&gt;</p>
-<ul>
-<li>&lt;nodeset_id&gt; = id of desired nodeset from which to create elementset</li>
-<li>&lt;elementset_id&gt; = id to assign to the collection of FE element</li>
-<li>&lt;max/min&gt; = flag to choose either the maximal or minimal elementset </li>
-</ul>
-<h4><a class="anchor" id="examples">
-examples</a></h4>
-<p><code> fix_modify AtC mesh nodeset_to_elementset myNodeset myElementset min </code> </p>
-<h4><a class="anchor" id="description">
-description</a></h4>
-<p>Command to create an elementset from an existing nodeset. Either the minimal element set of elements with all nodes in the set, or maximal element set with all elements with at least one node in the set, can be created </p>
-<h4><a class="anchor" id="restrictions">
-restrictions</a></h4>
-<p>None. </p>
-<h4><a class="anchor" id="related">
-related</a></h4>
-<h4><a class="anchor" id="default">
-default</a></h4>
-<p>Unless specified, the maximal element set is created </p>
-</div>
-<hr size="1"/><address style="text-align: right;"><small>Generated on 21 Aug 2013 for ATC by&nbsp;
-<a href="http://www.doxygen.org/index.html">
-<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.6.1 </small></address>
-</body>
-</html>
diff --git a/doc/src/USER/atc/man_mesh_output.html b/doc/src/USER/atc/man_mesh_output.html
deleted file mode 100644
index 1d2983afff..0000000000
--- a/doc/src/USER/atc/man_mesh_output.html
+++ /dev/null
@@ -1,47 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
-<title>ATC: fix_modify AtC mesh output</title>
-<link href="tabs.css" rel="stylesheet" type="text/css"/>
-<link href="doxygen.css" rel="stylesheet" type="text/css"/>
-</head>
-<body>
-<center>
-  <a href="http://lammps.sandia.gov">LAMMPS Website</a> &nbsp; &nbsp;
-  <a href="../../Manual.html">LAMMPS Manual</a> &nbsp; &nbsp;
-  <a href="../../fix_atc.html">USER-AtC Manual</a> &nbsp; &nbsp;
-  <a href="../../Commands_all.html">Commands</a>
-</center>
-
-<hr>
-
-
-<!-- Generated by Doxygen 1.6.1 -->
-<div class="contents">
-
-
-<h3><a class="anchor" id="man_mesh_output">fix_modify AtC mesh output </a></h3><h4><a class="anchor" id="syntax">
-syntax</a></h4>
-<p>fix_modify AtC mesh output &lt;file_prefix&gt; </p>
-<h4><a class="anchor" id="examples">
-examples</a></h4>
-<p><code> fix_modify AtC mesh output meshData </code> <br/>
- </p>
-<h4><a class="anchor" id="description">
-description</a></h4>
-<p>Command to output mesh and associated data: nodesets, facesets, and elementsets. This data is only output once upon initialization since currently the mesh is static. Creates (binary, "gold" format) Ensight output of mesh data. </p>
-<h4><a class="anchor" id="restrictions">
-restrictions</a></h4>
-<p>none </p>
-<h4><a class="anchor" id="related">
-related</a></h4>
-<h4><a class="anchor" id="default">
-default</a></h4>
-<p>none </p>
-</div>
-<hr size="1"/><address style="text-align: right;"><small>Generated on 21 Aug 2013 for ATC by&nbsp;
-<a href="http://www.doxygen.org/index.html">
-<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.6.1 </small></address>
-</body>
-</html>
diff --git a/doc/src/USER/atc/man_mesh_quadrature.html b/doc/src/USER/atc/man_mesh_quadrature.html
deleted file mode 100644
index 821e50e4cf..0000000000
--- a/doc/src/USER/atc/man_mesh_quadrature.html
+++ /dev/null
@@ -1,49 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
-<title>ATC: fix_modify AtC mesh quadrature</title>
-<link href="tabs.css" rel="stylesheet" type="text/css"/>
-<link href="doxygen.css" rel="stylesheet" type="text/css"/>
-</head>
-<body>
-<center>
-  <a href="http://lammps.sandia.gov">LAMMPS Website</a> &nbsp; &nbsp;
-  <a href="../../Manual.html">LAMMPS Manual</a> &nbsp; &nbsp;
-  <a href="../../fix_atc.html">USER-AtC Manual</a> &nbsp; &nbsp;
-  <a href="../../Commands_all.html">Commands</a>
-</center>
-
-<hr>
-
-
-<!-- Generated by Doxygen 1.6.1 -->
-<div class="contents">
-
-
-<h3><a class="anchor" id="man_mesh_quadrature">fix_modify AtC mesh quadrature </a></h3><h4><a class="anchor" id="syntax">
-syntax</a></h4>
-<p>fix_modify AtC mesh quadrature &lt;quad&gt;</p>
-<ul>
-<li>quad = one of &lt;nodal|gauss1|gauss2|gauss3|face&gt; --- when a mesh is created it defaults to gauss2, use this call to change it after the fact </li>
-</ul>
-<h4><a class="anchor" id="examples">
-examples</a></h4>
-<p><code> fix_modify AtC mesh quadrature face </code> </p>
-<h4><a class="anchor" id="description">
-description</a></h4>
-<p>(Re-)assigns the quadrature style for the existing mesh. </p>
-<h4><a class="anchor" id="restrictions">
-restrictions</a></h4>
-<h4><a class="anchor" id="related">
-related</a></h4>
-<p><a class="el" href="man_mesh_create.html">fix_modify AtC mesh create</a> </p>
-<h4><a class="anchor" id="default">
-default</a></h4>
-<p>none </p>
-</div>
-<hr size="1"/><address style="text-align: right;"><small>Generated on 21 Aug 2013 for ATC by&nbsp;
-<a href="http://www.doxygen.org/index.html">
-<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.6.1 </small></address>
-</body>
-</html>
diff --git a/doc/src/USER/atc/man_mesh_read.html b/doc/src/USER/atc/man_mesh_read.html
deleted file mode 100644
index 315180e1db..0000000000
--- a/doc/src/USER/atc/man_mesh_read.html
+++ /dev/null
@@ -1,50 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
-<title>ATC: fix_modify AtC mesh read</title>
-<link href="tabs.css" rel="stylesheet" type="text/css"/>
-<link href="doxygen.css" rel="stylesheet" type="text/css"/>
-</head>
-<body>
-<center>
-  <a href="http://lammps.sandia.gov">LAMMPS Website</a> &nbsp; &nbsp;
-  <a href="../../Manual.html">LAMMPS Manual</a> &nbsp; &nbsp;
-  <a href="../../fix_atc.html">USER-AtC Manual</a> &nbsp; &nbsp;
-  <a href="../../Commands_all.html">Commands</a>
-</center>
-
-<hr>
-
-
-<!-- Generated by Doxygen 1.6.1 -->
-<div class="contents">
-
-
-<h3><a class="anchor" id="man_mesh_read">fix_modify AtC mesh read </a></h3><h4><a class="anchor" id="syntax">
-syntax</a></h4>
-<p>fix_modify AtC mesh read &lt;filename&gt; &lt;f|p&gt; &lt;f|p&gt; &lt;f|p&gt;</p>
-<ul>
-<li>filename = name of file containing mesh to be read</li>
-<li>f p p = periodicity flags for x, y, z </li>
-</ul>
-<h4><a class="anchor" id="examples">
-examples</a></h4>
-<p><code> fix_modify AtC mesh read myComponent.mesh p p p </code> <br/>
- <code> fix_modify AtC mesh read myOtherComponent.exo </code> </p>
-<h4><a class="anchor" id="description">
-description</a></h4>
-<p>Reads a mesh from a text or exodus file, and assigns periodic boundary conditions if needed. </p>
-<h4><a class="anchor" id="restrictions">
-restrictions</a></h4>
-<h4><a class="anchor" id="related">
-related</a></h4>
-<h4><a class="anchor" id="default">
-default</a></h4>
-<p>periodicity flags are false by default </p>
-</div>
-<hr size="1"/><address style="text-align: right;"><small>Generated on 21 Aug 2013 for ATC by&nbsp;
-<a href="http://www.doxygen.org/index.html">
-<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.6.1 </small></address>
-</body>
-</html>
diff --git a/doc/src/USER/atc/man_mesh_write.html b/doc/src/USER/atc/man_mesh_write.html
deleted file mode 100644
index f709c02a84..0000000000
--- a/doc/src/USER/atc/man_mesh_write.html
+++ /dev/null
@@ -1,48 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
-<title>ATC: fix_modify AtC mesh write</title>
-<link href="tabs.css" rel="stylesheet" type="text/css"/>
-<link href="doxygen.css" rel="stylesheet" type="text/css"/>
-</head>
-<body>
-<center>
-  <a href="http://lammps.sandia.gov">LAMMPS Website</a> &nbsp; &nbsp;
-  <a href="../../Manual.html">LAMMPS Manual</a> &nbsp; &nbsp;
-  <a href="../../fix_atc.html">USER-AtC Manual</a> &nbsp; &nbsp;
-  <a href="../../Commands_all.html">Commands</a>
-</center>
-
-<hr>
-
-
-<!-- Generated by Doxygen 1.6.1 -->
-<div class="contents">
-
-
-<h3><a class="anchor" id="man_mesh_write">fix_modify AtC mesh write </a></h3><h4><a class="anchor" id="syntax">
-syntax</a></h4>
-<p>fix_modify AtC mesh write &lt;filename&gt;</p>
-<ul>
-<li>filename = name of file to write mesh </li>
-</ul>
-<h4><a class="anchor" id="examples">
-examples</a></h4>
-<p><code> fix_modify AtC mesh write myMesh.mesh </code> <br/>
- </p>
-<h4><a class="anchor" id="description">
-description</a></h4>
-<p>Writes a mesh to a text file. </p>
-<h4><a class="anchor" id="restrictions">
-restrictions</a></h4>
-<h4><a class="anchor" id="related">
-related</a></h4>
-<h4><a class="anchor" id="default">
-default</a></h4>
-</div>
-<hr size="1"/><address style="text-align: right;"><small>Generated on 21 Aug 2013 for ATC by&nbsp;
-<a href="http://www.doxygen.org/index.html">
-<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.6.1 </small></address>
-</body>
-</html>
diff --git a/doc/src/USER/atc/man_momentum_time_integration.html b/doc/src/USER/atc/man_momentum_time_integration.html
deleted file mode 100644
index ee0505847c..0000000000
--- a/doc/src/USER/atc/man_momentum_time_integration.html
+++ /dev/null
@@ -1,58 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
-<title>ATC: fix_modify AtC time_integration (momentum)</title>
-<link href="tabs.css" rel="stylesheet" type="text/css"/>
-<link href="doxygen.css" rel="stylesheet" type="text/css"/>
-</head>
-<body>
-<center>
-  <a href="http://lammps.sandia.gov">LAMMPS Website</a> &nbsp; &nbsp;
-  <a href="../../Manual.html">LAMMPS Manual</a> &nbsp; &nbsp;
-  <a href="../../fix_atc.html">USER-AtC Manual</a> &nbsp; &nbsp;
-  <a href="../../Commands_all.html">Commands</a>
-</center>
-
-<hr>
-
-
-<!-- Generated by Doxygen 1.6.1 -->
-<div class="contents">
-
-
-<h3><a class="anchor" id="man_momentum_time_integration">fix_modify AtC time_integration (momentum) </a></h3><h4><a class="anchor" id="syntax">
-syntax</a></h4>
-<p>fix_modify AtC time_integration &lt;descriptor&gt; <br/>
-</p>
-<ul>
-<li>descriptor (string) = time integration type <br/>
-</li>
-</ul>
-<p>various time integration methods for the finite elements<br/>
- </p>
-<h4><a class="anchor" id="description">
-description</a></h4>
-<p>verlet - atomic velocity update with 2nd order Verlet, nodal temperature update with 2nd order Verlet, kinetostats based on controlling force <br/>
- fractional_step - atomic velocity update with 2nd order Verlet, mixed nodal momentum update, 2nd order Verlet for continuum and exact 2nd order Verlet for atomic contributions, kinetostats based on controlling discrete momentum changes<br/>
- gear - atomic velocity update with 2nd order Verlet, nodal temperature update with 3rd or 4th order Gear, kinetostats based on controlling power <br/>
- </p>
-<h4><a class="anchor" id="examples">
-examples</a></h4>
-<p><code> fix_modify atc time_integration verlet </code> <br/>
- <code> fix_modify atc time_integration fractional_step </code> <br/>
- </p>
-<h4><a class="anchor" id="description">
-description</a></h4>
-<h4><a class="anchor" id="related">
-related</a></h4>
-<p>see <a class="el" href="../../fix_atc.html">fix atc command</a> </p>
-<h4><a class="anchor" id="default">
-default</a></h4>
-<p>none </p>
-</div>
-<hr size="1"/><address style="text-align: right;"><small>Generated on 21 Aug 2013 for ATC by&nbsp;
-<a href="http://www.doxygen.org/index.html">
-<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.6.1 </small></address>
-</body>
-</html>
diff --git a/doc/src/USER/atc/man_output.html b/doc/src/USER/atc/man_output.html
deleted file mode 100644
index d0a08fa0da..0000000000
--- a/doc/src/USER/atc/man_output.html
+++ /dev/null
@@ -1,61 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
-<title>ATC: fix_modify AtC output</title>
-<link href="tabs.css" rel="stylesheet" type="text/css"/>
-<link href="doxygen.css" rel="stylesheet" type="text/css"/>
-</head>
-<body>
-<center>
-  <a href="http://lammps.sandia.gov">LAMMPS Website</a> &nbsp; &nbsp;
-  <a href="../../Manual.html">LAMMPS Manual</a> &nbsp; &nbsp;
-  <a href="../../fix_atc.html">USER-AtC Manual</a> &nbsp; &nbsp;
-  <a href="../../Commands_all.html">Commands</a>
-</center>
-
-<hr>
-
-
-<!-- Generated by Doxygen 1.6.1 -->
-<div class="contents">
-
-
-<h3><a class="anchor" id="man_output">fix_modify AtC output </a></h3><h4><a class="anchor" id="syntax">
-syntax</a></h4>
-<p>fix_modify AtC output &lt;filename_prefix&gt; &lt;frequency&gt; [text | full_text | binary | vector_components | tensor_components ] fix_modify AtC output index [step | time ]</p>
-<ul>
-<li>filename_prefix (string) = prefix for data files</li>
-<li>frequency (integer) = frequency of output in time-steps</li>
-<li>options (keyword/s): <br/>
- text = creates text output of index, step and nodal variable values for unique nodes <br/>
- full_text = creates text output index, nodal id, step, nodal coordinates and nodal variable values for unique and image nodes <br/>
- binary = creates binary Ensight output <br/>
- vector_components = outputs vectors as scalar components <br/>
- tensor_components = outputs tensor as scalar components (use this for Paraview)<br/>
-</li>
-</ul>
-<h4><a class="anchor" id="examples">
-examples</a></h4>
-<p><code> fix_modify AtC output heatFE 100 </code> <br/>
- <code> fix_modify AtC output hardyFE 1 text tensor_components </code> <br/>
- <code> fix_modify AtC output hardyFE 10 text binary tensor_components </code> <br/>
- <code> fix_modify AtC output index step </code> <br/>
- </p>
-<h4><a class="anchor" id="description">
-description</a></h4>
-<p>Creates text and/or binary (Ensight, "gold" format) output of nodal/mesh data which is transfer/physics specific. Output indexed by step or time is possible. </p>
-<h4><a class="anchor" id="restrictions">
-restrictions</a></h4>
-<h4><a class="anchor" id="related">
-related</a></h4>
-<p>see <a class="el" href="../../fix_atc.html">fix atc command</a> </p>
-<h4><a class="anchor" id="default">
-default</a></h4>
-<p>no default format output indexed by time </p>
-</div>
-<hr size="1"/><address style="text-align: right;"><small>Generated on 21 Aug 2013 for ATC by&nbsp;
-<a href="http://www.doxygen.org/index.html">
-<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.6.1 </small></address>
-</body>
-</html>
diff --git a/doc/src/USER/atc/man_output_elementset.html b/doc/src/USER/atc/man_output_elementset.html
deleted file mode 100644
index 18afe0aa97..0000000000
--- a/doc/src/USER/atc/man_output_elementset.html
+++ /dev/null
@@ -1,52 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
-<title>ATC: fix_modify AtC output elementset</title>
-<link href="tabs.css" rel="stylesheet" type="text/css"/>
-<link href="doxygen.css" rel="stylesheet" type="text/css"/>
-</head>
-<body>
-<center>
-  <a href="http://lammps.sandia.gov">LAMMPS Website</a> &nbsp; &nbsp;
-  <a href="../../Manual.html">LAMMPS Manual</a> &nbsp; &nbsp;
-  <a href="../../fix_atc.html">USER-AtC Manual</a> &nbsp; &nbsp;
-  <a href="../../Commands_all.html">Commands</a>
-</center>
-
-<hr>
-
-
-<!-- Generated by Doxygen 1.6.1 -->
-<div class="contents">
-
-
-<h3><a class="anchor" id="man_output_elementset">fix_modify AtC output elementset </a></h3><h4><a class="anchor" id="syntax">
-syntax</a></h4>
-<p>fix_modify AtC output volume_integral &lt;eset_name&gt; &lt;field&gt; {`</p>
-<ul>
-<li>set_name (string) = name of elementset to be integrated over</li>
-<li>fieldname (string) = name of field to integrate csum = creates nodal sum over nodes in specified nodeset <br/>
- </li>
-</ul>
-<h4><a class="anchor" id="examples">
-examples</a></h4>
-<p><code> fix_modify AtC output eset1 mass_density </code> <br/>
- </p>
-<h4><a class="anchor" id="description">
-description</a></h4>
-<p>Performs volume integration of specified field over elementset and outputs resulting variable values to GLOBALS file. </p>
-<h4><a class="anchor" id="restrictions">
-restrictions</a></h4>
-<h4><a class="anchor" id="related">
-related</a></h4>
-<p>see <a class="el" href="../../fix_atc.html">fix atc command</a> </p>
-<h4><a class="anchor" id="default">
-default</a></h4>
-<p>none </p>
-</div>
-<hr size="1"/><address style="text-align: right;"><small>Generated on 21 Aug 2013 for ATC by&nbsp;
-<a href="http://www.doxygen.org/index.html">
-<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.6.1 </small></address>
-</body>
-</html>
diff --git a/doc/src/USER/atc/man_output_nodeset.html b/doc/src/USER/atc/man_output_nodeset.html
deleted file mode 100644
index 7906c5fc52..0000000000
--- a/doc/src/USER/atc/man_output_nodeset.html
+++ /dev/null
@@ -1,53 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
-<title>ATC: fix_modify AtC output nodeset</title>
-<link href="tabs.css" rel="stylesheet" type="text/css"/>
-<link href="doxygen.css" rel="stylesheet" type="text/css"/>
-</head>
-<body>
-<center>
-  <a href="http://lammps.sandia.gov">LAMMPS Website</a> &nbsp; &nbsp;
-  <a href="../../Manual.html">LAMMPS Manual</a> &nbsp; &nbsp;
-  <a href="../../fix_atc.html">USER-AtC Manual</a> &nbsp; &nbsp;
-  <a href="../../Commands_all.html">Commands</a>
-</center>
-
-<hr>
-
-
-<!-- Generated by Doxygen 1.6.1 -->
-<div class="contents">
-
-
-<h3><a class="anchor" id="man_output_nodeset">fix_modify AtC output nodeset </a></h3><h4><a class="anchor" id="syntax">
-syntax</a></h4>
-<p>fix_modify AtC output nodeset &lt;nodeset_name&gt; &lt;operation&gt;</p>
-<ul>
-<li>nodeset_name (string) = name of nodeset to be operated on</li>
-<li>operation (keyword/s): <br/>
- sum = creates nodal sum over nodes in specified nodeset <br/>
- </li>
-</ul>
-<h4><a class="anchor" id="examples">
-examples</a></h4>
-<p><code> fix_modify AtC output nodeset nset1 sum </code> <br/>
- </p>
-<h4><a class="anchor" id="description">
-description</a></h4>
-<p>Performs operation over the nodes belonging to specified nodeset and outputs resulting variable values to GLOBALS file. </p>
-<h4><a class="anchor" id="restrictions">
-restrictions</a></h4>
-<h4><a class="anchor" id="related">
-related</a></h4>
-<p>see <a class="el" href="../../fix_atc.html">fix atc command</a> </p>
-<h4><a class="anchor" id="default">
-default</a></h4>
-<p>none </p>
-</div>
-<hr size="1"/><address style="text-align: right;"><small>Generated on 21 Aug 2013 for ATC by&nbsp;
-<a href="http://www.doxygen.org/index.html">
-<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.6.1 </small></address>
-</body>
-</html>
diff --git a/doc/src/USER/atc/man_pair_interactions.html b/doc/src/USER/atc/man_pair_interactions.html
deleted file mode 100644
index 3ec2eecc60..0000000000
--- a/doc/src/USER/atc/man_pair_interactions.html
+++ /dev/null
@@ -1,48 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
-<title>ATC: fix_modify AtC pair_interactions/bond_interactions</title>
-<link href="tabs.css" rel="stylesheet" type="text/css"/>
-<link href="doxygen.css" rel="stylesheet" type="text/css"/>
-</head>
-<body>
-<center>
-  <a href="http://lammps.sandia.gov">LAMMPS Website</a> &nbsp; &nbsp;
-  <a href="../../Manual.html">LAMMPS Manual</a> &nbsp; &nbsp;
-  <a href="../../fix_atc.html">USER-AtC Manual</a> &nbsp; &nbsp;
-  <a href="../../Commands_all.html">Commands</a>
-</center>
-
-<hr>
-
-
-<!-- Generated by Doxygen 1.6.1 -->
-<div class="contents">
-
-
-<h3><a class="anchor" id="man_pair_interactions">fix_modify AtC pair_interactions/bond_interactions </a></h3><h4><a class="anchor" id="syntax">
-syntax</a></h4>
-<p>fix_modify AtC pair_interactions &lt;on|off&gt; <br/>
- fix_modify AtC bond_interactions &lt;on|off&gt; <br/>
-</p>
-<h4><a class="anchor" id="examples">
-examples</a></h4>
-<p><code> fix_modify AtC bond_interactions on </code> <br/>
- </p>
-<h4><a class="anchor" id="description">
-description</a></h4>
-<p>include bonds and/or pairs in the stress and heat flux computations </p>
-<h4><a class="anchor" id="restrictions">
-restrictions</a></h4>
-<h4><a class="anchor" id="related">
-related</a></h4>
-<h4><a class="anchor" id="default">
-default</a></h4>
-<p>pair interactions: on, bond interactions: off </p>
-</div>
-<hr size="1"/><address style="text-align: right;"><small>Generated on 21 Aug 2013 for ATC by&nbsp;
-<a href="http://www.doxygen.org/index.html">
-<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.6.1 </small></address>
-</body>
-</html>
diff --git a/doc/src/USER/atc/man_poisson_solver.html b/doc/src/USER/atc/man_poisson_solver.html
deleted file mode 100644
index 3e22a51f3e..0000000000
--- a/doc/src/USER/atc/man_poisson_solver.html
+++ /dev/null
@@ -1,51 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
-<title>ATC: fix_modify AtC poisson_solver</title>
-<link href="tabs.css" rel="stylesheet" type="text/css"/>
-<link href="doxygen.css" rel="stylesheet" type="text/css"/>
-</head>
-<body>
-<center>
-  <a href="http://lammps.sandia.gov">LAMMPS Website</a> &nbsp; &nbsp;
-  <a href="../../Manual.html">LAMMPS Manual</a> &nbsp; &nbsp;
-  <a href="../../fix_atc.html">USER-AtC Manual</a> &nbsp; &nbsp;
-  <a href="../../Commands_all.html">Commands</a>
-</center>
-
-<hr>
-
-
-<!-- Generated by Doxygen 1.6.1 -->
-<div class="contents">
-
-
-<h3><a class="anchor" id="man_poisson_solver">fix_modify AtC poisson_solver </a></h3><h4><a class="anchor" id="syntax">
-syntax</a></h4>
-<p>fix_modify AtC poisson_solver mesh create &lt;nx&gt; &lt;ny&gt; &lt;nz&gt; &lt;region-id&gt; &lt;f|p&gt; &lt;f|p&gt; &lt;f|p&gt;</p>
-<ul>
-<li>nx ny nz = number of elements in x, y, z</li>
-<li>region-id = id of region that is to be meshed</li>
-<li>f p p = perioidicity flags for x, y, z </li>
-</ul>
-<h4><a class="anchor" id="examples">
-examples</a></h4>
-<p><code> fix_modify AtC poisson_solver mesh create 10 1 1 feRegion p p p </code> </p>
-<h4><a class="anchor" id="description">
-description</a></h4>
-<p>Creates a uniform mesh in a rectangular region </p>
-<h4><a class="anchor" id="restrictions">
-restrictions</a></h4>
-<p>creates only uniform rectangular grids in a rectangular region </p>
-<h4><a class="anchor" id="related">
-related</a></h4>
-<h4><a class="anchor" id="default">
-default</a></h4>
-<p>none </p>
-</div>
-<hr size="1"/><address style="text-align: right;"><small>Generated on 21 Aug 2013 for ATC by&nbsp;
-<a href="http://www.doxygen.org/index.html">
-<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.6.1 </small></address>
-</body>
-</html>
diff --git a/doc/src/USER/atc/man_read_restart.html b/doc/src/USER/atc/man_read_restart.html
deleted file mode 100644
index d13151a12e..0000000000
--- a/doc/src/USER/atc/man_read_restart.html
+++ /dev/null
@@ -1,49 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
-<title>ATC: fix_modify AtC read_restart</title>
-<link href="tabs.css" rel="stylesheet" type="text/css"/>
-<link href="doxygen.css" rel="stylesheet" type="text/css"/>
-</head>
-<body>
-<center>
-  <a href="http://lammps.sandia.gov">LAMMPS Website</a> &nbsp; &nbsp;
-  <a href="../../Manual.html">LAMMPS Manual</a> &nbsp; &nbsp;
-  <a href="../../fix_atc.html">USER-AtC Manual</a> &nbsp; &nbsp;
-  <a href="../../Commands_all.html">Commands</a>
-</center>
-
-<hr>
-
-
-<!-- Generated by Doxygen 1.6.1 -->
-<div class="contents">
-
-
-<h3><a class="anchor" id="man_read_restart">fix_modify AtC read_restart </a></h3><h4><a class="anchor" id="syntax">
-syntax</a></h4>
-<p>fix_modify AtC read_restart [file_name] <br/>
- </p>
-<h4><a class="anchor" id="examples">
-examples</a></h4>
-<p><code> fix_modify AtC read_restart ATC_state </code> <br/>
- </p>
-<h4><a class="anchor" id="description">
-description</a></h4>
-<p>Reads the current state of the fields from a named text-based restart file. </p>
-<h4><a class="anchor" id="restrictions">
-restrictions</a></h4>
-<p>The restart file only contains fields and their time derivatives. The reference positions of the atoms and the commands that initialize the fix are not saved e.g. an identical mesh containing the same atoms will have to be recreated. </p>
-<h4><a class="anchor" id="related">
-related</a></h4>
-<p>see write_restart <a class="el" href="man_write_restart.html">fix_modify AtC write_restart</a> </p>
-<h4><a class="anchor" id="default">
-default</a></h4>
-<p>none </p>
-</div>
-<hr size="1"/><address style="text-align: right;"><small>Generated on 21 Aug 2013 for ATC by&nbsp;
-<a href="http://www.doxygen.org/index.html">
-<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.6.1 </small></address>
-</body>
-</html>
diff --git a/doc/src/USER/atc/man_remove_molecule.html b/doc/src/USER/atc/man_remove_molecule.html
deleted file mode 100644
index 54e4e3419f..0000000000
--- a/doc/src/USER/atc/man_remove_molecule.html
+++ /dev/null
@@ -1,52 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
-<title>ATC: fix_modify AtC remove_molecule</title>
-<link href="tabs.css" rel="stylesheet" type="text/css"/>
-<link href="doxygen.css" rel="stylesheet" type="text/css"/>
-</head>
-<body>
-<center>
-  <a href="http://lammps.sandia.gov">LAMMPS Website</a> &nbsp; &nbsp;
-  <a href="../../Manual.html">LAMMPS Manual</a> &nbsp; &nbsp;
-  <a href="../../fix_atc.html">USER-AtC Manual</a> &nbsp; &nbsp;
-  <a href="../../Commands_all.html">Commands</a>
-</center>
-
-<hr>
-
-
-<!-- Generated by Doxygen 1.6.1 -->
-<div class="contents">
-
-
-<h3><a class="anchor" id="man_remove_molecule">fix_modify AtC remove_molecule </a></h3><h4><a class="anchor" id="syntax">
-syntax</a></h4>
-<p>fix_modify_AtC remove_molecule &lt;TAG&gt; <br/>
-</p>
-<ul>
-<li>&lt;TAG&gt; = tag for tracking a molecule type <br/>
- </li>
-</ul>
-<h4><a class="anchor" id="examples">
-examples</a></h4>
-<p><code> fix_modify AtC remove_molecule water </code> <br/>
- </p>
-<h4><a class="anchor" id="description">
-description</a></h4>
-<p>Removes tag designated for tracking a specified set of molecules. <br/>
- </p>
-<h4><a class="anchor" id="restrictions">
-restrictions</a></h4>
-<h4><a class="anchor" id="related">
-related</a></h4>
-<h4><a class="anchor" id="default">
-default</a></h4>
-<p>No defaults for this command. </p>
-</div>
-<hr size="1"/><address style="text-align: right;"><small>Generated on 21 Aug 2013 for ATC by&nbsp;
-<a href="http://www.doxygen.org/index.html">
-<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.6.1 </small></address>
-</body>
-</html>
diff --git a/doc/src/USER/atc/man_remove_source.html b/doc/src/USER/atc/man_remove_source.html
deleted file mode 100644
index c15e0ca46d..0000000000
--- a/doc/src/USER/atc/man_remove_source.html
+++ /dev/null
@@ -1,50 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
-<title>ATC: fix_modify AtC remove_source</title>
-<link href="tabs.css" rel="stylesheet" type="text/css"/>
-<link href="doxygen.css" rel="stylesheet" type="text/css"/>
-</head>
-<body>
-<center>
-  <a href="http://lammps.sandia.gov">LAMMPS Website</a> &nbsp; &nbsp;
-  <a href="../../Manual.html">LAMMPS Manual</a> &nbsp; &nbsp;
-  <a href="../../fix_atc.html">USER-AtC Manual</a> &nbsp; &nbsp;
-  <a href="../../Commands_all.html">Commands</a>
-</center>
-
-<hr>
-
-
-<!-- Generated by Doxygen 1.6.1 -->
-<div class="contents">
-
-
-<h3><a class="anchor" id="man_remove_source">fix_modify AtC remove_source </a></h3><h4><a class="anchor" id="syntax">
-syntax</a></h4>
-<p>fix_modify AtC remove_source &lt;field&gt; &lt;element_set&gt;</p>
-<ul>
-<li>&lt;field&gt; = field name valid for type of physics</li>
-<li>&lt;element_set&gt; = name of set of elements </li>
-</ul>
-<h4><a class="anchor" id="examples">
-examples</a></h4>
-<p><code> fix_modify atc remove_source temperature groupNAME </code> </p>
-<h4><a class="anchor" id="description">
-description</a></h4>
-<p>Remove a domain source. </p>
-<h4><a class="anchor" id="restrictions">
-restrictions</a></h4>
-<p>keyword 'all' reserved in element_set name </p>
-<h4><a class="anchor" id="related">
-related</a></h4>
-<p>see <a class="el" href="man_source.html">fix_modify AtC source</a> </p>
-<h4><a class="anchor" id="default">
-default</a></h4>
-</div>
-<hr size="1"/><address style="text-align: right;"><small>Generated on 21 Aug 2013 for ATC by&nbsp;
-<a href="http://www.doxygen.org/index.html">
-<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.6.1 </small></address>
-</body>
-</html>
diff --git a/doc/src/USER/atc/man_remove_species.html b/doc/src/USER/atc/man_remove_species.html
deleted file mode 100644
index ee063ce57f..0000000000
--- a/doc/src/USER/atc/man_remove_species.html
+++ /dev/null
@@ -1,52 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
-<title>ATC: fix_modify AtC remove_species</title>
-<link href="tabs.css" rel="stylesheet" type="text/css"/>
-<link href="doxygen.css" rel="stylesheet" type="text/css"/>
-</head>
-<body>
-<center>
-  <a href="http://lammps.sandia.gov">LAMMPS Website</a> &nbsp; &nbsp;
-  <a href="../../Manual.html">LAMMPS Manual</a> &nbsp; &nbsp;
-  <a href="../../fix_atc.html">USER-AtC Manual</a> &nbsp; &nbsp;
-  <a href="../../Commands_all.html">Commands</a>
-</center>
-
-<hr>
-
-
-<!-- Generated by Doxygen 1.6.1 -->
-<div class="contents">
-
-
-<h3><a class="anchor" id="man_remove_species">fix_modify AtC remove_species </a></h3><h4><a class="anchor" id="syntax">
-syntax</a></h4>
-<p>fix_modify_AtC delete_species &lt;TAG&gt; <br/>
-</p>
-<ul>
-<li>&lt;TAG&gt; = tag for tracking a species <br/>
- </li>
-</ul>
-<h4><a class="anchor" id="examples">
-examples</a></h4>
-<p><code> fix_modify AtC remove_species gold </code> <br/>
- </p>
-<h4><a class="anchor" id="description">
-description</a></h4>
-<p>Removes tag designated for tracking a specified species. <br/>
- </p>
-<h4><a class="anchor" id="restrictions">
-restrictions</a></h4>
-<h4><a class="anchor" id="related">
-related</a></h4>
-<h4><a class="anchor" id="default">
-default</a></h4>
-<p>No defaults for this command. </p>
-</div>
-<hr size="1"/><address style="text-align: right;"><small>Generated on 21 Aug 2013 for ATC by&nbsp;
-<a href="http://www.doxygen.org/index.html">
-<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.6.1 </small></address>
-</body>
-</html>
diff --git a/doc/src/USER/atc/man_reset_atomic_reference_positions.html b/doc/src/USER/atc/man_reset_atomic_reference_positions.html
deleted file mode 100644
index 3c43861054..0000000000
--- a/doc/src/USER/atc/man_reset_atomic_reference_positions.html
+++ /dev/null
@@ -1,47 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
-<title>ATC: fix_modify AtC reset_atomic_reference_positions</title>
-<link href="tabs.css" rel="stylesheet" type="text/css"/>
-<link href="doxygen.css" rel="stylesheet" type="text/css"/>
-</head>
-<body>
-<center>
-  <a href="http://lammps.sandia.gov">LAMMPS Website</a> &nbsp; &nbsp;
-  <a href="../../Manual.html">LAMMPS Manual</a> &nbsp; &nbsp;
-  <a href="../../fix_atc.html">USER-AtC Manual</a> &nbsp; &nbsp;
-  <a href="../../Commands_all.html">Commands</a>
-</center>
-
-<hr>
-
-
-<!-- Generated by Doxygen 1.6.1 -->
-<div class="contents">
-
-
-<h3><a class="anchor" id="man_reset_atomic_reference_positions">fix_modify AtC reset_atomic_reference_positions </a></h3><h4><a class="anchor" id="syntax">
-syntax</a></h4>
-<p>fix_modify AtC reset_atomic_reference_positions </p>
-<h4><a class="anchor" id="examples">
-examples</a></h4>
-<p><code> fix_modify atc reset_atomic_reference_positions </code></p>
-<h4><a class="anchor" id="description">
-description</a></h4>
-<p><code> Resets the atomic positions <a class="el" href="namespaceATC.html" title="owned field/s: MASS_DENSITY">ATC</a> uses to perform point to field operations. In can be used to use perfect lattice sites in <a class="el" href="namespaceATC.html" title="owned field/s: MASS_DENSITY">ATC</a> but a thermalized or deformed lattice in LAMMPS. </code></p>
-<h4><a class="anchor" id="restrictions">
-restrictions</a></h4>
-<p><code> </code></p>
-<h4><a class="anchor" id="related">
-related</a></h4>
-<p><code> </code></p>
-<h4><a class="anchor" id="default">
-default</a></h4>
-<p><code> Default is off </code></p>
-</div>
-<hr size="1"/><address style="text-align: right;"><small>Generated on 21 Aug 2013 for ATC by&nbsp;
-<a href="http://www.doxygen.org/index.html">
-<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.6.1 </small></address>
-</body>
-</html>
diff --git a/doc/src/USER/atc/man_reset_time.html b/doc/src/USER/atc/man_reset_time.html
deleted file mode 100644
index 9607848e1a..0000000000
--- a/doc/src/USER/atc/man_reset_time.html
+++ /dev/null
@@ -1,63 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
-<title>ATC: fix_modify AtC reset_time</title>
-<link href="tabs.css" rel="stylesheet" type="text/css"/>
-<link href="doxygen.css" rel="stylesheet" type="text/css"/>
-</head>
-<body>
-<center>
-  <a href="http://lammps.sandia.gov">LAMMPS Website</a> &nbsp; &nbsp;
-  <a href="../../Manual.html">LAMMPS Manual</a> &nbsp; &nbsp;
-  <a href="../../fix_atc.html">USER-AtC Manual</a> &nbsp; &nbsp;
-  <a href="../../Commands_all.html">Commands</a>
-</center>
-
-<hr>
-
-
-<!-- Generated by Doxygen 1.6.1 -->
-<div class="contents">
-
-
-<h3><a class="anchor" id="man_reset_time">fix_modify AtC reset_time </a></h3><h4><a class="anchor" id="syntax">
-syntax</a></h4>
-<p>fix_modify AtC reset_time </p>
-<h4><a class="anchor" id="examples">
-examples</a></h4>
-<p><code> fix_modify atc reset_time 0.0 </code> <br/>
- </p>
-<h4><a class="anchor" id="description">
-description</a></h4>
-<p>Resets the simulation time counter. </p>
-<h4><a class="anchor" id="restrictions">
-restrictions</a></h4>
-<h4><a class="anchor" id="related">
-related</a></h4>
-<h4><a class="anchor" id="default">
-default</a></h4>
-<h4><a class="anchor" id="syntax">
-syntax</a></h4>
-<p>fix_modify AtC kernel_bandwidth </p>
-<h4><a class="anchor" id="examples">
-examples</a></h4>
-<p><code> fix_modify atc reset_time 8 </code> <br/>
- </p>
-<h4><a class="anchor" id="description">
-description</a></h4>
-<p>Sets a maximum parallel bandwidth for the kernel functions during parallel communication. If the command is not issued, the default will be to assume the bandwidth of the kernel matrix corresponds to the number of sampling locations. </p>
-<h4><a class="anchor" id="restrictions">
-restrictions</a></h4>
-<p>Only is used if kernel functions are being used. </p>
-<h4><a class="anchor" id="related">
-related</a></h4>
-<h4><a class="anchor" id="default">
-default</a></h4>
-<p>Number of sample locations. </p>
-</div>
-<hr size="1"/><address style="text-align: right;"><small>Generated on 21 Aug 2013 for ATC by&nbsp;
-<a href="http://www.doxygen.org/index.html">
-<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.6.1 </small></address>
-</body>
-</html>
diff --git a/doc/src/USER/atc/man_sample_frequency.html b/doc/src/USER/atc/man_sample_frequency.html
deleted file mode 100644
index 9a9a8e3a02..0000000000
--- a/doc/src/USER/atc/man_sample_frequency.html
+++ /dev/null
@@ -1,50 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
-<title>ATC: fix_modify AtC sample_frequency</title>
-<link href="tabs.css" rel="stylesheet" type="text/css"/>
-<link href="doxygen.css" rel="stylesheet" type="text/css"/>
-</head>
-<body>
-<center>
-  <a href="http://lammps.sandia.gov">LAMMPS Website</a> &nbsp; &nbsp;
-  <a href="../../Manual.html">LAMMPS Manual</a> &nbsp; &nbsp;
-  <a href="../../fix_atc.html">USER-AtC Manual</a> &nbsp; &nbsp;
-  <a href="../../Commands_all.html">Commands</a>
-</center>
-
-<hr>
-
-
-<!-- Generated by Doxygen 1.6.1 -->
-<div class="contents">
-
-
-<h3><a class="anchor" id="man_sample_frequency">fix_modify AtC sample_frequency </a></h3><h4><a class="anchor" id="syntax">
-syntax</a></h4>
-<p>fix_modify AtC sample_frequency [freq]</p>
-<ul>
-<li>freq (int) : frequency to sample field in number of steps </li>
-</ul>
-<h4><a class="anchor" id="examples">
-examples</a></h4>
-<p><code> fix_modify AtC sample_frequency 10 </code></p>
-<h4><a class="anchor" id="description">
-description</a></h4>
-<p><code> Specifies a frequency at which fields are computed for the case where time filters are being applied. </code></p>
-<h4><a class="anchor" id="restrictions">
-restrictions</a></h4>
-<p><code> Must be used with the hardy/field AtC fix ( see <a class="el" href="../../fix_atc.html">fix atc command</a> ) and is only relevant when time filters are being used. </code></p>
-<h4><a class="anchor" id="related">
-related</a></h4>
-<p><code> </code></p>
-<h4><a class="anchor" id="default">
-default</a></h4>
-<p><code> none </code></p>
-</div>
-<hr size="1"/><address style="text-align: right;"><small>Generated on 21 Aug 2013 for ATC by&nbsp;
-<a href="http://www.doxygen.org/index.html">
-<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.6.1 </small></address>
-</body>
-</html>
diff --git a/doc/src/USER/atc/man_set.html b/doc/src/USER/atc/man_set.html
deleted file mode 100644
index 55ad8d952b..0000000000
--- a/doc/src/USER/atc/man_set.html
+++ /dev/null
@@ -1,54 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
-<title>ATC: fix_modify AtC set</title>
-<link href="tabs.css" rel="stylesheet" type="text/css"/>
-<link href="doxygen.css" rel="stylesheet" type="text/css"/>
-</head>
-<body>
-<center>
-  <a href="http://lammps.sandia.gov">LAMMPS Website</a> &nbsp; &nbsp;
-  <a href="../../Manual.html">LAMMPS Manual</a> &nbsp; &nbsp;
-  <a href="../../fix_atc.html">USER-AtC Manual</a> &nbsp; &nbsp;
-  <a href="../../Commands_all.html">Commands</a>
-</center>
-
-<hr>
-
-
-<!-- Generated by Doxygen 1.6.1 -->
-<div class="contents">
-
-
-<h3><a class="anchor" id="man_set">fix_modify AtC set </a></h3><h4><a class="anchor" id="syntax">
-syntax</a></h4>
-<p>fix_modify AtC set reference_potential_energy &lt;value_or_filename(optional)&gt;</p>
-<ul>
-<li>value (double) : optional user specified zero point for PE in native LAMMPS energy units <br/>
-</li>
-<li>filename (string) : optional user specified string for file of nodal PE values to be read-in </li>
-</ul>
-<h4><a class="anchor" id="examples">
-examples</a></h4>
-<p><code> fix_modify AtC set reference_potential_energy </code> <br/>
- <code> fix_modify AtC set reference_potential_energy -0.05 </code> <br/>
- <code> fix_modify AtC set reference_potential_energy myPEvalues </code> <br/>
- </p>
-<h4><a class="anchor" id="description">
-description</a></h4>
-<p>Used to set various quantities for the post-processing algorithms. It sets the zero point for the potential energy density using the value provided for all nodes, or from the current configuration of the lattice if no value is provided, or values provided within the specified filename. </p>
-<h4><a class="anchor" id="restrictions">
-restrictions</a></h4>
-<p>Must be used with the hardy/field type of AtC fix ( see <a class="el" href="../../fix_atc.html">fix atc command</a> ) </p>
-<h4><a class="anchor" id="related">
-related</a></h4>
-<h4><a class="anchor" id="default">
-default</a></h4>
-<p>Defaults to lammps zero point i.e. isolated atoms </p>
-</div>
-<hr size="1"/><address style="text-align: right;"><small>Generated on 21 Aug 2013 for ATC by&nbsp;
-<a href="http://www.doxygen.org/index.html">
-<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.6.1 </small></address>
-</body>
-</html>
diff --git a/doc/src/USER/atc/man_source.html b/doc/src/USER/atc/man_source.html
deleted file mode 100644
index 78fb1652eb..0000000000
--- a/doc/src/USER/atc/man_source.html
+++ /dev/null
@@ -1,51 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
-<title>ATC: fix_modify AtC source</title>
-<link href="tabs.css" rel="stylesheet" type="text/css"/>
-<link href="doxygen.css" rel="stylesheet" type="text/css"/>
-</head>
-<body>
-<center>
-  <a href="http://lammps.sandia.gov">LAMMPS Website</a> &nbsp; &nbsp;
-  <a href="../../Manual.html">LAMMPS Manual</a> &nbsp; &nbsp;
-  <a href="../../fix_atc.html">USER-AtC Manual</a> &nbsp; &nbsp;
-  <a href="../../Commands_all.html">Commands</a>
-</center>
-
-<hr>
-
-
-<!-- Generated by Doxygen 1.6.1 -->
-<div class="contents">
-
-
-<h3><a class="anchor" id="man_source">fix_modify AtC source </a></h3><h4><a class="anchor" id="syntax">
-syntax</a></h4>
-<p>fix_modify AtC source &lt;field&gt; &lt;element_set&gt; &lt;value | function&gt;</p>
-<ul>
-<li>&lt;field&gt; = field name valid for type of physics</li>
-<li>&lt;element_set&gt; = name of set of elements </li>
-</ul>
-<h4><a class="anchor" id="examples">
-examples</a></h4>
-<p><code> fix_modify atc source temperature middle temporal_ramp 10. 0. </code> </p>
-<h4><a class="anchor" id="description">
-description</a></h4>
-<p>Add domain sources to the mesh. The units are consistent with LAMMPS's units for mass, length and time and are defined by the PDE being solved, e.g. for thermal transfer the balance equation is for energy and source is energy per time. </p>
-<h4><a class="anchor" id="restrictions">
-restrictions</a></h4>
-<p>keyword 'all' reserved in element_set name </p>
-<h4><a class="anchor" id="related">
-related</a></h4>
-<p>see <a class="el" href="man_remove_source.html">fix_modify AtC remove_source</a> </p>
-<h4><a class="anchor" id="default">
-default</a></h4>
-<p>none </p>
-</div>
-<hr size="1"/><address style="text-align: right;"><small>Generated on 21 Aug 2013 for ATC by&nbsp;
-<a href="http://www.doxygen.org/index.html">
-<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.6.1 </small></address>
-</body>
-</html>
diff --git a/doc/src/USER/atc/man_source_integration.html b/doc/src/USER/atc/man_source_integration.html
deleted file mode 100644
index 3b261b7810..0000000000
--- a/doc/src/USER/atc/man_source_integration.html
+++ /dev/null
@@ -1,44 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
-<title>ATC: fix_modify AtC source_integration</title>
-<link href="tabs.css" rel="stylesheet" type="text/css"/>
-<link href="doxygen.css" rel="stylesheet" type="text/css"/>
-</head>
-<body>
-<center>
-  <a href="http://lammps.sandia.gov">LAMMPS Website</a> &nbsp; &nbsp;
-  <a href="../../Manual.html">LAMMPS Manual</a> &nbsp; &nbsp;
-  <a href="../../fix_atc.html">USER-AtC Manual</a> &nbsp; &nbsp;
-  <a href="../../Commands_all.html">Commands</a>
-</center>
-
-<hr>
-
-
-<!-- Generated by Doxygen 1.6.1 -->
-<div class="contents">
-
-
-<h3><a class="anchor" id="man_source_integration">fix_modify AtC source_integration </a></h3><h4><a class="anchor" id="syntax">
-syntax</a></h4>
-<p>fix_modify AtC source_integration &lt; fe | atom&gt; </p>
-<h4><a class="anchor" id="examples">
-examples</a></h4>
-<p><code> fix_modify atc source_integration atom </code> </p>
-<h4><a class="anchor" id="description">
-description</a></h4>
-<h4><a class="anchor" id="restrictions">
-restrictions</a></h4>
-<h4><a class="anchor" id="related">
-related</a></h4>
-<h4><a class="anchor" id="default">
-default</a></h4>
-<p>Default is fe </p>
-</div>
-<hr size="1"/><address style="text-align: right;"><small>Generated on 21 Aug 2013 for ATC by&nbsp;
-<a href="http://www.doxygen.org/index.html">
-<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.6.1 </small></address>
-</body>
-</html>
diff --git a/doc/src/USER/atc/man_temperature_definition.html b/doc/src/USER/atc/man_temperature_definition.html
deleted file mode 100644
index c317c06c00..0000000000
--- a/doc/src/USER/atc/man_temperature_definition.html
+++ /dev/null
@@ -1,45 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
-<title>ATC: fix_modify AtC temperature_definition</title>
-<link href="tabs.css" rel="stylesheet" type="text/css"/>
-<link href="doxygen.css" rel="stylesheet" type="text/css"/>
-</head>
-<body>
-<center>
-  <a href="http://lammps.sandia.gov">LAMMPS Website</a> &nbsp; &nbsp;
-  <a href="../../Manual.html">LAMMPS Manual</a> &nbsp; &nbsp;
-  <a href="../../fix_atc.html">USER-AtC Manual</a> &nbsp; &nbsp;
-  <a href="../../Commands_all.html">Commands</a>
-</center>
-
-<hr>
-
-
-<!-- Generated by Doxygen 1.6.1 -->
-<div class="contents">
-
-
-<h3><a class="anchor" id="man_temperature_definition">fix_modify AtC temperature_definition </a></h3><h4><a class="anchor" id="syntax">
-syntax</a></h4>
-<p>fix_modify AtC temperature_definition &lt;kinetic|total&gt;</p>
-<h4><a class="anchor" id="examples">
-examples</a></h4>
-<p><code> fix_modify atc temperature_definition kinetic </code> <br/>
-</p>
-<h4><a class="anchor" id="description">
-description</a></h4>
-<p>Change the definition for the atomic temperature used to create the finite element temperature. The kinetic option is based only on the kinetic energy of the atoms while the total option uses the total energy (kinetic + potential) of an atom.</p>
-<h4><a class="anchor" id="restrictions">
-restrictions</a></h4>
-<p>This command is only valid when using thermal coupling. Also, while not a formal restriction, the user should ensure that associating a potential energy with each atom makes physical sense for the total option to be meaningful.</p>
-<h4><a class="anchor" id="default">
-default</a></h4>
-<p>kinetic </p>
-</div>
-<hr size="1"/><address style="text-align: right;"><small>Generated on 21 Aug 2013 for ATC by&nbsp;
-<a href="http://www.doxygen.org/index.html">
-<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.6.1 </small></address>
-</body>
-</html>
diff --git a/doc/src/USER/atc/man_thermal_time_integration.html b/doc/src/USER/atc/man_thermal_time_integration.html
deleted file mode 100644
index 830591921e..0000000000
--- a/doc/src/USER/atc/man_thermal_time_integration.html
+++ /dev/null
@@ -1,57 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
-<title>ATC: fix_modify AtC time_integration (thermal)</title>
-<link href="tabs.css" rel="stylesheet" type="text/css"/>
-<link href="doxygen.css" rel="stylesheet" type="text/css"/>
-</head>
-<body>
-<center>
-  <a href="http://lammps.sandia.gov">LAMMPS Website</a> &nbsp; &nbsp;
-  <a href="../../Manual.html">LAMMPS Manual</a> &nbsp; &nbsp;
-  <a href="../../fix_atc.html">USER-AtC Manual</a> &nbsp; &nbsp;
-  <a href="../../Commands_all.html">Commands</a>
-</center>
-
-<hr>
-
-
-<!-- Generated by Doxygen 1.6.1 -->
-<div class="contents">
-
-
-<h3><a class="anchor" id="man_thermal_time_integration">fix_modify AtC time_integration (thermal) </a></h3><h4><a class="anchor" id="syntax">
-syntax</a></h4>
-<p>fix_modify AtC time_integration &lt;descriptor&gt; <br/>
-</p>
-<ul>
-<li>descriptor (string) = time integration type <br/>
-</li>
-</ul>
-<p>various time integration methods for the finite elements<br/>
- </p>
-<h4><a class="anchor" id="description">
-description</a></h4>
-<p>gear - atomic velocity update with 2nd order Verlet, nodal temperature update with 3rd or 4th order Gear, thermostats based on controlling power <br/>
- fractional_step - atomic velocity update with 2nd order Verlet, mixed nodal temperature update, 3/4 Gear for continuum and 2 Verlet for atomic contributions, thermostats based on controlling discrete energy changes<br/>
- </p>
-<h4><a class="anchor" id="examples">
-examples</a></h4>
-<p><code> fix_modify atc time_integration gear </code> <br/>
- <code> fix_modify atc time_integration fractional_step </code> <br/>
- </p>
-<h4><a class="anchor" id="description">
-description</a></h4>
-<h4><a class="anchor" id="related">
-related</a></h4>
-<p>see <a class="el" href="../../fix_atc.html">fix atc command</a> </p>
-<h4><a class="anchor" id="default">
-default</a></h4>
-<p>none </p>
-</div>
-<hr size="1"/><address style="text-align: right;"><small>Generated on 21 Aug 2013 for ATC by&nbsp;
-<a href="http://www.doxygen.org/index.html">
-<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.6.1 </small></address>
-</body>
-</html>
diff --git a/doc/src/USER/atc/man_time_filter.html b/doc/src/USER/atc/man_time_filter.html
deleted file mode 100644
index 5000fb079d..0000000000
--- a/doc/src/USER/atc/man_time_filter.html
+++ /dev/null
@@ -1,55 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
-<title>ATC: fix_modify AtC filter</title>
-<link href="tabs.css" rel="stylesheet" type="text/css"/>
-<link href="doxygen.css" rel="stylesheet" type="text/css"/>
-</head>
-<body>
-<center>
-  <a href="http://lammps.sandia.gov">LAMMPS Website</a> &nbsp; &nbsp;
-  <a href="../../Manual.html">LAMMPS Manual</a> &nbsp; &nbsp;
-  <a href="../../fix_atc.html">USER-AtC Manual</a> &nbsp; &nbsp;
-  <a href="../../Commands_all.html">Commands</a>
-</center>
-
-<hr>
-
-
-<!-- Generated by Doxygen 1.6.1 -->
-<div class="contents">
-
-
-<h3><a class="anchor" id="man_time_filter">fix_modify AtC filter </a></h3><h4><a class="anchor" id="syntax">
-syntax</a></h4>
-<p>fix_modify AtC filter &lt;on | off | equilibrate&gt; <br/>
-</p>
-<ul>
-<li>on | off (keyword) = turns filter on or off<br/>
-</li>
-<li>equilibrate = runs dynamics without filtering but initializes filtered quantities </li>
-</ul>
-<h4><a class="anchor" id="examples">
-examples</a></h4>
-<p><code> fix_modify atc transfer filter on </code> <br/>
-</p>
-<h4><a class="anchor" id="description">
-description</a></h4>
-<p>Filters the MD dynamics to construct a more appropriate continuous field. Equilibrating first filters the time derivatives without changing the dynamics to provide a better initial condition to the filtered dynamics</p>
-<h4><a class="anchor" id="restrictions">
-restrictions</a></h4>
-<p>only for be used with specific transfers: thermal, two_temperature</p>
-<h4><a class="anchor" id="related">
-related</a></h4>
-<p><a class="el" href="man_filter_scale.html">fix_modify AtC filter scale</a> <br/>
- <a class="el" href="man_equilibrium_start.html">fix_modify AtC equilibrium_start</a></p>
-<h4><a class="anchor" id="default">
-default</a></h4>
-<p>off </p>
-</div>
-<hr size="1"/><address style="text-align: right;"><small>Generated on 21 Aug 2013 for ATC by&nbsp;
-<a href="http://www.doxygen.org/index.html">
-<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.6.1 </small></address>
-</body>
-</html>
diff --git a/doc/src/USER/atc/man_track_displacement.html b/doc/src/USER/atc/man_track_displacement.html
deleted file mode 100644
index 2c7cf26150..0000000000
--- a/doc/src/USER/atc/man_track_displacement.html
+++ /dev/null
@@ -1,46 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
-<title>ATC: fix_modify AtC track_displacement</title>
-<link href="tabs.css" rel="stylesheet" type="text/css"/>
-<link href="doxygen.css" rel="stylesheet" type="text/css"/>
-</head>
-<body>
-<center>
-  <a href="http://lammps.sandia.gov">LAMMPS Website</a> &nbsp; &nbsp;
-  <a href="../../Manual.html">LAMMPS Manual</a> &nbsp; &nbsp;
-  <a href="../../fix_atc.html">USER-AtC Manual</a> &nbsp; &nbsp;
-  <a href="../../Commands_all.html">Commands</a>
-</center>
-
-<hr>
-
-
-<!-- Generated by Doxygen 1.6.1 -->
-<div class="contents">
-
-
-<h3><a class="anchor" id="man_track_displacement">fix_modify AtC track_displacement </a></h3><h4><a class="anchor" id="syntax">
-syntax</a></h4>
-<p>fix_modify AtC track_displacement &lt;on/off&gt; <br/>
- </p>
-<h4><a class="anchor" id="examples">
-examples</a></h4>
-<p><code> fix_modify atc track_displacement on </code> <br/>
- </p>
-<h4><a class="anchor" id="description">
-description</a></h4>
-<p>Determines whether displacement is tracked or not. For solids problems this is a useful quantity, but for fluids it is not relevant. </p>
-<h4><a class="anchor" id="restrictions">
-restrictions</a></h4>
-<p>Some constitutive models require the displacement field </p>
-<h4><a class="anchor" id="default">
-default</a></h4>
-<p>on </p>
-</div>
-<hr size="1"/><address style="text-align: right;"><small>Generated on 21 Aug 2013 for ATC by&nbsp;
-<a href="http://www.doxygen.org/index.html">
-<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.6.1 </small></address>
-</body>
-</html>
diff --git a/doc/src/USER/atc/man_unfix_flux.html b/doc/src/USER/atc/man_unfix_flux.html
deleted file mode 100644
index 551896431a..0000000000
--- a/doc/src/USER/atc/man_unfix_flux.html
+++ /dev/null
@@ -1,50 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
-<title>ATC: fix_modify AtC unfix_flux</title>
-<link href="tabs.css" rel="stylesheet" type="text/css"/>
-<link href="doxygen.css" rel="stylesheet" type="text/css"/>
-</head>
-<body>
-<center>
-  <a href="http://lammps.sandia.gov">LAMMPS Website</a> &nbsp; &nbsp;
-  <a href="../../Manual.html">LAMMPS Manual</a> &nbsp; &nbsp;
-  <a href="../../fix_atc.html">USER-AtC Manual</a> &nbsp; &nbsp;
-  <a href="../../Commands_all.html">Commands</a>
-</center>
-
-<hr>
-
-
-<!-- Generated by Doxygen 1.6.1 -->
-<div class="contents">
-
-
-<h3><a class="anchor" id="man_unfix_flux">fix_modify AtC unfix_flux </a></h3><h4><a class="anchor" id="syntax">
-syntax</a></h4>
-<p>fix_modify AtC fix_flux &lt;field&gt; &lt;face_set&gt; &lt;value | function&gt;</p>
-<ul>
-<li>&lt;field&gt; = field name valid for type of physics, temperature | electron_temperature</li>
-<li>&lt;face_set&gt; = name of set of element faces </li>
-</ul>
-<h4><a class="anchor" id="examples">
-examples</a></h4>
-<p><code> fix_modify atc unfix_flux temperature faceSet </code> <br/>
-</p>
-<h4><a class="anchor" id="description">
-description</a></h4>
-<p>Command for removing prescribed normal fluxes e.g. heat_flux, stress. </p>
-<h4><a class="anchor" id="restrictions">
-restrictions</a></h4>
-<h4><a class="anchor" id="related">
-related</a></h4>
-<p>see <a class="el" href="man_unfix_flux.html">fix_modify AtC unfix_flux</a> </p>
-<h4><a class="anchor" id="default">
-default</a></h4>
-</div>
-<hr size="1"/><address style="text-align: right;"><small>Generated on 21 Aug 2013 for ATC by&nbsp;
-<a href="http://www.doxygen.org/index.html">
-<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.6.1 </small></address>
-</body>
-</html>
diff --git a/doc/src/USER/atc/man_unfix_nodes.html b/doc/src/USER/atc/man_unfix_nodes.html
deleted file mode 100644
index 4dfd9b3cfc..0000000000
--- a/doc/src/USER/atc/man_unfix_nodes.html
+++ /dev/null
@@ -1,51 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
-<title>ATC: fix_modify AtC unfix</title>
-<link href="tabs.css" rel="stylesheet" type="text/css"/>
-<link href="doxygen.css" rel="stylesheet" type="text/css"/>
-</head>
-<body>
-<center>
-  <a href="http://lammps.sandia.gov">LAMMPS Website</a> &nbsp; &nbsp;
-  <a href="../../Manual.html">LAMMPS Manual</a> &nbsp; &nbsp;
-  <a href="../../fix_atc.html">USER-AtC Manual</a> &nbsp; &nbsp;
-  <a href="../../Commands_all.html">Commands</a>
-</center>
-
-<hr>
-
-
-<!-- Generated by Doxygen 1.6.1 -->
-<div class="contents">
-
-
-<h3><a class="anchor" id="man_unfix_nodes">fix_modify AtC unfix </a></h3><h4><a class="anchor" id="syntax">
-syntax</a></h4>
-<p>fix_modify AtC unfix &lt;field&gt; &lt;nodeset&gt;</p>
-<ul>
-<li>&lt;field&gt; = field name valid for type of physics</li>
-<li>&lt;nodeset&gt; = name of set of nodes </li>
-</ul>
-<h4><a class="anchor" id="examples">
-examples</a></h4>
-<p><code> fix_modify AtC unfix temperature groupNAME </code> </p>
-<h4><a class="anchor" id="description">
-description</a></h4>
-<p>Removes constraint on field values for specified nodes. </p>
-<h4><a class="anchor" id="restrictions">
-restrictions</a></h4>
-<p>keyword 'all' reserved in nodeset name </p>
-<h4><a class="anchor" id="related">
-related</a></h4>
-<p>see <a class="el" href="man_fix_nodes.html">fix_modify AtC fix</a> </p>
-<h4><a class="anchor" id="default">
-default</a></h4>
-<p>none </p>
-</div>
-<hr size="1"/><address style="text-align: right;"><small>Generated on 21 Aug 2013 for ATC by&nbsp;
-<a href="http://www.doxygen.org/index.html">
-<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.6.1 </small></address>
-</body>
-</html>
diff --git a/doc/src/USER/atc/man_write_atom_weights.html b/doc/src/USER/atc/man_write_atom_weights.html
deleted file mode 100644
index 1722d74f67..0000000000
--- a/doc/src/USER/atc/man_write_atom_weights.html
+++ /dev/null
@@ -1,51 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
-<title>ATC: fix_modify AtC write_atom_weights</title>
-<link href="tabs.css" rel="stylesheet" type="text/css"/>
-<link href="doxygen.css" rel="stylesheet" type="text/css"/>
-</head>
-<body>
-<center>
-  <a href="http://lammps.sandia.gov">LAMMPS Website</a> &nbsp; &nbsp;
-  <a href="../../Manual.html">LAMMPS Manual</a> &nbsp; &nbsp;
-  <a href="../../fix_atc.html">USER-AtC Manual</a> &nbsp; &nbsp;
-  <a href="../../Commands_all.html">Commands</a>
-</center>
-
-<hr>
-
-
-<!-- Generated by Doxygen 1.6.1 -->
-<div class="contents">
-
-
-<h3><a class="anchor" id="man_write_atom_weights">fix_modify AtC write_atom_weights </a></h3><h4><a class="anchor" id="syntax">
-syntax</a></h4>
-<p>fix_modify AtC write_atom_weights &lt;filename&gt; &lt;frequency&gt;</p>
-<ul>
-<li>&lt;filename&gt; = name of file that atomic weights are written to <br/>
-</li>
-<li>&lt;frequency&gt; = how often writes will occur <br/>
- </li>
-</ul>
-<h4><a class="anchor" id="examples">
-examples</a></h4>
-<p><code> fix_modify atc write_atom_weights atm_wt_file.txt 10 </code> <br/>
- </p>
-<h4><a class="anchor" id="description">
-description</a></h4>
-<p>Command for writing the values of atomic weights to a specified file. </p>
-<h4><a class="anchor" id="restrictions">
-restrictions</a></h4>
-<h4><a class="anchor" id="related">
-related</a></h4>
-<h4><a class="anchor" id="default">
-default</a></h4>
-</div>
-<hr size="1"/><address style="text-align: right;"><small>Generated on 21 Aug 2013 for ATC by&nbsp;
-<a href="http://www.doxygen.org/index.html">
-<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.6.1 </small></address>
-</body>
-</html>
diff --git a/doc/src/USER/atc/man_write_restart.html b/doc/src/USER/atc/man_write_restart.html
deleted file mode 100644
index 74c6e2d289..0000000000
--- a/doc/src/USER/atc/man_write_restart.html
+++ /dev/null
@@ -1,49 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
-<title>ATC: fix_modify AtC write_restart</title>
-<link href="tabs.css" rel="stylesheet" type="text/css"/>
-<link href="doxygen.css" rel="stylesheet" type="text/css"/>
-</head>
-<body>
-<center>
-  <a href="http://lammps.sandia.gov">LAMMPS Website</a> &nbsp; &nbsp;
-  <a href="../../Manual.html">LAMMPS Manual</a> &nbsp; &nbsp;
-  <a href="../../fix_atc.html">USER-AtC Manual</a> &nbsp; &nbsp;
-  <a href="../../Commands_all.html">Commands</a>
-</center>
-
-<hr>
-
-
-<!-- Generated by Doxygen 1.6.1 -->
-<div class="contents">
-
-
-<h3><a class="anchor" id="man_write_restart">fix_modify AtC write_restart </a></h3><h4><a class="anchor" id="syntax">
-syntax</a></h4>
-<p>fix_modify AtC write_restart [file_name] <br/>
- </p>
-<h4><a class="anchor" id="examples">
-examples</a></h4>
-<p><code> fix_modify AtC write_restart restart.mydata </code> <br/>
- </p>
-<h4><a class="anchor" id="description">
-description</a></h4>
-<p>Dumps the current state of the fields to a named text-based restart file. This done when the command is invoked and not repeated, unlike the similar lammps command. </p>
-<h4><a class="anchor" id="restrictions">
-restrictions</a></h4>
-<p>The restart file only contains fields and their time derivatives. The reference positions of the atoms and the commands that initialize the fix are not saved e.g. an identical mesh containing the same atoms will have to be recreated. </p>
-<h4><a class="anchor" id="related">
-related</a></h4>
-<p>see read_restart <a class="el" href="man_read_restart.html">fix_modify AtC read_restart</a> </p>
-<h4><a class="anchor" id="default">
-default</a></h4>
-<p>none </p>
-</div>
-<hr size="1"/><address style="text-align: right;"><small>Generated on 21 Aug 2013 for ATC by&nbsp;
-<a href="http://www.doxygen.org/index.html">
-<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.6.1 </small></address>
-</body>
-</html>
diff --git a/doc/src/angle_charmm.rst b/doc/src/angle_charmm.rst
index 34843fe855..a8c227c765 100644
--- a/doc/src/angle_charmm.rst
+++ b/doc/src/angle_charmm.rst
@@ -15,7 +15,6 @@ angle_style charmm/omp command
 Syntax
 """"""
 
-
 .. code-block:: LAMMPS
 
    angle_style charmm
@@ -23,7 +22,6 @@ Syntax
 Examples
 """"""""
 
-
 .. code-block:: LAMMPS
 
    angle_style charmm
@@ -38,8 +36,7 @@ The *charmm* angle style uses the potential
 
    E = K (\theta - \theta_0)^2 + K_{ub} (r - r_{ub})^2
 
-
-with an additional Urey\_Bradley term based on the distance :math:`r` between
+with an additional Urey_Bradley term based on the distance :math:`r` between
 the 1st and 3rd atoms in the angle.  :math:`K`, :math:`\theta_0`,
 :math:`K_{ub}`, and :math:`R_{ub}` are coefficients defined for each angle
 type.
@@ -60,10 +57,8 @@ or :doc:`read_restart <read_restart>` commands:
 :math:`\theta_0` is specified in degrees, but LAMMPS converts it to radians
 internally; hence the units of :math:`K` are in energy/radian\^2.
 
-
 ----------
 
-
 Styles with a *gpu*\ , *intel*\ , *kk*\ , *omp*\ , or *opt* suffix are
 functionally the same as the corresponding style without the suffix.
 They have been optimized to run faster, depending on your available
@@ -82,14 +77,11 @@ by including their suffix, or you can use the :doc:`-suffix command-line switch
 See :doc:`Speed packages <Speed_packages>` doc page for more
 instructions on how to use the accelerated styles effectively.
 
-
 ----------
 
-
 Restrictions
 """"""""""""
 
-
 This angle style can only be used if LAMMPS was built with the
 MOLECULE package.  See the :doc:`Build package <Build_package>` doc page
 for more info.
@@ -101,13 +93,9 @@ Related commands
 
 **Default:** none
 
-
 ----------
 
-
 .. _angle-MacKerell:
 
-
-
 **(MacKerell)** MacKerell, Bashford, Bellott, Dunbrack, Evanseck, Field,
 Fischer, Gao, Guo, Ha, et al, J Phys Chem, 102, 3586 (1998).
diff --git a/doc/src/angle_class2.rst b/doc/src/angle_class2.rst
index ae5330d964..afacfb7c1d 100644
--- a/doc/src/angle_class2.rst
+++ b/doc/src/angle_class2.rst
@@ -15,7 +15,6 @@ angle_style class2/p6 command
 Syntax
 """"""
 
-
 .. code-block:: LAMMPS
 
    angle_style class2
@@ -23,7 +22,6 @@ Syntax
 Examples
 """"""""
 
-
 .. code-block:: LAMMPS
 
    angle_style class2
@@ -43,7 +41,6 @@ The *class2* angle style uses the potential
    E_{bb} & = M (r_{ij} - r_1) (r_{jk} - r_2) \\
    E_{ba} & = N_1 (r_{ij} - r_1) (\theta - \theta_0) + N_2(r_{jk} - r_2)(\theta - \theta_0)
 
-
 where :math:`E_a` is the angle term, :math:`E_{bb}` is a bond-bond term, and :math:`E_{ba}` is a
 bond-angle term.  :math:`\theta_0` is the equilibrium angle and :math:`r_1` and :math:`r_2` are
 the equilibrium bond lengths.
@@ -94,10 +91,8 @@ the angle type.
 The :math:`\theta_0` value in the :math:`E_{ba}` formula is not specified,
 since it is the same value from the :math:`E_a` formula.
 
-
 ----------
 
-
 Styles with a *gpu*\ , *intel*\ , *kk*\ , *omp*\ , or *opt* suffix are
 functionally the same as the corresponding style without the suffix.
 They have been optimized to run faster, depending on your available
@@ -116,17 +111,14 @@ by including their suffix, or you can use the :doc:`-suffix command-line switch
 See the :doc:`Speed packages <Speed_packages>` doc page for more
 instructions on how to use the accelerated styles effectively.
 
-
 ----------
 
-
 The *class2/p6* angle style uses the *class2* potential expanded to sixth order:
 
 .. math::
 
    E_{a} = K_2\left(\theta - \theta_0\right)^2 + K_3\left(\theta - \theta_0\right)^3 + K_4\left(\theta - \theta_0\right)^4 + K_5\left(\theta - \theta_0\right)^5 + K_6\left(\theta - \theta_0\right)^6
 
-
 In this expanded term 6 coefficients for the :math:`E_a` formula need to be set:
 
 * :math:`\theta_0` (degrees)
@@ -138,14 +130,11 @@ In this expanded term 6 coefficients for the :math:`E_a` formula need to be set:
 
 The bond-bond and bond-angle terms remain unchanged.
 
-
 ----------
 
-
 Restrictions
 """"""""""""
 
-
 This angle style can only be used if LAMMPS was built with the CLASS2
 package.  For the *class2/p6* style LAMMPS needs to be built with the
 USER-MOFFF package.  See the :doc:`Build package <Build_package>` doc
@@ -158,12 +147,8 @@ Related commands
 
 **Default:** none
 
-
 ----------
 
-
 .. _angle-Sun:
 
-
-
 **(Sun)** Sun, J Phys Chem B 102, 7338-7364 (1998).
diff --git a/doc/src/angle_coeff.rst b/doc/src/angle_coeff.rst
index 5f9a71371a..9066b45462 100644
--- a/doc/src/angle_coeff.rst
+++ b/doc/src/angle_coeff.rst
@@ -6,7 +6,6 @@ angle_coeff command
 Syntax
 """"""
 
-
 .. code-block:: LAMMPS
 
    angle_coeff N args
@@ -17,7 +16,6 @@ Syntax
 Examples
 """"""""
 
-
 .. code-block:: LAMMPS
 
    angle_coeff 1 300.0 107.0
@@ -45,7 +43,6 @@ Note that using an :doc:`angle_coeff <angle_coeff>` command can override a previ
 for the same angle type.  For example, these commands set the coeffs
 for all angle types, then overwrite the coeffs for just angle type 2:
 
-
 .. code-block:: LAMMPS
 
    angle_coeff * 200.0 107.0 1.2
@@ -58,7 +55,6 @@ coefficients for all N types must be listed in the file.  For example,
 under the "Angle Coeffs" section of a data file, the line that
 corresponds to the 1st example above would be listed as
 
-
 .. parsed-literal::
 
    1 300.0 107.0
@@ -68,10 +64,8 @@ rule, in that an additional argument is used in the input script to
 allow specification of the cross-term coefficients.   See its
 doc page for details.
 
-
 ----------
 
-
 The list of all angle styles defined in LAMMPS is given on the
 :doc:`angle_style <angle_style>` doc page.  They are also listed in more
 compact form on the :ref:`Commands angle <angle>` doc
@@ -81,14 +75,11 @@ On either of those pages, click on the style to display the formula it
 computes and its coefficients as specified by the associated
 :doc:`angle_coeff <angle_coeff>` command.
 
-
 ----------
 
-
 Restrictions
 """"""""""""
 
-
 This command must come after the simulation box is defined by a
 :doc:`read_data <read_data>`, :doc:`read_restart <read_restart>`, or
 :doc:`create_box <create_box>` command.
diff --git a/doc/src/angle_cosine.rst b/doc/src/angle_cosine.rst
index 583f43bc40..f104771781 100644
--- a/doc/src/angle_cosine.rst
+++ b/doc/src/angle_cosine.rst
@@ -12,7 +12,6 @@ angle_style cosine/kk command
 Syntax
 """"""
 
-
 .. code-block:: LAMMPS
 
    angle_style cosine
@@ -20,7 +19,6 @@ Syntax
 Examples
 """"""""
 
-
 .. code-block:: LAMMPS
 
    angle_style cosine
@@ -35,7 +33,6 @@ The *cosine* angle style uses the potential
 
    E = K [1 + \cos(\theta)]
 
-
 where :math:`K` is defined for each angle type.
 
 The following coefficients must be defined for each angle type via the
@@ -45,10 +42,8 @@ or :doc:`read_restart <read_restart>` commands:
 
 * :math:`K` (energy)
 
-
 ----------
 
-
 Styles with a *gpu*\ , *intel*\ , *kk*\ , *omp*\ , or *opt* suffix are
 functionally the same as the corresponding style without the suffix.
 They have been optimized to run faster, depending on your available
@@ -67,14 +62,11 @@ by including their suffix, or you can use the :doc:`-suffix command-line switch
 See the :doc:`Speed packages <Speed_packages>` doc page for more
 instructions on how to use the accelerated styles effectively.
 
-
 ----------
 
-
 Restrictions
 """"""""""""
 
-
 This angle style can only be used if LAMMPS was built with the
 MOLECULE package.  See the :doc:`Build package <Build_package>` doc page
 for more info.
diff --git a/doc/src/angle_cosine_buck6d.rst b/doc/src/angle_cosine_buck6d.rst
index bb024c3474..228b96abc8 100644
--- a/doc/src/angle_cosine_buck6d.rst
+++ b/doc/src/angle_cosine_buck6d.rst
@@ -6,7 +6,6 @@ angle_style cosine/buck6d command
 Syntax
 """"""
 
-
 .. code-block:: LAMMPS
 
    angle_style cosine/buck6d
@@ -14,7 +13,6 @@ Syntax
 Examples
 """"""""
 
-
 .. code-block:: LAMMPS
 
    angle_style cosine/buck6d
@@ -46,22 +44,19 @@ internally.
 
 Additional to the cosine term the *cosine/buck6d* angle style computes
 the short range (vdW) interaction belonging to the
-:doc:`pair\_buck6d <pair_buck6d_coul_gauss>` between the end atoms of the
+:doc:`pair_style buck6d <pair_buck6d_coul_gauss>` between the end atoms of the
 angle.  For this reason this angle style only works in combination
-with the :doc:`pair\_buck6d <pair_buck6d_coul_gauss>` styles and needs
+with the :doc:`pair_style buck6d <pair_buck6d_coul_gauss>` styles and needs
 the :doc:`special_bonds <special_bonds>` 1-3 interactions to be weighted
 0.0 to prevent double counting.
 
-
 ----------
 
-
 Restrictions
 """"""""""""
 
-
 *cosine/buck6d* can only be used in combination with the
-:doc:`pair\_buck6d <pair_buck6d_coul_gauss>` style and with a
+:doc:`pair_style buck6d <pair_buck6d_coul_gauss>` style and with a
 :doc:`special_bonds <special_bonds>` 0.0 weighting of 1-3 interactions.
 
 This angle style can only be used if LAMMPS was built with the
diff --git a/doc/src/angle_cosine_delta.rst b/doc/src/angle_cosine_delta.rst
index f83b03b36d..3d29d134e0 100644
--- a/doc/src/angle_cosine_delta.rst
+++ b/doc/src/angle_cosine_delta.rst
@@ -9,7 +9,6 @@ angle_style cosine/delta/omp command
 Syntax
 """"""
 
-
 .. code-block:: LAMMPS
 
    angle_style cosine/delta
@@ -17,7 +16,6 @@ Syntax
 Examples
 """"""""
 
-
 .. code-block:: LAMMPS
 
    angle_style cosine/delta
@@ -32,7 +30,6 @@ The *cosine/delta* angle style uses the potential
 
    E = K [1 - \cos(\theta - \theta_0)]
 
-
 where :math:`\theta_0` is the equilibrium value of the angle, and :math:`K` is a
 prefactor.  Note that the usual 1/2 factor is included in :math:`K`.
 
@@ -47,10 +44,8 @@ or :doc:`read_restart <read_restart>` commands:
 :math:`\theta_0` is specified in degrees, but LAMMPS converts it to radians
 internally.
 
-
 ----------
 
-
 Styles with a *gpu*\ , *intel*\ , *kk*\ , *omp*\ , or *opt* suffix are
 functionally the same as the corresponding style without the suffix.
 They have been optimized to run faster, depending on your available
@@ -69,14 +64,11 @@ by including their suffix, or you can use the :doc:`-suffix command-line switch
 See the :doc:`Speed packages <Speed_packages>` doc page for more
 instructions on how to use the accelerated styles effectively.
 
-
 ----------
 
-
 Restrictions
 """"""""""""
 
-
 This angle style can only be used if LAMMPS was built with the
 MOLECULE package.  See the :doc:`Build package <Build_package>` doc page
 for more info.
diff --git a/doc/src/angle_cosine_periodic.rst b/doc/src/angle_cosine_periodic.rst
index c8ede7e03d..d0c774e5f6 100644
--- a/doc/src/angle_cosine_periodic.rst
+++ b/doc/src/angle_cosine_periodic.rst
@@ -9,7 +9,6 @@ angle_style cosine/periodic/omp command
 Syntax
 """"""
 
-
 .. code-block:: LAMMPS
 
    angle_style cosine/periodic
@@ -17,7 +16,6 @@ Syntax
 Examples
 """"""""
 
-
 .. code-block:: LAMMPS
 
    angle_style cosine/periodic
@@ -36,7 +34,6 @@ center:
 
    E = C \left[ 1 - B(-1)^n\cos\left( n\theta\right) \right]
 
-
 where :math:`C`, :math:`B` and :math:`n` are coefficients defined for each angle type.
 
 See :ref:`(Mayo) <cosine-Mayo>` for a description of the DREIDING force field
@@ -55,10 +52,8 @@ constant :math:`K = \frac{C}{n^2}`.  When :math:`B = 1`, it leads to a minimum f
 linear geometry.  When :math:`B = -1`, it leads to a maximum for the linear
 geometry.
 
-
 ----------
 
-
 Styles with a *gpu*\ , *intel*\ , *kk*\ , *omp*\ , or *opt* suffix are
 functionally the same as the corresponding style without the suffix.
 They have been optimized to run faster, depending on your available
@@ -77,14 +72,11 @@ by including their suffix, or you can use the :doc:`-suffix command-line switch
 See the :doc:`Speed packages <Speed_packages>` doc page for more
 instructions on how to use the accelerated styles effectively.
 
-
 ----------
 
-
 Restrictions
 """"""""""""
 
-
 This angle style can only be used if LAMMPS was built with the
 MOLECULE package.  See the :doc:`Build package <Build_package>` doc page
 for more info.
@@ -96,13 +88,9 @@ Related commands
 
 **Default:** none
 
-
 ----------
 
-
 .. _cosine-Mayo:
 
-
-
 **(Mayo)** Mayo, Olfason, Goddard III, J Phys Chem, 94, 8897-8909
 (1990).
diff --git a/doc/src/angle_cosine_shift.rst b/doc/src/angle_cosine_shift.rst
index 00b494bc08..70198034ed 100644
--- a/doc/src/angle_cosine_shift.rst
+++ b/doc/src/angle_cosine_shift.rst
@@ -9,7 +9,6 @@ angle_style cosine/shift/omp command
 Syntax
 """"""
 
-
 .. code-block:: LAMMPS
 
    angle_style cosine/shift
@@ -17,7 +16,6 @@ Syntax
 Examples
 """"""""
 
-
 .. code-block:: LAMMPS
 
    angle_style cosine/shift
@@ -32,7 +30,6 @@ The *cosine/shift* angle style uses the potential
 
    E = -\frac{U_{\text{min}}}{2} \left[ 1 + \cos(\theta-\theta_0) \right]
 
-
 where :math:`\theta_0` is the equilibrium angle. The potential is bounded
 between :math:`-U_{\text{min}}` and zero. In the neighborhood of the minimum
 :math:`E = - U_{\text{min}} + U_{\text{min}}/4(\theta - \theta_0)^2` hence
@@ -46,10 +43,8 @@ or :doc:`read_restart <read_restart>` commands:
 * :math:`U_{\text{min}}` (energy)
 * :math:`\theta` (angle)
 
-
 ----------
 
-
 Styles with a *gpu*\ , *intel*\ , *kk*\ , *omp*\ , or *opt* suffix are
 functionally the same as the corresponding style without the suffix.
 They have been optimized to run faster, depending on your available
@@ -68,14 +63,11 @@ by including their suffix, or you can use the :doc:`-suffix command-line switch
 See the :doc:`Speed packages <Speed_packages>` doc page for more
 instructions on how to use the accelerated styles effectively.
 
-
 ----------
 
-
 Restrictions
 """"""""""""
 
-
 This angle style can only be used if LAMMPS was built with the
 USER-MISC package.
 
@@ -83,6 +75,6 @@ Related commands
 """"""""""""""""
 
 :doc:`angle_coeff <angle_coeff>`,
-:doc:`angle\_cosine\_shift\_exp <angle_cosine_shift_exp>`
+:doc:`angle_style cosine/shift/exp <angle_cosine_shift_exp>`
 
 **Default:** none
diff --git a/doc/src/angle_cosine_shift_exp.rst b/doc/src/angle_cosine_shift_exp.rst
index ae810f9f33..5193b3abfc 100644
--- a/doc/src/angle_cosine_shift_exp.rst
+++ b/doc/src/angle_cosine_shift_exp.rst
@@ -9,7 +9,6 @@ angle_style cosine/shift/exp/omp command
 Syntax
 """"""
 
-
 .. code-block:: LAMMPS
 
    angle_style cosine/shift/exp
@@ -17,7 +16,6 @@ Syntax
 Examples
 """"""""
 
-
 .. code-block:: LAMMPS
 
    angle_style cosine/shift/exp
@@ -56,10 +54,8 @@ or :doc:`read_restart <read_restart>` commands:
 * :math:`\theta` (angle)
 * :math:`A` (real number)
 
-
 ----------
 
-
 Styles with a *gpu*\ , *intel*\ , *kk*\ , *omp*\ , or *opt* suffix are
 functionally the same as the corresponding style without the suffix.
 They have been optimized to run faster, depending on your available
@@ -78,14 +74,11 @@ by including their suffix, or you can use the :doc:`-suffix command-line switch
 See the :doc:`Speed packages <Speed_packages>` doc page for more
 instructions on how to use the accelerated styles effectively.
 
-
 ----------
 
-
 Restrictions
 """"""""""""
 
-
 This angle style can only be used if LAMMPS was built with the
 USER-MISC package.  See the :doc:`Build package <Build_package>` doc
 page for more info.
@@ -94,7 +87,7 @@ Related commands
 """"""""""""""""
 
 :doc:`angle_coeff <angle_coeff>`,
-:doc:`angle\_cosine\_shift <angle_cosine_shift>`,
-:doc:`dihedral\_cosine\_shift\_exp <dihedral_cosine_shift_exp>`
+:doc:`angle_style cosine/shift <angle_cosine_shift>`,
+:doc:`dihedral_style cosine/shift/exp <dihedral_cosine_shift_exp>`
 
 **Default:** none
diff --git a/doc/src/angle_cosine_squared.rst b/doc/src/angle_cosine_squared.rst
index ee9258dda8..722b098f54 100644
--- a/doc/src/angle_cosine_squared.rst
+++ b/doc/src/angle_cosine_squared.rst
@@ -9,7 +9,6 @@ angle_style cosine/squared/omp command
 Syntax
 """"""
 
-
 .. code-block:: LAMMPS
 
    angle_style cosine/squared
@@ -17,7 +16,6 @@ Syntax
 Examples
 """"""""
 
-
 .. code-block:: LAMMPS
 
    angle_style cosine/squared
@@ -32,7 +30,6 @@ The *cosine/squared* angle style uses the potential
 
    E = K [\cos(\theta) - \cos(\theta_0)]^2
 
-
 where :math:`\theta_0` is the equilibrium value of the angle, and :math:`K` is a
 prefactor.  Note that the usual 1/2 factor is included in :math:`K`.
 
@@ -47,10 +44,8 @@ or :doc:`read_restart <read_restart>` commands:
 :math:`\theta_0` is specified in degrees, but LAMMPS converts it to radians
 internally.
 
-
 ----------
 
-
 Styles with a *gpu*\ , *intel*\ , *kk*\ , *omp*\ , or *opt* suffix are
 functionally the same as the corresponding style without the suffix.
 They have been optimized to run faster, depending on your available
@@ -69,14 +64,11 @@ by including their suffix, or you can use the :doc:`-suffix command-line switch
 See the :doc:`Speed packages <Speed_packages>` doc page for more
 instructions on how to use the accelerated styles effectively.
 
-
 ----------
 
-
 Restrictions
 """"""""""""
 
-
 This angle style can only be used if LAMMPS was built with the
 MOLECULE package.  See the :doc:`Build package <Build_package>` doc page
 for more info.
diff --git a/doc/src/angle_cross.rst b/doc/src/angle_cross.rst
index eb5865c060..4fa95481ac 100644
--- a/doc/src/angle_cross.rst
+++ b/doc/src/angle_cross.rst
@@ -6,7 +6,6 @@ angle_style cross command
 Syntax
 """"""
 
-
 .. code-block:: LAMMPS
 
    angle_style cross
@@ -14,7 +13,6 @@ Syntax
 Examples
 """"""""
 
-
 .. code-block:: LAMMPS
 
    angle_style cross
@@ -54,9 +52,8 @@ internally; hence the units of :math:`K_{BS0}` and :math:`K_{BS1}` are in energy
 Restrictions
 """"""""""""
 
-
 This angle style can only be used if LAMMPS was built with the
-USER\_YAFF package.  See the :doc:`Build package <Build_package>` doc
+USER_YAFF package.  See the :doc:`Build package <Build_package>` doc
 page for more info.
 
 Related commands
diff --git a/doc/src/angle_dipole.rst b/doc/src/angle_dipole.rst
index cfa4313b30..8cd171c35e 100644
--- a/doc/src/angle_dipole.rst
+++ b/doc/src/angle_dipole.rst
@@ -9,7 +9,6 @@ angle_style dipole/omp command
 Syntax
 """"""
 
-
 .. code-block:: LAMMPS
 
    angle_style dipole
@@ -17,7 +16,6 @@ Syntax
 Examples
 """"""""
 
-
 .. code-block:: LAMMPS
 
    angle_style dipole
@@ -40,14 +38,12 @@ and the reference (bond) vector :math:`\vec{r_{ij}}`:
 
    \cos\gamma = \frac{\vec{\mu_j}\cdot\vec{r_{ij}}}{\mu_j\,r_{ij}}
 
-
 The *dipole* angle style uses the potential:
 
 .. math::
 
    E = K (\cos\gamma - \cos\gamma_0)^2
 
-
 where :math:`K` is a rigidity constant and gamma0 is an equilibrium (reference)
 angle.
 
@@ -59,7 +55,6 @@ potential using the 'chain rule' as in appendix C.3 of
 
    \vec{T_j} = \frac{2K(\cos\gamma - \cos\gamma_0)}{\mu_j\,r_{ij}}\, \vec{r_{ij}} \times \vec{\mu_j}
 
-
 Example: if :math:`\gamma_0` is set to 0 degrees, the torque generated by
 the potential will tend to align the dipole along the reference
 direction defined by the (bond) vector :math:`\vec{r_{ij}}` (in other words, :math:`\vec{\mu_j}` is
@@ -74,7 +69,6 @@ couple generating a torque equivalent to the opposite of :math:`\vec{T_j}`:
    -\vec{T_j} & = \vec{r_{ij}} \times \vec{F_i} \\
    \vec{F_j}  & = -\vec{F_i}
 
-
 where :math:`\vec{F_i}` and :math:`\vec{F_j}` are applied on atoms :math:`i`
 and :math:`j`, respectively.
 
@@ -86,10 +80,8 @@ or :doc:`read_restart <read_restart>` commands:
 * :math:`K` (energy)
 * :math:`\gamma_0` (degrees)
 
-
 ----------
 
-
 Styles with a *gpu*\ , *intel*\ , *kk*\ , *omp*\ , or *opt* suffix are
 functionally the same as the corresponding style without the suffix.
 They have been optimized to run faster, depending on your available
@@ -111,7 +103,6 @@ instructions on how to use the accelerated styles effectively.
 Restrictions
 """"""""""""
 
-
 This angle style can only be used if LAMMPS was built with the
 USER-MISC package.  See the :doc:`Build package <Build_package>` doc
 page for more info.
@@ -140,20 +131,14 @@ Related commands
 
 **Default:** none
 
-
 ----------
 
-
 .. _Orsi:
 
-
-
 **(Orsi)** Orsi & Essex, The ELBA force field for coarse-grain modeling of
 lipid membranes, PloS ONE 6(12): e28637, 2011.
 
 .. _Allen1:
 
-
-
 **(Allen)** Allen & Tildesley, Computer Simulation of Liquids,
 Clarendon Press, Oxford, 1987.
diff --git a/doc/src/angle_fourier.rst b/doc/src/angle_fourier.rst
index d290e2d1f7..a2008f731c 100644
--- a/doc/src/angle_fourier.rst
+++ b/doc/src/angle_fourier.rst
@@ -9,7 +9,6 @@ angle_style fourier/omp command
 Syntax
 """"""
 
-
 .. code-block:: LAMMPS
 
    angle_style fourier
@@ -31,7 +30,6 @@ The *fourier* angle style uses the potential
 
    E = K [C_0 + C_1 \cos ( \theta) + C_2 \cos( 2 \theta) ]
 
-
 The following coefficients must be defined for each angle type via the
 :doc:`angle_coeff <angle_coeff>` command as in the example above, or in
 the data file or restart files read by the :doc:`read_data <read_data>`
@@ -42,10 +40,8 @@ or :doc:`read_restart <read_restart>` commands:
 * :math:`C_1` (real)
 * :math:`C_2` (real)
 
-
 ----------
 
-
 Styles with a *gpu*\ , *intel*\ , *kk*\ , *omp*\ , or *opt* suffix are
 functionally the same as the corresponding style without the suffix.
 They have been optimized to run faster, depending on your available
@@ -64,16 +60,13 @@ by including their suffix, or you can use the :doc:`-suffix command-line switch
 See the :doc:`Speed packages <Speed_packages>` doc page for more
 instructions on how to use the accelerated styles effectively.
 
-
 ----------
 
-
 Restrictions
 """"""""""""
 
-
 This angle style can only be used if LAMMPS was built with the
-USER\_MISC package.  See the :doc:`Build package <Build_package>` doc
+USER_MISC package.  See the :doc:`Build package <Build_package>` doc
 page for more info.
 
 Related commands
diff --git a/doc/src/angle_fourier_simple.rst b/doc/src/angle_fourier_simple.rst
index d19dd19753..795142ccaa 100644
--- a/doc/src/angle_fourier_simple.rst
+++ b/doc/src/angle_fourier_simple.rst
@@ -9,7 +9,6 @@ angle_style fourier/simple/omp command
 Syntax
 """"""
 
-
 .. code-block:: LAMMPS
 
    angle_style fourier/simple
@@ -31,7 +30,6 @@ The *fourier/simple* angle style uses the potential
 
    E = K [ 1.0 + c \cos ( n \theta) ]
 
-
 The following coefficients must be defined for each angle type via the
 :doc:`angle_coeff <angle_coeff>` command as in the example above, or in
 the data file or restart files read by the :doc:`read_data <read_data>`
@@ -41,10 +39,8 @@ or :doc:`read_restart <read_restart>` commands:
 * :math:`c` (real)
 * :math:`n` (real)
 
-
 ----------
 
-
 Styles with a *gpu*\ , *intel*\ , *kk*\ , *omp*\ , or *opt* suffix are
 functionally the same as the corresponding style without the suffix.
 They have been optimized to run faster, depending on your available
@@ -63,16 +59,13 @@ by including their suffix, or you can use the :doc:`-suffix command-line switch
 See the :doc:`Speed packages <Speed_packages>` doc page for more
 instructions on how to use the accelerated styles effectively.
 
-
 ----------
 
-
 Restrictions
 """"""""""""
 
-
 This angle style can only be used if LAMMPS was built with the
-USER\_MISC package.  See the :doc:`Build package <Build_package>` doc
+USER_MISC package.  See the :doc:`Build package <Build_package>` doc
 page for more info.
 
 Related commands
diff --git a/doc/src/angle_harmonic.rst b/doc/src/angle_harmonic.rst
index 6b9ed776f5..4110f01d9b 100644
--- a/doc/src/angle_harmonic.rst
+++ b/doc/src/angle_harmonic.rst
@@ -15,7 +15,6 @@ angle_style harmonic/omp command
 Syntax
 """"""
 
-
 .. code-block:: LAMMPS
 
    angle_style harmonic
@@ -23,7 +22,6 @@ Syntax
 Examples
 """"""""
 
-
 .. code-block:: LAMMPS
 
    angle_style harmonic
@@ -38,7 +36,6 @@ The *harmonic* angle style uses the potential
 
    E = K (\theta - \theta_0)^2
 
-
 where :math:`\theta_0` is the equilibrium value of the angle, and :math:`K` is a
 prefactor.  Note that the usual 1/2 factor is included in :math:`K`.
 
@@ -53,10 +50,8 @@ or :doc:`read_restart <read_restart>` commands:
 :math:`\theta_0` is specified in degrees, but LAMMPS converts it to radians
 internally; hence the units of :math:`K` are in energy/radian\^2.
 
-
 ----------
 
-
 Styles with a *gpu*\ , *intel*\ , *kk*\ , *omp*\ , or *opt* suffix are
 functionally the same as the corresponding style without the suffix.
 They have been optimized to run faster, depending on your available
@@ -75,14 +70,11 @@ by including their suffix, or you can use the :doc:`-suffix command-line switch
 See the :doc:`Speed packages <Speed_packages>` doc page for more
 instructions on how to use the accelerated styles effectively.
 
-
 ----------
 
-
 Restrictions
 """"""""""""
 
-
 This angle style can only be used if LAMMPS was built with the
 MOLECULE package.  See the :doc:`Build package <Build_package>` doc
 page for more info.
diff --git a/doc/src/angle_hybrid.rst b/doc/src/angle_hybrid.rst
index f685beacc8..c84b351132 100644
--- a/doc/src/angle_hybrid.rst
+++ b/doc/src/angle_hybrid.rst
@@ -6,7 +6,6 @@ angle_style hybrid command
 Syntax
 """"""
 
-
 .. code-block:: LAMMPS
 
    angle_style hybrid style1 style2 ...
@@ -16,7 +15,6 @@ Syntax
 Examples
 """"""""
 
-
 .. code-block:: LAMMPS
 
    angle_style hybrid harmonic cosine
@@ -36,7 +34,7 @@ command or in the data file.
 
 In the :doc:`angle_coeff <angle_coeff>` commands, the name of an angle style must be added
 after the angle type, with the remaining coefficients being those
-appropriate to that style.  In the example above, the 2 angle\_coeff
+appropriate to that style.  In the example above, the 2 angle_coeff
 commands set angles of angle type 1 to be computed with a *harmonic*
 potential with coefficients 80.0, 30.0 for :math:`K`, :math:`\theta_0`.  All other angle
 types :math:`(2 - N)` are computed with a *cosine* potential with coefficient
@@ -47,7 +45,6 @@ If angle coefficients are specified in the data file read via the
 E.g. "harmonic" or "cosine", must be added after the angle type, for each
 line in the "Angle Coeffs" section, e.g.
 
-
 .. parsed-literal::
 
    Angle Coeffs
@@ -63,7 +60,6 @@ each line after the angle type.  For lines in the BondBond (or
 BondAngle) section of the data file for angle types that are not
 *class2*\ , you must use an angle style of *skip* as a placeholder, e.g.
 
-
 .. parsed-literal::
 
    BondBond Coeffs
@@ -81,14 +77,11 @@ in place of an angle style, either in a input script :doc:`angle_coeff <angle_co
 command or in the data file, if you desire to turn off interactions
 for specific angle types.
 
-
 ----------
 
-
 Restrictions
 """"""""""""
 
-
 This angle style can only be used if LAMMPS was built with the
 MOLECULE package.  See the :doc:`Build package <Build_package>` doc page
 for more info.
diff --git a/doc/src/angle_mm3.rst b/doc/src/angle_mm3.rst
index 6d6c6d874c..cc6ee120cd 100644
--- a/doc/src/angle_mm3.rst
+++ b/doc/src/angle_mm3.rst
@@ -6,7 +6,6 @@ angle_style mm3 command
 Syntax
 """"""
 
-
 .. code-block:: LAMMPS
 
    angle_style mm3
@@ -14,7 +13,6 @@ Syntax
 Examples
 """"""""
 
-
 .. code-block:: LAMMPS
 
    angle_style mm3
@@ -30,7 +28,6 @@ as defined in :ref:`(Allinger) <mm3-allinger1989>`
 
    E = K (\theta - \theta_0)^2 \left[ 1 - 0.014(\theta - \theta_0) + 5.6(10)^{-5} (\theta - \theta_0)^2 - 7.0(10)^{-7} (\theta - \theta_0)^3 + 9(10)^{-10} (\theta - \theta_0)^4 \right]
 
-
 where :math:`\theta_0` is the equilibrium value of the angle, and :math:`K` is a
 prefactor. The anharmonic prefactors have units :math:`\deg^{-n}`, for example
 :math:`-0.014 \deg^{-1}`, :math:`5.6 \cdot 10^{-5} \deg^{-2}`, ...
@@ -49,9 +46,8 @@ internally; hence the units of :math:`K` are in energy/radian\^2.
 Restrictions
 """"""""""""
 
-
 This angle style can only be used if LAMMPS was built with the
-USER\_YAFF package.  See the :doc:`Build package <Build_package>` doc
+USER_YAFF package.  See the :doc:`Build package <Build_package>` doc
 page for more info.
 
 Related commands
diff --git a/doc/src/angle_none.rst b/doc/src/angle_none.rst
index e848391932..eea4f2f951 100644
--- a/doc/src/angle_none.rst
+++ b/doc/src/angle_none.rst
@@ -6,7 +6,6 @@ angle_style none command
 Syntax
 """"""
 
-
 .. code-block:: LAMMPS
 
    angle_style none
@@ -14,7 +13,6 @@ Syntax
 Examples
 """"""""
 
-
 .. code-block:: LAMMPS
 
    angle_style none
diff --git a/doc/src/angle_quartic.rst b/doc/src/angle_quartic.rst
index bbf1dd618e..4559389a2a 100644
--- a/doc/src/angle_quartic.rst
+++ b/doc/src/angle_quartic.rst
@@ -9,7 +9,6 @@ angle_style quartic/omp command
 Syntax
 """"""
 
-
 .. code-block:: LAMMPS
 
    angle_style quartic
@@ -17,7 +16,6 @@ Syntax
 Examples
 """"""""
 
-
 .. code-block:: LAMMPS
 
    angle_style quartic
@@ -32,7 +30,6 @@ The *quartic* angle style uses the potential
 
    E = K_2 (\theta - \theta_0)^2 + K_3 (\theta - \theta_0)^3 + K_4 (\theta - \theta_0)^4
 
-
 where :math:`\theta_0` is the equilibrium value of the angle, and :math:`K` is a
 prefactor.  Note that the usual 1/2 factor is included in :math:`K`.
 
@@ -49,10 +46,8 @@ or :doc:`read_restart <read_restart>` commands:
 :math:`\theta_0` is specified in degrees, but LAMMPS converts it to radians
 internally; hence the units of :math:`K` are in energy/radian\^2.
 
-
 ----------
 
-
 Styles with a *gpu*\ , *intel*\ , *kk*\ , *omp*\ , or *opt* suffix are
 functionally the same as the corresponding style without the suffix.
 They have been optimized to run faster, depending on your available
@@ -71,16 +66,13 @@ by including their suffix, or you can use the :doc:`-suffix command-line switch
 See the :doc:`Speed packages <Speed_packages>` doc page for more
 instructions on how to use the accelerated styles effectively.
 
-
 ----------
 
-
 Restrictions
 """"""""""""
 
-
 This angle style can only be used if LAMMPS was built with the
-USER\_MISC package.  See the :doc:`Build package <Build_package>` doc
+USER_MISC package.  See the :doc:`Build package <Build_package>` doc
 page for more info.
 
 Related commands
diff --git a/doc/src/angle_sdk.rst b/doc/src/angle_sdk.rst
index 9f9b1ee532..5601e4f245 100644
--- a/doc/src/angle_sdk.rst
+++ b/doc/src/angle_sdk.rst
@@ -9,7 +9,6 @@ angle_style sdk/omp command
 Syntax
 """"""
 
-
 .. code-block:: LAMMPS
 
    angle_style sdk
@@ -19,7 +18,6 @@ Syntax
 Examples
 """"""""
 
-
 .. code-block:: LAMMPS
 
    angle_style sdk
@@ -32,16 +30,16 @@ The *sdk* angle style is a combination of the harmonic angle potential,
 
 .. math::
 
-   E = K (\theta - \theta_0)^2 
+   E = K (\theta - \theta_0)^2
 
-
-where :math:`\theta_0` is the equilibrium value of the angle and :math:`K` a prefactor,
-with the *repulsive* part of the non-bonded *lj/sdk* pair style
-between the atoms 1 and 3.  This angle potential is intended for
-coarse grained MD simulations with the CMM parameterization using the
-:doc:`pair_style lj/sdk <pair_sdk>`.  Relative to the pair\_style
-*lj/sdk*\ , however, the energy is shifted by *epsilon*\ , to avoid sudden
-jumps.  Note that the usual 1/2 factor is included in :math:`K`.
+where :math:`\theta_0` is the equilibrium value of the angle and
+:math:`K` a prefactor, with the *repulsive* part of the non-bonded
+*lj/sdk* pair style between the atoms 1 and 3.  This angle potential is
+intended for coarse grained MD simulations with the CMM parameterization
+using the :doc:`pair_style lj/sdk <pair_sdk>`.  Relative to the
+pair_style *lj/sdk*\ , however, the energy is shifted by
+:math:`\epsilon`, to avoid sudden jumps.  Note that the usual 1/2 factor
+is included in :math:`K`.
 
 The following coefficients must be defined for each angle type via the
 :doc:`angle_coeff <angle_coeff>` command as in the example above:
@@ -52,12 +50,10 @@ The following coefficients must be defined for each angle type via the
 :math:`\theta_0` is specified in degrees, but LAMMPS converts it to radians
 internally; hence the units of :math:`K` are in energy/radian\^2.
 The also required *lj/sdk* parameters will be extracted automatically
-from the pair\_style.
-
+from the pair_style.
 
 ----------
 
-
 Styles with a *gpu*\ , *intel*\ , *kk*\ , *omp*\ , or *opt* suffix are
 functionally the same as the corresponding style without the suffix.
 They have been optimized to run faster, depending on your available
@@ -76,14 +72,11 @@ by including their suffix, or you can use the :doc:`-suffix command-line switch
 See the :doc:`Speed packages <Speed_packages>` doc page for more
 instructions on how to use the accelerated styles effectively.
 
-
 ----------
 
-
 Restrictions
 """"""""""""
 
-
 This angle style can only be used if LAMMPS was built with the
 USER-CGSDK package.  See the :doc:`Build package <Build_package>` doc
 page for more info.
diff --git a/doc/src/angle_style.rst b/doc/src/angle_style.rst
index 3e22113d85..91232a6b6c 100644
--- a/doc/src/angle_style.rst
+++ b/doc/src/angle_style.rst
@@ -6,7 +6,6 @@ angle_style command
 Syntax
 """"""
 
-
 .. code-block:: LAMMPS
 
    angle_style style
@@ -16,7 +15,6 @@ Syntax
 Examples
 """"""""
 
-
 .. code-block:: LAMMPS
 
    angle_style harmonic
@@ -43,7 +41,7 @@ files which means angle_style and :doc:`angle_coeff <angle_coeff>`
 commands do not need to be re-specified in an input script that
 restarts a simulation.  See the :doc:`read_restart <read_restart>`
 command for details on how to do this.  The one exception is that
-angle\_style *hybrid* only stores the list of sub-styles in the restart
+angle_style *hybrid* only stores the list of sub-styles in the restart
 file; angle coefficients need to be re-specified.
 
 .. note::
@@ -56,16 +54,14 @@ file; angle coefficients need to be re-specified.
 In the formulas listed for each angle style, *theta* is the angle
 between the 3 atoms in the angle.
 
-
 ----------
 
-
 Here is an alphabetic list of angle styles defined in LAMMPS.  Click on
 the style to display the formula it computes and coefficients
 specified by the associated :doc:`angle_coeff <angle_coeff>` command.
 
 Click on the style to display the formula it computes, any additional
-arguments specified in the angle\_style command, and coefficients
+arguments specified in the angle_style command, and coefficients
 specified by the associated :doc:`angle_coeff <angle_coeff>` command.
 
 There are also additional accelerated pair styles included in the
@@ -97,15 +93,12 @@ of (g,i,k,o,t) to indicate which accelerated styles exist.
 * :doc:`sdk <angle_sdk>` - harmonic angle with repulsive SDK pair style between 1-3 atoms
 * :doc:`table <angle_table>` - tabulated by angle
 
-
 ----------
 
-
 Restrictions
 """"""""""""
 
-
-Angle styles can only be set for atom\_styles that allow angles to be
+Angle styles can only be set for atom_styles that allow angles to be
 defined.
 
 Most angle styles are part of the MOLECULE package.  They are only
@@ -120,7 +113,6 @@ Related commands
 Default
 """""""
 
-
 .. code-block:: LAMMPS
 
    angle_style none
diff --git a/doc/src/angle_table.rst b/doc/src/angle_table.rst
index f63cf167d9..729d890d67 100644
--- a/doc/src/angle_table.rst
+++ b/doc/src/angle_table.rst
@@ -9,7 +9,6 @@ angle_style table/omp command
 Syntax
 """"""
 
-
 .. code-block:: LAMMPS
 
    angle_style table style N
@@ -20,7 +19,6 @@ Syntax
 Examples
 """"""""
 
-
 .. code-block:: LAMMPS
 
    angle_style table linear 1000
@@ -59,14 +57,11 @@ The filename specifies a file containing tabulated energy and
 derivative values.  The keyword specifies a section of the file.  The
 format of this file is described below.
 
-
 ----------
 
-
 The format of a tabulated file is as follows (without the
 parenthesized comments):
 
-
 .. parsed-literal::
 
    # Angle potential for harmonic (one or more comment or blank lines)
@@ -92,7 +87,7 @@ keyword followed by one or more numeric values.
 The parameter "N" is required and its value is the number of table
 entries that follow.  Note that this may be different than the *N*
 specified in the :doc:`angle_style table <angle_style>` command.  Let
-Ntable = *N* in the angle\_style command, and Nfile = "N" in the
+Ntable = *N* in the angle_style command, and Nfile = "N" in the
 tabulated file.  What LAMMPS does is a preliminary interpolation by
 creating splines using the Nfile tabulated values as nodal points.  It
 uses these to interpolate as needed to generate energy and derivative
@@ -129,10 +124,8 @@ Note that one file can contain many sections, each with a tabulated
 potential.  LAMMPS reads the file section by section until it finds
 one that matches the specified keyword.
 
-
 ----------
 
-
 Styles with a *gpu*\ , *intel*\ , *kk*\ , *omp*\ , or *opt* suffix are
 functionally the same as the corresponding style without the suffix.
 They have been optimized to run faster, depending on your available
@@ -151,24 +144,21 @@ by including their suffix, or you can use the :doc:`-suffix command-line switch
 See the :doc:`Speed packages <Speed_packages>` doc page for more
 instructions on how to use the accelerated styles effectively.
 
-
 ----------
 
-
 **Restart info:**
 
-This angle style writes the settings for the "angle\_style table"
-command to :doc:`binary restart files <restart>`, so a angle\_style
+This angle style writes the settings for the "angle_style table"
+command to :doc:`binary restart files <restart>`, so a angle_style
 command does not need to specified in an input script that reads a
 restart file.  However, the coefficient information is not stored in
 the restart file, since it is tabulated in the potential files.  Thus,
-angle\_coeff commands do need to be specified in the restart input
+angle_coeff commands do need to be specified in the restart input
 script.
 
 Restrictions
 """"""""""""
 
-
 This angle style can only be used if LAMMPS was built with the
 MOLECULE package.  See the :doc:`Build package <Build_package>` doc page
 for more info.
diff --git a/doc/src/angle_zero.rst b/doc/src/angle_zero.rst
index e5dab4e3a0..22b2e95c04 100644
--- a/doc/src/angle_zero.rst
+++ b/doc/src/angle_zero.rst
@@ -6,7 +6,6 @@ angle_style zero command
 Syntax
 """"""
 
-
 .. code-block:: LAMMPS
 
    angle_style zero *nocoeff*
@@ -14,7 +13,6 @@ Syntax
 Examples
 """"""""
 
-
 .. code-block:: LAMMPS
 
    angle_style zero
diff --git a/doc/src/angles.rst b/doc/src/angles.rst
index 79c52a5525..c940689d4d 100644
--- a/doc/src/angles.rst
+++ b/doc/src/angles.rst
@@ -1,7 +1,6 @@
 Angle Styles
 ############
 
-
 .. toctree::
    :maxdepth: 1
    :glob:
diff --git a/doc/src/atc_add_molecule.rst b/doc/src/atc_add_molecule.rst
new file mode 100644
index 0000000000..dc0f0318ac
--- /dev/null
+++ b/doc/src/atc_add_molecule.rst
@@ -0,0 +1,48 @@
+.. index:: fix_modify AtC add_molecule
+
+fix_modify AtC add_molecule command
+===================================
+
+Syntax
+""""""
+
+.. parsed-literal::
+
+   fix_modify <AtC fixID> add_molecule <small|large> <tag> <group-ID>
+
+* AtC fixID = ID of :doc:`fix atc <fix_atc>` instance
+* add_molecule = name of the AtC sub-command
+* *small* or *large* = can be *small* if molecule size < cutoff radius, must be *large* otherwise
+* tag = tag for tracking a molecule
+* *group-ID* = LAMMPS defined group-ID
+
+Examples
+""""""""
+
+.. code-block:: LAMMPS
+
+   group WATERGROUP type 1 2
+   fix_modify AtC add_molecule small water WATERGROUP
+
+Description
+"""""""""""
+
+Associates a tag with all molecules corresponding to a specified group.
+
+Restrictions
+""""""""""""
+
+None.
+
+Related AtC commands
+""""""""""""""""""""
+
+- :ref:`fix_modify AtC command overview <atc_fix_modify>`
+- :doc:`fix_modify AtC add_species <atc_add_species>`
+- :doc:`fix_modify AtC remove_species <atc_remove_species>`
+- :doc:`fix_modify AtC remove_molecule <atc_remove_molecule>`
+
+Default
+"""""""
+
+None.
diff --git a/doc/src/atc_add_species.rst b/doc/src/atc_add_species.rst
new file mode 100644
index 0000000000..0b39379e62
--- /dev/null
+++ b/doc/src/atc_add_species.rst
@@ -0,0 +1,49 @@
+.. index:: fix_modify AtC add_species
+
+fix_modify AtC add_species command
+==================================
+
+Syntax
+""""""
+
+.. parsed-literal::
+
+   fix_modify <AtC fixID> add_species <tag> <group|type> <ID>
+
+* AtC fixID = ID of :doc:`fix atc <fix_atc>` instance
+* add_species = name of the AtC sub-command
+* tag = tag for tracking a species
+* *group* or *type* = LAMMPS defined group or type of atoms
+* ID = name of group or type number
+
+Examples
+""""""""
+
+.. code-block:: LAMMPS
+
+   fix_modify AtC add_species gold type 1
+   group GOLDGROUP type 1
+   fix_modify AtC add_species gold group GOLDGROUP
+
+Description
+"""""""""""
+
+Associates a tag with all atoms of a specified type or within a specified group.
+
+Restrictions
+""""""""""""
+
+None.
+
+Related AtC commands
+""""""""""""""""""""
+
+- :ref:`fix_modify AtC command overview <atc_fix_modify>`
+- :doc:`fix_modify AtC add_molecule <atc_add_molecule>`
+- :doc:`fix_modify AtC remove_species <atc_remove_species>`
+- :doc:`fix_modify AtC remove_molecule <atc_remove_molecule>`
+
+Default
+"""""""
+
+None.
diff --git a/doc/src/atc_atom_element_map.rst b/doc/src/atc_atom_element_map.rst
new file mode 100644
index 0000000000..96895acc8e
--- /dev/null
+++ b/doc/src/atc_atom_element_map.rst
@@ -0,0 +1,46 @@
+.. index:: fix_modify AtC atom_element_map
+
+fix_modify AtC atom_element_map command
+=======================================
+
+Syntax
+""""""
+
+.. parsed-literal::
+
+   fix_modify <AtC fixID> atom_element_map <eulerian|lagrangian> [<frequency>]
+
+* AtC fixID = ID of :doc:`fix atc <fix_atc>` instance
+* atom_element_map = name of the AtC sub-command
+* *eulerian* or *lagrangian* = frame of reference
+* frequency = frequency of updating atom-to-continuum maps based on the current configuration - (only for eulerian)
+
+
+Examples
+""""""""
+
+.. code-block:: LAMMPS
+
+   fix_modify AtC atom_element_map eulerian 100
+
+Description
+"""""""""""
+
+Changes frame of reference from *eulerian* to *lagrangian* or vice versa
+and sets the frequency for which the map from atoms to elements is
+reformed and all the attendant data is recalculated.
+
+Restrictions
+""""""""""""
+
+Cannot change map type after initialization.
+
+Related AtC commands
+""""""""""""""""""""
+
+- :ref:`fix_modify AtC command overview <atc_fix_modify>`
+
+Default
+"""""""
+
+*lagrangian*
diff --git a/doc/src/atc_atom_weight.rst b/doc/src/atc_atom_weight.rst
new file mode 100644
index 0000000000..50e7ea146d
--- /dev/null
+++ b/doc/src/atc_atom_weight.rst
@@ -0,0 +1,56 @@
+.. index:: fix_modify AtC atom_weight
+
+fix_modify AtC atom_weight command
+==================================
+
+Syntax
+""""""
+
+.. parsed-literal::
+
+   fix_modify <AtC fixID> atom_weight <method> <args>
+
+* AtC fixID = ID of :doc:`fix atc <fix_atc>` instance
+* atom_weight = name of the AtC sub-command
+* method = *constant* or *lattice* or *element* or *region* or *group* or *read_in*
+
+  - *constant* <group-ID> <value>: atoms in specified group are assigned the constant value given
+  - *lattice*\ : volume per atom for specified lattice type (e.g. fcc) and parameter
+  - *element*\ : element volume divided among atoms within element
+  - *region*\ : volume per atom determined based on the atom count in the MD regions and their volumes. Note: meaningful only if atoms completely fill all the regions.
+  - *group*\ : volume per atom determined based on the atom count in a group and its volume
+  - *node*\ : (undocumented)
+  - *node_element*\ : (undocumented)
+  - *read_in*\ <filename>: list of values for atoms are read-in from specified file
+
+Examples
+""""""""
+
+.. code-block:: LAMMPS
+
+   fix_modify AtC atom_weight constant myatoms 11.8
+   fix_modify AtC atom_weight lattice
+   fix_modify AtC atom_weight read-in atm_wt_file.txt
+
+Description
+"""""""""""
+
+Command for assigning the value of atomic weights used for atomic
+integration in atom-continuum coupled simulations.
+
+
+Restrictions
+""""""""""""
+
+The use of the lattice option requires a lattice type and parameter is already specified.
+
+Related AtC commands
+""""""""""""""""""""
+
+- :ref:`fix_modify AtC command overview <atc_fix_modify>`
+
+Default
+"""""""
+
+*lattice*
+
diff --git a/doc/src/atc_atomic_charge.rst b/doc/src/atc_atomic_charge.rst
new file mode 100644
index 0000000000..4b3d34b815
--- /dev/null
+++ b/doc/src/atc_atomic_charge.rst
@@ -0,0 +1,43 @@
+.. index:: fix_modify AtC atomic_charge
+
+fix_modify AtC atomic_charge command
+====================================
+
+Syntax
+""""""
+
+.. parsed-literal::
+
+   fix_modify <AtC fixID> <include|omit> atomic_charge
+
+* AtC fixID = ID of :doc:`fix atc <fix_atc>` instance
+* *include* or *omit* = switch to activate/deactivate inclusion of intrinsic atomic charge in ATC
+* atomic_charge = name of the AtC sub-command
+
+Examples
+""""""""
+
+.. code-block:: LAMMPS
+
+   fix_modify AtC include atomic_charge
+
+Description
+"""""""""""
+
+Determines whether AtC tracks the total charge as a finite element
+field.
+
+Restrictions
+""""""""""""
+
+Required for: *electrostatics*
+
+Related AtC commands
+""""""""""""""""""""
+
+- :ref:`fix_modify AtC command overview <atc_fix_modify>`
+
+Default
+"""""""
+
+If the atom charge is defined, default is on, otherwise default is off.
diff --git a/doc/src/atc_boundary_dynamics.rst b/doc/src/atc_boundary_dynamics.rst
new file mode 100644
index 0000000000..696d091094
--- /dev/null
+++ b/doc/src/atc_boundary_dynamics.rst
@@ -0,0 +1,43 @@
+.. index:: fix_modify AtC boundary_dynamics
+
+fix_modify AtC boundary_dynamics command
+========================================
+
+Syntax
+""""""
+
+.. parsed-literal::
+
+   fix_modify <AtC fixID> boundary_dynamics <on|damped_harmonic|prescribed|coupled|none>
+
+* AtC fixID = ID of :doc:`fix atc <fix_atc>` instance
+* boundary_dynamics = name of the AtC sub-command
+* *on* or *damped_harmonic* *prescribed* *coupled* *none*
+
+
+Description
+"""""""""""
+
+Sets different schemes for controlling boundary atoms.  *on* will integrate
+the boundary atoms using the velocity-verlet algorithm.  *damped_harmonic*
+uses a mass/spring/dashpot for the boundary atoms with added arguments
+of the damping and spring constants followed by the ratio of the
+boundary type mass to the desired mass.  *prescribed* forces the boundary
+atoms to follow the finite element displacement.  *coupled* does the same.
+
+Restrictions
+""""""""""""
+
+Boundary atoms must be specified.  When using swaps between internal and
+boundary atoms, the initial configuration must have already correctly
+partitioned the two.
+
+Related AtC commands
+""""""""""""""""""""
+
+- :ref:`fix_modify AtC command overview <atc_fix_modify>`
+
+Default
+"""""""
+
+*prescribed on*
diff --git a/doc/src/atc_boundary_faceset.rst b/doc/src/atc_boundary_faceset.rst
new file mode 100644
index 0000000000..c33239b833
--- /dev/null
+++ b/doc/src/atc_boundary_faceset.rst
@@ -0,0 +1,47 @@
+.. index:: fix_modify AtC boundary_faceset
+
+fix_modify AtC boundary_faceset command
+=======================================
+
+Syntax
+""""""
+
+.. parsed-literal::
+
+   fix_modify <AtC fixID> boundary_faceset <is|add> <faceset_name>
+
+* AtC fixID = ID of :doc:`fix atc <fix_atc>` instance
+* boundary_faceset = name of the AtC sub-command
+* *is* or *add* = select whether to select or add a faceset
+* faceset_name = name of the faceset
+
+Examples
+""""""""
+
+.. code-block:: LAMMPS
+
+   fix_modify AtC boundary_faceset is obndy
+
+Description
+"""""""""""
+
+This command species the faceset name when using a faceset to compute
+the MD/FE boundary fluxes. The faceset must already exist.
+
+Restrictions
+""""""""""""
+
+This is only valid when *fe_md_boundary* is set to *faceset*\ .
+
+Related AtC commands
+""""""""""""""""""""
+
+- :ref:`fix_modify AtC command overview <atc_fix_modify>`
+- :doc:`fix_modify AtC fe_md_boundary <atc_fe_md_boundary>`
+- :doc:`fix_modify AtC mesh create_faceset box <atc_mesh_create_faceset_box>`
+- :doc:`fix_modify AtC mesh create_faceset plane <atc_mesh_create_faceset_plane>`
+
+Default
+"""""""
+
+None.
diff --git a/doc/src/atc_boundary_type.rst b/doc/src/atc_boundary_type.rst
new file mode 100644
index 0000000000..26b40e5a12
--- /dev/null
+++ b/doc/src/atc_boundary_type.rst
@@ -0,0 +1,45 @@
+.. index:: fix_modify AtC boundary type
+
+fix_modify AtC boundary type command
+====================================
+
+Syntax
+""""""
+
+.. parsed-literal::
+
+   fix_modify <AtC fixID> boundary type <atom-type-id>
+
+* AtC fixID = ID of :doc:`fix atc <fix_atc>` instance
+* boundary type = name of the AtC sub-command
+* atom-type-id =  type id for atoms that represent a fictitious boundary internal to the FE mesh
+
+
+Examples
+""""""""
+
+.. code-block:: LAMMPS
+
+   fix_modify AtC boundary type ghost_atoms
+
+Description
+"""""""""""
+
+Command to define the atoms that represent the fictitious boundary
+internal to the FE mesh. For fully overlapped MD/FE domains with
+periodic boundary conditions no boundary atoms should be defined.
+
+Restrictions
+""""""""""""
+
+None.
+
+Related AtC commands
+""""""""""""""""""""
+
+- :ref:`fix_modify AtC command overview <atc_fix_modify>`
+
+Default
+"""""""
+
+None.
diff --git a/doc/src/atc_consistent_fe_initialization.rst b/doc/src/atc_consistent_fe_initialization.rst
new file mode 100644
index 0000000000..3241752262
--- /dev/null
+++ b/doc/src/atc_consistent_fe_initialization.rst
@@ -0,0 +1,46 @@
+.. index:: fix_modify AtC consistent_fe_initialization
+
+fix_modify AtC consistent_fe_initialization command
+===================================================
+
+Syntax
+""""""
+
+.. parsed-literal::
+
+   fix_modify <AtC fixID> consistent_fe_initialization <on|off>
+
+* AtC fixID = ID of :doc:`fix atc <fix_atc>` instance
+* consistent_fe_initialization = name of the AtC sub-command
+* *on* or *off* = switch to activate/deactivate the initial setting of the FE intrinsic field to match the projected MD field
+
+Examples
+""""""""
+
+.. code-block:: LAMMPS
+
+   fix_modify AtC consistent_fe_initialization on
+
+Description
+"""""""""""
+
+Determines whether AtC initializes FE intrinsic fields (e.g.,
+temperature) to match the projected MD values. This is particularly
+useful for fully overlapping simulations.
+
+Restrictions
+""""""""""""
+
+Can be used with: *thermal*, *two_temperature*.
+Cannot be used with time filtering on.
+Does not include boundary nodes.
+
+Related AtC commands
+""""""""""""""""""""
+
+- :ref:`fix_modify AtC command overview <atc_fix_modify>`
+
+Default
+"""""""
+
+Default is *off*
diff --git a/doc/src/atc_control_localized_lambda.rst b/doc/src/atc_control_localized_lambda.rst
new file mode 100644
index 0000000000..eb286756b7
--- /dev/null
+++ b/doc/src/atc_control_localized_lambda.rst
@@ -0,0 +1,46 @@
+.. index:: fix_modify AtC control localized_lambda
+
+fix_modify AtC control localized_lambda command
+===============================================
+
+Syntax
+""""""
+
+.. parsed-literal::
+
+   fix_modify <AtC fixID> control localized_lambda <on|off>
+
+* AtC fixID = ID of :doc:`fix atc <fix_atc>` instance
+* control localized_lambda = name of the AtC sub-command
+* *on* or *off* = Toggles state of localization algorithm
+
+Examples
+""""""""
+
+.. code-block:: LAMMPS
+
+   fix_modify AtC control localized_lambda on
+
+Description
+"""""""""""
+
+Turns the localization algorithms *on* or *off* for control algorithms
+to restrict the influence of FE coupling or boundary conditions to a
+region near the boundary of the MD region.  Control algorithms will not
+affect atoms in elements not possessing faces on the boundary of the
+region.  Flux-based control is localized via row-sum lumping while
+quantity control is done by solving a truncated matrix equation.
+
+Restrictions
+""""""""""""
+
+None.
+
+Related AtC commands
+""""""""""""""""""""
+- :ref:`fix_modify AtC command overview <atc_fix_modify>`
+
+Default
+"""""""
+
+off
diff --git a/doc/src/atc_control_momentum.rst b/doc/src/atc_control_momentum.rst
new file mode 100644
index 0000000000..7a9e88c721
--- /dev/null
+++ b/doc/src/atc_control_momentum.rst
@@ -0,0 +1,78 @@
+.. index:: fix_modify AtC control momentum
+
+fix_modify AtC control momentum command
+=======================================
+
+Syntax
+""""""
+
+.. parsed-literal::
+
+   fix_modify <AtC fixID> control <physics_type> <solution_parameter> <value>
+   fix_modify AtC control momentum none
+   fix_modify AtC control momentum rescale <frequency>
+   fix_modify AtC control momentum glc_displacement
+   fix_modify AtC control momentum glc_velocity
+   fix_modify AtC control momentum hoover
+   fix_modify AtC control momentum flux [faceset face_set_id, interpolate]
+   
+* AtC fixID = ID of :doc:`fix atc <fix_atc>` instance
+* control = name of the AtC sub-command
+* physics_type = *thermal* or *momentum*
+* solution_parameter = *max_iterations* or *tolerance*
+* value = solution_parameter value
+* momentum option = *none* or *rescale* or *glc_displacement* or *glc_velocity* *hoover* or *flux*
+* frequency = time step frequency for applying displacement and velocity rescaling
+* faceset_id = id of boundary face set (optional, only for *faceset*)
+
+
+Examples
+""""""""
+
+.. code-block:: LAMMPS
+
+   fix_modify AtC control momentum none
+   fix_modify AtC control momentum flux faceset bndy_faces
+   fix_modify AtC control momentum glc_velocity
+
+Description
+"""""""""""
+
+The general version of *control* sets the numerical parameters for the
+matrix solvers used in the specified control algorithm.  Many solution
+approaches require iterative solvers, and these methods enable users to
+provide the maximum number of iterations and the relative tolerance.
+
+The *control momentum* version sets the momentum exchange mechanism from
+the finite elements to the atoms, managed through a control algorithm.
+*rescale* computes a scale factor for each atom to match the finite
+element temperature.  *hoover* is a Gaussian least-constraint isokinetic
+thermostat enforces that the nodal restricted atomic temperature matches
+the finite element temperature.  *flux* is a similar mode, but rather
+adds energy to the atoms based on conservation of energy.
+
+*correction_max_iterations* sets the maximum number of iterations to
+compute the 2nd order in time correction term for lambda with the
+fractional step method. The method uses the same tolerance as the
+controller's matrix solver.
+
+Restrictions
+""""""""""""
+
+Only for be used with the specific controllers *thermal* or *momentum*.
+They are ignored if a lumped solution is requested.
+
+*control momentum* is only for be used with specific transfers: elastic
+*rescale* not valid with time filtering activated
+
+Related AtC commands
+""""""""""""""""""""
+
+- :ref:`fix_modify AtC command overview <atc_fix_modify>`
+- :doc:`fix_modify AtC control thermal <atc_control_thermal>`
+
+Default
+"""""""
+
+- *max_iterations* is the number of rows in the matrix.
+- *tolerance* is 1.0e-10.
diff --git a/doc/src/atc_control_thermal.rst b/doc/src/atc_control_thermal.rst
new file mode 100644
index 0000000000..dc3f28f8eb
--- /dev/null
+++ b/doc/src/atc_control_thermal.rst
@@ -0,0 +1,88 @@
+.. index:: fix_modify AtC control thermal
+
+fix_modify AtC control thermal command
+======================================
+
+Syntax
+""""""
+
+.. parsed-literal::
+
+   fix_modify <AtC fixID> control <physics_type> <solution_parameter> <value>
+   fix_modify <AtC fixID> control thermal <control_type> <optional_args>
+   fix_modify <AtC fixID> control thermal rescale <frequency>
+   fix_modify <AtC fixID> control thermal flux <boundary_integration_type> <faceset_id>
+   fix_modify <AtC fixID> control thermal correction_max_iterations <max_iterations>
+
+* AtC fixID = ID of :doc:`fix atc <fix_atc>` instance
+* control = name of the AtC sub-command
+* physics_type = *thermal* or *momentum*
+* solution_parameter = *max_iterations* or *tolerance*
+* value = solution_parameter value
+* thermal control_type = *none* or *rescale* or *hoover* or *flux*
+* frequency = time step frequency for applying velocity rescaling
+* boundary_integration_type = *faceset* or *interpolate* (optional)
+* faceset_id = id of boundary face set (optional, only for *faceset*)
+* correction_max_iterations = maximum number of iterations that will be used by iterative matrix solvers for *thermal* physics type
+
+Examples
+""""""""
+
+.. code-block:: LAMMPS
+
+   fix_modify AtC control thermal none
+   fix_modify AtC control thermal rescale 10
+   fix_modify AtC control thermal hoover
+   fix_modify AtC control thermal flux
+   fix_modify AtC control thermal flux faceset bndy_faces
+   fix_modify AtC control thermal correction_max_iterations 10
+
+Description
+"""""""""""
+
+The general version of *control* sets the numerical parameters for the
+matrix solvers used in the specified control algorithm.  Many solution
+approaches require iterative solvers, and these methods enable users to
+provide the maximum number of iterations and the relative tolerance.
+
+The *control thermal* version sets the energy exchange mechanism from
+the finite elements to the atoms, managed through a control algorithm.
+*rescale* computes a scale factor for each atom to match the finite
+element temperature.  *hoover* is a Gaussian least-constraint isokinetic
+thermostat enforces that the nodal restricted atomic temperature matches
+the finite element temperature.  *flux* is a similar mode, but rather
+adds energy to the atoms based on conservation of energy. *hoover* and
+*flux* allow the prescription of sources or fixed temperatures on the
+atoms.
+
+*correction_max_iterations* sets the maximum number of iterations to
+compute the 2nd order in time correction term for lambda with the
+fractional step method. The method uses the same tolerance as the
+controller's matrix solver.
+
+Restrictions
+""""""""""""
+
+Only for be used with the specific controllers *thermal* or *momentum*.
+They are ignored if a lumped solution is requested.
+
+*control thermal* is only for be used with specific transfers: thermal (*rescale*\ , *hoover*\ , *flux*\ ), *two_temperature* (*flux*\ ).
+*rescale* not valid with time filtering activated
+
+*correction_max_iterations* is only for use with *thermal* physics using
+the fractional step method.
+
+Related AtC commands
+""""""""""""""""""""
+
+- :ref:`fix_modify AtC command overview <atc_fix_modify>`
+- :doc:`fix_modify AtC control momentum <atc_control_momentum>`
+
+Default
+"""""""
+
+- *max_iterations* is the number of rows in the matrix.
+- *tolerance* is 1.0e-10.
+- *rescale* frequency is 1
+- *flux* boundary_integration_type is *interpolate*
+- *correction_max_iterations* is 20
diff --git a/doc/src/atc_decomposition.rst b/doc/src/atc_decomposition.rst
new file mode 100644
index 0000000000..50d11bf52f
--- /dev/null
+++ b/doc/src/atc_decomposition.rst
@@ -0,0 +1,48 @@
+.. index:: fix_modify AtC decomposition
+
+fix_modify AtC decomposition command
+====================================
+
+Syntax
+""""""
+
+.. parsed-literal::
+
+   fix_modify <AtC fixID> decomposition <type>
+
+* AtC fixID = ID of :doc:`fix atc <fix_atc>` instance
+* decomposition = name of the AtC sub-command
+* type =  *replicated_memory* or *distributed_memory*
+
+
+Examples
+""""""""
+
+.. code-block:: LAMMPS
+
+   fix_modify AtC decomposition distributed_memory
+
+Description
+"""""""""""
+
+Command for assigning the distribution of work and memory for parallel
+runs.  With *replicated_memory* the nodal information is replicated on
+each processor, and with *distributed_memory* only the owned nodal
+information kept on each processor.  The *replicated_memory* option
+is most appropriate for simulations were the number of nodes is much
+smaller than the number of atoms.
+
+Restrictions
+""""""""""""
+
+None.
+
+Related AtC commands
+""""""""""""""""""""
+
+- :ref:`fix_modify AtC command overview <atc_fix_modify>`
+
+Default
+"""""""
+
+replicated_memory
diff --git a/doc/src/atc_electron_integration.rst b/doc/src/atc_electron_integration.rst
new file mode 100644
index 0000000000..2f3fd9eee2
--- /dev/null
+++ b/doc/src/atc_electron_integration.rst
@@ -0,0 +1,49 @@
+.. index:: fix_modify AtC extrinsic electron_integration
+
+fix_modify AtC extrinsic electron_integration command
+=====================================================
+
+Syntax
+""""""
+
+.. parsed-literal::
+
+   fix_modify <AtC fixID> extrinsic electron_integration <integration_type> [<num_subcycle_steps>]
+
+* AtC fixID = ID of :doc:`fix atc <fix_atc>` instance
+* extrinsic electron_integration = name of the AtC sub-command
+* integration_type = *explicit* or *implicit* or *steady*
+* num_subcycle_steps = number of subcycle steps for the electron time integration (optional)
+
+
+Examples
+""""""""
+
+.. code-block:: LAMMPS
+
+   fix_modify AtC extrinsic electron_integration implicit
+   fix_modify AtC extrinsic electron_integration explicit 100
+
+Description
+"""""""""""
+
+Switches between integration schemes for the electron temperature. The
+number of subcycling steps used to integrate the electron temperature for
+one LAMMPS timestep can be manually adjusted to capture fast electron
+dynamics.
+
+Restrictions
+""""""""""""
+
+For use only with the two_temperature type of the AtC fix (see
+:doc:`fix atc <fix_atc>` command)
+
+Related AtC commands
+""""""""""""""""""""
+
+- :ref:`fix_modify AtC command overview <atc_fix_modify>`
+
+Default
+"""""""
+
+*implicit* and *subcycle_steps* = 1
diff --git a/doc/src/atc_equilibrium_start.rst b/doc/src/atc_equilibrium_start.rst
new file mode 100644
index 0000000000..0068dc02c3
--- /dev/null
+++ b/doc/src/atc_equilibrium_start.rst
@@ -0,0 +1,44 @@
+.. index:: fix_modify AtC equilibrium_start
+
+fix_modify AtC equilibrium_start command
+========================================
+
+Syntax
+""""""
+
+.. parsed-literal::
+
+   fix_modify <AtC fixID> equilibrium_start <on|off>
+
+* AtC fixID = ID of :doc:`fix atc <fix_atc>` instance
+* equilibrium_start = name of the AtC sub-command
+* *exponential* or *step* or *no_filter* = select type of filter
+
+Examples
+""""""""
+
+.. code-block:: LAMMPS
+
+   fix_modify AtC equilibrium_start on
+
+Description
+"""""""""""
+
+Starts filtered calculations assuming they start in equilibrium,
+i.e. perfect finite element force balance.
+
+Restrictions
+""""""""""""
+
+Only for use with these specific transfers: thermal, two_temperature
+
+Related AtC commands
+""""""""""""""""""""
+- :ref:`fix_modify AtC command overview <atc_fix_modify>`
+- :doc:`fix_modify AtC filter <atc_time_filter>`
+- :doc:`fix_modify AtC filter scale <atc_filter_scale>`
+
+Default
+"""""""
+
+None.
diff --git a/doc/src/atc_extrinsic_exchange.rst b/doc/src/atc_extrinsic_exchange.rst
new file mode 100644
index 0000000000..03d794115b
--- /dev/null
+++ b/doc/src/atc_extrinsic_exchange.rst
@@ -0,0 +1,45 @@
+.. index:: fix_modify AtC extrinsic exchange
+
+fix_modify AtC extrinsic exchange command
+=========================================
+
+Syntax
+""""""
+
+.. parsed-literal::
+
+   fix_modify <AtC fixID> extrinsic exchange <on|off>
+
+* AtC fixID = ID of :doc:`fix atc <fix_atc>` instance
+* extrinsic exchange = name of the AtC sub-command
+* *on* or *off* = set state of energy exchange
+
+
+Examples
+""""""""
+
+.. code-block:: LAMMPS
+
+   fix_modify AtC extrinsic exchange on
+
+Description
+"""""""""""
+
+Switches energy exchange between the MD system and the electron system
+on or off
+
+Restrictions
+""""""""""""
+
+For use only with the two_temperature type of the AtC fix (see
+:doc:`fix atc <fix_atc>` command)
+
+Related AtC commands
+""""""""""""""""""""
+
+- :ref:`fix_modify AtC command overview <atc_fix_modify>`
+
+Default
+"""""""
+
+*on*
diff --git a/doc/src/atc_fe_md_boundary.rst b/doc/src/atc_fe_md_boundary.rst
new file mode 100644
index 0000000000..ad66bf6d49
--- /dev/null
+++ b/doc/src/atc_fe_md_boundary.rst
@@ -0,0 +1,52 @@
+.. index:: fix_modify AtC fe_md_boundary
+
+fix_modify AtC fe_md_boundary command
+=====================================
+
+Syntax
+""""""
+
+.. parsed-literal::
+
+   fix_modify <AtC fixID> fe_md_boundary <faceset|interpolate|no_boundary>
+
+* AtC fixID = ID of :doc:`fix atc <fix_atc>` instance
+* fe_md_boundary = name of the AtC sub-command
+* *faceset* or *interpolate* or *no_boundary*
+
+Examples
+""""""""
+
+.. code-block:: LAMMPS
+
+   fix_modify AtC fe_md_boundary interpolate
+
+Description
+"""""""""""
+
+Specifies different methods for computing fluxes between between the MD
+and FE integration regions.  Faceset defines a faceset separating the MD
+and FE regions and uses finite element face quadrature to compute the
+flux.  Interpolate uses a reconstruction scheme to approximate the flux,
+which is more robust but less accurate if the MD/FE boundary does
+correspond to a faceset.  No boundary results in no fluxes between the
+systems being computed.
+
+
+Restrictions
+""""""""""""
+
+If *faceset* is used, all the AtC non-boundary atoms must lie within and
+completely fill the domain enclosed by the faceset.
+
+Related AtC commands
+""""""""""""""""""""
+
+- :ref:`fix_modify AtC command overview <atc_fix_modify>`
+- :doc:`fix_modify AtC mesh create_faceset box <atc_mesh_create_faceset_box>`
+- :doc:`fix_modify AtC mesh create_faceset plane <atc_mesh_create_faceset_plane>`
+
+Default
+"""""""
+
+*interpolate*
diff --git a/doc/src/atc_filter_scale.rst b/doc/src/atc_filter_scale.rst
new file mode 100644
index 0000000000..ce62a589eb
--- /dev/null
+++ b/doc/src/atc_filter_scale.rst
@@ -0,0 +1,44 @@
+.. index:: fix_modify AtC filter scale
+
+fix_modify AtC filter scale command
+===================================
+
+Syntax
+""""""
+
+.. parsed-literal::
+
+   fix_modify <AtC fixID> filter scale <scale>
+
+* AtC fixID = ID of :doc:`fix atc <fix_atc>` instance
+* filter scale = name of the AtC sub-command
+* scale = characteristic times scale of the filter
+
+Examples
+""""""""
+
+.. code-block:: LAMMPS
+
+   fix_modify AtC filter scale 10.0
+
+Description
+"""""""""""
+
+Sets the time scale for MD dynamics filter to construct a more
+appropriate continuous field.
+
+Restrictions
+""""""""""""
+
+Only for use with these specific transfers: thermal, two_temperature
+
+Related AtC commands
+""""""""""""""""""""
+- :ref:`fix_modify AtC command overview <atc_fix_modify>`
+- :doc:`fix_modify AtC filter <atc_time_filter>`
+- :doc:`fix_modify AtC filter type <atc_filter_type>`
+
+Default
+"""""""
+
+0.0
diff --git a/doc/src/atc_filter_type.rst b/doc/src/atc_filter_type.rst
new file mode 100644
index 0000000000..5e2da80755
--- /dev/null
+++ b/doc/src/atc_filter_type.rst
@@ -0,0 +1,43 @@
+.. index:: fix_modify AtC filter type
+
+fix_modify AtC filter type command
+===================================
+
+Syntax
+""""""
+
+.. parsed-literal::
+
+   fix_modify <AtC fixID> filter type <exponential|step|no_filter>
+
+* AtC fixID = ID of :doc:`fix atc <fix_atc>` instance
+* filter type = name of the AtC sub-command
+* *exponential* or *step* or *no_filter* = select type of filter
+
+Examples
+""""""""
+
+.. code-block:: LAMMPS
+
+   fix_modify AtC filter type exponential
+
+Description
+"""""""""""
+
+Specifies the type of time filter used.
+
+Restrictions
+""""""""""""
+
+Only for use with these specific transfers: thermal, two_temperature
+
+Related AtC commands
+""""""""""""""""""""
+- :ref:`fix_modify AtC command overview <atc_fix_modify>`
+- :doc:`fix_modify AtC filter <atc_time_filter>`
+- :doc:`fix_modify AtC filter scale <atc_filter_scale>`
+
+Default
+"""""""
+
+None.
diff --git a/doc/src/atc_fix.rst b/doc/src/atc_fix.rst
new file mode 100644
index 0000000000..d3ba972508
--- /dev/null
+++ b/doc/src/atc_fix.rst
@@ -0,0 +1,46 @@
+.. index:: fix_modify AtC fix
+
+fix_modify AtC fix command
+==========================
+
+Syntax
+""""""
+
+.. parsed-literal::
+
+   fix_modify <AtC fixID> fix <field> <nodeset> <constant|function>
+
+* AtC fixID = ID of :doc:`fix atc <fix_atc>` instance
+* fix = name of the AtC sub-command
+* field = field kind name valid for type of physics: *temperature* or *electron_temperature*
+* nodeset = name of set of nodes to apply boundary condition
+* *constant* or *function* = value or name of function followed by its parameters
+
+Examples
+""""""""
+
+.. code-block:: LAMMPS
+
+   fix_modify AtC fix temperature groupNAME 10.
+   fix_modify AtC fix temperature groupNAME 0 0 0 10.0 0 0 1.0
+
+Description
+"""""""""""
+
+Creates a constraint on the values of the specified field at specified nodes.
+
+Restrictions
+""""""""""""
+
+The keyword *all* is reserved and thus not available as nodeset name.
+
+Related AtC commands
+""""""""""""""""""""
+
+- :ref:`fix_modify AtC command overview <atc_fix_modify>`
+- :doc:`fix_modify AtC unfix <atc_unfix>`
+
+Default
+"""""""
+
+None.
diff --git a/doc/src/atc_fix_flux.rst b/doc/src/atc_fix_flux.rst
new file mode 100644
index 0000000000..12699e9163
--- /dev/null
+++ b/doc/src/atc_fix_flux.rst
@@ -0,0 +1,48 @@
+.. index:: fix_modify AtC fix_flux
+
+fix_modify AtC fix_flux command
+===============================
+
+Syntax
+""""""
+
+.. parsed-literal::
+
+   fix_modify <AtC fixID> fix_flux <field> <face_set> <value|function>
+
+* AtC fixID = ID of :doc:`fix atc <fix_atc>` instance
+* fix_flux = name of the AtC sub-command
+* field = field kind name valid for type of physics: *temperature* or *electron_temperature*
+* face_set = name of set of element faces
+* *value* or *function* = value or name of function followed by its parameters
+
+Examples
+""""""""
+
+.. code-block:: LAMMPS
+
+   fix_modify AtC fix_flux temperature faceSet 10.0
+
+Description
+"""""""""""
+
+Command for fixing normal fluxes e.g. heat_flux. This command only
+prescribes the normal component of the physical flux, e.g. heat (energy)
+flux. The units are in AtC units, i.e. derived from the LAMMPS length,
+time, and mass scales.
+
+Restrictions
+""""""""""""
+
+Only normal fluxes (Neumann data) can be prescribed.
+
+Related AtC commands
+""""""""""""""""""""
+
+- :ref:`fix_modify AtC command overview <atc_fix_modify>`
+- :doc:`fix_modify AtC unfix_flux <atc_unfix_flux>`
+
+Default
+"""""""
+
+None.
diff --git a/doc/src/atc_hardy_computes.rst b/doc/src/atc_hardy_computes.rst
new file mode 100644
index 0000000000..609740fe99
--- /dev/null
+++ b/doc/src/atc_hardy_computes.rst
@@ -0,0 +1,54 @@
+.. index:: fix_modify AtC computes
+
+fix_modify AtC computes command
+===============================
+
+Syntax
+""""""
+
+.. parsed-literal::
+
+   fix_modify <AtC fixID> computes <add|delete> <per-atom compute-ID> <volume|number>
+
+* AtC fixID = ID of :doc:`fix atc <fix_atc>` instance
+* computes = name of the AtC sub-command
+* *add* or *delete* = add or delete the calculation of an equivalent continuum field for the specified per-atom compute as volume or number density quantity
+* per-atom compute-ID = ID of a per-atom compute; fields can be calculated for all per-atom computes available in LAMMPS
+* *volume* or *number* = select whether the created field is a per-unit-volume quantity or a per-atom quantity as weighted by kernel functions
+
+Examples
+""""""""
+
+.. code-block:: LAMMPS
+
+   compute virial all stress/atom
+   fix_modify AtC computes add virial volume
+   fix_modify AtC computes delete virial
+
+   compute centrosymmetry all centro/atom
+   fix_modify AtC computes add centrosymmetry number
+
+Description
+"""""""""""
+
+Calculates continuum fields corresponding to specified per-atom
+:doc:`computes <compute>` created by LAMMPS.
+
+Restrictions
+""""""""""""
+
+Must be used with :doc:`fix atc hardy <fix_atc>`.  The per-atom compute
+must be specified before the corresponding continuum field can be
+requested.
+
+Related AtC commands
+""""""""""""""""""""
+
+- :ref:`fix_modify AtC command overview <atc_fix_modify>`
+- :doc:`fix_modify AtC fields <atc_hardy_fields>`
+- :doc:`compute <compute>`
+
+Default
+"""""""
+
+None.
diff --git a/doc/src/atc_hardy_fields.rst b/doc/src/atc_hardy_fields.rst
new file mode 100644
index 0000000000..70f3360af8
--- /dev/null
+++ b/doc/src/atc_hardy_fields.rst
@@ -0,0 +1,86 @@
+.. index:: fix_modify AtC fields
+
+fix_modify AtC fields command
+=============================
+
+Syntax
+""""""
+
+.. parsed-literal::
+
+   fix_modify <AtC fixID> fields <all|none>
+   fix_modify <AtC fixID> fields <add|delete> <list_of_fields>
+
+* AtC fixID = ID of :doc:`fix atc <fix_atc>` instance
+* fields = name of the AtC sub-command
+* *all* or *none* = output all or no fields
+* *add* or *delete* = add or delete the listed output fields
+* list_of_fields = one or more of the fields listed below:
+
+  - density : mass per unit volume
+  - displacement : displacement vector
+  - momentum : momentum per unit volume
+  - velocity : defined by momentum divided by density
+  - projected_velocity : simple kernel estimation of atomic velocities
+  - temperature : temperature derived from the relative atomic kinetic energy
+  - kinetic_temperature : temperature derived from the full kinetic energy
+  - number_density : simple kernel estimation of number of atoms per unit volume
+  - stress : Cauchy stress tensor for eulerian analysis (atom_element_map), or 1st Piola-Kirchhoff stress tensor for lagrangian analysis
+  - transformed_stress : 1st Piola-Kirchhoff stress tensor for eulerian analysis (atom_element_map), or Cauchy stress tensor for lagrangian analysis
+  - heat_flux : spatial heat flux vector for eulerian, or referential heat flux vector for lagrangian
+  - potential_energy : potential energy per unit volume
+  - kinetic_energy : kinetic energy per unit volume
+  - thermal_energy : thermal energy (kinetic energy - continuum kinetic energy) per unit volume
+  - internal_energy : total internal energy (potential + thermal) per unit volume
+  - energy : total energy (potential + kinetic) per unit volume
+  - number_density : number of atoms per unit volume
+  - eshelby_stress : configurational stress (energy-momentum) tensor defined by [Eshelby]_
+  - vacancy_concentration : volume fraction of vacancy content
+  - type_concentration : volume fraction of a specific atom type
+  
+Examples
+""""""""
+
+.. code-block:: LAMMPS
+
+   fix_modify AtC fields add velocity temperature
+
+
+Description
+"""""""""""
+
+Allows modification of the fields calculated and output by the AtC
+transfer class.  The commands are cumulative, e.g.:
+
+.. code-block:: LAMMPS
+
+   fix_modify AtC fields none
+   fix_modify AtC fields add velocity temperature
+
+will only output the velocity and temperature fields.
+
+Restrictions
+""""""""""""
+
+Must be used with :doc:`fix atc hardy <fix_atc>`.  Currently, the stress
+and heat flux formulas are only correct for central force potentials,
+e.g. Lennard-Jones and EAM but not Stillinger-Weber.
+
+Related AtC commands
+""""""""""""""""""""
+
+- :ref:`fix_modify AtC command overview <atc_fix_modify>`
+- :doc:`fix_modify AtC gradients <atc_hardy_gradients>`
+- :doc:`fix_modify AtC rates <atc_hardy_rates>`
+- :doc:`fix_modify AtC computes <atc_hardy_computes>`
+
+
+Default
+"""""""
+
+By default, no fields are output.
+
+References
+""""""""""
+
+.. [Eshelby] J.D. Eshelby, Philos. Trans. Royal Soc. London A, Math. Phys. Sci., Vol. 244, No. 877 (1951) pp. 87-112; J. Elasticity, Vol. 5, Nos. 3-4 (1975) pp. 321-335]
diff --git a/doc/src/atc_hardy_gradients.rst b/doc/src/atc_hardy_gradients.rst
new file mode 100644
index 0000000000..36fad76afe
--- /dev/null
+++ b/doc/src/atc_hardy_gradients.rst
@@ -0,0 +1,74 @@
+.. index:: fix_modify AtC gradients
+
+fix_modify AtC gradients command
+================================
+
+Syntax
+""""""
+
+.. parsed-literal::
+
+   fix_modify <AtC fixID> gradients <add|delete> <list_of_fields>
+
+* AtC fixID = ID of :doc:`fix atc <fix_atc>` instance
+* gradients = name of the AtC sub-command
+* *add* or *delete* = select whether to add or delete calculation of gradients for the listed output fields
+* list_of_fields = one or more of the fields listed below:
+
+  - density : mass per unit volume
+  - displacement : displacement vector
+  - momentum : momentum per unit volume
+  - velocity : defined by momentum divided by density
+  - projected_velocity : simple kernel estimation of atomic velocities
+  - temperature : temperature derived from the relative atomic kinetic energy
+  - kinetic_temperature : temperature derived from the full kinetic energy
+  - number_density : simple kernel estimation of number of atoms per unit volume
+  - stress : Cauchy stress tensor for eulerian analysis (atom_element_map), or 1st Piola-Kirchhoff stress tensor for lagrangian analysis
+  - transformed_stress : 1st Piola-Kirchhoff stress tensor for eulerian analysis (atom_element_map), or Cauchy stress tensor for lagrangian analysis
+  - heat_flux : spatial heat flux vector for eulerian, or referential heat flux vector for lagrangian
+  - potential_energy : potential energy per unit volume
+  - kinetic_energy : kinetic energy per unit volume
+  - thermal_energy : thermal energy (kinetic energy - continuum kinetic energy) per unit volume
+  - internal_energy : total internal energy (potential + thermal) per unit volume
+  - energy : total energy (potential + kinetic) per unit volume
+  - number_density : number of atoms per unit volume
+  - eshelby_stress : configurational stress (energy-momentum) tensor defined by [Eshelby]_
+  - vacancy_concentration : volume fraction of vacancy content
+  - type_concentration : volume fraction of a specific atom type
+
+
+Examples
+""""""""
+
+.. code-block:: LAMMPS
+
+   fix_modify AtC gradients add temperature velocity stress
+   fix_modify AtC gradients delete velocity
+
+
+Description
+"""""""""""
+
+Requests calculation and output of gradients of the fields from the AtC
+transfer class.  These gradients will be with regard to spatial or
+material coordinate for Eulerian or Lagrangian analysis, respectively,
+as specified by :doc:`fix_modify AtC atom_element_map <atc_atom_element_map>`
+
+
+Restrictions
+""""""""""""
+
+Must be used with :doc:`fix atc hardy <fix_atc>`.
+
+Related AtC commands
+""""""""""""""""""""
+
+- :ref:`fix_modify AtC command overview <atc_fix_modify>`
+- :doc:`fix_modify AtC atom_element_map <atc_atom_element_map>`
+- :doc:`fix_modify AtC fields <atc_hardy_fields>`
+- :doc:`fix_modify AtC rates <atc_hardy_rates>`
+
+Default
+"""""""
+
+None.
diff --git a/doc/src/atc_hardy_kernel.rst b/doc/src/atc_hardy_kernel.rst
new file mode 100644
index 0000000000..a52f2a9968
--- /dev/null
+++ b/doc/src/atc_hardy_kernel.rst
@@ -0,0 +1,64 @@
+.. index:: fix_modify AtC kernel
+
+fix_modify AtC kernel command
+=============================
+
+Syntax
+""""""
+
+.. parsed-literal::
+
+   fix_modify <AtC fixID> kernel <type> <parameters>
+
+* AtC fixID = ID of :doc:`fix atc <fix_atc>` instance
+* kernel = name of the AtC sub-command
+* type = *step* or *cell* or *cubic_bar* or *cubic_cylinder* or
+  *cubic_sphere* or *quartic_bar* or *quartic_cylinder* or
+  *quartic_sphere*
+* the following parameter(s) are required for each kernel:
+
+  - *step* : <radius>
+  - *cell* : <hx> <hy> <hz> or <h>
+  - *cubic_bar* : <half_width>
+  - *cubic_cylinder* : <radius>
+  - *cubic_sphere* : <radius>
+  - *quartic_bar* : <half_width>
+  - *quartic_cylinder* : <radius>
+  - *quartic_sphere* : <radius>
+    
+
+
+Examples
+""""""""
+
+.. code-block:: LAMMPS
+
+   fix_modify AtC kernel cell 1.0 1.0 1.0
+   fix_modify AtC kernel quartic_sphere 10.0
+
+
+Description
+"""""""""""
+
+Sets the localization kernel type and parameters for :doc:`fix atc hardy <fix_atc>`.
+
+Restrictions
+""""""""""""
+
+Must be used with :doc:`fix atc hardy <fix_atc>`.  For bar kernel types,
+half-width oriented along x-direction.  For cylinder kernel types,
+cylindrical axis is assumed to be in z-direction.
+
+Related AtC commands
+""""""""""""""""""""
+
+- :ref:`fix_modify AtC command overview <atc_fix_modify>`
+- :doc:`fix_modify AtC fields <atc_hardy_fields>`
+- :doc:`fix_modify AtC gradients <atc_hardy_gradients>`
+- :doc:`fix_modify AtC rates <atc_hardy_rates>`
+- :doc:`fix_modify AtC computes <atc_hardy_computes>`
+
+Default
+"""""""
+
+None.
diff --git a/doc/src/atc_hardy_on_the_fly.rst b/doc/src/atc_hardy_on_the_fly.rst
new file mode 100644
index 0000000000..fe7c688387
--- /dev/null
+++ b/doc/src/atc_hardy_on_the_fly.rst
@@ -0,0 +1,54 @@
+.. index:: fix_modify AtC on_the_fly
+
+fix_modify AtC on_the_fly command
+=================================
+
+Syntax
+""""""
+
+.. parsed-literal::
+
+   fix_modify <AtC fixID> on_the_fly <bond|kernel> <on|off>
+
+* AtC fixID = ID of :doc:`fix atc <fix_atc>` instance
+* on_the_fly = name of the AtC sub-command
+* *bond* or *kernel* = specifies on-the-fly calculation of *bond* or *kernel* matrix elements
+* *on* or *off* = activate or discontinue on-the-fly mode
+
+Examples
+""""""""
+
+.. code-block:: LAMMPS
+
+   fix_modify AtC on_the_fly bond on
+   fix_modify AtC on_the_fly kernel
+   fix_modify AtC on_the_fly kernel off
+
+Description
+"""""""""""
+
+Overrides normal mode of pre-calculating and storing bond pair-to-node a
+nd kernel atom-to-node matrices. If activated, it will calculate elements
+of these matrices during repeated calls of field computations
+(i.e. "on-the-fly") and not store them for future use.  The *on* flag is
+optional - if omitted, on_the_fly will be activated for the specified
+matrix.  Can be deactivated using the *off* flag.
+
+Restrictions
+""""""""""""
+
+Must be used with :doc:`fix atc hardy <fix_atc>`.
+
+Related AtC commands
+""""""""""""""""""""
+
+- :ref:`fix_modify AtC command overview <atc_fix_modify>`
+
+Default
+"""""""
+
+By default, on-the-fly calculation is not active (i.e. off). However,
+THE code does a memory allocation check to determine if it can store all
+needed bond and kernel matrix elements. If this allocation fails,
+on-the-fly will be activated.
+
diff --git a/doc/src/atc_hardy_rates.rst b/doc/src/atc_hardy_rates.rst
new file mode 100644
index 0000000000..890ada0c47
--- /dev/null
+++ b/doc/src/atc_hardy_rates.rst
@@ -0,0 +1,74 @@
+.. index:: fix_modify AtC rates
+
+fix_modify AtC rates command
+================================
+
+Syntax
+""""""
+
+.. parsed-literal::
+
+   fix_modify <AtC fixID> rates <add|delete> <list_of_fields>
+
+* AtC fixID = ID of :doc:`fix atc <fix_atc>` instance
+* rates = name of the AtC sub-command
+* *add* or *delete* = select whether to add or delete calculation of rates for the listed output fields
+* list_of_fields = one or more of the fields listed below:
+
+  - density : mass per unit volume
+  - displacement : displacement vector
+  - momentum : momentum per unit volume
+  - velocity : defined by momentum divided by density
+  - projected_velocity : simple kernel estimation of atomic velocities
+  - temperature : temperature derived from the relative atomic kinetic energy
+  - kinetic_temperature : temperature derived from the full kinetic energy
+  - number_density : simple kernel estimation of number of atoms per unit volume
+  - stress : Cauchy stress tensor for eulerian analysis (atom_element_map), or 1st Piola-Kirchhoff stress tensor for lagrangian analysis
+  - transformed_stress : 1st Piola-Kirchhoff stress tensor for eulerian analysis (atom_element_map), or Cauchy stress tensor for lagrangian analysis
+  - heat_flux : spatial heat flux vector for eulerian, or referential heat flux vector for lagrangian
+  - potential_energy : potential energy per unit volume
+  - kinetic_energy : kinetic energy per unit volume
+  - thermal_energy : thermal energy (kinetic energy - continuum kinetic energy) per unit volume
+  - internal_energy : total internal energy (potential + thermal) per unit volume
+  - energy : total energy (potential + kinetic) per unit volume
+  - number_density : number of atoms per unit volume
+  - eshelby_stress : configurational stress (energy-momentum) tensor defined by [Eshelby]_
+  - vacancy_concentration : volume fraction of vacancy content
+  - type_concentration : volume fraction of a specific atom type
+
+
+Examples
+""""""""
+
+.. code-block:: LAMMPS
+
+   fix_modify AtC rates add temperature velocity stress
+   fix_modify AtC rates delete stress
+
+
+Description
+"""""""""""
+
+Requests calculation and output of rates (time derivatives) of the
+fields from the AtC transfer class.  For Eulerian analysis (see
+:doc:`fix_modify AtC atom_element_map <atc_atom_element_map>`) these
+rates are the partial time derivatives of the nodal fields, not the full
+(material) time derivatives.
+
+Restrictions
+""""""""""""
+
+Must be used with :doc:`fix atc hardy <fix_atc>`.
+
+Related AtC commands
+""""""""""""""""""""
+
+- :ref:`fix_modify AtC command overview <atc_fix_modify>`
+- :doc:`fix_modify AtC atom_element_map <atc_atom_element_map>`
+- :doc:`fix_modify AtC fields <atc_hardy_fields>`
+- :doc:`fix_modify AtC fields <atc_hardy_gradients>`
+
+Default
+"""""""
+
+None.
diff --git a/doc/src/atc_initial.rst b/doc/src/atc_initial.rst
new file mode 100644
index 0000000000..7d62251c6c
--- /dev/null
+++ b/doc/src/atc_initial.rst
@@ -0,0 +1,44 @@
+.. index:: fix_modify AtC initial
+
+fix_modify AtC initial command
+====================================
+
+Syntax
+""""""
+
+.. parsed-literal::
+
+   fix_modify <AtC fixID> initial <field> <nodeset> <constant|function>
+
+* AtC fixID = ID of :doc:`fix atc <fix_atc>` instance
+* initial = name of the AtC sub-command
+* field = field kind name valid for type of physics: *temperature* or *electron_temperature*
+* nodeset = name of set of nodes to apply initial condition
+* *constant* or *function* = value or name of function followed by its parameters
+
+Examples
+""""""""
+
+.. code-block:: LAMMPS
+
+   fix_modify AtC initial temperature groupNAME 10.
+
+Description
+"""""""""""
+
+Sets the initial values for the specified field at the specified nodes.
+
+Restrictions
+""""""""""""
+
+The keyword *all* is reserved and thus not available as nodeset name.
+
+Related AtC commands
+""""""""""""""""""""
+
+- :ref:`fix_modify AtC command overview <atc_fix_modify>`
+
+Default
+"""""""
+
+None.
diff --git a/doc/src/atc_internal_element_set.rst b/doc/src/atc_internal_element_set.rst
new file mode 100644
index 0000000000..4a376f55a3
--- /dev/null
+++ b/doc/src/atc_internal_element_set.rst
@@ -0,0 +1,52 @@
+.. index:: fix_modify AtC internal_element_set
+
+fix_modify AtC internal_element_set command
+===========================================
+
+Syntax
+""""""
+
+.. parsed-literal::
+
+   fix_modify <AtC fixID> internal_element_set <element_set_name>
+
+* AtC fixID = ID of :doc:`fix atc <fix_atc>` instance
+* internal_element_set = name of the AtC sub-command
+* element_set_name = name of element set defining internal region, or *off*
+
+Examples
+""""""""
+
+.. code-block:: LAMMPS
+
+   fix_modify AtC internal_element_set myElementSet
+   fix_modify AtC internal_element_set off
+
+Description
+"""""""""""
+
+Enables AtC to base the region for internal atoms to be an element
+set. If no ghost atoms are used, all the AtC atoms must be constrained
+to remain in this element set by the user, e.g., with walls. If boundary
+atoms are used in conjunction with Eulerian atom maps AtC will partition
+all atoms of a boundary or internal type to be of type internal if they
+are in the internal region or to be of type boundary otherwise.
+
+Restrictions
+""""""""""""
+
+If boundary atoms are used in conjunction with Eulerian atom maps, the
+Eulerian reset frequency must be an integer multiple of the Lammps
+reneighbor frequency.
+
+Related AtC commands
+""""""""""""""""""""
+
+- :ref:`fix_modify AtC command overview <atc_fix_modify>`
+- :doc:`fix_modify AtC atom_element_map <atc_atom_element_map>`
+- :doc:`fix_modify AtC boundary type <atc_boundary_type>`
+
+Default
+"""""""
+
+*off*
diff --git a/doc/src/atc_internal_quadrature.rst b/doc/src/atc_internal_quadrature.rst
new file mode 100644
index 0000000000..b171914021
--- /dev/null
+++ b/doc/src/atc_internal_quadrature.rst
@@ -0,0 +1,46 @@
+.. index:: fix_modify AtC internal_quadrature
+
+fix_modify AtC internal_quadrature command
+==========================================
+
+Syntax
+""""""
+
+.. parsed-literal::
+
+   fix_modify <AtC fixID> internal_quadrature <on|off> [region]
+
+* AtC fixID = ID of :doc:`fix atc <fix_atc>` instance
+* internal_quadrature = name of the AtC sub-command
+* on or off = select whether internal quadrature is enabled or not
+* region = treat finite elements as within MD region (optional)
+
+
+Examples
+""""""""
+
+.. code-block:: LAMMPS
+
+   fix_modify AtC internal_quadrature off
+
+Description
+"""""""""""
+
+Command to use or not use atomic quadrature on internal elements fully
+filled with atoms. By turning the internal quadrature off these elements
+do not contribute to the governing PDE and the fields at the internal
+nodes follow the weighted averages of the atomic data.
+
+Optional region tag specifies which finite element nodes will be treated
+as being within the MD region. This option is only valid with
+internal_quadrature off.
+
+Related AtC commands
+""""""""""""""""""""
+
+- :ref:`fix_modify AtC command overview <atc_fix_modify>`
+
+Default
+"""""""
+
+on.
diff --git a/doc/src/atc_kernel_bandwidth.rst b/doc/src/atc_kernel_bandwidth.rst
new file mode 100644
index 0000000000..02707cfd30
--- /dev/null
+++ b/doc/src/atc_kernel_bandwidth.rst
@@ -0,0 +1,47 @@
+.. index:: fix_modify AtC kernel_bandwidth
+
+fix_modify AtC kernel_bandwidth command
+=======================================
+
+Syntax
+""""""
+
+.. parsed-literal::
+
+   fix_modify <AtC fixID> kernel_bandwidth <value>
+
+* AtC fixID = ID of :doc:`fix atc <fix_atc>` instance
+* kernel_bandwidth = name of the AtC sub-command
+* value = new bandwidth value
+
+Examples
+""""""""
+
+.. code-block:: LAMMPS
+
+   fix_modify AtC kernel_bandwidth 8
+
+Description
+"""""""""""
+
+Sets a maximum parallel bandwidth for the kernel functions during
+parallel communication. If the command is not issued, the default will
+be to assume the bandwidth of the kernel matrix corresponds to the
+number of sampling locations.
+
+
+Restrictions
+""""""""""""
+
+Only is used if kernel functions are being used.
+
+Related AtC commands
+""""""""""""""""""""
+
+- :ref:`fix_modify AtC command overview <atc_fix_modify>`
+
+Default
+"""""""
+
+Number of sample locations.
+
diff --git a/doc/src/atc_lumped_lambda_solve.rst b/doc/src/atc_lumped_lambda_solve.rst
new file mode 100644
index 0000000000..e777116da5
--- /dev/null
+++ b/doc/src/atc_lumped_lambda_solve.rst
@@ -0,0 +1,41 @@
+.. index:: fix_modify AtC control lumped_lambda_solve
+
+fix_modify AtC control lumped_lambda_solve command
+==================================================
+
+Syntax
+""""""
+
+.. parsed-literal::
+
+   fix_modify <AtC fixID> control lumped_lambda_solve <on|off>
+
+* AtC fixID = ID of :doc:`fix atc <fix_atc>` instance
+* control lumped_lambda_solve = name of the AtC sub-command
+* *on* or *off* = Toggles state of lumped matrix
+
+Examples
+""""""""
+
+.. code-block:: LAMMPS
+
+   fix_modify AtC control lumped_lambda_solve on
+
+Description
+"""""""""""
+
+Command select whether to use or not use lumped matrix for lambda solve.
+
+Restrictions
+""""""""""""
+
+None.
+
+Related AtC commands
+""""""""""""""""""""
+- :ref:`fix_modify AtC command overview <atc_fix_modify>`
+
+Default
+"""""""
+
+off
diff --git a/doc/src/atc_mask_direction.rst b/doc/src/atc_mask_direction.rst
new file mode 100644
index 0000000000..ed5c605834
--- /dev/null
+++ b/doc/src/atc_mask_direction.rst
@@ -0,0 +1,38 @@
+.. index:: fix_modify AtC control mask_direction
+
+fix_modify AtC control mask_direction command
+=============================================
+
+Syntax
+""""""
+
+.. parsed-literal::
+
+   fix_modify <AtC fixID> control mask_direction <direction> <on|off>
+
+* AtC fixID = ID of :doc:`fix atc <fix_atc>` instance
+* control mask_direction = name of the AtC sub-command
+* direction = select direction
+* *on* or *off* = Toggles state
+
+Examples
+""""""""
+
+.. code-block:: LAMMPS
+
+   fix_modify AtC control mask_direction 0 on
+
+Description
+"""""""""""
+
+Command to mask out certain dimensions from the atomic regulator
+
+Restrictions
+""""""""""""
+
+None.
+
+Related AtC commands
+""""""""""""""""""""
+- :ref:`fix_modify AtC command overview <atc_fix_modify>`
+
diff --git a/doc/src/atc_mass_matrix.rst b/doc/src/atc_mass_matrix.rst
new file mode 100644
index 0000000000..eb586b933b
--- /dev/null
+++ b/doc/src/atc_mass_matrix.rst
@@ -0,0 +1,45 @@
+.. index:: fix_modify AtC mass_matrix
+
+fix_modify AtC mass_matrix command
+==================================
+
+Syntax
+""""""
+
+.. parsed-literal::
+
+   fix_modify <AtC fixID> mass_matrix <fe|md_fe>
+
+* AtC fixID = ID of :doc:`fix atc <fix_atc>` instance
+* mass_matrix = name of the AtC sub-command
+* *fe* or *md_fe* = activate/deactivate using the FE mass matrix in the MD region
+
+Examples
+""""""""
+
+.. code-block:: LAMMPS
+
+   fix_modify AtC mass_matrix fe
+
+Description
+"""""""""""
+
+Determines whether AtC uses the FE mass matrix based on Gaussian
+quadrature or based on atomic quadrature in the MD region. This is
+useful for fully overlapping simulations to improve efficiency.
+
+Restrictions
+""""""""""""
+
+Should not be used unless the FE region is contained within the MD
+region, otherwise the method will be unstable and inaccurate.
+
+Related AtC commands
+""""""""""""""""""""
+
+- :ref:`fix_modify AtC command overview <atc_fix_modify>`
+
+Default
+"""""""
+
+*md_fe*
diff --git a/doc/src/atc_material.rst b/doc/src/atc_material.rst
new file mode 100644
index 0000000000..471bffffb2
--- /dev/null
+++ b/doc/src/atc_material.rst
@@ -0,0 +1,44 @@
+.. index:: fix_modify AtC material
+
+fix_modify AtC material command
+===============================
+
+Syntax
+""""""
+
+.. parsed-literal::
+
+   fix_modify <AtC fixID> material <elementset_name> <material_id>
+
+* AtC fixID = ID of :doc:`fix atc <fix_atc>` instance
+* material = name of the AtC sub-command
+* elementset_name = name of the elementset
+* material_id = ID of the material
+
+Examples
+""""""""
+
+.. code-block:: LAMMPS
+
+   fix_modify AtC material gap_region 1
+
+Description
+"""""""""""
+
+Sets the material model in *elementset_name* to be of type *material_id*\ .
+
+Restrictions
+""""""""""""
+
+The element set must already be created and the material must be
+specified in the material file given the the atc fix on construction
+
+Related AtC commands
+""""""""""""""""""""
+
+- :ref:`fix_modify AtC command overview <atc_fix_modify>`
+
+Default
+"""""""
+
+All elements default to the first material in the material file.
diff --git a/doc/src/atc_mesh_add_to_nodeset.rst b/doc/src/atc_mesh_add_to_nodeset.rst
new file mode 100644
index 0000000000..f9f6f575fe
--- /dev/null
+++ b/doc/src/atc_mesh_add_to_nodeset.rst
@@ -0,0 +1,45 @@
+.. index:: fix_modify AtC mesh add_to_nodeset
+
+fix_modify AtC mesh add_to_nodeset command
+==========================================
+
+Syntax
+""""""
+
+.. parsed-literal::
+
+   fix_modify <AtC fixID> mesh add_to_nodeset <id> <xmin> <xmax> <ymin> <ymax> <zmin> <zmax>
+
+* AtC fixID = ID of :doc:`fix atc <fix_atc>` instance
+* mesh create_nodeset = name of the AtC sub-command
+* id = id to assign to the collection of FE nodes
+* <xmin> <xmax> <ymin> <ymax> <zmin> <zmax> = coordinates of the bounding box that contains the desired nodes to be added
+
+Examples
+""""""""
+
+.. code-block:: LAMMPS
+
+   fix_modify AtC mesh add_to_nodeset lbc -12.1 -11.9 -12 12 -12 12
+
+Description
+"""""""""""
+
+Command to add nodes to an already existing FE nodeset.
+
+Restrictions
+""""""""""""
+
+None
+
+Related AtC commands
+""""""""""""""""""""
+
+- :ref:`fix_modify AtC command overview <atc_fix_modify>`
+- :doc:`fix_modify AtC mesh create_nodeset <atc_mesh_create_nodeset>`
+
+
+Default
+"""""""
+
+Coordinates are assumed to be in lattice units.
diff --git a/doc/src/atc_mesh_create.rst b/doc/src/atc_mesh_create.rst
new file mode 100644
index 0000000000..b17bb8ac0d
--- /dev/null
+++ b/doc/src/atc_mesh_create.rst
@@ -0,0 +1,47 @@
+.. index:: fix_modify AtC mesh create
+
+fix_modify AtC mesh create command
+===================================
+
+Syntax
+""""""
+
+.. parsed-literal::
+
+   fix_modify <AtC fixID> mesh create <nx> <ny> <nz> <region-ID> <f|p> <f|p> <f|p>
+
+* AtC fixID = ID of :doc:`fix atc <fix_atc>` instance
+* mesh create = name of the AtC sub-command
+* nx ny nz = number of elements in x-, y-, and z-direction
+* region-ID = ID of region that is to be meshed
+* f or p = periodicity flags for x-, y-, and z-direction
+
+Examples
+""""""""
+
+.. code-block:: LAMMPS
+
+   fix_modify AtC mesh create 10 1 1 feRegion p p p
+
+Description
+"""""""""""
+
+Creates a uniform mesh in a rectangular region.
+
+Restrictions
+""""""""""""
+
+Creates only uniform rectangular grids in a rectangular region
+
+Related AtC commands
+""""""""""""""""""""
+
+- :ref:`fix_modify AtC command overview <atc_fix_modify>`
+- :doc:`fix_modify AtC mesh quadrature <atc_mesh_quadrature>`
+
+Default
+"""""""
+
+When created, the mesh defaults to gauss2 (2-point Gaussian)
+quadrature. Use the :doc:`fix_modify AtC mesh quadrature
+<atc_mesh_quadrature>` command to change the quadrature style.
diff --git a/doc/src/atc_mesh_create_elementset.rst b/doc/src/atc_mesh_create_elementset.rst
new file mode 100644
index 0000000000..3cb406e7bc
--- /dev/null
+++ b/doc/src/atc_mesh_create_elementset.rst
@@ -0,0 +1,46 @@
+.. index:: fix_modify AtC mesh create_elementset
+
+fix_modify AtC mesh create_elementset command
+=============================================
+
+Syntax
+""""""
+
+.. parsed-literal::
+
+   fix_modify <AtC fixID> mesh create_elementset <id> <xmin> <xmax> <ymin> <ymax> <zmin> <zmax>
+
+* AtC fixID = ID of :doc:`fix atc <fix_atc>` instance
+* mesh create_elementset = name of the AtC sub-command
+* id = id to assign to the collection of FE nodes
+* <xmin> <xmax> <ymin> <ymax> <zmin> <zmax> = coordinates of the bounding box that contains only the desired elements
+
+Examples
+""""""""
+
+.. code-block:: LAMMPS
+
+   fix_modify AtC mesh create_elementset middle -4.1 4.1 -100 100 -100 1100
+
+Description
+"""""""""""
+
+Command to assign an id to a set of FE elements to be used subsequently
+in defining material and mesh-based operations.
+
+Restrictions
+""""""""""""
+
+Only viable for rectangular grids.
+
+Related AtC commands
+""""""""""""""""""""
+
+- :ref:`fix_modify AtC command overview <atc_fix_modify>`
+- :doc:`fix_modify AtC mesh delete_elements <atc_mesh_delete_elements>`
+- :doc:`fix_modify AtC mesh nodeset_to_elementset <atc_mesh_nodeset_to_elementset>`
+
+Default
+"""""""
+
+Coordinates are assumed to be in lattice units.
diff --git a/doc/src/atc_mesh_create_faceset_box.rst b/doc/src/atc_mesh_create_faceset_box.rst
new file mode 100644
index 0000000000..09b099d179
--- /dev/null
+++ b/doc/src/atc_mesh_create_faceset_box.rst
@@ -0,0 +1,49 @@
+.. index:: fix_modify AtC mesh create_faceset box
+
+fix_modify AtC mesh create_faceset box command
+==============================================
+
+Syntax
+""""""
+
+.. parsed-literal::
+
+   fix_modify <AtC fixID> mesh create_faceset <id> box <xmin> <xmax> <ymin> <ymax> <zmin> <zmax> <in|out> [units]
+
+* AtC fixID = ID of :doc:`fix atc <fix_atc>` instance
+* mesh create_faceset = name of the AtC sub-command
+* id = id to assign to the collection of FE faces
+* box = use bounding box to define FE faces
+* <xmin> <xmax> <ymin> <ymax> <zmin> <zmax> = coordinates of the bounding box that is coincident with the desired FE faces
+* <in|out> = "in" gives inner faces to the box, "out" gives the outer faces to the box
+* units = option to specify real as opposed to lattice units
+
+
+Examples
+""""""""
+
+.. code-block:: LAMMPS
+
+   fix_modify AtC mesh create_faceset obndy box -4.0 4.0 -12 12 -12 12 out
+
+
+Description
+"""""""""""
+
+Command to assign an id to a set of FE faces.
+
+Restrictions
+""""""""""""
+
+Only viable for rectangular grids.
+
+Related AtC commands
+""""""""""""""""""""
+
+- :ref:`fix_modify AtC command overview <atc_fix_modify>`
+- :doc:`fix_modify AtC mesh create_faceset plane <atc_mesh_create_faceset_plane>`
+
+Default
+"""""""
+
+The default options are units = lattice and the use of outer faces.
diff --git a/doc/src/atc_mesh_create_faceset_plane.rst b/doc/src/atc_mesh_create_faceset_plane.rst
new file mode 100644
index 0000000000..035e584044
--- /dev/null
+++ b/doc/src/atc_mesh_create_faceset_plane.rst
@@ -0,0 +1,48 @@
+.. index:: fix_modify AtC mesh create_faceset plane
+
+fix_modify AtC mesh create_faceset plane command
+================================================
+
+Syntax
+""""""
+
+.. parsed-literal::
+
+   fix_modify <AtC fixID> mesh create_faceset <id> plane <x|y|z> <val1> <x|y|z> <lval2> <uval2> [units]
+
+* AtC fixID = ID of :doc:`fix atc <fix_atc>` instance
+* mesh create_faceset = name of the AtC sub-command
+* id = id to assign to the collection of FE faces
+* plane = use plane to define faceset
+* <val1>,<lval2>,<uval2> = plane is specified as the x|y|z=val1 plane bounded by the segments x|y|z = [lval2,uval2]
+* units = option to specify real as opposed to lattice units
+
+
+Examples
+""""""""
+
+.. code-block:: LAMMPS
+
+   fix_modify AtC mesh create_faceset xyplane plane y 0 x -4 0
+
+
+Description
+"""""""""""
+
+Command to assign an id to a set of FE faces.
+
+Restrictions
+""""""""""""
+
+Only viable for rectangular grids.
+
+Related AtC commands
+""""""""""""""""""""
+
+- :ref:`fix_modify AtC command overview <atc_fix_modify>`
+- :doc:`fix_modify AtC mesh create_faceset box <atc_mesh_create_faceset_box>`
+
+Default
+"""""""
+
+The default options are units = lattice.
diff --git a/doc/src/atc_mesh_create_nodeset.rst b/doc/src/atc_mesh_create_nodeset.rst
new file mode 100644
index 0000000000..a2f9d74d07
--- /dev/null
+++ b/doc/src/atc_mesh_create_nodeset.rst
@@ -0,0 +1,45 @@
+.. index:: fix_modify AtC mesh create_nodeset
+
+fix_modify AtC mesh create_nodeset command
+==========================================
+
+Syntax
+""""""
+
+.. parsed-literal::
+
+   fix_modify <AtC fixID> mesh create_nodeset <id> <xmin> <xmax> <ymin> <ymax> <zmin> <zmax>
+
+* AtC fixID = ID of :doc:`fix atc <fix_atc>` instance
+* mesh create_nodeset = name of the AtC sub-command
+* id = id to assign to the collection of FE nodes
+* <xmin> <xmax> <ymin> <ymax> <zmin> <zmax> = coordinates of the bounding box that contains only the desired nodes
+
+Examples
+""""""""
+
+.. code-block:: LAMMPS
+
+   fix_modify AtC mesh create_nodeset lbc -12.1 -11.9 -12 12 -12 12
+
+Description
+"""""""""""
+
+Command to assign an id to a set of FE nodes to be used subsequently in
+defining boundary conditions.
+
+Restrictions
+""""""""""""
+
+None
+
+Related AtC commands
+""""""""""""""""""""
+
+- :ref:`fix_modify AtC command overview <atc_fix_modify>`
+- :doc:`fix_modify AtC mesh add_to_nodeset <atc_mesh_add_to_nodeset>`
+
+Default
+"""""""
+
+Coordinates are assumed to be in lattice units.
diff --git a/doc/src/atc_mesh_delete_elements.rst b/doc/src/atc_mesh_delete_elements.rst
new file mode 100644
index 0000000000..9785f0adf6
--- /dev/null
+++ b/doc/src/atc_mesh_delete_elements.rst
@@ -0,0 +1,44 @@
+.. index:: fix_modify AtC mesh delete_elements
+
+fix_modify AtC mesh delete_elements command
+=============================================
+
+Syntax
+""""""
+
+.. parsed-literal::
+
+   fix_modify <AtC fixID> mesh delete_elements <id>
+
+* AtC fixID = ID of :doc:`fix atc <fix_atc>` instance
+* mesh create_elementset = name of the AtC sub-command
+* id = id of the element set
+
+Examples
+""""""""
+
+.. code-block:: LAMMPS
+
+   fix_modify AtC mesh delete_elements gap
+
+Description
+"""""""""""
+
+Deletes a group of elements from the mesh.
+
+Restrictions
+""""""""""""
+
+None.
+
+Related AtC commands
+""""""""""""""""""""
+
+- :ref:`fix_modify AtC command overview <atc_fix_modify>`
+- :doc:`fix_modify AtC mesh create_elementset <atc_mesh_create_elementset>`
+- :doc:`fix_modify AtC mesh nodeset_to_elementset <atc_mesh_nodeset_to_elementset>`
+
+Default
+"""""""
+
+None.
diff --git a/doc/src/atc_mesh_nodeset_to_elementset.rst b/doc/src/atc_mesh_nodeset_to_elementset.rst
new file mode 100644
index 0000000000..d8721cc295
--- /dev/null
+++ b/doc/src/atc_mesh_nodeset_to_elementset.rst
@@ -0,0 +1,50 @@
+.. index:: fix_modify AtC mesh nodeset_to_elementset
+
+fix_modify AtC mesh nodeset_to_elementset command
+=================================================
+
+Syntax
+""""""
+
+.. parsed-literal::
+
+   fix_modify <AtC fixID> mesh nodeset_to_elementset <nodeset_id> <elementset_id> <max/min>
+
+* AtC fixID = ID of :doc:`fix atc <fix_atc>` instance
+* mesh nodeset_to_elementset = name of the AtC sub-command
+* nodeset_id = id of desired nodeset from which to create the elementset
+* elementset_id = id to assign to the collection of FE elements
+* <max/min> = flag to choose either the maximal or minimal elementset
+
+Examples
+""""""""
+
+.. code-block:: LAMMPS
+
+   fix_modify AtC mesh nodeset_to_elementset myNodeset myElementset min
+
+
+Description
+"""""""""""
+
+Command to create an elementset from an existing nodeset. Either the
+minimal element set of elements with all nodes in the set, or maximal
+element set with all elements with at least one node in the set, can be
+created.
+
+Restrictions
+""""""""""""
+
+None.
+
+Related AtC commands
+""""""""""""""""""""
+
+- :ref:`fix_modify AtC command overview <atc_fix_modify>`
+- :doc:`fix_modify AtC mesh create_elementset <atc_mesh_create_elementset>`
+- :doc:`fix_modify AtC mesh delete_elements <atc_mesh_delete_elements>`
+
+Default
+"""""""
+
+Unless specified, the maximal element set is created.
diff --git a/doc/src/atc_mesh_output.rst b/doc/src/atc_mesh_output.rst
new file mode 100644
index 0000000000..63756df98e
--- /dev/null
+++ b/doc/src/atc_mesh_output.rst
@@ -0,0 +1,47 @@
+.. index:: fix_modify AtC mesh output
+
+fix_modify AtC mesh output command
+==================================
+
+Syntax
+""""""
+
+.. parsed-literal::
+
+   fix_modify <AtC fixID> mesh output <file_prefix>
+
+* AtC fixID = ID of :doc:`fix atc <fix_atc>` instance
+* mesh output = name of the AtC sub-command
+* file_prefix = prefix of various generated output files
+
+
+Examples
+""""""""
+
+.. code-block:: LAMMPS
+
+   fix_modify AtC mesh output meshData
+
+
+Description
+"""""""""""
+
+Command to output mesh and associated data: nodesets, facesets, and
+elementsets. This data is only output once upon initialization since
+currently the mesh is static. Creates binary (EnSight, "gold" format)
+output of mesh data.
+
+Restrictions
+""""""""""""
+
+None.
+
+Related AtC commands
+""""""""""""""""""""
+
+- :ref:`fix_modify AtC command overview <atc_fix_modify>`
+
+Default
+"""""""
+
+None.
diff --git a/doc/src/atc_mesh_quadrature.rst b/doc/src/atc_mesh_quadrature.rst
new file mode 100644
index 0000000000..0c9bd4b30f
--- /dev/null
+++ b/doc/src/atc_mesh_quadrature.rst
@@ -0,0 +1,45 @@
+.. index:: fix_modify AtC mesh quadrature
+
+fix_modify AtC mesh quadrature command
+======================================
+
+Syntax
+""""""
+
+.. parsed-literal::
+
+   fix_modify <AtC fixID> mesh quatrature <quad>
+
+* AtC fixID = ID of :doc:`fix atc <fix_atc>` instance
+* mesh quadrature = name of the AtC sub-command
+* quad = *nodal* or *gauss1* or *gauss2* or *gauss3* or *face*
+
+Examples
+""""""""
+
+.. code-block:: LAMMPS
+
+   fix_modify AtC mesh quadrature face
+
+Description
+"""""""""""
+
+(Re-)assigns the quadrature style for an existing mesh.  When a mesh is
+created its quadrature method defaults to gauss2.  Use this call to
+change it after the fact.
+
+Restrictions
+""""""""""""
+
+None.
+
+Related AtC commands
+""""""""""""""""""""
+
+- :ref:`fix_modify AtC command overview <atc_fix_modify>`
+- :doc:`fix_modify AtC mesh create <atc_mesh_create>`
+
+Default
+"""""""
+
+None.
diff --git a/doc/src/atc_mesh_read.rst b/doc/src/atc_mesh_read.rst
new file mode 100644
index 0000000000..9848e12b07
--- /dev/null
+++ b/doc/src/atc_mesh_read.rst
@@ -0,0 +1,47 @@
+.. index:: fix_modify AtC mesh read
+
+fix_modify AtC mesh read command
+===================================
+
+Syntax
+""""""
+
+.. parsed-literal::
+
+   fix_modify <AtC fixID> mesh read <f|p> <f|p> <f|p>
+
+* AtC fixID = ID of :doc:`fix atc <fix_atc>` instance
+* mesh read = name of the AtC sub-command
+* filename = name of the file containing the mesh to be read
+* f or p = periodicity flags for x-, y-, and z-direction (optional)
+
+Examples
+""""""""
+
+.. code-block:: LAMMPS
+
+   fix_modify AtC mesh read myComponent.mesh p p p
+   fix_modify AtC mesh read myOtherComponent.exo
+
+Description
+"""""""""""
+
+Reads a mesh from a text or exodus file, and assigns periodic boundary
+conditions if needed.
+
+Restrictions
+""""""""""""
+
+None
+
+Related AtC commands
+""""""""""""""""""""
+
+- :ref:`fix_modify AtC command overview <atc_fix_modify>`
+- :doc:`fix_modify AtC mesh create <atc_mesh_create>`
+- :doc:`fix_modify AtC mesh write <atc_mesh_write>`
+
+Default
+"""""""
+
+Periodicity flags are set to false (f) by default.
diff --git a/doc/src/atc_mesh_write.rst b/doc/src/atc_mesh_write.rst
new file mode 100644
index 0000000000..dbb8f9c219
--- /dev/null
+++ b/doc/src/atc_mesh_write.rst
@@ -0,0 +1,44 @@
+.. index:: fix_modify AtC mesh write
+
+fix_modify AtC mesh write command
+===================================
+
+Syntax
+""""""
+
+.. parsed-literal::
+
+   fix_modify <AtC fixID> mesh write <f|p> <f|p> <f|p>
+
+* AtC fixID = ID of :doc:`fix atc <fix_atc>` instance
+* mesh write = name of the AtC sub-command
+* filename = name of the file containing the mesh to be write
+
+Examples
+""""""""
+
+.. code-block:: LAMMPS
+
+   fix_modify AtC mesh write myMesh.mesh
+
+Description
+"""""""""""
+
+Writes a mesh to a text file.
+
+Restrictions
+""""""""""""
+
+None
+
+Related AtC commands
+""""""""""""""""""""
+
+- :ref:`fix_modify AtC command overview <atc_fix_modify>`
+- :doc:`fix_modify AtC mesh create <atc_mesh_create>`
+- :doc:`fix_modify AtC mesh read <atc_mesh_read>`
+
+Default
+"""""""
+
+None.
diff --git a/doc/src/atc_output.rst b/doc/src/atc_output.rst
new file mode 100644
index 0000000000..3fb1491be1
--- /dev/null
+++ b/doc/src/atc_output.rst
@@ -0,0 +1,61 @@
+.. index:: fix_modify AtC output
+
+fix_modify AtC output command
+=============================
+
+Syntax
+""""""
+
+.. parsed-literal::
+
+   fix_modify <AtC fixID> output <filename_prefix> <frequency> [text|full_text|binary|vector_components|tensor_components]
+   fix_modify <AtC fixID> output index [step|time]
+
+* AtC fixID = ID of :doc:`fix atc <fix_atc>` instance
+* *output* or *output index* = name of the AtC sub-command
+* filename_prefix = prefix for data files (for *output*)
+* frequency = frequency of output in time-steps (for *output*)
+* optional keywords for *output*:
+
+  - text = creates text output of index, step and nodal variable values for unique nodes
+  - full_text = creates text output index, nodal id, step, nodal coordinates and nodal variable values for unique and image nodes
+  - binary = creates binary EnSight output
+  - vector_components = outputs vectors as scalar components
+  - tensor_components = outputs tensor as scalar components (for use with ParaView)
+
+* *step* or *time* = index output by step or by time (for *output index*)
+
+
+Examples
+""""""""
+
+.. code-block:: LAMMPS
+
+   fix_modify AtC output heatFE 100
+   fix_modify AtC output hardyFE 1 text tensor_components
+   fix_modify AtC output hardyFE 10 text binary tensor_components
+   fix_modify AtC output index step
+
+
+Description
+"""""""""""
+
+Creates text and/or binary (EnSight, "gold" format) output of nodal/mesh
+data which is transfer/physics specific. Output indexing by step or time
+is possible.
+
+Restrictions
+""""""""""""
+
+None.
+
+Related AtC commands
+""""""""""""""""""""
+
+- :ref:`fix_modify AtC command overview <atc_fix_modify>`
+- :doc:`fix atc command <fix_atc>`
+
+Default
+"""""""
+
+No default format. Output indexed by time.
diff --git a/doc/src/atc_output_boundary_integral.rst b/doc/src/atc_output_boundary_integral.rst
new file mode 100644
index 0000000000..71a3e03ac2
--- /dev/null
+++ b/doc/src/atc_output_boundary_integral.rst
@@ -0,0 +1,47 @@
+.. index:: fix_modify AtC output boundary_integral
+
+fix_modify AtC output boundary_integral command
+===============================================
+
+Syntax
+""""""
+
+.. parsed-literal::
+
+   fix_modify <AtC fixID> output boundary_integral <fieldname> faceset [name]
+
+* AtC fixID = ID of :doc:`fix atc <fix_atc>` instance
+* output boundary_integral = name of the AtC sub-command
+* fieldname = name of hardy field
+* faceset = required keyword
+* name= name of faceset
+
+
+Examples
+""""""""
+
+.. code-block:: LAMMPS
+
+   fix_modify AtC output boundary_integral stress faceset loop1
+
+
+Description
+"""""""""""
+
+Calculates a surface integral of the given field dotted with the outward
+normal of the faces and puts output in the "GLOBALS" file.
+
+Restrictions
+""""""""""""
+
+Must be used with the hardy/field type of :doc:`fix atc <fix_atc>`
+
+Related AtC commands
+""""""""""""""""""""
+
+- :ref:`fix_modify AtC command overview <atc_fix_modify>`
+
+Default
+"""""""
+
+None.
diff --git a/doc/src/atc_output_contour_integral.rst b/doc/src/atc_output_contour_integral.rst
new file mode 100644
index 0000000000..24678ef6cc
--- /dev/null
+++ b/doc/src/atc_output_contour_integral.rst
@@ -0,0 +1,48 @@
+.. index:: fix_modify AtC output contour_integral
+
+fix_modify AtC output contour_integral command
+==============================================
+
+Syntax
+""""""
+
+.. parsed-literal::
+
+   fix_modify <AtC fixID> output contour_integral <fieldname> faceset <name> [axis [x|y|z]]
+
+* AtC fixID = ID of :doc:`fix atc <fix_atc>` instance
+* output contour_integral = name of the AtC sub-command
+* fieldname = name of hardy field
+* faceset = required keyword
+* name = name of faceset
+* *axis x* or *axis y* or *axis z* = (optional)
+
+
+Examples
+""""""""
+
+.. code-block:: LAMMPS
+
+   fix_modify AtC output contour_integral stress faceset loop1
+
+
+Description
+"""""""""""
+
+Calculates a surface integral of the given field dotted with the outward
+normal of the faces and puts output in the "GLOBALS" file.
+
+Restrictions
+""""""""""""
+
+Must be used with the hardy/field type of :doc:`fix atc <fix_atc>`
+
+Related AtC commands
+""""""""""""""""""""
+
+- :ref:`fix_modify AtC command overview <atc_fix_modify>`
+
+Default
+"""""""
+
+None.
diff --git a/doc/src/atc_output_nodeset.rst b/doc/src/atc_output_nodeset.rst
new file mode 100644
index 0000000000..eb12a2344e
--- /dev/null
+++ b/doc/src/atc_output_nodeset.rst
@@ -0,0 +1,49 @@
+.. index:: fix_modify AtC output nodeset
+
+fix_modify AtC output nodeset command
+=====================================
+
+Syntax
+""""""
+
+.. parsed-literal::
+
+   fix_modify <AtC fixID> output nodeset <nodeset_name> <operation>
+
+* AtC fixID = ID of :doc:`fix atc <fix_atc>` instance
+* output nodeset = name of the AtC sub-command
+* nodeset_name= name of nodeset to be operated on
+* operation = *sum*
+
+  * *sum* = creates nodal sum over nodes in specified nodeset
+
+
+Examples
+""""""""
+
+.. code-block:: LAMMPS
+
+   fix_modify AtC output nodeset nset1 sum
+
+
+Description
+"""""""""""
+
+Performs operation over the nodes belonging to specified nodeset and
+outputs resulting variable values to GLOBALS file.
+
+Restrictions
+""""""""""""
+
+None.
+
+Related AtC commands
+""""""""""""""""""""
+
+- :ref:`fix_modify AtC command overview <atc_fix_modify>`
+- :doc:`fix atc command <fix_atc>`
+
+Default
+"""""""
+
+None.
diff --git a/doc/src/atc_output_volume_integral.rst b/doc/src/atc_output_volume_integral.rst
new file mode 100644
index 0000000000..464d43cbce
--- /dev/null
+++ b/doc/src/atc_output_volume_integral.rst
@@ -0,0 +1,47 @@
+.. index:: fix_modify AtC output volume_integral
+
+fix_modify AtC output volume_integral command
+=============================================
+
+Syntax
+""""""
+
+.. parsed-literal::
+
+   fix_modify <AtC fixID> output volume_integral <elementset_name> <field>
+
+* AtC fixID = ID of :doc:`fix atc <fix_atc>` instance
+* output volume_integral = name of the AtC sub-command
+* elementset_name= name of elementset to be integrated over
+* fieldname = name of field to integrate
+
+
+Examples
+""""""""
+
+.. code-block:: LAMMPS
+
+   fix_modify AtC output volume_integral eset1 mass_density
+
+
+Description
+"""""""""""
+
+Performs volume integration of specified field over elementset and
+outputs resulting variable values to GLOBALS file.
+
+Restrictions
+""""""""""""
+
+None.
+
+Related AtC commands
+""""""""""""""""""""
+
+- :ref:`fix_modify AtC command overview <atc_fix_modify>`
+- :doc:`fix atc command <fix_atc>`
+
+Default
+"""""""
+
+None.
diff --git a/doc/src/atc_pair_interactions.rst b/doc/src/atc_pair_interactions.rst
new file mode 100644
index 0000000000..73ada09001
--- /dev/null
+++ b/doc/src/atc_pair_interactions.rst
@@ -0,0 +1,47 @@
+.. index:: fix_modify AtC pair_interactions
+
+fix_modify AtC pair_interactions command
+========================================
+
+fix_modify AtC bond_interactions command
+========================================
+
+Syntax
+""""""
+
+.. parsed-literal::
+
+   fix_modify <AtC fixID> pair_interactions <on|off>
+   fix_modify <AtC fixID> bond_interactions <on|off>
+
+* AtC fixID = ID of :doc:`fix atc <fix_atc>` instance
+* *pair_interactions* or *bond_interactions* = name of the AtC sub-command
+* *on* or *off* = activate or deactivate
+
+Examples
+""""""""
+
+.. code-block:: LAMMPS
+
+   fix_modify AtC pair_interactions off
+   fix_modify AtC bond_interactions on
+
+Description
+"""""""""""
+
+Include bonds and/or pairs in stress and heat flux computations.
+
+Restrictions
+""""""""""""
+
+None.
+
+Related AtC commands
+""""""""""""""""""""
+
+- :ref:`fix_modify AtC command overview <atc_fix_modify>`
+
+Default
+"""""""
+
+*pair_interactions*\ : on, *bond_interactions*\ : off
diff --git a/doc/src/atc_poisson_solver.rst b/doc/src/atc_poisson_solver.rst
new file mode 100644
index 0000000000..d37f214b97
--- /dev/null
+++ b/doc/src/atc_poisson_solver.rst
@@ -0,0 +1,45 @@
+.. index:: fix_modify AtC poisson_solver
+
+fix_modify AtC poisson_solver command
+=====================================
+
+Syntax
+""""""
+
+.. parsed-literal::
+
+   fix_modify <AtC fixID> poisson_solver mesh create <nx> <ny> <nz> <region-ID> <f|p> <f|p> <f|p>
+
+* AtC fixID = ID of :doc:`fix atc <fix_atc>` instance
+* poisson_solver = name of the AtC sub-command
+* *nx* *ny* *nz* = number of elements in x, y, and z
+* region-id = id of region to be meshed
+* *f* or *p* = periodicity flags for x, y, and z
+
+
+Examples
+""""""""
+
+.. code-block:: LAMMPS
+
+   fix_modify AtC poisson_solver mesh create 10 1 1 feRegion p p p
+
+Description
+"""""""""""
+
+Creates a uniform mesh in a rectangular region.
+
+Restrictions
+""""""""""""
+
+Creates only uniform rectangular grids in rectangular regions.
+
+Related AtC commands
+""""""""""""""""""""
+
+- :ref:`fix_modify AtC command overview <atc_fix_modify>`
+
+Default
+"""""""
+
+None.
diff --git a/doc/src/atc_read_restart.rst b/doc/src/atc_read_restart.rst
new file mode 100644
index 0000000000..11ba4519a4
--- /dev/null
+++ b/doc/src/atc_read_restart.rst
@@ -0,0 +1,48 @@
+.. index:: fix_modify AtC read_restart
+
+fix_modify AtC read_restart command
+===================================
+
+Syntax
+""""""
+
+.. parsed-literal::
+
+   fix_modify <AtC fixID> read_restart <file_name>
+
+* AtC fixID = ID of :doc:`fix atc <fix_atc>` instance
+* read_restart = name of the AtC sub-command
+* file_name = name of AtC restart file
+
+
+Examples
+""""""""
+
+.. code-block:: LAMMPS
+
+   fix_modify AtC read_restart restart.mydata.AtC
+
+
+Description
+"""""""""""
+
+Reads the current state of the AtC fields from a named text-based restart file.
+
+Restrictions
+""""""""""""
+
+The restart file only contains fields and their time derivatives.  The
+reference positions of the atoms and the commands that initialize the
+fix are not saved e.g. an identical mesh containing the same atoms will
+have to be recreated.
+
+Related AtC commands
+""""""""""""""""""""
+
+- :ref:`fix_modify AtC command overview <atc_fix_modify>`
+- :doc:`fix_modify AtC write_restart <atc_write_restart>`
+
+Default
+"""""""
+
+None.
diff --git a/doc/src/atc_remove_molecule.rst b/doc/src/atc_remove_molecule.rst
new file mode 100644
index 0000000000..a654cd5c1d
--- /dev/null
+++ b/doc/src/atc_remove_molecule.rst
@@ -0,0 +1,45 @@
+.. index:: fix_modify AtC remove_molecule
+
+fix_modify AtC remove_molecule command
+======================================
+
+Syntax
+""""""
+
+.. parsed-literal::
+
+   fix_modify <AtC fixID> remove_molecule <tag>
+
+* AtC fixID = ID of :doc:`fix atc <fix_atc>` instance
+* remove_molecule = name of the AtC sub-command
+* tag = tag for tracking a molecule
+
+Examples
+""""""""
+
+.. code-block:: LAMMPS
+
+   fix_modify AtC remove_molecule water
+
+Description
+"""""""""""
+
+Removes tag designated for tracking a specified set of molecules.
+
+Restrictions
+""""""""""""
+
+None.
+
+Related AtC commands
+""""""""""""""""""""
+
+- :ref:`fix_modify AtC command overview <atc_fix_modify>`
+- :doc:`fix_modify AtC add_species <atc_add_species>`
+- :doc:`fix_modify AtC add_molecule <atc_add_molecule>`
+- :doc:`fix_modify AtC remove_species <atc_remove_species>`
+
+Default
+"""""""
+
+None.
diff --git a/doc/src/atc_remove_source.rst b/doc/src/atc_remove_source.rst
new file mode 100644
index 0000000000..d98b7933da
--- /dev/null
+++ b/doc/src/atc_remove_source.rst
@@ -0,0 +1,44 @@
+.. index:: fix_modify AtC remove_source
+
+fix_modify AtC remove_source command
+====================================
+
+Syntax
+""""""
+
+.. parsed-literal::
+
+   fix_modify <AtC fixID> remove_source <field> <element_set>
+
+* AtC fixID = ID of :doc:`fix atc <fix_atc>` instance
+* remove_source = name of the AtC sub-command
+* field = field kind name valid for type of physics: *temperature* or *electron_temperature*
+* element_set = name of set of elements
+
+Examples
+""""""""
+
+.. code-block:: LAMMPS
+
+   fix_modify AtC remove_source temperature groupNAME
+
+Description
+"""""""""""
+
+Remove a domain source.
+
+Restrictions
+""""""""""""
+
+The keyword *all* is reserved and thus not available as element_set name.
+
+Related AtC commands
+""""""""""""""""""""
+
+- :ref:`fix_modify AtC command overview <atc_fix_modify>`
+- :doc:`fix_modify AtC source <atc_source>`
+
+Default
+"""""""
+
+None.
diff --git a/doc/src/atc_remove_species.rst b/doc/src/atc_remove_species.rst
new file mode 100644
index 0000000000..20e1f6a742
--- /dev/null
+++ b/doc/src/atc_remove_species.rst
@@ -0,0 +1,45 @@
+.. index:: fix_modify AtC remove_species
+
+fix_modify AtC remove_species command
+=====================================
+
+Syntax
+""""""
+
+.. parsed-literal::
+
+   fix_modify <AtC fixID> remove_species <tag>
+
+* AtC fixID = ID of :doc:`fix atc <fix_atc>` instance
+* remove_species = name of the AtC sub-command
+* tag = tag for tracking a species
+
+Examples
+""""""""
+
+.. code-block:: LAMMPS
+
+   fix_modify AtC remove_species gold
+
+Description
+"""""""""""
+
+Removes tag designated for tracking a specified species.
+
+Restrictions
+""""""""""""
+
+None.
+
+Related AtC commands
+""""""""""""""""""""
+
+- :ref:`fix_modify AtC command overview <atc_fix_modify>`
+- :doc:`fix_modify AtC add_species <atc_add_species>`
+- :doc:`fix_modify AtC add_molecule <atc_add_molecule>`
+- :doc:`fix_modify AtC remove_molecule <atc_remove_molecule>`
+  
+Default
+"""""""
+
+None.
diff --git a/doc/src/atc_reset_atomic_reference.rst b/doc/src/atc_reset_atomic_reference.rst
new file mode 100644
index 0000000000..8f53cbfbe9
--- /dev/null
+++ b/doc/src/atc_reset_atomic_reference.rst
@@ -0,0 +1,46 @@
+.. index:: fix_modify AtC reset_atomic_reference_positions
+
+fix_modify AtC reset_atomic_reference_positions command
+=======================================================
+
+Syntax
+""""""
+
+.. parsed-literal::
+
+   fix_modify <AtC fixID> reset_atomic_reference_positions
+
+* AtC fixID = ID of :doc:`fix atc <fix_atc>` instance
+* reset_atomic_reference_positions = name of the AtC sub-command
+
+
+Examples
+""""""""
+
+.. code-block:: LAMMPS
+
+   fix_modify AtC reset_atomic_reference_positions
+
+Description
+"""""""""""
+
+Resets the atomic positions ATC uses to perform point to field
+operations. In can be used to use perfect lattice sites in ATC but a
+thermalized or deformed lattice in LAMMPS.
+
+
+Restrictions
+""""""""""""
+
+None.
+
+Related AtC commands
+""""""""""""""""""""
+
+- :ref:`fix_modify AtC command overview <atc_fix_modify>`
+
+Default
+"""""""
+
+None
+
diff --git a/doc/src/atc_reset_time.rst b/doc/src/atc_reset_time.rst
new file mode 100644
index 0000000000..147a6ab910
--- /dev/null
+++ b/doc/src/atc_reset_time.rst
@@ -0,0 +1,44 @@
+.. index:: fix_modify AtC reset_time
+
+fix_modify AtC reset_time command
+=================================
+
+Syntax
+""""""
+
+.. parsed-literal::
+
+   fix_modify <AtC fixID> reset_time <value>
+
+* AtC fixID = ID of :doc:`fix atc <fix_atc>` instance
+* reset_time = name of the AtC sub-command
+* value = new time value
+
+Examples
+""""""""
+
+.. code-block:: LAMMPS
+
+   fix_modify AtC reset_time 0.0
+
+Description
+"""""""""""
+
+Resets the simulation time counter.
+
+
+Restrictions
+""""""""""""
+
+None.
+
+Related AtC commands
+""""""""""""""""""""
+
+- :ref:`fix_modify AtC command overview <atc_fix_modify>`
+
+Default
+"""""""
+
+None
+
diff --git a/doc/src/atc_sample_frequency.rst b/doc/src/atc_sample_frequency.rst
new file mode 100644
index 0000000000..5b0da6d9dd
--- /dev/null
+++ b/doc/src/atc_sample_frequency.rst
@@ -0,0 +1,44 @@
+.. index:: fix_modify AtC sample_frequency
+
+fix_modify AtC sample_frequency command
+=======================================
+
+Syntax
+""""""
+
+.. parsed-literal::
+
+   fix_modify <AtC fixID> sample_frequency <freq>
+
+* AtC fixID = ID of :doc:`fix atc <fix_atc>` instance
+* sample_frequency = name of the AtC sub-command
+* freq = frequency to sample fields in number of steps
+
+Examples
+""""""""
+
+.. code-block:: LAMMPS
+
+   fix_modify AtC sample_frequency 10
+
+Description
+"""""""""""
+
+Specifies a frequency at which fields are computed for the case where
+time filters are being applied.
+
+Restrictions
+""""""""""""
+
+Must be used with :doc:`fix atc hardy <fix_atc>` and is only relevant when time filters are being used.
+
+Related AtC commands
+""""""""""""""""""""
+
+- :ref:`fix_modify AtC command overview <atc_fix_modify>`
+
+Default
+"""""""
+
+None.
+
diff --git a/doc/src/atc_set_reference_pe.rst b/doc/src/atc_set_reference_pe.rst
new file mode 100644
index 0000000000..ff4d95526f
--- /dev/null
+++ b/doc/src/atc_set_reference_pe.rst
@@ -0,0 +1,50 @@
+.. index:: fix_modify AtC set reference_potential_energy
+
+fix_modify AtC set reference_potential_energy command
+=====================================================
+
+Syntax
+""""""
+
+.. parsed-literal::
+
+   fix_modify <AtC fixID> set reference_potential_energy [<value|filename>]
+
+* AtC fixID = ID of :doc:`fix atc <fix_atc>` instance
+* set reference_potential_energy = name of the AtC sub-command
+* value = optional user specified zero point for PE in native LAMMPS energy units
+* filename = optional user specified string for file of nodal PE values to be read-in
+
+Examples
+""""""""
+
+.. code-block:: LAMMPS
+
+   fix_modify AtC set reference_potential_energy
+   fix_modify AtC set reference_potential_energy -0.05
+   fix_modify AtC set reference_potential_energy myPEvalues 
+
+Description
+"""""""""""
+
+Used to set various quantities for the post-processing algorithms. It
+sets the zero point for the potential energy density using the value
+provided for all nodes, or from the current configuration of the lattice
+if no value is provided, or values provided within the specified
+filename.
+
+Restrictions
+""""""""""""
+
+Must be used with :doc:`fix atc hardy <fix_atc>` or :doc:`fix atc field <fix_atc>`.
+
+Related AtC commands
+""""""""""""""""""""
+
+- :ref:`fix_modify AtC command overview <atc_fix_modify>`
+
+Default
+"""""""
+
+Defaults to the LAMMPS zero point i.e. isolated atoms.
+
diff --git a/doc/src/atc_source.rst b/doc/src/atc_source.rst
new file mode 100644
index 0000000000..6df4b67d1c
--- /dev/null
+++ b/doc/src/atc_source.rst
@@ -0,0 +1,48 @@
+.. index:: fix_modify AtC source
+
+fix_modify AtC source command
+==============================
+
+Syntax
+""""""
+
+.. parsed-literal::
+
+   fix_modify <AtC fixID> source <field> <element_set> <value|function>
+
+* AtC fixID = ID of :doc:`fix atc <fix_atc>` instance
+* source = name of the AtC sub-command
+* field = field kind name valid for type of physics: *temperature* or *electron_temperature*
+* element_set = name of set of elements
+* *value* or *function* = value or name of function followed by its parameters
+
+Examples
+""""""""
+
+.. code-block:: LAMMPS
+
+   fix_modify AtC source temperature middle temporal_ramp 10.0 0.0
+
+Description
+"""""""""""
+
+Add domain sources to the mesh. The units are consistent with LAMMPS's
+units for mass, length and time and are defined by the PDE being solved,
+e.g. for thermal transfer the balance equation is for energy and source
+is energy per time.
+
+Restrictions
+""""""""""""
+
+The keyword *all* is reserved and thus not available as element_set name.
+
+Related AtC commands
+""""""""""""""""""""
+
+- :ref:`fix_modify AtC command overview <atc_fix_modify>`
+- :doc:`fix_modify AtC remove_source <atc_remove_source>`
+
+Default
+"""""""
+
+None.
diff --git a/doc/src/atc_source_integration.rst b/doc/src/atc_source_integration.rst
new file mode 100644
index 0000000000..b10e6c7e2a
--- /dev/null
+++ b/doc/src/atc_source_integration.rst
@@ -0,0 +1,42 @@
+.. index:: fix_modify AtC source_integration
+
+fix_modify AtC source_integration command
+=========================================
+
+Syntax
+""""""
+
+.. parsed-literal::
+
+   fix_modify <AtC fixID> source_integration <fe|atom>
+
+* AtC fixID = ID of :doc:`fix atc <fix_atc>` instance
+* source_integration = name of the AtC sub-command
+* *fe* or *atom* = (undocumented)
+
+Examples
+""""""""
+
+.. code-block:: LAMMPS
+
+   fix_modify AtC source_integration atom
+
+Description
+"""""""""""
+
+(undocumented)
+
+Restrictions
+""""""""""""
+
+None.
+
+Related AtC commands
+""""""""""""""""""""
+
+- :ref:`fix_modify AtC command overview <atc_fix_modify>`
+
+Default
+"""""""
+
+Default is *fe*
diff --git a/doc/src/atc_temperature_definition.rst b/doc/src/atc_temperature_definition.rst
new file mode 100644
index 0000000000..b5a27467ca
--- /dev/null
+++ b/doc/src/atc_temperature_definition.rst
@@ -0,0 +1,48 @@
+.. index:: fix_modify AtC temperature_definition
+
+fix_modify AtC temperature_definition command
+=============================================
+
+Syntax
+""""""
+
+.. parsed-literal::
+
+   fix_modify <AtC fixID> temperature_definition <kinetic|total>
+
+* AtC fixID = ID of :doc:`fix atc <fix_atc>` instance
+* temperature_definition = name of the AtC sub-command
+* *kinetic* or *total* = (undocumented)
+
+Examples
+""""""""
+
+.. code-block:: LAMMPS
+
+   fix_modify AtC temperature_definition kinetic
+
+Description
+"""""""""""
+
+Change the definition for the atomic temperature used to create the
+finite element temperature.  The kinetic option is based only on the
+kinetic energy of the atoms while the total option uses the total energy
+(kinetic + potential) of an atom.
+
+Restrictions
+""""""""""""
+
+This command is only valid when using thermal coupling.  Also, while not
+a formal restriction, the user should ensure that associating a
+potential energy with each atom makes physical sense for the total
+option to be meaningful.
+
+Related AtC commands
+""""""""""""""""""""
+
+- :ref:`fix_modify AtC command overview <atc_fix_modify>`
+
+Default
+"""""""
+
+*kinetic*
diff --git a/doc/src/atc_time_filter.rst b/doc/src/atc_time_filter.rst
new file mode 100644
index 0000000000..0a97c83259
--- /dev/null
+++ b/doc/src/atc_time_filter.rst
@@ -0,0 +1,46 @@
+.. index:: fix_modify AtC filter
+
+fix_modify AtC filter command
+=============================
+
+Syntax
+""""""
+
+.. parsed-literal::
+
+   fix_modify <AtC fixID> filter <on|off|equilibrate>
+
+* AtC fixID = ID of :doc:`fix atc <fix_atc>` instance
+* filter = name of the AtC sub-command
+* *on* or *off* or *equilibrate* = Select state of filter
+
+Examples
+""""""""
+
+.. code-block:: LAMMPS
+
+   fix_modify AtC filter on
+
+Description
+"""""""""""
+
+Filters the MD dynamics to construct a more appropriate continuous
+field. Equilibrating first filters the time derivatives without changing
+the dynamics to provide a better initial condition to the filtered
+dynamics.
+
+Restrictions
+""""""""""""
+
+Only for use with these specific transfers: thermal, two_temperature
+
+Related AtC commands
+""""""""""""""""""""
+- :ref:`fix_modify AtC command overview <atc_fix_modify>`
+- :doc:`fix_modify AtC filter scale <atc_filter_scale>`
+- :doc:`fix_modify AtC equilibrium_start <atc_equilibrium_start>`
+
+Default
+"""""""
+
+off
diff --git a/doc/src/atc_time_integration.rst b/doc/src/atc_time_integration.rst
new file mode 100644
index 0000000000..580be0430c
--- /dev/null
+++ b/doc/src/atc_time_integration.rst
@@ -0,0 +1,78 @@
+.. index:: fix_modify AtC time_integration
+
+fix_modify AtC time_integration command
+=======================================
+
+Syntax
+""""""
+
+.. parsed-literal::
+
+   fix_modify <AtC fixID> time_integration <descriptor>
+
+* AtC fixID = ID of :doc:`fix atc <fix_atc>` instance
+* time_integration = name of the AtC sub-command
+* descriptor =  *gear* or *fractional_step* or *verlet*
+
+
+Examples
+""""""""
+
+.. code-block:: LAMMPS
+
+   fix_modify AtC time_integration fractional_step
+
+
+Description
+"""""""""""
+
+Command to select the thermal or momentum time integration.
+
+---------
+
+Options for thermal time integration:
+
+*gear*
+  atomic velocity update with 2nd order Verlet, nodal temperature update
+  with 3rd or 4th order Gear, thermostats based on controlling power
+
+*fractional_step*
+  atomic velocity update with 2nd order Verlet, mixed nodal temperature
+  update, 3/4 Gear for continuum and 2 Verlet for atomic contributions,
+  thermostats based on controlling discrete energy changes
+
+---------
+
+Options for momentum time integration:
+
+*verlet*
+  atomic velocity update with 2nd order Verlet, nodal temperature update
+  with 2nd order Verlet, kinetostats based on controlling force
+
+*fractional_step*
+  atomic velocity update with 2nd order Verlet, mixed nodal momentum
+  update, 2nd order Verlet for continuum and exact 2nd order Verlet for
+  atomic contributions, kinetostats based on controlling discrete
+  momentum changes
+
+*gear*
+  atomic velocity update with 2nd order Verlet, nodal temperature update
+  with 3rd or 4th order Gear, kinetostats based on controlling power.
+
+---------
+
+Restrictions
+""""""""""""
+
+None.
+
+
+Related AtC commands
+""""""""""""""""""""
+
+- :ref:`fix_modify AtC command overview <atc_fix_modify>`
+
+Default
+"""""""
+
+None.
diff --git a/doc/src/atc_track_displacement.rst b/doc/src/atc_track_displacement.rst
new file mode 100644
index 0000000000..043f42ea9c
--- /dev/null
+++ b/doc/src/atc_track_displacement.rst
@@ -0,0 +1,43 @@
+.. index:: fix_modify AtC track_displacement
+
+fix_modify AtC track_displacement command
+=========================================
+
+Syntax
+""""""
+
+.. parsed-literal::
+
+   fix_modify <AtC fixID> track_displacement <on|off>
+
+* AtC fixID = ID of :doc:`fix atc <fix_atc>` instance
+* track_displacement = name of the AtC sub-command
+* *on* or *off* = (undocumented)
+
+Examples
+""""""""
+
+.. code-block:: LAMMPS
+
+   fix_modify AtC track_displacement on
+
+Description
+"""""""""""
+
+Determines whether displacement is tracked or not. For solids problems
+this is a useful quantity, but for fluids it is not relevant.
+
+Restrictions
+""""""""""""
+
+Some constitutive models require the displacement field.
+
+Related AtC commands
+""""""""""""""""""""
+
+- :ref:`fix_modify AtC command overview <atc_fix_modify>`
+
+Default
+"""""""
+
+*on*
diff --git a/doc/src/atc_unfix.rst b/doc/src/atc_unfix.rst
new file mode 100644
index 0000000000..12ee37bbde
--- /dev/null
+++ b/doc/src/atc_unfix.rst
@@ -0,0 +1,44 @@
+.. index:: fix_modify AtC unfix
+
+fix_modify AtC unfix command
+==============================
+
+Syntax
+""""""
+
+.. parsed-literal::
+
+   fix_modify <AtC fixID> unfix <field> <nodeset>
+
+* AtC fixID = ID of :doc:`fix atc <fix_atc>` instance
+* unfix = name of the AtC sub-command
+* field = field kind name valid for type of physics: *temperature* or *electron_temperature*
+* nodeset = name of set of nodes to apply boundary condition
+
+Examples
+""""""""
+
+.. code-block:: LAMMPS
+
+   fix_modify AtC unfix temperature groupNAME
+
+Description
+"""""""""""
+
+Removes constraint on field values for specified nodes.
+
+Restrictions
+""""""""""""
+
+The keyword *all* is reserved and thus not available as nodeset name.
+
+Related AtC commands
+""""""""""""""""""""
+
+- :ref:`fix_modify AtC command overview <atc_fix_modify>`
+- :doc:`fix_modify AtC fix <atc_fix>`
+
+Default
+"""""""
+
+None.
diff --git a/doc/src/atc_unfix_flux.rst b/doc/src/atc_unfix_flux.rst
new file mode 100644
index 0000000000..da9d1b4aba
--- /dev/null
+++ b/doc/src/atc_unfix_flux.rst
@@ -0,0 +1,45 @@
+.. index:: fix_modify AtC unfix_flux
+
+fix_modify AtC unfix_flux command
+=================================
+
+Syntax
+""""""
+
+.. parsed-literal::
+
+   fix_modify <AtC fixID> unfix_flux <field> <face_set> <value|function>
+
+* AtC fixID = ID of :doc:`fix atc <fix_atc>` instance
+* unfix_flux = name of the AtC sub-command
+* field = field kind name valid for type of physics: *temperature* or *electron_temperature*
+* face_set = name of set of element faces
+
+Examples
+""""""""
+
+.. code-block:: LAMMPS
+
+   fix_modify AtC unfix_flux temperature faceSet
+
+Description
+"""""""""""
+
+Command for removing prescribed normal fluxes e.g. heat_flux, stress.
+
+
+Restrictions
+""""""""""""
+
+None.
+
+Related AtC commands
+""""""""""""""""""""
+
+- :ref:`fix_modify AtC command overview <atc_fix_modify>`
+- :doc:`fix_modify AtC fix_flux <atc_fix_flux>`
+
+Default
+"""""""
+
+None.
diff --git a/doc/src/atc_write_atom_weights.rst b/doc/src/atc_write_atom_weights.rst
new file mode 100644
index 0000000000..ecb69b5deb
--- /dev/null
+++ b/doc/src/atc_write_atom_weights.rst
@@ -0,0 +1,45 @@
+.. index:: fix_modify AtC write_atom_weights
+
+fix_modify AtC write_atom_weights command
+=========================================
+
+Syntax
+""""""
+
+.. parsed-literal::
+
+   fix_modify <AtC fixID> write_atom_weights <filename> <frequency>
+
+* AtC fixID = ID of :doc:`fix atc <fix_atc>` instance
+* write_atom_weights = name of the AtC sub-command
+* filename = name of file that atomic weights are written to
+* frequency = how often writes will occur
+
+Examples
+""""""""
+
+.. code-block:: LAMMPS
+
+   fix_modify AtC write_atom_weights atm_wt_file.txt 10
+
+Description
+"""""""""""
+
+Command for writing the values of atomic weights to a specified file.
+
+
+Restrictions
+""""""""""""
+
+None.
+
+Related AtC commands
+""""""""""""""""""""
+
+- :ref:`fix_modify AtC command overview <atc_fix_modify>`
+
+Default
+"""""""
+
+None
+
diff --git a/doc/src/atc_write_restart.rst b/doc/src/atc_write_restart.rst
new file mode 100644
index 0000000000..e4f19dea10
--- /dev/null
+++ b/doc/src/atc_write_restart.rst
@@ -0,0 +1,47 @@
+.. index:: fix_modify AtC write_restart
+
+fix_modify AtC write_restart command
+====================================
+
+Syntax
+""""""
+
+.. parsed-literal::
+
+   fix_modify <AtC fixID> write_restart <file_name>
+
+* AtC fixID = ID of :doc:`fix atc <fix_atc>` instance
+* write_restart = name of the AtC sub-command
+* file_name = name of AtC restart file
+
+
+Examples
+""""""""
+
+.. code-block:: LAMMPS
+
+   fix_modify AtC write_restart restart.mydata.AtC
+
+
+Description
+"""""""""""
+
+Dumps the current state of the fields to a named text-based restart
+file.  This done when the command is invoked and not repeated, unlike
+the otherwise similar LAMMPS command.
+
+Restrictions
+""""""""""""
+
+None.
+
+Related AtC commands
+""""""""""""""""""""
+
+- :ref:`fix_modify AtC command overview <atc_fix_modify>`
+- :doc:`fix_modify AtC read_restart <atc_read_restart>`
+
+Default
+"""""""
+
+None.
diff --git a/doc/src/atom_modify.rst b/doc/src/atom_modify.rst
index 147727dd66..c94ca65c1c 100644
--- a/doc/src/atom_modify.rst
+++ b/doc/src/atom_modify.rst
@@ -6,16 +6,15 @@ atom_modify command
 Syntax
 """"""
 
-
 .. code-block:: LAMMPS
 
    atom_modify keyword values ...
 
 * one or more keyword/value pairs may be appended
 * keyword = *id* or *map* or *first* or *sort*
-  
+
   .. parsed-literal::
-  
+
         *id* value = *yes* or *no*
         *map* value = *yes* or *array* or *hash*
         *first* value = group-ID = group whose atoms will appear first in internal atom lists
@@ -23,12 +22,9 @@ Syntax
           Nfreq = sort atoms spatially every this many time steps
           binsize = bin size for spatial sorting (distance units)
 
-
-
 Examples
 """"""""
 
-
 .. code-block:: LAMMPS
 
    atom_modify map yes
@@ -64,8 +60,8 @@ The only reason not to use atom IDs is if you are running an atomic
 simulation so large that IDs cannot be uniquely assigned.  For a
 default LAMMPS build this limit is 2\^31 or about 2 billion atoms.
 However, even in this case, you can use 64-bit atom IDs, allowing 2\^63
-or about 9e18 atoms, if you build LAMMPS with the - DLAMMPS\_BIGBIG
-switch.  This is described on the :doc:`Build\_settings <Build_settings>`
+or about 9e18 atoms, if you build LAMMPS with the - DLAMMPS_BIGBIG
+switch.  This is described on the :doc:`Build_settings <Build_settings>`
 doc page.  If atom IDs are not used, they must be specified as 0 for
 all atoms, e.g. in a data or restart file.
 
@@ -112,7 +108,7 @@ this command.  Note that specifying "all" as the group-ID effectively
 turns off the *first* option.
 
 It is OK to use the *first* keyword with a group that has not yet been
-defined, e.g. to use the atom\_modify first command at the beginning of
+defined, e.g. to use the atom_modify first command at the beginning of
 your input script.  LAMMPS does not use the group until a simulation
 is run.
 
@@ -160,7 +156,6 @@ cache locality will be undermined.
 Restrictions
 """"""""""""
 
-
 The *first* and *sort* options cannot be used together.  Since sorting
 is on by default, it will be turned off if the *first* keyword is
 used with a group-ID that is not "all".
@@ -179,12 +174,8 @@ frequency of 1000 and a binsize of 0.0, which means the neighbor
 cutoff will be used to set the bin size. If no neighbor cutoff is
 defined, sorting will be turned off.
 
-
 ----------
 
-
 .. _Meloni:
 
-
-
 **(Meloni)** Meloni, Rosati and Colombo, J Chem Phys, 126, 121102 (2007).
diff --git a/doc/src/atom_style.rst b/doc/src/atom_style.rst
index d0707559d7..df00c65f01 100644
--- a/doc/src/atom_style.rst
+++ b/doc/src/atom_style.rst
@@ -6,15 +6,14 @@ atom_style command
 Syntax
 """"""
 
-
 .. code-block:: LAMMPS
 
    atom_style style args
 
 * style = *angle* or *atomic* or *body* or *bond* or *charge* or *dipole* or         *dpd* or *edpd* or *mdpd* or *tdpd* or *electron* or *ellipsoid* or         *full* or *line* or *meso* or *molecular* or *peri* or *smd* or         *sphere* or *spin* or *tri* or *template* or *hybrid*
-  
+
   .. parsed-literal::
-  
+
        args = none for any style except the following
          *body* args = bstyle bstyle-args
            bstyle = style of body particles
@@ -28,11 +27,9 @@ Syntax
 
 * accelerated styles (with same args) = *angle/kk* or *atomic/kk* or *bond/kk* or *charge/kk* or *full/kk* or *molecular/kk*
 
-
 Examples
 """"""""
 
-
 .. code-block:: LAMMPS
 
    atom_style atomic
@@ -122,7 +119,7 @@ quantities.
 +--------------+-----------------------------------------------------+--------------------------------------+
 | *tri*        | corner points, angular momentum                     | rigid bodies                         |
 +--------------+-----------------------------------------------------+--------------------------------------+
-| *wavepacket* | charge, spin, eradius, etag, cs\_re, cs\_im         | AWPMD                                |
+| *wavepacket* | charge, spin, eradius, etag, cs_re, cs_im           | AWPMD                                |
 +--------------+-----------------------------------------------------+--------------------------------------+
 
 .. note::
@@ -161,7 +158,7 @@ For the *dipole* style, a point dipole is defined for each point
 particle.  Note that if you wish the particles to be finite-size
 spheres as in a Stockmayer potential for a dipolar fluid, so that the
 particles can rotate due to dipole-dipole interactions, then you need
-to use atom\_style hybrid sphere dipole, which will assign both a
+to use atom_style hybrid sphere dipole, which will assign both a
 diameter and dipole moment to each particle.
 
 For the *electron* style, the particles representing electrons are 3d
@@ -174,14 +171,14 @@ per-particle mass and volume.
 The *dpd* style is for dissipative particle dynamics (DPD) particles.
 Note that it is part of the USER-DPD package, and is not for use with
 the :doc:`pair_style dpd or dpd/stat <pair_dpd>` commands, which can
-simply use atom\_style atomic.  Atom\_style dpd extends DPD particle
+simply use atom_style atomic.  Atom_style dpd extends DPD particle
 properties with internal temperature (dpdTheta), internal conductive
 energy (uCond), internal mechanical energy (uMech), and internal
 chemical energy (uChem).
 
 The *edpd* style is for energy-conserving dissipative particle
-dynamics (eDPD) particles which store a temperature (edpd\_temp), and
-heat capacity(edpd\_cv).
+dynamics (eDPD) particles which store a temperature (edpd_temp), and
+heat capacity(edpd_cv).
 
 The *mdpd* style is for many-body dissipative particle dynamics (mDPD)
 particles which store a density (rho) for considering
@@ -189,7 +186,7 @@ density-dependent many-body interactions.
 
 The *tdpd* style is for transport dissipative particle dynamics (tDPD)
 particles which store a set of chemical concentration. An integer
-"cc\_species" is required to specify the number of chemical species
+"cc_species" is required to specify the number of chemical species
 involved in a tDPD system.
 
 The *meso* style is for smoothed particle hydrodynamics (SPH)
@@ -208,7 +205,7 @@ Those spins have a norm (their magnetic moment) and a direction.
 
 The *wavepacket* style is similar to *electron*\ , but the electrons may
 consist of several Gaussian wave packets, summed up with coefficients
-cs= (cs\_re,cs\_im).  Each of the wave packets is treated as a separate
+cs= (cs_re,cs_im).  Each of the wave packets is treated as a separate
 particle in LAMMPS, wave packets belonging to the same electron must
 have identical *etag* values.
 
@@ -235,7 +232,7 @@ can be advantageous for large-scale coarse-grained systems.
 .. note::
 
    When using the *template* style with a :doc:`molecule template <molecule>` that contains multiple molecules, you should
-   insure the atom types, bond types, angle\_types, etc in all the
+   insure the atom types, bond types, angle_types, etc in all the
    molecules are consistent.  E.g. if one molecule represents H2O and
    another CO2, then you probably do not want each molecule file to
    define 2 atom types and a single bond type, because they will conflict
@@ -259,13 +256,11 @@ orientation and position can be time integrated due to forces and
 torques.
 
 Note that there may be additional arguments required along with the
-*bstyle* specification, in the atom\_style body command.  These
+*bstyle* specification, in the atom_style body command.  These
 arguments are described on the :doc:`Howto body <Howto_body>` doc page.
 
-
 ----------
 
-
 Typically, simulations require only a single (non-hybrid) atom style.
 If some atoms in the simulation do not have all the properties defined
 by a particular style, use the simplest style that defines all the
@@ -276,7 +271,7 @@ If some atoms have bonds, but others do not, use the *bond* style.
 The only scenario where the *hybrid* style is needed is if there is no
 single style which defines all needed properties of all atoms.  For
 example, as mentioned above, if you want dipolar particles which will
-rotate due to torque, you need to use "atom\_style hybrid sphere
+rotate due to torque, you need to use "atom_style hybrid sphere
 dipole".  When a hybrid style is used, atoms store and communicate the
 union of all quantities implied by the individual styles.
 
@@ -287,10 +282,8 @@ per-atom basis.
 LAMMPS can be extended with new atom styles as well as new body
 styles; see the :doc:`Modify <Modify>` doc page.
 
-
 ----------
 
-
 Styles with a *kk* suffix are functionally the same as the
 corresponding style without the suffix.  They have been optimized to
 run faster, depending on your available hardware, as discussed in on
@@ -315,7 +308,6 @@ instructions on how to use the accelerated styles effectively.
 Restrictions
 """"""""""""
 
-
 This command cannot be used after the simulation box is defined by a
 :doc:`read_data <read_data>` or :doc:`create_box <create_box>` command.
 
@@ -338,7 +330,7 @@ The *electron* style is part of the USER-EFF package for :doc:`electronic force
 The *dpd* style is part of the USER-DPD package for dissipative
 particle dynamics (DPD).
 
-The *edpd*\ , *mdpd*\ , and *tdpd* styles are part of the USER-MESO package
+The *edpd*\ , *mdpd*\ , and *tdpd* styles are part of the USER-MESODPD package
 for energy-conserving dissipative particle dynamics (eDPD), many-body
 dissipative particle dynamics (mDPD), and transport dissipative particle
 dynamics (tDPD), respectively.
@@ -359,15 +351,11 @@ Related commands
 Default
 """""""
 
-atom\_style atomic
-
+atom_style atomic
 
 ----------
 
-
 .. _Grime:
 
-
-
 **(Grime)** Grime and Voth, to appear in J Chem Theory & Computation
 (2014).
diff --git a/doc/src/balance.rst b/doc/src/balance.rst
index 9da86342ec..5e631fdd27 100644
--- a/doc/src/balance.rst
+++ b/doc/src/balance.rst
@@ -6,7 +6,6 @@ balance command
 Syntax
 """"""
 
-
 .. parsed-literal::
 
    balance thresh style args ... keyword args ...
@@ -14,9 +13,9 @@ Syntax
 * thresh = imbalance threshold that must be exceeded to perform a re-balance
 * one style/arg pair can be used (or multiple for *x*\ ,\ *y*\ ,\ *z*\ )
 * style = *x* or *y* or *z* or *shift* or *rcb*
-  
+
   .. parsed-literal::
-  
+
        *x* args = *uniform* or Px-1 numbers between 0 and 1
          *uniform* = evenly spaced cuts between processors in x dimension
          numbers = Px-1 ascending values between 0 and 1, Px - # of processors in x dimension
@@ -37,9 +36,9 @@ Syntax
 
 * zero or more keyword/arg pairs may be appended
 * keyword = *weight* or *out*
-  
+
   .. parsed-literal::
-  
+
        *weight* style args = use weighted particle counts for the balancing
          *style* = *group* or *neigh* or *time* or *var* or *store*
            *group* args = Ngroup group1 weight1 group2 weight2 ...
@@ -57,13 +56,10 @@ Syntax
        *out* arg = filename
          filename = write each processor's sub-domain to a file
 
-
-
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    balance 0.9 x uniform y 0.4 0.5 0.6
    balance 1.2 shift xz 5 1.1
@@ -168,10 +164,8 @@ fractions of the box length) are also printed.
    :doc:`kspace_style <kspace_style>` command.  Thus you should benchmark
    the run times of a simulation before and after balancing.
 
-
 ----------
 
-
 The method used to perform a load balance is specified by one of the
 listed styles (or more in the case of *x*\ ,\ *y*\ ,\ *z*\ ), which are
 described in detail below.  There are 2 kinds of styles.
@@ -193,7 +187,6 @@ sub-box for each of 16 processors); the middle diagram is after a
 .. image:: JPG/balance_rcb_small.jpg
    :target: JPG/balance_rcb.jpg
 
-
 The *rcb* style is a "tiling" method which does not produce a logical
 3d grid of processors.  Rather it tiles the simulation domain with
 rectangular sub-boxes of varying size and shape in an irregular
@@ -204,7 +197,7 @@ The "grid" methods can be used with either of the
 :doc:`comm_style <comm_style>` command options, *brick* or *tiled*\ .  The
 "tiling" methods can only be used with :doc:`comm_style tiled <comm_style>`.  Note that it can be useful to use a "grid"
 method with :doc:`comm_style tiled <comm_style>` to return the domain
-partitioning to a logical 3d grid of processors so that "comm\_style
+partitioning to a logical 3d grid of processors so that "comm_style
 brick" can afterwords be specified for subsequent :doc:`run <run>`
 commands.
 
@@ -220,10 +213,8 @@ When a "tiling" method is specified, the current domain partitioning
 ("grid" or "tiled") is ignored, and a new partitioning is computed
 from scratch.
 
-
 ----------
 
-
 The *x*\ , *y*\ , and *z* styles invoke a "grid" method for balancing, as
 described above.  Note that any or all of these 3 styles can be
 specified together, one after the other, but they cannot be used with
@@ -237,7 +228,7 @@ that specify the position of the cutting planes.  This requires
 knowing Ps = Px or Py or Pz = the number of processors assigned by
 LAMMPS to the relevant dimension.  This assignment is made (and the
 Px, Py, Pz values printed out) when the simulation box is created by
-the "create\_box" or "read\_data" or "read\_restart" command and is
+the "create_box" or "read_data" or "read_restart" command and is
 influenced by the settings of the :doc:`processors <processors>`
 command.
 
@@ -250,10 +241,8 @@ there are 2 processors in the x dimension, you specify a single value
 such as 0.75, which would make the left processor's sub-domain 3x
 larger than the right processor's sub-domain.
 
-
 ----------
 
-
 The *shift* style invokes a "grid" method for balancing, as
 described above.  It changes the positions of cutting planes between
 processors in an iterative fashion, seeking to reduce the imbalance
@@ -307,10 +296,8 @@ the balance procedure ends.
    the same number of iterations to converge even if the cutting plane is
    initially close to the target value.
 
-
 ----------
 
-
 The *rcb* style invokes a "tiled" method for balancing, as described
 above.  It performs a recursive coordinate bisectioning (RCB) of the
 simulation domain. The basic idea is as follows.
@@ -344,14 +331,12 @@ box in two.  The recursion continues until every processor is assigned
 a sub-box of the entire simulation domain, and owns the (weighted)
 particles in that sub-box.
 
-
 ----------
 
-
-.. _weighted\_balance:
+.. _weighted_balance:
 
 This sub-section describes how to perform weighted load balancing
-using the *weight* keyword. 
+using the *weight* keyword.
 
 By default, all particles have a weight of 1.0, which means each
 particle is assumed to require the same amount of computation during a
@@ -477,16 +462,14 @@ velocity, the volume of its Voronoi cell, etc.
 
 The *store* weight style does not compute a weight factor.  Instead it
 stores the current accumulated weights in a custom per-atom property
-specified by *name*\ .  This must be a property defined as *d\_name* via
+specified by *name*\ .  This must be a property defined as *d_name* via
 the :doc:`fix property/atom <fix_property_atom>` command.  Note that
 these custom per-atom properties can be output in a :doc:`dump <dump>`
 file, so this is a way to examine, debug, or visualize the
 per-particle weights computed during the load-balancing operation.
 
-
 ----------
 
-
 The *out* keyword writes a text file to the specified *filename* with
 the results of the balancing operation.  The file contains the bounds
 of the sub-domain for each processor after the balancing operation
@@ -495,7 +478,6 @@ completes.  The format of the file is compatible with the
 visualizing mesh files.  An example is shown here for a balancing by 4
 processors for a 2d problem:
 
-
 .. parsed-literal::
 
    ITEM: TIMESTEP
@@ -543,14 +525,11 @@ rectangle for each processor (1 to 4).
 For a 3d problem, the syntax is similar with 8 vertices listed for
 each processor, instead of 4, and "SQUARES" replaced by "CUBES".
 
-
 ----------
 
-
 Restrictions
 """"""""""""
 
-
 For 2d simulations, the *z* style cannot be used.  Nor can a "z"
 appear in *dimstr* for the *shift* style.
 
@@ -563,12 +542,6 @@ Related commands
 :doc:`group <group>`, :doc:`processors <processors>`,
 :doc:`fix balance <fix_balance>`, :doc:`comm_style <comm_style>`
 
-.. _pizza: http://pizza.sandia.gov
+.. _pizza: https://pizza.sandia.gov
 
 **Default:** none
-
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/bond_class2.rst b/doc/src/bond_class2.rst
index 7b07c8a69a..3aee22dbf4 100644
--- a/doc/src/bond_class2.rst
+++ b/doc/src/bond_class2.rst
@@ -12,7 +12,6 @@ bond_style class2/kk command
 Syntax
 """"""
 
-
 .. code-block:: LAMMPS
 
    bond_style class2
@@ -20,7 +19,6 @@ Syntax
 Examples
 """"""""
 
-
 .. code-block:: LAMMPS
 
    bond_style class2
@@ -35,7 +33,6 @@ The *class2* bond style uses the potential
 
    E = K_2 (r - r_0)^2 + K_3 (r - r_0)^3 + K_4 (r - r_0)^4
 
-
 where :math:`r_0` is the equilibrium bond distance.
 
 See :ref:`(Sun) <bond-Sun>` for a description of the COMPASS class2 force field.
@@ -50,10 +47,8 @@ or :doc:`read_restart <read_restart>` commands:
 * :math:`K_3` (energy/distance\^3)
 * :math:`K_4` (energy/distance\^4)
 
-
 ----------
 
-
 Styles with a *gpu*\ , *intel*\ , *kk*\ , *omp*\ , or *opt* suffix are
 functionally the same as the corresponding style without the suffix.
 They have been optimized to run faster, depending on your available
@@ -72,14 +67,11 @@ by including their suffix, or you can use the :doc:`-suffix command-line switch
 See the :doc:`Speed packages <Speed_packages>` doc page for more
 instructions on how to use the accelerated styles effectively.
 
-
 ----------
 
-
 Restrictions
 """"""""""""
 
-
 This bond style can only be used if LAMMPS was built with the CLASS2
 package.  See the :doc:`Build package <Build_package>` doc page for more
 info.
@@ -91,12 +83,8 @@ Related commands
 
 **Default:** none
 
-
 ----------
 
-
 .. _bond-Sun:
 
-
-
 **(Sun)** Sun, J Phys Chem B 102, 7338-7364 (1998).
diff --git a/doc/src/bond_coeff.rst b/doc/src/bond_coeff.rst
index 157403a301..416190a367 100644
--- a/doc/src/bond_coeff.rst
+++ b/doc/src/bond_coeff.rst
@@ -6,7 +6,6 @@ bond_coeff command
 Syntax
 """"""
 
-
 .. code-block:: LAMMPS
 
    bond_coeff N args
@@ -17,7 +16,6 @@ Syntax
 Examples
 """"""""
 
-
 .. code-block:: LAMMPS
 
    bond_coeff 5 80.0 1.2
@@ -42,48 +40,41 @@ leading asterisk means all types from 1 to n (inclusive).  A trailing
 asterisk means all types from n to N (inclusive).  A middle asterisk
 means all types from m to n (inclusive).
 
-Note that using a bond\_coeff command can override a previous setting
+Note that using a bond_coeff command can override a previous setting
 for the same bond type.  For example, these commands set the coeffs
 for all bond types, then overwrite the coeffs for just bond type 2:
 
-
 .. code-block:: LAMMPS
 
    bond_coeff * 100.0 1.2
    bond_coeff 2 200.0 1.2
 
 A line in a data file that specifies bond coefficients uses the exact
-same format as the arguments of the bond\_coeff command in an input
+same format as the arguments of the bond_coeff command in an input
 script, except that wild-card asterisks should not be used since
 coefficients for all N types must be listed in the file.  For example,
 under the "Bond Coeffs" section of a data file, the line that
 corresponds to the 1st example above would be listed as
 
-
 .. parsed-literal::
 
    5 80.0 1.2
 
-
 ----------
 
-
 The list of all bond styles defined in LAMMPS is given on the
 :doc:`bond_style <bond_style>` doc page.  They are also listed in more
 compact form on the :doc:`Commands bond <Commands_bond>` doc page.
 
 On either of those pages, click on the style to display the formula it
 computes and its coefficients as specified by the associated
-bond\_coeff command.
-
+bond_coeff command.
 
 ----------
 
-
 Restrictions
 """"""""""""
 
-
 This command must come after the simulation box is defined by a
 :doc:`read_data <read_data>`, :doc:`read_restart <read_restart>`, or
 :doc:`create_box <create_box>` command.
diff --git a/doc/src/bond_fene.rst b/doc/src/bond_fene.rst
index a36db3a170..3ba9672294 100644
--- a/doc/src/bond_fene.rst
+++ b/doc/src/bond_fene.rst
@@ -15,7 +15,6 @@ bond_style fene/omp command
 Syntax
 """"""
 
-
 .. code-block:: LAMMPS
 
    bond_style fene
@@ -23,7 +22,6 @@ Syntax
 Examples
 """"""""
 
-
 .. code-block:: LAMMPS
 
    bond_style fene
@@ -38,7 +36,6 @@ The *fene* bond style uses the potential
 
    E = -0.5 K R_0^2  \ln \left[ 1 - \left(\frac{r}{R_0}\right)^2\right] + 4 \epsilon \left[ \left(\frac{\sigma}{r}\right)^{12} - \left(\frac{\sigma}{r}\right)^6 \right] + \epsilon
 
-
 to define a finite extensible nonlinear elastic (FENE) potential
 :ref:`(Kremer) <fene-Kremer>`, used for bead-spring polymer models.  The first
 term is attractive, the 2nd Lennard-Jones term is repulsive.  The
@@ -55,10 +52,8 @@ or :doc:`read_restart <read_restart>` commands:
 * :math:`\epsilon` (energy)
 * :math:`\sigma` (distance)
 
-
 ----------
 
-
 Styles with a *gpu*\ , *intel*\ , *kk*\ , *omp*\ , or *opt* suffix are
 functionally the same as the corresponding style without the suffix.
 They have been optimized to run faster, depending on your available
@@ -77,14 +72,11 @@ by including their suffix, or you can use the :doc:`-suffix command-line switch
 See the :doc:`Speed packages <Speed_packages>` doc page for more
 instructions on how to use the accelerated styles effectively.
 
-
 ----------
 
-
 Restrictions
 """"""""""""
 
-
 This bond style can only be used if LAMMPS was built with the MOLECULE
 package.  See the :doc:`Build package <Build_package>` doc page for more
 info.
@@ -100,12 +92,8 @@ Related commands
 
 **Default:** none
 
-
 ----------
 
-
 .. _fene-Kremer:
 
-
-
 **(Kremer)** Kremer, Grest, J Chem Phys, 92, 5057 (1990).
diff --git a/doc/src/bond_fene_expand.rst b/doc/src/bond_fene_expand.rst
index 8a05e141d7..032b726121 100644
--- a/doc/src/bond_fene_expand.rst
+++ b/doc/src/bond_fene_expand.rst
@@ -9,7 +9,6 @@ bond_style fene/expand/omp command
 Syntax
 """"""
 
-
 .. code-block:: LAMMPS
 
    bond_style fene/expand
@@ -17,7 +16,6 @@ Syntax
 Examples
 """"""""
 
-
 .. code-block:: LAMMPS
 
    bond_style fene/expand
@@ -32,7 +30,6 @@ The *fene/expand* bond style uses the potential
 
    E = -0.5 K R_0^2 \ln \left[1 -\left( \frac{\left(r - \Delta\right)}{R_0}\right)^2 \right] + 4 \epsilon \left[ \left(\frac{\sigma}{\left(r - \Delta\right)}\right)^{12} - \left(\frac{\sigma}{\left(r - \Delta\right)}\right)^6 \right] + \epsilon
 
-
 to define a finite extensible nonlinear elastic (FENE) potential
 :ref:`(Kremer) <feneexpand-Kremer>`, used for bead-spring polymer models.  The first
 term is attractive, the 2nd Lennard-Jones term is repulsive.
@@ -53,10 +50,8 @@ or :doc:`read_restart <read_restart>` commands:
 * :math:`\sigma` (distance)
 * :math:`\Delta` (distance)
 
-
 ----------
 
-
 Styles with a *gpu*\ , *intel*\ , *kk*\ , *omp*\ , or *opt* suffix are
 functionally the same as the corresponding style without the suffix.
 They have been optimized to run faster, depending on your available
@@ -75,14 +70,11 @@ by including their suffix, or you can use the :doc:`-suffix command-line switch
 See the :doc:`Speed packages <Speed_packages>` doc page for more
 instructions on how to use the accelerated styles effectively.
 
-
 ----------
 
-
 Restrictions
 """"""""""""
 
-
 This bond style can only be used if LAMMPS was built with the MOLECULE
 package.  See the :doc:`Build package <Build_package>` doc page for more
 info.
@@ -98,12 +90,8 @@ Related commands
 
 **Default:** none
 
-
 ----------
 
-
 .. _feneexpand-Kremer:
 
-
-
 **(Kremer)** Kremer, Grest, J Chem Phys, 92, 5057 (1990).
diff --git a/doc/src/bond_gromos.rst b/doc/src/bond_gromos.rst
index 3b935568bb..ad1b143a24 100644
--- a/doc/src/bond_gromos.rst
+++ b/doc/src/bond_gromos.rst
@@ -9,7 +9,6 @@ bond_style gromos/omp command
 Syntax
 """"""
 
-
 .. code-block:: LAMMPS
 
    bond_style gromos
@@ -17,7 +16,6 @@ Syntax
 Examples
 """"""""
 
-
 .. code-block:: LAMMPS
 
    bond_style gromos
@@ -32,7 +30,6 @@ The *gromos* bond style uses the potential
 
    E = K (r^2 - r_0^2)^2
 
-
 where :math:`r_0` is the equilibrium bond distance.  Note that the usual 1/4
 factor is included in :math:`K`.
 
@@ -44,10 +41,8 @@ or :doc:`read_restart <read_restart>` commands:
 * :math:`K` (energy/distance\^4)
 * :math:`r_0` (distance)
 
-
 ----------
 
-
 Styles with a *gpu*\ , *intel*\ , *kk*\ , *omp*\ , or *opt* suffix are
 functionally the same as the corresponding style without the suffix.
 They have been optimized to run faster, depending on your available
@@ -66,14 +61,11 @@ by including their suffix, or you can use the :doc:`-suffix command-line switch
 See the :doc:`Speed packages <Speed_packages>` doc page for more
 instructions on how to use the accelerated styles effectively.
 
-
 ----------
 
-
 Restrictions
 """"""""""""
 
-
 This bond style can only be used if LAMMPS was built with the MOLECULE
 package.  See the :doc:`Build package <Build_package>` doc page for more
 info.
diff --git a/doc/src/bond_harmonic.rst b/doc/src/bond_harmonic.rst
index 06af4037f6..befab173d6 100644
--- a/doc/src/bond_harmonic.rst
+++ b/doc/src/bond_harmonic.rst
@@ -15,7 +15,6 @@ bond_style harmonic/omp command
 Syntax
 """"""
 
-
 .. code-block:: LAMMPS
 
    bond_style harmonic
@@ -23,7 +22,6 @@ Syntax
 Examples
 """"""""
 
-
 .. code-block:: LAMMPS
 
    bond_style harmonic
@@ -38,7 +36,6 @@ The *harmonic* bond style uses the potential
 
    E = K (r - r_0)^2
 
-
 where :math:`r_0` is the equilibrium bond distance.  Note that the usual 1/2
 factor is included in :math:`K`.
 
@@ -50,10 +47,8 @@ or :doc:`read_restart <read_restart>` commands:
 * :math:`K` (energy/distance\^2)
 * :math:`r_0` (distance)
 
-
 ----------
 
-
 Styles with a *gpu*\ , *intel*\ , *kk*\ , *omp*\ , or *opt* suffix are
 functionally the same as the corresponding style without the suffix.
 They have been optimized to run faster, depending on your available
@@ -72,14 +67,11 @@ by including their suffix, or you can use the :doc:`-suffix command-line switch
 See the :doc:`Speed packages <Speed_packages>` doc page for more
 instructions on how to use the accelerated styles effectively.
 
-
 ----------
 
-
 Restrictions
 """"""""""""
 
-
 This bond style can only be used if LAMMPS was built with the MOLECULE
 package.  See the :doc:`Build package <Build_package>` doc page for more
 info.
diff --git a/doc/src/bond_harmonic_shift.rst b/doc/src/bond_harmonic_shift.rst
index 26373790a2..a044797c6f 100644
--- a/doc/src/bond_harmonic_shift.rst
+++ b/doc/src/bond_harmonic_shift.rst
@@ -9,7 +9,6 @@ bond_style harmonic/shift/omp command
 Syntax
 """"""
 
-
 .. code-block:: LAMMPS
 
    bond_style harmonic/shift
@@ -17,7 +16,6 @@ Syntax
 Examples
 """"""""
 
-
 .. code-block:: LAMMPS
 
    bond_style harmonic/shift
@@ -33,7 +31,6 @@ the potential
 
    E = \frac{U_{\text{min}}}{(r_0-r_c)^2} \left[ (r-r_0)^2-(r_c-r_0)^2 \right]
 
-
 where :math:`r_0` is the equilibrium bond distance, and :math:`r_c` the critical distance.
 The potential is :math:`-U_{\text{min}}` at :math:`r0` and zero at :math:`r_c`. The spring constant is
 :math:`k = U_{\text{min}} / [ 2 (r_0-r_c)^2]`.
@@ -49,10 +46,8 @@ or :doc:`read_restart <read_restart>` commands:
 
 * :math:`r_c` (distance)
 
-
 ----------
 
-
 Styles with a *gpu*\ , *intel*\ , *kk*\ , *omp*\ , or *opt* suffix are
 functionally the same as the corresponding style without the suffix.
 They have been optimized to run faster, depending on your available
@@ -71,14 +66,11 @@ by including their suffix, or you can use the :doc:`-suffix command-line switch
 See the :doc:`Speed packages <Speed_packages>` doc page for more
 instructions on how to use the accelerated styles effectively.
 
-
 ----------
 
-
 Restrictions
 """"""""""""
 
-
 This bond style can only be used if LAMMPS was built with the
 USER-MISC package.  See the :doc:`Build package <Build_package>` doc
 page for more info.
diff --git a/doc/src/bond_harmonic_shift_cut.rst b/doc/src/bond_harmonic_shift_cut.rst
index 6b7e7d4fbb..64a7ae2e3d 100644
--- a/doc/src/bond_harmonic_shift_cut.rst
+++ b/doc/src/bond_harmonic_shift_cut.rst
@@ -9,7 +9,6 @@ bond_style harmonic/shift/cut/omp command
 Syntax
 """"""
 
-
 .. code-block:: LAMMPS
 
    bond_style harmonic/shift/cut
@@ -17,7 +16,6 @@ Syntax
 Examples
 """"""""
 
-
 .. code-block:: LAMMPS
 
    bond_style harmonic/shift/cut
@@ -33,7 +31,6 @@ uses the potential
 
    E = \frac{U_{\text{min}}}{(r_0-r_c)^2} \left[ (r-r_0)^2-(r_c-r_0)^2 \right]
 
-
 where :math:`r_0` is the equilibrium bond distance, and rc the critical distance.
 The bond potential is zero for distances :math:`r > r_c`. The potential is :math:`-U_{\text{min}}`
 at :math:`r_0` and zero at :math:`r_c`. The spring constant is :math:`k = U_{\text{min}} / [ 2 (r_0-r_c)^2]`.
@@ -47,10 +44,8 @@ or :doc:`read_restart <read_restart>` commands:
 * :math:`r_0` (distance)
 * :math:`r_c` (distance)
 
-
 ----------
 
-
 Styles with a *gpu*\ , *intel*\ , *kk*\ , *omp*\ , or *opt* suffix are
 functionally the same as the corresponding style without the suffix.
 They have been optimized to run faster, depending on your available
@@ -69,14 +64,11 @@ by including their suffix, or you can use the :doc:`-suffix command-line switch
 See the :doc:`Speed packages <Speed_packages>` doc page for more
 instructions on how to use the accelerated styles effectively.
 
-
 ----------
 
-
 Restrictions
 """"""""""""
 
-
 This bond style can only be used if LAMMPS was built with the
 USER-MISC package.  See the :doc:`Build package <Build_package>` doc
 page for more info.
@@ -86,6 +78,6 @@ Related commands
 
 :doc:`bond_coeff <bond_coeff>`, :doc:`delete_bonds <delete_bonds>`,
 :doc:`bond_harmonic <bond_harmonic>`,
-:doc:`bond\_harmonic\_shift <bond_harmonic_shift>`
+:doc:`bond_style harmonic/shift <bond_harmonic_shift>`
 
 **Default:** none
diff --git a/doc/src/bond_hybrid.rst b/doc/src/bond_hybrid.rst
index 6b8175858f..74bd39988b 100644
--- a/doc/src/bond_hybrid.rst
+++ b/doc/src/bond_hybrid.rst
@@ -6,7 +6,6 @@ bond_style hybrid command
 Syntax
 """"""
 
-
 .. code-block:: LAMMPS
 
    bond_style hybrid style1 style2 ...
@@ -16,7 +15,6 @@ Syntax
 Examples
 """"""""
 
-
 .. code-block: LAMMPS
 
    bond_style hybrid harmonic fene
@@ -34,9 +32,9 @@ be computed with a *harmonic* potential.  The assignment of bond type
 to style is made via the :doc:`bond_coeff <bond_coeff>` command or in
 the data file.
 
-In the bond\_coeff commands, the name of a bond style must be added
+In the bond_coeff commands, the name of a bond style must be added
 after the bond type, with the remaining coefficients being those
-appropriate to that style.  In the example above, the 2 bond\_coeff
+appropriate to that style.  In the example above, the 2 bond_coeff
 commands set bonds of bond type 1 to be computed with a *harmonic*
 potential with coefficients 80.0, 1.2 for :math:`K`, :math:`r_0`.  All other bond types
 (2-N) are computed with a *fene* potential with coefficients 30.0,
@@ -47,7 +45,6 @@ If bond coefficients are specified in the data file read via the
 E.g. "harmonic" or "fene" must be added after the bond type, for each
 line in the "Bond Coeffs" section, e.g.
 
-
 .. parsed-literal::
 
    Bond Coeffs
@@ -57,25 +54,22 @@ line in the "Bond Coeffs" section, e.g.
    ...
 
 A bond style of *none* with no additional coefficients can be used in
-place of a bond style, either in a input script bond\_coeff command or
+place of a bond style, either in a input script bond_coeff command or
 in the data file, if you desire to turn off interactions for specific
 bond types.
 
-
 ----------
 
-
 Restrictions
 """"""""""""
 
-
 This bond style can only be used if LAMMPS was built with the MOLECULE
 package.  See the :doc:`Build package <Build_package>` doc page for more
 info.
 
 Unlike other bond styles, the hybrid bond style does not store bond
 coefficient info for individual sub-styles in a :doc:`binary restart files <restart>`.  Thus when restarting a simulation from a restart
-file, you need to re-specify bond\_coeff commands.
+file, you need to re-specify bond_coeff commands.
 
 Related commands
 """"""""""""""""
diff --git a/doc/src/bond_mm3.rst b/doc/src/bond_mm3.rst
index e7baa78ea0..8ea79d9139 100644
--- a/doc/src/bond_mm3.rst
+++ b/doc/src/bond_mm3.rst
@@ -6,7 +6,6 @@ bond_style mm3 command
 Syntax
 """"""
 
-
 .. code-block:: LAMMPS
 
    bond_style mm3
@@ -14,7 +13,6 @@ Syntax
 Examples
 """"""""
 
-
 .. code-block:: LAMMPS
 
    bond_style mm3
@@ -30,7 +28,6 @@ as defined in :ref:`(Allinger) <mm3-allinger1989>`
 
    E = K (r - r_0)^2 \left[ 1 - 2.55(r-r_0) + (7/12) 2.55^2(r-r_0)^2 \right]
 
-
 where :math:`r_0` is the equilibrium value of the bond, and :math:`K` is a
 prefactor. The anharmonic prefactors have units angstrom\^(-n):
 -2.55 angstrom\^(-1) and (7/12)2.55\^2 angstrom\^(-2). The code takes
@@ -49,9 +46,8 @@ or :doc:`read_restart <read_restart>` commands:
 Restrictions
 """"""""""""
 
-
 This bond style can only be used if LAMMPS was built with the
-USER\_YAFF package.  See the :doc:`Build package <Build_package>` doc
+USER_YAFF package.  See the :doc:`Build package <Build_package>` doc
 page for more info.
 
 Related commands
@@ -61,13 +57,9 @@ Related commands
 
 **Default:** none
 
-
 ----------
 
-
 .. _mm3-allinger1989:
 
-
-
 **(Allinger)** Allinger, Yuh, Lii, JACS, 111(23), 8551-8566
 (1989),
diff --git a/doc/src/bond_morse.rst b/doc/src/bond_morse.rst
index 13f24855f3..5cc30bcdf9 100644
--- a/doc/src/bond_morse.rst
+++ b/doc/src/bond_morse.rst
@@ -9,7 +9,6 @@ bond_style morse/omp command
 Syntax
 """"""
 
-
 .. code-block:: LAMMPS
 
    bond_style morse
@@ -17,7 +16,6 @@ Syntax
 Examples
 """"""""
 
-
 .. code-block:: LAMMPS
 
    bond_style morse
@@ -32,7 +30,6 @@ The *morse* bond style uses the potential
 
    E = D \left[ 1 - e^{-\alpha (r - r_0)} \right]^2
 
-
 where :math:`r_0` is the equilibrium bond distance, :math:`\alpha` is a stiffness
 parameter, and :math:`D` determines the depth of the potential well.
 
@@ -45,10 +42,8 @@ or :doc:`read_restart <read_restart>` commands:
 * :math:`\alpha` (inverse distance)
 * :math:`r_0` (distance)
 
-
 ----------
 
-
 Styles with a *gpu*\ , *intel*\ , *kk*\ , *omp*\ , or *opt* suffix are
 functionally the same as the corresponding style without the suffix.
 They have been optimized to run faster, depending on your available
@@ -67,14 +62,11 @@ by including their suffix, or you can use the :doc:`-suffix command-line switch
 See the :doc:`Speed packages <Speed_packages>` doc page for more
 instructions on how to use the accelerated styles effectively.
 
-
 ----------
 
-
 Restrictions
 """"""""""""
 
-
 This bond style can only be used if LAMMPS was built with the MOLECULE
 package.  See the :doc:`Build package <Build_package>` doc page for more
 info.
diff --git a/doc/src/bond_none.rst b/doc/src/bond_none.rst
index ac838581be..3712ef08d5 100644
--- a/doc/src/bond_none.rst
+++ b/doc/src/bond_none.rst
@@ -6,7 +6,6 @@ bond_style none command
 Syntax
 """"""
 
-
 .. code-block:: LAMMPS
 
    bond_style none
@@ -14,7 +13,6 @@ Syntax
 Examples
 """"""""
 
-
 .. code-blocK:: LAMMPS
 
    bond_style none
diff --git a/doc/src/bond_nonlinear.rst b/doc/src/bond_nonlinear.rst
index 4f8a0c881e..05ed28fffe 100644
--- a/doc/src/bond_nonlinear.rst
+++ b/doc/src/bond_nonlinear.rst
@@ -9,7 +9,6 @@ bond_style nonlinear/omp command
 Syntax
 """"""
 
-
 .. code-block:: LAMMPS
 
    bond_style nonlinear
@@ -17,7 +16,6 @@ Syntax
 Examples
 """"""""
 
-
 .. code-block:: LAMMPS
 
    bond_style nonlinear
@@ -32,7 +30,6 @@ The *nonlinear* bond style uses the potential
 
    E = \frac{\epsilon (r - r_0)^2}{ [ \lambda^2 - (r - r_0)^2 ]}
 
-
 to define an anharmonic spring :ref:`(Rector) <Rector>` of equilibrium
 length :math:`r_0` and maximum extension lamda.
 
@@ -45,10 +42,8 @@ or :doc:`read_restart <read_restart>` commands:
 * :math:`r_0` (distance)
 * :math:`\lambda` (distance)
 
-
 ----------
 
-
 Styles with a *gpu*\ , *intel*\ , *kk*\ , *omp*\ , or *opt* suffix are
 functionally the same as the corresponding style without the suffix.
 They have been optimized to run faster, depending on your available
@@ -67,14 +62,11 @@ by including their suffix, or you can use the :doc:`-suffix command-line switch
 See the :doc:`Speed packages <Speed_packages>` doc page for more
 instructions on how to use the accelerated styles effectively.
 
-
 ----------
 
-
 Restrictions
 """"""""""""
 
-
 This bond style can only be used if LAMMPS was built with the MOLECULE
 package.  See the :doc:`Build package <Build_package>` doc page for more
 info.
@@ -86,12 +78,8 @@ Related commands
 
 **Default:** none
 
-
 ----------
 
-
 .. _Rector:
 
-
-
 **(Rector)** Rector, Van Swol, Henderson, Molecular Physics, 82, 1009 (1994).
diff --git a/doc/src/bond_oxdna.rst b/doc/src/bond_oxdna.rst
index 2b7ba54708..71e5105436 100644
--- a/doc/src/bond_oxdna.rst
+++ b/doc/src/bond_oxdna.rst
@@ -12,7 +12,6 @@ bond_style oxrna2/fene command
 Syntax
 """"""
 
-
 .. code-block:: LAMMPS
 
    bond_style oxdna/fene
@@ -24,7 +23,6 @@ Syntax
 Examples
 """"""""
 
-
 .. code-block:: LAMMPS
 
    bond_style oxdna/fene
@@ -34,7 +32,7 @@ Examples
    bond_coeff * 2.0 0.25 0.7564
 
    bond_style oxrna2/fene
-   bond_coeff \* 2.0 0.25 0.76107
+   bond_coeff * 2.0 0.25 0.76107
 
 Description
 """""""""""
@@ -45,7 +43,6 @@ The *oxdna/fene* , *oxdna2/fene* and *oxrna2/fene* bond styles use the potential
 
    E = - \frac{\epsilon}{2} \ln \left[ 1 - \left(\frac{r-r_0}{\Delta}\right)^2\right]
 
-
 to define a modified finite extensible nonlinear elastic (FENE)
 potential :ref:`(Ouldridge) <Ouldridge0>` to model the connectivity of the
 phosphate backbone in the oxDNA/oxRNA force field for coarse-grained
@@ -69,11 +66,11 @@ commands:
    coaxial stacking interaction *oxdna/coaxstk* as well as
    hydrogen-bonding interaction *oxdna/hbond* (see also documentation of
    :doc:`pair_style oxdna/excv <pair_oxdna>`). For the oxDNA2
-   :ref:`(Snodin) <Snodin0>` bond style the analogous pair styles 
+   :ref:`(Snodin) <Snodin0>` bond style the analogous pair styles
    *oxdna2/excv* , *oxdna2/stk* , *oxdna2/xstk* , *oxdna2/coaxstk* ,
-   *oxdna2/hbond* and an additional Debye-Hueckel pair style 
+   *oxdna2/hbond* and an additional Debye-Hueckel pair style
    *oxdna2/dh* have to be defined. The same applies to the oxRNA2
-   :ref:`(Sulc1) <Sulc01>` styles. 
+   :ref:`(Sulc1) <Sulc01>` styles.
    The coefficients in the above example have to be kept fixed and cannot
    be changed without reparameterizing the entire model.
 
@@ -83,27 +80,24 @@ setup tool which creates single straight or helical DNA strands, DNA/RNA
 duplexes or arrays of DNA/RNA duplexes can be found in
 examples/USER/cgdna/util/.
 
-Please cite :ref:`(Henrich) <Henrich0>` in any publication that uses 
-this implementation.  The article contains general information 
-on the model, its implementation and performance as well as the structure of 
+Please cite :ref:`(Henrich) <Henrich0>` in any publication that uses
+this implementation.  The article contains general information
+on the model, its implementation and performance as well as the structure of
 the data and input file. The preprint version of the article can be found
 `here <PDF/USER-CGDNA.pdf>`_.
-Please cite also the relevant oxDNA/oxRNA publications. These are 
-:ref:`(Ouldridge) <Ouldridge0>` and 
-:ref:`(Ouldridge-DPhil) <Ouldridge-DPhil0>` for oxDNA, 
-:ref:`(Snodin) <Snodin0>` for oxDNA2, 
-:ref:`(Sulc1) <Sulc01>` for oxRNA2 
-and for sequence-specific hydrogen-bonding and stacking interactions 
+Please cite also the relevant oxDNA/oxRNA publications. These are
+:ref:`(Ouldridge) <Ouldridge0>` and
+:ref:`(Ouldridge-DPhil) <Ouldridge-DPhil0>` for oxDNA,
+:ref:`(Snodin) <Snodin0>` for oxDNA2,
+:ref:`(Sulc1) <Sulc01>` for oxRNA2
+and for sequence-specific hydrogen-bonding and stacking interactions
 :ref:`(Sulc2) <Sulc02>`.
 
-
 ----------
 
-
 Restrictions
 """"""""""""
 
-
 This bond style can only be used if LAMMPS was built with the
 USER-CGDNA package and the MOLECULE and ASPHERE package.  See the
 :doc:`Build package <Build_package>` doc page for more info.
@@ -111,14 +105,13 @@ USER-CGDNA package and the MOLECULE and ASPHERE package.  See the
 Related commands
 """"""""""""""""
 
-:doc:`pair_style oxdna/excv <pair_oxdna>`, :doc:`pair_style oxdna2/excv <pair_oxdna2>`, :doc:`pair_style oxrna2/excv <pair_oxrna2>`, 
+:doc:`pair_style oxdna/excv <pair_oxdna>`, :doc:`pair_style oxdna2/excv <pair_oxdna2>`, :doc:`pair_style oxrna2/excv <pair_oxrna2>`,
 :doc:`bond_coeff <bond_coeff>`, :doc:`fix nve/dotc/langevin <fix_nve_dotc_langevin>`
 
 **Default:**
 
 none
 
-
 ----------
 
 .. _Henrich0:
diff --git a/doc/src/bond_quartic.rst b/doc/src/bond_quartic.rst
index 89b1a0a131..1321e01586 100644
--- a/doc/src/bond_quartic.rst
+++ b/doc/src/bond_quartic.rst
@@ -9,7 +9,6 @@ bond_style quartic/omp command
 Syntax
 """"""
 
-
 .. code-block:: LAMMPS
 
    bond_style quartic
@@ -17,7 +16,6 @@ Syntax
 Examples
 """"""""
 
-
 .. code-block:: LAMMPS
 
    bond_style quartic
@@ -50,7 +48,7 @@ or :doc:`read_restart <read_restart>` commands:
 This potential was constructed to mimic the FENE bond potential for
 coarse-grained polymer chains.  When monomers with :math:`\sigma = \epsilon = 1.0`
 are used, the following choice of parameters gives a quartic potential that
-looks nearly like the FENE potential: 
+looks nearly like the FENE potential:
 
 .. math::
 
@@ -59,7 +57,7 @@ looks nearly like the FENE potential:
    B_2 &= 0.25 \\
    R_c &= 1.3 \\
    U_0 &= 34.6878
-   
+
 Different parameters can be specified using the :doc:`bond_coeff <bond_coeff>`
 command, but you will need to choose them carefully so they form a suitable
 bond potential.
@@ -83,16 +81,13 @@ Note that when bonds are dumped to a file via the :doc:`dump local <dump>` comma
 :doc:`delete_bonds <delete_bonds>` command can also be used to query the
 status of broken bonds or permanently delete them, e.g.:
 
-
 .. code-block:: LAMMPS
 
    delete_bonds all stats
    delete_bonds all bond 0 remove
 
-
 ----------
 
-
 Styles with a *gpu*\ , *intel*\ , *kk*\ , *omp*\ , or *opt* suffix are
 functionally the same as the corresponding style without the suffix.
 They have been optimized to run faster, depending on your available
@@ -111,14 +106,11 @@ by including their suffix, or you can use the :doc:`-suffix command-line switch
 See the :doc:`Speed packages <Speed_packages>` doc page for more
 instructions on how to use the accelerated styles effectively.
 
-
 ----------
 
-
 Restrictions
 """"""""""""
 
-
 This bond style can only be used if LAMMPS was built with the MOLECULE
 package.  See the :doc:`Build package <Build_package>` doc page for more
 info.
diff --git a/doc/src/bond_style.rst b/doc/src/bond_style.rst
index a0908606e4..52cc761da1 100644
--- a/doc/src/bond_style.rst
+++ b/doc/src/bond_style.rst
@@ -6,7 +6,6 @@ bond_style command
 Syntax
 """"""
 
-
 .. code-block:: LAMMPS
 
    bond_style style args
@@ -20,7 +19,6 @@ Syntax
 Examples
 """"""""
 
-
 .. code-block:: LAMMPS
 
    bond_style harmonic
@@ -49,10 +47,10 @@ The coefficients associated with a bond style can be specified in a
 data or restart file or via the :doc:`bond_coeff <bond_coeff>` command.
 
 All bond potentials store their coefficient data in binary restart
-files which means bond\_style and :doc:`bond_coeff <bond_coeff>` commands
+files which means bond_style and :doc:`bond_coeff <bond_coeff>` commands
 do not need to be re-specified in an input script that restarts a
 simulation.  See the :doc:`read_restart <read_restart>` command for
-details on how to do this.  The one exception is that bond\_style
+details on how to do this.  The one exception is that bond_style
 *hybrid* only stores the list of sub-styles in the restart file; bond
 coefficients need to be re-specified.
 
@@ -66,16 +64,14 @@ coefficients need to be re-specified.
 In the formulas listed for each bond style, *r* is the distance
 between the 2 atoms in the bond.
 
-
 ----------
 
-
 Here is an alphabetic list of bond styles defined in LAMMPS.  Click on
 the style to display the formula it computes and coefficients
 specified by the associated :doc:`bond_coeff <bond_coeff>` command.
 
 Click on the style to display the formula it computes, any additional
-arguments specified in the bond\_style command, and coefficients
+arguments specified in the bond_style command, and coefficients
 specified by the associated :doc:`bond_coeff <bond_coeff>` command.
 
 There are also additional accelerated pair styles included in the
@@ -104,14 +100,11 @@ accelerated styles exist.
 * :doc:`quartic <bond_quartic>` - breakable quartic bond
 * :doc:`table <bond_table>` - tabulated by bond length
 
-
 ----------
 
-
 Restrictions
 """"""""""""
 
-
 Bond styles can only be set for atom styles that allow bonds to be
 defined.
 
diff --git a/doc/src/bond_table.rst b/doc/src/bond_table.rst
index 79ad429222..445face231 100644
--- a/doc/src/bond_table.rst
+++ b/doc/src/bond_table.rst
@@ -9,7 +9,6 @@ bond_style table/omp command
 Syntax
 """"""
 
-
 .. code-block:: LAMMPS
 
    bond_style table style N
@@ -20,7 +19,6 @@ Syntax
 Examples
 """"""""
 
-
 .. code-block:: LAMMPS
 
    bond_style table linear 1000
@@ -59,14 +57,11 @@ The filename specifies a file containing tabulated energy and force
 values.  The keyword specifies a section of the file.  The format of
 this file is described below.
 
-
 ----------
 
-
 The format of a tabulated file is as follows (without the
 parenthesized comments):
 
-
 .. parsed-literal::
 
    # Bond potential for harmonic (one or more comment or blank lines)
@@ -127,10 +122,8 @@ Note that one file can contain many sections, each with a tabulated
 potential.  LAMMPS reads the file section by section until it finds
 one that matches the specified keyword.
 
-
 ----------
 
-
 Styles with a *gpu*\ , *intel*\ , *kk*\ , *omp*\ , or *opt* suffix are
 functionally the same as the corresponding style without the suffix.
 They have been optimized to run faster, depending on your available
@@ -149,24 +142,21 @@ by including their suffix, or you can use the :doc:`-suffix command-line switch
 See the :doc:`Speed packages <Speed_packages>` doc page for more
 instructions on how to use the accelerated styles effectively.
 
-
 ----------
 
-
 **Restart info:**
 
-This bond style writes the settings for the "bond\_style table"
-command to :doc:`binary restart files <restart>`, so a bond\_style
+This bond style writes the settings for the "bond_style table"
+command to :doc:`binary restart files <restart>`, so a bond_style
 command does not need to specified in an input script that reads a
 restart file.  However, the coefficient information is not stored in
 the restart file, since it is tabulated in the potential files.  Thus,
-bond\_coeff commands do need to be specified in the restart input
+bond_coeff commands do need to be specified in the restart input
 script.
 
 Restrictions
 """"""""""""
 
-
 This bond style can only be used if LAMMPS was built with the MOLECULE
 package.  See the :doc:`Build package <Build_package>` doc page for more
 info.
diff --git a/doc/src/bond_write.rst b/doc/src/bond_write.rst
index f7055d42aa..5f93e41da0 100644
--- a/doc/src/bond_write.rst
+++ b/doc/src/bond_write.rst
@@ -6,7 +6,6 @@ bond_write command
 Syntax
 """"""
 
-
 .. code-block:: LAMMPS
 
    bond_write btype N inner outer file keyword itype jtype
@@ -21,7 +20,6 @@ Syntax
 Examples
 """"""""
 
-
 .. code-block:: LAMMPS
 
    bond_write 1 500 0.5 3.5 table.txt Harmonic_1
@@ -54,7 +52,6 @@ and a force (in force units).
 Restrictions
 """"""""""""
 
-
 All force field coefficients for bond and other kinds of interactions
 must be set before this command can be invoked.
 
diff --git a/doc/src/bond_zero.rst b/doc/src/bond_zero.rst
index 329cd9d13a..42df0472a1 100644
--- a/doc/src/bond_zero.rst
+++ b/doc/src/bond_zero.rst
@@ -6,7 +6,6 @@ bond_style zero command
 Syntax
 """"""
 
-
 .. code-block:: LAMMPS
 
    bond_style zero [nocoeff]
@@ -14,7 +13,6 @@ Syntax
 Examples
 """"""""
 
-
 .. code-block:: LAMMPS
 
    bond_style zero
@@ -35,7 +33,7 @@ atoms listed in the data file read by the :doc:`read_data <read_data>`
 command.  If no bond style is defined, this command cannot be used.
 
 The optional *nocoeff* flag allows to read data files with a BondCoeff
-section for any bond style. Similarly, any bond\_coeff commands
+section for any bond style. Similarly, any bond_coeff commands
 will only be checked for the bond type number and the rest ignored.
 
 Note that the :doc:`bond_coeff <bond_coeff>` command must be used for
diff --git a/doc/src/bonds.rst b/doc/src/bonds.rst
index 3019e0c177..4118e153e9 100644
--- a/doc/src/bonds.rst
+++ b/doc/src/bonds.rst
@@ -1,7 +1,6 @@
 Bond Styles
 ###########
 
-
 .. toctree::
    :maxdepth: 1
    :glob:
diff --git a/doc/src/boundary.rst b/doc/src/boundary.rst
index 2a9896c2c8..7e5ce7d1ae 100644
--- a/doc/src/boundary.rst
+++ b/doc/src/boundary.rst
@@ -6,27 +6,23 @@ boundary command
 Syntax
 """"""
 
-
 .. parsed-literal::
 
    boundary x y z
 
 * x,y,z = *p* or *s* or *f* or *m*\ , one or two letters
-  
+
   .. parsed-literal::
-  
+
        *p* is periodic
        *f* is non-periodic and fixed
        *s* is non-periodic and shrink-wrapped
        *m* is non-periodic and shrink-wrapped with a minimum value
 
-
-
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    boundary p p f
    boundary p fs p
@@ -97,7 +93,6 @@ triclinic representations.
 Restrictions
 """"""""""""
 
-
 This command cannot be used after the simulation box is defined by a
 :doc:`read_data <read_data>` or :doc:`create_box <create_box>` command or
 :doc:`read_restart <read_restart>` command.  See the
@@ -115,12 +110,6 @@ of lost atoms.
 Default
 """""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    boundary p p p
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/box.rst b/doc/src/box.rst
index 9ef8316dae..86638971c0 100644
--- a/doc/src/box.rst
+++ b/doc/src/box.rst
@@ -6,25 +6,21 @@ box command
 Syntax
 """"""
 
-
 .. parsed-literal::
 
    box keyword value ...
 
 * one or more keyword/value pairs may be appended
 * keyword = *tilt*
-  
+
   .. parsed-literal::
-  
+
        *tilt* value = *small* or *large*
 
-
-
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    box tilt large
    box tilt small
@@ -58,7 +54,6 @@ error.
 Restrictions
 """"""""""""
 
-
 This command cannot be used after the simulation box is defined by a
 :doc:`read_data <read_data>` or :doc:`create_box <create_box>` command or
 :doc:`read_restart <read_restart>` command.
@@ -69,8 +64,3 @@ Default
 """""""
 
 The default value is tilt = small.
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/change_box.rst b/doc/src/change_box.rst
index 3430d25c72..2ab70ddec8 100644
--- a/doc/src/change_box.rst
+++ b/doc/src/change_box.rst
@@ -1,21 +1,20 @@
-.. index:: change\_box
+.. index:: change_box
 
-change\_box command
-===================
+change_box command
+==================
 
 Syntax
 """"""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    change_box group-ID parameter args ... keyword args ...
 
 * group-ID = ID of group of atoms to (optionally) displace
 * one or more parameter/arg pairs may be appended
-  
+
   .. parsed-literal::
-  
+
      parameter = *x* or *y* or *z* or *xy* or *xz* or *yz* or *boundary* or *ortho* or *triclinic* or *set* or *remap*
        *x*\ , *y*\ , *z* args = style value(s)
          style = *final* or *delta* or *scale* or *volume*
@@ -45,20 +44,17 @@ Syntax
 
 * zero or more keyword/value pairs may be appended
 * keyword = *units*
-  
+
   .. parsed-literal::
-  
+
        *units* value = *lattice* or *box*
          lattice = distances are defined in lattice units
          box = distances are defined in simulation box units
 
-
-
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    change_box all xy final -2.0 z final 0.0 5.0 boundary p p f remap units box
    change_box all x scale 1.1 y volume z volume remap
@@ -106,15 +102,14 @@ new owning processors.
 
 .. note::
 
-   This means that you cannot use the change\_box command to enlarge
+   This means that you cannot use the change_box command to enlarge
    a shrink-wrapped box, e.g. to make room to insert more atoms via the
    :doc:`create_atoms <create_atoms>` command, because the simulation box
-   will be re-shrink-wrapped before the change\_box command completes.
+   will be re-shrink-wrapped before the change_box command completes.
    Instead you could do something like this, assuming the simulation box
    is non-periodic and atoms extend from 0 to 20 in all dimensions:
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    change_box all x final -10 20
    create_atoms 1 single -5 5 5       # this will fail to insert an atom
@@ -125,7 +120,7 @@ new owning processors.
 
 .. note::
 
-   Unlike the earlier "displace\_box" version of this command, atom
+   Unlike the earlier "displace_box" version of this command, atom
    remapping is NOT performed by default.  This command allows remapping
    to be done in a more general way, exactly when you specify it (zero or
    more times) in the sequence of transformations.  Thus if you do not
@@ -166,10 +161,8 @@ new owning processors.
    transformations.  For more information on the allowed limits for box
    skew see the discussion on triclinic boxes on :doc:`Howto triclinic <Howto_triclinic>` doc page.
 
-
 ----------
 
-
 For the *x*\ , *y*\ , and *z* parameters, this is the meaning of their
 styles and values.
 
@@ -194,8 +187,7 @@ used following a keyword that changed the volume, which is any of the
 style, then both it and the current keyword apply to the keyword
 preceding "key".  I.e. this sequence of keywords is allowed:
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    change_box all x scale 1.1 y volume z volume
 
@@ -206,8 +198,7 @@ preceding keyword was invoked.
 If the following command is used, then the z box length will shrink by
 the same 1.1 factor the x box length was increased by:
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    change_box all x scale 1.1 z volume
 
@@ -216,17 +207,15 @@ shrink by sqrt(1.1) to keep the volume constant.  In this case, the
 y,z box lengths shrink so as to keep their relative aspect ratio
 constant:
 
+.. code-block:: LAMMPS
 
-.. parsed-literal::
-
-   change_box all"x scale 1.1 y volume z volume
+   change_box all x scale 1.1 y volume z volume
 
 If the following command is used, then the final box will be a factor
 of 10% larger in x and y, and a factor of 21% smaller in z, so as to
 keep the volume constant:
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    change_box all x scale 1.1 z volume y scale 1.1 z volume
 
@@ -242,10 +231,8 @@ keep the volume constant:
 For the *scale* and *volume* styles, the box length is expanded or
 compressed around its mid point.
 
-
 ----------
 
-
 For the *xy*\ , *xz*\ , and *yz* parameters, this is the meaning of their
 styles and values.  Note that changing the tilt factors of a triclinic
 box does not change its volume.
@@ -269,10 +256,8 @@ example), then configurations with tilt = ..., -15, -5, 5, 15, 25,
 ... are all equivalent.  Any tilt factor specified by this command
 must be within these limits.
 
-
 ----------
 
-
 The *boundary* keyword takes arguments that have exactly the same
 meaning as they do for the :doc:`boundary <boundary>` command.  In each
 dimension, a single letter assigns the same style to both the lower
@@ -295,13 +280,11 @@ command.  This command allows the boundary conditions to be changed
 later in your input script.  Also note that the
 :doc:`read_restart <read_restart>` will change boundary conditions to
 match what is stored in the restart file.  So if you wish to change
-them, you should use the change\_box command after the read\_restart
+them, you should use the change_box command after the read_restart
 command.
 
-
 ----------
 
-
 The *ortho* and *triclinic* keywords convert the simulation box to be
 orthogonal or triclinic (non-orthogonal).
 
@@ -318,16 +301,14 @@ be toggled to triclinic, and then a :doc:`non-equilibrium MD (NEMD) simulation <
 If the simulation box is currently triclinic and has non-zero tilt in
 xy, yz, or xz, then it cannot be converted to an orthogonal box.
 
-
 ----------
 
-
 The *set* keyword saves the current box size/shape.  This can be
 useful if you wish to use the *remap* keyword more than once or if you
 wish it to be applied to an intermediate box size/shape in a sequence
 of keyword operations.  Note that the box size/shape is saved before
 any of the keywords are processed, i.e. the box size/shape at the time
-the create\_box command is encountered in the input script.
+the create_box command is encountered in the input script.
 
 The *remap* keyword remaps atom coordinates from the last saved box
 size/shape to the current box state.  For example, if you stretch the
@@ -343,10 +324,8 @@ including this one, have been processed.
 
 Only atoms in the specified group are remapped.
 
-
 ----------
 
-
 The *units* keyword determines the meaning of the distance units used
 to define various arguments.  A *box* value selects standard distance
 units as defined by the :doc:`units <units>` command, e.g. Angstroms for
@@ -354,20 +333,17 @@ units = real or metal.  A *lattice* value means the distance units are
 in lattice spacings.  The :doc:`lattice <lattice>` command must have
 been previously used to define the lattice spacing.
 
-
 ----------
 
-
 Restrictions
 """"""""""""
 
-
 If you use the *ortho* or *triclinic* keywords, then at the point in
 the input script when this command is issued, no :doc:`dumps <dump>` can
 be active, nor can a :doc:`fix deform <fix_deform>` be active.  This is
 because these commands test whether the simulation box is orthogonal
 when they are first issued.  Note that these commands can be used in
-your script before a change\_box command is issued, so long as an
+your script before a change_box command is issued, so long as an
 :doc:`undump <undump>` or :doc:`unfix <unfix>` command is also used to
 turn them off.
 
@@ -380,8 +356,3 @@ Default
 """""""
 
 The option default is units = lattice.
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/clear.rst b/doc/src/clear.rst
index dac4ba8fa4..6c4ef9a22c 100644
--- a/doc/src/clear.rst
+++ b/doc/src/clear.rst
@@ -6,7 +6,6 @@ clear command
 Syntax
 """"""
 
-
 .. parsed-literal::
 
    clear
@@ -14,7 +13,6 @@ Syntax
 Examples
 """"""""
 
-
 .. parsed-literal::
 
    (commands for 1st simulation)
@@ -42,8 +40,3 @@ Restrictions
 **Related commands:** none
 
 **Default:** none
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/comm_modify.rst b/doc/src/comm_modify.rst
index 5526646261..9a2ae60f1e 100644
--- a/doc/src/comm_modify.rst
+++ b/doc/src/comm_modify.rst
@@ -1,21 +1,20 @@
-.. index:: comm\_modify
+.. index:: comm_modify
 
-comm\_modify command
-====================
+comm_modify command
+===================
 
 Syntax
 """"""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    comm_modify keyword value ...
 
 * zero or more keyword/value pairs may be appended
 * keyword = *mode* or *cutoff* or *cutoff/multi* or *group* or *vel*
-  
+
   .. parsed-literal::
-  
+
        *mode* value = *single* or *multi* = communicate atoms within a single or multiple distances
        *cutoff* value = Rcut (distance units) = communicate atoms from this far away
        *cutoff/multi* type value
@@ -24,20 +23,17 @@ Syntax
        *group* value = group-ID = only communicate atoms in the group
        *vel* value = *yes* or *no* = do or do not communicate velocity info with ghost atoms
 
-
-
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    comm_modify mode multi
    comm_modify mode multi group solvent
-   comm_modift mode multi cutoff/multi 1 10.0 cutoff/multi 2\*4 15.0
+   comm_modift mode multi cutoff/multi 1 10.0 cutoff/multi 2*4 15.0
    comm_modify vel yes
    comm_modify mode single cutoff 5.0 vel yes
-   comm_modify cutoff/multi \* 0.0
+   comm_modify cutoff/multi * 0.0
 
 Description
 """""""""""
@@ -53,9 +49,9 @@ processors and stored as properties of ghost atoms.
    you specify a :doc:`comm_style <comm_style>` or
    :doc:`read_restart <read_restart>` command, all communication settings
    are restored to their default or stored values, including those
-   previously reset by a comm\_modify command.  Thus if your input script
-   specifies a comm\_style or read\_restart command, you should use the
-   comm\_modify command after it.
+   previously reset by a comm_modify command.  Thus if your input script
+   specifies a comm_style or read_restart command, you should use the
+   comm_modify command after it.
 
 The *mode* keyword determines whether a single or multiple cutoff
 distances are used to determine which atoms to communicate.
@@ -86,7 +82,7 @@ printed. Specifying a cutoff value of 0.0 will reset any previous value
 to the default. If bonded interactions exist and equilibrium bond length
 information is available, then also a heuristic based on that bond length
 is computed. It is used as communication cutoff, if there is no pair
-style present and no *comm\_modify cutoff* command used. Otherwise a
+style present and no *comm_modify cutoff* command used. Otherwise a
 warning is printed, if this bond based estimate is larger than the
 communication cutoff used. A
 
@@ -165,7 +161,6 @@ that boundary (e.g. due to dilation or shear).
 Restrictions
 """"""""""""
 
-
 Communication mode *multi* is currently only available for
 :doc:`comm_style <comm_style>` *brick*\ .
 
@@ -180,8 +175,3 @@ Default
 The option defaults are mode = single, group = all, cutoff = 0.0, vel =
 no.  The cutoff default of 0.0 means that ghost cutoff = neighbor
 cutoff = pairwise force cutoff + neighbor skin.
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/comm_style.rst b/doc/src/comm_style.rst
index 528f05ecf1..2137378547 100644
--- a/doc/src/comm_style.rst
+++ b/doc/src/comm_style.rst
@@ -1,13 +1,12 @@
-.. index:: comm\_style
+.. index:: comm_style
 
-comm\_style command
-===================
+comm_style command
+==================
 
 Syntax
 """"""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    comm_style style
 
@@ -16,8 +15,7 @@ Syntax
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    comm_style brick
    comm_style tiled
@@ -57,7 +55,6 @@ commands.  The decomposition can be changed via the
 Restrictions
 """"""""""""
 
-
 Communication style *tiled* cannot be used with *triclinic* simulation
 cells.
 
@@ -71,8 +68,3 @@ Default
 """""""
 
 The default style is brick.
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/commands_list.rst b/doc/src/commands_list.rst
index 2eaa78d59c..349d388923 100644
--- a/doc/src/commands_list.rst
+++ b/doc/src/commands_list.rst
@@ -1,7 +1,6 @@
 Commands
 ########
 
-
 .. toctree::
    :maxdepth: 1
 
@@ -121,4 +120,3 @@ Commands
    write_data
    write_dump
    write_restart
-
diff --git a/doc/src/compute.rst b/doc/src/compute.rst
index 56de4f4225..0726a502bc 100644
--- a/doc/src/compute.rst
+++ b/doc/src/compute.rst
@@ -6,7 +6,6 @@ compute command
 Syntax
 """"""
 
-
 .. parsed-literal::
 
    compute ID group-ID style args
@@ -19,8 +18,7 @@ Syntax
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    compute 1 all temp
    compute newtemp flow temp/partial 1 1 0
@@ -43,10 +41,8 @@ various LAMMPS output options, many of which involve computes.
 The ID of a compute can only contain alphanumeric characters and
 underscores.
 
-
 ----------
 
-
 Computes calculate one of three styles of quantities: global,
 per-atom, or local.  A global quantity is one or more system-wide
 values, e.g. the temperature of the system.  A per-atom quantity is
@@ -76,11 +72,11 @@ discussed below, it can be referenced via the following bracket
 notation, where ID is the ID of the compute:
 
 +-------------+--------------------------------------------+
-| c\_ID       | entire scalar, vector, or array            |
+| c_ID        | entire scalar, vector, or array            |
 +-------------+--------------------------------------------+
-| c\_ID[I]    | one element of vector, one column of array |
+| c_ID[I]     | one element of vector, one column of array |
 +-------------+--------------------------------------------+
-| c\_ID[I][J] | one element of array                       |
+| c_ID[I][J]  | one element of array                       |
 +-------------+--------------------------------------------+
 
 In other words, using one bracket reduces the dimension of the
@@ -92,14 +88,12 @@ vector or array.
 Note that commands and :doc:`variables <variable>` which use compute
 quantities typically do not allow for all kinds, e.g. a command may
 require a vector of values, not a scalar.  This means there is no
-ambiguity about referring to a compute quantity as c\_ID even if it
+ambiguity about referring to a compute quantity as c_ID even if it
 produces, for example, both a scalar and vector.  The doc pages for
 various commands explain the details.
 
-
 ----------
 
-
 In LAMMPS, the values generated by a compute can be used in several
 ways:
 
@@ -115,7 +109,6 @@ ways:
   command.  Or the per-atom values can be referenced in an :doc:`atom-style variable <variable>`.
 * Local values can be reduced by the :doc:`compute reduce <compute_reduce>` command, or histogrammed by the :doc:`fix ave/histo <fix_ave_histo>` command, or output by the :doc:`dump local <dump>` command.
 
-
 The results of computes that calculate global quantities can be either
 "intensive" or "extensive" values.  Intensive means the value is
 independent of the number of atoms in the simulation,
@@ -123,23 +116,20 @@ e.g. temperature.  Extensive means the value scales with the number of
 atoms in the simulation, e.g. total rotational kinetic energy.
 :doc:`Thermodynamic output <thermo_style>` will normalize extensive
 values by the number of atoms in the system, depending on the
-"thermo\_modify norm" setting.  It will not normalize intensive values.
+"thermo_modify norm" setting.  It will not normalize intensive values.
 If a compute value is accessed in another way, e.g. by a
 :doc:`variable <variable>`, you may want to know whether it is an
 intensive or extensive value.  See the doc page for individual
 computes for further info.
 
-
 ----------
 
-
 LAMMPS creates its own computes internally for thermodynamic output.
-Three computes are always created, named "thermo\_temp",
-"thermo\_press", and "thermo\_pe", as if these commands had been invoked
+Three computes are always created, named "thermo_temp",
+"thermo_press", and "thermo_pe", as if these commands had been invoked
 in the input script:
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    compute thermo_temp all temp
    compute thermo_press all pressure thermo_temp
@@ -166,10 +156,8 @@ Code for new computes can be added to LAMMPS; see the
 :doc:`Modify <Modify>` doc page for details.  The results of their
 calculations accessed in the various ways described above.
 
-
 ----------
 
-
 Each compute style has its own doc page which describes its arguments
 and what it does.  Here is an alphabetic list of compute styles
 available in LAMMPS.  They are also listed in more compact form on the
@@ -332,8 +320,3 @@ Related commands
 :doc:`uncompute <uncompute>`, :doc:`compute_modify <compute_modify>`, :doc:`fix ave/atom <fix_ave_atom>`, :doc:`fix ave/time <fix_ave_time>`, :doc:`fix ave/histo <fix_ave_histo>`
 
 **Default:** none
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/compute_ackland_atom.rst b/doc/src/compute_ackland_atom.rst
index c86ca121db..33e0b6cf15 100644
--- a/doc/src/compute_ackland_atom.rst
+++ b/doc/src/compute_ackland_atom.rst
@@ -6,7 +6,6 @@ compute ackland/atom command
 Syntax
 """"""
 
-
 .. parsed-literal::
 
    compute ID group-ID ackland/atom keyword/value
@@ -15,18 +14,15 @@ Syntax
 * ackland/atom = style name of this compute command
 * zero or more keyword/value pairs may be appended
 * keyword = *legacy*
-  
+
   .. parsed-literal::
-  
+
        *legacy* yes/no = use (\ *yes*\ ) or do not use (\ *no*\ ) legacy ackland algorithm implementation
 
-
-
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    compute 1 all ackland/atom
    compute 1 all ackland/atom legacy yes
@@ -72,7 +68,6 @@ LAMMPS output options.
 Restrictions
 """"""""""""
 
-
 This compute is part of the USER-MISC package.  It is only enabled if
 LAMMPS was built with that package.  See the :doc:`Build package <Build_package>` doc page for more info.
 
@@ -88,17 +83,8 @@ Default
 """""""
 The keyword *legacy* defaults to *no*\ .
 
-
 ----------
 
-
 .. _Ackland:
 
-
-
 **(Ackland)** Ackland, Jones, Phys Rev B, 73, 054104 (2006).
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/compute_adf.rst b/doc/src/compute_adf.rst
index 363091a033..a9375fa038 100644
--- a/doc/src/compute_adf.rst
+++ b/doc/src/compute_adf.rst
@@ -6,7 +6,6 @@ compute adf command
 Syntax
 """"""
 
-
 .. parsed-literal::
 
    compute ID group-ID adf Nbin itype1 jtype1 ktype1 Rjinner1 Rjouter1 Rkinner1 Rkouter1 ...
@@ -23,19 +22,16 @@ Syntax
 * RkouterN =  outer radius of K atom shell for Nth ADF histogram (distance units)
 * zero or one keyword/value pairs may be appended
 * keyword = *ordinate*
-  
+
   .. parsed-literal::
-  
+
        *ordinate* value = *degree* or *radian* or *cosine*
          Choose the ordinate parameter for the histogram
 
-
-
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    compute 1 fluid adf 32 1 1 1 0.0 1.2 0.0 1.2 &
                           1 1 2 0.0 1.2 0.0 1.5 &
@@ -43,7 +39,7 @@ Examples
                           2 1 1 0.0 1.2 0.0 1.2 &
                           2 1 2 0.0 1.5 2.0 3.5 &
                           2 2 2 2.0 3.5 2.0 3.5
-   compute 1 fluid adf 32 1\*2 1\*2 1\*2 0.5 3.5
+   compute 1 fluid adf 32 1*2 1*2 1*2 0.5 3.5
    compute 1 fluid adf 32
 
 Description
@@ -68,7 +64,7 @@ neighbor atom in each requested ADF.
    those pairs will not be included in the ADF. This does not apply when
    using long-range coulomb interactions (\ *coul/long*\ , *coul/msm*\ ,
    *coul/wolf* or similar.  One way to get around this would be to set
-   special\_bond scaling factors to very tiny numbers that are not exactly
+   special_bond scaling factors to very tiny numbers that are not exactly
    zero (e.g. 1.0e-50). Another workaround is to write a dump file, and
    use the :doc:`rerun <rerun>` command to compute the ADF for snapshots in
    the dump file.  The rerun script can use a
@@ -110,7 +106,7 @@ in the range of types represented by *ktypeN*\ .
 If no *itypeN*\ , *jtypeN*\ , *ktypeN* settings are specified, then
 LAMMPS will generate a single ADF for all atoms in the group.
 The inner cutoff is set to zero and the outer cutoff is set
-to the force cutoff. If no pair\_style is specified, there is no
+to the force cutoff. If no pair_style is specified, there is no
 force cutoff and LAMMPS will give an error message. Note that
 in most cases, generating an ADF for all atoms is not a good thing.
 Such an ADF is both uninformative and
@@ -172,11 +168,10 @@ The simplest way to output the results of the compute adf calculation
 to a file is to use the :doc:`fix ave/time <fix_ave_time>` command, for
 example:
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    compute myADF all adf 32 2 2 2 0.5 3.5 0.5 3.5
-   fix 1 all ave/time 100 1 100 c_myADF[\*] file tmp.adf mode vector
+   fix 1 all ave/time 100 1 100 c_myADF[*] file tmp.adf mode vector
 
 **Output info:**
 
@@ -208,14 +203,13 @@ angles per atom satisfying the ADF criteria.
 Restrictions
 """"""""""""
 
-
 The ADF is not computed for neighbors outside the force cutoff,
 since processors (in parallel) don't know about atom coordinates for
 atoms further away than that distance.  If you want an ADF for larger
 distances, you can use the :doc:`rerun <rerun>` command to post-process
 a dump file and set the cutoff for the potential to be longer in the
 rerun script.  Note that in the rerun context, the force cutoff is
-arbitrary, since you aren't running dynamics and thus are not changing
+arbitrary, since you are not running dynamics and thus are not changing
 your model.
 
 Related commands
@@ -227,8 +221,3 @@ Default
 """""""
 
 The keyword default is ordinate = degree.
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/compute_angle.rst b/doc/src/compute_angle.rst
index 49b9849f05..60f929197c 100644
--- a/doc/src/compute_angle.rst
+++ b/doc/src/compute_angle.rst
@@ -6,7 +6,6 @@ compute angle command
 Syntax
 """"""
 
-
 .. parsed-literal::
 
    compute ID group-ID angle
@@ -17,8 +16,7 @@ Syntax
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    compute 1 all angle
 
@@ -26,8 +24,8 @@ Description
 """""""""""
 
 Define a computation that extracts the angle energy calculated by each
-of the angle sub-styles used in the  "angle\_style
-hybrid" angle\_hybrid.html command.  These values are made accessible
+of the angle sub-styles used in the  "angle_style
+hybrid" angle_hybrid.html command.  These values are made accessible
 for output or further processing by other commands.  The group
 specified for this command is ignored.
 
@@ -37,7 +35,7 @@ energy contributed by one or more of the hybrid sub-styles.
 **Output info:**
 
 This compute calculates a global vector of length N where N is the
-number of sub\_styles defined by the :doc:`angle_style hybrid <angle_style>` command, which can be accessed by indices
+number of sub_styles defined by the :doc:`angle_style hybrid <angle_style>` command, which can be accessed by indices
 1-N.  These values can be used by any command that uses global scalar
 or vector values from a compute as input.  See the :doc:`Howto output <Howto_output>` doc page for an overview of LAMMPS output
 options.
@@ -55,8 +53,3 @@ Related commands
 :doc:`compute pe <compute_pe>`, :doc:`compute pair <compute_pair>`
 
 **Default:** none
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/compute_angle_local.rst b/doc/src/compute_angle_local.rst
index e6efe50b42..fe0af199e2 100644
--- a/doc/src/compute_angle_local.rst
+++ b/doc/src/compute_angle_local.rst
@@ -6,7 +6,6 @@ compute angle/local command
 Syntax
 """"""
 
-
 .. parsed-literal::
 
    compute ID group-ID angle/local value1 value2 ... keyword args ...
@@ -14,30 +13,27 @@ Syntax
 * ID, group-ID are documented in :doc:`compute <compute>` command
 * angle/local = style name of this compute command
 * one or more values may be appended
-* value = *theta* or *eng* or *v\_name*
-  
+* value = *theta* or *eng* or *v_name*
+
   .. parsed-literal::
-  
+
        *theta* = tabulate angles
        *eng* = tabulate angle energies
        *v_name* = equal-style variable with name (see below)
 
 * zero or more keyword/args pairs may be appended
 * keyword = *set*
-  
+
   .. parsed-literal::
-  
+
        *set* args = theta name
          theta = only currently allowed arg
          name = name of variable to set with theta
 
-
-
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    compute 1 all angle/local theta
    compute 1 all angle/local eng theta
@@ -55,9 +51,9 @@ The value *theta* is the angle for the 3 atoms in the interaction.
 
 The value *eng* is the interaction energy for the angle.
 
-The value *v\_name* can be used together with the *set* keyword to
+The value *v_name* can be used together with the *set* keyword to
 compute a user-specified function of the angle theta.  The *name*
-specified for the *v\_name* value is the name of an :doc:`equal-style variable <variable>` which should evaluate a formula based on a
+specified for the *v_name* value is the name of an :doc:`equal-style variable <variable>` which should evaluate a formula based on a
 variable which will store the angle theta.  This other variable must
 be an :doc:`internal-style variable <variable>` defined in the input
 script; its initial numeric value can be anything.  It must be an
@@ -72,12 +68,11 @@ As an example, these commands can be added to the bench/in.rhodo
 script to compute the cosine and cosine\^2 of every angle in the system
 and output the statistics in various ways:
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    variable t internal 0.0
    variable cos equal cos(v_t)
-   variable cossq equal cos(v_t)\*cos(v_t)
+   variable cossq equal cos(v_t)*cos(v_t)
 
    compute 1 all property/local aatom1 aatom2 aatom3 atype
    compute 2 all angle/local eng theta v_cos v_cossq set theta t
@@ -96,10 +91,8 @@ with thermo output.  And the :doc:`fix ave/histo <fix_ave_histo>`
 command will histogram the cosine(angle) values and write them to a
 file.
 
-
 ----------
 
-
 The local data stored by this command is generated by looping over all
 the atoms owned on a processor and their angles.  An angle will only
 be included if all 3 atoms in the angle are in the specified compute
@@ -120,8 +113,7 @@ command in a consistent way.
 
 Here is an example of how to do this:
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    compute 1 all property/local atype aatom1 aatom2 aatom3
    compute 2 all angle/local theta eng
@@ -151,8 +143,3 @@ Related commands
 :doc:`dump local <dump>`, :doc:`compute property/local <compute_property_local>`
 
 **Default:** none
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/compute_angmom_chunk.rst b/doc/src/compute_angmom_chunk.rst
index 2637e4774a..eb5e8fd013 100644
--- a/doc/src/compute_angmom_chunk.rst
+++ b/doc/src/compute_angmom_chunk.rst
@@ -6,7 +6,6 @@ compute angmom/chunk command
 Syntax
 """"""
 
-
 .. parsed-literal::
 
    compute ID group-ID angmom/chunk chunkID
@@ -18,8 +17,7 @@ Syntax
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    compute 1 fluid angmom/chunk molchunk
 
@@ -64,12 +62,11 @@ The simplest way to output the results of the compute angmom/chunk
 calculation to a file is to use the :doc:`fix ave/time <fix_ave_time>`
 command, for example:
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    compute cc1 all chunk/atom molecule
    compute myChunk all angmom/chunk cc1
-   fix 1 all ave/time 100 1 100 c_myChunk[\*] file tmp.out mode vector
+   fix 1 all ave/time 100 1 100 c_myChunk[*] file tmp.out mode vector
 
 **Output info:**
 
@@ -93,8 +90,3 @@ Related commands
 :doc:`variable angmom() function <variable>`
 
 **Default:** none
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/compute_basal_atom.rst b/doc/src/compute_basal_atom.rst
index 5c2cea3958..ac628d2b6d 100644
--- a/doc/src/compute_basal_atom.rst
+++ b/doc/src/compute_basal_atom.rst
@@ -6,7 +6,6 @@ compute basal/atom command
 Syntax
 """"""
 
-
 .. parsed-literal::
 
    compute ID group-ID basal/atom
@@ -17,8 +16,7 @@ Syntax
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    compute 1 all basal/atom
 
@@ -59,7 +57,6 @@ components of a unit vector.
 Restrictions
 """"""""""""
 
-
 This compute is part of the USER-MISC package.  It is only enabled if
 LAMMPS was built with that package.  See the :doc:`Build package <Build_package>` doc page for more info.
 
@@ -74,17 +71,8 @@ Related commands
 
 **Default:** none
 
-
 ----------
 
-
 .. _Barrett:
 
-
-
 **(Barrett)** Barrett, Tschopp, El Kadiri, Scripta Mat. 66, p.666 (2012).
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/compute_body_local.rst b/doc/src/compute_body_local.rst
index 5d6a492c66..395a8ebf91 100644
--- a/doc/src/compute_body_local.rst
+++ b/doc/src/compute_body_local.rst
@@ -6,7 +6,6 @@ compute body/local command
 Syntax
 """"""
 
-
 .. parsed-literal::
 
    compute ID group-ID body/local input1 input2 ...
@@ -15,20 +14,17 @@ Syntax
 * body/local = style name of this compute command
 * one or more keywords may be appended
 * keyword = *id* or *type* or *integer*
-  
+
   .. parsed-literal::
-  
+
        *id* = atom ID of the body particle
        *type* = atom type of the body particle
        *integer* = 1,2,3,etc = index of fields defined by body style
 
-
-
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    compute 1 all body/local type 1 2 3
    compute 1 all body/local 3 6
@@ -65,7 +61,7 @@ group.
 For a body particle, the *integer* keywords refer to fields calculated
 by the body style for each sub-particle.  The body style, as specified
 by the :doc:`atom_style body <atom_style>`, determines how many fields
-exist and what they are.  See the :doc:`Howto\_body <Howto_body>` doc
+exist and what they are.  See the :doc:`Howto_body <Howto_body>` doc
 page for details of the different styles.
 
 Here is an example of how to output body information using the :doc:`dump local <dump>` command with this compute.  If fields 1,2,3 for the
@@ -73,8 +69,7 @@ body sub-particles are x,y,z coordinates, then the dump file will be
 formatted similar to the output of a :doc:`dump atom or custom <dump>`
 command.
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    compute 1 all body/local type 1 2 3
    dump 1 all local 1000 tmp.dump index c_1[1] c_1[2] c_1[3] c_1[4]
@@ -103,8 +98,3 @@ Related commands
 :doc:`dump local <dump>`
 
 **Default:** none
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/compute_bond.rst b/doc/src/compute_bond.rst
index 43e9a64cbb..59ac05630a 100644
--- a/doc/src/compute_bond.rst
+++ b/doc/src/compute_bond.rst
@@ -6,7 +6,6 @@ compute bond command
 Syntax
 """"""
 
-
 .. parsed-literal::
 
    compute ID group-ID bond
@@ -17,8 +16,7 @@ Syntax
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    compute 1 all bond
 
@@ -37,7 +35,7 @@ or more of the hybrid sub-styles.
 **Output info:**
 
 This compute calculates a global vector of length N where N is the
-number of sub\_styles defined by the :doc:`bond_style hybrid <bond_style>` command, which can be accessed by indices 1-N.
+number of sub_styles defined by the :doc:`bond_style hybrid <bond_style>` command, which can be accessed by indices 1-N.
 These values can be used by any command that uses global scalar or
 vector values from a compute as input.  See the :doc:`Howto output <Howto_output>` doc page for an overview of LAMMPS output
 options.
@@ -55,8 +53,3 @@ Related commands
 :doc:`compute pe <compute_pe>`, :doc:`compute pair <compute_pair>`
 
 **Default:** none
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/compute_bond_local.rst b/doc/src/compute_bond_local.rst
index 9559dd0f35..32d756d52a 100644
--- a/doc/src/compute_bond_local.rst
+++ b/doc/src/compute_bond_local.rst
@@ -6,7 +6,6 @@ compute bond/local command
 Syntax
 """"""
 
-
 .. parsed-literal::
 
    compute ID group-ID bond/local value1 value2 ... keyword args ...
@@ -14,7 +13,7 @@ Syntax
 * ID, group-ID are documented in :doc:`compute <compute>` command
 * bond/local = style name of this compute command
 * one or more values may be appended
-* value = *dist* or *engpot* or *force* or *fx* or *fy* or *fz* or *engvib* or *engrot* or *engtrans* or *omega* or *velvib* or *v\_name*
+* value = *dist* or *engpot* or *force* or *fx* or *fy* or *fz* or *engvib* or *engrot* or *engtrans* or *omega* or *velvib* or *v_name*
 
 .. parsed-literal::
 
@@ -39,15 +38,10 @@ Syntax
        dist = only currently allowed arg
        name = name of variable to set with distance (dist)
 
-
-
-
-
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    compute 1 all bond/local engpot
    compute 1 all bond/local dist engpot force
@@ -112,9 +106,9 @@ two atoms in the bond towards each other.  A negative value means the
 2 atoms are moving toward each other; a positive value means they are
 moving apart.
 
-The value *v\_name* can be used together with the *set* keyword to
+The value *v_name* can be used together with the *set* keyword to
 compute a user-specified function of the bond distance.  The *name*
-specified for the *v\_name* value is the name of an :doc:`equal-style variable <variable>` which should evaluate a formula based on a
+specified for the *v_name* value is the name of an :doc:`equal-style variable <variable>` which should evaluate a formula based on a
 variable which will store the bond distance.  This other variable must
 be an :doc:`internal-style variable <variable>` defined in the input
 script; its initial numeric value can be anything.  It must be an
@@ -126,11 +120,10 @@ As an example, these commands can be added to the bench/in.rhodo
 script to compute the distance\^2 of every bond in the system and
 output the statistics in various ways:
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    variable d internal 0.0
-   variable dsq equal v_d\*v_d
+   variable dsq equal v_d*v_d
 
    compute 1 all property/local batom1 batom2 btype
    compute 2 all bond/local engpot dist v_dsq set dist d
@@ -148,10 +141,8 @@ those quantities via the :doc:`compute reduce <compute_reduce>` command
 with thermo output.  And the :doc:`fix ave/histo <fix_ave_histo>`
 command will histogram the distance\^2 values and write them to a file.
 
-
 ----------
 
-
 The local data stored by this command is generated by looping over all
 the atoms owned on a processor and their bonds.  A bond will only be
 included if both atoms in the bond are in the specified compute group.
@@ -172,12 +163,11 @@ command in a consistent way.
 
 Here is an example of how to do this:
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    compute 1 all property/local btype batom1 batom2
    compute 2 all bond/local dist engpot
-   dump 1 all local 1000 tmp.dump index c_1[\*] c_2[\*]
+   dump 1 all local 1000 tmp.dump index c_1[*] c_2[*]
 
 **Output info:**
 
@@ -207,8 +197,3 @@ Related commands
 :doc:`dump local <dump>`, :doc:`compute property/local <compute_property_local>`
 
 **Default:** none
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/compute_centro_atom.rst b/doc/src/compute_centro_atom.rst
index 48a9ddd03c..312582eb90 100644
--- a/doc/src/compute_centro_atom.rst
+++ b/doc/src/compute_centro_atom.rst
@@ -6,7 +6,6 @@ compute centro/atom command
 Syntax
 """"""
 
-
 .. parsed-literal::
 
    compute ID group-ID centro/atom lattice keyword value ...
@@ -23,13 +22,10 @@ Syntax
        *no* = do not calculate 3 symmetry axes
        *yes* = calculate 3 symmetry axes
 
-
-
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    compute 1 all centro/atom fcc
 
@@ -52,20 +48,22 @@ in the specified compute group.
 This parameter is computed using the following formula from
 :ref:`(Kelchner) <Kelchner>`
 
-.. image:: Eqs/centro_symmetry.jpg
-   :align: center
+.. math::
 
-where the *N* nearest neighbors of each atom are identified and Ri and
-Ri+N/2 are vectors from the central atom to a particular pair of
-nearest neighbors.  There are N\*(N-1)/2 possible neighbor pairs that
-can contribute to this formula.  The quantity in the sum is computed
-for each, and the N/2 smallest are used.  This will typically be for
-pairs of atoms in symmetrically opposite positions with respect to the
-central atom; hence the i+N/2 notation.
+   CS = \sum_{i = 1}^{N/2} | \vec{R}_i + \vec{R}_{i+N/2} |^2
 
-*N* is an input parameter, which should be set to correspond to the
-number of nearest neighbors in the underlying lattice of atoms.  If
-the keyword *fcc* or *bcc* is used, *N* is set to 12 and 8
+where the :math:`N` nearest neighbors of each atom are identified and
+:math:`\vec{R}_i` and :math:`\vec{R}_{i+N/2}` are vectors from the
+central atom to a particular pair of nearest neighbors.  There are
+:math:`N (N-1)/2` possible neighbor pairs that can contribute to this
+formula.  The quantity in the sum is computed for each, and the
+:math:`N/2` smallest are used.  This will typically be for pairs of
+atoms in symmetrically opposite positions with respect to the central
+atom; hence the :math:`i+N/2` notation.
+
+:math:`N` is an input parameter, which should be set to correspond to
+the number of nearest neighbors in the underlying lattice of atoms.
+If the keyword *fcc* or *bcc* is used, *N* is set to 12 and 8
 respectively.  More generally, *N* can be set to a positive, even
 integer.
 
@@ -74,9 +72,9 @@ lattice, the centro-symmetry parameter will be 0.  It will be near 0
 for small thermal perturbations of a perfect lattice.  If a point
 defect exists, the symmetry is broken, and the parameter will be a
 larger positive value.  An atom at a surface will have a large
-positive parameter.  If the atom does not have *N* neighbors (within
-the potential cutoff), then its centro-symmetry parameter is set to
-0.0.
+positive parameter.  If the atom does not have :math:`N` neighbors
+(within the potential cutoff), then its centro-symmetry parameter is
+set to 0.0.
 
 If the keyword *axes* has the setting *yes*\ , then this compute also
 estimates three symmetry axes for each atom's local neighborhood.  The
@@ -95,7 +93,7 @@ of any atom.
 
 Only atoms within the cutoff of the pairwise neighbor list are
 considered as possible neighbors.  Atoms not in the compute group are
-included in the *N* neighbors used in this calculation.
+included in the :math:`N` neighbors used in this calculation.
 
 The neighbor list needed to compute this quantity is constructed each
 time the calculation is performed (e.g. each time a snapshot of atoms
@@ -127,7 +125,6 @@ Here are typical centro-symmetry values, from a nanoindentation
 simulation into gold (FCC).  These were provided by Jon Zimmerman
 (Sandia):
 
-
 .. parsed-literal::
 
    Bulk lattice = 0
@@ -138,7 +135,6 @@ simulation into gold (FCC).  These were provided by Jon Zimmerman
 These values are \*not\* normalized by the square of the lattice
 parameter.  If they were, normalized values would be:
 
-
 .. parsed-literal::
 
    Bulk lattice = 0
@@ -164,17 +160,8 @@ Default
 
 The default value for the optional keyword is axes = no.
 
-
 ----------
 
-
 .. _Kelchner:
 
-
-
 **(Kelchner)** Kelchner, Plimpton, Hamilton, Phys Rev B, 58, 11085 (1998).
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/compute_chunk_atom.rst b/doc/src/compute_chunk_atom.rst
index a88d5fa61b..ead17e3f7c 100644
--- a/doc/src/compute_chunk_atom.rst
+++ b/doc/src/compute_chunk_atom.rst
@@ -6,16 +6,15 @@ compute chunk/atom command
 Syntax
 """"""
 
-
 .. parsed-literal::
 
    compute ID group-ID chunk/atom style args keyword values ...
 
 * ID, group-ID are documented in :doc:`compute <compute>` command
 * chunk/atom = style name of this compute command
-  
+
   .. parsed-literal::
-  
+
      style = *bin/1d* or *bin/2d* or *bin/3d* or *bin/sphere* or *type* or *molecule* or c_ID, c_ID[I], f_ID, f_ID[I], v_name
        *bin/1d* args = dim origin delta
          dim = *x* or *y* or *z*
@@ -51,9 +50,9 @@ Syntax
 
 * zero or more keyword/values pairs may be appended
 * keyword = *region* or *nchunk* or *static* or *compress* or *bound* or *discard* or *pbc* or *units*
-  
+
   .. parsed-literal::
-  
+
        *region* value = region-ID
          region-ID = ID of region atoms must be in to be part of a chunk
        *nchunk* value = *once* or *every*
@@ -82,13 +81,10 @@ Syntax
          yes = use periodic distance for bin/sphere and bin/cylinder styles
        *units* value = *box* or *lattice* or *reduced*
 
-
-
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    compute 1 all chunk/atom type
    compute 1 all chunk/atom bin/1d z lower 0.02 units reduced
@@ -141,19 +137,15 @@ timesteps it specifies, while it accumulates per-chunk averages.
 
 The details are described below.
 
-
 ----------
 
-
 The different chunk styles operate as follows.  For each style, how it
 calculates *Nchunk* and assigns chunk IDs to atoms is explained.  Note
 that using the optional keywords can change both of those actions, as
 described further below where the keywords are discussed.
 
-
 ----------
 
-
 The *binning* styles perform a spatial binning of atoms, and assign an
 atom the chunk ID corresponding to the bin number it is in.  *Nchunk*
 is set to the number of bins, which can change if the simulation box
@@ -241,18 +233,14 @@ have moved outside the bounds of all bins.  If an atom is not inside
 any bin, the *discard* keyword is used to determine how a chunk ID is
 assigned to the atom.
 
-
 ----------
 
-
 The *type* style uses the atom type as the chunk ID.  *Nchunk* is set
 to the number of atom types defined for the simulation, e.g. via the
 :doc:`create_box <create_box>` or :doc:`read_data <read_data>` commands.
 
-
 ----------
 
-
 The *molecule* style uses the molecule ID of each atom as its chunk
 ID.  *Nchunk* is set to the largest chunk ID.  Note that this excludes
 molecule IDs for atoms which are not in the specified group or
@@ -269,10 +257,8 @@ solvent atoms, have an out-of-range chunk ID.  These atoms are
 discarded (not assigned to any chunk) or assigned to *Nchunk*\ ,
 depending on the value of the *discard* keyword.
 
-
 ----------
 
-
 The *compute/fix/variable* styles set the chunk ID of each atom based
 on a quantity calculated and stored by a compute, fix, or variable.
 In each case, it must be a per-atom quantity.  In each case the
@@ -308,10 +294,8 @@ invoke other computes, fixes, or variables when they are evaluated, so
 this is a very general means of generating per-atom quantities to
 treat as a chunk ID.
 
-
 ----------
 
-
 Normally, *Nchunk* = the number of chunks, is re-calculated every time
 this fix is invoked, though the value may or may not change.  As
 explained below, the *nchunk* keyword can be set to *once* which means
@@ -335,10 +319,8 @@ the same compute chunk/atom compute.  However, the time windows they
 induce for holding *Nchunk* constant must be identical, else an error
 will be generated.
 
-
 ----------
 
-
 The various optional keywords operate as follows.  Note that some of
 them function differently or are ignored by different chunk styles.
 Some of them also have different default values, depending on
@@ -348,10 +330,8 @@ The *region* keyword applies to all chunk styles.  If used, an atom
 must be in both the specified group and the specified geometric
 :doc:`region <region>` to be assigned to a chunk.
 
-
 ----------
 
-
 The *nchunk* keyword applies to all chunk styles.  It specifies how
 often *Nchunk* is recalculated, which in turn can affect the chunk IDs
 assigned to individual atoms.
@@ -368,10 +348,8 @@ chunk style and other system and keyword settings.  They attempt to
 represent typical use cases for the various chunk styles.  The
 *nchunk* value can always be set explicitly if desired.
 
-
 ----------
 
-
 The *limit* keyword can be used to limit the calculated value of
 *Nchunk* = the number of chunks.  The limit is applied each time
 *Nchunk* is calculated, which also limits the chunk IDs assigned to
@@ -423,10 +401,8 @@ assigned to them.  Note that in this case, all atoms will end up with
 chunk IDs <= *Nc*\ , and their original values (e.g. molecule ID or
 compute/fix/variable value) will also have been <= *Nc*\ .
 
-
 ----------
 
-
 The *ids* keyword applies to all chunk styles.  If the setting is
 *once* then the chunk IDs assigned to atoms the first time this
 compute is invoked will be permanent, and never be re-computed.
@@ -449,10 +425,8 @@ re-calculated on any timestep this compute is invoked.
    quantities will also have the same ID, and thus be initialized
    correctly with chunk IDs from the restart file.
 
-
 ----------
 
-
 The *compress* keyword applies to all chunk styles and affects how
 *Nchunk* is calculated, which in turn affects the chunk IDs assigned
 to each atom.  It is useful for converting a "sparse" set of chunk IDs
@@ -504,10 +478,8 @@ conjunction with the :doc:`compute property/chunk <compute_property_chunk>` comm
    can affect these costs, depending on which keyword is used first.  So
    use this option with care.
 
-
 ----------
 
-
 The *discard* keyword applies to all chunk styles.  It affects what
 chunk IDs are assigned to atoms that do not match one of the valid
 chunk IDs from 1 to *Nchunk*\ .  Note that it does not apply to atoms
@@ -585,10 +557,8 @@ than *rmin*\ , it will be assigned to the first bin.  If the distance of
 the atom from the origin is greater than *rmax*\ , it will be assigned
 to the last bin.
 
-
 ----------
 
-
 The *bound* keyword only applies to the *bin/1d*\ , *bin/2d*\ , *bin/3d*
 styles and to the axis dimension of the *bin/cylinder* style;
 otherwise it is ignored.  It can be used one or more times to limit
@@ -648,10 +618,8 @@ are scaled by the lattice spacing or reduced value of the 1st
 dimension perpendicular to the cylinder axis.  E.g. y for an x-axis
 cylinder, x for a y-axis cylinder, and x for a z-axis cylinder.
 
-
 ----------
 
-
 **Output info:**
 
 This compute calculates a per-atom vector, which can be accessed by
@@ -666,7 +634,6 @@ belonging to a chunk.
 Restrictions
 """"""""""""
 
-
 Even if the *nchunk* keyword is set to *once*\ , the chunk IDs assigned
 to each atom are not stored in a restart files.  This means you cannot
 expect those assignments to persist in a restarted simulation.
@@ -700,8 +667,3 @@ The option defaults are as follows:
 * bound = lower and upper in all dimensions
 * pbc = no
 * units = lattice
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/compute_chunk_spread_atom.rst b/doc/src/compute_chunk_spread_atom.rst
index d2a2f7498a..d486da4e3e 100644
--- a/doc/src/compute_chunk_spread_atom.rst
+++ b/doc/src/compute_chunk_spread_atom.rst
@@ -6,7 +6,6 @@ compute chunk/spread/atom command
 Syntax
 """"""
 
-
 .. parsed-literal::
 
    compute ID group-ID chunk/spread/atom chunkID input1 input2 ...
@@ -15,22 +14,19 @@ Syntax
 * chunk/spread/atom = style name of this compute command
 * chunkID = ID of :doc:`compute chunk/atom <compute_chunk_atom>` command
 * one or more inputs can be listed
-* input = c\_ID, c\_ID[N], f\_ID, f\_ID[N]
-  
+* input = c_ID, c_ID[N], f_ID, f_ID[N]
+
   .. parsed-literal::
-  
+
        c_ID = global vector calculated by a compute with ID
        c_ID[I] = Ith column of global array calculated by a compute with ID, I can include wildcard (see below)
        f_ID = global vector calculated by a fix with ID
        f_ID[I] = Ith column of global array calculated by a fix with ID, I can include wildcard (see below)
 
-
-
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    compute 1 all chunk/spread/atom mychunk c_com[*] c_gyration
 
@@ -85,10 +81,8 @@ or fix.
    does not check that it is per-chunk data.  It only checks that the fix
    produces a global vector or array.
 
-
 ----------
 
-
 Each listed input is operated on independently.
 
 If a bracketed index I is used, it can be specified using a wildcard
@@ -105,23 +99,19 @@ had been listed one by one.  E.g. these 2 compute chunk/spread/atom
 commands are equivalent, since the :doc:`compute com/chunk <compute_com_chunk>` command creates a per-atom array
 with 3 columns:
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    compute com all com/chunk mychunk
    compute 10 all chunk/spread/atom mychunk c_com[*]
    compute 10 all chunk/spread/atom mychunk c_com[1] c_com[2] c_com[3]
 
-
 ----------
 
-
 Here is an example of writing a dump file the with the center-of-mass
 (COM) for the chunk each atom is in.  The commands below can be added
 to the bench/in.chain script.
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    compute         cmol all chunk/atom molecule
    compute         com all com/chunk cmol
@@ -134,14 +124,13 @@ forces for the :doc:`fix addforce <fix_addforce>` command.  In this
 example the forces act to pull atoms of an extended polymer chain
 towards its COM in an attractive manner.
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    compute         prop all property/atom xu yu zu
    variable        k equal 0.1
-   variable        fx atom v_k\*(c_comchunk[1]-c_prop[1])
-   variable        fy atom v_k\*(c_comchunk[2]-c_prop[2])
-   variable        fz atom v_k\*(c_comchunk[3]-c_prop[3])
+   variable        fx atom v_k*(c_comchunk[1]-c_prop[1])
+   variable        fy atom v_k*(c_comchunk[2]-c_prop[2])
+   variable        fz atom v_k*(c_comchunk[3]-c_prop[3])
    fix             3 all addforce v_fx v_fy v_fz
 
 Note that :doc:`compute property/atom <compute_property_atom>` is used
@@ -155,7 +144,6 @@ bench/in.chain script.  Thermo output is shown for 1000 steps, where
 the last column is the average radius of gyration over all 320 chains
 in the 32000 atom system:
 
-
 .. parsed-literal::
 
    compute         gyr all gyration/chunk cmol
@@ -174,10 +162,8 @@ in the 32000 atom system:
         900     22.59128    5.0247538    4.5611513
        1000    22.586832      4.94697    4.5238362
 
-
 ----------
 
-
 Here is an example for using one set of chunks, defined for molecules,
 to compute the dipole moment vector for each chunk.  E.g. for water
 molecules. Then spreading those values to each atom in each chunk.
@@ -185,14 +171,13 @@ Then defining a second set of chunks based on spatial bins.  And
 finally, using the :doc:`fix ave/chunk <fix_ave_chunk>` command to
 calculate an average dipole moment vector per spatial bin.
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    compute       cmol all chunk/atom molecule
    compute       dipole all dipole/chunk cmol
    compute       spread all chunk/spread/atom cmol c_dipole[1] c_dipole[2] c_dipole[3]
    compute       cspatial all chunk/atom bin/1d z lower 0.1 units reduced
-   fix           ave all ave/chunk 100 10 1000 cspatial c_spread[\*]
+   fix           ave all ave/chunk 100 10 1000 cspatial c_spread[*]
 
 Note that the :doc:`fix ave/chunk <fix_ave_chunk>` command requires
 per-atom values as input.  That is why the compute chunk/spread/atom
@@ -201,10 +186,8 @@ If a molecule straddles bin boundaries, each of its atoms contributes
 in a weighted manner to the average dipole moment of the spatial bin
 it is in.
 
-
 ----------
 
-
 **Output info:**
 
 This compute calculates a per-atom vector or array, which can be
@@ -230,8 +213,3 @@ Related commands
 :doc:`compute chunk/atom <compute_chunk_atom>`, :doc:`fix ave/chunk <fix_ave_chunk>`, :doc:`compute reduce/chunk <compute_reduce_chunk>`
 
 **Default:** none
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/compute_cluster_atom.rst b/doc/src/compute_cluster_atom.rst
index cab2e60ecc..d9742a4a4b 100644
--- a/doc/src/compute_cluster_atom.rst
+++ b/doc/src/compute_cluster_atom.rst
@@ -12,7 +12,6 @@ compute aggregate/atom command
 Syntax
 """"""
 
-
 .. parsed-literal::
 
    compute ID group-ID cluster/atom cutoff
@@ -26,8 +25,7 @@ Syntax
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    compute 1 all cluster/atom 3.5
    compute 1 all fragment/atom
@@ -84,7 +82,7 @@ multiple compute/dump commands, each of a *cluster/atom* or
    those pairs will not be included when computing the clusters. This
    does not apply when using long-range coulomb (\ *coul/long*\ , *coul/msm*\ ,
    *coul/wolf* or similar.  One way to get around this would be to set
-   special\_bond scaling factors to very tiny numbers that are not exactly
+   special_bond scaling factors to very tiny numbers that are not exactly
    zero (e.g. 1.0e-50). Another workaround is to write a dump file, and
    use the :doc:`rerun <rerun>` command to compute the clusters for
    snapshots in the dump file.  The rerun script can use a
@@ -110,8 +108,3 @@ Related commands
 :doc:`compute coord/atom <compute_coord_atom>`
 
 **Default:** none
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/compute_cna_atom.rst b/doc/src/compute_cna_atom.rst
index f75506eb90..27bff636a2 100644
--- a/doc/src/compute_cna_atom.rst
+++ b/doc/src/compute_cna_atom.rst
@@ -6,7 +6,6 @@ compute cna/atom command
 Syntax
 """"""
 
-
 .. parsed-literal::
 
    compute ID group-ID cna/atom cutoff
@@ -18,8 +17,7 @@ Syntax
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    compute 1 all cna/atom 3.08
 
@@ -51,8 +49,11 @@ E.g. 12 nearest neighbor for perfect FCC and HCP crystals, 14 nearest
 neighbors for perfect BCC crystals.  These formulas can be used to
 obtain a good cutoff distance:
 
-.. image:: Eqs/cna_cutoff1.jpg
-   :align: center
+.. math::
+
+  r_{c}^{fcc} = & \frac{1}{2} \left(\frac{\sqrt{2}}{2} + 1\right) \mathrm{a} \simeq 0.8536 \:\mathrm{a} \\
+  r_{c}^{bcc} = & \frac{1}{2}(\sqrt{2} + 1) \mathrm{a} \simeq 1.207 \:\mathrm{a} \\
+  r_{c}^{hcp} = & \frac{1}{2}\left(1+\sqrt{\frac{4+2x^{2}}{3}}\right) \mathrm{a}
 
 where a is the lattice constant for the crystal structure concerned
 and in the HCP case, x = (c/a) / 1.633, where 1.633 is the ideal c/a
@@ -62,10 +63,12 @@ Also note that since the CNA calculation in LAMMPS uses the neighbors
 of an owned atom to find the nearest neighbors of a ghost atom, the
 following relation should also be satisfied:
 
-.. image:: Eqs/cna_cutoff2.jpg
-   :align: center
+.. math::
 
-where Rc is the cutoff distance of the potential, Rs is the skin
+  r_c + r_s > 2*{\rm cutoff}
+
+where :math:`r_c` is the cutoff distance of the potential, :math:`r_s`
+is the skin
 distance as specified by the :doc:`neighbor <neighbor>` command, and
 cutoff is the argument used with the compute cna/atom command.  LAMMPS
 will issue a warning if this is not the case.
@@ -97,23 +100,12 @@ Related commands
 
 **Default:** none
 
-
 ----------
 
-
 .. _Faken:
 
-
-
 **(Faken)** Faken, Jonsson, Comput Mater Sci, 2, 279 (1994).
 
 .. _Tsuzuki1:
 
-
-
 **(Tsuzuki)** Tsuzuki, Branicio, Rino, Comput Phys Comm, 177, 518 (2007).
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/compute_cnp_atom.rst b/doc/src/compute_cnp_atom.rst
index ba31448776..c87082dc07 100644
--- a/doc/src/compute_cnp_atom.rst
+++ b/doc/src/compute_cnp_atom.rst
@@ -6,7 +6,6 @@ compute cnp/atom command
 Syntax
 """"""
 
-
 .. parsed-literal::
 
    compute ID group-ID cnp/atom cutoff
@@ -18,8 +17,7 @@ Syntax
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    compute 1 all cnp/atom 3.08
 
@@ -40,13 +38,15 @@ only be performed on single component systems.
 This parameter is computed using the following formula from
 :ref:`(Tsuzuki) <Tsuzuki2>`
 
-.. image:: Eqs/cnp_eq.jpg
-   :align: center
+.. math::
 
-where the index *j* goes over the *n*\ i nearest neighbors of atom
-*i*\ , and the index *k* goes over the *n*\ ij common nearest neighbors
-between atom *i* and atom *j*\ . Rik and Rjk are the vectors connecting atom
-*k* to atoms *i* and *j*\ .  The quantity in the double sum is computed
+   Q_{i} = \frac{1}{n_i}\sum_{j = 1}^{n_i} | \sum_{k = 1}^{n_{ij}}  \vec{R}_{ik} + \vec{R}_{jk} |^2
+
+where the index *j* goes over the :math:`n_i` nearest neighbors of atom
+*i*\ , and the index *k* goes over the :math:`n_{ij}` common nearest neighbors
+between atom *i* and atom *j*\ . :math:`\vec{R}_{ik}` and
+:math:`\vec{R}_{jk}` are the vectors connecting atom *k* to atoms *i*
+and *j*\ .  The quantity in the double sum is computed
 for each atom.
 
 The CNP calculation is sensitive to the specified cutoff value.
@@ -56,8 +56,11 @@ E.g. 12 nearest neighbor for perfect FCC and HCP crystals, 14 nearest
 neighbors for perfect BCC crystals.  These formulas can be used to
 obtain a good cutoff distance:
 
-.. image:: Eqs/cnp_cutoff.jpg
-   :align: center
+.. math::
+
+  r_{c}^{fcc} = & \frac{1}{2} \left(\frac{\sqrt{2}}{2} + 1\right) \mathrm{a} \simeq 0.8536 \:\mathrm{a} \\
+  r_{c}^{bcc} = & \frac{1}{2}(\sqrt{2} + 1) \mathrm{a} \simeq 1.207 \:\mathrm{a} \\
+  r_{c}^{hcp} = & \frac{1}{2}\left(1+\sqrt{\frac{4+2x^{2}}{3}}\right) \mathrm{a}
 
 where a is the lattice constant for the crystal structure concerned
 and in the HCP case, x = (c/a) / 1.633, where 1.633 is the ideal c/a
@@ -67,10 +70,12 @@ Also note that since the CNP calculation in LAMMPS uses the neighbors
 of an owned atom to find the nearest neighbors of a ghost atom, the
 following relation should also be satisfied:
 
-.. image:: Eqs/cnp_cutoff2.jpg
-   :align: center
+.. math::
 
-where Rc is the cutoff distance of the potential, Rs is the skin
+  r_c + r_s > 2*{\rm cutoff}
+
+where :math:`r_c` is the cutoff distance of the potential, :math:`r_s` is
+the skin
 distance as specified by the :doc:`neighbor <neighbor>` command, and
 cutoff is the argument used with the compute cnp/atom command.  LAMMPS
 will issue a warning if this is not the case.
@@ -91,7 +96,6 @@ LAMMPS output options.
 The per-atom vector values will be real positive numbers. Some typical CNP
 values:
 
-
 .. parsed-literal::
 
    FCC lattice = 0.0
@@ -105,7 +109,6 @@ values:
 Restrictions
 """"""""""""
 
-
 This compute is part of the USER-MISC package.  It is only enabled if
 LAMMPS was built with that package.  See the :doc:`Build package <Build_package>` doc page for more info.
 
@@ -117,17 +120,8 @@ Related commands
 
 **Default:** none
 
-
 ----------
 
-
 .. _Tsuzuki2:
 
-
-
 **(Tsuzuki)** Tsuzuki, Branicio, Rino, Comput Phys Comm, 177, 518 (2007).
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/compute_com.rst b/doc/src/compute_com.rst
index ac20b3cb73..af36b34b2b 100644
--- a/doc/src/compute_com.rst
+++ b/doc/src/compute_com.rst
@@ -6,7 +6,6 @@ compute com command
 Syntax
 """"""
 
-
 .. parsed-literal::
 
    compute ID group-ID com
@@ -17,8 +16,7 @@ Syntax
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    compute 1 all com
 
@@ -62,8 +60,3 @@ Related commands
 :doc:`compute com/chunk <compute_com_chunk>`
 
 **Default:** none
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/compute_com_chunk.rst b/doc/src/compute_com_chunk.rst
index 15cf528517..dd27702652 100644
--- a/doc/src/compute_com_chunk.rst
+++ b/doc/src/compute_com_chunk.rst
@@ -6,7 +6,6 @@ compute com/chunk command
 Syntax
 """"""
 
-
 .. parsed-literal::
 
    compute ID group-ID com/chunk chunkID
@@ -18,8 +17,7 @@ Syntax
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    compute 1 fluid com/chunk molchunk
 
@@ -62,12 +60,11 @@ The simplest way to output the results of the compute com/chunk
 calculation to a file is to use the :doc:`fix ave/time <fix_ave_time>`
 command, for example:
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    compute cc1 all chunk/atom molecule
    compute myChunk all com/chunk cc1
-   fix 1 all ave/time 100 1 100 c_myChunk[\*] file tmp.out mode vector
+   fix 1 all ave/time 100 1 100 c_myChunk[*] file tmp.out mode vector
 
 **Output info:**
 
@@ -91,8 +88,3 @@ Related commands
 :doc:`compute com <compute_com>`
 
 **Default:** none
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/compute_contact_atom.rst b/doc/src/compute_contact_atom.rst
index c6c58a5ea4..b8b3c695d6 100644
--- a/doc/src/compute_contact_atom.rst
+++ b/doc/src/compute_contact_atom.rst
@@ -6,7 +6,6 @@ compute contact/atom command
 Syntax
 """"""
 
-
 .. parsed-literal::
 
    compute ID group-ID contact/atom
@@ -17,8 +16,7 @@ Syntax
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    compute 1 all contact/atom
 
@@ -49,7 +47,6 @@ above.
 Restrictions
 """"""""""""
 
-
 This compute requires that atoms store a radius as defined by the
 :doc:`atom_style sphere <atom_style>` command.
 
@@ -59,8 +56,3 @@ Related commands
 :doc:`compute coord/atom <compute_coord_atom>`
 
 **Default:** none
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/compute_coord_atom.rst b/doc/src/compute_coord_atom.rst
index db87284cc2..c51ea212f0 100644
--- a/doc/src/compute_coord_atom.rst
+++ b/doc/src/compute_coord_atom.rst
@@ -6,7 +6,6 @@ compute coord/atom command
 Syntax
 """"""
 
-
 .. parsed-literal::
 
    compute ID group-ID coord/atom cstyle args ...
@@ -14,9 +13,9 @@ Syntax
 * ID, group-ID are documented in :doc:`compute <compute>` command
 * coord/atom = style name of this compute command
 * cstyle = *cutoff* or *orientorder*
-  
+
   .. parsed-literal::
-  
+
        *cutoff* args = cutoff [group group2-ID] typeN
          cutoff = distance within which to count coordination neighbors (distance units)
          group *group2-ID* = select group-ID to restrict which atoms to consider for coordination number (optional)
@@ -25,17 +24,14 @@ Syntax
          orientorderID = ID of an orientorder/atom compute
          threshold = minimum value of the product of two "connected" atoms
 
-
-
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    compute 1 all coord/atom cutoff 2.0
    compute 1 all coord/atom cutoff 6.0 1 2
-   compute 1 all coord/atom cutoff 6.0 2\*4 5\*8 \*
+   compute 1 all coord/atom cutoff 6.0 2*4 5*8 *
    compute 1 solute coord/atom cutoff 2.0 group solvent
    compute 1 all coord/atom orientorder 2 0.5
 
@@ -82,10 +78,10 @@ identify crystal-like atoms in a system, as discussed in :ref:`ten Wolde <tenWol
 
 The ID of the previously specified :doc:`compute orientorder/atom <compute_orientorder_atom>` command is specified as
 *orientorderID*\ .  The compute must invoke its *components* option to
-calculate components of the *Ybar\_lm* vector for each atoms, as
+calculate components of the *Ybar_lm* vector for each atoms, as
 described in its documentation.  Note that orientorder/atom compute
 defines its own criteria for identifying neighboring atoms.  If the
-scalar product (*Ybar\_lm(i)*,*Ybar\_lm(j)*), calculated by the
+scalar product (*Ybar_lm(i)*,*Ybar_lm(j)*), calculated by the
 orientorder/atom compute is larger than the specified *threshold*\ ,
 then I and J are connected, and the coordination value of I is
 incremented by one.
@@ -145,18 +141,9 @@ Default
 
 group = all
 
-
 ----------
 
-
 .. _tenWolde1:
 
-
-
 **(tenWolde)** P. R. ten Wolde, M. J. Ruiz-Montero, D. Frenkel,
 J. Chem. Phys. 104, 9932 (1996).
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/compute_damage_atom.rst b/doc/src/compute_damage_atom.rst
index 2b498a3fb5..ab17584ccd 100644
--- a/doc/src/compute_damage_atom.rst
+++ b/doc/src/compute_damage_atom.rst
@@ -6,7 +6,6 @@ compute damage/atom command
 Syntax
 """"""
 
-
 .. parsed-literal::
 
    compute ID group-ID damage/atom
@@ -17,8 +16,7 @@ Syntax
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    compute 1 all damage/atom
 
@@ -54,7 +52,6 @@ The per-atom vector values are unitless numbers (damage) >= 0.0.
 Restrictions
 """"""""""""
 
-
 This compute is part of the PERI package.  It is only enabled if
 LAMMPS was built with that package.  See the :doc:`Build package <Build_package>` doc page for more info.
 
@@ -65,8 +62,3 @@ Related commands
 :doc:`compute plasticity/atom <compute_plasticity_atom>`
 
 **Default:** none
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/compute_dihedral.rst b/doc/src/compute_dihedral.rst
index 695031e05e..ed87b727ec 100644
--- a/doc/src/compute_dihedral.rst
+++ b/doc/src/compute_dihedral.rst
@@ -6,7 +6,6 @@ compute dihedral command
 Syntax
 """"""
 
-
 .. parsed-literal::
 
    compute ID group-ID dihedral
@@ -17,8 +16,7 @@ Syntax
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    compute 1 all dihedral
 
@@ -36,7 +34,7 @@ total energy contributed by one or more of the hybrid sub-styles.
 **Output info:**
 
 This compute calculates a global vector of length N where N is the
-number of sub\_styles defined by the :doc:`dihedral_style hybrid <dihedral_style>` command.  which can be accessed by indices
+number of sub_styles defined by the :doc:`dihedral_style hybrid <dihedral_style>` command.  which can be accessed by indices
 1-N.  These values can be used by any command that uses global scalar
 or vector values from a compute as input.  See the :doc:`Howto output <Howto_output>` doc page for an overview of LAMMPS output
 options.
@@ -54,8 +52,3 @@ Related commands
 :doc:`compute pe <compute_pe>`, :doc:`compute pair <compute_pair>`
 
 **Default:** none
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/compute_dihedral_local.rst b/doc/src/compute_dihedral_local.rst
index ce7a9ede84..6fd1401292 100644
--- a/doc/src/compute_dihedral_local.rst
+++ b/doc/src/compute_dihedral_local.rst
@@ -6,7 +6,6 @@ compute dihedral/local command
 Syntax
 """"""
 
-
 .. parsed-literal::
 
    compute ID group-ID dihedral/local value1 value2 ... keyword args ...
@@ -14,29 +13,26 @@ Syntax
 * ID, group-ID are documented in :doc:`compute <compute>` command
 * dihedral/local = style name of this compute command
 * one or more values may be appended
-* value = *phi* or *v\_name*
-  
+* value = *phi* or *v_name*
+
   .. parsed-literal::
-  
+
        *phi* = tabulate dihedral angles
        *v_name* = equal-style variable with name (see below)
 
 * zero or more keyword/args pairs may be appended
 * keyword = *set*
-  
+
   .. parsed-literal::
-  
+
        *set* args = phi name
          phi = only currently allowed arg
          name = name of variable to set with phi
 
-
-
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    compute 1 all dihedral/local phi
 
@@ -53,9 +49,9 @@ by the group parameter as explained below.
 The value *phi* is the dihedral angle, as defined in the diagram on
 the :doc:`dihedral_style <dihedral_style>` doc page.
 
-The value *v\_name* can be used together with the *set* keyword to
+The value *v_name* can be used together with the *set* keyword to
 compute a user-specified function of the dihedral angle phi.  The
-*name* specified for the *v\_name* value is the name of an :doc:`equal-style variable <variable>` which should evaluate a formula based on a
+*name* specified for the *v_name* value is the name of an :doc:`equal-style variable <variable>` which should evaluate a formula based on a
 variable which will store the angle phi.  This other variable must
 be an :doc:`internal-style variable <variable>` defined in the input
 script; its initial numeric value can be anything.  It must be an
@@ -70,12 +66,11 @@ As an example, these commands can be added to the bench/in.rhodo
 script to compute the cosine and cosine\^2 of every dihedral angle in
 the system and output the statistics in various ways:
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    variable p internal 0.0
    variable cos equal cos(v_p)
-   variable cossq equal cos(v_p)\*cos(v_p)
+   variable cossq equal cos(v_p)*cos(v_p)
 
    compute 1 all property/local datom1 datom2 datom3 datom4 dtype
    compute 2 all dihedral/local phi v_cos v_cossq set phi p
@@ -94,10 +89,8 @@ with thermo output.  And the :doc:`fix ave/histo <fix_ave_histo>`
 command will histogram the cosine(angle) values and write them to a
 file.
 
-
 ----------
 
-
 The local data stored by this command is generated by looping over all
 the atoms owned on a processor and their dihedrals.  A dihedral will
 only be included if all 4 atoms in the dihedral are in the specified
@@ -114,8 +107,7 @@ command in a consistent way.
 
 Here is an example of how to do this:
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    compute 1 all property/local dtype datom1 datom2 datom3 datom4
    compute 2 all dihedral/local phi
@@ -144,8 +136,3 @@ Related commands
 :doc:`dump local <dump>`, :doc:`compute property/local <compute_property_local>`
 
 **Default:** none
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/compute_dilatation_atom.rst b/doc/src/compute_dilatation_atom.rst
index 84e4d48a1c..46ebef8220 100644
--- a/doc/src/compute_dilatation_atom.rst
+++ b/doc/src/compute_dilatation_atom.rst
@@ -6,7 +6,6 @@ compute dilatation/atom command
 Syntax
 """"""
 
-
 .. parsed-literal::
 
    compute ID group-ID dilatation/atom
@@ -17,8 +16,7 @@ Syntax
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    compute 1 all dilatation/atom
 
@@ -57,7 +55,6 @@ The per-atom vector values are unitless numbers (theta) >= 0.0.
 Restrictions
 """"""""""""
 
-
 This compute is part of the PERI package.  It is only enabled if
 LAMMPS was built with that package.  See the :doc:`Build package <Build_package>` doc page for more info.
 
@@ -68,8 +65,3 @@ Related commands
 :doc:`compute plasticity/atom <compute_plasticity_atom>`
 
 **Default:** none
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/compute_dipole_chunk.rst b/doc/src/compute_dipole_chunk.rst
index 8d70f1ef13..f08b1d67d9 100644
--- a/doc/src/compute_dipole_chunk.rst
+++ b/doc/src/compute_dipole_chunk.rst
@@ -6,7 +6,6 @@ compute dipole/chunk command
 Syntax
 """"""
 
-
 .. parsed-literal::
 
    compute ID group-ID dipole/chunk chunkID charge-correction
@@ -19,8 +18,7 @@ Syntax
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    compute 1 fluid dipole/chunk molchunk
    compute dw water dipole/chunk 1 geometry
@@ -67,12 +65,11 @@ The simplest way to output the results of the compute com/chunk
 calculation to a file is to use the :doc:`fix ave/time <fix_ave_time>`
 command, for example:
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    compute cc1 all chunk/atom molecule
    compute myChunk all dipole/chunk cc1
-   fix 1 all ave/time 100 1 100 c_myChunk[\*] file tmp.out mode vector
+   fix 1 all ave/time 100 1 100 c_myChunk[*] file tmp.out mode vector
 
 **Output info:**
 
@@ -96,8 +93,3 @@ Related commands
 :doc:`compute com/chunk <compute_com_chunk>`
 
 **Default:** none
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/compute_displace_atom.rst b/doc/src/compute_displace_atom.rst
index 797e132480..9e1488cdf1 100644
--- a/doc/src/compute_displace_atom.rst
+++ b/doc/src/compute_displace_atom.rst
@@ -6,7 +6,6 @@ compute displace/atom command
 Syntax
 """"""
 
-
 .. parsed-literal::
 
    compute ID group-ID displace/atom
@@ -15,18 +14,15 @@ Syntax
 * displace/atom = style name of this compute command
 * zero or more keyword/arg pairs may be appended
 * keyword = *refresh*
-  
+
   .. parsed-literal::
-  
+
        *replace* arg = name of per-atom variable
 
-
-
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    compute 1 all displace/atom
    compute 1 all displace/atom refresh myVar
@@ -65,11 +61,9 @@ the compute command was issued.  The value of the displacement will be
    quantities will also have the same ID, and thus be initialized
    correctly with time=0 atom coordinates from the restart file.
 
-
 ----------
 
-
-The *refresh* option can be used in conjunction with the "dump\_modify
+The *refresh* option can be used in conjunction with the "dump_modify
 refresh" command to generate incremental dump files.
 
 The definition and motivation of an incremental dump file is as
@@ -88,8 +82,7 @@ a distance *Dhop*\ .  For any snapshot we only want to output atoms that
 have hopped since the last snapshot.  This can be accomplished with
 something like the following commands:
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    write_dump      all custom tmp.dump id type x y z    # see comment below
 
@@ -102,11 +95,11 @@ something like the following commands:
 
 The :doc:`dump_modify thresh <dump_modify>` command will only output
 atoms that have displaced more than 0.6 Angstroms on each snapshot
-(assuming metal units).  The dump\_modify *refresh* option triggers a
+(assuming metal units).  The dump_modify *refresh* option triggers a
 call to this compute at the end of every dump.
 
 The *refresh* argument for this compute is the ID of an :doc:`atom-style variable <variable>` which calculates a Boolean value (0 or 1)
-based on the same criterion used by dump\_modify thresh.  This compute
+based on the same criterion used by dump_modify thresh.  This compute
 evaluates the atom-style variable.  For each atom that returns 1
 (true), the original (reference) coordinates of the atom (stored by
 this compute) are updated.
@@ -119,17 +112,15 @@ Note that in the first snapshot of a subsequent run, no atoms will be
 typically be output.  That is because the initial displacement for all
 atoms is 0.0.  If an initial dump snapshot is desired, containing the
 initial reference positions of all atoms, one way to do this is
-illustrated above.  An initial write\_dump command can be used before
+illustrated above.  An initial write_dump command can be used before
 the first run.  It will contain the positions of all the atoms,
 Options in the :doc:`dump_modify <dump_modify>` command above will
 append new output to that same file and delay the output until a later
 timestep.  The *delay* setting avoids a second time = 0 snapshot which
 would be empty.
 
-
 ----------
 
-
 **Output info:**
 
 This compute calculates a per-atom array with 4 columns, which can be
@@ -153,8 +144,3 @@ Related commands
 :doc:`compute msd <compute_msd>`, :doc:`dump custom <dump>`, :doc:`fix store/state <fix_store_state>`
 
 **Default:** none
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/compute_dpd.rst b/doc/src/compute_dpd.rst
index 39b07865c2..c106522b57 100644
--- a/doc/src/compute_dpd.rst
+++ b/doc/src/compute_dpd.rst
@@ -6,7 +6,6 @@ compute dpd command
 Syntax
 """"""
 
-
 .. parsed-literal::
 
    compute ID group-ID dpd
@@ -17,8 +16,7 @@ Syntax
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    compute 1 all dpd
 
@@ -26,28 +24,33 @@ Description
 """""""""""
 
 Define a computation that accumulates the total internal conductive
-energy (U\_cond), the total internal mechanical energy (U\_mech), the
-total chemical energy (U\_chem) and the *harmonic* average of the internal
-temperature (dpdTheta) for the entire system of particles.  See the
+energy (:math:`U^{cond}`), the total internal mechanical energy
+(:math:`U^{mech}`), the total chemical energy (:math:`U^{chem}`)
+and the *harmonic* average of the internal temperature (:math:`\theta_{avg}`)
+for the entire system of particles.  See the
 :doc:`compute dpd/atom <compute_dpd_atom>` command if you want
 per-particle internal energies and internal temperatures.
 
 The system internal properties are computed according to the following
 relations:
 
-.. image:: Eqs/compute_dpd.jpg
-   :align: center
+.. math::
 
-where N is the number of particles in the system
+   U^{cond} = & \displaystyle\sum_{i=1}^{N} u_{i}^{cond} \\
+   U^{mech} = & \displaystyle\sum_{i=1}^{N} u_{i}^{mech} \\
+   U^{chem} = & \displaystyle\sum_{i=1}^{N} u_{i}^{chem} \\
+          U = & \displaystyle\sum_{i=1}^{N} (u_{i}^{cond} + u_{i}^{mech} + u_{i}^{chem}) \\
+   \theta_{avg} = & (\frac{1}{N}\displaystyle\sum_{i=1}^{N} \frac{1}{\theta_{i}})^{-1} \\
 
+where :math:`N` is the number of particles in the system
 
 ----------
 
-
 **Output info:**
 
-This compute calculates a global vector of length 5 (U\_cond, U\_mech,
-U\_chem, dpdTheta, N\_particles), which can be accessed by indices 1-5.
+This compute calculates a global vector of length 5 (:math:`U^{cond}`,
+:math:`U^{mech}`, :math:`U^{chem}`, :math:`\theta_{avg}`, :math:`N`),
+which can be accessed by indices 1-5.
 See the :doc:`Howto output <Howto_output>` doc page for an overview of
 LAMMPS output options.
 
@@ -56,7 +59,6 @@ The vector values will be in energy and temperature :doc:`units <units>`.
 Restrictions
 """"""""""""
 
-
 This command is part of the USER-DPD package.  It is only enabled if
 LAMMPS was built with that package.  See the :doc:`Build package <Build_package>` doc page for more info.
 
@@ -71,20 +73,11 @@ Related commands
 
 **Default:** none
 
-
 ----------
 
-
 .. _Larentzos1:
 
-
-
 **(Larentzos)** J.P. Larentzos, J.K. Brennan, J.D. Moore, and
 W.D. Mattson, "LAMMPS Implementation of Constant Energy Dissipative
 Particle Dynamics (DPD-E)", ARL-TR-6863, U.S. Army Research
 Laboratory, Aberdeen Proving Ground, MD (2014).
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/compute_dpd_atom.rst b/doc/src/compute_dpd_atom.rst
index a517f572be..d1a683db87 100644
--- a/doc/src/compute_dpd_atom.rst
+++ b/doc/src/compute_dpd_atom.rst
@@ -6,7 +6,6 @@ compute dpd/atom command
 Syntax
 """"""
 
-
 .. parsed-literal::
 
    compute ID group-ID dpd/atom
@@ -17,16 +16,18 @@ Syntax
 Examples
 """"""""
 
-compute 1 all dpd/atom
+.. code-block:: LAMMPS
+
+   compute 1 all dpd/atom
 
 Description
 """""""""""
 
 Define a computation that accesses the per-particle internal
-conductive energy (u\_cond), internal mechanical energy (u\_mech),
-internal chemical energy (u\_chem) and
-internal temperatures (dpdTheta) for each particle in a group.  See
-the :doc:`compute dpd <compute_dpd>` command if you want the total
+conductive energy (:math:`u^{cond}`), internal mechanical
+energy (:math:`u^{mech}`), internal chemical energy (:math:`u^{chem}`)
+and internal temperatures (:math:`\theta`) for each particle in a group.
+See the :doc:`compute dpd <compute_dpd>` command if you want the total
 internal conductive energy, the total internal mechanical energy, the
 total chemical energy and
 average internal temperature of the entire system or group of dpd
@@ -34,19 +35,20 @@ particles.
 
 **Output info:**
 
-This compute calculates a per-particle array with 4 columns (u\_cond,
-u\_mech, u\_chem, dpdTheta), which can be accessed by indices 1-4 by any
+This compute calculates a per-particle array with 4 columns (:math:`u^{cond}`,
+:math:`u^{mech}`, :math:`u^{chem}`, :math:`\theta`), which can be accessed
+by indices 1-4 by any
 command that uses per-particle values from a compute as input.  See
 the :doc:`Howto output <Howto_output>` doc page for an overview of
 LAMMPS output options.
 
-The per-particle array values will be in energy (u\_cond, u\_mech, u\_chem)
-and temperature (dpdTheta) :doc:`units <units>`.
+The per-particle array values will be in energy (:math:`u^{cond}`,
+:math:`u^{mech}`, :math:`u^{chem}`)
+and temperature (:math:`theta`) :doc:`units <units>`.
 
 Restrictions
 """"""""""""
 
-
 This command is part of the USER-DPD package.  It is only enabled if
 LAMMPS was built with that package.  See the :doc:`Build package <Build_package>` doc page for more info.
 
@@ -60,20 +62,11 @@ Related commands
 
 **Default:** none
 
-
 ----------
 
-
 .. _Larentzos2:
 
-
-
 **(Larentzos)** J.P. Larentzos, J.K. Brennan, J.D. Moore, and
 W.D. Mattson, "LAMMPS Implementation of Constant Energy Dissipative
 Particle Dynamics (DPD-E)", ARL-TR-6863, U.S. Army Research
 Laboratory, Aberdeen Proving Ground, MD (2014).
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/compute_edpd_temp_atom.rst b/doc/src/compute_edpd_temp_atom.rst
index ce9a4e26b2..8670e70b48 100644
--- a/doc/src/compute_edpd_temp_atom.rst
+++ b/doc/src/compute_edpd_temp_atom.rst
@@ -6,7 +6,6 @@ compute edpd/temp/atom command
 Syntax
 """"""
 
-
 .. parsed-literal::
 
    compute ID group-ID edpd/temp/atom
@@ -17,8 +16,7 @@ Syntax
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    compute 1 all edpd/temp/atom
 
@@ -45,36 +43,24 @@ The per-atom vector values will be in temperature :doc:`units <units>`.
 Restrictions
 """"""""""""
 
-
-This compute is part of the USER-MESO package.  It is only enabled if
+This compute is part of the USER-MESODPD package.  It is only enabled if
 LAMMPS was built with that package.  See the :doc:`Build package <Build_package>` doc page for more info.
 
 Related commands
 """"""""""""""""
 
-:doc:`pair_style edpd <pair_meso>`
+:doc:`pair_style edpd <pair_mesodpd>`
 
 **Default:** none
 
-
 ----------
 
-
 .. _Espanol1997:
 
-
-
 **(Espanol1997)** Espanol, Europhys Lett, 40(6): 631-636 (1997).  DOI:
 10.1209/epl/i1997-00515-8
 
 .. _Li2014a:
 
-
-
 **(Li2014)** Li, Tang, Lei, Caswell, Karniadakis, J Comput Phys, 265:
 113-127 (2014).  DOI: 10.1016/j.jcp.2014.02.003.
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/compute_entropy_atom.rst b/doc/src/compute_entropy_atom.rst
index c43c73814c..85a180df74 100644
--- a/doc/src/compute_entropy_atom.rst
+++ b/doc/src/compute_entropy_atom.rst
@@ -6,7 +6,6 @@ compute entropy/atom command
 Syntax
 """"""
 
-
 .. parsed-literal::
 
    compute ID group-ID entropy/atom sigma cutoff keyword value ...
@@ -26,13 +25,10 @@ Syntax
        cutoff2 = cutoff for the averaging over neighbors
      *local* values = *yes* or *no* = use the local density around each atom to normalize the g(r)
 
-
-
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    compute 1 all entropy/atom 0.25 5.
    compute 1 all entropy/atom 0.25 5. avg yes 5.
@@ -53,27 +49,30 @@ information about the solid structure is required.
 This parameter for atom i is computed using the following formula from
 :ref:`(Piaggi) <Piaggi>` and :ref:`(Nettleton) <Nettleton>` ,
 
-.. image:: Eqs/pair_entropy.jpg
-   :align: center
+.. math::
+
+   s_S^i=-2\pi\rho k_B \int\limits_0^{r_m} \left [ g(r) \ln g(r) - g(r) + 1 \right ] r^2 dr
 
 where r is a distance, g(r) is the radial distribution function of atom
 i and rho is the density of the system. The g(r) computed for each
 atom i can be noisy and therefore it is smoothed using:
 
-.. image:: Eqs/pair_entropy2.jpg
-   :align: center
+.. math::
 
-where the sum in j goes through the neighbors of atom i, and sigma is a
-parameter to control the smoothing.
+   g_m^i(r) = \frac{1}{4 \pi \rho r^2} \sum\limits_{j} \frac{1}{\sqrt{2 \pi \sigma^2}} e^{-(r-r_{ij})^2/(2\sigma^2)}
 
-The input parameters are *sigma* the smoothing parameter, and the
-*cutoff* for the calculation of g(r).
+where the sum in j goes through the neighbors of atom i, and :math:`\sigma`
+is a parameter to control the smoothing.
+
+The input parameters are *sigma* the smoothing parameter :math:`\sigma`,
+and the *cutoff* for the calculation of g(r).
 
 If the keyword *avg* has the setting *yes*\ , then this compute also
 averages the parameter over the neighbors  of atom i according to:
 
-.. image:: Eqs/pair_entropy3.jpg
-   :align: center
+.. math::
+
+  \left< s_S^i \right>  = \frac{\sum_j s_S^j + s_S^i}{N + 1}
 
 where the sum j goes over the neighbors of atom i and N is the number
 of neighbors. This procedure provides a sharper distinction between
@@ -85,10 +84,9 @@ If the *avg yes* option is used, the effective cutoff of the neighbor
 list should be *cutoff*\ +\ *cutoff2* and therefore it might be necessary
 to increase the skin of the neighbor list with:
 
-
 .. parsed-literal::
 
-   neighbor skin bin
+   neighbor <skin distance> bin
 
 See :doc:`neighbor <neighbor>` for details.
 
@@ -101,14 +99,12 @@ inhomogeneous systems such as those that have surfaces.
 Here are typical input parameters for fcc aluminum (lattice
 constant 4.05 Angstroms),
 
-
 .. parsed-literal::
 
    compute 1 all entropy/atom 0.25 5.7 avg yes 3.7
 
 and for bcc sodium (lattice constant 4.23 Angstroms),
 
-
 .. parsed-literal::
 
    compute 1 all entropy/atom 0.25 7.3 avg yes 5.1
@@ -127,7 +123,6 @@ ordered environments.
 Restrictions
 """"""""""""
 
-
 This compute is part of the USER-MISC package.  It is only enabled if
 LAMMPS was built with that package.  See the :doc:`Build package <Build_package>` doc page for more info.
 
@@ -142,23 +137,12 @@ Default
 
 The default values for the optional keywords are avg = no and local = no.
 
-
 ----------
 
-
 .. _Piaggi:
 
-
-
 **(Piaggi)** Piaggi and Parrinello, J Chem Phys, 147, 114112 (2017).
 
 .. _Nettleton:
 
-
-
 **(Nettleton)** Nettleton and Green, J Chem Phys, 29, 6 (1958).
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/compute_erotate_asphere.rst b/doc/src/compute_erotate_asphere.rst
index be17f8bedc..ab0c1fe59b 100644
--- a/doc/src/compute_erotate_asphere.rst
+++ b/doc/src/compute_erotate_asphere.rst
@@ -6,7 +6,6 @@ compute erotate/asphere command
 Syntax
 """"""
 
-
 .. parsed-literal::
 
    compute ID group-ID erotate/asphere
@@ -17,8 +16,7 @@ Syntax
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    compute 1 all erotate/asphere
 
@@ -55,7 +53,6 @@ scalar value will be in energy :doc:`units <units>`.
 Restrictions
 """"""""""""
 
-
 This compute requires that ellipsoidal particles atoms store a shape
 and quaternion orientation and angular momentum as defined by the
 :doc:`atom_style ellipsoid <atom_style>` command.
@@ -75,8 +72,3 @@ particles.
 :doc:`compute erotate/sphere <compute_erotate_sphere>`
 
 **Default:** none
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/compute_erotate_rigid.rst b/doc/src/compute_erotate_rigid.rst
index 2f74dd425c..f07751eff5 100644
--- a/doc/src/compute_erotate_rigid.rst
+++ b/doc/src/compute_erotate_rigid.rst
@@ -6,7 +6,6 @@ compute erotate/rigid command
 Syntax
 """"""
 
-
 .. parsed-literal::
 
    compute ID group-ID erotate/rigid fix-ID
@@ -18,8 +17,7 @@ Syntax
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    compute 1 all erotate/rigid myRigid
 
@@ -53,7 +51,6 @@ scalar value will be in energy :doc:`units <units>`.
 Restrictions
 """"""""""""
 
-
 This compute is part of the RIGID package.  It is only enabled if
 LAMMPS was built with that package.  See the :doc:`Build package <Build_package>` doc page for more info.
 
@@ -63,8 +60,3 @@ Related commands
 :doc:`compute ke/rigid <compute_ke_rigid>`
 
 **Default:** none
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/compute_erotate_sphere.rst b/doc/src/compute_erotate_sphere.rst
index d1df476435..17656ef0be 100644
--- a/doc/src/compute_erotate_sphere.rst
+++ b/doc/src/compute_erotate_sphere.rst
@@ -6,7 +6,6 @@ compute erotate/sphere command
 Syntax
 """"""
 
-
 .. parsed-literal::
 
    compute ID group-ID erotate/sphere
@@ -17,8 +16,7 @@ Syntax
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    compute 1 all erotate/sphere
 
@@ -50,7 +48,6 @@ scalar value will be in energy :doc:`units <units>`.
 Restrictions
 """"""""""""
 
-
 This compute requires that atoms store a radius and angular velocity
 (omega) as defined by the :doc:`atom_style sphere <atom_style>` command.
 
@@ -64,8 +61,3 @@ Related commands
 :doc:`compute erotate/asphere <compute_erotate_asphere>`
 
 **Default:** none
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/compute_erotate_sphere_atom.rst b/doc/src/compute_erotate_sphere_atom.rst
index 31a90bc282..f7450be9c2 100644
--- a/doc/src/compute_erotate_sphere_atom.rst
+++ b/doc/src/compute_erotate_sphere_atom.rst
@@ -6,7 +6,6 @@ compute erotate/sphere/atom command
 Syntax
 """"""
 
-
 .. parsed-literal::
 
    compute ID group-ID erotate/sphere/atom
@@ -17,8 +16,7 @@ Syntax
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    compute 1 all erotate/sphere/atom
 
@@ -60,8 +58,3 @@ Related commands
 :doc:`dump custom <dump>`
 
 **Default:** none
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/compute_event_displace.rst b/doc/src/compute_event_displace.rst
index 55555c46bd..679e455465 100644
--- a/doc/src/compute_event_displace.rst
+++ b/doc/src/compute_event_displace.rst
@@ -6,7 +6,6 @@ compute event/displace command
 Syntax
 """"""
 
-
 .. parsed-literal::
 
    compute ID group-ID event/displace threshold
@@ -18,8 +17,7 @@ Syntax
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    compute 1 all event/displace 0.5
 
@@ -58,7 +56,6 @@ scalar value will be a 0 or 1 as explained above.
 Restrictions
 """"""""""""
 
-
 This command can only be used if LAMMPS was built with the REPLICA
 package.  See the :doc:`Build package <Build_package>` doc
 page for more info.
@@ -69,8 +66,3 @@ Related commands
 :doc:`prd <prd>`, :doc:`tad <tad>`
 
 **Default:** none
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/compute_fep.rst b/doc/src/compute_fep.rst
index 0f2fdc18c1..4700817609 100644
--- a/doc/src/compute_fep.rst
+++ b/doc/src/compute_fep.rst
@@ -6,7 +6,6 @@ compute fep command
 Syntax
 """"""
 
-
 .. parsed-literal::
 
    compute ID group-ID fep temp attribute args ... keyword value ...
@@ -16,9 +15,9 @@ Syntax
 * temp = external temperature (as specified for constant-temperature run)
 * one or more attributes with args may be appended
 * attribute = *pair* or *atom*
-  
+
   .. parsed-literal::
-  
+
        *pair* args = pstyle pparam I J v_delta
          pstyle = pair style name, e.g. lj/cut
          pparam = parameter to perturb
@@ -31,9 +30,9 @@ Syntax
 
 * zero or more keyword/value pairs may be appended
 * keyword = *tail* or *volume*
-  
+
   .. parsed-literal::
-  
+
        *tail* value = *no* or *yes*
          *no* = ignore tail correction to pair energies (usually small in fep)
          *yes* = include tail correction to pair energies
@@ -41,15 +40,12 @@ Syntax
          *no* = ignore volume changes (e.g. in *NVE* or *NVT* trajectories)
          *yes* = include volume changes (e.g. in *NpT* trajectories)
 
-
-
 Examples
 """"""""
 
+.. code-block:: LAMMPS
 
-.. parsed-literal::
-
-   compute 1 all fep 298 pair lj/cut epsilon 1 \* v_delta pair lj/cut sigma 1 \* v_delta volume yes
+   compute 1 all fep 298 pair lj/cut epsilon 1 * v_delta pair lj/cut sigma 1 * v_delta volume yes
    compute 1 all fep 300 atom charge 2 v_delta
 
 Description
@@ -70,14 +66,17 @@ initial interactions of the atoms that will undergo perturbation, and
 a term :math:`U_1` corresponding to the final interactions of
 these atoms:
 
-.. image:: Eqs/compute_fep_u.jpg
-   :align: center
+.. math::
+
+   U(\lambda) = U_{\mathrm{bg}} + U_1(\lambda) + U_0(\lambda)
 
 A coupling parameter :math:`\lambda` varying from 0 to 1 connects the
 reference and perturbed systems:
 
-.. image:: Eqs/compute_fep_lambda.jpg
-   :align: center
+.. math::
+
+   \lambda &= 0 \quad\Rightarrow\quad U = U_{\mathrm{bg}} + U_0 \\
+   \lambda &= 1 \quad\Rightarrow\quad U = U_{\mathrm{bg}} + U_1
 
 It is possible but not necessary that the coupling parameter (or a
 function thereof) appears as a multiplication factor of the potential
@@ -89,16 +88,22 @@ This command can be combined with :doc:`fix adapt <fix_adapt>` to
 perform multistage free-energy perturbation calculations along
 stepwise alchemical transformations during a simulation run:
 
-.. image:: Eqs/compute_fep_fep.jpg
-   :align: center
+.. math::
+
+   \Delta_0^1 A = \sum_{i=0}^{n-1} \Delta_{\lambda_i}^{\lambda_{i+1}} A = - kT
+   \sum_{i=0}^{n-1} \ln \left< \exp \left( - \frac{U(\lambda_{i+1}) -
+   U(\lambda_i)}{kT} \right) \right>_{\lambda_i}
 
 This compute is suitable for the finite-difference thermodynamic
 integration (FDTI) method :ref:`(Mezei) <Mezei>`, which is based on an
 evaluation of the numerical derivative of the free energy by a
 perturbation method using a very small :math:`\delta`:
 
-.. image:: Eqs/compute_fep_fdti.jpg
-   :align: center
+.. math::
+
+   \Delta_0^1 A = \int_{\lambda=0}^{\lambda=1} \left( \frac{\partial
+   A(\lambda)}{\partial\lambda} \right)_\lambda \mathrm{d}\lambda \approx
+   \sum_{i=0}^{n-1} w_i \frac{A(\lambda_{i} + \delta) - A(\lambda_i)}{\delta}
 
 where :math:`w_i` are weights of a numerical quadrature. The :doc:`fix adapt <fix_adapt>` command can be used to define the stages of
 :math:`\lambda` at which the derivative is calculated and averaged.
@@ -109,16 +114,23 @@ choosing a very small perturbation :math:`\delta` the thermodynamic
 integration method can be implemented using a numerical evaluation of
 the derivative of the potential energy with respect to :math:`\lambda`:
 
-.. image:: Eqs/compute_fep_ti.jpg
-   :align: center
+.. math::
+
+   \Delta_0^1 A = \int_{\lambda=0}^{\lambda=1} \left< \frac{\partial
+   U(\lambda)}{\partial\lambda} \right>_\lambda \mathrm{d}\lambda \approx
+   \sum_{i=0}^{n-1} w_i \left< \frac{U(\lambda_{i} + \delta) -
+   U(\lambda_i)}{\delta} \right>_{\lambda_i}
 
 Another technique to calculate free energy differences is the
 acceptance ratio method :ref:`(Bennet) <Bennet>`, which can be implemented
 by calculating the potential energy differences with :math:`\delta` = 1.0 on
 both the forward and reverse routes:
 
-.. image:: Eqs/compute_fep_bar.jpg
-   :align: center
+.. math::
+
+   \left< \frac{1}{1 + \exp\left[\left(U_1 - U_0 - \Delta_0^1A \right) /kT
+   \right]} \right>_0 = \left< \frac{1}{1 + \exp\left[\left(U_0 - U_1 +
+   \Delta_0^1A \right) /kT \right]} \right>_1
 
 The value of the free energy difference is determined by numerical
 root finding to establish the equality.
@@ -135,10 +147,8 @@ the reference and perturbed states, or along the alchemical
 transformation route.  This compute command does not change bond
 lengths or other internal coordinates :ref:`(Boresch, Karplus) <BoreschKarplus>`.
 
-
 ----------
 
-
 The *pair* attribute enables various parameters of potentials defined
 by the :doc:`pair_style <pair_style>` and :doc:`pair_coeff <pair_coeff>`
 commands to be changed, if the pair style supports it.
@@ -231,30 +241,26 @@ used, then the *pstyle* will be a sub-style name.  You must specify
 I,J arguments that correspond to type pair values defined (via the
 :doc:`pair_coeff <pair_coeff>` command) for that sub-style.
 
-The *v\_name* argument for keyword *pair* is the name of an
+The *v_name* argument for keyword *pair* is the name of an
 :doc:`equal-style variable <variable>` which will be evaluated each time
-this compute is invoked.  It should be specified as v\_name, where name
+this compute is invoked.  It should be specified as v_name, where name
 is the variable name.
 
-
 ----------
 
-
 The *atom* attribute enables atom properties to be changed.  The
 *aparam* argument is the name of the parameter to change.  This is the
 current list of atom parameters that can be used with this compute:
 
 * charge = charge on particle
 
-The *v\_name* argument for keyword *pair* is the name of an
+The *v_name* argument for keyword *pair* is the name of an
 :doc:`equal-style variable <variable>` which will be evaluated each time
-this compute is invoked.  It should be specified as v\_name, where name
+this compute is invoked.  It should be specified as v_name, where name
 is the variable name.
 
-
 ----------
 
-
 The *tail* keyword controls the calculation of the tail correction to
 "van der Waals" pair energies beyond the cutoff, if this has been
 activated via the :doc:`pair_modify <pair_modify>` command. If the
@@ -265,20 +271,21 @@ If the keyword *volume* = *yes*\ , then the Boltzmann term is multiplied
 by the volume so that correct ensemble averaging can be performed over
 trajectories during which the volume fluctuates or changes :ref:`(Allen and Tildesley) <AllenTildesley>`:
 
-.. image:: Eqs/compute_fep_vol.jpg
-   :align: center
+.. math::
 
+   \Delta_0^1 A = - kT \sum_{i=0}^{n-1} \ln \frac{\left< V \exp \left( -
+   \frac{U(\lambda_{i+1}) - U(\lambda_i)}{kT} \right)
+   \right>_{\lambda_i}}{\left< V \right>_{\lambda_i}}
 
 ----------
 
-
 **Output info:**
 
 This compute calculates a global vector of length 3 which contains the
-energy difference ( :math:`U_1-U_0` ) as c\_ID[1], the
+energy difference ( :math:`U_1-U_0` ) as c_ID[1], the
 Boltzmann factor :math:`\exp(-(U_1-U_0)/kT)`, or
-:math:`V \exp(-(U_1-U_0)/kT)`, as c\_ID[2] and the
-volume of the simulation box :math:`V` as c\_ID[3]. :math:`U_1` is the
+:math:`V \exp(-(U_1-U_0)/kT)`, as c_ID[2] and the
+volume of the simulation box :math:`V` as c_ID[3]. :math:`U_1` is the
 pair potential energy obtained with the perturbed parameters and
 :math:`U_0` is the pair potential energy obtained with the
 unperturbed parameters. The energies include kspace terms if these
@@ -293,7 +300,6 @@ The values calculated by this compute are "extensive".
 Restrictions
 """"""""""""
 
-
 This compute is distributed as the USER-FEP package.  It is only
 enabled if LAMMPS was built with that package.  See the :doc:`Build package <Build_package>` doc page for more info.
 
@@ -301,49 +307,32 @@ Related commands
 """"""""""""""""
 
 :doc:`fix adapt/fep <fix_adapt_fep>`, :doc:`fix ave/time <fix_ave_time>`,
-:doc:`pair\_fep\_soft <pair_fep_soft>`
+:doc:`pair_style .../soft <pair_fep_soft>`
 
 Default
 """""""
 
 The option defaults are *tail* = *no*\ , *volume* = *no*\ .
 
-
 ----------
 
-
 .. _Pearlman:
 
-
-
 **(Pearlman)** Pearlman, J Chem Phys, 98, 1487 (1994)
 
 .. _Mezei:
 
-
-
 **(Mezei)** Mezei, J Chem Phys, 86, 7084 (1987)
 
 .. _Bennet:
 
-
-
 **(Bennet)** Bennet, J Comput Phys, 22, 245 (1976)
 
 .. _BoreschKarplus:
 
-
-
 **(BoreschKarplus)** Boresch and Karplus, J Phys Chem A, 103, 103 (1999)
 
 .. _AllenTildesley:
 
-
-
 **(AllenTildesley)** Allen and Tildesley, Computer Simulation of
 Liquids, Oxford University Press (1987)
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/compute_global_atom.rst b/doc/src/compute_global_atom.rst
index 5ff6f1775f..e9adb0317b 100644
--- a/doc/src/compute_global_atom.rst
+++ b/doc/src/compute_global_atom.rst
@@ -6,17 +6,16 @@ compute global/atom command
 Syntax
 """"""
 
-
 .. parsed-literal::
 
    compute ID group-ID style index input1 input2 ...
 
 * ID, group-ID are documented in :doc:`compute <compute>` command
 * global/atom = style name of this compute command
-* index = c\_ID, c\_ID[N], f\_ID, f\_ID[N], v\_name
-  
+* index = c_ID, c_ID[N], f_ID, f_ID[N], v_name
+
   .. parsed-literal::
-  
+
        c_ID = per-atom vector calculated by a compute with ID
        c_ID[I] = Ith column of per-atom array calculated by a compute with ID
        f_ID = per-atom vector calculated by a fix with ID
@@ -24,26 +23,23 @@ Syntax
        v_name = per-atom vector calculated by an atom-style variable with name
 
 * one or more inputs can be listed
-* input = c\_ID, c\_ID[N], f\_ID, f\_ID[N], v\_name
-  
+* input = c_ID, c_ID[N], f_ID, f_ID[N], v_name
+
   .. parsed-literal::
-  
+
        c_ID = global vector calculated by a compute with ID
        c_ID[I] = Ith column of global array calculated by a compute with ID, I can include wildcard (see below)
        f_ID = global vector calculated by a fix with ID
        f_ID[I] = Ith column of global array calculated by a fix with ID, I can include wildcard (see below)
        v_name = global vector calculated by a vector-style variable with name
 
-
-
 Examples
 """"""""
 
+.. code-block:: LAMMPS
 
-.. parsed-literal::
-
-   compute 1 all global/atom c_chunk c_com[1\] c_com[2\] c_com[3\]
-   compute 1 all global/atom c_chunk c_com[\*\]
+   compute 1 all global/atom c_chunk c_com[1] c_com[2] c_com[3]
+   compute 1 all global/atom c_chunk c_com[*]
 
 Description
 """""""""""
@@ -84,17 +80,16 @@ of each atom from the center-of-mass of the molecule it is in, and
 dump those values to a dump file.  In this case, each molecule is a
 chunk.
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    compute cc1 all chunk/atom molecule
    compute myChunk all com/chunk cc1
    compute prop all property/atom xu yu zu
-   compute glob all global/atom c_cc1 c_myChunk[\*]
+   compute glob all global/atom c_cc1 c_myChunk[*]
    variable dx atom c_prop[1]-c_glob[1]
    variable dy atom c_prop[2]-c_glob[2]
    variable dz atom c_prop[3]-c_glob[3]
-   variable dist atom sqrt(v_dx\*v_dx+v_dy\*v_dy+v_dz\*v_dz)
+   variable dist atom sqrt(v_dx*v_dx+v_dy*v_dy+v_dz*v_dz)
    dump 1 all custom 100 tmp.dump id xu yu zu c_glob[1] c_glob[2] c_glob[3] &
         v_dx v_dy v_dz v_dist
    dump_modify 1 sort id
@@ -102,10 +97,8 @@ chunk.
 You can add these commands to the bench/in.chain script to see how
 they work.
 
-
 ----------
 
-
 Note that for input values from a compute or fix, the bracketed index
 I can be specified using a wildcard asterisk with the index to
 effectively specify multiple values.  This takes the form "\*" or "\*n"
@@ -121,18 +114,15 @@ had been listed one by one.  E.g. these 2 compute global/atom commands
 are equivalent, since the :doc:`compute com/chunk <compute_com_chunk>`
 command creates a global array with 3 columns:
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    compute cc1 all chunk/atom molecule
    compute com all com/chunk cc1
    compute 1 all global/atom c_cc1 c_com[1] c_com[2] c_com[3]
-   compute 1 all global/atom c_cc1 c_com[\*]
-
+   compute 1 all global/atom c_cc1 c_com[*]
 
 ----------
 
-
 This section explains the *index* parameter.  Note that it must
 reference per-atom values, as contrasted with the *input* values which
 must reference global values.
@@ -175,10 +165,8 @@ invoke other computes, fixes, or variables when they are evaluated, so
 this is a very general means of generating per-atom quantities to use
 as *index*\ .
 
-
 ----------
 
-
 This section explains the kinds of *input* values that can be used.
 Note that inputs reference global values, as contrasted with the
 *index* parameter which must reference per-atom values.
@@ -215,10 +203,8 @@ evaluated, so this is a very general means of generating a vector of
 global quantities which the *index* parameter will reference for
 assignment of global values to atoms.
 
-
 ----------
 
-
 **Output info:**
 
 If a single input is specified this compute produces a per-atom
@@ -243,8 +229,3 @@ Related commands
 :doc:`compute chunk/atom <compute_chunk_atom>`, :doc:`compute reduce <compute_reduce>`
 
 **Default:** none
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/compute_group_group.rst b/doc/src/compute_group_group.rst
index 390f4f7c6a..ba29090d5e 100644
--- a/doc/src/compute_group_group.rst
+++ b/doc/src/compute_group_group.rst
@@ -6,7 +6,6 @@ compute group/group command
 Syntax
 """"""
 
-
 .. parsed-literal::
 
    compute ID group-ID group/group group2-ID keyword value ...
@@ -16,21 +15,18 @@ Syntax
 * group2-ID = group ID of second (or same) group
 * zero or more keyword/value pairs may be appended
 * keyword = *pair* or *kspace* or *boundary* or *molecule*
-  
+
   .. parsed-literal::
-  
+
        *pair* value = *yes* or *no*
        *kspace* value = *yes* or *no*
        *boundary* value = *yes* or *no*
        *molecule* value = *off* or *inter* or *intra*
 
-
-
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    compute 1 lower group/group upper
    compute 1 lower group/group upper kspace yes
@@ -93,10 +89,8 @@ that included in the regular Ewald and PPPM routines.
 This compute does not calculate any bond or angle or dihedral or
 improper interactions between atoms in the two groups.
 
-
 ----------
 
-
 The pairwise contributions to the group-group interactions are
 calculated by looping over a neighbor list.  The Kspace contribution
 to the group-group interactions require essentially the same amount of
@@ -115,7 +109,7 @@ frequently.
    means those pairs will not be included in the group/group interaction.
    This does not apply when using long-range coulomb interactions
    (\ *coul/long*\ , *coul/msm*\ , *coul/wolf* or similar.  One way to get
-   around this would be to set special\_bond scaling factors to very tiny
+   around this would be to set special_bond scaling factors to very tiny
    numbers that are not exactly zero (e.g. 1.0e-50). Another workaround
    is to write a dump file, and use the :doc:`rerun <rerun>` command to
    compute the group/group interactions for snapshots in the dump file.
@@ -132,10 +126,8 @@ The individual contributions can be summed in a
 This `document <PDF/kspace.pdf>`_ describes how the long-range
 group-group calculations are performed.
 
-
 ----------
 
-
 **Output info:**
 
 This compute calculates a global scalar (the energy) and a global
@@ -151,7 +143,6 @@ The vector values will be in force :doc:`units <units>`.
 Restrictions
 """"""""""""
 
-
 Not all pair styles can be evaluated in a pairwise mode as required by
 this compute.  For example, 3-body and other many-body potentials,
 such as :doc:`Tersoff <pair_tersoff>` and
@@ -171,17 +162,8 @@ Default
 The option defaults are pair = yes, kspace = no, boundary = yes,
 molecule = off.
 
-
 ----------
 
-
 .. _Bogusz:
 
-
-
 Bogusz et al, J Chem Phys, 108, 7070 (1998)
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/compute_gyration.rst b/doc/src/compute_gyration.rst
index 89d11799e0..42ca1e53e5 100644
--- a/doc/src/compute_gyration.rst
+++ b/doc/src/compute_gyration.rst
@@ -6,7 +6,6 @@ compute gyration command
 Syntax
 """"""
 
-
 .. parsed-literal::
 
    compute ID group-ID gyration
@@ -17,8 +16,7 @@ Syntax
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    compute 1 molecule gyration
 
@@ -32,24 +30,26 @@ periodic boundaries.
 Rg is a measure of the size of the group of atoms, and is computed as
 the square root of the Rg\^2 value in this formula
 
-.. image:: Eqs/compute_gyration.jpg
-   :align: center
+.. math::
 
-where M is the total mass of the group, Rcm is the center-of-mass
-position of the group, and the sum is over all atoms in the group.
+ {R_g}^2 = \frac{1}{M} \sum_i m_i (r_i - r_{cm})^2
 
-A Rg\^2 tensor, stored as a 6-element vector, is also calculated by
-this compute.  The formula for the components of the tensor is the
-same as the above formula, except that (Ri - Rcm)\^2 is replaced by
-(Rix - Rcmx) \* (Riy - Rcmy) for the xy component, etc.  The 6
-components of the vector are ordered xx, yy, zz, xy, xz, yz.  Note
-that unlike the scalar Rg, each of the 6 values of the tensor is
-effectively a "squared" value, since the cross-terms may be negative
+where :math:`M` is the total mass of the group, :math:`r_{cm}` is the
+center-of-mass position of the group, and the sum is over all atoms in
+the group.
+
+A :math:`{R_g}^2` tensor, stored as a 6-element vector, is also calculated
+by this compute.  The formula for the components of the tensor is the
+same as the above formula, except that :math:`(r_i - r_{cm})^2` is replaced
+by :math:`(r_{i,x} - r_{cm,x}) \cdot (r_{i,y} - r_{cm,y})` for the xy component,
+and so on.  The 6 components of the vector are ordered xx, yy, zz, xy, xz, yz.
+Note that unlike the scalar :math:`R_g`, each of the 6 values of the tensor
+is effectively a "squared" value, since the cross-terms may be negative
 and taking a sqrt() would be invalid.
 
 .. note::
 
-   The coordinates of an atom contribute to Rg in "unwrapped" form,
+   The coordinates of an atom contribute to :math:`R_g` in "unwrapped" form,
    by using the image flags associated with each atom.  See the :doc:`dump custom <dump>` command for a discussion of "unwrapped" coordinates.
    See the Atoms section of the :doc:`read_data <read_data>` command for a
    discussion of image flags and how they are set for each atom.  You can
@@ -58,8 +58,8 @@ and taking a sqrt() would be invalid.
 
 **Output info:**
 
-This compute calculates a global scalar (Rg) and a global vector of
-length 6 (Rg\^2 tensor), which can be accessed by indices 1-6.  These
+This compute calculates a global scalar (:math:`R_g`) and a global vector of
+length 6 (:math:`{R_g}^2` tensor), which can be accessed by indices 1-6.  These
 values can be used by any command that uses a global scalar value or
 vector values from a compute as input.  See the :doc:`Howto output <Howto_output>` doc page for an overview of LAMMPS output
 options.
@@ -79,8 +79,3 @@ Related commands
 :doc:`compute gyration/shape <compute_gyration_shape>`
 
 **Default:** none
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/compute_gyration_chunk.rst b/doc/src/compute_gyration_chunk.rst
index 7ed70e0968..2ba632ded1 100644
--- a/doc/src/compute_gyration_chunk.rst
+++ b/doc/src/compute_gyration_chunk.rst
@@ -6,7 +6,6 @@ compute gyration/chunk command
 Syntax
 """"""
 
-
 .. parsed-literal::
 
    compute ID group-ID gyration/chunk chunkID keyword value ...
@@ -16,18 +15,15 @@ Syntax
 * chunkID = ID of :doc:`compute chunk/atom <compute_chunk_atom>` command
 * zero or more keyword/value pairs may be appended
 * keyword = *tensor*
-  
+
   .. parsed-literal::
-  
+
        *tensor* value = none
 
-
-
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    compute 1 molecule gyration/chunk molchunk
    compute 2 molecule gyration/chunk molchunk tensor
@@ -52,11 +48,12 @@ boundaries.
 Rg is a measure of the size of a chunk, and is computed by this
 formula
 
-.. image:: Eqs/compute_gyration.jpg
-   :align: center
+.. math::
 
-where M is the total mass of the chunk, Rcm is the center-of-mass
-position of the chunk, and the sum is over all atoms in the
+ {R_g}^2 = \frac{1}{M} \sum_i m_i (r_i - r_{cm})^2
+
+where :math:`M` is the total mass of the chunk, :math:`r_{cm}` is
+the center-of-mass position of the chunk, and the sum is over all atoms in the
 chunk.
 
 Note that only atoms in the specified group contribute to the
@@ -70,14 +67,16 @@ non-zero chunk IDs.
 If the *tensor* keyword is specified, then the scalar Rg value is not
 calculated, but an Rg tensor is instead calculated for each chunk.
 The formula for the components of the tensor is the same as the above
-formula, except that (Ri - Rcm)\^2 is replaced by (Rix - Rcmx) \* (Riy -
-Rcmy) for the xy component, etc.  The 6 components of the tensor are
+formula, except that :math:`(r_i - r_{cm})^2` is replaced by
+:math:`(r_{i,x} - r_{cm,x}) \cdot (r_{i,y} - r_{cm,y})` for the xy
+component, and so on.  The 6 components of the tensor are
 ordered xx, yy, zz, xy, xz, yz.
 
 .. note::
 
-   The coordinates of an atom contribute to Rg in "unwrapped" form,
-   by using the image flags associated with each atom.  See the :doc:`dump custom <dump>` command for a discussion of "unwrapped" coordinates.
+   The coordinates of an atom contribute to :math:`R_g` in "unwrapped" form,
+   by using the image flags associated with each atom.  See the :doc:`dump custom <dump>`
+   command for a discussion of "unwrapped" coordinates.
    See the Atoms section of the :doc:`read_data <read_data>` command for a
    discussion of image flags and how they are set for each atom.  You can
    reset the image flags (e.g. to 0) before invoking this compute by
@@ -87,8 +86,7 @@ The simplest way to output the results of the compute gyration/chunk
 calculation to a file is to use the :doc:`fix ave/time <fix_ave_time>`
 command, for example:
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    compute cc1 all chunk/atom molecule
    compute myChunk all gyration/chunk cc1
@@ -119,8 +117,3 @@ Restrictions
 :doc:`compute gyration <compute_gyration>`
 
 **Default:** none
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/compute_gyration_shape.rst b/doc/src/compute_gyration_shape.rst
index bfabd48132..81fc628a21 100644
--- a/doc/src/compute_gyration_shape.rst
+++ b/doc/src/compute_gyration_shape.rst
@@ -6,7 +6,6 @@ compute gyration/shape command
 Syntax
 """"""
 
-
 .. parsed-literal::
 
    compute ID group-ID gyration/shape compute-ID
@@ -18,8 +17,7 @@ Syntax
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    compute 1 molecule gyration/shape pe
 
@@ -33,11 +31,14 @@ due to atoms passing through periodic boundaries.
 The three computed shape parameters are the asphericity, b, the acylindricity, c,
 and the relative shape anisotropy, k:
 
-.. image:: Eqs/compute_shape_parameters.jpg
-   :align: center
+.. math::
 
-where lx <= ly <= lz are the three eigenvalues of the gyration tensor. A general description 
-of these parameters is provided in :ref:`(Mattice) <Mattice1>` while an application to polymer systems 
+ c = & l_z - 0.5(l_y+l_x) \\
+ b = & l_y - l_x \\
+ k = & \frac{3}{2} \frac{l_x^2+l_y^2+l_z^2}{(l_x+l_y+l_z)^2} - \frac{1}{2}
+
+where :math:`l_x` <= :math:`l_y` <= :math:`l_z` are the three eigenvalues of the gyration tensor. A general description
+of these parameters is provided in :ref:`(Mattice) <Mattice1>` while an application to polymer systems
 can be found in :ref:`(Theodorou) <Theodorou1>`.
 The asphericity  is always non-negative and zero only when the three principal
 moments are equal. This zero condition is met when the distribution of particles
@@ -78,7 +79,6 @@ distance\^2 :doc:`units <units>` while the sixth one is dimensionless.
 Restrictions
 """"""""""""
 
-
 This compute is part of the USER-MISC package.  It is only enabled if
 LAMMPS was built with that package.  See the :doc:`Build package <Build_package>` doc page for more info.
 
@@ -89,23 +89,12 @@ Related commands
 
 **Default:** none
 
-
 ----------
 
-
 .. _Mattice1:
 
-
-
 **(Mattice)** Mattice, Suter, Conformational Theory of Large Molecules, Wiley, New York, 1994.
 
 .. _Theodorou1:
 
-
-
 **(Theodorou)** Theodorou, Suter, Macromolecules, 18, 1206 (1985).
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/compute_gyration_shape_chunk.rst b/doc/src/compute_gyration_shape_chunk.rst
index 5b88cbd4dc..50dd4822ce 100644
--- a/doc/src/compute_gyration_shape_chunk.rst
+++ b/doc/src/compute_gyration_shape_chunk.rst
@@ -6,7 +6,6 @@ compute gyration/shape/chunk command
 Syntax
 """"""
 
-
 .. parsed-literal::
 
    compute ID group-ID gyration/shape/chunk compute-ID
@@ -18,28 +17,30 @@ Syntax
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    compute 1 molecule gyration/shape/chunk pe
 
 Description
 """""""""""
 
-Define a computation that calculates the eigenvalues of the gyration tensor and 
-three shape parameters of multiple chunks of atoms. The computation includes 
+Define a computation that calculates the eigenvalues of the gyration tensor and
+three shape parameters of multiple chunks of atoms. The computation includes
 all effects due to atoms passing through periodic boundaries.
 
 The three computed shape parameters are the asphericity, b, the acylindricity, c,
 and the relative shape anisotropy, k:
 
-.. image:: Eqs/compute_shape_parameters.jpg
-   :align: center
+.. math::
 
-where lx <= ly <= lz are the three eigenvalues of the gyration tensor. A general description 
-of these parameters is provided in :ref:`(Mattice) <Mattice2>` while an application to polymer systems 
-can be found in :ref:`(Theodorou) <Theodorou2>`. The asphericity  is always non-negative and zero 
-only when the three principal moments are equal. This zero condition is met when the distribution 
+ c = & l_z - 0.5(l_y+l_x) \\
+ b = & l_y - l_x \\
+ k = & \frac{3}{2} \frac{l_x^2+l_y^2+l_z^2}{(l_x+l_y+l_z)^2} - \frac{1}{2}
+
+where :math:`l_x` <= :math:`l_y` <= :math`l_z` are the three eigenvalues of the gyration tensor. A general description
+of these parameters is provided in :ref:`(Mattice) <Mattice2>` while an application to polymer systems
+can be found in :ref:`(Theodorou) <Theodorou2>`. The asphericity  is always non-negative and zero
+only when the three principal moments are equal. This zero condition is met when the distribution
 of particles is spherically symmetric (hence the name asphericity) but also whenever the particle
 distribution is symmetric with respect to the three coordinate axes, e.g.,
 when the particles are distributed uniformly on a cube, tetrahedron or other Platonic
@@ -65,7 +66,7 @@ The tensor keyword must be specified in the compute gyration/chunk command.
 
 **Output info:**
 
-This compute calculates a global array with six columns, 
+This compute calculates a global array with six columns,
 which can be accessed by indices 1-6. The first three columns are the
 eigenvalues of the gyration tensor followed by the asphericity, the acylindricity
 and the relative shape anisotropy.  The computed values can be used by any command
@@ -79,7 +80,6 @@ distance\^2 :doc:`units <units>` while the sixth one is dimensionless.
 Restrictions
 """"""""""""
 
-
 This compute is part of the USER-MISC package.  It is only enabled if
 LAMMPS was built with that package.  See the :doc:`Build package <Build_package>` doc page for more info.
 
@@ -91,23 +91,12 @@ Related commands
 
 **Default:** none
 
-
 ----------
 
-
 .. _Mattice2:
 
-
-
 **(Mattice)** Mattice, Suter, Conformational Theory of Large Molecules, Wiley, New York, 1994.
 
 .. _Theodorou2:
 
-
-
 **(Theodorou)** Theodorou, Suter, Macromolecules, 18, 1206 (1985).
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/compute_heat_flux.rst b/doc/src/compute_heat_flux.rst
index cb36d30da4..1b28c08ae5 100644
--- a/doc/src/compute_heat_flux.rst
+++ b/doc/src/compute_heat_flux.rst
@@ -6,7 +6,6 @@ compute heat/flux command
 Syntax
 """"""
 
-
 .. parsed-literal::
 
    compute ID group-ID heat/flux ke-ID pe-ID stress-ID
@@ -20,8 +19,7 @@ Syntax
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    compute myFlux all heat/flux myKE myPE myStress
 
@@ -88,7 +86,6 @@ included in the calculation.
    or :doc:`compute centroid/stress/atom virial <compute_stress_atom>`
    so as not to include a kinetic energy term in the heat flux.
 
-
 .. warning::
 
    The compute *heat/flux* has been reported to produce unphysical
@@ -106,10 +103,8 @@ to the thermal conductivity :math:`\kappa`:
 .. math::
    \kappa  = \frac{V}{k_B T^2} \int_0^\infty \langle J_x(0)  J_x(t) \rangle \, \mathrm{d} t = \frac{V}{3 k_B T^2} \int_0^\infty \langle \mathbf{J}(0) \cdot  \mathbf{J}(t)  \rangle \, \mathrm{d}t
 
-
 ----------
 
-
 The heat flux can be output every so many timesteps (e.g. via the
 :doc:`thermo_style custom <thermo_style>` command).  Then as a
 post-processing operation, an auto-correlation can be performed, its
@@ -122,10 +117,8 @@ the auto-correlation.  The trap() function in the
 An example LAMMPS input script for solid Ar is appended below.  The
 result should be: average conductivity ~0.29 in W/mK.
 
-
 ----------
 
-
 **Output info:**
 
 This compute calculates a global vector of length 6.
@@ -166,12 +159,9 @@ Related commands
 
 **Default:** none
 
-
 ----------
 
-
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    # Sample LAMMPS input script for thermal conductivity of solid Ar
 
@@ -181,7 +171,7 @@ Related commands
    variable    dt equal 4.0
    variable    p equal 200     # correlation length
    variable    s equal 10      # sample interval
-   variable    d equal $p\*$s   # dump interval
+   variable    d equal $p*$s   # dump interval
 
    # convert from LAMMPS real units to SI
 
@@ -189,7 +179,7 @@ Related commands
    variable    kCal2J equal 4186.0/6.02214e23
    variable    A2m equal 1.0e-10
    variable    fs2s equal 1.0e-15
-   variable    convert equal ${kCal2J}\*${kCal2J}/${fs2s}/${A2m}
+   variable    convert equal ${kCal2J}*${kCal2J}/${fs2s}/${A2m}
 
    # setup problem
 
@@ -201,7 +191,7 @@ Related commands
    create_atoms 1 box
    mass         1 39.948
    pair_style   lj/cut 13.0
-   pair_coeff   \* \* 0.2381 3.405
+   pair_coeff   * * 0.2381 3.405
    timestep     ${dt}
    thermo       $d
 
@@ -226,33 +216,22 @@ Related commands
    variable     Jz equal c_flux[3]/vol
    fix          JJ all ave/correlate $s $p $d &
                 c_flux[1] c_flux[2] c_flux[3] type auto file J0Jt.dat ave running
-   variable     scale equal ${convert}/${kB}/$T/$T/$V\*$s\*${dt}
-   variable     k11 equal trap(f_JJ[3])\*${scale}
-   variable     k22 equal trap(f_JJ[4])\*${scale}
-   variable     k33 equal trap(f_JJ[5])\*${scale}
+   variable     scale equal ${convert}/${kB}/$T/$T/$V*$s*${dt}
+   variable     k11 equal trap(f_JJ[3])*${scale}
+   variable     k22 equal trap(f_JJ[4])*${scale}
+   variable     k33 equal trap(f_JJ[5])*${scale}
    thermo_style custom step temp v_Jx v_Jy v_Jz v_k11 v_k22 v_k33
    run          100000
    variable     k equal (v_k11+v_k22+v_k33)/3.0
    variable     ndens equal count(all)/vol
    print        "average conductivity: $k[W/mK] @ $T K, ${ndens} /A\^3"
 
-
 ----------
 
-
 .. _Surblys2:
 
-
-
 **(Surblys)** Surblys, Matsubara, Kikugawa, Ohara, Phys Rev E, 99, 051301(R) (2019).
 
 .. _Boone:
 
-
-
 **(Boone)** Boone, Babaei, Wilmer, J Chem Theory Comput, 15, 5579--5587 (2019).
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/compute_hexorder_atom.rst b/doc/src/compute_hexorder_atom.rst
index 16ecaf5b41..31f7dbe662 100644
--- a/doc/src/compute_hexorder_atom.rst
+++ b/doc/src/compute_hexorder_atom.rst
@@ -6,7 +6,6 @@ compute hexorder/atom command
 Syntax
 """"""
 
-
 .. parsed-literal::
 
    compute ID group-ID hexorder/atom keyword values ...
@@ -14,21 +13,18 @@ Syntax
 * ID, group-ID are documented in :doc:`compute <compute>` command
 * hexorder/atom = style name of this compute command
 * one or more keyword/value pairs may be appended
-  
+
   .. parsed-literal::
-  
+
      keyword = *degree* or *nnn* or *cutoff*
        *cutoff* value = distance cutoff
        *nnn* value = number of nearest neighbors
        *degree* value = degree *n* of order parameter
 
-
-
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    compute 1 all hexorder/atom
    compute 1 all hexorder/atom degree 4 nnn 4 cutoff 1.2
@@ -36,19 +32,21 @@ Examples
 Description
 """""""""""
 
-Define a computation that calculates *qn* the bond-orientational
+Define a computation that calculates :math:`q_n` the bond-orientational
 order parameter for each atom in a group. The hexatic (\ *n* = 6) order
 parameter was introduced by :ref:`Nelson and Halperin <Nelson>` as a way to detect
-hexagonal symmetry in two-dimensional systems. For each atom, *qn*
+hexagonal symmetry in two-dimensional systems. For each atom, :math:`q_n`
 is a complex number (stored as two real numbers) defined as follows:
 
-.. image:: Eqs/hexorder.jpg
-   :align: center
+.. math::
+
+   q_n = \frac{1}{nnn}\sum_{j = 1}^{nnn} e^{n i \theta({\bf r}_{ij})}
 
 where the sum is over the *nnn* nearest neighbors
-of the central atom. The angle theta
-is formed by the bond vector rij and the *x* axis. theta is calculated
-only using the *x* and *y* components, whereas the distance from the
+of the central atom. The angle :math:`\theta`
+is formed by the bond vector :math:`r_{ij}` and the *x* axis.
+:math:`\theta` is calculated only using the *x* and *y* components,
+whereas the distance from the
 central atom is calculated using all three
 *x*\ , *y*\ , and *z* components of the bond vector.
 Neighbor atoms not in the group
@@ -60,22 +58,22 @@ the maximum allowable value, is the cutoff specified
 by the pair style.
 
 The optional keyword *nnn* defines the number of nearest
-neighbors used to calculate *qn*\ . The default value is 6.
+neighbors used to calculate :math:`q_n`. The default value is 6.
 If the value is NULL, then all neighbors up to the
 distance cutoff are used.
 
 The optional keyword *degree* sets the degree *n* of the order parameter.
 The default value is 6. For a perfect hexagonal lattice with
 *nnn* = 6,
-*q*\ 6 = exp(6 i phi) for all atoms, where the constant 0 < phi < pi/3
+:math:`q_6 = e^{6 i \phi}` for all atoms, where the constant :math:`0 < \phi < \frac{\pi}{3}`
 depends only on the orientation of the lattice relative to the *x* axis.
 In an isotropic liquid, local neighborhoods may still exhibit
 weak hexagonal symmetry, but because the orientational correlation
-decays quickly with distance, the value of phi will be different for
-different atoms, and so when *q*\ 6 is averaged over all the atoms
-in the system, \|<\ *q*\ 6>\| << 1.
+decays quickly with distance, the value of :math:`\phi` will be different for
+different atoms, and so when :math:`q_6` is averaged over all the atoms
+in the system, :math:`| \left< q_6 \right> | << 1`.
 
-The value of *qn* is set to zero for atoms not in the
+The value of :math:`q_n` is set to zero for atoms not in the
 specified compute group, as well as for atoms that have less than
 *nnn* neighbors within the distance cutoff.
 
@@ -102,8 +100,8 @@ too frequently.
 **Output info:**
 
 This compute calculates a per-atom array with 2 columns, giving the
-real and imaginary parts *qn*\ , a complex number restricted to the
-unit disk of the complex plane i.e. Re(\ *qn*\ )\^2 + Im(\ *qn*\ )\^2 <= 1 .
+real and imaginary parts :math:`q_n`, a complex number restricted to the
+unit disk of the complex plane i.e. :math:`Re(q_n)^2 + Im(q_n)^2 <= 1`.
 
 These values can be accessed by any command that uses per-atom values
 from a compute as input.  See the :doc:`Howto output <Howto_output>` doc
@@ -123,17 +121,8 @@ Default
 
 The option defaults are *cutoff* = pair style cutoff, *nnn* = 6, *degree* = 6
 
-
 ----------
 
-
 .. _Nelson:
 
-
-
 **(Nelson)** Nelson, Halperin, Phys Rev B, 19, 2457 (1979).
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/compute_hma.rst b/doc/src/compute_hma.rst
index 61e598948e..e00fdde841 100644
--- a/doc/src/compute_hma.rst
+++ b/doc/src/compute_hma.rst
@@ -6,7 +6,6 @@ compute hma command
 Syntax
 """"""
 
-
 .. parsed-literal::
 
    compute ID group-ID hma temp-ID keyword ...
@@ -23,13 +22,10 @@ Syntax
      *p* = compute will return pressure.  the following keyword must be the difference between the harmonic pressure and lattice pressure as described below
      *cv* = compute will return the heat capacity
 
-
-
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    compute 2 all hma 1 u
    compute 2 all hma 1 anharmonic u p 0.9
@@ -54,30 +50,31 @@ effects, smaller timestep inaccuracy, faster equilibration and shorter
 decorrelation time.
 
 HMA should not be used if atoms are expected to diffuse.  It is also
-restricted to simulations in the NVT ensemble.  While this compute may be
-used with any potential in LAMMPS, it will provide inaccurate results
+restricted to simulations in the NVT ensemble.  While this compute may
+be used with any potential in LAMMPS, it will provide inaccurate results
 for potentials that do not go to 0 at the truncation distance;
-:doc:`pair\_lj\_smooth\_linear <pair_lj_smooth_linear>` and Ewald summation should
-work fine, while :doc:`pair_lj <pair_lj>` will perform poorly unless
-the potential is shifted (via :doc:`pair_modify <pair_modify>` shift) or the cutoff is large.  Furthermore, computation of the heat capacity with
-this compute is restricted to those that implement the single\_hessian method
-in Pair.  Implementing single\_hessian in additional pair styles is simple.
-Please contact Andrew Schultz (ajs42 at buffalo.edu) and David Kofke (kofke at
-buffalo.edu) if your desired pair style does not have this method.  This is
-the list of pair styles that currently implement pair\_hessian:
-
-* :doc:`lj\_smooth\_linear <pair_lj_smooth_linear>`
+:doc:`pair_style lj/smooth/linear <pair_lj_smooth_linear>` and Ewald
+summation should work fine, while :doc:`pair_style lj/cut <pair_lj>`
+will perform poorly unless the potential is shifted (via
+:doc:`pair_modify <pair_modify>` shift) or the cutoff is large.
+Furthermore, computation of the heat capacity with this compute is
+restricted to those that implement the *single_hessian* method in Pair.
+Implementing *single_hessian* in additional pair styles is simple.
+Please contact Andrew Schultz (ajs42 at buffalo.edu) and David Kofke
+(kofke at buffalo.edu) if your desired pair style does not have this
+method.  This is the list of pair styles that currently implement
+*single_hessian*:
 
+* :doc:`pair_style lj/smooth/linear <pair_lj_smooth_linear>`
 
 In this method, the analytically known harmonic behavior of a crystal is removed from the traditional ensemble
 averages, which leads to an accurate and precise measurement of the anharmonic contributions without contamination
 by noise produced by the already-known harmonic behavior.
 A detailed description of this method can be found in (:ref:`Moustafa <hma-Moustafa>`). The potential energy is computed by the formula:
 
-
 .. math::
 
-   \begin{equation}\left< U\right>_{HMA} = \frac{d}{2} (N-1) k_B T  + \left< U + \frac{1}{2} F\bullet\Delta r \right>\end{equation}
+   \left< U\right>_{HMA} = \frac{d}{2} (N-1) k_B T  + \left< U + \frac{1}{2} F\bullet\Delta r \right>
 
 where :math:`N` is the number of atoms in the system, :math:`k_B` is Boltzmann's
 constant, :math:`T` is the temperature, :math:`d` is the
@@ -87,10 +84,9 @@ pair, bond, angle, dihedral, improper, kspace (long-range), and fix energies.
 
 The pressure is computed by the formula:
 
-
 .. math::
 
-   \begin{equation}\left< P\right>_{HMA} = \Delta \hat P + \left< P_{vir} + \frac{\beta \Delta \hat P - \rho}{d(N-1)} F\bullet\Delta r \right>\end{equation}
+   \left< P\right>_{HMA} = \Delta \hat P + \left< P_{vir} + \frac{\beta \Delta \hat P - \rho}{d(N-1)} F\bullet\Delta r \right>
 
 where :math:`\rho` is the number density of the system, :math:`\Delta \hat P` is the
 difference between the harmonic and lattice pressure, :math:`P_{vir}` is
@@ -102,12 +98,11 @@ pressure is sensitive to :math:`\Delta \hat P`; the precision tends to be
 best when :math:`\Delta \hat P` is the actual the difference between the lattice
 pressure and harmonic pressure.
 
-
 .. math::
 
-   \begin{equation}\left<C_V \right>_{HMA} = \frac{d}{2} (N-1) k_B + \frac{1}{k_B T^2} \left( \left<
+   \left<C_V \right>_{HMA} = \frac{d}{2} (N-1) k_B + \frac{1}{k_B T^2} \left( \left<
    U_{HMA}^2 \right> - \left<U_{HMA}\right>^2 \right) + \frac{1}{4 T}
-   \left< F\bullet\Delta r + \Delta r \bullet \Phi \bullet \Delta r \right>\end{equation}
+   \left< F\bullet\Delta r + \Delta r \bullet \Phi \bullet \Delta r \right>
 
 where :math:`\Phi` is the Hessian matrix. The compute hma command
 computes the full expression for :math:`C_V` except for the
@@ -118,8 +113,7 @@ round-off error when computing :math:`C_V`.  To address this, the *anharmonic*
 keyword can be passed and/or the output format can be specified with more
 digits.
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    thermo_modify format float '%22.15e'
 
@@ -142,8 +136,7 @@ should be avoided as its extra forces interfere with the HMA implementation.
 
 The following example illustrates the placement of this command in the input script:
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    min_style cg
    minimize 1e-35 1e-15 50000 500000
@@ -175,7 +168,6 @@ scalar value will be in energy :doc:`units <units>`.
 Restrictions
 """"""""""""
 
-
 This compute is part of the USER-MISC package.  It is enabled only
 if LAMMPS was built with that package.  See the :doc:`Build package <Build_package>` doc page for more info.
 
@@ -187,23 +179,14 @@ Related commands
 :doc:`compute pe <compute_pe>`, :doc:`compute pressure <compute_pressure>`
 
 :doc:`dynamical matrix <dynamical_matrix>` provides a finite difference
-formulation of the hessian provided by Pair's single\_hessian, which is used by
+formulation of the hessian provided by Pair's single_hessian, which is used by
 this compute.
 
 **Default:** none
 
-
 ----------
 
-
 .. _hma-Moustafa:
 
-
-
 **(Moustafa)** Sabry G. Moustafa, Andrew J. Schultz, and David A. Kofke, *Very fast averaging of thermal properties of crystals by molecular simulation*\ ,
 `Phys. Rev. E [92], 043303 (2015) <https://link.aps.org/doi/10.1103/PhysRevE.92.043303>`_
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/compute_improper.rst b/doc/src/compute_improper.rst
index aec2bfbbf5..0a264a74e7 100644
--- a/doc/src/compute_improper.rst
+++ b/doc/src/compute_improper.rst
@@ -6,7 +6,6 @@ compute improper command
 Syntax
 """"""
 
-
 .. parsed-literal::
 
    compute ID group-ID improper
@@ -17,8 +16,7 @@ Syntax
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    compute 1 all improper
 
@@ -36,7 +34,7 @@ total energy contributed by one or more of the hybrid sub-styles.
 **Output info:**
 
 This compute calculates a global vector of length N where N is the
-number of sub\_styles defined by the :doc:`improper_style hybrid <improper_style>` command.  which can be accessed by indices
+number of sub_styles defined by the :doc:`improper_style hybrid <improper_style>` command.  which can be accessed by indices
 1-N.  These values can be used by any command that uses global scalar
 or vector values from a compute as input.  See the :doc:`Howto output <Howto_output>` doc page for an overview of LAMMPS output
 options.
@@ -54,8 +52,3 @@ Related commands
 :doc:`compute pe <compute_pe>`, :doc:`compute pair <compute_pair>`
 
 **Default:** none
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/compute_improper_local.rst b/doc/src/compute_improper_local.rst
index fc651d324a..7a14daf161 100644
--- a/doc/src/compute_improper_local.rst
+++ b/doc/src/compute_improper_local.rst
@@ -6,7 +6,6 @@ compute improper/local command
 Syntax
 """"""
 
-
 .. parsed-literal::
 
    compute ID group-ID improper/local value1 value2 ...
@@ -15,18 +14,15 @@ Syntax
 * improper/local = style name of this compute command
 * one or more values may be appended
 * value = *chi*
-  
+
   .. parsed-literal::
-  
+
        *chi* = tabulate improper angles
 
-
-
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    compute 1 all improper/local chi
 
@@ -58,8 +54,7 @@ command in a consistent way.
 
 Here is an example of how to do this:
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    compute 1 all property/local itype iatom1 iatom2 iatom3 iatom4
    compute 2 all improper/local chi
@@ -88,8 +83,3 @@ Related commands
 :doc:`dump local <dump>`, :doc:`compute property/local <compute_property_local>`
 
 **Default:** none
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/compute_inertia_chunk.rst b/doc/src/compute_inertia_chunk.rst
index a60c98b3c3..f667929807 100644
--- a/doc/src/compute_inertia_chunk.rst
+++ b/doc/src/compute_inertia_chunk.rst
@@ -6,7 +6,6 @@ compute inertia/chunk command
 Syntax
 """"""
 
-
 .. parsed-literal::
 
    compute ID group-ID inertia/chunk chunkID
@@ -18,8 +17,7 @@ Syntax
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    compute 1 fluid inertia/chunk molchunk
 
@@ -63,12 +61,11 @@ The simplest way to output the results of the compute inertia/chunk
 calculation to a file is to use the :doc:`fix ave/time <fix_ave_time>`
 command, for example:
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    compute cc1 all chunk/atom molecule
    compute myChunk all inertia/chunk cc1
-   fix 1 all ave/time 100 1 100 c_myChunk[\*] file tmp.out mode vector
+   fix 1 all ave/time 100 1 100 c_myChunk[*] file tmp.out mode vector
 
 **Output info:**
 
@@ -92,8 +89,3 @@ Related commands
 :doc:`variable inertia() function <variable>`
 
 **Default:** none
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/compute_ke.rst b/doc/src/compute_ke.rst
index baccf848b5..d98d39247c 100644
--- a/doc/src/compute_ke.rst
+++ b/doc/src/compute_ke.rst
@@ -6,7 +6,6 @@ compute ke command
 Syntax
 """"""
 
-
 .. parsed-literal::
 
    compute ID group-ID ke
@@ -17,8 +16,7 @@ Syntax
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    compute 1 all ke
 
@@ -28,8 +26,8 @@ Description
 Define a computation that calculates the translational kinetic energy
 of a group of particles.
 
-The kinetic energy of each particle is computed as 1/2 m v\^2, where m
-and v are the mass and velocity of the particle.
+The kinetic energy of each particle is computed as :math:`\frac{1}{2} m
+v^2`, where *m* and *v* are the mass and velocity of the particle.
 
 There is a subtle difference between the quantity calculated by this
 compute and the kinetic energy calculated by the *ke* or *etotal*
@@ -37,12 +35,13 @@ keyword used in thermodynamic output, as specified by the
 :doc:`thermo_style <thermo_style>` command.  For this compute, kinetic
 energy is "translational" kinetic energy, calculated by the simple
 formula above.  For thermodynamic output, the *ke* keyword infers
-kinetic energy from the temperature of the system with 1/2 Kb T of
-energy for each degree of freedom.  For the default temperature
-computation via the :doc:`compute temp <compute_temp>` command, these
-are the same.  But different computes that calculate temperature can
-subtract out different non-thermal components of velocity and/or
-include different degrees of freedom (translational, rotational, etc).
+kinetic energy from the temperature of the system with
+:math:`\frac{1}{2} k_B T` of energy for each degree of freedom.  For the
+default temperature computation via the :doc:`compute temp
+<compute_temp>` command, these are the same.  But different computes
+that calculate temperature can subtract out different non-thermal
+components of velocity and/or include different degrees of freedom
+(translational, rotational, etc).
 
 **Output info:**
 
@@ -64,8 +63,3 @@ Related commands
 :doc:`compute erotate/sphere <compute_erotate_sphere>`
 
 **Default:** none
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/compute_ke_atom.rst b/doc/src/compute_ke_atom.rst
index a377903866..42294dbca1 100644
--- a/doc/src/compute_ke_atom.rst
+++ b/doc/src/compute_ke_atom.rst
@@ -6,7 +6,6 @@ compute ke/atom command
 Syntax
 """"""
 
-
 .. parsed-literal::
 
    compute ID group-ID ke/atom
@@ -17,8 +16,7 @@ Syntax
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    compute 1 all ke/atom
 
@@ -53,8 +51,3 @@ Related commands
 :doc:`dump custom <dump>`
 
 **Default:** none
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/compute_ke_atom_eff.rst b/doc/src/compute_ke_atom_eff.rst
index bbe7aa1013..7aa89d0dfc 100644
--- a/doc/src/compute_ke_atom_eff.rst
+++ b/doc/src/compute_ke_atom_eff.rst
@@ -6,7 +6,6 @@ compute ke/atom/eff command
 Syntax
 """"""
 
-
 .. parsed-literal::
 
    compute ID group-ID ke/atom/eff
@@ -17,8 +16,7 @@ Syntax
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    compute 1 all ke/atom/eff
 
@@ -30,11 +28,12 @@ Define a computation that calculates the per-atom translational
 group.  The particles are assumed to be nuclei and electrons modeled
 with the :doc:`electronic force field <pair_eff>`.
 
-The kinetic energy for each nucleus is computed as 1/2 m v\^2, where m
-corresponds to the corresponding nuclear mass, and the kinetic energy
-for each electron is computed as 1/2 (me v\^2 + 3/4 me s\^2), where me
-and v correspond to the mass and translational velocity of each
-electron, and s to its radial velocity, respectively.
+The kinetic energy for each nucleus is computed as :math:`\frac{1}{2} m
+v^2`, where *m* corresponds to the corresponding nuclear mass, and the
+kinetic energy for each electron is computed as :math:`\frac{1}{2} (m_e
+v^2 + \frac{3}{4} m_e s^2)`, where :math:`m_e` and *v* correspond to the mass
+and translational velocity of each electron, and *s* to its radial
+velocity, respectively.
 
 There is a subtle difference between the quantity calculated by this
 compute and the kinetic energy calculated by the *ke* or *etotal*
@@ -43,8 +42,8 @@ keyword used in thermodynamic output, as specified by the
 energy is "translational" plus electronic "radial" kinetic energy,
 calculated by the simple formula above. For thermodynamic output, the
 *ke* keyword infers kinetic energy from the temperature of the system
-with 1/2 Kb T of energy for each (nuclear-only) degree of freedom in
-eFF.
+with :math:`\frac{1}{2} k_B T` of energy for each (nuclear-only) degree
+of freedom in eFF.
 
 .. note::
 
@@ -52,8 +51,7 @@ eFF.
    thermodynamic output by using the :doc:`thermo_modify <thermo_modify>`
    command, as shown in the following example:
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    compute         effTemp all temp/eff
    thermo_style    custom step etotal pe ke temp press
@@ -74,7 +72,6 @@ The per-atom vector values will be in energy :doc:`units <units>`.
 Restrictions
 """"""""""""
 
-
 This compute is part of the USER-EFF package.  It is only enabled if
 LAMMPS was built with that package.  See the :doc:`Build package <Build_package>` doc page for more info.
 
@@ -84,8 +81,3 @@ Related commands
 :doc:`dump custom <dump>`
 
 **Default:** none
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/compute_ke_eff.rst b/doc/src/compute_ke_eff.rst
index 981e238bbe..f1cffebc56 100644
--- a/doc/src/compute_ke_eff.rst
+++ b/doc/src/compute_ke_eff.rst
@@ -6,7 +6,6 @@ compute ke/eff command
 Syntax
 """"""
 
-
 .. parsed-literal::
 
    compute ID group-ID ke/eff
@@ -17,8 +16,7 @@ Syntax
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    compute 1 all ke/eff
 
@@ -29,11 +27,12 @@ Define a computation that calculates the kinetic energy of motion of a
 group of eFF particles (nuclei and electrons), as modeled with the
 :doc:`electronic force field <pair_eff>`.
 
-The kinetic energy for each nucleus is computed as 1/2 m v\^2 and the
-kinetic energy for each electron is computed as 1/2(me v\^2 + 3/4 me
-s\^2), where m corresponds to the nuclear mass, me to the electron
-mass, v to the translational velocity of each particle, and s to the
-radial velocity of the electron, respectively.
+The kinetic energy for each nucleus is computed as :math:`\frac{1}{2} m
+v^2` and the kinetic energy for each electron is computed as
+:math:`\frac{1}{2}(m_e v^2 + \frac{3}{4} m_e s^2)`, where *m*
+corresponds to the nuclear mass, :math:`m_e` to the electron mass, *v*
+to the translational velocity of each particle, and *s* to the radial
+velocity of the electron, respectively.
 
 There is a subtle difference between the quantity calculated by this
 compute and the kinetic energy calculated by the *ke* or *etotal*
@@ -42,20 +41,22 @@ keyword used in thermodynamic output, as specified by the
 energy is "translational" and "radial" (only for electrons) kinetic
 energy, calculated by the simple formula above.  For thermodynamic
 output, the *ke* keyword infers kinetic energy from the temperature of
-the system with 1/2 Kb T of energy for each degree of freedom.  For
-the eFF temperature computation via the :doc:`compute temp\_eff <compute_temp_eff>` command, these are the same.  But
-different computes that calculate temperature can subtract out
-different non-thermal components of velocity and/or include other
-degrees of freedom.
+the system with :math:`\frac{1}{2} k_B T` of energy for each degree of
+freedom.  For the eFF temperature computation via the :doc:`compute
+temp_eff <compute_temp_eff>` command, these are the same.  But
+different computes that calculate temperature can subtract out different
+non-thermal components of velocity and/or include other degrees of
+freedom.
 
-IMPRORTANT NOTE: The temperature in eFF models should be monitored via
-the :doc:`compute temp/eff <compute_temp_eff>` command, which can be
-printed with thermodynamic output by using the
-:doc:`thermo_modify <thermo_modify>` command, as shown in the following
-example:
+.. warning::
 
+   The temperature in eFF models should be monitored via
+   the :doc:`compute temp/eff <compute_temp_eff>` command, which can be
+   printed with thermodynamic output by using the
+   :doc:`thermo_modify <thermo_modify>` command, as shown in the following
+   example:
 
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    compute         effTemp all temp/eff
    thermo_style    custom step etotal pe ke temp press
@@ -76,15 +77,9 @@ scalar value will be in energy :doc:`units <units>`.
 Restrictions
 """"""""""""
 
-
 This compute is part of the USER-EFF package.  It is only enabled if
 LAMMPS was built with that package.  See the :doc:`Build package <Build_package>` doc page for more info.
 
 **Related commands:** none
 
 **Default:** none
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/compute_ke_rigid.rst b/doc/src/compute_ke_rigid.rst
index 9d1b4fa9b6..fd4706de19 100644
--- a/doc/src/compute_ke_rigid.rst
+++ b/doc/src/compute_ke_rigid.rst
@@ -6,7 +6,6 @@ compute ke/rigid command
 Syntax
 """"""
 
-
 .. parsed-literal::
 
    compute ID group-ID ke/rigid fix-ID
@@ -18,8 +17,7 @@ Syntax
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    compute 1 all ke/rigid myRigid
 
@@ -52,7 +50,6 @@ scalar value will be in energy :doc:`units <units>`.
 Restrictions
 """"""""""""
 
-
 This compute is part of the RIGID package.  It is only enabled if
 LAMMPS was built with that package.  See the :doc:`Build package <Build_package>` doc page for more info.
 
@@ -62,8 +59,3 @@ Related commands
 :doc:`compute erotate/rigid <compute_erotate_rigid>`
 
 **Default:** none
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/compute_meso_e_atom.rst b/doc/src/compute_meso_e_atom.rst
index 2417ab1265..ad8e46cafb 100644
--- a/doc/src/compute_meso_e_atom.rst
+++ b/doc/src/compute_meso_e_atom.rst
@@ -6,7 +6,6 @@ compute meso/e/atom command
 Syntax
 """"""
 
-
 .. parsed-literal::
 
    compute ID group-ID meso/e/atom
@@ -17,8 +16,7 @@ Syntax
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    compute 1 all meso/e/atom
 
@@ -50,7 +48,6 @@ The per-atom vector values will be in energy :doc:`units <units>`.
 Restrictions
 """"""""""""
 
-
 This compute is part of the USER-SPH package.  It is only enabled if
 LAMMPS was built with that package.  See the :doc:`Build package <Build_package>` doc page for more info.
 
@@ -60,8 +57,3 @@ Related commands
 :doc:`dump custom <dump>`
 
 **Default:** none
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/compute_meso_rho_atom.rst b/doc/src/compute_meso_rho_atom.rst
index 57fcd4e2fe..d4611c5cb7 100644
--- a/doc/src/compute_meso_rho_atom.rst
+++ b/doc/src/compute_meso_rho_atom.rst
@@ -6,7 +6,6 @@ compute meso/rho/atom command
 Syntax
 """"""
 
-
 .. parsed-literal::
 
    compute ID group-ID meso/rho/atom
@@ -17,8 +16,7 @@ Syntax
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    compute 1 all meso/rho/atom
 
@@ -50,7 +48,6 @@ The per-atom vector values will be in mass/volume :doc:`units <units>`.
 Restrictions
 """"""""""""
 
-
 This compute is part of the USER-SPH package.  It is only enabled if
 LAMMPS was built with that package.  See the :doc:`Build package <Build_package>` doc page for more info.
 
@@ -60,8 +57,3 @@ Related commands
 :doc:`dump custom <dump>`
 
 **Default:** none
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/compute_meso_t_atom.rst b/doc/src/compute_meso_t_atom.rst
index b148516039..e44425a65c 100644
--- a/doc/src/compute_meso_t_atom.rst
+++ b/doc/src/compute_meso_t_atom.rst
@@ -6,7 +6,6 @@ compute meso/t/atom command
 Syntax
 """"""
 
-
 .. parsed-literal::
 
    compute ID group-ID meso/t/atom
@@ -17,8 +16,7 @@ Syntax
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    compute 1 all meso/t/atom
 
@@ -32,7 +30,9 @@ The internal temperature is the ratio of internal energy over the heat
 capacity associated with the internal degrees of freedom of a mesoscopic
 particles, e.g. a Smooth-Particle Hydrodynamics particle.
 
-T\_\ *int* = E\_\ *int* / C\_\ *V, int*
+.. math::
+
+    T_{int} = E_{int} / C_{V,int}
 
 See `this PDF guide <USER/sph/SPH_LAMMPS_userguide.pdf>`_ to using SPH in
 LAMMPS.
@@ -52,7 +52,6 @@ The per-atom vector values will be in temperature :doc:`units <units>`.
 Restrictions
 """"""""""""
 
-
 This compute is part of the USER-SPH package.  It is only enabled if
 LAMMPS was built with that package.  See the :doc:`Build package <Build_package>` doc page for more info.
 
@@ -62,8 +61,3 @@ Related commands
 :doc:`dump custom <dump>`
 
 **Default:** none
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/compute_modify.rst b/doc/src/compute_modify.rst
index 331887829e..3b8f613744 100644
--- a/doc/src/compute_modify.rst
+++ b/doc/src/compute_modify.rst
@@ -1,22 +1,21 @@
-.. index:: compute\_modify
+.. index:: compute_modify
 
-compute\_modify command
-=======================
+compute_modify command
+======================
 
 Syntax
 """"""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    compute_modify compute-ID keyword value ...
 
 * compute-ID = ID of the compute to modify
 * one or more keyword/value pairs may be listed
 * keyword = *extra/dof* or *extra* or *dynamic/dof* or *dynamic*
-  
+
   .. parsed-literal::
-  
+
        *extra/dof* value = N
          N = # of extra degrees of freedom to subtract
        *extra* syntax is identical to *extra/dof*\ , will be disabled at some point
@@ -24,13 +23,10 @@ Syntax
          yes/no = do or do not re-compute the number of degrees of freedom (DOF) contributing to the temperature
        *dynamic* syntax is identical to *dynamic/dof*\ , will be disabled at some point
 
-
-
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    compute_modify myTemp extra/dof 0
    compute_modify newtemp dynamic/dof yes extra/dof 600
@@ -80,8 +76,3 @@ Default
 
 The option defaults are extra/dof = 2 or 3 for 2d or 3d systems and
 dynamic/dof = no.
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/compute_momentum.rst b/doc/src/compute_momentum.rst
index d09c8a31eb..af968efb59 100644
--- a/doc/src/compute_momentum.rst
+++ b/doc/src/compute_momentum.rst
@@ -6,7 +6,6 @@ compute momentum command
 Syntax
 """"""
 
-
 .. parsed-literal::
 
    compute ID group-ID momentum
@@ -17,8 +16,7 @@ Syntax
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    compute 1 all momentum
 
@@ -44,7 +42,6 @@ value will be in mass\*velocity :doc:`units <units>`.
 Restrictions
 """"""""""""
 
-
 This compute is part of the USER-MISC package.  It is only enabled if
 LAMMPS was built with that package.  See the :doc:`Build package <Build_package>` doc page for more info.
 
@@ -52,8 +49,3 @@ Related commands
 """"""""""""""""
 
 **Default:** none
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/compute_msd.rst b/doc/src/compute_msd.rst
index 4b472566e7..94ab6a1579 100644
--- a/doc/src/compute_msd.rst
+++ b/doc/src/compute_msd.rst
@@ -6,7 +6,6 @@ compute msd command
 Syntax
 """"""
 
-
 .. parsed-literal::
 
    compute ID group-ID msd keyword values ...
@@ -15,19 +14,16 @@ Syntax
 * msd = style name of this compute command
 * zero or more keyword/value pairs may be appended
 * keyword = *com* or *average*
-  
+
   .. parsed-literal::
-  
+
        *com* value = *yes* or *no*
        *average* value = *yes* or *no*
 
-
-
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    compute 1 all msd
    compute 1 upper msd com yes average yes
@@ -116,14 +112,9 @@ Restrictions
 Related commands
 """"""""""""""""
 
-:doc:`compute msd/nongauss <compute_msd_nongauss>`, :doc:`compute displace\_atom <compute_displace_atom>`, :doc:`fix store/state <fix_store_state>`, :doc:`compute msd/chunk <compute_msd_chunk>`
+:doc:`compute msd/nongauss <compute_msd_nongauss>`, :doc:`compute displace_atom <compute_displace_atom>`, :doc:`fix store/state <fix_store_state>`, :doc:`compute msd/chunk <compute_msd_chunk>`
 
 Default
 """""""
 
 The option default are com = no, average = no.
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/compute_msd_chunk.rst b/doc/src/compute_msd_chunk.rst
index f8a2ee1dc1..9a9a926030 100644
--- a/doc/src/compute_msd_chunk.rst
+++ b/doc/src/compute_msd_chunk.rst
@@ -6,7 +6,6 @@ compute msd/chunk command
 Syntax
 """"""
 
-
 .. parsed-literal::
 
    compute ID group-ID msd/chunk chunkID
@@ -18,8 +17,7 @@ Syntax
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    compute 1 all msd/chunk molchunk
 
@@ -101,12 +99,11 @@ The simplest way to output the results of the compute msd/chunk
 calculation to a file is to use the :doc:`fix ave/time <fix_ave_time>`
 command, for example:
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    compute cc1 all chunk/atom molecule
    compute myChunk all msd/chunk cc1
-   fix 1 all ave/time 100 1 100 c_myChunk[\*] file tmp.out mode vector
+   fix 1 all ave/time 100 1 100 c_myChunk[*] file tmp.out mode vector
 
 **Output info:**
 
@@ -130,8 +127,3 @@ Related commands
 :doc:`compute msd <compute_msd>`
 
 **Default:** none
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/compute_msd_nongauss.rst b/doc/src/compute_msd_nongauss.rst
index 56407e1dde..2dfc00fb68 100644
--- a/doc/src/compute_msd_nongauss.rst
+++ b/doc/src/compute_msd_nongauss.rst
@@ -6,7 +6,6 @@ compute msd/nongauss command
 Syntax
 """"""
 
-
 .. parsed-literal::
 
    compute ID group-ID msd/nongauss keyword values ...
@@ -15,18 +14,15 @@ Syntax
 * msd/nongauss = style name of this compute command
 * zero or more keyword/value pairs may be appended
 * keyword = *com*
-  
+
   .. parsed-literal::
-  
+
        *com* value = *yes* or *no*
 
-
-
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    compute 1 all msd/nongauss
    compute 1 upper msd/nongauss com yes
@@ -46,8 +42,9 @@ dz\*dz)\*(dx\*dx + dy\*dy + dz\*dz), summed and averaged over atoms in the
 group.  The 3rd component is the nonGaussian diffusion parameter NGP =
 3\*drfourth/(5\*drsquared\*drsquared), i.e.
 
-.. image:: Eqs/compute_msd_nongauss.jpg
-   :align: center
+.. math::
+
+ NGP(t) = 3<(r(t)-r(0))^4>/(5<(r(t)-r(0))^2>^2) - 1
 
 The NGP is a commonly used quantity in studies of dynamical
 heterogeneity.  Its minimum theoretical value (-0.4) occurs when all
@@ -76,7 +73,6 @@ the 3rd is dimensionless.
 Restrictions
 """"""""""""
 
-
 This compute is part of the MISC package.  It is only enabled if
 LAMMPS was built with that package.  See the :doc:`Build package <Build_package>` doc page for more info.
 
@@ -89,8 +85,3 @@ Default
 """""""
 
 The option default is com = no.
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/compute_omega_chunk.rst b/doc/src/compute_omega_chunk.rst
index dd8a3be806..73895b585c 100644
--- a/doc/src/compute_omega_chunk.rst
+++ b/doc/src/compute_omega_chunk.rst
@@ -6,7 +6,6 @@ compute omega/chunk command
 Syntax
 """"""
 
-
 .. parsed-literal::
 
    compute ID group-ID omega/chunk chunkID
@@ -18,8 +17,7 @@ Syntax
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    compute 1 fluid omega/chunk molchunk
 
@@ -64,12 +62,11 @@ The simplest way to output the results of the compute omega/chunk
 calculation to a file is to use the :doc:`fix ave/time <fix_ave_time>`
 command, for example:
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    compute cc1 all chunk/atom molecule
    compute myChunk all omega/chunk cc1
-   fix 1 all ave/time 100 1 100 c_myChunk[\*] file tmp.out mode vector
+   fix 1 all ave/time 100 1 100 c_myChunk[*] file tmp.out mode vector
 
 **Output info:**
 
@@ -93,8 +90,3 @@ Related commands
 :doc:`variable omega() function <variable>`
 
 **Default:** none
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/compute_orientorder_atom.rst b/doc/src/compute_orientorder_atom.rst
index 70b96a9fc5..7b894b886e 100644
--- a/doc/src/compute_orientorder_atom.rst
+++ b/doc/src/compute_orientorder_atom.rst
@@ -6,7 +6,6 @@ compute orientorder/atom command
 Syntax
 """"""
 
-
 .. parsed-literal::
 
    compute ID group-ID orientorder/atom keyword values ...
@@ -14,9 +13,9 @@ Syntax
 * ID, group-ID are documented in :doc:`compute <compute>` command
 * orientorder/atom = style name of this compute command
 * one or more keyword/value pairs may be appended
-  
+
   .. parsed-literal::
-  
+
      keyword = *cutoff* or *nnn* or *degrees* or *components*
        *cutoff* value = distance cutoff
        *nnn* value = number of nearest neighbors
@@ -25,13 +24,10 @@ Syntax
        *wl/hat* value = yes or no
        *components* value = ldegree
 
-
-
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    compute 1 all orientorder/atom
    compute 1 all orientorder/atom degrees 5 4 6 8 10 12 nnn NULL cutoff 1.5
@@ -42,23 +38,25 @@ Description
 """""""""""
 
 Define a computation that calculates a set of bond-orientational
-order parameters *Ql* for each atom in a group. These order parameters
+order parameters :math:`Q_l` for each atom in a group. These order parameters
 were introduced by :ref:`Steinhardt et al. <Steinhardt>` as a way to
 characterize the local orientational order in atomic structures.
-For each atom, *Ql* is a real number defined as follows:
+For each atom, :math:`Q_l` is a real number defined as follows:
 
-.. image:: Eqs/orientorder.jpg
-   :align: center
+.. math::
+
+   \bar{Y}_{lm} = & \frac{1}{nnn}\sum_{j = 1}^{nnn} Y_{lm}( \theta( {\bf r}_{ij} ), \phi( {\bf r}_{ij} ) ) \\
+   Q_l = & \sqrt{\frac{4 \pi}{2 l + 1} \sum_{m = -l}^{m = l} \bar{Y}_{lm} \bar{Y}^*_{lm}}
 
 The first equation defines the spherical harmonic order parameters.
 These are complex number components of the 3D analog of the 2D order
-parameter *qn*\ , which is implemented as LAMMPS compute
+parameter :math:`q_n`, which is implemented as LAMMPS compute
 :doc:`hexorder/atom <compute_hexorder_atom>`.
 The summation is over the *nnn* nearest
 neighbors of the central atom.
 The angles theta and phi are the standard spherical polar angles
-defining the direction of the bond vector *rij*\ .
-The second equation defines *Ql*\ , which is a
+defining the direction of the bond vector :math:`r_{ij}`.
+The second equation defines :math:`Q_l`, which is a
 rotationally invariant non-negative amplitude obtained by summing
 over all the components of degree *l*\ .
 
@@ -68,42 +66,45 @@ the maximum allowable value, is the cutoff specified
 by the pair style.
 
 The optional keyword *nnn* defines the number of nearest
-neighbors used to calculate *Ql*\ . The default value is 12.
+neighbors used to calculate :math:`Q_l`. The default value is 12.
 If the value is NULL, then all neighbors up to the
 specified distance cutoff are used.
 
 The optional keyword *degrees* defines the list of order parameters to
 be computed.  The first argument *nlvalues* is the number of order
 parameters. This is followed by that number of non-negative integers giving the
-degree of each order parameter. Because *Q*\ 2 and all odd-degree order
+degree of each order parameter. Because :math:`Q_2` and all odd-degree order
 parameters are zero for atoms in cubic crystals (see
-:ref:`Steinhardt <Steinhardt>`), the default order parameters are *Q*\ 4,
-*Q*\ 6, *Q*\ 8, *Q*\ 10, and *Q*\ 12. For the FCC crystal with *nnn* =12, *Q*\ 4
-= sqrt(7/3)/8 = 0.19094....  The numerical values of all order
-parameters up to *Q*\ 12 for a range of commonly encountered
-high-symmetry structures are given in Table I of :ref:`Mickel et al. <Mickel>`, and these can be reproduced with this compute
+:ref:`Steinhardt <Steinhardt>`), the default order parameters are :math:`Q_4`,
+:math:`Q_6`, :math:`Q_8`, :math:`Q_{10}`, and :math:`Q_{12}`. For the FCC
+crystal with *nnn* =12, :math:`Q_4 = \sqrt{\frac{7}{192}} = 0.19094...`.
+The numerical values of all order
+parameters up to :math:`Q_12` for a range of commonly encountered
+high-symmetry structures are given in Table I of :ref:`Mickel et al. <Mickel>`,
+and these can be reproduced with this compute.
 
-The optional keyword *wl* will output the third-order invariants *Wl*
+The optional keyword *wl* will output the third-order invariants :math:`W_l`
 (see Eq. 1.4 in :ref:`Steinhardt <Steinhardt>`) for the same degrees as
-for the *Ql* parameters. For the FCC crystal with *nnn* =12,
-*W*\ 4 = -sqrt(14/143).(49/4096)/Pi\^1.5 = -0.0006722136...
+for the :math:`Q_l` parameters. For the FCC crystal with *nnn* =12,
+:math:`W_4` = -sqrt(14/143).(49/4096)/Pi\^1.5 = -0.0006722136...
 
 The optional keyword *wl/hat* will output the normalized third-order
-invariants *Wlhat* (see Eq. 2.2 in :ref:`Steinhardt <Steinhardt>`)
-for the same degrees as for the *Ql* parameters. For the FCC crystal
-with *nnn* =12, *W*\ 4hat = -7/3\*sqrt(2/429) = -0.159317...The numerical
-values of *Wlhat* for a range of commonly encountered high-symmetry
+invariants :math:`\hat{W}_l` (see Eq. 2.2 in :ref:`Steinhardt <Steinhardt>`)
+for the same degrees as for the :math:`Q_l` parameters. For the FCC crystal
+with *nnn* =12, :math:`\hat{W}_4 = -\frac{7}{3} \sqrt{\frac{2}{429}} = -0.159317...`
+The numerical
+values of :math:`\hat{W}_l` for a range of commonly encountered high-symmetry
 structures are given in Table I of :ref:`Steinhardt <Steinhardt>`, and these
 can be reproduced with this keyword.
 
 The optional keyword *components* will output the components of the
-normalized complex vector *Ybar\_lm* of degree *ldegree*\ , which must be
+normalized complex vector :math:`\bar{Y}_{lm}` of degree *ldegree*\ , which must be
 explicitly included in the keyword *degrees*\ . This option can be used
-in conjunction with :doc:`compute coord\_atom <compute_coord_atom>` to
+in conjunction with :doc:`compute coord_atom <compute_coord_atom>` to
 calculate the ten Wolde's criterion to identify crystal-like
 particles, as discussed in :ref:`ten Wolde <tenWolde2>`.
 
-The value of *Ql* is set to zero for atoms not in the
+The value of :math:`Q_l` is set to zero for atoms not in the
 specified compute group, as well as for atoms that have less than
 *nnn* neighbors within the distance cutoff, unless *nnn* is NULL.
 
@@ -130,19 +131,19 @@ too frequently.
 **Output info:**
 
 This compute calculates a per-atom array with *nlvalues* columns,
-giving the *Ql* values for each atom, which are real numbers on the
-range 0 <= *Ql* <= 1.
+giving the :math:`Q_l` values for each atom, which are real numbers on the
+range :math:`0 <= Q_l <= 1`.
 
-If the keyword *wl* is set to yes, then the *Wl* values for each
+If the keyword *wl* is set to yes, then the :math:`W_l` values for each
 atom will be added to the output array, which are real numbers.
 
-If the keyword *wl/hat* is set to yes, then the *Wl\_hat*
+If the keyword *wl/hat* is set to yes, then the :math:`\hat{W}_l`
 values for each atom will be added to the output array, which are real numbers.
 
 If the keyword *components* is set, then the real and imaginary parts
-of each component of (normalized) *Ybar\_lm* will be added to the
-output array in the following order: Re(*Ybar\_-m*) Im(*Ybar\_-m*)
-Re(*Ybar\_-m+1*) Im(*Ybar\_-m+1*) ... Re(*Ybar\_m*) Im(*Ybar\_m*).  This
+of each component of (normalized) :math:`\bar{Y}_{lm}` will be added to the
+output array in the following order: :math:`Re(\bar{Y}_{-m}) Im(\bar{Y}_{-m})
+Re(\bar{Y}_{-m+1}) Im(\bar{Y}_{-m+1}) ... Re(\bar{Y}_m) Im(\bar{Y}_m)`.  This
 way, the per-atom array will have a total of *nlvalues*\ +2\*(2\ *l*\ +1)
 columns.
 
@@ -163,35 +164,22 @@ Default
 """""""
 
 The option defaults are *cutoff* = pair style cutoff, *nnn* = 12,
-*degrees* = 5 4 6 8 10 12 i.e. *Q*\ 4, *Q*\ 6, *Q*\ 8, *Q*\ 10, and *Q*\ 12,
+*degrees* = 5 4 6 8 10 12 i.e. :math:`Q_4`, :math:`Q_6`, :math:`Q_8`, :math:`Q_{10}`, and :math:`Q_{12}`,
 *wl* = no, *wl/hat* = no, and *components* off
 
-
 ----------
 
-
 .. _Steinhardt:
 
-
-
 **(Steinhardt)** P. Steinhardt, D. Nelson, and M. Ronchetti,
 Phys. Rev. B 28, 784 (1983).
 
 .. _Mickel:
 
-
-
 **(Mickel)** W. Mickel, S. C. Kapfer, G. E. Schroeder-Turkand, K. Mecke,
 J. Chem. Phys. 138, 044501 (2013).
 
 .. _tenWolde2:
 
-
-
 **(tenWolde)** P. R. ten Wolde, M. J. Ruiz-Montero, D. Frenkel,
 J. Chem. Phys. 104, 9932 (1996).
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/compute_pair.rst b/doc/src/compute_pair.rst
index 03da8acddb..40c758ebf0 100644
--- a/doc/src/compute_pair.rst
+++ b/doc/src/compute_pair.rst
@@ -6,7 +6,6 @@ compute pair command
 Syntax
 """"""
 
-
 .. parsed-literal::
 
    compute ID group-ID pair pstyle [nstyle] [evalue]
@@ -17,12 +16,10 @@ Syntax
 * nsub = *n*\ -instance of a sub-style, if a pair style is used multiple times in a hybrid style
 * *evalue* = *epair* or *evdwl* or *ecoul* or blank (optional)
 
-
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    compute 1 all pair gauss
    compute 1 all pair lj/cut/coul/cut ecoul
@@ -100,8 +97,3 @@ Default
 """""""
 
 The keyword defaults are *evalue* = *epair*\ , nsub = 0.
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/compute_pair_local.rst b/doc/src/compute_pair_local.rst
index 39abd67f6c..31030cd97e 100644
--- a/doc/src/compute_pair_local.rst
+++ b/doc/src/compute_pair_local.rst
@@ -6,7 +6,6 @@ compute pair/local command
 Syntax
 """"""
 
-
 .. parsed-literal::
 
    compute ID group-ID pair/local value1 value2 ... keyword args ...
@@ -15,9 +14,9 @@ Syntax
 * pair/local = style name of this compute command
 * one or more values may be appended
 * value = *dist* or *eng* or *force* or *fx* or *fy* or *fz* or *pN*
-  
+
   .. parsed-literal::
-  
+
        *dist* = pairwise distance
        *eng* = pairwise energy
        *force* = pairwise force
@@ -26,18 +25,15 @@ Syntax
 
 * zero or more keyword/arg pairs may be appended
 * keyword = *cutoff*
-  
+
   .. parsed-literal::
-  
+
        *cutoff* arg = *type* or *radius*
 
-
-
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    compute 1 all pair/local eng
    compute 1 all pair/local dist eng force
@@ -119,8 +115,7 @@ command in a consistent way.
 
 Here is an example of how to do this:
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    compute 1 all property/local patom1 patom2
    compute 2 all pair/local dist eng force
@@ -172,8 +167,3 @@ Default
 """""""
 
 The keyword default is cutoff = type.
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/compute_pe.rst b/doc/src/compute_pe.rst
index d3d23e590c..813b577490 100644
--- a/doc/src/compute_pe.rst
+++ b/doc/src/compute_pe.rst
@@ -6,7 +6,6 @@ compute pe command
 Syntax
 """"""
 
-
 .. parsed-literal::
 
    compute ID group-ID pe keyword ...
@@ -19,8 +18,7 @@ Syntax
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    compute 1 all pe
    compute molPE all pe bond angle dihedral improper
@@ -56,20 +54,17 @@ potential energy.
    The :doc:`fix_modify energy yes <fix_modify>` command must also be
    specified if a fix is to contribute potential energy to this command.
 
-A compute of this style with the ID of "thermo\_pe" is created when
+A compute of this style with the ID of "thermo_pe" is created when
 LAMMPS starts up, as if this command were in the input script:
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    compute thermo_pe all pe
 
-See the "thermo\_style" command for more details.
-
+See the "thermo_style" command for more details.
 
 ----------
 
-
 **Output info:**
 
 This compute calculates a global scalar (the potential energy).  This
@@ -90,8 +85,3 @@ Related commands
 :doc:`compute pe/atom <compute_pe_atom>`
 
 **Default:** none
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/compute_pe_atom.rst b/doc/src/compute_pe_atom.rst
index bd4dcd2d57..b616cecd89 100644
--- a/doc/src/compute_pe_atom.rst
+++ b/doc/src/compute_pe_atom.rst
@@ -6,7 +6,6 @@ compute pe/atom command
 Syntax
 """"""
 
-
 .. parsed-literal::
 
    compute ID group-ID pe/atom keyword ...
@@ -19,8 +18,7 @@ Syntax
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    compute 1 all pe/atom
    compute 1 all pe/atom pair
@@ -74,8 +72,7 @@ As an example of per-atom potential energy compared to total potential
 energy, these lines in an input script should yield the same result
 in the last 2 columns of thermo output:
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    compute        peratom all pe/atom
    compute        pe all reduce sum c_peratom
@@ -99,7 +96,6 @@ The per-atom vector values will be in energy :doc:`units <units>`.
 Restrictions
 """"""""""""
 
-
 Related commands
 """"""""""""""""
 
@@ -107,17 +103,8 @@ Related commands
 
 **Default:** none
 
-
 ----------
 
-
 .. _Heyes1:
 
-
-
 **(Heyes)** Heyes, Phys Rev B 49, 755 (1994),
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/compute_plasticity_atom.rst b/doc/src/compute_plasticity_atom.rst
index 10dc82df16..939017f5e9 100644
--- a/doc/src/compute_plasticity_atom.rst
+++ b/doc/src/compute_plasticity_atom.rst
@@ -6,7 +6,6 @@ compute plasticity/atom command
 Syntax
 """"""
 
-
 .. parsed-literal::
 
    compute ID group-ID plasticity/atom
@@ -17,8 +16,7 @@ Syntax
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    compute 1 all plasticity/atom
 
@@ -33,7 +31,7 @@ The plasticity for a Peridynamic particle is the so-called consistency
 parameter (lambda).  For elastic deformation lambda = 0, otherwise
 lambda > 0 for plastic deformation.  For details, see
 :ref:`(Mitchell) <Mitchell>` and the PDF doc included in the LAMMPS
-distribution in `doc/PDF/PDLammps\_EPS.pdf <PDF/PDLammps_EPS.pdf>`_.
+distribution in `doc/PDF/PDLammps_EPS.pdf <PDF/PDLammps_EPS.pdf>`_.
 
 This command can be invoked for one of the Peridynamic :doc:`pair styles <pair_peri>`: peri/eps.
 
@@ -52,7 +50,6 @@ The per-atom vector values are unitless numbers (lambda) >= 0.0.
 Restrictions
 """"""""""""
 
-
 This compute is part of the PERI package.  It is only enabled if
 LAMMPS was built with that package.  See the :doc:`Build package <Build_package>` doc page for more info.
 
@@ -64,19 +61,10 @@ Related commands
 
 **Default:** none
 
-
 ----------
 
-
 .. _Mitchell:
 
-
-
 **(Mitchell)** Mitchell, "A non-local, ordinary-state-based
 viscoelasticity model for peridynamics", Sandia National Lab Report,
 8064:1-28 (2011).
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/compute_pressure.rst b/doc/src/compute_pressure.rst
index 3ee7f86fbd..7366fa6d3d 100644
--- a/doc/src/compute_pressure.rst
+++ b/doc/src/compute_pressure.rst
@@ -6,7 +6,6 @@ compute pressure command
 Syntax
 """"""
 
-
 .. parsed-literal::
 
    compute ID group-ID pressure temp-ID keyword ...
@@ -20,8 +19,7 @@ Syntax
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    compute 1 all pressure thermo_temp
    compute 1 all pressure NULL pair bond
@@ -37,23 +35,24 @@ of atoms via the :doc:`compute reduce <compute_reduce>` command.
 
 The pressure is computed by the formula
 
-.. image:: Eqs/pressure.jpg
-   :align: center
+.. math::
 
-where N is the number of atoms in the system (see discussion of DOF
-below), Kb is the Boltzmann constant, T is the temperature, d is the
-dimensionality of the system (2 or 3 for 2d/3d), and V is the system
-volume (or area in 2d).  The second term is the virial, equal to
+   P = \frac{N k_B T}{V} + \frac{\sum_{i}^{N'} r_i \bullet f_i}{dV}
+
+where *N* is the number of atoms in the system (see discussion of DOF
+below), :math:`k_B` is the Boltzmann constant, *T* is the temperature, d
+is the dimensionality of the system (2 or 3 for 2d/3d), and *V* is the
+system volume (or area in 2d).  The second term is the virial, equal to
 -dU/dV, computed for all pairwise as well as 2-body, 3-body, 4-body,
-many-body, and long-range interactions, where r\_i and f\_i are the
-position and force vector of atom i, and the black dot indicates a dot
-product.  When periodic boundary conditions are used, N' necessarily
-includes periodic image (ghost) atoms outside the central box, and the
-position and force vectors of ghost atoms are thus included in the
-summation.  When periodic boundary conditions are not used, N' = N =
-the number of atoms in the system.  :doc:`Fixes <fix>` that impose
-constraints (e.g. the :doc:`fix shake <fix_shake>` command) also
-contribute to the virial term.
+many-body, and long-range interactions, where :math:`r_i` and
+:math:`f_i` are the position and force vector of atom *i*, and the black
+dot indicates a dot product.  When periodic boundary conditions are
+used, N' necessarily includes periodic image (ghost) atoms outside the
+central box, and the position and force vectors of ghost atoms are thus
+included in the summation.  When periodic boundary conditions are not
+used, N' = N = the number of atoms in the system.  :doc:`Fixes <fix>`
+that impose constraints (e.g. the :doc:`fix shake <fix_shake>` command)
+also contribute to the virial term.
 
 A symmetric pressure tensor, stored as a 6-element vector, is also
 calculated by this compute.  The 6 components of the vector are
@@ -62,8 +61,10 @@ ordered xx, yy, zz, xy, xz, yz.  The equation for the I,J components
 the first term uses components of the kinetic energy tensor and the
 second term uses components of the virial tensor:
 
-.. image:: Eqs/pressure_tensor.jpg
-   :align: center
+.. math::
+
+   P_{IJ} = \frac{\sum_{k}^{N} m_k v_{k_I} v_{k_J}}{V} +
+   \frac{\sum_{k}^{N'} r_{k_I} f_{k_J}}{V}
 
 If no extra keywords are listed, the entire equations above are
 calculated.  This includes a kinetic energy (temperature) term and the
@@ -99,21 +100,18 @@ Also note that the N in the first formula above is really
 degrees-of-freedom divided by d = dimensionality, where the DOF value
 is calculated by the temperature compute.  See the various :doc:`compute temperature <compute>` styles for details.
 
-A compute of this style with the ID of "thermo\_press" is created when
+A compute of this style with the ID of "thermo_press" is created when
 LAMMPS starts up, as if this command were in the input script:
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    compute thermo_press all pressure thermo_temp
 
-where "thermo\_temp" is the ID of a similarly defined compute of style
-"temp".  See the "thermo\_style" command for more details.
-
+where "thermo_temp" is the ID of a similarly defined compute of style
+"temp".  See the "thermo_style" command for more details.
 
 ----------
 
-
 Styles with a *gpu*\ , *intel*\ , *kk*\ , *omp*\ , or *opt* suffix are
 functionally the same as the corresponding style without the suffix.
 They have been optimized to run faster, depending on your available
@@ -132,10 +130,8 @@ by including their suffix, or you can use the :doc:`-suffix command-line switch
 See the :doc:`Speed packages <Speed_packages>` doc page for more
 instructions on how to use the accelerated styles effectively.
 
-
 ----------
 
-
 **Output info:**
 
 This compute calculates a global scalar (the pressure) and a global
@@ -160,17 +156,8 @@ Related commands
 
 **Default:** none
 
-
 ----------
 
-
 .. _Thompson1:
 
-
-
 **(Thompson)** Thompson, Plimpton, Mattson, J Chem Phys, 131, 154107 (2009).
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/compute_pressure_cylinder.rst b/doc/src/compute_pressure_cylinder.rst
index 8d5cbb7b25..104e68d533 100644
--- a/doc/src/compute_pressure_cylinder.rst
+++ b/doc/src/compute_pressure_cylinder.rst
@@ -6,7 +6,6 @@ compute pressure/cylinder command
 Syntax
 """"""
 
-
 .. parsed-literal::
 
    compute ID group-ID pressure/cylinder zlo zhi Rmax bin_width
@@ -16,13 +15,12 @@ Syntax
 * zlo = minimum z-boundary for cylinder
 * zhi = maximum z-boundary for cylinder
 * Rmax = maximum radius to perform calculation to
-* bin\_width = width of radial bins to use for calculation
+* bin_width = width of radial bins to use for calculation
 
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    compute 1 all pressure/cylinder -10.0 10.0 15.0 0.25
 
@@ -33,19 +31,19 @@ Define a computation that calculates the pressure tensor of a system in
 cylindrical coordinates, as discussed in :ref:`(Addington) <Addington1>`.
 This is useful for systems with a single axis of rotational symmetry,
 such as cylindrical micelles or carbon nanotubes. The compute splits the
-system into radial, cylindrical-shell-type bins of width bin\_width,
-centered at x=0,y=0, and calculates the radial (P\_rhorho), azimuthal
-(P\_phiphi), and axial (P\_zz) components of the configurational pressure
+system into radial, cylindrical-shell-type bins of width bin_width,
+centered at x=0,y=0, and calculates the radial (P_rhorho), azimuthal
+(P_phiphi), and axial (P_zz) components of the configurational pressure
 tensor. The local density is also calculated for each bin, so that the
-true pressure can be recovered as P\_kin+P\_conf=density\*k\*T+P\_conf.  The
+true pressure can be recovered as P_kin+P_conf=density\*k\*T+P_conf.  The
 output is a global array with 5 columns; one each for bin radius, local
-number density, P\_rhorho, P\_phiphi, and P\_zz. The number of rows is
-governed by the values of Rmax and bin\_width. Pressure tensor values are
+number density, P_rhorho, P_phiphi, and P_zz. The number of rows is
+governed by the values of Rmax and bin_width. Pressure tensor values are
 output in pressure units.
 
 **Output info:**
 
-This compute calculates a global array with 5 columns and Rmax/bin\_width
+This compute calculates a global array with 5 columns and Rmax/bin_width
 rows. The output columns are: R (distance units), number density (inverse
 volume units), configurational radial pressure (pressure units),
 configurational azimuthal pressure (pressure units), and configurational
@@ -59,7 +57,6 @@ inverse volume :doc:`units <units>`.
 Restrictions
 """"""""""""
 
-
 This compute currently calculates the pressure tensor contributions
 for pair styles only (i.e. no bond, angle, dihedral, etc. contributions
 and in the presence of bonded interactions, the result will be incorrect
@@ -67,7 +64,7 @@ due to exclusions for special bonds)  and requires pair-wise force
 calculations not available for most many-body pair styles. K-space
 calculations are also excluded. Note that this pressure compute outputs
 the configurational terms only; the kinetic contribution is not included
-and may be calculated from the number density output by P\_kin=density\*k\*T.
+and may be calculated from the number density output by P_kin=density\*k\*T.
 
 This compute is part of the USER-MISC package.  It is only enabled
 if LAMMPS was built with that package.  See the :doc:`Build package <Build_package>` doc page for more info.
@@ -80,17 +77,8 @@ Related commands
 
 **Default:** none
 
-
 ----------
 
-
 .. _Addington1:
 
-
-
 **(Addington)** Addington, Long, Gubbins, J Chem Phys, 149, 084109 (2018).
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/compute_pressure_uef.rst b/doc/src/compute_pressure_uef.rst
index 59f7608f44..07302ba46d 100644
--- a/doc/src/compute_pressure_uef.rst
+++ b/doc/src/compute_pressure_uef.rst
@@ -6,7 +6,6 @@ compute pressure/uef command
 Syntax
 """"""
 
-
 .. parsed-literal::
 
    compute ID group-ID pressure/uef temp-ID keyword ...
@@ -20,8 +19,7 @@ Syntax
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    compute 1 all pressure/uef my_temp_uef
    compute 2 all pressure/uef my_temp_uef virial
@@ -43,7 +41,6 @@ The keywords and output information are documented in
 Restrictions
 """"""""""""
 
-
 This fix is part of the USER-UEF package. It is only enabled if LAMMPS
 was built with that package. See the :doc:`Build package <Build_package>` doc page for more info.
 
@@ -63,8 +60,3 @@ Related commands
 :doc:`compute temp/uef <compute_temp_uef>`
 
 **Default:** none
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/compute_property_atom.rst b/doc/src/compute_property_atom.rst
index f78798e6f5..1643be8699 100644
--- a/doc/src/compute_property_atom.rst
+++ b/doc/src/compute_property_atom.rst
@@ -6,7 +6,6 @@ compute property/atom command
 Syntax
 """"""
 
-
 .. parsed-literal::
 
    compute ID group-ID property/atom input1 input2 ...
@@ -14,9 +13,9 @@ Syntax
 * ID, group-ID are documented in :doc:`compute <compute>` command
 * property/atom = style name of this compute command
 * input = one or more atom attributes
-  
+
   .. parsed-literal::
-  
+
        possible attributes = id, mol, proc, type, mass,
                              x, y, z, xs, ys, zs, xu, yu, zu, ix, iy, iz,
                              vx, vy, vz, fx, fy, fz,
@@ -36,9 +35,8 @@ Syntax
                              rho, drho, e, de, cv,
                              i_name, d_name
 
-  
   .. parsed-literal::
-  
+
            id = atom ID
            mol = molecule ID
            proc = ID of processor that owns atom
@@ -66,25 +64,22 @@ Syntax
            corner123x, corner123y, corner123z = corner points of triangle
            nbonds = number of bonds assigned to an atom
 
-  
   .. parsed-literal::
-  
+
            PERI package per-atom properties:
            vfrac = ???
            s0 = ???
 
-  
   .. parsed-literal::
-  
+
            USER-EFF and USER-AWPMD package per-atom properties:
            spin = electron spin
            eradius = electron radius
            ervel = electron radial velocity
            erforce = electron radial force
 
-  
   .. parsed-literal::
-  
+
            USER-SPH package per-atom properties:
            rho = ???
            drho = ???
@@ -92,20 +87,16 @@ Syntax
            de = ???
            cv = ???
 
-  
   .. parsed-literal::
-  
+
            :doc:`fix property/atom <fix_property_atom>` per-atom properties:
            i_name = custom integer vector with name
            d_name = custom integer vector with name
 
-
-
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    compute 1 all property/atom xs vx fx mux
    compute 2 all property/atom type
@@ -156,11 +147,11 @@ two atoms in the bond.  Thus a bond between atoms I,J may be tallied
 for either atom I or atom J.  If :doc:`newton bond off <newton>` is set,
 it will be tallied with both atom I and atom J.
 
-The *i\_name* and *d\_name* attributes refer to custom integer and
+The *i_name* and *d_name* attributes refer to custom integer and
 floating-point properties that have been added to each atom via the
 :doc:`fix property/atom <fix_property_atom>` command.  When that command
 is used specific names are given to each attribute which are what is
-specified as the "name" portion of *i\_name* or *d\_name*.
+specified as the "name" portion of *i_name* or *d_name*.
 
 **Output info:**
 
@@ -191,8 +182,3 @@ Related commands
 :doc:`fix property/atom <fix_property_atom>`
 
 **Default:** none
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/compute_property_chunk.rst b/doc/src/compute_property_chunk.rst
index a0832a33be..ed49833a48 100644
--- a/doc/src/compute_property_chunk.rst
+++ b/doc/src/compute_property_chunk.rst
@@ -6,7 +6,6 @@ compute property/chunk command
 Syntax
 """"""
 
-
 .. parsed-literal::
 
    compute ID group-ID property/chunk chunkID input1 input2 ...
@@ -14,21 +13,18 @@ Syntax
 * ID, group-ID are documented in :doc:`compute <compute>` command
 * property/chunk = style name of this compute command
 * input = one or more attributes
-  
+
   .. parsed-literal::
-  
+
        attributes = count, id, coord1, coord2, coord3
          count = # of atoms in chunk
          id = original chunk IDs before compression by :doc:`compute chunk/atom <compute_chunk_atom>`
          coord123 = coordinates for spatial bins calculated by :doc:`compute chunk/atom <compute_chunk_atom>`
 
-
-
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    compute 1 all property/chunk count
    compute 1 all property/chunk ID coord1
@@ -85,13 +81,12 @@ The simplest way to output the results of the compute property/chunk
 calculation to a file is to use the :doc:`fix ave/time <fix_ave_time>`
 command, for example:
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    compute cc1 all chunk/atom molecule
    compute myChunk1 all property/chunk cc1 count
    compute myChunk2 all com/chunk cc1
-   fix 1 all ave/time 100 1 100 c_myChunk1 c_myChunk2[\*] file tmp.out mode vector
+   fix 1 all ave/time 100 1 100 c_myChunk1 c_myChunk2[*] file tmp.out mode vector
 
 **Output info:**
 
@@ -122,8 +117,3 @@ Related commands
 :doc:`fix ave/chunk <fix_ave_chunk>`
 
 **Default:** none
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/compute_property_local.rst b/doc/src/compute_property_local.rst
index ff4388f989..4e29bb7fc0 100644
--- a/doc/src/compute_property_local.rst
+++ b/doc/src/compute_property_local.rst
@@ -6,7 +6,6 @@ compute property/local command
 Syntax
 """"""
 
-
 .. parsed-literal::
 
    compute ID group-ID property/local attribute1 attribute2 ... keyword args ...
@@ -14,9 +13,9 @@ Syntax
 * ID, group-ID are documented in :doc:`compute <compute>` command
 * property/local = style name of this compute command
 * one or more attributes may be appended
-  
+
   .. parsed-literal::
-  
+
        possible attributes = natom1 natom2 ntype1 ntype2
                              patom1 patom2 ptype1 ptype2
                              batom1 batom2 btype
@@ -24,9 +23,8 @@ Syntax
                              datom1 datom2 datom3 datom4 dtype
                              iatom1 iatom2 iatom3 iatom4 itype
 
-  
   .. parsed-literal::
-  
+
           natom1, natom2 = IDs of 2 atoms in each pair (within neighbor cutoff)
           ntype1, ntype2 = type of 2 atoms in each pair (within neighbor cutoff)
           patom1, patom2 = IDs of 2 atoms in each pair (within force cutoff)
@@ -42,18 +40,15 @@ Syntax
 
 * zero or more keyword/arg pairs may be appended
 * keyword = *cutoff*
-  
+
   .. parsed-literal::
-  
+
        *cutoff* arg = *type* or *radius*
 
-
-
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    compute 1 all property/local btype batom1 batom2
    compute 1 all property/local atype aatom2
@@ -172,8 +167,3 @@ Default
 """""""
 
 The keyword default is cutoff = type.
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/compute_ptm_atom.rst b/doc/src/compute_ptm_atom.rst
index e414e8d2aa..112ed1ea6a 100644
--- a/doc/src/compute_ptm_atom.rst
+++ b/doc/src/compute_ptm_atom.rst
@@ -6,24 +6,23 @@ compute ptm/atom command
 Syntax
 """"""
 
-
 .. parsed-literal::
 
-   compute ID group-ID ptm/atom structures threshold
+   compute ID group-ID ptm/atom structures threshold group2-ID
 
 * ID, group-ID are documented in :doc:`compute <compute>` command
 * ptm/atom = style name of this compute command
 * structures = structure types to search for
 * threshold = lattice distortion threshold (RMSD)
+* group2-ID determines which group is used for neighbor selection (optional, default "all")
 
 Examples
 """"""""
 
+.. code-block:: LAMMPS
 
-.. parsed-literal::
-
-   compute 1 all ptm/atom default 0.1
-   compute 1 all ptm/atom fcc-hcp-dcub-dhex 0.15
+   compute 1 all ptm/atom default 0.1 all
+   compute 1 all ptm/atom fcc-hcp-dcub-dhex 0.15 all
    compute 1 all ptm/atom all 0
 
 Description
@@ -62,8 +61,10 @@ to identify potential structure matches.  Next, the deviation is computed betwee
 local structure (in the simulation) and a template of the ideal lattice structure.
 The deviation is calculated as:
 
-.. image:: Eqs/ptm_rmsd.jpg
-   :align: center
+.. math::
+
+   \text{RMSD}(\mathbf{u}, \mathbf{v}) = \min_{s, \mathbf{Q}} \sqrt{\frac{1}{N} \sum\limits_{i=1}^{N}
+   {\left|\left| s[\vec{u_i} - \overline{\mathbf{u}}] - \mathbf{Q} \vec{v_i} \right|\right|}^2}
 
 Here, u and v contain the coordinates of the local and ideal structures respectively,
 s is a scale factor, and Q is a rotation.  The best match is identified by the
@@ -79,7 +80,9 @@ The neighbor list needed to compute this quantity is constructed each
 time the calculation is performed (e.g. each time a snapshot of atoms
 is dumped).  Thus it can be inefficient to compute/dump this quantity
 too frequently or to have multiple compute/dump commands, each with a
-*ptm/atom* style.
+*ptm/atom* style. By default the compute processes **all** neighbors
+unless the optional *group2-ID* argument is given, then only members
+of that group are considered as neighbors.
 
 **Output info:**
 
@@ -102,12 +105,12 @@ The type is a number from -1 to 8.  The rmsd is a positive real number.
 The interatomic distance is computed from the scale factor in the RMSD equation.
 The (qw,qx,qy,qz) parameters represent the orientation of the local structure
 in quaternion form.  The reference coordinates for each template (from which the
-orientation is determined) can be found in the *ptm\_constants.h* file in the PTM source directory.
+orientation is determined) can be found in the *ptm_constants.h* file in the PTM source directory.
+For atoms that are not within the compute group-ID, all values are set to zero.
 
 Restrictions
 """"""""""""
 
-
 This fix is part of the USER-PTM package.  It is only enabled if
 LAMMPS was built with that package.  See the :doc:`Build package <Build_package>` doc page for more info.
 
@@ -119,17 +122,8 @@ Related commands
 
 **Default:** none
 
-
 ----------
 
-
 .. _Larsen:
 
-
-
 **(Larsen)** Larsen, Schmidt, Schiotz, Modelling Simul Mater Sci Eng, 24, 055007 (2016).
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/compute_rdf.rst b/doc/src/compute_rdf.rst
index a11e1a1c97..0aedfe09aa 100644
--- a/doc/src/compute_rdf.rst
+++ b/doc/src/compute_rdf.rst
@@ -6,7 +6,6 @@ compute rdf command
 Syntax
 """"""
 
-
 .. parsed-literal::
 
    compute ID group-ID rdf Nbin itype1 jtype1 itype2 jtype2 ... keyword/value ...
@@ -18,25 +17,22 @@ Syntax
 * jtypeN = distribution atom type for Nth RDF histogram (see asterisk form below)
 * zero or more keyword/value pairs may be appended
 * keyword = *cutoff*
-  
+
   .. parsed-literal::
-  
+
        *cutoff* value = Rcut
          Rcut = cutoff distance for RDF computation (distance units)
 
-
-
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    compute 1 all rdf 100
    compute 1 all rdf 100 1 1
-   compute 1 all rdf 100 \* 3 cutoff 5.0
+   compute 1 all rdf 100 * 3 cutoff 5.0
    compute 1 fluid rdf 500 1 1 1 2 2 1 2 2
-   compute 1 fluid rdf 500 1\*3 2 5 \*10 cutoff 3.5
+   compute 1 fluid rdf 500 1*3 2 5 *10 cutoff 3.5
 
 Description
 """""""""""
@@ -61,7 +57,7 @@ shell of distances in 3d and a thin ring of distances in 2d.
    those pairs will not be included in the RDF. This does not apply when
    using long-range coulomb interactions (\ *coul/long*\ , *coul/msm*\ ,
    *coul/wolf* or similar.  One way to get around this would be to set
-   special\_bond scaling factors to very tiny numbers that are not exactly
+   special_bond scaling factors to very tiny numbers that are not exactly
    zero (e.g. 1.0e-50). Another workaround is to write a dump file, and
    use the :doc:`rerun <rerun>` command to compute the RDF for snapshots in
    the dump file.  The rerun script can use a
@@ -78,7 +74,7 @@ distance specified.
    Normally, you should only use the *cutoff* keyword if no pair
    style is defined, e.g. the :doc:`rerun <rerun>` command is being used to
    post-process a dump file of snapshots.  Or if you really want the RDF
-   for distances beyond the pair\_style force cutoff and cannot easily
+   for distances beyond the pair_style force cutoff and cannot easily
    post-process a dump file to calculate it.  This is because using the
    *cutoff* keyword incurs extra computation and possibly communication,
    which may slow down your simulation.  If you specify a *Rcut* <= force
@@ -151,11 +147,10 @@ The simplest way to output the results of the compute rdf calculation
 to a file is to use the :doc:`fix ave/time <fix_ave_time>` command, for
 example:
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    compute myRDF all rdf 50
-   fix 1 all ave/time 100 1 100 c_myRDF[\*] file tmp.rdf mode vector
+   fix 1 all ave/time 100 1 100 c_myRDF[*] file tmp.rdf mode vector
 
 **Output info:**
 
@@ -179,14 +174,13 @@ also numbers >= 0.0.
 Restrictions
 """"""""""""
 
-
 The RDF is not computed for distances longer than the force cutoff,
 since processors (in parallel) don't know about atom coordinates for
 atoms further away than that distance.  If you want an RDF for larger
 distances, you can use the :doc:`rerun <rerun>` command to post-process
 a dump file and set the cutoff for the potential to be longer in the
 rerun script.  Note that in the rerun context, the force cutoff is
-arbitrary, since you aren't running dynamics and thus are not changing
+arbitrary, since you are not running dynamics and thus are not changing
 your model.  The definition of g(r) used by LAMMPS is only appropriate
 for characterizing atoms that are uniformly distributed throughout the
 simulation cell. In such cases, the coordination number is still
@@ -217,8 +211,3 @@ Default
 """""""
 
 The keyword defaults are cutoff = 0.0 (use the pairwise force cutoff).
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/compute_reduce.rst b/doc/src/compute_reduce.rst
index 283c5da95d..7599343d2e 100644
--- a/doc/src/compute_reduce.rst
+++ b/doc/src/compute_reduce.rst
@@ -9,26 +9,25 @@ compute reduce/region command
 Syntax
 """"""
 
-
 .. parsed-literal::
 
    compute ID group-ID style arg mode input1 input2 ... keyword args ...
 
 * ID, group-ID are documented in :doc:`compute <compute>` command
 * style = *reduce* or *reduce/region*
-  
+
   .. parsed-literal::
-  
+
        *reduce* arg = none
        *reduce/region* arg = region-ID
          region-ID = ID of region to use for choosing atoms
 
 * mode = *sum* or *min* or *max* or *ave* or *sumsq* or *avesq*
 * one or more inputs can be listed
-* input = x, y, z, vx, vy, vz, fx, fy, fz, c\_ID, c\_ID[N], f\_ID, f\_ID[N], v\_name
-  
+* input = x, y, z, vx, vy, vz, fx, fy, fz, c_ID, c_ID[N], f_ID, f_ID[N], v_name
+
   .. parsed-literal::
-  
+
        x,y,z,vx,vy,vz,fx,fy,fz = atom attribute (position, velocity, force component)
        c_ID = per-atom or local vector calculated by a compute with ID
        c_ID[I] = Ith column of per-atom or local array calculated by a compute with ID, I can include wildcard (see below)
@@ -38,20 +37,17 @@ Syntax
 
 * zero or more keyword/args pairs may be appended
 * keyword = *replace*
-  
+
   .. parsed-literal::
-  
+
        *replace* args = vec1 vec2
          vec1 = reduced value from this input vector will be replaced
          vec2 = replace it with vec1[N] where N is index of max/min value from vec2
 
-
-
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    compute 1 all reduce sum c_force
    compute 1 all reduce/region subbox sum c_force
@@ -112,18 +108,15 @@ had been listed one by one.  E.g. these 2 compute reduce commands are
 equivalent, since the :doc:`compute stress/atom <compute_stress_atom>`
 command creates a per-atom array with 6 columns:
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    compute myPress all stress/atom NULL
-   compute 2 all reduce min c_myPress[\*]
+   compute 2 all reduce min c_myPress[*]
    compute 2 all reduce min c_myPress[1] c_myPress[2] c_myPress[3] &
                             c_myPress[4] c_myPress[5] c_myPress[6]
 
-
 ----------
 
-
 The atom attribute values (x,y,z,vx,vy,vz,fx,fy,fz) are
 self-explanatory.  Note that other atom attributes can be used as
 inputs to this fix by using the :doc:`compute property/atom <compute_property_atom>` command and then specifying
@@ -160,10 +153,8 @@ invoke other computes, fixes, or variables when they are evaluated, so
 this is a very general means of generating per-atom quantities to
 reduce.
 
-
 ----------
 
-
 If the *replace* keyword is used, two indices *vec1* and *vec2* are
 specified, where each index ranges from 1 to the # of input values.
 The replace keyword can only be used if the *mode* is *min* or *max*\ .
@@ -175,8 +166,7 @@ stored index is used to select the Nth element of the *vec1* vector.
 Thus, for example, if you wish to use this compute to find the bond
 with maximum stretch, you can do it as follows:
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    compute 1 all property/local batom1 batom2
    compute 2 all bond/local dist
@@ -191,10 +181,8 @@ information in this context, the *replace* keywords will extract the
 atom IDs for the two atoms in the bond of maximum stretch.  These atom
 IDs and the bond stretch will be printed with thermodynamic output.
 
-
 ----------
 
-
 If a single input is specified this compute produces a global scalar
 value.  If multiple inputs are specified, this compute produces a
 global vector of values, the length of which is equal to the number of
@@ -206,10 +194,8 @@ scales linearly with the number of atoms involved.  If normalized
 values are desired, this compute can be accessed by the :doc:`thermo_style custom <thermo_style>` command with :doc:`thermo_modify norm yes <thermo_modify>` set as an option.  Or it can be accessed by a
 :doc:`variable <variable>` that divides by the appropriate atom count.
 
-
 ----------
 
-
 **Output info:**
 
 This compute calculates a global scalar if a single input value is
@@ -237,8 +223,3 @@ Related commands
 :doc:`compute <compute>`, :doc:`fix <fix>`, :doc:`variable <variable>`
 
 **Default:** none
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/compute_reduce_chunk.rst b/doc/src/compute_reduce_chunk.rst
index 4f4384d91c..34619efd06 100644
--- a/doc/src/compute_reduce_chunk.rst
+++ b/doc/src/compute_reduce_chunk.rst
@@ -6,7 +6,6 @@ compute reduce/chunk command
 Syntax
 """"""
 
-
 .. parsed-literal::
 
    compute ID group-ID reduce/chunk chunkID mode input1 input2 ...
@@ -16,23 +15,20 @@ Syntax
 * chunkID = ID of :doc:`compute chunk/atom <compute_chunk_atom>` command
 * mode = *sum* or *min* or *max*
 * one or more inputs can be listed
-* input = c\_ID, c\_ID[N], f\_ID, f\_ID[N], v\_ID
-  
+* input = c_ID, c_ID[N], f_ID, f_ID[N], v_ID
+
   .. parsed-literal::
-  
+
        c_ID = per-atom vector calculated by a compute with ID
        c_ID[I] = Ith column of per-atom array calculated by a compute with ID, I can include wildcard (see below)
        f_ID = per-atom vector calculated by a fix with ID
        f_ID[I] = Ith column of per-atom array calculated by a fix with ID, I can include wildcard (see below)
        v_name = per-atom vector calculated by an atom-style variable with name
 
-
-
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    compute 1 all reduce/chunk/atom mychunk min c_cluster
 
@@ -91,17 +87,14 @@ had been listed one by one.  E.g. these 2 compute reduce/chunk
 commands are equivalent, since the :doc:`compute property/chunk <compute_property_chunk>` command creates a per-atom
 array with 3 columns:
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    compute prop all property/atom vx vy vz
-   compute 10 all reduce/chunk mychunk max c_prop[\*]
+   compute 10 all reduce/chunk mychunk max c_prop[*]
    compute 10 all reduce/chunk mychunk max c_prop[1] c_prop[2] c_prop[3]
 
-
 ----------
 
-
 Here is an example of using this compute, in conjunction with the
 compute chunk/spread/atom command to identify self-assembled micelles.
 The commands below can be added to the examples/in.micelle script.
@@ -118,8 +111,7 @@ attraction induced by the hydrophobicity.  The output of the
 chunk/reduce command will be a cluster ID per chunk (molecule).
 Molecules with the same cluster ID are in the same micelle.
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    group phobic type 4     # specific to in.micelle model
    compute cluster phobic cluster/atom 2.0
@@ -128,8 +120,7 @@ Molecules with the same cluster ID are in the same micelle.
 
 This per-chunk info could be output in at least two ways:
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    fix 10 all ave/time 1000 1 1000 c_reduce file tmp.phobic mode vector
 
@@ -147,8 +138,7 @@ The result from compute chunk/spread/atom can be used to define a new
 set of chunks, where all the atoms in all the molecules in the same
 micelle are assigned to the same chunk, i.e. one chunk per micelle.
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    compute micelle all chunk/atom c_spread compress yes
 
@@ -158,8 +148,7 @@ doc page.  E.g. count the number of atoms in each micelle, calculate
 its center or mass, shape (moments of inertia), radius of gyration,
 etc.
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    compute prop all property/chunk micelle count
    fix 20 all ave/time 1000 1 1000 c_prop file tmp.micelle mode vector
@@ -169,10 +158,8 @@ with its count of atoms, plus a first line for a chunk with all the
 solvent atoms.  By the time 50000 steps have elapsed there are a
 handful of large micelles.
 
-
 ----------
 
-
 **Output info:**
 
 This compute calculates a global vector if a single input value is
@@ -198,8 +185,3 @@ Related commands
 :doc:`compute chunk/atom <compute_chunk_atom>`, :doc:`compute reduce <compute_reduce>`, :doc:`compute chunk/spread/atom <compute_chunk_spread_atom>`
 
 **Default:** none
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/compute_rigid_local.rst b/doc/src/compute_rigid_local.rst
index 1960814e0e..4fc0f3c2dd 100644
--- a/doc/src/compute_rigid_local.rst
+++ b/doc/src/compute_rigid_local.rst
@@ -6,7 +6,6 @@ compute rigid/local command
 Syntax
 """"""
 
-
 .. parsed-literal::
 
    compute ID group-ID rigid/local rigidID input1 input2 ...
@@ -15,9 +14,9 @@ Syntax
 * rigid/local = style name of this compute command
 * rigidID = ID of fix rigid/small command or one of its variants
 * input = one or more rigid body attributes
-  
+
   .. parsed-literal::
-  
+
        possible attributes = id, mol, mass,
                              x, y, z, xu, yu, zu, ix, iy, iz
                              vx, vy, vz, fx, fy, fz,
@@ -40,13 +39,10 @@ Syntax
            tqx,tqy,tqz = torque on body
            inertiax,inertiay,inertiaz = diagonalized moments of inertia of body
 
-
-
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    compute 1 all rigid/local myRigid mol x y z
 
@@ -91,16 +87,13 @@ vector or array from one timestep to the next.
 Here is an example of how to use this compute to dump rigid body info
 to a file:
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    compute 1 all rigid/local myRigid mol x y z fx fy fz
    dump 1 all local 1000 tmp.dump index c_1[1] c_1[2] c_1[3] c_1[4] c_1[5] c_1[6] c_1[7]
 
-
 ----------
 
-
 This section explains the rigid body attributes that can be specified.
 
 The *id* attribute is the atom-ID of the atom which owns the rigid body, which is
@@ -155,10 +148,8 @@ diagonalized inertia tensor for the body, i.e the 3 moments of inertia
 for the body around its principal axes, as computed internally by
 LAMMPS.
 
-
 ----------
 
-
 **Output info:**
 
 This compute calculates a local vector or local array depending on the
@@ -188,7 +179,6 @@ corresponding attribute is in:
 Restrictions
 """"""""""""
 
-
 This compute is part of the RIGID package.  It is only enabled if
 LAMMPS was built with that package.  See the :doc:`Build package <Build_package>` doc page for more info.
 
@@ -198,8 +188,3 @@ Related commands
 :doc:`dump local <dump>`, :doc:`compute reduce <compute_reduce>`
 
 **Default:** none
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/compute_saed.rst b/doc/src/compute_saed.rst
index d42c35abcd..cad4bc1b93 100644
--- a/doc/src/compute_saed.rst
+++ b/doc/src/compute_saed.rst
@@ -6,7 +6,6 @@ compute saed command
 Syntax
 """"""
 
-
 .. parsed-literal::
 
    compute ID group-ID saed lambda type1 type2 ... typeN keyword value ...
@@ -16,10 +15,10 @@ Syntax
 * lambda = wavelength of incident radiation (length units)
 * type1 type2 ... typeN = chemical symbol of each atom type (see valid options below)
 * zero or more keyword/value pairs may be appended
-* keyword = *Kmax* or *Zone* or *dR\_Ewald* or *c* or *manual* or *echo*
-  
+* keyword = *Kmax* or *Zone* or *dR_Ewald* or *c* or *manual* or *echo*
+
   .. parsed-literal::
-  
+
        *Kmax* value = Maximum distance explored from reciprocal space origin
                       (inverse length units)
        *Zone* values = z1 z2 z3
@@ -34,13 +33,10 @@ Syntax
                   based on the values of the *c* parameters
        *echo* = flag to provide extra output for debugging purposes
 
-
-
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    compute 1 all saed 0.0251 Al O Kmax 1.70 Zone 0 0 1 dR_Ewald 0.01 c 0.5 0.5 0.5
    compute 2 all saed 0.0251 Ni Kmax 1.70 Zone 0 0 0 c 0.05 0.05 0.05 manual echo
@@ -59,14 +55,13 @@ radiation of wavelength lambda.
 The electron diffraction intensity I at each reciprocal lattice point
 is computed from the structure factor F using the equations:
 
-.. image:: Eqs/compute_saed1.jpg
-   :align: center
+.. math::
 
-.. image:: Eqs/compute_saed2.jpg
-   :align: center
+  I = & \frac{F^{*}F}{N} \\
+  F(\mathbf{k}) = & \sum_{j=1}^{N}f_j(\theta)exp(2\pi i \mathbf{k} \cdot \mathbf{r}_j)
 
-Here, K is the location of the reciprocal lattice node, rj is the
-position of each atom, fj are atomic scattering factors.
+Here, K is the location of the reciprocal lattice node, :math:`r_j` is the
+position of each atom, :math:`f_j` are atomic scattering factors.
 
 Diffraction intensities are calculated on a three-dimensional mesh of
 reciprocal lattice nodes. The mesh spacing is defined either (a)  by
@@ -95,7 +90,7 @@ unless small spacing parameters <0.05 Angstrom\^(-1) are implemented.
 Meshes with manual spacing do not require a periodic boundary.
 
 The limits of the reciprocal lattice mesh are determined by the use of
-the *Kmax*\ , *Zone*\ , and *dR\_Ewald* parameters.  The rectilinear mesh
+the *Kmax*\ , *Zone*\ , and *dR_Ewald* parameters.  The rectilinear mesh
 created about the origin of reciprocal space is terminated at the
 boundary of a sphere of radius *Kmax* centered at the origin.  If
 *Zone* parameters z1=z2=z3=0 are used, diffraction intensities are
@@ -104,7 +99,7 @@ greatly increase the cost of computation.  Otherwise, *Zone*
 parameters will denote the z1=h, z2=k, and z3=l (in a global since)
 zone axis of an intersecting Ewald sphere.  Diffraction intensities
 will only be computed at the intersection of the reciprocal lattice
-mesh and a *dR\_Ewald* thick surface of the Ewald sphere.  See the
+mesh and a *dR_Ewald* thick surface of the Ewald sphere.  See the
 example 3D intensity data and the intersection of a [010] zone axis
 in the below image.
 
@@ -119,33 +114,116 @@ for each atom type (type1 type2 ... typeN) and angle of diffraction.
 The analytic approximation is computed using the formula
 :ref:`(Brown) <Brown>`:
 
-.. image:: Eqs/compute_saed3.jpg
-   :align: center
+.. math::
+
+  f_j\left ( \frac{sin(\theta)}{\lambda} \right )=\sum_{i}^{5}
+  a_i exp\left ( -b_i \frac{sin^{2}(\theta)}{\lambda^{2}} \right )
 
 Coefficients parameterized by :ref:`(Fox) <Fox>` are assigned for each
 atom type designating the chemical symbol and charge of each atom
 type. Valid chemical symbols for compute saed are:
 
-H:       He:      Li:      Be:       B:
-C:        N:       O:       F:      Ne:
-Na:      Mg:      Al:      Si:       P:
-S:       Cl:      Ar:       K:      Ca:
-Sc:      Ti:       V:      Cr:      Mn:
-Fe:      Co:      Ni:      Cu:      Zn:
-Ga:      Ge:      As:      Se:      Br:
-Kr:      Rb:      Sr:       Y:      Zr:
-Nb:      Mo:      Tc:      Ru:      Rh:
-Pd:      Ag:      Cd:      In:      Sn:
-Sb:      Te:       I:      Xe:      Cs:
-Ba:      La:      Ce:      Pr:      Nd:
-Pm:      Sm:      Eu:      Gd:      Tb:
-Dy:      Ho:      Er:      Tm:      Yb:
-Lu:      Hf:      Ta:       W:      Re:
-Os:      Ir:      Pt:      Au:      Hg:
-Tl:      Pb:      Bi:      Po:      At:
-Rn:      Fr:      Ra:      Ac:      Th:
-Pa:       U:      Np:      Pu:      Am:
-Cm:      Bk:      Cf:tb(c=5,s=:)
+.. table_from_list::
+   :columns: 20
+
+   * H
+   * He
+   * Li
+   * Be
+   * B
+   * C
+   * N
+   * O
+   * F
+   * Ne
+   * Na
+   * Mg
+   * Al
+   * Si
+   * P
+   * S
+   * Cl
+   * Ar
+   * K
+   * Ca
+   * Sc
+   * Ti
+   * V
+   * Cr
+   * Mn
+   * Fe
+   * Co
+   * Ni
+   * Cu
+   * Zn
+   * Ga
+   * Ge
+   * As
+   * Se
+   * Br
+   * Kr
+   * Rb
+   * Sr
+   * Y
+   * Zr
+   * Nb
+   * Mo
+   * Tc
+   * Ru
+   * Rh
+   * Pd
+   * Ag
+   * Cd
+   * In
+   * Sn
+   * Sb
+   * Te
+   * I
+   * Xe
+   * Cs
+   * Ba
+   * La
+   * Ce
+   * Pr
+   * Nd
+   * Pm
+   * Sm
+   * Eu
+   * Gd
+   * Tb
+   * Dy
+   * Ho
+   * Er
+   * Tm
+   * Yb
+   * Lu
+   * Hf
+   * Ta
+   * W
+   * Re
+   * Os
+   * Ir
+   * Pt
+   * Au
+   * Hg
+   * Tl
+   * Pb
+   * Bi
+   * Po
+   * At
+   * Rn
+   * Fr
+   * Ra
+   * Ac
+   * Th
+   * Pa
+   * U
+   * Np
+   * Pu
+   * Am
+   * Cm
+   * Bk
+   * Cf
 
 If the *echo* keyword is specified, compute saed will provide extra
 reporting information to the screen.
@@ -166,49 +244,35 @@ All array values calculated by this compute are "intensive".
 Restrictions
 """"""""""""
 
-
 This compute is part of the USER-DIFFRACTION package.  It is only
 enabled if LAMMPS was built with that package.  See the :doc:`Build package <Build_package>` doc page for more info.
 
-The compute\_saed command does not work for triclinic cells.
+The compute_saed command does not work for triclinic cells.
 
 Related commands
 """"""""""""""""
 
-:doc:`fix saed\_vtk <fix_saed_vtk>`, :doc:`compute xrd <compute_xrd>`
+:doc:`fix saed_vtk <fix_saed_vtk>`, :doc:`compute xrd <compute_xrd>`
 
 Default
 """""""
 
-The option defaults are Kmax = 1.70, Zone 1 0 0, c 1 1 1, dR\_Ewald =
+The option defaults are Kmax = 1.70, Zone 1 0 0, c 1 1 1, dR_Ewald =
 0.01.
 
-
 ----------
 
-
 .. _saed-Coleman:
 
-
-
 **(Coleman)** Coleman, Spearot, Capolungo, MSMSE, 21, 055020
 (2013).
 
 .. _Brown:
 
-
-
 **(Brown)** Brown et al. International Tables for Crystallography
 Volume C: Mathematical and Chemical Tables, 554-95 (2004).
 
 .. _Fox:
 
-
-
 **(Fox)** Fox, O'Keefe, Tabbernor, Acta Crystallogr. A, 45, 786-93
 (1989).
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/compute_slice.rst b/doc/src/compute_slice.rst
index e98048b912..c8211269bc 100644
--- a/doc/src/compute_slice.rst
+++ b/doc/src/compute_slice.rst
@@ -6,7 +6,6 @@ compute slice command
 Syntax
 """"""
 
-
 .. parsed-literal::
 
    compute ID group-ID slice Nstart Nstop Nskip input1 input2 ...
@@ -16,23 +15,20 @@ Syntax
 * Nstart = starting index within input vector(s)
 * Nstop = stopping index within input vector(s)
 * Nskip = extract every Nskip elements from input vector(s)
-* input = c\_ID, c\_ID[N], f\_ID, f\_ID[N]
-  
+* input = c_ID, c_ID[N], f_ID, f_ID[N]
+
   .. parsed-literal::
-  
+
        c_ID = global vector calculated by a compute with ID
        c_ID[I] = Ith column of global array calculated by a compute with ID
        f_ID = global vector calculated by a fix with ID
        f_ID[I] = Ith column of global array calculated by a fix with ID
        v_name = vector calculated by an vector-style variable with name
 
-
-
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    compute 1 all slice 1 100 10 c_msdmol[4]
    compute 1 all slice 301 400 1 c_msdmol[4] v_myVec
@@ -91,10 +87,8 @@ even if the length of the vector is 1.  If multiple inputs are
 specified, then a global array of values is produced, with the number
 of columns equal to the number of inputs specified.
 
-
 ----------
 
-
 **Output info:**
 
 This compute calculates a global vector if a single input value is
@@ -130,8 +124,3 @@ Related commands
 :doc:`compute <compute>`, :doc:`fix <fix>`, :doc:`compute reduce <compute_reduce>`
 
 **Default:** none
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/compute_smd_contact_radius.rst b/doc/src/compute_smd_contact_radius.rst
index 82cb381692..01c543af38 100644
--- a/doc/src/compute_smd_contact_radius.rst
+++ b/doc/src/compute_smd_contact_radius.rst
@@ -6,7 +6,6 @@ compute smd/contact/radius command
 Syntax
 """"""
 
-
 .. parsed-literal::
 
    compute ID group-ID smd/contact/radius
@@ -17,8 +16,7 @@ Syntax
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    compute 1 all smd/contact/radius
 
@@ -29,7 +27,7 @@ Define a computation which outputs the contact radius, i.e., the
 radius used to prevent particles from penetrating each other.  The
 contact radius is used only to prevent particles belonging to
 different physical bodies from penetrating each other. It is used by
-the contact pair styles, e.g., smd/hertz and smd/tri\_surface.
+the contact pair styles, e.g., smd/hertz and smd/tri_surface.
 
 See `this PDF guide <PDF/SMD_LAMMPS_userguide.pdf>`_ to using Smooth
 Mach Dynamics in LAMMPS.
@@ -49,18 +47,12 @@ The per-particle vector values will be in distance :doc:`units <units>`.
 Restrictions
 """"""""""""
 
-
 This compute is part of the USER-SMD package.  It is only enabled if
 LAMMPS was built with that package.  See the :doc:`Build package <Build_package>` doc page for more info.
 
 Related commands
 """"""""""""""""
 
-:doc:`dump custom <dump>` smd/hertz smd/tri\_surface
+:doc:`dump custom <dump>` smd/hertz smd/tri_surface
 
 **Default:** none
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/compute_smd_damage.rst b/doc/src/compute_smd_damage.rst
index d828888b47..3f02ac5c74 100644
--- a/doc/src/compute_smd_damage.rst
+++ b/doc/src/compute_smd_damage.rst
@@ -6,7 +6,6 @@ compute smd/damage command
 Syntax
 """"""
 
-
 .. parsed-literal::
 
    compute ID group-ID smd/damage
@@ -17,8 +16,7 @@ Syntax
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    compute 1 all smd/damage
 
@@ -42,18 +40,12 @@ The per-particle values are dimensionless an in the range of zero to one.
 Restrictions
 """"""""""""
 
-
 This compute is part of the USER-SMD package.  It is only enabled if
 LAMMPS was built with that package.  See the "Build
 
 Related commands
 """"""""""""""""
 
-:doc:`smd/plastic\_strain <compute_smd_plastic_strain>`, :doc:`smd/tlsph\_stress <compute_smd_tlsph_stress>`
+:doc:`smd/plastic_strain <compute_smd_plastic_strain>`, :doc:`smd/tlsph_stress <compute_smd_tlsph_stress>`
 
 **Default:** none
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/compute_smd_hourglass_error.rst b/doc/src/compute_smd_hourglass_error.rst
index e8ea6573c1..56b8a81c01 100644
--- a/doc/src/compute_smd_hourglass_error.rst
+++ b/doc/src/compute_smd_hourglass_error.rst
@@ -6,7 +6,6 @@ compute smd/hourglass/error command
 Syntax
 """"""
 
-
 .. parsed-literal::
 
    compute ID group-ID smd/hourglass/error
@@ -17,8 +16,7 @@ Syntax
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    compute 1 all smd/hourglass/error
 
@@ -52,7 +50,6 @@ The per-particle vector values will are dimensionless. See
 Restrictions
 """"""""""""
 
-
 This compute is part of the USER-SMD package.  It is only enabled if
 LAMMPS was built with that package.  See the :doc:`Build package <Build_package>` doc page for more info.
 
@@ -61,12 +58,7 @@ tlsph pair style.
 
 **Related Commands:**
 
-:doc:`smd/tlsph\_defgrad <compute_smd_tlsph_defgrad>`
+:doc:`smd/tlsph_defgrad <compute_smd_tlsph_defgrad>`
 
 Default
 """""""
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/compute_smd_internal_energy.rst b/doc/src/compute_smd_internal_energy.rst
index b04494a415..7613d5bb3e 100644
--- a/doc/src/compute_smd_internal_energy.rst
+++ b/doc/src/compute_smd_internal_energy.rst
@@ -6,7 +6,6 @@ compute smd/internal/energy command
 Syntax
 """"""
 
-
 .. parsed-literal::
 
    compute ID group-ID smd/internal/energy
@@ -17,8 +16,7 @@ Syntax
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    compute 1 all smd/internal/energy
 
@@ -43,7 +41,6 @@ The per-particle vector values will be given in :doc:`units <units>` of energy.
 Restrictions
 """"""""""""
 
-
 This compute is part of the USER-SMD package.  It is only enabled if
 LAMMPS was built with that package.  See the :doc:`Build package <Build_package>` doc page for more info. This compute can
 only be used for particles which interact via the updated Lagrangian
@@ -53,8 +50,3 @@ or total Lagrangian SPH pair styles.
 
 Default
 """""""
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/compute_smd_plastic_strain.rst b/doc/src/compute_smd_plastic_strain.rst
index 8f27b039ca..772169310f 100644
--- a/doc/src/compute_smd_plastic_strain.rst
+++ b/doc/src/compute_smd_plastic_strain.rst
@@ -6,7 +6,6 @@ compute smd/plastic/strain command
 Syntax
 """"""
 
-
 .. parsed-literal::
 
    compute ID group-ID smd/plastic/strain
@@ -17,8 +16,7 @@ Syntax
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    compute 1 all smd/plastic/strain
 
@@ -44,7 +42,6 @@ The per-particle values will be given dimensionless. See :doc:`units <units>`.
 Restrictions
 """"""""""""
 
-
 This compute is part of the USER-SMD package.  It is only enabled if
 LAMMPS was built with that package.  See the :doc:`Build package <Build_package>` doc page for more info. This compute can
 only be used for particles which interact via the updated Lagrangian
@@ -58,8 +55,3 @@ Related commands
 :doc:`smd/tlsph/strain <compute_smd_tlsph_strain>`
 
 **Default:** none
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/compute_smd_plastic_strain_rate.rst b/doc/src/compute_smd_plastic_strain_rate.rst
index bf1b8a8530..7b0480a211 100644
--- a/doc/src/compute_smd_plastic_strain_rate.rst
+++ b/doc/src/compute_smd_plastic_strain_rate.rst
@@ -6,7 +6,6 @@ compute smd/plastic/strain/rate command
 Syntax
 """"""
 
-
 .. parsed-literal::
 
    compute ID group-ID smd/plastic/strain/rate
@@ -17,8 +16,7 @@ Syntax
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    compute 1 all smd/plastic/strain/rate
 
@@ -44,7 +42,6 @@ The per-particle values will be given in :doc:`units <units>` of one over time.
 Restrictions
 """"""""""""
 
-
 This compute is part of the USER-SMD package.  It is only enabled if
 LAMMPS was built with that package.  See the :doc:`Build package <Build_package>` doc page for more info. This compute can
 only be used for particles which interact via the updated Lagrangian
@@ -58,8 +55,3 @@ Related commands
 :doc:`smd/tlsph/strain <compute_smd_tlsph_strain>`
 
 **Default:** none
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/compute_smd_rho.rst b/doc/src/compute_smd_rho.rst
index f3c2e1cc47..50c74b8c26 100644
--- a/doc/src/compute_smd_rho.rst
+++ b/doc/src/compute_smd_rho.rst
@@ -6,7 +6,6 @@ compute smd/rho command
 Syntax
 """"""
 
-
 .. parsed-literal::
 
    compute ID group-ID smd/rho
@@ -17,8 +16,7 @@ Syntax
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    compute 1 all smd/rho
 
@@ -45,7 +43,6 @@ The per-particle values will be in :doc:`units <units>` of mass over volume.
 Restrictions
 """"""""""""
 
-
 This compute is part of the USER-SMD package. It is only enabled if
 LAMMPS was built with that package. See the :doc:`Build package <Build_package>` doc page for more info.
 
@@ -55,8 +52,3 @@ Related commands
 :doc:`compute smd/vol <compute_smd_vol>`
 
 **Default:** none
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/compute_smd_tlsph_defgrad.rst b/doc/src/compute_smd_tlsph_defgrad.rst
index ddff4ba4c2..c599b82709 100644
--- a/doc/src/compute_smd_tlsph_defgrad.rst
+++ b/doc/src/compute_smd_tlsph_defgrad.rst
@@ -6,7 +6,6 @@ compute smd/tlsph/defgrad command
 Syntax
 """"""
 
-
 .. parsed-literal::
 
    compute ID group-ID smd/tlsph/defgrad
@@ -17,8 +16,7 @@ Syntax
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    compute 1 all smd/tlsph/defgrad
 
@@ -48,7 +46,6 @@ entry is the determinant of the deformation gradient.
 Restrictions
 """"""""""""
 
-
 This compute is part of the USER-SMD package.  It is only enabled if
 LAMMPS was built with that package. See the :doc:`Build package <Build_package>` doc page for more info. TThis compute can
 only be used for particles which interact via the total Lagrangian SPH
@@ -60,8 +57,3 @@ Related commands
 :doc:`smd/hourglass/error <compute_smd_hourglass_error>`
 
 **Default:** none
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/compute_smd_tlsph_dt.rst b/doc/src/compute_smd_tlsph_dt.rst
index 5a4f35e8b0..7835f0642d 100644
--- a/doc/src/compute_smd_tlsph_dt.rst
+++ b/doc/src/compute_smd_tlsph_dt.rst
@@ -6,7 +6,6 @@ compute smd/tlsph/dt command
 Syntax
 """"""
 
-
 .. parsed-literal::
 
    compute ID group-ID smd/tlsph/dt
@@ -17,8 +16,7 @@ Syntax
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    compute 1 all smd/tlsph/dt
 
@@ -49,7 +47,6 @@ The per-particle values will be given in :doc:`units <units>` of time.
 Restrictions
 """"""""""""
 
-
 This compute is part of the USER-SMD package.  It is only enabled if
 LAMMPS was built with that package.  See the :doc:`Build package <Build_package>` doc page for more info.
 
@@ -62,8 +59,3 @@ Related commands
 :doc:`smd/adjust/dt <fix_smd_adjust_dt>`
 
 **Default:** none
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/compute_smd_tlsph_num_neighs.rst b/doc/src/compute_smd_tlsph_num_neighs.rst
index cfa122aae6..202f1640d6 100644
--- a/doc/src/compute_smd_tlsph_num_neighs.rst
+++ b/doc/src/compute_smd_tlsph_num_neighs.rst
@@ -6,7 +6,6 @@ compute smd/tlsph/num/neighs command
 Syntax
 """"""
 
-
 .. parsed-literal::
 
    compute ID group-ID smd/tlsph/num/neighs
@@ -17,8 +16,7 @@ Syntax
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    compute 1 all smd/tlsph/num/neighs
 
@@ -44,7 +42,6 @@ The per-particle values are dimensionless. See :doc:`units <units>`.
 Restrictions
 """"""""""""
 
-
 This compute is part of the USER-SMD package.  It is only enabled if
 LAMMPS was built with that package.  See the :doc:`Build package <Build_package>` doc page for more info.
 
@@ -57,8 +54,3 @@ Related commands
 :doc:`smd/ulsph/num/neighs <compute_smd_ulsph_num_neighs>`
 
 **Default:** none
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/compute_smd_tlsph_shape.rst b/doc/src/compute_smd_tlsph_shape.rst
index 0161e5e6e5..f4ed10a232 100644
--- a/doc/src/compute_smd_tlsph_shape.rst
+++ b/doc/src/compute_smd_tlsph_shape.rst
@@ -6,7 +6,6 @@ compute smd/tlsph/shape command
 Syntax
 """"""
 
-
 .. parsed-literal::
 
    compute ID group-ID smd/tlsph/shape
@@ -17,8 +16,7 @@ Syntax
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    compute 1 all smd/tlsph/shape
 
@@ -51,7 +49,6 @@ particle relative to its initial state.
 Restrictions
 """"""""""""
 
-
 This compute is part of the USER-SMD package.  It is only enabled if
 LAMMPS was built with that package. See the :doc:`Build package <Build_package>` doc page for more info.
 
@@ -64,8 +61,3 @@ Related commands
 :doc:`smd/contact/radius <compute_smd_contact_radius>`
 
 **Default:** none
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/compute_smd_tlsph_strain.rst b/doc/src/compute_smd_tlsph_strain.rst
index 965d69a938..24c5937462 100644
--- a/doc/src/compute_smd_tlsph_strain.rst
+++ b/doc/src/compute_smd_tlsph_strain.rst
@@ -6,7 +6,6 @@ compute smd/tlsph/strain command
 Syntax
 """"""
 
-
 .. parsed-literal::
 
    compute ID group-ID smd/tlsph/strain
@@ -17,8 +16,7 @@ Syntax
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    compute 1 all smd/tlsph/strain
 
@@ -47,7 +45,6 @@ zz, xy, xz, yz components of the symmetric strain tensor.
 Restrictions
 """"""""""""
 
-
 This compute is part of the USER-SMD package.  It is only enabled if
 LAMMPS was built with that package.  See the :doc:`Build package <Build_package>` doc page for more info.
 
@@ -61,8 +58,3 @@ Related commands
 :doc:`smd/tlsph/stress <compute_smd_tlsph_stress>`
 
 **Default:** none
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/compute_smd_tlsph_strain_rate.rst b/doc/src/compute_smd_tlsph_strain_rate.rst
index 554706382a..0eb68432c1 100644
--- a/doc/src/compute_smd_tlsph_strain_rate.rst
+++ b/doc/src/compute_smd_tlsph_strain_rate.rst
@@ -6,7 +6,6 @@ compute smd/tlsph/strain/rate command
 Syntax
 """"""
 
-
 .. parsed-literal::
 
    compute ID group-ID smd/tlsph/strain/rate
@@ -17,8 +16,7 @@ Syntax
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    compute 1 all smd/tlsph/strain/rate
 
@@ -46,7 +44,6 @@ zz, xy, xz, yz components of the symmetric strain rate tensor.
 Restrictions
 """"""""""""
 
-
 This compute is part of the USER-SMD package.  It is only enabled if
 LAMMPS was built with that package.  See the :doc:`Build package <Build_package>` doc page for more info.
 
@@ -59,8 +56,3 @@ Related commands
 :doc:`compute smd/tlsph/strain <compute_smd_tlsph_strain>`, :doc:`compute smd/tlsph/stress <compute_smd_tlsph_stress>`
 
 **Default:** none
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/compute_smd_tlsph_stress.rst b/doc/src/compute_smd_tlsph_stress.rst
index db26b6b6b7..10d01ea9c0 100644
--- a/doc/src/compute_smd_tlsph_stress.rst
+++ b/doc/src/compute_smd_tlsph_stress.rst
@@ -6,7 +6,6 @@ compute smd/tlsph/stress command
 Syntax
 """"""
 
-
 .. parsed-literal::
 
    compute ID group-ID smd/tlsph/stress
@@ -17,8 +16,7 @@ Syntax
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    compute 1 all smd/tlsph/stress
 
@@ -48,7 +46,6 @@ invariant of the stress tensor, i.e., the von Mises equivalent stress.
 Restrictions
 """"""""""""
 
-
 This compute is part of the USER-SMD package.  It is only enabled if
 LAMMPS was built with that package.  See the :doc:`Build package <Build_package>` doc page for more info.
 
@@ -61,8 +58,3 @@ Related commands
 :doc:`compute smd/tlsph/strain <compute_smd_tlsph_strain>`, :doc:`cmopute smd/tlsph/strain/rate <compute_smd_tlsph_strain_rate>`
 
 **Default:** none
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/compute_smd_triangle_vertices.rst b/doc/src/compute_smd_triangle_vertices.rst
index 61bd5ed97c..ad33df3ef8 100644
--- a/doc/src/compute_smd_triangle_vertices.rst
+++ b/doc/src/compute_smd_triangle_vertices.rst
@@ -6,7 +6,6 @@ compute smd/triangle/vertices command
 Syntax
 """"""
 
-
 .. parsed-literal::
 
    compute ID group-ID smd/triangle/vertices
@@ -17,8 +16,7 @@ Syntax
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    compute 1 all smd/triangle/mesh/vertices
 
@@ -26,7 +24,7 @@ Description
 """""""""""
 
 Define a computation that returns the coordinates of the vertices
-corresponding to the triangle-elements of a mesh created by the :doc:`fix smd/wall\_surface <fix_smd_wall_surface>`.
+corresponding to the triangle-elements of a mesh created by the :doc:`fix smd/wall_surface <fix_smd_wall_surface>`.
 
 See `this PDF guide <PDF/SMD_LAMMPS_userguide.pdf>`_ to using Smooth
 Mach Dynamics in LAMMPS.
@@ -43,10 +41,10 @@ The per-particle vector has nine entries, (x1/y1/z1), (x2/y2/z2), and
 each triangle.
 
 It is only meaningful to use this compute for a group of particles
-which is created via the :doc:`fix smd/wall\_surface <fix_smd_wall_surface>` command.
+which is created via the :doc:`fix smd/wall_surface <fix_smd_wall_surface>` command.
 
-The output of this compute can be used with the dump2vtk\_tris tool to
-generate a VTK representation of the smd/wall\_surface mesh for
+The output of this compute can be used with the dump2vtk_tris tool to
+generate a VTK representation of the smd/wall_surface mesh for
 visualization purposes.
 
 The values will be given in :doc:`units <units>` of distance.
@@ -54,7 +52,6 @@ The values will be given in :doc:`units <units>` of distance.
 Restrictions
 """"""""""""
 
-
 This compute is part of the USER-SMD package.  It is only enabled if
 LAMMPS was built with that package.  See the :doc:`Build package <Build_package>` doc page for more info.
 
@@ -62,11 +59,6 @@ Related commands
 """"""""""""""""
 
 :doc:`fix smd/move/tri/surf <fix_smd_move_triangulated_surface>`,
-:doc:`fix smd/wall\_surface <fix_smd_wall_surface>`
+:doc:`fix smd/wall_surface <fix_smd_wall_surface>`
 
 **Default:** none
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/compute_smd_ulsph_num_neighs.rst b/doc/src/compute_smd_ulsph_num_neighs.rst
index fc98d03777..70824fc517 100644
--- a/doc/src/compute_smd_ulsph_num_neighs.rst
+++ b/doc/src/compute_smd_ulsph_num_neighs.rst
@@ -6,8 +6,7 @@ compute smd/ulsph/num/neighs command
 Syntax
 """"""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    compute ID group-ID smd/ulsph/num/neighs
 
@@ -17,8 +16,7 @@ Syntax
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    compute 1 all smd/ulsph/num/neighs
 
@@ -44,7 +42,6 @@ The per-particle values will be given dimensionless, see :doc:`units <units>`.
 Restrictions
 """"""""""""
 
-
 This compute is part of the USER-SMD package.  It is only enabled if
 LAMMPS was built with that package.  See the :doc:`Build package <Build_package>` doc page for more info.  This compute can
 only be used for particles which interact with the updated Lagrangian
@@ -56,8 +53,3 @@ Related commands
 :doc:`compute smd/tlsph/num/neighs <compute_smd_tlsph_num_neighs>`
 
 **Default:** none
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/compute_smd_ulsph_strain.rst b/doc/src/compute_smd_ulsph_strain.rst
index 53a14e85fe..dbf6751bf7 100644
--- a/doc/src/compute_smd_ulsph_strain.rst
+++ b/doc/src/compute_smd_ulsph_strain.rst
@@ -6,8 +6,7 @@ compute smd/ulsph/strain command
 Syntax
 """"""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    compute ID group-ID smd/ulsph/strain
 
@@ -17,8 +16,7 @@ Syntax
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    compute 1 all smd/ulsph/strain
 
@@ -47,7 +45,6 @@ The per-particle tensor values will be given dimensionless, see
 Restrictions
 """"""""""""
 
-
 This compute is part of the USER-SMD package.  It is only enabled if
 LAMMPS was built with that package. See the :doc:`Build package <Build_package>` doc page for more info. This compute can
 only be used for particles which interact with the updated Lagrangian
@@ -59,8 +56,3 @@ Related commands
 :doc:`compute smd/tlsph/strain <compute_smd_tlsph_strain>`
 
 **Default:** none
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/compute_smd_ulsph_strain_rate.rst b/doc/src/compute_smd_ulsph_strain_rate.rst
index 0b8c6af19f..7f911e9332 100644
--- a/doc/src/compute_smd_ulsph_strain_rate.rst
+++ b/doc/src/compute_smd_ulsph_strain_rate.rst
@@ -6,8 +6,7 @@ compute smd/ulsph/strain/rate command
 Syntax
 """"""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    compute ID group-ID smd/ulsph/strain/rate
 
@@ -17,8 +16,7 @@ Syntax
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    compute 1 all smd/ulsph/strain/rate
 
@@ -47,7 +45,6 @@ zz, xy, xz, yz components of the symmetric strain rate tensor.
 Restrictions
 """"""""""""
 
-
 This compute is part of the USER-SMD package.  It is only enabled if
 LAMMPS was built with that package.  See the :doc:`Build package <Build_package>` doc page for more info.
 
@@ -60,8 +57,3 @@ Related commands
 :doc:`compute smd/tlsph/strain/rate <compute_smd_tlsph_strain_rate>`
 
 **Default:** none
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/compute_smd_ulsph_stress.rst b/doc/src/compute_smd_ulsph_stress.rst
index d3e3211250..c74b37508a 100644
--- a/doc/src/compute_smd_ulsph_stress.rst
+++ b/doc/src/compute_smd_ulsph_stress.rst
@@ -6,8 +6,7 @@ compute smd/ulsph/stress command
 Syntax
 """"""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    compute ID group-ID smd/ulsph/stress
 
@@ -17,8 +16,7 @@ Syntax
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    compute 1 all smd/ulsph/stress
 
@@ -47,7 +45,6 @@ stress tensor, i.e., the von Mises equivalent stress.
 Restrictions
 """"""""""""
 
-
 This compute is part of the USER-SMD package.  It is only enabled if
 LAMMPS was built with that package. See the :doc:`Build package <Build_package>` doc page for more info. This compute can
 only be used for particles which interact with the updated Lagrangian
@@ -59,8 +56,3 @@ Related commands
 :doc:`compute smd/ulsph/strain <compute_smd_ulsph_strain>`, :doc:`compute smd/ulsph/strain/rate <compute_smd_ulsph_strain_rate>` :doc:`compute smd/tlsph/stress <compute_smd_tlsph_stress>`
 
 **Default:** none
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/compute_smd_vol.rst b/doc/src/compute_smd_vol.rst
index a1b553ae6b..abcc6fca22 100644
--- a/doc/src/compute_smd_vol.rst
+++ b/doc/src/compute_smd_vol.rst
@@ -6,7 +6,6 @@ compute smd/vol command
 Syntax
 """"""
 
-
 .. parsed-literal::
 
    compute ID group-ID smd/vol
@@ -17,8 +16,7 @@ Syntax
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    compute 1 all smd/vol
 
@@ -47,7 +45,6 @@ per-particle volumes of the group for which the fix is defined.
 Restrictions
 """"""""""""
 
-
 This compute is part of the USER-SMD package.  It is only enabled if
 LAMMPS was built with that package. See the :doc:`Build package <Build_package>` doc page for more info.
 
@@ -57,8 +54,3 @@ Related commands
 :doc:`compute smd/rho <compute_smd_rho>`
 
 **Default:** none
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/compute_sna_atom.rst b/doc/src/compute_sna_atom.rst
index 2bcd983237..83e28b913b 100644
--- a/doc/src/compute_sna_atom.rst
+++ b/doc/src/compute_sna_atom.rst
@@ -15,12 +15,11 @@ compute snap command
 Syntax
 """"""
 
-
 .. parsed-literal::
 
    compute ID group-ID sna/atom rcutfac rfac0 twojmax R_1 R_2 ... w_1 w_2 ... keyword values ...
    compute ID group-ID snad/atom rcutfac rfac0 twojmax R_1 R_2 ... w_1 w_2 ... keyword values ...
-   compute ID group-ID snav/atom rcutfac rfac0 twojmax R_1 R_2 ... w_1 w_2 ... keyword values ... 
+   compute ID group-ID snav/atom rcutfac rfac0 twojmax R_1 R_2 ... w_1 w_2 ... keyword values ...
    compute ID group-ID snap rcutfac rfac0 twojmax R_1 R_2 ... w_1 w_2 ... keyword values ...
 
 * ID, group-ID are documented in :doc:`compute <compute>` command
@@ -28,13 +27,13 @@ Syntax
 * rcutfac = scale factor applied to all cutoff radii (positive real)
 * rfac0 = parameter in distance to angle conversion (0 < rcutfac < 1)
 * twojmax = band limit for bispectrum components (non-negative integer)
-* R\_1, R\_2,... = list of cutoff radii, one for each type (distance units)
-* w\_1, w\_2,... = list of neighbor weights, one for each type
+* R_1, R_2,... = list of cutoff radii, one for each type (distance units)
+* w_1, w_2,... = list of neighbor weights, one for each type
 * zero or more keyword/value pairs may be appended
 * keyword = *rmin0* or *switchflag* or *bzeroflag* or *quadraticflag*
-  
+
   .. parsed-literal::
-  
+
        *rmin0* value = parameter in distance to angle conversion (distance units)
        *switchflag* value = *0* or *1*
           *0* = do not use switching function
@@ -46,13 +45,10 @@ Syntax
           *0* = do not generate quadratic terms
           *1* = generate quadratic terms
 
-
-
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    compute b all sna/atom 1.4 0.99363 6 2.0 2.4 0.75 1.0 rmin0 0.0
    compute db all sna/atom 1.4 0.95 6 2.0 1.0
@@ -65,8 +61,8 @@ Description
 Define a computation that calculates a set of quantities related to the
 bispectrum components of the atoms in a group. These computes are
 used primarily for calculating the dependence of energy, force, and
-stress components on the linear coefficients in the 
-:doc:`snap pair\_style <pair_snap>`, which is useful when training a
+stress components on the linear coefficients in the
+:doc:`snap pair_style <pair_snap>`, which is useful when training a
 SNAP potential to match target data.
 
 Bispectrum components of an atom are order parameters characterizing
@@ -75,23 +71,24 @@ mathematical definition is given in the paper by Thompson et
 al. :ref:`(Thompson) <Thompson20141>`
 
 The position of a neighbor atom *i'* relative to a central atom *i* is
-a point within the 3D ball of radius *R\_ii' = rcutfac\*(R\_i + R\_i')*
+a point within the 3D ball of radius *R_ii' = rcutfac\*(R_i + R_i')*
 
 Bartok et al. :ref:`(Bartok) <Bartok20101>`, proposed mapping this 3D ball
 onto the 3-sphere, the surface of the unit ball in a four-dimensional
-space.  The radial distance *r* within *R\_ii'* is mapped on to a third
+space.  The radial distance *r* within *R_ii'* is mapped on to a third
 polar angle *theta0* defined by,
 
-.. image:: Eqs/compute_sna_atom1.jpg
-   :align: center
+.. math::
+
+  \theta_0 = {\tt rfac0} \frac{r-r_{min0}}{R_{ii'}-r_{min0}} \pi
 
 In this way, all possible neighbor positions are mapped on to a subset
 of the 3-sphere.  Points south of the latitude *theta0max=rfac0\*Pi*
 are excluded.
 
 The natural basis for functions on the 3-sphere is formed by the 4D
-hyperspherical harmonics *U\^j\_m,m'(theta, phi, theta0).*  These
-functions are better known as *D\^j\_m,m',* the elements of the Wigner
+hyperspherical harmonics *U\^j_m,m'(theta, phi, theta0).*  These
+functions are better known as *D\^j_m,m',* the elements of the Wigner
 *D*\ -matrices :ref:`(Meremianin <Meremianin2006>`,
 :ref:`Varshalovich) <Varshalovich1987>`.
 
@@ -101,28 +98,37 @@ radial distance. Expanding this density function as a generalized
 Fourier series in the basis functions, we can write each Fourier
 coefficient as
 
-.. image:: Eqs/compute_sna_atom2.jpg
-   :align: center
+.. math::
 
-The *w\_i'* neighbor weights are dimensionless numbers that are chosen
+  u^j_{m,m'} = U^j_{m,m'}(0,0,0) + \sum_{r_{ii'} < R_{ii'}}{f_c(r_{ii'}) w_{i'} U^j_{m,m'}(\theta_0,\theta,\phi)}
+
+The *w_i'* neighbor weights are dimensionless numbers that are chosen
 to distinguish atoms of different types, while the central atom is
 arbitrarily assigned a unit weight.  The function *fc(r)* ensures that
 the contribution of each neighbor atom goes smoothly to zero at
-*R\_ii'*:
+*R_ii'*:
 
-.. image:: Eqs/compute_sna_atom4.jpg
-   :align: center
+.. math::
 
-The expansion coefficients *u\^j\_m,m'* are complex-valued and they are
+  f_c(r)   = & \frac{1}{2}(\cos(\pi \frac{r-r_{min0}}{R_{ii'}-r_{min0}}) + 1), r \leq R_{ii'} \\
+           = & 0,  r > R_{ii'}
+
+The expansion coefficients *u\^j_m,m'* are complex-valued and they are
 not directly useful as descriptors, because they are not invariant
 under rotation of the polar coordinate frame. However, the following
 scalar triple products of expansion coefficients can be shown to be
 real-valued and invariant under rotation :ref:`(Bartok) <Bartok20101>`.
 
-.. image:: Eqs/compute_sna_atom3.jpg
-   :align: center
+.. math::
 
-The constants *H\^jmm'\_j1m1m1'\_j2m2m2'* are coupling coefficients,
+   B_{j_1,j_2,j}  =
+   \sum_{m_1,m'_1=-j_1}^{j_1}\sum_{m_2,m'_2=-j_2}^{j_2}\sum_{m,m'=-j}^{j} (u^j_{m,m'})^*
+   H {\scriptscriptstyle \begin{array}{l} {j} {m} {m'} \\
+        {j_1} {m_1} {m'_1} \\
+        {j_2} {m_2} {m'_2} \end{array}}
+        u^{j_1}_{m_1,m'_1} u^{j_2}_{m_2,m'_2}
+
+The constants *H\^jmm'_j1m1m1'_j2m2m2'* are coupling coefficients,
 analogous to Clebsch-Gordan coefficients for rotations on the
 2-sphere. These invariants are the components of the bispectrum and
 these are the quantities calculated by the compute *sna/atom*\ . They
@@ -138,8 +144,9 @@ atom.
 Compute *snad/atom* calculates the derivative of the bispectrum components
 summed separately for each atom type:
 
-.. image:: Eqs/compute_sna_atom5.jpg
-   :align: center
+.. math::
+
+   -\sum_{i' \in I} \frac{\partial {B^{i'}_{j_1,j_2,j}  }}{\partial {\bf r}_i}
 
 The sum is over all atoms *i'* of atom type *I*\ .  For each atom *i*\ ,
 this compute evaluates the above expression for each direction, each
@@ -149,8 +156,9 @@ for a detailed explanation.
 Compute *snav/atom* calculates the virial contribution due to the
 derivatives:
 
-.. image:: Eqs/compute_sna_atom6.jpg
-   :align: center
+.. math::
+
+  -{\bf r}_i \otimes \sum_{i' \in I} \frac{\partial {B^{i'}_{j_1,j_2,j}}}{\partial {\bf r}_i}
 
 Again, the sum is over all atoms *i'* of atom type *I*\ .  For each atom
 *i*\ , this compute evaluates the above expression for each of the six
@@ -159,7 +167,7 @@ section below on output for a detailed explanation.
 
 Compute *snap* calculates a global array contains information related
 to all three of the above per-atom computes *sna/atom*\ , *snad/atom*\ ,
-and *snav/atom*\ . The first row of the array contains the summation of 
+and *snav/atom*\ . The first row of the array contains the summation of
 *sna/atom* over all atoms, but broken out by type. The last six rows
 of the array contain the summation of *snav/atom* over all atoms, broken
 out by type. In between these are 3\*\ *N* rows containing the same values
@@ -168,13 +176,12 @@ broken out by type). The element in the last column of each row contains
 the potential energy, force, or stress, according to the row.
 These quantities correspond to the user-specified reference potential
 that must be subtracted from the target data when fitting SNAP.
-The potential energy calculation uses the built in compute *thermo\_pe*.
-The stress calculation uses a compute called *snap\_press* that is
+The potential energy calculation uses the built in compute *thermo_pe*.
+The stress calculation uses a compute called *snap_press* that is
 automatically created behind the scenes, according to the following
 command:
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    compute snap_press all pressure NULL virial
 
@@ -233,7 +240,7 @@ ordered in which they are listed.
    file.  The rerun script can use a :doc:`special_bonds <special_bonds>`
    command that includes all pairs in the neighbor list.
 
-;line
+----------
 
 **Output info:**
 
@@ -243,7 +250,6 @@ of columns and the identity of the bispectrum component contained in
 each column depend of the value of *twojmax*\ , as
 described by the following piece of python code:
 
-
 .. parsed-literal::
 
    for j1 in range(0,twojmax+1):
@@ -272,12 +278,12 @@ block contains six sub-blocks corresponding to the *xx*\ , *yy*\ , *zz*\ ,
 notation.  Each of these sub-blocks contains one column for each
 bispectrum component, the same as for compute *sna/atom*
 
-Compute *snap* evaluates a global array. 
+Compute *snap* evaluates a global array.
 The columns are arranged into
 *ntypes* blocks, listed in order of atom type *I*\ . Each block
 contains one column for each bispectrum component, the same as for compute
 *sna/atom*\ . A final column contains the corresponding energy, force component
-on an atom, or virial stress component. The rows of the array appear 
+on an atom, or virial stress component. The rows of the array appear
 in the following order:
 
 * 1 row: *sna/atom* quantities summed for all atoms of type *I*
@@ -313,7 +319,6 @@ page for an overview of LAMMPS output options.
 Restrictions
 """"""""""""
 
-
 These computes are part of the SNAP package.  They are only enabled if
 LAMMPS was built with that package.  See the :doc:`Build package <Build_package>` doc page for more info.
 
@@ -328,37 +333,22 @@ Default
 The optional keyword defaults are *rmin0* = 0,
 *switchflag* = 1, *bzeroflag* = 1, *quadraticflag* = 0,
 
-
 ----------
 
-
 .. _Thompson20141:
 
-
-
 **(Thompson)** Thompson, Swiler, Trott, Foiles, Tucker, under review, preprint
 available at `arXiv:1409.3880 <http://arxiv.org/abs/1409.3880>`_
 
 .. _Bartok20101:
 
-
-
 **(Bartok)** Bartok, Payne, Risi, Csanyi, Phys Rev Lett, 104, 136403 (2010).
 
 .. _Meremianin2006:
 
-
-
 **(Meremianin)** Meremianin, J. Phys. A,  39, 3099 (2006).
 
 .. _Varshalovich1987:
 
-
-
 **(Varshalovich)** Varshalovich, Moskalev, Khersonskii, Quantum Theory
 of Angular Momentum, World Scientific, Singapore (1987).
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/compute_spin.rst b/doc/src/compute_spin.rst
index 034d2ab685..49243e9650 100644
--- a/doc/src/compute_spin.rst
+++ b/doc/src/compute_spin.rst
@@ -6,7 +6,6 @@ compute spin command
 Syntax
 """"""
 
-
 .. code-block:: LAMMPS
 
    compute ID group-ID spin
@@ -17,7 +16,6 @@ Syntax
 Examples
 """"""""
 
-
 .. code-block:: LAMMPS
 
    compute out_mag all spin
@@ -37,11 +35,9 @@ This compute calculates the following 6 magnetic quantities:
 * The sixth one is referred to as the spin temperature, according
   to the work of :ref:`(Nurdin) <Nurdin1>`.
 
-
 The simplest way to output the results of the compute spin calculation
 is to define some of the quantities as variables, and to use the thermo and
-thermo\_style commands, for example:
-
+thermo_style commands, for example:
 
 .. code-block:: LAMMPS
 
@@ -56,7 +52,7 @@ thermo\_style commands, for example:
 
 This series of commands evaluates the total magnetization along z, the norm of
 the total magnetization, and the magnetic temperature. Three variables are
-assigned to those quantities. The thermo and thermo\_style commands print them
+assigned to those quantities. The thermo and thermo_style commands print them
 every 10 timesteps.
 
 **Output info:**
@@ -67,9 +63,8 @@ metal units (:doc:`units <units>`).
 Restrictions
 """"""""""""
 
-
 The *spin* compute is part of the SPIN package.  This compute is only
-enabled if LAMMPS was built with this package.  See the :doc:`Build package <Build_package>` doc page for more info.  The atom\_style
+enabled if LAMMPS was built with this package.  See the :doc:`Build package <Build_package>` doc page for more info.  The atom_style
 has to be "spin" for this compute to be valid.
 
 **Related commands:**
@@ -80,12 +75,8 @@ none
 
 none
 
-
 ----------
 
-
 .. _Nurdin1:
 
-
-
 **(Nurdin)** Nurdin and Schotte Phys Rev E, 61(4), 3579 (2000)
diff --git a/doc/src/compute_stress_atom.rst b/doc/src/compute_stress_atom.rst
index 45d6027871..48e8b9c69c 100644
--- a/doc/src/compute_stress_atom.rst
+++ b/doc/src/compute_stress_atom.rst
@@ -8,7 +8,6 @@ compute centroid/stress/atom command
 Syntax
 """"""
 
-
 .. parsed-literal::
 
    compute ID group-ID style temp-ID keyword ...
@@ -22,8 +21,7 @@ Syntax
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    compute 1 mobile stress/atom NULL
    compute 1 mobile stress/atom myRamp
@@ -177,10 +175,8 @@ subtracting a background streaming velocity.  See the doc pages for
 individual :doc:`compute commands <compute>` to determine which ones
 include a bias.
 
-
 ----------
 
-
 Note that as defined in the formula, per-atom stress is the negative
 of the per-atom pressure tensor.  It is also really a stress\*volume
 formulation, meaning the computed quantity is in units of
@@ -199,12 +195,11 @@ is the total pressure of the system.
 These lines in an input script for a 3d system should yield that
 result. I.e. the last 2 columns of thermo output will be the same:
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    compute        peratom all stress/atom NULL
    compute        p all reduce sum c_peratom[1] c_peratom[2] c_peratom[3]
-   variable       press equal -(c_p[1]+c_p[2]+c_p[3])/(3\*vol)
+   variable       press equal -(c_p[1]+c_p[2]+c_p[3])/(3*vol)
    thermo_style   custom step temp etotal press v_press
 
 .. note::
@@ -245,35 +240,20 @@ Related commands
 
 **Default:** none
 
-
 ----------
 
-
 .. _Heyes2:
 
-
-
 **(Heyes)** Heyes, Phys Rev B, 49, 755 (1994).
 
 .. _Sirk1:
 
-
-
 **(Sirk)** Sirk, Moore, Brown, J Chem Phys, 138, 064505 (2013).
 
 .. _Thompson2:
 
-
-
 **(Thompson)** Thompson, Plimpton, Mattson, J Chem Phys, 131, 154107 (2009).
 
 .. _Surblys1:
 
-
-
 **(Surblys)** Surblys, Matsubara, Kikugawa, Ohara, Phys Rev E, 99, 051301(R) (2019).
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/compute_stress_mop.rst b/doc/src/compute_stress_mop.rst
index 892924575d..83a8374702 100644
--- a/doc/src/compute_stress_mop.rst
+++ b/doc/src/compute_stress_mop.rst
@@ -9,7 +9,6 @@ compute stress/mop/profile command
 Syntax
 """"""
 
-
 .. parsed-literal::
 
    compute ID group-ID style dir args keywords ...
@@ -20,7 +19,6 @@ Syntax
 * args = argument specific to the compute style
 * keywords = *kin* or *conf* or *total* (one of more can be specified)
 
-
 .. parsed-literal::
 
      *stress/mop* args = pos
@@ -74,14 +72,14 @@ corrections to the pressure added by the :doc:`pair_modify tail yes <pair_modify
 Compute *stress/mop* calculates a global vector (indices starting at 1), with 3
 values for each declared keyword (in the order the keywords have been
 declared). For each keyword, the stress tensor components are ordered as
-follows: stress\_dir,x, stress\_dir,y, and stress\_dir,z.
+follows: stress_dir,x, stress_dir,y, and stress_dir,z.
 
 Compute *stress/mop/profile* instead calculates a global array, with 1 column
 giving the position of the planes where the stress tensor was computed,
 and with 3 columns of values for each declared keyword (in the order the
 keywords have been declared). For each keyword, the profiles of stress
-tensor components are ordered as follows: stress\_dir,x; stress\_dir,y;
-and stress\_dir,z.
+tensor components are ordered as follows: stress_dir,x; stress_dir,y;
+and stress_dir,z.
 
 The values are in pressure :doc:`units <units>`.
 
@@ -90,7 +88,6 @@ The values produced by this compute can be accessed by various :doc:`output comm
 Restrictions
 """"""""""""
 
-
 These styles are part of the USER-MISC package. They are only enabled if
 LAMMPS is built with that package. See the :doc:`Build package <Build_package>`
 doc page on for more info.
@@ -110,18 +107,9 @@ Related commands
 
 **Default:** none
 
-
 ----------
 
-
 .. _mop-todd:
 
-
-
 **(Todd)** B. D. Todd, Denis J. Evans, and Peter J. Daivis: "Pressure tensor for inhomogeneous fluids",
 Phys. Rev. E 52, 1627 (1995).
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/compute_tally.rst b/doc/src/compute_tally.rst
index 38ab176b7d..f49c872306 100644
--- a/doc/src/compute_tally.rst
+++ b/doc/src/compute_tally.rst
@@ -18,7 +18,6 @@ compute stress/tally command
 Syntax
 """"""
 
-
 .. parsed-literal::
 
    compute ID group-ID style group2-ID
@@ -30,8 +29,7 @@ Syntax
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    compute 1 lower force/tally upper
    compute 1 left pe/tally right
@@ -53,10 +51,8 @@ and intramolecular energies. Something that would otherwise be
 impossible without integrating this as a core functionality into
 the based classes of LAMMPS.
 
-
 ----------
 
-
 The pairwise contributions are computing via a callback that the
 compute registers with the non-bonded pairwise force computation.
 This limits the use to systems that have no bonds, no Kspace, and no
@@ -65,10 +61,8 @@ have to compute forces or energies a second time and thus can be much
 more efficient. The callback mechanism allows to write more complex
 pairwise property computations.
 
-
 ----------
 
-
 **Output info:**
 
 Compute *pe/tally* calculates a global scalar (the energy) and a per
@@ -92,7 +86,6 @@ Both the scalar and vector values calculated by this compute are
 Restrictions
 """"""""""""
 
-
 This compute is part of the USER-TALLY package.  It is only enabled if
 LAMMPS was built with that package.  See the :doc:`Build package <Build_package>` doc page for more info.
 
@@ -109,12 +102,7 @@ The computes in this package are not compatible with dynamic groups.
 Related commands
 """"""""""""""""
 
-*compute group/group*\ \_compute\_group\_group.html, *compute
-heat/flux*\ \_compute\_heat\_flux.html
+*compute group/group*\ _compute_group_group.html, *compute
+heat/flux*\ _compute_heat_flux.html
 
 **Default:** none
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/compute_tdpd_cc_atom.rst b/doc/src/compute_tdpd_cc_atom.rst
index b6e5497f2d..00eee60f62 100644
--- a/doc/src/compute_tdpd_cc_atom.rst
+++ b/doc/src/compute_tdpd_cc_atom.rst
@@ -6,7 +6,6 @@ compute tdpd/cc/atom command
 Syntax
 """"""
 
-
 .. parsed-literal::
 
    compute ID group-ID tdpd/cc/atom index
@@ -18,8 +17,7 @@ Syntax
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    compute 1 all tdpd/cc/atom 2
 
@@ -47,29 +45,19 @@ per unit mass.
 Restrictions
 """"""""""""
 
-
-This compute is part of the USER-MESO package.  It is only enabled if
+This compute is part of the USER-MESODPD package.  It is only enabled if
 LAMMPS was built with that package.  See the :doc:`Build package <Build_package>` doc page for more info.
 
 Related commands
 """"""""""""""""
 
-:doc:`pair_style tdpd <pair_meso>`
+:doc:`pair_style tdpd <pair_mesodpd>`
 
 **Default:** none
 
-
 ----------
 
-
 .. _Li2015a:
 
-
-
 **(Li2015)** Li, Yazdani, Tartakovsky, Karniadakis, J Chem Phys, 143:
 014101 (2015).  DOI: 10.1063/1.4923254
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/compute_temp.rst b/doc/src/compute_temp.rst
index b9b00c7469..9232191472 100644
--- a/doc/src/compute_temp.rst
+++ b/doc/src/compute_temp.rst
@@ -9,7 +9,6 @@ compute temp/kk command
 Syntax
 """"""
 
-
 .. parsed-literal::
 
    compute ID group-ID temp
@@ -20,8 +19,7 @@ Syntax
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    compute 1 all temp
    compute myTemp mobile temp
@@ -56,24 +54,21 @@ atoms that include these constraints will be computed correctly.  If
 needed, the subtracted degrees-of-freedom can be altered using the
 *extra* option of the :doc:`compute_modify <compute_modify>` command.
 
-A compute of this style with the ID of "thermo\_temp" is created when
+A compute of this style with the ID of "thermo_temp" is created when
 LAMMPS starts up, as if this command were in the input script:
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    compute thermo_temp all temp
 
-See the "thermo\_style" command for more details.
+See the "thermo_style" command for more details.
 
 See the :doc:`Howto thermostat <Howto_thermostat>` doc page for a
 discussion of different ways to compute temperature and perform
 thermostatting.
 
-
 ----------
 
-
 Styles with a *gpu*\ , *intel*\ , *kk*\ , *omp*\ , or *opt* suffix are
 functionally the same as the corresponding style without the suffix.
 They have been optimized to run faster, depending on your available
@@ -92,10 +87,8 @@ by including their suffix, or you can use the :doc:`-suffix command-line switch
 See the :doc:`Speed packages <Speed_packages>` doc page for more
 instructions on how to use the accelerated styles effectively.
 
-
 ----------
 
-
 **Output info:**
 
 This compute calculates a global scalar (the temperature) and a global
@@ -120,8 +113,3 @@ Related commands
 :doc:`compute temp/partial <compute_temp_partial>`, :doc:`compute temp/region <compute_temp_region>`, :doc:`compute pressure <compute_pressure>`
 
 **Default:** none
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/compute_temp_asphere.rst b/doc/src/compute_temp_asphere.rst
index 499065ca5c..46fadc2ff5 100644
--- a/doc/src/compute_temp_asphere.rst
+++ b/doc/src/compute_temp_asphere.rst
@@ -6,7 +6,6 @@ compute temp/asphere command
 Syntax
 """"""
 
-
 .. parsed-literal::
 
    compute ID group-ID temp/asphere keyword value ...
@@ -15,22 +14,19 @@ Syntax
 * temp/asphere = style name of this compute command
 * zero or more keyword/value pairs may be appended
 * keyword = *bias* or *dof*
-  
+
   .. parsed-literal::
-  
+
        *bias* value = bias-ID
          bias-ID = ID of a temperature compute that removes a velocity bias
        *dof* value = *all* or *rotate*
          all = compute temperature of translational and rotational degrees of freedom
          rotate = compute temperature of just rotational degrees of freedom
 
-
-
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    compute 1 all temp/asphere
    compute myTemp mobile temp/asphere bias tempCOM
@@ -107,10 +103,8 @@ See the :doc:`Howto thermostat <Howto_thermostat>` doc page for a
 discussion of different ways to compute temperature and perform
 thermostatting.
 
-
 ----------
 
-
 The keyword/value option pairs are used in the following ways.
 
 For the *bias* keyword, *bias-ID* refers to the ID of a temperature
@@ -127,10 +121,8 @@ that includes both translational and rotational degrees of freedom.  A
 setting of *rotate* calculates a temperature that includes only
 rotational degrees of freedom.
 
-
 ----------
 
-
 **Output info:**
 
 This compute calculates a global scalar (the temperature) and a global
@@ -148,7 +140,6 @@ vector values will be in energy :doc:`units <units>`.
 Restrictions
 """"""""""""
 
-
 This compute is part of the ASPHERE package.  It is only enabled if
 LAMMPS was built with that package.  See the :doc:`Build package <Build_package>` doc page for more info.
 
@@ -166,8 +157,3 @@ Related commands
 :doc:`compute temp <compute_temp>`
 
 **Default:** none
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/compute_temp_body.rst b/doc/src/compute_temp_body.rst
index 3464a584b1..75477eff36 100644
--- a/doc/src/compute_temp_body.rst
+++ b/doc/src/compute_temp_body.rst
@@ -6,7 +6,6 @@ compute temp/body command
 Syntax
 """"""
 
-
 .. parsed-literal::
 
    compute ID group-ID temp/body keyword value ...
@@ -15,22 +14,19 @@ Syntax
 * temp/body = style name of this compute command
 * zero or more keyword/value pairs may be appended
 * keyword = *bias* or *dof*
-  
+
   .. parsed-literal::
-  
+
        *bias* value = bias-ID
          bias-ID = ID of a temperature compute that removes a velocity bias
        *dof* value = *all* or *rotate*
          all = compute temperature of translational and rotational degrees of freedom
          rotate = compute temperature of just rotational degrees of freedom
 
-
-
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    compute 1 all temp/body
    compute myTemp mobile temp/body bias tempCOM
@@ -87,10 +83,8 @@ See the :doc:`Howto thermostat <Howto_thermostat>` doc page for a
 discussion of different ways to compute temperature and perform
 thermostatting.
 
-
 ----------
 
-
 The keyword/value option pairs are used in the following ways.
 
 For the *bias* keyword, *bias-ID* refers to the ID of a temperature
@@ -107,10 +101,8 @@ that includes both translational and rotational degrees of freedom.  A
 setting of *rotate* calculates a temperature that includes only
 rotational degrees of freedom.
 
-
 ----------
 
-
 **Output info:**
 
 This compute calculates a global scalar (the temperature) and a global
@@ -128,7 +120,6 @@ vector values will be in energy :doc:`units <units>`.
 Restrictions
 """"""""""""
 
-
 This compute is part of the BODY package.  It is only enabled if
 LAMMPS was built with that package.  See the :doc:`Build package <Build_package>` doc page for more info.
 
@@ -142,8 +133,3 @@ Related commands
 :doc:`compute temp <compute_temp>`
 
 **Default:** none
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/compute_temp_chunk.rst b/doc/src/compute_temp_chunk.rst
index 37b6a05264..89bef3a327 100644
--- a/doc/src/compute_temp_chunk.rst
+++ b/doc/src/compute_temp_chunk.rst
@@ -6,7 +6,6 @@ compute temp/chunk command
 Syntax
 """"""
 
-
 .. parsed-literal::
 
    compute ID group-ID temp/chunk chunkID value1 value2 ... keyword value ...
@@ -16,18 +15,18 @@ Syntax
 * chunkID = ID of :doc:`compute chunk/atom <compute_chunk_atom>` command
 * zero or more values can be listed as value1,value2,etc
 * value = *temp* or *kecom* or *internal*
-  
+
   .. parsed-literal::
-  
+
        temp = temperature of each chunk
        kecom = kinetic energy of each chunk based on velocity of center of mass
        internal = internal kinetic energy of each chunk
 
 * zero or more keyword/value pairs may be appended
 * keyword = *com* or *bias* or *adof* or *cdof*
-  
+
   .. parsed-literal::
-  
+
        *com* value = *yes* or *no*
          yes = subtract center-of-mass velocity from each chunk before calculating temperature
          no = do not subtract center-of-mass velocity
@@ -38,13 +37,10 @@ Syntax
        *cdof* value = dof_per_chunk
          dof_per_chunk = define this many degrees-of-freedom per chunk
 
-
-
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    compute 1 fluid temp/chunk molchunk
    compute 1 fluid temp/chunk molchunk temp internal
@@ -116,10 +112,8 @@ chunk.  The interal KE is summed over the atoms in the chunk using an
 internal "thermal" velocity for each atom, which is its velocity minus
 the center-of-mass velocity of the chunk.
 
-
 ----------
 
-
 Note that currently the global and per-chunk temperatures calculated
 by this compute only include translational degrees of freedom for each
 atom.  No rotational degrees of freedom are included for finite-size
@@ -155,17 +149,14 @@ calculating the temperature; fix ave/chunk does not.
 The simplest way to output the per-chunk results of the compute
 temp/chunk calculation to a file is to use the :doc:`fix ave/time <fix_ave_time>` command, for example:
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    compute cc1 all chunk/atom molecule
    compute myChunk all temp/chunk cc1 temp
    fix 1 all ave/time 100 1 100 c_myChunk file tmp.out mode vector
 
-
 ----------
 
-
 The keyword/value option pairs are used in the following ways.
 
 The *com* keyword can be used with a value of *yes* to subtract the
@@ -208,10 +199,8 @@ set to the remaining degrees of freedom for the entire molecule
 (entire chunk in this case), e.g. 6 for 3d, or 3 for 2d, for a rigid
 molecule.
 
-
 ----------
 
-
 **Output info:**
 
 This compute calculates a global scalar (the temperature) and a global
@@ -240,7 +229,6 @@ energy :doc:`units <units>` for the *kecom* and *internal* values.
 Restrictions
 """"""""""""
 
-
 The *com* and *bias* keywords cannot be used together.
 
 Related commands
@@ -253,8 +241,3 @@ Default
 
 The option defaults are com no, no bias, adof = dimensionality of the
 system (2 or 3), and cdof = 0.0.
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/compute_temp_com.rst b/doc/src/compute_temp_com.rst
index d81ede2e43..b21db2ac27 100644
--- a/doc/src/compute_temp_com.rst
+++ b/doc/src/compute_temp_com.rst
@@ -6,7 +6,6 @@ compute temp/com command
 Syntax
 """"""
 
-
 .. parsed-literal::
 
    compute ID group-ID temp/com
@@ -17,8 +16,7 @@ Syntax
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    compute 1 all temp/com
    compute myTemp mobile temp/com
@@ -93,8 +91,3 @@ Related commands
 :doc:`compute temp <compute_temp>`
 
 **Default:** none
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/compute_temp_cs.rst b/doc/src/compute_temp_cs.rst
index e735a79b6f..f3c82c2b1a 100644
--- a/doc/src/compute_temp_cs.rst
+++ b/doc/src/compute_temp_cs.rst
@@ -6,7 +6,6 @@ compute temp/cs command
 Syntax
 """"""
 
-
 .. parsed-literal::
 
    compute ID group-ID temp/cs group1 group2
@@ -19,8 +18,7 @@ Syntax
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    compute oxygen_c-s all temp/cs O_core O_shell
    compute core_shells all temp/cs cores shells
@@ -102,7 +100,6 @@ vector values will be in energy :doc:`units <units>`.
 Restrictions
 """"""""""""
 
-
 The number of core/shell pairs contributing to the temperature is
 assumed to be constant for the duration of the run.  No fixes should
 be used which generate new molecules or atoms during a simulation.
@@ -114,18 +111,9 @@ Related commands
 
 **Default:** none
 
-
 ----------
 
-
 .. _MitchellFinchham1:
 
-
-
 **(Mitchell and Finchham)** Mitchell, Finchham, J Phys Condensed Matter,
 5, 1031-1038 (1993).
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/compute_temp_deform.rst b/doc/src/compute_temp_deform.rst
index 779ce2de71..d73670485b 100644
--- a/doc/src/compute_temp_deform.rst
+++ b/doc/src/compute_temp_deform.rst
@@ -6,7 +6,6 @@ compute temp/deform command
 Syntax
 """"""
 
-
 .. parsed-literal::
 
    compute ID group-ID temp/deform
@@ -17,8 +16,7 @@ Syntax
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    compute myTemp all temp/deform
 
@@ -135,8 +133,3 @@ Related commands
 :doc:`fix nvt/sllod <fix_nvt_sllod>`
 
 **Default:** none
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/compute_temp_deform_eff.rst b/doc/src/compute_temp_deform_eff.rst
index fab6275f0a..b5d6659573 100644
--- a/doc/src/compute_temp_deform_eff.rst
+++ b/doc/src/compute_temp_deform_eff.rst
@@ -6,7 +6,6 @@ compute temp/deform/eff command
 Syntax
 """"""
 
-
 .. parsed-literal::
 
    compute ID group-ID temp/deform/eff
@@ -17,8 +16,7 @@ Syntax
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    compute myTemp all temp/deform/eff
 
@@ -62,7 +60,6 @@ vector values will be in energy :doc:`units <units>`.
 Restrictions
 """"""""""""
 
-
 This compute is part of the USER-EFF package.  It is only enabled if
 LAMMPS was built with that package.  See the :doc:`Build package <Build_package>` doc page for more info.
 
@@ -73,8 +70,3 @@ Related commands
 :doc:`fix nvt/sllod/eff <fix_nvt_sllod_eff>`
 
 **Default:** none
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/compute_temp_drude.rst b/doc/src/compute_temp_drude.rst
index fc45a5ba2b..8cb9849a24 100644
--- a/doc/src/compute_temp_drude.rst
+++ b/doc/src/compute_temp_drude.rst
@@ -6,7 +6,6 @@ compute temp/drude command
 Syntax
 """"""
 
-
 .. parsed-literal::
 
    compute ID group-ID temp/drude
@@ -17,8 +16,7 @@ Syntax
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    compute TDRUDE all temp/drude
 
@@ -69,10 +67,9 @@ are "extensive".
 Restrictions
 """"""""""""
 
-
 The number of degrees of freedom contributing to the temperature is
 assumed to be constant for the duration of the run unless the
-*fix\_modify* command sets the option *dynamic yes*\ .
+*fix_modify* command sets the option *dynamic yes*\ .
 
 Related commands
 """"""""""""""""
@@ -80,8 +77,3 @@ Related commands
 :doc:`fix drude <fix_drude>`, :doc:`fix langevin/drude <fix_langevin_drude>`, :doc:`fix drude/transform <fix_drude_transform>`, :doc:`pair_style thole <pair_thole>`, :doc:`compute temp <compute_temp>`
 
 **Default:** none
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/compute_temp_eff.rst b/doc/src/compute_temp_eff.rst
index e15832a25b..84a2028920 100644
--- a/doc/src/compute_temp_eff.rst
+++ b/doc/src/compute_temp_eff.rst
@@ -6,7 +6,6 @@ compute temp/eff command
 Syntax
 """"""
 
-
 .. parsed-literal::
 
    compute ID group-ID temp/eff
@@ -17,8 +16,7 @@ Syntax
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    compute 1 all temp/eff
    compute myTemp mobile temp/eff
@@ -53,8 +51,7 @@ densities two to five times the density of liquid H2 ranges from
    :doc:`thermo_modify <thermo_modify>` command, as shown in the following
    example:
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    compute         effTemp all temp/eff
    thermo_style    custom step etotal pe ke temp press
@@ -91,7 +88,6 @@ the simulation.
 Restrictions
 """"""""""""
 
-
 This compute is part of the USER-EFF package.  It is only enabled if
 LAMMPS was built with that package.  See the :doc:`Build package <Build_package>` doc page for more info.
 
@@ -101,8 +97,3 @@ Related commands
 :doc:`compute temp/partial <compute_temp_partial>`, :doc:`compute temp/region <compute_temp_region>`, :doc:`compute pressure <compute_pressure>`
 
 **Default:** none
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/compute_temp_partial.rst b/doc/src/compute_temp_partial.rst
index ce493802d6..e2fd36f35a 100644
--- a/doc/src/compute_temp_partial.rst
+++ b/doc/src/compute_temp_partial.rst
@@ -6,7 +6,6 @@ compute temp/partial command
 Syntax
 """"""
 
-
 .. parsed-literal::
 
    compute ID group-ID temp/partial xflag yflag zflag
@@ -18,8 +17,7 @@ Syntax
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    compute newT flow temp/partial 1 1 0
 
@@ -69,10 +67,8 @@ See the :doc:`Howto thermostat <Howto_thermostat>` doc page for a
 discussion of different ways to compute temperature and perform
 thermostatting.
 
-
 ----------
 
-
 Styles with a *gpu*\ , *intel*\ , *kk*\ , *omp*\ , or *opt* suffix are
 functionally the same as the corresponding style without the suffix.
 They have been optimized to run faster, depending on your available
@@ -91,10 +87,8 @@ by including their suffix, or you can use the :doc:`-suffix command-line switch
 See the :doc:`Speed packages <Speed_packages>` doc page for more
 instructions on how to use the accelerated styles effectively.
 
-
 ----------
 
-
 **Output info:**
 
 This compute calculates a global scalar (the temperature) and a global
@@ -119,8 +113,3 @@ Related commands
 :doc:`compute temp <compute_temp>`, :doc:`compute temp/region <compute_temp_region>`, :doc:`compute pressure <compute_pressure>`
 
 **Default:** none
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/compute_temp_profile.rst b/doc/src/compute_temp_profile.rst
index d7bbc74aea..53870fa300 100644
--- a/doc/src/compute_temp_profile.rst
+++ b/doc/src/compute_temp_profile.rst
@@ -6,7 +6,6 @@ compute temp/profile command
 Syntax
 """"""
 
-
 .. parsed-literal::
 
    compute ID group-ID temp/profile xflag yflag zflag binstyle args
@@ -15,9 +14,9 @@ Syntax
 * temp/profile = style name of this compute command
 * xflag,yflag,zflag = 0/1 for whether to exclude/include this dimension
 * binstyle = *x* or *y* or *z* or *xy* or *yz* or *xz* or *xyz*
-  
+
   .. parsed-literal::
-  
+
        *x* arg = Nx
        *y* arg = Ny
        *z* arg = Nz
@@ -29,18 +28,15 @@ Syntax
 
 * zero or more keyword/value pairs may be appended
 * keyword = *out*
-  
+
   .. parsed-literal::
-  
+
        *out* value = *tensor* or *bin*
 
-
-
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    compute myTemp flow temp/profile 1 1 1 x 10
    compute myTemp flow temp/profile 1 1 1 x 10 out bin
@@ -169,7 +165,6 @@ temperature :doc:`units <units>`.
 Restrictions
 """"""""""""
 
-
 You should not use too large a velocity-binning grid, especially in
 3d.  In the current implementation, the binned velocity averages are
 summed across all processors, so this will be inefficient if the grid
@@ -186,17 +181,8 @@ Default
 
 The option default is out = tensor.
 
-
 ----------
 
-
 .. _Evans1:
 
-
-
 **(Evans)** Evans and Morriss, Phys Rev Lett, 56, 2172-2175 (1986).
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/compute_temp_ramp.rst b/doc/src/compute_temp_ramp.rst
index b2161c53d7..4ac22bdfef 100644
--- a/doc/src/compute_temp_ramp.rst
+++ b/doc/src/compute_temp_ramp.rst
@@ -6,7 +6,6 @@ compute temp/ramp command
 Syntax
 """"""
 
-
 .. parsed-literal::
 
    compute ID group-ID temp/ramp vdim vlo vhi dim clo chi keyword value ...
@@ -20,7 +19,6 @@ Syntax
 * zero or more keyword/value pairs may be appended
 * keyword = *units*
 
-
 .. parsed-literal::
 
      *units* value = *lattice* or *box*
@@ -28,8 +26,7 @@ Syntax
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    compute 2nd middle temp/ramp vx 0 8 y 2 12 units lattice
 
@@ -118,8 +115,3 @@ Default
 """""""
 
 The option default is units = lattice.
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/compute_temp_region.rst b/doc/src/compute_temp_region.rst
index 38432a18ca..e207d75d9f 100644
--- a/doc/src/compute_temp_region.rst
+++ b/doc/src/compute_temp_region.rst
@@ -6,7 +6,6 @@ compute temp/region command
 Syntax
 """"""
 
-
 .. parsed-literal::
 
    compute ID group-ID temp/region region-ID
@@ -18,8 +17,7 @@ Syntax
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    compute mine flow temp/region boundary
 
@@ -107,8 +105,3 @@ Related commands
 :doc:`compute temp <compute_temp>`, :doc:`compute pressure <compute_pressure>`
 
 **Default:** none
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/compute_temp_region_eff.rst b/doc/src/compute_temp_region_eff.rst
index 37d690848e..a05cc5597c 100644
--- a/doc/src/compute_temp_region_eff.rst
+++ b/doc/src/compute_temp_region_eff.rst
@@ -6,7 +6,6 @@ compute temp/region/eff command
 Syntax
 """"""
 
-
 .. parsed-literal::
 
    compute ID group-ID temp/region/eff region-ID
@@ -18,8 +17,7 @@ Syntax
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    compute mine flow temp/region/eff boundary
 
@@ -54,7 +52,6 @@ vector values will be in energy :doc:`units <units>`.
 Restrictions
 """"""""""""
 
-
 This compute is part of the USER-EFF package.  It is only enabled if
 LAMMPS was built with that package.  See the :doc:`Build package <Build_package>` doc page for more info.
 
@@ -64,8 +61,3 @@ Related commands
 :doc:`compute temp/region <compute_temp_region>`, :doc:`compute temp/eff <compute_temp_eff>`, :doc:`compute pressure <compute_pressure>`
 
 **Default:** none
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/compute_temp_rotate.rst b/doc/src/compute_temp_rotate.rst
index 47a94b3923..7d3ed4d63d 100644
--- a/doc/src/compute_temp_rotate.rst
+++ b/doc/src/compute_temp_rotate.rst
@@ -6,7 +6,6 @@ compute temp/rotate command
 Syntax
 """"""
 
-
 .. parsed-literal::
 
    compute ID group-ID temp/rotate
@@ -17,8 +16,7 @@ Syntax
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    compute Tbead bead temp/rotate
 
@@ -85,7 +83,6 @@ vector values will be in energy :doc:`units <units>`.
 Restrictions
 """"""""""""
 
-
 This compute is part of the USER-MISC package.  It is only enabled if
 LAMMPS was built with that package.  See the :doc:`Build package <Build_package>` doc page for more info.
 
@@ -95,8 +92,3 @@ Related commands
 :doc:`compute temp <compute_temp>`
 
 **Default:** none
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/compute_temp_sphere.rst b/doc/src/compute_temp_sphere.rst
index 285a232d56..f0cd4c3ba0 100644
--- a/doc/src/compute_temp_sphere.rst
+++ b/doc/src/compute_temp_sphere.rst
@@ -6,7 +6,6 @@ compute temp/sphere command
 Syntax
 """"""
 
-
 .. parsed-literal::
 
    compute ID group-ID temp/sphere keyword value ...
@@ -15,22 +14,19 @@ Syntax
 * temp/sphere = style name of this compute command
 * zero or more keyword/value pairs may be appended
 * keyword = *bias* or *dof*
-  
+
   .. parsed-literal::
-  
+
        *bias* value = bias-ID
          bias-ID = ID of a temperature compute that removes a velocity bias
        *dof* value = *all* or *rotate*
          all = compute temperature of translational and rotational degrees of freedom
          rotate = compute temperature of just rotational degrees of freedom
 
-
-
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    compute 1 all temp/sphere
    compute myTemp mobile temp/sphere bias tempCOM
@@ -94,10 +90,8 @@ See the :doc:`Howto thermostat <Howto_thermostat>` doc page for a
 discussion of different ways to compute temperature and perform
 thermostatting.
 
-
 ----------
 
-
 The keyword/value option pairs are used in the following ways.
 
 For the *bias* keyword, *bias-ID* refers to the ID of a temperature
@@ -114,10 +108,8 @@ that includes both translational and rotational degrees of freedom.  A
 setting of *rotate* calculates a temperature that includes only
 rotational degrees of freedom.
 
-
 ----------
 
-
 **Output info:**
 
 This compute calculates a global scalar (the temperature) and a global
@@ -135,7 +127,6 @@ vector values will be in energy :doc:`units <units>`.
 Restrictions
 """"""""""""
 
-
 This fix requires that atoms store torque and angular velocity (omega)
 and a radius as defined by the :doc:`atom_style sphere <atom_style>`
 command.
@@ -152,8 +143,3 @@ Default
 """""""
 
 The option defaults are no bias and dof = all.
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/compute_temp_uef.rst b/doc/src/compute_temp_uef.rst
index 4512c08b6d..2ce288a66f 100644
--- a/doc/src/compute_temp_uef.rst
+++ b/doc/src/compute_temp_uef.rst
@@ -6,7 +6,6 @@ compute temp/uef command
 Syntax
 """"""
 
-
 .. parsed-literal::
 
    compute ID group-ID temp/uef
@@ -17,8 +16,7 @@ Syntax
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    compute 1 all temp/uef
    compute 2 sel temp/uef
@@ -40,7 +38,6 @@ documentation for :doc:`compute temp <compute_temp>`.
 Restrictions
 """"""""""""
 
-
 This fix is part of the USER-UEF package. It is only enabled if LAMMPS
 was built with that package. See the :doc:`Build package <Build_package>` doc page for more info.
 
@@ -55,8 +52,3 @@ Related commands
 :doc:`compute pressure/uef <compute_pressure_uef>`
 
 **Default:** none
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/compute_ti.rst b/doc/src/compute_ti.rst
index 6c0b04e3bb..79fc56178c 100644
--- a/doc/src/compute_ti.rst
+++ b/doc/src/compute_ti.rst
@@ -6,7 +6,6 @@ compute ti command
 Syntax
 """"""
 
-
 .. parsed-literal::
 
    compute ID group ti keyword args ...
@@ -15,9 +14,9 @@ Syntax
 * ti = style name of this compute command
 * one or more attribute/arg pairs may be appended
 * keyword = pair style (lj/cut, gauss, born, etc) or *tail* or *kspace*
-  
+
   .. parsed-literal::
-  
+
        pair style args = atype v_name1 v_name2
          atype = atom type (see asterisk form below)
          v_name1 = variable with name1 that is energy scale factor and function of lambda
@@ -31,16 +30,13 @@ Syntax
          v_name1 = variable with name1 that is K-Space scale factor and function of lambda
          v_name2 = variable with name2 that is derivative of v_name1 with respect to lambda
 
-
-
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    compute 1 all ti lj/cut 1 v_lj v_dlj coul/long 2 v_c v_dc kspace 1 v_ks v_dks
-   compute 1 all ti lj/cut 1\*3 v_lj v_dlj coul/long \* v_c v_dc kspace \* v_ks v_dks
+   compute 1 all ti lj/cut 1*3 v_lj v_dlj coul/long * v_c v_dc kspace * v_ks v_dks
 
 Description
 """""""""""
@@ -62,17 +58,15 @@ to 1 (or vice versa) over the course of a :doc:`run <run>`.  The
 time-dependent adjustment is what the :doc:`fix adapt <fix_adapt>`
 command does.
 
-Assume that the unscaled energy of a pair\_style or kspace\_style is
+Assume that the unscaled energy of a pair_style or kspace_style is
 given by U.  Then the scaled energy is
 
-
 .. parsed-literal::
 
    Us = f(lambda) U
 
 where f() is some function of lambda.  What this compute calculates is
 
-
 .. parsed-literal::
 
    dUs / d(lambda) = U df(lambda)/dlambda = Us / f(lambda) df(lambda)/dlambda
@@ -91,9 +85,9 @@ leading asterisk means all types from 1 to n (inclusive).  A trailing
 asterisk means all types from n to N (inclusive).  A middle asterisk
 means all types from m to n (inclusive).
 
-You also specify two functions, as :doc:`equal-style variables <variable>`.  The first is specified as *v\_name1*, where
+You also specify two functions, as :doc:`equal-style variables <variable>`.  The first is specified as *v_name1*, where
 *name1* is the name of the variable, and is f(lambda) in the notation
-above.  The second is specified as *v\_name2*, where *name2* is the
+above.  The second is specified as *v_name2*, where *name2* is the
 name of the variable, and is df(lambda) / dlambda in the notation
 above.  I.e. it is the analytic derivative of f() with respect to
 lambda.  Note that the *name1* variable is also typically given as an
@@ -117,10 +111,8 @@ command.
 More details about the exact functional forms for the computation of
 du/dl can be found in the paper by :ref:`Eike <Eike>`.
 
-
 ----------
 
-
 **Output info:**
 
 This compute calculates a global scalar, namely dUs/dlambda.  This
@@ -135,7 +127,6 @@ The scalar value will be in energy :doc:`units <units>`.
 Restrictions
 """"""""""""
 
-
 This compute is part of the MISC package.  It is only enabled if
 LAMMPS was built with that package.  See the :doc:`Build package <Build_package>` doc page for more info.
 
@@ -146,17 +137,8 @@ Related commands
 
 **Default:** none
 
-
 ----------
 
-
 .. _Eike:
 
-
-
 **(Eike)** Eike and Maginn, Journal of Chemical Physics, 124, 164503 (2006).
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/compute_torque_chunk.rst b/doc/src/compute_torque_chunk.rst
index b9b5fd82bf..258ce03aa0 100644
--- a/doc/src/compute_torque_chunk.rst
+++ b/doc/src/compute_torque_chunk.rst
@@ -6,7 +6,6 @@ compute torque/chunk command
 Syntax
 """"""
 
-
 .. parsed-literal::
 
    compute ID group-ID torque/chunk chunkID
@@ -18,8 +17,7 @@ Syntax
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    compute 1 fluid torque/chunk molchunk
 
@@ -63,12 +61,11 @@ The simplest way to output the results of the compute torque/chunk
 calculation to a file is to use the :doc:`fix ave/time <fix_ave_time>`
 command, for example:
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    compute cc1 all chunk/atom molecule
    compute myChunk all torque/chunk cc1
-   fix 1 all ave/time 100 1 100 c_myChunk[\*] file tmp.out mode vector
+   fix 1 all ave/time 100 1 100 c_myChunk[*] file tmp.out mode vector
 
 **Output info:**
 
@@ -92,8 +89,3 @@ Related commands
 :doc:`variable torque() function <variable>`
 
 **Default:** none
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/compute_vacf.rst b/doc/src/compute_vacf.rst
index 9b2aa5e3bf..ce2757c115 100644
--- a/doc/src/compute_vacf.rst
+++ b/doc/src/compute_vacf.rst
@@ -6,7 +6,6 @@ compute vacf command
 Syntax
 """"""
 
-
 .. parsed-literal::
 
    compute ID group-ID vacf
@@ -17,8 +16,7 @@ Syntax
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    compute 1 all vacf
    compute 1 upper vacf
@@ -43,12 +41,11 @@ The integral of the VACF versus time is proportional to the diffusion
 coefficient of the diffusing atoms.  This can be computed in the
 following manner, using the :doc:`variable trap() <variable>` function:
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    compute         2 all vacf
    fix             5 all vector 1 c_2[4]
-   variable        diff equal dt\*trap(f_5)
+   variable        diff equal dt*trap(f_5)
    thermo_style    custom step v_diff
 
 .. note::
@@ -80,8 +77,3 @@ Related commands
 :doc:`compute msd <compute_msd>`
 
 **Default:** none
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/compute_vcm_chunk.rst b/doc/src/compute_vcm_chunk.rst
index f8718fe803..415038d7c2 100644
--- a/doc/src/compute_vcm_chunk.rst
+++ b/doc/src/compute_vcm_chunk.rst
@@ -6,7 +6,6 @@ compute vcm/chunk command
 Syntax
 """"""
 
-
 .. parsed-literal::
 
    compute ID group-ID vcm/chunk chunkID
@@ -18,8 +17,7 @@ Syntax
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    compute 1 fluid vcm/chunk molchunk
 
@@ -53,12 +51,11 @@ The simplest way to output the results of the compute vcm/chunk
 calculation to a file is to use the :doc:`fix ave/time <fix_ave_time>`
 command, for example:
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    compute cc1 all chunk/atom molecule
    compute myChunk all vcm/chunk cc1
-   fix 1 all ave/time 100 1 100 c_myChunk[\*] file tmp.out mode vector
+   fix 1 all ave/time 100 1 100 c_myChunk[*] file tmp.out mode vector
 
 **Output info:**
 
@@ -79,8 +76,3 @@ Restrictions
 **Related commands:** none
 
 **Default:** none
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/compute_voronoi_atom.rst b/doc/src/compute_voronoi_atom.rst
index 2f25339c21..a5d99d5de9 100644
--- a/doc/src/compute_voronoi_atom.rst
+++ b/doc/src/compute_voronoi_atom.rst
@@ -6,7 +6,6 @@ compute voronoi/atom command
 Syntax
 """"""
 
-
 .. parsed-literal::
 
    compute ID group-ID voronoi/atom keyword arg ...
@@ -14,11 +13,11 @@ Syntax
 * ID, group-ID are documented in :doc:`compute <compute>` command
 * voronoi/atom = style name of this compute command
 * zero or more keyword/value pairs may be appended
-* keyword = *only\_group* or *surface* or *radius* or *edge\_histo* or *edge\_threshold*
-  or *face\_threshold* or *neighbors* or *peratom*
-  
+* keyword = *only_group* or *surface* or *radius* or *edge_histo* or *edge_threshold*
+  or *face_threshold* or *neighbors* or *peratom*
+
   .. parsed-literal::
-  
+
        *only_group* = no arg
        *occupation* = no arg
        *surface* arg = sgroup-ID
@@ -35,13 +34,10 @@ Syntax
        *neighbors* value = *yes* or *no* = store list of all neighbors or no
        *peratom* value = *yes* or *no* = per-atom quantities accessible or no
 
-
-
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    compute 1 all voronoi/atom
    compute 2 precipitate voronoi/atom surface matrix
@@ -67,11 +63,9 @@ plus any exterior faces (see note below). If the *peratom* keyword
 is set to "no", the per-atom quantities are still calculated,
 but they are not accessible.
 
-
 ----------
 
-
-If the *only\_group* keyword is specified the tessellation is performed
+If the *only_group* keyword is specified the tessellation is performed
 only with respect to the atoms contained in the compute group. This is
 equivalent to deleting all atoms not contained in the group prior to
 evaluating the tessellation.
@@ -86,24 +80,23 @@ In the example above, a precipitate embedded in a matrix, only atoms
 at the surface of the precipitate will have non-zero surface area, and
 only the outward facing facets of the Voronoi cells are counted (the
 hull of the precipitate). The total surface area of the precipitate
-can be obtained by running a "reduce sum" compute on c\_2[3]
+can be obtained by running a "reduce sum" compute on c_2[3]
 
 If the *radius* keyword is specified with an atom style variable as
 the argument, a poly-disperse Voronoi tessellation is
 performed. Examples for radius variables are
 
+.. code-block:: LAMMPS
 
-.. parsed-literal::
-
-   variable r1 atom (type==1)\*0.1+(type==2)\*0.4
+   variable r1 atom (type==1)*0.1+(type==2)*0.4
    compute radius all property/atom radius
    variable r2 atom c_radius
 
-Here v\_r1 specifies a per-type radius of 0.1 units for type 1 atoms
-and 0.4 units for type 2 atoms, and v\_r2 accesses the radius property
-present in atom\_style sphere for granular models.
+Here v_r1 specifies a per-type radius of 0.1 units for type 1 atoms
+and 0.4 units for type 2 atoms, and v_r2 accesses the radius property
+present in atom_style sphere for granular models.
 
-The *edge\_histo* keyword activates the compilation of a histogram of
+The *edge_histo* keyword activates the compilation of a histogram of
 number of edges on the faces of the Voronoi cells in the compute
 group. The argument *maxedge* of the this keyword is the largest number
 of edges on a single Voronoi cell face expected to occur in the
@@ -113,7 +106,7 @@ faces with more than *maxedge* edges. Since the polygon with the
 smallest amount of edges is a triangle, entries 1 and 2 of the vector
 will always be zero.
 
-The *edge\_threshold* and *face\_threshold* keywords allow the
+The *edge_threshold* and *face_threshold* keywords allow the
 suppression of edges below a given minimum length and faces below a
 given minimum area. Ultra short edges and ultra small faces can occur
 as artifacts of the Voronoi tessellation. These keywords will affect
@@ -146,19 +139,16 @@ overview of LAMMPS output options. More specifically, the array can be
 accessed by a :doc:`dump local <dump>` command to write a file
 containing all the Voronoi neighbors in a system:
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    compute 6 all voronoi/atom neighbors yes
    dump d2 all local 1 dump.neighbors index c_6[1] c_6[2] c_6[3]
 
-If the *face\_threshold* keyword is used, then only faces
+If the *face_threshold* keyword is used, then only faces
 with areas greater than the threshold are stored.
 
-
 ----------
 
-
 The Voronoi calculation is performed by the freely available `Voro++ package <voronoi_>`_, written by Chris Rycroft at UC Berkeley and LBL,
 which must be installed on your system when building LAMMPS for use
 with this compute.  See instructions on obtaining and installing the
@@ -166,8 +156,6 @@ Voro++ software in the src/VORONOI/README file.
 
 .. _voronoi: http://math.lbl.gov/voro++/
 
-
-
 .. note::
 
    The calculation of Voronoi volumes is performed by each
@@ -211,7 +199,7 @@ per-atom values from a compute as input.  See the :doc:`Howto output <Howto_outp
 options. If the *peratom* keyword is set to "no", the per-atom array
 is still created, but it is not accessible.
 
-If the *edge\_histo* keyword is used, then this compute generates a
+If the *edge_histo* keyword is used, then this compute generates a
 global vector of length *maxedge*\ +1, containing a histogram of the
 number of edges per face.
 
@@ -235,7 +223,6 @@ The Voronoi face area will be in distance :doc:`units <units>` squared.
 Restrictions
 """"""""""""
 
-
 This compute is part of the VORONOI package.  It is only enabled if
 LAMMPS was built with that package.  See the :doc:`Build package <Build_package>` doc page for more info.
 
@@ -249,8 +236,3 @@ Related commands
 :doc:`dump custom <dump>`, :doc:`dump local <dump>`
 
 **Default:** *neighbors* no, *peratom* yes
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/compute_xrd.rst b/doc/src/compute_xrd.rst
index 00466ed8ce..29b1e9ebd0 100644
--- a/doc/src/compute_xrd.rst
+++ b/doc/src/compute_xrd.rst
@@ -6,7 +6,6 @@ compute xrd command
 Syntax
 """"""
 
-
 .. parsed-literal::
 
    compute ID group-ID xrd lambda type1 type2 ... typeN keyword value ...
@@ -17,9 +16,9 @@ Syntax
 * type1 type2 ... typeN = chemical symbol of each atom type (see valid options below)
 * zero or more keyword/value pairs may be appended
 * keyword = *2Theta* or *c* or *LP* or *manual* or *echo*
-  
+
   .. parsed-literal::
-  
+
        *2Theta* values = Min2Theta Max2Theta
          Min2Theta,Max2Theta = minimum and maximum 2 theta range to explore
          (radians or degrees)
@@ -32,13 +31,10 @@ Syntax
                   based on the values of the *c* parameters
        *echo* = flag to provide extra output for debugging purposes
 
-
-
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    compute 1 all xrd 1.541838 Al O 2Theta 0.087 0.87 c 1 1 1 LP 1 echo
    compute 2 all xrd 1.541838 Al O 2Theta 10 100 c 0.05 0.05 0.05 LP 1 manual
@@ -57,21 +53,16 @@ of wavelength lambda.
 The x-ray diffraction intensity, I, at each reciprocal lattice point, k,
 is computed from the structure factor, F, using the equations:
 
-.. image:: Eqs/compute_xrd1.jpg
-   :align: center
+.. math::
 
-.. image:: Eqs/compute_xrd2.jpg
-   :align: center
+   I =             & Lp(\theta)\frac{F^{*}F}{N} \\
+   F(\mathbf{k}) = & \sum_{j=1}^{N}f_j(\theta)exp(2\pi i \mathbf{k}\cdot \mathbf{r}_j) \\
+   Lp(\theta)    = & \frac{1+cos^{2}(2\theta)}{cos(\theta)sin^{2}(\theta)} \\
+   \frac{sin(\theta)}{\lambda} = & \frac{\left | \mathbf{k} \right |}{2}
 
-.. image:: Eqs/compute_xrd3.jpg
-   :align: center
-
-.. image:: Eqs/compute_xrd4.jpg
-   :align: center
-
-Here, K is the location of the reciprocal lattice node, rj is the
-position of each atom, fj are atomic scattering factors, LP is the
-Lorentz-polarization factor, and theta is the scattering angle of
+Here, K is the location of the reciprocal lattice node, :math:`r_j` is the
+position of each atom, :math:`f_j` are atomic scattering factors, *Lp* is the
+Lorentz-polarization factor, and :math:`\theta` is the scattering angle of
 diffraction.  The Lorentz-polarization factor can be turned off using
 the optional *LP* keyword.
 
@@ -114,8 +105,10 @@ for each atom type (type1 type2 ... typeN) and angle of diffraction.
 The analytic approximation is computed using the formula
 :ref:`(Colliex) <Colliex>`:
 
-.. image:: Eqs/compute_xrd5.jpg
-   :align: center
+.. math::
+
+   f_j\left ( \frac{sin(\theta)}{\lambda} \right )=\sum_{i}^{4}
+   a_i exp\left ( -b_i \frac{sin^{2}(\theta)}{\lambda^{2}} \right )+c
 
 Coefficients parameterized by :ref:`(Peng) <Peng>` are assigned for each
 atom type designating the chemical symbol and charge of each atom
@@ -229,11 +222,10 @@ All array values calculated by this compute are "intensive".
 Restrictions
 """"""""""""
 
-
 This compute is part of the USER-DIFFRACTION package.  It is only
 enabled if LAMMPS was built with that package.  See the :doc:`Build package <Build_package>` doc page for more info.
 
-The compute\_xrd command does not work for triclinic cells.
+The compute_xrd command does not work for triclinic cells.
 
 Related commands
 """"""""""""""""
@@ -247,32 +239,19 @@ Default
 The option defaults are 2Theta = 1 179 (degrees), c = 1 1 1, LP = 1,
 no manual flag, no echo flag.
 
-
 ----------
 
-
 .. _xrd-Coleman:
 
-
-
 **(Coleman)** Coleman, Spearot, Capolungo, MSMSE, 21, 055020
 (2013).
 
 .. _Colliex:
 
-
-
 **(Colliex)** Colliex et al. International Tables for Crystallography
 Volume C: Mathematical and Chemical Tables, 249-429 (2004).
 
 .. _Peng:
 
-
-
 **(Peng)** Peng, Ren, Dudarev, Whelan, Acta Crystallogr. A, 52, 257-76
 (1996).
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/computes.rst b/doc/src/computes.rst
index 1c1819a444..8d53b6cf06 100644
--- a/doc/src/computes.rst
+++ b/doc/src/computes.rst
@@ -1,7 +1,6 @@
 Computes
 ########
 
-
 .. toctree::
    :maxdepth: 1
    :glob:
diff --git a/doc/src/create_atoms.rst b/doc/src/create_atoms.rst
index ea49d99ab1..b58489f868 100644
--- a/doc/src/create_atoms.rst
+++ b/doc/src/create_atoms.rst
@@ -1,21 +1,20 @@
-.. index:: create\_atoms
+.. index:: create_atoms
 
-create\_atoms command
+create_atoms command
 =====================
 
 Syntax
 """"""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    create_atoms type style args keyword values ...
 
 * type = atom type (1-Ntypes) of atoms to create (offset for molecule creation)
 * style = *box* or *region* or *single* or *random*
-  
+
   .. parsed-literal::
-  
+
        *box* args = none
        *region* args = region-ID
          region-ID = particles will only be created if contained in the region
@@ -28,9 +27,9 @@ Syntax
 
 * zero or more keyword/value pairs may be appended
 * keyword = *mol* or *basis* or *ratio* or *subset* or *remap* or *var* or *set* or *rotate* or *units*
-  
-  .. parsed-literal::
-  
+
+  .. code-block:: LAMMPS
+
        *mol* value = template-ID seed
          template-ID = ID of molecule template specified in a separate :doc:`molecule <molecule>` command
          seed = random # seed (positive integer)
@@ -55,13 +54,10 @@ Syntax
          *lattice* = the geometry is defined in lattice units
          *box* = the geometry is defined in simulation box units
 
-
-
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    create_atoms 1 box
    create_atoms 3 region regsphere basis 2 3
@@ -92,7 +88,7 @@ the specified atom *type*\ .  E.g. if *type* = 2, and the file specifies
 atom types 1,2,3, then each created molecule will have atom types
 3,4,5.
 
-For the *box* style, the create\_atoms command fills the entire
+For the *box* style, the create_atoms command fills the entire
 simulation box with particles on the lattice.  If your simulation box
 is periodic, you should insure its size is a multiple of the lattice
 spacings, to avoid unwanted atom overlaps at the box boundaries.  If
@@ -140,11 +136,11 @@ outside a geometric boundary.
 
 Note that this command adds particles to those that already exist.
 This means it can be used to add particles to a system previously read
-in from a data or restart file.  Or the create\_atoms command can be
+in from a data or restart file.  Or the create_atoms command can be
 used multiple times, to add multiple sets of particles to the
 simulation.  For example, grain boundaries can be created, by
-interleaving create\_atoms with :doc:`lattice <lattice>` commands
-specifying different orientations.  By using the create\_atoms command
+interleaving create_atoms with :doc:`lattice <lattice>` commands
+specifying different orientations.  By using the create_atoms command
 in conjunction with the :doc:`delete_atoms <delete_atoms>` command,
 reasonably complex geometries can be created, or a protein can be
 solvated with a surrounding box of water molecules.
@@ -161,16 +157,14 @@ used to remove overlapping atoms or molecules.
    LAMMPS.  This is true even if you are using shrink-wrapped box
    boundaries, as specified by the :doc:`boundary <boundary>` command.
    However, you can first use the :doc:`change_box <change_box>` command to
-   temporarily expand the box, then add atoms via create\_atoms, then
-   finally use change\_box command again if needed to re-shrink-wrap the
+   temporarily expand the box, then add atoms via create_atoms, then
+   finally use change_box command again if needed to re-shrink-wrap the
    new atoms.  See the :doc:`change_box <change_box>` doc page for an
-   example of how to do this, using the create\_atoms *single* style to
+   example of how to do this, using the create_atoms *single* style to
    insert a new atom outside the current simulation box.
 
-
 ----------
 
-
 Individual atoms are inserted by this command, unless the *mol*
 keyword is used.  It specifies a *template-ID* previously defined
 using the :doc:`molecule <molecule>` command, which reads a file that
@@ -201,17 +195,15 @@ not overlap, regardless of their relative orientations.
 .. note::
 
    If the :doc:`create_box <create_box>` command is used to create
-   the simulation box, followed by the create\_atoms command with its
+   the simulation box, followed by the create_atoms command with its
    *mol* option for adding molecules, then you typically need to use the
    optional keywords allowed by the :doc:`create_box <create_box>` command
    for extra bonds (angles,etc) or extra special neighbors.  This is
    because by default, the :doc:`create_box <create_box>` command sets up a
-   non-molecular system which doesn't allow molecules to be added.
-
+   non-molecular system which does not allow molecules to be added.
 
 ----------
 
-
 This is the meaning of the other allowed keywords.
 
 The *basis* keyword is only used when atoms (not molecules) are being
@@ -268,8 +260,7 @@ the sinusoid would appear to be "smoother".  Also note the use of the
 converts lattice spacings to distance.  Click on the image for a
 larger version.
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    dimension       2
    variable        x equal 100
@@ -280,7 +271,7 @@ larger version.
 
    variable        xx internal 0.0
    variable        yy internal 0.0
-   variable        v equal "(0.2\*v_y\*ylat \* cos(v_xx/xlat \* 2.0\*PI\*4.0/v_x) + 0.5\*v_y\*ylat - v_yy) > 0.0"
+   variable        v equal "(0.2*v_y*ylat * cos(v_xx/xlat * 2.0*PI*4.0/v_x) + 0.5*v_y*ylat - v_yy) > 0.0"
    create_atoms    1 box var v set x xx set y yy
    write_dump      all atom sinusoid.lammpstrj
 
@@ -304,14 +295,12 @@ the :doc:`units <units>` command, e.g. Angstroms for units = real or
 metal.  A *lattice* value means the distance units are in lattice
 spacings.
 
-
 ----------
 
-
 Atom IDs are assigned to created atoms in the following way.  The
 collection of created atoms are assigned consecutive IDs that start
 immediately following the largest atom ID existing before the
-create\_atoms command was invoked.  This is done by the processor's
+create_atoms command was invoked.  This is done by the processor's
 communicating the number of atoms they each own, the first processor
 numbering its atoms from 1 to N1, the second processor from N1+1 to
 N2, etc.  Where N1 = number of atoms owned by the first processor, N2
@@ -358,14 +347,11 @@ and thus also set the mass for the particle to 1.0.
 The :doc:`set <set>` command can be used to override many of these
 default settings.
 
-
 ----------
 
-
 Restrictions
 """"""""""""
 
-
 An :doc:`atom_style <atom_style>` must be previously defined to use this
 command.
 
@@ -385,8 +371,3 @@ The default for the *basis* keyword is that all created atoms are
 assigned the argument *type* as their atom type (when single atoms are
 being created).  The other defaults are *remap* = no, *rotate* =
 random, and *units* = lattice.
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/create_bonds.rst b/doc/src/create_bonds.rst
index 9b9c814c9a..b69fd909f0 100644
--- a/doc/src/create_bonds.rst
+++ b/doc/src/create_bonds.rst
@@ -1,19 +1,17 @@
-.. index:: create\_bonds
+.. index:: create_bonds
 
-create\_bonds command
-=====================
+create_bonds command
+====================
 
 Syntax
 """"""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    create_bonds style args ... keyword value ...
 
 * style = *many* or *single/bond* or *single/angle* or *single/dihedral*
 
-
 .. parsed-literal::
 
      *many* args = group-ID group2-ID btype rmin rmax
@@ -42,13 +40,10 @@ Syntax
 
      *special* value = *yes* or *no*
 
-
-
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    create_bonds many all all 1 1.0 1.2
    create_bonds many surf solvent 3 2.0 2.4
@@ -105,10 +100,8 @@ data file for a complex system of molecules.
    "extra/bond/per/atom" arguments.  And similarly for angles, dihedrals and
    impropers.  See the doc pages for these 2 commands for details.
 
-
 ----------
 
-
 The *many* style will create bonds between pairs of atoms I,J where I
 is in one of the two specified groups, and J is in the other.  The two
 groups can be the same, e.g. group "all".  The created bonds will be
@@ -121,7 +114,7 @@ apart such that *rmin* <= D <= *rmax*\ .
 The following settings must have been made in an input script before
 this style is used:
 
-* special\_bonds weight for 1-2 interactions must be 0.0
+* special_bonds weight for 1-2 interactions must be 0.0
 * a :doc:`pair_style <pair_style>` must be defined
 * no :doc:`kspace_style <kspace_style>` defined
 * minimum :doc:`pair_style <pair_style>` cutoff + :doc:`neighbor <neighbor>` skin >= *rmax*
@@ -146,10 +139,8 @@ executes, e.g. if you wish to use long-range Coulombic interactions
 via the :doc:`kspace_style <kspace_style>` command for your subsequent
 simulation.
 
-
 ----------
 
-
 The *single/bond* style creates a single bond of type *btype* between
 two atoms with IDs *batom1* and *batom2*\ .  *Btype* must be a value
 between 1 and the number of bond types defined.
@@ -176,10 +167,8 @@ read by the :doc:`read_data <read_data>` command.  I.e. the 4 atoms are ordered
 linearly within the improper.  *itype* must be a value between 1 and
 the number of improper types defined.
 
-
 ----------
 
-
 The keyword *special* controls whether an internal list of special
 bonds is created after one or more bonds, or a single angle, dihedral or
 improper is added to the system.
@@ -197,8 +186,7 @@ the same time, by using this command repeatedly, it is more efficient
 to only trigger the internal list to be created once, after the last
 bond (or angle, or dihedral, or improper) is added:
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    create_bonds single/bond 5 52 98 special no
    create_bonds single/bond 5 73 74 special no
@@ -211,14 +199,11 @@ bond (angle, dihedral, improper) is added, before performing a simulation.
 Otherwise pairwise interactions will not be properly excluded or
 weighted.  LAMMPS does NOT check that you have done this correctly.
 
-
 ----------
 
-
 Restrictions
 """"""""""""
 
-
 This command cannot be used with molecular systems defined using
 molecule template files via the :doc:`molecule <molecule>` and
 :doc:`atom_style template <atom_style>` commands.
@@ -232,8 +217,3 @@ Default
 """""""
 
 The keyword default is special = yes.
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/create_box.rst b/doc/src/create_box.rst
index 4e19def87d..917a4b3b0a 100644
--- a/doc/src/create_box.rst
+++ b/doc/src/create_box.rst
@@ -1,13 +1,12 @@
-.. index:: create\_box
+.. index:: create_box
 
-create\_box command
-===================
+create_box command
+==================
 
 Syntax
 """"""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    create_box N region-ID keyword value ...
 
@@ -15,9 +14,9 @@ Syntax
 * region-ID = ID of region to use as simulation domain
 * zero or more keyword/value pairs may be appended
 * keyword = *bond/types* or *angle/types* or *dihedral/types* or *improper/types* or *extra/bond/per/atom* or *extra/angle/per/atom* or *extra/dihedral/per/atom* or *extra/improper/per/atom*
-  
+
   .. parsed-literal::
-  
+
        *bond/types* value = # of bond types
        *angle/types* value = # of angle types
        *dihedral/types* value = # of dihedral types
@@ -28,13 +27,10 @@ Syntax
        *extra/improper/per/atom* value = # of impropers per atom
        *extra/special/per/atom* value = # of special neighbors per atom
 
-
-
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    create_box 2 mybox
    create_box 2 mybox bond/types 2 extra/bond/per/atom 1
@@ -67,7 +63,7 @@ positive or negative values and are called "tilt factors" because they
 are the amount of displacement applied to faces of an originally
 orthogonal box to transform it into the parallelepiped.
 
-By default, a *prism* region used with the create\_box command must
+By default, a *prism* region used with the create_box command must
 have tilt factors (xy,xz,yz) that do not skew the box more than half
 the distance of the parallel box length.  For example, if xlo = 2 and
 xhi = 12, then the x box length is 10 and the xy tilt factor must be
@@ -119,10 +115,8 @@ using the :doc:`change box <change_box>` command with its *ortho* and
    a parallel simulation to lose atoms the first time that LAMMPS
    shrink-wraps the box around the atoms.
 
-
 ----------
 
-
 The optional keywords can be used to create a system that allows for
 bond (angle, dihedral, improper) interactions, or for molecules with
 special 1-2,1-3,1-4 neighbors to be added later.  These optional
@@ -130,7 +124,7 @@ keywords serve the same purpose as the analogous keywords that can be
 used in a data file which are recognized by the
 :doc:`read_data <read_data>` command when it sets up a system.
 
-Note that if these keywords are not used, then the create\_box command
+Note that if these keywords are not used, then the create_box command
 creates an atomic (non-molecular) simulation that does not allow bonds
 between pairs of atoms to be defined, or a :doc:`bond potential <bond_style>` to be specified, or for molecules with
 special neighbors to be added to the system by commands such as
@@ -139,20 +133,17 @@ or :doc:`fix pour <fix_pour>`.
 
 As an example, see the examples/deposit/in.deposit.molecule script,
 which deposits molecules onto a substrate.  Initially there are no
-molecules in the system, but they are added later by the :doc:`fix deposit <fix_deposit>` command.  The create\_box command in the
+molecules in the system, but they are added later by the :doc:`fix deposit <fix_deposit>` command.  The create_box command in the
 script uses the bond/types and extra/bond/per/atom keywords to allow
 this.  If the added molecule contained more than 1 special bond
 (allowed by default), an extra/special/per/atom keyword would also
 need to be specified.
 
-
 ----------
 
-
 Restrictions
 """"""""""""
 
-
 An :doc:`atom_style <atom_style>` and :doc:`region <region>` must have
 been previously defined to use this command.
 
@@ -163,8 +154,3 @@ Related commands
 :doc:`region <region>`
 
 **Default:** none
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/delete_atoms.rst b/doc/src/delete_atoms.rst
index ca684b4a11..d695603ded 100644
--- a/doc/src/delete_atoms.rst
+++ b/doc/src/delete_atoms.rst
@@ -1,20 +1,19 @@
-.. index:: delete\_atoms
+.. index:: delete_atoms
 
-delete\_atoms command
-=====================
+delete_atoms command
+====================
 
 Syntax
 """"""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    delete_atoms style args keyword value ...
 
 * style = *group* or *region* or *overlap* or *porosity*
-  
+
   .. parsed-literal::
-  
+
        *group* args = group-ID
        *region* args = region-ID
        *overlap* args = cutoff group1-ID group2-ID
@@ -28,20 +27,17 @@ Syntax
 
 * zero or more keyword/value pairs may be appended
 * keyword = *compress* or *bond* or *mol*
-  
+
   .. parsed-literal::
-  
+
        *compress* value = *no* or *yes*
        *bond* value = *no* or *yes*
        *mol* value = *no* or *yes*
 
-
-
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    delete_atoms group edge
    delete_atoms region sphere compress no
@@ -139,7 +135,6 @@ part of molecules.
 Restrictions
 """"""""""""
 
-
 The *overlap* styles requires inter-processor communication to acquire
 ghost atoms and build a neighbor list.  This means that your system
 must be ready to perform a simulation before using this command (force
@@ -168,8 +163,3 @@ Default
 """""""
 
 The option defaults are compress = yes, bond = no, mol = no.
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/delete_bonds.rst b/doc/src/delete_bonds.rst
index 7a12376eee..9c42b5a2a0 100644
--- a/doc/src/delete_bonds.rst
+++ b/doc/src/delete_bonds.rst
@@ -1,22 +1,20 @@
-.. index:: delete\_bonds
+.. index:: delete_bonds
 
-delete\_bonds command
-=====================
+delete_bonds command
+====================
 
 Syntax
 """"""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    delete_bonds group-ID style arg keyword ...
 
 * group-ID = group ID
-* style = *multi* or *atom* or *bond* or *angle* or *dihedral* or
-          *improper* or *stats*
-  
+* style = *multi* or *atom* or *bond* or *angle* or *dihedral* or *improper* or *stats*
+
   .. parsed-literal::
-  
+
        *multi* arg = none
        *atom* arg = an atom type or range of types (see below)
        *bond* arg = a bond type or range of types (see below)
@@ -28,16 +26,14 @@ Syntax
 * zero or more keywords may be appended
 * keyword = *any* or *undo* or *remove* or *special*
 
-
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    delete_bonds frozen multi remove
    delete_bonds all atom 4 special
-   delete_bonds all bond 0\*3 special
+   delete_bonds all bond 0*3 special
    delete_bonds all stats
 
 Description
@@ -90,9 +86,9 @@ of all interactions in the specified group is simply reported.  This
 is useful for diagnostic purposes if bonds have been turned off by a
 bond-breaking potential during a previous run.
 
-The default behavior of the delete\_bonds command is to turn off
+The default behavior of the delete_bonds command is to turn off
 interactions by toggling their type to a negative value, but not to
-permanently remove the interaction.  E.g. a bond\_type of 2 is set to
+permanently remove the interaction.  E.g. a bond_type of 2 is set to
 -2.  The neighbor list creation routines will not include such an
 interaction in their interaction lists.  The default is also to not
 alter the list of 1-2, 1-3, 1-4 neighbors computed by the
@@ -109,7 +105,7 @@ interaction.  Instead, if any of the atoms in the interaction are in
 the specified group, it will be turned off (or on if the *undo*
 keyword is used).
 
-The *undo* keyword inverts the delete\_bonds command so that the
+The *undo* keyword inverts the delete_bonds command so that the
 specified bonds, angles, etc are turned on if they are currently
 turned off.  This means a negative value is toggled to positive.  For
 example, for style *angle*\ , if *type* is specified as 2, then all
@@ -117,14 +113,14 @@ angles with current type = -2, are reset to type = 2.  Note that the
 :doc:`fix shake <fix_shake>` command also sets bond and angle types
 negative, so this option should not be used on those interactions.
 
-The *remove* keyword is invoked at the end of the delete\_bonds
+The *remove* keyword is invoked at the end of the delete_bonds
 operation.  It causes turned-off bonds (angles, etc) to be removed
 from each atom's data structure and then adjusts the global bond
 (angle, etc) counts accordingly.  Removal is a permanent change;
 removed bonds cannot be turned back on via the *undo* keyword.
 Removal does not alter the pairwise 1-2, 1-3, 1-4 weighting list.
 
-The *special* keyword is invoked at the end of the delete\_bonds
+The *special* keyword is invoked at the end of the delete_bonds
 operation, after (optional) removal.  It re-computes the pairwise 1-2,
 1-3, 1-4 weighting list.  The weighting list computation treats
 turned-off bonds the same as turned-on.  Thus, turned-off bonds must
@@ -132,12 +128,11 @@ be removed if you wish to change the weighting list.
 
 Note that the choice of *remove* and *special* options affects how
 1-2, 1-3, 1-4 pairwise interactions will be computed across bonds that
-have been modified by the delete\_bonds command.
+have been modified by the delete_bonds command.
 
 Restrictions
 """"""""""""
 
-
 This command requires inter-processor communication to acquire ghost
 atoms, to coordinate the deleting of bonds, angles, etc between atoms
 shared by multiple processors.  This means that your system must be
@@ -161,8 +156,3 @@ Related commands
 :doc:`special_bonds <special_bonds>`, :doc:`fix shake <fix_shake>`
 
 **Default:** none
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/dielectric.rst b/doc/src/dielectric.rst
index 44a8f4176c..bd4f4dff56 100644
--- a/doc/src/dielectric.rst
+++ b/doc/src/dielectric.rst
@@ -6,7 +6,6 @@ dielectric command
 Syntax
 """"""
 
-
 .. parsed-literal::
 
    dielectric value
@@ -16,8 +15,7 @@ Syntax
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    dielectric 2.0
 
@@ -44,12 +42,6 @@ Related commands
 Default
 """""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    dielectric 1.0
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/dihedral_charmm.rst b/doc/src/dihedral_charmm.rst
index 46da2f9458..38cb18d172 100644
--- a/doc/src/dihedral_charmm.rst
+++ b/doc/src/dihedral_charmm.rst
@@ -1,25 +1,24 @@
-.. index:: dihedral\_style charmm
+.. index:: dihedral_style charmm
 
-dihedral\_style charmm command
-==============================
+dihedral_style charmm command
+=============================
 
-dihedral\_style charmm/intel command
-====================================
+dihedral_style charmm/intel command
+===================================
 
-dihedral\_style charmm/kk command
+dihedral_style charmm/kk command
+================================
+
+dihedral_style charmm/omp command
 =================================
 
-dihedral\_style charmm/omp command
-==================================
-
-dihedral\_style charmmfsw command
-=================================
+dihedral_style charmmfsw command
+================================
 
 Syntax
 """"""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    dihedral_style style
 
@@ -28,8 +27,7 @@ Syntax
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    dihedral_style charmm
    dihedral_style charmmfsw
@@ -42,8 +40,9 @@ Description
 
 The *charmm* and *charmmfsw* dihedral styles use the potential
 
-.. image:: Eqs/dihedral_charmm.jpg
-   :align: center
+.. math::
+
+   E = K [ 1 + \cos (n \phi - d) ]
 
 See :ref:`(MacKerell) <dihedral-MacKerell>` for a description of the CHARMM
 force field.  This dihedral style can also be used for the AMBER force
@@ -66,9 +65,9 @@ The following coefficients must be defined for each dihedral type via the
 the data file or restart files read by the :doc:`read_data <read_data>`
 or :doc:`read_restart <read_restart>` commands:
 
-* K (energy)
-* n (integer >= 0)
-* d (integer value of degrees)
+* :math:`K` (energy)
+* :math:`n` (integer >= 0)
+* :math:`d` (integer value of degrees)
 * weighting factor (1.0, 0.5, or 0.0)
 
 The weighting factor is required to correct for double counting
@@ -91,12 +90,12 @@ the ring in the opposite direction and thus the weighting factor is
 Note that this dihedral weighting factor is unrelated to the scaling
 factor specified by the :doc:`special bonds <special_bonds>` command
 which applies to all 1-4 interactions in the system.  For CHARMM force
-fields, the special\_bonds 1-4 interaction scaling factor should be set
+fields, the special_bonds 1-4 interaction scaling factor should be set
 to 0.0. Since the corresponding 1-4 non-bonded interactions are
 computed with the dihedral.  This means that if any of the weighting
 factors defined as dihedral coefficients (4th coeff above) are
 non-zero, then you must use a pair style with "lj/charmm" and set the
-special\_bonds 1-4 scaling factor to 0.0 (which is the
+special_bonds 1-4 scaling factor to 0.0 (which is the
 default). Otherwise 1-4 non-bonded interactions in dihedrals will be
 computed twice.
 
@@ -111,11 +110,11 @@ i.e. within the outer cutoff specified for the pair style.  The
 :doc:`pair_style lj/charmmfsw/coul/long <pair_charmm>` commands.  Use
 the *charmm* style with the older :doc:`pair_style <pair_charmm>`
 commands that have just "charmm" in their style name.  See the
-discussion on the :doc:`CHARMM pair\_style <pair_charmm>` doc page for
+discussion on the :doc:`CHARMM pair_style <pair_charmm>` doc page for
 details.
 
 Note that for AMBER force fields, which use pair styles with "lj/cut",
-the special\_bonds 1-4 scaling factor should be set to the AMBER
+the special_bonds 1-4 scaling factor should be set to the AMBER
 defaults (1/2 and 5/6) and all the dihedral weighting factors (4th
 coeff above) must be set to 0.0. In this case, you can use any pair
 style you wish, since the dihedral does not need any Lennard-Jones
@@ -124,10 +123,8 @@ interactions.  Likewise the *charmm* or *charmmfsw* styles are
 identical in this case since no 1-4 non-bonded interactions are
 computed.
 
-
 ----------
 
-
 Styles with a *gpu*\ , *intel*\ , *kk*\ , *omp*\ , or *opt* suffix are
 functionally the same as the corresponding style without the suffix.
 They have been optimized to run faster, depending on your available
@@ -146,15 +143,12 @@ by including their suffix, or you can use the :doc:`-suffix command-line switch
 See the :doc:`Speed packages <Speed_packages>` doc page for more
 instructions on how to use the accelerated styles effectively.
 
-
 ----------
 
-
 Restrictions
 """"""""""""
 
-
-When using run\_style :doc:`respa <run_style>`, these dihedral styles
+When using run_style :doc:`respa <run_style>`, these dihedral styles
 must be assigned to the same r-RESPA level as *pair* or *outer*\ .
 
 When used in combination with CHARMM pair styles, the 1-4
@@ -173,25 +167,14 @@ Related commands
 
 **Default:** none
 
-
 ----------
 
-
 .. _dihedral-Cornell:
 
-
-
 **(Cornell)** Cornell, Cieplak, Bayly, Gould, Merz, Ferguson,
 Spellmeyer, Fox, Caldwell, Kollman, JACS 117, 5179-5197 (1995).
 
 .. _dihedral-MacKerell:
 
-
-
 **(MacKerell)** MacKerell, Bashford, Bellott, Dunbrack, Evanseck, Field,
 Fischer, Gao, Guo, Ha, et al, J Phys Chem B, 102, 3586 (1998).
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/dihedral_class2.rst b/doc/src/dihedral_class2.rst
index fd26167f65..034020429b 100644
--- a/doc/src/dihedral_class2.rst
+++ b/doc/src/dihedral_class2.rst
@@ -1,154 +1,159 @@
-.. index:: dihedral\_style class2
+.. index:: dihedral_style class2
 
-dihedral\_style class2 command
-==============================
+dihedral_style class2 command
+=============================
 
-dihedral\_style class2/omp command
-==================================
-
-dihedral\_style class2/kk command
+dihedral_style class2/omp command
 =================================
 
+dihedral_style class2/kk command
+================================
+
 Syntax
 """"""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    dihedral_style class2
 
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    dihedral_style class2
    dihedral_coeff 1 100 75 100 70 80 60
-   dihedral_coeff \* mbt 3.5945 0.1704 -0.5490 1.5228
-   dihedral_coeff \* ebt 0.3417 0.3264 -0.9036 0.1368 0.0 -0.8080 1.0119 1.1010
+   dihedral_coeff * mbt 3.5945 0.1704 -0.5490 1.5228
+   dihedral_coeff * ebt 0.3417 0.3264 -0.9036 0.1368 0.0 -0.8080 1.0119 1.1010
    dihedral_coeff 2 at 0.0 -0.1850 -0.7963 -2.0220 0.0 -0.3991 110.2453 105.1270
-   dihedral_coeff \* aat -13.5271 110.2453 105.1270
-   dihedral_coeff \* bb13 0.0 1.0119 1.1010
+   dihedral_coeff * aat -13.5271 110.2453 105.1270
+   dihedral_coeff * bb13 0.0 1.0119 1.1010
 
 Description
 """""""""""
 
 The *class2* dihedral style uses the potential
 
-.. image:: Eqs/dihedral_class2.jpg
-   :align: center
+.. math::
 
-where Ed is the dihedral term, Embt is a middle-bond-torsion term,
-Eebt is an end-bond-torsion term, Eat is an angle-torsion term, Eaat
-is an angle-angle-torsion term, and Ebb13 is a bond-bond-13 term.
+   E        = & E_d + E_{mbt} + E_{ebt} + E_{at} + E_{aat} + E_{bb13} \\
+   E_d      = & \sum_{n=1}^{3} K_n [ 1 - \cos (n \phi - \phi_n) ] \\
+   E_{mbt}  = & (r_{jk} - r_2) [ A_1 \cos (\phi) + A_2 \cos (2\phi) + A_3 \cos (3\phi) ] \\
+   E_{ebt}  = & (r_{ij} - r_1) [ B_1 \cos (\phi) + B_2 \cos (2\phi) + B_3 \cos (3\phi) ] + \\
+              & (r_{kl} - r_3) [ C_1 \cos (\phi) + C_2 \cos (2\phi) + C_3 \cos (3\phi) ] \\
+   E_{at}   = & (\theta_{ijk} - \theta_1) [ D_1 \cos (\phi) + D_2 \cos (2\phi) + D_3 \cos (3\phi) ] + \\
+              & (\theta_{jkl} - \theta_2) [ E_1 \cos (\phi) + E_2 \cos (2\phi) + E_3 \cos (3\phi) ] \\
+   E_{aat}  = & M (\theta_{ijk} - \theta_1) (\theta_{jkl} - \theta_2) \cos (\phi) \\
+   E_{bb13} = & N (r_{ij} - r_1) (r_{kl} - r_3)
 
-Theta1 and theta2 are equilibrium angles and r1 r2 r3 are equilibrium
-bond lengths.
+where :math:`E_d` is the dihedral term, :math:`E_{mbt}` is a middle-bond-torsion term,
+:math:`E_{ebt}` is an end-bond-torsion term, :math:`E_{at}` is an angle-torsion term, :math:`E_{aat}`
+is an angle-angle-torsion term, and :math:`E_{bb13}` is a bond-bond-13 term.
+
+:math:`\theta_1` and :math:`\theta_2` are equilibrium angles and :math:`r_1`, :math:`r_2`, and
+:math:`r_3` are equilibrium bond lengths.
 
 See :ref:`(Sun) <dihedral-Sun>` for a description of the COMPASS class2 force field.
 
-Coefficients for the Ed, Embt, Eebt, Eat, Eaat, and Ebb13 formulas
-must be defined for each dihedral type via the
-:doc:`dihedral_coeff <dihedral_coeff>` command as in the example above,
-or in the data file or restart files read by the
-:doc:`read_data <read_data>` or :doc:`read_restart <read_restart>`
-commands.
+Coefficients for the :math:`E_d`, :math:`E_{mbt}`, :math:`E_{ebt}`,
+:math:`E_{at}`, :math:`E_{aat}`, and :math:`E_{bb13}` formulas must be
+defined for each dihedral type via the :doc:`dihedral_coeff <dihedral_coeff>`
+command as in the example above, or in the data file
+or restart files read by the :doc:`read_data <read_data>` or
+:doc:`read_restart <read_restart>` commands.
 
-These are the 6 coefficients for the Ed formula:
+These are the 6 coefficients for the :math:`E_d` formula:
 
-* K1 (energy)
-* phi1 (degrees)
-* K2 (energy)
-* phi2 (degrees)
-* K3 (energy)
-* phi3 (degrees)
+* :math:`K_1` (energy)
+* :math:`\phi_1` (degrees)
+* :math:`K_2` (energy)
+* :math:`\phi_2` (degrees)
+* :math:`K_3` (energy)
+* :math:`phi_3` (degrees)
 
-For the Embt formula, each line in a
+For the :math:`E_{mbt}` formula, each line in a
 :doc:`dihedral_coeff <dihedral_coeff>` command in the input script lists
-5 coefficients, the first of which is "mbt" to indicate they are
+5 coefficients, the first of which is *mbt* to indicate they are
 MiddleBondTorsion coefficients.  In a data file, these coefficients
-should be listed under a "MiddleBondTorsion Coeffs" heading and you
-must leave out the "mbt", i.e. only list 4 coefficients after the
+should be listed under a *MiddleBondTorsion Coeffs* heading and you
+must leave out the *mbt*, i.e. only list 4 coefficients after the
 dihedral type.
 
-* mbt
-* A1 (energy/distance)
-* A2 (energy/distance)
-* A3 (energy/distance)
-* r2 (distance)
+* *mbt*
+* :math:`A_1` (energy/distance)
+* :math:`A_2` (energy/distance)
+* :math:`A_3` (energy/distance)
+* :math:`r_2` (distance)
 
-For the Eebt formula, each line in a
+For the :math:`E_{ebt}` formula, each line in a
 :doc:`dihedral_coeff <dihedral_coeff>` command in the input script lists
-9 coefficients, the first of which is "ebt" to indicate they are
+9 coefficients, the first of which is *ebt* to indicate they are
 EndBondTorsion coefficients.  In a data file, these coefficients
-should be listed under a "EndBondTorsion Coeffs" heading and you must
-leave out the "ebt", i.e. only list 8 coefficients after the dihedral
+should be listed under a *EndBondTorsion Coeffs* heading and you must
+leave out the *ebt*, i.e. only list 8 coefficients after the dihedral
 type.
 
-* ebt
-* B1 (energy/distance)
-* B2 (energy/distance)
-* B3 (energy/distance)
-* C1 (energy/distance)
-* C2 (energy/distance)
-* C3 (energy/distance)
-* r1 (distance)
-* r3 (distance)
+* *ebt*
+* :math:`B_1` (energy/distance)
+* :math:`B_2` (energy/distance)
+* :math:`B_3` (energy/distance)
+* :math:`C_1` (energy/distance)
+* :math:`C_2` (energy/distance)
+* :math:`C_3` (energy/distance)
+* :math:`r_1` (distance)
+* :math:`r_3` (distance)
 
-For the Eat formula, each line in a
+For the :math:`E_{at}` formula, each line in a
 :doc:`dihedral_coeff <dihedral_coeff>` command in the input script lists
-9 coefficients, the first of which is "at" to indicate they are
+9 coefficients, the first of which is *at* to indicate they are
 AngleTorsion coefficients.  In a data file, these coefficients should
-be listed under a "AngleTorsion Coeffs" heading and you must leave out
-the "at", i.e. only list 8 coefficients after the dihedral type.
+be listed under a *AngleTorsion Coeffs* heading and you must leave out
+the *at*, i.e. only list 8 coefficients after the dihedral type.
 
-* at
-* D1 (energy/radian)
-* D2 (energy/radian)
-* D3 (energy/radian)
-* E1 (energy/radian)
-* E2 (energy/radian)
-* E3 (energy/radian)
-* theta1 (degrees)
-* theta2 (degrees)
+* *at*
+* :math:`D_1` (energy/radian)
+* :math:`D_2` (energy/radian)
+* :math:`D_3` (energy/radian)
+* :math:`E_1` (energy/radian)
+* :math:`E_2` (energy/radian)
+* :math:`E_3` (energy/radian)
+* :math:`\theta_1` (degrees)
+* :math:`\theta_2` (degrees)
 
-Theta1 and theta2 are specified in degrees, but LAMMPS converts them
-to radians internally; hence the units of D and E are in
+:math:`\theta_1` and :math:`\theta_2` are specified in degrees, but LAMMPS converts
+them to radians internally; hence the units of :math:`D` and :math:`E` are in
 energy/radian.
 
-For the Eaat formula, each line in a
+For the :math:`E_{aat}` formula, each line in a
 :doc:`dihedral_coeff <dihedral_coeff>` command in the input script lists
-4 coefficients, the first of which is "aat" to indicate they are
+4 coefficients, the first of which is *aat* to indicate they are
 AngleAngleTorsion coefficients.  In a data file, these coefficients
-should be listed under a "AngleAngleTorsion Coeffs" heading and you
-must leave out the "aat", i.e. only list 3 coefficients after the
+should be listed under a *AngleAngleTorsion Coeffs* heading and you
+must leave out the *aat*, i.e. only list 3 coefficients after the
 dihedral type.
 
-* aat
-* M (energy/radian\^2)
-* theta1 (degrees)
-* theta2 (degrees)
+* *aat*
+* :math:`M` (energy/radian\^2)
+* :math:`\theta_1` (degrees)
+* :math:`\theta_2` (degrees)
 
-Theta1 and theta2 are specified in degrees, but LAMMPS converts them
-to radians internally; hence the units of M are in energy/radian\^2.
+:math:`\theta_1` and :math:`\theta_2` are specified in degrees, but LAMMPS converts
+them to radians internally; hence the units of M are in energy/radian\^2.
 
-For the Ebb13 formula, each line in a
+For the :math:`E_{bb13}` formula, each line in a
 :doc:`dihedral_coeff <dihedral_coeff>` command in the input script lists
-4 coefficients, the first of which is "bb13" to indicate they are
+4 coefficients, the first of which is *bb13* to indicate they are
 BondBond13 coefficients.  In a data file, these coefficients should be
-listed under a "BondBond13 Coeffs" heading and you must leave out the
-"bb13", i.e. only list 3 coefficients after the dihedral type.
-
-* bb13
-* N (energy/distance\^2)
-* r1 (distance)
-* r3 (distance)
+listed under a *BondBond13 Coeffs* heading and you must leave out the
+*bb13*, i.e. only list 3 coefficients after the dihedral type.
 
+* *bb13*
+* :math:`N` (energy/distance\^2)
+* :math:`r_1` (distance)
+* :math:`r_3` (distance)
 
 ----------
 
-
 Styles with a *gpu*\ , *intel*\ , *kk*\ , *omp*\ , or *opt* suffix are
 functionally the same as the corresponding style without the suffix.
 They have been optimized to run faster, depending on your available
@@ -167,14 +172,11 @@ by including their suffix, or you can use the :doc:`-suffix command-line switch
 See the :doc:`Speed packages <Speed_packages>` doc page for more
 instructions on how to use the accelerated styles effectively.
 
-
 ----------
 
-
 Restrictions
 """"""""""""
 
-
 This dihedral style can only be used if LAMMPS was built with the
 CLASS2 package.  See the :doc:`Build package <Build_package>` doc
 page for more info.
@@ -186,17 +188,8 @@ Related commands
 
 **Default:** none
 
-
 ----------
 
-
 .. _dihedral-Sun:
 
-
-
 **(Sun)** Sun, J Phys Chem B 102, 7338-7364 (1998).
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/dihedral_coeff.rst b/doc/src/dihedral_coeff.rst
index 4a3f0cd487..d72a299416 100644
--- a/doc/src/dihedral_coeff.rst
+++ b/doc/src/dihedral_coeff.rst
@@ -1,13 +1,12 @@
-.. index:: dihedral\_coeff
+.. index:: dihedral_coeff
 
-dihedral\_coeff command
-=======================
+dihedral_coeff command
+======================
 
 Syntax
 """"""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    dihedral_coeff N args
 
@@ -17,12 +16,11 @@ Syntax
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    dihedral_coeff 1 80.0 1 3
-   dihedral_coeff \* 80.0 1 3 0.5
-   dihedral_coeff 2\* 80.0 1 3 0.5
+   dihedral_coeff * 80.0 1 3 0.5
+   dihedral_coeff 2* 80.0 1 3 0.5
 
 Description
 """""""""""
@@ -41,24 +39,22 @@ leading asterisk means all types from 1 to n (inclusive).  A trailing
 asterisk means all types from n to N (inclusive).  A middle asterisk
 means all types from m to n (inclusive).
 
-Note that using a dihedral\_coeff command can override a previous setting
+Note that using a dihedral_coeff command can override a previous setting
 for the same dihedral type.  For example, these commands set the coeffs
 for all dihedral types, then overwrite the coeffs for just dihedral type 2:
 
+.. code-block:: LAMMPS
 
-.. parsed-literal::
-
-   dihedral_coeff \* 80.0 1 3
+   dihedral_coeff * 80.0 1 3
    dihedral_coeff 2 200.0 1 3
 
 A line in a data file that specifies dihedral coefficients uses the exact
-same format as the arguments of the dihedral\_coeff command in an input
+same format as the arguments of the dihedral_coeff command in an input
 script, except that wild-card asterisks should not be used since
 coefficients for all N types must be listed in the file.  For example,
 under the "Dihedral Coeffs" section of a data file, the line that
 corresponds to the 1st example above would be listed as
 
-
 .. parsed-literal::
 
    1 80.0 1 3
@@ -79,26 +75,21 @@ page for details.
    to define *K* appropriately to account for this difference if
    necessary.
 
-
 ----------
 
-
 The list of all dihedral styles defined in LAMMPS is given on the
 :doc:`dihedral_style <dihedral_style>` doc page.  They are also listed
 in more compact form on the :ref:`Commands dihedral <dihedral>` doc page.
 
 On either of those pages, click on the style to display the formula it
 computes and its coefficients as specified by the associated
-dihedral\_coeff command.
-
+dihedral_coeff command.
 
 ----------
 
-
 Restrictions
 """"""""""""
 
-
 This command must come after the simulation box is defined by a
 :doc:`read_data <read_data>`, :doc:`read_restart <read_restart>`, or
 :doc:`create_box <create_box>` command.
@@ -112,8 +103,3 @@ Related commands
 :doc:`dihedral_style <dihedral_style>`
 
 **Default:** none
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/dihedral_cosine_shift_exp.rst b/doc/src/dihedral_cosine_shift_exp.rst
index 2a9aadc99e..4ce537409c 100644
--- a/doc/src/dihedral_cosine_shift_exp.rst
+++ b/doc/src/dihedral_cosine_shift_exp.rst
@@ -1,24 +1,22 @@
-.. index:: dihedral\_style cosine/shift/exp
+.. index:: dihedral_style cosine/shift/exp
 
-dihedral\_style cosine/shift/exp command
-========================================
+dihedral_style cosine/shift/exp command
+=======================================
 
-dihedral\_style cosine/shift/exp/omp command
-============================================
+dihedral_style cosine/shift/exp/omp command
+===========================================
 
 Syntax
 """"""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    dihedral_style cosine/shift/exp
 
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    dihedral_style cosine/shift/exp
    dihedral_coeff 1 10.0 45.0 2.0
@@ -28,21 +26,23 @@ Description
 
 The *cosine/shift/exp* dihedral style uses the potential
 
-.. image:: Eqs/dihedral_cosine_shift_exp.jpg
-   :align: center
+.. math::
 
-where Umin, theta, and a are defined for each dihedral type.
+   E = -U_{min}\frac{e^{-a U(\theta,\theta_0)}-1}{e^a-1} \quad\mbox{with}\quad U(\theta,\theta_0)=-0.5 \left(1+\cos(\theta-\theta_0) \right)
 
-The potential is bounded between [-Umin:0] and the minimum is located
-at the angle theta0. The a parameter can be both positive or negative
+where :math:`U_{min}`, :math:`\theta`, and :math:`a` are defined for
+each dihedral type.
+
+The potential is bounded between :math:`\left[-U_{min}:0\right]` and the minimum is located
+at the angle :math:`\theta_0`. The a parameter can be both positive or negative
 and is used to control the spring constant at the equilibrium.
 
-The spring constant is given by k=a exp(a) Umin/ [2 (Exp(a)-1)].
-For a>3 k/Umin = a/2 to better than 5% relative error. For negative
+The spring constant is given by :math:`k=a e^a \frac{U_{min}}{2 \left(e^a-1\right)}`.
+For :math:`a>3` and  :math:`\frac{k}{U_{min}} = \frac{a}{2}` to better than 5% relative error. For negative
 values of the a parameter, the spring constant is essentially zero,
 and anharmonic terms takes over. The potential is furthermore well
-behaved in the limit a->0, where it has been implemented to linear
-order in a for a < 0.001.
+behaved in the limit :math:`a \rightarrow 0`, where it has been implemented to linear
+order in :math:`a` for :math:`a < 0.001`.
 
 The following coefficients must be defined for each dihedral type via
 the :doc:`dihedral_coeff <dihedral_coeff>` command as in the example
@@ -50,14 +50,12 @@ above, or in the data file or restart files read by the
 :doc:`read_data <read_data>` or :doc:`read_restart <read_restart>`
 commands:
 
-* umin (energy)
-* theta (angle)
-* A (real number)
-
+* :math:`U_{min}` (energy)
+* :math:`\theta` (angle)
+* :math:`a` (real number)
 
 ----------
 
-
 Styles with a *gpu*\ , *intel*\ , *kk*\ , *omp*\ , or *opt* suffix are
 functionally the same as the corresponding style without the suffix.
 They have been optimized to run faster, depending on your available
@@ -76,14 +74,11 @@ by including their suffix, or you can use the :doc:`-suffix command-line switch
 See the :doc:`Speed packages <Speed_packages>` doc page for more
 instructions on how to use the accelerated styles effectively.
 
-
 ----------
 
-
 Restrictions
 """"""""""""
 
-
 This dihedral style can only be used if LAMMPS was built with the
 USER-MISC package.  See the :doc:`Build package <Build_package>` doc
 page for more info.
@@ -92,11 +87,6 @@ Related commands
 """"""""""""""""
 
 :doc:`dihedral_coeff <dihedral_coeff>`,
-:doc:`angle\_cosine\_shift\_exp <angle_cosine_shift_exp>`
+:doc:`angle_style cosine/shift/exp <angle_cosine_shift_exp>`
 
 **Default:** none
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/dihedral_fourier.rst b/doc/src/dihedral_fourier.rst
index 0156cdce26..ad5f1f6586 100644
--- a/doc/src/dihedral_fourier.rst
+++ b/doc/src/dihedral_fourier.rst
@@ -1,27 +1,25 @@
-.. index:: dihedral\_style fourier
+.. index:: dihedral_style fourier
 
-dihedral\_style fourier command
-===============================
+dihedral_style fourier command
+==============================
 
-dihedral\_style fourier/intel command
-=====================================
+dihedral_style fourier/intel command
+====================================
 
-dihedral\_style fourier/omp command
-===================================
+dihedral_style fourier/omp command
+==================================
 
 Syntax
 """"""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    dihedral_style fourier
 
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    dihedral_style fourier
    dihedral_coeff 1 3 -0.846200 3 0.0 7.578800 1 0 0.138000 2 -180.0
@@ -31,27 +29,26 @@ Description
 
 The *fourier* dihedral style uses the potential:
 
-.. image:: Eqs/dihedral_fourier.jpg
-   :align: center
+.. math::
+
+   E = \sum_{i=1,m} K_i  [ 1.0 + \cos ( n_i \phi - d_i ) ]
 
 The following coefficients must be defined for each dihedral type via the
 :doc:`dihedral_coeff <dihedral_coeff>` command as in the example above, or in
 the data file or restart files read by the :doc:`read_data <read_data>`
 or :doc:`read_restart <read_restart>` commands:
 
-* m (integer >=1)
-* K1 (energy)
-* n1 (integer >= 0)
-* d1 (degrees)
+* :math:`m` (integer >=1)
+* :math:`K_1` (energy)
+* :math:`n_1` (integer >= 0)
+* :math:`d_1` (degrees)
 * [...]
-* Km (energy)
-* nm (integer >= 0)
-* dm (degrees)
-
+* :math:`K_m` (energy)
+* :math:`n_m` (integer >= 0)
+* :math:`d_m` (degrees)
 
 ----------
 
-
 Styles with a *gpu*\ , *intel*\ , *kk*\ , *omp*\ , or *opt* suffix are
 functionally the same as the corresponding style without the suffix.
 They have been optimized to run faster, depending on your available
@@ -70,16 +67,13 @@ by including their suffix, or you can use the :doc:`-suffix command-line switch
 See the :doc:`Speed packages <Speed_packages>` doc page for more
 instructions on how to use the accelerated styles effectively.
 
-
 ----------
 
-
 Restrictions
 """"""""""""
 
-
 This angle style can only be used if LAMMPS was built with the
-USER\_MISC package.  See the :doc:`Build package <Build_package>` doc
+USER_MISC package.  See the :doc:`Build package <Build_package>` doc
 page for more info.
 
 Related commands
@@ -88,8 +82,3 @@ Related commands
 :doc:`dihedral_coeff <dihedral_coeff>`
 
 **Default:** none
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/dihedral_harmonic.rst b/doc/src/dihedral_harmonic.rst
index 8f711f0f63..703b96cf95 100644
--- a/doc/src/dihedral_harmonic.rst
+++ b/doc/src/dihedral_harmonic.rst
@@ -1,30 +1,28 @@
-.. index:: dihedral\_style harmonic
+.. index:: dihedral_style harmonic
 
-dihedral\_style harmonic command
-================================
+dihedral_style harmonic command
+===============================
 
-dihedral\_style harmonic/intel command
-======================================
+dihedral_style harmonic/intel command
+=====================================
 
-dihedral\_style harmonic/kk command
+dihedral_style harmonic/kk command
+==================================
+
+dihedral_style harmonic/omp command
 ===================================
 
-dihedral\_style harmonic/omp command
-====================================
-
 Syntax
 """"""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    dihedral_style harmonic
 
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    dihedral_style harmonic
    dihedral_coeff 1 80.0 1 2
@@ -34,17 +32,18 @@ Description
 
 The *harmonic* dihedral style uses the potential
 
-.. image:: Eqs/dihedral_harmonic.jpg
-   :align: center
+.. math::
+
+   E = K [ 1 + d  \cos (n \phi) ]
 
 The following coefficients must be defined for each dihedral type via the
 :doc:`dihedral_coeff <dihedral_coeff>` command as in the example above, or in
 the data file or restart files read by the :doc:`read_data <read_data>`
 or :doc:`read_restart <read_restart>` commands:
 
-* K (energy)
-* d (+1 or -1)
-* n (integer >= 0)
+* :math:`K` (energy)
+* :math:`d` (+1 or -1)
+* :math:`n` (integer >= 0)
 
 .. note::
 
@@ -55,15 +54,12 @@ or :doc:`read_restart <read_restart>` commands:
 
 * The LAMMPS convention is that the trans position = 180 degrees, while
   in some force fields trans = 0 degrees.
-* Some force fields reverse the sign convention on *d*\ .
-* Some force fields let *n* be positive or negative which corresponds to
-  *d* = 1 or -1 for the harmonic style.
-
-
+* Some force fields reverse the sign convention on :math:`d`.
+* Some force fields let :math:`n` be positive or negative which corresponds to
+  :math:`d = 1` or :math:`d = -1` for the harmonic style.
 
 ----------
 
-
 Styles with a *gpu*\ , *intel*\ , *kk*\ , *omp*\ , or *opt* suffix are
 functionally the same as the corresponding style without the suffix.
 They have been optimized to run faster, depending on your available
@@ -82,14 +78,11 @@ by including their suffix, or you can use the :doc:`-suffix command-line switch
 See the :doc:`Speed packages <Speed_packages>` doc page for more
 instructions on how to use the accelerated styles effectively.
 
-
 ----------
 
-
 Restrictions
 """"""""""""
 
-
 This dihedral style can only be used if LAMMPS was built with the
 MOLECULE package.  See the :doc:`Build package <Build_package>` doc page
 for more info.
@@ -100,8 +93,3 @@ Related commands
 :doc:`dihedral_coeff <dihedral_coeff>`
 
 **Default:** none
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/dihedral_helix.rst b/doc/src/dihedral_helix.rst
index 19086e1aeb..00c0006e98 100644
--- a/doc/src/dihedral_helix.rst
+++ b/doc/src/dihedral_helix.rst
@@ -1,24 +1,22 @@
-.. index:: dihedral\_style helix
+.. index:: dihedral_style helix
 
-dihedral\_style helix command
-=============================
+dihedral_style helix command
+============================
 
-dihedral\_style helix/omp command
-=================================
+dihedral_style helix/omp command
+================================
 
 Syntax
 """"""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    dihedral_style helix
 
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    dihedral_style helix
    dihedral_coeff 1 80.0 100.0 40.0
@@ -28,15 +26,18 @@ Description
 
 The *helix* dihedral style uses the potential
 
-.. image:: Eqs/dihedral_helix.jpg
-   :align: center
+.. math::
+
+   E = A [1 - \cos(\theta)] + B [1 + \cos(3 \theta)] +
+       C [1 + \cos(\theta + \frac{\pi}{4})]
 
 This coarse-grain dihedral potential is described in :ref:`(Guo) <Guo>`.
 For dihedral angles in the helical region, the energy function is
 represented by a standard potential consisting of three minima, one
 corresponding to the trans (t) state and the other to gauche states
-(g+ and g-).  The paper describes how the A,B,C parameters are chosen
-so as to balance secondary (largely driven by local interactions) and
+(g+ and g-).  The paper describes how the :math:`A`, :math:`B` and,
+:math:`C` parameters are chosen so as to balance secondary (largely
+driven by local interactions) and
 tertiary structure (driven by long-range interactions).
 
 The following coefficients must be defined for each dihedral type via the
@@ -44,14 +45,12 @@ The following coefficients must be defined for each dihedral type via the
 the data file or restart files read by the :doc:`read_data <read_data>`
 or :doc:`read_restart <read_restart>` commands:
 
-* A (energy)
-* B (energy)
-* C (energy)
-
+* :math:`A` (energy)
+* :math:`B` (energy)
+* :math:`C` (energy)
 
 ----------
 
-
 Styles with a *gpu*\ , *intel*\ , *kk*\ , *omp*\ , or *opt* suffix are
 functionally the same as the corresponding style without the suffix.
 They have been optimized to run faster, depending on your available
@@ -70,14 +69,11 @@ by including their suffix, or you can use the :doc:`-suffix command-line switch
 See the :doc:`Speed packages <Speed_packages>` doc page for more
 instructions on how to use the accelerated styles effectively.
 
-
 ----------
 
-
 Restrictions
 """"""""""""
 
-
 This dihedral style can only be used if LAMMPS was built with the
 MOLECULE package.  See the :doc:`Build package <Build_package>` doc page
 for more info.
@@ -89,17 +85,8 @@ Related commands
 
 **Default:** none
 
-
 ----------
 
-
 .. _Guo:
 
-
-
 **(Guo)** Guo and Thirumalai, Journal of Molecular Biology, 263, 323-43 (1996).
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/dihedral_hybrid.rst b/doc/src/dihedral_hybrid.rst
index f67b1185fe..9fe4478f67 100644
--- a/doc/src/dihedral_hybrid.rst
+++ b/doc/src/dihedral_hybrid.rst
@@ -1,13 +1,12 @@
-.. index:: dihedral\_style hybrid
+.. index:: dihedral_style hybrid
 
-dihedral\_style hybrid command
-==============================
+dihedral_style hybrid command
+=============================
 
 Syntax
 """"""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    dihedral_style hybrid style1 style2 ...
 
@@ -16,12 +15,11 @@ Syntax
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    dihedral_style hybrid harmonic helix
    dihedral_coeff 1 harmonic 6.0 1 3
-   dihedral_coeff 2\* helix 10 10 10
+   dihedral_coeff 2* helix 10 10 10
 
 Description
 """""""""""
@@ -34,10 +32,10 @@ boundary (of dihedral type 2) could be computed with a *helix*
 potential.  The assignment of dihedral type to style is made via the
 :doc:`dihedral_coeff <dihedral_coeff>` command or in the data file.
 
-In the dihedral\_coeff commands, the name of a dihedral style must be
+In the dihedral_coeff commands, the name of a dihedral style must be
 added after the dihedral type, with the remaining coefficients being
 those appropriate to that style.  In the example above, the 2
-dihedral\_coeff commands set dihedrals of dihedral type 1 to be
+dihedral_coeff commands set dihedrals of dihedral type 1 to be
 computed with a *harmonic* potential with coefficients 6.0, 1, 3 for
 K, d, n.  All other dihedral types (2-N) are computed with a *helix*
 potential with coefficients 10, 10, 10 for A, B, C.
@@ -47,7 +45,6 @@ If dihedral coefficients are specified in the data file read via the
 E.g. "harmonic" or "helix", must be added after the dihedral type, for
 each line in the "Dihedral Coeffs" section, e.g.
 
-
 .. parsed-literal::
 
    Dihedral Coeffs
@@ -64,7 +61,6 @@ lines in the AngleTorsion (or EndBondTorsion, etc) section of the data
 file for dihedral types that are not *class2*\ , you must use an
 dihedral style of *skip* as a placeholder, e.g.
 
-
 .. parsed-literal::
 
    AngleTorsion Coeffs
@@ -78,25 +74,22 @@ input script, since AngleTorsion (or EndBondTorsion, etc) coefficients
 need not be specified at all for dihedral types that are not *class2*\ .
 
 A dihedral style of *none* with no additional coefficients can be used
-in place of a dihedral style, either in a input script dihedral\_coeff
+in place of a dihedral style, either in a input script dihedral_coeff
 command or in the data file, if you desire to turn off interactions
 for specific dihedral types.
 
-
 ----------
 
-
 Restrictions
 """"""""""""
 
-
 This dihedral style can only be used if LAMMPS was built with the
 MOLECULE package.  See the :doc:`Build package <Build_package>` doc page
 for more info.
 
 Unlike other dihedral styles, the hybrid dihedral style does not store
 dihedral coefficient info for individual sub-styles in a :doc:`binary restart files <restart>`.  Thus when restarting a simulation from a
-restart file, you need to re-specify dihedral\_coeff commands.
+restart file, you need to re-specify dihedral_coeff commands.
 
 Related commands
 """"""""""""""""
@@ -104,8 +97,3 @@ Related commands
 :doc:`dihedral_coeff <dihedral_coeff>`
 
 **Default:** none
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/dihedral_multi_harmonic.rst b/doc/src/dihedral_multi_harmonic.rst
index e304685a68..11d4419202 100644
--- a/doc/src/dihedral_multi_harmonic.rst
+++ b/doc/src/dihedral_multi_harmonic.rst
@@ -1,24 +1,22 @@
-.. index:: dihedral\_style multi/harmonic
+.. index:: dihedral_style multi/harmonic
 
-dihedral\_style multi/harmonic command
-======================================
+dihedral_style multi/harmonic command
+=====================================
 
-dihedral\_style multi/harmonic/omp command
-==========================================
+dihedral_style multi/harmonic/omp command
+=========================================
 
 Syntax
 """"""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    dihedral_style multi/harmonic
 
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    dihedral_style multi/harmonic
    dihedral_coeff 1 20 20 20 20 20
@@ -28,24 +26,23 @@ Description
 
 The *multi/harmonic* dihedral style uses the potential
 
-.. image:: Eqs/dihedral_multi_harmonic.jpg
-   :align: center
+.. math::
+
+   E = \sum_{n=1,5} A_n  \cos^{n-1}(\phi)
 
 The following coefficients must be defined for each dihedral type via the
 :doc:`dihedral_coeff <dihedral_coeff>` command as in the example above, or in
 the data file or restart files read by the :doc:`read_data <read_data>`
 or :doc:`read_restart <read_restart>` commands:
 
-* A1 (energy)
-* A2 (energy)
-* A3 (energy)
-* A4 (energy)
-* A5 (energy)
-
+* :math:`A_1` (energy)
+* :math:`A_2` (energy)
+* :math:`A_3` (energy)
+* :math:`A_4` (energy)
+* :math:`A_5` (energy)
 
 ----------
 
-
 Styles with a *gpu*\ , *intel*\ , *kk*\ , *omp*\ , or *opt* suffix are
 functionally the same as the corresponding style without the suffix.
 They have been optimized to run faster, depending on your available
@@ -64,14 +61,11 @@ by including their suffix, or you can use the :doc:`-suffix command-line switch
 See the :doc:`Speed packages <Speed_packages>` doc page for more
 instructions on how to use the accelerated styles effectively.
 
-
 ----------
 
-
 Restrictions
 """"""""""""
 
-
 This dihedral style can only be used if LAMMPS was built with the
 MOLECULE package.  See the :doc:`Build package <Build_package>` doc page
 for more info.
@@ -82,8 +76,3 @@ Related commands
 :doc:`dihedral_coeff <dihedral_coeff>`
 
 **Default:** none
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/dihedral_nharmonic.rst b/doc/src/dihedral_nharmonic.rst
index ceb87e4651..9ce464f5f6 100644
--- a/doc/src/dihedral_nharmonic.rst
+++ b/doc/src/dihedral_nharmonic.rst
@@ -1,51 +1,48 @@
-.. index:: dihedral\_style nharmonic
+.. index:: dihedral_style nharmonic
 
-dihedral\_style nharmonic command
+dihedral_style nharmonic command
 =================================
 
-dihedral\_style nharmonic/omp command
+dihedral_style nharmonic/omp command
 =====================================
 
 Syntax
 """"""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    dihedral_style nharmonic
 
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    dihedral_style nharmonic
-   dihedral_coeff \* 3 10.0 20.0 30.0
+   dihedral_coeff * 3 10.0 20.0 30.0
 
 Description
 """""""""""
 
 The *nharmonic* dihedral style uses the potential:
 
-.. image:: Eqs/dihedral_nharmonic.jpg
-   :align: center
+.. math::
+
+   E = \sum_{n=1,n} A_n  \cos^{n-1}(\phi)
 
 The following coefficients must be defined for each dihedral type via the
 :doc:`dihedral_coeff <dihedral_coeff>` command as in the example above, or in
 the data file or restart files read by the :doc:`read_data <read_data>`
 or :doc:`read_restart <read_restart>` commands:
 
-* n (integer >=1)
-* A1 (energy)
-* A2 (energy)
+* :math:`n` (integer >=1)
+* :math:`A_1` (energy)
+* :math:`A_2` (energy)
 * ...
-* An (energy)
-
+* :math:`A_n` (energy)
 
 ----------
 
-
 Styles with a *gpu*\ , *intel*\ , *kk*\ , *omp*\ , or *opt* suffix are
 functionally the same as the corresponding style without the suffix.
 They have been optimized to run faster, depending on your available
@@ -64,16 +61,13 @@ by including their suffix, or you can use the :doc:`-suffix command-line switch
 See the :doc:`Speed packages <Speed_packages>` doc page for more
 instructions on how to use the accelerated styles effectively.
 
-
 ----------
 
-
 Restrictions
 """"""""""""
 
-
 This angle style can only be used if LAMMPS was built with the
-USER\_MISC package.  See the :doc:`Build package <Build_package>` doc
+USER_MISC package.  See the :doc:`Build package <Build_package>` doc
 page for more info.
 
 Related commands
@@ -82,8 +76,3 @@ Related commands
 :doc:`dihedral_coeff <dihedral_coeff>`
 
 **Default:** none
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/dihedral_none.rst b/doc/src/dihedral_none.rst
index 8955323bb5..eda8d1c39e 100644
--- a/doc/src/dihedral_none.rst
+++ b/doc/src/dihedral_none.rst
@@ -1,21 +1,19 @@
-.. index:: dihedral\_style none
+.. index:: dihedral_style none
 
-dihedral\_style none command
-============================
+dihedral_style none command
+===========================
 
 Syntax
 """"""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    dihedral_style none
 
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    dihedral_style none
 
@@ -39,8 +37,3 @@ Related commands
 :doc:`dihedral_style zero <dihedral_zero>`
 
 **Default:** none
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/dihedral_opls.rst b/doc/src/dihedral_opls.rst
index 5edbcd870b..b123a1c64b 100644
--- a/doc/src/dihedral_opls.rst
+++ b/doc/src/dihedral_opls.rst
@@ -1,30 +1,28 @@
-.. index:: dihedral\_style opls
+.. index:: dihedral_style opls
 
-dihedral\_style opls command
-============================
+dihedral_style opls command
+===========================
 
-dihedral\_style opls/intel command
-==================================
+dihedral_style opls/intel command
+=================================
 
-dihedral\_style opls/kk command
+dihedral_style opls/kk command
+==============================
+
+dihedral_style opls/omp command
 ===============================
 
-dihedral\_style opls/omp command
-================================
-
 Syntax
 """"""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    dihedral_style opls
 
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    dihedral_style opls
    dihedral_coeff 1 1.740 -0.157 0.279 0.00   # CT-CT-CT-CT
@@ -36,8 +34,10 @@ Description
 
 The *opls* dihedral style uses the potential
 
-.. image:: Eqs/dihedral_opls.jpg
-   :align: center
+.. math::
+
+   E = & \frac{1}{2} K_1 [1 + \cos(\phi)] + \frac{1}{2} K_2 [1 - \cos(2 \phi)] + \\
+       & \frac{1}{2} K_3 [1 + \cos(3 \phi)] + \frac{1}{2} K_4 [1 - \cos(4 \phi)]
 
 Note that the usual 1/2 factor is not included in the K values.
 
@@ -49,15 +49,13 @@ The following coefficients must be defined for each dihedral type via the
 the data file or restart files read by the :doc:`read_data <read_data>`
 or :doc:`read_restart <read_restart>` commands:
 
-* K1 (energy)
-* K2 (energy)
-* K3 (energy)
-* K4 (energy)
-
+* :math:`K_1` (energy)
+* :math:`K_2` (energy)
+* :math:`K_3` (energy)
+* :math:`K_4` (energy)
 
 ----------
 
-
 Styles with a *gpu*\ , *intel*\ , *kk*\ , *omp*\ , or *opt* suffix are
 functionally the same as the corresponding style without the suffix.
 They have been optimized to run faster, depending on your available
@@ -76,14 +74,11 @@ by including their suffix, or you can use the :doc:`-suffix command-line switch
 See the :doc:`Speed packages <Speed_packages>` doc page for more
 instructions on how to use the accelerated styles effectively.
 
-
 ----------
 
-
 Restrictions
 """"""""""""
 
-
 This dihedral style can only be used if LAMMPS was built with the
 MOLECULE package.  See the :doc:`Build package <Build_package>` doc page
 for more info.
@@ -95,17 +90,8 @@ Related commands
 
 **Default:** none
 
-
 ----------
 
-
 .. _Watkins:
 
-
-
 **(Watkins)** Watkins and Jorgensen, J Phys Chem A, 105, 4118-4125 (2001).
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/dihedral_quadratic.rst b/doc/src/dihedral_quadratic.rst
index 9634e729e9..bdc5f79559 100644
--- a/doc/src/dihedral_quadratic.rst
+++ b/doc/src/dihedral_quadratic.rst
@@ -1,24 +1,22 @@
-.. index:: dihedral\_style quadratic
+.. index:: dihedral_style quadratic
 
-dihedral\_style quadratic command
-=================================
+dihedral_style quadratic command
+================================
 
-dihedral\_style quadratic/omp command
-=====================================
+dihedral_style quadratic/omp command
+====================================
 
 Syntax
 """"""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    dihedral_style quadratic
 
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    dihedral_style quadratic
    dihedral_coeff 100.0 80.0
@@ -28,8 +26,9 @@ Description
 
 The *quadratic* dihedral style uses the potential:
 
-.. image:: Eqs/dihedral_quadratic.jpg
-   :align: center
+.. math::
+
+   E = K (\phi - \phi_0)^2
 
 This dihedral potential can be used to keep a dihedral in a predefined
 value (cis=zero, right-hand convention is used).
@@ -40,13 +39,11 @@ above, or in the data file or restart files read by the
 :doc:`read_data <read_data>` or :doc:`read_restart <read_restart>`
 commands:
 
-* K (energy/radian\^2)
-* phi0 (degrees)
-
+* :math:`K` (energy/radian\^2)
+* :math:`\phi_0` (degrees)
 
 ----------
 
-
 Styles with a *gpu*\ , *intel*\ , *kk*\ , *omp*\ , or *opt* suffix are
 functionally the same as the corresponding style without the suffix.
 They have been optimized to run faster, depending on your available
@@ -65,16 +62,13 @@ by including their suffix, or you can use the :doc:`-suffix command-line switch
 See the :doc:`Speed packages <Speed_packages>` doc page for more
 instructions on how to use the accelerated styles effectively.
 
-
 ----------
 
-
 Restrictions
 """"""""""""
 
-
 This angle style can only be used if LAMMPS was built with the
-USER\_MISC package.  See the :doc:`Build package <Build_package>` doc
+USER_MISC package.  See the :doc:`Build package <Build_package>` doc
 page for more info.
 
 Related commands
@@ -83,8 +77,3 @@ Related commands
 :doc:`dihedral_coeff <dihedral_coeff>`
 
 **Default:** none
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/dihedral_spherical.rst b/doc/src/dihedral_spherical.rst
index ef5a3801e2..67919aa77f 100644
--- a/doc/src/dihedral_spherical.rst
+++ b/doc/src/dihedral_spherical.rst
@@ -1,21 +1,19 @@
-.. index:: dihedral\_style spherical
+.. index:: dihedral_style spherical
 
-dihedral\_style spherical command
-=================================
+dihedral_style spherical command
+================================
 
 Syntax
 """"""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    dihedral_style spherical
 
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    dihedral_coeff 1 1  286.1  1 124  1    1 90.0 0    1 90.0 0
    dihedral_coeff 1 3  69.3   1 93.9 1    1 90   0    1 90   0  &
@@ -30,11 +28,16 @@ The *spherical* dihedral style uses the potential:
 .. image:: JPG/dihedral_spherical_angles.jpg
    :align: center
 
-.. image:: Eqs/dihedral_spherical.jpg
-   :align: center
+.. math::
+
+   E(\phi,\theta_1,\theta_2) & = \sum_{i=1}^N\nolimits\ C_i\ \Phi_i(\phi)\ \Theta_{1i}(\theta_1)\ \Theta_{2i}(\theta_2) \\
+   \Phi_{i}(\phi)            & = u_i - \mathrm{cos}((\phi   - a_i)K_i) \\
+   \Theta_{1i}(\theta_1)     & = v_i - \mathrm{cos}((\theta_1-b_i)L_i) \\
+   \Theta_{2i}(\theta_2)     & = w_i - \mathrm{cos}((\theta_2-c_i)M_i)
 
 For this dihedral style, the energy can be any function that combines the
-4-body dihedral-angle (phi) and the two 3-body bond-angles (theta1, theta2).
+4-body dihedral-angle (:math:`\phi`) and the two 3-body bond-angles
+(:math:`\theta_1`, :math:`\theta_2`).
 For this reason, there is usually no need to define 3-body "angle" forces
 separately for the atoms participating in these interactions.
 It is probably more efficient to incorporate 3-body angle forces into
@@ -44,8 +47,9 @@ parameters can prevent singularities that occur with traditional
 force-fields whenever theta1 or theta2 approach 0 or 180 degrees.
 
 The last example above corresponds to an interaction with a single energy
-minima located near phi=93.9, theta1=74.4, theta2=48.1 degrees, and it remains
-numerically stable at all angles (phi, theta1, theta2). In this example,
+minima located near :math:`\phi=93.9`, :math:`\theta_1=74.4`,
+:math:`\theta_2=48.1` degrees, and it remains numerically stable at all
+angles (:math:`\phi`, :math:`\theta_1`, :math:`\theta_2`). In this example,
 the coefficients 49.1, and 25.2 can be physically interpreted as the
 harmonic spring constants for theta1 and theta2 around their minima.
 The coefficient 69.3 is the harmonic spring constant for phi after
@@ -56,39 +60,36 @@ The following coefficients must be defined for each dihedral type via the
 the Dihedral Coeffs section of a data file read by the
 :doc:`read_data <read_data>` command:
 
-* n (integer >= 1)
-* C1 (energy)
-* K1 (typically an integer)
-* a1 (degrees)
-* u1 (typically 0.0 or 1.0)
-* L1 (typically an integer)
-* b1 (degrees, typically 0.0 or 90.0)
-* v1 (typically 0.0 or 1.0)
-* M1 (typically an integer)
-* c1 (degrees, typically 0.0 or 90.0)
-* w1 (typically 0.0 or 1.0)
+* :math:`n` (integer >= 1)
+* :math:`C_1` (energy)
+* :math:`K_1` (typically an integer)
+* :math:`a_1` (degrees)
+* :math:`u_1` (typically 0.0 or 1.0)
+* :math:`L_1` (typically an integer)
+* :math:`b_1` (degrees, typically 0.0 or 90.0)
+* :math:`v_1` (typically 0.0 or 1.0)
+* :math:`M_1` (typically an integer)
+* :math:`c_1` (degrees, typically 0.0 or 90.0)
+* :math:`w_1` (typically 0.0 or 1.0)
 * [...]
-* Cn (energy)
-* Kn (typically an integer)
-* an (degrees)
-* un (typically 0.0 or 1.0)
-* Ln (typically an integer)
-* bn (degrees, typically 0.0 or 90.0)
-* vn (typically 0.0 or 1.0)
-* Mn (typically an integer)
-* cn (degrees, typically 0.0 or 90.0)
-* wn (typically 0.0 or 1.0)
-
+* :math:`C_n` (energy)
+* :math:`K_n` (typically an integer)
+* :math:`a_n` (degrees)
+* :math:`u_n` (typically 0.0 or 1.0)
+* :math:`L_n` (typically an integer)
+* :math:`b_n` (degrees, typically 0.0 or 90.0)
+* :math:`v_n` (typically 0.0 or 1.0)
+* :math:`M_n` (typically an integer)
+* :math:`c_n` (degrees, typically 0.0 or 90.0)
+* :math:`w_n` (typically 0.0 or 1.0)
 
 ----------
 
-
 Restrictions
 """"""""""""
 
-
 This dihedral style can only be used if LAMMPS was built with the
-USER\_MISC package.  See the :doc:`Build package <Build_package>` doc
+USER_MISC package.  See the :doc:`Build package <Build_package>` doc
 page for more info.
 
 Related commands
@@ -97,8 +98,3 @@ Related commands
 :doc:`dihedral_coeff <dihedral_coeff>`
 
 **Default:** none
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/dihedral_style.rst b/doc/src/dihedral_style.rst
index 81d1ddabdd..bf3cf4902a 100644
--- a/doc/src/dihedral_style.rst
+++ b/doc/src/dihedral_style.rst
@@ -1,13 +1,12 @@
-.. index:: dihedral\_style
+.. index:: dihedral_style
 
-dihedral\_style command
-=======================
+dihedral_style command
+======================
 
 Syntax
 """"""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    dihedral_style style
 
@@ -16,8 +15,7 @@ Syntax
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    dihedral_style harmonic
    dihedral_style multi/harmonic
@@ -40,11 +38,11 @@ a data or restart file or via the :doc:`dihedral_coeff <dihedral_coeff>`
 command.
 
 All dihedral potentials store their coefficient data in binary restart
-files which means dihedral\_style and
+files which means dihedral_style and
 :doc:`dihedral_coeff <dihedral_coeff>` commands do not need to be
 re-specified in an input script that restarts a simulation.  See the
 :doc:`read_restart <read_restart>` command for details on how to do
-this.  The one exception is that dihedral\_style *hybrid* only stores
+this.  The one exception is that dihedral_style *hybrid* only stores
 the list of sub-styles in the restart file; dihedral coefficients need
 to be re-specified.
 
@@ -82,16 +80,14 @@ coefficients you specify.
    :doc:`dihedral_coeff <dihedral_coeff>` command to account for this
    difference if necessary.
 
-
 ----------
 
-
 Here is an alphabetic list of dihedral styles defined in LAMMPS.  Click on
 the style to display the formula it computes and coefficients
 specified by the associated :doc:`dihedral_coeff <dihedral_coeff>` command.
 
 Click on the style to display the formula it computes, any additional
-arguments specified in the dihedral\_style command, and coefficients
+arguments specified in the dihedral_style command, and coefficients
 specified by the associated :doc:`dihedral_coeff <dihedral_coeff>`
 command.
 
@@ -119,14 +115,11 @@ more of (g,i,k,o,t) to indicate which accelerated styles exist.
 * :doc:`table <dihedral_table>` - tabulated dihedral
 * :doc:`table/cut <dihedral_table_cut>` - tabulated dihedral with analytic cutoff
 
-
 ----------
 
-
 Restrictions
 """"""""""""
 
-
 Dihedral styles can only be set for atom styles that allow dihedrals
 to be defined.
 
@@ -142,9 +135,4 @@ Related commands
 Default
 """""""
 
-dihedral\_style none
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
+dihedral_style none
diff --git a/doc/src/dihedral_table.rst b/doc/src/dihedral_table.rst
index fb3e620adc..112716a240 100644
--- a/doc/src/dihedral_table.rst
+++ b/doc/src/dihedral_table.rst
@@ -1,16 +1,15 @@
-.. index:: dihedral\_style table
+.. index:: dihedral_style table
 
-dihedral\_style table command
-=============================
+dihedral_style table command
+============================
 
-dihedral\_style table/omp command
-=================================
+dihedral_style table/omp command
+================================
 
 Syntax
 """"""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    dihedral_style table style Ntable
 
@@ -20,8 +19,7 @@ Syntax
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    dihedral_style table spline 400
    dihedral_style table linear 1000
@@ -64,15 +62,12 @@ The filename specifies a file containing tabulated energy and
 derivative values. The keyword specifies a section of the file.  The
 format of this file is described below.
 
-
 ----------
 
-
 The format of a tabulated file is as follows (without the
 parenthesized comments).  It can begin with one or more comment
 or blank lines.
 
-
 .. parsed-literal::
 
    # Table of the potential and its negative derivative
@@ -132,7 +127,7 @@ strange numerical behavior can occur in the large remaining gap.
 The parameter "N" is required and its value is the number of table
 entries that follow. Note that this may be different than the N
 specified in the :doc:`dihedral_style table <dihedral_style>` command.
-Let *Ntable* is the number of table entries requested dihedral\_style
+Let *Ntable* is the number of table entries requested dihedral_style
 command, and let *Nfile* be the parameter following "N" in the
 tabulated file ("30" in the sparse example above).  What LAMMPS does
 is a preliminary interpolation by creating splines using the *Nfile*
@@ -180,10 +175,8 @@ Note that one file can contain many sections, each with a tabulated
 potential. LAMMPS reads the file section by section until it finds one
 that matches the specified keyword.
 
-
 ----------
 
-
 Styles with a *gpu*\ , *intel*\ , *kk*\ , *omp*\ , or *opt* suffix are
 functionally the same as the corresponding style without the suffix.
 They have been optimized to run faster, depending on your available
@@ -204,18 +197,17 @@ instructions on how to use the accelerated styles effectively.
 
 **Restart info:**
 
-This dihedral style writes the settings for the "dihedral\_style table"
-command to :doc:`binary restart files <restart>`, so a dihedral\_style
+This dihedral style writes the settings for the "dihedral_style table"
+command to :doc:`binary restart files <restart>`, so a dihedral_style
 command does not need to specified in an input script that reads a
 restart file.  However, the coefficient information is not stored in
 the restart file, since it is tabulated in the potential files.  Thus,
-dihedral\_coeff commands do need to be specified in the restart input
+dihedral_coeff commands do need to be specified in the restart input
 script.
 
 Restrictions
 """"""""""""
 
-
 This dihedral style can only be used if LAMMPS was built with the
 USER-MISC package.  See the :doc:`Build package <Build_package>` doc
 page for more info.
@@ -226,8 +218,3 @@ Related commands
 :doc:`dihedral_coeff <dihedral_coeff>`
 
 **Default:** none
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/dihedral_table_cut.rst b/doc/src/dihedral_table_cut.rst
index 809a858f00..ae2fcd1f77 100644
--- a/doc/src/dihedral_table_cut.rst
+++ b/doc/src/dihedral_table_cut.rst
@@ -1,13 +1,12 @@
-.. index:: dihedral\_style table/cut
+.. index:: dihedral_style table/cut
 
-dihedral\_style table/cut command
-=================================
+dihedral_style table/cut command
+================================
 
 Syntax
 """"""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    dihedral_style table/cut style Ntable
 
@@ -17,8 +16,7 @@ Syntax
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    dihedral_style table/cut spline 400
    dihedral_style table/cut linear 1000
@@ -66,32 +64,31 @@ above.
 The cutoff dihedral style uses a tabulated dihedral interaction with a
 cutoff function:
 
-.. image:: Eqs/dihedral_table_cut.jpg
-   :align: center
+.. math::
+
+   f(\theta) & = K \qquad\qquad\qquad\qquad\qquad\qquad \theta < \theta_1 \\
+   f(\theta) & = K \left(1-\frac{(\theta - \theta_1)^2}{(\theta_2 - \theta_1)^2}\right) \qquad \theta_1 < \theta < \theta_2
 
 The cutoff specifies an prefactor to the cutoff function.  While this value
 would ordinarily equal 1 there may be situations where the value should change.
 
-The cutoff angle1 specifies the angle (in degrees) below which the dihedral
+The cutoff :math:`\theta_1` specifies the angle (in degrees) below which the dihedral
 interaction is unmodified, i.e. the cutoff function is 1.
 
-The cutoff function is applied between angle1 and angle2, which is the angle at
-which the cutoff function drops to zero.  The value of zero effectively "turns
-off" the dihedral interaction.
+The cutoff function is applied between :math:`\theta_1` and :math:`\theta_2`, which is
+the angle at which the cutoff function drops to zero.  The value of zero effectively
+"turns off" the dihedral interaction.
 
 The filename specifies a file containing tabulated energy and
 derivative values. The keyword specifies a section of the file.  The
 format of this file is described below.
 
-
 ----------
 
-
 The format of a tabulated file is as follows (without the
 parenthesized comments).  It can begin with one or more comment
 or blank lines.
 
-
 .. parsed-literal::
 
    # Table of the potential and its negative derivative
@@ -151,7 +148,7 @@ strange numerical behavior can occur in the large remaining gap.
 The parameter "N" is required and its value is the number of table
 entries that follow. Note that this may be different than the N
 specified in the :doc:`dihedral_style table <dihedral_style>` command.
-Let *Ntable* is the number of table entries requested dihedral\_style
+Let *Ntable* is the number of table entries requested dihedral_style
 command, and let *Nfile* be the parameter following "N" in the
 tabulated file ("30" in the sparse example above).  What LAMMPS does
 is a preliminary interpolation by creating splines using the *Nfile*
@@ -201,18 +198,17 @@ that matches the specified keyword.
 
 **Restart info:**
 
-This dihedral style writes the settings for the "dihedral\_style table/cut"
-command to :doc:`binary restart files <restart>`, so a dihedral\_style
+This dihedral style writes the settings for the "dihedral_style table/cut"
+command to :doc:`binary restart files <restart>`, so a dihedral_style
 command does not need to specified in an input script that reads a
 restart file.  However, the coefficient information is not stored in
 the restart file, since it is tabulated in the potential files.  Thus,
-dihedral\_coeff commands do need to be specified in the restart input
+dihedral_coeff commands do need to be specified in the restart input
 script.
 
 Restrictions
 """"""""""""
 
-
 This dihedral style can only be used if LAMMPS was built with the
 USER-MISC package.  See the :doc:`Build package <Build_package>` doc
 page for more info.
@@ -226,11 +222,4 @@ Related commands
 
 .. _dihedralcut-Salerno:
 
-
-
 **(Salerno)** Salerno, Bernstein, J Chem Theory Comput, --, ---- (2018).
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/dihedral_zero.rst b/doc/src/dihedral_zero.rst
index 38715735ce..7d8dcd496a 100644
--- a/doc/src/dihedral_zero.rst
+++ b/doc/src/dihedral_zero.rst
@@ -1,25 +1,23 @@
-.. index:: dihedral\_style zero
+.. index:: dihedral_style zero
 
-dihedral\_style zero command
+dihedral_style zero command
 ============================
 
 Syntax
 """"""
 
+.. code-block:: LAMMPS
 
-.. parsed-literal::
-
-   dihedral_style zero *nocoeff*
+   dihedral_style zero [nocoeff]
 
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    dihedral_style zero
    dihedral_style zero nocoeff
-   dihedral_coeff \*
+   dihedral_coeff *
 
 Description
 """""""""""
@@ -35,7 +33,7 @@ command.  If no dihedral style is defined, this command cannot be
 used.
 
 The optional *nocoeff* flag allows to read data files with a DihedralCoeff
-section for any dihedral style. Similarly, any dihedral\_coeff commands
+section for any dihedral style. Similarly, any dihedral_coeff commands
 will only be checked for the dihedral type number and the rest ignored.
 
 Note that the :doc:`dihedral_coeff <dihedral_coeff>` command must be
@@ -51,8 +49,3 @@ Restrictions
 :doc:`dihedral_style none <dihedral_none>`
 
 **Default:** none
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/dihedrals.rst b/doc/src/dihedrals.rst
index bab913f1c2..f56e323427 100644
--- a/doc/src/dihedrals.rst
+++ b/doc/src/dihedrals.rst
@@ -1,7 +1,6 @@
 Dihedral Styles
 ###############
 
-
 .. toctree::
    :maxdepth: 1
    :glob:
diff --git a/doc/src/dimension.rst b/doc/src/dimension.rst
index 1ccb3930d6..be711815a6 100644
--- a/doc/src/dimension.rst
+++ b/doc/src/dimension.rst
@@ -6,7 +6,6 @@ dimension command
 Syntax
 """"""
 
-
 .. parsed-literal::
 
    dimension N
@@ -16,8 +15,7 @@ Syntax
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    dimension 2
 
@@ -43,7 +41,6 @@ additional instructions on how to run 2d simulations.
 Restrictions
 """"""""""""
 
-
 This command must be used before the simulation box is defined by a
 :doc:`read_data <read_data>` or :doc:`create_box <create_box>` command.
 
@@ -55,12 +52,6 @@ Related commands
 Default
 """""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    dimension 3
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/displace_atoms.rst b/doc/src/displace_atoms.rst
index 2764940dde..efc6f9230b 100644
--- a/doc/src/displace_atoms.rst
+++ b/doc/src/displace_atoms.rst
@@ -1,21 +1,20 @@
-.. index:: displace\_atoms
+.. index:: displace_atoms
 
-displace\_atoms command
-=======================
+displace_atoms command
+======================
 
 Syntax
 """"""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    displace_atoms group-ID style args keyword value ...
 
 * group-ID = ID of group of atoms to displace
 * style = *move* or *ramp* or *random* or *rotate*
-  
+
   .. parsed-literal::
-  
+
        *move* args = delx dely delz
          delx,dely,delz = distance to displace in each dimension (distance units)
          any of delx,dely,delz can be a variable (see below)
@@ -33,19 +32,16 @@ Syntax
          theta = angle of rotation (degrees)
 
 * zero or more keyword/value pairs may be appended
-  
+
   .. parsed-literal::
-  
+
        keyword = *units*
          value = *box* or *lattice*
 
-
-
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    displace_atoms top move 0 -5 0 units box
    displace_atoms flow ramp x 0.0 5.0 y 2.0 20.5
@@ -63,7 +59,7 @@ The *move* style displaces the group of atoms by the specified 3d
 displacement vector.  Any of the 3 quantities defining the vector
 components can be specified as an equal-style or atom-style
 :doc:`variable <variable>`.  If the value is a variable, it should be
-specified as v\_name, where name is the variable name.  In this case,
+specified as v_name, where name is the variable name.  In this case,
 the variable will be evaluated, and its value(s) used for the
 displacement(s).  The scale factor implied by the *units* keyword will
 also be applied to the variable result.
@@ -113,10 +109,8 @@ style are determined by the setting of *box* or *lattice* for the
 :doc:`lattice <lattice>` command must have been previously used to
 define the lattice spacing.
 
-
 ----------
 
-
 .. note::
 
    Care should be taken not to move atoms on top of other atoms.
@@ -139,14 +133,11 @@ define the lattice spacing.
    the simulation box may not end up as optimal as the initial mapping
    attempted to be.
 
-
 ----------
 
-
 Restrictions
 """"""""""""
 
-
 For a 2d simulation, only rotations around the a vector parallel to
 the z-axis are allowed.
 
@@ -160,8 +151,3 @@ Default
 """""""
 
 The option defaults are units = lattice.
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/dump.rst b/doc/src/dump.rst
index 833575debc..36a20defb6 100644
--- a/doc/src/dump.rst
+++ b/doc/src/dump.rst
@@ -30,7 +30,6 @@ dump command
 Syntax
 """"""
 
-
 .. parsed-literal::
 
    dump ID group-ID style N file args
@@ -42,9 +41,9 @@ Syntax
 * N = dump every this many timesteps
 * file = name of file to write dump info to
 * args = list of arguments for a particular style
-  
+
   .. parsed-literal::
-  
+
        *atom* args = none
        *atom/gz* args = none
        *atom/mpiio* args = none
@@ -69,9 +68,9 @@ Syntax
        *xyz/mpiio* args = none
 
 * *custom* or *custom/gz* or *custom/mpiio* or *netcdf* or *netcdf/mpiio* args = list of atom attributes
-  
+
   .. parsed-literal::
-  
+
          possible attributes = id, mol, proc, procp1, type, element, mass,
                                x, y, z, xs, ys, zs, xu, yu, zu,
                                xsu, ysu, zsu, ix, iy, iz,
@@ -81,9 +80,8 @@ Syntax
                                angmomx, angmomy, angmomz, tqx, tqy, tqz,
                                c_ID, c_ID[N], f_ID, f_ID[N], v_name
 
-  
   .. parsed-literal::
-  
+
            id = atom ID
            mol = molecule ID
            proc = ID of processor that owns atom
@@ -114,9 +112,9 @@ Syntax
            i_name = per-atom integer vector with name, managed by fix property/atom
 
 * *local* args = list of local attributes
-  
+
   .. parsed-literal::
-  
+
          possible attributes = index, c_ID, c_ID[I], f_ID, f_ID[I]
            index = enumeration of local values
            c_ID = local vector calculated by a compute with ID
@@ -124,24 +122,21 @@ Syntax
            f_ID = local vector calculated by a fix with ID
            f_ID[I] = Ith column of local array calculated by a fix with ID, I can include wildcard (see below)
 
-
-
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    dump myDump all atom 100 dump.atom
    dump myDump all atom/mpiio 100 dump.atom.mpiio
    dump myDump all atom/gz 100 dump.atom.gz
    dump 2 subgroup atom 50 dump.run.bin
    dump 2 subgroup atom 50 dump.run.mpiio.bin
-   dump 4a all custom 100 dump.myforce.\* id type x y vx fx
+   dump 4a all custom 100 dump.myforce.* id type x y vx fx
    dump 4b flow custom 100 dump.%.myforce id type c_myF[3] v_ke
    dump 4b flow custom 100 dump.%.myforce id type c_myF[\*] v_ke
-   dump 2 inner cfg 10 dump.snap.\*.cfg mass type xs ys zs vx vy vz
-   dump snap all cfg 100 dump.config.\*.cfg mass type xs ys zs id type c_Stress[2]
+   dump 2 inner cfg 10 dump.snap.*.cfg mass type xs ys zs vx vy vz
+   dump snap all cfg 100 dump.config.*.cfg mass type xs ys zs id type c_Stress[2]
    dump 1 all xtc 1000 file.xtc
 
 Description
@@ -216,10 +211,8 @@ The precision of values output to text-based dump files can be
 controlled by the :doc:`dump_modify format <dump_modify>` command and
 its options.
 
-
 ----------
 
-
 The *style* keyword determines what atom quantities are written to the
 file and in what format.  Settings made via the
 :doc:`dump_modify <dump_modify>` command can also alter the format of
@@ -228,7 +221,7 @@ individual values and the file itself.
 The *atom*\ , *local*\ , and *custom* styles create files in a simple text
 format that is self-explanatory when viewing a dump file.  Some of the
 LAMMPS post-processing tools described on the :doc:`Tools <Tools>` doc
-page, including `Pizza.py <http://www.sandia.gov/~sjplimp/pizza.html>`_,
+page, including `Pizza.py <https://pizza.sandia.gov>`_,
 work with this format, as does the :doc:`rerun <rerun>` command.
 
 For post-processing purposes the *atom*\ , *local*\ , and *custom* text
@@ -237,7 +230,6 @@ files are self-describing in the following sense.
 The dimensions of the simulation box are included in each snapshot.
 For an orthogonal simulation box this information is formatted as:
 
-
 .. parsed-literal::
 
    ITEM: BOX BOUNDS xx yy zz
@@ -258,7 +250,6 @@ bounding box which encloses the triclinic simulation box is output,
 along with the 3 tilt factors (xy, xz, yz) of the triclinic box,
 formatted as follows:
 
-
 .. parsed-literal::
 
    ITEM: BOX BOUNDS xy xz yz xx yy zz
@@ -271,10 +262,10 @@ the 3 tilt factors will be included on each of the 3 following lines.
 This bounding box is convenient for many visualization programs.  The
 meaning of the 6 character flags for "xx yy zz" is the same as above.
 
-Note that the first two numbers on each line are now xlo\_bound instead
+Note that the first two numbers on each line are now xlo_bound instead
 of xlo, etc, since they represent a bounding box.  See the :doc:`Howto triclinic <Howto_triclinic>` doc page for a geometric description
 of triclinic boxes, as defined by LAMMPS, simple formulas for how the
-6 bounding box extents (xlo\_bound,xhi\_bound,etc) are calculated from
+6 bounding box extents (xlo_bound,xhi_bound,etc) are calculated from
 the triclinic parameters, and how to transform those parameters to and
 from other commonly used triclinic representations.
 
@@ -289,13 +280,13 @@ scaled format (from 0 to 1).  I.e. an x value of 0.25 means the atom
 is at a location 1/4 of the distance from xlo to xhi of the box
 boundaries.  The format can be changed to unscaled coords via the
 :doc:`dump_modify <dump_modify>` settings.  Image flags can also be
-added for each atom via dump\_modify.
+added for each atom via dump_modify.
 
 Style *custom* allows you to specify a list of atom attributes to be
 written to the dump file for each atom.  Possible attributes are
 listed above and will appear in the order specified.  You cannot
 specify a quantity that is not defined for a particular simulation -
-such as *q* for atom style *bond*\ , since that atom style doesn't
+such as *q* for atom style *bond*\ , since that atom style does not
 assign charges.  Dumps occur at the very end of a timestep, so atom
 attributes will include effects due to fixes that are applied during
 the timestep.  An explanation of the possible dump custom attributes
@@ -314,7 +305,7 @@ be cut and pasted directly into a data file read by the
 
 Style *cfg* has the same command syntax as style *custom* and writes
 extended CFG format files, as used by the
-`AtomEye <http://mt.seas.upenn.edu/Archive/Graphics/A>`_ visualization
+`AtomEye <http://li.mit.edu/Archive/Graphics/A/>`_ visualization
 package.  Since the extended CFG format uses a single snapshot of the
 system per file, a wildcard "\*" must be included in the filename, as
 discussed below.  The list of atom attributes for style *cfg* must
@@ -378,10 +369,8 @@ Note that *atom*\ , *custom*\ , *dcd*\ , *xtc*\ , and *xyz* style dump files
 can be read directly by `VMD <http://www.ks.uiuc.edu/Research/vmd>`_, a
 popular molecular viewing program.
 
-
 ----------
 
-
 Dumps are performed on timesteps that are a multiple of N (including
 timestep 0) and on the last timestep of a minimization if the
 minimization converges.  Note that this means a dump will not be
@@ -436,8 +425,7 @@ library, which is part of the MPI standard for versions 2.0 and above.
 Using MPI-IO requires two steps.  First, build LAMMPS with its MPIIO
 package installed, e.g.
 
-
-.. parsed-literal::
+.. code-block:: bash
 
    make yes-mpiio    # installs the MPIIO package
    make mpi          # build LAMMPS for your platform
@@ -474,10 +462,8 @@ be about 3x smaller than the text version, but will also take longer
 to write.  This option is not available for the *dcd* and *xtc*
 styles.
 
-
 ----------
 
-
 Note that in the discussion which follows, for styles which can
 reference values from a compute or fix, like the *custom*\ , *cfg*\ , or
 *local* styles, the bracketed index I can be specified using a
@@ -495,18 +481,15 @@ had been listed one by one.  E.g. these 2 dump commands are
 equivalent, since the :doc:`compute stress/atom <compute_stress_atom>`
 command creates a per-atom array with 6 columns:
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    compute myPress all stress/atom NULL
-   dump 2 all custom 100 tmp.dump id myPress[\*]
+   dump 2 all custom 100 tmp.dump id myPress[*]
    dump 2 all custom 100 tmp.dump id myPress[1] myPress[2] myPress[3] &
                                      myPress[4] myPress[5] myPress[6]
 
-
 ----------
 
-
 This section explains the local attributes that can be specified as
 part of the *local* style.
 
@@ -519,7 +502,7 @@ between processor, there is no guarantee that the same index will be
 used for the same info (e.g. a particular bond) in successive
 snapshots.
 
-The *c\_ID* and *c\_ID[I]* attributes allow local vectors or arrays
+The *c_ID* and *c_ID[I]* attributes allow local vectors or arrays
 calculated by a :doc:`compute <compute>` to be output.  The ID in the
 attribute should be replaced by the actual ID of the compute that has
 been defined previously in the input script.  See the
@@ -532,20 +515,20 @@ opposed to local quantities, cannot be output in a dump local command.
 Instead, global quantities can be output by the :doc:`thermo_style custom <thermo_style>` command, and per-atom quantities can be
 output by the dump custom command.
 
-If *c\_ID* is used as a attribute, then the local vector calculated by
-the compute is printed.  If *c\_ID[I]* is used, then I must be in the
+If *c_ID* is used as a attribute, then the local vector calculated by
+the compute is printed.  If *c_ID[I]* is used, then I must be in the
 range from 1-M, which will print the Ith column of the local array
 with M columns calculated by the compute.  See the discussion above
 for how I can be specified with a wildcard asterisk to effectively
 specify multiple values.
 
-The *f\_ID* and *f\_ID[I]* attributes allow local vectors or arrays
+The *f_ID* and *f_ID[I]* attributes allow local vectors or arrays
 calculated by a :doc:`fix <fix>` to be output.  The ID in the attribute
 should be replaced by the actual ID of the fix that has been defined
 previously in the input script.
 
-If *f\_ID* is used as a attribute, then the local vector calculated by
-the fix is printed.  If *f\_ID[I]* is used, then I must be in the
+If *f_ID* is used as a attribute, then the local vector calculated by
+the fix is printed.  If *f_ID[I]* is used, then I must be in the
 range from 1-M, which will print the Ith column of the local with M
 columns calculated by the fix.  See the discussion above for how I can
 be specified with a wildcard asterisk to effectively specify multiple
@@ -554,17 +537,14 @@ values.
 Here is an example of how to dump bond info for a system, including
 the distance and energy of each bond:
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    compute 1 all property/local batom1 batom2 btype
    compute 2 all bond/local dist eng
    dump 1 all local 1000 tmp.dump index c_1[1] c_1[2] c_1[3] c_2[1] c_2[2]
 
-
 ----------
 
-
 This section explains the atom attributes that can be specified as
 part of the *custom* and *cfg* styles.
 
@@ -632,7 +612,7 @@ The *tqx*\ , *tqy*\ , *tqz* attributes are for finite-size particles that
 can sustain a rotational torque due to interactions with other
 particles.
 
-The *c\_ID* and *c\_ID[I]* attributes allow per-atom vectors or arrays
+The *c_ID* and *c_ID[I]* attributes allow per-atom vectors or arrays
 calculated by a :doc:`compute <compute>` to be output.  The ID in the
 attribute should be replaced by the actual ID of the compute that has
 been defined previously in the input script.  See the
@@ -646,14 +626,14 @@ command.  Instead, global quantities can be output by the
 :doc:`thermo_style custom <thermo_style>` command, and local quantities
 can be output by the dump local command.
 
-If *c\_ID* is used as a attribute, then the per-atom vector calculated
-by the compute is printed.  If *c\_ID[I]* is used, then I must be in
+If *c_ID* is used as a attribute, then the per-atom vector calculated
+by the compute is printed.  If *c_ID[I]* is used, then I must be in
 the range from 1-M, which will print the Ith column of the per-atom
 array with M columns calculated by the compute.  See the discussion
 above for how I can be specified with a wildcard asterisk to
 effectively specify multiple values.
 
-The *f\_ID* and *f\_ID[I]* attributes allow vector or array per-atom
+The *f_ID* and *f_ID[I]* attributes allow vector or array per-atom
 quantities calculated by a :doc:`fix <fix>` to be output.  The ID in the
 attribute should be replaced by the actual ID of the fix that has been
 defined previously in the input script.  The :doc:`fix ave/atom <fix_ave_atom>` command is one that calculates per-atom
@@ -662,14 +642,14 @@ any :doc:`compute <compute>`, :doc:`fix <fix>`, or atom-style
 :doc:`variable <variable>`, this allows those time-averaged results to
 be written to a dump file.
 
-If *f\_ID* is used as a attribute, then the per-atom vector calculated
-by the fix is printed.  If *f\_ID[I]* is used, then I must be in the
+If *f_ID* is used as a attribute, then the per-atom vector calculated
+by the fix is printed.  If *f_ID[I]* is used, then I must be in the
 range from 1-M, which will print the Ith column of the per-atom array
 with M columns calculated by the fix.  See the discussion above for
 how I can be specified with a wildcard asterisk to effectively specify
 multiple values.
 
-The *v\_name* attribute allows per-atom vectors calculated by a
+The *v_name* attribute allows per-atom vectors calculated by a
 :doc:`variable <variable>` to be output.  The name in the attribute
 should be replaced by the actual name of the variable that has been
 defined previously in the input script.  Only an atom-style variable
@@ -680,7 +660,7 @@ invoke other computes, fixes, or variables when they are evaluated, so
 this is a very general means of creating quantities to output to a
 dump file.
 
-The *d\_name* and *i\_name* attributes allow to output custom per atom
+The *d_name* and *i_name* attributes allow to output custom per atom
 floating point or integer properties that are managed by
 :doc:`fix property/atom <fix_property_atom>`.
 
@@ -688,16 +668,13 @@ See the :doc:`Modify <Modify>` doc page for information on how to add
 new compute and fix styles to LAMMPS to calculate per-atom quantities
 which could then be output into dump files.
 
-
 ----------
 
-
 Restrictions
 """"""""""""
 
-
 To write gzipped dump files, you must either compile LAMMPS with the
--DLAMMPS\_GZIP option or use the styles from the COMPRESS package.
+-DLAMMPS_GZIP option or use the styles from the COMPRESS package.
 See the :doc:`Build settings <Build_settings>` doc page for details.
 
 The *atom/gz*\ , *cfg/gz*\ , *custom/gz*\ , and *xyz/gz* styles are part of
@@ -716,7 +693,7 @@ LAMMPS was built with that package.  See the :doc:`Build package <Build_package>
 Related commands
 """"""""""""""""
 
-:doc:`dump atom/adios <dump_adios>`, :doc:`dump custom/adios <dump_adios>`, 
+:doc:`dump atom/adios <dump_adios>`, :doc:`dump custom/adios <dump_adios>`,
 :doc:`dump h5md <dump_h5md>`, :doc:`dump image <dump_image>`,
 :doc:`dump molfile <dump_molfile>`, :doc:`dump_modify <dump_modify>`,
 :doc:`undump <undump>`
@@ -726,8 +703,3 @@ Default
 
 The defaults for the *image* and *movie* styles are listed on the
 :doc:`dump image <dump_image>` doc page.
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/dump_adios.rst b/doc/src/dump_adios.rst
index 1cd2e81c9b..e1b0fe000a 100644
--- a/doc/src/dump_adios.rst
+++ b/doc/src/dump_adios.rst
@@ -1,5 +1,5 @@
-.. index:: dump atom/adios 
-.. index:: dump custom/adios 
+.. index:: dump atom/adios
+.. index:: dump custom/adios
 
 dump atom/adios  command
 =========================
@@ -10,7 +10,6 @@ dump custom/adios command
 Syntax
 """"""
 
-
 .. parsed-literal::
 
    dump ID group-ID atom/adios N file.bp
@@ -24,12 +23,10 @@ Syntax
 * file.bp = name of file/stream to write to
 * args = same options as in :doc:`\ *dump custom*\ <dump>` command
 
-
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    dump adios1 all atom/adios   100 atoms.bp
    dump 4a     all custom/adios 100 dump_adios.bp id v_p x y z
@@ -45,52 +42,35 @@ ADIOS-BP files are binary, portable and self-describing.
 
 .. _adios: https://github.com/ornladios/ADIOS2
 
-
-
-**Use from write\_dump:**
+**Use from write_dump:**
 
 It is possible to use these dump styles with the
 :doc:`write_dump <write_dump>` command.  In this case, the sub-intervals
-must not be set at all.  The write\_dump command can be used to
+must not be set at all.  The write_dump command can be used to
 create a new file at each individual dump.
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    dump 4     all atom/adios 100 dump.bp
    write_dump all atom/adios singledump.bp
 
-
 ----------
 
-
 Restrictions
 """"""""""""
 
-
 The number of atoms per snapshot CAN change with the adios style.
 When using the ADIOS tool 'bpls' to list the content of a .bp file,
-bpls will print *\__* for the size of the output table indicating that
+bpls will print *__* for the size of the output table indicating that
 its size is changing every step.
 
 The *atom/adios* and *custom/adios* dump styles are part of the USER-ADIOS
 package.  They are only enabled if LAMMPS was built with that package.
 See the :doc:`Build package <Build_package>` doc page for more info.
 
-
 ----------
 
-
 Related commands
 """"""""""""""""
 
 :doc:`dump <dump>`, :doc:`dump_modify <dump_modify>`, :doc:`undump <undump>`
-
-
-----------
-
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/dump_cfg_uef.rst b/doc/src/dump_cfg_uef.rst
index 28242b0871..fdefad62ff 100644
--- a/doc/src/dump_cfg_uef.rst
+++ b/doc/src/dump_cfg_uef.rst
@@ -6,7 +6,6 @@ dump cfg/uef command
 Syntax
 """"""
 
-
 .. parsed-literal::
 
    dump ID group-ID cfg/uef N file mass type xs ys zs args
@@ -15,18 +14,15 @@ Syntax
 * group-ID = ID of the group of atoms to be dumped
 * N = dump every this many timesteps
 * file = name of file to write dump info to
-  
+
   .. parsed-literal::
-  
+
      args = same as args for :doc:`dump custom <dump>`
 
-
-
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    dump 1 all cfg/uef 10 dump.\*.cfg mass type xs ys zs
    dump 2 all cfg/uef 100 dump.\*.cfg mass type xs ys zs id c_stress
@@ -46,7 +42,6 @@ reference frame as the atomic positions.
 Restrictions
 """"""""""""
 
-
 This fix is part of the USER-UEF package. It is only enabled if LAMMPS
 was built with that package. See the :doc:`Build package <Build_package>` doc page for more info.
 
@@ -60,8 +55,3 @@ Related commands
 :doc:`fix nvt/uef <fix_nh_uef>`
 
 **Default:** none
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/dump_h5md.rst b/doc/src/dump_h5md.rst
index e0a22a846a..de44572307 100644
--- a/doc/src/dump_h5md.rst
+++ b/doc/src/dump_h5md.rst
@@ -6,7 +6,6 @@ dump h5md command
 Syntax
 """"""
 
-
 .. parsed-literal::
 
    dump ID group-ID h5md N file.h5 args
@@ -30,28 +29,22 @@ Syntax
      create_group value = *yes* or *no*
      author value = quoted string
 
-
-
 Note that at least one element must be specified and image may only be
 present if position is specified first.
 
 For the elements *position*\ , *velocity*\ , *force* and *species*\ , a
-sub-interval may be specified to write the data only every N\_element
-iterations of the dump (i.e. every N\*N\_element time steps). This is
+sub-interval may be specified to write the data only every N_element
+iterations of the dump (i.e. every N\*N_element time steps). This is
 specified by this option directly following the element declaration:
 
-
 .. parsed-literal::
 
    every N_element
 
-
-
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    dump h5md1 all h5md 100 dump_h5md.h5 position image
    dump h5md1 all h5md 100 dump_h5md.h5 position velocity every 10
@@ -65,17 +58,15 @@ Dump a snapshot of atom coordinates every N timesteps in the
 HDF5 files are binary, portable and self-describing.  This dump style
 will write only one file, on the root node.
 
-Several dumps may write to the same file, by using file\_from and
+Several dumps may write to the same file, by using file_from and
 referring to a previously defined dump.  Several groups may also be
 stored within the same file by defining several dumps.  A dump that
-refers (via *file\_from*) to an already open dump ID and that concerns
-another particle group must specify *create\_group yes*.
+refers (via *file_from*) to an already open dump ID and that concerns
+another particle group must specify *create_group yes*.
 
 .. _h5md: http://nongnu.org/h5md/
 
-
-
-Each data element is written every N\*N\_element steps. For *image*\ , no
+Each data element is written every N\*N_element steps. For *image*\ , no
 sub-interval is needed as it must be present at the same interval as
 *position*\ .  *image* must be given after *position* in any case.  The
 box information (edges in each dimension) is stored at the same
@@ -88,32 +79,28 @@ every N steps.
    timesteps when neighbor lists are rebuilt, the coordinates of an atom
    written to a dump file may be slightly outside the simulation box.
 
-**Use from write\_dump:**
+**Use from write_dump:**
 
 It is possible to use this dump style with the
 :doc:`write_dump <write_dump>` command.  In this case, the sub-intervals
-must not be set at all.  The write\_dump command can be used either to
+must not be set at all.  The write_dump command can be used either to
 create a new file or to add current data to an existing dump file by
-using the *file\_from* keyword.
+using the *file_from* keyword.
 
 Typically, the *species* data is fixed. The following two commands
 store the position data every 100 timesteps, with the image data, and
 store once the species data in the same file.
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    dump h5md1 all h5md 100 dump.h5 position image
    write_dump all h5md dump.h5 file_from h5md1 species
 
-
 ----------
 
-
 Restrictions
 """"""""""""
 
-
 The number of atoms per snapshot cannot change with the h5md style.
 The position data is stored wrapped (box boundaries not enforced, see
 note above).  Only orthogonal domains are currently supported. This is
@@ -128,31 +115,18 @@ provided by the HDF5 library.
 
 .. _HDF5-ws: http://www.hdfgroup.org/HDF5/
 
-
-
-
 ----------
 
-
 Related commands
 """"""""""""""""
 
 :doc:`dump <dump>`, :doc:`dump_modify <dump_modify>`, :doc:`undump <undump>`
 
-
 ----------
 
-
-.. _h5md\_cpc:
-
-
+.. _h5md_cpc:
 
 **(de Buyl)** de Buyl, Colberg and Hofling, H5MD: A structured,
 efficient, and portable file format for molecular data,
 Comp. Phys. Comm. 185(6), 1546-1553 (2014) -
 `[arXiv:1308.6382] <http://arxiv.org/abs/1308.6382/>`_.
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/dump_image.rst b/doc/src/dump_image.rst
index 938b11c356..0477e5d718 100644
--- a/doc/src/dump_image.rst
+++ b/doc/src/dump_image.rst
@@ -9,7 +9,6 @@ dump movie command
 Syntax
 """"""
 
-
 .. parsed-literal::
 
    dump ID group-ID style N file color diameter keyword value ...
@@ -23,9 +22,9 @@ Syntax
 * diameter = atom attribute that determines size of each atom
 * zero or more keyword/value pairs may be appended
 * keyword = *atom* or *adiam* or *bond* or *line* or *tri* or *body* or *fix* or *size* or *view* or *center* or *up* or *zoom* or *persp* or *box* or *axes* or *subbox* or *shiny* or *ssao*
-  
+
   .. parsed-literal::
-  
+
        *atom* = yes/no = do or do not draw atoms
        *adiam* size = numeric value for atom diameter (distance units)
        *bond* values = color width = color and width of bonds
@@ -83,13 +82,10 @@ Syntax
          seed = random # seed (positive integer)
          dfactor = strength of shading from 0.0 to 1.0
 
-
-
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    dump d0 all image 100 dump.\*.jpg type type
    dump d1 mobile image 500 snap.\*.png element element ssao yes 4539 0.6
@@ -118,22 +114,20 @@ has been run, using the :doc:`rerun <rerun>` command to read snapshots
 from an existing dump file, and using these dump commands in the rerun
 script to generate the images/movie.
 
-Here are two sample images, rendered as 1024x1024 JPEG files.  Click
-to see the full-size images:
+Here are two sample images, rendered as 1024x1024 JPEG files.
 
 .. raw:: html
 
-   <DIV ALIGN=center>
+   Click to see the full-size images:
 
-.. image:: JPG/dump1_small.jpg
+.. |dump1| image:: JPG/dump1_small.jpg
    :target: JPG/dump1.jpg
-
-.. image:: JPG/dump2_small.jpg
+   :width: 48%
+.. |dump2| image:: JPG/dump2_small.jpg
    :target: JPG/dump2.jpg
+   :width: 48%
 
-.. raw:: html
-
-   </DIV>
+|dump1|  |dump2|
 
 Only atoms in the specified group are rendered in the image.  The
 :doc:`dump_modify region and thresh <dump_modify>` commands can also
@@ -146,7 +140,7 @@ created.  The JPEG and PNG files are binary; PPM has a text mode
 header followed by binary data. JPEG images have lossy compression;
 PNG has lossless compression; and PPM files are uncompressed but can
 be compressed with gzip, if LAMMPS has been compiled with
--DLAMMPS\_GZIP and a ".gz" suffix is used.
+-DLAMMPS_GZIP and a ".gz" suffix is used.
 
 Similarly, the format of the resulting movie is chosen with the
 *movie* dump style. This is handled by the underlying FFmpeg converter
@@ -157,7 +151,7 @@ framerate can be set using the :doc:`dump_modify <dump_modify>` command.
 
 To write out JPEG and PNG format files, you must build LAMMPS with
 support for the corresponding JPEG or PNG library. To convert images
-into movies, LAMMPS has to be compiled with the -DLAMMPS\_FFMPEG
+into movies, LAMMPS has to be compiled with the -DLAMMPS_FFMPEG
 flag. See the :doc:`Build settings <Build_settings>` doc page for
 details.
 
@@ -167,10 +161,8 @@ details.
    timesteps when neighbor lists are rebuilt, the coordinates of an atom
    in the image may be slightly outside the simulation box.
 
-
 ----------
 
-
 Dumps are performed on timesteps that are a multiple of N (including
 timestep 0) and on the last timestep of a minimization if the
 minimization converges.  Note that this means a dump will not be
@@ -194,10 +186,8 @@ Dump *movie* filenames on the other hand, must not have any wildcard
 character since only one file combining all images into a single
 movie will be written by the movie encoder.
 
-
 ----------
 
-
 The *color* and *diameter* settings determine the color and size of
 atoms rendered in the image.  They can be any atom attribute defined
 for the :doc:`dump custom <dump>` command, including *type* and
@@ -228,14 +218,12 @@ diameter 1.0.  This mapping can be changed by the :doc:`dump_modify adiam <dump_
 If *element* is specified for the *color* and/or *diameter* setting,
 then the color and/or diameter of each atom is determined by which
 element it is, which in turn is specified by the element-to-type
-mapping specified by the "dump\_modify element" command.  By default
+mapping specified by the "dump_modify element" command.  By default
 every atom type is C (carbon).  Every element has a color and diameter
 associated with it, which is the same as the colors and sizes used by
 the `AtomEye <atomeye_>`_ visualization package.
 
-.. _atomeye: http://mt.seas.upenn.edu/Archive/Graphics/A
-
-
+.. _atomeye: http://li.mit.edu/Archive/Graphics/A/
 
 If other atom attributes are used for the *color* or *diameter*
 settings, they are interpreted in the following way.
@@ -258,20 +246,16 @@ drawn.  Note that finite-size spherical particles, as defined by
 :doc:`atom_style sphere <atom_style>` define a per-particle radius or
 diameter, which can be used as the *diameter* setting.
 
-
 ----------
 
-
 The various keywords listed above control how the image is rendered.
 As listed below, all of the keywords have defaults, most of which you
 will likely not need to change.  The :doc:`dump modify <dump_modify>`
 also has options specific to the dump image style, particularly for
 assigning colors to atoms, bonds, and other image features.
 
-
 ----------
 
-
 The *atom* keyword allow you to turn off the drawing of all atoms, if
 the specified value is *no*\ .  Note that this will not turn off the
 drawing of particles that are represented as lines, triangles, or
@@ -283,10 +267,8 @@ set a single numeric *size*\ .  All atoms will be drawn with that
 diameter, e.g. 1.5, which is in whatever distance :doc:`units <units>`
 the input script defines, e.g. Angstroms.
 
-
 ----------
 
-
 The *bond* keyword allows to you to alter how bonds are drawn.  A bond
 is only drawn if both atoms in the bond are being drawn due to being
 in the specified group and due to other selection criteria
@@ -329,10 +311,8 @@ If *type* is specified for the *width* value then the diameter of each
 bond is determined by its bond type.  By default all types have
 diameter 0.5.  This mapping can be changed by the :doc:`dump_modify bdiam <dump_modify>` command.
 
-
 ----------
 
-
 The *line* keyword can be used when :doc:`atom_style line <atom_style>`
 is used to define particles as line segments, and will draw them as
 lines.  If this keyword is not used, such particles will be drawn as
@@ -356,10 +336,8 @@ lines will be drawn as cylinders with that diameter, e.g. 1.0, which
 is in whatever distance :doc:`units <units>` the input script defines,
 e.g. Angstroms.
 
-
 ----------
 
-
 The *tri* keyword can be used when :doc:`atom_style tri <atom_style>` is
 used to define particles as triangles, and will draw them as triangles
 or edges (3 lines) or both, depending on the setting for *tflag*\ .  If
@@ -380,10 +358,8 @@ default the mapping of types to colors is as follows:
 and repeats itself for types > 6.  There is not yet an option to
 change this via the :doc:`dump_modify <dump_modify>` command.
 
-
 ----------
 
-
 The *body* keyword can be used when :doc:`atom_style body <atom_style>`
 is used to define body particles with internal state
 (e.g. sub-particles), and will drawn them in a manner specific to the
@@ -415,10 +391,8 @@ particle.  By default the mapping of types to colors is as follows:
 and repeats itself for types > 6.  There is not yet an option to
 change this via the :doc:`dump_modify <dump_modify>` command.
 
-
 ----------
 
-
 The *fix* keyword can be used with a :doc:`fix <fix>` that produces
 objects to be drawn.
 
@@ -441,24 +415,20 @@ the mapping of types to colors is as follows:
 and repeats itself for types > 6.  There is not yet an option to
 change this via the :doc:`dump_modify <dump_modify>` command.
 
-
 ----------
 
-
 The *size* keyword sets the width and height of the created images,
 i.e. the number of pixels in each direction.
 
-
 ----------
 
-
 The *view*\ , *center*\ , *up*\ , *zoom*\ , and *persp* values determine how
 3d simulation space is mapped to the 2d plane of the image.  Basically
 they control how the simulation box appears in the image.
 
 All of the *view*\ , *center*\ , *up*\ , *zoom*\ , and *persp* values can be
 specified as numeric quantities, whose meaning is explained below.
-Any of them can also be specified as an :doc:`equal-style variable <variable>`, by using v\_name as the value, where "name" is
+Any of them can also be specified as an :doc:`equal-style variable <variable>`, by using v_name as the value, where "name" is
 the variable name.  In this case the variable will be evaluated on the
 timestep each image is created to create a new value.  If the
 equal-style variable is time-dependent, this is a means of changing
@@ -495,7 +465,6 @@ plane perpendicular to the view vector implied by the *theta* and
 vector and user-specified up vector.  Thus this internal vector is
 computed from the user-specified *up* vector as
 
-
 .. parsed-literal::
 
    up_internal = view cross (up cross view)
@@ -523,10 +492,8 @@ perspective.
 
    The *persp* keyword is not yet supported as an option.
 
-
 ----------
 
-
 The *box* keyword determines if and how the simulation box boundaries
 are rendered as thin cylinders in the image.  If *no* is set, then the
 box boundaries are not drawn and the *diam* setting is ignored.  If
@@ -553,10 +520,8 @@ processor sub-domain are drawn, with a diameter that is a fraction of
 the shortest box length in x,y,z (for 3d) or x,y (for 2d).  The color
 of the sub-domain boundaries can be set with the :doc:`dump_modify boxcolor <dump_modify>` command.
 
-
 ----------
 
-
 The *shiny* keyword determines how shiny the objects rendered in the
 image will appear.  The *sfactor* value must be a value 0.0 <=
 *sfactor* <= 1.0, where *sfactor* = 1 is a highly reflective surface
@@ -570,27 +535,24 @@ cost of computing the image by roughly 2x.  The strength of the effect
 can be scaled by the *dfactor* parameter.  If *no* is set, no depth
 shading is performed.
 
-
 ----------
 
-
 A series of JPEG, PNG, or PPM images can be converted into a movie
 file and then played as a movie using commonly available tools. Using
 dump style *movie* automates this step and avoids the intermediate
 step of writing (many) image snapshot file. But LAMMPS has to be
-compiled with -DLAMMPS\_FFMPEG and an FFmpeg executable have to be
+compiled with -DLAMMPS_FFMPEG and an FFmpeg executable have to be
 installed.
 
 To manually convert JPEG, PNG or PPM files into an animated GIF or
 MPEG or other movie file you can use:
 
 * a) Use the ImageMagick convert program.
-  
-  .. parsed-literal::
-  
-     % convert \*.jpg foo.gif
-     % convert -loop 1 \*.ppm foo.mpg
 
+  .. code-block:: bash
+
+     % convert *.jpg foo.gif
+     % convert -loop 1 *.ppm foo.mpg
 
   Animated GIF files from ImageMagick are not optimized. You can use
   a program like gifsicle to optimize and thus massively shrink them.
@@ -613,22 +575,16 @@ MPEG or other movie file you can use:
   FFmpeg is a command line tool that is available on many platforms and
   allows extremely flexible encoding and decoding of movies.
 
-  
-  .. parsed-literal::
-  
-     cat snap.\*.jpg \| ffmpeg -y -f image2pipe -c:v mjpeg -i - -b:v 2000k movie.m4v
-     cat snap.\*.ppm \| ffmpeg -y -f image2pipe -c:v ppm -i - -b:v 2400k movie.avi
+  .. code-block:: bash
 
+     cat snap.*.jpg | ffmpeg -y -f image2pipe -c:v mjpeg -i - -b:v 2000k movie.m4v
+     cat snap.*.ppm | ffmpeg -y -f image2pipe -c:v ppm -i - -b:v 2400k movie.avi
 
   Front ends for FFmpeg exist for multiple platforms. For more
   information see the `FFmpeg homepage <http://www.ffmpeg.org/>`_
 
-
-
-
 ----------
 
-
 Play the movie:
 
 * a) Use your browser to view an animated GIF movie.
@@ -639,19 +595,19 @@ Play the movie:
 * b) Use the freely available mplayer or ffplay tool to view a
   movie. Both are available for multiple OSes and support a large
   variety of file formats and decoders.
-  
-  .. parsed-literal::
-  
+
+  .. code-block:: bash
+
      % mplayer foo.mpg
      % ffplay bar.avi
 
-* c) Use the `Pizza.py <http://www.sandia.gov/~sjplimp/pizza.html>`_
-  `animate tool <http://www.sandia.gov/~sjplimp/pizza/doc/animate.html>`_,
+* c) Use the `Pizza.py <https://pizza.sandia.gov>`_
+  `animate tool <https://pizza.sandia.gov/doc/animate.html>`_,
   which works directly on a series of image files.
-  
-  .. parsed-literal::
-  
-     a = animate("foo\*.jpg")
+
+  .. code-block:: python
+
+     a = animate("foo*.jpg")
 
 * d) QuickTime and other Windows- or MacOS-based media players can
   obviously play movie files directly. Similarly for corresponding tools
@@ -660,29 +616,23 @@ Play the movie:
   additional libraries, purchasing a license, or may not be
   supported.
 
-
-
 ----------
 
-
 See the :doc:`Modify <Modify>` doc page for information on how to add
 new compute and fix styles to LAMMPS to calculate per-atom quantities
 which could then be output into dump files.
 
-
 ----------
 
-
 Restrictions
 """"""""""""
 
-
-To write JPEG images, you must use the -DLAMMPS\_JPEG switch when
+To write JPEG images, you must use the -DLAMMPS_JPEG switch when
 building LAMMPS and link with a JPEG library. To write PNG images, you
-must use the -DLAMMPS\_PNG switch when building LAMMPS and link with a
+must use the -DLAMMPS_PNG switch when building LAMMPS and link with a
 PNG library.
 
-To write *movie* dumps, you must use the -DLAMMPS\_FFMPEG switch when
+To write *movie* dumps, you must use the -DLAMMPS_FFMPEG switch when
 building LAMMPS and have the FFmpeg executable available on the
 machine where LAMMPS is being run.  Typically it's name is lowercase,
 i.e. ffmpeg.
@@ -695,7 +645,6 @@ errors and warnings printed by it. Those warnings and error messages
 will be printed to the screen only. Due to the way image data is
 communicated to FFmpeg, it will often print the message
 
-
 .. parsed-literal::
 
    pipe:: Input/output error
@@ -707,7 +656,6 @@ and 2 format streams) have video bandwidth limits that can be crossed
 when rendering too large of image sizes. Typical warnings look like
 this:
 
-
 .. parsed-literal::
 
    [mpeg @ 0x98b5e0] packet too large, ignoring buffer limits to mux it
@@ -746,8 +694,3 @@ The defaults for the keywords are as follows:
 * subbox no 0.0
 * shiny = 1.0
 * ssao = no
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/dump_modify.rst b/doc/src/dump_modify.rst
index 8d42a7acab..75fff9d444 100644
--- a/doc/src/dump_modify.rst
+++ b/doc/src/dump_modify.rst
@@ -1,13 +1,12 @@
-.. index:: dump\_modify
+.. index:: dump_modify
 
-dump\_modify command
-====================
+dump_modify command
+===================
 
 Syntax
 """"""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    dump_modify dump-ID keyword values ...
 
@@ -15,9 +14,9 @@ Syntax
 * one or more keyword/value pairs may be appended
 * these keywords apply to various dump styles
 * keyword = *append* or *at* or *buffer* or *delay* or *element* or *every* or *fileper* or *first* or *flush* or *format* or *image* or *label* or *maxfiles* or *nfile* or *pad* or *pbc* or *precision* or *region* or *refresh* or *scale* or *sfactor* or *sort* or *tfactor* or *thermo* or *thresh* or *time* or *units* or *unwrap*
-  
+
   .. parsed-literal::
-  
+
        *append* arg = *yes* or *no*
        *at* arg = N
          N = index of frame written upon first dump
@@ -68,9 +67,9 @@ Syntax
 
 * these keywords apply only to the *image* and *movie* :doc:`styles <dump_image>`
 * keyword = *acolor* or *adiam* or *amap* or *backcolor* or *bcolor* or *bdiam* or *boxcolor* or *color* or *bitrate* or *framerate*
-  
+
   .. parsed-literal::
-  
+
        *acolor* args = type color
          type = atom type or range of types (see below)
          color = name of color or color1/color2/...
@@ -115,13 +114,10 @@ Syntax
        *framerate* arg = fps
          fps = frames per second for movie
 
-
-
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    dump_modify 1 format line "%d %d %20.15g %g %g" scale yes
    dump_modify 1 format float %20.15g scale yes
@@ -143,21 +139,17 @@ As explained on the :doc:`dump <dump>` doc page, the *atom/mpiio*\ ,
 syntax and in the format of the dump files they create, to the
 corresponding styles without "mpiio", except the single dump file they
 produce is written in parallel via the MPI-IO library.  Thus if a
-dump\_modify option below is valid for the *atom* style, it is also
+dump_modify option below is valid for the *atom* style, it is also
 valid for the *atom/mpiio* style, and similarly for the other styles
 which allow for use of MPI-IO.
 
-
 ----------
 
-
 These keywords apply to various dump styles, including the :doc:`dump image <dump_image>` and :doc:`dump movie <dump_image>` styles.  The
 description gives details.
 
-
 ----------
 
-
 The *append* keyword applies to all dump styles except *cfg* and *xtc*
 and *dcd*\ .  It also applies only to text output files, not to binary
 or gzipped or image/movie files.  If specified as *yes*\ , then dump
@@ -165,23 +157,19 @@ snapshots are appended to the end of an existing dump file.  If
 specified as *no*\ , then a new dump file will be created which will
 overwrite an existing file with the same name.
 
-
 ----------
 
-
 The *at* keyword only applies to the *netcdf* dump style.  It can only
 be used if the *append yes* keyword is also used.  The *N* argument is
 the index of which frame to append to.  A negative value can be
 specified for *N*\ , which means a frame counted from the end of the
-file.  The *at* keyword can only be used if the dump\_modify command is
+file.  The *at* keyword can only be used if the dump_modify command is
 before the first command that causes dump snapshots to be output,
 e.g. a :doc:`run <run>` or :doc:`minimize <minimize>` command.  Once the
 dump file has been opened, this keyword has no further effect.
 
-
 ----------
 
-
 The *buffer* keyword applies only to dump styles *atom*\ , *cfg*\ ,
 *custom*\ , *local*\ , and *xyz*\ .  It also applies only to text output
 files, not to binary or gzipped files.  If specified as *yes*\ , which
@@ -197,20 +185,16 @@ relatively expensive task of formatting the output for its own atoms.
 However it requires about twice the memory (per processor) for the
 extra buffering.
 
-
 ----------
 
-
 The *delay* keyword applies to all dump styles.  No snapshots will be
 output until the specified *Dstep* timestep or later.  Specifying
 *Dstep* < 0 is the same as turning off the delay setting.  This is a
 way to turn off unwanted output early in a simulation, for example,
 during an equilibration phase.
 
-
 ----------
 
-
 The *element* keyword applies only to the dump *cfg*\ , *xyz*\ , and
 *image* styles.  It associates element names (e.g. H, C, Fe) with
 LAMMPS atom types.  See the list of element names at the bottom of
@@ -229,19 +213,15 @@ In the case of *xyz* format dumps, there are no restrictions to what
 label can be used as an element name.  Any white-space separated text
 will be accepted.
 
-.. _atomeye: http://mt.seas.upenn.edu/Archive/Graphics/A
-
-
-
+.. _atomeye: http://li.mit.edu/Archive/Graphics/A/
 
 ----------
 
-
 The *every* keyword changes the dump frequency originally specified by
 the :doc:`dump <dump>` command to a new value.  The every keyword can be
 specified in one of two ways.  It can be a numeric value in which case
 it must be > 0.  Or it can be an :doc:`equal-style variable <variable>`,
-which should be specified as v\_name, where name is the variable name.
+which should be specified as v_name, where name is the variable name.
 
 In this case, the variable is evaluated at the beginning of a run to
 determine the next timestep at which a dump snapshot will be written
@@ -264,8 +244,7 @@ to the dump file.  The *every* keyword cannot be used with the dump
 For example, the following commands will
 write snapshots at timesteps 0,10,20,30,100,200,300,1000,2000,etc:
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    variable        s equal logfreq(10,3,10)
    dump            1 all atom 100 tmp.dump
@@ -274,8 +253,7 @@ write snapshots at timesteps 0,10,20,30,100,200,300,1000,2000,etc:
 The following commands would write snapshots at the timesteps listed
 in file tmp.times:
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    variable        f file tmp.times
    variable        s equal next(f)
@@ -292,13 +270,11 @@ in file tmp.times:
    from the file is not a value greater than the current timestep.  Thus
    if you wanted output on steps 0,15,100 of a 100-timestep run, the file
    should contain the values 15,100,101 and you should also use the
-   dump\_modify first command.  Any final value > 100 could be used in
+   dump_modify first command.  Any final value > 100 could be used in
    place of 101.
 
-
 ----------
 
-
 The *first* keyword determines whether a dump snapshot is written on
 the very first timestep after the dump command is invoked.  This will
 always occur if the current timestep is a multiple of N, the frequency
@@ -307,20 +283,16 @@ if this is not the case, a dump snapshot will only be written if the
 setting of this keyword is *yes*\ .  If it is *no*\ , which is the
 default, then it will not be written.
 
-
 ----------
 
-
 The *flush* keyword determines whether a flush operation is invoked
 after a dump snapshot is written to the dump file.  A flush insures
 the output in that file is current (no buffering by the OS), even if
 LAMMPS halts before the simulation completes.  Flushes cannot be
 performed with dump style *xtc*\ .
 
-
 ----------
 
-
 The *format* keyword can be used to change the default numeric format
 output by the text-based dump styles: *atom*\ , *custom*\ , *cfg*\ , and
 *xyz* styles, and their MPIIO variants.  Only the *line* or *none*
@@ -360,7 +332,7 @@ settings, reverting all values to their default format.
    values.  However, when specifying the *line* option or *format M
    string* option for those values, you should specify a format string
    appropriate for an 8-byte signed integer, e.g. one with "%ld", if
-   LAMMPS was compiled with the -DLAMMPS\_BIGBIG option for 8-byte IDs.
+   LAMMPS was compiled with the -DLAMMPS_BIGBIG option for 8-byte IDs.
 
 .. note::
 
@@ -371,30 +343,25 @@ settings, reverting all values to their default format.
    (large) integer, then you need to use an appropriate format.  For
    example, these commands:
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    compute     1 all property/local batom1 batom2
    dump        1 all local 100 tmp.bonds index c_1[1] c_1[2]
    dump_modify 1 format "%d %0.0f %0.0f"
 
 will output the two atom IDs for atoms in each bond as integers.  If
-the dump\_modify command were omitted, they would appear as
+the dump_modify command were omitted, they would appear as
 floating-point values, assuming they were large integers (more than 6
 digits).  The "index" keyword should use the "%d" format since it is
 not generated by a compute or fix, and is stored internally as an
 integer.
 
-
 ----------
 
-
 The *fileper* keyword is documented below with the *nfile* keyword.
 
-
 ----------
 
-
 The *image* keyword applies only to the dump *atom* style.  If the
 image value is *yes*\ , 3 flags are appended to each atom's coords which
 are the absolute box image of the atom in each dimension.  For
@@ -405,16 +372,13 @@ current coordinate.  Note that for dump style *custom* these various
 values can be printed in the dump file by using the appropriate atom
 attributes in the dump command itself.
 
-
 ----------
 
-
 The *label* keyword applies only to the dump *local* style.  When
 it writes local information, such as bond or angle topology
 to a dump file, it will use the specified *label* to format
 the header.  By default this includes 2 lines:
 
-
 .. parsed-literal::
 
    ITEM: NUMBER OF ENTRIES
@@ -423,10 +387,8 @@ the header.  By default this includes 2 lines:
 The word "ENTRIES" will be replaced with the string specified,
 e.g. BONDS or ANGLES.
 
-
 ----------
 
-
 The *maxfiles* keyword can only be used when a '\*' wildcard is
 included in the dump file name, i.e. when writing a new file(s) for
 each snapshot.  The specified *Fmax* is how many snapshots will be
@@ -439,10 +401,8 @@ timestep something bad will happen, e.g. when LAMMPS will exit with an
 error.  You can dump every timestep, and limit the number of dump
 files produced, even if you run for 1000s of steps.
 
-
 ----------
 
-
 The *nfile* or *fileper* keywords can be used in conjunction with the
 "%" wildcard character in the specified dump file name, for all dump
 styles except the *dcd*\ , *image*\ , *movie*\ , *xtc*\ , and *xyz* styles
@@ -463,10 +423,8 @@ file for every Np processors.  For example, if Np = 4, every 4th
 processor (0,4,8,12,etc) will collect information from itself and the
 next 3 processors and write it to a dump file.
 
-
 ----------
 
-
 The *pad* keyword only applies when the dump filename is specified
 with a wildcard "\*" character which becomes the timestep.  If *pad* is
 0, which is the default, the timestep is converted into a string of
@@ -477,10 +435,8 @@ yield 0000100, 0012000, 2000000.  This can be useful so that
 post-processing programs can easily read the files in ascending
 timestep order.
 
-
 ----------
 
-
 The *pbc* keyword applies to all the dump styles.  As explained on the
 :doc:`dump <dump>` doc page, atom coordinates in a dump file may be
 slightly outside the simulation box.  This is because periodic
@@ -492,24 +448,20 @@ snapshot is written, then restored to their original position.  If it
 is set to *no* they will not be.  The *no* setting is the default
 because it requires no extra computation.
 
-
 ----------
 
-
 The *precision* keyword only applies to the dump *xtc* style.  A
 specified value of N means that coordinates are stored to 1/N
 nanometer accuracy, e.g. for N = 1000, the coordinates are written to
 1/1000 nanometer accuracy.
 
-
 ----------
 
-
 The *refresh* keyword only applies to the dump *custom*\ , *cfg*\ ,
 *image*\ , and *movie* styles.  It allows an "incremental" dump file to
 be written, by refreshing a compute that is used as a threshold for
 determining which atoms are included in a dump snapshot.  The
-specified *c\_ID* gives the ID of the compute.  It is prefixed by "c\_"
+specified *c_ID* gives the ID of the compute.  It is prefixed by "c\_"
 to indicate a compute, which is the only current option.  At some
 point, other options may be added, e.g. fixes or variables.
 
@@ -534,8 +486,7 @@ any snapshot we only want to output atoms that have hopped since the
 last snapshot.  This can be accomplished with something the following
 commands:
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    variable        Dhop equal 0.6
    variable        check atom "c_dsp[4] > v_Dhop"
@@ -552,7 +503,7 @@ Angstroms to be output on a given snapshot (assuming metal units).
 However, note that when an atom is output, we also need to update the
 reference position for that atom to its new coordinates.  So that it
 will not be output in every snapshot thereafter.  That reference
-position is stored by :doc:`compute displace/atom <compute_displace_atom>`.  So the dump\_modify
+position is stored by :doc:`compute displace/atom <compute_displace_atom>`.  So the dump_modify
 *refresh* option triggers a call to compute displace/atom at the end
 of every dump to perform that update.  The *refresh check* option
 shown as part of the :doc:`compute displace/atom <compute_displace_atom>` command enables the compute
@@ -560,23 +511,21 @@ to respond to the call from the dump command, and update the
 appropriate reference positions.  This is done be defining an
 :doc:`atom-style variable <variable>`, *check* in this example, which
 calculates a Boolean value (0 or 1) for each atom, based on the same
-criterion used by dump\_modify thresh.
+criterion used by dump_modify thresh.
 
 See the :doc:`compute displace/atom <compute_displace_atom>` command for
 more details, including an example of how to produce output that
 includes an initial snapshot with the reference position of all atoms.
 
 Note that only computes with a *refresh* option will work with
-dump\_modify refresh.  See individual compute doc pages for details.
+dump_modify refresh.  See individual compute doc pages for details.
 Currently, only compute displace/atom supports this option.  Others
-may be added at some point.  If you use a compute that doesn't support
-refresh operations, LAMMPS will not complain; dump\_modify refresh will
+may be added at some point.  If you use a compute that does not support
+refresh operations, LAMMPS will not complain; dump_modify refresh will
 simply do nothing.
 
-
 ----------
 
-
 The *region* keyword only applies to the dump *custom*\ , *cfg*\ ,
 *image*\ , and *movie* styles.  If specified, only atoms in the region
 will be written to the dump file or included in the image/movie.  Only
@@ -586,10 +535,8 @@ can be defined as the "inside" or "outside" of a geometric shape, and
 it can be the "union" or "intersection" of a series of simpler
 regions.
 
-
 ----------
 
-
 The *scale* keyword applies only to the dump *atom* style.  A scale
 value of *yes* means atom coords are written in normalized units from
 0.0 to 1.0 in each box dimension.  If the simulation box is triclinic
@@ -597,10 +544,8 @@ value of *yes* means atom coords are written in normalized units from
 value of *no* means they are written in absolute distance units
 (e.g. Angstroms or sigma).
 
-
 ----------
 
-
 The *sfactor* and *tfactor* keywords only apply to the dump *xtc*
 style.  They allow customization of the unit conversion factors used
 when writing to XTC files.  By default they are initialized for
@@ -614,10 +559,8 @@ different units, since the compression algorithm used in XTC files is
 most effective when the typical magnitude of position data is between
 10.0 and 0.1.
 
-
 ----------
 
-
 The *sort* keyword determines whether lines of per-atom output in a
 snapshot are sorted or not.  A sort value of *off* means they will
 typically be written in indeterminate order, either in serial or
@@ -640,19 +583,15 @@ performed.
    output requires extra overhead in terms of CPU and communication cost,
    as well as memory, versus unsorted output.
 
-
 ----------
 
-
 The *thermo* keyword only applies the dump *netcdf* style.  It
 triggers writing of :doc:`thermo <thermo>` information to the dump file
 alongside per-atom data.  The values included in the dump file are
 identical to the values specified by :doc:`thermo_style <thermo_style>`.
 
-
 ----------
 
-
 The *thresh* keyword only applies to the dump *custom*\ , *cfg*\ ,
 *image*\ , and *movie* styles.  Multiple thresholds can be specified.
 Specifying *none* turns off all threshold criteria.  If thresholds are
@@ -677,8 +616,7 @@ the dump command was invoked to produce a snapshot.  This is a way to
 only dump atoms whose attribute has changed (or not changed).
 Three examples follow.
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    dump_modify ... thresh ix != LAST
 
@@ -687,21 +625,19 @@ simulation box since the last dump.  (Note that atoms that crossed
 once and then crossed back between the two dump timesteps would not be
 included.)
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    region foo sphere 10 20 10 15
    variable inregion atom rmask(foo)
-   dump_modify ... thresh v_inregion \|\^ LAST
+   dump_modify ... thresh v_inregion |^ LAST
 
 This will dump atoms which crossed the boundary of the spherical
 region since the last dump.
 
+.. code-block:: LAMMPS
 
-.. parsed-literal::
-
-   variable charge atom "(q > 0.5) \|\| (q < -0.5)"
-   dump_modify ... thresh v_charge \|\^ LAST
+   variable charge atom "(q > 0.5) || (q < -0.5)"
+   dump_modify ... thresh v_charge |^ LAST
 
 This will dump atoms whose charge has changed from an absolute value
 less than 1/2 to greater than 1/2 (or vice versa) since the last dump.
@@ -714,16 +650,13 @@ In this context, XOR means that if either the attribute or value is
 0.0 and the other is non-zero, then the result is "true" and the
 threshold criterion is met.  Otherwise it is not met.
 
-
 ----------
 
-
 The *time* keyword only applies to the dump *atom*\ , *custom*\ , and
 *local* styles (and their COMPRESS package versions *atom/gz*\ ,
 *custom/gz* and *local/gz*\ ). If set to *yes*\ , each frame will will
 contain two extra lines before the "ITEM: TIMESTEP" entry:
 
-
 .. parsed-literal::
 
    ITEM: TIME
@@ -735,16 +668,13 @@ This is to simplify post-processing of trajectories using a variable time
 step, e.g. when using :doc:`fix dt/reset <fix_dt_reset>`.
 The default setting is *no*\ .
 
-
 ----------
 
-
 The *units* keyword only applies to the dump *atom*\ , *custom*\ , and
 *local* styles (and their COMPRESS package versions *atom/gz*\ ,
 *custom/gz* and *local/gz*\ ). If set to *yes*\ , each individual dump
 file will contain two extra lines at the very beginning with:
 
-
 .. parsed-literal::
 
    ITEM: UNITS
@@ -755,10 +685,8 @@ to the dump file and thus allows visualization and post-processing
 tools to determine the choice of units of the data in the dump file.
 The default setting is *no*\ .
 
-
 ----------
 
-
 The *unwrap* keyword only applies to the dump *dcd* and *xtc* styles.
 If set to *yes*\ , coordinates will be written "unwrapped" by the image
 flags for each atom.  Unwrapped means that if the atom has passed through
@@ -767,19 +695,15 @@ the coordinate would be if it had not been wrapped back into the
 periodic box.  Note that these coordinates may thus be far outside the
 box size stored with the snapshot.
 
-
 ----------
 
-
 These keywords apply only to the :doc:`dump image <dump_image>` and
 :doc:`dump movie <dump_image>` styles.  Any keyword that affects an
 image, also affects a movie, since the movie is simply a collection of
 images.  Some of the keywords only affect the :doc:`dump movie <dump_image>` style.  The descriptions give details.
 
-
 ----------
 
-
 The *acolor* keyword can be used with the :doc:`dump image <dump_image>`
 command, when its atom color setting is *type*\ , to set the color that
 atoms of each type will be drawn in the image.
@@ -796,16 +720,14 @@ all types from 1 to N.  A leading asterisk means all types from 1 to n
 
 The specified *color* can be a single color which is any of the 140
 pre-defined colors (see below) or a color name defined by the
-dump\_modify color option.  Or it can be two or more colors separated
+dump_modify color option.  Or it can be two or more colors separated
 by a "/" character, e.g. red/green/blue.  In the former case, that
 color is assigned to all the specified atom types.  In the latter
 case, the list of colors are assigned in a round-robin fashion to each
 of the specified atom types.
 
-
 ----------
 
-
 The *adiam* keyword can be used with the :doc:`dump image <dump_image>`
 command, when its atom diameter setting is *type*\ , to set the size
 that atoms of each type will be drawn in the image.  The specified
@@ -815,10 +737,8 @@ argument to specify a range of atom types.  The specified *diam* is
 the size in whatever distance :doc:`units <units>` the input script is
 using, e.g. Angstroms.
 
-
 ----------
 
-
 The *amap* keyword can be used with the :doc:`dump image <dump_image>`
 command, with its *atom* keyword, when its atom setting is an
 atom-attribute, to setup a color map.  The color map is used to assign
@@ -877,7 +797,7 @@ The *N* setting is how many entries follow.  The format of the entries
 depends on whether the color map style is continuous, discrete or
 sequential.  In all cases the *color* setting can be any of the 140
 pre-defined colors (see below) or a color name defined by the
-dump\_modify color option.
+dump_modify color option.
 
 For continuous color maps, each entry has a *value* and a *color*\ .
 The *value* is either a number within the range of values or *min* or
@@ -934,32 +854,27 @@ atoms in individual molecules with a different color.  See the
 examples/pour/in.pour.2d.molecule input script for an example of how
 this is used.
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    variable        colors string &
                    "red green blue yellow white &
                    purple pink orange lime gray"
    variable        mol atom mol%10
-   dump            1 all image 250 image.\*.jpg v_mol type &
+   dump            1 all image 250 image.*.jpg v_mol type &
                    zoom 1.6 adiam 1.5
    dump_modify     1 pad 5 amap 0 10 sa 1 10 ${colors}
 
 In this case, 10 colors are defined, and molecule IDs are
 mapped to one of the colors, even if there are 1000s of molecules.
 
-
 ----------
 
-
 The *backcolor* sets the background color of the images.  The color
 name can be any of the 140 pre-defined colors (see below) or a color
-name defined by the dump\_modify color option.
-
+name defined by the dump_modify color option.
 
 ----------
 
-
 The *bcolor* keyword can be used with the :doc:`dump image <dump_image>`
 command, with its *bond* keyword, when its color setting is *type*\ , to
 set the color that bonds of each type will be drawn in the image.
@@ -976,16 +891,14 @@ all types from 1 to N.  A leading asterisk means all types from 1 to n
 
 The specified *color* can be a single color which is any of the 140
 pre-defined colors (see below) or a color name defined by the
-dump\_modify color option.  Or it can be two or more colors separated
+dump_modify color option.  Or it can be two or more colors separated
 by a "/" character, e.g. red/green/blue.  In the former case, that
 color is assigned to all the specified bond types.  In the latter
 case, the list of colors are assigned in a round-robin fashion to each
 of the specified bond types.
 
-
 ----------
 
-
 The *bdiam* keyword can be used with the :doc:`dump image <dump_image>`
 command, with its *bond* keyword, when its diam setting is *type*\ , to
 set the diameter that bonds of each type will be drawn in the image.
@@ -995,10 +908,8 @@ the *type* argument to specify a range of bond types.  The specified
 *diam* is the size in whatever distance :doc:`units <units>` you are
 using, e.g. Angstroms.
 
-
 ----------
 
-
 The *bitrate* keyword can be used with the :doc:`dump movie <dump_image>` command to define the size of the resulting
 movie file and its quality via setting how many kbits per second are
 to be used for the movie file. Higher bitrates require less
@@ -1012,26 +923,22 @@ older compression formats.
    Not all movie file formats supported by dump movie allow the
    bitrate to be set.  If not, the setting is silently ignored.
 
-
 ----------
 
-
 The *boxcolor* keyword sets the color of the simulation box drawn
 around the atoms in each image as well as the color of processor
 sub-domain boundaries.  See the "dump image box" command for how to
 specify that a box be drawn via the *box* keyword, and the sub-domain
 boundaries via the *subbox* keyword.  The color name can be any of the
 140 pre-defined colors (see below) or a color name defined by the
-dump\_modify color option.
-
+dump_modify color option.
 
 ----------
 
-
 The *color* keyword allows definition of a new color name, in addition
 to the 140-predefined colors (see below), and associates 3
 red/green/blue RGB values with that color name.  The color name can
-then be used with any other dump\_modify keyword that takes a color
+then be used with any other dump_modify keyword that takes a color
 name as a value.  The RGB values should each be floating point values
 between 0.0 and 1.0 inclusive.
 
@@ -1040,10 +947,8 @@ names are searched first, then the 140 pre-defined color names.  This
 means you can also use the *color* keyword to overwrite one of the
 pre-defined color names with new RBG values.
 
-
 ----------
 
-
 The *framerate* keyword can be used with the :doc:`dump movie <dump_image>` command to define the duration of the resulting
 movie file.  Movie files written by the dump *movie* command have a
 default frame rate of 24 frames per second and the images generated
@@ -1055,10 +960,8 @@ frame rate higher than 24 is not recommended, as it will result in
 simply dropping the rendered images. It is more efficient to dump
 images less frequently.
 
-
 ----------
 
-
 Restrictions
 """"""""""""
  none
@@ -1107,12 +1010,10 @@ The option defaults are
 * color = 140 color names are pre-defined as listed below
 * framerate = 24
 
-
 ----------
 
-
 These are the standard 109 element names that LAMMPS pre-defines for
-use with the :doc:`dump image <dump_image>` and dump\_modify commands.
+use with the :doc:`dump image <dump_image>` and dump_modify commands.
 
 * 1-10 = "H", "He", "Li", "Be", "B", "C", "N", "O", "F", "Ne"
 * 11-20 = "Na", "Mg", "Al", "Si", "P", "S", "Cl", "Ar", "K", "Ca"
@@ -1126,13 +1027,11 @@ use with the :doc:`dump image <dump_image>` and dump\_modify commands.
 * 91-100 = "Pa", "U", "Np", "Pu", "Am", "Cm", "Bk", "Cf", "Es", "Fm"
 * 101-109 = "Md", "No", "Lr", "Rf", "Db", "Sg", "Bh", "Hs", "Mt"
 
-
 ----------
 
-
 These are the 140 colors that LAMMPS pre-defines for use with the
-:doc:`dump image <dump_image>` and dump\_modify commands.  Additional
-colors can be defined with the dump\_modify color command.  The 3
+:doc:`dump image <dump_image>` and dump_modify commands.  Additional
+colors can be defined with the dump_modify color command.  The 3
 numbers listed for each name are the RGB (red/green/blue) values.
 Divide each value by 255 to get the equivalent 0.0 to 1.0 value.
 
@@ -1193,8 +1092,3 @@ Divide each value by 255 to get the equivalent 0.0 to 1.0 value.
 +-------------------------------+--------------------------------------+---------------------------------+--------------------------------+--------------------------------+
 | wheat = 245, 222, 179         | white = 255, 255, 255                | whitesmoke = 245, 245, 245      | yellow = 255, 255, 0           | yellowgreen = 154, 205, 50     |
 +-------------------------------+--------------------------------------+---------------------------------+--------------------------------+--------------------------------+
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/dump_molfile.rst b/doc/src/dump_molfile.rst
index 69347840b5..69bd8aa8c2 100644
--- a/doc/src/dump_molfile.rst
+++ b/doc/src/dump_molfile.rst
@@ -6,7 +6,6 @@ dump molfile command
 Syntax
 """"""
 
-
 .. parsed-literal::
 
    dump ID group-ID molfile N file format path
@@ -19,15 +18,13 @@ Syntax
 * format = file format to be used
 * path = file path with plugins (optional)
 
-
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    dump mf1 all molfile 10 melt1.xml hoomd
-   dump mf2 all molfile 10 melt2-\*.pdb pdb .
+   dump mf2 all molfile 10 melt2-*.pdb pdb .
    dump mf3 all molfile 50 melt3.xyz xyz .:/home/akohlmey/vmd/plugins/LINUX/molfile
 
 Description
@@ -56,10 +53,8 @@ by this dump style: the number of atoms must not change, the atoms
 must be sorted, outside of the coordinates no change in atom properties
 (like type, mass, charge) will be recorded.
 
-
 ----------
 
-
 The *format* keyword determines what format is used to write out the
 dump. For this to work, LAMMPS must be able to find and load a
 compatible molfile plugin that supports this format.  Settings made via
@@ -79,10 +74,8 @@ if it had not been wrapped back into the periodic box.  Note that these
 coordinates may thus be far outside the box size stored with the
 snapshot.
 
-
 ----------
 
-
 Dumps are performed on timesteps that are a multiple of N (including
 timestep 0) and on the last timestep of a minimization if the
 minimization converges.  Note that this means a dump will not be
@@ -94,14 +87,11 @@ an arbitrary timestep.  N can be changed between runs by using the
 :doc:`dump_modify every <dump_modify>` command. The :doc:`dump_modify every <dump_modify>` command also allows a variable to be used to
 determine the sequence of timesteps on which dump files are written.
 
-
 ----------
 
-
 Restrictions
 """"""""""""
 
-
 The *molfile* dump style is part of the USER-MOLFILE package.  It is
 only enabled if LAMMPS was built with that package.  See the :doc:`Build package <Build_package>` doc page for more info.
 
@@ -125,10 +115,8 @@ application itself.  The plugins are installed in the directory:
    with a set of header files that are compatible with VMD 1.9 and 1.9.1
    (June 2012)
 
-
 ----------
 
-
 Related commands
 """"""""""""""""
 
@@ -138,8 +126,3 @@ Default
 """""""
 
 The default path is ".". All other properties have to be specified.
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/dump_netcdf.rst b/doc/src/dump_netcdf.rst
index 9f98cd9824..5627060452 100644
--- a/doc/src/dump_netcdf.rst
+++ b/doc/src/dump_netcdf.rst
@@ -9,7 +9,6 @@ dump netcdf/mpiio command
 Syntax
 """"""
 
-
 .. parsed-literal::
 
    dump ID group-ID netcdf N file args
@@ -25,13 +24,12 @@ Syntax
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    dump 1 all netcdf 100 traj.nc type x y z vx vy vz
    dump_modify 1 append yes at -1 thermo yes
    dump 1 all netcdf/mpiio 1000 traj.nc id type x y z
-   dump 1 all netcdf 1000 traj.\*.nc id type x y z
+   dump 1 all netcdf 1000 traj.*.nc id type x y z
 
 Description
 """""""""""
@@ -63,35 +61,21 @@ by :doc:`thermo_style <thermo_style>`.
 
 .. _netcdf-home: http://www.unidata.ucar.edu/software/netcdf/
 
-
-
 .. _pnetcdf-home: http://trac.mcs.anl.gov/projects/parallel-netcdf/
 
-
-
-
 ----------
 
-
 Restrictions
 """"""""""""
 
-
 The *netcdf* and *netcdf/mpiio* dump styles are part of the
 USER-NETCDF package.  They are only enabled if LAMMPS was built with
 that package. See the :doc:`Build package <Build_package>` doc page for
 more info.
 
-
 ----------
 
-
 Related commands
 """"""""""""""""
 
 :doc:`dump <dump>`, :doc:`dump_modify <dump_modify>`, :doc:`undump <undump>`
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/dump_vtk.rst b/doc/src/dump_vtk.rst
index 6624820a4f..4f607c4fdd 100644
--- a/doc/src/dump_vtk.rst
+++ b/doc/src/dump_vtk.rst
@@ -6,7 +6,6 @@ dump vtk command
 Syntax
 """"""
 
-
 .. parsed-literal::
 
    dump ID group-ID vtk N file args
@@ -21,11 +20,10 @@ Syntax
 Examples
 """"""""
 
+.. code-block:: LAMMPS
 
-.. parsed-literal::
-
-   dump dmpvtk all vtk 100 dump\*.myforce.vtk id type vx fx
-   dump dmpvtp flow vtk 100 dump\*.%.displace.vtp id type c_myD[1] c_myD[2] c_myD[3] v_ke
+   dump dmpvtk all vtk 100 dump*.myforce.vtk id type vx fx
+   dump dmpvtp flow vtk 100 dump*.%.displace.vtp id type c_myD[1] c_myD[2] c_myD[3] v_ke
 
 Description
 """""""""""
@@ -74,13 +72,11 @@ determine the kind of output.
 For the *vtk* style, sorting is off by default. See the
 :doc:`dump_modify <dump_modify>` doc page for details.
 
-
 ----------
 
-
 The dimensions of the simulation box are written to a separate file
 for each snapshot (either in legacy VTK or XML format depending on the
-format of the main dump file) with the suffix *\_boundingBox* appended
+format of the main dump file) with the suffix *_boundingBox* appended
 to the given dump filename.
 
 For an orthogonal simulation box this information is saved as a
@@ -109,10 +105,8 @@ a wildcard "\*" must be included in the filename, as discussed below.
 Otherwise the dump files will get overwritten with the new snapshot
 each time.
 
-
 ----------
 
-
 Dumps are performed on timesteps that are a multiple of N (including
 timestep 0) and on the last timestep of a minimization if the
 minimization converges.  Note that this means a dump will not be
@@ -140,8 +134,8 @@ in order with some post-processing tools.
 If a "%" character appears in the filename, then each of P processors
 writes a portion of the dump file, and the "%" character is replaced
 with the processor ID from 0 to P-1 preceded by an underscore character.
-For example, tmp.dump%.vtp becomes tmp.dump\_0.vtp, tmp.dump\_1.vtp, ...
-tmp.dump\_P-1.vtp, etc.  This creates smaller files and can be a fast
+For example, tmp.dump%.vtp becomes tmp.dump_0.vtp, tmp.dump_1.vtp, ...
+tmp.dump_P-1.vtp, etc.  This creates smaller files and can be a fast
 mode of output on parallel machines that support parallel I/O for output.
 
 By default, P = the number of processors meaning one file per
@@ -156,19 +150,16 @@ processor 0 does write files.
 Note that using the "\*" and "%" characters together can produce a
 large number of small dump files!
 
-If *dump\_modify binary* is used, the dump file (or files, if "\*" or
+If *dump_modify binary* is used, the dump file (or files, if "\*" or
 "%" is also used) is written in binary format.  A binary dump file
 will be about the same size as a text version, but will typically
 write out much faster.
 
-
 ----------
 
-
 Restrictions
 """"""""""""
 
-
 The *vtk* style does not support writing of gzipped dump files.
 
 The *vtk* dump style is part of the USER-VTK package. It is only
@@ -192,8 +183,3 @@ Default
 
 By default, files are written in ASCII format. If the file extension
 is not one of .vtk, .vtp or .vtu, the legacy VTK file format is used.
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/dynamical_matrix.rst b/doc/src/dynamical_matrix.rst
index 0d4ccf7589..01981732da 100644
--- a/doc/src/dynamical_matrix.rst
+++ b/doc/src/dynamical_matrix.rst
@@ -1,13 +1,12 @@
-.. index:: dynamical\_matrix
+.. index:: dynamical_matrix
 
-dynamical\_matrix command
-=========================
+dynamical_matrix command
+========================
 
 Syntax
 """"""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    dynamical_matrix group-ID style gamma args keyword value ...
 
@@ -15,20 +14,17 @@ Syntax
 * style = *regular* or *eskm*
 * gamma = finite different displacement length (distance units)
 * one or more keyword/arg pairs may be appended
-  
+
   .. parsed-literal::
-  
+
        keyword = *file* or *binary*
          *file* name = name of output file for the dynamical matrix
          *binary* arg = *yes* or *no* or *gzip*
 
-
-
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    dynamical_matrix 1 regular 0.000001
    dynamical_matrix 1 eskm 0.000001
@@ -40,49 +36,47 @@ Description
 
 Calculate the dynamical matrix by finite difference of the selected group,
 
-.. image:: JPG/dynamical_matrix_dynmat.jpg
-   :align: center
+.. math::
 
-where D is the dynamical matrix and Phi is the force constant matrix defined by
+   D = \frac{\Phi_{ij}^{\alpha\beta}}{\sqrt{M_i M_j}}
 
-.. image:: JPG/dynamical_matrix_force_constant.jpg
-   :align: center
+where D is the dynamical matrix and :math:`\Phi` is the force constant
+matrix defined by
 
-The output for the dynamical matrix is printed three elements at a time. The
-three elements are the three beta elements for a respective i/alpha/j combination. 
-Each line is printed in order of j increasing first, alpha second, and i last.
+.. math::
 
-If the style eskm is selected, the dynamical matrix will be in units of inverse squared
-femtoseconds. These units will then conveniently leave frequencies in THz, where
-frequencies, represented as omega, can be calculated from
+   \Phi_{ij}^{\alpha\beta} = \frac{\partial^2 U}{\partial x_{i,\alpha} \partial x_{j,\beta}}
 
-:c, image(Eqs/dynamical\_matrix\_phonons.jpg)
+The output for the dynamical matrix is printed three elements at a time.
+The three elements are the three :math:`\beta` elements for a respective
+i/:math:`\alpha`/j combination.  Each line is printed in order of j
+increasing first, :math:`\alpha` second, and i last.
+
+If the style eskm is selected, the dynamical matrix will be in units of
+inverse squared femtoseconds. These units will then conveniently leave
+frequencies in THz.
 
 Restrictions
 """"""""""""
 
-
 The command collects an array of nine times the number of atoms in a group
 on every single MPI rank, so the memory requirements can be very significant
 for large systems.
 
 This command is part of the USER-PHONON package.  It is only enabled if
-LAMMPS was built with that package.  See the :doc:`Build package <Build_package>` doc page for more info.
+LAMMPS was built with that package.
+See the :doc:`Build package <Build_package>` doc page for more info.
 
 Related commands
 """"""""""""""""
 
-:doc:`fix phonon <fix_phonon>`
+:doc:`fix phonon <fix_phonon>`, :doc:`fix numdiff <fix_numdiff>`, 
 
-:doc:`compute hma <compute_hma>` uses an analytic formulation of the hessian
-provided by Pair's single\_hessian.
+:doc:`compute hma <compute_hma>` uses an analytic formulation of the
+Hessian provided by a pair_style's Pair::single_hessian() function,
+if implemented.
 
 Default
 """""""
 
 The default settings are file = "dynmat.dyn", binary = no
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/echo.rst b/doc/src/echo.rst
index a88d821993..6fc00aa1e6 100644
--- a/doc/src/echo.rst
+++ b/doc/src/echo.rst
@@ -6,7 +6,6 @@ echo command
 Syntax
 """"""
 
-
 .. parsed-literal::
 
    echo style
@@ -16,8 +15,7 @@ Syntax
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    echo both
    echo log
@@ -42,12 +40,6 @@ Restrictions
 Default
 """""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    echo log
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/fix.rst b/doc/src/fix.rst
index 801479de6e..2b5ed48ac9 100644
--- a/doc/src/fix.rst
+++ b/doc/src/fix.rst
@@ -6,7 +6,6 @@ fix command
 Syntax
 """"""
 
-
 .. parsed-literal::
 
    fix ID group-ID style args
@@ -19,8 +18,7 @@ Syntax
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    fix 1 all nve
    fix 3 all nvt temp 300.0 300.0 0.01
@@ -77,10 +75,8 @@ continue on with its calculations in a restarted simulation.  See the
 a fix in an input script that reads a restart file.  See the doc pages
 for individual fixes for info on which ones can be restarted.
 
-
 ----------
 
-
 Some fixes calculate one of three styles of quantities: global,
 per-atom, or local, which can be used by other commands or output as
 described below.  A global quantity is one or more system-wide values,
@@ -107,11 +103,11 @@ discussed below, it can be referenced via the following bracket
 notation, where ID is the ID of the fix:
 
 +-------------+--------------------------------------------+
-| f\_ID       | entire scalar, vector, or array            |
+| f_ID       | entire scalar, vector, or array             |
 +-------------+--------------------------------------------+
-| f\_ID[I]    | one element of vector, one column of array |
+| f_ID[I]    | one element of vector, one column of array  |
 +-------------+--------------------------------------------+
-| f\_ID[I][J] | one element of array                       |
+| f_ID[I][J] | one element of array                        |
 +-------------+--------------------------------------------+
 
 In other words, using one bracket reduces the dimension of the
@@ -123,14 +119,12 @@ or array.
 Note that commands and :doc:`variables <variable>` which use fix
 quantities typically do not allow for all kinds, e.g. a command may
 require a vector of values, not a scalar.  This means there is no
-ambiguity about referring to a fix quantity as f\_ID even if it
+ambiguity about referring to a fix quantity as f_ID even if it
 produces, for example, both a scalar and vector.  The doc pages for
 various commands explain the details.
 
-
 ----------
 
-
 In LAMMPS, the values generated by a fix can be used in several ways:
 
 * Global values can be output via the :doc:`thermo_style custom <thermo_style>` or :doc:`fix ave/time <fix_ave_time>` command.
@@ -142,7 +136,6 @@ In LAMMPS, the values generated by a fix can be used in several ways:
   command.  Or the per-atom values can be referenced in an :doc:`atom-style variable <variable>`.
 * Local values can be reduced by the :doc:`compute reduce <compute_reduce>` command, or histogrammed by the :doc:`fix ave/histo <fix_ave_histo>` command.
 
-
 See the :doc:`Howto output <Howto_output>` doc page for a summary of
 various LAMMPS output options, many of which involve fixes.
 
@@ -153,16 +146,14 @@ e.g. temperature.  Extensive means the value scales with the number of
 atoms in the simulation, e.g. total rotational kinetic energy.
 :doc:`Thermodynamic output <thermo_style>` will normalize extensive
 values by the number of atoms in the system, depending on the
-"thermo\_modify norm" setting.  It will not normalize intensive values.
+"thermo_modify norm" setting.  It will not normalize intensive values.
 If a fix value is accessed in another way, e.g. by a
 :doc:`variable <variable>`, you may want to know whether it is an
 intensive or extensive value.  See the doc page for individual fixes
 for further info.
 
-
 ----------
 
-
 Each fix style has its own doc page which describes its arguments and
 what it does, as listed below.  Here is an alphabetic list of fix
 styles available in LAMMPS.  They are also listed in more compact form
@@ -271,6 +262,7 @@ accelerated styles exist.
 * :doc:`npt/eff <fix_nh_eff>` - NPT for  nuclei and electrons in the electron force field model
 * :doc:`npt/sphere <fix_npt_sphere>` - NPT for spherical particles
 * :doc:`npt/uef <fix_nh_uef>` - NPT style time integration with diagonal flow
+* :doc:`numdiff <fix_numdiff>` - compute derivatives of per-atom data from finite differences
 * :doc:`nve <fix_nve>` - constant NVE time integration
 * :doc:`nve/asphere <fix_nve_asphere>` - NVE for aspherical particles
 * :doc:`nve/asphere/noforce <fix_nve_asphere_noforce>` - NVE for aspherical particles without forces
@@ -396,7 +388,6 @@ accelerated styles exist.
 Restrictions
 """"""""""""
 
-
 Some fix styles are part of specific packages.  They are only enabled
 if LAMMPS was built with that package.  See the :doc:`Build package <Build_package>` doc page for more info.  The doc pages for
 individual fixes tell if it is part of a package.
@@ -407,8 +398,3 @@ Related commands
 :doc:`unfix <unfix>`, :doc:`fix_modify <fix_modify>`
 
 **Default:** none
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/fix_adapt.rst b/doc/src/fix_adapt.rst
index 723cbd4618..eab8f92639 100644
--- a/doc/src/fix_adapt.rst
+++ b/doc/src/fix_adapt.rst
@@ -6,7 +6,6 @@ fix adapt command
 Syntax
 """"""
 
-
 .. parsed-literal::
 
    fix ID group-ID adapt N attribute args ... keyword value ...
@@ -16,9 +15,9 @@ Syntax
 * N = adapt simulation settings every this many timesteps
 * one or more attribute/arg pairs may be appended
 * attribute = *pair* or *kspace* or *atom*
-  
+
   .. parsed-literal::
-  
+
        *pair* args = pstyle pparam I J v_name
          pstyle = pair style name, e.g. lj/cut
          pparam = parameter to adapt over time
@@ -37,9 +36,9 @@ Syntax
 
 * zero or more keyword/value pairs may be appended
 * keyword = *scale* or *reset*
-  
+
   .. parsed-literal::
-  
+
        *scale* value = *no* or *yes*
          *no* = the variable value is the new setting
          *yes* = the variable value multiplies the original setting
@@ -47,17 +46,14 @@ Syntax
          *no* = values will remain altered at the end of a run
          *yes* = reset altered values to their original values at the end of a run
 
-
-
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    fix 1 all adapt 1 pair soft a 1 1 v_prefactor
-   fix 1 all adapt 1 pair soft a 2\* 3 v_prefactor
-   fix 1 all adapt 1 pair lj/cut epsilon \* \* v_scale1 coul/cut scale 3 3 v_scale2 scale yes reset yes
+   fix 1 all adapt 1 pair soft a 2* 3 v_prefactor
+   fix 1 all adapt 1 pair lj/cut epsilon * * v_scale1 coul/cut scale 3 3 v_scale2 scale yes reset yes
    fix 1 all adapt 10 atom diameter v_size
 
    variable ramp_up equal "ramp(0.01,0.5)"
@@ -102,10 +98,8 @@ themselves are actually altered by this fix.  Make sure you use the
 *reset yes* option if you want the parameters to be restored to their
 initial values after the run.
 
-
 ----------
 
-
 The *pair* keyword enables various parameters of potentials defined by
 the :doc:`pair_style <pair_style>` command to be changed, if the pair
 style supports it.  Note that the :doc:`pair_style <pair_style>` and
@@ -127,11 +121,11 @@ meaning of these parameters:
 +---------------------------------------------------------------------+--------------------------------------------------+-------------+
 | :doc:`born <pair_born>`                                             | a,b,c                                            | type pairs  |
 +---------------------------------------------------------------------+--------------------------------------------------+-------------+
-| :doc:`born/coul/long, born/coul/msm <pair_born>`                    | coulombic\_cutoff                                | type global |
+| :doc:`born/coul/long, born/coul/msm <pair_born>`                    | coulombic_cutoff                                 | type global |
 +---------------------------------------------------------------------+--------------------------------------------------+-------------+
 | :doc:`buck <pair_buck>`                                             | a,c                                              | type pairs  |
 +---------------------------------------------------------------------+--------------------------------------------------+-------------+
-| :doc:`buck/coul/long, buck/coul/msm <pair_buck>`                    | coulombic\_cutoff                                | type global |
+| :doc:`buck/coul/long, buck/coul/msm <pair_buck>`                    | coulombic_cutoff                                 | type global |
 +---------------------------------------------------------------------+--------------------------------------------------+-------------+
 | :doc:`buck/mdf <pair_mdf>`                                          | a,c                                              | type pairs  |
 +---------------------------------------------------------------------+--------------------------------------------------+-------------+
@@ -141,11 +135,11 @@ meaning of these parameters:
 +---------------------------------------------------------------------+--------------------------------------------------+-------------+
 | :doc:`coul/debye <pair_coul>`                                       | scale                                            | type pairs  |
 +---------------------------------------------------------------------+--------------------------------------------------+-------------+
-| :doc:`coul/dsf <pair_coul>`                                         | coulombic\_cutoff                                | type global |
+| :doc:`coul/dsf <pair_coul>`                                         | coulombic_cutoff                                 | type global |
 +---------------------------------------------------------------------+--------------------------------------------------+-------------+
-| :doc:`coul/long, coul/msm <pair_coul>`                              | coulombic\_cutoff, scale                         | type pairs  |
+| :doc:`coul/long, coul/msm <pair_coul>`                              | coulombic_cutoff, scale                          | type pairs  |
 +---------------------------------------------------------------------+--------------------------------------------------+-------------+
-| :doc:`coul/long/soft <pair_fep_soft>`                               | scale, lambda, coulombic\_cutoff                 | type pairs  |
+| :doc:`coul/long/soft <pair_fep_soft>`                               | scale, lambda, coulombic_cutoff                  | type pairs  |
 +---------------------------------------------------------------------+--------------------------------------------------+-------------+
 | :doc:`eam, eam/alloy, eam/fs <pair_eam>`                            | scale                                            | type pairs  |
 +---------------------------------------------------------------------+--------------------------------------------------+-------------+
@@ -155,17 +149,17 @@ meaning of these parameters:
 +---------------------------------------------------------------------+--------------------------------------------------+-------------+
 | :doc:`lj/class2 <pair_class2>`                                      | epsilon,sigma                                    | type pairs  |
 +---------------------------------------------------------------------+--------------------------------------------------+-------------+
-| :doc:`lj/class2/coul/cut, lj/class2/coul/long <pair_class2>`        | epsilon,sigma,coulombic\_cutoff                  | type pairs  |
+| :doc:`lj/class2/coul/cut, lj/class2/coul/long <pair_class2>`        | epsilon,sigma,coulombic_cutoff                   | type pairs  |
 +---------------------------------------------------------------------+--------------------------------------------------+-------------+
 | :doc:`lj/cut <pair_lj>`                                             | epsilon,sigma                                    | type pairs  |
 +---------------------------------------------------------------------+--------------------------------------------------+-------------+
-| :doc:`lj/cut/coul/cut, lj/cut/coul/long, lj/cut/coul/msm <pair_lj>` | epsilon,sigma,coulombic\_cutoff                  | type pairs  |
+| :doc:`lj/cut/coul/cut, lj/cut/coul/long, lj/cut/coul/msm <pair_lj>` | epsilon,sigma,coulombic_cutoff                   | type pairs  |
 +---------------------------------------------------------------------+--------------------------------------------------+-------------+
-| :doc:`lj/cut/coul/cut/soft, lj/cut/coul/long/soft <pair_fep_soft>`  | epsilon,sigma,lambda,coulombic\_cutoff           | type pairs  |
+| :doc:`lj/cut/coul/cut/soft, lj/cut/coul/long/soft <pair_fep_soft>`  | epsilon,sigma,lambda,coulombic_cutoff            | type pairs  |
 +---------------------------------------------------------------------+--------------------------------------------------+-------------+
 | :doc:`lj/cut/coul/dsf <pair_lj>`                                    | cutoff                                           | type global |
 +---------------------------------------------------------------------+--------------------------------------------------+-------------+
-| :doc:`lj/cut/tip4p/cut <pair_lj>`                                   | epsilon,sigma,coulombic\_cutoff                  | type pairs  |
+| :doc:`lj/cut/tip4p/cut <pair_lj>`                                   | epsilon,sigma,coulombic_cutoff                   | type pairs  |
 +---------------------------------------------------------------------+--------------------------------------------------+-------------+
 | :doc:`lj/cut/soft <pair_fep_soft>`                                  | epsilon,sigma,lambda                             | type pairs  |
 +---------------------------------------------------------------------+--------------------------------------------------+-------------+
@@ -177,7 +171,7 @@ meaning of these parameters:
 +---------------------------------------------------------------------+--------------------------------------------------+-------------+
 | :doc:`lubricate <pair_lubricate>`                                   | mu                                               | global      |
 +---------------------------------------------------------------------+--------------------------------------------------+-------------+
-| :doc:`mie/cut <pair_mie>`                                           | epsilon,sigma,gamma\_repulsive,gamma\_attractive | type pairs  |
+| :doc:`mie/cut <pair_mie>`                                           | epsilon,sigma,gamma_repulsive,gamma_attractive   | type pairs  |
 +---------------------------------------------------------------------+--------------------------------------------------+-------------+
 | :doc:`morse, morse/smooth/linear <pair_morse>`                      | D0,R0,alpha                                      | type pairs  |
 +---------------------------------------------------------------------+--------------------------------------------------+-------------+
@@ -185,19 +179,19 @@ meaning of these parameters:
 +---------------------------------------------------------------------+--------------------------------------------------+-------------+
 | :doc:`nm/cut <pair_nm>`                                             | E0,R0,m,n                                        | type pairs  |
 +---------------------------------------------------------------------+--------------------------------------------------+-------------+
-| :doc:`nm/cut/coul/cut, nm/cut/coul/long <pair_nm>`                  | E0,R0,m,n,coulombic\_cutoff                      | type pairs  |
+| :doc:`nm/cut/coul/cut, nm/cut/coul/long <pair_nm>`                  | E0,R0,m,n,coulombic_cutoff                       | type pairs  |
 +---------------------------------------------------------------------+--------------------------------------------------+-------------+
 | :doc:`reax/c <pair_reaxc>`                                          | chi, eta, gamma                                  | type global |
 +---------------------------------------------------------------------+--------------------------------------------------+-------------+
-| :doc:`spin/dmi <pair_spin_dmi>`                                     | coulombic\_cutoff                                | type global |
+| :doc:`spin/dmi <pair_spin_dmi>`                                     | coulombic_cutoff                                 | type global |
 +---------------------------------------------------------------------+--------------------------------------------------+-------------+
-| :doc:`spin/exchange <pair_spin_exchange>`                           | coulombic\_cutoff                                | type global |
+| :doc:`spin/exchange <pair_spin_exchange>`                           | coulombic_cutoff                                 | type global |
 +---------------------------------------------------------------------+--------------------------------------------------+-------------+
-| :doc:`spin/magelec <pair_spin_magelec>`                             | coulombic\_cutoff                                | type global |
+| :doc:`spin/magelec <pair_spin_magelec>`                             | coulombic_cutoff                                 | type global |
 +---------------------------------------------------------------------+--------------------------------------------------+-------------+
-| :doc:`spin/neel <pair_spin_neel>`                                   | coulombic\_cutoff                                | type global |
+| :doc:`spin/neel <pair_spin_neel>`                                   | coulombic_cutoff                                 | type global |
 +---------------------------------------------------------------------+--------------------------------------------------+-------------+
-| :doc:`table <pair_table>`                                           | table\_cutoff                                    | type pairs  |
+| :doc:`table <pair_table>`                                           | table_cutoff                                     | type pairs  |
 +---------------------------------------------------------------------+--------------------------------------------------+-------------+
 | :doc:`ufm <pair_ufm>`                                               | epsilon,sigma                                    | type pairs  |
 +---------------------------------------------------------------------+--------------------------------------------------+-------------+
@@ -253,10 +247,10 @@ be a sub-style name.  You must specify I,J arguments that correspond
 to type pair values defined (via the :doc:`pair_coeff <pair_coeff>`
 command) for that sub-style.
 
-The *v\_name* argument for keyword *pair* is the name of an
+The *v_name* argument for keyword *pair* is the name of an
 :doc:`equal-style variable <variable>` which will be evaluated each time
 this fix is invoked to set the parameter to a new value.  It should be
-specified as v\_name, where name is the variable name.  Equal-style
+specified as v_name, where name is the variable name.  Equal-style
 variables can specify formulas with various mathematical functions,
 and include :doc:`thermo_style <thermo_style>` command keywords for the
 simulation box parameters and timestep and elapsed time.  Thus it is
@@ -270,16 +264,13 @@ For example, these commands would change the prefactor coefficient of
 the :doc:`pair_style soft <pair_soft>` potential from 10.0 to 30.0 in a
 linear fashion over the course of a simulation:
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    variable prefactor equal ramp(10,30)
-   fix 1 all adapt 1 pair soft a \* \* v_prefactor
-
+   fix 1 all adapt 1 pair soft a * * v_prefactor
 
 ----------
 
-
 The *bond* keyword uses the specified variable to change the value of
 a bond coefficient over time, very similar to how the *pair* keyword
 operates. The only difference is that now a bond coefficient for a
@@ -293,9 +284,9 @@ from 1 to N.  A leading asterisk means all types from 1 to n (inclusive).
 A trailing asterisk means all types from n to N (inclusive).  A middle
 asterisk means all types from m to n (inclusive).
 
-Currently *bond* does not support bond\_style hybrid nor bond\_style
+Currently *bond* does not support bond_style hybrid nor bond_style
 hybrid/overlay as bond styles. The only bonds that currently are
-working with fix\_adapt are
+working with fix_adapt are
 
 +---------------------------------+-------+------------+
 | :doc:`gromos <bond_gromos>`     | k, r0 | type bonds |
@@ -303,10 +294,8 @@ working with fix\_adapt are
 | :doc:`harmonic <bond_harmonic>` | k,r0  | type bonds |
 +---------------------------------+-------+------------+
 
-
 ----------
 
-
 The *kspace* keyword used the specified variable as a scale factor on
 the energy, forces, virial calculated by whatever K-Space solver is
 defined by the :doc:`kspace_style <kspace_style>` command.  If the
@@ -315,10 +304,8 @@ variable has a value of 1.0, then the solver is unaltered.
 The *kspace* keyword works this way whether the *scale* keyword
 is set to *no* or *yes*\ .
 
-
 ----------
 
-
 The *atom* keyword enables various atom properties to be changed.  The
 *aparam* argument is the name of the parameter to change.  This is the
 current list of atom parameters that can be varied by this fix:
@@ -326,10 +313,10 @@ current list of atom parameters that can be varied by this fix:
 * charge = charge on particle
 * diameter = diameter of particle
 
-The *v\_name* argument of the *atom* keyword is the name of an
+The *v_name* argument of the *atom* keyword is the name of an
 :doc:`equal-style variable <variable>` which will be evaluated each time
 this fix is invoked to set the parameter to a new value.  It should be
-specified as v\_name, where name is the variable name.  See the
+specified as v_name, where name is the variable name.  See the
 discussion above describing the formulas associated with equal-style
 variables.  The new value is assigned to the corresponding attribute
 for all atoms in the fix group.
@@ -349,17 +336,14 @@ For example, these commands would shrink the diameter of all granular
 particles in the "center" group from 1.0 to 0.1 in a linear fashion
 over the course of a 1000-step simulation:
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    variable size equal ramp(1.0,0.1)
    fix 1 center adapt 10 atom diameter v_size
 
-
 ----------
 
-
-**Restart, fix\_modify, output, run start/stop, minimize info:**
+**Restart, fix_modify, output, run start/stop, minimize info:**
 
 No information about this fix is written to :doc:`binary restart files <restart>`.  None of the :doc:`fix_modify <fix_modify>` options
 are relevant to this fix.  No global or per-atom quantities are stored
@@ -383,8 +367,3 @@ Default
 """""""
 
 The option defaults are scale = no, reset = no.
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/fix_adapt_fep.rst b/doc/src/fix_adapt_fep.rst
index 2cc3a59191..ee44d8904f 100644
--- a/doc/src/fix_adapt_fep.rst
+++ b/doc/src/fix_adapt_fep.rst
@@ -6,7 +6,6 @@ fix adapt/fep command
 Syntax
 """"""
 
-
 .. parsed-literal::
 
    fix ID group-ID adapt/fep N attribute args ... keyword value ...
@@ -16,9 +15,9 @@ Syntax
 * N = adapt simulation settings every this many timesteps
 * one or more attribute/arg pairs may be appended
 * attribute = *pair* or *kspace* or *atom*
-  
+
   .. parsed-literal::
-  
+
        *pair* args = pstyle pparam I J v_name
          pstyle = pair style name, e.g. lj/cut
          pparam = parameter to adapt over time
@@ -33,9 +32,9 @@ Syntax
 
 * zero or more keyword/value pairs may be appended
 * keyword = *scale* or *reset* or *after*
-  
+
   .. parsed-literal::
-  
+
        *scale* value = *no* or *yes*
          *no* = the variable value is the new setting
          *yes* = the variable value multiplies the original setting
@@ -47,17 +46,14 @@ Syntax
          *no* = parameters are adapted at timestep N
          *yes* = parameters are adapted one timestep after N
 
-
-
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    fix 1 all adapt/fep 1 pair soft a 1 1 v_prefactor
-   fix 1 all adapt/fep 1 pair soft a 2\* 3 v_prefactor
-   fix 1 all adapt/fep 1 pair lj/cut epsilon \* \* v_scale1 coul/cut scale 3 3 v_scale2 scale yes reset yes
+   fix 1 all adapt/fep 1 pair soft a 2* 3 v_prefactor
+   fix 1 all adapt/fep 1 pair lj/cut epsilon * * v_scale1 coul/cut scale 3 3 v_scale2 scale yes reset yes
    fix 1 all adapt/fep 10 atom diameter 1 v_size
 
 Description
@@ -74,7 +70,6 @@ with two differences,
 * There is a new option *after* for better compatibility with "fix
   ave/time".
 
-
 This version is suited for free energy calculations using
 :doc:`compute ti <compute_ti>` or :doc:`compute fep <compute_fep>`.
 
@@ -106,10 +101,8 @@ such as "fix ave/time" is used to calculate averages at every N
 timesteps, all the contributions to the average will be obtained with
 the same values of the parameters.
 
-
 ----------
 
-
 The *pair* keyword enables various parameters of potentials defined by
 the :doc:`pair_style <pair_style>` command to be changed, if the pair
 style supports it.  Note that the :doc:`pair_style <pair_style>` and
@@ -224,10 +217,10 @@ be a sub-style name.  You must specify I,J arguments that correspond
 to type pair values defined (via the :doc:`pair_coeff <pair_coeff>`
 command) for that sub-style.
 
-The *v\_name* argument for keyword *pair* is the name of an
+The *v_name* argument for keyword *pair* is the name of an
 :doc:`equal-style variable <variable>` which will be evaluated each time
 this fix is invoked to set the parameter to a new value.  It should be
-specified as v\_name, where name is the variable name.  Equal-style
+specified as v_name, where name is the variable name.  Equal-style
 variables can specify formulas with various mathematical functions,
 and include :doc:`thermo_style <thermo_style>` command keywords for the
 simulation box parameters and timestep and elapsed time.  Thus it is
@@ -241,16 +234,13 @@ For example, these commands would change the prefactor coefficient of
 the :doc:`pair_style soft <pair_soft>` potential from 10.0 to 30.0 in a
 linear fashion over the course of a simulation:
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    variable prefactor equal ramp(10,30)
-   fix 1 all adapt 1 pair soft a \* \* v_prefactor
-
+   fix 1 all adapt 1 pair soft a * * v_prefactor
 
 ----------
 
-
 The *kspace* keyword used the specified variable as a scale factor on
 the energy, forces, virial calculated by whatever K-Space solver is
 defined by the :doc:`kspace_style <kspace_style>` command.  If the
@@ -259,10 +249,8 @@ variable has a value of 1.0, then the solver is unaltered.
 The *kspace* keyword works this way whether the *scale* keyword
 is set to *no* or *yes*\ .
 
-
 ----------
 
-
 The *atom* keyword enables various atom properties to be changed.  The
 *aparam* argument is the name of the parameter to change.  This is the
 current list of atom parameters that can be varied by this fix:
@@ -274,10 +262,10 @@ The *I* argument indicates which atom types are affected. A wild-card
 asterisk can be used in place of or in conjunction with the I argument
 to set the coefficients for multiple atom types.
 
-The *v\_name* argument of the *atom* keyword is the name of an
+The *v_name* argument of the *atom* keyword is the name of an
 :doc:`equal-style variable <variable>` which will be evaluated each time
 this fix is invoked to set the parameter to a new value.  It should be
-specified as v\_name, where name is the variable name.  See the
+specified as v_name, where name is the variable name.  See the
 discussion above describing the formulas associated with equal-style
 variables.  The new value is assigned to the corresponding attribute
 for all atoms in the fix group.
@@ -291,20 +279,17 @@ For example, these commands would shrink the diameter of all granular
 particles in the "center" group from 1.0 to 0.1 in a linear fashion
 over the course of a 1000-step simulation:
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    variable size equal ramp(1.0,0.1)
-   fix 1 center adapt 10 atom diameter \* v_size
+   fix 1 center adapt 10 atom diameter * v_size
 
 For :doc:`rRESPA time integration <run_style>`, this fix changes
 parameters on the outermost rRESPA level.
 
-
 ----------
 
-
-**Restart, fix\_modify, output, run start/stop, minimize info:**
+**Restart, fix_modify, output, run start/stop, minimize info:**
 
 No information about this fix is written to :doc:`binary restart files <restart>`.  None of the :doc:`fix_modify <fix_modify>` options
 are relevant to this fix.  No global or per-atom quantities are stored
@@ -319,14 +304,9 @@ Restrictions
 Related commands
 """"""""""""""""
 
-:doc:`compute fep <compute_fep>`, :doc:`fix adapt <fix_adapt>`, :doc:`compute ti <compute_ti>`, :doc:`pair\_fep\_soft <pair_fep_soft>`
+:doc:`compute fep <compute_fep>`, :doc:`fix adapt <fix_adapt>`, :doc:`compute ti <compute_ti>`, :doc:`pair_style \*/soft <pair_fep_soft>`
 
 Default
 """""""
 
 The option defaults are scale = no, reset = no, after = no.
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/fix_addforce.rst b/doc/src/fix_addforce.rst
index 971abdc682..a7403ef7ab 100644
--- a/doc/src/fix_addforce.rst
+++ b/doc/src/fix_addforce.rst
@@ -6,7 +6,6 @@ fix addforce command
 Syntax
 """"""
 
-
 .. parsed-literal::
 
    fix ID group-ID addforce fx fy fz keyword value ...
@@ -14,16 +13,16 @@ Syntax
 * ID, group-ID are documented in :doc:`fix <fix>` command
 * addforce = style name of this fix command
 * fx,fy,fz = force component values (force units)
-  
+
   .. parsed-literal::
-  
+
        any of fx,fy,fz can be a variable (see below)
 
 * zero or more keyword/value pairs may be appended to args
 * keyword = *every* or *region* or *energy*
-  
+
   .. parsed-literal::
-  
+
        *every* value = Nevery
          Nevery = add force every this many timesteps
        *region* value = region-ID
@@ -31,13 +30,10 @@ Syntax
        *energy* value = v_name
          v_name = variable with name that calculates the potential energy of each atom in the added force field
 
-
-
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    fix kick flow addforce 1.0 0.0 0.0
    fix kick flow addforce 1.0 0.0 v_oscillate
@@ -54,7 +50,7 @@ a channel.
 Any of the 3 quantities defining the force components can be specified
 as an equal-style or atom-style :doc:`variable <variable>`, namely *fx*\ ,
 *fy*\ , *fz*\ .  If the value is a variable, it should be specified as
-v\_name, where name is the variable name.  In this case, the variable
+v_name, where name is the variable name.  In this case, the variable
 will be evaluated each timestep, and its value(s) used to determine
 the force component.
 
@@ -76,10 +72,8 @@ If the *region* keyword is used, the atom must also be in the
 specified geometric :doc:`region <region>` in order to have force added
 to it.
 
-
 ----------
 
-
 Adding a force to atoms implies a change in their potential energy as
 they move due to the applied force field.  For dynamics via the "run"
 command, this energy can be optionally added to the system's potential
@@ -104,7 +98,7 @@ one or more variables, and you are performing energy minimization via
 the "minimize" command.  The keyword specifies the name of an
 atom-style :doc:`variable <variable>` which is used to compute the
 energy of each atom as function of its position.  Like variables used
-for *fx*\ , *fy*\ , *fz*\ , the energy variable is specified as v\_name,
+for *fx*\ , *fy*\ , *fz*\ , the energy variable is specified as v_name,
 where name is the variable name.
 
 Note that when the *energy* keyword is used during an energy
@@ -115,10 +109,8 @@ were a spring-like F = kx, then the energy formula should be E =
 -0.5kx\^2.  If you don't do this correctly, the minimization will not
 converge properly.
 
-
 ----------
 
-
 Styles with a *gpu*\ , *intel*\ , *kk*\ , *omp*\ , or *opt* suffix are
 functionally the same as the corresponding style without the suffix.
 They have been optimized to run faster, depending on your available
@@ -137,11 +129,9 @@ by including their suffix, or you can use the :doc:`-suffix command-line switch
 See the :doc:`Speed packages <Speed_packages>` doc page for more
 instructions on how to use the accelerated styles effectively.
 
-
 ----------
 
-
-**Restart, fix\_modify, output, run start/stop, minimize info:**
+**Restart, fix_modify, output, run start/stop, minimize info:**
 
 No information about this fix is written to :doc:`binary restart files <restart>`.
 
@@ -199,8 +189,3 @@ Default
 """""""
 
 The option default for the every keyword is every = 1.
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/fix_addtorque.rst b/doc/src/fix_addtorque.rst
index 75636d5abf..2b5a7ce8ce 100644
--- a/doc/src/fix_addtorque.rst
+++ b/doc/src/fix_addtorque.rst
@@ -6,7 +6,6 @@ fix addtorque command
 Syntax
 """"""
 
-
 .. parsed-literal::
 
    fix ID group-ID addtorque Tx Ty Tz
@@ -16,12 +15,10 @@ Syntax
 * Tx,Ty,Tz = torque component values (torque units)
 * any of Tx,Ty,Tz can be a variable (see below)
 
-
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    fix kick bead addtorque 2.0 3.0 5.0
    fix kick bead addtorque 0.0 0.0 v_oscillate
@@ -37,13 +34,12 @@ the group such that:
 * the group would move as a rigid body in the absence of other
   forces.
 
-
 This command can be used to drive a group of atoms into rotation.
 
 Any of the 3 quantities defining the torque components can be specified
 as an equal-style :doc:`variable <variable>`, namely *Tx*\ ,
 *Ty*\ , *Tz*\ .  If the value is a variable, it should be specified as
-v\_name, where name is the variable name.  In this case, the variable
+v_name, where name is the variable name.  In this case, the variable
 will be evaluated each timestep, and its value used to determine the
 torque component.
 
@@ -52,11 +48,9 @@ functions, and include :doc:`thermo_style <thermo_style>` command
 keywords for the simulation box parameters and timestep and elapsed
 time.  Thus it is easy to specify a time-dependent torque.
 
-
 ----------
 
-
-**Restart, fix\_modify, output, run start/stop, minimize info:**
+**Restart, fix_modify, output, run start/stop, minimize info:**
 
 No information about this fix is written to :doc:`binary restart files <restart>`.
 
@@ -91,7 +85,6 @@ the iteration count during the minimization.
 Restrictions
 """"""""""""
 
-
 This fix is part of the USER-MISC package.  It is only enabled if
 LAMMPS was built with that package.  See the :doc:`Build package <Build_package>` doc page for more info.
 
@@ -101,8 +94,3 @@ Related commands
 :doc:`fix addforce <fix_addforce>`
 
 **Default:** none
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/fix_append_atoms.rst b/doc/src/fix_append_atoms.rst
index 29ef20342a..6246787075 100644
--- a/doc/src/fix_append_atoms.rst
+++ b/doc/src/fix_append_atoms.rst
@@ -6,7 +6,6 @@ fix append/atoms command
 Syntax
 """"""
 
-
 .. parsed-literal::
 
    fix ID group-ID append/atoms face ... keyword value ...
@@ -16,9 +15,9 @@ Syntax
 * face = *zhi*
 * zero or more keyword/value pairs may be appended
 * keyword = *basis* or *size* or *freq* or *temp* or *random* or *units*
-  
+
   .. parsed-literal::
-  
+
        *basis* values = M itype
          M = which basis atom
          itype = atom type (1-N) to assign to this basis atom
@@ -38,13 +37,10 @@ Syntax
          *lattice* = the wall position is defined in lattice units
          *box* = the wall position is defined in simulation box units
 
-
-
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    fix 1 all append/atoms zhi size 5.0 freq 295 units lattice
    fix 4 all append/atoms zhi size 15.0 freq 5 units box
@@ -88,11 +84,9 @@ A *lattice* value means the distance units are in lattice spacings.
 The :doc:`lattice <lattice>` command must have been previously used to
 define the lattice spacings.
 
-
 ----------
 
-
-**Restart, fix\_modify, output, run start/stop, minimize info:**
+**Restart, fix_modify, output, run start/stop, minimize info:**
 
 No information about this fix is written to :doc:`binary restart files <restart>`.  None of the :doc:`fix_modify <fix_modify>` options
 are relevant to this fix.  No global or per-atom quantities are stored
@@ -103,7 +97,6 @@ the :doc:`run <run>` command.  This fix is not invoked during :doc:`energy minim
 Restrictions
 """"""""""""
 
-
 This fix style is part of the SHOCK package.  It is only enabled if
 LAMMPS was built with that package. See the :doc:`Build package <Build_package>` doc page for more info.
 
@@ -121,8 +114,3 @@ Default
 
 The keyword defaults are size = 0.0, freq = 0, units = lattice.  All
 added atoms are of type 1 unless the basis keyword is used.
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/fix_atc.rst b/doc/src/fix_atc.rst
index 2c2f474c93..81a16b907a 100644
--- a/doc/src/fix_atc.rst
+++ b/doc/src/fix_atc.rst
@@ -6,30 +6,27 @@ fix atc command
 Syntax
 """"""
 
-
 .. parsed-literal::
 
    fix <fixID> <group> atc <type> <parameter_file>
 
 * fixID = name of fix
 * group = name of group fix is to be applied
-* type = *thermal* or *two\_temperature* or *hardy* or *field*
+* type = *thermal* or *two_temperature* or *hardy* or *field*
 
 .. parsed-literal::
 
     *thermal* = thermal coupling with fields: temperature
     *two_temperature* = electron-phonon coupling with field: temperature and electron_temperature
-    *hardy* = on-the-fly post-processing using kernel localization functions (see "related" section for possible fields)
-    *field* = on-the-fly post-processing using mesh-based localization functions (see "related" section for possible fields)
-
-* parameter\_file = name of the file with material parameters. Note: Neither hardy nor field requires a parameter file
+    *hardy* = on-the-fly post-processing using kernel localization functions
+    *field* = on-the-fly post-processing using mesh-based localization functions
 
+* parameter_file = name of the file with material parameters. Note: Neither hardy nor field requires a parameter file
 
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    fix AtC internal atc thermal Ar_thermal.dat
    fix AtC internal atc two_temperature Ar_ttm.mat
@@ -39,15 +36,20 @@ Examples
 Description
 """""""""""
 
-This fix is the beginning to creating a coupled FE/MD simulation and/or an on-the-fly estimation of continuum fields. The coupled versions of this fix do Verlet integration and the post-processing does not. After instantiating this fix, several other fix\_modify commands will be needed to set up the problem, e.g. define the finite element mesh and prescribe initial and boundary conditions.
+This fix is the beginning to creating a coupled FE/MD simulation and/or
+an on-the-fly estimation of continuum fields. The coupled versions of
+this fix do Verlet integration and the post-processing does not. After
+instantiating this fix, several other fix_modify commands will be
+needed to set up the problem, e.g. define the finite element mesh and
+prescribe initial and boundary conditions.
 
 .. image:: JPG/atc_nanotube.jpg
    :align: center
 
+The following coupling example is typical, but non-exhaustive:
 
-.. parsed-literal::
+.. code-block:: LAMMPS
 
-   The following coupling example is typical, but non-exhaustive:
     # ... commands to create and initialize the MD system
 
     # initial fix to designate coupling type and group to apply it to
@@ -74,8 +76,7 @@ This fix is the beginning to creating a coupled FE/MD simulation and/or an on-th
 
 likewise for this post-processing example:
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
     # ... commands to create and initialize the MD system
 
@@ -87,7 +88,7 @@ likewise for this post-processing example:
     fix AtC kernel quartic_sphere 10.0
 
     # create a uniform 1 x 1 x 1 mesh that covers region contain the group
-    # with periodicity this effectively creats a system average
+    # with periodicity this effectively creates a system average
     fix_modify AtC mesh create 1 1 1 box p p p
 
     # change from default lagrangian map to eulerian
@@ -107,8 +108,7 @@ likewise for this post-processing example:
 the mesh's linear interpolation functions can be used as the localization function
 by using the field option:
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
     fix AtC internal atc field
     fix_modify AtC mesh create 1 1 1 box p p p
@@ -116,182 +116,165 @@ by using the field option:
 
 Note coupling and post-processing can be combined in the same simulations using separate fixes.
 
-
 ----------
 
+**Restart, fix_modify, output, run start/stop, minimize info:**
 
-**Restart, fix\_modify, output, run start/stop, minimize info:**
-
-No information about this fix is written to :doc:`binary restart files <restart>`.  The :doc:`fix_modify <fix_modify>` options
-relevant to this fix are listed below.  No global scalar or vector or
-per-atom quantities are stored by this fix for access by various
-:doc:`output commands <Howto_output>`.  No parameter of this fix can be
-used with the *start/stop* keywords of the :doc:`run <run>` command.
-This fix is not invoked during :doc:`energy minimization <minimize>`.
+No information about this fix is written to :doc:`binary restart files
+<restart>`.  The :doc:`fix_modify <fix_modify>` options relevant to this
+fix are listed below.  No global scalar or vector or per-atom quantities
+are stored by this fix for access by various :doc:`output commands
+<Howto_output>`.  No parameter of this fix can be used with the
+*start/stop* keywords of the :doc:`run <run>` command.  This fix is not
+invoked during :doc:`energy minimization <minimize>`.
 
 Restrictions
 """"""""""""
 
-
-Thermal and two\_temperature (coupling) types use a Verlet time-integration algorithm. The hardy type does not contain its own time-integrator and must be used with a separate fix that does contain one, e.g. nve, nvt, etc. In addition, currently:
+Thermal and two_temperature (coupling) types use a Verlet
+time-integration algorithm. The hardy type does not contain its own
+time-integrator and must be used with a separate fix that does contain
+one, e.g. nve, nvt, etc. In addition, currently:
 
 * the coupling is restricted to thermal physics
 * the FE computations are done in serial on each processor.
 
+.. _atc_fix_modify:
+
 Related commands
 """"""""""""""""
 
-After specifying this fix in your input script, several other :doc:`fix_modify <fix_modify>` commands are used to setup the problem, e.g. define the finite element mesh and prescribe initial and boundary conditions.
+After specifying this fix in your input script, several other
+:doc:`fix_modify <fix_modify>` commands are used to setup the problem,
+e.g. define the finite element mesh and prescribe initial and boundary
+conditions.
 
-fix\_modify commands for setup:
+*fix_modify* commands for setup:
 
-* `fix\_modify AtC mesh create <USER/atc/man_mesh_create.html>`_
-* `fix\_modify AtC mesh quadrature <USER/atc/man_mesh_quadrature.html>`_
-* `fix\_modify AtC mesh read <USER/atc/man_mesh_read.html>`_
-* `fix\_modify AtC mesh write <USER/atc/man_mesh_write.html>`_
-* `fix\_modify AtC mesh create\_nodeset <USER/atc/man_mesh_create_nodeset.html>`_
-* `fix\_modify AtC mesh add\_to\_nodeset <USER/atc/man_mesh_add_to_nodeset.html>`_
-* `fix\_modify AtC mesh create\_faceset box <USER/atc/man_mesh_create_faceset_box.html>`_
-* `fix\_modify AtC mesh create\_faceset plane <USER/atc/man_mesh_create_faceset_plane.html>`_
-* `fix\_modify AtC mesh create\_elementset <USER/atc/man_mesh_create_elementset.html>`_
-* `fix\_modify AtC mesh delete\_elements <USER/atc/man_mesh_delete_elements.html>`_
-* `fix\_modify AtC mesh nodeset\_to\_elementset <USER/atc/man_mesh_nodeset_to_elementset.html>`_
-* `fix\_modify AtC boundary <USER/atc/man_boundary.html>`_
-* `fix\_modify AtC internal\_quadrature <USER/atc/man_internal_quadrature.html>`_
-* `fix\_modify AtC time\_integration (thermal) <USER/atc/man_thermal_time_integration.html>`_
-* `fix\_modify AtC time\_integration (momentum) <USER/atc/man_momentum_time_integration.html>`_
-* `fix\_modify AtC extrinsic electron\_integration <USER/atc/man_electron_integration.html>`_
-* `fix\_modify AtC internal\_element\_set <USER/atc/man_internal_element_set.html>`_
-* `fix\_modify AtC decomposition <USER/atc/man_decomposition.html>`_
+* :doc:`fix_modify AtC mesh create <atc_mesh_create>`
+* :doc:`fix_modify AtC mesh quadrature <atc_mesh_quadrature>`
+* :doc:`fix_modify AtC mesh read <atc_mesh_read>`
+* :doc:`fix_modify AtC mesh write <atc_mesh_write>`
+* :doc:`fix_modify AtC mesh create_nodeset <atc_mesh_create_nodeset>`
+* :doc:`fix_modify AtC mesh add_to_nodeset <atc_mesh_add_to_nodeset>`
+* :doc:`fix_modify AtC mesh create_faceset box <atc_mesh_create_faceset_box>`
+* :doc:`fix_modify AtC mesh create_faceset plane <atc_mesh_create_faceset_plane>`
+* :doc:`fix_modify AtC mesh create_elementset <atc_mesh_create_elementset>`
+* :doc:`fix_modify AtC mesh delete_elements <atc_mesh_delete_elements>`
+* :doc:`fix_modify AtC mesh nodeset_to_elementset <atc_mesh_nodeset_to_elementset>`
+* :doc:`fix_modify AtC boundary type <atc_boundary_type>`
+* :doc:`fix_modify AtC internal_quadrature <atc_internal_quadrature>`
+* :doc:`fix_modify AtC time_integration <atc_time_integration>`
+* :doc:`fix_modify AtC extrinsic electron_integration <atc_electron_integration>`
+* :doc:`fix_modify AtC internal_element_set <atc_internal_element_set>`
+* :doc:`fix_modify AtC decomposition <atc_decomposition>`
 
-fix\_modify commands for boundary and initial conditions:
+*fix_modify* commands for boundary and initial conditions:
 
-* `fix\_modify AtC initial <USER/atc/man_initial.html>`_
-* `fix\_modify AtC fix <USER/atc/man_fix_nodes.html>`_
-* `fix\_modify AtC unfix <USER/atc/man_unfix_nodes.html>`_
-* `fix\_modify AtC fix\_flux <USER/atc/man_fix_flux.html>`_
-* `fix\_modify AtC unfix\_flux <USER/atc/man_unfix_flux.html>`_
-* `fix\_modify AtC source <USER/atc/man_source.html>`_
-* `fix\_modify AtC remove\_source <USER/atc/man_remove_source.html>`_
+* :doc:`fix_modify AtC initial <atc_initial>`
+* :doc:`fix_modify AtC fix <atc_fix>`
+* :doc:`fix_modify AtC unfix <atc_unfix>`
+* :doc:`fix_modify AtC fix_flux <atc_fix_flux>`
+* :doc:`fix_modify AtC unfix_flux <atc_unfix_flux>`
+* :doc:`fix_modify AtC source <atc_source>`
+* :doc:`fix_modify AtC remove_source <atc_remove_source>`
 
-fix\_modify commands for control and filtering:
+*fix_modify* commands for control and filtering:
 
-* `fix\_modify AtC control <USER/atc/man_control.html>`_
-* `fix\_modify AtC control thermal <USER/atc/man_control_thermal.html>`_
-* `fix\_modify AtC control thermal correction\_max\_iterations <USER/atc/man_control_thermal_correction_max_iterations.html>`_
-* `fix\_modify AtC control momentum <USER/atc/man_control_momentum.html>`_
-* `fix\_modify AtC control localized\_lambda <USER/atc/man_localized_lambda.html>`_
-* `fix\_modify AtC control lumped\_lambda\_solve <USER/atc/man_lumped_lambda_solve.html>`_
-* `fix\_modify AtC control mask\_direction <USER/atc/man_mask_direction.html>`_ control
-* `fix\_modify AtC filter <USER/atc/man_time_filter.html>`_
-* `fix\_modify AtC filter scale <USER/atc/man_filter_scale.html>`_
-* `fix\_modify AtC filter type <USER/atc/man_filter_type.html>`_
-* `fix\_modify AtC equilibrium\_start <USER/atc/man_equilibrium_start.html>`_
-* `fix\_modify AtC extrinsic exchange <USER/atc/man_extrinsic_exchange.html>`_
-* `fix\_modify AtC poisson\_solver <USER/atc/man_poisson_solver.html>`_
+* :doc:`fix_modify AtC control thermal <atc_control_thermal>`
+* :doc:`fix_modify AtC control momentum <atc_control_momentum>`
+* :doc:`fix_modify AtC control localized_lambda <atc_control_localized_lambda>`
+* :doc:`fix_modify AtC control lumped_lambda_solve <atc_lumped_lambda_solve>`
+* :doc:`fix_modify AtC control mask_direction <atc_mask_direction>`
+* :doc:`fix_modify AtC filter <atc_time_filter>`
+* :doc:`fix_modify AtC filter scale <atc_filter_scale>`
+* :doc:`fix_modify AtC filter type <atc_filter_type>`
+* :doc:`fix_modify AtC equilibrium_start <atc_equilibrium_start>`
+* :doc:`fix_modify AtC extrinsic exchange <atc_extrinsic_exchange>`
+* :doc:`fix_modify AtC poisson_solver <atc_poisson_solver>`
 
-fix\_modify commands for output:
+*fix_modify* commands for output:
 
-* `fix\_modify AtC output <USER/atc/man_output.html>`_
-* `fix\_modify AtC output nodeset <USER/atc/man_output_nodeset.html>`_
-* `fix\_modify AtC output elementset <USER/atc/man_output_elementset.html>`_
-* `fix\_modify AtC output boundary\_integral <USER/atc/man_boundary_integral.html>`_
-* `fix\_modify AtC output contour\_integral <USER/atc/man_contour_integral.html>`_
-* `fix\_modify AtC mesh output <USER/atc/man_mesh_output.html>`_
-* `fix\_modify AtC write\_restart <USER/atc/man_write_restart.html>`_
-* `fix\_modify AtC read\_restart <USER/atc/man_read_restart.html>`_
+* :doc:`fix_modify AtC output <atc_output>`
+* :doc:`fix_modify AtC output nodeset <atc_output_nodeset>`
+* :doc:`fix_modify AtC output volume_integral <atc_output_volume_integral>`
+* :doc:`fix_modify AtC output boundary_integral <atc_output_boundary_integral>`
+* :doc:`fix_modify AtC output contour_integral <atc_output_contour_integral>`
+* :doc:`fix_modify AtC mesh output <atc_mesh_output>`
+* :doc:`fix_modify AtC write_restart <atc_write_restart>`
+* :doc:`fix_modify AtC read_restart <atc_read_restart>`
 
-fix\_modify commands for post-processing:
+*fix_modify* commands for post-processing:
 
-* `fix\_modify AtC kernel <USER/atc/man_hardy_kernel.html>`_
-* `fix\_modify AtC fields <USER/atc/man_hardy_fields.html>`_
-* `fix\_modify AtC grdients <USER/atc/man_hardy_gradients.html>`_
-* `fix\_modify AtC rates <USER/atc/man_hardy_rates.html>`_
-* `fix\_modify AtC computes <USER/atc/man_hardy_computes.html>`_
-* `fix\_modify AtC on\_the\_fly <USER/atc/man_hardy_on_the_fly.html>`_
-* `fix\_modify AtC pair\_interactions/bond\_interactions <USER/atc/man_pair_interactions.html>`_
-* `fix\_modify AtC sample\_frequency <USER/atc/man_sample_frequency.html>`_
-* `fix\_modify AtC set <USER/atc/man_set.html>`_
+* :doc:`fix_modify AtC kernel <atc_hardy_kernel>`
+* :doc:`fix_modify AtC fields <atc_hardy_fields>`
+* :doc:`fix_modify AtC gradients <atc_hardy_gradients>`
+* :doc:`fix_modify AtC rates <atc_hardy_rates>`
+* :doc:`fix_modify AtC computes <atc_hardy_computes>`
+* :doc:`fix_modify AtC on_the_fly <atc_hardy_on_the_fly>`
+* :doc:`fix_modify AtC pair/bond_interactions <atc_pair_interactions>`
+* :doc:`fix_modify AtC sample_frequency <atc_sample_frequency>`
+* :doc:`fix_modify AtC set <atc_set_reference_pe>`
 
-miscellaneous fix\_modify commands:
+miscellaneous *fix_modify* commands:
 
-* `fix\_modify AtC atom\_element\_map <USER/atc/man_atom_element_map.html>`_
-* `fix\_modify AtC atom\_weight <USER/atc/man_atom_weight.html>`_
-* `fix\_modify AtC write\_atom\_weights <USER/atc/man_write_atom_weights.html>`_
-* `fix\_modify AtC reset\_time <USER/atc/man_reset_time.html>`_
-* `fix\_modify AtC reset\_atomic\_reference\_positions <USER/atc/man_reset_atomic_reference_positions.html>`_
-* `fix\_modify AtC fe\_md\_boundary <USER/atc/man_fe_md_boundary.html>`_
-* `fix\_modify AtC boundary\_faceset <USER/atc/man_boundary_faceset.html>`_
-* `fix\_modify AtC consistent\_fe\_initialization <USER/atc/man_consistent_fe_initialization.html>`_
-* `fix\_modify AtC mass\_matrix <USER/atc/man_mass_matrix.html>`_
-* `fix\_modify AtC material <USER/atc/man_material.html>`_
-* `fix\_modify AtC atomic\_charge <USER/atc/man_atomic_charge.html>`_
-* `fix\_modify AtC source\_integration <USER/atc/man_source_integration.html>`_
-* `fix\_modify AtC temperature\_definition <USER/atc/man_temperature_definition.html>`_
-* `fix\_modify AtC track\_displacement <USER/atc/man_track_displacement.html>`_
-* `fix\_modify AtC boundary\_dynamics <USER/atc/man_boundary_dynamics.html>`_
-* `fix\_modify AtC add\_species <USER/atc/man_add_species.html>`_
-* `fix\_modify AtC add\_molecule <USER/atc/man_add_molecule.html>`_
-* `fix\_modify AtC remove\_species <USER/atc/man_remove_species.html>`_
-* `fix\_modify AtC remove\_molecule <USER/atc/man_remove_molecule.html>`_
+* :doc:`fix_modify AtC atom_element_map <atc_atom_element_map>`
+* :doc:`fix_modify AtC atom_weight <atc_atom_weight>`
+* :doc:`fix_modify AtC write_atom_weights <atc_write_atom_weights>`
+* :doc:`fix_modify AtC kernel_bandwidth <atc_kernel_bandwidth>`
+* :doc:`fix_modify AtC reset_time <atc_reset_time>`
+* :doc:`fix_modify AtC reset_atomic_reference_positions <atc_reset_atomic_reference>`
+* :doc:`fix_modify AtC fe_md_boundary <atc_fe_md_boundary>`
+* :doc:`fix_modify AtC boundary_faceset <atc_boundary_faceset>`
+* :doc:`fix_modify AtC consistent_fe_initialization <atc_consistent_fe_initialization>`
+* :doc:`fix_modify AtC mass_matrix <atc_mass_matrix>`
+* :doc:`fix_modify AtC material <atc_material>`
+* :doc:`fix_modify AtC atomic_charge <atc_atomic_charge>`
+* :doc:`fix_modify AtC source_integration <atc_source_integration>`
+* :doc:`fix_modify AtC temperature_definition <atc_temperature_definition>`
+* :doc:`fix_modify AtC track_displacement <atc_track_displacement>`
+* :doc:`fix_modify AtC boundary_dynamics <atc_boundary_dynamics>`
+* :doc:`fix_modify AtC add_species <atc_add_species>`
+* :doc:`fix_modify AtC add_molecule <atc_add_molecule>`
+* :doc:`fix_modify AtC remove_species <atc_remove_species>`
+* :doc:`fix_modify AtC remove_molecule <atc_remove_molecule>`
 
-Note: a set of example input files with the attendant material files are included with this package
+Note: a set of example input files with the attendant material files are included in the ``examples/USER/atc`` folders.
 
 Default
 """""""
 None
 
-
 ----------
 
-
 For detailed exposition of the theory and algorithms please see:
 
 .. _Wagner:
 
-
-
 **(Wagner)** Wagner, GJ; Jones, RE; Templeton, JA; Parks, MA, "An atomistic-to-continuum coupling method for heat transfer in solids." Special Issue of Computer Methods and Applied Mechanics (2008) 197:3351.
 
 .. _Zimmeman2004:
 
-
-
 **(Zimmerman2004)** Zimmerman, JA; Webb, EB; Hoyt, JJ;. Jones, RE; Klein, PA; Bammann, DJ, "Calculation of stress in atomistic simulation." Special Issue of Modelling and Simulation in Materials Science and Engineering (2004), 12:S319.
 
 .. _Zimmerman2010:
 
-
-
 **(Zimmerman2010)** Zimmerman, JA; Jones, RE; Templeton, JA, "A material frame approach for evaluating continuum variables in atomistic simulations." Journal of Computational Physics (2010), 229:2364.
 
 .. _Templeton2010:
 
-
-
 **(Templeton2010)** Templeton, JA; Jones, RE; Wagner, GJ, "Application of a field-based method to spatially varying thermal transport problems in molecular dynamics." Modelling and Simulation in Materials Science and Engineering (2010), 18:085007.
 
 .. _Jones:
 
-
-
 **(Jones)** Jones, RE; Templeton, JA; Wagner, GJ; Olmsted, D; Modine, JA, "Electron transport enhanced molecular dynamics for metals and semi-metals." International Journal for Numerical Methods in Engineering (2010), 83:940.
 
 .. _Templeton2011:
 
-
-
 **(Templeton2011)** Templeton, JA; Jones, RE; Lee, JW; Zimmerman, JA; Wong, BM, "A long-range electric field solver for molecular dynamics based on atomistic-to-continuum modeling." Journal of Chemical Theory and Computation (2011), 7:1736.
 
 .. _Mandadapu:
 
-
-
 **(Mandadapu)** Mandadapu, KK; Templeton, JA; Lee, JW, "Polarization as a field variable from molecular dynamics simulations." Journal of Chemical Physics (2013), 139:054115.
 
 Please refer to the standard finite element (FE) texts, e.g. T.J.R Hughes " The finite element method ", Dover 2003, for the basics of FE simulation.
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/fix_atom_swap.rst b/doc/src/fix_atom_swap.rst
index 420a490c15..2ad289e91e 100644
--- a/doc/src/fix_atom_swap.rst
+++ b/doc/src/fix_atom_swap.rst
@@ -6,7 +6,6 @@ fix atom/swap command
 Syntax
 """"""
 
-
 .. parsed-literal::
 
    fix ID group-ID atom/swap N X seed T keyword values ...
@@ -19,9 +18,9 @@ Syntax
 * T = scaling temperature of the MC swaps (temperature units)
 * one or more keyword/value pairs may be appended to args
 * keyword = *types* or *mu* or *ke* or *semi-grand* or *region*
-  
+
   .. parsed-literal::
-  
+
        *types* values = two or more atom types
        *mu* values = chemical potential of swap types (energy units)
        *ke* value = *no* or *yes*
@@ -33,13 +32,10 @@ Syntax
        *region* value = region-ID
          region-ID = ID of region to use as an exchange/move volume
 
-
-
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    fix 2 all atom/swap 1 1 29494 300.0 ke no types 1 2
    fix myFix all atom/swap 100 1 12345 298.0 region my_swap_region types 5 6
@@ -112,7 +108,7 @@ non-zero molecule ID, but does not check for this at the time of
 swapping.
 
 If not using *semi-grand* this fix checks to ensure all atoms of the
-given types have the same atomic charge. LAMMPS doesn't enforce this
+given types have the same atomic charge. LAMMPS does not enforce this
 in general, but it is needed for this fix to simplify the
 swapping procedure. Successful swaps will swap the atom type and charge
 of the swapped atoms. Conversely, when using *semi-grand*\ , it is assumed that all the atom
@@ -145,7 +141,7 @@ you MUST enable the :doc:`fix_modify <fix_modify>` *energy* option for
 that fix.  The doc pages for individual :doc:`fix <fix>` commands
 specify if this should be done.
 
-**Restart, fix\_modify, output, run start/stop, minimize info:**
+**Restart, fix_modify, output, run start/stop, minimize info:**
 
 This fix writes the state of the fix to :doc:`binary restart files <restart>`.  This includes information about the random
 number generator seed, the next timestep for MC exchanges, the number
@@ -178,7 +174,6 @@ the :doc:`run <run>` command.  This fix is not invoked during :doc:`energy minim
 Restrictions
 """"""""""""
 
-
 This fix is part of the MC package.  It is only enabled if LAMMPS was
 built with that package.  See the :doc:`Build package <Build_package>`
 doc page for more info.
@@ -196,18 +191,9 @@ Default
 The option defaults are ke = yes, semi-grand = no, mu = 0.0 for
 all atom types.
 
-
 ----------
 
-
 .. _Sadigh:
 
-
-
 **(Sadigh)** B Sadigh, P Erhart, A Stukowski, A Caro, E Martinez, and
 L Zepeda-Ruiz, Phys. Rev. B, 85, 184203 (2012).
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/fix_ave_atom.rst b/doc/src/fix_ave_atom.rst
index a9878887d8..93ff48ce0f 100644
--- a/doc/src/fix_ave_atom.rst
+++ b/doc/src/fix_ave_atom.rst
@@ -6,7 +6,6 @@ fix ave/atom command
 Syntax
 """"""
 
-
 .. parsed-literal::
 
    fix ID group-ID ave/atom Nevery Nrepeat Nfreq value1 value2 ...
@@ -17,10 +16,10 @@ Syntax
 * Nrepeat = # of times to use input values for calculating averages
 * Nfreq = calculate averages every this many timesteps
   one or more input values can be listed
-* value = x, y, z, vx, vy, vz, fx, fy, fz, c\_ID, c\_ID[i], f\_ID, f\_ID[i], v\_name
-  
+* value = x, y, z, vx, vy, vz, fx, fy, fz, c_ID, c_ID[i], f_ID, f_ID[i], v_name
+
   .. parsed-literal::
-  
+
        x,y,z,vx,vy,vz,fx,fy,fz = atom attribute (position, velocity, force component)
        c_ID = per-atom vector calculated by a compute with ID
        c_ID[I] = Ith column of per-atom array calculated by a compute with ID, I can include wildcard (see below)
@@ -28,17 +27,14 @@ Syntax
        f_ID[I] = Ith column of per-atom array calculated by a fix with ID, I can include wildcard (see below)
        v_name = per-atom vector calculated by an atom-style variable with name
 
-
-
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    fix 1 all ave/atom 1 100 100 vx vy vz
    fix 1 all ave/atom 10 20 1000 c_my_stress[1]
-   fix 1 all ave/atom 10 20 1000 c_my_stress[\*]
+   fix 1 all ave/atom 10 20 1000 c_my_stress[*]
 
 Description
 """""""""""
@@ -83,19 +79,16 @@ had been listed one by one.  E.g. these 2 fix ave/atom commands are
 equivalent, since the :doc:`compute stress/atom <compute_stress_atom>`
 command creates a per-atom array with 6 columns:
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    compute my_stress all stress/atom NULL
-   fix 1 all ave/atom 10 20 1000 c_my_stress[\*]
+   fix 1 all ave/atom 10 20 1000 c_my_stress[*]
    fix 1 all ave/atom 10 20 1000 c_my_stress[1] c_my_stress[2] &
                                  c_my_stress[3] c_my_stress[4] &
                                  c_my_stress[5] c_my_stress[6]
 
-
 ----------
 
-
 The *Nevery*\ , *Nrepeat*\ , and *Nfreq* arguments specify on what
 timesteps the input values will be used in order to contribute to the
 average.  The final averaged quantities are generated on timesteps
@@ -111,10 +104,8 @@ timesteps 90,92,94,96,98,100 will be used to compute the final average
 on timestep 100.  Similarly for timesteps 190,192,194,196,198,200 on
 timestep 200, etc.
 
-
 ----------
 
-
 The atom attribute values (x,y,z,vx,vy,vz,fx,fy,fz) are
 self-explanatory.  Note that other atom attributes can be used as
 inputs to this fix by using the :doc:`compute property/atom <compute_property_atom>` command and then specifying
@@ -156,11 +147,9 @@ thermodynamic keywords, or invoke other computes, fixes, or variables
 when they are evaluated, so this is a very general means of generating
 per-atom quantities to time average.
 
-
 ----------
 
-
-**Restart, fix\_modify, output, run start/stop, minimize info:**
+**Restart, fix_modify, output, run start/stop, minimize info:**
 
 No information about this fix is written to :doc:`binary restart files <restart>`.  None of the :doc:`fix_modify <fix_modify>` options
 are relevant to this fix.  No global scalar or vector quantities are
@@ -187,8 +176,3 @@ Related commands
 :doc:`variable <variable>`,
 
 **Default:** none
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/fix_ave_chunk.rst b/doc/src/fix_ave_chunk.rst
index 92fe47bfb5..b19cce417c 100644
--- a/doc/src/fix_ave_chunk.rst
+++ b/doc/src/fix_ave_chunk.rst
@@ -6,7 +6,6 @@ fix ave/chunk command
 Syntax
 """"""
 
-
 .. parsed-literal::
 
    fix ID group-ID ave/chunk Nevery Nrepeat Nfreq chunkID value1 value2 ... keyword args ...
@@ -18,10 +17,10 @@ Syntax
 * Nfreq = calculate averages every this many timesteps
 * chunkID = ID of :doc:`compute chunk/atom <compute_chunk_atom>` command
 * one or more input values can be listed
-* value = vx, vy, vz, fx, fy, fz, density/mass, density/number, temp, c\_ID, c\_ID[I], f\_ID, f\_ID[I], v\_name
-  
+* value = vx, vy, vz, fx, fy, fz, density/mass, density/number, temp, c_ID, c_ID[I], f_ID, f_ID[I], v_name
+
   .. parsed-literal::
-  
+
        vx,vy,vz,fx,fy,fz = atom attribute (velocity, force component)
        density/number, density/mass = number or mass density
        temp = temperature
@@ -33,9 +32,9 @@ Syntax
 
 * zero or more keyword/arg pairs may be appended
 * keyword = *norm* or *ave* or *bias* or *adof* or *cdof* or *file* or *overwrite* or *title1* or *title2* or *title3*
-  
+
   .. parsed-literal::
-  
+
        *norm* arg = *all* or *sample* or *none* = how output on *Nfreq* steps is normalized
          all = output is sum of atoms across all *Nrepeat* samples, divided by atom count
          sample = output is sum of *Nrepeat* sample averages, divided by *Nrepeat*
@@ -62,13 +61,10 @@ Syntax
        *title3* arg = string
          string = text to print as 3rd line of output file
 
-
-
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    fix 1 all ave/chunk 10000 1 10000 binchunk c_myCentro title1 "My output values"
    fix 1 flow ave/chunk 100 10 1000 molchunk vx vz norm sample file vel.profile
@@ -82,15 +78,13 @@ with the newer, more flexible fix ave/chunk and :doc:`compute chunk/atom <comput
 the fix ave/spatial arguments across the two new commands.  For
 example, this command:
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    fix 1 flow ave/spatial 100 10 1000 y 0.0 1.0 vx vz norm sample file vel.profile
 
 could be replaced by:
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    compute cc1 flow chunk/atom bin/1d y 0.0 1.0
    fix 1 flow ave/chunk 100 10 1000 cc1 vx vz norm sample file vel.profile
@@ -154,11 +148,10 @@ had been listed one by one.  E.g. these 2 fix ave/chunk commands are
 equivalent, since the :doc:`compute property/atom <compute_property_atom>` command creates, in this
 case, a per-atom array with 3 columns:
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    compute myAng all property/atom angmomx angmomy angmomz
-   fix 1 all ave/chunk 100 1 100 cc1 c_myAng[\*] file tmp.angmom
+   fix 1 all ave/chunk 100 1 100 cc1 c_myAng[*] file tmp.angmom
    fix 2 all ave/chunk 100 1 100 cc1 c_myAng[1] c_myAng[2] c_myAng[3] file tmp.angmom
 
 .. note::
@@ -173,10 +166,8 @@ case, a per-atom array with 3 columns:
    computational cost (summing across processors), so be careful to
    define a reasonable number of chunks.
 
-
 ----------
 
-
 The *Nevery*\ , *Nrepeat*\ , and *Nfreq* arguments specify on what
 timesteps the input values will be accessed and contribute to the
 average.  The final averaged quantities are generated on timesteps
@@ -219,10 +210,8 @@ discussed below.
    the size of each bin can vary at each timestep if the simulation box
    size changes, e.g. for an NPT simulation.
 
-
 ----------
 
-
 The atom attribute values (vx,vy,vz,fx,fy,fz) are self-explanatory.
 As noted above, any other atom attributes can be used as input values
 to this fix by using the :doc:`compute property/atom <compute_property_atom>` command and then specifying
@@ -303,10 +292,8 @@ attributes, or invoke other computes, fixes, or variables when they
 are evaluated, so this is a very general means of generating per-atom
 quantities to average within chunks.
 
-
 ----------
 
-
 Additional optional keywords also affect the operation of this fix
 and its outputs.
 
@@ -430,7 +417,6 @@ values for each of these, so they do not need to be specified.
 
 By default, these header lines are as follows:
 
-
 .. parsed-literal::
 
    # Chunk-averaged data for fix ID and group name
@@ -440,7 +426,7 @@ By default, these header lines are as follows:
 In the first line, ID and name are replaced with the fix-ID and group
 name.  The second line describes the two values that are printed at
 the first of each section of output.  In the third line the values are
-replaced with the appropriate value names, e.g. fx or c\_myCompute[2].
+replaced with the appropriate value names, e.g. fx or c_myCompute[2].
 
 The words in parenthesis only appear with corresponding columns if the
 chunk style specified for the :doc:`compute chunk/atom <compute_chunk_atom>` command supports them.  The OrigID
@@ -468,11 +454,9 @@ be in unitless reduced units (0-1).  This is not true for the Coord1 value
 of style *bin/sphere* or *bin/cylinder* which both represent radial
 dimensions.  Those values are always in distance :doc:`units <units>`.
 
-
 ----------
 
-
-**Restart, fix\_modify, output, run start/stop, minimize info:**
+**Restart, fix_modify, output, run start/stop, minimize info:**
 
 No information about this fix is written to :doc:`binary restart files <restart>`.  None of the :doc:`fix_modify <fix_modify>` options
 are relevant to this fix.
@@ -513,8 +497,3 @@ Default
 
 The option defaults are norm = all, ave = one, bias = none, no file output, and
 title 1,2,3 = strings as described above.
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/fix_ave_correlate.rst b/doc/src/fix_ave_correlate.rst
index c5b422ef6e..c42159e89b 100644
--- a/doc/src/fix_ave_correlate.rst
+++ b/doc/src/fix_ave_correlate.rst
@@ -6,7 +6,6 @@ fix ave/correlate command
 Syntax
 """"""
 
-
 .. parsed-literal::
 
    fix ID group-ID ave/correlate Nevery Nrepeat Nfreq value1 value2 ... keyword args ...
@@ -17,10 +16,10 @@ Syntax
 * Nrepeat = # of correlation time windows to accumulate
 * Nfreq = calculate time window averages every this many timesteps
 * one or more input values can be listed
-* value = c\_ID, c\_ID[N], f\_ID, f\_ID[N], v\_name
-  
+* value = c_ID, c_ID[N], f_ID, f_ID[N], v_name
+
   .. parsed-literal::
-  
+
        c_ID = global scalar calculated by a compute with ID
        c_ID[I] = Ith component of global vector calculated by a compute with ID, I can include wildcard (see below)
        f_ID = global scalar calculated by a fix with ID
@@ -30,9 +29,9 @@ Syntax
 
 * zero or more keyword/arg pairs may be appended
 * keyword = *type* or *ave* or *start* or *prefactor* or *file* or *overwrite* or *title1* or *title2* or *title3*
-  
+
   .. parsed-literal::
-  
+
        *type* arg = *auto* or *upper* or *lower* or *auto/upper* or *auto/lower* or *full*
          auto = correlate each value with itself
          upper = correlate each value with each succeeding value
@@ -57,20 +56,17 @@ Syntax
        *title3* arg = string
          string = text to print as 3rd line of output file
 
-
-
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    fix 1 all ave/correlate 5 100 1000 c_myTemp file temp.correlate
    fix 1 all ave/correlate 1 50 10000 &
              c_thermo_press[1] c_thermo_press[2] c_thermo_press[3] &
              type upper ave running title1 "My correlation data"
 
-fix 1 all ave/correlate 1 50 10000 c\_thermo\_press[\*]
+   fix 1 all ave/correlate 1 50 10000 c_thermo_press[*]
 
 Description
 """""""""""
@@ -124,19 +120,16 @@ vector had been listed one by one.  E.g. these 2 fix ave/correlate
 commands are equivalent, since the :doc:`compute pressure <compute_pressure>` command creates a global vector with 6
 values.
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    compute myPress all pressure NULL
-   fix 1 all ave/correlate 1 50 10000 c_myPress[\*]
+   fix 1 all ave/correlate 1 50 10000 c_myPress[*]
    fix 1 all ave/correlate 1 50 10000 &
              c_myPress[1] c_myPress[2] c_myPress[3] &
              c_myPress[4] c_myPress[5] c_myPress[6]
 
-
 ----------
 
-
 The *Nevery*\ , *Nrepeat*\ , and *Nfreq* arguments specify on what
 timesteps the input values will be used to calculate correlation data.
 The input values are sampled every *Nevery* timesteps.  The
@@ -147,7 +140,6 @@ beginning of the simulation or the last output time; see the *ave*
 keyword for options.  For the set of samples, the correlation value
 Cij is calculated as:
 
-
 .. parsed-literal::
 
    Cij(delta) = ave(Vi(t)\*Vj(t+delta))
@@ -160,7 +152,6 @@ time delta.  The maximum delta used is of size (\ *Nrepeat*\ -1)\*\ *Nevery*\ .
 Thus the correlation between a pair of input values yields *Nrepeat*
 correlation datums:
 
-
 .. parsed-literal::
 
    Cij(0), Cij(Nevery), Cij(2\*Nevery), ..., Cij((Nrepeat-1)\*Nevery)
@@ -176,10 +167,8 @@ Vi(10)\*V j20), Vi(15)\*Vj(25), ..., Vi(85)\*Vj(95), Vi(90)\*Vj(100).
 non-zero.  Also, if the *ave* keyword is set to *one* which is the
 default, then *Nfreq* >= (\ *Nrepeat*\ -1)\*\ *Nevery* is required.
 
-
 ----------
 
-
 If a value begins with "c\_", a compute ID must follow which has been
 previously defined in the input script.  If no bracketed term is
 appended, the global scalar calculated by the compute is used.  If a
@@ -219,10 +208,8 @@ keywords, or they can invoke other computes, fixes, or variables when
 they are evaluated, so this is a very general means of specifying
 quantities to time correlate.
 
-
 ----------
 
-
 Additional optional keywords also affect the operation of this fix.
 
 The *type* keyword determines which pairs of input values are
@@ -248,7 +235,6 @@ pair Vi(t)\*Vj(t+delta) is always the one sampled at the later time.
   itself and every other value.  I.e. Cij = Vi\*Vj, for i,j = 1,N so
   Npair = N\^2.
 
-
 The *ave* keyword determines what happens to the accumulation of
 correlation samples every *Nfreq* timesteps.  If the *ave* setting is
 *one*\ , then the accumulation is restarted or zeroed every *Nfreq*
@@ -292,7 +278,6 @@ values for each of these, so they do not need to be specified.
 
 By default, these header lines are as follows:
 
-
 .. parsed-literal::
 
    # Time-correlated data for fix ID
@@ -304,14 +289,11 @@ describes the two values that are printed at the first of each section
 of output.  In the third line the value pairs are replaced with the
 appropriate fields from the fix ave/correlate command.
 
-
 ----------
 
-
 Let Sij = a set of time correlation data for input values I and J,
 namely the *Nrepeat* values:
 
-
 .. parsed-literal::
 
    Sij = Cij(0), Cij(Nevery), Cij(2\*Nevery), ..., Cij(\*Nrepeat-1)\*Nevery)
@@ -326,11 +308,9 @@ quantities which can be derived from time correlation data.  If a
 normalization factor is needed for the time integration, it can be
 included in the variable formula or via the *prefactor* keyword.
 
-
 ----------
 
-
-**Restart, fix\_modify, output, run start/stop, minimize info:**
+**Restart, fix_modify, output, run start/stop, minimize info:**
 
 No information about this fix is written to :doc:`binary restart files <restart>`.  None of the :doc:`fix_modify <fix_modify>` options
 are relevant to this fix.
@@ -362,7 +342,6 @@ as determined by the *type* keyword, as described above.
   ..., C1N, C21, C22, ..., C2N, C31, ..., C3N, ..., CN1, ..., CNN-1,
   CNN.
 
-
 The array values calculated by this fix are treated as intensive.  If
 you need to divide them by the number of atoms, you must do this in a
 later processing step, e.g. when using them in a
@@ -386,8 +365,3 @@ Related commands
 
 The option defaults are ave = one, type = auto, start = 0, no file
 output, title 1,2,3 = strings as described above, and prefactor = 1.0.
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/fix_ave_correlate_long.rst b/doc/src/fix_ave_correlate_long.rst
index a976061edc..affa7df127 100644
--- a/doc/src/fix_ave_correlate_long.rst
+++ b/doc/src/fix_ave_correlate_long.rst
@@ -6,7 +6,6 @@ fix ave/correlate/long command
 Syntax
 """"""
 
-
 .. parsed-literal::
 
    fix ID group-ID ave/correlate/long Nevery Nfreq value1 value2 ... keyword args ...
@@ -16,10 +15,10 @@ Syntax
 * Nevery = use input values every this many timesteps
 * Nfreq = save state of the time correlation functions every this many timesteps
 * one or more input values can be listed
-* value = c\_ID, c\_ID[N], f\_ID, f\_ID[N], v\_name
-  
+* value = c_ID, c_ID[N], f_ID, f_ID[N], v_name
+
   .. parsed-literal::
-  
+
        c_ID = global scalar calculated by a compute with ID
        c_ID[I] = Ith component of global vector calculated by a compute with ID
        f_ID = global scalar calculated by a fix with ID
@@ -28,9 +27,9 @@ Syntax
 
 * zero or more keyword/arg pairs may be appended
 * keyword = *type* or *start* or *file* or *overwrite* or *title1* or *title2* or *ncorr* or *p* or *m*
-  
+
   .. parsed-literal::
-  
+
        *type* arg = *auto* or *upper* or *lower* or *auto/upper* or *auto/lower* or *full*
          auto = correlate each value with itself
          upper = correlate each value with each succeeding value
@@ -52,15 +51,12 @@ Syntax
        *nlen* args = Nlen
          Nlen = length of each correlator
        *ncount* args = Ncount
-         Ncount = number of values over which succesive correlators are averaged
-
-
+         Ncount = number of values over which successive correlators are averaged
 
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    fix 1 all ave/correlate/long 5 1000 c_myTemp file temp.correlate
    fix 1 all ave/correlate/long 1 10000 &
@@ -70,11 +66,12 @@ Examples
 Description
 """""""""""
 
-This fix is similar in spirit and syntax to the :doc:`fix ave/correlate <fix_ave_correlate>`.  However, this fix allows the
-efficient calculation of time correlation functions on the fly over
-extremely long time windows without too much CPU overhead, using a
-multiple-tau method :ref:`(Ramirez) <Ramirez>` that decreases the resolution
-of the stored correlation function with time.
+This fix is similar in spirit and syntax to the :doc:`fix ave/correlate <fix_ave_correlate>`.
+However, this fix allows the efficient calculation of time correlation
+functions on-the-fly over extremely long time windows with little
+additional CPU overhead, using a multiple-tau method
+:ref:`(Ramirez) <Ramirez>` that decreases the resolution of the stored
+correlation function with time.  It is not a full drop-in replacement.
 
 The group specified with this command is ignored.  However, note that
 specified values may represent calculations performed by computes and
@@ -113,13 +110,15 @@ corresponds to about 10 KB.
 
 For the meaning of the additional optional keywords, see the :doc:`fix ave/correlate <fix_ave_correlate>` doc page.
 
-**Restart, fix\_modify, output, run start/stop, minimize info:**
+**Restart, fix_modify, output, run start/stop, minimize info:**
 
-Since this fix in intended for the calculation of time correlation
-functions over very long MD simulations, the information about this
-fix is written automatically to binary restart files, so that the time
-correlation calculation can continue in subsequent simulations. None
-of the fix\_modify options are relevant to this fix.
+Contrary to :doc:`fix ave/correlate <fix_ave_correlate>` this fix
+does **not** provide access to its internal data to various output
+options. Since this fix in intended for the calculation of time
+correlation functions over very long MD simulations, the information
+about this fix is written automatically to binary restart files, so
+that the time correlation calculation can continue in subsequent
+simulations. None of the fix_modify options are relevant to this fix.
 
 No parameter of this fix can be used with the start/stop keywords of
 the run command. This fix is not invoked during energy minimization.
@@ -127,7 +126,6 @@ the run command. This fix is not invoked during energy minimization.
 Restrictions
 """"""""""""
 
-
 This compute is part of the USER-MISC package.  It is only enabled if
 LAMMPS was built with that package.  See the :doc:`Build package <Build_package>` doc page for more info.
 
@@ -145,18 +143,9 @@ the :doc:`fix ave/correlate <fix_ave_correlate>` doc page.
 The option defaults for keywords unique to this command are as
 follows: ncorr=20, nlen=16, ncount=2.
 
-
 ----------
 
-
 .. _Ramirez:
 
-
-
 **(Ramirez)** J. Ramirez, S.K. Sukumaran, B. Vorselaars and
 A.E. Likhtman, J. Chem. Phys. 133, 154103 (2010).
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/fix_ave_histo.rst b/doc/src/fix_ave_histo.rst
index 176e4b51db..158f259695 100644
--- a/doc/src/fix_ave_histo.rst
+++ b/doc/src/fix_ave_histo.rst
@@ -9,7 +9,6 @@ fix ave/histo/weight command
 Syntax
 """"""
 
-
 .. parsed-literal::
 
    fix ID group-ID style Nevery Nrepeat Nfreq lo hi Nbin value1 value2 ... keyword args ...
@@ -22,10 +21,10 @@ Syntax
 * lo,hi = lo/hi bounds within which to histogram
 * Nbin = # of histogram bins
 * one or more input values can be listed
-* value = x, y, z, vx, vy, vz, fx, fy, fz, c\_ID, c\_ID[N], f\_ID, f\_ID[N], v\_name
-  
+* value = x, y, z, vx, vy, vz, fx, fy, fz, c_ID, c_ID[N], f_ID, f_ID[N], v_name
+
   .. parsed-literal::
-  
+
        x,y,z,vx,vy,vz,fx,fy,fz = atom attribute (position, velocity, force component)
        c_ID = scalar or vector calculated by a compute with ID
        c_ID[I] = Ith component of vector or Ith column of array calculated by a compute with ID, I can include wildcard (see below)
@@ -36,9 +35,9 @@ Syntax
 
 * zero or more keyword/arg pairs may be appended
 * keyword = *mode* or *file* or *ave* or *start* or *beyond* or *overwrite* or *title1* or *title2* or *title3*
-  
+
   .. parsed-literal::
-  
+
        *mode* arg = *scalar* or *vector*
          scalar = all input values are scalars
          vector = all input values are vectors
@@ -63,17 +62,14 @@ Syntax
        *title3* arg = string
          string = text to print as 3rd line of output file, only for vector mode
 
-
-
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    fix 1 all ave/histo 100 5 1000 0.5 1.5 50 c_myTemp file temp.histo ave running
    fix 1 all ave/histo 100 5 1000 -5 5 100 c_thermo_press[2] c_thermo_press[3] title1 "My output values"
-   fix 1 all ave/histo 100 5 1000 -5 5 100 c_thermo_press[\*]
+   fix 1 all ave/histo 100 5 1000 -5 5 100 c_thermo_press[*]
    fix 1 all ave/histo 1 100 1000 -2.0 2.0 18 vx vy vz mode vector ave running beyond extra
    fix 1 all ave/histo/weight 1 1 1 10 100 2000 c_XRD[1] c_XRD[2]
 
@@ -138,11 +134,10 @@ vector or columns of the array had been listed one by one.  E.g. these
 2 fix ave/histo commands are equivalent, since the :doc:`compute com/chunk <compute_com_chunk>` command creates a global array with
 3 columns:
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    compute myCOM all com/chunk
-   fix 1 all ave/histo 100 1 100 c_myCOM[\*] file tmp1.com mode vector
+   fix 1 all ave/histo 100 1 100 c_myCOM[*] file tmp1.com mode vector
    fix 2 all ave/histo 100 1 100 c_myCOM[1] c_myCOM[2] c_myCOM[3] file tmp2.com mode vector
 
 If the fix ave/histo/weight command is used, exactly two values must
@@ -155,10 +150,8 @@ corresponding weight is tallied.  E.g. The Nth entry (weight) in the
 second vector is tallied to the bin corresponding to the Nth entry in
 the first vector.
 
-
 ----------
 
-
 The *Nevery*\ , *Nrepeat*\ , and *Nfreq* arguments specify on what
 timesteps the input values will be used in order to contribute to the
 histogram.  The final histogram is generated on timesteps that are
@@ -176,10 +169,8 @@ histogram on timestep 100.  Similarly for timesteps
 = 100, then no time averaging of the histogram is done; a histogram is
 simply generated on timesteps 100,200,etc.
 
-
 ----------
 
-
 The atom attribute values (x,y,z,vx,vy,vz,fx,fy,fz) are
 self-explanatory.  Note that other atom attributes can be used as
 inputs to this fix by using the :doc:`compute property/atom <compute_property_atom>` command and then specifying
@@ -237,10 +228,8 @@ thermodynamic keywords, or they can invoke other computes, fixes, or
 variables when they are evaluated, so this is a very general means of
 specifying quantities to histogram.
 
-
 ----------
 
-
 Additional optional keywords also affect the operation of this fix.
 
 If the *mode* keyword is set to *scalar*\ , then all input values must
@@ -327,7 +316,6 @@ values for each of these, so they do not need to be specified.
 
 By default, these header lines are as follows:
 
-
 .. parsed-literal::
 
    # Histogram for fix ID
@@ -339,11 +327,9 @@ describes the six values that are printed at the first of each section
 of output.  The third describes the 4 values printed for each bin in
 the histogram.
 
-
 ----------
 
-
-**Restart, fix\_modify, output, run start/stop, minimize info:**
+**Restart, fix_modify, output, run start/stop, minimize info:**
 
 No information about this fix is written to :doc:`binary restart files <restart>`.  None of the :doc:`fix_modify <fix_modify>` options
 are relevant to this fix.
@@ -388,8 +374,3 @@ Related commands
 The option defaults are mode = scalar, kind = figured out from input
 arguments, ave = one, start = 0, no file output, beyond = ignore, and
 title 1,2,3 = strings as described above.
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/fix_ave_time.rst b/doc/src/fix_ave_time.rst
index 39fa1746e4..efa8095d69 100644
--- a/doc/src/fix_ave_time.rst
+++ b/doc/src/fix_ave_time.rst
@@ -6,7 +6,6 @@ fix ave/time command
 Syntax
 """"""
 
-
 .. parsed-literal::
 
    fix ID group-ID ave/time Nevery Nrepeat Nfreq value1 value2 ... keyword args ...
@@ -17,10 +16,10 @@ Syntax
 * Nrepeat = # of times to use input values for calculating averages
 * Nfreq = calculate averages every this many timesteps
 * one or more input values can be listed
-* value = c\_ID, c\_ID[N], f\_ID, f\_ID[N], v\_name
-  
+* value = c_ID, c_ID[N], f_ID, f_ID[N], v_name
+
   .. parsed-literal::
-  
+
        c_ID = global scalar or vector calculated by a compute with ID
        c_ID[I] = Ith component of global vector or Ith column of global array calculated by a compute with ID, I can include wildcard (see below)
        f_ID = global scalar or vector calculated by a fix with ID
@@ -30,9 +29,9 @@ Syntax
 
 * zero or more keyword/arg pairs may be appended
 * keyword = *mode* or *file* or *ave* or *start* or *off* or *overwrite* or *title1* or *title2* or *title3*
-  
+
   .. parsed-literal::
-  
+
        *mode* arg = *scalar* or *vector*
          scalar = all input values are global scalars
          vector = all input values are global vectors or global arrays
@@ -56,18 +55,15 @@ Syntax
        *title3* arg = string
          string = text to print as 3rd line of output file, only for vector mode
 
-
-
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    fix 1 all ave/time 100 5 1000 c_myTemp c_thermo_temp file temp.profile
    fix 1 all ave/time 100 5 1000 c_thermo_press[2] ave window 20 &
                                  title1 "My output values"
-   fix 1 all ave/time 100 5 1000 c_thermo_press[\*]
+   fix 1 all ave/time 100 5 1000 c_thermo_press[*]
    fix 1 all ave/time 1 100 1000 f_indent f_indent[1] file temp.indent off 1
 
 Description
@@ -132,17 +128,14 @@ vector or columns of the array had been listed one by one.  E.g. these
 2 fix ave/time commands are equivalent, since the :doc:`compute rdf <compute_rdf>` command creates, in this case, a global array
 with 3 columns, each of length 50:
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    compute myRDF all rdf 50 1 2
-   fix 1 all ave/time 100 1 100 c_myRDF[\*] file tmp1.rdf mode vector
+   fix 1 all ave/time 100 1 100 c_myRDF[*] file tmp1.rdf mode vector
    fix 2 all ave/time 100 1 100 c_myRDF[1] c_myRDF[2] c_myRDF[3] file tmp2.rdf mode vector
 
-
 ----------
 
-
 The *Nevery*\ , *Nrepeat*\ , and *Nfreq* arguments specify on what
 timesteps the input values will be used in order to contribute to the
 average.  The final averaged quantities are generated on timesteps
@@ -160,10 +153,8 @@ timestep 200, etc.  If Nrepeat=1 and Nfreq = 100, then no time
 averaging is done; values are simply generated on timesteps
 100,200,etc.
 
-
 ----------
 
-
 If a value begins with "c\_", a compute ID must follow which has been
 previously defined in the input script.  If *mode* = scalar, then if
 no bracketed term is appended, the global scalar calculated by the
@@ -212,10 +203,8 @@ keywords, or they can invoke other computes, fixes, or variables when
 they are evaluated, so this is a very general means of specifying
 quantities to time average.
 
-
 ----------
 
-
 Additional optional keywords also affect the operation of this fix.
 
 If the *mode* keyword is set to *scalar*\ , then all input values must
@@ -290,7 +279,6 @@ default values for each of these, so they do not need to be specified.
 
 By default, these header lines are as follows for *mode* = scalar:
 
-
 .. parsed-literal::
 
    # Time-averaged data for fix ID
@@ -303,7 +291,6 @@ so the *title3* setting is ignored when *mode* = scalar.
 
 By default, these header lines are as follows for *mode* = vector:
 
-
 .. parsed-literal::
 
    # Time-averaged data for fix ID
@@ -315,11 +302,9 @@ describes the two values that are printed at the first of each section
 of output.  In the third line the values are replaced with the
 appropriate fields from the fix ave/time command.
 
-
 ----------
 
-
-**Restart, fix\_modify, output, run start/stop, minimize info:**
+**Restart, fix_modify, output, run start/stop, minimize info:**
 
 No information about this fix is written to :doc:`binary restart files <restart>`.  None of the :doc:`fix_modify <fix_modify>` options
 are relevant to this fix.
@@ -368,8 +353,3 @@ Default
 The option defaults are mode = scalar, ave = one, start = 0, no file
 output, format = %g, title 1,2,3 = strings as described above, and no
 off settings for any input values.
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/fix_aveforce.rst b/doc/src/fix_aveforce.rst
index 07d2e3b0f0..437c5caaa7 100644
--- a/doc/src/fix_aveforce.rst
+++ b/doc/src/fix_aveforce.rst
@@ -6,7 +6,6 @@ fix aveforce command
 Syntax
 """"""
 
-
 .. parsed-literal::
 
    fix ID group-ID aveforce fx fy fz keyword value ...
@@ -14,26 +13,23 @@ Syntax
 * ID, group-ID are documented in :doc:`fix <fix>` command
 * aveforce = style name of this fix command
 * fx,fy,fz = force component values (force units)
-  
+
   .. parsed-literal::
-  
+
        any of fx,fy,fz can be a variable (see below)
 
 * zero or more keyword/value pairs may be appended to args
 * keyword = *region*
-  
+
   .. parsed-literal::
-  
+
        *region* value = region-ID
          region-ID = ID of region atoms must be in to have added force
 
-
-
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    fix pressdown topwall aveforce 0.0 -1.0 0.0
    fix 2 bottomwall aveforce NULL -1.0 0.0 region top
@@ -59,7 +55,7 @@ average value without adding in any additional force.
 
 Any of the 3 quantities defining the force components can be specified
 as an equal-style :doc:`variable <variable>`, namely *fx*\ , *fy*\ , *fz*\ .
-If the value is a variable, it should be specified as v\_name, where
+If the value is a variable, it should be specified as v_name, where
 name is the variable name.  In this case, the variable will be
 evaluated each timestep, and its value used to determine the average
 force.
@@ -73,10 +69,8 @@ If the *region* keyword is used, the atom must also be in the
 specified geometric :doc:`region <region>` in order to have force added
 to it.
 
-
 ----------
 
-
 Styles with a *gpu*\ , *intel*\ , *kk*\ , *omp*\ , or *opt* suffix are
 functionally the same as the corresponding style without the suffix.
 They have been optimized to run faster, depending on your available
@@ -95,11 +89,9 @@ by including their suffix, or you can use the :doc:`-suffix command-line switch
 See the :doc:`Speed packages <Speed_packages>` doc page for more
 instructions on how to use the accelerated styles effectively.
 
-
 ----------
 
-
-**Restart, fix\_modify, output, run start/stop, minimize info:**
+**Restart, fix_modify, output, run start/stop, minimize info:**
 
 No information about this fix is written to :doc:`binary restart files <restart>`.
 
@@ -132,8 +124,3 @@ Related commands
 :doc:`fix setforce <fix_setforce>`, :doc:`fix addforce <fix_addforce>`
 
 **Default:** none
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/fix_balance.rst b/doc/src/fix_balance.rst
index db2bf9e64b..13fdf6b1c7 100644
--- a/doc/src/fix_balance.rst
+++ b/doc/src/fix_balance.rst
@@ -6,7 +6,6 @@ fix balance command
 Syntax
 """"""
 
-
 .. parsed-literal::
 
    fix ID group-ID balance Nfreq thresh style args keyword args ...
@@ -16,9 +15,9 @@ Syntax
 * Nfreq = perform dynamic load balancing every this many steps
 * thresh = imbalance threshold that must be exceeded to perform a re-balance
 * style = *shift* or *rcb*
-  
+
   .. parsed-literal::
-  
+
        shift args = dimstr Niter stopthresh
          dimstr = sequence of letters containing "x" or "y" or "z", each not more than once
          Niter = # of times to iterate within each dimension of dimstr sequence
@@ -27,9 +26,9 @@ Syntax
 
 * zero or more keyword/arg pairs may be appended
 * keyword = *weight* or *out*
-  
+
   .. parsed-literal::
-  
+
        *weight* style args = use weighted particle counts for the balancing
          *style* = *group* or *neigh* or *time* or *var* or *store*
            *group* args = Ngroup group1 weight1 group2 weight2 ...
@@ -47,13 +46,10 @@ Syntax
        *out* arg = filename
          filename = write each processor's sub-domain to a file, at each re-balancing
 
-
-
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    fix 2 all balance 1000 1.05 shift x 10 1.05
    fix 2 all balance 100 0.9 shift xy 20 1.1 out tmp.balance
@@ -147,10 +143,8 @@ forced even if the current balance is perfect (1.0) be specifying a
    :doc:`kspace_style <kspace_style>` command.  Thus you should benchmark
    the run times of a simulation before and after balancing.
 
-
 ----------
 
-
 The method used to perform a load balance is specified by one of the
 listed styles, which are described in detail below.  There are 2 kinds
 of styles.
@@ -165,13 +159,17 @@ the simulation box across processors (one sub-box for each of 16
 processors); the middle diagram is after a "grid" method has been
 applied.
 
-.. image:: JPG/balance_uniform_small.jpg
+.. |bal_uni| image:: JPG/balance_uniform_small.jpg
    :target: JPG/balance_uniform.jpg
-.. image:: JPG/balance_nonuniform_small.jpg
+   :width: 31%
+.. |bal_non| image:: JPG/balance_nonuniform_small.jpg
    :target: JPG/balance_nonuniform.jpg
-.. image:: JPG/balance_rcb_small.jpg
+   :width: 31%
+.. |bal_rcb| image:: JPG/balance_rcb_small.jpg
    :target: JPG/balance_rcb.jpg
+   :width: 31%
 
+|bal_uni|  |bal_non|  |bal_rcb|
 
 The *rcb* style is a "tiling" method which does not produce a logical
 3d grid of processors.  Rather it tiles the simulation domain with
@@ -195,10 +193,8 @@ When a "tiling" method is specified, the current domain partitioning
 ("grid" or "tiled") is ignored, and a new partitioning is computed
 from scratch.
 
-
 ----------
 
-
 The *group-ID* is ignored.  However the impact of balancing on
 different groups of atoms can be affected by using the *group* weight
 style as described below.
@@ -214,10 +210,8 @@ command settings.
 On re-balance steps, re-balancing will only be attempted if the current
 imbalance factor, as defined above, exceeds the *thresh* setting.
 
-
 ----------
 
-
 The *shift* style invokes a "grid" method for balancing, as described
 above.  It changes the positions of cutting planes between processors
 in an iterative fashion, seeking to reduce the imbalance factor.
@@ -282,10 +276,8 @@ the normal reneighboring procedure.
    the threshold accuracy is reached (in a dimension) is less iterations
    than *Niter* and exit early.
 
-
 ----------
 
-
 The *rcb* style invokes a "tiled" method for balancing, as described
 above.  It performs a recursive coordinate bisectioning (RCB) of the
 simulation domain. The basic idea is as follows.
@@ -311,10 +303,8 @@ the box in two.  The recursion continues until every processor is
 assigned a sub-box of the entire simulation domain, and owns the atoms
 in that sub-box.
 
-
 ----------
 
-
 The *out* keyword writes text to the specified *filename* with the
 results of each re-balancing operation.  The file contains the bounds
 of the sub-domain for each processor after the balancing operation
@@ -323,7 +313,6 @@ completes.  The format of the file is compatible with the
 visualizing mesh files.  An example is shown here for a balancing by 4
 processors for a 2d problem:
 
-
 .. parsed-literal::
 
    ITEM: TIMESTEP
@@ -371,11 +360,9 @@ rectangle for each processor (1 to 4).
 For a 3d problem, the syntax is similar with 8 vertices listed for
 each processor, instead of 4, and "SQUARES" replaced by "CUBES".
 
-
 ----------
 
-
-**Restart, fix\_modify, output, run start/stop, minimize info:**
+**Restart, fix_modify, output, run start/stop, minimize info:**
 
 No information about this fix is written to :doc:`binary restart files <restart>`.  None of the :doc:`fix_modify <fix_modify>` options
 are relevant to this fix.
@@ -399,14 +386,11 @@ by this fix are "intensive".
 No parameter of this fix can be used with the *start/stop* keywords of
 the :doc:`run <run>` command.  This fix is not invoked during :doc:`energy minimization <minimize>`.
 
-
 ----------
 
-
 Restrictions
 """"""""""""
 
-
 For 2d simulations, the *z* style cannot be used.  Nor can a "z"
 appear in *dimstr* for the *shift* style.
 
@@ -419,12 +403,6 @@ Related commands
 :doc:`group <group>`, :doc:`processors <processors>`, :doc:`balance <balance>`,
 :doc:`comm_style <comm_style>`
 
-.. _pizza: http://pizza.sandia.gov
+.. _pizza: https://pizza.sandia.gov
 
 **Default:** none
-
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/fix_bocs.rst b/doc/src/fix_bocs.rst
index 38e88ad1aa..5315aa81a1 100644
--- a/doc/src/fix_bocs.rst
+++ b/doc/src/fix_bocs.rst
@@ -6,7 +6,6 @@ fix bocs command
 Syntax
 """"""
 
-
 .. parsed-literal::
 
    fix  ID group-ID bocs keyword values ...
@@ -19,13 +18,10 @@ Syntax
        *linear_spline* values = input_filename
        *cubic_spline* values = input_filename
 
-
-
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    fix 1 all bocs temp 300.0 300.0 100.0 cgiso 0.986 0.986 1000.0 analytic 66476.015 968 2 245030.10 8962.20
 
@@ -41,22 +37,20 @@ Dunn and Noid in :ref:`(Dunn1) <bocs-Dunn1>` to the standard MTTK
 barostat by Martyna et. al. in :ref:`(Martyna) <bocs-Martyna>` .
 The first half of the command mimics a standard fix npt command:
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    fix 1 all bocs temp Tstart Tstop Tcoupl cgiso Pstart Pstop Pdamp
 
 The two differences are replacing *npt* with *bocs*\ , and replacing
 *iso*\ /\ *aniso*\ /\ *etc* with *cgiso*\ .
 The rest of the command details what form you would like to use for
-the pressure correction equation. The choices are: *analytic*\ , *linear\_spline*,
-or *cubic\_spline*.
+the pressure correction equation. The choices are: *analytic*\ , *linear_spline*,
+or *cubic_spline*.
 
 With either spline method, the only argument that needs to follow it
 is the name of a file that contains the desired pressure correction
 as a function of volume. The file must be formatted so each line has:
 
-
 .. parsed-literal::
 
    Volume_i, PressureCorrection_i
@@ -73,19 +67,17 @@ range provided, the simulation will stop.
 
 With the *analytic* option, the arguments are as follows:
 
-
 .. parsed-literal::
 
    ... analytic V_avg N_particles N_coeff Coeff_1 Coeff_2 ... Coeff_N
 
-Note that *V\_avg* and *Coeff\_i* should all be in the proper units, e.g. if you
-are using *units real*\ , *V\_avg* should be in cubic angstroms, and the
+Note that *V_avg* and *Coeff_i* should all be in the proper units, e.g. if you
+are using *units real*\ , *V_avg* should be in cubic angstroms, and the
 coefficients should all be in atmospheres \* cubic angstroms.
 
 Restrictions
 """"""""""""
 
-
 As this is computing a (modified) pressure, group-ID should be *all*\ .
 
 The pressure correction has only been tested for use with an isotropic
@@ -94,9 +86,9 @@ pressure coupling in 3 dimensions.
 By default, LAMMPS will still report the normal value for the pressure
 if the pressure is printed via a *thermo* command, or if the pressures
 are written to a file every so often. In order to have LAMMPS report the
-modified pressure, you must include the *thermo\_modify* command given in
+modified pressure, you must include the *thermo_modify* command given in
 the examples. For the last argument in the command, you should put
-XXXX\_press, where XXXX is the ID given to the fix bocs command (in the
+XXXX_press, where XXXX is the ID given to the fix bocs command (in the
 example, the ID of the fix bocs command is 1 ).
 
 This fix is part of the USER-BOCS package.  It is only enabled if
@@ -110,31 +102,16 @@ paper by Dunn et. al. :ref:`(Dunn2) <bocs-Dunn2>` .
 
 .. _bocsgithub: https://github.com/noid-group/BOCS
 
-
-
-
 ----------
 
-
 .. _bocs-Dunn1:
 
-
-
 **(Dunn1)** Dunn and Noid, J Chem Phys, 143, 243148 (2015).
 
 .. _bocs-Martyna:
 
-
-
 **(Martyna)** Martyna, Tobias, and Klein, J Chem Phys, 101, 4177 (1994).
 
 .. _bocs-Dunn2:
 
-
-
 **(Dunn2)** Dunn, Lebold, DeLyser, Rudzinski, and Noid, J. Phys. Chem. B, 122, 3363 (2018).
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/fix_bond_break.rst b/doc/src/fix_bond_break.rst
index 57bd3d39a8..3994b58b12 100644
--- a/doc/src/fix_bond_break.rst
+++ b/doc/src/fix_bond_break.rst
@@ -6,7 +6,6 @@ fix bond/break command
 Syntax
 """"""
 
-
 .. parsed-literal::
 
    fix ID group-ID bond/break Nevery bondtype Rmax keyword values ...
@@ -18,20 +17,17 @@ Syntax
 * Rmax = bond longer than Rmax can break (distance units)
 * zero or more keyword/value pairs may be appended to args
 * keyword = *prob*
-  
+
   .. parsed-literal::
-  
+
        *prob* values = fraction seed
          fraction = break a bond with this probability if otherwise eligible
          seed = random number seed (positive integer)
 
-
-
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    fix 5 all bond/break 10 2 1.2
    fix 5 polymer bond/break 1 1 2.0 prob 0.5 49829
@@ -117,11 +113,9 @@ You can dump out snapshots of the current bond topology via the :doc:`dump local
    may need to thermostat your system to compensate for energy changes
    resulting from broken bonds (and angles, dihedrals, impropers).
 
-
 ----------
 
-
-**Restart, fix\_modify, output, run start/stop, minimize info:**
+**Restart, fix_modify, output, run start/stop, minimize info:**
 
 No information about this fix is written to :doc:`binary restart files <restart>`.  None of the :doc:`fix_modify <fix_modify>` options
 are relevant to this fix.
@@ -141,7 +135,6 @@ the :doc:`run <run>` command.  This fix is not invoked during :doc:`energy minim
 Restrictions
 """"""""""""
 
-
 This fix is part of the MC package.  It is only enabled if LAMMPS was
 built with that package.  See the :doc:`Build package <Build_package>`
 doc page for more info.
@@ -156,8 +149,3 @@ Default
 """""""
 
 The option defaults are prob = 1.0.
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/fix_bond_create.rst b/doc/src/fix_bond_create.rst
index dbf1234582..0c48a800c9 100644
--- a/doc/src/fix_bond_create.rst
+++ b/doc/src/fix_bond_create.rst
@@ -6,7 +6,6 @@ fix bond/create command
 Syntax
 """"""
 
-
 .. parsed-literal::
 
    fix ID group-ID bond/create Nevery itype jtype Rmin bondtype keyword values ...
@@ -19,9 +18,9 @@ Syntax
 * bondtype = type of created bonds
 * zero or more keyword/value pairs may be appended to args
 * keyword = *iparam* or *jparam* or *prob* or *atype* or *dtype* or *itype*
-  
+
   .. parsed-literal::
-  
+
        *iparam* values = maxbond, newtype
          maxbond = max # of bonds of bondtype the itype atom can have
          newtype = change the itype atom to this type when maxbonds exist
@@ -38,13 +37,10 @@ Syntax
        *itype* value = impropertype
          impropertype = type of created impropers
 
-
-
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    fix 5 all bond/create 10 1 2 0.8 1
    fix 5 all bond/create 1 3 3 0.8 1 prob 0.5 85784 iparam 2 3
@@ -218,11 +214,9 @@ You can dump out snapshots of the current bond topology via the :doc:`dump local
    thermostat your system to compensate for energy changes resulting from
    created bonds (and angles, dihedrals, impropers).
 
-
 ----------
 
-
-**Restart, fix\_modify, output, run start/stop, minimize info:**
+**Restart, fix_modify, output, run start/stop, minimize info:**
 
 No information about this fix is written to :doc:`binary restart files <restart>`.  None of the :doc:`fix_modify <fix_modify>` options
 are relevant to this fix.
@@ -242,7 +236,6 @@ the :doc:`run <run>` command.  This fix is not invoked during :doc:`energy minim
 Restrictions
 """"""""""""
 
-
 This fix is part of the MC package.  It is only enabled if LAMMPS was
 built with that package.  See the :doc:`Build package <Build_package>`
 doc page for more info.
@@ -258,8 +251,3 @@ Default
 
 The option defaults are iparam = (0,itype), jparam = (0,jtype), and
 prob = 1.0.
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/fix_bond_react.rst b/doc/src/fix_bond_react.rst
index ec9533788e..8daa52a73d 100644
--- a/doc/src/fix_bond_react.rst
+++ b/doc/src/fix_bond_react.rst
@@ -6,7 +6,6 @@ fix bond/react command
 Syntax
 """"""
 
-
 .. parsed-literal::
 
    fix ID group-ID bond/react common_keyword values ...
@@ -19,7 +18,7 @@ Syntax
 * bond/react = style name of this fix command
 * the common keyword/values may be appended directly after 'bond/react'
 * this applies to all reaction specifications (below)
-* common\_keyword = *stabilization*
+* common_keyword = *stabilization*
 
   .. parsed-literal::
 
@@ -37,9 +36,9 @@ Syntax
 * Rmax = bonding pair atoms must be separated by less than Rmax to initiate reaction (distance units)
 * template-ID(pre-reacted) = ID of a molecule template containing pre-reaction topology
 * template-ID(post-reacted) = ID of a molecule template containing post-reaction topology
-* map\_file = name of file specifying corresponding atom-IDs in the pre- and post-reacted templates
+* map_file = name of file specifying corresponding atom-IDs in the pre- and post-reacted templates
 * zero or more individual keyword/value pairs may be appended to each react argument
-* individual\_keyword = *prob* or *max\_rxn* or *stabilize\_steps* or *update\_edges*
+* individual_keyword = *prob* or *max_rxn* or *stabilize_steps* or *update_edges*
 
   .. parsed-literal::
 
@@ -55,15 +54,12 @@ Syntax
            charges = update atomic charges of all atoms in reaction templates
            custom = force the update of user-specified atomic charges
 
-
-
 Examples
 """"""""
 
-For unabridged example scripts and files, see examples/USER/misc/bond\_react.
+For unabridged example scripts and files, see examples/USER/reaction.
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    molecule mol1 pre_reacted_topology.txt
    molecule mol2 post_reacted_topology.txt
@@ -114,7 +110,7 @@ The *stabilization* keyword enables reaction site stabilization.
 Reaction site stabilization is performed by including reacting atoms
 in an internally-created fix :doc:`nve/limit <fix_nve_limit>` time
 integrator for a set number of timesteps given by the
-*stabilize\_steps* keyword. While reacting atoms are being time
+*stabilize_steps* keyword. While reacting atoms are being time
 integrated by the internal nve/limit, they are prevented from being
 involved in any new reactions. The *xmax* value keyword should
 typically be set to the maximum distance that non-reacting atoms move
@@ -127,7 +123,7 @@ automatically thermostatted by an internally-created
 :doc:`nve/limit <fix_nve_limit>` integrator. The second group contains
 all atoms currently not involved in a reaction. This group should be
 used by a thermostat in order to time integrate the system. The name
-of this group of non-reacting atoms is created by appending '\_REACT'
+of this group of non-reacting atoms is created by appending '_REACT'
 to the group-ID argument of the *stabilization* keyword, as shown in
 the second example above.
 
@@ -143,16 +139,15 @@ command creates a :doc:`dynamic group <group>` that is initialized to
 include all atoms. If the group-ID is that of an existing static
 group, the group is used as the parent group of new,
 internally-created dynamic group. In both cases, this new dynamic
-group is named by appending '\_REACT' to the group-ID, e.g.
-nvt\_grp\_REACT. By specifying an existing group, you may thermostat
+group is named by appending '_REACT' to the group-ID, e.g.
+nvt_grp_REACT. By specifying an existing group, you may thermostat
 constant-topology parts of your system separately. The dynamic group
 contains only atoms not involved in a reaction at a given timestep,
 and therefore should be used by a subsequent system-wide time
 integrator such as nvt, npt, or nve, as shown in the second example
-above (full examples can be found at examples/USER/misc/bond\_react).
-The time integration command should be placed after the fix bond/react
-command due to the internal dynamic grouping performed by fix
-bond/react.
+above (full examples can be found at examples/USER/reaction). The time
+integration command should be placed after the fix bond/react command
+due to the internal dynamic grouping performed by fix bond/react.
 
 .. note::
 
@@ -256,7 +251,6 @@ A map file has a header and a body. The header of map file the
 contains one mandatory keyword and five optional keywords. The
 mandatory keyword is 'equivalences':
 
-
 .. parsed-literal::
 
    N *equivalences* = # of atoms N in the reaction molecule templates
@@ -264,7 +258,6 @@ mandatory keyword is 'equivalences':
 The optional keywords are 'edgeIDs', 'deleteIDs', 'customIDs' and
 'constraints':
 
-
 .. parsed-literal::
 
    N *edgeIDs* = # of edge atoms N in the pre-reacted molecule template
@@ -292,18 +285,15 @@ Edges' and allows for forcing the update of a specific atom's atomic
 charge. The first column is the ID of an atom near the edge of the
 pre-reacted molecule template, and the value of the second column is
 either 'none' or 'charges.' Further details are provided in the
-discussion of the 'update\_edges' keyword. The fifth optional section
+discussion of the 'update_edges' keyword. The fifth optional section
 begins with the keyword 'Constraints' and lists additional criteria
 that must be satisfied in order for the reaction to occur. Currently,
-there are three types of constraints available, as discussed below.
+there are four types of constraints available, as discussed below.
 
 A sample map file is given below:
 
-
 ----------
 
-
-
 .. parsed-literal::
 
    # this is a map file
@@ -331,10 +321,8 @@ A sample map file is given below:
    6   6
    7   7
 
-
 ----------
 
-
 The handedness of atoms that are chiral centers can be enforced by
 listing their IDs in the ChiralIDs section. A chiral atom must be
 bonded to four atoms with mutually different atom types. This feature
@@ -348,7 +336,6 @@ Any number of additional constraints may be specified in the
 Constraints section of the map file. The constraint of type 'distance'
 has syntax as follows:
 
-
 .. parsed-literal::
 
    distance *ID1* *ID2* *rmin* *rmax*
@@ -359,7 +346,6 @@ distance between *rmin* and *rmax* for the reaction to occur.
 
 The constraint of type 'angle' has the following syntax:
 
-
 .. parsed-literal::
 
    angle *ID1* *ID2* *ID3* *amin* *amax*
@@ -371,26 +357,43 @@ the central atom). Angles must be specified in degrees. This
 constraint can be used to enforce a certain orientation between
 reacting molecules.
 
+The constraint of type 'dihedral' has the following syntax:
+
+.. parsed-literal::
+
+   dihedral *ID1* *ID2* *ID3* *ID4* *amin* *amax* *amin2* *amax2*
+
+where 'dihedral' is the required keyword, and *ID1*\ , *ID2*\ , *ID3*
+and *ID4* are pre-reaction atom IDs. Dihedral angles are calculated in
+the interval (-180,180]. Refer to the :doc:`dihedral style <dihedral_style>`
+documentation for further details on convention. If *amin* is less
+than *amax*, these four atoms must form a dihedral angle greater than
+*amin* **and** less than *amax* for the reaction to occur. If *amin*
+is greater than *amax*, these four atoms must form a dihedral angle
+greater than *amin* **or** less than *amax* for the reaction to occur.
+Angles must be specified in degrees. Optionally, a second range of
+permissible angles *amin2*-*amax2* can be specified.
+
 The constraint of type 'arrhenius' imposes an additional reaction
 probability according to the temperature-dependent Arrhenius equation:
 
-.. image:: Eqs/fix_bond_react.jpg
-   :align: center
+.. math::
+
+   k = AT^{n}e^{\frac{-E_{a}}{k_{B}T}}
 
 The Arrhenius constraint has the following syntax:
 
-
 .. parsed-literal::
 
    arrhenius *A* *n* *E_a* *seed*
 
 where 'arrhenius' is the required keyword, *A* is the pre-exponential
-factor, *n* is the exponent of the temperature dependence, *E\_a* is
-the activation energy (:doc:`units <units>` of energy), and *seed* is a
+factor, *n* is the exponent of the temperature dependence, :math:`E_a`
+is the activation energy (:doc:`units <units>` of energy), and *seed* is a
 random number seed. The temperature is defined as the instantaneous
 temperature averaged over all atoms in the reaction site, and is
 calculated in the same manner as for example
-:doc:`compute\_temp\_chunk <compute_temp_chunk>`. Currently, there are no
+:doc:`compute temp/chunk <compute_temp_chunk>`. Currently, there are no
 options for additional temperature averaging or velocity-biased
 temperature calculations. A uniform random number between 0 and 1 is
 generated using *seed*\ ; if this number is less than the result of the
@@ -419,9 +422,9 @@ actually occurs. The fraction setting must be a value between 0.0 and
 1.0. A uniform random number between 0.0 and 1.0 is generated and the
 eligible reaction only occurs if the random number is less than the
 fraction. Up to N reactions are permitted to occur, as optionally
-specified by the *max\_rxn* keyword.
+specified by the *max_rxn* keyword.
 
-The *stabilize\_steps* keyword allows for the specification of how many
+The *stabilize_steps* keyword allows for the specification of how many
 timesteps a reaction site is stabilized before being returned to the
 overall system thermostat. In order to produce the most physical
 behavior, this 'reaction site equilibration time' should be tuned to
@@ -432,7 +435,7 @@ individually tuned for each fix reaction step. Note that in some
 situations, decreasing rather than increasing this parameter will
 result in an increase in stability.
 
-The *update\_edges* keyword can increase the number of atoms whose
+The *update_edges* keyword can increase the number of atoms whose
 atomic charges are updated, when the pre-reaction template contains
 edge atoms. When the value is set to 'charges,' all atoms' atomic
 charges are updated to those specified by the post-reaction template,
@@ -458,13 +461,12 @@ such as small rings, that may be otherwise indistinguishable.
 Optionally, you can enforce additional behaviors on reacting atoms.
 For example, it may be beneficial to force reacting atoms to remain at
 a certain temperature. For this, you can use the internally-created
-dynamic group named "bond\_react\_MASTER\_group", which consists of all
+dynamic group named "bond_react_MASTER_group", which consists of all
 atoms currently involved in a reaction. For example, adding the
 following command would add an additional thermostat to the group of
 all currently-reacting atoms:
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    fix 1 bond_react_MASTER_group temp/rescale 1 300 300 10 1
 
@@ -483,11 +485,9 @@ you should be cautious about invoking this fix too frequently.
 You can dump out snapshots of the current bond topology via the dump
 local command.
 
-
 ----------
 
-
-**Restart, fix\_modify, output, run start/stop, minimize info:**
+**Restart, fix_modify, output, run start/stop, minimize info:**
 
 Cumulative reaction counts for each reaction are written to :doc:`binary restart files <restart>`. These values are associated with the
 reaction name (react-ID). Additionally, internally-created per-atom
@@ -513,8 +513,7 @@ all other fixes that use any group created by fix bond/react.
 Restrictions
 """"""""""""
 
-
-This fix is part of the USER-MISC package.  It is only enabled if
+This fix is part of the USER-REACTION package.  It is only enabled if
 LAMMPS was built with that package.  See the
 :doc:`Build package <Build_package>` doc page for more info.
 
@@ -529,20 +528,11 @@ Related commands
 Default
 """""""
 
-The option defaults are stabilization = no, prob = 1.0, stabilize\_steps = 60,
-update\_edges = none
-
+The option defaults are stabilization = no, prob = 1.0, stabilize_steps = 60,
+update_edges = none
 
 ----------
 
-
 .. _Gissinger:
 
-
-
 **(Gissinger)** Gissinger, Jensen and Wise, Polymer, 128, 211 (2017).
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/fix_bond_swap.rst b/doc/src/fix_bond_swap.rst
index b341fea35b..9427b0e780 100644
--- a/doc/src/fix_bond_swap.rst
+++ b/doc/src/fix_bond_swap.rst
@@ -6,7 +6,6 @@ fix bond/swap command
 Syntax
 """"""
 
-
 .. parsed-literal::
 
    fix ID group-ID bond/swap Nevery fraction cutoff seed
@@ -21,8 +20,7 @@ Syntax
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    fix 1 all bond/swap 50 0.5 1.3 598934
 
@@ -115,16 +113,13 @@ ends of a chain swap with each other.
    running dynamics, but can affect calculation of some diagnostic
    quantities or the printing of unwrapped coordinates to a dump file.
 
-
 ----------
 
-
 This fix computes a temperature each time it is invoked for use by the
 Boltzmann criterion.  To do this, the fix creates its own compute of
 style *temp*\ , as if this command had been issued:
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    compute fix-ID_temp all temp
 
@@ -134,19 +129,17 @@ appended and the group for the new compute is "all", so that the
 temperature of the entire system is used.
 
 Note that this is NOT the compute used by thermodynamic output (see
-the :doc:`thermo_style <thermo_style>` command) with ID = *thermo\_temp*.
+the :doc:`thermo_style <thermo_style>` command) with ID = *thermo_temp*.
 This means you can change the attributes of this fix's temperature
 (e.g. its degrees-of-freedom) via the
 :doc:`compute_modify <compute_modify>` command or print this temperature
 during thermodynamic output via the :doc:`thermo_style custom <thermo_style>` command using the appropriate compute-ID.
-It also means that changing attributes of *thermo\_temp* will have no
+It also means that changing attributes of *thermo_temp* will have no
 effect on this fix.
 
-
 ----------
 
-
-**Restart, fix\_modify, thermo output, run start/stop, minimize info:**
+**Restart, fix_modify, thermo output, run start/stop, minimize info:**
 
 No information about this fix is written to :doc:`binary restart files <restart>`.  Because the state of the random number generator
 is not saved in restart files, this means you cannot do "exact"
@@ -177,12 +170,11 @@ the :doc:`run <run>` command.  This fix is not invoked during :doc:`energy minim
 Restrictions
 """"""""""""
 
-
 This fix is part of the MC package.  It is only enabled if LAMMPS was
 built with that package.  See the :doc:`Build package <Build_package>`
 doc page for more info.
 
-The settings of the "special\_bond" command must be 0,1,1 in order to
+The settings of the "special_bond" command must be 0,1,1 in order to
 use this fix, which is typical of bead-spring chains with FENE or
 harmonic bonds.  This means that pairwise interactions between bonded
 atoms are turned off, but are turned on between atoms two or three
@@ -199,18 +191,9 @@ Related commands
 
 **Default:** none
 
-
 ----------
 
-
 .. _Sides:
 
-
-
 **(Sides)** Sides, Grest, Stevens, Plimpton, J Polymer Science B, 42,
 199-208 (2004).
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/fix_box_relax.rst b/doc/src/fix_box_relax.rst
index 02e5f97736..7786a8faef 100644
--- a/doc/src/fix_box_relax.rst
+++ b/doc/src/fix_box_relax.rst
@@ -6,16 +6,15 @@ fix box/relax command
 Syntax
 """"""
 
-
 .. parsed-literal::
 
    fix ID group-ID box/relax keyword value ...
 
 * ID, group-ID are documented in :doc:`fix <fix>` command
 * box/relax = style name of this fix command
-  
+
   .. parsed-literal::
-  
+
      one or more keyword value pairs may be appended
      keyword = *iso* or *aniso* or *tri* or *x* or *y* or *z* or *xy* or *yz* or *xz* or *couple* or *nreset* or *vmax* or *dilate* or *scaleyz* or *scalexz* or *scalexy* or *fixedpoint*
        *iso* or *aniso* or *tri* value = Ptarget = desired pressure (pressure units)
@@ -30,13 +29,10 @@ Syntax
        *fixedpoint* values = x y z
          x,y,z = perform relaxation dilation/contraction around this point (distance units)
 
-
-
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    fix 1 all box/relax iso 0.0 vmax 0.001
    fix 2 water box/relax aniso 0.0 dilate partial
@@ -54,10 +50,8 @@ close to the specified external tensor.  Conceptually, specifying a
 positive pressure is like squeezing on the simulation box; a negative
 pressure typically allows the box to expand.
 
-
 ----------
 
-
 The external pressure tensor is specified using one or more of the
 *iso*\ , *aniso*\ , *tri*\ , *x*\ , *y*\ , *z*\ , *xy*\ , *xz*\ , *yz*\ , and *couple*
 keywords.  These keywords give you the ability to specify all 6
@@ -138,10 +132,8 @@ displaced by the same amount, different on each iteration.
    new objective function valid for the new box size/shape.  Repeat as
    necessary until the box size/shape has reached its new equilibrium.
 
-
 ----------
 
-
 The *couple* keyword allows two or three of the diagonal components of
 the pressure tensor to be "coupled" together.  The value specified
 with the keyword determines which are coupled.  For example, *xz*
@@ -155,10 +147,8 @@ dilated or contracted by the same percentage every timestep.  The
 *Couple xyz* can be used for a 2d simulation; the *z* dimension is
 simply ignored.
 
-
 ----------
 
-
 The *iso*\ , *aniso*\ , and *tri* keywords are simply shortcuts that are
 equivalent to specifying several other keywords together.
 
@@ -167,7 +157,6 @@ pressure is computed (hydrostatic pressure), and dilate/contract the
 dimensions together.  Using "iso Ptarget" is the same as specifying
 these 4 keywords:
 
-
 .. parsed-literal::
 
    x Ptarget
@@ -181,7 +170,6 @@ stress tensor as the driving forces, and the specified scalar external
 pressure.  Using "aniso Ptarget" is the same as specifying these 4
 keywords:
 
-
 .. parsed-literal::
 
    x Ptarget
@@ -195,7 +183,6 @@ as the driving forces, and the specified scalar pressure as the
 external normal stress.  Using "tri Ptarget" is the same as specifying
 these 7 keywords:
 
-
 .. parsed-literal::
 
    x Ptarget
@@ -206,10 +193,8 @@ these 7 keywords:
    xz 0.0
    couple none
 
-
 ----------
 
-
 The *vmax* keyword can be used to limit the fractional change in the
 volume of the simulation box that can occur in one iteration of the
 minimizer.  If the pressure is not settling down during the
@@ -220,31 +205,32 @@ percent in one iteration when *couple xyz* has been specified.  For
 any other case it means no linear dimension of the simulation box can
 change by more than 1/10 of a percent.
 
-
 ----------
 
-
 With this fix, the potential energy used by the minimizer is augmented
 by an additional energy provided by the fix. The overall objective
 function then is:
 
-.. image:: Eqs/fix_box_relax1.jpg
-   :align: center
+.. math::
 
-where *U* is the system potential energy, *P*\ \_t is the desired
-hydrostatic pressure, *V* and *V*\ \_0 are the system and reference
-volumes, respectively.  *E*\ \_\ *strain* is the strain energy expression
+   E = U + P_t \left(V-V_0 \right) + E_{strain}
+
+where *U* is the system potential energy, :math:`P_t` is the desired
+hydrostatic pressure, :math:`V` and :math:`V_0` are the system and reference
+volumes, respectively.  :math:`E_{strain}` is the strain energy expression
 proposed by Parrinello and Rahman :ref:`(Parrinello1981) <Parrinello1981>`.
 Taking derivatives of *E* w.r.t. the box dimensions, and setting these
 to zero, we find that at the minimum of the objective function, the
 global system stress tensor **P** will satisfy the relation:
 
-.. image:: Eqs/fix_box_relax2.jpg
-   :align: center
+.. math::
 
-where **I** is the identity matrix, **h**\ \_0 is the box dimension tensor of
-the reference cell, and **h**\ \_0\ *d* is the diagonal part of
-**h**\ \_0. **S**\ \_\ *t* is a symmetric stress tensor that is chosen by LAMMPS
+   \mathbf P = P_t \mathbf I + {\mathbf S_t} \left( \mathbf h_0^{-1} \right)^t \mathbf h_{0d}
+
+where **I** is the identity matrix, :math:`\mathbf{h_0}` is the box
+dimension tensor of the reference cell, and ::math:`\mathbf{h_{0d}}`
+is the diagonal part of :math:`\mathbf{h_0}`. :math:`\mathbf{S_t}`
+is a symmetric stress tensor that is chosen by LAMMPS
 so that the upper-triangular components of **P** equal the stress tensor
 specified by the user.
 
@@ -283,7 +269,7 @@ from a restart file.
    Because pressure is often a very sensitive function of volume,
    it can be difficult for the minimizer to equilibrate the system the
    desired pressure with high precision, particularly for solids.  Some
-   techniques that seem to help are (a) use the "min\_modify line
+   techniques that seem to help are (a) use the "min_modify line
    quadratic" option when minimizing with box relaxations, (b) minimize
    several times in succession if need be, to drive the pressure closer
    to the target pressure, (c) relax the atom positions before relaxing
@@ -292,42 +278,37 @@ from a restart file.
    systems (e.g. liquids) will not sustain a non-hydrostatic applied
    pressure, which means the minimizer will not converge.
 
-
 ----------
 
-
 This fix computes a temperature and pressure each timestep.  The
 temperature is used to compute the kinetic contribution to the
 pressure, even though this is subsequently ignored by default.  To do
 this, the fix creates its own computes of style "temp" and "pressure",
 as if these commands had been issued:
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    compute fix-ID_temp group-ID temp
    compute fix-ID_press group-ID pressure fix-ID_temp virial
 
 See the :doc:`compute temp <compute_temp>` and :doc:`compute pressure <compute_pressure>` commands for details.  Note that the
-IDs of the new computes are the fix-ID + underscore + "temp" or fix\_ID
+IDs of the new computes are the fix-ID + underscore + "temp" or fix_ID
 + underscore + "press", and the group for the new computes is the same
 as the fix group.  Also note that the pressure compute does not
 include a kinetic component.
 
 Note that these are NOT the computes used by thermodynamic output (see
-the :doc:`thermo_style <thermo_style>` command) with ID = *thermo\_temp*
-and *thermo\_press*.  This means you can change the attributes of this
+the :doc:`thermo_style <thermo_style>` command) with ID = *thermo_temp*
+and *thermo_press*.  This means you can change the attributes of this
 fix's temperature or pressure via the
 :doc:`compute_modify <compute_modify>` command or print this temperature
 or pressure during thermodynamic output via the :doc:`thermo_style custom <thermo_style>` command using the appropriate compute-ID.
-It also means that changing attributes of *thermo\_temp* or
-*thermo\_press* will have no effect on this fix.
-
+It also means that changing attributes of *thermo_temp* or
+*thermo_press* will have no effect on this fix.
 
 ----------
 
-
-**Restart, fix\_modify, output, run start/stop, minimize info:**
+**Restart, fix_modify, output, run start/stop, minimize info:**
 
 No information about this fix is written to :doc:`binary restart files <restart>`.
 
@@ -342,7 +323,7 @@ minimization, most likely in an undesirable way.
 .. note::
 
    If both the *temp* and *press* keywords are used in a single
-   thermo\_modify command (or in two separate commands), then the order in
+   thermo_modify command (or in two separate commands), then the order in
    which the keywords are specified is important.  Note that a :doc:`pressure compute <compute_pressure>` defines its own temperature compute as
    an argument when it is specified.  The *temp* keyword will override
    this (for the pressure compute being used by fix box/relax), but only if the
@@ -362,8 +343,7 @@ result in double-counting of the fix energy in the minimization
 energy. Instead, the fix energy can be explicitly added to the
 potential energy using one of these two variants:
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    variable emin equal pe+f_1
 
@@ -380,7 +360,6 @@ described above.
 Restrictions
 """"""""""""
 
-
 Only dimensions that are available can be adjusted by this fix.
 Non-periodic dimensions are not available.  *z*\ , *xz*\ , and *yz*\ , are
 not available for 2D simulations. *xy*\ , *xz*\ , and *yz* are only
@@ -406,17 +385,8 @@ Default
 
 The keyword defaults are dilate = all, vmax = 0.0001, nreset = 0.
 
-
 ----------
 
-
 .. _Parrinello1981:
 
-
-
 **(Parrinello1981)** Parrinello and Rahman, J Appl Phys, 52, 7182 (1981).
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/fix_client_md.rst b/doc/src/fix_client_md.rst
index 01539b6d68..2e0cf84cc5 100644
--- a/doc/src/fix_client_md.rst
+++ b/doc/src/fix_client_md.rst
@@ -6,7 +6,6 @@ fix client/md command
 Syntax
 """"""
 
-
 .. parsed-literal::
 
    fix ID group-ID client/md
@@ -17,8 +16,7 @@ Syntax
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    fix 1 all client/md
 
@@ -42,7 +40,7 @@ for the interacting particles to LAMMPS, so it can complete the
 timestep.
 
 Note that the server code can be a quantum code, or another classical
-MD code which encodes a force field (pair\_style in LAMMPS lingo) which
+MD code which encodes a force field (pair_style in LAMMPS lingo) which
 LAMMPS does not have.  In the quantum case, this fix is a mechanism
 for running *ab initio* MD with quantum forces.
 
@@ -61,16 +59,14 @@ specify boundary conditions or force constraints in the usual way,
 which will be added to the per-atom forces returned by the server
 code.
 
-See the examples/message dir for example scripts where LAMMPS is both
+See the examples/message directory for example scripts where LAMMPS is both
 the "client" and/or "server" code for this kind of client/server MD
 simulation.  The examples/message/README file explains how to launch
 LAMMPS and another code in tandem to perform a coupled simulation.
 
-
 ----------
 
-
-**Restart, fix\_modify, output, run start/stop, minimize info:**
+**Restart, fix_modify, output, run start/stop, minimize info:**
 
 No information about this fix is written to :doc:`binary restart files <restart>`.
 
@@ -94,7 +90,6 @@ the :doc:`run <run>` command.  This fix is not invoked during :doc:`energy minim
 Restrictions
 """"""""""""
 
-
 This fix is part of the MESSAGE package.  It is only enabled if LAMMPS
 was built with that package.  See the :doc:`Build package <Build_package>` doc page for more info.
 
@@ -108,8 +103,3 @@ Related commands
 :doc:`message <message>`, :doc:`server <server>`
 
 **Default:** none
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/fix_cmap.rst b/doc/src/fix_cmap.rst
index 70e1dd5987..6f68d97c59 100644
--- a/doc/src/fix_cmap.rst
+++ b/doc/src/fix_cmap.rst
@@ -6,7 +6,6 @@ fix cmap command
 Syntax
 """"""
 
-
 .. parsed-literal::
 
    fix ID group-ID cmap filename
@@ -18,8 +17,7 @@ Syntax
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    fix            myCMAP all cmap ../potentials/cmap36.data
    read_data      proteinX.data fix myCMAP crossterm CMAP
@@ -46,12 +44,11 @@ specified should contain the CMAP parameters for a particular version
 of the CHARMM force field.  Two such files are including in the
 lammps/potentials directory: charmm22.cmap and charmm36.cmap.
 
-The data file read by the "read\_data" must contain the topology of all
+The data file read by the "read_data" must contain the topology of all
 the CMAP interactions, similar to the topology data for bonds, angles,
 dihedrals, etc.  Specially it should have a line like this
 in its header section:
 
-
 .. parsed-literal::
 
    N crossterms
@@ -59,7 +56,6 @@ in its header section:
 where N is the number of CMAP cross-terms.  It should also have a section
 in the body of the data file like this with N lines:
 
-
 .. parsed-literal::
 
    CMAP
@@ -75,7 +71,7 @@ interaction; it is an index into the CMAP force field file.  The
 remaining 5 columns are the atom IDs of the atoms in the two 4-atom
 dihedrals that overlap to create the CMAP 5-body interaction.  Note
 that the "crossterm" and "CMAP" keywords for the header and body
-sections match those specified in the read\_data command following the
+sections match those specified in the read_data command following the
 data file name; see the :doc:`read_data <read_data>` doc page for
 more details.
 
@@ -92,11 +88,9 @@ energy of the system, as output by the
 the note below about how to include the CMAP energy when performing an
 :doc:`energy minimization <minimize>`.
 
-
 ----------
 
-
-**Restart, fix\_modify, output, run start/stop, minimize info:**
+**Restart, fix_modify, output, run start/stop, minimize info:**
 
 This fix writes the list of CMAP cross-terms to :doc:`binary restart files <restart>`.  See the :doc:`read_restart <read_restart>` command
 for info on how to re-specify a fix in an input script that reads a
@@ -133,7 +127,6 @@ invoked by the :doc:`minimize <minimize>` command.
 Restrictions
 """"""""""""
 
-
 To function as expected this fix command must be issued *before* a
 :doc:`read_data <read_data>` command but *after* a
 :doc:`read_restart <read_restart>` command.
@@ -149,24 +142,13 @@ Related commands
 
 **Default:** none
 
-
 ----------
 
-
 .. _Buck:
 
-
-
 **(Buck)** Buck, Bouguet-Bonnet, Pastor, MacKerell Jr., Biophys J, 90, L36
 (2006).
 
 .. _Brooks2:
 
-
-
 **(Brooks)** Brooks, Brooks, MacKerell Jr., J Comput Chem, 30, 1545 (2009).
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/fix_colvars.rst b/doc/src/fix_colvars.rst
index eac0e21d76..20315624d6 100644
--- a/doc/src/fix_colvars.rst
+++ b/doc/src/fix_colvars.rst
@@ -6,7 +6,6 @@ fix colvars command
 Syntax
 """"""
 
-
 .. parsed-literal::
 
    fix ID group-ID colvars configfile keyword values ...
@@ -15,9 +14,9 @@ Syntax
 * colvars = style name of this fix command
 * configfile = the configuration file for the colvars module
 * keyword = *input* or *output* or *seed* or *tstat*
-  
+
   .. parsed-literal::
-  
+
        *input* arg = colvars.state file name or prefix or NULL (default: NULL)
        *output* arg = output filename prefix (default: out)
        *seed* arg = seed for random number generator (default: 1966)
@@ -25,13 +24,10 @@ Syntax
          use unwrapped coordinates in collective variables (default: yes)
        *tstat* arg = fix id of a thermostat or NULL (default: NULL)
 
-
-
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    fix mtd all colvars peptide.colvars.inp seed 2122 input peptide.colvars.state output peptide
    fix abf all colvars colvars.inp tstat 1
@@ -56,10 +52,8 @@ A detailed discussion of its implementation is in :ref:`(Fiorin) <Fiorin>`.
 There are some example scripts for using this package with LAMMPS in the
 examples/USER/colvars directory.
 
-
 ----------
 
-
 The only mandatory argument to the fix is the filename to the colvars
 input file that contains the input that is independent from the MD
 program in which the colvars library has been integrated.
@@ -96,7 +90,7 @@ fix that thermostats all atoms in the fix colvars group. This will be
 used to provide the colvars module with the current thermostat target
 temperature.
 
-**Restart, fix\_modify, output, run start/stop, minimize info:**
+**Restart, fix_modify, output, run start/stop, minimize info:**
 
 This fix writes the current status of the colvars module into
 :doc:`binary restart files <restart>`. This is in addition to the text
@@ -107,12 +101,12 @@ The :doc:`fix_modify <fix_modify>` *energy* option is supported by this
 fix to add the energy change from the biasing force added by the fix
 to the system's potential energy as part of :doc:`thermodynamic output <thermo_style>`.
 
-The *fix\_modify configfile <config file>* option allows to add settings
+The *fix_modify configfile <config file>* option allows to add settings
 from an additional config file to the colvars module. This option can
 only be used, after the system has been initialized with a :doc:`run <run>`
 command.
 
-The *fix\_modify config <quoted string>* option allows to add settings
+The *fix_modify config <quoted string>* option allows to add settings
 from inline strings. Those have to fit on a single line when enclosed
 in a pair of double quotes ("), or can span multiple lines when bracketed
 by a pair of triple double quotes (""", like python embedded documentation).
@@ -125,7 +119,6 @@ fix is "extensive".
 Restrictions
 """"""""""""
 
-
 This fix is part of the USER-COLVARS package.  It is only enabled if
 LAMMPS was built with that package.  See the :doc:`Build package <Build_package>` doc page for more info.
 
@@ -146,17 +139,8 @@ Default
 The default options are input = NULL, output = out, seed = 1966, unwrap yes,
 and tstat = NULL.
 
-
 ----------
 
-
 .. _Fiorin:
 
-
-
 **(Fiorin)** Fiorin, Klein, Henin, Mol. Phys., DOI:10.1080/00268976.2013.813594
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/fix_controller.rst b/doc/src/fix_controller.rst
index 55be294df8..2fd5f17c95 100644
--- a/doc/src/fix_controller.rst
+++ b/doc/src/fix_controller.rst
@@ -6,7 +6,6 @@ fix controller command
 Syntax
 """"""
 
-
 .. parsed-literal::
 
    fix ID group-ID controller Nevery alpha Kp Ki Kd pvar setpoint cvar
@@ -18,10 +17,10 @@ Syntax
 * Kp = proportional gain in PID equation (unitless)
 * Ki = integral gain in PID equation (unitless)
 * Kd = derivative gain in PID equation (unitless)
-* pvar = process variable of form c\_ID, c\_ID[I], f\_ID, f\_ID[I], or v\_name
-  
+* pvar = process variable of form c_ID, c_ID[I], f_ID, f_ID[I], or v_name
+
   .. parsed-literal::
-  
+
        c_ID = global scalar calculated by a compute with ID
        c_ID[I] = Ith component of global vector calculated by a compute with ID
        f_ID = global scalar calculated by a fix with ID
@@ -31,12 +30,10 @@ Syntax
 * setpoint = desired value of process variable (same units as process variable)
 * cvar = name of control variable
 
-
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    fix 1 all controller 100 1.0 0.5 0.0 0.0 c_thermo_temp 1.5 tcontrol
    fix 1 all controller 100 0.2 0.5 0 100.0 v_pxxwall 1.01325 xwall
@@ -97,43 +94,48 @@ The PID controller is invoked once each *Nevery* timesteps.
 The PID controller is implemented as a discretized version of
 the following dynamic equation:
 
-.. image:: Eqs/fix_controller1.jpg
-   :align: center
+.. math::
+
+   \frac{dc}{dt}  = \hat{E} -\alpha (K_p e + K_i \int_0^t e \, dt + K_d \frac{de}{dt} )
 
 where *c* is the continuous time analog of the control variable,
 *e* =\ *pvar*\ -\ *setpoint* is the error in the process variable, and
-*alpha*\ , *Kp*\ , *Ki*\ , and *Kd* are constants set by the corresponding
+:math:`\alpha`, :math:`K_p`, :math:`K_i` , and :math:`K_d` are constants
+set by the corresponding
 keywords described above. The discretized version of this equation is:
 
-.. image:: Eqs/fix_controller2.jpg
-   :align: center
+.. math::
 
-where *tau* = *Nevery* \* *timestep* is the time interval between updates,
+   c_n  = \hat{E} c_{n-1} -\alpha \left( K_p \tau e_n + K_i \tau^2 \sum_{i=1}^n e_i + K_d (e_n - e_{n-1}) \right)
+
+where :math:`\tau = \mathtt{Nevery} \cdot \mathtt{timestep}` is the time
+interval between updates,
 and the subscripted variables indicate the values of *c* and *e* at
 successive updates.
 
 From the first equation, it is clear that if the three gain values
-*Kp*\ , *Ki*\ , *Kd* are dimensionless constants, then *alpha* must have
+:math:`K_p`, :math:`K_i`, :math:`K_d` are dimensionless constants,
+then :math:`\alpha` must have
 units of [unit *cvar*\ ]/[unit *pvar*\ ]/[unit time] e.g. [ eV/K/ps
 ]. The advantage of this unit scheme is that the value of the
 constants should be invariant under a change of either the MD timestep
 size or the value of *Nevery*\ . Similarly, if the LAMMPS :doc:`unit style <units>` is changed, it should only be necessary to change
-the value of *alpha* to reflect this, while leaving *Kp*\ , *Ki*\ , and
-*Kd* unaltered.
+the value of :math:`\alpha` to reflect this, while leaving :math:`K_p`,
+:math:`K_i`, and :math:`K_d` unaltered.
 
 When choosing the values of the four constants, it is best to first
-pick a value and sign for *alpha* that is consistent with the
-magnitudes and signs of *pvar* and *cvar*\ .  The magnitude of *Kp*
-should then be tested over a large positive range keeping *Ki* = *Kd* =0.
-A good value for *Kp* will produce a fast response in *pvar*\ , without
-overshooting the *setpoint*\ .  For many applications, proportional
-feedback is sufficient, and so *Ki* = *Kd* =0 can be used. In cases where
-there is a substantial lag time in the response of *pvar* to a change
-in *cvar*\ , this can be counteracted by increasing *Kd*\ . In situations
+pick a value and sign for :math:`\alpha` that is consistent with the
+magnitudes and signs of *pvar* and *cvar*\ .  The magnitude of :math:`K_p`
+should then be tested over a large positive range keeping :math:`K_i = K_d =0`.
+A good value for :math:`K_p` will produce a fast response in *pvar*\ ,
+without overshooting the *setpoint*\ .  For many applications, proportional
+feedback is sufficient, and so :math:`K_i` = K_d =0` can be used. In cases
+where there is a substantial lag time in the response of *pvar* to a change
+in *cvar*\ , this can be counteracted by increasing :math:`K_d`. In situations
 where *pvar* plateaus without reaching *setpoint*\ , this can be
-counteracted by increasing *Ki*\ .  In the language of Charles Dickens,
-*Kp* represents the error of the present, *Ki* the error of the past,
-and *Kd* the error yet to come.
+counteracted by increasing :math:`K_i`.  In the language of Charles Dickens,
+:math:`K_p` represents the error of the present, :math:`K_i` the error of
+the past, and :math:`K_d` the error yet to come.
 
 Because this fix updates *cvar*\ , but does not initialize its value,
 the initial value is that assigned by the user in the input script via
@@ -141,12 +143,10 @@ the :doc:`internal-style variable <variable>` command.  This value is
 used (by the other LAMMPS command that used the variable) until this
 fix performs its first update of *cvar* after *Nevery* timesteps.  On
 the first update, the value of the derivative term is set to zero,
-because the value of *e\_n-1* is not yet defined.
-
+because the value of :math:`e_n-1` is not yet defined.
 
 ----------
 
-
 The process variable *pvar* can be specified as the output of a
 :doc:`compute <compute>` or :doc:`fix <fix>` or the evaluation of a
 :doc:`variable <variable>`.  In each case, the compute, fix, or variable
@@ -188,11 +188,9 @@ variable.  It must be an internal-style variable, because this fix
 updates its value directly.  Note that other commands can use an
 equal-style versus internal-style variable interchangeably.
 
-
 ----------
 
-
-**Restart, fix\_modify, output, run start/stop, minimize info:**
+**Restart, fix_modify, output, run start/stop, minimize info:**
 
 Currently, no information about this fix is written to :doc:`binary restart files <restart>`.  None of the :doc:`fix_modify <fix_modify>` options
 are relevant to this fix.
@@ -224,8 +222,3 @@ Related commands
 :doc:`fix adapt <fix_adapt>`
 
 **Default:** none
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/fix_deform.rst b/doc/src/fix_deform.rst
index fe1b0925d6..75fc6cc5c9 100644
--- a/doc/src/fix_deform.rst
+++ b/doc/src/fix_deform.rst
@@ -9,7 +9,6 @@ fix deform/kk command
 Syntax
 """"""
 
-
 .. parsed-literal::
 
    fix ID group-ID deform N parameter args ... keyword value ...
@@ -18,9 +17,9 @@ Syntax
 * deform = style name of this fix command
 * N = perform box deformation every this many timesteps
 * one or more parameter/arg pairs may be appended
-  
+
   .. parsed-literal::
-  
+
      parameter = *x* or *y* or *z* or *xy* or *xz* or *yz*
        *x*\ , *y*\ , *z* args = style value(s)
          style = *final* or *delta* or *scale* or *vel* or *erate* or *trate* or *volume* or *wiggle* or *variable*
@@ -66,9 +65,9 @@ Syntax
 
 * zero or more keyword/value pairs may be appended
 * keyword = *remap* or *flip* or *units*
-  
+
   .. parsed-literal::
-  
+
        *remap* value = *x* or *v* or *none*
          x = remap coords of atoms in group into deforming box
          v = remap velocities of all atoms when they cross periodic boundaries
@@ -79,13 +78,10 @@ Syntax
          lattice = distances are defined in lattice units
          box = distances are defined in simulation box units
 
-
-
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    fix 1 all deform 1 x final 0.0 9.0 z final 0.0 5.0 units box
    fix 1 all deform 1 x trate 0.1 y volume z volume
@@ -129,10 +125,8 @@ command.  Every Nth timestep during the run, the simulation box is
 expanded, contracted, or tilted to ramped values between the initial
 and final values.
 
-
 ----------
 
-
 For the *x*\ , *y*\ , and *z* parameters, this is the meaning of their
 styles and values.
 
@@ -173,7 +167,6 @@ is defined as delta/L0, where L0 is the original box length and delta
 is the change relative to the original length.  The box length L as a
 function of time will change as
 
-
 .. parsed-literal::
 
    L(t) = L0 (1 + erate\*dt)
@@ -201,7 +194,6 @@ is the change relative to the original length.
 
 The box length L as a function of time will change as
 
-
 .. parsed-literal::
 
    L(t) = L0 exp(trate\*dt)
@@ -254,7 +246,6 @@ The *wiggle* style oscillates the specified box length dimension
 sinusoidally with the specified amplitude and period.  I.e. the box
 length L as a function of time is given by
 
-
 .. parsed-literal::
 
    L(t) = L0 + A sin(2\*pi t/Tp)
@@ -289,23 +280,20 @@ Here is an example of using the *variable* style to perform the same
 box deformation as the *wiggle* style formula listed above, where we
 assume that the current timestep = 0.
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    variable A equal 5.0
    variable Tp equal 10.0
-   variable displace equal "v_A \* sin(2\*PI \* step\*dt/v_Tp)"
-   variable rate equal "2\*PI\*v_A/v_Tp \* cos(2\*PI \* step\*dt/v_Tp)"
+   variable displace equal "v_A * sin(2*PI * step*dt/v_Tp)"
+   variable rate equal "2*PI*v_A/v_Tp * cos(2*PI * step*dt/v_Tp)"
    fix 2 all deform 1 x variable v_displace v_rate remap v
 
 For the *scale*\ , *vel*\ , *erate*\ , *trate*\ , *volume*\ , *wiggle*\ , and
 *variable* styles, the box length is expanded or compressed around its
 mid point.
 
-
 ----------
 
-
 For the *xy*\ , *xz*\ , and *yz* parameters, this is the meaning of their
 styles and values.  Note that changing the tilt factors of a triclinic
 box does not change its volume.
@@ -345,7 +333,6 @@ direction for xy deformation) from the unstrained orientation.
 
 The tilt factor T as a function of time will change as
 
-
 .. parsed-literal::
 
    T(t) = T0 + L0\*erate\*dt
@@ -378,7 +365,6 @@ from the unstrained orientation.
 
 The tilt factor T as a function of time will change as
 
-
 .. parsed-literal::
 
    T(t) = T0 exp(trate\*dt)
@@ -406,7 +392,6 @@ The *wiggle* style oscillates the specified tilt factor sinusoidally
 with the specified amplitude and period.  I.e. the tilt factor T as a
 function of time is given by
 
-
 .. parsed-literal::
 
    T(t) = T0 + A sin(2\*pi t/Tp)
@@ -440,19 +425,16 @@ Here is an example of using the *variable* style to perform the same
 box deformation as the *wiggle* style formula listed above, where we
 assume that the current timestep = 0.
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    variable A equal 5.0
    variable Tp equal 10.0
-   variable displace equal "v_A \* sin(2\*PI \* step\*dt/v_Tp)"
-   variable rate equal "2\*PI\*v_A/v_Tp \* cos(2\*PI \* step\*dt/v_Tp)"
+   variable displace equal "v_A * sin(2*PI * step*dt/v_Tp)"
+   variable rate equal "2*PI*v_A/v_Tp * cos(2*PI * step*dt/v_Tp)"
    fix 2 all deform 1 xy variable v_displace v_rate remap v
 
-
 ----------
 
-
 All of the tilt styles change the xy, xz, yz tilt factors during a
 simulation.  In LAMMPS, tilt factors (xy,xz,yz) for triclinic boxes
 are normally bounded by half the distance of the parallel box length.
@@ -488,10 +470,8 @@ does not change the atom positions due to non-periodicity.  In this
 mode, if you tilt the system to extreme angles, the simulation will
 simply become inefficient due to the highly skewed simulation box.
 
-
 ----------
 
-
 Each time the box size or shape is changed, the *remap* keyword
 determines whether atom positions are remapped to the new box.  If
 *remap* is set to *x* (the default), atoms in the fix group are
@@ -581,10 +561,8 @@ does not affect the *variable* style.  You should use the *xlat*\ ,
 *ylat*\ , *zlat* keywords of the :doc:`thermo_style <thermo_style>`
 command if you want to include lattice spacings in a variable formula.
 
-
 ----------
 
-
 Styles with a *gpu*\ , *intel*\ , *kk*\ , *omp*\ , or *opt* suffix are
 functionally the same as the corresponding style without the suffix.
 They have been optimized to run faster, depending on your available
@@ -603,7 +581,7 @@ by including their suffix, or you can use the :doc:`-suffix command-line switch
 See the :doc:`Speed packages <Speed_packages>` doc page for more
 instructions on how to use the accelerated styles effectively.
 
-**Restart, fix\_modify, output, run start/stop, minimize info:**
+**Restart, fix_modify, output, run start/stop, minimize info:**
 
 This fix will restore the initial box settings from :doc:`binary restart files <restart>`, which allows the fix to be properly continue
 deformation, when using the start/stop options of the :doc:`run <run>`
@@ -620,7 +598,6 @@ This fix is not invoked during :doc:`energy minimization <minimize>`.
 Restrictions
 """"""""""""
 
-
 You cannot apply x, y, or z deformations to a dimension that is
 shrink-wrapped via the :doc:`boundary <boundary>` command.
 
@@ -636,8 +613,3 @@ Default
 """""""
 
 The option defaults are remap = x, flip = yes, and units = lattice.
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/fix_deposit.rst b/doc/src/fix_deposit.rst
index c076d80ed4..31df74ce9b 100644
--- a/doc/src/fix_deposit.rst
+++ b/doc/src/fix_deposit.rst
@@ -6,7 +6,6 @@ fix deposit command
 Syntax
 """"""
 
-
 .. parsed-literal::
 
    fix ID group-ID deposit N type M seed keyword values ...
@@ -19,9 +18,9 @@ Syntax
 * seed = random # seed (positive integer)
 * one or more keyword/value pairs may be appended to args
 * keyword = *region* or *id* or *global* or *local* or *near* or *gaussian* or *attempt* or *rate* or *vx* or *vy* or *vz* or *mol* or *rigid* or *shake* or *units*
-  
+
   .. parsed-literal::
-  
+
        *region* value = region-ID
          region-ID = ID of region to use as insertion volume
        *id* value = *max* or *next*
@@ -63,13 +62,10 @@ Syntax
          lattice = the geometry is defined in lattice units
          box = the geometry is defined in simulation box units
 
-
-
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    fix 3 all deposit 1000 2 100 29494 region myblock local 1.0 1.0 1.0 units box
    fix 2 newatoms deposit 10000 1 500 12345 region disk near 2.0 vz -1.0 -0.8
@@ -167,7 +163,7 @@ command which also appears in your input script.
    If you wish the new rigid molecules (and other rigid molecules)
    to be thermostatted correctly via :doc:`fix rigid/small/nvt <fix_rigid>`
    or :doc:`fix rigid/small/npt <fix_rigid>`, then you need to use the
-   "fix\_modify dynamic/dof yes" command for the rigid fix.  This is to
+   "fix_modify dynamic/dof yes" command for the rigid fix.  This is to
    inform that fix that the molecule count will vary dynamically.
 
 If you wish to insert molecules via the *mol* keyword, that will have
@@ -275,7 +271,7 @@ units of distance or velocity.
    the :doc:`compute_modify dynamic yes <compute_modify>` command for the
    temperature compute you are using.
 
-**Restart, fix\_modify, output, run start/stop, minimize info:**
+**Restart, fix_modify, output, run start/stop, minimize info:**
 
 This fix writes the state of the deposition to :doc:`binary restart files <restart>`.  This includes information about how many
 particles have been deposited, the random number generator seed, the
@@ -299,7 +295,6 @@ of this fix can be used with the *start/stop* keywords of the
 Restrictions
 """"""""""""
 
-
 This fix is part of the MISC package.  It is only enabled if LAMMPS
 was built with that package.  See the :doc:`Build package <Build_package>` doc page for more info.
 
@@ -320,8 +315,3 @@ is an equal probabilities for all molecules in the template.
 Additional option defaults are id = max, delta = 0.0, near = 0.0,
 attempt = 10, rate = 0.0, vx = 0.0 0.0, vy = 0.0 0.0, vz = 0.0 0.0,
 and units = lattice.
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/fix_dpd_energy.rst b/doc/src/fix_dpd_energy.rst
index 09fc23ac66..0eeb8f9478 100644
--- a/doc/src/fix_dpd_energy.rst
+++ b/doc/src/fix_dpd_energy.rst
@@ -9,7 +9,6 @@ fix dpd/energy/kk command
 Syntax
 """"""
 
-
 .. parsed-literal::
 
    fix ID group-ID dpd/energy
@@ -20,8 +19,7 @@ Syntax
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    fix 1 all dpd/energy
 
@@ -43,16 +41,14 @@ This fix must be used with the :doc:`pair_style dpd/fdt/energy <pair_style>` com
 
 Note that numerous variants of DPD can be specified by choosing an
 appropriate combination of the integrator and :doc:`pair_style dpd/fdt/energy <pair_style>` command.  DPD under isoenergetic conditions
-can be specified by using fix *dpd/energy*\ , fix *nve* and pair\_style
+can be specified by using fix *dpd/energy*\ , fix *nve* and pair_style
 *dpd/fdt/energy*\ .  DPD under isoenthalpic conditions can
-be specified by using fix *dpd/energy*\ , fix *nph* and pair\_style
+be specified by using fix *dpd/energy*\ , fix *nph* and pair_style
 *dpd/fdt/energy*\ .  Examples of each DPD variant are provided in the
 examples/USER/dpd directory.
 
-
 ----------
 
-
 Styles with a *gpu*\ , *intel*\ , *kk*\ , *omp*\ , or *opt* suffix are
 functionally the same as the corresponding style without the suffix.
 They have been optimized to run faster, depending on your available
@@ -71,14 +67,11 @@ by including their suffix, or you can use the :doc:`-suffix command-line switch
 See the :doc:`Speed packages <Speed_packages>` doc page for more
 instructions on how to use the accelerated styles effectively.
 
-
 ----------
 
-
 Restrictions
 """"""""""""
 
-
 This command is part of the USER-DPD package.  It is only enabled if
 LAMMPS was built with that package.  See the :doc:`Build package <Build_package>` doc page for more info.
 
@@ -99,14 +92,10 @@ Related commands
 
 **Default:** none
 
-
 ----------
 
-
 .. _Lisal1:
 
-
-
 **(Lisal)** M. Lisal, J.K. Brennan, J. Bonet Avalos, "Dissipative
 particle dynamics at isothermal, isobaric, isoenergetic, and
 isoenthalpic conditions using Shardlow-like splitting algorithms.",
@@ -114,14 +103,7 @@ J. Chem. Phys., 135, 204105 (2011).
 
 .. _Larentzos3:
 
-
-
 **(Larentzos)** J.P. Larentzos, J.K. Brennan, J.D. Moore, and
 W.D. Mattson, "LAMMPS Implementation of Constant Energy Dissipative
 Particle Dynamics (DPD-E)", ARL-TR-6863, U.S. Army Research
 Laboratory, Aberdeen Proving Ground, MD (2014).
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/fix_dpd_source.rst b/doc/src/fix_dpd_source.rst
index d23fbff1c9..5ea1c85fb4 100644
--- a/doc/src/fix_dpd_source.rst
+++ b/doc/src/fix_dpd_source.rst
@@ -9,7 +9,6 @@ fix tdpd/source command
 Syntax
 """"""
 
-
 .. parsed-literal::
 
    fix ID group-ID edpd/source keyword values ...
@@ -19,9 +18,9 @@ Syntax
 * edpd/source or tdpd/source = style name of this fix command
 * index (only specified for tdpd/source) = index of chemical species (1 to Nspecies)
 * keyword = *sphere* or *cuboid*
-  
+
   .. parsed-literal::
-  
+
        *sphere* values = cx,cy,cz,radius,source
          cx,cy,cz = x,y,z center of spherical domain (distance units)
          radius = radius of a spherical domain (distance units)
@@ -31,13 +30,10 @@ Syntax
          dLx,dLy,dLz = x,y,z side length of a cuboid domain (distance units)
          source = heat source or concentration source (flux units, see below)
 
-
-
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    fix 1 all edpd/source sphere 0.0 0.0 0.0 5.0 0.01
    fix 1 all edpd/source cuboid 0.0 0.0 0.0 20.0 10.0 10.0 -0.01
@@ -66,11 +62,9 @@ spherical domain to apply the source flux to.
 If the *cuboid* keyword is used, the *cx,cy,cz,dLx,dLy,dLz* defines a
 cuboid domain to apply the source flux to.
 
-
 ----------
 
-
-**Restart, fix\_modify, output, run start/stop, minimize info:**
+**Restart, fix_modify, output, run start/stop, minimize info:**
 
 No information about this fix is written to :doc:`binary restart files <restart>`.  None of the :doc:`fix_modify <fix_modify>` options
 are relevant to this fix.  No global or per-atom quantities are stored
@@ -81,29 +75,24 @@ the :doc:`run <run>` command.  This fix is not invoked during :doc:`energy minim
 Restrictions
 """"""""""""
 
-
-This fix is part of the USER-MESO package. It is only enabled if
+This fix is part of the USER-MESODPD package. It is only enabled if
 LAMMPS was built with that package. See the :doc:`Build package <Build_package>` doc page for more info.
 
-Fix *edpd/source* must be used with the :doc:`pair_style edpd <pair_meso>` command.  Fix *tdpd/source* must be used with the
-:doc:`pair_style tdpd <pair_meso>` command.
+Fix *edpd/source* must be used with the :doc:`pair_style edpd <pair_mesodpd>` command.  Fix *tdpd/source* must be used with the
+:doc:`pair_style tdpd <pair_mesodpd>` command.
 
 Related commands
 """"""""""""""""
 
-:doc:`pair_style edpd <pair_meso>`, :doc:`pair_style tdpd <pair_meso>`,
+:doc:`pair_style edpd <pair_mesodpd>`, :doc:`pair_style tdpd <pair_mesodpd>`,
 :doc:`compute edpd/temp/atom <compute_edpd_temp_atom>`, :doc:`compute tdpd/cc/atom <compute_tdpd_cc_atom>`
 
 **Default:** none
 
-
 ----------
 
-
 .. _Li2014b:
 
-
-
 **(Li2014)** Z. Li, Y.-H. Tang, H. Lei, B. Caswell and G.E. Karniadakis,
 "Energy-conserving dissipative particle dynamics with
 temperature-dependent properties", J. Comput. Phys., 265: 113-127
@@ -111,14 +100,7 @@ temperature-dependent properties", J. Comput. Phys., 265: 113-127
 
 .. _Li2015b:
 
-
-
 **(Li2015)** Z. Li, A. Yazdani, A. Tartakovsky and G.E. Karniadakis,
 "Transport dissipative particle dynamics model for mesoscopic
 advection-diffusion-reaction problems", J. Chem. Phys., 143: 014101
 (2015).  DOI: 10.1063/1.4923254
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/fix_drag.rst b/doc/src/fix_drag.rst
index bc1476301a..792d4725cc 100644
--- a/doc/src/fix_drag.rst
+++ b/doc/src/fix_drag.rst
@@ -6,7 +6,6 @@ fix drag command
 Syntax
 """"""
 
-
 .. parsed-literal::
 
    fix ID group-ID drag x y z fmag delta
@@ -20,8 +19,7 @@ Syntax
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    fix center small-molecule drag 0.0 10.0 0.0 5.0 2.0
 
@@ -40,7 +38,7 @@ application.
 This command can be used to steer one or more atoms to a new location
 in the simulation.
 
-**Restart, fix\_modify, output, run start/stop, minimize info:**
+**Restart, fix_modify, output, run start/stop, minimize info:**
 
 No information about this fix is written to :doc:`binary restart files <restart>`.
 
@@ -67,8 +65,3 @@ Related commands
 :doc:`fix spring/rg <fix_spring_rg>`, :doc:`fix smd <fix_smd>`
 
 **Default:** none
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/fix_drude.rst b/doc/src/fix_drude.rst
index d58d1c6d6a..db13d8d052 100644
--- a/doc/src/fix_drude.rst
+++ b/doc/src/fix_drude.rst
@@ -6,7 +6,6 @@ fix drude command
 Syntax
 """"""
 
-
 .. parsed-literal::
 
    fix ID group-ID drude flag1 flag2 ... flagN
@@ -18,8 +17,7 @@ Syntax
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    fix 1 all drude 1 1 0 1 0 2 2 2
    fix 1 all drude C C N C N D D D
@@ -42,7 +40,6 @@ or capital letter (N,C,D):
 Restrictions
 """"""""""""
 
-
 This fix should be invoked before any other commands that implement
 the Drude oscillator model, such as :doc:`fix langevin/drude <fix_langevin_drude>`, :doc:`fix drude/transform <fix_drude_transform>`, :doc:`compute temp/drude <compute_temp_drude>`, :doc:`pair_style thole <pair_thole>`.
 
@@ -52,8 +49,3 @@ Related commands
 :doc:`fix langevin/drude <fix_langevin_drude>`, :doc:`fix drude/transform <fix_drude_transform>`, :doc:`compute temp/drude <compute_temp_drude>`, :doc:`pair_style thole <pair_thole>`
 
 **Default:** None
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/fix_drude_transform.rst b/doc/src/fix_drude_transform.rst
index f54fce6a43..607c161572 100644
--- a/doc/src/fix_drude_transform.rst
+++ b/doc/src/fix_drude_transform.rst
@@ -9,7 +9,6 @@ fix drude/transform/inverse command
 Syntax
 """"""
 
-
 .. parsed-literal::
 
    fix ID group-ID style keyword value ...
@@ -20,8 +19,7 @@ Syntax
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    fix 3 all drude/transform/direct
    fix 1 all drude/transform/inverse
@@ -54,63 +52,57 @@ Masses:
 
 .. math::
 
-   \begin{equation} M' = M + m \end{equation}
-
+    M' = M + m
 
 .. math::
 
-   \begin{equation} m' = \frac {M\, m } {M'} \end{equation}
+    m' = \frac {M\, m } {M'}
 
 Positions:
 
 .. math::
 
-   \begin{equation} X' = \frac {M\, X + m\, x} {M'}\end{equation}
-
+    X' = \frac {M\, X + m\, x} {M'}
 
 .. math::
 
-   \begin{equation} x' = x - X \end{equation}
+    x' = x - X
 
 Velocities:
 
 .. math::
 
-   \begin{equation} V' = \frac {M\, V + m\, v} {M'}\end{equation}
-
+    V' = \frac {M\, V + m\, v} {M'}
 
 .. math::
 
-   \begin{equation} v' = v - V \end{equation}
+    v' = v - V
 
 Forces:
 
 .. math::
 
-   \begin{equation} F' = F + f \end{equation}
-
+    F' = F + f
 
 .. math::
 
-   \begin{equation} f' = \frac { M\, f - m\, F} {M'}\end{equation}
+    f' = \frac { M\, f - m\, F} {M'}
 
 This transform conserves the total kinetic energy
 
 .. math::
 
-   \begin{equation} \frac 1 2 \, (M\, V^2\ + m\, v^2)
-   = \frac 1 2 \, (M'\, V'^2\ + m'\, v'^2) \end{equation}
+    \frac 1 2 \, (M\, V^2\ + m\, v^2)
+   = \frac 1 2 \, (M'\, V'^2\ + m'\, v'^2)
 
 and the virial defined with absolute positions
 
 .. math::
 
-   \begin{equation} X\, F + x\, f = X'\, F' + x'\, f' \end{equation}
-
+    X\, F + x\, f = X'\, F' + x'\, f'
 
 ----------
 
-
 This fix requires each atom know whether it is a Drude particle or
 not.  You must therefore use the :doc:`fix drude <fix_drude>` command to
 specify the Drude status of each atom type.
@@ -123,10 +115,8 @@ specify the Drude status of each atom type.
    electrons or non-polarizable atoms in the group. The non-polarizable
    atoms will simply not be transformed.
 
-
 ----------
 
-
 This fix does NOT perform time integration. It only transform masses,
 coordinates, velocities and forces. Thus you must use separate time
 integration fixes, like :doc:`fix nve <fix_nve>` or :doc:`fix npt <fix_nh>` to actually update the velocities and positions of
@@ -142,8 +132,7 @@ acting on two distinct groups.
 
 Example:
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    fix fDIRECT all drude/transform/direct
    fix fNVT gCORES nvt temp 300.0 300.0 100
@@ -162,14 +151,13 @@ relative coordinates, are calculated using :doc:`compute temp/drude <compute_tem
 In addition, if you want to use a barostat to simulate a system at
 constant pressure, only one of the Nose-Hoover fixes must be *npt*\ ,
 the other one should be *nvt*\ . You must add a *compute temp/com* and a
-*fix\_modify* command so that the temperature of the *npt* fix be just
+*fix_modify* command so that the temperature of the *npt* fix be just
 that of its group (the Drude cores) but the pressure be the overall
-pressure *thermo\_press*.
+pressure *thermo_press*.
 
 Example:
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    compute cTEMP_CORE gCORES temp/com
    fix fDIRECT all drude/transform/direct
@@ -188,16 +176,13 @@ In order to avoid the flying ice cube problem (irreversible transfer
 of linear momentum to the center of mass of the system), you may need
 to add a *fix momentum* command:
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    fix fMOMENTUM all momentum 100 linear 1 1 1
 
-
 ----------
 
-
-**Restart, fix\_modify, output, run start/stop, minimize info:**
+**Restart, fix_modify, output, run start/stop, minimize info:**
 
 No information about this fix is written to :doc:`binary restart files <restart>`.
 
@@ -215,17 +200,8 @@ Related commands
 
 **Default:** none
 
-
 ----------
 
-
 .. _Lamoureux1:
 
-
-
 **(Lamoureux)** Lamoureux and Roux, J Chem Phys, 119, 3025-3039 (2003).
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/fix_dt_reset.rst b/doc/src/fix_dt_reset.rst
index ba34dee50b..861134f745 100644
--- a/doc/src/fix_dt_reset.rst
+++ b/doc/src/fix_dt_reset.rst
@@ -6,7 +6,6 @@ fix dt/reset command
 Syntax
 """"""
 
-
 .. parsed-literal::
 
    fix ID group-ID dt/reset N Tmin Tmax Xmax keyword values ...
@@ -20,7 +19,6 @@ Syntax
 * zero or more keyword/value pairs may be appended
 * keyword = *emax* or *units*
 
-
 .. parsed-literal::
 
      *emax* value = Emax
@@ -32,8 +30,7 @@ Syntax
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    fix 5 all dt/reset 10 1.0e-5 0.01 0.1
    fix 5 all dt/reset 10 0.01 2.0 0.2 units box
@@ -83,7 +80,7 @@ Note that the cumulative simulation time (in time units), which
 accounts for changes in the timestep size as a simulation proceeds,
 can be accessed by the :doc:`thermo_style time <thermo_style>` keyword.
 
-**Restart, fix\_modify, output, run start/stop, minimize info:**
+**Restart, fix_modify, output, run start/stop, minimize info:**
 
 No information about this fix is written to :doc:`binary restart files <restart>`.  None of the :doc:`fix_modify <fix_modify>` options
 are relevant to this fix.
@@ -111,8 +108,3 @@ Default
 
 The option defaults are units = lattice, and no emax kinetic energy
 limit.
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/fix_efield.rst b/doc/src/fix_efield.rst
index faf4d9c81a..0410803c13 100644
--- a/doc/src/fix_efield.rst
+++ b/doc/src/fix_efield.rst
@@ -6,7 +6,6 @@ fix efield command
 Syntax
 """"""
 
-
 .. parsed-literal::
 
    fix ID group-ID efield ex ey ez keyword value ...
@@ -17,21 +16,18 @@ Syntax
 * any of ex,ey,ez can be a variable (see below)
 * zero or more keyword/value pairs may be appended to args
 * keyword = *region* or *energy*
-  
+
   .. parsed-literal::
-  
+
        *region* value = region-ID
          region-ID = ID of region atoms must be in to have added force
        *energy* value = v_name
          v_name = variable with name that calculates the potential energy of each atom in the added E-field
 
-
-
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    fix kick external-field efield 1.0 0.0 0.0
    fix kick external-field efield 0.0 0.0 v_oscillate
@@ -47,7 +43,7 @@ external electric field.
 For charges, any of the 3 quantities defining the E-field components
 can be specified as an equal-style or atom-style
 :doc:`variable <variable>`, namely *ex*\ , *ey*\ , *ez*\ .  If the value is a
-variable, it should be specified as v\_name, where name is the variable
+variable, it should be specified as v_name, where name is the variable
 name.  In this case, the variable will be evaluated each timestep, and
 its value used to determine the E-field component.
 
@@ -71,10 +67,8 @@ If the *region* keyword is used, the atom must also be in the
 specified geometric :doc:`region <region>` in order to have force added
 to it.
 
-
 ----------
 
-
 Adding a force or torque to atoms implies a change in their potential
 energy as they move or rotate due to the applied E-field.
 
@@ -107,7 +101,7 @@ minimize the orientation of dipoles in an applied electric field.
 The *energy* keyword specifies the name of an atom-style
 :doc:`variable <variable>` which is used to compute the energy of each
 atom as function of its position.  Like variables used for *ex*\ , *ey*\ ,
-*ez*\ , the energy variable is specified as v\_name, where name is the
+*ez*\ , the energy variable is specified as v_name, where name is the
 variable name.
 
 Note that when the *energy* keyword is used during an energy
@@ -118,11 +112,9 @@ due to the electric field were a spring-like F = kx, then the energy
 formula should be E = -0.5kx\^2.  If you don't do this correctly, the
 minimization will not converge properly.
 
-
 ----------
 
-
-**Restart, fix\_modify, output, run start/stop, minimize info:**
+**Restart, fix_modify, output, run start/stop, minimize info:**
 
 No information about this fix is written to :doc:`binary restart files <restart>`.
 
@@ -169,7 +161,6 @@ the iteration count during the minimization.
 Restrictions
 """"""""""""
 
-
 This fix is part of the MISC package.  It is only enabled if LAMMPS
 was built with that package.  See the :doc:`Build package <Build_package>` doc page for more info.
 
@@ -179,8 +170,3 @@ Related commands
 :doc:`fix addforce <fix_addforce>`
 
 **Default:** none
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/fix_ehex.rst b/doc/src/fix_ehex.rst
index 2a8a4c8f67..10622c8b3e 100644
--- a/doc/src/fix_ehex.rst
+++ b/doc/src/fix_ehex.rst
@@ -6,7 +6,6 @@ fix ehex command
 Syntax
 """"""
 
-
 .. parsed-literal::
 
    fix ID group-ID ehex nevery F keyword value
@@ -17,9 +16,9 @@ Syntax
 * F = energy flux into the reservoir (energy/time units)
 * zero or more keyword/value pairs may be appended to args
 * keyword = *region* or *constrain* or *com* or *hex*
-  
+
   .. parsed-literal::
-  
+
        *region* value = region-ID
          region-ID = ID of region (reservoir) atoms must be in for added thermostatting force
        *constrain* value = none
@@ -29,13 +28,10 @@ Syntax
        *hex* value = none
          omit the coordinate correction to recover the HEX algorithm
 
-
-
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    # Lennard-Jones, from examples/in.ehex.lj
 
@@ -78,13 +74,20 @@ additional thermostatting force to the equations of motion, such that
 the time evolution of coordinates and momenta of particle :math:`i`
 becomes :ref:`(Wirnsberger) <Wirnsberger>`
 
-.. image:: Eqs/fix_ehex_eom.jpg
-   :align: center
+.. math::
+
+     \dot{\mathbf r}_i &= \mathbf v_i,  \\
+     \dot{\mathbf v}_i &= \frac{\mathbf f_i}{m_i} + \frac{\mathbf g_i}{m_i}.
 
 The thermostatting force is given by
 
-.. image:: Eqs/fix_ehex_f.jpg
-   :align: center
+.. math::
+
+   \mathbf g_i = \begin{cases}
+   \frac{m_i}{2}   \frac{ F_{\Gamma_{k(\mathbf r_i)}}}{ K_{\Gamma_{k(\mathbf r_i)}}}
+   \left(\mathbf v_i -  \mathbf v_{\Gamma_{k(\mathbf r_i)}} \right) &  \mbox{$k(\mathbf r_i)> 0$ (inside a reservoir),} \\
+    0                                     &  \mbox{otherwise, }
+   \end{cases}
 
 where :math:`m_i` is the mass and :math:`k(\mathbf r_i)` maps the particle
 position to the respective reservoir. The quantity
@@ -96,7 +99,7 @@ velocity of that reservoir. The thermostatting force does not affect
 the center of mass velocities of the individual reservoirs and the
 entire simulation box. A derivation of the equations and details on
 the numerical implementation with velocity Verlet in LAMMPS can be
-found in reference "(Wirnsberger)"#\_Wirnsberger.
+found in reference "(Wirnsberger)"#_Wirnsberger.
 
 .. note::
 
@@ -106,7 +109,7 @@ found in reference "(Wirnsberger)"#\_Wirnsberger.
 
 This fix is different from a thermostat such as :doc:`fix nvt <fix_nh>`
 or :doc:`fix temp/rescale <fix_temp_rescale>` in that energy is
-added/subtracted continually.  Thus if there isn't another mechanism
+added/subtracted continually.  Thus if there is not another mechanism
 in place to counterbalance this effect, the entire system will heat or
 cool continuously.
 
@@ -121,10 +124,8 @@ cool continuously.
 This fix will default to :doc:`fix_heat <fix_heat>` (HEX algorithm) if
 the keyword *hex* is specified.
 
-
 ----------
 
-
 **Compatibility with SHAKE and RATTLE (rigid molecules)**\ :
 
 This fix is compatible with :doc:`fix shake <fix_shake>` and :doc:`fix rattle <fix_shake>`. If either of these constraining algorithms is
@@ -160,11 +161,9 @@ constraints will be satisfied.
    temperature gradients.  A higher precision can be achieved by
    decreasing the timestep.
 
-
 ----------
 
-
-**Restart, fix\_modify, output, run start/stop, minimize info:**
+**Restart, fix_modify, output, run start/stop, minimize info:**
 
 No information about this fix is written to :doc:`binary restart files <restart>`.  None of the :doc:`fix_modify <fix_modify>` options
 are relevant to this fix.
@@ -175,7 +174,6 @@ the :doc:`run <run>` command.  This fix is not invoked during :doc:`energy minim
 Restrictions
 """"""""""""
 
-
 This fix is part of the RIGID package.  It is only enabled if LAMMPS
 was built with that package.  See the :doc:`Build package <Build_package>` doc page for more info.
 
@@ -186,24 +184,13 @@ Related commands
 
 **Default:** none
 
-
 ----------
 
-
 .. _Ikeshoji:
 
-
-
 **(Ikeshoji)** Ikeshoji and Hafskjold, Molecular Physics, 81, 251-261 (1994).
 
 .. _Wirnsberger:
 
-
-
 **(Wirnsberger)** Wirnsberger, Frenkel, and Dellago, J Chem Phys, 143,
 124104 (2015).
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/fix_electron_stopping.rst b/doc/src/fix_electron_stopping.rst
index 6589d4b69d..cead9f7a12 100644
--- a/doc/src/fix_electron_stopping.rst
+++ b/doc/src/fix_electron_stopping.rst
@@ -6,7 +6,6 @@ fix electron/stopping command
 Syntax
 """"""
 
-
 .. parsed-literal::
 
    fix ID group-ID electron/stopping Ecut file keyword value ...
@@ -17,21 +16,18 @@ Syntax
 * file = name of the file containing the electronic stopping power table
 * zero or more keyword/value pairs may be appended to args
 * keyword = *region* or *minneigh*
-  
+
   .. parsed-literal::
-  
+
        *region* value = region-ID
          region-ID = region, whose atoms will be affected by this fix
        *minneigh* value = minneigh
          minneigh = minimum number of neighbors an atom to have stopping applied
 
-
-
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    fix el all electron/stopping 10.0 elstop-table.txt
    fix el all electron/stopping 10.0 elstop-table.txt minneigh 3
@@ -52,10 +48,9 @@ considered, the simulated range of the ions can be severely overestimated
 The electronic stopping is implemented by applying a friction force
 to each atom as:
 
-
 .. math::
 
-   \begin{equation}\vec{F}_i = \vec{F}^0_i - \frac{\vec{v}_i}{\|\vec{v}_i\|} \cdot S_e\end{equation}
+   \vec{F}_i = \vec{F}^0_i - \frac{\vec{v}_i}{\|\vec{v}_i\|} \cdot S_e
 
 where :math:`\vec{F}_i` is the resulting total force on the atom.
 :math:`\vec{F}^0_i` is the original force applied to the atom, :math:`\vec{v}_i` is
@@ -97,10 +92,8 @@ geometric :doc:`region <region>` in order to have electronic stopping applied to
 it. This is useful if the position of the bulk material is fixed. By default
 the electronic stopping is applied everywhere in the simulation cell.
 
-
 ----------
 
-
 The energy ranges and stopping powers are read from the file *file*\ .
 Lines starting with *#* and empty lines are ignored. Otherwise each
 line must contain exactly **N+1** numbers, where **N** is the number of atom
@@ -115,7 +108,6 @@ intermediate energy values are calculated with linear interpolation between
 
 For example:
 
-
 .. parsed-literal::
 
    # This is a comment
@@ -137,7 +129,7 @@ scientific publications, experimental databases or by using
 of the impact parameter of the ion; these results can be used
 to derive the stopping power.
 
-**Restart, fix\_modify, output, run start/stop, minimize info:**
+**Restart, fix_modify, output, run start/stop, minimize info:**
 
 No information about this fix is written to :doc:`binary restart files <restart>`.
 
@@ -154,7 +146,6 @@ on this fix.
 Restrictions
 """"""""""""
 
-
 This pair style is part of the USER-MISC package. It is only enabled if
 LAMMPS was built with that package. See the :doc:`Build package <Build_package>`
 doc page for more info.
@@ -164,47 +155,28 @@ Default
 
 The default is no limitation by region, and minneigh = 1.
 
-
 ----------
 
-
 .. _elstopping:
 
-
-
-**(electronic stopping)** Wikipedia - Electronic Stopping Power: https://en.wikipedia.org/wiki/Stopping\_power\_%28particle\_radiation%29
+**(electronic stopping)** Wikipedia - Electronic Stopping Power: https://en.wikipedia.org/wiki/Stopping_power_%28particle_radiation%29
 
 .. _Nordlund98:
 
-
-
 **(Nordlund98)** Nordlund, Kai, et al.  Physical Review B 57.13 (1998): 7556.
 
 .. _Nordlund95:
 
-
-
 **(Nordlund95)** Nordlund, Kai. Computational materials science 3.4 (1995): 448-456.
 
 .. _SRIM:
 
-
-
 **(SRIM)** SRIM webpage: http://www.srim.org/
 
 .. _CasP:
 
-
-
-**(CasP)** CasP webpage: https://www.helmholtz-berlin.de/people/gregor-schiwietz/casp\_en.html
+**(CasP)** CasP webpage: https://www.helmholtz-berlin.de/people/gregor-schiwietz/casp_en.html
 
 .. _PASS:
 
-
-
 **(PASS)** PASS webpage: https://www.sdu.dk/en/DPASS
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/fix_enforce2d.rst b/doc/src/fix_enforce2d.rst
index 7c4934d223..d33dd25a61 100644
--- a/doc/src/fix_enforce2d.rst
+++ b/doc/src/fix_enforce2d.rst
@@ -9,7 +9,6 @@ fix enforce2d/kk command
 Syntax
 """"""
 
-
 .. parsed-literal::
 
    fix ID group-ID enforce2d
@@ -20,8 +19,7 @@ Syntax
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    fix 5 all enforce2d
 
@@ -32,10 +30,8 @@ Zero out the z-dimension velocity and force on each atom in the group.
 This is useful when running a 2d simulation to insure that atoms do
 not move from their initial z coordinate.
 
-
 ----------
 
-
 Styles with a *gpu*\ , *intel*\ , *kk*\ , *omp*\ , or *opt* suffix are
 functionally the same as the corresponding style without the suffix.
 They have been optimized to run faster, depending on your available
@@ -54,11 +50,9 @@ by including their suffix, or you can use the :doc:`-suffix command-line switch
 See the :doc:`Speed packages <Speed_packages>` doc page for more
 instructions on how to use the accelerated styles effectively.
 
-
 ----------
 
-
-**Restart, fix\_modify, output, run start/stop, minimize info:**
+**Restart, fix_modify, output, run start/stop, minimize info:**
 
 No information about this fix is written to :doc:`binary restart files <restart>`.  None of the :doc:`fix_modify <fix_modify>` options
 are relevant to this fix.  No global or per-atom quantities are stored
@@ -76,8 +70,3 @@ Restrictions
 **Related commands:** none
 
 **Default:** none
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/fix_eos_cv.rst b/doc/src/fix_eos_cv.rst
index 7c309ec135..50281b6e71 100644
--- a/doc/src/fix_eos_cv.rst
+++ b/doc/src/fix_eos_cv.rst
@@ -6,7 +6,6 @@ fix eos/cv command
 Syntax
 """"""
 
-
 .. parsed-literal::
 
    fix ID group-ID eos/cv cv
@@ -18,8 +17,7 @@ Syntax
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    fix 1 all eos/cv 0.01
 
@@ -27,26 +25,24 @@ Description
 """""""""""
 
 Fix *eos/cv* applies a mesoparticle equation of state to relate the
-particle internal energy (u\_i) to the particle internal temperature
-(dpdTheta\_i).  The *eos/cv* mesoparticle equation of state requires
+particle internal energy (:math:`u_i`) to the particle internal temperature
+(:math:`\theta_i`).  The *eos/cv* mesoparticle equation of state requires
 the constant-volume heat capacity, and is defined as follows:
 
-.. image:: Eqs/fix_eos-cv.jpg
-   :align: center
+.. math::
 
-where Cv is the constant-volume heat capacity, u\_cond is the internal
-conductive energy, and u\_mech is the internal mechanical energy.  Note
-that alternative definitions of the mesoparticle equation of state are
-possible.
+   u_{i} = u^{mech}_{i} + u^{cond}_{i} = C_{V} \theta_{i}
 
+where :math:`C_V` is the constant-volume heat capacity, :math:`u^{cond}`
+is the internal conductive energy, and :math:`u^{mech}` is the internal
+mechanical energy.  Note that alternative definitions of the mesoparticle
+equation of state are possible.
 
 ----------
 
-
 Restrictions
 """"""""""""
 
-
 This command is part of the USER-DPD package.  It is only enabled if
 LAMMPS was built with that package.  See the :doc:`Build package <Build_package>` doc page for more info.
 
@@ -60,20 +56,11 @@ Related commands
 
 **Default:** none
 
-
 ----------
 
-
 .. _Larentzos4:
 
-
-
 **(Larentzos)** J.P. Larentzos, J.K. Brennan, J.D. Moore, and
 W.D. Mattson, "LAMMPS Implementation of Constant Energy Dissipative
 Particle Dynamics (DPD-E)", ARL-TR-6863, U.S. Army Research
 Laboratory, Aberdeen Proving Ground, MD (2014).
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/fix_eos_table.rst b/doc/src/fix_eos_table.rst
index d1cb88edf4..3800aa0c53 100644
--- a/doc/src/fix_eos_table.rst
+++ b/doc/src/fix_eos_table.rst
@@ -6,7 +6,6 @@ fix eos/table command
 Syntax
 """"""
 
-
 .. parsed-literal::
 
    fix ID group-ID eos/table style file N keyword
@@ -21,8 +20,7 @@ Syntax
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    fix 1 all eos/table linear eos.table 100000 KEYWORD
 
@@ -30,8 +28,8 @@ Description
 """""""""""
 
 Fix *eos/table* applies a tabulated mesoparticle equation of state to
-relate the particle internal energy (u\_i) to the particle internal
-temperature (dpdTheta\_i).
+relate the particle internal energy (u_i) to the particle internal
+temperature (dpdTheta_i).
 
 Fix *eos/table* creates interpolation tables of length *N* from
 internal energy values listed in a file as a function of internal
@@ -51,14 +49,11 @@ The filename specifies a file containing tabulated internal
 temperature and internal energy values.  The keyword specifies a
 section of the file.  The format of this file is described below.
 
-
 ----------
 
-
 The format of a tabulated file is as follows (without the
 parenthesized comments):
 
-
 .. parsed-literal::
 
    # EOS TABLE                (one or more comment or blank lines)
@@ -102,14 +97,11 @@ Note that one file can contain many sections, each with a tabulated
 potential.  LAMMPS reads the file section by section until it finds
 one that matches the specified keyword.
 
-
 ----------
 
-
 Restrictions
 """"""""""""
 
-
 This command is part of the USER-DPD package.  It is only enabled if
 LAMMPS was built with that package.  See the :doc:`Build package <Build_package>` doc page for more info.
 
@@ -127,8 +119,3 @@ Related commands
 :doc:`fix shardlow <fix_shardlow>`, :doc:`pair dpd/fdt <pair_dpd_fdt>`
 
 **Default:** none
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/fix_eos_table_rx.rst b/doc/src/fix_eos_table_rx.rst
index 8b94ef9459..e3cd4e8ce8 100644
--- a/doc/src/fix_eos_table_rx.rst
+++ b/doc/src/fix_eos_table_rx.rst
@@ -9,7 +9,6 @@ fix eos/table/rx/kk command
 Syntax
 """"""
 
-
 .. parsed-literal::
 
    fix ID group-ID eos/table/rx style file1 N keyword ...
@@ -28,8 +27,7 @@ Syntax
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    fix 1 all eos/table/rx linear eos.table 10000 KEYWORD thermo.table
    fix 1 all eos/table/rx linear eos.table 10000 KEYWORD 1.5
@@ -40,30 +38,33 @@ Description
 
 Fix *eos/table/rx* applies a tabulated mesoparticle equation
 of state to relate the concentration-dependent particle internal
-energy (u\_i) to the particle internal temperature (dpdTheta\_i).
+energy (:math:`u_i`) to the particle internal temperature (:math:`\theta_i`).
 
-The concentration-dependent particle internal energy (u\_i) is
+The concentration-dependent particle internal energy (:math:`u_i`) is
 computed according to the following relation:
 
-.. image:: Eqs/fix_eos_table_rx.jpg
-   :align: center
+.. math::
 
-where *m* is the number of species, *c\_i,j* is the concentration of
-species *j* in particle *i*\ , *u\_j* is the internal energy of species j,
-*DeltaH\_f,j* is the heat of formation of species *j*\ , N is the number of
-molecules represented by the coarse-grained particle, kb is the
-Boltzmann constant, and T is the temperature of the system.  Additionally,
-it is possible to modify the concentration-dependent particle internal
+   U_{i} = \displaystyle\sum_{j=1}^{m} c_{i,j}(u_{j} + \Delta H_{f,j}) + \frac{3k_{b}T}{2} + Nk_{b}T \\
+
+where *m* is the number of species, :math:`c_{i,j}` is the
+concentration of species *j* in particle *i*\ , :math:`u_j` is the
+internal energy of species j, :math:`\Delta H_{f,j} is the heat of
+formation of species *j*\ , N is the number of molecules represented
+by the coarse-grained particle, :math:`k_b` is the Boltzmann constant,
+and *T* is the temperature of the system.  Additionally, it is
+possible to modify the concentration-dependent particle internal
 energy relation by adding an energy correction, temperature-dependent
-correction, and/or a molecule-dependent correction.  An energy correction can
-be specified as a constant (in energy units).  A temperature correction can be
-specified by multiplying a temperature correction coefficient by the
-internal temperature.  A molecular correction can be specified by
-by multiplying a molecule correction coefficient by the average number of
-product gas particles in the coarse-grain particle.
+correction, and/or a molecule-dependent correction.  An energy
+correction can be specified as a constant (in energy units).  A
+temperature correction can be specified by multiplying a temperature
+correction coefficient by the internal temperature.  A molecular
+correction can be specified by by multiplying a molecule correction
+coefficient by the average number of product gas particles in the
+coarse-grain particle.
 
 Fix *eos/table/rx* creates interpolation tables of length *N* from *m*
-internal energy values of each species *u\_j* listed in a file as a
+internal energy values of each species :math:`u_j` listed in a file as a
 function of internal temperature.  During a simulation, these tables
 are used to interpolate internal energy or temperature values as needed.
 The interpolation is done with the *linear* style.  For the *linear* style,
@@ -72,29 +73,27 @@ which an internal energy is computed by linear interpolation.  A secant
 solver is used to determine the internal temperature from the internal energy.
 
 The first filename specifies a file containing tabulated internal
-temperature and *m* internal energy values for each species *u\_j*.
+temperature and *m* internal energy values for each species :math:`u_j`.
 The keyword specifies a section of the file.  The format of this
 file is described below.
 
 The second filename specifies a file containing heat of formation
-*DeltaH\_f,j* for each species.
+:math:`\Delta H_{f,j}` for each species.
 
 In cases where the coarse-grain particle represents a single molecular
-species (i.e., no reactions occur and fix *rx* is not present in the input file),
-fix *eos/table/rx* can be applied in a similar manner to fix *eos/table*
-within a non-reactive DPD simulation.  In this case, the heat of formation
-filename is replaced with the heat of formation value for the single species.
-Additionally, the energy correction and temperature correction coefficients may
-also be specified as fix arguments.
-
+species (i.e., no reactions occur and fix *rx* is not present in the
+input file), fix *eos/table/rx* can be applied in a similar manner to
+fix *eos/table* within a non-reactive DPD simulation.  In this case,
+the heat of formation filename is replaced with the heat of formation
+value for the single species.  Additionally, the energy correction and
+temperature correction coefficients may also be specified as fix
+arguments.
 
 ----------
 
-
 The format of a tabulated file is as follows (without the
 parenthesized comments):
 
-
 .. parsed-literal::
 
    # EOS TABLE                (one or more comment or blank lines)
@@ -133,14 +132,11 @@ Note that one file can contain many sections, each with a tabulated
 potential.  LAMMPS reads the file section by section until it finds
 one that matches the specified keyword.
 
-
 ----------
 
-
 The format of a heat of formation file is as follows (without the
 parenthesized comments):
 
-
 .. parsed-literal::
 
    # HEAT OF FORMATION TABLE  (one or more comment or blank lines)
@@ -161,7 +157,6 @@ three additional columns that correspond to the energy correction,
 the temperature correction coefficient and molecule correction
 coefficient.  In this case, the format of the file is as follows:
 
-
 .. parsed-literal::
 
    # HEAT OF FORMATION TABLE     (one or more comment or blank lines)
@@ -173,10 +168,8 @@ coefficient.  In this case, the format of the file is as follows:
    ...
    no      0.93 0.00 0.000 -1.76
 
-
 ----------
 
-
 Styles with a *gpu*\ , *intel*\ , *kk*\ , *omp*\ , or *opt* suffix are
 functionally the same as the corresponding style without the suffix.
 They have been optimized to run faster, depending on your available
@@ -195,14 +188,11 @@ by including their suffix, or you can use the :doc:`-suffix command-line switch
 See the :doc:`Speed packages <Speed_packages>` doc page for more
 instructions on how to use the accelerated styles effectively.
 
-
 ----------
 
-
 Restrictions
 """"""""""""
 
-
 This command is part of the USER-DPD package.  It is only enabled if
 LAMMPS was built with that package.  See the :doc:`Build package <Build_package>` doc page for more info.
 
@@ -221,12 +211,3 @@ Related commands
 :doc:`pair dpd/fdt <pair_dpd_fdt>`
 
 **Default:** none
-
-
-----------
-
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/fix_evaporate.rst b/doc/src/fix_evaporate.rst
index 75c6b2bcbe..d6b9c6ae34 100644
--- a/doc/src/fix_evaporate.rst
+++ b/doc/src/fix_evaporate.rst
@@ -6,7 +6,6 @@ fix evaporate command
 Syntax
 """"""
 
-
 .. parsed-literal::
 
    fix ID group-ID evaporate N M region-ID seed
@@ -18,19 +17,16 @@ Syntax
 * region-ID = ID of region within which to perform deletions
 * seed = random number seed to use for choosing atoms to delete
 * zero or more keyword/value pairs may be appended
-  
+
   .. parsed-literal::
-  
+
      keyword = *molecule*
        *molecule* value = *no* or *yes*
 
-
-
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    fix 1 solvent evaporate 1000 10 surface 49892
    fix 1 solvent evaporate 1000 10 surface 38277 molecule yes
@@ -76,7 +72,7 @@ incur overhead due to the cost of building neighbor lists.
    :doc:`compute_modify dynamic yes <compute_modify>` command for the
    temperature compute you are using.
 
-**Restart, fix\_modify, output, run start/stop, minimize info:**
+**Restart, fix_modify, output, run start/stop, minimize info:**
 
 No information about this fix is written to :doc:`binary restart files <restart>`.  None of the :doc:`fix_modify <fix_modify>` options
 are relevant to this fix.
@@ -92,7 +88,6 @@ the :doc:`run <run>` command.  This fix is not invoked during :doc:`energy minim
 Restrictions
 """"""""""""
 
-
 This fix is part of the MISC package.  It is only enabled if LAMMPS
 was built with that package.  See the :doc:`Build package <Build_package>` doc page for more info.
 
@@ -105,8 +100,3 @@ Default
 """""""
 
 The option defaults are molecule = no.
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/fix_external.rst b/doc/src/fix_external.rst
index 8e7ca5b2e1..a77545d294 100644
--- a/doc/src/fix_external.rst
+++ b/doc/src/fix_external.rst
@@ -6,7 +6,6 @@ fix external command
 Syntax
 """"""
 
-
 .. parsed-literal::
 
    fix ID group-ID external mode args
@@ -14,22 +13,19 @@ Syntax
 * ID, group-ID are documented in :doc:`fix <fix>` command
 * external = style name of this fix command
 * mode = *pf/callback* or *pf/array*
-  
+
   .. parsed-literal::
-  
+
        *pf/callback* args = Ncall Napply
          Ncall = make callback every Ncall steps
          Napply = apply callback forces every Napply steps
        *pf/array* args = Napply
          Napply = apply array forces every Napply steps
 
-
-
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    fix 1 all external pf/callback 1 1
    fix 1 all external pf/callback 100 1
@@ -43,10 +39,8 @@ This fix allows external programs that are running LAMMPS through its
 properties on specific timesteps, similar to the way other fixes do.
 The external driver can be a :doc:`C/C++ or Fortran program <Howto_library>` or a :doc:`Python script <Python_head>`.
 
-
 ----------
 
-
 If mode is *pf/callback* then the fix will make a callback every
 *Ncall* timesteps or minimization iterations to the external program.
 The external program computes forces on atoms by setting values in an
@@ -57,40 +51,37 @@ be used multiple times to update atom forces.
 
 The callback function "foo" is invoked by the fix as:
 
+.. code-block:: c++
 
-.. parsed-literal::
-
-   foo(void \*ptr, bigint timestep, int nlocal, int \*ids, double \*\*x, double \*\*fexternal);
+   foo(void *ptr, bigint timestep, int nlocal, tagint *ids, double **x, double **fexternal);
 
 The arguments are as follows:
 
-* ptr = pointer provided by and simply passed back to external driver
-* timestep = current LAMMPS timestep
-* nlocal = # of atoms on this processor
-* ids = list of atom IDs on this processor
-* x = coordinates of atoms on this processor
-* fexternal = forces to add to atoms on this processor
+* *ptr* = pointer provided by and simply passed back to external driver
+* *timestep* = current LAMMPS timestep
+* *nlocal* = # of atoms on this processor
+* *ids* = list of atom IDs on this processor
+* *x* = coordinates of atoms on this processor
+* *fexternal* = forces to add to atoms on this processor
 
-Note that timestep is a "bigint" which is defined in src/lmptype.h,
-typically as a 64-bit integer.
+Note that *timestep* is a "bigint" which is defined in src/lmptype.h,
+typically as a 64-bit integer. And *ids* is a pointer to type "tagint"
+which is typically a 32-bit integer unless LAMMPS is compiled with
+-DLAMMPS_BIGBIG. For more info please see the :ref:`build settings
+<size>` section of the manual.  Finally, *fexternal* are the forces
+returned by the driver program.
 
-Fexternal are the forces returned by the driver program.
-
-The fix has a set\_callback() method which the external driver can call
+The fix has a set_callback() method which the external driver can call
 to pass a pointer to its foo() function.  See the
-couple/lammps\_quest/lmpqst.cpp file in the LAMMPS distribution for an
+couple/lammps_quest/lmpqst.cpp file in the LAMMPS distribution for an
 example of how this is done.  This sample application performs
 classical MD using quantum forces computed by a density functional
 code `Quest <quest_>`_.
 
 .. _quest: http://dft.sandia.gov/Quest
 
-
-
-
 ----------
 
-
 If mode is *pf/array* then the fix simply stores force values in an
 array.  The fix adds these forces to each atom in the group, once
 every *Napply* steps, similar to the way the :doc:`fix addforce <fix_addforce>` command works.
@@ -98,10 +89,9 @@ every *Napply* steps, similar to the way the :doc:`fix addforce <fix_addforce>`
 The name of the public force array provided by the FixExternal
 class is
 
+.. code-block:: c++
 
-.. parsed-literal::
-
-   double \*\*fexternal;
+   double **fexternal;
 
 It is allocated by the FixExternal class as an (N,3) array where N is
 the number of atoms owned by a processor.  The 3 corresponds to the
@@ -114,10 +104,8 @@ between calls to the LAMMPS :doc:`run <run>` command, it could retrieve
 atom coordinates from LAMMPS, compute forces, set values in fexternal,
 etc.
 
-
 ----------
 
-
 To use this fix during energy minimization, the energy corresponding
 to the added forces must also be set so as to be consistent with the
 added forces.  Otherwise the minimization will not converge correctly.
@@ -125,8 +113,7 @@ added forces.  Otherwise the minimization will not converge correctly.
 This can be done from the external driver by calling this public
 method of the FixExternal class:
 
-
-.. parsed-literal::
+.. code-block:: c++
 
    void set_energy(double eng);
 
@@ -136,11 +123,9 @@ atoms.  It should also be provided in :doc:`energy units <units>`
 consistent with the simulation.  See the details below for how to
 insure this energy setting is used appropriately in a minimization.
 
-
 ----------
 
-
-**Restart, fix\_modify, output, run start/stop, minimize info:**
+**Restart, fix_modify, output, run start/stop, minimize info:**
 
 No information about this fix is written to :doc:`binary restart files <restart>`.
 
@@ -180,8 +165,3 @@ Restrictions
 **Related commands:** none
 
 **Default:** none
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/fix_ffl.rst b/doc/src/fix_ffl.rst
index 67e386c26f..ac23175875 100644
--- a/doc/src/fix_ffl.rst
+++ b/doc/src/fix_ffl.rst
@@ -6,7 +6,6 @@ fix ffl command
 Syntax
 """"""
 
-
 .. parsed-literal::
 
    fix ID id-group ffl tau Tstart Tstop seed [flip-type]
@@ -17,18 +16,15 @@ Syntax
 * Tstart, Tstop = temperature ramp during the run
 * seed = random number seed to use for generating noise (positive integer)
 * one more value may be appended
-  
+
   .. parsed-literal::
-  
+
          flip-type  = determines the flipping type, can be chosen between rescale - no_flip - hard - soft, if no flip type is given, rescale will be chosen by default
 
-
-
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    fix 3 boundary ffl 10 300 300 31415
    fix 1 all ffl 100 500 500 9265 soft
@@ -46,15 +42,13 @@ on the same atom groups.
 The time-evolution of a single particle undergoing Langevin dynamics is described
 by the equations
 
+.. math::
+
+    \frac {dq}{dt} = \frac{p}{m},
 
 .. math::
 
-   \begin{equation} \frac {dq}{dt} = \frac{p}{m}, \end{equation}
-
-
-.. math::
-
-   \begin{equation} \frac {dp}{dt} = -\gamma p + W + F, \end{equation}
+   \frac {dp}{dt} = -\gamma p + W + F,
 
 where :math:`F` is the physical force, :math:`\gamma` is the friction coefficient, and :math:`W` is a
 Gaussian random force.
@@ -74,11 +68,11 @@ different numbers of processors.
 
 The flipping type *flip-type* can be chosen between 4 types described in
 :ref:`(Hijazi) <Hijazi>`. The flipping operation occurs during the thermostatting
-step and it flips the momenta of the atoms. If no\_flip is chosen, no flip
+step and it flips the momenta of the atoms. If no_flip is chosen, no flip
 will be executed and the integration will be the same as a standard
 Langevin thermostat :ref:`(Bussi) <Bussi3>`. The other flipping types are : rescale - hard - soft.
 
-**Restart, fix\_modify, output, run start/stop, minimize info:**
+**Restart, fix_modify, output, run start/stop, minimize info:**
 
 The instantaneous values of the extended variables are written to
 :doc:`binary restart files <restart>`.  Because the state of the random
@@ -107,7 +101,6 @@ fix is "extensive".
 Restrictions
 """"""""""""
 
-
 In order to perform constant-pressure simulations please use
 :doc:`fix press/berendsen <fix_press_berendsen>`, rather than
 :doc:`fix npt <fix_nh>`, to avoid duplicate integration of the
@@ -121,22 +114,12 @@ Related commands
 
 :doc:`fix nvt <fix_nh>`, :doc:`fix temp/rescale <fix_temp_rescale>`, :doc:`fix viscous <fix_viscous>`, :doc:`fix nvt <fix_nh>`, :doc:`pair_style dpd/tstat <pair_dpd>`, :doc:`fix gld <fix_gld>`, :doc:`fix gle <fix_gle>`
 
-
 ----------
 
-
 .. _Hijazi:
 
-
-
 .. _Bussi3:
 
 **(Hijazi)** M. Hijazi, D. M. Wilkins, M. Ceriotti, J. Chem. Phys. 148, 184109 (2018)
 
-
 **(Bussi)** G. Bussi, M. Parrinello, Phs. Rev. E 75, 056707 (2007)
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/fix_filter_corotate.rst b/doc/src/fix_filter_corotate.rst
index b6765c25b4..1731ef94a2 100644
--- a/doc/src/fix_filter_corotate.rst
+++ b/doc/src/fix_filter_corotate.rst
@@ -6,7 +6,6 @@ fix filter/corotate command
 Syntax
 """"""
 
-
 .. parsed-literal::
 
    fix ID group-ID filter/corotate keyword value ...
@@ -14,21 +13,18 @@ Syntax
 * ID, group-ID are documented in :doc:`fix <fix>` command
 * one or more constraint/value pairs are appended
 * constraint = *b* or *a* or *t* or *m*
-  
+
   .. parsed-literal::
-  
+
        *b* values = one or more bond types
        *a* values = one or more angle types
        *t* values = one or more atom types
        *m* value = one or more mass values
 
-
-
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    timestep 8
    run_style respa 3 2 8 bond 1 pair 2 kspace 3
@@ -62,11 +58,9 @@ contain the fastest covalent bonds inside clusters.
 
 If the clusters are chosen suitably, the :doc:`run_style respa <run_style>` is stable for outer time-steps of at least 8fs.
 
-
 ----------
 
-
-**Restart, fix\_modify, output, run start/stop, minimize info:**
+**Restart, fix_modify, output, run start/stop, minimize info:**
 
 No information about these fixes is written to :doc:`binary restart files <restart>`.  None of the :doc:`fix_modify <fix_modify>` options
 are relevant to these fixes.  No global or per-atom quantities are
@@ -77,7 +71,6 @@ fixes are not invoked during :doc:`energy minimization <minimize>`.
 Restrictions
 """"""""""""
 
-
 This fix is part of the USER-MISC package. It is only enabled if
 LAMMPS was built with that package. See the :doc:`Build package <Build_package>` doc page for more info.
 
@@ -88,17 +81,8 @@ Related commands
 
 **Default:** none
 
-
 ----------
 
-
 .. _Fath2017:
 
-
-
 **(Fath)** Fath, Hochbruck, Singh, J Comp Phys, 333, 180-198 (2017).
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/fix_flow_gauss.rst b/doc/src/fix_flow_gauss.rst
index 728ef17387..7b9e001bd3 100644
--- a/doc/src/fix_flow_gauss.rst
+++ b/doc/src/fix_flow_gauss.rst
@@ -6,7 +6,6 @@ fix flow/gauss command
 Syntax
 """"""
 
-
 .. parsed-literal::
 
    fix ID group-ID flow/gauss xflag yflag zflag keyword
@@ -14,28 +13,25 @@ Syntax
 * ID, group-ID are documented in :doc:`fix <fix>` command
 * flow/gauss = style name of this fix command
 * xflag,yflag,zflag = 0 or 1
-  
+
   .. parsed-literal::
-  
+
          0 = do not conserve current in this dimension
          1 = conserve current in this dimension
 
 * zero or more keyword/value pairs may be appended
 * keyword = *energy*
-  
+
   .. parsed-literal::
-  
+
        *energy* value = no or yes
          no = do not compute work done by this fix
          yes = compute work done by this fix
 
-
-
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    fix GD fluid flow/gauss 1 0 0
    fix GD fluid flow/gauss 1 1 1 energy yes
@@ -72,7 +68,7 @@ other methods, such as the pump method :ref:`(Zhu) <Zhu>`. The pressure
 correction is discussed and described in :ref:`(Strong) <Strong>`.
 
 For a complete example including the considerations discussed
-above, see the examples/USER/flow\_gauss directory.
+above, see the examples/USER/flow_gauss directory.
 
 .. note::
 
@@ -95,13 +91,13 @@ expensive than usual, so it is not performed by default. To invoke the
 work calculation, use the *energy* keyword. The
 :doc:`fix_modify <fix_modify>` *energy* option also invokes the work
 calculation, and overrides an *energy no* setting here. If neither
-*energy yes* or *fix\_modify energy yes* are set, the global scalar
+*energy yes* or *fix_modify energy yes* are set, the global scalar
 computed by the fix will return zero.
 
 .. note::
 
    In order to check energy conservation, any other fixes that do
-   work on the system must have *fix\_modify energy yes* set as well. This
+   work on the system must have *fix_modify energy yes* set as well. This
    includes thermostat fixes and any constraints that hold the positions
    of wall atoms fixed, such as :doc:`fix spring/self <fix_spring_self>`.
 
@@ -115,14 +111,12 @@ computed at different rRESPA levels, then there must be a separate flow/gauss
 fix for each level. For example, if the flowing fluid and obstacle interact
 through pairwise and long-range Coulomb interactions, which are computed at
 rRESPA levels 3 and 4, respectively, then there must be two separate
-flow/gauss fixes, one that specifies *fix\_modify respa 3* and one with
-*fix\_modify respa 4*.
-
+flow/gauss fixes, one that specifies *fix_modify respa 3* and one with
+*fix_modify respa 4*.
 
 ----------
 
-
-**Restart, fix\_modify, output, run start/stop, minimize info:**
+**Restart, fix_modify, output, run start/stop, minimize info:**
 
 This fix is part of the USER-MISC package.  It is only enabled if
 LAMMPS was built with that package.  See the :doc:`Build package <Build_package>` doc page for more info.
@@ -162,29 +156,16 @@ Default
 
 The option default for the *energy* keyword is energy = no.
 
-
 ----------
 
-
 .. _Strong:
 
-
-
 **(Strong)** Strong and Eaves, J. Phys. Chem. B 121, 189 (2017).
 
 .. _Evans2:
 
-
-
 **(Evans)** Evans and Morriss, Phys. Rev. Lett. 56, 2172 (1986).
 
 .. _Zhu:
 
-
-
 **(Zhu)** Zhu, Tajkhorshid, and Schulten, Biophys. J. 83, 154 (2002).
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/fix_freeze.rst b/doc/src/fix_freeze.rst
index cc67f969df..d6659dc8f8 100644
--- a/doc/src/fix_freeze.rst
+++ b/doc/src/fix_freeze.rst
@@ -9,7 +9,6 @@ fix freeze/kk command
 Syntax
 """"""
 
-
 .. parsed-literal::
 
    fix ID group-ID freeze
@@ -20,8 +19,7 @@ Syntax
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    fix 2 bottom freeze
 
@@ -36,10 +34,8 @@ particles appropriately, as if the frozen particle has infinite mass.
 A similar functionality for normal (point) particles can be obtained
 using :doc:`fix setforce <fix_setforce>`.
 
-
 ----------
 
-
 Styles with a *gpu*\ , *intel*\ , *kk*\ , *omp*\ , or *opt* suffix are
 functionally the same as the corresponding style without the suffix.
 They have been optimized to run faster, depending on your available
@@ -58,11 +54,9 @@ by including their suffix, or you can use the :doc:`-suffix command-line switch
 See the :doc:`Speed packages <Speed_packages>` doc page for more
 instructions on how to use the accelerated styles effectively.
 
-
 ----------
 
-
-**Restart, fix\_modify, output, run start/stop, minimize info:**
+**Restart, fix_modify, output, run start/stop, minimize info:**
 
 No information about this fix is written to :doc:`binary restart files <restart>`.  None of the :doc:`fix_modify <fix_modify>` options
 are relevant to this fix.
@@ -79,7 +73,6 @@ the :doc:`run <run>` command.  This fix is not invoked during :doc:`energy minim
 Restrictions
 """"""""""""
 
-
 This fix is part of the GRANULAR package.  It is only enabled if
 LAMMPS was built with that package.  See the :doc:`Build package <Build_package>` doc page for more info.
 
@@ -94,8 +87,3 @@ Related commands
 :doc:`atom_style sphere <atom_style>`, :doc:`fix setforce <fix_setforce>`
 
 **Default:** none
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/fix_gcmc.rst b/doc/src/fix_gcmc.rst
index 6b6af93fdc..77a0323000 100644
--- a/doc/src/fix_gcmc.rst
+++ b/doc/src/fix_gcmc.rst
@@ -6,7 +6,6 @@ fix gcmc command
 Syntax
 """"""
 
-
 .. parsed-literal::
 
    fix ID group-ID gcmc N X M type seed T mu displace keyword values ...
@@ -22,9 +21,9 @@ Syntax
 * mu = chemical potential of the ideal gas reservoir (energy units)
 * displace = maximum Monte Carlo translation distance (length units)
 * zero or more keyword/value pairs may be appended to args
-  
+
   .. parsed-literal::
-  
+
      keyword = *mol*\ , *region*\ , *maxangle*\ , *pressure*\ , *fugacity_coeff*, *full_energy*, *charge*\ , *group*\ , *grouptype*\ , *intra_energy*, *tfac_insert*, or *overlap_cutoff*
        *mol* value = template-ID
          template-ID = ID of molecule template specified in a separate :doc:`molecule <molecule>` command
@@ -54,13 +53,10 @@ Syntax
        *max* value = Maximum number of molecules allowed in the system
        *min* value = Minimum number of molecules allowed in the system
 
-
-
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    fix 2 gas gcmc 10 1000 1000 2 29494 298.0 -0.5 0.01
    fix 3 water gcmc 10 100 100 0 3456543 3.0 -2.5 0.1 mol my_one_water maxangle 180 full_energy
@@ -154,8 +150,7 @@ thermal equilibrium with the simulation cell. Also, it is important
 that the temperature used by fix nvt be dynamic/dof, which can be
 achieved as follows:
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    compute mdtemp mdatoms temp
    compute_modify mdtemp dynamic/dof yes
@@ -174,7 +169,7 @@ at a random position within the current simulation cell or region, and
 new atom velocities are randomly chosen from the specified temperature
 distribution given by T. The effective temperature for new atom
 velocities can be increased or decreased using the optional keyword
-*tfac\_insert* (see below). Relative coordinates for atoms in a
+*tfac_insert* (see below). Relative coordinates for atoms in a
 molecule are taken from the template molecule provided by the
 user. The center of mass of the molecule is placed at the insertion
 point. The orientation of the molecule is chosen at random by rotating
@@ -205,7 +200,7 @@ which also appears in your input script.
    If you wish the new rigid molecules (and other rigid molecules)
    to be thermostatted correctly via :doc:`fix rigid/small/nvt <fix_rigid>`
    or :doc:`fix rigid/small/npt <fix_rigid>`, then you need to use the
-   "fix\_modify dynamic/dof yes" command for the rigid fix.  This is to
+   "fix_modify dynamic/dof yes" command for the rigid fix.  This is to
    inform that fix that the molecule count will vary dynamically.
 
 If you wish to insert molecules via the *mol* keyword, that will have
@@ -248,46 +243,49 @@ two groups: the default group "all" and the fix group
 The chemical potential is a user-specified input parameter defined
 as:
 
-.. image:: Eqs/fix_gcmc1.jpg
-   :align: center
+.. math::
 
-The second term mu\_ex is the excess chemical potential due to
+   \mu = \mu^{id} + \mu^{ex}
+
+The second term mu_ex is the excess chemical potential due to
 energetic interactions and is formally zero for the fictitious gas
 reservoir but is non-zero for interacting systems. So, while the
 chemical potential of the reservoir and the simulation cell are equal,
-mu\_ex is not, and as a result, the densities of the two are generally
-quite different.  The first term mu\_id is the ideal gas contribution
-to the chemical potential.  mu\_id can be related to the density or
+mu_ex is not, and as a result, the densities of the two are generally
+quite different.  The first term mu_id is the ideal gas contribution
+to the chemical potential.  mu_id can be related to the density or
 pressure of the fictitious gas reservoir by:
 
-.. image:: Eqs/fix_gcmc2.jpg
-   :align: center
+.. math::
 
-where k is Boltzman's constant,
-T is the user-specified temperature, rho is the number density,
-P is the pressure, and phi is the fugacity coefficient.
-The constant Lambda is required for dimensional consistency.
-For all unit styles except *lj* it is defined as the thermal
-de Broglie wavelength
+   \mu^{id}  = & k T \ln{\rho \Lambda^3} \\
+             = & k T \ln{\frac{\phi P \Lambda^3}{k T}}
 
-.. image:: Eqs/fix_gcmc3.jpg
-   :align: center
+where *k* is Boltzman's constant, *T* is the user-specified
+temperature, :math:`\rho` is the number density, *P* is the pressure,
+and :math:`\phi` is the fugacity coefficient.  The constant
+:math:`\Lambda` is required for dimensional consistency.  For all unit
+styles except *lj* it is defined as the thermal de Broglie wavelength
 
-where h is Planck's constant, and m is the mass of the exchanged atom
-or molecule.  For unit style *lj*\ , Lambda is simply set to the
-unity. Note that prior to March 2017, lambda for unit style *lj* was
-calculated using the above formula with h set to the rather specific
+.. math::
+
+   \Lambda = \sqrt{ \frac{h^2}{2 \pi m k T}}
+
+where *h* is Planck's constant, and *m* is the mass of the exchanged atom
+or molecule.  For unit style *lj*\ , :math:`\Lambda` is simply set to
+unity. Note that prior to March 2017, :math:`\Lambda` for unit style *lj*
+was calculated using the above formula with *h* set to the rather specific
 value of 0.18292026.  Chemical potential under the old definition can
 be converted to an equivalent value under the new definition by
-subtracting 3kTln(Lambda\_old).
+subtracting :math:`3 k T \ln(\Lambda_{old})`.
 
 As an alternative to specifying mu directly, the ideal gas reservoir
-can be defined by its pressure P using the *pressure* keyword, in
+can be defined by its pressure *P* using the *pressure* keyword, in
 which case the user-specified chemical potential is ignored. The user
-may also specify the fugacity coefficient phi using the
-*fugacity\_coeff* keyword, which defaults to unity.
+may also specify the fugacity coefficient :math:`\phi` using the
+*fugacity_coeff* keyword, which defaults to unity.
 
-The *full\_energy* option means that the fix calculates the total
+The *full_energy* option means that the fix calculates the total
 potential energy of the entire simulated system, instead of just
 the energy of the part that is changed. The total system
 energy before and after the proposed GCMC exchange or MC move
@@ -298,7 +296,7 @@ in which case only
 partial energies are computed to determine the energy difference
 due to the proposed change.
 
-The *full\_energy* option is needed for systems with complicated
+The *full_energy* option is needed for systems with complicated
 potential energy calculations, including the following:
 
 * long-range electrostatics (kspace)
@@ -308,29 +306,29 @@ potential energy calculations, including the following:
 * tail corrections
 * need to include potential energy contributions from other fixes
 
-In these cases, LAMMPS will automatically apply the *full\_energy*
+In these cases, LAMMPS will automatically apply the *full_energy*
 keyword and issue a warning message.
 
-When the *mol* keyword is used, the *full\_energy* option also includes
+When the *mol* keyword is used, the *full_energy* option also includes
 the intramolecular energy of inserted and deleted molecules, whereas
-this energy is not included when *full\_energy* is not used. If this
-is not desired, the *intra\_energy* keyword can be used to define an
+this energy is not included when *full_energy* is not used. If this
+is not desired, the *intra_energy* keyword can be used to define an
 amount of energy that is subtracted from the final energy when a
 molecule is inserted, and subtracted from the initial energy when a molecule
 is deleted. For molecules that have a non-zero intramolecular energy,
 this will ensure roughly the same behavior whether or not the
-*full\_energy* option is used.
+*full_energy* option is used.
 
 Inserted atoms and molecules are assigned random velocities based on
-the specified temperature T. Because the relative velocity of all
+the specified temperature *T*. Because the relative velocity of all
 atoms in the molecule is zero, this may result in inserted molecules
 that are systematically too cold. In addition, the intramolecular
 potential energy of the inserted molecule may cause the kinetic energy
 of the molecule to quickly increase or decrease after insertion.  The
-*tfac\_insert* keyword allows the user to counteract these effects by
+*tfac_insert* keyword allows the user to counteract these effects by
 changing the temperature used to assign velocities to inserted atoms
 and molecules by a constant factor. For a particular application, some
-experimentation may be required to find a value of *tfac\_insert* that
+experimentation may be required to find a value of *tfac_insert* that
 results in inserted molecules that equilibrate quickly to the correct
 temperature.
 
@@ -359,8 +357,7 @@ therefore, you will want to use the
 current number of atoms is used as a normalizing factor each time
 temperature is computed. A simple example of this is:
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    compute_modify thermo_temp dynamic yes
 
@@ -376,21 +373,21 @@ in the context of NVT dynamics.
    solution is to start a new simulation after the equilibrium density
    has been reached.
 
-With some pair\_styles, such as :doc:`Buckingham <pair_buck>`,
+With some pair_styles, such as :doc:`Buckingham <pair_buck>`,
 :doc:`Born-Mayer-Huggins <pair_born>` and :doc:`ReaxFF <pair_reaxc>`, two
 atoms placed close to each other may have an arbitrary large, negative
 potential energy due to the functional form of the potential.  While
 these unphysical configurations are inaccessible to typical dynamical
 trajectories, they can be generated by Monte Carlo moves. The
-*overlap\_cutoff* keyword suppresses these moves by effectively
+*overlap_cutoff* keyword suppresses these moves by effectively
 assigning an infinite positive energy to all new configurations that
 place any pair of atoms closer than the specified overlap cutoff
 distance.
 
 The *max* and *min* keywords allow for the restriction of the number
-of atoms in the simulation. They automatically reject all insertion 
+of atoms in the simulation. They automatically reject all insertion
 or deletion moves that would take the system beyond the set boundaries.
-Should the system already be beyond the boundary, only moves that bring 
+Should the system already be beyond the boundary, only moves that bring
 the system closer to the bounds may be accepted.
 
 The *group* keyword adds all inserted atoms to the
@@ -398,7 +395,7 @@ The *group* keyword adds all inserted atoms to the
 adds all inserted atoms of the specified type to the
 :doc:`group <group>` of the group-ID value.
 
-**Restart, fix\_modify, output, run start/stop, minimize info:**
+**Restart, fix_modify, output, run start/stop, minimize info:**
 
 This fix writes the state of the fix to :doc:`binary restart files <restart>`.  This includes information about the random
 number generator seed, the next timestep for MC exchanges,  the number
@@ -437,12 +434,11 @@ the :doc:`run <run>` command.  This fix is not invoked during :doc:`energy minim
 Restrictions
 """"""""""""
 
-
 This fix is part of the MC package.  It is only enabled if LAMMPS was
 built with that package.  See the :doc:`Build package <Build_package>`
 doc page for more info.
 
-Do not set "neigh\_modify once yes" or else this fix will never be
+Do not set "neigh_modify once yes" or else this fix will never be
 called.  Reneighboring is required.
 
 Can be run in parallel, but aspects of the GCMC part will not scale
@@ -476,25 +472,16 @@ Related commands
 Default
 """""""
 
-The option defaults are mol = no, maxangle = 10, overlap\_cutoff = 0.0,
-fugacity\_coeff = 1.0, intra\_energy = 0.0, tfac\_insert = 1.0.
+The option defaults are mol = no, maxangle = 10, overlap_cutoff = 0.0,
+fugacity_coeff = 1.0, intra_energy = 0.0, tfac_insert = 1.0.
 (Patomtrans, Pmoltrans, Pmolrotate) = (1, 0, 0) for mol = no and
-(0, 1, 1) for mol = yes. full\_energy = no,
-except for the situations where full\_energy is required, as
+(0, 1, 1) for mol = yes. full_energy = no,
+except for the situations where full_energy is required, as
 listed above.
 
-
 ----------
 
-
 .. _Frenkel:
 
-
-
 **(Frenkel)** Frenkel and Smit, Understanding Molecular Simulation,
 Academic Press, London, 2002.
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/fix_gld.rst b/doc/src/fix_gld.rst
index 4826ce07ff..cb93804b1a 100644
--- a/doc/src/fix_gld.rst
+++ b/doc/src/fix_gld.rst
@@ -6,7 +6,6 @@ fix gld command
 Syntax
 """"""
 
-
 .. parsed-literal::
 
    fix ID group-ID gld Tstart Tstop N_k seed series c_1 tau_1 ... c_N_k tau_N_k keyword values ...
@@ -14,15 +13,15 @@ Syntax
 * ID, group-ID are documented in :doc:`fix <fix>` command
 * gld = style name of this fix command
 * Tstart,Tstop = desired temperature at start/end of run (temperature units)
-* N\_k = number of terms in the Prony series representation of the memory kernel
+* N_k = number of terms in the Prony series representation of the memory kernel
 * seed = random number seed to use for white noise (positive integer)
 * series = *pprony* is presently the only available option
-* c\_k = the weight of the kth term in the Prony series (mass per time units)
-* tau\_k = the time constant of the kth term in the Prony series (time units)
+* c_k = the weight of the kth term in the Prony series (mass per time units)
+* tau_k = the time constant of the kth term in the Prony series (time units)
 * zero or more keyword/value pairs may be appended
-  
+
   .. parsed-literal::
-  
+
      keyword = *frozen* or *zero*
        *frozen* value = *no* or *yes*
          *no* = initialize extended variables using values drawn from equilibrium distribution at Tstart
@@ -31,13 +30,10 @@ Syntax
          *no* = do not set total random force to zero
          *yes* = set total random force to zero
 
-
-
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    fix 1 all gld 1.0 1.0 2 82885 pprony 0.5 1.0 1.0 2.0 frozen yes zero yes
    fix 3 rouse gld 7.355 7.355 4 48823 pprony 107.1 0.02415 186.0 0.04294 428.6 0.09661 1714 0.38643
@@ -62,8 +58,11 @@ to be a Prony series.
 
 With this fix active, the force on the *j*\ th atom is given as
 
-.. image:: Eqs/fix_gld1.jpg
-   :align: center
+.. math::
+
+   {\bf F}_{j}(t) = & {\bf F}^C_j(t)-\int \limits_{0}^{t} \Gamma_j(t-s) {\bf v}_j(s)~\text{d}s + {\bf F}^R_j(t) \\
+   \Gamma_j(t-s) = & \sum \limits_{k=1}^{N_k} \frac{c_k}{\tau_k} e^{-(t-s)/\tau_k} \\
+   \langle{\bf F}^R_j(t),{\bf F}^R_j(s)\rangle = & \text{k$_\text{B}$T} ~\Gamma_j(t-s)
 
 Here, the first term is representative of all conservative (pairwise,
 bonded, etc) forces external to this fix, the second is the temporally
@@ -72,7 +71,7 @@ the colored Gaussian random force.
 
 The Prony series form of the memory kernel is chosen to enable an
 extended variable formalism, with a number of exemplary mathematical
-features discussed in :ref:`(Baczewski) <Baczewski>`. In particular, 3N\_k
+features discussed in :ref:`(Baczewski) <Baczewski>`. In particular, :math:`3N_k`
 extended variables are added to each atom, which effect the action of
 the memory kernel without having to explicitly evaluate the integral
 over time in the second term of the force. This also has the benefit
@@ -101,10 +100,8 @@ generate its own unique seed and its own stream of random
 numbers. Thus the dynamics of the system will not be identical on two
 runs on different numbers of processors.
 
-
 ----------
 
-
 The keyword/value option pairs are used in the following ways.
 
 The keyword *frozen* can be used to specify how the extended variables
@@ -124,10 +121,8 @@ to zero by subtracting off an equal part of it from each atom in the
 group. As a result, the center-of-mass of a system with zero initial
 momentum will not drift over time.
 
-
 ----------
 
-
 **Restart, run start/stop, minimize info:**
 
 The instantaneous values of the extended variables are written to
@@ -150,7 +145,6 @@ This fix is not invoked during :doc:`energy minimization <minimize>`.
 Restrictions
 """"""""""""
 
-
 This fix is part of the MISC package.  It is only enabled if LAMMPS
 was built with that package.  See the :doc:`Build package <Build_package>` doc page for more info.
 
@@ -165,17 +159,8 @@ Default
 
 The option defaults are frozen = no, zero = no.
 
-
 ----------
 
-
 .. _Baczewski:
 
-
-
 **(Baczewski)** A.D. Baczewski and S.D. Bond, J. Chem. Phys. 139, 044107 (2013).
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/fix_gle.rst b/doc/src/fix_gle.rst
index 53efdf91a5..fb6006d514 100644
--- a/doc/src/fix_gle.rst
+++ b/doc/src/fix_gle.rst
@@ -6,7 +6,6 @@ fix gle command
 Syntax
 """"""
 
-
 .. parsed-literal::
 
    fix ID id-group gle Ns Tstart Tstop seed Amatrix [noneq Cmatrix] [every stride]
@@ -18,22 +17,19 @@ Syntax
 * Amatrix = file to read the drift matrix A from
 * seed = random number seed to use for generating noise (positive integer)
 * zero or more keyword/value pairs may be appended
-  
+
   .. parsed-literal::
-  
+
        keyword = *noneq* or *every*
          *noneq* Cmatrix  = file to read the non-equilibrium covariance matrix from
          *every* stride   = apply the GLE once every time steps. Reduces the accuracy
              of the integration of the GLE, but has \*no effect\* on the accuracy of equilibrium
              sampling. It might change sampling properties when used together with *noneq*\ .
 
-
-
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    fix 3 boundary gle 6 300 300 31415 smart.A
    fix 1 all gle 6 300 300 31415 qt-300k.A noneq qt-300k.C
@@ -55,7 +51,6 @@ Each degree of freedom in the thermostatted group is supplemented
 with Ns additional degrees of freedom s, and the equations of motion
 become
 
-
 .. parsed-literal::
 
    dq/dt=p/m
@@ -104,7 +99,7 @@ input matrix for :doc:`fix gle <fix_gle>`. While the GLE scheme is more
 general, the form used by :doc:`fix gld <fix_gld>` can be more directly
 related to the representation of an implicit solvent environment.
 
-**Restart, fix\_modify, output, run start/stop, minimize info:**
+**Restart, fix_modify, output, run start/stop, minimize info:**
 
 The instantaneous values of the extended variables are written to
 :doc:`binary restart files <restart>`.  Because the state of the random
@@ -133,7 +128,6 @@ fix is "extensive".
 Restrictions
 """"""""""""
 
-
 The GLE thermostat in its current implementation should not be used
 with rigid bodies, SHAKE or RATTLE. It is expected that all the
 thermostatted degrees of freedom are fully flexible, and the sampled
@@ -152,31 +146,18 @@ Related commands
 
 :doc:`fix nvt <fix_nh>`, :doc:`fix temp/rescale <fix_temp_rescale>`, :doc:`fix viscous <fix_viscous>`, :doc:`fix nvt <fix_nh>`, :doc:`pair_style dpd/tstat <pair_dpd>`, :doc:`fix gld <fix_gld>`
 
-
 ----------
 
-
 .. _Ceriotti:
 
-
-
 **(Ceriotti)** Ceriotti, Bussi and Parrinello, J Chem Theory Comput 6,
 1170-80 (2010)
 
 .. _GLE4MD:
 
-
-
 **(GLE4MD)** `http://gle4md.org/ <http://gle4md.org/>`_
 
 .. _Ceriotti2:
 
-
-
 **(Ceriotti2)** Ceriotti, Bussi and Parrinello, Phys Rev Lett 103,
 030603 (2009)
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/fix_gravity.rst b/doc/src/fix_gravity.rst
index 87ed196a90..1d31384911 100644
--- a/doc/src/fix_gravity.rst
+++ b/doc/src/fix_gravity.rst
@@ -12,7 +12,6 @@ fix gravity/kk command
 Syntax
 """"""
 
-
 .. parsed-literal::
 
    fix ID group gravity magnitude style args
@@ -22,9 +21,9 @@ Syntax
 * magnitude = size of acceleration (force/mass units)
 * magnitude can be a variable (see below)
 * style = *chute* or *spherical* or *gradient* or *vector*
-  
+
   .. parsed-literal::
-  
+
        *chute* args = angle
          angle = angle in +x away from -z or -y axis in 3d/2d (in degrees)
          angle can be a variable (see below)
@@ -36,13 +35,10 @@ Syntax
          x y z = vector direction to apply the acceleration
          x or y or z can be a variable (see below)
 
-
-
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    fix 1 all gravity 1.0 chute 24.0
    fix 1 all gravity v_increase chute 24.0
@@ -86,7 +82,7 @@ length is ignored.  For 2d systems, the *z* component is ignored.
 Any of the quantities *magnitude*\ , *angle*\ , *phi*\ , *theta*\ , *x*\ , *y*\ ,
 *z* which define the gravitational magnitude and direction, can be
 specified as an equal-style :doc:`variable <variable>`.  If the value is
-a variable, it should be specified as v\_name, where name is the
+a variable, it should be specified as v_name, where name is the
 variable name.  In this case, the variable will be evaluated each
 timestep, and its value used to determine the quantity.  You should
 insure that the variable calculates a result in the appropriate units,
@@ -98,10 +94,8 @@ keywords for the simulation box parameters and timestep and elapsed
 time.  Thus it is easy to specify a time-dependent gravitational
 field.
 
-
 ----------
 
-
 Styles with a *gpu*\ , *intel*\ , *kk*\ , *omp*\ , or *opt* suffix are
 functionally the same as the corresponding style without the suffix.
 They have been optimized to run faster, depending on your available
@@ -120,11 +114,9 @@ by including their suffix, or you can use the :doc:`-suffix command-line switch
 See the :doc:`Speed packages <Speed_packages>` doc page for more
 instructions on how to use the accelerated styles effectively.
 
-
 ----------
 
-
-**Restart, fix\_modify, output, run start/stop, minimize info:**
+**Restart, fix_modify, output, run start/stop, minimize info:**
 
 No information about this fix is written to :doc:`binary restart files <restart>`.
 
@@ -156,8 +148,3 @@ Related commands
 :doc:`atom_style sphere <atom_style>`, :doc:`fix addforce <fix_addforce>`
 
 **Default:** none
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/fix_grem.rst b/doc/src/fix_grem.rst
index 68e143b1ad..eef39c1ffc 100644
--- a/doc/src/fix_grem.rst
+++ b/doc/src/fix_grem.rst
@@ -6,7 +6,6 @@ fix grem command
 Syntax
 """"""
 
-
 .. parsed-literal::
 
    fix ID group-ID grem lambda eta H0 thermostat-ID
@@ -21,8 +20,7 @@ Syntax
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    fix             fxgREM all grem 400 -0.01 -30000 fxnpt
    thermo_modify   press fxgREM_press
@@ -38,17 +36,18 @@ which uses non-Boltzmann ensembles to sample over first order phase
 transitions. The is done by defining replicas with an enthalpy
 dependent effective temperature
 
-.. image:: Eqs/fix_grem.jpg
-   :align: center
+.. math::
 
-with *eta* negative and steep enough to only intersect the
+  T_{eff} = \lambda + \eta (H - H_0)
+
+with :math:`\eta` negative and steep enough to only intersect the
 characteristic microcanonical temperature (Ts) of the system once,
-ensuring a unimodal enthalpy distribution in that replica. *Lambda* is
-the intercept and effects the generalized ensemble similar to how
-temperature effects a Boltzmann ensemble. *H0* is a reference
-enthalpy, and is typically set as the lowest desired sampled enthalpy.
-Further explanation can be found in our recent papers
-:ref:`(Malolepsza) <Malolepsza>`.
+ensuring a unimodal enthalpy distribution in that replica.
+:math:`\lambda` is the intercept and effects the generalized ensemble
+similar to how temperature effects a Boltzmann ensemble. :math:`H_0`
+is a reference enthalpy, and is typically set as the lowest desired
+sampled enthalpy.  Further explanation can be found in our recent
+papers :ref:`(Malolepsza) <Malolepsza>`.
 
 This fix requires a Nose-Hoover thermostat fix reference passed to the
 grem as *thermostat-ID*\ . Two distinct temperatures exist in this
@@ -59,13 +58,13 @@ algorithms can be used.
 
 The fix enforces a generalized ensemble in a single replica
 only. Typically, this ideology is combined with replica exchange with
-replicas differing by *lambda* only for simplicity, but this is not
+replicas differing by :math:`\lambda` only for simplicity, but this is not
 required. A multi-replica simulation can be run within the LAMMPS
 environment using the :doc:`temper/grem <temper_grem>` command. This
 utilizes LAMMPS partition mode and requires the number of available
 processors be on the order of the number of desired replicas. A
 100-replica simulation would require at least 100 processors (1 per
-world at minimum). If a many replicas are needed on a small number of
+world at minimum). If many replicas are needed on a small number of
 processors, multi-replica runs can be run outside of LAMMPS.  An
 example of this can be found in examples/USER/misc/grem and has no
 limit on the number of replicas per processor. However, this is very
@@ -74,19 +73,17 @@ inefficient and error prone and should be avoided if possible.
 In general, defining the generalized ensembles is unique for every
 system. When starting a many-replica simulation without any knowledge
 of the underlying microcanonical temperature, there are several tricks
-we have utilized to optimize the process.  Choosing a less-steep *eta*
-yields broader distributions, requiring fewer replicas to map the
-microcanonical temperature.  While this likely struggles from the same
-sampling problems gREM was built to avoid, it provides quick insight
-to Ts.  Initially using an evenly-spaced *lambda* distribution
-identifies regions where small changes in enthalpy lead to large
-temperature changes. Replicas are easily added where needed.
-
+we have utilized to optimize the process.  Choosing a less-steep
+:math:`\eta` yields broader distributions, requiring fewer replicas to
+map the microcanonical temperature.  While this likely struggles from
+the same sampling problems gREM was built to avoid, it provides quick
+insight to Ts.  Initially using an evenly-spaced :math:`\lambda`
+distribution identifies regions where small changes in enthalpy lead
+to large temperature changes. Replicas are easily added where needed.
 
 ----------
 
-
-**Restart, fix\_modify, output, run start/stop, minimize info:**
+**Restart, fix_modify, output, run start/stop, minimize info:**
 
 No information about this fix is written to :doc:`binary restart files <restart>`.
 
@@ -97,7 +94,6 @@ by this fix to add the rescaled kinetic pressure as part of
 Restrictions
 """"""""""""
 
-
 This fix is part of the USER-MISC package. It is only enabled if
 LAMMPS was built with that package. See the :doc:`Build package <Build_package>` doc page for more info.
 
@@ -108,24 +104,13 @@ Related commands
 
 **Default:** none
 
-
 ----------
 
-
 .. _Kim2010:
 
-
-
 **(Kim)** Kim, Keyes, Straub, J Chem. Phys, 132, 224107 (2010).
 
 .. _Malolepsza:
 
-
-
 **(Malolepsza)** Malolepsza, Secor, Keyes, J Phys Chem B 119 (42),
 13379-13384 (2015).
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/fix_halt.rst b/doc/src/fix_halt.rst
index e020ea7e26..9836679de3 100644
--- a/doc/src/fix_halt.rst
+++ b/doc/src/fix_halt.rst
@@ -6,7 +6,6 @@ fix halt command
 Syntax
 """"""
 
-
 .. parsed-literal::
 
    fix ID group-ID halt N attribute operator avalue keyword value ...
@@ -14,49 +13,50 @@ Syntax
 * ID, group-ID are documented in :doc:`fix <fix>` command
 * halt = style name of this fix command
 * N = check halt condition every N steps
-* attribute = *bondmax* or *tlimit* or v\_name
-  
+* attribute = *bondmax* or *tlimit* or v_name
+
   .. parsed-literal::
-  
-       bondmax = length of longest bond in the system
-       tlimit = elapsed CPU time
+
+       bondmax = length of longest bond in the system (in length units)
+       tlimit = elapsed CPU time (in seconds)
+       diskfree = free disk space (in megabytes)
        v_name = name of :doc:`equal-style variable <variable>`
 
 * operator = "<" or "<=" or ">" or ">=" or "==" or "!=" or "\|\^"
 * avalue = numeric value to compare attribute to
 * zero or more keyword/value pairs may be appended
-* keyword = *error* or *message*
-  
+* keyword = *error* or *message* or *path*
+
   .. parsed-literal::
-  
+
        *error* value = *hard* or *soft* or *continue*
        *message* value = *yes* or *no*
-
+       *path* value = path to check for free space (may be in quotes)
 
 
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    fix 10 all halt 1 bondmax > 1.5
-   fix 10 all print 10 v_myCheck != 0 error soft
+   fix 10 all halt 10 v_myCheck != 0 error soft
+   fix 10 all halt 100 diskfree < 100000.0 path "dump storage/."
 
 Description
 """""""""""
 
-Check a condition every N steps during a simulation run.  N must be >=
-1.  If the condition is met, exit the run immediately.  In this
-context a "run" can be dynamics or minimization iterations, as
-specified by the :doc:`run <run>` or :doc:`minimize <minimize>` command.
+Check a condition every N steps during a simulation run.  N must be >=1.
+If the condition is met, exit the run.  In this context a "run" can be
+dynamics or minimization iterations, as specified by the :doc:`run
+<run>` or :doc:`minimize <minimize>` command.
 
 The specified group-ID is ignored by this fix.
 
-The specified *attribute* can be one of the options listed above,
-namely *bondmax* or *tlimit*\ , or an :doc:`equal-style variable <variable>` referenced as *v\_name*, where "name" is the
-name of a variable that has been defined previously in the input
-script.
+The specified *attribute* can be one of the options listed above, namely
+*bondmax*, *tlimit*\ , *diskfree*\ , or an :doc:`equal-style variable
+<variable>` referenced as *v_name*, where "name" is the name of a
+variable that has been defined previously in the input script.
 
 The *bondmax* attribute will loop over all bonds in the system,
 compute their current lengths, and set *attribute* to the longest bond
@@ -70,7 +70,7 @@ using this method versus the timer command option.  The first is that
 the clock starts at the beginning of the current run (not when the
 timer or fix command is specified), so that any setup time for the run
 is not included in the elapsed time.  The second is that the timer
-invocation and syncing across all processors (via MPI\_Allreduce) is
+invocation and syncing across all processors (via MPI_Allreduce) is
 not performed once every *N* steps by this command.  Instead it is
 performed (typically) only a small number of times and the elapsed
 times are used to predict when the end-of-the-run will be.  Both of
@@ -80,6 +80,14 @@ a run is performing 1000s of timesteps/sec, the overhead for syncing
 the timer frequently across a large number of processors may be
 non-negligible.
 
+The *diskfree* attribute will check for available disk space (in
+megabytes) on supported operating systems. By default it will
+check the file system of the current working directory.  This
+can be changed with the optional *path* keyword, which will take
+the path to a file or folder on the file system to be checked
+as argument.  This path must be given with single or double quotes,
+if it contains blanks or other special characters (like \$).
+
 Equal-style variables evaluate to a numeric value.  See the
 :doc:`variable <variable>` command for a description.  They calculate
 formulas which can involve mathematical operations, atom properties,
@@ -90,8 +98,7 @@ computing some attribute of the current system.  For example, the
 following "bondmax" variable will calculate the same quantity as the
 hstyle = bondmax option.
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    compute         bdist all bond/local dist
    compute         bmax all reduce max c_bdist
@@ -99,8 +106,7 @@ hstyle = bondmax option.
 
 Thus these two versions of a fix halt command will do the same thing:
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    fix 10 all halt 1 bondmax > 1.5
    fix 10 all halt 1 v_bondmax > 1.5
@@ -117,10 +123,8 @@ it is "false".
 
 The specified *avalue* must be a numeric value.
 
-
 ----------
 
-
 The optional *error* keyword determines how the current run is halted.
 If its value is *hard*\ , then LAMMPS will stop with an error message.
 
@@ -146,7 +150,7 @@ is printed; the run simply exits.  The latter may be desirable for
 post-processing tools that extract thermodynamic information from log
 files.
 
-**Restart, fix\_modify, output, run start/stop, minimize info:**
+**Restart, fix_modify, output, run start/stop, minimize info:**
 
 No information about this fix is written to :doc:`binary restart files <restart>`.  None of the :doc:`fix_modify <fix_modify>` options
 are relevant to this fix.  No global or per-atom quantities are stored
@@ -156,7 +160,7 @@ the :doc:`run <run>` command.
 
 Restrictions
 """"""""""""
- none
+The *diskfree* attribute is currently only supported on Linux and MacOS.
 
 Related commands
 """"""""""""""""
@@ -166,9 +170,4 @@ Related commands
 Default
 """""""
 
-The option defaults are error = hard and message = yes.
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
+The option defaults are error = hard, message = yes, and path = ".".
diff --git a/doc/src/fix_heat.rst b/doc/src/fix_heat.rst
index c96a88ee35..82a2b6e7f8 100644
--- a/doc/src/fix_heat.rst
+++ b/doc/src/fix_heat.rst
@@ -6,7 +6,6 @@ fix heat command
 Syntax
 """"""
 
-
 .. parsed-literal::
 
    fix ID group-ID heat N eflux
@@ -18,19 +17,16 @@ Syntax
 * eflux can be a variable (see below)
 * zero or more keyword/value pairs may be appended to args
 * keyword = *region*
-  
+
   .. parsed-literal::
-  
+
        *region* value = region-ID
          region-ID = ID of region atoms must be in to have added force
 
-
-
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    fix 3 qin heat 1 1.0
    fix 3 qin heat 10 v_flux
@@ -76,8 +72,8 @@ time.  In this case, each value is an "intensive" quantity, which need
 not be scaled with the number of atoms in the group.
 
 As mentioned above, the *eflux* parameter can be specified as an
-equal-style or atom\_style :doc:`variable <variable>`.  If the value is a
-variable, it should be specified as v\_name, where name is the variable
+equal-style or atom_style :doc:`variable <variable>`.  If the value is a
+variable, it should be specified as v_name, where name is the variable
 name.  In this case, the variable will be evaluated each timestep, and
 its value(s) used to determine the flux.
 
@@ -100,7 +96,7 @@ with optional time-dependence as well.
 
 Fix heat is different from a thermostat such as :doc:`fix nvt <fix_nh>`
 or :doc:`fix temp/rescale <fix_temp_rescale>` in that energy is
-added/subtracted continually.  Thus if there isn't another mechanism
+added/subtracted continually.  Thus if there is not another mechanism
 in place to counterbalance this effect, the entire system will heat or
 cool continuously.  You can use multiple heat fixes so that the net
 energy change is 0.0 or use :doc:`fix viscous <fix_viscous>` to drain
@@ -112,7 +108,7 @@ their velocities.  Thus you must still use an integration fix
 not normally be used on atoms that have their temperature controlled
 by another fix - e.g. :doc:`fix nvt <fix_nh>` or :doc:`fix langevin <fix_langevin>` fix.
 
-**Restart, fix\_modify, output, run start/stop, minimize info:**
+**Restart, fix_modify, output, run start/stop, minimize info:**
 
 No information about this fix is written to :doc:`binary restart files <restart>`.  None of the :doc:`fix_modify <fix_modify>` options
 are relevant to this fix.
@@ -137,8 +133,3 @@ Related commands
 :doc:`fix ehex <fix_ehex>`, :doc:`compute temp <compute_temp>`, :doc:`compute temp/region <compute_temp_region>`
 
 **Default:** none
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/fix_hyper_global.rst b/doc/src/fix_hyper_global.rst
index 579d6cc681..c24d405b55 100644
--- a/doc/src/fix_hyper_global.rst
+++ b/doc/src/fix_hyper_global.rst
@@ -6,7 +6,6 @@ fix hyper/global command
 Syntax
 """"""
 
-
 .. parsed-literal::
 
    fix ID group-ID hyper/global cutbond qfactor Vmax Tequil
@@ -21,8 +20,7 @@ Syntax
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    fix 1 all hyper/global 1.0 0.3 0.8 300.0
 
@@ -58,65 +56,63 @@ Fichthorn as described in :ref:`(Miron) <Mironghd>`.  In LAMMPS we use a
 simplified version of bond-boost GHD where a single bond in the system
 is biased at any one timestep.
 
-Bonds are defined between each pair of I,J atoms whose R0ij distance
-is less than *cutbond*\ , when the system is in a quenched state
+Bonds are defined between each pair of atoms *ij*\ , whose :math:`R^0_{ij}`
+distance is less than *cutbond*\ , when the system is in a quenched state
 (minimum) energy.  Note that these are not "bonds" in a covalent
 sense.  A bond is simply any pair of atoms that meet the distance
 criterion.  *Cutbond* is an argument to this fix; it is discussed
-below.  A bond is only formed if one or both of the I.J atoms are in
+below.  A bond is only formed if one or both of the *ij* atoms are in
 the specified group.
 
-The current strain of bond IJ (when running dynamics) is defined as
+The current strain of bond *ij* (when running dynamics) is defined as
 
+.. math::
 
-.. parsed-literal::
+   E_{ij} = \frac{R_{ij} - R^0_{ij}}{R^0_{ij}}
 
-   Eij = (Rij - R0ij) / R0ij
+where :math:`R_{ij}` is the current distance between atoms *i* and *j*\ ,
+and :math:`R^0_{ij}` is the equilibrium distance in the quenched state.
 
-where Rij is the current distance between atoms I,J, and R0ij is the
-equilibrium distance in the quenched state.
+The bias energy :math:`V_{ij}` of any bond between atoms *i* and *j*
+is defined as
 
-The bias energy Vij of any bond IJ is defined as
+.. math::
 
+   V_{ij} = V^{max} \cdot \left( 1 - \left(\frac{E_{ij}}{q}\right)^2 \right) \textrm{ for } \left|E_{ij}\right| < qfactor \textrm{ or } 0 \textrm{ otherwise}
 
-.. parsed-literal::
-
-   Vij = Vmax \* (1 - (Eij/q)\^2) for abs(Eij) < qfactor
-       = 0 otherwise
-
-where the prefactor *Vmax* and the cutoff *qfactor* are arguments to
+where the prefactor :math:`V^{max}` and the cutoff *qfactor* are arguments to
 this fix; they are discussed below.  This functional form is an
-inverse parabola centered at 0.0 with height Vmax and which goes to
-0.0 at +/- qfactor.
+inverse parabola centered at 0.0 with height :math:`V^{max}` and
+which goes to 0.0 at +/- qfactor.
 
-Let Emax = the maximum of abs(Eij) for all IJ bonds in the system on a
-given timestep.  On that step, Vij is added as a bias potential to
-only the single bond with strain Emax, call it Vij(max).  Note that
-Vij(max) will be 0.0 if Emax >= qfactor on that timestep.  Also note
-that Vij(max) is added to the normal interatomic potential that is
-computed between all atoms in the system at every step.
+Let :math:`E^{max}` be the maximum of :math:`\left| E_{ij} \right|`
+for all *ij* bonds in the system on a
+given timestep.  On that step, :math:`V_{ij}` is added as a bias potential
+to only the single bond with strain :math:`E^{max}`, call it
+:math:`V^{max}_{ij}`.  Note that :math:`V^{max}_{ij}` will be 0.0
+if :math:`E^{max} >= \textrm{qfactor}` on that timestep.  Also note
+that :math:`V^{max}_{ij}` is added to the normal interatomic potential
+that is computed between all atoms in the system at every step.
 
-The derivative of Vij(max) with respect to the position of each atom
-in the Emax bond gives a bias force Fij(max) acting on the bond as
+The derivative of :math:`V^{max}_{ij}` with respect to the position of
+each atom in the :math:`E^{max}` bond gives a bias force
+:math:`F^{max}_{ij}` acting on the bond as
 
+.. math::
 
-.. parsed-literal::
-
-   Fij(max) = - dVij(max)/dEij = 2 Vmax Eij / qfactor\^2   for abs(Eij) < qfactor
-            = 0 otherwise
+   F^{max}_{ij} = - \frac{dV^{max}_{ij}}{dE_{ij}} = \frac{2 V^{max} E-{ij}}{\textrm{qfactor}^2}   \textrm{ for } \left|E_{ij}\right| < \textrm{qfactor} \textrm{ or } 0 \textrm{ otherwise}
 
 which can be decomposed into an equal and opposite force acting on
-only the two I,J atoms in the Emax bond.
+only the two *ij* atoms in the :math:`E^{max}` bond.
 
 The time boost factor for the system is given each timestep I by
 
+.. math::
 
-.. parsed-literal::
+   B_i = e^{\beta V^{max}_{ij}}
 
-   Bi = exp(beta \* Vij(max))
-
-where beta = 1/kTequil, and *Tequil* is the temperature of the system
-and an argument to this fix.  Note that Bi >= 1 at every step.
+where :math:`\beta = \frac{1}{kT_{equil}}`, and :math:`T_{equil}` is the temperature of the system
+and an argument to this fix.  Note that :math:`B_i >= 1` at every step.
 
 .. note::
 
@@ -125,34 +121,31 @@ and an argument to this fix.  Note that Bi >= 1 at every step.
    constant-temperature (NVT) dynamics.  LAMMPS does not check that this
    is done.
 
-The elapsed time t\_hyper for a GHD simulation running for *N*
+The elapsed time :math:`t_{hyper}` for a GHD simulation running for *N*
 timesteps is simply
 
+.. math::
 
-.. parsed-literal::
+   t_{hyper} = \sum_{i=1,N} B-i \cdot dt
 
-   t_hyper = Sum (i = 1 to N) Bi \* dt
-
-where dt is the timestep size defined by the :doc:`timestep <timestep>`
-command.  The effective time acceleration due to GHD is thus t\_hyper /
+where *dt* is the timestep size defined by the :doc:`timestep <timestep>`
+command.  The effective time acceleration due to GHD is thus t_hyper /
 N\*dt, where N\*dt is elapsed time for a normal MD run of N timesteps.
 
 Note that in GHD, the boost factor varies from timestep to timestep.
-Likewise, which bond has Emax strain and thus which pair of atoms the
-bias potential is added to, will also vary from timestep to timestep.
+Likewise, which bond has :math:`E^{max}` strain and thus which pair of
+atoms the bias potential is added to, will also vary from timestep to timestep.
 This is in contrast to local hyperdynamics (LHD) where the boost
 factor is an input parameter; see the :doc:`fix hyper/local <fix_hyper_local>` doc page for details.
 
-
 ----------
 
-
 Here is additional information on the input parameters for GHD.
 
 The *cutbond* argument is the cutoff distance for defining bonds
-between pairs of nearby atoms.  A pair of I,J atoms in their
+between pairs of nearby atoms.  A pair of *ij* atoms in their
 equilibrium, minimum-energy configuration, which are separated by a
-distance Rij < *cutbond*\ , are flagged as a bonded pair.  Setting
+distance :math:`R_{ij} < cutbond`, are flagged as a bonded pair.  Setting
 *cubond* to be ~25% larger than the nearest-neighbor distance in a
 crystalline lattice is a typical choice for solids, so that bonds
 exist only between nearest neighbor pairs.
@@ -166,7 +159,7 @@ could still experience a non-zero bias force.
 If *qfactor* is set too large, then transitions from one energy basin
 to another are affected because the bias potential is non-zero at the
 transition state (e.g. saddle point).  If *qfactor* is set too small
-than little boost is achieved because the Eij strain of some bond in
+than little boost is achieved because the :math:`E_{ij}` strain of some bond in
 the system will (nearly) always exceed *qfactor*\ .  A value of 0.3 for
 *qfactor* is typically reasonable.
 
@@ -183,7 +176,7 @@ time-accurate trajectory of the system.
 
 Note that if *Vmax* is set too small, the GHD simulation will run
 correctly.  There will just be fewer events because the hyper time
-(t\_hyper equation above) will be shorter.
+(t_hyper equation above) will be shorter.
 
 .. note::
 
@@ -202,11 +195,9 @@ In general, the lower the value of *Tequil* and the higher the value
 of *Vmax*\ , the more time boost will be achievable by the GHD
 algorithm.
 
-
 ----------
 
-
-**Restart, fix\_modify, output, run start/stop, minimize info:**
+**Restart, fix_modify, output, run start/stop, minimize info:**
 
 No information about this fix is written to :doc:`binary restart files <restart>`.
 
@@ -220,7 +211,7 @@ scalar is the magnitude of the bias potential (energy units) applied on
 the current timestep.  The vector stores the following quantities:
 
 * 1 = boost factor on this step (unitless)
-* 2 = max strain Eij of any bond on this step (absolute value, unitless)
+* 2 = max strain :math:`E_{ij}` of any bond on this step (absolute value, unitless)
 * 3 = ID of first atom in the max-strain bond
 * 4 = ID of second atom in the max-strain bond
 * 5 = average # of bonds/atom on this step
@@ -266,7 +257,6 @@ the :doc:`run <run>` command.  This fix is not invoked during :doc:`energy minim
 Restrictions
 """"""""""""
 
-
 This command can only be used if LAMMPS was built with the REPLICA
 package.  See the :doc:`Build package <Build_package>` doc page for more
 info.
@@ -278,24 +268,13 @@ Related commands
 
 **Default:** None
 
-
 ----------
 
-
 .. _Voter2013ghd:
 
-
-
 **(Voter2013)** S. Y. Kim, D. Perez, A. F. Voter, J Chem Phys, 139,
 144110 (2013).
 
 .. _Mironghd:
 
-
-
 **(Miron)** R. A. Miron and K. A. Fichthorn, J Chem Phys, 119, 6210 (2003).
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/fix_hyper_local.rst b/doc/src/fix_hyper_local.rst
index 6758c747b6..a8e7483dac 100644
--- a/doc/src/fix_hyper_local.rst
+++ b/doc/src/fix_hyper_local.rst
@@ -6,7 +6,6 @@ fix hyper/local command
 Syntax
 """"""
 
-
 .. parsed-literal::
 
    fix ID group-ID hyper/local cutbond qfactor Vmax Tequil Dcut alpha Btarget
@@ -22,9 +21,9 @@ Syntax
 * Btarget = desired time boost factor (unitless)
 * zero or more keyword/value pairs may be appended
 * keyword = *bound* or *reset* or *check/ghost* or *check/bias*
-  
+
   .. parsed-literal::
-  
+
        *bound* value = Bfrac
          Bfrac =  -1 or a value >= 0.0
        *reset* value = Rfreq
@@ -32,13 +31,10 @@ Syntax
        *check/ghost* values = none
        *check/bias* values = Nevery error/warn/ignore
 
-
-
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    fix 1 all hyper/local 1.0 0.3 0.8 300.0
    fix 1 all hyper/local 1.0 0.3 0.8 300.0 bound 0.1 reset 0
@@ -77,66 +73,63 @@ To understand this description, you should first read the description
 of the GHD algorithm on the :doc:`fix hyper/global <fix_hyper_global>`
 doc page.  This description of LHD builds on the GHD description.
 
-The definition of bonds and Eij are the same for GHD and LHD.  The
-formulas for Vij(max) and Fij(max) are also the same except for a
-pre-factor Cij, explained below.
+The definition of bonds and :math:`E_{ij}` are the same for GHD and LHD.
+The formulas for :math:`V^{max}_{ij}` and :math:`F^{max}_{ij}` are also
+the same except for a pre-factor :math:`C_{ij}`, explained below.
 
-The bias energy Vij applied to a bond IJ with maximum strain is
+The bias energy :math:`V_{ij}` applied to a bond *ij* with maximum strain is
 
+.. math::
 
-.. parsed-literal::
+   V^{max}_{ij} = C_{ij} \cdot V^{max} \cdot \left(1 - \left(\frac{E_{ij}}{q}\right)^2\right) \textrm{ for } \left|E_{ij}\right| < qfactor \textrm{ or } 0 \textrm{ otherwise}
 
-   Vij(max) = Cij \* Vmax \* (1 - (Eij/q)\^2) for abs(Eij) < qfactor
-            = 0 otherwise
+The derivative of :math:`V^{max}_{ij}` with respect to the position of
+each atom in the *ij* bond gives a bias force :math:`F^{max}_{ij}` acting
+on the bond as
 
-The derivative of Vij(max) with respect to the position of each atom
-in the IJ bond gives a bias force Fij(max) acting on the bond as
+.. math::
 
-
-.. parsed-literal::
-
-   Fij(max) = - dVij(max)/dEij = 2 Cij Vmax Eij / qfactor\^2   for abs(Eij) < qfactor
-            = 0 otherwise
+   F^{max}_{ij} = - \frac{dV^{max}_{ij}}{dE_{ij}} = 2 C_{ij} V^{max} \frac{E_{ij}}{qfactor^2} \textrm{ for } \left|E_{ij}\right| < qfactor \textrm{ or } 0 \textrm{ otherwise}
 
 which can be decomposed into an equal and opposite force acting on
-only the two I,J atoms in the IJ bond.
+only the two atoms *i* and *j* in the *ij* bond.
 
 The key difference is that in GHD a bias energy and force is added (on
 a particular timestep) to only one bond (pair of atoms) in the system,
-which is the bond with maximum strain Emax.
+which is the bond with maximum strain :math:`E^{max}`.
 
 In LHD, a bias energy and force can be added to multiple bonds
-separated by the specified *Dcut* distance or more.  A bond IJ is
+separated by the specified *Dcut* distance or more.  A bond *ij* is
 biased if it is the maximum strain bond within its local
-"neighborhood", which is defined as the bond IJ plus any neighbor
-bonds within a distance *Dcut* from IJ.  The "distance" between bond
-IJ and bond KL is the minimum distance between any of the IK, IL, JK,
-JL pairs of atoms.
+"neighborhood", which is defined as the bond *ij* plus any neighbor
+bonds within a distance *Dcut* from *ij*.  The "distance" between bond
+*ij* and bond *kl* is the minimum distance between any of the *ik*, *il*,
+*jk*, and *jl* pairs of atoms.
 
 For a large system, multiple bonds will typically meet this
-requirement, and thus a bias potential Vij(max) will be applied to
-many bonds on the same timestep.
+requirement, and thus a bias potential :math:`V^{max}_{ij}` will be
+applied to many bonds on the same timestep.
 
-In LHD, all bonds store a Cij prefactor which appears in the Vij(max)
-and Fij(max) equations above.  Note that the Cij factor scales the
-strength of the bias energy and forces whenever bond IJ is the maximum
-strain bond in its neighborhood.
+In LHD, all bonds store a :math:`C_{ij}` prefactor which appears in
+the :math:`V^{max}_{ij}` and :math:`F^{max}_{ij}equations above.  Note
+that the :math:`C_{ij}` factor scales the strength of the bias energy
+and forces whenever bond *ij* is the maximum strain bond in its neighborhood.
 
-Cij is initialized to 1.0 when a bond between the I,J atoms is first
-defined.  The specified *Btarget* factor is then used to adjust the
-Cij prefactors for each bond every timestep in the following manner.
+:math:`C_{ij}` is initialized to 1.0 when a bond between the *ij* atoms
+is first defined.  The specified *Btarget* factor is then used to adjust the
+:math:`C_{ij}` prefactors for each bond every timestep in the following manner.
 
-An instantaneous boost factor Bij is computed each timestep
+An instantaneous boost factor :math:`B_{ij}` is computed each timestep
 for each bond, as
 
+.. math::
 
-.. parsed-literal::
+   B_{ij} = e^{\beta V^{max}_{kl}}
 
-   Bij = exp(beta \* Vkl(max))
-
-where Vkl(max) is the bias energy of the maxstrain bond KL within bond
-IJ's neighborhood, beta = 1/kTequil, and *Tequil* is the temperature
-of the system and an argument to this fix.
+where :math:`V^{max}_{kl}` is the bias energy of the maxstrain bond *kl*
+within bond *ij*\ 's neighborhood, :math:`\beta = \frac{1}{kT_{equil}}`,
+and :math:`T_{equil}` is the temperature of the system and an argument
+to this fix.
 
 .. note::
 
@@ -146,33 +139,33 @@ of the system and an argument to this fix.
    running constant-temperature (NVT) dynamics.  LAMMPS does not check
    that this is done.
 
-Note that if IJ = KL, then bond IJ is a biased bond on that timestep,
-otherwise it is not.  But regardless, the boost factor Bij can be
-thought of an estimate of time boost currently being applied within a
-local region centered on bond IJ.  For LHD, we want this to be the
-specified *Btarget* value everywhere in the simulation domain.
+Note that if *ij*\ == *kl*\ , then bond *ij* is a biased bond on that
+timestep, otherwise it is not.  But regardless, the boost factor
+:math:`B_{ij}` can be thought of an estimate of time boost currently
+being applied within a local region centered on bond *ij*.  For LHD,
+we want this to be the specified *Btarget* value everywhere in the
+simulation domain.
 
-To accomplish this, if Bij < Btarget, the Cij prefactor for bond IJ is
-incremented on the current timestep by an amount proportional to the
-inverse of the specified *alpha* and the difference (Bij - Btarget).
-Conversely if Bij > Btarget, Cij is decremented by the same amount.
-This procedure is termed "boostostatting" in
-:ref:`(Voter2013) <Voter2013lhd>`.  It drives all of the individual Cij to
-values such that when Vij\ *max* is applied as a bias to bond IJ, the
-resulting boost factor Bij will be close to *Btarget* on average.
-Thus the LHD time acceleration factor for the overall system is
-effectively *Btarget*\ .
+To accomplish this, if :math:`B_{ij} < B_{target}`, the :math:`C_{ij}`
+prefactor for bond *ij* is incremented on the current timestep by an
+amount proportional to the inverse of the specified :math:`\alpha` and
+the difference (:math:`B_{ij} - B_{target}`).  Conversely if
+:math:`B_{ij} > B_{target}`, :math:`C_{ij}` is decremented by the same
+amount.  This procedure is termed "boostostatting" in :ref:`(Voter2013)
+<Voter2013lhd>`.  It drives all of the individual :math:`C_{ij}` to
+values such that when :math:`V^{max}_{ij}` is applied as a bias to bond
+*ij*, the resulting boost factor :math:`B_{ij}` will be close to
+:math:`B_{target}` on average.  Thus the LHD time acceleration factor
+for the overall system is effectively *Btarget*\ .
 
-Note that in LHD, the boost factor *Btarget* is specified by the user.
+Note that in LHD, the boost factor :math:`B_{target}` is specified by the user.
 This is in contrast to global hyperdynamics (GHD) where the boost
-factor varies each timestep and is computed as a function of *Vmax*\ ,
-Emax, and *Tequil*\ ; see the :doc:`fix hyper/global <fix_hyper_global>`
-doc page for details.
-
+factor varies each timestep and is computed as a function of :math:`V_{max}`,
+:math:`E_{max}`, and :math:`T_{equil}`; see the
+:doc:`fix hyper/global <fix_hyper_global>` doc page for details.
 
 ----------
 
-
 Here is additional information on the input parameters for LHD.
 
 Note that the *cutbond*\ , *qfactor*\ , and *Tequil* arguments have the
@@ -182,7 +175,7 @@ The *Dcut*\ , *alpha*\ , and *Btarget* parameters are unique to LHD.
 The *cutbond* argument is the cutoff distance for defining bonds
 between pairs of nearby atoms.  A pair of I,J atoms in their
 equilibrium, minimum-energy configuration, which are separated by a
-distance Rij < *cutbond*\ , are flagged as a bonded pair.  Setting
+distance :math:`R_{ij} < cutbond`, are flagged as a bonded pair.  Setting
 *cubond* to be ~25% larger than the nearest-neighbor distance in a
 crystalline lattice is a typical choice for solids, so that bonds
 exist only between nearest neighbor pairs.
@@ -190,37 +183,40 @@ exist only between nearest neighbor pairs.
 The *qfactor* argument is the limiting strain at which the bias
 potential goes to 0.0.  It is dimensionless, so a value of 0.3 means a
 bond distance can be up to 30% larger or 30% smaller than the
-equilibrium (quenched) R0ij distance and the two atoms in the bond
+equilibrium (quenched) :math:`R^0_{ij}` distance and the two atoms in the bond
 could still experience a non-zero bias force.
 
 If *qfactor* is set too large, then transitions from one energy basin
 to another are affected because the bias potential is non-zero at the
 transition state (e.g. saddle point).  If *qfactor* is set too small
-than little boost can be achieved because the Eij strain of some bond in
+than little boost can be achieved because the :math:`E_{ij}` strain of
+some bond in
 the system will (nearly) always exceed *qfactor*\ .  A value of 0.3 for
 *qfactor* is typically a reasonable value.
 
 The *Vmax* argument is a fixed prefactor on the bias potential.  There
-is a also a dynamic prefactor Cij, driven by the choice of *Btarget*
-as discussed above.  The product of these should be a value less than
+is a also a dynamic prefactor :math:`C_{ij}`, driven by the choice of
+*Btarget* as discussed above.  The product of these should be a value less than
 the smallest barrier height for an event to occur.  Otherwise the
 applied bias potential may be large enough (when added to the
 interatomic potential) to produce a local energy basin with a maxima
 in the center.  This can produce artificial energy minima in the same
-basin that trap an atom.  Or if Cij\*\ *Vmax* is even larger, it may
+basin that trap an atom.  Or if :math:`C_{ij} \cdot V^{max}` is even
+larger, it may
 induce an atom(s) to rapidly transition to another energy basin.  Both
 cases are "bad dynamics" which violate the assumptions of LHD that
 guarantee an accelerated time-accurate trajectory of the system.
 
 .. note::
 
-   It may seem that *Vmax* can be set to any value, and Cij will
-   compensate to reduce the overall prefactor if necessary.  However the
-   Cij are initialized to 1.0 and the boostostatting procedure typically
-   operates slowly enough that there can be a time period of bad dynamics
-   if *Vmax* is set too large.  A better strategy is to set *Vmax* to the
+   It may seem that :math:`V^{max}` can be set to any value, and
+   :math:`C_{ij}` will compensate to reduce the overall prefactor
+   if necessary.  However the :math:`C_{ij}` are initialized to 1.0
+   and the boostostatting procedure typically operates slowly enough
+   that there can be a time period of bad dynamics if :math:`V^{max}`
+   is set too large.  A better strategy is to set :math:`V^{max}` to the
    slightly smaller than the lowest barrier height for an event (the same
-   as for GHD), so that the Cij remain near unity.
+   as for GHD), so that the :math:`C_{ij}` remain near unity.
 
 The *Tequil* argument is the temperature at which the system is
 simulated; see the comment above about the :doc:`fix langevin <fix_langevin>` thermostatting.  It is also part of the
@@ -249,11 +245,10 @@ well for many solid-state systems.
    atoms move (between quenched states) to be considered an "event".  It
    is an argument to the "compute event/displace" command used to detect
    events.  By default the ghost communication distance is set by the
-   pair\_style cutoff, which will typically be < *Dcut*\ .  The :doc:`comm_modify cutoff <comm_modify>` command should be used to override the ghost
+   pair_style cutoff, which will typically be < *Dcut*\ .  The :doc:`comm_modify cutoff <comm_modify>` command should be used to override the ghost
    cutoff explicitly, e.g.
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    comm_modify cutoff 12.0
 
@@ -262,44 +257,43 @@ half the *cutbond* parameter as an estimate to warn if the ghost
 cutoff is not long enough.
 
 As described above the *alpha* argument is a pre-factor in the
-boostostat update equation for each bond's Cij prefactor.  *Alpha* is
-specified in time units, similar to other thermostat or barostat
+boostostat update equation for each bond's :math:`C_{ij}` prefactor.
+*Alpha* is specified in time units, similar to other thermostat or barostat
 damping parameters.  It is roughly the physical time it will take the
-boostostat to adjust a Cij value from a too high (or too low) value to
-a correct one.  An *alpha* setting of a few ps is typically good for
+boostostat to adjust a :math:`C_{ij}` value from a too high (or too low)
+value to a correct one.  An *alpha* setting of a few ps is typically good for
 solid-state systems.  Note that the *alpha* argument here is the
 inverse of the alpha parameter discussed in
 :ref:`(Voter2013) <Voter2013lhd>`.
 
 The *Btarget* argument is the desired time boost factor (a value > 1)
 that all the atoms in the system will experience.  The elapsed time
-t\_hyper for an LHD simulation running for *N* timesteps is simply
+t_hyper for an LHD simulation running for *N* timesteps is simply
 
+.. math::
 
-.. parsed-literal::
+   t_{hyper} = B_{target} \cdot N \cdot dt
 
-   t_hyper = Btarget \* N\*dt
-
-where dt is the timestep size defined by the :doc:`timestep <timestep>`
-command.  The effective time acceleration due to LHD is thus t\_hyper /
-N\*dt = Btarget, where N\*dt is elapsed time for a normal MD run
-of N timesteps.
+where *dt* is the timestep size defined by the :doc:`timestep <timestep>`
+command.  The effective time acceleration due to LHD is thus
+:math:`\frac{t_{hyper}}{N\cdot dt} = B_{target}`, where :math:`N\cdot dt`
+is the elapsed time for a normal MD run of N timesteps.
 
 You cannot choose an arbitrarily large setting for *Btarget*\ .  The
 maximum value you should choose is
 
+.. math::
 
-.. parsed-literal::
+   B_{target} = e^{\beta V_{small}}
 
-   Btarget = exp(beta \* Vsmall)
-
-where Vsmall is the smallest event barrier height in your system, beta
-= 1/kTequil, and *Tequil* is the specified temperature of the system
+where :math:`V_{small}` is the smallest event barrier height in your
+system, :math:`\beta = \frac{1}{kT_{equil}}`, and :math:`T_{equil}`
+is the specified temperature of the system
 (both by this fix and the Langevin thermostat).
 
 Note that if *Btarget* is set smaller than this, the LHD simulation
 will run correctly.  There will just be fewer events because the hyper
-time (t\_hyper equation above) will be shorter.
+time (t_hyper equation above) will be shorter.
 
 .. note::
 
@@ -309,47 +303,46 @@ time (t\_hyper equation above) will be shorter.
    simulations with smaller and smaller *Btarget* values, until the event
    rate does not change (as a function of hyper time).
 
-
 ----------
 
-
 Here is additional information on the optional keywords for this fix.
 
-The *bound* keyword turns on min/max bounds for bias coefficients Cij
-for all bonds.  Cij is a prefactor for each bond on the bias potential
-of maximum strength Vmax.  Depending on the choice of *alpha* and
-*Btarget* and *Vmax*\ , the boostostatting can cause individual Cij
-values to fluctuate.  If the fluctuations are too large Cij\*Vmax can
-exceed low barrier heights and induce bad event dynamics.  Bounding
-the Cij values is a way to prevent this.  If *Bfrac* is set to -1 or
-any negative value (the default) then no bounds are enforced on Cij
-values (except they must always be >= 0.0).  A *Bfrac* setting >= 0.0
-sets a lower bound of 1.0 - Bfrac and upper bound of 1.0 + Bfrac on
-each Cij value.  Note that all Cij values are initialized to 1.0 when
-a bond is created for the first time.  Thus *Bfrac* limits the bias
-potential height to *Vmax* +/- *Bfrac*\ \*\ *Vmax*\ .
+The *bound* keyword turns on min/max bounds for bias coefficients
+:math:`C_{ij}` for all bonds.  :math:`C_{ij}` is a prefactor for each bond on
+the bias potential of maximum strength :math:`V^{max}`.  Depending on the
+choice of *alpha* and *Btarget* and *Vmax*\ , the boostostatting can cause
+individual :math:`C_{ij}` values to fluctuate.  If the fluctuations are too
+large :math:`C_{ij} \cdot V^{max}` can exceed low barrier heights and induce
+bad event dynamics.  Bounding the :math:`C_{ij}` values is a way to prevent
+this.  If *Bfrac* is set to -1 or any negative value (the default) then no
+bounds are enforced on :math:`C_{ij}` values (except they must always
+be >= 0.0).  A *Bfrac* setting >= 0.0
+sets a lower bound of 1.0 - Bfrac and upper bound of 1.0 + Bfrac on each
+:math:`C_{ij}` value.  Note that all :math:`C_{ij}` values are initialized
+to 1.0 when a bond is created for the first time.  Thus *Bfrac* limits the
+bias potential height to *Vmax* +/- *Bfrac*\ \*\ *Vmax*\ .
 
-The *reset* keyword allow *Vmax* to be adjusted dynamically depending
-on the average value of all Cij prefactors.  This can be useful if you
+The *reset* keyword allow *Vmax* to be adjusted dynamically depending on the
+average value of all :math:`C_{ij}` prefactors.  This can be useful if you
 are unsure what value of *Vmax* will match the *Btarget* boost for the
-system.  The Cij values will then adjust in aggregate (up or down) so
-that Cij\*Vmax produces a boost of *Btarget*\ , but this may conflict
-with the *bound* keyword settings.  By using *bound* and *reset*
-together, *Vmax* itself can be reset, and desired bounds still applied
-to the Cij values.
+system.  The :math:`C_{ij}` values will then adjust in aggregate (up or down)
+so that :math:`C_{ij} \cdot V^{max}` produces a boost of *Btarget*\ , but this
+may conflict with the *bound* keyword settings.  By using *bound* and *reset*
+together, :math:`V^{max}` itself can be reset, and desired bounds still applied
+to the :math:`C_{ij}` values.
 
 A setting for *Rfreq* of -1 (the default) means *Vmax* never changes.
-A setting of 0 means *Vmax* is adjusted every time an event occurs and
+A setting of 0 means :math:`V^{max}` is adjusted every time an event occurs and
 bond pairs are recalculated.  A setting of N > 0 timesteps means
-*Vmax* is adjusted on the first time an event occurs on a timestep >=
-N steps after the previous adjustment.  The adjustment to *Vmax* is
-computed as follows.  The current average of all Cij\*Vmax values is
-computed and the *Vmax* is reset to that value.  All Cij values are
-changed to new prefactors such the new Cij\*Vmax is the same as it was
-previously.  If the *bound* keyword was used, those bounds are
-enforced on the new Cij values.  Henceforth, new bonds are assigned a
-Cij = 1.0, which means their bias potential magnitude is the new
-*Vmax*\ .
+:math:`V^{max}` is adjusted on the first time an event occurs on a timestep >=
+N steps after the previous adjustment.  The adjustment to :math:`V^{max}` is
+computed as follows.  The current average of all :math:`C_{ij} \cdot V^{max}`
+values is computed and the :math:`V^{max}` is reset to that value.  All
+:math:`C_{ij}` values are changed to new prefactors such the new
+:math:`C_{ij} \cdot V^{max}` is the same as it was previously.  If the
+*bound* keyword was used, those bounds are enforced on the new :math:`C_{ij}`
+values.  Henceforth, new bonds are assigned a :math:`C_{ij} = 1.0`, which
+means their bias potential magnitude is the new :math:`V^{max}`.
 
 The *check/ghost* keyword turns on extra computation each timestep to
 compute statistics about ghost atoms used to determine which bonds to
@@ -370,11 +363,9 @@ keyword is not enabled, the output of that statistic will be 0.
 Note that both of these computations are costly, hence they are only
 enabled by these keywords.
 
-
 ----------
 
-
-**Restart, fix\_modify, output, run start/stop, minimize info:**
+**Restart, fix_modify, output, run start/stop, minimize info:**
 
 No information about this fix is written to :doc:`binary restart files <restart>`.
 
@@ -390,8 +381,8 @@ vector stores the following quantities:
 
 * 1 = average boost for all bonds on this step (unitless)
 * 2 = # of biased bonds on this step
-* 3 = max strain Eij of any bond on this step (absolute value, unitless)
-* 4 = value of Vmax on this step (energy units)
+* 3 = max strain :math:`E_{ij}` of any bond on this step (absolute value, unitless)
+* 4 = value of :math:`V^{max}` on this step (energy units)
 * 5 = average bias coeff for all bonds on this step (unitless)
 * 6 = min bias coeff for all bonds on this step (unitless)
 * 7 = max bias coeff for all bonds on this step (unitless)
@@ -428,12 +419,12 @@ multiple runs (since the point in the input script the fix was
 defined).
 
 For value 10, each bond instantaneous boost factor is given by the
-equation for Bij above.  The total system boost (average across all
+equation for :math:`B_{ij}` above.  The total system boost (average across all
 bonds) fluctuates, but should average to a value close to the
-specified Btarget.
+specified :math:`B_{target}`.
 
 For value 12, the numerator is a count of all biased bonds on each
-timestep whose bias energy = 0.0 due to Eij >= *qfactor*\ .  The
+timestep whose bias energy = 0.0 due to :math:`E_{ij} >= qfactor`.  The
 denominator is the count of all biased bonds on all timesteps.
 
 For value 13, the numerator is a count of all biased bonds on each
@@ -522,12 +513,12 @@ The scalar and vector values calculated by this fix are all
 "intensive".
 
 This fix also computes a local vector of length the number of bonds
-currently in the system.  The value for each bond is its Cij prefactor
-(bias coefficient).  These values can be can be accessed by various
+currently in the system.  The value for each bond is its :math:`C_{ij}`
+prefactor (bias coefficient).  These values can be can be accessed by various
 :doc:`output commands <Howto_output>`.  A particularly useful one is the
 :doc:`fix ave/histo <fix_ave_histo>` command which can be used to
 histogram the Cij values to see if they are distributed reasonably
-close to 1.0, which indicates a good choice of *Vmax*\ .
+close to 1.0, which indicates a good choice of :math:`V^{max}`.
 
 The local values calculated by this fix are unitless.
 
@@ -537,7 +528,6 @@ the :doc:`run <run>` command.  This fix is not invoked during :doc:`energy minim
 Restrictions
 """"""""""""
 
-
 This fix is part of the REPLICA package.  It is only enabled if LAMMPS
 was built with that package.  See the :doc:`Build package <Build_package>`
 doc page for more info.
@@ -554,24 +544,13 @@ The default settings for optimal keywords are bounds = -1 and reset =
 -1.  The check/ghost and check/bias keywords are not enabled by
 default.
 
-
 ----------
 
-
 .. _Voter2013lhd:
 
-
-
 **(Voter2013)** S. Y. Kim, D. Perez, A. F. Voter, J Chem Phys, 139,
 144110 (2013).
 
 .. _Mironlhd:
 
-
-
 **(Miron)** R. A. Miron and K. A. Fichthorn, J Chem Phys, 119, 6210 (2003).
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/fix_imd.rst b/doc/src/fix_imd.rst
index 75c5ccc741..fe54e5bf50 100644
--- a/doc/src/fix_imd.rst
+++ b/doc/src/fix_imd.rst
@@ -6,7 +6,6 @@ fix imd command
 Syntax
 """"""
 
-
 .. parsed-literal::
 
    fix ID group-ID imd trate port keyword values ...
@@ -15,9 +14,9 @@ Syntax
 * imd = style name of this fix command
 * port = port number on which the fix listens for an IMD client
 * keyword = *unwrap* or *fscale* or *trate*
-  
+
   .. parsed-literal::
-  
+
        *unwrap* arg = *on* or *off*
          off = coordinates are wrapped back into the principal unit cell (default)
          on = "unwrapped" coordinates using the image flags used
@@ -28,13 +27,10 @@ Syntax
          off = LAMMPS waits to be connected to an IMD client before continuing (default)
          on = LAMMPS listens for an IMD client, but continues with the run
 
-
-
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    fix vmd all imd 5678
    fix comm all imd 8888 trate 5 unwrap on fscale 10.0
@@ -48,7 +44,7 @@ IMD protocol, as initially implemented in VMD and NAMD.  Specifically
 it allows LAMMPS to connect an IMD client, for example the `VMD visualization program <VMD_>`_, so that it can monitor the progress of the
 simulation and interactively apply forces to selected atoms.
 
-If LAMMPS is compiled with the pre-processor flag -DLAMMPS\_ASYNC\_IMD
+If LAMMPS is compiled with the pre-processor flag -DLAMMPS_ASYNC_IMD
 then fix imd will use POSIX threads to spawn a IMD communication
 thread on MPI rank 0 in order to offload data reading and writing
 from the main execution thread and potentially lower the inferred
@@ -108,7 +104,6 @@ with fix imd enabled, one needs to start VMD and load a coordinate or
 topology file that matches the fix group.  When the VMD command
 prompts appears, one types the command line:
 
-
 .. parsed-literal::
 
    imd connect localhost 5678
@@ -138,17 +133,11 @@ screen output is active.
 
 .. _VMD: http://www.ks.uiuc.edu/Research/vmd
 
-
-
 .. _imdvmd: http://www.ks.uiuc.edu/Research/vmd/imd/
 
-
-
 .. _vrpnicms: http://sites.google.com/site/akohlmey/software/vrpn-icms
 
-
-
-**Restart, fix\_modify, output, run start/stop, minimize info:**
+**Restart, fix_modify, output, run start/stop, minimize info:**
 
 No information about this fix is written to :doc:`binary restart files <restart>`.  None of the :doc:`fix_modify <fix_modify>` options
 are relevant to this fix.  No global scalar or vector or per-atom
@@ -159,7 +148,6 @@ fix is not invoked during :doc:`energy minimization <minimize>`.
 Restrictions
 """"""""""""
 
-
 This fix is part of the USER-MISC package.  It is only enabled if
 LAMMPS was built with that package.  See the :doc:`Build package <Build_package>` doc page for more info.
 
@@ -175,8 +163,3 @@ needs to use a different port number.
 **Related commands:** none
 
 **Default:** none
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/fix_indent.rst b/doc/src/fix_indent.rst
index ea8aa28b41..ef62506591 100644
--- a/doc/src/fix_indent.rst
+++ b/doc/src/fix_indent.rst
@@ -6,7 +6,6 @@ fix indent command
 Syntax
 """"""
 
-
 .. parsed-literal::
 
    fix ID group-ID indent K keyword values ...
@@ -16,9 +15,9 @@ Syntax
 * K = force constant for indenter surface (force/distance\^2 units)
 * one or more keyword/value pairs may be appended
 * keyword = *sphere* or *cylinder* or *plane* or *side* or *units*
-  
+
   .. parsed-literal::
-  
+
        *sphere* args = x y z R
          x,y,z = initial position of center of indenter (distance units)
          R = sphere radius of indenter (distance units)
@@ -40,13 +39,10 @@ Syntax
          lattice = the geometry is defined in lattice units
          box = the geometry is defined in simulation box units
 
-
-
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    fix 1 all indent 10.0 sphere 0.0 0.0 15.0 3.0
    fix 1 all indent 10.0 sphere v_x v_y 0.0 v_radius side in
@@ -66,10 +62,9 @@ must set one of those 3 keywords.
 
 A spherical indenter exerts a force of magnitude
 
+.. math::
 
-.. parsed-literal::
-
-   F(r) = - K (r - R)\^2
+   F(r) = - K \left( r - R \right)^2
 
 on each atom where *K* is the specified force constant, *r* is the
 distance from the atom to the center of the indenter, and *R* is the
@@ -105,7 +100,7 @@ be specified as an equal-style :doc:`variable <variable>`, namely *x*\ ,
 *y*\ , *z*\ , or *R*\ .  Similarly, for a cylindrical indenter, any of *c1*\ ,
 *c2*\ , or *R*\ , can be a variable.  For a planar indenter, *pos* can be
 a variable.  If the value is a variable, it should be specified as
-v\_name, where name is the variable name.  In this case, the variable
+v_name, where name is the variable name.  In this case, the variable
 will be evaluated each timestep, and its value used to define the
 indenter geometry.
 
@@ -117,35 +112,32 @@ change as a function of time or span consecutive runs in a continuous
 fashion.  For the latter, see the *start* and *stop* keywords of the
 :doc:`run <run>` command and the *elaplong* keyword of :doc:`thermo_style custom <thermo_style>` for details.
 
-For example, if a spherical indenter's x-position is specified as v\_x,
+For example, if a spherical indenter's x-position is specified as v_x,
 then this variable definition will keep it's center at a relative
 position in the simulation box, 1/4 of the way from the left edge to
 the right edge, even if the box size changes:
 
+.. code-block:: LAMMPS
 
-.. parsed-literal::
-
-   variable x equal "xlo + 0.25\*lx"
+   variable x equal "xlo + 0.25*lx"
 
 Similarly, either of these variable definitions will move the indenter
 from an initial position at 2.5 at a constant velocity of 5:
 
+.. code-block:: LAMMPS
 
-.. parsed-literal::
-
-   variable x equal "2.5 + 5\*elaplong\*dt"
+   variable x equal "2.5 + 5*elaplong*dt"
    variable x equal vdisplace(2.5,5)
 
-If a spherical indenter's radius is specified as v\_r, then these
+If a spherical indenter's radius is specified as v_r, then these
 variable definitions will grow the size of the indenter at a specified
 rate.
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    variable r0 equal 0.0
    variable rate equal 1.0
-   variable r equal "v_r0 + step\*dt\*v_rate"
+   variable r equal "v_r0 + step*dt*v_rate"
 
 If the *side* keyword is specified as *out*\ , which is the default,
 then particles outside the indenter are pushed away from its outer
@@ -179,13 +171,12 @@ lattice spacing, you can define K with a variable whose formula
 contains *xlat*\ , *ylat*\ , *zlat* keywords of the
 :doc:`thermo_style <thermo_style>` command, e.g.
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    variable k equal 100.0/xlat/xlat
    fix 1 all indent $k sphere ...
 
-**Restart, fix\_modify, output, run start/stop, minimize info:**
+**Restart, fix_modify, output, run start/stop, minimize info:**
 
 No information about this fix is written to :doc:`binary restart files <restart>`.
 
@@ -227,8 +218,3 @@ Default
 """""""
 
 The option defaults are side = out and units = lattice.
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/fix_ipi.rst b/doc/src/fix_ipi.rst
index 1dc89c4174..d60b25248d 100644
--- a/doc/src/fix_ipi.rst
+++ b/doc/src/fix_ipi.rst
@@ -6,7 +6,6 @@ fix ipi command
 Syntax
 """"""
 
-
 .. parsed-literal::
 
    fix ID group-ID ipi address port [unix] [reset]
@@ -21,8 +20,10 @@ Syntax
 Examples
 """"""""
 
-fix 1 all ipi my.server.com 12345
-fix 1 all ipi mysocket 666 unix reset
+.. code-block:: LAMMPS
+
+   fix 1 all ipi my.server.com 12345
+   fix 1 all ipi mysocket 666 unix reset
 
 Description
 """""""""""
@@ -68,7 +69,7 @@ If the cell varies too wildly, it may be advisable to re-initialize
 these interactions at each call. This behavior can be requested by
 setting the *reset* switch.
 
-**Restart, fix\_modify, output, run start/stop, minimize info:**
+**Restart, fix_modify, output, run start/stop, minimize info:**
 
 There is no restart information associated with this fix, since all
 the dynamical parameters are dealt with by i-PI.
@@ -76,7 +77,6 @@ the dynamical parameters are dealt with by i-PI.
 Restrictions
 """"""""""""
 
-
 Using this fix on anything other than all atoms requires particular
 care, since i-PI will know nothing on atoms that are not those whose
 coordinates are transferred. However, one could use this strategy to
@@ -93,25 +93,14 @@ Related commands
 
 :doc:`fix nve <fix_nve>`
 
-
 ----------
 
-
 .. _IPICPC:
 
-
-
 **(IPI-CPC)** Ceriotti, More and Manolopoulos, Comp Phys Comm, 185,
 1019-1026 (2014).
 
 .. _ipihome:
 
-
-
 **(IPI)**
 `http://epfl-cosmo.github.io/gle4md/index.html?page=ipi <http://epfl-cosmo.github.io/gle4md/index.html?page=ipi>`_
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/fix_langevin.rst b/doc/src/fix_langevin.rst
index 429e831a11..7a45293db9 100644
--- a/doc/src/fix_langevin.rst
+++ b/doc/src/fix_langevin.rst
@@ -9,7 +9,6 @@ fix langevin/kk command
 Syntax
 """"""
 
-
 .. parsed-literal::
 
    fix ID group-ID langevin Tstart Tstop damp seed keyword values ...
@@ -22,9 +21,9 @@ Syntax
 * seed = random number seed to use for white noise (positive integer)
 * zero or more keyword/value pairs may be appended
 * keyword = *angmom* or *omega* or *scale* or *tally* or *zero*
-  
+
   .. parsed-literal::
-  
+
        *angmom* value = *no* or factor
          *no* = do not thermostat rotational degrees of freedom via the angular momentum
          factor = do thermostat rotational degrees of freedom via the angular momentum and apply numeric scale factor as discussed below
@@ -45,13 +44,10 @@ Syntax
          *no* = do not set total random force to zero
          *yes* = set total random force to zero
 
-
-
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    fix 3 boundary langevin 1.0 1.0 1000.0 699483
    fix 1 all langevin 1.0 1.1 100.0 48279 scale 3 1.5
@@ -66,36 +62,35 @@ implicit solvent.  Used with :doc:`fix nve <fix_nve>`, this command
 performs Brownian dynamics (BD), since the total force on each atom
 will have the form:
 
+.. math::
 
-.. parsed-literal::
+   F = & F_c + F_f + F_r \\
+   F_f = & - \frac{m}{\mathrm{damp}} v \\
+   F_r \propto & \sqrt{\frac{k_B T m}{dt~\mathrm{damp}}}
 
-   F = Fc + Ff + Fr
-   Ff = - (m / damp) v
-   Fr is proportional to sqrt(Kb T m / (dt damp))
+:math:`F_c` is the conservative force computed via the usual
+inter-particle interactions (:doc:`pair_style <pair_style>`,
+:doc:`bond_style <bond_style>`, etc).  The :math:`F_f` and :math:`F_r`
+terms are added by this fix on a per-particle basis.  See the
+:doc:`pair_style dpd/tstat <pair_dpd>` command for a thermostatting
+option that adds similar terms on a pairwise basis to pairs of
+interacting particles.
 
-Fc is the conservative force computed via the usual inter-particle
-interactions (:doc:`pair_style <pair_style>`,
-:doc:`bond_style <bond_style>`, etc).
+:math:`F_f` is a frictional drag or viscous damping term proportional to
+the particle's velocity.  The proportionality constant for each atom is
+computed as :math:`\frac{m}{\mathrm{damp}}`, where *m* is the mass of the
+particle and damp is the damping factor specified by the user.
 
-The Ff and Fr terms are added by this fix on a per-particle basis.
-See the :doc:`pair_style dpd/tstat <pair_dpd>` command for a
-thermostatting option that adds similar terms on a pairwise basis to
-pairs of interacting particles.
-
-Ff is a frictional drag or viscous damping term proportional to the
-particle's velocity.  The proportionality constant for each atom is
-computed as m/damp, where m is the mass of the particle and damp is
-the damping factor specified by the user.
-
-Fr is a force due to solvent atoms at a temperature T randomly bumping
-into the particle.  As derived from the fluctuation/dissipation
-theorem, its magnitude as shown above is proportional to sqrt(Kb T m /
-dt damp), where Kb is the Boltzmann constant, T is the desired
-temperature, m is the mass of the particle, dt is the timestep size,
-and damp is the damping factor.  Random numbers are used to randomize
-the direction and magnitude of this force as described in
-:ref:`(Dunweg) <Dunweg1>`, where a uniform random number is used (instead of
-a Gaussian random number) for speed.
+:math:`F_r` is a force due to solvent atoms at a temperature *T*
+randomly bumping into the particle.  As derived from the
+fluctuation/dissipation theorem, its magnitude as shown above is
+proportional to :math:`\sqrt{\frac{k_B T m}{dt~\mathrm{damp}}}`, where
+:math:`k_B` is the Boltzmann constant, *T* is the desired temperature,
+*m* is the mass of the particle, *dt* is the timestep size, and damp is
+the damping factor.  Random numbers are used to randomize the direction
+and magnitude of this force as described in :ref:`(Dunweg) <Dunweg1>`,
+where a uniform random number is used (instead of a Gaussian random
+number) for speed.
 
 Note that unless you use the *omega* or *angmom* keywords, the
 thermostat effect of this fix is applied to only the translational
@@ -107,14 +102,15 @@ thermostatting takes place; see the description below.
 
 .. note::
 
-   Unlike the :doc:`fix nvt <fix_nh>` command which performs
-   Nose/Hoover thermostatting AND time integration, this fix does NOT
-   perform time integration.  It only modifies forces to effect
-   thermostatting.  Thus you must use a separate time integration fix,
-   like :doc:`fix nve <fix_nve>` to actually update the velocities and
-   positions of atoms using the modified forces.  Likewise, this fix
-   should not normally be used on atoms that also have their temperature
-   controlled by another fix - e.g. by :doc:`fix nvt <fix_nh>` or :doc:`fix temp/rescale <fix_temp_rescale>` commands.
+   Unlike the :doc:`fix nvt <fix_nh>` command which performs Nose/Hoover
+   thermostatting AND time integration, this fix does NOT perform time
+   integration.  It only modifies forces to effect thermostatting.  Thus
+   you must use a separate time integration fix, like :doc:`fix nve
+   <fix_nve>` to actually update the velocities and positions of atoms
+   using the modified forces.  Likewise, this fix should not normally be
+   used on atoms that also have their temperature controlled by another
+   fix - e.g. by :doc:`fix nvt <fix_nh>` or :doc:`fix temp/rescale
+   <fix_temp_rescale>` commands.
 
 See the :doc:`Howto thermostat <Howto_thermostat>` doc page for
 a discussion of different ways to compute temperature and perform
@@ -126,7 +122,7 @@ run from *Tstart* to *Tstop*\ .
 *Tstart* can be specified as an equal-style or atom-style
 :doc:`variable <variable>`.  In this case, the *Tstop* setting is
 ignored.  If the value is a variable, it should be specified as
-v\_name, where name is the variable name.  In this case, the variable
+v_name, where name is the variable name.  In this case, the variable
 will be evaluated each timestep, and its value used to determine the
 target temperature.
 
@@ -154,13 +150,14 @@ the remaining thermal degrees of freedom, and the bias is added back
 in.
 
 The *damp* parameter is specified in time units and determines how
-rapidly the temperature is relaxed.  For example, a value of 100.0
-means to relax the temperature in a timespan of (roughly) 100 time
-units (tau or fmsec or psec - see the :doc:`units <units>` command).
-The damp factor can be thought of as inversely related to the
-viscosity of the solvent.  I.e. a small relaxation time implies a
-hi-viscosity solvent and vice versa.  See the discussion about gamma
-and viscosity in the documentation for the :doc:`fix viscous <fix_viscous>` command for more details.
+rapidly the temperature is relaxed.  For example, a value of 100.0 means
+to relax the temperature in a timespan of (roughly) 100 time units
+(:math:`\tau` or fs or ps - see the :doc:`units <units>` command).  The
+damp factor can be thought of as inversely related to the viscosity of
+the solvent.  I.e. a small relaxation time implies a high-viscosity
+solvent and vice versa.  See the discussion about :math:`\gamma` and
+viscosity in the documentation for the :doc:`fix viscous <fix_viscous>`
+command for more details.
 
 The random # *seed* must be a positive integer.  A Marsaglia random
 number generator is used.  Each processor uses the input seed to
@@ -168,18 +165,16 @@ generate its own unique seed and its own stream of random numbers.
 Thus the dynamics of the system will not be identical on two runs on
 different numbers of processors.
 
-
 ----------
 
-
 The keyword/value option pairs are used in the following ways.
 
 The keyword *angmom* and *omega* keywords enable thermostatting of
 rotational degrees of freedom in addition to the usual translational
 degrees of freedom.  This can only be done for finite-size particles.
 
-A simulation using atom\_style sphere defines an omega for finite-size
-spheres.  A simulation using atom\_style ellipsoid defines a finite
+A simulation using atom_style sphere defines an omega for finite-size
+spheres.  A simulation using atom_style ellipsoid defines a finite
 size and shape for aspherical particles and an angular momentum.
 The Langevin formulas for thermostatting the rotational degrees of
 freedom are the same as those above, where force is replaced by
@@ -191,39 +186,40 @@ The rotational temperature of the particles can be monitored by the
 :doc:`compute temp/sphere <compute_temp_sphere>` and :doc:`compute temp/asphere <compute_temp_asphere>` commands with their rotate
 options.
 
-For the *omega* keyword there is also a scale factor of 10.0/3.0 that
-is applied as a multiplier on the Ff (damping) term in the equation
-above and of sqrt(10.0/3.0) as a multiplier on the Fr term.  This does
-not affect the thermostatting behavior of the Langevin formalism but
-insures that the randomized rotational diffusivity of spherical
-particles is correct.
+For the *omega* keyword there is also a scale factor of
+:math:`\frac{10.0}{3.0}` that is applied as a multiplier on the
+:math:`F_f` (damping) term in the equation above and of
+:math:`\sqrt{\frac{10.0}{3.0}}` as a multiplier on the :math:`F_r` term.
+This does not affect the thermostatting behavior of the Langevin
+formalism but insures that the randomized rotational diffusivity of
+spherical particles is correct.
 
 For the *angmom* keyword a similar scale factor is needed which is
-10.0/3.0 for spherical particles, but is anisotropic for aspherical
-particles (e.g. ellipsoids).  Currently LAMMPS only applies an
-isotropic scale factor, and you can choose its magnitude as the
+:math:`\frac{10.0}{3.0}` for spherical particles, but is anisotropic for
+aspherical particles (e.g. ellipsoids).  Currently LAMMPS only applies
+an isotropic scale factor, and you can choose its magnitude as the
 specified value of the *angmom* keyword.  If your aspherical particles
-are (nearly) spherical than a value of 10.0/3.0 = 3.333 is a good
-choice.  If they are highly aspherical, a value of 1.0 is as good a
-choice as any, since the effects on rotational diffusivity of the
-particles will be incorrect regardless.  Note that for any reasonable
-scale factor, the thermostatting effect of the *angmom* keyword on the
-rotational temperature of the aspherical particles should still be
-valid.
+are (nearly) spherical than a value of :math:`\frac{10.0}{3.0} =
+3.\overline{3}` is a good choice.  If they are highly aspherical, a
+value of 1.0 is as good a choice as any, since the effects on rotational
+diffusivity of the particles will be incorrect regardless.  Note that
+for any reasonable scale factor, the thermostatting effect of the
+*angmom* keyword on the rotational temperature of the aspherical
+particles should still be valid.
 
 The keyword *scale* allows the damp factor to be scaled up or down by
 the specified factor for atoms of that type.  This can be useful when
 different atom types have different sizes or masses.  It can be used
 multiple times to adjust damp for several atom types.  Note that
 specifying a ratio of 2 increases the relaxation time which is
-equivalent to the solvent's viscosity acting on particles with 1/2 the
-diameter.  This is the opposite effect of scale factors used by the
-:doc:`fix viscous <fix_viscous>` command, since the damp factor in fix
-*langevin* is inversely related to the gamma factor in fix *viscous*\ .
-Also note that the damping factor in fix *langevin* includes the
-particle mass in Ff, unlike fix *viscous*\ .  Thus the mass and size of
-different atom types should be accounted for in the choice of ratio
-values.
+equivalent to the solvent's viscosity acting on particles with
+:math:`\frac{1}{2}` the diameter.  This is the opposite effect of scale
+factors used by the :doc:`fix viscous <fix_viscous>` command, since the
+damp factor in fix *langevin* is inversely related to the :math:`\gamma`
+factor in fix *viscous*\ .  Also note that the damping factor in fix
+*langevin* includes the particle mass in Ff, unlike fix *viscous*\ .
+Thus the mass and size of different atom types should be accounted for
+in the choice of ratio values.
 
 The keyword *tally* enables the calculation of the cumulative energy
 added/subtracted to the atoms as they are thermostatted.  Effectively
@@ -270,10 +266,8 @@ Regardless of the choice of output velocity, the sampling of the configurational
 distribution of atom positions is the same, and linearly consistent with the
 target temperature.
 
-
 ----------
 
-
 Styles with a *gpu*\ , *intel*\ , *kk*\ , *omp*\ , or *opt* suffix are
 functionally the same as the corresponding style without the suffix.
 They have been optimized to run faster, depending on your available
@@ -292,11 +286,9 @@ by including their suffix, or you can use the :doc:`-suffix command-line switch
 See the :doc:`Speed packages <Speed_packages>` doc page for more
 instructions on how to use the accelerated styles effectively.
 
-
 ----------
 
-
-**Restart, fix\_modify, output, run start/stop, minimize info:**
+**Restart, fix_modify, output, run start/stop, minimize info:**
 
 No information about this fix is written to :doc:`binary restart files <restart>`.  Because the state of the random number generator
 is not saved in restart files, this means you cannot do "exact"
@@ -330,9 +322,8 @@ This fix is not invoked during :doc:`energy minimization <minimize>`.
 Restrictions
 """"""""""""
 
-
 For *gjf* do not choose damp=dt/2. *gjf* is not compatible
-with run\_style respa.
+with run_style respa.
 
 Related commands
 """"""""""""""""
@@ -345,42 +336,25 @@ Default
 The option defaults are angmom = no, omega = no, scale = 1.0 for all
 types, tally = no, zero = no, gjf = no.
 
-
 ----------
 
-
 .. _Dunweg1:
 
-
-
 **(Dunweg)** Dunweg and Paul, Int J of Modern Physics C, 2, 817-27 (1991).
 
 .. _Schneider1:
 
-
-
 **(Schneider)** Schneider and Stoll, Phys Rev B, 17, 1302 (1978).
 
 .. _Gronbech-Jensen:
 
-
-
 **(Gronbech-Jensen)** Gronbech-Jensen and Farago, Mol Phys, 111, 983
 (2013); Gronbech-Jensen, Hayre, and Farago, Comp Phys Comm, 185, 524 (2014)
 
 .. _2Gronbech-Jensen:
 
-
-
 **(Gronbech-Jensen)** Gronbech Jensen and Gronbech-Jensen, Mol Phys, 117, 2511 (2019)
 
 .. _1Gronbech-Jensen:
 
-
-
 **(Gronbech-Jensen)** Gronbech-Jensen, Mol Phys (2019); https://doi.org/10.1080/00268976.2019.1662506
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/fix_langevin_drude.rst b/doc/src/fix_langevin_drude.rst
index 32546f69b0..f361a88736 100644
--- a/doc/src/fix_langevin_drude.rst
+++ b/doc/src/fix_langevin_drude.rst
@@ -6,7 +6,6 @@ fix langevin/drude command
 Syntax
 """"""
 
-
 .. parsed-literal::
 
    fix ID group-ID langevin/drude Tcom damp_com seed_com Tdrude damp_drude seed_drude keyword values ...
@@ -14,27 +13,24 @@ Syntax
 * ID, group-ID are documented in :doc:`fix <fix>` command
 * langevin/drude = style name of this fix command
 * Tcom = desired temperature of the centers of mass (temperature units)
-* damp\_com = damping parameter for the thermostat on centers of mass (time units)
-* seed\_com = random number seed to use for white noise of the thermostat on centers of mass (positive integer)
+* damp_com = damping parameter for the thermostat on centers of mass (time units)
+* seed_com = random number seed to use for white noise of the thermostat on centers of mass (positive integer)
 * Tdrude = desired temperature of the Drude oscillators (temperature units)
-* damp\_drude = damping parameter for the thermostat on Drude oscillators (time units)
-* seed\_drude = random number seed to use for white noise of the thermostat on Drude oscillators (positive integer)
+* damp_drude = damping parameter for the thermostat on Drude oscillators (time units)
+* seed_drude = random number seed to use for white noise of the thermostat on Drude oscillators (positive integer)
 * zero or more keyword/value pairs may be appended
 * keyword = *zero*
-  
+
   .. parsed-literal::
-  
+
        *zero* value = *no* or *yes*
          *no* = do not set total random force on centers of mass to zero
          *yes* = set total random force on centers of mass to zero
 
-
-
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    fix 3 all langevin/drude 300.0 100.0 19377 1.0 20.0 83451
    fix 1 all langevin/drude 298.15 100.0 19377 5.0 10.0 83451 zero yes
@@ -60,50 +56,46 @@ Velocities:
 
 .. math::
 
-   \begin{equation} V' = \frac {M\, V + m\, v} {M'} \end{equation}
-
+    V' = \frac {M\, V + m\, v} {M'}
 
 .. math::
 
-   \begin{equation} v' = v - V \end{equation}
+    v' = v - V
 
 Masses:
 
 .. math::
 
-   \begin{equation} M' = M + m \end{equation}
-
+    M' = M + m
 
 .. math::
 
-   \begin{equation} m' = \frac {M\, m } {M'} \end{equation}
+    m' = \frac {M\, m } {M'}
 
 The Langevin forces are computed as
 
 .. math::
 
-   \begin{equation} F' = - \frac {M'} {\mathtt{damp\_com}}\, V' + F_r' \end{equation}
-
+    F' = - \frac {M'} {\mathtt{damp_com}}\, V' + F_r'
 
 .. math::
 
-   \begin{equation} f' = - \frac {m'} {\mathtt{damp\_drude}}\, v' + f_r' \end{equation}
+    f' = - \frac {m'} {\mathtt{damp_drude}}\, v' + f_r'
 
 :math:`F_r'` is a random force proportional to
-:math:`\sqrt { \frac {2\, k_B \mathtt{Tcom}\, m'}                  {\mathrm dt\, \mathtt{damp\_com} }         }`.
+:math:`\sqrt { \frac {2\, k_B \mathtt{Tcom}\, m'}                  {\mathrm dt\, \mathtt{damp_com} }         }`.
 :math:`f_r'` is a random force proportional to
-:math:`\sqrt { \frac {2\, k_B \mathtt{Tdrude}\, m'}                  {\mathrm dt\, \mathtt{damp\_drude} }         }`.
+:math:`\sqrt { \frac {2\, k_B \mathtt{Tdrude}\, m'}                  {\mathrm dt\, \mathtt{damp_drude} }         }`.
 Then the real forces acting on the particles are computed from the inverse
 transform:
 
 .. math::
 
-   \begin{equation} F = \frac M {M'}\, F' - f' \end{equation}
-
+    F = \frac M {M'}\, F' - f'
 
 .. math::
 
-   \begin{equation} f = \frac m {M'}\, F' + f' \end{equation}
+    f = \frac m {M'}\, F' + f'
 
 This fix also thermostats non-polarizable atoms in the group at
 temperature *Tcom*\ , as if they had a massless Drude partner.  The
@@ -132,10 +124,8 @@ See the :doc:`Howto thermostat <Howto_thermostat>` doc page for a
 discussion of different ways to compute temperature and perform
 thermostatting.
 
-
 ----------
 
-
 This fix requires each atom know whether it is a Drude particle or
 not.  You must therefore use the :doc:`fix drude <fix_drude>` command to
 specify the Drude status of each atom type.
@@ -155,21 +145,18 @@ specify the Drude status of each atom type.
    correctly.  You must use the :doc:`comm_modify <comm_modify>` command to
    enable this, e.g.
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    comm_modify vel yes
 
-
 ----------
 
-
 *Tcom* is the target temperature of the centers of mass, which would
 be used to thermostat the non-polarizable atoms.  *Tdrude* is the
 (normally low) target temperature of the core-Drude particle pairs
 (dipoles).  *Tcom* and *Tdrude* can be specified as an equal-style
 :doc:`variable <variable>`.  If the value is a variable, it should be
-specified as v\_name, where name is the variable name. In this case,
+specified as v_name, where name is the variable name. In this case,
 the variable will be evaluated each timestep, and its value used to
 determine the target temperature.
 
@@ -198,14 +185,14 @@ neighboring atoms. The optimal value probably depends on the
 temperature of the centers of mass and on the mass of the Drude
 particles.
 
-*damp\_com* is the characteristic time for reaching thermal equilibrium
+*damp_com* is the characteristic time for reaching thermal equilibrium
 of the centers of mass.  For example, a value of 100.0 means to relax
 the temperature of the centers of mass in a timespan of (roughly) 100
 time units (tau or fmsec or psec - see the :doc:`units <units>`
-command).  *damp\_drude* is the characteristic time for reaching
+command).  *damp_drude* is the characteristic time for reaching
 thermal equilibrium of the dipoles. It is typically a few timesteps.
 
-The number *seed\_com* and *seed\_drude* are positive integers. They set
+The number *seed_com* and *seed_drude* are positive integers. They set
 the seeds of the Marsaglia random number generators used for
 generating the random forces on centers of mass and on the
 dipoles. Each processor uses the input seed to generate its own unique
@@ -229,14 +216,11 @@ center-of-mass and relative coordinates, respectively, can be
 calculated using the :doc:`compute temp/drude <compute_temp_drude>`
 command.
 
-
 ----------
 
-
 Usage example for rigid bodies in the NPT ensemble:
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    comm_modify vel yes
    fix TEMP all langevin/drude 300. 100. 1256 1. 20. 13977 zero yes
@@ -263,19 +247,16 @@ Comments:
   :doc:`compute temp/drude <compute_temp_drude>`
 * Contrary to the alternative thermostatting using Nose-Hoover thermostat
   fix *npt* and :doc:`fix drude/transform <fix_drude_transform>`, the
-  *fix\_modify* command is not required here, because the fix *nph*
+  *fix_modify* command is not required here, because the fix *nph*
   computes the global pressure even if its group is *ATOMS*\ . This is
   what we want. If we thermostatted *ATOMS* using *npt*\ , the pressure
   should be the global one, but the temperature should be only that of
-  the cores. That's why the command *fix\_modify* should be called in
+  the cores. That's why the command *fix_modify* should be called in
   that case.
 
-
-
 ----------
 
-
-**Restart, fix\_modify, output, run start/stop, minimize info:**
+**Restart, fix_modify, output, run start/stop, minimize info:**
 
 No information about this fix is written to :doc:`binary restart files <restart>`.  Because the state of the random number generator
 is not saved in restart files, this means you cannot do "exact"
@@ -309,18 +290,9 @@ Default
 
 The option defaults are zero = no.
 
-
 ----------
 
-
 .. _Jiang1:
 
-
-
 **(Jiang)** Jiang, Hardy, Phillips, MacKerell, Schulten, and Roux, J
 Phys Chem Lett, 2, 87-92 (2011).
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/fix_langevin_eff.rst b/doc/src/fix_langevin_eff.rst
index d9f00a76ea..36768d25b2 100644
--- a/doc/src/fix_langevin_eff.rst
+++ b/doc/src/fix_langevin_eff.rst
@@ -6,7 +6,6 @@ fix langevin/eff command
 Syntax
 """"""
 
-
 .. parsed-literal::
 
    fix ID group-ID langevin/eff Tstart Tstop damp seed keyword values ...
@@ -17,9 +16,9 @@ Syntax
 * damp = damping parameter (time units)
 * seed = random number seed to use for white noise (positive integer)
 * zero or more keyword/value pairs may be appended
-  
+
   .. parsed-literal::
-  
+
      keyword = *scale* or *tally* or *zero*
        *scale* values = type ratio
          type = atom type (1-N)
@@ -28,20 +27,16 @@ Syntax
          *no* = do not tally the energy added/subtracted to atoms
          *yes* = do tally the energy added/subtracted to atoms
 
-  
   .. parsed-literal::
-  
+
        *zero* value = *no* or *yes*
          *no* = do not set total random force to zero
          *yes* = set total random force to zero
 
-
-
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    fix 3 boundary langevin/eff 1.0 1.0 10.0 699483
    fix 1 all langevin/eff 1.0 1.1 10.0 48279 scale 3 1.5
@@ -54,29 +49,30 @@ to a group of nuclei and electrons in the :doc:`electron force field <pair_eff>`
 this command performs Brownian dynamics (BD), since the total force on
 each atom will have the form:
 
+.. math::
 
-.. parsed-literal::
+   F   = & F_c + F_f + F_r \\
+   F_f = & - \frac{m}{\mathrm{damp}} v \\
+   F_r \propto &  \sqrt{\frac{k_B T m}{dt~\mathrm{damp}}}
 
-   F = Fc + Ff + Fr
-   Ff = - (m / damp) v
-   Fr is proportional to sqrt(Kb T m / (dt damp))
+:math:`F_c` is the conservative force computed via the usual
+inter-particle interactions (:doc:`pair_style <pair_style>`).
+The :math:`F_f` and :math:`F_r` terms are added by this fix on a
+per-particle basis.
 
-Fc is the conservative force computed via the usual inter-particle
-interactions (:doc:`pair_style <pair_style>`).
+The operation of this fix is exactly like that described by the
+:doc:`fix langevin <fix_langevin>` command, except that the
+thermostatting is also applied to the radial electron velocity for
+electron particles.
 
-The Ff and Fr terms are added by this fix on a per-particle basis.
+**Restart, fix_modify, output, run start/stop, minimize info:**
 
-The operation of this fix is exactly like that described by the :doc:`fix langevin <fix_langevin>` command, except that the thermostatting
-is also applied to the radial electron velocity for electron
-particles.
-
-**Restart, fix\_modify, output, run start/stop, minimize info:**
-
-No information about this fix is written to :doc:`binary restart files <restart>`.  Because the state of the random number generator
-is not saved in restart files, this means you cannot do "exact"
-restarts with this fix, where the simulation continues on the same as
-if no restart had taken place.  However, in a statistical sense, a
-restarted simulation should produce the same behavior.
+No information about this fix is written to :doc:`binary restart files
+<restart>`.  Because the state of the random number generator is not
+saved in restart files, this means you cannot do "exact" restarts with
+this fix, where the simulation continues on the same as if no restart
+had taken place.  However, in a statistical sense, a restarted
+simulation should produce the same behavior.
 
 The :doc:`fix_modify <fix_modify>` *temp* option is supported by this
 fix.  You can use it to assign a temperature :doc:`compute <compute>`
@@ -118,23 +114,12 @@ Default
 
 The option defaults are scale = 1.0 for all types and tally = no.
 
-
 ----------
 
-
 .. _Dunweg2:
 
-
-
 **(Dunweg)** Dunweg and Paul, Int J of Modern Physics C, 2, 817-27 (1991).
 
 .. _Schneider2:
 
-
-
 **(Schneider)** Schneider and Stoll, Phys Rev B, 17, 1302 (1978).
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/fix_langevin_spin.rst b/doc/src/fix_langevin_spin.rst
index 2902c8fb24..9a70cc1cd1 100644
--- a/doc/src/fix_langevin_spin.rst
+++ b/doc/src/fix_langevin_spin.rst
@@ -6,7 +6,6 @@ fix langevin/spin command
 Syntax
 """"""
 
-
 .. parsed-literal::
 
    fix ID group-ID langevin/spin T Tdamp seed
@@ -17,12 +16,10 @@ Syntax
 * Tdamp = transverse magnetic damping parameter (adim)
 * seed = random number seed to use for white noise (positive integer)
 
-
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    fix 2 all langevin/spin 300.0 0.01 21
 
@@ -36,16 +33,19 @@ Brownian dynamics (BD).
 A random torque and a transverse dissipation are applied to each spin i according to
 the following stochastic differential equation:
 
-.. image:: Eqs/fix_langevin_spin_sLLG.jpg
-   :align: center
+.. math::
 
-with lambda the transverse damping, and eta a random vector.
+   \frac{d \vec{s}_{i}}{dt} = \frac{1}{\left(1+\lambda^2 \right)} \left( \left(
+   \vec{\omega}_{i} +\vec{\eta} \right) \times \vec{s}_{i} + \lambda\, \vec{s}_{i}
+  \times\left( \vec{\omega}_{i} \times\vec{s}_{i} \right) \right)
+
+with :math:`\lambda` the transverse damping, and :math:`\eta` a random vector.
 This equation is referred to as the stochastic Landau-Lifshitz-Gilbert (sLLG)
 equation.
 
-The components of eta are drawn from a Gaussian probability law. Their amplitude
-is defined as a proportion of the temperature of the external thermostat T (in K
-in metal units).
+The components of :math:`\eta` are drawn from a Gaussian probability
+law. Their amplitude is defined as a proportion of the temperature of
+the external thermostat T (in K in metal units).
 
 More details about this implementation are reported in :ref:`(Tranchida) <Tranchida2>`.
 
@@ -53,8 +53,7 @@ Note: due to the form of the sLLG equation, this fix has to be defined just
 before the nve/spin fix (and after all other magnetic fixes).
 As an example:
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    fix 1 all precession/spin zeeman 0.01 0.0 0.0 1.0
    fix 2 all langevin/spin 300.0 0.01 21
@@ -69,11 +68,9 @@ generate its own unique seed and its own stream of random numbers.
 Thus the dynamics of the system will not be identical on two runs on
 different numbers of processors.
 
-
 ----------
 
-
-**Restart, fix\_modify, output, run start/stop, minimize info:**
+**Restart, fix_modify, output, run start/stop, minimize info:**
 
 No information about this fix is written to :doc:`binary restart files <restart>`.  Because the state of the random number generator
 is not saved in restart files, this means you cannot do "exact"
@@ -86,7 +83,6 @@ This fix is not invoked during :doc:`energy minimization <minimize>`.
 Restrictions
 """"""""""""
 
-
 The *langevin/spin* fix is part of the SPIN package.  This style is
 only enabled if LAMMPS was built with this package.  See the :doc:`Build package <Build_package>` doc page for more info.
 
@@ -103,24 +99,13 @@ Related commands
 
 **Default:** none
 
-
 ----------
 
-
 .. _Mayergoyz1:
 
-
-
 **(Mayergoyz)** I.D. Mayergoyz, G. Bertotti, C. Serpico (2009). Elsevier (2009)
 
 .. _Tranchida2:
 
-
-
 **(Tranchida)** Tranchida, Plimpton, Thibaudeau and Thompson,
 Journal of Computational Physics, 372, 406-425, (2018).
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/fix_latte.rst b/doc/src/fix_latte.rst
index d30b911e7f..f1469153a7 100644
--- a/doc/src/fix_latte.rst
+++ b/doc/src/fix_latte.rst
@@ -6,7 +6,6 @@ fix latte command
 Syntax
 """"""
 
-
 .. parsed-literal::
 
    fix ID group-ID latte peID
@@ -18,8 +17,7 @@ Syntax
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    fix dftb all latte NULL
 
@@ -55,10 +53,8 @@ specified as NULL.  Eventually it will be used to enable LAMMPS to
 calculate a Coulomb potential as an alternative to LATTE performing
 the calculation.
 
-
 ----------
 
-
 LATTE is a code for performing self-consistent charge transfer
 tight-binding (SC-TB) calculations of total energies and the forces
 acting on atoms in molecules and solids. This tight-binding method is
@@ -106,11 +102,9 @@ areas of chemistry and materials science, as we now can simulate
 larger system sizes and longer time scales
 (:ref:`Cawkwell2012 <Cawkwell2012>`), (:ref:`Negre2016 <Negre2016>`).
 
-
 ----------
 
-
-**Restart, fix\_modify, output, run start/stop, minimize info:**
+**Restart, fix_modify, output, run start/stop, minimize info:**
 
 No information about this fix is written to :doc:`binary restart files <restart>`.
 
@@ -144,7 +138,6 @@ energy minimization, invoked by the :doc:`minimize <minimize>` command.
 Restrictions
 """"""""""""
 
-
 This fix is part of the LATTE package.  It is only enabled if LAMMPS
 was built with that package.  See the :doc:`Build package <Build_package>` doc page for more info.
 
@@ -170,90 +163,61 @@ doing 99% or more of the work to compute quantum-accurate forces.
 
 **Default:** none
 
-
 ----------
 
-
 .. _Elstner:
 
-
-
 **(Elstner)** M. Elstner, D. Poresag, G. Jungnickel, J. Elsner,
 M. Haugk, T. Frauenheim, S. Suhai, and G. Seifert, Phys. Rev. B, 58,
 7260 (1998).
 
 .. _Elstner1:
 
-
-
 **(Elstner)** M. Elstner, D. Poresag, G. Jungnickel, J. Elsner,
 M. Haugk, T. Frauenheim, S. Suhai, and G. Seifert, Phys. Rev. B, 58,
 7260 (1998).
 
 .. _Finnis2:
 
-
-
 **(Finnis)** M. W. Finnis, A. T. Paxton, M. Methfessel, and M. van
 Schilfgarde, Phys. Rev. Lett., 81, 5149 (1998).
 
 .. _Mniszewski:
 
-
-
 **(Mniszewski)** S. M. Mniszewski, M. J. Cawkwell, M. E. Wall,
 J. Mohd-Yusof, N. Bock, T. C.  Germann, and A. M. N. Niklasson,
 J. Chem. Theory Comput., 11, 4644 (2015).
 
 .. _Niklasson2002:
 
-
-
 **(Niklasson2002)** A. M. N. Niklasson, Phys. Rev. B, 66, 155115 (2002).
 
 .. _Rubensson:
 
-
-
 **(Rubensson)** E. H. Rubensson, A. M. N. Niklasson, SIAM
 J. Sci. Comput. 36 (2), 147-170, (2014).
 
 .. _Niklasson2008:
 
-
-
 **(Niklasson2008)** A. M. N. Niklasson, Phys. Rev. Lett., 100, 123004
 (2008).
 
 .. _Niklasson2014:
 
-
-
 **(Niklasson2014)** A. M. N. Niklasson and M. Cawkwell, J. Chem. Phys.,
 141, 164123, (2014).
 
 .. _Niklasson2017:
 
-
-
 **(Niklasson2017)** A. M. N. Niklasson, J. Chem. Phys., 147, 054103 (2017).
 
 .. _Cawkwell2012:
 
-
-
 **(Cawkwell2012)** A. M. N. Niklasson, M. J. Cawkwell, Phys. Rev. B, 86
 (17), 174308 (2012).
 
 .. _Negre2016:
 
-
-
 **(Negre2016)** C. F. A. Negre, S. M. Mniszewski, M. J. Cawkwell,
 N. Bock, M. E. Wall, and A. M. N. Niklasson, J. Chem. Theory Comp.,
 12, 3063 (2016).
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/fix_lb_fluid.rst b/doc/src/fix_lb_fluid.rst
index c0d924078c..f450fdb8f0 100644
--- a/doc/src/fix_lb_fluid.rst
+++ b/doc/src/fix_lb_fluid.rst
@@ -6,7 +6,6 @@ fix lb/fluid command
 Syntax
 """"""
 
-
 .. parsed-literal::
 
    fix ID group-ID lb/fluid nevery LBtype viscosity density keyword values ...
@@ -19,10 +18,10 @@ Syntax
 * viscosity = the fluid viscosity (units of mass/(time\*length)).
 * density = the fluid density.
 * zero or more keyword/value pairs may be appended
-* keyword = *setArea* or *setGamma* or *scaleGamma* or *dx* or *dm* or *a0* or *noise* or *calcforce* or *trilinear* or *D3Q19* or *read\_restart* or *write\_restart* or *zwall\_velocity* or *bodyforce* or *printfluid*
-  
+* keyword = *setArea* or *setGamma* or *scaleGamma* or *dx* or *dm* or *a0* or *noise* or *calcforce* or *trilinear* or *D3Q19* or *read_restart* or *write_restart* or *zwall_velocity* or *bodyforce* or *printfluid*
+
   .. parsed-literal::
-  
+
        *setArea* values = type node_area
            type = atom type (1-N)
            node_area = portion of the surface area of the composite object associated with the particular atom type (used when the force coupling constant is set by default).
@@ -48,13 +47,10 @@ Syntax
        *bodyforce* values = bodyforcex bodyforcey bodyforcez = the x,y and z components of a constant body force added to the fluid.
        *printfluid* values = N = print the fluid density and velocity at each grid point every N timesteps.
 
-
-
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    fix 1 all lb/fluid 1 2 1.0 1.0 setGamma 13.0 dx 4.0 dm 10.0 calcforce sphere1
    fix 1 all lb/fluid 1 1 1.0 0.0009982071 setArea 1 1.144592082 dx 2.0 dm 0.3 trilinear noise 300.0 8979873
@@ -69,33 +65,38 @@ dependent force to the fluid.
 The lattice-Boltzmann algorithm solves for the fluid motion governed by
 the Navier Stokes equations,
 
-.. image:: Eqs/fix_lb_fluid_navierstokes.jpg
-   :align: center
+.. math::
+
+   \partial_t \rho + \partial_{\beta}\left(\rho u_{\beta}\right)= & 0 \\
+   \partial_t\left(\rho u_{\alpha}\right) + \partial_{\beta}\left(\rho u_{\alpha} u_{\beta}\right) = & \partial_{\beta}\sigma_{\alpha \beta} + F_{\alpha} + \partial_{\beta}\left(\eta_{\alpha \beta \gamma \nu}\partial_{\gamma} u_{\nu}\right)
 
 with,
 
-.. image:: Eqs/fix_lb_fluid_viscosity.jpg
-   :align: center
+.. math::
 
-where rho is the fluid density, u is the local fluid velocity, sigma
-is the stress tensor, F is a local external force, and eta and Lambda
-are the shear and bulk viscosities respectively.  Here, we have
-implemented
+   \eta_{\alpha \beta \gamma \nu} = \eta\left[\delta_{\alpha \gamma}\delta_{\beta \nu} + \delta_{\alpha \nu}\delta_{\beta \gamma} - \frac{2}{3}\delta_{\alpha \beta}\delta_{\gamma \nu}\right] + \Lambda \delta_{\alpha \beta}\delta_{\gamma \nu}
 
-.. image:: Eqs/fix_lb_fluid_stress.jpg
-   :align: center
+where :math:`\rho` is the fluid density, *u* is the local
+fluid velocity, :math:`\sigma` is the stress tensor, *F* is a local external
+force, and :math:`\eta` and :math:`\Lambda` are the shear and bulk viscosities
+respectively.  Here, we have implemented
 
-with a\_0 set to 1/3 (dx/dt)\^2 by default.
+.. math::
+
+   \sigma_{\alpha \beta} = -P_{\alpha \beta} = -\rho a_0 \delta_{\alpha \beta}
+
+with :math:`a_0` set to :math:`\frac{1}{3} \frac{dx}{dt}^2` by default.
 
 The algorithm involves tracking the time evolution of a set of partial
 distribution functions which evolve according to a velocity
 discretized version of the Boltzmann equation,
 
-.. image:: Eqs/fix_lb_fluid_boltzmann.jpg
-   :align: center
+.. math::
+
+   \left(\partial_t + e_{i\alpha}\partial_{\alpha}\right)f_i = -\frac{1}{\tau}\left(f_i - f_i^{eq}\right) + W_i
 
 where the first term on the right hand side represents a single time
-relaxation towards the equilibrium distribution function, and tau is a
+relaxation towards the equilibrium distribution function, and :math:`\tau` is a
 parameter physically related to the viscosity.  On a technical note,
 we have implemented a 15 velocity model (D3Q15) as default; however,
 the user can switch to a 19 velocity model (D3Q19) through the use of
@@ -108,23 +109,27 @@ finite difference LB integrator is used.  If *LBtype* is set equal to
 Physical variables are then defined in terms of moments of the distribution
 functions,
 
-.. image:: Eqs/fix_lb_fluid_properties.jpg
-   :align: center
+.. math::
+
+   \rho = & \displaystyle\sum\limits_{i} f_i \\
+   \rho u_{\alpha} = & \displaystyle\sum\limits_{i} f_i e_{i\alpha}
 
 Full details of the lattice-Boltzmann algorithm used can be found in
 :ref:`Mackay et al. <fluid-Mackay>`.
 
-The fluid is coupled to the MD particles described by *group-ID*
-through a velocity dependent force.  The contribution to the fluid
-force on a given lattice mesh site j due to MD particle alpha is
+The fluid is coupled to the MD particles described by *group-ID* through
+a velocity dependent force.  The contribution to the fluid force on a
+given lattice mesh site j due to MD particle :math:`\alpha` is
 calculated as:
 
-.. image:: Eqs/fix_lb_fluid_fluidforce.jpg
-   :align: center
+.. math::
 
-where v\_n is the velocity of the MD particle, u\_f is the fluid
-velocity interpolated to the particle location, and gamma is the force
-coupling constant.  Zeta is a weight assigned to the grid point,
+   {\bf F}_{j \alpha} = \gamma \left({\bf v}_n - {\bf u}_f \right) \zeta_{j\alpha}
+
+where :math:`\mathbf{v}_n` is the velocity of the MD particle,
+:math:`\mathbf{u}_f` is the fluid
+velocity interpolated to the particle location, and :math:`\gamma` is the force
+coupling constant.  :math:`\zeta` is a weight assigned to the grid point,
 obtained by distributing the particle to the nearest lattice sites.
 For this, the user has the choice between a trilinear stencil, which
 provides a support of 8 lattice sites, or the immersed boundary method
@@ -135,27 +140,31 @@ to walls, due to its smaller support.  Therefore, by default, the
 Peskin stencil is used; however the user may switch to the trilinear
 stencil by specifying the keyword, *trilinear*\ .
 
-By default, the force coupling constant, gamma, is calculated according to
+By default, the force coupling constant, :math:`\gamma`, is calculated
+according to
 
-.. image:: Eqs/fix_lb_fluid_gammadefault.jpg
-   :align: center
+.. math::
 
-Here, m\_v is the mass of the MD particle, m\_u is a representative
-fluid mass at the particle location, and dt\_collision is a collision
-time, chosen such that tau/dt\_collision = 1 (see :ref:`Mackay and Denniston <Mackay2>` for full details).  In order to calculate m\_u, the
-fluid density is interpolated to the MD particle location, and
-multiplied by a volume, node\_area\*dx\_lb, where node\_area represents
-the portion of the surface area of the composite object associated
-with a given MD particle.  By default, node\_area is set equal to
-dx\_lb\*dx\_lb; however specific values for given atom types can be set
-using the *setArea* keyword.
+   \gamma = \frac{2m_um_v}{m_u+m_v}\left(\frac{1}{\Delta t_{collision}}\right)
+
+Here, :math:`m_v` is the mass of the MD particle, :math:`m_u` is a
+representative fluid mass at the particle location, and :math:`\Delta
+t_{collision}` is a collision time, chosen such that
+:math:`\frac{\tau}{\Delta t_{collision}} = 1` (see :ref:`Mackay and
+Denniston <Mackay2>` for full details).  In order to calculate :math:`m_u`,
+the fluid density is interpolated to the MD particle location, and
+multiplied by a volume, node_area * :math:`dx_{LB}`, where node_area
+represents the portion of the surface area of the composite object
+associated with a given MD particle.  By default, node_area is set
+equal to :math:`dx_{LB}^2`; however specific values for given atom types
+can be set using the *setArea* keyword.
 
 The user also has the option of specifying their own value for the
 force coupling constant, for all the MD particles associated with the
 fix, through the use of the *setGamma* keyword.  This may be useful
 when modelling porous particles.  See :ref:`Mackay et al. <fluid-Mackay>` for a
 detailed description of the method by which the user can choose an
-appropriate gamma value.
+appropriate :math:`\gamma` value.
 
 .. note::
 
@@ -169,7 +178,9 @@ appropriate gamma value.
    used to integrate the particle motion.  However, if the user specifies
    their own value for the force coupling constant, as mentioned in
    :ref:`Mackay et al. <fluid-Mackay>`, the built-in LAMMPS integrators may prove to
-   be unstable.  Therefore, we have included our own integrators :doc:`fix lb/rigid/pc/sphere <fix_lb_rigid_pc_sphere>`, and :doc:`fix lb/pc <fix_lb_pc>`, to solve for the particle motion in these
+   be unstable.  Therefore, we have included our own integrators
+   :doc:`fix lb/rigid/pc/sphere <fix_lb_rigid_pc_sphere>`, and
+   :doc:`fix lb/pc <fix_lb_pc>`, to solve for the particle motion in these
    cases.  These integrators should not be used with the
    :doc:`lb/viscous <fix_lb_viscous>` fix, as they add hydrodynamic forces
    to the particles directly.  In addition, they can not be used if the
@@ -188,28 +199,29 @@ appropriate gamma value.
    location, in order to approximate an infinitely massive particle (see
    the dragforce test run for an example).
 
-
 ----------
 
-
 Inside the fix, parameters are scaled by the lattice-Boltzmann
-timestep, dt, grid spacing, dx, and mass unit, dm.  dt is set equal to
-(nevery\*dt\_MD), where dt\_MD is the MD timestep.  By default, dm is set
-equal to 1.0, and dx is chosen so that tau/(dt) =
-(3\*eta\*dt)/(rho\*dx\^2) is approximately equal to 1.  However, the user
-has the option of specifying their own values for dm, and dx, by using
+timestep, :math:`dt_{LB}`, grid spacing, :math:`dx_{LB}`, and mass unit,
+:math:`dm_{LB}`.  :math:`dt_{LB}` is set equal to
+:math:`\mathrm{nevery}\cdot dt_{MD}`, where :math:`dt_{MD}` is the MD timestep.
+By default,
+:math:`dm_{LB}` is set equal to 1.0, and :math:`dx_{LB}` is chosen so that
+:math:`\frac{\tau}{dt} = \frac{3\eta dt}{\rho dx^2}` is approximately equal to 1.
+However, the user has the option of specifying their own values for
+:math:`dm_{LB}`, and :math:`dx_{LB}`, by using
 the optional keywords *dm*\ , and *dx* respectively.
 
 .. note::
 
-   Care must be taken when choosing both a value for dx, and a
-   simulation domain size.  This fix uses the same subdivision of the
-   simulation domain among processors as the main LAMMPS program.  In
+   Care must be taken when choosing both a value for :math:`dx_{LB}`,
+   and a simulation domain size.  This fix uses the same subdivision of
+   the simulation domain among processors as the main LAMMPS program.  In
    order to uniformly cover the simulation domain with lattice sites, the
    lengths of the individual LAMMPS sub-domains must all be evenly
-   divisible by dx.  If the simulation domain size is cubic, with equal
-   lengths in all dimensions, and the default value for dx is used, this
-   will automatically be satisfied.
+   divisible by :math:`dx_{LB}`.  If the simulation domain size is cubic,
+   with equal lengths in all dimensions, and the default value for
+   :math:`dx_{LB}` is used, this will automatically be satisfied.
 
 Physical parameters describing the fluid are specified through
 *viscosity*\ , *density*\ , and *a0*\ . If the force coupling constant is
@@ -221,27 +233,25 @@ the mass, distance, and time units chosen for the main LAMMPS run, as
 they are scaled by the LB timestep, lattice spacing, and mass unit,
 inside the fix.
 
-
 ----------
 
-
 The *setArea* keyword allows the user to associate a surface area with
 a given atom type.  For example if a spherical composite object of
 radius R is represented as a spherical shell of N evenly distributed
 MD particles, all of the same type, the surface area per particle
-associated with that atom type should be set equal to 4\*pi\*R\^2/N.
+associated with that atom type should be set equal to :math:`\frac{4\pi R^2}{N}`.
 This keyword should only be used if the force coupling constant,
-gamma, is set the default way.
+:math:`\gamma`, is set the default way.
 
 The *setGamma* keyword allows the user to specify their own value for
-the force coupling constant, gamma, instead of using the default
+the force coupling constant, :math:`\gamma`, instead of using the default
 value.
 
 The *scaleGamma* keyword should be used in conjunction with the
-*setGamma* keyword, when the user wishes to specify different gamma
+*setGamma* keyword, when the user wishes to specify different :math:`\gamma`
 values for different atom types.  This keyword allows the user to
-scale the *setGamma* gamma value by a factor, gammaFactor, for a given
-atom type.
+scale the *setGamma* :math:`\gamma` value by a factor, gammaFactor,
+for a given atom type.
 
 The *dx* keyword allows the user to specify a value for the LB grid
 spacing.
@@ -250,9 +260,10 @@ The *dm* keyword allows the user to specify the LB mass unit.
 
 If the *a0* keyword is used, the value specified is used for the
 square of the speed of sound in the fluid.  If this keyword is not
-present, the speed of sound squared is set equal to (1/3)\*(dx/dt)\^2.
-Setting a0 > (dx/dt)\^2 is not allowed, as this may lead to
-instabilities.
+present, the speed of sound squared is set equal to
+:math:`\frac{1}{3}\left(\frac{dx_{LB}}{dt_{LB}}\right)^2`.
+Setting :math:`a0 > (\frac{dx_{LB}}{dt_{LB}})^2` is not allowed,
+as this may lead to instabilities.
 
 If the *noise* keyword is used, followed by a positive temperature
 value, and a positive integer random number seed, a thermal
@@ -275,7 +286,7 @@ If the keyword *D3Q19* is used, the 19 velocity (D3Q19) lattice is
 used by the lattice-Boltzmann algorithm.  By default, the 15 velocity
 (D3Q15) lattice is used.
 
-If the keyword *write\_restart* is used, followed by a positive
+If the keyword *write_restart* is used, followed by a positive
 integer, N, a binary restart file is printed every N LB timesteps.
 This restart file only contains information about the fluid.
 Therefore, a LAMMPS restart file should also be written in order to
@@ -287,10 +298,10 @@ print out full details of the simulation.
    files may become quite large.
 
 In order to restart the fluid portion of the simulation, the keyword
-*read\_restart* is specified, followed by the name of the binary
-lb\_fluid restart file to be used.
+*read_restart* is specified, followed by the name of the binary
+lb_fluid restart file to be used.
 
-If the *zwall\_velocity* keyword is used y-velocities are assigned to
+If the *zwall_velocity* keyword is used y-velocities are assigned to
 the lower and upper walls.  This keyword requires the presence of
 walls in the z-direction.  This is set by assigning fixed boundary
 conditions in the z-direction.  If fixed boundary conditions are
@@ -304,24 +315,20 @@ If the *printfluid* keyword is used, followed by a positive integer, N,
 the fluid densities and velocities at each lattice site are printed to the
 screen every N timesteps.
 
-
 ----------
 
-
 For further details, as well as descriptions and results of several
 test runs, see :ref:`Mackay et al. <fluid-Mackay>`.  Please include a citation to
-this paper if the lb\_fluid fix is used in work contributing to
+this paper if the lb_fluid fix is used in work contributing to
 published research.
 
-
 ----------
 
-
-**Restart, fix\_modify, output, run start/stop, minimize info:**
+**Restart, fix_modify, output, run start/stop, minimize info:**
 
 Due to the large size of the fluid data, this fix writes it's own
 binary restart files, if requested, independent of the main LAMMPS
-:doc:`binary restart files <restart>`; no information about *lb\_fluid*
+:doc:`binary restart files <restart>`; no information about *lb_fluid*
 is written to the main LAMMPS :doc:`binary restart files <restart>`.
 
 None of the :doc:`fix_modify <fix_modify>` options are relevant to this
@@ -333,7 +340,6 @@ of this fix can be used with the *start/stop* keywords of the
 Restrictions
 """"""""""""
 
-
 This fix is part of the USER-LB package.  It is only enabled if LAMMPS
 was built with that package.  See the :doc:`Build package <Build_package>` doc page for more info.
 
@@ -364,49 +370,35 @@ Default
 
 By default, the force coupling constant is set according to
 
-.. image:: Eqs/fix_lb_fluid_gammadefault.jpg
-   :align: center
+.. math::
 
-and an area of dx\_lb\^2 per node, used to calculate the fluid mass at
+   \gamma = \frac{2m_um_v}{m_u+m_v}\left(\frac{1}{\Delta t_{collision}}\right)
+
+and an area of :math:`dx_{LB}^2` per node, used to calculate the fluid mass at
 the particle node location, is assumed.
 
-dx is chosen such that tau/(delta t\_LB) =
-(3 eta dt\_LB)/(rho dx\_lb\^2) is approximately equal to 1.
-dm is set equal to 1.0.
-a0 is set equal to (1/3)\*(dx\_lb/dt\_lb)\^2.
+*dx* is chosen such that :math:`\frac{\tau}{dt_{LB}} =
+\frac{3\eta dt_{LB}}{\rho dx_{LB}^2}` is approximately equal to 1.
+*dm* is set equal to 1.0.
+*a0* is set equal to :math:`\frac{1}{3}\left(\frac{dx_{LB}}{dt_{LB}}\right)^2`.
 The Peskin stencil is used as the default interpolation method.
 The D3Q15 lattice is used for the lattice-Boltzmann algorithm.
 If walls are present, they are assumed to be stationary.
 
-
 ----------
 
-
 .. _Ollila:
 
-
-
 **(Ollila et al.)** Ollila, S.T.T., Denniston, C., Karttunen, M., and Ala-Nissila, T., Fluctuating lattice-Boltzmann model for complex fluids, J. Chem. Phys. 134 (2011) 064902.
 
 .. _fluid-Mackay:
 
-
-
 **(Mackay et al.)** Mackay, F. E., Ollila, S.T.T., and Denniston, C., Hydrodynamic Forces Implemented into LAMMPS through a lattice-Boltzmann fluid, Computer Physics Communications 184 (2013) 2021-2031.
 
 .. _Mackay2:
 
-
-
 **(Mackay and Denniston)** Mackay, F. E., and Denniston, C., Coupling MD particles to a lattice-Boltzmann fluid through the use of conservative forces, J. Comput. Phys. 237 (2013) 289-298.
 
 .. _Adhikari:
 
-
-
 **(Adhikari et al.)** Adhikari, R., Stratford, K.,  Cates, M. E., and Wagner, A. J., Fluctuating lattice Boltzmann, Europhys. Lett. 71 (2005) 473-479.
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/fix_lb_momentum.rst b/doc/src/fix_lb_momentum.rst
index cfc5c07d8d..a595ba2ce5 100644
--- a/doc/src/fix_lb_momentum.rst
+++ b/doc/src/fix_lb_momentum.rst
@@ -6,7 +6,6 @@ fix lb/momentum command
 Syntax
 """"""
 
-
 .. parsed-literal::
 
    fix ID group-ID lb/momentum nevery keyword values ...
@@ -16,19 +15,16 @@ Syntax
 * nevery = adjust the momentum every this many timesteps
 * zero or more keyword/value pairs may be appended
 * keyword = *linear*
-  
+
   .. parsed-literal::
-  
+
        *linear* values = xflag yflag zflag
          xflag,yflag,zflag = 0/1 to exclude/include each dimension.
 
-
-
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    fix 1 sphere lb/momentum
    fix 1 all lb/momentum linear 1 1 0
@@ -54,7 +50,7 @@ be changed by specifying the keyword *linear*\ , along with a set of
 three flags set to 0/1 in order to exclude/ include the corresponding
 dimension.
 
-**Restart, fix\_modify, output, run start/stop, minimize info:**
+**Restart, fix_modify, output, run start/stop, minimize info:**
 
 No information about this fix is written to :doc:`binary restart files <restart>`.  None of the :doc:`fix_modify <fix_modify>` options
 are relevant to this fix.  No global or per-atom quantities are stored
@@ -65,7 +61,6 @@ the :doc:`run <run>` command.  This fix is not invoked during :doc:`energy minim
 Restrictions
 """"""""""""
 
-
 Can only be used if a lattice-Boltzmann fluid has been created via the
 :doc:`fix lb/fluid <fix_lb_fluid>` command, and must come after this
 command.
@@ -82,8 +77,3 @@ Default
 """""""
 
 Zeros the total system linear momentum in each dimension.
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/fix_lb_pc.rst b/doc/src/fix_lb_pc.rst
index 039e315be1..874ff21893 100644
--- a/doc/src/fix_lb_pc.rst
+++ b/doc/src/fix_lb_pc.rst
@@ -6,7 +6,6 @@ fix lb/pc command
 Syntax
 """"""
 
-
 .. parsed-literal::
 
    fix ID group-ID lb/pc
@@ -17,8 +16,7 @@ Syntax
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    fix 1 all lb/pc
 
@@ -31,7 +29,7 @@ forces, using the integration algorithm described in :ref:`Mackay et al. <Mackay
 user-specified value for the force-coupling constant used in :doc:`fix lb/fluid <fix_lb_fluid>` has been set; do not use this integration
 algorithm if the force coupling constant has been set by default.
 
-**Restart, fix\_modify, output, run start/stop, minimize info:**
+**Restart, fix_modify, output, run start/stop, minimize info:**
 
 No information about this fix is written to :doc:`binary restart files <restart>`.  None of the :doc:`fix_modify <fix_modify>` options
 are relevant to this fix.  No global or per-atom quantities are stored
@@ -42,7 +40,6 @@ the :doc:`run <run>` command.  This fix is not invoked during :doc:`energy minim
 Restrictions
 """"""""""""
 
-
 This fix is part of the USER-LB package.  It is only enabled if LAMMPS
 was built with that package.  See the :doc:`Build package <Build_package>` doc page for more info.
 
@@ -57,17 +54,8 @@ Related commands
 
 **Default:** None.
 
-
 ----------
 
-
 .. _Mackay1:
 
-
-
 **(Mackay et al.)** Mackay, F. E., Ollila, S.T.T., and Denniston, C., Hydrodynamic Forces Implemented into LAMMPS through a lattice-Boltzmann fluid, Computer Physics Communications 184 (2013) 2021-2031.
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/fix_lb_rigid_pc_sphere.rst b/doc/src/fix_lb_rigid_pc_sphere.rst
index dfa7cf0663..42fb21ca69 100644
--- a/doc/src/fix_lb_rigid_pc_sphere.rst
+++ b/doc/src/fix_lb_rigid_pc_sphere.rst
@@ -6,7 +6,6 @@ fix lb/rigid/pc/sphere command
 Syntax
 """"""
 
-
 .. parsed-literal::
 
    fix ID group-ID lb/rigid/pc/sphere bodystyle args keyword values ...
@@ -14,9 +13,9 @@ Syntax
 * ID, group-ID are documented in :doc:`fix <fix>` command
 * lb/rigid/pc/sphere = style name of this fix command
 * bodystyle = *single* or *molecule* or *group*
-  
+
   .. parsed-literal::
-  
+
        *single* args = none
        *molecule* args = none
        *group* args = N groupID1 groupID2 ...
@@ -24,9 +23,9 @@ Syntax
 
 * zero or more keyword/value pairs may be appended
 * keyword = *force* or *torque* or *innerNodes*
-  
+
   .. parsed-literal::
-  
+
        *force* values = M xflag yflag zflag
          M = which rigid body from 1-Nbody (see asterisk form below)
          xflag,yflag,zflag = off/on if component of center-of-mass force is active
@@ -36,13 +35,10 @@ Syntax
        *innerNodes* values = innergroup-ID
          innergroup-ID = ID of the atom group which does not experience a hydrodynamic force from the lattice-Boltzmann fluid
 
-
-
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    fix 1 spheres lb/rigid/pc/sphere
    fix 1 all lb/rigid/pc/sphere force 1 0 0 innerNodes ForceAtoms
@@ -61,10 +57,8 @@ solid, uniform density spheres, with moments of inertia calculated
 using the combined sum of the masses of all the constituent particles
 (which are assumed to be point particles).
 
-
 ----------
 
-
 By default, all of the atoms that this fix acts on experience a
 hydrodynamic force due to the presence of the lattice-Boltzmann fluid.
 However, the *innerNodes* keyword allows the user to specify atoms
@@ -81,16 +75,14 @@ is desirable simply to place an atom at the center of each sphere,
 which does not contribute to the hydrodynamic force, and have these
 central atoms interact with one another.
 
-
 ----------
 
-
 Apart from the features described above, this fix is very similar to
 the rigid fix (although it includes fewer optional arguments, and
 assumes the constituent atoms are point particles); see
 :doc:`fix rigid <fix_rigid>` for a complete documentation.
 
-**Restart, fix\_modify, output, run start/stop, minimize info:**
+**Restart, fix_modify, output, run start/stop, minimize info:**
 
 No information about the *rigid* and *rigid/nve* fixes are written to
 :doc:`binary restart files <restart>`.
@@ -136,7 +128,6 @@ of the :doc:`run <run>` command.  These fixes are not invoked during
 Restrictions
 """"""""""""
 
-
 This fix is part of the USER-LB package.  It is only enabled if LAMMPS
 was built with that package.  See the :doc:`Build package <Build_package>` doc page for more info.
 
@@ -157,17 +148,8 @@ Default
 
 The defaults are force \* on on on, and torque \* on on on.
 
-
 ----------
 
-
 .. _Mackay:
 
-
-
 **(Mackay et al.)** Mackay, F. E., Ollila, S.T.T., and Denniston, C., Hydrodynamic Forces Implemented into LAMMPS through a lattice-Boltzmann fluid, Computer Physics Communications 184 (2013) 2021-2031.
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/fix_lb_viscous.rst b/doc/src/fix_lb_viscous.rst
index 36f33037bf..6d7431c780 100644
--- a/doc/src/fix_lb_viscous.rst
+++ b/doc/src/fix_lb_viscous.rst
@@ -6,7 +6,6 @@ fix lb/viscous command
 Syntax
 """"""
 
-
 .. parsed-literal::
 
    fix ID group-ID lb/viscous
@@ -17,7 +16,9 @@ Syntax
 Examples
 """"""""
 
-fix 1 flow lb/viscous
+.. code-block:: LAMMPS
+
+   fix 1 flow lb/viscous
 
 Description
 """""""""""
@@ -27,7 +28,7 @@ is to be used in place of that command when a lattice-Boltzmann fluid
 is present, and the user wishes to integrate the particle motion using
 one of the built in LAMMPS integrators.
 
-This fix adds a force, F = - Gamma\*(velocity-fluid\_velocity), to each
+This fix adds a force, F = - Gamma\*(velocity-fluid_velocity), to each
 atom, where Gamma is the force coupling constant described in the :doc:`fix lb/fluid <fix_lb_fluid>` command (which applies an equal and
 opposite force to the fluid).
 
@@ -41,20 +42,16 @@ opposite force to the fluid).
    value is used, then this fix provides the only method for adding the
    hydrodynamic forces to the particles.
 
-
 ----------
 
-
 For further details, as well as descriptions and results of several
 test runs, see :ref:`Mackay et al. <Mackay3>`.  Please include a citation to
 this paper if this fix is used in work contributing to published
 research.
 
-
 ----------
 
-
-**Restart, fix\_modify, output, run start/stop, minimize info:**
+**Restart, fix_modify, output, run start/stop, minimize info:**
 
 As described in the :doc:`fix viscous <fix_viscous>` documentation:
 
@@ -73,7 +70,6 @@ for details."
 Restrictions
 """"""""""""
 
-
 This fix is part of the USER-LB package.  It is only enabled if LAMMPS
 was built with that package.  See the :doc:`Build package <Build_package>` doc page for more info.
 
@@ -92,17 +88,8 @@ Related commands
 
 **Default:** none
 
-
 ----------
 
-
 .. _Mackay3:
 
-
-
 **(Mackay et al.)** Mackay, F. E., Ollila, S.T.T., and Denniston, C., Hydrodynamic Forces Implemented into LAMMPS through a lattice-Boltzmann fluid, Computer Physics Communications 184 (2013) 2021-2031.
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/fix_lineforce.rst b/doc/src/fix_lineforce.rst
index e317348a5e..b02acfa9f4 100644
--- a/doc/src/fix_lineforce.rst
+++ b/doc/src/fix_lineforce.rst
@@ -6,7 +6,6 @@ fix lineforce command
 Syntax
 """"""
 
-
 .. parsed-literal::
 
    fix ID group-ID lineforce x y z
@@ -18,8 +17,7 @@ Syntax
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    fix hold boundary lineforce 0.0 1.0 1.0
 
@@ -34,7 +32,7 @@ plane perpendicular to the line.
 If the initial velocity of the atom is 0.0 (or along the line), then
 it should continue to move along the line thereafter.
 
-**Restart, fix\_modify, output, run start/stop, minimize info:**
+**Restart, fix_modify, output, run start/stop, minimize info:**
 
 No information about this fix is written to :doc:`binary restart files <restart>`.  None of the :doc:`fix_modify <fix_modify>` options
 are relevant to this fix.  No global or per-atom quantities are stored
@@ -55,8 +53,3 @@ Related commands
 :doc:`fix planeforce <fix_planeforce>`
 
 **Default:** none
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/fix_manifoldforce.rst b/doc/src/fix_manifoldforce.rst
index 5dfdd70150..8cb9723277 100644
--- a/doc/src/fix_manifoldforce.rst
+++ b/doc/src/fix_manifoldforce.rst
@@ -6,7 +6,6 @@ fix manifoldforce command
 Syntax
 """"""
 
-
 .. parsed-literal::
 
    fix ID group-ID manifoldforce manifold manifold-args ...
@@ -15,11 +14,12 @@ Syntax
 * manifold = name of the manifold
 * manifold-args = parameters for the manifold
 
-
 Examples
 """"""""
 
-fix constrain all manifoldforce sphere 5.0
+.. code-block:: LAMMPS
+
+   fix constrain all manifoldforce sphere 5.0
 
 Description
 """""""""""
@@ -32,11 +32,9 @@ given manifold, e.g. to set up a run with :doc:`fix nve/manifold/rattle <fix_nve
 only *hftn* and *quickmin* with a very small time step perform
 adequately though.
 
-
 ----------
 
-
-**Restart, fix\_modify, output, run start/stop, minimize info:**
+**Restart, fix_modify, output, run start/stop, minimize info:**
 
 No information about this fix is written to :doc:`binary restart files <restart>`.  None of the :doc:`fix_modify <fix_modify>` options
 are relevant to this fix.  No global or per-atom quantities are stored
@@ -44,31 +42,21 @@ by this fix for access by various :doc:`output commands <Howto_output>`.
 No parameter of this fix can be used with the *start/stop* keywords of
 the :doc:`run <run>` command.  This fix is invoked during :doc:`energy minimization <minimize>`.
 
-
 ----------
 
-
 Restrictions
 """"""""""""
 
-
 This fix is part of the USER-MANIFOLD package. It is only enabled if
 LAMMPS was built with that package.  See the :doc:`Build package <Build_package>` doc page for more info.
 
-Only use this with *min\_style hftn* or *min\_style quickmin*. If not,
+Only use this with *min_style hftn* or *min_style quickmin*. If not,
 the constraints will not be satisfied very well at all. A warning is
-generated if the *min\_style* is incompatible but no error.
-
+generated if the *min_style* is incompatible but no error.
 
 ----------
 
-
 Related commands
 """"""""""""""""
 
 :doc:`fix nve/manifold/rattle <fix_nve_manifold_rattle>`, :doc:`fix nvt/manifold/rattle <fix_nvt_manifold_rattle>`
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/fix_meso.rst b/doc/src/fix_meso.rst
index e28514f8ea..dc9f1cb991 100644
--- a/doc/src/fix_meso.rst
+++ b/doc/src/fix_meso.rst
@@ -6,7 +6,6 @@ fix meso command
 Syntax
 """"""
 
-
 .. parsed-literal::
 
    fix ID group-ID meso
@@ -17,8 +16,7 @@ Syntax
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    fix 1 all meso
 
@@ -33,7 +31,7 @@ internal variables such as SPH or DPDE.
 See `this PDF guide <USER/sph/SPH_LAMMPS_userguide.pdf>`_ to using SPH in
 LAMMPS.
 
-**Restart, fix\_modify, output, run start/stop, minimize info:**
+**Restart, fix_modify, output, run start/stop, minimize info:**
 
 No information about this fix is written to :doc:`binary restart files <restart>`.  None of the :doc:`fix_modify <fix_modify>` options
 are relevant to this fix.  No global or per-atom quantities are stored
@@ -44,7 +42,6 @@ the :doc:`run <run>` command.  This fix is not invoked during :doc:`energy minim
 Restrictions
 """"""""""""
 
-
 This fix is part of the USER-SPH package.  It is only enabled if
 LAMMPS was built with that package.  See the :doc:`Build package <Build_package>` doc page for more info.
 
@@ -54,8 +51,3 @@ Related commands
 "fix meso/stationary"
 
 **Default:** none
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/fix_meso_move.rst b/doc/src/fix_meso_move.rst
index 62804aa75c..a976c2de34 100644
--- a/doc/src/fix_meso_move.rst
+++ b/doc/src/fix_meso_move.rst
@@ -6,7 +6,6 @@ fix meso/move command
 Syntax
 """"""
 
-
 .. parsed-literal::
 
    fix ID group-ID meso/move style args keyword values ...
@@ -14,9 +13,9 @@ Syntax
 * ID, group-ID are documented in :doc:`fix <fix>` command
 * meso/move = style name of this fix command
 * style = *linear* or *wiggle* or *rotate* or *variable*
-  
+
   .. parsed-literal::
-  
+
        *linear* args = Vx Vy Vz
          Vx,Vy,Vz = components of velocity vector (velocity units), any component can be specified as NULL
        *wiggle* args = Ax Ay Az period
@@ -32,18 +31,15 @@ Syntax
 
 * zero or more keyword/value pairs may be appended
 * keyword = *units*
-  
+
   .. parsed-literal::
-  
+
        *units* value = *box* or *lattice*
 
-
-
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    fix 1 boundary meso/move wiggle 3.0 0.0 0.0 1.0 units box
    fix 2 boundary meso/move rotate 0.0 0.0 0.0 0.0 0.0 1.0 5.0
@@ -88,15 +84,12 @@ internal energy and extrapolated velocity are also updated.
    (e.g. to 0) before invoking this fix by using the :doc:`set image <set>`
    command.
 
-
 ----------
 
-
 The *linear* style moves particles at a constant velocity, so that their
 position *X* = (x,y,z) as a function of time is given in vector
 notation as
 
-
 .. parsed-literal::
 
    X(t) = X0 + V \* delta
@@ -114,8 +107,7 @@ Note that the *linear* style is identical to using the *variable*
 style with an :doc:`equal-style variable <variable>` that uses the
 vdisplace() function.  E.g.
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    variable V equal 10.0
    variable x equal vdisplace(0.0,$V)
@@ -125,7 +117,6 @@ The *wiggle* style moves particles in an oscillatory fashion, so that
 their position *X* = (x,y,z) as a function of time is given in vector
 notation as
 
-
 .. parsed-literal::
 
    X(t) = X0 + A sin(omega\*delta)
@@ -144,14 +135,13 @@ Note that the *wiggle* style is identical to using the *variable*
 style with :doc:`equal-style variables <variable>` that use the
 swiggle() and cwiggle() functions.  E.g.
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    variable A equal 10.0
    variable T equal 5.0
-   variable omega equal 2.0\*PI/$T
+   variable omega equal 2.0*PI/$T
    variable x equal swiggle(0.0,$A,$T)
-   variable v equal v_omega\*($A-cwiggle(0.0,$A,$T))
+   variable v equal v_omega*($A-cwiggle(0.0,$A,$T))
    fix 1 boundary move variable v_x NULL NULL v_v NULL NULL
 
 The *rotate* style rotates particles around a rotation axis *R* =
@@ -168,7 +158,7 @@ Rperp is a perpendicular vector from the rotation axis to the particle.
 The *variable* style allows the position and velocity components of
 each particle to be set by formulas specified via the
 :doc:`variable <variable>` command.  Each of the 6 variables is
-specified as an argument to the fix as v\_name, where name is the
+specified as an argument to the fix as v_name, where name is the
 variable name that is defined elsewhere in the input script.
 
 Each variable must be of either the *equal* or *atom* style.
@@ -181,10 +171,10 @@ fix stores the original coordinates of each particle (see note below) so
 that per-atom quantity can be used in an atom-style variable formula.
 See the :doc:`variable <variable>` command for details.
 
-The first 3 variables (v\_dx,v\_dy,v\_dz) specified for the *variable*
+The first 3 variables (v_dx,v_dy,v_dz) specified for the *variable*
 style are used to calculate a displacement from the particle's original
 position at the time the fix was specified.  The second 3 variables
-(v\_vx,v\_vy,v\_vz) specified are used to compute a velocity for each
+(v_vx,v_vy,v_vz) specified are used to compute a velocity for each
 particle.
 
 Any of the 6 variables can be specified as NULL.  If both the
@@ -212,11 +202,9 @@ been previously used to define the lattice spacing.  Each of these 3
 quantities may be dependent on the x,y,z dimension, since the lattice
 spacings can be different in x,y,z.
 
-
 ----------
 
-
-**Restart, fix\_modify, output, run start/stop, minimize info:**
+**Restart, fix_modify, output, run start/stop, minimize info:**
 
 This fix writes the original coordinates of moving particles to :doc:`binary restart files <restart>`, as well as the initial timestep, so that
 the motion can be continuous in a restarted simulation.  See the
@@ -247,7 +235,6 @@ This fix is not invoked during :doc:`energy minimization <minimize>`.
 Restrictions
 """"""""""""
 
-
 This fix is part of the USER-SDPD package.  It is only enabled if
 LAMMPS was built with that package. See the :doc:`Build package <Build_package>` doc page for more info.
 
@@ -266,8 +253,3 @@ Default
 """""""
 
 The option default is units = lattice.
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/fix_meso_stationary.rst b/doc/src/fix_meso_stationary.rst
index 5a7d53e55b..89c30ece14 100644
--- a/doc/src/fix_meso_stationary.rst
+++ b/doc/src/fix_meso_stationary.rst
@@ -6,7 +6,6 @@ fix meso/stationary command
 Syntax
 """"""
 
-
 .. parsed-literal::
 
    fix ID group-ID meso/stationary
@@ -17,8 +16,7 @@ Syntax
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    fix 1 boundary meso/stationary
 
@@ -34,7 +32,7 @@ space.
 See `this PDF guide <USER/sph/SPH_LAMMPS_userguide.pdf>`_ to using SPH in
 LAMMPS.
 
-**Restart, fix\_modify, output, run start/stop, minimize info:**
+**Restart, fix_modify, output, run start/stop, minimize info:**
 
 No information about this fix is written to :doc:`binary restart files <restart>`.  None of the :doc:`fix_modify <fix_modify>` options
 are relevant to this fix.  No global or per-atom quantities are stored
@@ -45,7 +43,6 @@ the :doc:`run <run>` command.  This fix is not invoked during :doc:`energy minim
 Restrictions
 """"""""""""
 
-
 This fix is part of the USER-SPH package.  It is only enabled if
 LAMMPS was built with that package.  See the :doc:`Build package <Build_package>` doc page for more info.
 
@@ -55,8 +52,3 @@ Related commands
 "fix meso"
 
 **Default:** none
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/fix_modify.rst b/doc/src/fix_modify.rst
index baa31338ed..604b63550c 100644
--- a/doc/src/fix_modify.rst
+++ b/doc/src/fix_modify.rst
@@ -1,22 +1,21 @@
-.. index:: fix\_modify
+.. index:: fix_modify
 
-fix\_modify command
-===================
+fix_modify command
+==================
 
 Syntax
 """"""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    fix_modify fix-ID keyword value ...
 
 * fix-ID = ID of the fix to modify
 * one or more keyword/value pairs may be appended
 * keyword = *temp* or *press* or *energy* or *virial* or *respa* or *dynamic/dof* or *bodyforces*
-  
+
   .. parsed-literal::
-  
+
        *temp* value = compute ID that calculates a temperature
        *press* value = compute ID that calculates a pressure
        *energy* value = *yes* or *no*
@@ -27,13 +26,10 @@ Syntax
        *bodyforces* value = *early* or *late*
          early/late = compute rigid-body forces/torques early or late in the timestep
 
-
-
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    fix_modify 3 temp myTemp press myPress
    fix_modify 1 energy yes
@@ -45,7 +41,7 @@ Description
 Modify one or more parameters of a previously defined fix.  Only
 specific fix styles support specific parameters.  See the doc pages
 for individual fix commands for info on which ones support which
-fix\_modify parameters.
+fix_modify parameters.
 
 The *temp* keyword is used to determine how a fix computes
 temperature.  The specified compute ID must have been previously
@@ -69,8 +65,8 @@ system. The fix's global and per-atom
 energy is included in the calculation performed by the :doc:`compute pe <compute_pe>` or :doc:`compute pe/atom <compute_pe_atom>`
 commands.  See the :doc:`thermo_style <thermo_style>` command for info
 on how potential energy is output.  For fixes that tally a global
-energy, it can be printed by using the keyword f\_ID in the
-thermo\_style custom command, where ID is the fix-ID of the appropriate
+energy, it can be printed by using the keyword f_ID in the
+thermo_style custom command, where ID is the fix-ID of the appropriate
 fix.
 
 .. note::
@@ -108,7 +104,7 @@ This is a number ranging from 1 to the number of levels. If the RESPA
 level is larger than the current maximum, the outermost level will be
 used, which is also the default setting. This default can be restored
 using a value of *0* for the RESPA level. The affected fix has to be
-enabled to support this feature; if not, *fix\_modify* will report an
+enabled to support this feature; if not, *fix_modify* will report an
 error. Active fixes with a custom RESPA level setting are reported
 with their specified level at the beginning of a r-RESPA run.
 
@@ -154,7 +150,7 @@ will give a warning if that is the case.
 
 Restrictions
 """"""""""""
- none
+none
 
 Related commands
 """"""""""""""""
@@ -167,8 +163,3 @@ Default
 The option defaults are temp = ID defined by fix, press = ID defined
 by fix, energy = no, virial = different for each fix style, respa = 0,
 bodyforce = late.
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/fix_modify_atc_commands.rst b/doc/src/fix_modify_atc_commands.rst
new file mode 100644
index 0000000000..ec326b8bf4
--- /dev/null
+++ b/doc/src/fix_modify_atc_commands.rst
@@ -0,0 +1,8 @@
+fix_modify AtC commands
+############################
+
+.. toctree::
+   :maxdepth: 1
+   :glob:
+
+   atc_*
diff --git a/doc/src/fix_momentum.rst b/doc/src/fix_momentum.rst
index e8194143d6..58fc9278a1 100644
--- a/doc/src/fix_momentum.rst
+++ b/doc/src/fix_momentum.rst
@@ -9,7 +9,6 @@ fix momentum/kk command
 Syntax
 """"""
 
-
 .. parsed-literal::
 
    fix ID group-ID momentum N keyword values ...
@@ -19,25 +18,21 @@ Syntax
 * N = adjust the momentum every this many timesteps
   one or more keyword/value pairs may be appended
 * keyword = *linear* or *angular* or *rescale*
-  
+
   .. parsed-literal::
-  
+
        *linear* values = xflag yflag zflag
          xflag,yflag,zflag = 0/1 to exclude/include each dimension
        *angular* values = none
 
-  
   .. parsed-literal::
-  
+
        *rescale* values = none
 
-
-
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    fix 1 all momentum 1 linear 1 1 0
    fix 1 all momentum 1 linear 1 1 1 rescale
@@ -70,10 +65,8 @@ of atoms by rescaling the velocities after the momentum was removed.
 Note that the :doc:`velocity <velocity>` command can be used to create
 initial velocities with zero aggregate linear and/or angular momentum.
 
-
 ----------
 
-
 Styles with a *gpu*\ , *intel*\ , *kk*\ , *omp*\ , or *opt* suffix are
 functionally the same as the corresponding style without the suffix.
 They have been optimized to run faster, depending on your available
@@ -92,7 +85,7 @@ by including their suffix, or you can use the :doc:`-suffix command-line switch
 See the :doc:`Speed packages <Speed_packages>` doc page for more
 instructions on how to use the accelerated styles effectively.
 
-**Restart, fix\_modify, output, run start/stop, minimize info:**
+**Restart, fix_modify, output, run start/stop, minimize info:**
 
 No information about this fix is written to :doc:`binary restart files <restart>`.  None of the :doc:`fix_modify <fix_modify>` options
 are relevant to this fix.  No global or per-atom quantities are stored
@@ -110,8 +103,3 @@ Related commands
 :doc:`fix recenter <fix_recenter>`, :doc:`velocity <velocity>`
 
 **Default:** none
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/fix_move.rst b/doc/src/fix_move.rst
index 036b156630..e9ebbd726b 100644
--- a/doc/src/fix_move.rst
+++ b/doc/src/fix_move.rst
@@ -6,7 +6,6 @@ fix move command
 Syntax
 """"""
 
-
 .. parsed-literal::
 
    fix ID group-ID move style args keyword values ...
@@ -14,9 +13,9 @@ Syntax
 * ID, group-ID are documented in :doc:`fix <fix>` command
 * move = style name of this fix command
 * style = *linear* or *wiggle* or *rotate* or *variable*
-  
+
   .. parsed-literal::
-  
+
        *linear* args = Vx Vy Vz
          Vx,Vy,Vz = components of velocity vector (velocity units), any component can be specified as NULL
        *wiggle* args = Ax Ay Az period
@@ -32,18 +31,15 @@ Syntax
 
 * zero or more keyword/value pairs may be appended
 * keyword = *units*
-  
+
   .. parsed-literal::
-  
+
        *units* value = *box* or *lattice*
 
-
-
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    fix 1 boundary move wiggle 3.0 0.0 0.0 1.0 units box
    fix 2 boundary move rotate 0.0 0.0 0.0 0.0 0.0 1.0 5.0
@@ -83,15 +79,12 @@ whose movement can influence nearby atoms.
    (e.g. to 0) before invoking this fix by using the :doc:`set image <set>`
    command.
 
-
 ----------
 
-
 The *linear* style moves atoms at a constant velocity, so that their
 position *X* = (x,y,z) as a function of time is given in vector
 notation as
 
-
 .. parsed-literal::
 
    X(t) = X0 + V \* delta
@@ -109,8 +102,7 @@ Note that the *linear* style is identical to using the *variable*
 style with an :doc:`equal-style variable <variable>` that uses the
 vdisplace() function.  E.g.
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    variable V equal 10.0
    variable x equal vdisplace(0.0,$V)
@@ -120,7 +112,6 @@ The *wiggle* style moves atoms in an oscillatory fashion, so that
 their position *X* = (x,y,z) as a function of time is given in vector
 notation as
 
-
 .. parsed-literal::
 
    X(t) = X0 + A sin(omega\*delta)
@@ -139,14 +130,13 @@ Note that the *wiggle* style is identical to using the *variable*
 style with :doc:`equal-style variables <variable>` that use the
 swiggle() and cwiggle() functions.  E.g.
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    variable A equal 10.0
    variable T equal 5.0
-   variable omega equal 2.0\*PI/$T
+   variable omega equal 2.0*PI/$T
    variable x equal swiggle(0.0,$A,$T)
-   variable v equal v_omega\*($A-cwiggle(0.0,$A,$T))
+   variable v equal v_omega*($A-cwiggle(0.0,$A,$T))
    fix 1 boundary move variable v_x NULL NULL v_v NULL NULL
 
 The *rotate* style rotates atoms around a rotation axis *R* =
@@ -167,7 +157,7 @@ atom's motion and rotation over time.
 The *variable* style allows the position and velocity components of
 each atom to be set by formulas specified via the
 :doc:`variable <variable>` command.  Each of the 6 variables is
-specified as an argument to the fix as v\_name, where name is the
+specified as an argument to the fix as v_name, where name is the
 variable name that is defined elsewhere in the input script.
 
 Each variable must be of either the *equal* or *atom* style.
@@ -180,10 +170,10 @@ fix stores the original coordinates of each atom (see note below) so
 that per-atom quantity can be used in an atom-style variable formula.
 See the :doc:`variable <variable>` command for details.
 
-The first 3 variables (v\_dx,v\_dy,v\_dz) specified for the *variable*
+The first 3 variables (v_dx,v_dy,v_dz) specified for the *variable*
 style are used to calculate a displacement from the atom's original
 position at the time the fix was specified.  The second 3 variables
-(v\_vx,v\_vy,v\_vz) specified are used to compute a velocity for each
+(v_vx,v_vy,v_vz) specified are used to compute a velocity for each
 atom.
 
 Any of the 6 variables can be specified as NULL.  If both the
@@ -211,11 +201,9 @@ been previously used to define the lattice spacing.  Each of these 3
 quantities may be dependent on the x,y,z dimension, since the lattice
 spacings can be different in x,y,z.
 
-
 ----------
 
-
-**Restart, fix\_modify, output, run start/stop, minimize info:**
+**Restart, fix_modify, output, run start/stop, minimize info:**
 
 This fix writes the original coordinates of moving atoms to :doc:`binary restart files <restart>`, as well as the initial timestep, so that
 the motion can be continuous in a restarted simulation.  See the
@@ -256,8 +244,3 @@ Related commands
 **Default:** none
 
 The option default is units = lattice.
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/fix_mscg.rst b/doc/src/fix_mscg.rst
index b6f776677e..81a59ad7ee 100644
--- a/doc/src/fix_mscg.rst
+++ b/doc/src/fix_mscg.rst
@@ -6,7 +6,6 @@ fix mscg command
 Syntax
 """"""
 
-
 .. parsed-literal::
 
    fix ID group-ID mscg N keyword args ...
@@ -16,9 +15,9 @@ Syntax
 * N = envoke this fix every this many timesteps
 * zero or more keyword/value pairs may be appended
 * keyword = *range* or *name* or *max*
-  
+
   .. parsed-literal::
-  
+
        *range* arg = *on* or *off*
          *on* = range finding functionality is performed
          *off* = force matching functionality is performed
@@ -27,13 +26,10 @@ Syntax
        *max* args = maxb maxa maxd
          maxb,maxa,maxd = maximum bonds/angles/dihedrals per atom
 
-
-
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    fix 1 all mscg 1
    fix 1 all mscg 1 range name A B
@@ -94,10 +90,8 @@ also be output depending on the parameters in the MS-CG library input
 script.  Again, see the documentation provided with the MS-CG library
 for more info.
 
-
 ----------
 
-
 The *range* keyword specifies which MS-CG library functionality should
 be invoked. If *on*\ , the step 4 range finder functionality is invoked.
 *off*\ , the step 5 force matching functionality is invoked.
@@ -112,7 +106,6 @@ dihedrals a bead can have in the coarse-grained model.
 Restrictions
 """"""""""""
 
-
 This fix is part of the MSCG package. It is only enabled if LAMMPS was
 built with that package.  See the :doc:`Build package <Build_package>`
 doc page for more info.
@@ -132,24 +125,13 @@ Default
 
 The default keyword settings are range off, max 4 12 36.
 
-
 ----------
 
-
 .. _Izvekov:
 
-
-
 **(Izvekov)** Izvekov, Voth, J Chem Phys 123, 134105 (2005).
 
 .. _Noid:
 
-
-
 **(Noid)** Noid, Chu, Ayton, Krishna, Izvekov, Voth, Das, Andersen, J
 Chem Phys 128, 134105 (2008).
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/fix_msst.rst b/doc/src/fix_msst.rst
index b22aedde7a..b76af36bb8 100644
--- a/doc/src/fix_msst.rst
+++ b/doc/src/fix_msst.rst
@@ -6,7 +6,6 @@ fix msst command
 Syntax
 """"""
 
-
 .. parsed-literal::
 
    fix ID group-ID msst dir shockvel keyword value ...
@@ -17,9 +16,9 @@ Syntax
 * shockvel = shock velocity (strictly positive, distance/time units)
 * zero or more keyword value pairs may be appended
 * keyword = *q* or *mu* or *p0* or *v0* or *e0* or *tscale* or *beta* or *dftb*
-  
+
   .. parsed-literal::
-  
+
        *q* value = cell mass-like parameter (mass\^2/distance\^4 units)
        *mu* value = artificial viscosity (mass/length/time units)
        *p0* value = initial pressure in the shock equations (pressure units)
@@ -29,13 +28,10 @@ Syntax
        *dftb* value = *yes* or *no* for whether using MSST in conjunction with DFTB+
        *beta* value = scale factor for improved energy conservation
 
-
-
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    fix 1 all msst y 100.0 q 1.0e5 mu 1.0e5
    fix 2 all msst z 50.0 q 1.0e4 mu 1.0e4  v0 4.3419e+03 p0 3.7797e+03 e0 -9.72360e+02 tscale 0.01
@@ -100,22 +96,20 @@ This fix computes a temperature and pressure and potential energy each
 timestep. To do this, the fix creates its own computes of style "temp"
 "pressure", and "pe", as if these commands had been issued:
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    compute fix-ID_MSST_temp all temp
    compute fix-ID_MSST_press all pressure fix-ID_MSST_temp
 
    compute fix-ID_MSST_pe all pe
 
-See the :doc:`compute temp <compute_temp>` and :doc:`compute pressure <compute_pressure>` commands for details.  Note that the
-IDs of the new computes are the fix-ID + "_MSST\_temp`or <MSST_press">`_
-or "_MSST\_pe".  The group for the new computes is "all".
-
+See the :doc:`compute temp <compute_temp>` and :doc:`compute pressure
+<compute_pressure>` commands for details.  Note that the IDs of the
+new computes are the fix-ID + "_MSST_temp" or "MSST_press" or
+"_MSST_pe".  The group for the new computes is "all".
 
 ----------
 
-
 The *dftb* keyword is to allow this fix to be used when LAMMPS is
 being driven by DFTB+, a density-functional tight-binding code. If the
 keyword *dftb* is used with a value of *yes*\ , then the MSST equations
@@ -126,15 +120,14 @@ you must define a :doc:`fix external <fix_external>` command in your
 input script, which is used to callback to DFTB+ during the LAMMPS
 timestepping.  DFTB+ will communicate its info to LAMMPS via that fix.
 
-
 ----------
 
+**Restart, fix_modify, output, run start/stop, minimize info:**
 
-**Restart, fix\_modify, output, run start/stop, minimize info:**
-
-This fix writes the state of all internal variables to :doc:`binary restart files <restart>`.  See the :doc:`read_restart <read_restart>` command
-for info on how to re-specify a fix in an input script that reads a
-restart file, so that the operation of the fix continues in an
+This fix writes the state of all internal variables to :doc:`binary
+restart files <restart>`.  See the :doc:`read_restart <read_restart>`
+command for info on how to re-specify a fix in an input script that
+reads a restart file, so that the operation of the fix continues in an
 uninterrupted fashion.
 
 The progress of the MSST can be monitored by printing the global
@@ -150,18 +143,17 @@ equations. See also :doc:`thermo_style <thermo_style>` command.
 
 The global vector contains four values in this order:
 
-[\ *dhugoniot*\ , *drayleigh*\ , *lagrangian\_speed*, *lagrangian\_position*]
+[\ *dhugoniot*\ , *drayleigh*\ , *lagrangian_speed*, *lagrangian_position*]
 
 1. *dhugoniot* is the departure from the Hugoniot (temperature units).
 2. *drayleigh* is the departure from the Rayleigh line (pressure units).
-3. *lagrangian\_speed* is the laboratory-frame Lagrangian speed (particle velocity) of the computational cell (velocity units).
-4. *lagrangian\_position* is the computational cell position in the reference frame moving at the shock speed. This is usually a good estimate of distance of the computational cell behind the shock front.
+3. *lagrangian_speed* is the laboratory-frame Lagrangian speed (particle velocity) of the computational cell (velocity units).
+4. *lagrangian_position* is the computational cell position in the reference frame moving at the shock speed. This is usually a good estimate of distance of the computational cell behind the shock front.
 
 To print these quantities to the log file with descriptive column
 headers, the following LAMMPS commands are suggested:
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    fix              msst all msst z
    fix_modify       msst energy yes
@@ -172,15 +164,16 @@ headers, the following LAMMPS commands are suggested:
    thermo_style     custom step temp ke pe lz pzz etotal v_dhug v_dray v_lgr_vel v_lgr_pos f_msst
 
 These fixes compute a global scalar and a global vector of 4
-quantities, which can be accessed by various :doc:`output commands <Howto_output>`.  The scalar values calculated by this fix
-are "extensive"; the vector values are "intensive".
+quantities, which can be accessed by various :doc:`output commands
+<Howto_output>`.  The scalar values calculated by this fix are
+"extensive"; the vector values are "intensive".
 
 Restrictions
 """"""""""""
 
-
 This fix style is part of the SHOCK package.  It is only enabled if
-LAMMPS was built with that package. See the :doc:`Build package <Build_package>` doc page for more info.
+LAMMPS was built with that package. See the :doc:`Build package
+<Build_package>` doc page for more info.
 
 All cell dimensions must be periodic. This fix can not be used with a
 triclinic cell.  The MSST fix has been tested only for the group-ID
@@ -198,31 +191,18 @@ The keyword defaults are q = 10, mu = 0, tscale = 0.01, dftb = no,
 beta = 0.0.  Note that p0, v0, and e0 are calculated on the first
 timestep.
 
-
 ----------
 
-
 .. _Reed:
 
-
-
 **(Reed)** Reed, Fried, and Joannopoulos, Phys. Rev. Lett., 90, 235503
 (2003).
 
 .. _Reed2:
 
-
-
 **(Reed2)** Reed, J. Phys. Chem. C, 116, 2205 (2012).
 
 .. _Goldman2:
 
-
-
 **(Goldman)** Goldman, Srinivasan, Hamel, Fried, Gaus, and Elstner,
 J. Phys. Chem. C, 117, 7885 (2013).
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/fix_mvv_dpd.rst b/doc/src/fix_mvv_dpd.rst
index e42dc84115..77ca08e0c5 100644
--- a/doc/src/fix_mvv_dpd.rst
+++ b/doc/src/fix_mvv_dpd.rst
@@ -12,7 +12,6 @@ fix mvv/tdpd command
 Syntax
 """"""
 
-
 .. parsed-literal::
 
    fix ID group-ID mvv/dpd lambda
@@ -28,8 +27,7 @@ Syntax
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    fix 1 all mvv/dpd
    fix 1 all mvv/dpd 0.5
@@ -50,10 +48,14 @@ The modified velocity-Verlet (MVV) algorithm aims to improve the
 stability of the time integrator by using an extrapolated version of
 the velocity for the force evaluation:
 
-.. image:: Eqs/fix_mvv_dpd.jpg
-   :align: center
+.. math::
 
-where the parameter <font size="4">&lambda;</font> depends on the
+   v(t+\frac{\Delta t}{2}) = & v(t) + \frac{\Delta t}{2}\cdot a(t) \\
+   r(t+\Delta t) = & r(t) + \Delta t\cdot v(t+\frac{\Delta t}{2}) \\
+   a(t+\Delta t) = & \frac{1}{m}\cdot F\left[ r(t+\Delta t), v(t) +\lambda \cdot \Delta t\cdot a(t)\right] \\
+   v(t+\Delta t) = & v(t+\frac{\Delta t}{2}) + \frac{\Delta t}{2}\cdot a(t+\Delta t)
+
+where the parameter :math:`\lambda` depends on the
 specific choice of DPD parameters, and needs to be tuned on a
 case-by-case basis.  Specification of a *lambda* value is optional.
 If specified, the setting must be from 0.0 to 1.0.  If not specified,
@@ -62,21 +64,19 @@ standard velocity-Verlet (VV) scheme.  For more details, see
 :ref:`Groot <Groot2>`.
 
 Fix *mvv/dpd* updates the position and velocity of each atom.  It can
-be used with the :doc:`pair_style mdpd <pair_meso>` command or other
+be used with the :doc:`pair_style mdpd <pair_mesodpd>` command or other
 pair styles such as :doc:`pair dpd <pair_dpd>`.
 
 Fix *mvv/edpd* updates the per-atom temperature, in addition to
-position and velocity, and must be used with the :doc:`pair_style edpd <pair_meso>` command.
+position and velocity, and must be used with the :doc:`pair_style edpd <pair_mesodpd>` command.
 
 Fix *mvv/tdpd* updates the per-atom chemical concentration, in
 addition to position and velocity, and must be used with the
-:doc:`pair_style tdpd <pair_meso>` command.
-
+:doc:`pair_style tdpd <pair_mesodpd>` command.
 
 ----------
 
-
-**Restart, fix\_modify, output, run start/stop, minimize info:**
+**Restart, fix_modify, output, run start/stop, minimize info:**
 
 No information about this fix is written to :doc:`binary restart files <restart>`.  None of the :doc:`fix_modify <fix_modify>` options
 are relevant to this fix.  No global or per-atom quantities are stored
@@ -87,33 +87,23 @@ the :doc:`run <run>` command.  This fix is not invoked during :doc:`energy minim
 Restrictions
 """"""""""""
 
-
-This fix is part of the USER-MESO package. It is only enabled if
+This fix is part of the USER-MESODPD package. It is only enabled if
 LAMMPS was built with that package. See the :doc:`Build package <Build_package>` doc page for more info.
 
 Related commands
 """"""""""""""""
 
-:doc:`pair_style mdpd <pair_meso>`, :doc:`pair_style edpd <pair_meso>`,
-:doc:`pair_style tdpd <pair_meso>`
+:doc:`pair_style mdpd <pair_mesodpd>`, :doc:`pair_style edpd <pair_mesodpd>`,
+:doc:`pair_style tdpd <pair_mesodpd>`
 
 Default
 """""""
 
 The default value for the optional *lambda* parameter is 0.5.
 
-
 ----------
 
-
 .. _Groot2:
 
-
-
 **(Groot)** Groot and Warren, J Chem Phys, 107: 4423-4435 (1997).  DOI:
 10.1063/1.474784
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/fix_neb.rst b/doc/src/fix_neb.rst
index 4d84e5d0b6..3612192d5b 100644
--- a/doc/src/fix_neb.rst
+++ b/doc/src/fix_neb.rst
@@ -6,7 +6,6 @@ fix neb command
 Syntax
 """"""
 
-
 .. parsed-literal::
 
    fix ID group-ID neb Kspring keyword value
@@ -35,8 +34,7 @@ Syntax
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    fix 1 active neb 10.0
    fix 2 all neb 1.0 perp 1.0 end last
@@ -66,7 +64,6 @@ interatomic force Fi = -Grad(V) for each replica I is altered.  For
 all intermediate replicas (i.e. for 1 < I < N, except the climbing
 replica) the force vector becomes:
 
-
 .. parsed-literal::
 
    Fi = -Grad(V) + (Grad(V) dot T') T' + Fnudge_parallel + Fnudge_perp
@@ -78,10 +75,10 @@ roughly in the direction of (Ri+i - Ri-1); see the
 coordinates of replica I; Ri-1 and Ri+1 are the coordinates of its
 neighbor replicas.  The term (Grad(V) dot T') is used to remove the
 component of the gradient parallel to the path which would tend to
-distribute the replica unevenly along the path.  Fnudge\_parallel is an
+distribute the replica unevenly along the path.  Fnudge_parallel is an
 artificial nudging force which is applied only in the tangent
 direction and which maintains the equal spacing between replicas (see
-below for more information).  Fnudge\_perp is an optional artificial
+below for more information).  Fnudge_perp is an optional artificial
 spring which is applied in a direction perpendicular to the tangent
 direction and which prevent the paths from forming acute kinks (see
 below for more information).
@@ -90,23 +87,19 @@ In the second stage of the NEB calculation, the interatomic force Fi
 for the climbing replica (the replica of highest energy after the
 first stage) is changed to:
 
-
 .. parsed-literal::
 
    Fi = -Grad(V) + 2 (Grad(V) dot T') T'
 
 and the relaxation procedure is continued to a new converged MEP.
 
-
 ----------
 
-
 The keyword *parallel* specifies how the parallel nudging force is
 computed.  With a value of *neigh*\ , the parallel nudging force is
 computed as in :ref:`(Henkelman1) <Henkelman1>` by connecting each
 intermediate replica with the previous and the next image:
 
-
 .. parsed-literal::
 
    Fnudge_parallel = *Kspring* \* (\|Ri+1 - Ri\| - \|Ri - Ri-1\|)
@@ -115,8 +108,7 @@ Note that in this case the specified *Kspring* is in force/distance
 units.
 
 With a value of *ideal*\ , the spring force is computed as suggested in
-ref`(WeinanE) <WeinanE>` 
-
+ref`(WeinanE) <WeinanE>`
 
 .. parsed-literal::
 
@@ -132,10 +124,8 @@ in force units.
 Note that the *ideal* form of nudging can often be more effective at
 keeping the replicas equally spaced.
 
-
 ----------
 
-
 The keyword *perp* specifies if and how a perpendicular nudging force
 is computed.  It adds a spring force perpendicular to the path in
 order to prevent the path from becoming too strongly kinked.  It can
@@ -145,7 +135,6 @@ resolution is poor.  I.e. when few replicas are used; see
 
 The perpendicular spring force is given by
 
-
 .. parsed-literal::
 
    Fnudge_perp = *Kspring2* \* F(Ri-1,Ri,Ri+1) (Ri+1 + Ri-1 - 2 Ri)
@@ -158,10 +147,8 @@ acute.  F(Ri-1 Ri R+1) is defined in :ref:`(Jonsson) <Jonsson>`.
 If *Kspring2* is set to 0.0 (the default) then no perpendicular spring
 force is added.
 
-
 ----------
 
-
 By default, no additional forces act on the first and last replicas
 during the NEB relaxation, so these replicas simply relax toward their
 respective local minima.  By using the key word *end*\ , additional
@@ -171,7 +158,6 @@ target energy ETarget.
 
 If ETarget>E, the interatomic force Fi for the specified replica becomes:
 
-
 .. parsed-literal::
 
    Fi = -Grad(V) + (Grad(V) dot T' + (E-ETarget)\*Kspring3) T',  *when* Grad(V) dot T' < 0
@@ -217,7 +203,7 @@ Finally, note that the last replica may never reach the target energy
 if it is stuck in a local minima which has a larger energy than the
 target energy.
 
-**Restart, fix\_modify, output, run start/stop, minimize info:**
+**Restart, fix_modify, output, run start/stop, minimize info:**
 
 No information about this fix is written to :doc:`binary restart files <restart>`.  None of the :doc:`fix_modify <fix_modify>` options
 are relevant to this fix.  No global or per-atom quantities are stored
@@ -232,7 +218,6 @@ as invoked by the :doc:`minimize <minimize>` command via the
 Restrictions
 """"""""""""
 
-
 This command can only be used if LAMMPS was built with the REPLICA
 package.  See the :doc:`Build package <Build_package>` doc
 page for more info.
@@ -248,45 +233,28 @@ Default
 The option defaults are parallel = neigh, perp = 0.0, ends is not
 specified (no inter-replica force on the end replicas).
 
-
 ----------
 
-
 .. _Henkelman1:
 
-
-
 **(Henkelman1)** Henkelman and Jonsson, J Chem Phys, 113, 9978-9985 (2000).
 
 .. _Henkelman2:
 
-
-
 **(Henkelman2)** Henkelman, Uberuaga, Jonsson, J Chem Phys, 113,
 9901-9904 (2000).
 
 .. _WeinanE:
 
-
-
 **(WeinanE)** E, Ren, Vanden-Eijnden, Phys Rev B, 66, 052301 (2002).
 
 .. _Jonsson:
 
-
-
 **(Jonsson)** Jonsson, Mills and Jacobsen, in Classical and Quantum
 Dynamics in Condensed Phase Simulations, edited by Berne, Ciccotti,
 and Coker World Scientific, Singapore, 1998, p 385.
 
 .. _Maras1:
 
-
-
 **(Maras)** Maras, Trushin, Stukowski, Ala-Nissila, Jonsson,
 Comp Phys Comm, 205, 13-21 (2016).
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/fix_neb_spin.rst b/doc/src/fix_neb_spin.rst
index 859ae5ad79..93729ac96f 100644
--- a/doc/src/fix_neb_spin.rst
+++ b/doc/src/fix_neb_spin.rst
@@ -6,7 +6,6 @@ fix neb/spin command
 Syntax
 """"""
 
-
 .. parsed-literal::
 
    fix ID group-ID neb/spin Kspring
@@ -22,7 +21,9 @@ Syntax
 Examples
 """"""""
 
-fix 1 active neb/spin 1.0
+.. code-block:: LAMMPS
+
+   fix 1 active neb/spin 1.0
 
 Description
 """""""""""
@@ -46,7 +47,7 @@ The nudging forces are calculated as explained in
 :ref:`(BessarabB) <BessarabB>`).
 See this reference for more explanation about their expression.
 
-**Restart, fix\_modify, output, run start/stop, minimize info:**
+**Restart, fix_modify, output, run start/stop, minimize info:**
 
 No information about this fix is written to :doc:`binary restart files <restart>`.  None of the :doc:`fix_modify <fix_modify>` options
 are relevant to this fix.  No global or per-atom quantities are stored
@@ -61,7 +62,6 @@ as invoked by the :doc:`minimize <minimize>` command via the
 Restrictions
 """"""""""""
 
-
 This command can only be used if LAMMPS was built with the SPIN
 package.  See the :doc:`Build package <Build_package>` doc
 page for more info.
@@ -76,18 +76,9 @@ Default
 
 none
 
-
 ----------
 
-
 .. _BessarabB:
 
-
-
 **(BessarabB)** Bessarab, Uzdin, Jonsson, Comp Phys Comm, 196,
 335-347 (2015).
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/fix_nh.rst b/doc/src/fix_nh.rst
index 50abc247a1..6927b47fcb 100644
--- a/doc/src/fix_nh.rst
+++ b/doc/src/fix_nh.rst
@@ -36,17 +36,16 @@ fix nph/omp command
 Syntax
 """"""
 
-
 .. parsed-literal::
 
    fix ID group-ID style_name keyword value ...
 
 * ID, group-ID are documented in :doc:`fix <fix>` command
-* style\_name = *nvt* or *npt* or *nph*
+* style_name = *nvt* or *npt* or *nph*
 * one or more keyword/value pairs may be appended
-  
+
   .. parsed-literal::
-  
+
      keyword = *temp* or *iso* or *aniso* or *tri* or *x* or *y* or *z* or *xy* or *yz* or *xz* or *couple* or *tchain* or *pchain* or *mtk* or *tloop* or *ploop* or *nreset* or *drag* or *dilate* or *scalexy* or *scaleyz* or *scalexz* or *flip* or *fixedpoint* or *update*
        *temp* values = Tstart Tstop Tdamp
          Tstart,Tstop = external temperature at start/end of run
@@ -82,13 +81,10 @@ Syntax
          dipole = update dipole orientation (only for sphere variants)
          dipole/dlm = use DLM integrator to update dipole orientation (only for sphere variants)
 
-
-
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    fix 1 all nvt temp 300.0 300.0 100.0
    fix 1 water npt temp 300.0 300.0 100.0 iso 0.0 0.0 1000.0
@@ -128,10 +124,8 @@ energy proposed by Parrinello and Rahman in
 follow the time-reversible measure-preserving Verlet and rRESPA
 integrators derived by Tuckerman et al in :ref:`(Tuckerman) <nh-Tuckerman>`.
 
-
 ----------
 
-
 The thermostat parameters for fix styles *nvt* and *npt* are specified
 using the *temp* keyword.  Other thermostat-related keywords are
 *tchain*\ , *tloop* and *drag*\ , which are discussed below.
@@ -159,15 +153,12 @@ by the velocity/position update portion of the integration.
    via using an :doc:`immediate variable <variable>` expression accessing
    the thermo property 'dt', which is the length of the time step. Example:
 
+.. code-block:: LAMMPS
 
-.. parsed-literal::
-
-   fix 1 all nvt temp 300.0 300.0 $(100.0\*dt)
-
+   fix 1 all nvt temp 300.0 300.0 $(100.0*dt)
 
 ----------
 
-
 The barostat parameters for fix styles *npt* and *nph* is specified
 using one or more of the *iso*\ , *aniso*\ , *tri*\ , *x*\ , *y*\ , *z*\ , *xy*\ ,
 *xz*\ , *yz*\ , and *couple* keywords.  These keywords give you the
@@ -233,10 +224,8 @@ group, a separate time integration fix like :doc:`fix nve <fix_nve>` or
 :doc:`fix nvt <fix_nh>` can be used on them, independent of whether they
 are dilated or not.
 
-
 ----------
 
-
 The *couple* keyword allows two or three of the diagonal components of
 the pressure tensor to be "coupled" together.  The value specified
 with the keyword determines which are coupled.  For example, *xz*
@@ -250,10 +239,8 @@ dilated or contracted by the same percentage every timestep.  The
 be identical.  *Couple xyz* can be used for a 2d simulation; the *z*
 dimension is simply ignored.
 
-
 ----------
 
-
 The *iso*\ , *aniso*\ , and *tri* keywords are simply shortcuts that are
 equivalent to specifying several other keywords together.
 
@@ -262,7 +249,6 @@ pressure is computed (hydrostatic pressure), and dilate/contract the
 dimensions together.  Using "iso Pstart Pstop Pdamp" is the same as
 specifying these 4 keywords:
 
-
 .. parsed-literal::
 
    x Pstart Pstop Pdamp
@@ -276,7 +262,6 @@ stress tensor as the driving forces, and the specified scalar external
 pressure.  Using "aniso Pstart Pstop Pdamp" is the same as specifying
 these 4 keywords:
 
-
 .. parsed-literal::
 
    x Pstart Pstop Pdamp
@@ -290,7 +275,6 @@ as the driving forces, and the specified scalar pressure as the
 external normal stress.  Using "tri Pstart Pstop Pdamp" is the same as
 specifying these 7 keywords:
 
-
 .. parsed-literal::
 
    x Pstart Pstop Pdamp
@@ -301,10 +285,8 @@ specifying these 7 keywords:
    xz 0.0 0.0 Pdamp
    couple none
 
-
 ----------
 
-
 In some cases (e.g. for solids) the pressure (volume) and/or
 temperature of the system can oscillate undesirably when a Nose/Hoover
 barostat and thermostat is applied.  The optional *drag* keyword will
@@ -398,10 +380,8 @@ Dullweber-Leimkuhler-McLachlan integration scheme
 giving better energy conservation and allows slightly longer timesteps
 at only a small additional computational cost.
 
-
 ----------
 
-
 .. note::
 
    Using a barostat coupled to tilt dimensions *xy*\ , *xz*\ , *yz* can
@@ -449,22 +429,23 @@ See the :doc:`Howto thermostat <Howto_thermostat>` and :doc:`Howto barostat <How
 ways to compute temperature and perform thermostatting and
 barostatting.
 
-
 ----------
 
-
 These fixes compute a temperature and pressure each timestep.  To do
 this, the thermostat and barostat fixes create their own computes of
 style "temp" and "pressure", as if one of these sets of commands had
 been issued:
 
 For fix nvt:
-compute fix-ID\_temp group-ID temp
 
+.. code-block:: LAMMPS
 
-.. parsed-literal::
+   compute fix-ID_temp group-ID temp
+
+For fix npt and fix nph:
+
+.. code-block:: LAMMPS
 
-   For fix npt and fix nph:
    compute fix-ID_temp all temp
    compute fix-ID_press all pressure fix-ID_temp
 
@@ -475,17 +456,17 @@ for the entire system.  In the case of fix nph, the temperature
 compute is not used for thermostatting, but just for a kinetic-energy
 contribution to the pressure.  See the :doc:`compute temp <compute_temp>` and :doc:`compute pressure <compute_pressure>`
 commands for details.  Note that the IDs of the new computes are the
-fix-ID + underscore + "temp" or fix\_ID + underscore + "press".
+fix-ID + underscore + "temp" or fix_ID + underscore + "press".
 
 Note that these are NOT the computes used by thermodynamic output (see
-the :doc:`thermo_style <thermo_style>` command) with ID = *thermo\_temp*
-and *thermo\_press*.  This means you can change the attributes of these
+the :doc:`thermo_style <thermo_style>` command) with ID = *thermo_temp*
+and *thermo_press*.  This means you can change the attributes of these
 fix's temperature or pressure via the
 :doc:`compute_modify <compute_modify>` command.  Or you can print this
 temperature or pressure during thermodynamic output via the
 :doc:`thermo_style custom <thermo_style>` command using the appropriate
-compute-ID.  It also means that changing attributes of *thermo\_temp*
-or *thermo\_press* will have no effect on this fix.
+compute-ID.  It also means that changing attributes of *thermo_temp*
+or *thermo_press* will have no effect on this fix.
 
 Like other fixes that perform thermostatting, fix nvt and fix npt can
 be used with :doc:`compute commands <compute>` that calculate a
@@ -501,18 +482,34 @@ temperature is calculated taking the bias into account, bias is
 removed from each atom, thermostatting is performed on the remaining
 thermal degrees of freedom, and the bias is added back in.
 
-
 ----------
 
-
 These fixes can be used with either the *verlet* or *respa*
 :doc:`integrators <run_style>`. When using one of the barostat fixes
 with *respa*\ , LAMMPS uses an integrator constructed
 according to the following factorization of the Liouville propagator
 (for two rRESPA levels):
 
-.. image:: Eqs/fix_nh1.jpg
-   :align: center
+.. math::
+
+   \exp \left(\mathrm{i} L \Delta t \right) = & \hat{E}
+   \exp \left(\mathrm{i} L_{\rm T\textrm{-}baro} \frac{\Delta t}{2} \right)
+   \exp \left(\mathrm{i} L_{\rm T\textrm{-}part} \frac{\Delta t}{2} \right)
+   \exp \left(\mathrm{i} L_{\epsilon , 2} \frac{\Delta t}{2} \right)
+   \exp \left(\mathrm{i} L_{2}^{(2)} \frac{\Delta t}{2} \right) \\
+   &\times \left[
+   \exp \left(\mathrm{i} L_{2}^{(1)} \frac{\Delta t}{2n} \right)
+   \exp \left(\mathrm{i} L_{\epsilon , 1} \frac{\Delta t}{2n} \right)
+   \exp \left(\mathrm{i} L_1 \frac{\Delta t}{n} \right)
+   \exp \left(\mathrm{i} L_{\epsilon , 1} \frac{\Delta t}{2n} \right)
+   \exp \left(\mathrm{i} L_{2}^{(1)} \frac{\Delta t}{2n} \right)
+   \right]^n \\
+   &\times
+   \exp \left(\mathrm{i} L_{2}^{(2)} \frac{\Delta t}{2} \right)
+   \exp \left(\mathrm{i} L_{\epsilon , 2} \frac{\Delta t}{2} \right)
+   \exp \left(\mathrm{i} L_{\rm T\textrm{-}part} \frac{\Delta t}{2} \right)
+   \exp \left(\mathrm{i} L_{\rm T\textrm{-}baro} \frac{\Delta t}{2} \right) \\
+   &+ \mathcal{O} \left(\Delta t^3 \right)
 
 This factorization differs somewhat from that of Tuckerman et al, in
 that the barostat is only updated at the outermost rRESPA level,
@@ -537,20 +534,16 @@ of the underlying non-Hamiltonian equations of motion.
    the momentum at infrequent intervals using the
    :doc:`fix momentum <fix_momentum>` command.
 
-
 ----------
 
-
 The fix npt and fix nph commands can be used with rigid bodies or
 mixtures of rigid bodies and non-rigid particles (e.g. solvent).  But
 there are also :doc:`fix rigid/npt <fix_rigid>` and :doc:`fix rigid/nph <fix_rigid>` commands, which are typically a more natural
 choice.  See the doc page for those commands for more discussion of
 the various ways to do this.
 
-
 ----------
 
-
 Styles with a *gpu*\ , *intel*\ , *kk*\ , *omp*\ , or *opt* suffix are
 functionally the same as the corresponding style without the suffix.
 They have been optimized to run faster, depending on your available
@@ -569,11 +562,9 @@ by including their suffix, or you can use the :doc:`-suffix command-line switch
 See the :doc:`Speed packages <Speed_packages>` doc page for more
 instructions on how to use the accelerated styles effectively.
 
-
 ----------
 
-
-**Restart, fix\_modify, output, run start/stop, minimize info:**
+**Restart, fix_modify, output, run start/stop, minimize info:**
 
 These fixes writes the state of all the thermostat and barostat
 variables to :doc:`binary restart files <restart>`.  See the
@@ -593,7 +584,7 @@ compute temperature on a subset of atoms.
 .. note::
 
    If both the *temp* and *press* keywords are used in a single
-   thermo\_modify command (or in two separate commands), then the order in
+   thermo_modify command (or in two separate commands), then the order in
    which the keywords are specified is important.  Note that a :doc:`pressure compute <compute_pressure>` defines its own temperature compute as
    an argument when it is specified.  The *temp* keyword will override
    this (for the pressure compute being used by fix npt), but only if the
@@ -628,21 +619,21 @@ simulation, otherwise its value is 3.
 
 The order of values in the global vector and their meaning is as
 follows.  The notation means there are tchain values for eta, followed
-by tchain for eta\_dot, followed by ndof for omega, etc:
+by tchain for eta_dot, followed by ndof for omega, etc:
 
 * eta[tchain] = particle thermostat displacements (unitless)
-* eta\_dot[tchain] = particle thermostat velocities (1/time units)
+* eta_dot[tchain] = particle thermostat velocities (1/time units)
 * omega[ndof] = barostat displacements (unitless)
-* omega\_dot[ndof] = barostat velocities (1/time units)
+* omega_dot[ndof] = barostat velocities (1/time units)
 * etap[pchain] = barostat thermostat displacements (unitless)
-* etap\_dot[pchain] = barostat thermostat velocities (1/time units)
-* PE\_eta[tchain] = potential energy of each particle thermostat displacement (energy units)
-* KE\_eta\_dot[tchain] = kinetic energy of each particle thermostat velocity (energy units)
-* PE\_omega[ndof] = potential energy of each barostat displacement (energy units)
-* KE\_omega\_dot[ndof] = kinetic energy of each barostat velocity (energy units)
-* PE\_etap[pchain] = potential energy of each barostat thermostat displacement (energy units)
-* KE\_etap\_dot[pchain] = kinetic energy of each barostat thermostat velocity (energy units)
-* PE\_strain[1] = scalar strain energy (energy units)
+* etap_dot[pchain] = barostat thermostat velocities (1/time units)
+* PE_eta[tchain] = potential energy of each particle thermostat displacement (energy units)
+* KE_eta_dot[tchain] = kinetic energy of each particle thermostat velocity (energy units)
+* PE_omega[ndof] = potential energy of each barostat displacement (energy units)
+* KE_omega_dot[ndof] = kinetic energy of each barostat velocity (energy units)
+* PE_etap[pchain] = potential energy of each barostat thermostat displacement (energy units)
+* KE_etap_dot[pchain] = kinetic energy of each barostat thermostat velocity (energy units)
+* PE_strain[1] = scalar strain energy (energy units)
 
 These fixes can ramp their external temperature and pressure over
 multiple runs, using the *start* and *stop* keywords of the
@@ -651,14 +642,11 @@ how to do this.
 
 These fixes are not invoked during :doc:`energy minimization <minimize>`.
 
-
 ----------
 
-
 Restrictions
 """"""""""""
 
-
 *X*\ , *y*\ , *z* cannot be barostatted if the associated dimension is not
 periodic.  *Xy*\ , *xz*\ , and *yz* can only be barostatted if the
 simulation domain is triclinic and the 2nd dimension in the keyword
@@ -701,43 +689,26 @@ ploop = 1, nreset = 0, drag = 0.0, dilate = all, couple = none,
 flip = yes, scaleyz = scalexz = scalexy = yes if periodic in 2nd
 dimension and not coupled to barostat, otherwise no.
 
-
 ----------
 
-
 .. _nh-Martyna:
 
-
-
 **(Martyna)** Martyna, Tobias and Klein, J Chem Phys, 101, 4177 (1994).
 
 .. _nh-Parrinello:
 
-
-
 **(Parrinello)** Parrinello and Rahman, J Appl Phys, 52, 7182 (1981).
 
 .. _nh-Tuckerman:
 
-
-
 **(Tuckerman)** Tuckerman, Alejandre, Lopez-Rendon, Jochim, and
 Martyna, J Phys A: Math Gen, 39, 5629 (2006).
 
 .. _nh-Shinoda:
 
-
-
 **(Shinoda)** Shinoda, Shiga, and Mikami, Phys Rev B, 69, 134103 (2004).
 
 .. _nh-Dullweber:
 
-
-
 **(Dullweber)** Dullweber, Leimkuhler and McLachlan, J Chem Phys, 107,
 5840 (1997).
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/fix_nh_eff.rst b/doc/src/fix_nh_eff.rst
index 58ed3e41cd..b5fecf279f 100644
--- a/doc/src/fix_nh_eff.rst
+++ b/doc/src/fix_nh_eff.rst
@@ -12,16 +12,15 @@ fix nph/eff command
 Syntax
 """"""
 
-
 .. parsed-literal::
 
    fix ID group-ID style_name keyword value ...
 
 * ID, group-ID are documented in :doc:`fix <fix>` command
-* style\_name = *nvt/eff* or *npt/eff* or *nph/eff*
-  
+* style_name = *nvt/eff* or *npt/eff* or *nph/eff*
+
   .. parsed-literal::
-  
+
      one or more keyword value pairs may be appended
      keyword = *temp* or *iso* or *aniso* or *tri* or *x* or *y* or *z* or *xy* or *yz* or *xz* or *couple* or *tchain* or *pchain* or *mtk* or *tloop* or *ploop* or *nreset* or *drag* or *dilate*
        *temp* values = Tstart Tstop Tdamp
@@ -43,13 +42,10 @@ Syntax
        *drag* value = drag factor added to barostat/thermostat (0.0 = no drag)
        *dilate* value = *all* or *partial*
 
-
-
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    fix 1 all nvt/eff temp 300.0 300.0 0.1
    fix 1 part npt/eff temp 300.0 300.0 0.1 iso 0.0 0.0 1.0
@@ -89,7 +85,7 @@ to the temperature or kinetic energy from the electron radial velocity.
 .. note::
 
    there are two different pressures that can be reported for eFF
-   when defining the pair\_style (see :doc:`pair eff/cut <pair_eff>` to
+   when defining the pair_style (see :doc:`pair eff/cut <pair_eff>` to
    understand these settings), one (default) that considers electrons do
    not contribute radial virial components (i.e. electrons treated as
    incompressible 'rigid' spheres) and one that does.  The radial
@@ -109,7 +105,7 @@ to the temperature or kinetic energy from the electron radial velocity.
    the user must allow for these degrees of freedom to equilibrate
    (i.e. equi-partitioning of energy) through time integration.
 
-**Restart, fix\_modify, output, run start/stop, minimize info:**
+**Restart, fix_modify, output, run start/stop, minimize info:**
 
 See the doc page for the :doc:`fix nvt, npt, and nph <fix_nh>` commands
 for details.
@@ -117,7 +113,6 @@ for details.
 Restrictions
 """"""""""""
 
-
 This fix is part of the USER-EFF package.  It is only enabled if
 LAMMPS was built with that package.  See the :doc:`Build package <Build_package>` doc page for more info.
 
@@ -146,36 +141,21 @@ Default
 The keyword defaults are tchain = 3, pchain = 3, mtk = yes, tloop =
 ploop = 1, nreset = 0, drag = 0.0, dilate = all, and couple = none.
 
-
 ----------
 
-
 .. _Martyna1:
 
-
-
 **(Martyna)** Martyna, Tobias and Klein, J Chem Phys, 101, 4177 (1994).
 
 .. _Parrinello:
 
-
-
 **(Parrinello)** Parrinello and Rahman, J Appl Phys, 52, 7182 (1981).
 
 .. _Tuckerman1:
 
-
-
 **(Tuckerman)** Tuckerman, Alejandre, Lopez-Rendon, Jochim, and
 Martyna, J Phys A: Math Gen, 39, 5629 (2006).
 
 .. _Shinoda2:
 
-
-
 **(Shinoda)** Shinoda, Shiga, and Mikami, Phys Rev B, 69, 134103 (2004).
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/fix_nh_uef.rst b/doc/src/fix_nh_uef.rst
index 7c15f5ffcb..27851d89a1 100644
--- a/doc/src/fix_nh_uef.rst
+++ b/doc/src/fix_nh_uef.rst
@@ -9,19 +9,18 @@ fix npt/uef command
 Syntax
 """"""
 
-
 .. parsed-literal::
 
    fix ID group-ID style_name erate edot_x edot_y temp Tstart Tstop Tdamp keyword value ...
 
 * ID, group-ID are documented in :doc:`fix <fix>` command
-* style\_name = *nvt/uef* or *npt/uef*
+* style_name = *nvt/uef* or *npt/uef*
 * *Tstart*\ , *Tstop*\ , and *Tdamp* are documented in the :doc:`fix npt <fix_nh>` command
-* *edot\_x* and *edot\_y* are the strain rates in the x and y directions (1/(time units))
+* *edot_x* and *edot_y* are the strain rates in the x and y directions (1/(time units))
 * one or more keyword/value pairs may be appended
-  
+
   .. parsed-literal::
-  
+
      keyword = *ext* or *strain* or *iso* or *x* or *y* or *z* or *tchain* or *pchain* or *tloop* or *ploop* or *mtk*
        *ext* value = *x* or *y* or *z* or *xy* or *yz* or *xz* = external dimensions
          sets the external dimensions used to calculate the scalar pressure
@@ -30,13 +29,10 @@ Syntax
        *iso*\ , *x*\ , *y*\ , *z*\ , *tchain*\ , *pchain*\ , *tloop*\ , *ploop*\ , *mtk* keywords
          documented by the :doc:`fix npt <fix_nh>` command
 
-
-
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    fix uniax_nvt all nvt/uef temp 400 400 100 erate 0.00001 -0.000005
    fix biax_nvt all nvt/uef temp 400 400 100 erate 0.000005 0.000005
@@ -61,10 +57,10 @@ Note that NEMD simulations of a continuously strained system can be
 performed using the :doc:`fix deform <fix_deform>`, :doc:`fix nvt/sllod <fix_nvt_sllod>`, and :doc:`compute temp/deform <compute_temp_deform>` commands.
 
 The applied flow field is set by the *eps* keyword. The values
-*edot\_x* and *edot\_y* correspond to the strain rates in the xx and yy
+*edot_x* and *edot_y* correspond to the strain rates in the xx and yy
 directions.  It is implicitly assumed that the flow field is
 traceless, and therefore the strain rate in the zz direction is eqal
-to -(*edot\_x* + *edot\_y*).
+to -(*edot_x* + *edot_y*).
 
 .. note::
 
@@ -89,19 +85,17 @@ in the LAMMPS frame. Only when the positions and velocities are
 updated is the system rotated to the flow frame, and it is rotated
 back to the LAMMPS frame immediately afterwards. For this reason, all
 vector-valued quantities (except for the tensors from
-:doc:`compute\_pressure/uef <compute_pressure_uef>` and
-:doc:`compute\_temp/uef <compute_temp_uef>`) will be computed in the
+:doc:`compute pressure/uef <compute_pressure_uef>` and
+:doc:`compute temp/uef <compute_temp_uef>`) will be computed in the
 LAMMPS frame. Rotationally invariant scalar quantities like the
 temperature and hydrostatic pressure are frame-invariant and will be
 computed correctly. Additionally, the system is in the LAMMPS frame
 during all of the output steps, and therefore trajectory files made
 using the dump command will be in the LAMMPS frame unless the
-:doc:`dump\_cfg/uef <dump_cfg_uef>` command is used.
-
+:doc:`dump cfg/uef <dump_cfg_uef>` command is used.
 
 ----------
 
-
 Temperature control is achieved with the default Nose-Hoover style
 thermostat documented in :doc:`fix npt <fix_nh>`. When this fix is
 active, only the peculiar velocity of each atom is stored, defined as
@@ -122,8 +116,7 @@ pressure (Pxx+Pyy)/2 will be controlled.
 This example command will control the total hydrostatic pressure under
 uniaxial tension:
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    fix f1 all npt/uef temp 0.7 0.7 0.5 iso 1 1 5 erate -0.5 -0.5 ext xyz
 
@@ -131,8 +124,7 @@ This example command will control the average stress in compression
 directions, which would typically correspond to free surfaces under
 drawing with uniaxial tension:
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    fix f2 all npt/uef temp 0.7 0.7 0.5 iso 1 1 5 erate -0.5 -0.5 ext xy
 
@@ -148,31 +140,26 @@ method.
 
 For example, the following commands will work:
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    fix f3 all npt/uef temp 0.7 0.7 0.5 x 1 1 5 y 1 1 5 erate -0.5 -0.5
    fix f4 all npt/uef temp 0.7 0.7 0.5 z 1 1 5 erate 0.5 0.5
 
 The following commands will not work:
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    fix f5 all npt/uef temp 0.7 0.7 0.5 x 1 1 5 z 1 1 5 erate -0.5 -0.5
    fix f6 all npt/uef temp 0.7 0.7 0.5 x 1 1 5 z 2 2 5 erate 0.5 0.5
 
-
 ----------
 
-
 These fix computes a temperature and pressure each timestep.  To do
 this, it creates its own computes of style "temp/uef" and
 "pressure/uef", as if one of these two sets of commands had been
 issued:
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    compute fix-ID_temp group-ID temp/uef
    compute fix-ID_press group-ID pressure/uef fix-ID_temp
@@ -182,9 +169,9 @@ issued:
 
 See the :doc:`compute temp/uef <compute_temp_uef>` and :doc:`compute pressure/uef <compute_pressure_uef>` commands for details.  Note
 that the IDs of the new computes are the fix-ID + underscore + "temp"
-or fix\_ID + underscore + "press".
+or fix_ID + underscore + "press".
 
-**Restart, fix\_modify, output, run start/stop, minimize info:**
+**Restart, fix_modify, output, run start/stop, minimize info:**
 
 The fix writes the state of all the thermostat and barostat variables,
 as well as the cumulative strain applied, to :doc:`binary restart files <restart>`.  See the :doc:`read_restart <read_restart>` command
@@ -210,7 +197,6 @@ The fix is not invoked during :doc:`energy minimization <minimize>`.
 Restrictions
 """"""""""""
 
-
 This fix is part of the USER-UEF package. It is only enabled if LAMMPS
 was built with that package. See the :doc:`Build package <Build_package>` doc page for more info.
 
@@ -235,45 +221,28 @@ Default
 
 The default keyword values specific to this fix are exy = xyz, strain
 = 0 0.  The remaining defaults are the same as for *fix
-npt*\ \_fix\_nh.html except tchain = 1.  The reason for this change is
+npt*\ _fix_nh.html except tchain = 1.  The reason for this change is
 given in :doc:`fix nvt/sllod <fix_nvt_sllod>`.
 
-
 ----------
 
-
 .. _Dobson:
 
-
-
 **(Dobson)** Dobson, J Chem Phys, 141, 184103 (2014).
 
 .. _Hunt:
 
-
-
 **(Hunt)** Hunt, Mol Simul, 42, 347 (2016).
 
 .. _Semaev:
 
-
-
 **(Semaev)** Semaev, Cryptography and Lattices, 181 (2001).
 
 .. _Sllod:
 
-
-
 **(Evans and Morriss)** Evans and Morriss, Phys Rev A, 30, 1528 (1984).
 
 .. _Nicholson:
 
-
-
 **(Nicholson and Rutledge)** Nicholson and Rutledge, J Chem Phys, 145,
 244903 (2016).
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/fix_nph_asphere.rst b/doc/src/fix_nph_asphere.rst
index 88d8052a5a..76670f1c30 100644
--- a/doc/src/fix_nph_asphere.rst
+++ b/doc/src/fix_nph_asphere.rst
@@ -9,7 +9,6 @@ fix nph/asphere/omp command
 Syntax
 """"""
 
-
 .. parsed-literal::
 
    fix ID group-ID nph/asphere args keyword value ...
@@ -21,8 +20,7 @@ Syntax
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    fix 1 all nph/asphere iso 0.0 0.0 1000.0
    fix 2 all nph/asphere x 5.0 5.0 1000.0
@@ -57,38 +55,33 @@ only the particles in the fix group are re-scaled.  The latter can be
 useful for leaving the coordinates of particles in a solid substrate
 unchanged and controlling the pressure of a surrounding fluid.
 
-
 ----------
 
-
 This fix computes a temperature and pressure each timestep.  To do
 this, the fix creates its own computes of style "temp/asphere" and
 "pressure", as if these commands had been issued:
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    compute fix-ID_temp all temp/asphere
    compute fix-ID_press all pressure fix-ID_temp
 
 See the :doc:`compute temp/asphere <compute_temp_asphere>` and :doc:`compute pressure <compute_pressure>` commands for details.  Note that the
-IDs of the new computes are the fix-ID + underscore + "temp" or fix\_ID
+IDs of the new computes are the fix-ID + underscore + "temp" or fix_ID
 + underscore + "press", and the group for the new computes is "all"
 since pressure is computed for the entire system.
 
 Note that these are NOT the computes used by thermodynamic output (see
-the :doc:`thermo_style <thermo_style>` command) with ID = *thermo\_temp*
-and *thermo\_press*.  This means you can change the attributes of this
+the :doc:`thermo_style <thermo_style>` command) with ID = *thermo_temp*
+and *thermo_press*.  This means you can change the attributes of this
 fix's temperature or pressure via the
 :doc:`compute_modify <compute_modify>` command or print this temperature
 or pressure during thermodynamic output via the :doc:`thermo_style custom <thermo_style>` command using the appropriate compute-ID.
-It also means that changing attributes of *thermo\_temp* or
-*thermo\_press* will have no effect on this fix.
-
+It also means that changing attributes of *thermo_temp* or
+*thermo_press* will have no effect on this fix.
 
 ----------
 
-
 Styles with a *gpu*\ , *intel*\ , *kk*\ , *omp*\ , or *opt* suffix are
 functionally the same as the corresponding style without the suffix.
 They have been optimized to run faster, depending on your available
@@ -107,7 +100,7 @@ by including their suffix, or you can use the :doc:`-suffix command-line switch
 See the :doc:`Speed packages <Speed_packages>` doc page for more
 instructions on how to use the accelerated styles effectively.
 
-**Restart, fix\_modify, output, run start/stop, minimize info:**
+**Restart, fix_modify, output, run start/stop, minimize info:**
 
 This fix writes the state of the Nose/Hoover barostat to :doc:`binary restart files <restart>`.  See the :doc:`read_restart <read_restart>`
 command for info on how to re-specify a fix in an input script that
@@ -139,7 +132,6 @@ This fix is not invoked during :doc:`energy minimization <minimize>`.
 Restrictions
 """"""""""""
 
-
 This fix is part of the ASPHERE package.  It is only enabled if LAMMPS
 was built with that package.  See the :doc:`Build package <Build_package>` doc page for more info.
 
@@ -154,11 +146,6 @@ shape attribute.
 Related commands
 """"""""""""""""
 
-:doc:`fix nph <fix_nh>`, :doc:`fix nve\_asphere <fix_nve_asphere>`, :doc:`fix nvt\_asphere <fix_nvt_asphere>`, :doc:`fix npt\_asphere <fix_npt_asphere>`, :doc:`fix_modify <fix_modify>`
+:doc:`fix nph <fix_nh>`, :doc:`fix nve_asphere <fix_nve_asphere>`, :doc:`fix nvt_asphere <fix_nvt_asphere>`, :doc:`fix npt_asphere <fix_npt_asphere>`, :doc:`fix_modify <fix_modify>`
 
 **Default:** none
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/fix_nph_body.rst b/doc/src/fix_nph_body.rst
index 25416bfa11..c2f6097fef 100644
--- a/doc/src/fix_nph_body.rst
+++ b/doc/src/fix_nph_body.rst
@@ -6,7 +6,6 @@ fix nph/body command
 Syntax
 """"""
 
-
 .. parsed-literal::
 
    fix ID group-ID nph/body args keyword value ...
@@ -18,8 +17,7 @@ Syntax
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    fix 1 all nph/body iso 0.0 0.0 1000.0
    fix 2 all nph/body x 5.0 5.0 1000.0
@@ -54,38 +52,33 @@ only the particles in the fix group are re-scaled.  The latter can be
 useful for leaving the coordinates of particles in a solid substrate
 unchanged and controlling the pressure of a surrounding fluid.
 
-
 ----------
 
-
 This fix computes a temperature and pressure each timestep.  To do
 this, the fix creates its own computes of style "temp/body" and
 "pressure", as if these commands had been issued:
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    compute fix-ID_temp all temp/body
    compute fix-ID_press all pressure fix-ID_temp
 
 See the :doc:`compute temp/body <compute_temp_body>` and :doc:`compute pressure <compute_pressure>` commands for details.  Note that the
-IDs of the new computes are the fix-ID + underscore + "temp" or fix\_ID
+IDs of the new computes are the fix-ID + underscore + "temp" or fix_ID
 + underscore + "press", and the group for the new computes is "all"
 since pressure is computed for the entire system.
 
 Note that these are NOT the computes used by thermodynamic output (see
-the :doc:`thermo_style <thermo_style>` command) with ID = *thermo\_temp*
-and *thermo\_press*.  This means you can change the attributes of this
+the :doc:`thermo_style <thermo_style>` command) with ID = *thermo_temp*
+and *thermo_press*.  This means you can change the attributes of this
 fix's temperature or pressure via the
 :doc:`compute_modify <compute_modify>` command or print this temperature
 or pressure during thermodynamic output via the :doc:`thermo_style custom <thermo_style>` command using the appropriate compute-ID.
-It also means that changing attributes of *thermo\_temp* or
-*thermo\_press* will have no effect on this fix.
-
+It also means that changing attributes of *thermo_temp* or
+*thermo_press* will have no effect on this fix.
 
 ----------
 
-
 Styles with a *gpu*\ , *intel*\ , *kk*\ , *omp*\ , or *opt* suffix are
 functionally the same as the corresponding style without the suffix.
 They have been optimized to run faster, depending on your available
@@ -104,7 +97,7 @@ by including their suffix, or you can use the :doc:`-suffix command-line switch
 See the :doc:`Speed packages <Speed_packages>` doc page for more
 instructions on how to use the accelerated styles effectively.
 
-**Restart, fix\_modify, output, run start/stop, minimize info:**
+**Restart, fix_modify, output, run start/stop, minimize info:**
 
 This fix writes the state of the Nose/Hoover barostat to :doc:`binary restart files <restart>`.  See the :doc:`read_restart <read_restart>`
 command for info on how to re-specify a fix in an input script that
@@ -136,7 +129,6 @@ This fix is not invoked during :doc:`energy minimization <minimize>`.
 Restrictions
 """"""""""""
 
-
 This fix is part of the BODY package.  It is only enabled if LAMMPS
 was built with that package.  See the :doc:`Build package <Build_package>` doc page for more info.
 
@@ -147,11 +139,6 @@ command.
 Related commands
 """"""""""""""""
 
-:doc:`fix nph <fix_nh>`, :doc:`fix nve\_body <fix_nve_body>`, :doc:`fix nvt\_body <fix_nvt_body>`, :doc:`fix npt\_body <fix_npt_body>`, :doc:`fix_modify <fix_modify>`
+:doc:`fix nph <fix_nh>`, :doc:`fix nve_body <fix_nve_body>`, :doc:`fix nvt_body <fix_nvt_body>`, :doc:`fix npt_body <fix_npt_body>`, :doc:`fix_modify <fix_modify>`
 
 **Default:** none
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/fix_nph_sphere.rst b/doc/src/fix_nph_sphere.rst
index de8fb71944..d1e5bfd701 100644
--- a/doc/src/fix_nph_sphere.rst
+++ b/doc/src/fix_nph_sphere.rst
@@ -9,7 +9,6 @@ fix nph/sphere/omp command
 Syntax
 """"""
 
-
 .. parsed-literal::
 
    fix ID group-ID nph/sphere args keyword value ...
@@ -17,9 +16,9 @@ Syntax
 * ID, group-ID are documented in :doc:`fix <fix>` command
 * nph/sphere = style name of this fix command
 * keyword = *disc*
-  
+
   .. parsed-literal::
-  
+
        *disc* value = none = treat particles as 2d discs, not spheres
 
 * additional barostat related keyword/value pairs from the :doc:`fix nph <fix_nh>` command can be appended
@@ -27,8 +26,7 @@ Syntax
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    fix 1 all nph/sphere iso 0.0 0.0 1000.0
    fix 2 all nph/sphere x 5.0 5.0 1000.0
@@ -70,38 +68,33 @@ only the particles in the fix group are re-scaled.  The latter can be
 useful for leaving the coordinates of particles in a solid substrate
 unchanged and controlling the pressure of a surrounding fluid.
 
-
 ----------
 
-
 This fix computes a temperature and pressure each timestep.  To do
 this, the fix creates its own computes of style "temp/sphere" and
 "pressure", as if these commands had been issued:
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    compute fix-ID_temp all temp/sphere
    compute fix-ID_press all pressure fix-ID_temp
 
 See the :doc:`compute temp/sphere <compute_temp_sphere>` and :doc:`compute pressure <compute_pressure>` commands for details.  Note that the
-IDs of the new computes are the fix-ID + underscore + "temp" or fix\_ID
+IDs of the new computes are the fix-ID + underscore + "temp" or fix_ID
 + underscore + "press", and the group for the new computes is "all"
 since pressure is computed for the entire system.
 
 Note that these are NOT the computes used by thermodynamic output (see
-the :doc:`thermo_style <thermo_style>` command) with ID = *thermo\_temp*
-and *thermo\_press*.  This means you can change the attributes of this
+the :doc:`thermo_style <thermo_style>` command) with ID = *thermo_temp*
+and *thermo_press*.  This means you can change the attributes of this
 fix's temperature or pressure via the
 :doc:`compute_modify <compute_modify>` command or print this temperature
 or pressure during thermodynamic output via the :doc:`thermo_style custom <thermo_style>` command using the appropriate compute-ID.
-It also means that changing attributes of *thermo\_temp* or
-*thermo\_press* will have no effect on this fix.
-
+It also means that changing attributes of *thermo_temp* or
+*thermo_press* will have no effect on this fix.
 
 ----------
 
-
 Styles with a *gpu*\ , *intel*\ , *kk*\ , *omp*\ , or *opt* suffix are
 functionally the same as the corresponding style without the suffix.
 They have been optimized to run faster, depending on your available
@@ -120,7 +113,7 @@ by including their suffix, or you can use the :doc:`-suffix command-line switch
 See the :doc:`Speed packages <Speed_packages>` doc page for more
 instructions on how to use the accelerated styles effectively.
 
-**Restart, fix\_modify, output, run start/stop, minimize info:**
+**Restart, fix_modify, output, run start/stop, minimize info:**
 
 This fix writes the state of the Nose/Hoover barostat to :doc:`binary restart files <restart>`.  See the :doc:`read_restart <read_restart>`
 command for info on how to re-specify a fix in an input script that
@@ -152,7 +145,6 @@ This fix is not invoked during :doc:`energy minimization <minimize>`.
 Restrictions
 """"""""""""
 
-
 This fix requires that atoms store torque and angular velocity (omega)
 and a radius as defined by the :doc:`atom_style sphere <atom_style>`
 command.
@@ -166,12 +158,7 @@ defined by the :doc:`dimension <dimension>` keyword.
 Related commands
 """"""""""""""""
 
-:doc:`fix nph <fix_nh>`, :doc:`fix nve\_sphere <fix_nve_sphere>`, :doc:`fix nvt\_sphere <fix_nvt_sphere>`, :doc:`fix npt\_sphere <fix_npt_sphere>`,
+:doc:`fix nph <fix_nh>`, :doc:`fix nve_sphere <fix_nve_sphere>`, :doc:`fix nvt_sphere <fix_nvt_sphere>`, :doc:`fix npt_sphere <fix_npt_sphere>`,
 :doc:`fix_modify <fix_modify>`
 
 **Default:** none
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/fix_nphug.rst b/doc/src/fix_nphug.rst
index 070192207f..fed73f6315 100644
--- a/doc/src/fix_nphug.rst
+++ b/doc/src/fix_nphug.rst
@@ -9,15 +9,14 @@ fix nphug/omp command
 Syntax
 """"""
 
-
 .. parsed-literal::
 
    fix ID group-ID nphug keyword value ...
 
 * ID, group-ID are documented in :doc:`fix <fix>` command
-  
+
   .. parsed-literal::
-  
+
      one or more keyword value pairs may be appended
      keyword = *temp* or *iso* or *aniso* or *tri* or *x* or *y* or *z* or *couple* or *tchain* or *pchain* or *mtk* or *tloop* or *ploop* or *nreset* or *drag* or *dilate* or *scaleyz* or *scalexz* or *scalexy*
        *temp* values = Value1 Value2 Tdamp
@@ -42,13 +41,10 @@ Syntax
        *scalexz* value = *yes* or *no* = scale xz with lz
        *scalexy* value = *yes* or *no* = scale xy with ly
 
-
-
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    fix myhug all nphug temp 1.0 1.0 10.0 z 40.0 40.0 70.0
    fix myhug all nphug temp 1.0 1.0 10.0 iso 40.0 40.0 70.0 drag 200.0 tchain 1 pchain 0
@@ -88,28 +84,27 @@ Essentially, a Hugoniostat simulation is an NPT simulation in which the
 user-specified target temperature is replaced with a time-dependent
 target temperature Tt obtained from the following equation:
 
-.. image:: Eqs/fix_nphug.jpg
-   :align: center
+.. math::
 
-where T and Tt are the instantaneous and target temperatures,
-P and P0 are the instantaneous and reference pressures or axial stresses,
+   T_t - T = \frac{\left(\frac{1}{2}\left(P + P_0\right)\left(V_0 - V\right) + E_0 - E\right)}{N_{dof} k_B } = \Delta
+
+where *T* and :math:`T_t` are the instantaneous and target temperatures,
+*P* and :math:`P_0` are the instantaneous and reference pressures or axial stresses,
 depending on whether hydrostatic or uniaxial compression is being
-performed, V and V0 are the instantaneous and reference volumes,
-E and E0 are the instantaneous and reference internal energy (potential
-plus kinetic), Ndof is the number of degrees of freedom used in the
-definition of temperature, and kB is the Boltzmann constant. Delta is the
+performed, *V* and :math:`V_0` are the instantaneous and reference volumes,
+*E* and :math:`E_0` are the instantaneous and reference internal energy (potential
+plus kinetic), :math:`N_{dof}` is the number of degrees of freedom used in the
+definition of temperature, and :math:`k_B` is the Boltzmann constant. :math:`\Delta` is the
 negative deviation of the instantaneous temperature from the target temperature.
-When the system reaches a stable equilibrium, the value of Delta should
+When the system reaches a stable equilibrium, the value of :math:`\Delta` should
 fluctuate about zero.
 
-The values of E0, V0, and P0 are the instantaneous values at the start of
-the simulation. These can be overridden using the fix\_modify keywords *e0*\ ,
+The values of :math:`E_0`, :math:`V_0`, and :math:`P_0` are the instantaneous values at the start of
+the simulation. These can be overridden using the fix_modify keywords *e0*\ ,
 *v0*\ , and *p0* described below.
 
-
 ----------
 
-
 .. note::
 
    Unlike the :doc:`fix temp/berendsen <fix_temp_berendsen>` command
@@ -119,16 +114,13 @@ the simulation. These can be overridden using the fix\_modify keywords *e0*\ ,
    this fix should not be used on atoms that have their temperature
    controlled by another fix - e.g. by :doc:`fix langevin <fix_nh>` or :doc:`fix temp/rescale <fix_temp_rescale>` commands.
 
-
 ----------
 
-
 This fix computes a temperature and pressure at each timestep.  To do
 this, the fix creates its own computes of style "temp" and "pressure",
 as if one of these two sets of commands had been issued:
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    compute fix-ID_temp group-ID temp
    compute fix-ID_press group-ID pressure fix-ID_temp
@@ -137,24 +129,22 @@ as if one of these two sets of commands had been issued:
    compute fix-ID_press all pressure fix-ID_temp
 
 See the :doc:`compute temp <compute_temp>` and :doc:`compute pressure <compute_pressure>` commands for details.  Note that the
-IDs of the new computes are the fix-ID + underscore + "temp" or fix\_ID
+IDs of the new computes are the fix-ID + underscore + "temp" or fix_ID
 + underscore + "press".  The group for
 the new computes is "all" since pressure is computed for the entire
 system.
 
 Note that these are NOT the computes used by thermodynamic output (see
-the :doc:`thermo_style <thermo_style>` command) with ID = *thermo\_temp*
-and *thermo\_press*.  This means you can change the attributes of this
+the :doc:`thermo_style <thermo_style>` command) with ID = *thermo_temp*
+and *thermo_press*.  This means you can change the attributes of this
 fix's temperature or pressure via the
 :doc:`compute_modify <compute_modify>` command or print this temperature
 or pressure during thermodynamic output via the :doc:`thermo_style custom <thermo_style>` command using the appropriate compute-ID.
-It also means that changing attributes of *thermo\_temp* or
-*thermo\_press* will have no effect on this fix.
-
+It also means that changing attributes of *thermo_temp* or
+*thermo_press* will have no effect on this fix.
 
 ----------
 
-
 Styles with a *gpu*\ , *intel*\ , *kk*\ , *omp*\ , or *opt* suffix are
 functionally the same as the corresponding style without the suffix.
 They have been optimized to run faster, depending on your available
@@ -173,25 +163,24 @@ by including their suffix, or you can use the :doc:`-suffix command-line switch
 See the :doc:`Speed packages <Speed_packages>` doc page for more
 instructions on how to use the accelerated styles effectively.
 
-
 ----------
 
+**Restart, fix_modify, output, run start/stop, minimize info:**
 
-**Restart, fix\_modify, output, run start/stop, minimize info:**
+This fix writes the values of :math:`E_0`, :math:`V_0`, and :math:`P_0`,
+as well as the state of all the thermostat and barostat variables to
+:doc:`binary restart files <restart>`.  See the :doc:`read_restart
+<read_restart>` command for info on how to re-specify a fix in an input
+script that reads a restart file, so that the operation of the fix
+continues in an uninterrupted fashion.
 
-This fix writes the values of E0, V0, and P0, as well as the
-state of all the thermostat and barostat
-variables to :doc:`binary restart files <restart>`.  See the
-:doc:`read_restart <read_restart>` command for info on how to re-specify
-a fix in an input script that reads a restart file, so that the
-operation of the fix continues in an uninterrupted fashion.
-
-The :doc:`fix_modify <fix_modify>` *e0*\ , *v0* and *p0* keywords
-can be used to define the values of E0, V0, and P0. Note the
-the values for *e0* and *v0* are extensive, and so must correspond
-to the total energy and volume of the entire system, not energy and
-volume per atom. If any of these quantities are not specified, then the
-instantaneous value in the system at the start of the simulation is used.
+The :doc:`fix_modify <fix_modify>` *e0*\ , *v0* and *p0* keywords can be
+used to define the values of :math:`E_0`, :math:`V_0`, and
+:math:`P_0`. Note the the values for *e0* and *v0* are extensive, and so
+must correspond to the total energy and volume of the entire system, not
+energy and volume per atom. If any of these quantities are not
+specified, then the instantaneous value in the system at the start of
+the simulation is used.
 
 The :doc:`fix_modify <fix_modify>` *temp* and *press* options are
 supported by these fixes.  You can use them to assign a
@@ -216,7 +205,7 @@ values are "intensive".
 
 The scalar is the cumulative energy change due to the fix.
 
-The vector stores three quantities unique to this fix (Delta, Us, and up),
+The vector stores three quantities unique to this fix (:math:`\Delta`, Us, and up),
 followed by all the internal Nose/Hoover thermostat and barostat
 variables defined for :doc:`fix npt <fix_nh>`. Delta is the deviation
 of the temperature from the target temperature, given by the above equation.
@@ -226,7 +215,6 @@ shock calculated from the RH conditions. They have units of distance/time.
 Restrictions
 """"""""""""
 
-
 This fix style is part of the SHOCK package.  It is only enabled if
 LAMMPS was built with that package. See the :doc:`Build package <Build_package>` doc page for more info.
 
@@ -243,17 +231,8 @@ Default
 
 The keyword defaults are the same as those for :doc:`fix npt <fix_nh>`
 
-
 ----------
 
-
 .. _Ravelo1:
 
-
-
 **(Ravelo)** Ravelo, Holian, Germann and Lomdahl, Phys Rev B, 70, 014103 (2004).
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/fix_npt_asphere.rst b/doc/src/fix_npt_asphere.rst
index ee3a81892e..aac88c551e 100644
--- a/doc/src/fix_npt_asphere.rst
+++ b/doc/src/fix_npt_asphere.rst
@@ -9,7 +9,6 @@ fix npt/asphere/omp command
 Syntax
 """"""
 
-
 .. parsed-literal::
 
    fix ID group-ID npt/asphere keyword value ...
@@ -21,8 +20,7 @@ Syntax
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    fix 1 all npt/asphere temp 300.0 300.0 100.0 iso 0.0 0.0 1000.0
    fix 2 all npt/asphere temp 300.0 300.0 100.0 x 5.0 5.0 1000.0
@@ -65,33 +63,30 @@ only the particles in the fix group are re-scaled.  The latter can be
 useful for leaving the coordinates of particles in a solid substrate
 unchanged and controlling the pressure of a surrounding fluid.
 
-
 ----------
 
-
 This fix computes a temperature and pressure each timestep.  To do
 this, the fix creates its own computes of style "temp/asphere" and
 "pressure", as if these commands had been issued:
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    compute fix-ID_temp all temp/asphere
    compute fix-ID_press all pressure fix-ID_temp
 
 See the :doc:`compute temp/asphere <compute_temp_asphere>` and :doc:`compute pressure <compute_pressure>` commands for details.  Note that the
-IDs of the new computes are the fix-ID + underscore + "temp" or fix\_ID
+IDs of the new computes are the fix-ID + underscore + "temp" or fix_ID
 + underscore + "press", and the group for the new computes is "all"
 since pressure is computed for the entire system.
 
 Note that these are NOT the computes used by thermodynamic output (see
-the :doc:`thermo_style <thermo_style>` command) with ID = *thermo\_temp*
-and *thermo\_press*.  This means you can change the attributes of this
+the :doc:`thermo_style <thermo_style>` command) with ID = *thermo_temp*
+and *thermo_press*.  This means you can change the attributes of this
 fix's temperature or pressure via the
 :doc:`compute_modify <compute_modify>` command or print this temperature
 or pressure during thermodynamic output via the :doc:`thermo_style custom <thermo_style>` command using the appropriate compute-ID.
-It also means that changing attributes of *thermo\_temp* or
-*thermo\_press* will have no effect on this fix.
+It also means that changing attributes of *thermo_temp* or
+*thermo_press* will have no effect on this fix.
 
 Like other fixes that perform thermostatting, this fix can be used
 with :doc:`compute commands <compute>` that calculate a temperature
@@ -107,10 +102,8 @@ temperature is calculated taking the bias into account, bias is
 removed from each atom, thermostatting is performed on the remaining
 thermal degrees of freedom, and the bias is added back in.
 
-
 ----------
 
-
 Styles with a *gpu*\ , *intel*\ , *kk*\ , *omp*\ , or *opt* suffix are
 functionally the same as the corresponding style without the suffix.
 They have been optimized to run faster, depending on your available
@@ -129,7 +122,7 @@ by including their suffix, or you can use the :doc:`-suffix command-line switch
 See the :doc:`Speed packages <Speed_packages>` doc page for more
 instructions on how to use the accelerated styles effectively.
 
-**Restart, fix\_modify, output, run start/stop, minimize info:**
+**Restart, fix_modify, output, run start/stop, minimize info:**
 
 This fix writes the state of the Nose/Hoover thermostat and barostat
 to :doc:`binary restart files <restart>`.  See the
@@ -164,7 +157,6 @@ This fix is not invoked during :doc:`energy minimization <minimize>`.
 Restrictions
 """"""""""""
 
-
 This fix is part of the ASPHERE package.  It is only enabled if LAMMPS
 was built with that package.  See the :doc:`Build package <Build_package>` doc page for more info.
 
@@ -179,11 +171,6 @@ shape attribute.
 Related commands
 """"""""""""""""
 
-:doc:`fix npt <fix_nh>`, :doc:`fix nve\_asphere <fix_nve_asphere>`, :doc:`fix nvt\_asphere <fix_nvt_asphere>`, :doc:`fix_modify <fix_modify>`
+:doc:`fix npt <fix_nh>`, :doc:`fix nve_asphere <fix_nve_asphere>`, :doc:`fix nvt_asphere <fix_nvt_asphere>`, :doc:`fix_modify <fix_modify>`
 
 **Default:** none
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/fix_npt_body.rst b/doc/src/fix_npt_body.rst
index bfc743d923..120437eeab 100644
--- a/doc/src/fix_npt_body.rst
+++ b/doc/src/fix_npt_body.rst
@@ -6,7 +6,6 @@ fix npt/body command
 Syntax
 """"""
 
-
 .. parsed-literal::
 
    fix ID group-ID npt/body keyword value ...
@@ -18,8 +17,7 @@ Syntax
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    fix 1 all npt/body temp 300.0 300.0 100.0 iso 0.0 0.0 1000.0
    fix 2 all npt/body temp 300.0 300.0 100.0 x 5.0 5.0 1000.0
@@ -62,33 +60,30 @@ only the particles in the fix group are re-scaled.  The latter can be
 useful for leaving the coordinates of particles in a solid substrate
 unchanged and controlling the pressure of a surrounding fluid.
 
-
 ----------
 
-
 This fix computes a temperature and pressure each timestep.  To do
 this, the fix creates its own computes of style "temp/body" and
 "pressure", as if these commands had been issued:
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    compute fix-ID_temp all temp/body
    compute fix-ID_press all pressure fix-ID_temp
 
 See the :doc:`compute temp/body <compute_temp_body>` and :doc:`compute pressure <compute_pressure>` commands for details.  Note that the
-IDs of the new computes are the fix-ID + underscore + "temp" or fix\_ID
+IDs of the new computes are the fix-ID + underscore + "temp" or fix_ID
 + underscore + "press", and the group for the new computes is "all"
 since pressure is computed for the entire system.
 
 Note that these are NOT the computes used by thermodynamic output (see
-the :doc:`thermo_style <thermo_style>` command) with ID = *thermo\_temp*
-and *thermo\_press*.  This means you can change the attributes of this
+the :doc:`thermo_style <thermo_style>` command) with ID = *thermo_temp*
+and *thermo_press*.  This means you can change the attributes of this
 fix's temperature or pressure via the
 :doc:`compute_modify <compute_modify>` command or print this temperature
 or pressure during thermodynamic output via the :doc:`thermo_style custom <thermo_style>` command using the appropriate compute-ID.
-It also means that changing attributes of *thermo\_temp* or
-*thermo\_press* will have no effect on this fix.
+It also means that changing attributes of *thermo_temp* or
+*thermo_press* will have no effect on this fix.
 
 Like other fixes that perform thermostatting, this fix can be used
 with :doc:`compute commands <compute>` that calculate a temperature
@@ -104,10 +99,8 @@ temperature is calculated taking the bias into account, bias is
 removed from each atom, thermostatting is performed on the remaining
 thermal degrees of freedom, and the bias is added back in.
 
-
 ----------
 
-
 Styles with a *gpu*\ , *intel*\ , *kk*\ , *omp*\ , or *opt* suffix are
 functionally the same as the corresponding style without the suffix.
 They have been optimized to run faster, depending on your available
@@ -126,7 +119,7 @@ by including their suffix, or you can use the :doc:`-suffix command-line switch
 See the :doc:`Speed packages <Speed_packages>` doc page for more
 instructions on how to use the accelerated styles effectively.
 
-**Restart, fix\_modify, output, run start/stop, minimize info:**
+**Restart, fix_modify, output, run start/stop, minimize info:**
 
 This fix writes the state of the Nose/Hoover thermostat and barostat
 to :doc:`binary restart files <restart>`.  See the
@@ -161,7 +154,6 @@ This fix is not invoked during :doc:`energy minimization <minimize>`.
 Restrictions
 """"""""""""
 
-
 This fix is part of the BODY package.  It is only enabled if LAMMPS
 was built with that package.  See the :doc:`Build package <Build_package>` doc page for more info.
 
@@ -172,11 +164,6 @@ command.
 Related commands
 """"""""""""""""
 
-:doc:`fix npt <fix_nh>`, :doc:`fix nve\_body <fix_nve_body>`, :doc:`fix nvt\_body <fix_nvt_body>`, :doc:`fix_modify <fix_modify>`
+:doc:`fix npt <fix_nh>`, :doc:`fix nve_body <fix_nve_body>`, :doc:`fix nvt_body <fix_nvt_body>`, :doc:`fix_modify <fix_modify>`
 
 **Default:** none
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/fix_npt_cauchy.rst b/doc/src/fix_npt_cauchy.rst
index 3a660c5c4f..5e0188c574 100644
--- a/doc/src/fix_npt_cauchy.rst
+++ b/doc/src/fix_npt_cauchy.rst
@@ -6,13 +6,12 @@ fix npt/cauchy command
 Syntax
 """"""
 
-
 .. parsed-literal::
 
    fix ID group-ID style_name keyword value ...
 
 * ID, group-ID are documented in :doc:`fix <fix>` command
-* style\_name = *npt/cauchy*
+* style_name = *npt/cauchy*
 * one or more keyword/value pairs may be appended
 * keyword = *temp* or *iso* or *aniso* or *tri* or *x* or *y* or *z* or *xy* or *yz* or *xz* or *couple* or *tchain* or *pchain* or *mtk* or *tloop* or *ploop* or *nreset* or *drag* or *dilate* or *scalexy* or *scaleyz* or *scalexz* or *flip* or *fixedpoint* or *update*
 
@@ -52,12 +51,12 @@ Syntax
        *fixedpoint* values = x y z
          x,y,z = perform barostat dilation/contraction around this point (distance units)
 
-
-
 Examples
 """"""""
 
-fix 1 water npt/cauchy temp 300.0 300.0 100.0 iso 0.0 0.0 1000.0
+.. code-block:: LAMMPS
+
+   fix 1 water npt/cauchy temp 300.0 300.0 100.0 iso 0.0 0.0 1000.0
 
 Description
 """""""""""
@@ -91,10 +90,8 @@ energy proposed by Parrinello and Rahman in
 follow the time-reversible measure-preserving Verlet and rRESPA
 integrators derived by Tuckerman et al in :ref:`(Tuckerman) <nc-Tuckerman>`.
 
-
 ----------
 
-
 The thermostat parameters are specified using the *temp* keyword.
 Other thermostat-related keywords are *tchain*\ , *tloop* and *drag*\ ,
 which are discussed below.
@@ -120,10 +117,8 @@ by the velocity/position update portion of the integration.
    100 timesteps.  Note that this is NOT the same as 100 time units for
    most :doc:`units <units>` settings.
 
-
 ----------
 
-
 The barostat parameters are specified using one or more of the *iso*\ ,
 *aniso*\ , *tri*\ , *x*\ , *y*\ , *z*\ , *xy*\ , *xz*\ , *yz*\ , and *couple* keywords.
 These keywords give you the ability to specify all 6 components of an
@@ -188,10 +183,8 @@ group, a separate time integration fix like :doc:`fix nve <fix_nve>` or
 :doc:`fix nvt <fix_nh>` can be used on them, independent of whether they
 are dilated or not.
 
-
 ----------
 
-
 The *couple* keyword allows two or three of the diagonal components of
 the pressure tensor to be "coupled" together.  The value specified
 with the keyword determines which are coupled.  For example, *xz*
@@ -205,10 +198,8 @@ dilated or contracted by the same percentage every timestep.  The
 be identical.  *Couple xyz* can be used for a 2d simulation; the *z*
 dimension is simply ignored.
 
-
 ----------
 
-
 The *iso*\ , *aniso*\ , and *tri* keywords are simply shortcuts that are
 equivalent to specifying several other keywords together.
 
@@ -217,7 +208,6 @@ pressure is computed (hydrostatic pressure), and dilate/contract the
 dimensions together.  Using "iso Pstart Pstop Pdamp" is the same as
 specifying these 4 keywords:
 
-
 .. parsed-literal::
 
    x Pstart Pstop Pdamp
@@ -231,7 +221,6 @@ stress tensor as the driving forces, and the specified scalar external
 pressure.  Using "aniso Pstart Pstop Pdamp" is the same as specifying
 these 4 keywords:
 
-
 .. parsed-literal::
 
    x Pstart Pstop Pdamp
@@ -245,7 +234,6 @@ as the driving forces, and the specified scalar pressure as the
 external normal stress.  Using "tri Pstart Pstop Pdamp" is the same as
 specifying these 7 keywords:
 
-
 .. parsed-literal::
 
    x Pstart Pstop Pdamp
@@ -256,10 +244,8 @@ specifying these 7 keywords:
    xz 0.0 0.0 Pdamp
    couple none
 
-
 ----------
 
-
 In some cases (e.g. for solids) the pressure (volume) and/or
 temperature of the system can oscillate undesirably when a Nose/Hoover
 barostat and thermostat is applied.  The optional *drag* keyword will
@@ -340,10 +326,8 @@ far. In all cases, the particle trajectories are unaffected by the
 chosen value, except for a time-dependent constant translation of
 positions.
 
-
 ----------
 
-
 .. note::
 
    Using a barostat coupled to tilt dimensions *xy*\ , *xz*\ , *yz* can
@@ -391,16 +375,13 @@ See the :doc:`Howto thermostat <Howto_thermostat>` and :doc:`Howto barostat <How
 ways to compute temperature and perform thermostatting and
 barostatting.
 
-
 ----------
 
-
 This fix compute a temperature and pressure each timestep.  To do
 this, the fix creates its own computes of style "temp" and "pressure",
 as if one of these sets of commands had been issued:
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    compute fix-ID_temp all temp
    compute fix-ID_press all pressure fix-ID_temp
@@ -408,17 +389,17 @@ as if one of these sets of commands had been issued:
 The group for both the new temperature and pressure compute is "all"
 since pressure is computed for the entire system.  See the :doc:`compute temp <compute_temp>` and :doc:`compute pressure <compute_pressure>`
 commands for details.  Note that the IDs of the new computes are the
-fix-ID + underscore + "temp" or fix\_ID + underscore + "press".
+fix-ID + underscore + "temp" or fix_ID + underscore + "press".
 
 Note that these are NOT the computes used by thermodynamic output (see
-the :doc:`thermo_style <thermo_style>` command) with ID = *thermo\_temp*
-and *thermo\_press*.  This means you can change the attributes of these
+the :doc:`thermo_style <thermo_style>` command) with ID = *thermo_temp*
+and *thermo_press*.  This means you can change the attributes of these
 fix's temperature or pressure via the
 :doc:`compute_modify <compute_modify>` command.  Or you can print this
 temperature or pressure during thermodynamic output via the
 :doc:`thermo_style custom <thermo_style>` command using the appropriate
-compute-ID.  It also means that changing attributes of *thermo\_temp*
-or *thermo\_press* will have no effect on this fix.
+compute-ID.  It also means that changing attributes of *thermo_temp*
+or *thermo_press* will have no effect on this fix.
 
 Like other fixes that perform thermostatting, fix npt/cauchy can
 be used with :doc:`compute commands <compute>` that calculate a
@@ -434,18 +415,34 @@ temperature is calculated taking the bias into account, bias is
 removed from each atom, thermostatting is performed on the remaining
 thermal degrees of freedom, and the bias is added back in.
 
-
 ----------
 
-
 This fix can be used with either the *verlet* or *respa*
 :doc:`integrators <run_style>`. When using this fix
 with *respa*\ , LAMMPS uses an integrator constructed
 according to the following factorization of the Liouville propagator
 (for two rRESPA levels):
 
-.. image:: Eqs/fix_nh1.jpg
-   :align: center
+.. math::
+
+   \exp \left(\mathrm{i} L \Delta t \right) = & \hat{E}
+   \exp \left(\mathrm{i} L_{\rm T\textrm{-}baro} \frac{\Delta t}{2} \right)
+   \exp \left(\mathrm{i} L_{\rm T\textrm{-}part} \frac{\Delta t}{2} \right)
+   \exp \left(\mathrm{i} L_{\epsilon , 2} \frac{\Delta t}{2} \right)
+   \exp \left(\mathrm{i} L_{2}^{(2)} \frac{\Delta t}{2} \right) \\
+   &\times \left[
+   \exp \left(\mathrm{i} L_{2}^{(1)} \frac{\Delta t}{2n} \right)
+   \exp \left(\mathrm{i} L_{\epsilon , 1} \frac{\Delta t}{2n} \right)
+   \exp \left(\mathrm{i} L_1 \frac{\Delta t}{n} \right)
+   \exp \left(\mathrm{i} L_{\epsilon , 1} \frac{\Delta t}{2n} \right)
+   \exp \left(\mathrm{i} L_{2}^{(1)} \frac{\Delta t}{2n} \right)
+   \right]^n \\
+   &\times
+   \exp \left(\mathrm{i} L_{2}^{(2)} \frac{\Delta t}{2} \right)
+   \exp \left(\mathrm{i} L_{\epsilon , 2} \frac{\Delta t}{2} \right)
+   \exp \left(\mathrm{i} L_{\rm T\textrm{-}part} \frac{\Delta t}{2} \right)
+   \exp \left(\mathrm{i} L_{\rm T\textrm{-}baro} \frac{\Delta t}{2} \right) \\
+   &+ \mathcal{O} \left(\Delta t^3 \right)
 
 This factorization differs somewhat from that of Tuckerman et al, in
 that the barostat is only updated at the outermost rRESPA level,
@@ -468,11 +465,9 @@ of the underlying non-Hamiltonian equations of motion.
    resetting the momentum at infrequent intervals using the
    :doc:`fix momentum <fix_momentum>` command.
 
-
 ----------
 
-
-**Restart, fix\_modify, output, run start/stop, minimize info:**
+**Restart, fix_modify, output, run start/stop, minimize info:**
 
 This fix writes the state of all the thermostat and barostat
 variables to :doc:`binary restart files <restart>`.  See the
@@ -492,7 +487,7 @@ compute temperature on a subset of atoms.
 .. note::
 
    If both the *temp* and *press* keywords are used in a single
-   thermo\_modify command (or in two separate commands), then the order in
+   thermo_modify command (or in two separate commands), then the order in
    which the keywords are specified is important.  Note that a :doc:`pressure compute <compute_pressure>` defines its own temperature compute as
    an argument when it is specified.  The *temp* keyword will override
    this (for the pressure compute being used by fix npt), but only if the
@@ -527,21 +522,21 @@ simulation, otherwise its value is 3.
 
 The order of values in the global vector and their meaning is as
 follows.  The notation means there are tchain values for eta, followed
-by tchain for eta\_dot, followed by ndof for omega, etc:
+by tchain for eta_dot, followed by ndof for omega, etc:
 
 * eta[tchain] = particle thermostat displacements (unitless)
-* eta\_dot[tchain] = particle thermostat velocities (1/time units)
+* eta_dot[tchain] = particle thermostat velocities (1/time units)
 * omega[ndof] = barostat displacements (unitless)
-* omega\_dot[ndof] = barostat velocities (1/time units)
+* omega_dot[ndof] = barostat velocities (1/time units)
 * etap[pchain] = barostat thermostat displacements (unitless)
-* etap\_dot[pchain] = barostat thermostat velocities (1/time units)
-* PE\_eta[tchain] = potential energy of each particle thermostat displacement (energy units)
-* KE\_eta\_dot[tchain] = kinetic energy of each particle thermostat velocity (energy units)
-* PE\_omega[ndof] = potential energy of each barostat displacement (energy units)
-* KE\_omega\_dot[ndof] = kinetic energy of each barostat velocity (energy units)
-* PE\_etap[pchain] = potential energy of each barostat thermostat displacement (energy units)
-* KE\_etap\_dot[pchain] = kinetic energy of each barostat thermostat velocity (energy units)
-* PE\_strain[1] = scalar strain energy (energy units)
+* etap_dot[pchain] = barostat thermostat velocities (1/time units)
+* PE_eta[tchain] = potential energy of each particle thermostat displacement (energy units)
+* KE_eta_dot[tchain] = kinetic energy of each particle thermostat velocity (energy units)
+* PE_omega[ndof] = potential energy of each barostat displacement (energy units)
+* KE_omega_dot[ndof] = kinetic energy of each barostat velocity (energy units)
+* PE_etap[pchain] = potential energy of each barostat thermostat displacement (energy units)
+* KE_etap_dot[pchain] = kinetic energy of each barostat thermostat velocity (energy units)
+* PE_strain[1] = scalar strain energy (energy units)
 
 This fix can ramp its external temperature and pressure over
 multiple runs, using the *start* and *stop* keywords of the
@@ -550,14 +545,11 @@ how to do this.
 
 This fix is not invoked during :doc:`energy minimization <minimize>`.
 
-
 ----------
 
-
 Restrictions
 """"""""""""
 
-
 This fix is part of the USER-MISC package.  It is only enabled if
 LAMMPS was built with that package.  See the :doc:`Build package <Build_package>` doc page for more info.
 
@@ -589,7 +581,7 @@ the set values and the final true (Cauchy) stresses can be
 considerable.
 
 The *cauchystat* keyword modifies the barostat as per Miller et
-al. (Miller)\_"#nc-Miller" so that the Cauchy stress is controlled.
+al. (Miller)_"#nc-Miller" so that the Cauchy stress is controlled.
 *alpha* is the non-dimensional parameter, typically set to 0.001 or
 0.01 that determines how aggressively the algorithm drives the system
 towards the set Cauchy stresses.  Larger values of *alpha* will modify
@@ -637,43 +629,26 @@ cauchystat = no,
 scaleyz = scalexz = scalexy = yes if periodic in 2nd dimension and
 not coupled to barostat, otherwise no.
 
-
 ----------
 
-
 .. _nc-Martyna:
 
-
-
 **(Martyna)** Martyna, Tobias and Klein, J Chem Phys, 101, 4177 (1994).
 
 .. _nc-Parrinello:
 
-
-
 **(Parrinello)** Parrinello and Rahman, J Appl Phys, 52, 7182 (1981).
 
 .. _nc-Tuckerman:
 
-
-
 **(Tuckerman)** Tuckerman, Alejandre, Lopez-Rendon, Jochim, and
 Martyna, J Phys A: Math Gen, 39, 5629 (2006).
 
 .. _nc-Shinoda:
 
-
-
 **(Shinoda)** Shinoda, Shiga, and Mikami, Phys Rev B, 69, 134103 (2004).
 
 .. _nc-Miller:
 
-
-
 **(Miller)** Miller, Tadmor, Gibson, Bernstein and Pavia, J Chem Phys,
 144, 184107 (2016).
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/fix_npt_sphere.rst b/doc/src/fix_npt_sphere.rst
index 0c4b79d616..2def29ae47 100644
--- a/doc/src/fix_npt_sphere.rst
+++ b/doc/src/fix_npt_sphere.rst
@@ -9,7 +9,6 @@ fix npt/sphere/omp command
 Syntax
 """"""
 
-
 .. parsed-literal::
 
    fix ID group-ID npt/sphere keyword value ...
@@ -28,8 +27,7 @@ Syntax
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    fix 1 all npt/sphere temp 300.0 300.0 100.0 iso 0.0 0.0 1000.0
    fix 2 all npt/sphere temp 300.0 300.0 100.0 x 5.0 5.0 1000.0
@@ -78,33 +76,30 @@ only the particles in the fix group are re-scaled.  The latter can be
 useful for leaving the coordinates of particles in a solid substrate
 unchanged and controlling the pressure of a surrounding fluid.
 
-
 ----------
 
-
 This fix computes a temperature and pressure each timestep.  To do
 this, the fix creates its own computes of style "temp/sphere" and
 "pressure", as if these commands had been issued:
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    compute fix-ID_temp all temp/sphere
    compute fix-ID_press all pressure fix-ID_temp
 
 See the :doc:`compute temp/sphere <compute_temp_sphere>` and :doc:`compute pressure <compute_pressure>` commands for details.  Note that the
-IDs of the new computes are the fix-ID + underscore + "temp" or fix\_ID
+IDs of the new computes are the fix-ID + underscore + "temp" or fix_ID
 + underscore + "press", and the group for the new computes is "all"
 since pressure is computed for the entire system.
 
 Note that these are NOT the computes used by thermodynamic output (see
-the :doc:`thermo_style <thermo_style>` command) with ID = *thermo\_temp*
-and *thermo\_press*.  This means you can change the attributes of this
+the :doc:`thermo_style <thermo_style>` command) with ID = *thermo_temp*
+and *thermo_press*.  This means you can change the attributes of this
 fix's temperature or pressure via the
 :doc:`compute_modify <compute_modify>` command or print this temperature
 or pressure during thermodynamic output via the :doc:`thermo_style custom <thermo_style>` command using the appropriate compute-ID.
-It also means that changing attributes of *thermo\_temp* or
-*thermo\_press* will have no effect on this fix.
+It also means that changing attributes of *thermo_temp* or
+*thermo_press* will have no effect on this fix.
 
 Like other fixes that perform thermostatting, this fix can be used
 with :doc:`compute commands <compute>` that calculate a temperature
@@ -120,10 +115,8 @@ temperature is calculated taking the bias into account, bias is
 removed from each atom, thermostatting is performed on the remaining
 thermal degrees of freedom, and the bias is added back in.
 
-
 ----------
 
-
 Styles with a *gpu*\ , *intel*\ , *kk*\ , *omp*\ , or *opt* suffix are
 functionally the same as the corresponding style without the suffix.
 They have been optimized to run faster, depending on your available
@@ -142,7 +135,7 @@ by including their suffix, or you can use the :doc:`-suffix command-line switch
 See the :doc:`Speed packages <Speed_packages>` doc page for more
 instructions on how to use the accelerated styles effectively.
 
-**Restart, fix\_modify, output, run start/stop, minimize info:**
+**Restart, fix_modify, output, run start/stop, minimize info:**
 
 This fix writes the state of the Nose/Hoover thermostat and barostat
 to :doc:`binary restart files <restart>`.  See the
@@ -177,7 +170,6 @@ This fix is not invoked during :doc:`energy minimization <minimize>`.
 Restrictions
 """"""""""""
 
-
 This fix requires that atoms store torque and angular velocity (omega)
 and a radius as defined by the :doc:`atom_style sphere <atom_style>`
 command.
@@ -191,11 +183,6 @@ defined by the :doc:`dimension <dimension>` keyword.
 Related commands
 """"""""""""""""
 
-:doc:`fix npt <fix_nh>`, :doc:`fix nve\_sphere <fix_nve_sphere>`, :doc:`fix nvt\_sphere <fix_nvt_sphere>`, :doc:`fix npt\_asphere <fix_npt_asphere>`, :doc:`fix_modify <fix_modify>`
+:doc:`fix npt <fix_nh>`, :doc:`fix nve_sphere <fix_nve_sphere>`, :doc:`fix nvt_sphere <fix_nvt_sphere>`, :doc:`fix npt_asphere <fix_npt_asphere>`, :doc:`fix_modify <fix_modify>`
 
 **Default:** none
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/fix_numdiff.rst b/doc/src/fix_numdiff.rst
new file mode 100644
index 0000000000..974826d1f2
--- /dev/null
+++ b/doc/src/fix_numdiff.rst
@@ -0,0 +1,110 @@
+.. index:: fix numdiff
+
+fix numdiff command
+====================
+
+Syntax
+""""""
+
+.. parsed-literal::
+
+   fix ID group-ID numdiff Nevery delta
+
+* ID, group-ID are documented in :doc:`fix <fix>` command
+* numdiff = style name of this fix command
+* Nevery = calculate force by finite difference every this many timesteps
+* delta = finite difference displacement length (distance units)
+
+Examples
+""""""""
+
+.. code-block:: LAMMPS
+
+   fix 1 all numdiff 1 0.0001
+   fix 1 all numdiff 10 1e-6
+   fix 1 all numdiff 100 0.01
+
+Description
+"""""""""""
+
+Calculate forces through finite difference calculations of energy
+versus position.  These forces can be compared to analytic forces
+computed by pair styles, bond styles, etc.  This can be useful for
+debugging or other purposes.
+
+The group specified with the command means only atoms within the group
+have their averages computed.  Results are set to 0.0 for atoms not in
+the group.
+
+This fix performs a loop over all atoms in the group.  For each atom
+and each component of force it adds *delta* to the position, and
+computes the new energy of the entire system.  It then subtracts
+*delta* from the original position and again computes the new energy
+of the system.  It then restores the original position.  That
+component of force is calculated as the difference in energy divided
+by two times *delta*.
+
+.. note::
+
+   It is important to choose a suitable value for delta, the magnitude of
+   atom displacements that are used to generate finite difference
+   approximations to the exact forces.  For typical systems, a value in
+   the range of 1 part in 1e4 to 1e5 of the typical separation distance
+   between atoms in the liquid or solid state will be sufficient.
+   However, the best value will depend on a multitude of factors
+   including the stiffness of the interatomic potential, the thermodynamic
+   state of the material being probed, and so on. The only way to be sure
+   that you have made a good choice is to do a sensitivity study on a
+   representative atomic configuration, sweeping over a wide range of
+   values of delta.  If delta is too small, the output forces will vary
+   erratically due to truncation effects. If delta is increased beyond a
+   certain point, the output forces will start to vary smoothly with
+   delta, due to growing contributions from higher order derivatives. In
+   between these two limits, the numerical force values should be largely
+   independent of delta.
+
+.. note::
+
+   The cost of each energy evaluation is essentially the cost of an MD
+   timestep.  Thus invoking this fix once for a 3d system has a cost
+   of 6N timesteps, where N is the total number of atoms in the system
+   (assuming all atoms are included in the group).  So this fix can be
+   very expensive to use for large systems.
+
+----------
+
+The *Nevery* argument specifies on what timesteps the force will
+be used calculated by finite difference.
+
+The *delta* argument specifies the positional displacement each
+atom will undergo.
+
+----------
+
+**Restart, fix_modify, output, run start/stop, minimize info:**
+
+No information about this fix is written to :doc:`binary restart files
+<restart>`.  None of the :doc:`fix_modify <fix_modify>` options are
+relevant to this fix.
+
+This fix produces a per-atom array which can be accessed by various
+:doc:`output commands <Howto_output>`, which stores the components of
+the force on each atom as calculated by finite difference.  The
+per-atom values can only be accessed on timesteps that are multiples
+of *Nevery* since that is when the finite difference forces are
+calculated.
+
+No parameter of this fix can be used with the *start/stop* keywords of
+the :doc:`run <run>` command.  This fix is invoked during :doc:`energy
+minimization <minimize>`.
+
+Restrictions
+""""""""""""
+ none
+
+Related commands
+""""""""""""""""
+
+:doc:`dynamical_matrix <dynamical_matrix>`,
+
+**Default:** none
diff --git a/doc/src/fix_nve.rst b/doc/src/fix_nve.rst
index 9c8b5dcf33..8089ad094d 100644
--- a/doc/src/fix_nve.rst
+++ b/doc/src/fix_nve.rst
@@ -15,7 +15,6 @@ fix nve/omp command
 Syntax
 """"""
 
-
 .. parsed-literal::
 
    fix ID group-ID nve
@@ -26,8 +25,7 @@ Syntax
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    fix 1 all nve
 
@@ -39,10 +37,8 @@ atoms in the group each timestep.  V is volume; E is energy.  This
 creates a system trajectory consistent with the microcanonical
 ensemble.
 
-
 ----------
 
-
 Styles with a *gpu*\ , *intel*\ , *kk*\ , *omp*\ , or *opt* suffix are
 functionally the same as the corresponding style without the suffix.
 They have been optimized to run faster, depending on your available
@@ -61,11 +57,9 @@ by including their suffix, or you can use the :doc:`-suffix command-line switch
 See the :doc:`Speed packages <Speed_packages>` doc page for more
 instructions on how to use the accelerated styles effectively.
 
-
 ----------
 
-
-**Restart, fix\_modify, output, run start/stop, minimize info:**
+**Restart, fix_modify, output, run start/stop, minimize info:**
 
 No information about this fix is written to :doc:`binary restart files <restart>`.  None of the :doc:`fix_modify <fix_modify>` options
 are relevant to this fix.  No global or per-atom quantities are stored
@@ -83,8 +77,3 @@ Related commands
 :doc:`fix nvt <fix_nh>`, :doc:`fix npt <fix_nh>`
 
 **Default:** none
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/fix_nve_asphere.rst b/doc/src/fix_nve_asphere.rst
index 688792058d..f231330831 100644
--- a/doc/src/fix_nve_asphere.rst
+++ b/doc/src/fix_nve_asphere.rst
@@ -9,7 +9,6 @@ fix nve/asphere/intel command
 Syntax
 """"""
 
-
 .. parsed-literal::
 
    fix ID group-ID nve/asphere
@@ -20,8 +19,7 @@ Syntax
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    fix 1 all nve/asphere
 
@@ -36,7 +34,7 @@ trajectory consistent with the microcanonical ensemble.
 This fix differs from the :doc:`fix nve <fix_nve>` command, which
 assumes point particles and only updates their position and velocity.
 
-**Restart, fix\_modify, output, run start/stop, minimize info:**
+**Restart, fix_modify, output, run start/stop, minimize info:**
 
 No information about this fix is written to :doc:`binary restart files <restart>`.  None of the :doc:`fix_modify <fix_modify>` options
 are relevant to this fix.  No global or per-atom quantities are stored
@@ -44,10 +42,8 @@ by this fix for access by various :doc:`output commands <Howto_output>`.
 No parameter of this fix can be used with the *start/stop* keywords of
 the :doc:`run <run>` command.  This fix is not invoked during :doc:`energy minimization <minimize>`.
 
-
 ----------
 
-
 Styles with a *gpu*\ , *intel*\ , *kk*\ , *omp*\ , or *opt* suffix are
 functionally the same as the corresponding style without the suffix.
 They have been optimized to run faster, depending on your available
@@ -66,14 +62,11 @@ by including their suffix, or you can use the :doc:`-suffix command-line switch
 See the :doc:`Speed packages <Speed_packages>` doc page for more
 instructions on how to use the accelerated styles effectively.
 
-
 ----------
 
-
 Restrictions
 """"""""""""
 
-
 This fix is part of the ASPHERE package.  It is only enabled if LAMMPS
 was built with that package.  See the :doc:`Build package <Build_package>` doc page for more info.
 
@@ -91,8 +84,3 @@ Related commands
 :doc:`fix nve <fix_nve>`, :doc:`fix nve/sphere <fix_nve_sphere>`
 
 **Default:** none
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/fix_nve_asphere_noforce.rst b/doc/src/fix_nve_asphere_noforce.rst
index b175b769e8..b518781d6c 100644
--- a/doc/src/fix_nve_asphere_noforce.rst
+++ b/doc/src/fix_nve_asphere_noforce.rst
@@ -6,7 +6,6 @@ fix nve/asphere/noforce command
 Syntax
 """"""
 
-
 .. parsed-literal::
 
    fix ID group-ID nve/asphere/noforce
@@ -17,7 +16,9 @@ Syntax
 Examples
 """"""""
 
-fix 1 all nve/asphere/noforce
+.. code-block:: LAMMPS
+
+   fix 1 all nve/asphere/noforce
 
 Description
 """""""""""
@@ -32,11 +33,9 @@ This is useful as an implicit time integrator for Fast Lubrication
 Dynamics, since the velocity and angular momentum are updated by the
 :doc:`pair_style lubricuteU <pair_lubricateU>` command.
 
-
 ----------
 
-
-**Restart, fix\_modify, output, run start/stop, minimize info:**
+**Restart, fix_modify, output, run start/stop, minimize info:**
 
 No information about this fix is written to :doc:`binary restart files <restart>`.  None of the :doc:`fix_modify <fix_modify>` options
 are relevant to this fix.  No global or per-atom quantities are stored
@@ -47,7 +46,6 @@ the :doc:`run <run>` command.  This fix is not invoked during :doc:`energy minim
 Restrictions
 """"""""""""
 
-
 This fix is part of the ASPHERE package.  It is only enabled if LAMMPS
 was built with that package.  See the :doc:`Build package <Build_package>` doc page for more info.
 
@@ -65,8 +63,3 @@ Related commands
 :doc:`fix nve/noforce <fix_nve_noforce>`, :doc:`fix nve/asphere <fix_nve_asphere>`
 
 **Default:** none
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/fix_nve_awpmd.rst b/doc/src/fix_nve_awpmd.rst
index 8aeb6969b2..45bb002617 100644
--- a/doc/src/fix_nve_awpmd.rst
+++ b/doc/src/fix_nve_awpmd.rst
@@ -6,7 +6,6 @@ fix nve/awpmd command
 Syntax
 """"""
 
-
 .. parsed-literal::
 
    fix ID group-ID nve/awpmd
@@ -17,8 +16,7 @@ Syntax
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    fix 1 all nve/awpmd
 
@@ -33,11 +31,9 @@ ensemble.
 The operation of this fix is exactly like that described by the :doc:`fix nve <fix_nve>` command, except that the width and width-velocity of
 the electron wave functions are also updated.
 
-
 ----------
 
-
-**Restart, fix\_modify, output, run start/stop, minimize info:**
+**Restart, fix_modify, output, run start/stop, minimize info:**
 
 No information about this fix is written to :doc:`binary restart files <restart>`.  None of the :doc:`fix_modify <fix_modify>` options
 are relevant to this fix.  No global or per-atom quantities are stored
@@ -48,7 +44,6 @@ the :doc:`run <run>` command.  This fix is not invoked during :doc:`energy minim
 Restrictions
 """"""""""""
 
-
 This fix is part of the USER-AWPMD package.  It is only enabled if
 LAMMPS was built with that package.  See the :doc:`Build package <Build_package>` doc page for more info.
 
@@ -58,8 +53,3 @@ Related commands
 :doc:`fix nve <fix_nve>`
 
 **Default:** none
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/fix_nve_body.rst b/doc/src/fix_nve_body.rst
index 5410ddb8ee..ad68abb0d4 100644
--- a/doc/src/fix_nve_body.rst
+++ b/doc/src/fix_nve_body.rst
@@ -6,7 +6,6 @@ fix nve/body command
 Syntax
 """"""
 
-
 .. parsed-literal::
 
    fix ID group-ID nve/body
@@ -17,8 +16,7 @@ Syntax
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    fix 1 all nve/body
 
@@ -34,7 +32,7 @@ particles.
 This fix differs from the :doc:`fix nve <fix_nve>` command, which
 assumes point particles and only updates their position and velocity.
 
-**Restart, fix\_modify, output, run start/stop, minimize info:**
+**Restart, fix_modify, output, run start/stop, minimize info:**
 
 No information about this fix is written to :doc:`binary restart files <restart>`.  None of the :doc:`fix_modify <fix_modify>` options
 are relevant to this fix.  No global or per-atom quantities are stored
@@ -45,7 +43,6 @@ the :doc:`run <run>` command.  This fix is not invoked during :doc:`energy minim
 Restrictions
 """"""""""""
 
-
 This fix is part of the BODY package.  It is only enabled if LAMMPS
 was built with that package.  See the :doc:`Build package <Build_package>` doc page for more info.
 
@@ -62,8 +59,3 @@ Related commands
 :doc:`fix nve <fix_nve>`, :doc:`fix nve/sphere <fix_nve_sphere>`, :doc:`fix nve/asphere <fix_nve_asphere>`
 
 **Default:** none
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/fix_nve_dot.rst b/doc/src/fix_nve_dot.rst
index 5fc6a46ab5..a7018a337e 100644
--- a/doc/src/fix_nve_dot.rst
+++ b/doc/src/fix_nve_dot.rst
@@ -6,7 +6,6 @@ fix nve/dot command
 Syntax
 """"""
 
-
 .. parsed-literal::
 
    fix ID group-ID nve/dot
@@ -14,12 +13,10 @@ Syntax
 * ID, group-ID are documented in :doc:`fix <fix>` command
 * nve/dot = style name of this fix command
 
-
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    fix 1 all nve/dot
 
@@ -43,14 +40,11 @@ An example input file can be found in /examples/USER/cgdna/examples/duplex1/.
 Further details of the implementation and stability of the integrator are contained in :ref:`(Henrich) <Henrich4>`.
 The preprint version of the article can be found `here <PDF/USER-CGDNA.pdf>`_.
 
-
 ----------
 
-
 Restrictions
 """"""""""""
 
-
 These pair styles can only be used if LAMMPS was built with the
 :ref:`USER-CGDNA <PKG-USER-CGDNA>` package and the MOLECULE and ASPHERE package.
 See the :doc:`Build package <Build_package>` doc page for more info.
@@ -62,10 +56,8 @@ Related commands
 
 **Default:** none
 
-
 ----------
 
-
 .. _Davidchack4:
 
 **(Davidchack)** R.L Davidchack, T.E. Ouldridge, and M.V. Tretyakov. J. Chem. Phys. 142, 144114 (2015).
@@ -77,8 +69,3 @@ Related commands
 .. _Henrich4:
 
 **(Henrich)** O. Henrich, Y. A. Gutierrez-Fosado, T. Curk, T. E. Ouldridge, Eur. Phys. J. E 41, 57 (2018).
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/fix_nve_dotc_langevin.rst b/doc/src/fix_nve_dotc_langevin.rst
index 6b210b7150..88d15b9e17 100644
--- a/doc/src/fix_nve_dotc_langevin.rst
+++ b/doc/src/fix_nve_dotc_langevin.rst
@@ -6,7 +6,6 @@ fix nve/dotc/langevin command
 Syntax
 """"""
 
-
 .. parsed-literal::
 
    fix ID group-ID nve/dotc/langevin Tstart Tstop damp seed keyword value
@@ -17,19 +16,16 @@ Syntax
 * damp = damping parameter (time units)
 * seed = random number seed to use for white noise (positive integer)
 * keyword = *angmom*
-  
+
   .. parsed-literal::
-  
+
        *angmom* value = factor
          factor = do thermostat rotational degrees of freedom via the angular momentum and apply numeric scale factor as discussed below
 
-
-
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    fix 1 all nve/dotc/langevin 1.0 1.0 0.03 457145 angmom 10
    fix 1 all nve/dotc/langevin 0.1 0.1 78.9375 457145 angmom 10
@@ -60,39 +56,36 @@ over the standard integrator, permitting slightly larger timestep sizes.
 
 The total force on each atom will have the form:
 
+.. math::
 
-.. parsed-literal::
+   F =   & F_c + F_f + F_r \\
+   F_f = & - \frac{m}{\mathrm{damp}} v \\
+   F_r \propto & \sqrt{\frac{k_B T m}{dt~\mathrm{damp}}}
 
-   F = Fc + Ff + Fr
-   Ff = - (m / damp) v
-   Fr is proportional to sqrt(Kb T m / (dt damp))
+:math:`F_c` is the conservative force computed via the usual
+inter-particle interactions (:doc:`pair_style <pair_style>`,
+:doc:`bond_style <bond_style>`, etc). The :math:`F_f` and :math:`F_r`
+terms are implicitly taken into account by this fix on a per-particle
+basis.
 
-Fc is the conservative force computed via the usual inter-particle
-interactions (:doc:`pair_style <pair_style>`,
-:doc:`bond_style <bond_style>`, etc).
-
-The Ff and Fr terms are implicitly taken into account by this fix
-on a per-particle basis.
-
-Ff is a frictional drag or viscous damping term proportional to the
-particle's velocity.  The proportionality constant for each atom is
-computed as m/damp, where m is the mass of the particle and damp is
-the damping factor specified by the user.
-
-Fr is a force due to solvent atoms at a temperature T randomly bumping
-into the particle.  As derived from the fluctuation/dissipation
-theorem, its magnitude as shown above is proportional to sqrt(Kb T m /
-dt damp), where Kb is the Boltzmann constant, T is the desired
-temperature, m is the mass of the particle, dt is the timestep size,
-and damp is the damping factor.  Random numbers are used to randomize
-the direction and magnitude of this force as described in
-:ref:`(Dunweg) <Dunweg5>`, where a uniform random number is used (instead of
-a Gaussian random number) for speed.
+:math:`F_f` is a frictional drag or viscous damping term proportional to
+the particle's velocity.  The proportionality constant for each atom is
+computed as :math:`\frac{m}{\mathrm{damp}}`, where *m* is the mass of
+the particle and damp is the damping factor specified by the user.
 
+:math:`F_r` is a force due to solvent atoms at a temperature *T*
+randomly bumping into the particle.  As derived from the
+fluctuation/dissipation theorem, its magnitude as shown above is
+proportional to :math:`\sqrt{\frac{k_B T m}{dt~\mathrm{damp}}}`, where
+:math:`k_B` is the Boltzmann constant, *T* is the desired temperature,
+*m* is the mass of the particle, *dt* is the timestep size, and damp is
+the damping factor.  Random numbers are used to randomize the direction
+and magnitude of this force as described in :ref:`(Dunweg) <Dunweg5>`,
+where a uniform random number is used (instead of a Gaussian random
+number) for speed.
 
 ----------
 
-
 *Tstart* and *Tstop* have to be constant values, i.e. they cannot
 be variables. If used together with the oxDNA force field for
 coarse-grained simulation of DNA please note that T = 0.1 in oxDNA units
@@ -104,7 +97,7 @@ means to relax the temperature in a timespan of (roughly) 0.03 time
 units tau (see the :doc:`units <units>` command).
 The damp factor can be thought of as inversely related to the
 viscosity of the solvent, i.e. a small relaxation time implies a
-hi-viscosity solvent and vice versa.  See the discussion about gamma
+high-viscosity solvent and vice versa.  See the discussion about gamma
 and viscosity in the documentation for the :doc:`fix viscous <fix_viscous>` command for more details.
 Note that the value 78.9375 in the second example above corresponds
 to a diffusion constant, which is about an order of magnitude larger
@@ -124,21 +117,18 @@ particles are always considered to have a finite size.
 The keyword *angmom* enables thermostatting of the rotational degrees of
 freedom in addition to the usual translational degrees of freedom.
 
-The scale factor after the *angmom* keyword gives the ratio of the rotational to
-the translational friction coefficient.
+The scale factor after the *angmom* keyword gives the ratio of the
+rotational to the translational friction coefficient.
 
-An example input file can be found in /examples/USER/cgdna/examples/duplex2/.
+An example input file can be found in examples/USER/cgdna/examples/duplex2/.
 Further details of the implementation and stability of the integrators are contained in :ref:`(Henrich) <Henrich5>`.
 The preprint version of the article can be found `here <PDF/USER-CGDNA.pdf>`_.
 
-
 ----------
 
-
 Restrictions
 """"""""""""
 
-
 These pair styles can only be used if LAMMPS was built with the
 :ref:`USER-CGDNA <PKG-USER-CGDNA>` package and the MOLECULE and ASPHERE package.
 See the :doc:`Build package <Build_package>` doc page for more info.
@@ -150,10 +140,8 @@ Related commands
 
 **Default:** none
 
-
 ----------
 
-
 .. _Davidchack5:
 
 **(Davidchack)** R.L Davidchack, T.E. Ouldridge, M.V. Tretyakov. J. Chem. Phys. 142, 144114 (2015).
@@ -169,8 +157,3 @@ Related commands
 .. _Henrich5:
 
 **(Henrich)** O. Henrich, Y. A. Gutierrez-Fosado, T. Curk, T. E. Ouldridge, Eur. Phys. J. E 41, 57 (2018).
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/fix_nve_eff.rst b/doc/src/fix_nve_eff.rst
index a1d10cb484..78e6352b6e 100644
--- a/doc/src/fix_nve_eff.rst
+++ b/doc/src/fix_nve_eff.rst
@@ -6,7 +6,6 @@ fix nve/eff command
 Syntax
 """"""
 
-
 .. parsed-literal::
 
    fix ID group-ID nve/eff
@@ -17,8 +16,7 @@ Syntax
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    fix 1 all nve/eff
 
@@ -32,7 +30,7 @@ system trajectory consistent with the microcanonical ensemble.
 The operation of this fix is exactly like that described by the :doc:`fix nve <fix_nve>` command, except that the radius and radial velocity
 of electrons are also updated.
 
-**Restart, fix\_modify, output, run start/stop, minimize info:**
+**Restart, fix_modify, output, run start/stop, minimize info:**
 
 No information about this fix is written to :doc:`binary restart files <restart>`.  None of the :doc:`fix_modify <fix_modify>` options
 are relevant to this fix.  No global or per-atom quantities are stored
@@ -43,7 +41,6 @@ the :doc:`run <run>` command.  This fix is not invoked during :doc:`energy minim
 Restrictions
 """"""""""""
 
-
 This fix is part of the USER-EFF package.  It is only enabled if
 LAMMPS was built with that package.  See the :doc:`Build package <Build_package>` doc page for more info.
 
@@ -53,8 +50,3 @@ Related commands
 :doc:`fix nve <fix_nve>`, :doc:`fix nvt/eff <fix_nh_eff>`, :doc:`fix npt/eff <fix_nh_eff>`
 
 **Default:** none
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/fix_nve_limit.rst b/doc/src/fix_nve_limit.rst
index 684016959b..98d691d6b9 100644
--- a/doc/src/fix_nve_limit.rst
+++ b/doc/src/fix_nve_limit.rst
@@ -6,7 +6,6 @@ fix nve/limit command
 Syntax
 """"""
 
-
 .. parsed-literal::
 
    fix ID group-ID nve/limit xmax
@@ -18,8 +17,7 @@ Syntax
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    fix 1 all nve/limit 0.1
 
@@ -62,7 +60,7 @@ very large for overlapped configurations.
    that need this fix, then turn fix shake on when doing normal dynamics
    with a fixed-size timestep.
 
-**Restart, fix\_modify, output, run start/stop, minimize info:**
+**Restart, fix_modify, output, run start/stop, minimize info:**
 
 No information about this fix is written to :doc:`binary restart files <restart>`.  None of the :doc:`fix_modify <fix_modify>` options
 are relevant to this fix.
@@ -91,8 +89,3 @@ Related commands
 :doc:`pair_style soft <pair_soft>`
 
 **Default:** none
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/fix_nve_line.rst b/doc/src/fix_nve_line.rst
index e92f529542..d47bf34f61 100644
--- a/doc/src/fix_nve_line.rst
+++ b/doc/src/fix_nve_line.rst
@@ -6,7 +6,6 @@ fix nve/line command
 Syntax
 """"""
 
-
 .. parsed-literal::
 
    fix ID group-ID nve/line
@@ -17,8 +16,7 @@ Syntax
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    fix 1 all nve/line
 
@@ -34,7 +32,7 @@ segment particles.
 This fix differs from the :doc:`fix nve <fix_nve>` command, which
 assumes point particles and only updates their position and velocity.
 
-**Restart, fix\_modify, output, run start/stop, minimize info:**
+**Restart, fix_modify, output, run start/stop, minimize info:**
 
 No information about this fix is written to :doc:`binary restart files <restart>`.  None of the :doc:`fix_modify <fix_modify>` options
 are relevant to this fix.  No global or per-atom quantities are stored
@@ -45,7 +43,6 @@ the :doc:`run <run>` command.  This fix is not invoked during :doc:`energy minim
 Restrictions
 """"""""""""
 
-
 This fix is part of the ASPHERE package.  It is only enabled if LAMMPS
 was built with that package.  See the :doc:`Build package <Build_package>` doc page for more info.
 
@@ -58,8 +55,3 @@ Related commands
 :doc:`fix nve <fix_nve>`, :doc:`fix nve/asphere <fix_nve_asphere>`
 
 **Default:** none
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/fix_nve_manifold_rattle.rst b/doc/src/fix_nve_manifold_rattle.rst
index f4215f2abe..1caedf88e1 100644
--- a/doc/src/fix_nve_manifold_rattle.rst
+++ b/doc/src/fix_nve_manifold_rattle.rst
@@ -6,7 +6,6 @@ fix nve/manifold/rattle command
 Syntax
 """"""
 
-
 .. parsed-literal::
 
    fix ID group-ID nve/manifold/rattle tol maxit manifold manifold-args keyword value ...
@@ -18,20 +17,17 @@ Syntax
 * manifold = name of the manifold
 * manifold-args = parameters for the manifold
 * one or more keyword/value pairs may be appended
-  
+
   .. parsed-literal::
-  
+
      keyword = *every*
        *every* values = N
          N = print info about iteration every N steps. N = 0 means no output
 
-
-
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    fix 1 all nve/manifold/rattle 1e-4 10 sphere 5.0
    fix step all nve/manifold/rattle 1e-8 100 ellipsoid 2.5 2.5 5.0 every 25
@@ -53,14 +49,13 @@ parameters, see the :doc:`Howto manifold <Howto_manifold>` doc page.
 Note that the particles must initially be close to the manifold in
 question. If not, RATTLE will not be able to iterate until the
 constraint is satisfied, and an error is generated. For simple
-manifolds this can be achieved with *region* and *create\_atoms*
+manifolds this can be achieved with *region* and *create_atoms*
 commands, but for more complex surfaces it might be more useful to
 write a script.
 
 The manifold args may be equal-style variables, like so:
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    variable R equal "ramp(5.0,3.0)"
    fix shrink_sphere all nve/manifold/rattle 1e-4 10 sphere v_R
@@ -72,11 +67,9 @@ the particles.  Note that if the manifold has to exert work on the
 particles because of these changes, the total energy might not be
 conserved.
 
-
 ----------
 
-
-**Restart, fix\_modify, output, run start/stop, minimize info:**
+**Restart, fix_modify, output, run start/stop, minimize info:**
 
 No information about this fix is written to :doc:`binary restart files <restart>`.  None of the :doc:`fix_modify <fix_modify>` options
 are relevant to this fix.  No global or per-atom quantities are stored
@@ -84,21 +77,16 @@ by this fix for access by various :doc:`output commands <Howto_output>`.
 No parameter of this fix can be used with the *start/stop* keywords of
 the :doc:`run <run>` command.  This fix is not invoked during :doc:`energy minimization <minimize>`.
 
-
 ----------
 
-
 Restrictions
 """"""""""""
 
-
 This fix is part of the USER-MANIFOLD package. It is only enabled if
 LAMMPS was built with that package. See the :doc:`Build package <Build_package>` doc page for more info.
 
-
 ----------
 
-
 Related commands
 """"""""""""""""
 
@@ -106,24 +94,13 @@ Related commands
 
 **Default:** every = 0, tchain = 3
 
-
 ----------
 
-
 .. _Andersen1:
 
-
-
 **(Andersen)** Andersen, J. Comp. Phys. 52, 24, (1983).
 
 .. _Paquay2:
 
-
-
 **(Paquay)** Paquay and Kusters, Biophys. J., 110, 6, (2016).
 preprint available at `arXiv:1411.3019 <http://arxiv.org/abs/1411.3019/>`_.
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/fix_nve_noforce.rst b/doc/src/fix_nve_noforce.rst
index bacc4a9908..d45648694a 100644
--- a/doc/src/fix_nve_noforce.rst
+++ b/doc/src/fix_nve_noforce.rst
@@ -6,7 +6,6 @@ fix nve/noforce command
 Syntax
 """"""
 
-
 .. parsed-literal::
 
    fix ID group-ID nve
@@ -17,8 +16,7 @@ Syntax
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    fix 3 wall nve/noforce
 
@@ -39,7 +37,7 @@ unchanged, and can thus be printed by the :doc:`dump <dump>` command or
 queried with an equal-style :doc:`variable <variable>` that uses the
 fcm() group function to compute the total force on the group of atoms.
 
-**Restart, fix\_modify, output, run start/stop, minimize info:**
+**Restart, fix_modify, output, run start/stop, minimize info:**
 
 No information about this fix is written to :doc:`binary restart files <restart>`.  None of the :doc:`fix_modify <fix_modify>` options
 are relevant to this fix.  No global or per-atom quantities are stored
@@ -57,8 +55,3 @@ Related commands
 :doc:`fix nve <fix_nve>`
 
 **Default:** none
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/fix_nve_sphere.rst b/doc/src/fix_nve_sphere.rst
index 855ea0f916..753e40cd15 100644
--- a/doc/src/fix_nve_sphere.rst
+++ b/doc/src/fix_nve_sphere.rst
@@ -12,7 +12,6 @@ fix nve/sphere/kk command
 Syntax
 """"""
 
-
 .. parsed-literal::
 
    fix ID group-ID nve/sphere
@@ -21,21 +20,18 @@ Syntax
 * nve/sphere = style name of this fix command
 * zero or more keyword/value pairs may be appended
 * keyword = *update* or *disc*
-  
+
   .. parsed-literal::
-  
+
        *update* value = *dipole* or *dipole/dlm*
          dipole = update orientation of dipole moment during integration
          dipole/dlm = use DLM integrator to update dipole orientation
        *disc* value = none = treat particles as 2d discs, not spheres
 
-
-
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    fix 1 all nve/sphere
    fix 1 all nve/sphere update dipole
@@ -72,10 +68,8 @@ simulations, as defined by the :doc:`dimension <dimension>` keyword.
 The only difference between discs and spheres in this context is their
 moment of inertia, as used in the time integration.
 
-
 ----------
 
-
 Styles with a *gpu*\ , *intel*\ , *kk*\ , *omp*\ , or *opt* suffix are
 functionally the same as the corresponding style without the suffix.
 They have been optimized to run faster, depending on your available
@@ -94,11 +88,9 @@ by including their suffix, or you can use the :doc:`-suffix command-line switch
 See the :doc:`Speed packages <Speed_packages>` doc page for more
 instructions on how to use the accelerated styles effectively.
 
-
 ----------
 
-
-**Restart, fix\_modify, output, run start/stop, minimize info:**
+**Restart, fix_modify, output, run start/stop, minimize info:**
 
 No information about this fix is written to :doc:`binary restart files <restart>`.  None of the :doc:`fix_modify <fix_modify>` options
 are relevant to this fix.  No global or per-atom quantities are stored
@@ -109,7 +101,6 @@ the :doc:`run <run>` command.  This fix is not invoked during :doc:`energy minim
 Restrictions
 """"""""""""
 
-
 This fix requires that atoms store torque and angular velocity (omega)
 and a radius as defined by the :doc:`atom_style sphere <atom_style>`
 command.  If the *dipole* keyword is used, then they must also store a
@@ -129,18 +120,9 @@ Related commands
 
 **Default:** none
 
-
 ----------
 
-
 .. _nve-Dullweber:
 
-
-
 **(Dullweber)** Dullweber, Leimkuhler and McLachlan, J Chem Phys, 107,
 5840 (1997).
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/fix_nve_spin.rst b/doc/src/fix_nve_spin.rst
index 65f235bd3f..143ddb2426 100644
--- a/doc/src/fix_nve_spin.rst
+++ b/doc/src/fix_nve_spin.rst
@@ -6,7 +6,6 @@ fix nve/spin command
 Syntax
 """"""
 
-
 .. parsed-literal::
 
    fix ID group-ID nve/spin keyword values
@@ -14,20 +13,17 @@ Syntax
 * ID, group-ID are documented in :doc:`fix <fix>` command
 * nve/spin = style name of this fix command
 * keyword = *lattice*
-  
+
   .. parsed-literal::
-  
+
        *lattice* value = *moving* or *frozen*
          moving = integrate both spin and atomic degress of freedom
          frozen = integrate spins on a fixed lattice
 
-
-
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    fix 3 all nve/spin lattice moving
    fix 1 all nve/spin lattice frozen
@@ -47,7 +43,7 @@ By default a spin-lattice integration is performed (lattice = moving).
 The *nve/spin* fix applies a Suzuki-Trotter decomposition to
 the equations of motion of the spin lattice system, following the scheme:
 
-.. image:: Eqs/fix_integration_spin_stdecomposition.jpg
+.. image:: JPG/fix_integration_spin_stdecomposition.jpg
    :align: center
 
 according to the implementation reported in :ref:`(Omelyan) <Omelyan1>`.
@@ -56,23 +52,19 @@ A sectoring method enables this scheme for parallel calculations.
 The implementation of this sectoring algorithm is reported
 in :ref:`(Tranchida) <Tranchida1>`.
 
-
 ----------
 
-
 Restrictions
 """"""""""""
 
-
 This fix style can only be used if LAMMPS was built with the SPIN
 package.  See the :doc:`Build package <Build_package>` doc page for more
 info.
 
 To use the spin algorithm, it is necessary to define a map with
-the atom\_modify command. Typically, by adding the command:
+the atom_modify command. Typically, by adding the command:
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    atom_modify map array
 
@@ -89,25 +81,14 @@ Default
 
 The option default is lattice = moving.
 
-
 ----------
 
-
 .. _Omelyan1:
 
-
-
 **(Omelyan)** Omelyan, Mryglod, and Folk. Phys. Rev. Lett.
 86(5), 898. (2001).
 
 .. _Tranchida1:
 
-
-
 **(Tranchida)** Tranchida, Plimpton, Thibaudeau and Thompson,
 Journal of Computational Physics, 372, 406-425, (2018).
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/fix_nve_tri.rst b/doc/src/fix_nve_tri.rst
index c5e5aa99d6..f5fdb7cc7d 100644
--- a/doc/src/fix_nve_tri.rst
+++ b/doc/src/fix_nve_tri.rst
@@ -6,7 +6,6 @@ fix nve/tri command
 Syntax
 """"""
 
-
 .. parsed-literal::
 
    fix ID group-ID nve/tri
@@ -17,8 +16,7 @@ Syntax
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    fix 1 all nve/tri
 
@@ -35,7 +33,7 @@ using triangular particles.
 This fix differs from the :doc:`fix nve <fix_nve>` command, which
 assumes point particles and only updates their position and velocity.
 
-**Restart, fix\_modify, output, run start/stop, minimize info:**
+**Restart, fix_modify, output, run start/stop, minimize info:**
 
 No information about this fix is written to :doc:`binary restart files <restart>`.  None of the :doc:`fix_modify <fix_modify>` options
 are relevant to this fix.  No global or per-atom quantities are stored
@@ -46,7 +44,6 @@ the :doc:`run <run>` command.  This fix is not invoked during :doc:`energy minim
 Restrictions
 """"""""""""
 
-
 This fix is part of the ASPHERE package.  It is only enabled if LAMMPS
 was built with that package.  See the :doc:`Build package <Build_package>` doc page for more info.
 
@@ -59,8 +56,3 @@ Related commands
 :doc:`fix nve <fix_nve>`, :doc:`fix nve/asphere <fix_nve_asphere>`
 
 **Default:** none
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/fix_nvk.rst b/doc/src/fix_nvk.rst
index a3f3928339..415e3256b4 100644
--- a/doc/src/fix_nvk.rst
+++ b/doc/src/fix_nvk.rst
@@ -6,7 +6,6 @@ fix nvk command
 Syntax
 """"""
 
-
 .. parsed-literal::
 
    fix ID group-ID nvk
@@ -17,8 +16,7 @@ Syntax
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    fix 1 all nvk
 
@@ -39,11 +37,9 @@ nvk is initiated. If a different kinetic energy is desired, the
 :doc:`velocity <velocity>` command should be used to change the kinetic
 energy prior to this fix.
 
-
 ----------
 
-
-**Restart, fix\_modify, output, run start/stop, minimize info:**
+**Restart, fix_modify, output, run start/stop, minimize info:**
 
 No information about this fix is written to :doc:`binary restart files <restart>`.  None of the :doc:`fix_modify <fix_modify>` options
 are relevant to this fix.  No global or per-atom quantities are stored
@@ -54,7 +50,6 @@ the :doc:`run <run>` command.  This fix is not invoked during :doc:`energy minim
 Restrictions
 """"""""""""
 
-
 The Gaussian thermostat only works when it is applied to all atoms in
 the simulation box. Therefore, the group must be set to all.
 
@@ -67,23 +62,12 @@ LAMMPS was built with that package.  See the :doc:`Build package <Build_package>
 
 **Default:** none
 
-
 ----------
 
-
 .. _nvk-Minary:
 
-
-
 **(Minary)** Minary, Martyna, and Tuckerman, J Chem Phys, 18, 2510 (2003).
 
 .. _nvk-Zhang:
 
-
-
 **(Zhang)** Zhang, J Chem Phys, 106, 6102 (1997).
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/fix_nvt_asphere.rst b/doc/src/fix_nvt_asphere.rst
index a3ad145405..6004de2e60 100644
--- a/doc/src/fix_nvt_asphere.rst
+++ b/doc/src/fix_nvt_asphere.rst
@@ -9,7 +9,6 @@ fix nvt/asphere/omp command
 Syntax
 """"""
 
-
 .. parsed-literal::
 
    fix ID group-ID nvt/asphere keyword value ...
@@ -21,8 +20,7 @@ Syntax
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    fix 1 all nvt/asphere temp 300.0 300.0 100.0
    fix 1 all nvt/asphere temp 300.0 300.0 100.0 drag 0.2
@@ -55,8 +53,7 @@ This fix computes a temperature each timestep.  To do this, the fix
 creates its own compute of style "temp/asphere", as if this command
 had been issued:
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    compute fix-ID_temp group-ID temp/asphere
 
@@ -66,12 +63,12 @@ underscore + "temp", and the group for the new compute is the same as
 the fix group.
 
 Note that this is NOT the compute used by thermodynamic output (see
-the :doc:`thermo_style <thermo_style>` command) with ID = *thermo\_temp*.
+the :doc:`thermo_style <thermo_style>` command) with ID = *thermo_temp*.
 This means you can change the attributes of this fix's temperature
 (e.g. its degrees-of-freedom) via the
 :doc:`compute_modify <compute_modify>` command or print this temperature
 during thermodynamic output via the :doc:`thermo_style custom <thermo_style>` command using the appropriate compute-ID.
-It also means that changing attributes of *thermo\_temp* will have no
+It also means that changing attributes of *thermo_temp* will have no
 effect on this fix.
 
 Like other fixes that perform thermostatting, this fix can be used
@@ -88,10 +85,8 @@ temperature is calculated taking the bias into account, bias is
 removed from each atom, thermostatting is performed on the remaining
 thermal degrees of freedom, and the bias is added back in.
 
-
 ----------
 
-
 Styles with a *gpu*\ , *intel*\ , *kk*\ , *omp*\ , or *opt* suffix are
 functionally the same as the corresponding style without the suffix.
 They have been optimized to run faster, depending on your available
@@ -110,7 +105,7 @@ by including their suffix, or you can use the :doc:`-suffix command-line switch
 See the :doc:`Speed packages <Speed_packages>` doc page for more
 instructions on how to use the accelerated styles effectively.
 
-**Restart, fix\_modify, output, run start/stop, minimize info:**
+**Restart, fix_modify, output, run start/stop, minimize info:**
 
 This fix writes the state of the Nose/Hoover thermostat to :doc:`binary restart files <restart>`.  See the :doc:`read_restart <read_restart>`
 command for info on how to re-specify a fix in an input script that
@@ -138,7 +133,6 @@ This fix is not invoked during :doc:`energy minimization <minimize>`.
 Restrictions
 """"""""""""
 
-
 This fix is part of the ASPHERE package.  It is only enabled if LAMMPS
 was built with that package.  See the :doc:`Build package <Build_package>` doc page for more info.
 
@@ -153,11 +147,6 @@ shape attribute.
 Related commands
 """"""""""""""""
 
-:doc:`fix nvt <fix_nh>`, :doc:`fix nve\_asphere <fix_nve_asphere>`, :doc:`fix npt\_asphere <fix_npt_asphere>`, :doc:`fix_modify <fix_modify>`
+:doc:`fix nvt <fix_nh>`, :doc:`fix nve_asphere <fix_nve_asphere>`, :doc:`fix npt_asphere <fix_npt_asphere>`, :doc:`fix_modify <fix_modify>`
 
 **Default:** none
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/fix_nvt_body.rst b/doc/src/fix_nvt_body.rst
index 92819b26ca..41d652a32d 100644
--- a/doc/src/fix_nvt_body.rst
+++ b/doc/src/fix_nvt_body.rst
@@ -6,7 +6,6 @@ fix nvt/body command
 Syntax
 """"""
 
-
 .. parsed-literal::
 
    fix ID group-ID nvt/body keyword value ...
@@ -18,8 +17,7 @@ Syntax
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    fix 1 all nvt/body temp 300.0 300.0 100.0
    fix 1 all nvt/body temp 300.0 300.0 100.0 drag 0.2
@@ -52,8 +50,7 @@ This fix computes a temperature each timestep.  To do this, the fix
 creates its own compute of style "temp/body", as if this command
 had been issued:
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    compute fix-ID_temp group-ID temp/body
 
@@ -63,12 +60,12 @@ underscore + "temp", and the group for the new compute is the same as
 the fix group.
 
 Note that this is NOT the compute used by thermodynamic output (see
-the :doc:`thermo_style <thermo_style>` command) with ID = *thermo\_temp*.
+the :doc:`thermo_style <thermo_style>` command) with ID = *thermo_temp*.
 This means you can change the attributes of this fix's temperature
 (e.g. its degrees-of-freedom) via the
 :doc:`compute_modify <compute_modify>` command or print this temperature
 during thermodynamic output via the :doc:`thermo_style custom <thermo_style>` command using the appropriate compute-ID.
-It also means that changing attributes of *thermo\_temp* will have no
+It also means that changing attributes of *thermo_temp* will have no
 effect on this fix.
 
 Like other fixes that perform thermostatting, this fix can be used
@@ -85,10 +82,8 @@ temperature is calculated taking the bias into account, bias is
 removed from each atom, thermostatting is performed on the remaining
 thermal degrees of freedom, and the bias is added back in.
 
-
 ----------
 
-
 Styles with a *gpu*\ , *intel*\ , *kk*\ , *omp*\ , or *opt* suffix are
 functionally the same as the corresponding style without the suffix.
 They have been optimized to run faster, depending on your available
@@ -107,7 +102,7 @@ by including their suffix, or you can use the :doc:`-suffix command-line switch
 See the :doc:`Speed packages <Speed_packages>` doc page for more
 instructions on how to use the accelerated styles effectively.
 
-**Restart, fix\_modify, output, run start/stop, minimize info:**
+**Restart, fix_modify, output, run start/stop, minimize info:**
 
 This fix writes the state of the Nose/Hoover thermostat to :doc:`binary restart files <restart>`.  See the :doc:`read_restart <read_restart>`
 command for info on how to re-specify a fix in an input script that
@@ -135,7 +130,6 @@ This fix is not invoked during :doc:`energy minimization <minimize>`.
 Restrictions
 """"""""""""
 
-
 This fix is part of the BODY package.  It is only enabled if LAMMPS
 was built with that package.  See the :doc:`Build package <Build_package>` doc page for more info.
 
@@ -146,11 +140,6 @@ command.
 Related commands
 """"""""""""""""
 
-:doc:`fix nvt <fix_nh>`, :doc:`fix nve\_body <fix_nve_body>`, :doc:`fix npt\_body <fix_npt_body>`, :doc:`fix_modify <fix_modify>`
+:doc:`fix nvt <fix_nh>`, :doc:`fix nve_body <fix_nve_body>`, :doc:`fix npt_body <fix_npt_body>`, :doc:`fix_modify <fix_modify>`
 
 **Default:** none
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/fix_nvt_manifold_rattle.rst b/doc/src/fix_nvt_manifold_rattle.rst
index 438c11fe7e..198208ca0d 100644
--- a/doc/src/fix_nvt_manifold_rattle.rst
+++ b/doc/src/fix_nvt_manifold_rattle.rst
@@ -6,7 +6,6 @@ fix nvt/manifold/rattle command
 Syntax
 """"""
 
-
 .. parsed-literal::
 
    fix ID group-ID nvt/manifold/rattle tol maxit manifold manifold-args keyword value ...
@@ -18,9 +17,9 @@ Syntax
 * manifold = name of the manifold
 * manifold-args = parameters for the manifold
 * one or more keyword/value pairs may be appended
-  
+
   .. parsed-literal::
-  
+
      keyword = *temp* or *tchain* or *every*
        *temp* values = Tstart Tstop Tdamp
          Tstart, Tstop = external temperature at start/end of run
@@ -30,12 +29,12 @@ Syntax
        *every* value = N
          N = print info about iteration every N steps. N = 0 means no output
 
-
-
 Examples
 """"""""
 
-fix 1 all nvt/manifold/rattle 1e-4 10 cylinder 3.0 temp 1.0 1.0 10.0
+.. code-block:: LAMMPS
+
+   fix 1 all nvt/manifold/rattle 1e-4 10 cylinder 3.0 temp 1.0 1.0 10.0
 
 Description
 """""""""""
@@ -48,11 +47,9 @@ canonical ensemble of particles constrained to a curved surface
 O(dt).  For a list of currently supported manifolds and their
 parameters, see the :doc:`Howto manifold <Howto_manifold>` doc page.
 
-
 ----------
 
-
-**Restart, fix\_modify, output, run start/stop, minimize info:**
+**Restart, fix_modify, output, run start/stop, minimize info:**
 
 No information about this fix is written to :doc:`binary restart files <restart>`.  None of the :doc:`fix_modify <fix_modify>` options
 are relevant to this fix.  No global or per-atom quantities are stored
@@ -60,44 +57,28 @@ by this fix for access by various :doc:`output commands <Howto_output>`.
 No parameter of this fix can be used with the *start/stop* keywords of
 the :doc:`run <run>` command.  This fix is not invoked during :doc:`energy minimization <minimize>`.
 
-
 ----------
 
-
 Restrictions
 """"""""""""
 
-
 This fix is part of the USER-MANIFOLD package. It is only enabled if
 LAMMPS was built with that package.  See the :doc:`Build package <Build_package>` doc page for more info.
 
-
 ----------
 
-
 Related commands
 """"""""""""""""
 
 :doc:`fix nve/manifold/rattle <fix_nvt_manifold_rattle>`, :doc:`fix manifoldforce <fix_manifoldforce>` **Default:** every = 0
 
-
 ----------
 
-
 .. _Andersen2:
 
-
-
 **(Andersen)** Andersen, J. Comp. Phys. 52, 24, (1983).
 
 .. _Paquay3:
 
-
-
 **(Paquay)** Paquay and Kusters, Biophys. J., 110, 6, (2016).
 preprint available at `arXiv:1411.3019 <http://arxiv.org/abs/1411.3019/>`_.
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/fix_nvt_sllod.rst b/doc/src/fix_nvt_sllod.rst
index cd8f529c83..829bf8c634 100644
--- a/doc/src/fix_nvt_sllod.rst
+++ b/doc/src/fix_nvt_sllod.rst
@@ -12,7 +12,6 @@ fix nvt/sllod/omp command
 Syntax
 """"""
 
-
 .. parsed-literal::
 
    fix ID group-ID nvt/sllod keyword value ...
@@ -24,8 +23,7 @@ Syntax
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    fix 1 all nvt/sllod temp 300.0 300.0 100.0
    fix 1 all nvt/sllod temp 300.0 300.0 100.0 drag 0.2
@@ -87,8 +85,7 @@ This fix computes a temperature each timestep.  To do this, the fix
 creates its own compute of style "temp/deform", as if this command had
 been issued:
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    compute fix-ID_temp group-ID temp/deform
 
@@ -98,12 +95,12 @@ underscore + "temp", and the group for the new compute is the same as
 the fix group.
 
 Note that this is NOT the compute used by thermodynamic output (see
-the :doc:`thermo_style <thermo_style>` command) with ID = *thermo\_temp*.
+the :doc:`thermo_style <thermo_style>` command) with ID = *thermo_temp*.
 This means you can change the attributes of this fix's temperature
 (e.g. its degrees-of-freedom) via the
 :doc:`compute_modify <compute_modify>` command or print this temperature
 during thermodynamic output via the :doc:`thermo_style custom <thermo_style>` command using the appropriate compute-ID.
-It also means that changing attributes of *thermo\_temp* will have no
+It also means that changing attributes of *thermo_temp* will have no
 effect on this fix.
 
 Like other fixes that perform thermostatting, this fix can be used
@@ -120,10 +117,8 @@ temperature is calculated taking the bias into account, bias is
 removed from each atom, thermostatting is performed on the remaining
 thermal degrees of freedom, and the bias is added back in.
 
-
 ----------
 
-
 Styles with a *gpu*\ , *intel*\ , *kk*\ , *omp*\ , or *opt* suffix are
 functionally the same as the corresponding style without the suffix.
 They have been optimized to run faster, depending on your available
@@ -142,7 +137,7 @@ by including their suffix, or you can use the :doc:`-suffix command-line switch
 See the :doc:`Speed packages <Speed_packages>` doc page for more
 instructions on how to use the accelerated styles effectively.
 
-**Restart, fix\_modify, output, run start/stop, minimize info:**
+**Restart, fix_modify, output, run start/stop, minimize info:**
 
 This fix writes the state of the Nose/Hoover thermostat to :doc:`binary restart files <restart>`.  See the :doc:`read_restart <read_restart>`
 command for info on how to re-specify a fix in an input script that
@@ -170,7 +165,6 @@ This fix is not invoked during :doc:`energy minimization <minimize>`.
 Restrictions
 """"""""""""
 
-
 This fix works best without Nose-Hoover chain thermostats, i.e. using
 tchain = 1.  Setting tchain to larger values can result in poor
 equilibration.
@@ -186,30 +180,17 @@ Default
 
 Same as :doc:`fix nvt <fix_nh>`, except tchain = 1.
 
-
 ----------
 
-
 .. _Evans3:
 
-
-
 **(Evans and Morriss)** Evans and Morriss, Phys Rev A, 30, 1528 (1984).
 
 .. _Daivis:
 
-
-
 **(Daivis and Todd)** Daivis and Todd, J Chem Phys, 124, 194103 (2006).
 
 .. _Daivis-sllod:
 
-
-
 **(Daivis and Todd)** Daivis and Todd, Nonequilibrium Molecular Dynamics (book),
 Cambridge University Press, https://doi.org/10.1017/9781139017848, (2017).
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/fix_nvt_sllod_eff.rst b/doc/src/fix_nvt_sllod_eff.rst
index f1dc60c88f..49ad9f608c 100644
--- a/doc/src/fix_nvt_sllod_eff.rst
+++ b/doc/src/fix_nvt_sllod_eff.rst
@@ -6,7 +6,6 @@ fix nvt/sllod/eff command
 Syntax
 """"""
 
-
 .. parsed-literal::
 
    fix ID group-ID nvt/sllod/eff keyword value ...
@@ -18,8 +17,7 @@ Syntax
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    fix 1 all nvt/sllod/eff temp 300.0 300.0 0.1
    fix 1 all nvt/sllod/eff temp 300.0 300.0 0.1 drag 0.2
@@ -40,7 +38,7 @@ page), is performed with a :doc:`compute temp/deform/eff <compute_temp_deform_ef
 the eFF contribution to the temperature from the electron radial
 velocity.
 
-**Restart, fix\_modify, output, run start/stop, minimize info:**
+**Restart, fix_modify, output, run start/stop, minimize info:**
 
 This fix writes the state of the Nose/Hoover thermostat to :doc:`binary restart files <restart>`.  See the :doc:`read_restart <read_restart>`
 command for info on how to re-specify a fix in an input script that
@@ -68,7 +66,6 @@ This fix is not invoked during :doc:`energy minimization <minimize>`.
 Restrictions
 """"""""""""
 
-
 This fix is part of the USER-EFF package.  It is only enabled if
 LAMMPS was built with that package.  See the :doc:`Build package <Build_package>` doc page for more info.
 
@@ -86,18 +83,9 @@ Default
 
 Same as :doc:`fix nvt/eff <fix_nh_eff>`, except tchain = 1.
 
-
 ----------
 
-
 .. _Tuckerman2:
 
-
-
 **(Tuckerman)** Tuckerman, Mundy, Balasubramanian, Klein, J Chem Phys,
 106, 5615 (1997).
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/fix_nvt_sphere.rst b/doc/src/fix_nvt_sphere.rst
index 3275114a03..95bb0a20c4 100644
--- a/doc/src/fix_nvt_sphere.rst
+++ b/doc/src/fix_nvt_sphere.rst
@@ -9,7 +9,6 @@ fix nvt/sphere/omp command
 Syntax
 """"""
 
-
 .. parsed-literal::
 
    fix ID group-ID nvt/sphere keyword value ...
@@ -18,9 +17,9 @@ Syntax
 * nvt/sphere = style name of this fix command
 * zero or more keyword/value pairs may be appended
 * keyword = *disc*
-  
+
   .. parsed-literal::
-  
+
        *disc* value = none = treat particles as 2d discs, not spheres
 
 * additional thermostat related keyword/value pairs from the :doc:`fix nvt <fix_nh>` command can be appended
@@ -28,8 +27,7 @@ Syntax
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    fix 1 all nvt/sphere temp 300.0 300.0 100.0
    fix 1 all nvt/sphere temp 300.0 300.0 100.0 disc
@@ -69,8 +67,7 @@ This fix computes a temperature each timestep.  To do this, the fix
 creates its own compute of style "temp/sphere", as if this command
 had been issued:
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    compute fix-ID_temp group-ID temp/sphere
 
@@ -80,12 +77,12 @@ underscore + "temp", and the group for the new compute is the same as
 the fix group.
 
 Note that this is NOT the compute used by thermodynamic output (see
-the :doc:`thermo_style <thermo_style>` command) with ID = *thermo\_temp*.
+the :doc:`thermo_style <thermo_style>` command) with ID = *thermo_temp*.
 This means you can change the attributes of this fix's temperature
 (e.g. its degrees-of-freedom) via the
 :doc:`compute_modify <compute_modify>` command or print this temperature
 during thermodynamic output via the :doc:`thermo_style custom <thermo_style>` command using the appropriate compute-ID.
-It also means that changing attributes of *thermo\_temp* will have no
+It also means that changing attributes of *thermo_temp* will have no
 effect on this fix.
 
 Like other fixes that perform thermostatting, this fix can be used
@@ -102,10 +99,8 @@ temperature is calculated taking the bias into account, bias is
 removed from each atom, thermostatting is performed on the remaining
 thermal degrees of freedom, and the bias is added back in.
 
-
 ----------
 
-
 Styles with a *gpu*\ , *intel*\ , *kk*\ , *omp*\ , or *opt* suffix are
 functionally the same as the corresponding style without the suffix.
 They have been optimized to run faster, depending on your available
@@ -124,7 +119,7 @@ by including their suffix, or you can use the :doc:`-suffix command-line switch
 See the :doc:`Speed packages <Speed_packages>` doc page for more
 instructions on how to use the accelerated styles effectively.
 
-**Restart, fix\_modify, output, run start/stop, minimize info:**
+**Restart, fix_modify, output, run start/stop, minimize info:**
 
 This fix writes the state of the Nose/Hoover thermostat to :doc:`binary restart files <restart>`.  See the :doc:`read_restart <read_restart>`
 command for info on how to re-specify a fix in an input script that
@@ -152,7 +147,6 @@ This fix is not invoked during :doc:`energy minimization <minimize>`.
 Restrictions
 """"""""""""
 
-
 This fix requires that atoms store torque and angular velocity (omega)
 and a radius as defined by the :doc:`atom_style sphere <atom_style>`
 command.
@@ -166,11 +160,6 @@ defined by the :doc:`dimension <dimension>` keyword.
 Related commands
 """"""""""""""""
 
-:doc:`fix nvt <fix_nh>`, :doc:`fix nve\_sphere <fix_nve_sphere>`, :doc:`fix nvt\_asphere <fix_nvt_asphere>`, :doc:`fix npt\_sphere <fix_npt_sphere>`, :doc:`fix_modify <fix_modify>`
+:doc:`fix nvt <fix_nh>`, :doc:`fix nve_sphere <fix_nve_sphere>`, :doc:`fix nvt_asphere <fix_nvt_asphere>`, :doc:`fix npt_sphere <fix_npt_sphere>`, :doc:`fix_modify <fix_modify>`
 
 **Default:** none
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/fix_oneway.rst b/doc/src/fix_oneway.rst
index cc57989a53..04186404e6 100644
--- a/doc/src/fix_oneway.rst
+++ b/doc/src/fix_oneway.rst
@@ -6,7 +6,6 @@ fix oneway command
 Syntax
 """"""
 
-
 .. parsed-literal::
 
    fix ID group-ID oneway N region-ID direction
@@ -17,12 +16,10 @@ Syntax
 * region-ID = ID of region where fix is active
 * direction = *x* or *-x* or *y* or *-y* or *z* or *-z* = coordinate and direction of the oneway constraint
 
-
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    fix ions oneway 10 semi -x
    fix all oneway 1 left -z
@@ -40,11 +37,9 @@ only.
 This can be used, for example, as a simple model of a semi-permeable
 membrane, or as an implementation of Maxwell's demon.
 
-
 ----------
 
-
-**Restart, fix\_modify, output, run start/stop, minimize info:**
+**Restart, fix_modify, output, run start/stop, minimize info:**
 
 No information about this fix is written to :doc:`binary restart files <restart>`.  None of the :doc:`fix_modify <fix_modify>` options
 are relevant to this fix.  No global or per-atom quantities are stored
@@ -62,12 +57,3 @@ Related commands
 :doc:`fix wall/reflect <fix_wall_reflect>` command
 
 **Default:** none
-
-
-----------
-
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/fix_orient.rst b/doc/src/fix_orient.rst
index 7ac297b064..8fdcc79ace 100644
--- a/doc/src/fix_orient.rst
+++ b/doc/src/fix_orient.rst
@@ -6,7 +6,6 @@ fix orient/fcc command
 fix orient/bcc command
 ======================
 
-
 .. parsed-literal::
 
    fix ID group-ID orient/fcc nstats dir alat dE cutlo cuthi file0 file1
@@ -23,8 +22,7 @@ fix orient/bcc command
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    fix gb all orient/fcc 0 1 4.032008 0.001 0.25 0.75 xi.vec chi.vec
    fix gb all orient/bcc 0 1 2.882 0.001 0.25 0.75 ngb.left ngb.right
@@ -58,8 +56,21 @@ accounted for in measuring the grain boundary velocity.
 
 The potential energy added to atom I is given by these formulas
 
-.. image:: Eqs/fix_orient_fcc.jpg
-   :align: center
+.. math::
+
+   \xi_{i} = & \sum_{j=1}^{12} \left| \mathbf{r}_{j} - \mathbf{r}_{j}^{\rm I} \right| \qquad\qquad\left(1\right) \\
+   \\
+  \xi_{\rm IJ} = & \sum_{j=1}^{12} \left| \mathbf{r}_{j}^{\rm J} - \mathbf{r}_{j}^{\rm I} \right| \qquad\qquad\left(2\right)\\
+  \\
+  \xi_{\rm low}  = & {\rm cutlo} \, \xi_{\rm IJ}  \qquad\qquad\qquad\left(3\right)\\
+  \xi_{\rm high}  = & {\rm cuthi} \, \xi_{\rm IJ} \qquad\qquad\qquad\left(4\right) \\
+  \\
+  \omega_{i} = & \frac{\pi}{2} \frac{\xi_{i} - \xi_{\rm low}}{\xi_{\rm high} - \xi_{\rm low}} \qquad\qquad\left(5\right)\\
+  \\
+  u_{i}  = & 0 \quad\quad\qquad\qquad\qquad \textrm{ for } \qquad \xi_{i} < \xi_{\rm low}\\
+         = & {\rm dE}\,\frac{1 - \cos(2 \omega_{i})}{2}
+   \qquad \mathrm{ for }\qquad \xi_{\rm low} < \xi_{i} < \xi_{\rm high}  \quad \left(6\right) \\
+         = & {\rm dE} \quad\qquad\qquad\qquad\textrm{ for } \qquad \xi_{\rm high} < \xi_{i}
 
 which are fully explained in :ref:`(Janssens) <Janssens>`.  For fcc crystals
 this order parameter Xi for atom I in equation (1) is a sum over the
@@ -126,7 +137,7 @@ equal-and-opposite neighbors.  A pair of orientation files for a
 Sigma=5 tilt boundary are shown below. A tutorial that can help for
 writing the orientation files is given in :ref:`(Wicaksono2) <Wicaksono2>`
 
-**Restart, fix\_modify, output, run start/stop, minimize info:**
+**Restart, fix_modify, output, run start/stop, minimize info:**
 
 No information about this fix is written to :doc:`binary restart files <restart>`.
 
@@ -155,7 +166,6 @@ the :doc:`run <run>` command.  This fix is not invoked during :doc:`energy minim
 Restrictions
 """"""""""""
 
-
 This fix is part of the MISC package.  It is only enabled if LAMMPS
 was built with that package.  See the :doc:`Build package <Build_package>` doc page for more info.
 
@@ -168,42 +178,31 @@ Related commands
 
 **Default:** none
 
-
 ----------
 
-
 .. _Janssens:
 
-
-
 **(Janssens)** Janssens, Olmsted, Holm, Foiles, Plimpton, Derlet, Nature
 Materials, 5, 124-127 (2006).
 
 .. _Wicaksono1:
 
-
-
 **(Wicaksono1)** Wicaksono, Sinclair, Militzer, Computational Materials
 Science, 117, 397-405 (2016).
 
 .. _Wicaksono2:
 
-
-
 **(Wicaksono2)** Wicaksono, figshare,
-https://dx.doi.org/10.6084/m9.figshare.1488628.v1 (2015).
-
+https://doi.org/10.6084/m9.figshare.1488628.v1 (2015).
 
 ----------
 
-
 For illustration purposes, here are example files that specify a
 Sigma=5 <100> tilt boundary.  This is for a lattice constant of 3.5706
 Angs.
 
 file0:
 
-
 .. parsed-literal::
 
         0.798410432046075    1.785300000000000    1.596820864092150
@@ -215,7 +214,6 @@ file0:
 
 file1:
 
-
 .. parsed-literal::
 
        -0.798410432046075    1.785300000000000    1.596820864092150
@@ -224,8 +222,3 @@ file1:
         2.395231296138225    0.000000000000000   -0.798410432046075
         1.596820864092150    1.785300000000000    0.798410432046075
         1.596820864092150   -1.785300000000000    0.798410432046075
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/fix_phonon.rst b/doc/src/fix_phonon.rst
index f331f3ebb4..4eed4efc5b 100644
--- a/doc/src/fix_phonon.rst
+++ b/doc/src/fix_phonon.rst
@@ -6,7 +6,6 @@ fix phonon command
 Syntax
 """"""
 
-
 .. parsed-literal::
 
    fix ID group-ID phonon N Noutput Nwait map_file prefix keyword values ...
@@ -16,15 +15,14 @@ Syntax
 * N = measure the Green's function every this many timesteps
 * Noutput = output the dynamical matrix every this many measurements
 * Nwait = wait this many timesteps before measuring
-* map\_file = *file* or *GAMMA*
-  
+* map_file = *file* or *GAMMA*
+
   .. parsed-literal::
-  
+
        *file* is the file that contains the mapping info between atom ID and the lattice indices.
 
-  
   .. parsed-literal::
-  
+
        *GAMMA* flags to treate the whole simulation box as a unit cell, so that the mapping
        info can be generated internally. In this case, dynamical matrix at only the gamma-point
        will/can be evaluated.
@@ -32,21 +30,18 @@ Syntax
 * prefix = prefix for output files
 * one or none keyword/value pairs may be appended
 * keyword = *sysdim* or *nasr*
-  
+
   .. parsed-literal::
-  
+
        *sysdim* value = d
          d = dimension of the system, usually the same as the MD model dimension
        *nasr* value = n
          n = number of iterations to enforce the acoustic sum rule
 
-
-
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    fix 1 all phonon 20 5000 200000 map.in LJ1D sysdim 1
    fix 1 all phonon 20 5000 200000 map.in EAM3D
@@ -68,36 +63,32 @@ Based on fluctuation-dissipation theory, the force constant
 coefficients of the system in reciprocal space are given by
 (:ref:`Campana <Campana>` , :ref:`Kong <Kong>`)
 
-
 .. math::
 
-   \begin{equation}\mathbf{\Phi}_{k\alpha,k^\prime \beta}(\mathbf{q}) = k_B T \mathbf{G}^{-1}_{k\alpha,k^\prime \beta}(\mathbf{q})\end{equation}
+   \mathbf{\Phi}_{k\alpha,k^\prime \beta}(\mathbf{q}) = k_B T \mathbf{G}^{-1}_{k\alpha,k^\prime \beta}(\mathbf{q})
 
 where :math:`\mathbf{G}` is the Green's functions coefficients given by
 
-
 .. math::
 
-   \begin{equation}\mathbf{G}_{k\alpha,k^\prime \beta}(\mathbf{q}) = \left< \mathbf{u}_{k\alpha}(\mathbf{q}) \bullet \mathbf{u}_{k^\prime \beta}^*(\mathbf{q}) \right>\end{equation}
+   \mathbf{G}_{k\alpha,k^\prime \beta}(\mathbf{q}) = \left< \mathbf{u}_{k\alpha}(\mathbf{q}) \bullet \mathbf{u}_{k^\prime \beta}^*(\mathbf{q}) \right>
 
 where :math:`\left< \ldots \right>` denotes the ensemble average, and
 
-
 .. math::
 
-   \begin{equation}\mathbf{u}_{k\alpha}(\mathbf{q}) = \sum_l \mathbf{u}_{l k \alpha} \exp{(i\mathbf{qr}_l)}\end{equation}
+   \mathbf{u}_{k\alpha}(\mathbf{q}) = \sum_l \mathbf{u}_{l k \alpha} \exp{(i\mathbf{qr}_l)}
 
 is the :math:`\alpha` component of the atomic displacement for the :math:`k`
 th atom in the unit cell in reciprocal space at :math:`\mathbf{q}`. In
 practice, the Green's functions coefficients can also be measured
 according to the following formula,
 
-
 .. math::
 
-   \begin{equation}\mathbf{G}_{k\alpha,k^\prime \beta}(\mathbf{q}) =
+   \mathbf{G}_{k\alpha,k^\prime \beta}(\mathbf{q}) =
    \left< \mathbf{R}_{k \alpha}(\mathbf{q}) \bullet \mathbf{R}^*_{k^\prime \beta}(\mathbf{q}) \right>
-   - \left<\mathbf{R}\right>_{k \alpha}(\mathbf{q}) \bullet \left<\mathbf{R}\right>^*_{k^\prime \beta}(\mathbf{q})\end{equation}
+   - \left<\mathbf{R}\right>_{k \alpha}(\mathbf{q}) \bullet \left<\mathbf{R}\right>^*_{k^\prime \beta}(\mathbf{q})
 
 where :math:`\mathbf{R}` is the instantaneous positions of atoms, and
 :math:`\left<\mathbf{R}\right>` is the averaged atomic positions. It
@@ -107,11 +98,10 @@ easier to implement in an MD code.
 Once the force constant matrix is known, the dynamical matrix
 :math:`\mathbf{D}` can then be obtained by
 
-
 .. math::
 
-   \begin{equation}\mathbf{D}_{k\alpha, k^\prime\beta}(\mathbf{q}) =
-   (m_k m_{k^\prime})^{-\frac{1}{2}} \mathbf{\Phi}_{k \alpha, k^\prime \beta}(\mathbf{q})\end{equation}
+   \mathbf{D}_{k\alpha, k^\prime\beta}(\mathbf{q}) =
+   (m_k m_{k^\prime})^{-\frac{1}{2}} \mathbf{\Phi}_{k \alpha, k^\prime \beta}(\mathbf{q})
 
 whose eigenvalues are exactly the phonon frequencies at :math:`\mathbf{q}`.
 
@@ -141,14 +131,14 @@ provided by keyword *nasr* gives the total number of iterations. For a
 system whose unit cell has only one atom, *nasr* = 1 is sufficient;
 for other systems, *nasr* = 10 is typically sufficient.
 
-The *map\_file* contains the mapping information between the lattice
+The *map_file* contains the mapping information between the lattice
 indices and the atom IDs, which tells the code which atom sits at
 which lattice point; the lattice indices start from 0. An auxiliary
 code, `latgen <http://code.google.com/p/latgen>`_, can be employed to
 generate the compatible map file for various crystals.
 
 In case one simulates a non-periodic system, where the whole simulation
-box is treated as a unit cell, one can set *map\_file* as *GAMMA*\ , so
+box is treated as a unit cell, one can set *map_file* as *GAMMA*\ , so
 that the mapping info will be generated internally and a file is not
 needed. In this case, the dynamical matrix at only the gamma-point
 will/can be evaluated. Please keep in mind that fix-phonon is designed
@@ -160,12 +150,12 @@ The calculated dynamical matrix elements are written out in
 points in the log file is in the units of the basis vectors of the
 corresponding reciprocal lattice.
 
-**Restart, fix\_modify, output, run start/stop, minimize info:**
+**Restart, fix_modify, output, run start/stop, minimize info:**
 
 No information about this fix is written to :doc:`binary restart files <restart>`.
 
 The :doc:`fix_modify <fix_modify>` *temp* option is supported by this
-fix. You can use it to change the temperature compute from thermo\_temp
+fix. You can use it to change the temperature compute from thermo_temp
 to the one that reflects the true temperature of atoms in the group.
 
 No global scalar or vector or per-atom quantities are stored by this
@@ -186,7 +176,6 @@ This fix is not invoked during :doc:`energy minimization <minimize>`.
 Restrictions
 """"""""""""
 
-
 This fix assumes a crystalline system with periodical lattice. The
 temperature of the system should not exceed the melting temperature to
 keep the system in its solid state.
@@ -208,38 +197,25 @@ Default
 The option defaults are sysdim = the same dimension as specified by
 the :doc:`dimension <dimension>` command, and nasr = 20.
 
-
 ----------
 
-
 .. _Campana:
 
-
-
 **(Campana)** C. Campana and
 M. H. Muser, *Practical Green's function approach to the
-simulation of elastic semi-infinite solids*\ , `Phys. Rev. B [74], 075420 (2006) <http://dx.doi.org/10.1103/PhysRevB.74.075420>`_
+simulation of elastic semi-infinite solids*\ , `Phys. Rev. B [74], 075420 (2006) <https://doi.org/10.1103/PhysRevB.74.075420>`_
 
 .. _Kong:
 
-
-
 **(Kong)** L.T. Kong, G. Bartels, C. Campana,
 C. Denniston, and Martin H. Muser, *Implementation of Green's
-function molecular dynamics: An extension to LAMMPS*\ , `Computer Physics Communications [180](6):1004-1010 (2009). <http://dx.doi.org/10.1016/j.cpc.2008.12.035>`_
+function molecular dynamics: An extension to LAMMPS*\ , `Computer Physics Communications [180](6):1004-1010 (2009). <https://doi.org/10.1016/j.cpc.2008.12.035>`_
 
 L.T. Kong, C. Denniston, and Martin H. Muser,
 *An improved version of the Green's function molecular dynamics
-method*\ , `Computer Physics Communications [182](2):540-541 (2011). <http://dx.doi.org/10.1016/j.cpc.2010.10.006>`_
+method*\ , `Computer Physics Communications [182](2):540-541 (2011). <https://doi.org/10.1016/j.cpc.2010.10.006>`_
 
 .. _Kong2011:
 
-
-
 **(Kong2011)** L.T. Kong, *Phonon dispersion measured directly from
-molecular dynamics simulations*\ , `Computer Physics Communications [182](10):2201-2207, (2011). <http://dx.doi.org/10.1016/j.cpc.2011.04.019>`_
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
+molecular dynamics simulations*\ , `Computer Physics Communications [182](10):2201-2207, (2011). <https://doi.org/10.1016/j.cpc.2011.04.019>`_
diff --git a/doc/src/fix_pimd.rst b/doc/src/fix_pimd.rst
index cdbdf33d2b..5bc7b75c90 100644
--- a/doc/src/fix_pimd.rst
+++ b/doc/src/fix_pimd.rst
@@ -6,7 +6,6 @@ fix pimd command
 Syntax
 """"""
 
-
 .. parsed-literal::
 
    fix ID group-ID pimd keyword value ...
@@ -15,22 +14,19 @@ Syntax
 * pimd = style name of this fix command
 * zero or more keyword/value pairs may be appended
 * keyword = *method* or *fmass* or *sp* or *temp* or *nhc*
-  
+
   .. parsed-literal::
-  
+
        *method* value = *pimd* or *nmpimd* or *cmd*
        *fmass* value = scaling factor on mass
        *sp* value = scaling factor on Planck constant
        *temp* value = temperature (temperarate units)
        *nhc* value = Nc = number of chains in Nose-Hoover thermostat
 
-
-
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    fix 1 all pimd method nmpimd fmass 1.0 sp 2.0 temp 300.0 nhc 4
 
@@ -46,8 +42,11 @@ configurations from the canonical ensemble :ref:`(Feynman) <Feynman>`.
 The classical partition function and its components are given
 by the following equations:
 
-.. image:: Eqs/fix_pimd.jpg
-   :align: center
+.. math::
+
+   Z = & \int d{\bf q} d{\bf p} \cdot \textrm{exp} [ -\beta H_{eff} ] \\
+   H_{eff} = & \bigg(\sum_{i=1}^P \frac{p_i^2}{2m_i}\bigg) + V_{eff} \\
+   V_{eff} = & \sum_{i=1}^P \bigg[ \frac{mP}{2\beta^2 \hbar^2} (q_i - q_{i+1})^2 + \frac{1}{P} V(q_i)\bigg]
 
 The interested user is referred to any of the numerous references on
 this methodology, but briefly, each quantum particle in a path
@@ -129,16 +128,14 @@ To run a PIMD simulation with M quasi-beads in each ring polymer using
 N MPI tasks for each partition's domain-decomposition, you would use P
 = MxN processors (cores) and run the simulation as follows:
 
-
-.. parsed-literal::
+.. code-block:: bash
 
    mpirun -np P lmp_mpi -partition MxN -in script
 
 Note that in the LAMMPS input script for a multi-partition simulation,
 it is often very useful to define a :doc:`uloop-style variable <variable>` such as
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    variable ibead uloop M pad
 
@@ -146,8 +143,7 @@ where M is the number of quasi-beads (partitions) used in the
 calculation.  The uloop variable can then be used to manage I/O
 related tasks for each of the partitions, e.g.
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    dump dcd all dcd 10 system_${ibead}.dcd
    restart 1000 system_${ibead}.restart1 system_${ibead}.restart2
@@ -156,7 +152,6 @@ related tasks for each of the partitions, e.g.
 Restrictions
 """"""""""""
 
-
 This fix is part of the USER-MISC package.  It is only enabled if
 LAMMPS was built with that package.  See the :doc:`Build package <Build_package>` doc page for more info.
 
@@ -168,8 +163,7 @@ To avoid this, users can simply initialize velocities with different
 random number seeds assigned to each partition, as defined by the
 uloop variable, e.g.
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    velocity all create 300.0 1234${ibead} rot yes dist gaussian
 
@@ -179,50 +173,31 @@ Default
 The keyword defaults are method = pimd, fmass = 1.0, sp = 1.0, temp = 300.0,
 and nhc = 2.
 
-
 ----------
 
-
 .. _Feynman:
 
-
-
 **(Feynman)** R. Feynman and A. Hibbs, Chapter 7, Quantum Mechanics and
 Path Integrals, McGraw-Hill, New York (1965).
 
 .. _pimd-Tuckerman:
 
-
-
 **(Tuckerman)** M. Tuckerman and B. Berne, J Chem Phys, 99, 2796 (1993).
 
 .. _Cao1:
 
-
-
 **(Cao1)** J. Cao and B. Berne, J Chem Phys, 99, 2902 (1993).
 
 .. _Cao2:
 
-
-
 **(Cao2)** J. Cao and G. Voth, J Chem Phys, 100, 5093 (1994).
 
 .. _Hone:
 
-
-
 **(Hone)** T. Hone, P. Rossky, G. Voth, J Chem Phys, 124,
 154103 (2006).
 
 .. _Calhoun:
 
-
-
 **(Calhoun)** A. Calhoun, M. Pavese, G. Voth, Chem Phys Letters, 262,
 415 (1996).
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/fix_planeforce.rst b/doc/src/fix_planeforce.rst
index 2a406f5da5..c90a3b6bbe 100644
--- a/doc/src/fix_planeforce.rst
+++ b/doc/src/fix_planeforce.rst
@@ -6,7 +6,6 @@ fix planeforce command
 Syntax
 """"""
 
-
 .. parsed-literal::
 
    fix ID group-ID planeforce x y z
@@ -18,8 +17,7 @@ Syntax
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    fix hold boundary planeforce 1.0 0.0 0.0
 
@@ -34,7 +32,7 @@ force perpendicular to the plane.
 If the initial velocity of the atom is 0.0 (or in the plane), then it
 should continue to move in the plane thereafter.
 
-**Restart, fix\_modify, output, run start/stop, minimize info:**
+**Restart, fix_modify, output, run start/stop, minimize info:**
 
 No information about this fix is written to :doc:`binary restart files <restart>`.  None of the :doc:`fix_modify <fix_modify>` options
 are relevant to this fix.  No global or per-atom quantities are stored
@@ -55,8 +53,3 @@ Related commands
 :doc:`fix lineforce <fix_lineforce>`
 
 **Default:** none
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/fix_plumed.rst b/doc/src/fix_plumed.rst
index 26f66d4ac7..aeef6cff50 100644
--- a/doc/src/fix_plumed.rst
+++ b/doc/src/fix_plumed.rst
@@ -6,7 +6,6 @@ fix plumed command
 Syntax
 """"""
 
-
 .. parsed-literal::
 
    fix ID group-ID plumed keyword value ...
@@ -14,18 +13,18 @@ Syntax
 * ID, group-ID are documented in :doc:`fix <fix>` command
 * plumed = style name of this fix command
 * keyword = *plumedfile* or *outfile*
-  
+
   .. parsed-literal::
-  
+
        *plumedfile* arg = name of PLUMED input file to use (default: NULL)
        *outfile* arg = name of file on which to write the PLUMED log (default: NULL)
 
-
-
 Examples
 """"""""
 
-fix pl all plumed all plumed plumedfile plumed.dat outfile p.log
+.. code-block:: LAMMPS
+
+   fix pl all plumed all plumed plumedfile plumed.dat outfile p.log
 
 Description
 """""""""""
@@ -47,10 +46,8 @@ A detailed discussion of the code can be found in :ref:`(PLUMED) <PLUMED>`.
 There is an example input for using this package with LAMMPS in the
 examples/USER/plumed directory.
 
-
 ----------
 
-
 The command to make LAMMPS call PLUMED during a run requires two keyword
 value pairs pointing to the PLUMED input file and an output file for the
 PLUMED log. The user must specify these arguments every time PLUMED is
@@ -78,7 +75,7 @@ correctly read and parsed.  The names of the files in which the results
 are stored from the various analysis options performed by PLUMED will
 be specified by the user in the PLUMED input file.
 
-**Restart, fix\_modify, output, run start/stop, minimize info:**
+**Restart, fix_modify, output, run start/stop, minimize info:**
 
 When performing a restart of a calculation that involves PLUMED you must
 include a RESTART command in the PLUMED input file as detailed in the
@@ -101,7 +98,6 @@ however.
 Restrictions
 """"""""""""
 
-
 This fix is part of the USER-PLUMED package.  It is only enabled if
 LAMMPS was built with that package.  See the :doc:`Build package <Build_package>` doc page for more info.
 
@@ -118,25 +114,12 @@ Default
 
 The default options are plumedfile = NULL and outfile = NULL
 
-
 ----------
 
-
 .. _PLUMED:
 
-
-
 **(PLUMED)** G.A. Tribello, M. Bonomi, D. Branduardi, C. Camilloni and G. Bussi, Comp. Phys. Comm 185, 604 (2014)
 
-.. _plumeddocs: http://www.plumed.org/doc.html
+.. _plumeddocs: https://www.plumed.org/doc.html
 
-
-
-.. _plumedhome: http://www.plumed.org/
-
-
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
+.. _plumedhome: https://www.plumed.org/
diff --git a/doc/src/fix_poems.rst b/doc/src/fix_poems.rst
index da690030f6..1be7a90419 100644
--- a/doc/src/fix_poems.rst
+++ b/doc/src/fix_poems.rst
@@ -5,7 +5,6 @@ fix poems command
 
 Syntax:
 
-
 .. parsed-literal::
 
    fix ID group-ID poems keyword values
@@ -13,20 +12,17 @@ Syntax:
 * ID, group-ID are documented in :doc:`fix <fix>` command
 * poems = style name of this fix command
 * keyword = *group* or *file* or *molecule*
-  
+
   .. parsed-literal::
-  
+
        *group* values = list of group IDs
        *molecule* values = none
        *file* values = filename
 
-
-
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    fix 3 fluid poems group clump1 clump2 clump3
    fix 3 fluid poems file cluster.list
@@ -53,8 +49,6 @@ documents in the poems directory distributed with LAMMPS.
 
 .. _poems: http://www.rpi.edu/~anderk5/lab
 
-
-
 This fix updates the positions and velocities of the rigid atoms with
 a constant-energy time integration, so you should not update the same
 atoms via other fixes (e.g. nve, nvt, npt, temp/rescale, langevin).
@@ -98,7 +92,7 @@ this context means a set of rigid bodies connected by joints.
 
 For computational efficiency, you should turn off pairwise and bond
 interactions within each rigid body, as they no longer contribute to
-the motion.  The "neigh\_modify exclude" and "delete\_bonds" commands
+the motion.  The "neigh_modify exclude" and "delete_bonds" commands
 can be used to do this if each rigid body is a group.
 
 For computational efficiency, you should only define one fix poems
@@ -111,7 +105,7 @@ body contribution to the pressure virial is also accounted for.  The
 latter is only correct if forces within the bodies have been turned
 off, and there is only a single fix poems defined.
 
-**Restart, fix\_modify, output, run start/stop, minimize info:**
+**Restart, fix_modify, output, run start/stop, minimize info:**
 
 No information about this fix is written to :doc:`binary restart files <restart>`.
 
@@ -128,7 +122,6 @@ command.  This fix is not invoked during :doc:`energy minimization <minimize>`.
 Restrictions
 """"""""""""
 
-
 This fix is part of the POEMS package.  It is only enabled if LAMMPS
 was built with that package, which also requires the POEMS library be
 built and linked with LAMMPS.  See the :doc:`Build package <Build_package>` doc page for more info.
@@ -141,19 +134,10 @@ Related commands
 
 **Default:** none
 
-
 ----------
 
-
 .. _Anderson:
 
-
-
 **(Anderson)** Anderson, Mukherjee, Critchley, Ziegler, and Lipton
 "POEMS: Parallelizable Open-source Efficient Multibody Software ",
-Engineering With Computers (2006). (`link to paper <http://dx.doi.org/10.1007/s00366-006-0026-x>`_)
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
+Engineering With Computers (2006). (`link to paper <https://doi.org/10.1007/s00366-006-0026-x>`_)
diff --git a/doc/src/fix_pour.rst b/doc/src/fix_pour.rst
index dab9fa601d..26f1cd0eae 100644
--- a/doc/src/fix_pour.rst
+++ b/doc/src/fix_pour.rst
@@ -6,7 +6,6 @@ fix pour command
 Syntax
 """"""
 
-
 .. parsed-literal::
 
    fix ID group-ID pour N type seed keyword values ...
@@ -18,9 +17,9 @@ Syntax
 * seed = random # seed (positive integer)
 * one or more keyword/value pairs may be appended to args
 * keyword = *region* or *diam* or *vol* or *rate* or *dens* or *vel* or *mol* or *rigid* or *shake* or *ignore*
-  
+
   .. parsed-literal::
-  
+
        *region* value = region-ID
          region-ID = ID of region to use as insertion volume
        *diam* values = dstyle args
@@ -61,13 +60,10 @@ Syntax
          skip any line or triangle particles when detecting possible
            overlaps with inserted particles
 
-
-
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    fix 3 all pour 1000 2 29494 region myblock
    fix 2 all pour 10000 1 19985583 region disk vol 0.33 100 rate 1.0 diam range 0.9 1.1
@@ -130,7 +126,7 @@ command which also appears in your input script.
    If you wish the new rigid molecules (and other rigid molecules)
    to be thermostatted correctly via :doc:`fix rigid/small/nvt <fix_rigid>`
    or :doc:`fix rigid/small/npt <fix_rigid>`, then you need to use the
-   "fix\_modify dynamic/dof yes" command for the rigid fix.  This is to
+   "fix_modify dynamic/dof yes" command for the rigid fix.  This is to
    inform that fix that the molecule count will vary dynamically.
 
 If you wish to insert molecules via the *mol* keyword, that will have
@@ -157,10 +153,8 @@ many timesteps until the desired # of particles has been inserted.
    should use the :doc:`compute_modify dynamic yes <compute_modify>`
    command for the temperature compute you are using.
 
-
 ----------
 
-
 All other keywords are optional with defaults as shown below.
 
 The *diam* option is only used when inserting atoms and specifies the
@@ -229,11 +223,9 @@ causes the overlap check to skip any line or triangle particles.
 Obviously you should only use it if there is in fact no overlap of the
 line or triangle particles with the insertion region.
 
-
 ----------
 
-
-**Restart, fix\_modify, output, run start/stop, minimize info:**
+**Restart, fix_modify, output, run start/stop, minimize info:**
 
 No information about this fix is written to :doc:`binary restart files <restart>`.  This means you must be careful when restarting a
 pouring simulation, when the restart file was written in the middle of
@@ -258,7 +250,6 @@ of this fix can be used with the *start/stop* keywords of the
 Restrictions
 """"""""""""
 
-
 This fix is part of the GRANULAR package.  It is only enabled if
 LAMMPS was built with that package.  See the :doc:`Build package <Build_package>` doc page for more info.
 
@@ -284,8 +275,3 @@ setting is defined.  If the *mol* keyword is used, the default for
 Additional option defaults are diam = one 1.0, dens = 1.0 1.0, vol =
 0.25 50, rate = 0.0, vel = 0.0 0.0 0.0 0.0 0.0 (for 3d), vel = 0.0 0.0 0.0
 (for 2d), and id = max.
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/fix_precession_spin.rst b/doc/src/fix_precession_spin.rst
index b81d0a8bf8..065f894926 100644
--- a/doc/src/fix_precession_spin.rst
+++ b/doc/src/fix_precession_spin.rst
@@ -6,7 +6,6 @@ fix precession/spin command
 Syntax
 """"""
 
-
 .. code-block:: LAMMPS
 
    fix ID group precession/spin style args
@@ -14,9 +13,9 @@ Syntax
 * ID, group are documented in :doc:`fix <fix>` command
 * precession/spin = style name of this fix command
 * style = *zeeman* or *anisotropy* or *cubic*
-  
+
   .. parsed-literal::
-  
+
        *zeeman* args = H x y z
          H = intensity of the magnetic field (in Tesla)
          x y z = vector direction of the field
@@ -24,19 +23,15 @@ Syntax
          K = intensity of the magnetic anisotropy (in eV)
          x y z = vector direction of the anisotropy
 
-  
   .. parsed-literal::
-  
+
        *cubic* args = K1 K2c n1x n1y n1x n2x n2y n2z n3x n3y n3z
          K1 and K2c = intensity of the magnetic anisotropy (in eV)
          n1x to n3z = three direction vectors of the cubic anisotropy
 
-
-
 Examples
 """"""""
 
-
 .. code-block:: LAMMPS
 
    fix 1 all precession/spin zeeman 0.1 0.0 0.0 1.0
@@ -65,7 +60,6 @@ with:
 * :math:`\mu_i` the atomic moment of spin :math:`i` given as a multiple of the
   Bohr magneton :math:`\mu_B` (for example, :math:`\mu_i \approx 2.2` in bulk iron).
 
-
 The field value in Tesla is multiplied by the gyromagnetic
 ratio, :math:`g \cdot \mu_B/\hbar`, converting it into a precession frequency in
 rad.THz (in metal units and with :math:`\mu_B = 5.788 eV/T`).
@@ -73,11 +67,11 @@ rad.THz (in metal units and with :math:`\mu_B = 5.788 eV/T`).
 As a comparison, the figure below displays the simulation of a
 single spin (of norm :math:`\mu_i = 1.0`) submitted to an external
 magnetic field of :math:`\vert B_{ext}\vert = 10.0\; \mathrm{Tesla}` (and oriented along the z
-axis). 
+axis).
 The upper plot shows the average magnetization along the
 external magnetic field axis and the lower plot the Zeeman
 energy, both as a function of temperature.
-The reference result is provided by the plot of the Langevin 
+The reference result is provided by the plot of the Langevin
 function for the same parameters.
 
 .. image:: JPG/zeeman_langevin.jpg
@@ -85,7 +79,7 @@ function for the same parameters.
 
 The temperature effects are accounted for by connecting the spin
 :math:`i` to a thermal bath using a Langevin thermostat (see
-:doc:`fix\_langevin\_spin <fix_langevin_spin>` for the definition of 
+:doc:`fix langevin/spin <fix_langevin_spin>` for the definition of
 this thermostat).
 
 Style *anisotropy* is used to simulate an easy axis or an easy plane
@@ -134,18 +128,15 @@ normalized).
 
 Those styles can be combined within one single command line.
 
-
 ----------
 
-
-**Restart, fix\_modify, output, run start/stop, minimize info:**
+**Restart, fix_modify, output, run start/stop, minimize info:**
 
 By default, the energy associated to this fix is not added to the potential
 energy of the system.
 The :doc:`fix_modify <fix_modify>` *energy* option is supported by this fix
 to add this magnetic potential energy to the potential energy of the system,
 
-
 .. code-block:: LAMMPS
 
    fix             1 all precession/spin zeeman 1.0 0.0 0.0 1.0
@@ -159,10 +150,9 @@ No information about this fix is written to :doc:`binary restart files <restart>
 Restrictions
 """"""""""""
 
-
 The *precession/spin* style is part of the SPIN package.  This style
 is only enabled if LAMMPS was built with this package, and if the
-atom\_style "spin" was declared.  See the :doc:`Build package <Build_package>` doc page for more info.
+atom_style "spin" was declared.  See the :doc:`Build package <Build_package>` doc page for more info.
 
 Related commands
 """"""""""""""""
@@ -173,13 +163,9 @@ Related commands
 
 none
 
-
 ----------
 
-
 .. _Skomski1:
 
-
-
 **(Skomski)** Skomski, R. (2008). Simple models of magnetism.
 Oxford University Press.
diff --git a/doc/src/fix_press_berendsen.rst b/doc/src/fix_press_berendsen.rst
index 17338048b0..215ef81b02 100644
--- a/doc/src/fix_press_berendsen.rst
+++ b/doc/src/fix_press_berendsen.rst
@@ -6,16 +6,15 @@ fix press/berendsen command
 Syntax
 """"""
 
-
 .. parsed-literal::
 
    fix ID group-ID press/berendsen keyword value ...
 
 * ID, group-ID are documented in :doc:`fix <fix>` command
 * press/berendsen = style name of this fix command
-  
+
   .. parsed-literal::
-  
+
      one or more keyword value pairs may be appended
      keyword = *iso* or *aniso* or *x* or *y* or *z* or *couple* or *dilate* or *modulus*
        *iso* or *aniso* values = Pstart Pstop Pdamp
@@ -28,13 +27,10 @@ Syntax
        *modulus* value = bulk modulus of system (pressure units)
        *dilate* value = *all* or *partial*
 
-
-
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    fix 1 all press/berendsen iso 0.0 0.0 1000.0
    fix 2 all press/berendsen aniso 0.0 0.0 1000.0 dilate partial
@@ -68,10 +64,8 @@ unchanged and controlling the pressure of a surrounding fluid.
 See the :doc:`Howto baroostat <Howto_barostat>` doc page for a
 discussion of different ways to perform barostatting.
 
-
 ----------
 
-
 The barostat is specified using one or more of the *iso*\ , *aniso*\ ,
 *x*\ , *y*\ , *z*\ , and *couple* keywords.  These keywords give you the
 ability to specify the 3 diagonal components of an external stress
@@ -126,10 +120,8 @@ means to relax the pressure in a timespan of (roughly) 10 time units
    too small for solids.  Thus you should experiment to find appropriate
    values of *Pdamp* and/or the *modulus* when using this fix.
 
-
 ----------
 
-
 The *couple* keyword allows two or three of the diagonal components of
 the pressure tensor to be "coupled" together.  The value specified
 with the keyword determines which are coupled.  For example, *xz*
@@ -143,10 +135,8 @@ dilated or contracted by the same percentage every timestep.  The
 be identical.  *Couple xyz* can be used for a 2d simulation; the *z*
 dimension is simply ignored.
 
-
 ----------
 
-
 The *iso* and *aniso* keywords are simply shortcuts that are
 equivalent to specifying several other keywords together.
 
@@ -155,7 +145,6 @@ pressure is computed (hydrostatic pressure), and dilate/contract the
 dimensions together.  Using "iso Pstart Pstop Pdamp" is the same as
 specifying these 4 keywords:
 
-
 .. parsed-literal::
 
    x Pstart Pstop Pdamp
@@ -169,7 +158,6 @@ stress tensor as the driving forces, and the specified scalar external
 pressure.  Using "aniso Pstart Pstop Pdamp" is the same as specifying
 these 4 keywords:
 
-
 .. parsed-literal::
 
    x Pstart Pstop Pdamp
@@ -177,35 +165,32 @@ these 4 keywords:
    z Pstart Pstop Pdamp
    couple none
 
-
 ----------
 
-
 This fix computes a temperature and pressure each timestep.  To do
 this, the fix creates its own computes of style "temp" and "pressure",
 as if these commands had been issued:
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    compute fix-ID_temp group-ID temp
    compute fix-ID_press group-ID pressure fix-ID_temp
 
 See the :doc:`compute temp <compute_temp>` and :doc:`compute pressure <compute_pressure>` commands for details.  Note that the
-IDs of the new computes are the fix-ID + underscore + "temp" or fix\_ID
+IDs of the new computes are the fix-ID + underscore + "temp" or fix_ID
 + underscore + "press", and the group for the new computes is the same
 as the fix group.
 
 Note that these are NOT the computes used by thermodynamic output (see
-the :doc:`thermo_style <thermo_style>` command) with ID = *thermo\_temp*
-and *thermo\_press*.  This means you can change the attributes of this
+the :doc:`thermo_style <thermo_style>` command) with ID = *thermo_temp*
+and *thermo_press*.  This means you can change the attributes of this
 fix's temperature or pressure via the
 :doc:`compute_modify <compute_modify>` command or print this temperature
 or pressure during thermodynamic output via the :doc:`thermo_style custom <thermo_style>` command using the appropriate compute-ID.
-It also means that changing attributes of *thermo\_temp* or
-*thermo\_press* will have no effect on this fix.
+It also means that changing attributes of *thermo_temp* or
+*thermo_press* will have no effect on this fix.
 
-**Restart, fix\_modify, output, run start/stop, minimize info:**
+**Restart, fix_modify, output, run start/stop, minimize info:**
 
 No information about this fix is written to :doc:`binary restart files <restart>`.
 
@@ -230,7 +215,6 @@ This fix is not invoked during :doc:`energy minimization <minimize>`.
 Restrictions
 """"""""""""
 
-
 Any dimension being adjusted by this fix must be periodic.
 
 Related commands
@@ -245,18 +229,9 @@ Default
 The keyword defaults are dilate = all, modulus = 10.0 in units of
 pressure for whatever :doc:`units <units>` are defined.
 
-
 ----------
 
-
 .. _Berendsen1:
 
-
-
 **(Berendsen)** Berendsen, Postma, van Gunsteren, DiNola, Haak, J Chem
 Phys, 81, 3684 (1984).
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/fix_print.rst b/doc/src/fix_print.rst
index 72d231a15c..82b26d4ef3 100644
--- a/doc/src/fix_print.rst
+++ b/doc/src/fix_print.rst
@@ -6,7 +6,6 @@ fix print command
 Syntax
 """"""
 
-
 .. parsed-literal::
 
    fix ID group-ID print N string keyword value ...
@@ -17,22 +16,19 @@ Syntax
 * string = text string to print with optional variable names
 * zero or more keyword/value pairs may be appended
 * keyword = *file* or *append* or *screen* or *title*
-  
+
   .. parsed-literal::
-  
+
        *file* value = filename
        *append* value = filename
        *screen* value = *yes* or *no*
        *title* value = string
          string =  text to print as 1st line of output file
 
-
-
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    fix extra all print 100 "Coords of marker atom = $x $y $z"
    fix extra all print 100 "Coords of marker atom = $x $y $z" file coord.txt
@@ -48,7 +44,7 @@ If it contains variables it must be enclosed in double quotes to
 insure they are not evaluated when the input script line is read, but
 will instead be evaluated each time the string is printed.
 
-Instead of a numeric value, N can be specified as an :doc:`equal-style variable <variable>`, which should be specified as v\_name, where
+Instead of a numeric value, N can be specified as an :doc:`equal-style variable <variable>`, which should be specified as v_name, where
 name is the variable name.  In this case, the variable is evaluated at
 the beginning of a run to determine the **next** timestep at which the
 string will be written out.  On that timestep, the variable will be
@@ -58,8 +54,7 @@ and logfreq() and stride() math functions for :doc:`equal-style variables <varia
 this context. For example, the following commands will print output at
 timesteps 10,20,30,100,200,300,1000,2000,etc:
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    variable        s equal logfreq(10,3,10)
    fix extra all print v_s "Coords of marker atom = $x $y $z"
@@ -88,14 +83,13 @@ The *title* keyword allow specification of the string that will be
 printed as the first line of the output file, assuming the *file*
 keyword was used.  By default, the title line is as follows:
 
-
 .. parsed-literal::
 
    # Fix print output for fix ID
 
 where ID is replaced with the fix-ID.
 
-**Restart, fix\_modify, output, run start/stop, minimize info:**
+**Restart, fix_modify, output, run start/stop, minimize info:**
 
 No information about this fix is written to :doc:`binary restart files <restart>`.  None of the :doc:`fix_modify <fix_modify>` options
 are relevant to this fix.  No global or per-atom quantities are stored
@@ -117,8 +111,3 @@ Default
 
 The option defaults are no file output, screen = yes, and title string
 as described above.
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/fix_propel_self.rst b/doc/src/fix_propel_self.rst
index 005657c759..b6b5a6051f 100644
--- a/doc/src/fix_propel_self.rst
+++ b/doc/src/fix_propel_self.rst
@@ -6,7 +6,9 @@ fix propel/self command
 Syntax
 """"""
 
-fix ID group-ID propel/self mode magnitude keyword values ...
+.. parsed-literal::
+
+   fix ID group-ID propel/self mode magnitude keyword values ...
 
 * ID, group-ID are documented in :doc:`fix <fix>` command
 * propel/self = style name of this fix command
@@ -17,13 +19,10 @@ fix ID group-ID propel/self mode magnitude keyword values ...
 
   *types* values = one or more atom types
 
-
-
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    fix active_group all propel/self velocity 1.0
    fix constant_velocity all viscous 1.0
@@ -45,7 +44,7 @@ such as proposed by :ref:`(Erdmann) <Erdmann>`.
 For *mode* = *quat* the force is applied along the axis obtained
 by rotating the x-axis along the atom's quaternion. In other words, the
 force is along the x-axis in the atom's body frame. This mode requires
-all atoms in the group to have a quaternion, so atom\_style should
+all atoms in the group to have a quaternion, so atom_style should
 either be ellipsoid or body.  In combination with Langevin thermostat
 for translation and rotation in the overdamped regime, the quaternion
 mode corresponds to the active Brownian particle model introduced by
@@ -56,11 +55,9 @@ By default, this fix is applied to all atoms in the group. You can
 override this behavior by specifying the atom types the fix should work
 on through the *types* keyword.
 
-
 ----------
 
-
-**Restart, fix\_modify, output, run start/stop, minimize info:**
+**Restart, fix_modify, output, run start/stop, minimize info:**
 
 No information about this fix is written to :doc:`binary restart files <restart>`.
 
@@ -69,11 +66,10 @@ This fix is not imposed  during minimization.
 Restrictions
 """"""""""""
 
-
 In quat mode, this fix makes use of per-atom quaternions to take
 into account the fact that the orientation can rotate and hence the
 direction of the active force can change. The quat mode
-of this fix only works with atom\_style ellipsoid.
+of this fix only works with atom_style ellipsoid.
 
 Related commands
 """"""""""""""""
@@ -82,32 +78,19 @@ Related commands
 
 .. _Erdmann:
 
-
-
 **(Erdmann)** U. Erdmann , W. Ebeling, L. Schimansky-Geier, and F. Schweitzer,
 Eur. Phys. J. B 15, 105-113, 2000.
 
 .. _Henkes:
 
-
-
 **(Henkes)** Henkes, S, Fily, Y., and Marchetti, M. C. Phys. Rev. E, 84, 040301(R), 2011.
 
 .. _Bialke:
 
-
-
 **(Bialke)** J. Bialke, T. Speck, and H Loewen, Phys. Rev. Lett. 108, 168301, 2012.
 
 .. _Fily:
 
-
-
 **(Fily)** Y. Fily and M.C. Marchetti, Phys. Rev. Lett. 108, 235702, 2012.
 
 **Default:** types
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/fix_property_atom.rst b/doc/src/fix_property_atom.rst
index f13c6239cd..f866ddf7a2 100644
--- a/doc/src/fix_property_atom.rst
+++ b/doc/src/fix_property_atom.rst
@@ -9,17 +9,16 @@ fix property/atom/kk command
 Syntax
 """"""
 
-
 .. parsed-literal::
 
    fix ID group-ID property/atom vec1 vec2 ... keyword value ...
 
 * ID, group-ID are documented in :doc:`fix <fix>` command
 * property/atom = style name of this fix command
-* vec1,vec2,... = *mol* or *q* or *rmass* or *i\_name* or *d\_name*
-  
+* vec1,vec2,... = *mol* or *q* or *rmass* or *i_name* or *d_name*
+
   .. parsed-literal::
-  
+
        *mol* = molecule IDs
        *q* = charge
        *rmass* = per-atom mass
@@ -28,18 +27,15 @@ Syntax
 
 * zero of more keyword/value pairs may be appended
 * keyword = *ghost*
-  
+
   .. parsed-literal::
-  
+
        *ghost* value = *no* or *yes* for whether ghost atom info in communicated
 
-
-
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    fix 1 all property/atom mol
    fix 1 all property/atom i_myflag1 i_myflag2
@@ -88,7 +84,7 @@ In the future, we may add additional per-atom properties similar to
 by some atom styles, so they can be used by atom styles that do not
 define them.
 
-More generally, the *i\_name* and *d\_name* vectors allow one or more
+More generally, the *i_name* and *d_name* vectors allow one or more
 new custom per-atom properties to be defined.  Each name must be
 unique and can use alphanumeric or underscore characters.  These
 vectors can store whatever values you decide are useful in your
@@ -136,10 +132,8 @@ new properties are also defined for the ghost atoms.
    a 'run 0' command should be issued to properly initialize the storage
    created by this fix.
 
-
 ----------
 
-
 This fix is one of a small number that can be defined in an input
 script before the simulation box is created or atoms are defined.
 This is so it can be used with the :doc:`read_data <read_data>` command
@@ -154,15 +148,13 @@ passing it the fix-ID of this fix.
 
 Thus these commands:
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    fix prop all property/atom mol d_flag
    read_data data.txt fix prop NULL Molecules
 
 would allow a data file to have a section like this:
 
-
 .. parsed-literal::
 
    Molecules
@@ -185,12 +177,11 @@ Another way of initializing the new properties is via the
 defined for every set of 10 atoms, based on their atom-IDs,
 these commands could be used:
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    fix prop all property/atom mol
    variable cluster atom ((id-1)/10)+1
-   set atom \* mol v_cluster
+   set atom * mol v_cluster
 
 The :doc:`atom-style variable <variable>` will create values for atoms
 with IDs 31,32,33,...40 that are 4.0,4.1,4.2,...,4.9.  When the
@@ -204,42 +195,33 @@ molecule IDs could be read-in from a separate file and assigned by the
 :doc:`set <set>` command.  This allows you to initialize new per-atom
 properties in a completely general fashion.
 
-
 ----------
 
-
-For new atom properties specified as *i\_name* or *d\_name*, the
+For new atom properties specified as *i_name* or *d_name*, the
 :doc:`compute property/atom <compute_property_atom>` command can access
 their values.  This means that the values can be output via the :doc:`dump custom <dump>` command, accessed by fixes like :doc:`fix ave/atom <fix_ave_atom>`, accessed by other computes like :doc:`compute reduce <compute_reduce>`, or used in :doc:`atom-style variables <variable>`.
 
 For example, these commands will output two new properties to a custom
 dump file:
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    fix prop all property/atom i_flag1 d_flag2
    compute 1 all property/atom i_flag1 d_flag2
    dump 1 all custom 100 tmp.dump id x y z c_1[1] c_1[2]
 
-
 ----------
 
-
 If you wish to add new :doc:`pair styles <pair_style>`,
 :doc:`fixes <fix>`, or :doc:`computes <compute>` that use the per-atom
 properties defined by this fix, see the :doc:`Modify atom <Modify_atom>`
 doc page which has details on how the properties can be accessed from
 added classes.
 
-
 ----------
 
-
 .. _isotopes:
 
-
-
 Example for using per-atom masses with TIP4P water to
 study isotope effects. When setting up simulations with the :doc:`TIP4P pair styles <Howto_tip4p>` for water, you have to provide exactly
 one atom type each to identify the water oxygen and hydrogen
@@ -251,8 +233,7 @@ for regular TIP4P water, where water oxygen is atom type 1 and water
 hydrogen is atom type 2, the following lines of input script convert
 this to using per-atom masses:
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    fix Isotopes all property/atom rmass ghost yes
    set type 1 mass 15.9994
@@ -265,8 +246,7 @@ existing data file and just add this *Isotopes* section with
 one line per atom containing atom-ID and mass. Either way, the
 extended data file can be read back with:
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    fix Isotopes all property/atom rmass ghost yes
    read_data tip4p-isotopes.data fix Isotopes NULL Isotopes
@@ -276,17 +256,14 @@ and the second to the name of the section. The following input
 script code will now change the first 100 water molecules in this
 example to heavy water:
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    group hwat id 2:300:3
    group hwat id 3:300:3
    set group hwat mass 2.0141018
 
-
 ----------
 
-
 Styles with a *gpu*\ , *intel*\ , *kk*\ , *omp*\ , or *opt* suffix are
 functionally the same as the corresponding style without the suffix.
 They have been optimized to run faster, depending on your available
@@ -305,11 +282,9 @@ by including their suffix, or you can use the :doc:`-suffix command-line switch
 See the :doc:`Speed packages <Speed_packages>` doc page for more
 instructions on how to use the accelerated styles effectively.
 
-
 ----------
 
-
-**Restart, fix\_modify, output, run start/stop, minimize info:**
+**Restart, fix_modify, output, run start/stop, minimize info:**
 
 This fix writes the per-atom values it stores to :doc:`binary restart files <restart>`, so that the values can be restored when a
 simulation is restarted.  See the :doc:`read_restart <read_restart>`
@@ -336,8 +311,3 @@ Default
 """""""
 
 The default keyword values are ghost = no.
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/fix_python_invoke.rst b/doc/src/fix_python_invoke.rst
index 0ee101198b..94bad11f00 100644
--- a/doc/src/fix_python_invoke.rst
+++ b/doc/src/fix_python_invoke.rst
@@ -6,7 +6,6 @@ fix python/invoke command
 Syntax
 """"""
 
-
 .. parsed-literal::
 
    fix ID group-ID python/invoke N callback function_name
@@ -14,20 +13,17 @@ Syntax
 * ID, group-ID are ignored by this fix
 * python/invoke = style name of this fix command
 * N = execute every N steps
-* callback = *post\_force* or *end\_of\_step*
-  
+* callback = *post_force* or *end_of_step*
+
   .. parsed-literal::
-  
+
        *post_force* = callback after force computations on atoms every N time steps
        *end_of_step* = callback after every N time steps
 
-
-
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    python post_force_callback here """
    from lammps import lammps
@@ -73,7 +69,6 @@ gives access to the LAMMPS state from Python.
 Restrictions
 """"""""""""
 
-
 This fix is part of the PYTHON package.  It is only enabled if LAMMPS
 was built with that package.  See the :doc:`Build package <Build_package>` doc page for more info.
 
@@ -86,8 +81,3 @@ Related commands
 """"""""""""""""
 
 :doc:`python command <python>`
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/fix_python_move.rst b/doc/src/fix_python_move.rst
index e188c096af..07f61c2b85 100644
--- a/doc/src/fix_python_move.rst
+++ b/doc/src/fix_python_move.rst
@@ -6,7 +6,6 @@ fix python/move command
 Syntax
 """"""
 
-
 .. parsed-literal::
 
    fix python/move pymodule.CLASS
@@ -16,8 +15,7 @@ pymodule.CLASS = use class **CLASS** in module/file **pymodule** to compute how
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    fix  1 all python/move py_nve.NVE
    fix  1 all python/move py_nve.NVE_OPT
@@ -37,16 +35,13 @@ however, the performance of this fix can be moderately to significantly
 slower than the corresponding C++ code. For specific cases, this
 performance penalty can be limited through effective use of NumPy.
 
-
 ----------
 
-
 The python module file has to start with the following code:
 
+.. code-block:: python
 
-.. parsed-literal::
-
-   from __future_\_ import print_function
+   from __future__ import print_function
    import lammps
    import ctypes
    import traceback
@@ -85,11 +80,9 @@ methods as needed.
 
 Examples for how to do this are in the *examples/python* folder.
 
-
 ----------
 
-
-**Restart, fix\_modify, output, run start/stop, minimize info:**
+**Restart, fix_modify, output, run start/stop, minimize info:**
 
 No information about this fix is written to :doc:`binary restart files <restart>`.  None of the :doc:`fix_modify <fix_modify>` options
 are relevant to this fix.  No global or per-atom quantities are stored
@@ -100,7 +93,6 @@ the :doc:`run <run>` command.  This fix is not invoked during :doc:`energy minim
 Restrictions
 """"""""""""
 
-
 This pair style is part of the PYTHON package.  It is only enabled if
 LAMMPS was built with that package.  See the :doc:`Build package <Build_package>` doc page for more info.
 
@@ -110,8 +102,3 @@ Related commands
 :doc:`fix nve <fix_nve>`, :doc:`fix python/invoke <fix_python_invoke>`
 
 **Default:** none
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/fix_qbmsst.rst b/doc/src/fix_qbmsst.rst
index 6156c65041..b7a4f49300 100644
--- a/doc/src/fix_qbmsst.rst
+++ b/doc/src/fix_qbmsst.rst
@@ -6,7 +6,6 @@ fix qbmsst command
 Syntax
 """"""
 
-
 .. parsed-literal::
 
    fix ID group-ID qbmsst dir shockvel keyword value ...
@@ -16,17 +15,17 @@ Syntax
 * dir = *x* or *y* or *z*
 * shockvel = shock velocity (strictly positive, velocity units)
 * zero or more keyword/value pairs may be appended
-* keyword = *q* or *mu* or *p0* or *v0* or *e0* or *tscale* or *damp* or *seed*\ or *f\_max* or *N\_f* or *eta* or *beta* or *T\_init*
-  
+* keyword = *q* or *mu* or *p0* or *v0* or *e0* or *tscale* or *damp* or *seed*\ or *f_max* or *N_f* or *eta* or *beta* or *T_init*
+
   .. parsed-literal::
-  
+
        *q* value = cell mass-like parameter (mass\^2/distance\^4 units)
        *mu* value = artificial viscosity (mass/distance/time units)
        *p0* value = initial pressure in the shock equations (pressure units)
        *v0* value = initial simulation cell volume in the shock equations (distance\^3 units)
        *e0* value = initial total energy (energy units)
        *tscale* value = reduction in initial temperature (unitless fraction between 0.0 and 1.0)
-       *damp* value = damping parameter (time units) inverse of friction <i>&gamma;</i>
+       *damp* value = damping parameter (time units) inverse of friction *gamma*
        *seed* value = random number seed (positive integer)
        *f_max* value = upper cutoff frequency of the vibration spectrum (1/time units)
        *N_f* value = number of frequency bins (positive integer)
@@ -34,50 +33,50 @@ Syntax
        *beta* value = the quantum temperature is updated every beta time steps (positive integer)
        *T_init* value = quantum temperature for the initial state (temperature units)
 
-
-
 Examples
 """"""""
 
+.. code-block:: LAMMPS
 
-.. parsed-literal::
+   # (liquid methane modeled with the REAX force field, real units)
+   fix 1 all qbmsst z 0.122 q 25 mu 0.9 tscale 0.01 damp 200 seed 35082 f_max 0.3 N_f 100 eta 1 beta 400 T_init 110
+   # (quartz modeled with the BKS force field, metal units)
+   fix 2 all qbmsst z 72 q 40 tscale 0.05 damp 1 seed 47508 f_max 120.0 N_f 100 eta 1.0 beta 500 T_init 300
 
-   fix 1 all qbmsst z 0.122 q 25 mu 0.9 tscale 0.01 damp 200 seed 35082 f_max 0.3 N_f 100 eta 1 beta 400 T_init 110 (liquid methane modeled with the REAX force field, real units)
-   fix 2 all qbmsst z 72 q 40 tscale 0.05 damp 1 seed 47508 f_max 120.0 N_f 100 eta 1.0 beta 500 T_init 300 (quartz modeled with the BKS force field, metal units)
-
-Two example input scripts are given, including shocked alpha quartz
-and shocked liquid methane. The input script first equilibrate an
-initial state with the quantum thermal bath at the target temperature
-and then apply the qbmsst to simulate shock compression with quantum
-nuclear correction.  The following two figures plot related quantities
-for shocked alpha quartz.
+Two example input scripts are given, including shocked
+:math:`\alpha\textrm{-quartz}` and shocked liquid methane.  The input
+script first equilibrates an initial state with the quantum thermal
+bath at the target temperature and then applies *fix qbmsst* to simulate
+shock compression with quantum nuclear correction.  The following two
+figures plot relevant quantities for shocked
+:math:`\alpha\textrm{-quartz}`.
 
 .. image:: JPG/qbmsst_init.jpg
    :align: center
 
-Figure 1. Classical temperature <i>T</i><sup>cl</sup> = &sum;
-<i>m<sub>i</sub>v<sub>i</sub><sup>2</sup>/3Nk</i><sub>B</sub> vs. time
-for coupling the alpha quartz initial state with the quantum thermal
-bath at target quantum temperature <i>T</i><sup>qm</sup> = 300 K. The
-NpH ensemble is used for time integration while QTB provides the
-colored random force. <i>T</i><sup>cl</sup> converges at the timescale
-of *damp* which is set to be 1 ps.
+Figure 1. Classical temperature
+:math:`T_{cl} = \sum \frac{m_iv_i^2}{3Nk_B}` vs. time for coupling the
+:math:`\alpha\textrm{-quartz}` initial state with the quantum thermal
+bath at target quantum temperature :math:`T^{qm} = 300 K`. The NpH
+ensemble is used for time integration while QTB provides the colored
+random force. :math:`T^{cl}` converges at the timescale of *damp*
+which is set to be 1 ps.
 
 .. image:: JPG/qbmsst_shock.jpg
    :align: center
 
 Figure 2. Quantum temperature and pressure vs. time for simulating
-shocked alpha quartz with the QBMSST. The shock propagates along the z
-direction. Restart of the QBMSST command is demonstrated in the
-example input script. Thermodynamic quantities stay continuous before
-and after the restart.
+shocked :math:`\alpha\textrm{-quartz}` with *fix qbmsst*\. The shock
+propagates along the z direction. Restart of the *fix qbmsst* command
+is demonstrated in the example input script. Thermodynamic quantities
+stay continuous before and after the restart.
 
 Description
 """""""""""
 
 This command performs the Quantum-Bath coupled Multi-Scale Shock
 Technique (QBMSST) integration. See :ref:`(Qi) <Qi>` for a detailed
-description of this method.  The QBMSST provides description of the
+description of this method.  QBMSST provides description of the
 thermodynamics and kinetics of shock processes while incorporating
 quantum nuclear effects.  The *shockvel* setting determines the steady
 shock velocity that will be simulated along direction *dir*\ .
@@ -96,91 +95,85 @@ Hugoniot that is 40% lower than observed with classical molecular
 dynamics.
 
 It is highly recommended that the system be already in an equilibrium
-state with a quantum thermal bath at temperature of *T\_init*.  The fix
-command :doc:`fix qtb <fix_qtb>` at constant temperature *T\_init* could
+state with a quantum thermal bath at temperature of *T_init*.  The fix
+command :doc:`fix qtb <fix_qtb>` at constant temperature *T_init* could
 be used before applying this command to introduce self-consistent
 quantum nuclear effects into the initial state.
 
 The parameters *q*\ , *mu*\ , *e0*\ , *p0*\ , *v0* and *tscale* are described
 in the command :doc:`fix msst <fix_msst>`. The values of *e0*\ , *p0*\ , or
 *v0* will be calculated on the first step if not specified.  The
-parameter of *damp*\ , *f\_max*, and *N\_f* are described in the command
+parameter of *damp*\ , *f_max*, and *N_f* are described in the command
 :doc:`fix qtb <fix_qtb>`.
 
-The fix qbmsst command couples the shock system to a quantum thermal
+The *fix qbmsst* command couples the shock system to a quantum thermal
 bath with a rate that is proportional to the change of the total
-energy of the shock system, <i>etot</i> - <i>etot</i><sub>0</sub>.
-Here <i>etot</i> consists of both the system energy and a thermal
-term, see :ref:`(Qi) <Qi>`, and <i>etot</i><sub>0</sub> = *e0* is the
+energy of the shock system, :math:`E^{tot} - E^{tot}_0`.
+Here :math:`E^{etot}` consists of both the system energy and a thermal
+term, see :ref:`(Qi) <Qi>`, and :math:`E^{tot}_0 = e0` is the
 initial total energy.
 
-The *eta* (<i>&eta;</i>) parameter is a unitless coupling constant
-between the shock system and the quantum thermal bath. A small *eta*
+The *eta* (:math:`\eta`) parameter is a unitless coupling constant
+between the shock system and the quantum thermal bath. A small :math:`\eta`
 value cannot adjust the quantum temperature fast enough during the
-temperature ramping period of shock compression while large *eta*
-leads to big temperature oscillation. A value of *eta* between 0.3 and
+temperature ramping period of shock compression while large :math:`\eta`
+leads to big temperature oscillation. A value of :math:`\eta` between 0.3 and
 1 is usually appropriate for simulating most systems under shock
-compression. We observe that different values of *eta* lead to almost
+compression. We observe that different values of :math:`\eta` lead to almost
 the same final thermodynamic state behind the shock, as expected.
 
-The quantum temperature is updated every *beta* (<i>&beta;</i>) steps
-with an integration time interval *beta* times longer than the
-simulation time step. In that case, <i>etot</i> is taken as its
-average over the past *beta* steps. The temperature of the quantum
-thermal bath <i>T</i><sup>qm</sup> changes dynamically according to
-the following equation where &Delta;<i>t</i> is the MD time step and
-<i>&gamma;</i> is the friction constant which is equal to the inverse
+The quantum temperature is updated every *beta* (:math:`\beta`) steps
+with an integration time interval :math:`\beta` times longer than the
+simulation time step. In that case, :math:`E^{tot}` is taken as its
+average over the past :math:`\beta` steps. The temperature of the quantum
+thermal bath :math:`T^{qm}` changes dynamically according to
+the following equation where :math:`\Delta_t` is the MD time step and
+:math:`\gamma` is the friction constant which is equal to the inverse
 of the *damp* parameter.
 
-.. raw:: html
+.. math::
 
-   <center><font size="4"> <i>dT</i><sup>qm</sup>/<i>dt =
-   &gamma;&eta;</i>&sum;<i><sup>&beta;</sup><sub>l =
-   1</sub></i>[<i>etot</i>(<i>t-l</i>&Delta;<i>t</i>)-<i>etot</i><sub>0</sub>]/<i>3&beta;Nk</i><sub>B</sub>
-   </font></center>
+   \frac{dT^{qm}}{dt} = \gamma\eta\sum^\beta_{l=1}\frac{E^{tot}(t-l\Delta t) - E^{tot}_0}{3\beta N k_B}
 
-The parameter *T\_init* is the initial temperature of the quantum
+The parameter *T_init* is the initial temperature of the quantum
 thermal bath and the system before shock loading.
 
 For all pressure styles, the simulation box stays orthorhombic in
 shape. Parrinello-Rahman boundary conditions (tilted box) are
 supported by LAMMPS, but are not implemented for QBMSST.
 
-
 ----------
 
-
-**Restart, fix\_modify, output, run start/stop, minimize info:**
+**Restart, fix_modify, output, run start/stop, minimize info:**
 
 Because the state of the random number generator is not written to
 :doc:`binary restart files <restart>`, this fix cannot be restarted
 "exactly" in an uninterrupted fashion. However, in a statistical
 sense, a restarted simulation should produce similar behaviors of the
 system as if it is not interrupted.  To achieve such a restart, one
-should write explicitly the same value for *q*\ , *mu*\ , *damp*\ , *f\_max*,
-*N\_f*, *eta*\ , and *beta* and set *tscale* = 0 if the system is
+should write explicitly the same value for *q*\ , *mu*\ , *damp*\ , *f_max*,
+*N_f*, *eta*\ , and *beta* and set *tscale* = 0 if the system is
 compressed during the first run.
 
 The progress of the QBMSST can be monitored by printing the global
 scalar and global vector quantities computed by the fix.  The global
 vector contains five values in this order:
 
-[\ *dhugoniot*\ , *drayleigh*\ , *lagrangian\_speed*, *lagrangian\_position*,
-*quantum\_temperature*]
+[\ *dhugoniot*\ , *drayleigh*\ , *lagrangian_speed*, *lagrangian_position*,
+*quantum_temperature*]
 
 1. *dhugoniot* is the departure from the Hugoniot (temperature units).
 2. *drayleigh* is the departure from the Rayleigh line (pressure units).
-3. *lagrangian\_speed* is the laboratory-frame Lagrangian speed (particle velocity) of the computational cell (velocity units).
-4. *lagrangian\_position* is the computational cell position in the reference frame moving at the shock speed. This is the distance of the computational cell behind the shock front.
-5. *quantum\_temperature* is the temperature of the quantum thermal bath <i>T</i><sup>qm</sup>.
+3. *lagrangian_speed* is the laboratory-frame Lagrangian speed (particle velocity) of the computational cell (velocity units).
+4. *lagrangian_position* is the computational cell position in the reference frame moving at the shock speed. This is the distance of the computational cell behind the shock front.
+5. *quantum_temperature* is the temperature of the quantum thermal bath :math:`T^{qm}`.
 
 To print these quantities to the log file with descriptive column
 headers, the following LAMMPS commands are suggested. Here the
 :doc:`fix_modify <fix_modify>` energy command is also enabled to allow
-the thermo keyword *etotal* to print the quantity <i>etot</i>.  See
+the thermo keyword *etotal* to print the quantity :math:`E^{tot}`.  See
 also the :doc:`thermo_style <thermo_style>` command.
 
-
 .. parsed-literal::
 
    fix             fix_id all msst z
@@ -192,21 +185,19 @@ also the :doc:`thermo_style <thermo_style>` command.
    variable        T_qm    equal f_fix_id[5]
    thermo_style    custom  step temp ke pe lz pzz etotal v_dhug v_dray v_lgr_vel v_lgr_pos v_T_qm f_fix_id
 
-The global scalar under the entry f\_fix\_id is the quantity of thermo
-energy as an extra part of <i>etot</i>. This global scalar and the
-vector of 5 quantities can be accessed by various :doc:`output commands <Howto_output>`. It is worth noting that the temp keyword
+The global scalar under the entry f_fix_id is the quantity of thermo
+energy as an extra part of :math:`E^{tot}`. This global scalar and the
+vector of 5 quantities can be accessed by various :doc:`output commands <Howto_output>`.
+It is worth noting that the temp keyword
 under the :doc:`thermo_style <thermo_style>` command print the
-instantaneous classical temperature <i>T</i><sup>cl</sup> as described
+instantaneous classical temperature :math:`T^{cl}` as described
 in the command :doc:`fix qtb <fix_qtb>`.
 
-
 ----------
 
-
 Restrictions
 """"""""""""
 
-
 This fix style is part of the USER-QTB package.  It is only enabled if
 LAMMPS was built with that package. See the :doc:`Build package <Build_package>` doc page for more info.
 
@@ -214,43 +205,28 @@ All cell dimensions must be periodic. This fix can not be used with a
 triclinic cell.  The QBMSST fix has been tested only for the group-ID
 all.
 
-
 ----------
 
-
 Related commands
 """"""""""""""""
 
 :doc:`fix qtb <fix_qtb>`, :doc:`fix msst <fix_msst>`
 
-
 ----------
 
-
 Default
 """""""
 
 The keyword defaults are q = 10, mu = 0, tscale = 0.01, damp = 1, seed
-= 880302, f\_max = 200.0, N\_f = 100, eta = 1.0, beta = 100, and
-T\_init=300.0. e0, p0, and v0 are calculated on the first step.
-
+= 880302, f_max = 200.0, N_f = 100, eta = 1.0, beta = 100, and
+T_init=300.0. e0, p0, and v0 are calculated on the first step.
 
 ----------
 
-
 .. _Goldman1:
 
-
-
 **(Goldman)** Goldman, Reed and Fried, J. Chem. Phys. 131, 204103 (2009)
 
 .. _Qi:
 
-
-
 **(Qi)** Qi and Reed, J. Phys. Chem. A 116, 10451 (2012).
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/fix_qeq.rst b/doc/src/fix_qeq.rst
index 77ce447fed..ea53fc2b2e 100644
--- a/doc/src/fix_qeq.rst
+++ b/doc/src/fix_qeq.rst
@@ -18,7 +18,6 @@ fix qeq/fire command
 Syntax
 """"""
 
-
 .. parsed-literal::
 
    fix ID group-ID style Nevery cutoff tolerance maxiter qfile keyword ...
@@ -32,20 +31,17 @@ Syntax
 * qfile = a filename with QEq parameters or *coul/streitz* or *reax/c*
 * zero or more keyword/value pairs may be appended
 * keyword = *alpha* or *qdamp* or *qstep*
-  
+
   .. parsed-literal::
-  
+
        *alpha* value = Slater type orbital exponent (qeq/slater only)
        *qdamp* value = damping factor for damped dynamics charge solver (qeq/dynamic and qeq/fire only)
        *qstep* value = time step size for damped dynamics charge solver (qeq/dynamic and qeq/fire only)
 
-
-
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    fix 1 all qeq/point 1 10 1.0e-6 200 param.qeq1
    fix 1 qeq qeq/shielded 1 8 1.0e-6 100 param.qeq2
@@ -100,7 +96,6 @@ interactions with their neighbors within *cutoff*\ .  It requires a few
 parameters, in *metal* units, for each atom type which provided in a
 file specified by *qfile*\ .  The file has the following format
 
-
 .. parsed-literal::
 
    1 chi eta gamma zeta qcore
@@ -198,7 +193,7 @@ better on larger sizes, and *qeq/fire* is faster than *qeq/dynamic*\ .
    arbitrary choices of these parameters.  We do not develop these QEq
    parameters.  See the examples/qeq directory for some examples.
 
-**Restart, fix\_modify, output, run start/stop, minimize info:**
+**Restart, fix_modify, output, run start/stop, minimize info:**
 
 No information about these fixes is written to :doc:`binary restart files <restart>`.  No global scalar or vector or per-atom
 quantities are stored by these fixes for access by various :doc:`output commands <Howto_output>`.  No parameter of these fixes can be used
@@ -209,7 +204,6 @@ Thexe fixes are invoked during :doc:`energy minimization <minimize>`.
 Restrictions
 """"""""""""
 
-
 These fixes are part of the QEQ package.  They are only enabled if
 LAMMPS was built with that package.  See the :doc:`Build package <Build_package>` doc page for more info.
 
@@ -220,51 +214,32 @@ Related commands
 
 **Default:** none
 
-
 ----------
 
-
 .. _Rappe1:
 
-
-
 **(Rappe and Goddard)** A. K. Rappe and W. A. Goddard III, J Physical
 Chemistry, 95, 3358-3363 (1991).
 
 .. _Nakano1:
 
-
-
 **(Nakano)** A. Nakano, Computer Physics Communications, 104, 59-69 (1997).
 
 .. _Rick1:
 
-
-
 **(Rick and Stuart)** S. W. Rick, S. J. Stuart, B. J. Berne, J Chemical Physics
 101, 16141 (1994).
 
 .. _Streitz1:
 
-
-
 **(Streitz-Mintmire)** F. H. Streitz, J. W. Mintmire, Physical Review B, 50,
 16, 11996 (1994)
 
 .. _vanDuin:
 
-
-
 **(ReaxFF)** A. C. T. van Duin, S. Dasgupta, F. Lorant, W. A. Goddard III, J
 Physical Chemistry, 105, 9396-9049 (2001)
 
 .. _Shan:
 
-
-
 **(QEq/Fire)** T.-R. Shan, A. P. Thompson, S. J. Plimpton, in preparation
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/fix_qeq_comb.rst b/doc/src/fix_qeq_comb.rst
index b5da7142fa..c815ac7eb3 100644
--- a/doc/src/fix_qeq_comb.rst
+++ b/doc/src/fix_qeq_comb.rst
@@ -9,7 +9,6 @@ fix qeq/comb/omp command
 Syntax
 """"""
 
-
 .. parsed-literal::
 
    fix ID group-ID qeq/comb Nevery precision keyword value ...
@@ -20,19 +19,16 @@ Syntax
 * precision = convergence criterion for charge equilibration
 * zero or more keyword/value pairs may be appended
 * keyword = *file*
-  
+
   .. parsed-literal::
-  
+
        *file* value = filename
          filename = name of file to write QEQ equilibration info to
 
-
-
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    fix 1 surface qeq/comb 10 0.0001
 
@@ -41,7 +37,7 @@ Description
 
 Perform charge equilibration (QeQ) in conjunction with the COMB
 (Charge-Optimized Many-Body) potential as described in
-:ref:`(COMB\_1) <COMB_1>` and :ref:`(COMB\_2) <COMB_2>`.  It performs the charge
+:ref:`(COMB_1) <COMB_1>` and :ref:`(COMB_2) <COMB_2>`.  It performs the charge
 equilibration portion of the calculation using the so-called QEq
 method, whereby the charge on each atom is adjusted to minimize the
 energy of the system.  This fix can only be used with the COMB
@@ -54,8 +50,8 @@ per-atom electronegativity (effective force on the charges).  An
 electronegativity equalization calculation (or QEq) is performed in an
 iterative fashion, which in parallel requires communication at each
 iteration for processors to exchange charge information about nearby
-atoms with each other.  See :ref:`Rappe\_and\_Goddard <Rappe_and_Goddard>` and
-:ref:`Rick\_and\_Stuart <Rick_and_Stuart>` for details.
+atoms with each other.  See :ref:`Rappe_and_Goddard <Rappe_and_Goddard>` and
+:ref:`Rick_and_Stuart <Rick_and_Stuart>` for details.
 
 During a run, charge equilibration is performed every *Nevery* time
 steps.  Charge equilibration is also always enforced on the first step
@@ -67,10 +63,8 @@ performing charge equilibration (more iterations) and accuracy.
 If the *file* keyword is used, then information about each
 equilibration calculation is written to the specified file.
 
-
 ----------
 
-
 Styles with a *gpu*\ , *intel*\ , *kk*\ , *omp*\ , or *opt* suffix are
 functionally the same as the corresponding style without the suffix.
 They have been optimized to run faster, depending on your available
@@ -89,11 +83,9 @@ by including their suffix, or you can use the :doc:`-suffix command-line switch
 See the :doc:`Speed packages <Speed_packages>` doc page for more
 instructions on how to use the accelerated styles effectively.
 
-
 ----------
 
-
-**Restart, fix\_modify, output, run start/stop, minimize info:**
+**Restart, fix_modify, output, run start/stop, minimize info:**
 
 No information about this fix is written to :doc:`binary restart files <restart>`.
 
@@ -115,7 +107,6 @@ This fix can be invoked during :doc:`energy minimization <minimize>`.
 Restrictions
 """"""""""""
 
-
 This fix command currently only supports :doc:`pair style *comb*\ <pair_comb>`.
 
 Related commands
@@ -128,38 +119,23 @@ Default
 
 No file output is performed.
 
-
 ----------
 
+.. _COMB_1:
 
-.. _COMB\_1:
+**(COMB_1)** J. Yu, S. B. Sinnott, S. R. Phillpot, Phys Rev B, 75, 085311 (2007),
 
+.. _COMB_2:
 
-
-**(COMB\_1)** J. Yu, S. B. Sinnott, S. R. Phillpot, Phys Rev B, 75, 085311 (2007),
-
-.. _COMB\_2:
-
-
-
-**(COMB\_2)** T.-R. Shan, B. D. Devine, T. W. Kemper, S. B. Sinnott, S. R.
+**(COMB_2)** T.-R. Shan, B. D. Devine, T. W. Kemper, S. B. Sinnott, S. R.
 Phillpot, Phys Rev B, 81, 125328 (2010).
 
-.. _Rappe\_and\_Goddard:
+.. _Rappe_and_Goddard:
 
-
-
-**(Rappe\_and\_Goddard)** A. K. Rappe, W. A. Goddard, J Phys Chem 95, 3358
+**(Rappe_and_Goddard)** A. K. Rappe, W. A. Goddard, J Phys Chem 95, 3358
 (1991).
 
-.. _Rick\_and\_Stuart:
+.. _Rick_and_Stuart:
 
-
-
-**(Rick\_and\_Stuart)** S. W. Rick, S. J. Stuart, B. J. Berne, J Chem Phys
+**(Rick_and_Stuart)** S. W. Rick, S. J. Stuart, B. J. Berne, J Chem Phys
 101, 16141 (1994).
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/fix_qeq_reax.rst b/doc/src/fix_qeq_reax.rst
index e39c0eb590..1c722606a7 100644
--- a/doc/src/fix_qeq_reax.rst
+++ b/doc/src/fix_qeq_reax.rst
@@ -12,7 +12,6 @@ fix qeq/reax/omp command
 Syntax
 """"""
 
-
 .. parsed-literal::
 
    fix ID group-ID qeq/reax Nevery cutlo cuthi tolerance params args
@@ -28,8 +27,7 @@ Syntax
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    fix 1 all qeq/reax 1 0.0 10.0 1.0e-6 reax/c
    fix 1 all qeq/reax 1 0.0 10.0 1.0e-6 param.qeq
@@ -57,7 +55,6 @@ and the file must contain one line for each atom type.  The latter
 form must be used when performing QeQ with a non-ReaxFF potential.
 Each line should be formatted as follows:
 
-
 .. parsed-literal::
 
    itype chi eta gamma
@@ -74,7 +71,7 @@ The optional *dual* keyword allows to perform the optimization
 of the S and T matrices in parallel. This is only supported for
 the *qeq/reax/omp* style. Otherwise they are processed separately.
 
-**Restart, fix\_modify, output, run start/stop, minimize info:**
+**Restart, fix_modify, output, run start/stop, minimize info:**
 
 No information about this fix is written to :doc:`binary restart files <restart>`.  No global scalar or vector or per-atom
 quantities are stored by this fix for access by various :doc:`output commands <Howto_output>`.  No parameter of this fix can be used
@@ -82,10 +79,8 @@ with the *start/stop* keywords of the :doc:`run <run>` command.
 
 This fix is invoked during :doc:`energy minimization <minimize>`.
 
-
 ----------
 
-
 Styles with a *gpu*\ , *intel*\ , *kk*\ , *omp*\ , or *opt* suffix are
 functionally the same as the corresponding style without the suffix.
 They have been optimized to run faster, depending on your available
@@ -104,14 +99,11 @@ by including their suffix, or you can use the :doc:`-suffix command-line switch
 See the :doc:`Speed packages <Speed_packages>` doc page for more
 instructions on how to use the accelerated styles effectively.
 
-
 ----------
 
-
 Restrictions
 """"""""""""
 
-
 This fix is part of the USER-REAXC package.  It is only enabled if
 LAMMPS was built with that package.  See the :doc:`Build package <Build_package>` doc page for more info.
 
@@ -126,31 +118,18 @@ Related commands
 
 **Default:** none
 
-
 ----------
 
-
 .. _Rappe2:
 
-
-
 **(Rappe)** Rappe and Goddard III, Journal of Physical Chemistry, 95,
 3358-3363 (1991).
 
 .. _Nakano2:
 
-
-
 **(Nakano)** Nakano, Computer Physics Communications, 104, 59-69 (1997).
 
 .. _qeq-Aktulga:
 
-
-
 **(Aktulga)** Aktulga, Fogarty, Pandit, Grama, Parallel Computing, 38,
 245-259 (2012).
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/fix_qmmm.rst b/doc/src/fix_qmmm.rst
index 6166efbada..4eb45e490f 100644
--- a/doc/src/fix_qmmm.rst
+++ b/doc/src/fix_qmmm.rst
@@ -6,7 +6,6 @@ fix qmmm command
 Syntax
 """"""
 
-
 .. parsed-literal::
 
    fix ID group-ID qmmm
@@ -17,7 +16,9 @@ Syntax
 Examples
 """"""""
 
-fix 1 qmol qmmm
+.. code-block:: LAMMPS
+
+   fix 1 qmol qmmm
 
 Description
 """""""""""
@@ -32,8 +33,6 @@ should be possible without changes to LAMMPS itself.
 
 .. _espresso: http://www.quantum-espresso.org
 
-
-
 The interface code for this is in the lib/qmmm directory of the LAMMPS
 distribution and is being made available at this early stage of
 development in order to encourage contributions for interfaces to
@@ -43,7 +42,7 @@ to be adapted if necessary before being finalized.
 Details about how to use this fix are currently documented in the
 description of the QM/MM interface code itself in lib/qmmm/README.
 
-**Restart, fix\_modify, output, run start/stop, minimize info:**
+**Restart, fix_modify, output, run start/stop, minimize info:**
 
 No information about this fix is written to :doc:`binary restart files <restart>`.  None of the :doc:`fix_modify <fix_modify>` options
 are relevant to this fix.  No global scalar or vector or per-atom
@@ -54,7 +53,6 @@ fix is not invoked during :doc:`energy minimization <minimize>`.
 Restrictions
 """"""""""""
 
-
 This fix is part of the USER-QMMM package.  It is only enabled if
 LAMMPS was built with that package. It also requires building a
 library provided with LAMMPS.  See the :doc:`Build package <Build_package>` doc page for more info.
@@ -66,8 +64,3 @@ executable.  See the lib/qmmm/README file for details.
 **Related commands:** none
 
 **Default:** none
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/fix_qtb.rst b/doc/src/fix_qtb.rst
index a940dd1833..6dfabcbaa7 100644
--- a/doc/src/fix_qtb.rst
+++ b/doc/src/fix_qtb.rst
@@ -6,7 +6,6 @@ fix qtb command
 Syntax
 """"""
 
-
 .. parsed-literal::
 
    fix ID group-ID qtb keyword value ...
@@ -14,28 +13,27 @@ Syntax
 * ID, group-ID are documented in :doc:`fix <fix>` command
 * qtb = style name of this fix
 * zero or more keyword/value pairs may be appended
-* keyword = *temp* or *damp* or *seed* or *f\_max* or *N\_f*
-  
+* keyword = *temp* or *damp* or *seed* or *f_max* or *N_f*
+
   .. parsed-literal::
-  
+
        *temp* value = target quantum temperature (temperature units)
-       *damp* value = damping parameter (time units) inverse of friction <i>&gamma</i>;
+       *damp* value = damping parameter (time units) inverse of friction *gamma*
        *seed* value = random number seed (positive integer)
        *f_max* value = upper cutoff frequency of the vibration spectrum (1/time units)
        *N_f* value = number of frequency bins (positive integer)
 
-
-
 Examples
 """"""""
 
+.. code-block:: LAMMPS
 
-.. parsed-literal::
-
+   # (liquid methane modeled with the REAX force field, real units)
    fix 1 all nve
-   fix 1 all qtb temp 110 damp 200 seed 35082 f_max 0.3 N_f 100 (liquid methane modeled with the REAX force field, real units)
+   fix 1 all qtb temp 110 damp 200 seed 35082 f_max 0.3 N_f 100
+   # (quartz modeled with the BKS force field, metal units)
    fix 2 all nph iso 1.01325 1.01325 1
-   fix 2 all qtb temp 300 damp 1 seed 47508 f_max 120.0 N_f 100 (quartz modeled with the BKS force field, metal units)
+   fix 2 all qtb temp 300 damp 1 seed 47508 f_max 120.0 N_f 100
 
 Description
 """""""""""
@@ -56,61 +54,53 @@ atoms and thus higher classical limits.
 The equation of motion implemented by this command follows a Langevin
 form:
 
-.. raw:: html
+.. math::
 
-   <center><font size="4"><i> m<sub>i</sub>a<sub>i</sub> = f<sub>i</sub>
-   + R<sub>i</sub> -
-   m<sub>i</sub>&gamma;v<sub>i</sub>. </i></font></center>
+   m_i a_i = f_i + R_i - m_i\gamma v_i
 
-Here <i>m<sub>i</sub></i>, <i>a<sub>i</sub></i>, <i>f<sub>i</sub>
-</i>, <i>R<sub>i</sub></i>, <i>&gamma;</i> and <i>v<sub>i</sub> </i>
-represent mass, acceleration, force exerted by all other atoms, random
+Here :math:`m_i, a_i, f_i, R_i, \gamma, \textrm{and} v_i`
+represent in this order mass, acceleration, force exerted by all other atoms, random
 force, frictional coefficient (the inverse of damping parameter damp),
-and velocity. The random force <i>R<sub>i</sub></i> is "colored" so
-that any vibrational mode with frequency <i>&omega;</i> will have a
-temperature-sensitive energy <i>&theta;</i>(<i>&omega;,T</i>) which
+and velocity. The random force :math:`R_i` is "colored" so
+that any vibrational mode with frequency :math:`\omega` will have a
+temperature-sensitive energy :math:`\theta(\omega,T)` which
 resembles the energy expectation for a quantum harmonic oscillator
 with the same natural frequency:
 
-.. raw:: html
+.. math::
 
-   <center><font size="4"> <i>&theta;</i>(<i>&omega;,T</i>) =
-   &#8463;&omega;/2 +
-   &#8463;&omega;[</i>exp(<i>&#8463;&omega;/k</i><sub>B</sub><i>T</i>)<i>-1</i>]<i><sup>-1</sup></i>
-   </font></center>
+   \theta(\omega T) = \frac{\hbar}{2} + \hbar\omega \left[\exp(\frac{\hbar\omega}{k_B T})-1 \right]^{-1}
 
 To efficiently generate the random forces, we employ the method
 of :ref:`(Barrat) <Barrat>`, that circumvents the need to generate all
 random forces for all times before the simulation. The memory
 requirement of this approach is less demanding and independent
-of the simulation duration. Since the total random force <i>R</i><sub>tot</sub>
+of the simulation duration. Since the total random force :math:`R_{tot}`
 does not necessarily vanish for a finite number of atoms,
-<i>R<sub>i</sub></i> is replaced by <i>R<sub>i</sub></i> - <i>R</i><sub>tot</sub>/<i>N</i><sub>tot</sub>
+:math:`R_i` is replaced by :math:`R_i - \frac{R_{tot}}{N_{tot}}`
 to avoid collective motion of the system.
 
 The *temp* parameter sets the target quantum temperature. LAMMPS will
 still have an output temperature in its thermo style. That is the
-instantaneous classical temperature <i>T</i><sup>cl</sup> derived from
+instantaneous classical temperature :math:`T^{cl}` derived from
 the atom velocities at thermal equilibrium. A non-zero
-<i>T</i><sup>cl</sup> will be present even when the quantum
+:math:`T^{cl}` will be present even when the quantum
 temperature approaches zero. This is associated with zero-point energy
 at low temperatures.
 
-.. raw:: html
+.. math::
 
-   <center><font size="4"> <i>T</i><sup>cl</sup> = &sum;
-   <i>m<sub>i</sub>v<sub>i</sub><sup>2</sup>/3Nk</i><sub>B</sub>
-   </font></center>
+   T^{cl} = \sum \frac{m_i v_i^2}{3 N k_B}
 
 The *damp* parameter is specified in time units, and it equals the
-inverse of the frictional coefficient <i>&gamma;</i>. <i>&gamma;</i>
+inverse of the frictional coefficient :math:`\gamma`. :math:`\gamma`
 should be as small as possible but slightly larger than the timescale
 of anharmonic coupling in the system which is about 10 ps to 100
-ps. When <i>&gamma;</i> is too large, it gives an energy spectrum that
-differs from the desired Bose-Einstein spectrum. When <i>&gamma;</i>
+ps. When :math:`\gamma` is too large, it gives an energy spectrum that
+differs from the desired Bose-Einstein spectrum. When :math:`\gamma`
 is too small, the quantum thermal bath coupling to the system will be
 less significant than anharmonic effects, reducing to a classical
-limit. We find that setting <i>&gamma;</i> between 5 THz and 1 THz
+limit. We find that setting :math:`\gamma` between 5 THz and 1 THz
 could be appropriate depending on the system.
 
 The random number *seed* is a positive integer used to initiate a
@@ -119,25 +109,24 @@ to generate its own unique seed and its own stream of random
 numbers. Thus the dynamics of the system will not be identical on two
 runs on different numbers of processors.
 
-The *f\_max* parameter truncate the noise frequency domain so that
-vibrational modes with frequencies higher than *f\_max* will not be
-modulated. If we denote &Delta;<i>t</i> as the time interval for the
-MD integration, *f\_max* is always reset by the code to make
-<i>&alpha;</i> = (int)(2*f\_max*&Delta;<i>t</i>)<sup><i>-1</i></sup> a
+The *f_max* parameter truncate the noise frequency domain so that
+vibrational modes with frequencies higher than *f_max* will not be
+modulated. If we denote :math:`\Delta t` as the time interval for the
+MD integration, *f_max* is always reset by the code to make
+:math:`\alpha = (int)(2` *f_max* :math:`\Delta t)^{-1}` a
 positive integer and print out relative information. An appropriate
-value for the cutoff frequency *f\_max* would be around 2~3
-<i>f</i><sub>D</sub>, where <i>f</i><sub>D</sub> is the Debye
-frequency.
+value for the cutoff frequency *f_max* would be around 2~3 :math:`f_D`,
+where :math:`f_D` is the Debye frequency.
 
-The *N\_f* parameter is the frequency grid size, the number of points
-from 0 to *f\_max* in the frequency domain that will be
-sampled. <i>3&times;2</i> *N\_f* per-atom random numbers are required
+The *N_f* parameter is the frequency grid size, the number of points
+from 0 to *f_max* in the frequency domain that will be
+sampled. 3*2\ *N_f* per-atom random numbers are required
 in the random force generation and there could be as many atoms as in
 the whole simulation that can migrate into every individual
-processor. A larger *N\_f* provides a more accurate sampling of the
-spectrum while consumes more memory.  With fixed *f\_max* and
-<i>&gamma;</i>, *N\_f* should be big enough to converge the classical
-temperature <i>T</i><sup>cl</sup> as a function of target quantum bath
+processor. A larger *N_f* provides a more accurate sampling of the
+spectrum while consumes more memory.  With fixed *f_max* and
+:math:`\gamma`, *N_f* should be big enough to converge the classical
+temperature :math:`T^{cl}` as a function of target quantum bath
 temperature. Memory usage per processor could be from 10 to 100
 Mbytes.
 
@@ -147,72 +136,57 @@ Mbytes.
    Nose/Hoover thermostatting AND time integration, this fix does NOT
    perform time integration. It only modifies forces to a colored
    thermostat. Thus you must use a separate time integration fix, like
-   :doc:`fix nve <fix_nve>` or :doc:`fix nph <fix_nh>` to actually update the
-   velocities and positions of atoms (as shown in the
-   examples). Likewise, this fix should not normally be used with other
-   fixes or commands that also specify system temperatures , e.g. :doc:`fix nvt <fix_nh>` and :doc:`fix temp/rescale <fix_temp_rescale>`.
-
+   :doc:`fix nve <fix_nve>` or :doc:`fix nph <fix_nh>` to actually
+   update the velocities and positions of atoms (as shown in the
+   examples). Likewise, this fix should not normally be used with
+   other fixes or commands that also specify system temperatures ,
+   e.g. :doc:`fix nvt <fix_nh>` and :doc:`fix temp/rescale
+   <fix_temp_rescale>`.
 
 ----------
 
+**Restart, fix_modify, output, run start/stop, minimizie info:**
 
-**Restart, fix\_modify, output, run start/stop, minimizie info:**
-
-No information about this fix is written to :doc:`binary restart files <restart>`.  Because the state of the random number generator
-is not saved in restart files, this means you cannot do "exact"
-restarts with this fix. However, in a statistical sense, a restarted
-simulation should produce similar behaviors of the system.
+No information about this fix is written to :doc:`binary restart files
+<restart>`.  Because the state of the random number generator is not
+saved in restart files, this means you cannot do "exact" restarts with
+this fix. However, in a statistical sense, a restarted simulation
+should produce similar behaviors of the system.
 
 This fix is not invoked during :doc:`energy minimization <minimize>`.
 
-
 ----------
 
-
 Restrictions
 """"""""""""
 
-
 This fix style is part of the USER-QTB package.  It is only enabled if
-LAMMPS was built with that package. See the :doc:`Build package <Build_package>` doc page for more info.
-
+LAMMPS was built with that package. See the :doc:`Build package
+<Build_package>` doc page for more info.
 
 ----------
 
-
 Related commands
 """"""""""""""""
 
-:doc:`fix nve <fix_nve>`, :doc:`fix nph <fix_nh>`, :doc:`fix langevin <fix_langevin>`, :doc:`fix qbmsst <fix_qbmsst>`
-
+:doc:`fix nve <fix_nve>`, :doc:`fix nph <fix_nh>`,
+:doc:`fix langevin <fix_langevin>`, :doc:`fix qbmsst <fix_qbmsst>`
 
 ----------
 
-
 Default
 """""""
 
 The keyword defaults are temp = 300, damp = 1, seed = 880302,
-f\_max=200.0 and N\_f = 100.
-
+f_max=200.0 and N_f = 100.
 
 ----------
 
-
 .. _Dammak:
 
-
-
 **(Dammak)** Dammak, Chalopin, Laroche, Hayoun, and Greffet, Phys Rev
 Lett, 103, 190601 (2009).
 
 .. _Barrat:
 
-
-
 **(Barrat)** Barrat and Rodney, J. Stat. Phys, 144, 679 (2011).
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/fix_reaxc_bonds.rst b/doc/src/fix_reaxc_bonds.rst
index fcd788cff0..8f50473af8 100644
--- a/doc/src/fix_reaxc_bonds.rst
+++ b/doc/src/fix_reaxc_bonds.rst
@@ -9,7 +9,6 @@ fix reax/c/bonds/kk command
 Syntax
 """"""
 
-
 .. parsed-literal::
 
    fix ID group-ID reaxc/bonds Nevery filename
@@ -22,8 +21,7 @@ Syntax
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    fix 1 all reax/c/bonds 100 bonds.reaxc
 
@@ -45,11 +43,11 @@ The meaning of the column header abbreviations is as follows:
 * id = atom id
 * type = atom type
 * nb = number of bonds
-* id\_1 = atom id of first bond
-* id\_nb = atom id of Nth bond
+* id_1 = atom id of first bond
+* id_nb = atom id of Nth bond
 * mol = molecule id
-* bo\_1 = bond order of first bond
-* bo\_nb = bond order of Nth bond
+* bo_1 = bond order of first bond
+* bo_nb = bond order of Nth bond
 * abo = atom bond order (sum of all bonds)
 * nlp = number of lone pairs
 * q = atomic charge
@@ -58,11 +56,9 @@ If the filename ends with ".gz", the output file is written in gzipped
 format.  A gzipped dump file will be about 3x smaller than the text
 version, but will also take longer to write.
 
-
 ----------
 
-
-**Restart, fix\_modify, output, run start/stop, minimize info:**
+**Restart, fix_modify, output, run start/stop, minimize info:**
 
 No information about this fix is written to :doc:`binary restart files <restart>`.  None of the :doc:`fix_modify <fix_modify>` options
 are relevant to this fix.  No global or per-atom quantities are stored
@@ -70,10 +66,8 @@ by this fix for access by various :doc:`output commands <Howto_output>`.
 No parameter of this fix can be used with the *start/stop* keywords of
 the :doc:`run <run>` command.  This fix is not invoked during :doc:`energy minimization <minimize>`.
 
-
 ----------
 
-
 Styles with a *gpu*\ , *intel*\ , *kk*\ , *omp*\ , or *opt* suffix are
 functionally the same as the corresponding style without the suffix.
 They have been optimized to run faster, depending on your available
@@ -93,21 +87,18 @@ by including their suffix, or you can use the :doc:`-suffix command-line switch
 See :doc:`Speed <Speed>` of the manual for
 more instructions on how to use the accelerated styles effectively.
 
-
 ----------
 
-
 Restrictions
 """"""""""""
 
-
 The fix reax/c/bonds command requires that the :doc:`pair_style reax/c <pair_reaxc>` is invoked.  This fix is part of the
 USER-REAXC package.  It is only enabled if LAMMPS was built with that
 package.  See the :doc:`Build package <Build_package>` doc page for more
 info.
 
 To write gzipped bond files, you must compile LAMMPS with the
--DLAMMPS\_GZIP option.
+-DLAMMPS_GZIP option.
 
 Related commands
 """"""""""""""""
@@ -115,8 +106,3 @@ Related commands
 :doc:`pair_style reax/c <pair_reaxc>`, :doc:`fix reax/c/species <fix_reaxc_species>`
 
 **Default:** none
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/fix_reaxc_species.rst b/doc/src/fix_reaxc_species.rst
index ebcae065ee..63beb5520d 100644
--- a/doc/src/fix_reaxc_species.rst
+++ b/doc/src/fix_reaxc_species.rst
@@ -9,7 +9,6 @@ fix reax/c/species/kk command
 Syntax
 """"""
 
-
 .. parsed-literal::
 
    fix ID group-ID reax/c/species Nevery Nrepeat Nfreq filename keyword value ...
@@ -22,9 +21,9 @@ Syntax
 * filename = name of output file
 * zero or more keyword/value pairs may be appended
 * keyword = *cutoff* or *element* or *position*
-  
+
   .. parsed-literal::
-  
+
        *cutoff* value = I J Cutoff
          I, J = atom types
          Cutoff = Bond-order cutoff value for this pair of atom types
@@ -33,13 +32,10 @@ Syntax
          posfreq = write position files every this many timestep
          filepos = name of position output file
 
-
-
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    fix 1 all reax/c/species 10 10 100 species.out
    fix 1 all reax/c/species 1 2 20 species.out cutoff 1 1 0.40 cutoff 1 2 0.55
@@ -77,7 +73,7 @@ symbol printed for each LAMMPS atom type. The number of symbols must
 match the number of LAMMPS atom types and each symbol must consist of
 1 or 2 alphanumeric characters. Normally, these symbols should be
 chosen to match the chemical identity of each LAMMPS atom type, as
-specified using the :doc:`reax/c pair\_coeff <pair_reaxc>` command and
+specified using the :doc:`reax/c pair_coeff <pair_reaxc>` command and
 the ReaxFF force field file.
 
 The optional keyword *position* writes center-of-mass positions of
@@ -97,10 +93,8 @@ character appears in *filepos*\ , then one file per snapshot is written
 at *posfreq* and the "\*" character is replaced with the timestep
 value.  For example, AuO.pos.\* becomes AuO.pos.0, AuO.pos.1000, etc.
 
-
 ----------
 
-
 The *Nevery*\ , *Nrepeat*\ , and *Nfreq* arguments specify on what
 timesteps the bond-order values are sampled to get the average bond
 order.  The species analysis is performed using the average bond-order
@@ -116,11 +110,9 @@ For example, if Nevery=2, Nrepeat=6, and Nfreq=100, then bond-order
 values on timesteps 90,92,94,96,98,100 will be used to compute the
 average bond-order for the species analysis output on timestep 100.
 
-
 ----------
 
-
-**Restart, fix\_modify, output, run start/stop, minimize info:**
+**Restart, fix_modify, output, run start/stop, minimize info:**
 
 No information about this fix is written to :doc:`binary restart files <restart>`.  None of the :doc:`fix_modify <fix_modify>` options
 are relevant to this fix.
@@ -143,10 +135,8 @@ any atom in the molecule.
 No parameter of this fix can be used with the *start/stop* keywords of
 the :doc:`run <run>` command.  This fix is not invoked during :doc:`energy minimization <minimize>`.
 
-
 ----------
 
-
 Styles with a *gpu*\ , *intel*\ , *kk*\ , *omp*\ , or *opt* suffix are
 functionally the same as the corresponding style without the suffix.
 They have been optimized to run faster, depending on your available
@@ -166,23 +156,20 @@ by including their suffix, or you can use the :doc:`-suffix command-line switch
 See :doc:`Speed <Speed>` of the manual for
 more instructions on how to use the accelerated styles effectively.
 
-
 ----------
 
-
 Restrictions
 """"""""""""
 
-
 The "fix reax/c/species" currently only works with :doc:`pair_style reax/c <pair_reaxc>` and it requires that the :doc:`pair_style reax/c <pair_reaxc>` be invoked.  This fix is part of the
 USER-REAXC package.  It is only enabled if LAMMPS was built with that
 package.  See the :doc:`Build package <Build_package>` doc page for more
 info.
 
 To write gzipped species files, you must compile LAMMPS with the
--DLAMMPS\_GZIP option.
+-DLAMMPS_GZIP option.
 
-It should be possible to extend it to other reactive pair\_styles (such as
+It should be possible to extend it to other reactive pair_styles (such as
 :doc:`rebo <pair_airebo>`, :doc:`airebo <pair_airebo>`,
 :doc:`comb <pair_comb>`, and :doc:`bop <pair_bop>`), but this has not yet been done.
 
@@ -197,8 +184,3 @@ Default
 The default values for bond-order cutoffs are 0.3 for all I-J pairs.  The
 default element symbols are C, H, O, N.  Position files are not written
 by default.
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/fix_recenter.rst b/doc/src/fix_recenter.rst
index d6895b0874..eec224c67d 100644
--- a/doc/src/fix_recenter.rst
+++ b/doc/src/fix_recenter.rst
@@ -6,7 +6,6 @@ fix recenter command
 Syntax
 """"""
 
-
 .. parsed-literal::
 
    fix ID group-ID recenter x y z keyword value ...
@@ -16,20 +15,17 @@ Syntax
 * x,y,z = constrain center-of-mass to these coords (distance units),         any coord can also be NULL or INIT (see below)
 * zero or more keyword/value pairs may be appended
 * keyword = *shift* or *units*
-  
+
   .. parsed-literal::
-  
+
        *shift* value = group-ID
          group-ID = group of atoms whose coords are shifted
        *units* value = *box* or *lattice* or *fraction*
 
-
-
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    fix 1 all recenter 0.0 0.5 0.0
    fix 1 all recenter INIT INIT NULL
@@ -97,7 +93,7 @@ velocities with zero aggregate linear and/or angular momentum.
    simulation scenario is to use the :doc:`fix spring <fix_spring>` command
    to tether the molecule in place.
 
-**Restart, fix\_modify, output, run start/stop, minimize info:**
+**Restart, fix_modify, output, run start/stop, minimize info:**
 
 No information about this fix is written to :doc:`binary restart files <restart>`.  None of the :doc:`fix_modify <fix_modify>` options
 are relevant to this fix.
@@ -119,7 +115,6 @@ the :doc:`run <run>` command.  This fix is not invoked during :doc:`energy minim
 Restrictions
 """"""""""""
 
-
 This fix should not be used with an x,y,z setting that causes a large
 shift in the system on the 1st timestep, due to the requested COM
 being very different from the initial COM.  This could cause atoms to
@@ -136,8 +131,3 @@ Default
 """""""
 
 The option defaults are shift = fix group-ID, and units = lattice.
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/fix_restrain.rst b/doc/src/fix_restrain.rst
index 04d7a01c07..3965cee04d 100644
--- a/doc/src/fix_restrain.rst
+++ b/doc/src/fix_restrain.rst
@@ -6,7 +6,6 @@ fix restrain command
 Syntax
 """"""
 
-
 .. code-block:: LAMMPS
 
    fix ID group-ID restrain keyword args ...
@@ -15,9 +14,9 @@ Syntax
 * restrain = style name of this fix command
 * one or more keyword/arg pairs may be appended
 * keyword = *bond* or *angle* or *dihedral*
-  
+
   .. parsed-literal::
-  
+
        *bond* args = atom1 atom2 Kstart Kstop r0
          atom1,atom2 = IDs of 2 atoms in bond
          Kstart,Kstop = restraint coefficients at start/end of run (energy units)
@@ -33,12 +32,9 @@ Syntax
          keyword/value = optional keyword value pairs. supported keyword/value pairs:
            *mult* n = dihedral multiplicity n (integer >= 0, default = 1)
 
-
-
 Examples
 """"""""
 
-
 .. code-block:: LAMMPS
 
    fix holdem all restrain bond 45 48 2000.0 2000.0 2.75
@@ -106,7 +102,6 @@ molecule with particular restraints (e.g. for fitting force field
 parameters or constructing a potential energy surface), commands such
 as the following may be useful:
 
-
 .. code-block:: LAMMPS
 
    # minimize molecule energy with restraints
@@ -126,10 +121,8 @@ as the following may be useful:
    unfix REST
    run 0
 
-
 ----------
 
-
 The *bond* keyword applies a bond restraint to the specified atoms
 using the same functional form used by the :doc:`bond_style harmonic <bond_harmonic>` command.  The potential associated with
 the restraint is
@@ -138,7 +131,6 @@ the restraint is
 
    E = K (r - r_0)^2
 
-
 with the following coefficients:
 
 * :math:`K` (energy/distance\^2)
@@ -147,10 +139,8 @@ with the following coefficients:
 :math:`K` and :math:`r_0` are specified with the fix.  Note that the usual 1/2 factor
 is included in :math:`K`.
 
-
 ----------
 
-
 The *angle* keyword applies an angle restraint to the specified atoms
 using the same functional form used by the :doc:`angle_style harmonic <angle_harmonic>` command.  The potential associated with
 the restraint is
@@ -167,10 +157,8 @@ with the following coefficients:
 :math:`K` and :math:`\theta_0` are specified with the fix.  Note that the usual 1/2
 factor is included in :math:`K`.
 
-
 ----------
 
-
 The *dihedral* keyword applies a dihedral restraint to the specified
 atoms using a simplified form of the function used by the
 :doc:`dihedral_style charmm <dihedral_charmm>` command.  The potential
@@ -180,7 +168,6 @@ associated with the restraint is
 
    E = K [ 1 + \cos (n \phi - d) ]
 
-
 with the following coefficients:
 
 * :math:`K` (energy)
@@ -193,11 +180,9 @@ optional *mult* keyword to set it to a different positive integer.
 Also note that the energy will be a minimum when the
 current dihedral angle :math:`\phi` is equal to :math:`\phi_0`.
 
-
 ----------
 
-
-**Restart, fix\_modify, output, run start/stop, minimize info:**
+**Restart, fix_modify, output, run start/stop, minimize info:**
 
 No information about this fix is written to :doc:`binary restart files <restart>`.
 
diff --git a/doc/src/fix_rhok.rst b/doc/src/fix_rhok.rst
index 25acb09f0b..089c96dd50 100644
--- a/doc/src/fix_rhok.rst
+++ b/doc/src/fix_rhok.rst
@@ -3,7 +3,6 @@
 fix rhok command
 ================
 
-
 .. parsed-literal::
 
    fix ID group-ID rhok nx ny nz K a
@@ -16,8 +15,7 @@ fix rhok command
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    fix bias all rhok 16 0 0 4.0 16.0
    fix 1 all npt temp 0.8 0.8 4.0 z 2.2 2.2 8.0
@@ -29,8 +27,11 @@ Description
 
 The fix applies a force to atoms given by the potential
 
-.. image:: Eqs/fix_rhok.jpg
-   :align: center
+.. math::
+
+   U  = &  \frac{1}{2} K (|\rho_{\vec{k}}| - a)^2 \\
+   \rho_{\vec{k}}  = & \sum_j^N \exp(-i\vec{k} \cdot \vec{r}_j )/\sqrt{N} \\
+   \vec{k}  = & (2\pi n_x /L_x , 2\pi n_y  /L_y , 2\pi n_z/L_z )
 
 as described in :ref:`(Pedersen) <Pedersen>`.
 
@@ -44,7 +45,6 @@ An example of using the interface pinning method is located in the
 Restrictions
 """"""""""""
 
-
 This fix is part of the USER-MISC package.  It is only enabled if
 LAMMPS was built with that package.  See the :doc:`Build package <Build_package>` doc page for more info.
 
@@ -55,17 +55,8 @@ Related commands
 
 **Default:** none
 
-
 ----------
 
-
 .. _Pedersen:
 
-
-
 **(Pedersen)** Pedersen, J. Chem. Phys., 139, 104102 (2013).
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/fix_rigid.rst b/doc/src/fix_rigid.rst
index 9e9c65dd19..72ed56bab1 100644
--- a/doc/src/fix_rigid.rst
+++ b/doc/src/fix_rigid.rst
@@ -51,7 +51,6 @@ fix rigid/nph/small command
 Syntax
 """"""
 
-
 .. parsed-literal::
 
    fix ID group-ID style bodystyle args keyword values ...
@@ -59,9 +58,9 @@ Syntax
 * ID, group-ID are documented in :doc:`fix <fix>` command
 * style = *rigid* or *rigid/nve* or *rigid/nvt* or *rigid/npt* or *rigid/nph* or *rigid/small* or *rigid/nve/small* or *rigid/nvt/small* or *rigid/npt/small* or *rigid/nph/small*
 * bodystyle = *single* or *molecule* or *group*
-  
+
   .. parsed-literal::
-  
+
        *single* args = none
        *molecule* args = none
        *custom* args = *i_propname* or *v_varname*
@@ -73,9 +72,9 @@ Syntax
 
 * zero or more keyword/value pairs may be appended
 * keyword = *langevin* or *reinit* or *temp* or *iso* or *aniso* or *x* or *y* or *z* or *couple* or *tparam* or *pchain* or *dilate* or *force* or *torque* or *infile*
-  
+
   .. parsed-literal::
-  
+
        *langevin* values = Tstart Tstop Tperiod seed
          Tstart,Tstop = desired temperature at start/stop of run (temperature units)
          Tdamp = temperature damping parameter (time units)
@@ -110,27 +109,24 @@ Syntax
        *mol* value = template-ID
          template-ID = ID of molecule template specified in a separate :doc:`molecule <molecule>` command
 
-
-
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    fix 1 clump rigid single reinit yes
    fix 1 clump rigid/small molecule
    fix 1 clump rigid single force 1 off off on langevin 1.0 1.0 1.0 428984
    fix 1 polychains rigid/nvt molecule temp 1.0 1.0 5.0 reinit no
-   fix 1 polychains rigid molecule force 1\*5 off off off force 6\*10 off off on
+   fix 1 polychains rigid molecule force 1*5 off off off force 6*10 off off on
    fix 1 polychains rigid/small molecule langevin 1.0 1.0 1.0 428984
-   fix 2 fluid rigid group 3 clump1 clump2 clump3 torque \* off off off
+   fix 2 fluid rigid group 3 clump1 clump2 clump3 torque * off off off
    fix 1 rods rigid/npt molecule temp 300.0 300.0 100.0 iso 0.5 0.5 10.0
    fix 1 particles rigid/npt molecule temp 1.0 1.0 5.0 x 0.5 0.5 1.0 z 0.5 0.5 1.0 couple xz
    fix 1 water rigid/nph molecule iso 0.5 0.5 1.0
    fix 1 particles rigid/npt/small molecule temp 1.0 1.0 1.0 iso 0.5 0.5 1.0
 
-   variable bodyid atom 1.0\*gmask(clump1)+2.0\*gmask(clump2)+3.0\*gmask(clump3)
+   variable bodyid atom 1.0*gmask(clump1)+2.0*gmask(clump2)+3.0*gmask(clump3)
    fix 1 clump rigid custom v_bodyid
 
    variable bodyid atomfile bodies.txt
@@ -186,7 +182,7 @@ The *rigid* styles are typically the best choice for a system with a
 small number of large rigid bodies, each of which can extend across
 the domain of many processors.  It operates by creating a single
 global list of rigid bodies, which all processors contribute to.
-MPI\_Allreduce operations are performed each timestep to sum the
+MPI_Allreduce operations are performed each timestep to sum the
 contributions from each processor to the force and torque on all the
 bodies.  This operation will not scale well in parallel if large
 numbers of rigid bodies are simulated.
@@ -261,10 +257,8 @@ differences may accumulate to produce divergent trajectories.
    and velocity of individual atoms in the body will be reset when time
    integration starts again.
 
-
 ----------
 
-
 Each rigid body must have two or more atoms.  An atom can belong to at
 most one rigid body.  Which atoms are in which bodies can be defined
 via several options.
@@ -364,10 +358,8 @@ rigid or fix rigid/small command which includes all the desired rigid
 bodies.  LAMMPS will allow multiple rigid fixes to be defined, but it
 is more expensive.
 
-
 ----------
 
-
 The constituent particles within a rigid body can be point particles
 (the default in LAMMPS) or finite-size particles, such as spheres or
 ellipsoids or line segments or triangles.  See the :doc:`atom_style sphere and ellipsoid and line and tri <atom_style>` commands for more
@@ -385,10 +377,8 @@ commands are used to do this.  For finite-size particles this also
 means the particles can be highly overlapped when creating the rigid
 body.
 
-
 ----------
 
-
 The *rigid*\ , *rigid/nve*\ , *rigid/small*\ , and *rigid/small/nve* styles
 perform constant NVE time integration.  They are referred to below as
 the 4 NVE rigid styles.  The only difference is that the *rigid* and
@@ -478,7 +468,6 @@ pressure is computed (hydrostatic pressure), and dilate/contract the
 dimensions together.  Using "iso Pstart Pstop Pdamp" is the same as
 specifying these 4 keywords:
 
-
 .. parsed-literal::
 
    x Pstart Pstop Pdamp
@@ -492,7 +481,6 @@ stress tensor as the driving forces, and the specified scalar external
 pressure.  Using "aniso Pstart Pstop Pdamp" is the same as specifying
 these 4 keywords:
 
-
 .. parsed-literal::
 
    x Pstart Pstop Pdamp
@@ -500,10 +488,8 @@ these 4 keywords:
    z Pstart Pstop Pdamp
    couple none
 
-
 ----------
 
-
 The keyword/value option pairs are used in the following ways.
 
 The *reinit* keyword determines, whether the rigid body properties
@@ -579,10 +565,8 @@ freedom.
    temperature as well without use of the Langevin or Nose/Hoover options
    associated with the fix rigid commands.
 
-
 ----------
 
-
 The *mol* keyword can only be used with the *rigid/small* styles.  It
 must be used when other commands, such as :doc:`fix deposit <fix_deposit>` or :doc:`fix pour <fix_pour>`, add rigid
 bodies on-the-fly during a simulation.  You specify a *template-ID*
@@ -603,10 +587,8 @@ Also note that when using the *mol* keyword, extra restart information
 about all rigid bodies is written out whenever a restart file is
 written out.  See the NOTE in the next section for details.
 
-
 ----------
 
-
 The *infile* keyword allows a file of rigid body attributes to be read
 in from a file, rather then having LAMMPS compute them.  There are 5
 such attributes: the total mass of the rigid body, its center-of-mass
@@ -628,7 +610,6 @@ comment lines starting with "#" which are ignored.  The first
 non-blank, non-comment line should list N = the number of lines to
 follow.  The N successive lines contain the following information:
 
-
 .. parsed-literal::
 
    ID1 masstotal xcm ycm zcm ixx iyy izz ixy ixz iyz vxcm vycm vzcm lx ly lz ixcm iycm izcm
@@ -681,10 +662,8 @@ cross periodic boundaries during the simulation.
    auxiliary file will contain one line for every rigid body, even if the
    original file only listed a subset of the rigid bodies.
 
-
 ----------
 
-
 If you use a :doc:`temperature compute <compute>` with a group that
 includes particles in rigid bodies, the degrees-of-freedom removed by
 each rigid body are accounted for in the temperature (and pressure)
@@ -706,10 +685,8 @@ degrees of freedom (2 translational, 1 rotational).
 The rigid body contribution to the pressure of the system (virial) is
 also accounted for by this fix.
 
-
 ----------
 
-
 If your simulation is a hybrid model with a mixture of rigid bodies
 and non-rigid particles (e.g. solvent) there are several ways these
 rigid fixes can be used in tandem with :doc:`fix nve <fix_nve>`, :doc:`fix nvt <fix_nh>`, :doc:`fix npt <fix_nh>`, and :doc:`fix nph <fix_nh>`.
@@ -746,7 +723,6 @@ choices:
   rigid styles for the rigid bodies.  Use :doc:`fix nvt <fix_nh>` (or any
   other thermostat) for the non-rigid particles.
 
-
 In all case, the rigid bodies and non-rigid particles both contribute
 to the global pressure and the box is scaled the same by any of the
 barostatting fixes.
@@ -758,10 +734,8 @@ and change the box dimensions, but not time integrate any particles.
 The integration of the rigid bodies will be performed by fix
 rigid/nvt.
 
-
 ----------
 
-
 Styles with a *gpu*\ , *intel*\ , *kk*\ , *omp*\ , or *opt* suffix are
 functionally the same as the corresponding style without the suffix.
 They have been optimized to run faster, depending on your available
@@ -780,11 +754,9 @@ by including their suffix, or you can use the :doc:`-suffix command-line switch
 See the :doc:`Speed packages <Speed_packages>` doc page for more
 instructions on how to use the accelerated styles effectively.
 
-
 ----------
 
-
-**Restart, fix\_modify, output, run start/stop, minimize info:**
+**Restart, fix_modify, output, run start/stop, minimize info:**
 
 No information about the 4 NVE rigid styles is written to :doc:`binary restart files <restart>`.  The exception is if the *infile* or
 *mol* keyword is used, in which case an auxiliary file is written out
@@ -872,14 +844,11 @@ No parameter of these fixes can be used with the *start/stop* keywords
 of the :doc:`run <run>` command.  These fixes are not invoked during
 :doc:`energy minimization <minimize>`.
 
-
 ----------
 
-
 Restrictions
 """"""""""""
 
-
 These fixes are all part of the RIGID package.  It is only enabled if
 LAMMPS was built with that package.  See the :doc:`Build package <Build_package>` doc page for more info.
 
@@ -896,8 +865,7 @@ insures all DOFs are accounted for properly, and then rescale the
 temperature to the desired value before performing a simulation.  For
 example:
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    velocity all create 300.0 12345
    run 0                             # temperature may not be 300K
@@ -916,43 +884,26 @@ The option defaults are force \* on on on and torque \* on on on,
 meaning all rigid bodies are acted on by center-of-mass force and
 torque.  Also Tchain = Pchain = 10, Titer = 1, Torder = 3, reinit = yes.
 
-
 ----------
 
-
 .. _Hoover:
 
-
-
 **(Hoover)** Hoover, Phys Rev A, 31, 1695 (1985).
 
 .. _Kamberaj:
 
-
-
 **(Kamberaj)** Kamberaj, Low, Neal, J Chem Phys, 122, 224114 (2005).
 
 .. _Martyna2:
 
-
-
 **(Martyna)** Martyna, Klein, Tuckerman, J Chem Phys, 97, 2635 (1992);
 Martyna, Tuckerman, Tobias, Klein, Mol Phys, 87, 1117.
 
 .. _Miller3:
 
-
-
 **(Miller)** Miller, Eleftheriou, Pattnaik, Ndirango, and Newns,
 J Chem Phys, 116, 8649 (2002).
 
 .. _Zhang1:
 
-
-
 **(Zhang)** Zhang, Glotzer, Nanoletters, 4, 1407-1413 (2004).
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/fix_rigid_meso.rst b/doc/src/fix_rigid_meso.rst
index 964d414c70..c9a709175f 100644
--- a/doc/src/fix_rigid_meso.rst
+++ b/doc/src/fix_rigid_meso.rst
@@ -6,7 +6,6 @@ fix rigid/meso command
 Syntax
 """"""
 
-
 .. parsed-literal::
 
    fix ID group-ID rigid/meso bodystyle args keyword values ...
@@ -14,9 +13,9 @@ Syntax
 * ID, group-ID are documented in :doc:`fix <fix>` command
 * rigid/meso = style name of this fix command
 * bodystyle = *single* or *molecule* or *group*
-  
+
   .. parsed-literal::
-  
+
        *single* args = none
        *molecule* args = none
        *custom* args = *i_propname* or *v_varname*
@@ -28,9 +27,9 @@ Syntax
 
 * zero or more keyword/value pairs may be appended
 * keyword = *reinit* or *force* or *torque* or *infile*
-  
+
   .. parsed-literal::
-  
+
        *reinit* = *yes* or *no*
        *force* values = M xflag yflag zflag
          M = which rigid body from 1-Nbody (see asterisk form below)
@@ -41,13 +40,10 @@ Syntax
        *infile* filename
          filename = file with per-body values of mass, center-of-mass, moments of inertia
 
-
-
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    fix 1 ellipsoid rigid/meso single
    fix 1 rods      rigid/meso molecule
@@ -119,10 +115,8 @@ internal energy and extrapolated velocity are also updated.
    and velocity of individual particles in the body will be reset when time
    integration starts again.
 
-
 ----------
 
-
 Each rigid body must have two or more particles.  A particle can belong
 to at most one rigid body.  Which particles are in which bodies can be
 defined via several options.
@@ -203,10 +197,8 @@ rigid/meso command which includes all the desired rigid bodies. LAMMPS
 will allow multiple rigid/meso fixes to be defined, but it is more
 expensive.
 
-
 ----------
 
-
 The keyword/value option pairs are used in the following ways.
 
 The *reinit* keyword determines, whether the rigid body properties
@@ -217,10 +209,8 @@ unphysical manipulations between runs or when properties cannot be
 easily re-computed (e.g. when read from a file). When using the *infile*
 keyword, the *reinit* option is automatically set to *no*\ .
 
-
 ----------
 
-
 The *infile* keyword allows a file of rigid body attributes to be read
 in from a file, rather then having LAMMPS compute them.  There are 5
 such attributes: the total mass of the rigid body, its center-of-mass
@@ -242,7 +232,6 @@ comment lines starting with "#" which are ignored.  The first
 non-blank, non-comment line should list N = the number of lines to
 follow.  The N successive lines contain the following information:
 
-
 .. parsed-literal::
 
    ID1 masstotal xcm ycm zcm ixx iyy izz ixy ixz iyz vxcm vycm vzcm lx ly lz ixcm iycm izcm
@@ -295,11 +284,9 @@ cross periodic boundaries during the simulation.
    auxiliary file will contain one line for every rigid body, even if the
    original file only listed a subset of the rigid bodies.
 
-
 ----------
 
-
-**Restart, fix\_modify, output, run start/stop, minimize info:**
+**Restart, fix_modify, output, run start/stop, minimize info:**
 
 No information is written to :doc:`binary restart files <restart>`.
 If the *infile* keyword is used, an auxiliary file is written out
@@ -349,14 +336,11 @@ the :doc:`run <run>` command.
 
 This fix is not invoked during :doc:`energy minimization <minimize>`.
 
-
 ----------
 
-
 Restrictions
 """"""""""""
 
-
 This fix is part of the USER-SDPD package and also depends on the RIGID
 package.  It is only enabled if LAMMPS was built with both packages. See
 the :doc:`Build package <Build_package>` doc page for more info.
@@ -379,18 +363,9 @@ The option defaults are force \* on on on and torque \* on on on,
 meaning all rigid bodies are acted on by center-of-mass force and
 torque. Also reinit = yes.
 
-
 ----------
 
-
 .. _Miller:
 
-
-
 **(Miller)** Miller, Eleftheriou, Pattnaik, Ndirango, and Newns,
 J Chem Phys, 116, 8649 (2002).
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/fix_rx.rst b/doc/src/fix_rx.rst
index 79809b7fc6..0d8af574c1 100644
--- a/doc/src/fix_rx.rst
+++ b/doc/src/fix_rx.rst
@@ -9,7 +9,6 @@ fix rx/kk command
 Syntax
 """"""
 
-
 .. parsed-literal::
 
    fix ID group-ID rx file localTemp matrix solver minSteps ...
@@ -19,7 +18,7 @@ Syntax
 * file = filename containing the reaction kinetic equations and Arrhenius parameters
 * localTemp = *none,lucy* = no local temperature averaging or local temperature defined through Lucy weighting function
 * matrix = *sparse, dense* format for the stoichiometric matrix
-* solver = *lammps\_rk4,rkf45* = rk4 is an explicit 4th order Runge-Kutta method; rkf45 is an adaptive 4th-order Runge-Kutta-Fehlberg method
+* solver = *lammps_rk4,rkf45* = rk4 is an explicit 4th order Runge-Kutta method; rkf45 is an adaptive 4th-order Runge-Kutta-Fehlberg method
 * minSteps = # of steps for rk4 solver or minimum # of steps for rkf45 (rk4 or rkf45)
 * maxSteps = maximum number of steps for the rkf45 solver (rkf45 only)
 * relTol = relative tolerance for the rkf45 solver (rkf45 only)
@@ -29,8 +28,7 @@ Syntax
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    fix 1 all rx kinetics.rx none dense lammps_rk4
    fix 1 all rx kinetics.rx none sparse lammps_rk4 1
@@ -46,13 +44,15 @@ defined within the file associated with this command.
 
 For a general reaction such that
 
-.. image:: Eqs/fix_rx_reaction.jpg
-   :align: center
+.. math::
+
+   \nu_{A}A + \nu_{B}B \rightarrow \nu_{C}C
 
 the reaction rate equation is defined to be of the form
 
-.. image:: Eqs/fix_rx_reactionRate.jpg
-   :align: center
+.. math::
+
+   r = k(T)[A]^{\nu_{A}}[B]^{\nu_{B}}
 
 In the current implementation, the exponents are defined to be equal
 to the stoichiometric coefficients.  A given reaction set consisting
@@ -63,10 +63,10 @@ constructed based on the *n* reaction rate equations.
 
 The ODE systems are solved over the full DPD timestep *dt* using either a 4th
 order Runge-Kutta *rk4* method with a fixed step-size *h*\ , specified
-by the *lammps\_rk4* keyword, or a 4th order Runge-Kutta-Fehlberg (rkf45) method
+by the *lammps_rk4* keyword, or a 4th order Runge-Kutta-Fehlberg (rkf45) method
 with an adaptive step-size for *h*\ . The number of ODE steps per DPD timestep
 for the rk4 method is optionally specified immediately after the rk4
-keyword. The ODE step-size is set as *dt/num\_steps*. Smaller
+keyword. The ODE step-size is set as *dt/num_steps*. Smaller
 step-sizes tend to yield more accurate results but there is not
 control on the error. For error control, use the rkf45 ODE solver.
 
@@ -74,13 +74,13 @@ The rkf45 method adjusts the step-size so that the local truncation error is hel
 within the specified absolute and relative tolerances. The initial step-size *h0*
 can be specified by the user or estimated internally. It is recommended that the user
 specify *h0* since this will generally reduced the number of ODE integration steps
-required. *h0* is defined as *dt / min\_steps* if min\_steps >= 1. If min\_steps == 0,
+required. *h0* is defined as *dt / min_steps* if min_steps >= 1. If min_steps == 0,
 *h0* is estimated such that an explicit Euler method would likely produce
 an acceptable solution. This is generally overly conservative for the 4th-order
 method and users are advised to specify *h0* as some fraction of the DPD timestep.
 For small DPD timesteps, only one step may be necessary depending upon the tolerances.
-Note that more than min\_steps ODE steps may be taken depending upon the ODE stiffness
-but no more than max\_steps will be taken. If max\_steps is reached, an error warning
+Note that more than min_steps ODE steps may be taken depending upon the ODE stiffness
+but no more than max_steps will be taken. If max_steps is reached, an error warning
 is printed and the simulation is stopped.
 
 After each ODE step, the solution error *e* is tested and weighted using the absTol
@@ -103,10 +103,8 @@ statistics per MPI process can be useful to examine any load imbalance caused by
 adaptive ODE solver. (Some DPD particles can take longer to solve than others. This
 can lead to an imbalance across the MPI processes.)
 
-
 ----------
 
-
 The filename specifies a file that contains the entire set of reaction
 kinetic equations and corresponding Arrhenius parameters.  The format of
 this file is described below.
@@ -121,12 +119,13 @@ irreversible reaction.  After specifying the reaction, the reaction
 rate constant is determined through the temperature dependent
 Arrhenius equation:
 
-.. image:: Eqs/fix_rx.jpg
-   :align: center
+.. math::
+
+   k = AT^{n}e^{\frac{-E_{a}}{k_{B}T}}
 
 where *A* is the Arrhenius factor in time units or concentration/time
 units, *n* is the unitless exponent of the temperature dependence, and
-*E\_a* is the activation energy in energy units.  The temperature
+:math:`E_a` is the activation energy in energy units.  The temperature
 dependence can be removed by specifying the exponent as zero.
 
 The internal temperature of the coarse-grained particles can be used
@@ -136,13 +135,15 @@ be specified to compute a local-average particle internal temperature
 for use in the reaction rate constant expressions.  The local-average
 particle internal temperature is defined as:
 
-.. image:: Eqs/fix_rx_localTemp.jpg
-   :align: center
+.. math::
+
+   \theta_i^{-1} = \frac{\sum_{j=1}\omega_{Lucy}\left(r_{ij}\right)\theta_j^{-1}}{\sum_{j=1}\omega_{Lucy}\left(r_{ij}\right)}
 
 where the Lucy function is expressed as:
 
-.. image:: Eqs/fix_rx_localTemp2.jpg
-   :align: center
+.. math::
+
+   \omega_{Lucy}\left(r_{ij}\right) = \left( 1 + \frac{3r_{ij}}{r_c} \right) \left( 1 - \frac{r_{ij}}{r_c} \right)^3
 
 The self-particle interaction is included in the above equation.
 
@@ -157,14 +158,11 @@ numbers <= 3), a fast exponential function is used. This can save significant
 computational time so users are encouraged to use integer coefficients
 where possible.
 
-
 ----------
 
-
 The format of a tabulated file is as follows (without the
 parenthesized comments):
 
-
 .. parsed-literal::
 
    # Rxn equations and parameters                                               (one or more comment or blank lines)
@@ -197,12 +195,10 @@ case, the :doc:`read_data <read_data>` command with the fix keyword
 should be specified, where the fix-ID will be the "fix rx`ID with a <SPECIES">`_ suffix, e.g.
 
 fix          foo all rx reaction.file ...
-read\_data    data.dpd fix foo\_SPECIES NULL Species
-
+read_data    data.dpd fix foo_SPECIES NULL Species
 
 ----------
 
-
 Styles with a *gpu*\ , *intel*\ , *kk*\ , *omp*\ , or *opt* suffix are
 functionally the same as the corresponding style without the suffix.
 They have been optimized to run faster, depending on your available
@@ -221,14 +217,11 @@ by including their suffix, or you can use the :doc:`-suffix command-line switch
 See the :doc:`Speed packages <Speed_packages>` doc page for more
 instructions on how to use the accelerated styles effectively.
 
-
 ----------
 
-
 Restrictions
 """"""""""""
 
-
 This command is part of the USER-DPD package.  It is only enabled if
 LAMMPS was built with that package.  See the :doc:`Build package <Build_package>` doc page for more info.
 
@@ -246,8 +239,3 @@ Related commands
 :doc:`pair dpd/fdt/energy <pair_dpd_fdt>`
 
 **Default:** none
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/fix_saed_vtk.rst b/doc/src/fix_saed_vtk.rst
index 2aa3960efb..818d14cc60 100644
--- a/doc/src/fix_saed_vtk.rst
+++ b/doc/src/fix_saed_vtk.rst
@@ -6,7 +6,6 @@ fix saed/vtk command
 Syntax
 """"""
 
-
 .. parsed-literal::
 
    fix ID group-ID saed/vtk Nevery Nrepeat Nfreak c_ID attribute args ... keyword args ...
@@ -16,10 +15,10 @@ Syntax
 * Nevery = use input values every this many timesteps
 * Nrepeat = # of times to use input values for calculating averages
 * Nfreq = calculate averages every this many timesteps
-* c\_ID = saed compute ID
-  
+* c_ID = saed compute ID
+
   .. parsed-literal::
-  
+
      keyword = *file* or *ave* or *start* or *file* or *overwrite*\ :l
        *ave* args = *one* or *running* or *window M*
          one = output a new average value every Nfreq steps
@@ -31,13 +30,10 @@ Syntax
          filename = name of file to output time averages to
        *overwrite* arg = none = overwrite output file with only latest output
 
-
-
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    compute 1 all saed 0.0251 Al O Kmax 1.70 Zone 0 0 1 dR_Ewald 0.01 c 0.5 0.5 0.5
    compute 2 all saed 0.0251 Ni Kmax 1.70 Zone 0 0 0 c 0.05 0.05 0.05 manual echo
@@ -60,7 +56,7 @@ outside the *Kmax* range assigned in the compute saed. The ghost data is
 assigned a value of -1 and can be removed setting a minimum isovolume
 of 0 within the visualization software. SAED images can be created by
 visualizing a spherical slice of the data that is centered at
-R\_Ewald\*[h k l]/norm([h k l]), where R\_Ewald=1/lambda.
+R_Ewald\*[h k l]/norm([h k l]), where R_Ewald=1/lambda.
 
 The group specified within this command is ignored. However, note that
 specified values may represent calculations performed by saed computes
@@ -69,16 +65,13 @@ which store their own "group" definitions.
 Fix saed/vtk is designed to work only with :doc:`compute saed <compute_saed>`
 values, e.g.
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    compute 3 top saed 0.0251 Al O
    fix saed/vtk 1 1 1 c_3 file Al2O3_001.saed
 
-
 ----------
 
-
 The *Nevery*\ , *Nrepeat*\ , and *Nfreq* arguments specify on what
 timesteps the input values will be used in order to contribute to the
 average.  The final averaged quantities are generated on timesteps
@@ -97,18 +90,15 @@ timestep 200, etc.  If Nrepeat=1 and Nfreq = 100, then no time
 averaging is done; values are simply generated on timesteps
 100,200,etc.
 
-
 ----------
 
-
 The output for fix ave/time/saed is a file written with the 3rd generation
 vtk image data formatting.  The filename assigned by the *file* keyword is
-appended with \_N.vtk where N is an index (0,1,2...) to account for multiple
+appended with _N.vtk where N is an index (0,1,2...) to account for multiple
 diffraction intensity outputs.
 
 By default the header contains the following information (with example data):
 
-
 .. parsed-literal::
 
    # vtk DataFile Version 3.0 c_SAED
@@ -130,10 +120,8 @@ The data is shifted by -0.85, -0.85, -0.85 inv(length) units so that
 the origin will lie at 0, 0, 0.   Here, 15,424,827 kspace points are
 sampled in total.
 
-
 ----------
 
-
 Additional optional keywords also affect the operation of this fix.
 
 The *ave* keyword determines how the values produced every *Nfreq*
@@ -169,7 +157,7 @@ running or windowed average.
 The *file* keyword allows a filename to be specified.  Every *Nfreq*
 steps, the vector of saed intensity data is written to a new file using
 the 3rd generation vtk format.  The base of each file is assigned by
-the *file* keyword and this string is appended with \_N.vtk where N is
+the *file* keyword and this string is appended with _N.vtk where N is
 an index (0,1,2...) to account for situations with multiple diffraction
 intensity outputs.
 
@@ -177,7 +165,7 @@ The *overwrite* keyword will continuously overwrite the output file
 with the latest output, so that it only contains one timestep worth of
 output.  This option can only be used with the *ave running* setting.
 
-**Restart, fix\_modify, output, run start/stop, minimize info:**
+**Restart, fix_modify, output, run start/stop, minimize info:**
 
 No information about this fix is written to :doc:`binary restart files <restart>`.  None of the :doc:`fix_modify <fix_modify>` options
 are relevant to this fix.
@@ -188,8 +176,7 @@ the :doc:`run <run>` command.  This fix is not invoked during :doc:`energy minim
 Restrictions
 """"""""""""
 
-
-The attributes for fix\_saed\_vtk must match the values assigned in the
+The attributes for fix_saed_vtk must match the values assigned in the
 associated :doc:`compute_saed <compute_saed>` command.
 
 Related commands
@@ -202,18 +189,9 @@ Default
 
 The option defaults are ave = one, start = 0, no file output.
 
-
 ----------
 
-
 .. _Coleman:
 
-
-
 **(Coleman)** Coleman, Spearot, Capolungo, MSMSE, 21, 055020
 (2013).
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/fix_setforce.rst b/doc/src/fix_setforce.rst
index 39a51e0f7b..59de49fbe0 100644
--- a/doc/src/fix_setforce.rst
+++ b/doc/src/fix_setforce.rst
@@ -12,7 +12,6 @@ fix setforce/spin command
 Syntax
 """"""
 
-
 .. parsed-literal::
 
    fix ID group-ID setforce fx fy fz keyword value ...
@@ -23,19 +22,16 @@ Syntax
 * any of fx,fy,fz can be a variable (see below)
 * zero or more keyword/value pairs may be appended to args
 * keyword = *region*
-  
+
   .. parsed-literal::
-  
+
        *region* value = region-ID
          region-ID = ID of region atoms must be in to have added force
 
-
-
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    fix freeze indenter setforce 0.0 0.0 0.0
    fix 2 edge setforce NULL 0.0 0.0
@@ -59,7 +55,7 @@ alter the force component in that dimension.
 Any of the 3 quantities defining the force components can be specified
 as an equal-style or atom-style :doc:`variable <variable>`, namely *fx*\ ,
 *fy*\ , *fz*\ .  If the value is a variable, it should be specified as
-v\_name, where name is the variable name.  In this case, the variable
+v_name, where name is the variable name.  In this case, the variable
 will be evaluated each timestep, and its value used to determine the
 force component.
 
@@ -77,10 +73,8 @@ If the *region* keyword is used, the atom must also be in the
 specified geometric :doc:`region <region>` in order to have force added
 to it.
 
-
 ----------
 
-
 Style *spin* suffix sets the components of the magnetic precession
 vectors instead of the mechanical forces. This also erases all
 previously computed magnetic precession vectors on the atom, though
@@ -92,10 +86,8 @@ atoms in the simulation by zeroing their precession vector.
 All options defined above remain valid, they just apply to the magnetic
 precession vectors instead of the forces.
 
-
 ----------
 
-
 Styles with a *gpu*\ , *intel*\ , *kk*\ , *omp*\ , or *opt* suffix are
 functionally the same as the corresponding style without the suffix.
 They have been optimized to run faster, depending on your available
@@ -117,11 +109,9 @@ by including their suffix, or you can use the :doc:`-suffix command-line switch
 See the :doc:`Speed packages <Speed_packages>` doc page for more
 instructions on how to use the accelerated styles effectively.
 
-
 ----------
 
-
-**Restart, fix\_modify, output, run start/stop, minimize info:**
+**Restart, fix_modify, output, run start/stop, minimize info:**
 
 No information about this fix is written to :doc:`binary restart files <restart>`.
 
@@ -150,7 +140,6 @@ non-zero force to atoms during a minimization.
 Restrictions
 """"""""""""
 
-
 The fix *setforce/spin* only makes sense when LAMMPS was built with the
 SPIN package.
 
@@ -160,8 +149,3 @@ Related commands
 :doc:`fix addforce <fix_addforce>`, :doc:`fix aveforce <fix_aveforce>`
 
 **Default:** none
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/fix_shake.rst b/doc/src/fix_shake.rst
index ce875b18cf..cd3fbd3865 100644
--- a/doc/src/fix_shake.rst
+++ b/doc/src/fix_shake.rst
@@ -9,7 +9,6 @@ fix rattle command
 Syntax
 """"""
 
-
 .. parsed-literal::
 
    fix ID group-ID style tol iter N constraint values ... keyword value ...
@@ -21,9 +20,9 @@ Syntax
 * N = print SHAKE statistics every this many timesteps (0 = never)
 * one or more constraint/value pairs are appended
 * constraint = *b* or *a* or *t* or *m*
-  
+
   .. parsed-literal::
-  
+
        *b* values = one or more bond types
        *a* values = one or more angle types
        *t* values = one or more atom types
@@ -31,19 +30,16 @@ Syntax
 
 * zero or more keyword/value pairs may be appended
 * keyword = *mol*
-  
+
   .. parsed-literal::
-  
+
        *mol* value = template-ID
          template-ID = ID of molecule template specified in a separate :doc:`molecule <molecule>` command
 
-
-
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    fix 1 sub shake 0.0001 20 10 b 4 19 a 3 5 2
    fix 1 sub shake 0.0001 20 10 t 5 6 m 1.0 a 31
@@ -75,13 +71,16 @@ be the position and velocity of atom *i* at time *n*\ , for
 *i* =1,...,\ *N*\ , where *N* is the number of sites of our reference
 molecule. The distance vector between sites *i* and *j* is given by
 
-.. image:: Eqs/fix_rattle_rij.jpg
-   :align: center
+.. math::
+
+   \mathbf r^{n+1}_{ij} = \mathbf r^n_j - \mathbf r^n_i
 
 The constraints can then be formulated as
 
-.. image:: Eqs/fix_rattle_constraints.jpg
-   :align: center
+.. math::
+
+   \mathbf r^{n+1}_{ij} \cdot \mathbf r^{n+1}_{ij} &= d^2_{ij} \quad \text{and} \\
+   \mathbf v^{n+1}_{ij} \cdot \mathbf r^{n+1}_{ij} &= 0
 
 The SHAKE algorithm satisfies the first condition, i.e. the sites at
 time *n+1* will have the desired separations Dij immediately after the
@@ -122,7 +121,7 @@ constraint lists atom types.  All bonds connected to an atom of the
 specified type will be constrained.  The *m* constraint lists atom
 masses.  All bonds connected to atoms of the specified masses will be
 constrained (within a fudge factor of MASSDELTA specified in
-fix\_shake.cpp).  The *a* constraint lists angle types.  If both bonds
+fix_shake.cpp).  The *a* constraint lists angle types.  If both bonds
 in the angle are constrained then the angle will also be constrained
 if its type is in the list.
 
@@ -147,10 +146,8 @@ for.
    defined in your input script after any other fixes which add or change
    forces (to atoms that fix shake operates on).
 
-
 ----------
 
-
 The *mol* keyword should be used when other commands, such as :doc:`fix deposit <fix_deposit>` or :doc:`fix pour <fix_pour>`, add molecules
 on-the-fly during a simulation, and you wish to constrain the new
 molecules via SHAKE.  You specify a *template-ID* previously defined
@@ -162,10 +159,8 @@ file.  See the :doc:`molecule <molecule>` command for details.  The only
 settings required to be in this file (by this command) are the SHAKE
 info of atoms in the molecule.
 
-
 ----------
 
-
 Styles with a *gpu*\ , *intel*\ , *kk*\ , *omp*\ , or *opt* suffix are
 functionally the same as the corresponding style without the suffix.
 They have been optimized to run faster, depending on your available
@@ -184,10 +179,8 @@ by including their suffix, or you can use the :doc:`-suffix command-line switch
 See the :doc:`Speed packages <Speed_packages>` doc page for more
 instructions on how to use the accelerated styles effectively.
 
-
 ----------
 
-
 **RATTLE:**
 
 The velocity constraints lead to a linear system of equations which
@@ -202,14 +195,12 @@ LAMMPS closely follows (:ref:`Andersen (1983) <Andersen3>`).
    after fix rattle operates, then fix rattle will not take them into
    account and the overall time integration will typically not satisfy
    the RATTLE constraints.  You can check whether the constraints work
-   correctly by setting the value of RATTLE\_DEBUG in src/fix\_rattle.cpp
+   correctly by setting the value of RATTLE_DEBUG in src/fix_rattle.cpp
    to 1 and recompiling LAMMPS.
 
-
 ----------
 
-
-**Restart, fix\_modify, output, run start/stop, minimize info:**
+**Restart, fix_modify, output, run start/stop, minimize info:**
 
 The :doc:`fix_modify <fix_modify>` *virial* option is supported by this
 fix to add the contribution due to keeping the constraints to the
@@ -225,7 +216,6 @@ fixes are not invoked during :doc:`energy minimization <minimize>`.
 Restrictions
 """"""""""""
 
-
 These fixes are part of the RIGID package.  They are only enabled if
 LAMMPS was built with that package.  See the :doc:`Build package <Build_package>` doc page for more info.
 
@@ -247,24 +237,13 @@ make a linear molecule rigid.
 
 **Default:** none
 
-
 ----------
 
-
 .. _Ryckaert:
 
-
-
 **(Ryckaert)** J.-P. Ryckaert, G. Ciccotti and H. J. C. Berendsen,
 J of Comp Phys, 23, 327-341 (1977).
 
 .. _Andersen3:
 
-
-
 **(Andersen)** H. Andersen, J of Comp Phys, 52, 24-34 (1983).
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/fix_shardlow.rst b/doc/src/fix_shardlow.rst
index 20bd2273d4..9949d3a51c 100644
--- a/doc/src/fix_shardlow.rst
+++ b/doc/src/fix_shardlow.rst
@@ -9,7 +9,6 @@ fix shardlow/kk command
 Syntax
 """"""
 
-
 .. parsed-literal::
 
    fix ID group-ID shardlow
@@ -20,8 +19,7 @@ Syntax
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    fix 1 all shardlow
 
@@ -44,19 +42,17 @@ necessary).
 
 Note that numerous variants of DPD can be specified by choosing an
 appropriate combination of the integrator and :doc:`pair_style dpd/fdt <pair_style>` command.  DPD under isothermal conditions can
-be specified by using fix *shardlow*\ , fix *nve* and pair\_style
+be specified by using fix *shardlow*\ , fix *nve* and pair_style
 *dpd/fdt*\ .  DPD under isoenergetic conditions can be specified by
-using fix *shardlow*\ , fix *nve* and pair\_style *dpd/fdt/energy*\ .  DPD
+using fix *shardlow*\ , fix *nve* and pair_style *dpd/fdt/energy*\ .  DPD
 under isobaric conditions can be specified by using fix shardlow, fix
-*nph* and pair\_style *dpd/fdt*\ .  DPD under isoenthalpic conditions can
-be specified by using fix shardlow, fix *nph* and pair\_style
+*nph* and pair_style *dpd/fdt*\ .  DPD under isoenthalpic conditions can
+be specified by using fix shardlow, fix *nph* and pair_style
 *dpd/fdt/energy*\ .  Examples of each DPD variant are provided in the
 examples/USER/dpd directory.
 
-
 ----------
 
-
 Styles with a *gpu*\ , *intel*\ , *kk*\ , *omp*\ , or *opt* suffix are
 functionally the same as the corresponding style without the suffix.
 They have been optimized to run faster, depending on your available
@@ -75,14 +71,11 @@ by including their suffix, or you can use the :doc:`-suffix command-line switch
 See the :doc:`Speed packages <Speed_packages>` doc page for more
 instructions on how to use the accelerated styles effectively.
 
-
 ----------
 
-
 Restrictions
 """"""""""""
 
-
 This command is part of the USER-DPD package.  It is only enabled if
 LAMMPS was built with that package.  See the :doc:`Build package <Build_package>` doc page for more info.
 
@@ -104,14 +97,10 @@ Related commands
 
 **Default:** none
 
-
 ----------
 
-
 .. _Lisal:
 
-
-
 **(Lisal)** M. Lisal, J.K. Brennan, J. Bonet Avalos, "Dissipative
 particle dynamics as isothermal, isobaric, isoenergetic, and
 isoenthalpic conditions using Shardlow-like splitting algorithms.",
@@ -119,8 +108,6 @@ J. Chem. Phys., 135, 204105 (2011).
 
 .. _Larentzos1sh:
 
-
-
 **(Larentzos1)** J.P. Larentzos, J.K. Brennan, J.D. Moore, M. Lisal and
 W.D. Mattson, "Parallel Implementation of Isothermal and Isoenergetic
 Dissipative Particle Dynamics Using Shardlow-Like Splitting
@@ -128,14 +115,7 @@ Algorithms", Comput. Phys. Commun., 185, 1987-1998 (2014).
 
 .. _Larentzos2sh:
 
-
-
 **(Larentzos2)** J.P. Larentzos, J.K. Brennan, J.D. Moore, and
 W.D. Mattson, "LAMMPS Implementation of Constant Energy Dissipative
 Particle Dynamics (DPD-E)", ARL-TR-6863, U.S. Army Research
 Laboratory, Aberdeen Proving Ground, MD (2014).
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/fix_smd.rst b/doc/src/fix_smd.rst
index e9ea27e61f..b303114887 100644
--- a/doc/src/fix_smd.rst
+++ b/doc/src/fix_smd.rst
@@ -6,7 +6,6 @@ fix smd command
 Syntax
 """"""
 
-
 .. parsed-literal::
 
    fix ID group-ID smd type values keyword values
@@ -14,9 +13,9 @@ Syntax
 * ID, group-ID are documented in :doc:`fix <fix>` command
 * smd  = style name of this fix command
 * mode = *cvel* or *cfor* to select constant velocity or constant force SMD
-  
+
   .. parsed-literal::
-  
+
        *cvel* values = K vel
          K = spring constant (force/distance units)
          vel = velocity of pulling (distance/time units)
@@ -24,9 +23,9 @@ Syntax
          force = pulling force (force units)
 
 * keyword = *tether* or *couple*
-  
+
   .. parsed-literal::
-  
+
        *tether* values = x y z R0
          x,y,z = point to which spring is tethered
          R0 = distance of end of spring from tether point (distance units)
@@ -35,13 +34,10 @@ Syntax
          x,y,z = direction of spring, automatically computed with 'auto'
          R0 = distance of end of spring (distance units)
 
-
-
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    fix  pull    cterm smd cvel 20.0 -0.00005 tether NULL NULL 100.0 0.0
    fix  pull    cterm smd cvel 20.0 -0.0001 tether 25.0 25 25.0 0.0
@@ -103,7 +99,7 @@ can then later be used to compute the potential of mean force (PMF)
 by averaging over multiple independent trajectories along the same
 pulling path.
 
-**Restart, fix\_modify, output, run start/stop, minimize info:**
+**Restart, fix_modify, output, run start/stop, minimize info:**
 
 The fix stores the direction of the spring, current pulling target
 distance and the running PMF to :doc:`binary restart files <restart>`.
@@ -139,7 +135,6 @@ the :doc:`run <run>` command.  This fix is not invoked during :doc:`energy minim
 Restrictions
 """"""""""""
 
-
 This fix is part of the USER-MISC package.  It is only enabled if
 LAMMPS was built with that package.  See the :doc:`Build package <Build_package>` doc page for more info.
 
@@ -153,14 +148,10 @@ Related commands
 
 **Default:** none
 
-
 ----------
 
-
 .. _Izrailev:
 
-
-
 **(Izrailev)** Izrailev, Stepaniants, Isralewitz, Kosztin, Lu, Molnar,
 Wriggers, Schulten. Computational Molecular Dynamics: Challenges,
 Methods, Ideas, volume 4 of Lecture Notes in Computational Science and
@@ -168,17 +159,8 @@ Engineering, pp. 39-65. Springer-Verlag, Berlin, 1998.
 
 .. _Park:
 
-
-
 **(Park)** Park, Schulten, J. Chem. Phys. 120 (13), 5946 (2004)
 
 .. _Jarzynski:
 
-
-
 **(Jarzynski)** Jarzynski, Phys. Rev. Lett. 78, 2690 (1997)
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/fix_smd_adjust_dt.rst b/doc/src/fix_smd_adjust_dt.rst
index 5176e158fe..d91ad1392d 100644
--- a/doc/src/fix_smd_adjust_dt.rst
+++ b/doc/src/fix_smd_adjust_dt.rst
@@ -1,31 +1,27 @@
-.. index:: fix smd/adjust\_dt
+.. index:: fix smd/adjust_dt
 
-fix smd/adjust\_dt command
-==========================
+fix smd/adjust_dt command
+=========================
 
 Syntax
 """"""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    fix ID group-ID smd/adjust_dt arg
 
 * ID, group-ID are documented in :doc:`fix <fix>` command
-* smd/adjust\_dt = style name of this fix command
-* arg = *s\_fact*
-  
+* smd/adjust_dt = style name of this fix command
+* arg = *s_fact*
+
   .. parsed-literal::
-  
+
        *s_fact* = safety factor
 
-
-
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    fix 1 all smd/adjust_dt 0.1
 
@@ -45,30 +41,24 @@ step.
 
 This fix inquires the minimum stable time increment across all
 particles contained in the group for which this fix is defined. An
-additional safety factor *s\_fact* is applied to the time increment.
+additional safety factor *s_fact* is applied to the time increment.
 
 See `this PDF guide <PDF/SMD_LAMMPS_userguide.pdf>`_ to use Smooth Mach
 Dynamics in LAMMPS.
 
-**Restart, fix\_modify, output, run start/stop, minimize info:**
+**Restart, fix_modify, output, run start/stop, minimize info:**
 
 Currently, no part of USER-SMD supports restarting nor minimization.
 
 Restrictions
 """"""""""""
 
-
 This fix is part of the USER-SMD package.  It is only enabled if
 LAMMPS was built with that package.  See the :doc:`Build package <Build_package>` doc page for more info.
 
 Related commands
 """"""""""""""""
 
-:doc:`smd/tlsph\_dt <compute_smd_tlsph_dt>`
+:doc:`smd/tlsph_dt <compute_smd_tlsph_dt>`
 
 **Default:** none
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/fix_smd_integrate_tlsph.rst b/doc/src/fix_smd_integrate_tlsph.rst
index 32aba62dd9..ef91414788 100644
--- a/doc/src/fix_smd_integrate_tlsph.rst
+++ b/doc/src/fix_smd_integrate_tlsph.rst
@@ -1,21 +1,19 @@
-.. index:: fix smd/integrate\_tlsph
+.. index:: fix smd/integrate_tlsph
 
-fix smd/integrate\_tlsph command
-================================
+fix smd/integrate_tlsph command
+===============================
 
 Syntax
 """"""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    fix ID group-ID smd/integrate_tlsph keyword values
 
 * ID, group-ID are documented in :doc:`fix <fix>` command
-* smd/integrate\_tlsph = style name of this fix command
+* smd/integrate_tlsph = style name of this fix command
 * zero or more keyword/value pairs may be appended
-* keyword = *limit\_velocity*
-
+* keyword = *limit_velocity*
 
 .. parsed-literal::
 
@@ -25,8 +23,7 @@ Syntax
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    fix 1 all smd/integrate_tlsph
    fix 1 all smd/integrate_tlsph limit_velocity 1000
@@ -40,11 +37,11 @@ interact according with the Total-Lagrangian SPH pair style.
 See `this PDF guide <PDF/SMD_LAMMPS_userguide.pdf>`_ to using Smooth Mach
 Dynamics in LAMMPS.
 
-The *limit\_velocity* keyword will control the velocity, scaling the
-norm of the velocity vector to max\_vel in case it exceeds this
+The *limit_velocity* keyword will control the velocity, scaling the
+norm of the velocity vector to max_vel in case it exceeds this
 velocity limit.
 
-**Restart, fix\_modify, output, run start/stop, minimize info:**
+**Restart, fix_modify, output, run start/stop, minimize info:**
 
 Currently, no part of USER-SMD supports restarting nor
 minimization. This fix has no outputs.
@@ -52,18 +49,12 @@ minimization. This fix has no outputs.
 Restrictions
 """"""""""""
 
-
 This fix is part of the USER-SMD package.  It is only enabled if
 LAMMPS was built with that package.  See the :doc:`Build package <Build_package>` doc page for more info.
 
 Related commands
 """"""""""""""""
 
-:doc:`smd/integrate\_ulsph <fix_smd_integrate_ulsph>`
+:doc:`smd/integrate_ulsph <fix_smd_integrate_ulsph>`
 
 **Default:** none
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/fix_smd_integrate_ulsph.rst b/doc/src/fix_smd_integrate_ulsph.rst
index 216e8652bd..c355abf17b 100644
--- a/doc/src/fix_smd_integrate_ulsph.rst
+++ b/doc/src/fix_smd_integrate_ulsph.rst
@@ -1,33 +1,31 @@
-.. index:: fix smd/integrate\_ulsph
+.. index:: fix smd/integrate_ulsph
 
-fix smd/integrate\_ulsph command
+fix smd/integrate_ulsph command
 ================================
 
 Syntax
 """"""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    fix ID group-ID smd/integrate_ulsph keyword
 
 * ID, group-ID are documented in :doc:`fix <fix>` command
-* smd/integrate\_ulsph = style name of this fix command
+* smd/integrate_ulsph = style name of this fix command
 * zero or more keyword/value pairs may be appended
-* keyword = adjust\_radius or limit\_velocity
+* keyword = adjust_radius or limit_velocity
 
-adjust\_radius values = adjust\_radius\_factor min\_nn max\_nn
-      adjust\_radius\_factor = factor which scale the smooth/kernel radius
-      min\_nn = minimum number of neighbors
-      max\_nn = maximum number of neighbors
-limit\_velocity values = max\_velocity
-      max\_velocity = maximum allowed velocity.
+adjust_radius values = adjust_radius_factor min_nn max_nn
+      adjust_radius_factor = factor which scale the smooth/kernel radius
+      min_nn = minimum number of neighbors
+      max_nn = maximum number of neighbors
+limit_velocity values = max_velocity
+      max_velocity = maximum allowed velocity.
 
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    fix 1 all smd/integrate_ulsph adjust_radius 1.02 25 50
    fix 1 all smd/integrate_ulsph limit_velocity 1000
@@ -41,17 +39,17 @@ interact with the updated Lagrangian SPH pair style.
 See `this PDF guide <PDF/SMD_LAMMPS_userguide.pdf>`_ to using Smooth Mach
 Dynamics in LAMMPS.
 
-The *adjust\_radius* keyword activates dynamic adjustment of the
+The *adjust_radius* keyword activates dynamic adjustment of the
 per-particle SPH smoothing kernel radius such that the number of
-neighbors per particles remains within the interval *min\_nn* to
-*max\_nn*. The parameter *adjust\_radius\_factor* determines the amount
-of adjustment per timestep. Typical values are *adjust\_radius\_factor*
-=1.02, *min\_nn* =15, and *max\_nn* =20.
+neighbors per particles remains within the interval *min_nn* to
+*max_nn*. The parameter *adjust_radius_factor* determines the amount
+of adjustment per timestep. Typical values are *adjust_radius_factor*
+=1.02, *min_nn* =15, and *max_nn* =20.
 
-The *limit\_velocity* keyword will control the velocity, scaling the norm of
-the velocity vector to max\_vel in case it exceeds this velocity limit.
+The *limit_velocity* keyword will control the velocity, scaling the norm of
+the velocity vector to max_vel in case it exceeds this velocity limit.
 
-**Restart, fix\_modify, output, run start/stop, minimize info:**
+**Restart, fix_modify, output, run start/stop, minimize info:**
 
 Currently, no part of USER-SMD supports restarting nor
 minimization. This fix has no outputs.
@@ -59,15 +57,9 @@ minimization. This fix has no outputs.
 Restrictions
 """"""""""""
 
-
 This fix is part of the USER-SMD package.  It is only enabled if
 LAMMPS was built with that package.  See the :doc:`Build package <Build_package>` doc page for more info.
 
 **Related commands:** none
 
 **Default:** none
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/fix_smd_move_triangulated_surface.rst b/doc/src/fix_smd_move_triangulated_surface.rst
index 866a799d45..3aa40a75c2 100644
--- a/doc/src/fix_smd_move_triangulated_surface.rst
+++ b/doc/src/fix_smd_move_triangulated_surface.rst
@@ -1,22 +1,21 @@
-.. index:: fix smd/move\_tri\_surf
+.. index:: fix smd/move_tri_surf
 
-fix smd/move\_tri\_surf command
-===============================
+fix smd/move_tri_surf command
+=============================
 
 Syntax
 """"""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    fix ID group-ID smd/move_tri_surf keyword
 
 * ID, group-ID are documented in :doc:`fix <fix>` command
-* smd/move\_tri\_surf keyword = style name of this fix command
+* smd/move_tri_surf keyword = style name of this fix command
 * keyword = *\*LINEAR* or *\*WIGGLE* or *\*ROTATE*
-  
+
   .. parsed-literal::
-  
+
         *\*LINEAR* args = Vx Vy Vz
            Vx,Vy,Vz = components of velocity vector (velocity units), any component can be specified as NULL
         *\*WIGGLE* args = Vx Vy Vz max_travel
@@ -27,23 +26,20 @@ Syntax
            Rx,Ry,Rz = axis of rotation vector
            period = period of rotation (time units)
 
-
-
 Examples
 """"""""
 
+.. code-block:: LAMMPS
 
-.. parsed-literal::
-
-   fix 1 tool smd/move_tri_surf \*LINEAR 20 20 10
-   fix 2 tool smd/move_tri_surf \*WIGGLE 20 20 10
-   fix 2 tool smd/move_tri_surf \*ROTATE 0 0 0 5 2 1
+   fix 1 tool smd/move_tri_surf *LINEAR 20 20 10
+   fix 2 tool smd/move_tri_surf *WIGGLE 20 20 10
+   fix 2 tool smd/move_tri_surf *ROTATE 0 0 0 5 2 1
 
 Description
 """""""""""
 
 This fix applies only to rigid surfaces read from .STL files via fix
-:doc:`smd/wall\_surface <fix_smd_wall_surface>` .  It updates position
+:doc:`smd/wall_surface <fix_smd_wall_surface>` .  It updates position
 and velocity for the particles in the group each timestep without
 regard to forces on the particles.  The rigid surfaces can thus be
 moved along simple trajectories during the simulation.
@@ -54,7 +50,7 @@ to V = (Vx,Vy,Vz).
 
 The *\*WIGGLE* style moves particles in an oscillatory fashion.
 Particles are moved along (vx, vy, vz) with constant velocity until a
-displacement of max\_travel is reached. Then, the velocity vector is
+displacement of max_travel is reached. Then, the velocity vector is
 reversed. This process is repeated.
 
 The *\*ROTATE* style rotates particles around a rotation axis R =
@@ -67,7 +63,7 @@ rotation axis to the particle.
 See `this PDF guide <PDF/SMD_LAMMPS_userguide.pdf>`_ to using Smooth Mach
 Dynamics in LAMMPS.
 
-**Restart, fix\_modify, output, run start/stop, minimize info:**
+**Restart, fix_modify, output, run start/stop, minimize info:**
 
 Currently, no part of USER-SMD supports restarting nor
 minimization. This fix has no outputs.
@@ -75,19 +71,13 @@ minimization. This fix has no outputs.
 Restrictions
 """"""""""""
 
-
 This fix is part of the USER-SMD package.  It is only enabled if
 LAMMPS was built with that package.  See the :doc:`Build package <Build_package>` doc page for more info.
 
 Related commands
 """"""""""""""""
 
-:doc:`smd/triangle\_mesh\_vertices <compute_smd_triangle_vertices>`,
-:doc:`smd/wall\_surface <fix_smd_wall_surface>`
+:doc:`smd/triangle_mesh_vertices <compute_smd_triangle_vertices>`,
+:doc:`smd/wall_surface <fix_smd_wall_surface>`
 
 **Default:** none
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/fix_smd_setvel.rst b/doc/src/fix_smd_setvel.rst
index 22cf1dff53..eb92f435e1 100644
--- a/doc/src/fix_smd_setvel.rst
+++ b/doc/src/fix_smd_setvel.rst
@@ -6,7 +6,6 @@ fix smd/setvel command
 Syntax
 """"""
 
-
 .. parsed-literal::
 
    fix ID group-ID smd/setvel vx vy vz keyword value ...
@@ -17,21 +16,18 @@ Syntax
 * any of vx,vy,vz can be a variable (see below)
 * zero or more keyword/value pairs may be appended to args
 * keyword = *region*
-  
+
   .. parsed-literal::
-  
+
        *region* value = region-ID
          region-ID = ID of region particles must be in to have their velocities set
 
-
-
 Examples
 """"""""
 
+.. code-block:: LAMMPS
 
-.. parsed-literal::
-
-   fix top_velocity top_group setvel 1.0 0.0 0.0
+   fix top_velocity top_group smd/setvel 1.0 0.0 0.0
 
 Description
 """""""""""
@@ -48,7 +44,7 @@ This fix is indented to be used together with a time integration fix.
 Any of the 3 quantities defining the velocity components can be specified
 as an equal-style or atom-style :doc:`variable <variable>`, namely *vx*\ ,
 *vy*\ , *vz*\ .  If the value is a variable, it should be specified as
-v\_name, where name is the variable name.  In this case, the variable
+v_name, where name is the variable name.  In this case, the variable
 will be evaluated each timestep, and its value used to determine the
 force component.
 
@@ -65,11 +61,9 @@ field with optional time-dependence as well.
 If the *region* keyword is used, the particle must also be in the
 specified geometric :doc:`region <region>` in order to have its velocity set by this command.
 
-
 ----------
 
-
-**Restart, fix\_modify, output, run start/stop, minimize info:**
+**Restart, fix_modify, output, run start/stop, minimize info:**
 
 Currently, no part of USER-SMD supports restarting nor minimization
 None of the :doc:`fix_modify <fix_modify>` options
@@ -86,15 +80,9 @@ the :doc:`run <run>` command.
 Restrictions
 """"""""""""
 
-
 This fix is part of the USER-SMD package.  It is only enabled if
 LAMMPS was built with that package.  See the :doc:`Build package <Build_package>` doc page for more info.
 
 **Related commands:** none
 
 **Default:** none
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/fix_smd_wall_surface.rst b/doc/src/fix_smd_wall_surface.rst
index d3c98e3088..6bebcdf6c2 100644
--- a/doc/src/fix_smd_wall_surface.rst
+++ b/doc/src/fix_smd_wall_surface.rst
@@ -1,22 +1,21 @@
-.. index:: fix smd/wall\_surface
+.. index:: fix smd/wall_surface
 
-fix smd/wall\_surface command
-=============================
+fix smd/wall_surface command
+============================
 
 Syntax
 """"""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    fix ID group-ID smd/wall_surface arg type mol-ID
 
 * ID, group-ID are documented in :doc:`fix <fix>` command
-* smd/wall\_surface = style name of this fix command
+* smd/wall_surface = style name of this fix command
 * arg = *file*
-  
+
   .. parsed-literal::
-  
+
         *file* = file name of a triangular mesh in stl format
 
 * type = particle type to be given to the new particles created by this fix
@@ -25,8 +24,7 @@ Syntax
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    fix stl_surf all smd/wall_surface tool.stl 2 65535
 
@@ -40,19 +38,19 @@ the new particle is that of the minimum circle which encompasses the
 triangle vertices.
 
 The triangulated surface can be used as a complex rigid wall via the
-:doc:`smd/tri\_surface <pair_smd_triangulated_surface>` pair style.  It
+:doc:`smd/tri_surface <pair_smd_triangulated_surface>` pair style.  It
 is possible to move the triangulated surface via the
-:doc:`smd/move\_tri\_surf <fix_smd_move_triangulated_surface>` fix style.
+:doc:`smd/move_tri_surf <fix_smd_move_triangulated_surface>` fix style.
 
 Immediately after a .STL file has been read, the simulation needs to
 be run for 0 timesteps in order to properly register the new particles
-in the system. See the "funnel\_flow" example in the USER-SMD examples
+in the system. See the "funnel_flow" example in the USER-SMD examples
 directory.
 
 See `this PDF guide <PDF/SMD_LAMMPS_userguide.pdf>`_ to use Smooth Mach
 Dynamics in LAMMPS.
 
-**Restart, fix\_modify, output, run start/stop, minimize info:**
+**Restart, fix_modify, output, run start/stop, minimize info:**
 
 Currently, no part of USER-SMD supports restarting nor
 minimization. This fix has no outputs.
@@ -60,7 +58,6 @@ minimization. This fix has no outputs.
 Restrictions
 """"""""""""
 
-
 This fix is part of the USER-SMD package.  It is only enabled if
 LAMMPS was built with that package.  See the :doc:`Build package <Build_package>` doc page for more info.
 
@@ -74,13 +71,8 @@ multiple objects in one file.
 Related commands
 """"""""""""""""
 
-:doc:`smd/triangle\_mesh\_vertices <compute_smd_triangle_vertices>`,
-:doc:`smd/move\_tri\_surf <fix_smd_move_triangulated_surface>`,
-:doc:`smd/tri\_surface <pair_smd_triangulated_surface>`
+:doc:`smd/triangle_mesh_vertices <compute_smd_triangle_vertices>`,
+:doc:`smd/move_tri_surf <fix_smd_move_triangulated_surface>`,
+:doc:`smd/tri_surface <pair_smd_triangulated_surface>`
 
 **Default:** none
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/fix_spring.rst b/doc/src/fix_spring.rst
index c3621cab3f..518b4d2302 100644
--- a/doc/src/fix_spring.rst
+++ b/doc/src/fix_spring.rst
@@ -6,7 +6,6 @@ fix spring command
 Syntax
 """"""
 
-
 .. parsed-literal::
 
    fix ID group-ID spring keyword values
@@ -14,9 +13,9 @@ Syntax
 * ID, group-ID are documented in :doc:`fix <fix>` command
 * spring = style name of this fix command
 * keyword = *tether* or *couple*
-  
+
   .. parsed-literal::
-  
+
        *tether* values = K x y z R0
          K = spring constant (force/distance units)
          x,y,z = point to which spring is tethered
@@ -27,13 +26,10 @@ Syntax
          x,y,z = direction of spring
          R0 = equilibrium distance of spring (distance units)
 
-
-
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    fix pull ligand spring tether 50.0 0.0 0.0 0.0 0.0
    fix pull ligand spring tether 50.0 0.0 0.0 0.0 5.0
@@ -49,7 +45,7 @@ Apply a spring force to a group of atoms or between two groups of
 atoms.  This is useful for applying an umbrella force to a small
 molecule or lightly tethering a large group of atoms (e.g. all the
 solvent or a large molecule) to the center of the simulation box so
-that it doesn't wander away over the course of a long simulation.  It
+that it does not wander away over the course of a long simulation.  It
 can also be used to hold the centers of mass of two groups of atoms at
 a given distance or orientation with respect to each other.
 
@@ -101,7 +97,7 @@ last example holds the ion a distance 5 away from the pore axis
    spring connecting two groups or a group and the tether point can cross
    a periodic boundary and its length be calculated correctly.
 
-**Restart, fix\_modify, output, run start/stop, minimize info:**
+**Restart, fix_modify, output, run start/stop, minimize info:**
 
 No information about this fix is written to :doc:`binary restart files <restart>`.
 
@@ -154,8 +150,3 @@ Related commands
 :doc:`fix spring/rg <fix_spring_rg>`, :doc:`fix smd <fix_smd>`
 
 **Default:** none
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/fix_spring_chunk.rst b/doc/src/fix_spring_chunk.rst
index d645519add..d839d9158c 100644
--- a/doc/src/fix_spring_chunk.rst
+++ b/doc/src/fix_spring_chunk.rst
@@ -6,7 +6,6 @@ fix spring/chunk command
 Syntax
 """"""
 
-
 .. parsed-literal::
 
    fix ID group-ID spring/chunk K chunkID comID
@@ -20,8 +19,7 @@ Syntax
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    fix restrain all spring/chunk 100 chunkID comID
 
@@ -50,7 +48,7 @@ chunk.  Note that *K* thus represents the spring constant for the
 total force on each chunk of atoms, not for a spring applied to each
 atom.
 
-**Restart, fix\_modify, output, run start/stop, minimize info:**
+**Restart, fix_modify, output, run start/stop, minimize info:**
 
 No information about this fix is written to :doc:`binary restart files <restart>`.
 
@@ -92,8 +90,3 @@ Related commands
 :doc:`fix spring/rg <fix_spring_rg>`
 
 **Default:** none
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/fix_spring_rg.rst b/doc/src/fix_spring_rg.rst
index 59007b6cb6..962e780f7f 100644
--- a/doc/src/fix_spring_rg.rst
+++ b/doc/src/fix_spring_rg.rst
@@ -6,7 +6,6 @@ fix spring/rg command
 Syntax
 """"""
 
-
 .. parsed-literal::
 
    fix ID group-ID spring/rg K RG0
@@ -16,7 +15,6 @@ Syntax
 * K = harmonic force constant (force/distance units)
 * RG0 = target radius of gyration to constrain to (distance units)
 
-
 .. parsed-literal::
 
      if RG0 = NULL, use the current RG as the target value
@@ -24,8 +22,7 @@ Syntax
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    fix 1 protein spring/rg 5.0 10.0
    fix 2 micelle spring/rg 5.0 NULL
@@ -44,18 +41,23 @@ energy of the constraint and associated force on each atom is given by
 the second and third formulas, when the group is at a different RG
 than the target value RG0.
 
-.. image:: Eqs/fix_spring_rg.jpg
-   :align: center
+.. math::
 
-The (xi - center-of-mass) term is computed taking into account
-periodic boundary conditions, m\_i is the mass of the atom, and M is
-the mass of the entire group.  Note that K is thus a force constant
+   {R_G}^2 & = \frac{1}{M}\sum_{i}^{N}{m_{i}\left( x_{i} -
+   \frac{1}{M}\sum_{j}^{N}{m_{j}x_{j}} \right)^{2}} \\
+   E & = K\left( R_G - R_{G0} \right)^{2} \\
+   F_{i} & = 2K\frac{m_{i}}{M}\left( 1-\frac{R_{G0}}{R_G}
+   \right)\left( x_{i} - \frac{1}{M}\sum_{j}^{N}{m_{j}x_{j}} \right)
+
+The (:math:`x_i` - center-of-mass) term is computed taking into account
+periodic boundary conditions, :math:`m_i` is the mass of the atom, and
+*M* is the mass of the entire group.  Note that K is thus a force constant
 for the aggregate force on the group of atoms, not a per-atom force.
 
-If RG0 is specified as NULL, then the RG of the group is computed at
+If :math:`R_{G0}` is specified as NULL, then the RG of the group is computed at
 the time the fix is specified, and that value is used as the target.
 
-**Restart, fix\_modify, output, run start/stop, minimize info:**
+**Restart, fix_modify, output, run start/stop, minimize info:**
 
 No information about this fix is written to :doc:`binary restart files <restart>`.  None of the :doc:`fix_modify <fix_modify>` options
 are relevant to this fix.  No global or per-atom quantities are stored
@@ -78,8 +80,3 @@ Related commands
 :doc:`fix drag <fix_drag>`, :doc:`fix smd <fix_smd>`
 
 **Default:** none
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/fix_spring_self.rst b/doc/src/fix_spring_self.rst
index d9720f0e7c..38da0013b1 100644
--- a/doc/src/fix_spring_self.rst
+++ b/doc/src/fix_spring_self.rst
@@ -6,7 +6,6 @@ fix spring/self command
 Syntax
 """"""
 
-
 .. parsed-literal::
 
    fix ID group-ID spring/self K dir
@@ -19,8 +18,7 @@ Syntax
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    fix tether boundary-atoms spring/self 10.0
    fix zrest  move spring/self 10.0 z
@@ -43,7 +41,7 @@ directions, but it can be limited to the xy-, xz-, yz-plane and the
 x-, y-, or z-direction, thus restraining the atoms to a line or a
 plane, respectively.
 
-**Restart, fix\_modify, output, run start/stop, minimize info:**
+**Restart, fix_modify, output, run start/stop, minimize info:**
 
 This fix writes the original coordinates of tethered atoms to :doc:`binary restart files <restart>`, so that the spring effect will be the
 same in a restarted simulation.  See the
@@ -89,8 +87,3 @@ Related commands
 :doc:`fix smd <fix_smd>`, :doc:`fix spring/rg <fix_spring_rg>`
 
 **Default:** none
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/fix_srd.rst b/doc/src/fix_srd.rst
index 6232c345a1..70f07cc0bf 100644
--- a/doc/src/fix_srd.rst
+++ b/doc/src/fix_srd.rst
@@ -6,7 +6,6 @@ fix srd command
 Syntax
 """"""
 
-
 .. parsed-literal::
 
    fix ID group-ID srd N groupbig-ID Tsrd hgrid seed keyword value ...
@@ -21,9 +20,9 @@ Syntax
 
 * zero or more keyword/value pairs may be appended
 * keyword = *lamda* or *collision* or *overlap* or *inside* or *exact* or *radius* or *bounce* or *search* or *cubic* or *shift* or *tstat* or *rescale*
-  
+
   .. parsed-literal::
-  
+
        *lamda* value = mean free path of SRD particles (distance units)
        *collision* value = *noslip* or *slip* = collision model
        *overlap* value = *yes* or *no* = whether big particles may overlap
@@ -48,13 +47,10 @@ Syntax
          *rotate* = rescale during velocity rotation, but not collisions
          *collide* = rescale during collisions, but not velocity rotation
 
-
-
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    fix 1 srd srd 10 big 1.0 0.25 482984
    fix 1 srd srd 10 big 0.5 0.25 482984 collision slip search 0.5
@@ -84,36 +80,36 @@ the implementation and usage of mixture systems (solute particles in
 an SRD fluid).  See the examples/srd directory for sample input
 scripts using SRD particles in both settings.
 
-This fix does 2 things:
+This fix does two things:
 
-(1) It advects the SRD particles, performing collisions between SRD
-and big particles or walls every timestep, imparting force and torque
-to the big particles.  Collisions also change the position and
-velocity of SRD particles.
+  1. It advects the SRD particles, performing collisions between SRD
+     and big particles or walls every timestep, imparting force and torque
+     to the big particles.  Collisions also change the position and
+     velocity of SRD particles.
 
-(2) It resets the velocity distribution of SRD particles via random
-rotations every N timesteps.
+  2. It resets the velocity distribution of SRD particles via random
+     rotations every N timesteps.
 
 SRD particles have a mass, temperature, characteristic timestep
-dt\_SRD, and mean free path between collisions (lamda).  The
-fundamental equation relating these 4 quantities is
+:math:`dt_{SRD}`, and mean free path between collisions
+(:math:`\lambda`).  The fundamental equation relating these 4 quantities
+is
 
+.. math::
 
-.. parsed-literal::
+   \lambda = dt_{SRD} \sqrt{\frac{k_B T_{SRD}}{m}}
 
-   lamda = dt_SRD \* sqrt(Kboltz \* Tsrd / mass)
-
-The mass of SRD particles is set by the :doc:`mass <mass>` command
-elsewhere in the input script.  The SRD timestep dt\_SRD is N times the
-step dt defined by the :doc:`timestep <timestep>` command.  Big
-particles move in the normal way via a time integration :doc:`fix <fix>`
-with a short timestep dt.  SRD particles advect with a large timestep
-dt\_SRD >= dt.
+The mass *m* of SRD particles is set by the :doc:`mass <mass>` command
+elsewhere in the input script.  The SRD timestep :math:`dt_{SRD}` is N
+times the step *dt* defined by the :doc:`timestep <timestep>` command.
+Big particles move in the normal way via a time integration :doc:`fix
+<fix>` with a short timestep dt.  SRD particles advect with a large
+timestep :math:`dt_{SRD} \ge dt`.
 
 If the *lamda* keyword is not specified, the SRD temperature
-*Tsrd* is used in the above formula to compute lamda.  If the *lamda*
-keyword is specified, then the *Tsrd* setting is ignored and the above
-equation is used to compute the SRD temperature.
+:math:`T_{SRD}` is used in the above formula to compute :math:`\lambda`.
+If the *lamda* keyword is specified, then the *Tsrd* setting is ignored
+and the above equation is used to compute the SRD temperature.
 
 The characteristic length scale for the SRD fluid is set by *hgrid*
 which is used to bin SRD particles for purposes of resetting their
@@ -121,13 +117,14 @@ velocities.  Normally hgrid is set to be 1/4 of the big particle
 diameter or smaller, to adequately resolve fluid properties around the
 big particles.
 
-Lamda cannot be smaller than 0.6 \* hgrid, else an error is generated
-(unless the *shift* keyword is used, see below).  The velocities of
-SRD particles are bounded by Vmax, which is set so that an SRD
-particle will not advect further than Dmax = 4\*lamda in dt\_SRD.  This
-means that roughly speaking, Dmax should not be larger than a big
-particle diameter, else SRDs may pass through big particles without
-colliding.  A warning is generated if this is the case.
+:math:`\lambda` cannot be smaller than 0.6 \* hgrid, else an error is
+generated (unless the *shift* keyword is used, see below).  The
+velocities of SRD particles are bounded by Vmax, which is set so that an
+SRD particle will not advect further than :math:`D_{max} = 4 \lambda` in
+:math:`dt_{SRD}`.  This means that roughly speaking, :math:`D_{max}`
+should not be larger than a big particle diameter, else SRDs may pass
+through big particles without colliding.  A warning is generated if this
+is the case.
 
 Collisions between SRD particles and big particles or walls are
 modeled as a lightweight SRD point particle hitting a heavy big
@@ -153,18 +150,17 @@ SRD velocity is chosen randomly.  This collision style imparts torque
 to a big particle.  Thus a time integrator :doc:`fix <fix>` that rotates
 the big particles appropriately should be used.
 
-
 ----------
 
-
 The *overlap* keyword should be set to *yes* if two (or more) big
 particles can ever overlap.  This depends on the pair potential
 interaction used for big-big interactions, or could be the case if
-multiple big particles are held together as rigid bodies via the :doc:`fix rigid <fix_rigid>` command.  If the *overlap* keyword is *no* and
-big particles do in fact overlap, then SRD/big collisions can generate
-an error if an SRD ends up inside two (or more) big particles at once.
-How this error is treated is determined by the *inside* keyword.
-Running with *overlap* set to *no* allows for faster collision
+multiple big particles are held together as rigid bodies via the
+:doc:`fix rigid <fix_rigid>` command.  If the *overlap* keyword is *no*
+and big particles do in fact overlap, then SRD/big collisions can
+generate an error if an SRD ends up inside two (or more) big particles
+at once.  How this error is treated is determined by the *inside*
+keyword.  Running with *overlap* set to *no* allows for faster collision
 checking, so it should only be set to *yes* if needed.
 
 The *inside* keyword determines how a collision is treated if the
@@ -201,10 +197,8 @@ bounces between nearby big particles.  Note that if the limit is
 reached, the SRD can be left inside a big particle.  A setting of 0 is
 the same as no limit.
 
-
 ----------
 
-
 There are 2 kinds of bins created and maintained when running an SRD
 simulation.  The first are "SRD bins" which are used to bin SRD
 particles and reset their velocities, as discussed above.  The second
@@ -258,30 +252,30 @@ warning is generated.
    reneighboring.  Note that changing the SRD bin size may alter the
    properties of the SRD fluid, such as its viscosity.
 
-The *shift* keyword determines whether the coordinates of SRD
-particles are randomly shifted when binned for purposes of rotating
-their velocities.  When no shifting is performed, SRD particles are
-binned and the velocity distribution of the set of SRD particles in
-each bin is adjusted via a rotation operator.  This is a statistically
-valid operation if SRD particles move sufficiently far between
-successive rotations.  This is determined by their mean-free path
-lamda.  If lamda is less than 0.6 of the SRD bin size, then shifting
-is required.  A shift means that all of the SRD particles are shifted
-by a vector whose coordinates are chosen randomly in the range [-1/2
-bin size, 1/2 bin size].  Note that all particles are shifted by the
-same vector.  The specified random number *shiftseed* is used to
-generate these vectors.  This operation sufficiently randomizes which
-SRD particles are in the same bin, even if lamda is small.
+The *shift* keyword determines whether the coordinates of SRD particles
+are randomly shifted when binned for purposes of rotating their
+velocities.  When no shifting is performed, SRD particles are binned and
+the velocity distribution of the set of SRD particles in each bin is
+adjusted via a rotation operator.  This is a statistically valid
+operation if SRD particles move sufficiently far between successive
+rotations.  This is determined by their mean-free path :math:`\lambda`.
+If :math:`\lambda` is less than 0.6 of the SRD bin size, then shifting
+is required.  A shift means that all of the SRD particles are shifted by
+a vector whose coordinates are chosen randomly in the range [-1/2 bin
+size, 1/2 bin size].  Note that all particles are shifted by the same
+vector.  The specified random number *shiftseed* is used to generate
+these vectors.  This operation sufficiently randomizes which SRD
+particles are in the same bin, even if :math:`lambda` is small.
 
 If the *shift* flag is set to *no*\ , then no shifting is performed, but
-bin data will be communicated if bins overlap processor boundaries.
-An error will be generated if lamda < 0.6 of the SRD bin size.  If the
-*shift* flag is set to *possible*\ , then shifting is performed only if
-lamda < 0.6 of the SRD bin size.  A warning is generated to let you
-know this is occurring.  If the *shift* flag is set to *yes* then
-shifting is performed regardless of the magnitude of lamda.  Note that
-the *shiftseed* is not used if the *shift* flag is set to *no*\ , but
-must still be specified.
+bin data will be communicated if bins overlap processor boundaries.  An
+error will be generated if :math:`\lambda < 0.6` of the SRD bin size.
+If the *shift* flag is set to *possible*\ , then shifting is performed
+only if :math:`\lambda < 0.6` of the SRD bin size.  A warning is
+generated to let you know this is occurring.  If the *shift* flag is set
+to *yes* then shifting is performed regardless of the magnitude of
+:math:`\lambda`.  Note that the *shiftseed* is not used if the *shift*
+flag is set to *no*\ , but must still be specified.
 
 Note that shifting of SRD coordinates requires extra communication,
 hence it should not normally be enabled unless required.
@@ -319,10 +313,8 @@ rescaling off during collisions and the per-bin velocity rotation
 operation.  The *collide* and *rotate* values turn it on for
 one of the operations and off for the other.
 
-
 ----------
 
-
 .. note::
 
    This fix is normally used for simulations with a huge number of
@@ -342,15 +334,13 @@ interactions is specified, the :doc:`pair_coeff <pair_coeff>` command
 should be used to turn off big/SRD interactions, e.g. by setting their
 epsilon or cutoff length to 0.0.
 
-The "delete\_atoms overlap" command may be useful in setting up an SRD
+The "delete_atoms overlap" command may be useful in setting up an SRD
 simulation to insure there are no initial overlaps between big and SRD
 particles.
 
-
 ----------
 
-
-**Restart, fix\_modify, output, run start/stop, minimize info:**
+**Restart, fix_modify, output, run start/stop, minimize info:**
 
 No information about this fix is written to :doc:`binary restart files <restart>`.  None of the :doc:`fix_modify <fix_modify>` options
 are relevant to this fix.
@@ -385,7 +375,6 @@ the :doc:`run <run>` command.  This fix is not invoked during :doc:`energy minim
 Restrictions
 """"""""""""
 
-
 This command can only be used if LAMMPS was built with the SRD
 package.  See the :doc:`Build package <Build_package>` doc
 page for more info.
@@ -398,35 +387,22 @@ Related commands
 Default
 """""""
 
-The option defaults are lamda inferred from Tsrd, collision = noslip,
-overlap = no, inside = error, exact = yes, radius = 1.0, bounce = 0,
-search = hgrid, cubic = error 0.01, shift = no, tstat = no, and
-rescale = yes.
-
+The option defaults are: *lamda* (:math:`\lambda`) is inferred from *Tsrd*,
+collision = noslip, overlap = no, inside = error, exact = yes, radius =
+1.0, bounce = 0, search = hgrid, cubic = error 0.01, shift = no, tstat =
+no, and rescale = yes.
 
 ----------
 
-
 .. _Hecht:
 
-
-
 **(Hecht)** Hecht, Harting, Ihle, Herrmann, Phys Rev E, 72, 011408 (2005).
 
 .. _Petersen1:
 
-
-
 **(Petersen)** Petersen, Lechman, Plimpton, Grest, in' t Veld, Schunk, J
 Chem Phys, 132, 174106 (2010).
 
 .. _Lechman:
 
-
-
 **(Lechman)** Lechman, et al, in preparation (2010).
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/fix_store_force.rst b/doc/src/fix_store_force.rst
index 5d96ee26fe..d9ccd162fd 100644
--- a/doc/src/fix_store_force.rst
+++ b/doc/src/fix_store_force.rst
@@ -6,7 +6,6 @@ fix store/force command
 Syntax
 """"""
 
-
 .. parsed-literal::
 
    fix ID group-ID store/force
@@ -17,8 +16,7 @@ Syntax
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    fix 1 all store/force
 
@@ -51,7 +49,7 @@ potentially modify the force on each atom.  Examples of such fixes are
    to include certain constraints (e.g. fix shake) in the stored force,
    then it could be specified after some fixes and before others.
 
-**Restart, fix\_modify, output, run start/stop, minimize info:**
+**Restart, fix_modify, output, run start/stop, minimize info:**
 
 No information about this fix is written to :doc:`binary restart files <restart>`.  None of the :doc:`fix_modify <fix_modify>` options
 are relevant to this fix.
@@ -71,11 +69,6 @@ Restrictions
 Related commands
 """"""""""""""""
 
-:doc:`fix store\_state <fix_store_state>`
+:doc:`fix store_state <fix_store_state>`
 
 **Default:** none
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/fix_store_state.rst b/doc/src/fix_store_state.rst
index 15cad5bc81..b8fee6b5ea 100644
--- a/doc/src/fix_store_state.rst
+++ b/doc/src/fix_store_state.rst
@@ -6,7 +6,6 @@ fix store/state command
 Syntax
 """"""
 
-
 .. parsed-literal::
 
    fix ID group-ID store/state N input1 input2 ... keyword value ...
@@ -15,9 +14,9 @@ Syntax
 * store/state = style name of this fix command
 * N = store atom attributes every N steps, N = 0 for initial store only
 * input = one or more atom attributes
-  
+
   .. parsed-literal::
-  
+
        possible attributes = id, mol, type, mass,
                              x, y, z, xs, ys, zs, xu, yu, zu, xsu, ysu, zsu, ix, iy, iz,
                              vx, vy, vz, fx, fy, fz,
@@ -27,9 +26,8 @@ Syntax
                              c_ID, c_ID[N], f_ID, f_ID[N], v_name,
                              d_name, i_name
 
-  
   .. parsed-literal::
-  
+
            id = atom ID
            mol = molecule ID
            type = atom type
@@ -58,18 +56,15 @@ Syntax
 
 * zero or more keyword/value pairs may be appended
 * keyword = *com*
-  
+
   .. parsed-literal::
-  
+
        *com* value = *yes* or *no*
 
-
-
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    fix 1 all store/state 0 x y z
    fix 1 all store/state 0 xu yu zu com yes
@@ -107,7 +102,7 @@ The requested values are stored in a per-atom vector or array as
 discussed below.  Zeroes are stored for atoms not in the specified
 group.
 
-**Restart, fix\_modify, output, run start/stop, minimize info:**
+**Restart, fix_modify, output, run start/stop, minimize info:**
 
 This fix writes the per-atom values it stores to :doc:`binary restart files <restart>`, so that the values can be restored when a
 simulation is restarted.  See the :doc:`read_restart <read_restart>`
@@ -141,8 +136,3 @@ Default
 """""""
 
 The option default is com = no.
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/fix_temp_berendsen.rst b/doc/src/fix_temp_berendsen.rst
index f378d5dac7..4913efdf53 100644
--- a/doc/src/fix_temp_berendsen.rst
+++ b/doc/src/fix_temp_berendsen.rst
@@ -6,7 +6,6 @@ fix temp/berendsen command
 Syntax
 """"""
 
-
 .. parsed-literal::
 
    fix ID group-ID temp/berendsen Tstart Tstop Tdamp
@@ -14,19 +13,17 @@ Syntax
 * ID, group-ID are documented in :doc:`fix <fix>` command
 * temp/berendsen = style name of this fix command
 * Tstart,Tstop = desired temperature at start/end of run
-  
+
   .. parsed-literal::
-  
+
        Tstart can be a variable (see below)
 
 * Tdamp = temperature damping parameter (time units)
 
-
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    fix 1 all temp/berendsen 300.0 300.0 100.0
 
@@ -53,7 +50,7 @@ of (roughly) 100 time units (tau or fmsec or psec - see the
 
 *Tstart* can be specified as an equal-style :doc:`variable <variable>`.
 In this case, the *Tstop* setting is ignored.  If the value is a
-variable, it should be specified as v\_name, where name is the variable
+variable, it should be specified as v_name, where name is the variable
 name.  In this case, the variable will be evaluated each timestep, and
 its value used to determine the target temperature.
 
@@ -87,8 +84,7 @@ This fix computes a temperature each timestep.  To do this, the fix
 creates its own compute of style "temp", as if this command had been
 issued:
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    compute fix-ID_temp group-ID temp
 
@@ -97,12 +93,12 @@ that the ID of the new compute is the fix-ID + underscore + "temp",
 and the group for the new compute is the same as the fix group.
 
 Note that this is NOT the compute used by thermodynamic output (see
-the :doc:`thermo_style <thermo_style>` command) with ID = *thermo\_temp*.
+the :doc:`thermo_style <thermo_style>` command) with ID = *thermo_temp*.
 This means you can change the attributes of this fix's temperature
 (e.g. its degrees-of-freedom) via the
 :doc:`compute_modify <compute_modify>` command or print this temperature
 during thermodynamic output via the :doc:`thermo_style custom <thermo_style>` command using the appropriate compute-ID.
-It also means that changing attributes of *thermo\_temp* will have no
+It also means that changing attributes of *thermo_temp* will have no
 effect on this fix.
 
 Like other fixes that perform thermostatting, this fix can be used
@@ -119,11 +115,9 @@ temperature is calculated taking the bias into account, bias is
 removed from each atom, thermostatting is performed on the remaining
 thermal degrees of freedom, and the bias is added back in.
 
-
 ----------
 
-
-**Restart, fix\_modify, output, run start/stop, minimize info:**
+**Restart, fix_modify, output, run start/stop, minimize info:**
 
 No information about this fix is written to :doc:`binary restart files <restart>`.
 
@@ -151,7 +145,6 @@ This fix is not invoked during :doc:`energy minimization <minimize>`.
 Restrictions
 """"""""""""
 
-
 This fix can be used with dynamic groups as defined by the
 :doc:`group <group>` command.  Likewise it can be used with groups to
 which atoms are added or deleted over time, e.g. a deposition
@@ -169,18 +162,9 @@ Related commands
 
 **Default:** none
 
-
 ----------
 
-
 .. _Berendsen2:
 
-
-
 **(Berendsen)** Berendsen, Postma, van Gunsteren, DiNola, Haak, J Chem
 Phys, 81, 3684 (1984).
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/fix_temp_csvr.rst b/doc/src/fix_temp_csvr.rst
index 27aabaab1d..cd4e5dc88f 100644
--- a/doc/src/fix_temp_csvr.rst
+++ b/doc/src/fix_temp_csvr.rst
@@ -9,33 +9,28 @@ fix temp/csld command
 Syntax
 """"""
 
-
 .. parsed-literal::
 
    fix ID group-ID temp/csvr Tstart Tstop Tdamp seed
-
    fix ID group-ID temp/csld Tstart Tstop Tdamp seed
 
 * ID, group-ID are documented in :doc:`fix <fix>` command
 * temp/csvr or temp/csld = style name of this fix command
 * Tstart,Tstop = desired temperature at start/end of run
-  
+
   .. parsed-literal::
-  
+
        Tstart can be a variable (see below)
 
 * Tdamp = temperature damping parameter (time units)
 * seed = random number seed to use for white noise (positive integer)
 
-
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    fix 1 all temp/csvr 300.0 300.0 100.0 54324
-
    fix 1 all temp/csld 100.0 300.0 10.0 123321
 
 Description
@@ -69,7 +64,7 @@ of (roughly) 100 time units (tau or fmsec or psec - see the
 
 *Tstart* can be specified as an equal-style :doc:`variable <variable>`.
 In this case, the *Tstop* setting is ignored.  If the value is a
-variable, it should be specified as v\_name, where name is the variable
+variable, it should be specified as v_name, where name is the variable
 name.  In this case, the variable will be evaluated each timestep, and
 its value used to determine the target temperature.
 
@@ -97,8 +92,7 @@ These fixes compute a temperature each timestep.  To do this, the fix
 creates its own compute of style "temp", as if this command had been
 issued:
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    compute fix-ID_temp group-ID temp
 
@@ -107,12 +101,12 @@ that the ID of the new compute is the fix-ID + underscore + "temp",
 and the group for the new compute is the same as the fix group.
 
 Note that this is NOT the compute used by thermodynamic output (see
-the :doc:`thermo_style <thermo_style>` command) with ID = *thermo\_temp*.
+the :doc:`thermo_style <thermo_style>` command) with ID = *thermo_temp*.
 This means you can change the attributes of this fix's temperature
 (e.g. its degrees-of-freedom) via the
 :doc:`compute_modify <compute_modify>` command or print this temperature
 during thermodynamic output via the :doc:`thermo_style custom <thermo_style>` command using the appropriate compute-ID.
-It also means that changing attributes of *thermo\_temp* will have no
+It also means that changing attributes of *thermo_temp* will have no
 effect on this fix.
 
 Like other fixes that perform thermostatting, these fixes can be used
@@ -129,11 +123,9 @@ temperature is calculated taking the bias into account, bias is
 removed from each atom, thermostatting is performed on the remaining
 thermal degrees of freedom, and the bias is added back in.
 
-
 ----------
 
-
-**Restart, fix\_modify, output, run start/stop, minimize info:**
+**Restart, fix_modify, output, run start/stop, minimize info:**
 
 No information about these fixes are written to :doc:`binary restart files <restart>`.
 
@@ -157,7 +149,6 @@ is "extensive".
 Restrictions
 """"""""""""
 
-
 These fixes are not compatible with :doc:`fix shake <fix_shake>`.
 
 The fix can be used with dynamic groups as defined by the
@@ -177,22 +168,12 @@ Related commands
 
 **Default:** none
 
-
 ----------
 
-
 .. _Bussi1:
 
-
-
 .. _Bussi2:
 
 **(Bussi1)** Bussi, Donadio and Parrinello, J. Chem. Phys. 126, 014101(2007)
 
-
 **(Bussi2)** Bussi and Parrinello, Phys. Rev. E 75, 056707 (2007)
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/fix_temp_rescale.rst b/doc/src/fix_temp_rescale.rst
index 13858f6043..d23006c52b 100644
--- a/doc/src/fix_temp_rescale.rst
+++ b/doc/src/fix_temp_rescale.rst
@@ -6,7 +6,6 @@ fix temp/rescale command
 Syntax
 """"""
 
-
 .. parsed-literal::
 
    fix ID group-ID temp/rescale N Tstart Tstop window fraction
@@ -15,20 +14,18 @@ Syntax
 * temp/rescale = style name of this fix command
 * N = perform rescaling every N steps
 * Tstart,Tstop = desired temperature at start/end of run (temperature units)
-  
+
   .. parsed-literal::
-  
+
        Tstart can be a variable (see below)
 
 * window = only rescale if temperature is outside this window (temperature units)
 * fraction = rescale to target temperature by this fraction
 
-
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    fix 3 flow temp/rescale 100 1.0 1.1 0.02 0.5
    fix 3 boundary temp/rescale 1 1.0 1.5 0.05 1.0
@@ -59,7 +56,7 @@ beginning and end of the run.
 
 *Tstart* can be specified as an equal-style :doc:`variable <variable>`.
 In this case, the *Tstop* setting is ignored.  If the value is a
-variable, it should be specified as v\_name, where name is the variable
+variable, it should be specified as v_name, where name is the variable
 name.  In this case, the variable will be evaluated each timestep, and
 its value used to determine the target temperature.
 
@@ -94,8 +91,7 @@ This fix computes a temperature each timestep.  To do this, the fix
 creates its own compute of style "temp", as if one of this command had
 been issued:
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    compute fix-ID_temp group-ID temp
 
@@ -104,12 +100,12 @@ ID of the new compute is the fix-ID + underscore + "temp", and the
 group for the new compute is the same as the fix group.
 
 Note that this is NOT the compute used by thermodynamic output (see
-the :doc:`thermo_style <thermo_style>` command) with ID = *thermo\_temp*.
+the :doc:`thermo_style <thermo_style>` command) with ID = *thermo_temp*.
 This means you can change the attributes of this fix's temperature
 (e.g. its degrees-of-freedom) via the
 :doc:`compute_modify <compute_modify>` command or print this temperature
 during thermodynamic output via the :doc:`thermo_style custom <thermo_style>` command using the appropriate compute-ID.
-It also means that changing attributes of *thermo\_temp* will have no
+It also means that changing attributes of *thermo_temp* will have no
 effect on this fix.
 
 Like other fixes that perform thermostatting, this fix can be used
@@ -126,11 +122,9 @@ temperature is calculated taking the bias into account, bias is
 removed from each atom, thermostatting is performed on the remaining
 thermal degrees of freedom, and the bias is added back in.
 
-
 ----------
 
-
-**Restart, fix\_modify, output, run start/stop, minimize info:**
+**Restart, fix_modify, output, run start/stop, minimize info:**
 
 No information about this fix is written to :doc:`binary restart files <restart>`.
 
@@ -166,8 +160,3 @@ Related commands
 :doc:`fix_modify <fix_modify>`
 
 **Default:** none
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/fix_temp_rescale_eff.rst b/doc/src/fix_temp_rescale_eff.rst
index ef7cf8f42a..5173e6addc 100644
--- a/doc/src/fix_temp_rescale_eff.rst
+++ b/doc/src/fix_temp_rescale_eff.rst
@@ -6,7 +6,6 @@ fix temp/rescale/eff command
 Syntax
 """"""
 
-
 .. parsed-literal::
 
    fix ID group-ID temp/rescale/eff N Tstart Tstop window fraction
@@ -21,8 +20,7 @@ Syntax
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    fix 3 flow temp/rescale/eff 10 1.0 100.0 0.02 1.0
 
@@ -37,7 +35,7 @@ The operation of this fix is exactly like that described by the :doc:`fix temp/r
 is also applied to the radial electron velocity for electron
 particles.
 
-**Restart, fix\_modify, output, run start/stop, minimize info:**
+**Restart, fix_modify, output, run start/stop, minimize info:**
 
 No information about this fix is written to :doc:`binary restart files <restart>`.
 
@@ -65,7 +63,6 @@ This fix is not invoked during :doc:`energy minimization <minimize>`.
 Restrictions
 """"""""""""
 
-
 This fix is part of the USER-EFF package.  It is only enabled if
 LAMMPS was built with that package.  See the :doc:`Build package <Build_package>` doc page for more info.
 
@@ -76,8 +73,3 @@ Related commands
 :doc:`fix temp rescale <fix_temp_rescale>`,
 
 **Default:** none
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/fix_tfmc.rst b/doc/src/fix_tfmc.rst
index a5d37136ef..fe290dfc0c 100644
--- a/doc/src/fix_tfmc.rst
+++ b/doc/src/fix_tfmc.rst
@@ -6,7 +6,6 @@ fix tfmc command
 Syntax
 """"""
 
-
 .. parsed-literal::
 
    fix ID group-ID tfmc Delta Temp seed keyword value
@@ -18,20 +17,17 @@ Syntax
 * seed = random number seed (positive integer)
 * zero or more keyword/arg pairs may be appended
 * keyword = *com* or *rot*
-  
+
   .. parsed-literal::
-  
+
        *com* args = xflag yflag zflag
          xflag,yflag,zflag = 0/1 to exclude/include each dimension
        *rot* args = none
 
-
-
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    fix 1 all tfmc 0.1 1000.0 159345
    fix 1 all tfmc 0.05 600.0 658943 com 1 1 0
@@ -118,11 +114,9 @@ rotational component of the tfMC displacements after every iteration.
    external forces, and removing them will lead to a violation of
    detailed balance.
 
-
 ----------
 
-
-**Restart, fix\_modify, output, run start/stop, minimize info:**
+**Restart, fix_modify, output, run start/stop, minimize info:**
 
 No information about this fix is written to :doc:`binary restart files <restart>`.
 
@@ -134,7 +128,6 @@ This fix is not invoked during :doc:`energy minimization <minimize>`.
 Restrictions
 """"""""""""
 
-
 This fix is part of the MC package.  It is only enabled if LAMMPS was
 built with that package.  See the :doc:`Build package <Build_package>`
 doc page for more info.
@@ -151,31 +144,18 @@ Default
 
 The option default is com = 0 0 0
 
-
 ----------
 
-
 .. _Bal:
 
-
-
 **(Bal)** K. M Bal and E. C. Neyts, J. Chem. Phys. 141, 204104 (2014).
 
 .. _Mees:
 
-
-
 **(Mees)** M. J. Mees, G. Pourtois, E. C. Neyts, B. J. Thijsse, and
 A. Stesmans, Phys. Rev. B 85, 134301 (2012).
 
 .. _Neyts:
 
-
-
 **(Neyts)** E. C. Neyts and A. Bogaerts, Theor. Chem. Acc. 132, 1320
 (2013).
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/fix_thermal_conductivity.rst b/doc/src/fix_thermal_conductivity.rst
index 9682adf76a..6b8b670694 100644
--- a/doc/src/fix_thermal_conductivity.rst
+++ b/doc/src/fix_thermal_conductivity.rst
@@ -6,7 +6,6 @@ fix thermal/conductivity command
 Syntax
 """"""
 
-
 .. parsed-literal::
 
    fix ID group-ID thermal/conductivity N edim Nbin keyword value ...
@@ -18,18 +17,15 @@ Syntax
 * Nbin = # of layers in edim direction (must be even number)
 * zero or more keyword/value pairs may be appended
 * keyword = *swap*
-  
+
   .. parsed-literal::
-  
+
        *swap* value = Nswap = number of swaps to perform every N steps
 
-
-
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    fix 1 all thermal/conductivity 100 z 20
    fix 1 all thermal/conductivity 50 z 20 swap 2
@@ -67,8 +63,7 @@ this induces a temperature gradient in the system which can be
 measured using commands such as the following, which writes the
 temperature profile (assuming z = edim) to the file tmp.profile:
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    compute   ke all ke/atom
    variable  temp atom c_ke/1.5
@@ -113,7 +108,7 @@ fluid, in appropriate units.  See the :ref:`Muller-Plathe paper <Muller-Plathe1>
    accurately infer a thermal conductivity and should try increasing the
    Nevery parameter.
 
-**Restart, fix\_modify, output, run start/stop, minimize info:**
+**Restart, fix_modify, output, run start/stop, minimize info:**
 
 No information about this fix is written to :doc:`binary restart files <restart>`.  None of the :doc:`fix_modify <fix_modify>` options
 are relevant to this fix.
@@ -133,7 +128,6 @@ the :doc:`run <run>` command.  This fix is not invoked during :doc:`energy minim
 Restrictions
 """"""""""""
 
-
 This fix is part of the MISC package.  It is only enabled if LAMMPS
 was built with that package.  See the :doc:`Build package <Build_package>` doc page for more info.
 
@@ -165,24 +159,13 @@ Default
 
 The option defaults are swap = 1.
 
-
 ----------
 
-
 .. _Muller-Plathe1:
 
-
-
 **(Muller-Plathe)** Muller-Plathe, J Chem Phys, 106, 6082 (1997).
 
 .. _Zhang2:
 
-
-
 **(Zhang)** Zhang, Lussetti, de Souza, Muller-Plathe, J Phys Chem B,
 109, 15060-15067 (2005).
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/fix_ti_spring.rst b/doc/src/fix_ti_spring.rst
index 807f89b172..8bf5439e0d 100644
--- a/doc/src/fix_ti_spring.rst
+++ b/doc/src/fix_ti_spring.rst
@@ -6,7 +6,6 @@ fix ti/spring command
 Syntax
 """"""
 
-
 .. parsed-literal::
 
    fix ID group-ID ti/spring k t_s t_eq keyword value ...
@@ -14,22 +13,19 @@ Syntax
 * ID, group-ID are documented in :doc:`fix <fix>` command
 * ti/spring = style name of this fix command
 * k = spring constant (force/distance units)
-* t\_eq = number of steps for the equilibration procedure
-* t\_s = number of steps for the switching procedure
+* t_eq = number of steps for the equilibration procedure
+* t_s = number of steps for the switching procedure
 * zero or more keyword/value pairs may be appended to args
 * keyword = *function*
-  
+
   .. parsed-literal::
-  
+
        *function* value = function-ID
          function-ID = ID of the switching function (1 or 2)
 
-
-
 **Example:**
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    fix 1 all ti/spring 50.0 2000 1000 function 2
 
@@ -48,11 +44,12 @@ The thermodynamic integration procedure is performed by rescaling the
 force on each atom. Given an atomic configuration the force (F) on
 each atom is given by
 
-.. image:: Eqs/fix_ti_spring_force.jpg
-   :align: center
+.. math::
 
-where F\_solid is the force that acts on an atom due to an interatomic
-potential (\ *e.g.* EAM potential), F\_harm is the force due to the
+  F = \left( 1-\lambda \right) F_{\text{solid}} + \lambda F_{\text{harm}}
+
+where F_solid is the force that acts on an atom due to an interatomic
+potential (\ *e.g.* EAM potential), F_harm is the force due to the
 Einstein crystal harmonic spring, and lambda is the coupling parameter
 of the thermodynamic integration. An Einstein crystal is a solid where
 each atom is attached to its equilibrium position by a harmonic spring
@@ -61,15 +58,15 @@ independently to each atom in the group defined by the fix to tether
 it to its initial position. The initial position of each atom is its
 position at the time the fix command was issued.
 
-The fix acts as follows: during the first *t\_eq* steps after the fix
+The fix acts as follows: during the first *t_eq* steps after the fix
 is defined the value of lambda is zero. This is the period to
 equilibrate the system in the lambda = 0 state. After this the value
 of lambda changes dynamically during the simulation from 0 to 1
 according to the function defined using the keyword *function*
 (described below), this switching from lambda from 0 to 1 is done in
-*t\_s* steps. Then comes the second equilibration period of *t\_eq* to
+*t_s* steps. Then comes the second equilibration period of *t_eq* to
 equilibrate the system in the lambda = 1 state. After that, the
-switching back to the lambda = 0 state is made using *t\_s* timesteps
+switching back to the lambda = 0 state is made using *t_s* timesteps
 and following the same switching function. After this period the value
 of lambda is kept equal to zero and the fix has no other effect on the
 dynamics of the system.
@@ -87,15 +84,17 @@ The *function* keyword allows the use of two different lambda
 paths. Option *1* results in a constant rate of change of lambda with
 time:
 
-.. image:: Eqs/fix_ti_spring_function_1.jpg
-   :align: center
+.. math::
 
-where tau is the scaled time variable *t/t\_s*. The option *2* performs
+  \lambda(\tau) = \tau
+
+where tau is the scaled time variable *t/t_s*. The option *2* performs
 the lambda switching at a rate defined by the following switching
 function
 
-.. image:: Eqs/fix_ti_spring_function_2.jpg
-   :align: center
+.. math::
+
+  \lambda(\tau) = \tau^5 \left( 70 \tau^4 - 315 \tau^3 + 540 \tau^2 - 420 \tau + 126 \right)
 
 This function has zero slope as lambda approaches its extreme values
 (0 and 1), according to :ref:`de Koning <deKoning96>` this results in
@@ -117,7 +116,7 @@ increase in computational resources cost.
    option will *NOT* solve this problem). The Langevin thermostat (:doc:`fix langevin <fix_langevin>`) correctly thermostats the system and we
    advise its usage with ti/spring command.
 
-**Restart, fix\_modify, output, run start/stop, minimize info:**
+**Restart, fix_modify, output, run start/stop, minimize info:**
 
 This fix writes the original coordinates of tethered atoms to :doc:`binary restart files <restart>`, so that the spring effect will be the
 same in a restarted simulation. See the :doc:`read restart <read_restart>` command for info on how to re-specify a fix
@@ -157,7 +156,6 @@ Related commands
 Restrictions
 """"""""""""
 
-
 This fix is part of the USER-MISC package. It is only enabled if
 LAMMPS was built with that package. See the :doc:`Build package <Build_package>` doc page for more info.
 
@@ -166,24 +164,13 @@ Default
 
 The keyword default is function = 1.
 
-
 ----------
 
-
 .. _Freitas1:
 
-
-
 **(Freitas)** Freitas, Asta, and de Koning, Computational Materials
 Science, 112, 333 (2016).
 
 .. _deKoning96:
 
-
-
 **(de Koning)** de Koning and Antonelli, Phys Rev E, 53, 465 (1996).
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/fix_tmd.rst b/doc/src/fix_tmd.rst
index 416ab877ab..bbc99d3ba2 100644
--- a/doc/src/fix_tmd.rst
+++ b/doc/src/fix_tmd.rst
@@ -6,14 +6,13 @@ fix tmd command
 Syntax
 """"""
 
-
 .. parsed-literal::
 
    fix ID group-ID tmd rho_final file1 N file2
 
 * ID, group-ID are documented in :doc:`fix <fix>` command
 * tmd = style name of this fix command
-* rho\_final = desired value of rho at the end of the run (distance units)
+* rho_final = desired value of rho at the end of the run (distance units)
 * file1 = filename to read target structure from
 * N = dump TMD statistics every this many timesteps, 0 = no dump
 * file2 = filename to write TMD statistics to (only needed if N > 0)
@@ -21,8 +20,7 @@ Syntax
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    fix 1 all nve
    fix 2 tmdatoms tmd 1.0 target_file 100 tmd_dump_file
@@ -34,18 +32,17 @@ Perform targeted molecular dynamics (TMD) on a group of atoms.  A
 holonomic constraint is used to force the atoms to move towards (or
 away from) the target configuration.  The parameter "rho" is
 monotonically decreased (or increased) from its initial value to
-rho\_final at the end of the run.
+rho_final at the end of the run.
 
 Rho has distance units and is a measure of the root-mean-squared
 distance (RMSD) between the current configuration of the atoms in the
 group and the target coordinates listed in file1.  Thus a value of
-rho\_final = 0.0 means move the atoms all the way to the final
+rho_final = 0.0 means move the atoms all the way to the final
 structure during the course of the run.
 
 The target file1 can be ASCII text or a gzipped text file (detected by
 a .gz suffix).  The format of the target file1 is as follows:
 
-
 .. parsed-literal::
 
    0.0 25.0 xlo xhi
@@ -81,10 +78,10 @@ The atoms in the fix tmd group should be integrated (via a fix nve,
 nvt, npt) along with other atoms in the system.
 
 Restarts can be used with a fix tmd command.  For example, imagine a
-10000 timestep run with a rho\_initial = 11 and a rho\_final = 1.  If a
+10000 timestep run with a rho_initial = 11 and a rho_final = 1.  If a
 restart file was written after 2000 time steps, then the configuration
 in the file would have a rho value of 9.  A new 8000 time step run
-could be performed with the same rho\_final = 1 to complete the
+could be performed with the same rho_final = 1 to complete the
 conformational change at the same transition rate.  Note that for
 restarted runs, the name of the TMD statistics file should be changed
 to prevent it being overwritten.
@@ -92,7 +89,7 @@ to prevent it being overwritten.
 For more information about TMD, see :ref:`(Schlitter1) <Schlitter1>` and
 :ref:`(Schlitter2) <Schlitter2>`.
 
-**Restart, fix\_modify, output, run start/stop, minimize info:**
+**Restart, fix_modify, output, run start/stop, minimize info:**
 
 No information about this fix is written to :doc:`binary restart files <restart>`.  None of the :doc:`fix_modify <fix_modify>` options
 are relevant to this fix.  No global or per-atom quantities are stored
@@ -107,7 +104,6 @@ This fix is not invoked during :doc:`energy minimization <minimize>`.
 Restrictions
 """"""""""""
 
-
 All TMD fixes must be listed in the input script after all integrator
 fixes (nve, nvt, npt) are applied.  This ensures that atoms are moved
 before their positions are corrected to comply with the constraint.
@@ -118,34 +114,23 @@ are not multiple competing holonomic constraints applied to the same
 atoms.
 
 To read gzipped target files, you must compile LAMMPS with the
--DLAMMPS\_GZIP option.  See the :doc:`Build settings <Build_settings>`
+-DLAMMPS_GZIP option.  See the :doc:`Build settings <Build_settings>`
 doc page for details.
 
 **Related commands:** none
 
 **Default:** none
 
-
 ----------
 
-
 .. _Schlitter1:
 
-
-
 **(Schlitter1)** Schlitter, Swegat, Mulders, "Distance-type reaction
 coordinates for modelling activated processes", J Molecular Modeling,
 7, 171-177 (2001).
 
 .. _Schlitter2:
 
-
-
 **(Schlitter2)** Schlitter and Klahn, "The free energy of a reaction
 coordinate at multiple constraints: a concise formulation", Molecular
 Physics, 101, 3439-3443 (2003).
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/fix_ttm.rst b/doc/src/fix_ttm.rst
index 8833e0f471..ae759c1b13 100644
--- a/doc/src/fix_ttm.rst
+++ b/doc/src/fix_ttm.rst
@@ -9,19 +9,18 @@ fix ttm/mod command
 Syntax
 """"""
 
-
 .. parsed-literal::
 
    fix ID group-ID ttm seed C_e rho_e kappa_e gamma_p gamma_s v_0 Nx Ny Nz T_infile N T_outfile
    fix ID group-ID ttm/mod seed init_file Nx Ny Nz T_infile N T_outfile
 
 * ID, group-ID are documented in :doc:`fix <fix>` command
-* style = *ttm* or *ttm\_mod*
+* style = *ttm* or *ttm_mod*
 * seed = random number seed to use for white noise (positive integer)
 * remaining arguments for fix ttm:
-  
+
   .. parsed-literal::
-  
+
        C_e  = electronic specific heat (energy/(electron\*temperature) units)
        rho_e = electronic density (electrons/volume units)
        kappa_e = electronic thermal conductivity (energy/(time\*distance\*temperature) units)
@@ -36,9 +35,9 @@ Syntax
        T_outfile = filename to write TTM temperatures to (only needed if N > 0)
 
 * remaining arguments for fix ttm/mod:
-  
+
   .. parsed-literal::
-  
+
        init_file = file with the parameters to TTM
        Nx = number of thermal solve grid points in the x-direction (positive integer)
        Ny = number of thermal solve grid points in the y-direction (positive integer)
@@ -47,13 +46,10 @@ Syntax
        N = dump TTM temperatures every this many timesteps, 0 = no dump
        T_outfile = filename to write TTM temperatures to (only needed if N > 0)
 
-
-
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    fix 2 all ttm 699489 1.0 1.0 10 0.1 0.0 2.0 1 12 1 initialTs 1000 T.out
    fix 2 all ttm 123456 1.0 1.0 1.0 1.0 1.0 5.0 5 5 5 Te.in 1 Te.out
@@ -97,11 +93,11 @@ reservoir, whereas the heat reservoir for fix TTM is finite and
 represents the local electrons.  Third, the TTM fix allows users to
 specify not just one friction coefficient, but rather two independent
 friction coefficients: one for the electron-ion interactions
-(*gamma\_p*), and one for electron stopping (*gamma\_s*).
+(*gamma_p*), and one for electron stopping (*gamma_s*).
 
-When the friction coefficient due to electron stopping, *gamma\_s*, is
+When the friction coefficient due to electron stopping, *gamma_s*, is
 non-zero, electron stopping effects are included for atoms moving
-faster than the electron stopping critical velocity, *v\_0*.  For
+faster than the electron stopping critical velocity, *v_0*.  For
 further details about this algorithm, see :ref:`(Duffy) <Duffy>` and
 :ref:`(Rutherford) <Rutherford>`.
 
@@ -109,14 +105,17 @@ Energy transport within the electronic subsystem is solved according
 to the heat diffusion equation with added source terms for heat
 transfer between the subsystems:
 
-.. image:: Eqs/fix_ttm.jpg
-   :align: center
+.. math::
 
-where C\_e is the specific heat, rho\_e is the density, kappa\_e is the
+  C_e \rho_e \frac{\partial T_e}{\partial t} =
+  \bigtriangledown (\kappa_e \bigtriangledown T_e) -
+  g_p (T_e - T_a) + g_s T_a'
+
+where C_e is the specific heat, rho_e is the density, kappa_e is the
 thermal conductivity, T is temperature, the "e" and "a" subscripts
-represent electronic and atomic subsystems respectively, g\_p is the
-coupling constant for the electron-ion interaction, and g\_s is the
-electron stopping coupling parameter.  C\_e, rho\_e, and kappa\_e are
+represent electronic and atomic subsystems respectively, g_p is the
+coupling constant for the electron-ion interaction, and g_s is the
+electron stopping coupling parameter.  C_e, rho_e, and kappa_e are
 specified as parameters to the fix.  The other quantities are derived.
 The form of the heat diffusion equation used here is almost the same
 as that in equation 6 of :ref:`(Duffy) <Duffy>`, with the exception that the
@@ -136,15 +135,14 @@ approach of :ref:`(Rutherford) <Rutherford>` where the atomic subsystem was
 embedded within a larger continuum representation of the electronic
 subsystem.
 
-The initial electronic temperature input file, *T\_infile*, is a text
+The initial electronic temperature input file, *T_infile*, is a text
 file LAMMPS reads in with no header and with four numeric columns
 (ix,iy,iz,Temp) and with a number of rows equal to the number of
 user-specified grid points (Nx by Ny by Nz).  The ix,iy,iz are node
 indices from 0 to nxnodes-1, etc.  For example, the initial electronic
-temperatures on a 1 by 2 by 3 grid could be specified in a *T\_infile*
+temperatures on a 1 by 2 by 3 grid could be specified in a *T_infile*
 as follows:
 
-
 .. parsed-literal::
 
    0 0 0 1.0
@@ -159,7 +157,7 @@ where the electronic temperatures along the y=0 plane have been set to
 to 2.0.  The order of lines in this file is no important.  If all the
 nodal values are not specified, LAMMPS will generate an error.
 
-The temperature output file, *T\_oufile*, is created and written by
+The temperature output file, *T_oufile*, is created and written by
 this fix.  Temperatures for both the electronic and atomic subsystems
 at every node and every N timesteps are output.  If N is specified as
 zero, no output is generated, and no output filename is needed.  The
@@ -185,33 +183,35 @@ temperature controlled by another fix - e.g. :doc:`fix nvt <fix_nh>` or
    you should insure that this grid is not too large, else your
    simulation could incur high memory and communication costs.
 
-
 ----------
 
-
 **Additional details for fix ttm/mod**
 
 Fix ttm/mod uses the heat diffusion equation with possible external
 heat sources (e.g. laser heating in ablation simulations):
 
-.. image:: Eqs/fix_ttm_mod.jpg
-   :align: center
+.. math::
 
-where theta is the Heaviside step function, I\_0 is the (absorbed)
-laser pulse intensity for ablation simulations, l\_skin is the depth
+  C_e \rho_e \frac{\partial T_e}{\partial t} =
+  \bigtriangledown (\kappa_e \bigtriangledown T_e) -
+  g_p (T_e - T_a) + g_s T_a' + \theta (x-x_{surface})I_0 \exp(-x/l_{skin})
+
+where theta is the Heaviside step function, I_0 is the (absorbed)
+laser pulse intensity for ablation simulations, l_skin is the depth
 of skin-layer, and all other designations have the same meaning as in
 the former equation. The duration of the pulse is set by the parameter
-*tau* in the *init\_file*.
+*tau* in the *init_file*.
 
-Fix ttm/mod also allows users to specify the dependencies of C\_e and
-kappa\_e on the electronic temperature. The specific heat is expressed
+Fix ttm/mod also allows users to specify the dependencies of C_e and
+kappa_e on the electronic temperature. The specific heat is expressed
 as
 
-.. image:: Eqs/fix_ttm_ce.jpg
-   :align: center
+.. math::
 
-where *X* = T\_e/1000, and the thermal conductivity is defined as
-kappa\_e = D\_e\*rho\_e\*C\_e, where D\_e is the thermal diffusion
+  C_e = C_0 + (a_0 + a_1 X + a_2 X^2 + a_3 X^3 + a_4 X^4) \exp (-(AX)^2)
+
+where *X* = T_e/1000, and the thermal conductivity is defined as
+kappa_e = D_e\*rho_e\*C_e, where D_e is the thermal diffusion
 coefficient.
 
 Electronic pressure effects are included in the TTM model to account
@@ -219,40 +219,41 @@ for the blast force acting on ions because of electronic pressure
 gradient (see :ref:`(Chen) <Chen>`, :ref:`(Norman) <Norman>`).  The total force
 acting on an ion is:
 
-.. image:: Eqs/fix_ttm_blast.jpg
-   :align: center
+.. math::
 
-where F\_langevin is a force from Langevin thermostat simulating
-electron-phonon coupling, and nabla P\_e/n\_ion is the electron blast
+  {\vec F}_i = - \partial U / \partial {\vec r}_i + {\vec F}_{langevin} - \nabla P_e/n_{ion}
+
+where F_langevin is a force from Langevin thermostat simulating
+electron-phonon coupling, and nabla P_e/n_ion is the electron blast
 force.
 
-The electronic pressure is taken to be P\_e = B\*rho\_e\*C\_e\*T\_e
+The electronic pressure is taken to be P_e = B\*rho_e\*C_e\*T_e
 
 The current fix ttm/mod implementation allows TTM simulations with a
 vacuum. The vacuum region is defined as the grid cells with zero
 electronic temperature. The numerical scheme does not allow energy
 exchange with such cells. Since the material can expand to previously
 unoccupied region in some simulations, the vacuum border can be
-allowed to move. It is controlled by the *surface\_movement* parameter
-in the *init\_file*. If it is set to 1, then "vacuum" cells can be
-changed to "electron-filled" cells with the temperature *T\_e_min* if
+allowed to move. It is controlled by the *surface_movement* parameter
+in the *init_file*. If it is set to 1, then "vacuum" cells can be
+changed to "electron-filled" cells with the temperature *T_e_min* if
 atoms move into them (currently only implemented for the case of
 1-dimensional motion of flat surface normal to the X axis). The
-initial borders of vacuum can be set in the *init\_file* via *lsurface*
+initial borders of vacuum can be set in the *init_file* via *lsurface*
 and *rsurface* parameters. In this case, electronic pressure gradient
 is calculated as
 
-.. image:: Eqs/fix_ttm_blast1.jpg
-   :align: center
+.. math::
+
+  \nabla_x P_e = \left[\frac{C_e{}T_e(x)\lambda}{(x+\lambda)^2} + \frac{x}{x+\lambda}\frac{(C_e{}T_e)_{x+\Delta x}-(C_e{}T_e)_{x}}{\Delta x} \right]
 
 where lambda is the electron mean free path (see :ref:`(Norman) <Norman>`,
 :ref:`(Pisarev) <Pisarev>`)
 
-The fix ttm/mod parameter file *init\_file* has the following syntax/
+The fix ttm/mod parameter file *init_file* has the following syntax/
 Every line with the odd number is considered as a comment and
 ignored. The lines with the even numbers are treated as follows:
 
-
 .. parsed-literal::
 
    a_0, energy/(temperature\*electron) units
@@ -278,11 +279,9 @@ ignored. The lines with the even numbers are treated as follows:
    surface_movement: 0 to disable tracking of surface motion, 1 to enable
    T_e_min, temperature units
 
-
 ----------
 
-
-**Restart, fix\_modify, output, run start/stop, minimize info:**
+**Restart, fix_modify, output, run start/stop, minimize info:**
 
 These fixes write the state of the electronic subsystem and the energy
 exchange between the subsystems to :doc:`binary restart files <restart>`.  See the :doc:`read_restart <read_restart>` command
@@ -321,7 +320,6 @@ of the :doc:`run <run>` command.  The fixes are not invoked during
 Restrictions
 """"""""""""
 
-
 Fix *ttm* is part of the MISC package. It is only enabled if LAMMPS
 was built with that package.  Fix *ttm/mod* is part of the USER-MISC
 package. It is only enabled if LAMMPS was built with that package.
@@ -338,46 +336,29 @@ Related commands
 
 **Default:** none
 
-
 ----------
 
-
 .. _Duffy:
 
-
-
 **(Duffy)** D M Duffy and A M Rutherford, J. Phys.: Condens. Matter, 19,
 016207-016218 (2007).
 
 .. _Rutherford:
 
-
-
 **(Rutherford)** A M Rutherford and D M Duffy, J. Phys.:
 Condens. Matter, 19, 496201-496210 (2007).
 
 .. _Chen:
 
-
-
 **(Chen)** J Chen, D Tzou and J Beraun, Int. J. Heat
 Mass Transfer, 49, 307-316 (2006).
 
 .. _Norman:
 
-
-
 **(Norman)** G E Norman, S V Starikov, V V Stegailov et al., Contrib.
 Plasma Phys., 53, 129-139 (2013).
 
 .. _Pisarev:
 
-
-
 **(Pisarev)** V V Pisarev and S V Starikov, J. Phys.: Condens. Matter, 26,
 475401 (2014).
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/fix_tune_kspace.rst b/doc/src/fix_tune_kspace.rst
index 8424418988..66a3fef024 100644
--- a/doc/src/fix_tune_kspace.rst
+++ b/doc/src/fix_tune_kspace.rst
@@ -6,7 +6,6 @@ fix tune/kspace command
 Syntax
 """"""
 
-
 .. parsed-literal::
 
    fix ID group-ID tune/kspace N
@@ -15,12 +14,10 @@ Syntax
 * tune/kspace = style name of this fix command
 * N = invoke this fix every N steps
 
-
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    fix 2 all tune/kspace 100
 
@@ -83,11 +80,10 @@ the :doc:`run <run>` command.  This fix is not invoked during :doc:`energy minim
 Restrictions
 """"""""""""
 
-
 This fix is part of the KSPACE package.  It is only enabled if LAMMPS
 was built with that package.  See the :doc:`Build package <Build_package>` doc page for more info.
 
-Do not set "neigh\_modify once yes" or else this fix will never be
+Do not set "neigh_modify once yes" or else this fix will never be
 called.  Reneighboring is required.
 
 This fix is not compatible with a hybrid pair style, long-range dispersion,
@@ -102,8 +98,3 @@ Related commands
 
 Default
 """""""
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/fix_vector.rst b/doc/src/fix_vector.rst
index a2c7c87cd5..81922dea8a 100644
--- a/doc/src/fix_vector.rst
+++ b/doc/src/fix_vector.rst
@@ -6,7 +6,6 @@ fix vector command
 Syntax
 """"""
 
-
 .. parsed-literal::
 
    fix ID group-ID vector Nevery value1 value2 ...
@@ -15,10 +14,10 @@ Syntax
 * vector = style name of this fix command
 * Nevery = use input values every this many timesteps
 * one or more input values can be listed
-* value = c\_ID, c\_ID[N], f\_ID, f\_ID[N], v\_name
-  
+* value = c_ID, c_ID[N], f_ID, f_ID[N], v_name
+
   .. parsed-literal::
-  
+
        c_ID = global scalar calculated by a compute with ID
        c_ID[I] = Ith component of global vector calculated by a compute with ID
        f_ID = global scalar calculated by a fix with ID
@@ -26,13 +25,10 @@ Syntax
        v_name = value calculated by an equal-style variable with name
        v_name[I] = Ith component of vector-style variable with name
 
-
-
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    fix 1 all vector 100 c_myTemp
    fix 1 all vector 5 c_myTemp v_integral
@@ -52,12 +48,11 @@ time-integrated using the :doc:`variable trap() <variable>` function.
 For example the velocity auto-correlation function (VACF) can be
 time-integrated, to yield a diffusion coefficient, as follows:
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    compute         2 all vacf
    fix             5 all vector 1 c_2[4]
-   variable        diff equal dt\*trap(f_5)
+   variable        diff equal dt*trap(f_5)
    thermo_style    custom step v_diff
 
 The group specified with this command is ignored.  However, note that
@@ -89,10 +84,8 @@ command with a timestep value that encompasses all the runs.  This is
 so that the vector or array stored by this fix can be allocated to a
 sufficient size.
 
-
 ----------
 
-
 If a value begins with "c\_", a compute ID must follow which has been
 previously defined in the input script.  If no bracketed term is
 appended, the global scalar calculated by the compute is used.  If a
@@ -128,11 +121,9 @@ keywords, or they can invoke other computes, fixes, or variables when
 they are evaluated, so this is a very general means of specifying
 quantities to be stored by fix vector.
 
-
 ----------
 
-
-**Restart, fix\_modify, output, run start/stop, minimize info:**
+**Restart, fix_modify, output, run start/stop, minimize info:**
 
 No information about this fix is written to :doc:`binary restart files <restart>`.  None of the :doc:`fix_modify <fix_modify>` options
 are relevant to this fix.
@@ -174,8 +165,3 @@ Related commands
 :doc:`compute <compute>`, :doc:`variable <variable>`
 
 **Default:** none
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/fix_viscosity.rst b/doc/src/fix_viscosity.rst
index 27250f2c85..e31cbf2e45 100644
--- a/doc/src/fix_viscosity.rst
+++ b/doc/src/fix_viscosity.rst
@@ -6,7 +6,6 @@ fix viscosity command
 Syntax
 """"""
 
-
 .. parsed-literal::
 
    fix ID group-ID viscosity N vdim pdim Nbin keyword value ...
@@ -19,19 +18,16 @@ Syntax
 * Nbin = # of layers in pdim direction (must be even number)
 * zero or more keyword/value pairs may be appended
 * keyword = *swap* or *target*
-  
+
   .. parsed-literal::
-  
+
        *swap* value = Nswap = number of swaps to perform every N steps
        *vtarget* value = V or INF = target velocity of swap partners (velocity units)
 
-
-
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    fix 1 all viscosity 100 x z 20
    fix 1 all viscosity 50 x z 20 swap 2 vtarget 1.5
@@ -66,8 +62,7 @@ directions.  Over time, this induces a shear velocity profile in the
 system which can be measured using commands such as the following,
 which writes the profile to the file tmp.profile:
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    compute layers all chunk/atom bin/1d z lower 0.05 units reduced
    fix f1 all ave/chunk 100 10 1000 layers vx file tmp.profile
@@ -118,7 +113,7 @@ system using a :doc:`PPPM solver <kspace_style>` since PPPM does not
 currently support non-orthogonal boxes.  Using fix viscosity keeps the
 box orthogonal; thus it does not suffer from this limitation.
 
-**Restart, fix\_modify, output, run start/stop, minimize info:**
+**Restart, fix_modify, output, run start/stop, minimize info:**
 
 No information about this fix is written to :doc:`binary restart files <restart>`.  None of the :doc:`fix_modify <fix_modify>` options
 are relevant to this fix.
@@ -138,7 +133,6 @@ the :doc:`run <run>` command.  This fix is not invoked during :doc:`energy minim
 Restrictions
 """"""""""""
 
-
 This fix is part of the MISC package.  It is only enabled if LAMMPS
 was built with that package.  See the :doc:`Build package <Build_package>` doc page for more info.
 
@@ -168,24 +162,13 @@ Default
 
 The option defaults are swap = 1 and vtarget = INF.
 
-
 ----------
 
-
 .. _Muller-Plathe2:
 
-
-
 **(Muller-Plathe)** Muller-Plathe, Phys Rev E, 59, 4894-4898 (1999).
 
 .. _Maginn:
 
-
-
 **(Maginn)** Kelkar, Rafferty, Maginn, Siepmann, Fluid Phase Equilibria,
 260, 218-231 (2007).
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/fix_viscous.rst b/doc/src/fix_viscous.rst
index 0c8338048a..88d619e56c 100644
--- a/doc/src/fix_viscous.rst
+++ b/doc/src/fix_viscous.rst
@@ -6,7 +6,6 @@ fix viscous command
 Syntax
 """"""
 
-
 .. parsed-literal::
 
    fix ID group-ID viscous gamma keyword values ...
@@ -15,21 +14,18 @@ Syntax
 * viscous = style name of this fix command
 * gamma = damping coefficient (force/velocity units)
 * zero or more keyword/value pairs may be appended
-  
+
   .. parsed-literal::
-  
+
      keyword = *scale*
        *scale* values = type ratio
          type = atom type (1-N)
          ratio = factor to scale the damping coefficient by
 
-
-
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    fix 1 flow viscous 0.1
    fix 1 damp viscous 0.5 scale 3 2.5
@@ -47,11 +43,11 @@ energy to the system), it has the effect of slowly (or rapidly)
 freezing the system; hence it can also be used as a simple energy
 minimization technique.
 
-The damping force F is given by F = - gamma \* velocity.  The larger
-the coefficient, the faster the kinetic energy is reduced.  If the
-optional keyword *scale* is used, gamma can scaled up or down by the
-specified factor for atoms of that type.  It can be used multiple
-times to adjust gamma for several atom types.
+The damping force :math:`F_i` is given by :math:`F_i = - \gamma v_i`.
+The larger the coefficient, the faster the kinetic energy is reduced.
+If the optional keyword *scale* is used, :math:`\gamma` can scaled up or
+down by the specified factor for atoms of that type.  It can be used
+multiple times to adjust :math:`\gamma` for several atom types.
 
 .. note::
 
@@ -60,38 +56,40 @@ times to adjust gamma for several atom types.
    :doc:`units <units>` options like "real" or "metal" that are not
    self-consistent.
 
-In a Brownian dynamics context, gamma = Kb T / D, where Kb =
-Boltzmann's constant, T = temperature, and D = particle diffusion
-coefficient.  D can be written as Kb T / (3 pi eta d), where eta =
-dynamic viscosity of the frictional fluid and d = diameter of
-particle.  This means gamma = 3 pi eta d, and thus is proportional to
-the viscosity of the fluid and the particle diameter.
+In a Brownian dynamics context, :math:`\gamma = \frac{k_B T}{D}`, where
+:math:`k_B =` Boltzmann's constant, *T* = temperature, and *D* = particle
+diffusion coefficient.  *D* can be written as :math:`\frac{k_B T}{3 \pi
+\eta d}`, where :math:`\eta =` dynamic viscosity of the frictional fluid
+and d = diameter of particle.  This means :math:`\gamma = 3 \pi \eta d`,
+and thus is proportional to the viscosity of the fluid and the particle
+diameter.
 
 In the current implementation, rather than have the user specify a
-viscosity, gamma is specified directly in force/velocity units.  If
-needed, gamma can be adjusted for atoms of different sizes
-(i.e. sigma) by using the *scale* keyword.
+viscosity, :math:`\gamma` is specified directly in force/velocity units.
+If needed, :math:`\gamma` can be adjusted for atoms of different sizes
+(i.e. :math:`\sigma`) by using the *scale* keyword.
 
 Note that Brownian dynamics models also typically include a randomized
-force term to thermostat the system at a chosen temperature.  The :doc:`fix langevin <fix_langevin>` command does this.  It has the same
+force term to thermostat the system at a chosen temperature.  The
+:doc:`fix langevin <fix_langevin>` command does this.  It has the same
 viscous damping term as fix viscous and adds a random force to each
-atom.  The random force term is proportional to the sqrt of the chosen
-thermostatting temperature.  Thus if you use fix langevin with a
-target T = 0, its random force term is zero, and you are essentially
-performing the same operation as fix viscous.  Also note that the
-gamma of fix viscous is related to the damping parameter of :doc:`fix langevin <fix_langevin>`, however the former is specified in units
-of force/velocity and the latter in units of time, so that it can more
-easily be used as a thermostat.
-
+atom.  The random force term is proportional to the square root of the
+chosen thermostatting temperature.  Thus if you use fix langevin with a
+target :math:`T = 0`, its random force term is zero, and you are
+essentially performing the same operation as fix viscous.  Also note
+that the gamma of fix viscous is related to the damping parameter of
+:doc:`fix langevin <fix_langevin>`, however the former is specified in
+units of force/velocity and the latter in units of time, so that it can
+more easily be used as a thermostat.
 
 ----------
 
+**Restart, fix_modify, output, run start/stop, minimize info:**
 
-**Restart, fix\_modify, output, run start/stop, minimize info:**
-
-No information about this fix is written to :doc:`binary restart files <restart>`.  None of the :doc:`fix_modify <fix_modify>` options
-are relevant to this fix.  No global or per-atom quantities are stored
-by this fix for access by various :doc:`output commands <Howto_output>`.
+No information about this fix is written to :doc:`binary restart files
+<restart>`.  None of the :doc:`fix_modify <fix_modify>` options are
+relevant to this fix.  No global or per-atom quantities are stored by
+this fix for access by various :doc:`output commands <Howto_output>`.
 No parameter of this fix can be used with the *start/stop* keywords of
 the :doc:`run <run>` command.
 
@@ -115,8 +113,3 @@ Related commands
 :doc:`fix langevin <fix_langevin>`
 
 **Default:** none
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/fix_wall.rst b/doc/src/fix_wall.rst
index a14cf423b0..a56bca3c45 100644
--- a/doc/src/fix_wall.rst
+++ b/doc/src/fix_wall.rst
@@ -24,7 +24,6 @@ fix wall/morse command
 Syntax
 """"""
 
-
 .. parsed-literal::
 
    fix ID group-ID style face args ... keyword value ...
@@ -34,9 +33,9 @@ Syntax
 * one or more face/arg pairs may be appended
 * face = *xlo* or *xhi* or *ylo* or *yhi* or *zlo* or *zhi*
 * args for styles *lj93* or *lj126* or *lj1043* or *colloid* or *harmonic*
-  
+
   .. parsed-literal::
-  
+
          args = coord epsilon sigma cutoff
          coord = position of wall = EDGE or constant or variable
            EDGE = current lo or hi edge of simulation box
@@ -49,9 +48,9 @@ Syntax
          cutoff = distance from wall at which wall-particle interaction is cut off (distance units)
 
 * args for style *morse*
-  
+
   .. parsed-literal::
-  
+
          args = coord D_0 alpha r_0 cutoff
          coord = position of wall = EDGE or constant or variable
            EDGE = current lo or hi edge of simulation box
@@ -67,9 +66,9 @@ Syntax
 
 * zero or more keyword/value pairs may be appended
 * keyword = *units* or *fld*
-  
+
   .. parsed-literal::
-  
+
        *units* value = *lattice* or *box*
          *lattice* = the wall position is defined in lattice units
          *box* = the wall position is defined in simulation box units
@@ -80,13 +79,10 @@ Syntax
          *yes* = allow periodic boundary in a wall dimension
          *no* = require non-perioidic boundaries in any wall dimension
 
-
-
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    fix wallhi all wall/lj93 xlo -1.0 1.0 1.0 2.5 units box
    fix wallhi all wall/lj93 xhi EDGE 1.0 1.0 2.5
@@ -104,38 +100,55 @@ wall-particle interactions depends on the style.
 
 For style *wall/lj93*\ , the energy E is given by the 9/3 potential:
 
-.. image:: Eqs/fix_wall_lj93.jpg
-   :align: center
+.. math::
+
+ E = \epsilon \left[ \frac{2}{15} \left(\frac{\sigma}{r}\right)^{9} -
+                       \left(\frac{\sigma}{r}\right)^3 \right]
+                       \qquad r < r_c
 
 For style *wall/lj126*\ , the energy E is given by the 12/6 potential:
 
-.. image:: Eqs/pair_lj.jpg
-   :align: center
+.. math::
+
+ E = 4 \epsilon \left[ \left(\frac{\sigma}{r}\right)^{12} -
+                       \left(\frac{\sigma}{r}\right)^6 \right]
+                       \qquad r < r_c
 
 For style *wall/lj1043*\ , the energy E is given by the 10/4/3 potential:
 
-.. image:: Eqs/fix_wall_lj1043.jpg
-   :align: center
+.. math::
+
+ E = 2 \pi \epsilon \left[ \frac{2}{5} \left(\frac{\sigma}{r}\right)^{10} -
+                       \left(\frac{\sigma}{r}\right)^4 -
+                       \frac{\sqrt(2)\sigma^3}{3\left(r+\left(0.61/\sqrt(2)\right)\sigma\right)^3}\right]
+                       \qquad r < r_c
 
 For style *wall/colloid*\ , the energy E is given by an integrated form
 of the :doc:`pair_style colloid <pair_colloid>` potential:
 
-.. image:: Eqs/fix_wall_colloid.jpg
-   :align: center
+.. math::
+
+   E = & \epsilon \left[ \frac{\sigma^{6}}{7560}
+   \left(\frac{6R-D}{D^{7}} + \frac{D+8R}{(D+2R)^{7}} \right) \right. \\
+    & \left. - \frac{1}{6} \left(\frac{2R(D+R) + D(D+2R)
+    \left[ \ln D - \ln (D+2R) \right]}{D(D+2R)} \right) \right] \qquad r < r_c
 
 For style *wall/harmonic*\ , the energy E is given by a harmonic spring
 potential:
 
-.. image:: Eqs/fix_wall_harmonic.jpg
-   :align: center
+.. math::
+
+ E = \epsilon \quad (r - r_c)^2 \qquad r < r_c
 
 For style *wall/morse*\ , the energy E is given by a Morse potential:
 
-.. image:: Eqs/pair_morse.jpg
-   :align: center
+.. math::
+
+   E = D_0 \left[ e^{- 2 \alpha (r - r_0)} - 2 e^{- \alpha (r - r_0)} \right]
+       \qquad r < r_c
 
 In all cases, *r* is the distance from the particle to the wall at
-position *coord*\ , and Rc is the *cutoff* distance at which the
+position *coord*\ , and :math:`r_c` is the *cutoff* distance at which the
 particle and wall no longer interact.  The energy of the wall
 potential is shifted so that the wall-particle interaction energy is
 0.0 at the cutoff distance.
@@ -152,7 +165,7 @@ EDGE is used, then the corresponding boundary of the current
 simulation box is used.  If a numeric constant is specified then the
 wall is placed at that position in the appropriate dimension (x, y, or
 z).  In both the EDGE and constant cases, the wall will never move.
-If the wall position is a variable, it should be specified as v\_name,
+If the wall position is a variable, it should be specified as v_name,
 where name is an :doc:`equal-style variable <variable>` name.  In this
 case the variable is evaluated each timestep and the result becomes
 the current position of the reflecting wall.  Equal-style variables
@@ -162,10 +175,10 @@ box parameters and timestep and elapsed time.  Thus it is easy to
 specify a time-dependent wall position.  See examples below.
 
 For the *wall/lj93* and *wall/lj126* and *wall/lj1043* styles,
-*epsilon* and *sigma* are the usual Lennard-Jones parameters, which
+:math:`\epsilon` and :math:`\sigma` are the usual Lennard-Jones parameters, which
 determine the strength and size of the particle as it interacts with
-the wall.  Epsilon has energy units.  Note that this *epsilon* and
-*sigma* may be different than any *epsilon* or *sigma* values defined
+the wall.  Epsilon has energy units.  Note that this :math:`\epsilon` and
+:math:`\sigma` may be different than any :math:`\epsilon` or :math:`\sigma` values defined
 for a pair style that computes particle-particle interactions.
 
 The *wall/lj93* interaction is derived by integrating over a 3d
@@ -174,42 +187,42 @@ interaction is effectively a harder, more repulsive wall interaction.
 The *wall/lj1043* interaction is yet a different form of wall
 interaction, described in Magda et al in :ref:`(Magda) <Magda>`.
 
-For the *wall/colloid* style, *R* is the radius of the colloid
-particle, *D* is the distance from the surface of the colloid particle
-to the wall (r-R), and *sigma* is the size of a constituent LJ
-particle inside the colloid particle and wall.  Note that the cutoff
-distance Rc in this case is the distance from the colloid particle
-center to the wall.  The prefactor *epsilon* can be thought of as an
-effective Hamaker constant with energy units for the strength of the
-colloid-wall interaction.  More specifically, the *epsilon* pre-factor
-= 4 \* pi\^2 \* rho\_wall \* rho\_colloid \* epsilon \* sigma\^6, where epsilon
-and sigma are the LJ parameters for the constituent LJ
-particles. Rho\_wall and rho\_colloid are the number density of the
-constituent particles, in the wall and colloid respectively, in units
-of 1/volume.
+For the *wall/colloid* style, *R* is the radius of the colloid particle,
+*D* is the distance from the surface of the colloid particle to the wall
+(r-R), and :math:`\sigma` is the size of a constituent LJ particle
+inside the colloid particle and wall.  Note that the cutoff distance Rc
+in this case is the distance from the colloid particle center to the
+wall.  The prefactor :math:`\epsilon` can be thought of as an effective
+Hamaker constant with energy units for the strength of the colloid-wall
+interaction.  More specifically, the :math:`\epsilon` pre-factor is
+:math:`4\pi^2 \rho_{wall} \rho_{colloid} \epsilon \sigma^6`, where
+:math:`\epsilon` and :math:`\sigma` are the LJ parameters for the
+constituent LJ particles. :math:`\rho_{wall}` and :math:`\rho_{colloid}`
+are the number density of the constituent particles, in the wall and
+colloid respectively, in units of 1/volume.
 
 The *wall/colloid* interaction is derived by integrating over
-constituent LJ particles of size *sigma* within the colloid particle
-and a 3d half-lattice of Lennard-Jones 12/6 particles of size *sigma*
+constituent LJ particles of size :math:`\sigma` within the colloid particle
+and a 3d half-lattice of Lennard-Jones 12/6 particles of size :math:`\sigma`
 in the wall.  As mentioned in the preceding paragraph, the density of
 particles in the wall and colloid can be different, as specified by
-the *epsilon* pre-factor.
+the :math:`\epsilon` pre-factor.
 
-For the *wall/harmonic* style, *epsilon* is effectively the spring
+For the *wall/harmonic* style, :math:`\epsilon` is effectively the spring
 constant K, and has units (energy/distance\^2).  The input parameter
-*sigma* is ignored.  The minimum energy position of the harmonic
+:math:`\sigma` is ignored.  The minimum energy position of the harmonic
 spring is at the *cutoff*\ .  This is a repulsive-only spring since the
 interaction is truncated at the *cutoff*
 
 For the *wall/morse* style, the three parameters are in this order:
-*D\_0* the depth of the potential, *alpha* the width parameter, and
-*r\_0* the location of the minimum.  *D\_0* has energy units, *alpha*
-inverse distance units, and *r\_0* distance units.
+:math:`D_0` the depth of the potential, :math:`\alpha` the width parameter, and
+:math:`r_0` the location of the minimum.  :math:`D_0` has energy units, :math:`\alpha`
+inverse distance units, and :math:`r_0` distance units.
 
-For any wall, the *epsilon* and/or *sigma* and/or *alpha* parameter can
+For any wall, the :math:`\epsilon` and/or :math:`\sigma` and/or :math:`\alpha` parameter can
 be specified
 as an :doc:`equal-style variable <variable>`, in which case it should be
-specified as v\_name, where name is the variable name.  As with a
+specified as v_name, where name is the variable name.  As with a
 variable wall position, the variable is evaluated each timestep and
 the result becomes the current epsilon or sigma of the wall.
 Equal-style variables can specify formulas with various mathematical
@@ -230,7 +243,7 @@ time.  Thus it is easy to specify a time-dependent wall interaction.
    the finite-size particles of radius R must be a distance larger than R
    from the wall position *coord*\ .  The *harmonic* style is a softer
    potential and does not blow up as r -> 0, but you must use a large
-   enough *epsilon* that particles always reamin on the correct side of
+   enough :math:`\epsilon` that particles always reamin on the correct side of
    the wall (r > 0).
 
 The *units* keyword determines the meaning of the distance units used
@@ -265,17 +278,14 @@ then particles may interact with both the wall and with periodic
 images on the other side of the box, which is probably not what you
 want.
 
-
 ----------
 
-
 Here are examples of variable definitions that move the wall position
 in a time-dependent fashion using equal-style
 :doc:`variables <variable>`.  The wall interaction parameters (epsilon,
 sigma) could be varied with additional variable definitions.
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    variable ramp equal ramp(0,10)
    fix 1 all wall xlo v_ramp 1.0 1.0 2.5
@@ -289,35 +299,31 @@ sigma) could be varied with additional variable definitions.
    variable wiggle equal cwiggle(0.0,5.0,3.0)
    fix 1 all wall xlo v_wiggle 1.0 1.0 2.5
 
-The ramp(lo,hi) function adjusts the wall position linearly from lo to
-hi over the course of a run.  The vdisplace(c0,velocity) function does
-something similar using the equation position = c0 + velocity\*delta,
-where delta is the elapsed time.
-
-The swiggle(c0,A,period) function causes the wall position to
-oscillate sinusoidally according to this equation, where omega = 2 PI
-/ period:
+The *ramp(lo,hi)* function adjusts the wall position linearly from *lo* to
+*hi* over the course of a run.  The *vdisplace(c0,velocity)* function does
+something similar using the equation *position = c0 + velocity\*delta*\ ,
+where *delta* is the elapsed time.
 
+The *swiggle(c0,A,period)* function causes the wall position to
+oscillate sinusoidally according to this equation, where *omega = 2 PI
+/ period*\ :
 
 .. parsed-literal::
 
    position = c0 + A sin(omega\*delta)
 
-The cwiggle(c0,A,period) function causes the wall position to
+The *cwiggle(c0,A,period)* function causes the wall position to
 oscillate sinusoidally according to this equation, which will have an
 initial wall velocity of 0.0, and thus may impose a gentler
 perturbation on the particles:
 
-
 .. parsed-literal::
 
    position = c0 + A (1 - cos(omega\*delta))
 
-
 ----------
 
-
-**Restart, fix\_modify, output, run start/stop, minimize info:**
+**Restart, fix_modify, output, run start/stop, minimize info:**
 
 No information about this fix is written to :doc:`binary restart files <restart>`.
 
@@ -356,10 +362,8 @@ invoked by the :doc:`minimize <minimize>` command.
    minimized), you MUST enable the :doc:`fix_modify <fix_modify>` *energy*
    option for this fix.
 
-
 ----------
 
-
 Styles with a *gpu*\ , *intel*\ , *kk*\ , *omp*\ , or *opt* suffix are
 functionally the same as the corresponding style without the suffix.
 They have been optimized to run faster, depending on your available
@@ -378,10 +382,8 @@ by including their suffix, or you can use the :doc:`-suffix command-line switch
 See the :doc:`Speed packages <Speed_packages>` doc page for more
 instructions on how to use the accelerated styles effectively.
 
-
 ----------
 
-
 Restrictions
 """"""""""""
  none
@@ -398,18 +400,9 @@ Default
 
 The option defaults units = lattice, fld = no, and pbc = no.
 
-
 ----------
 
-
 .. _Magda:
 
-
-
 **(Magda)** Magda, Tirrell, Davis, J Chem Phys, 83, 1888-1901 (1985);
 erratum in JCP 84, 2901 (1986).
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/fix_wall_body_polygon.rst b/doc/src/fix_wall_body_polygon.rst
index 2ecbb2e911..a93d71369f 100644
--- a/doc/src/fix_wall_body_polygon.rst
+++ b/doc/src/fix_wall_body_polygon.rst
@@ -6,21 +6,20 @@ fix wall/body/polygon command
 Syntax
 """"""
 
-
 .. parsed-literal::
 
    fix ID group-ID wall/body/polygon k_n c_n c_t wallstyle args keyword values ...
 
 * ID, group-ID are documented in :doc:`fix <fix>` command
 * wall/body/polygon = style name of this fix command
-* k\_n = normal repulsion strength (force/distance or pressure units)
-* c\_n = normal damping coefficient (force/distance or pressure units)
-* c\_t = tangential damping coefficient (force/distance or pressure units)
+* k_n = normal repulsion strength (force/distance or pressure units)
+* c_n = normal damping coefficient (force/distance or pressure units)
+* c_t = tangential damping coefficient (force/distance or pressure units)
 * wallstyle = *xplane* or *yplane* or *zplane* or *zcylinder*
 * args = list of arguments for a particular style
-  
+
   .. parsed-literal::
-  
+
        *xplane* or *yplane* args = lo hi
          lo,hi = position of lower and upper plane (distance units), either can be NULL)
        *zcylinder* args = radius
@@ -28,20 +27,20 @@ Syntax
 
 * zero or more keyword/value pairs may be appended to args
 * keyword = *wiggle*
-  
+
   .. parsed-literal::
-  
+
        *wiggle* values = dim amplitude period
          dim = *x* or *y* or *z*
          amplitude = size of oscillation (distance units)
          period = time of oscillation (time units)
 
-
-
 Examples
 """"""""
 
-fix 1 all wall/body/polygon 1000.0 20.0 5.0 xplane -10.0 10.0
+.. code-block:: LAMMPS
+
+   fix 1 all wall/body/polygon 1000.0 20.0 5.0 xplane -10.0 10.0
 
 Description
 """""""""""
@@ -55,7 +54,7 @@ particles themselves, which is similar to a Hookean potential.  See
 the :doc:`Howto body <Howto_body>` doc page for more details on using
 body particles.
 
-The parameters *k\_n*, *c\_n*, *c\_t* have the same meaning and units as
+The parameters *k_n*, *c_n*, *c_t* have the same meaning and units as
 those specified with the :doc:`pair_style body/rounded/polygon <pair_body_rounded_polygon>` command.
 
 The *wallstyle* can be planar or cylindrical.  The 2 planar options
@@ -79,7 +78,6 @@ the z dimension.
 Each timestep, the position of a wiggled wall in the appropriate *dim*
 is set according to this equation:
 
-
 .. parsed-literal::
 
    position = coord + A - A cos (omega \* delta)
@@ -89,7 +87,7 @@ the *amplitude*\ , *omega* is 2 PI / *period*\ , and *delta* is the time
 elapsed since the fix was specified.  The velocity of the wall is set
 to the derivative of this expression.
 
-**Restart, fix\_modify, output, run start/stop, minimize info:**
+**Restart, fix_modify, output, run start/stop, minimize info:**
 
 None of the :doc:`fix_modify <fix_modify>` options are relevant to this
 fix.  No global or per-atom quantities are stored by this fix for
@@ -100,7 +98,6 @@ of this fix can be used with the *start/stop* keywords of the
 Restrictions
 """"""""""""
 
-
 This fix is part of the BODY package.  It is only enabled if LAMMPS
 was built with that package.  See the :doc:`Build package <Build_package>` doc page for more info.
 
@@ -112,8 +109,3 @@ Related commands
 :doc:`atom_style body <atom_style>`, :doc:`pair_style body/rounded/polygon <pair_body_rounded_polygon>`
 
 **Default:** none
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/fix_wall_body_polyhedron.rst b/doc/src/fix_wall_body_polyhedron.rst
index fd58c16c44..4b01234f0f 100644
--- a/doc/src/fix_wall_body_polyhedron.rst
+++ b/doc/src/fix_wall_body_polyhedron.rst
@@ -6,21 +6,20 @@ fix wall/body/polyhedron command
 Syntax
 """"""
 
-
 .. parsed-literal::
 
    fix ID group-ID wall/body/polyhedron k_n c_n c_t wallstyle args keyword values ...
 
 * ID, group-ID are documented in :doc:`fix <fix>` command
 * wall/body/polyhedron = style name of this fix command
-* k\_n = normal repulsion strength (force/distance units or pressure units - see discussion below)
-* c\_n = normal damping coefficient (force/distance units or pressure units - see discussion below)
-* c\_t = tangential damping coefficient (force/distance units or pressure units - see discussion below)
+* k_n = normal repulsion strength (force/distance units or pressure units - see discussion below)
+* c_n = normal damping coefficient (force/distance units or pressure units - see discussion below)
+* c_t = tangential damping coefficient (force/distance units or pressure units - see discussion below)
 * wallstyle = *xplane* or *yplane* or *zplane* or *zcylinder*
 * args = list of arguments for a particular style
-  
+
   .. parsed-literal::
-  
+
        *xplane* or *yplane* args = lo hi
          lo,hi = position of lower and upper plane (distance units), either can be NULL)
        *zcylinder* args = radius
@@ -28,20 +27,20 @@ Syntax
 
 * zero or more keyword/value pairs may be appended to args
 * keyword = *wiggle*
-  
+
   .. parsed-literal::
-  
+
        *wiggle* values = dim amplitude period
          dim = *x* or *y* or *z*
          amplitude = size of oscillation (distance units)
          period = time of oscillation (time units)
 
-
-
 Examples
 """"""""
 
-fix 1 all wall/body/polyhedron 1000.0 20.0 5.0 xplane -10.0 10.0
+.. code-block:: LAMMPS
+
+   fix 1 all wall/body/polyhedron 1000.0 20.0 5.0 xplane -10.0 10.0
 
 Description
 """""""""""
@@ -55,7 +54,7 @@ particles themselves, which is similar to a Hookean potential.  See
 the :doc:`Howto body <Howto_body>` doc page for more details on using
 body particles.
 
-The parameters *k\_n*, *c\_n*, *c\_t* have the same meaning and units as
+The parameters *k_n*, *c_n*, *c_t* have the same meaning and units as
 those specified with the :doc:`pair_style body/rounded/polyhedron <pair_body_rounded_polyhedron>` command.
 
 The *wallstyle* can be planar or cylindrical.  The 3 planar options
@@ -78,7 +77,6 @@ the z dimension.
 Each timestep, the position of a wiggled wall in the appropriate *dim*
 is set according to this equation:
 
-
 .. parsed-literal::
 
    position = coord + A - A cos (omega \* delta)
@@ -88,7 +86,7 @@ the *amplitude*\ , *omega* is 2 PI / *period*\ , and *delta* is the time
 elapsed since the fix was specified.  The velocity of the wall is set
 to the derivative of this expression.
 
-**Restart, fix\_modify, output, run start/stop, minimize info:**
+**Restart, fix_modify, output, run start/stop, minimize info:**
 
 None of the :doc:`fix_modify <fix_modify>` options are relevant to this
 fix.  No global or per-atom quantities are stored by this fix for
@@ -99,7 +97,6 @@ of this fix can be used with the *start/stop* keywords of the
 Restrictions
 """"""""""""
 
-
 This fix is part of the BODY package.  It is only enabled if LAMMPS
 was built with that package.  See the :doc:`Build package <Build_package>` doc page for more info.
 
@@ -111,8 +108,3 @@ Related commands
 :doc:`atom_style body <atom_style>`, :doc:`pair_style body/rounded/polyhedron <pair_body_rounded_polyhedron>`
 
 **Default:** none
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/fix_wall_ees.rst b/doc/src/fix_wall_ees.rst
index 873811110c..79f96765f8 100644
--- a/doc/src/fix_wall_ees.rst
+++ b/doc/src/fix_wall_ees.rst
@@ -9,16 +9,15 @@ fix wall/region/ees command
 Syntax
 """"""
 
-
 .. parsed-literal::
 
    fix ID group-ID style args
 
 * ID, group-ID are documented in :doc:`fix <fix>` command
 * style = *wall/ees* or *wall/region/ees*
-  
+
   .. parsed-literal::
-  
+
        args for style *wall/ees*\ : one or more *face parameters* groups may be appended
        face = *xlo* or *xhi* or *ylo* or *yhi* or *zlo* or *zhi*
        parameters = coord epsilon sigma cutoff
@@ -32,22 +31,18 @@ Syntax
            sigma can be a variable (see below)
          cutoff = distance from wall at which wall-particle interaction is cut off (distance units)
 
-  
   .. parsed-literal::
-  
+
        args for style *wall/region/ees*\ : *region-ID* *epsilon* *sigma* *cutoff*
          region-ID = region whose boundary will act as wall
          epsilon = strength factor for wall-particle interaction (energy or energy/distance\^2 units)
          sigma = size factor for wall-particle interaction (distance units)
          cutoff = distance from wall at which wall-particle interaction is cut off (distance units)
 
-
-
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    fix wallhi all wall/ees xlo -1.0 1.0 1.0 2.5 units box
    fix wallhi all wall/ees xhi EDGE 1.0 1.0 2.5
@@ -65,15 +60,15 @@ group by generating a force on the atom in a direction perpendicular to
 the wall and a torque parallel with the wall.  The energy of
 wall-particle interactions E is given by:
 
-.. image:: Eqs/fix_wall_ees.jpg
-   :align: center
+.. math::
+
+   E = \epsilon \left[ \frac{2  \sigma_{LJ}^{12} \left(7 r^5+14 r^3 \sigma_{n}^2+3 r \sigma_{n}^4\right) }{945 \left(r^2-\sigma_{n}^2\right)^7} -\frac{ \sigma_{LJ}^6 \left(2 r \sigma_{n}^3+\sigma_{n}^2 \left(r^2-\sigma_{n}^2\right)\log{ \left[\frac{r-\sigma_{n}}{r+\sigma_{n}}\right]}\right) }{12 \sigma_{n}^5 \left(r^2-\sigma_{n}^2\right)} \right]\qquad \sigma_n < r < r_c
 
 Introduced by Babadi and Ejtehadi in :ref:`(Babadi) <BabadiEjtehadi>`. Here,
 *r* is the distance from the particle to the wall at position *coord*\ ,
 and Rc is the *cutoff* distance at which the particle and wall no
-longer interact. Also, sigma\_n is the distance between center of
-ellipsoid and the nearest point of its surface to the wall. The energy
-of the wall is:
+longer interact. Also, :math:`\sigma_n` is the distance between center of
+ellipsoid and the nearest point of its surface to the wall as shown below.
 
 .. image:: JPG/fix_wall_ees_image.jpg
    :align: center
@@ -82,24 +77,29 @@ Details of using this command and specifications are the same as
 fix/wall command. You can also find an example in USER/ees/ under
 examples/ directory.
 
-The prefactor *epsilon* can be thought of as an
+The prefactor :math:`\epsilon` can be thought of as an
 effective Hamaker constant with energy units for the strength of the
-ellipsoid-wall interaction.  More specifically, the *epsilon* pre-factor
-= 8 \* pi\^2 \* rho\_wall \* rho\_ellipsoid \* epsilon
-\* sigma\_a \* sigma\_b \* sigma\_c, where epsilon is the LJ parameters for
-the constituent LJ particles and sigma\_a, sigma\_b, and sigma\_c are radii
-of ellipsoidal particles. Rho\_wall and rho\_ellipsoid are the number
-density of the constituent particles, in the wall and ellipsoid
-respectively, in units of 1/volume.
+ellipsoid-wall interaction.  More specifically, the :math:`\epsilon`
+pre-factor is
+
+.. math::
+
+   8 \pi^2 \quad \rho_{wall} \quad \rho_{ellipsoid} \quad \epsilon \quad \sigma_a \quad \sigma_b \quad \sigma_c
+
+where :math:`\epsilon` is the LJ energy parameter for the constituent LJ
+particles and :math:`\sigma_a`, :math:`\sigma_b`, and :math:`\sigma_c`
+are the radii of the ellipsoidal particles. :math:`\rho_{wall}` and
+:math:`\rho_{ellipsoid}` are the number density of the constituent
+particles, in the wall and ellipsoid respectively, in units of 1/volume.
 
 .. note::
 
-   You must insure that r is always bigger than sigma\_n for
+   You must insure that r is always bigger than :math:`\sigma_n` for
    all particles in the group, or LAMMPS will generate an error.  This
    means you cannot start your simulation with particles touching the wall
-   position *coord* (r = sigma\_n) or with particles penetrating the wall
-   (0 =< r < sigma\_n) or with particles on the wrong side of the
-   wall (r < 0).
+   position *coord* (:math:`r = \sigma_n`) or with particles penetrating
+   the wall (:math:`0 =< r < \sigma_n`) or with particles on the wrong
+   side of the wall (:math:`r < 0`).
 
 Fix *wall/region/ees* treats the surface of the geometric region defined
 by the *region-ID* as a bounding wall which interacts with nearby
@@ -111,7 +111,6 @@ of using this fix in the examples/USER/misc/ees/ directory.
 Restrictions
 """"""""""""
 
-
 This fix is part of the USER-MISC package.  It is only enabled if
 LAMMPS was built with that package.  See the :doc:`Build package <Build_package>` doc page for more info.
 
@@ -129,17 +128,8 @@ Default
 
 none
 
-
 ----------
 
-
 .. _BabadiEjtehadi:
 
-
-
 **(Babadi)** Babadi and Ejtehadi, EPL, 77 (2007) 23002.
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/fix_wall_gran.rst b/doc/src/fix_wall_gran.rst
index 0db5a3e5ac..daf3152c34 100644
--- a/doc/src/fix_wall_gran.rst
+++ b/doc/src/fix_wall_gran.rst
@@ -6,7 +6,6 @@ fix wall/gran command
 Syntax
 """"""
 
-
 .. parsed-literal::
 
    fix ID group-ID wall/gran fstyle fstyle_params wallstyle args keyword values ...
@@ -14,15 +13,15 @@ Syntax
 * ID, group-ID are documented in :doc:`fix <fix>` command
 * wall/gran = style name of this fix command
 * fstyle = style of force interactions between particles and wall
-  
+
   .. parsed-literal::
-  
+
        possible choices: hooke, hooke/history, hertz/history, granular
 
-* fstyle\_params = parameters associated with force interaction style
-  
+* fstyle_params = parameters associated with force interaction style
+
   .. parsed-literal::
-  
+
        For *hooke*\ , *hooke/history*\ , and *hertz/history*\ , *fstyle_params* are:
              Kn = elastic constant for normal particle repulsion (force/distance units or pressure units - see discussion below)
              Kt = elastic constant for tangential contact (force/distance units or pressure units - see discussion below)
@@ -31,16 +30,15 @@ Syntax
              xmu = static yield criterion (unitless value between 0.0 and 1.0e4)
              dampflag = 0 or 1 if tangential damping force is excluded or included
 
-  
   .. parsed-literal::
-  
+
        For *granular*\ , *fstyle_params* are set using the same syntax as for the *pair_coeff* command of :doc:`pair_style granular <pair_granular>`
 
 * wallstyle = *xplane* or *yplane* or *zplane* or *zcylinder*
 * args = list of arguments for a particular style
-  
+
   .. parsed-literal::
-  
+
        *xplane* or *yplane* or *zplane* args = lo hi
          lo,hi = position of lower and upper plane (distance units), either can be NULL)
        *zcylinder* args = radius
@@ -48,9 +46,9 @@ Syntax
 
 * zero or more keyword/value pairs may be appended to args
 * keyword = *wiggle* or *shear*
-  
+
   .. parsed-literal::
-  
+
        *wiggle* values = dim amplitude period
          dim = *x* or *y* or *z*
          amplitude = size of oscillation (distance units)
@@ -59,13 +57,10 @@ Syntax
          dim = *x* or *y* or *z*
          vshear = magnitude of shear velocity (velocity units)
 
-
-
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    fix 1 all wall/gran hooke  200000.0 NULL 50.0 NULL 0.5 0 xplane -10.0 10.0
    fix 1 all wall/gran hooke/history 200000.0 NULL 50.0 NULL 0.5 0 zplane 0.0 NULL
@@ -83,28 +78,29 @@ close enough to touch it.
 
 The nature of the wall/particle interactions are determined by the
 *fstyle* setting.  It can be any of the styles defined by the
-:doc:`pair_style gran/\* <pair_gran>` or the more general `pair\_style granular <pair_granular.html">`_ commands.  Currently the options are
-*hooke*\ , *hooke/history*\ , or *hertz/history* for the former, and
-*granular* with all the possible options of the associated
-*pair\_coeff* command for the latter.  The equation for the force
+:doc:`pair_style gran/\* <pair_gran>` or the more general
+:doc:`pair_style granular <pair_granular>` commands.  Currently the
+options are *hooke*\ , *hooke/history*\ , or *hertz/history* for the
+former, and *granular* with all the possible options of the associated
+*pair_coeff* command for the latter.  The equation for the force
 between the wall and particles touching it is the same as the
 corresponding equation on the :doc:`pair_style gran/\* <pair_gran>` and
-:doc:`pair\_style\_granular <pair_granular>` doc pages, in the limit of
-one of the two particles going to infinite radius and mass (flat
-wall).  Specifically, delta = radius - r = overlap of particle with
-wall, m\_eff = mass of particle, and the effective radius of contact =
-RiRj/Ri+Rj is set to the radius of the particle.
+:doc:`pair_style granular <pair_granular>` doc pages, in the limit of
+one of the two particles going to infinite radius and mass (flat wall).
+Specifically, delta = radius - r = overlap of particle with wall, m_eff
+= mass of particle, and the effective radius of contact = RiRj/Ri+Rj is
+set to the radius of the particle.
 
-The parameters *Kn*\ , *Kt*\ , *gamma\_n*, *gamma\_t*, *xmu* and *dampflag*
+The parameters *Kn*\ , *Kt*\ , *gamma_n*, *gamma_t*, *xmu* and *dampflag*
 have the same meaning and units as those specified with the
 :doc:`pair_style gran/\* <pair_gran>` commands.  This means a NULL can be
-used for either *Kt* or *gamma\_t* as described on that page.  If a
+used for either *Kt* or *gamma_t* as described on that page.  If a
 NULL is used for *Kt*\ , then a default value is used where *Kt* = 2/7
-*Kn*\ .  If a NULL is used for *gamma\_t*, then a default value is used
-where *gamma\_t* = 1/2 *gamma\_n*.
+*Kn*\ .  If a NULL is used for *gamma_t*, then a default value is used
+where *gamma_t* = 1/2 *gamma_n*.
 
 All the model choices for cohesion, tangential friction, rolling
-friction and twisting friction supported by the :doc:`pair_style granular <pair_granular>` through its *pair\_coeff* command are also
+friction and twisting friction supported by the :doc:`pair_style granular <pair_granular>` through its *pair_coeff* command are also
 supported for walls. These are discussed in greater detail on the doc
 page for :doc:`pair_style granular <pair_granular>`.
 
@@ -115,7 +111,8 @@ material.
 
 .. note::
 
-   As discussed on the doc page for :doc:`pair_style gran/\* <pair_gran>`, versions of LAMMPS before 9Jan09 used a
+   As discussed on the doc page for :doc:`pair_style gran/\* <pair_gran>`,
+   versions of LAMMPS before 9Jan09 used a
    different equation for Hertzian interactions.  This means Hertizian
    wall/particle interactions have also changed.  They now include a
    sqrt(radius) term which was not present before.  Also the previous
@@ -125,10 +122,10 @@ material.
    appropriately in the current code to reproduce the results of a
    previous Hertzian monodisperse calculation.  For example, for the
    common case of a monodisperse system with particles of diameter 1, Kn,
-   Kt, gamma\_n, and gamma\_s should be set sqrt(2.0) larger than they were
+   Kt, gamma_n, and gamma_s should be set sqrt(2.0) larger than they were
    previously.
 
-The effective mass *m\_eff* in the formulas listed on the :doc:`pair_style granular <pair_gran>` doc page is the mass of the particle for
+The effective mass *m_eff* in the formulas listed on the :doc:`pair_style granular <pair_gran>` doc page is the mass of the particle for
 particle/wall interactions (mass of wall is infinite).  If the
 particle is part of a rigid body, its mass is replaced by the mass of
 the rigid body in those formulas.  This is determined by searching for
@@ -155,7 +152,6 @@ be wiggled in the z dimension.
 Each timestep, the position of a wiggled wall in the appropriate *dim*
 is set according to this equation:
 
-
 .. parsed-literal::
 
    position = coord + A - A cos (omega \* delta)
@@ -175,7 +171,7 @@ the clockwise direction for *vshear* > 0 or counter-clockwise for
 *vshear* < 0.  In this case, *vshear* is the tangential velocity of
 the wall at whatever *radius* has been defined.
 
-**Restart, fix\_modify, output, run start/stop, minimize info:**
+**Restart, fix_modify, output, run start/stop, minimize info:**
 
 This fix writes the shear friction state of atoms interacting with the
 wall to :doc:`binary restart files <restart>`, so that a simulation can
@@ -194,7 +190,6 @@ of this fix can be used with the *start/stop* keywords of the
 Restrictions
 """"""""""""
 
-
 This fix is part of the GRANULAR package.  It is only enabled if
 LAMMPS was built with that package.  See the :doc:`Build package <Build_package>` doc page for more info.
 
@@ -209,8 +204,3 @@ Related commands
 :doc:`pair_style granular <pair_granular>`
 
 **Default:** none
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/fix_wall_gran_region.rst b/doc/src/fix_wall_gran_region.rst
index 3ca17aa440..620baa0942 100644
--- a/doc/src/fix_wall_gran_region.rst
+++ b/doc/src/fix_wall_gran_region.rst
@@ -6,7 +6,6 @@ fix wall/gran/region command
 Syntax
 """"""
 
-
 .. parsed-literal::
 
    fix ID group-ID wall/gran/region fstyle fstyle_params wallstyle regionID
@@ -14,15 +13,15 @@ Syntax
 * ID, group-ID are documented in :doc:`fix <fix>` command
 * wall/region = style name of this fix command
 * fstyle = style of force interactions between particles and wall
-  
+
   .. parsed-literal::
-  
+
        possible choices: hooke, hooke/history, hertz/history, granular
 
-* fstyle\_params = parameters associated with force interaction style
-  
+* fstyle_params = parameters associated with force interaction style
+
   .. parsed-literal::
-  
+
        For *hooke*\ , *hooke/history*\ , and *hertz/history*\ , *fstyle_params* are:
              Kn = elastic constant for normal particle repulsion (force/distance units or pressure units - see discussion below)
              Kt = elastic constant for tangential contact (force/distance units or pressure units - see discussion below)
@@ -31,9 +30,8 @@ Syntax
              xmu = static yield criterion (unitless value between 0.0 and 1.0e4)
              dampflag = 0 or 1 if tangential damping force is excluded or included
 
-  
   .. parsed-literal::
-  
+
        For *granular*\ , *fstyle_params* are set using the same syntax as for the *pair_coeff* command of :doc:`pair_style granular <pair_granular>`
 
 * wallstyle = region (see :doc:`fix wall/gran <fix_wall_gran>` for options for other kinds of walls)
@@ -42,8 +40,7 @@ Syntax
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    fix wall all wall/gran/region hooke/history 1000.0 200.0 200.0 100.0 0.5 1 region myCone
    fix 3 all wall/gran/region granular hooke 1000.0 50.0 tangential linear_nohistory 1.0 0.4 damping velocity region myBox
@@ -62,7 +59,7 @@ non-granular particles and simpler wall geometries, respectively.
 Here are snapshots of example models using this command.
 Corresponding input scripts can be found in examples/granregion.
 Click on the images to see a bigger picture.  Movies of these
-simulations are `here on the Movies page <http://lammps.sandia.gov/movies.html#granregion>`_ of the LAMMPS
+simulations are `here on the Movies page <https://lammps.sandia.gov/movies.html#granregion>`_ of the LAMMPS
 web site.
 
 .. image:: JPG/gran_funnel_small.jpg
@@ -71,10 +68,8 @@ web site.
 .. image:: JPG/gran_mixer_small.jpg
    :target: JPG/gran_mixer.png
 
-
 ----------
 
-
 The distance between a particle and the region boundary is the
 distance to the nearest point on the region surface.  The force the
 wall exerts on the particle is along the direction between that point
@@ -154,35 +149,36 @@ corresponding manner.
 
 The nature of the wall/particle interactions are determined by the
 *fstyle* setting.  It can be any of the styles defined by the
-:doc:`pair_style gran/\* <pair_gran>` or the more general `pair\_style granular <pair_granular.html">`_ commands.  Currently the options are
-*hooke*\ , *hooke/history*\ , or *hertz/history* for the former, and
-*granular* with all the possible options of the associated
-*pair\_coeff* command for the latter.  The equation for the force
+:doc:`pair_style gran/\* <pair_gran>` or the more general
+:doc:`pair_style granular <pair_granular>` commands.  Currently the
+options are *hooke*\ , *hooke/history*\ , or *hertz/history* for the
+former, and *granular* with all the possible options of the associated
+*pair_coeff* command for the latter.  The equation for the force
 between the wall and particles touching it is the same as the
 corresponding equation on the :doc:`pair_style gran/\* <pair_gran>` and
-:doc:`pair\_style\_granular <pair_granular>` doc pages, but the effective
-radius is calculated using the radius of the particle and the radius
-of curvature of the wall at the contact point.
+:doc:`pair_style granular <pair_granular>` doc pages, but the effective
+radius is calculated using the radius of the particle and the radius of
+curvature of the wall at the contact point.
 
 Specifically, delta = radius - r = overlap of particle with wall,
-m\_eff = mass of particle, and RiRj/Ri+Rj is the effective radius, with
+m_eff = mass of particle, and RiRj/Ri+Rj is the effective radius, with
 Rj replaced by the radius of curvature of the wall at the contact
 point.  The radius of curvature can be negative for a concave wall
 section, e.g. the interior of cylinder.  For a flat wall, delta =
-radius - r = overlap of particle with wall, m\_eff = mass of particle,
+radius - r = overlap of particle with wall, m_eff = mass of particle,
 and the effective radius of contact is just the radius of the
 particle.
 
-The parameters *Kn*\ , *Kt*\ , *gamma\_n*, *gamma\_t*, *xmu* and *dampflag*
+The parameters *Kn*\ , *Kt*\ , *gamma_n*, *gamma_t*, *xmu* and *dampflag*
 have the same meaning and units as those specified with the
 :doc:`pair_style gran/\* <pair_gran>` commands.  This means a NULL can be
-used for either *Kt* or *gamma\_t* as described on that page.  If a
+used for either *Kt* or *gamma_t* as described on that page.  If a
 NULL is used for *Kt*\ , then a default value is used where *Kt* = 2/7
-*Kn*\ .  If a NULL is used for *gamma\_t*, then a default value is used
-where *gamma\_t* = 1/2 *gamma\_n*.
+*Kn*\ .  If a NULL is used for *gamma_t*, then a default value is used
+where *gamma_t* = 1/2 *gamma_n*.
 
 All the model choices for cohesion, tangential friction, rolling
-friction and twisting friction supported by the :doc:`pair_style granular <pair_granular>` through its *pair\_coeff* command are also
+friction and twisting friction supported by the :doc:`pair_style granular <pair_granular>` through its *pair_coeff* command are also
 supported for walls. These are discussed in greater detail on the doc
 page for :doc:`pair_style granular <pair_granular>`.
 
@@ -191,7 +187,7 @@ values for the 6 wall/particle coefficients than for particle/particle
 interactions.  E.g. if you wish to model the wall as a different
 material.
 
-**Restart, fix\_modify, output, run start/stop, minimize info:**
+**Restart, fix_modify, output, run start/stop, minimize info:**
 
 Similar to :doc:`fix wall/gran <fix_wall_gran>` command, this fix writes
 the shear friction state of atoms interacting with the wall to :doc:`binary restart files <restart>`, so that a simulation can continue
@@ -228,7 +224,6 @@ of this fix can be used with the *start/stop* keywords of the
 Restrictions
 """"""""""""
 
-
 This fix is part of the GRANULAR package.  It is only enabled if
 LAMMPS was built with that package.  See the :doc:`Build package <Build_package>` doc page for more info.
 
@@ -242,8 +237,3 @@ Related commands
 :doc:`region <region>`
 
 **Default:** none
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/fix_wall_piston.rst b/doc/src/fix_wall_piston.rst
index 863fb2bd86..626634ec83 100644
--- a/doc/src/fix_wall_piston.rst
+++ b/doc/src/fix_wall_piston.rst
@@ -6,7 +6,6 @@ fix wall/piston command
 Syntax
 """"""
 
-
 .. parsed-literal::
 
    fix ID group-ID wall/piston face ... keyword value ...
@@ -16,9 +15,9 @@ Syntax
 * face = *zlo*
 * zero or more keyword/value pairs may be appended
 * keyword = *pos* or *vel* or *ramp* or *units*
-  
+
   .. parsed-literal::
-  
+
        *pos* args = z
          z = z coordinate at which the piston begins (distance units)
        *vel* args = vz
@@ -33,13 +32,10 @@ Syntax
          *lattice* = the wall position is defined in lattice units
          *box* = the wall position is defined in simulation box units
 
-
-
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    fix xwalls all wall/piston zlo
    fix walls all wall/piston zlo pos 1.0 vel 10.0 units box
@@ -92,11 +88,9 @@ A *lattice* value means the distance units are in lattice spacings.
 The :doc:`lattice <lattice>` command must have been previously used to
 define the lattice spacings.
 
-
 ----------
 
-
-**Restart, fix\_modify, output, run start/stop, minimize info:**
+**Restart, fix_modify, output, run start/stop, minimize info:**
 
 No information about this fix is written to :doc:`binary restart files <restart>`.  None of the :doc:`fix_modify <fix_modify>` options
 are relevant to this fix.  No global or per-atom quantities are stored
@@ -107,7 +101,6 @@ the :doc:`run <run>` command.  This fix is not invoked during :doc:`energy minim
 Restrictions
 """"""""""""
 
-
 This fix style is part of the SHOCK package.  It is only enabled if
 LAMMPS was built with that package. See the :doc:`Build package <Build_package>` doc page for more info.
 
@@ -128,8 +121,3 @@ Default
 """""""
 
 The keyword defaults are pos = 0, vel = 0, units = lattice.
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/fix_wall_reflect.rst b/doc/src/fix_wall_reflect.rst
index c6807eee94..3960105ab9 100644
--- a/doc/src/fix_wall_reflect.rst
+++ b/doc/src/fix_wall_reflect.rst
@@ -9,7 +9,6 @@ fix wall/reflect/kk command
 Syntax
 """"""
 
-
 .. parsed-literal::
 
    fix ID group-ID wall/reflect face arg ... keyword value ...
@@ -18,9 +17,9 @@ Syntax
 * wall/reflect = style name of this fix command
 * one or more face/arg pairs may be appended
 * face = *xlo* or *xhi* or *ylo* or *yhi* or *zlo* or *zhi*
-  
+
   .. parsed-literal::
-  
+
        arg = EDGE or constant or variable
          EDGE = current lo edge of simulation box
          constant = number like 0.0 or 30.0 (distance units)
@@ -28,20 +27,17 @@ Syntax
 
 * zero or more keyword/value pairs may be appended
 * keyword = *units*
-  
+
   .. parsed-literal::
-  
+
        *units* value = *lattice* or *box*
          *lattice* = the wall position is defined in lattice units
          *box* = the wall position is defined in simulation box units
 
-
-
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    fix xwalls all wall/reflect xlo EDGE xhi EDGE
    fix walls all wall/reflect xlo 0.0 ylo 10.0 units box
@@ -78,7 +74,7 @@ EDGE is used, then the corresponding boundary of the current
 simulation box is used.  If a numeric constant is specified then the
 wall is placed at that position in the appropriate dimension (x, y, or
 z).  In both the EDGE and constant cases, the wall will never move.
-If the wall position is a variable, it should be specified as v\_name,
+If the wall position is a variable, it should be specified as v_name,
 where name is an :doc:`equal-style variable <variable>` name.  In this
 case the variable is evaluated each timestep and the result becomes
 the current position of the reflecting wall.  Equal-style variables
@@ -99,16 +95,13 @@ A *lattice* value means the distance units are in lattice spacings.
 The :doc:`lattice <lattice>` command must have been previously used to
 define the lattice spacings.
 
-
 ----------
 
-
 Here are examples of variable definitions that move the wall position
 in a time-dependent fashion using equal-style
 :doc:`variables <variable>`.
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    variable ramp equal ramp(0,10)
    fix 1 all wall/reflect xlo v_ramp
@@ -122,34 +115,30 @@ in a time-dependent fashion using equal-style
    variable wiggle equal cwiggle(0.0,5.0,3.0)
    fix 1 all wall/reflect xlo v_wiggle
 
-The ramp(lo,hi) function adjusts the wall position linearly from lo to
-hi over the course of a run.  The vdisplace(c0,velocity) function does
-something similar using the equation position = c0 + velocity\*delta,
-where delta is the elapsed time.
-
-The swiggle(c0,A,period) function causes the wall position to
-oscillate sinusoidally according to this equation, where omega = 2 PI
-/ period:
+The *ramp(lo,hi)* function adjusts the wall position linearly from *lo* to
+*hi* over the course of a run.  The *vdisplace(c0,velocity)* function does
+something similar using the equation *position = c0 + velocity\*delta*\ ,
+where *delta* is the elapsed time.
 
+The *swiggle(c0,A,period)* function causes the wall position to
+oscillate sinusoidally according to this equation, where *omega = 2 PI
+/ period*\ :
 
 .. parsed-literal::
 
    position = c0 + A sin(omega\*delta)
 
-The cwiggle(c0,A,period) function causes the wall position to
+The *cwiggle(c0,A,period)* function causes the wall position to
 oscillate sinusoidally according to this equation, which will have an
 initial wall velocity of 0.0, and thus may impose a gentler
 perturbation on the particles:
 
-
 .. parsed-literal::
 
    position = c0 + A (1 - cos(omega\*delta))
 
-
 ----------
 
-
 Styles with a *gpu*\ , *intel*\ , *kk*\ , *omp*\ , or *opt* suffix are
 functionally the same as the corresponding style without the suffix.
 They have been optimized to run faster, depending on your available
@@ -170,11 +159,9 @@ use the :doc:`suffix <suffix>` command in your input script.
 See the :doc:`Speed packages <Speed_packages>` doc page for more
 instructions on how to use the accelerated styles effectively.
 
-
 ----------
 
-
-**Restart, fix\_modify, output, run start/stop, minimize info:**
+**Restart, fix_modify, output, run start/stop, minimize info:**
 
 No information about this fix is written to :doc:`binary restart files
 <restart>`.  None of the :doc:`fix_modify <fix_modify>` options are
@@ -187,7 +174,6 @@ the :doc:`run <run>` command.  This fix is not invoked during
 Restrictions
 """"""""""""
 
-
 Any dimension (xyz) that has a reflecting wall must be non-periodic.
 
 A reflecting wall should not be used with rigid bodies such as those
@@ -208,14 +194,6 @@ The default for the units keyword is lattice.
 
 ----------
 
-
 .. _Bond1:
 
-
-
 **(Bond)** Bond and Leimkuhler, SIAM J Sci Comput, 30, p 134 (2007).
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/fix_wall_reflect_stochastic.rst b/doc/src/fix_wall_reflect_stochastic.rst
index 3748f4b922..ddeebfbe38 100644
--- a/doc/src/fix_wall_reflect_stochastic.rst
+++ b/doc/src/fix_wall_reflect_stochastic.rst
@@ -6,7 +6,6 @@ fix wall/reflect/stochastic command
 Syntax
 """"""
 
-
 .. parsed-literal::
 
    fix ID group-ID wall/reflect/stochastic rstyle seed face args ... keyword value ...
@@ -17,9 +16,9 @@ Syntax
 * seed = random seed for stochasticity (positive integer)
 * one or more face/args pairs may be appended
 * face = *xlo* or *xhi* or *ylo* or *yhi* or *zlo* or *zhi*
-  
+
   .. parsed-literal::
-  
+
        args = pos temp velx vely velz accomx accomy accomz
          pos = EDGE or constant
            EDGE = current lo or hi edge of simulation box
@@ -33,20 +32,17 @@ Syntax
 
 * zero or more keyword/value pairs may be appended
 * keyword = *units*
-  
+
   .. parsed-literal::
-  
+
        *units* value = *lattice* or *box*
          *lattice* = the wall position is defined in lattice units
          *box* = the wall position is defined in simulation box units
 
-
-
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    fix zwalls all wall/reflect/stochastic diffusive 23424 zlo EDGE 300 0.1 0.1 0 zhi EDGE 200 0.1 0.1 0
    fix ywalls all wall/reflect/stochastic maxwell 345533 ylo 5.0 300 0.1 0.0 0.0 0.8 yhi 10.0 300 0.1 0.0 0.0 0.8
@@ -99,14 +95,11 @@ as defined by the :doc:`units <units>` command, e.g. Angstroms for units
 lattice spacings. The :doc:`lattice <lattice>` command must have been
 previously used to define the lattice spacings.
 
-
 ----------
 
-
 Restrictions
 """"""""""""
 
-
 This fix has the same limitations as the :doc:`fix wall/reflect <fix_wall_reflect>` command.  Any dimension (xyz) that
 has a wall must be non-periodic.  It should not be used with rigid
 bodies such as those defined by the :doc:`fix rigid <fix_rigid>`
@@ -126,32 +119,19 @@ Default
 
 The default for the units keyword is lattice.
 
-
 ----------
 
-
 .. _Maxwell:
 
-
-
 **(Maxwell)** J.C. Maxwell, Philos. Tans. Royal Soc. London, 157: 49-88
 (1867).
 
 .. _CL:
 
-
-
 **(Cercignani)** C. Cercignani and M. Lampis. Trans. Theory
 Stat. Phys. 1, 2, 101 (1971).
 
 .. _To:
 
-
-
 **(To)** Q.D. To, V.H. Vu, G. Lauriat, and
 C. Leonard. J. Math. Phys. 56, 103101 (2015).
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/fix_wall_region.rst b/doc/src/fix_wall_region.rst
index 069221df9d..b3f4733c56 100644
--- a/doc/src/fix_wall_region.rst
+++ b/doc/src/fix_wall_region.rst
@@ -6,7 +6,6 @@ fix wall/region command
 Syntax
 """"""
 
-
 .. parsed-literal::
 
    fix ID group-ID wall/region region-ID style args ... cutoff
@@ -16,28 +15,26 @@ Syntax
 * region-ID = region whose boundary will act as wall
 * style = *lj93* or *lj126* or *lj1043* or *colloid* or *harmonic* or *morse*
 * args for styles *lj93* or *lj126* or *lj1043* or *colloid* or *harmonic* =
-  
+
   .. parsed-literal::
-  
+
         epsilon = strength factor for wall-particle interaction (energy or energy/distance\^2 units)
         sigma = size factor for wall-particle interaction (distance units)
 
 * args for style *morse* =
-  
+
   .. parsed-literal::
-  
+
         D_0 = depth of the potential (energy units)
         alpha = width parameter (1/distance units)
         r_0 = distance of the potential minimum from wall position (distance units)
 
 * cutoff = distance from wall at which wall-particle interaction is cut off (distance units)
 
-
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    fix wall all wall/region mySphere lj93 1.0 1.0 2.5
    fix wall all wall/region mySphere harmonic 1.0 0.0 2.5
@@ -132,38 +129,56 @@ style.
 
 For style *lj93*\ , the energy E is given by the 9/3 potential:
 
-.. image:: Eqs/fix_wall_lj93.jpg
-   :align: center
+.. math::
+
+ E = \epsilon \left[ \frac{2}{15} \left(\frac{\sigma}{r}\right)^{9} -
+                       \left(\frac{\sigma}{r}\right)^3 \right]
+                       \qquad r < r_c
 
 For style *lj126*\ , the energy E is given by the 12/6 potential:
 
-.. image:: Eqs/pair_lj.jpg
-   :align: center
+.. math::
+
+ E = 4 \epsilon \left[ \left(\frac{\sigma}{r}\right)^{12} -
+                       \left(\frac{\sigma}{r}\right)^6 \right]
+                       \qquad r < r_c
 
 For style *wall/lj1043*\ , the energy E is given by the 10/4/3 potential:
 
-.. image:: Eqs/fix_wall_lj1043.jpg
-   :align: center
+.. math::
+
+ E = 2 \pi \epsilon \left[ \frac{2}{5} \left(\frac{\sigma}{r}\right)^{10} -
+                       \left(\frac{\sigma}{r}\right)^4 -
+                       \frac{\sqrt(2)\sigma^3}{3\left(r+\left(0.61/\sqrt(2)\right)\sigma\right)^3}\right]
+                       \qquad r < r_c
 
 For style *colloid*\ , the energy E is given by an integrated form of
 the :doc:`pair_style colloid <pair_colloid>` potential:
 
-.. image:: Eqs/fix_wall_colloid.jpg
-   :align: center
+.. math::
+
+   E = & \epsilon \left[ \frac{\sigma^{6}}{7560}
+   \left(\frac{6R-D}{D^{7}} + \frac{D+8R}{(D+2R)^{7}} \right) \right. \\
+    & \left. - \frac{1}{6} \left(\frac{2R(D+R) + D(D+2R)
+    \left[ \ln D - \ln (D+2R) \right]}{D(D+2R)} \right) \right] \qquad r < r_c
 
 For style *wall/harmonic*\ , the energy E is given by a harmonic spring
 potential (the distance parameter is ignored):
 
-.. image:: Eqs/fix_wall_harmonic.jpg
-   :align: center
+.. math::
+
+   E = \epsilon \quad (r - r_c)^2 \qquad r < r_c
 
 For style *wall/morse*\ , the energy E is given by the Morse potential:
 
-.. image:: Eqs/pair_morse.jpg
-   :align: center
+.. math::
 
-Unlike other styles, this requires three parameters (*D\_0*, *alpha*\ , *r\_0*
-in this order) instead of two like for the other wall styles.
+   E = D_0 \left[ e^{- 2 \alpha (r - r_0)} - 2 e^{- \alpha (r - r_0)} \right]
+       \qquad r < r_c
+
+Unlike other styles, this requires three parameters (:math:`D_0`,
+:math:`\alpha`, and :math:`r_0` in this order) instead of two like
+for the other wall styles.
 
 In all cases, *r* is the distance from the particle to the region
 surface, and Rc is the *cutoff* distance at which the particle and
@@ -171,10 +186,10 @@ surface no longer interact.  The cutoff is always the last argument.
 The energy of the wall potential is shifted so that the wall-particle
 interaction energy is 0.0 at the cutoff distance.
 
-For a full description of these wall styles, see fix\_style
+For a full description of these wall styles, see fix_style
 :doc:`wall <fix_wall>`
 
-**Restart, fix\_modify, output, run start/stop, minimize info:**
+**Restart, fix_modify, output, run start/stop, minimize info:**
 
 No information about this fix is written to :doc:`binary restart files <restart>`.
 
@@ -225,8 +240,3 @@ Related commands
 :doc:`fix wall/gran <fix_wall_gran>`
 
 **Default:** none
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/fix_wall_srd.rst b/doc/src/fix_wall_srd.rst
index 8a4fd22176..5df7345a4d 100644
--- a/doc/src/fix_wall_srd.rst
+++ b/doc/src/fix_wall_srd.rst
@@ -6,7 +6,6 @@ fix wall/srd command
 Syntax
 """"""
 
-
 .. parsed-literal::
 
    fix ID group-ID wall/srd face arg ... keyword value ...
@@ -15,9 +14,9 @@ Syntax
 * wall/srd = style name of this fix command
 * one or more face/arg pairs may be appended
 * face = *xlo* or *xhi* or *ylo* or *yhi* or *zlo* or *zhi*
-  
+
   .. parsed-literal::
-  
+
        *xlo*\ ,\ *ylo*\ ,\ *zlo* arg = EDGE or constant or variable
          EDGE = current lo edge of simulation box
          constant = number like 0.0 or -30.0 (distance units)
@@ -29,20 +28,17 @@ Syntax
 
 * zero or more keyword/value pairs may be appended
 * keyword = *units*
-  
+
   .. parsed-literal::
-  
+
        *units* value = *lattice* or *box*
          *lattice* = the wall position is defined in lattice units
          *box* = the wall position is defined in simulation box units
 
-
-
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    fix xwalls all wall/srd xlo EDGE xhi EDGE
    fix walls all wall/srd xlo 0.0 ylo 10.0 units box
@@ -88,7 +84,7 @@ EDGE is used, then the corresponding boundary of the current
 simulation box is used.  If a numeric constant is specified then the
 wall is placed at that position in the appropriate dimension (x, y, or
 z).  In both the EDGE and constant cases, the wall will never move.
-If the wall position is a variable, it should be specified as v\_name,
+If the wall position is a variable, it should be specified as v_name,
 where name is an :doc:`equal-style variable <variable>` name.  In this
 case the variable is evaluated each timestep and the result becomes
 the current position of the reflecting wall.  Equal-style variables
@@ -137,16 +133,13 @@ A *lattice* value means the distance units are in lattice spacings.
 The :doc:`lattice <lattice>` command must have been previously used to
 define the lattice spacings.
 
-
 ----------
 
-
 Here are examples of variable definitions that move the wall position
 in a time-dependent fashion using equal-style
 :doc:`variables <variable>`.
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    variable ramp equal ramp(0,10)
    fix 1 all wall/srd xlo v_ramp
@@ -160,35 +153,31 @@ in a time-dependent fashion using equal-style
    variable wiggle equal cwiggle(0.0,5.0,3.0)
    fix 1 all wall/srd xlo v_wiggle
 
-The ramp(lo,hi) function adjusts the wall position linearly from lo to
-hi over the course of a run.  The displace(c0,velocity) function does
-something similar using the equation position = c0 + velocity\*delta,
-where delta is the elapsed time.
-
-The swiggle(c0,A,period) function causes the wall position to
-oscillate sinusoidally according to this equation, where omega = 2 PI
-/ period:
+The *ramp(lo,hi)* function adjusts the wall position linearly from *lo*
+to *hi* over the course of a run.  The *vdisplace(c0,velocity)* function
+does something similar using the equation *position = c0 +
+velocity\*delta*, where *delta* is the elapsed time.
 
+The *swiggle(c0,A,period)* function causes the wall position to
+oscillate sinusoidally according to this equation, where *omega = 2 PI
+/ period*\ :
 
 .. parsed-literal::
 
    position = c0 + A sin(omega\*delta)
 
-The cwiggle(c0,A,period) function causes the wall position to
+The *cwiggle(c0,A,period)* function causes the wall position to
 oscillate sinusoidally according to this equation, which will have an
 initial wall velocity of 0.0, and thus may impose a gentler
 perturbation on the particles:
 
-
 .. parsed-literal::
 
    position = c0 + A (1 - cos(omega\*delta))
 
-
 ----------
 
-
-**Restart, fix\_modify, output, run start/stop, minimize info:**
+**Restart, fix_modify, output, run start/stop, minimize info:**
 
 No information about this fix is written to :doc:`binary restart files <restart>`.  None of the :doc:`fix_modify <fix_modify>` options
 are relevant to this fix.
@@ -209,7 +198,6 @@ the :doc:`run <run>` command.  This fix is not invoked during :doc:`energy minim
 Restrictions
 """"""""""""
 
-
 Any dimension (xyz) that has an SRD wall must be non-periodic.
 
 Related commands
@@ -218,8 +206,3 @@ Related commands
 :doc:`fix srd <fix_srd>`
 
 **Default:** none
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/fixes.rst b/doc/src/fixes.rst
index 5a85738c45..eb0215e310 100644
--- a/doc/src/fixes.rst
+++ b/doc/src/fixes.rst
@@ -1,7 +1,6 @@
 Fixes
 #####
 
-
 .. toctree::
    :maxdepth: 1
    :glob:
diff --git a/doc/src/group.rst b/doc/src/group.rst
index 6868dfd268..42e1d29a85 100644
--- a/doc/src/group.rst
+++ b/doc/src/group.rst
@@ -6,16 +6,15 @@ group command
 Syntax
 """"""
 
-
 .. parsed-literal::
 
    group ID style args
 
 * ID = user-defined name of the group
 * style = *delete* or *clear* or *empty* or *region* or         *type* or *id* or *molecule* or *variable* or         *include* or *subtract* or *union* or *intersect* or         *dynamic* or *static*
-  
+
   .. parsed-literal::
-  
+
        *delete* = no args
        *clear* = no args
        *empty* = no args
@@ -46,13 +45,10 @@ Syntax
            *every* value = N = update group every this many timesteps
        *static* = no args
 
-
-
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    group edge region regstrip
    group water type 3 4
@@ -159,8 +155,7 @@ For example, these lines define a variable "eatom" that calculates the
 potential energy of each atom and includes it in the group if its
 potential energy is above the threshold value -3.0.
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    compute         1 all pe/atom
    compute         2 all reduce sum c_1
@@ -172,8 +167,7 @@ potential energy is above the threshold value -3.0.
 
 Note that these lines
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    compute         2 all reduce sum c_1
    thermo_style    custom step temp pe c_2
@@ -224,10 +218,8 @@ The *intersect* style takes a list of two or more existing group names
 as arguments.  Atoms that belong to every one of the listed groups are
 added to the specified group.
 
-
 ----------
 
-
 The *dynamic* style flags an existing or new group as dynamic.  This
 means atoms will be (re)assigned to the group periodically as a
 simulation runs.  This is in contrast to static groups where atoms are
@@ -274,8 +266,7 @@ used to model a quench of the system, freezing atoms outside the
 shrinking sphere, then converting the remaining atoms to a static
 group and running further.
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    variable        nsteps equal 5000
    variable        rad equal 18-(step/v_nsteps)\*(18-5)
@@ -298,14 +289,11 @@ The *static* style removes the setting for a dynamic group, converting
 it to a static group (the default).  The atoms in the static group are
 those currently in the dynamic group.
 
-
 ----------
 
-
 Restrictions
 """"""""""""
 
-
 There can be no more than 32 groups defined at one time, including
 "all".
 
@@ -321,8 +309,3 @@ Default
 """""""
 
 All atoms belong to the "all" group.
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/group2ndx.rst b/doc/src/group2ndx.rst
index 03ce1d6d4a..84e7b6df32 100644
--- a/doc/src/group2ndx.rst
+++ b/doc/src/group2ndx.rst
@@ -9,7 +9,6 @@ ndx2group command
 Syntax
 """"""
 
-
 .. parsed-literal::
 
    group2ndx file group-ID ...
@@ -18,12 +17,10 @@ Syntax
 * file = name of index file to write out or read in
 * zero or more group IDs may be appended
 
-
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    group2ndx allindex.ndx
    group2ndx someindex.ndx upper lower mobile
@@ -52,14 +49,11 @@ recreated. If a group of the same name already exists, it will be completely
 reset. When specifying group IDs, those groups, if present, will be read
 from the index file and restored.
 
-
 ----------
 
-
 Restrictions
 """"""""""""
 
-
 This command requires that atoms have atom IDs, since this is the
 information that is written to the index file.
 
@@ -72,8 +66,3 @@ Related commands
 :doc:`group <group>`, :doc:`dump <dump>`, :doc:`fix colvars <fix_colvars>`
 
 **Default:** none
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/hyper.rst b/doc/src/hyper.rst
index 90268a2c90..d17af1d407 100644
--- a/doc/src/hyper.rst
+++ b/doc/src/hyper.rst
@@ -6,7 +6,6 @@ hyper command
 Syntax
 """"""
 
-
 .. parsed-literal::
 
    hyper N Nevent fix-ID compute-ID keyword values ...
@@ -17,9 +16,9 @@ Syntax
 * compute-ID = ID of a compute that identifies when an event has occurred
 * zero or more keyword/value pairs may be appended
 * keyword = *min* or *dump* or *rebond*
-  
+
   .. parsed-literal::
-  
+
        *min* values = etol ftol maxiter maxeval
          etol = stopping tolerance for energy, used in quenching
          ftol = stopping tolerance for force, used in quenching
@@ -30,13 +29,10 @@ Syntax
        *rebond* value = Nrebond
          Nrebond = frequency at which to reset bonds, even if no event has occurred
 
-
-
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    compute event all event/displace 1.0
    fix HG mobile hyper/global 3.0 0.3 0.4 800.0
@@ -83,7 +79,6 @@ occur.  See the :doc:`prd <prd>` doc page for more info about PRD.
 An HD run has several stages, which are repeated each time an event
 occurs, as explained below.  The logic for an HD run is as follows:
 
-
 .. parsed-literal::
 
    quench
@@ -142,10 +137,8 @@ local hyperdynamics, such as the number of events and the elapsed
 hyper time (accelerated time), And it includes info specific to one or
 the other, depending on which style of fix was specified by *fix-ID*\ .
 
-
 ----------
 
-
 The optional keywords operate as follows.
 
 As explained above, the *min* keyword can be used to specify
@@ -173,14 +166,11 @@ if more frequent resets alter event statistics, perhaps because the
 parameters chosen for defining what is a bond and what is an event are
 producing bad dynamics in the presence of the bias potential.
 
-
 ----------
 
-
 Restrictions
 """"""""""""
 
-
 This command can only be used if LAMMPS was built with the REPLICA
 package.  See the :doc:`Build package <Build_package>` doc
 page for more info.
@@ -195,25 +185,14 @@ Default
 
 The option defaults are min = 0.1 0.1 40 50 and time = steps.
 
-
 ----------
 
-
 .. _Voter2013:
 
-
-
 **(Voter2013)** S. Y. Kim, D. Perez, A. F. Voter, J Chem Phys, 139,
 144110 (2013).
 
 .. _Voter2002hd:
 
-
-
 **(Voter2002)** Voter, Montalenti, Germann, Annual Review of Materials
 Research 32, 321 (2002).
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/if.rst b/doc/src/if.rst
index 3886d35f9c..96a0eca42e 100644
--- a/doc/src/if.rst
+++ b/doc/src/if.rst
@@ -6,7 +6,6 @@ if command
 Syntax
 """"""
 
-
 .. parsed-literal::
 
    if boolean then t1 t2 ... elif boolean f1 f2 ... elif boolean f1 f2 ... else e1 e2 ...
@@ -22,8 +21,7 @@ Syntax
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    if "${steps} > 1000" then quit
    if "${myString} == a10" then quit
@@ -55,7 +53,7 @@ until one is found to be true, in which case its commands (f1, f2,
 ..., fN) are executed.  If no Boolean expression is TRUE, then the
 commands associated with the else keyword, namely (e1, e2, ..., eN),
 are executed.  The elif and else keywords and their associated
-commands are optional.  If they aren't specified and the initial
+commands are optional.  If they are not specified and the initial
 Boolean expression is FALSE, then no commands are executed.
 
 The syntax for Boolean expressions is described below.
@@ -77,8 +75,7 @@ above.
 Note that by using the line continuation character "&", the if command
 can be spread across many lines, though it is still a single command:
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    if "$a < $b" then &
      "print 'Minimum value = $a'" &
@@ -102,8 +99,7 @@ checked, so long as it is current on the timestep when the run
 completes.  As explained on the :doc:`variable <variable>` doc page,
 this can be insured by including the variable in thermodynamic output.
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    variable myTemp equal temp
    label loop
@@ -119,27 +115,24 @@ Here is an example of a double loop which uses the if and
 :doc:`jump <jump>` commands to break out of the inner loop when a
 condition is met, then continues iterating through the outer loop.
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    label       loopa
    variable    a loop 5
      label     loopb
      variable  b loop 5
-     print     "A,B = $a,$b"
-     run       10000
-     if        "$b > 2" then "jump SELF break"
+       print     "A,B = $a,$b"
+       run       10000
+       if        "$b > 2" then "jump SELF break"
      next      b
      jump      in.script loopb
-   label       break
-   variable    b delete
+     label       break
+     variable    b delete
    next        a
    jump        SELF loopa
 
-
 ----------
 
-
 The Boolean expressions for the if and elif keywords have a C-like
 syntax.  Note that each expression is a single argument within the if
 command.  Thus if you want to include spaces in the expression for
@@ -149,7 +142,6 @@ An expression is built out of numbers (which start with a digit or
 period or minus sign) or strings (which start with a letter and can
 contain alphanumeric characters or underscores):
 
-
 .. parsed-literal::
 
    0.2, 100, 1.0e20, -15.4, etc
@@ -157,7 +149,6 @@ contain alphanumeric characters or underscores):
 
 and Boolean operators:
 
-
 .. parsed-literal::
 
    A == B, A != B, A < B, A <= B, A > B, A >= B, A && B, A \|\| B, A \|\^ B, !A
@@ -202,10 +193,8 @@ strings.
 The overall Boolean expression produces a TRUE result if the result is
 non-zero.  If the result is zero, the expression result is FALSE.
 
-
 ----------
 
-
 Restrictions
 """"""""""""
  none
@@ -216,8 +205,3 @@ Related commands
 :doc:`variable <variable>`, :doc:`print <print>`
 
 **Default:** none
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/improper_class2.rst b/doc/src/improper_class2.rst
index ed120acb58..5affc0d4bb 100644
--- a/doc/src/improper_class2.rst
+++ b/doc/src/improper_class2.rst
@@ -1,55 +1,61 @@
-.. index:: improper\_style class2
+.. index:: improper_style class2
 
-improper\_style class2 command
-==============================
+improper_style class2 command
+=============================
 
-improper\_style class2/omp command
-==================================
-
-improper\_style class2/kk command
+improper_style class2/omp command
 =================================
 
+improper_style class2/kk command
+================================
+
 Syntax
 """"""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    improper_style class2
 
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    improper_style class2
    improper_coeff 1 100.0 0
-   improper_coeff \* aa 0.0 0.0 0.0 115.06 130.01 115.06
+   improper_coeff * aa 0.0 0.0 0.0 115.06 130.01 115.06
 
 Description
 """""""""""
 
 The *class2* improper style uses the potential
 
-.. image:: Eqs/improper_class2.jpg
-   :align: center
+.. math::
 
-where Ei is the improper term and Eaa is an angle-angle term.  The 3 X
-terms in Ei are an average over 3 out-of-plane angles.
+   E      = & E_i + E_{aa} \\
+   E_i    = & K [ \frac{\chi_{ijkl} + \chi_{kjli} + \chi_{ljik}}{3} - \chi_0 ]^2 \\
+   E_{aa} = & M_1 (\theta_{ijk} - \theta_1) (\theta_{kjl} - \theta_3) + \\
+            & M_2 (\theta_{ijk} - \theta_1) (\theta_{ijl} - \theta_2) + \\
+            & M_3 (\theta_{ijl} - \theta_2) (\theta_{kjl} - \theta_3)
+
+where :math:`E_i` is the improper term and :math:`E_{aa}` is an
+angle-angle term.  The 3 :math:`\chi` terms in :math:`E_i` are an
+average over 3 out-of-plane angles.
 
 The 4 atoms in an improper quadruplet (listed in the data file read by
-the :doc:`read_data <read_data>` command) are ordered I,J,K,L.  X\_IJKL
-refers to the angle between the plane of I,J,K and the plane of J,K,L,
-and the bond JK lies in both planes.  Similarly for X\_KJLI and X\_LJIK.
+the :doc:`read_data <read_data>` command) are ordered I,J,K,L.
+:math:`\chi_{ijkl}` refers to the angle between the plane of I,J,K and
+the plane of J,K,L, and the bond JK lies in both planes.  Similarly for
+:math:`\chi_{kjli}` and :math:`\chi_{ljik}`.
 Note that atom J appears in the common bonds (JI, JK, JL) of all 3 X
 terms.  Thus J (the 2nd atom in the quadruplet) is the atom of
-symmetry in the 3 X angles.
+symmetry in the 3 :math:`\chi` angles.
 
-The subscripts on the various theta's refer to different combinations
-of 3 atoms (I,J,K,L) used to form a particular angle.  E.g. Theta\_IJL
-is the angle formed by atoms I,J,L with J in the middle.  Theta1,
-theta2, theta3 are the equilibrium positions of those angles.  Again,
+The subscripts on the various :math:`\theta`\ s refer to different
+combinations of 3 atoms (I,J,K,L) used to form a particular angle.
+E.g. :math:`\theta_{ijl}` is the angle formed by atoms I,J,L with J
+in the middle.  :math:`\theta_1`, :math:`\theta_2`, :math:`\theta_3`
+are the equilibrium positions of those angles.  Again,
 atom J (the 2nd atom in the quadruplet) is the atom of symmetry in the
 theta angles, since it is always the center atom.
 
@@ -59,42 +65,41 @@ this is not required.
 
 See :ref:`(Sun) <improper-Sun>` for a description of the COMPASS class2 force field.
 
-Coefficients for the Ei and Eaa formulas must be defined for each
+Coefficients for the :math:`E_i` and :math:`E_{aa}` formulas must be
+defined for each
 improper type via the :doc:`improper_coeff <improper_coeff>` command as
 in the example above, or in the data file or restart files read by the
 :doc:`read_data <read_data>` or :doc:`read_restart <read_restart>`
 commands.
 
-These are the 2 coefficients for the Ei formula:
+These are the 2 coefficients for the :math:`E_i` formula:
 
-* K (energy/radian\^2)
-* X0 (degrees)
+* :math:`K` (energy/radian\^2)
+* :math:`\chi_0` (degrees)
 
-X0 is specified in degrees, but LAMMPS converts it to radians
+:math:`\chi_0` is specified in degrees, but LAMMPS converts it to radians
 internally; hence the units of K are in energy/radian\^2.
 
-For the Eaa formula, each line in a
+For the :math:`E_{aa}` formula, each line in a
 :doc:`improper_coeff <improper_coeff>` command in the input script lists
-7 coefficients, the first of which is "aa" to indicate they are
+7 coefficients, the first of which is *aa* to indicate they are
 AngleAngle coefficients.  In a data file, these coefficients should be
-listed under a "AngleAngle Coeffs" heading and you must leave out the
-"aa", i.e. only list 6 coefficients after the improper type.
+listed under a *AngleAngle Coeffs* heading and you must leave out the
+*aa*, i.e. only list 6 coefficients after the improper type.
 
-* aa
-* M1 (energy/distance)
-* M2 (energy/distance)
-* M3 (energy/distance)
-* theta1 (degrees)
-* theta2 (degrees)
-* theta3 (degrees)
+* *aa*
+* :math:`M_1` (energy/distance)
+* :math:`M_2` (energy/distance)
+* :math:`M_3` (energy/distance)
+* :math:`\theta_1` (degrees)
+* :math:`\theta_2` (degrees)
+* :math:`\theta_3` (degrees)
 
 The theta values are specified in degrees, but LAMMPS converts them to
 radians internally; hence the units of M are in energy/radian\^2.
 
-
 ----------
 
-
 Styles with a *gpu*\ , *intel*\ , *kk*\ , *omp*\ , or *opt* suffix are
 functionally the same as the corresponding style without the suffix.
 They have been optimized to run faster, depending on your available
@@ -113,14 +118,11 @@ by including their suffix, or you can use the :doc:`-suffix command-line switch
 See the :doc:`Speed packages <Speed_packages>` doc page for more
 instructions on how to use the accelerated styles effectively.
 
-
 ----------
 
-
 Restrictions
 """"""""""""
 
-
 This improper style can only be used if LAMMPS was built with the
 CLASS2 package.  See the :doc:`Build package <Build_package>` doc
 page for more info.
@@ -132,17 +134,8 @@ Related commands
 
 **Default:** none
 
-
 ----------
 
-
 .. _improper-Sun:
 
-
-
 **(Sun)** Sun, J Phys Chem B 102, 7338-7364 (1998).
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/improper_coeff.rst b/doc/src/improper_coeff.rst
index 3c50f9bf58..3d2878c517 100644
--- a/doc/src/improper_coeff.rst
+++ b/doc/src/improper_coeff.rst
@@ -1,13 +1,12 @@
-.. index:: improper\_coeff
+.. index:: improper_coeff
 
-improper\_coeff command
-=======================
+improper_coeff command
+======================
 
 Syntax
 """"""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    improper_coeff N args
 
@@ -17,12 +16,11 @@ Syntax
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    improper_coeff 1 300.0 0.0
-   improper_coeff \* 80.2 -1 2
-   improper_coeff \*4 80.2 -1 2
+   improper_coeff * 80.2 -1 2
+   improper_coeff *4 80.2 -1 2
 
 Description
 """""""""""
@@ -42,25 +40,23 @@ to N.  A leading asterisk means all types from 1 to n (inclusive).  A
 trailing asterisk means all types from n to N (inclusive).  A middle
 asterisk means all types from m to n (inclusive).
 
-Note that using an improper\_coeff command can override a previous
+Note that using an improper_coeff command can override a previous
 setting for the same improper type.  For example, these commands set
 the coeffs for all improper types, then overwrite the coeffs for just
 improper type 2:
 
+.. code-block:: LAMMPS
 
-.. parsed-literal::
-
-   improper_coeff \* 300.0 0.0
+   improper_coeff * 300.0 0.0
    improper_coeff 2 50.0 0.0
 
 A line in a data file that specifies improper coefficients uses the
-exact same format as the arguments of the improper\_coeff command in an
+exact same format as the arguments of the improper_coeff command in an
 input script, except that wild-card asterisks should not be used since
 coefficients for all N types must be listed in the file.  For example,
 under the "Improper Coeffs" section of a data file, the line that
 corresponds to the 1st example above would be listed as
 
-
 .. parsed-literal::
 
    1 300.0 0.0
@@ -70,26 +66,21 @@ this rule, in that an additional argument is used in the input script
 to allow specification of the cross-term coefficients.  See its doc
 page for details.
 
-
 ----------
 
-
 The list of all improper styles defined in LAMMPS is given on the
 :doc:`improper_style <improper_style>` doc page.  They are also listed
 in more compact form on the :ref:`Commands improper <improper>` doc page.
 
 On either of those pages, click on the style to display the formula it
 computes and its coefficients as specified by the associated
-improper\_coeff command.
-
+improper_coeff command.
 
 ----------
 
-
 Restrictions
 """"""""""""
 
-
 This command must come after the simulation box is defined by a
 :doc:`read_data <read_data>`, :doc:`read_restart <read_restart>`, or
 :doc:`create_box <create_box>` command.
@@ -103,8 +94,3 @@ Related commands
 :doc:`improper_style <improper_style>`
 
 **Default:** none
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/improper_cossq.rst b/doc/src/improper_cossq.rst
index b8f0c33c29..6e669d3dbe 100644
--- a/doc/src/improper_cossq.rst
+++ b/doc/src/improper_cossq.rst
@@ -1,24 +1,22 @@
-.. index:: improper\_style cossq
+.. index:: improper_style cossq
 
-improper\_style cossq command
-=============================
+improper_style cossq command
+============================
 
-improper\_style cossq/omp command
-=================================
+improper_style cossq/omp command
+================================
 
 Syntax
 """"""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    improper_style cossq
 
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    improper_style cossq
    improper_coeff 1 4.0 0.0
@@ -28,18 +26,19 @@ Description
 
 The *cossq* improper style uses the potential
 
-.. image:: Eqs/improper_cossq.jpg
-   :align: center
+.. math::
 
-where x is the improper angle, x0 is its equilibrium value, and K is a
-prefactor.
+   E = \frac{1}{2} K \cos^2{\left(\chi - \chi_0\right)}
+
+where :math:`\chi` is the improper angle, :math:`\chi_0` is its
+equilibrium value, and :math:`K` is a prefactor.
 
 If the 4 atoms in an improper quadruplet (listed in the data file read
-by the :doc:`read_data <read_data>` command) are ordered I,J,K,L then X
-is the angle between the plane of I,J,K and the plane of J,K,L.
+by the :doc:`read_data <read_data>` command) are ordered I,J,K,L then
+:math:`\chi` is the angle between the plane of I,J,K and the plane of J,K,L.
 Alternatively, you can think of atoms J,K,L as being in a plane, and
-atom I above the plane, and X as a measure of how far out-of-plane I
-is with respect to the other 3 atoms.
+atom I above the plane, and :math:`\chi` as a measure of how far
+out-of-plane I is with respect to the other 3 atoms.
 
 Note that defining 4 atoms to interact in this way, does not mean that
 bonds necessarily exist between I-J, J-K, or K-L, as they would in a
@@ -52,13 +51,11 @@ above, or in the data file or restart files read by the
 :doc:`read_data <read_data>` or :doc:`read_restart <read_restart>`
 commands:
 
-* K (energy)
-* X0 (degrees)
-
+* :math:`K` (energy)
+* :math:`\chi_0` (degrees)
 
 ----------
 
-
 Styles with a *gpu*\ , *intel*\ , *kk*\ , *omp*\ , or *opt* suffix are
 functionally the same as the corresponding style without the suffix.
 They have been optimized to run faster, depending on your available
@@ -77,14 +74,11 @@ by including their suffix, or you can use the :doc:`-suffix command-line switch
 See the :doc:`Speed packages <Speed_packages>` doc page for more
 instructions on how to use the accelerated styles effectively.
 
-
 ----------
 
-
 Restrictions
 """"""""""""
 
-
 This improper style can only be used if LAMMPS was built with the
 USER-MISC package.  See the :doc:`Build package <Build_package>` doc
 page for more info.
@@ -95,8 +89,3 @@ Related commands
 :doc:`improper_coeff <improper_coeff>`
 
 **Default:** none
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/improper_cvff.rst b/doc/src/improper_cvff.rst
index e661d3b84a..a952d9f3b8 100644
--- a/doc/src/improper_cvff.rst
+++ b/doc/src/improper_cvff.rst
@@ -1,27 +1,25 @@
-.. index:: improper\_style cvff
+.. index:: improper_style cvff
 
-improper\_style cvff command
-============================
+improper_style cvff command
+===========================
 
-improper\_style cvff/intel command
-==================================
+improper_style cvff/intel command
+=================================
 
-improper\_style cvff/omp command
-================================
+improper_style cvff/omp command
+===============================
 
 Syntax
 """"""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    improper_style cvff
 
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    improper_style cvff
    improper_coeff 1 80.0 -1 4
@@ -31,8 +29,9 @@ Description
 
 The *cvff* improper style uses the potential
 
-.. image:: Eqs/improper_cvff.jpg
-   :align: center
+.. math::
+
+   E = K [1 + d  \cos (n \phi) ]
 
 where phi is the improper dihedral angle.
 
@@ -54,14 +53,12 @@ above, or in the data file or restart files read by the
 :doc:`read_data <read_data>` or :doc:`read_restart <read_restart>`
 commands:
 
-* K (energy)
-* d (+1 or -1)
-* n (0,1,2,3,4,6)
-
+* :math:`K` (energy)
+* :math:`d` (+1 or -1)
+* :math:`n` (0,1,2,3,4,6)
 
 ----------
 
-
 Styles with a *gpu*\ , *intel*\ , *kk*\ , *omp*\ , or *opt* suffix are
 functionally the same as the corresponding style without the suffix.
 They have been optimized to run faster, depending on your available
@@ -80,14 +77,11 @@ by including their suffix, or you can use the :doc:`-suffix command-line switch
 See the :doc:`Speed packages <Speed_packages>` doc page for more
 instructions on how to use the accelerated styles effectively.
 
-
 ----------
 
-
 Restrictions
 """"""""""""
 
-
 This improper style can only be used if LAMMPS was built with the
 MOLECULE package.  See the :doc:`Build package <Build_package>` doc page
 for more info.
@@ -98,8 +92,3 @@ Related commands
 :doc:`improper_coeff <improper_coeff>`
 
 **Default:** none
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/improper_distance.rst b/doc/src/improper_distance.rst
index 72643a05bd..d5f07f9971 100644
--- a/doc/src/improper_distance.rst
+++ b/doc/src/improper_distance.rst
@@ -1,18 +1,19 @@
-.. index:: improper\_style distance
+.. index:: improper_style distance
 
-improper\_style distance command
-================================
+improper_style distance command
+===============================
 
 Syntax
 """"""
 
-improper\_style distance
+.. code-block:: LAMMPS
+
+   improper_style distance
 
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    improper_style distance
    improper_coeff 1 80.0 100.0
@@ -22,10 +23,11 @@ Description
 
 The *distance* improper style uses the potential
 
-.. image:: Eqs/improper_dist-1.jpg
-   :align: center
+.. math::
 
-where d is the distance between the central atom and the plane formed
+   E = K_2 d^2 + K_4 d^4
+
+where :math:`d` is the distance between the central atom and the plane formed
 by the other three atoms.  If the 4 atoms in an improper quadruplet
 (listed in the data file read by the :doc:`read_data <read_data>`
 command) are ordered I,J,K,L then the I-atom is assumed to be the
@@ -40,20 +42,17 @@ linear dihedral. Normally, the bonds I-J, I-K, I-L would exist for an
 improper to be defined between the 4 atoms.
 
 The following coefficients must be defined for each improper type via
-the improper\_coeff command as in the example above, or in the data
-file or restart files read by the read\_data or read\_restart commands:
-
-* K\_2 (energy/distance\^2)
-* K\_4 (energy/distance\^4)
+the improper_coeff command as in the example above, or in the data
+file or restart files read by the read_data or read_restart commands:
 
+* :math:`K_2` (energy/distance\^2)
+* :math:`K_4` (energy/distance\^4)
 
 ----------
 
-
 Restrictions
 """"""""""""
 
-
 This improper style can only be used if LAMMPS was built with the
 USER-MISC package.  See the :doc:`Build package <Build_package>` doc
 page for more info.
@@ -64,8 +63,3 @@ Related commands
 :doc:`improper_coeff <improper_coeff>`
 
 **Default:** none
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/improper_distharm.rst b/doc/src/improper_distharm.rst
index dcbdfbc656..113941bee4 100644
--- a/doc/src/improper_distharm.rst
+++ b/doc/src/improper_distharm.rst
@@ -1,18 +1,19 @@
-.. index:: improper\_style distharm
+.. index:: improper_style distharm
 
-improper\_style distharm command
-================================
+improper_style distharm command
+===============================
 
 Syntax
 """"""
 
-improper\_style distharm
+.. code-block:: LAMMPS
+
+   improper_style distharm
 
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    improper_style distharm
    improper_coeff 1 25.0 0.5
@@ -22,32 +23,30 @@ Description
 
 The *distharm* improper style uses the potential
 
-.. image:: Eqs/improper_distharm.jpg
-   :align: center
+.. math::
 
-where d is the oriented distance between the central atom and the plane formed
+   E = K (d - d_0)^2
+
+where :math:`d` is the oriented distance between the central atom and the plane formed
 by the other three atoms.  If the 4 atoms in an improper quadruplet
 (listed in the data file read by the :doc:`read_data <read_data>`
 command) are ordered I,J,K,L then the L-atom is assumed to be the
 central atom. Note that this is different from the convention used
-in the improper\_style distance. The distance d is oriented and can take
-on negative values. This may lead to unwanted behavior if d0 is not equal to zero.
+in the improper_style distance. The distance :math:`d` is oriented and can take
+on negative values. This may lead to unwanted behavior if :math:`d_0` is not equal to zero.
 
 The following coefficients must be defined for each improper type via
-the improper\_coeff command as in the example above, or in the data
-file or restart files read by the read\_data or read\_restart commands:
-
-* K (energy/distance\^2)
-* d0 (distance)
+the improper_coeff command as in the example above, or in the data
+file or restart files read by the read_data or read_restart commands:
 
+* :math:`K` (energy/distance\^2)
+* :math:`d_0` (distance)
 
 ----------
 
-
 Restrictions
 """"""""""""
 
-
 This improper style can only be used if LAMMPS was built with the
 USER-YAFF package.  See the :doc:`Build package <Build_package>` doc
 page for more info.
@@ -58,8 +57,3 @@ Related commands
 :doc:`improper_coeff <improper_coeff>`
 
 **Default:** none
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/improper_fourier.rst b/doc/src/improper_fourier.rst
index 23988a49ad..7842e866f6 100644
--- a/doc/src/improper_fourier.rst
+++ b/doc/src/improper_fourier.rst
@@ -1,24 +1,22 @@
-.. index:: improper\_style fourier
+.. index:: improper_style fourier
 
-improper\_style fourier command
-===============================
+improper_style fourier command
+==============================
 
-improper\_style fourier/omp command
-===================================
+improper_style fourier/omp command
+==================================
 
 Syntax
 """"""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    improper_style fourier
 
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    improper_style fourier
    improper_coeff 1 100.0 0.0 1.0 0.5 1
@@ -28,8 +26,9 @@ Description
 
 The *fourier* improper style uses the following potential:
 
-.. image:: Eqs/improper_fourier.jpg
-   :align: center
+.. math::
+
+   E = K [C_0 + C_1 \cos ( \omega) + C_2 \cos( 2 \omega) ]
 
 where K is the force constant, C0, C1, C2 are dimensionless coefficients,
 and omega is the angle between the IL axis and the IJK plane:
@@ -45,16 +44,14 @@ above, or in the data file or restart files read by the
 :doc:`read_data <read_data>` or :doc:`read_restart <read_restart>`
 commands:
 
-* K (energy)
-* C0 (unitless)
-* C1 (unitless)
-* C2 (unitless)
+* :math:`K` (energy)
+* :math:`C_0` (unitless)
+* :math:`C_1` (unitless)
+* :math:`C_2` (unitless)
 * all  (0 or 1, optional)
 
-
 ----------
 
-
 Styles with a *gpu*\ , *intel*\ , *kk*\ , *omp*\ , or *opt* suffix are
 functionally the same as the corresponding style without the suffix.
 They have been optimized to run faster, depending on your available
@@ -73,16 +70,13 @@ by including their suffix, or you can use the :doc:`-suffix command-line switch
 See the :doc:`Speed packages <Speed_packages>` doc page for more
 instructions on how to use the accelerated styles effectively.
 
-
 ----------
 
-
 Restrictions
 """"""""""""
 
-
 This angle style can only be used if LAMMPS was built with the
-USER\_MISC package.  See the :doc:`Build package <Build_package>` doc
+USER_MISC package.  See the :doc:`Build package <Build_package>` doc
 page for more info.
 
 Related commands
@@ -91,8 +85,3 @@ Related commands
 :doc:`improper_coeff <improper_coeff>`
 
 **Default:** none
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/improper_harmonic.rst b/doc/src/improper_harmonic.rst
index d3332c816c..0f525ff34b 100644
--- a/doc/src/improper_harmonic.rst
+++ b/doc/src/improper_harmonic.rst
@@ -1,30 +1,28 @@
-.. index:: improper\_style harmonic
+.. index:: improper_style harmonic
 
-improper\_style harmonic command
-================================
+improper_style harmonic command
+===============================
 
-improper\_style harmonic/intel command
-======================================
+improper_style harmonic/intel command
+=====================================
 
-improper\_style harmonic/kk command
+improper_style harmonic/kk command
+==================================
+
+improper_style harmonic/omp command
 ===================================
 
-improper\_style harmonic/omp command
-====================================
-
 Syntax
 """"""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    improper_style harmonic
 
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    improper_style harmonic
    improper_coeff 1 100.0 0
@@ -34,18 +32,21 @@ Description
 
 The *harmonic* improper style uses the potential
 
-.. image:: Eqs/improper_harmonic.jpg
-   :align: center
+.. math::
 
-where X is the improper angle, X0 is its equilibrium value, and K is a
-prefactor.  Note that the usual 1/2 factor is included in K.
+   E = K (\chi - \chi_0)^2
+
+where :math:`\chi` is the improper angle, :math:`\chi_0` is its equilibrium
+value, and :math:`K` is a prefactor.  Note that the usual 1/2 factor is
+included in :math:`K`.
 
 If the 4 atoms in an improper quadruplet (listed in the data file read
-by the :doc:`read_data <read_data>` command) are ordered I,J,K,L then X
+by the :doc:`read_data <read_data>` command) are ordered I,J,K,L then
+:math:`\chi`
 is the angle between the plane of I,J,K and the plane of J,K,L.
 Alternatively, you can think of atoms J,K,L as being in a plane, and
-atom I above the plane, and X as a measure of how far out-of-plane I
-is with respect to the other 3 atoms.
+atom I above the plane, and :math:`\chi` as a measure of how far out-of-plane
+I is with respect to the other 3 atoms.
 
 Note that defining 4 atoms to interact in this way, does not mean that
 bonds necessarily exist between I-J, J-K, or K-L, as they would in a
@@ -58,16 +59,14 @@ above, or in the data file or restart files read by the
 :doc:`read_data <read_data>` or :doc:`read_restart <read_restart>`
 commands:
 
-* K (energy/radian\^2)
-* X0 (degrees)
+* :math:`K` (energy/radian\^2)
+* :math:`\chi_0` (degrees)
 
-X0 is specified in degrees, but LAMMPS converts it to radians
+:math:`\chi_0` is specified in degrees, but LAMMPS converts it to radians
 internally; hence the units of K are in energy/radian\^2.
 
-
 ----------
 
-
 Styles with a *gpu*\ , *intel*\ , *kk*\ , *omp*\ , or *opt* suffix are
 functionally the same as the corresponding style without the suffix.
 They have been optimized to run faster, depending on your available
@@ -86,14 +85,11 @@ by including their suffix, or you can use the :doc:`-suffix command-line switch
 See the :doc:`Speed packages <Speed_packages>` doc page for more
 instructions on how to use the accelerated styles effectively.
 
-
 ----------
 
-
 Restrictions
 """"""""""""
 
-
 This improper style can only be used if LAMMPS was built with the
 MOLECULE package.  See the :doc:`Build package <Build_package>` doc page
 for more info.
@@ -104,8 +100,3 @@ Related commands
 :doc:`improper_coeff <improper_coeff>`
 
 **Default:** none
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/improper_hybrid.rst b/doc/src/improper_hybrid.rst
index 5b170749cc..9d5c4c696d 100644
--- a/doc/src/improper_hybrid.rst
+++ b/doc/src/improper_hybrid.rst
@@ -1,13 +1,12 @@
-.. index:: improper\_style hybrid
+.. index:: improper_style hybrid
 
-improper\_style hybrid command
-==============================
+improper_style hybrid command
+=============================
 
 Syntax
 """"""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    improper_style hybrid style1 style2 ...
 
@@ -16,8 +15,7 @@ Syntax
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    improper_style hybrid harmonic helix
    improper_coeff 1 harmonic 120.0 30
@@ -34,13 +32,13 @@ boundary (of improper type 2) could be computed with a *cvff*
 potential.  The assignment of improper type to style is made via the
 :doc:`improper_coeff <improper_coeff>` command or in the data file.
 
-In the improper\_coeff command, the first coefficient sets the improper
+In the improper_coeff command, the first coefficient sets the improper
 style and the remaining coefficients are those appropriate to that
-style.  In the example above, the 2 improper\_coeff commands would set
+style.  In the example above, the 2 improper_coeff commands would set
 impropers of improper type 1 to be computed with a *harmonic*
-potential with coefficients 120.0, 30 for K, X0.  Improper type 2
-would be computed with a *cvff* potential with coefficients 20.0, -1,
-2 for K, d, n.
+potential with coefficients 120.0, 30 for :math:`K`, :math:`\chi_0`.
+Improper type 2 would be computed with a *cvff* potential with coefficients
+20.0, -1, 2 for K, d, and n, respectively.
 
 If the improper *class2* potential is one of the hybrid styles, it
 requires additional AngleAngle coefficients be specified in the data
@@ -51,24 +49,22 @@ appropriate to that style.  The AngleAngle coeffs for that improper
 type will then be ignored.
 
 An improper style of *none* can be specified as the 2nd argument to
-the improper\_coeff command, if you desire to turn off certain improper
+the improper_coeff command, if you desire to turn off certain improper
 types.
 
-
 ----------
 
-
 Restrictions
 """"""""""""
 
-
 This improper style can only be used if LAMMPS was built with the
 MOLECULE package.  See the :doc:`Build package <Build_package>` doc page
 for more info.
 
 Unlike other improper styles, the hybrid improper style does not store
-improper coefficient info for individual sub-styles in a :doc:`binary restart files <restart>`.  Thus when restarting a simulation from a
-restart file, you need to re-specify improper\_coeff commands.
+improper coefficient info for individual sub-styles in a :doc:`binary restart files <restart>`.
+Thus when restarting a simulation from a
+restart file, you need to re-specify improper_coeff commands.
 
 Related commands
 """"""""""""""""
@@ -76,8 +72,3 @@ Related commands
 :doc:`improper_coeff <improper_coeff>`
 
 **Default:** none
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/improper_inversion_harmonic.rst b/doc/src/improper_inversion_harmonic.rst
index ecdcad7136..4a4ad9e863 100644
--- a/doc/src/improper_inversion_harmonic.rst
+++ b/doc/src/improper_inversion_harmonic.rst
@@ -1,21 +1,19 @@
-.. index:: improper\_style inversion/harmonic
+.. index:: improper_style inversion/harmonic
 
-improper\_style inversion/harmonic command
-==========================================
+improper_style inversion/harmonic command
+=========================================
 
 Syntax
 """"""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    improper_style inversion/harmonic
 
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    improper_style inversion/harmonic
    improper_coeff 1 18.776340 0.000000
@@ -26,19 +24,20 @@ Description
 The *inversion/harmonic* improper style follows the Wilson-Decius
 out-of-plane angle definition and uses an harmonic potential:
 
-.. image:: Eqs/improper_inversion_harmonic.jpg
-   :align: center
+.. math::
 
-where K is the force constant and omega is the angle evaluated for
-all three axis-plane combinations centered around the atom I.  For
-the IL axis and the IJK plane omega looks as follows:
+   E = K \left(\omega - \omega_0\right)^2
+
+where :math:`K` is the force constant and :math:`\omega` is the angle
+evaluated for all three axis-plane combinations centered around the atom I.
+For the IL axis and the IJK plane :math:`\omega` looks as follows:
 
 .. image:: JPG/umbrella.jpg
    :align: center
 
 Note that the *inversion/harmonic* angle term evaluation differs to
 the :doc:`improper_umbrella <improper_umbrella>` due to the cyclic
-evaluation of all possible angles omega.
+evaluation of all possible angles :math:`\omega`.
 
 The following coefficients must be defined for each improper type via
 the :doc:`improper_coeff <improper_coeff>` command as in the example
@@ -46,21 +45,18 @@ above, or in the data file or restart files read by the
 :doc:`read_data <read_data>` or :doc:`read_restart <read_restart>`
 commands:
 
-* K (energy)
-* omega0 (degrees)
-
-If omega0 = 0 the potential term has a minimum for the planar
-structure.  Otherwise it has two minima at +/- omega0, with a barrier
-in between.
+* :math:`K` (energy)
+* :math:`\omega_0` (degrees)
 
+If :math:`\omega_0 = 0` the potential term has a single minimum for
+the planar structure.  Otherwise it has two minima at +/- :math:`\omega_0`,
+with a barrier in between.
 
 ----------
 
-
 Restrictions
 """"""""""""
 
-
 This improper style can only be used if LAMMPS was built with the
 USER-MOFFF package.  See the :doc:`Build package <Build_package>` doc
 page for more info.
@@ -71,12 +67,3 @@ Related commands
 :doc:`improper_coeff <improper_coeff>`
 
 **Default:** none
-
-
-----------
-
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/improper_none.rst b/doc/src/improper_none.rst
index b348f3aab2..c1c194041a 100644
--- a/doc/src/improper_none.rst
+++ b/doc/src/improper_none.rst
@@ -1,21 +1,19 @@
-.. index:: improper\_style none
+.. index:: improper_style none
 
-improper\_style none command
-============================
+improper_style none command
+===========================
 
 Syntax
 """"""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    improper_style none
 
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    improper_style none
 
@@ -39,8 +37,3 @@ Related commands
 :doc:`improper_style zero <improper_zero>`
 
 **Default:** none
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/improper_ring.rst b/doc/src/improper_ring.rst
index 6cc14ea15a..0634405c0e 100644
--- a/doc/src/improper_ring.rst
+++ b/doc/src/improper_ring.rst
@@ -1,24 +1,22 @@
-.. index:: improper\_style ring
+.. index:: improper_style ring
 
-improper\_style ring command
-============================
+improper_style ring command
+===========================
 
-improper\_style ring/omp command
-================================
+improper_style ring/omp command
+===============================
 
 Syntax
 """"""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    improper_style ring
 
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    improper_style ring
    improper_coeff 1 8000 70.5
@@ -28,17 +26,22 @@ Description
 
 The *ring* improper style uses the potential
 
-.. image:: Eqs/improper_ring.jpg
-   :align: center
+.. math::
 
-where K is a prefactor, theta is the angle formed by the atoms
-specified by (i,j,k,l) indices and theta0 its equilibrium value.
+   E = &\frac{1}{6} K \left(\Delta_{ijl} + \Delta_{ijk} + \Delta_{kjl} \right)^6 \\
+   \Delta_{ijl} = & \cos{\theta_{ijl} - \cos{\theta_0}} \\
+   \Delta_{ijk} = & \cos{\theta_{ijk} - \cos{\theta_0}} \\
+   \Delta_{kjl} = & \cos{\theta_{kjl} - \cos{\theta_0}}
+
+where :math:`K` is a prefactor, :math:`\theta` is the angle formed by
+the atoms specified by (i,j,k,l) indices and :math:`\theta_0` its
+equilibrium value.
 
 If the 4 atoms in an improper quadruplet (listed in the data file read
 by the :doc:`read_data <read_data>` command) are ordered i,j,k,l then
-theta\_\ *ijl* is the angle between atoms i,j and l, theta\_\ *ijk* is the
-angle between atoms i,j and k, theta\_\ *kjl* is the angle between atoms
-j,k, and l.
+:math:`\theta_{ijl}` is the angle between atoms i,j and l,
+:math:`\theta_{ijk}` is the angle between atoms i,j and k,
+:math:`\theta_{kjl}` is the angle between atoms j,k, and l.
 
 The "ring" improper style implements the improper potential introduced
 by Destree et al., in Equation (9) of :ref:`(Destree) <Destree>`.  This
@@ -56,13 +59,11 @@ above, or in the data file or restart files read by the
 :doc:`read_data <read_data>` or :doc:`read_restart <read_restart>`
 commands:
 
-* K (energy)
-* theta0 (degrees)
-
+* :math:`K` (energy)
+* :math:`\theta_0` (degrees)
 
 ----------
 
-
 Styles with a *gpu*\ , *intel*\ , *kk*\ , *omp*\ , or *opt* suffix are
 functionally the same as the corresponding style without the suffix.
 They have been optimized to run faster, depending on your available
@@ -81,14 +82,11 @@ by including their suffix, or you can use the :doc:`-suffix command-line switch
 See the :doc:`Speed packages <Speed_packages>` doc page for more
 instructions on how to use the accelerated styles effectively.
 
-
 ----------
 
-
 Restrictions
 """"""""""""
 
-
 This improper style can only be used if LAMMPS was built with the
 USER-MISC package.  See the :doc:`Build package <Build_package>` doc
 page for more info.
@@ -100,12 +98,5 @@ Related commands
 
 .. _Destree:
 
-
-
 **(Destree)** M. Destree, F. Laupretre, A. Lyulin, and J.-P.  Ryckaert,
 J Chem Phys, 112, 9632 (2000).
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/improper_sqdistharm.rst b/doc/src/improper_sqdistharm.rst
index f54e610c80..2f8723a68c 100644
--- a/doc/src/improper_sqdistharm.rst
+++ b/doc/src/improper_sqdistharm.rst
@@ -1,18 +1,19 @@
-.. index:: improper\_style sqdistharm
+.. index:: improper_style sqdistharm
 
-improper\_style sqdistharm command
-==================================
+improper_style sqdistharm command
+=================================
 
 Syntax
 """"""
 
-improper\_style sqdistharm
+.. code-block:: LAMMPS
+
+   improper_style sqdistharm
 
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    improper_style sqdistharm
    improper_coeff 1 50.0 0.1
@@ -22,33 +23,31 @@ Description
 
 The *sqdistharm* improper style uses the potential
 
-.. image:: Eqs/improper_sqdistharm.jpg
-   :align: center
+.. math::
 
-where d is the distance between the central atom and the plane formed
+   E = K (d^2 - {d_0}^2)^2
+
+where :math:`d` is the distance between the central atom and the plane formed
 by the other three atoms.  If the 4 atoms in an improper quadruplet
 (listed in the data file read by the :doc:`read_data <read_data>`
 command) are ordered I,J,K,L then the L-atom is assumed to be the
 central atom. Note that this is different from the convention used
-in the improper\_style distance.
+in the improper_style distance.
 
 The following coefficients must be defined for each improper type via
-the improper\_coeff command as in the example above, or in the data
-file or restart files read by the read\_data or read\_restart commands:
+the improper_coeff command as in the example above, or in the data
+file or restart files read by the read_data or read_restart commands:
 
-* K (energy/distance\^4)
-* d0\^2 (distance\^2)
-
-Note that d0\^2 (in units distance\^2) has be provided and not d0.
+* :math:`K` (energy/distance\^4)
+* :math:`{d_0}^2` (distance\^2)
 
+Note that :math:`{d_0}^2` (in units distance\^2) has be provided and not :math:`d_0`.
 
 ----------
 
-
 Restrictions
 """"""""""""
 
-
 This improper style can only be used if LAMMPS was built with the
 USER-MISC package.  See the :doc:`Build package <Build_package>` doc
 page for more info.
@@ -59,8 +58,3 @@ Related commands
 :doc:`improper_coeff <improper_coeff>`
 
 **Default:** none
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/improper_style.rst b/doc/src/improper_style.rst
index ee8b75ed3f..0667b8f5b9 100644
--- a/doc/src/improper_style.rst
+++ b/doc/src/improper_style.rst
@@ -1,13 +1,12 @@
-.. index:: improper\_style
+.. index:: improper_style
 
-improper\_style command
-=======================
+improper_style command
+======================
 
 Syntax
 """"""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    improper_style style
 
@@ -16,8 +15,7 @@ Syntax
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    improper_style harmonic
    improper_style cvff
@@ -43,11 +41,11 @@ a data or restart file or via the :doc:`improper_coeff <improper_coeff>`
 command.
 
 All improper potentials store their coefficient data in binary restart
-files which means improper\_style and
+files which means improper_style and
 :doc:`improper_coeff <improper_coeff>` commands do not need to be
 re-specified in an input script that restarts a simulation.  See the
 :doc:`read_restart <read_restart>` command for details on how to do
-this.  The one exception is that improper\_style *hybrid* only stores
+this.  The one exception is that improper_style *hybrid* only stores
 the list of sub-styles in the restart file; improper coefficients need
 to be re-specified.
 
@@ -58,17 +56,15 @@ to be re-specified.
    turn off (or weight) the pairwise interaction that would otherwise
    exist between a group of 4 bonded atoms.
 
-
 ----------
 
-
 Here is an alphabetic list of improper styles defined in LAMMPS.
 Click on the style to display the formula it computes and coefficients
 specified by the associated :doc:`improper_coeff <improper_coeff>`
 command.
 
 Click on the style to display the formula it computes, any additional
-arguments specified in the improper\_style command, and coefficients
+arguments specified in the improper_style command, and coefficients
 specified by the associated :doc:`improper_coeff <improper_coeff>`
 command.
 
@@ -94,15 +90,12 @@ more of (g,i,k,o,t) to indicate which accelerated styles exist.
 
 :doc:`sqdistharm <improper_sqdistharm>` - improper that is harmonic in the square of the out-of-plane distance
 
-
 ----------
 
-
 Restrictions
 """"""""""""
 
-
-Improper styles can only be set for atom\_style choices that allow
+Improper styles can only be set for atom_style choices that allow
 impropers to be defined.
 
 Most improper styles are part of the MOLECULE package.  They are only
@@ -117,12 +110,6 @@ Related commands
 Default
 """""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    improper_style none
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/improper_umbrella.rst b/doc/src/improper_umbrella.rst
index 66f3112fe7..ad070319bc 100644
--- a/doc/src/improper_umbrella.rst
+++ b/doc/src/improper_umbrella.rst
@@ -1,24 +1,22 @@
-.. index:: improper\_style umbrella
+.. index:: improper_style umbrella
 
-improper\_style umbrella command
-================================
+improper_style umbrella command
+===============================
 
-improper\_style umbrella/omp command
-====================================
+improper_style umbrella/omp command
+===================================
 
 Syntax
 """"""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    improper_style umbrella
 
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    improper_style umbrella
    improper_coeff 1 100.0 180.0
@@ -30,18 +28,20 @@ The *umbrella* improper style uses the following potential, which is
 commonly referred to as a classic inversion and used in the
 :doc:`DREIDING <Howto_bioFF>` force field:
 
-.. image:: Eqs/improper_umbrella.jpg
-   :align: center
+.. math::
 
-where K is the force constant and omega is the angle between the IL
+   E = & \frac{1}{2}K\left( \frac{1}{\sin\omega_0}\right) ^2 \left( \cos\omega - \cos\omega_0\right) ^2 \qquad \omega_0 \neq 0^o \\
+   E = & K\left( 1-cos\omega\right)  \qquad \omega_0 = 0^o
+
+where :math:`K` is the force constant and :math:`\omega` is the angle between the IL
 axis and the IJK plane:
 
 .. image:: JPG/umbrella.jpg
    :align: center
 
-If omega0 = 0 the potential term has a minimum for the planar
-structure.  Otherwise it has two minima at +/- omega0, with a barrier
-in between.
+If :math:`\omega_0 = 0` the potential term has a minimum for the planar
+structure.  Otherwise it has two minima at :math:`\omega +/- \omega_0`,
+with a barrier in between.
 
 See :ref:`(Mayo) <umbrella-Mayo>` for a description of the DREIDING force field.
 
@@ -51,13 +51,11 @@ above, or in the data file or restart files read by the
 :doc:`read_data <read_data>` or :doc:`read_restart <read_restart>`
 commands:
 
-* K (energy)
-* omega0 (degrees)
-
+* :math:`K` (energy)
+* :math:`\omega_0` (degrees)
 
 ----------
 
-
 Styles with a *gpu*\ , *intel*\ , *kk*\ , *omp*\ , or *opt* suffix are
 functionally the same as the corresponding style without the suffix.
 They have been optimized to run faster, depending on your available
@@ -76,14 +74,11 @@ by including their suffix, or you can use the :doc:`-suffix command-line switch
 See the :doc:`Speed packages <Speed_packages>` doc page for more
 instructions on how to use the accelerated styles effectively.
 
-
 ----------
 
-
 Restrictions
 """"""""""""
 
-
 This improper style can only be used if LAMMPS was built with the
 MOLECULE package.  See the :doc:`Build package <Build_package>` doc page
 for more info.
@@ -95,18 +90,9 @@ Related commands
 
 **Default:** none
 
-
 ----------
 
-
 .. _umbrella-Mayo:
 
-
-
 **(Mayo)** Mayo, Olfason, Goddard III, J Phys Chem, 94, 8897-8909
 (1990),
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/improper_zero.rst b/doc/src/improper_zero.rst
index 5714749596..354c0d486e 100644
--- a/doc/src/improper_zero.rst
+++ b/doc/src/improper_zero.rst
@@ -1,25 +1,23 @@
-.. index:: improper\_style zero
+.. index:: improper_style zero
 
-improper\_style zero command
-============================
+improper_style zero command
+===========================
 
 Syntax
 """"""
 
+.. code-block:: LAMMPS
 
-.. parsed-literal::
-
-   improper_style zero *nocoeff*
+   improper_style zero [nocoeff]
 
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    improper_style zero
    improper_style zero nocoeff
-   improper_coeff \*
+   improper_coeff *
 
 Description
 """""""""""
@@ -35,7 +33,7 @@ command.  If no improper style is defined, this command cannot be
 used.
 
 The optional *nocoeff* flag allows to read data files with a ImproperCoeff
-section for any improper style. Similarly, any improper\_coeff commands
+section for any improper style. Similarly, any improper_coeff commands
 will only be checked for the improper type number and the rest ignored.
 
 Note that the :doc:`improper_coeff <improper_coeff>` command must be
@@ -51,8 +49,3 @@ Restrictions
 :doc:`improper_style none <improper_none>`
 
 **Default:** none
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/impropers.rst b/doc/src/impropers.rst
index 93b4776d2c..a6653fde7d 100644
--- a/doc/src/impropers.rst
+++ b/doc/src/impropers.rst
@@ -1,7 +1,6 @@
 Improper Styles
 ###############
 
-
 .. toctree::
    :maxdepth: 1
    :glob:
diff --git a/doc/src/include.rst b/doc/src/include.rst
index 9f1a11e8f7..e98ffa05e4 100644
--- a/doc/src/include.rst
+++ b/doc/src/include.rst
@@ -6,7 +6,6 @@ include command
 Syntax
 """"""
 
-
 .. parsed-literal::
 
    include file
@@ -16,8 +15,7 @@ Syntax
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    include newfile
    include in.run2
@@ -45,8 +43,3 @@ Related commands
 :doc:`variable <variable>`, :doc:`jump <jump>`
 
 **Default:** none
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/info.rst b/doc/src/info.rst
index cc41b49f29..77d430ea66 100644
--- a/doc/src/info.rst
+++ b/doc/src/info.rst
@@ -6,7 +6,6 @@ info command
 Syntax
 """"""
 
-
 .. parsed-literal::
 
    info args
@@ -18,8 +17,7 @@ Syntax
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    info system
    info groups computes variables
@@ -128,8 +126,3 @@ Default
 The *out* option has the default *screen*\ .
 
 The *styles* option has the default *all*\ .
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/jump.rst b/doc/src/jump.rst
index bd16c9109f..d597b336d3 100644
--- a/doc/src/jump.rst
+++ b/doc/src/jump.rst
@@ -6,7 +6,6 @@ jump command
 Syntax
 """"""
 
-
 .. parsed-literal::
 
    jump file label
@@ -17,8 +16,7 @@ Syntax
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    jump newfile
    jump in.run2 runloop
@@ -41,8 +39,7 @@ script is re-opened and read again.
    The SELF option is not guaranteed to work when the current input
    script is being read through stdin (standard input), e.g.
 
-
-.. parsed-literal::
+.. code-block:: bash
 
    lmp_g++ < in.script
 
@@ -50,8 +47,7 @@ since the SELF option invokes the C-library rewind() call, which may
 not be supported for stdin on some systems or by some MPI
 implementations.  This can be worked around by using the :doc:`-in command-line switch <Run_options>`, e.g.
 
-
-.. parsed-literal::
+.. code-block:: bash
 
    lmp_g++ -in in.script
 
@@ -60,8 +56,7 @@ the script name as a variable to the input script.  In the latter
 case, a :doc:`variable <variable>` called "fname" could be used in place
 of SELF, e.g.
 
-
-.. parsed-literal::
+.. code-block:: bash
 
    lmp_g++ -var fname in.script < in.script
 
@@ -75,8 +70,7 @@ etc.  The :doc:`next <next>` command is used to exit the loop after 10
 iterations.  When the "a" variable has been incremented for the tenth
 time, it will cause the next jump command to be skipped.
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    variable a loop 10
    label loop
@@ -93,8 +87,7 @@ partitions of 10 procs each.  An in.file containing the example
 variable and jump command will cause each partition to run a different
 simulation.
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    mpirun -np 40 lmp_ibm -partition 4x10 -in in.file
 
@@ -108,8 +101,7 @@ checked, so long as it is current on the timestep when the run
 completes.  As explained on the :doc:`variable <variable>` doc page,
 this can be insured by including the variable in thermodynamic output.
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    variable myTemp equal temp
    label loop
@@ -125,27 +117,25 @@ Here is an example of a double loop which uses the if and
 :doc:`jump <jump>` commands to break out of the inner loop when a
 condition is met, then continues iterating through the outer loop.
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    label       loopa
    variable    a loop 5
      label     loopb
      variable  b loop 5
-     print     "A,B = $a,$b"
-     run       10000
-     if        "$b > 2" then "jump SELF break"
+       print     "A,B = $a,$b"
+       run       10000
+       if        "$b > 2" then "jump SELF break"
      next      b
      jump      in.script loopb
-   label       break
-   variable    b delete
+     label       break
+     variable    b delete
    next        a
    jump        SELF loopa
 
 Restrictions
 """"""""""""
 
-
 If you jump to a file and it does not contain the specified label,
 LAMMPS will come to the end of the file and exit.
 
@@ -156,8 +146,3 @@ Related commands
 :doc:`next <next>`
 
 **Default:** none
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/kim_commands.rst b/doc/src/kim_commands.rst
index ea2f768e7c..99f7efffd5 100644
--- a/doc/src/kim_commands.rst
+++ b/doc/src/kim_commands.rst
@@ -1,42 +1,47 @@
-.. index:: kim\_init
+.. index:: kim_init, kim_interactions, kim_query, kim_param, kim_property
 
-kim\_init command
-=================
+:ref:`kim_init<kim_init command>` command
+=========================================
 
-kim\_interactions command
-=========================
+:ref:`kim_interactions<kim_interactions command>` command
+=========================================================
 
-kim\_query command
-==================
+:ref:`kim_query<kim_query command>` command
+===========================================
 
-kim\_param command
-==================
+:ref:`kim_param<kim_param command>` command
+===========================================
+
+:ref:`kim_property<kim_property command>` command
+=================================================
 
 Syntax
 """"""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    kim_init model user_units unitarg
    kim_interactions typeargs
    kim_query variable formatarg query_function queryargs
    kim_param get param_name index_range variables formatarg
    kim_param set param_name index_range values
+   kim_property create  instance_id property_id
+   kim_property modify  instance_id key key_name key_name_key key_name_value
+   kim_property remove  instance_id key key_name
+   kim_property destroy instance_id
+   kim_property dump    file
 
-.. _formatarg\_options:
-
-
+.. _formatarg_options:
 
 * model = name of the KIM interatomic model (the KIM ID for models archived in OpenKIM)
-* user\_units = the LAMMPS :doc:`units <units>` style assumed in the LAMMPS input script
-* unitarg = *unit\_conversion\_mode* (optional)
-* typeargs = atom type to species mapping (one entry per atom type) or *fixed\_types* for models with a preset fixed mapping
+* user_units = the LAMMPS :doc:`units <units>` style assumed in the LAMMPS input script
+* unitarg = *unit_conversion_mode* (optional)
+* typeargs = atom type to species mapping (one entry per atom type) or *fixed_types* for models with a preset fixed mapping
 * variable(s) = single name or list of names of (string style) LAMMPS variable(s) where a query result or parameter get result is stored. Variables that do not exist will be created by the command.
 * formatarg = *list, split, or explicit* (optional):
-  
+
   .. parsed-literal::
-  
+
      *list* = returns a single string with a list of space separated values
             (e.g. "1.0 2.0 3.0"), which is placed in a LAMMPS variable as
             defined by the *variable* argument. [default for *kim_query*]
@@ -44,19 +49,24 @@ Syntax
             on the prefix specified in *variable* and a number appended to
             indicate which element in the list of values is in the variable.
      *explicit* = returns the values separately in one more more variable names
-            provided as arguments that preceed *formatarg*\ . [default for *kim_param*]
+            provided as arguments that precede *formatarg*\ . [default for *kim_param*]
 
-* query\_function = name of the OpenKIM web API query function to be used
+* query_function = name of the OpenKIM web API query function to be used
 * queryargs = a series of *keyword=value* pairs that represent the web query; supported keywords depend on the query function
-* param\_name = name of a KIM portable model parameter
-* index\_range = KIM portable model parameter index range (an integer for a single element, or pair of integers separated by a colon for a range of elements)
+* param_name = name of a KIM portable model parameter
+* index_range = KIM portable model parameter index range (an integer for a single element, or pair of integers separated by a colon for a range of elements)
 * values = new value(s) to replace the current value(s) of a KIM portable model parameter
+* instance_id = a positive integer identifying the KIM property instance
+* property_id = identifier of a `KIM Property Definition <https://openkim.org/properties>`_, which can be (1) a property short name, (2) the full unique ID of the property (including the contributor and date), (3) a file name corresponding to a local property definition file
+* key_name = one of the keys belonging to the specified KIM property definition
+* key_name_key = a key belonging to a key-value pair (standardized in the `KIM Properties Framework <https://openkim.org/doc/schema/properties-framework>`__)
+* key_name_value = value to be associated with a key_name_key in a key-value pair
+* file = name of a file to write the currently defined set of KIM property instances to
 
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    kim_init SW_StillingerWeber_1985_Si__MO_405512056662_005 metal
    kim_interactions Si
@@ -68,18 +78,27 @@ Examples
    kim_query a0 get_lattice_constant_cubic crystal=["fcc"] species=["Al"] units=["angstrom"]
    kim_param get gamma 1 varGamma
    kim_param set gamma 1 3.0
+   kim_property create  1 atomic-mass
+   kim_property modify  1 key mass source-value 26.98154
+   kim_property modify  1 key species source-value Al
+   kim_property remove  1 key species
+   kim_property destroy 1
+   kim_property dump    results.edn
+
+
+.. _kim_description:
 
 Description
 """""""""""
 
-The set of *kim\_commands* provide a high-level wrapper around the
+The set of *kim_commands* provide a high-level wrapper around the
 `Open Knowledgebase of Interatomic Models (OpenKIM) <https://openkim.org>`_
 repository of interatomic models (IMs) (potentials and force fields),
 so that they can be used by LAMMPS scripts.  These commands do not implement
 any computations directly, but rather generate LAMMPS input commands based
 on the information retrieved from the OpenKIM repository to initialize and
 activate OpenKIM IMs and query their predictions for use in the LAMMPS script.
-All LAMMPS input commands generated and executed by *kim\_commands* are
+All LAMMPS input commands generated and executed by *kim_commands* are
 echoed to the LAMMPS log file.
 
 Benefits of Using OpenKIM IMs
@@ -103,22 +122,18 @@ Reproducibility
 Convenience
 ^^^^^^^^^^^
 
-* IMs in OpenKIM are distributed in binary form along with LAMMPS and can be used in a LAMMPS input script simply by providing their KIM ID in the *kim\_init* command documented on this page.
-* The *kim\_query* web query tool provides the ability to use the predictions of IMs for supported material properties (computed via `KIM Tests <https://openkim.org/doc/evaluation/kim-tests/>`_) as part of a LAMMPS input script setup and analysis.
+* IMs in OpenKIM are distributed in binary form along with LAMMPS and can be used in a LAMMPS input script simply by providing their KIM ID in the *kim_init* command documented on this page.
+* The *kim_query* web query tool provides the ability to use the predictions of IMs for supported material properties (computed via `KIM Tests <https://openkim.org/doc/evaluation/kim-tests/>`_) as part of a LAMMPS input script setup and analysis.
 * Support is provided for unit conversion between the :doc:`unit style <units>` used in the LAMMPS input script and the units required by the OpenKIM IM. This makes it possible to use a single input script with IMs using different units without change and minimizes the likelihood of errors due to incompatible units.
 
-.. _IM\_types:
-
-
+.. _IM_types:
 
 Types of IMs in OpenKIM
 -----------------------
 
 There are two types of IMs archived in OpenKIM:
 
-.. _PM\_type:
-
-
+.. _PM_type:
 
 1. The first type is called a *KIM Portable Model* (PM). A KIM PM is an independent computer implementation of an IM written in one of the languages supported by KIM (C, C++, Fortran) that conforms to the KIM Application Programming Interface (`KIM API <https://openkim.org/kim-api/>`_) Portable Model Interface (PMI) standard. A KIM PM will work seamlessly with any simulation code that supports the KIM API/PMI standard (including LAMMPS; see `complete list of supported codes <https://openkim.org/projects-using-kim/>`_).
 2. The second type is called a *KIM Simulator Model* (SM). A KIM SM is an IM that is implemented natively within a simulation code (\ *simulator*\ ) that supports the KIM API Simulator Model Interface (SMI); in this case LAMMPS. A separate SM package is archived in OpenKIM for each parameterization of the IM, which includes all of the necessary parameter files, LAMMPS commands, and metadata (supported species, units, etc.) needed to run the IM in LAMMPS.
@@ -135,8 +150,7 @@ and supported species, separated by two underscores from the KIM ID itself,
 which begins with an IM code
 (\ *MO* for a KIM Portable Model, and *SM* for a KIM Simulator Model)
 followed by a unique 12-digit code and a 3-digit version identifier.
-By convention SM prefixes begin with *Sim\_* to readily identify them.
-
+By convention SM prefixes begin with *Sim_* to readily identify them.
 
 .. parsed-literal::
 
@@ -151,7 +165,6 @@ access to raw files, and other information.
 The URL for the Model Page is constructed from the
 `extended KIM ID <https://openkim.org/doc/schema/kim-ids/>`_ of the IM:
 
-
 .. parsed-literal::
 
    https://openkim.org/id/extended_KIM_ID
@@ -159,7 +172,6 @@ The URL for the Model Page is constructed from the
 For example, for the Stillinger--Weber potential
 listed above the Model Page is located at:
 
-
 .. parsed-literal::
 
    `https://openkim.org/id/SW_StillingerWeber_1985_Si__MO_405512056662_005 <https://openkim.org/id/SW_StillingerWeber_1985_Si__MO_405512056662_005>`_
@@ -168,11 +180,10 @@ See the `current list of KIM PMs and SMs archived in OpenKIM <https://openkim.or
 This list is sorted by species and can be filtered to display only
 IMs for certain species combinations.
 
-See `Obtaining KIM Models <http://openkim.org/doc/usage/obtaining-models>`_ to
-learn how to install a pre-build binary of the OpenKIM Repository of Models.
+See `Obtaining KIM Models <https://openkim.org/doc/usage/obtaining-models>`_ to
+learn how to install a pre-built binary of the OpenKIM Repository of Models.
 
 .. note::
-
    It is also possible to locally install IMs not archived in OpenKIM,
    in which case their names do not have to conform to the KIM ID format.
 
@@ -180,65 +191,66 @@ Using OpenKIM IMs with LAMMPS
 -----------------------------
 
 Two commands are employed when using OpenKIM IMs, one to select the
-IM and perform necessary initialization (*kim\_init*), and the second
+IM and perform necessary initialization (\ *kim_init*\ ), and the second
 to set up the IM for use by executing any necessary LAMMPS commands
-(*kim\_interactions*). Both are required.
+(\ *kim_interactions*\ ). Both are required.
 
 See the *examples/kim* directory for example input scripts that use KIM PMs
 and KIM SMs.
 
-OpenKIM IM Initialization (*kim\_init*)
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+.. _kim_init command:
 
-The *kim\_init* mode command must be issued **before**
+OpenKIM IM Initialization (*kim_init*)
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+The *kim_init* mode command must be issued **before**
 the simulation box is created (normally at the top of the file).
 This command sets the OpenKIM IM that will be used and may issue
 additional commands changing LAMMPS default settings that are required
 for using the selected IM (such as :doc:`units <units>` or
 :doc:`atom_style <atom_style>`). If needed, those settings can be overridden,
-however, typically a script containing a *kim\_init* command
-would not include *units* and *atom\_style* commands.
+however, typically a script containing a *kim_init* command
+would not include *units* and *atom_style* commands.
 
-The required arguments of *kim\_init* are the *model* name of the
+The required arguments of *kim_init* are the *model* name of the
 IM to be used in the simulation (for an IM archived in OpenKIM this is
 its `extended KIM ID <https://openkim.org/doc/schema/kim-ids/>`_, and
-the *user\_units*, which are the LAMMPS :doc:`units style <units>` used
+the *user_units*, which are the LAMMPS :doc:`units style <units>` used
 in the input script.  (Any dimensioned numerical values in the input
 script and values read in from files are expected to be in the
-*user\_units* system.)
+*user_units* system.)
 
 The selected IM can be either a :ref:`KIM PM or a KIM SM <IM_types>`.
-For a KIM SM, the *kim\_init* command verifies that the SM is designed
+For a KIM SM, the *kim_init* command verifies that the SM is designed
 to work with LAMMPS (and not another simulation code).
 In addition, the LAMMPS version used for defining
 the SM and the LAMMPS version being currently run are
 printed to help diagnose any incompatible changes to input script or
 command syntax between the two LAMMPS versions.
 
-Based on the selected model *kim\_init* may modify the
+Based on the selected model *kim_init* may modify the
 :doc:`atom_style <atom_style>`.
 Some SMs have requirements for this setting. If this is the case, then
-*atom\_style* will be set to the required style. Otherwise, the value is left
-unchanged (which in the absence of an *atom\_style* command in the input script
-is the :doc:`default atom\_style value <atom_style>`).
+*atom_style* will be set to the required style. Otherwise, the value is left
+unchanged (which in the absence of an *atom_style* command in the input script
+is the :doc:`default atom_style value <atom_style>`).
 
-Regarding units, the *kim\_init* command behaves in different ways depending
+Regarding units, the *kim_init* command behaves in different ways depending
 on whether or not *unit conversion mode* is activated as indicated by the
 optional *unitarg* argument.
-If unit conversion mode is **not** active, then *user\_units* must
+If unit conversion mode is **not** active, then *user_units* must
 either match the required units of the IM or the IM must be able
 to adjust its units to match. (The latter is only possible with some KIM PMs;
 SMs can never adjust their units.) If a match is possible, the LAMMPS
 :doc:`units <units>` command is called to set the units to
-*user\_units*. If the match fails, the simulation is terminated with
+*user_units*\ . If the match fails, the simulation is terminated with
 an error.
 
 Here is an example of a LAMMPS script to compute the cohesive energy
 of a face-centered cubic (fcc) lattice for the Ercolessi and Adams (1994)
 potential for Al:
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    kim_init         EAM_Dynamo_ErcolessiAdams_1994_Al__MO_123629422045_005 metal
    boundary         p p p
@@ -252,19 +264,18 @@ potential for Al:
    variable         Ec equal (pe/count(all))/${_u_energy}
    print            "Cohesive Energy = ${EcJ} eV"
 
-The above script will end with an error in the *kim\_init* line if the
+The above script will end with an error in the *kim_init* line if the
 IM is changed to another potential for Al that does not work with *metal*
-units. To address this *kim\_init* offers the *unit\_conversion\_mode*
+units. To address this *kim_init* offers the *unit_conversion_mode*
 as shown below.
-If unit conversion mode *is* active, then *kim\_init* calls the LAMMPS
+If unit conversion mode *is* active, then *kim_init* calls the LAMMPS
 :doc:`units <units>` command to set the units to the IM's required or
-preferred units. Conversion factors between the IM's units and the *user\_units*
+preferred units. Conversion factors between the IM's units and the *user_units*
 are defined for all :doc:`physical quantities <units>` (mass, distance, etc.).
 (Note that converting to or from the "lj" unit style is not supported.)
 These factors are stored as :doc:`internal style variables <variable>` with
 the following standard names:
 
-
 .. parsed-literal::
 
    _u_mass
@@ -292,39 +303,37 @@ script constructs an fcc lattice with a lattice parameter defined in
 meters, computes the total energy, and prints the cohesive energy in
 Joules regardless of the units of the IM.
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    kim_init         EAM_Dynamo_ErcolessiAdams_1994_Al__MO_123629422045_005 si unit_conversion_mode
    boundary         p p p
-   lattice          fcc 4.032e-10\*${_u_distance}
+   lattice          fcc 4.032e-10*${_u_distance}
    region           simbox block 0 1 0 1 0 1 units lattice
    create_box       1 simbox
    create_atoms     1 box
-   mass             1 4.480134e-26\*${_u_mass}
+   mass             1 4.480134e-26*${_u_mass}
    kim_interactions Al
    run              0
    variable         Ec_in_J equal (pe/count(all))/${_u_energy}
    print            "Cohesive Energy = ${Ec_in_J} J"
 
-Note the multiplication by ${\_u_distance} and ${\_u_mass} to convert
-from SI units (specified in the *kim\_init* command) to whatever units the
-IM uses (metal in this case), and the division by ${\_u_energy}
+Note the multiplication by ${_u_distance} and ${_u_mass} to convert
+from SI units (specified in the *kim_init* command) to whatever units the
+IM uses (metal in this case), and the division by ${_u_energy}
 to convert from the IM's energy units to SI units (Joule). This script
 will work correctly for any IM for Al (KIM PM or SM) selected by the
-*kim\_init* command.
+*kim_init* command.
 
 Care must be taken to apply unit conversion to dimensional variables read in
 from a file. For example, if a configuration of atoms is read in from a
 dump file using the :doc:`read_dump <read_dump>` command, the following can
 be done to convert the box and all atomic positions to the correct units:
 
+.. code-block:: LAMMPS
 
-.. parsed-literal::
-
-   variable xyfinal equal xy\*${_u_distance}
-   variable xzfinal equal xz\*${_u_distance}
-   variable yzfinal equal yz\*${_u_distance}
+   variable xyfinal equal xy*${_u_distance}
+   variable xzfinal equal xz*${_u_distance}
+   variable yzfinal equal yz*${_u_distance}
    change_box all x scale ${_u_distance} &
                           y scale ${_u_distance} &
                           z scale ${_u_distance} &
@@ -339,17 +348,19 @@ be done to convert the box and all atomic positions to the correct units:
    all appropriate places in the input script. It is up to the user to do this
    correctly.
 
-OpenKIM IM Execution (*kim\_interactions*)
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+.. _kim_interactions command:
+
+OpenKIM IM Execution (*kim_interactions*)
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 The second and final step in using an OpenKIM IM is to execute the
-*kim\_interactions* command. This command must be preceded by a *kim\_init*
+*kim_interactions* command. This command must be preceded by a *kim_init*
 command and a command that defines the number of atom types *N* (such as
 :doc:`create_box <create_box>`).
-The *kim\_interactions* command has one argument *typeargs*\ . This argument
+The *kim_interactions* command has one argument *typeargs*\ . This argument
 contains either a list of *N* chemical species, which defines a mapping between
 atom types in LAMMPS to the available species in the OpenKIM IM, or the
-keyword *fixed\_types* for models that have a preset fixed mapping (i.e.
+keyword *fixed_types* for models that have a preset fixed mapping (i.e.
 the mapping between LAMMPS atom types and chemical species is defined by
 the model and cannot be changed). In the latter case, the user must consult
 the model documentation to see how many atom types there are and how they
@@ -357,29 +368,26 @@ map to the chemical species.
 
 For example, consider an OpenKIM IM that supports Si and C species.
 If the LAMMPS simulation has four atom types, where the first three are Si,
-and the fourth is C, the following *kim\_interactions* command would be used:
+and the fourth is C, the following *kim_interactions* command would be used:
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    kim_interactions Si Si Si C
 
 Alternatively, for a model with a fixed mapping the command would be:
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    kim_interactions fixed_types
 
-The *kim\_interactions* command performs all the necessary steps to set up
-the OpenKIM IM selected in the *kim\_init* command. The specific actions depend
+The *kim_interactions* command performs all the necessary steps to set up
+the OpenKIM IM selected in the *kim_init* command. The specific actions depend
 on whether the IM is a KIM PM or a KIM SM.  For a KIM PM,
 a :doc:`pair_style kim <pair_kim>` command is executed followed by
-the appropriate *pair\_coeff* command. For example, for the
+the appropriate *pair_coeff* command. For example, for the
 Ercolessi and Adams (1994) KIM PM for Al set by the following commands:
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    kim_init EAM_Dynamo_ErcolessiAdams_1994_Al__MO_123629422045_005 metal
    ...
@@ -387,13 +395,12 @@ Ercolessi and Adams (1994) KIM PM for Al set by the following commands:
    ...
    kim_interactions Al
 
-the *kim\_interactions* command executes the following LAMMPS input commands:
+the *kim_interactions* command executes the following LAMMPS input commands:
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    pair_style kim EAM_Dynamo_ErcolessiAdams_1994_Al__MO_123629422045_005
-   pair_coeff \* \* Al
+   pair_coeff * * Al
 
 For a KIM SM, the generated input commands may be more complex
 and require that LAMMPS is built with the required packages included
@@ -402,8 +409,7 @@ is defined in the SM specification file, which is part of the SM package.
 For example, for the Strachan et al. (2003) ReaxFF SM
 set by the following commands:
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    kim_init Sim_LAMMPS_ReaxFF_StrachanVanDuinChakraborty_2003_CHNO__SM_107643900657_000 real
    ...
@@ -411,45 +417,51 @@ set by the following commands:
    ...
    kim_interactions C H N O
 
-the *kim\_interactions* command executes the following LAMMPS input commands:
+the *kim_interactions* command executes the following LAMMPS input commands:
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    pair_style reax/c lmp_control safezone 2.0 mincap 100
-   pair_coeff \* \* ffield.reax.rdx C H N O
+   pair_coeff * * ffield.reax.rdx C H N O
    fix reaxqeq all qeq/reax 1 0.0 10.0 1.0e-6 param.qeq
 
-Note that the files *lmp\_control*, *ffield.reax.rdx* and *param.qeq*
-are specific to the Strachan et al. (2003) ReaxFF parameterization
-and are archived as part of the SM package in OpenKIM.
-Note also that parameters like cutoff radii and charge tolerances,
-which have an effect on IM predictions, are also included in the
-SM definition ensuring reproducibility.
-
 .. note::
 
-   When using *kim\_init* and *kim\_interactions* to select
+    The files *lmp_control*, *ffield.reax.rdx* and *param.qeq*
+    are specific to the Strachan et al. (2003) ReaxFF parameterization
+    and are archived as part of the SM package in OpenKIM.
+
+.. note::
+
+    Parameters like cutoff radii and charge tolerances,
+    which have an effect on IM predictions, are also included in the
+    SM definition ensuring reproducibility.
+
+.. note::
+
+   When using *kim_init* and *kim_interactions* to select
    and set up an OpenKIM IM, other LAMMPS commands
-   for the same functions (such as pair\_style, pair\_coeff, bond\_style,
-   bond\_coeff, fixes related to charge equilibration, etc.) should normally
+   for the same functions (such as pair_style, pair_coeff, bond_style,
+   bond_coeff, fixes related to charge equilibration, etc.) should normally
    not appear in the input script.
 
-Using OpenKIM Web Queries in LAMMPS (*kim\_query*)
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+.. _kim_query command:
 
-The *kim\_query* command performs a web query to retrieve the predictions
-of an IM set by *kim\_init* for material properties archived in
+Using OpenKIM Web Queries in LAMMPS (*kim_query*)
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+The *kim_query* command performs a web query to retrieve the predictions
+of an IM set by *kim_init* for material properties archived in
 `OpenKIM <https://openkim.org>`_.
 
 .. note::
 
-   The *kim\_query* command must be preceded by a *kim\_init* command.
+   The *kim_query* command must be preceded by a *kim_init* command.
 
-The syntax for the *kim\_query* command is as follows:
+The syntax for the *kim_query* command is as follows:
 
 
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    kim_query variable formatarg query_function queryargs
 
@@ -460,21 +472,21 @@ For the "list" setting of *formatarg* (or if *formatarg* is not
 specified), the result is returned as a space-separated list of
 values in *variable*\ .
 The *formatarg* keyword "split" separates the result values into
-individual variables of the form *prefix\_I*, where *prefix* is set to the
-*kim\_query* *variable* argument and *I* ranges from 1 to the number of
+individual variables of the form *prefix_I*, where *prefix* is set to the
+*kim_query* *variable* argument and *I* ranges from 1 to the number of
 returned values. The number and order of the returned values is determined
 by the type of query performed.  (Note that the "explicit" setting of
-*formatarg* is not supported by *kim\_query*.)
+*formatarg* is not supported by *kim_query*\ .)
 
 .. note::
 
-   *kim\_query* only supports queries that return a single result or
+   *kim_query* only supports queries that return a single result or
    an array of values. More complex queries that return a JSON structure
-   are not currently supported. An attempt to use *kim\_query* in such
+   are not currently supported. An attempt to use *kim_query* in such
    cases will generate an error.
 
-The second required argument *query\_function* is the name of the
-query function to be called (e.g. *get\_lattice\_constant\_cubic*).
+The second required argument *query_function* is the name of the
+query function to be called (e.g. *get_lattice_constant_cubic*\ ).
 All following :doc:`arguments <Commands_parse>` are parameters handed over to
 the web query in the format *keyword=value*\ , where *value* is always
 an array of one or more comma-separated items in brackets.
@@ -487,29 +499,28 @@ is available on the OpenKIM webpage at
 
    All query functions require the *model* keyword, which identifies
    the IM whose predictions are being queried. This keyword is automatically
-   generated by *kim\_query* based on the IM set in *kim\_init* and must not
-   be specified as an argument to *kim\_query*.
+   generated by *kim_query* based on the IM set in *kim_init* and must not
+   be specified as an argument to *kim_query*\ .
 
 .. note::
 
-   Each *query\_function* is associated with a default method (implemented
+   Each *query_function* is associated with a default method (implemented
    as a `KIM Test <https://openkim.org/doc/evaluation/kim-tests/>`_)
    used to compute this property. In cases where there are multiple
    methods in OpenKIM for computing a property, a *method* keyword can
    be provided to select the method of choice.  See the
-   `query documentation <https://openkim.org/doc/repository/kim-query>`_
-   to see which methods are available for a given *query function*\ .
+   `query documentation <https://openkim.org/doc/usage/kim-query>`_
+   to see which methods are available for a given *query_function*\ .
 
-*kim\_query* Usage Examples and Further Clarifications
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+*kim_query* Usage Examples and Further Clarifications
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-The data obtained by *kim\_query* commands can be used as part of the setup
+The data obtained by *kim_query* commands can be used as part of the setup
 or analysis phases of LAMMPS simulations. Some examples are given below.
 
 **Define an equilibrium fcc crystal**
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    kim_init         EAM_Dynamo_ErcolessiAdams_1994_Al__MO_123629422045_005 metal
    boundary         p p p
@@ -517,23 +528,24 @@ or analysis phases of LAMMPS simulations. Some examples are given below.
    lattice          fcc ${a0}
    ...
 
-The *kim\_query* command retrieves from `OpenKIM <https://openkim.org>`_
+The *kim_query* command retrieves from `OpenKIM <https://openkim.org>`_
 the equilibrium lattice constant predicted by the Ercolessi and Adams (1994)
 potential for the fcc structure and places it in
 variable *a0*\ . This variable is then used on the next line to set up the
-crystal. By using *kim\_query*, the user is saved the trouble and possible
+crystal. By using *kim_query*, the user is saved the trouble and possible
 error of tracking this value down, or of having to perform an energy
 minimization to find the equilibrium lattice constant.
 
-Note that in *unit\_conversion\_mode* the results obtained from a
-*kim\_query* would need to be converted to the appropriate units system.
-For example, in the above script, the lattice command would need to be
-changed to: "lattice fcc ${a0}\*${\_u_distance}".
+.. note::
+
+    In *unit_conversion_mode* the results obtained from a
+    *kim_query* would need to be converted to the appropriate units system.
+    For example, in the above script, the lattice command would need to be
+    changed to: "lattice fcc ${a0}*${_u_distance}".
 
 **Define an equilibrium hcp crystal**
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    kim_init         EAM_Dynamo_Mendelev_2007_Zr__MO_848899341753_000 metal
    boundary         p p p
@@ -545,25 +557,24 @@ changed to: "lattice fcc ${a0}\*${\_u_distance}".
                     basis 0.333333 0.666666 0.25 basis 0.666666 0.333333 0.75
    ...
 
-In this case the *kim\_query* returns two arguments (since the hexagonal
+In this case the *kim_query* returns two arguments (since the hexagonal
 close packed (hcp) structure has two independent lattice constants).
 The *formatarg* keyword "split" places the two values into
-the variables *latconst\_1* and *latconst\_2*. (These variables are
+the variables *latconst_1* and *latconst_2*\ . (These variables are
 created if they do not already exist.) For convenience the variables
 *a0* and *c0* are created in order to make the remainder of the
 input script more readable.
 
 **Define a crystal at finite temperature accounting for thermal expansion**
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    kim_init         EAM_Dynamo_ErcolessiAdams_1994_Al__MO_123629422045_005 metal
    boundary         p p p
    kim_query        a0 get_lattice_constant_cubic crystal=["fcc"] species=["Al"] units=["angstrom"]
    kim_query        alpha get_linear_thermal_expansion_coefficient_cubic  crystal=["fcc"] species=["Al"] units=["1/K"] temperature=[293.15] temperature_units=["K"]
    variable         DeltaT equal 300
-   lattice          fcc ${a0}\*${alpha}\*${DeltaT}
+   lattice          fcc ${a0}*${alpha}*${DeltaT}
    ...
 
 As in the previous example, the equilibrium lattice constant is obtained
@@ -578,16 +589,15 @@ potential.
    of the temperature in the above example) it is also possible to pass a
    tolerance indicating how close to the value is considered a match.
    If no tolerance is passed a default value is used. If multiple results
-   are returned (indicating that the tolerance is too large), *kim\_query*
+   are returned (indicating that the tolerance is too large), *kim_query*
    will return an error. See the
-   `query documentation <https://openkim.org/doc/repository/kim-query>`_
+   `query documentation <https://openkim.org/doc/usage/kim-query>`_
    to see which numerical arguments and tolerances are available for a
-   given *query function*\ .
+   given *query_function*\ .
 
 **Compute defect formation energy**
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    kim_init         EAM_Dynamo_ErcolessiAdams_1994_Al__MO_123629422045_005 metal
    ...
@@ -595,7 +605,7 @@ potential.
    ... which is stored in the variable *Etot*
    ...
    kim_query        Ec get_cohesive_energy_cubic crystal=["fcc"] species=["Al"] units=["eV"]
-   variable         Eform equal ${Etot} - count(all)\*${Ec}
+   variable         Eform equal ${Etot} - count(all)*${Ec}
    ...
 
 The defect formation energy *Eform* is computed by subtracting from *Etot* the
@@ -604,7 +614,7 @@ ideal fcc cohesive energy of the atoms in the system obtained from
 
 .. note::
 
-   *kim\_query* commands return results archived in
+   *kim_query* commands return results archived in
    `OpenKIM <https://openkim.org>`_. These results are obtained
    using programs for computing material properties
    (KIM Tests and KIM Test Drivers) that were contributed to OpenKIM.
@@ -612,8 +622,10 @@ ideal fcc cohesive energy of the atoms in the system obtained from
    from these programs are queried is tracked. No other information about
    the nature of the query or its source is recorded.
 
-Accessing KIM Model Parameters from LAMMPS (*kim\_param*)
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+.. _kim_param command:
+
+Accessing KIM Model Parameters from LAMMPS (*kim_param*)
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 All IMs are functional forms containing a set of
 parameters.  The values of these parameters are typically
@@ -635,10 +647,10 @@ of an IM, whereas KIM SMs are wrappers to an IM implemented within LAMMPS.
 Two different mechanisms are provided for accessing IM parameters in these
 two cases:
 
-* For a KIM PM, the *kim\_param* command can be used to *get* and *set* the values of the PM's parameters as explained below.
+* For a KIM PM, the *kim_param* command can be used to *get* and *set* the values of the PM's parameters as explained below.
 * For a KIM SM, the user should consult the documentation page for the specific IM and follow instructions there for how to modify its parameters (if possible).
 
-The *kim\_param get* and *kim\_param set* commands provide an interface
+The *kim_param get* and *kim_param set* commands provide an interface
 to access and change the parameters of a KIM PM that "publishes" its
 parameters and makes them publicly available (see the
 `KIM API documentation <https://kim-api.readthedocs.io/en/devel/features.html>`_
@@ -646,20 +658,19 @@ for details).
 
 .. note::
 
-   The *kim\_param get/set* commands must be preceded by *kim\_init*.
-   The *kim\_param set* command must additionally be preceded by a
-   *kim\_interactions* command (or alternatively by a *pair\_style kim*
-   and *pair\_coeff* commands).  The *kim\_param set* command may be used wherever a *pair\_coeff* command may occur.
+   The *kim_param get/set* commands must be preceded by *kim_init*\ .
+   The *kim_param set* command must additionally be preceded by a
+   *kim_interactions* command (or alternatively by a *pair_style kim*
+   and *pair_coeff* commands).  The *kim_param set* command may be used wherever a *pair_coeff* command may occur.
 
-The syntax for the *kim\_param* command is as follows:
+The syntax for the *kim_param* command is as follows:
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    kim_param get param_name index_range variable formatarg
    kim_param set param_name index_range values
 
-Here, *param\_name* is the name of a KIM PM parameter (which is published
+Here, *param_name* is the name of a KIM PM parameter (which is published
 by the PM and available for access). The specific string used to identify
 a parameter is defined by the PM. For example, for the
 `Stillinger--Weber (SW) potential in OpenKIM <https://openkim.org/id/SW_StillingerWeber_1985_Si__MO_405512056662_005>`_,
@@ -668,7 +679,7 @@ the parameter names are *A, B, p, q, sigma, gamma, cutoff, lambda, costheta0*\ .
 .. note::
 
    The list of all the parameters that a PM exposes for access/mutation are
-   automatically written to the lammps log file when *kim\_init* is called.
+   automatically written to the lammps log file when *kim_init* is called.
 
 Each published parameter of a KIM PM takes the form of an array of
 numerical values. The array can contain one element for a single-valued
@@ -681,41 +692,40 @@ values used for each pairwise combination of the model's six supported species
 (this model does not have parameters specific to individual ternary
 combinations of its supported species).
 
-The *index\_range* argument may either be an integer referring to
+The *index_range* argument may either be an integer referring to
 a specific element within the array associated with the parameter
-specified by *param\_name*, or a pair of integers separated by a colon
+specified by *param_name*, or a pair of integers separated by a colon
 that refer to a slice of this array.  In both cases, one-based indexing is
 used to refer to the entries of the array.
 
-The result of a *get* operation for a specific *index\_range* is stored in
+The result of a *get* operation for a specific *index_range* is stored in
 one or more :doc:`LAMMPS string style variables <variable>` as determined
 by the optional *formatarg* argument :ref:`documented above. <formatarg_options>`
 If not specified, the default for *formatarg* is "explicit" for the
-*kim\_param* command.
+*kim_param* command.
 
 For the case where the result is an array with multiple values
-(i.e. *index\_range* contains a range), the optional "split" or "explicit"
+(i.e. *index_range* contains a range), the optional "split" or "explicit"
 *formatarg* keywords can be used to separate the results into multiple
 variables; see the examples below.
-Multiple parameters can be retrieved with a single call to *kim\_param get*
+Multiple parameters can be retrieved with a single call to *kim_param get*
 by repeating the argument list following *get*\ .
 
 For a *set* operation, the *values* argument contains the new value(s)
-for the element(s) of the parameter specified by *index\_range*. For the case
+for the element(s) of the parameter specified by *index_range*\ . For the case
 where multiple values are being set, *values* contains a set of values
 separated by spaces. Multiple parameters can be set with a single call to
-*kim\_param set* by repeating the argument list following *set*\ .
+*kim_param set* by repeating the argument list following *set*\ .
 
-*kim\_param* Usage Examples and Further Clarifications
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+*kim_param* Usage Examples and Further Clarifications
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 Examples of getting and setting KIM PM parameters with further
 clarifications are provided below.
 
 **Getting a scalar parameter**
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    kim_init         SW_StillingerWeber_1985_Si__MO_405512056662_005 metal
    ...
@@ -728,8 +738,7 @@ LAMMPS variable.
 
 **Getting multiple scalar parameters with a single call**
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    kim_init         SW_StillingerWeber_1985_Si__MO_405512056662_005 metal
    ...
@@ -743,8 +752,7 @@ them in the LAMMPS variables *VARA* and *VARB*\ .
 There are several options when getting a range of values from a parameter
 determined by the *formatarg* argument.
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    kim_init         SW_ZhouWardMartin_2013_CdTeZnSeHgS__MO_503261197030_002 metal
    ...
@@ -752,9 +760,9 @@ determined by the *formatarg* argument.
 
 In this case, *formatarg* is not specified and therefore the default
 "explicit" mode is used. (The behavior would be the same if the word
-*explicit* were added after *LAM\_TeSe*.) Elements 7, 8 and 9 of parameter
+*explicit* were added after *LAM_TeSe*\ .) Elements 7, 8 and 9 of parameter
 lambda retrieved by the *get* operation are placed in the LAMMPS variables
-*LAM\_TeTe*, *LAM\_TeZn* and *LAM\_TeSe*, respectively.
+*LAM_TeTe*, *LAM_TeZn* and *LAM_TeSe*, respectively.
 
 .. note::
 
@@ -766,8 +774,7 @@ lambda retrieved by the *get* operation are placed in the LAMMPS variables
    provided with the driver for the PM being used. A link to the driver
    is provided at the top of the model page.
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    kim_init         SW_ZhouWardMartin_2013_CdTeZnSeHgS__MO_503261197030_002 metal
    ...
@@ -785,11 +792,10 @@ The result of the *get* operation is stored in the LAMMPS variable
 *LAMS* as a string containing the three retrieved values separated
 by spaces, e.g "1.0 2.0 3.0". This can be used in LAMMPS with an
 *index* variable to access the values one at a time within a loop
-as shown in the example. At each iteration of the loop *LAM\_VALUE*
+as shown in the example. At each iteration of the loop *LAM_VALUE*
 contains the current value of lambda.
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    kim_init         SW_ZhouWardMartin_2013_CdTeZnSeHgS__MO_503261197030_002 metal
    ...
@@ -797,14 +803,13 @@ contains the current value of lambda.
 
 In this case, the "split" mode of *formatarg* is used.
 The three values retrieved by the *get* operation are stored in
-the three LAMMPS variables *LAM\_15*, *LAM\_16* and *LAM\_17*.
+the three LAMMPS variables *LAM_15*, *LAM_16* and *LAM_17*\ .
 The provided name "LAM" is used as prefix and the location in
 the lambda array is appended to create the variable names.
 
 **Setting a scalar parameter**
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    kim_init         SW_StillingerWeber_1985_Si__MO_405512056662_005 metal
    ...
@@ -815,8 +820,7 @@ Here, the SW potential's gamma parameter is set to 2.6.  Note that the *get*
 and *set* commands work together, so that a *get* following a *set*
 operation will return the new value that was set. For example:
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    ...
    kim_interactions Si
@@ -826,13 +830,12 @@ operation will return the new value that was set. For example:
    ...
    print            "original gamma = ${ORIG_GAMMA}, new gamma = ${NEW_GAMMA}"
 
-Here, *ORIG\_GAMMA* will contain the original gamma value for the SW
-potential, while *NEW\_GAMMA* will contain the value 2.6.
+Here, *ORIG_GAMMA* will contain the original gamma value for the SW
+potential, while *NEW_GAMMA* will contain the value 2.6.
 
 **Setting multiple scalar parameters with a single call**
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    kim_init         SW_ZhouWardMartin_2013_CdTeZnSeHgS__MO_503261197030_002 metal
    ...
@@ -848,8 +851,7 @@ be used when setting parameters.
 
 **Setting a range of values of a parameter**
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    kim_init         SW_ZhouWardMartin_2013_CdTeZnSeHgS__MO_503261197030_002 metal
    ...
@@ -860,6 +862,421 @@ In this case, elements 2 through 6 of the parameter *sigma*
 are set to the values 2.35214, 2.23869, 2.04516, 2.43269 and 1.80415 in
 order.
 
+.. _kim_property command:
+
+Writing material properties computed in LAMMPS to standard KIM property instance format (*kim_property*)
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+As explained :ref:`above<kim_description>`,
+The OpenKIM system includes a collection of Tests (material property calculation codes),
+Models (interatomic potentials), Predictions, and Reference Data (DFT or experiments).
+Specifically, a KIM Test is a computation that when coupled with a KIM Model generates
+the prediction of that model for a specific material property rigorously defined
+by a KIM Property Definition (see the
+`KIM Properties Framework <https://openkim.org/doc/schema/properties-framework/>`__
+for further details). A prediction of a material property for a given model is a specific
+numerical realization of a property definition, referred to as a "Property
+Instance."  The objective of the *kim_property* command is to make it easy to
+output material properties in a standardized, machine readable, format that can be easily
+ingested by other programs.
+Additionally, it aims to make it as easy as possible to convert a LAMMPS script that computes a
+material property into a KIM Test that can then be uploaded to `openkim.org <https://openkim.org>`_
+
+A developer interested in creating a KIM Test using a LAMMPS script should
+first determine whether a property definition that applies to their calculation
+already exists in OpenKIM by searching the `properties page
+<https://openkim.org/properties>`_.  If none exists, it is possible to use a
+locally defined property definition contained in a file until it can be
+uploaded to the official repository (see below).  Once one or more applicable
+property definitions have been identified, the *kim_property create*,
+*kim_property modify*, *kim_property remove*, and *kim_property destroy*,
+commands provide an interface to create, set, modify, remove, and destroy
+instances of them within a LAMMPS script.  Their general syntax is as follows:
+
+.. code-block:: LAMMPS
+
+   kim_property create  instance_id property_id
+   kim_property modify  instance_id key key_name key_name_key key_name_value
+   kim_property remove  instance_id key key_name
+   kim_property destroy instance_id
+   kim_property dump    file
+
+Here, *instance_id* is a positive integer used to uniquely identify each
+property instance; (note that the results file can contain multiple property
+instances).  A property_id is an identifier of a
+`KIM Property Definition <https://openkim.org/properties>`_,
+which can be (1) a property short name, (2) the full unique ID of the property
+(including the contributor and date), (3) a file name corresponding to a local
+property definition file.  Examples of each of these cases are shown below:
+
+.. code-block:: LAMMPS
+
+   kim_property create 1 atomic-mass
+   kim_property create 2 cohesive-energy-relation-cubic-crystal
+
+.. code-block:: LAMMPS
+
+   kim_property create 1 tag:brunnels@noreply.openkim.org,2016-05-11:property/atomic-mass
+   kim_property create 2 tag:staff@noreply.openkim.org,2014-04-15:property/cohesive-energy-relation-cubic-crystal
+
+.. code-block:: LAMMPS
+
+   kim_property create 1 new-property.edn
+   kim_property create 2 /home/mary/marys-kim-properties/dissociation-energy.edn
+
+In the last example, "new-property.edn" and "/home/mary/marys-kim-properties/dissociation-energy.edn" are the
+names of files that contain user-defined (local) property definitions.
+
+A KIM property instance takes the form of a "map," i.e. a set of key-value
+pairs akin to Perl's hash, Python's dictionary, or Java's Hashtable.  It
+consists of a set of property key names, each of which is referred to here by
+the *key_name* argument, that are defined as part of the relevant KIM Property
+Definition and include only lowercase alphanumeric characters and dashes.  The
+value paired with each property key is itself a map whose possible keys are
+defined as part of the `KIM Properties Framework
+<https://openkim.org/doc/schema/properties-framework>`__; these keys are
+referred to by the *key_name_key* argument and their associated values by the
+*key_name_value* argument.  These values may either be scalars or arrays,
+as stipulated in the property definition.
+
+.. note::
+
+    Each map assigned to a *key_name* must contain the *key_name_key*
+    "source-value" and an associated *key_name_value* of the appropriate
+    type (as defined in the relevant KIM Property Definition).  For keys that are
+    defined as having physical units, the
+    "source-unit" *key_name_key* must also be given a string value recognized
+    by `GNU units <https://www.gnu.org/software/units/>`_.
+
+Once a *kim_property create* command has been given to instantiate a property
+instance, maps associated with the property's keys can be edited using the
+*kim_property modify* command.  In using this command, the special keyword
+"key" should be given, followed by the property key name and the key-value pair
+in the map associated with the key that is to be set.  For example, the
+`atomic-mass <https://openkim.org/properties/show/2016-05-11/brunnels@noreply.openkim.org/atomic-mass>`_
+property definition consists of two property keys named "mass" and "species."
+An instance of this property could be created like so:
+
+.. code-block:: LAMMPS
+
+   kim_property create 1 atomic-mass
+   kim_property modify 1 key species source-value Al
+   kim_property modify 1 key mass    source-value 26.98154
+   kim_property modify 1 key mass    source-unit amu
+
+or, equivalently,
+
+.. code-block:: LAMMPS
+
+   kim_property create 1 atomic-mass
+   kim_property modify 1 key species source-value Al       &
+                         key mass    source-value 26.98154 &
+                                     source-unit  amu
+
+*kim_property* Usage Examples and Further Clarifications
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+**Create**
+
+.. code-block:: LAMMPS
+
+   kim_property create instance_id property_id
+
+The *kim_property create* command takes as input a property instance ID and the
+property definition name, and creates an initial empty property instance data
+structure.  For example,
+
+.. code-block:: LAMMPS
+
+   kim_property create 1 atomic-mass
+   kim_property create 2 cohesive-energy-relation-cubic-crystal
+
+creates an empty property instance of the "atomic-mass" property definition
+with instance ID 1 and an empty instance of the
+"cohesive-energy-relation-cubic-crystal" property with ID 2.  A list of
+published property definitions in OpenKIM can be found on the `properties page
+<https://openkim.org/properties>`_.
+
+One can also provide the name of a file in the current working directory or the
+path of a file containing a valid property definition.  For example,
+
+.. code-block:: LAMMPS
+
+   kim_property create 1 new-property.edn
+
+where "new-property.edn" refers to a file name containing a new property
+definition that does not exist in OpenKIM.
+
+If the *property_id* given cannot be found in OpenKIM and no file of this name
+containing a valid property definition can be found, this command will produce
+an error with an appropriate message.  Calling *kim_property create* with the
+same instance ID multiple times will also produce an error.
+
+**Modify**
+
+.. code-block:: LAMMPS
+
+   kim_property modify instance_id key key_name key_name_key key_name_value
+
+The *kim_property modify* command incrementally builds the property instance
+by receiving property definition keys along with associated arguments. Each
+*key_name* is associated with a map containing one or more key-value pairs (in
+the form of *key_name_key*-*key_name_value* pairs).  For example,
+
+.. code-block:: LAMMPS
+
+   kim_property modify 1 key species source-value Al
+   kim_property modify 1 key mass    source-value 26.98154
+   kim_property modify 1 key mass    source-unit  amu
+
+where the special keyword "key" is followed by a *key_name* ("species" or
+"mass" in the above) and one or more key-value pairs.  These key-value pairs
+may continue until either another "key" keyword is given or the end of the
+command line is reached.  Thus, the above could equivalently be written as
+
+.. code-block:: LAMMPS
+
+   kim_property modify 1 key species source-value Al       &
+                         key mass    source-value 26.98154 &
+                         key mass    source-unit  amu
+
+As an example of modifying multiple key-value pairs belonging to the map of a
+single property key, the following command modifies the map of the
+"cohesive-potential-energy" property key to contain the key "source-unit" which
+is assigned a value of "eV" and the key "digits" which is assigned a value of
+5:
+
+.. code-block:: LAMMPS
+
+   kim_property modify 2 key cohesive-potential-energy source-unit eV digits 5
+
+.. note::
+
+    The relevant data types of the values in the map are handled
+    automatically based on the specification of the key in the
+    KIM Property Definition.  In the example above,
+    this means that the value "eV" will automatically be interpreted as a string
+    while the value 5 will be interpreted as an integer.
+
+The values contained in maps can either be scalars, as in all of the examples
+above, or arrays depending on which is stipulated in the corresponding Property
+Definition.  For one-dimensional arrays, a single one-based index must be
+supplied that indicates which element of the array is to be modified.  For
+multidimensional arrays, multiple indices must be given depending on the
+dimensionality of the array.
+
+.. note::
+
+   All array indexing used by *kim_property modify* is one-based, i.e. the
+   indices are enumerated 1, 2, 3, ...
+
+.. note::
+
+   The dimensionality of arrays are defined in the the corresponding Property
+   Definition.  The extent of each dimension of an array can either be a
+   specific finite number or indefinite and determined at run time.  If
+   an array has a fixed extent, attempting to modify an out-of-range index will
+   fail with an error message.
+
+For example, the "species" property key of the
+`cohesive-energy-relation-cubic-crystal
+<https://openkim.org/properties/show/2014-04-15/staff@noreply.openkim.org/cohesive-energy-relation-cubic-crystal>`_
+property is a one-dimensional array that can contain any number of entries
+based on the number of atoms in the unit cell of a given cubic crystal.  To
+assign an array containing the string "Al" four times to the "source-value" key
+of the "species" property key, we can do so by issuing:
+
+.. code-block:: LAMMPS
+
+   kim_property modify 2 key species source-value 1 Al
+   kim_property modify 2 key species source-value 2 Al
+   kim_property modify 2 key species source-value 3 Al
+   kim_property modify 2 key species source-value 4 Al
+
+.. note::
+
+    No declaration of the number of elements in this array was given;
+    *kim_property modify* will automatically handle memory management to allow
+    an arbitrary number of elements to be added to the array.
+
+.. note::
+
+   In the event that *kim_property modify* is used to set the value of an
+   array index without having set the values of all lesser indices, they will
+   be assigned default values based on the data type associated with the key in
+   the map:
+
+   .. table_from_list::
+      :columns: 2
+
+      * Data type
+      * Default value
+      * int
+      * 0
+      * float
+      * 0.0
+      * string
+      * \"\"
+      * file
+      * \"\"
+
+   For example, doing the following:
+
+   .. code-block:: LAMMPS
+
+      kim_property create 2 cohesive-energy-relation-cubic-crystal
+      kim_property modify 2 key species source-value 4 Al
+
+   will result in the "source-value" key in the map for the property key
+   "species" being assigned the array ["", "", "", "Al"].
+
+For convenience, the index argument provided may refer to an inclusive range of
+indices by specifying two integers separated by a colon (the first integer must
+be less than or equal to the second integer, and no whitespace should be
+included).  Thus, the snippet above could equivalently be written:
+
+.. code-block:: LAMMPS
+
+   kim_property modify 2 key species source-value 1:4 Al Al Al Al
+
+Calling this command with a non-positive index, e.g.
+``kim_property modify 2 key species source-value 0 Al``, or an incorrect
+number of input arguments, e.g.
+``kim_property modify 2 key species source-value 1:4 Al Al``, will result in an
+error.
+
+As an example of modifying multidimensional arrays, consider the "basis-atoms"
+key in the `cohesive-energy-relation-cubic-crystal
+<https://openkim.org/properties/show/2014-04-15/staff@noreply.openkim.org/cohesive-energy-relation-cubic-crystal>`_
+property definition.  This is a two-dimensional array containing the fractional
+coordinates of atoms in the unit cell of the cubic crystal.  In the case of,
+e.g. a conventional fcc unit cell, the "source-value" key in the map associated
+with this key should be assigned the following value:
+
+.. code-block:: LAMMPS
+
+   [[0.0, 0.0, 0.0],
+    [0.5, 0.5, 0.0],
+    [0.5, 0.0, 0.5],
+    [0.0, 0.5, 0.5]]
+
+While each of the twelve components could be set individually, we can instead set
+each row at a time using colon notation:
+
+.. code-block:: LAMMPS
+
+   kim_property modify 2 key basis-atom-coordinates source-value 1 1:3 0.0 0.0 0.0
+   kim_property modify 2 key basis-atom-coordinates source-value 2 1:3 0.5 0.5 0.0
+   kim_property modify 2 key basis-atom-coordinates source-value 3 1:3 0.5 0.0 0.5
+   kim_property modify 2 key basis-atom-coordinates source-value 4 1:3 0.0 0.5 0.5
+
+Where the first index given refers to a row and the second index refers to a
+column.  We could, instead, choose to set each column at a time like so:
+
+.. code-block:: LAMMPS
+
+   kim_property modify 2 key basis-atom-coordinates source-value 1:4 1 0.0 0.5 0.5 0.0 &
+                         key basis-atom-coordinates source-value 1:4 2 0.0 0.5 0.0 0.5 &
+                         key basis-atom-coordinates source-value 1:4 3 0.0 0.0 0.5 0.5
+
+.. note::
+
+   Multiple calls of *kim_property modify* made for the same instance ID
+   can be combined into a single invocation, meaning the following are
+   both valid:
+
+   .. code-block:: LAMMPS
+
+      kim_property modify 2 key basis-atom-coordinates source-value 1 1:3 0.0 0.0 0.0 &
+                            key basis-atom-coordinates source-value 2 1:3 0.5 0.5 0.0 &
+                            key basis-atom-coordinates source-value 3 1:3 0.5 0.0 0.5 &
+                            key basis-atom-coordinates source-value 4 1:3 0.0 0.5 0.5
+
+   .. code-block:: LAMMPS
+
+      kim_property modify 2 key short-name source-value 1 fcc                         &
+                            key species source-value 1:4 Al Al Al Al                  &
+                            key a source-value 1:5 3.9149 4.0000 4.032 4.0817 4.1602  &
+                                  source-unit angstrom                                &
+                                  digits 5                                            &
+                            key basis-atom-coordinates source-value 1 1:3 0.0 0.0 0.0 &
+                            key basis-atom-coordinates source-value 2 1:3 0.5 0.5 0.0 &
+                            key basis-atom-coordinates source-value 3 1:3 0.5 0.0 0.5 &
+                            key basis-atom-coordinates source-value 4 1:3 0.0 0.5 0.5
+
+.. note::
+
+   For multidimensional arrays, only one colon-separated range is allowed
+   in the index listing.  Therefore,
+
+   .. code-block:: LAMMPS
+
+      kim_property modify 2 key basis-atom-coordinates 1 1:3 0.0 0.0 0.0
+
+   is valid but
+
+   .. code-block:: LAMMPS
+
+      kim_property modify 2 key basis-atom-coordinates 1:2 1:3 0.0 0.0 0.0 0.0 0.0 0.0
+
+   is not.
+
+.. note::
+
+   After one sets a value in a map with the *kim_property modify* command,
+   additional calls will overwrite the previous value.
+
+**Remove**
+
+.. code-block:: LAMMPS
+
+   kim_property remove instance_id key key_name
+
+The *kim_property remove* command can be used to remove a property key from a
+property instance.  For example,
+
+.. code-block:: LAMMPS
+
+   kim_property remove 2 key basis-atom-coordinates
+
+**Destroy**
+
+.. code-block:: LAMMPS
+
+   kim_property destroy instance_id
+
+The *kim_property destroy* command deletes a previously created property
+instance ID.  For example,
+
+.. code-block:: LAMMPS
+
+   kim_property destroy 2
+
+.. note::
+
+    If this command is called with an instance ID that does not exist, no
+    error is raised.
+
+**Dump**
+
+The *kim_property dump*  command can be used to write the content of all
+currently defined property instances to a file:
+
+.. code-block:: LAMMPS
+
+   kim_property dump file
+
+For example,
+
+.. code-block:: LAMMPS
+
+   kim_property dump results.edn
+
+.. note::
+
+    Issuing the *kim_property dump* command clears all existing property
+    instances from memory.
+
 Citation of OpenKIM IMs
 -----------------------
 
@@ -878,16 +1295,18 @@ and enables open source efforts like OpenKIM to function.
 Restrictions
 """"""""""""
 
-
-The set of *kim\_commands* is part of the KIM package.  It is only enabled if
+The set of *kim_commands* is part of the KIM package.  It is only enabled if
 LAMMPS is built with that package. A requirement for the KIM package,
 is the KIM API library that must be downloaded from the
 `OpenKIM website <https://openkim.org/kim-api/>`_ and installed before
 LAMMPS is compiled. When installing LAMMPS from binary, the kim-api package
-is a dependency that is automatically downloaded and installed. See the KIM
-section of the :doc:`Packages details <Packages_details>` for details.
+is a dependency that is automatically downloaded and installed. The *kim_query*
+command requires the *libcurl* library to be installed.  The *kim_property*
+command requires *Python* 3.6 or later and the *kim-property* python package to
+be installed. See the KIM section of the :doc:`Packages details <Packages_details>`
+for details.
 
-Furthermore, when using *kim\_commands* to run KIM SMs, any packages required
+Furthermore, when using *kim_commands* to run KIM SMs, any packages required
 by the native potential being used or other commands or fixes that it invokes
 must be installed.
 
@@ -896,25 +1315,14 @@ Related commands
 
 :doc:`pair_style kim <pair_kim>`
 
-
 ----------
 
-
 .. _kim-mainpaper:
 
-
-
 **(Tadmor)** Tadmor, Elliott, Sethna, Miller and Becker, JOM, 63, 17 (2011).
 doi: `https://doi.org/10.1007/s11837-011-0102-6 <https://doi.org/10.1007/s11837-011-0102-6>`_
 
 .. _kim-api:
 
-
-
 **(Elliott)** Elliott, Tadmor and Bernstein, `https://openkim.org/kim-api <https://openkim.org/kim-api>`_ (2011)
 doi: `https://doi.org/10.25950/FF8F563A <https://doi.org/10.25950/FF8F563A>`_
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/kspace_modify.rst b/doc/src/kspace_modify.rst
index c79b9ceb09..afbe1b0043 100644
--- a/doc/src/kspace_modify.rst
+++ b/doc/src/kspace_modify.rst
@@ -1,21 +1,20 @@
-.. index:: kspace\_modify
+.. index:: kspace_modify
 
-kspace\_modify command
-======================
+kspace_modify command
+=====================
 
 Syntax
 """"""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    kspace_modify keyword value ...
 
 * one or more keyword/value pairs may be listed
 * keyword = *collective* or *compute* or *cutoff/adjust* or *diff* or *disp/auto* or *fftbench* or *force/disp/kspace* or *force/disp/real* or *force* or *gewald/disp* or *gewald* or *kmax/ewald* or *mesh* or *minorder* or *mix/disp* or *order/disp* or *order* or *overlap* or *scafacos* or *slab* or *splittol*
-  
+
   .. parsed-literal::
-  
+
        *collective* value = *yes* or *no*
        *compute* value = *yes* or *no*
        *cutoff/adjust* value = *yes* or *no*
@@ -56,13 +55,10 @@ Syntax
        *splittol* value = tol
          tol = relative size of two eigenvalues (see discussion below)
 
-
-
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    kspace_modify mesh 24 24 30 order 6
    kspace_modify slab 3.0
@@ -75,10 +71,8 @@ Set parameters used by the kspace solvers defined by the
 :doc:`kspace_style <kspace_style>` command.  Not all parameters are
 relevant to all kspace styles.
 
-
 ----------
 
-
 The *collective* keyword applies only to PPPM.  It is set to *no* by
 default, except on IBM BlueGene machines.  If this option is set to
 *yes*\ , LAMMPS will use MPI collective operations to remap data for
@@ -87,10 +81,8 @@ This is faster on IBM BlueGene machines, and may also be faster on
 other machines if they have an efficient implementation of MPI
 collective operations and adequate hardware.
 
-
 ----------
 
-
 The *compute* keyword allows Kspace computations to be turned off,
 even though a :doc:`kspace_style <kspace_style>` is defined.  This is
 not useful for running a real simulation, but can be useful for
@@ -100,10 +92,8 @@ defining a :doc:`kspace_style <kspace_style>`, but a Kspace-compatible
 :doc:`pair_style <pair_style>` requires a kspace style to be defined.
 This keyword gives you that option.
 
-
 ----------
 
-
 The *cutoff/adjust* keyword applies only to MSM. If this option is
 turned on, the Coulombic cutoff will be automatically adjusted at the
 beginning of the run to give the desired estimated error. Other
@@ -113,10 +103,8 @@ grid that minimizes cost using an estimate given by
 :ref:`(Hardy) <Hardy1>`. Note that this cost estimate is not exact, somewhat
 experimental, and still may not yield the optimal parameters.
 
-
 ----------
 
-
 The *diff* keyword specifies the differentiation scheme used by the
 PPPM method to compute forces on particles given electrostatic
 potentials on the PPPM mesh.  The *ik* approach is the default for
@@ -140,10 +128,8 @@ always used for MSM.
    Currently, not all PPPM styles support the *ad* option.  Support
    for those PPPM variants will be added later.
 
-
 ----------
 
-
 The *disp/auto* option controls whether the pppm/disp is allowed to
 generate PPPM parameters automatically. If set to *no*\ , parameters have
 to be specified using the *gewald/disp*\ , *mesh/disp*\ ,
@@ -155,29 +141,23 @@ will provide simulations that are either inaccurate or slow. Using this
 option is thus not recommended. For guidelines on how to obtain good
 parameters, see the :doc:`How-To <Howto_dispersion>` discussion.
 
-
 ----------
 
-
 The *fftbench* keyword applies only to PPPM. It is off by default. If
 this option is turned on, LAMMPS will perform a short FFT benchmark
 computation and report its timings, and will thus finish a some seconds
 later than it would if this option were off.
 
-
 ----------
 
-
 The *force/disp/real* and *force/disp/kspace* keywords set the force
 accuracy for the real and space computations for the dispersion part
 of pppm/disp. As shown in :ref:`(Isele-Holder) <Isele-Holder1>`, optimal
 performance and accuracy in the results is obtained when these values
 are different.
 
-
 ----------
 
-
 The *force* keyword overrides the relative accuracy parameter set by
 the :doc:`kspace_style <kspace_style>` command with an absolute
 accuracy.  The accuracy determines the RMS error in per-atom forces
@@ -188,10 +168,8 @@ conjunction with the pairwise cutoff to determine the number of
 K-space vectors for style *ewald*\ , the FFT grid size for style
 *pppm*\ , or the real space grid size for style *msm*\ .
 
-
 ----------
 
-
 The *gewald* keyword sets the value of the Ewald or PPPM G-ewald
 parameter for charge as *rinv* in reciprocal distance units.  Without
 this setting, LAMMPS chooses the parameter automatically as a function
@@ -203,18 +181,14 @@ and G-ewald parameter automatically.  If the value is set to 0.0,
 LAMMPS will choose the G-ewald parameter automatically.  MSM does not
 use the *gewald* parameter.
 
-
 ----------
 
-
 The *gewald/disp* keyword sets the value of the Ewald or PPPM G-ewald
 parameter for dispersion as *rinv* in reciprocal distance units.  It
 has the same meaning as the *gewald* setting for Coulombics.
 
-
 ----------
 
-
 The *kmax/ewald* keyword sets the number of kspace vectors in each
 dimension for kspace style *ewald*\ .  The three values must be positive
 integers, or else (0,0,0), which unsets the option.  When this option
@@ -223,10 +197,8 @@ consistent with the user-specified accuracy and pairwise cutoff. In
 any case, if kspace style *ewald* is invoked, the values used are
 printed to the screen and the log file at the start of the run.
 
-
 ----------
 
-
 The *mesh* keyword sets the grid size for kspace style *pppm* or
 *msm*\ .  In the case of PPPM, this is the FFT mesh, and each dimension
 must be factorizable into powers of 2, 3, and 5.  In the case of MSM,
@@ -236,10 +208,8 @@ or MSM solver chooses its own grid size, consistent with the
 user-specified accuracy and pairwise cutoff.  Values for x,y,z of
 0,0,0 unset the option.
 
-
 ----------
 
-
 The *mesh/disp* keyword sets the grid size for kspace style
 *pppm/disp*\ .  This is the FFT mesh for long-range dispersion and ach
 dimension must be factorizable into powers of 2, 3, and 5.  When this
@@ -247,10 +217,8 @@ option is not set, the PPPM solver chooses its own grid size,
 consistent with the user-specified accuracy and pairwise cutoff.
 Values for x,y,z of 0,0,0 unset the option.
 
-
 ----------
 
-
 The *minorder* keyword allows LAMMPS to reduce the *order* setting if
 necessary to keep the communication of ghost grid point limited to
 exchanges between nearest-neighbor processors.  See the discussion of
@@ -266,10 +234,8 @@ error if the grid communication is non-nearest-neighbor and *overlap*
 is set to *no*\ . The *minorder* keyword is not currently supported in
 MSM.
 
-
 ----------
 
-
 The *mix/disp* keyword selects the mixing rule for the dispersion
 coefficients.  With *pair*\ , the dispersion coefficients of unlike
 types are computed as indicated with :doc:`pair_modify <pair_modify>`.
@@ -288,10 +254,8 @@ dispersion coefficients is approximated. This leads to faster
 computations, but the accuracy in the reciprocal space computations of
 the dispersion part is decreased.
 
-
 ----------
 
-
 The *order* keyword determines how many grid spacings an atom's charge
 extends when it is mapped to the grid in kspace style *pppm* or *msm*\ .
 The default for this parameter is 5 for PPPM and 8 for MSM, which
@@ -314,19 +278,15 @@ be generated indicating the order parameter is being reduced to allow
 LAMMPS to run the problem. Automatic adjustment of the order parameter
 is not supported in MSM.
 
-
 ----------
 
-
 The *order/disp* keyword determines how many grid spacings an atom's
 dispersion term extends when it is mapped to the grid in kspace style
 *pppm/disp*\ .  It has the same meaning as the *order* setting for
 Coulombics.
 
-
 ----------
 
-
 The *overlap* keyword can be used in conjunction with the *minorder*
 keyword with the PPPM styles to adjust the amount of communication
 that occurs when values on the FFT grid are exchanged between
@@ -342,10 +302,8 @@ communication will be limited to nearest-neighbor processors and the
 *minorder* keyword discussion. The *overlap* keyword is always set to
 *yes* in MSM.
 
-
 ----------
 
-
 The *pressure/scalar* keyword applies only to MSM. If this option is
 turned on, only the scalar pressure (i.e. (Pxx + Pyy + Pzz)/3.0) will
 be computed, which can be used, for example, to run an isotropic barostat.
@@ -356,10 +314,8 @@ instead of using the virial equation. This option cannot be used to access
 individual components of the pressure tensor, to compute per-atom virial,
 or with suffix kspace/pair styles of MSM, like OMP or GPU.
 
-
 ----------
 
-
 The *scafacos* keyword is used for settings that are passed to the
 ScaFaCoS library when using :doc:`kspace_style scafacos <kspace_style>`.
 
@@ -368,18 +324,18 @@ The *tolerance* option affects how the *accuracy* specified with the
 The following values may be used:
 
 * energy = absolute accuracy in total Coulombic energy
-* energy\_rel = relative accuracy in total Coulombic energy
+* energy_rel = relative accuracy in total Coulombic energy
 * potential = absolute accuracy in total Coulombic potential
-* potential\_rel = relative accuracy in total Coulombic potential
+* potential_rel = relative accuracy in total Coulombic potential
 * field = absolute accuracy in electric field
-* field\_rel = relative accuracy in electric field
+* field_rel = relative accuracy in electric field
 
-The values with suffix \_rel indicate the tolerance is a relative
+The values with suffix _rel indicate the tolerance is a relative
 tolerance; the other values impose an absolute tolerance on the given
 quantity. Absolute tolerance in this case means, that for a given
-quantity q and a given absolute tolerance of t\_a the result should
-be between q-t\_a and q+t\_a. For a relative tolerance t\_r the relative
-error should not be greater than t\_r, i.e. abs(1 - (result/q)) < t\_r.
+quantity q and a given absolute tolerance of t_a the result should
+be between q-t_a and q+t_a. For a relative tolerance t_r the relative
+error should not be greater than t_r, i.e. abs(1 - (result/q)) < t_r.
 As a consequence of this, the tolerance type should be checked, when
 performing computations with a high absolute field / energy. E.g.
 if the total energy in the system is 1000000.0 an absolute tolerance
@@ -387,10 +343,10 @@ of 1e-3 would mean that the result has to be between 999999.999 and
 1000000.001, which would be equivalent to a relative tolerance of
 1e-9.
 
-The energy and energy\_rel values, set a tolerance based on the total
-Coulombic energy of the system.  The potential and potential\_rel set a
+The energy and energy_rel values, set a tolerance based on the total
+Coulombic energy of the system.  The potential and potential_rel set a
 tolerance based on the per-atom Coulombic energy.  The field and
-field\_rel tolerance types set a tolerance based on the electric field
+field_rel tolerance types set a tolerance based on the electric field
 values computed by ScaFaCoS.  Since per-atom forces are derived from
 the per-atom electric field, this effectively sets a tolerance on the
 forces, similar to other LAMMPS KSpace styles, as explained on the
@@ -399,7 +355,7 @@ forces, similar to other LAMMPS KSpace styles, as explained on the
 Note that not all ScaFaCoS solvers support all tolerance types.
 These are the allowed values for each method:
 
-* fmm = energy and energy\_rel
+* fmm = energy and energy_rel
 * p2nfft = field (1d-,2d-,3d-periodic systems) or potential (0d-periodic)
 * p3m = field
 * ewald = field
@@ -409,7 +365,7 @@ If the tolerance type is not changed, the default values for the
 tolerance type are the first values in the above list, e.g. energy
 is the default tolerance type for the fmm solver.
 
-The *fmm\_tuning* option is only relevant when using the FMM method.
+The *fmm_tuning* option is only relevant when using the FMM method.
 It activates (value=1) or deactivates (value=0) an internal tuning
 mechanism for the FMM solver.  The tuning operation runs sequentially
 and can be very time-consuming.  Usually it is not needed for systems
@@ -417,10 +373,8 @@ with a homogeneous charge distribution. The default for this option is
 therefore *0*\ . The FMM internal tuning is performed once, when the
 solver is set up.
 
-
 ----------
 
-
 The *slab* keyword allows an Ewald or PPPM solver to be used for a
 systems that are periodic in x,y but non-periodic in z - a
 :doc:`boundary <boundary>` setting of "boundary p p f".  This is done by
@@ -456,10 +410,8 @@ slab correction has also been extended to point dipole interactions
    dielectric constant due to the Yeh/Berkowitz :ref:`(Yeh) <Yeh>` correction
    not being compatible with how :doc:`fix efield <fix_efield>` works.
 
-
 ----------
 
-
 The *force/disp/real* and *force/disp/kspace* keywords set the force
 accuracy for the real and space computations for the dispersion part
 of pppm/disp. As shown in :ref:`(Isele-Holder) <Isele-Holder1>`, optimal
@@ -477,13 +429,12 @@ provide simulations that are either inaccurate or slow. Using this
 option is thus not recommended.  For guidelines on how to obtain good
 parameters, see the :doc:`Howto dispersion <Howto_dispersion>` doc page.
 
-
 ----------
 
-
 Restrictions
 """"""""""""
- none
+
+none
 
 Related commands
 """"""""""""""""
@@ -501,67 +452,44 @@ ik (PPPM), mix/disp = pair, force/disp/real = -1.0, force/disp/kspace
 = -1.0, split = 0, tol = 1.0e-6, and disp/auto = no. For pppm/intel,
 order = order/disp = 7.  For scafacos settings, the scafacos tolerance
 option depends on the method chosen, as documented above.  The
-scafacos fmm\_tuning default = 0.
-
+scafacos fmm_tuning default = 0.
 
 ----------
 
-
 .. _Hockney1:
 
-
-
 **(Hockney)** Hockney and Eastwood, Computer Simulation Using Particles,
 Adam Hilger, NY (1989).
 
 .. _Yeh:
 
-
-
 **(Yeh)** Yeh and Berkowitz, J Chem Phys, 111, 3155 (1999).
 
 .. _Ballenegger:
 
-
-
 **(Ballenegger)** Ballenegger, Arnold, Cerda, J Chem Phys, 131, 094107
 (2009).
 
 .. _Klapp:
 
-
-
 **(Klapp)** Klapp, Schoen, J Chem Phys, 117, 8050 (2002).
 
 .. _Hardy1:
 
-
-
 **(Hardy)** David Hardy thesis: Multilevel Summation for the Fast
 Evaluation of Forces for the Simulation of Biomolecules, University of
 Illinois at Urbana-Champaign, (2006).
 
 .. _Hummer:
 
-
-
 **(Hummer)** Hummer, Gronbech-Jensen, Neumann, J Chem Phys, 109, 2791 (1998)
 
 .. _Isele-Holder1:
 
-
-
 **(Isele-Holder)** Isele-Holder, Mitchell, Hammond, Kohlmeyer, Ismail, J
 Chem Theory Comput, 9, 5412 (2013).
 
 .. _Wennberg:
 
-
-
 **(Wennberg)** Wennberg, Murtola, Hess, Lindahl, J Chem Theory Comput,
 9, 3527 (2013).
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/kspace_style.rst b/doc/src/kspace_style.rst
index 5142734f19..57cd51d549 100644
--- a/doc/src/kspace_style.rst
+++ b/doc/src/kspace_style.rst
@@ -1,13 +1,12 @@
-.. index:: kspace\_style
+.. index:: kspace_style
 
-kspace\_style command
-=====================
+kspace_style command
+====================
 
 Syntax
 """"""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    kspace_style style value
 
@@ -76,13 +75,10 @@ Syntax
          method = fmm or p2nfft or p3m or ewald or direct
          accuracy = desired relative error in forces
 
-
-
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    kspace_style pppm 1.0e-4
    kspace_style pppm/cg 1.0e-5 1.0e-6
@@ -94,12 +90,12 @@ Description
 """""""""""
 
 Define a long-range solver for LAMMPS to use each timestep to compute
-long-range Coulombic interactions or long-range 1/r\^6 interactions.
+long-range Coulombic interactions or long-range :math:`1/r^6` interactions.
 Most of the long-range solvers perform their computation in K-space,
 hence the name of this command.
 
 When such a solver is used in conjunction with an appropriate pair
-style, the cutoff for Coulombic or 1/r\^N interactions is effectively
+style, the cutoff for Coulombic or :math:`1/r^N` interactions is effectively
 infinite.  If the Coulombic case, this means each charge in the system
 interacts with charges in an infinite array of periodic images of the
 simulation domain.
@@ -120,17 +116,15 @@ matching keyword to the name of the KSpace style, as in this table:
 | tip4p/long           | tip4p                 |
 +----------------------+-----------------------+
 
-
 ----------
 
-
 The *ewald* style performs a standard Ewald summation as described in
 any solid-state physics text.
 
 The *ewald/disp* style adds a long-range dispersion sum option for
-1/r\^6 potentials and is useful for simulation of interfaces
+:math:`1/r^6` potentials and is useful for simulation of interfaces
 :ref:`(Veld) <Veld>`.  It also performs standard Coulombic Ewald summations,
-but in a more efficient manner than the *ewald* style.  The 1/r\^6
+but in a more efficient manner than the *ewald* style.  The :math:`1/r^6`
 capability means that Lennard-Jones or Buckingham potentials can be
 used without a cutoff, i.e. they become full long-range potentials.
 The *ewald/disp* style can also be used with point-dipoles, see
@@ -143,18 +137,16 @@ The *ewald/dipole/spin* style adds long-range standard Ewald
 summations for magnetic dipole-dipole interactions between
 magnetic spins.
 
-
 ----------
 
-
 The *pppm* style invokes a particle-particle particle-mesh solver
 :ref:`(Hockney) <Hockney>` which maps atom charge to a 3d mesh, uses 3d FFTs
 to solve Poisson's equation on the mesh, then interpolates electric
 fields on the mesh points back to the atoms.  It is closely related to
 the particle-mesh Ewald technique (PME) :ref:`(Darden) <Darden>` used in
 AMBER and CHARMM.  The cost of traditional Ewald summation scales as
-N\^(3/2) where N is the number of atoms in the system.  The PPPM solver
-scales as Nlog(N) due to the FFTs, so it is almost always a faster
+:math:`N^{\frac{3}{2}}` where :math:`N` is the number of atoms in the system.  The PPPM solver
+scales as :math:`N \log{N}` due to the FFTs, so it is almost always a faster
 choice :ref:`(Pollock) <Pollock>`.
 
 The *pppm/cg* style is identical to the *pppm* style except that it
@@ -201,10 +193,8 @@ page.
    must be used if energy and/or pressure are quantities of interest,
    such as when using a barostat.
 
-
 ----------
 
-
 The *pppm/disp* and *pppm/disp/tip4p* styles add a mesh-based long-range
 dispersion sum option for 1/r\^6 potentials :ref:`(Isele-Holder) <Isele-Holder2012>`,
 similar to the *ewald/disp* style. The 1/r\^6 capability means
@@ -221,30 +211,26 @@ parameters and how to choose them is described in
 :ref:`(Isele-Holder) <Isele-Holder2012>`,
 :ref:`(Isele-Holder2) <Isele-Holder2013>` and the :doc:`Howto dispersion <Howto_dispersion>` doc page.
 
-
 ----------
 
-
 .. note::
 
    All of the PPPM styles can be used with single-precision FFTs by
-   using the compiler switch -DFFT\_SINGLE for the FFT\_INC setting in your
-   lo-level Makefile.  This setting also changes some of the PPPM
+   using the compiler switch -DFFT_SINGLE for the FFT_INC setting in your
+   low-level Makefile.  This setting also changes some of the PPPM
    operations (e.g. mapping charge to mesh and interpolating electric
    fields to particles) to be performed in single precision.  This option
    can speed-up long-range calculations, particularly in parallel or on
-   GPUs.  The use of the -DFFT\_SINGLE flag is discussed on the :doc:`Build settings <Build_settings>` doc page. MSM does not currently support
-   the -DFFT\_SINGLE compiler switch.
-
+   GPUs.  The use of the -DFFT_SINGLE flag is discussed on the :doc:`Build settings <Build_settings>` doc page. MSM does not currently support
+   the -DFFT_SINGLE compiler switch.
 
 ----------
 
-
 The *msm* style invokes a multi-level summation method MSM solver,
 :ref:`(Hardy) <Hardy2006>` or :ref:`(Hardy2) <Hardy2009>`, which maps atom charge
 to a 3d mesh, and uses a multi-level hierarchy of coarser and coarser
 meshes on which direct Coulomb solvers are done.  This method does not
-use FFTs and scales as N. It may therefore be faster than the other
+use FFTs and scales as :math:`N`. It may therefore be faster than the other
 K-space solvers for relatively large problems when running on large
 core counts. MSM can also be used for non-periodic boundary conditions
 and for mixed periodic and non-periodic boundaries.
@@ -263,10 +249,8 @@ to run an isotropic barostat. If the full pressure tensor is needed,
 then calculating the pressure at every timestep or using a fixed
 pressure simulation with MSM will cause the code to run slower.
 
-
 ----------
 
-
 The *scafacos* style is a wrapper on the `ScaFaCoS Coulomb solver library <http://www.scafacos.de>`_ which provides a variety of solver
 methods which can be used with LAMMPS.  The paper by :ref:`(Who) <Who2012>`
 gives an overview of ScaFaCoS.
@@ -290,7 +274,7 @@ See details on :ref:`this page <USER-SCAFACOS>`.
 
    Unlike other KSpace solvers in LAMMPS, ScaFaCoS computes all
    Coulombic interactions, both short- and long-range.  Thus you should
-   NOT use a Coulombic pair style when using kspace\_style scafacos.  This
+   NOT use a Coulombic pair style when using kspace_style scafacos.  This
    also means the total Coulombic energy (short- and long-range) will be
    tallied for :doc:`thermodynamic output <thermo_style>` command as part
    of the *elong* keyword; the *ecoul* keyword will be zero.
@@ -325,10 +309,8 @@ the :doc:`kspace_modify scafacos accuracy <kspace_modify>` doc page.
 The :doc:`kspace_modify scafacos <kspace_modify>` command also explains
 other ScaFaCoS options currently exposed to LAMMPS.
 
-
 ----------
 
-
 The specified *accuracy* determines the relative RMS error in per-atom
 forces calculated by the long-range solver.  It is set as a
 dimensionless number, relative to the force that two unit point
@@ -383,10 +365,8 @@ options of the K-space solvers that can be set, including a *force*
 option for setting an absolute RMS error in forces, as opposed to a
 relative RMS error.
 
-
 ----------
 
-
 Styles with a *gpu*\ , *intel*\ , *kk*\ , *omp*\ , or *opt* suffix are
 functionally the same as the corresponding style without the suffix.
 They have been optimized to run faster, depending on your available
@@ -397,7 +377,7 @@ produce the same results, except for round-off and precision issues.
 More specifically, the *pppm/gpu* style performs charge assignment and
 force interpolation calculations on the GPU.  These processes are
 performed either in single or double precision, depending on whether
-the -DFFT\_SINGLE setting was specified in your lo-level Makefile, as
+the -DFFT_SINGLE setting was specified in your low-level Makefile, as
 discussed above.  The FFTs themselves are still calculated on the CPU.
 If *pppm/gpu* is used with a GPU-enabled pair style, part of the PPPM
 calculation can be performed concurrently on the GPU while other
@@ -415,22 +395,19 @@ LAMMPS was built with those packages.  See the :doc:`Build package <Build_packag
 See the :doc:`Speed packages <Speed_packages>` doc page for more
 instructions on how to use the accelerated styles effectively.
 
-
 ----------
 
-
 Restrictions
 """"""""""""
 
-
 Note that the long-range electrostatic solvers in LAMMPS assume conducting
 metal (tinfoil) boundary conditions for both charge and dipole
 interactions. Vacuum boundary conditions are not currently supported.
 
 The *ewald/disp*\ , *ewald*\ , *pppm*\ , and *msm* styles support
 non-orthogonal (triclinic symmetry) simulation boxes. However,
-triclinic simulation cells may not yet be supported by suffix versions
-of these styles.
+triclinic simulation cells may not yet be supported by all suffix
+versions of these styles.
 
 All of the kspace styles are part of the KSPACE package.  They are
 only enabled if LAMMPS was built with that package.  See the :doc:`Build package <Build_package>` doc page for more info.
@@ -465,133 +442,89 @@ Related commands
 Default
 """""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    kspace_style none
 
-
 ----------
 
-
 .. _Darden:
 
-
-
 **(Darden)** Darden, York, Pedersen, J Chem Phys, 98, 10089 (1993).
 
 .. _Deserno:
 
-
-
 **(Deserno)** Deserno and Holm, J Chem Phys, 109, 7694 (1998).
 
 .. _Hockney:
 
-
-
 **(Hockney)** Hockney and Eastwood, Computer Simulation Using Particles,
 Adam Hilger, NY (1989).
 
 .. _Kolafa:
 
-
-
 **(Kolafa)** Kolafa and Perram, Molecular Simulation, 9, 351 (1992).
 
 .. _Petersen:
 
-
-
 **(Petersen)** Petersen, J Chem Phys, 103, 3668 (1995).
 
 .. _Wang:
 
-
-
 **(Wang)** Wang and Holm, J Chem Phys, 115, 6277 (2001).
 
 .. _Pollock:
 
-
-
 **(Pollock)** Pollock and Glosli, Comp Phys Comm, 95, 93 (1996).
 
 .. _Cerutti:
 
-
-
 **(Cerutti)** Cerutti, Duke, Darden, Lybrand, Journal of Chemical Theory
 and Computation 5, 2322 (2009)
 
 .. _Neelov:
 
-
-
 **(Neelov)** Neelov, Holm, J Chem Phys 132, 234103 (2010)
 
 .. _Veld:
 
-
-
 **(Veld)** In 't Veld, Ismail, Grest, J Chem Phys, 127, 144711 (2007).
 
 .. _Toukmaji:
 
-
-
 **(Toukmaji)** Toukmaji, Sagui, Board, and Darden, J Chem Phys, 113,
 10913 (2000).
 
 .. _Isele-Holder2012:
 
-
-
 **(Isele-Holder)** Isele-Holder, Mitchell, Ismail, J Chem Phys, 137,
 174107 (2012).
 
 .. _Isele-Holder2013:
 
-
-
 **(Isele-Holder2)** Isele-Holder, Mitchell, Hammond, Kohlmeyer, Ismail,
 J Chem Theory Comput 9, 5412 (2013).
 
 .. _Hardy2006:
 
-
-
 **(Hardy)** David Hardy thesis: Multilevel Summation for the Fast
 Evaluation of Forces for the Simulation of Biomolecules, University of
 Illinois at Urbana-Champaign, (2006).
 
 .. _Hardy2009:
 
-
-
 **(Hardy2)** Hardy, Stone, Schulten, Parallel Computing, 35, 164-177
 (2009).
 
 .. _Sutmann2013:
 
-
-
 **(Sutmann)** Sutmann, Arnold, Fahrenberger, et. al., Physical review / E 88(6), 063308 (2013)
 
 .. _Cerda2008:
 
-
-
 **(Cerda)** Cerda, Ballenegger, Lenz, Holm, J Chem Phys 129, 234104 (2008)
 
 .. _Who2012:
 
-
-
 **(Who)** Who, Author2, Author3, J of Long Range Solvers, 35, 164-177
 (2012).
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/label.rst b/doc/src/label.rst
index 31ebbfe0cb..0b1273008f 100644
--- a/doc/src/label.rst
+++ b/doc/src/label.rst
@@ -6,7 +6,6 @@ label command
 Syntax
 """"""
 
-
 .. parsed-literal::
 
    label ID
@@ -16,8 +15,7 @@ Syntax
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    label xyz
    label loop
@@ -40,8 +38,3 @@ Restrictions
 **Related commands:** none
 
 **Default:** none
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/lattice.rst b/doc/src/lattice.rst
index a26060d7c0..693d0cd84a 100644
--- a/doc/src/lattice.rst
+++ b/doc/src/lattice.rst
@@ -6,24 +6,23 @@ lattice command
 Syntax
 """"""
 
-
 .. parsed-literal::
 
    lattice style scale keyword values ...
 
 * style = *none* or *sc* or *bcc* or *fcc* or *hcp* or *diamond* or         *sq* or *sq2* or *hex* or *custom*
 * scale = scale factor between lattice and simulation box
-  
+
   .. parsed-literal::
-  
+
        scale = reduced density rho\* (for LJ units)
        scale = lattice constant in distance units (for all other units)
 
 * zero or more keyword/value pairs may be appended
 * keyword = *origin* or *orient* or *spacing* or *a1* or *a2* or *a3* or *basis*
-  
+
   .. parsed-literal::
-  
+
        *origin* values = x y z
          x,y,z = fractions of a unit cell (0 <= x,y,z < 1)
        *orient* values = dim i j k
@@ -36,13 +35,10 @@ Syntax
        *basis* values = x y z
          x,y,z = fractional coords of a basis atom (0 <= x,y,z < 1)
 
-
-
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    lattice fcc 3.52
    lattice hex 0.85
@@ -94,10 +90,8 @@ can be repeated multiple times to build a poly-crystalline model with
 different geometric regions populated with atoms in different lattice
 orientations.
 
-
 ----------
 
-
 A lattice of style *none* does not define a unit cell and basis set,
 so it cannot be used with the :doc:`create_atoms <create_atoms>`
 command.  However it does define a lattice spacing via the specified
@@ -140,10 +134,8 @@ x of a basis atom within the unit cell is thus a linear combination of
 the unit cell's 3 edge vectors, i.e. x = bx a1 + by a2 + bz a3,
 where bx,by,bz are the 3 values specified for the *basis* keyword.
 
-
 ----------
 
-
 This sub-section discusses the arguments that determine how the
 idealized unit cell is transformed into a lattice of points within the
 simulation box.
@@ -199,10 +191,8 @@ the Z direction.
    applied to a1,a2,a3 to rotate the original unit cell to a new
    orientation in the simulation box.
 
-
 ----------
 
-
 Several LAMMPS commands have the option to use distance units that are
 inferred from "lattice spacings" in the x,y,z box directions.
 E.g. the :doc:`region <region>` command can create a block of size
@@ -259,19 +249,16 @@ Note that whenever the lattice command is used, the values of the
 lattice spacings LAMMPS calculates are printed out.  Thus their effect
 in commands that use the spacings should be decipherable.
 
-
 ----------
 
-
 Example commands for generating a Wurtzite crystal (courtesy
 of Aidan Thompson), with its 8 atom unit cell.
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    variable a equal  4.340330
-   variable b equal  $a\*sqrt(3.0)
-   variable c equal  $a\*sqrt(8.0/3.0)
+   variable b equal  $a*sqrt(3.0)
+   variable c equal  $a*sqrt(8.0/3.0)
 
    variable 1_3 equal 1.0/3.0
    variable 2_3 equal 2.0/3.0
@@ -301,14 +288,11 @@ of Aidan Thompson), with its 8 atom unit cell.
            basis   7       2       &
            basis   8       2
 
-
 ----------
 
-
 Restrictions
 """"""""""""
 
-
 The *a1,a2,a3,basis* keywords can only be used with style *custom*\ .
 
 Related commands
@@ -320,16 +304,10 @@ Related commands
 Default
 """""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    lattice none 1.0
 
 For other lattice styles, the option defaults are origin = 0.0 0.0
 0.0, orient = x 1 0 0, orient = y 0 1 0, orient = z 0 0 1, a1 = 1 0 0,
 a2 = 0 1 0, and a3 = 0 0 1.
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/log.rst b/doc/src/log.rst
index 0f53040c13..5c412d4d9f 100644
--- a/doc/src/log.rst
+++ b/doc/src/log.rst
@@ -6,7 +6,6 @@ log command
 Syntax
 """"""
 
-
 .. parsed-literal::
 
    log file keyword
@@ -17,8 +16,7 @@ Syntax
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    log log.equil
    log log.equil append
@@ -49,8 +47,3 @@ Default
 """""""
 
 The default LAMMPS log file is named log.lammps
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/mass.rst b/doc/src/mass.rst
index 0431b8f65b..55ba9c61bf 100644
--- a/doc/src/mass.rst
+++ b/doc/src/mass.rst
@@ -6,7 +6,6 @@ mass command
 Syntax
 """"""
 
-
 .. parsed-literal::
 
    mass I value
@@ -17,12 +16,11 @@ Syntax
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    mass 1 1.0
-   mass \* 62.5
-   mass 2\* 62.5
+   mass * 62.5
+   mass 2* 62.5
 
 Description
 """""""""""
@@ -48,7 +46,6 @@ mass command in an input script, except that no wild-card asterisk can
 be used.  For example, under the "Masses" section of a data file, the
 line that corresponds to the 1st example above would be listed as
 
-
 .. parsed-literal::
 
    1 1.0
@@ -75,7 +72,6 @@ per-atom mass will be used by LAMMPS.
 Restrictions
 """"""""""""
 
-
 This command must come after the simulation box is defined by a
 :doc:`read_data <read_data>`, :doc:`read_restart <read_restart>`, or
 :doc:`create_box <create_box>` command.
@@ -88,8 +84,3 @@ The mass assigned to any type or atom must be > 0.0.
 **Related commands:** none
 
 **Default:** none
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/message.rst b/doc/src/message.rst
index 6891512b85..f4ca5735e0 100644
--- a/doc/src/message.rst
+++ b/doc/src/message.rst
@@ -6,7 +6,6 @@ message command
 Syntax
 """"""
 
-
 .. parsed-literal::
 
    message which protocol mode arg
@@ -14,9 +13,9 @@ Syntax
 * which = *client* or *server* or *quit*
 * protocol = *md* or *mc*
 * mode = *file* or *zmq* or *mpi/one* or *mpi/two*
-  
+
   .. parsed-literal::
-  
+
        *file* arg = filename
          filename = file used for message exchanges
        *zmq* arg = socket-ID
@@ -26,13 +25,10 @@ Syntax
        *mpi/two* arg = filename
          filename = file used to establish communication between 2 MPI jobs
 
-
-
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    message client md file tmp.couple
    message server md file tmp.couple
@@ -60,20 +56,16 @@ one code is the "client" and sends request messages to a "server"
 code.  The server responds to each request with a reply message.  This
 enables the two codes to work in tandem to perform a simulation.
 
-
 ----------
 
-
 The *which* argument defines LAMMPS to be the client or the server.
 
 As explained below the *quit* option should be used when LAMMPS is
 finished as a client.  It sends a message to the server to tell it to
 shut down.
 
-
 ----------
 
-
 The *protocol* argument defines the format and content of messages
 that will be exchanged between the two codes.  The current options
 are:
@@ -86,10 +78,8 @@ For protocol *md*\ , LAMMPS can be either a client or server.  See the
 
 For protocol *mc*\ , LAMMPS can be the server.  See the :doc:`server mc <server_mc>` doc page for details on the protocol.
 
-
 ----------
 
-
 The *mode* argument specifies how messages are exchanged between the
 client and server codes.  Both codes must use the same mode and use
 consistent parameters.
@@ -105,10 +95,9 @@ code's machine.  Support for socket messaging is provided by the
 open-source `ZeroMQ library <http://zeromq.org>`_, which must be
 installed on your system.  The client specifies an IP address (IPv4
 format) or the DNS name of the machine the server code is running on,
-followed by a 4-digit port ID for the socket, separated by a colon.
+followed by a 4 or 5 digit port ID for the socket, separated by a colon.
 E.g.
 
-
 .. parsed-literal::
 
    localhost:5555        # client and server running on same machine
@@ -121,7 +110,20 @@ what the client specifies.
 
 .. note::
 
-   What are allowed port IDs?
+   On Linux or Unix machines port IDs below 1024 are reserved to the
+   superuser and thus not available.  Other ports may already be in
+   use and cannot be opened by a second process.  On a Linux machine
+   the commands "netstat -t4an" or "ss -t4an" will list all locally
+   used port IDs for IPv4 addresses.
+
+.. note::
+
+   On many machines (and sometimes on local networks) also ports IDs
+   may be blocked by default through firewalls.  In that case either
+   access to the required port (or a desired range of ports) has to
+   be selectively enabled to the firewall disabled (the latter is
+   usually not a good idea unless you are on a (small) local network
+   that is already protected from outside access.
 
 .. note::
 
@@ -131,8 +133,7 @@ what the client specifies.
 For mode *mpi/one*\ , the 2 codes communicate via MPI and are launched
 by the same mpirun command, e.g. with this syntax for OpenMPI:
 
-
-.. parsed-literal::
+.. code-block:: bash
 
    mpirun -np 2 lmp_mpi -mpicolor 0 -in in.client -log log.client : -np 4 othercode args  # LAMMPS is client
    mpirun -np 2 othercode args : -np 4 lmp_mpi -mpicolor 1 -in in.server  # LAMMPS is server
@@ -148,10 +149,8 @@ inter-communicator can be established to enable the 2 codes to send
 MPI messages to each other.  Both codes must be able to access the
 path/file in a common filesystem.
 
-
 ----------
 
-
 Normally, the message client or message server command should be used
 at the top of a LAMMPS input script.  It performs an initial handshake
 with the other code to setup messaging and to verify that both codes
@@ -186,14 +185,11 @@ the client).  As an example, this can be performed in a loop to use a
 quantum code as a server to compute quantum forces for multiple LAMMPS
 data files or periodic snapshots while running dynamics.
 
-
 ----------
 
-
 Restrictions
 """"""""""""
 
-
 This command is part of the MESSAGE package.  It is only enabled if
 LAMMPS was built with that package.  See the :doc:`Build package <Build_package>` doc page for more info.
 
@@ -203,8 +199,3 @@ Related commands
 :doc:`server <server>`, :doc:`fix client/md <fix_client_md>`
 
 **Default:** none
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/min_modify.rst b/doc/src/min_modify.rst
index b90354deb0..a01aab173d 100644
--- a/doc/src/min_modify.rst
+++ b/doc/src/min_modify.rst
@@ -1,25 +1,24 @@
-.. index:: min\_modify
+.. index:: min_modify
 
-min\_modify command
-===================
+min_modify command
+==================
 
 Syntax
 """"""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    min_modify keyword values ...
 
 * one or more keyword/value pairs may be listed
-  
+
   .. parsed-literal::
-  
-     keyword = *dmax* or *line* or *norm* or *alpha_damp* or *discrete_factor*
+
+     keyword = *dmax* or *line* or *norm* or *alpha_damp* or *discrete_factor* or *integrator* or *tmax*
        *dmax* value = max
          max = maximum distance for line search to move (distance units)
        *line* value = *backtrack* or *quadratic* or *forcezero* or *spin_cubic* or *spin_none*
-         backtrack,quadratic,forcezero,spin_cubic,spin_none = style of linesearch to use 
+         backtrack,quadratic,forcezero,spin_cubic,spin_none = style of linesearch to use
        *norm* value = *two* or *max*
          two = Euclidean two-norm (length of 3N vector)
          inf = max force component across all 3-vectors
@@ -28,16 +27,18 @@ Syntax
          damping = fictitious Gilbert damping for spin minimization (adim)
        *discrete_factor* value = factor
          factor = discretization factor for adaptive spin timestep (adim)
-
-
+       *integrator* value = *eulerimplicit* or *verlet*
+         time integration scheme for fire minimization
+       *tmax* value = factor
+         factor = maximum adaptive timestep for fire minimization (adim)
 
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    min_modify dmax 0.2
+   min_modify integrator verlet tmax 4
 
 Description
 """""""""""
@@ -60,80 +61,111 @@ highly overlapped atoms from being moved long distances (e.g. through
 another atom) due to large forces.
 
 The choice of line search algorithm for the *cg* and *sd* minimization
-styles can be selected via the *line* keyword.
-The default *quadratic* line search algorithm starts out using
-the robust backtracking method described below. However, once
-the system gets close to a local
-minimum and the linesearch steps get small, so that the energy
-is approximately quadratic in the step length, it uses the
-estimated location of zero gradient as the linesearch step,
-provided the energy change is downhill.
-This becomes more efficient than backtracking
-for highly-converged relaxations. The *forcezero*
-line search algorithm is similar to *quadratic*\ .
-It may be more efficient than *quadratic* on some systems.
+styles can be selected via the *line* keyword.  The default
+*quadratic* line search algorithm starts out using the robust
+backtracking method described below. However, once the system gets
+close to a local minimum and the linesearch steps get small, so that
+the energy is approximately quadratic in the step length, it uses the
+estimated location of zero gradient as the linesearch step, provided
+the energy change is downhill.  This becomes more efficient than
+backtracking for highly-converged relaxations. The *forcezero* line
+search algorithm is similar to *quadratic*\ .  It may be more
+efficient than *quadratic* on some systems.
 
-The backtracking search is robust and should always find a local energy
-minimum.  However, it will "converge" when it can no longer reduce the
-energy of the system.  Individual atom forces may still be larger than
-desired at this point, because the energy change is measured as the
-difference of two large values (energy before and energy after) and
-that difference may be smaller than machine epsilon even if atoms
-could move in the gradient direction to reduce forces further.
+The backtracking search is robust and should always find a local
+energy minimum.  However, it will "converge" when it can no longer
+reduce the energy of the system.  Individual atom forces may still be
+larger than desired at this point, because the energy change is
+measured as the difference of two large values (energy before and
+energy after) and that difference may be smaller than machine epsilon
+even if atoms could move in the gradient direction to reduce forces
+further.
 
-The choice of a norm can be modified for the min styles *cg*\ , *sd*\ , 
-*quickmin*\ , *fire*\ , *spin*\ , *spin/cg* and *spin/lbfgs* using 
-the *norm* keyword.
-The default *two* norm computes the 2-norm (Euclidean length) of the
-global force vector:
+The choice of a norm can be modified for the min styles *cg*\ , *sd*\
+, *quickmin*\ , *fire*\ , *fire/old*\ , *spin*\ , *spin/cg* and
+*spin/lbfgs* using the *norm* keyword.  The default *two* norm computes
+the 2-norm (Euclidean length) of the global force vector:
 
-.. image:: Eqs/norm_two.jpg
-   :align: center
+.. math::
 
-The *max* norm computes the length of the 3-vector force 
-for each atom  (2-norm), and takes the maximum value of those across 
+   || \vec{F} ||_{2} = \sqrt{\vec{F}_1+ \cdots + \vec{F}_N}
+
+The *max* norm computes the length of the 3-vector force
+for each atom  (2-norm), and takes the maximum value of those across
 all atoms
 
-.. image:: Eqs/norm_max.jpg
-   :align: center
+.. math::
+
+   || \vec{F} ||_{max} = {\rm max}\left(||\vec{F}_1||, \cdots, ||\vec{F}_N||\right)
 
 The *inf* norm takes the maximum component across the forces of
 all atoms in the system:
 
-.. image:: Eqs/norm_inf.jpg
-   :align: center
+.. math::
+
+   || \vec{F} ||_{inf} = {\rm max}\left(|F_1^1|, |F_1^2|, |F_1^3| \cdots, |F_N^1|, |F_N^2|, |F_N^3|\right)
 
 For the min styles *spin*\ , *spin/cg* and *spin/lbfgs*\ , the force
 norm is replaced by the spin-torque norm.
 
-Keywords *alpha\_damp* and *discrete\_factor* only make sense when
+Keywords *alpha_damp* and *discrete_factor* only make sense when
 a :doc:`min_spin <min_spin>` command is declared.
-Keyword *alpha\_damp* defines an analog of a magnetic Gilbert
+Keyword *alpha_damp* defines an analog of a magnetic Gilbert
 damping. It defines a relaxation rate toward an equilibrium for
 a given magnetic system.
-Keyword *discrete\_factor* defines a discretization factor for the
+Keyword *discrete_factor* defines a discretization factor for the
 adaptive timestep used in the *spin* minimization.
 See :doc:`min_spin <min_spin>` for more information about those
 quantities.
 
 The choice of a line search algorithm for the *spin/cg* and
-*spin/lbfgs* styles can be specified via the *line* keyword.
-The *spin\_cubic* and  *spin\_none* only make sense when one of those 
-two minimization styles is declared.
-The *spin\_cubic* performs the line search based on a cubic interpolation
-of the energy along the search direction. The *spin\_none* keyword
-deactivates the line search procedure.
-The *spin\_none* is a default value for *line* keyword for both *spin/lbfgs*
-and *spin/cg*\ . Convergence of *spin/lbfgs* can be more robust if
-*spin\_cubic* line search is used.
+*spin/lbfgs* styles can be specified via the *line* keyword.  The
+*spin_cubic* and *spin_none* keywords only make sense when one of those two
+minimization styles is declared.  The *spin_cubic* performs the line
+search based on a cubic interpolation of the energy along the search
+direction. The *spin_none* keyword deactivates the line search
+procedure.  The *spin_none* is a default value for *line* keyword for
+both *spin/lbfgs* and *spin/cg*\ . Convergence of *spin/lbfgs* can be
+more robust if *spin_cubic* line search is used.
+
+The Newton *integrator* used for *fire* minimization can be selected
+to be either the symplectic Euler (\ *eulerimplicit*\ ) or velocity
+Verlet (\ *verlet*\ ).  *tmax* defines the maximum value for the
+adaptive timestep during a *fire* minimization. It is a multiplication
+factor applied to the current :doc:`timestep <timestep>` (not in time
+unit). For example, *tmax* = 4.0 with a :doc:`timestep <timestep>` of
+2fs, means that the maximum value the timestep can reach during a *fire*
+minimization is 4fs.
+Note that parameter defaults has been chosen to be reliable in most cases,
+but one should consider adjusting :doc:`timestep <timestep>` and *tmax* to
+optimize the minimization for large or complex systems.  Other
+parameters of the *fire* minimization can be tuned (\ *tmin*\ ,
+*delaystep*\ , *dtgrow*\ , *dtshrink*\ , *alpha0*\ , and
+*alphashrink*\ ). Please refer to the references describing the
+:doc:`min_style <min_style>` *fire*.
+An additional stopping criteria *vdfmax* is used by *fire* in order to avoid
+unnecessary looping when it is reasonable to think the system will not
+be relaxed further.  Note that in this case the system will NOT have
+reached your minimization criteria. This could happen when the system
+comes to be stuck in a local basin of the phase space.  *vdfmax* is
+the maximum number of consecutive iterations with P(t) < 0.
+
+The :doc:`min_style <min_style>` *fire* is an optimized implementation of
+:doc:`min_style <min_style>` *fire/old*. It can however behave similarly
+to the *fire/old* style by using the following set of parameters:
+
+.. code-block:: LAMMPS
+
+   min_modify integrator eulerexplicit tmax 10.0 tmin 0.0 delaystep 5 &
+             dtgrow 1.1 dtshrink 0.5 alpha0 0.1 alphashrink 0.99 &
+             vdfmax 100000 halfstepback no initialdelay no
 
 Restrictions
 """"""""""""
 
-
-For magnetic GNEB calculations, only *spin\_none* value for *line* keyword can be used
-when styles *spin/cg* and *spin/lbfgs* are employed.
-See :doc:`neb/spin <neb_spin>` for more explanation.
+For magnetic GNEB calculations, only *spin_none* value for *line*
+keyword can be used when minimization styles *spin/cg* and *spin/lbfgs* are
+employed.  See :doc:`neb/spin <neb_spin>` for more explanation.
 
 Related commands
 """"""""""""""""
@@ -145,11 +177,11 @@ Default
 
 The option defaults are dmax = 0.1, line = quadratic and norm = two.
 
-For the *spin*\ , *spin/cg* and *spin/lbfgs* styles, the
-option defaults are alpha\_damp = 1.0, discrete\_factor = 10.0,
-line = spin\_none, and norm = euclidean.
+For the *spin*\ , *spin/cg* and *spin/lbfgs* styles, the option
+defaults are alpha_damp = 1.0, discrete_factor = 10.0, line =
+spin_none, and norm = euclidean.
 
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
+For the *fire* style, the option defaults are integrator =
+eulerimplicit, tmax = 10.0, tmin = 0.02, delaystep = 20, dtgrow = 1.1,
+dtshrink = 0.5, alpha0 = 0.25, alphashrink = 0.99, vdfmax = 2000,
+halfstepback = yes and initialdelay = yes.
diff --git a/doc/src/min_spin.rst b/doc/src/min_spin.rst
index 96053fda98..46fd08b838 100644
--- a/doc/src/min_spin.rst
+++ b/doc/src/min_spin.rst
@@ -1,29 +1,27 @@
-.. index:: min\_style spin
+.. index:: min_style spin
 
-min\_style spin command
-=======================
+min_style spin command
+======================
 
-min\_style spin/cg command
-==========================
+min_style spin/cg command
+=========================
 
-min\_style spin/lbfgs command
-=============================
+min_style spin/lbfgs command
+============================
 
 Syntax
 """"""
 
+.. code-block:: LAMMPS
 
-.. parsed-literal::
-
-   min_style spin 
-   min_style spin/cg 
+   min_style spin
+   min_style spin/cg
    min_style spin/lbfgs
 
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    min_style  spin/lbfgs
    min_modify line spin_cubic discrete_factor 10.0
@@ -37,54 +35,53 @@ command is performed.
 Style *spin* defines a damped spin dynamics with an adaptive
 timestep, according to:
 
-.. image:: Eqs/min_spin_damping.jpg
-   :align: center
+.. math::
 
-with lambda a damping coefficient (similar to a Gilbert
-damping).
-Lambda can be defined by setting the *alpha\_damp* keyword with the
-:doc:`min_modify <min_modify>` command.
+   \frac{d \vec{s}_{i}}{dt} = \lambda\, \vec{s}_{i} \times\left( \vec{\omega}_{i} \times\vec{s}_{i} \right)
+
+with :math:`\lambda` a damping coefficient (similar to a Gilbert
+damping). :math:`\lambda` can be defined by setting the
+*alpha_damp* keyword with the :doc:`min_modify <min_modify>` command.
 
 The minimization procedure solves this equation using an
 adaptive timestep. The value of this timestep is defined
 by the largest precession frequency that has to be solved in the
 system:
 
-.. image:: Eqs/min_spin_timestep.jpg
-   :align: center
+.. math::
 
-with *\|omega\|\_\ *max*\ * the norm of the largest precession frequency
-in the system (across all processes, and across all replicas if a
+   {\Delta t}_{\rm max} = \frac{2\pi}{\kappa \left|\vec{\omega}_{\rm max} \right|}
+
+with :math:`\left|\vec{\omega}_{\rm max}\right|` the norm of the largest precession
+frequency in the system (across all processes, and across all replicas if a
 spin/neb calculation is performed).
 
-Kappa defines a discretization factor *discrete\_factor* for the
-definition of this timestep.
-*discrete\_factor* can be defined with the :doc:`min_modify <min_modify>`
-command.
+:math:`\kappa` defines a discretization factor *discrete_factor* for
+the definition of this timestep.  *discrete_factor* can be defined with
+the :doc:`min_modify <min_modify>` command.
 
 Style *spin/cg* defines an orthogonal spin optimization
-(OSO) combined to a conjugate gradient (CG) algorithm. 
+(OSO) combined to a conjugate gradient (CG) algorithm.
 The :doc:`min_modify <min_modify>` command can be used to
-couple the *spin/cg* to a line search procedure, and to modify the 
-discretization factor *discrete\_factor*.
-By default, style *spin/cg* does not employ the line search procedure 
+couple the *spin/cg* to a line search procedure, and to modify the
+discretization factor *discrete_factor*.
+By default, style *spin/cg* does not employ the line search procedure
 and uses the adaptive time-step technique in the same way as style *spin*\ .
 
-Style *spin/lbfgs* defines an orthogonal spin optimization
-(OSO) combined to a limited-memory Broyden-Fletcher-Goldfarb-Shanno 
-(L-BFGS) algorithm.
-By default, style *spin/lbfgs* does not employ line search procedure.
-If the line search procedure is not used then the discrete factor defines
-the maximum root mean squared rotation angle of spins by equation *pi/(5\*Kappa)*.
-The default value for Kappa is 10.
-The *spin\_cubic* line search can improve the convergence of the 
+Style *spin/lbfgs* defines an orthogonal spin optimization (OSO)
+combined to a limited-memory Broyden-Fletcher-Goldfarb-Shanno (L-BFGS)
+algorithm.  By default, style *spin/lbfgs* does not employ line search
+procedure.  If the line search procedure is not used then the discrete
+factor defines the maximum root mean squared rotation angle of spins by
+equation *pi/(5\*Kappa)*.  The default value for Kappa is 10.  The
+*spin_cubic* line search option can improve the convergence of the
 *spin/lbfgs* algorithm.
 
 The :doc:`min_modify <min_modify>` command can be used to
 activate the line search procedure, and to modify the
-discretization factor *discrete\_factor*.
+discretization factor *discrete_factor*.
 
-For more information about styles *spin/cg* and *spin/lbfgs*\ , 
+For more information about styles *spin/cg* and *spin/lbfgs*\ ,
 see their implementation reported in :ref:`(Ivanov) <Ivanov1>`.
 
 .. note::
@@ -101,7 +98,6 @@ see their implementation reported in :ref:`(Ivanov) <Ivanov1>`.
 Restrictions
 """"""""""""
 
-
 This minimization procedure is only applied to spin degrees of
 freedom for a frozen lattice configuration.
 
@@ -114,20 +110,11 @@ Related commands
 Default
 """""""
 
-The option defaults are *alpha\_damp* = 1.0, *discrete\_factor* =
-10.0, *line* = spin\_none and *norm* = euclidean.
-
+The option defaults are *alpha_damp* = 1.0, *discrete_factor* =
+10.0, *line* = spin_none and *norm* = euclidean.
 
 ----------
 
-
 .. _Ivanov1:
 
-
-
 **(Ivanov)** Ivanov, Uzdin, Jonsson. arXiv preprint arXiv:1904.02669, (2019).
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/min_style.rst b/doc/src/min_style.rst
index b9e896df3e..c03015d4d9 100644
--- a/doc/src/min_style.rst
+++ b/doc/src/min_style.rst
@@ -1,23 +1,21 @@
-.. index:: min\_style
+.. index:: min_style
 
-min\_style command
-==================
+min_style command
+=================
 
 Syntax
 """"""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    min_style style
 
-* style = *cg* or *hftn* or *sd* or *quickmin* or *fire* or *spin* or *spin/cg* or *spin/lbfgs*
+* style = *cg* or *hftn* or *sd* or *quickmin* or *fire* or *fire/old* or *spin* or *spin/cg* or *spin/lbfgs*
 
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    min_style cg
    min_style spin
@@ -26,8 +24,8 @@ Examples
 Description
 """""""""""
 
-Choose a minimization algorithm to use when a :doc:`minimize <minimize>`
-command is performed.
+Choose a minimization algorithm to use when a :doc:`minimize
+<minimize>` command is performed.
 
 Style *cg* is the Polak-Ribiere version of the conjugate gradient (CG)
 algorithm.  At each iteration the force gradient is combined with the
@@ -55,82 +53,96 @@ descent will not converge as quickly as CG, but may be more robust in
 some situations.
 
 Style *quickmin* is a damped dynamics method described in
-:ref:`(Sheppard) <Sheppard>`, where the damping parameter is related to the
-projection of the velocity vector along the current force vector for
-each atom.  The velocity of each atom is initialized to 0.0 by this
-style, at the beginning of a minimization.
+:ref:`(Sheppard) <Sheppard>`, where the damping parameter is related
+to the projection of the velocity vector along the current force
+vector for each atom.  The velocity of each atom is initialized to 0.0
+by this style, at the beginning of a minimization.
 
-Style *fire* is a damped dynamics method described in
-:ref:`(Bitzek) <Bitzek>`, which is similar to *quickmin* but adds a variable
-timestep and alters the projection operation to maintain components of
-the velocity non-parallel to the current force vector.  The velocity
-of each atom is initialized to 0.0 by this style, at the beginning of
-a minimization.
+Style *fire* is a damped dynamics method described in :ref:`(Bitzek)
+<Bitzek>`, which is similar to *quickmin* but adds a variable timestep
+and alters the projection operation to maintain components of the
+velocity non-parallel to the current force vector.  The velocity of
+each atom is initialized to 0.0 by this style, at the beginning of a
+minimization. This style correspond to an optimized version described
+in :ref:`(Guenole) <Guenole>` that include different time integration
+schemes and defaults parameters. The default parameters can be
+modified with the command :doc:`min_modify <min_modify>`.
 
-Style *spin* is a damped spin dynamics with an adaptive
-timestep.
+Style *fire/old* is the original implementation of *fire* in Lammps,
+conserved for backward compatibility. The main differences regarding
+the current version *fire* are: time integration by Explicit Euler
+only, different sequence in maintaining velocity components non-parallel
+to the current force vector and hard-coded minimization parameters.
+A complete description of the differences between *fire/old* and *fire*
+can be found in :ref:`(Guenole) <Guenole>` (where the current *fire*
+in LAMMPS is called *fire2.0*). By using an appropriate set of
+parameters, *fire* can behave similar to *fire/old*, as described
+in the :doc:`min_modify <min_modify>` command.
 
-Style *spin/cg* uses an orthogonal spin optimization (OSO)
-combined to a conjugate gradient (CG) approach to minimize spin
-configurations.
+Style *spin* is a damped spin dynamics with an adaptive timestep.
 
-Style *spin/lbfgs* uses an orthogonal spin optimization (OSO)
-combined to a limited-memory Broyden-Fletcher-Goldfarb-Shanno
-(LBFGS) approach to minimize spin configurations.
+Style *spin/cg* uses an orthogonal spin optimization (OSO) combined to
+a conjugate gradient (CG) approach to minimize spin configurations.
 
-See the :doc:`min/spin <min_spin>` doc page for more information
-about the *spin*\ , *spin/cg* and *spin/lbfgs* styles.
+Style *spin/lbfgs* uses an orthogonal spin optimization (OSO) combined
+to a limited-memory Broyden-Fletcher-Goldfarb-Shanno (LBFGS) approach
+to minimize spin configurations.
 
-Either the *quickmin* and *fire* styles are useful in the context of
-nudged elastic band (NEB) calculations via the :doc:`neb <neb>` command.
+See the :doc:`min/spin <min_spin>` doc page for more information about
+the *spin*\ , *spin/cg* and *spin/lbfgs* styles.
 
-Either the *spin*\ , *spin/cg* and *spin/lbfgs* styles are useful 
-in the context of magnetic geodesic nudged elastic band (GNEB) calculations 
-via the :doc:`neb/spin <neb_spin>` command.
+Either the *quickmin*\ , *fire* and *fire/old* styles are useful in the
+context of nudged elastic band (NEB) calculations via the :doc:`neb
+<neb>` command.
+
+Either the *spin*\ , *spin/cg* and *spin/lbfgs* styles are useful in
+the context of magnetic geodesic nudged elastic band (GNEB)
+calculations via the :doc:`neb/spin <neb_spin>` command.
 
 .. note::
 
    The damped dynamic minimizers use whatever timestep you have
-   defined via the :doc:`timestep <timestep>` command.  Often they will
-   converge more quickly if you use a timestep about 10x larger than you
-   would normally use for dynamics simulations.
+   defined via the :doc:`timestep <timestep>` command.  Often they
+   will converge more quickly if you use a timestep about 10x larger
+   than you would normally use for dynamics simulations.
+   For *fire*, the default timestep is recommended to be equal to
+   the one you would normally use for dynamics simulations.
 
 .. note::
 
-   The *quickmin*\ , *fire*\ , *hftn*\ , and *cg/kk* styles do not yet
-   support the use of the :doc:`fix box/relax <fix_box_relax>` command or
-   minimizations involving the electron radius in :doc:`eFF <pair_eff>`
-   models.
-
+   The *quickmin*\ , *fire*\ , *fire/old*\ , *hftn*\ , and *cg/kk* styles do not yet
+   support the use of the :doc:`fix box/relax <fix_box_relax>` command
+   or minimizations involving the electron radius in :doc:`eFF
+   <pair_eff>` models.
 
 ----------
 
-
 Styles with a *gpu*\ , *intel*\ , *kk*\ , *omp*\ , or *opt* suffix are
 functionally the same as the corresponding style without the suffix.
 They have been optimized to run faster, depending on your available
-hardware, as discussed on the :doc:`Speed packages <Speed_packages>` doc
-page.  The accelerated styles take the same arguments and should
+hardware, as discussed on the :doc:`Speed packages <Speed_packages>`
+doc page.  The accelerated styles take the same arguments and should
 produce the same results, except for round-off and precision issues.
 
 These accelerated styles are part of the GPU, USER-INTEL, KOKKOS,
 USER-OMP and OPT packages, respectively.  They are only enabled if
-LAMMPS was built with those packages.  See the :doc:`Build package <Build_package>` doc page for more info.
+LAMMPS was built with those packages.  See the :doc:`Build package
+<Build_package>` doc page for more info.
 
 You can specify the accelerated styles explicitly in your input script
-by including their suffix, or you can use the :doc:`-suffix command-line switch <Run_options>` when you invoke LAMMPS, or you can use the
-:doc:`suffix <suffix>` command in your input script.
+by including their suffix, or you can use the :doc:`-suffix
+command-line switch <Run_options>` when you invoke LAMMPS, or you can
+use the :doc:`suffix <suffix>` command in your input script.
 
 See the :doc:`Speed packages <Speed_packages>` doc page for more
 instructions on how to use the accelerated styles effectively.
 
-
 ----------
 
-
 Restrictions
 """"""""""""
- none
+
+none
 
 Related commands
 """"""""""""""""
@@ -140,31 +152,24 @@ Related commands
 Default
 """""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    min_style cg
 
-
 ----------
 
-
 .. _Sheppard:
 
-
-
 **(Sheppard)** Sheppard, Terrell, Henkelman, J Chem Phys, 128, 134106
 (2008).  See ref 1 in this paper for original reference to Qmin in
 Jonsson, Mills, Jacobsen.
 
 .. _Bitzek:
 
-
-
 **(Bitzek)** Bitzek, Koskinen, Gahler, Moseler, Gumbsch, Phys Rev Lett,
 97, 170201 (2006).
 
+.. _Guenole:
 
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
+**(Guenole)** Guenole, Noehring, Vaid, Houlle, Xie, Prakash, Bitzek,
+Comput Mater Sci, 175, 109584 (2020).
diff --git a/doc/src/minimize.rst b/doc/src/minimize.rst
index d9aba3eda0..dde5284b7a 100644
--- a/doc/src/minimize.rst
+++ b/doc/src/minimize.rst
@@ -9,7 +9,6 @@ minimize/kk command
 Syntax
 """"""
 
-
 .. parsed-literal::
 
    minimize etol ftol maxiter maxeval
@@ -22,8 +21,7 @@ Syntax
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    minimize 1.0e-4 1.0e-6 100 1000
    minimize 0.0 1.0e-8 1000 100000
@@ -52,10 +50,12 @@ or :doc:`limited timestep <fix_nve_limit>`.  Or dynamics can be run
 using :doc:`fix viscous <fix_viscous>` to impose a damping force that
 slowly drains all kinetic energy from the system.  The :doc:`pair_style soft <pair_soft>` potential can be used to un-overlap atoms while
 running dynamics.
+un-overlap atoms while running dynamics.
 
 Note that you can minimize some atoms in the system while holding the
-coordinates of other atoms fixed by applying :doc:`fix setforce <fix_setforce>` to the other atoms.  See a fuller
-discussion of using fixes while minimizing below.
+coordinates of other atoms fixed by applying :doc:`fix setforce
+<fix_setforce>` to the other atoms.  See a fuller discussion of using
+fixes while minimizing below.
 
 The :doc:`minimization styles <min_style>` *cg*\ , *sd*\ , and *hftn*
 involves an outer iteration loop which sets the search direction along
@@ -68,43 +68,46 @@ be more robust than previous line searches we've tried.  The
 backtracking method is described in Nocedal and Wright's Numerical
 Optimization (Procedure 3.1 on p 41).
 
-The :doc:`minimization styles <min_style>` *quickmin* and *fire* perform
-damped dynamics using an Euler integration step.  Thus they require a
-:doc:`timestep <timestep>` be defined.
+The :doc:`minimization styles <min_style>` *quickmin*\ , *fire* and
+*fire/old* perform damped dynamics using an Euler integration step.  Thus
+they require a :doc:`timestep <timestep>` be defined.
 
 .. note::
 
    The damped dynamic minimizers use whatever timestep you have
-   defined via the :doc:`timestep <timestep>` command.  Often they will
-   converge more quickly if you use a timestep about 10x larger than you
-   would normally use for dynamics simulations.
-
+   defined via the :doc:`timestep <timestep>` command.  Often they
+   will converge more quickly if you use a timestep about 10x larger
+   than you would normally use for dynamics simulations.
 
 ----------
 
-
 In all cases, the objective function being minimized is the total
 potential energy of the system as a function of the N atom
 coordinates:
 
-.. image:: Eqs/min_energy.jpg
-   :align: center
+.. math::
+ E(r_1,r_2, \ldots ,r_N)  = & \sum_{i,j} E_{\it pair}(r_i,r_j) +
+                              \sum_{ij} E_{\it bond}(r_i,r_j) +
+                              \sum_{ijk} E_{\it angle}(r_i,r_j,r_k) + \\
+                            & \sum_{ijkl} E_{\it dihedral}(r_i,r_j,r_k,r_l) +
+                              \sum_{ijkl} E_{\it improper}(r_i,r_j,r_k,r_l) +
+                              \sum_i E_{\it fix}(r_i)
 
-where the first term is the sum of all non-bonded :doc:`pairwise interactions <pair_style>` including :doc:`long-range Coulombic interactions <kspace_style>`, the 2nd through 5th terms are
-:doc:`bond <bond_style>`, :doc:`angle <angle_style>`,
-:doc:`dihedral <dihedral_style>`, and :doc:`improper <improper_style>`
-interactions respectively, and the last term is energy due to
-:doc:`fixes <fix>` which can act as constraints or apply force to atoms,
-such as through interaction with a wall.  See the discussion below about
-how fix commands affect minimization.
+where the first term is the sum of all non-bonded :doc:`pairwise
+interactions <pair_style>` including :doc:`long-range Coulombic
+interactions <kspace_style>`, the 2nd through 5th terms are :doc:`bond
+<bond_style>`, :doc:`angle <angle_style>`, :doc:`dihedral
+<dihedral_style>`, and :doc:`improper <improper_style>` interactions
+respectively, and the last term is energy due to :doc:`fixes <fix>`
+which can act as constraints or apply force to atoms, such as through
+interaction with a wall.  See the discussion below about how fix
+commands affect minimization.
 
 The starting point for the minimization is the current configuration
 of the atoms.
 
-
 ----------
 
-
 The minimization procedure stops if any of several criteria are met:
 
 * the change in energy between outer iterations is less than *etol*
@@ -126,9 +129,9 @@ The minimization procedure stops if any of several criteria are met:
 .. note::
 
    You can also use the :doc:`fix halt <fix_halt>` command to specify
-   a general criterion for exiting a minimization, that is a calculation
-   performed on the state of the current system, as defined by an
-   :doc:`equal-style variable <variable>`.
+   a general criterion for exiting a minimization, that is a
+   calculation performed on the state of the current system, as
+   defined by an :doc:`equal-style variable <variable>`.
 
 For the first criterion, the specified energy tolerance *etol* is
 unitless; it is met when the energy change between successive
@@ -163,9 +166,8 @@ freedom, such as from the :doc:`fix box/relax <fix_box_relax>` command.
 
 Following minimization, a statistical summary is printed that lists
 which convergence criterion caused the minimizer to stop, as well as
-information about the energy, force, final line search, and
-iteration counts.  An example is as follows:
-
+information about the energy, force, final line search, and iteration
+counts.  An example is as follows:
 
 .. parsed-literal::
 
@@ -204,10 +206,8 @@ reduced.
 The iterations and force evaluation values are what is checked by the
 *maxiter* and *maxeval* parameters.
 
-
 ----------
 
-
 .. note::
 
    There are several force fields in LAMMPS which have
@@ -277,10 +277,8 @@ that can be used include:
    :doc:`fix shake <fix_shake>` or :doc:`fix rigid <fix_rigid>`.  See more
    info in the Restrictions section below.
 
-
 ----------
 
-
 Styles with a *gpu*\ , *intel*\ , *kk*\ , *omp*\ , or *opt* suffix are
 functionally the same as the corresponding style without the suffix.
 They have been optimized to run faster, depending on your available
@@ -299,14 +297,11 @@ by including their suffix, or you can use the :doc:`-suffix command-line switch
 See the :doc:`Speed packages <Speed_packages>` doc page for more
 instructions on how to use the accelerated styles effectively.
 
-
 ----------
 
-
 Restrictions
 """"""""""""
 
-
 Features that are not yet implemented are listed here, in case someone
 knows how they could be coded:
 
@@ -337,8 +332,3 @@ Related commands
 :doc:`run_style <run_style>`
 
 **Default:** none
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/molecule.rst b/doc/src/molecule.rst
index 6a36636d9c..aa00949990 100644
--- a/doc/src/molecule.rst
+++ b/doc/src/molecule.rst
@@ -6,7 +6,6 @@ molecule command
 Syntax
 """"""
 
-
 .. parsed-literal::
 
    molecule ID file1 keyword values ... file2 keyword values ... fileN ...
@@ -15,9 +14,9 @@ Syntax
 * file1,file2,... = names of files containing molecule descriptions
 * zero or more keyword/value pairs may be appended after each file
 * keyword = *offset* or *toff* or *boff* or *aoff* or *doff* or *ioff* or *scale*
-  
+
   .. parsed-literal::
-  
+
        *offset* values = Toff Boff Aoff Doff Ioff
          Toff = offset to add to atom types
          Boff = offset to add to bond types
@@ -37,13 +36,10 @@ Syntax
        *scale* value = sfactor
          sfactor = scale factor to apply to the size and mass of the molecule
 
-
-
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    molecule 1 mymol.txt
    molecule 1 co2.txt h2o.txt
@@ -64,6 +60,7 @@ templates include:
 * :doc:`fix rigid/small <fix_rigid>`
 * :doc:`fix shake <fix_shake>`
 * :doc:`fix gcmc <fix_gcmc>`
+* :doc:`fix bond/react <fix_bond_react>`
 * :doc:`create_atoms <create_atoms>`
 * :doc:`atom_style template <atom_style>`
 
@@ -127,7 +124,7 @@ a description of the file.  Then lines are read one at a time.  Lines
 can have a trailing comment starting with '#' that is ignored.  If the
 line is blank (only white-space after comment is deleted), it is
 skipped.  If the line contains a header keyword, the corresponding
-value(s) is read from the line.  If it doesn't contain a header
+value(s) is read from the line.  If it does not contain a header
 keyword, the line begins the body of the file.
 
 The body of the file contains zero or more sections.  The first line
@@ -148,6 +145,7 @@ appear if the value(s) are different than the default.
 * Na *angles* = # of angles Na in molecule, default = 0
 * Nd *dihedrals* = # of dihedrals Nd in molecule, default = 0
 * Ni *impropers* = # of impropers Ni in molecule, default = 0
+* Nf *fragments* = # of fragments in molecule, default = 0
 * Mtotal *mass* = total mass of molecule
 * Xc Yc Zc *com* = coordinates of center-of-mass of molecule
 * Ixx Iyy Izz Ixy Ixz Iyz *inertia* = 6 components of inertia tensor of molecule
@@ -170,7 +168,7 @@ internally.
 
 These are the allowed section keywords for the body of the file.
 
-* *Coords, Types, Charges, Diameters, Masses* = atom-property sections
+* *Coords, Types, Molecules, Fragments, Charges, Diameters, Masses* = atom-property sections
 * *Bonds, Angles, Dihedrals, Impropers* = molecular topology sections
 * *Special Bond Counts, Special Bonds* = special neighbor info
 * *Shake Flags, Shake Atoms, Shake Bond Types* = SHAKE info
@@ -209,29 +207,43 @@ should be a number from 1 to Nlines for the section, indicating which
 atom (or bond, etc) the entry applies to.  The lines are assumed to be
 listed in order from 1 to Nlines, but LAMMPS does not check for this.
 
-
 ----------
 
-
 *Coords* section:
 
 * one line per atom
 * line syntax: ID x y z
 * x,y,z = coordinate of atom
 
-
 ----------
 
-
 *Types* section:
 
 * one line per atom
 * line syntax: ID type
 * type = atom type of atom
 
+----------
+
+*Molecules* section:
+
+* one line per atom
+* line syntax: ID molecule-ID
+* molecule-ID = molecule ID of atom
 
 ----------
 
+*Fragments* section:
+
+* one line per fragment
+* line syntax: ID a b c d ...
+* a,b,c,d,... = IDs of atoms in fragment
+
+The ID of a fragment can only contain alphanumeric characters and
+underscores.  The atom IDs should be values from 1 to Natoms, where
+Natoms = # of atoms in the molecule.
+
+----------
 
 *Charges* section:
 
@@ -243,10 +255,8 @@ This section is only allowed for :doc:`atom styles <atom_style>` that
 support charge.  If this section is not included, the default charge
 on each atom in the molecule is 0.0.
 
-
 ----------
 
-
 *Diameters* section:
 
 * one line per atom
@@ -254,13 +264,11 @@ on each atom in the molecule is 0.0.
 * diam = diameter of atom
 
 This section is only allowed for :doc:`atom styles <atom_style>` that
-support finite-size spherical particles, e.g. atom\_style sphere.  If
+support finite-size spherical particles, e.g. atom_style sphere.  If
 not listed, the default diameter of each atom in the molecule is 1.0.
 
-
 ----------
 
-
 *Masses* section:
 
 * one line per atom
@@ -274,10 +282,8 @@ included, the default mass for each atom is derived from its volume
 (see Diameters section) and a default density of 1.0, in
 :doc:`units <units>` of mass/volume.
 
-
 ----------
 
-
 *Bonds* section:
 
 * one line per bond
@@ -288,10 +294,8 @@ included, the default mass for each atom is derived from its volume
 The IDs for the two atoms in each bond should be values
 from 1 to Natoms, where Natoms = # of atoms in the molecule.
 
-
 ----------
 
-
 *Angles* section:
 
 * one line per angle
@@ -304,10 +308,8 @@ Natoms, where Natoms = # of atoms in the molecule.  The 3 atoms are
 ordered linearly within the angle.  Thus the central atom (around
 which the angle is computed) is the atom2 in the list.
 
-
 ----------
 
-
 *Dihedrals* section:
 
 * one line per dihedral
@@ -319,10 +321,8 @@ The IDs for the four atoms in each dihedral should be values from 1 to
 Natoms, where Natoms = # of atoms in the molecule.  The 4 atoms are
 ordered linearly within the dihedral.
 
-
 ----------
 
-
 *Impropers* section:
 
 * one line per improper
@@ -336,10 +336,8 @@ the 4 atoms determines the definition of the improper angle used in
 the formula for the defined :doc:`improper style <improper_style>`.  See
 the doc pages for individual styles for details.
 
-
 ----------
 
-
 *Special Bond Counts* section:
 
 * one line per atom
@@ -358,10 +356,8 @@ As explained above, LAMMPS will auto-generate this information if this
 section is not specified.  If specified, this section will
 override what would be auto-generated.
 
-
 ----------
 
-
 *Special Bonds* section:
 
 * one line per atom
@@ -381,10 +377,8 @@ As explained above, LAMMPS will auto-generate this information if this
 section is not specified.  If specified, this section will override
 what would be auto-generated.
 
-
 ----------
 
-
 *Shake Flags* section:
 
 * one line per atom
@@ -404,10 +398,8 @@ clusters.
 * 3 = part of a 3-atom SHAKE cluster with two bonds
 * 4 = part of a 4-atom SHAKE cluster with three bonds
 
-
 ----------
 
-
 *Shake Atoms* section:
 
 * one line per atom
@@ -442,10 +434,8 @@ and b,c,d = IDs of other three atoms bonded to the central atom.
 See the :doc:`fix shake <fix_shake>` doc page for a further description
 of SHAKE clusters.
 
-
 ----------
 
-
 *Shake Bond Types* section:
 
 * one line per atom
@@ -489,14 +479,11 @@ atom (value d in the Shake Atoms section).
 See the :doc:`fix shake <fix_shake>` doc page for a further description
 of SHAKE clusters.
 
-
 ----------
 
-
 Restrictions
 """"""""""""
 
-
 This command must come after the simulation box is define by a
 :doc:`read_data <read_data>`, :doc:`read_restart <read_restart>`, or
 :doc:`create_box <create_box>` command.
@@ -511,8 +498,3 @@ Default
 """""""
 
 The default keywords values are offset 0 0 0 0 0 and scale = 1.0.
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/neb.rst b/doc/src/neb.rst
index 713179b02c..acb157e2ec 100644
--- a/doc/src/neb.rst
+++ b/doc/src/neb.rst
@@ -6,7 +6,6 @@ neb command
 Syntax
 """"""
 
-
 .. parsed-literal::
 
    neb etol ftol N1 N2 Nevery file-style arg keyword
@@ -17,9 +16,9 @@ Syntax
 * N2 = max # of iterations (timesteps) to run barrier-climbing NEB
 * Nevery = print replica energies and reaction coordinates every this many timesteps
 * file-style = *final* or *each* or *none*
-  
+
   .. parsed-literal::
-  
+
        *final* arg = filename
          filename = file with initial coords for final replica
            coords for intermediate replicas are linearly interpolated
@@ -35,8 +34,7 @@ keyword = *verbose*
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    neb 0.1 0.0 1000 500 50 final coords.final
    neb 0.0 0.001 1000 500 50 each coords.initial.$i
@@ -114,10 +112,8 @@ from such an initial path.  In this case, you will want to generate
 initial states for the intermediate replicas that are geometrically
 closer to the MEP and read them in.
 
-
 ----------
 
-
 For a *file-style* setting of *final*\ , a filename is specified which
 contains atomic coordinates for zero or more atoms, in the format
 described below.  For each atom that appears in the file, the new
@@ -151,8 +147,7 @@ For a *file-style* setting of *each*\ , a filename is specified which is
 assumed to be unique to each replica.  This can be done by using a
 variable in the filename, e.g.
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    variable i equal part
    neb 0.0 0.001 1000 500 50 each coords.initial.$i
@@ -185,10 +180,8 @@ that a long calculation can be restarted if needed.
    must thus be in the correct initial configuration at the time the neb
    command is issued.
 
-
 ----------
 
-
 A NEB calculation proceeds in two stages, each of which is a
 minimization procedure, performed via damped dynamics.  To enable
 this, you must first define a damped dynamics
@@ -246,10 +239,8 @@ configuration at (close to) the saddle point of the transition. The
 potential energies for the set of replicas represents the energy
 profile of the transition along the MEP.
 
-
 ----------
 
-
 A few other settings in your input script are required or advised to
 perform a NEB calculation.  See the NOTE about the choice of timestep
 at the beginning of this doc page.
@@ -271,10 +262,8 @@ Euler integration step.  Thus you must define an appropriate
 will often converge more quickly if you use a timestep about 10x
 larger than you would normally use for dynamics simulations.
 
-
 ----------
 
-
 Each file read by the neb command containing atomic coordinates used
 to initialize one or more replicas must be formatted as follows.
 
@@ -284,7 +273,6 @@ starting with "#" which are ignored.  The first non-blank, non-comment
 line should list N = the number of lines to follow.  The N successive
 lines contain the following information:
 
-
 .. parsed-literal::
 
    ID1 x1 y1 z1
@@ -306,10 +294,8 @@ Also note there is no requirement that the atoms in the file
 correspond to the NEB atoms in the group defined by the :doc:`fix neb <fix_neb>` command.  Not every NEB atom need be in the file,
 and non-NEB atoms can be listed in the file.
 
-
 ----------
 
-
 Four kinds of output can be generated during a NEB calculation: energy
 barrier statistics, thermodynamic output by each replica, dump files,
 and restart files.
@@ -388,24 +374,24 @@ restart the calculation from an intermediate point with altered
 parameters.
 
 There are 2 Python scripts provided in the tools/python directory,
-neb\_combine.py and neb\_final.py, which are useful in analyzing output
+neb_combine.py and neb_final.py, which are useful in analyzing output
 from a NEB calculation.  Assume a NEB simulation with M replicas, and
 the NEB atoms labeled with a specific atom type.
 
-The neb\_combine.py script extracts atom coords for the NEB atoms from
+The neb_combine.py script extracts atom coords for the NEB atoms from
 all M dump files and creates a single dump file where each snapshot
 contains the NEB atoms from all the replicas and one copy of non-NEB
 atoms from the first replica (presumed to be identical in other
 replicas).  This can be visualized/animated to see how the NEB atoms
 relax as the NEB calculation proceeds.
 
-The neb\_final.py script extracts the final snapshot from each of the M
+The neb_final.py script extracts the final snapshot from each of the M
 dump files to create a single dump file with M snapshots.  This can be
 visualized to watch the system make its transition over the energy
 barrier.
 
 To illustrate, here are images from the final snapshot produced by the
-neb\_combine.py script run on the dump files produced by the two
+neb_combine.py script run on the dump files produced by the two
 example input scripts in examples/neb.  Click on them to see a larger
 image.
 
@@ -415,22 +401,17 @@ image.
 .. image:: JPG/hop2_small.jpg
    :target: JPG/hop2.jpg
 
-
 ----------
 
-
 Restrictions
 """"""""""""
 
-
 This command can only be used if LAMMPS was built with the REPLICA
 package.  See the :doc:`Build package <Build_package>` doc
 page for more info.
 
-
 ----------
 
-
 Related commands
 """"""""""""""""
 
@@ -442,37 +423,22 @@ Default
 
 none
 
-
 ----------
 
-
 .. _HenkelmanA:
 
-
-
 **(HenkelmanA)** Henkelman and Jonsson, J Chem Phys, 113, 9978-9985 (2000).
 
 .. _HenkelmanB:
 
-
-
 **(HenkelmanB)** Henkelman, Uberuaga, Jonsson, J Chem Phys, 113,
 9901-9904 (2000).
 
 .. _Nakano3:
 
-
-
 **(Nakano)** Nakano, Comp Phys Comm, 178, 280-289 (2008).
 
 .. _Maras2:
 
-
-
 **(Maras)** Maras, Trushin, Stukowski, Ala-Nissila, Jonsson,
 Comp Phys Comm, 205, 13-21 (2016)
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/neb_spin.rst b/doc/src/neb_spin.rst
index 74c46ff58e..10b08f674b 100644
--- a/doc/src/neb_spin.rst
+++ b/doc/src/neb_spin.rst
@@ -6,7 +6,6 @@ neb/spin command
 Syntax
 """"""
 
-
 .. parsed-literal::
 
    neb/spin etol ttol N1 N2 Nevery file-style arg keyword
@@ -17,9 +16,9 @@ Syntax
 * N2 = max # of iterations (timesteps) to run barrier-climbing NEB
 * Nevery = print replica energies and reaction coordinates every this many timesteps
 * file-style = *final* or *each* or *none*
-  
+
   .. parsed-literal::
-  
+
        *final* arg = filename
          filename = file with initial coords for final replica
            coords for intermediate replicas are linearly interpolated
@@ -30,13 +29,16 @@ Syntax
        *none* arg = no argument all replicas assumed to already have
            their initial coords
 
-keyword = *verbose*
+* keyword = *verbose*
+
+  .. parsed-literal::
+
+       *verbose* = print supplemental information
 
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    neb/spin 0.1 0.0 1000 500 50 final coords.final
    neb/spin 0.0 0.001 1000 500 50 each coords.initial.$i
@@ -110,10 +112,8 @@ from such an initial path.  In this case, you will want to generate
 initial states for the intermediate replicas that are geometrically
 closer to the MEP and read them in.
 
-
 ----------
 
-
 For a *file-style* setting of *final*\ , a filename is specified which
 contains atomic and spin coordinates for zero or more atoms, in the
 format described below.
@@ -136,21 +136,27 @@ is assigned to be a fraction of the angular distance.
    The angular interpolation between the starting and final point
    is achieved using Rodrigues formula:
 
-.. image:: Eqs/neb_spin_rodrigues_formula.jpg
-   :align: center
+.. math::
 
-where m\_i\^I is the initial spin configuration for the spin i,
-omega\_i\^nu is a rotation angle defined as:
+    \vec{m}_i^{\nu} = \vec{m}_i^{I} \cos(\omega_i^{\nu})
+    + (\vec{k}_i \times \vec{m}_i^{I}) \sin(\omega_i^{\nu})
+    + (1.0-\cos(\omega_i^{\nu})) \vec{k}_i (\vec{k}_i\cdot
+    \vec{m}_i^{I})
 
-.. image:: Eqs/neb_spin_angle.jpg
-   :align: center
+where :math:`\vec{m}_i^I` is the initial spin configuration for
+spin i, :math:`\omega_i^{\nu}` is a rotation angle defined as:
 
-with nu the image number, Q the total number of images, and
-omega\_i the total rotation between the initial and final spins.
-k\_i defines a rotation axis such as:
+.. math::
 
-.. image:: Eqs/neb_spin_k.jpg
-   :align: center
+   \omega_i^{\nu} = (\nu - 1) \Delta \omega_i {\rm ~~and~~} \Delta \omega_i = \frac{\omega_i}{Q-1}
+
+with :math:`\nu` the image number, Q the total number of images, and
+:math:`\omega_i` the total rotation between the initial and final spins.
+:math:`\vec{k}_i` defines a rotation axis such as:
+
+.. math::
+
+   \vec{k}_i =  \frac{\vec{m}_i^I \times \vec{m}_i^F}{\left|\vec{m}_i^I \times \vec{m}_i^F\right|}
 
 if the initial and final spins are not aligned.
 If the initial and final spins are aligned, then their cross
@@ -185,16 +191,14 @@ that a long calculation can be restarted if needed.
    must thus be in the correct initial configuration at the time the neb
    command is issued.
 
-
 ----------
 
-
 A NEB calculation proceeds in two stages, each of which is a
 minimization procedure.  To enable
 this, you must first define a
 :doc:`min_style <min_style>`, using either the *spin*\ ,
 *spin/cg*\ , or *spin/lbfgs* style (see
-:doc:`min_spin <min_spin>` for more information).  
+:doc:`min_spin <min_spin>` for more information).
 The other styles cannot be used, since they relax the lattice
 degrees of freedom instead of the spins.
 
@@ -249,10 +253,8 @@ configuration at (close to) the saddle point of the transition. The
 potential energies for the set of replicas represents the energy
 profile of the transition along the MEP.
 
-
 ----------
 
-
 An atom map must be defined which it is not by default for :doc:`atom_style atomic <atom_style>` problems.  The :doc:`atom_modify map <atom_modify>` command can be used to do this.
 
 An initial value can be defined for the timestep. Although, the *spin*
@@ -262,10 +264,8 @@ this timestep is likely to evolve during the calculation.
 The minimizers in LAMMPS operate on all spins in your system, even
 non-GNEB atoms, as defined above.
 
-
 ----------
 
-
 Each file read by the neb/spin command containing spin coordinates used
 to initialize one or more replicas must be formatted as follows.
 
@@ -275,7 +275,6 @@ starting with "#" which are ignored.  The first non-blank, non-comment
 line should list N = the number of lines to follow.  The N successive
 lines contain the following information:
 
-
 .. parsed-literal::
 
    ID1 g1 x1 y1 z1 sx1 sy1 sz1
@@ -298,10 +297,8 @@ Also note there is no requirement that the atoms in the file
 correspond to the GNEB atoms in the group defined by the :doc:`fix neb <fix_neb>` command.  Not every GNEB atom need be in the file,
 and non-GNEB atoms can be listed in the file.
 
-
 ----------
 
-
 Four kinds of output can be generated during a GNEB calculation: energy
 barrier statistics, thermodynamic output by each replica, dump files,
 and restart files.
@@ -339,7 +336,7 @@ The forward (reverse) energy barrier is the potential energy of the
 highest replica minus the energy of the first (last) replica.
 
 Supplementary information for all replicas can be printed out to the
-screen and master log.lammps file by adding the verbose keyword. This
+screen and master log.lammps file by adding the *verbose* keyword. This
 information include the following.
 The "GradVidottan" are the projections of the potential gradient for
 the replica i on its tangent vector (as detailed in Appendix D of
@@ -372,30 +369,26 @@ calculation fails to converge properly to the MEP, and you wish to
 restart the calculation from an intermediate point with altered
 parameters.
 
-A c file script in provided in the tool/spin/interpolate\_gneb
+A c file script in provided in the tool/spin/interpolate_gneb
 directory, that interpolates the MEP given the information provided
-by the verbose output option (as detailed in Appendix D of
+by the *verbose* output option (as detailed in Appendix D of
 :ref:`(BessarabA) <BessarabA>`).
 
-
 ----------
 
-
 Restrictions
 """"""""""""
 
-
 This command can only be used if LAMMPS was built with the SPIN
 package.  See the :doc:`Build package <Build_package>` doc
 page for more info.
 
-For magnetic GNEB calculations, only *spin\_none* value for *line* keyword can be used
-when styles *spin/cg* and *spin/lbfgs* are employed.
-
+For magnetic GNEB calculations, only the *spin_none* value for the
+*line* keyword can be used when minimization styles *spin/cg* and
+*spin/lbfgs* are employed.
 
 ----------
 
-
 Related commands
 """"""""""""""""
 
@@ -406,18 +399,9 @@ Default
 
 none
 
-
 ----------
 
-
 .. _BessarabA:
 
-
-
 **(BessarabA)** Bessarab, Uzdin, Jonsson, Comp Phys Comm, 196,
 335-347 (2015).
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/neigh_modify.rst b/doc/src/neigh_modify.rst
index 2ab119193c..2618953dd7 100644
--- a/doc/src/neigh_modify.rst
+++ b/doc/src/neigh_modify.rst
@@ -1,20 +1,19 @@
-.. index:: neigh\_modify
+.. index:: neigh_modify
 
-neigh\_modify command
-=====================
+neigh_modify command
+====================
 
 Syntax
 """"""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    neigh_modify keyword values ...
 
 * one or more keyword/value pairs may be listed
-  
+
   .. parsed-literal::
-  
+
      keyword = *delay* or *every* or *check* or *once* or *cluster* or *include* or *exclude* or *page* or *one* or *binsize*
        *delay* value = N
          N = delay building until this many steps since last build
@@ -49,13 +48,10 @@ Syntax
        *binsize* value = size
          size = bin size for neighbor list construction (distance units)
 
-
-
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    neigh_modify every 2 delay 10 check yes page 100000
    neigh_modify exclude type 2 3
@@ -132,7 +128,6 @@ sample scenarios where this is useful:
 * When one or more rigid bodies are specified, interactions within each
   body can be turned off to save needless computation.  See the :doc:`fix rigid <fix_rigid>` command for more details.
 
-
 The *exclude type* option turns off the pairwise interaction if one
 atom is of type M and the other of type N.  M can equal N.  The
 *exclude group* option turns off the interaction if one atom is in the
@@ -164,7 +159,7 @@ turning off bond interactions.
    long-range solver treats the interaction.  This is done correctly for
    pairwise interactions that are excluded (or weighted) via the
    :doc:`special_bonds <special_bonds>` command.  But it is not done for
-   interactions that are excluded via these neigh\_modify exclude options.
+   interactions that are excluded via these neigh_modify exclude options.
 
 The *page* and *one* options affect how memory is allocated for the
 neighbor lists.  For most simulations the default settings for these
@@ -182,10 +177,10 @@ atom can have.
    LAMMPS can crash without an error message if the number of
    neighbors for a single particle is larger than the *page* setting,
    which means it is much, much larger than the *one* setting.  This is
-   because LAMMPS doesn't error check these limits for every pairwise
+   because LAMMPS does not error check these limits for every pairwise
    interaction (too costly), but only after all the particle's neighbors
    have been found.  This problem usually means something is very wrong
-   with the way you've setup your problem (particle spacing, cutoff
+   with the way you have setup your problem (particle spacing, cutoff
    length, neighbor skin distance, etc).  If you really expect that many
    neighbors per particle, then boost the *one* and *page* settings
    accordingly.
@@ -205,7 +200,6 @@ binsize of 1/2 the cutoff.
 Restrictions
 """"""""""""
 
-
 If the "delay" setting is non-zero, then it must be a multiple of the
 "every" setting.
 
@@ -227,8 +221,3 @@ Default
 The option defaults are delay = 10, every = 1, check = yes, once = no,
 cluster = no, include = all (same as no include option defined),
 exclude = none, page = 100000, one = 2000, and binsize = 0.0.
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/neighbor.rst b/doc/src/neighbor.rst
index 3869723202..1bb591587c 100644
--- a/doc/src/neighbor.rst
+++ b/doc/src/neighbor.rst
@@ -6,7 +6,6 @@ neighbor command
 Syntax
 """"""
 
-
 .. parsed-literal::
 
    neighbor skin style
@@ -17,8 +16,7 @@ Syntax
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    neighbor 0.3 bin
    neighbor 2.0 nsq
@@ -86,10 +84,5 @@ Default
 | 0.3 bin for units = lj, skin = 0.3 sigma
 | 2.0 bin for units = real or metal, skin = 2.0 Angstroms
 | 0.001 bin for units = si, skin = 0.001 meters = 1.0 mm
-| 0.1 bin for units = cgs, skin = 0.1 cm = 1.0 mm 
-| 
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
+| 0.1 bin for units = cgs, skin = 0.1 cm = 1.0 mm
+|
diff --git a/doc/src/newton.rst b/doc/src/newton.rst
index eb7a2250c7..df1298a9e4 100644
--- a/doc/src/newton.rst
+++ b/doc/src/newton.rst
@@ -6,7 +6,6 @@ newton command
 Syntax
 """"""
 
-
 .. parsed-literal::
 
    newton flag
@@ -19,8 +18,7 @@ Syntax
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    newton off
    newton on off
@@ -54,7 +52,6 @@ communication in the innermost loop.
 Restrictions
 """"""""""""
 
-
 The newton bond setting cannot be changed after the simulation box is
 defined by a :doc:`read_data <read_data>` or
 :doc:`create_box <create_box>` command.
@@ -67,12 +64,6 @@ Related commands
 Default
 """""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    newton on
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/next.rst b/doc/src/next.rst
index e4446de48d..fd62e29ffe 100644
--- a/doc/src/next.rst
+++ b/doc/src/next.rst
@@ -6,7 +6,6 @@ next command
 Syntax
 """"""
 
-
 .. parsed-literal::
 
    next variables
@@ -16,8 +15,7 @@ Syntax
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    next x
    next a t x myTemp
@@ -84,8 +82,7 @@ command with an *index*\ -style variable.  If this input script is named
 in.polymer, 8 simulations would be run using data files from
 directories run1 through run8.
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    variable d index run1 run2 run3 run4 run5 run6 run7 run8
    shell cd $d
@@ -106,8 +103,7 @@ finished.
 Jump and next commands can also be nested to enable multi-level loops.
 For example, this script will run 15 simulations in a double loop.
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    variable i loop 3
      variable j loop 5
@@ -125,8 +121,7 @@ Here is an example of a double loop which uses the :doc:`if <if>` and
 :doc:`jump <jump>` commands to break out of the inner loop when a
 condition is met, then continues iterating through the outer loop.
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    label       loopa
    variable    a loop 5
@@ -146,7 +141,6 @@ condition is met, then continues iterating through the outer loop.
 Restrictions
 """"""""""""
 
-
 As described above.
 
 Related commands
@@ -156,8 +150,3 @@ Related commands
 :doc:`variable <variable>`,
 
 **Default:** none
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/package.rst b/doc/src/package.rst
index 368caf63fb..a6a2353087 100644
--- a/doc/src/package.rst
+++ b/doc/src/package.rst
@@ -6,16 +6,15 @@ package command
 Syntax
 """"""
 
-
 .. parsed-literal::
 
    package style args
 
 * style = *gpu* or *intel* or *kokkos* or *omp*
 * args = arguments specific to the style
-  
+
   .. parsed-literal::
-  
+
        *gpu* args = Ngpu keyword value ...
          Ngpu = # of GPUs per node
          zero or more keyword/value pairs may be appended
@@ -100,13 +99,10 @@ Syntax
              yes = threaded neighbor list build (default)
              no = non-threaded neighbor list build
 
-
-
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    package gpu 1
    package gpu 1 split 0.75
@@ -165,10 +161,8 @@ See the :doc:`Speed packages <Speed_packages>` doc page for more details
 about using the various accelerator packages for speeding up LAMMPS
 simulations.
 
-
 ----------
 
-
 The *gpu* style invokes settings associated with the use of the GPU
 package.
 
@@ -236,8 +230,7 @@ As an example, if you have two GPUs per node and 8 CPU cores per node,
 and would like to run on 4 nodes (32 cores) with dynamic balancing of
 force calculation across CPU and GPU cores, you could specify
 
-
-.. parsed-literal::
+.. code-block:: bash
 
    mpirun -np 32 -sf gpu -in in.script    # launch command
    package gpu 2 split -1                 # input script command
@@ -271,11 +264,11 @@ GPUs from different vendors or for CPU based accelerator support).
 In LAMMPS only one platform can be active at a time and by default
 the first platform with an accelerator is selected. This is equivalent
 to using a platform ID of -1. The platform ID is a number corresponding
-to the output of the ocl\_get\_devices tool. The platform ID is passed
+to the output of the ocl_get_devices tool. The platform ID is passed
 to the GPU library, by prefixing the *device* keyword with that number
 separated by a colon. For CUDA, the *device* keyword is ignored.
 Currently, the device tuning support is limited to NVIDIA Kepler, NVIDIA
-Fermi, AMD Cypress, Intel x86\_64 CPU, Intel Xeon Phi, or a generic device.
+Fermi, AMD Cypress, Intel x86_64 CPU, Intel Xeon Phi, or a generic device.
 More devices may be added later.  The default device type can be
 specified when building LAMMPS with the GPU library, via setting a
 variable in the lib/gpu/Makefile that is used.
@@ -285,19 +278,19 @@ In addition, a device type *custom* is available, which is followed by
 from the package command. It can be combined with the (colon separated)
 platform id. The individual settings are:
 
-* MEM\_THREADS
-* THREADS\_PER\_ATOM
-* THREADS\_PER\_CHARGE
-* BLOCK\_PAIR
-* MAX\_SHARED\_TYPES
-* BLOCK\_NBOR\_BUILD
-* BLOCK\_BIO\_PAIR
-* BLOCK\_ELLIPSE
-* WARP\_SIZE
-* PPPM\_BLOCK\_1D
-* BLOCK\_CELL\_2D
-* BLOCK\_CELL\_ID
-* MAX\_BIO\_SHARED\_TYPES
+* MEM_THREADS
+* THREADS_PER_ATOM
+* THREADS_PER_CHARGE
+* BLOCK_PAIR
+* MAX_SHARED_TYPES
+* BLOCK_NBOR_BUILD
+* BLOCK_BIO_PAIR
+* BLOCK_ELLIPSE
+* WARP_SIZE
+* PPPM_BLOCK_1D
+* BLOCK_CELL_2D
+* BLOCK_CELL_ID
+* MAX_BIO_SHARED_TYPES
 
 The *blocksize* keyword allows you to tweak the number of threads used
 per thread block. This number should be a multiple of 32 (for GPUs)
@@ -306,10 +299,8 @@ are 64, 128, or 256. A larger block size increases occupancy of
 individual GPU cores, but reduces the total number of thread blocks,
 thus may lead to load imbalance.
 
-
 ----------
 
-
 The *intel* style invokes settings associated with the use of the
 USER-INTEL package.  All of its settings, except the *omp* and *mode*
 keywords, are ignored if LAMMPS was not built with Xeon Phi
@@ -342,10 +333,10 @@ The *Nthread* value for the *omp* keyword sets the number of OpenMP
 threads allocated for each MPI task.  Setting *Nthread* = 0 (the
 default) instructs LAMMPS to use whatever value is the default for the
 given OpenMP environment. This is usually determined via the
-*OMP\_NUM\_THREADS* environment variable or the compiler runtime, which
+*OMP_NUM_THREADS* environment variable or the compiler runtime, which
 is usually a value of 1.
 
-For more details, including examples of how to set the OMP\_NUM\_THREADS
+For more details, including examples of how to set the OMP_NUM_THREADS
 environment variable, see the discussion of the *Nthreads* setting on
 this doc page for the "package omp" command.  Nthreads is a required
 argument for the USER-OMP package.  Its meaning is exactly the same
@@ -377,7 +368,7 @@ force calculation.
 The *lrt* keyword can be used to enable "Long Range Thread (LRT)"
 mode. It can take a value of *yes* to enable and *no* to disable.
 LRT mode generates an extra thread (in addition to any OpenMP threads
-specified with the OMP\_NUM\_THREADS environment variable or the *omp*
+specified with the OMP_NUM_THREADS environment variable or the *omp*
 keyword). The extra thread is dedicated for performing part of the
 :doc:`PPPM solver <kspace_style>` computations and communications. This
 can improve parallel performance on processors supporting
@@ -390,7 +381,7 @@ ignored and no extra threads are generated. Enabling LRT will replace
 the :doc:`run_style <run_style>` with the *verlet/lrt/intel* style that
 is identical to the default *verlet* style aside from supporting the
 LRT feature. This feature requires setting the pre-processor flag
--DLMP\_INTEL\_USELRT in the makefile when compiling LAMMPS.
+-DLMP_INTEL_USELRT in the makefile when compiling LAMMPS.
 
 The *balance* keyword sets the fraction of :doc:`pair style <pair_style>` work offloaded to the co-processor for split
 values between 0.0 and 1.0 inclusive.  While this fraction of work is
@@ -430,17 +421,15 @@ with 16 threads, for a total of 128.
 Note that the default settings for *tpc* and *tptask* are fine for
 most problems, regardless of how many MPI tasks you assign to a Phi.
 
-The *no\_affinity* keyword will turn off automatic setting of core
+The *no_affinity* keyword will turn off automatic setting of core
 affinity for MPI tasks and OpenMP threads on the host when using
 offload to a co-processor. Affinity settings are used when possible
 to prevent MPI tasks and OpenMP threads from being on separate NUMA
 domains and to prevent offload threads from interfering with other
 processes/threads used for LAMMPS.
 
-
 ----------
 
-
 The *kokkos* style invokes settings associated with the use of the
 KOKKOS package.
 
@@ -455,7 +444,7 @@ CPUs (i.e. the Kokkos CUDA back end is not enabled).
 A value of *full* uses a full neighbor lists and is the default when
 running on GPUs. This performs twice as much computation as the *half*
 option, however that is often a win because it is thread-safe and
-doesn't require atomic operations in the calculation of pair forces. For
+does not require atomic operations in the calculation of pair forces. For
 that reason, *full* is the default setting for GPUs. However, when
 running on CPUs, a *half* neighbor list is the default because it are
 often faster, just as it is for non-accelerated pair styles. Similarly,
@@ -549,13 +538,11 @@ keywords are set to *device*\ , the value for these *comm* keywords will
 be automatically changed to *host*\ . This setting has no effect if not
 running on GPUs or if using only one MPI rank. CUDA-aware MPI is available
 for OpenMPI 1.8 (or later versions), Mvapich2 1.9 (or later) when the
-"MV2\_USE\_CUDA" environment variable is set to "1", CrayMPI, and IBM
+"MV2_USE_CUDA" environment variable is set to "1", CrayMPI, and IBM
 Spectrum MPI when the "-gpu" flag is used.
 
-
 ----------
 
-
 The *omp* style invokes settings associated with the use of the
 USER-OMP package.
 
@@ -570,17 +557,16 @@ tasks \* threads/task should not exceed the physical number of cores
 
 Setting *Nthread* = 0 instructs LAMMPS to use whatever value is the
 default for the given OpenMP environment. This is usually determined
-via the *OMP\_NUM\_THREADS* environment variable or the compiler
+via the *OMP_NUM_THREADS* environment variable or the compiler
 runtime.  Note that in most cases the default for OpenMP capable
 compilers is to use one thread for each available CPU core when
-*OMP\_NUM\_THREADS* is not explicitly set, which can lead to poor
+*OMP_NUM_THREADS* is not explicitly set, which can lead to poor
 performance.
 
 Here are examples of how to set the environment variable when
 launching LAMMPS:
 
-
-.. parsed-literal::
+.. code-block:: bash
 
    env OMP_NUM_THREADS=4 lmp_machine -sf omp -in in.script
    env OMP_NUM_THREADS=2 mpirun -np 2 lmp_machine -sf omp -in in.script
@@ -590,7 +576,7 @@ or you can set it permanently in your shell's start-up script.
 All three of these examples use a total of 4 CPU cores.
 
 Note that different MPI implementations have different ways of passing
-the OMP\_NUM\_THREADS environment variable to all MPI processes.  The
+the OMP_NUM_THREADS environment variable to all MPI processes.  The
 2nd example line above is for MPICH; the 3rd example line with -x is
 for OpenMPI.  Check your MPI documentation for additional details.
 
@@ -613,14 +599,11 @@ expense of using more memory.  Specifically, neighbor list pages are
 allocated for all threads at the same time and each thread works
 within its own pages.
 
-
 ----------
 
-
 Restrictions
 """"""""""""
 
-
 This command cannot be used after the simulation box is defined by a
 :doc:`read_data <read_data>` or :doc:`create_box <create_box>` command.
 
@@ -682,8 +665,3 @@ defaults are neigh = yes.  These settings are made automatically if
 the "-sf omp" :doc:`command-line switch <Run_options>` is used.  If it
 is not used, you must invoke the package omp command in your input
 script or via the "-pk omp" :doc:`command-line switch <Run_options>`.
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/pair_adp.rst b/doc/src/pair_adp.rst
index b6fba9e960..bbfd98f677 100644
--- a/doc/src/pair_adp.rst
+++ b/doc/src/pair_adp.rst
@@ -1,28 +1,26 @@
-.. index:: pair\_style adp
+.. index:: pair_style adp
 
-pair\_style adp command
-=======================
+pair_style adp command
+======================
 
-pair\_style adp/omp command
-===========================
+pair_style adp/omp command
+==========================
 
 Syntax
 """"""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    pair_style adp
 
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    pair_style adp
-   pair_coeff \* \* Ta.adp Ta
-   pair_coeff \* \* ../potentials/AlCu.adp Al Al Cu
+   pair_coeff * * Ta.adp Ta
+   pair_coeff * * ../potentials/AlCu.adp Al Al Cu
 
 Description
 """""""""""
@@ -32,18 +30,23 @@ using the angular dependent potential (ADP) of :ref:`(Mishin) <Mishin>`,
 which is a generalization of the :doc:`embedded atom method (EAM) potential <pair_eam>`.  The LAMMPS implementation is discussed in
 :ref:`(Singh) <Singh>`.  The total energy Ei of an atom I is given by
 
-.. image:: Eqs/pair_adp.jpg
-   :align: center
+.. math::
 
-where F is the embedding energy which is a function of the atomic
-electron density rho, phi is a pair potential interaction, alpha and
-beta are the element types of atoms I and J, and s and t = 1,2,3 and
-refer to the cartesian coordinates.  The mu and lambda terms represent
-the dipole and quadruple distortions of the local atomic environment
-which extend the original EAM framework by introducing angular forces.
+   E_i            & = F_\alpha \left( \sum_{j\neq i} \rho_\beta (r_{ij}) \right) + \frac{1}{2} \sum_{j\neq i}\phi_{\alpha\beta}(r_{ij})+ \frac{1}{2} \sum_s (\mu_i^s)^2 + \frac{1}{2} \sum_{s,t} (\lambda_i^{st})^2 - \frac{1}{6} \nu_i^2 \\
+   \mu_i^s        & = \sum_{j\neq i}u_{\alpha\beta}(r_{ij})r_{ij}^s\\
+   \lambda_i^{st} & = \sum_{j\neq i}w_{\alpha\beta}(r_{ij})r_{ij}^sr_{ij}^t\\
+   \nu_i          & = \sum_s\lambda_i^{ss}
+
+where :math:`F` is the embedding energy which is a function of the atomic
+electron density :math:`\rho`, :math:`\phi` is a pair potential interaction,
+:math:`\alpha` and :math:`\beta` are the element types of atoms :math:`I` and
+:math:`J`, and :math:`s` and :math:`t = 1,2,3` and refer to the cartesian
+coordinates.  The :math:`\mu` and :math:`\lambda` terms represent the dipole
+and quadruple distortions of the local atomic environment which extend the
+original EAM framework by introducing angular forces.
 
 Note that unlike for other potentials, cutoffs for ADP potentials are
-not set in the pair\_style or pair\_coeff command; they are specified in
+not set in the pair_style or pair_coeff command; they are specified in
 the ADP potential files themselves.  Likewise, the ADP potential files
 list atomic masses; thus you do not need to use the :doc:`mass <mass>`
 command to specify them.
@@ -53,20 +56,21 @@ command to specify them.
 * The NIST WWW site at http://www.ctcms.nist.gov/potentials.
   Note that ADP potentials obtained from NIST must be converted
   into the extended DYNAMO *setfl* format discussed below.
-* The OpenKIM Project at https://openkim.org/browse/models/by-type provides
-  ADP potentials that can be used directly in LAMMPS with the :doc:`kim_commands interface <kim_commands>`.
+* The OpenKIM Project at
+  `https://openkim.org/browse/models/by-type <https://openkim.org/browse/models/by-type>`_
+  provides ADP potentials that can be used directly in LAMMPS with the
+  :doc:`kim_commands <kim_commands>` interface.
 
 ----------
 
-
-Only a single pair\_coeff command is used with the *adp* style which
+Only a single pair_coeff command is used with the *adp* style which
 specifies an extended DYNAMO *setfl* file, which contains information
-for M elements.  These are mapped to LAMMPS atom types by specifying N
-additional arguments after the filename in the pair\_coeff command,
-where N is the number of LAMMPS atom types:
+for :math:`M` elements.  These are mapped to LAMMPS atom types by specifying :math:`N`
+additional arguments after the filename in the pair_coeff command,
+where :math:`N` is the number of LAMMPS atom types:
 
 * filename
-* N element names = mapping of extended *setfl* elements to atom types
+* :math:`N` element names = mapping of extended *setfl* elements to atom types
 
 See the :doc:`pair_coeff <pair_coeff>` doc page for alternate ways to
 specify the path for the potential file.
@@ -76,12 +80,11 @@ potentials directory of the LAMMPS distribution, is an extended *setfl*
 file which has tabulated ADP values for w elements and their alloy
 interactions: Cu and Al.  If your LAMMPS simulation has 4 atoms types
 and you want the 1st 3 to be Al, and the 4th to be Cu, you would use
-the following pair\_coeff command:
+the following pair_coeff command:
 
+.. code-block:: LAMMPS
 
-.. parsed-literal::
-
-   pair_coeff \* \* AlCu.adp Al Al Al Cu
+   pair_coeff * * AlCu.adp Al Al Al Cu
 
 The 1st 2 arguments must be \* \* so as to span all LAMMPS atom types.
 The first three Al arguments map LAMMPS atom types 1,2,3 to the Al
@@ -103,34 +106,36 @@ the tabulated pair potentials.  See the :doc:`pair_eam <pair_eam>`
 command for further details on the *setfl* format.
 
 * lines 1,2,3 = comments (ignored)
-* line 4: Nelements Element1 Element2 ... ElementN
-* line 5: Nrho, drho, Nr, dr, cutoff
+* line 4: :math:`N_{\text{elements}}` Element1 Element2 ... ElementN
+* line 5: :math:`N_{\rho}`, :math:`d_{\rho}`, :math:`N_r`, :math:`d_r`, cutoff
 
-Following the 5 header lines are Nelements sections, one for each
+Following the 5 header lines are :math:`N_{\text{elements}}` sections, one for each
 element, each with the following format:
 
 * line 1 = atomic number, mass, lattice constant, lattice type (e.g. FCC)
-* embedding function F(rho) (Nrho values)
-* density function rho(r) (Nr values)
+* embedding function :math:`F(\rho)` (:math:`N_{\rho}` values)
+* density function :math:`\rho(r)` (:math:`N_r` values)
 
-Following the Nelements sections, Nr values for each pair potential
-phi(r) array are listed for all i,j element pairs in the same format
-as other arrays.  Since these interactions are symmetric (i,j = j,i)
-only phi arrays with i >= j are listed, in the following order: i,j =
-(1,1), (2,1), (2,2), (3,1), (3,2), (3,3), (4,1), ..., (Nelements,
-Nelements).  The tabulated values for each phi function are listed as
-r\*phi (in units of eV-Angstroms), since they are for atom pairs, the
+Following the :math:`N_{\text{elements}}` sections, :math:`N_r` values for each pair potential
+:math:`\phi(r)` array are listed for all :math:`i,j` element pairs in the same format
+as other arrays.  Since these interactions are symmetric (:math:`i,j = j,i`)
+only :math:`\phi` arrays with :math:`i \geq j` are listed, in the following order:
+
+.. math::
+
+   i,j = (1,1), (2,1), (2,2), (3,1), (3,2), (3,3), (4,1), ..., (N_{\text{elements}},N_{\text{elements}}).
+
+The tabulated values for each :math:`\phi` function are listed as
+:math:`r*\phi` (in units of eV-Angstroms), since they are for atom pairs, the
 same as for :doc:`other EAM files <pair_eam>`.
 
-After the phi(r) arrays, each of the u(r) arrays are listed in the
+After the :math:`\phi(r)` arrays, each of the :math:`u(r)` arrays are listed in the
 same order with the same assumptions of symmetry.  Directly following
-the u(r), the w(r) arrays are listed.  Note that phi(r) is the only
-array tabulated with a scaling by r.
-
+the :math:`u(r)`, the :math:`w(r)` arrays are listed.  Note that :math:`\phi(r)` is the only
+array tabulated with a scaling by :math:`r`.
 
 ----------
 
-
 Styles with a *gpu*\ , *intel*\ , *kk*\ , *omp*\ , or *opt* suffix are
 functionally the same as the corresponding style without the suffix.
 They have been optimized to run faster, depending on your available
@@ -149,10 +154,8 @@ by including their suffix, or you can use the :doc:`-suffix command-line switch
 See the :doc:`Speed packages <Speed_packages>` doc page for more
 instructions on how to use the accelerated styles effectively.
 
-
 ----------
 
-
 **Mixing, shift, table, tail correction, restart, rRESPA info**\ :
 
 For atom type pairs I,J and I != J, where types I and J correspond to
@@ -163,21 +166,18 @@ This pair style does not support the :doc:`pair_modify <pair_modify>`
 shift, table, and tail options.
 
 This pair style does not write its information to :doc:`binary restart files <restart>`, since it is stored in tabulated potential files.
-Thus, you need to re-specify the pair\_style and pair\_coeff commands in
+Thus, you need to re-specify the pair_style and pair_coeff commands in
 an input script that reads a restart file.
 
 This pair style can only be used via the *pair* keyword of the
 :doc:`run_style respa <run_style>` command.  It does not support the
 *inner*\ , *middle*\ , *outer* keywords.
 
-
 ----------
 
-
 Restrictions
 """"""""""""
 
-
 This pair style is part of the MANYBODY package.  It is only enabled
 if LAMMPS was built with that package.
 
@@ -188,24 +188,13 @@ Related commands
 
 **Default:** none
 
-
 ----------
 
-
 .. _Mishin:
 
-
-
 **(Mishin)** Mishin, Mehl, and Papaconstantopoulos, Acta Mater, 53, 4029
 (2005).
 
 .. _Singh:
 
-
-
 **(Singh)** Singh and Warner, Acta Mater, 58, 5797-5805 (2010),
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/pair_agni.rst b/doc/src/pair_agni.rst
index d7088a7eae..e5a17658cf 100644
--- a/doc/src/pair_agni.rst
+++ b/doc/src/pair_agni.rst
@@ -1,23 +1,25 @@
-.. index:: pair\_style agni
+.. index:: pair_style agni
 
-pair\_style agni command
+pair_style agni command
 ========================
 
-pair\_style agni/omp command
+pair_style agni/omp command
 ============================
 
 Syntax
 """"""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    pair_style agni
 
 Examples
 """"""""
-pair\_style      agni
-pair\_coeff      \* \* Al.agni Al
+
+.. code-block:: LAMMPS
+
+   pair_style      agni
+   pair_coeff      * * Al.agni Al
 
 Description
 """""""""""
@@ -25,14 +27,18 @@ Description
 Style *agni* style computes the many-body vectorial force components for
 an atom as
 
-.. image:: Eqs/pair_agni.jpg
-   :align: center
+.. math::
 
-*u* labels the individual components, i.e. x, y or z, and *V* is the
-corresponding atomic fingerprint. *d* is the Euclidean distance between
-any two atomic fingerprints. A total of N\_t reference atomic
-environments are considered to construct the force field file. *alpha\_t*
-and *l* are the weight coefficients and length scale parameter of the
+   F_i^u                  & = \sum_t^{N_t}\alpha_t \cdot \exp\left[-\frac{\left(d_{i,t}^u\right)^2}{2l^2}\right] \\
+   d_{i,t}^u              & = \left|\left| V_i^u(\eta) - V_t^u(\eta) \right|\right| \\
+   V_i^u(\eta)            & = \sum_{j \neq i}\frac{r^u_{ij}}{r_{ij}} \cdot e^{-\left(\frac{r_{ij}}{\eta} \right)^2} \cdot f_d\left(r_{ij}\right) \\
+   f_d\left(r_{ij}\right) & = \frac{1}{2} \left[\cos\left(\frac{\pi r_{ij}}{R_c}\right) + 1 \right]
+
+:math:`u` labels the individual components, i.e. :math:`x`, :math:`y` or :math:`z`, and :math:`V` is the
+corresponding atomic fingerprint. :math:`d` is the Euclidean distance between
+any two atomic fingerprints. A total of :math:`N_t` reference atomic
+environments are considered to construct the force field file. :math:`\alpha_t`
+and :math:`l` are the weight coefficients and length scale parameter of the
 non-linear regression model.
 
 The method implements the recently proposed machine learning access to
@@ -42,14 +48,14 @@ of the method is to map the atomic environment numerically into a
 fingerprint, and use machine learning methods to create a mapping to the
 vectorial atomic forces.
 
-Only a single pair\_coeff command is used with the *agni* style which
+Only a single pair_coeff command is used with the *agni* style which
 specifies an AGNI potential file containing the parameters of the
 force field for the needed elements. These are mapped to LAMMPS atom
-types by specifying N additional arguments after the filename in the
-pair\_coeff command, where N is the number of LAMMPS atom types:
+types by specifying :math:`N` additional arguments after the filename in the
+pair_coeff command, where :math:`N` is the number of LAMMPS atom types:
 
 * filename
-* N element names = mapping of AGNI elements to atom types
+* :math:`N` element names = mapping of AGNI elements to atom types
 
 See the :doc:`pair_coeff <pair_coeff>` doc page for alternate ways
 to specify the path for the force field file.
@@ -59,10 +65,8 @@ parameters of the force field, i.e., the reference training environments
 used to construct the machine learning force field. Example force field
 and input files are provided in the examples/USER/misc/agni directory.
 
-
 ----------
 
-
 Styles with *omp* suffix is functionally the same as the corresponding
 style without the suffix. They have been optimized to run faster,
 depending on your available hardware, as discussed on the :doc:`Speed packages <Speed_packages>` doc page.  The accelerated style takes
@@ -79,31 +83,26 @@ by including their suffix, or you can use the :doc:`-suffix command-line switch
 See the :doc:`Speed packages <Speed_packages>` doc page for more
 instructions on how to use the accelerated styles effectively.
 
-
 ----------
 
-
 **Mixing, shift, table, tail correction, restart, rRESPA info**\ :
 
 This pair style does not support the :doc:`pair_modify <pair_modify>`
 shift, table, and tail options.
 
 This pair style does not write its information to :doc:`binary restart files <restart>`, since it is stored in potential files.  Thus, you
-need to re-specify the pair\_style and pair\_coeff commands in an input
+need to re-specify the pair_style and pair_coeff commands in an input
 script that reads a restart file.
 
 This pair style can only be used via the *pair* keyword of the
 :doc:`run_style respa <run_style>` command.  It does not support the
 *inner*\ , *middle*\ , *outer* keywords.
 
-
 ----------
 
-
 Restrictions
 """"""""""""
 
-
 Currently, only elemental systems are implemented. Also, the method
 only provides access to the forces and not energies or stresses.
 The lack of potential energy data makes this pair style incompatible with
@@ -120,7 +119,7 @@ The AGNI force field files provided with LAMMPS (see the
 potentials directory) are parameterized for metal :doc:`units <units>`.
 You can use the AGNI potential with any LAMMPS units, but you would need
 to create your own AGNI potential file with coefficients listed in the
-appropriate units if your simulation doesn't use "metal" units.
+appropriate units if your simulation does not use "metal" units.
 
 Related commands
 """"""""""""""""
@@ -129,29 +128,16 @@ Related commands
 
 **Default:** none
 
-
 ----------
 
-
 .. _Botu2015adaptive:
 
-
-
 **(Botu1)** V. Botu and R. Ramprasad, Int. J. Quant. Chem., 115(16), 1074 (2015).
 
 .. _Botu2015learning:
 
-
-
 **(Botu2)** V. Botu and R. Ramprasad, Phys. Rev. B, 92(9), 094306 (2015).
 
 .. _Botu2016construct:
 
-
-
 **(Botu3)** V. Botu, R. Batra, J. Chapman and R. Ramprasad, https://arxiv.org/abs/1610.02098 (2016).
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/pair_airebo.rst b/doc/src/pair_airebo.rst
index 2a742d8ee2..b6d1af2a79 100644
--- a/doc/src/pair_airebo.rst
+++ b/doc/src/pair_airebo.rst
@@ -1,61 +1,59 @@
-.. index:: pair\_style airebo
+.. index:: pair_style airebo
 
-pair\_style airebo command
-==========================
+pair_style airebo command
+=========================
 
-pair\_style airebo/intel command
-================================
+pair_style airebo/intel command
+===============================
 
-pair\_style airebo/omp command
-==============================
+pair_style airebo/omp command
+=============================
 
-pair\_style airebo/morse command
-================================
+pair_style airebo/morse command
+===============================
 
-pair\_style airebo/morse/intel command
-======================================
+pair_style airebo/morse/intel command
+=====================================
 
-pair\_style airebo/morse/omp command
-====================================
+pair_style airebo/morse/omp command
+===================================
 
-pair\_style rebo command
-========================
+pair_style rebo command
+=======================
 
-pair\_style rebo/intel command
-==============================
+pair_style rebo/intel command
+=============================
 
-pair\_style rebo/omp command
-============================
+pair_style rebo/omp command
+===========================
 
 Syntax
 """"""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    pair_style style cutoff LJ_flag TORSION_flag cutoff_min
 
 * style = *airebo* or *airebo/morse* or *rebo*
-* cutoff = LJ or Morse cutoff (sigma scale factor) (AIREBO and AIREBO-M only)
-* LJ\_flag = 0/1 to turn off/on the LJ or Morse term (AIREBO and AIREBO-M only, optional)
-* TORSION\_flag = 0/1 to turn off/on the torsion term (AIREBO and AIREBO-M only, optional)
-* cutoff\_min = Start of the transition region of cutoff (sigma scale factor) (AIREBO and AIREBO-M only, optional)
+* cutoff = LJ or Morse cutoff (:math:`\sigma` scale factor) (AIREBO and AIREBO-M only)
+* LJ_flag = 0/1 to turn off/on the LJ or Morse term (AIREBO and AIREBO-M only, optional)
+* TORSION_flag = 0/1 to turn off/on the torsion term (AIREBO and AIREBO-M only, optional)
+* cutoff_min = Start of the transition region of cutoff (:math:`\sigma` scale factor) (AIREBO and AIREBO-M only, optional)
 
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    pair_style airebo 3.0
    pair_style airebo 2.5 1 0
-   pair_coeff \* \* ../potentials/CH.airebo H C
+   pair_coeff * * ../potentials/CH.airebo H C
 
    pair_style airebo/morse 3.0
-   pair_coeff \* \* ../potentials/CH.airebo-m H C
+   pair_coeff * * ../potentials/CH.airebo-m H C
 
    pair_style rebo
-   pair_coeff \* \* ../potentials/CH.rebo H C
+   pair_coeff * * ../potentials/CH.rebo H C
 
 Description
 """""""""""
@@ -82,82 +80,82 @@ with a few slightly different parameters
 
 The AIREBO potential consists of three terms:
 
-.. image:: Eqs/pair_airebo.jpg
-   :align: center
+.. math::
+
+   E & = \frac{1}{2} \sum_i \sum_{j \neq i}
+   \left[ E^{\text{REBO}}_{ij} + E^{\text{LJ}}_{ij} +
+    \sum_{k \neq i,j} \sum_{l \neq i,j,k} E^{\text{TORSION}}_{kijl} \right] \\
 
 By default, all three terms are included.  For the *airebo* style, if
-the first two optional flag arguments to the pair\_style command are
+the first two optional flag arguments to the pair_style command are
 included, the LJ and torsional terms can be turned off.  Note that
 both or neither of the flags must be included.  If both of the LJ an
 torsional terms are turned off, it becomes the 2nd-generation REBO
 potential, with a small caveat on the spline fitting procedure
-mentioned below.  This can be specified directly as pair\_style *rebo*
+mentioned below.  This can be specified directly as pair_style *rebo*
 with no additional arguments.
 
 The detailed formulas for this potential are given in
 :ref:`(Stuart) <Stuart>`; here we provide only a brief description.
 
-The E\_REBO term has the same functional form as the hydrocarbon REBO
+The :math:`E^{\text{REBO}}` term has the same functional form as the hydrocarbon REBO
 potential developed in :ref:`(Brenner) <Brenner>`.  The coefficients for
-E\_REBO in AIREBO are essentially the same as Brenner's potential, but
+:math:`E^{\text{REBO}}` in AIREBO are essentially the same as Brenner's potential, but
 a few fitted spline values are slightly different.  For most cases the
-E\_REBO term in AIREBO will produce the same energies, forces and
+:math:`E^{\text{REBO}}` term in AIREBO will produce the same energies, forces and
 statistical averages as the original REBO potential from which it was
-derived.  The E\_REBO term in the AIREBO potential gives the model its
+derived.  The :math:`E^{\text{REBO}}` term in the AIREBO potential gives the model its
 reactive capabilities and only describes short-ranged C-C, C-H and H-H
-interactions (r < 2 Angstroms). These interactions have strong
+interactions (:math:`r < 2` Angstroms). These interactions have strong
 coordination-dependence through a bond order parameter, which adjusts
 the attraction between the I,J atoms based on the position of other
 nearby atoms and thus has 3- and 4-body dependence.
 
-The E\_LJ term adds longer-ranged interactions (2 < r < cutoff) using a
+The :math:`E^{\text{LJ}}` term adds longer-ranged interactions (:math:`2 < r < \text{cutoff}`) using a
 form similar to the standard :doc:`Lennard Jones potential <pair_lj>`.
-The E\_LJ term in AIREBO contains a series of switching functions so
-that the short-ranged LJ repulsion (1/r\^12) does not interfere with
-the energetics captured by the E\_REBO term.  The extent of the E\_LJ
-interactions is determined by the *cutoff* argument to the pair\_style
+The :math:`E^{\text{LJ}}` term in AIREBO contains a series of switching functions so
+that the short-ranged LJ repulsion (:math:`1/r^{12}`) does not interfere with
+the energetics captured by the :math:`E^{\text{REBO}}` term.  The extent of the :math:`E^{\text{LJ}}`
+interactions is determined by the *cutoff* argument to the pair_style
 command which is a scale factor.  For each type pair (C-C, C-H, H-H)
 the cutoff is obtained by multiplying the scale factor by the sigma
 value defined in the potential file for that type pair.  In the
-standard AIREBO potential, sigma\_CC = 3.4 Angstroms, so with a scale
-factor of 3.0 (the argument in pair\_style), the resulting E\_LJ cutoff
+standard AIREBO potential, :math:`\sigma_{CC} = 3.4` Angstroms, so with a scale
+factor of 3.0 (the argument in pair_style), the resulting :math:`E^{\text{LJ}}` cutoff
 would be 10.2 Angstroms.
 
 By default, the longer-ranged interaction is smoothly switched off
-between 2.16 and 3.0 sigma. By specifying *cutoff\_min* in addition
+between 2.16 and 3.0 :math:`\sigma`. By specifying *cutoff_min* in addition
 to *cutoff*\ , the switching can be configured to take place between
-*cutoff\_min* and *cutoff*\ . *cutoff\_min* can only be specified if all
+*cutoff_min* and *cutoff*\ . *cutoff_min* can only be specified if all
 optional arguments are given.
 
-The E\_TORSION term is an explicit 4-body potential that describes
+The :math:`E^{\text{TORSION}}` term is an explicit 4-body potential that describes
 various dihedral angle preferences in hydrocarbon configurations.
 
-
 ----------
 
-
-Only a single pair\_coeff command is used with the *airebo*\ , *airebo*
+Only a single pair_coeff command is used with the *airebo*\ , *airebo*
 or *rebo* style which specifies an AIREBO, REBO, or AIREBO-M potential
 file with parameters for C and H.  Note that as of LAMMPS version
 15 May 2019 the *rebo* style in LAMMPS uses its own potential
 file (CH.rebo).  These are mapped to LAMMPS atom types by specifying
-N additional arguments after the filename in the pair\_coeff command,
+N additional arguments after the filename in the pair_coeff command,
 where N is the number of LAMMPS atom types:
 
 * filename
-* N element names = mapping of AIREBO elements to atom types
+* :math:`N` element names = mapping of AIREBO elements to atom types
 
 See the :doc:`pair_coeff <pair_coeff>` doc page for alternate ways
 to specify the path for the potential file.
 
 As an example, if your LAMMPS simulation has 4 atom types and you want
 the 1st 3 to be C, and the 4th to be H, you would use the following
-pair\_coeff command:
+pair_coeff command:
 
+.. code-block:: LAMMPS
 
-.. parsed-literal::
-
-   pair_coeff \* \* CH.airebo C C C H
+   pair_coeff * * CH.airebo C C C H
 
 The 1st 2 arguments must be \* \* so as to span all LAMMPS atom types.
 The first three C arguments map LAMMPS atom types 1,2,3 to the C
@@ -178,21 +176,20 @@ listed in the CH.airebo-m file to agree with the :ref:`(O'Connor) <OConnor>`
 paper. Thus the parameters are specific to this potential and the way
 it was fit, so modifying the file should be done cautiously. The
 AIREBO-M Morse potentials were parameterized using a cutoff of
-3.0 (sigma). Modifying this cutoff may impact simulation accuracy.
+3.0 (:math:`\sigma`). Modifying this cutoff may impact simulation accuracy.
 
 This pair style tallies a breakdown of the total AIREBO potential
 energy into sub-categories, which can be accessed via the :doc:`compute pair <compute_pair>` command as a vector of values of length 3.
 The 3 values correspond to the following sub-categories:
 
-1. *E\_REBO* = REBO energy
-2. *E\_LJ* = Lennard-Jones energy
-3. *E\_TORSION* = Torsion energy
+1. :math:`E_{\text{REBO}}` = REBO energy
+2. :math:`E_{\text{LJ}}` = Lennard-Jones energy
+3. :math:`E_{\text{TORSION}}` = Torsion energy
 
 To print these quantities to the log file (with descriptive column
 headings) the following commands could be included in an input script:
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    compute 0 all pair airebo
    variable REBO     equal c_0[1]
@@ -200,10 +197,8 @@ headings) the following commands could be included in an input script:
    variable TORSION  equal c_0[3]
    thermo_style custom step temp epair v_REBO v_LJ v_TORSION
 
-
 ----------
 
-
 Styles with a *gpu*\ , *intel*\ , *kk*\ , *omp*\ , or *opt* suffix are
 functionally the same as the corresponding style without the suffix.
 They have been optimized to run faster, depending on your available
@@ -222,27 +217,24 @@ by including their suffix, or you can use the :doc:`-suffix command-line switch
 See the :doc:`Speed packages <Speed_packages>` doc page for more
 instructions on how to use the accelerated styles effectively.
 
-
 ----------
 
-
 **Mixing, shift, table, tail correction, restart, rRESPA info**\ :
 
 These pair styles do not support the :doc:`pair_modify <pair_modify>`
 mix, shift, table, and tail options.
 
 These pair styles do not write their information to :doc:`binary restart files <restart>`, since it is stored in potential files.  Thus, you
-need to re-specify the pair\_style and pair\_coeff commands in an input
+need to re-specify the pair_style and pair_coeff commands in an input
 script that reads a restart file.
 
 These pair styles can only be used via the *pair* keyword of the
 :doc:`run_style respa <run_style>` command.  They do not support the
-*inner*\ , *middle*\ , *outer* keywords.
+*inner* , *middle*, *outer* keywords.
 
 Restrictions
 """"""""""""
 
-
 These pair styles are part of the MANYBODY package.  They are only
 enabled if LAMMPS was built with that package.  See the :doc:`Build package <Build_package>` doc page for more info.
 
@@ -254,7 +246,7 @@ The CH.airebo and CH.airebo-m potential files provided with LAMMPS
 You can use the AIREBO, AIREBO-M or REBO potential with any LAMMPS units,
 but you would need to create your own AIREBO or AIREBO-M potential file
 with coefficients listed in the appropriate units, if your simulation
-doesn't use "metal" units.
+does not use "metal" units.
 
 Related commands
 """"""""""""""""
@@ -263,31 +255,18 @@ Related commands
 
 **Default:** none
 
-
 ----------
 
-
 .. _Stuart:
 
-
-
 **(Stuart)** Stuart, Tutein, Harrison, J Chem Phys, 112, 6472-6486
 (2000).
 
 .. _Brenner:
 
-
-
 **(Brenner)** Brenner, Shenderova, Harrison, Stuart, Ni, Sinnott, J
 Physics: Condensed Matter, 14, 783-802 (2002).
 
 .. _OConnor:
 
-
-
 **(O'Connor)** O'Connor et al., J. Chem. Phys. 142, 024903 (2015).
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/pair_atm.rst b/doc/src/pair_atm.rst
index 7043de0041..902e07a80d 100644
--- a/doc/src/pair_atm.rst
+++ b/doc/src/pair_atm.rst
@@ -1,30 +1,28 @@
-.. index:: pair\_style atm
+.. index:: pair_style atm
 
-pair\_style atm command
-=======================
+pair_style atm command
+======================
 
 Syntax
 """"""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    pair_style atm cutoff cutoff_triple
 
 * cutoff = cutoff for each pair in 3-body interaction (distance units)
-* cutoff\_triple = additional cutoff applied to product of 3 pairwise distances (distance units)
+* cutoff_triple = additional cutoff applied to product of 3 pairwise distances (distance units)
 
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    pair_style atm 4.5 2.5
-   pair_coeff \* \* \* 0.072
+   pair_coeff * * * 0.072
 
    pair_style hybrid/overlay lj/cut 6.5 atm 4.5 2.5
-   pair_coeff \* \* lj/cut 1.0 1.0
+   pair_coeff * * lj/cut 1.0 1.0
    pair_coeff 1 1 atm 1 0.064
    pair_coeff 1 1 atm 2 0.080
    pair_coeff 1 2 atm 2 0.100
@@ -36,91 +34,90 @@ Description
 The *atm* style computes a 3-body :ref:`Axilrod-Teller-Muto <Axilrod>`
 potential for the energy E of a system of atoms as
 
-.. image:: Eqs/pair_atm.jpg
-   :align: center
+.. math::
 
-where nu is the three-body interaction strength.  The distances
-between pairs of atoms r12, r23, r31 and the angles gamma1, gamma2,
-gamma3 are as shown in this diagram:
+   E & = \nu\frac{1+3\cos\gamma_1\cos\gamma_2\cos\gamma_3}{r_{12}^3r_{23}^3r_{31}^3} \\
+
+where :math:`\nu` is the three-body interaction strength.  The distances
+between pairs of atoms :math:`r_{12}`, :math:`r_{23}`, :math:`r_{31}` and the angles :math:`\gamma_1`, :math:`\gamma_2`,
+:math:`\gamma_3` are as shown in this diagram:
 
 .. image:: JPG/pair_atm_dia.jpg
    :align: center
 
-Note that for the interaction between a triplet of atoms I,J,K, there
+Note that for the interaction between a triplet of atoms :math:`I,J,K`, there
 is no "central" atom.  The interaction is symmetric with respect to
-permutation of the three atoms. Thus the nu value is
-the same for all those permutations of the atom types of I,J,K
+permutation of the three atoms. Thus the :math:`\nu` value is
+the same for all those permutations of the atom types of :math:`I,J,K`
 and needs to be specified only once, as discussed below.
 
 The *atm* potential is typically used in combination with a two-body
 potential using the :doc:`pair_style hybrid/overlay <pair_hybrid>`
 command as in the example above.
 
-The potential for a triplet of atom is calculated only if all 3
-distances r12, r23, r31 between the 3 atoms satisfy rIJ < cutoff.
-In addition, the product of the 3 distances r12\*r23\*r31 <
-cutoff\_triple\^3 is required, which excludes from calculation the
-triplets with small contribution to the interaction.
+The potential for a triplet of atom is calculated only if all 3 distances
+:math:`r_{12}`, :math:`r_{23}`, :math:`r_{31}` between the 3 atoms satisfy
+:math:`r_{IJ} < \text{cutoff}`.  In addition, the product of the 3 distances
+:math:`r_{12} r_{23} r_{31}` < cutoff_triple :math:`^3` is required, which
+excludes from calculation the triplets with small contribution to the
+interaction.
 
 The following coefficients must be defined for each pair of atoms
 types via the :doc:`pair_coeff <pair_coeff>` command as in the examples
 above, or in the restart files read by the
 :doc:`read_restart <read_restart>` commands:
 
-* K = atom type of the third atom (1 to Ntypes)
-* nu = prefactor (energy/distance\^9 units)
+* :math:`K` = atom type of the third atom (1 to :math:`N_{\text{types}}`)
+* :math:`\nu` = prefactor (energy/distance\^9 units)
 
-K can be specified in one of two ways.  An explicit numeric value can
-be used, as in the 2nd example above.  J <= K is required.  LAMMPS
-sets the coefficients for the other 5 symmetric interactions to the
-same values.  E.g. if I = 1, J = 2, K = 3, then these 6 values are set
-to the specified nu: nu123, nu132, nu213, nu231, nu312, nu321.  This
-enforces the symmetry discussed above.
+:math:`K` can be specified in one of two ways.  An explicit numeric value can
+be used, as in the 2nd example above.  :math:`J \leq K` is required.  LAMMPS
+sets the coefficients for the other 5 symmetric interactions to the same
+values.  E.g. if :math:`I = 1`, :math:`J = 2`, :math:`K = 3`, then these 6
+values are set to the specified :math:`\nu`: :math:`\nu_{123}`,
+:math:`\nu_{132}`, :math:`\nu_{213}`, :math:`\nu_{231}`, :math:`\nu_{312}`,
+:math:`\nu_{321}`.  This enforces the symmetry discussed above.
 
 A wildcard asterisk can be used for K to set the coefficients for
 multiple triplets of atom types.  This takes the form "\*" or "\*n" or
-"n\*" or "m\*n".  If N = the number of atom types, then an asterisk with
-no numeric values means all types from 1 to N.  A leading asterisk
-means all types from 1 to n (inclusive).  A trailing asterisk means
-all types from n to N (inclusive).  A middle asterisk means all types
-from m to n (inclusive).  Note that only type triplets with J <= K are
-considered; if asterisks imply type triplets where K < J, they are
+"n\*" or "m\*n".  If :math:`N` equals the number of atom types, then an asterisk with
+no numeric values means all types from 1 to :math:`N`.  A leading asterisk
+means all types from 1 to :math:`n` (inclusive).  A trailing asterisk means
+all types from :math:`n` to :math:`N` (inclusive).  A middle asterisk means all types
+from :math:`m` to :math:`n` (inclusive).  Note that only type triplets with :math:`J \leq K` are
+considered; if asterisks imply type triplets where :math:`K < J`, they are
 ignored.
 
-Note that a pair\_coeff command can override a previous setting for the
-same I,J,K triplet.  For example, these commands set nu for all I,J.K
-triplets, then overwrite nu for just the I,J,K = 2,3,4 triplet:
+Note that a pair_coeff command can override a previous setting for the
+same :math:`I,J,K` triplet.  For example, these commands set :math:`\nu` for all :math:`I,J.K`
+triplets, then overwrite nu for just the :math:`I,J,K = 2,3,4` triplet:
 
+.. code-block:: LAMMPS
 
-.. parsed-literal::
-
-   pair_coeff \* \* \* 0.25
+   pair_coeff * * * 0.25
    pair_coeff 2 3 4 0.1
 
 Note that for a simulation with a single atom type, only a single
 entry is required, e.g.
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    pair_coeff 1 1 1 0.25
 
-For a simulation with two atom types, four pair\_coeff commands will
+For a simulation with two atom types, four pair_coeff commands will
 specify all possible nu values:
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    pair_coeff 1 1 1 nu1
    pair_coeff 1 1 2 nu2
    pair_coeff 1 2 2 nu3
    pair_coeff 2 2 2 nu4
 
-For a simulation with three atom types, ten pair\_coeff commands will
+For a simulation with three atom types, ten pair_coeff commands will
 specify all possible nu values:
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    pair_coeff 1 1 1 nu1
    pair_coeff 1 1 2 nu2
@@ -133,42 +130,37 @@ specify all possible nu values:
    pair_coeff 2 3 3 nu9
    pair_coeff 3 3 3 nu10
 
-By default the nu value for all triplets is set to 0.0.  Thus it is
-not required to provide pair\_coeff commands that enumerate triplet
-interactions for all K types.  If some I,J,K combination is not
+By default the :math:`\nu` value for all triplets is set to 0.0.  Thus it is
+not required to provide pair_coeff commands that enumerate triplet
+interactions for all :math:`K` types.  If some :math:`I,J,K` combination is not
 specified, then there will be no 3-body ATM interactions for that
 combination and all its permutations.  However, as with all pair
-styles, it is required to specify a pair\_coeff command for all I,J
+styles, it is required to specify a pair_coeff command for all :math:`I,J`
 combinations, else an error will result.
 
-
 ----------
 
-
 **Mixing, shift, table, tail correction, restart, rRESPA info**\ :
 
 This pair styles do not support the :doc:`pair_modify <pair_modify>`
 mix, shift, table, and tail options.
 
-This pair style writes its information to :doc:`binary restart files <restart>`, so pair\_style and pair\_coeff commands do not need
-to be specified in an input script that reads a restart file.
-However, if the *atm* potential is used in combination with other
-potentials using the :doc:`pair_style hybrid/overlay <pair_hybrid>`
-command then pair\_coeff commands need to be re-specified
-in the restart input script.
+This pair style writes its information to :doc:`binary restart files
+<restart>`, so pair_style and pair_coeff commands do not need to be specified
+in an input script that reads a restart file.  However, if the *atm* potential
+is used in combination with other potentials using the :doc:`pair_style
+hybrid/overlay <pair_hybrid>` command then pair_coeff commands need to be
+re-specified in the restart input script.
 
 This pair style can only be used via the *pair* keyword of the
 :doc:`run_style respa <run_style>` command.  It does not support the
-*inner*\ , *middle*\ , *outer* keywords.
-
+*inner* , *middle* , *outer* keywords.
 
 ----------
 
-
 Restrictions
 """"""""""""
 
-
 This pair style is part of the MANYBODY package.  It is only enabled
 if LAMMPS was built with that package.  See the :doc:`Build package <Build_package>` doc page for more info.
 
@@ -179,19 +171,10 @@ Related commands
 
 **Default:** none
 
-
 ----------
 
-
 .. _Axilrod:
 
-
-
 **(Axilrod)**
 Axilrod and Teller, J Chem Phys, 11, 299 (1943);
 Muto, Nippon Sugaku-Buturigakkwaishi 17, 629 (1943).
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/pair_awpmd.rst b/doc/src/pair_awpmd.rst
index ecf6cc7c30..701c45849e 100644
--- a/doc/src/pair_awpmd.rst
+++ b/doc/src/pair_awpmd.rst
@@ -1,22 +1,21 @@
-.. index:: pair\_style awpmd/cut
+.. index:: pair_style awpmd/cut
 
-pair\_style awpmd/cut command
-=============================
+pair_style awpmd/cut command
+============================
 
 Syntax
 """"""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    pair_style awpmd/cut Rc keyword value ...
 
 * Rc = global cutoff, -1 means cutoff of half the shortest box length
 * zero or more keyword/value pairs may be appended
-* keyword = *hartree* or *dproduct* or *uhf* or *free* or *pbc* or *fix* or *harm* or *ermscale* or *flex\_press*
-  
+* keyword = *hartree* or *dproduct* or *uhf* or *free* or *pbc* or *fix* or *harm* or *ermscale* or *flex_press*
+
   .. parsed-literal::
-  
+
        *hartree* value = none
        *dproduct* value = none
        *uhf* value = none
@@ -31,17 +30,14 @@ Syntax
          factor = scaling between electron mass and width variable mass
        *flex_press* value = none
 
-
-
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    pair_style awpmd/cut -1
    pair_style awpmd/cut 40.0 uhf free
-   pair_coeff \* \*
+   pair_coeff * *
    pair_coeff 2 2 20.0
 
 Description
@@ -53,7 +49,7 @@ basic formulas here.  Could be links to other documents.
 
 Rc is the cutoff.
 
-The pair\_style command allows for several optional keywords
+The pair_style command allows for several optional keywords
 to be specified.
 
 The *hartree*\ , *dproduct*\ , and *uhf* keywords specify the form of the
@@ -81,7 +77,7 @@ The *ermscale* keyword specifies a unitless scaling factor
 between the electron masses and the width variable mass.  More
 details needed.
 
-If the *flex\_press* keyword is used, then a contribution from the
+If the *flex_press* keyword is used, then a contribution from the
 electrons is added to the total virial and pressure of the system.
 
 This potential is designed to be used with :doc:`atom_style wavepacket <atom_style>` definitions, in order to handle the
@@ -97,28 +93,24 @@ commands, or by mixing as described below:
 
 For *awpmd/cut*\ , the cutoff coefficient is optional.  If it is not
 used (as in some of the examples above), the default global value
-specified in the pair\_style command is used.
-
+specified in the pair_style command is used.
 
 ----------
 
-
 **Mixing, shift, table, tail correction, restart, rRESPA info**\ :
 
 The :doc:`pair_modify <pair_modify>` mix, shift, table, and tail options
 are not relevant for this pair style.
 
-This pair style writes its information to :doc:`binary restart files <restart>`, so pair\_style and pair\_coeff commands do not need
+This pair style writes its information to :doc:`binary restart files <restart>`, so pair_style and pair_coeff commands do not need
 to be specified in an input script that reads a restart file.
 
 This pair style can only be used via the *pair* keyword of the
 :doc:`run_style respa <run_style>` command.  It does not support the
 *inner*\ , *middle*\ , *outer* keywords.
 
-
 ----------
 
-
 Restrictions
 """"""""""""
  none
@@ -131,10 +123,5 @@ Related commands
 Default
 """""""
 
-These are the defaults for the pair\_style keywords: *hartree* for the
+These are the defaults for the pair_style keywords: *hartree* for the
 initial wave function, *free* for the wave packet width.
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/pair_beck.rst b/doc/src/pair_beck.rst
index 15bd126ac2..f234366eae 100644
--- a/doc/src/pair_beck.rst
+++ b/doc/src/pair_beck.rst
@@ -1,19 +1,18 @@
-.. index:: pair\_style beck
+.. index:: pair_style beck
 
-pair\_style beck command
-========================
+pair_style beck command
+=======================
 
-pair\_style beck/gpu command
-============================
+pair_style beck/gpu command
+===========================
 
-pair\_style beck/omp command
-============================
+pair_style beck/omp command
+===========================
 
 Syntax
 """"""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    pair_style beck Rc
 
@@ -22,11 +21,10 @@ Syntax
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    pair_style beck 8.0
-   pair_coeff \* \* 399.671876712 0.0000867636112694 0.675 4.390 0.0003746
+   pair_coeff * * 399.671876712 0.0000867636112694 0.675 4.390 0.0003746
    pair_coeff 1 1 399.671876712 0.0000867636112694 0.675 4.390 0.0003746 6.0
 
 Description
@@ -36,8 +34,9 @@ Style *beck* computes interactions based on the potential by
 :ref:`(Beck) <Beck>`, originally designed for simulation of Helium.  It
 includes truncation at a cutoff distance Rc.
 
-.. image:: Eqs/pair_beck.jpg
-   :align: center
+.. math::
+
+   E(r) &= A \exp\left[-\alpha r - \beta r^6\right] - \frac{B}{\left(r^2+a^2\right)^3} \left(1+\frac{2.709+3a^2}{r^2+a^2}\right) \qquad r < R_c \\
 
 The following coefficients must be defined for each pair of atoms
 types via the :doc:`pair_coeff <pair_coeff>` command as in the examples
@@ -45,20 +44,18 @@ above, or in the data file or restart files read by the
 :doc:`read_data <read_data>` or :doc:`read_restart <read_restart>`
 commands.
 
-* A (energy units)
-* B (energy-distance\^6 units)
-* a (distance units)
-* alpha (1/distance units)
-* beta  (1/distance\^6 units)
+* :math:`A` (energy units)
+* :math:`B` (energy-distance\^6 units)
+* :math:`a` (distance units)
+* :math:`\alpha` (1/distance units)
+* :math:`\beta`  (1/distance\^6 units)
 * cutoff (distance units)
 
 The last coefficient is optional.  If not specified, the global cutoff
-Rc is used.
-
+:math:`R_c` is used.
 
 ----------
 
-
 Styles with a *gpu*\ , *intel*\ , *kk*\ , *omp*\ , or *opt* suffix are
 functionally the same as the corresponding style without the suffix.
 They have been optimized to run faster, depending on your available
@@ -77,10 +74,8 @@ by including their suffix, or you can use the :doc:`-suffix command-line switch
 See the :doc:`Speed packages <Speed_packages>` doc page for more
 instructions on how to use the accelerated styles effectively.
 
-
 ----------
 
-
 **Mixing, shift, table, tail correction, restart, rRESPA info**\ :
 
 For atom type pairs I,J and I != J, coefficients must be specified.
@@ -95,20 +90,18 @@ for this pair style.
 This pair style does not support the :doc:`pair_modify <pair_modify>`
 tail option for adding long-range tail corrections.
 
-This pair style writes its information to :doc:`binary restart files <restart>`, so pair\_style and pair\_coeff commands do not need
+This pair style writes its information to :doc:`binary restart files <restart>`, so pair_style and pair_coeff commands do not need
 to be specified in an input script that reads a restart file.
 
 This pair style can only be used via the *pair* keyword of the
 :doc:`run_style respa <run_style>` command.  It does not support the
 *inner*\ , *middle*\ , *outer* keywords.
 
-
 ----------
 
-
 Restrictions
 """"""""""""
- none
+none
 
 Related commands
 """"""""""""""""
@@ -117,17 +110,8 @@ Related commands
 
 **Default:** none
 
-
 ----------
 
-
 .. _Beck:
 
-
-
 **(Beck)** Beck, Molecular Physics, 14, 311 (1968).
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/pair_body_nparticle.rst b/doc/src/pair_body_nparticle.rst
index 1ebb6a3b47..cdb4870cbf 100644
--- a/doc/src/pair_body_nparticle.rst
+++ b/doc/src/pair_body_nparticle.rst
@@ -1,13 +1,12 @@
-.. index:: pair\_style body/nparticle
+.. index:: pair_style body/nparticle
 
-pair\_style body/nparticle command
-==================================
+pair_style body/nparticle command
+=================================
 
 Syntax
 """"""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    pair_style body/nparticle cutoff
 
@@ -16,11 +15,10 @@ cutoff = global cutoff for interactions (distance units)
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    pair_style body/nparticle 3.0
-   pair_coeff \* \* 1.0 1.0
+   pair_coeff * * 1.0 1.0
    pair_coeff 1 1 1.0 1.5 2.5
 
 Description
@@ -67,11 +65,14 @@ The interaction between two sub-particles, or a sub-particle and point
 particle, or between two point particles is computed as a Lennard-Jones
 interaction, using the standard formula
 
-.. image:: Eqs/pair_lj.jpg
-   :align: center
+.. math::
 
-where Rc is the cutoff.  As explained above, an interaction involving
-one or two body sub-particles may be computed even for r > Rc.
+   E & = 4 \epsilon \left[ \left(\frac{\sigma}{r}\right)^{12} -
+                       \left(\frac{\sigma}{r}\right)^6 \right]
+                       \qquad r < R_c \\
+
+where :math:`R_c` is the cutoff.  As explained above, an interaction involving
+one or two body sub-particles may be computed even for :math:`r > R_c`.
 
 For style *body*\ , the following coefficients must be defined for each
 pair of atoms types via the :doc:`pair_coeff <pair_coeff>` command as in
@@ -79,22 +80,20 @@ the examples above, or in the data file or restart files read by the
 :doc:`read_data <read_data>` or :doc:`read_restart <read_restart>`
 commands:
 
-* epsilon (energy units)
-* sigma (distance units)
+* :math:`\epsilon` (energy units)
+* :math:`\sigma` (distance units)
 * cutoff (distance units)
 
 The last coefficient is optional.  If not specified, the global cutoff
 is used.
 
-
 ----------
 
-
 **Mixing, shift, table, tail correction, restart, rRESPA info**\ :
 
 For atom type pairs I,J and I != J, the epsilon and sigma coefficients
 and cutoff distance for all of this pair style can be mixed.  The
-default mix value is *geometric*\ .  See the "pair\_modify" command for
+default mix value is *geometric*\ .  See the :doc:`pair_modify <pair_modify>` command for
 details.
 
 This pair style does not support the :doc:`pair_modify <pair_modify>`
@@ -106,14 +105,11 @@ This pair style can only be used via the *pair* keyword of the
 :doc:`run_style respa <run_style>` command.  It does not support the
 *inner*\ , *middle*\ , *outer* keywords.
 
-
 ----------
 
-
 Restrictions
 """"""""""""
 
-
 This style is part of the BODY package.  It is only enabled if LAMMPS
 was built with that package.  See the :doc:`Build package <Build_package>` doc page for more info.
 
@@ -126,8 +122,3 @@ Related commands
 :doc:`pair_coeff <pair_coeff>`, :doc:`fix rigid <fix_rigid>`
 
 **Default:** none
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/pair_body_rounded_polygon.rst b/doc/src/pair_body_rounded_polygon.rst
index 7fee589b9f..baba67bf7f 100644
--- a/doc/src/pair_body_rounded_polygon.rst
+++ b/doc/src/pair_body_rounded_polygon.rst
@@ -1,16 +1,17 @@
-.. index:: pair\_style body/rounded/polygon
+.. index:: pair_style body/rounded/polygon
 
-pair\_style body/rounded/polygon command
-========================================
+pair_style body/rounded/polygon command
+=======================================
 
 Syntax
 """"""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    pair_style body/rounded/polygon c_n c_t mu delta_ua cutoff
 
+.. parsed-literal::
+
    c_n = normal damping coefficient
    c_t = tangential damping coefficient
    mu = normal friction coefficient during gross sliding
@@ -20,11 +21,10 @@ Syntax
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    pair_style body/rounded/polygon 20.0 5.0 0.0 1.0 0.5
-   pair_coeff \* \* 100.0 1.0
+   pair_coeff * * 100.0 1.0
    pair_coeff 1 1 100.0 1.0
 
 Description
@@ -33,7 +33,8 @@ Description
 Style *body/rounded/polygon* is for use with 2d models of body
 particles of style *rounded/polygon*\ .  It calculates pairwise
 body/body interactions which can include body particles modeled as
-1-vertex circular disks with a specified diameter.  See the :doc:`Howto body <Howto_body>` doc page for more details on using body
+1-vertex circular disks with a specified diameter.  See the
+:doc:`Howto body <Howto_body>` doc page for more details on using body
 rounded/polygon particles.
 
 This pairwise interaction between rounded polygons is described in
@@ -53,35 +54,45 @@ between two particles are defined with respect to the separation of
 their respective rounded surfaces, not by the separation of the
 vertices and edges themselves.
 
-This means that the specified cutoff in the pair\_style command is the
-cutoff distance, r\_c, for the surface separation, \delta\_n (see figure
+This means that the specified cutoff in the pair_style command is the
+cutoff distance, :math:`r_c`, for the surface separation, :math:`\delta_n` (see figure
 below).  This is the distance at which two particles no longer
-interact.  If r\_c is specified as 0.0, then it is a contact-only
+interact.  If :math:`r_c` is specified as 0.0, then it is a contact-only
 interaction.  I.e. the two particles must overlap in order to exert a
-repulsive force on each other.  If r\_c > 0.0, then the force between
+repulsive force on each other.  If :math:`r_c > 0.0`, then the force between
 two particles will be attractive for surface separations from 0 to
-r\_c, and repulsive once the particles overlap.
+:math:`r_c`, and repulsive once the particles overlap.
 
 Note that unlike for other pair styles, the specified cutoff is not
 the distance between the centers of two particles at which they stop
 interacting.  This center-to-center distance depends on the shape and
 size of the two particles and their relative orientation.  LAMMPS
 takes that into account when computing the surface separation distance
-and applying the r\_c cutoff.
+and applying the :math:`r_c` cutoff.
 
 The forces between vertex-vertex, vertex-edge, and edge-edge overlaps
 are given by:
 
-.. image:: Eqs/pair_body_rounded.jpg
-   :align: center
+.. math::
+
+   F_n &= \begin{cases}
+           k_n \delta_n - c_n v_n     &  \delta_n \le 0 \\
+          -k_{na} \delta_n - c_n v_n  &  0 < \delta_n \le r_c \\
+          0                           & \delta_n > r_c \\
+          \end{cases} \\
+   F_t &= \begin{cases}
+          \mu k_n \delta_n - c_t v_t & \delta_n \le 0 \\
+          0                          & \delta_n > 0
+          \end{cases}
 
 .. image:: JPG/pair_body_rounded.jpg
    :align: center
 
-Note that F\_n and F\_t are functions of the surface separation \delta\_n
-= d - (R\_i + R\_j).  In this model, when (R\_i + R\_j) < d < (R\_i + R\_j)
-+ r\_c, that is, 0 < \delta\_n < r\_c, the cohesive region of the two
-surfaces overlap and the two surfaces are attractive to each other.
+Note that :math:`F_n` and :math:`F_t` are functions of the surface separation
+:math:`\delta_n = d - (R_i + R_j)`.  In this model, when
+:math:`(R_i + R_j) < d < (R_i + R_j) + r_c`, that is, :math:`0 < \delta_n < r_c`,
+the cohesive region of the two surfaces overlap and the two surfaces are
+attractive to each other.
 
 In :ref:`Fraige <pair-Fraige>`, the tangential friction force between two
 particles that are in contact is modeled differently prior to gross
@@ -98,20 +109,20 @@ The following coefficients must be defined for each pair of atom types
 via the :doc:`pair_coeff <pair_coeff>` command as in the examples above,
 or in the data file read by the :doc:`read_data <read_data>` command:
 
-* k\_n (energy/distance\^2 units)
-* k\_na (energy/distance\^2 units)
+* :math:`k_n` (energy/distance\^2 units)
+* :math:`k_{na}` (energy/distance\^2 units)
 
-Effectively, k\_n and k\_na are the slopes of the red lines in the plot
-above for force versus surface separation, for \delta\_n < 0 and 0 <
-\delta\_n < r\_c respectively.
+Effectively, :math:`k_n` and :math:`k_{na}` are the slopes of the red lines in the plot
+above for force versus surface separation, for :math:`\delta_n < 0` and
+:math:`0 < \delta_n < r_c` respectively.
 
 **Mixing, shift, table, tail correction, restart, rRESPA info**\ :
 
 This pair style does not support the :doc:`pair_modify <pair_modify>`
 mix, shift, table, and tail options.
 
-This pair style does not write its information to :doc:`binary restart files <restart>`.  Thus, you need to re-specify the pair\_style and
-pair\_coeff commands in an input script that reads a restart file.
+This pair style does not write its information to :doc:`binary restart files <restart>`.  Thus, you need to re-specify the pair_style and
+pair_coeff commands in an input script that reads a restart file.
 
 This pair style can only be used via the *pair* keyword of the
 :doc:`run_style respa <run_style>` command.  It does not support the
@@ -120,7 +131,6 @@ This pair style can only be used via the *pair* keyword of the
 Restrictions
 """"""""""""
 
-
 These pair styles are part of the BODY package.  They are only enabled
 if LAMMPS was built with that package.  See the :doc:`Build package <Build_package>` doc page for more info.
 
@@ -136,12 +146,5 @@ Related commands
 
 .. _pair-Fraige:
 
-
-
 **(Fraige)** F. Y. Fraige, P. A. Langston, A. J. Matchett, J. Dodds,
 Particuology, 6, 455 (2008).
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/pair_body_rounded_polyhedron.rst b/doc/src/pair_body_rounded_polyhedron.rst
index 010e346f30..72e94db8c9 100644
--- a/doc/src/pair_body_rounded_polyhedron.rst
+++ b/doc/src/pair_body_rounded_polyhedron.rst
@@ -1,16 +1,17 @@
-.. index:: pair\_style body/rounded/polyhedron
+.. index:: pair_style body/rounded/polyhedron
 
-pair\_style body/rounded/polyhedron command
-===========================================
+pair_style body/rounded/polyhedron command
+==========================================
 
 Syntax
 """"""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    pair_style body/rounded/polyhedron c_n c_t mu delta_ua cutoff
 
+.. parsed-literal::
+
    c_n = normal damping coefficient
    c_t = tangential damping coefficient
    mu = normal friction coefficient during gross sliding
@@ -20,11 +21,10 @@ Syntax
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    pair_style body/rounded/polyhedron 20.0 5.0 0.0 1.0 0.5
-   pair_coeff \* \* 100.0 1.0
+   pair_coeff * * 100.0 1.0
    pair_coeff 1 1 100.0 1.0
 
 Description
@@ -33,7 +33,8 @@ Description
 Style *body/rounded/polygon* is for use with 3d models of body
 particles of style *rounded/polyhedron*\ .  It calculates pairwise
 body/body interactions which can include body particles modeled as
-1-vertex spheres with a specified diameter.  See the :doc:`Howto body <Howto_body>` doc page for more details on using body
+1-vertex spheres with a specified diameter.  See the
+:doc:`Howto body <Howto_body>` doc page for more details on using body
 rounded/polyhedron particles.
 
 This pairwise interaction between the rounded polyhedra is described
@@ -53,27 +54,36 @@ and energies between two particles are defined with respect to the
 separation of their respective rounded surfaces, not by the separation
 of the vertices, edges, and faces themselves.
 
-This means that the specified cutoff in the pair\_style command is the
-cutoff distance, r\_c, for the surface separation, \delta\_n (see figure
+This means that the specified cutoff in the pair_style command is the
+cutoff distance, :math:`r_c`, for the surface separation, :math:`\delta_n` (see figure
 below).  This is the distance at which two particles no longer
-interact.  If r\_c is specified as 0.0, then it is a contact-only
+interact.  If :math:`r_c` is specified as 0.0, then it is a contact-only
 interaction.  I.e. the two particles must overlap in order to exert a
-repulsive force on each other.  If r\_c > 0.0, then the force between
+repulsive force on each other.  If :math:`r_c > 0.0`, then the force between
 two particles will be attractive for surface separations from 0 to
-r\_c, and repulsive once the particles overlap.
+:math:`r_c`, and repulsive once the particles overlap.
 
 Note that unlike for other pair styles, the specified cutoff is not
 the distance between the centers of two particles at which they stop
 interacting.  This center-to-center distance depends on the shape and
 size of the two particles and their relative orientation.  LAMMPS
 takes that into account when computing the surface separation distance
-and applying the r\_c cutoff.
+and applying the :math:`r_c` cutoff.
 
 The forces between vertex-vertex, vertex-edge, vertex-face, edge-edge,
 and edge-face overlaps are given by:
 
-.. image:: Eqs/pair_body_rounded.jpg
-   :align: center
+.. math::
+
+ F_n &= \begin{cases}
+        k_n \delta_n - c_n v_n,    & \delta_n \le 0 \\
+       -k_{na} \delta_n - c_n v_n  & 0 < \delta_n \le r_c \\
+        0                          & \delta_n > r_c \\
+        \end{cases} \\
+ F_t &= \begin{cases}
+        \mu k_n \delta_n - c_t v_t & \delta_n \le 0 \\
+        0                          & \delta_n > 0
+        \end{cases}
 
 .. image:: JPG/pair_body_rounded.jpg
    :align: center
@@ -93,20 +103,21 @@ The following coefficients must be defined for each pair of atom types
 via the :doc:`pair_coeff <pair_coeff>` command as in the examples above,
 or in the data file read by the :doc:`read_data <read_data>` command:
 
-* k\_n (energy/distance\^2 units)
-* k\_na (energy/distance\^2 units)
+* :math:`k_n` (energy/distance\^2 units)
+* :math:`k_{na}` (energy/distance\^2 units)
 
-Effectively, k\_n and k\_na are the slopes of the red lines in the plot
-above for force versus surface separation, for \delta\_n < 0 and 0 <
-\delta\_n < r\_c respectively.
+Effectively, :math:`k_n` and :math:`k_{na}` are the slopes of the red lines in the plot
+above for force versus surface separation, for :math:`\delta_n` < 0 and
+:math:`0 < \delta_n < r_c` respectively.
 
 **Mixing, shift, table, tail correction, restart, rRESPA info**\ :
 
 This pair style does not support the :doc:`pair_modify <pair_modify>`
 mix, shift, table, and tail options.
 
-This pair style does not write its information to :doc:`binary restart files <restart>`.  Thus, you need to re-specify the pair\_style and
-pair\_coeff commands in an input script that reads a restart file.
+This pair style does not write its information to :doc:`binary restart files <restart>`.
+Thus, you need to re-specify the pair_style and pair_coeff
+commands in an input script that reads a restart file.
 
 This pair style can only be used via the *pair* keyword of the
 :doc:`run_style respa <run_style>` command.  It does not support the
@@ -115,7 +126,6 @@ This pair style can only be used via the *pair* keyword of the
 Restrictions
 """"""""""""
 
-
 These pair styles are part of the BODY package.  They are only enabled
 if LAMMPS was built with that package.  See the :doc:`Build package <Build_package>` doc page for more info.
 
@@ -131,12 +141,5 @@ Related commands
 
 .. _pair-Wang:
 
-
-
 **(Wang)** J. Wang, H. S. Yu, P. A. Langston, F. Y. Fraige, Granular
 Matter, 13, 1 (2011).
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/pair_bop.rst b/doc/src/pair_bop.rst
index 3c45e2cf2f..5cd045931a 100644
--- a/doc/src/pair_bop.rst
+++ b/doc/src/pair_bop.rst
@@ -1,13 +1,12 @@
-.. index:: pair\_style bop
+.. index:: pair_style bop
 
-pair\_style bop command
-=======================
+pair_style bop command
+======================
 
 Syntax
 """"""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    pair_style bop keyword ...
 
@@ -18,87 +17,86 @@ Syntax
 
      save = pre-compute and save some values
 
-
-
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    pair_style bop
-   pair_coeff \* \* ../potentials/CdTe_bop Cd Te
+   pair_coeff * * ../potentials/CdTe_bop Cd Te
    pair_style bop save
-   pair_coeff \* \* ../potentials/CdTe.bop.table Cd Te Te
+   pair_coeff * * ../potentials/CdTe.bop.table Cd Te Te
    comm_modify cutoff 14.70
 
 Description
 """""""""""
 
 The *bop* pair style computes Bond-Order Potentials (BOP) based on
-quantum mechanical theory incorporating both sigma and pi bonding.
+quantum mechanical theory incorporating both :math:`\sigma` and :math:`\pi` bonding.
 By analytically deriving the BOP from quantum mechanical theory its
 transferability to different phases can approach that of quantum
 mechanical methods.  This potential is similar to the original BOP
-developed by Pettifor (:ref:`Pettifor\_1 <Pettifor_1>`,
-:ref:`Pettifor\_2 <Pettifor_2>`, :ref:`Pettifor\_3 <Pettifor_3>`) and later updated
+developed by Pettifor (:ref:`Pettifor_1 <Pettifor_1>`,
+:ref:`Pettifor_2 <Pettifor_2>`, :ref:`Pettifor_3 <Pettifor_3>`) and later updated
 by Murdick, Zhou, and Ward (:ref:`Murdick <Murdick>`, :ref:`Ward <Ward>`).
 Currently, BOP potential files for these systems are provided with
 LAMMPS: AlCu, CCu, CdTe, CdTeSe, CdZnTe, CuH, GaAs.  A system with
 only a subset of these elements, including a single element (e.g. C or
 Cu or Al or Ga or Zn or CdZn), can also be modeled by using the
 appropriate alloy file and assigning all atom types to the
-single element or subset of elements via the pair\_coeff command, as
+single element or subset of elements via the pair_coeff command, as
 discussed below.
 
 The BOP potential consists of three terms:
 
-.. image:: Eqs/pair_bop.jpg
-   :align: center
+.. math::
 
-where phi\_ij(r\_ij) is a short-range two-body function representing the
-repulsion between a pair of ion cores, beta\_(sigma,ij)(r\_ij) and
-beta\_(sigma,ij)(r\_ij) are respectively sigma and pi bond integrals,
-THETA\_(sigma,ij) and THETA\_(pi,ij) are sigma and pi bond-orders, and
-U\_prom is the promotion energy for sp-valent systems.
+   E = \frac{1}{2} \sum_{i=1}^{N} \sum_{j=i_1}^{i_N} \phi_{ij} \left( r_{ij} \right) - \sum_{i=1}^{N} \sum_{j=i_1}^{i_N} \beta_{\sigma,ij} \left( r_{ij} \right) \cdot \Theta_{\sigma,ij} - \sum_{i=1}^{N} \sum_{j=i_1}^{i_N} \beta_{\pi,ij} \left( r_{ij} \right) \cdot \Theta_{\pi,ij} + U_{prom}
+
+where :math:`\phi_{ij}(r_{ij})` is a short-range two-body function
+representing the repulsion between a pair of ion cores,
+:math:`\beta_{\sigma,ij}(r_{ij})` and :math:`\beta_{\sigma,ij}(r_{ij})`
+are respectively sigma and :math:`\pi` bond integrals, :math:`\Theta_{\sigma,ij}`
+and :math:`\Theta_{\pi,ij}` are :math:`\sigma` and :math:`\pi`
+bond-orders, and U_prom is the promotion energy for sp-valent systems.
 
 The detailed formulas for this potential are given in Ward
 (:ref:`Ward <Ward>`); here we provide only a brief description.
 
-The repulsive energy phi\_ij(r\_ij) and the bond integrals
-beta\_(sigma,ij)(r\_ij) and beta\_(phi,ij)(r\_ij) are functions of the
-interatomic distance r\_ij between atom i and j.  Each of these
-potentials has a smooth cutoff at a radius of r\_(cut,ij).  These
+The repulsive energy :math:`\phi_{ij}(r_{ij})` and the bond integrals
+:math:`\beta_{\sigma,ij}(r_{ij})` and :math:`\beta_{\phi,ij}(r_{ij})` are functions of the
+interatomic distance :math:`r_{ij}` between atom *i* and *j*\ .  Each of these
+potentials has a smooth cutoff at a radius of :math:`r_{cut,ij}`.  These
 smooth cutoffs ensure stable behavior at situations with high sampling
 near the cutoff such as melts and surfaces.
 
 The bond-orders can be viewed as environment-dependent local variables
-that are ij bond specific.  The maximum value of the sigma bond-order
-(THETA\_sigma) is 1, while that of the pi bond-order (THETA\_pi) is 2,
-attributing to a maximum value of the total bond-order
-(THETA\_sigma+THETA\_pi) of 3.  The sigma and pi bond-orders reflect the
-ubiquitous single-, double-, and triple- bond behavior of
-chemistry. Their analytical expressions can be derived from tight-
-binding theory by recursively expanding an inter-site Green's function
-as a continued fraction. To accurately represent the bonding with a
-computationally efficient potential formulation suitable for MD
-simulations, the derived BOP only takes (and retains) the first two
-levels of the recursive representations for both the sigma and the pi
-bond-orders. Bond-order terms can be understood in terms of molecular
-orbital hopping paths based upon the Cyrot-Lackmann theorem
-(:ref:`Pettifor\_1 <Pettifor_1>`).  The sigma bond-order with a half-full
-valence shell is used to interpolate the bond-order expression that
-incorporated explicit valance band filling.  This pi bond-order
-expression also contains also contains a three-member ring term that
-allows implementation of an asymmetric density of states, which helps
-to either stabilize or destabilize close-packed structures.  The pi
-bond-order includes hopping paths of length 4.  This enables the
-incorporation of dihedral angles effects.
+that are ij bond specific.  The maximum value of the :math:`\sigma`
+bond-order (:math:`\Theta_{\sigma}` is 1, while that of the :math:`\pi`
+bond-order (:math:`\Theta_{\pi}`) is 2, attributing to a maximum value
+of the total bond-order (:math:`\Theta_{\sigma}+\Theta_{\pi}`) of 3.
+The :math:`\sigma` and :math:`\pi` bond-orders reflect the ubiquitous
+single-, double-, and triple- bond behavior of chemistry. Their
+analytical expressions can be derived from tight- binding theory by
+recursively expanding an inter-site Green's function as a continued
+fraction. To accurately represent the bonding with a computationally
+efficient potential formulation suitable for MD simulations, the derived
+BOP only takes (and retains) the first two levels of the recursive
+representations for both the :math:`\sigma` and the :math:`\pi` bond-orders. Bond-order
+terms can be understood in terms of molecular orbital hopping paths
+based upon the Cyrot-Lackmann theorem (:ref:`Pettifor_1 <Pettifor_1>`).
+The :math:`\sigma` bond-order with a half-full valence shell is used to
+interpolate the bond-order expression that incorporated explicit valance
+band filling.  This :math:`\pi` bond-order expression also contains also contains
+a three-member ring term that allows implementation of an asymmetric
+density of states, which helps to either stabilize or destabilize
+close-packed structures.  The :math:`\pi` bond-order includes hopping paths of
+length 4.  This enables the incorporation of dihedral angles effects.
 
 .. note::
 
    Note that unlike for other potentials, cutoffs for BOP
-   potentials are not set in the pair\_style or pair\_coeff command; they
+   potentials are not set in the pair_style or pair_coeff command; they
    are specified in the BOP potential files themselves.  Likewise, the
    BOP potential files list atomic masses; thus you do not need to use
    the :doc:`mass <mass>` command to specify them.  Note that for BOP
@@ -108,7 +106,7 @@ incorporation of dihedral angles effects.
    :doc:`pair_coeff <pair_coeff>` command to read the BOP potential
    file.
 
-One option can be specified as a keyword with the pair\_style command.
+One option can be specified as a keyword with the pair_style command.
 
 The *save* keyword gives you the option to calculate in advance and
 store a set of distances, angles, and derivatives of angles.  The
@@ -118,14 +116,12 @@ The latter requires less memory, but may be slower.  It is best to
 test this option to optimize the speed of BOP for your particular
 system configuration.
 
-
 ----------
 
-
-Only a single pair\_coeff command is used with the *bop* style which
+Only a single pair_coeff command is used with the *bop* style which
 specifies a BOP potential file, with parameters for all needed
 elements.  These are mapped to LAMMPS atom types by specifying
-N additional arguments after the filename in the pair\_coeff command,
+N additional arguments after the filename in the pair_coeff command,
 where N is the number of LAMMPS atom types:
 
 * filename
@@ -134,12 +130,11 @@ where N is the number of LAMMPS atom types:
 As an example, imagine the CdTe.bop file has BOP values for Cd
 and Te.  If your LAMMPS simulation has 4 atoms types and you want the
 1st 3 to be Cd, and the 4th to be Te, you would use the following
-pair\_coeff command:
+pair_coeff command:
 
+.. code-block:: LAMMPS
 
-.. parsed-literal::
-
-   pair_coeff \* \* CdTe Cd Cd Cd Te
+   pair_coeff * * CdTe Cd Cd Cd Te
 
 The 1st 2 arguments must be \* \* so as to span all LAMMPS atom types.
 The first three Cd arguments map LAMMPS atom types 1,2,3 to the Cd
@@ -148,18 +143,16 @@ element in the BOP file.  The final Te argument maps LAMMPS atom type
 
 BOP files in the *potentials* directory of the LAMMPS distribution
 have a ".bop" suffix.  The potentials are in tabulated form containing
-pre-tabulated pair functions for phi\_ij(r\_ij), beta\_(sigma,ij)(r\_ij),
-and beta\_pi,ij)(r\_ij).
+pre-tabulated pair functions for phi_ij(r_ij), beta_(sigma,ij)(r_ij),
+and beta_pi,ij)(r_ij).
 
 The parameters/coefficients format for the different kinds of BOP
 files are given below with variables matching the formulation of Ward
 (:ref:`Ward <Ward>`) and Zhou (:ref:`Zhou <Zhou1>`). Each header line containing a
 ":" is preceded by a blank line.
 
-
 ----------
 
-
 **No angular table file format**\ :
 
 The parameters/coefficients format for the BOP potentials input file
@@ -177,101 +170,92 @@ the tabulated functions are given.
 
 * Line 1: nr, nBOt (nr is the number of divisions the radius is broken
   into for function tables and MUST be a factor of 5; nBOt is the number
-  of divisions for the tabulated values of THETA\_(S,ij)
-* Line 2: delta\_1-delta\_7 (if all are not used in the particular
+  of divisions for the tabulated values of THETA_(S,ij)
+* Line 2: delta_1-delta_7 (if all are not used in the particular
 * formulation, set unused values to 0.0)
 
+Following this N lines for e_1-e_N containing p_pi.
 
-Following this N lines for e\_1-e\_N containing p\_pi.
-
-* Line 3: p\_pi (for e\_1)
-* Line 4: p\_pi (for e\_2 and continues to e\_N)
+* Line 3: p_pi (for e_1)
+* Line 4: p_pi (for e_2 and continues to e_N)
 
 The next section contains several pair constants for the number of
-interaction types e\_i-e\_j, with i=1->N, j=i->N
+interaction types e_i-e_j, with i=1->N, j=i->N
 
-* Line 1: r\_cut (for e\_1-e\_1 interactions)
-* Line 2: c\_sigma, a\_sigma, c\_pi, a\_pi
-* Line 3: delta\_sigma, delta\_pi
-* Line 4: f\_sigma, k\_sigma, delta\_3 (This delta\_3 is similar to that of
+* Line 1: r_cut (for e_1-e_1 interactions)
+* Line 2: c_sigma, a_sigma, c_pi, a_pi
+* Line 3: delta_sigma, delta_pi
+* Line 4: f_sigma, k_sigma, delta_3 (This delta_3 is similar to that of
   the previous section but is interaction type dependent)
 
-
 The next section contains a line for each three body interaction type
-e\_j-e\_i-e\_k with i=0->N, j=0->N, k=j->N
+e_j-e_i-e_k with i=0->N, j=0->N, k=j->N
 
-* Line 1: g\_(sigma0), g\_(sigma1), g\_(sigma2) (These are coefficients for
-  g\_(sigma,jik)(THETA\_ijk) for e\_1-e\_1-e\_1 interaction. :ref:`Ward <Ward>`
+* Line 1: g_(sigma0), g_(sigma1), g_(sigma2) (These are coefficients for
+  g_(sigma,jik)(THETA_ijk) for e_1-e_1-e_1 interaction. :ref:`Ward <Ward>`
   contains the full expressions for the constants as functions of
-  b\_(sigma,ijk), p\_(sigma,ijk), u\_(sigma,ijk))
-* Line 2: g\_(sigma0), g\_(sigma1), g\_(sigma2) (for e\_1-e\_1-e\_2)
-
+  b_(sigma,ijk), p_(sigma,ijk), u_(sigma,ijk))
+* Line 2: g_(sigma0), g_(sigma1), g_(sigma2) (for e_1-e_1-e_2)
 
 The next section contains a block for each interaction type for the
-phi\_ij(r\_ij).  Each block has nr entries with 5 entries per line.
+phi_ij(r_ij).  Each block has nr entries with 5 entries per line.
 
-* Line 1: phi(r1), phi(r2), phi(r3), phi(r4), phi(r5) (for the e\_1-e\_1
+* Line 1: phi(r1), phi(r2), phi(r3), phi(r4), phi(r5) (for the e_1-e_1
   interaction type)
 * Line 2: phi(r6), phi(r7), phi(r8), phi(r9), phi(r10) (this continues
   until nr)
 * ...
-* Line nr/5\_1: phi(r1), phi(r2), phi(r3), phi(r4), phi(r5), (for the
-  e\_1-e\_1 interaction type)
-
+* Line nr/5_1: phi(r1), phi(r2), phi(r3), phi(r4), phi(r5), (for the
+  e_1-e_1 interaction type)
 
 The next section contains a block for each interaction type for the
-beta\_(sigma,ij)(r\_ij).  Each block has nr entries with 5 entries per
+beta_(sigma,ij)(r_ij).  Each block has nr entries with 5 entries per
 line.
 
-* Line 1: beta\_sigma(r1), beta\_sigma(r2), beta\_sigma(r3), beta\_sigma(r4),
-  beta\_sigma(r5) (for the e\_1-e\_1 interaction type)
-* Line 2: beta\_sigma(r6), beta\_sigma(r7), beta\_sigma(r8), beta\_sigma(r9),
-  beta\_sigma(r10) (this continues until nr)
+* Line 1: beta_sigma(r1), beta_sigma(r2), beta_sigma(r3), beta_sigma(r4),
+  beta_sigma(r5) (for the e_1-e_1 interaction type)
+* Line 2: beta_sigma(r6), beta_sigma(r7), beta_sigma(r8), beta_sigma(r9),
+  beta_sigma(r10) (this continues until nr)
 * ...
-* Line nr/5+1: beta\_sigma(r1), beta\_sigma(r2), beta\_sigma(r3),
-  beta\_sigma(r4), beta\_sigma(r5) (for the e\_1-e\_2 interaction type)
-
+* Line nr/5+1: beta_sigma(r1), beta_sigma(r2), beta_sigma(r3),
+  beta_sigma(r4), beta_sigma(r5) (for the e_1-e_2 interaction type)
 
 The next section contains a block for each interaction type for
-beta\_(pi,ij)(r\_ij).  Each block has nr entries with 5 entries per line.
+beta_(pi,ij)(r_ij).  Each block has nr entries with 5 entries per line.
 
-* Line 1: beta\_pi(r1), beta\_pi(r2), beta\_pi(r3), beta\_pi(r4), beta\_pi(r5)
-  (for the e\_1-e\_1 interaction type)
-* Line 2: beta\_pi(r6), beta\_pi(r7), beta\_pi(r8), beta\_pi(r9),
-  beta\_pi(r10) (this continues until nr)
+* Line 1: beta_pi(r1), beta_pi(r2), beta_pi(r3), beta_pi(r4), beta_pi(r5)
+  (for the e_1-e_1 interaction type)
+* Line 2: beta_pi(r6), beta_pi(r7), beta_pi(r8), beta_pi(r9),
+  beta_pi(r10) (this continues until nr)
 * ...
-* Line nr/5+1: beta\_pi(r1), beta\_pi(r2), beta\_pi(r3), beta\_pi(r4),
-  beta\_pi(r5) (for the e\_1-e\_2 interaction type)
-
+* Line nr/5+1: beta_pi(r1), beta_pi(r2), beta_pi(r3), beta_pi(r4),
+  beta_pi(r5) (for the e_1-e_2 interaction type)
 
 The next section contains a block for each interaction type for the
-THETA\_(S,ij)((THETA\_(sigma,ij))\^(1/2), f\_(sigma,ij)).  Each block has
+THETA_(S,ij)((THETA_(sigma,ij))\^(1/2), f_(sigma,ij)).  Each block has
 nBOt entries with 5 entries per line.
 
-* Line 1: THETA\_(S,ij)(r1), THETA\_(S,ij)(r2), THETA\_(S,ij)(r3),
-  THETA\_(S,ij)(r4), THETA\_(S,ij)(r5) (for the e\_1-e\_2 interaction type)
-* Line 2: THETA\_(S,ij)(r6), THETA\_(S,ij)(r7), THETA\_(S,ij)(r8),
-  THETA\_(S,ij)(r9), THETA\_(S,ij)(r10) (this continues until nBOt)
+* Line 1: THETA_(S,ij)(r1), THETA_(S,ij)(r2), THETA_(S,ij)(r3),
+  THETA_(S,ij)(r4), THETA_(S,ij)(r5) (for the e_1-e_2 interaction type)
+* Line 2: THETA_(S,ij)(r6), THETA_(S,ij)(r7), THETA_(S,ij)(r8),
+  THETA_(S,ij)(r9), THETA_(S,ij)(r10) (this continues until nBOt)
 * ...
-* Line nBOt/5+1: THETA\_(S,ij)(r1), THETA\_(S,ij)(r2), THETA\_(S,ij)(r3),
-  THETA\_(S,ij)(r4), THETA\_(S,ij)(r5) (for the e\_1-e\_2 interaction type)
+* Line nBOt/5+1: THETA_(S,ij)(r1), THETA_(S,ij)(r2), THETA_(S,ij)(r3),
+  THETA_(S,ij)(r4), THETA_(S,ij)(r5) (for the e_1-e_2 interaction type)
 
+The next section contains a block of N lines for e_1-e_N
 
-The next section contains a block of N lines for e\_1-e\_N
+* Line 1: delta\^mu (for e_1)
+* Line 2: delta\^mu (for e_2 and repeats to e_N)
 
-* Line 1: delta\^mu (for e\_1)
-* Line 2: delta\^mu (for e\_2 and repeats to e\_N)
-
-The last section contains more constants for e\_i-e\_j interactions with
+The last section contains more constants for e_i-e_j interactions with
 i=0->N, j=i->N
 
-* Line 1: (A\_ij)\^(mu\*nu) (for e1-e1)
-* Line 2: (A\_ij)\^(mu\*nu) (for e1-e2 and repeats as above)
-
+* Line 1: (A_ij)\^(mu\*nu) (for e1-e1)
+* Line 2: (A_ij)\^(mu\*nu) (for e1-e2 and repeats as above)
 
 ----------
 
-
 **Angular spline table file format**\ :
 
 The parameters/coefficients format for the BOP potentials input file
@@ -290,46 +274,41 @@ the tabulated functions are given.
 * Line 1: nr, ntheta, nBOt (nr is the number of divisions the radius is broken
   into for function tables and MUST be a factor of 5; ntheta is the power of the
   power of the spline used to fit the angular function; nBOt is the number
-  of divisions for the tabulated values of THETA\_(S,ij)
-* Line 2: delta\_1-delta\_7 (if all are not used in the particular
+  of divisions for the tabulated values of THETA_(S,ij)
+* Line 2: delta_1-delta_7 (if all are not used in the particular
 * formulation, set unused values to 0.0)
 
+Following this N lines for e_1-e_N containing p_pi.
 
-Following this N lines for e\_1-e\_N containing p\_pi.
-
-* Line 3: p\_pi (for e\_1)
-* Line 4: p\_pi (for e\_2 and continues to e\_N)
+* Line 3: p_pi (for e_1)
+* Line 4: p_pi (for e_2 and continues to e_N)
 
 The next section contains several pair constants for the number of
-interaction types e\_i-e\_j, with i=1->N, j=i->N
+interaction types e_i-e_j, with i=1->N, j=i->N
 
-* Line 1: r\_cut (for e\_1-e\_1 interactions)
-* Line 2: c\_sigma, a\_sigma, c\_pi, a\_pi
-* Line 3: delta\_sigma, delta\_pi
-* Line 4: f\_sigma, k\_sigma, delta\_3 (This delta\_3 is similar to that of
+* Line 1: r_cut (for e_1-e_1 interactions)
+* Line 2: c_sigma, a_sigma, c_pi, a_pi
+* Line 3: delta_sigma, delta_pi
+* Line 4: f_sigma, k_sigma, delta_3 (This delta_3 is similar to that of
   the previous section but is interaction type dependent)
 
-
 The next section contains a line for each three body interaction type
-e\_j-e\_i-e\_k with i=0->N, j=0->N, k=j->N
+e_j-e_i-e_k with i=0->N, j=0->N, k=j->N
 
 * Line 1: g0, g1, g2... (These are coefficients for the angular spline
-  of the g\_(sigma,jik)(THETA\_ijk) for e\_1-e\_1-e\_1 interaction.  The
+  of the g_(sigma,jik)(THETA_ijk) for e_1-e_1-e_1 interaction.  The
   function can contain up to 10 term thus 10 constants.  The first line
   can contain up to five constants.  If the spline has more than five
   terms the second line will contain the remaining constants The
   following lines will then contain the constants for the remaining g0,
-  g1, g2... (for e\_1-e\_1-e\_2) and the other three body
+  g1, g2... (for e_1-e_1-e_2) and the other three body
   interactions
 
-
 The rest of the table has the same structure as the previous section
 (see above).
 
-
 ----------
 
-
 **Angular no-spline table file format**\ :
 
 The parameters/coefficients format for the BOP potentials input file
@@ -348,65 +327,57 @@ the tabulated functions are given.
 * Line 1: nr, ntheta, nBOt (nr is the number of divisions the radius is broken
   into for function tables and MUST be a factor of 5; ntheta is the number of
   divisions for the tabulated values of the g angular function; nBOt is the number
-  of divisions for the tabulated values of THETA\_(S,ij)
-* Line 2: delta\_1-delta\_7 (if all are not used in the particular
+  of divisions for the tabulated values of THETA_(S,ij)
+* Line 2: delta_1-delta_7 (if all are not used in the particular
 * formulation, set unused values to 0.0)
 
+Following this N lines for e_1-e_N containing p_pi.
 
-Following this N lines for e\_1-e\_N containing p\_pi.
-
-* Line 3: p\_pi (for e\_1)
-* Line 4: p\_pi (for e\_2 and continues to e\_N)
+* Line 3: p_pi (for e_1)
+* Line 4: p_pi (for e_2 and continues to e_N)
 
 The next section contains several pair constants for the number of
-interaction types e\_i-e\_j, with i=1->N, j=i->N
+interaction types e_i-e_j, with i=1->N, j=i->N
 
-* Line 1: r\_cut (for e\_1-e\_1 interactions)
-* Line 2: c\_sigma, a\_sigma, c\_pi, a\_pi
-* Line 3: delta\_sigma, delta\_pi
-* Line 4: f\_sigma, k\_sigma, delta\_3 (This delta\_3 is similar to that of
+* Line 1: r_cut (for e_1-e_1 interactions)
+* Line 2: c_sigma, a_sigma, c_pi, a_pi
+* Line 3: delta_sigma, delta_pi
+* Line 4: f_sigma, k_sigma, delta_3 (This delta_3 is similar to that of
   the previous section but is interaction type dependent)
 
-
 The next section contains a line for each three body interaction type
-e\_j-e\_i-e\_k with i=0->N, j=0->N, k=j->N
+e_j-e_i-e_k with i=0->N, j=0->N, k=j->N
 
-* Line 1: g(theta1), g(theta2), g(theta3), g(theta4), g(theta5) (for the e\_1-e\_1-e\_1
+* Line 1: g(theta1), g(theta2), g(theta3), g(theta4), g(theta5) (for the e_1-e_1-e_1
   interaction type)
 * Line 2: g(theta6), g(theta7), g(theta8), g(theta9), g(theta10) (this continues
   until ntheta)
 * ...
 * Line ntheta/5+1: g(theta1), g(theta2), g(theta3), g(theta4), g(theta5), (for the
-  e\_1-e\_1-e\_2 interaction type)
-
+  e_1-e_1-e_2 interaction type)
 
 The rest of the table has the same structure as the previous section (see above).
 
-
 ----------
 
-
 **Mixing, shift, table tail correction, restart**\ :
 
 This pair style does not support the :doc:`pair_modify <pair_modify>`
 mix, shift, table, and tail options.
 
 This pair style does not write its information to :doc:`binary restart files <restart>`, since it is stored in potential files.  Thus, you
-need to re-specify the pair\_style and pair\_coeff commands in an input
+need to re-specify the pair_style and pair_coeff commands in an input
 script that reads a restart file.
 
 This pair style can only be used via the *pair* keyword of the
 :doc:`run_style respa <run_style>` command.  It does not support the
 *inner*\ , *middle*\ , *outer* keywords.
 
-
 ----------
 
-
 Restrictions
 """"""""""""
 
-
 These pair styles are part of the MANYBODY package.  They are only
 enabled if LAMMPS was built with that package.  See the :doc:`Build package <Build_package>` doc page for more info.
 
@@ -427,54 +398,35 @@ Related commands
 Default
 """""""
 
-non-tabulated potential file, a\_0 is non-zero.
-
+non-tabulated potential file, a_0 is non-zero.
 
 ----------
 
+.. _Pettifor_1:
 
-.. _Pettifor\_1:
-
-
-
-**(Pettifor\_1)** D.G. Pettifor and I.I. Oleinik, Phys. Rev. B, 59, 8487
+**(Pettifor_1)** D.G. Pettifor and I.I. Oleinik, Phys. Rev. B, 59, 8487
 (1999).
 
-.. _Pettifor\_2:
+.. _Pettifor_2:
 
-
-
-**(Pettifor\_2)** D.G. Pettifor and I.I. Oleinik, Phys. Rev. Lett., 84,
+**(Pettifor_2)** D.G. Pettifor and I.I. Oleinik, Phys. Rev. Lett., 84,
 4124 (2000).
 
-.. _Pettifor\_3:
+.. _Pettifor_3:
 
-
-
-**(Pettifor\_3)** D.G. Pettifor and I.I. Oleinik, Phys. Rev. B, 65, 172103
+**(Pettifor_3)** D.G. Pettifor and I.I. Oleinik, Phys. Rev. B, 65, 172103
 (2002).
 
 .. _Murdick:
 
-
-
 **(Murdick)** D.A. Murdick, X.W. Zhou, H.N.G. Wadley, D. Nguyen-Manh, R.
 Drautz, and D.G. Pettifor, Phys. Rev. B, 73, 45206 (2006).
 
 .. _Ward:
 
-
-
 **(Ward)** D.K. Ward, X.W. Zhou, B.M. Wong, F.P. Doty, and J.A.
 Zimmerman, Phys. Rev. B, 85,115206 (2012).
 
 .. _Zhou1:
 
-
-
 **(Zhou)** X.W. Zhou, D.K. Ward, M. Foster (TBP).
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/pair_born.rst b/doc/src/pair_born.rst
index 7aeed58d48..2fa5785132 100644
--- a/doc/src/pair_born.rst
+++ b/doc/src/pair_born.rst
@@ -1,53 +1,51 @@
-.. index:: pair\_style born
+.. index:: pair_style born
 
-pair\_style born command
-========================
+pair_style born command
+=======================
 
-pair\_style born/omp command
-============================
+pair_style born/omp command
+===========================
 
-pair\_style born/gpu command
-============================
+pair_style born/gpu command
+===========================
 
-pair\_style born/coul/long command
-==================================
-
-pair\_style born/coul/long/gpu command
-======================================
-
-pair\_style born/coul/long/omp command
-======================================
-
-pair\_style born/coul/msm command
+pair_style born/coul/long command
 =================================
 
-pair\_style born/coul/msm/omp command
+pair_style born/coul/long/gpu command
 =====================================
 
-pair\_style born/coul/wolf command
-==================================
+pair_style born/coul/long/omp command
+=====================================
 
-pair\_style born/coul/wolf/gpu command
-======================================
+pair_style born/coul/msm command
+================================
 
-pair\_style born/coul/wolf/omp command
-======================================
+pair_style born/coul/msm/omp command
+====================================
 
-pair\_style born/coul/dsf command
+pair_style born/coul/wolf command
 =================================
 
+pair_style born/coul/wolf/gpu command
+=====================================
+
+pair_style born/coul/wolf/omp command
+=====================================
+
+pair_style born/coul/dsf command
+================================
+
 Syntax
 """"""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    pair_style style args
 
 * style = *born* or *born/coul/long* or *born/coul/msm* or *born/coul/wolf*
 * args = list of arguments for a particular style
 
-
 .. parsed-literal::
 
      *born* args = cutoff
@@ -70,30 +68,29 @@ Syntax
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    pair_style born 10.0
-   pair_coeff \* \* 6.08 0.317 2.340 24.18 11.51
+   pair_coeff * * 6.08 0.317 2.340 24.18 11.51
    pair_coeff 1 1 6.08 0.317 2.340 24.18 11.51
 
    pair_style born/coul/long 10.0
    pair_style born/coul/long 10.0 8.
-   pair_coeff \* \* 6.08 0.317 2.340 24.18 11.51
+   pair_coeff * * 6.08 0.317 2.340 24.18 11.51
    pair_coeff 1 1 6.08 0.317 2.340 24.18 11.51
 
    pair_style born/coul/msm 10.0
    pair_style born/coul/msm 10.0 8.0
-   pair_coeff \* \* 6.08 0.317 2.340 24.18 11.51
+   pair_coeff * * 6.08 0.317 2.340 24.18 11.51
    pair_coeff 1 1 6.08 0.317 2.340 24.18 11.51
 
    pair_style born/coul/wolf 0.25 10.0
    pair_style born/coul/wolf 0.25 10.0 9.0
-   pair_coeff \* \* 6.08 0.317 2.340 24.18 11.51
+   pair_coeff * * 6.08 0.317 2.340 24.18 11.51
    pair_coeff 1 1 6.08 0.317 2.340 24.18 11.51
 
    pair_style born/coul/dsf 0.1 10.0 12.0
-   pair_coeff \* \*   0.0 1.00 0.00 0.00 0.00
+   pair_coeff * *   0.0 1.00 0.00 0.00 0.00
    pair_coeff 1 1 480.0 0.25 0.00 1.05 0.50
 
 Description
@@ -102,11 +99,14 @@ Description
 The *born* style computes the Born-Mayer-Huggins or Tosi/Fumi
 potential described in :ref:`(Fumi and Tosi) <FumiTosi>`, given by
 
-.. image:: Eqs/pair_born.jpg
-   :align: center
+.. math::
 
-where sigma is an interaction-dependent length parameter, rho is an
-ionic-pair dependent length parameter, and Rc is the cutoff.
+   E = A \exp \left(\frac{\sigma - r}{\rho} \right) -
+   \frac{C}{r^6} + \frac{D}{r^8} \qquad r < r_c
+
+where :math:`\sigma` is an interaction-dependent length parameter,
+:math:`\rho` is an ionic-pair dependent length parameter, and
+:math:`r_c` is the cutoff.
 
 The styles with *coul/long* or *coul/msm* add a Coulombic term as
 described for the :doc:`lj/cut <pair_lj>` pair styles.  An additional
@@ -138,8 +138,8 @@ above, or in the data file or restart files read by the
 commands, or by mixing as described below:
 
 * A (energy units)
-* rho (distance units)
-* sigma (distance units)
+* :math:`\rho` (distance units)
+* :math:`\sigma` (distance units)
 * C (energy units \* distance units\^6)
 * D (energy units \* distance units\^8)
 * cutoff (distance units)
@@ -147,17 +147,15 @@ commands, or by mixing as described below:
 The second coefficient, rho, must be greater than zero.
 
 The last coefficient is optional.  If not specified, the global A,C,D
-cutoff specified in the pair\_style command is used.
+cutoff specified in the pair_style command is used.
 
 For *born/coul/long*\ , *born/coul/wolf* and *born/coul/dsf* no
 Coulombic cutoff can be specified for an individual I,J type pair.
 All type pairs use the same global Coulombic cutoff specified in the
-pair\_style command.
-
+pair_style command.
 
 ----------
 
-
 Styles with a *gpu*\ , *intel*\ , *kk*\ , *omp*\ , or *opt* suffix are
 functionally the same as the corresponding style without the suffix.
 They have been optimized to run faster, depending on your available
@@ -176,10 +174,8 @@ by including their suffix, or you can use the :doc:`-suffix command-line switch
 See the :doc:`Speed packages <Speed_packages>` doc page for more
 instructions on how to use the accelerated styles effectively.
 
-
 ----------
 
-
 **Mixing, shift, table, tail correction, restart, rRESPA info**\ :
 
 These pair styles do not support mixing.  Thus, coefficients for all
@@ -193,24 +189,21 @@ The *born/coul/long* pair style supports the
 :doc:`pair_modify <pair_modify>` table option to tabulate the
 short-range portion of the long-range Coulombic interaction.
 
-These styles support the pair\_modify tail option for adding long-range
+These styles support the pair_modify tail option for adding long-range
 tail corrections to energy and pressure.
 
 Thess styles writes thei information to binary :doc:`restart <restart>`
-files, so pair\_style and pair\_coeff commands do not need to be
+files, so pair_style and pair_coeff commands do not need to be
 specified in an input script that reads a restart file.
 
 These styles can only be used via the *pair* keyword of the :doc:`run_style respa <run_style>` command.  They do not support the *inner*\ ,
 *middle*\ , *outer* keywords.
 
-
 ----------
 
-
 Restrictions
 """"""""""""
 
-
 The *born/coul/long* style is part of the KSPACE package.  It is only
 enabled if LAMMPS was built with that package.  See the :doc:`Build package <Build_package>` doc page for more info.
 
@@ -221,18 +214,9 @@ Related commands
 
 **Default:** none
 
-
 ----------
 
-
 .. _FumiTosi:
 
-
-
 Fumi and Tosi, J Phys Chem Solids, 25, 31 (1964),
 Fumi and Tosi, J Phys Chem Solids, 25, 45 (1964).
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/pair_brownian.rst b/doc/src/pair_brownian.rst
index 4286818c74..12566a2993 100644
--- a/doc/src/pair_brownian.rst
+++ b/doc/src/pair_brownian.rst
@@ -1,22 +1,21 @@
-.. index:: pair\_style brownian
+.. index:: pair_style brownian
 
-pair\_style brownian command
-============================
+pair_style brownian command
+===========================
 
-pair\_style brownian/omp command
+pair_style brownian/omp command
 ================================
 
-pair\_style brownian/poly command
-=================================
+pair_style brownian/poly command
+================================
 
-pair\_style brownian/poly/omp command
-=====================================
+pair_style brownian/poly/omp command
+====================================
 
 Syntax
 """"""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    pair_style style mu flaglog flagfld cutinner cutoff t_target seed flagHI flagVF
 
@@ -26,7 +25,7 @@ Syntax
 * flagfld = 0/1 to include/exclude Fast Lubrication Dynamics effects
 * cutinner = inner cutoff distance (distance units)
 * cutoff = outer cutoff for interactions (distance units)
-* t\_target = target temp of the system (temperature units)
+* t_target = target temp of the system (temperature units)
 * seed = seed for the random number generator (positive integer)
 * flagHI (optional) = 0/1 to include/exclude 1/r hydrodynamic interactions
 * flagVF (optional) = 0/1 to include/exclude volume fraction corrections in the long-range isotropic terms
@@ -34,12 +33,11 @@ Syntax
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    pair_style brownian 1.5 1 1 2.01 2.5 2.0 5878567 (assuming radius = 1)
    pair_coeff 1 1 2.05 2.8
-   pair_coeff \* \*
+   pair_coeff * *
 
 Description
 """""""""""
@@ -55,17 +53,15 @@ when dissipative lubrication forces are acting.  Thus the parameters
 specified consistent with the settings in the lubrication pair styles.
 For details, refer to either of the lubrication pair styles.
 
-The *t\_target* setting is used to specify the target temperature of
+The *t_target* setting is used to specify the target temperature of
 the system.  The random number *seed* is used to generate random
 numbers for the thermostatting procedure.
 
 The *flagHI* and *flagVF* settings are optional.  Neither should be
 used, or both must be defined.
 
-
 ----------
 
-
 The following coefficients must be defined for each pair of atoms
 types via the :doc:`pair_coeff <pair_coeff>` command as in the examples
 above, or in the data file or restart files read by the
@@ -76,13 +72,11 @@ commands, or by mixing as described below:
 * cutoff (distance units)
 
 The two coefficients are optional.  If neither is specified, the two
-cutoffs specified in the pair\_style command are used.  Otherwise both
+cutoffs specified in the pair_style command are used.  Otherwise both
 must be specified.
 
-
 ----------
 
-
 Styles with a *gpu*\ , *intel*\ , *kk*\ , *omp*\ , or *opt* suffix are
 functionally the same as the corresponding style without the suffix.
 They have been optimized to run faster, depending on your available
@@ -101,15 +95,13 @@ by including their suffix, or you can use the :doc:`-suffix command-line switch
 See :doc:`this section <Speed>` of the manual for more
 instructions on how to use the accelerated styles effectively.
 
-
 ----------
 
-
 **Mixing, shift, table, tail correction, restart, rRESPA info**\ :
 
 For atom type pairs I,J and I != J, the two cutoff distances for this
 pair style can be mixed.  The default mix value is *geometric*\ .  See
-the "pair\_modify" command for details.
+the "pair_modify" command for details.
 
 This pair style does not support the :doc:`pair_modify <pair_modify>`
 shift option for the energy of the pair interaction.
@@ -121,28 +113,25 @@ This pair style does not support the :doc:`pair_modify <pair_modify>`
 tail option for adding long-range tail corrections to energy and
 pressure.
 
-This pair style writes its information to :doc:`binary restart files <restart>`, so pair\_style and pair\_coeff commands do not need
+This pair style writes its information to :doc:`binary restart files <restart>`, so pair_style and pair_coeff commands do not need
 to be specified in an input script that reads a restart file.
 
 This pair style can only be used via the *pair* keyword of the
 :doc:`run_style respa <run_style>` command.  It does not support the
 *inner*\ , *middle*\ , *outer* keywords.
 
-
 ----------
 
-
 Restrictions
 """"""""""""
 
-
 These styles are part of the COLLOID package.  They are only enabled
 if LAMMPS was built with that package.  See the :doc:`Build package <Build_package>` doc page for more info.
 
-Only spherical monodisperse particles are allowed for pair\_style
+Only spherical monodisperse particles are allowed for pair_style
 brownian.
 
-Only spherical particles are allowed for pair\_style brownian/poly.
+Only spherical particles are allowed for pair_style brownian/poly.
 
 Related commands
 """"""""""""""""
@@ -154,8 +143,3 @@ Default
 
 The default settings for the optional args are flagHI = 1 and flagVF =
 1.
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/pair_buck.rst b/doc/src/pair_buck.rst
index c3b5458ba1..c0eb0ee282 100644
--- a/doc/src/pair_buck.rst
+++ b/doc/src/pair_buck.rst
@@ -1,68 +1,66 @@
-.. index:: pair\_style buck
+.. index:: pair_style buck
 
-pair\_style buck command
+pair_style buck command
 ========================
 
-pair\_style buck/gpu command
+pair_style buck/gpu command
 ============================
 
-pair\_style buck/intel command
+pair_style buck/intel command
 ==============================
 
-pair\_style buck/kk command
+pair_style buck/kk command
 ===========================
 
-pair\_style buck/omp command
+pair_style buck/omp command
 ============================
 
-pair\_style buck/coul/cut command
+pair_style buck/coul/cut command
 =================================
 
-pair\_style buck/coul/cut/gpu command
+pair_style buck/coul/cut/gpu command
 =====================================
 
-pair\_style buck/coul/cut/intel command
+pair_style buck/coul/cut/intel command
 =======================================
 
-pair\_style buck/coul/cut/kk command
+pair_style buck/coul/cut/kk command
 ====================================
 
-pair\_style buck/coul/cut/omp command
+pair_style buck/coul/cut/omp command
 =====================================
 
-pair\_style buck/coul/long command
+pair_style buck/coul/long command
 ==================================
 
-pair\_style buck/coul/long/gpu command
+pair_style buck/coul/long/gpu command
 ======================================
 
-pair\_style buck/coul/long/intel command
+pair_style buck/coul/long/intel command
 ========================================
 
-pair\_style buck/coul/long/kk command
+pair_style buck/coul/long/kk command
 =====================================
 
-pair\_style buck/coul/long/omp command
+pair_style buck/coul/long/omp command
 ======================================
 
-pair\_style buck/coul/msm command
+pair_style buck/coul/msm command
 =================================
 
-pair\_style buck/coul/msm/omp command
+pair_style buck/coul/msm/omp command
 =====================================
 
 Syntax
 """"""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    pair_style style args
 
 * style = *buck* or *buck/coul/cut* or *buck/coul/long* or *buck/coul/msm*
 * args = list of arguments for a particular style
 
-
 .. parsed-literal::
 
      *buck* args = cutoff
@@ -80,27 +78,26 @@ Syntax
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    pair_style buck 2.5
-   pair_coeff \* \* 100.0 1.5 200.0
-   pair_coeff \* \* 100.0 1.5 200.0 3.0
+   pair_coeff * * 100.0 1.5 200.0
+   pair_coeff * * 100.0 1.5 200.0 3.0
 
    pair_style buck/coul/cut 10.0
    pair_style buck/coul/cut 10.0 8.0
-   pair_coeff \* \* 100.0 1.5 200.0
+   pair_coeff * * 100.0 1.5 200.0
    pair_coeff 1 1 100.0 1.5 200.0 9.0
    pair_coeff 1 1 100.0 1.5 200.0 9.0 8.0
 
    pair_style buck/coul/long 10.0
    pair_style buck/coul/long 10.0 8.0
-   pair_coeff \* \* 100.0 1.5 200.0
+   pair_coeff * * 100.0 1.5 200.0
    pair_coeff 1 1 100.0 1.5 200.0 9.0
 
    pair_style buck/coul/msm 10.0
    pair_style buck/coul/msm 10.0 8.0
-   pair_coeff \* \* 100.0 1.5 200.0
+   pair_coeff * * 100.0 1.5 200.0
    pair_coeff 1 1 100.0 1.5 200.0 9.0
 
 Description
@@ -109,11 +106,12 @@ Description
 The *buck* style computes a Buckingham potential (exp/6 instead of
 Lennard-Jones 12/6) given by
 
-.. image:: Eqs/pair_buck.jpg
-   :align: center
+.. math::
 
-where rho is an ionic-pair dependent length parameter, and Rc is the
-cutoff on both terms.
+   E = A e^{-r / \rho} - \frac{C}{r^6} \qquad r < r_c
+
+where :math:`\rho` is an ionic-pair dependent length parameter, and
+:math:`r_c` is the cutoff on both terms.
 
 The styles with *coul/cut* or *coul/long* or *coul/msm* add a
 Coulombic term as described for the :doc:`lj/cut <pair_lj>` pair styles.
@@ -147,14 +145,14 @@ above, or in the data file or restart files read by the
 commands:
 
 * A (energy units)
-* rho (distance units)
+* :math:`\rho` (distance units)
 * C (energy-distance\^6 units)
 * cutoff (distance units)
 * cutoff2 (distance units)
 
-The second coefficient, rho, must be greater than zero.
-The coefficients A, rho, and C can be written as analytical expressions
-of epsilon and sigma, in analogy to the Lennard-Jones potential
+The second coefficient, :math:`\rho`, must be greater than zero.
+The coefficients A,:math:`\rho`, and C can be written as analytical expressions
+of :math:`\epsilon` and :math:`\sigma`, in analogy to the Lennard-Jones potential
 :ref:`(Khrapak) <Khrapak>`.
 
 The latter 2 coefficients are optional.  If not specified, the global
@@ -166,12 +164,10 @@ the A,C and Coulombic cutoffs for this type pair.  You cannot specify
 For *buck/coul/long* only the LJ cutoff can be specified since a
 Coulombic cutoff cannot be specified for an individual I,J type pair.
 All type pairs use the same global Coulombic cutoff specified in the
-pair\_style command.
-
+pair_style command.
 
 ----------
 
-
 Styles with a *gpu*\ , *intel*\ , *kk*\ , *omp*\ , or *opt* suffix are
 functionally the same as the corresponding style without the suffix.
 They have been optimized to run faster, depending on your available
@@ -190,10 +186,8 @@ by including their suffix, or you can use the :doc:`-suffix command-line switch
 See the :doc:`Speed packages <Speed_packages>` doc page for more
 instructions on how to use the accelerated styles effectively.
 
-
 ----------
 
-
 **Mixing, shift, table, tail correction, restart, rRESPA info**\ :
 
 These pair styles do not support mixing.  Thus, coefficients for all
@@ -206,11 +200,11 @@ The *buck/coul/long* pair style supports the
 :doc:`pair_modify <pair_modify>` table option to tabulate the
 short-range portion of the long-range Coulombic interaction.
 
-These styles support the pair\_modify tail option for adding long-range
+These styles support the pair_modify tail option for adding long-range
 tail corrections to energy and pressure for the A,C terms in the
 pair interaction.
 
-These styles write their information to :doc:`binary restart files <restart>`, so pair\_style and pair\_coeff commands do not need
+These styles write their information to :doc:`binary restart files <restart>`, so pair_style and pair_coeff commands do not need
 to be specified in an input script that reads a restart file.
 
 These styles can only be used via the *pair* keyword of the :doc:`run_style respa <run_style>` command.  They do not support the *inner*\ ,
@@ -219,7 +213,6 @@ These styles can only be used via the *pair* keyword of the :doc:`run_style resp
 Restrictions
 """"""""""""
 
-
 The *buck/coul/long* style is part of the KSPACE package.  They are
 only enabled if LAMMPS was built with that package.  See the :doc:`Build package <Build_package>` doc page for more info.
 
@@ -232,11 +225,4 @@ Related commands
 
 .. _Khrapak:
 
-
-
 **(Khrapak)** Khrapak, Chaudhuri, and Morfill, J Chem Phys, 134, 054120 (2011).
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/pair_buck6d_coul_gauss.rst b/doc/src/pair_buck6d_coul_gauss.rst
index 3bf9fa53a2..f8c5a29a32 100644
--- a/doc/src/pair_buck6d_coul_gauss.rst
+++ b/doc/src/pair_buck6d_coul_gauss.rst
@@ -1,23 +1,21 @@
-.. index:: pair\_style buck6d/coul/gauss/dsf
+.. index:: pair_style buck6d/coul/gauss/dsf
 
-pair\_style buck6d/coul/gauss/dsf command
+pair_style buck6d/coul/gauss/dsf command
+========================================
+
+pair_style buck6d/coul/gauss/long command
 =========================================
 
-pair\_style buck6d/coul/gauss/long command
-==========================================
-
 Syntax
 """"""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    pair_style style args
 
 * style = *buck6d/coul/gauss/dsf* or *buck6d/coul/gauss/long*
 * args = list of arguments for a particular style
 
-
 .. parsed-literal::
 
      *buck6d/coul/gauss/dsf* args = smooth cutoff (cutoff2)
@@ -33,8 +31,7 @@ Syntax
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    pair_style buck6d/coul/gauss/dsf    0.9000    12.0000
    pair_coeff 1  1  1030.  3.061  457.179  4.521  0.608
@@ -50,12 +47,13 @@ interactions following the MOF-FF force field after
 :ref:`(Schmid) <Schmid>`. The vdW term of the *buck6d* styles
 computes a dispersion damped Buckingham potential:
 
-.. image:: Eqs/pair_buck6d.jpg
-   :align: center
+.. math::
 
-where A and C are a force constant, kappa is an ionic-pair dependent
+   E = A e^{-\kappa r} - \frac{C}{r^6} \cdot \frac{1}{1 + D r^{14}} \qquad r < r_c \\
+
+where A and C are a force constant, :math:`\kappa` is an ionic-pair dependent
 reciprocal length parameter, D is a dispersion correction parameter,
-and the cutoff Rc truncates the interaction distance.
+and the cutoff :math:`r_c` truncates the interaction distance.
 The first term in the potential corresponds to the Buckingham
 repulsion term and the second term to the dispersion attraction with
 a damping correction analog to the Grimme correction used in DFT.
@@ -78,14 +76,15 @@ distributions which effectively dampen electrostatic interactions
 for high charges at close distances.  The electrostatic potential
 is thus evaluated as:
 
-.. image:: Eqs/pair_coul_gauss.jpg
-   :align: center
+.. math::
 
-where C is an energy-conversion constant, Qi and Qj are the
-charges on the 2 atoms, epsilon is the dielectric constant which
-can be set by the :doc:`dielectric <dielectric>` command, alpha is
-ion pair dependent damping parameter and erf() is the error-function.
-The cutoff Rc truncates the interaction distance.
+   E = \frac{C_{q_i q_j}}{\epsilon r_{ij}}\,\, \textrm{erf}\left(\alpha_{ij} r_{ij}\right)\quad\quad\quad r < r_c
+
+where C is an energy-conversion constant, :math:`q_i` and :math:`q_j`
+are the charges on the 2 atoms, epsilon is the dielectric constant which
+can be set by the :doc:`dielectric <dielectric>` command, :math:`\alpha`
+is the ion pair dependent damping parameter and erf() is the
+error-function.  The cutoff :math:`r_c` truncates the interaction distance.
 
 The style *buck6d/coul/gauss/dsf* computes the Coulomb interaction
 via the damped shifted force model described in :ref:`(Fennell) <Fennell>`
@@ -107,20 +106,18 @@ above, or in the data file or restart files read by the
 commands:
 
 * A (energy units)
-* rho (distance\^-1 units)
+* :math:`\rho` (distance\^-1 units)
 * C (energy-distance\^6 units)
 * D (distance\^14 units)
-* alpha (distance\^-1 units)
+* :math:`\alpha` (distance\^-1 units)
 * cutoff (distance units)
 
-The second coefficient, rho, must be greater than zero. The latter
-coefficient is optional.  If not specified, the global vdW cutoff
+The second coefficient, :math:`\rho`, must be greater than zero. The
+latter coefficient is optional.  If not specified, the global vdW cutoff
 is used.
 
-
 ----------
 
-
 **Mixing, shift, table, tail correction, restart, rRESPA info**\ :
 
 These pair styles do not support mixing.  Thus, coefficients for all
@@ -130,13 +127,12 @@ These styles do not support the :doc:`pair_modify <pair_modify>` shift
 option for the energy. Instead the smoothing function should be applied
 by setting the global smoothing parameter to a value < 1.0.
 
-These styles write their information to :doc:`binary restart files <restart>`, so pair\_style and pair\_coeff commands do not need
+These styles write their information to :doc:`binary restart files <restart>`, so pair_style and pair_coeff commands do not need
 to be specified in an input script that reads a restart file.
 
 Restrictions
 """"""""""""
 
-
 These styles are part of the USER-MOFFF package.  They are only
 enabled if LAMMPS was built with that package.  See the :doc:`Build package <Build_package>` doc page for more info.
 
@@ -149,16 +145,8 @@ Related commands
 
 .. _Schmid:
 
-
-
 .. _Fennell:
 
 **(Schmid)** S. Bureekaew, S. Amirjalayer, M. Tafipolsky, C. Spickermann, T.K. Roy and R. Schmid, Phys. Status Solidi B, 6, 1128 (2013).
 
-
 **(Fennell)** C. J. Fennell, J. D. Gezelter, J Chem Phys, 124, 234104 (2006).
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/pair_buck_long.rst b/doc/src/pair_buck_long.rst
index 332f15b4f9..6f1e2d83ef 100644
--- a/doc/src/pair_buck_long.rst
+++ b/doc/src/pair_buck_long.rst
@@ -1,47 +1,44 @@
-.. index:: pair\_style buck/long/coul/long
+.. index:: pair_style buck/long/coul/long
 
-pair\_style buck/long/coul/long command
+pair_style buck/long/coul/long command
 =======================================
 
-pair\_style buck/long/coul/long/omp command
+pair_style buck/long/coul/long/omp command
 ===========================================
 
 Syntax
 """"""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    pair_style buck/long/coul/long flag_buck flag_coul cutoff (cutoff2)
 
-* flag\_buck = *long* or *cut*
-  
+* flag_buck = *long* or *cut*
+
   .. parsed-literal::
-  
+
        *long* = use Kspace long-range summation for the dispersion term 1/r\^6
        *cut* = use a cutoff
 
-* flag\_coul = *long* or *off*
-  
+* flag_coul = *long* or *off*
+
   .. parsed-literal::
-  
+
        *long* = use Kspace long-range summation for the Coulombic term 1/r
        *off* = omit the Coulombic term
 
 * cutoff = global cutoff for Buckingham (and Coulombic if only 1 cutoff) (distance units)
 * cutoff2 = global cutoff for Coulombic (optional) (distance units)
 
-
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    pair_style buck/long/coul/long cut off 2.5
    pair_style buck/long/coul/long cut long 2.5 4.0
    pair_style buck/long/coul/long long long 4.0
-   pair_coeff \* \* 1 1
+   pair_coeff * * 1 1
    pair_coeff 1 1 1 3 4
 
 Description
@@ -50,40 +47,39 @@ Description
 The *buck/long/coul/long* style computes a Buckingham potential (exp/6
 instead of Lennard-Jones 12/6) and Coulombic potential, given by
 
-.. image:: Eqs/pair_buck.jpg
-   :align: center
+.. math::
 
-.. image:: Eqs/pair_coulomb.jpg
-   :align: center
+   E = & A e^{-r / \rho} - \frac{C}{r^6} \qquad r < r_c \\
+   E = & \frac{C q_i q_j}{\epsilon  r} \qquad r < r_c
 
-Rc is the cutoff.  If one cutoff is specified in the pair\_style
+:math:`r_c` is the cutoff.  If one cutoff is specified in the pair_style
 command, it is used for both the Buckingham and Coulombic terms.  If
 two cutoffs are specified, they are used as cutoffs for the Buckingham
 and Coulombic terms respectively.
 
 The purpose of this pair style is to capture long-range interactions
 resulting from both attractive 1/r\^6 Buckingham and Coulombic 1/r
-interactions.  This is done by use of the *flag\_buck* and *flag\_coul*
+interactions.  This is done by use of the *flag_buck* and *flag_coul*
 settings.  The :ref:`Ismail <Ismail>` paper has more details on when it is
 appropriate to include long-range 1/r\^6 interactions, using this
 potential.
 
-If *flag\_buck* is set to *long*\ , no cutoff is used on the Buckingham
+If *flag_buck* is set to *long*\ , no cutoff is used on the Buckingham
 1/r\^6 dispersion term.  The long-range portion can be calculated by
 using the :doc:`kspace_style ewald/disp or pppm/disp <kspace_style>`
 commands.  The specified Buckingham cutoff then determines which
 portion of the Buckingham interactions are computed directly by the
 pair potential versus which part is computed in reciprocal space via
-the Kspace style.  If *flag\_buck* is set to *cut*\ , the Buckingham
+the Kspace style.  If *flag_buck* is set to *cut*\ , the Buckingham
 interactions are simply cutoff, as with :doc:`pair_style buck <pair_buck>`.
 
-If *flag\_coul* is set to *long*\ , no cutoff is used on the Coulombic
+If *flag_coul* is set to *long*\ , no cutoff is used on the Coulombic
 interactions.  The long-range portion can calculated by using any of
 several :doc:`kspace_style <kspace_style>` command options such as
-*pppm* or *ewald*\ .  Note that if *flag\_buck* is also set to long, then
+*pppm* or *ewald*\ .  Note that if *flag_buck* is also set to long, then
 the *ewald/disp* or *pppm/disp* Kspace style needs to be used to
 perform the long-range calculations for both the Buckingham and
-Coulombic interactions.  If *flag\_coul* is set to *off*\ , Coulombic
+Coulombic interactions.  If *flag_coul* is set to *off*\ , Coulombic
 interactions are not computed.
 
 The following coefficients must be defined for each pair of atoms
@@ -101,21 +97,19 @@ commands:
 The second coefficient, rho, must be greater than zero.
 
 The latter 2 coefficients are optional.  If not specified, the global
-Buckingham and Coulombic cutoffs specified in the pair\_style command
+Buckingham and Coulombic cutoffs specified in the pair_style command
 are used.  If only one cutoff is specified, it is used as the cutoff
 for both Buckingham and Coulombic interactions for this type pair.  If
 both coefficients are specified, they are used as the Buckingham and
 Coulombic cutoffs for this type pair.  Note that if you are using
-*flag\_buck* set to *long*\ , you cannot specify a Buckingham cutoff for
+*flag_buck* set to *long*\ , you cannot specify a Buckingham cutoff for
 an atom type pair, since only one global Buckingham cutoff is allowed.
-Similarly, if you are using *flag\_coul* set to *long*\ , you cannot
+Similarly, if you are using *flag_coul* set to *long*\ , you cannot
 specify a Coulombic cutoff for an atom type pair, since only one
 global Coulombic cutoff is allowed.
 
-
 ----------
 
-
 Styles with a *gpu*\ , *intel*\ , *kk*\ , *omp*\ , or *opt* suffix are
 functionally the same as the corresponding style without the suffix.
 They have been optimized to run faster, depending on your available
@@ -134,10 +128,8 @@ by including their suffix, or you can use the :doc:`-suffix command-line switch
 See the :doc:`Speed packages <Speed_packages>` doc page for more
 instructions on how to use the accelerated styles effectively.
 
-
 ----------
 
-
 **Mixing, shift, table, tail correction, restart, rRESPA info**\ :
 
 This pair styles does not support mixing.  Thus, coefficients for all
@@ -145,7 +137,7 @@ I,J pairs must be specified explicitly.
 
 This pair style supports the :doc:`pair_modify <pair_modify>` shift
 option for the energy of the exp() and 1/r\^6 portion of the pair
-interaction, assuming *flag\_buck* is *cut*\ .
+interaction, assuming *flag_buck* is *cut*\ .
 
 This pair style does not support the :doc:`pair_modify <pair_modify>`
 shift option for the energy of the Buckingham portion of the pair
@@ -155,7 +147,7 @@ This pair style supports the :doc:`pair_modify <pair_modify>` table and
 table/disp options since they can tabulate the short-range portion of
 the long-range Coulombic and dispersion interactions.
 
-This pair style write its information to :doc:`binary restart files <restart>`, so pair\_style and pair\_coeff commands do not need
+This pair style write its information to :doc:`binary restart files <restart>`, so pair_style and pair_coeff commands do not need
 to be specified in an input script that reads a restart file.
 
 This pair style supports the use of the *inner*\ , *middle*\ , and *outer*
@@ -164,14 +156,11 @@ pairwise forces can be partitioned by distance at different levels of
 the rRESPA hierarchy.  See the :doc:`run_style <run_style>` command for
 details.
 
-
 ----------
 
-
 Restrictions
 """"""""""""
 
-
 This style is part of the KSPACE package.  It is only enabled if
 LAMMPS was built with that package.  See the :doc:`Build package <Build_package>` doc page for more info.
 
@@ -182,18 +171,9 @@ Related commands
 
 **Default:** none
 
-
 ----------
 
-
 .. _Ismail:
 
-
-
 **(Ismail)** Ismail, Tsige, In 't Veld, Grest, Molecular Physics
 (accepted) (2007).
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/pair_charmm.rst b/doc/src/pair_charmm.rst
index 16a9a80223..031e6e6717 100644
--- a/doc/src/pair_charmm.rst
+++ b/doc/src/pair_charmm.rst
@@ -1,68 +1,66 @@
-.. index:: pair\_style lj/charmm/coul/charmm
+.. index:: pair_style lj/charmm/coul/charmm
 
-pair\_style lj/charmm/coul/charmm command
+pair_style lj/charmm/coul/charmm command
 =========================================
 
-pair\_style lj/charmm/coul/charmm/intel command
+pair_style lj/charmm/coul/charmm/intel command
 ===============================================
 
-pair\_style lj/charmm/coul/charmm/kk command
+pair_style lj/charmm/coul/charmm/kk command
 ============================================
 
-pair\_style lj/charmm/coul/charmm/omp command
+pair_style lj/charmm/coul/charmm/omp command
 =============================================
 
-pair\_style lj/charmm/coul/charmm/implicit command
+pair_style lj/charmm/coul/charmm/implicit command
 ==================================================
 
-pair\_style lj/charmm/coul/charmm/implicit/kk command
+pair_style lj/charmm/coul/charmm/implicit/kk command
 =====================================================
 
-pair\_style lj/charmm/coul/charmm/implicit/omp command
+pair_style lj/charmm/coul/charmm/implicit/omp command
 ======================================================
 
-pair\_style lj/charmm/coul/long command
+pair_style lj/charmm/coul/long command
 =======================================
 
-pair\_style lj/charmm/coul/long/gpu command
+pair_style lj/charmm/coul/long/gpu command
 ===========================================
 
-pair\_style lj/charmm/coul/long/intel command
+pair_style lj/charmm/coul/long/intel command
 =============================================
 
-pair\_style lj/charmm/coul/long/kk command
+pair_style lj/charmm/coul/long/kk command
 ==========================================
 
-pair\_style lj/charmm/coul/long/opt command
+pair_style lj/charmm/coul/long/opt command
 ===========================================
 
-pair\_style lj/charmm/coul/long/omp command
+pair_style lj/charmm/coul/long/omp command
 ===========================================
 
-pair\_style lj/charmm/coul/msm command
+pair_style lj/charmm/coul/msm command
 ======================================
 
-pair\_style lj/charmm/coul/msm/omp command
+pair_style lj/charmm/coul/msm/omp command
 ==========================================
 
-pair\_style lj/charmmfsw/coul/charmmfsh command
+pair_style lj/charmmfsw/coul/charmmfsh command
 ===============================================
 
-pair\_style lj/charmmfsw/coul/long command
+pair_style lj/charmmfsw/coul/long command
 ==========================================
 
 Syntax
 """"""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    pair_style style args
 
 * style = *lj/charmm/coul/charmm* or *lj/charmm/coul/charmm/implicit* or *lj/charmm/coul/long* or *lj/charmm/coul/msm* or *lj/charmmfsw/coul/charmmfsh* or *lj/charmmfsw/coul/long*
 * args = list of arguments for a particular style
 
-
 .. parsed-literal::
 
      *lj/charmm/coul/charmm* args = inner outer (inner2) (outer2)
@@ -87,31 +85,30 @@ Syntax
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    pair_style lj/charmm/coul/charmm 8.0 10.0
    pair_style lj/charmm/coul/charmm 8.0 10.0 7.0 9.0
    pair_style lj/charmmfsw/coul/charmmfsh 10.0 12.0
    pair_style lj/charmmfsw/coul/charmmfsh 10.0 12.0 9.0
-   pair_coeff \* \* 100.0 2.0
+   pair_coeff * * 100.0 2.0
    pair_coeff 1 1 100.0 2.0 150.0 3.5
 
    pair_style lj/charmm/coul/charmm/implicit 8.0 10.0
    pair_style lj/charmm/coul/charmm/implicit 8.0 10.0 7.0 9.0
-   pair_coeff \* \* 100.0 2.0
+   pair_coeff * * 100.0 2.0
    pair_coeff 1 1 100.0 2.0 150.0 3.5
 
    pair_style lj/charmm/coul/long 8.0 10.0
    pair_style lj/charmm/coul/long 8.0 10.0 9.0
    pair_style lj/charmmfsw/coul/long 8.0 10.0
    pair_style lj/charmmfsw/coul/long 8.0 10.0 9.0
-   pair_coeff \* \* 100.0 2.0
+   pair_coeff * * 100.0 2.0
    pair_coeff 1 1 100.0 2.0 150.0 3.5
 
    pair_style lj/charmm/coul/msm 8.0 10.0
    pair_style lj/charmm/coul/msm 8.0 10.0 9.0
-   pair_coeff \* \* 100.0 2.0
+   pair_coeff * * 100.0 2.0
    pair_coeff 1 1 100.0 2.0 150.0 3.5
 
 Description
@@ -160,8 +157,20 @@ artifacts.
    the CHARMM force field energies and forces, when using one of these
    two CHARMM pair styles.
 
-.. image:: Eqs/pair_charmm.jpg
-   :align: center
+.. math::
+
+   E = & LJ(r) \qquad \qquad \qquad r < r_{\rm in} \\
+     = & S(r) * LJ(r) \qquad \qquad r_{\rm in} < r < r_{\rm out} \\
+     = & 0 \qquad \qquad \qquad \qquad r > r_{\rm out} \\
+   E = & C(r) \qquad \qquad \qquad r < r_{\rm in} \\
+     = & S(r) * C(r) \qquad \qquad r_{\rm in} < r < r_{\rm out} \\
+     = & 0 \qquad \qquad \qquad \qquad r > r_{\rm out} \\
+   LJ(r) = & 4 \epsilon \left[ \left(\frac{\sigma}{r}\right)^{12} -
+           \left(\frac{\sigma}{r}\right)^6 \right] \\
+   C(r) = & \frac{C q_i q_j}{ \epsilon r} \\
+   S(r) = & \frac{ \left[r_{\rm out}^2 - r^2\right]^2
+     \left[r_{\rm out}^2 + 2r^2 - 3{r_{\rm in}^2}\right]}
+   { \left[r_{\rm out}^2 - {r_{\rm in}}^2\right]^3 }
 
 where S(r) is the energy switching function mentioned above for the
 *charmm* styles.  See the :ref:`(Steinbach) <Steinbach>` paper for the
@@ -171,7 +180,7 @@ used in the *charmmfsw* and *charmmfsh* styles.
 When using the *lj/charmm/coul/charmm styles*\ , both the LJ and
 Coulombic terms require an inner and outer cutoff. They can be the
 same for both formulas or different depending on whether 2 or 4
-arguments are used in the pair\_style command.  For the
+arguments are used in the pair_style command.  For the
 *lj/charmmfsw/coul/charmmfsh* style, the LJ term requires both an
 inner and outer cutoff, while the Coulombic term requires only one
 cutoff.  If the Coulombic cutoff is not specified (2 instead of 3
@@ -197,7 +206,7 @@ factor is applied to the Coulombic term, so it can be used in
 conjunction with the :doc:`kspace_style <kspace_style>` command and its
 *ewald* or *pppm* or *msm* option.  Only one Coulombic cutoff is
 specified for these styles; if only 2 arguments are used in the
-pair\_style command, then the outer LJ cutoff is used as the single
+pair_style command, then the outer LJ cutoff is used as the single
 Coulombic cutoff.  The Coulombic cutoff specified for these styles
 means that pairwise interactions within this distance are computed
 directly; interactions outside that distance are computed in
@@ -209,26 +218,23 @@ above, or in the data file or restart files read by the
 :doc:`read_data <read_data>` or :doc:`read_restart <read_restart>`
 commands, or by mixing as described below:
 
-* epsilon (energy units)
-* sigma (distance units)
-* epsilon\_14 (energy units)
-* sigma\_14 (distance units)
+* :math:`\epsilon` (energy units)
+* :math:`\sigma` (distance units)
+* :math:`\epsilon_{14}` (energy units)
+* :math:`\sigma_{14}` (distance units)
 
-Note that sigma is defined in the LJ formula as the zero-crossing
-distance for the potential, not as the energy minimum at 2\^(1/6)
-sigma.
+Note that :math:`\sigma` is defined in the LJ formula as the zero-crossing
+distance for the potential, not as the energy minimum at :math:`2^{1/6} \sigma`.
 
 The latter 2 coefficients are optional.  If they are specified, they
 are used in the LJ formula between 2 atoms of these types which are
 also first and fourth atoms in any dihedral.  No cutoffs are specified
 because the CHARMM force field does not allow varying cutoffs for
 individual atom pairs; all pairs use the global cutoff(s) specified in
-the pair\_style command.
-
+the pair_style command.
 
 ----------
 
-
 Styles with a *gpu*\ , *intel*\ , *kk*\ , *omp*\ , or *opt* suffix are
 functionally the same as the corresponding style without the suffix.
 They have been optimized to run faster, depending on your available
@@ -247,16 +253,14 @@ by including their suffix, or you can use the :doc:`-suffix command-line switch
 See the :doc:`Speed packages <Speed_packages>` doc page for more
 instructions on how to use the accelerated styles effectively.
 
-
 ----------
 
-
 **Mixing, shift, table, tail correction, restart, rRESPA info**\ :
 
-For atom type pairs I,J and I != J, the epsilon, sigma, epsilon\_14,
-and sigma\_14 coefficients for all of the lj/charmm pair styles can be
+For atom type pairs I,J and I != J, the epsilon, sigma, epsilon_14,
+and sigma_14 coefficients for all of the lj/charmm pair styles can be
 mixed.  The default mix value is *arithmetic* to coincide with the
-usual settings for the CHARMM force field.  See the "pair\_modify"
+usual settings for the CHARMM force field.  See the "pair_modify"
 command for details.
 
 None of the *lj/charmm* or *lj/charmmfsw* pair styles support the
@@ -274,8 +278,8 @@ corrections to energy and pressure, since the Lennard-Jones portion of
 the pair interaction is smoothed to 0.0 at the cutoff.
 
 All of the *lj/charmm* and *lj/charmmfsw* pair styles write their
-information to :doc:`binary restart files <restart>`, so pair\_style and
-pair\_coeff commands do not need to be specified in an input script
+information to :doc:`binary restart files <restart>`, so pair_style and
+pair_coeff commands do not need to be specified in an input script
 that reads a restart file.
 
 The *lj/charmm/coul/long* and *lj/charmmfsw/coul/long* pair styles
@@ -283,17 +287,14 @@ support the use of the *inner*\ , *middle*\ , and *outer* keywords of the
 :doc:`run_style respa <run_style>` command, meaning the pairwise forces
 can be partitioned by distance at different levels of the rRESPA
 hierarchy.  The other styles only support the *pair* keyword of
-run\_style respa.  See the :doc:`run_style <run_style>` command for
+run_style respa.  See the :doc:`run_style <run_style>` command for
 details.
 
-
 ----------
 
-
 Restrictions
 """"""""""""
 
-
 All the styles with *coul/charmm* or *coul/charmmfsh* styles are part
 of the MOLECULE package.  All the styles with *coul/long* style are
 part of the KSPACE package.  They are only enabled if LAMMPS was built
@@ -307,30 +308,17 @@ Related commands
 
 **Default:** none
 
-
 ----------
 
-
 .. _Brooks1:
 
-
-
 **(Brooks)** Brooks, et al, J Comput Chem, 30, 1545 (2009).
 
 .. _pair-MacKerell:
 
-
-
 **(MacKerell)** MacKerell, Bashford, Bellott, Dunbrack, Evanseck, Field,
 Fischer, Gao, Guo, Ha, et al, J Phys Chem, 102, 3586 (1998).
 
 .. _Steinbach:
 
-
-
 **(Steinbach)** Steinbach, Brooks, J Comput Chem, 15, 667 (1994).
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/pair_class2.rst b/doc/src/pair_class2.rst
index 01c442176f..8131799181 100644
--- a/doc/src/pair_class2.rst
+++ b/doc/src/pair_class2.rst
@@ -1,50 +1,48 @@
-.. index:: pair\_style lj/class2
+.. index:: pair_style lj/class2
 
-pair\_style lj/class2 command
-=============================
+pair_style lj/class2 command
+============================
 
-pair\_style lj/class2/gpu command
-=================================
-
-pair\_style lj/class2/kk command
+pair_style lj/class2/gpu command
 ================================
 
-pair\_style lj/class2/omp command
-=================================
+pair_style lj/class2/kk command
+===============================
 
-pair\_style lj/class2/coul/cut command
-======================================
+pair_style lj/class2/omp command
+================================
 
-pair\_style lj/class2/coul/cut/kk command
+pair_style lj/class2/coul/cut command
+=====================================
+
+pair_style lj/class2/coul/cut/kk command
+========================================
+
+pair_style lj/class2/coul/cut/omp command
 =========================================
 
-pair\_style lj/class2/coul/cut/omp command
+pair_style lj/class2/coul/long command
+======================================
+
+pair_style lj/class2/coul/long/gpu command
 ==========================================
 
-pair\_style lj/class2/coul/long command
-=======================================
+pair_style lj/class2/coul/long/kk command
+=========================================
 
-pair\_style lj/class2/coul/long/gpu command
-===========================================
-
-pair\_style lj/class2/coul/long/kk command
+pair_style lj/class2/coul/long/omp command
 ==========================================
 
-pair\_style lj/class2/coul/long/omp command
-===========================================
-
 Syntax
 """"""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    pair_style style args
 
 * style = *lj/class2* or *lj/class2/coul/cut* or *lj/class2/coul/long*
 * args = list of arguments for a particular style
 
-
 .. parsed-literal::
 
      *lj/class2* args = cutoff
@@ -59,22 +57,21 @@ Syntax
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    pair_style lj/class2 10.0
-   pair_coeff \* \* 100.0 2.5
-   pair_coeff 1 2\* 100.0 2.5 9.0
+   pair_coeff * * 100.0 2.5
+   pair_coeff 1 2* 100.0 2.5 9.0
 
    pair_style lj/class2/coul/cut 10.0
    pair_style lj/class2/coul/cut 10.0 8.0
-   pair_coeff \* \* 100.0 3.0
+   pair_coeff * * 100.0 3.0
    pair_coeff 1 1 100.0 3.5 9.0
    pair_coeff 1 1 100.0 3.5 9.0 9.0
 
    pair_style lj/class2/coul/long 10.0
    pair_style lj/class2/coul/long 10.0 8.0
-   pair_coeff \* \* 100.0 3.0
+   pair_coeff * * 100.0 3.0
    pair_coeff 1 1 100.0 3.5 9.0
 
 Description
@@ -82,10 +79,13 @@ Description
 
 The *lj/class2* styles compute a 6/9 Lennard-Jones potential given by
 
-.. image:: Eqs/pair_class2.jpg
-   :align: center
+.. math::
 
-Rc is the cutoff.
+   E = \epsilon \left[ 2 \left(\frac{\sigma}{r}\right)^9 -
+     3 \left(\frac{\sigma}{r}\right)^6 \right]
+   \qquad r < r_c
+
+:math:`r_c` is the cutoff.
 
 The *lj/class2/coul/cut* and *lj/class2/coul/long* styles add a
 Coulombic term as described for the :doc:`lj/cut <pair_lj>` pair styles.
@@ -98,8 +98,8 @@ above, or in the data file or restart files read by the
 :doc:`read_data <read_data>` or :doc:`read_restart <read_restart>`
 commands, or by mixing as described below:
 
-* epsilon (energy units)
-* sigma (distance units)
+* :math:`\epsilon` (energy units)
+* :math:`\sigma` (distance units)
 * cutoff1 (distance units)
 * cutoff2 (distance units)
 
@@ -114,32 +114,27 @@ Coulombic terms.
 For *lj/class2/coul/long* only the class 2 cutoff can be specified
 since a Coulombic cutoff cannot be specified for an individual I,J
 type pair.  All type pairs use the same global Coulombic cutoff
-specified in the pair\_style command.
-
+specified in the pair_style command.
 
 ----------
 
-
-If the pair\_coeff command is not used to define coefficients for a
-particular I != J type pair, the mixing rule for epsilon and sigma for
-all class2 potentials is to use the *sixthpower* formulas documented
-by the :doc:`pair_modify <pair_modify>` command.  The :doc:`pair_modify mix <pair_modify>` setting is thus ignored for class2 potentials
-for epsilon and sigma.  However it is still followed for mixing the
-cutoff distance.
-
+If the pair_coeff command is not used to define coefficients for a
+particular I != J type pair, the mixing rule for :math:`\epsilon` and
+:math:`\sigma` for all class2 potentials is to use the *sixthpower*
+formulas documented by the :doc:`pair_modify <pair_modify>` command.
+The :doc:`pair_modify mix <pair_modify>` setting is thus ignored for
+class2 potentials for epsilon and sigma.  However it is still followed
+for mixing the cutoff distance.
 
 ----------
 
-
 A version of these styles with a soft core, *lj/cut/soft*\ , suitable for use in
 free energy calculations, is part of the USER-FEP package and is documented with
-the :doc:`pair\_fep\_soft <pair_fep_soft>` styles. The version with soft core is
+the :doc:`pair_style */soft <pair_fep_soft>` styles. The version with soft core is
 only available if LAMMPS was built with that package. See the :doc:`Build package <Build_package>` doc page for more info.
 
-
 ----------
 
-
 Styles with a *gpu*\ , *intel*\ , *kk*\ , *omp*\ , or *opt* suffix are
 functionally the same as the corresponding style without the suffix.
 They have been optimized to run faster, depending on your available
@@ -158,17 +153,15 @@ by including their suffix, or you can use the :doc:`-suffix command-line switch
 See the :doc:`Speed packages <Speed_packages>` doc page for more
 instructions on how to use the accelerated styles effectively.
 
-
 ----------
 
-
 **Mixing, shift, table, tail correction, restart, rRESPA info**\ :
 
 For atom type pairs I,J and I != J, the epsilon and sigma coefficients
 and cutoff distance for all of the lj/class2 pair styles can be mixed.
 Epsilon and sigma are always mixed with the value *sixthpower*\ .  The
-cutoff distance is mixed by whatever option is set by the pair\_modify
-command (default = geometric).  See the "pair\_modify" command for
+cutoff distance is mixed by whatever option is set by the pair_modify
+command (default = geometric).  See the "pair_modify" command for
 details.
 
 All of the lj/class2 pair styles support the
@@ -184,40 +177,30 @@ All of the lj/class2 pair styles support the
 tail correction to the energy and pressure of the Lennard-Jones
 portion of the pair interaction.
 
-All of the lj/class2 pair styles write their information to :doc:`binary restart files <restart>`, so pair\_style and pair\_coeff commands do
+All of the lj/class2 pair styles write their information to :doc:`binary restart files <restart>`, so pair_style and pair_coeff commands do
 not need to be specified in an input script that reads a restart file.
 
 Only the *lj/class2* and *lj/class2/coul/long* pair styles support the use of the
 *inner*\ , *middle*\ , and *outer* keywords of the :doc:`run_style respa <run_style>` command, meaning the pairwise forces can be
 partitioned by distance at different levels of the rRESPA hierarchy.
-The other styles only support the *pair* keyword of run\_style respa.
+The other styles only support the *pair* keyword of run_style respa.
 See the :doc:`run_style <run_style>` command for details.
 
 Restrictions
 """"""""""""
 
-
 These styles are part of the CLASS2 package.  They are only enabled if
 LAMMPS was built with that package.  See the :doc:`Build package <Build_package>` doc page for more info.
 
 Related commands
 """"""""""""""""
 
-:doc:`pair_coeff <pair_coeff>`, :doc:`pair\_fep\_soft <pair_fep_soft>`
+:doc:`pair_coeff <pair_coeff>`, :doc:`pair_style */soft <pair_fep_soft>`
 
 **Default:** none
 
-
 ----------
 
-
 .. _pair-Sun:
 
-
-
 **(Sun)** Sun, J Phys Chem B 102, 7338-7364 (1998).
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/pair_coeff.rst b/doc/src/pair_coeff.rst
index a7eac2b6e6..1886ce1118 100644
--- a/doc/src/pair_coeff.rst
+++ b/doc/src/pair_coeff.rst
@@ -1,13 +1,12 @@
-.. index:: pair\_coeff
+.. index:: pair_coeff
 
-pair\_coeff command
-===================
+pair_coeff command
+==================
 
 Syntax
 """"""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    pair_coeff I J args
 
@@ -17,15 +16,14 @@ Syntax
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    pair_coeff 1 2 1.0 1.0 2.5
-   pair_coeff 2 \* 1.0 1.0
-   pair_coeff 3\* 1\*2 1.0 1.0 2.5
-   pair_coeff \* \* 1.0 1.0
-   pair_coeff \* \* nialhjea 1 1 2
-   pair_coeff \* 3 morse.table ENTRY1
+   pair_coeff 2 * 1.0 1.0
+   pair_coeff 3* 1*2 1.0 1.0 2.5
+   pair_coeff * * 1.0 1.0
+   pair_coeff * * nialhjea 1 1 2
+   pair_coeff * 3 morse.table ENTRY1
    pair_coeff 1 2 lj/cut 1.0 1.0 2.5 (for pair_style hybrid)
 
 Description
@@ -51,18 +49,17 @@ types from 1 to N.  A leading asterisk means all types from 1 to n
 (inclusive).  Note that only type pairs with I <= J are considered; if
 asterisks imply type pairs where J < I, they are ignored.
 
-Note that a pair\_coeff command can override a previous setting for the
+Note that a pair_coeff command can override a previous setting for the
 same I,J pair.  For example, these commands set the coeffs for all I,J
 pairs, then overwrite the coeffs for just the I,J = 2,3 pair:
 
+.. code-block:: LAMMPS
 
-.. parsed-literal::
-
-   pair_coeff \* \* 1.0 1.0 2.5
+   pair_coeff * * 1.0 1.0 2.5
    pair_coeff 2 3 2.0 1.0 1.12
 
 A line in a data file that specifies pair coefficients uses the exact
-same format as the arguments of the pair\_coeff command in an input
+same format as the arguments of the pair_coeff command in an input
 script, with the exception of the I,J type arguments.  In each line of
 the "Pair Coeffs" section of a data file, only a single type I is
 specified, which sets the coefficients for type I interacting with
@@ -72,34 +69,33 @@ should also not be used as part of the I argument.  Thus in a data
 file, the line corresponding to the 1st example above would be listed
 as
 
-
 .. parsed-literal::
 
    2 1.0 1.0 2.5
 
 For many potentials, if coefficients for type pairs with I != J are
-not set explicitly by a pair\_coeff command, the values are inferred
+not set explicitly by a pair_coeff command, the values are inferred
 from the I,I and J,J settings by mixing rules; see the
 :doc:`pair_modify <pair_modify>` command for a discussion.  Details on
 this option as it pertains to individual potentials are described on
 the doc page for the potential.
 
 Many pair styles, typically for many-body potentials, use tabulated
-potential files as input, when specifying the pair\_coeff command.
+potential files as input, when specifying the pair_coeff command.
 Potential files provided with LAMMPS are in the potentials directory
 of the distribution.  For some potentials, such as EAM, other archives
 of suitable files can be found on the Web.  They can be used with
 LAMMPS so long as they are in the format LAMMPS expects, as discussed
 on the individual doc pages.
 
-When a pair\_coeff command using a potential file is specified, LAMMPS
+When a pair_coeff command using a potential file is specified, LAMMPS
 looks for the potential file in 2 places.  First it looks in the
 location specified.  E.g. if the file is specified as "niu3.eam", it
 is looked for in the current working directory.  If it is specified as
 "../potentials/niu3.eam", then it is looked for in the potentials
 directory, assuming it is a sister directory of the current working
 directory.  If the file is not found, it is then looked for in the
-directory specified by the LAMMPS\_POTENTIALS environment variable.
+directory specified by the LAMMPS_POTENTIALS environment variable.
 Thus if this is set to the potentials directory in the LAMMPS distribution,
 then you can use those files from anywhere on your system, without
 copying them into your working directory.  Environment variables are
@@ -108,44 +104,36 @@ for
 
 csh, tcsh:
 
-
 .. parsed-literal::
 
    % setenv LAMMPS_POTENTIALS /path/to/lammps/potentials
 
 bash:
 
-
 .. parsed-literal::
 
    % export LAMMPS_POTENTIALS=/path/to/lammps/potentials
 
 Windows:
 
-
 .. parsed-literal::
 
    % set LAMMPS_POTENTIALS="C:\\Path to LAMMPS\\Potentials"
 
-
 ----------
 
-
 The alphabetic list of pair styles defined in LAMMPS is given on the
 :doc:`pair_style <pair_style>` doc page.  They are also listed in more
 compact form on the :doc:`Commands pair <Commands_pair>` doc page.
 
 Click on the style to display the formula it computes and its
-coefficients as specified by the associated pair\_coeff command.
-
+coefficients as specified by the associated pair_coeff command.
 
 ----------
 
-
 Restrictions
 """"""""""""
 
-
 This command must come after the simulation box is defined by a
 :doc:`read_data <read_data>`, :doc:`read_restart <read_restart>`, or
 :doc:`create_box <create_box>` command.
@@ -158,8 +146,3 @@ Related commands
 :doc:`pair_write <pair_write>`
 
 **Default:** none
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/pair_colloid.rst b/doc/src/pair_colloid.rst
index 3893d2113a..d9f086059d 100644
--- a/doc/src/pair_colloid.rst
+++ b/doc/src/pair_colloid.rst
@@ -1,19 +1,18 @@
-.. index:: pair\_style colloid
+.. index:: pair_style colloid
 
-pair\_style colloid command
-===========================
+pair_style colloid command
+==========================
 
-pair\_style colloid/gpu command
-===============================
+pair_style colloid/gpu command
+==============================
 
-pair\_style colloid/omp command
-===============================
+pair_style colloid/omp command
+==============================
 
 Syntax
 """"""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    pair_style colloid cutoff
 
@@ -22,11 +21,10 @@ Syntax
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    pair_style colloid 10.0
-   pair_coeff \* \*  25 1.0 10.0 10.0
+   pair_coeff * *  25 1.0 10.0 10.0
    pair_coeff 1 1 144 1.0 0.0 0.0 3.0
    pair_coeff 1 2  75.398 1.0 0.0 10.0 9.0
    pair_coeff 2 2  39.478 1.0 10.0 10.0 25.0
@@ -41,37 +39,64 @@ Lennard-Jones particle of size sigma.
 
 The colloid-colloid interaction energy is given by
 
-.. image:: Eqs/pair_colloid_cc.jpg
-   :align: center
+.. math::
 
-where A\_cc is the Hamaker constant, a1 and a2 are the radii of the two
-colloidal particles, and Rc is the cutoff.  This equation results from
-describing each colloidal particle as an integrated collection of
-Lennard-Jones particles of size sigma and is derived in
-:ref:`(Everaers) <Everaers1>`.
+   U_A = & - \frac{A_{cc}}{6} \left[
+   \frac{2 a_1 a_2}{r^2-\left(a_1+a_2\right)^2}
+   + \frac{2 a_1 a_2}{r^2 - \left(a_1 - a_2\right)^2}
+     + \mathrm{ln}
+       \left(
+  \frac{r^2-\left(a_1+a_2\right)^2}{r^2-\left(a_1-a_2\right)^2}
+   \right)
+  \right] \\
+    & \\
+    U_R = & \frac{A_{cc}}{37800}  \frac{\sigma^6}{r}
+    \biggl[ \frac{r^2-7r\left(a_1+a_2\right)+6\left(a_1^2+7a_1a_2+a_2^2\right)}
+  {\left(r-a_1-a_2\right)^7} \\
+   &\qquad              +\frac{r^2+7r\left(a_1+a_2\right)+6\left(a_1^2+7a_1a_2+a_2^2\right)}
+  {\left(r+a_1+a_2\right)^7}  \\
+  &\qquad               -\frac{r^2+7r\left(a_1-a_2\right)+6\left(a_1^2-7a_1a_2+a_2^2\right)}
+  {\left(r+a_1-a_2\right)^7} \\
+  &\qquad       \left.  -\frac{r^2-7r\left(a_1-a_2\right)+6\left(a_1^2-7a_1a_2+a_2^2\right)}
+  {\left(r-a_1+a_2\right)^7}
+  \right]  \\
+  & \\
+  U = & U_A + U_R, \qquad r < r_c
+
+where :math:`A_{cc}` is the Hamaker constant, :math:`a_1` and :math:`a_2` are the
+radii of the two colloidal particles, and :math:`r_c` is the cutoff.  This
+equation results from describing each colloidal particle as an
+integrated collection of Lennard-Jones particles of size sigma and is
+derived in :ref:`(Everaers) <Everaers1>`.
 
 The colloid-solvent interaction energy is given by
 
-.. image:: Eqs/pair_colloid_cs.jpg
-   :align: center
+.. math::
 
-where A\_cs is the Hamaker constant, a is the radius of the colloidal
-particle, and Rc is the cutoff.  This formula is derived from the
+   U = \frac{2 ~ a^3 ~ \sigma^3 ~ A_{cs}}{9 \left( a^2 - r^2 \right)^3}
+   \left[ 1 - \frac{\left(5 ~ a^6+45~a^4~r^2+63~a^2~r^4+15~r^6\right) \sigma^6}
+   {15 \left(a-r\right)^6 \left( a+r \right)^6} \right], \quad r < r_c
+
+where :math:A_{cs}` is the Hamaker constant, *a* is the radius of the colloidal
+particle, and :math:`r_c` is the cutoff.  This formula is derived from the
 colloid-colloid interaction, letting one of the particle sizes go to
 zero.
 
 The solvent-solvent interaction energy is given by the usual
 Lennard-Jones formula
 
-.. image:: Eqs/pair_colloid_ss.jpg
-   :align: center
+.. math::
 
-with A\_ss set appropriately, which results from letting both particle
-sizes go to zero.
+   U = \frac{A_{ss}}{36} \left[ \left( \frac{\sigma}{r}
+        \right)^{12} - \left( \frac{ \sigma}{r} \right)^6 \right], \quad
+        r < r_c
 
-When used in combination with :doc:`pair_style yukawa/colloid <pair_colloid>`, the two terms become the so-called
-DLVO potential, which combines electrostatic repulsion and van der
-Waals attraction.
+with :math:`A_{ss}` set appropriately, which results from letting both
+particle sizes go to zero.
+
+When used in combination with :doc:`pair_style yukawa/colloid
+<pair_colloid>`, the two terms become the so-called DLVO potential,
+which combines electrostatic repulsion and van der Waals attraction.
 
 The following coefficients must be defined for each pair of atoms
 types via the :doc:`pair_coeff <pair_coeff>` command as in the examples
@@ -80,7 +105,7 @@ above, or in the data file or restart files read by the
 commands, or by mixing as described below:
 
 * A (energy units)
-* sigma (distance units)
+* :math:`\sigma` (distance units)
 * d1 (distance units)
 * d2 (distance units)
 * cutoff (distance units)
@@ -88,19 +113,19 @@ commands, or by mixing as described below:
 A is the Hamaker energy prefactor and should typically be set as
 follows:
 
-* A\_cc = colloid/colloid = 4 pi\^2 = 39.5
-* A\_cs = colloid/solvent = sqrt(A\_cc\*A\_ss)
-* A\_ss = solvent/solvent = 144 (assuming epsilon = 1, so that 144/36 = 4)
+* :math:`A_{cc}` = colloid/colloid = :math:`4 \pi^2 = 39.5`
+* :math:`A_{cs}` = colloid/solvent = :math:`\sqrt{A_{cc} A_{ss}}`
+* :math:`A_{ss}` = solvent/solvent = 144 (assuming epsilon = 1, so that 144/36 = 4)
 
-Sigma is the size of the solvent particle or the constituent particles
-integrated over in the colloidal particle and should typically be set
-as follows:
+:math:`\sigma` is the size of the solvent particle or the constituent
+particles integrated over in the colloidal particle and should typically
+be set as follows:
 
-* Sigma\_cc = colloid/colloid = 1.0
-* Sigma\_cs = colloid/solvent = arithmetic mixing between colloid sigma and solvent sigma
-* Sigma\_ss = solvent/solvent = 1.0 or whatever size the solvent particle is
+* :math:`\sigma_{cc}` = colloid/colloid = 1.0
+* :math:`\sigma_{cs}` = colloid/solvent = arithmetic mixing between colloid :math:`\sigma` and solvent :math:`\sigma`
+* :math:`\sigma_{ss}` = solvent/solvent = 1.0 or whatever size the solvent particle is
 
-Thus typically Sigma\_cs = 1.0, unless the solvent particle's size !=
+Thus typically :math:`\sigma_{cs} = 1.0`, unless the solvent particle's size !=
 1.0.
 
 D1 and d2 are particle diameters, so that d1 = 2\*a1 and d2 = 2\*a2 in
@@ -108,16 +133,16 @@ the formulas above.  Both d1 and d2 must be values >= 0.  If d1 > 0
 and d2 > 0, then the pair interacts via the colloid-colloid formula
 above.  If d1 = 0 and d2 = 0, then the pair interacts via the
 solvent-solvent formula.  I.e. a d value of 0 is a Lennard-Jones
-particle of size sigma.  If either d1 = 0 or d2 = 0 and the other is
+particle of size :math:`\sigma`.  If either d1 = 0 or d2 = 0 and the other is
 larger, then the pair interacts via the colloid-solvent formula.
 
 Note that the diameter of a particular particle type may appear in
-multiple pair\_coeff commands, as it interacts with other particle
+multiple pair_coeff commands, as it interacts with other particle
 types.  You should insure the particle diameter is specified
 consistently each time it appears.
 
 The last coefficient is optional.  If not specified, the global cutoff
-specified in the pair\_style command is used.  However, you typically
+specified in the pair_style command is used.  However, you typically
 want different cutoffs for interactions between different particle
 sizes.  E.g. if colloidal particles of diameter 10 are used with
 solvent particles of diameter 1, then a solvent-solvent cutoff of 2.5
@@ -128,16 +153,14 @@ colloid-solvent cutoff in this case.
 
 .. note::
 
-   When using pair\_style colloid for a mixture with 2 (or more)
+   When using pair_style colloid for a mixture with 2 (or more)
    widely different particles sizes (e.g. sigma=10 colloids in a
    background sigma=1 LJ fluid), you will likely want to use these
    commands for efficiency: :doc:`neighbor multi <neighbor>` and
    :doc:`comm_modify multi <comm_modify>`.
 
-
 ----------
 
-
 Styles with a *gpu*\ , *intel*\ , *kk*\ , *omp*\ , or *opt* suffix are
 functionally the same as the corresponding style without the suffix.
 They have been optimized to run faster, depending on your available
@@ -156,17 +179,15 @@ by including their suffix, or you can use the :doc:`-suffix command-line switch
 See the :doc:`Speed packages <Speed_packages>` doc page for more
 instructions on how to use the accelerated styles effectively.
 
-
 ----------
 
-
 **Mixing, shift, table, tail correction, restart, rRESPA info**\ :
 
 For atom type pairs I,J and I != J, the A, sigma, d1, and d2
 coefficients and cutoff distance for this pair style can be mixed.  A
 is an energy value mixed like a LJ epsilon.  D1 and d2 are distance
 values and are mixed like sigma.  The default mix value is
-*geometric*\ .  See the "pair\_modify" command for details.
+*geometric*\ .  See the "pair_modify" command for details.
 
 This pair style supports the :doc:`pair_modify <pair_modify>` shift
 option for the energy of the pair interaction.
@@ -178,34 +199,31 @@ This pair style does not support the :doc:`pair_modify <pair_modify>`
 tail option for adding long-range tail corrections to energy and
 pressure.
 
-This pair style writes its information to :doc:`binary restart files <restart>`, so pair\_style and pair\_coeff commands do not need
+This pair style writes its information to :doc:`binary restart files <restart>`, so pair_style and pair_coeff commands do not need
 to be specified in an input script that reads a restart file.
 
 This pair style can only be used via the *pair* keyword of the
 :doc:`run_style respa <run_style>` command.  It does not support the
 *inner*\ , *middle*\ , *outer* keywords.
 
-
 ----------
 
-
 Restrictions
 """"""""""""
 
-
 This style is part of the COLLOID package.  It is only enabled if
 LAMMPS was built with that package.  See the :doc:`Build package <Build_package>` doc page for more info.
 
 Normally, this pair style should be used with finite-size particles
 which have a diameter, e.g. see the :doc:`atom_style sphere <atom_style>` command.  However, this is not a requirement,
-since the only definition of particle size is via the pair\_coeff
+since the only definition of particle size is via the pair_coeff
 parameters for each type.  In other words, the physical radius of the
 particle is ignored.  Thus you should insure that the d1,d2 parameters
 you specify are consistent with the physical size of the particles of
 that type.
 
 Per-particle polydispersity is not yet supported by this pair style;
-only per-type polydispersity is enabled via the pair\_coeff parameters.
+only per-type polydispersity is enabled via the pair_coeff parameters.
 
 Related commands
 """"""""""""""""
@@ -214,17 +232,8 @@ Related commands
 
 **Default:** none
 
-
 ----------
 
-
 .. _Everaers1:
 
-
-
 **(Everaers)** Everaers, Ejtehadi, Phys Rev E, 67, 041710 (2003).
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/pair_comb.rst b/doc/src/pair_comb.rst
index 0dc15dcd89..247f539ab5 100644
--- a/doc/src/pair_comb.rst
+++ b/doc/src/pair_comb.rst
@@ -1,40 +1,38 @@
-.. index:: pair\_style comb
+.. index:: pair_style comb
 
-pair\_style comb command
+pair_style comb command
+=======================
+
+pair_style comb/omp command
+===========================
+
+pair_style comb3 command
 ========================
 
-pair\_style comb/omp command
-============================
-
-pair\_style comb3 command
-=========================
-
 Syntax
 """"""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    pair_style comb
    pair_style comb3 keyword
 
+.. parsed-literal::
+
    keyword = *polar*
      *polar* value = *polar_on* or *polar_off* = whether or not to include atomic polarization
 
-
-
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    pair_style comb
-   pair_coeff \* \* ../potentials/ffield.comb Si
-   pair_coeff \* \* ../potentials/ffield.comb Hf Si O
+   pair_coeff * * ../potentials/ffield.comb Si
+   pair_coeff * * ../potentials/ffield.comb Hf Si O
 
    pair_style comb3 polar_off
-   pair_coeff \* \* ../potentials/ffield.comb3 O Cu N C O
+   pair_coeff * * ../potentials/ffield.comb3 O Cu N C O
 
 Description
 """""""""""
@@ -42,22 +40,22 @@ Description
 Style *comb* computes the second-generation variable charge COMB
 (Charge-Optimized Many-Body) potential.  Style *comb3* computes the
 third-generation COMB potential.  These COMB potentials are described
-in :ref:`(COMB) <COMB>` and :ref:`(COMB3) <COMB3>`.  Briefly, the total energy
-*E<sub>T</sub>* of a system of atoms is given by
+in :ref:`(COMB) <COMB>` and :ref:`(COMB3) <COMB3>`.  Briefly, the
+total energy :math:`E_T` of a system of atoms is given by
 
-.. image:: Eqs/pair_comb1.jpg
-   :align: center
+.. math::
 
-where *E<sub>i</sub><sup>self</sup>* is the self-energy of atom *i*
-(including atomic ionization energies and electron affinities),
-*E<sub>ij</sub><sup>short</sup>* is the bond-order potential between
-atoms *i* and *j*\ ,
-*E<sub>ij</sub><sup>Coul</sup>* is the Coulomb interactions,
-*E<sup>polar</sup>* is the polarization term for organic systems
-(style *comb3* only),
-*E<sup>vdW</sup>* is the van der Waals energy (style *comb3* only),
-*E<sup>barr</sup>* is a charge barrier function, and
-*E<sup>corr</sup>* are angular correction terms.
+   E_T  = & \sum_i [ E_i^{self} (q_i) + \sum_{j>i} [E_{ij}^{short} (r_{ij}, q_i, q_j) + E_{ij}^{Coul} (r_{ij}, q_i, q_j)] + \\
+          & E^{polar} (q_i, r_{ij}) + E^{vdW} (r_{ij}) + E^{barr} (q_i) + E^{corr} (r_{ij}, \theta_{jik})]
+
+where :math:`E_i^{self}` is the self-energy of atom *i* (including
+atomic ionization energies and electron affinities),
+:math:`E_{ij}^{short}` is the bond-order potential between atoms *i* and
+*j*\ , :math:`E_{ij}^{Coul}` is the Coulomb interactions,
+:math:`E^{polar}` is the polarization term for organic systems (style
+*comb3* only), :math:`E^{vdW}` is the van der Waals energy (style
+*comb3* only), :math:`E^{barr}` is a charge barrier function, and
+:math:`E^{corr}` are angular correction terms.
 
 The COMB potentials (styles *comb* and *comb3*\ ) are variable charge
 potentials.  The equilibrium charge on each atom is calculated by the
@@ -69,21 +67,20 @@ that determine how often charge equilibration is performed, its
 convergence criterion, and which atoms are included in the
 calculation.
 
-Only a single pair\_coeff command is used with the *comb* and *comb3*
+Only a single pair_coeff command is used with the *comb* and *comb3*
 styles which specifies the COMB potential file with parameters for all
 needed elements.  These are mapped to LAMMPS atom types by specifying
-N additional arguments after the potential file in the pair\_coeff
+N additional arguments after the potential file in the pair_coeff
 command, where N is the number of LAMMPS atom types.
 
-For example, if your LAMMPS simulation of a Si/SiO<sub>2</sub>/
-HfO<sub>2</sub> interface has 4 atom types, and you want the 1st and
+For example, if your LAMMPS simulation of a Si/SiO2/
+HfO2 interface has 4 atom types, and you want the 1st and
 last to be Si, the 2nd to be Hf, and the 3rd to be O, and you would
-use the following pair\_coeff command:
+use the following pair_coeff command:
 
+.. code-block:: LAMMPS
 
-.. parsed-literal::
-
-   pair_coeff \* \* ../potentials/ffield.comb Si Hf O Si
+   pair_coeff * * ../potentials/ffield.comb Si Hf O Si
 
 The first two arguments must be \* \* so as to span all LAMMPS atom
 types.  The first and last Si arguments map LAMMPS atom types 1 and 4
@@ -101,32 +98,51 @@ Cu, Hf, Ti, O, their oxides and Zr, Zn and U metals.  For style
 *comb3*\ , the potential file *ffield.comb3* contains all
 currently-available 3rd generation COMB parameterizations: O, Cu, N, C,
 H, Ti, Zn and Zr.  The status of the optimization of the compounds, for
-example Cu<sub>2</sub>O, TiN and hydrocarbons, are given in the
+example Cu2O, TiN and hydrocarbons, are given in the
 following table:
 
-.. image:: Eqs/pair_comb2.jpg
-   :align: center
++----+----+----+----+----+----+----+----+----+
+|    | O  | Cu | N  | C  | H  | Ti | Zn | Zr |
++----+----+----+----+----+----+----+----+----+
+| O  | F  | F  | F  | F  | F  | F  | F  | F  |
++----+----+----+----+----+----+----+----+----+
+| Cu | F  | F  | P  | F  | F  | P  | F  | P  |
++----+----+----+----+----+----+----+----+----+
+| N  | F  | P  | F  | M  | F  | P  | P  | P  |
++----+----+----+----+----+----+----+----+----+
+| C  | F  | F  | M  | F  | F  | M  | M  | M  |
++----+----+----+----+----+----+----+----+----+
+| H  | F  | F  | F  | F  | F  | M  | M  | F  |
++----+----+----+----+----+----+----+----+----+
+| Ti | F  | P  | P  | M  | M  | F  | P  | P  |
++----+----+----+----+----+----+----+----+----+
+| Zn | F  | F  | P  | M  | M  | P  | F  | P  |
++----+----+----+----+----+----+----+----+----+
+| Zr | F  | P  | P  | M  | F  | P  | P  | F  |
++----+----+----+----+----+----+----+----+----+
+
+* F = Fully optimized
+* M = Only optimized for dimer molecule
+* P = in progress, but have it from mixing rule
 
 For style *comb3*\ , in addition to ffield.comb3, a special parameter
 file, *lib.comb3*\ , that is exclusively used for C/O/H systems, will be
 automatically loaded if carbon atom is detected in LAMMPS input
 structure.  This file must be in your working directory or in the
-directory pointed to by the environment variable LAMMPS\_POTENTIALS, as
+directory pointed to by the environment variable LAMMPS_POTENTIALS, as
 described on the :doc:`pair_coeff <pair_coeff>` command doc page.
 
 Keyword *polar* indicates whether the force field includes
 the atomic polarization.  Since the equilibration of the polarization
-has not yet been implemented, it can only set polar\_off at present.
+has not yet been implemented, it can only set polar_off at present.
 
 .. note::
 
    You can not use potential file *ffield.comb* with style *comb3*\ ,
    nor file *ffield.comb3* with style *comb*\ .
 
-
 ----------
 
-
 Styles with a *gpu*\ , *intel*\ , *kk*\ , *omp*\ , or *opt* suffix are
 functionally the same as the corresponding style without the suffix.
 They have been optimized to run faster, depending on your available
@@ -145,10 +161,8 @@ by including their suffix, or you can use the :doc:`-suffix command-line switch
 See the :doc:`Speed packages <Speed_packages>` doc page for more
 instructions on how to use the accelerated styles effectively.
 
-
 ----------
 
-
 **Mixing, shift, table, tail correction, restart, rRESPA info**\ :
 
 For atom type pairs I,J and I != J, where types I and J correspond to
@@ -159,21 +173,18 @@ These pair styles does not support the :doc:`pair_modify <pair_modify>`
 shift, table, and tail options.
 
 These pair styles do not write its information to :doc:`binary restart files <restart>`, since it is stored in potential files.  Thus, you
-need to re-specify the pair\_style, pair\_coeff, and :doc:`fix qeq/comb <fix_qeq_comb>` commands in an input script that reads a
+need to re-specify the pair_style, pair_coeff, and :doc:`fix qeq/comb <fix_qeq_comb>` commands in an input script that reads a
 restart file.
 
 These pair styles can only be used via the *pair* keyword of the
 :doc:`run_style respa <run_style>` command.  It does not support the
 *inner*\ , *middle*\ , *outer* keywords.
 
-
 ----------
 
-
 Restrictions
 """"""""""""
 
-
 These pair styles are part of the MANYBODY package.  It is only
 enabled if LAMMPS was built with that package.  See the :doc:`Build package <Build_package>` doc page for more info.
 
@@ -185,7 +196,7 @@ with LAMMPS (see the potentials directory) are parameterized for metal
 :doc:`units <units>`.  You can use the COMB potential with any LAMMPS
 units, but you would need to create your own COMB potential file with
 coefficients listed in the appropriate units if your simulation
-doesn't use "metal" units.
+does not use "metal" units.
 
 Related commands
 """"""""""""""""
@@ -195,33 +206,20 @@ Related commands
 
 **Default:** none
 
-
 ----------
 
-
 .. _COMB:
 
-
-
 **(COMB)**  T.-R. Shan, B. D. Devine, T. W. Kemper, S. B. Sinnott, and
 S. R. Phillpot, Phys. Rev. B 81, 125328 (2010)
 
 .. _COMB3:
 
-
-
 **(COMB3)** T. Liang, T.-R. Shan, Y.-T. Cheng, B. D. Devine, M. Noordhoek,
 Y. Li, Z. Lu, S. R. Phillpot, and S. B. Sinnott, Mat. Sci. & Eng: R 74,
 255-279 (2013).
 
 .. _Rick2:
 
-
-
 **(Rick)** S. W. Rick, S. J. Stuart, B. J. Berne, J Chem Phys 101, 6141
 (1994).
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/pair_cosine_squared.rst b/doc/src/pair_cosine_squared.rst
index 4031a9741c..b7fa29bbd5 100644
--- a/doc/src/pair_cosine_squared.rst
+++ b/doc/src/pair_cosine_squared.rst
@@ -1,20 +1,18 @@
-.. index:: pair\_style cosine/squared
+.. index:: pair_style cosine/squared
 
-pair\_style cosine/squared command
-==================================
+pair_style cosine/squared command
+=================================
 
 Syntax
 """"""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    pair_style cosine/squared cutoff
 
 * cutoff = global cutoff for cosine-squared interactions (distance units)
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    pair_coeff i j eps sigma
    pair_coeff i j eps sigma cutoff
@@ -30,11 +28,10 @@ Syntax
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    pair_style cosine/squared 3.0
-   pair_coeff \* \* 1.0 1.3
+   pair_coeff * * 1.0 1.3
    pair_coeff 1 3 1.0 1.3 2.0
    pair_coeff 1 3 1.0 1.3 wca
    pair_coeff 1 3 1.0 1.3 2.0 wca
@@ -44,14 +41,20 @@ Description
 
 Style *cosine/squared* computes a potential of the form
 
-.. image:: Eqs/pair_cosine_squared.jpg
-   :align: center
+.. math::
 
-between two point particles, where (sigma, -epsilon) is the location of
-the (rightmost) minimum of the potential, as explained in the syntax
-section above.
+   E =
+   \begin{cases}
+   -\epsilon& \quad r < \sigma \\
+   -\epsilon\cos\left(\frac{\pi\left(r - \sigma\right)}{2\left(r_c - \sigma\right)}\right)&\quad \sigma \leq r < r_c \\
+   0& \quad r \geq r_c
+   \end{cases}
 
-This potential was first used in (Cooke)\_#CKD for a coarse-grained lipid
+between two point particles, where (:math:`\sigma, -\epsilon`) is the
+location of the (rightmost) minimum of the potential, as explained in
+the syntax section above.
+
+This potential was first used in (Cooke)_#CKD for a coarse-grained lipid
 membrane model.  It is generally very useful as a non-specific
 interaction potential because it is fully adjustable in depth and width
 while joining the minimum at (sigma, -epsilon) and zero at (cutoff, 0)
@@ -60,14 +63,17 @@ energy calculations etc. This evidently requires *cutoff* to be larger
 than *sigma*\ .
 
 If the *wca* option is used then a Weeks-Chandler-Andersen potential
-(Weeks)\_#WCA is added to the above specified cosine-squared potential,
+(Weeks)_#WCA is added to the above specified cosine-squared potential,
 specifically the following:
 
-.. image:: Eqs/pair_cosine_squared_wca.jpg
-   :align: center
+.. math::
 
-In this case, and this case only, the *sigma* parameter can be equal to
-*cutoff* (sigma = cutoff) which will result in ONLY the WCA potential
+ E = \epsilon \left[ \left(\frac{\sigma}{r}\right)^{12} -
+                       2\left(\frac{\sigma}{r}\right)^6 + 1\right]
+                       , \quad r < \sigma
+
+In this case, and this case only, the :math:`\sigma` parameter can be equal to
+*cutoff* (:math:`\sigma =` cutoff) which will result in ONLY the WCA potential
 being used (and print a warning), so the minimum will be attained at
 (sigma, 0). This is a convenience feature that enables a purely
 repulsive potential to be used without a need to define an additional
@@ -80,31 +86,26 @@ in the graphs below:
 .. image:: JPG/pair_cosine_squared_graphs.jpg
    :align: center
 
-
 ----------
 
-
 **Mixing, shift, table, tail correction, restart, rRESPA info**\ :
 
 Mixing is not supported for this style.
 
 The *shift*\ , *table* and *tail* options are not relevant for this style.
 
-This pair style writes its information to :doc:`binary restart files <restart>`, so pair\_style and pair\_coeff commands do not need
+This pair style writes its information to :doc:`binary restart files <restart>`, so pair_style and pair_coeff commands do not need
 to be specified in an input script that reads a restart file.
 
 These pair styles can only be used via the *pair* keyword of the
 :doc:`run_style respa <run_style>` command.  They do not support the
 *inner*\ , *middle*\ , *outer* keywords.
 
-
 ----------
 
-
 Restrictions
 """"""""""""
 
-
 The *cosine/squared* style is part of the "USER-MISC" package. It is only
 enabled if LAMMPS is build with that package.  See the :doc:`Build package <Build_package>` doc page for more info.
 
@@ -118,17 +119,8 @@ Related commands
 
 .. _CKD:
 
-
-
 **(Cooke)** "Cooke, Kremer and Deserno, Phys. Rev. E, 72, 011506 (2005)"
 
 .. _WCA:
 
-
-
 **(Weeks)** "Weeks, Chandler and Andersen, J. Chem. Phys., 54, 5237 (1971)"
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/pair_coul.rst b/doc/src/pair_coul.rst
index 735b52cb6e..8f77a622d6 100644
--- a/doc/src/pair_coul.rst
+++ b/doc/src/pair_coul.rst
@@ -1,88 +1,87 @@
-.. index:: pair\_style coul/cut
+.. index:: pair_style coul/cut
 
-pair\_style coul/cut command
-============================
+pair_style coul/cut command
+===========================
 
-pair\_style coul/cut/gpu command
-================================
-
-pair\_style coul/cut/kk command
+pair_style coul/cut/gpu command
 ===============================
 
-pair\_style coul/cut/omp command
-================================
-
-pair\_style coul/debye command
+pair_style coul/cut/kk command
 ==============================
 
-pair\_style coul/debye/gpu command
-==================================
-
-pair\_style coul/debye/kk command
-=================================
-
-pair\_style coul/debye/omp command
-==================================
-
-pair\_style coul/dsf command
-============================
-
-pair\_style coul/dsf/gpu command
-================================
-
-pair\_style coul/dsf/kk command
+pair_style coul/cut/omp command
 ===============================
 
-pair\_style coul/dsf/omp command
-================================
-
-pair\_style coul/long command
+pair_style coul/debye command
 =============================
 
-pair\_style coul/long/omp command
+pair_style coul/debye/gpu command
 =================================
 
-pair\_style coul/long/gpu command
+pair_style coul/debye/kk command
+================================
+
+pair_style coul/debye/omp command
 =================================
 
-pair\_style coul/long/kk command
-================================
+pair_style coul/dsf command
+===========================
 
-pair\_style coul/msm command
-============================
+pair_style coul/dsf/gpu command
+===============================
 
-pair\_style coul/msm/omp command
-================================
-
-pair\_style coul/streitz command
-================================
-
-pair\_style coul/wolf command
-=============================
-
-pair\_style coul/wolf/kk command
-================================
-
-pair\_style coul/wolf/omp command
-=================================
-
-pair\_style tip4p/cut command
-=============================
-
-pair\_style tip4p/long command
+pair_style coul/dsf/kk command
 ==============================
 
-pair\_style tip4p/cut/omp command
-=================================
+pair_style coul/dsf/omp command
+===============================
 
-pair\_style tip4p/long/omp command
-==================================
+pair_style coul/long command
+============================
+
+pair_style coul/long/omp command
+================================
+
+pair_style coul/long/gpu command
+================================
+
+pair_style coul/long/kk command
+===============================
+
+pair_style coul/msm command
+===========================
+
+pair_style coul/msm/omp command
+===============================
+
+pair_style coul/streitz command
+===============================
+
+pair_style coul/wolf command
+============================
+
+pair_style coul/wolf/kk command
+===============================
+
+pair_style coul/wolf/omp command
+================================
+
+pair_style tip4p/cut command
+============================
+
+pair_style tip4p/long command
+=============================
+
+pair_style tip4p/cut/omp command
+================================
+
+pair_style tip4p/long/omp command
+=================================
 
 Syntax
 """"""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    pair_style coul/cut cutoff
    pair_style coul/debye kappa cutoff
@@ -101,38 +100,37 @@ Syntax
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    pair_style coul/cut 2.5
-   pair_coeff \* \*
+   pair_coeff * *
    pair_coeff 2 2 3.5
 
    pair_style coul/debye 1.4 3.0
-   pair_coeff \* \*
+   pair_coeff * *
    pair_coeff 2 2 3.5
 
    pair_style coul/dsf 0.05 10.0
-   pair_coeff \* \*
+   pair_coeff * *
 
    pair_style coul/long 10.0
-   pair_coeff \* \*
+   pair_coeff * *
 
    pair_style coul/msm 10.0
-   pair_coeff \* \*
+   pair_coeff * *
 
    pair_style coul/wolf 0.2 9.0
-   pair_coeff \* \*
+   pair_coeff * *
 
    pair_style coul/streitz 12.0 ewald
    pair_style coul/streitz 12.0 wolf 0.30
-   pair_coeff \* \* AlO.streitz Al O
+   pair_coeff * * AlO.streitz Al O
 
    pair_style tip4p/cut 1 2 7 8 0.15 12.0
-   pair_coeff \* \*
+   pair_coeff * *
 
    pair_style tip4p/long 1 2 7 8 0.15 10.0
-   pair_coeff \* \*
+   pair_coeff * *
 
 Description
 """""""""""
@@ -140,70 +138,70 @@ Description
 The *coul/cut* style computes the standard Coulombic interaction
 potential given by
 
-.. image:: Eqs/pair_coulomb.jpg
-   :align: center
+.. math::
+
+   E = \frac{C q_i q_j}{\epsilon  r} \qquad r < r_c
 
 where C is an energy-conversion constant, Qi and Qj are the charges on
-the 2 atoms, and epsilon is the dielectric constant which can be set
-by the :doc:`dielectric <dielectric>` command.  The cutoff Rc truncates
+the 2 atoms, and :math:`\epsilon` is the dielectric constant which can be set
+by the :doc:`dielectric <dielectric>` command.  The cutoff :math:`r_c` truncates
 the interaction distance.
 
-
 ----------
 
-
 Style *coul/debye* adds an additional exp() damping factor to the
 Coulombic term, given by
 
-.. image:: Eqs/pair_debye.jpg
-   :align: center
+.. math::
 
-where kappa is the Debye length.  This potential is another way to
+   E = \frac{C q_i q_j}{\epsilon  r} \exp(- \kappa r) \qquad r < r_c
+
+where :math:`\kappa` is the Debye length.  This potential is another way to
 mimic the screening effect of a polar solvent.
 
-
 ----------
 
-
 Style *coul/dsf* computes Coulombic interactions via the damped
 shifted force model described in :ref:`Fennell <Fennell1>`, given by:
 
-.. image:: Eqs/pair_coul_dsf.jpg
-   :align: center
+.. math::
 
-where *alpha* is the damping parameter and erfc() is the
+   E = q_iq_j \left[ \frac{\mbox{erfc} (\alpha r)}{r} -  \frac{\mbox{erfc} (\alpha r_c)}{r_c} +
+   \left( \frac{\mbox{erfc} (\alpha r_c)}{r_c^2} +  \frac{2\alpha}{\sqrt{\pi}}\frac{\exp (-\alpha^2    r^2_c)}{r_c} \right)(r-r_c) \right] \qquad r < r_c
+
+where :math:`\alpha` is the damping parameter and erfc() is the
 complementary error-function. The potential corrects issues in the
 Wolf model (described below) to provide consistent forces and energies
 (the Wolf potential is not differentiable at the cutoff) and smooth
 decay to zero.
 
-
 ----------
 
-
 Style *coul/wolf* computes Coulombic interactions via the Wolf
 summation method, described in :ref:`Wolf <Wolf1>`, given by:
 
-.. image:: Eqs/pair_coul_wolf.jpg
-   :align: center
+.. math::
 
-where *alpha* is the damping parameter, and erc() and erfc() are
+   E_i = \frac{1}{2} \sum_{j \neq i}
+   \frac{q_i q_j {\rm erfc}(\alpha r_{ij})}{r_{ij}} +
+   \frac{1}{2} \sum_{j \neq i}
+   \frac{q_i q_j {\rm erf}(\alpha r_{ij})}{r_{ij}} \qquad r < r_c
+
+where :math:`\alpha` is the damping parameter, and erc() and erfc() are
 error-function and complementary error-function terms.  This potential
 is essentially a short-range, spherically-truncated,
 charge-neutralized, shifted, pairwise *1/r* summation.  With a
 manipulation of adding and subtracting a self term (for i = j) to the
 first and second term on the right-hand-side, respectively, and a
-small enough *alpha* damping parameter, the second term shrinks and
+small enough :math:`\alpha` damping parameter, the second term shrinks and
 the potential becomes a rapidly-converging real-space summation.  With
-a long enough cutoff and small enough alpha parameter, the energy and
+a long enough cutoff and small enough :math:`\alpha` parameter, the energy and
 forces calculated by the Wolf summation method approach those of the
 Ewald sum.  So it is a means of getting effective long-range
 interactions with a short-range potential.
 
-
 ----------
 
-
 Style *coul/streitz* is the Coulomb pair interaction defined as part
 of the Streitz-Mintmire potential, as described in :ref:`this paper <Streitz2>`, in which charge distribution about an atom is modeled
 as a Slater 1\ *s* orbital.  More details can be found in the referenced
@@ -214,12 +212,11 @@ short-range potential that has been parameterized appropriately) via
 the :doc:`pair_style hybrid/overlay <pair_hybrid>` command.  Likewise,
 charge equilibration must be performed via the :doc:`fix qeq/slater <fix_qeq>` command. For example:
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    pair_style hybrid/overlay coul/streitz 12.0 wolf 0.31 eam/alloy
-   pair_coeff \* \* coul/streitz AlO.streitz Al O
-   pair_coeff \* \* eam/alloy AlO.eam.alloy Al O
+   pair_coeff * * coul/streitz AlO.streitz Al O
+   pair_coeff * * eam/alloy AlO.eam.alloy Al O
    fix 1 all qeq/slater 1 12.0 1.0e-6 100 coul/streitz
 
 The keyword *wolf* in the coul/streitz command denotes computing
@@ -228,8 +225,7 @@ parameter is required for the Wolf summation, as described for the
 coul/wolf potential above.  Alternatively, Coulombic interactions can
 be computed via an Ewald summation.  For example:
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    pair_style hybrid/overlay coul/streitz 12.0 ewald eam/alloy
    kspace_style ewald 1e-6
@@ -257,10 +253,8 @@ any other pair style such as EAM, MEAM, Tersoff, or LJ in
 hybrid/overlay mode.  To do this, you would need to provide a
 Streitz-Mintmire parameterization for the material being modeled.
 
-
 ----------
 
-
 Styles *coul/long* and *coul/msm* compute the same Coulombic
 interactions as style *coul/cut* except that an additional damping
 factor is applied so it can be used in conjunction with the
@@ -275,7 +269,7 @@ a massless site located a short distance away from the oxygen atom
 along the bisector of the HOH angle.  The atomic types of the oxygen and
 hydrogen atoms, the bond and angle types for OH and HOH interactions,
 and the distance to the massless charge site are specified as
-pair\_style arguments.  Style *tip4p/cut* uses a global cutoff for
+pair_style arguments.  Style *tip4p/cut* uses a global cutoff for
 Coulomb interactions; style *tip4p/long* is for use with a long-range
 Coulombic solver (Ewald or PPPM).
 
@@ -298,10 +292,8 @@ shrink the size of the neighbor list.  This leads to slightly larger
 cost for the long-range calculation, so you can test the trade-off for
 your model.
 
-
 ----------
 
-
 Note that these potentials are designed to be combined with other pair
 potentials via the :doc:`pair_style hybrid/overlay <pair_hybrid>`
 command.  This is because they have no repulsive core.  Hence if they
@@ -311,7 +303,7 @@ other.
 
 The following coefficients must be defined for each pair of atoms
 types via the :doc:`pair_coeff <pair_coeff>` command as in the examples
-above, or in the data file or restart files read by the
+above, or in the data or restart files read by the
 :doc:`read_data <read_data>` or :doc:`read_restart <read_restart>`
 commands, or by mixing as described below:
 
@@ -319,17 +311,15 @@ commands, or by mixing as described below:
 
 For *coul/cut* and *coul/debye*\ , the cutoff coefficient is optional.
 If it is not used (as in some of the examples above), the default
-global value specified in the pair\_style command is used.
+global value specified in the pair_style command is used.
 
 For *coul/long* and *coul/msm* no cutoff can be specified for an
-individual I,J type pair via the pair\_coeff command.  All type pairs
-use the same global Coulombic cutoff specified in the pair\_style
+individual I,J type pair via the pair_coeff command.  All type pairs
+use the same global Coulomb cutoff specified in the pair_style
 command.
 
-
 ----------
 
-
 Styles with a *gpu*\ , *intel*\ , *kk*\ , *omp*\ , or *opt* suffix are
 functionally the same as the corresponding style without the suffix.
 They have been optimized to run faster, depending on your available
@@ -348,15 +338,13 @@ by including their suffix, or you can use the :doc:`-suffix command-line switch
 See the :doc:`Speed packages <Speed_packages>` doc page for more
 instructions on how to use the accelerated styles effectively.
 
-
 ----------
 
-
 **Mixing, shift, table, tail correction, restart, rRESPA info**\ :
 
 For atom type pairs I,J and I != J, the cutoff distance for the
 *coul/cut* style can be mixed.  The default mix value is *geometric*\ .
-See the "pair\_modify" command for details.
+See the "pair_modify" command for details.
 
 The :doc:`pair_modify <pair_modify>` shift option is not relevant
 for these pair styles.
@@ -369,21 +357,18 @@ These pair styles do not support the :doc:`pair_modify <pair_modify>`
 tail option for adding long-range tail corrections to energy and
 pressure.
 
-These pair styles write their information to :doc:`binary restart files <restart>`, so pair\_style and pair\_coeff commands do not need
+These pair styles write their information to :doc:`binary restart files <restart>`, so pair_style and pair_coeff commands do not need
 to be specified in an input script that reads a restart file.
 
-This pair style can only be used via the *pair* keyword of the
-:doc:`run_style respa <run_style>` command.  It does not support the
+These pair styles can only be used via the *pair* keyword of the
+:doc:`run_style respa <run_style>` command.  They do not support the
 *inner*\ , *middle*\ , *outer* keywords.
 
-
 ----------
 
-
 Restrictions
 """"""""""""
 
-
 The *coul/long*\ , *coul/msm* and *tip4p/long* styles are part of the
 KSPACE package.  They are only enabled if LAMMPS was built with that
 package.  See the :doc:`Build package <Build_package>` doc page for more
@@ -392,43 +377,28 @@ info.
 Related commands
 """"""""""""""""
 
-:doc:`pair_coeff <pair_coeff>`, :doc:`pair\_style, hybrid/overlay <pair_hybrid>`, :doc:`kspace_style <kspace_style>`
+:doc:`pair_coeff <pair_coeff>`, :doc:`pair_style, hybrid/overlay <pair_hybrid>`, :doc:`kspace_style <kspace_style>`
 
 **Default:** none
 
-
 ----------
 
-
 .. _Wolf1:
 
-
-
 **(Wolf)** D. Wolf, P. Keblinski, S. R. Phillpot, J. Eggebrecht, J Chem
 Phys, 110, 8254 (1999).
 
 .. _Fennell1:
 
-
-
 **(Fennell)** C. J. Fennell, J. D. Gezelter, J Chem Phys, 124,
 234104 (2006).
 
 .. _Streitz2:
 
-
-
 **(Streitz)** F. H. Streitz, J. W. Mintmire, Phys Rev B, 50, 11996-12003
 (1994).
 
 .. _Jorgensen3:
 
-
-
 **(Jorgensen)** Jorgensen, Chandrasekhar, Madura, Impey, Klein, J Chem
 Phys, 79, 926 (1983).
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/pair_coul_diel.rst b/doc/src/pair_coul_diel.rst
index 0d98a22dc7..02ad620327 100644
--- a/doc/src/pair_coul_diel.rst
+++ b/doc/src/pair_coul_diel.rst
@@ -1,16 +1,15 @@
-.. index:: pair\_style coul/diel
+.. index:: pair_style coul/diel
 
-pair\_style coul/diel command
-=============================
+pair_style coul/diel command
+============================
 
-pair\_style coul/diel/omp command
-=================================
+pair_style coul/diel/omp command
+================================
 
 Syntax
 """"""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    pair_style coul/diel cutoff
 
@@ -19,8 +18,7 @@ cutoff = global cutoff (distance units)
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    pair_style coul/diel 3.5
    pair_coeff 1 4 78. 1.375 0.112
@@ -30,7 +28,7 @@ Description
 
 Style *coul/diel* computes a Coulomb correction for implicit solvent
 ion interactions in which the dielectric permittivity is distance dependent.
-The dielectric permittivity epsilon\_D(r) connects to limiting regimes:
+The dielectric permittivity epsilon_D(r) connects to limiting regimes:
 One limit is defined by a small dielectric permittivity (close to vacuum)
 at or close to contact separation between the ions. At larger separations
 the dielectric permittivity reaches a bulk value used in the regular Coulomb
@@ -38,16 +36,18 @@ interaction coul/long or coul/cut.
 The transition is modeled by a hyperbolic function which is incorporated
 in the Coulomb correction term for small ion separations as follows
 
-.. image:: Eqs/pair_coul_diel.jpg
-   :align: center
+.. math::
 
-where r\_me is the inflection point of epsilon\_D(r) and sigma\_e is a slope
+   E  = & \frac{Cq_iq_j}{\epsilon r} \left( \frac{\epsilon}{\epsilon_D(r)}-1\right)                       \qquad r < r_c \\
+   \epsilon_D(r)  = & \frac{5.2+\epsilon}{2} +  \frac{\epsilon-5.2}{2}\tanh\left(\frac{r-r_{me}}{\sigma_e}\right)
+
+where :math:`r_{me}` is the inflection point of :math:`\epsilon_D(r)` and :math:`\sigma_e` is a slope
 defining length scale. C is the same Coulomb conversion factor as in the
-pair\_styles coul/cut, coul/long, and coul/debye. In this way the Coulomb
+pair_styles coul/cut, coul/long, and coul/debye. In this way the Coulomb
 interaction between ions is corrected at small distances r. The lower
-limit of epsilon\_D(r->0)=5.2 due to dielectric saturation :ref:`(Stiles) <Stiles>`
+limit of epsilon_D(r->0)=5.2 due to dielectric saturation :ref:`(Stiles) <Stiles>`
 while the Coulomb interaction reaches its bulk limit by setting
-epsilon\_D(r->\infty)=epsilon, the bulk value of the solvent which is 78
+:math:`\epsilon_D(r \to \infty) = \epsilon`, the bulk value of the solvent which is 78
 for water at 298K.
 
 Examples of the use of this type of Coulomb interaction include implicit
@@ -63,16 +63,14 @@ above, or in the data file or restart files read by the
 :doc:`read_data <read_data>` or :doc:`read_restart <read_restart>`
 commands:
 
-* epsilon (no units)
-* r\_me (distance units)
-* sigma\_e (distance units)
-
-The global cutoff (r\_c) specified in the pair\_style command is used.
+* :math:`\epsilon` (no units)
+* :math:`r_{me}` (distance units)
+* :math:`\sigma_e` (distance units)
 
+The global cutoff (:math:`r_c`) specified in the pair_style command is used.
 
 ----------
 
-
 **Mixing, shift, table, tail correction, restart, rRESPA info**\ :
 
 This pair style does not support parameter mixing. Coefficients must
@@ -96,7 +94,6 @@ This pair style can only be used via the *pair* keyword of the
 Restrictions
 """"""""""""
 
-
 This style is part of the "USER-MISC" package.  It is only enabled if
 LAMMPS was built with that package.  See the :doc:`Build package <Build_package>` doc page for more info.
 
@@ -108,32 +105,19 @@ Related commands
 
 **Default:** none
 
-
 ----------
 
-
 .. _Stiles:
 
-
-
 **(Stiles)** Stiles , Hubbard, and Kayser, J Chem Phys, 77,
 6189 (1982).
 
 .. _Lenart1:
 
-
-
 **(Lenart)** Lenart , Jusufi, and Panagiotopoulos, J Chem Phys, 126,
 044509 (2007).
 
 .. _Jusufi1:
 
-
-
 **(Jusufi)** Jusufi, Hynninen, and Panagiotopoulos, J Phys Chem B, 112,
 13783 (2008).
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/pair_coul_shield.rst b/doc/src/pair_coul_shield.rst
index dff5869649..c9acbf40ef 100644
--- a/doc/src/pair_coul_shield.rst
+++ b/doc/src/pair_coul_shield.rst
@@ -1,24 +1,22 @@
-.. index:: pair\_style coul/shield
+.. index:: pair_style coul/shield
 
-pair\_style coul/shield command
-===============================
+pair_style coul/shield command
+==============================
 
 Syntax
 """"""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    pair_style coul/shield cutoff tap_flag
 
 * cutoff = global cutoff (distance units)
-* tap\_flag = 0/1 to turn off/on the taper function
+* tap_flag = 0/1 to turn off/on the taper function
 
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    pair_style coul/shield 16.0 1
    pair_coeff 1 2 0.70
@@ -39,27 +37,31 @@ the pair style :doc:`ilp/graphene/hbn <pair_ilp_graphene_hbn>`
    molecule id and is recommended to use the "full" atom style, so that
    charge and molecule ID information is included.
 
-.. image:: Eqs/pair_coul_shield.jpg
-   :align: center
+.. math::
 
-Where Tap(r\_ij) is the taper function which provides a continuous cutoff
-(up to third derivative) for inter-atomic separations larger than r\_c
+   E      = & \frac{1}{2} \sum_i \sum_{j \neq i} V_{ij} \\
+   V_{ij} = & {\rm Tap}(r_{ij})\frac{\kappa q_i q_j}{\sqrt[3]{r_{ij}^3+(1/\lambda_{ij})^3}}\\
+   {\rm Tap}(r_{ij}) = & 20\left ( \frac{r_{ij}}{R_{cut}} \right )^7 -
+                          70\left ( \frac{r_{ij}}{R_{cut}} \right )^6 +
+                          84\left ( \frac{r_{ij}}{R_{cut}} \right )^5 -
+                          35\left ( \frac{r_{ij}}{R_{cut}} \right )^4 + 1
+
+Where Tap(:math:`r_{ij}`) is the taper function which provides a continuous cutoff
+(up to third derivative) for inter-atomic separations larger than :math:`r_c`
 :ref:`(Leven1) <Leven3>`, :ref:`(Leven2) <Leven4>` and :ref:`(Maaravi) <Maaravi1>`.
-Here *lambda* is the shielding parameter that
+Here :math:`\lambda` is the shielding parameter that
 eliminates the short-range singularity of the classical mono-polar
 electrostatic interaction expression :ref:`(Maaravi) <Maaravi1>`.
 
-The shielding parameter *lambda* (1/distance units) must be defined for
+The shielding parameter :math:`\lambda` (1/distance units) must be defined for
 each pair of atom types via the :doc:`pair_coeff <pair_coeff>` command as
 in the example above, or in the data file or restart files read by the
 :doc:`read_data <read_data>` or :doc:`read_restart <read_restart>` commands:
 
-The global cutoff (r\_c) specified in the pair\_style command is used.
-
+The global cutoff (:math:`r_c`) specified in the pair_style command is used.
 
 ----------
 
-
 **Mixing, shift, table, tail correction, restart, rRESPA info**\ :
 
 This pair style does not support parameter mixing. Coefficients must
@@ -79,7 +81,6 @@ This pair style can only be used via the *pair* keyword of the
 Restrictions
 """"""""""""
 
-
 This style is part of the USER-MISC package.  It is only enabled if
 LAMMPS was built with that package.  See the :doc:`Build package <Build_package>` doc page for more info.
 
@@ -89,31 +90,18 @@ Related commands
 :doc:`pair_coeff <pair_coeff>`
 :doc:`pair_style ilp/graphene/hbn <pair_ilp_graphene_hbn>`
 
-**Default:** tap\_flag = 1
-
+**Default:** tap_flag = 1
 
 ----------
 
-
 .. _Leven3:
 
-
-
 **(Leven1)** I. Leven, I. Azuri, L. Kronik and O. Hod, J. Chem. Phys. 140, 104106 (2014).
 
 .. _Leven4:
 
-
-
 **(Leven2)** I. Leven et al, J. Chem.Theory Comput. 12, 2896-905 (2016).
 
 .. _Maaravi1:
 
-
-
 **(Maaravi)** T. Maaravi et al, J. Phys. Chem. C 121, 22826-22835 (2017).
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/pair_coul_slater.rst b/doc/src/pair_coul_slater.rst
new file mode 100644
index 0000000000..16db7c614a
--- /dev/null
+++ b/doc/src/pair_coul_slater.rst
@@ -0,0 +1,116 @@
+.. index:: pair_style coul/slater
+
+pair_style coul/slater/cut command
+==================================
+
+pair_style coul/slater/long command
+===================================
+
+Syntax
+""""""
+
+
+.. code-block:: LAMMPS
+
+   pair_style coul/slater/cut lambda cutoff
+   pair_style coul/slater/long lambda cutoff
+
+lambda = decay length of the charge (distance units)
+cutoff = cutoff (distance units)
+
+Examples
+""""""""
+
+
+.. code-block:: LAMMPS
+
+   pair_style coul/slater/cut 1.0 3.5
+   pair_coeff * *
+   pair_coeff 2 2 2.5
+
+   pair_style coul/slater/long 1.0 12.0
+   pair_coeff * *
+   pair_coeff 1 1 5.0
+
+Description
+"""""""""""
+
+Styles *coul/slater* compute electrostatic interactions in mesoscopic models
+which employ potentials without explicit excluded-volume interactions.
+The goal is to prevent artificial ionic pair formation by including a charge
+distribution in the Coulomb potential, following the formulation of
+:ref:`(Melchor) <Melchor>`:
+
+.. math::
+
+   E  =  \frac{Cq_iq_j}{\epsilon r} \left( 1- \left( 1 + \frac{r_{ij}}{\lambda} exp\left( -2r_{ij}/\lambda \right) \right) \right)                       \qquad r < r_c
+
+where :math:`r_c` is the cutoff distance and :math:`\lambda` is the decay length of the charge.
+C is the same Coulomb conversion factor as in the pair_styles coul/cut and coul/long. In this way the Coulomb
+interaction between ions is corrected at small distances r.
+For the *coul/slater/cut* style, the potential energy for distances larger than the cutoff is zero,
+while for the *coul/slater/long*, the long-range interactions are computed either by the Ewald or the PPPM technique.
+
+Phenomena that can be captured at a mesoscopic level using this type of electrostatic
+interactions include the formation of polyelectrolyte-surfactant aggregates,
+charge stabilization of colloidal suspensions, and the formation of
+complexes driven by charged species in biological systems. :ref:`(Vaiwala) <Vaiwala>`.
+
+The cutoff distance is optional. If it is not used,
+the default global value specified in the pair_style command is used.
+For each pair of atom types, a specific cutoff distance can be defined via the :doc:`pair_coeff <pair_coeff>` command as in the example
+above, or in the data file or restart files read by the
+:doc:`read_data <read_data>` or :doc:`read_restart <read_restart>`
+commands:
+
+* :math:`r_c` (distance units)
+
+The global decay length of the charge (:math:`\lambda`) specified in the pair_style command is used for all pairs.
+
+----------
+
+**Mixing, shift, table, tail correction, restart, rRESPA info**\ :
+
+For atom type pairs I,J and I != J, the cutoff distance for the
+*coul/slater* styles can be mixed.  The default mix value is *geometric*\ .
+See the "pair_modify" command for details.
+
+The :doc:`pair_modify <pair_modify>` shift and table options are not relevant
+for these pair styles.
+
+These pair styles do not support the :doc:`pair_modify <pair_modify>`
+tail option for adding long-range tail corrections to energy and
+pressure.
+
+These pair styles write their information to :doc:`binary restart files <restart>`, so pair_style and pair_coeff commands do not need
+to be specified in an input script that reads a restart file.
+
+This pair style can only be used via the *pair* keyword of the
+:doc:`run_style respa <run_style>` command.  It does not support the
+*inner*\ , *middle*\ , *outer* keywords.
+
+Restrictions
+""""""""""""
+
+The  *coul/slater/long* style requires the long-range solvers included in the KSPACE package.
+
+These styles are part of the "USER-MISC" package.  They are only enabled if
+LAMMPS was built with that package.  See the :doc:`Build package <Build_package>` doc page for more info.
+
+Related commands
+""""""""""""""""
+
+:doc:`pair_coeff <pair_coeff>`, :doc:`pair_style, hybrid/overlay <pair_hybrid>`, :doc:`kspace_style <kspace_style>`
+
+**Default:** none
+
+----------
+
+.. _Melchor:
+
+**(Melchor)** Gonzalez-Melchor, Mayoral, Velazquez, and Alejandre, J Chem Phys, 125, 224107 (2006).
+
+.. _Vaiwala:
+
+**(Vaiwala)** Vaiwala, Jadhav, and Thaokar, J Chem Phys, 146, 124904 (2017).
+
diff --git a/doc/src/pair_cs.rst b/doc/src/pair_cs.rst
index 000f8df3eb..72332a87b2 100644
--- a/doc/src/pair_cs.rst
+++ b/doc/src/pair_cs.rst
@@ -1,47 +1,45 @@
-.. index:: pair\_style born/coul/dsf/cs
+.. index:: pair_style born/coul/dsf/cs
 
-pair\_style born/coul/dsf/cs command
+pair_style born/coul/dsf/cs command
 ====================================
 
-pair\_style born/coul/long/cs command
+pair_style born/coul/long/cs command
 =====================================
 
-pair\_style born/coul/long/cs/gpu command
+pair_style born/coul/long/cs/gpu command
 =========================================
 
-pair\_style born/coul/wolf/cs command
+pair_style born/coul/wolf/cs command
 =====================================
 
-pair\_style born/coul/wolf/cs/gpu command
+pair_style born/coul/wolf/cs/gpu command
 =========================================
 
-pair\_style buck/coul/long/cs command
+pair_style buck/coul/long/cs command
 =====================================
 
-pair\_style coul/long/cs command
+pair_style coul/long/cs command
 ================================
 
-pair\_style coul/long/cs/gpu command
+pair_style coul/long/cs/gpu command
 ====================================
 
-pair\_style coul/wolf/cs command
+pair_style coul/wolf/cs command
 ================================
 
-pair\_style lj/cut/coul/long/cs command
+pair_style lj/cut/coul/long/cs command
 =======================================
 
 Syntax
 """"""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    pair_style style args
 
 * style = *born/coul/dsf/cs* or *born/coul/long/cs* or *born/coul/wolf/cs* or *buck/coul/long/cs* or *coul/long/cs* or *coul/wolf/cs* or *lj/cut/coul/long/cs*
 * args = list of arguments for a particular style
 
-
 .. parsed-literal::
 
      *born/coul/dsf/cs* args = alpha cutoff (cutoff2)
@@ -70,34 +68,33 @@ Syntax
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    pair_style born/coul/dsf/cs 0.1 10.0 12.0
-   pair_coeff \* \*   0.0 1.00 0.00 0.00 0.00
+   pair_coeff * *   0.0 1.00 0.00 0.00 0.00
    pair_coeff 1 1 480.0 0.25 0.00 1.05 0.50
 
    pair_style born/coul/long/cs 10.0 8.0
    pair_coeff 1 1 6.08 0.317 2.340 24.18 11.51
 
    pair_style born/coul/wolf/cs 0.25 10.0 12.0
-   pair_coeff \* \*   0.0 1.00 0.00 0.00 0.00
+   pair_coeff * *   0.0 1.00 0.00 0.00 0.00
    pair_coeff 1 1 480.0 0.25 0.00 1.05 0.50
 
    pair_style buck/coul/long/cs 10.0
    pair_style buck/coul/long/cs 10.0 8.0
-   pair_coeff \* \* 100.0 1.5 200.0
+   pair_coeff * * 100.0 1.5 200.0
    pair_coeff 1 1 100.0 1.5 200.0 9.0
 
    pair_style coul/long/cs 10.0
-   pair_coeff \* \*
+   pair_coeff * *
 
    pair_style coul/wolf/cs 0.2 9.0
-   pair_coeff \* \*
+   pair_coeff * *
 
    pair_style lj/cut/coul/long/cs 10.0
    pair_style lj/cut/coul/long/cs 10.0 8.0
-   pair_coeff \* \* 100.0 3.0
+   pair_coeff * * 100.0 3.0
    pair_coeff 1 1 100.0 3.5 9.0
 
 Description
@@ -135,25 +132,24 @@ to 0.0, which works because the core and shell atoms are bonded to
 each other.  This induces a long-range correction approximation which
 fails at small distances (~< 10e-8). Therefore, the Coulomb term which
 is used to calculate the correction factor is extended by a minimal
-distance (r\_min = 1.0-6) when the interaction between a core/shell
+distance (r_min = 1.0-6) when the interaction between a core/shell
 pair is treated, as follows
 
-.. image:: Eqs/pair_cs.jpg
-   :align: center
+.. math::
 
-where C is an energy-conversion constant, Qi and Qj are the charges on
-the core and shell, epsilon is the dielectric constant and r\_min is the
-minimal distance.
+   E = \frac{C q_i q_j}{\epsilon (r + r_{min})} \qquad r \rightarrow 0
+
+where C is an energy-conversion constant, :math:`q_i` and :math:`q_j`
+are the charges on the core and shell, epsilon is the dielectric
+constant and :math:`r_{min}` is the minimal distance.
 
 For styles that are not used with a long-range solver, i.e. those with
 "/dsf" or "/wolf" in the name, the only correction is the addition of
 a minimal distance to avoid the possible r = 0.0 case for a core/shell
 pair.
 
-
 ----------
 
-
 Styles with a *gpu*\ , *intel*\ , *kk*\ , *omp*\ , or *opt* suffix are
 functionally the same as the corresponding style without the suffix.
 They have been optimized to run faster, depending on your available
@@ -172,24 +168,19 @@ by including their suffix, or you can use the :doc:`-suffix command-line switch
 See the :doc:`Speed packages <Speed_packages>` doc page for more
 instructions on how to use the accelerated styles effectively.
 
-
 ----------
 
-
 **Mixing, shift, table, tail correction, restart, rRESPA info**\ :
 
 See the corresponding doc pages for pair styles without the "cs"
 suffix to see how mixing, shifting, tabulation, tail correction,
 restarting, and rRESPA are handled by theses pair styles.
 
-
 ----------
 
-
 Restrictions
 """"""""""""
 
-
 These pair styles are part of the CORESHELL package.  They are only
 enabled if LAMMPS was built with that package.  See the :doc:`Build package <Build_package>` doc page for more info.
 
@@ -201,18 +192,9 @@ Related commands
 
 **Default:** none
 
-
 ----------
 
-
 .. _MitchellFinchham2:
 
-
-
 **(Mitchell and Finchham)** Mitchell, Finchham, J Phys Condensed Matter,
 5, 1031-1038 (1993).
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/pair_dipole.rst b/doc/src/pair_dipole.rst
index 9b9d969215..38731dcb6d 100644
--- a/doc/src/pair_dipole.rst
+++ b/doc/src/pair_dipole.rst
@@ -1,37 +1,36 @@
-.. index:: pair\_style lj/cut/dipole/cut
+.. index:: pair_style lj/cut/dipole/cut
 
-pair\_style lj/cut/dipole/cut command
-=====================================
+pair_style lj/cut/dipole/cut command
+====================================
 
-pair\_style lj/cut/dipole/cut/gpu command
-=========================================
+pair_style lj/cut/dipole/cut/gpu command
+========================================
 
-pair\_style lj/cut/dipole/cut/omp command
-=========================================
+pair_style lj/cut/dipole/cut/omp command
+========================================
 
-pair\_style lj/sf/dipole/sf command
-===================================
+pair_style lj/sf/dipole/sf command
+==================================
 
-pair\_style lj/sf/dipole/sf/gpu command
-=======================================
-
-pair\_style lj/sf/dipole/sf/omp command
-=======================================
-
-pair\_style lj/cut/dipole/long command
+pair_style lj/sf/dipole/sf/gpu command
 ======================================
 
-pair\_style lj/cut/dipole/long/gpu command
-==========================================
+pair_style lj/sf/dipole/sf/omp command
+======================================
 
-pair\_style lj/long/dipole/long command
-=======================================
+pair_style lj/cut/dipole/long command
+=====================================
+
+pair_style lj/cut/dipole/long/gpu command
+=========================================
+
+pair_style lj/long/dipole/long command
+======================================
 
 Syntax
 """"""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    pair_style lj/cut/dipole/cut cutoff (cutoff2)
    pair_style lj/sf/dipole/sf cutoff (cutoff2)
@@ -40,44 +39,41 @@ Syntax
 
 * cutoff = global cutoff LJ (and Coulombic if only 1 arg) (distance units)
 * cutoff2 = global cutoff for Coulombic and dipole (optional) (distance units)
-* flag\_lj = *long* or *cut* or *off*
-  
+* flag_lj = *long* or *cut* or *off*
+
   .. parsed-literal::
-  
+
        *long* = use long-range damping on dispersion 1/r\^6 term
        *cut* = use a cutoff on dispersion 1/r\^6 term
        *off* = omit disperion 1/r\^6 term entirely
 
-* flag\_coul = *long* or *off*
-  
+* flag_coul = *long* or *off*
+
   .. parsed-literal::
-  
+
        *long* = use long-range damping on Coulombic 1/r and point-dipole terms
        *off* = omit Coulombic and point-dipole terms entirely
 
-
-
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    pair_style lj/cut/dipole/cut 10.0
-   pair_coeff \* \* 1.0 1.0
+   pair_coeff * * 1.0 1.0
    pair_coeff 2 3 1.0 1.0 2.5 4.0
 
    pair_style lj/sf/dipole/sf 9.0
-   pair_coeff \* \* 1.0 1.0
+   pair_coeff * * 1.0 1.0
    pair_coeff 2 3 1.0 1.0 2.5 4.0 scale 0.5
    pair_coeff 2 3 1.0 1.0 2.5 4.0
 
    pair_style lj/cut/dipole/long 10.0
-   pair_coeff \* \* 1.0 1.0
+   pair_coeff * * 1.0 1.0
    pair_coeff 2 3 1.0 1.0 2.5 4.0
 
    pair_style lj/long/dipole/long long long 3.5 10.0
-   pair_coeff \* \* 1.0 1.0
+   pair_coeff * * 1.0 1.0
    pair_coeff 2 3 1.0 1.0 2.5 4.0
 
 Description
@@ -90,19 +86,44 @@ charge-charge (Eqq), charge-dipole (Eqp), and dipole-dipole (Epp)
 interactions are computed by these formulas for the energy (E), force
 (F), and torque (T) between particles I and J.
 
-.. image:: Eqs/pair_dipole.jpg
-   :align: center
+.. math::
 
-where qi and qj are the charges on the two particles, pi and pj are
-the dipole moment vectors of the two particles, r is their separation
-distance, and the vector r = Ri - Rj is the separation vector between
-the two particles.  Note that Eqq and Fqq are simply Coulombic energy
-and force, Fij = -Fji as symmetric forces, and Tij != -Tji since the
-torques do not act symmetrically.  These formulas are discussed in
-:ref:`(Allen) <Allen2>` and in :ref:`(Toukmaji) <Toukmaji2>`.
+   E_{LJ}  = & 4 \epsilon \left[ \left(\frac{\sigma}{r}\right)^{12} -
+                        \left(\frac{\sigma}{r}\right)^6 \right] \\
+   E_{qq}  = & \frac{q_i q_j}{r} \\
+   E_{qp}  = & \frac{q}{r^3} (p \bullet \vec{r}) \\
+   E_{pp}  = & \frac{1}{r^3} (\vec{p_i} \bullet \vec{p_j}) -
+             \frac{3}{r^5} (\vec{p_i} \bullet \vec{r}) (\vec{p_j} \bullet \vec{r}) \\
+             & \\
+   F_{qq}  = & \frac{q_i q_j}{r^3} \vec{r} \\
+   F_{qp}  = & -\frac{q}{r^3} \vec{p} + \frac{3q}{r^5}
+             (\vec{p} \bullet \vec{r}) \vec{r} \\
+   F_{pp}  = & \frac{3}{r^5} (\vec{p_i} \bullet \vec{p_j}) \vec{r} -
+             \frac{15}{r^7} (\vec{p_i} \bullet \vec{r})
+             (\vec{p_j} \bullet \vec{r}) \vec{r} +
+             \frac{3}{r^5} \left[ (\vec{p_j} \bullet \vec{r}) \vec{p_i} +
+             (\vec{p_i} \bullet \vec{r}) \vec{p_j} \right] \\
+             & \\
+   T_{pq} = T_{ij}  = & \frac{q_j}{r^3} (\vec{p_i} \times \vec{r}) \\
+   T_{qp} = T_{ji}  = & - \frac{q_i}{r^3} (\vec{p_j} \times \vec{r}) \\
+   T_{pp} = T_{ij}  = & -\frac{1}{r^3} (\vec{p_i} \times \vec{p_j}) +
+                      \frac{3}{r^5} (\vec{p_j} \bullet \vec{r})
+                      (\vec{p_i} \times \vec{r}) \\
+   T_{pp} = T_{ji}  = & -\frac{1}{r^3} (\vec{p_j} \times \vec{p_i}) +
+                      \frac{3}{r^5} (\vec{p_i} \bullet \vec{r})
+                      (\vec{p_j} \times \vec{r})
+
+where :math:`q_i` and :math:`q_j` are the charges on the two particles,
+:math:`\vec{p_i}` and :math:`\vec{p_j}` are the dipole moment vectors of
+the two particles, r is their separation distance, and the vector r =
+Ri - Rj is the separation vector between the two particles.  Note that
+Eqq and Fqq are simply Coulombic energy and force, Fij = -Fji as
+symmetric forces, and Tij != -Tji since the torques do not act
+symmetrically.  These formulas are discussed in :ref:`(Allen) <Allen2>`
+and in :ref:`(Toukmaji) <Toukmaji2>`.
 
 Also note, that in the code, all of these terms (except Elj) have a
-C/epsilon prefactor, the same as the Coulombic term in the LJ +
+:math:`C/\epsilon` prefactor, the same as the Coulombic term in the LJ +
 Coulombic pair styles discussed :doc:`here <pair_lj>`.  C is an
 energy-conversion constant and epsilon is the dielectric constant
 which can be set by the :doc:`dielectric <dielectric>` command.  The
@@ -116,37 +137,95 @@ potential containing extra terms that make both the energy and its
 derivative go to zero at the cutoff distance; this removes
 (cutoff-related) problems in energy conservation and any numerical
 instability in the equations of motion :ref:`(Allen) <Allen2>`. Shifted-force
-interactions for the Lennard-Jones (E\_LJ), charge-charge (Eqq),
+interactions for the Lennard-Jones (E_LJ), charge-charge (Eqq),
 charge-dipole (Eqp), dipole-charge (Epq) and dipole-dipole (Epp)
 potentials are computed by these formulas for the energy (E), force
 (F), and torque (T) between particles I and J:
 
-.. image:: Eqs/pair_dipole_sf.jpg
-   :align: center
+.. math::
 
-.. image:: Eqs/pair_dipole_sf2.jpg
-   :align: center
+   E_{LJ}  = &  4\epsilon \left\{ \left[ \left( \frac{\sigma}{r} \right)^{\!12} -
+  \left( \frac{\sigma}{r} \right)^{\!6}  \right] +
+  \left[ 6\left( \frac{\sigma}{r_c} \right)^{\!12} -
+  3\left(\frac{\sigma}{r_c}\right)^{\!6}\right]\left(\frac{r}{r_c}\right)^{\!2}
+  - 7\left( \frac{\sigma}{r_c} \right)^{\!12} +
+  4\left( \frac{\sigma}{r_c} \right)^{\!6}\right\} \\
+  E_{qq}  = & \frac{q_i q_j}{r}\left(1-\frac{r}{r_c}\right)^{\!2} \\
+  E_{pq}  = & E_{ji} = -\frac{q}{r^3} \left[ 1 -
+  3\left(\frac{r}{r_c}\right)^{\!2} +
+  2\left(\frac{r}{r_c}\right)^{\!3}\right] (\vec{p}\bullet\vec{r}) \\
+  E_{qp}  = & E_{ij} = \frac{q}{r^3} \left[ 1 -
+  3\left(\frac{r}{r_c}\right)^{\!2} +
+  2\left(\frac{r}{r_c}\right)^{\!3}\right] (\vec{p}\bullet\vec{r}) \\
+  E_{pp} = & \left[1-4\left(\frac{r}{r_c}\right)^{\!3} +
+  3\left(\frac{r}{r_c}\right)^{\!4}\right]\left[\frac{1}{r^3}
+  (\vec{p_i} \bullet \vec{p_j}) - \frac{3}{r^5}
+  (\vec{p_i} \bullet \vec{r}) (\vec{p_j} \bullet \vec{r})\right] \\
+           & \\
 
-where epsilon and sigma are the standard LJ parameters, r\_c is the
-cutoff, qi and qj are the charges on the two particles, pi and pj are
-the dipole moment vectors of the two particles, r is their separation
-distance, and the vector r = Ri - Rj is the separation vector between
-the two particles.  Note that Eqq and Fqq are simply Coulombic energy
-and force, Fij = -Fji as symmetric forces, and Tij != -Tji since the
-torques do not act symmetrically.  The shifted-force formula for the
-Lennard-Jones potential is reported in :ref:`(Stoddard) <Stoddard>`.  The
-original (non-shifted) formulas for the electrostatic potentials,
-forces and torques can be found in :ref:`(Price) <Price2>`. The shifted-force
-electrostatic potentials have been obtained by applying equation 5.13
-of :ref:`(Allen) <Allen2>`. The formulas for the corresponding forces and
-torques have been obtained by applying the 'chain rule' as in appendix
-C.3 of :ref:`(Allen) <Allen2>`.
+  F_{LJ}  = & \left\{\left[48\epsilon \left(\frac{\sigma}{r}\right)^{\!12} -
+  24\epsilon \left(\frac{\sigma}{r}\right)^{\!6} \right]\frac{1}{r^2} -
+  \left[48\epsilon \left(\frac{\sigma}{r_c}\right)^{\!12} - 24\epsilon
+  \left(\frac{\sigma}{r_c}\right)^{\!6} \right]\frac{1}{r_c^2}\right\}\vec{r}\\
+  F_{qq}  = & \frac{q_i q_j}{r}\left(\frac{1}{r^2} -
+  \frac{1}{r_c^2}\right)\vec{r} \\
+  F_{pq} = & F_{ij } =  -\frac{3q}{r^5} \left[ 1 -
+  \left(\frac{r}{r_c}\right)^{\!2}\right](\vec{p}\bullet\vec{r})\vec{r} +
+  \frac{q}{r^3}\left[1-3\left(\frac{r}{r_c}\right)^{\!2} +
+  2\left(\frac{r}{r_c}\right)^{\!3}\right] \vec{p} \\
+  F_{qp} = & F_{ij}  = \frac{3q}{r^5} \left[ 1 -
+  \left(\frac{r}{r_c}\right)^{\!2}\right] (\vec{p}\bullet\vec{r})\vec{r} -
+  \frac{q}{r^3}\left[1-3\left(\frac{r}{r_c}\right)^{\!2} +
+  2\left(\frac{r}{r_c}\right)^{\!3}\right] \vec{p} \\
+  F_{pp}  = &\frac{3}{r^5}\Bigg\{\left[1-\left(\frac{r}{r_c}\right)^{\!4}\right]
+  \left[(\vec{p_i}\bullet\vec{p_j}) - \frac{3}{r^2} (\vec{p_i}\bullet\vec{r})
+  (\vec{p_j} \bullet \vec{r})\right] \vec{r} + \\
+    & \left[1 -
+  4\left(\frac{r}{r_c}\right)^{\!3}+3\left(\frac{r}{r_c}\right)^{\!4}\right]
+  \left[ (\vec{p_j} \bullet \vec{r}) \vec{p_i} + (\vec{p_i} \bullet \vec{r})
+  \vec{p_j} -\frac{2}{r^2} (\vec{p_i} \bullet \vec{r})
+  (\vec{p_j} \bullet \vec{r})\vec{r}\right] \Bigg\}
 
-If one cutoff is specified in the pair\_style command, it is used for
+.. math::
+
+   T_{pq} = T_{ij}  = & \frac{q_j}{r^3} \left[ 1 -
+  3\left(\frac{r}{r_c}\right)^{\!2} +
+  2\left(\frac{r}{r_c}\right)^{\!3}\right] (\vec{p_i}\times\vec{r}) \\
+  T_{qp} = T_{ji}  = & - \frac{q_i}{r^3} \left[ 1 -
+  3\left(\frac{r}{r_c}\right)^{\!2} +
+  2\left(\frac{r}{r_c}\right)^{\!3} \right] (\vec{p_j}\times\vec{r}) \\
+  T_{pp} = T_{ij}  = & -\frac{1}{r^3}\left[1-4\left(\frac{r}{r_c}\right)^{\!3} +
+  e3\left(\frac{r}{r_c}\right)^{\!4}\right] (\vec{p_i} \times \vec{p_j}) + \\
+                     & \frac{3}{r^5}\left[1-4\left(\frac{r}{r_c}\right)^{\!3} +
+  3\left(\frac{r}{r_c}\right)^{\!4}\right] (\vec{p_j}\bullet\vec{r})
+  (\vec{p_i} \times \vec{r}) \\
+  T_{pp} = T_{ji} = & -\frac{1}{r^3}\left[1-4\left(\frac{r}{r_c}\right)^{\!3} +
+  3\left(\frac{r}{r_c}\right)^{\!4}\right](\vec{p_j} \times \vec{p_i}) + \\
+                     & \frac{3}{r^5}\left[1-4\left(\frac{r}{r_c}\right)^{\!3} +
+  3\left(\frac{r}{r_c}\right)^{\!4}\right] (\vec{p_i} \bullet \vec{r})
+  (\vec{p_j} \times \vec{r})
+
+where :math:`\epsilon` and :math:`\sigma` are the standard LJ
+parameters, :math:`r_c` is the cutoff, :math:`q_i` and :math:`q_j` are
+the charges on the two particles, :math:`\vec{p_i}` and
+:math:`\vec{p_j}` are the dipole moment vectors of the two particles, r
+is their separation distance, and the vector r = Ri - Rj is the
+separation vector between the two particles.  Note that Eqq and Fqq are
+simply Coulombic energy and force, Fij = -Fji as symmetric forces, and
+Tij != -Tji since the torques do not act symmetrically.  The
+shifted-force formula for the Lennard-Jones potential is reported in
+:ref:`(Stoddard) <Stoddard>`.  The original (non-shifted) formulas for
+the electrostatic potentials, forces and torques can be found in
+:ref:`(Price) <Price2>`. The shifted-force electrostatic potentials have
+been obtained by applying equation 5.13 of :ref:`(Allen) <Allen2>`. The
+formulas for the corresponding forces and torques have been obtained by
+applying the 'chain rule' as in appendix C.3 of :ref:`(Allen) <Allen2>`.
+
+If one cutoff is specified in the pair_style command, it is used for
 both the LJ and Coulombic (q,p) terms.  If two cutoffs are specified,
 they are used as cutoffs for the LJ and Coulombic (q,p) terms
 respectively. This pair style also supports an optional *scale* keyword
-as part of a pair\_coeff statement, where the interactions can be
+as part of a pair_coeff statement, where the interactions can be
 scaled according to this factor. This scale factor is also made available
 for use with fix adapt.
 
@@ -164,19 +243,19 @@ dipole-charge, and charge-charge interactions are all supported, along
 with the standard 12/6 Lennard-Jones interactions.  LJ interactions
 can be cutoff or long-ranged.
 
-For style *lj/long/dipole/long*\ , if *flag\_lj* is set to *long*\ , no
+For style *lj/long/dipole/long*\ , if *flag_lj* is set to *long*\ , no
 cutoff is used on the LJ 1/r\^6 dispersion term.  The long-range
-portion is calculated by using the :doc:`kspace_style ewald\_disp <kspace_style>` command.  The specified LJ cutoff then
+portion is calculated by using the :doc:`kspace_style ewald_disp <kspace_style>` command.  The specified LJ cutoff then
 determines which portion of the LJ interactions are computed directly
 by the pair potential versus which part is computed in reciprocal
-space via the Kspace style.  If *flag\_lj* is set to *cut*\ , the LJ
-interactions are simply cutoff, as with :doc:`pair_style lj/cut <pair_lj>`.  If *flag\_lj* is set to *off*\ , LJ interactions
+space via the Kspace style.  If *flag_lj* is set to *cut*\ , the LJ
+interactions are simply cutoff, as with :doc:`pair_style lj/cut <pair_lj>`.  If *flag_lj* is set to *off*\ , LJ interactions
 are not computed at all.
 
-If *flag\_coul* is set to *long*\ , no cutoff is used on the Coulombic or
+If *flag_coul* is set to *long*\ , no cutoff is used on the Coulombic or
 dipole interactions.  The long-range portion is calculated by using
-*ewald\_disp* of the :doc:`kspace_style <kspace_style>` command. If
-*flag\_coul* is set to *off*\ , Coulombic and dipole interactions are not
+*ewald_disp* of the :doc:`kspace_style <kspace_style>` command. If
+*flag_coul* is set to *off*\ , Coulombic and dipole interactions are not
 computed at all.
 
 Atoms with dipole moments should be integrated using the :doc:`fix nve/sphere update dipole <fix_nve_sphere>` or the :doc:`fix nvt/sphere update dipole <fix_nvt_sphere>` command to rotate the
@@ -195,22 +274,20 @@ above, or in the data file or restart files read by the
 :doc:`read_data <read_data>` or :doc:`read_restart <read_restart>`
 commands, or by mixing as described below:
 
-* epsilon (energy units)
-* sigma (distance units)
+* :math:`\epsilon` (energy units)
+* :math:`\sigma` (distance units)
 * cutoff1 (distance units)
 * cutoff2 (distance units)
 
 The latter 2 coefficients are optional.  If not specified, the global
-LJ and Coulombic cutoffs specified in the pair\_style command are used.
+LJ and Coulombic cutoffs specified in the pair_style command are used.
 If only one cutoff is specified, it is used as the cutoff for both LJ
 and Coulombic interactions for this type pair.  If both coefficients
 are specified, they are used as the LJ and Coulombic cutoffs for this
 type pair.
 
-
 ----------
 
-
 Styles with a *gpu*\ , *intel*\ , *kk*\ , *omp*\ , or *opt* suffix are
 functionally the same as the corresponding style without the suffix.
 They have been optimized to run faster, depending on your available
@@ -229,21 +306,19 @@ by including their suffix, or you can use the :doc:`-suffix command-line switch
 See the :doc:`Speed packages <Speed_packages>` doc page for more
 instructions on how to use the accelerated styles effectively.
 
-
 ----------
 
-
 **Mixing, shift, table, tail correction, restart, rRESPA info**\ :
 
 For atom type pairs I,J and I != J, the epsilon and sigma coefficients
 and cutoff distances for this pair style can be mixed.  The default
-mix value is *geometric*\ .  See the "pair\_modify" command for details.
+mix value is *geometric*\ .  See the "pair_modify" command for details.
 
 For atom type pairs I,J and I != J, the A, sigma, d1, and d2
 coefficients and cutoff distance for this pair style can be mixed.  A
 is an energy value mixed like a LJ epsilon.  D1 and d2 are distance
 values and are mixed like sigma.  The default mix value is
-*geometric*\ .  See the "pair\_modify" command for details.
+*geometric*\ .  See the "pair_modify" command for details.
 
 This pair style does not support the :doc:`pair_modify <pair_modify>`
 shift option for the energy of the Lennard-Jones portion of the pair
@@ -256,7 +331,7 @@ This pair style does not support the :doc:`pair_modify <pair_modify>`
 tail option for adding long-range tail corrections to energy and
 pressure.
 
-This pair style writes its information to :doc:`binary restart files <restart>`, so pair\_style and pair\_coeff commands do not need
+This pair style writes its information to :doc:`binary restart files <restart>`, so pair_style and pair_coeff commands do not need
 to be specified in an input script that reads a restart file.
 
 This pair style can only be used via the *pair* keyword of the
@@ -266,7 +341,6 @@ This pair style can only be used via the *pair* keyword of the
 Restrictions
 """"""""""""
 
-
 The *lj/cut/dipole/cut*\ , *lj/cut/dipole/long*\ , and
 *lj/long/dipole/long* styles are part of the DIPOLE package.  They are
 only enabled if LAMMPS was built with that package.  See the :doc:`Build package <Build_package>` doc page for more info.
@@ -285,37 +359,22 @@ Related commands
 
 **Default:** none
 
-
 ----------
 
-
 .. _Allen2:
 
-
-
 **(Allen)** Allen and Tildesley, Computer Simulation of Liquids,
 Clarendon Press, Oxford, 1987.
 
 .. _Toukmaji2:
 
-
-
 **(Toukmaji)** Toukmaji, Sagui, Board, and Darden, J Chem Phys, 113,
 10913 (2000).
 
 .. _Stoddard:
 
-
-
 **(Stoddard)** Stoddard and Ford, Phys Rev A, 8, 1504 (1973).
 
 .. _Price2:
 
-
-
 **(Price)** Price, Stone and Alderton, Mol Phys, 52, 987 (1984).
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/pair_dpd.rst b/doc/src/pair_dpd.rst
index aceef23179..0a078585c6 100644
--- a/doc/src/pair_dpd.rst
+++ b/doc/src/pair_dpd.rst
@@ -1,31 +1,30 @@
-.. index:: pair\_style dpd
+.. index:: pair_style dpd
 
-pair\_style dpd command
-=======================
+pair_style dpd command
+======================
 
-pair\_style dpd/gpu command
-===========================
+pair_style dpd/gpu command
+==========================
 
-pair\_style dpd/intel command
-=============================
+pair_style dpd/intel command
+============================
 
-pair\_style dpd/omp command
-===========================
+pair_style dpd/omp command
+==========================
 
-pair\_style dpd/tstat command
-=============================
+pair_style dpd/tstat command
+============================
 
-pair\_style dpd/tstat/gpu command
-=================================
+pair_style dpd/tstat/gpu command
+================================
 
-pair\_style dpd/tstat/omp command
-=================================
+pair_style dpd/tstat/omp command
+================================
 
 Syntax
 """"""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    pair_style dpd T cutoff seed
    pair_style dpd/tstat Tstart Tstop cutoff seed
@@ -38,15 +37,14 @@ Syntax
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    pair_style dpd 1.0 2.5 34387
-   pair_coeff \* \* 3.0 1.0
+   pair_coeff * * 3.0 1.0
    pair_coeff 1 1 3.0 1.0 1.0
 
    pair_style dpd/tstat 1.0 1.0 2.5 34387
-   pair_coeff \* \* 1.0
+   pair_coeff * * 1.0
    pair_coeff 1 1 1.0 1.0
 
 Description
@@ -67,17 +65,24 @@ pair interaction and the thermostat for each pair of particles.
 For style *dpd*\ , the force on atom I due to atom J is given as a sum
 of 3 terms
 
-.. image:: Eqs/pair_dpd.jpg
-   :align: center
+.. math::
 
-where Fc is a conservative force, Fd is a dissipative force, and Fr is
-a random force.  Rij is a unit vector in the direction Ri - Rj, Vij is
-the vector difference in velocities of the two atoms = Vi - Vj, alpha
-is a Gaussian random number with zero mean and unit variance, dt is
-the timestep size, and w(r) is a weighting factor that varies between
-0 and 1.  Rc is the cutoff.  Sigma is set equal to sqrt(2 Kb T gamma),
-where Kb is the Boltzmann constant and T is the temperature parameter
-in the pair\_style command.
+   \vec{f}  = & (F^C + F^D + F^R) \hat{r_{ij}} \qquad \qquad r < r_c \\
+   F^C      = & A w(r) \\
+   F^D      = & - \gamma w^2(r) (\hat{r_{ij}} \bullet \vec{v_{ij}}) \\
+   F^R      = & \sigma w(r) \alpha (\Delta t)^{-1/2} \\
+   w(r)     = & 1 - r/r_c
+
+where :math:`F^C` is a conservative force, :math:`F^D` is a dissipative
+force, and :math:`F^R` is a random force.  :math:`r_{ij}` is a unit
+vector in the direction :math:`r_i - r_j`, :math:`V_{ij} is the vector
+difference in velocities of the two atoms :math:`= \vec{v}_i -
+\vec{v}_j, :math:`\alpha` is a Gaussian random number with zero mean and
+unit variance, dt is the timestep size, and w(r) is a weighting factor
+that varies between 0 and 1.  :math:`r_c` is the cutoff.  :math:`\sigma`
+is set equal to :math:`\sqrt{2 k_B T \gamma}`, where :math:`k_B` is the
+Boltzmann constant and T is the temperature parameter in the pair_style
+command.
 
 For style *dpd/tstat*\ , the force on atom I due to atom J is the same
 as the above equation, except that the conservative Fc term is
@@ -97,7 +102,7 @@ the examples above, or in the data file or restart files read by the
 commands:
 
 * A (force units)
-* gamma (force/velocity units)
+* :math:`\gamma` (force/velocity units)
 * cutoff (distance units)
 
 The last coefficient is optional.  If not specified, the global DPD
@@ -121,14 +126,17 @@ the work of :ref:`(Afshar) <Afshar>` and :ref:`(Phillips) <Phillips>`.
 
 .. note::
 
-   The virial calculation for pressure when using this pair style
+   The virial calculation for pressure when using these pair styles
    includes all the components of force listed above, including the
-   random force.
-
+   random force.  Since the random force depends on random numbers,
+   everything that changes the order of atoms in the neighbor list
+   (e.g. different number of MPI ranks or a different neighbor list
+   skin distance) will also change the sequence in which the random
+   numbers are applied and thus the individual forces and therefore
+   also the virial/pressure.
 
 ----------
 
-
 Styles with a *gpu*\ , *intel*\ , *kk*\ , *omp*\ , or *opt* suffix are
 functionally the same as the corresponding style without the suffix.
 They have been optimized to run faster, depending on your available
@@ -147,10 +155,8 @@ by including their suffix, or you can use the :doc:`-suffix command-line switch
 See the :doc:`Speed packages <Speed_packages>` doc page for more
 instructions on how to use the accelerated styles effectively.
 
-
 ----------
 
-
 **Mixing, shift, table, tail correction, restart, rRESPA info**\ :
 
 These pair styles do not support mixing.  Thus, coefficients for all
@@ -168,7 +174,7 @@ These pair style do not support the :doc:`pair_modify <pair_modify>`
 tail option for adding long-range tail corrections to energy and
 pressure.
 
-These pair styles writes their information to :doc:`binary restart files <restart>`, so pair\_style and pair\_coeff commands do not need
+These pair styles writes their information to :doc:`binary restart files <restart>`, so pair_style and pair_coeff commands do not need
 to be specified in an input script that reads a restart file.  Note
 that the user-specified random number seed is stored in the restart
 file, so when a simulation is restarted, each processor will
@@ -186,14 +192,11 @@ runs, using the *start* and *stop* keywords of the :doc:`run <run>`
 command.  See the :doc:`run <run>` command for details of how to do
 this.
 
-
 ----------
 
-
 Restrictions
 """"""""""""
 
-
 The default frequency for rebuilding neighbor lists is every 10 steps
 (see the :doc:`neigh_modify <neigh_modify>` command). This may be too
 infrequent for style *dpd* simulations since particles move rapidly
@@ -218,31 +221,18 @@ Related commands
 
 **Default:** none
 
-
 ----------
 
-
 .. _Groot1:
 
-
-
 **(Groot)** Groot and Warren, J Chem Phys, 107, 4423-35 (1997).
 
 .. _Afshar:
 
-
-
 **(Afshar)** Afshar, F. Schmid, A. Pishevar, S. Worley, Comput Phys
 Comm, 184, 1119-1128 (2013).
 
 .. _Phillips:
 
-
-
 **(Phillips)** C. L. Phillips, J. A. Anderson, S. C. Glotzer, Comput
 Phys Comm, 230, 7191-7201 (2011).
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/pair_dpd_fdt.rst b/doc/src/pair_dpd_fdt.rst
index 91de642ddb..223caf7681 100644
--- a/doc/src/pair_dpd_fdt.rst
+++ b/doc/src/pair_dpd_fdt.rst
@@ -1,26 +1,24 @@
-.. index:: pair\_style dpd/fdt
+.. index:: pair_style dpd/fdt
 
-pair\_style dpd/fdt command
-===========================
+pair_style dpd/fdt command
+==========================
 
-pair\_style dpd/fdt/energy command
-==================================
+pair_style dpd/fdt/energy command
+=================================
 
-pair\_style dpd/fdt/energy/kk command
-=====================================
+pair_style dpd/fdt/energy/kk command
+====================================
 
 Syntax
 """"""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    pair_style style args
 
 * style = *dpd/fdt* or *dpd/fdt/energy*
 * args = list of arguments for a particular style
 
-
 .. parsed-literal::
 
      *dpd/fdt* args = T cutoff seed
@@ -34,14 +32,13 @@ Syntax
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    pair_style dpd/fdt 300.0 2.5 34387
-   pair_coeff \* \* 3.0 1.0 2.5
+   pair_coeff * * 3.0 1.0 2.5
 
    pair_style dpd/fdt/energy 2.5 34387
-   pair_coeff \* \* 3.0 1.0 0.1 2.5
+   pair_coeff * * 3.0 1.0 0.1 2.5
 
 Description
 """""""""""
@@ -54,25 +51,33 @@ under isoenergetic and isoenthalpic conditions (see :ref:`(Lisal) <Lisal3>`).
 For DPD simulations in general, the force on atom I due to atom J is
 given as a sum of 3 terms
 
-.. image:: Eqs/pair_dpd.jpg
-   :align: center
+.. math::
 
-where Fc is a conservative force, Fd is a dissipative force, and Fr is
-a random force.  Rij is a unit vector in the direction Ri - Rj, Vij is
-the vector difference in velocities of the two atoms = Vi - Vj, alpha
-is a Gaussian random number with zero mean and unit variance, dt is
-the timestep size, and w(r) is a weighting factor that varies between
-0 and 1.  Rc is the cutoff.  The weighting factor, omega\_ij, varies
-between 0 and 1, and is chosen to have the following functional form:
+   \vec{f}  = & (F^C + F^D + F^R) \hat{r_{ij}} \qquad \qquad r < r_c \\
+   F^C      = & A w(r) \\
+   F^D      = & - \gamma w^2(r) (\hat{r_{ij}} \bullet \vec{v_{ij}}) \\
+   F^R      = & \sigma w(r) \alpha (\Delta t)^{-1/2} \\
+   w(r)     = & 1 - r/r_c
 
-.. image:: Eqs/pair_dpd_omega.jpg
-   :align: center
+where :math:`F^C` is a conservative force, :math:`F^D` is a dissipative
+force, and :math:`F^R` is a random force.  :math:`r_{ij}` is a unit
+vector in the direction :math:`r_i - r_j`, :math:`V_{ij} is the vector
+difference in velocities of the two atoms :math:`= \vec{v}_i -
+\vec{v}_j, :math:`\alpha` is a Gaussian random number with zero mean and
+unit variance, dt is the timestep size, and w(r) is a weighting factor
+that varies between 0 and 1.  Rc is the cutoff.  The weighting factor,
+:math:`\omega_{ij}`, varies between 0 and 1, and is chosen to have the
+following functional form:
+
+.. math::
+
+   \omega_{ij} = 1 - \frac{r_{ij}}{r_{c}}
 
 Note that alternative definitions of the weighting function exist, but
 would have to be implemented as a separate pair style command.
 
-For style *dpd/fdt*\ , the fluctuation-dissipation theorem defines gamma
-to be set equal to sigma\*sigma/(2 T), where T is the set point
+For style *dpd/fdt*\ , the fluctuation-dissipation theorem defines :math:`\gamma`
+to be set equal to :math:`\sigma^2/(2 T)`, where T is the set point
 temperature specified as a pair style parameter in the above examples.
 The following coefficients must be defined for each pair of atoms types
 via the :doc:`pair_coeff <pair_coeff>` command as in the examples above,
@@ -80,33 +85,40 @@ or in the data file or restart files read by the
 :doc:`read_data <read_data>` or :doc:`read_restart <read_restart>` commands:
 
 * A (force units)
-* sigma (force\*time\^(1/2) units)
+* :math:`\sigma` (force\*time\^(1/2) units)
 * cutoff (distance units)
 
 The last coefficient is optional.  If not specified, the global DPD
 cutoff is used.
 
-Style *dpd/fdt/energy* is used to perform DPD simulations
-under isoenergetic and isoenthalpic conditions.  The fluctuation-dissipation
-theorem defines gamma to be set equal to sigma\*sigma/(2 dpdTheta), where
-dpdTheta is the average internal temperature for the pair. The particle
-internal temperature is related to the particle internal energy through
-a mesoparticle equation of state (see :doc:`fix eos <fix>`). The
-differential internal conductive and mechanical energies are computed
-within style *dpd/fdt/energy* as:
+Style *dpd/fdt/energy* is used to perform DPD simulations under
+isoenergetic and isoenthalpic conditions.  The fluctuation-dissipation
+theorem defines :math:`\gamma` to be set equal to :math:`sigma^2/(2
+\theta)`, where :math:theta` is the average internal temperature for the
+pair. The particle internal temperature is related to the particle
+internal energy through a mesoparticle equation of state (see :doc:`fix
+eos <fix>`). The differential internal conductive and mechanical
+energies are computed within style *dpd/fdt/energy* as:
 
-.. image:: Eqs/pair_dpd_energy.jpg
-   :align: center
+.. math::
+
+   du_{i}^{cond}  = & \kappa_{ij}(\frac{1}{\theta_{i}}-\frac{1}{\theta_{j}})\omega_{ij}^{2} + \alpha_{ij}\omega_{ij}\zeta_{ij}^{q}(\Delta{t})^{-1/2} \\
+   du_{i}^{mech}  = & -\frac{1}{2}\gamma_{ij}\omega_{ij}^{2}(\frac{\vec{r_{ij}}}{r_{ij}}\bullet\vec{v_{ij}})^{2} -
+   \frac{\sigma^{2}_{ij}}{4}(\frac{1}{m_{i}}+\frac{1}{m_{j}})\omega_{ij}^{2} -
+   \frac{1}{2}\sigma_{ij}\omega_{ij}(\frac{\vec{r_{ij}}}{r_{ij}}\bullet\vec{v_{ij}})\zeta_{ij}(\Delta{t})^{-1/2}
 
 where
 
-.. image:: Eqs/pair_dpd_energy_terms.jpg
-   :align: center
+.. math::
 
-Zeta\_ij\^q is a second Gaussian random number with zero mean and unit
+   \alpha_{ij}^{2}  = & 2k_{B}\kappa_{ij} \\
+   \sigma^{2}_{ij}  = & 2\gamma_{ij}k_{B}\Theta_{ij} \\
+   \Theta_{ij}^{-1}  = & \frac{1}{2}(\frac{1}{\theta_{i}}+\frac{1}{\theta_{j}})
+
+:math:`\zeta_ij^q` is a second Gaussian random number with zero mean and unit
 variance that is used to compute the internal conductive energy. The
-fluctuation-dissipation theorem defines alpha\*alpha to be set
-equal to 2\*kB\*kappa, where kappa is the mesoparticle thermal
+fluctuation-dissipation theorem defines :math:`alpha^2` to be set
+equal to :math:2k_B\kappa`, where :math:`\kappa` is the mesoparticle thermal
 conductivity parameter.   The following coefficients must be defined for
 each pair of atoms types via the :doc:`pair_coeff <pair_coeff>`
 command as in the examples above, or in the data file or restart files
@@ -114,8 +126,8 @@ read by the :doc:`read_data <read_data>` or :doc:`read_restart <read_restart>`
 commands:
 
 * A (force units)
-* sigma (force\*time\^(1/2) units)
-* kappa (energy\*temperature/time units)
+* :math:`\sigma` (force\*time\^(1/2) units)
+* :math:`\kappa` (energy\*temperature/time units)
 * cutoff (distance units)
 
 The last coefficient is optional.  If not specified, the global DPD
@@ -140,10 +152,8 @@ Shardlow splitting algorithm is advantageous, especially when
 performing DPD under isoenergetic conditions, as it allows
 significantly larger timesteps to be taken.
 
-
 ----------
 
-
 Styles with a *gpu*\ , *intel*\ , *kk*\ , *omp*\ , or *opt* suffix are
 functionally the same as the corresponding style without the suffix.
 They have been optimized to run faster, depending on your available
@@ -162,14 +172,11 @@ by including their suffix, or you can use the :doc:`-suffix command-line switch
 See the :doc:`Speed packages <Speed_packages>` doc page for more
 instructions on how to use the accelerated styles effectively.
 
-
 ----------
 
-
 Restrictions
 """"""""""""
 
-
 These commands are part of the USER-DPD package.  They are only
 enabled if LAMMPS was built with that package.  See the :doc:`Build package <Build_package>` doc page for more info.
 
@@ -188,20 +195,11 @@ Related commands
 
 **Default:** none
 
-
 ----------
 
-
 .. _Lisal3:
 
-
-
 **(Lisal)** M. Lisal, J.K. Brennan, J. Bonet Avalos, "Dissipative
 particle dynamics at isothermal, isobaric, isoenergetic, and
 isoenthalpic conditions using Shardlow-like splitting algorithms.",
 J. Chem. Phys., 135, 204105 (2011).
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/pair_drip.rst b/doc/src/pair_drip.rst
index abc65900a0..25a51c4de8 100644
--- a/doc/src/pair_drip.rst
+++ b/doc/src/pair_drip.rst
@@ -1,13 +1,12 @@
-.. index:: pair\_style drip
+.. index:: pair_style drip
 
-pair\_style drip command
-========================
+pair_style drip command
+=======================
 
 Syntax
 """"""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    pair_style hybrid/overlay drip [styles ...]
 
@@ -16,20 +15,19 @@ Syntax
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    pair_style hybrid/overlay drip
-   pair_coeff \* \* none
-   pair_coeff \* \* drip  C.drip  C
+   pair_coeff * * none
+   pair_coeff * * drip  C.drip  C
 
    pair_style hybrid/overlay drip rebo
-   pair_coeff \* \* drip  C.drip     C
-   pair_coeff \* \* rebo  CH.airebo  C
+   pair_coeff * * drip  C.drip     C
+   pair_coeff * * rebo  CH.airebo  C
 
    pair_style hybrid/overlay drip rebo
-   pair_coeff \* \* drip  C.drip     C NULL
-   pair_coeff \* \* rebo  CH.airebo  C H
+   pair_coeff * * drip  C.drip     C NULL
+   pair_coeff * * rebo  CH.airebo  C H
 
 Description
 """""""""""
@@ -40,10 +38,12 @@ in :ref:`(Wen) <Wen2018>`, which is based on the :ref:`(Kolmogorov) <Kolmogorov2
 potential and provides an improved prediction for forces.
 The total potential energy of a system is
 
-.. image:: Eqs/pair_drip.jpg
-   :align: center
+.. math::
 
-where the *r\^-6* term models the attractive London dispersion,
+   E = & \frac{1}{2} \sum_{i} \sum_{j\notin\text{layer}\,i} \phi_{ij} \\
+   \phi_{ij} = &f_\text{c}(x_r) \left[ e^{-\lambda(r_{ij} - z_0 )} \left[C+f(\rho_{ij})+  g(\rho_{ij}, \{\alpha_{ij}^{(m)}\}) \right]- A\left (\frac{z_0}{r_{ij}} \right)^6 \right]
+
+where the :math:`r^{-6}` term models the attractive London dispersion,
 the exponential term is designed to capture the registry effect due to
 overlapping *pi* bonds, and *fc* is a cutoff function.
 
@@ -69,22 +69,19 @@ If you want, you can enforce this by assigning different atom types to atoms in
 different layers, and apply an intralayer potential to one atom type.
 See :doc:`pair_hybrid <pair_hybrid>` for details.
 
-
 ----------
 
-
 The :doc:`pair_coeff <pair_coeff>` command for DRIP takes *4+N* arguments, where
 *N* is the number of LAMMPS atom types. The fist three arguments must be fixed
 to be *\* \* drip*, the fourth argument is the path to the DRIP parameter file,
 and the remaining N arguments specifying the mapping between element in the
 parameter file and atom types. For example, if your LAMMPS simulation has 3 atom
-types and you want all of them to be C, you would use the following pair\_coeff
+types and you want all of them to be C, you would use the following pair_coeff
 command:
 
+.. code-block:: LAMMPS
 
-.. parsed-literal::
-
-   pair_coeff \* \* drip  C.drip  C C C
+   pair_coeff * * drip  C.drip  C C C
 
 If a mapping value is specified as NULL, the mapping is not performed. This
 could be useful when DRIP is used to model part of the system where other
@@ -92,37 +89,33 @@ element exists. Suppose you have a hydrocarbon system, with C of atom type 1
 and H of atom type 2, you can use the following command to inform DRIP not to
 model H atoms:
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    pair_style hybrid/overlay drip rebo
-   pair_coeff \* \* drip  C.drip     C NULL
-   pair_coeff \* \* rebo  CH.airebo  C H
+   pair_coeff * * drip  C.drip     C NULL
+   pair_coeff * * rebo  CH.airebo  C H
 
 .. note::
 
    The potential parameters developed in :ref:`(Wen) <Wen2018>` are provided with
    LAMMPS (see the "potentials" directory). Besides those in :ref:`Wen <Wen2018>`, an
-   additional parameter "normal\_cutoff", specific to the LAMMPS implementation, is
+   additional parameter "normal_cutoff", specific to the LAMMPS implementation, is
    used to find the three nearest neighbors of an atom to construct the normal.
 
-
 ----------
 
-
 **Mixing, shift, table, tail correction, and restart info**\ :
 
-This pair style does not support the pair\_modify mix, shift, table,
+This pair style does not support the pair_modify mix, shift, table,
 and tail options.
 
 This pair style does not write their information to binary restart files, since
-it is stored in potential files. Thus, you need to re-specify the pair\_style and
-pair\_coeff commands in an input script that reads a restart file.
+it is stored in potential files. Thus, you need to re-specify the pair_style and
+pair_coeff commands in an input script that reads a restart file.
 
 Restrictions
 """"""""""""
 
-
 This pair style is part of the USER-MISC package. It is only enabled if LAMMPS
 was built with that package.  See the :doc:`Build package <Build_package>` doc
 page for more info.
@@ -134,34 +127,23 @@ The *C.drip* parameter file provided with LAMMPS (see the "potentials"
 directory) is parameterized for metal :doc:`units <units>`. You can use the DRIP
 potential with any LAMMPS units, but you would need to create your own custom
 parameter file with coefficients listed in the appropriate units, if your
-simulation doesn't use "metal" units.
+simulation does not use "metal" units.
 
 Related commands
 """"""""""""""""
 
-:doc:`pair_style lebedeva\_z <pair_lebedeva_z>`,
+:doc:`pair_style lebedeva_z <pair_lebedeva_z>`,
 :doc:`pair_style kolmogorov/crespi/z <pair_kolmogorov_crespi_z>`,
 :doc:`pair_style kolmogorov/crespi/full <pair_kolmogorov_crespi_full>`,
 :doc:`pair_style ilp/graphene/hbn <pair_ilp_graphene_hbn>`.
 
-
 ----------
 
-
 .. _Wen2018:
 
-
-
 **(Wen)** M. Wen, S. Carr, S. Fang, E. Kaxiras, and E. B. Tadmor, Phys. Rev. B,
 98, 235404 (2018)
 
 .. _Kolmogorov2005:
 
-
-
 **(Kolmogorov)** A. N. Kolmogorov, V. H. Crespi, Phys. Rev. B 71, 235415 (2005)
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/pair_dsmc.rst b/doc/src/pair_dsmc.rst
index 1b76efd3a2..03f6505d47 100644
--- a/doc/src/pair_dsmc.rst
+++ b/doc/src/pair_dsmc.rst
@@ -1,31 +1,29 @@
-.. index:: pair\_style dsmc
+.. index:: pair_style dsmc
 
-pair\_style dsmc command
-========================
+pair_style dsmc command
+=======================
 
 Syntax
 """"""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    pair_style dsmc max_cell_size seed weighting Tref Nrecompute Nsample
 
-* max\_cell\_size = global maximum cell size for DSMC interactions (distance units)
+* max_cell_size = global maximum cell size for DSMC interactions (distance units)
 * seed = random # seed (positive integer)
 * weighting = macroparticle weighting
 * Tref = reference temperature (temperature units)
-* Nrecompute = re-compute v\*sigma\_max every this many timesteps (timesteps)
-* Nsample = sample this many times in recomputing v\*sigma\_max
+* Nrecompute = re-compute v\*sigma_max every this many timesteps (timesteps)
+* Nsample = sample this many times in recomputing v\*sigma_max
 
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    pair_style dsmc 2.5 34387 10 1.0 100 20
-   pair_coeff \* \* 1.0
+   pair_coeff * * 1.0
    pair_coeff 1 1 1.0
 
 Description
@@ -36,13 +34,13 @@ direct simulation Monte Carlo (DSMC) model following the exposition in
 :ref:`(Bird) <Bird>`.  Each collision resets the velocities of the two
 particles involved.  The number of pairwise collisions for each pair
 or particle types and the length scale within which they occur are
-determined by the parameters of the pair\_style and pair\_coeff
+determined by the parameters of the pair_style and pair_coeff
 commands.
 
 Stochastic collisions are performed using the variable hard sphere
-(VHS) approach, with the user-defined *max\_cell\_size* value used as
+(VHS) approach, with the user-defined *max_cell_size* value used as
 the maximum DSMC cell size, and reference cross-sections for
-collisions given using the pair\_coeff command.
+collisions given using the pair_coeff command.
 
 There is no pairwise energy or virial contributions associated with
 this pair style.
@@ -55,16 +53,14 @@ commands:
 
 * sigma (area units, i.e. distance-squared)
 
-The global DSMC *max\_cell\_size* determines the maximum cell length
+The global DSMC *max_cell_size* determines the maximum cell length
 used in the DSMC calculation.  A structured mesh is overlayed on the
 simulation box such that an integer number of cells are created in
 each direction for each processor's sub-domain.  Cell lengths are
 adjusted up to the user-specified maximum cell size.
 
-
 ----------
 
-
 To perform a DSMC simulation with LAMMPS, several additional options
 should be set in your input script, though LAMMPS does not check for
 these settings.
@@ -73,8 +69,7 @@ Since this pair style does not compute particle forces, you should use
 the "fix nve/noforce" time integration fix for the DSMC particles,
 e.g.
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    fix 1 all nve/noforce
 
@@ -84,8 +79,7 @@ possible to perform all collisions between pairs of particles that are
 on the same processor.  To ensure this occurs, you should use
 these commands:
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    neighbor 0.0 bin
    neigh_modify every 1 delay 0 check no
@@ -104,15 +98,12 @@ uniform, which will not give good DSMC collision rates. Specify
 "dist gaussian" when using the :doc:`velocity <velocity>` command
 as in the following:
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    velocity all create 594.6 87287 loop geom dist gaussian
 
-
 ----------
 
-
 **Mixing, shift, table, tail correction, restart, rRESPA info**\ :
 
 This pair style does not support mixing.  Thus, coefficients for all
@@ -128,7 +119,7 @@ This pair style does not support the :doc:`pair_modify <pair_modify>`
 tail option for adding long-range tail corrections to energy and
 pressure.
 
-This pair style writes its information to :doc:`binary restart files <restart>`, so pair\_style and pair\_coeff commands do not need
+This pair style writes its information to :doc:`binary restart files <restart>`, so pair_style and pair_coeff commands do not need
 to be specified in an input script that reads a restart file.  Note
 that the user-specified random number seed is stored in the restart
 file, so when a simulation is restarted, each processor will
@@ -141,14 +132,11 @@ This pair style can only be used via the *pair* keyword of the
 :doc:`run_style respa <run_style>` command.  It does not support the
 *inner*\ , *middle*\ , *outer* keywords.
 
-
 ----------
 
-
 Restrictions
 """"""""""""
 
-
 This style is part of the MC package.  It is only enabled if LAMMPS
 was built with that package.  See the :doc:`Build package <Build_package>` doc page for more info.
 
@@ -161,18 +149,9 @@ Related commands
 
 **Default:** none
 
-
 ----------
 
-
 .. _Bird:
 
-
-
 **(Bird)** G. A. Bird, "Molecular Gas Dynamics and the Direct Simulation
 of Gas Flows" (1994).
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/pair_e3b.rst b/doc/src/pair_e3b.rst
index 320090b8ca..68f8708b27 100644
--- a/doc/src/pair_e3b.rst
+++ b/doc/src/pair_e3b.rst
@@ -1,21 +1,20 @@
-.. index:: pair\_style e3b
+.. index:: pair_style e3b
 
-pair\_style e3b command
-=======================
+pair_style e3b command
+======================
 
 Syntax
 """"""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    pair_style e3b Otype
 
 * Otype = atom type for oxygen
 
-.. parsed-literal::
+.. code-block:: LAMMPS
 
-   pair_coeff \* \* keyword
+   pair_coeff * * keyword
 
 * one or more keyword/value pairs must be appended.
 * keyword = *preset* or *Ea* or *Eb* or *Ec* or *E2* or *K3* or *K2* or *Rs* or *Rc3* or *Rc2* or *bondL* or *neigh*
@@ -43,25 +42,34 @@ Syntax
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    pair_style e3b 1
-   pair_coeff \* \* Ea 35.85 Eb -240.2 Ec 449.3 E2 108269.9 K3 1.907 K2 4.872 Rc3 5.2 Rc2 5.2 Rs 5.0 bondL 0.9572
+   pair_coeff * * Ea 35.85 Eb -240.2 Ec 449.3 E2 108269.9 K3 1.907 K2 4.872 Rc3 5.2 Rc2 5.2 Rs 5.0 bondL 0.9572
 
    pair_style hybrid/overlay e3b 1 lj/cut/tip4p/long 1 2 1 1 0.15 8.5
-   pair_coeff \* \* e3b preset 2011
+   pair_coeff * * e3b preset 2011
 
 Description
 """""""""""
 
 The *e3b* style computes an \"explicit three-body\" (E3B) potential for water :ref:`(Kumar 2008) <Kumar>`.
 
-.. image:: Eqs/e3b.jpg
-   :align: center
+.. math::
+
+   E =& E_2 \sum_{i,j}e^{-k_2 r_{ij}} + E_A \sum_{\substack{i,j,k,\ell \\
+   \in \textrm{type A}}} f(r_{ij})f(r_{k\ell}) + E_B \sum_{\substack{i,j,k,\ell \\
+   \in \textrm{type B}}} f(r_{ij})f(r_{k\ell}) + E_C \sum_{\substack{i,j,k,\ell \\
+   \in \textrm{type C}}} f(r_{ij})f(r_{k\ell}) \\
+   f(r) =& e^{-k_3 r}s(r) \\
+   s(r) =& \begin{cases}
+   1 & r<R_s \\
+   \displaystyle\frac{(R_f-r)^2(R_f-3R_s+2r)}{(R_f-R_s)^3} & R_s\leq r\leq R_f \\
+   0 & r>R_f\\
+   \end{cases}
 
 This potential was developed as a water model that includes the three-body cooperativity of hydrogen bonding explicitly.
-To use it in this way, it must be applied in conjunction with a conventional two-body water model, through *pair\_style hybrid/overlay*.
+To use it in this way, it must be applied in conjunction with a conventional two-body water model, through *pair_style hybrid/overlay*.
 The three body interactions are split into three types: A, B, and C.
 Type A corresponds to anti-cooperative double hydrogen bond donor interactions.
 Type B corresponds to the cooperative interaction of molecules that both donate and accept a hydrogen bond.
@@ -71,9 +79,9 @@ The two-body interactions are designed to correct for the effective many-body in
 The two-body interactions are cut off sharply at Rc2, because K3 is typically significantly smaller than K2.
 See :ref:`(Kumar 2008) <Kumar>` for more details.
 
-Only a single *pair\_coeff* command is used with the *e3b* style.
+Only a single *pair_coeff* command is used with the *e3b* style.
 The 1st two arguments must be \* \*.
-The oxygen atom type for the pair style is passed as the only argument to the *pair\_style* command, not in the *pair\_coeff* command.
+The oxygen atom type for the pair style is passed as the only argument to the *pair_style* command, not in the *pair_coeff* command.
 The hydrogen atom type is inferred by the ordering of the atoms.
 
 .. note::
@@ -82,14 +90,14 @@ The hydrogen atom type is inferred by the ordering of the atoms.
    Each water molecule must have consecutive IDs with the oxygen first.
    This pair style does not test that this criteria is met.
 
-The *pair\_coeff* command must have at least one keyword/value pair, as described above.
+The *pair_coeff* command must have at least one keyword/value pair, as described above.
 The *preset* keyword sets the potential parameters to the values used in :ref:`(Tainter 2011) <Tainter2011>` or :ref:`(Tainter 2015) <Tainter2015>`.
-To use the water models defined in those references, the *e3b* style should always be used in conjunction with an *lj/cut/tip4p/long* style through *pair\_style hybrid/overlay*, as demonstrated in the second example above.
+To use the water models defined in those references, the *e3b* style should always be used in conjunction with an *lj/cut/tip4p/long* style through *pair_style hybrid/overlay*, as demonstrated in the second example above.
 The *preset 2011* option should be used with the :doc:`TIP4P water model <Howto_tip4p>`.
 The *preset 2015* option should be used with the :doc:`TIP4P/2005 water model <Howto_tip4p>`.
 If the *preset* keyword is used, no other keyword is needed.
 Changes to the preset parameters can be made by specifying the *preset* keyword followed by the specific parameter to change, like *Ea*\ .
-Note that the other keywords must come after *preset* in the pair\_style command.
+Note that the other keywords must come after *preset* in the pair_style command.
 The *e3b* style can also be used to implement any three-body potential of the same form by specifying all the keywords except *neigh*\ : *Ea*\ , *Eb*\ , *Ec*\ , *E2*\ , *K3*\ , *K2*\ , *Rc3*\ , *Rc2*\ , *Rs*\ , and *bondL*\ .
 The keyword *bondL* specifies the intramolecular OH bond length of the water model being used.
 This is needed to include H atoms that are within the cutoff even when the attached oxygen atom is not.
@@ -103,31 +111,26 @@ If the neigh setting is too large, the pair style will use more memory than nece
 This pair style tallies a breakdown of the total E3B potential energy into sub-categories, which can be accessed via the :doc:`compute pair <compute_pair>` command as a vector of values of length 4.
 The 4 values correspond to the terms in the first equation above: the E2 term, the Ea term, the Eb term, and the Ec term.
 
-See the examples/USER/e3b directory for a complete example script.
-
+See the examples/USER/misc/e3b directory for a complete example script.
 
 ----------
 
-
 **Mixing, shift, table, tail correction, restart, rRESPA info**\ :
 
 This pair style does not support the :doc:`pair_modify <pair_modify>`
 shift, table, and tail options.
 
 This pair style does not write its information to :doc:`binary restart files <restart>`.  Thus, you
-need to re-specify the pair\_style and pair\_coeff commands in an input
+need to re-specify the pair_style and pair_coeff commands in an input
 script that reads a restart file.
 
 This pair style is incompatible with :doc:`respa <run_style>`.
 
-
 ----------
 
-
 Restrictions
 """"""""""""
 
-
 This pair style is part of the USER-MISC package.  It is only enabled
 if LAMMPS was built with that package.  See the :doc:`Build package <Build_package>` doc page for more info.
 
@@ -135,7 +138,7 @@ This pair style requires the :doc:`newton <newton>` setting to be "on"
 for pair interactions.
 
 This pair style requires a fixed number of atoms in the simulation, so it is incompatible with fixes like :doc:`fix deposit <fix_deposit>`.
-If the number of atoms changes between runs, this pair style must be re-initialized by calling the *pair\_style* and *pair\_coeffs* commands.
+If the number of atoms changes between runs, this pair style must be re-initialized by calling the *pair_style* and *pair_coeffs* commands.
 This is not a fundamental limitation of the pair style, but the code currently does not support a variable number of atoms.
 
 The *preset* keyword currently only works with real, metal, si, and cgs :doc:`units <units>`.
@@ -150,27 +153,16 @@ Default
 
 The option default for the *neigh* keyword is 10.
 
-
 ----------
 
-
 .. _Kumar:
 
-
-
 .. _Tainter2011:
 
 **(Kumar)** Kumar and Skinner, J. Phys. Chem. B, 112, 8311 (2008)
 
-
 .. _Tainter2015:
 
 **(Tainter 2011)** Tainter, Pieniazek, Lin, and Skinner, J. Chem. Phys., 134, 184501 (2011)
 
-
 **(Tainter 2015)** Tainter, Shi, and Skinner, 11, 2268 (2015)
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/pair_eam.rst b/doc/src/pair_eam.rst
index 0f6840bbe4..7384a4d54c 100644
--- a/doc/src/pair_eam.rst
+++ b/doc/src/pair_eam.rst
@@ -1,76 +1,75 @@
-.. index:: pair\_style eam
+.. index:: pair_style eam
 
-pair\_style eam command
-=======================
+pair_style eam command
+======================
 
-pair\_style eam/gpu command
-===========================
-
-pair\_style eam/intel command
-=============================
-
-pair\_style eam/kk command
+pair_style eam/gpu command
 ==========================
 
-pair\_style eam/omp command
-===========================
+pair_style eam/intel command
+============================
 
-pair\_style eam/opt command
-===========================
+pair_style eam/kk command
+=========================
 
-pair\_style eam/alloy command
-=============================
+pair_style eam/omp command
+==========================
 
-pair\_style eam/alloy/gpu command
-=================================
+pair_style eam/opt command
+==========================
 
-pair\_style eam/alloy/intel command
-===================================
+pair_style eam/alloy command
+============================
 
-pair\_style eam/alloy/kk command
+pair_style eam/alloy/gpu command
 ================================
 
-pair\_style eam/alloy/omp command
-=================================
-
-pair\_style eam/alloy/opt command
-=================================
-
-pair\_style eam/cd command
-==========================
-
-pair\_style eam/cd/omp command
-==============================
-
-pair\_style eam/cd/old command
-==============================
-
-pair\_style eam/cd/old/omp command
+pair_style eam/alloy/intel command
 ==================================
 
-pair\_style eam/fs command
-==========================
+pair_style eam/alloy/kk command
+===============================
 
-pair\_style eam/fs/gpu command
-==============================
-
-pair\_style eam/fs/intel command
+pair_style eam/alloy/omp command
 ================================
 
-pair\_style eam/fs/kk command
+pair_style eam/alloy/opt command
+================================
+
+pair_style eam/cd command
+=========================
+
+pair_style eam/cd/omp command
 =============================
 
-pair\_style eam/fs/omp command
-==============================
+pair_style eam/cd/old command
+=============================
 
-pair\_style eam/fs/opt command
-==============================
+pair_style eam/cd/old/omp command
+=================================
+
+pair_style eam/fs command
+=========================
+
+pair_style eam/fs/gpu command
+=============================
+
+pair_style eam/fs/intel command
+===============================
+
+pair_style eam/fs/kk command
+============================
+
+pair_style eam/fs/omp command
+=============================
+
+pair_style eam/fs/opt command
+=============================
 
 Syntax
 """"""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    pair_style style
 
@@ -79,21 +78,20 @@ Syntax
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    pair_style eam
-   pair_coeff \* \* cuu3
-   pair_coeff 1\*3 1\*3 niu3.eam
+   pair_coeff * * cuu3
+   pair_coeff 1*3 1\*3 niu3.eam
 
    pair_style eam/alloy
-   pair_coeff \* \* ../potentials/NiAlH_jea.eam.alloy Ni Al Ni Ni
+   pair_coeff * * ../potentials/NiAlH_jea.eam.alloy Ni Al Ni Ni
 
    pair_style eam/cd
-   pair_coeff \* \* ../potentials/FeCr.cdeam Fe Cr
+   pair_coeff * * ../potentials/FeCr.cdeam Fe Cr
 
    pair_style eam/fs
-   pair_coeff \* \* NiAlH_jea.eam.fs Ni Al Ni Ni
+   pair_coeff * * NiAlH_jea.eam.fs Ni Al Ni Ni
 
 Description
 """""""""""
@@ -102,8 +100,10 @@ Style *eam* computes pairwise interactions for metals and metal alloys
 using embedded-atom method (EAM) potentials :ref:`(Daw) <Daw>`.  The total
 energy Ei of an atom I is given by
 
-.. image:: Eqs/pair_eam.jpg
-   :align: center
+.. math::
+
+   E_i = F_\alpha \left(\sum_{j \neq i}\ \rho_\beta (r_{ij})\right) +
+         \frac{1}{2} \sum_{j \neq i} \phi_{\alpha\beta} (r_{ij})
 
 where F is the embedding energy which is a function of the atomic
 electron density rho, phi is a pair potential interaction, and alpha
@@ -136,7 +136,7 @@ are parameterized in terms of LAMMPS :doc:`metal units <units>`.
 .. note::
 
    Note that unlike for other potentials, cutoffs for EAM
-   potentials are not set in the pair\_style or pair\_coeff command; they
+   potentials are not set in the pair_style or pair_coeff command; they
    are specified in the EAM potential files themselves.  Likewise, the
    EAM potential files list atomic masses; thus you do not need to use
    the :doc:`mass <mass>` command to specify them.
@@ -144,12 +144,12 @@ are parameterized in terms of LAMMPS :doc:`metal units <units>`.
 There are several WWW sites that distribute and document EAM
 potentials stored in DYNAMO or other formats:
 
-
 .. parsed-literal::
 
    http://www.ctcms.nist.gov/potentials
    http://cst-www.nrl.navy.mil/ccm6/ap
    http://enpub.fulton.asu.edu/cms/potentials/main/main.htm
+   https://openkim.org
 
 These potentials should be usable with LAMMPS, though the alternate
 formats would need to be converted to the DYNAMO format used by LAMMPS
@@ -157,31 +157,33 @@ and described on this page.  The NIST site is maintained by Chandler
 Becker (cbecker at nist.gov) who is good resource for info on
 interatomic potentials and file formats.
 
+The OpenKIM Project at
+`https://openkim.org/browse/models/by-type <https://openkim.org/browse/models/by-type>`_
+provides EAM potentials that can be used directly in LAMMPS with the
+:doc:`kim_commands <kim_commands>` interface.
 
 ----------
 
-
 For style *eam*\ , potential values are read from a file that is in the
 DYNAMO single-element *funcfl* format.  If the DYNAMO file was created
 by a Fortran program, it cannot have "D" values in it for exponents.
 C only recognizes "e" or "E" for scientific notation.
 
 Note that unlike for other potentials, cutoffs for EAM potentials are
-not set in the pair\_style or pair\_coeff command; they are specified in
+not set in the pair_style or pair_coeff command; they are specified in
 the EAM potential files themselves.
 
 For style *eam* a potential file must be assigned to each I,I pair of
-atom types by using one or more pair\_coeff commands, each with a
+atom types by using one or more pair_coeff commands, each with a
 single argument:
 
 * filename
 
 Thus the following command
 
+.. code-block:: LAMMPS
 
-.. parsed-literal::
-
-   pair_coeff \*2 1\*2 cuu3.eam
+   pair_coeff *2 1*2 cuu3.eam
 
 will read the cuu3 potential file and use the tabulated Cu values for
 F, phi, rho that it contains for type pairs 1,1 and 2,2 (type pairs
@@ -229,17 +231,14 @@ sqrt(Hartree \* Bohr-radii).  For two interacting atoms i,j this is used
 by LAMMPS to compute the pair potential term in the EAM energy
 expression as r\*phi, in units of eV-Angstroms, via the formula
 
+.. math::
 
-.. parsed-literal::
-
-   r\*phi = 27.2 \* 0.529 \* Zi \* Zj
+   r \cdot \phi = 27.2 \cdot 0.529 \cdot Z_i \cdot Z_j
 
 where 1 Hartree = 27.2 eV and 1 Bohr = 0.529 Angstroms.
 
-
 ----------
 
-
 Style *eam/alloy* computes pairwise interactions using the same
 formula as style *eam*\ .  However the associated
 :doc:`pair_coeff <pair_coeff>` command reads a DYNAMO *setfl* file
@@ -256,27 +255,26 @@ DYNAMO file was created by a Fortran program, it cannot have "D"
 values in it for exponents.  C only recognizes "e" or "E" for
 scientific notation.
 
-Only a single pair\_coeff command is used with the *eam/alloy* style
+Only a single pair_coeff command is used with the *eam/alloy* style
 which specifies a DYNAMO *setfl* file, which contains information for
 M elements.  These are mapped to LAMMPS atom types by specifying N
-additional arguments after the filename in the pair\_coeff command,
+additional arguments after the filename in the pair_coeff command,
 where N is the number of LAMMPS atom types:
 
 * filename
 * N element names = mapping of *setfl* elements to atom types
 
-As an example, the potentials/NiAlH\_jea.eam.alloy file is a *setfl*
+As an example, the potentials/NiAlH_jea.eam.alloy file is a *setfl*
 file which has tabulated EAM values for 3 elements and their alloy
 interactions: Ni, Al, and H.  See the :doc:`pair_coeff <pair_coeff>` doc
 page for alternate ways to specify the path for the potential file.
 If your LAMMPS simulation has 4 atoms types and you want the 1st 3 to
-be Ni, and the 4th to be Al, you would use the following pair\_coeff
+be Ni, and the 4th to be Al, you would use the following pair_coeff
 command:
 
+.. code-block:: LAMMPS
 
-.. parsed-literal::
-
-   pair_coeff \* \* NiAlH_jea.eam.alloy Ni Ni Ni Al
+   pair_coeff * * NiAlH_jea.eam.alloy Ni Ni Ni Al
 
 The 1st 2 arguments must be \* \* so as to span all LAMMPS atom types.
 The first three Ni arguments map LAMMPS atom types 1,2,3 to the Ni
@@ -331,10 +329,8 @@ the tabulated values for each phi function are listed in *setfl* files
 directly as r\*phi (in units of eV-Angstroms), since they are for atom
 pairs.
 
-
 ----------
 
-
 Style *eam/cd* is similar to the *eam/alloy* style, except that it
 computes alloy pairwise interactions using the concentration-dependent
 embedded-atom method (CD-EAM).  This model can reproduce the enthalpy
@@ -342,7 +338,7 @@ of mixing of alloys over the full composition range, as described in
 :ref:`(Stukowski) <Stukowski>`. Style *eam/cd/old* is an older, slightly
 different and slower two-site formulation of the model :ref:`(Caro) <Caro>`.
 
-The pair\_coeff command is specified the same as for the *eam/alloy*
+The pair_coeff command is specified the same as for the *eam/alloy*
 style.  However the DYNAMO *setfl* file must has two
 lines added to it, at the end of the file:
 
@@ -362,17 +358,18 @@ the input EAM file are always taken as the *A* and *B* species.
 *CD-EAM* files in the *potentials* directory of the LAMMPS
 distribution have a ".cdeam" suffix.
 
-
 ----------
 
-
 Style *eam/fs* computes pairwise interactions for metals and metal
 alloys using a generalized form of EAM potentials due to Finnis and
 Sinclair :ref:`(Finnis) <Finnis1>`.  The total energy Ei of an atom I is
 given by
 
-.. image:: Eqs/pair_eam_fs.jpg
-   :align: center
+.. math::
+
+   E_i = F_\alpha \left(\sum_{j \neq i}\
+   \rho_{\alpha\beta} (r_{ij})\right) +
+   \frac{1}{2} \sum_{j \neq i} \phi_{\alpha\beta} (r_{ij})
 
 This has the same form as the EAM formula above, except that rho is
 now a functional specific to the atomic types of both atoms I and J,
@@ -382,7 +379,7 @@ element at that atomic site.
 
 The associated :doc:`pair_coeff <pair_coeff>` command for style *eam/fs*
 reads a DYNAMO *setfl* file that has been extended to include
-additional rho\_alpha\_beta arrays of tabulated values.  A discussion of
+additional rho_alpha_beta arrays of tabulated values.  A discussion of
 how FS EAM differs from conventional EAM alloy potentials is given in
 :ref:`(Ackland1) <Ackland1>`.  An example of such a potential is the same
 author's Fe-P FS potential :ref:`(Ackland2) <Ackland2>`.  Note that while FS
@@ -391,13 +388,12 @@ dependence on the total density, the implementation in LAMMPS does not
 require that; the user can tabulate any functional form desired in the
 FS potential files.
 
-For style *eam/fs*\ , the form of the pair\_coeff command is exactly the
+For style *eam/fs*\ , the form of the pair_coeff command is exactly the
 same as for style *eam/alloy*\ , e.g.
 
+.. code-block:: LAMMPS
 
-.. parsed-literal::
-
-   pair_coeff \* \* NiAlH_jea.eam.fs Ni Ni Ni Al
+   pair_coeff * * NiAlH_jea.eam.fs Ni Ni Ni Al
 
 where there are N additional arguments after the filename, where N is
 the number of LAMMPS atom types.  See the :doc:`pair_coeff <pair_coeff>`
@@ -444,10 +440,8 @@ eV-Angstroms) as in EAM *setfl* files.  Note that in Finnis/Sinclair,
 the phi(r) arrays are still symmetric, so only phi arrays for i >= j
 are listed.
 
-
 ----------
 
-
 Styles with a *gpu*\ , *intel*\ , *kk*\ , *omp*\ , or *opt* suffix are
 functionally the same as the corresponding style without the suffix.
 They have been optimized to run faster, depending on your available
@@ -466,36 +460,31 @@ by including their suffix, or you can use the :doc:`-suffix command-line switch
 See the :doc:`Speed packages <Speed_packages>` doc page for more
 instructions on how to use the accelerated styles effectively.
 
-
 ----------
 
-
 **Mixing, shift, table, tail correction, restart, rRESPA info**\ :
 
 For atom type pairs I,J and I != J, where types I and J correspond to
 two different element types, mixing is performed by LAMMPS as
 described above with the individual styles.  You never need to specify
-a pair\_coeff command with I != J arguments for the eam styles.
+a pair_coeff command with I != J arguments for the eam styles.
 
 This pair style does not support the :doc:`pair_modify <pair_modify>`
 shift, table, and tail options.
 
 The eam pair styles do not write their information to :doc:`binary restart files <restart>`, since it is stored in tabulated potential files.
-Thus, you need to re-specify the pair\_style and pair\_coeff commands in
+Thus, you need to re-specify the pair_style and pair_coeff commands in
 an input script that reads a restart file.
 
 The eam pair styles can only be used via the *pair* keyword of the
 :doc:`run_style respa <run_style>` command.  They do not support the
 *inner*\ , *middle*\ , *outer* keywords.
 
-
 ----------
 
-
 Restrictions
 """"""""""""
 
-
 All of these styles are part of the MANYBODY package.  They are only
 enabled if LAMMPS was built with that package.  See the :doc:`Build package <Build_package>` doc page for more info.
 
@@ -506,50 +495,31 @@ Related commands
 
 **Default:** none
 
-
 ----------
 
-
 .. _Ackland1:
 
-
-
 **(Ackland1)** Ackland, Condensed Matter (2005).
 
 .. _Ackland2:
 
-
-
 **(Ackland2)** Ackland, Mendelev, Srolovitz, Han and Barashev, Journal
 of Physics: Condensed Matter, 16, S2629 (2004).
 
 .. _Daw:
 
-
-
 **(Daw)** Daw, Baskes, Phys Rev Lett, 50, 1285 (1983).
 Daw, Baskes, Phys Rev B, 29, 6443 (1984).
 
 .. _Finnis1:
 
-
-
 **(Finnis)** Finnis, Sinclair, Philosophical Magazine A, 50, 45 (1984).
 
 .. _Stukowski:
 
-
-
 **(Stukowski)** Stukowski, Sadigh, Erhart, Caro; Modeling Simulation
 Materials Science & Engineering, 7, 075005 (2009).
 
 .. _Caro:
 
-
-
 **(Caro)** A Caro, DA Crowson, M Caro; Phys Rev Lett, 95, 075702 (2005)
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/pair_edip.rst b/doc/src/pair_edip.rst
index 68b54a16fe..5561e30919 100644
--- a/doc/src/pair_edip.rst
+++ b/doc/src/pair_edip.rst
@@ -1,19 +1,18 @@
-.. index:: pair\_style edip
+.. index:: pair_style edip
 
-pair\_style edip command
-========================
+pair_style edip command
+=======================
 
-pair\_style edip/omp command
-============================
+pair_style edip/omp command
+===========================
 
-pair\_style edip/multi command
-==============================
+pair_style edip/multi command
+=============================
 
 Syntax
 """"""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    pair_style style
 
@@ -22,8 +21,10 @@ Syntax
 Examples
 """"""""
 
-pair\_style edip
-pair\_coeff \* \* Si.edip Si
+.. code-block:: LAMMPS
+
+   pair_style edip
+   pair_coeff * * Si.edip Si
 
 Description
 """""""""""
@@ -37,20 +38,31 @@ potentials, while *edip/multi* supports multi-element EDIP runs.
 
 In EDIP, the energy E of a system of atoms is
 
-.. image:: Eqs/pair_edip.jpg
-   :align: center
+.. math::
 
-where phi2 is a two-body term and phi3 is a three-body term.  The
-summations in the formula are over all neighbors J and K of atom I
-within a cutoff distance = a.
-Both terms depend on the local environment of atom I through its
-effective coordination number defined by Z, which is unity for a
-cutoff distance < c and gently goes to 0 at distance = a.
+   E  = & \sum_{j \ne i} \phi_{2}(R_{ij}, Z_{i}) + \sum_{j \ne i} \sum_{k \ne i,k > j} \phi_{3}(R_{ij}, R_{ik}, Z_{i}) \\
+   \phi_{2}(r, Z)  = & A\left[\left(\frac{B}{r}\right)^{\rho} - e^{-\beta Z^2}\right]exp{\left(\frac{\sigma}{r-a}\right)} \\
+   \phi_{3}(R_{ij}, R_{ik}, Z_i)  = & exp{\left(\frac{\gamma}{R_{ij}-a}\right)}exp{\left(\frac{\gamma}{R_{ik}-a}\right)}h(cos\theta_{ijk},Z_i) \\
+   Z_i  = & \sum_{m \ne i} f(R_{im}) \qquad
+   f(r) = \begin{cases}
+          1 & \quad r<c \\
+          \exp\left(\frac{\alpha}{1-x^{-3}}\right) & \quad c<r<a \\
+          0 & \quad r>a
+          \end{cases} \\
+   h(l,Z)  = & \lambda [(1-e^{-Q(Z)(l+\tau(Z))^2}) + \eta Q(Z)(l+\tau(Z))^2 ] \\
+   Q(Z)  = & Q_0 e^{-\mu Z} \qquad \tau(Z) = u_1 + u_2 (u_3 e^{-u_4 Z} - e^{-2u_4 Z})
 
-Only a single pair\_coeff command is used with the *edip* style which
+where :math:`\phi_2` is a two-body term and :math:`\phi_3` is a
+three-body term.  The summations in the formula are over all neighbors J
+and K of atom I within a cutoff distance = a.  Both terms depend on the
+local environment of atom I through its effective coordination number
+defined by Z, which is unity for a cutoff distance < c and gently goes
+to 0 at distance = a.
+
+Only a single pair_coeff command is used with the *edip* style which
 specifies a EDIP potential file with parameters for all
 needed elements.  These are mapped to LAMMPS atom types by specifying
-N additional arguments after the filename in the pair\_coeff command,
+N additional arguments after the filename in the pair_coeff command,
 where N is the number of LAMMPS atom types:
 
 * filename
@@ -74,14 +86,14 @@ and three-body coefficients in the formula above:
 * B (distance units)
 * cutoffA (distance units)
 * cutoffC (distance units)
-* alpha
-* beta
-* eta
-* gamma (distance units)
-* lambda (energy units)
-* mu
-* tho
-* sigma (distance units)
+* :math:`\alpha`
+* :math:`\beta`
+* :math:`\eta`
+* :math:`\gamma` (distance units)
+* :math:`lambda` (energy units)
+* :math:`\mu`
+* :math:`\tau`
+* :math:`\sigma` (distance units)
 * Q0
 * u1
 * u2
@@ -94,7 +106,7 @@ for three-body interactions. The alpha and cutoffC parameters are used
 for the coordination environment function only.
 
 The EDIP potential file must contain entries for all the
-elements listed in the pair\_coeff command.  It can also contain
+elements listed in the pair_coeff command.  It can also contain
 entries for additional elements not being used in a particular
 simulation; LAMMPS ignores those entries.
 
@@ -111,10 +123,8 @@ multi-element EDIP parameterization. If you know any and
 you are interest in that, please contact the author of
 the EDIP package.
 
-
 ----------
 
-
 Styles with a *gpu*\ , *intel*\ , *kk*\ , *omp*\ , or *opt* suffix are
 functionally the same as the corresponding style without the suffix.
 They have been optimized to run faster, depending on your available
@@ -133,31 +143,26 @@ by including their suffix, or you can use the :doc:`-suffix command-line switch
 See the :doc:`Speed packages <Speed_packages>` doc page for more
 instructions on how to use the accelerated styles effectively.
 
-
 ----------
 
-
 **Mixing, shift, table, tail correction, restart, rRESPA info**\ :
 
 This pair style does not support the :doc:`pair_modify <pair_modify>`
 shift, table, and tail options.
 
 This pair style does not write its information to :doc:`binary restart files <restart>`, since it is stored in potential files.  Thus, you
-need to re-specify the pair\_style and pair\_coeff commands in an input
+need to re-specify the pair_style and pair_coeff commands in an input
 script that reads a restart file.
 
 This pair style can only be used via the *pair* keyword of the
 :doc:`run_style respa <run_style>` command.  It does not support the
 *inner*\ , *middle*\ , *outer* keywords.
 
-
 ----------
 
-
 Restrictions
 """"""""""""
 
-
 This pair style can only be used if LAMMPS was built with the
 USER-MISC package.  See the :doc:`Build package <Build_package>` doc
 page for more info.
@@ -169,7 +174,7 @@ The EDIP potential files provided with LAMMPS (see the potentials directory)
 are parameterized for metal :doc:`units <units>`.
 You can use the EDIP potential with any LAMMPS units, but you would need
 to create your own EDIP potential file with coefficients listed in the
-appropriate units if your simulation doesn't use "metal" units.
+appropriate units if your simulation does not use "metal" units.
 
 Related commands
 """"""""""""""""
@@ -178,17 +183,8 @@ Related commands
 
 **Default:** none
 
-
 ----------
 
-
 .. _EDIP:
 
-
-
 **(EDIP)** J F Justo et al, Phys Rev B 58, 2539 (1998).
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/pair_eff.rst b/doc/src/pair_eff.rst
index 235090cd39..f163e5afaa 100644
--- a/doc/src/pair_eff.rst
+++ b/doc/src/pair_eff.rst
@@ -1,21 +1,20 @@
-.. index:: pair\_style eff/cut
+.. index:: pair_style eff/cut
 
-pair\_style eff/cut command
-===========================
+pair_style eff/cut command
+==========================
 
 Syntax
 """"""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    pair_style eff/cut cutoff keyword args ...
 
 * cutoff = global cutoff for Coulombic interactions
 * zero or more keyword/value pairs may be appended
-  
+
   .. parsed-literal::
-  
+
      keyword = *limit/eradius* or *pressure/evirials* or *ecp*
        *limit/eradius* args = none
        *pressure/evirials* args = none
@@ -23,19 +22,16 @@ Syntax
          type = LAMMPS atom type (1 to Ntypes)
          element = element symbol (e.g. H, Si)
 
-
-
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    pair_style eff/cut 39.7
    pair_style eff/cut 40.0 limit/eradius
    pair_style eff/cut 40.0 limit/eradius pressure/evirials
    pair_style eff/cut 40.0 ecp 1 Si 3 C
-   pair_coeff \* \*
+   pair_coeff * *
    pair_coeff 2 2 20.0
    pair_coeff 1 s 0.320852 2.283269 0.814857
    pair_coeff 3 p 22.721015 0.728733 1.103199 17.695345 6.693621
@@ -93,35 +89,29 @@ electronically excited and ionized states of matter can occur and
 coexist.  Furthermore, the interactions between particles -nuclei and
 electrons- reduce to the sum of a set of effective pairwise potentials
 in the eFF formulation.  The *eff/cut* style computes the pairwise
-Coulomb interactions between nuclei and electrons (E\_NN,E\_Ne,E\_ee),
-and the quantum-derived Pauli (E\_PR) and Kinetic energy interactions
-potentials between electrons (E\_KE) for a total energy expression
+Coulomb interactions between nuclei and electrons (E_NN,E_Ne,E_ee),
+and the quantum-derived Pauli (E_PR) and Kinetic energy interactions
+potentials between electrons (E_KE) for a total energy expression
 given as,
 
-.. image:: Eqs/eff_energy_expression.jpg
-   :align: center
+.. math::
+
+   U\left(R,r,s\right) =  E_{NN} \left( R \right) + E_{Ne} \left( {R,r,s} \right) + E_{ee} \left( {r,s} \right) + E_{KE} \left( {r,s} \right) + E_{PR} \left( { \uparrow  \downarrow ,S} \right)
 
 The individual terms are defined as follows:
 
-.. image:: Eqs/eff_KE.jpg
-   :align: center
+.. math::
 
-.. image:: Eqs/eff_NN.jpg
-   :align: center
+   E_{KE}  = & \frac{\hbar^2 }{{m_{e} }}\sum\limits_i {\frac{3}{{2s_i^2 }}} \\
+   E_{NN}  = & \frac{1}{{4\pi \varepsilon _0 }}\sum\limits_{i < j} {\frac{{Z_i Z_j }}{{R_{ij} }}} \\
+   E_{Ne}  = & - \frac{1}{{4\pi \varepsilon _0 }}\sum\limits_{i,j} {\frac{{Z_i }}{{R_{ij} }}Erf\left( {\frac{{\sqrt 2 R_{ij} }}{{s_j }}} \right)} \\
+   E_{ee}  = & \frac{1}{{4\pi \varepsilon _0 }}\sum\limits_{i < j} {\frac{1}{{r_{ij} }}Erf\left( {\frac{{\sqrt 2 r_{ij} }}{{\sqrt {s_i^2  + s_j^2 } }}} \right)} \\
+   E_{Pauli}  = & \sum\limits_{\sigma _i  = \sigma _j } {E\left( { \uparrow  \uparrow } \right)_{ij}}  + \sum\limits_{\sigma _i  \ne \sigma _j } {E\left( { \uparrow  \downarrow } \right)_{ij}} \\
 
-.. image:: Eqs/eff_Ne.jpg
-   :align: center
-
-.. image:: Eqs/eff_ee.jpg
-   :align: center
-
-.. image:: Eqs/eff_Pauli.jpg
-   :align: center
-
-where, s\_i correspond to the electron sizes, the sigmas i's to the
-fixed spins of the electrons, Z\_i to the charges on the nuclei, R\_ij
+where, s_i correspond to the electron sizes, the sigmas i's to the
+fixed spins of the electrons, Z_i to the charges on the nuclei, R_ij
 to the distances between the nuclei or the nuclei and electrons, and
-r\_ij to the distances between electrons.  For additional details see
+r_ij to the distances between electrons.  For additional details see
 :ref:`(Jaramillo-Botero) <Jaramillo-Botero>`.
 
 The overall electrostatics energy is given in Hartree units of energy
@@ -153,17 +143,15 @@ commands, or by mixing as described below:
 
 For *eff/cut*\ , the cutoff coefficient is optional.  If it is not used
 (as in some of the examples above), the default global value specified
-in the pair\_style command is used.
+in the pair_style command is used.
 
 For *eff/long* (not yet available) no cutoff will be specified for an
 individual I,J type pair via the :doc:`pair_coeff <pair_coeff>` command.
-All type pairs use the same global cutoff specified in the pair\_style
+All type pairs use the same global cutoff specified in the pair_style
 command.
 
-
 ----------
 
-
 The *limit/eradius* and *pressure/evirials* keywords are optional.
 Neither or both must be specified.  If not specified they are unset.
 
@@ -172,7 +160,7 @@ becoming excessively diffuse at very high temperatures were the
 Gaussian wave packet representation breaks down, and from expanding as
 free particles to infinite size.  If unset, electron radius is free to
 increase without bounds.  If set, a restraining harmonic potential of
-the form E = 1/2k\_ss\^2 for s > L\_box/2, where k\_s = 1 Hartrees/Bohr\^2,
+the form E = 1/2k_ss\^2 for s > L_box/2, where k_s = 1 Hartrees/Bohr\^2,
 is applied on the electron radius.
 
 The *pressure/evirials* keyword is used to control between two types
@@ -191,7 +179,7 @@ representations, after the "ecp" keyword.
 .. note::
 
    Default ECP parameters are provided for C, N, O, Al, and Si.
-   Users can modify these using the pair\_coeff command as exemplified
+   Users can modify these using the pair_coeff command as exemplified
    above.  For this, the User must distinguish between two different
    functional forms supported, one that captures the orbital overlap
    assuming the s-type core interacts with an s-like valence electron
@@ -203,7 +191,7 @@ representations, after the "ecp" keyword.
 .. note::
 
    there are two different pressures that can be reported for eFF
-   when defining this pair\_style, one (default) that considers electrons
+   when defining this pair_style, one (default) that considers electrons
    do not contribute radial virial components (i.e. electrons treated as
    incompressible 'rigid' spheres) and one that does.  The radial
    electronic contributions to the virials are only tallied if the
@@ -214,10 +202,8 @@ representations, after the "ecp" keyword.
    significant over long-term averaged runs (i.e. even though the energy
    partitioning changes, the total energy remains similar).
 
-
 ----------
 
-
 .. note::
 
    This implementation of eFF gives a reasonably accurate description
@@ -229,11 +215,10 @@ representations, after the "ecp" keyword.
    Si.  The ECP captures the orbital overlap between the core and valence
    electrons (i.e. Pauli repulsion) with one of the functional forms:
 
-.. image:: Eqs/eff_ECP1.jpg
-   :align: center
+.. math::
 
-.. image:: Eqs/eff_ECP2.jpg
-   :align: center
+   E_{Pauli(ECP_s)} = & p_1\exp\left(-\frac{p_2r^2}{p_3+s^2} \right) \\
+   E_{Pauli(ECP_p)} = & p_1\left( \frac{2}{p_2/s+s/p_2} \right)\left( r-p_3s\right)^2\exp \left[ -\frac{p_4\left( r-p_3s \right)^2}{p_5+s^2} \right]
 
 Where the 1st form correspond to core interactions with s-type valence
 electrons and the 2nd to core interactions with p-type valence
@@ -273,15 +258,13 @@ metals (e.g. beryllium) and semimetals such as boron; and various
 compounds containing ionic and/or multicenter bonds, such as boron
 dihydride.
 
-
 ----------
 
-
 **Mixing, shift, table, tail correction, restart, rRESPA info**\ :
 
 For atom type pairs I,J and I != J, the cutoff distance for the
 *eff/cut* style can be mixed.  The default mix value is *geometric*\ .
-See the "pair\_modify" command for details.
+See the "pair_modify" command for details.
 
 The :doc:`pair_modify <pair_modify>` shift option is not relevant for
 these pair styles.
@@ -294,21 +277,18 @@ These pair styles do not support the :doc:`pair_modify <pair_modify>`
 tail option for adding long-range tail corrections to energy and
 pressure.
 
-These pair styles write their information to :doc:`binary restart files <restart>`, so pair\_style and pair\_coeff commands do not need
+These pair styles write their information to :doc:`binary restart files <restart>`, so pair_style and pair_coeff commands do not need
 to be specified in an input script that reads a restart file.
 
 These pair styles can only be used via the *pair* keyword of the
 :doc:`run_style respa <run_style>` command.  They do not support the
 *inner*\ , *middle*\ , *outer* keywords.
 
-
 ----------
 
-
 Restrictions
 """"""""""""
 
-
 These pair styles will only be enabled if LAMMPS is built with the
 USER-EFF package.  It will only be enabled if LAMMPS was built with
 that package.  See the :doc:`Build package <Build_package>` doc page for
@@ -330,29 +310,18 @@ Related commands
 Default
 """""""
 
-If not specified, limit\_eradius = 0 and pressure\_with\_evirials = 0.
-
+If not specified, limit_eradius = 0 and pressure_with_evirials = 0.
 
 ----------
 
-
 .. _Su:
 
-
-
 **(Su)** Su and Goddard, Excited Electron Dynamics Modeling of Warm
 Dense Matter, Phys Rev Lett, 99:185003 (2007).
 
 .. _Jaramillo-Botero:
 
-
-
 **(Jaramillo-Botero)** Jaramillo-Botero, Su, Qi, Goddard, Large-scale,
 Long-term Non-adiabatic Electron Molecular Dynamics for Describing
 Material Properties and Phenomena in Extreme Environments, J Comp
 Chem, 32, 497-512 (2011).
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/pair_eim.rst b/doc/src/pair_eim.rst
index bdaa8733bb..bb09e10ed2 100644
--- a/doc/src/pair_eim.rst
+++ b/doc/src/pair_eim.rst
@@ -1,16 +1,15 @@
-.. index:: pair\_style eim
+.. index:: pair_style eim
 
-pair\_style eim command
-=======================
+pair_style eim command
+======================
 
-pair\_style eim/omp command
-===========================
+pair_style eim/omp command
+==========================
 
 Syntax
 """"""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    pair_style style
 
@@ -19,13 +18,12 @@ Syntax
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    pair_style eim
-   pair_coeff \* \* Na Cl ../potentials/ffield.eim Na Cl
-   pair_coeff \* \* Na Cl ffield.eim  Na Na Na Cl
-   pair_coeff \* \* Na Cl ../potentials/ffield.eim Cl NULL Na
+   pair_coeff * * Na Cl ../potentials/ffield.eim Na Cl
+   pair_coeff * * Na Cl ffield.eim  Na Na Na Cl
+   pair_coeff * * Na Cl ../potentials/ffield.eim Cl NULL Na
 
 Description
 """""""""""
@@ -34,30 +32,42 @@ Style *eim* computes pairwise interactions for ionic compounds
 using embedded-ion method (EIM) potentials :ref:`(Zhou) <Zhou2>`.  The
 energy of the system E is given by
 
-.. image:: Eqs/pair_eim1.jpg
-   :align: center
+.. math::
+
+   E = \frac{1}{2} \sum_{i=1}^{N} \sum_{j=i_1}^{i_N} \phi_{ij} \left(r_{ij}\right) + \sum_{i=1}^{N}E_i\left(q_i,\sigma_i\right)
 
 The first term is a double pairwise sum over the J neighbors of all I
-atoms, where phi\_ij is a pair potential.  The second term sums over
-the embedding energy E\_i of atom I, which is a function of its charge
-q\_i and the electrical potential sigma\_i at its location.  E\_i, q\_i,
-and sigma\_i are calculated as
+atoms, where :math:`\phi_{ij}` is a pair potential.  The second term sums over
+the embedding energy E_i of atom I, which is a function of its charge
+q_i and the electrical potential :math:`\sigma_i` at its location.  E_i, q_i,
+and :math:`sigma_i` are calculated as
 
-.. image:: Eqs/pair_eim2.jpg
-   :align: center
+.. math::
 
-where eta\_ji is a pairwise function describing electron flow from atom
-I to atom J, and psi\_ij is another pairwise function.  The multi-body
+   q_i  = & \sum_{j=i_1}^{i_N} \eta_{ji}\left(r_{ij}\right) \\
+   \sigma_i  = & \sum_{j=i_1}^{i_N} q_j \cdot \psi_{ij} \left(r_{ij}\right) \\
+   E_i\left(q_i,\sigma_i\right)  = & \frac{1}{2} \cdot q_i \cdot \sigma_i
+
+where :math:`\eta_{ji} is a pairwise function describing electron flow from atom
+I to atom J, and :math:`\psi_{ij}` is another pairwise function.  The multi-body
 nature of the EIM potential is a result of the embedding energy term.
 A complete list of all the pair functions used in EIM is summarized
 below
 
-.. image:: Eqs/pair_eim3.jpg
-   :align: center
+.. math::
 
-Here E\_b, r\_e, r\_(c,phi), alpha, beta, A\_(psi), zeta, r\_(s,psi),
-r\_(c,psi), A\_(eta), r\_(s,eta), r\_(c,eta), chi, and pair function type
-p are parameters, with subscripts ij indicating the two species of
+   \phi_{ij}\left(r\right) = & \left\{ \begin{array}{lr}
+   \left[\frac{E_{b,ij}\beta_{ij}}{\beta_{ij}-\alpha_{ij}}\exp\left(-\alpha_{ij} \frac{r-r_{e,ij}}{r_{e,ij}}\right)-\frac{E_{b,ij}\alpha_{ij}}{\beta_{ij}-\alpha_{ij}}\exp\left(-\beta_{ij} \frac{r-r_{e,ij}}{r_{e,ij}}\right)\right]f_c\left(r,r_{e,ij},r_{c,\phi,ij}\right),& p_{ij}=1 \\
+   \left[\frac{E_{b,ij}\beta_{ij}}{\beta_{ij}-\alpha_{ij}} \left(\frac{r_{e,ij}}{r}\right)^{\alpha_{ij}}  -\frac{E_{b,ij}\alpha_{ij}}{\beta_{ij}-\alpha_{ij}} \left(\frac{r_{e,ij}}{r}\right)^{\beta_{ij}}\right]f_c\left(r,r_{e,ij},r_{c,\phi,ij}\right),& p_{ij}=2
+   \end{array}
+   \right.\\
+   \eta_{ji} = & A_{\eta,ij}\left(\chi_j-\chi_i\right)f_c\left(r,r_{s,\eta,ij},r_{c,\eta,ij}\right) \\
+   \psi_{ij}\left(r\right) = & A_{\psi,ij}\exp\left(-\zeta_{ij}r\right)f_c\left(r,r_{s,\psi,ij},r_{c,\psi,ij}\right) \\
+   f_{c}\left(r,r_p,r_c\right) = & 0.510204 \mathrm{erfc}\left[\frac{1.64498\left(2r-r_p-r_c\right)}{r_c-r_p}\right] - 0.010204
+
+Here :math:`E_b, r_e, r_(c,\phi), \alpha, \beta, A_(\psi), \zeta, r_(s,\psi),
+r_(c,\psi), A_(\eta), r_(s,\eta), r_(c,\eta), \chi,` and pair function type
+*p* are parameters, with subscripts *ij* indicating the two species of
 atoms in the atomic pair.
 
 .. note::
@@ -67,12 +77,10 @@ atoms in the atomic pair.
    charge on each atom and thus requires you to assign a charge to each
    atom, e.g. the *charge* or *full* atom styles.  This is because the
    EIM potential infers the charge on an atom from the equation above for
-   q\_i; you do not assign charges explicitly.
-
+   q_i; you do not assign charges explicitly.
 
 ----------
 
-
 All the EIM parameters are listed in a potential file which is
 specified by the :doc:`pair_coeff <pair_coeff>` command.  This is an
 ASCII text file in a format described below.  The "ffield.eim" file
@@ -82,15 +90,15 @@ A system with any combination of these elements can be modeled.  This
 file is parameterized in terms of LAMMPS :doc:`metal units <units>`.
 
 Note that unlike other potentials, cutoffs for EIM potentials are not
-set in the pair\_style or pair\_coeff command; they are specified in the
+set in the pair_style or pair_coeff command; they are specified in the
 EIM potential file itself.  Likewise, the EIM potential file lists
 atomic masses; thus you do not need to use the :doc:`mass <mass>`
 command to specify them.
 
-Only a single pair\_coeff command is used with the *eim* style which
+Only a single pair_coeff command is used with the *eim* style which
 specifies an EIM potential file and the element(s) to extract
 information for.  The EIM elements are mapped to LAMMPS atom types by
-specifying N additional arguments after the filename in the pair\_coeff
+specifying N additional arguments after the filename in the pair_coeff
 command, where N is the number of LAMMPS atom types:
 
 * Elem1, Elem2, ...
@@ -103,12 +111,11 @@ to specify the path for the potential file.
 As an example like one of those above, suppose you want to model a
 system with Na and Cl atoms.  If your LAMMPS simulation has 4 atoms
 types and you want the 1st 3 to be Na, and the 4th to be Cl, you would
-use the following pair\_coeff command:
+use the following pair_coeff command:
 
+.. code-block:: LAMMPS
 
-.. parsed-literal::
-
-   pair_coeff \* \* Na Cl ffield.eim Na Na Na Cl
+   pair_coeff * * Na Cl ffield.eim Na Na Na Cl
 
 The 1st 2 arguments must be \* \* so as to span all LAMMPS atom types.
 The filename is the EIM potential file.  The Na and Cl arguments
@@ -140,17 +147,15 @@ radius (LAMMPS ignores it), ionic radius (LAMMPS ignores it), cohesive
 energy (LAMMPS ignores it), and q0 (must be 0).
 
 Lines starting with "pair:" are entered as: element 1, element 2,
-r\_(c,phi), r\_(c,phi) (redundant for historical reasons), E\_b, r\_e,
-alpha, beta, r\_(c,eta), A\_(eta), r\_(s,eta), r\_(c,psi), A\_(psi), zeta,
-r\_(s,psi), and p.
+r_(c,phi), r_(c,phi) (redundant for historical reasons), E_b, r_e,
+alpha, beta, r_(c,eta), A_(eta), r_(s,eta), r_(c,psi), A_(psi), zeta,
+r_(s,psi), and p.
 
 The lines in the file can be in any order; LAMMPS extracts the info it
 needs.
 
-
 ----------
 
-
 Styles with a *gpu*\ , *intel*\ , *kk*\ , *omp*\ , or *opt* suffix are
 functionally the same as the corresponding style without the suffix.
 They have been optimized to run faster, depending on your available
@@ -169,14 +174,11 @@ by including their suffix, or you can use the :doc:`-suffix command-line switch
 See the :doc:`Speed packages <Speed_packages>` doc page for more
 instructions on how to use the accelerated styles effectively.
 
-
 ----------
 
-
 Restrictions
 """"""""""""
 
-
 This style is part of the MANYBODY package.  It is only enabled if
 LAMMPS was built with that package.
 
@@ -187,18 +189,9 @@ Related commands
 
 **Default:** none
 
-
 ----------
 
-
 .. _Zhou2:
 
-
-
 **(Zhou)** Zhou, submitted for publication (2010).  Please contact
 Xiaowang Zhou (Sandia) for details via email at xzhou at sandia.gov.
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/pair_exp6_rx.rst b/doc/src/pair_exp6_rx.rst
index 01ef5ad9d1..7f2be1817a 100644
--- a/doc/src/pair_exp6_rx.rst
+++ b/doc/src/pair_exp6_rx.rst
@@ -1,16 +1,15 @@
-.. index:: pair\_style exp6/rx
+.. index:: pair_style exp6/rx
 
-pair\_style exp6/rx command
-===========================
+pair_style exp6/rx command
+==========================
 
-pair\_style exp6/rx/kk command
-==============================
+pair_style exp6/rx/kk command
+=============================
 
 Syntax
 """"""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    pair_style exp6/rx cutoff ...
 
@@ -20,17 +19,16 @@ Syntax
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    pair_style exp6/rx 10.0
    pair_style exp6/rx 10.0 fractional
    pair_style exp6/rx 10.0 molecular
-   pair_coeff \* \* exp6.params h2o h2o exponent 1.0 1.0 10.0
-   pair_coeff \* \* exp6.params h2o 1fluid exponent 1.0 1.0 10.0
-   pair_coeff \* \* exp6.params 1fluid 1fluid exponent 1.0 1.0 10.0
-   pair_coeff \* \* exp6.params 1fluid 1fluid none 10.0
-   pair_coeff \* \* exp6.params 1fluid 1fluid polynomial filename 10.0
+   pair_coeff * * exp6.params h2o h2o exponent 1.0 1.0 10.0
+   pair_coeff * * exp6.params h2o 1fluid exponent 1.0 1.0 10.0
+   pair_coeff * * exp6.params 1fluid 1fluid exponent 1.0 1.0 10.0
+   pair_coeff * * exp6.params 1fluid 1fluid none 10.0
+   pair_coeff * * exp6.params 1fluid 1fluid polynomial filename 10.0
 
 Description
 """""""""""
@@ -43,17 +41,19 @@ one CG particle can interact with a species in a neighboring CG
 particle through a site-site interaction potential model.  The
 *exp6/rx* style computes an exponential-6 potential given by
 
-.. image:: Eqs/pair_exp6_rx.jpg
-   :align: center
+.. math::
 
-where the *epsilon* parameter determines the depth of the potential
-minimum located at *Rm*\ , and *alpha* determines the softness of the repulsion.
+   U_{ij}(r) = \frac{\epsilon}{\alpha-6}\{6\exp[\alpha(1-\frac{r_{ij}}{R_{m}})]-\alpha(\frac{R_{m}}{r_{ij}})^6\}
+
+where the :math:`\epsilon` parameter determines the depth of the
+potential minimum located at :math:`R_m`, and :math:`\alpha` determines
+the softness of the repulsion.
 
 The coefficients must be defined for each species in a given particle
 type via the :doc:`pair_coeff <pair_coeff>` command as in the examples
 above, where the first argument is the filename that includes the
 exponential-6 parameters for each species.  The file includes the
-species tag followed by the *alpha*\ , *epsilon* and *Rm*
+species tag followed by the :math:`\alpha, \epsilon` and :math:`R_m`
 parameters. The format of the file is described below.
 
 The second and third arguments specify the site-site interaction
@@ -74,33 +74,30 @@ to scale the EXP-6 parameters as reactions occur.  Currently, there
 are three scaling options:  *exponent*\ , *polynomial* and *none*\ .
 
 Exponent scaling requires two additional arguments for scaling
-the *Rm* and *epsilon* parameters, respectively.  The scaling factor
+the :math:`R_m` and :math:`\epsilon` parameters, respectively.  The scaling factor
 is computed by phi\^exponent, where phi is the number of molecules
 represented by the coarse-grain particle and exponent is specified
-as a pair coefficient argument for *Rm* and *epsilon*\ , respectively.
-The *Rm* and *epsilon* parameters are multiplied by the scaling
+as a pair coefficient argument for :math:`R_m` and :math:`\epsilon`, respectively.
+The :math:`R_m` and :math:`\epsilon` parameters are multiplied by the scaling
 factor to give the scaled interaction parameters for the CG particle.
 
 Polynomial scaling requires a filename to be specified as a pair
 coeff argument.  The file contains the coefficients to a fifth order
-polynomial for the *alpha*\ , *epsilon* and *Rm* parameters that depend
+polynomial for the :math:`\alpha`, :math:`\epsilon` and :math:`R_m` parameters that depend
 upon phi (the number of molecules represented by the CG particle).
 The format of a polynomial file is provided below.
 
 The *none* option to the scaling does not have any additional pair coeff
 arguments.  This is equivalent to specifying the *exponent* option with
-*Rm* and *epsilon* exponents of 0.0 and 0.0, respectively.
+:math:`R_m` and :math:`\epsilon` exponents of 0.0 and 0.0, respectively.
 
 The final argument specifies the interaction cutoff (optional).
 
-
 ----------
 
-
 The format of a tabulated file is as follows (without the
 parenthesized comments):
 
-
 .. parsed-literal::
 
    # exponential-6 parameters for various species      (one or more comment or blank lines)
@@ -113,7 +110,6 @@ parenthesized comments):
 The format of the polynomial scaling file as follows (without the
 parenthesized comments):
 
-
 .. parsed-literal::
 
    # POLYNOMIAL FILE          (one or more comment or blank lines)
@@ -133,29 +129,33 @@ between sections.
 
 Following a blank line, the next N lines list the species and their
 corresponding parameters.  The first argument is the species tag, the
-second argument is the exp6 tag, the 3rd argument is the *alpha*
-parameter (energy units), the 4th argument is the *epsilon* parameter
-(energy-distance\^6 units), and the 5th argument is the *Rm* parameter
+second argument is the exp6 tag, the 3rd argument is the :math:`\alpha`
+parameter (energy units), the 4th argument is the :math:`\epsilon` parameter
+(energy-distance\^6 units), and the 5th argument is the :math:`R_m` parameter
 (distance units).  If a species tag of "1fluid" is listed as a pair
 coefficient, a one-fluid approximation is specified where a
 concentration-dependent combination of the parameters is computed
 through the following equations:
 
-.. image:: Eqs/pair_exp6_rx_oneFluid.jpg
-   :align: center
+.. math::
+
+   R_{m}^{3} = & \sum_{a}\sum_{b} x_{a}x_{b}R_{m,ab}^{3} \\
+   \epsilon  = & \frac{1}{R_{m}^{3}}\sum_{a}\sum_{b} x_{a}x_{b}\epsilon_{ab}R_{m,ab}^{3} \\
+   \alpha    = & \frac{1}{\epsilon R_{m}^{3}}\sum_{a}\sum_{b} x_{a}x_{b}\alpha_{ab}\epsilon_{ab}R_{m,ab}^{3}
 
 where
 
-.. image:: Eqs/pair_exp6_rx_oneFluid2.jpg
-   :align: center
+.. math::
 
-and xa and xb are the mole fractions of a and b, respectively, which
+   \epsilon_{ab} = & \sqrt{\epsilon_{a}\epsilon_{b}} \\
+   R_{m,ab}      = & \frac{R_{m,a}+R_{m,b}}{2} \\
+   \alpha_{ab}   = & \sqrt{\alpha_{a}\alpha_{b}}
+
+and :math:`x_a` and :math:`x_b` are the mole fractions of a and b, respectively, which
 comprise the gas mixture.
 
-
 ----------
 
-
 **Mixing, shift, table, tail correction, restart, rRESPA info**\ :
 
 This pair style does not support mixing.  Thus, coefficients for all
@@ -164,14 +164,12 @@ I,J pairs must be specified explicitly.
 This style does not support the :doc:`pair_modify <pair_modify>` shift option
 for the energy of the exp() and 1/r\^6 portion of the pair interaction.
 
-This style does not support the pair\_modify tail option for adding long-range
+This style does not support the pair_modify tail option for adding long-range
 tail corrections to energy and pressure for the A,C terms in the
 pair interaction.
 
-
 ----------
 
-
 Styles with a *gpu*\ , *intel*\ , *kk*\ , *omp*\ , or *opt* suffix are
 functionally the same as the corresponding style without the suffix.
 They have been optimized to run faster, depending on your available
@@ -190,14 +188,11 @@ by including their suffix, or you can use the :doc:`-suffix command-line switch
 See the :doc:`Speed packages <Speed_packages>` doc page for more
 instructions on how to use the accelerated styles effectively.
 
-
 ----------
 
-
 Restrictions
 """"""""""""
 
-
 This command is part of the USER-DPD package.  It is only enabled if
 LAMMPS was built with that package.  See the :doc:`Build package <Build_package>` doc page for more info.
 
@@ -207,8 +202,3 @@ Related commands
 :doc:`pair_coeff <pair_coeff>`
 
 **Default:** fractional weighting
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/pair_extep.rst b/doc/src/pair_extep.rst
index 8d5da3d974..8e5bc3ac9f 100644
--- a/doc/src/pair_extep.rst
+++ b/doc/src/pair_extep.rst
@@ -1,24 +1,22 @@
-.. index:: pair\_style extep
+.. index:: pair_style extep
 
-pair\_style extep command
-=========================
+pair_style extep command
+========================
 
 Syntax
 """"""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    pair_style extep
 
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    pair_style extep
-   pair_coeff \* \* BN.extep B N
+   pair_coeff * * BN.extep B N
 
 Description
 """""""""""
@@ -26,34 +24,23 @@ Description
 Style *extep* computes the Extended Tersoff Potential (ExTeP)
 interactions as described in :ref:`(Los2017) <Los2017>`.
 
-
 ----------
 
-
 Restrictions
 """"""""""""
- none
+none
 
 Related commands
 """"""""""""""""
 
-"pair\_tersoff" pair\_tersoff.html
+"pair_tersoff" pair_tersoff.html
 
 **Default:** none
 
-
 ----------
 
-
 .. _Los2017:
 
-
-
 **(Los2017)** J. H. Los et al. "Extended Tersoff potential for boron nitride:
 Energetics and elastic properties of pristine and defective h-BN",
 Phys. Rev. B 96 (184108), 2017.
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/pair_fep_soft.rst b/doc/src/pair_fep_soft.rst
index d1e64ae5df..c8f7d0d7ab 100644
--- a/doc/src/pair_fep_soft.rst
+++ b/doc/src/pair_fep_soft.rst
@@ -1,77 +1,75 @@
-.. index:: pair\_style lj/cut/soft
+.. index:: pair_style lj/cut/soft
 
-pair\_style lj/cut/soft command
-===============================
+pair_style lj/cut/soft command
+==============================
 
-pair\_style lj/cut/soft/omp command
-===================================
-
-pair\_style lj/cut/coul/cut/soft command
-========================================
-
-pair\_style lj/cut/coul/cut/soft/omp command
-============================================
-
-pair\_style lj/cut/coul/long/soft command
-=========================================
-
-pair\_style lj/cut/coul/long/soft/omp command
-=============================================
-
-pair\_style lj/cut/tip4p/long/soft command
-==========================================
-
-pair\_style lj/cut/tip4p/long/soft/omp command
-==============================================
-
-pair\_style lj/charmm/coul/long/soft command
-============================================
-
-pair\_style lj/charmm/coul/long/soft/omp command
-================================================
-
-pair\_style lj/class2/soft command
+pair_style lj/cut/soft/omp command
 ==================================
 
-pair\_style lj/class2/coul/cut/soft command
-===========================================
-
-pair\_style lj/class2/coul/long/soft command
-============================================
-
-pair\_style coul/cut/soft command
-=================================
-
-pair\_style coul/cut/soft/omp command
-=====================================
-
-pair\_style coul/long/soft command
-==================================
-
-pair\_style coul/long/soft/omp command
-======================================
-
-pair\_style tip4p/long/soft command
-===================================
-
-pair\_style tip4p/long/soft/omp command
+pair_style lj/cut/coul/cut/soft command
 =======================================
 
-pair\_style morse/soft command
+pair_style lj/cut/coul/cut/soft/omp command
+===========================================
+
+pair_style lj/cut/coul/long/soft command
+========================================
+
+pair_style lj/cut/coul/long/soft/omp command
+============================================
+
+pair_style lj/cut/tip4p/long/soft command
+==========================================
+
+pair_style lj/cut/tip4p/long/soft/omp command
+==============================================
+
+pair_style lj/charmm/coul/long/soft command
+============================================
+
+pair_style lj/charmm/coul/long/soft/omp command
+================================================
+
+pair_style lj/class2/soft command
+==================================
+
+pair_style lj/class2/coul/cut/soft command
+===========================================
+
+pair_style lj/class2/coul/long/soft command
+============================================
+
+pair_style coul/cut/soft command
+=================================
+
+pair_style coul/cut/soft/omp command
+=====================================
+
+pair_style coul/long/soft command
+==================================
+
+pair_style coul/long/soft/omp command
+======================================
+
+pair_style tip4p/long/soft command
+===================================
+
+pair_style tip4p/long/soft/omp command
+=======================================
+
+pair_style morse/soft command
 ==============================
 
 Syntax
 """"""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    pair_style style args
 
 * style = *lj/cut/soft* or *lj/cut/coul/cut/soft* or *lj/cut/coul/long/soft* or *lj/cut/tip4p/long/soft* or *lj/charmm/coul/long/soft* or *lj/class2/soft* or *lj/class2/coul/cut/soft* or *lj/class2/coul/long/soft* or *coul/cut/soft* or *coul/long/soft* or *tip4p/long/soft* or *morse/soft*
 * args = list of arguments for a particular style
 
-
 .. parsed-literal::
 
      *lj/cut/soft* args = n alpha_lj cutoff
@@ -127,51 +125,50 @@ Syntax
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    pair_style lj/cut/soft 2.0 0.5 9.5
-   pair_coeff \* \* 0.28 3.1 1.0
+   pair_coeff * * 0.28 3.1 1.0
    pair_coeff 1 1 0.28 3.1 1.0 9.5
 
    pair_style lj/cut/coul/cut/soft 2.0 0.5 10.0 9.5
    pair_style lj/cut/coul/cut/soft 2.0 0.5 10.0 9.5 9.5
-   pair_coeff \* \* 0.28 3.1 1.0
+   pair_coeff * * 0.28 3.1 1.0
    pair_coeff 1 1 0.28 3.1 0.5 10.0
    pair_coeff 1 1 0.28 3.1 0.5 10.0 9.5
 
    pair_style lj/cut/coul/long/soft 2.0 0.5 10.0 9.5
    pair_style lj/cut/coul/long/soft 2.0 0.5 10.0 9.5 9.5
-   pair_coeff \* \* 0.28 3.1 1.0
+   pair_coeff * * 0.28 3.1 1.0
    pair_coeff 1 1 0.28 3.1 0.0 10.0
    pair_coeff 1 1 0.28 3.1 0.0 10.0 9.5
 
    pair_style lj/cut/tip4p/long/soft 1 2 7 8 0.15 2.0 0.5 10.0 9.8
    pair_style lj/cut/tip4p/long/soft 1 2 7 8 0.15 2.0 0.5 10.0 9.8 9.5
-   pair_coeff \* \* 0.155 3.1536 1.0
+   pair_coeff * * 0.155 3.1536 1.0
    pair_coeff 1 1 0.155 3.1536 1.0 9.5
 
    pair_style lj/charmm/coul/long 2.0 0.5 10.0 8.0 10.0
    pair_style lj/charmm/coul/long 2.0 0.5 10.0 8.0 10.0 9.0
-   pair_coeff \* \* 0.28 3.1 1.0
+   pair_coeff * * 0.28 3.1 1.0
    pair_coeff 1 1 0.28 3.1 1.0 0.14 3.1
 
    pair_style lj/class2/coul/long/soft 2.0 0.5 10.0 9.5
    pair_style lj/class2/coul/long/soft 2.0 0.5 10.0 9.5 9.5
-   pair_coeff \* \* 0.28 3.1 1.0
+   pair_coeff * * 0.28 3.1 1.0
    pair_coeff 1 1 0.28 3.1 0.0 10.0
    pair_coeff 1 1 0.28 3.1 0.0 10.0 9.5
 
    pair_style coul/long/soft 1.0 10.0 9.5
-   pair_coeff \* \* 1.0
+   pair_coeff * * 1.0
    pair_coeff 1 1 1.0 9.5
 
    pair_style tip4p/long/soft 1 2 7 8 0.15 2.0 0.5 10.0 9.8
-   pair_coeff \* \* 1.0
+   pair_coeff * * 1.0
    pair_coeff 1 1 1.0 9.5
 
    pair_style morse/soft 4 0.9 10.0
-   pair_coeff \* \* 100.0 2.0 1.5 1.0
+   pair_coeff * * 100.0 2.0 1.5 1.0
    pair_coeff 1 1 100.0 2.0 1.5 1.0 3.0
 
 Description
@@ -187,55 +184,65 @@ are suited for "alchemical" free energy calculations using the :doc:`fix adapt/f
 The *lj/cut/soft* style and related sub-styles compute the 12-6 Lennard-Jones
 and Coulomb potentials modified by a soft core, with the functional form
 
-.. image:: Eqs/pair_lj_soft.jpg
-   :align: center
+.. math::
+
+   E = \lambda^n 4 \epsilon \left\{
+   \frac{1}{ \left[ \alpha_{\mathrm{LJ}} (1-\lambda)^2 +
+   \left( \displaystyle\frac{r}{\sigma} \right)^6 \right]^2 } -
+   \frac{1}{ \alpha_{\mathrm{LJ}} (1-\lambda)^2 +
+   \left( \displaystyle\frac{r}{\sigma} \right)^6 }
+   \right\} \qquad r < r_c
 
 The *lj/class2/soft* style is a 9-6 potential with the exponent of the
 denominator of the first term in brackets taking the value 1.5 instead of 2
 (other details differ, see the form of the potential in
-:doc:`pair\_class2 <pair_class2>`).
+:doc:`pair_style lj/class2 <pair_class2>`).
 
 Coulomb interactions can also be damped with a soft core at short distance,
 
-.. image:: Eqs/pair_coul_soft.jpg
-   :align: center
+.. math::
 
-In the Coulomb part C is an energy-conversion constant, q\_i and q\_j
-are the charges on the 2 atoms, and epsilon is the dielectric constant
-which can be set by the :doc:`dielectric <dielectric>` command.
+   E = \lambda^n \frac{ C q_i q_j}{\epsilon \left[ \alpha_{\mathrm{C}}
+   (1-\lambda)^2 + r^2 \right]^{1/2}} \qquad r < r_c
 
-The coefficient lambda is an activation parameter. When lambda = 1 the pair
-potential is identical to a Lennard-Jones term or a Coulomb term or a
-combination of both. When lambda = 0 the interactions are deactivated. The
-transition between these two extrema is smoothed by a soft repulsive core in
-order to avoid singularities in potential energy and forces when sites are
-created or annihilated and can overlap :ref:`(Beutler) <Beutler>`.
+In the Coulomb part :math:`C` is an energy-conversion constant, :math:`q_i` and
+:math:`q_j` are the charges on the 2 atoms, and epsilon is the dielectric
+constant which can be set by the :doc:`dielectric <dielectric>` command.
 
-The parameters n, alpha\_LJ and alpha\_C are set in the
-:doc:`pair_style <pair_style>` command, before the cutoffs.  Usual choices for the
-exponent are n = 2 or n = 1. For the remaining coefficients alpha\_LJ = 0.5 and
-alpha\_C = 10 Angstrom\^2 are appropriate choices. Plots of the 12/6 LJ and
-Coulomb terms are shown below, for lambda ranging from 1 to 0 every 0.1.
+The coefficient lambda is an activation parameter. When :math:`\lambda = 1` the
+pair potential is identical to a Lennard-Jones term or a Coulomb term or a
+combination of both. When :math:`\lambda = 0` the interactions are
+deactivated. The transition between these two extrema is smoothed by a soft
+repulsive core in order to avoid singularities in potential energy and forces
+when sites are created or annihilated and can overlap :ref:`(Beutler)
+<Beutler>`.
+
+The parameters :math:`n`, :math:`\alpha_\mathrm{LJ}` and
+:math:`\alpha_\mathrm{C}` are set in the :doc:`pair_style <pair_style>` command,
+before the cutoffs.  Usual choices for the exponent are :math:`n = 2` or
+:math:`n = 1`. For the remaining coefficients :math:`\alpha_\mathrm{LJ} = 0.5`
+and :math:`\alpha_\mathrm{C} = 10~\text{A}^2` are appropriate choices. Plots of
+the 12-6 LJ and Coulomb terms are shown below, for lambda ranging from 1 to 0
+every 0.1.
 
 .. image:: JPG/lj_soft.jpg
 .. image:: JPG/coul_soft.jpg
 
-
 For the *lj/cut/coul/cut/soft* or *lj/cut/coul/long/soft* pair styles, as well
 as for the equivalent *class2* versions, the following coefficients must be
 defined for each pair of atoms types via the :doc:`pair_coeff <pair_coeff>`
 command as in the examples above, or in the data file or restart files read by
-the :doc:`read_data <read_data>` or :doc:`read_restart <read_restart>` commands, or
-by mixing as described below:
+the :doc:`read_data <read_data>` or :doc:`read_restart <read_restart>` commands,
+or by mixing as described below:
 
-* epsilon (energy units)
-* sigma (distance units)
-* lambda (activation parameter, between 0 and 1)
+* :math:`\epsilon` (energy units)
+* :math:`\sigma` (distance units)
+* :math:`\lambda` (activation parameter, between 0 and 1)
 * cutoff1 (distance units)
 * cutoff2 (distance units)
 
 The latter two coefficients are optional.  If not specified, the global
-LJ and Coulombic cutoffs specified in the pair\_style command are used.
+LJ and Coulombic cutoffs specified in the pair_style command are used.
 If only one cutoff is specified, it is used as the cutoff for both LJ
 and Coulombic interactions for this type pair.  If both coefficients
 are specified, they are used as the LJ and Coulombic cutoffs for this
@@ -245,88 +252,95 @@ since it has no Coulombic terms. For the *coul/cut/soft* and
 specified.
 
 Style *lj/cut/tip4p/long/soft* implements a soft-core version of the TIP4P water
-model. The usage of the TIP4P pair style is documented in the
-:doc:`pair_lj <pair_lj>` styles. In the soft version the parameters n, alpha\_LJ
-and alpha\_C are set in the :doc:`pair_style <pair_style>` command, after the
-specific parameters of the TIP4P water model and before the cutoffs. The
-activation parameter lambda is supplied as an argument of the
-:doc:`pair_coeff <pair_coeff>` command, after epsilon and sigma and before the
-optional cutoffs.
+model. The usage of the TIP4P pair style is documented in the :doc:`pair_lj
+<pair_lj>` styles. In the soft version the parameters :math:`n`,
+:math:`\alpha_\mathrm{LJ}` and :math:`\alpha_\mathrm {C}` are set in the
+:doc:`pair_style <pair_style>` command, after the specific parameters of the
+TIP4P water model and before the cutoffs. The activation parameter lambda is
+supplied as an argument of the :doc:`pair_coeff <pair_coeff>` command, after
+epsilon and sigma and before the optional cutoffs.
 
 Style *lj/charmm/coul/long/soft* implements a soft-core version of the modified
-12-6 LJ potential used in CHARMM and documented in the
-:doc:`pair\_lj\_charmm <pair_charmm>` style. In the soft version the parameters n,
-alpha\_LJ and alpha\_C are set in the :doc:`pair_style <pair_style>` command, before
-the global cutoffs. The activation parameter lambda is introduced as an argument
-of the :doc:`pair_coeff <pair_coeff>` command, after epsilon and sigma and
-before the optional eps14 and sigma14.
+12-6 LJ potential used in CHARMM and documented in the :doc:`pair_style
+lj/charmm/coul/long <pair_charmm>` style. In the soft version the parameters
+:math:`n`, :math:`\alpha_\mathrm{LJ}` and :math:`\alpha_\mathrm{C}` are set in
+the :doc:`pair_style <pair_style>` command, before the global cutoffs. The
+activation parameter lambda is introduced as an argument of the :doc:`pair_coeff
+<pair_coeff>` command, after :math:`\epsilon` and :math:`\sigma` and before the
+optional eps14 and sigma14.
 
 Style *lj/class2/soft* implements a soft-core version of the 9-6 potential in
-:doc:`pair\_class2 <pair_class2>`. In the soft version the parameters n, alpha\_LJ
-and alpha\_C are set in the :doc:`pair_style <pair_style>` command, before the
-global cutoffs. The activation parameter lambda is introduced as an argument of
-the the :doc:`pair_coeff <pair_coeff>` command, after epsilon and sigma and before
-the optional cutoffs.
+:doc:`pair_style lj/class2 <pair_class2>`. In the soft version the parameters
+:math:`n`, :math:`\alpha_\mathrm{LJ}` and :math:`\alpha_\mathrm{C}` are set in the
+:doc:`pair_style <pair_style>` command, before the global cutoffs. The
+activation parameter lambda is introduced as an argument of the the
+:doc:`pair_coeff <pair_coeff>` command, after :math:`\epsilon` and
+:math:`\sigma` and before the optional cutoffs.
 
-The *coul/cut/soft*\ , *coul/long/soft* and *tip4p/long/soft* sub-styles
-are designed to be combined with other pair potentials via the
-:doc:`pair_style hybrid/overlay <pair_hybrid>` command.  This is because
-they have no repulsive core.  Hence, if used by themselves, there will
-be no repulsion to keep two oppositely charged particles from
-overlapping each other. In this case, if lambda = 1, a singularity may
-occur.  These sub-styles are suitable to represent charges embedded in
-the Lennard-Jones radius of another site (for example hydrogen atoms
-in several water models).
+The *coul/cut/soft*\ , *coul/long/soft* and *tip4p/long/soft* sub-styles are
+designed to be combined with other pair potentials via the :doc:`pair_style
+hybrid/overlay <pair_hybrid>` command.  This is because they have no repulsive
+core.  Hence, if used by themselves, there will be no repulsion to keep two
+oppositely charged particles from overlapping each other. In this case, if
+:math:`\lambda = 1`, a singularity may occur.  These sub-styles are suitable to
+represent charges embedded in the Lennard-Jones radius of another site (for
+example hydrogen atoms in several water models).
 
 .. note::
 
-   When using the soft-core Coulomb potentials with long-range
-   solvers (\ *coul/long/soft*\ , *lj/cut/coul/long/soft*\ , etc.)  in a free
-   energy calculation in which sites holding electrostatic charges are
-   being created or annihilated (using :doc:`fix adapt/fep <fix_adapt_fep>`
-   and :doc:`compute fep <compute_fep>`) it is important to adapt both the
-   lambda activation parameter (from 0 to 1, or the reverse) and the
-   value of the charge (from 0 to its final value, or the reverse). This
-   ensures that long-range electrostatic terms (kspace) are correct. It
-   is not necessary to use soft-core Coulomb potentials if the van der
-   Waals site is present during the free-energy route, thus avoiding
-   overlap of the charges. Examples are provided in the LAMMPS source
-   directory tree, under examples/USER/fep.
+   When using the soft-core Coulomb potentials with long-range solvers (\
+   *coul/long/soft*\ , *lj/cut/coul/long/soft*\ , etc.)  in a free energy
+   calculation in which sites holding electrostatic charges are being created or
+   annihilated (using :doc:`fix adapt/fep <fix_adapt_fep>` and :doc:`compute fep
+   <compute_fep>`) it is important to adapt both the :math:`\lambda` activation
+   parameter (from 0 to 1, or the reverse) and the value of the charge (from 0
+   to its final value, or the reverse). This ensures that long-range
+   electrostatic terms (kspace) are correct. It is not necessary to use
+   soft-core Coulomb potentials if the van der Waals site is present during the
+   free-energy route, thus avoiding overlap of the charges. Examples are
+   provided in the LAMMPS source directory tree, under examples/USER/fep.
 
 .. note::
 
-   To avoid division by zero do not set sigma = 0 in the *lj/cut/soft* and
-   related styles; use the lambda parameter instead to activate/deactivate
-   interactions, or use epsilon = 0 and sigma = 1. Alternatively, when sites do not
-   interact though the Lennard-Jones term the *coul/long/soft* or similar sub-style
-   can be used via the :doc:`pair_style hybrid/overlay <pair_hybrid>` command.
-
+   To avoid division by zero do not set :math:`\sigma = 0` in the *lj/cut/soft*
+   and related styles; use the lambda parameter instead to activate/deactivate
+   interactions, or use :math:`\epsilon = 0` and :math:`\sigma = 1`.
+   Alternatively, when sites do not interact though the Lennard-Jones term
+   the *coul/long/soft* or similar sub-style can be used via the
+   :doc:`pair_style hybrid/overlay <pair_hybrid>` command.
 
 ----------
 
-
 The *morse/soft* variant modifies the :doc:`pair_morse <pair_morse>` style at
 short range to have a soft core. The functional form differs from that of the
 *lj/soft* styles, and is instead given by:
 
-.. image:: Eqs/pair_morse_soft.jpg
-   :align: center
+.. math::
+
+   \begin{split}
+   s(\lambda) =& (1 - \lambda) / (1 - \lambda_f), \qquad B = -2D e^{-2 \alpha
+   r_0} (e^{\alpha r_0} - 1) / 3 \\
+   E =& D_0 \left[ e^{- 2 \alpha (r - r_0)} - 2 e^{- \alpha (r - r_0)} \right] +
+   s(\lambda) B e^{-3\alpha(r-r_0)}, \qquad \hspace{2.85em}\lambda \geq
+   \lambda_f,\quad r < r_c \\
+   E =& \left( D_0 \left[ e^{- 2 \alpha (r - r_0)} - 2 e^{- \alpha (r - r_0)}
+   \right] + B e^{-3\alpha(r-r_0)} \right)(\lambda/\lambda_f)^n, \qquad \lambda
+   < \lambda_f,\quad r < r_c
+   \end{split}
 
 The *morse/soft* style requires the following pair coefficients:
 
-* D0 (energy units)
-* alpha (1/distance units)
-* r0 (distance units)
-* lambda (unitless, between 0.0 and 1.0)
+* :math:`D_0` (energy units)
+* :math:`\alpha` (1/distance units)
+* :math:`r_0` (distance units)
+* :math:`\lambda` (unitless, between 0.0 and 1.0)
 * cutoff (distance units)
 
 The last coefficient is optional. If not specified, the global morse cutoff is
 used.
 
-
 ----------
 
-
 Styles with a *gpu*\ , *intel*\ , *kk*\ , *omp*\ , or *opt* suffix are
 functionally the same as the corresponding style without the suffix.
 They have been optimized to run faster, depending on your available
@@ -338,29 +352,28 @@ These accelerated styles are part of the GPU, USER-INTEL, KOKKOS,
 USER-OMP and OPT packages, respectively.  They are only enabled if
 LAMMPS was built with those packages.  See the :doc:`Build package <Build_package>` doc page for more info.
 
-You can specify the accelerated styles explicitly in your input script
-by including their suffix, or you can use the :doc:`-suffix command-line switch <Run_options>` when you invoke LAMMPS, or you can use the
-:doc:`suffix <suffix>` command in your input script.
+You can specify the accelerated styles explicitly in your input script by
+including their suffix, or you can use the :doc:`-suffix command-line switch
+<Run_options>` when you invoke LAMMPS, or you can use the :doc:`suffix <suffix>`
+command in your input script.
 
 See the :doc:`Speed packages <Speed_packages>` doc page for more
 instructions on how to use the accelerated styles effectively.
 
-
 ----------
 
-
 **Mixing, shift, tail correction, restart info**\ :
 
-The different versions of the *lj/cut/soft* pair styles support mixing.  For atom
-type pairs I,J and I != J, the epsilon and sigma coefficients and cutoff
-distance for these pair style can be mixed.  The default mix value is
-*geometric* for 12-6 styles.
+The different versions of the *lj/cut/soft* pair styles support mixing.  For
+atom type pairs I,J and I != J, the :math:`\epsilon` and :math:`\sigma`
+coefficients and cutoff distance for these pair style can be mixed.  The default
+mix value is *geometric* for 12-6 styles.
 
-The mixing rule for epsilon and sigma for *lj/class2/soft* 9-6 potentials is to use the
-*sixthpower* formulas. The :doc:`pair_modify mix <pair_modify>` setting is thus
-ignored for class2 potentials for epsilon and sigma. However it is still
-followed for mixing the cutoff distance. See the :doc:`pair_modify <pair_modify>`
-command for details.
+The mixing rule for epsilon and sigma for *lj/class2/soft* 9-6 potentials is to
+use the *sixthpower* formulas. The :doc:`pair_modify mix <pair_modify>` setting
+is thus ignored for class2 potentials for :math:`\epsilon` and
+:math:`\sigma`. However it is still followed for mixing the cutoff distance. See
+the :doc:`pair_modify <pair_modify>` command for details.
 
 The *morse/soft* pair style does not support mixing. Thus, coefficients for all
 LJ pairs must be specified explicitly.
@@ -376,31 +389,31 @@ interaction.
 
 .. note::
 
-   The analytical form of the tail corrections for energy and pressure used
-   in the *lj/cut/soft* potentials are approximate, being identical to that of the
-   corresponding non-soft potentials scaled by a factor lambda\^n. The errors due to
-   this approximation should be negligible. For example, for a cutoff of 2.5 sigma
-   this approximation leads to maximum relative errors in tail corrections of the
-   order of 1e-4 for energy and virial (alpha\_LJ = 0.5, n = 2). The error vanishes
-   when lambda approaches 0 or 1. Note that these are the errors affecting the
-   long-range tail (itself a correction to the interaction energy) which includes
-   other approximations, namely that the system is homogeneous (local density equal
+   The analytical form of the tail corrections for energy and pressure used in
+   the *lj/cut/soft* potentials are approximate, being identical to that of the
+   corresponding non-soft potentials scaled by a factor :math:`\lambda^n`. The
+   errors due to this approximation should be negligible. For example, for a
+   cutoff of :math:`2.5\sigma` this approximation leads to maximum relative
+   errors in tail corrections of the order of 1e-4 for energy and virial
+   (:math:`\alpha_\mathrm{LJ} = 0.5, n = 2`). The error vanishes when lambda
+   approaches 0 or 1. Note that these are the errors affecting the long-range
+   tail (itself a correction to the interaction energy) which includes other
+   approximations, namely that the system is homogeneous (local density equal
    the average density) beyond the cutoff.
 
-The *morse/soft* pair style does not support the :doc:`pair_modify <pair_modify>`
-tail option for adding long-range tail corrections to energy and pressure.
-
-All of these pair styles write information to :doc:`binary restart files <restart>`, so pair\_style and pair\_coeff commands do not need to be
-specified in an input script that reads a restart file.
+The *morse/soft* pair style does not support the :doc:`pair_modify
+<pair_modify>` tail option for adding long-range tail corrections to energy and
+pressure.
 
+All of these pair styles write information to :doc:`binary restart files
+<restart>`, so pair_style and pair_coeff commands do not need to be specified
+in an input script that reads a restart file.
 
 ----------
 
-
 Restrictions
 """"""""""""
 
-
 The pair styles with soft core are only enabled if LAMMPS was built with the
 USER-FEP package. The *long* versions also require the KSPACE package to be
 installed. The soft *tip4p* versions also require the MOLECULE package to be
@@ -416,18 +429,9 @@ Related commands
 
 **Default:** none
 
-
 ----------
 
-
 .. _Beutler:
 
-
-
 **(Beutler)** Beutler, Mark, van Schaik, Gerber, van Gunsteren, Chem
 Phys Lett, 222, 529 (1994).
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/pair_gauss.rst b/doc/src/pair_gauss.rst
index cb687ff487..1f183c00b9 100644
--- a/doc/src/pair_gauss.rst
+++ b/doc/src/pair_gauss.rst
@@ -1,25 +1,24 @@
-.. index:: pair\_style gauss
+.. index:: pair_style gauss
 
-pair\_style gauss command
-=========================
+pair_style gauss command
+========================
 
-pair\_style gauss/gpu command
-=============================
+pair_style gauss/gpu command
+============================
 
-pair\_style gauss/omp command
-=============================
+pair_style gauss/omp command
+============================
 
-pair\_style gauss/cut command
-=============================
+pair_style gauss/cut command
+============================
 
-pair\_style gauss/cut/omp command
-=================================
+pair_style gauss/cut/omp command
+================================
 
 Syntax
 """"""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    pair_style gauss cutoff
    pair_style gauss/cut cutoff
@@ -29,11 +28,10 @@ Syntax
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    pair_style gauss 12.0
-   pair_coeff \* \* 1.0 0.9
+   pair_coeff * * 1.0 0.9
    pair_coeff 1 4 1.0 0.9 10.0
 
    pair_style gauss/cut 3.5
@@ -44,11 +42,12 @@ Description
 
 Style *gauss* computes a tethering potential of the form
 
-.. image:: Eqs/pair_gauss.jpg
-   :align: center
+.. math::
+
+   E = - A \exp(-B r^2) \qquad r < r_c
 
 between an atom and its corresponding tether site which will typically
-be a frozen atom in the simulation.  Rc is the cutoff.
+be a frozen atom in the simulation.  :math:`r_c` is the cutoff.
 
 The following coefficients must be defined for each pair of atom types
 via the :doc:`pair_coeff <pair_coeff>` command as in the examples above,
@@ -66,17 +65,19 @@ is used.
 Style *gauss/cut* computes a generalized Gaussian interaction potential
 between pairs of particles:
 
-.. image:: Eqs/pair_gauss_cut.jpg
-   :align: center
+.. math::
 
-where H determines together with the standard deviation sigma\_h the
-peak height of the Gaussian function, and r\_mh the peak position.
-Examples of the use of the Gaussian potentials include implicit
-solvent simulations of salt ions :ref:`(Lenart) <Lenart2>` and of surfactants
-:ref:`(Jusufi) <Jusufi2>`.  In these instances the Gaussian potential mimics
-the hydration barrier between a pair of particles. The hydration
-barrier is located at r\_mh and has a width of sigma\_h. The prefactor
-determines the height of the potential barrier.
+   E = \frac{H}{\sigma_h\sqrt{2\pi}} \exp\left[-\frac{(r-r_{mh})^2}{2\sigma_h^2}\right]
+
+where H determines together with the standard deviation :math:`\sigma_h`
+the peak height of the Gaussian function, and :math:`r_{mh}` the peak
+position.  Examples of the use of the Gaussian potentials include
+implicit solvent simulations of salt ions :ref:`(Lenart) <Lenart2>` and
+of surfactants :ref:`(Jusufi) <Jusufi2>`.  In these instances the
+Gaussian potential mimics the hydration barrier between a pair of
+particles. The hydration barrier is located at :math:`r_{mh}` and has a
+width of :math:`\sigma_h`. The prefactor determines the height of the
+potential barrier.
 
 The following coefficients must be defined for each pair of atom types
 via the :doc:`pair_coeff <pair_coeff>` command as in the example above,
@@ -85,17 +86,15 @@ or in the data file or restart files read by the
 commands:
 
 * H (energy \* distance units)
-* r\_mh (distance units)
-* sigma\_h (distance units)
+* :math:`r_{mh}` (distance units)
+* :math:`\sigma_h` (distance units)
 * cutoff (distance units)
 
 The last coefficient is optional. If not specified, the global cutoff
 is used.
 
-
 ----------
 
-
 Styles with a *gpu*\ , *intel*\ , *kk*\ , *omp*\ , or *opt* suffix are
 functionally the same as the corresponding style without the suffix.
 They have been optimized to run faster, depending on your available
@@ -114,28 +113,26 @@ by including their suffix, or you can use the :doc:`-suffix command-line switch
 See the :doc:`Speed packages <Speed_packages>` doc page for more
 instructions on how to use the accelerated styles effectively.
 
-
 ----------
 
-
 **Mixing, shift, table, tail correction, restart, rRESPA info**\ :
 
-For atom type pairs I,J and I != J, the A, B, H, sigma\_h, r\_mh
+For atom type pairs I,J and I != J, the A, B, H, sigma_h, r_mh
 parameters, and the cutoff distance for these pair styles can be mixed:
 A (energy units)
 sqrt(1/B) (distance units, see below)
 H (energy units)
-sigma\_h (distance units)
-r\_mh (distance units)
+sigma_h (distance units)
+r_mh (distance units)
 cutoff (distance units):ul
 
 The default mix value is *geometric*\ .
 Only *arithmetic* and *geometric* mix values are supported.
-See the "pair\_modify" command for details.
+See the "pair_modify" command for details.
 
 The A and H parameters are mixed using the same rules normally
 used to mix the "epsilon" parameter in a Lennard Jones interaction.
-The sigma\_h, r\_mh, and the cutoff distance are mixed using the same
+The sigma_h, r_mh, and the cutoff distance are mixed using the same
 rules used to mix the "sigma" parameter in a Lennard Jones interaction.
 The B parameter is converted to a distance (sigma), before mixing
 (using sigma=B\^-0.5), and converted back to a coefficient
@@ -157,7 +154,7 @@ interaction.
 The :doc:`pair_modify <pair_modify>` table and tail options are not
 relevant for these pair styles.
 
-These pair styles write their information to :doc:`binary restart files <restart>`, so pair\_style and pair\_coeff commands do not need
+These pair styles write their information to :doc:`binary restart files <restart>`, so pair_style and pair_coeff commands do not need
 to be specified in an input script that reads a restart file.
 
 These pair styles can only be used via the *pair* keyword of the
@@ -171,21 +168,17 @@ sites have an atom within the distance at which the force is a maximum
 To print this quantity to the log file (with a descriptive column
 heading) the following commands could be included in an input script:
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    compute gauss all pair gauss
    variable occ equal c_gauss[1]
    thermo_style custom step temp epair v_occ
 
-
 ----------
 
-
 Restrictions
 """"""""""""
 
-
 The *gauss/cut* style is part of the "user-misc" package. It is only
 enabled if LAMMPS is build with that package.  See the :doc:`Build package <Build_package>` doc page for more info.
 
@@ -199,19 +192,10 @@ Related commands
 
 .. _Lenart2:
 
-
-
 **(Lenart)** Lenart , Jusufi, and Panagiotopoulos, J Chem Phys, 126,
 044509 (2007).
 
 .. _Jusufi2:
 
-
-
 **(Jusufi)** Jusufi, Hynninen, and Panagiotopoulos, J Phys Chem B, 112,
 13783 (2008).
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/pair_gayberne.rst b/doc/src/pair_gayberne.rst
index 8db0e6edc2..e6cf480852 100644
--- a/doc/src/pair_gayberne.rst
+++ b/doc/src/pair_gayberne.rst
@@ -1,22 +1,21 @@
-.. index:: pair\_style gayberne
+.. index:: pair_style gayberne
 
-pair\_style gayberne command
-============================
+pair_style gayberne command
+===========================
 
-pair\_style gayberne/gpu command
-================================
+pair_style gayberne/gpu command
+===============================
 
-pair\_style gayberne/intel command
-==================================
+pair_style gayberne/intel command
+=================================
 
-pair\_style gayberne/omp command
-================================
+pair_style gayberne/omp command
+===============================
 
 Syntax
 """"""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    pair_style gayberne gamma upsilon mu cutoff
 
@@ -28,11 +27,10 @@ Syntax
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    pair_style gayberne 1.0 1.0 1.0 10.0
-   pair_coeff \* \* 1.0 1.7 1.7 3.4 3.4 1.0 1.0 1.0
+   pair_coeff * * 1.0 1.7 1.7 3.4 3.4 1.0 1.0 1.0
 
 Description
 """""""""""
@@ -41,24 +39,33 @@ The *gayberne* styles compute a Gay-Berne anisotropic LJ interaction
 :ref:`(Berardi) <Berardi>` between pairs of ellipsoidal particles or an
 ellipsoidal and spherical particle via the formulas
 
-.. image:: Eqs/pair_gayberne.jpg
-   :align: center
+.. math::
 
-where A1 and A2 are the transformation matrices from the simulation
-box frame to the body frame and r12 is the center to center vector
-between the particles.  Ur controls the shifted distance dependent
-interaction based on the distance of closest approach of the two
-particles (h12) and the user-specified shift parameter gamma.  When
-both particles are spherical, the formula reduces to the usual
-Lennard-Jones interaction (see details below for when Gay-Berne treats
-a particle as "spherical").
+   U ( \mathbf{A}_1, \mathbf{A}_2, \mathbf{r}_{12} ) = & U_r (
+   \mathbf{A}_1, \mathbf{A}_2, \mathbf{r}_{12}, \gamma ) \cdot \eta_{12} (
+   \mathbf{A}_1, \mathbf{A}_2, \upsilon ) \cdot \chi_{12} ( \mathbf{A}_1,
+   \mathbf{A}_2, \mathbf{r}_{12}, \mu ) \\
+   U_r = & 4 \epsilon ( \varrho^{12} - \varrho^6) \\
+   \varrho = & \frac{\sigma}{ h_{12} + \gamma \sigma}
+
+where A1 and A2 are the transformation matrices from the simulation box
+frame to the body frame and :math:`r_{12}` is the center to center
+vector between the particles.  :math:`U_r` controls the shifted distance
+dependent interaction based on the distance of closest approach of the
+two particles (:math:`h_{12}`) and the user-specified shift parameter
+gamma.  When both particles are spherical, the formula reduces to the
+usual Lennard-Jones interaction (see details below for when Gay-Berne
+treats a particle as "spherical").
 
 For large uniform molecules it has been shown that the energy
 parameters are approximately representable in terms of local contact
 curvatures :ref:`(Everaers) <Everaers2>`:
 
-.. image:: Eqs/pair_gayberne2.jpg
-   :align: center
+.. math::
+
+   \epsilon_a = \sigma \cdot { \frac{a}{ b \cdot c } }; \epsilon_b =
+   \sigma \cdot { \frac{b}{ a \cdot c } }; \epsilon_c = \sigma \cdot {
+   \frac{c}{ a \cdot b } }
 
 The variable names utilized as potential parameters are for the most
 part taken from :ref:`(Everaers) <Everaers2>` in order to be consistent with
@@ -80,69 +87,72 @@ above, or in the data file or restart files read by the
 :doc:`read_data <read_data>` or :doc:`read_restart <read_restart>`
 commands, or by mixing as described below:
 
-* epsilon = well depth (energy units)
-* sigma = minimum effective particle radii (distance units)
-* epsilon\_i_a = relative well depth of type I for side-to-side interactions
-* epsilon\_i_b = relative well depth of type I for face-to-face interactions
-* epsilon\_i_c = relative well depth of type I for end-to-end interactions
-* epsilon\_j_a = relative well depth of type J for side-to-side interactions
-* epsilon\_j_b = relative well depth of type J for face-to-face interactions
-* epsilon\_j_c = relative well depth of type J for end-to-end interactions
+* :math:`\epsilon` = well depth (energy units)
+* :math:`\sigma` = minimum effective particle radii (distance units)
+* :math:`\epsilon_{i,a}` = relative well depth of type I for side-to-side interactions
+* :math:`\epsilon_{i,b}` = relative well depth of type I for face-to-face interactions
+* :math:`\epsilon_{i,c}` = relative well depth of type I for end-to-end interactions
+* :math:`\epsilon_{j,a}` = relative well depth of type J for side-to-side interactions
+* :math:`\epsilon_{j,b}` = relative well depth of type J for face-to-face interactions
+* :math:`\epsilon_{j,c}` = relative well depth of type J for end-to-end interactions
 * cutoff (distance units)
 
 The last coefficient is optional.  If not specified, the global
-cutoff specified in the pair\_style command is used.
+cutoff specified in the pair_style command is used.
 
-It is typical with the Gay-Berne potential to define *sigma* as the
-minimum of the 3 shape diameters of the particles involved in an I,I
-interaction, though this is not required.  Note that this is a
-different meaning for *sigma* than the :doc:`pair_style resquared <pair_resquared>` potential uses.
+It is typical with the Gay-Berne potential to define :math:`\sigma` as
+the minimum of the 3 shape diameters of the particles involved in an I,I
+interaction, though this is not required.  Note that this is a different
+meaning for :math:`\sigma` than the :doc:`pair_style resquared
+<pair_resquared>` potential uses.
 
-The epsilon\_i and epsilon\_j coefficients are actually defined for atom
-types, not for pairs of atom types.  Thus, in a series of pair\_coeff
-commands, they only need to be specified once for each atom type.
+The :math:`\epsilon_i` and :math:`\epsilon_j` coefficients are actually
+defined for atom types, not for pairs of atom types.  Thus, in a series
+of pair_coeff commands, they only need to be specified once for each
+atom type.
 
-Specifically, if any of epsilon\_i_a, epsilon\_i_b, epsilon\_i_c are
-non-zero, the three values are assigned to atom type I.  If all the
-epsilon\_i values are zero, they are ignored.  If any of epsilon\_j_a,
-epsilon\_j_b, epsilon\_j_c are non-zero, the three values are assigned
-to atom type J.  If all three epsilon\_j values are zero, they are
-ignored.  Thus the typical way to define the epsilon\_i and epsilon\_j
-coefficients is to list their values in "pair\_coeff I J" commands when
-I = J, but set them to 0.0 when I != J.  If you do list them when I !=
-J, you should insure they are consistent with their values in other
-pair\_coeff commands, since only the last setting will be in effect.
+Specifically, if any of :math:`\epsilon_{i,a}`, :math:`\epsilon_{i,b}`,
+:math:`\epsilon_{i,c}` are non-zero, the three values are assigned to
+atom type I.  If all the :math:`\epsilon_i` values are zero, they are
+ignored.  If any of :math:`\epsilon_{j,a}`, :math:`\epsilon_{j,b}`,
+:math:`\epsilon_{j,c}` are non-zero, the three values are assigned to
+atom type J.  If all three epsilon_j values are zero, they are ignored.
+Thus the typical way to define the :math:`\epsilon_i` and
+:math:`\epsilon_j` coefficients is to list their values in "pair_coeff
+I J" commands when I = J, but set them to 0.0 when I != J.  If you do
+list them when I != J, you should insure they are consistent with their
+values in other pair_coeff commands, since only the last setting will
+be in effect.
 
 Note that if this potential is being used as a sub-style of
-:doc:`pair_style hybrid <pair_hybrid>`, and there is no "pair\_coeff I I"
+:doc:`pair_style hybrid <pair_hybrid>`, and there is no "pair_coeff I I"
 setting made for Gay-Berne for a particular type I (because I-I
 interactions are computed by another hybrid pair potential), then you
-still need to insure the epsilon a,b,c coefficients are assigned to
-that type. e.g. in a "pair\_coeff I J" command.
+still need to insure the :math:`\epsilon` a,b,c coefficients are assigned to
+that type. e.g. in a "pair_coeff I J" command.
 
 .. note::
 
-   If the epsilon a = b = c for an atom type, and if the shape of
-   the particle itself is spherical, meaning its 3 shape parameters are
-   all the same, then the particle is treated as an LJ sphere by the
+   If the :math:`\epsilon` a = b = c for an atom type, and if the shape
+   of the particle itself is spherical, meaning its 3 shape parameters
+   are all the same, then the particle is treated as an LJ sphere by the
    Gay-Berne potential.  This is significant because if two LJ spheres
    interact, then the simple Lennard-Jones formula is used to compute
    their interaction energy/force using the specified epsilon and sigma
    as the standard LJ parameters.  This is much cheaper to compute than
-   the full Gay-Berne formula.  To treat the particle as a LJ sphere with
-   sigma = D, you should normally set epsilon a = b = c = 1.0, set the
-   pair\_coeff sigma = D, and also set the 3 shape parameters for the
-   particle to D.  The one exception is that if the 3 shape parameters
-   are set to 0.0, which is a valid way in LAMMPS to specify a point
-   particle, then the Gay-Berne potential will treat that as shape
-   parameters of 1.0 (i.e. a LJ particle with sigma = 1), since it
-   requires finite-size particles.  In this case you should still set the
-   pair\_coeff sigma to 1.0 as well.
-
+   the full Gay-Berne formula.  To treat the particle as a LJ sphere
+   with sigma = D, you should normally set :math:`\epsilon` a = b = c =
+   1.0, set the pair_coeff :math:`\sigma = D`, and also set the 3 shape
+   parameters for the particle to D.  The one exception is that if the 3
+   shape parameters are set to 0.0, which is a valid way in LAMMPS to
+   specify a point particle, then the Gay-Berne potential will treat
+   that as shape parameters of 1.0 (i.e. a LJ particle with
+   :math:`\sigma = 1`), since it requires finite-size particles.  In
+   this case you should still set the pair_coeff :math:`\sigma` to 1.0
+   as well.
 
 ----------
 
-
 Styles with a *gpu*\ , *intel*\ , *kk*\ , *omp*\ , or *opt* suffix are
 functionally the same as the corresponding style without the suffix.
 They have been optimized to run faster, depending on your available
@@ -161,15 +171,13 @@ by including their suffix, or you can use the :doc:`-suffix command-line switch
 See the :doc:`Speed packages <Speed_packages>` doc page for more
 instructions on how to use the accelerated styles effectively.
 
-
 ----------
 
-
 **Mixing, shift, table, tail correction, restart, rRESPA info**\ :
 
 For atom type pairs I,J and I != J, the epsilon and sigma coefficients
 and cutoff distance for this pair style can be mixed.  The default mix
-value is *geometric*\ .  See the "pair\_modify" command for details.
+value is *geometric*\ .  See the "pair_modify" command for details.
 
 This pair styles supports the :doc:`pair_modify <pair_modify>` shift
 option for the energy of the Lennard-Jones portion of the pair
@@ -184,21 +192,18 @@ This pair style does not support the :doc:`pair_modify <pair_modify>`
 tail option for adding long-range tail corrections to energy and
 pressure.
 
-This pair style writes its information to :doc:`binary restart files <restart>`, so pair\_style and pair\_coeff commands do not need
+This pair style writes its information to :doc:`binary restart files <restart>`, so pair_style and pair_coeff commands do not need
 to be specified in an input script that reads a restart file.
 
 This pair style can only be used via the *pair* keyword of the
 :doc:`run_style respa <run_style>` command.  It does not support the
 *inner*\ , *middle*\ , *outer* keywords.
 
-
 ----------
 
-
 Restrictions
 """"""""""""
 
-
 The *gayberne* style is part of the ASPHERE package.  It is only
 enabled if LAMMPS was built with that package.  See the :doc:`Build package <Build_package>` doc page for more info.
 
@@ -229,36 +234,21 @@ Related commands
 
 **Default:** none
 
-
 ----------
 
-
 .. _Everaers2:
 
-
-
 **(Everaers)** Everaers and Ejtehadi, Phys Rev E, 67, 041710 (2003).
 
 .. _Berardi:
 
-
-
 **(Berardi)** Berardi, Fava, Zannoni, Chem Phys Lett, 297, 8-14 (1998).
 Berardi, Muccioli, Zannoni, J Chem Phys, 128, 024905 (2008).
 
 .. _Perram:
 
-
-
 **(Perram)** Perram and Rasmussen, Phys Rev E, 54, 6565-6572 (1996).
 
 .. _Allen3:
 
-
-
 **(Allen)** Allen and Germano, Mol Phys 104, 3225-3235 (2006).
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/pair_gran.rst b/doc/src/pair_gran.rst
index 20ab3b3cab..3cfe946e41 100644
--- a/doc/src/pair_gran.rst
+++ b/doc/src/pair_gran.rst
@@ -1,50 +1,48 @@
-.. index:: pair\_style gran/hooke
+.. index:: pair_style gran/hooke
 
-pair\_style gran/hooke command
-==============================
+pair_style gran/hooke command
+=============================
 
-pair\_style gran/hooke/omp command
-==================================
+pair_style gran/hooke/omp command
+=================================
 
-pair\_style gran/hooke/history command
-======================================
+pair_style gran/hooke/history command
+=====================================
 
-pair\_style gran/hooke/history/omp command
-==========================================
-
-pair\_style gran/hooke/history/kk command
+pair_style gran/hooke/history/omp command
 =========================================
 
-pair\_style gran/hertz/history command
-======================================
+pair_style gran/hooke/history/kk command
+========================================
 
-pair\_style gran/hertz/history/omp command
-==========================================
+pair_style gran/hertz/history command
+=====================================
+
+pair_style gran/hertz/history/omp command
+=========================================
 
 Syntax
 """"""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    pair_style style Kn Kt gamma_n gamma_t xmu dampflag
 
 * style = *gran/hooke* or *gran/hooke/history* or *gran/hertz/history*
 * Kn = elastic constant for normal particle repulsion (force/distance units or pressure units - see discussion below)
 * Kt = elastic constant for tangential contact (force/distance units or pressure units - see discussion below)
-* gamma\_n = damping coefficient for collisions in normal direction (1/time units or 1/time-distance units - see discussion below)
-* gamma\_t = damping coefficient for collisions in tangential direction (1/time units or 1/time-distance units - see discussion below)
+* gamma_n = damping coefficient for collisions in normal direction (1/time units or 1/time-distance units - see discussion below)
+* gamma_t = damping coefficient for collisions in tangential direction (1/time units or 1/time-distance units - see discussion below)
 * xmu = static yield criterion (unitless value between 0.0 and 1.0e4)
 * dampflag = 0 or 1 if tangential damping force is excluded or included
 
-
 .. note::
 
    Versions of LAMMPS before 9Jan09 had different style names for
    granular force fields.  This is to emphasize the fact that the
    Hertzian equation has changed to model polydispersity more accurately.
-   A side effect of the change is that the Kn, Kt, gamma\_n, and gamma\_t
-   coefficients in the pair\_style command must be specified with
+   A side effect of the change is that the Kn, Kt, gamma_n, and gamma_t
+   coefficients in the pair_style command must be specified with
    different values in order to reproduce calculations made with earlier
    versions of LAMMPS, even for monodisperse systems.  See the NOTE below
    for details.
@@ -52,8 +50,7 @@ Syntax
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    pair_style gran/hooke/history 200000.0 NULL 50.0 NULL 0.5 1
    pair_style gran/hooke 200000.0 70000.0 50.0 30.0 0.5 0
@@ -70,13 +67,23 @@ no force between the particles when r > d.
 
 The two Hookean styles use this formula:
 
-.. image:: Eqs/pair_gran_hooke.jpg
-   :align: center
+.. math::
+
+   F_{hk} = (k_n \delta \mathbf{n}_{ij} -
+   m_{eff} \gamma_n\mathbf{ v}_n) -
+   (k_t \mathbf{ \Delta s}_t +
+   m_{eff} \gamma_t \mathbf{v}_t)
 
 The Hertzian style uses this formula:
 
-.. image:: Eqs/pair_gran_hertz.jpg
-   :align: center
+.. math::
+
+   F_{hz} = \sqrt{\delta} \sqrt{\frac{R_i R_j}{R_i + R_j}} F_{hk} =
+     \sqrt{\delta} \sqrt{\frac{R_i R_j}{R_i + R_j}}
+     \Big[ (k_n \delta \mathbf{n}_{ij} -
+       m_{eff} \: \gamma_n \mathbf{ v}_n) -
+       (k_t \mathbf{ \Delta s}_t +
+       m_{eff} \: \gamma_t \mathbf{v}_t) \Big]
 
 In both equations the first parenthesized term is the normal force
 between the two particles and the second parenthesized term is the
@@ -92,34 +99,35 @@ if *dampflag* is set to 0.
 
 The other quantities in the equations are as follows:
 
-* delta = d - r = overlap distance of 2 particles
-* Kn = elastic constant for normal contact
-* Kt = elastic constant for tangential contact
-* gamma\_n = viscoelastic damping constant for normal contact
-* gamma\_t = viscoelastic damping constant for tangential contact
-* m\_eff = Mi Mj / (Mi + Mj) = effective mass of 2 particles of mass Mi and Mj
-* Delta St = tangential displacement vector between 2 particles       which is truncated to satisfy a frictional yield criterion
-* n\_ij = unit vector along the line connecting the centers of the 2 particles
-* Vn = normal component of the relative velocity of the 2 particles
-* Vt = tangential component of the relative velocity of the 2 particles
+* :math:`\delta` = d - r = overlap distance of 2 particles
+* :math:`K_n` = elastic constant for normal contact
+* :math:`K_t` = elastic constant for tangential contact
+* :math:`\gamma_n` = viscoelastic damping constant for normal contact
+* :math:`\gamma_t` = viscoelastic damping constant for tangential contact
+* :math:`m_{eff} = M_i M_j / (M_i + M_j) =` effective mass of 2 particles of mass M_i and M_j
+* :math:`\mathbf{\Delta s}_t =` tangential displacement vector between 2 particles       which is truncated to satisfy a frictional yield criterion
+* :math:`n_{ij} =` unit vector along the line connecting the centers of the 2 particles
+* :math:`V_n =` normal component of the relative velocity of the 2 particles
+* :math:`V_t =` tangential component of the relative velocity of the 2 particles
 
-The Kn, Kt, gamma\_n, and gamma\_t coefficients are specified as
-parameters to the pair\_style command.  If a NULL is used for Kt, then
-a default value is used where Kt = 2/7 Kn.  If a NULL is used for
-gamma\_t, then a default value is used where gamma\_t = 1/2 gamma\_n.
+The :math:`K_n`, :math:`K_t`, :math:`\gamma_n`, and :math:`\gamma_t`
+coefficients are specified as parameters to the pair_style command.  If
+a NULL is used for :math:`K_t`, then a default value is used where
+:math:`K_t = 2/7 K_n`.  If a NULL is used for :math:`\gamma_t`, then a
+default value is used where :math:`\gamma_t = 1/2 \gamma_n`.
 
 The interpretation and units for these 4 coefficients are different in
 the Hookean versus Hertzian equations.
 
 The Hookean model is one where the normal push-back force for two
 overlapping particles is a linear function of the overlap distance.
-Thus the specified Kn is in units of (force/distance).  Note that this
-push-back force is independent of absolute particle size (in the
-monodisperse case) and of the relative sizes of the two particles (in
-the polydisperse case).  This model also applies to the other terms in
-the force equation so that the specified gamma\_n is in units of
-(1/time), Kt is in units of (force/distance), and gamma\_t is in units
-of (1/time).
+Thus the specified :math:`K_n` is in units of (force/distance).  Note
+that this push-back force is independent of absolute particle size (in
+the monodisperse case) and of the relative sizes of the two particles
+(in the polydisperse case).  This model also applies to the other terms
+in the force equation so that the specified :math:`\gamma_n` is in units
+of (1/time), :math:`K_t` is in units of (force/distance), and
+:math:`\gamma_t` is in units of (1/time).
 
 The Hertzian model is one where the normal push-back force for two
 overlapping particles is proportional to the area of overlap of the
@@ -128,40 +136,41 @@ Thus Kn has units of force per area and is thus specified in units of
 (pressure).  The effects of absolute particle size (monodispersity)
 and relative size (polydispersity) are captured in the radii-dependent
 pre-factors.  When these pre-factors are carried through to the other
-terms in the force equation it means that the specified gamma\_n is in
-units of (1/(time\*distance)), Kt is in units of (pressure), and
-gamma\_t is in units of (1/(time\*distance)).
+terms in the force equation it means that the specified :math:`\gamma_n` is in
+units of (1/(time\*distance)), :math:`K_t` is in units of (pressure), and
+:math:`\gamma_t` is in units of (1/(time\*distance)).
 
-Note that in the Hookean case, Kn can be thought of as a linear spring
-constant with units of force/distance.  In the Hertzian case, Kn is
-like a non-linear spring constant with units of force/area or
-pressure, and as shown in the :ref:`(Zhang) <Zhang3>` paper, Kn = 4G /
-(3(1-nu)) where nu = the Poisson ratio, G = shear modulus = E /
-(2(1+nu)), and E = Young's modulus.  Similarly, Kt = 4G / (2-nu).
-(NOTE: in an earlier version of the manual, we incorrectly stated that
-Kt = 8G / (2-nu).)
+Note that in the Hookean case, :math:`K_n` can be thought of as a linear
+spring constant with units of force/distance.  In the Hertzian case,
+:math:`K_n` is like a non-linear spring constant with units of
+force/area or pressure, and as shown in the :ref:`(Zhang) <Zhang3>`
+paper, :math:`K_n = 4G / (3(1-\nu))` where :math:`\nu =` the Poisson ratio,
+G = shear modulus = :math:`E / (2(1+\nu))`, and E = Young's modulus.  Similarly,
+:math:`K_t = 4G / (2-\nu)`.  (NOTE: in an earlier version of the manual, we incorrectly
+stated that :math:`K_t = 8G / (2-\nu)`.)
 
-Thus in the Hertzian case Kn and Kt can be set to values that
-corresponds to properties of the material being modeled.  This is also
-true in the Hookean case, except that a spring constant must be chosen
-that is appropriate for the absolute size of particles in the model.
-Since relative particle sizes are not accounted for, the Hookean
-styles may not be a suitable model for polydisperse systems.
+Thus in the Hertzian case :math:`K_n` and :math:`K_t` can be set to
+values that corresponds to properties of the material being modeled.
+This is also true in the Hookean case, except that a spring constant
+must be chosen that is appropriate for the absolute size of particles in
+the model.  Since relative particle sizes are not accounted for, the
+Hookean styles may not be a suitable model for polydisperse systems.
 
 .. note::
 
    In versions of LAMMPS before 9Jan09, the equation for Hertzian
-   interactions did not include the sqrt(RiRj/Ri+Rj) term and thus was
-   not as accurate for polydisperse systems.  For monodisperse systems,
-   sqrt(RiRj/Ri+Rj) is a constant factor that effectively scales all 4
-   coefficients: Kn, Kt, gamma\_n, gamma\_t.  Thus you can set the values
-   of these 4 coefficients appropriately in the current code to reproduce
+   interactions did not include the :math:`\sqrt{r_i r_j / (r_i + r_j)}`
+   term and thus was not as accurate for polydisperse systems.  For
+   monodisperse systems, :math:`\sqrt{ r_i r_j /(r_i+r_j)}` is a
+   constant factor that effectively scales all 4 coefficients:
+   :math:`K_n, K_t, \gamma_n, \gamma_t`.  Thus you can set the values of
+   these 4 coefficients appropriately in the current code to reproduce
    the results of a previous Hertzian monodisperse calculation.  For
    example, for the common case of a monodisperse system with particles
-   of diameter 1, all 4 of these coefficients should now be set 2x larger
-   than they were previously.
+   of diameter 1, all 4 of these coefficients should now be set 2x
+   larger than they were previously.
 
-Xmu is also specified in the pair\_style command and is the upper limit
+Xmu is also specified in the pair_style command and is the upper limit
 of the tangential force through the Coulomb criterion Ft = xmu\*Fn,
 where Ft and Fn are the total tangential and normal force components
 in the formulas above.  Thus in the Hookean case, the tangential force
@@ -177,7 +186,7 @@ holds, though the spring is no longer linear.
    for modeling of systems which can sustain very large tangential
    forces.
 
-The effective mass *m\_eff* is given by the formula above for two
+The effective mass *m_eff* is given by the formula above for two
 isolated particles.  If either particle is part of a rigid body, its
 mass is replaced by the mass of the rigid body in the formula above.
 This is determined by searching for a :doc:`fix rigid <fix_rigid>`
@@ -185,25 +194,22 @@ command (or its variants).
 
 For granular styles there are no additional coefficients to set for
 each pair of atom types via the :doc:`pair_coeff <pair_coeff>` command.
-All settings are global and are made via the pair\_style command.
+All settings are global and are made via the pair_style command.
 However you must still use the :doc:`pair_coeff <pair_coeff>` for all
 pairs of granular atom types.  For example the command
 
+.. code-block:: LAMMPS
 
-.. parsed-literal::
-
-   pair_coeff \* \*
+   pair_coeff * *
 
 should be used if all atoms in the simulation interact via a granular
 potential (i.e. one of the pair styles above is used).  If a granular
 potential is used as a sub-style of :doc:`pair_style hybrid <pair_hybrid>`, then specific atom types can be used in the
-pair\_coeff command to determine which atoms interact via a granular
+pair_coeff command to determine which atoms interact via a granular
 potential.
 
-
 ----------
 
-
 Styles with a *gpu*\ , *intel*\ , *kk*\ , *omp*\ , or *opt* suffix are
 functionally the same as the corresponding style without the suffix.
 They have been optimized to run faster, depending on your available
@@ -222,16 +228,14 @@ by including their suffix, or you can use the :doc:`-suffix command-line switch
 See the :doc:`Speed packages <Speed_packages>` doc page for more
 instructions on how to use the accelerated styles effectively.
 
-
 ----------
 
-
 **Mixing, shift, table, tail correction, restart, rRESPA info**\ :
 
 The :doc:`pair_modify <pair_modify>` mix, shift, table, and tail options
 are not relevant for granular pair styles.
 
-These pair styles write their information to :doc:`binary restart files <restart>`, so a pair\_style command does not need to be
+These pair styles write their information to :doc:`binary restart files <restart>`, so a pair_style command does not need to be
 specified in an input script that reads a restart file.
 
 These pair styles can only be used via the *pair* keyword of the
@@ -253,14 +257,11 @@ tangential direction.
 These extra quantities can be accessed by the :doc:`compute pair/local <compute_pair_local>` command, as *p1*\ , *p2*\ , ...,
 *p10*\ .
 
-
 ----------
 
-
 Restrictions
 """"""""""""
 
-
 All the granular pair styles are part of the GRANULAR package.  It is
 only enabled if LAMMPS was built with that package.  See the :doc:`Build package <Build_package>` doc page for more info.
 
@@ -285,31 +286,18 @@ Related commands
 
 **Default:** none
 
-
 ----------
 
-
 .. _Brilliantov:
 
-
-
 **(Brilliantov)** Brilliantov, Spahn, Hertzsch, Poschel, Phys Rev E, 53,
 p 5382-5392 (1996).
 
 .. _Silbert:
 
-
-
 **(Silbert)** Silbert, Ertas, Grest, Halsey, Levine, Plimpton, Phys Rev
 E, 64, p 051302 (2001).
 
 .. _Zhang3:
 
-
-
 **(Zhang)** Zhang and Makse, Phys Rev E, 72, p 011301 (2005).
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/pair_granular.rst b/doc/src/pair_granular.rst
index a22e6b233a..f581c502f3 100644
--- a/doc/src/pair_granular.rst
+++ b/doc/src/pair_granular.rst
@@ -1,13 +1,12 @@
-.. index:: pair\_style granular
+.. index:: pair_style granular
 
-pair\_style granular command
-============================
+pair_style granular command
+===========================
 
 Syntax
 """"""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    pair_style granular cutoff
 
@@ -16,23 +15,22 @@ Syntax
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    pair_style granular
-   pair_coeff \* \* hooke 1000.0 50.0 tangential linear_nohistory 1.0 0.4 damping mass_velocity
+   pair_coeff * * hooke 1000.0 50.0 tangential linear_nohistory 1.0 0.4 damping mass_velocity
 
    pair_style granular
-   pair_coeff \* \* hooke 1000.0 50.0 tangential linear_history 500.0 1.0 0.4 damping mass_velocity
+   pair_coeff * * hooke 1000.0 50.0 tangential linear_history 500.0 1.0 0.4 damping mass_velocity
 
    pair_style granular
-   pair_coeff \* \* hertz 1000.0 50.0 tangential mindlin 1000.0 1.0 0.4
+   pair_coeff * * hertz 1000.0 50.0 tangential mindlin 1000.0 1.0 0.4
 
    pair_style granular
-   pair_coeff \* \* hertz/material 1e8 0.3 0.3 tangential mindlin_rescale NULL 1.0 0.4 damping tsuji
+   pair_coeff * * hertz/material 1e8 0.3 0.3 tangential mindlin_rescale NULL 1.0 0.4 damping tsuji
 
    pair_style granular
-   pair_coeff 1 \* jkr 1000.0 500.0 0.3 10 tangential mindlin 800.0 1.0 0.5 rolling sds 500.0 200.0 0.5 twisting marshall
+   pair_coeff 1 * jkr 1000.0 500.0 0.3 10 tangential mindlin 800.0 1.0 0.5 rolling sds 500.0 200.0 0.5 twisting marshall
    pair_coeff 2 2 hertz 200.0 100.0 tangential linear_history 300.0 1.0 0.1 rolling sds 200.0 100.0 0.1 twisting marshall
 
    pair_style granular
@@ -67,14 +65,12 @@ on a Johnson-Kendall-Roberts normal contact model and 2-2 interactions
 are based on a DMT cohesive model (see below).  In that example, 1-1
 and 2-2 interactions have different model forms, in which case mixing of
 coefficients cannot be determined, so 1-2 interactions must be
-explicitly defined via the *pair\_coeff 1 \** command, otherwise an
+explicitly defined via the *pair_coeff 1 \** command, otherwise an
 error would result.
 
-
 ----------
 
-
-The first required keyword for the *pair\_coeff* command is the normal
+The first required keyword for the *pair_coeff* command is the normal
 contact model. Currently supported options for normal contact models
 and their required arguments are:
 
@@ -95,10 +91,9 @@ damping mode, see below); E is Young's modulus in units of
 For the *hooke* model, the normal, elastic component of force acting
 on particle *i* due to contact with particle *j* is given by:
 
-
 .. math::
 
-   \begin{equation}\mathbf{F}_{ne, Hooke} = k_N \delta_{ij} \mathbf{n}\end{equation}
+   \mathbf{F}_{ne, Hooke} = k_N \delta_{ij} \mathbf{n}
 
 Where :math:`\delta_{ij} = R_i + R_j - \|\mathbf{r}_{ij}\|` is the particle
 overlap, :math:`R_i, R_j` are the particle radii, :math:`\mathbf{r}_{ij} = \mathbf{r}_i - \mathbf{r}_j` is the vector separating the two
@@ -109,10 +104,9 @@ for *hooke*\ , the units of the spring constant :math:`k_n` are
 
 For the *hertz* model, the normal component of force is given by:
 
-
 .. math::
 
-   \begin{equation}\mathbf{F}_{ne, Hertz} = k_N R_{eff}^{1/2}\delta_{ij}^{3/2} \mathbf{n}\end{equation}
+   \mathbf{F}_{ne, Hertz} = k_N R_{eff}^{1/2}\delta_{ij}^{3/2} \mathbf{n}
 
 Here, :math:`R_{eff} = \frac{R_i R_j}{R_i + R_j}` is the effective
 radius, denoted for simplicity as *R* from here on.  For *hertz*\ , the
@@ -121,10 +115,9 @@ equivalently *pressure*\ .
 
 For the *hertz/material* model, the force is given by:
 
-
 .. math::
 
-   \begin{equation}\mathbf{F}_{ne, Hertz/material} = \frac{4}{3} E_{eff} R_{eff}^{1/2}\delta_{ij}^{3/2} \mathbf{n}\end{equation}
+   \mathbf{F}_{ne, Hertz/material} = \frac{4}{3} E_{eff} R_{eff}^{1/2}\delta_{ij}^{3/2} \mathbf{n}
 
 Here, :math:`E_{eff} = E = \left(\frac{1-\nu_i^2}{E_i} + \frac{1-\nu_j^2}{E_j}\right)^{-1}` is the effective Young's
 modulus, with :math:`\nu_i, \nu_j` the Poisson ratios of the particles of
@@ -136,27 +129,23 @@ The *dmt* model corresponds to the
 :ref:`(Derjaguin-Muller-Toporov) <DMT1975>` cohesive model, where the force
 is simply Hertz with an additional attractive cohesion term:
 
-
 .. math::
 
-   \begin{equation}\mathbf{F}_{ne, dmt} = \left(\frac{4}{3} E R^{1/2}\delta_{ij}^{3/2} - 4\pi\gamma R\right)\mathbf{n}\end{equation}
+   \mathbf{F}_{ne, dmt} = \left(\frac{4}{3} E R^{1/2}\delta_{ij}^{3/2} - 4\pi\gamma R\right)\mathbf{n}
 
 The *jkr* model is the :ref:`(Johnson-Kendall-Roberts) <JKR1971>` model,
 where the force is computed as:
 
-
 .. math::
 
-   \begin{equation}\label{eq:force_jkr}
-   \mathbf{F}_{ne, jkr} = \left(\frac{4Ea^3}{3R} - 2\pi a^2\sqrt{\frac{4\gamma E}{\pi a}}\right)\mathbf{n}\end{equation}
+   \mathbf{F}_{ne, jkr} = \left(\frac{4Ea^3}{3R} - 2\pi a^2\sqrt{\frac{4\gamma E}{\pi a}}\right)\mathbf{n}
 
 Here, *a* is the radius of the contact zone, related to the overlap
 :math:`\delta` according to:
 
-
 .. math::
 
-   \begin{equation}\delta = a^2/R - 2\sqrt{\pi \gamma a/E}\end{equation}
+   \delta = a^2/R - 2\sqrt{\pi \gamma a/E}
 
 LAMMPS internally inverts the equation above to solve for *a* in terms
 of :math:`\delta`, then solves for the force in the previous
@@ -169,22 +158,19 @@ initially will not experience force until they come into contact
 experience a tensile force up to :math:`3\pi\gamma R`, at which point they
 lose contact.
 
-
 ----------
 
-
 In addition, the normal force is augmented by a damping term of the
 following general form:
 
-
 .. math::
 
-   \begin{equation}\mathbf{F}_{n,damp} = -\eta_n \mathbf{v}_{n,rel}\end{equation}
+   \mathbf{F}_{n,damp} = -\eta_n \mathbf{v}_{n,rel}
 
 Here, :math:`\mathbf{v}_{n,rel} = (\mathbf{v}_j - \mathbf{v}_i) \cdot \mathbf{n} \mathbf{n}` is the component of relative velocity along
 :math:`\mathbf{n}`.
 
-The optional *damping* keyword to the *pair\_coeff* command followed by
+The optional *damping* keyword to the *pair_coeff* command followed by
 a keyword determines the model form of the damping factor :math:`\eta_n`,
 and the interpretation of the :math:`\eta_{n0}` or :math:`e` coefficients
 specified as part of the normal contact model settings. The *damping*
@@ -195,7 +181,7 @@ other settings, potentially also the twisting damping).  The options
 for the damping model currently supported are:
 
 1. *velocity*
-2. *mass\_velocity*
+2. *mass_velocity*
 3. *viscoelastic*
 4. *tsuji*
 
@@ -205,35 +191,32 @@ used by default.
 For *damping velocity*\ , the normal damping is simply equal to the
 user-specified damping coefficient in the *normal* model:
 
-
 .. math::
 
-   \begin{equation}\eta_n = \eta_{n0}\end{equation}
+   \eta_n = \eta_{n0}
 
 Here, :math:`\eta_{n0}` is the damping coefficient specified for the normal
 contact model, in units of *mass*\ /\ *time*\ .
 
-For *damping mass\_velocity*, the normal damping is given by:
-
+For *damping mass_velocity*, the normal damping is given by:
 
 .. math::
 
-   \begin{equation}\eta_n = \eta_{n0} m_{eff}\end{equation}
+   \eta_n = \eta_{n0} m_{eff}
 
 Here, :math:`\eta_{n0}` is the damping coefficient specified for the normal
 contact model, in units of *mass*\ /\ *time* and
 :math:`m_{eff} = m_i m_j/(m_i + m_j)` is the effective mass.
-Use *damping mass\_velocity* to reproduce the damping behavior of
+Use *damping mass_velocity* to reproduce the damping behavior of
 *pair gran/hooke/\**.
 
 The *damping viscoelastic* model is based on the viscoelastic
 treatment of :ref:`(Brilliantov et al) <Brill1996>`, where the normal
 damping is given by:
 
-
 .. math::
 
-   \begin{equation}\eta_n = \eta_{n0}\ a m_{eff}\end{equation}
+   \eta_n = \eta_{n0}\ a m_{eff}
 
 Here, *a* is the contact radius, given by :math:`a =\sqrt{R\delta}`
 for all models except *jkr*\ , for which it is given implicitly according
@@ -244,18 +227,16 @@ The *tsuji* model is based on the work of :ref:`(Tsuji et al) <Tsuji1992>`. Here
 the normal model is interpreted as a restitution coefficient
 :math:`e`. The damping constant :math:`\eta_n` is given by:
 
-
 .. math::
 
-   \begin{equation}\eta_n = \alpha (m_{eff}k_n)^{1/2}\end{equation}
+   \eta_n = \alpha (m_{eff}k_n)^{1/2}
 
 For normal contact models based on material parameters, :math:`k_n = 4/3Ea`.  The parameter :math:`\alpha` is related to the restitution
 coefficient *e* according to:
 
-
 .. math::
 
-   \begin{equation}\alpha = 1.2728-4.2783e+11.087e^2-22.348e^3+27.467e^4-18.022e^5+4.8218e^6\end{equation}
+   \alpha = 1.2728-4.2783e+11.087e^2-22.348e^3+27.467e^4-18.022e^5+4.8218e^6
 
 The dimensionless coefficient of restitution :math:`e` specified as part
 of the normal contact model parameters should be between 0 and 1, but
@@ -264,53 +245,47 @@ no error check is performed on this.
 The total normal force is computed as the sum of the elastic and
 damping components:
 
-
 .. math::
 
-   \begin{equation}\mathbf{F}_n = \mathbf{F}_{ne} + \mathbf{F}_{n,damp}\end{equation}
-
+   \mathbf{F}_n = \mathbf{F}_{ne} + \mathbf{F}_{n,damp}
 
 ----------
 
-
-The *pair\_coeff* command also requires specification of the tangential
+The *pair_coeff* command also requires specification of the tangential
 contact model. The required keyword *tangential* is expected, followed
 by the model choice and associated parameters. Currently supported
 tangential model choices and their expected parameters are as follows:
 
-1. *linear\_nohistory* : :math:`x_{\gamma,t}`, :math:`\mu_s`
-2. *linear\_history* : :math:`k_t`, :math:`x_{\gamma,t}`, :math:`\mu_s`
+1. *linear_nohistory* : :math:`x_{\gamma,t}`, :math:`\mu_s`
+2. *linear_history* : :math:`k_t`, :math:`x_{\gamma,t}`, :math:`\mu_s`
 3. *mindlin* : :math:`k_t` or NULL, :math:`x_{\gamma,t}`, :math:`\mu_s`
-4. *mindlin\_rescale* : :math:`k_t` or NULL, :math:`x_{\gamma,t}`, :math:`\mu_s`
+4. *mindlin_rescale* : :math:`k_t` or NULL, :math:`x_{\gamma,t}`, :math:`\mu_s`
 
 Here, :math:`x_{\gamma,t}` is a dimensionless multiplier for the normal
 damping :math:`\eta_n` that determines the magnitude of the tangential
 damping, :math:`\mu_t` is the tangential (or sliding) friction
 coefficient, and :math:`k_t` is the tangential stiffness coefficient.
 
-For *tangential linear\_nohistory*, a simple velocity-dependent Coulomb
+For *tangential linear_nohistory*, a simple velocity-dependent Coulomb
 friction criterion is used, which mimics the behavior of the *pair
-gran/hooke* style. The tangential force (\mathbf{F}\_t\) is given by:
-
+gran/hooke* style. The tangential force (\mathbf{F}_t\) is given by:
 
 .. math::
 
-   \begin{equation}\mathbf{F}_t =  -min(\mu_t F_{n0}, \|\mathbf{F}_\mathrm{t,damp}\|) \mathbf{t}\end{equation}
+   \mathbf{F}_t =  -min(\mu_t F_{n0}, \|\mathbf{F}_\mathrm{t,damp}\|) \mathbf{t}
 
 The tangential damping force :math:`\mathbf{F}_\mathrm{t,damp}` is given by:
 
-
 .. math::
 
-   \begin{equation}\mathbf{F}_\mathrm{t,damp} = -\eta_t \mathbf{v}_{t,rel}\end{equation}
+   \mathbf{F}_\mathrm{t,damp} = -\eta_t \mathbf{v}_{t,rel}
 
 The tangential damping prefactor :math:`\eta_t` is calculated by scaling
 the normal damping :math:`\eta_n` (see above):
 
-
 .. math::
 
-   \begin{equation}\eta_t = -x_{\gamma,t} \eta_n\end{equation}
+   \eta_t = -x_{\gamma,t} \eta_n
 
 The normal damping prefactor :math:`\eta_n` is determined by the choice
 of the *damping* keyword, as discussed above.  Thus, the *damping*
@@ -328,43 +303,39 @@ depends on the form of the contact model. For non-cohesive models
 (\ *hertz*\ , *hertz/material*\ , *hooke*\ ), it is given by the magnitude of
 the normal force:
 
-
 .. math::
 
-   \begin{equation}F_{n0} = \|\mathbf{F}_n\|\end{equation}
+   F_{n0} = \|\mathbf{F}_n\|
 
 For cohesive models such as *jkr* and *dmt*\ , the critical force is
 adjusted so that the critical tangential force approaches :math:`\mu_t F_{pulloff}`, see :ref:`Marshall <Marshall2009>`, equation 43, and
 :ref:`Thornton <Thornton1991>`.  For both models, :math:`F_{n0}` takes the
 form:
 
-
 .. math::
 
-   \begin{equation}F_{n0} = \|\mathbf{F}_ne + 2 F_{pulloff}\|\end{equation}
+   F_{n0} = \|\mathbf{F}_ne + 2 F_{pulloff}\|
 
 Where :math:`F_{pulloff} = 3\pi \gamma R` for *jkr*\ , and
 :math:`F_{pulloff} = 4\pi \gamma R` for *dmt*\ .
 
 The remaining tangential options all use accumulated tangential
 displacement (i.e. contact history). This is discussed below in the
-context of the *linear\_history* option, but the same treatment of the
+context of the *linear_history* option, but the same treatment of the
 accumulated displacement applies to the other options as well.
 
-For *tangential linear\_history*, the tangential force is given by:
-
+For *tangential linear_history*, the tangential force is given by:
 
 .. math::
 
-   \begin{equation}\mathbf{F}_t =  -min(\mu_t F_{n0}, \|-k_t\mathbf{\xi} + \mathbf{F}_\mathrm{t,damp}\|) \mathbf{t}\end{equation}
+   \mathbf{F}_t =  -min(\mu_t F_{n0}, \|-k_t\mathbf{\xi} + \mathbf{F}_\mathrm{t,damp}\|) \mathbf{t}
 
 Here, :math:`\mathbf{\xi}` is the tangential displacement accumulated
 during the entire duration of the contact:
 
-
 .. math::
 
-   \begin{equation}\mathbf{\xi} = \int_{t0}^t \mathbf{v}_{t,rel}(\tau) \mathrm{d}\tau\end{equation}
+   \mathbf{\xi} = \int_{t0}^t \mathbf{v}_{t,rel}(\tau) \mathrm{d}\tau
 
 This accumulated tangential displacement must be adjusted to account
 for changes in the frame of reference of the contacting pair of
@@ -383,11 +354,9 @@ preserve the magnitude.  This follows the discussion in
 :ref:`Luding <Luding2008>`, see equation 17 and relevant discussion in that
 work:
 
-
 .. math::
 
-   \begin{equation}\mathbf{\xi} = \left(\mathbf{\xi'} - (\mathbf{n} \cdot \mathbf{\xi'})\mathbf{n}\right) \frac{\|\mathbf{\xi'}\|}{\|\mathbf{\xi'}\| - \mathbf{n}\cdot\mathbf{\xi'}}
-   \label{eq:rotate_displacements}\end{equation}
+   \mathbf{\xi} = \left(\mathbf{\xi'} - (\mathbf{n} \cdot \mathbf{\xi'})\mathbf{n}\right) \frac{\|\mathbf{\xi'}\|}{\|\mathbf{\xi'}\| - \mathbf{n}\cdot\mathbf{\xi'}}
 
 Here, :math:`\mathbf{\xi'}` is the accumulated displacement prior to the
 current time step and :math:`\mathbf{\xi}` is the corrected
@@ -401,33 +370,29 @@ tangential displacement is re-scaled to match the value for the
 critical force (see :ref:`Luding <Luding2008>`, equation 20 and related
 discussion):
 
-
 .. math::
 
-   \begin{equation}\mathbf{\xi} = -\frac{1}{k_t}\left(\mu_t F_{n0}\mathbf{t} + \mathbf{F}_{t,damp}\right)\end{equation}
+   \mathbf{\xi} = -\frac{1}{k_t}\left(\mu_t F_{n0}\mathbf{t} + \mathbf{F}_{t,damp}\right)
 
 The tangential force is added to the total normal force (elastic plus
 damping) to produce the total force on the particle. The tangential
 force also acts at the contact point (defined as the center of the
 overlap region) to induce a torque on each particle according to:
 
+.. math::
+
+   \mathbf{\tau}_i = -(R_i - 0.5 \delta) \mathbf{n} \times \mathbf{F}_t
 
 .. math::
 
-   \begin{equation}\mathbf{\tau}_i = -(R_i - 0.5 \delta) \mathbf{n} \times \mathbf{F}_t\end{equation}
+   \mathbf{\tau}_j = -(R_j - 0.5 \delta) \mathbf{n} \times \mathbf{F}_t
 
-
-.. math::
-
-   \begin{equation}\mathbf{\tau}_j = -(R_j - 0.5 \delta) \mathbf{n} \times \mathbf{F}_t\end{equation}
-
-For *tangential mindlin*\ , the :ref:`Mindlin <Mindlin1949>` no-slip solution is used, which differs from the *linear\_history*
+For *tangential mindlin*\ , the :ref:`Mindlin <Mindlin1949>` no-slip solution is used, which differs from the *linear_history*
 option by an additional factor of *a*\ , the radius of the contact region. The tangential force is given by:
 
-
 .. math::
 
-   \begin{equation}\mathbf{F}_t =  -min(\mu_t F_{n0}, \|-k_t a \mathbf{\xi} + \mathbf{F}_\mathrm{t,damp}\|) \mathbf{t}\end{equation}
+   \mathbf{F}_t =  -min(\mu_t F_{n0}, \|-k_t a \mathbf{\xi} + \mathbf{F}_\mathrm{t,damp}\|) \mathbf{t}
 
 Here, *a* is the radius of the contact region, given by :math:`a =\sqrt{R\delta}`
 for all normal contact models, except for *jkr*\ , where it is given
@@ -440,19 +405,17 @@ normal contact model that specifies material parameters :math:`E` and
 case, mixing of the shear modulus for different particle types *i* and
 *j* is done according to:
 
-
 .. math::
 
-   \begin{equation}1/G = 2(2-\nu_i)(1+\nu_i)/E_i + 2(2-\nu_j)(1+\nu_j)/E_j\end{equation}
+   1/G = 2(2-\nu_i)(1+\nu_i)/E_i + 2(2-\nu_j)(1+\nu_j)/E_j
 
-The *mindlin\_rescale* option uses the same form as *mindlin*\ , but the
+The *mindlin_rescale* option uses the same form as *mindlin*\ , but the
 magnitude of the tangential displacement is re-scaled as the contact
 unloads, i.e. if :math:`a < a_{t_{n-1}}`:
 
-
 .. math::
 
-   \begin{equation}\mathbf{\xi} = \mathbf{\xi_{t_{n-1}}} \frac{a}{a_{t_{n-1}}}\end{equation}
+   \mathbf{\xi} = \mathbf{\xi_{t_{n-1}}} \frac{a}{a_{t_{n-1}}}
 
 Here, :math:`t_{n-1}` indicates the value at the previous time
 step. This rescaling accounts for the fact that a decrease in the
@@ -462,10 +425,8 @@ created without the rescaling above (:ref:`Walton <WaltonPC>` ). See also
 discussion in :ref:`Thornton et al, 2013 <Thornton2013>` , particularly
 equation 18(b) of that work and associated discussion.
 
-
 ----------
 
-
 The optional *rolling* keyword enables rolling friction, which resists
 pure rolling motion of particles. The options currently supported are:
 
@@ -482,27 +443,24 @@ rolling displacement due to changes in the frame of reference of the
 contacting pair.  The rolling pseudo-force is computed analogously to
 the tangential force:
 
-
 .. math::
 
-   \begin{equation}\mathbf{F}_{roll,0} =  k_{roll} \mathbf{\xi}_{roll}  - \gamma_{roll} \mathbf{v}_{roll}\end{equation}
+   \mathbf{F}_{roll,0} =  k_{roll} \mathbf{\xi}_{roll}  - \gamma_{roll} \mathbf{v}_{roll}
 
 Here, :math:`\mathbf{v}_{roll} = -R(\mathbf{\Omega}_i - \mathbf{\Omega}_j) \times \mathbf{n}` is the relative rolling
 velocity, as given in :ref:`Wang et al <Wang2015>` and
 :ref:`Luding <Luding2008>`. This differs from the expressions given by :ref:`Kuhn and Bagi <Kuhn2004>` and used in :ref:`Marshall <Marshall2009>`; see :ref:`Wang et al <Wang2015>` for details. The rolling displacement is given by:
 
-
 .. math::
 
-   \begin{equation}\mathbf{\xi}_{roll} = \int_{t_0}^t \mathbf{v}_{roll} (\tau) \mathrm{d} \tau\end{equation}
+   \mathbf{\xi}_{roll} = \int_{t_0}^t \mathbf{v}_{roll} (\tau) \mathrm{d} \tau
 
 A Coulomb friction criterion truncates the rolling pseudo-force if it
 exceeds a critical value:
 
-
 .. math::
 
-   \begin{equation}\mathbf{F}_{roll} =  min(\mu_{roll} F_{n,0}, \|\mathbf{F}_{roll,0}\|)\mathbf{k}\end{equation}
+   \mathbf{F}_{roll} =  min(\mu_{roll} F_{n,0}, \|\mathbf{F}_{roll,0}\|)\mathbf{k}
 
 Here, :math:`\mathbf{k} = \mathbf{v}_{roll}/\|\mathbf{v}_{roll}\|` is the direction of
 the pseudo-force.  As with tangential displacement, the rolling
@@ -516,20 +474,16 @@ The rolling pseudo-force does not contribute to the total force on
 either particle (hence 'pseudo'), but acts only to induce an equal and
 opposite torque on each particle, according to:
 
+.. math::
+
+   \tau_{roll,i} =  R_{eff} \mathbf{n} \times \mathbf{F}_{roll}
 
 .. math::
 
-   \begin{equation}\tau_{roll,i} =  R_{eff} \mathbf{n} \times \mathbf{F}_{roll}\end{equation}
-
-
-.. math::
-
-   \begin{equation}\tau_{roll,j} =  -\tau_{roll,i}\end{equation}
-
+   \tau_{roll,j} =  -\tau_{roll,i}
 
 ----------
 
-
 The optional *twisting* keyword enables twisting friction, which
 resists rotation of two contacting particles about the vector
 :math:`\mathbf{n}` that connects their centers. The options currently
@@ -548,68 +502,58 @@ changes in the frame of reference due to rotations of the particle
 pair. The formulation in :ref:`Marshall <Marshall2009>` therefore provides
 the most straightforward treatment:
 
-
 .. math::
 
-   \begin{equation}\tau_{twist,0} = -k_{twist}\xi_{twist} - \gamma_{twist}\Omega_{twist}\end{equation}
+   \tau_{twist,0} = -k_{twist}\xi_{twist} - \gamma_{twist}\Omega_{twist}
 
 Here :math:`\xi_{twist} = \int_{t_0}^t \Omega_{twist} (\tau) \mathrm{d}\tau` is the twisting angular displacement, and
 :math:`\Omega_{twist} = (\mathbf{\Omega}_i - \mathbf{\Omega}_j) \cdot \mathbf{n}` is the relative twisting angular velocity. The torque
 is then truncated according to:
 
-
 .. math::
 
-   \begin{equation}\tau_{twist} = min(\mu_{twist} F_{n,0}, \tau_{twist,0})\end{equation}
+   \tau_{twist} = min(\mu_{twist} F_{n,0}, \tau_{twist,0})
 
 Similar to the sliding and rolling displacement, the angular
 displacement is rescaled so that it corresponds to the critical value
 if the twisting torque exceeds this critical value:
 
-
 .. math::
 
-   \begin{equation}\xi_{twist} = \frac{1}{k_{twist}} (\mu_{twist} F_{n,0}sgn(\Omega_{twist}) - \gamma_{twist}\Omega_{twist})\end{equation}
+   \xi_{twist} = \frac{1}{k_{twist}} (\mu_{twist} F_{n,0}sgn(\Omega_{twist}) - \gamma_{twist}\Omega_{twist})
 
 For *twisting sds*\ , the coefficients :math:`k_{twist}, \gamma_{twist}`
 and :math:`\mu_{twist}` are simply the user input parameters that follow
-the *twisting sds* keywords in the *pair\_coeff* command.
+the *twisting sds* keywords in the *pair_coeff* command.
 
-For *twisting\_marshall*, the coefficients are expressed in terms of
+For *twisting_marshall*, the coefficients are expressed in terms of
 sliding friction coefficients, as discussed in
 :ref:`Marshall <Marshall2009>` (see equations 32 and 33 of that work):
 
+.. math::
+
+   k_{twist} = 0.5k_ta^2
 
 .. math::
 
-   \begin{equation}k_{twist} = 0.5k_ta^2\end{equation}
-
+   \eta_{twist} = 0.5\eta_ta^2
 
 .. math::
 
-   \begin{equation}\eta_{twist} = 0.5\eta_ta^2\end{equation}
-
-
-.. math::
-
-   \begin{equation}\mu_{twist} = \frac{2}{3}a\mu_t\end{equation}
+   \mu_{twist} = \frac{2}{3}a\mu_t
 
 Finally, the twisting torque on each particle is given by:
 
+.. math::
+
+   \mathbf{\tau}_{twist,i} = \tau_{twist}\mathbf{n}
 
 .. math::
 
-   \begin{equation}\mathbf{\tau}_{twist,i} = \tau_{twist}\mathbf{n}\end{equation}
-
-
-.. math::
-
-   \begin{equation}\mathbf{\tau}_{twist,j} = -\mathbf{\tau}_{twist,i}\end{equation}
-
+   \mathbf{\tau}_{twist,j} = -\mathbf{\tau}_{twist,i}
 
 ----------
 
-
 The *granular* pair style can reproduce the behavior of the
 *pair gran/\** styles with the appropriate settings (some very
 minor differences can be expected due to corrections in
@@ -622,34 +566,30 @@ The second example is equivalent to
 The third example is equivalent to
 *pair gran/hertz/history 1000.0 500.0 50.0 50.0 0.4 1*\ .
 
-
 ----------
 
-
-LAMMPS automatically sets pairwise cutoff values for *pair\_style
+LAMMPS automatically sets pairwise cutoff values for *pair_style
 granular* based on particle radii (and in the case of *jkr* pull-off
 distances). In the vast majority of situations, this is adequate.
-However, a cutoff value can optionally be appended to the *pair\_style
+However, a cutoff value can optionally be appended to the *pair_style
 granular* command to specify a global cutoff (i.e. a cutoff for all
 atom types). Additionally, the optional *cutoff* keyword can be passed
-to the *pair\_coeff* command, followed by a cutoff value.  This will
-set a pairwise cutoff for the atom types in the *pair\_coeff* command.
+to the *pair_coeff* command, followed by a cutoff value.  This will
+set a pairwise cutoff for the atom types in the *pair_coeff* command.
 These options may be useful in some rare cases where the automatic
 cutoff determination is not sufficient, e.g.  if particle diameters
 are being modified via the *fix adapt* command. In that case, the
-global cutoff specified as part of the *pair\_style granular* command
+global cutoff specified as part of the *pair_style granular* command
 is applied to all atom types, unless it is overridden for a given atom
 type combination by the *cutoff* value specified in the *pair coeff*
 command.  If *cutoff* is only specified in the *pair coeff* command
-and no global cutoff is appended to the *pair\_style granular* command,
+and no global cutoff is appended to the *pair_style granular* command,
 then LAMMPS will use that cutoff for the specified atom type
 combination, and automatically set pairwise cutoffs for the remaining
 atom types.
 
-
 ----------
 
-
 Styles with a *gpu*\ , *intel*\ , *kk*\ , *omp*\ , or *opt* suffix are
 functionally the same as the corresponding style without the suffix.
 They have been optimized to run faster, depending on your available
@@ -668,10 +608,8 @@ by including their suffix, or you can use the :doc:`-suffix command-line switch
 See the :doc:`Speed packages <Speed_packages>` doc page for more
 instructions on how to use the accelerated styles effectively.
 
-
 ----------
 
-
 **Mixing, shift, table, tail correction, restart, rRESPA info**\ :
 
 The :doc:`pair_modify <pair_modify>` mix, shift, table, and tail options
@@ -682,32 +620,29 @@ most quantities, e.g. if friction coefficient for type 1-type 1
 interactions is set to :math:`\mu_1`, and friction coefficient for type
 2-type 2 interactions is set to :math:`\mu_2`, the friction coefficient
 for type1-type2 interactions is computed as :math:`\sqrt{\mu_1\mu_2}`
-(unless explicitly specified to a different value by a *pair\_coeff 1 2
+(unless explicitly specified to a different value by a *pair_coeff 1 2
 ...* command). The exception to this is elastic modulus, only
 applicable to *hertz/material*\ , *dmt* and *jkr* normal contact
 models. In that case, the effective elastic modulus is computed as:
 
-
 .. math::
 
-   \begin{equation}E_{eff,ij} = \left(\frac{1-\nu_i^2}{E_i} + \frac{1-\nu_j^2}{E_j}\right)^{-1}\end{equation}
+   E_{eff,ij} = \left(\frac{1-\nu_i^2}{E_i} + \frac{1-\nu_j^2}{E_j}\right)^{-1}
 
 If the *i-j* coefficients :math:`E_{ij}` and :math:`\nu_{ij}` are
 explicitly specified, the effective modulus is computed as:
 
-
 .. math::
 
-   \begin{equation}E_{eff,ij} = \left(\frac{1-\nu_{ij}^2}{E_{ij}} + \frac{1-\nu_{ij}^2}{E_{ij}}\right)^{-1}\end{equation}
+   E_{eff,ij} = \left(\frac{1-\nu_{ij}^2}{E_{ij}} + \frac{1-\nu_{ij}^2}{E_{ij}}\right)^{-1}
 
 or
 
-
 .. math::
 
-   \begin{equation}E_{eff,ij} = \frac{E_{ij}}{2(1-\nu_{ij})}\end{equation}
+   E_{eff,ij} = \frac{E_{ij}}{2(1-\nu_{ij})}
 
-These pair styles write their information to :doc:`binary restart files <restart>`, so a pair\_style command does not need to be
+These pair styles write their information to :doc:`binary restart files <restart>`, so a pair_style command does not need to be
 specified in an input script that reads a restart file.
 
 These pair styles can only be used via the *pair* keyword of the
@@ -726,19 +661,16 @@ particle I. The next entry (8) is the magnitude of the rolling torque.
 The next entry (9) is the magnitude of the twisting torque acting
 about the vector connecting the two particle centers.
 The last 3 (10-12) are the components of the vector connecting
-the centers of the two particles (x\_I - x\_J).
+the centers of the two particles (x_I - x_J).
 
 These extra quantities can be accessed by the :doc:`compute pair/local <compute_pair_local>` command, as *p1*\ , *p2*\ , ...,
 *p12*\ .
 
-
 ----------
 
-
 Restrictions
 """"""""""""
 
-
 All the granular pair styles are part of the GRANULAR package.  It is
 only enabled if LAMMPS was built with that package.  See the :doc:`Build package <Build_package>` doc page for more info.
 
@@ -765,23 +697,19 @@ Related commands
 Default
 """""""
 
-For the *pair\_coeff* settings: *damping viscoelastic*\ , *rolling none*\ ,
+For the *pair_coeff* settings: *damping viscoelastic*\ , *rolling none*\ ,
 *twisting none*\ .
 
 **References:**
 
 .. _Brill1996:
 
-
-
 **(Brilliantov et al, 1996)** Brilliantov, N. V., Spahn, F., Hertzsch,
 J. M., & Poschel, T. (1996).  Model for collisions in granular
 gases. Physical review E, 53(5), 5382.
 
 .. _Tsuji1992:
 
-
-
 **(Tsuji et al, 1992)** Tsuji, Y., Tanaka, T., & Ishida,
 T. (1992). Lagrangian numerical simulation of plug flow of
 cohesionless particles in a horizontal pipe. Powder technology, 71(3),
@@ -789,39 +717,29 @@ cohesionless particles in a horizontal pipe. Powder technology, 71(3),
 
 .. _JKR1971:
 
-
-
 **(Johnson et al, 1971)** Johnson, K. L., Kendall, K., & Roberts,
 A. D. (1971).  Surface energy and the contact of elastic
 solids. Proc. R. Soc. Lond. A, 324(1558), 301-313.
 
 .. _DMT1975:
 
-
-
 **Derjaguin et al, 1975)** Derjaguin, B. V., Muller, V. M., & Toporov,
 Y. P. (1975). Effect of contact deformations on the adhesion of
 particles. Journal of Colloid and interface science, 53(2), 314-326.
 
 .. _Luding2008:
 
-
-
 **(Luding, 2008)** Luding, S. (2008). Cohesive, frictional powders:
 contact models for tension. Granular matter, 10(4), 235.
 
 .. _Marshall2009:
 
-
-
 **(Marshall, 2009)** Marshall, J. S. (2009). Discrete-element modeling
 of particulate aerosol flows.  Journal of Computational Physics,
 228(5), 1541-1561.
 
 .. _Silbert2001:
 
-
-
 **(Silbert, 2001)** Silbert, L. E., Ertas, D., Grest, G. S., Halsey,
 T. C., Levine, D., & Plimpton, S. J. (2001).  Granular flow down an
 inclined plane: Bagnold scaling and rheology. Physical Review E,
@@ -829,50 +747,33 @@ inclined plane: Bagnold scaling and rheology. Physical Review E,
 
 .. _Kuhn2004:
 
-
-
 **(Kuhn and Bagi, 2005)** Kuhn, M. R., & Bagi, K. (2004). Contact
 rolling and deformation in granular media.  International journal of
 solids and structures, 41(21), 5793-5820.
 
 .. _Wang2015:
 
-
-
 **(Wang et al, 2015)** Wang, Y., Alonso-Marroquin, F., & Guo,
 W. W. (2015).  Rolling and sliding in 3-D discrete element
 models. Particuology, 23, 49-55.
 
 .. _Thornton1991:
 
-
-
 **(Thornton, 1991)** Thornton, C. (1991). Interparticle sliding in the
 presence of adhesion.  J. Phys. D: Appl. Phys. 24 1942
 
 .. _Mindlin1949:
 
-
-
 **(Mindlin, 1949)** Mindlin, R. D. (1949). Compliance of elastic bodies
 in contact.  J. Appl. Mech., ASME 16, 259-268.
 
 .. _Thornton2013:
 
-
-
 **(Thornton et al, 2013)** Thornton, C., Cummins, S. J., & Cleary,
-P. W. (2013).  An investigation of the comparative behaviour of
+P. W. (2013).  An investigation of the comparative behavior of
 alternative contact force models during inelastic collisions. Powder
 Technology, 233, 30-46.
 
 .. _WaltonPC:
 
-
-
 **(Otis R. Walton)** Walton, O.R., Personal Communication
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/pair_gromacs.rst b/doc/src/pair_gromacs.rst
index d80e8a794b..121181a90d 100644
--- a/doc/src/pair_gromacs.rst
+++ b/doc/src/pair_gromacs.rst
@@ -1,38 +1,36 @@
-.. index:: pair\_style lj/gromacs
+.. index:: pair_style lj/gromacs
 
-pair\_style lj/gromacs command
-==============================
+pair_style lj/gromacs command
+=============================
 
-pair\_style lj/gromacs/gpu command
-==================================
-
-pair\_style lj/gromacs/kk command
+pair_style lj/gromacs/gpu command
 =================================
 
-pair\_style lj/gromacs/omp command
-==================================
+pair_style lj/gromacs/kk command
+================================
 
-pair\_style lj/gromacs/coul/gromacs command
-===========================================
+pair_style lj/gromacs/omp command
+=================================
 
-pair\_style lj/gromacs/coul/gromacs/kk command
+pair_style lj/gromacs/coul/gromacs command
+==========================================
+
+pair_style lj/gromacs/coul/gromacs/kk command
+=============================================
+
+pair_style lj/gromacs/coul/gromacs/omp command
 ==============================================
 
-pair\_style lj/gromacs/coul/gromacs/omp command
-===============================================
-
 Syntax
 """"""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    pair_style style args
 
 * style = *lj/gromacs* or *lj/gromacs/coul/gromacs*
 * args = list of arguments for a particular style
 
-
 .. parsed-literal::
 
      *lj/gromacs* args = inner outer
@@ -44,16 +42,15 @@ Syntax
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    pair_style lj/gromacs 9.0 12.0
-   pair_coeff \* \* 100.0 2.0
+   pair_coeff * * 100.0 2.0
    pair_coeff 2 2 100.0 2.0 8.0 10.0
 
    pair_style lj/gromacs/coul/gromacs 9.0 12.0
    pair_style lj/gromacs/coul/gromacs 8.0 10.0 7.0 9.0
-   pair_coeff \* \* 100.0 2.0
+   pair_coeff * * 100.0 2.0
 
 Description
 """""""""""
@@ -64,25 +61,33 @@ smoothly to zero between an inner and outer cutoff.  It is a commonly
 used potential in the `GROMACS <http://www.gromacs.org>`_ MD code and for
 the coarse-grained models of :ref:`(Marrink) <Marrink>`.
 
-.. image:: Eqs/pair_gromacs.jpg
-   :align: center
+.. math::
 
-r1 is the inner cutoff; rc is the outer cutoff.  The coefficients A, B,
-and C are computed by LAMMPS to perform the shifting and smoothing.
-The function
-S(r) is actually applied once to each term of the LJ formula and once
-to the Coulombic formula, so there are 2 or 3 sets of A,B,C coefficients
-depending on which pair\_style is used.  The boundary conditions
-applied to the smoothing function are as follows: S'(r1) = S''(r1) = 0,
-S(rc) = -E(rc), S'(rc) = -E'(rc), and S''(rc) = -E''(rc),
-where E(r) is the corresponding term
-in the LJ or Coulombic potential energy function.
-Single and double primes denote first and second
-derivatives with respect to r, respectively.
+   E_{LJ} = & 4 \epsilon \left[ \left(\frac{\sigma}{r}\right)^{12} -
+            \left(\frac{\sigma}{r}\right)^6 \right] + S_{LJ}(r)
+                       \qquad r < r_c \\
+   E_C  = & \frac{C q_i q_j}{\epsilon  r} + S_C(r) \qquad r < r_c \\
+   S(r) = & C \qquad r < r_1 \\
+   S(r) = & \frac{A}{3} (r - r_1)^3 + \frac{B}{4} (r - r_1)^4 + C \qquad  r_1 < r < r_c \\
+   A = & (-3 E'(r_c) + (r_c - r_1) E''(r_c))/(r_c - r_1)^2 \\
+   B = & (2 E'(r_c) - (r_c - r_1) E''(r_c))/(r_c - r_1)^3 \\
+   C = & -E(r_c) + \frac{1}{2} (r_c - r_1) E'(r_c) - \frac{1}{12} (r_c - r_1)^2 E''(r_c)
+
+:math:`r_1` is the inner cutoff; :math:`r_c` is the outer cutoff.  The
+coefficients A, B, and C are computed by LAMMPS to perform the shifting
+and smoothing.  The function S(r) is actually applied once to each term
+of the LJ formula and once to the Coulombic formula, so there are 2 or 3
+sets of A,B,C coefficients depending on which pair_style is used.  The
+boundary conditions applied to the smoothing function are as follows:
+:math:`S'(r_1) = S''(r_1) = 0, S(r_c) = -E(r_c), S'(r_c) = -E'(r_c)`,
+and :math:`S''(r_c) = -E''(r_c)`, where E(r) is the corresponding term
+in the LJ or Coulombic potential energy function.  Single and double
+primes denote first and second derivatives with respect to r,
+respectively.
 
 The inner and outer cutoff for the LJ and Coulombic terms can be the
 same or different depending on whether 2 or 4 arguments are used in
-the pair\_style command.  The inner LJ cutoff must be > 0, but the
+the pair_style command.  The inner LJ cutoff must be > 0, but the
 inner Coulombic cutoff can be >= 0.
 
 The following coefficients must be defined for each pair of atoms
@@ -91,14 +96,13 @@ above, or in the data file or restart files read by the
 :doc:`read_data <read_data>` or :doc:`read_restart <read_restart>`
 commands, or by mixing as described below:
 
-* epsilon (energy units)
-* sigma (distance units)
+* :math:`\epsilon` (energy units)
+* :math:`\sigma` (distance units)
 * inner (distance units)
 * outer (distance units)
 
 Note that sigma is defined in the LJ formula as the zero-crossing
-distance for the potential, not as the energy minimum at 2\^(1/6)
-sigma.
+distance for the potential, not as the energy minimum at :math:`2^{1/6} \sigma`.
 
 The last 2 coefficients are optional inner and outer cutoffs for style
 *lj/gromacs*\ .  If not specified, the global *inner* and *outer* values
@@ -107,12 +111,10 @@ are used.
 The last 2 coefficients cannot be used with style
 *lj/gromacs/coul/gromacs* because this force field does not allow
 varying cutoffs for individual atom pairs; all pairs use the global
-cutoff(s) specified in the pair\_style command.
-
+cutoff(s) specified in the pair_style command.
 
 ----------
 
-
 Styles with a *gpu*\ , *intel*\ , *kk*\ , *omp*\ , or *opt* suffix are
 functionally the same as the corresponding style without the suffix.
 They have been optimized to run faster, depending on your available
@@ -131,15 +133,13 @@ by including their suffix, or you can use the :doc:`-suffix command-line switch
 See the :doc:`Speed packages <Speed_packages>` doc page for more
 instructions on how to use the accelerated styles effectively.
 
-
 ----------
 
-
 **Mixing, shift, table, tail correction, restart, rRESPA info**\ :
 
 For atom type pairs I,J and I != J, the epsilon and sigma coefficients
 and cutoff distance for all of the lj/cut pair styles can be mixed.
-The default mix value is *geometric*\ .  See the "pair\_modify" command
+The default mix value is *geometric*\ .  See the "pair_modify" command
 for details.
 
 None of the GROMACS pair styles support the
@@ -155,17 +155,15 @@ None of the GROMACS pair styles support the
 corrections to energy and pressure, since there are no corrections for
 a potential that goes to 0.0 at the cutoff.
 
-All of the GROMACS pair styles write their information to :doc:`binary restart files <restart>`, so pair\_style and pair\_coeff commands do
+All of the GROMACS pair styles write their information to :doc:`binary restart files <restart>`, so pair_style and pair_coeff commands do
 not need to be specified in an input script that reads a restart file.
 
 All of the GROMACS pair styles can only be used via the *pair*
 keyword of the :doc:`run_style respa <run_style>` command.  They do not
 support the *inner*\ , *middle*\ , *outer* keywords.
 
-
 ----------
 
-
 Restrictions
 """"""""""""
  none
@@ -177,17 +175,8 @@ Related commands
 
 **Default:** none
 
-
 ----------
 
-
 .. _Marrink:
 
-
-
 **(Marrink)** Marrink, de Vries, Mark, J Phys Chem B, 108, 750-760 (2004).
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/pair_gw.rst b/doc/src/pair_gw.rst
index cb17e581e1..7564252459 100644
--- a/doc/src/pair_gw.rst
+++ b/doc/src/pair_gw.rst
@@ -1,16 +1,15 @@
-.. index:: pair\_style gw
+.. index:: pair_style gw
 
-pair\_style gw command
-======================
+pair_style gw command
+=====================
 
-pair\_style gw/zbl command
-==========================
+pair_style gw/zbl command
+=========================
 
 Syntax
 """"""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    pair_style style
 
@@ -19,14 +18,13 @@ Syntax
 Examples
 """"""""
 
-pair\_style gw
-pair\_coeff \* \* SiC.gw Si C C
+.. code-block:: LAMMPS
 
-
-.. parsed-literal::
+   pair_style gw
+   pair_coeff * * SiC.gw Si C C
 
    pair_style gw/zbl
-   pair_coeff \* \* SiC.gw.zbl C Si
+   pair_coeff * * SiC.gw.zbl C Si
 
 Description
 """""""""""
@@ -43,10 +41,10 @@ to release the code anyway with only the technical explanations.
 For details of the model and the parameters, please refer to the
 linked publication.
 
-Only a single pair\_coeff command is used with the *gw* and *gw/zbl*
+Only a single pair_coeff command is used with the *gw* and *gw/zbl*
 styles which specifies a Gao-Weber potential file with parameters
 for all needed elements.  These are mapped to LAMMPS atom types by
-specifying N additional arguments after the filename in the pair\_coeff
+specifying N additional arguments after the filename in the pair_coeff
 command, where N is the number of LAMMPS atom types:
 
 * filename
@@ -57,12 +55,11 @@ to specify the path for the potential file.
 
 As an example, imagine a file SiC.gw has Gao-Weber values for Si and C.
 If your LAMMPS simulation has 4 atoms types and you want the first 3 to
-be Si, and the 4th to be C, you would use the following pair\_coeff command:
+be Si, and the 4th to be C, you would use the following pair_coeff command:
 
+.. code-block:: LAMMPS
 
-.. parsed-literal::
-
-   pair_coeff \* \* SiC.gw Si Si Si C
+   pair_coeff * * SiC.gw Si Si Si C
 
 The first 2 arguments must be \* \* so as to span all LAMMPS atom types.
 The first three Si arguments map LAMMPS atom types 1,2,3 to the Si
@@ -80,10 +77,8 @@ is similar to other many-body potentials supported by LAMMPS.
 You have to refer to the comments in the files and the literature
 to learn more details.
 
-
 ----------
 
-
 **Mixing, shift, table, tail correction, restart, rRESPA info**\ :
 
 For atom type pairs I,J and I != J, where types I and J correspond to
@@ -94,21 +89,18 @@ This pair style does not support the :doc:`pair_modify <pair_modify>`
 shift, table, and tail options.
 
 This pair style does not write its information to :doc:`binary restart files <restart>`, since it is stored in potential files.  Thus, you
-need to re-specify the pair\_style and pair\_coeff commands in an input
+need to re-specify the pair_style and pair_coeff commands in an input
 script that reads a restart file.
 
 This pair style can only be used via the *pair* keyword of the
 :doc:`run_style respa <run_style>` command.  It does not support the
 *inner*\ , *middle*\ , *outer* keywords.
 
-
 ----------
 
-
 Restrictions
 """"""""""""
 
-
 This pair style is part of the MANYBODY package. It is only enabled if
 LAMMPS was built with that package.  See the :doc:`Build package <Build_package>` doc page for more info.
 
@@ -119,7 +111,7 @@ The Gao-Weber potential files provided with LAMMPS (see the
 potentials directory) are parameterized for metal :doc:`units <units>`.
 You can use the GW potential with any LAMMPS units, but you would need
 to create your own GW potential file with coefficients listed in the
-appropriate units if your simulation doesn't use "metal" units.
+appropriate units if your simulation does not use "metal" units.
 
 Related commands
 """"""""""""""""
@@ -128,18 +120,9 @@ Related commands
 
 **Default:** none
 
-
 ----------
 
-
 .. _Gao:
 
-
-
 **(Gao)** Gao and Weber, Nuclear Instruments and Methods in Physics
 Research B 191 (2012) 504.
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/pair_hbond_dreiding.rst b/doc/src/pair_hbond_dreiding.rst
index e202cb4293..0f5470d5f9 100644
--- a/doc/src/pair_hbond_dreiding.rst
+++ b/doc/src/pair_hbond_dreiding.rst
@@ -1,37 +1,35 @@
-.. index:: pair\_style hbond/dreiding/lj
+.. index:: pair_style hbond/dreiding/lj
 
-pair\_style hbond/dreiding/lj command
-=====================================
+pair_style hbond/dreiding/lj command
+====================================
 
-pair\_style hbond/dreiding/lj/omp command
-=========================================
-
-pair\_style hbond/dreiding/morse command
+pair_style hbond/dreiding/lj/omp command
 ========================================
 
-pair\_style hbond/dreiding/morse/omp command
-============================================
+pair_style hbond/dreiding/morse command
+=======================================
+
+pair_style hbond/dreiding/morse/omp command
+===========================================
 
 Syntax
 """"""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    pair_style style N inner_distance_cutoff outer_distance_cutoff angle_cutof
 
 * style = *hbond/dreiding/lj* or *hbond/dreiding/morse*
 * n = cosine angle periodicity
-* inner\_distance\_cutoff = global inner cutoff for Donor-Acceptor interactions (distance units)
-* outer\_distance\_cutoff = global cutoff for Donor-Acceptor interactions (distance units)
-* angle\_cutoff = global angle cutoff for Acceptor-Hydrogen-Donor
+* inner_distance_cutoff = global inner cutoff for Donor-Acceptor interactions (distance units)
+* outer_distance_cutoff = global cutoff for Donor-Acceptor interactions (distance units)
+* angle_cutoff = global angle cutoff for Acceptor-Hydrogen-Donor
 * interactions (degrees)
 
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    pair_style hybrid/overlay lj/cut 10.0 hbond/dreiding/lj 4 9.0 11.0 90
    pair_coeff 1 2 hbond/dreiding/lj 3 i 9.5 2.75 4 9.0 11.0 90.0
@@ -46,15 +44,27 @@ The *hbond/dreiding* styles compute the Acceptor-Hydrogen-Donor (AHD)
 3-body hydrogen bond interaction for the :doc:`DREIDING <Howto_bioFF>`
 force field, given by:
 
-.. image:: Eqs/pair_hbond_dreiding.jpg
-   :align: center
+.. math::
 
-where Rin is the inner spline distance cutoff, Rout is the outer
-distance cutoff, theta\_c is the angle cutoff, and n is the cosine
-periodicity.
+   E  = & \left[LJ(r) | Morse(r) \right] \qquad \qquad \qquad r < r_{\rm in} \\
+      = & S(r) * \left[LJ(r) | Morse(r) \right] \qquad \qquad r_{\rm in} < r < r_{\rm out} \\
+      = & 0 \qquad \qquad \qquad \qquad \qquad \qquad \qquad r > r_{\rm out} \\
+   LJ(r)  = & AR^{-12}-BR^{-10}cos^n\theta=
+         \epsilon\left\lbrace 5\left[ \frac{\sigma}{r}\right]^{12}-
+         6\left[ \frac{\sigma}{r}\right]^{10}  \right\rbrace cos^n\theta\\
+   Morse(r)  = & D_0\left\lbrace \chi^2 - 2\chi\right\rbrace cos^n\theta=
+         D_{0}\left\lbrace e^{- 2 \alpha (r - r_0)} - 2 e^{- \alpha (r - r_0)}
+         \right\rbrace cos^n\theta \\
+   S(r)  = & \frac{ \left[r_{\rm out}^2 - r^2\right]^2
+   \left[r_{\rm out}^2 + 2r^2 - 3{r_{\rm in}^2}\right]}
+   { \left[r_{\rm out}^2 - {r_{\rm in}}^2\right]^3 }
+
+where :math:`r_{\rm in}` is the inner spline distance cutoff,
+:math:`r_{\rm out}` is the outer distance cutoff, :math:`\theta_c` is
+the angle cutoff, and *n* is the cosine periodicity.
 
 Here, *r* is the radial distance between the donor (D) and acceptor
-(A) atoms and *theta* is the bond angle between the acceptor, the
+(A) atoms and :math:`\theta` is the bond angle between the acceptor, the
 hydrogen (H) and the donor atoms:
 
 .. image:: JPG/dreiding_hbond.jpg
@@ -102,13 +112,11 @@ on the DREIDING force field.
 
    In the original Dreiding force field paper 1-4 non-bonded
    interactions ARE allowed.  If this is desired for your model, use the
-   special\_bonds command (e.g. "special\_bonds lj 0.0 0.0 1.0") to turn
+   special_bonds command (e.g. "special_bonds lj 0.0 0.0 1.0") to turn
    these interactions on.
 
-
 ----------
 
-
 The following coefficients must be defined for pairs of eligible
 donor/acceptor types via the :doc:`pair_coeff <pair_coeff>` command as
 in the examples above.
@@ -117,7 +125,7 @@ in the examples above.
 
    Unlike other pair styles and their associated
    :doc:`pair_coeff <pair_coeff>` commands, you do not need to specify
-   pair\_coeff settings for all possible I,J type pairs.  Only I,J type
+   pair_coeff settings for all possible I,J type pairs.  Only I,J type
    pairs for atoms which act as joint donors/acceptors need to be
    specified; all other type pairs are assumed to be inactive.
 
@@ -126,22 +134,22 @@ in the examples above.
    A :doc:`pair_coeff <pair_coeff>` command can be specified multiple
    times for the same donor/acceptor type pair.  This enables multiple
    hydrogen types to be assigned to the same donor/acceptor type pair.
-   For other pair\_styles, if the pair\_coeff command is re-used for the
+   For other pair_styles, if the pair_coeff command is re-used for the
    same I.J type pair, the settings for that type pair are overwritten.
    For the hydrogen bond potentials this is not the case; the settings
    are cumulative.  This means the only way to turn off a previous
-   setting, is to re-use the pair\_style command and start over.
+   setting, is to re-use the pair_style command and start over.
 
 For the *hbond/dreiding/lj* style the list of coefficients is as
 follows:
 
 * K = hydrogen atom type = 1 to Ntypes
 * donor flag = *i* or *j*
-* epsilon (energy units)
-* sigma (distance units)
-* n = exponent in formula above
-* distance cutoff Rin (distance units)
-* distance cutoff Rout (distance units)
+* :math:`\epsilon` (energy units)
+* :math:`\sigma` (distance units)
+* *n* = exponent in formula above
+* distance cutoff :math:`r_{\rm in}` (distance units)
+* distance cutoff :math:`r_{\rm out}` (distance units)
 * angle cutoff (degrees)
 
 For the *hbond/dreiding/morse* style the list of coefficients is as
@@ -149,12 +157,12 @@ follows:
 
 * K = hydrogen atom type = 1 to Ntypes
 * donor flag = *i* or *j*
-* D0 (energy units)
-* alpha (1/distance units)
-* r0 (distance units)
-* n = exponent in formula above
-* distance cutoff Rin (distance units)
-* distance cutoff Rout (distance units)
+* :math:`D_0` (energy units)
+* :math:`\alpha` (1/distance units)
+* :math:`r_0` (distance units)
+* *n* = exponent in formula above
+* distance cutoff :math:`r_{\rm in}` (distance units)
+* distance cutoff :math:`r_{out}` (distance units)
 * angle cutoff (degrees)
 
 A single hydrogen atom type K can be specified, or a wild-card asterisk
@@ -163,30 +171,28 @@ select multiple types as hydrogen atoms.  This takes the form
 "\*" or "\*n" or "n\*" or "m\*n".  See the :doc:`pair_coeff <pair_coeff>`
 command doc page for details.
 
-If the donor flag is *i*\ , then the atom of type I in the pair\_coeff
+If the donor flag is *i*\ , then the atom of type I in the pair_coeff
 command is treated as the donor, and J is the acceptor.  If the donor
-flag is *j*\ , then the atom of type J in the pair\_coeff command is
+flag is *j*\ , then the atom of type J in the pair_coeff command is
 treated as the donor and I is the donor.  This option is required
 because the :doc:`pair_coeff <pair_coeff>` command requires that I <= J.
 
-Epsilon and sigma are settings for the hydrogen bond potential based
-on a Lennard-Jones functional form.  Note that sigma is defined as the
-zero-crossing distance for the potential, not as the energy minimum at
-2\^(1/6) sigma.
+:math:`\epsilon` and :math:`\sigma` are settings for the hydrogen bond
+potential based on a Lennard-Jones functional form.  Note that sigma is
+defined as the zero-crossing distance for the potential, not as the
+energy minimum at :math:`2^{1/6} \sigma`.
 
-D0 and alpha and r0 are settings for the hydrogen bond potential based
-on a Morse functional form.
+:math:`D_0` and :math:`\alpha` and :math:`r_0` are settings for the
+hydrogen bond potential based on a Morse functional form.
 
 The last 3 coefficients for both styles are optional.  If not
 specified, the global n, distance cutoff, and angle cutoff specified
-in the pair\_style command are used.  If you wish to only override the
+in the pair_style command are used.  If you wish to only override the
 2nd or 3rd optional parameter, you must also specify the preceding
 optional parameters.
 
-
 ----------
 
-
 Styles with a *gpu*\ , *intel*\ , *kk*\ , *omp*\ , or *opt* suffix are
 functionally the same as the corresponding style without the suffix.
 They have been optimized to run faster, depending on your available
@@ -205,10 +211,8 @@ by including their suffix, or you can use the :doc:`-suffix command-line switch
 See the :doc:`Speed packages <Speed_packages>` doc page for more
 instructions on how to use the accelerated styles effectively.
 
-
 ----------
 
-
 **Mixing, shift, table, tail correction, restart, rRESPA info**\ :
 
 These pair styles do not support mixing. You must explicitly identify
@@ -224,7 +228,7 @@ These pair styles do not support the :doc:`pair_modify <pair_modify>`
 tail option for adding long-range tail corrections to energy and
 pressure.
 
-These pair styles do not write their information to :doc:`binary restart files <restart>`, so pair\_style and pair\_coeff commands need to be
+These pair styles do not write their information to :doc:`binary restart files <restart>`, so pair_style and pair_coeff commands need to be
 re-specified in an input script that reads a restart file.
 
 These pair styles can only be used via the *pair* keyword of the
@@ -239,18 +243,15 @@ command as a vector of values of length 2.
 To print these quantities to the log file (with a descriptive column
 heading) the following commands could be included in an input script:
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    compute hb all pair hbond/dreiding/lj
    variable n_hbond equal c_hb[1] #number hbonds
    variable E_hbond equal c_hb[2] #hbond energy
    thermo_style custom step temp epair v_E_hbond
 
-
 ----------
 
-
 Restrictions
 """"""""""""
  none
@@ -262,25 +263,14 @@ Related commands
 
 **Default:** none
 
-
 ----------
 
-
 .. _pair-Mayo:
 
-
-
 **(Mayo)** Mayo, Olfason, Goddard III, J Phys Chem, 94, 8897-8909
 (1990).
 
 .. _Liu:
 
-
-
 **(Liu)** Liu, Bryantsev, Diallo, Goddard III, J. Am. Chem. Soc 131 (8)
 2798 (2009)
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/pair_hybrid.rst b/doc/src/pair_hybrid.rst
index 2ede99b35a..8e40466faf 100644
--- a/doc/src/pair_hybrid.rst
+++ b/doc/src/pair_hybrid.rst
@@ -1,22 +1,21 @@
-.. index:: pair\_style hybrid
+.. index:: pair_style hybrid
 
-pair\_style hybrid command
-==========================
+pair_style hybrid command
+=========================
 
-pair\_style hybrid/kk command
-=============================
+pair_style hybrid/kk command
+============================
 
-pair\_style hybrid/overlay command
-==================================
+pair_style hybrid/overlay command
+=================================
 
-pair\_style hybrid/overlay/kk command
-=====================================
+pair_style hybrid/overlay/kk command
+====================================
 
 Syntax
 """"""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    pair_style hybrid style1 args style2 args ...
    pair_style hybrid/overlay style1 args style2 args ...
@@ -26,17 +25,16 @@ Syntax
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    pair_style hybrid lj/cut/coul/cut 10.0 eam lj/cut 5.0
-   pair_coeff 1\*2 1\*2 eam niu3
+   pair_coeff 1*2 1*2 eam niu3
    pair_coeff 3 3 lj/cut/coul/cut 1.0 1.0
-   pair_coeff 1\*2 3 lj/cut 0.5 1.2
+   pair_coeff 1*2 3 lj/cut 0.5 1.2
 
    pair_style hybrid/overlay lj/cut 2.5 coul/long 2.0
-   pair_coeff \* \* lj/cut 1.0 1.0
-   pair_coeff \* \* coul/long
+   pair_coeff * * lj/cut 1.0 1.0
+   pair_coeff * * coul/long
 
 Description
 """""""""""
@@ -60,7 +58,7 @@ using *lj/cut* and *coul/long* together gives the same result as if
 the *lj/cut/coul/long* potential were used by itself.  In this case,
 it would be more efficient to use the single combined potential, but
 in general any combination of pair potentials can be used together in
-to produce an interaction that is not encoded in any single pair\_style
+to produce an interaction that is not encoded in any single pair_style
 file, e.g. adding Coulombic forces between granular particles.
 
 All pair styles that will be used are listed as "sub-styles" following
@@ -78,7 +76,7 @@ a Tersoff potential for pure C for the other set (presumably with some
 could be listed twice.  But if you just want to use a Lennard-Jones or
 other pairwise potential for several different atom type pairs in your
 model, then you should just list the sub-style once and use the
-pair\_coeff command to assign parameters for the different type pairs.
+pair_coeff command to assign parameters for the different type pairs.
 
 .. note::
 
@@ -87,10 +85,10 @@ pair\_coeff command to assign parameters for the different type pairs.
    This is because the GPU package currently assumes that only one
    instance of a pair style is being used.
 
-In the pair\_coeff commands, the name of a pair style must be added
+In the pair_coeff commands, the name of a pair style must be added
 after the I,J type specification, with the remaining coefficients
 being those appropriate to that style.  If the pair style is used
-multiple times in the pair\_style command, then an additional numeric
+multiple times in the pair_style command, then an additional numeric
 argument must also be specified which is a number from 1 to M where M
 is the number of times the sub-style was listed in the pair style
 command.  The extra number indicates which instance of the sub-style
@@ -100,25 +98,23 @@ For example, consider a simulation with 3 atom types: types 1 and 2
 are Ni atoms, type 3 are LJ atoms with charges.  The following
 commands would set up a hybrid simulation:
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    pair_style hybrid eam/alloy lj/cut/coul/cut 10.0 lj/cut 8.0
-   pair_coeff \* \* eam/alloy nialhjea Ni Ni NULL
+   pair_coeff * * eam/alloy nialhjea Ni Ni NULL
    pair_coeff 3 3 lj/cut/coul/cut 1.0 1.0
-   pair_coeff 1\*2 3 lj/cut 0.8 1.3
+   pair_coeff 1*2 3 lj/cut 0.8 1.3
 
 As an example of using the same pair style multiple times, consider a
 simulation with 2 atom types.  Type 1 is Si, type 2 is C.  The
 following commands would model the Si atoms with Tersoff, the C atoms
 with Tersoff, and the cross-interactions with Lennard-Jones:
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    pair_style hybrid lj/cut 2.5 tersoff tersoff
-   pair_coeff \* \* tersoff 1 Si.tersoff Si NULL
-   pair_coeff \* \* tersoff 2 C.tersoff NULL C
+   pair_coeff * * tersoff 1 Si.tersoff Si NULL
+   pair_coeff * * tersoff 2 C.tersoff NULL C
    pair_coeff 1 2 lj/cut 1.0 1.5
 
 If pair coefficients are specified in the data file read via the
@@ -126,7 +122,6 @@ If pair coefficients are specified in the data file read via the
 E.g. "eam/alloy" or "lj/cut" must be added after the atom type, for
 each line in the "Pair Coeffs" section, e.g.
 
-
 .. parsed-literal::
 
    Pair Coeffs
@@ -134,7 +129,7 @@ each line in the "Pair Coeffs" section, e.g.
    1 lj/cut/coul/cut 1.0 1.0
    ...
 
-Note that the pair\_coeff command for some potentials such as
+Note that the pair_coeff command for some potentials such as
 :doc:`pair_style eam/alloy <pair_eam>` includes a mapping specification
 of elements to all atom types, which in the hybrid case, can include
 atom types not assigned to the *eam/alloy* potential.  The NULL
@@ -144,29 +139,28 @@ sub-style.
 
 For the *hybrid* style, each atom type pair I,J is assigned to exactly
 one sub-style.  Just as with a simulation using a single pair style,
-if you specify the same atom type pair in a second pair\_coeff command,
+if you specify the same atom type pair in a second pair_coeff command,
 the previous assignment will be overwritten.
 
 For the *hybrid/overlay* style, each atom type pair I,J can be
 assigned to one or more sub-styles.  If you specify the same atom type
-pair in a second pair\_coeff command with a new sub-style, then the
+pair in a second pair_coeff command with a new sub-style, then the
 second sub-style is added to the list of potentials that will be
 calculated for two interacting atoms of those types.  If you specify
-the same atom type pair in a second pair\_coeff command with a
+the same atom type pair in a second pair_coeff command with a
 sub-style that has already been defined for that pair of atoms, then
 the new pair coefficients simply override the previous ones, as in the
-normal usage of the pair\_coeff command.  E.g. these two sets of
+normal usage of the pair_coeff command.  E.g. these two sets of
 commands are the same:
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    pair_style lj/cut 2.5
-   pair_coeff \* \* 1.0 1.0
+   pair_coeff * * 1.0 1.0
    pair_coeff 2 2 1.5 0.8
 
    pair_style hybrid/overlay lj/cut 2.5
-   pair_coeff \* \* lj/cut 1.0 1.0
+   pair_coeff * * lj/cut 1.0 1.0
    pair_coeff 2 2 lj/cut 1.5 0.8
 
 Coefficients must be defined for each pair of atoms types via the
@@ -187,16 +181,14 @@ sub-style and use the :doc:`neigh_modify exclude type <neigh_modify>`
 command.  You can assign it to some sub-style and set the coefficients
 so that there is effectively no interaction (e.g. epsilon = 0.0 in a
 LJ potential).  Or, for *hybrid* and *hybrid/overlay* simulations, you
-can use this form of the pair\_coeff command in your input script:
+can use this form of the pair_coeff command in your input script:
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    pair_coeff        2 3 none
 
 or this form in the "Pair Coeffs" section of the data file:
 
-
 .. parsed-literal::
 
    3 none
@@ -210,10 +202,8 @@ command in your input script, if atoms in the simulation will need
 attributes from several atom styles, due to using multiple pair
 potentials.
 
-
 ----------
 
-
 Different force fields (e.g. CHARMM vs AMBER) may have different rules
 for applying weightings that change the strength of pairwise
 interactions between pairs of atoms that are also 1-2, 1-3, and 1-4
@@ -229,8 +219,7 @@ Here is an example for mixing CHARMM and AMBER: The global *amber*
 setting sets the 1-4 interactions to non-zero scaling factors and
 then overrides them with 0.0 only for CHARMM:
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    special_bonds amber
    pair_hybrid lj/charmm/coul/long 8.0 10.0 lj/cut/coul/long 10.0
@@ -238,8 +227,7 @@ then overrides them with 0.0 only for CHARMM:
 
 The this input achieves the same effect:
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    special_bonds 0.0 0.0 0.1
    pair_hybrid lj/charmm/coul/long 8.0 10.0 lj/cut/coul/long 10.0
@@ -253,8 +241,7 @@ Tersoff part of the system the force constants for the bonded
 interactions have been set to 0. Note the global settings are
 effectively *lj/coul 0.0 0.0 0.5* as required for OPLS/AA:
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    special_bonds lj/coul 1e-20 1e-20 0.5
    pair_hybrid tersoff lj/cut/coul/long 12.0
@@ -269,20 +256,16 @@ the compute tally styles, for example, if those pair styles
 See the :doc:`pair_modify <pair_modify>` doc page for details on
 the specific syntax, requirements and restrictions.
 
-
 ----------
 
-
 The potential energy contribution to the overall system due to an
 individual sub-style can be accessed and output via the :doc:`compute pair <compute_pair>` command.
 
-
 ----------
 
-
 .. note::
 
-   Several of the potentials defined via the pair\_style command in
+   Several of the potentials defined via the pair_style command in
    LAMMPS are really many-body potentials, such as Tersoff, AIREBO, MEAM,
    ReaxFF, etc.  The way to think about using these potentials in a
    hybrid setting is as follows.
@@ -293,10 +276,10 @@ all types and the NULL keywords described above to exclude specific
 types not assigned to that potential.  If types 1,3,4 were assigned in
 that way (but not type 2), this means that all many-body interactions
 between all atoms of types 1,3,4 will be computed by that potential.
-Pair\_style hybrid allows interactions between type pairs 2-2, 1-2,
+Pair_style hybrid allows interactions between type pairs 2-2, 1-2,
 2-3, 2-4 to be specified for computation by other pair styles.  You
 could even add a second interaction for 1-1 to be computed by another
-pair style, assuming pair\_style hybrid/overlay is used.
+pair style, assuming pair_style hybrid/overlay is used.
 
 But you should not, as a general rule, attempt to exclude the
 many-body interactions for some subset of the type pairs within the
@@ -308,7 +291,7 @@ find the additional atoms in the group.  It is typically non-physical
 to think of excluding an interaction between a particular pair of
 atoms when the potential computes 3-body or 4-body interactions.
 
-However, you can still use the pair\_coeff none setting or the
+However, you can still use the pair_coeff none setting or the
 :doc:`neigh_modify exclude <neigh_modify>` command to exclude certain
 type pairs from the neighbor list that will be passed to a many-body
 sub-style.  This will alter the calculations made by a many-body
@@ -322,15 +305,14 @@ to use a Tersoff potential to compute interactions within each
 surface, but not between surfaces.  Then either of these two command
 sequences would implement that model:
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    pair_style hybrid tersoff
-   pair_coeff \* \* tersoff SiC.tersoff C C
+   pair_coeff * * tersoff SiC.tersoff C C
    pair_coeff 1 2 none
 
    pair_style tersoff
-   pair_coeff \* \* SiC.tersoff C C
+   pair_coeff * * SiC.tersoff C C
    neigh_modify exclude type 1 2
 
 Either way, only neighbor lists with 1-1 or 2-2 interactions would be
@@ -343,22 +325,19 @@ potentials together, in an overlapping manner.  Imagine you have CNT
 interactions, and AIREBO for C/C interactions.  Si atoms are type 1; C
 atoms are type 2.  Something like this will work:
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    pair_style hybrid/overlay tersoff airebo 3.0
-   pair_coeff \* \* tersoff SiC.tersoff.custom Si C
-   pair_coeff \* \* airebo CH.airebo NULL C
+   pair_coeff * * tersoff SiC.tersoff.custom Si C
+   pair_coeff * * airebo CH.airebo NULL C
 
 Note that to prevent the Tersoff potential from computing C/C
 interactions, you would need to modify the SiC.tersoff file to turn
 off C/C interaction, i.e. by setting the appropriate coefficients to
 0.0.
 
-
 ----------
 
-
 Styles with a *gpu*\ , *intel*\ , *kk*\ , *omp*\ , or *opt* suffix are
 functionally the same as the corresponding style without the suffix.
 They have been optimized to run faster, depending on your available
@@ -383,10 +362,8 @@ by including their suffix, or you can use the :doc:`-suffix command-line switch
 See the :doc:`Speed packages <Speed_packages>` doc page for more
 instructions on how to use the accelerated styles effectively.
 
-
 ----------
 
-
 **Mixing, shift, table, tail correction, restart, rRESPA info**\ :
 
 Any pair potential settings made via the
@@ -396,12 +373,12 @@ sub-styles of the hybrid potential.
 For atom type pairs I,J and I != J, if the sub-style assigned to I,I
 and J,J is the same, and if the sub-style allows for mixing, then the
 coefficients for I,J can be mixed.  This means you do not have to
-specify a pair\_coeff command for I,J since the I,J type pair will be
+specify a pair_coeff command for I,J since the I,J type pair will be
 assigned automatically to the sub-style defined for both I,I and J,J
 and its coefficients generated by the mixing rule used by that
 sub-style.  For the *hybrid/overlay* style, there is an additional
 requirement that both the I,I and J,J pairs are assigned to a single
-sub-style.  See the "pair\_modify" command for details of mixing rules.
+sub-style.  See the "pair_modify" command for details of mixing rules.
 See the See the doc page for the sub-style to see if allows for
 mixing.
 
@@ -413,7 +390,7 @@ For the hybrid pair styles, the list of sub-styles and their
 respective settings are written to :doc:`binary restart files <restart>`, so a :doc:`pair_style <pair_style>` command does
 not need to specified in an input script that reads a restart file.
 However, the coefficient information is not stored in the restart
-file.  Thus, pair\_coeff commands need to be re-specified in the
+file.  Thus, pair_coeff commands need to be re-specified in the
 restart input script.
 
 These pair styles support the use of the *inner*\ , *middle*\ , and
@@ -423,9 +400,8 @@ their sub-styles do.
 Restrictions
 """"""""""""
 
-
 When using a long-range Coulombic solver (via the
-:doc:`kspace_style <kspace_style>` command) with a hybrid pair\_style,
+:doc:`kspace_style <kspace_style>` command) with a hybrid pair_style,
 one or more sub-styles will be of the "long" variety,
 e.g. *lj/cut/coul/long* or *buck/coul/long*\ .  You must insure that the
 short-range Coulombic cutoff used by each of these long pair styles is
@@ -436,9 +412,5 @@ Related commands
 
 :doc:`pair_coeff <pair_coeff>`
 
-**Default:** none
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
+**Default:**
+none
diff --git a/doc/src/pair_ilp_graphene_hbn.rst b/doc/src/pair_ilp_graphene_hbn.rst
index 74937bd0fb..22f4a37380 100644
--- a/doc/src/pair_ilp_graphene_hbn.rst
+++ b/doc/src/pair_ilp_graphene_hbn.rst
@@ -1,32 +1,30 @@
-.. index:: pair\_style ilp/graphene/hbn
+.. index:: pair_style ilp/graphene/hbn
 
-pair\_style ilp/graphene/hbn command
-====================================
+pair_style ilp/graphene/hbn command
+===================================
 
 Syntax
 """"""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    pair_style [hybrid/overlay ...] ilp/graphene/hbn cutoff tap_flag
 
 * cutoff = global cutoff (distance units)
-* tap\_flag = 0/1 to turn off/on the taper function
+* tap_flag = 0/1 to turn off/on the taper function
 
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    pair_style  hybrid/overlay ilp/graphene/hbn 16.0 1
-   pair_coeff  \* \* ilp/graphene/hbn  BNCH.ILP B N C
+   pair_coeff  * * ilp/graphene/hbn  BNCH.ILP B N C
 
    pair_style  hybrid/overlay rebo tersoff ilp/graphene/hbn 16.0 coul/shield 16.0
-   pair_coeff  \* \* rebo              CH.rebo     NULL NULL C
-   pair_coeff  \* \* tersoff           BNC.tersoff B    N    NULL
-   pair_coeff  \* \* ilp/graphene/hbn  BNCH.ILP    B    N    C
+   pair_coeff  * * rebo              CH.rebo     NULL NULL C
+   pair_coeff  * * tersoff           BNC.tersoff B    N    NULL
+   pair_coeff  * * ilp/graphene/hbn  BNCH.ILP    B    N    C
    pair_coeff  1 1 coul/shield 0.70
    pair_coeff  1 2 coul/shield 0.695
    pair_coeff  2 2 coul/shield 0.69
@@ -40,13 +38,26 @@ potential (ILP) potential as described in :ref:`(Leven1) <Leven1>`,
 The normals are calculated in the way as described
 in :ref:`(Kolmogorov) <Kolmogorov2>`.
 
-.. image:: Eqs/pair_ilp_graphene_hbn.jpg
-   :align: center
+.. math::
 
-Where Tap(r\_ij) is the taper function which provides a continuous
-cutoff (up to third derivative) for interatomic separations larger than
-r\_c :ref:`(Maaravi) <Maaravi2>`. The definitions of each parameter in the above
-equation can be found in :ref:`(Leven1) <Leven1>` and :ref:`(Maaravi) <Maaravi2>`.
+   E  = & \frac{1}{2} \sum_i \sum_{j \neq i} V_{ij} \\
+   V_{ij}  = & {\rm Tap}(r_{ij})\left \{ e^{-\alpha (r_{ij}/\beta -1)}
+                \left [ \epsilon + f(\rho_{ij}) + f(\rho_{ji})\right ] -
+                 \frac{1}{1+e^{-d\left [ \left ( r_{ij}/\left (s_R \cdot r^{eff} \right ) \right )-1 \right ]}}
+                 \cdot \frac{C_6}{r^6_{ij}} \right \}\\
+   \rho_{ij}^2 = & r_{ij}^2 - ({\bf r}_{ij} \cdot {\bf n}_i)^2 \\
+   \rho_{ji}^2  = & r_{ij}^2 - ({\bf r}_{ij} \cdot {\bf n}_j)^2 \\
+   f(\rho)  = &  C e^{ -( \rho / \delta )^2 } \\
+   {\rm Tap}(r_{ij})  = & 20\left ( \frac{r_{ij}}{R_{cut}} \right )^7 -
+                           70\left ( \frac{r_{ij}}{R_{cut}} \right )^6 +
+                           84\left ( \frac{r_{ij}}{R_{cut}} \right )^5 -
+                           35\left ( \frac{r_{ij}}{R_{cut}} \right )^4 + 1
+
+Where :math:`\mathrm{Tap}(r_{ij})` is the taper function which provides
+a continuous cutoff (up to third derivative) for interatomic separations
+larger than :math:`r_c` :ref:`(Maaravi) <Maaravi2>`. The definitions of
+each parameter in the above equation can be found in :ref:`(Leven1)
+<Leven1>` and :ref:`(Maaravi) <Maaravi2>`.
 
 It is important to include all the pairs to build the neighbor list for
 calculating the normals.
@@ -82,7 +93,7 @@ list for calculating the normals for each atom pair.
 
 .. note::
 
-   Four new sets of parameters of ILP for 2D layered Materials with bilayer and 
+   Four new sets of parameters of ILP for 2D layered Materials with bilayer and
    bulk configurations are presented in :ref:`(Ouyang1) <Ouyang1>` and :ref:`(Ouyang2) <Ouyang2>`, respectively.
    These parameters provide a good description in both short- and long-range interaction regimes.
    While the old ILP parameters published in :ref:`(Leven2) <Leven2>` and
@@ -93,44 +104,40 @@ list for calculating the normals for each atom pair.
    be found in :ref:`(Ouyang1) <Ouyang1>` and :ref:`(Ouyang2) <Ouyang2>`.
 
 This potential must be used in combination with hybrid/overlay.
-Other interactions can be set to zero using pair\_style *none*\ .
+Other interactions can be set to zero using pair_style *none*\ .
 
 This pair style tallies a breakdown of the total interlayer potential
 energy into sub-categories, which can be accessed via the :doc:`compute pair <compute_pair>` command as a vector of values of length 2.
 The 2 values correspond to the following sub-categories:
 
-1. *E\_vdW* = vdW (attractive) energy
-2. *E\_Rep* = Repulsive energy
+1. *E_vdW* = vdW (attractive) energy
+2. *E_Rep* = Repulsive energy
 
 To print these quantities to the log file (with descriptive column
 headings) the following commands could be included in an input script:
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    compute 0 all pair ilp/graphene/hbn
    variable Evdw  equal c_0[1]
    variable Erep  equal c_0[2]
    thermo_style custom step temp epair v_Erep v_Evdw
 
-
 ----------
 
-
 **Mixing, shift, table, tail correction, restart, rRESPA info**\ :
 
-This pair style does not support the pair\_modify mix, shift, table, and
+This pair style does not support the pair_modify mix, shift, table, and
 tail options.
 
 This pair style does not write their information to binary restart
 files, since it is stored in potential files. Thus, you need to
-re-specify the pair\_style and pair\_coeff commands in an input script
+re-specify the pair_style and pair_coeff commands in an input script
 that reads a restart file.
 
 Restrictions
 """"""""""""
 
-
 This fix is part of the USER-MISC package.  It is only enabled if
 LAMMPS was built with that package.  See the :doc:`Build package <Build_package>` doc page for more info.
 
@@ -150,54 +157,35 @@ Related commands
 :doc:`pair_none <pair_none>`,
 :doc:`pair_style hybrid/overlay <pair_hybrid>`,
 :doc:`pair_style drip <pair_drip>`,
-:doc:`pair_style pair\_kolmogorov\_crespi\_z <pair_kolmogorov_crespi_z>`,
-:doc:`pair_style pair\_kolmogorov\_crespi\_full <pair_kolmogorov_crespi_full>`,
-:doc:`pair_style pair\_lebedeva\_z <pair_lebedeva_z>`,
-:doc:`pair_style pair\_coul\_shield <pair_coul_shield>`.
-
-**Default:** tap\_flag = 1
+:doc:`pair_style pair_kolmogorov_crespi_z <pair_kolmogorov_crespi_z>`,
+:doc:`pair_style pair_kolmogorov_crespi_full <pair_kolmogorov_crespi_full>`,
+:doc:`pair_style pair_lebedeva_z <pair_lebedeva_z>`,
+:doc:`pair_style pair_coul_shield <pair_coul_shield>`.
 
+**Default:** tap_flag = 1
 
 ----------
 
-
 .. _Leven1:
 
-
-
 **(Leven1)** I. Leven, I. Azuri, L. Kronik and O. Hod, J. Chem. Phys. 140, 104106 (2014).
 
 .. _Leven2:
 
-
-
 **(Leven2)** I. Leven et al, J. Chem.Theory Comput. 12, 2896-905 (2016).
 
 .. _Maaravi2:
 
-
-
 **(Maaravi)** T. Maaravi et al, J. Phys. Chem. C 121, 22826-22835 (2017).
 
 .. _Kolmogorov2:
 
-
-
 **(Kolmogorov)** A. N. Kolmogorov, V. H. Crespi, Phys. Rev. B 71, 235415 (2005).
 
 .. _Ouyang1:
 
-
-
 **(Ouyang1)** W. Ouyang, D. Mandelli, M. Urbakh and O. Hod, Nano Lett. 18, 6009-6016 (2018).
 
 .. _Ouyang2:
 
-
-
 **(Ouyang2)** W. Ouyang et al., J. Chem. Theory Comput. 16(1), 666-676 (2020).
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/pair_kim.rst b/doc/src/pair_kim.rst
index 56232a3e92..7717545f21 100644
--- a/doc/src/pair_kim.rst
+++ b/doc/src/pair_kim.rst
@@ -1,13 +1,12 @@
-.. index:: pair\_style kim
+.. index:: pair_style kim
 
-pair\_style kim command
-=======================
+pair_style kim command
+======================
 
 Syntax
 """"""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    pair_style kim model
 
@@ -16,11 +15,10 @@ model = name of a KIM model (the KIM ID for models archived in OpenKIM)
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    pair_style kim SW_StillingerWeber_1985_Si__MO_405512056662_005
-   pair_coeff \* \* Si
+   pair_coeff * * Si
 
 Description
 """""""""""
@@ -35,18 +33,16 @@ KIM API Portable Model Interface (PMI) and can be used by any
 simulation code that conforms to the KIM API/PMI, and
 "KIM Simulator Models" that are natively implemented within a single
 simulation code (like LAMMPS) and can only be used with it.
-The *pair\_style kim* command is limited to KIM PMs. It is
+The *pair_style kim* command is limited to KIM PMs. It is
 used by the :doc:`kim_commands interface <kim_commands>` as needed.
 
 .. note::
 
-   Since *pair\_style kim* is called by *kim\_interactions* as needed,
+   Since *pair_style kim* is called by *kim_interactions* as needed,
    is not recommended to be directly used in input scripts.
 
-
 ----------
 
-
 The argument *model* is the name of the KIM PM.
 For potentials archived in OpenKIM
 this is the extended KIM ID (see :doc:`kim_commands <kim_commands>`
@@ -55,31 +51,28 @@ be incompatibilities (for example due to unit matching issues).
 In the event of an incompatibility, the code will terminate with
 an error message. Check both the LAMMPS and KIM log files for details.
 
-Only a single *pair\_coeff* command is used with the *kim* style, which
+Only a single *pair_coeff* command is used with the *kim* style, which
 specifies the mapping of LAMMPS atom types to the species supported by
 the KIM PM.  This is done by specifying *N* additional arguments
-after the \* \* in the *pair\_coeff* command, where *N* is the number of
+after the \* \* in the *pair_coeff* command, where *N* is the number of
 LAMMPS atom types:
 
 * N element names = mapping of KIM elements to atom types
 
 For example, consider a KIM PM that supports Si and C species.
 If the LAMMPS simulation has four atom types, where the first three are Si,
-and the fourth is C, the following *pair\_coeff* command would be used:
+and the fourth is C, the following *pair_coeff* command would be used:
 
+.. code-block:: LAMMPS
 
-.. parsed-literal::
-
-   pair_coeff \* \* Si Si Si C
+   pair_coeff * * Si Si Si C
 
 The first two arguments must be \* \* so as to span all LAMMPS atom types.
 The first three Si arguments map LAMMPS atom types 1, 2, and 3 to Si as
 defined within KIM PM.  The final C argument maps LAMMPS atom type 4 to C.
 
-
 ----------
 
-
 In addition to the usual LAMMPS error messages, the KIM library itself
 may generate errors, which should be printed to the screen.  In this
 case it is also useful to check the *kim.log* file for additional error
@@ -91,35 +84,30 @@ the *lib/kim/README* file.  Once you have done this and built LAMMPS
 with the KIM package installed you can run the example input scripts
 in *examples/kim*\ .
 
-
 ----------
 
-
 **Mixing, shift, table, tail correction, restart, rRESPA info**\ :
 
 This pair style does not support the :doc:`pair_modify <pair_modify>`
 mix, shift, table, and tail options.
 
 This pair style does not write its information to :doc:`binary restart files <restart>`, since KIM stores the potential parameters.
-Thus, you need to re-specify the pair\_style and pair\_coeff commands in
+Thus, you need to re-specify the pair_style and pair_coeff commands in
 an input script that reads a restart file.
 
 This pair style can only be used via the *pair* keyword of the
 :doc:`run_style respa <run_style>` command.  It does not support the
 *inner*\ , *middle*\ , *outer* keywords.
 
-
 ----------
 
-
 Restrictions
 """"""""""""
 
-
 This pair style is part of the KIM package. See details on
 restrictions in :doc:`kim_commands <kim_commands>`.
 
-This current version of pair\_style kim is compatible with the
+This current version of pair_style kim is compatible with the
 kim-api package version 2.0.0 and higher.
 
 Related commands
@@ -128,8 +116,3 @@ Related commands
 :doc:`pair_coeff <pair_coeff>`, :doc:`kim_commands <kim_commands>`
 
 **Default:** none
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/pair_kolmogorov_crespi_full.rst b/doc/src/pair_kolmogorov_crespi_full.rst
index a9dcbcbda9..8d9adf0341 100644
--- a/doc/src/pair_kolmogorov_crespi_full.rst
+++ b/doc/src/pair_kolmogorov_crespi_full.rst
@@ -1,32 +1,30 @@
-.. index:: pair\_style kolmogorov/crespi/full
+.. index:: pair_style kolmogorov/crespi/full
 
-pair\_style kolmogorov/crespi/full command
-==========================================
+pair_style kolmogorov/crespi/full command
+=========================================
 
 Syntax
 """"""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    pair_style hybrid/overlay kolmogorov/crespi/full cutoff tap_flag
 
 * cutoff = global cutoff (distance units)
-* tap\_flag = 0/1 to turn off/on the taper function
+* tap_flag = 0/1 to turn off/on the taper function
 
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    pair_style hybrid/overlay kolmogorov/crespi/full 20.0 0
-   pair_coeff \* \* none
-   pair_coeff \* \* kolmogorov/crespi/full  CH.KC   C C
+   pair_coeff * * none
+   pair_coeff * * kolmogorov/crespi/full  CH.KC   C C
 
    pair_style hybrid/overlay rebo kolmogorov/crespi/full 16.0 1
-   pair_coeff \* \* rebo                    CH.rebo      C H
-   pair_coeff \* \* kolmogorov/crespi/full  CH_taper.KC  C H
+   pair_coeff * * rebo                    CH.rebo      C H
+   pair_coeff * * kolmogorov/crespi/full  CH_taper.KC  C H
 
 Description
 """""""""""
@@ -35,15 +33,20 @@ The *kolmogorov/crespi/full* style computes the Kolmogorov-Crespi (KC)
 interaction potential as described in :ref:`(Kolmogorov) <Kolmogorov1>`.
 No simplification is made,
 
-.. image:: Eqs/pair_kolmogorov_crespi_full.jpg
-   :align: center
+.. math::
+
+   E  = & \frac{1}{2} \sum_i \sum_{j \neq i} V_{ij} \\
+   V_{ij}  = & e^{-\lambda (r_{ij} -z_0)} \left [ C + f(\rho_{ij}) + f(\rho_{ji}) - A \left ( \frac{r_{ij}}{z_0}\right )^{-6} \right ] \\
+  \rho_{ij}^2 = & r_{ij}^2 - ({\bf r}_{ij}\cdot {\bf n}_{i})^2 \\
+  \rho_{ji}^2 = & r_{ij}^2 - ({\bf r}_{ij}\cdot  {\bf n}_{j})^2 \\
+  f(\rho) & =  e^{-(\rho/\delta)^2} \sum_{n=0}^2 C_{2n} { (\rho/\delta) }^{2n}
 
 It is important to have a sufficiently large cutoff to ensure smooth
 forces and to include all the pairs to build the neighbor list for
 calculating the normals.  Energies are shifted so that they go
 continuously to zero at the cutoff assuming that the exponential part of
-*Vij* (first term) decays sufficiently fast.  This shift is achieved by
-the last term in the equation for *Vij* above. This is essential only
+:math:`V_{ij}` (first term) decays sufficiently fast.  This shift is achieved by
+the last term in the equation for :math:`V_{ij}` above. This is essential only
 when the tapper function is turned off. The formula of taper function
 can be found in pair style :doc:`ilp/graphene/hbn <pair_ilp_graphene_hbn>`.
 
@@ -69,10 +72,10 @@ list for calculating the normals for each atom pair.
 .. note::
 
    Two new sets of parameters of KC potential for hydrocarbons, CH.KC
-   (without the taper function) and CH\_taper.KC (with the taper function)
+   (without the taper function) and CH_taper.KC (with the taper function)
    are presented in :ref:`(Ouyang1) <Ouyang3>`.  The energy for the KC potential
    with the taper function goes continuously to zero at the cutoff.  The
-   parameters in both CH.KC and CH\_taper.KC provide a good description in
+   parameters in both CH.KC and CH_taper.KC provide a good description in
    both short- and long-range interaction regimes. While the original
    parameters (CC.KC) published in :ref:`(Kolmogorov) <Kolmogorov1>` are only
    suitable for long-range interaction regime.  This feature is essential
@@ -81,44 +84,40 @@ list for calculating the normals for each atom pair.
    comparison of these parameters can be found in :ref:`(Ouyang1) <Ouyang3>` and :ref:`(Ouyang2) <Ouyang4>`.
 
 This potential must be used in combination with hybrid/overlay.
-Other interactions can be set to zero using pair\_style *none*\ .
+Other interactions can be set to zero using pair_style *none*\ .
 
 This pair style tallies a breakdown of the total interlayer potential
 energy into sub-categories, which can be accessed via the :doc:`compute pair <compute_pair>` command as a vector of values of length 2.
 The 2 values correspond to the following sub-categories:
 
-1. *E\_vdW* = vdW (attractive) energy
-2. *E\_Rep* = Repulsive energy
+1. *E_vdW* = vdW (attractive) energy
+2. *E_Rep* = Repulsive energy
 
 To print these quantities to the log file (with descriptive column
 headings) the following commands could be included in an input script:
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    compute 0 all pair kolmogorov/crespi/full
    variable Evdw  equal c_0[1]
    variable Erep  equal c_0[2]
    thermo_style custom step temp epair v_Erep v_Evdw
 
-
 ----------
 
-
 **Mixing, shift, table, tail correction, restart, rRESPA info**\ :
 
-This pair style does not support the pair\_modify mix, shift, table,
+This pair style does not support the pair_modify mix, shift, table,
 and tail options.
 
 This pair style does not write their information to binary restart
 files, since it is stored in potential files. Thus, you need to
-re-specify the pair\_style and pair\_coeff commands in an input script
+re-specify the pair_style and pair_coeff commands in an input script
 that reads a restart file.
 
 Restrictions
 """"""""""""
 
-
 This fix is part of the USER-MISC package.  It is only enabled if
 LAMMPS was built with that package.  See the :doc:`Build package <Build_package>` doc page for more info.
 
@@ -138,35 +137,22 @@ Related commands
 :doc:`pair_none <pair_none>`,
 :doc:`pair_style hybrid/overlay <pair_hybrid>`,
 :doc:`pair_style drip <pair_drip>`,
-:doc:`pair_style pair\_lebedeva\_z <pair_lebedeva_z>`,
+:doc:`pair_style pair_lebedeva_z <pair_lebedeva_z>`,
 :doc:`pair_style kolmogorov/crespi/z <pair_kolmogorov_crespi_z>`,
 :doc:`pair_style ilp/graphene/hbn <pair_ilp_graphene_hbn>`.
 
-**Default:** tap\_flag = 0
-
+**Default:** tap_flag = 0
 
 ----------
 
-
 .. _Kolmogorov1:
 
-
-
 **(Kolmogorov)** A. N. Kolmogorov, V. H. Crespi, Phys. Rev. B 71, 235415 (2005)
 
 .. _Ouyang3:
 
-
-
 **(Ouyang1)** W. Ouyang, D. Mandelli, M. Urbakh and O. Hod, Nano Lett. 18, 6009-6016 (2018).
 
 .. _Ouyang4:
 
-
-
 **(Ouyang2)** W. Ouyang et al., J. Chem. Theory Comput. 16(1), 666-676 (2020).
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/pair_kolmogorov_crespi_z.rst b/doc/src/pair_kolmogorov_crespi_z.rst
index f9c116e15a..8b961773a3 100644
--- a/doc/src/pair_kolmogorov_crespi_z.rst
+++ b/doc/src/pair_kolmogorov_crespi_z.rst
@@ -1,28 +1,26 @@
-.. index:: pair\_style kolmogorov/crespi/z
+.. index:: pair_style kolmogorov/crespi/z
 
-pair\_style kolmogorov/crespi/z command
-=======================================
+pair_style kolmogorov/crespi/z command
+======================================
 
 Syntax
 """"""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    pair_style [hybrid/overlay ...] kolmogorov/crespi/z cutoff
 
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    pair_style hybrid/overlay kolmogorov/crespi/z 20.0
-   pair_coeff \* \* none
+   pair_coeff * * none
    pair_coeff 1 2 kolmogorov/crespi/z  CC.KC   C C
 
    pair_style hybrid/overlay rebo kolmogorov/crespi/z 14.0
-   pair_coeff \* \* rebo                 CH.rebo    C C
+   pair_coeff * * rebo                 CH.rebo    C C
    pair_coeff 1 2 kolmogorov/crespi/z  CC.KC      C C
 
 Description
@@ -32,13 +30,17 @@ The *kolmogorov/crespi/z* style computes the Kolmogorov-Crespi interaction
 potential as described in :ref:`(Kolmogorov) <KC05>`. An important simplification is made,
 which is to take all normals along the z-axis.
 
-.. image:: Eqs/pair_kolmogorov_crespi_z.jpg
-   :align: center
+.. math::
+
+   E  = & \frac{1}{2} \sum_i \sum_{j \neq i} V_{ij} \\
+   V_{ij}  = & e^{-\lambda(r_{ij} -z_0}) \left[ C + f(\rho_{ij}) + f(\rho_{ji}) \right] - A \left( \frac{r_{ij}}{z_0}\right)^{-6} + A \left( \frac{\textrm{cutoff}}{z_0}\right)^{-6} \\
+   \rho_{ij}^2 = & \rho_{ji}^2  =  x_{ij}^2 + y_{ij}^2 \qquad \qquad (\mathbf{n}_i \equiv \mathbf{\hat{z}}) \\
+   f(\rho)  = &  e^{-(\rho/\delta)^2} \sum_{n=0}^2 C_{2n} \left( \rho/\delta \right)^{2n}
 
 It is important to have a sufficiently large cutoff to ensure smooth forces.
 Energies are shifted so that they go continuously to zero at the cutoff assuming
-that the exponential part of *Vij* (first term) decays sufficiently fast.
-This shift is achieved by the last term in the equation for *Vij* above.
+that the exponential part of :math:`V_{ij}` (first term) decays sufficiently fast.
+This shift is achieved by the last term in the equation for :math:`V_{ij}` above.
 
 This potential is intended for interactions between two layers of graphene.
 Therefore, to avoid interaction between layers in multi-layered materials,
@@ -51,12 +53,11 @@ is available to facilitate scaling of energies in accordance with
 :ref:`(vanWijk) <vanWijk>`.
 
 This potential must be used in combination with hybrid/overlay.
-Other interactions can be set to zero using pair\_style *none*\ .
+Other interactions can be set to zero using pair_style *none*\ .
 
 Restrictions
 """"""""""""
 
-
 This fix is part of the USER-MISC package.  It is only enabled if
 LAMMPS was built with that package.  See the :doc:`Build package <Build_package>` doc page for more info.
 
@@ -73,24 +74,13 @@ Related commands
 
 **Default:** none
 
-
 ----------
 
-
 .. _KC05:
 
-
-
 **(Kolmogorov)** A. N. Kolmogorov, V. H. Crespi, Phys. Rev. B 71, 235415 (2005)
 
 .. _vanWijk:
 
-
-
 **(vanWijk)** M. M. van Wijk, A. Schuring, M. I. Katsnelson, and A. Fasolino,
 Physical Review Letters, 113, 135504 (2014)
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/pair_lcbop.rst b/doc/src/pair_lcbop.rst
index 49a0ba0a4b..ef26556c69 100644
--- a/doc/src/pair_lcbop.rst
+++ b/doc/src/pair_lcbop.rst
@@ -1,24 +1,22 @@
-.. index:: pair\_style lcbop
+.. index:: pair_style lcbop
 
-pair\_style lcbop command
-=========================
+pair_style lcbop command
+========================
 
 Syntax
 """"""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    pair_style lcbop
 
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    pair_style lcbop
-   pair_coeff \* \* ../potentials/C.lcbop C
+   pair_coeff * * ../potentials/C.lcbop C
 
 Description
 """""""""""
@@ -27,10 +25,10 @@ The *lcbop* pair style computes the long-range bond-order potential
 for carbon (LCBOP) of :ref:`(Los and Fasolino) <Los>`.  See section II in
 that paper for the analytic equations associated with the potential.
 
-Only a single pair\_coeff command is used with the *lcbop* style which
+Only a single pair_coeff command is used with the *lcbop* style which
 specifies an LCBOP potential file with parameters for specific
 elements.  These are mapped to LAMMPS atom types by specifying N
-additional arguments after the filename in the pair\_coeff command,
+additional arguments after the filename in the pair_coeff command,
 where N is the number of LAMMPS atom types:
 
 * filename
@@ -40,12 +38,11 @@ See the :doc:`pair_coeff <pair_coeff>` doc page for alternate ways
 to specify the path for the potential file.
 
 As an example, if your LAMMPS simulation has 4 atom types and you want
-the 1st 3 to be C you would use the following pair\_coeff command:
+the 1st 3 to be C you would use the following pair_coeff command:
 
+.. code-block:: LAMMPS
 
-.. parsed-literal::
-
-   pair_coeff \* \* C.lcbop C C C NULL
+   pair_coeff * * C.lcbop C C C NULL
 
 The 1st 2 arguments must be \* \* so as to span all LAMMPS atom types.
 The first C argument maps LAMMPS atom type 1 to the C element in the
@@ -59,17 +56,15 @@ are listed in the C.lcbop file to agree with the original :ref:`(Los and Fasolin
 potential and the way it was fit, so modifying the file should be done
 carefully.
 
-
 ----------
 
-
 **Mixing, shift, table, tail correction, restart, rRESPA info**\ :
 
 This pair style does not support the :doc:`pair_modify <pair_modify>`
 mix, shift, table, and tail options.
 
 This pair style does not write its information to :doc:`binary restart files <restart>`, since it is stored in potential files.  Thus, you
-need to re-specify the pair\_style and pair\_coeff commands in an input
+need to re-specify the pair_style and pair_coeff commands in an input
 script that reads a restart file.
 
 This pair style can only be used via the *pair* keyword of the
@@ -79,7 +74,6 @@ This pair style can only be used via the *pair* keyword of the
 Restrictions
 """"""""""""
 
-
 This pair styles is part of the MANYBODY package.  It is only enabled
 if LAMMPS was built with that package.  See the :doc:`Build package <Build_package>` doc page for more info.
 
@@ -90,7 +84,7 @@ The C.lcbop potential file provided with LAMMPS (see the potentials
 directory) is parameterized for metal :doc:`units <units>`.  You can use
 the LCBOP potential with any LAMMPS units, but you would need to
 create your own LCBOP potential file with coefficients listed in the
-appropriate units if your simulation doesn't use "metal" units.
+appropriate units if your simulation does not use "metal" units.
 
 Related commands
 """"""""""""""""
@@ -99,18 +93,9 @@ Related commands
 
 **Default:** none
 
-
 ----------
 
-
 .. _Los:
 
-
-
 **(Los and Fasolino)** J. H. Los and A. Fasolino, Phys. Rev. B 68, 024107
 (2003).
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/pair_lebedeva_z.rst b/doc/src/pair_lebedeva_z.rst
index 08a88450b5..df81d83999 100644
--- a/doc/src/pair_lebedeva_z.rst
+++ b/doc/src/pair_lebedeva_z.rst
@@ -1,28 +1,26 @@
-.. index:: pair\_style lebedeva/z
+.. index:: pair_style lebedeva/z
 
-pair\_style lebedeva/z command
-==============================
+pair_style lebedeva/z command
+=============================
 
 Syntax
 """"""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    pair_style [hybrid/overlay ...] lebedeva/z cutoff
 
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    pair_style hybrid/overlay lebedeva/z 20.0
-   pair_coeff \* \* none
+   pair_coeff * * none
    pair_coeff 1 2 lebedeva/z  CC.Lebedeva   C C
 
    pair_style hybrid/overlay rebo lebedeva/z 14.0
-   pair_coeff \* \* rebo        CH.rebo       C C
+   pair_coeff * * rebo        CH.rebo       C C
    pair_coeff 1 2 lebedeva/z  CC.Lebedeva   C C
 
 Description
@@ -32,25 +30,29 @@ The *lebedeva/z* style computes the Lebedeva interaction
 potential as described in :ref:`(Lebedeva et al.) <Leb01>`. An important simplification is made,
 which is to take all normals along the z-axis.
 
-.. image:: Eqs/pair_lebedeva.png
-   :align: center
+.. math::
+
+   E       = & \frac{1}{2} \sum_i \sum_{i \neq j} V_{ij}\\
+   V_{ij}  = & B e^{-\alpha(r_{ij} - z_0)} \\
+             & + C(1 + D_1\rho^2_{ij} + D_2\rho^4_{ij} e^{-\lambda_1\rho^2_{ij}} e^{-\lambda_2 (z^2_{ij} - z^2_0)} \\
+             & - A \left(\frac{z_0}{r_ij}\right)^6 + A \left( \frac{z_0}{r_c} \right)^6 \\
+   \rho^2_{ij} = & x^2_{ij} + y^2_{ij} \qquad (\mathbf{n_i} \equiv \mathbf{\hat{z}})
 
 It is important to have a sufficiently large cutoff to ensure smooth forces.
 Energies are shifted so that they go continuously to zero at the cutoff assuming
-that the exponential part of *Vij* (first term) decays sufficiently fast.
-This shift is achieved by the last term in the equation for *Vij* above.
+that the exponential part of :math:`V_{ij}` (first term) decays sufficiently fast.
+This shift is achieved by the last term in the equation for :math:`V_{ij}` above.
 
 The parameter file (e.g. CC.Lebedeva), is intended for use with metal
 :doc:`units <units>`, with energies in meV. An additional parameter, *S*\ ,
 is available to facilitate scaling of energies.
 
 This potential must be used in combination with hybrid/overlay.
-Other interactions can be set to zero using pair\_style *none*\ .
+Other interactions can be set to zero using pair_style *none*\ .
 
 Restrictions
 """"""""""""
 
-
 This fix is part of the USER-MISC package.  It is only enabled if
 LAMMPS was built with that package.  See the :doc:`Build package <Build_package>` doc page for more info.
 
@@ -67,17 +69,8 @@ Related commands
 
 **Default:** none
 
-
 ----------
 
-
 .. _Leb01:
 
-
-
 **(Lebedeva et al.)** I. V. Lebedeva, A. A. Knizhnik, A. M. Popov, Y. E. Lozovik, B. V. Potapkin, Phys. Rev. B, 84, 245437 (2011)
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/pair_line_lj.rst b/doc/src/pair_line_lj.rst
index 3b7af38fd1..70077c61f8 100644
--- a/doc/src/pair_line_lj.rst
+++ b/doc/src/pair_line_lj.rst
@@ -1,13 +1,12 @@
-.. index:: pair\_style line/lj
+.. index:: pair_style line/lj
 
-pair\_style line/lj command
-===========================
+pair_style line/lj command
+==========================
 
 Syntax
 """"""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    pair_style line/lj cutoff
 
@@ -16,11 +15,10 @@ cutoff = global cutoff for interactions (distance units)
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    pair_style line/lj 3.0
-   pair_coeff \* \* 1.0 1.0 1.0 0.8 1.12
+   pair_coeff * * 1.0 1.0 1.0 0.8 1.12
    pair_coeff 1 2 1.0 2.0 1.0 1.5 1.12 5.0
    pair_coeff 1 2 1.0 0.0 1.0 1.0 2.5
 
@@ -28,13 +26,13 @@ Description
 """""""""""
 
 Style *line/lj* treats particles which are line segments as a set of
-small spherical particles that tile the line segment length as
-explained below.  Interactions between two line segments, each with N1
-and N2 spherical particles, are calculated as the pairwise sum of
-N1\*N2 Lennard-Jones interactions.  Interactions between a line segment
-with N spherical particles and a point particle are treated as the
-pairwise sum of N Lennard-Jones interactions.  See the :doc:`pair_style lj/cut <pair_lj>` doc page for the definition of Lennard-Jones
-interactions.
+small spherical particles that tile the line segment length as explained
+below.  Interactions between two line segments, each with N1 and N2
+spherical particles, are calculated as the pairwise sum of N1\*N2
+Lennard-Jones interactions.  Interactions between a line segment with N
+spherical particles and a point particle are treated as the pairwise sum
+of N Lennard-Jones interactions.  See the :doc:`pair_style lj/cut
+<pair_lj>` doc page for the definition of Lennard-Jones interactions.
 
 The set of non-overlapping spherical sub-particles that represent a
 line segment are generated in the following manner.  Their size is a
@@ -50,17 +48,17 @@ each pair of points.
 
 The LJ interaction between 2 spheres on different line segments (or a
 sphere on a line segment and a point particles) is computed with
-sub-particle epsilon, sigma, and cutoff values that are set by the
-pair\_coeff command, as described below.  If the distance between the 2
-spheres is greater than the sub-particle cutoff, there is no
-interaction.  This means that some pairs of sub-particles on 2 line
+sub-particle :math:`\epsilon`, :math:`\sigma`, and *cutoff* values that
+are set by the pair_coeff command, as described below.  If the distance
+between the 2 spheres is greater than the sub-particle cutoff, there is
+no interaction.  This means that some pairs of sub-particles on 2 line
 segments may interact, but others may not.
 
 For purposes of creating the neighbor list for pairs of interacting
 line segments or lines/point particles, a regular particle-particle
 cutoff is used, as defined by the *cutoff* setting above in the
-pair\_style command or overridden with an optional argument in the
-pair\_coeff command for a type pair as discussed below.  The distance
+pair_style command or overridden with an optional argument in the
+pair_coeff command for a type pair as discussed below.  The distance
 between the centers of 2 line segments, or the center of a line
 segment and a point particle, must be less than this distance (plus
 the neighbor skin; see the :doc:`neighbor <neighbor>` command), for
@@ -71,7 +69,7 @@ the pair of particles to be included in the neighbor list.
    This means that a too-short value for the *cutoff* setting can
    exclude a pair of particles from the neighbor list even if pairs of
    their sub-particle spheres would interact, based on the sub-particle
-   cutoff specified in the pair\_coeff command.  E.g. sub-particles at the
+   cutoff specified in the pair_coeff command.  E.g. sub-particles at the
    ends of the line segments that are close to each other.  Which may not
    be what you want, since it means the ends of 2 line segments could
    pass through each other.  It is up to you to specify a *cutoff*
@@ -86,8 +84,8 @@ commands:
 
 * sizeI (distance units)
 * sizeJ (distance units)
-* epsilon (energy units)
-* sigma (distance units)
+* :math:`\epsilon` (energy units)
+* :math:`\sigma` (distance units)
 * subcutoff (distance units)
 * cutoff (distance units)
 
@@ -95,28 +93,26 @@ The *sizeI* and *sizeJ* coefficients are the sub-particle sizes for
 line particles of type I and type J.  They are used to define the N
 sub-particles per segment as described above.  These coefficients are
 actually stored on a per-type basis.  Thus if there are multiple
-pair\_coeff commands that involve type I, as either the first or
+pair_coeff commands that involve type I, as either the first or
 second atom type, you should use consistent values for sizeI or sizeJ
 in all of them.  If you do not do this, the last value specified for
 sizeI will apply to all segments of type I.  If typeI or typeJ refers
 to point particles, the corresponding sizeI or sizeJ is ignored; it
 can be set to 0.0.
 
-The *epsilon*\ , *sigma*\ , and *subcutoff* coefficients are used to
-compute an LJ interactions between a pair of sub-particles on 2 line
-segments (of type I and J), or between a sub particle/point particle
-pair.  As discussed above, the *subcutoff* and *cutoff* params are
-different.  The latter is only used for building the neighbor list
+The :math:`\epsilon`, :math:`\sigma`, and *subcutoff* coefficients are
+used to compute an LJ interactions between a pair of sub-particles on 2
+line segments (of type I and J), or between a sub particle/point
+particle pair.  As discussed above, the *subcutoff* and *cutoff* params
+are different.  The latter is only used for building the neighbor list
 when the distance between centers of two line segments or one segment
 and a point particle is calculated.
 
 The *cutoff* coefficient is optional.  If not specified, the global
 cutoff is used.
 
-
 ----------
 
-
 **Mixing, shift, table, tail correction, restart, rRESPA info**\ :
 
 For atom type pairs I,J and I != J, coefficients must be specified.
@@ -131,14 +127,11 @@ This pair style can only be used via the *pair* keyword of the
 :doc:`run_style respa <run_style>` command.  It does not support the
 *inner*\ , *middle*\ , *outer* keywords.
 
-
 ----------
 
-
 Restrictions
 """"""""""""
 
-
 This style is part of the ASPHERE package.  It is only enabled if
 LAMMPS was built with that package.  See the :doc:`Build package <Build_package>` doc page for more info.
 
@@ -152,8 +145,3 @@ Related commands
 :doc:`pair_coeff <pair_coeff>`, :doc:`pair_style tri/lj <pair_tri_lj>`
 
 **Default:** none
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/pair_list.rst b/doc/src/pair_list.rst
index 2dd5ec44de..93485b3471 100644
--- a/doc/src/pair_list.rst
+++ b/doc/src/pair_list.rst
@@ -6,7 +6,6 @@ pair_style list command
 Syntax
 """"""
 
-
 .. code-block:: LAMMPS
 
    pair_style list listfile cutoff keyword
@@ -18,7 +17,6 @@ Syntax
 Examples
 """"""""
 
-
 .. code-block:: LAMMPS
 
    pair_style list restraints.txt 200.0
@@ -34,7 +32,7 @@ Description
 Style *list* computes interactions between explicitly listed pairs of
 atoms with the option to select functional form and parameters for
 each individual pair.  Because the parameters are set in the list
-file, the pair\_coeff command has no parameters (but still needs to be
+file, the pair_coeff command has no parameters (but still needs to be
 provided).  The *check* and *nocheck* keywords enable/disable a test
 that checks whether all listed bonds were present and computed.
 
@@ -50,23 +48,20 @@ The format of the list file is as follows:
 * empty lines will be ignored
 * comment text starts with a '#' character
 * line syntax: *ID1 ID2 style coeffs cutoff*
-  
+
   .. parsed-literal::
-  
+
        ID1 = atom ID of first atom
        ID2 = atom ID of second atom
        style = style of interaction
        coeffs = list of coeffs
        cutoff = cutoff for interaction (optional)
 
-
-
 The cutoff parameter is optional. If not specified, the global cutoff
 is used.
 
 Here is an example file:
 
-
 .. parsed-literal::
 
    # this is a comment
@@ -81,7 +76,6 @@ The style *lj126* computes pairwise interactions with the formula
 
    E = 4 \epsilon \left[ \left(\frac{\sigma}{r}\right)^{12} - \left(\frac{\sigma}{r}\right)^6 \right] \qquad r < r_c
 
-
 and the coefficients:
 
 * :math:`\epsilon` (energy units)
@@ -93,7 +87,6 @@ The style *morse* computes pairwise interactions with the formula
 
    E = D_0 \left[ e^{- 2 \alpha (r - r_0)} - 2 e^{- \alpha (r - r_0)} \right] \qquad r < r_c
 
-
 and the coefficients:
 
 * :math:`D_0` (energy units)
@@ -113,10 +106,8 @@ and the coefficients:
 
 Note that the usual 1/2 factor is included in :math:`K`.
 
-
 ----------
 
-
 **Mixing, shift, table, tail correction, restart, rRESPA info**\ :
 
 This pair style does not support mixing since all parameters are
@@ -128,21 +119,18 @@ pair style.
 The :doc:`pair_modify <pair_modify>` table and tail options are not
 relevant for this pair style.
 
-This pair style does not write its information to :doc:`binary restart files <restart>`, so pair\_style and pair\_coeff commands need
+This pair style does not write its information to :doc:`binary restart files <restart>`, so pair_style and pair_coeff commands need
 to be specified in an input script that reads a restart file.
 
 This pair style can only be used via the *pair* keyword of the
 :doc:`run_style respa <run_style>` command.  It does not support the
 *inner*\ , *middle*\ , *outer* keywords.
 
-
 ----------
 
-
 Restrictions
 """"""""""""
 
-
 This pair style does not use a neighbor list and instead identifies
 atoms by their IDs. This has two consequences: 1) The cutoff has to be
 chosen sufficiently large, so that the second atom of a pair has to be
diff --git a/doc/src/pair_lj.rst b/doc/src/pair_lj.rst
index 3fa1cb0bca..21357ab45f 100644
--- a/doc/src/pair_lj.rst
+++ b/doc/src/pair_lj.rst
@@ -1,122 +1,120 @@
-.. index:: pair\_style lj/cut
+.. index:: pair_style lj/cut
 
-pair\_style lj/cut command
-==========================
+pair_style lj/cut command
+=========================
 
-pair\_style lj/cut/gpu command
-==============================
-
-pair\_style lj/cut/intel command
-================================
-
-pair\_style lj/cut/kk command
+pair_style lj/cut/gpu command
 =============================
 
-pair\_style lj/cut/opt command
-==============================
+pair_style lj/cut/intel command
+===============================
 
-pair\_style lj/cut/omp command
-==============================
+pair_style lj/cut/kk command
+============================
 
-pair\_style lj/cut/coul/cut command
-===================================
+pair_style lj/cut/opt command
+=============================
 
-pair\_style lj/cut/coul/cut/gpu command
-=======================================
+pair_style lj/cut/omp command
+=============================
 
-pair\_style lj/cut/coul/cut/kk command
+pair_style lj/cut/coul/cut command
+==================================
+
+pair_style lj/cut/coul/cut/gpu command
 ======================================
 
-pair\_style lj/cut/coul/cut/omp command
-=======================================
-
-pair\_style lj/cut/coul/debye command
+pair_style lj/cut/coul/cut/kk command
 =====================================
 
-pair\_style lj/cut/coul/debye/gpu command
-=========================================
-
-pair\_style lj/cut/coul/debye/kk command
-========================================
-
-pair\_style lj/cut/coul/debye/omp command
-=========================================
-
-pair\_style lj/cut/coul/dsf command
-===================================
-
-pair\_style lj/cut/coul/dsf/gpu command
-=======================================
-
-pair\_style lj/cut/coul/dsf/kk command
+pair_style lj/cut/coul/cut/omp command
 ======================================
 
-pair\_style lj/cut/coul/dsf/omp command
-=======================================
-
-pair\_style lj/cut/coul/long command
+pair_style lj/cut/coul/debye command
 ====================================
 
-pair\_style lj/cut/coul/long/gpu command
+pair_style lj/cut/coul/debye/gpu command
 ========================================
 
-pair\_style lj/cut/coul/long/kk command
+pair_style lj/cut/coul/debye/kk command
 =======================================
 
-pair\_style lj/cut/coul/long/intel command
-==========================================
-
-pair\_style lj/cut/coul/long/opt command
+pair_style lj/cut/coul/debye/omp command
 ========================================
 
-pair\_style lj/cut/coul/long/omp command
-========================================
+pair_style lj/cut/coul/dsf command
+==================================
 
-pair\_style lj/cut/coul/msm command
-===================================
+pair_style lj/cut/coul/dsf/gpu command
+======================================
 
-pair\_style lj/cut/coul/msm/gpu command
-=======================================
-
-pair\_style lj/cut/coul/msm/omp command
-=======================================
-
-pair\_style lj/cut/coul/wolf command
-====================================
-
-pair\_style lj/cut/coul/wolf/omp command
-========================================
-
-pair\_style lj/cut/tip4p/cut command
-====================================
-
-pair\_style lj/cut/tip4p/cut/omp command
-========================================
-
-pair\_style lj/cut/tip4p/long command
+pair_style lj/cut/coul/dsf/kk command
 =====================================
 
-pair\_style lj/cut/tip4p/long/gpu command
+pair_style lj/cut/coul/dsf/omp command
+======================================
+
+pair_style lj/cut/coul/long command
+===================================
+
+pair_style lj/cut/coul/long/gpu command
+=======================================
+
+pair_style lj/cut/coul/long/kk command
+======================================
+
+pair_style lj/cut/coul/long/intel command
 =========================================
 
-pair\_style lj/cut/tip4p/long/omp command
-=========================================
+pair_style lj/cut/coul/long/opt command
+=======================================
 
-pair\_style lj/cut/tip4p/long/opt command
-=========================================
+pair_style lj/cut/coul/long/omp command
+=======================================
+
+pair_style lj/cut/coul/msm command
+==================================
+
+pair_style lj/cut/coul/msm/gpu command
+======================================
+
+pair_style lj/cut/coul/msm/omp command
+======================================
+
+pair_style lj/cut/coul/wolf command
+===================================
+
+pair_style lj/cut/coul/wolf/omp command
+=======================================
+
+pair_style lj/cut/tip4p/cut command
+===================================
+
+pair_style lj/cut/tip4p/cut/omp command
+=======================================
+
+pair_style lj/cut/tip4p/long command
+====================================
+
+pair_style lj/cut/tip4p/long/gpu command
+========================================
+
+pair_style lj/cut/tip4p/long/omp command
+========================================
+
+pair_style lj/cut/tip4p/long/opt command
+========================================
 
 Syntax
 """"""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    pair_style style args
 
 * style = *lj/cut* or *lj/cut/coul/cut* or *lj/cut/coul/debye* or *lj/cut/coul/dsf* or *lj/cut/coul/long* *lj/cut/coul/msm* or *lj/cut/tip4p/long*
 * args = list of arguments for a particular style
 
-
 .. parsed-literal::
 
      *lj/cut* args = cutoff
@@ -158,51 +156,50 @@ Syntax
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    pair_style lj/cut 2.5
-   pair_coeff \* \* 1 1
+   pair_coeff * * 1 1
    pair_coeff 1 1 1 1.1 2.8
 
    pair_style lj/cut/coul/cut 10.0
    pair_style lj/cut/coul/cut 10.0 8.0
-   pair_coeff \* \* 100.0 3.0
+   pair_coeff * * 100.0 3.0
    pair_coeff 1 1 100.0 3.5 9.0
    pair_coeff 1 1 100.0 3.5 9.0 9.0
 
    pair_style lj/cut/coul/debye 1.5 3.0
    pair_style lj/cut/coul/debye 1.5 2.5 5.0
-   pair_coeff \* \* 1.0 1.0
+   pair_coeff * * 1.0 1.0
    pair_coeff 1 1 1.0 1.5 2.5
    pair_coeff 1 1 1.0 1.5 2.5 5.0
 
    pair_style lj/cut/coul/dsf 0.05 2.5 10.0
-   pair_coeff \* \* 1.0 1.0
+   pair_coeff * * 1.0 1.0
    pair_coeff 1 1 1.0 1.0 2.5
 
    pair_style lj/cut/coul/long 10.0
    pair_style lj/cut/coul/long 10.0 8.0
-   pair_coeff \* \* 100.0 3.0
+   pair_coeff * * 100.0 3.0
    pair_coeff 1 1 100.0 3.5 9.0
 
    pair_style lj/cut/coul/msm 10.0
    pair_style lj/cut/coul/msm 10.0 8.0
-   pair_coeff \* \* 100.0 3.0
+   pair_coeff * * 100.0 3.0
    pair_coeff 1 1 100.0 3.5 9.0
 
    pair_style lj/cut/tip4p/cut 1 2 7 8 0.15 12.0
    pair_style lj/cut/tip4p/cut 1 2 7 8 0.15 12.0 10.0
-   pair_coeff \* \* 100.0 3.0
+   pair_coeff * * 100.0 3.0
    pair_coeff 1 1 100.0 3.5 9.0
 
    pair_style lj/cut/coul/wolf 0.2 5. 10.0
-   pair_coeff \* \* 1.0 1.0
+   pair_coeff * * 1.0 1.0
    pair_coeff 1 1 1.0 1.0 2.5
 
    pair_style lj/cut/tip4p/long 1 2 7 8 0.15 12.0
    pair_style lj/cut/tip4p/long 1 2 7 8 0.15 12.0 10.0
-   pair_coeff \* \* 100.0 3.0
+   pair_coeff * * 100.0 3.0
    pair_coeff 1 1 100.0 3.5 9.0
 
 Description
@@ -211,39 +208,47 @@ Description
 The *lj/cut* styles compute the standard 12/6 Lennard-Jones potential,
 given by
 
-.. image:: Eqs/pair_lj.jpg
-   :align: center
+.. math::
+
+   E = 4 \epsilon \left[ \left(\frac{\sigma}{r}\right)^{12} -
+       \left(\frac{\sigma}{r}\right)^6 \right]
+                       \qquad r < r_c
 
 Rc is the cutoff.
 
 Style *lj/cut/coul/cut* adds a Coulombic pairwise interaction given by
 
-.. image:: Eqs/pair_coulomb.jpg
-   :align: center
+.. math::
 
-where C is an energy-conversion constant, Qi and Qj are the charges on
-the 2 atoms, and epsilon is the dielectric constant which can be set
-by the :doc:`dielectric <dielectric>` command.  If one cutoff is
-specified in the pair\_style command, it is used for both the LJ and
-Coulombic terms.  If two cutoffs are specified, they are used as
-cutoffs for the LJ and Coulombic terms respectively.
+   E = \frac{C q_i q_j}{\epsilon  r} \qquad r < r_c
+
+where C is an energy-conversion constant, :math:`q_i` and :math:`q_j`
+are the charges on the 2 atoms, and :math:`\epsilon` is the dielectric
+constant which can be set by the :doc:`dielectric <dielectric>` command.
+If one cutoff is specified in the pair_style command, it is used for
+both the LJ and Coulombic terms.  If two cutoffs are specified, they are
+used as cutoffs for the LJ and Coulombic terms respectively.
 
 Style *lj/cut/coul/debye* adds an additional exp() damping factor
 to the Coulombic term, given by
 
-.. image:: Eqs/pair_debye.jpg
-   :align: center
+.. math::
 
-where kappa is the inverse of the Debye length.  This potential is
-another way to mimic the screening effect of a polar solvent.
+   E = \frac{C q_i q_j}{\epsilon  r} \exp(- \kappa r) \qquad r < r_c
+
+where :math:`\kappa` is the inverse of the Debye length.  This potential
+is another way to mimic the screening effect of a polar solvent.
 
 Style *lj/cut/coul/dsf* computes the Coulombic term via the damped
 shifted force model described in :ref:`Fennell <Fennell2>`, given by:
 
-.. image:: Eqs/pair_coul_dsf.jpg
-   :align: center
+.. math::
 
-where *alpha* is the damping parameter and erfc() is the complementary
+   E =
+    q_iq_j \left[ \frac{\mbox{erfc} (\alpha r)}{r} -  \frac{\mbox{erfc} (\alpha r_c)}{r_c} +
+   \left( \frac{\mbox{erfc} (\alpha r_c)}{r_c^2} +  \frac{2\alpha}{\sqrt{\pi}}\frac{\exp (-\alpha^2    r^2_c)}{r_c} \right)(r-r_c) \right] \qquad r < r_c
+
+where :math:`\alpha` is the damping parameter and erfc() is the complementary
 error-function. This potential is essentially a short-range,
 spherically-truncated, charge-neutralized, shifted, pairwise *1/r*
 summation.  The potential is based on Wolf summation, proposed as an
@@ -253,7 +258,7 @@ effectively short-ranged. In order for the electrostatic sum to be
 absolutely convergent, charge neutralization within the cutoff radius
 is enforced by shifting the potential through placement of image
 charges on the cutoff sphere. Convergence can often be improved by
-setting *alpha* to a small non-zero value.
+setting :math:`\alpha` to a small non-zero value.
 
 Styles *lj/cut/coul/long* and *lj/cut/coul/msm* compute the same
 Coulombic interactions as style *lj/cut/coul/cut* except that an
@@ -267,21 +272,25 @@ computed in reciprocal space.
 Style *coul/wolf* adds a Coulombic pairwise interaction via the Wolf
 summation method, described in :ref:`Wolf <Wolf1>`, given by:
 
-.. image:: Eqs/pair_coul_wolf.jpg
-   :align: center
+.. math::
 
-where *alpha* is the damping parameter, and erfc() is the
-complementary error-function terms.  This potential
-is essentially a short-range, spherically-truncated,
-charge-neutralized, shifted, pairwise *1/r* summation.  With a
-manipulation of adding and subtracting a self term (for i = j) to the
-first and second term on the right-hand-side, respectively, and a
-small enough *alpha* damping parameter, the second term shrinks and
-the potential becomes a rapidly-converging real-space summation.  With
-a long enough cutoff and small enough alpha parameter, the energy and
-forces calculated by the Wolf summation method approach those of the
-Ewald sum.  So it is a means of getting effective long-range
-interactions with a short-range potential.
+   E_i = \frac{1}{2} \sum_{j \neq i}
+   \frac{q_i q_j {\rm erfc}(\alpha r_{ij})}{r_{ij}} +
+   \frac{1}{2} \sum_{j \neq i}
+   \frac{q_i q_j {\rm erf}(\alpha r_{ij})}{r_{ij}} \qquad r < r_c
+
+where :math:`\alpha` is the damping parameter, and erfc() is the
+complementary error-function terms.  This potential is essentially a
+short-range, spherically-truncated, charge-neutralized, shifted,
+pairwise *1/r* summation.  With a manipulation of adding and subtracting
+a self term (for i = j) to the first and second term on the
+right-hand-side, respectively, and a small enough :math:`\alpha` damping
+parameter, the second term shrinks and the potential becomes a
+rapidly-converging real-space summation.  With a long enough cutoff and
+small enough :math:`\alpha` parameter, the energy and forces calculated by the
+Wolf summation method approach those of the Ewald sum.  So it is a means
+of getting effective long-range interactions with a short-range
+potential.
 
 Styles *lj/cut/tip4p/cut* and *lj/cut/tip4p/long* implement the TIP4P
 water model of :ref:`(Jorgensen) <Jorgensen2>`, which introduces a massless
@@ -289,7 +298,7 @@ site located a short distance away from the oxygen atom along the
 bisector of the HOH angle.  The atomic types of the oxygen and
 hydrogen atoms, the bond and angle types for OH and HOH interactions,
 and the distance to the massless charge site are specified as
-pair\_style arguments.  Style *lj/cut/tip4p/cut* uses a cutoff for
+pair_style arguments.  Style *lj/cut/tip4p/cut* uses a cutoff for
 Coulomb interactions; style *lj/cut/tip4p/long* is for use with a
 long-range Coulombic solver (Ewald or PPPM).
 
@@ -319,17 +328,16 @@ the data file or restart files read by the :doc:`read_data <read_data>`
 or :doc:`read_restart <read_restart>` commands, or by mixing as
 described below:
 
-* epsilon (energy units)
-* sigma (distance units)
+* :math:`\epsilon` (energy units)
+* :math:`\sigma` (distance units)
 * cutoff1 (distance units)
 * cutoff2 (distance units)
 
-Note that sigma is defined in the LJ formula as the zero-crossing
-distance for the potential, not as the energy minimum at 2\^(1/6)
-sigma.
+Note that :math:`\sigma` is defined in the LJ formula as the zero-crossing
+distance for the potential, not as the energy minimum at :math:`2^{\frac{1}{6}} \sigma`.
 
 The latter 2 coefficients are optional.  If not specified, the global
-LJ and Coulombic cutoffs specified in the pair\_style command are used.
+LJ and Coulombic cutoffs specified in the pair_style command are used.
 If only one cutoff is specified, it is used as the cutoff for both LJ
 and Coulombic interactions for this type pair.  If both coefficients
 are specified, they are used as the LJ and Coulombic cutoffs for this
@@ -340,21 +348,19 @@ For *lj/cut/coul/long* and *lj/cut/coul/msm* and *lj/cut/tip4p/cut*
 and *lj/cut/tip4p/long* only the LJ cutoff can be specified since a
 Coulombic cutoff cannot be specified for an individual I,J type pair.
 All type pairs use the same global Coulombic cutoff specified in the
-pair\_style command.
-
+pair_style command.
 
 ----------
 
-
-A version of these styles with a soft core, *lj/cut/soft*\ , suitable for use in
-free energy calculations, is part of the USER-FEP package and is documented with
-the :doc:`pair\_fep\_soft <pair_fep_soft>` styles. The version with soft core is
-only available if LAMMPS was built with that package. See the :doc:`Build package <Build_package>` doc page for more info.
-
+A version of these styles with a soft core, *lj/cut/soft*\ , suitable
+for use in free energy calculations, is part of the USER-FEP package and
+is documented with the :doc:`pair_style */soft <pair_fep_soft>`
+styles. The version with soft core is only available if LAMMPS was built
+with that package. See the :doc:`Build package <Build_package>` doc page
+for more info.
 
 ----------
 
-
 Styles with a *gpu*\ , *intel*\ , *kk*\ , *omp*\ , or *opt* suffix are
 functionally the same as the corresponding style without the suffix.
 They have been optimized to run faster, depending on your available
@@ -373,15 +379,13 @@ by including their suffix, or you can use the :doc:`-suffix command-line switch
 See the :doc:`Speed packages <Speed_packages>` doc page for more
 instructions on how to use the accelerated styles effectively.
 
-
 ----------
 
-
 **Mixing, shift, table, tail correction, restart, rRESPA info**\ :
 
 For atom type pairs I,J and I != J, the epsilon and sigma coefficients
 and cutoff distance for all of the lj/cut pair styles can be mixed.
-The default mix value is *geometric*\ .  See the "pair\_modify" command
+The default mix value is *geometric*\ .  See the "pair_modify" command
 for details.
 
 All of the *lj/cut* pair styles support the
@@ -397,23 +401,20 @@ All of the *lj/cut* pair styles support the
 tail correction to the energy and pressure for the Lennard-Jones
 portion of the pair interaction.
 
-All of the *lj/cut* pair styles write their information to :doc:`binary restart files <restart>`, so pair\_style and pair\_coeff commands do
+All of the *lj/cut* pair styles write their information to :doc:`binary restart files <restart>`, so pair_style and pair_coeff commands do
 not need to be specified in an input script that reads a restart file.
 
 The *lj/cut* and *lj/cut/coul/long* pair styles support the use of the
 *inner*\ , *middle*\ , and *outer* keywords of the :doc:`run_style respa <run_style>` command, meaning the pairwise forces can be
 partitioned by distance at different levels of the rRESPA hierarchy.
-The other styles only support the *pair* keyword of run\_style respa.
+The other styles only support the *pair* keyword of run_style respa.
 See the :doc:`run_style <run_style>` command for details.
 
-
 ----------
 
-
 Restrictions
 """"""""""""
 
-
 The *lj/cut/coul/long* and *lj/cut/tip4p/long* styles are part of the
 KSPACE package. The *lj/cut/tip4p/cut* style is part of the MOLECULE
 package. These styles are only enabled if LAMMPS was built with those
@@ -427,25 +428,14 @@ Related commands
 
 **Default:** none
 
-
 ----------
 
-
 .. _Jorgensen2:
 
-
-
 **(Jorgensen)** Jorgensen, Chandrasekhar, Madura, Impey, Klein, J Chem
 Phys, 79, 926 (1983).
 
 .. _Fennell2:
 
-
-
 **(Fennell)** C. J. Fennell, J. D. Gezelter, J Chem Phys, 124,
 234104 (2006).
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/pair_lj96.rst b/doc/src/pair_lj96.rst
index e71627a364..3799020a05 100644
--- a/doc/src/pair_lj96.rst
+++ b/doc/src/pair_lj96.rst
@@ -1,19 +1,18 @@
-.. index:: pair\_style lj96/cut
+.. index:: pair_style lj96/cut
 
-pair\_style lj96/cut command
-============================
+pair_style lj96/cut command
+===========================
 
-pair\_style lj96/cut/gpu command
-================================
+pair_style lj96/cut/gpu command
+===============================
 
-pair\_style lj96/cut/omp command
-================================
+pair_style lj96/cut/omp command
+===============================
 
 Syntax
 """"""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    pair_style lj96/cut cutoff
 
@@ -22,11 +21,10 @@ Syntax
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    pair_style lj96/cut 2.5
-   pair_coeff \* \* 1.0 1.0 4.0
+   pair_coeff * * 1.0 1.0 4.0
    pair_coeff 1 1 1.0 1.0
 
 Description
@@ -35,10 +33,13 @@ Description
 The *lj96/cut* style compute a 9/6 Lennard-Jones potential, instead
 of the standard 12/6 potential, given by
 
-.. image:: Eqs/pair_lj96.jpg
-   :align: center
+.. math::
 
-Rc is the cutoff.
+   E = 4 \epsilon \left[ \left(\frac{\sigma}{r}\right)^{9} -
+   \left(\frac{\sigma}{r}\right)^6 \right]
+                       \qquad r < r_c
+
+:math:`r_c` is the cutoff.
 
 The following coefficients must be defined for each pair of atoms
 types via the :doc:`pair_coeff <pair_coeff>` command as in the examples
@@ -46,17 +47,15 @@ above, or in the data file or restart files read by the
 :doc:`read_data <read_data>` or :doc:`read_restart <read_restart>`
 commands, or by mixing as described below:
 
-* epsilon (energy units)
-* sigma (distance units)
+* :math:`\epsilon` (energy units)
+* :math:`\sigma` (distance units)
 * cutoff (distance units)
 
 The last coefficient is optional.  If not specified, the global LJ
-cutoff specified in the pair\_style command is used.
-
+cutoff specified in the pair_style command is used.
 
 ----------
 
-
 Styles with a *gpu*\ , *intel*\ , *kk*\ , *omp*\ , or *opt* suffix are
 functionally the same as the corresponding style without the suffix.
 They have been optimized to run faster, depending on your available
@@ -75,15 +74,13 @@ by including their suffix, or you can use the :doc:`-suffix command-line switch
 See the :doc:`Speed packages <Speed_packages>` doc page for more
 instructions on how to use the accelerated styles effectively.
 
-
 ----------
 
-
 **Mixing, shift, table, tail correction, restart, rRESPA info**\ :
 
 For atom type pairs I,J and I != J, the epsilon and sigma coefficients
 and cutoff distance for all of the lj/cut pair styles can be mixed.
-The default mix value is *geometric*\ .  See the "pair\_modify" command
+The default mix value is *geometric*\ .  See the "pair_modify" command
 for details.
 
 This pair style supports the :doc:`pair_modify <pair_modify>` shift
@@ -96,7 +93,7 @@ This pair style supports the :doc:`pair_modify <pair_modify>` tail
 option for adding a long-range tail correction to the energy and
 pressure of the pair interaction.
 
-This pair style writes its information to :doc:`binary restart files <restart>`, so pair\_style and pair\_coeff commands do not need
+This pair style writes its information to :doc:`binary restart files <restart>`, so pair_style and pair_coeff commands do not need
 to be specified in an input script that reads a restart file.
 
 This pair style supports the use of the *inner*\ , *middle*\ , and *outer*
@@ -105,13 +102,11 @@ pairwise forces can be partitioned by distance at different levels of
 the rRESPA hierarchy.  See the :doc:`run_style <run_style>` command for
 details.
 
-
 ----------
 
-
 Restrictions
 """"""""""""
- none
+none
 
 Related commands
 """"""""""""""""
@@ -119,8 +114,3 @@ Related commands
 :doc:`pair_coeff <pair_coeff>`
 
 **Default:** none
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/pair_lj_cubic.rst b/doc/src/pair_lj_cubic.rst
index dcfcc7167c..5bf5d873e4 100644
--- a/doc/src/pair_lj_cubic.rst
+++ b/doc/src/pair_lj_cubic.rst
@@ -1,30 +1,28 @@
-.. index:: pair\_style lj/cubic
+.. index:: pair_style lj/cubic
 
-pair\_style lj/cubic command
-============================
+pair_style lj/cubic command
+===========================
 
-pair\_style lj/cubic/gpu command
-================================
+pair_style lj/cubic/gpu command
+===============================
 
-pair\_style lj/cubic/omp command
-================================
+pair_style lj/cubic/omp command
+===============================
 
 Syntax
 """"""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    pair_style lj/cubic
 
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    pair_style lj/cubic
-   pair_coeff \* \* 1.0 0.8908987
+   pair_coeff * * 1.0 0.8908987
 
 Description
 """""""""""
@@ -39,15 +37,18 @@ point.  The cubic coefficient A3 is chosen so that both energy and
 force go to zero at the cutoff distance.  Outside the cutoff distance
 the energy and force are zero.
 
-.. image:: Eqs/pair_lj_cubic.jpg
-   :align: center
+.. math::
 
-The location of the inflection point rs is defined
-by the LJ diameter, rs/sigma = (26/7)\^1/6. The cutoff distance
-is defined by rc/rs = 67/48 or rc/sigma = 1.737....
+   E & = u_{LJ}(r) \qquad r \leq r_s \\
+     & = u_{LJ}(r_s) + (r-r_s) u'_{LJ}(r_s) - \frac{1}{6} A_3 (r-r_s)^3 \qquad r_s < r \leq r_c \\
+     & = 0 \qquad r > r_c
+
+The location of the inflection point :math:`r_s` is defined
+by the LJ diameter, :math:`r_s/\sigma = (26/7)^{1/6}`. The cutoff distance
+is defined by :math:`r_c/r_s = 67/48` or :math:`r_c/\sigma = 1.737...`
 The analytic expression for the
 the cubic coefficient
-A3\*rmin\^3/epsilon = 27.93... is given in the paper by
+:math:`A_3 r_{min}^3/\epsilon = 27.93...` is given in the paper by
 Holian and Ravelo :ref:`(Holian) <Holian>`.
 
 This potential is commonly used to study the shock mechanics of FCC
@@ -59,18 +60,16 @@ or in the data file or restart files read by the
 :doc:`read_data <read_data>` or :doc:`read_restart <read_restart>`
 commands, or by mixing as described below:
 
-* epsilon (energy units)
-* sigma (distance units)
-
-Note that sigma is defined in the LJ formula as the zero-crossing
-distance for the potential, not as the energy minimum, which is
-located at rmin = 2\^(1/6)\*sigma. In the above example, sigma =
-0.8908987, so rmin = 1.
+* :math:`\epsilon` (energy units)
+* :math:`\sigma` (distance units)
 
+Note that :math:`\sigma` is defined in the LJ formula as the
+zero-crossing distance for the potential, not as the energy minimum,
+which is located at :math:`r_{min} = 2^{\frac{1}{6}} \sigma`. In the
+above example, :math:`\sigma = 0.8908987`, so :math:`r_{min} = 1.0`.
 
 ----------
 
-
 Styles with a *gpu*\ , *intel*\ , *kk*\ , *omp*\ , or *opt* suffix are
 functionally the same as the corresponding style without the suffix.
 They have been optimized to run faster, depending on your available
@@ -89,15 +88,13 @@ by including their suffix, or you can use the :doc:`-suffix command-line switch
 See the :doc:`Speed packages <Speed_packages>` doc page for more
 instructions on how to use the accelerated styles effectively.
 
-
 ----------
 
-
 **Mixing, shift, table, tail correction, restart, rRESPA info**\ :
 
 For atom type pairs I,J and I != J, the epsilon and sigma coefficients
 and cutoff distance for all of the lj/cut pair styles can be mixed.
-The default mix value is *geometric*\ .  See the "pair\_modify" command
+The default mix value is *geometric*\ .  See the "pair_modify" command
 for details.
 
 The lj/cubic pair style does not support the
@@ -113,17 +110,15 @@ The lj/cubic pair style does not support the
 corrections to energy and pressure, since there are no corrections for
 a potential that goes to 0.0 at the cutoff.
 
-The lj/cubic pair style writes its information to :doc:`binary restart files <restart>`, so pair\_style and pair\_coeff commands do
+The lj/cubic pair style writes its information to :doc:`binary restart files <restart>`, so pair_style and pair_coeff commands do
 not need to be specified in an input script that reads a restart file.
 
 The lj/cubic pair style can only be used via the *pair*
 keyword of the :doc:`run_style respa <run_style>` command.  It does not
 support the *inner*\ , *middle*\ , *outer* keywords.
 
-
 ----------
 
-
 Restrictions
 """"""""""""
  none
@@ -135,22 +130,12 @@ Related commands
 
 **Default:** none
 
-
 ----------
 
-
 .. _Holian:
 
-
-
 .. _Ravelo2:
 
 **(Holian)** Holian and Ravelo, Phys Rev B, 51, 11275 (1995).
 
-
 **(Ravelo)** Ravelo, Holian, Germann and Lomdahl, Phys Rev B, 70, 014103 (2004).
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/pair_lj_expand.rst b/doc/src/pair_lj_expand.rst
index 606cead480..1478188bbb 100644
--- a/doc/src/pair_lj_expand.rst
+++ b/doc/src/pair_lj_expand.rst
@@ -1,28 +1,27 @@
-.. index:: pair\_style lj/expand
+.. index:: pair_style lj/expand
 
-pair\_style lj/expand command
-=============================
+pair_style lj/expand command
+============================
 
-pair\_style lj/expand/gpu command
-=================================
-
-pair\_style lj/expand/kk command
+pair_style lj/expand/gpu command
 ================================
 
-pair\_style lj/expand/omp command
-=================================
+pair_style lj/expand/kk command
+===============================
 
-pair\_style lj/expand/coul/long command
-=======================================
+pair_style lj/expand/omp command
+================================
 
-pair\_style lj/expand/coul/long/gpu command
-===========================================
+pair_style lj/expand/coul/long command
+======================================
+
+pair_style lj/expand/coul/long/gpu command
+==========================================
 
 Syntax
 """"""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    pair_style lj/expand cutoff
 
@@ -31,16 +30,15 @@ Syntax
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    pair_style lj/expand 2.5
-   pair_coeff \* \* 1.0 1.0 0.5
+   pair_coeff * * 1.0 1.0 0.5
    pair_coeff 1 1 1.0 1.0 -0.2 2.0
 
    pair_style lj/expand/coul/long 2.5
    pair_style lj/expand/coul/long 2.5 4.0
-   pair_coeff \* \* 1.0 1.0 0.5
+   pair_coeff * * 1.0 1.0 0.5
    pair_coeff 1 1 1.0 1.0 -0.2 3.0
 
 Description
@@ -51,36 +49,39 @@ delta which can be useful when particles are of different sizes, since
 it is different that using different sigma values in a standard LJ
 formula:
 
-.. image:: Eqs/pair_lj_expand.jpg
-   :align: center
+.. math::
 
-Rc is the cutoff which does not include the delta distance.  I.e. the
-actual force cutoff is the sum of cutoff + delta.
+   E = 4 \epsilon \left[ \left(\frac{\sigma}{r - \Delta}\right)^{12} -
+     \left(\frac{\sigma}{r - \Delta}\right)^6 \right]
+     \qquad r < r_c + \Delta
+
+:math:`r_c` is the cutoff which does not include the :math:`\Delta`
+distance.  I.e. the actual force cutoff is the sum of :math:`r_c +
+\Delta`.
 
 For all of the *lj/expand* pair styles, the following coefficients must
-be defined for each pair of atoms types via the
-:doc:`pair_coeff <pair_coeff>` command as in the examples above, or in
-the data file or restart files read by the :doc:`read_data <read_data>`
-or :doc:`read_restart <read_restart>` commands, or by mixing as
-described below:
+be defined for each pair of atoms types via the :doc:`pair_coeff
+<pair_coeff>` command as in the examples above, or in the data file or
+restart files read by the :doc:`read_data <read_data>` or
+:doc:`read_restart <read_restart>` commands, or by mixing as described
+below:
 
-* epsilon (energy units)
-* sigma (distance units)
-* delta (distance units)
+* :math:`\epsilon` (energy units)
+* :math:`\sigma` (distance units)
+* :math:`\Delta` (distance units)
 * cutoff (distance units)
 
-The delta values can be positive or negative.  The last coefficient is
-optional.  If not specified, the global LJ cutoff is used.
+The :math:`\Delta` values can be positive or negative.  The last
+coefficient is optional.  If not specified, the global LJ cutoff is
+used.
 
 For *lj/expand/coul/long* only the LJ cutoff can be specified since a
 Coulombic cutoff cannot be specified for an individual I,J type pair.
 All type pairs use the same global Coulombic cutoff specified in the
-pair\_style command.
-
+pair_style command.
 
 ----------
 
-
 Styles with a *gpu*\ , *intel*\ , *kk*\ , *omp*\ , or *opt* suffix are
 functionally the same as the corresponding style without the suffix.
 They have been optimized to run faster, depending on your available
@@ -99,17 +100,15 @@ by including their suffix, or you can use the :doc:`-suffix command-line switch
 See the :doc:`Speed packages <Speed_packages>` doc page for more
 instructions on how to use the accelerated styles effectively.
 
-
 ----------
 
-
 **Mixing, shift, table, tail correction, restart, rRESPA info**\ :
 
 For atom type pairs I,J and I != J, the epsilon, sigma, and shift
 coefficients and cutoff distance for this pair style can be mixed.
 Shift is always mixed via an *arithmetic* rule.  The other
-coefficients are mixed according to the pair\_modify mix value.  The
-default mix value is *geometric*\ .  See the "pair\_modify" command for
+coefficients are mixed according to the pair_modify mix value.  The
+default mix value is *geometric*\ .  See the "pair_modify" command for
 details.
 
 This pair style supports the :doc:`pair_modify <pair_modify>` shift
@@ -122,20 +121,18 @@ This pair style supports the :doc:`pair_modify <pair_modify>` tail
 option for adding a long-range tail correction to the energy and
 pressure of the pair interaction.
 
-This pair style writes its information to :doc:`binary restart files <restart>`, so pair\_style and pair\_coeff commands do not need
+This pair style writes its information to :doc:`binary restart files <restart>`, so pair_style and pair_coeff commands do not need
 to be specified in an input script that reads a restart file.
 
 This pair style can only be used via the *pair* keyword of the
 :doc:`run_style respa <run_style>` command.  It does not support the
 *inner*\ , *middle*\ , *outer* keywords.
 
-
 ----------
 
-
 Restrictions
 """"""""""""
- none
+none
 
 Related commands
 """"""""""""""""
@@ -143,8 +140,3 @@ Related commands
 :doc:`pair_coeff <pair_coeff>`
 
 **Default:** none
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/pair_lj_long.rst b/doc/src/pair_lj_long.rst
index 40d5688a33..682f11b95b 100644
--- a/doc/src/pair_lj_long.rst
+++ b/doc/src/pair_lj_long.rst
@@ -1,35 +1,33 @@
-.. index:: pair\_style lj/long/coul/long
+.. index:: pair_style lj/long/coul/long
 
-pair\_style lj/long/coul/long command
+pair_style lj/long/coul/long command
+====================================
+
+pair_style lj/long/coul/long/intel command
+==========================================
+
+pair_style lj/long/coul/long/omp command
+========================================
+
+pair_style lj/long/coul/long/opt command
+========================================
+
+pair_style lj/long/tip4p/long command
 =====================================
 
-pair\_style lj/long/coul/long/intel command
-===========================================
-
-pair\_style lj/long/coul/long/omp command
+pair_style lj/long/tip4p/long/omp command
 =========================================
 
-pair\_style lj/long/coul/long/opt command
-=========================================
-
-pair\_style lj/long/tip4p/long command
-======================================
-
-pair\_style lj/long/tip4p/long/omp command
-==========================================
-
 Syntax
 """"""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    pair_style style args
 
 * style = *lj/long/coul/long* or *lj/long/tip4p/long*
 * args = list of arguments for a particular style
 
-
 .. parsed-literal::
 
      *lj/long/coul/long* args = flag_lj flag_coul cutoff (cutoff2)
@@ -58,42 +56,47 @@ Syntax
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    pair_style lj/long/coul/long cut off 2.5
    pair_style lj/long/coul/long cut long 2.5 4.0
    pair_style lj/long/coul/long long long 2.5 4.0
-   pair_coeff \* \* 1 1
+   pair_coeff * * 1 1
    pair_coeff 1 1 1 3 4
 
    pair_style lj/long/tip4p/long long long 1 2 7 8 0.15 12.0
    pair_style lj/long/tip4p/long long long 1 2 7 8 0.15 12.0 10.0
-   pair_coeff \* \* 100.0 3.0
+   pair_coeff * * 100.0 3.0
    pair_coeff 1 1 100.0 3.5 9.0
 
 Description
 """""""""""
 
-Style *lj/long/coul/long* computes the standard 12/6 Lennard-Jones and
-Coulombic potentials, given by
+Style *lj/long/coul/long* computes the standard 12/6 Lennard-Jones potential:
 
-.. image:: Eqs/pair_lj.jpg
-   :align: center
+.. math::
 
-.. image:: Eqs/pair_coulomb.jpg
-   :align: center
+   E = 4 \epsilon \left[ \left(\frac{\sigma}{r}\right)^{12} -
+                       \left(\frac{\sigma}{r}\right)^6 \right]
+                       \qquad r < r_c \\
 
-where C is an energy-conversion constant, Qi and Qj are the charges on
-the 2 atoms, epsilon is the dielectric constant which can be set by
-the :doc:`dielectric <dielectric>` command, and Rc is the cutoff.  If
-one cutoff is specified in the pair\_style command, it is used for both
+with :math:`\epsilon` and :math:`\sigma` being the usual Lennard-Jones
+potential parameters, plus the Coulomb potential, given by:
+
+.. math::
+
+   E = \frac{C q_i q_j}{\epsilon  r} \qquad r < r_c
+
+where C is an energy-conversion constant, :math:`q_i` and :math:`q_j` are the charges on
+the 2 atoms, :math:`\epsilon` is the dielectric constant which can be set by
+the :doc:`dielectric <dielectric>` command, and :math:`r_c` is the cutoff.  If
+one cutoff is specified in the pair_style command, it is used for both
 the LJ and Coulombic terms.  If two cutoffs are specified, they are
 used as cutoffs for the LJ and Coulombic terms respectively.
 
 The purpose of this pair style is to capture long-range interactions
 resulting from both attractive 1/r\^6 Lennard-Jones and Coulombic 1/r
-interactions.  This is done by use of the *flag\_lj* and *flag\_coul*
+interactions.  This is done by use of the *flag_lj* and *flag_coul*
 settings.  The :ref:`In 't Veld <Veld2>` paper has more details on when it is
 appropriate to include long-range 1/r\^6 interactions, using this
 potential.
@@ -103,7 +106,7 @@ Style *lj/long/tip4p/long* implements the TIP4P water model of
 short distance away from the oxygen atom along the bisector of the HOH
 angle.  The atomic types of the oxygen and hydrogen atoms, the bond
 and angle types for OH and HOH interactions, and the distance to the
-massless charge site are specified as pair\_style arguments.
+massless charge site are specified as pair_style arguments.
 
 .. note::
 
@@ -123,22 +126,22 @@ LJ cutoff >= Coulombic cutoff + 2\*qdist, to shrink the size of the
 neighbor list.  This leads to slightly larger cost for the long-range
 calculation, so you can test the trade-off for your model.
 
-If *flag\_lj* is set to *long*\ , no cutoff is used on the LJ 1/r\^6
+If *flag_lj* is set to *long*\ , no cutoff is used on the LJ 1/r\^6
 dispersion term.  The long-range portion can be calculated by using
 the :doc:`kspace_style ewald/disp or pppm/disp <kspace_style>` commands.
 The specified LJ cutoff then determines which portion of the LJ
 interactions are computed directly by the pair potential versus which
 part is computed in reciprocal space via the Kspace style.  If
-*flag\_lj* is set to *cut*\ , the LJ interactions are simply cutoff, as
+*flag_lj* is set to *cut*\ , the LJ interactions are simply cutoff, as
 with :doc:`pair_style lj/cut <pair_lj>`.
 
-If *flag\_coul* is set to *long*\ , no cutoff is used on the Coulombic
+If *flag_coul* is set to *long*\ , no cutoff is used on the Coulombic
 interactions.  The long-range portion can calculated by using any of
 several :doc:`kspace_style <kspace_style>` command options such as
-*pppm* or *ewald*\ .  Note that if *flag\_lj* is also set to long, then
+*pppm* or *ewald*\ .  Note that if *flag_lj* is also set to long, then
 the *ewald/disp* or *pppm/disp* Kspace style needs to be used to
 perform the long-range calculations for both the LJ and Coulombic
-interactions.  If *flag\_coul* is set to *off*\ , Coulombic interactions
+interactions.  If *flag_coul* is set to *off*\ , Coulombic interactions
 are not computed.
 
 The following coefficients must be defined for each pair of atoms
@@ -147,8 +150,8 @@ above, or in the data file or restart files read by the
 :doc:`read_data <read_data>` or :doc:`read_restart <read_restart>`
 commands, or by mixing as described below:
 
-* epsilon (energy units)
-* sigma (distance units)
+* :math:`\epsilon` (energy units)
+* :math:`\sigma` (distance units)
 * cutoff1 (distance units)
 * cutoff2 (distance units)
 
@@ -157,36 +160,32 @@ distance for the potential, not as the energy minimum at 2\^(1/6)
 sigma.
 
 The latter 2 coefficients are optional.  If not specified, the global
-LJ and Coulombic cutoffs specified in the pair\_style command are used.
+LJ and Coulombic cutoffs specified in the pair_style command are used.
 If only one cutoff is specified, it is used as the cutoff for both LJ
 and Coulombic interactions for this type pair.  If both coefficients
 are specified, they are used as the LJ and Coulombic cutoffs for this
 type pair.
 
-Note that if you are using *flag\_lj* set to *long*\ , you
+Note that if you are using *flag_lj* set to *long*\ , you
 cannot specify a LJ cutoff for an atom type pair, since only one
-global LJ cutoff is allowed.  Similarly, if you are using *flag\_coul*
+global LJ cutoff is allowed.  Similarly, if you are using *flag_coul*
 set to *long*\ , you cannot specify a Coulombic cutoff for an atom type
 pair, since only one global Coulombic cutoff is allowed.
 
 For *lj/long/tip4p/long* only the LJ cutoff can be specified
 since a Coulombic cutoff cannot be specified for an individual I,J
 type pair.  All type pairs use the same global Coulombic cutoff
-specified in the pair\_style command.
-
+specified in the pair_style command.
 
 ----------
 
-
 A version of these styles with a soft core, *lj/cut/soft*\ , suitable for use in
 free energy calculations, is part of the USER-FEP package and is documented with
-the :doc:`pair\_fep\_soft <pair_fep_soft>` styles. The version with soft core is
+the :doc:`pair_style */soft <pair_fep_soft>` styles. The version with soft core is
 only available if LAMMPS was built with that package. See the :doc:`Build package <Build_package>` doc page for more info.
 
-
 ----------
 
-
 Styles with a *gpu*\ , *intel*\ , *kk*\ , *omp*\ , or *opt* suffix are
 functionally the same as the corresponding style without the suffix.
 They have been optimized to run faster, depending on your available
@@ -205,20 +204,18 @@ by including their suffix, or you can use the :doc:`-suffix command-line switch
 See the :doc:`Speed packages <Speed_packages>` doc page for more
 instructions on how to use the accelerated styles effectively.
 
-
 ----------
 
-
 **Mixing, shift, table, tail correction, restart, rRESPA info**\ :
 
 For atom type pairs I,J and I != J, the epsilon and sigma coefficients
 and cutoff distance for all of the lj/long pair styles can be mixed.
-The default mix value is *geometric*\ .  See the "pair\_modify" command
+The default mix value is *geometric*\ .  See the "pair_modify" command
 for details.
 
 These pair styles support the :doc:`pair_modify <pair_modify>` shift
 option for the energy of the Lennard-Jones portion of the pair
-interaction, assuming *flag\_lj* is *cut*\ .
+interaction, assuming *flag_lj* is *cut*\ .
 
 These pair styles support the :doc:`pair_modify <pair_modify>` table and
 table/disp options since they can tabulate the short-range portion of
@@ -228,7 +225,7 @@ Thes pair styles do not support the :doc:`pair_modify <pair_modify>`
 tail option for adding a long-range tail correction to the
 Lennard-Jones portion of the energy and pressure.
 
-These pair styles write their information to :doc:`binary restart files <restart>`, so pair\_style and pair\_coeff commands do not need
+These pair styles write their information to :doc:`binary restart files <restart>`, so pair_style and pair_coeff commands do not need
 to be specified in an input script that reads a restart file.
 
 The pair lj/long/coul/long styles support the use of the *inner*\ ,
@@ -237,14 +234,11 @@ command, meaning the pairwise forces can be partitioned by distance at
 different levels of the rRESPA hierarchy.  See the
 :doc:`run_style <run_style>` command for details.
 
-
 ----------
 
-
 Restrictions
 """"""""""""
 
-
 These styles are part of the KSPACE package.  They are only enabled if
 LAMMPS was built with that package.  See the :doc:`Build package <Build_package>` doc page for more info.
 
@@ -255,24 +249,13 @@ Related commands
 
 **Default:** none
 
-
 ----------
 
-
 .. _Veld2:
 
-
-
 **(In 't Veld)** In 't Veld, Ismail, Grest, J Chem Phys (accepted) (2007).
 
 .. _Jorgensen4:
 
-
-
 **(Jorgensen)** Jorgensen, Chandrasekhar, Madura, Impey, Klein, J Chem
 Phys, 79, 926 (1983).
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/pair_lj_smooth.rst b/doc/src/pair_lj_smooth.rst
index 4b3c206ef5..b2cf6f7493 100644
--- a/doc/src/pair_lj_smooth.rst
+++ b/doc/src/pair_lj_smooth.rst
@@ -1,16 +1,15 @@
-.. index:: pair\_style lj/smooth
+.. index:: pair_style lj/smooth
 
-pair\_style lj/smooth command
-=============================
+pair_style lj/smooth command
+============================
 
-pair\_style lj/smooth/omp command
-=================================
+pair_style lj/smooth/omp command
+================================
 
 Syntax
 """"""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    pair_style lj/smooth Rin Rc
 
@@ -20,11 +19,10 @@ Syntax
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    pair_style lj/smooth 8.0 10.0
-   pair_coeff \* \* 10.0 1.5
+   pair_coeff * * 10.0 1.5
    pair_coeff 1 1 20.0 1.3 7.0 9.0
 
 Description
@@ -33,12 +31,17 @@ Description
 Style *lj/smooth* computes a LJ interaction with a force smoothing
 applied between the inner and outer cutoff.
 
-.. image:: Eqs/pair_lj_smooth.jpg
-   :align: center
+.. math::
+
+   E & =  4 \epsilon \left[ \left(\frac{\sigma}{r}\right)^{12} -
+                         \left(\frac{\sigma}{r}\right)^6 \right]
+                         \qquad r < r_{in} \\
+   F & =  C_1 + C_2 (r - r_{in}) + C_3 (r - r_{in})^2 + C_4 (r - r_{in})^3
+                       \qquad r_{in} < r < r_c
 
 The polynomial coefficients C1, C2, C3, C4 are computed by LAMMPS to
-cause the force to vary smoothly from the inner cutoff Rin to the
-outer cutoff Rc.
+cause the force to vary smoothly from the inner cutoff :math:`r_{in}` to the
+outer cutoff :math:`r_c`.
 
 At the inner cutoff the force and its 1st derivative
 will match the non-smoothed LJ formula.  At the outer cutoff the force
@@ -58,18 +61,16 @@ above, or in the data file or restart files read by the
 :doc:`read_data <read_data>` or :doc:`read_restart <read_restart>`
 commands, or by mixing as described below:
 
-* epsilon (energy units)
-* sigma (distance units)
-* inner (distance units)
-* outer (distance units)
+* :math:`\epsilon` (energy units)
+* :math:`\sigma` (distance units)
+* :math:`r_{in}` (distance units)
+* :math:`r_c` (distance units)
 
 The last 2 coefficients are optional inner and outer cutoffs.  If not
-specified, the global values for Rin and Rc are used.
-
+specified, the global values for :math:`r_{in}` and :math:`r_c` are used.
 
 ----------
 
-
 Styles with a *gpu*\ , *intel*\ , *kk*\ , *omp*\ , or *opt* suffix are
 functionally the same as the corresponding style without the suffix.
 They have been optimized to run faster, depending on your available
@@ -88,17 +89,15 @@ by including their suffix, or you can use the :doc:`-suffix command-line switch
 See the :doc:`Speed packages <Speed_packages>` doc page for more
 instructions on how to use the accelerated styles effectively.
 
-
 ----------
 
-
 **Mixing, shift, table, tail correction, restart, rRESPA info**\ :
 
 For atom type pairs I,J and I != J, the epsilon, sigma, Rin
 coefficients and the cutoff distance for this pair style can be mixed.
 Rin is a cutoff value and is mixed like the cutoff.  The other
-coefficients are mixed according to the pair\_modify mix option.  The
-default mix value is *geometric*\ .  See the "pair\_modify" command for
+coefficients are mixed according to the pair_modify mix option.  The
+default mix value is *geometric*\ .  See the "pair_modify" command for
 details.
 
 This pair style supports the :doc:`pair_modify <pair_modify>` shift
@@ -112,20 +111,18 @@ tail option for adding long-range tail corrections to energy and
 pressure, since the energy of the pair interaction is smoothed to 0.0
 at the cutoff.
 
-This pair style writes its information to :doc:`binary restart files <restart>`, so pair\_style and pair\_coeff commands do not need
+This pair style writes its information to :doc:`binary restart files <restart>`, so pair_style and pair_coeff commands do not need
 to be specified in an input script that reads a restart file.
 
 This pair style can only be used via the *pair* keyword of the
 :doc:`run_style respa <run_style>` command.  It does not support the
 *inner*\ , *middle*\ , *outer* keywords.
 
-
 ----------
 
-
 Restrictions
 """"""""""""
- none
+none
 
 Related commands
 """"""""""""""""
@@ -133,8 +130,3 @@ Related commands
 :doc:`pair_coeff <pair_coeff>`, :doc:`pair lj/smooth/linear <pair_lj_smooth_linear>`
 
 **Default:** none
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/pair_lj_smooth_linear.rst b/doc/src/pair_lj_smooth_linear.rst
index d400552ca1..bb93eddd33 100644
--- a/doc/src/pair_lj_smooth_linear.rst
+++ b/doc/src/pair_lj_smooth_linear.rst
@@ -1,16 +1,15 @@
-.. index:: pair\_style lj/smooth/linear
+.. index:: pair_style lj/smooth/linear
 
-pair\_style lj/smooth/linear command
-====================================
+pair_style lj/smooth/linear command
+===================================
 
-pair\_style lj/smooth/linear/omp command
-========================================
+pair_style lj/smooth/linear/omp command
+=======================================
 
 Syntax
 """"""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    pair_style lj/smooth/linear cutoff
 
@@ -19,11 +18,10 @@ Syntax
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    pair_style lj/smooth/linear 2.5
-   pair_coeff \* \* 1.0 1.0
+   pair_coeff * * 1.0 1.0
    pair_coeff 1 1 0.3 3.0 9.0
 
 Description
@@ -35,8 +33,11 @@ standard 12/6 Lennard-Jones function and subtracts a linear term based
 on the cutoff distance, so that both, the potential and the force, go
 continuously to zero at the cutoff Rc :ref:`(Toxvaerd) <Toxvaerd>`:
 
-.. image:: Eqs/pair_lj_smooth_linear.jpg
-   :align: center
+.. math::
+
+   \phi\left(r\right) & =  4 \epsilon \left[ \left(\frac{\sigma}{r}\right)^{12} -
+                       \left(\frac{\sigma}{r}\right)^6 \right] \\
+   E\left(r\right) & =  \phi\left(r\right)  - \phi\left(R_c\right) - \left(r - R_c\right) \left.\frac{d\phi}{d r} \right|_{r=R_c}       \qquad r < R_c
 
 The following coefficients must be defined for each pair of atoms
 types via the :doc:`pair_coeff <pair_coeff>` command as in the examples
@@ -44,17 +45,15 @@ above, or in the data file or restart files read by the
 :doc:`read_data <read_data>` or :doc:`read_restart <read_restart>`
 commands, or by mixing as described below:
 
-* epsilon (energy units)
-* sigma (distance units)
+* :math:`\epsilon` (energy units)
+* :math:`\sigma` (distance units)
 * cutoff (distance units)
 
 The last coefficient is optional. If not specified, the global
-LJ cutoff specified in the pair\_style command is used.
-
+LJ cutoff specified in the pair_style command is used.
 
 ----------
 
-
 Styles with a *gpu*\ , *intel*\ , *kk*\ , *omp*\ , or *opt* suffix are
 functionally the same as the corresponding style without the suffix.
 They have been optimized to run faster, depending on your available
@@ -73,15 +72,13 @@ by including their suffix, or you can use the :doc:`-suffix command-line switch
 See the :doc:`Speed packages <Speed_packages>` doc page for more
 instructions on how to use the accelerated styles effectively.
 
-
 ----------
 
-
 **Mixing, shift, table, tail correction, restart, rRESPA info**\ :
 
 For atom type pairs I,J and I != J, the epsilon and sigma coefficients
 and cutoff distance can be mixed. The default mix value is geometric.
-See the "pair\_modify" command for details.
+See the "pair_modify" command for details.
 
 This pair style does not support the :doc:`pair_modify <pair_modify>`
 shift option for the energy of the pair interaction, since it goes
@@ -95,17 +92,15 @@ tail option for adding long-range tail corrections to energy and
 pressure, since the energy of the pair interaction is smoothed to 0.0
 at the cutoff.
 
-This pair style writes its information to :doc:`binary restart files <restart>`, so pair\_style and pair\_coeff commands do not need
+This pair style writes its information to :doc:`binary restart files <restart>`, so pair_style and pair_coeff commands do not need
 to be specified in an input script that reads a restart file.
 
 This pair style can only be used via the *pair* keyword of the
 :doc:`run_style respa <run_style>` command.  It does not support the
 *inner*\ , *middle*\ , *outer* keywords.
 
-
 ----------
 
-
 Restrictions
 """"""""""""
  none
@@ -117,17 +112,8 @@ Related commands
 
 **Default:** none
 
-
 ----------
 
-
 .. _Toxvaerd:
 
-
-
 **(Toxvaerd)** Toxvaerd, Dyre, J Chem Phys, 134, 081102 (2011).
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/pair_lj_switch3_coulgauss_long.rst b/doc/src/pair_lj_switch3_coulgauss_long.rst
index 3a885784a3..24374658e3 100644
--- a/doc/src/pair_lj_switch3_coulgauss_long.rst
+++ b/doc/src/pair_lj_switch3_coulgauss_long.rst
@@ -1,20 +1,18 @@
-.. index:: pair\_style lj/switch3/coulgauss/long
+.. index:: pair_style lj/switch3/coulgauss/long
 
-pair\_style lj/switch3/coulgauss/long command
-=============================================
+pair_style lj/switch3/coulgauss/long command
+============================================
 
 Syntax
 """"""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    pair_style style args
 
 * style = *lj/switch3/coulgauss/long*
 * args = list of arguments for a particular style
 
-
 .. parsed-literal::
 
      *lj/switch3/coulgauss/long* args = cutoff (cutoff2) width
@@ -25,8 +23,7 @@ Syntax
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    pair_style lj/switch3/coulgauss/long    12.0 3.0
    pair_coeff 1  0.2 2.5 1.2
@@ -40,26 +37,34 @@ Description
 The *lj/switch3/coulgauss* style evaluates the LJ
 vdW potential
 
-.. image:: Eqs/pair_lj_switch3.jpg
-   :align: center
+.. math::
 
-, which goes smoothly to zero at the cutoff r\_c as defined
+   E = 4\epsilon \left[ \left(\frac{\sigma}{r}\right)^{12}-\left(\frac{\sigma}{r}\right)^{6} \right]
+
+, which goes smoothly to zero at the cutoff r_c as defined
 by the switching function
 
-.. image:: Eqs/pair_switch3.jpg
-   :align: center
+.. math::
+
+ S_3(r) = \left\lbrace \begin{array}{ll}
+                     1 & \quad\mathrm{if}\quad r < r_\mathrm{c} - w \\
+                     3x^2 - 2x^3 & \quad\mathrm{if}\quad r < r_\mathrm{c} \quad\mathrm{with\quad} x=\frac{r_\mathrm{c} - r}{w} \\
+                     0 & \quad\mathrm{if}\quad r >= r_\mathrm{c}
+                 \end{array} \right.
 
 where w is the width defined in the arguments. This potential
 is combined with Coulomb interaction between Gaussian charge densities:
 
-.. image:: Eqs/pair_coulgauss.jpg
-   :align: center
+.. math::
 
-where qi and qj are the
-charges on the 2 atoms, epsilon is the dielectric constant which
-can be set by the :doc:`dielectric <dielectric>` command, gamma\_i and gamma\_j
-are the widths of the Gaussian charge distribution and erf() is the error-function.
-This style has to be used in conjunction with the :doc:`kspace_style <kspace_style>` command
+   E = \frac{q_i q_j \mathrm{erf}\left( r/\sqrt{\gamma_1^2+\gamma_2^2} \right) }{\epsilon r_{ij}}
+
+where :math:`q_i` and :math:`q_j` are the charges on the 2 atoms,
+:math:`\epsilon` is the dielectric constant which can be set by the
+:doc:`dielectric <dielectric>` command, :math:`\gamma_i` and
+:math:`\gamma_j` are the widths of the Gaussian charge distribution and
+erf() is the error-function.  This style has to be used in conjunction
+with the :doc:`kspace_style <kspace_style>` command
 
 If one cutoff is specified it is used for both the vdW and Coulomb
 terms.  If two cutoffs are specified, the first is used as the cutoff
@@ -71,14 +76,12 @@ above, or in the data file or restart files read by the
 :doc:`read_data <read_data>` or :doc:`read_restart <read_restart>`
 commands:
 
-* epsilon (energy)
-* sigma (distance)
-* gamma (distance)
-
+* :math:`\epsilon` (energy)
+* :math:`\sigma` (distance)
+* :math:`\gamma` (distance)
 
 ----------
 
-
 **Mixing, shift, table, tail correction, restart, rRESPA info**\ :
 
 Shifting the potential energy is not necessary because the switching
@@ -87,7 +90,6 @@ function ensures that the potential is zero at the cut-off.
 Restrictions
 """"""""""""
 
-
 These styles are part of the USER-YAFF package.  They are only
 enabled if LAMMPS was built with that package.  See the :doc:`Build package <Build_package>` doc page for more info.
 
@@ -97,8 +99,3 @@ Related commands
 :doc:`pair_coeff <pair_coeff>`
 
 **Default:** none
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/pair_local_density.rst b/doc/src/pair_local_density.rst
index 7cea5ef807..f2510686a9 100644
--- a/doc/src/pair_local_density.rst
+++ b/doc/src/pair_local_density.rst
@@ -1,13 +1,12 @@
-.. index:: pair\_style local/density
+.. index:: pair_style local/density
 
-pair\_style local/density command
-=================================
+pair_style local/density command
+================================
 
 Syntax
 """"""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    pair_style style arg
 
@@ -17,150 +16,156 @@ Syntax
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    pair_style local/density benzene_water.localdensity.table
 
-   pair_style hybrid/overlay table spline 500 local/density 
-   pair_coeff \* \* local/density  benzene_water.localdensity.table
+   pair_style hybrid/overlay table spline 500 local/density
+   pair_coeff * * local/density  benzene_water.localdensity.table
 
 Description
 """""""""""
 
-The local density (LD) potential is a mean-field manybody potential, and, in some 
-sense,a generalization of embedded atom models (EAM). The name "local density 
-potential" arises from the fact that it assigns an energy to an atom depending 
-on the number of neighboring atoms of given type around it within a predefined 
+The local density (LD) potential is a mean-field manybody potential, and, in some
+sense,a generalization of embedded atom models (EAM). The name "local density
+potential" arises from the fact that it assigns an energy to an atom depending
+on the number of neighboring atoms of given type around it within a predefined
 spherical volume (i.e., within a cutoff). The bottom-up coarse-graining (CG)
-literature suggests that such potentials can be widely useful  in capturing 
-effective multibody forces in a computationally efficient manner so as to 
-improve the quality of CG models of implicit solvation:ref:`(Sanyal1) <Sanyal1>` and 
-phase-segregation in liquid mixtures:ref:`(Sanyal2) <Sanyal2>`, and provide guidelines 
-to determine the extent of manybody correlations present in a CG 
-model.:ref:`(Rosenberger) <Rosenberger>` The LD potential in LAMMPS is primarily 
-intended to be used as a corrective potential over traditional pair potentials 
-in bottom-up CG models, i.e., as a hybrid pair style with 
-other explicit pair interaction terms (e.g., table spline, Lennard Jones, etc.). 
-Because the LD potential is not a pair potential per se,  it is implemented 
-simply as a single auxiliary file with all specifications that will be read 
+literature suggests that such potentials can be widely useful  in capturing
+effective multibody forces in a computationally efficient manner so as to
+improve the quality of CG models of implicit solvation:ref:`(Sanyal1) <Sanyal1>` and
+phase-segregation in liquid mixtures:ref:`(Sanyal2) <Sanyal2>`, and provide guidelines
+to determine the extent of manybody correlations present in a CG
+model.:ref:`(Rosenberger) <Rosenberger>` The LD potential in LAMMPS is primarily
+intended to be used as a corrective potential over traditional pair potentials
+in bottom-up CG models, i.e., as a hybrid pair style with
+other explicit pair interaction terms (e.g., table spline, Lennard Jones, etc.).
+Because the LD potential is not a pair potential per se,  it is implemented
+simply as a single auxiliary file with all specifications that will be read
 upon initialization.
 
 .. note::
 
-   Thus when used as the only interaction in the system, there is no 
-   corresponding pair\_coeff command and when used with other pair styles using the 
-   hybrid/overlay option, the corresponding pair\_coeff command must be supplied
+   Thus when used as the only interaction in the system, there is no
+   corresponding pair_coeff command and when used with other pair styles using the
+   hybrid/overlay option, the corresponding pair_coeff command must be supplied
    \*  \* as placeholders for the atom types.
 
-
 ----------
 
-
 **System with a single CG atom type:**
 
 A system of a single atom type (e.g., LJ argon) with a single local density (LD)
 potential would have an energy given by:
 
-.. image:: Eqs/pair_local_density_energy.jpg
-   :align: center
+.. math::
 
-where rho\_i is the LD at atom i and F(rho) is similar in spirit to the 
-embedding function used in EAM potentials. The LD at atom i is given by the sum
+   U_{LD} = \sum_i F(\rho_i)
 
-.. image:: Eqs/pair_local_density_ld.jpg
-   :align: center
+where :math:`\rho_i` is the LD at atom *i* and :math:`F(\rho)` is
+similar in spirit to the embedding function used in EAM potentials. The
+LD at atom *i* is given by the sum
 
-where phi is an indicator function that is one at r=0 and zero beyond a cutoff 
-distance R2. The choice of the functional form of phi is somewhat arbitrary, 
-but the following piecewise cubic function has proven sufficiently general: 
-:ref:`(Sanyal1) <Sanyal1>`, :ref:`(Sanyal2) <Sanyal2>` :ref:`(Rosenberger) <Rosenberger>`
+.. math::
 
-.. image:: Eqs/pair_local_density_indicator_func.jpg
-   :align: center
+   \rho_i = \sum_{j \neq i} \varphi(r_{ij})
 
-The constants *c* are chosen so that the indicator function smoothly 
-interpolates between 1 and 0 between the distances R1 and R2, which are 
-called the inner and outer cutoffs, respectively. Thus phi satisfies 
-phi(R1) = 1, phi(R2) = dphi/dr @ (r=R1) =  dphi/dr @ (r=R2) = 0. The embedding 
-function F(rho) may or may not have a closed-form expression. To maintain 
-generality, it is practically represented with a spline-interpolated table 
-over a predetermined range of rho. Outside of that range it simply adopts zero 
+where :math:`\varphi` is an indicator function that is one at r=0 and
+zero beyond a cutoff distance R2. The choice of the functional form of
+:math:`\varphi` is somewhat arbitrary, but the following piecewise cubic
+function has proven sufficiently general: :ref:`(Sanyal1) <Sanyal1>`,
+:ref:`(Sanyal2) <Sanyal2>` :ref:`(Rosenberger) <Rosenberger>`
+
+.. math::
+
+   \varphi(r) =
+   \begin{cases}
+   1 & r \le R_1 \\
+   c_0 + c_2r^2 + c_4r^4 + c_6r^6  & r \in (R_1, R_2) \\
+   0 & r \ge R_2
+   \end{cases}
+
+The constants *c* are chosen so that the indicator function smoothly
+interpolates between 1 and 0 between the distances R1 and R2, which are
+called the inner and outer cutoffs, respectively. Thus phi satisfies
+phi(R1) = 1, phi(R2) = dphi/dr @ (r=R1) =  dphi/dr @ (r=R2) = 0. The embedding
+function F(rho) may or may not have a closed-form expression. To maintain
+generality, it is practically represented with a spline-interpolated table
+over a predetermined range of rho. Outside of that range it simply adopts zero
 values at the endpoints.
 
-It can be shown that the total force between two atoms due to the LD potential 
-takes the form of a pair force, which motivates its designation as a LAMMPS 
+It can be shown that the total force between two atoms due to the LD potential
+takes the form of a pair force, which motivates its designation as a LAMMPS
 pair style. Please see :ref:`(Sanyal1) <Sanyal1>` for details of the derivation.
 
-
 ----------
 
-
 **Systems with arbitrary numbers of atom types:**
 
 The potential is easily generalized to systems involving multiple atom types:
 
-.. image:: Eqs/pair_local_density_energy_multi.jpg
-   :align: center
+.. math::
+
+   U_{LD} = \sum_i a_\alpha F(\rho_i)
 
 with the LD expressed as
 
-.. image:: Eqs/pair_local_density_ld_multi.jpg
-   :align: center
+.. math::
 
-where alpha gives the type of atom i, beta the type of atom j, and the 
-coefficients a and b filter for atom types as specified by the user. a is 
-called the central atom filter as it determines to which atoms the 
-potential applies; a\_alpha = 1 if the LD potential applies to atom type alpha 
-else zero. On the other hand, b is called the neighbor atom filter because it 
-specifies which atom types to use in the calculation of the LD; b\_beta = 1 if 
-atom type beta contributes to the LD and zero otherwise.
+   \rho_i = \sum_{j \neq i} b_\beta \varphi(r_{ij})
+
+where :math:`\alpha` gives the type of atom *i*\ , :math:`\beta` the
+type of atom *j*\ , and the coefficients *a* and *b* filter for atom
+types as specified by the user. *a* is called the central atom filter as
+it determines to which atoms the potential applies; :math:`a_{\alpha} =
+1` if the LD potential applies to atom type :math:`\alpha` else zero. On the
+other hand, *b* is called the neighbor atom filter because it specifies
+which atom types to use in the calculation of the LD; :math:`b_{\beta} =
+1` if atom type :math:`\beta` contributes to the LD and zero otherwise.
 
 .. note::
 
-   Note that the potentials need not be symmetric with respect to atom types, 
-   which is the reason for two distinct sets of coefficients a and b. An atom type 
-   may contribute to the LD but not the potential, or to the potential but not the 
-   LD. Such decisions are made by the user and should (ideally) be motivated on 
-   physical grounds for the problem at hand.
-
+   Note that the potentials need not be symmetric with respect to atom
+   types, which is the reason for two distinct sets of coefficients *a*
+   and *b*\ . An atom type may contribute to the LD but not the
+   potential, or to the potential but not the LD. Such decisions are
+   made by the user and should (ideally) be motivated on physical
+   grounds for the problem at hand.
 
 ----------
 
-
 **General form for implementation in LAMMPS:**
 
-Of course, a system with many atom types may have many different possible LD 
-potentials, each with their own atom type filters, cutoffs, and embedding 
-functions. The most general form of this potential as implemented in the 
-pair\_style local/density is:
+Of course, a system with many atom types may have many different possible LD
+potentials, each with their own atom type filters, cutoffs, and embedding
+functions. The most general form of this potential as implemented in the
+pair_style local/density is:
 
-.. image:: Eqs/pair_local_density_energy_implement.jpg
-   :align: center
+.. math::
 
-where, k is an index that spans the (arbitrary) number of applied LD potentials 
-N\_LD. Each LD is calculated as before with:
+   U_{LD} = \sum_k U_{LD}^{(k)} = \sum_i \left[ \sum_k a_\alpha^{(k)} F^{(k)} \left(\rho_i^{(k)}\right) \right]
 
-.. image:: Eqs/pair_local_density_ld_implement.jpg
-   :align: center
+where, *k* is an index that spans the (arbitrary) number of applied LD
+potentials N_LD. Each LD is calculated as before with:
 
-The superscript on the indicator function phi simply indicates that it is 
-associated with specific values of the cutoff distances R1(k) and R2(k). In 
-summary, there may be N\_LD distinct LD potentials. With each potential type (k), 
+.. math::
+
+   \rho_i^{(k)} = \sum_j b_\beta^{(k)} \varphi^{(k)} (r_{ij})
+
+The superscript on the indicator function phi simply indicates that it is
+associated with specific values of the cutoff distances R1(k) and R2(k). In
+summary, there may be N_LD distinct LD potentials. With each potential type (k),
 one must specify:
 
 * the inner and outer cutoffs as R1 and R2
-* the central type filter a(k), where k = 1,2,...N\_LD
-* the neighbor type filter b(k), where k = 1,2,...N\_LD
+* the central type filter a(k), where k = 1,2,...N_LD
+* the neighbor type filter b(k), where k = 1,2,...N_LD
 * the LD potential function F(k)(rho), typically as a table that is later spline-interpolated
 
-
 ----------
 
-
 **Tabulated input file format:**
 
-
 .. parsed-literal::
 
    Line 1:             comment or blank (ignored)
@@ -184,38 +189,36 @@ one must specify:
 
    Block N_LD
 
-Lines 5 to 9+N\_rho constitute the first block. Thus the input file is separated 
-(by blank lines) into N\_LD blocks each representing a separate LD potential and 
-each specifying its own upper and lower cutoffs, central and neighbor atoms, 
+Lines 5 to 9+N_rho constitute the first block. Thus the input file is separated
+(by blank lines) into N_LD blocks each representing a separate LD potential and
+each specifying its own upper and lower cutoffs, central and neighbor atoms,
 and potential.  In general, blank lines anywhere are ignored.
 
-
 ----------
 
-
 **Mixing, shift, table, tail correction, restart, info**\ :
-This pair style does not support automatic mixing. For atom type pairs alpha,
-beta and alpha != beta, even if LD potentials of type (alpha, alpha) and 
-(beta, beta) are provided, you will need to explicitly provide LD potential 
-types (alpha, beta) and (beta, alpha) if need be (Here, the notation (alpha,
-beta) means that alpha is the central atom to which the LD potential is applied
-and beta is the neighbor atom which contributes to the LD potential on alpha).
+This pair style does not support automatic mixing. For atom type pairs
+:math:`\alpha`, :math:`\beta` and :math:`\alpha` != :math:`\beta`, even
+if LD potentials of type (:math:`\alpha`, :math:`\alpha`) and
+(:math:`\beta`, :math:`\beta`) are provided, you will need to explicitly
+provide LD potential types (:math:`\alpha`, :math:`\beta`) and
+(:math:`\beta`, :math:`\alpha`) if need be (Here, the notation
+(:math:`\alpha`, :math:`\beta`) means that :math:`\alpha` is the central
+atom to which the LD potential is applied and :math:`\beta` is the
+neighbor atom which contributes to the LD potential on :math:`\alpha`).
 
 This pair style does not support the :doc:`pair_modify <pair_modify>`
 shift, table, and tail options.
 
 The local/density pair style does not write its information to :doc:`binary restart files <restart>`, since it is stored in tabulated potential files.
-Thus, you need to re-specify the pair\_style and pair\_coeff commands in
+Thus, you need to re-specify the pair_style and pair_coeff commands in
 an input script that reads a restart file.
 
-
 ----------
 
-
 Restrictions
 """"""""""""
 
-
 The local/density pair style is a part of the USER-MISC package. It is only
 enabled if LAMMPS was built with that package.  See the :doc:`Build package <Build_package>` doc page for more info.
 
@@ -226,28 +229,16 @@ Related commands
 
 **Default:** none
 
-
 ----------
 
-
 .. _Sanyal1:
 
-
-
 .. _Sanyal2:
 
 **(Sanyal1)** Sanyal and Shell, Journal of Chemical Physics, 2016, 145 (3), 034109.
 
-
 **(Sanyal2)** Sanyal and Shell, Journal of Physical Chemistry B, 122 (21), 5678-5693.
 
 .. _Rosenberger:
 
-
-
 **(Rosenberger)** Rosenberger, Sanyal, Shell and van der Vegt,  Journal of Chemical Physics, 2019, 151 (4), 044111.
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/pair_lubricate.rst b/doc/src/pair_lubricate.rst
index c6aa16fe00..563b88920e 100644
--- a/doc/src/pair_lubricate.rst
+++ b/doc/src/pair_lubricate.rst
@@ -1,22 +1,21 @@
-.. index:: pair\_style lubricate
+.. index:: pair_style lubricate
 
-pair\_style lubricate command
-=============================
+pair_style lubricate command
+============================
 
-pair\_style lubricate/omp command
+pair_style lubricate/omp command
+================================
+
+pair_style lubricate/poly command
 =================================
 
-pair\_style lubricate/poly command
-==================================
-
-pair\_style lubricate/poly/omp command
-======================================
+pair_style lubricate/poly/omp command
+=====================================
 
 Syntax
 """"""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    pair_style style mu flaglog flagfld cutinner cutoff flagHI flagVF
 
@@ -31,17 +30,16 @@ Syntax
 
 **Examples:** (all assume radius = 1)
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    pair_style lubricate 1.5 1 1 2.01 2.5
    pair_coeff 1 1 2.05 2.8
-   pair_coeff \* \*
+   pair_coeff * *
 
    pair_style lubricate 1.5 1 1 2.01 2.5
-   pair_coeff \* \*
+   pair_coeff * *
    variable mu equal ramp(1,2)
-   fix 1 all adapt 1 pair lubricate mu \* \* v_mu
+   fix 1 all adapt 1 pair lubricate mu * * v_mu
 
 Description
 """""""""""
@@ -51,8 +49,15 @@ interactions between mono-disperse finite-size spherical particles in
 a pairwise fashion.  The interactions have 2 components.  The first is
 Ball-Melrose lubrication terms via the formulas in :ref:`(Ball and Melrose) <Ball1>`
 
-.. image:: Eqs/pair_lubricate.jpg
-   :align: center
+.. math::
+
+   W & =  - a_{sq} | (v_1 - v_2) \bullet \mathbf{nn} |^2 -
+   a_{sh} | (\omega_1 + \omega_2) \bullet
+   (\mathbf{I} - \mathbf{nn}) - 2 \Omega_N |^2 - \\
+   &  a_{pu} | (\omega_1 - \omega_2) \bullet (\mathbf{I} - \mathbf{nn}) |^2 -
+   a_{tw} | (\omega_1 - \omega_2) \bullet \mathbf{nn} |^2  \qquad r < r_c \\
+   & \\
+   \Omega_N & = \mathbf{n} \times (v_1 - v_2) / r
 
 which represents the dissipation W between two nearby particles due to
 their relative velocities in the presence of a background solvent with
@@ -82,15 +87,16 @@ The other component is due to the Fast Lubrication Dynamics (FLD)
 approximation, described in :ref:`(Kumar) <Kumar1>`, which can be
 represented by the following equation
 
-.. image:: Eqs/fld.jpg
-   :align: center
+.. math::
+
+   F^{H} = -R_{FU}(U-U^{\infty}) + R_{FE}E^{\infty}
 
 where U represents the velocities and angular velocities of the
-particles, U\^\ *infty* represents the velocity and the angular velocity
-of the undisturbed fluid, and E\^\ *infty* represents the rate of strain
+particles, :math:`U^{\infty}` represents the velocity and the angular velocity
+of the undisturbed fluid, and :math:`E^{\infty}` represents the rate of strain
 tensor of the undisturbed fluid with viscosity *mu*\ . Again, note that
 this is dynamic viscosity which has units of mass/distance/time, not
-kinematic viscosity. Volume fraction corrections to R\_FU are included
+kinematic viscosity. Volume fraction corrections to R_FU are included
 as long as *flagVF* is set to 1 (default).
 
 .. note::
@@ -104,7 +110,7 @@ Style *lubricate* requires monodisperse spherical particles; style
 *lubricate/poly* allows for polydisperse spherical particles.
 
 The viscosity *mu* can be varied in a time-dependent manner over the
-course of a simulation, in which case in which case the pair\_style
+course of a simulation, in which case in which case the pair_style
 setting for *mu* will be overridden.  See the :doc:`fix adapt <fix_adapt>`
 command for details.
 
@@ -112,9 +118,9 @@ If the suspension is sheared via the :doc:`fix deform <fix_deform>`
 command then the pair style uses the shear rate to adjust the
 hydrodynamic interactions accordingly. Volume changes due to fix
 deform are accounted for when computing the volume fraction
-corrections to R\_FU.
+corrections to R_FU.
 
-When computing the volume fraction corrections to R\_FU, the presence
+When computing the volume fraction corrections to R_FU, the presence
 of walls (whether moving or stationary) will affect the volume
 fraction available to colloidal particles. This is currently accounted
 for with the following types of walls: :doc:`wall/lj93 <fix_wall>`,
@@ -133,10 +139,8 @@ thermostat the system at a constant temperature. If Brownian motion
 and the brownian style should use consistent parameters for *mu*\ ,
 *flaglog*\ , *flagfld*\ , *cutinner*\ , *cutoff*\ , *flagHI* and *flagVF*\ .
 
-
 ----------
 
-
 The following coefficients must be defined for each pair of atoms
 types via the :doc:`pair_coeff <pair_coeff>` command as in the examples
 above, or in the data file or restart files read by the
@@ -147,13 +151,11 @@ commands, or by mixing as described below:
 * cutoff (distance units)
 
 The two coefficients are optional.  If neither is specified, the two
-cutoffs specified in the pair\_style command are used.  Otherwise both
+cutoffs specified in the pair_style command are used.  Otherwise both
 must be specified.
 
-
 ----------
 
-
 Styles with a *gpu*\ , *intel*\ , *kk*\ , *omp*\ , or *opt* suffix are
 functionally the same as the corresponding style without the suffix.
 They have been optimized to run faster, depending on your available
@@ -172,15 +174,13 @@ by including their suffix, or you can use the :doc:`-suffix command-line switch
 See :doc:`this section <Speed>` of the manual for more
 instructions on how to use the accelerated styles effectively.
 
-
 ----------
 
-
 **Mixing, shift, table, tail correction, restart, rRESPA info**\ :
 
 For atom type pairs I,J and I != J, the two cutoff distances for this
 pair style can be mixed.  The default mix value is *geometric*\ .  See
-the "pair\_modify" command for details.
+the "pair_modify" command for details.
 
 This pair style does not support the :doc:`pair_modify <pair_modify>`
 shift option for the energy of the pair interaction.
@@ -192,28 +192,25 @@ This pair style does not support the :doc:`pair_modify <pair_modify>`
 tail option for adding long-range tail corrections to energy and
 pressure.
 
-This pair style writes its information to :doc:`binary restart files <restart>`, so pair\_style and pair\_coeff commands do not need
+This pair style writes its information to :doc:`binary restart files <restart>`, so pair_style and pair_coeff commands do not need
 to be specified in an input script that reads a restart file.
 
 This pair style can only be used via the *pair* keyword of the
 :doc:`run_style respa <run_style>` command.  It does not support the
 *inner*\ , *middle*\ , *outer* keywords.
 
-
 ----------
 
-
 Restrictions
 """"""""""""
 
-
 These styles are part of the COLLOID package.  They are only enabled
 if LAMMPS was built with that package.  See the :doc:`Build package <Build_package>` doc page for more info.
 
-Only spherical monodisperse particles are allowed for pair\_style
+Only spherical monodisperse particles are allowed for pair_style
 lubricate.
 
-Only spherical particles are allowed for pair\_style lubricate/poly.
+Only spherical particles are allowed for pair_style lubricate/poly.
 
 These pair styles will not restart exactly when using the
 :doc:`read_restart <read_restart>` command, though they should provide
@@ -232,27 +229,16 @@ Default
 The default settings for the optional args are flagHI = 1 and flagVF =
 1.
 
-
 ----------
 
-
 .. _Ball1:
 
-
-
 **(Ball)** Ball and Melrose, Physica A, 247, 444-472 (1997).
 
 .. _Kumar1:
 
-
-
 **(Kumar)** Kumar and Higdon, Phys Rev E, 82, 051401 (2010).  See also
 his thesis for more details: A. Kumar, "Microscale Dynamics in
 Suspensions of Non-spherical Particles", Thesis, University of
 Illinois Urbana-Champaign,
 (2010). (`https://www.ideals.illinois.edu/handle/2142/16032 <https://www.ideals.illinois.edu/handle/2142/16032>`_)
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/pair_lubricateU.rst b/doc/src/pair_lubricateU.rst
index b50eb18467..5b485746c8 100644
--- a/doc/src/pair_lubricateU.rst
+++ b/doc/src/pair_lubricateU.rst
@@ -1,16 +1,15 @@
-.. index:: pair\_style lubricateU
+.. index:: pair_style lubricateU
 
-pair\_style lubricateU command
-==============================
+pair_style lubricateU command
+=============================
 
-pair\_style lubricateU/poly command
-===================================
+pair_style lubricateU/poly command
+==================================
 
 Syntax
 """"""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    pair_style style mu flaglog cutinner cutoff gdot flagHI flagVF
 
@@ -25,12 +24,11 @@ Syntax
 
 **Examples:** (all assume radius = 1)
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    pair_style lubricateU 1.5 1 2.01 2.5 0.01 1 1
    pair_coeff 1 1 2.05 2.8
-   pair_coeff \* \*
+   pair_coeff * *
 
 Description
 """""""""""
@@ -43,8 +41,15 @@ other types of interactions.
 The interactions have 2 components.  The first is
 Ball-Melrose lubrication terms via the formulas in :ref:`(Ball and Melrose) <Ball2>`
 
-.. image:: Eqs/pair_lubricate.jpg
-   :align: center
+.. math::
+
+   W & =  - a_{sq} | (v_1 - v_2) \bullet \mathbf{nn} |^2 -
+   a_{sh} | (\omega_1 + \omega_2) \bullet
+   (\mathbf{I} - \mathbf{nn}) - 2 \Omega_N |^2 - \\
+   &  a_{pu} | (\omega_1 - \omega_2) \bullet (\mathbf{I} - \mathbf{nn}) |^2 -
+   a_{tw} | (\omega_1 - \omega_2) \bullet \mathbf{nn} |^2  \qquad r < r_c \\
+   & \\
+   \Omega_N & = \mathbf{n} \times (v_1 - v_2) / r
 
 which represents the dissipation W between two nearby particles due to
 their relative velocities in the presence of a background solvent with
@@ -75,16 +80,17 @@ The other component is due to the Fast Lubrication Dynamics (FLD)
 approximation, described in :ref:`(Kumar) <Kumar2>`.  The equation being
 solved to balance the forces and torques is
 
-.. image:: Eqs/fld2.jpg
-   :align: center
+.. math::
+
+   -R_{FU}(U-U^{\infty}) = -R_{FE}E^{\infty} - F^{rest}
 
 where U represents the velocities and angular velocities of the
-particles, U\^\ *infty* represents the velocities and the angular
-velocities of the undisturbed fluid, and E\^\ *infty* represents the rate
-of strain tensor of the undisturbed fluid flow with viscosity
+particles, :math:`U^{\infty}` represents the velocities and the angular
+velocities of the undisturbed fluid, and :math:`E^{\infty}` represents
+the rate of strain tensor of the undisturbed fluid flow with viscosity
 *mu*\ . Again, note that this is dynamic viscosity which has units of
 mass/distance/time, not kinematic viscosity.  Volume fraction
-corrections to R\_FU are included if *flagVF* is set to 1 (default).
+corrections to R_FU are included if *flagVF* is set to 1 (default).
 
 F\ *rest* represents the forces and torques due to all other types of
 interactions, e.g. Brownian, electrostatic etc.  Note that this
@@ -117,9 +123,9 @@ If the suspension is sheared via the :doc:`fix deform <fix_deform>`
 command then the pair style uses the shear rate to adjust the
 hydrodynamic interactions accordingly. Volume changes due to fix
 deform are accounted for when computing the volume fraction
-corrections to R\_FU.
+corrections to R_FU.
 
-When computing the volume fraction corrections to R\_FU, the presence
+When computing the volume fraction corrections to R_FU, the presence
 of walls (whether moving or stationary) will affect the volume
 fraction available to colloidal particles. This is currently accounted
 for with the following types of walls: :doc:`wall/lj93 <fix_wall>`,
@@ -127,7 +133,7 @@ for with the following types of walls: :doc:`wall/lj93 <fix_wall>`,
 :doc:`wall/harmonic <fix_wall>`.  For these wall styles, the correct
 volume fraction will be used when walls do not coincide with the box
 boundary, as well as when walls move and thereby cause a change in the
-volume fraction. To use these wall styles with pair\_style *lubricateU*
+volume fraction. To use these wall styles with pair_style *lubricateU*
 or *lubricateU/poly*\ , the *fld yes* option must be specified in the
 fix wall command.
 
@@ -138,10 +144,8 @@ thermostat the system at a constant temperature. If Brownian motion
 and the brownian style should use consistent parameters for *mu*\ ,
 *flaglog*\ , *flagfld*\ , *cutinner*\ , *cutoff*\ , *flagHI* and *flagVF*\ .
 
-
 ----------
 
-
 The following coefficients must be defined for each pair of atoms
 types via the :doc:`pair_coeff <pair_coeff>` command as in the examples
 above, or in the data file or restart files read by the
@@ -152,18 +156,16 @@ commands, or by mixing as described below:
 * cutoff (distance units)
 
 The two coefficients are optional.  If neither is specified, the two
-cutoffs specified in the pair\_style command are used.  Otherwise both
+cutoffs specified in the pair_style command are used.  Otherwise both
 must be specified.
 
-
 ----------
 
-
 **Mixing, shift, table, tail correction, restart, rRESPA info**\ :
 
 For atom type pairs I,J and I != J, the two cutoff distances for this
 pair style can be mixed.  The default mix value is *geometric*\ .  See
-the "pair\_modify" command for details.
+the "pair_modify" command for details.
 
 This pair style does not support the :doc:`pair_modify <pair_modify>`
 shift option for the energy of the pair interaction.
@@ -175,21 +177,18 @@ This pair style does not support the :doc:`pair_modify <pair_modify>`
 tail option for adding long-range tail corrections to energy and
 pressure.
 
-This pair style writes its information to :doc:`binary restart files <restart>`, so pair\_style and pair\_coeff commands do not need
+This pair style writes its information to :doc:`binary restart files <restart>`, so pair_style and pair_coeff commands do not need
 to be specified in an input script that reads a restart file.
 
 This pair style can only be used via the *pair* keyword of the
 :doc:`run_style respa <run_style>` command.  It does not support the
 *inner*\ , *middle*\ , *outer* keywords.
 
-
 ----------
 
-
 Restrictions
 """"""""""""
 
-
 These styles are part of the COLLOID package.  They are only enabled
 if LAMMPS was built with that package.  See the :doc:`Build package <Build_package>` doc page for more info.
 
@@ -200,10 +199,10 @@ the pair styles, and that no fixes apply additional constraint forces.
 One exception is the :doc:`fix wall/colloid <fix_wall>` commands, which
 has an "fld" option to apply their wall forces correctly.
 
-Only spherical monodisperse particles are allowed for pair\_style
+Only spherical monodisperse particles are allowed for pair_style
 lubricateU.
 
-Only spherical particles are allowed for pair\_style lubricateU/poly.
+Only spherical particles are allowed for pair_style lubricateU/poly.
 
 For sheared suspensions, it is assumed that the shearing is done in
 the xy plane, with x being the velocity direction and y being the
@@ -220,23 +219,12 @@ Default
 The default settings for the optional args are flagHI = 1 and flagVF =
 1.
 
-
 ----------
 
-
 .. _Ball2:
 
-
-
 **(Ball)** Ball and Melrose, Physica A, 247, 444-472 (1997).
 
 .. _Kumar2:
 
-
-
 **(Kumar)** Kumar and Higdon, Phys Rev E, 82, 051401 (2010).
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/pair_mdf.rst b/doc/src/pair_mdf.rst
index 4174a516d3..983e817f1d 100644
--- a/doc/src/pair_mdf.rst
+++ b/doc/src/pair_mdf.rst
@@ -1,27 +1,26 @@
-.. index:: pair\_style lj/mdf
+.. index:: pair_style lj/mdf
 
-pair\_style lj/mdf command
-==========================
+pair_style lj/mdf command
+=========================
 
-pair\_style buck/mdf command
-============================
+pair_style buck/mdf command
+===========================
 
-pair\_style lennard/mdf command
-===============================
+pair_style lennard/mdf command
+==============================
 
 Syntax
 """"""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    pair_style style args
 
 * style = *lj/mdf* or *buck/mdf* or *lennard/mdf*
 * args = list of arguments for a particular style
-  
+
   .. parsed-literal::
-  
+
        *lj/mdf* args = cutoff1 cutoff2
          cutoff1 = inner cutoff for the start of the tapering function
          cutoff1 = out cutoff for the end of the tapering function
@@ -32,24 +31,21 @@ Syntax
          cutoff1 = inner cutoff for the start of the tapering function
          cutoff1 = out cutoff for the end of the tapering function
 
-
-
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    pair_style lj/mdf 2.5 3.0
-   pair_coeff \* \* 1.0 1.0
+   pair_coeff * * 1.0 1.0
    pair_coeff 1 1 1.1 2.8 3.0 3.2
 
    pair_style buck 2.5 3.0
-   pair_coeff \* \* 100.0 1.5 200.0
-   pair_coeff \* \* 100.0 1.5 200.0 3.0 3.5
+   pair_coeff * * 100.0 1.5 200.0
+   pair_coeff * * 100.0 1.5 200.0 3.0 3.5
 
    pair_style lennard/mdf 2.5 3.0
-   pair_coeff \* \* 1.0 1.0
+   pair_coeff * * 1.0 1.0
    pair_coeff 1 1 1021760.3664 2120.317338 3.0 3.2
 
 Description
@@ -60,115 +56,112 @@ Lennard-Jones and Buckingham potential with the addition of a taper
 function that ramps the energy and force smoothly to zero between an
 inner and outer cutoff.
 
-.. image:: Eqs/pair_mdf-1.jpg
-   :align: center
+.. math::
+
+   E_{smooth}(r) = E(r)*f(r)
 
 The tapering, *f(r)*\ , is done by using the Mei, Davenport, Fernando
 function :ref:`(Mei) <Mei>`.
 
-.. image:: Eqs/pair_mdf-2.jpg
-   :align: center
+.. math::
+
+   f(r) & = 1.0  \qquad \qquad \mathrm{for} \qquad r < r_m \\
+   f(r) & = (1 - x)^3*(1+3x+6x^2) \quad \mathrm{for} \qquad r_m < r < r_{cut} \\
+   f(r) & = 0.0  \qquad \qquad \mathrm{for} \qquad  r >= r_{cut} \\
 
 where
 
-.. image:: Eqs/pair_mdf-3.jpg
-   :align: center
+.. math::
 
-Here *r\_m* is the inner cutoff radius and *r\_cut* is the outer cutoff
-radius.
+   x = \frac{(r-r_m)}{(r_{cut}-r_m)}
 
+Here :math:`r_m` is the inner cutoff radius and :math:`r_{cut}` is the
+outer cutoff radius.
 
 ----------
 
-
-For the *lj/mdf* pair\_style, the potential energy, *E(r)*\ , is the
+For the *lj/mdf* pair_style, the potential energy, *E(r)*\ , is the
 standard 12-6 Lennard-Jones written in the epsilon/sigma form:
 
-.. image:: Eqs/pair_mdf-4.jpg
-   :align: center
+.. math::
+
+   E(r) = 4\epsilon\biggl[\bigl(\frac{\sigma}{r}\bigr)^{12} - \bigl(\frac{\sigma}{r}\bigr)^6\biggr]
 
 Either the first two or all of the following coefficients must be
-defined for each pair of atoms types via the pair\_coeff command as
-in the examples above, or in the data file read by the
-:doc:`read_data <read_data>`. The two cutoffs default to the global
-values and epsilon and sigma can also be determined by mixing as
+defined for each pair of atoms types via the pair_coeff command as in
+the examples above, or in the data file read by the :doc:`read_data
+<read_data>`. The two cutoffs default to the global values and
+:math:`\epsilon` and :math:`\sigma` can also be determined by mixing as
 described below:
 
-* epsilon (energy units)
-* sigma (distance units)
-* r\_m (distance units)
-* r\_\ *cut* (distance units)
-
+* :math:`\epsilon` (energy units)
+* :math:`\sigma` (distance units)
+* :math:`r_m` (distance units)
+* :math:`r_{cut}` (distance units)
 
 ----------
 
-
-For the *buck/mdf* pair\_style, the potential energy, *E(r)*\ , is the
+For the *buck/mdf* pair_style, the potential energy, *E(r)*\ , is the
 standard Buckingham potential with three required coefficients.
 The two cutoffs can be omitted and default to the corresponding
 global values:
 
-.. image:: Eqs/pair_mdf-5.jpg
-   :align: center
+.. math::
 
-* A (energy units)
-* \rho (distance units)
-* C (energy-distance\^6 units)
-* r\_m (distance units)
-* r\_\ *cut* (distance units)
+   E(r) = A e^{(-r/\rho)} -\frac{C}{r^6}
 
+* *A* (energy units)
+* :math:`\rho` (distance units)
+* *C* (energy-distance\^6 units)
+* :math:`r_m` (distance units)
+* :math:`r_{cut}` (distance units)
 
 ----------
 
-
-For the *lennard/mdf* pair\_style, the potential energy, *E(r)*\ , is the
+For the *lennard/mdf* pair_style, the potential energy, *E(r)*\ , is the
 standard 12-6 Lennard-Jones written in the A/B form:
 
-.. image:: Eqs/pair_mdf-6.jpg
-   :align: center
+.. math::
+
+   E(r) = \frac{A}{r^{12}} - \frac{B}{r^{6}}
 
 The following coefficients must be defined for each pair of atoms
-types via the pair\_coeff command as in the examples above, or in the
-data file read by the read\_data commands, or by mixing as described below.
+types via the pair_coeff command as in the examples above, or in the
+data file read by the read_data commands, or by mixing as described below.
 The two cutoffs default to their global values and must be either both
 given or both left out:
 
-* A (energy-distance\^12 units)
-* B (energy-distance\^6 units)
-* r\_m (distance units)
-* r\_\ *cut* (distance units)
-
+* *A* (energy-distance\^12 units)
+* *B* (energy-distance\^6 units)
+* :math:`r_m` (distance units)
+* :math:`r_{cut}` (distance units)
 
 ----------
 
-
 **Mixing, shift, table, tail correction, restart, rRESPA info**\ :
 
-For atom type pairs I,J and I != J, the epsilon and sigma coefficients
-and cutoff distances for the lj/mdf pair style can be mixed.
-The default mix value is *geometric*\ .  See the "pair\_modify" command
-for details. The other two pair styles buck/mdf and lennard/mdf do not
-support mixing, so all I,J pairs of coefficients must be specified
-explicitly.
+For atom type pairs I,J and I != J, the :math:`\epsilon` and
+:math:`sigma` coefficients and cutoff distances for the lj/mdf pair
+style can be mixed.  The default mix value is *geometric*\ .  See the
+"pair_modify" command for details. The other two pair styles buck/mdf
+and lennard/mdf do not support mixing, so all I,J pairs of coefficients
+must be specified explicitly.
 
 None of the lj/mdf, buck/mdf, or lennard/mdf pair styles supports
 the :doc:`pair_modify <pair_modify>` shift option or long-range
 tail corrections to pressure and energy.
 
-These styles write their information to :doc:`binary restart files <restart>`, so pair\_style and pair\_coeff commands do not need
+These styles write their information to :doc:`binary restart files <restart>`, so pair_style and pair_coeff commands do not need
 to be specified in an input script that reads a restart file.
 
 These styles can only be used via the *pair* keyword of the :doc:`run_style respa <run_style>` command.  They do not support the *inner*\ ,
 *middle*\ , *outer* keywords.
 
-
 ----------
 
-
 Restrictions
 """"""""""""
 
-
 These pair styles can only be used if LAMMPS was built with the
 USER-MISC package.  See the :doc:`Build package <Build_package>` doc
 page for more info.
@@ -180,17 +173,8 @@ Related commands
 
 **Default:** none
 
-
 ----------
 
-
 .. _Mei:
 
-
-
 **(Mei)** Mei, Davenport, Fernando, Phys Rev B, 43 4653 (1991)
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/pair_meam_spline.rst b/doc/src/pair_meam_spline.rst
index d8cf53a66d..6c4da24625 100644
--- a/doc/src/pair_meam_spline.rst
+++ b/doc/src/pair_meam_spline.rst
@@ -1,28 +1,26 @@
-.. index:: pair\_style meam/spline
+.. index:: pair_style meam/spline
 
-pair\_style meam/spline command
-===============================
+pair_style meam/spline command
+==============================
 
-pair\_style meam/spline/omp command
-===================================
+pair_style meam/spline/omp command
+==================================
 
 Syntax
 """"""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    pair_style meam/spline
 
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code:: LAMMPS
 
    pair_style meam/spline
-   pair_coeff \* \* Ti.meam.spline Ti
-   pair_coeff \* \* Ti.meam.spline Ti Ti Ti
+   pair_coeff * * Ti.meam.spline Ti
+   pair_coeff * * Ti.meam.spline Ti Ti Ti
 
 Description
 """""""""""
@@ -32,27 +30,31 @@ using a variant of modified embedded-atom method (MEAM) potentials
 :ref:`(Lenosky) <Lenosky1>`.  For a single species ("old-style") MEAM,
 the total energy E is given by
 
-.. image:: Eqs/pair_meam_spline.jpg
-   :align: center
+.. math::
 
-where rho\_i is the density at atom I, theta\_jik is the angle between
-atoms J, I, and K centered on atom I. The five functions Phi, U, rho,
-f, and g are represented by cubic splines.
+   E & =\sum_{i<j}\phi(r_{ij})+\sum_{i}U(n_{i}) \\
+   n_{i} & =\sum_{j}\rho(r_{ij})+\sum_{\substack{j<k,\\j,k\neq i}}f(r_{ij})f(r_{ik})g[\cos(\theta_{jik})]
+
+where :math:`\rho_i` is the density at atom I, :math:`\theta_{jik}` is
+the angle between atoms J, I, and K centered on atom I. The five
+functions :math:`\phi, U, \rho, f,` and *g* are represented by cubic splines.
 
 The *meam/spline* style also supports a new style multicomponent
 modified embedded-atom method (MEAM) potential :ref:`(Zhang) <Zhang4>`, where
 the total energy E is given by
 
-.. image:: Eqs/pair_meam_spline_multicomponent.jpg
-   :align: center
+.. math::
 
-where the five functions Phi, U, rho, f, and g depend on the chemistry
-of the atoms in the interaction.  In particular, if there are N different
-chemistries, there are N different U, rho, and f functions, while there
-are N(N+1)/2 different Phi and g functions.  The new style multicomponent
-MEAM potential files are indicated by the second line in the file starts
-with "meam/spline" followed by the number of elements and the name of each
-element.
+   E &= \sum_{i<j}\phi_{ij}(r_{ij})+\sum_{i}U_i(n_{i}) \\
+   n_{i} & = \sum_{j\ne i}\rho_j(r_{ij})+\sum_{\substack{j<k,\\j,k\neq i}}f_{j}(r_{ij})f_{k}(r_{ik})g_{jk}[\cos(\theta_{jik})]
+
+where the five functions :math:`\phi, U, \rho, f,` and *g* depend on the
+chemistry of the atoms in the interaction.  In particular, if there are
+N different chemistries, there are N different *U*\ , :math:`\rho`, and
+*f* functions, while there are N(N+1)/2 different :math:`\phi` and *g*
+functions.  The new style multicomponent MEAM potential files are
+indicated by the second line in the file starts with "meam/spline"
+followed by the number of elements and the name of each element.
 
 The cutoffs and the coefficients for these spline functions are listed
 in a parameter file which is specified by the
@@ -62,7 +64,7 @@ distribution and have a ".meam.spline" file suffix.  All of these
 files are parameterized in terms of LAMMPS :doc:`metal units <units>`.
 
 Note that unlike for other potentials, cutoffs for spline-based MEAM
-potentials are not set in the pair\_style or pair\_coeff command; they
+potentials are not set in the pair_style or pair_coeff command; they
 are specified in the potential files themselves.
 
 Unlike the EAM pair style, which retrieves the atomic mass from the
@@ -70,10 +72,10 @@ potential file, the spline-based MEAM potentials do not include mass
 information; thus you need to use the :doc:`mass <mass>` command to
 specify it.
 
-Only a single pair\_coeff command is used with the *meam/spline* style
+Only a single pair_coeff command is used with the *meam/spline* style
 which specifies a potential file with parameters for all needed
 elements.  These are mapped to LAMMPS atom types by specifying N
-additional arguments after the filename in the pair\_coeff command,
+additional arguments after the filename in the pair_coeff command,
 where N is the number of LAMMPS atom types:
 
 * filename
@@ -84,13 +86,12 @@ to specify the path for the potential file.
 
 As an example, imagine the Ti.meam.spline file has values for Ti (old style).  If
 your LAMMPS simulation has 3 atoms types and they are all to be
-treated with this potentials, you would use the following pair\_coeff
+treated with this potentials, you would use the following pair_coeff
 command:
 
+.. code-block:: LAMMPS
 
-.. parsed-literal::
-
-   pair_coeff \* \* Ti.meam.spline Ti Ti Ti
+   pair_coeff * * Ti.meam.spline Ti Ti Ti
 
 The 1st 2 arguments must be \* \* so as to span all LAMMPS atom types.
 The three Ti arguments map LAMMPS atom types 1,2,3 to the Ti element
@@ -104,10 +105,9 @@ on the command line to that single type.
 An example with a two component spline (new style) is TiO.meam.spline, where
 the command
 
+.. code-block:: LAMMPS
 
-.. parsed-literal::
-
-   pair_coeff \* \* TiO.meam.spline Ti O
+   pair_coeff * * TiO.meam.spline Ti O
 
 will map the 1st atom type to Ti and the second atom type to O. Note
 in this case that the species names need to match exactly with the
@@ -115,10 +115,8 @@ names of the elements in the TiO.meam.spline file; otherwise an
 error will be raised. This behavior is different than the old style
 MEAM files.
 
-
 ----------
 
-
 Styles with a *gpu*\ , *intel*\ , *kk*\ , *omp*\ , or *opt* suffix are
 functionally the same as the corresponding style without the suffix.
 They have been optimized to run faster, depending on your available
@@ -137,31 +135,26 @@ by including their suffix, or you can use the :doc:`-suffix command-line switch
 See the :doc:`Speed packages <Speed_packages>` doc page for more
 instructions on how to use the accelerated styles effectively.
 
-
 ----------
 
-
 **Mixing, shift, table, tail correction, restart, rRESPA info**\ :
 
 This pair style does not support the :doc:`pair_modify <pair_modify>`
 shift, table, and tail options.
 
 The *meam/spline* pair style does not write its information to :doc:`binary restart files <restart>`, since it is stored in an external
-potential parameter file.  Thus, you need to re-specify the pair\_style
-and pair\_coeff commands in an input script that reads a restart file.
+potential parameter file.  Thus, you need to re-specify the pair_style
+and pair_coeff commands in an input script that reads a restart file.
 
 The *meam/spline* pair style can only be used via the *pair* keyword of the
 :doc:`run_style respa <run_style>` command.  They do not support the
 *inner*\ , *middle*\ , *outer* keywords.
 
-
 ----------
 
-
 Restrictions
 """"""""""""
 
-
 This pair style requires the :doc:`newton <newton>` setting to be "on"
 for pair interactions.
 
@@ -176,25 +169,14 @@ Related commands
 
 **Default:** none
 
-
 ----------
 
-
 .. _Lenosky1:
 
-
-
 **(Lenosky)** Lenosky, Sadigh, Alonso, Bulatov, de la Rubia, Kim, Voter,
 Kress, Modelling Simulation Materials Science Engineering, 8, 825
 (2000).
 
 .. _Zhang4:
 
-
-
 **(Zhang)** Zhang and Trinkle, Computational Materials Science, 124, 204-210 (2016).
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/pair_meam_sw_spline.rst b/doc/src/pair_meam_sw_spline.rst
index 847ce797a1..0cf4c57975 100644
--- a/doc/src/pair_meam_sw_spline.rst
+++ b/doc/src/pair_meam_sw_spline.rst
@@ -1,25 +1,23 @@
-.. index:: pair\_style meam/sw/spline
+.. index:: pair_style meam/sw/spline
 
-pair\_style meam/sw/spline command
-==================================
+pair_style meam/sw/spline command
+=================================
 
 Syntax
 """"""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    pair_style meam/sw/spline
 
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    pair_style meam/sw/spline
-   pair_coeff \* \* Ti.meam.sw.spline Ti
-   pair_coeff \* \* Ti.meam.sw.spline Ti Ti Ti
+   pair_coeff * * Ti.meam.sw.spline Ti
+   pair_coeff * * Ti.meam.sw.spline Ti Ti Ti
 
 Description
 """""""""""
@@ -32,12 +30,17 @@ was first proposed by Nicklas, Fellinger, and Park
 :ref:`(Nicklas) <Nicklas>`.  We refer to it as MEAM+SW.  The total energy E
 is given by
 
-.. image:: Eqs/pair_meam_sw_spline.jpg
-   :align: center
+.. math::
 
-where rho\_I is the density at atom I, theta\_JIK is the angle between
-atoms J, I, and K centered on atom I. The seven functions
-Phi, F, G, U, rho, f, and g are represented by cubic splines.
+   E & = E_{MEAM} + E_{SW} \\
+   E_{MEAM} & =  \sum _{IJ} \phi (r_{IJ}) + \sum _{I} U(\rho _I) \\
+   E_{SW} & =  \sum _{I} \sum _{JK} F(r_{IJ}) \, F(r_{IK}) \, G(\cos(\theta _{JIK})) \\
+   \rho _I & = \sum _J \rho(r_{IJ}) + \sum _{JK} f(r_{IJ}) \, f(r_{IK}) \, g(\cos(\theta _{JIK}))
+
+where :math:`\rho_I` is the density at atom I, :math:`\theta_{JIK}` is
+the angle between atoms J, I, and K centered on atom I. The seven
+functions :math:`\phi, F, G, U, \rho, f,` and *g* are represented by
+cubic splines.
 
 The cutoffs and the coefficients for these spline functions are listed
 in a parameter file which is specified by the
@@ -47,7 +50,7 @@ distribution and have a ".meam.sw.spline" file suffix.  All of these
 files are parameterized in terms of LAMMPS :doc:`metal units <units>`.
 
 Note that unlike for other potentials, cutoffs for spline-based
-MEAM+SW potentials are not set in the pair\_style or pair\_coeff
+MEAM+SW potentials are not set in the pair_style or pair_coeff
 command; they are specified in the potential files themselves.
 
 Unlike the EAM pair style, which retrieves the atomic mass from the
@@ -55,10 +58,10 @@ potential file, the spline-based MEAM+SW potentials do not include
 mass information; thus you need to use the :doc:`mass <mass>` command to
 specify it.
 
-Only a single pair\_coeff command is used with the meam/sw/spline style
+Only a single pair_coeff command is used with the meam/sw/spline style
 which specifies a potential file with parameters for all needed
 elements.  These are mapped to LAMMPS atom types by specifying N
-additional arguments after the filename in the pair\_coeff command,
+additional arguments after the filename in the pair_coeff command,
 where N is the number of LAMMPS atom types:
 
 * filename
@@ -69,10 +72,12 @@ to specify the path for the potential file.
 
 As an example, imagine the Ti.meam.sw.spline file has values for Ti.
 If your LAMMPS simulation has 3 atoms types and they are all to be
-treated with this potential, you would use the following pair\_coeff
+treated with this potential, you would use the following pair_coeff
 command:
 
-pair\_coeff \* \* Ti.meam.sw.spline Ti Ti Ti
+.. code-block:: LAMMPS
+
+   pair_coeff * * Ti.meam.sw.spline Ti Ti Ti
 
 The 1st 2 arguments must be \* \* so as to span all LAMMPS atom types.
 The three Ti arguments map LAMMPS atom types 1,2,3 to the Ti element
@@ -89,12 +94,10 @@ potentials.
    systems in the future.
 
 Example input scripts that use this pair style are provided
-in the examples/USER/misc/meam\_sw\_spline directory.
-
+in the examples/USER/misc/meam_sw_spline directory.
 
 ----------
 
-
 **Mixing, shift, table, tail correction, restart, rRESPA info**\ :
 
 The pair style does not support multiple element types or mixing.
@@ -105,21 +108,18 @@ shift, table, and tail options.
 
 The *meam/sw/spline* pair style does not write its information to
 :doc:`binary restart files <restart>`, since it is stored in an external
-potential parameter file.  Thus, you need to re-specify the pair\_style
-and pair\_coeff commands in an input script that reads a restart file.
+potential parameter file.  Thus, you need to re-specify the pair_style
+and pair_coeff commands in an input script that reads a restart file.
 
 The *meam/sw/spline* pair style can only be used via the *pair*
 keyword of the :doc:`run_style respa <run_style>` command.  They do not
 support the *inner*\ , *middle*\ , *outer* keywords.
 
-
 ----------
 
-
 Restrictions
 """"""""""""
 
-
 This pair style requires the :doc:`newton <newton>` setting to be "on"
 for pair interactions.
 
@@ -135,33 +135,20 @@ Related commands
 
 **Default:** none
 
-
 ----------
 
-
 .. _Lenosky2:
 
-
-
 **(Lenosky)** Lenosky, Sadigh, Alonso, Bulatov, de la Rubia, Kim, Voter,
 Kress, Modell. Simul. Mater. Sci. Eng. 8, 825 (2000).
 
 .. _Stillinger1:
 
-
-
 **(Stillinger)** Stillinger, Weber, Phys. Rev. B 31, 5262 (1985).
 
 .. _Nicklas:
 
-
-
 **(Nicklas)**
 The spline-based MEAM+SW format was first devised and used to develop
 potentials for bcc transition metals by Jeremy Nicklas, Michael Fellinger,
 and Hyoungki Park at The Ohio State University.
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/pair_meamc.rst b/doc/src/pair_meamc.rst
index 0240e683da..f227af8b45 100644
--- a/doc/src/pair_meamc.rst
+++ b/doc/src/pair_meamc.rst
@@ -1,27 +1,23 @@
-.. index:: pair\_style meam/c
+.. index:: pair_style meam/c
 
-pair\_style meam/c command
-==========================
+pair_style meam/c command
+=========================
 
 Syntax
 """"""
 
+.. code-block:: LAMMPS
 
-.. parsed-literal::
-
-   pair_style style
-
-style = *meam/c*
+   pair_style meam/c
 
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    pair_style meam/c
-   pair_coeff \* \* ../potentials/library.meam Si ../potentials/si.meam Si
-   pair_coeff \* \* ../potentials/library.meam Ni Al NULL Ni Al Ni Ni
+   pair_coeff * * ../potentials/library.meam Si ../potentials/si.meam Si
+   pair_coeff * * ../potentials/library.meam Ni Al NULL Ni Al Ni Ni
 
 Description
 """""""""""
@@ -29,7 +25,7 @@ Description
 .. note::
 
    The behavior of the MEAM potential for alloy systems has changed
-   as of November 2010; see description below of the mixture\_ref\_t
+   as of November 2010; see description below of the mixture_ref_t
    parameter
 
 Style *meam/c* computes pairwise interactions for a variety of materials
@@ -46,15 +42,17 @@ the 12 December 2018 release.
 In the MEAM formulation, the total energy E of a system of atoms is
 given by:
 
-.. image:: Eqs/pair_meam.jpg
-   :align: center
+.. math::
 
-where F is the embedding energy which is a function of the atomic
-electron density rho, and phi is a pair potential interaction.  The
-pair interaction is summed over all neighbors J of atom I within the
-cutoff distance.  As with EAM, the multi-body nature of the MEAM
-potential is a result of the embedding energy term.  Details of the
-computation of the embedding and pair energies, as implemented in
+   E = \sum_i \left\{ F_i(\bar{\rho}_i)
+       + \frac{1}{2} \sum_{i \neq j} \phi_{ij} (r_{ij}) \right\}
+
+where *F* is the embedding energy which is a function of the atomic
+electron density :math:`\rho`, and :math:`\phi` is a pair potential
+interaction.  The pair interaction is summed over all neighbors J of
+atom I within the cutoff distance.  As with EAM, the multi-body nature
+of the MEAM potential is a result of the embedding energy term.  Details
+of the computation of the embedding and pair energies, as implemented in
 LAMMPS, are given in :ref:`(Gullet) <Gullet>` and references therein.
 
 The various parameters in the MEAM formulas are listed in two files
@@ -67,13 +65,13 @@ distribution with a ".meam" suffix.  All of these are parameterized in
 terms of LAMMPS :doc:`metal units <units>`.
 
 Note that unlike for other potentials, cutoffs for MEAM potentials are
-not set in the pair\_style or pair\_coeff command; they are specified in
+not set in the pair_style or pair_coeff command; they are specified in
 the MEAM potential files themselves.
 
-Only a single pair\_coeff command is used with the *meam* style which
+Only a single pair_coeff command is used with the *meam* style which
 specifies two MEAM files and the element(s) to extract information
 for.  The MEAM elements are mapped to LAMMPS atom types by specifying
-N additional arguments after the 2nd filename in the pair\_coeff
+N additional arguments after the 2nd filename in the pair_coeff
 command, where N is the number of LAMMPS atom types:
 
 * MEAM library file
@@ -88,20 +86,20 @@ As an example, the potentials/library.meam file has generic MEAM
 settings for a variety of elements.  The potentials/SiC.meam file has
 specific parameter settings for a Si and C alloy system.  If your
 LAMMPS simulation has 4 atoms types and you want the 1st 3 to be Si,
-and the 4th to be C, you would use the following pair\_coeff command:
+and the 4th to be C, you would use the following pair_coeff command:
 
+.. code-block:: LAMMPS
 
-.. parsed-literal::
-
-   pair_coeff \* \* library.meam Si C sic.meam Si Si Si C
+   pair_coeff * * library.meam Si C sic.meam Si Si Si C
 
 The 1st 2 arguments must be \* \* so as to span all LAMMPS atom types.
-The two filenames are for the library and parameter file respectively.
-The Si and C arguments (between the file names) are the two elements
-for which info will be extracted from the library file.  The first
-three trailing Si arguments map LAMMPS atom types 1,2,3 to the MEAM Si
-element.  The final C argument maps LAMMPS atom type 4 to the MEAM C
-element.
+The first filename is the element library file. The list of elements following
+it extracts lines from the library file and assigns numeric indices to these
+elements. The second filename is the alloy parameter file, which refers to
+elements using the numeric indices assigned before.
+The arguments after the parameter file map LAMMPS atom types to elements, i.e.
+LAMMPS atom types 1,2,3 to the MEAM Si element.  The final C argument maps
+LAMMPS atom type 4 to the MEAM C element.
 
 If the 2nd filename is specified as NULL, no parameter file is read,
 which simply means the generic parameters in the library file are
@@ -122,7 +120,7 @@ that will be used with other potentials.
    filenames can appear in any order, e.g. "Si C" or "C Si" in the
    example above.  However, if the 2nd filename is not NULL (as in the
    example above), it contains settings that are Fortran-indexed for the
-   elements that preceed it.  Thus you need to insure you list the
+   elements that precede it.  Thus you need to insure you list the
    elements between the filenames in an order consistent with how the
    values in the 2nd filename are indexed.  See details below on the
    syntax for settings in the 2nd file.
@@ -141,15 +139,14 @@ Cu and lat = dia or fcc.  Because the library file is used by Fortran
 MD codes, these strings may be enclosed in single quotes, but this is
 not required.  The other numeric parameters match values in the
 formulas above.  The value of the "elt" string is what is used in the
-pair\_coeff command to identify which settings from the library file
+pair_coeff command to identify which settings from the library file
 you wish to read in.  There can be multiple entries in the library
-file with the same "elt" value; LAMMPS reads the 1st matching entry it
+file with the same "elt" value; LAMMPS reads the first matching entry it
 finds and ignores the rest.
 
 Other parameters in the MEAM library file correspond to single-element
 potential parameters:
 
-
 .. parsed-literal::
 
    lat      = lattice structure of reference configuration
@@ -170,7 +167,6 @@ is typically 1.0 for single-element systems.  The ibar parameter
 selects the form of the function G(Gamma) used to compute the electron
 density; options are
 
-
 .. parsed-literal::
 
       0 => G = sqrt(1+Gamma)
@@ -188,7 +184,6 @@ blank and comment lines (start with #) which can appear anywhere, each
 line has one of the following forms.  Each line can also have a
 trailing comment (starting with #) which is ignored.
 
-
 .. parsed-literal::
 
    keyword = value
@@ -198,23 +193,16 @@ trailing comment (starting with #) which is ignored.
 
 The indices I, J, K correspond to the elements selected from the
 MEAM library file numbered in the order of how those elements were
-selected starting from 1. Thus for the example given below
+selected starting from 1. Thus for the example given before
 
+.. code-block:: LAMMPS
 
-.. parsed-literal::
-
-   pair_coeff \* \* library.meam Si C sic.meam Si Si Si C
+   pair_coeff * * library.meam Si C sic.meam Si Si Si C
 
 an index of 1 would refer to Si and an index of 2 to C.
 
 The recognized keywords for the parameter file are as follows:
 
-Ec, alpha, rho0, delta, lattce, attrac, repuls, nn2, Cmin, Cmax, rc, delr,
-augt1, gsmooth\_factor, re
-
-where
-
-
 .. parsed-literal::
 
    rc          = cutoff radius for cutoff function; default = 4.0
@@ -238,7 +226,7 @@ where
                    hcp = hexagonal close-packed
                    dim = dimer
                    dia = diamond (interlaced fcc for alloy)
-                   dia3= diamond structure with primary 1NN and secondary 3NN interation
+                   dia3= diamond structure with primary 1NN and secondary 3NN interaction
                    b1  = rock salt (NaCl structure)
                    c11 = MoSi2 structure
                    l12 = Cu3Au structure (lower case L, followed by 12)
@@ -306,7 +294,6 @@ where N is the number of MEAM elements being used.
 
 Thus these lines
 
-
 .. parsed-literal::
 
    rho0(2) = 2.25
@@ -329,25 +316,24 @@ automatically.  When parameter values are fit using the modified
 density function, as in more recent literature, augt1 should be set to
 0.
 
-The mixture\_ref\_t parameter is available to match results with those
+The mixture_ref_t parameter is available to match results with those
 of previous versions of lammps (before January 2011).  Newer versions
 of lammps, by default, use the single-element values of the t
 parameters to compute the background reference density.  This is the
 proper way to compute these parameters.  Earlier versions of lammps
 used an alloy mixture averaged value of t to compute the background
-reference density.  Setting mixture\_ref\_t=1 gives the old behavior.
-WARNING: using mixture\_ref\_t=1 will give results that are demonstrably
+reference density.  Setting mixture_ref_t=1 gives the old behavior.
+WARNING: using mixture_ref_t=1 will give results that are demonstrably
 incorrect for second-neighbor MEAM, and non-standard for
 first-neighbor MEAM; this option is included only for matching with
 previous versions of lammps and should be avoided if possible.
 
 The parameters attrac and repuls, along with the integer selection
-parameter erose\_form, can be used to modify the Rose energy function
+parameter erose_form, can be used to modify the Rose energy function
 used to compute the pair potential.  This function gives the energy of
 the reference state as a function of interatomic spacing.  The form of
 this function is:
 
-
 .. parsed-literal::
 
    astar = alpha \* (r/re - 1.d0)
@@ -367,40 +353,35 @@ recent published MEAM parameter sets, such as :ref:`(Valone) <Valone>`
    in March 2009.  The current version is correct, but may show different
    behavior compared with earlier versions of lammps with the attrac
    and/or repuls parameters are non-zero.  To obtain the previous default
-   form, use erose\_form = 1 (this form does not seem to appear in the
+   form, use erose_form = 1 (this form does not seem to appear in the
    literature).  An alternative form (see e.g. :ref:`(Lee2) <Lee2>`) is
-   available using erose\_form = 2.
-
+   available using erose_form = 2.
 
 ----------
 
-
 **Mixing, shift, table, tail correction, restart, rRESPA info**\ :
 
 For atom type pairs I,J and I != J, where types I and J correspond to
 two different element types, mixing is performed by LAMMPS with
 user-specifiable parameters as described above.  You never need to
-specify a pair\_coeff command with I != J arguments for this style.
+specify a pair_coeff command with I != J arguments for this style.
 
 This pair style does not support the :doc:`pair_modify <pair_modify>`
 shift, table, and tail options.
 
 This pair style does not write its information to :doc:`binary restart files <restart>`, since it is stored in potential files.  Thus, you
-need to re-specify the pair\_style and pair\_coeff commands in an input
+need to re-specify the pair_style and pair_coeff commands in an input
 script that reads a restart file.
 
 This pair style can only be used via the *pair* keyword of the
 :doc:`run_style respa <run_style>` command.  It does not support the
 *inner*\ , *middle*\ , *outer* keywords.
 
-
 ----------
 
-
 Restrictions
 """"""""""""
 
-
 The *meam/c* style is provided in the USER-MEAMC package. It is
 only enabled if LAMMPS was built with that package.
 See the :doc:`Build package <Build_package>` doc page for more info.
@@ -420,59 +401,36 @@ Related commands
 
 **Default:** none
 
-
 ----------
 
-
 .. _Baskes:
 
-
-
 **(Baskes)** Baskes, Phys Rev B, 46, 2727-2742 (1992).
 
 .. _Gullet:
 
-
-
 **(Gullet)** Gullet, Wagner, Slepoy, SANDIA Report 2003-8782 (2003).
 This report may be accessed on-line via `this link <sandreport_>`_.
 
-.. _sandreport: http://infoserve.sandia.gov/sand\_doc/2003/038782.pdf
-
-
+.. _sandreport: http://infoserve.sandia.gov/sand_doc/2003/038782.pdf
 
 .. _Lee:
 
-
-
 **(Lee)** Lee, Baskes, Phys. Rev. B, 62, 8564-8567 (2000).
 
 .. _Lee2:
 
-
-
 **(Lee2)** Lee, Baskes, Kim, Cho.  Phys. Rev. B, 64, 184102 (2001).
 
 .. _Valone:
 
-
-
 **(Valone)** Valone, Baskes, Martin, Phys. Rev. B, 73, 214209 (2006).
 
 .. _Wang2:
 
-
-
 **(Wang)** Wang, Van Hove, Ross, Baskes, J. Chem. Phys., 121, 5410 (2004).
 
 .. _ZBL:
 
-
-
 **(ZBL)** J.F. Ziegler, J.P. Biersack, U. Littmark, "Stopping and Ranges
 of Ions in Matter", Vol 1, 1985, Pergamon Press.
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/pair_meso.rst b/doc/src/pair_meso.rst
deleted file mode 100644
index d645c4ab03..0000000000
--- a/doc/src/pair_meso.rst
+++ /dev/null
@@ -1,337 +0,0 @@
-.. index:: pair\_style edpd
-
-pair\_style edpd command
-========================
-
-pair\_style mdpd command
-========================
-
-pair\_style mdpd/rhosum command
-===============================
-
-pair\_style tdpd command
-========================
-
-Syntax
-""""""
-
-
-.. parsed-literal::
-
-   pair_style style args
-
-* style = *edpd* or *mdpd* or *mdpd/rhosum* or *tdpd*
-* args = list of arguments for a particular style
-  
-  .. parsed-literal::
-  
-       *edpd* args = cutoff seed
-         cutoff = global cutoff for eDPD interactions (distance units)
-         seed = random # seed (integer) (if <= 0, eDPD will use current time as the seed)
-       *mdpd* args = T cutoff seed
-         T = temperature (temperature units)
-         cutoff = global cutoff for mDPD interactions (distance units)
-         seed = random # seed (integer) (if <= 0, mDPD will use current time as the seed)
-       *mdpd/rhosum* args =
-       *tdpd* args = T cutoff seed
-         T = temperature (temperature units)
-         cutoff = global cutoff for tDPD interactions (distance units)
-         seed = random # seed (integer) (if <= 0, tDPD will use current time as the seed)
-
-
-
-Examples
-""""""""
-
-
-.. parsed-literal::
-
-   pair_style edpd 1.58 9872598
-   pair_coeff \* \* 18.75 4.5 0.41 1.58 1.42E-5 2.0 1.58
-   pair_coeff 1 1 18.75 4.5 0.41 1.58 1.42E-5 2.0 1.58 power 10.54 -3.66 3.44 -4.10
-   pair_coeff 1 1 18.75 4.5 0.41 1.58 1.42E-5 2.0 1.58 power 10.54 -3.66 3.44 -4.10 kappa -0.44 -3.21 5.04 0.00
-
-   pair_style hybrid/overlay mdpd/rhosum mdpd 1.0 1.0 65689
-   pair_coeff 1 1 mdpd/rhosum  0.75
-   pair_coeff 1 1 mdpd -40.0 25.0 18.0 1.0 0.75
-
-   pair_style tdpd 1.0 1.58 935662
-   pair_coeff \* \* 18.75 4.5 0.41 1.58 1.58 1.0 1.0E-5 2.0
-   pair_coeff 1 1 18.75 4.5 0.41 1.58 1.58 1.0 1.0E-5 2.0 3.0 1.0E-5 2.0
-
-Description
-"""""""""""
-
-The *edpd* style computes the pairwise interactions and heat fluxes
-for eDPD particles following the formulations in
-:ref:`(Li2014\_JCP) <Li2014_JCP>` and :ref:`Li2015\_CC <Li2015_CC>`. The time
-evolution of an eDPD particle is governed by the conservation of
-momentum and energy given by
-
-.. image:: Eqs/pair_edpd_gov.jpg
-   :align: center
-
-where the three components of <font size="4">F<sub>i</sub></font>
-including the conservative force <font
-size="4">F<sub>ij</sub><sup>C</sup></font>, dissipative force <font
-size="4">F<sub>ij</sub><sup>D</sup></font> and random force <font
-size="4">F<sub>ij</sub><sup>R</sup></font> are expressed as
-
-.. image:: Eqs/pair_edpd_force.jpg
-   :align: center
-
-in which the exponent of the weighting function <font
-size="4"><i>s</i></font> can be defined as a temperature-dependent
-variable. The heat flux between particles accounting for the
-collisional heat flux <font size="4">q<sup>C</sup></font>, viscous
-heat flux <font size="4">q<sup>V</sup></font>, and random heat flux
-<font size="4">q<sup>R</sup></font> are given by
-
-.. image:: Eqs/pair_edpd_heat.jpg
-   :align: center
-
-where the mesoscopic heat friction <font size="4">&kappa;</font> is given by
-
-.. image:: Eqs/pair_edpd_kappa.jpg
-   :align: center
-
-with <font size="4">&upsilon;</font> being the kinematic
-viscosity. For more details, see Eq.(15) in :ref:`(Li2014\_JCP) <Li2014_JCP>`.
-
-The following coefficients must be defined in eDPD system for each
-pair of atom types via the :doc:`pair_coeff <pair_coeff>` command as in
-the examples above.
-
-* A (force units)
-* gamma (force/velocity units)
-* power\_f (positive real)
-* cutoff (distance units)
-* kappa (thermal conductivity units)
-* power\_T (positive real)
-* cutoff\_T (distance units)
-* optional keyword = power or kappa
-
-The keyword *power* or *kappa* is optional. Both "power" and "kappa"
-require 4 parameters <font size="4">c<sub>1</sub>, c<sub>2</sub>,
-c<sub>4</sub>, c<sub>4</sub></font> showing the temperature dependence
-of the exponent <center><font size="4"> <i>s</i>(<i>T</i>) =
-power\_f\*(1+c<sub>1</sub>\*(T-1)+c<sub>2</sub>\*(T-1)<sup>2</sup>
-+c<sub>3</sub>\*(T-1)<sup>3</sup>+c<sub>4</sub>\*(T-1)<sup>4</sup>)</font></center>
-and of the mesoscopic heat friction <center><font size="4">
-<i>s<sub>T</sub>(T)</i> =
-kappa\*(1+c<sub>1</sub>\*(T-1)+c<sub>2</sub>\*(T-1)<sup>2</sup>
-+c<sub>3</sub>\*(T-1)<sup>3</sup>+c<sub>4</sub>\*(T-1)<sup>4</sup>)</font></center>
-If the keyword *power* or *kappa* is not specified, the eDPD system
-will use constant power\_f and kappa, which is independent to
-temperature changes.
-
-
-----------
-
-
-The *mdpd/rhosum* style computes the local particle mass density rho
-for mDPD particles by kernel function interpolation.
-
-The following coefficients must be defined for each pair of atom types
-via the :doc:`pair_coeff <pair_coeff>` command as in the examples above.
-
-* cutoff (distance units)
-
-
-----------
-
-
-The *mdpd* style computes the many-body interactions between mDPD
-particles following the formulations in
-:ref:`(Li2013\_POF) <Li2013_POF>`. The dissipative and random forces are in
-the form same as the classical DPD, but the conservative force is
-local density dependent, which are given by
-
-.. image:: Eqs/pair_mdpd_force.jpg
-   :align: center
-
-where the first term in <font size="4">F<sup>C</sup></font> with a
-negative coefficient A < 0 stands for an attractive force within an
-interaction range <font size="4">r<sub>c</sub></font>, and the second
-term with B > 0 is the density-dependent repulsive force within an
-interaction range <font size="4">r<sub>d</sub></font>.
-
-The following coefficients must be defined for each pair of atom types via the
-:doc:`pair_coeff <pair_coeff>` command as in the examples above.
-
-* A (force units)
-* B (force units)
-* gamma (force/velocity units)
-* cutoff\_c (distance units)
-* cutoff\_d (distance units)
-
-
-----------
-
-
-The *tdpd* style computes the pairwise interactions and chemical
-concentration fluxes for tDPD particles following the formulations in
-:ref:`(Li2015\_JCP) <Li2015_JCP>`.  The time evolution of a tDPD particle is
-governed by the conservation of momentum and concentration given by
-
-.. image:: Eqs/pair_tdpd_gov.jpg
-   :align: center
-
-where the three components of <font size="4">F<sub>i</sub></font>
-including the conservative force <font
-size="4">F<sub>ij</sub><sup>C</sup></font>, dissipative force <font
-size="4">F<sub>ij</sub><sup>D</sup></font> and random force <font
-size="4">F<sub>ij</sub><sup>R</sup></font> are expressed as
-
-.. image:: Eqs/pair_tdpd_force.jpg
-   :align: center
-
-The concentration flux between two tDPD particles includes the Fickian
-flux <font size="4">Q<sub>ij</sub><sup>D</sup></font> and random flux
-<font size="4">Q<sub>ij</sub><sup>R</sup></font>, which are given by
-
-.. image:: Eqs/pair_tdpd_flux.jpg
-   :align: center
-
-where the parameters kappa and epsilon determine the strength of the
-Fickian and random fluxes. <font size="4"><i>m</i><sub>s</sub></font>
-is the mass of a single solute molecule.  In general, <font
-size="4"><i>m</i><sub>s</sub></font> is much smaller than the mass of
-a tDPD particle <font size="4"><i>m</i></font>. For more details, see
-:ref:`(Li2015\_JCP) <Li2015_JCP>`.
-
-The following coefficients must be defined for each pair of atom types via the
-:doc:`pair_coeff <pair_coeff>` command as in the examples above.
-
-* A (force units)
-* gamma (force/velocity units)
-* power\_f (positive real)
-* cutoff (distance units)
-* cutoff\_CC (distance units)
-* kappa\_i (diffusivity units)
-* epsilon\_i (diffusivity units)
-* power\_cc\_i (positive real)
-
-The last 3 values must be repeated Nspecies times, so that values for
-each of the Nspecies chemical species are specified, as indicated by
-the "I" suffix.  In the first pair\_coeff example above for pair\_style
-tdpd, Nspecies = 1.  In the second example, Nspecies = 2, so 3
-additional coeffs are specified (for species 2).
-
-
-----------
-
-
-**Example scripts**
-
-There are example scripts for using all these pair styles in
-examples/USER/meso.  The example for an eDPD simulation models heat
-conduction with source terms analog of periodic Poiseuille flow
-problem. The setup follows Fig.12 in :ref:`(Li2014\_JCP) <Li2014_JCP>`. The
-output of the short eDPD simulation (about 2 minutes on a single core)
-gives a temperature and density profiles as
-
-.. image:: JPG/examples_edpd.jpg
-   :align: center
-
-The example for a mDPD simulation models the oscillations of a liquid
-droplet started from a liquid film. The mDPD parameters are adopted
-from :ref:`(Li2013\_POF) <Li2013_POF>`.  The short mDPD run (about 2 minutes
-on a single core) generates a particle trajectory which can
-be visualized as follows.
-
-.. image:: JPG/examples_mdpd_first.jpg
-   :target: JPG/examples_mdpd.gif
-   :align: center
-
-.. image:: JPG/examples_mdpd_last.jpg
-   :align: center
-
-The first image is the initial state of the simulation.  If you
-click it a GIF movie should play in your browser.  The second image
-is the final state of the simulation.
-
-The example for a tDPD simulation computes the effective diffusion
-coefficient of a tDPD system using a method analogous to the periodic
-Poiseuille flow.  The tDPD system is specified with two chemical
-species, and the setup follows Fig.1 in
-:ref:`(Li2015\_JCP) <Li2015_JCP>`. The output of the short tDPD simulation
-(about one and a half minutes on a single core) gives the
-concentration profiles of the two chemical species as
-
-.. image:: JPG/examples_tdpd.jpg
-   :align: center
-
-
-----------
-
-
-**Mixing, shift, table, tail correction, restart, rRESPA info**\ :
-
-The styles *edpd*\ , *mdpd*\ , *mdpd/rhosum* and *tdpd* do not support
-mixing. Thus, coefficients for all I,J pairs must be specified explicitly.
-
-The styles *edpd*\ , *mdpd*\ , *mdpd/rhosum* and *tdpd* do not support
-the :doc:`pair_modify <pair_modify>` shift, table, and tail options.
-
-The styles *edpd*\ , *mdpd*\ , *mdpd/rhosum* and *tdpd* do not write
-information to :doc:`binary restart files <restart>`. Thus, you need
-to re-specify the pair\_style and pair\_coeff commands in an input script
-that reads a restart file.
-
-Restrictions
-""""""""""""
-
-
-The pair styles *edpd*\ , *mdpd*\ , *mdpd/rhosum* and *tdpd* are part of
-the USER-MESO package. It is only enabled if LAMMPS was built with
-that package.  See the :doc:`Build package <Build_package>` doc page for
-more info.
-
-Related commands
-""""""""""""""""
-
-:doc:`pair_coeff <pair_coeff>`, :doc:`fix mvv/dpd <fix_mvv_dpd>`,
-:doc:`fix mvv/edpd <fix_mvv_dpd>`, :doc:`fix mvv/tdpd <fix_mvv_dpd>`,
-:doc:`fix edpd/source <fix_dpd_source>`, :doc:`fix tdpd/source <fix_dpd_source>`,
-:doc:`compute edpd/temp/atom <compute_edpd_temp_atom>`,
-:doc:`compute tdpd/cc/atom <compute_tdpd_cc_atom>`
-
-**Default:** none
-
-
-----------
-
-
-.. _Li2014\_JCP:
-
-
-
-**(Li2014\_JCP)** Li, Tang, Lei, Caswell, Karniadakis, J Comput Phys,
-265: 113-127 (2014).  DOI: 10.1016/j.jcp.2014.02.003.
-
-.. _Li2015\_CC:
-
-
-
-**(Li2015\_CC)** Li, Tang, Li, Karniadakis, Chem Commun, 51: 11038-11040
-(2015).  DOI: 10.1039/C5CC01684C.
-
-.. _Li2013\_POF:
-
-
-
-**(Li2013\_POF)** Li, Hu, Wang, Ma, Zhou, Phys Fluids, 25: 072103 (2013).
-DOI: 10.1063/1.4812366.
-
-.. _Li2015\_JCP:
-
-
-
-**(Li2015\_JCP)** Li, Yazdani, Tartakovsky, Karniadakis, J Chem Phys,
-143: 014101 (2015).  DOI: 10.1063/1.4923254.
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/pair_mesocnt.rst b/doc/src/pair_mesocnt.rst
index 566a6125c1..6d9ba79a31 100644
--- a/doc/src/pair_mesocnt.rst
+++ b/doc/src/pair_mesocnt.rst
@@ -1,24 +1,22 @@
-.. index:: pair\_style mesocnt
+.. index:: pair_style mesocnt
 
-pair\_style mesocnt command
-===========================
+pair_style mesocnt command
+==========================
 
 Syntax
 """"""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    pair_style mesocnt
 
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    pair_style mesocnt
-   pair_coeff \* \* 10_10.cnt
+   pair_coeff * * 10_10.cnt
 
 Description
 """""""""""
@@ -46,17 +44,17 @@ potential.
 In LAMMPS, cylindrical segments are represented by bonds. Each
 segment is defined by its two end points ("nodes") which correspond
 to atoms in LAMMPS. For the exact functional form of the potential
-and implementation details, the reader is referred to the 
-original papers :ref:`(Volkov1) <Volkov1>` and 
+and implementation details, the reader is referred to the
+original papers :ref:`(Volkov1) <Volkov1>` and
 :ref:`(Volkov2) <Volkov2>`.
 
-The potential requires tabulated data provided in a single ASCII 
-text file specified in the :doc:`pair_coeff <pair_coeff>` command. 
+The potential requires tabulated data provided in a single ASCII
+text file specified in the :doc:`pair_coeff <pair_coeff>` command.
 The first line of the file provides a time stamp and
 general information. The second line lists four integers giving
 the number of data points provided in the subsequent four
-data tables. The third line lists four floating point numbers: 
-the CNT radius R, the LJ parameter sigma and two numerical 
+data tables. The third line lists four floating point numbers:
+the CNT radius R, the LJ parameter sigma and two numerical
 parameters delta1 and delta2. These four parameters are given
 in Angstroms. This is followed by four data tables each separated
 by a single empty line. The first two tables have two columns
@@ -66,11 +64,11 @@ array and list the parameters Phi and uSemiParallel respectively.
 uInfParallel and uSemiParallel are given in eV/Angstrom, Phi is
 given in eV and Gamma is unitless.
 
-Potential files for CNTs can be readily generated using the freely 
+Potential files for CNTs can be readily generated using the freely
 available code provided on
 
 .. parsed-literal::
-  
+
    https://github.com/phankl/cntpot
 
 Using the same approach, it should also be possible to
@@ -89,7 +87,7 @@ boron nitride nanotubes.
 
    The *mesocnt* style requires CNTs to be represented
    as a chain of atoms connected by bonds. Atoms need
-   to be numbered consecutively within one chain. 
+   to be numbered consecutively within one chain.
    Atoms belonging to different CNTs need to be assigned
    different molecule IDs.
 
@@ -97,10 +95,8 @@ A full summary of the method and LAMMPS implementation details
 is expected to soon become available in Computer Physics
 Communications.
 
-
 ----------
 
-
 **Mixing, shift, table, tail correction, restart, rRESPA info**\ :
 
 This pair style does not support mixing.
@@ -108,23 +104,20 @@ This pair style does not support mixing.
 This pair style does not support the :doc:`pair_modify <pair_modify>`
 shift, table, and tail options.
 
-The *mesocnt* pair style do not write their information to :doc:`binary restart files <restart>`, 
+The *mesocnt* pair style do not write their information to :doc:`binary restart files <restart>`,
 since it is stored in tabulated potential files.
-Thus, you need to re-specify the pair\_style and pair\_coeff commands in
+Thus, you need to re-specify the pair_style and pair_coeff commands in
 an input script that reads a restart file.
 
 This pair style can only be used via the *pair* keyword of the
 :doc:`run_style respa <run_style>` command.  They do not support the
 *inner*\ , *middle*\ , *outer* keywords.
 
-
 ----------
 
-
 Restrictions
 """"""""""""
 
-
 This style is part of the USER-MISC package.  It is only
 enabled if LAMMPS was built with that package.  See the :doc:`Build package <Build_package>` doc page for more info.
 
@@ -138,24 +131,13 @@ Related commands
 
 **Default:** none
 
-
 ----------
 
-
 .. _Volkov1:
 
-
-
 **(Volkov1)** Volkov and Zhigilei, J Phys Chem C, 114, 5513 (2010).
 
 .. _Volkov2:
 
-
-
-**(Volkov2)** Volkov, Simov and Zhigilei, APS Meeting Abstracts, 
+**(Volkov2)** Volkov, Simov and Zhigilei, APS Meeting Abstracts,
 Q31.013 (2008).
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/pair_mesodpd.rst b/doc/src/pair_mesodpd.rst
new file mode 100644
index 0000000000..b2e8507d61
--- /dev/null
+++ b/doc/src/pair_mesodpd.rst
@@ -0,0 +1,328 @@
+.. index:: pair_style edpd
+
+pair_style edpd command
+=======================
+
+pair_style mdpd command
+=======================
+
+pair_style mdpd/rhosum command
+==============================
+
+pair_style tdpd command
+=======================
+
+Syntax
+""""""
+
+.. code-block:: LAMMPS
+
+   pair_style style args
+
+* style = *edpd* or *mdpd* or *mdpd/rhosum* or *tdpd*
+* args = list of arguments for a particular style
+
+  .. parsed-literal::
+
+       *edpd* args = cutoff seed
+         cutoff = global cutoff for eDPD interactions (distance units)
+         seed = random # seed (integer) (if <= 0, eDPD will use current time as the seed)
+       *mdpd* args = T cutoff seed
+         T = temperature (temperature units)
+         cutoff = global cutoff for mDPD interactions (distance units)
+         seed = random # seed (integer) (if <= 0, mDPD will use current time as the seed)
+       *mdpd/rhosum* args =
+       *tdpd* args = T cutoff seed
+         T = temperature (temperature units)
+         cutoff = global cutoff for tDPD interactions (distance units)
+         seed = random # seed (integer) (if <= 0, tDPD will use current time as the seed)
+
+Examples
+""""""""
+
+.. code-block:: LAMMPS
+
+   pair_style edpd 1.58 9872598
+   pair_coeff * * 18.75 4.5 0.41 1.58 1.42E-5 2.0 1.58
+   pair_coeff 1 1 18.75 4.5 0.41 1.58 1.42E-5 2.0 1.58 power 10.54 -3.66 3.44 -4.10
+   pair_coeff 1 1 18.75 4.5 0.41 1.58 1.42E-5 2.0 1.58 power 10.54 -3.66 3.44 -4.10 kappa -0.44 -3.21 5.04 0.00
+
+   pair_style hybrid/overlay mdpd/rhosum mdpd 1.0 1.0 65689
+   pair_coeff 1 1 mdpd/rhosum  0.75
+   pair_coeff 1 1 mdpd -40.0 25.0 18.0 1.0 0.75
+
+   pair_style tdpd 1.0 1.58 935662
+   pair_coeff * * 18.75 4.5 0.41 1.58 1.58 1.0 1.0E-5 2.0
+   pair_coeff 1 1 18.75 4.5 0.41 1.58 1.58 1.0 1.0E-5 2.0 3.0 1.0E-5 2.0
+
+Description
+"""""""""""
+
+The *edpd* style computes the pairwise interactions and heat fluxes
+for eDPD particles following the formulations in
+:ref:`(Li2014_JCP) <Li2014_JCP>` and :ref:`Li2015_CC <Li2015_CC>`. The time
+evolution of an eDPD particle is governed by the conservation of
+momentum and energy given by
+
+.. math::
+
+   \frac{\mathrm{d}^2 \mathbf{r}_i}{\mathrm{d} t^2}=
+   \frac{\mathrm{d} \mathbf{v}_i}{\mathrm{d} t}
+   =\mathbf{F}_{i}=\sum_{i\neq j}(\mathbf{F}_{ij}^{C}+\mathbf{F}_{ij}^{D}+\mathbf{F}_{ij}^{R}) \\
+   C_v\frac{\mathrm{d} T_i}{\mathrm{d} t}= q_{i} = \sum_{i\neq j}(q_{ij}^{C}+q_{ij}^{V}+q_{ij}^{R}),
+
+where the three components of :math:`F_{i}` including the conservative
+force :math:`F_{ij}^C`, dissipative force :math:`F_{ij}^D` and random
+force :math:`F_{ij}^R` are expressed as
+
+.. math::
+
+  \mathbf{F}_{ij}^{C} & = \alpha_{ij}{\omega_{C}}(r_{ij})\mathbf{e}_{ij} \\
+  \mathbf{F}_{ij}^{D} & = -\gamma {\omega_{D}}(r_{ij})(\mathbf{e}_{ij} \cdot \mathbf{v}_{ij})\mathbf{e}_{ij} \\
+  \mathbf{F}_{ij}^{R} & = \sigma {\omega_{R}}(r_{ij}){\xi_{ij}}\Delta t^{-1/2} \mathbf{e}_{ij} \\
+  \omega_{C}(r) & = 1 - r/r_c \\
+  \alpha_{ij} & = A\cdot k_B(T_i + T_j)/2 \\
+  \omega_{D}(r) & = \omega^2_{R}(r) = (1-r/r_c)^s \\
+  \sigma_{ij}^2 & = 4\gamma k_B T_i T_j/(T_i + T_j)
+
+in which the exponent of the weighting function *s* can be defined as a
+temperature-dependent variable. The heat flux between particles
+accounting for the collisional heat flux :math:`q^C`, viscous heat flux
+:math:`q^V`, and random heat flux :math:`q^R` are given by
+
+.. math::
+
+   q_i^C & = \sum_{j \ne i} k_{ij} \omega_{CT}(r_{ij}) \left( \frac{1}{T_i} - \frac{1}{T_j} \right) \\
+   q_i^V & = \frac{1}{2 C_v}\sum_{j \ne i}{ \left\{ \omega_D(r_{ij})\left[\gamma_{ij} \left( \mathbf{e}_{ij} \cdot \mathbf{v}_{ij} \right)^2 - \frac{\left( \sigma _{ij} \right)^2}{m}\right] - \sigma _{ij} \omega_R(r_{ij})\left( \mathbf{e}_{ij} \cdot \mathbf{v}_{ij} \right){\xi_{ij}} \right\} } \\
+   q_i^R & = \sum_{j \ne i} \beta _{ij} \omega_{RT}(r_{ij}) d {t^{ - 1/2}} \xi_{ij}^e \\
+   \omega_{CT}(r) & =\omega_{RT}^2(r)=\left(1-r/r_{ct}\right)^{s_T} \\
+   k_{ij} & =C_v^2\kappa(T_i + T_j)^2/4k_B \\
+   \beta_{ij}^2 & = 2k_Bk_{ij}
+
+where the mesoscopic heat friction :math:`\kappa` is given by
+
+.. math::
+
+  \kappa  = \frac{315k_B\upsilon }{2\pi \rho C_v r_{ct}^5}\frac{1}{Pr},
+
+with :math:`\upsilon` being the kinematic viscosity. For more details,
+see Eq.(15) in :ref:`(Li2014_JCP) <Li2014_JCP>`.
+
+The following coefficients must be defined in eDPD system for each
+pair of atom types via the :doc:`pair_coeff <pair_coeff>` command as in
+the examples above.
+
+* A (force units)
+* :math:`\gamma` (force/velocity units)
+* power_f (positive real)
+* cutoff (distance units)
+* kappa (thermal conductivity units)
+* power_T (positive real)
+* cutoff_T (distance units)
+* optional keyword = power or kappa
+
+The keyword *power* or *kappa* is optional. Both "power" and "kappa"
+require 4 parameters :math:`c_1, c_2, c_3, c_4` showing the temperature
+dependence of the exponent :math:`s(T) = \mathrm{power}_f ( 1+c_1
+(T-1) + c_2 (T-1)^2 + c_3 (T-1)^3 + c_4 (T-1)^4 )` and of the mesoscopic
+heat friction :math:`s_T(T) = \kappa (1 + c_1 (T-1) + c_2 (T-1)^2 + c_3
+(T-1)^3 + c_4 (T-1)^4)`.  If the keyword *power* or *kappa* is not
+specified, the eDPD system will use constant power_f and
+:math:`\kappa`, which is independent to temperature changes.
+
+----------
+
+The *mdpd/rhosum* style computes the local particle mass density
+:math:`\rho` for mDPD particles by kernel function interpolation.
+
+The following coefficients must be defined for each pair of atom types
+via the :doc:`pair_coeff <pair_coeff>` command as in the examples above.
+
+* cutoff (distance units)
+
+----------
+
+The *mdpd* style computes the many-body interactions between mDPD
+particles following the formulations in
+:ref:`(Li2013_POF) <Li2013_POF>`. The dissipative and random forces are in
+the form same as the classical DPD, but the conservative force is
+local density dependent, which are given by
+
+.. math::
+
+   \mathbf{F}_{ij}^C & = Aw_c(r_{ij})\mathbf{e}_{ij} + B(\rho_i+\rho_j)w_d(r_{ij})\mathbf{e}_{ij} \\
+   \mathbf{F}_{ij}^{D} & = -\gamma {\omega_{D}}(r_{ij})(\mathbf{e}_{ij} \cdot \mathbf{v}_{ij})\mathbf{e}_{ij} \\
+   \mathbf{F}_{ij}^{R} & = \sigma {\omega_{R}}(r_{ij}){\xi_{ij}}\Delta t^{-1/2} \mathbf{e}_{ij}
+
+where the first term in :math:`F_C` with a negative coefficient :math:`A
+< 0` stands for an attractive force within an interaction range
+:math:`r_c`, and the second term with :math:`B > 0` is the
+density-dependent repulsive force within an interaction range
+:math:`r_d`.
+
+The following coefficients must be defined for each pair of atom types via the
+:doc:`pair_coeff <pair_coeff>` command as in the examples above.
+
+* A (force units)
+* B (force units)
+* :math:`\gamma` (force/velocity units)
+* cutoff_c (distance units)
+* cutoff_d (distance units)
+
+----------
+
+The *tdpd* style computes the pairwise interactions and chemical
+concentration fluxes for tDPD particles following the formulations in
+:ref:`(Li2015_JCP) <Li2015_JCP>`.  The time evolution of a tDPD particle is
+governed by the conservation of momentum and concentration given by
+
+.. math::
+
+   \frac{\mathrm{d}^2 \mathbf{r}_i}{\mathrm{d} t^2} & = \frac{\mathrm{d} \mathbf{v}_i}{\mathrm{d} t}=\mathbf{F}_{i}=\sum_{i\neq j}(\mathbf{F}_{ij}^{C}+\mathbf{F}_{ij}^{D}+\mathbf{F}_{ij}^{R}) \\
+   \frac{\mathrm{d} C_{i}}{\mathrm{d} t} & = Q_{i} = \sum_{i\neq j}(Q_{ij}^{D}+Q_{ij}^{R}) + Q_{i}^{S}
+
+where the three components of :math:`F_{i}` including the conservative
+force :math:`F_{ij}^C`, dissipative force :math:`F_{ij}^C` and random
+force :math:`F_{ij}^C` are expressed as
+
+.. math::
+
+  \mathbf{F}_{ij}^{C} & = A{\omega_{C}}(r_{ij})\mathbf{e}_{ij} \\
+  \mathbf{F}_{ij}^{D} & = -\gamma {\omega_{D}}(r_{ij})(\mathbf{e}_{ij} \cdot \mathbf{v}_{ij})\mathbf{e}_{ij}  \\
+  \mathbf{F}_{ij}^{R} & = \sigma {\omega_{R}}(r_{ij}){\xi_{ij}}\Delta t^{-1/2} \mathbf{e}_{ij} \\
+  \omega_{C}(r) & = 1 - r/r_c \\
+  \omega_{D}(r) & = \omega^2_{R}(r) = (1-r/r_c)^{\rm power_f} \\
+  \sigma^2 = 2\gamma k_B T
+
+The concentration flux between two tDPD particles includes the Fickian
+flux :math:`Q_{ij}^D` and random flux :math:`Q_{ij}^R`, which are given
+by
+
+.. math::
+
+   Q_{ij}^D & = -\kappa_{ij} w_{DC}(r_{ij}) \left( C_i - C_j \right) \\
+   Q_{ij}^R & = \epsilon_{ij}\left( C_i + C_j \right) w_{RC}(r_{ij}) \xi_{ij} \\
+   w_{DC}(r_{ij}) & =w^2_{RC}(r_{ij}) = (1 - r/r_{cc})^{\rm power_{cc}} \\
+   \epsilon_{ij}^2 & = m_s^2\kappa_{ij}\rho
+
+where the parameters kappa and epsilon determine the strength of the
+Fickian and random fluxes. :math:`m_s` is the mass of a single solute
+molecule.  In general, :math:`m_s` is much smaller than the mass of a
+tDPD particle *m*\ . For more details, see :ref:`(Li2015_JCP)
+<Li2015_JCP>`.
+
+The following coefficients must be defined for each pair of atom types via the
+:doc:`pair_coeff <pair_coeff>` command as in the examples above.
+
+* A (force units)
+* :math:`\gamma` (force/velocity units)
+* power_f (positive real)
+* cutoff (distance units)
+* cutoff_CC (distance units)
+* :math:`\kappa_i` (diffusivity units)
+* :math:`\epsilon_i` (diffusivity units)
+* power_cc_i (positive real)
+
+The last 3 values must be repeated Nspecies times, so that values for
+each of the Nspecies chemical species are specified, as indicated by
+the "I" suffix.  In the first pair_coeff example above for pair_style
+tdpd, Nspecies = 1.  In the second example, Nspecies = 2, so 3
+additional coeffs are specified (for species 2).
+
+----------
+
+**Example scripts**
+
+There are example scripts for using all these pair styles in
+examples/USER/meso.  The example for an eDPD simulation models heat
+conduction with source terms analog of periodic Poiseuille flow
+problem. The setup follows Fig.12 in :ref:`(Li2014_JCP) <Li2014_JCP>`. The
+output of the short eDPD simulation (about 2 minutes on a single core)
+gives a temperature and density profiles as
+
+.. image:: JPG/examples_edpd.jpg
+   :align: center
+
+The example for a mDPD simulation models the oscillations of a liquid
+droplet started from a liquid film. The mDPD parameters are adopted
+from :ref:`(Li2013_POF) <Li2013_POF>`.  The short mDPD run (about 2 minutes
+on a single core) generates a particle trajectory which can
+be visualized as follows.
+
+.. image:: JPG/examples_mdpd_first.jpg
+   :target: JPG/examples_mdpd.gif
+   :align: center
+
+.. image:: JPG/examples_mdpd_last.jpg
+   :align: center
+
+The first image is the initial state of the simulation.  If you
+click it a GIF movie should play in your browser.  The second image
+is the final state of the simulation.
+
+The example for a tDPD simulation computes the effective diffusion
+coefficient of a tDPD system using a method analogous to the periodic
+Poiseuille flow.  The tDPD system is specified with two chemical
+species, and the setup follows Fig.1 in
+:ref:`(Li2015_JCP) <Li2015_JCP>`. The output of the short tDPD simulation
+(about one and a half minutes on a single core) gives the
+concentration profiles of the two chemical species as
+
+.. image:: JPG/examples_tdpd.jpg
+   :align: center
+
+----------
+
+**Mixing, shift, table, tail correction, restart, rRESPA info**\ :
+
+The styles *edpd*\ , *mdpd*\ , *mdpd/rhosum* and *tdpd* do not support
+mixing. Thus, coefficients for all I,J pairs must be specified explicitly.
+
+The styles *edpd*\ , *mdpd*\ , *mdpd/rhosum* and *tdpd* do not support
+the :doc:`pair_modify <pair_modify>` shift, table, and tail options.
+
+The styles *edpd*\ , *mdpd*\ , *mdpd/rhosum* and *tdpd* do not write
+information to :doc:`binary restart files <restart>`. Thus, you need
+to re-specify the pair_style and pair_coeff commands in an input script
+that reads a restart file.
+
+Restrictions
+""""""""""""
+
+The pair styles *edpd*\ , *mdpd*\ , *mdpd/rhosum* and *tdpd* are part of
+the USER-MESODPD package. It is only enabled if LAMMPS was built with
+that package.  See the :doc:`Build package <Build_package>` doc page for
+more info.
+
+Related commands
+""""""""""""""""
+
+:doc:`pair_coeff <pair_coeff>`, :doc:`fix mvv/dpd <fix_mvv_dpd>`,
+:doc:`fix mvv/edpd <fix_mvv_dpd>`, :doc:`fix mvv/tdpd <fix_mvv_dpd>`,
+:doc:`fix edpd/source <fix_dpd_source>`, :doc:`fix tdpd/source <fix_dpd_source>`,
+:doc:`compute edpd/temp/atom <compute_edpd_temp_atom>`,
+:doc:`compute tdpd/cc/atom <compute_tdpd_cc_atom>`
+
+**Default:** none
+
+----------
+
+.. _Li2014_JCP:
+
+**(Li2014_JCP)** Li, Tang, Lei, Caswell, Karniadakis, J Comput Phys,
+265: 113-127 (2014).  DOI: 10.1016/j.jcp.2014.02.003.
+
+.. _Li2015_CC:
+
+**(Li2015_CC)** Li, Tang, Li, Karniadakis, Chem Commun, 51: 11038-11040
+(2015).  DOI: 10.1039/C5CC01684C.
+
+.. _Li2013_POF:
+
+**(Li2013_POF)** Li, Hu, Wang, Ma, Zhou, Phys Fluids, 25: 072103 (2013).
+DOI: 10.1063/1.4812366.
+
+.. _Li2015_JCP:
+
+**(Li2015_JCP)** Li, Yazdani, Tartakovsky, Karniadakis, J Chem Phys,
+143: 014101 (2015).  DOI: 10.1063/1.4923254.
diff --git a/doc/src/pair_mgpt.rst b/doc/src/pair_mgpt.rst
index 0981502635..57fec82a7b 100644
--- a/doc/src/pair_mgpt.rst
+++ b/doc/src/pair_mgpt.rst
@@ -1,28 +1,26 @@
-.. index:: pair\_style mgpt
+.. index:: pair_style mgpt
 
-pair\_style mgpt command
-========================
+pair_style mgpt command
+=======================
 
 Syntax
 """"""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    pair_style mgpt
 
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    pair_style mgpt
-   pair_coeff \* \* Ta6.8x.mgpt.parmin Ta6.8x.mgpt.potin Omega
+   pair_coeff * * Ta6.8x.mgpt.parmin Ta6.8x.mgpt.potin Omega
    cp ~/lammps/potentials/Ta6.8x.mgpt.parmin parmin
    cp ~/lammps/potentials/Ta6.8x.mgpt.potin potin
-   pair_coeff \* \* parmin potin Omega volpress yes nbody 1234 precision double
-   pair_coeff \* \* parmin potin Omega volpress yes nbody 12
+   pair_coeff * * parmin potin Omega volpress yes nbody 1234 precision double
+   pair_coeff * * parmin potin Omega volpress yes nbody 12
 
 Description
 """""""""""
@@ -33,21 +31,25 @@ multi-ion interatomic potentials in d-band transition metals, with a
 volume-dependent, real-space total-energy functional for the N-ion
 elemental bulk material in the form
 
-.. image:: Eqs/pair_mgpt.jpg
-   :align: center
+.. math::
+
+   E_{\rm tot}({\bf R}_1 \ldots {\bf R}_N) = NE_{\rm vol}(\Omega )
+   + \frac{1}{2} \sum _{i,j} \mbox{}^\prime \ v_2(ij;\Omega )
+   + \frac{1}{6} \sum _{i,j,k} \mbox{}^\prime \ v_3(ijk;\Omega )
+   + \frac{1}{24} \sum _{i,j,k,l} \mbox{}^\prime \ v_4(ijkl;\Omega )
 
 where the prime on each summation sign indicates the exclusion of all
 self-interaction terms from the summation.  The leading volume term
-E\_vol as well as the two-ion central-force pair potential v\_2 and the
-three- and four-ion angular-force potentials, v\_3 and v\_4, depend
+E_vol as well as the two-ion central-force pair potential v_2 and the
+three- and four-ion angular-force potentials, v_3 and v_4, depend
 explicitly on the atomic volume Omega, but are structure independent
 and transferable to all bulk ion configurations, either ordered or
 disordered, and with of without the presence of point and line
 defects.  The simplified model GPT or MGPT (:ref:`Moriarty2 <Moriarty2>`,
-:ref:`Moriarty3 <Moriarty3>`), which retains the form of E\_tot and permits
+:ref:`Moriarty3 <Moriarty3>`), which retains the form of E_tot and permits
 more efficient large-scale atomistic simulations, derives from the GPT
-through a series of systematic approximations applied to E\_vol and the
-potentials v\_n that are valid for mid-period transition metals with
+through a series of systematic approximations applied to E_vol and the
+potentials v_n that are valid for mid-period transition metals with
 nearly half-filled d bands.
 
 Both analytic (:ref:`Moriarty2 <Moriarty2>`) and matrix
@@ -62,12 +64,12 @@ algorithms have been developed independently by Glosli
 (:ref:`Oppelstrup <Oppelstrup>`)
 
 The *mgpt* pair style calculates forces, energies, and the total
-energy per atom, E\_tot/N, using the Oppelstrup matrix-MGPT algorithm.
+energy per atom, E_tot/N, using the Oppelstrup matrix-MGPT algorithm.
 Input potential and control data are entered through the
 :doc:`pair_coeff <pair_coeff>` command.  Each material treated requires
 input parmin and potin potential files, as shown in the above
 examples, as well as specification by the user of the initial atomic
-volume Omega through pair\_coeff.  At the beginning of a time step in
+volume Omega through pair_coeff.  At the beginning of a time step in
 any simulation, the total volume of the simulation cell V should
 always be equal to Omega\*N, where N is the number of metal ions
 present, taking into account the presence of any vacancies and/or
@@ -77,25 +79,25 @@ style, Omega, V and N all remain constant throughout the simulation
 and thus are equal to their initial values.  In a constant-stress
 simulation, the cell volume V will change (slowly) as the simulation
 proceeds.  After each time step, the atomic volume should be updated
-by the code as Omega = V/N.  In addition, the volume term E\_vol and
-the potentials v\_2, v\_3 and v\_4 have to be removed at the end of the
+by the code as Omega = V/N.  In addition, the volume term E_vol and
+the potentials v_2, v_3 and v_4 have to be removed at the end of the
 time step, and then respecified at the new value of Omega.  In all
 simulations, Omega must remain within the defined volume range for
-E\_vol and the potentials for the given material.
+E_vol and the potentials for the given material.
 
 The default option volpress yes in the :doc:`pair_coeff <pair_coeff>`
-command includes all volume derivatives of E\_tot required to calculate
+command includes all volume derivatives of E_tot required to calculate
 the stress tensor and pressure correctly.  The option volpress no
 disregards the pressure contribution resulting from the volume term
-E\_vol, and can be used for testing and analysis purposes.  The
+E_vol, and can be used for testing and analysis purposes.  The
 additional optional variable nbody controls the specific terms in
-E\_tot that are calculated.  The default option and the normal option
+E_tot that are calculated.  The default option and the normal option
 for mid-period transition and actinide metals is nbody 1234 for which
-all four terms in E\_tot are retained.  The option nbody 12, for
+all four terms in E_tot are retained.  The option nbody 12, for
 example, retains only the volume term and the two-ion pair potential
 term and can be used for GPT series-end transition metals that can be
-well described without v\_3 and v\_4.  The nbody option can also be used
-to test or analyze the contribution of any of the four terms in E\_tot
+well described without v_3 and v_4.  The nbody option can also be used
+to test or analyze the contribution of any of the four terms in E_tot
 to a given calculated property.
 
 The *mgpt* pair style makes extensive use of matrix algebra and
@@ -145,31 +147,26 @@ before proceeding to more complex simulations.
    as provided, it will build with whatever low-level compiler (g++, icc,
    etc) is the default for your MPI installation.
 
-
 ----------
 
-
 **Mixing, shift, table tail correction, restart**\ :
 
 This pair style does not support the :doc:`pair_modify <pair_modify>`
 mix, shift, table, and tail options.
 
 This pair style does not write its information to :doc:`binary restart files <restart>`, since it is stored in potential files.  Thus, you
-needs to re-specify the pair\_style and pair\_coeff commands in an input
+needs to re-specify the pair_style and pair_coeff commands in an input
 script that reads a restart file.
 
 This pair style can only be used via the *pair* keyword of the
 :doc:`run_style respa <run_style>` command.  It does not support the
 *inner*\ , *middle*\ , *outer* keywords.
 
-
 ----------
 
-
 Restrictions
 """"""""""""
 
-
 This pair style is part of the USER-MGPT package and is only enabled
 if LAMMPS is built with that package.  See the :doc:`Build package <Build_package>` doc page for more info.
 
@@ -182,7 +179,7 @@ energies in Rydbergs and distances in Bohr radii. The *mgpt* pair
 style converts Rydbergs to Hartrees to make the potential files
 compatible with LAMMPS electron :doc:`units <units>`.
 
-The form of E\_tot used in the *mgpt* pair style is only appropriate
+The form of E_tot used in the *mgpt* pair style is only appropriate
 for elemental bulk solids and liquids.  This includes solids with
 point and extended defects such as vacancies, interstitials, grain
 boundaries and dislocations.  Alloys and free surfaces, however,
@@ -209,46 +206,29 @@ Default
 The options defaults for the :doc:`pair_coeff <pair_coeff>` command are
 volpress yes, nbody 1234, and precision double.
 
-
 ----------
 
-
 .. _Moriarty1:
 
-
-
 **(Moriarty1)** Moriarty, Physical Review B, 38, 3199 (1988).
 
 .. _Moriarty2:
 
-
-
 **(Moriarty2)** Moriarty, Physical Review B, 42, 1609 (1990).
 Moriarty, Physical Review B 49, 12431 (1994).
 
 .. _Moriarty3:
 
-
-
 **(Moriarty3)** Moriarty, Benedict, Glosli, Hood, Orlikowski, Patel, Soderlind, Streitz, Tang, and Yang,
 Journal of Materials Research, 21, 563 (2006).
 
 .. _Glosli:
 
-
-
 **(Glosli)** Glosli, unpublished, 2005.
 Streitz, Glosli, Patel, Chan, Yates, de Supinski, Sexton and Gunnels, Journal of Physics: Conference
 Series, 46, 254 (2006).
 
 .. _Oppelstrup:
 
-
-
 **(Oppelstrup)** Oppelstrup, unpublished, 2015.
 Oppelstrup and Moriarty, to be published.
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/pair_mie.rst b/doc/src/pair_mie.rst
index a516bdd3c0..527a568728 100644
--- a/doc/src/pair_mie.rst
+++ b/doc/src/pair_mie.rst
@@ -1,16 +1,15 @@
-.. index:: pair\_style mie/cut
+.. index:: pair_style mie/cut
 
-pair\_style mie/cut command
-===========================
+pair_style mie/cut command
+==========================
 
-pair\_style mie/cut/gpu command
-===============================
+pair_style mie/cut/gpu command
+==============================
 
 Syntax
 """"""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    pair_style mie/cut cutoff
 
@@ -19,8 +18,7 @@ Syntax
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    pair_style mie/cut 10.0
    pair_coeff 1 1 0.72 3.40 23.00 6.66
@@ -32,14 +30,17 @@ Description
 
 The *mie/cut* style computes the Mie potential, given by
 
-.. image:: Eqs/pair_mie.jpg
-   :align: center
+.. math::
+
+   E =  C \epsilon \left[ \left(\frac{\sigma}{r}\right)^{\gamma_{rep}} - \left(\frac{\sigma}{r}\right)^{\gamma_{att}} \right]
+                         \qquad r < r_c
 
 Rc is the cutoff and C is a function that depends on the repulsive and
 attractive exponents, given by:
 
-.. image:: Eqs/pair_mie2.jpg
-   :align: center
+.. math::
+
+   C = \left(\frac{\gamma_{rep}}{\gamma_{rep}-\gamma_{att}}\right) \left(\frac{\gamma_{rep}}{\gamma_{att}}\right)^{\left(\frac{\gamma_{att}}{\gamma_{rep}-\gamma_{att}}\right)}
 
 Note that for 12/6 exponents, C is equal to 4 and the formula is the
 same as the standard Lennard-Jones potential.
@@ -57,12 +58,10 @@ commands, or by mixing as described below:
 * cutoff (distance units)
 
 The last coefficient is optional.  If not specified, the global
-cutoff specified in the pair\_style command is used.
-
+cutoff specified in the pair_style command is used.
 
 ----------
 
-
 **Mixing, shift, table, tail correction, restart, rRESPA info**\ :
 
 For atom type pairs I,J and I != J, the epsilon and sigma coefficients
@@ -70,7 +69,7 @@ and cutoff distance for all of the mie/cut pair styles can be mixed.
 If not explicitly defined, both the repulsive and attractive gamma
 exponents for different atoms will be calculated following the same
 mixing rule defined for distances.  The default mix value is
-*geometric*\ . See the "pair\_modify" command for details.
+*geometric*\ . See the "pair_modify" command for details.
 
 This pair style supports the :doc:`pair_modify <pair_modify>` shift
 option for the energy of the pair interaction.
@@ -79,7 +78,7 @@ This pair style supports the :doc:`pair_modify <pair_modify>` tail
 option for adding a long-range tail correction to the energy and
 pressure of the pair interaction.
 
-This pair style writes its information to :doc:`binary restart files <restart>`, so pair\_style and pair\_coeff commands do not need
+This pair style writes its information to :doc:`binary restart files <restart>`, so pair_style and pair_coeff commands do not need
 to be specified in an input script that reads a restart file.
 
 This pair style supports the use of the *inner*\ , *middle*\ , and *outer*
@@ -88,13 +87,11 @@ pairwise forces can be partitioned by distance at different levels of
 the rRESPA hierarchy.  See the :doc:`run_style <run_style>` command for
 details.
 
-
 ----------
 
-
 Restrictions
 """"""""""""
- none
+none
 
 Related commands
 """"""""""""""""
@@ -103,24 +100,13 @@ Related commands
 
 **Default:** none
 
-
 ----------
 
-
 .. _Mie:
 
-
-
 **(Mie)** G. Mie, Ann Phys, 316, 657 (1903).
 
 .. _Avendano:
 
-
-
 **(Avendano)** C. Avendano, T. Lafitte, A. Galindo, C. S. Adjiman,
 G. Jackson, E. Muller, J Phys Chem B, 115, 11154 (2011).
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/pair_mm3_switch3_coulgauss_long.rst b/doc/src/pair_mm3_switch3_coulgauss_long.rst
index f100f9202d..1338682b95 100644
--- a/doc/src/pair_mm3_switch3_coulgauss_long.rst
+++ b/doc/src/pair_mm3_switch3_coulgauss_long.rst
@@ -1,20 +1,18 @@
-.. index:: pair\_style mm3/switch3/coulgauss/long
+.. index:: pair_style mm3/switch3/coulgauss/long
 
-pair\_style mm3/switch3/coulgauss/long command
+pair_style mm3/switch3/coulgauss/long command
 ==============================================
 
 Syntax
 """"""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    pair_style style args
 
 * style = *mm3/switch3/coulgauss/long*
 * args = list of arguments for a particular style
 
-
 .. parsed-literal::
 
      *mm3/switch3/coulgauss/long* args = cutoff (cutoff2) width
@@ -25,8 +23,7 @@ Syntax
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    pair_style mm3/switch3/coulgauss/long    12.0 3.0
    pair_coeff 1  0.2 2.5 1.2
@@ -40,26 +37,36 @@ Description
 The *mm3/switch3/coulgauss/long* style evaluates the MM3
 vdW potential :ref:`(Allinger) <mm3-allinger1989>`
 
-.. image:: Eqs/pair_mm3_switch3.jpg
-   :align: center
+.. math::
 
-, which goes smoothly to zero at the cutoff r\_c as defined
+   E & = \epsilon_{ij} \left[ -2.25 \left(\frac{r_{v,ij}}{r_{ij}}\right)^6 + 1.84(10)^5 \exp\left[-12.0 r_{ij}/r_{v,ij}\right] \right] S_3(r_{ij}) \\
+   r_{v,ij} & =  r_{v,i} + r_{v,j} \\
+   \epsilon_{ij} & = \sqrt{\epsilon_i \epsilon_j}
+
+, which goes smoothly to zero at the cutoff r_c as defined
 by the switching function
 
-.. image:: Eqs/pair_switch3.jpg
-   :align: center
+.. math::
+
+   S_3(r) = \left\lbrace \begin{array}{ll}
+                       1 & \quad\mathrm{if}\quad r < r_\mathrm{c} - w \\
+                       3x^2 - 2x^3 & \quad\mathrm{if}\quad r < r_\mathrm{c} \quad\mathrm{with\quad} x=\frac{r_\mathrm{c} - r}{w} \\
+                       0 & \quad\mathrm{if}\quad r >= r_\mathrm{c}
+                   \end{array} \right.
 
 where w is the width defined in the arguments. This potential
 is combined with Coulomb interaction between Gaussian charge densities:
 
-.. image:: Eqs/pair_coulgauss.jpg
-   :align: center
+.. math::
 
-where qi and qj are the
-charges on the 2 atoms, epsilon is the dielectric constant which
-can be set by the :doc:`dielectric <dielectric>` command, gamma\_i and gamma\_j
-are the widths of the Gaussian charge distribution and erf() is the error-function.
-This style has to be used in conjunction with the :doc:`kspace_style <kspace_style>` command
+   E = \frac{q_i q_j \mathrm{erf}\left( r/\sqrt{\gamma_1^2+\gamma_2^2} \right) }{\epsilon r_{ij}}
+
+where :math:`q_i` and :math:`q_j` are the charges on the 2 atoms,
+epsilon is the dielectric constant which can be set by the
+:doc:`dielectric <dielectric>` command, ::math:`\gamma_i` and
+:math:`\gamma_j` are the widths of the Gaussian charge distribution and
+erf() is the error-function.  This style has to be used in conjunction
+with the :doc:`kspace_style <kspace_style>` command
 
 If one cutoff is specified it is used for both the vdW and Coulomb
 terms.  If two cutoffs are specified, the first is used as the cutoff
@@ -71,14 +78,12 @@ above, or in the data file or restart files read by the
 :doc:`read_data <read_data>` or :doc:`read_restart <read_restart>`
 commands:
 
-* epsilon (energy)
-* r\_v (distance)
-* gamma (distance)
-
+* :math:`\epsilon` (energy)
+* :math:`r_v` (distance)
+* :math:`\gamma` (distance)
 
 ----------
 
-
 **Mixing, shift, table, tail correction, restart, rRESPA info**\ :
 
 Mixing rules are fixed for this style as defined above.
@@ -89,7 +94,6 @@ function ensures that the potential is zero at the cut-off.
 Restrictions
 """"""""""""
 
-
 These styles are part of the USER-YAFF package.  They are only
 enabled if LAMMPS was built with that package.  See the :doc:`Build package <Build_package>` doc page for more info.
 
@@ -99,8 +103,3 @@ Related commands
 :doc:`pair_coeff <pair_coeff>`
 
 **Default:** none
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/pair_modify.rst b/doc/src/pair_modify.rst
index dee1390234..b8969c0131 100644
--- a/doc/src/pair_modify.rst
+++ b/doc/src/pair_modify.rst
@@ -1,30 +1,25 @@
-.. index:: pair\_modify
+.. index:: pair_modify
 
-pair\_modify command
-====================
+pair_modify command
+===================
 
 Syntax
 """"""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    pair_modify keyword values ...
 
 * one or more keyword/value pairs may be listed
 * keyword = *pair* or *shift* or *mix* or *table* or *table/disp* or *tabinner*
-  or *tabinner/disp* or *tail* or *compute* or *nofdotr*
-  
+  or *tabinner/disp* or *tail* or *compute* or *nofdotr* or *special* or
+  *compute/tally*
+
   .. parsed-literal::
-  
-       *pair* values = sub-style N *special* which wt1 wt2 wt3
-                    or sub-style N *compute/tally* flag
+
+       *pair* value = sub-style N
          sub-style = sub-style of :doc:`pair hybrid <pair_hybrid>`
-         N = which instance of sub-style (only if sub-style is used multiple times)
-           *special* which wt1 wt2 wt3 = override *special_bonds* settings (optional)
-             which = *lj/coul* or *lj* or *coul*
-             w1,w2,w3 = 1-2, 1-3, and 1-4 weights from 0.0 to 1.0 inclusive
-           *compute/tally* flag = *yes* or *no*
+         N = which instance of sub-style (1 to M), only specify if sub-style is used multiple times
        *mix* value = *geometric* or *arithmetic* or *sixthpower*
        *shift* value = *yes* or *no*
        *table* value = N
@@ -37,15 +32,16 @@ Syntax
          cutoff = inner cutoff at which to begin table (distance units)
        *tail* value = *yes* or *no*
        *compute* value = *yes* or *no*
-       *nofdotr*
-
-
+       *nofdotr* value = none
+       *special* values = which wt1 wt2 wt3
+          which = *lj/coul* or *lj* or *coul*
+          w1,w2,w3 = 1-2, 1-3, 1-4 weights from 0.0 to 1.0 inclusive
+       *compute/tally* value = *yes* or *no*
 
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    pair_modify shift yes mix geometric
    pair_modify tail yes
@@ -53,74 +49,64 @@ Examples
    pair_modify pair lj/cut compute no
    pair_modify pair tersoff compute/tally no
    pair_modify pair lj/cut/coul/long 1 special lj/coul 0.0 0.0 0.0
+   pair_modify pair lj/cut/coul/long special lj 0.0 0.0 0.5 special coul 0.0 0.0 0.8333333
 
 Description
 """""""""""
 
-Modify the parameters of the currently defined pair style.  Not all
-parameters are relevant to all pair styles.
+Modify the parameters of the currently defined pair style.  If the
+pair style is :doc:`hybrid or hybrid/overlay <pair_hybrid>`, then the
+specified parameters are by default modified for all the hybrid sub-styles.
 
-If used, the *pair* keyword must appear first in the list of keywords.
-It can only be used with the :doc:`hybrid and hybrid/overlay <pair_hybrid>` pair styles.  It means that all the
-following parameters will only be modified for the specified
-sub-style.  If the sub-style is defined multiple times, then an
-additional numeric argument *N* must also be specified, which is a
-number from 1 to M where M is the number of times the sub-style was
-listed in the :doc:`pair_style hybrid <pair_hybrid>` command.  The extra
-number indicates which instance of the sub-style the remaining
-keywords will be applied to.  Note that if the *pair* keyword is not
-used, and the pair style is *hybrid* or *hybrid/overlay*\ , then all the
-specified keywords will be applied to all sub-styles.
+.. note::
 
-The *special* and *compute/tally* keywords can **only** be used in
-conjunction with the *pair* keyword and must directly follow it.
-*special* allows to override the
-:doc:`special_bonds <special_bonds>` settings for the specified sub-style.
-*compute/tally* allows to disable or enable registering
-:doc:`compute \*/tally <compute_tally>` computes for a given sub-style.
-More details are given below.
+   The behavior for hybrid pair styles can be changed by using the *pair*
+   keyword, which allows selection of a specific sub-style to apply all
+   remaining keywords to.
+   The *special* and *compute/tally* keywords can **only** be
+   used in conjunction with the *pair* keyword.  See further details about
+   these 3 keywords below.
 
 The *mix* keyword affects pair coefficients for interactions between
 atoms of type I and J, when I != J and the coefficients are not
 explicitly set in the input script.  Note that coefficients for I = J
 must be set explicitly, either in the input script via the
-"pair\_coeff" command or in the "Pair Coeffs" section of the :doc:`data file <read_data>`.  For some pair styles it is not necessary to
-specify coefficients when I != J, since a "mixing" rule will create
-them from the I,I and J,J settings.  The pair\_modify *mix* value
-determines what formulas are used to compute the mixed coefficients.
-In each case, the cutoff distance is mixed the same way as sigma.
+:doc:`pair_coeff <pair_coeff>` command or in the "Pair Coeffs" section of the
+:doc:`data file <read_data>`.  For some pair styles it is not
+necessary to specify coefficients when I != J, since a "mixing" rule
+will create them from the I,I and J,J settings.  The pair_modify
+*mix* value determines what formulas are used to compute the mixed
+coefficients.  In each case, the cutoff distance is mixed the same way
+as sigma.
 
-Note that not all pair styles support mixing.  Also, some mix options
-are not available for certain pair styles.  See the doc page for
-individual pair styles for those restrictions.  Note also that the
-:doc:`pair_coeff <pair_coeff>` command also can be to directly set
+Note that not all pair styles support mixing and some mix options
+are not available for certain pair styles. Also, there are additional
+restrictions when using :doc:`pair style hybrid or hybrid/overlay <pair_hybrid>`.
+See the doc page for individual pair styles for those restrictions.  Note also that the
+:doc:`pair_coeff <pair_coeff>` command also can be used to directly set
 coefficients for a specific I != J pairing, in which case no mixing is
 performed.
 
-mix *geometric*
+- mix *geometric*
 
+  .. math::
 
-.. parsed-literal::
+     \epsilon_{ij} = & \sqrt{\epsilon_i  \epsilon_j} \\
+     \sigma_{ij}   = & \sqrt{\sigma_i  \sigma_j}
 
-   epsilon_ij = sqrt(epsilon_i \* epsilon_j)
-   sigma_ij = sqrt(sigma_i \* sigma_j)
+- mix *arithmetic*
 
-mix *arithmetic*
+  .. math::
 
+    \epsilon_{ij} = & \sqrt{\epsilon_i  \epsilon_j} \\
+    \sigma_{ij}   = & \frac{1}{2} (\sigma_i + \sigma_j)
 
-.. parsed-literal::
+- mix *sixthpower*
 
-   epsilon_ij = sqrt(epsilon_i \* epsilon_j)
-   sigma_ij = (sigma_i + sigma_j) / 2
+  .. math::
 
-mix *sixthpower*
-
-
-.. parsed-literal::
-
-   epsilon_ij = (2 \* sqrt(epsilon_i\*epsilon_j) \* sigma_i\^3 \* sigma_j\^3) /
-                (sigma_i\^6 + sigma_j\^6)
-   sigma_ij = ((sigma_i\*\*6 + sigma_j\*\*6) / 2) \^ (1/6)
+    \epsilon_{ij} = & \frac{2 \sqrt{\epsilon_i \epsilon_j} \sigma_i^3 \sigma_j^3}{\sigma_i^6 + \sigma_j^6} \\
+    \sigma_{ij} =   & \left(\frac{1}{2} (\sigma_i^6 + \sigma_j^6) \right)^{\frac{1}{6}}
 
 The *shift* keyword determines whether a Lennard-Jones potential is
 shifted at its cutoff to 0.0.  If so, this adds an energy term to each
@@ -135,10 +121,11 @@ see the doc page for individual styles to see which potentials support
 these options.  If N is non-zero, a table of length 2\^N is
 pre-computed for forces and energies, which can shrink their
 computational cost by up to a factor of 2.  The table is indexed via a
-bit-mapping technique :ref:`(Wolff) <Wolff1>` and a linear interpolation is
-performed between adjacent table values.  In our experiments with
-different table styles (lookup, linear, spline), this method typically
-gave the best performance in terms of speed and accuracy.
+bit-mapping technique :ref:`(Wolff) <Wolff1>` and a linear
+interpolation is performed between adjacent table values.  In our
+experiments with different table styles (lookup, linear, spline), this
+method typically gave the best performance in terms of speed and
+accuracy.
 
 The choice of table length is a tradeoff in accuracy versus speed.  A
 larger N yields more accurate force computations, but requires more
@@ -162,27 +149,28 @@ pairwise interactions are computed via table lookup for simulations
 with "real" units, but some close pairs may be computed directly
 (non-table) for simulations with "lj" units.
 
-When the *tail* keyword is set to *yes*\ , certain pair styles will add
-a long-range VanderWaals tail "correction" to the energy and pressure.
-These corrections are bookkeeping terms which do not affect dynamics,
-unless a constant-pressure simulation is being performed.  See the doc
-page for individual styles to see which support this option.  These
-corrections are included in the calculation and printing of
-thermodynamic quantities (see the :doc:`thermo_style <thermo_style>`
-command).  Their effect will also be included in constant NPT or NPH
-simulations where the pressure influences the simulation box
-dimensions (e.g. the :doc:`fix npt <fix_nh>` and :doc:`fix nph <fix_nh>`
-commands).  The formulas used for the long-range corrections come from
-equation 5 of :ref:`(Sun) <Sun>`.
+When the *tail* keyword is set to *yes*\ , certain pair styles will
+add a long-range VanderWaals tail "correction" to the energy and
+pressure.  These corrections are bookkeeping terms which do not affect
+dynamics, unless a constant-pressure simulation is being performed.
+See the doc page for individual styles to see which support this
+option.  These corrections are included in the calculation and
+printing of thermodynamic quantities (see the :doc:`thermo_style
+<thermo_style>` command).  Their effect will also be included in
+constant NPT or NPH simulations where the pressure influences the
+simulation box dimensions (e.g. the :doc:`fix npt <fix_nh>` and
+:doc:`fix nph <fix_nh>` commands).  The formulas used for the
+long-range corrections come from equation 5 of :ref:`(Sun) <Sun>`.
 
 .. note::
 
    The tail correction terms are computed at the beginning of each
    run, using the current atom counts of each atom type.  If atoms are
-   deleted (or lost) or created during a simulation, e.g. via the :doc:`fix gcmc <fix_gcmc>` command, the correction factors are not
-   re-computed.  If you expect the counts to change dramatically, you can
-   break a run into a series of shorter runs so that the correction
-   factors are re-computed more frequently.
+   deleted (or lost) or created during a simulation, e.g. via the
+   :doc:`fix gcmc <fix_gcmc>` command, the correction factors are not
+   re-computed.  If you expect the counts to change dramatically, you
+   can break a run into a series of shorter runs so that the
+   correction factors are re-computed more frequently.
 
 Several additional assumptions are inherent in using tail corrections,
 including the following:
@@ -191,27 +179,27 @@ including the following:
   should not be used for systems that are non-liquid, 2d, have a slab
   geometry (only 2d periodic), or inhomogeneous.
 * G(r), the radial distribution function (rdf), is unity beyond the
-  cutoff, so a fairly large cutoff should be used (i.e. 2.5 sigma for an
-  LJ fluid), and it is probably a good idea to verify this assumption by
-  checking the rdf.  The rdf is not exactly unity beyond the cutoff for
-  each pair of interaction types, so the tail correction is necessarily
-  an approximation.
+  cutoff, so a fairly large cutoff should be used (i.e. 2.5 sigma for
+  an LJ fluid), and it is probably a good idea to verify this
+  assumption by checking the rdf.  The rdf is not exactly unity beyond
+  the cutoff for each pair of interaction types, so the tail
+  correction is necessarily an approximation.
 
-  The tail corrections are computed at the beginning of each simulation
-  run.  If the number of atoms changes during the run, e.g. due to atoms
-  leaving the simulation domain, or use of the :doc:`fix gcmc <fix_gcmc>`
-  command, then the corrections are not updated to reflect the changed
-  atom count.  If this is a large effect in your simulation, you should
-  break the long run into several short runs, so that the correction
-  factors are re-computed multiple times.
-
-* Thermophysical properties obtained from calculations with this option
-  enabled will not be thermodynamically consistent with the truncated
-  force-field that was used.  In other words, atoms do not feel any LJ
-  pair interactions beyond the cutoff, but the energy and pressure
-  reported by the simulation include an estimated contribution from
-  those interactions.
+  The tail corrections are computed at the beginning of each
+  simulation run.  If the number of atoms changes during the run,
+  e.g. due to atoms leaving the simulation domain, or use of the
+  :doc:`fix gcmc <fix_gcmc>` command, then the corrections are not
+  updated to reflect the changed atom count.  If this is a large
+  effect in your simulation, you should break the long run into
+  several short runs, so that the correction factors are re-computed
+  multiple times.
 
+* Thermophysical properties obtained from calculations with this
+  option enabled will not be thermodynamically consistent with the
+  truncated force-field that was used.  In other words, atoms do not
+  feel any LJ pair interactions beyond the cutoff, but the energy and
+  pressure reported by the simulation include an estimated
+  contribution from those interactions.
 
 The *compute* keyword allows pairwise computations to be turned off,
 even though a :doc:`pair_style <pair_style>` is defined.  This is not
@@ -225,59 +213,76 @@ a simulation with :doc:`pair_style hybrid <pair_hybrid>` with only a
 subset of the hybrid sub-styles enabled.  Second, this option allows
 you to perform a simulation with only long-range interactions but no
 short-range pairwise interactions.  Doing this by simply not defining
-a pair style will not work, because the
-:doc:`kspace_style <kspace_style>` command requires a Kspace-compatible
-pair style be defined.
+a pair style will not work, because the :doc:`kspace_style
+<kspace_style>` command requires a Kspace-compatible pair style be
+defined.
 
 The *nofdotr* keyword allows to disable an optimization that computes
-the global stress tensor from the total forces and atom positions rather
-than from summing forces between individual pairs of atoms.
-
+the global stress tensor from the total forces and atom positions
+rather than from summing forces between individual pairs of atoms.
 
 ----------
 
+The *pair* keyword can only be used with the :doc:`hybrid and
+hybrid/overlay <pair_hybrid>` pair styles.  If used, it must appear
+first in the list of keywords.
 
-The *special* keyword allows to override the 1-2, 1-3, and 1-4
-exclusion settings for individual sub-styles of a
-:doc:`hybrid pair style <pair_hybrid>`. It requires 4 arguments similar
-to the :doc:`special_bonds <special_bonds>` command, *which* and
-wt1,wt2,wt3.  The *which* argument can be *lj* to change the
-Lennard-Jones settings, *coul* to change the Coulombic settings,
-or *lj/coul* to change both to the same set of 3 values.  The wt1,wt2,wt3
-values are numeric weights from 0.0 to 1.0 inclusive, for the 1-2,
-1-3, and 1-4 bond topology neighbors, respectively. The *special*
-keyword can only be used in conjunction with the *pair* keyword
-and has to directly follow it.  This option is not compatible with
-pair styles from the GPU or the USER-INTEL package and attempting
-it will cause an error.
+Its meaning is that all the following parameters will only be modified
+for the specified sub-style.  If the sub-style is defined multiple
+times, then an additional numeric argument *N* must also be specified,
+which is a number from 1 to M where M is the number of times the
+sub-style was listed in the :doc:`pair_style hybrid <pair_hybrid>`
+command.  The extra number indicates which instance of the sub-style
+the remaining keywords will be applied to.
+
+The *special* and *compute/tally* keywords can **only** be used in
+conjunction with the *pair* keyword and they must directly follow it.
+I.e. any other keyword, must appear after *pair*, *special*, and
+*compute/tally*.
+
+The *special* keyword overrides the global :doc:`special_bonds <special_bonds>`
+1-2, 1-3, 1-4 exclusion settings (weights) for the sub-style selected
+by the *pair* keyword.
+
+Similar to the :doc:`special_bonds <special_bonds>` command, it takes
+4 arguments.  The *which* argument can be *lj* to change only the
+non-Coulomb weights (e.g. Lennard-Jones or Buckingham), *coul* to change
+only the Coulombic settings, or *lj/coul* to change both to the same
+values.  The *wt1,wt2,wt3* values are numeric weights from 0.0 to 1.0
+inclusive, for the 1-2, 1-3, and 1-4 bond topology neighbors, respectively.
+The *special* keyword can be used multiple times, e.g. to set the *lj*
+and *coul* settings to different values.
 
 .. note::
 
-   The global settings specified by the
-   :doc:`special_bonds <special_bonds>` command affect the construction of
-   neighbor lists.  Weights of 0.0 (for 1-2, 1-3, or 1-4 neighbors)
-   exclude those pairs from the neighbor list entirely.  Weights of 1.0
-   store the neighbor with no weighting applied. Thus only global values
-   different from exactly 0.0 or 1.0 can be overridden and an error is
-   generated if the requested setting is not compatible with the global
-   setting. Substituting 1.0e-10 for 0.0 and 0.9999999999 for 1.0 is
-   usually a sufficient workaround in this case without causing a
-   significant error.
-
-The *compute/tally* keyword takes exactly 1 argument (\ *no* or *yes*\ ),
-and allows to selectively disable or enable processing of the various
-:doc:`compute \*/tally <compute_tally>` styles for a given
-:doc:`pair hybrid or hybrid/overlay <pair_hybrid>` sub-style.
+   The *special* keyword is not compatible with pair styles from the
+   GPU or the USER-INTEL package and attempting to use it will cause
+   an error.
 
 .. note::
 
-   Any "pair\_modify pair compute/tally" command must be issued
+   Weights of exactly 0.0 or 1.0 in the :doc:`special_bonds <special_bonds>`
+   command have implications on the neighbor list construction, which
+   means that they cannot be overridden by using the *special* keyword.
+   One workaround for this restriction is to use the :doc:`special_bonds <special_bonds>`
+   command with weights like 1.0e-10 or 0.999999999 instead of 0.0 or 1.0,
+   respectively, which enables to reset each them to any value between 0.0
+   and 1.0 inclusively.  Otherwise you can set **all** global weights to
+   an arbitrary number between 0.0 or 1.0, like 0.5, and then you have
+   to override **all** *special* settings for **all** sub-styles which use
+   the 1-2, 1-3, and 1-4 exclusion weights in their force/energy computation.
+
+The *compute/tally* keyword disables or enables registering :doc:`compute
+\*/tally <compute_tally>` computes for the sub-style specified by
+the *pair* keyword.  Use *no* to disable, or *yes* to enable.
+
+.. note::
+
+   The "pair_modify pair compute/tally" command must be issued
    **before** the corresponding compute style is defined.
 
-
 ----------
 
-
 Restrictions
 """"""""""""
 
@@ -290,7 +295,7 @@ Related commands
 """"""""""""""""
 
 :doc:`pair_style <pair_style>`, :doc:`pair_style hybrid <pair_hybrid>`,
-pair\_coeff"_pair\_coeff.html, :doc:`thermo_style <thermo_style>`,
+:doc:`pair_coeff <pair_coeff>`, :doc:`thermo_style <thermo_style>`,
 :doc:`compute \*/tally <compute_tally>`
 
 Default
@@ -302,23 +307,12 @@ tabinner = sqrt(2.0), tail = no, and compute = yes.
 Note that some pair styles perform mixing, but only a certain style of
 mixing.  See the doc pages for individual pair styles for details.
 
-
 ----------
 
-
 .. _Wolff1:
 
-
-
 **(Wolff)** Wolff and Rudd, Comp Phys Comm, 120, 200-32 (1999).
 
 .. _Sun:
 
-
-
 **(Sun)** Sun, J Phys Chem B, 102, 7338-7364 (1998).
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/pair_momb.rst b/doc/src/pair_momb.rst
index 0bc3e41310..ed9a0b98dd 100644
--- a/doc/src/pair_momb.rst
+++ b/doc/src/pair_momb.rst
@@ -1,13 +1,12 @@
-.. index:: pair\_style momb
+.. index:: pair_style momb
 
-pair\_style momb command
-========================
+pair_style momb command
+=======================
 
 Syntax
 """"""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    pair_style momb cutoff s6 d
 
@@ -18,8 +17,7 @@ Syntax
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    pair_style momb 12.0 0.75 20.0
    pair_style hybrid/overlay eam/fs lj/charmm/coul/long 10.0 12.0 momb 12.0 0.75 20.0 morse 5.5
@@ -36,30 +34,30 @@ described comprehensively in :ref:`(Fichthorn) <Fichthorn>` and
 :ref:`(Zhou) <Zhou4>`. Grimme's method is widely used to correct for
 dispersion in density functional theory calculations.
 
-.. image:: Eqs/pair_momb.jpg
-   :align: center
+.. math::
+
+   E & = D_0 [\exp^{-2 \alpha (r-r_0)} - 2\exp^{-\alpha (r-r_0)}] - s_6 \frac{C_6}{r^6} f_{damp}(r,R_r) \\
+  f_{damp}(r,R_r) & = \frac{1}{1 + \exp^{-d(r/R_r - 1)}}
 
 For the *momb* pair style, the following coefficients must be defined
 for each pair of atoms types via the :doc:`pair_coeff <pair_coeff>`
 command as in the examples above, or in the data file or restart files
 read by the :doc:`read_data <read_data>` as described below:
 
-* D0 (energy units)
-* alpha (1/distance units)
-* r0 (distance units)
-* C6 (energy\*distance\^6 units)
-* Rr (distance units, typically sum of atomic vdW radii)
-
+* :math:`D_0` (energy units)
+* :math:`\alpha` (1/distance units)
+* :math:`r_0` (distance units)
+* :math:`C_6` (energy\*distance\^6 units)
+* :math:`R_r` (distance units, typically sum of atomic vdW radii)
 
 ----------
 
-
 Restrictions
 """"""""""""
 
-
 This style is part of the USER-MISC package. It is only enabled if
-LAMMPS is built with that package. See the :doc:`Build package <Build_package>` doc page on for more info.
+LAMMPS is built with that package. See the :doc:`Build package
+<Build_package>` doc page on for more info.
 
 Related commands
 """"""""""""""""
@@ -68,29 +66,16 @@ Related commands
 
 **Default:** none
 
-
 ----------
 
-
 .. _Grimme:
 
-
-
 **(Grimme)** Grimme, J Comput Chem, 27(15), 1787-1799 (2006).
 
 .. _Fichthorn:
 
-
-
 **(Fichthorn)** Fichthorn, Balankura, Qi, CrystEngComm, 18(29), 5410-5417 (2016).
 
 .. _Zhou4:
 
-
-
 **(Zhou)** Zhou, Saidi, Fichthorn, J Phys Chem C, 118(6), 3366-3374 (2014).
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/pair_morse.rst b/doc/src/pair_morse.rst
index ac1c106b06..d031c70cd2 100644
--- a/doc/src/pair_morse.rst
+++ b/doc/src/pair_morse.rst
@@ -1,38 +1,36 @@
-.. index:: pair\_style morse
+.. index:: pair_style morse
 
-pair\_style morse command
-=========================
+pair_style morse command
+========================
 
-pair\_style morse/gpu command
-=============================
-
-pair\_style morse/omp command
-=============================
-
-pair\_style morse/opt command
-=============================
-
-pair\_style morse/smooth/linear command
-=======================================
-
-pair\_style morse/smooth/linear/omp command
-===========================================
-
-pair\_style morse/kk command
+pair_style morse/gpu command
 ============================
 
+pair_style morse/omp command
+============================
+
+pair_style morse/opt command
+============================
+
+pair_style morse/smooth/linear command
+======================================
+
+pair_style morse/smooth/linear/omp command
+==========================================
+
+pair_style morse/kk command
+===========================
+
 Syntax
 """"""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    pair_style style args
 
 * style = *morse* or *morse/smooth/linear* or *morse/soft*
 * args = list of arguments for a particular style
 
-
 .. parsed-literal::
 
     *morse* args = cutoff
@@ -43,12 +41,11 @@ Syntax
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    pair_style morse 2.5
    pair_style morse/smooth/linear 2.5
-   pair_coeff \* \* 100.0 2.0 1.5
+   pair_coeff * * 100.0 2.0 1.5
    pair_coeff 1 1 100.0 2.0 1.5 3.0
 
 Description
@@ -56,8 +53,10 @@ Description
 
 Style *morse* computes pairwise interactions with the formula
 
-.. image:: Eqs/pair_morse.jpg
-   :align: center
+.. math::
+
+   E = D_0 \left[ e^{- 2 \alpha (r - r_0)} - 2 e^{- \alpha (r - r_0)} \right]
+       \qquad r < r_c
 
 Rc is the cutoff.
 
@@ -67,41 +66,39 @@ above, or in the data file or restart files read by the
 :doc:`read_data <read_data>` or :doc:`read_restart <read_restart>`
 commands:
 
-* D0 (energy units)
-* alpha (1/distance units)
-* r0 (distance units)
+* :math:`D_0` (energy units)
+* :math:`\alpha` (1/distance units)
+* :math:`r_0` (distance units)
 * cutoff (distance units)
 
 The last coefficient is optional.  If not specified, the global morse
 cutoff is used.
 
-
 ----------
 
-
 The *morse/smooth/linear* variant is similar to the lj/smooth/linear
 variant in that it adds to the potential a shift and a linear term
 so that both, potential energy and force, go to zero at the cut-off:
 
-.. image:: Eqs/pair_morse_smooth_linear.jpg
-   :align: center
+.. math::
 
-The syntax of the pair\_style and pair\_coeff commands are the same for
+   \phi\left(r\right) & =  D_0 \left[ e^{- 2 \alpha (r - r_0)} - 2 e^{- \alpha (r - r_0)} \right] \qquad r < r_c \\
+   E\left(r\right) & =  \phi\left(r\right)  - \phi\left(R_c\right) - \left(r - R_c\right) \left.\frac{d\phi}{d r} \right|_{r=R_c}       \qquad r < R_c
+
+The syntax of the pair_style and pair_coeff commands are the same for
 the *morse* and *morse/smooth/linear* styles.
 
-
 ----------
 
-
-A version of the *morse* style with a soft core, *morse/soft*\ , suitable for use in
-free energy calculations, is part of the USER-FEP package and is documented with
-the :doc:`pair\_fep\_soft <pair_fep_soft>` styles. The version with soft core is only
-available if LAMMPS was built with that package. See the :doc:`Build package <Build_package>` doc page for more info.
-
+A version of the *morse* style with a soft core, *morse/soft*\ ,
+suitable for use in free energy calculations, is part of the USER-FEP
+package and is documented with the :doc:`pair_style */soft
+<pair_fep_soft>` styles. The version with soft core is only available if
+LAMMPS was built with that package. See the :doc:`Build package
+<Build_package>` doc page for more info.
 
 ----------
 
-
 Styles with a *gpu*\ , *intel*\ , *kk*\ , *omp*\ , or *opt* suffix are
 functionally the same as the corresponding style without the suffix.
 They have been optimized to run faster, depending on your available
@@ -120,10 +117,8 @@ by including their suffix, or you can use the :doc:`-suffix command-line switch
 See the :doc:`Speed packages <Speed_packages>` doc page for more
 instructions on how to use the accelerated styles effectively.
 
-
 ----------
 
-
 **Mixing, shift, table, tail correction, restart, rRESPA info**\ :
 
 None of these pair styles support mixing.  Thus, coefficients for all
@@ -139,32 +134,24 @@ None of these pair styles support the :doc:`pair_modify <pair_modify>`
 tail option for adding long-range tail corrections to energy and
 pressure.
 
-All of these pair styles write their information to :doc:`binary restart files <restart>`, so pair\_style and pair\_coeff commands do not need
+All of these pair styles write their information to :doc:`binary restart files <restart>`, so pair_style and pair_coeff commands do not need
 to be specified in an input script that reads a restart file.
 
 These pair styles can only be used via the *pair* keyword of the
 :doc:`run_style respa <run_style>` command.  They do not support the
 *inner*\ , *middle*\ , *outer* keywords.
 
-
 ----------
 
-
 Restrictions
 """"""""""""
 
-
 The *morse/smooth/linear* pair style is only enabled if LAMMPS was
 built with the USER-MISC package.  See the :doc:`Build package <Build_package>` doc page for more info.
 
 Related commands
 """"""""""""""""
 
-:doc:`pair_coeff <pair_coeff>`, :doc:`pair\_fep\_soft <pair_fep_soft>`
+:doc:`pair_coeff <pair_coeff>`, :doc:`pair_style */soft <pair_fep_soft>`
 
 **Default:** none
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/pair_multi_lucy.rst b/doc/src/pair_multi_lucy.rst
index 512ce07bd7..37da1ab965 100644
--- a/doc/src/pair_multi_lucy.rst
+++ b/doc/src/pair_multi_lucy.rst
@@ -1,13 +1,12 @@
-.. index:: pair\_style multi/lucy
+.. index:: pair_style multi/lucy
 
-pair\_style multi/lucy command
-==============================
+pair_style multi/lucy command
+=============================
 
 Syntax
 """"""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    pair_style multi/lucy style N keyword ...
 
@@ -17,11 +16,10 @@ Syntax
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    pair_style multi/lucy linear 1000
-   pair_coeff \* \* multibody.table ENTRY1 7.0
+   pair_coeff * * multibody.table ENTRY1 7.0
 
 Description
 """""""""""
@@ -30,29 +28,34 @@ Style *multi/lucy* computes a density-dependent force following from
 the many-body form described in :ref:`(Moore) <Moore1>` and
 :ref:`(Warren) <Warren1>` as
 
-.. image:: Eqs/pair_multi_lucy.jpg
-   :align: center
+.. math::
 
-which consists of a density-dependent function, A(rho), and a
-radial-dependent weight function, omegaDD(rij).  The radial-dependent
-weight function, omegaDD(rij), is taken as the Lucy function:
+   F_{i}^{DD}(\rho_i,\rho_j,r_{ij}) = \frac{1}{2} \omega_{DD}\left(r_{ij}\right)
+   \left[A\left(\rho_i\right) + A\left(\rho_j\right)\right]e_{ij}
 
-.. image:: Eqs/pair_multi_lucy2.jpg
-   :align: center
+which consists of a density-dependent function, :math:`A(\rho)`, and a
+radial-dependent weight function, :math:`\omega_{DD}(r_{ij})`.  The
+radial-dependent weight function, :math:`\omega_{DD}(r_{ij})`, is taken
+as the Lucy function:
+
+.. math::
+
+   \omega_{DD}\left(r_{ij}\right) = \left(1+\frac{3r_{ij}}{r_{cut}}\right)\left(1+\frac{r_{ij}}{r_{cut}}\right)^3
 
 The density-dependent energy for a given particle is given by:
 
-.. image:: Eqs/pair_multi_lucy_energy.jpg
-   :align: center
+.. math::
+
+   u_{i}^{DD}\left(\rho_{i}\right) = \frac{\pi r_{cut}^4}{84} \int_{\rho_0}^{\rho_i} A\left(\rho'\right) d\rho'
 
 See the supporting information of :ref:`(Brennan) <Brennan1>` or the
 publication by :ref:`(Moore) <Moore1>` for more details on the functional
 form.
 
-An interpolation table is used to evaluate the density-dependent
-energy (Integral(A(rho)drho) and force (A(rho)).  Note that the
-pre-factor to the energy is computed after the interpolation, thus the
-Integral(A(rho)drho will have units of energy / length\^4.
+An interpolation table is used to evaluate the density-dependent energy
+(:math:`\int A(\rho') d\rho'`) and force (:math:`A(\rho')`).  Note that
+the pre-factor to the energy is computed after the interpolation, thus
+the :math:`\int A(\rho') d \rho'` will have units of energy / length\^4.
 
 The interpolation table is created as a pre-computation by fitting
 cubic splines to the file values and interpolating the
@@ -86,14 +89,11 @@ tabulated distance.  If specified, only file values up to the cutoff
 are used to create the interpolation table.  The format of this file
 is described below.
 
-
 ----------
 
-
 The format of a tabulated file is a series of one or more sections,
 defined as follows (without the parenthesized comments):
 
-
 .. parsed-literal::
 
    # Density-dependent function (one or more comment or blank lines)
@@ -110,7 +110,7 @@ A section begins with a non-blank line whose 1st character is not a
 "#"; blank lines or lines starting with "#" can be used as comments
 between sections.  The first line begins with a keyword which
 identifies the section.  The line can contain additional text, but the
-initial text must match the argument specified in the pair\_coeff
+initial text must match the argument specified in the pair_coeff
 command.  The next line lists (in any order) one or more parameters
 for the table.  Each parameter is a keyword followed by one or more
 numeric values.
@@ -118,7 +118,7 @@ numeric values.
 The parameter "N" is required and its value is the number of table
 entries that follow.  Note that this may be different than the *N*
 specified in the :doc:`pair_style multi/lucy <pair_multi_lucy>` command.
-Let Ntable = *N* in the pair\_style command, and Nfile = "N" in the
+Let Ntable = *N* in the pair_style command, and Nfile = "N" in the
 tabulated file.  What LAMMPS does is a preliminary interpolation by
 creating splines using the Nfile tabulated values as nodal points.  It
 uses these to interpolate the density-dependent energy and force at
@@ -137,23 +137,24 @@ as-is to perform spline interpolation.  In this case, the table values
 can be spaced in *density* uniformly or however you wish to position table
 values in regions of large gradients.
 
-If used, the parameters "R" or "RSQ" are followed by 2 values *rlo*
-and *rhi*\ .  If specified, the density associated with each density-dependent
-energy and force value is computed from these 2 values (at high accuracy), rather
-than using the (low-accuracy) value listed in each line of the table.
-The density values in the table file are ignored in this case.
-For "R", distances uniformly spaced between *rlo* and *rhi* are
-computed; for "RSQ", squared distances uniformly spaced between
-*rlo\*rlo* and *rhi\*rhi* are computed.
+If used, the parameters "R" or "RSQ" are followed by 2 values *rlo* and
+*rhi*\ .  If specified, the density associated with each
+density-dependent energy and force value is computed from these 2 values
+(at high accuracy), rather than using the (low-accuracy) value listed in
+each line of the table.  The density values in the table file are
+ignored in this case.  For "R", distances uniformly spaced between *rlo*
+and *rhi* are computed; for "RSQ", squared distances uniformly spaced
+between *rlo\*rlo* and *rhi\*rhi* are computed.
 
 .. note::
 
-   If you use "R" or "RSQ", the tabulated distance values in the
-   file are effectively ignored, and replaced by new values as described
-   in the previous paragraph.  If the density value in the table is not
-   very close to the new value (i.e. round-off difference), then you will
-   be assigning density-dependent energy and force values to a different density,
-   which is probably not what you want.  LAMMPS will warn if this is occurring.
+   If you use "R" or "RSQ", the tabulated distance values in the file
+   are effectively ignored, and replaced by new values as described in
+   the previous paragraph.  If the density value in the table is not
+   very close to the new value (i.e. round-off difference), then you
+   will be assigning density-dependent energy and force values to a
+   different density, which is probably not what you want.  LAMMPS will
+   warn if this is occurring.
 
 Following a blank line, the next N lines list the tabulated values.
 On each line, the 1st value is the index from 1 to N, the 2nd value is
@@ -165,10 +166,8 @@ Note that one file can contain many sections, each with a tabulated
 potential.  LAMMPS reads the file section by section until it finds
 one that matches the specified keyword.
 
-
 ----------
 
-
 **Mixing, shift, table, tail correction, restart, rRESPA info**\ :
 
 This pair style does not support mixing.  Thus, coefficients for all
@@ -177,25 +176,22 @@ I,J pairs must be specified explicitly.
 The :doc:`pair_modify <pair_modify>` shift, table, and tail options are
 not relevant for this pair style.
 
-This pair style writes the settings for the "pair\_style multi/lucy" command
-to :doc:`binary restart files <restart>`, so a pair\_style command does
+This pair style writes the settings for the "pair_style multi/lucy" command
+to :doc:`binary restart files <restart>`, so a pair_style command does
 not need to specified in an input script that reads a restart file.
 However, the coefficient information is not stored in the restart
-file, since it is tabulated in the potential files.  Thus, pair\_coeff
+file, since it is tabulated in the potential files.  Thus, pair_coeff
 commands do need to be specified in the restart input script.
 
 This pair style can only be used via the *pair* keyword of the
 :doc:`run_style respa <run_style>` command.  It does not support the
 *inner*\ , *middle*\ , *outer* keywords.
 
-
 ----------
 
-
 Restrictions
 """"""""""""
 
-
 This command is part of the USER-DPD package.  It is only enabled if
 LAMMPS was built with that package.  See the :doc:`Build package <Build_package>` doc page for more info.
 
@@ -206,29 +202,16 @@ Related commands
 
 **Default:** none
 
-
 ----------
 
-
 .. _Warren1:
 
-
-
 **(Warren)** Warren, Phys Rev E, 68, 066702 (2003).
 
 .. _Brennan1:
 
-
-
 **(Brennan)** Brennan, J Chem Phys Lett, 5, 2144-2149 (2014).
 
 .. _Moore1:
 
-
-
 **(Moore)** Moore, J Chem Phys, 144, 104501 (2016).
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/pair_multi_lucy_rx.rst b/doc/src/pair_multi_lucy_rx.rst
index 7a7f5cbb47..3824ca96cf 100644
--- a/doc/src/pair_multi_lucy_rx.rst
+++ b/doc/src/pair_multi_lucy_rx.rst
@@ -1,16 +1,15 @@
-.. index:: pair\_style multi/lucy/rx
+.. index:: pair_style multi/lucy/rx
 
-pair\_style multi/lucy/rx command
-=================================
+pair_style multi/lucy/rx command
+================================
 
-pair\_style multi/lucy/rx/kk command
-====================================
+pair_style multi/lucy/rx/kk command
+===================================
 
 Syntax
 """"""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    pair_style multi/lucy/rx style N keyword ...
 
@@ -21,14 +20,13 @@ Syntax
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    pair_style multi/lucy/rx linear 1000
    pair_style multi/lucy/rx linear 1000 fractional
    pair_style multi/lucy/rx linear 1000 molecular
-   pair_coeff \* \* multibody.table ENTRY1 h2o h2o 7.0
-   pair_coeff \* \* multibody.table ENTRY1 h2o 1fluid 7.0
+   pair_coeff * * multibody.table ENTRY1 h2o h2o 7.0
+   pair_coeff * * multibody.table ENTRY1 h2o 1fluid 7.0
 
 Description
 """""""""""
@@ -43,29 +41,34 @@ particle through a site-site interaction potential model.  Style
 following from the many-body form described in :ref:`(Moore) <Moore2>` and
 :ref:`(Warren) <Warren2>` as
 
-.. image:: Eqs/pair_multi_lucy.jpg
-   :align: center
+.. math::
 
-which consists of a density-dependent function, A(rho), and a
-radial-dependent weight function, omegaDD(rij).  The radial-dependent
-weight function, omegaDD(rij), is taken as the Lucy function:
+   F_{i}^{DD}(\rho_i,\rho_j,r_{ij}) = \frac{1}{2} \omega_{DD}\left(r_{ij}\right)
+   \left[A\left(\rho_i\right) + A\left(\rho_j\right)\right]e_{ij}
 
-.. image:: Eqs/pair_multi_lucy2.jpg
-   :align: center
+which consists of a density-dependent function, :math:`A(\rho)`, and a
+radial-dependent weight function, :math:`\omega_{DD}(r_{ij})`.  The
+radial-dependent weight function, :math:`\omega_{DD}(r_{ij})`, is taken
+as the Lucy function:
+
+.. math::
+
+   \omega_{DD}\left(r_{ij}\right) = \left(1+\frac{3r_{ij}}{r_{cut}}\right)\left(1+\frac{r_{ij}}{r_{cut}}\right)^3
 
 The density-dependent energy for a given particle is given by:
 
-.. image:: Eqs/pair_multi_lucy_energy.jpg
-   :align: center
+.. math::
+
+   u_{i}^{DD}\left(\rho_{i}\right) = \frac{\pi r_{cut}^4}{84} \int_{\rho_0}^{\rho_i} A\left(\rho'\right) d\rho'
 
 See the supporting information of :ref:`(Brennan) <Brennan2>` or the
 publication by :ref:`(Moore) <Moore2>` for more details on the functional
 form.
 
-An interpolation table is used to evaluate the density-dependent
-energy (Integral(A(rho)drho) and force (A(rho)).  Note that the
-pre-factor to the energy is computed after the interpolation, thus the
-Integral(A(rho)drho will have units of energy / length\^4.
+An interpolation table is used to evaluate the density-dependent energy
+(:math:`\int A(\rho') d \rho'`) and force (:math:`A(\rho')`).  Note that
+the pre-factor to the energy is computed after the interpolation, thus
+the :math:`\int A(\rho') d\rho'` will have units of energy / length\^4.
 
 The interpolation table is created as a pre-computation by fitting
 cubic splines to the file values and interpolating the
@@ -114,14 +117,11 @@ associated with the interacting coarse-grained particles (see the
 stored before and after the reaction kinetics solver is applied, where
 the difference is defined to be the internal chemical energy (uChem).
 
-
 ----------
 
-
 The format of a tabulated file is a series of one or more sections,
 defined as follows (without the parenthesized comments):
 
-
 .. parsed-literal::
 
    # Density-dependent function (one or more comment or blank lines)
@@ -138,7 +138,7 @@ A section begins with a non-blank line whose 1st character is not a
 "#"; blank lines or lines starting with "#" can be used as comments
 between sections.  The first line begins with a keyword which
 identifies the section.  The line can contain additional text, but the
-initial text must match the argument specified in the pair\_coeff
+initial text must match the argument specified in the pair_coeff
 command.  The next line lists (in any order) one or more parameters
 for the table.  Each parameter is a keyword followed by one or more
 numeric values.
@@ -146,7 +146,7 @@ numeric values.
 The parameter "N" is required and its value is the number of table
 entries that follow.  Note that this may be different than the *N*
 specified in the :doc:`pair_style multi/lucy/rx <pair_multi_lucy_rx>`
-command.  Let Ntable = *N* in the pair\_style command, and Nfile = "N"
+command.  Let Ntable = *N* in the pair_style command, and Nfile = "N"
 in the tabulated file.  What LAMMPS does is a preliminary
 interpolation by creating splines using the Nfile tabulated values as
 nodal points.  It uses these to interpolate the density-dependent
@@ -194,10 +194,8 @@ Note that one file can contain many sections, each with a tabulated
 potential.  LAMMPS reads the file section by section until it finds
 one that matches the specified keyword.
 
-
 ----------
 
-
 **Mixing, shift, table, tail correction, restart, rRESPA info**\ :
 
 This pair style does not support mixing.  Thus, coefficients for all
@@ -206,21 +204,19 @@ I,J pairs must be specified explicitly.
 The :doc:`pair_modify <pair_modify>` shift, table, and tail options are
 not relevant for this pair style.
 
-This pair style writes the settings for the "pair\_style multi/lucy/rx" command
-to :doc:`binary restart files <restart>`, so a pair\_style command does
+This pair style writes the settings for the "pair_style multi/lucy/rx" command
+to :doc:`binary restart files <restart>`, so a pair_style command does
 not need to specified in an input script that reads a restart file.
 However, the coefficient information is not stored in the restart
-file, since it is tabulated in the potential files.  Thus, pair\_coeff
+file, since it is tabulated in the potential files.  Thus, pair_coeff
 commands do need to be specified in the restart input script.
 
 This pair style can only be used via the *pair* keyword of the
 :doc:`run_style respa <run_style>` command.  It does not support the
 *inner*\ , *middle*\ , *outer* keywords.
 
-
 ----------
 
-
 Styles with a *gpu*\ , *intel*\ , *kk*\ , *omp*\ , or *opt* suffix are
 functionally the same as the corresponding style without the suffix.
 They have been optimized to run faster, depending on your available
@@ -239,14 +235,11 @@ by including their suffix, or you can use the :doc:`-suffix command-line switch
 See the :doc:`Speed packages <Speed_packages>` doc page for more
 instructions on how to use the accelerated styles effectively.
 
-
 ----------
 
-
 Restrictions
 """"""""""""
 
-
 This command is part of the USER-DPD package.  It is only enabled if
 LAMMPS was built with that package.  See the :doc:`Build package <Build_package>` doc page for more info.
 
@@ -257,29 +250,16 @@ Related commands
 
 **Default:** fractional weighting
 
-
 ----------
 
-
 .. _Warren2:
 
-
-
 **(Warren)** Warren, Phys Rev E, 68, 066702 (2003).
 
 .. _Brennan2:
 
-
-
 **(Brennan)** Brennan, J Chem Phys Lett, 5, 2144-2149 (2014).
 
 .. _Moore2:
 
-
-
 **(Moore)** Moore, J Chem Phys, 144, 104501 (2016).
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/pair_nb3b_harmonic.rst b/doc/src/pair_nb3b_harmonic.rst
index bc26e9b5ae..9d63df65d5 100644
--- a/doc/src/pair_nb3b_harmonic.rst
+++ b/doc/src/pair_nb3b_harmonic.rst
@@ -1,24 +1,22 @@
-.. index:: pair\_style nb3b/harmonic
+.. index:: pair_style nb3b/harmonic
 
-pair\_style nb3b/harmonic command
-=================================
+pair_style nb3b/harmonic command
+================================
 
 Syntax
 """"""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    pair_style nb3b/harmonic
 
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    pair_style nb3b/harmonic
-   pair_coeff \* \* MgOH.nb3bharmonic Mg O H
+   pair_coeff * * MgOH.nb3bharmonic Mg O H
 
 Description
 """""""""""
@@ -26,18 +24,19 @@ Description
 This pair style computes a non-bonded 3-body harmonic potential for the
 energy E of a system of atoms as
 
-.. image:: Eqs/pair_nb3b_harmonic.jpg
-   :align: center
+.. math::
 
-where *theta\_0* is the equilibrium value of the angle and *K* is a
+   E = K (\theta - \theta_0)^2
+
+where :math:`\theta_0` is the equilibrium value of the angle and *K* is a
 prefactor. Note that the usual 1/2 factor is included in *K*\ . The form
-of the potential is identical to that used in angle\_style *harmonic*\ ,
+of the potential is identical to that used in angle_style *harmonic*\ ,
 but in this case, the atoms do not need to be explicitly bonded.
 
-Only a single pair\_coeff command is used with this style which
+Only a single pair_coeff command is used with this style which
 specifies a potential file with parameters for specified elements.
 These are mapped to LAMMPS atom types by specifying N additional
-arguments after the filename in the pair\_coeff command, where N is the
+arguments after the filename in the pair_coeff command, where N is the
 number of LAMMPS atom types:
 
 * filename
@@ -49,12 +48,11 @@ to specify the path for the potential file.
 As an example, imagine a file SiC.nb3b.harmonic has potential values
 for Si and C.  If your LAMMPS simulation has 4 atoms types and you
 want the 1st 3 to be Si, and the 4th to be C, you would use the
-following pair\_coeff command:
+following pair_coeff command:
 
+.. code-block:: LAMMPS
 
-.. parsed-literal::
-
-   pair_coeff \* \* SiC.nb3b.harmonic Si Si Si C
+   pair_coeff * * SiC.nb3b.harmonic Si Si Si C
 
 The 1st 2 arguments must be \* \* so as to span all LAMMPS atom types.
 The first three Si arguments map LAMMPS atom types 1,2,3 to the Si
@@ -63,10 +61,12 @@ type 4 to the C element in the potential file.  If a mapping value is
 specified as NULL, the mapping is not performed.  This can be used
 when the potential is used as part of the *hybrid* pair style.  The
 NULL values are placeholders for atom types that will be used with
-other potentials. An example of a pair\_coeff command for use with the
+other potentials. An example of a pair_coeff command for use with the
 *hybrid* pair style is:
 
-pair\_coeff \* \* nb3b/harmonic MgOH.nb3b.harmonic Mg O H
+.. code-block:: LAMMPS
+
+   pair_coeff * * nb3b/harmonic MgOH.nb3b.harmonic Mg O H
 
 Three-body non-bonded harmonic files in the *potentials* directory of
 the LAMMPS distribution have a ".nb3b.harmonic" suffix.  Lines that
@@ -76,32 +76,29 @@ triplet of elements.
 Each entry has six arguments. The first three are atom types as
 referenced in the LAMMPS input file. The first argument specifies the
 central atom. The fourth argument indicates the *K* parameter. The
-fifth argument indicates *theta\_0*. The sixth argument indicates a
+fifth argument indicates :math:`\theta_0`. The sixth argument indicates a
 separation cutoff in Angstroms.
 
 For a given entry, if the second and third arguments are identical,
 then the entry is for a cutoff for the distance between types 1 and 2
-(values for *K* and *theta\_0* are irrelevant in this case).
+(values for *K* and :math:`\theta_0` are irrelevant in this case).
 
-For a given entry, if the first three arguments are all different,
-then the entry is for the *K* and *theta\_0* parameters (the cutoff in
+For a given entry, if the first three arguments are all different, then
+the entry is for the *K* and :math:`\theta_0` parameters (the cutoff in
 this case is irrelevant).
 
 It is required that the potential file contains entries for *all*
-permutations of the elements listed in the pair\_coeff command.
+permutations of the elements listed in the pair_coeff command.
 If certain combinations are not parameterized the corresponding
 parameters should be set to zero. The potential file can also
 contain entries for additional elements which are not used in
 a particular simulation; LAMMPS ignores those entries.
 
-
 ----------
 
-
 Restrictions
 """"""""""""
 
-
 This pair style can only be used if LAMMPS was built with the MANYBODY
 package.  See the :doc:`Build package <Build_package>` doc page for more
 info.
@@ -112,8 +109,3 @@ Related commands
 :doc:`pair_coeff <pair_coeff>`
 
 **Default:** none
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/pair_nm.rst b/doc/src/pair_nm.rst
index d0ef9efdf5..196747b291 100644
--- a/doc/src/pair_nm.rst
+++ b/doc/src/pair_nm.rst
@@ -1,36 +1,35 @@
-.. index:: pair\_style nm/cut
+.. index:: pair_style nm/cut
 
-pair\_style nm/cut command
-==========================
+pair_style nm/cut command
+=========================
 
-pair\_style nm/cut/coul/cut command
+pair_style nm/cut/coul/cut command
+==================================
+
+pair_style nm/cut/coul/long command
 ===================================
 
-pair\_style nm/cut/coul/long command
-====================================
+pair_style nm/cut/omp command
+=============================
 
-pair\_style nm/cut/omp command
-==============================
+pair_style nm/cut/coul/cut/omp command
+======================================
 
-pair\_style nm/cut/coul/cut/omp command
+pair_style nm/cut/coul/long/omp command
 =======================================
 
-pair\_style nm/cut/coul/long/omp command
-========================================
-
 Syntax
 """"""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    pair_style style args
 
 * style = *nm/cut* or *nm/cut/coul/cut* or *nm/cut/coul/long*
 * args = list of arguments for a particular style
-  
+
   .. parsed-literal::
-  
+
        *nm/cut* args = cutoff
          cutoff = global cutoff for Pair interactions (distance units)
        *nm/cut/coul/cut* args = cutoff (cutoff2)
@@ -40,24 +39,21 @@ Syntax
          cutoff = global cutoff for Pair (and Coulombic if only 1 arg) (distance units)
          cutoff2 = global cutoff for Coulombic (optional) (distance units)
 
-
-
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    pair_style nm/cut 12.0
-   pair_coeff \* \* 0.01 5.4 8.0 7.0
+   pair_coeff * * 0.01 5.4 8.0 7.0
    pair_coeff 1 1 0.01 4.4 7.0 6.0
 
    pair_style nm/cut/coul/cut 12.0 15.0
-   pair_coeff \* \* 0.01 5.4 8.0 7.0
+   pair_coeff * * 0.01 5.4 8.0 7.0
    pair_coeff 1 1 0.01 4.4 7.0 6.0
 
    pair_style nm/cut/coul/long 12.0 15.0
-   pair_coeff \* \* 0.01 5.4 8.0 7.0
+   pair_coeff * * 0.01 5.4 8.0 7.0
    pair_coeff 1 1 0.01 4.4 7.0 6.0
 
 Description
@@ -68,22 +64,25 @@ by :ref:`Clarke <Clarke>`, mainly used for ionic liquids.  A site can
 represent a single atom or a united-atom site.  The energy of an
 interaction has the following form:
 
-.. image:: Eqs/pair_nm.jpg
-   :align: center
+.. math::
 
-Rc is the cutoff.
+   E = \frac{E_0}{(n-m)} \left[ m \left(\frac{r_0}{r}\right)^n - n
+   \left(\frac{r_0}{r}\right)^m \right] \qquad r < r_c
+
+where :math:`r_c` is the cutoff.
 
 Style *nm/cut/coul/cut* adds a Coulombic pairwise interaction given by
 
-.. image:: Eqs/pair_coulomb.jpg
-   :align: center
+.. math::
 
-where C is an energy-conversion constant, Qi and Qj are the charges on
-the 2 atoms, and epsilon is the dielectric constant which can be set
-by the :doc:`dielectric <dielectric>` command.  If one cutoff is
-specified in the pair\_style command, it is used for both the NM and
-Coulombic terms.  If two cutoffs are specified, they are used as
-cutoffs for the NM and Coulombic terms respectively.
+   E = \frac{C q_i q_j}{\epsilon  r} \qquad r < r_c
+
+where :math:`C` is an energy-conversion constant, :math:`q_i` and :math:`q_j`
+are the charges on the 2 atoms, and epsilon is the dielectric constant which can
+be set by the :doc:`dielectric <dielectric>` command.  If one cutoff is
+specified in the pair_style command, it is used for both the N-M and Coulombic
+terms.  If two cutoffs are specified, they are used as cutoffs for the N-M and
+Coulombic terms respectively.
 
 Styles *nm/cut/coul/long* compute the same
 Coulombic interactions as style *nm/cut/coul/cut* except that an
@@ -101,30 +100,28 @@ examples above, or in the data file or restart files read by the
 :doc:`read_data <read_data>` or :doc:`read_restart <read_restart>`
 commands.
 
-* E0 (energy units)
-* r0 (distance units)
-* n (unitless)
-* m (unitless)
+* :math:`E_0` (energy units)
+* :math:`r_0` (distance units)
+* :math:`n` (unitless)
+* :math:`m` (unitless)
 * cutoff1 (distance units)
 * cutoff2 (distance units)
 
 The latter 2 coefficients are optional.  If not specified, the global
-NM and Coulombic cutoffs specified in the pair\_style command are used.
-If only one cutoff is specified, it is used as the cutoff for both NM
+N-M and Coulombic cutoffs specified in the pair_style command are used.
+If only one cutoff is specified, it is used as the cutoff for both N-M
 and Coulombic interactions for this type pair.  If both coefficients
-are specified, they are used as the NM and Coulombic cutoffs for this
+are specified, they are used as the N-M and Coulombic cutoffs for this
 type pair.  You cannot specify 2 cutoffs for style *nm*\ , since it
 has no Coulombic terms.
 
-For *nm/cut/coul/long* only the NM cutoff can be specified since a
+For *nm/cut/coul/long* only the N-M cutoff can be specified since a
 Coulombic cutoff cannot be specified for an individual I,J type pair.
 All type pairs use the same global Coulombic cutoff specified in the
-pair\_style command.
-
+pair_style command.
 
 ----------
 
-
 **Mixing, shift, table, tail correction, restart, rRESPA info**\ :
 
 These pair styles do not support mixing. Thus, coefficients for all
@@ -140,19 +137,17 @@ the short-range portion of the long-range Coulombic interaction.
 
 All of the *nm* pair styles support the :doc:`pair_modify <pair_modify>`
 tail option for adding a long-range tail correction to the energy and
-pressure for the NM portion of the pair interaction.
+pressure for the N-M portion of the pair interaction.
 
-All of the *nm* pair styles write their information to :doc:`binary restart files <restart>`, so pair\_style and pair\_coeff commands do not need
+All of the *nm* pair styles write their information to :doc:`binary restart files <restart>`, so pair_style and pair_coeff commands do not need
 to be specified in an input script that reads a restart file.
 
 All of the *nm* pair styles can only be used via the *pair* keyword of
 the :doc:`run_style respa <run_style>` command.  They do not support the
 *inner*\ , *middle*\ , *outer* keywords.
 
-
 ----------
 
-
 Styles with a *gpu*\ , *intel*\ , *kk*\ , *omp*\ , or *opt* suffix are
 functionally the same as the corresponding style without the suffix.
 They have been optimized to run faster, depending on your available
@@ -174,7 +169,6 @@ instructions on how to use the accelerated styles effectively.
 Restrictions
 """"""""""""
 
-
 These pair styles are part of the MISC package.  It is only enabled if
 LAMMPS was built with that package.  See the :doc:`Build package <Build_package>` doc page for more info.
 
@@ -185,17 +179,8 @@ Related commands
 
 **Default:** none
 
-
 ----------
 
-
 .. _Clarke:
 
-
-
 **(Clarke)** Clarke and Smith, J Chem Phys, 84, 2290 (1986).
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/pair_none.rst b/doc/src/pair_none.rst
index 04a763b8e0..2cb9cb608a 100644
--- a/doc/src/pair_none.rst
+++ b/doc/src/pair_none.rst
@@ -1,21 +1,19 @@
-.. index:: pair\_style none
+.. index:: pair_style none
 
-pair\_style none command
-========================
+pair_style none command
+=======================
 
 Syntax
 """"""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    pair_style none
 
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    pair_style none
 
@@ -43,7 +41,7 @@ building of a neighbor lists, but compute no pairwise interactions.
 
 Restrictions
 """"""""""""
- none
+none
 
 Related commands
 """"""""""""""""
@@ -51,8 +49,3 @@ Related commands
 :doc:`pair_style zero <pair_zero>`
 
 **Default:** none
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/pair_oxdna.rst b/doc/src/pair_oxdna.rst
index 2f6be35608..748a3affe7 100644
--- a/doc/src/pair_oxdna.rst
+++ b/doc/src/pair_oxdna.rst
@@ -1,36 +1,34 @@
-.. index:: pair\_style oxdna/excv
+.. index:: pair_style oxdna/excv
 
-pair\_style oxdna/excv command
-==============================
-
-pair\_style oxdna/stk command
+pair_style oxdna/excv command
 =============================
 
-pair\_style oxdna/hbond command
-===============================
+pair_style oxdna/stk command
+============================
 
-pair\_style oxdna/xstk command
+pair_style oxdna/hbond command
 ==============================
 
-pair\_style oxdna/coaxstk command
-=================================
+pair_style oxdna/xstk command
+=============================
+
+pair_style oxdna/coaxstk command
+================================
 
 Syntax
 """"""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    pair_style style1
 
-   pair_coeff \* \* style2 args
+   pair_coeff * * style2 args
 
 * style1 = *hybrid/overlay oxdna/excv oxdna/stk oxdna/hbond oxdna/xstk oxdna/coaxstk*
 
 * style2 = *oxdna/excv* or *oxdna/stk* or *oxdna/hbond* or *oxdna/xstk* or *oxdna/coaxstk*
 * args = list of arguments for these particular styles
 
-
 .. parsed-literal::
 
      *oxdna/stk* args = seq T xi kappa 6.0 0.4 0.9 0.32 0.75 1.3 0 0.8 0.9 0 0.95 0.9 0 0.95 2.0 0.65 2.0 0.65
@@ -45,17 +43,16 @@ Syntax
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    pair_style hybrid/overlay oxdna/excv oxdna/stk oxdna/hbond oxdna/xstk oxdna/coaxstk
-   pair_coeff \* \* oxdna/excv    2.0 0.7 0.675 2.0 0.515 0.5 2.0 0.33 0.32
-   pair_coeff \* \* oxdna/stk     seqdep 0.1 1.3448 2.6568 6.0 0.4 0.9 0.32 0.75 1.3 0 0.8 0.9 0 0.95 0.9 0 0.95 2.0 0.65 2.0 0.65
-   pair_coeff \* \* oxdna/hbond   seqdep 0.0 8.0 0.4 0.75 0.34 0.7 1.5 0 0.7 1.5 0 0.7 1.5 0 0.7 0.46 3.141592653589793 0.7 4.0 1.5707963267948966 0.45 4.0 1.5707963267948966 0.45
+   pair_coeff * * oxdna/excv    2.0 0.7 0.675 2.0 0.515 0.5 2.0 0.33 0.32
+   pair_coeff * * oxdna/stk     seqdep 0.1 1.3448 2.6568 6.0 0.4 0.9 0.32 0.75 1.3 0 0.8 0.9 0 0.95 0.9 0 0.95 2.0 0.65 2.0 0.65
+   pair_coeff * * oxdna/hbond   seqdep 0.0 8.0 0.4 0.75 0.34 0.7 1.5 0 0.7 1.5 0 0.7 1.5 0 0.7 0.46 3.141592653589793 0.7 4.0 1.5707963267948966 0.45 4.0 1.5707963267948966 0.45
    pair_coeff 1 4 oxdna/hbond   seqdep 1.077 8.0 0.4 0.75 0.34 0.7 1.5 0 0.7 1.5 0 0.7 1.5 0 0.7 0.46 3.141592653589793 0.7 4.0 1.5707963267948966 0.45 4.0 1.5707963267948966 0.45
    pair_coeff 2 3 oxdna/hbond   seqdep 1.077 8.0 0.4 0.75 0.34 0.7 1.5 0 0.7 1.5 0 0.7 1.5 0 0.7 0.46 3.141592653589793 0.7 4.0 1.5707963267948966 0.45 4.0 1.5707963267948966 0.45
-   pair_coeff \* \* oxdna/xstk    47.5 0.575 0.675 0.495 0.655 2.25 0.791592653589793 0.58 1.7 1.0 0.68 1.7 1.0 0.68 1.5 0 0.65 1.7 0.875 0.68 1.7 0.875 0.68
-   pair_coeff \* \* oxdna/coaxstk 46.0 0.4 0.6 0.22 0.58 2.0 2.541592653589793 0.65 1.3 0 0.8 0.9 0 0.95 0.9 0 0.95 2.0 -0.65 2.0 -0.65
+   pair_coeff * * oxdna/xstk    47.5 0.575 0.675 0.495 0.655 2.25 0.791592653589793 0.58 1.7 1.0 0.68 1.7 1.0 0.68 1.5 0 0.65 1.7 0.875 0.68 1.7 0.875 0.68
+   pair_coeff * * oxdna/coaxstk 46.0 0.4 0.6 0.22 0.58 2.0 2.541592653589793 0.65 1.3 0 0.8 0.9 0 0.95 0.9 0 0.95 2.0 -0.65 2.0 -0.65
 
 Description
 """""""""""
@@ -66,9 +63,9 @@ excluded volume interaction *oxdna/excv*\ , the stacking *oxdna/stk*\ , cross-st
 and coaxial stacking interaction *oxdna/coaxstk* as well
 as the hydrogen-bonding interaction *oxdna/hbond* between complementary pairs of nucleotides on
 opposite strands. Average sequence or sequence-dependent stacking and base-pairing strengths
-are supported :ref:`(Sulc) <Sulc1>`. Quasi-unique base-pairing between nucleotides can be achieved by using 
-more complementary pairs of atom types like 5-8 and 6-7, 9-12 and 10-11, 13-16 and 14-15, etc. 
-This prevents the hybridization of in principle complementary bases within Ntypes/4 bases 
+are supported :ref:`(Sulc) <Sulc1>`. Quasi-unique base-pairing between nucleotides can be achieved by using
+more complementary pairs of atom types like 5-8 and 6-7, 9-12 and 10-11, 13-16 and 14-15, etc.
+This prevents the hybridization of in principle complementary bases within Ntypes/4 bases
 up and down along the backbone.
 
 The exact functional form of the pair styles is rather complex.
@@ -100,17 +97,15 @@ on the model, its implementation and performance as well as the structure of
 the data and input file. The preprint version of the article can be found
 `here <PDF/USER-CGDNA.pdf>`_.
 Please cite also the relevant oxDNA publications
-:ref:`(Ouldridge) <Ouldridge1>`, 
+:ref:`(Ouldridge) <Ouldridge1>`,
 :ref:`(Ouldridge-DPhil) <Ouldridge-DPhil1>`
 and :ref:`(Sulc) <Sulc1>`.
 
 ----------
 
-
 Restrictions
 """"""""""""
 
-
 These pair styles can only be used if LAMMPS was built with the
 USER-CGDNA package and the MOLECULE and ASPHERE package.  See the
 :doc:`Build package <Build_package>` doc page for more info.
@@ -122,9 +117,8 @@ Related commands
 :doc:`bond_style oxdna2/fene <bond_oxdna>`, :doc:`pair_style oxdna2/excv <pair_oxdna2>`,
 :doc:`bond_style oxrna2/fene <bond_oxdna>`, :doc:`pair_style oxrna2/excv <pair_oxrna2>`,
 :doc:`fix nve/dotc/langevin <fix_nve_dotc_langevin>`
- 
-**Default:** none
 
+**Default:** none
 
 ----------
 
@@ -143,8 +137,3 @@ Related commands
 .. _Sulc1:
 
 **(Sulc)** P. Sulc, F. Romano, T.E. Ouldridge, L. Rovigatti, J.P.K. Doye, A.A. Louis, J. Chem. Phys. 137, 135101 (2012).
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/pair_oxdna2.rst b/doc/src/pair_oxdna2.rst
index c57eb86c1d..465f46a913 100644
--- a/doc/src/pair_oxdna2.rst
+++ b/doc/src/pair_oxdna2.rst
@@ -1,39 +1,37 @@
-.. index:: pair\_style oxdna2/excv
+.. index:: pair_style oxdna2/excv
 
-pair\_style oxdna2/excv command
-===============================
-
-pair\_style oxdna2/stk command
+pair_style oxdna2/excv command
 ==============================
 
-pair\_style oxdna2/hbond command
-================================
+pair_style oxdna2/stk command
+=============================
 
-pair\_style oxdna2/xstk command
+pair_style oxdna2/hbond command
 ===============================
 
-pair\_style oxdna2/coaxstk command
-==================================
+pair_style oxdna2/xstk command
+==============================
 
-pair\_style oxdna2/dh command
-=============================
+pair_style oxdna2/coaxstk command
+=================================
+
+pair_style oxdna2/dh command
+============================
 
 Syntax
 """"""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    pair_style style1
 
-   pair_coeff \* \* style2 args
+   pair_coeff * * style2 args
 
 * style1 = *hybrid/overlay oxdna2/excv oxdna2/stk oxdna2/hbond oxdna2/xstk oxdna2/coaxstk oxdna2/dh*
 
 * style2 = *oxdna2/excv* or *oxdna2/stk* or *oxdna2/hbond* or *oxdna2/xstk* or *oxdna2/coaxstk* or *oxdna2/dh*
 * args = list of arguments for these particular styles
 
-
 .. parsed-literal::
 
      *oxdna2/stk* args = seq T xi kappa 6.0 0.4 0.9 0.32 0.75 1.3 0 0.8 0.9 0 0.95 0.9 0 0.95 2.0 0.65 2.0 0.65
@@ -52,18 +50,17 @@ Syntax
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    pair_style hybrid/overlay oxdna2/excv oxdna2/stk oxdna2/hbond oxdna2/xstk oxdna2/coaxstk oxdna2/dh
-   pair_coeff \* \* oxdna2/excv    2.0 0.7 0.675 2.0 0.515 0.5 2.0 0.33 0.32
-   pair_coeff \* \* oxdna2/stk     seqdep 0.1 1.3523 2.6717 6.0 0.4 0.9 0.32 0.75 1.3 0 0.8 0.9 0 0.95 0.9 0 0.95 2.0 0.65 2.0 0.65
-   pair_coeff \* \* oxdna2/hbond   seqdep 0.0 8.0 0.4 0.75 0.34 0.7 1.5 0 0.7 1.5 0 0.7 1.5 0 0.7 0.46 3.141592653589793 0.7 4.0 1.5707963267948966 0.45 4.0 1.5707963267948966 0.45
+   pair_coeff * * oxdna2/excv    2.0 0.7 0.675 2.0 0.515 0.5 2.0 0.33 0.32
+   pair_coeff * * oxdna2/stk     seqdep 0.1 1.3523 2.6717 6.0 0.4 0.9 0.32 0.75 1.3 0 0.8 0.9 0 0.95 0.9 0 0.95 2.0 0.65 2.0 0.65
+   pair_coeff * * oxdna2/hbond   seqdep 0.0 8.0 0.4 0.75 0.34 0.7 1.5 0 0.7 1.5 0 0.7 1.5 0 0.7 0.46 3.141592653589793 0.7 4.0 1.5707963267948966 0.45 4.0 1.5707963267948966 0.45
    pair_coeff 1 4 oxdna2/hbond   seqdep 1.0678 8.0 0.4 0.75 0.34 0.7 1.5 0 0.7 1.5 0 0.7 1.5 0 0.7 0.46 3.141592653589793 0.7 4.0 1.5707963267948966 0.45 4.0 1.5707963267948966 0.45
    pair_coeff 2 3 oxdna2/hbond   seqdep 1.0678 8.0 0.4 0.75 0.34 0.7 1.5 0 0.7 1.5 0 0.7 1.5 0 0.7 0.46 3.141592653589793 0.7 4.0 1.5707963267948966 0.45 4.0 1.5707963267948966 0.45
-   pair_coeff \* \* oxdna2/xstk    47.5 0.575 0.675 0.495 0.655 2.25 0.791592653589793 0.58 1.7 1.0 0.68 1.7 1.0 0.68 1.5 0 0.65 1.7 0.875 0.68 1.7 0.875 0.68
-   pair_coeff \* \* oxdna2/coaxstk 58.5 0.4 0.6 0.22 0.58 2.0 2.891592653589793 0.65 1.3 0 0.8 0.9 0 0.95 0.9 0 0.95 40.0 3.116592653589793
-   pair_coeff \* \* oxdna2/dh      0.1 0.5 0.815
+   pair_coeff * * oxdna2/xstk    47.5 0.575 0.675 0.495 0.655 2.25 0.791592653589793 0.58 1.7 1.0 0.68 1.7 1.0 0.68 1.5 0 0.65 1.7 0.875 0.68 1.7 0.875 0.68
+   pair_coeff * * oxdna2/coaxstk 58.5 0.4 0.6 0.22 0.58 2.0 2.891592653589793 0.65 1.3 0 0.8 0.9 0 0.95 0.9 0 0.95 40.0 3.116592653589793
+   pair_coeff * * oxdna2/dh      0.1 0.5 0.815
 
 Description
 """""""""""
@@ -74,9 +71,9 @@ excluded volume interaction *oxdna2/excv*\ , the stacking *oxdna2/stk*\ , cross-
 and coaxial stacking interaction *oxdna2/coaxstk*\ , electrostatic Debye-Hueckel interaction *oxdna2/dh*
 as well as the hydrogen-bonding interaction *oxdna2/hbond* between complementary pairs of nucleotides on
 opposite strands. Average sequence or sequence-dependent stacking and base-pairing strengths
-are supported :ref:`(Sulc) <Sulc2>`. Quasi-unique base-pairing between nucleotides can be achieved by using 
-more complementary pairs of atom types like 5-8 and 6-7, 9-12 and 10-11, 13-16 and 14-15, etc. 
-This prevents the hybridization of in principle complementary bases within Ntypes/4 bases 
+are supported :ref:`(Sulc) <Sulc2>`. Quasi-unique base-pairing between nucleotides can be achieved by using
+more complementary pairs of atom types like 5-8 and 6-7, 9-12 and 10-11, 13-16 and 14-15, etc.
+This prevents the hybridization of in principle complementary bases within Ntypes/4 bases
 up and down along the backbone.
 
 The exact functional form of the pair styles is rather complex.
@@ -112,11 +109,9 @@ Please cite also the relevant oxDNA2 publications
 
 ----------
 
-
 Restrictions
 """"""""""""
 
-
 These pair styles can only be used if LAMMPS was built with the
 USER-CGDNA package and the MOLECULE and ASPHERE package.  See the
 :doc:`Build package <Build_package>` doc page for more info.
@@ -131,7 +126,6 @@ Related commands
 
 **Default:** none
 
-
 ----------
 
 .. _Henrich2:
@@ -153,8 +147,3 @@ Related commands
 .. _Ouldridge2:
 
 **(Ouldridge)** T.E. Ouldridge, A.A. Louis, J.P.K. Doye, J. Chem. Phys. 134, 085101 (2011).
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/pair_oxrna2.rst b/doc/src/pair_oxrna2.rst
index 38e77e3368..0cca929c49 100644
--- a/doc/src/pair_oxrna2.rst
+++ b/doc/src/pair_oxrna2.rst
@@ -21,7 +21,6 @@ pair_style oxrna2/dh command
 Syntax
 """"""
 
-
 .. code-block:: LAMMPS
 
    pair_style style1
@@ -33,7 +32,6 @@ Syntax
 * style2 = *oxrna2/excv* or *oxrna2/stk* or *oxrna2/hbond* or *oxrna2/xstk* or *oxrna2/coaxstk* or *oxrna2/dh*
 * args = list of arguments for these particular styles
 
-
 .. parsed-literal::
 
      *oxrna2/stk* args = seq T xi kappa 6.0 0.43 0.93 0.35 0.78 0.9 0 0.95 0.9 0 0.95 1.3 0 0.8 1.3 0 0.8 2.0 0.65 2.0 0.65
@@ -41,7 +39,7 @@ Syntax
        T = temperature (oxDNA units, 0.1 = 300 K)
        xi = 1.40206 (temperature-independent coefficient in stacking strength)
        kappa = 2.77 (coefficient of linear temperature dependence in stacking strength)
-     *oxrna2/hbond* args = seq eps 8.0 0.4 0.75 0.34 0.7 1.5 0 0.7 1.5 0 0.7 1.5 0 0.7 0.46 3.141592653589793 0.7 4.0 1.5707963267948966 0.45 4.0 1.5707963267948966 0.45 
+     *oxrna2/hbond* args = seq eps 8.0 0.4 0.75 0.34 0.7 1.5 0 0.7 1.5 0 0.7 1.5 0 0.7 0.46 3.141592653589793 0.7 4.0 1.5707963267948966 0.45 4.0 1.5707963267948966 0.45
        seq = seqav (for average sequence base-pairing strength) or seqdep (for sequence-dependent base-pairing strength)
        eps = 0.870439 (between base pairs A-T, C-G and G-T) or 0 (all other pairs)
      *oxrna2/dh* args = T rhos qeff
@@ -52,7 +50,6 @@ Syntax
 Examples
 """"""""
 
-
 .. code-block:: LAMMPS
 
    pair_style hybrid/overlay oxrna2/excv oxrna2/stk oxrna2/hbond oxrna2/xstk oxrna2/coaxstk oxrna2/dh
@@ -75,9 +72,9 @@ excluded volume interaction *oxrna2/excv*\ , the stacking *oxrna2/stk*\ , cross-
 and coaxial stacking interaction *oxrna2/coaxstk*\ , electrostatic Debye-Hueckel interaction *oxrna2/dh*
 as well as the hydrogen-bonding interaction *oxrna2/hbond* between complementary pairs of nucleotides on
 opposite strands. Average sequence or sequence-dependent stacking and base-pairing strengths
-are supported :ref:`(Sulc2) <Sulc32>`. Quasi-unique base-pairing between nucleotides can be achieved by using 
-more complementary pairs of atom types like 5-8 and 6-7, 9-12 and 10-11, 13-16 and 14-15, etc. 
-This prevents the hybridization of in principle complementary bases within Ntypes/4 bases 
+are supported :ref:`(Sulc2) <Sulc32>`. Quasi-unique base-pairing between nucleotides can be achieved by using
+more complementary pairs of atom types like 5-8 and 6-7, 9-12 and 10-11, 13-16 and 14-15, etc.
+This prevents the hybridization of in principle complementary bases within Ntypes/4 bases
 up and down along the backbone.
 
 The exact functional form of the pair styles is rather complex.
@@ -113,11 +110,9 @@ Please cite also the relevant oxRNA2 publications
 
 ----------
 
-
 Restrictions
 """"""""""""
 
-
 These pair styles can only be used if LAMMPS was built with the
 USER-CGDNA package and the MOLECULE and ASPHERE package.  See the
 :doc:`Build package <Build_package>` doc page for more info.
@@ -134,7 +129,6 @@ Related commands
 
 none
 
-
 ----------
 
 .. _Henrich3:
diff --git a/doc/src/pair_peri.rst b/doc/src/pair_peri.rst
index c618aeccca..2b3d3e9b99 100644
--- a/doc/src/pair_peri.rst
+++ b/doc/src/pair_peri.rst
@@ -1,28 +1,27 @@
-.. index:: pair\_style peri/pmb
+.. index:: pair_style peri/pmb
 
-pair\_style peri/pmb command
-============================
+pair_style peri/pmb command
+===========================
 
-pair\_style peri/pmb/omp command
-================================
+pair_style peri/pmb/omp command
+===============================
 
-pair\_style peri/lps command
-============================
+pair_style peri/lps command
+===========================
 
-pair\_style peri/lps/omp command
-================================
+pair_style peri/lps/omp command
+===============================
 
-pair\_style peri/ves command
-============================
+pair_style peri/ves command
+===========================
 
-pair\_style peri/eps command
-============================
+pair_style peri/eps command
+===========================
 
 Syntax
 """"""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    pair_style style
 
@@ -31,20 +30,19 @@ Syntax
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    pair_style peri/pmb
-   pair_coeff \* \* 1.6863e22 0.0015001 0.0005 0.25
+   pair_coeff * * 1.6863e22 0.0015001 0.0005 0.25
 
    pair_style peri/lps
-   pair_coeff \* \* 14.9e9 14.9e9 0.0015001 0.0005 0.25
+   pair_coeff * * 14.9e9 14.9e9 0.0015001 0.0005 0.25
 
    pair_style peri/ves
-   pair_coeff \* \* 14.9e9 14.9e9 0.0015001 0.0005 0.25 0.5 0.001
+   pair_coeff * * 14.9e9 14.9e9 0.0015001 0.0005 0.25 0.5 0.001
 
    pair_style peri/eps
-   pair_coeff \* \* 14.9e9 14.9e9 0.0015001 0.0005 0.25 118.43
+   pair_coeff * * 14.9e9 14.9e9 0.0015001 0.0005 0.25 118.43
 
 Description
 """""""""""
@@ -75,8 +73,8 @@ R. Rahman and J. T. Foster at University of Texas at San Antonio.  The
 original VES formulation is described in "(Mitchell2011)" and the
 original EPS formulation is in "(Mitchell2011a)".  Additional PDF docs
 that describe the VES and EPS implementations are include in the
-LAMMPS distribution in `doc/PDF/PDLammps\_VES.pdf <PDF/PDLammps_VES.pdf>`_ and
-`doc/PDF/PDLammps\_EPS.pdf <PDF/PDLammps_EPS.pdf>`_.  For questions
+LAMMPS distribution in `doc/PDF/PDLammps_VES.pdf <PDF/PDLammps_VES.pdf>`_ and
+`doc/PDF/PDLammps_EPS.pdf <PDF/PDLammps_EPS.pdf>`_.  For questions
 regarding the VES and EPS models in LAMMPS you can contact R. Rahman
 (rezwanur.rahman at utsa.edu).
 
@@ -91,11 +89,11 @@ For the *peri/pmb* style:
 * c (energy/distance/volume\^2 units)
 * horizon (distance units)
 * s00 (unitless)
-* alpha (unitless)
+* :math:`\alpha` (unitless)
 
 C is the effectively a spring constant for Peridynamic bonds, the
 horizon is a cutoff distance for truncating interactions, and s00 and
-alpha are used as a bond breaking criteria.  The units of c are such
+:math:`\alpha` are used as a bond breaking criteria.  The units of c are such
 that c/distance = stiffness/volume\^2, where stiffness is
 energy/distance\^2 and volume is distance\^3.  See the users guide for
 more details.
@@ -106,10 +104,10 @@ For the *peri/lps* style:
 * G (force/area units)
 * horizon (distance units)
 * s00 (unitless)
-* alpha (unitless)
+* :math:`\alpha` (unitless)
 
 K is the bulk modulus and G is the shear modulus.  The horizon is a
-cutoff distance for truncating interactions, and s00 and alpha are
+cutoff distance for truncating interactions, and s00 and :math:`\alpha` are
 used as a bond breaking criteria. See the users guide for more
 details.
 
@@ -119,16 +117,16 @@ For the *peri/ves* style:
 * G (force/area units)
 * horizon (distance units)
 * s00 (unitless)
-* alpha (unitless)
-* m\_lambdai (unitless)
-* m\_taubi (unitless)
+* :math:`\alpha` (unitless)
+* m_lambdai (unitless)
+* m_taubi (unitless)
 
 K is the bulk modulus and G is the shear modulus. The horizon is a
-cutoff distance for truncating interactions, and s00 and alpha are
-used as a bond breaking criteria. m\_lambdai and m\_taubi are the
+cutoff distance for truncating interactions, and s00 and :math:`\alpha` are
+used as a bond breaking criteria. m_lambdai and m_taubi are the
 viscoelastic relaxation parameter and time constant,
-respectively. m\_lambdai varies within zero to one. For very small
-values of m\_lambdai the viscoelastic model responds very similar to a
+respectively. m_lambdai varies within zero to one. For very small
+values of m_lambdai the viscoelastic model responds very similar to a
 linear elastic model. For details please see the description in
 "(Mtchell2011)".
 
@@ -138,18 +136,16 @@ For the *peri/eps* style:
 * G (force/area units)
 * horizon (distance units)
 * s00 (unitless)
-* alpha (unitless)
-* m\_yield\_stress (force/area units)
+* :math:`\alpha` (unitless)
+* m_yield_stress (force/area units)
 
 K is the bulk modulus and G is the shear modulus. The horizon is a
-cutoff distance and s00 and alpha are used as a bond breaking
-criteria.  m\_yield\_stress is the yield stress of the material. For
+cutoff distance and s00 and :math:`\alpha` are used as a bond breaking
+criteria.  m_yield_stress is the yield stress of the material. For
 details please see the description in "(Mtchell2011a)".
 
-
 ----------
 
-
 Styles with a *gpu*\ , *intel*\ , *kk*\ , *omp*\ , or *opt* suffix are
 functionally the same as the corresponding style without the suffix.
 They have been optimized to run faster, depending on your available
@@ -168,10 +164,8 @@ by including their suffix, or you can use the :doc:`-suffix command-line switch
 See the :doc:`Speed packages <Speed_packages>` doc page for more
 instructions on how to use the accelerated styles effectively.
 
-
 ----------
 
-
 **Mixing, shift, table, tail correction, restart, rRESPA info**\ :
 
 These pair styles do not support mixing.  Thus, coefficients for all
@@ -183,21 +177,18 @@ shift option.
 The :doc:`pair_modify <pair_modify>` table and tail options are not
 relevant for these pair styles.
 
-These pair styles write their information to :doc:`binary restart files <restart>`, so pair\_style and pair\_coeff commands do not need
+These pair styles write their information to :doc:`binary restart files <restart>`, so pair_style and pair_coeff commands do not need
 to be specified in an input script that reads a restart file.
 
 These pair styles can only be used via the *pair* keyword of the
 :doc:`run_style respa <run_style>` command.  They do not support the
 *inner*\ , *middle*\ , *outer* keywords.
 
-
 ----------
 
-
 Restrictions
 """"""""""""
 
-
 All of these styles are part of the PERI package. They are only
 enabled if LAMMPS was built with that package.  See the :doc:`Build package <Build_package>` doc page for more info.
 
@@ -208,47 +199,30 @@ Related commands
 
 **Default:** none
 
-
 ----------
 
-
 .. _Parks:
 
-
-
 **(Parks)** Parks, Lehoucq, Plimpton, Silling, Comp Phys Comm, 179(11),
 777-783 (2008).
 
 .. _Silling2000:
 
-
-
 **(Silling 2000)** Silling, J Mech Phys Solids, 48, 175-209 (2000).
 
 .. _Silling2007:
 
-
-
 **(Silling 2007)** Silling, Epton, Weckner, Xu, Askari, J Elasticity,
 88, 151-184 (2007).
 
 .. _Mitchell2011:
 
-
-
 **(Mitchell2011)** Mitchell. A non-local, ordinary-state-based
 viscoelasticity model for peridynamics. Sandia National Lab Report,
 8064:1-28 (2011).
 
 .. _Mitchell2011a:
 
-
-
 **(Mitchell2011a)** Mitchell. A Nonlocal, Ordinary, State-Based
 Plasticity Model for Peridynamics. Sandia National Lab Report,
 3166:1-34 (2011).
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/pair_polymorphic.rst b/doc/src/pair_polymorphic.rst
index ff522ae6b0..c0db3f10a4 100644
--- a/doc/src/pair_polymorphic.rst
+++ b/doc/src/pair_polymorphic.rst
@@ -1,13 +1,12 @@
-.. index:: pair\_style polymorphic
+.. index:: pair_style polymorphic
 
-pair\_style polymorphic command
-===============================
+pair_style polymorphic command
+==============================
 
 Syntax
 """"""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    pair_style polymorphic
 
@@ -16,14 +15,13 @@ style = *polymorphic*
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    pair_style polymorphic
-   pair_coeff \* \* TlBr_msw.polymorphic Tl Br
-   pair_coeff \* \* AlCu_eam.polymorphic Al Cu
-   pair_coeff \* \* GaN_tersoff.polymorphic Ga N
-   pair_coeff \* \* GaN_sw.polymorphic GaN
+   pair_coeff * * TlBr_msw.polymorphic Tl Br
+   pair_coeff * * AlCu_eam.polymorphic Al Cu
+   pair_coeff * * GaN_tersoff.polymorphic Ga N
+   pair_coeff * * GaN_sw.polymorphic GaN
 
 Description
 """""""""""
@@ -31,64 +29,124 @@ Description
 The *polymorphic* pair style computes a 3-body free-form potential
 (:ref:`Zhou <Zhou3>`) for the energy E of a system of atoms as
 
-.. image:: Eqs/polymorphic1.jpg
-   :align: center
+.. math::
 
-.. image:: Eqs/polymorphic2.jpg
-   :align: center
+   E & = \frac{1}{2}\sum_{i=1}^{i=N}\sum_{j=1}^{j=N}\left[\left(1-\delta_{ij}\right)\cdot U_{IJ}\left(r_{ij}\right)-\left(1-\eta_{ij}\right)\cdot F_{IJ}\left(r_{ij}\right)\cdot V_{IJ}\left(r_{ij}\right)\right] \\
+   X_{ij} & = \sum_{k=i_1,k\neq i,j}^{i_N}W_{IK}\left(r_{ik}\right)\cdot G_{JIK}\left(\theta_{jik}\right)\cdot P_{IK}\left(\Delta r_{jik}\right) \\
+   \Delta r_{jik} & = r_{ij}-\xi_{IJ}\cdot r_{ik}
 
-.. image:: Eqs/polymorphic3.jpg
-   :align: center
+where I, J, K represent species of atoms i, j, and k, :math:`i_1, ...,
+i_N` represents a list of *i*\ 's neighbors, :math:`\delta_{ij}` is a
+Dirac constant (i.e., :math:`\delta_{ij} = 1` when :math:`i = j`, and
+:math:`\delta_{ij} = 0` otherwise), :math:`\eta_{ij}` is similar
+constant that can be set either to :math:`\eta_{ij} = \delta_{ij}` or
+:math:`\eta_{ij} = 1 - \delta_{ij}` depending on the potential type,
+:math:`U_{IJ}(r_{ij})`, :math:`V_{IJ}(r_{ij})`, :math:`W_{IK}(r_{ik})`
+are pair functions, :math:`G_{JIK}(\cos(\theta))` is an angular
+function, :math:`P_{IK}(\Delta r_{jik})` is a function of atomic spacing
+differential :math:`\Delta r_{jik} = r_{ij} - \xi_{IJ} \cdot r_{ik}`
+with :math:`\xi_{IJ}` being a pair-dependent parameter, and
+:math:`F_{IJ}(X_{ij})` is a function of the local environment variable
+:math:`X_{ij}`. This generic potential is fully defined once the
+constants :math:`\eta_{ij}` and :math:`\xi_{IJ}`, and the six functions
+:math:`U_{IJ}(r_{ij})`, :math:`V_{IJ}(r_{ij})`, :math:`W_{IK}(r_{ik})`,
+:math:`G_{JIK}(\cos(\theta))`, :math:`P_{IK}(\Delta r_{jik})`, and
+:math:`F_{IJ}(X_{ij})` are given. Note that these six functions are all
+one dimensional, and hence can be provided in an analytic or tabular
+form. This allows users to design different potentials solely based on a
+manipulation of these functions. For instance, the potential reduces to
+Stillinger-Weber potential (:ref:`SW <SW>`) if we set
 
-where I, J, K represent species of atoms i, j, and k, i\_1, ..., i\_N
-represents a list of i's neighbors, delta\_ij is a Direc constant
-(i.e., delta\_ij = 1 when i = j, and delta\_ij = 0 otherwise), eta\_ij is
-similar constant that can be set either to eta\_ij = delta\_ij or eta\_ij
-= 1 - delta\_ij depending on the potential type, U\_IJ(r\_ij),
-V\_IJ(r\_ij), W\_IK(r\_ik) are pair functions, G\_JIK(cos(theta)) is an
-angular function, P\_IK(delta r\_jik) is a function of atomic spacing
-differential delta r\_jik = r\_ij - xi\_IJ\*r\_ik with xi\_IJ being a
-pair-dependent parameter, and F\_IJ(X\_ij) is a function of the local
-environment variable X\_ij. This generic potential is fully defined
-once the constants eta\_ij and xi\_IJ, and the six functions U\_IJ(r\_ij),
-V\_IJ(r\_ij), W\_IK(r\_ik), G\_JIK(cos(theta)), P\_IK(delta r\_jik), and
-F\_IJ(X\_ij) are given. Note that these six functions are all one
-dimensional, and hence can be provided in an analytic or tabular
-form. This allows users to design different potentials solely based on
-a manipulation of these functions. For instance, the potential reduces
-to Stillinger-Weber potential (:ref:`SW <SW>`) if we set
+.. math::
 
-.. image:: Eqs/polymorphic4.jpg
-   :align: center
+   \left\{\begin{array}{l}
+   \eta_{ij} = \delta_{ij},\xi_{IJ}=0 \\
+   U_{IJ}\left(r\right)=A_{IJ}\cdot\epsilon_{IJ}\cdot \left(\frac{\sigma_{IJ}}{r}\right)^q\cdot \left[B_{IJ}\cdot \left(\frac{\sigma_{IJ}}{r}\right)^{p-q}-1\right]\cdot exp\left(\frac{\sigma_{IJ}}{r-a_{IJ}\cdot \sigma_{IJ}}\right) \\
+   V_{IJ}\left(r\right)=\sqrt{\lambda_{IJ}\cdot \epsilon_{IJ}}\cdot exp\left(\frac{\gamma_{IJ}\cdot \sigma_{IJ}}{r-a_{IJ}\cdot \sigma_{IJ}}\right) \\
+   F_{IJ}\left(X\right)=-X \\
+   P_{IJ}\left(\Delta r\right)=1 \\
+   W_{IJ}\left(r\right)=\sqrt{\lambda_{IJ}\cdot \epsilon_{IJ}}\cdot exp\left(\frac{\gamma_{IJ}\cdot \sigma_{IJ}}{r-a_{IJ}\cdot \sigma_{IJ}}\right) \\
+   G_{JIK}\left(\theta\right)=\left(cos\theta+\frac{1}{3}\right)^2
+   \end{array}\right.
 
 The potential reduces to Tersoff types of potential
 (:ref:`Tersoff <Tersoff>` or :ref:`Albe <poly-Albe>`) if we set
 
-.. image:: Eqs/polymorphic5.jpg
-   :align: center
+.. math::
 
-.. image:: Eqs/polymorphic6.jpg
-   :align: center
+   \left\{\begin{array}{l}
+   \eta_{ij}=\delta_{ij},\xi_{IJ}=1 \\
+   U_{IJ}\left(r\right)=\frac{D_{e,IJ}}{S_{IJ}-1}\cdot exp\left[-\beta_{IJ}\sqrt{2S_{IJ}\left(r-r_{e,IJ}\right)}\right]\cdot f_{c,IJ}\left(r\right) \\
+   V_{IJ}\left(r\right)=\frac{S_{IJ}\cdot D_{e,IJ}}{S_{IJ}-1}\cdot exp\left[-\beta_{IJ}\sqrt{\frac{2}{S_{IJ}}\left(r-r_{e,IJ}\right)}\right]\cdot f_{c,IJ}\left(r\right) \\
+   F_{IJ}\left(X\right)=\left(1+X\right)^{-\frac{1}{2}} \\
+   P_{IJ}\left(\Delta r\right)=exp\left(2\mu_{IK}\cdot \Delta r\right) \\
+   W_{IJ}\left(r\right)=f_{c,IK}\left(r\right) \\
+   G_{JIK}\left(\theta\right)=\gamma_{IK}\left[1+\frac{c_{IK}^2}{d_{IK}^2}-\frac{c_{IK}^2}{d_{IK}^2+\left(h_{IK}+cos\theta\right)^2}\right]
+   \end{array}\right.
+
+.. math::
+
+   f_{c,IJ}=\left\{\begin{array}{lr}
+   1, & r\leq r_{s,IJ} \\
+   \frac{1}{2}+\frac{1}{2} cos \left[\frac{\pi \left(r-r_{s,IJ}\right)}{r_{c,IJ}-r_{s,IJ}}\right], & r_{s,IJ}<r<r_{c,IJ} \\
+   0, & r \geq r_{c,IJ} \\
+   \end{array}\right.
 
 The potential reduces to Rockett-Tersoff (:ref:`Wang <Wang3>`) type if we set
 
-.. image:: Eqs/polymorphic7.jpg
-   :align: center
+.. math::
 
-.. image:: Eqs/polymorphic6.jpg
-   :align: center
+   \left\{\begin{array}{l}
+   \eta_{ij}=\delta_{ij},\xi_{IJ}=1 \\
+   U_{IJ}\left(r\right)=\left\{\begin{array}{lr}
+   A_{IJ}\cdot exp\left(-\lambda_{1,IJ}\cdot r\right)\cdot f_{c,IJ}\left(r\right), & r\leq r_{s,1,IJ} \\
+   A_{IJ}\cdot exp\left(-\lambda_{1,IJ}\cdot r\right)\cdot f_{c,IJ}\left(r\right)\cdot f_{c,1,IJ}\left(r\right), & r_{s,1,IJ}<r<r_{c,1,IJ} \\
+   0, & r\ge r_{c,1,IJ}
+   \end{array}\right. \\
+   V_{IJ}\left(r\right)=\left\{\begin{array}{lr}
+   B_{IJ} \cdot exp\left(-\lambda_{2,IJ}\cdot r\right)\cdot f_{c,IJ}\left(r\right), & r\le r_{s,1,IJ} \\
+   B_{IJ} \cdot exp\left(-\lambda_{2,IJ}\cdot r\right)\cdot f_{c,IJ}\left(r\right)+A_{IJ}\cdot exp\left(-\lambda_{1,IJ}\cdot r\right)\cdot & \\ ~~~~~~ f_{c,IJ}\left(r\right)\cdot \left[1-f_{c,1,IJ}\left(r\right)\right], & r_{s,1,IJ}<r<r_{c,1,IJ} \\
+   B_{IJ} \cdot exp\left(-\lambda_{2,IJ}\cdot r\right)\cdot f_{c,IJ}\left(r\right)+A_{IJ}\cdot exp\left(-\lambda_{1,IJ}\cdot r\right)\cdot & \\ ~~~~~~ f_{c,IJ}\left(r\right) & r \ge r_{c,1,IJ}
+   \end{array}\right. \\
+   F_{IJ}\left(X\right)=\left[1+\left(\beta_{IJ}\cdot X\right)^{n_{IJ}}\right]^{-\frac{1}{2n_{IJ}}} \\
+   P_{IJ}\left(\Delta r\right)=exp\left(\lambda_{3,IK}\cdot \Delta r^3\right) \\
+   W_{IJ}\left(r\right)=f_{c,IK}\left(r\right) \\
+   G_{JIK}\left(\theta\right)=1+\frac{c_{IK}^2}{d_{IK}^2}-\frac{c_{IK}^2}{d_{IK}^2+\left(h_{IK}+cos\theta\right)^2}
+   \end{array}\right.
 
-.. image:: Eqs/polymorphic8.jpg
-   :align: center
+.. math::
+
+   f_{c,IJ}=\left\{\begin{array}{lr}
+   1, & r\leq r_{s,IJ} \\
+   \frac{1}{2}+\frac{1}{2} cos \left[\frac{\pi \left(r-r_{s,IJ}\right)}{r_{c,IJ}-r_{s,IJ}}\right], & r_{s,IJ}<r<r_{c,IJ} \\
+   0, & r \geq r_{c,IJ} \\
+   \end{array}\right.
+
+.. math::
+
+   f_{c,1,IJ}=\left\{\begin{array}{lr}
+   1, & r\leq r_{s,1,IJ} \\
+   \frac{1}{2}+\frac{1}{2} cos \left[\frac{\pi \left(r-r_{s,1,IJ}\right)}{r_{c,1,IJ}-r_{s,1,IJ}}\right], & r_{s,1,IJ}<r<r_{c,1,IJ} \\
+   0, & r \geq r_{c,1,IJ} \\
+   \end{array}\right.
 
 The potential becomes embedded atom method (:ref:`Daw <poly-Daw>`) if we set
 
-.. image:: Eqs/polymorphic9.jpg
-   :align: center
+.. math::
 
-In the embedded atom method case, phi\_IJ(r\_ij) is the pair energy,
-F\_I(X) is the embedding energy, X is the local electron density, and
-f\_K(r) is the atomic electron density function.
+   \left\{\begin{array}{l}
+   \eta_{ij}=1-\delta_{ij},\xi_{IJ}=0 \\
+   U_{IJ}\left(r\right)=\phi_{IJ}\left(r\right) \\
+   V_{IJ}\left(r\right)=1 \\
+   F_{II}\left(X\right)=-2F_I\left(X\right) \\
+   P_{IJ}\left(\Delta r\right)=1 \\
+   W_{IJ}\left(r\right)=f_{K}\left(r\right) \\
+   G_{JIK}\left(\theta\right)=1
+   \end{array}\right.
+
+In the embedded atom method case, :math:`\phi_{IJ}(r_{ij})` is the pair
+energy, :math:`F_I(X)` is the embedding energy, *X* is the local
+electron density, and :math:`f_K(r)` is the atomic electron density function.
 
 If the tabulated functions are created using the parameters of sw,
 tersoff, and eam potentials, the polymorphic pair style will produce
@@ -103,29 +161,28 @@ pair style is different from the sw pair style in this case. It just
 means that the definitions of the atom energies and atom stresses are
 different.
 
-Only a single pair\_coeff command is used with the polymorphic style
+Only a single pair_coeff command is used with the polymorphic style
 which specifies an potential file for all needed elements. These are
 mapped to LAMMPS atom types by specifying N additional arguments after
-the filename in the pair\_coeff command, where N is the number of
+the filename in the pair_coeff command, where N is the number of
 LAMMPS atom types:
 
 * filename
 * N element names = mapping of Tersoff elements to atom types
 
-See the pair\_coeff doc page for alternate ways to specify the path for
+See the pair_coeff doc page for alternate ways to specify the path for
 the potential file.  Several files for polymorphic potentials are
-included in the potentials dir of the LAMMPS distribution.  They have a
-"poly" suffix.
+included in the potentials directory of the LAMMPS distribution.  They
+have a "poly" suffix.
 
-As an example, imagine the SiC\_tersoff.polymorphic file has tabulated
+As an example, imagine the SiC_tersoff.poly file has tabulated
 functions for Si-C tersoff potential. If your LAMMPS simulation has 4
 atoms types and you want the 1st 3 to be Si, and the 4th to be C, you
-would use the following pair\_coeff command:
+would use the following pair_coeff command:
 
+.. code-block:: LAMMPS
 
-.. parsed-literal::
-
-   pair_coeff \* \* SiC_tersoff.polymorphic Si Si Si C
+   pair_coeff * * SiC_tersoff.poly Si Si Si C
 
 The 1st 2 arguments must be \* \* so as to span all LAMMPS atom
 types. The first three Si arguments map LAMMPS atom types 1,2,3 to the
@@ -141,19 +198,18 @@ have a ".poly" suffix. At the beginning of the files, an unlimited
 number of lines starting with '#' are used to describe the potential
 and are ignored by LAMMPS. The next line lists two numbers:
 
-
 .. parsed-literal::
 
-   ntypes eta
+   ntypes :math:`\eta`
 
 Here ntypes represent total number of species defined in the potential
-file, and eta = 0 or 1. The number ntypes must equal the total number
-of different species defined in the pair\_coeff command. When eta = 1,
-eta\_ij defined in the potential functions above is set to 1 -
-delta\_ij, otherwise eta\_ij is set to delta\_ij. The next ntypes lines
-each lists two numbers and a character string representing atomic
-number, atomic mass, and name of the species of the ntypes elements:
-
+file, and :math:`\eta = 0` or 1. The number ntypes must equal the total
+number of different species defined in the pair_coeff command. When
+:math:`\eta = 1`, :math:\eta_{ij}` defined in the potential functions
+above is set to :math:`1 - \delta_{ij}`, otherwise :math:`\eta_{ij}` is
+set to :math:`\delta_{ij}`. The next ntypes lines each lists two numbers
+and a character string representing atomic number, atomic mass, and name
+of the species of the ntypes elements:
 
 .. parsed-literal::
 
@@ -164,21 +220,20 @@ number, atomic mass, and name of the species of the ntypes elements:
 
 The next ntypes\*(ntypes+1)/2 lines contain two numbers:
 
-
 .. parsed-literal::
 
-   cut xi (1)
-   cut xi (2)
+   cut :math:`xi` (1)
+   cut :math:`xi` (2)
    ...
-   cut xi (ntypes\*(ntypes+1)/2)
+   cut :math:`xi` (ntypes\*(ntypes+1)/2)
 
-Here cut means the cutoff distance of the pair functions, xi is the
-same as defined in the potential functions above. The
+Here cut means the cutoff distance of the pair functions, :math:`\xi` is
+the same as defined in the potential functions above. The
 ntypes\*(ntypes+1)/2 lines are related to the pairs according to the
-sequence of first ii (self) pairs, i = 1, 2, ..., ntypes, and then
-then ij (cross) pairs, i = 1, 2, ..., ntypes-1, and j = i+1, i+2, ...,
-ntypes (i.e., the sequence of the ij pairs follows 11, 22, ..., 12,
-13, 14, ..., 23, 24, ...).
+sequence of first ii (self) pairs, i = 1, 2, ..., ntypes, and then then
+ij (cross) pairs, i = 1, 2, ..., ntypes-1, and j = i+1, i+2, ..., ntypes
+(i.e., the sequence of the ij pairs follows 11, 22, ..., 12, 13, 14,
+..., 23, 24, ...).
 
 The final blocks of the potential file are the U, V, W, P, G, and F
 functions are listed sequentially. First, U functions are given for
@@ -199,9 +254,9 @@ Tabulated functions are specified by spline n x1 x2, where n=number of
 point, (x1,x2)=range and then followed by n values evaluated uniformly
 over these argument ranges.  The valid argument ranges of the
 functions are between 0 <= r <= cut for the U(r), V(r), W(r)
-functions, -cutmax <= delta\_r <= cutmax for the P(delta\_r) functions,
--1 <= costheta <= 1 for the G(costheta) functions, and 0 <= X <= maxX
-for the F(X) functions.
+functions, -cutmax <= delta_r <= cutmax for the P(delta_r) functions,
+-1 <= :math:`\cos\theta` <= 1 for the G(:math:`\cos\theta`) functions,
+and 0 <= X <= maxX for the F(X) functions.
 
 **Mixing, shift, table tail correction, restart**\ :
 
@@ -209,19 +264,16 @@ This pair styles does not support the :doc:`pair_modify <pair_modify>`
 shift, table, and tail options.
 
 This pair style does not write their information to :doc:`binary restart files <restart>`, since it is stored in potential files. Thus, you
-need to re-specify the pair\_style and pair\_coeff commands in an input
+need to re-specify the pair_style and pair_coeff commands in an input
 script that reads a restart file.
 
-
 ----------
 
-
 Restrictions
 """"""""""""
 
-
-If using create\_atoms command, atomic masses must be defined in the
-input script. If using read\_data, atomic masses must be defined in the
+If using create_atoms command, atomic masses must be defined in the
+input script. If using read_data, atomic masses must be defined in the
 atomic structure data file.
 
 This pair style is part of the MANYBODY package. It is only enabled if
@@ -240,49 +292,30 @@ Related commands
 
 :doc:`pair_coeff <pair_coeff>`
 
-
 ----------
 
-
 .. _Zhou3:
 
-
-
 **(Zhou)** X. W. Zhou, M. E. Foster, R. E. Jones, P. Yang, H. Fan, and
 F. P. Doty, J. Mater. Sci. Res., 4, 15 (2015).
 
 .. _SW:
 
-
-
 **(SW)** F. H. Stillinger-Weber, and T. A. Weber, Phys. Rev. B, 31, 5262 (1985).
 
 .. _Tersoff:
 
-
-
 **(Tersoff)** J. Tersoff, Phys. Rev. B, 39, 5566 (1989).
 
 .. _poly-Albe:
 
-
-
 **(Albe)** K. Albe, K. Nordlund, J. Nord, and A. Kuronen, Phys. Rev. B,
 66, 035205 (2002).
 
 .. _Wang3:
 
-
-
 **(Wang)** J. Wang, and A. Rockett, Phys. Rev. B, 43, 12571 (1991).
 
 .. _poly-Daw:
 
-
-
 **(Daw)** M. S. Daw, and M. I. Baskes, Phys. Rev. B, 29, 6443 (1984).
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/pair_python.rst b/doc/src/pair_python.rst
index a962bdb7ca..e654a6025f 100644
--- a/doc/src/pair_python.rst
+++ b/doc/src/pair_python.rst
@@ -1,13 +1,12 @@
-.. index:: pair\_style python
+.. index:: pair_style python
 
-pair\_style python command
-==========================
+pair_style python command
+=========================
 
 Syntax
 """"""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    pair_style python cutoff
 
@@ -16,15 +15,14 @@ cutoff = global cutoff for interactions in python potential classes
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    pair_style python 2.5
-   pair_coeff \* \* py_pot.LJCutMelt lj
+   pair_coeff * * py_pot.LJCutMelt lj
 
    pair_style hybrid/overlay coul/long 12.0 python 12.0
-   pair_coeff \* \* coul/long
-   pair_coeff \* \* python py_pot.LJCutSPCE OW NULL
+   pair_coeff * * coul/long
+   pair_coeff * * python py_pot.LJCutSPCE OW NULL
 
 Description
 """""""""""
@@ -40,10 +38,10 @@ corresponding compiled code. This penalty can be significantly reduced
 through generating tabulations from the python code through the
 :doc:`pair_write <pair_write>` command, which is supported by this style.
 
-Only a single pair\_coeff command is used with the *python* pair style
+Only a single pair_coeff command is used with the *python* pair style
 which specifies a python class inside a python module or file that
 LAMMPS will look up in the current directory, the folder pointed to by
-the LAMMPS\_POTENTIALS environment variable or somewhere in your python
+the LAMMPS_POTENTIALS environment variable or somewhere in your python
 path.  A single python module can hold multiple python pair class
 definitions. The class definitions itself have to follow specific
 rules that are explained below.
@@ -51,24 +49,23 @@ rules that are explained below.
 Atom types in the python class are specified through symbolic
 constants, typically strings. These are mapped to LAMMPS atom types by
 specifying N additional arguments after the class name in the
-pair\_coeff command, where N must be the number of currently defined
+pair_coeff command, where N must be the number of currently defined
 atom types:
 
-As an example, imagine a file *py\_pot.py* has a python potential class
+As an example, imagine a file *py_pot.py* has a python potential class
 names *LJCutMelt* with parameters and potential functions for a two
 Lennard-Jones atom types labeled as 'LJ1' and 'LJ2'. In your LAMMPS
 input and you would have defined 3 atom types, out of which the first
 two are supposed to be using the 'LJ1' parameters and the third the
-'LJ2' parameters, then you would use the following pair\_coeff command:
+'LJ2' parameters, then you would use the following pair_coeff command:
 
+.. code-block:: LAMMPS
 
-.. parsed-literal::
-
-   pair_coeff \* \* py_pot.LJCutMelt LJ1 LJ1 LJ2
+   pair_coeff * * py_pot.LJCutMelt LJ1 LJ1 LJ2
 
 The first two arguments **must** be \* \* so as to span all LAMMPS atom
 types.  The first two LJ1 arguments map LAMMPS atom types 1 and 2 to
-the LJ1 atom type in the LJCutMelt class of the py\_pot.py file.  The
+the LJ1 atom type in the LJCutMelt class of the py_pot.py file.  The
 final LJ2 argument maps LAMMPS atom type 3 to the LJ2 atom type the
 python file.  If a mapping value is specified as NULL, the mapping is
 not performed, any pair interaction with this atom type will be
@@ -76,17 +73,14 @@ skipped. This can be used when a *python* potential is used as part of
 the *hybrid* or *hybrid/overlay* pair style. The NULL values are then
 placeholders for atom types that will be used with other potentials.
 
-
 ----------
 
-
 The python potential file has to start with the following code:
 
+.. code-block:: python
 
-.. parsed-literal::
+   from __future__ import print_function
 
-   from __future_\_ import print_function
-   #
    class LAMMPSPairPotential(object):
        def __init__(self):
            self.pmap=dict()
@@ -114,20 +108,19 @@ Here is an example for a single type Lennard-Jones potential class
 *LJCutMelt* in reduced units, which defines an atom type *lj* for
 which the parameters epsilon and sigma are both 1.0:
 
-
-.. parsed-literal::
+.. code-block:: python
 
    class LJCutMelt(LAMMPSPairPotential):
        def __init__(self):
            super(LJCutMelt,self).__init__()
-           # set coeffs: 48\*eps\*sig\*\*12, 24\*eps\*sig\*\*6,
-           #              4\*eps\*sig\*\*12,  4\*eps\*sig\*\*6
+           # set coeffs: 48*eps*sig**12, 24*eps*sig**6,
+           #              4*eps*sig**12,  4*eps*sig**6
            self.units = 'lj'
            self.coeff = {'lj'  : {'lj'  : (48.0,24.0,4.0,4.0)}}
 
 The class also has to provide two methods for the computation of the
-potential energy and forces, which have be named *compute\_force*,
-and *compute\_energy*, which both take 3 numerical arguments:
+potential energy and forces, which have be named *compute_force*,
+and *compute_energy*, which both take 3 numerical arguments:
 
 * rsq   = the square of the distance between a pair of atoms (float)
 * itype = the (numerical) type of the first atom
@@ -139,38 +132,35 @@ and use the result as return value. The functions need to use the
 value of the internal potential parameter data structure. Following
 the *LJCutMelt* example, here are the two functions:
 
-
-.. parsed-literal::
+.. code-block:: python
 
       def compute_force(self,rsq,itype,jtype):
            coeff = self.coeff[self.pmap[itype]][self.pmap[jtype]]
            r2inv  = 1.0/rsq
-           r6inv  = r2inv\*r2inv\*r2inv
+           r6inv  = r2inv*r2inv*r2inv
            lj1 = coeff[0]
            lj2 = coeff[1]
-           return (r6inv \* (lj1\*r6inv - lj2))\*r2inv
+           return (r6inv * (lj1*r6inv - lj2))*r2inv
 
        def compute_energy(self,rsq,itype,jtype):
            coeff = self.coeff[self.pmap[itype]][self.pmap[jtype]]
            r2inv  = 1.0/rsq
-           r6inv  = r2inv\*r2inv\*r2inv
+           r6inv  = r2inv*r2inv*r2inv
            lj3 = coeff[2]
            lj4 = coeff[3]
-           return (r6inv \* (lj3\*r6inv - lj4))
+           return (r6inv * (lj3*r6inv - lj4))
 
 .. note::
 
    for consistency with the C++ pair styles in LAMMPS, the
-   *compute\_force* function follows the conventions of the Pair::single()
+   *compute_force* function follows the conventions of the Pair::single()
    methods and does not return the full force, but the force scaled by
    the distance between the two atoms, so this value only needs to be
    multiplied by delta x, delta y, and delta z to conveniently obtain the
    three components of the force vector between these two atoms.
 
-
 ----------
 
-
 .. note::
 
    The evaluation of scripted python code will slow down the
@@ -180,16 +170,15 @@ the *LJCutMelt* example, here are the two functions:
    fly using the :doc:`pair_write <pair_write>` command. Please see below
    for an example LAMMPS input of how to build a table file:
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    pair_style python 2.5
-   pair_coeff \* \* py_pot.LJCutMelt lj
+   pair_coeff * * py_pot.LJCutMelt lj
    shell rm -f melt.table
    pair_write  1 1 2000 rsq 0.01 2.5 lj1_lj2.table lj
 
 Note that it is strongly recommended to try to **delete** the potential
-table file before generating it. Since the *pair\_write* command will
+table file before generating it. Since the *pair_write* command will
 always **append** to a table file, while pair style table will use the
 **first match**\ . Thus when changing the potential function in the python
 class, the table pair style will still read the old variant unless the
@@ -198,8 +187,7 @@ table file is first deleted.
 After switching the pair style to *table*\ , the potential tables need
 to be assigned to the LAMMPS atom types like this:
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    pair_style      table linear 2000
    pair_coeff      1  1  melt.table lj
@@ -207,10 +195,8 @@ to be assigned to the LAMMPS atom types like this:
 This can also be done for more complex systems.  Please see the
 *examples/python* folders for a few more examples.
 
-
 ----------
 
-
 **Mixing, shift, table, tail correction, restart, rRESPA info**\ :
 
 Mixing of potential parameters has to be handled inside the provided
@@ -223,21 +209,18 @@ This pair style does not support the :doc:`pair_modify <pair_modify>`
 shift, table, and tail options.
 
 This pair style does not write its information to :doc:`binary restart files <restart>`, since it is stored in potential files.  Thus, you
-need to re-specify the pair\_style and pair\_coeff commands in an input
+need to re-specify the pair_style and pair_coeff commands in an input
 script that reads a restart file.
 
 This pair style can only be used via the *pair* keyword of the
 :doc:`run_style respa <run_style>` command.  It does not support the
 *inner*\ , *middle*\ , *outer* keywords.
 
-
 ----------
 
-
 Restrictions
 """"""""""""
 
-
 This pair style is part of the PYTHON package.  It is only enabled if
 LAMMPS was built with that package.  See the :doc:`Build package <Build_package>` doc page for more info.
 
@@ -248,8 +231,3 @@ Related commands
 :doc:`pair style table <pair_table>`
 
 **Default:** none
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/pair_quip.rst b/doc/src/pair_quip.rst
index 293d76443e..7781f3a9fb 100644
--- a/doc/src/pair_quip.rst
+++ b/doc/src/pair_quip.rst
@@ -1,25 +1,23 @@
-.. index:: pair\_style quip
+.. index:: pair_style quip
 
-pair\_style quip command
-========================
+pair_style quip command
+=======================
 
 Syntax
 """"""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    pair_style quip
 
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    pair_style      quip
-   pair_coeff      \* \* gap_example.xml "Potential xml_label=GAP_2014_5_8_60_17_10_38_466" 14
-   pair_coeff      \* \* sw_example.xml "IP SW" 14
+   pair_coeff      * * gap_example.xml "Potential xml_label=GAP_2014_5_8_60_17_10_38_466" 14
+   pair_coeff      * * sw_example.xml "IP SW" 14
 
 Description
 """""""""""
@@ -33,7 +31,7 @@ interface is chiefly intended to be used to run Gaussian Approximation
 Potentials (GAP), which are described in the following publications:
 :ref:`(Bartok et al) <Bartok_2010>` and :ref:`(PhD thesis of Bartok) <Bartok_PhD>`.
 
-Only a single pair\_coeff command is used with the *quip* style that
+Only a single pair_coeff command is used with the *quip* style that
 specifies a QUIP potential file containing the parameters of the
 potential for all needed elements in XML format. This is followed by a
 QUIP initialization string. Finally, the QUIP elements are mapped to
@@ -66,7 +64,7 @@ This pair style does not support the :doc:`pair_modify <pair_modify>`
 mix, shift, table, and tail options.
 
 This pair style does not write its information to :doc:`binary restart files <restart>`, since it is stored in potential files.  Thus, you
-need to re-specify the pair\_style and pair\_coeff commands in an input
+need to re-specify the pair_style and pair_coeff commands in an input
 script that reads a restart file.
 
 This pair style can only be used via the *pair* keyword of the
@@ -76,7 +74,6 @@ This pair style can only be used via the *pair* keyword of the
 Restrictions
 """"""""""""
 
-
 This pair style is part of the USER-QUIP package.  It is only enabled
 if LAMMPS was built with that package.  See the :doc:`Build package <Build_package>` doc page for more info.
 
@@ -86,7 +83,7 @@ therefore should be used with LAMMPS metal :doc:`units <units>`.
 QUIP potentials are generally not designed to work with the scaling
 factors set by the :doc:`special_bonds <special_bonds>` command.  The
 recommended setting in molecular systems is to include all
-interactions, i.e. to use *special\_bonds lj/coul 1.0 1.0 1.0*. Scaling
+interactions, i.e. to use *special_bonds lj/coul 1.0 1.0 1.0*. Scaling
 factors > 0.0 will be ignored and treated as 1.0. The only exception
 to this rule is if you know that your QUIP potential needs to exclude
 bonded, 1-3, or 1-4 interactions and does not already do this exclusion
@@ -100,25 +97,14 @@ Related commands
 
 :doc:`pair_coeff <pair_coeff>`
 
-
 ----------
 
+.. _Bartok_2010:
 
-.. _Bartok\_2010:
-
-
-
-**(Bartok\_2010)** AP Bartok, MC Payne, R Kondor, and G Csanyi, Physical
+**(Bartok_2010)** AP Bartok, MC Payne, R Kondor, and G Csanyi, Physical
 Review Letters 104, 136403 (2010).
 
-.. _Bartok\_PhD:
+.. _Bartok_PhD:
 
-
-
-**(Bartok\_PhD)** A Bartok-Partay, PhD Thesis, University of Cambridge,
+**(Bartok_PhD)** A Bartok-Partay, PhD Thesis, University of Cambridge,
 (2010).
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/pair_reaxc.rst b/doc/src/pair_reaxc.rst
index 6040b78a77..1481b0bf4f 100644
--- a/doc/src/pair_reaxc.rst
+++ b/doc/src/pair_reaxc.rst
@@ -1,27 +1,26 @@
-.. index:: pair\_style reax/c
+.. index:: pair_style reax/c
 
-pair\_style reax/c command
-==========================
+pair_style reax/c command
+=========================
 
-pair\_style reax/c/kk command
+pair_style reax/c/kk command
+============================
+
+pair_style reax/c/omp command
 =============================
 
-pair\_style reax/c/omp command
-==============================
-
 Syntax
 """"""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    pair_style reax/c cfile keyword value
 
 * cfile = NULL or name of a control file
 * zero or more keyword/value pairs may be appended
-  
+
   .. parsed-literal::
-  
+
      keyword = *checkqeq* or *lgvdw* or *safezone* or *mincap*
        *checkqeq* value = *yes* or *no* = whether or not to require qeq/reax fix
        *enobonds* value = *yes* or *no* = whether or not to tally energy of atoms with no bonds
@@ -29,19 +28,16 @@ Syntax
        *safezone* = factor used for array allocation
        *mincap* = minimum size for array allocation
 
-
-
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    pair_style reax/c NULL
    pair_style reax/c controlfile checkqeq no
    pair_style reax/c NULL lgvdw yes
    pair_style reax/c NULL safezone 1.6 mincap 100
-   pair_coeff \* \* ffield.reax C H O N
+   pair_coeff * * ffield.reax C H O N
 
 Description
 """""""""""
@@ -67,7 +63,7 @@ consideration when using the *reax/c/kk* style is the choice of either
 half or full neighbor lists. This setting can be changed using the
 Kokkos :doc:`package <package>` command.
 
-The *reax/c* style differs from the (obsolete) "pair\_style reax"
+The *reax/c* style differs from the (obsolete) "pair_style reax"
 command in the implementation details.  The *reax* style was a
 Fortran library, linked to LAMMPS.  The *reax* style has been removed
 from LAMMPS after the 12 December 2018 version.
@@ -78,7 +74,7 @@ documented in potentials/README.reax.  The default ffield.reax
 contains parameterizations for the following elements: C, H, O, N.
 
 The format of these files is identical to that used originally by van
-Duin.  We have tested the accuracy of *pair\_style reax/c* potential
+Duin.  We have tested the accuracy of *pair_style reax/c* potential
 against the original ReaxFF code for the systems mentioned above.  You
 can use other ffield files for specific chemical systems that may be
 available elsewhere (but note that their accuracy may not have been
@@ -112,7 +108,7 @@ below.
    code. If these are changed by setting control variables in the control
    file, the results from LAMMPS and the serial code will not agree.
 
-Examples using *pair\_style reax/c* are provided in the examples/reax
+Examples using *pair_style reax/c* are provided in the examples/reax
 sub-directory.
 
 Use of this pair style requires that a charge be defined for every
@@ -122,7 +118,7 @@ charges.
 
 The ReaxFF parameter files provided were created using a charge
 equilibration (QEq) model for handling the electrostatic interactions.
-Therefore, by default, LAMMPS requires that the :doc:`fix qeq/reax <fix_qeq_reax>` command be used with *pair\_style reax/c*
+Therefore, by default, LAMMPS requires that the :doc:`fix qeq/reax <fix_qeq_reax>` command be used with *pair_style reax/c*
 when simulating a ReaxFF model, to equilibrate charge each timestep.
 Using the keyword *checkqeq* with the value *no*
 turns off the check for *fix qeq/reax*\ ,
@@ -153,7 +149,7 @@ drops to zero.
 Optional keywords *safezone* and *mincap* are used for allocating
 reax/c arrays.  Increasing these values can avoid memory problems,
 such as segmentation faults and bondchk failed errors, that could
-occur under certain conditions. These keywords aren't used by the
+occur under certain conditions. These keywords are not used by the
 Kokkos version, which instead uses a more robust memory allocation
 scheme that checks if the sizes of the arrays have been exceeded and
 automatically allocates more memory.
@@ -188,8 +184,7 @@ code):
 To print these quantities to the log file (with descriptive column
 headings) the following commands could be included in an input script:
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    compute reax all pair reax/c
    variable eb      equal c_reax[1]
@@ -198,10 +193,10 @@ headings) the following commands could be included in an input script:
    variable eqeq    equal c_reax[14]
    thermo_style custom step temp epair v_eb v_ea [...] v_eqeq
 
-Only a single pair\_coeff command is used with the *reax/c* style which
+Only a single pair_coeff command is used with the *reax/c* style which
 specifies a ReaxFF potential file with parameters for all needed
 elements.  These are mapped to LAMMPS atom types by specifying N
-additional arguments after the filename in the pair\_coeff command,
+additional arguments after the filename in the pair_coeff command,
 where N is the number of LAMMPS atom types:
 
 * filename
@@ -224,20 +219,16 @@ types that will be used with other potentials.
 As an example, say your LAMMPS simulation has 4 atom types and the
 elements are ordered as C, H, O, N in the *ffield* file.  If you want
 the LAMMPS atom type 1 and 2 to be C, type 3 to be N, and type 4 to be
-H, you would use the following pair\_coeff command:
+H, you would use the following pair_coeff command:
 
+.. code-block:: LAMMPS
 
-.. parsed-literal::
-
-   pair_coeff \* \* ffield.reax C C N H
-
+   pair_coeff * * ffield.reax C C N H
 
 ----------
 
-
 The format of a line in the control file is as follows:
 
-
 .. parsed-literal::
 
    variable_name value
@@ -248,16 +239,16 @@ If the value of a control variable is not specified, then default
 values are used.  What follows is the list of variables along with a
 brief description of their use and default values.
 
-simulation\_name: Output files produced by *pair\_style reax/c* carry
+simulation_name: Output files produced by *pair_style reax/c* carry
 this name + extensions specific to their contents.  Partial energies
 are reported with a ".pot" extension, while the trajectory file has
 ".trj" extension.
 
-tabulate\_long\_range: To improve performance, long range interactions
+tabulate_long_range: To improve performance, long range interactions
 can optionally be tabulated (0 means no tabulation). Value of this
 variable denotes the size of the long range interaction table.  The
 range from 0 to long range cutoff (defined in the *ffield* file) is
-divided into *tabulate\_long\_range* points.  Then at the start of
+divided into *tabulate_long_range* points.  Then at the start of
 simulation, we fill in the entries of the long range interaction table
 by computing the energies and forces resulting from van der Waals and
 Coulomb interactions between every possible atom type pairs present in
@@ -266,64 +257,60 @@ interaction table to estimate the energy and forces between a pair of
 atoms. Linear interpolation is used for estimation. (default value =
 0)
 
-energy\_update\_freq: Denotes the frequency (in number of steps) of
+energy_update_freq: Denotes the frequency (in number of steps) of
 writes into the partial energies file. (default value = 0)
 
-nbrhood\_cutoff: Denotes the near neighbors cutoff (in Angstroms)
+nbrhood_cutoff: Denotes the near neighbors cutoff (in Angstroms)
 regarding the bonded interactions. (default value = 5.0)
 
-hbond\_cutoff: Denotes the cutoff distance (in Angstroms) for hydrogen
+hbond_cutoff: Denotes the cutoff distance (in Angstroms) for hydrogen
 bond interactions.(default value = 7.5. A value of 0.0 turns off
 hydrogen bonds)
 
-bond\_graph\_cutoff: is the threshold used in determining what is a
+bond_graph_cutoff: is the threshold used in determining what is a
 physical bond, what is not. Bonds and angles reported in the
 trajectory file rely on this cutoff. (default value = 0.3)
 
-thb\_cutoff: cutoff value for the strength of bonds to be considered in
+thb_cutoff: cutoff value for the strength of bonds to be considered in
 three body interactions. (default value = 0.001)
 
-thb\_cutoff\_sq: cutoff value for the strength of bond order products
+thb_cutoff_sq: cutoff value for the strength of bond order products
 to be considered in three body interactions. (default value = 0.00001)
 
-write\_freq: Frequency of writes into the trajectory file. (default
+write_freq: Frequency of writes into the trajectory file. (default
 value = 0)
 
-traj\_title: Title of the trajectory - not the name of the trajectory
+traj_title: Title of the trajectory - not the name of the trajectory
 file.
 
-atom\_info: 1 means print only atomic positions + charge (default = 0)
+atom_info: 1 means print only atomic positions + charge (default = 0)
 
-atom\_forces: 1 adds net forces to atom lines in the trajectory file
+atom_forces: 1 adds net forces to atom lines in the trajectory file
 (default = 0)
 
-atom\_velocities: 1 adds atomic velocities to atoms line (default = 0)
+atom_velocities: 1 adds atomic velocities to atoms line (default = 0)
 
-bond\_info: 1 prints bonds in the trajectory file (default = 0)
-
-angle\_info: 1 prints angles in the trajectory file (default = 0)
+bond_info: 1 prints bonds in the trajectory file (default = 0)
 
+angle_info: 1 prints angles in the trajectory file (default = 0)
 
 ----------
 
-
 **Mixing, shift, table, tail correction, restart, rRESPA info**\ :
 
 This pair style does not support the :doc:`pair_modify <pair_modify>`
 mix, shift, table, and tail options.
 
 This pair style does not write its information to :doc:`binary restart files <restart>`, since it is stored in potential files.  Thus, you
-need to re-specify the pair\_style and pair\_coeff commands in an input
+need to re-specify the pair_style and pair_coeff commands in an input
 script that reads a restart file.
 
 This pair style can only be used via the *pair* keyword of the
 :doc:`run_style respa <run_style>` command.  It does not support the
 *inner*\ , *middle*\ , *outer* keywords.
 
-
 ----------
 
-
 Styles with a *gpu*\ , *intel*\ , *kk*\ , *omp*\ , or *opt* suffix are
 functionally the same as the corresponding style without the suffix.
 They have been optimized to run faster, depending on your available
@@ -342,14 +329,11 @@ by including their suffix, or you can use the :doc:`-suffix command-line switch
 See the :doc:`Speed packages <Speed_packages>` doc page for more
 instructions on how to use the accelerated styles effectively.
 
-
 ----------
 
-
 Restrictions
 """"""""""""
 
-
 This pair style is part of the USER-REAXC package.  It is only enabled
 if LAMMPS was built with that package.  See the :doc:`Build package <Build_package>` doc page for more info.
 
@@ -357,7 +341,7 @@ The ReaxFF potential files provided with LAMMPS in the potentials
 directory are parameterized for real :doc:`units <units>`.  You can use
 the ReaxFF potential with any LAMMPS units, but you would need to
 create your own potential file with coefficients listed in the
-appropriate units if your simulation doesn't use "real" units.
+appropriate units if your simulation does not use "real" units.
 
 Related commands
 """"""""""""""""
@@ -370,32 +354,19 @@ Default
 The keyword defaults are checkqeq = yes, enobonds = yes, lgvdw = no,
 safezone = 1.2, mincap = 50.
 
-
 ----------
 
+.. _Chenoweth_20082:
 
-.. _Chenoweth\_20082:
-
-
-
-**(Chenoweth\_2008)** Chenoweth, van Duin and Goddard,
+**(Chenoweth_2008)** Chenoweth, van Duin and Goddard,
 Journal of Physical Chemistry A, 112, 1040-1053 (2008).
 
 .. _Aktulga:
 
-
-
 (Aktulga) Aktulga, Fogarty, Pandit, Grama, Parallel Computing, 38,
 245-259 (2012).
 
-.. _Liu\_2011:
-
-
+.. _Liu_2011:
 
 **(Liu)** L. Liu, Y. Liu, S. V. Zybin, H. Sun and W. A. Goddard, Journal
 of Physical Chemistry A, 115, 11016-11022 (2011).
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/pair_resquared.rst b/doc/src/pair_resquared.rst
index b996ae1189..5bb4de7cb2 100644
--- a/doc/src/pair_resquared.rst
+++ b/doc/src/pair_resquared.rst
@@ -1,19 +1,18 @@
-.. index:: pair\_style resquared
+.. index:: pair_style resquared
 
-pair\_style resquared command
-=============================
+pair_style resquared command
+============================
 
-pair\_style resquared/gpu command
-=================================
+pair_style resquared/gpu command
+================================
 
-pair\_style resquared/omp command
-=================================
+pair_style resquared/omp command
+================================
 
 Syntax
 """"""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    pair_style resquared cutoff
 
@@ -22,11 +21,10 @@ Syntax
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    pair_style resquared 10.0
-   pair_coeff \* \* 1.0 1.0 1.7 3.4 3.4 1.0 1.0 1.0
+   pair_coeff * * 1.0 1.0 1.7 3.4 3.4 1.0 1.0 1.0
 
 Description
 """""""""""
@@ -35,8 +33,8 @@ Style *resquared* computes the RE-squared anisotropic interaction
 :ref:`(Everaers) <Everaers3>`, :ref:`(Babadi) <Babadi>` between pairs of
 ellipsoidal and/or spherical Lennard-Jones particles.  For ellipsoidal
 interactions, the potential considers the ellipsoid as being comprised
-of small spheres of size sigma.  LJ particles are a single sphere of
-size sigma.  The distinction is made to allow the pair style to make
+of small spheres of size :math:`\sigma`.  LJ particles are a single sphere of
+size :math:`\sigma`.  The distinction is made to allow the pair style to make
 efficient calculations of ellipsoid/solvent interactions.
 
 Details for the equations used are given in the references below and
@@ -54,20 +52,21 @@ above, or in the data file or restart files read by the
 commands:
 
 * A12 = Energy Prefactor/Hamaker constant (energy units)
-* sigma = atomic interaction diameter (distance units)
-* epsilon\_i_a = relative well depth of type I for side-to-side interactions
-* epsilon\_i_b = relative well depth of type I for face-to-face interactions
-* epsilon\_i_c = relative well depth of type I for end-to-end interactions
-* epsilon\_j_a = relative well depth of type J for side-to-side interactions
-* epsilon\_j_b = relative well depth of type J for face-to-face interactions
-* epsilon\_j_c = relative well depth of type J for end-to-end interactions
+* :math:`\sigma` = atomic interaction diameter (distance units)
+* :math:`\epsilon_{i,a}` = relative well depth of type I for side-to-side interactions
+* :math:`\epsilon_{i,b}` = relative well depth of type I for face-to-face interactions
+* :math:`\epsilon_{i,c}` = relative well depth of type I for end-to-end interactions
+* :math:`\epsilon_{j,a}` = relative well depth of type J for side-to-side interactions
+* :math:`\epsilon_{j,b}` = relative well depth of type J for face-to-face interactions
+* :math:`\epsilon_{j,c}` = relative well depth of type J for end-to-end interactions
 * cutoff (distance units)
 
 The parameters used depend on the type of the interacting particles,
 i.e. ellipsoids or LJ spheres.  The type of a particle is determined
 by the diameters specified for its 3 shape parameters.  If all 3 shape
 parameters = 0.0, then the particle is treated as an LJ sphere.  The
-epsilon\_i_\* or epsilon\_j_\* parameters are ignored for LJ spheres.  If
+:math:`\epsilon_{i,*}` or :math:`\epsilon_{j,*}` parameters are ignored
+for LJ spheres.  If
 the 3 shape parameters are > 0.0, then the particle is treated as an
 ellipsoid (even if the 3 parameters are equal to each other).
 
@@ -79,20 +78,22 @@ the formulas in the supplementary document referenced above.  A12 is
 the Hamaker constant as described in :ref:`(Everaers) <Everaers3>`. In LJ
 units:
 
-.. image:: Eqs/pair_resquared.jpg
-   :align: center
+.. math::
 
-where rho gives the number density of the spherical particles
-composing the ellipsoids and epsilon\_LJ determines the interaction
-strength of the spherical particles.
+   A_{12} = 4\pi^2\epsilon_{\mathrm{LJ}}(\rho\sigma^3)^2
+
+where :math:`\rho` gives the number density of the spherical particles
+composing the ellipsoids and :math:`\epsilon_{\mathrm{LJ}}` determines
+the interaction strength of the spherical particles.
 
 For ellipsoid/LJ sphere interactions, the interaction is also computed
 by the formulas in the supplementary document referenced above.  A12
 has a modified form (see `here <PDF/pair_resquared_extra.pdf>`_ for
 details):
 
-.. image:: Eqs/pair_resquared2.jpg
-   :align: center
+.. math::
+
+   A_{12} = 4\pi^2\epsilon_{\mathrm{LJ}}(\rho\sigma^3)
 
 For ellipsoid/LJ sphere interactions, a correction to the distance-
 of-closest approach equation has been implemented to reduce the error
@@ -103,57 +104,60 @@ using the standard Lennard-Jones formula, which is much cheaper to
 compute than the ellipsoidal formulas.  A12 is used as epsilon in the
 standard LJ formula:
 
-.. image:: Eqs/pair_resquared3.jpg
-   :align: center
+.. math::
 
-and the specified *sigma* is used as the sigma in the standard LJ
-formula.
+   A_{12} = \epsilon_{\mathrm{LJ}}
+
+and the specified :math:`\sigma` is used as the :math:`\sigma` in the
+standard LJ formula.
 
 When one of both of the interacting particles are ellipsoids, then
-*sigma* specifies the diameter of the continuous distribution of
-constituent particles within each ellipsoid used to model the
-RE-squared potential.  Note that this is a different meaning for
-*sigma* than the :doc:`pair_style gayberne <pair_gayberne>` potential
-uses.
+:math:`\sigma` specifies the diameter of the continuous distribution of
+constituent particles within each ellipsoid used to model the RE-squared
+potential.  Note that this is a different meaning for :math:`\sigma`
+than the :doc:`pair_style gayberne <pair_gayberne>` potential uses.
 
-The epsilon\_i and epsilon\_j coefficients are defined for atom types,
-not for pairs of atom types.  Thus, in a series of pair\_coeff
-commands, they only need to be specified once for each atom type.
+The :math:`\epsilon_i` and :math:`\epsilon_j` coefficients are defined
+for atom types, not for pairs of atom types.  Thus, in a series of
+pair_coeff commands, they only need to be specified once for each atom
+type.
 
-Specifically, if any of epsilon\_i_a, epsilon\_i_b, epsilon\_i_c are
-non-zero, the three values are assigned to atom type I.  If all the
-epsilon\_i values are zero, they are ignored.  If any of epsilon\_j_a,
-epsilon\_j_b, epsilon\_j_c are non-zero, the three values are assigned
-to atom type J.  If all three epsilon\_i values are zero, they are
-ignored.  Thus the typical way to define the epsilon\_i and epsilon\_j
-coefficients is to list their values in "pair\_coeff I J" commands when
-I = J, but set them to 0.0 when I != J.  If you do list them when I !=
-J, you should insure they are consistent with their values in other
-pair\_coeff commands.
+Specifically, if any of :math:`\epsilon_{i,a}`, :math:`\epsilon_{i,b}`,
+:math:`\epsilon_{i,c}` are non-zero, the three values are assigned to
+atom type I.  If all the :math:`\epsilon_i` values are zero, they are
+ignored.  If any of :math:`\epsilon_{j,a}`, :math:`\epsilon_{j,b}`,
+:math:`\epsilon_{j,c}` are non-zero, the three values are assigned to
+atom type J.  If all three :math:`\epsilon_i` values are zero, they are
+ignored.  Thus the typical way to define the :math:`\epsilon_i` and
+:math:`\epsilon_j` coefficients is to list their values in "pair_coeff
+I J" commands when I = J, but set them to 0.0 when I != J.  If you do
+list them when I != J, you should insure they are consistent with their
+values in other pair_coeff commands.
 
 Note that if this potential is being used as a sub-style of
-:doc:`pair_style hybrid <pair_hybrid>`, and there is no "pair\_coeff I I"
+:doc:`pair_style hybrid <pair_hybrid>`, and there is no "pair_coeff I I"
 setting made for RE-squared for a particular type I (because I-I
 interactions are computed by another hybrid pair potential), then you
 still need to insure the epsilon a,b,c coefficients are assigned to
-that type in a "pair\_coeff I J" command.
+that type in a "pair_coeff I J" command.
 
-For large uniform molecules it has been shown that the epsilon\_\*\_\*
+For large uniform molecules it has been shown that the :math:`\epsilon_{*,*}`
 energy parameters are approximately representable in terms of local
 contact curvatures :ref:`(Everaers) <Everaers3>`:
 
-.. image:: Eqs/pair_resquared4.jpg
-   :align: center
+.. math::
+
+   \epsilon_a = \sigma \cdot { \frac{a}{ b \cdot c } }; \epsilon_b =
+   \sigma \cdot { \frac{b}{ a \cdot c } }; \epsilon_c = \sigma \cdot {
+   \frac{c}{ a \cdot b } }
 
 where a, b, and c give the particle diameters.
 
 The last coefficient is optional.  If not specified, the global cutoff
-specified in the pair\_style command is used.
-
+specified in the pair_style command is used.
 
 ----------
 
-
 Styles with a *gpu*\ , *intel*\ , *kk*\ , *omp*\ , or *opt* suffix are
 functionally the same as the corresponding style without the suffix.
 They have been optimized to run faster, depending on your available
@@ -172,15 +176,13 @@ by including their suffix, or you can use the :doc:`-suffix command-line switch
 See the :doc:`Speed packages <Speed_packages>` doc page for more
 instructions on how to use the accelerated styles effectively.
 
-
 ----------
 
-
 **Mixing, shift, table, tail correction, restart, rRESPA info**\ :
 
 For atom type pairs I,J and I != J, the epsilon and sigma coefficients
 and cutoff distance can be mixed, but only for sphere pairs.  The
-default mix value is *geometric*\ .  See the "pair\_modify" command for
+default mix value is *geometric*\ .  See the "pair_modify" command for
 details.  Other type pairs cannot be mixed, due to the different
 meanings of the energy prefactors used to calculate the interactions
 and the implicit dependence of the ellipsoid-sphere interaction on the
@@ -201,21 +203,18 @@ This pair style does not support the :doc:`pair_modify <pair_modify>`
 tail option for adding long-range tail corrections to energy and
 pressure.
 
-This pair style writes its information to :doc:`binary restart files <restart>`, so pair\_style and pair\_coeff commands do not need
+This pair style writes its information to :doc:`binary restart files <restart>`, so pair_style and pair_coeff commands do not need
 to be specified in an input script that reads a restart file.
 
 This pair style can only be used via the *pair* keyword of the
 :doc:`run_style respa <run_style>` command.  It does not support the
 *inner*\ , *middle*\ , *outer* keywords of the :doc:`run_style command <run_style>`.
 
-
 ----------
 
-
 Restrictions
 """"""""""""
 
-
 This style is part of the ASPHERE package.  It is only enabled if
 LAMMPS was built with that package.  See the :doc:`Build package <Build_package>` doc page for more info.
 
@@ -238,23 +237,12 @@ Related commands
 
 **Default:** none
 
-
 ----------
 
-
 .. _Everaers3:
 
-
-
 **(Everaers)** Everaers and Ejtehadi, Phys Rev E, 67, 041710 (2003).
 
 .. _Babadi:
 
-
-
 **(Berardi)** Babadi, Ejtehadi, Everaers, J Comp Phys, 219, 770-779 (2006).
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/pair_sdk.rst b/doc/src/pair_sdk.rst
index 1ad9bd9c59..2a5167030b 100644
--- a/doc/src/pair_sdk.rst
+++ b/doc/src/pair_sdk.rst
@@ -1,44 +1,42 @@
-.. index:: pair\_style lj/sdk
+.. index:: pair_style lj/sdk
 
-pair\_style lj/sdk command
-==========================
+pair_style lj/sdk command
+=========================
 
-pair\_style lj/sdk/gpu command
-==============================
-
-pair\_style lj/sdk/kk command
+pair_style lj/sdk/gpu command
 =============================
 
-pair\_style lj/sdk/omp command
-==============================
+pair_style lj/sdk/kk command
+============================
 
-pair\_style lj/sdk/coul/long command
-====================================
+pair_style lj/sdk/omp command
+=============================
 
-pair\_style lj/sdk/coul/long/gpu command
-========================================
-
-pair\_style lj/sdk/coul/long/omp command
-========================================
-
-pair\_style lj/sdk/coul/msm command
+pair_style lj/sdk/coul/long command
 ===================================
 
-pair\_style lj/sdk/coul/msm/omp command
+pair_style lj/sdk/coul/long/gpu command
 =======================================
 
+pair_style lj/sdk/coul/long/omp command
+=======================================
+
+pair_style lj/sdk/coul/msm command
+==================================
+
+pair_style lj/sdk/coul/msm/omp command
+======================================
+
 Syntax
 """"""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    pair_style style args
 
 * style = *lj/sdk* or *lj/sdk/coul/long*
 * args = list of arguments for a particular style
 
-
 .. parsed-literal::
 
      *lj/sdk* args = cutoff
@@ -50,8 +48,7 @@ Syntax
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    pair_style lj/sdk 2.5
    pair_coeff 1 1 lj12_6 1 1.1 2.8
@@ -70,8 +67,17 @@ Description
 The *lj/sdk* styles compute a 9/6, 12/4, or 12/6 Lennard-Jones potential,
 given by
 
-.. image:: Eqs/pair_cmm.jpg
-   :align: center
+.. math::
+
+   E = & \frac{27}{4} \epsilon \left[ \left(\frac{\sigma}{r}\right)^{9} -
+                         \left(\frac{\sigma}{r}\right)^6 \right]
+                         \qquad r < r_c \\
+   E = & \frac{3\sqrt{3}}{2} \epsilon \left[ \left(\frac{\sigma}{r}\right)^{12} -
+                         \left(\frac{\sigma}{r}\right)^4 \right]
+                         \qquad r < r_c \\
+   E = &  4 \epsilon  \left[ \left(\frac{\sigma}{r}\right)^{12} -
+                         \left(\frac{\sigma}{r}\right)^6 \right]
+                         \qquad r < r_c
 
 as required for the SDK Coarse-grained MD parameterization discussed in
 :ref:`(Shinoda) <Shinoda3>` and :ref:`(DeVane) <DeVane>`.  Rc is the cutoff.
@@ -90,7 +96,7 @@ above, or in the data file or restart files read by the
 :doc:`read_data <read_data>` or :doc:`read_restart <read_restart>`
 commands, or by mixing as described below:
 
-* cg\_type (lj9\_6, lj12\_4, or lj12\_6)
+* cg_type (lj9_6, lj12_4, or lj12_6)
 * epsilon (energy units)
 * sigma (distance units)
 * cutoff1 (distance units)
@@ -100,7 +106,7 @@ distance for the potential, not as the energy minimum. The prefactors
 are chosen so that the potential minimum is at -epsilon.
 
 The latter 2 coefficients are optional.  If not specified, the global
-LJ and Coulombic cutoffs specified in the pair\_style command are used.
+LJ and Coulombic cutoffs specified in the pair_style command are used.
 If only one cutoff is specified, it is used as the cutoff for both LJ
 and Coulombic interactions for this type pair.  If both coefficients
 are specified, they are used as the LJ and Coulombic cutoffs for this
@@ -109,12 +115,10 @@ type pair.
 For *lj/sdk/coul/long* and *lj/sdk/coul/msm* only the LJ cutoff can be
 specified since a Coulombic cutoff cannot be specified for an
 individual I,J type pair.  All type pairs use the same global
-Coulombic cutoff specified in the pair\_style command.
-
+Coulombic cutoff specified in the pair_style command.
 
 ----------
 
-
 Styles with a *gpu*\ , *intel*\ , *kk*\ , *omp* or *opt* suffix are
 functionally the same as the corresponding style without the suffix.
 They have been optimized to run faster, depending on your available
@@ -133,16 +137,14 @@ by including their suffix, or you can use the :doc:`-suffix command-line switch
 See the :doc:`Speed packages <Speed_packages>` doc page for more
 instructions on how to use the accelerated styles effectively.
 
-
 ----------
 
-
 **Mixing, shift, table, tail correction, restart, and rRESPA info**\ :
 
 For atom type pairs I,J and I != J, the epsilon and sigma coefficients
 and cutoff distance for all of the lj/sdk pair styles *cannot* be mixed,
 since different pairs may have different exponents. So all parameters
-for all pairs have to be specified explicitly through the "pair\_coeff"
+for all pairs have to be specified explicitly through the "pair_coeff"
 command. Defining then in a data file is also not supported, due to
 limitations of that file format.
 
@@ -154,20 +156,17 @@ The *lj/sdk/coul/long* pair styles support the
 :doc:`pair_modify <pair_modify>` table option since they can tabulate
 the short-range portion of the long-range Coulombic interaction.
 
-All of the lj/sdk pair styles write their information to :doc:`binary restart files <restart>`, so pair\_style and pair\_coeff commands do
+All of the lj/sdk pair styles write their information to :doc:`binary restart files <restart>`, so pair_style and pair_coeff commands do
 not need to be specified in an input script that reads a restart file.
 
 The lj/sdk and lj/cut/coul/long pair styles do not support
 the use of the *inner*\ , *middle*\ , and *outer* keywords of the :doc:`run_style respa <run_style>` command.
 
-
 ----------
 
-
 Restrictions
 """"""""""""
 
-
 All of the lj/sdk pair styles are part of the USER-CGSDK package.  The
 *lj/sdk/coul/long* style also requires the KSPACE package to be built
 (which is enabled by default).  They are only enabled if LAMMPS was
@@ -181,23 +180,12 @@ Related commands
 
 **Default:** none
 
-
 ----------
 
-
 .. _Shinoda3:
 
-
-
 **(Shinoda)** Shinoda, DeVane, Klein, Mol Sim, 33, 27 (2007).
 
 .. _DeVane:
 
-
-
 **(DeVane)**  Shinoda, DeVane, Klein, Soft Matter, 4, 2453-2462 (2008).
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/pair_sdpd_taitwater_isothermal.rst b/doc/src/pair_sdpd_taitwater_isothermal.rst
index 5d970d382d..05e7bbfac0 100644
--- a/doc/src/pair_sdpd_taitwater_isothermal.rst
+++ b/doc/src/pair_sdpd_taitwater_isothermal.rst
@@ -1,13 +1,12 @@
-.. index:: pair\_style sdpd/taitwater/isothermal
+.. index:: pair_style sdpd/taitwater/isothermal
 
-pair\_style sdpd/taitwater/isothermal command
-=============================================
+pair_style sdpd/taitwater/isothermal command
+============================================
 
 Syntax
 """"""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    pair_style sdpd/taitwater/isothermal temperature viscosity seed
 
@@ -18,11 +17,10 @@ Syntax
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    pair_style sdpd/taitwater/isothermal 300. 1. 28681
-   pair_coeff \* \* 1000.0 1430.0 2.4
+   pair_coeff * * 1000.0 1430.0 2.4
 
 Description
 """""""""""
@@ -32,8 +30,6 @@ particles according to the Smoothed Dissipative Particle Dynamics model
 described in this paper by :ref:`(Espanol and Revenga) <Espanol_Revenga>` under
 the following assumptions:
 
-
-
 #. The temperature is constant and uniform.
 #. The shear viscosity is constant and uniform.
 #. The volume viscosity is negligible before the shear viscosity.
@@ -47,11 +43,13 @@ imagine for a mesoscopic particle.
 The pressure forces between particles will be computed according to
 Tait's equation of state:
 
-.. image:: Eqs/pair_sph_tait.jpg
-   :align: center
+.. math::
 
-where gamma = 7 and B = c\_0\^2 rho\_0 / gamma, with rho\_0 being the
-reference density and c\_0 the reference speed of sound.
+  p = B \left[(\frac{\rho}{\rho_0})^{\gamma} - 1\right]
+
+where :math:`\gamma = 7` and :math:`B = c_0^2 \rho_0 / \gamma`, with
+:math:`\rho_0` being the reference density and :math:`c_0` the reference
+speed of sound.
 
 The laminar viscosity and the random forces will be computed according
 to formulas described in :ref:`(Espanol and Revenga) <Espanol_Revenga>`.
@@ -75,14 +73,12 @@ The following coefficients must be defined for each pair of atoms
 types via the :doc:`pair_coeff <pair_coeff>` command as in the examples
 above.
 
-* rho0 reference density (mass/volume units)
-* c0 reference soundspeed (distance/time units)
+* :math:`\rho_0` reference density (mass/volume units)
+* :math:`c_0` reference soundspeed (distance/time units)
 * h kernel function cutoff (distance units)
 
-
 ----------
 
-
 **Mixing, shift, table, tail correction, restart, rRESPA info**\ :
 
 This style does not support mixing.  Thus, coefficients for all
@@ -91,8 +87,8 @@ I,J pairs must be specified explicitly.
 This style does not support the :doc:`pair_modify <pair_modify>`
 shift, table, and tail options.
 
-This style does not write information to :doc:`binary restart files <restart>`.  Thus, you need to re-specify the pair\_style and
-pair\_coeff commands in an input script that reads a restart file.
+This style does not write information to :doc:`binary restart files <restart>`.  Thus, you need to re-specify the pair_style and
+pair_coeff commands in an input script that reads a restart file.
 
 This style can only be used via the *pair* keyword of the :doc:`run_style respa <run_style>` command.  It does not support the *inner*\ ,
 *middle*\ , *outer* keywords.
@@ -100,31 +96,22 @@ This style can only be used via the *pair* keyword of the :doc:`run_style respa
 Restrictions
 """"""""""""
 
-
 This pair style is part of the USER-SDPD package.  It is only enabled
 if LAMMPS was built with that package.  See the :doc:`Build package <Build_package>` doc page for more info.
 
 Related commands
 """"""""""""""""
 
-:doc:`pair coeff <pair_coeff>`, :doc:`pair sph/rhosum <pair_sph_rhosum>`
+:doc:`pair coeff <pair_coeff>`, :doc:`pair sph/rhosum <pair_sph_rhosum>`,
+:doc:`pair sph/taitwater <pair_sph_taitwater>`
 
 Default
 """""""
 
 The default seed is 0 (before mixing).
 
-
 ----------
 
-
-.. _Espanol\_Revenga:
-
-
+.. _Espanol_Revenga:
 
 **(Espanol and Revenga)** Espanol, Revenga, Physical Review E, 67, 026705 (2003).
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/pair_smd_hertz.rst b/doc/src/pair_smd_hertz.rst
index a7b004830f..fd7f9c3e01 100644
--- a/doc/src/pair_smd_hertz.rst
+++ b/doc/src/pair_smd_hertz.rst
@@ -1,21 +1,22 @@
-.. index:: pair\_style smd/hertz
+.. index:: pair_style smd/hertz
 
-pair\_style smd/hertz command
-=============================
+pair_style smd/hertz command
+============================
 
 Syntax
 """"""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    pair_style smd/hertz scale_factor
 
 Examples
 """"""""
 
-pair\_style smd/hertz 1.0
-pair\_coeff 1 1 <contact\_stiffness>
+.. code-block:: LAMMPS
+
+   pair_style smd/hertz 1.0
+   pair_coeff 1 1 <contact_stiffness>
 
 Description
 """""""""""
@@ -26,33 +27,28 @@ belonging to different physical bodies.
 The contact forces are calculated using a Hertz potential, which
 evaluates the overlap between two particles (whose spatial extents are
 defined via its contact radius).  The effect is that a particles
-cannot penetrate into each other.  The parameter <contact\_stiffness>
+cannot penetrate into each other.  The parameter <contact_stiffness>
 has units of pressure and should equal roughly one half of the Young's
 modulus (or bulk modulus in the case of fluids) of the material model
 associated with the SPH particles.
 
-The parameter *scale\_factor* can be used to scale the particles'
+The parameter *scale_factor* can be used to scale the particles'
 contact radii. This can be useful to control how close particles can
-approach each other. Usually, *scale\_factor* =1.0.
-
+approach each other. Usually, *scale_factor* =1.0.
 
 ----------
 
-
 **Mixing, shift, table, tail correction, restart, rRESPA info**\ :
 
 No mixing is performed automatically.  Currently, no part of USER-SMD
 supports restarting nor minimization.  rRESPA does not apply to this
 pair style.
 
-
 ----------
 
-
 Restrictions
 """"""""""""
 
-
 This fix is part of the USER-SMD package.  It is only enabled if
 LAMMPS was built with that package.  See the :doc:`Build package <Build_package>` doc page for more info.
 
@@ -62,12 +58,3 @@ Related commands
 :doc:`pair_coeff <pair_coeff>`
 
 **Default:** none
-
-
-----------
-
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/pair_smd_tlsph.rst b/doc/src/pair_smd_tlsph.rst
index 20fbbf86dc..ea819325b4 100644
--- a/doc/src/pair_smd_tlsph.rst
+++ b/doc/src/pair_smd_tlsph.rst
@@ -1,20 +1,21 @@
-.. index:: pair\_style smd/tlsph
+.. index:: pair_style smd/tlsph
 
-pair\_style smd/tlsph command
-=============================
+pair_style smd/tlsph command
+============================
 
 Syntax
 """"""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    pair_style smd/tlsph args
 
 Examples
 """"""""
 
-pair\_style smd/tlsph
+.. code-block:: LAMMPS
+
+   pair_style smd/tlsph
 
 Description
 """""""""""
@@ -25,12 +26,11 @@ Smooth-Particle Hydrodynamics algorithm.
 
 This pair style is invoked with the following command:
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    pair_style smd/tlsph
-   pair_coeff i j \*COMMON rho0 E nu Q1 Q2 hg Cp &
-                  \*END
+   pair_coeff i j *COMMON rho0 E nu Q1 Q2 hg Cp &
+                  *END
 
 Here, *i* and *j* denote the *LAMMPS* particle types for which this
 pair style is defined. Note that *i* and *j* must be equal, i.e., no
@@ -51,24 +51,19 @@ be added.
 Please see the `SMD user guide <PDF/SMD_LAMMPS_userguide.pdf>`_ for a
 complete listing of the possible keywords and material models.
 
-
 ----------
 
-
 **Mixing, shift, table, tail correction, restart, rRESPA info**\ :
 
 No mixing is performed automatically.  Currently, no part of USER-SMD
 supports restarting nor minimization.  rRESPA does not apply to this
 pair style.
 
-
 ----------
 
-
 Restrictions
 """"""""""""
 
-
 This fix is part of the USER-SMD package.  It is only enabled if
 LAMMPS was built with that package.  See the :doc:`Build package <Build_package>` doc page for more info.
 
@@ -78,12 +73,3 @@ Related commands
 :doc:`pair_coeff <pair_coeff>`
 
 **Default:** none
-
-
-----------
-
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/pair_smd_triangulated_surface.rst b/doc/src/pair_smd_triangulated_surface.rst
index e531a7a2ec..d1177b2577 100644
--- a/doc/src/pair_smd_triangulated_surface.rst
+++ b/doc/src/pair_smd_triangulated_surface.rst
@@ -1,59 +1,55 @@
-.. index:: pair\_style smd/tri\_surface
+.. index:: pair_style smd/tri_surface
 
-pair\_style smd/tri\_surface command
-====================================
+pair_style smd/tri_surface command
+===================================
 
 Syntax
 """"""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    pair_style smd/tri_surface scale_factor
 
 Examples
 """"""""
 
-pair\_style smd/tri\_surface 1.0
-pair\_coeff 1 1 <contact\_stiffness>
+.. code-block:: LAMMPS
+
+   pair_style smd/tri_surface 1.0
+   pair_coeff 1 1 <contact_stiffness>
 
 Description
 """""""""""
 
-The *smd/tri\_surface* style calculates contact forces between SPH
+The *smd/tri_surface* style calculates contact forces between SPH
 particles and a rigid wall boundary defined via the
-:doc:`smd/wall\_surface <fix_smd_wall_surface>` fix.
+:doc:`smd/wall_surface <fix_smd_wall_surface>` fix.
 
 The contact forces are calculated using a Hertz potential, which
 evaluates the overlap between a particle (whose spatial extents are
 defined via its contact radius) and the triangle.  The effect is that
 a particle cannot penetrate into the triangular surface.  The
-parameter <contact\_stiffness> has units of pressure and should equal
+parameter <contact_stiffness> has units of pressure and should equal
 roughly one half of the Young's modulus (or bulk modulus in the case
 of fluids) of the material model associated with the SPH particle
 
-The parameter *scale\_factor* can be used to scale the particles'
+The parameter *scale_factor* can be used to scale the particles'
 contact radii. This can be useful to control how close particles can
-approach the triangulated surface. Usually, *scale\_factor* =1.0.
-
+approach the triangulated surface. Usually, *scale_factor* =1.0.
 
 ----------
 
-
 **Mixing, shift, table, tail correction, restart, rRESPA info**\ :
 
 No mixing is performed automatically.
 Currently, no part of USER-SMD supports restarting nor minimization.
 rRESPA does not apply to this pair style.
 
-
 ----------
 
-
 Restrictions
 """"""""""""
 
-
 This fix is part of the USER-SMD package.  It is only enabled if
 LAMMPS was built with that package.  See the :doc:`Build package <Build_package>` doc page for more info.
 
@@ -63,12 +59,3 @@ Related commands
 :doc:`pair_coeff <pair_coeff>`
 
 **Default:** none
-
-
-----------
-
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/pair_smd_ulsph.rst b/doc/src/pair_smd_ulsph.rst
index f09f2d829e..6210de2423 100644
--- a/doc/src/pair_smd_ulsph.rst
+++ b/doc/src/pair_smd_ulsph.rst
@@ -1,19 +1,17 @@
-.. index:: pair\_style smd/ulsph
+.. index:: pair_style smd/ulsph
 
-pair\_style smd/ulsph command
+pair_style smd/ulsph command
 =============================
 
 Syntax
 """"""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    pair_style smd/ulsph args
 
 * these keywords must be given
 
-
 .. parsed-literal::
 
    keyword = *\*DENSITY_SUMMATION* or *\*DENSITY_CONTINUITY* and *\*VELOCITY_GRADIENT* or *\*NO_VELOCITY_GRADIENT* and *\*GRADIENT_CORRECTION* or *\*NO_GRADIENT_CORRECTION*
@@ -21,10 +19,9 @@ Syntax
 Examples
 """"""""
 
+.. code-block:: LAMMPS
 
-.. parsed-literal::
-
-   pair_style smd/ulsph \*DENSITY_CONTINUITY \*VELOCITY_GRADIENT \*NO_GRADIENT_CORRECTION
+   pair_style smd/ulsph *DENSITY_CONTINUITY *VELOCITY_GRADIENT *NO_GRADIENT_CORRECTION
 
 Description
 """""""""""
@@ -35,17 +32,16 @@ Smooth-Particle Hydrodynamics algorithm.
 
 This pair style is invoked similar to the following command:
 
+.. code-block:: LAMMPS
 
-.. parsed-literal::
-
-   pair_style smd/ulsph \*DENSITY_CONTINUITY \*VELOCITY_GRADIENT \*NO_GRADIENT_CORRECTION
-   pair_coeff i j \*COMMON rho0 c0 Q1 Cp hg &
-                  \*END
+   pair_style smd/ulsph *DENSITY_CONTINUITY *VELOCITY_GRADIENT *NO_GRADIENT_CORRECTION
+   pair_coeff i j *COMMON rho0 c0 Q1 Cp hg &
+                  *END
 
 Here, *i* and *j* denote the *LAMMPS* particle types for which this
 pair style is defined. Note that *i* and *j* can be different, i.e.,
 *ulsph* cross interactions between different particle types are
-allowed. However, *i*\ --\ *i* respectively *j*\ --\ *j* pair\_coeff lines have
+allowed. However, *i*\ --\ *i* respectively *j*\ --\ *j* pair_coeff lines have
 to precede a cross interaction.  In contrast to the usual *LAMMPS*
 *pair coeff* definitions, which are given solely a number of floats
 and integers, the *ulsph* *pair coeff* definition is organized using
@@ -59,31 +55,26 @@ diagonal components of the stress tensor), and a material model to
 compute shear stresses (the off-diagonal components of the stress
 tensor).
 
-Note that the use of \*GRADIENT\_CORRECTION can lead to severe numerical
-instabilities. For a general fluid simulation, \*NO\_GRADIENT\_CORRECTION
+Note that the use of \*GRADIENT_CORRECTION can lead to severe numerical
+instabilities. For a general fluid simulation, \*NO_GRADIENT_CORRECTION
 is recommended.
 
 Please see the `SMD user guide <PDF/SMD_LAMMPS_userguide.pdf>`_ for a
 complete listing of the possible keywords and material models.
 
-
 ----------
 
-
 **Mixing, shift, table, tail correction, restart, rRESPA info**\ :
 
 No mixing is performed automatically.  Currently, no part of USER-SMD
 supports restarting nor minimization.  rRESPA does not apply to this
 pair style.
 
-
 ----------
 
-
 Restrictions
 """"""""""""
 
-
 This fix is part of the USER-SMD package.  It is only enabled if
 LAMMPS was built with that package.  See the :doc:`Build package <Build_package>` doc page for more info.
 
@@ -93,12 +84,3 @@ Related commands
 :doc:`pair_coeff <pair_coeff>`
 
 **Default:** none
-
-
-----------
-
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/pair_smtbq.rst b/doc/src/pair_smtbq.rst
index 14f836bd52..492820124e 100644
--- a/doc/src/pair_smtbq.rst
+++ b/doc/src/pair_smtbq.rst
@@ -1,76 +1,78 @@
-.. index:: pair\_style smtbq
+.. index:: pair_style smtbq
 
-pair\_style smtbq command
-=========================
+pair_style smtbq command
+========================
 
 Syntax
 """"""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    pair_style smtbq
 
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    pair_style smtbq
-   pair_coeff \* \* ffield.smtbq.Al2O3 O Al
+   pair_coeff * * ffield.smtbq.Al2O3 O Al
 
 Description
 """""""""""
 
 This pair style computes a variable charge SMTB-Q (Second-Moment
-tight-Binding QEq) potential as described in :ref:`SMTB-Q\_1 <SMTB-Q_1>` and
-:ref:`SMTB-Q\_2 <SMTB-Q_2>`. Briefly, the energy of metallic-oxygen systems
+tight-Binding QEq) potential as described in :ref:`SMTB-Q_1 <SMTB-Q_1>` and
+:ref:`SMTB-Q_2 <SMTB-Q_2>`. Briefly, the energy of metallic-oxygen systems
 is given by three contributions:
 
-.. image:: Eqs/pair_smtbq1.jpg
-   :align: center
+.. math::
 
-where *E<sub>tot</sub>* is the total potential energy of the system,
-*E<sub>ES</sub>* is the electrostatic part of the total energy,
-*E<sub>OO</sub>* is the interaction between oxygen atoms and
-*E<sub>MO</sub>* is a short-range interaction between metal and oxygen
-atoms. This interactions depend on interatomic distance
-*r<sub>ij</sub>* and/or the charge *Q<sub>i</sub>* of atoms
-*i*\ . Cut-off function enables smooth convergence to zero interaction.
+   E_{tot} & =  E_{ES} + E_{OO} + E_{MO} \\
+   E_{ES}  & =  \sum_i{\biggl[ \chi_{i}^{0}Q_i + \frac{1}{2}J_{i}^{0}Q_{i}^{2} +
+   \frac{1}{2} \sum_{j\neq i}{ J_{ij}(r_{ij})f_{cut}^{R_{coul}}(r_{ij})Q_i Q_j } \biggr] } \\
+   E_{OO}  & =  \sum_{i,j}^{i,j = O}{\biggl[Cexp( -\frac{r_{ij}}{\rho} ) - Df_{cut}^{r_1^{OO}r_2^{OO}}(r_{ij}) exp(Br_{ij})\biggr]}  \\
+   E_{MO}  & =  \sum_i{E_{cov}^{i} + \sum_{j\neq i}{ Af_{cut}^{r_{c1}r_{c2}}(r_{ij})exp\bigl[-p(\frac{r_{ij}}{r_0} -1) \bigr] } }
+
+where :math:`E_{tot}` is the total potential energy of the system,
+:math:`E_{ES}` is the electrostatic part of the total energy,
+:math:`E_{OO}` is the interaction between oxygen atoms and
+:math:`E_{MO}` is a short-range interaction between metal and oxygen
+atoms. This interactions depend on interatomic distance :math:`r_{ij}`
+and/or the charge :math:`Q_{i}` of atoms *i*\ . Cut-off function enables
+smooth convergence to zero interaction.
 
 The parameters appearing in the upper expressions are set in the
 ffield.SMTBQ.Syst file where Syst corresponds to the selected system
-(e.g. field.SMTBQ.Al2O3). Examples for TiO<sub>2</sub>,
-Al<sub>2</sub>O<sub>3</sub> are provided.  A single pair\_coeff command
+(e.g. field.SMTBQ.Al2O3). Examples for :math:`\mathrm{TiO_2}`,
+:math:`\mathrm{Al_2O_3}` are provided.  A single pair_coeff command
 is used with the SMTBQ styles which provides the path to the potential
 file with parameters for needed elements. These are mapped to LAMMPS
 atom types by specifying additional arguments after the potential
-filename in the pair\_coeff command. Note that atom type 1 must always
-correspond to oxygen atoms. As an example, to simulate a TiO2 system,
+filename in the pair_coeff command. Note that atom type 1 must always
+correspond to oxygen atoms. As an example, to simulate a :math:`\mathrm{TiO_2}` system,
 atom type 1 has to be oxygen and atom type 2 Ti. The following
-pair\_coeff command should then be used:
+pair_coeff command should then be used:
 
+.. code-block:: LAMMPS
 
-.. parsed-literal::
+   pair_coeff * * PathToLammps/potentials/ffield.smtbq.TiO2 O Ti
 
-   pair_coeff \* \* PathToLammps/potentials/ffield.smtbq.TiO2 O Ti
-
-The electrostatic part of the energy consists of two components 
+The electrostatic part of the energy consists of two components
 
 self-energy of atom *i* in the form of a second order charge dependent
 polynomial and a long-range Coulombic electrostatic interaction. The
 latter uses the wolf summation method described in :ref:`Wolf <Wolf2>`,
-spherically truncated at a longer cutoff, *R<sub>coul</sub>*\ . The
+spherically truncated at a longer cutoff, :math:`R_{coul}`. The
 charge of each ion is modeled by an orbital Slater which depends on
 the principal quantum number (\ *n*\ ) of the outer orbital shared by the
 ion.
 
-Interaction between oxygen, *E<sub>OO</sub>*\ , consists of two parts,
+Interaction between oxygen, :math:`E_{OO}`, consists of two parts,
 an attractive and a repulsive part. The attractive part is effective
-only at short range (< r<sub>2</sub><sup>OO</sup>). The attractive
+only at short range (< :math:`r_2^{OO}`). The attractive
 contribution was optimized to study surfaces reconstruction
-(e.g. :ref:`SMTB-Q\_2 <SMTB-Q_2>` in TiO<sub>2</sub>) and is not necessary
+(e.g. :ref:`SMTB-Q_2 <SMTB-Q_2>` in :math:`\mathrm{TiO_2}`) and is not necessary
 for oxide bulk modeling. The repulsive part is the Pauli interaction
 between the electron clouds of oxygen. The Pauli repulsion and the
 coulombic electrostatic interaction have same cut off value. In the
@@ -78,52 +80,57 @@ ffield.SMTBQ.Syst, the keyword *'buck'* allows to consider only the
 repulsive O-O interactions. The keyword *'buckPlusAttr'* allows to
 consider the repulsive and the attractive O-O interactions.
 
-The short-range interaction between metal-oxygen, *E<sub>MO</sub>* is
+The short-range interaction between metal-oxygen, :math:`E_{MO}` is
 based on the second moment approximation of the density of states with
 a N-body potential for the band energy term,
-*E<sup>i</sup><sub>cov</sub>*\ , and a Born-Mayer type repulsive terms
-as indicated by the keyword *'second\_moment'* in the
+:math:`E^i_{cov}`, and a Born-Mayer type repulsive terms
+as indicated by the keyword *'second_moment'* in the
 ffield.SMTBQ.Syst. The energy band term is given by:
 
-.. image:: Eqs/pair_smtbq2.jpg
-   :align: center
+.. math::
 
-where *&#951<sub>i</sub>* is the stoichiometry of atom *i*\ ,
-*&#948Q<sub>i</sub>* is the charge delocalization of atom *i*\ ,
+   E_{cov}^{i(i=M,O)} & = - \biggl\{\eta_i(\mu \xi^{0})^2 f_{cut}^{r_{c1}r_{c2}}(r_{ij})
+   \biggl( \sum_{j(j=O,M)}{ exp[ -2q(\frac{r_{ij}}{r_0} - 1)] } \biggr)
+   \delta Q_i \bigl( 2\frac{n_0}{\eta_i} - \delta Q_i \bigr) \biggr\}^{1/2} \\
+   \delta Q_i & =  | Q_i^{F} | - | Q_i |
+
+where :math:`\eta_i` is the stoichiometry of atom *i*\ ,
+:math:`\delta Q_i` is the charge delocalization of atom *i*\ ,
 compared to its formal charge
-*Q<sup>F</sup><sub>i</sub>*\ . n<sub>0</sub>, the number of hybridized
+:math:`Q^F_i`. :math:`n_0`, the number of hybridized
 orbitals, is calculated with to the atomic orbitals shared
-*d<sub>i</sub>* and the stoichiometry
-*&#951<sub>i</sub>*\ . *r<sub>c1</sub>* and *r<sub>c2</sub>* are the two
+:math:`d_i` and the stoichiometry
+:math:`\eta_i`. :math:`r_{c1}` and :math:`r_{c2}` are the two
 cutoff radius around the fourth neighbors in the cutoff function.
 
-In the formalism used here, *&#958<sup>0</sup>* is the energy
-parameter. *&#958<sup>0</sup>* is in tight-binding approximation the
+In the formalism used here, :math:`\xi^0` is the energy
+parameter. :math:`\xi^0` is in tight-binding approximation the
 hopping integral between the hybridized orbitals of the cation and the
 anion. In the literature we find many ways to write the hopping
 integral depending on whether one takes the point of view of the anion
 or cation. These are equivalent vision. The correspondence between the
 two visions is explained in appendix A of the article in the
-SrTiO<sub>3</sub> :ref:`SMTB-Q\_3 <SMTB-Q_3>` (parameter *&#946* shown in
-this article is in fact the *&#946<sub>O</sub>*\ ). To summarize the
-relationship between the hopping integral *&#958<sup>0</sup>* and the
-others, we have in an oxide C<sub>n</sub>O<sub>m</sub> the following
+SrTiO3 :ref:`SMTB-Q_3 <SMTB-Q_3>` (parameter :math:`\beta` shown in
+this article is in fact the :math:`\beta_O`). To summarize the
+relationship between the hopping integral :math:`\xi^O`  and the
+others, we have in an oxide :math:`\mathrm{C_n O_m}` the following
 relationship:
 
-.. image:: Eqs/pair_smtbq3.jpg
-   :align: center
+.. math::
 
-Thus parameter &#956, indicated above, is given by : &#956 = (&#8730n
-+ &#8730m) &#8260 2
+   \xi^0 & = \frac{\xi_O}{m} = \frac{\xi_C}{n} \\
+   \frac{\beta_O}{\sqrt{m}} & = \frac{\beta_C}{\sqrt{n}} = \xi^0 \frac{\sqrt{m}+\sqrt{n}}{2}
+
+Thus parameter :math:`\mu`, indicated above, is given by :math:`\mu = \frac{1}{2}(\sqrt{n}+\sqrt{m})`
 
 The potential offers the possibility to consider the polarizability of
 the electron clouds of oxygen by changing the slater radius of the
 charge density around the oxygen atoms through the parameters *rBB, rB and
 rS* in the ffield.SMTBQ.Syst. This change in radius is performed
 according to the method developed by E. Maras
-:ref:`SMTB-Q\_2 <SMTB-Q_2>`. This method needs to determine the number of
+:ref:`SMTB-Q_2 <SMTB-Q_2>`. This method needs to determine the number of
 nearest neighbors around the oxygen. This calculation is based on
-first (\ *r<sub>1n</sub>*\ ) and second (\ *r<sub>2n</sub>*\ ) distances
+first (:math:`r_{1n}`) and second (:math:`r_{2n}`) distances
 neighbors.
 
 The SMTB-Q potential is a variable charge potential. The equilibrium
@@ -132,8 +139,8 @@ equalization (QEq) method. See :ref:`Rick <Rick3>` for further detail. One
 can adjust the frequency, the maximum number of iterative loop and the
 convergence of the equilibrium charge calculation. To obtain the
 energy conservation in NVE thermodynamic ensemble, we recommend to use
-a convergence parameter in the interval 10<sup>-5</sup> -
-10<sup>-6</sup> eV.
+a convergence parameter in the interval 10e-5 -
+10e-6 eV.
 
 The ffield.SMTBQ.Syst files are provided for few systems. They consist
 of nine parts and the lines beginning with '#' are comments (note that
@@ -144,94 +151,135 @@ quotation marks ('').
 
 1) Number of different element in the oxide:
 
-* N<sub>elem</sub>= 2 or 3
-* Divided line
+* N_elem= 2 or 3
+* Divider line
 
 2) Atomic parameters
 
-For the anion (oxygen) 
+For the anion (oxygen)
 
 * Name of element (char) and stoichiometry in oxide
 * Formal charge and mass of element
-* Principal quantum number of outer orbital (\ *n*\ ), electronegativity (\ *&#967<sup>0</sup><sub>i</simulationub>*\ ) and hardness (\ *J<sup>0</sup><sub>i</sub>*\ )
-* Ionic radius parameters  : max coordination number (\ *coordBB* = 6 by default), bulk coordination number *(coordB)*\ , surface coordination number  *(coordS)* and *rBB, rB and rS*  the slater radius for each coordination number. (<b>note : If you don't want to change the slater radius, use three identical radius values</b>)
-* Number of orbital shared by the element in the oxide (\ *d<sub>i</sub>*\ )
-* Divided line
+* Principal quantum number of outer orbital n), electronegativity (:math:`\chi^0_i`) and hardness (:math:`J^0_i`)
+* Ionic radius parameters  : max coordination number (\ *coordBB* = 6 by default), bulk coordination number *(coordB)*\ , surface coordination number  *(coordS)* and *rBB, rB and rS*  the slater radius for each coordination number. (**note : If you don't want to change the slater radius, use three identical radius values**)
+* Number of orbital shared by the element in the oxide (:math:`d_i`)
+* Divider line
 
 For each cations (metal):
 
 * Name of element (char) and stoichiometry in oxide
 * Formal charge and mass of element
-* Number of electron in outer orbital *(ne)*\ , electronegativity (\ *&#967<sup>0</sup><sub>i</simulationub>*\ ), hardness (\ *J<sup>0</sup><sub>i</sub>*\ ) and *r<sub>Salter</sub>* the slater radius for the cation.
-* Number of orbitals shared by the elements in the oxide (\ *d<sub>i</sub>*\ )
-* Divided line
+* Number of electron in outer orbital *(ne)*\ , electronegativity (:math:`\chi^0_i`), hardness (:math:`J^0_i`) and :math:`r_{Slater}` the slater radius for the cation.
+* Number of orbitals shared by the elements in the oxide (:math:`d_i`)
+* Divider line
 
 3) Potential parameters:
 
-* Keyword for element1, element2 and interaction potential ('second\_moment' or 'buck' or 'buckPlusAttr') between element 1 and 2.  If the potential is 'second\_moment', specify 'oxide' or 'metal' for metal-oxygen or metal-metal interactions respectively.
-* Potential parameter: <pre><br/> If type of potential is 'second\_moment' : *A (eV)*\ , *p*\ , *&#958<sup>0</sup>* (eV) and *q* <br/> *r<sub>c1</sub>* (&#197), *r<sub>c2</sub>* (&#197) and *r<sub>0</sub>* (&#197) <br/> If type of potential is 'buck' : *C* (eV) and *&#961* (&#197) <br/> If type of potential is 'buckPlusAttr' : *C* (eV) and *&#961* (&#197) <br/> *D* (eV), *B* (&#197<sup>-1</sup>), *r<sub>1</sub><sup>OO</sup>* (&#197) and *r<sub>2</sub><sup>OO</sup>* (&#197) </pre>
-* Divided line
+* Keyword for element1, element2 and interaction potential
+  ('second_moment' or 'buck' or 'buckPlusAttr') between element 1
+  and 2.  If the potential is 'second_moment', specify 'oxide' or
+  'metal' for metal-oxygen or metal-metal interactions respectively.
+* Potential parameter:
+
+  - If type of potential is 'second_moment' : A (eV), *p*,
+    :math:`\zeta^0` (eV) and *q*, :math:`r_{c1} (\mathrm{\mathring{A}})`, :math:`r_{c2}
+    (\mathrm{\mathring{A}})` and :math:`r_0 (\mathrm{\mathring{A}})`
+  - If type of potential is 'buck' : *C* (eV) and :math:`\rho (\mathrm{\mathring{A}})`
+  - If type of potential is 'buckPlusAttr' : *C* (eV) and :math:`\rho
+    (\mathrm{\mathring{A}})` *D* (eV), *B* :math:`(\mathrm{\mathring{A}}^{-1})`, :math:`r^{OO}_1 (\mathrm{\mathring{A}})` and
+    :math:`r^{OO}_2 (\mathrm{\mathring{A}})`
+* Divider line
 
 4) Tables parameters:
 
-* Cutoff radius for the Coulomb interaction (\ *R<sub>coul</sub>*\ )
-* Starting radius  (\ *r<sub>min</sub>* = 1,18845 &#197) and increments (\ *dr* = 0,001 &#197) for creating the potential table.
-* Divided line
+* Cutoff radius for the Coulomb interaction (:math:`R_{coul}`)
+* Starting radius (:math:`r_{min} = 1,18845 \mathrm{\mathring{A}}`) and increments
+  (:math:`dr = 0.001 \mathrm{\mathring{A}}`) for creating the potential table.
+* Divider line
 
 5) Rick model parameter:
 
-* *Nevery* : parameter to set the frequency (\ *1/Nevery*\ ) of the charge resolution. The charges are evaluated each *Nevery* time steps.
-* Max number of iterative loop (\ *loopmax*\ ) and precision criterion (\ *prec*\ ) in eV of the charge resolution
-* Divided line
+* *Nevery* : parameter to set the frequency of the charge
+  resolution. The charges are evaluated each *Nevery* time steps.
+* Max number of iterative loop (\ *loopmax*\ ) and convergence criterion
+  (\ *prec*\ ) in eV of the charge resolution
+* Divider line
 
 6) Coordination parameter:
 
-* First (\ *r<sub>1n</sub>*\ ) and second (\ *r<sub>2n</sub>*\ ) neighbor distances in &#197
-* Divided line
+* First (:math:`r_{1n}`) and second (:math:`r_{2n}`) neighbor distances
+  in angstrom
+* Divider line
 
 7) Charge initialization mode:
 
-* Keyword (\ *QInitMode*\ ) and initial oxygen charge (\ *Q<sub>init</sub>*\ ). If keyword = 'true', all oxygen charges are initially set equal to *Q<sub>init</sub>*\ . The charges on the cations are initially set in order to respect the neutrality of the box. If keyword = 'false', all atom charges are initially set equal to 0 if you use "create\_atom"#create\_atom command or the charge specified in the file structure using :doc:`read_data <read_data>` command.
-* Divided line
+* Keyword (\ *QInitMode*\ ) and initial oxygen charge
+  (:math:`Q_{init}`). If keyword = 'true', all oxygen charges are
+  initially set equal to :math:`Q_{init}`. The charges on the cations
+  are initially set in order to respect the neutrality of the box. If
+  keyword = 'false', all atom charges are initially set equal to 0 if
+  you use the :doc:`create_atoms <create_atoms>` command or the charge
+  specified in the file structure using :doc:`read_data <read_data>`
+  command.
+* Divider line
 
-8) Mode for the electronegativity equalization (Qeq) 
+8) Mode for the electronegativity equalization (Qeq)
+
+* Keyword (\ *mode*\ ) followed by:
+
+  - QEqAll  (one QEq group) \|   no parameters
+  - QEqAllParallel (several QEq groups) \|   no parameters
+  - Surface \|   zlim   (QEq only for z>zlim)
 
-* Keyword mode: <pre> <br/> QEqAll  (one QEq group) \|   no parameters <br/> QEqAllParallel (several QEq groups) \|   no parameters <br/> Surface \|   zlim   (QEq only for z>zlim)   </pre>
 * Parameter if necessary
-* Divided line
+* Divider line
 
-9) Verbose 
+9) Verbose
 
 * If you want the code to work in verbose mode or not : 'true' or 'false'
-* If you want to print or not in file 'Energy\_component.txt' the three main contributions to the energy of the system according to the description presented above : 'true' or 'false' and *N<sub>Energy</sub>*\ . This option writes in file every *N<sub>Energy</sub>* time step. If the value is 'false' then *N<sub>Energy</sub>* = 0. The file take into account the possibility to have several QEq group *g* then it writes: time step, number of atoms in group *g*\ , electrostatic part of energy, *E<sub>ES</sub>*\ , the interaction between oxygen, *E<sub>OO</sub>*\ , and short range metal-oxygen interaction, *E<sub>MO</sub>*\ .
-* If you want to print in file 'Electroneg\_component.txt' the electronegativity component (\ *&#8706E<sub>tot</sub> &#8260&#8706Q<sub>i</sub>*\ ) or not: 'true' or 'false' and *N<sub>Electroneg</sub>*\ .This option writes in file every *N<sub>Electroneg</sub>* time step. If the value is 'false' then *N<sub>Electroneg</sub>* = 0.  The file consist in atom number *i*\ , atom type (1 for oxygen and # higher than 1 for metal), atom position: *x*\ , *y* and *z*\ , atomic charge of atom *i*\ , electrostatic part of atom *i* electronegativity, covalent part of atom *i* electronegativity, the hopping integral of atom *i* *(Z&#946<sup>2</sup>)<sub>i<sub>* and box electronegativity.
+* If you want to print or not in the file 'Energy_component.txt' the
+  three main contributions to the energy of the system according to the
+  description presented above : 'true' or 'false' and
+  :math:`N_{Energy}`. This option writes to the file every
+  :math:`N_{Energy}` time steps. If the value is 'false' then
+  :math:`N_{Energy} = 0`. The file takes into account the possibility to
+  have several QEq groups *g* then it writes: time step, number of atoms
+  in group *g*\ , electrostatic part of energy, :math:`E_{ES}`, the
+  interaction between oxygen, :math:`E_{OO}`, and short range
+  metal-oxygen interaction, :math:`E_{MO}`.
+* If you want to print to the file 'Electroneg_component.txt' the
+  electronegativity component (:math:`\frac{\partial E_{tot}}{\partial
+  Q_i}`) or not: 'true' or 'false' and :math:`N_{Electroneg}`. This
+  option writes to the file every :math:`N_{Electroneg}` time steps. If
+  the value is 'false' then :math:`N_{Electroneg} = 0`.  The file
+  consist of atom number *i*\ , atom type (1 for oxygen and # higher
+  than 1 for metal), atom position: *x*\ , *y* and *z*\ , atomic charge
+  of atom *i*\ , electrostatic part of atom *i* electronegativity,
+  covalent part of atom *i* electronegativity, the hopping integral of
+  atom *i* :math:`(Z\beta^2)_i` and box electronegativity.
 
 .. note::
 
    This last option slows down the calculation dramatically.  Use
    only with a single processor simulation.
 
-
 ----------
 
-
 **Mixing, shift, table, tail correction, restart, rRESPA info:**
 
 This pair style does not support the :doc:`pair_modify <pair_modify>`
 mix, shift, table, and tail options.
 
 This pair style does not write its information to :doc:`binary restart files <restart>`, since it is stored in potential files.  Thus, you
-needs to re-specify the pair\_style and pair\_coeff commands in an input
+needs to re-specify the pair_style and pair_coeff commands in an input
 script that reads a restart file.
 
 This pair style can only be used via the *pair* keyword of the
 :doc:`run_style respa <run_style>` command.  It does not support the
 *inner*\ , *middle*\ , *outer* keywords.
 
-
 ----------
 
-
 **Restriction:**
 
 This pair style is part of the USER-SMTBQ package and is only enabled
@@ -246,55 +294,36 @@ for pair interactions.
 The SMTB-Q potential files provided with LAMMPS (see the potentials
 directory) are parameterized for metal :doc:`units <units>`.
 
-
 ----------
 
-
 **Citing this work:**
 
 Please cite related publication: N. Salles, O. Politano, E. Amzallag
 and R. Tetot, Comput. Mater. Sci. 111 (2016) 181-189
 
-
 ----------
 
+.. _SMTB-Q_1:
 
-.. _SMTB-Q\_1:
-
-
-
-**(SMTB-Q\_1)** N. Salles, O. Politano, E. Amzallag, R. Tetot,
+**(SMTB-Q_1)** N. Salles, O. Politano, E. Amzallag, R. Tetot,
 Comput. Mater. Sci. 111 (2016) 181-189
 
-.. _SMTB-Q\_2:
+.. _SMTB-Q_2:
 
-
-
-**(SMTB-Q\_2)** E. Maras, N. Salles, R. Tetot, T. Ala-Nissila,
+**(SMTB-Q_2)** E. Maras, N. Salles, R. Tetot, T. Ala-Nissila,
 H. Jonsson, J. Phys. Chem. C 2015, 119, 10391-10399
 
-.. _SMTB-Q\_3:
+.. _SMTB-Q_3:
 
-
-
-**(SMTB-Q\_3)** R. Tetot, N. Salles, S. Landron, E. Amzallag, Surface
+**(SMTB-Q_3)** R. Tetot, N. Salles, S. Landron, E. Amzallag, Surface
 Science 616, 19-8722 28 (2013)
 
 .. _Wolf2:
 
-
-
 **(Wolf)** D. Wolf, P. Keblinski, S. R. Phillpot, J. Eggebrecht, J Chem
 Phys, 110, 8254 (1999).
 
 .. _Rick3:
 
-
-
 **(Rick)** S. W. Rick, S. J. Stuart, B. J. Berne, J Chem Phys 101, 6141
 (1994).
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/pair_snap.rst b/doc/src/pair_snap.rst
index d1137eb586..06ed748a07 100644
--- a/doc/src/pair_snap.rst
+++ b/doc/src/pair_snap.rst
@@ -1,27 +1,25 @@
-.. index:: pair\_style snap
+.. index:: pair_style snap
 
-pair\_style snap command
-========================
+pair_style snap command
+=======================
 
-pair\_style snap/kk command
-===========================
+pair_style snap/kk command
+==========================
 
 Syntax
 """"""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    pair_style snap
 
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    pair_style snap
-   pair_coeff \* \* InP.snapcoeff InP.snapparam In In P P
+   pair_coeff * * InP.snapcoeff InP.snapparam In In P P
 
 Description
 """""""""""
@@ -38,12 +36,13 @@ In SNAP, the total energy is decomposed into a sum over
 atom energies. The energy of atom *i* is
 expressed as a weighted sum over bispectrum components.
 
-.. image:: Eqs/pair_snap.jpg
-   :align: center
+.. math::
 
-where *B\_k\^i* is the *k*\ -th bispectrum component of atom *i*\ ,
-and *beta\_k\^alpha\_i* is the corresponding linear coefficient
-that depends on *alpha\_i*, the SNAP element of atom *i*\ . The
+   E^i_{SNAP}(B_1^i,...,B_K^i) = \beta^{\alpha_i}_0 + \sum_{k=1}^K \beta_k^{\alpha_i} B_k^i
+
+where :math:`B_k^i` is the *k*\ -th bispectrum component of atom *i*\ ,
+and :math:`\beta_k^{\alpha_i}` is the corresponding linear coefficient
+that depends on :math:\alpha_i`, the SNAP element of atom *i*\ . The
 number of bispectrum components used and their definitions
 depend on the value of *twojmax*
 defined in the SNAP parameter file described below.
@@ -51,10 +50,10 @@ The bispectrum calculation is described in more detail
 in :doc:`compute sna/atom <compute_sna_atom>`.
 
 Note that unlike for other potentials, cutoffs for SNAP potentials are
-not set in the pair\_style or pair\_coeff command; they are specified in
+not set in the pair_style or pair_coeff command; they are specified in
 the SNAP potential files themselves.
 
-Only a single pair\_coeff command is used with the *snap* style which
+Only a single pair_coeff command is used with the *snap* style which
 specifies a SNAP coefficient file followed by a SNAP parameter file
 and then N additional arguments specifying the mapping of SNAP
 elements to LAMMPS atom types, where N is the number of
@@ -66,12 +65,11 @@ LAMMPS atom types:
 
 As an example, if a LAMMPS indium phosphide simulation has 4 atoms
 types, with the first two being indium and the 3rd and 4th being
-phophorous, the pair\_coeff command would look like this:
+phophorous, the pair_coeff command would look like this:
 
+.. code-block:: LAMMPS
 
-.. parsed-literal::
-
-   pair_coeff \* \* snap InP.snapcoeff InP.snapparam In In P P
+   pair_coeff * * snap InP.snapcoeff InP.snapparam In In P P
 
 The 1st 2 arguments must be \* \* so as to span all LAMMPS atom types.
 The two filenames are for the coefficient and parameter files, respectively.
@@ -103,17 +101,16 @@ tantalum potential provided in the LAMMPS potentials directory
 combines the *snap* and *zbl* pair styles. It is invoked
 by the following commands:
 
+.. code-block:: LAMMPS
 
-.. parsed-literal::
-
-           variable zblcutinner equal 4
-           variable zblcutouter equal 4.8
-           variable zblz equal 73
-           pair_style hybrid/overlay &
-           zbl ${zblcutinner} ${zblcutouter} snap
-           pair_coeff \* \* zbl 0.0
-           pair_coeff 1 1 zbl ${zblz}
-           pair_coeff \* \* snap Ta06A.snapcoeff Ta06A.snapparam Ta
+   variable zblcutinner equal 4
+   variable zblcutouter equal 4.8
+   variable zblz equal 73
+   pair_style hybrid/overlay &
+   zbl ${zblcutinner} ${zblcutouter} snap
+   pair_coeff * * zbl 0.0
+   pair_coeff 1 1 zbl ${zblz}
+   pair_coeff * * snap Ta06A.snapcoeff Ta06A.snapparam Ta
 
 It is convenient to keep these commands in a separate file that can
 be inserted in any LAMMPS input script using the :doc:`include <include>`
@@ -139,7 +136,7 @@ The SNAP parameter file can contain blank and comment lines (start
 with #) anywhere. Each non-blank non-comment line must contain one
 keyword/value pair. The required keywords are *rcutfac* and
 *twojmax*\ . Optional keywords are *rfac0*\ , *rmin0*\ ,
-*switchflag*\ , and *bzeroflag*\ .
+*switchflag*\ , *bzeroflag*\, and *chunksize*\.
 
 The default values for these keywords are
 
@@ -148,10 +145,21 @@ The default values for these keywords are
 * *switchflag* = 0
 * *bzeroflag* = 1
 * *quadraticflag* = 1
+* *chunksize* = 2000
 
-Detailed definitions for all the keywords are given on the :doc:`compute sna/atom <compute_sna_atom>` doc page.
-If *quadraticflag* is set to 1, then the SNAP energy expression includes the quadratic term,
-0.5\*B\^t.alpha.B, where alpha is a symmetric *K* by *K* matrix.
+The keyword *chunksize* is only applicable when using the
+pair style *snap* with the KOKKOS package and is ignored otherwise.
+This keyword controls
+the number of atoms in each pass used to compute the bispectrum
+components and is used to avoid running out of memory. For example
+if there are 4000 atoms in the simulation and the *chunksize*
+is set to 2000, the bispectrum calculation will be broken up
+into two passes.
+
+Detailed definitions for all the other keywords
+are given on the :doc:`compute sna/atom <compute_sna_atom>` doc page.
+
+If *quadraticflag* is set to 1, then the SNAP energy expression includes the quadratic term, 0.5\*B\^t.alpha.B, where alpha is a symmetric *K* by *K* matrix.
 The SNAP element file should contain *K*\ (\ *K*\ +1)/2 additional coefficients
 for each element, the upper-triangular elements of alpha.
 
@@ -160,32 +168,28 @@ for each element, the upper-triangular elements of alpha.
    The previously used *diagonalstyle* keyword was removed in 2019,
    since all known SNAP potentials use the default value of 3.
 
-
 ----------
 
-
 **Mixing, shift, table, tail correction, restart, rRESPA info**\ :
 
 For atom type pairs I,J and I != J, where types I and J correspond to
 two different element types, mixing is performed by LAMMPS with
 user-specifiable parameters as described above.  You never need to
-specify a pair\_coeff command with I != J arguments for this style.
+specify a pair_coeff command with I != J arguments for this style.
 
 This pair style does not support the :doc:`pair_modify <pair_modify>`
 shift, table, and tail options.
 
 This pair style does not write its information to :doc:`binary restart files <restart>`, since it is stored in potential files.  Thus, you
-need to re-specify the pair\_style and pair\_coeff commands in an input
+need to re-specify the pair_style and pair_coeff commands in an input
 script that reads a restart file.
 
 This pair style can only be used via the *pair* keyword of the
 :doc:`run_style respa <run_style>` command.  It does not support the
 *inner*\ , *middle*\ , *outer* keywords.
 
-
 ----------
 
-
 Styles with a *gpu*\ , *intel*\ , *kk*\ , *omp*\ , or *opt* suffix are
 functionally the same as the corresponding style without the suffix.
 They have been optimized to run faster, depending on your available
@@ -204,14 +208,11 @@ by including their suffix, or you can use the :doc:`-suffix command-line switch
 See the :doc:`Speed packages <Speed_packages>` doc page for more
 instructions on how to use the accelerated styles effectively.
 
-
 ----------
 
-
 Restrictions
 """"""""""""
 
-
 This style is part of the SNAP package.  It is only enabled if LAMMPS
 was built with that package.  See the :doc:`Build package <Build_package>` doc page for more info.
 
@@ -224,29 +225,16 @@ Related commands
 
 **Default:** none
 
-
 ----------
 
-
 .. _Thompson20142:
 
-
-
 **(Thompson)** Thompson, Swiler, Trott, Foiles, Tucker, J Comp Phys, 285, 316 (2015).
 
 .. _Bartok20102:
 
-
-
 **(Bartok2010)** Bartok, Payne, Risi, Csanyi, Phys Rev Lett, 104, 136403 (2010).
 
 .. _Bartok2013:
 
-
-
 **(Bartok2013)** Bartok, Gillan, Manby, Csanyi, Phys Rev B 87, 184115 (2013).
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/pair_soft.rst b/doc/src/pair_soft.rst
index 384f7e1cc3..3339009052 100644
--- a/doc/src/pair_soft.rst
+++ b/doc/src/pair_soft.rst
@@ -1,19 +1,18 @@
-.. index:: pair\_style soft
+.. index:: pair_style soft
 
-pair\_style soft command
-========================
+pair_style soft command
+=======================
 
-pair\_style soft/gpu command
-============================
+pair_style soft/gpu command
+===========================
 
-pair\_style soft/omp command
-============================
+pair_style soft/omp command
+===========================
 
 Syntax
 """"""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    pair_style soft cutoff
 
@@ -22,25 +21,26 @@ Syntax
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    pair_style soft 1.0
-   pair_coeff \* \* 10.0
+   pair_coeff * * 10.0
    pair_coeff 1 1 10.0 3.0
 
    pair_style soft 1.0
-   pair_coeff \* \* 0.0
+   pair_coeff * * 0.0
    variable prefactor equal ramp(0,30)
-   fix 1 all adapt 1 pair soft a \* \* v_prefactor
+   fix 1 all adapt 1 pair soft a * * v_prefactor
 
 Description
 """""""""""
 
 Style *soft* computes pairwise interactions with the formula
 
-.. image:: Eqs/pair_soft.jpg
-   :align: center
+.. math::
+
+   E = A \left[ 1 + \cos\left(\frac{\pi r}{r_c}\right) \right]
+   \qquad r < r_c
 
 It is useful for pushing apart overlapping atoms, since it does not
 blow up as r goes to 0.  A is a pre-factor that can be made to vary in
@@ -74,26 +74,23 @@ cutoff is used.
 
 The :doc:`fix adapt <fix_adapt>` command can be used to vary A for one
 or more pair types over the course of a simulation, in which case
-pair\_coeff settings for A must still be specified, but will be
+pair_coeff settings for A must still be specified, but will be
 overridden.  For example these commands will vary the prefactor A for
 all pairwise interactions from 0.0 at the beginning to 30.0 at the end
 of a run:
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    variable prefactor equal ramp(0,30)
-   fix 1 all adapt 1 pair soft a \* \* v_prefactor
+   fix 1 all adapt 1 pair soft a * * v_prefactor
 
 Note that a formula defined by an :doc:`equal-style variable <variable>`
 can use the current timestep, elapsed time in the current run, elapsed
 time since the beginning of a series of runs, as well as access other
 variables.
 
-
 ----------
 
-
 Styles with a *gpu*\ , *intel*\ , *kk*\ , *omp*\ , or *opt* suffix are
 functionally the same as the corresponding style without the suffix.
 They have been optimized to run faster, depending on your available
@@ -112,17 +109,15 @@ by including their suffix, or you can use the :doc:`-suffix command-line switch
 See the :doc:`Speed packages <Speed_packages>` doc page for more
 instructions on how to use the accelerated styles effectively.
 
-
 ----------
 
-
 **Mixing, shift, table, tail correction, restart, rRESPA info**\ :
 
 For atom type pairs I,J and I != J, the A coefficient and cutoff
 distance for this pair style can be mixed.  A is always mixed via a
-*geometric* rule.  The cutoff is mixed according to the pair\_modify
+*geometric* rule.  The cutoff is mixed according to the pair_modify
 mix value.  The default mix value is *geometric*\ .  See the
-"pair\_modify" command for details.
+"pair_modify" command for details.
 
 This pair style does not support the :doc:`pair_modify <pair_modify>`
 shift option, since the pair interaction goes to 0.0 at the cutoff.
@@ -130,17 +125,15 @@ shift option, since the pair interaction goes to 0.0 at the cutoff.
 The :doc:`pair_modify <pair_modify>` table and tail options are not
 relevant for this pair style.
 
-This pair style writes its information to :doc:`binary restart files <restart>`, so pair\_style and pair\_coeff commands do not need
+This pair style writes its information to :doc:`binary restart files <restart>`, so pair_style and pair_coeff commands do not need
 to be specified in an input script that reads a restart file.
 
 This pair style can only be used via the *pair* keyword of the
 :doc:`run_style respa <run_style>` command.  It does not support the
 *inner*\ , *middle*\ , *outer* keywords.
 
-
 ----------
 
-
 Restrictions
 """"""""""""
  none
@@ -151,8 +144,3 @@ Related commands
 :doc:`pair_coeff <pair_coeff>`, :doc:`fix nve/limit <fix_nve_limit>`, :doc:`fix adapt <fix_adapt>`
 
 **Default:** none
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/pair_sph_heatconduction.rst b/doc/src/pair_sph_heatconduction.rst
index 6e468aaf1d..45d064fdf5 100644
--- a/doc/src/pair_sph_heatconduction.rst
+++ b/doc/src/pair_sph_heatconduction.rst
@@ -1,24 +1,22 @@
-.. index:: pair\_style sph/heatconduction
+.. index:: pair_style sph/heatconduction
 
-pair\_style sph/heatconduction command
-======================================
+pair_style sph/heatconduction command
+=====================================
 
 Syntax
 """"""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    pair_style sph/heatconduction
 
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    pair_style sph/heatconduction
-   pair_coeff \* \* 1.0 2.4
+   pair_coeff * * 1.0 2.4
 
 Description
 """""""""""
@@ -36,10 +34,8 @@ above.
 * D diffusion coefficient (length\^2/time units)
 * h kernel function cutoff (distance units)
 
-
 ----------
 
-
 **Mixing, shift, table, tail correction, restart, rRESPA info**\ :
 
 This style does not support mixing.  Thus, coefficients for all
@@ -48,8 +44,8 @@ I,J pairs must be specified explicitly.
 This style does not support the :doc:`pair_modify <pair_modify>`
 shift, table, and tail options.
 
-This style does not write information to :doc:`binary restart files <restart>`.  Thus, you need to re-specify the pair\_style and
-pair\_coeff commands in an input script that reads a restart file.
+This style does not write information to :doc:`binary restart files <restart>`.  Thus, you need to re-specify the pair_style and
+pair_coeff commands in an input script that reads a restart file.
 
 This style can only be used via the *pair* keyword of the :doc:`run_style respa <run_style>` command.  It does not support the *inner*\ ,
 *middle*\ , *outer* keywords.
@@ -57,18 +53,12 @@ This style can only be used via the *pair* keyword of the :doc:`run_style respa
 Restrictions
 """"""""""""
 
-
 This pair style is part of the USER-SPH package.  It is only enabled
 if LAMMPS was built with that package.  See the :doc:`Build package <Build_package>` doc page for more info.
 
 Related commands
 """"""""""""""""
 
-:doc:`pair_coeff <pair_coeff>`, pair\_sph/rhosum
+:doc:`pair_coeff <pair_coeff>`, pair_sph/rhosum
 
 **Default:** none
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/pair_sph_idealgas.rst b/doc/src/pair_sph_idealgas.rst
index bd21a3cf5b..fe874797eb 100644
--- a/doc/src/pair_sph_idealgas.rst
+++ b/doc/src/pair_sph_idealgas.rst
@@ -1,24 +1,22 @@
-.. index:: pair\_style sph/idealgas
+.. index:: pair_style sph/idealgas
 
-pair\_style sph/idealgas command
-================================
+pair_style sph/idealgas command
+===============================
 
 Syntax
 """"""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    pair_style sph/idealgas
 
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    pair_style sph/idealgas
-   pair_coeff \* \* 1.0 2.4
+   pair_coeff * * 1.0 2.4
 
 Description
 """""""""""
@@ -26,13 +24,14 @@ Description
 The sph/idealgas style computes pressure forces between particles
 according to the ideal gas equation of state:
 
-.. image:: Eqs/pair_sph_ideal.jpg
-   :align: center
+.. math::
 
-where gamma = 1.4 is the heat capacity ratio, rho is the local
-density, and e is the internal energy per unit mass.  This pair style
-also computes Monaghan's artificial viscosity to prevent particles
-from interpenetrating :ref:`(Monaghan) <ideal-Monoghan>`.
+   p = (\gamma - 1) \rho e
+
+where :math:`\gamma = 1.4` is the heat capacity ratio, :math:`\rho` is
+the local density, and e is the internal energy per unit mass.  This
+pair style also computes Monaghan's artificial viscosity to prevent
+particles from interpenetrating :ref:`(Monaghan) <ideal-Monoghan>`.
 
 See `this PDF guide <USER/sph/SPH_LAMMPS_userguide.pdf>`_ to using SPH in
 LAMMPS.
@@ -41,13 +40,11 @@ The following coefficients must be defined for each pair of atoms
 types via the :doc:`pair_coeff <pair_coeff>` command as in the examples
 above.
 
-* nu artificial viscosity (no units)
+* :math:`\nu` artificial viscosity (no units)
 * h kernel function cutoff (distance units)
 
-
 ----------
 
-
 **Mixing, shift, table, tail correction, restart, rRESPA info**\ :
 
 This style does not support mixing.  Thus, coefficients for all
@@ -56,8 +53,8 @@ I,J pairs must be specified explicitly.
 This style does not support the :doc:`pair_modify <pair_modify>`
 shift, table, and tail options.
 
-This style does not write information to :doc:`binary restart files <restart>`.  Thus, you need to re-specify the pair\_style and
-pair\_coeff commands in an input script that reads a restart file.
+This style does not write information to :doc:`binary restart files <restart>`.  Thus, you need to re-specify the pair_style and
+pair_coeff commands in an input script that reads a restart file.
 
 This style can only be used via the *pair* keyword of the :doc:`run_style respa <run_style>` command.  It does not support the *inner*\ ,
 *middle*\ , *outer* keywords.
@@ -65,29 +62,19 @@ This style can only be used via the *pair* keyword of the :doc:`run_style respa
 Restrictions
 """"""""""""
 
-
 This pair style is part of the USER-SPH package.  It is only enabled
 if LAMMPS was built with that package.  See the :doc:`Build package <Build_package>` doc page for more info.
 
 Related commands
 """"""""""""""""
 
-:doc:`pair_coeff <pair_coeff>`, pair\_sph/rhosum
+:doc:`pair_coeff <pair_coeff>`, pair_sph/rhosum
 
 **Default:** none
 
-
 ----------
 
-
 .. _ideal-Monoghan:
 
-
-
 **(Monaghan)** Monaghan and Gingold, Journal of Computational Physics,
 52, 374-389 (1983).
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/pair_sph_lj.rst b/doc/src/pair_sph_lj.rst
index 1911e4f1b8..bdfe530cfb 100644
--- a/doc/src/pair_sph_lj.rst
+++ b/doc/src/pair_sph_lj.rst
@@ -1,24 +1,22 @@
-.. index:: pair\_style sph/lj
+.. index:: pair_style sph/lj
 
-pair\_style sph/lj command
-==========================
+pair_style sph/lj command
+=========================
 
 Syntax
 """"""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    pair_style sph/lj
 
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    pair_style sph/lj
-   pair_coeff \* \* 1.0 2.4
+   pair_coeff * * 1.0 2.4
 
 Description
 """""""""""
@@ -37,13 +35,11 @@ The following coefficients must be defined for each pair of atoms
 types via the :doc:`pair_coeff <pair_coeff>` command as in the examples
 above.
 
-* nu artificial viscosity (no units)
+* :math:`\nu` artificial viscosity (no units)
 * h kernel function cutoff (distance units)
 
-
 ----------
 
-
 **Mixing, shift, table, tail correction, restart, rRESPA info**\ :
 
 This style does not support mixing.  Thus, coefficients for all
@@ -52,8 +48,8 @@ I,J pairs must be specified explicitly.
 This style does not support the :doc:`pair_modify <pair_modify>`
 shift, table, and tail options.
 
-This style does not write information to :doc:`binary restart files <restart>`.  Thus, you need to re-specify the pair\_style and
-pair\_coeff commands in an input script that reads a restart file.
+This style does not write information to :doc:`binary restart files <restart>`.  Thus, you need to re-specify the pair_style and
+pair_coeff commands in an input script that reads a restart file.
 
 This style can only be used via the *pair* keyword of the :doc:`run_style respa <run_style>` command.  It does not support the *inner*\ ,
 *middle*\ , *outer* keywords.
@@ -61,7 +57,6 @@ This style can only be used via the *pair* keyword of the :doc:`run_style respa
 Restrictions
 """"""""""""
 
-
 As noted above, the Lennard-Jones parameters epsilon and sigma are set
 to unity.
 
@@ -71,28 +66,17 @@ if LAMMPS was built with that package.  See the :doc:`Build package <Build_packa
 Related commands
 """"""""""""""""
 
-:doc:`pair_coeff <pair_coeff>`, pair\_sph/rhosum
+:doc:`pair_coeff <pair_coeff>`, pair_sph/rhosum
 
 **Default:** none
 
-
 ----------
 
-
 .. _Ree:
 
-
-
 **(Ree)** Ree, Journal of Chemical Physics, 73, 5401 (1980).
 
 .. _Monoghan:
 
-
-
 **(Monaghan)** Monaghan and Gingold, Journal of Computational Physics,
 52, 374-389 (1983).
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/pair_sph_rhosum.rst b/doc/src/pair_sph_rhosum.rst
index 65a0840ef5..b3148bcd6a 100644
--- a/doc/src/pair_sph_rhosum.rst
+++ b/doc/src/pair_sph_rhosum.rst
@@ -1,13 +1,12 @@
-.. index:: pair\_style sph/rhosum
+.. index:: pair_style sph/rhosum
 
-pair\_style sph/rhosum command
-==============================
+pair_style sph/rhosum command
+=============================
 
 Syntax
 """"""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    pair_style sph/rhosum Nstep
 
@@ -16,11 +15,10 @@ Syntax
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    pair_style sph/rhosum 10
-   pair_coeff \* \* 2.4
+   pair_coeff * * 2.4
 
 Description
 """""""""""
@@ -37,10 +35,8 @@ above.
 
 * h (distance units)
 
-
 ----------
 
-
 **Mixing, shift, table, tail correction, restart, rRESPA info**\ :
 
 This style does not support mixing.  Thus, coefficients for all
@@ -49,8 +45,8 @@ I,J pairs must be specified explicitly.
 This style does not support the :doc:`pair_modify <pair_modify>`
 shift, table, and tail options.
 
-This style does not write information to :doc:`binary restart files <restart>`.  Thus, you need to re-specify the pair\_style and
-pair\_coeff commands in an input script that reads a restart file.
+This style does not write information to :doc:`binary restart files <restart>`.  Thus, you need to re-specify the pair_style and
+pair_coeff commands in an input script that reads a restart file.
 
 This style can only be used via the *pair* keyword of the :doc:`run_style respa <run_style>` command.  It does not support the *inner*\ ,
 *middle*\ , *outer* keywords.
@@ -58,18 +54,12 @@ This style can only be used via the *pair* keyword of the :doc:`run_style respa
 Restrictions
 """"""""""""
 
-
 This pair style is part of the USER-SPH package.  It is only enabled
 if LAMMPS was built with that package.  See the :doc:`Build package <Build_package>` doc page for more info.
 
 Related commands
 """"""""""""""""
 
-:doc:`pair_coeff <pair_coeff>`, pair\_sph/taitwater
+:doc:`pair_coeff <pair_coeff>`, pair_sph/taitwater
 
 **Default:** none
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/pair_sph_taitwater.rst b/doc/src/pair_sph_taitwater.rst
index 3bb085b5bd..3431a20319 100644
--- a/doc/src/pair_sph_taitwater.rst
+++ b/doc/src/pair_sph_taitwater.rst
@@ -1,24 +1,22 @@
-.. index:: pair\_style sph/taitwater
+.. index:: pair_style sph/taitwater
 
-pair\_style sph/taitwater command
-=================================
+pair_style sph/taitwater command
+================================
 
 Syntax
 """"""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    pair_style sph/taitwater
 
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    pair_style sph/taitwater
-   pair_coeff \* \* 1000.0 1430.0 1.0 2.4
+   pair_coeff * * 1000.0 1430.0 1.0 2.4
 
 Description
 """""""""""
@@ -26,11 +24,13 @@ Description
 The sph/taitwater style computes pressure forces between SPH particles
 according to Tait's equation of state:
 
-.. image:: Eqs/pair_sph_tait.jpg
-   :align: center
+.. math::
 
-where gamma = 7 and B = c\_0\^2 rho\_0 / gamma, with rho\_0 being the
-reference density and c\_0 the reference speed of sound.
+   p = B \biggl[\left(\frac{\rho}{\rho_0}\right)^{\gamma} - 1\biggr]
+
+where :math:`\gamma = 7` and :math:`B = c_0^2 \rho_0 / \gamma`, with
+:math:`\rho_0` being the reference density and :math:`c_0` the reference
+speed of sound.
 
 This pair style also computes Monaghan's artificial viscosity to
 prevent particles from interpenetrating :ref:`(Monaghan) <Monaghan>`.
@@ -42,15 +42,13 @@ The following coefficients must be defined for each pair of atoms
 types via the :doc:`pair_coeff <pair_coeff>` command as in the examples
 above.
 
-* rho0 reference density (mass/volume units)
-* c0 reference soundspeed (distance/time units)
-* nu artificial viscosity (no units)
+* :math:`\rho_0` reference density (mass/volume units)
+* :math:`c_0` reference soundspeed (distance/time units)
+* :math:`\nu` artificial viscosity (no units)
 * h kernel function cutoff (distance units)
 
-
 ----------
 
-
 **Mixing, shift, table, tail correction, restart, rRESPA info**\ :
 
 This style does not support mixing.  Thus, coefficients for all
@@ -59,8 +57,8 @@ I,J pairs must be specified explicitly.
 This style does not support the :doc:`pair_modify <pair_modify>`
 shift, table, and tail options.
 
-This style does not write information to :doc:`binary restart files <restart>`.  Thus, you need to re-specify the pair\_style and
-pair\_coeff commands in an input script that reads a restart file.
+This style does not write information to :doc:`binary restart files <restart>`.  Thus, you need to re-specify the pair_style and
+pair_coeff commands in an input script that reads a restart file.
 
 This style can only be used via the *pair* keyword of the :doc:`run_style respa <run_style>` command.  It does not support the *inner*\ ,
 *middle*\ , *outer* keywords.
@@ -68,29 +66,19 @@ This style can only be used via the *pair* keyword of the :doc:`run_style respa
 Restrictions
 """"""""""""
 
-
 This pair style is part of the USER-SPH package.  It is only enabled
 if LAMMPS was built with that package.  See the :doc:`Build package <Build_package>` doc page for more info.
 
 Related commands
 """"""""""""""""
 
-:doc:`pair_coeff <pair_coeff>`, pair\_sph/rhosum
+:doc:`pair_coeff <pair_coeff>`, pair_sph/rhosum
 
 **Default:** none
 
-
 ----------
 
-
 .. _Monaghan:
 
-
-
 **(Monaghan)** Monaghan and Gingold, Journal of Computational Physics,
 52, 374-389 (1983).
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/pair_sph_taitwater_morris.rst b/doc/src/pair_sph_taitwater_morris.rst
index 91f79a1ac5..9c65fd91ec 100644
--- a/doc/src/pair_sph_taitwater_morris.rst
+++ b/doc/src/pair_sph_taitwater_morris.rst
@@ -1,24 +1,22 @@
-.. index:: pair\_style sph/taitwater/morris
+.. index:: pair_style sph/taitwater/morris
 
-pair\_style sph/taitwater/morris command
-========================================
+pair_style sph/taitwater/morris command
+=======================================
 
 Syntax
 """"""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    pair_style sph/taitwater/morris
 
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    pair_style sph/taitwater/morris
-   pair_coeff \* \* 1000.0 1430.0 1.0 2.4
+   pair_coeff * * 1000.0 1430.0 1.0 2.4
 
 Description
 """""""""""
@@ -26,11 +24,13 @@ Description
 The sph/taitwater/morris style computes pressure forces between SPH
 particles according to Tait's equation of state:
 
-.. image:: Eqs/pair_sph_tait.jpg
-   :align: center
+.. math::
 
-where gamma = 7 and B = c\_0\^2 rho\_0 / gamma, with rho\_0 being the
-reference density and c\_0 the reference speed of sound.
+   p = B \biggl[\left(\frac{\rho}{\rho_0}\right)^{\gamma} - 1\biggr]
+
+where :math:`\gamma = 7` and :math:`B = c_0^2 \rho_0 / \gamma`, with
+:math:`\rho_0` being the reference density and :math:`c_0` the reference
+speed of sound.
 
 This pair style also computes laminar viscosity :ref:`(Morris) <Morris>`.
 
@@ -41,15 +41,13 @@ The following coefficients must be defined for each pair of atoms
 types via the :doc:`pair_coeff <pair_coeff>` command as in the examples
 above.
 
-* rho0 reference density (mass/volume units)
-* c0 reference soundspeed (distance/time units)
-* nu dynamic viscosity (mass\*distance/time units)
+* :math:`\rho_0` reference density (mass/volume units)
+* :math:`c_0` reference soundspeed (distance/time units)
+* :math:`\nu` dynamic viscosity (mass\*distance/time units)
 * h kernel function cutoff (distance units)
 
-
 ----------
 
-
 **Mixing, shift, table, tail correction, restart, rRESPA info**\ :
 
 This style does not support mixing.  Thus, coefficients for all
@@ -58,8 +56,8 @@ I,J pairs must be specified explicitly.
 This style does not support the :doc:`pair_modify <pair_modify>`
 shift, table, and tail options.
 
-This style does not write information to :doc:`binary restart files <restart>`.  Thus, you need to re-specify the pair\_style and
-pair\_coeff commands in an input script that reads a restart file.
+This style does not write information to :doc:`binary restart files <restart>`.  Thus, you need to re-specify the pair_style and
+pair_coeff commands in an input script that reads a restart file.
 
 This style can only be used via the *pair* keyword of the :doc:`run_style respa <run_style>` command.  It does not support the *inner*\ ,
 *middle*\ , *outer* keywords.
@@ -67,28 +65,18 @@ This style can only be used via the *pair* keyword of the :doc:`run_style respa
 Restrictions
 """"""""""""
 
-
 This pair style is part of the USER-SPH package.  It is only enabled
 if LAMMPS was built with that package.  See the :doc:`Build package <Build_package>` doc page for more info.
 
 Related commands
 """"""""""""""""
 
-:doc:`pair_coeff <pair_coeff>`, pair\_sph/rhosum
+:doc:`pair_coeff <pair_coeff>`, pair_sph/rhosum
 
 **Default:** none
 
-
 ----------
 
-
 .. _Morris:
 
-
-
 **(Morris)** Morris, Fox, Zhu, J Comp Physics, 136, 214-226 (1997).
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/pair_spin_dipole.rst b/doc/src/pair_spin_dipole.rst
index 8b2112e34a..fae22d5e8a 100644
--- a/doc/src/pair_spin_dipole.rst
+++ b/doc/src/pair_spin_dipole.rst
@@ -1,16 +1,15 @@
-.. index:: pair\_style spin/dipole/cut
+.. index:: pair_style spin/dipole/cut
 
-pair\_style spin/dipole/cut command
+pair_style spin/dipole/cut command
+==================================
+
+pair_style spin/dipole/long command
 ===================================
 
-pair\_style spin/dipole/long command
-====================================
-
 Syntax
 """"""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    pair_style spin/dipole/cut cutoff
    pair_style spin/dipole/long cutoff
@@ -18,19 +17,17 @@ Syntax
 * cutoff = global cutoff for magnetic dipole energy and forces
   (optional) (distance units)
 
-
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    pair_style spin/dipole/cut 10.0
-   pair_coeff \* \* 10.0
+   pair_coeff * * 10.0
    pair_coeff 2 3 8.0
 
    pair_style spin/dipole/long 9.0
-   pair_coeff \* \* 10.0
+   pair_coeff * * 10.0
    pair_coeff 2 3 6.0
 
 Description
@@ -43,12 +40,38 @@ The magnetic dipole-dipole interactions are computed by the
 following formulas for the magnetic energy, magnetic precession
 vector omega and mechanical force between particles I and J.
 
-.. image:: Eqs/pair_spin_dipole.jpg
-   :align: center
+.. math::
 
-where si and sj are the spin on two magnetic particles,
-r is their separation distance, and the vector e = (Ri - Rj)/\|Ri - Rj\|
-is the direction vector between the two particles.
+   \mathcal{H}_{\rm long} & =
+   -\frac{\mu_{0} \left( \mu_B\right)^2}{4\pi}
+   \sum_{i,j,i\neq j}^{N}
+    \frac{g_i g_j}{r_{ij}^3}
+    \biggl(3
+    \left(\vec{e}_{ij}\cdot \vec{s}_{i}\right)
+    \left(\vec{e}_{ij}\cdot \vec{s}_{j}\right)
+    -\vec{s}_i\cdot\vec{s}_j \biggr) \\
+    \mathbf{\omega}_i & =
+    \frac{\mu_0 (\mu_B)^2}{4\pi\hbar}\sum_{j}
+    \frac{g_i g_j}{r_{ij}^3}
+    \, \biggl(
+    3\,(\vec{e}_{ij}\cdot\vec{s}_{j})\vec{e}_{ij}
+    -\vec{s}_{j} \biggr) \\
+    \mathbf{F}_i & =
+    \frac{3\, \mu_0 (\mu_B)^2}{4\pi} \sum_j
+    \frac{g_i g_j}{r_{ij}^4}
+    \biggl[\bigl( (\vec{s}_i\cdot\vec{s}_j)
+    -5(\vec{e}_{ij}\cdot\vec{s}_i)
+    (\vec{e}_{ij}\cdot\vec{s}_j)\bigr) \vec{e}_{ij}+
+    \bigl(
+    (\vec{e}_{ij}\cdot\vec{s}_i)\vec{s}_j+
+    (\vec{e}_{ij}\cdot\vec{s}_j)\vec{s}_i
+    \bigr)
+    \biggr]
+
+where :math:`\vec{s}_i` and :math:`\vec{s}_j` are the spin on two magnetic
+particles, r is their separation distance, and the vector :math:`\vec{e}_{ij}
+= \frac{r_i - r_j}{\left| r_i - r_j \right|}` is the direction vector
+between the two particles.
 
 Style *spin/dipole/long* computes long-range magnetic dipole-dipole
 interaction.
@@ -56,10 +79,8 @@ A :doc:`kspace_style <kspace_style>` must be defined to
 use this pair style.  Currently, :doc:`kspace_style ewald/dipole/spin <kspace_style>` and :doc:`kspace_style pppm/dipole/spin <kspace_style>` support long-range magnetic
 dipole-dipole interactions.
 
-
 ----------
 
-
 The :doc:`pair_modify <pair_modify>` table option is not relevant
 for this pair style.
 
@@ -67,13 +88,12 @@ This pair style does not support the :doc:`pair_modify <pair_modify>`
 tail option for adding long-range tail corrections to energy and
 pressure.
 
-This pair style writes its information to :doc:`binary restart files <restart>`, so pair\_style and pair\_coeff commands do not need
+This pair style writes its information to :doc:`binary restart files <restart>`, so pair_style and pair_coeff commands do not need
 to be specified in an input script that reads a restart file.
 
 Restrictions
 """"""""""""
 
-
 The *spin/dipole/cut* and *spin/dipole/long* styles are part of
 the SPIN package.  They are only enabled if LAMMPS was built with that
 package.  See the :doc:`Build package <Build_package>` doc page for more
@@ -89,8 +109,3 @@ Related commands
 :doc:`fix nve/spin <fix_nve_spin>`
 
 **Default:** none
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/pair_spin_dmi.rst b/doc/src/pair_spin_dmi.rst
index 98205e8d6e..dc2d22b30a 100644
--- a/doc/src/pair_spin_dmi.rst
+++ b/doc/src/pair_spin_dmi.rst
@@ -1,27 +1,24 @@
-.. index:: pair\_style spin/dmi
+.. index:: pair_style spin/dmi
 
-pair\_style spin/dmi command
-============================
+pair_style spin/dmi command
+===========================
 
 Syntax
 """"""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    pair_style spin/dmi cutoff
 
 * cutoff = global cutoff pair (distance in metal units)
 
-
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    pair_style spin/dmi 4.0
-   pair_coeff \* \* dmi 2.6 0.001 1.0 0.0 0.0
+   pair_coeff * * dmi 2.6 0.001 1.0 0.0 0.0
    pair_coeff 1 2 dmi 4.0 0.00109 0.0 0.0 1.0
 
 Description
@@ -32,15 +29,19 @@ between pairs of magnetic spins.
 According to the expression reported in :ref:`(Rohart) <Rohart>`, one has
 the following DM energy:
 
-.. image:: Eqs/pair_spin_dmi_interaction.jpg
-   :align: center
+.. math::
 
-where si and sj are two neighboring magnetic spins of two particles,
-eij = (ri - rj)/\|ri-rj\| is the unit vector between sites i and j,
-and D is the DM vector defining the intensity (in eV) and the direction
-of the interaction.
+    \mathbf{H}_{dm} = \sum_{{ i,j}=1,i\neq j}^{N}
+    \left( \vec{e}_{ij} \times \vec{D} \right)
+    \cdot\left(\vec{s}_{i}\times \vec{s}_{j}\right),
 
-In :ref:`(Rohart) <Rohart>`, D is defined as the direction normal to the film oriented
+where :math:`\vec{s}_i` and :math:`\vec{s}_j` are two neighboring magnetic spins of
+two particles, :math:`\vec{e}_ij = \frac{r_i - r_j}{\left| r_i - r_j \right|}`
+is the unit vector between sites *i* and *j*, and :math:`\vec{D}` is the
+DM vector defining the intensity (in eV) and the direction of the
+interaction.
+
+In :ref:`(Rohart) <Rohart>`, :math:`\vec{D}` is defined as the direction normal to the film oriented
 from the high spin-orbit layer to the magnetic ultra-thin film.
 
 The application of a spin-lattice Poisson bracket to this energy (as described
@@ -48,8 +49,11 @@ in :ref:`(Tranchida) <Tranchida5>`) allows to derive a magnetic torque omega, an
 mechanical force F (for spin-lattice calculations only) for each magnetic
 particle i:
 
-.. image:: Eqs/pair_spin_dmi_forces.jpg
-   :align: center
+.. math::
+
+    \vec{\omega}_i = -\frac{1}{\hbar} \sum_{j}^{Neighb} \vec{s}_{j}\times \left(\vec{e}_{ij}\times \vec{D} \right)
+    ~~{\rm and}~~
+    \vec{F}_i = -\sum_{j}^{Neighb} \frac{1}{r_{ij}} \vec{D} \times \left( \vec{s}_{i}\times \vec{s}_{j} \right)
 
 More details about the derivation of these torques/forces are reported in
 :ref:`(Tranchida) <Tranchida5>`.
@@ -70,17 +74,14 @@ the norm of the DM vector (in eV), and Dx, Dy and Dz define its direction.
 None of those coefficients is optional.  If not specified, the *spin/dmi*
 pair style cannot be used.
 
-
 ----------
 
-
 Restrictions
 """"""""""""
 
-
 All the *pair/spin* styles are part of the SPIN package.  These styles
 are only enabled if LAMMPS was built with this package, and if the
-atom\_style "spin" was declared.  See the :doc:`Build package <Build_package>` doc page for more info.
+atom_style "spin" was declared.  See the :doc:`Build package <Build_package>` doc page for more info.
 
 Related commands
 """"""""""""""""
@@ -90,24 +91,14 @@ Related commands
 
 **Default:** none
 
-
 ----------
 
-
 .. _Rohart:
 
-
-
 .. _Tranchida5:
 
 **(Rohart)** Rohart and Thiaville,
 Physical Review B, 88(18), 184422. (2013).
 
-
 **(Tranchida)** Tranchida, Plimpton, Thibaudeau and Thompson,
 Journal of Computational Physics, 372, 406-425, (2018).
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/pair_spin_exchange.rst b/doc/src/pair_spin_exchange.rst
index b232649f95..14eefaccec 100644
--- a/doc/src/pair_spin_exchange.rst
+++ b/doc/src/pair_spin_exchange.rst
@@ -1,23 +1,20 @@
-.. index:: pair\_style spin/exchange
+.. index:: pair_style spin/exchange
 
-pair\_style spin/exchange command
-=================================
+pair_style spin/exchange command
+================================
 
 Syntax
 """"""
 
-
 .. code-block:: LAMMPS
 
    pair_style spin/exchange cutoff
 
 * cutoff = global cutoff pair (distance in metal units)
 
-
 Examples
 """"""""
 
-
 .. code-block:: LAMMPS
 
    pair_style spin/exchange 4.0
@@ -32,11 +29,11 @@ pairs of magnetic spins:
 
 .. math::
 
-   H_{ex} = -\sum_{i,j}^N J_{ij} (r_{ij}) \,\vec{s}_i \cdot \vec{s}_j 
+   H_{ex} = -\sum_{i,j}^N J_{ij} (r_{ij}) \,\vec{s}_i \cdot \vec{s}_j
 
 where :math:`\vec{s}_i` and :math:`\vec{s}_j` are two neighboring magnetic spins of two particles,
 :math:`r_{ij} = \vert \vec{r}_i - \vec{r}_j \vert` is the inter-atomic distance between the two
-particles. The summation is over pairs of nearest neighbors. 
+particles. The summation is over pairs of nearest neighbors.
 :math:`J(r_{ij})` is a function defining the intensity and the sign of the exchange
 interaction for different neighboring shells. This function is defined as:
 
@@ -45,7 +42,7 @@ interaction for different neighboring shells. This function is defined as:
     {J}\left( r_{ij} \right) = 4 a \left( \frac{r_{ij}}{d}  \right)^2 \left( 1 - b \left( \frac{r_{ij}}{d}  \right)^2 \right) e^{-\left( \frac{r_{ij}}{d} \right)^2 }\Theta (R_c - r_{ij})
 
 where :math:`a`, :math:`b` and :math:`d` are the three constant coefficients defined in the associated
-"pair\_coeff" command, and :math:`R_c` is the radius cutoff associated to
+"pair_coeff" command, and :math:`R_c` is the radius cutoff associated to
 the pair interaction (see below for more explanations).
 
 The coefficients :math:`a`, :math:`b`, and :math:`d` need to be fitted so that the function above matches with
@@ -55,15 +52,15 @@ in :ref:`(Tranchida) <Tranchida3>`.
 
 From this exchange interaction, each spin :math:`i` will be submitted
 to a magnetic torque :math:`\vec{\omega}`, and its associated atom can be submitted to a
-force :math:`\vec{F}` for spin-lattice calculations (see :doc:`fix\_nve\_spin <fix_nve_spin>`),
+force :math:`\vec{F}` for spin-lattice calculations (see :doc:`fix nve/spin <fix_nve_spin>`),
 such as:
 
 .. math::
 
-   \vec{\omega}_{i} = \frac{1}{\hbar} \sum_{j}^{Neighb} {J} 
-   \left(r_{ij} \right)\,\vec{s}_{j} 
-   ~~{\rm and}~~ 
-   \vec{F}_{i} = \sum_{j}^{Neighb} \frac{\partial {J} \left(r_{ij} \right)}{ \partial r_{ij}} \left( \vec{s}_{i}\cdot \vec{s}_{j} \right) \vec{e}_{ij}  
+   \vec{\omega}_{i} = \frac{1}{\hbar} \sum_{j}^{Neighb} {J}
+   \left(r_{ij} \right)\,\vec{s}_{j}
+   ~~{\rm and}~~
+   \vec{F}_{i} = \sum_{j}^{Neighb} \frac{\partial {J} \left(r_{ij} \right)}{ \partial r_{ij}} \left( \vec{s}_{i}\cdot \vec{s}_{j} \right) \vec{e}_{ij}
 
 with :math:`\hbar` the Planck constant (in metal units), and :math:`\vec{e}_{ij} = \frac{\vec{r}_i - \vec{r}_j}{\vert \vec{r}_i-\vec{r}_j \vert}` the unit
 vector between sites :math:`i` and :math:`j`.
@@ -89,17 +86,14 @@ of the function :math:`J(r_{ij})` defined above.
 None of those coefficients is optional. If not specified, the
 *spin/exchange* pair style cannot be used.
 
-
 ----------
 
-
 Restrictions
 """"""""""""
 
-
 All the *pair/spin* styles are part of the SPIN package.  These styles
 are only enabled if LAMMPS was built with this package, and if the
-atom\_style "spin" was declared.  See the :doc:`Build package <Build_package>` doc page for more info.
+atom_style "spin" was declared.  See the :doc:`Build package <Build_package>` doc page for more info.
 
 Related commands
 """"""""""""""""
@@ -111,13 +105,9 @@ Related commands
 
 none
 
-
 ----------
 
-
 .. _Tranchida3:
 
-
-
 **(Tranchida)** Tranchida, Plimpton, Thibaudeau and Thompson,
 Journal of Computational Physics, 372, 406-425, (2018).
diff --git a/doc/src/pair_spin_magelec.rst b/doc/src/pair_spin_magelec.rst
index bd5ff51650..e4d6b81b8a 100644
--- a/doc/src/pair_spin_magelec.rst
+++ b/doc/src/pair_spin_magelec.rst
@@ -1,27 +1,24 @@
-.. index:: pair\_style spin/magelec
+.. index:: pair_style spin/magelec
 
-pair\_style spin/magelec command
+pair_style spin/magelec command
 ================================
 
 Syntax
 """"""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    pair_style spin/magelec cutoff
 
 * cutoff = global cutoff pair (distance in metal units)
 
-
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    pair_style spin/magelec 4.5
-   pair_coeff \* \* magelec 4.5 0.00109 1.0 1.0 1.0
+   pair_coeff * * magelec 4.5 0.00109 1.0 1.0 1.0
 
 Description
 """""""""""
@@ -30,66 +27,56 @@ Style *spin/me* computes a magneto-electric interaction between
 pairs of magnetic spins. According to the derivation reported in
 :ref:`(Katsura) <Katsura1>`, this interaction is defined as:
 
-.. image:: Eqs/pair_spin_me_interaction.jpg
-   :align: center
+.. math::
 
-where si and sj are neighboring magnetic spins of two particles,
-eij = (ri - rj)/\|ri-rj\| is the normalized separation vector between the
-two particles, and E is an electric polarization vector.
-The norm and direction of E are giving the intensity and the
-direction of a screened dielectric atomic polarization (in eV).
+   \vec{\omega}_i & = -\frac{1}{\hbar} \sum_{j}^{Neighb} \vec{s}_{j}\times\vec{D}(r_{ij}) \\
+   \vec{F}_i & = -\sum_{j}^{Neighb} \frac{\partial D(r_{ij})}{\partial r_{ij}} \left(\vec{s}_{i}\times \vec{s}_{j} \right) \cdot \vec{r}_{ij}
+
+where :math:`\vec{s}_i` and :math:`\vec{s}_j` are neighboring magnetic
+spins of two particles.
 
 From this magneto-electric interaction, each spin i will be submitted
 to a magnetic torque omega, and its associated atom can be submitted to a
-force F for spin-lattice calculations (see :doc:`fix\_nve\_spin <fix_nve_spin>`),
+force F for spin-lattice calculations (see :doc:`fix nve/spin <fix_nve_spin>`),
 such as:
 
-.. image:: Eqs/pair_spin_me_forces.jpg
-   :align: center
+.. math::
 
-with h the Planck constant (in metal units).
+    \vec{F}^{i} & = -\sum_{j}^{Neighbor} \left( \vec{s}_{i}\times \vec{s}_{j} \right) \times \vec{E} \\
+    \vec{\omega}^{i} = -\frac{1}{\hbar} \sum_{j}^{Neighbor} \vec{s}_j \times \left(\vec{E}\times r_{ij} \right)
+
+with h the Planck constant (in metal units) and :math:`\vec{E}` an
+electric polarization vector.  The norm and direction of E are giving
+the intensity and the direction of a screened dielectric atomic
+polarization (in eV).
 
 More details about the derivation of these torques/forces are reported in
 :ref:`(Tranchida) <Tranchida4>`.
 
-
 ----------
 
-
 Restrictions
 """"""""""""
 
-
 All the *pair/spin* styles are part of the SPIN package.  These styles
 are only enabled if LAMMPS was built with this package, and if the
-atom\_style "spin" was declared.  See the :doc:`Build package <Build_package>` doc page for more info.
+atom_style "spin" was declared.  See the :doc:`Build package <Build_package>` doc page for more info.
 
 Related commands
 """"""""""""""""
 
 :doc:`atom_style spin <atom_style>`, :doc:`pair_coeff <pair_coeff>`,
-:doc:`pair\_spin\_exchange <pair_spin_exchange>`, :doc:`pair_eam <pair_eam>`,
+:doc:`pair_style spin/exchange <pair_spin_exchange>`, :doc:`pair_eam <pair_eam>`,
 
 **Default:** none
 
-
 ----------
 
-
 .. _Katsura1:
 
-
-
 **(Katsura)** H. Katsura, N. Nagaosa, A.V. Balatsky. Phys. Rev. Lett., 95(5), 057205. (2005)
 
 .. _Tranchida4:
 
-
-
 **(Tranchida)** Tranchida, Plimpton, Thibaudeau, and Thompson,
 Journal of Computational Physics, 372, 406-425, (2018).
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/pair_spin_neel.rst b/doc/src/pair_spin_neel.rst
index 872b40d522..4e6eba1f34 100644
--- a/doc/src/pair_spin_neel.rst
+++ b/doc/src/pair_spin_neel.rst
@@ -6,18 +6,15 @@ pair_style spin/neel command
 Syntax
 """"""
 
-
 .. code-block:: LAMMPS
 
    pair_style spin/neel cutoff
 
 * cutoff = global cutoff pair (distance in metal units)
 
-
 Examples
 """"""""
 
-
 .. code-block:: LAMMPS
 
    pair_style spin/neel 4.0
@@ -59,7 +56,7 @@ the same Bethe-Slater function used to fit the exchange interaction:
    {J}\left( r_{ij} \right) = 4 a \left( \frac{r_{ij}}{d}  \right)^2 \left( 1 - b \left( \frac{r_{ij}}{d}  \right)^2 \right) e^{-\left( \frac{r_{ij}}{d} \right)^2 }\Theta (R_c - r_{ij})
 
 where :math:`a`, :math:`b` and :math:`d` are the three constant coefficients defined in the
-associated "pair\_coeff" command.
+associated "pair_coeff" command.
 
 The coefficients :math:`a`, :math:`b`, and :math:`d` need to be fitted so that the function
 above matches with the values of the magneto-elastic constant of the
@@ -76,17 +73,14 @@ calculations only).
 More details about the derivation of these torques/forces are reported
 in :ref:`(Tranchida) <Tranchida6>`.
 
-
 ----------
 
-
 Restrictions
 """"""""""""
 
-
 All the *pair/spin* styles are part of the SPIN package.  These styles
 are only enabled if LAMMPS was built with this package, and if the
-atom\_style "spin" was declared.  See the :doc:`Build package <Build_package>` doc page for more info.
+atom_style "spin" was declared.  See the :doc:`Build package <Build_package>` doc page for more info.
 
 Related commands
 """"""""""""""""
@@ -98,13 +92,9 @@ Related commands
 
 none
 
-
 ----------
 
-
 .. _Tranchida6:
 
-
-
 **(Tranchida)** Tranchida, Plimpton, Thibaudeau and Thompson,
 Journal of Computational Physics, 372, 406-425, (2018).
diff --git a/doc/src/pair_srp.rst b/doc/src/pair_srp.rst
index 057b09e427..01517df434 100644
--- a/doc/src/pair_srp.rst
+++ b/doc/src/pair_srp.rst
@@ -1,38 +1,37 @@
-.. index:: pair\_style srp
+.. index:: pair_style srp
 
-pair\_style srp command
-=======================
+pair_style srp command
+======================
 
 Syntax
 """"""
 
-pair\_style srp cutoff btype dist keyword value ...
+.. code-block:: LAMMPS
+
+   pair_style srp cutoff btype dist keyword value ...
 
 * cutoff = global cutoff for SRP interactions (distance units)
 * btype = bond type to apply SRP interactions to (can be wildcard, see below)
 * distance = *min* or *mid*
 * zero or more keyword/value pairs may be appended
 * keyword = *exclude*
-  
+
   .. parsed-literal::
-  
+
        *bptype* value = atom type for bond particles
        *exclude* value = *yes* or *no*
 
-
-
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    pair_style hybrid dpd 1.0 1.0 12345 srp 0.8 1 mid exclude yes
    pair_coeff 1 1 dpd 60.0 4.5 1.0
    pair_coeff 1 2 none
    pair_coeff 2 2 srp 100.0 0.8
 
-   pair_style hybrid dpd 1.0 1.0 12345 srp 0.8 \* min exclude yes
+   pair_style hybrid dpd 1.0 1.0 12345 srp 0.8 * min exclude yes
    pair_coeff 1 1 dpd 60.0 50 1.0
    pair_coeff 1 2 none
    pair_coeff 2 2 srp 40.0
@@ -56,19 +55,23 @@ Bonds of specified type *btype* interact with one another through a
 bond-pairwise potential, such that the force on bond *i* due to bond
 *j* is as follows
 
-.. image:: Eqs/pair_srp1.jpg
-   :align: center
+.. math::
 
-where *r* and *rij* are the distance and unit vector between the two
-bonds.  Note that *btype* can be specified as an asterisk "\*", which
-case the interaction is applied to all bond types.  The *mid* option
-computes *r* and *rij* from the midpoint distance between bonds. The
-*min* option computes *r* and *rij* from the minimum distance between
-bonds. The force acting on a bond is mapped onto the two bond atoms
-according to the lever rule,
+   F^{\mathrm{SRP}}_{ij} = C(1-r/r_c)\hat{r}_{ij} \qquad r < r_c
 
-.. image:: Eqs/pair_srp2.jpg
-   :align: center
+where *r* and :math:`\hat{r}_{ij}` are the distance and unit vector
+between the two bonds.  Note that *btype* can be specified as an
+asterisk "\*", which case the interaction is applied to all bond types.
+The *mid* option computes *r* and :math:`\hat{r}_{ij}` from the midpoint
+distance between bonds. The *min* option computes *r* and
+:math:`\hat{r}_{ij}` from the minimum distance between bonds. The force
+acting on a bond is mapped onto the two bond atoms according to the
+lever rule,
+
+.. math::
+
+   F_{i1}^{\mathrm{SRP}} & = F^{\mathrm{SRP}}_{ij}(L) \\
+   F_{i2}^{\mathrm{SRP}} & = F^{\mathrm{SRP}}_{ij}(1-L)
 
 where *L* is the normalized distance from the atom to the point of
 closest approach of bond *i* and *j*\ . The *mid* option takes *L* as
@@ -80,7 +83,7 @@ the data file or restart file read by the :doc:`read_data <read_data>`
 or :doc:`read_restart <read_restart>` commands:
 
 * *C* (force units)
-* *rc* (distance units)
+* :math:`r_c` (distance units)
 
 The last coefficient is optional. If not specified, the global cutoff
 is used.
@@ -114,12 +117,10 @@ Pair style *srp* turns off normalization of thermodynamic properties
 by particle number, as if the command :doc:`thermo_modify norm no <thermo_modify>` had been issued.
 
 The pairwise energy associated with style *srp* is shifted to be zero
-at the cutoff distance *rc*\ .
-
+at the cutoff distance :math:`r_c`.
 
 ----------
 
-
 **Mixing, shift, table, tail correction, restart, rRESPA info**\ :
 
 This pair styles does not support mixing.
@@ -127,7 +128,7 @@ This pair styles does not support mixing.
 This pair style does not support the :doc:`pair_modify <pair_modify>`
 shift option for the energy of the pair interaction. Note that as
 discussed above, the energy term is already shifted to be 0.0 at the
-cutoff distance *rc*\ .
+cutoff distance :math:`r_c`.
 
 The :doc:`pair_modify <pair_modify>` table option is not relevant for
 this pair style.
@@ -136,21 +137,18 @@ This pair style does not support the :doc:`pair_modify <pair_modify>`
 tail option for adding long-range tail corrections to energy and
 pressure.
 
-This pair style writes global and per-atom information to :doc:`binary restart files <restart>`. Pair srp should be used with :doc:`pair_style hybrid <pair_hybrid>`, thus the pair\_coeff commands need to be
+This pair style writes global and per-atom information to :doc:`binary restart files <restart>`. Pair srp should be used with :doc:`pair_style hybrid <pair_hybrid>`, thus the pair_coeff commands need to be
 specified in the input script when reading a restart file.
 
 This pair style can only be used via the *pair* keyword of the
 :doc:`run_style respa <run_style>` command.  It does not support the
 *inner*\ , *middle*\ , *outer* keywords.
 
-
 ----------
 
-
 Restrictions
 """"""""""""
 
-
 This pair style is part of the USER-MISC package. It is only enabled
 if LAMMPS was built with that package. See the Making LAMMPS section
 for more info.
@@ -173,18 +171,9 @@ Default
 
 The default keyword value is exclude = yes.
 
-
 ----------
 
-
 .. _Sirk2:
 
-
-
 **(Sirk)** Sirk TW, Sliozberg YR, Brennan JK, Lisal M, Andzelm JW, J
 Chem Phys, 136 (13) 134903, 2012.
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/pair_style.rst b/doc/src/pair_style.rst
index c04abca047..5b5e6e6fe8 100644
--- a/doc/src/pair_style.rst
+++ b/doc/src/pair_style.rst
@@ -1,13 +1,12 @@
-.. index:: pair\_style
+.. index:: pair_style
 
-pair\_style command
-===================
+pair_style command
+==================
 
 Syntax
 """"""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    pair_style style args
 
@@ -17,8 +16,7 @@ Syntax
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    pair_style lj/cut 2.5
    pair_style eam/alloy
@@ -65,29 +63,27 @@ pairwise interaction between two atoms separated by a distance *r*\ .
 The force between the atoms is the negative derivative of this
 expression.
 
-If the pair\_style command has a cutoff argument, it sets global
+If the pair_style command has a cutoff argument, it sets global
 cutoffs for all pairs of atom types.  The distance(s) can be smaller
 or larger than the dimensions of the simulation box.
 
 Typically, the global cutoff value can be overridden for a specific
 pair of atom types by the :doc:`pair_coeff <pair_coeff>` command.  The
 pair style settings (including global cutoffs) can be changed by a
-subsequent pair\_style command using the same style.  This will reset
+subsequent pair_style command using the same style.  This will reset
 the cutoffs for all atom type pairs, including those previously set
 explicitly by a :doc:`pair_coeff <pair_coeff>` command.  The exceptions
-to this are that pair\_style *table* and *hybrid* settings cannot be
-reset.  A new pair\_style command for these styles will wipe out all
-previously specified pair\_coeff values.
-
+to this are that pair_style *table* and *hybrid* settings cannot be
+reset.  A new pair_style command for these styles will wipe out all
+previously specified pair_coeff values.
 
 ----------
 
-
 Here is an alphabetic list of pair styles defined in LAMMPS.  They are
 also listed in more compact form on the :doc:`Commands pair <Commands_pair>` doc page.
 
 Click on the style to display the formula it computes, any additional
-arguments specified in the pair\_style command, and coefficients
+arguments specified in the pair_style command, and coefficients
 specified by the associated :doc:`pair_coeff <pair_coeff>` command.
 
 There are also additional accelerated pair styles included in the
@@ -144,6 +140,8 @@ accelerated styles exist.
 * :doc:`coul/long/cs <pair_cs>` - long-range Coulombic potential and core/shell
 * :doc:`coul/long/soft <pair_fep_soft>` - long-range Coulombic potential with a soft core
 * :doc:`coul/msm <pair_coul>` - long-range MSM Coulombics
+* :doc:`coul/slater/cut <pair_coul>` - smeared out Coulombics
+* :doc:`coul/slater/long <pair_coul>` - long-range smeared out Coulombics
 * :doc:`coul/shield <pair_coul_shield>` - Coulombics for boron nitride for use with :doc:`ilp/graphene/hbn <pair_ilp_graphene_hbn>` potential
 * :doc:`coul/streitz <pair_coul>` - Coulombics via Streitz/Mintmire Slater orbitals
 * :doc:`coul/wolf <pair_coul>` - Coulombics via Wolf potential
@@ -162,7 +160,7 @@ accelerated styles exist.
 * :doc:`eam/fs <pair_eam>` - Finnis-Sinclair EAM
 * :doc:`edip <pair_edip>` - three-body EDIP potential
 * :doc:`edip/multi <pair_edip>` - multi-element EDIP potential
-* :doc:`edpd <pair_meso>` - eDPD particle interactions
+* :doc:`edpd <pair_mesodpd>` - eDPD particle interactions
 * :doc:`eff/cut <pair_eff>` - electron force field with a cutoff
 * :doc:`eim <pair_eim>` - embedded ion method (EIM)
 * :doc:`exp6/rx <pair_exp6_rx>` - reactive DPD potential
@@ -239,8 +237,8 @@ accelerated styles exist.
 * :doc:`lubricate/poly <pair_lubricate>` - hydrodynamic lubrication forces with polydispersity
 * :doc:`lubricateU <pair_lubricateU>` - hydrodynamic lubrication forces for Fast Lubrication Dynamics
 * :doc:`lubricateU/poly <pair_lubricateU>` - hydrodynamic lubrication forces for Fast Lubrication with polydispersity
-* :doc:`mdpd <pair_meso>` - mDPD particle interactions
-* :doc:`mdpd/rhosum <pair_meso>` - mDPD particle interactions for mass density
+* :doc:`mdpd <pair_mesodpd>` - mDPD particle interactions
+* :doc:`mdpd/rhosum <pair_mesodpd>` - mDPD particle interactions for mass density
 * :doc:`meam/c <pair_meamc>` - modified embedded atom method (MEAM) in C
 * :doc:`meam/spline <pair_meam_spline>` - splined version of MEAM
 * :doc:`meam/sw/spline <pair_meam_sw_spline>` - splined version of MEAM with a Stillinger-Weber term
@@ -309,7 +307,7 @@ accelerated styles exist.
 * :doc:`sw <pair_sw>` - Stillinger-Weber 3-body potential
 * :doc:`table <pair_table>` - tabulated pair potential
 * :doc:`table/rx <pair_table_rx>` -
-* :doc:`tdpd <pair_meso>` - tDPD particle interactions
+* :doc:`tdpd <pair_mesodpd>` - tDPD particle interactions
 * :doc:`tersoff <pair_tersoff>` - Tersoff 3-body potential
 * :doc:`tersoff/mod <pair_tersoff_mod>` - modified Tersoff 3-body potential
 * :doc:`tersoff/mod/c <pair_tersoff_mod>` -
@@ -327,14 +325,11 @@ accelerated styles exist.
 * :doc:`yukawa/colloid <pair_yukawa_colloid>` - screened Yukawa potential for finite-size particles
 * :doc:`zbl <pair_zbl>` - Ziegler-Biersack-Littmark potential
 
-
 ----------
 
-
 Restrictions
 """"""""""""
 
-
 This command must be used before any coefficients are set by the
 :doc:`pair_coeff <pair_coeff>`, :doc:`read_data <read_data>`, or
 :doc:`read_restart <read_restart>` commands.
@@ -353,12 +348,6 @@ Related commands
 Default
 """""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    pair_style none
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/pair_sw.rst b/doc/src/pair_sw.rst
index abd551cffb..b4fddc6867 100644
--- a/doc/src/pair_sw.rst
+++ b/doc/src/pair_sw.rst
@@ -1,37 +1,35 @@
-.. index:: pair\_style sw
+.. index:: pair_style sw
 
-pair\_style sw command
-======================
+pair_style sw command
+=====================
 
-pair\_style sw/gpu command
-==========================
-
-pair\_style sw/intel command
-============================
-
-pair\_style sw/kk command
+pair_style sw/gpu command
 =========================
 
-pair\_style sw/omp command
-==========================
+pair_style sw/intel command
+===========================
+
+pair_style sw/kk command
+========================
+
+pair_style sw/omp command
+=========================
 
 Syntax
 """"""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    pair_style sw
 
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    pair_style sw
-   pair_coeff \* \* si.sw Si
-   pair_coeff \* \* GaN.sw Ga N Ga
+   pair_coeff * * si.sw Si
+   pair_coeff * * GaN.sw Ga N Ga
 
 Description
 """""""""""
@@ -39,17 +37,27 @@ Description
 The *sw* style computes a 3-body :ref:`Stillinger-Weber <Stillinger2>`
 potential for the energy E of a system of atoms as
 
-.. image:: Eqs/pair_sw.jpg
-   :align: center
+.. math::
 
-where phi2 is a two-body term and phi3 is a three-body term.  The
-summations in the formula are over all neighbors J and K of atom I
-within a cutoff distance = a\*sigma.
+   E & =  \sum_i \sum_{j > i} \phi_2 (r_{ij}) +
+          \sum_i \sum_{j \neq i} \sum_{k > j}
+          \phi_3 (r_{ij}, r_{ik}, \theta_{ijk}) \\
+  \phi_2(r_{ij}) & =  A_{ij} \epsilon_{ij} \left[ B_{ij} (\frac{\sigma_{ij}}{r_{ij}})^{p_{ij}} -
+                    (\frac{\sigma_{ij}}{r_{ij}})^{q_{ij}} \right]
+                    \exp \left( \frac{\sigma_{ij}}{r_{ij} - a_{ij} \sigma_{ij}} \right) \\
+  \phi_3(r_{ij},r_{ik},\theta_{ijk}) & = \lambda_{ijk} \epsilon_{ijk} \left[ \cos \theta_{ijk} -
+                    \cos \theta_{0ijk} \right]^2
+                    \exp \left( \frac{\gamma_{ij} \sigma_{ij}}{r_{ij} - a_{ij} \sigma_{ij}} \right)
+                    \exp \left( \frac{\gamma_{ik} \sigma_{ik}}{r_{ik} - a_{ik} \sigma_{ik}} \right)
 
-Only a single pair\_coeff command is used with the *sw* style which
+where :math:`\phi_2` is a two-body term and :math:`\phi_3` is a
+three-body term.  The summations in the formula are over all neighbors J
+and K of atom I within a cutoff distance :math:`a `\sigma`.
+
+Only a single pair_coeff command is used with the *sw* style which
 specifies a Stillinger-Weber potential file with parameters for all
 needed elements.  These are mapped to LAMMPS atom types by specifying
-N additional arguments after the filename in the pair\_coeff command,
+N additional arguments after the filename in the pair_coeff command,
 where N is the number of LAMMPS atom types:
 
 * filename
@@ -61,12 +69,11 @@ to specify the path for the potential file.
 As an example, imagine a file SiC.sw has Stillinger-Weber values for
 Si and C.  If your LAMMPS simulation has 4 atoms types and you want
 the 1st 3 to be Si, and the 4th to be C, you would use the following
-pair\_coeff command:
+pair_coeff command:
 
+.. code-block:: LAMMPS
 
-.. parsed-literal::
-
-   pair_coeff \* \* SiC.sw Si Si Si C
+   pair_coeff * * SiC.sw Si Si Si C
 
 The 1st 2 arguments must be \* \* so as to span all LAMMPS atom types.
 The first three Si arguments map LAMMPS atom types 1,2,3 to the Si
@@ -86,24 +93,25 @@ and three-body coefficients in the formula above:
 * element 1 (the center atom in a 3-body interaction)
 * element 2
 * element 3
-* epsilon (energy units)
-* sigma (distance units)
+* :math:`\epsilon` (energy units)
+* :math:`\sigma` (distance units)
 * a
-* lambda
-* gamma
-* costheta0
+* :math:`\lambda`
+* :math:`\gamma`
+* :math:`\cos\theta_0`
 * A
 * B
 * p
 * q
 * tol
 
-The A, B, p, and q parameters are used only for two-body
-interactions.  The lambda and costheta0 parameters are used only for
-three-body interactions. The epsilon, sigma and a parameters are used
-for both two-body and three-body interactions. gamma is used only in the
-three-body interactions, but is defined for pairs of atoms.
-The non-annotated parameters are unitless.
+The A, B, p, and q parameters are used only for two-body interactions.
+The :math:`\lambda` and :math:`\cos\theta_0` parameters are used only
+for three-body interactions. The :math:`\epsilon`, :math:`\sigma` and
+*a* parameters are used for both two-body and three-body
+interactions. :math:`\gamma` is used only in the three-body
+interactions, but is defined for pairs of atoms.  The non-annotated
+parameters are unitless.
 
 LAMMPS introduces an additional performance-optimization parameter tol
 that is used for both two-body and three-body interactions.  In the
@@ -118,7 +126,7 @@ can be separately controlled. If tol = 0.0, then the standard
 Stillinger-Weber cutoff is used.
 
 The Stillinger-Weber potential file must contain entries for all the
-elements listed in the pair\_coeff command.  It can also contain
+elements listed in the pair_coeff command.  It can also contain
 entries for additional elements not being used in a particular
 simulation; LAMMPS ignores those entries.
 
@@ -141,9 +149,9 @@ are usually defined by simple formulas involving two sets of pair-wise
 parameters, corresponding to the ij and ik pairs, where i is the
 center atom. The user must ensure that the correct combining rule is
 used to calculate the values of the three-body parameters for
-alloys. Note also that the function phi3 contains two exponential
+alloys. Note also that the function :math:`\phi_3` contains two exponential
 screening factors with parameter values from the ij pair and ik
-pairs. So phi3 for a C atom bonded to a Si atom and a second C atom
+pairs. So :math:`\phi_3` for a C atom bonded to a Si atom and a second C atom
 will depend on the three-body parameters for the CSiC entry, and also
 on the two-body parameters for the CCC and CSiSi entries. Since the
 order of the two neighbors is arbitrary, the three-body parameters for
@@ -152,13 +160,11 @@ parameters for entries SiCC and CSiSi should also be the same.  The
 parameters used only for two-body interactions (A, B, p, and q) in
 entries whose 2nd and 3rd element are different (e.g. SiCSi) are not
 used for anything and can be set to 0.0 if desired.
-This is also true for the parameters in phi3 that are
-taken from the ij and ik pairs (sigma, a, gamma)
-
+This is also true for the parameters in :math:`\phi_3` that are
+taken from the ij and ik pairs (:math:`\sigma`, *a*\ , :math:`\gamma`)
 
 ----------
 
-
 Styles with a *gpu*\ , *intel*\ , *kk*\ , *omp*\ , or *opt* suffix are
 functionally the same as the corresponding style without the suffix.
 They have been optimized to run faster, depending on your available
@@ -182,10 +188,8 @@ These parameters are common for modeling silicon and water.
 See the :doc:`Speed packages <Speed_packages>` doc page for more
 instructions on how to use the accelerated styles effectively.
 
-
 ----------
 
-
 **Mixing, shift, table, tail correction, restart, rRESPA info**\ :
 
 For atom type pairs I,J and I != J, where types I and J correspond to
@@ -196,21 +200,18 @@ This pair style does not support the :doc:`pair_modify <pair_modify>`
 shift, table, and tail options.
 
 This pair style does not write its information to :doc:`binary restart files <restart>`, since it is stored in potential files.  Thus, you
-need to re-specify the pair\_style and pair\_coeff commands in an input
+need to re-specify the pair_style and pair_coeff commands in an input
 script that reads a restart file.
 
 This pair style can only be used via the *pair* keyword of the
 :doc:`run_style respa <run_style>` command.  It does not support the
 *inner*\ , *middle*\ , *outer* keywords.
 
-
 ----------
 
-
 Restrictions
 """"""""""""
 
-
 This pair style is part of the MANYBODY package.  It is only enabled
 if LAMMPS was built with that package.  See the :doc:`Build package <Build_package>` doc page for more info.
 
@@ -221,7 +222,7 @@ The Stillinger-Weber potential files provided with LAMMPS (see the
 potentials directory) are parameterized for metal :doc:`units <units>`.
 You can use the SW potential with any LAMMPS units, but you would need
 to create your own SW potential file with coefficients listed in the
-appropriate units if your simulation doesn't use "metal" units.
+appropriate units if your simulation does not use "metal" units.
 
 Related commands
 """"""""""""""""
@@ -230,17 +231,8 @@ Related commands
 
 **Default:** none
 
-
 ----------
 
-
 .. _Stillinger2:
 
-
-
 **(Stillinger)** Stillinger and Weber, Phys Rev B, 31, 5262 (1985).
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/pair_table.rst b/doc/src/pair_table.rst
index 9607f2ab77..9d1a21f1dc 100644
--- a/doc/src/pair_table.rst
+++ b/doc/src/pair_table.rst
@@ -1,22 +1,21 @@
-.. index:: pair\_style table
+.. index:: pair_style table
 
-pair\_style table command
-=========================
+pair_style table command
+========================
 
-pair\_style table/gpu command
-=============================
-
-pair\_style table/kk command
+pair_style table/gpu command
 ============================
 
-pair\_style table/omp command
-=============================
+pair_style table/kk command
+===========================
+
+pair_style table/omp command
+============================
 
 Syntax
 """"""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    pair_style table style N keyword ...
 
@@ -29,14 +28,13 @@ Syntax
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    pair_style table linear 1000
    pair_style table linear 1000 pppm
    pair_style table bitmap 12
-   pair_coeff \* 3 morse.table ENTRY1
-   pair_coeff \* 3 morse.table ENTRY1 7.0
+   pair_coeff * 3 morse.table ENTRY1
+   pair_coeff * 3 morse.table ENTRY1 7.0
 
 Description
 """""""""""
@@ -96,7 +94,7 @@ table.  The format of this file is described below.
 If your tabulated potential(s) are designed to be used as the
 short-range part of one of the long-range solvers specified by the
 :doc:`kspace_style <kspace_style>` command, then you must use one or
-more of the optional keywords listed above for the pair\_style command.
+more of the optional keywords listed above for the pair_style command.
 These are *ewald* or *pppm* or *msm* or *dispersion* or *tip4p*\ .  This
 is so LAMMPS can insure the short-range potential and long-range
 solver are compatible with each other, as it does for other
@@ -104,11 +102,9 @@ short-range pair styles, such as :doc:`pair_style lj/cut/coul/long <pair_lj>`.
 the tabulated values for each pair of atom types has the correct
 functional form to be compatible with the matching long-range solver.
 
-
 ----------
 
-
-Here are some guidelines for using the pair\_style table command to
+Here are some guidelines for using the pair_style table command to
 best effect:
 
 * Vary the number of table points; you may need to use more than you think
@@ -117,7 +113,7 @@ best effect:
   of what the final interpolated potential looks like.  This can show up
   interpolation "features" you may not like.
 * Start with the linear style; it's the style least likely to have problems.
-* Use *N* in the pair\_style command equal to the "N" in the tabulation
+* Use *N* in the pair_style command equal to the "N" in the tabulation
   file, and use the "RSQ" or "BITMAP" parameter, so additional interpolation
   is not needed.  See discussion below.
 * Make sure that your tabulated forces and tabulated energies are
@@ -126,15 +122,11 @@ best effect:
 * Use as large an inner cutoff as possible.  This avoids fitting splines
   to very steep parts of the potential.
 
-
-
 ----------
 
-
 The format of a tabulated file is a series of one or more sections,
 defined as follows (without the parenthesized comments):
 
-
 .. parsed-literal::
 
    # Morse potential for Fe   (one or more comment or blank lines)
@@ -151,7 +143,7 @@ A section begins with a non-blank line whose 1st character is not a
 "#"; blank lines or lines starting with "#" can be used as comments
 between sections.  The first line begins with a keyword which
 identifies the section.  The line can contain additional text, but the
-initial text must match the argument specified in the pair\_coeff
+initial text must match the argument specified in the pair_coeff
 command.  The next line lists (in any order) one or more parameters
 for the table.  Each parameter is a keyword followed by one or more
 numeric values.
@@ -159,7 +151,7 @@ numeric values.
 The parameter "N" is required and its value is the number of table
 entries that follow.  Note that this may be different than the *N*
 specified in the :doc:`pair_style table <pair_style>` command.  Let
-Ntable = *N* in the pair\_style command, and Nfile = "N" in the
+Ntable = *N* in the pair_style command, and Nfile = "N" in the
 tabulated file.  What LAMMPS does is a preliminary interpolation by
 creating splines using the Nfile tabulated values as nodal points.  It
 uses these to interpolate energy and force values at Ntable different
@@ -203,8 +195,8 @@ This ordering is complex, so it is not documented here, since this
 file is typically produced by the :doc:`pair_write <pair_write>` command
 with its *bitmap* option.  When the table is in BITMAP format, the "N"
 parameter in the file must be equal to 2\^M where M is the value
-specified in the pair\_style command.  Also, a cutoff parameter cannot
-be used as an optional 3rd argument in the pair\_coeff command; the
+specified in the pair_style command.  Also, a cutoff parameter cannot
+be used as an optional 3rd argument in the pair_coeff command; the
 entire table extent as specified in the file must be used.
 
 If used, the parameter "FPRIME" is followed by 2 values *fplo* and
@@ -225,10 +217,8 @@ Note that one file can contain many sections, each with a tabulated
 potential.  LAMMPS reads the file section by section until it finds
 one that matches the specified keyword.
 
-
 ----------
 
-
 Styles with a *gpu*\ , *intel*\ , *kk*\ , *omp*\ , or *opt* suffix are
 functionally the same as the corresponding style without the suffix.
 They have been optimized to run faster, depending on your available
@@ -247,10 +237,8 @@ by including their suffix, or you can use the :doc:`-suffix command-line switch
 See the :doc:`Speed packages <Speed_packages>` doc page for more
 instructions on how to use the accelerated styles effectively.
 
-
 ----------
 
-
 **Mixing, shift, table, tail correction, restart, rRESPA info**\ :
 
 This pair style does not support mixing.  Thus, coefficients for all
@@ -259,24 +247,22 @@ I,J pairs must be specified explicitly.
 The :doc:`pair_modify <pair_modify>` shift, table, and tail options are
 not relevant for this pair style.
 
-This pair style writes the settings for the "pair\_style table" command
-to :doc:`binary restart files <restart>`, so a pair\_style command does
+This pair style writes the settings for the "pair_style table" command
+to :doc:`binary restart files <restart>`, so a pair_style command does
 not need to specified in an input script that reads a restart file.
 However, the coefficient information is not stored in the restart
-file, since it is tabulated in the potential files.  Thus, pair\_coeff
+file, since it is tabulated in the potential files.  Thus, pair_coeff
 commands do need to be specified in the restart input script.
 
 This pair style can only be used via the *pair* keyword of the
 :doc:`run_style respa <run_style>` command.  It does not support the
 *inner*\ , *middle*\ , *outer* keywords.
 
-
 ----------
 
-
 Restrictions
 """"""""""""
- none
+none
 
 Related commands
 """"""""""""""""
@@ -285,17 +271,8 @@ Related commands
 
 **Default:** none
 
-
 ----------
 
-
 .. _Wolff2:
 
-
-
 **(Wolff)** Wolff and Rudd, Comp Phys Comm, 120, 200-32 (1999).
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/pair_table_rx.rst b/doc/src/pair_table_rx.rst
index 616dbb3da0..32863cbd29 100644
--- a/doc/src/pair_table_rx.rst
+++ b/doc/src/pair_table_rx.rst
@@ -1,16 +1,15 @@
-.. index:: pair\_style table/rx
+.. index:: pair_style table/rx
 
-pair\_style table/rx command
-============================
+pair_style table/rx command
+===========================
 
-pair\_style table/rx/kk command
-===============================
+pair_style table/rx/kk command
+==============================
 
 Syntax
 """"""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    pair_style table style N ...
 
@@ -21,15 +20,14 @@ Syntax
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    pair_style table/rx linear 1000
    pair_style table/rx linear 1000 fractional
    pair_style table/rx linear 1000 molecular
-   pair_coeff \* \* rxn.table ENTRY1 h2o h2o 10.0
-   pair_coeff \* \* rxn.table ENTRY1 1fluid 1fluid 10.0
-   pair_coeff \* 3 rxn.table ENTRY1 h2o no2 10.0
+   pair_coeff * * rxn.table ENTRY1 h2o h2o 10.0
+   pair_coeff * * rxn.table ENTRY1 1fluid 1fluid 10.0
+   pair_coeff * 3 rxn.table ENTRY1 h2o no2 10.0
 
 Description
 """""""""""
@@ -99,11 +97,9 @@ associated with the interacting coarse-grained particles (see the
 stored before and after the reaction kinetics solver is applied, where
 the difference is defined to be the internal chemical energy (uChem).
 
-
 ----------
 
-
-Here are some guidelines for using the pair\_style table/rx command to
+Here are some guidelines for using the pair_style table/rx command to
 best effect:
 
 * Vary the number of table points; you may need to use more than you think
@@ -112,7 +108,7 @@ best effect:
   of what the final interpolated potential looks like.  This can show up
   interpolation "features" you may not like.
 * Start with the linear style; it's the style least likely to have problems.
-* Use *N* in the pair\_style command equal to the "N" in the tabulation
+* Use *N* in the pair_style command equal to the "N" in the tabulation
   file, and use the "RSQ" or "BITMAP" parameter, so additional interpolation
   is not needed.  See discussion below.
 * Make sure that your tabulated forces and tabulated energies are consistent
@@ -120,15 +116,11 @@ best effect:
 * Use as large an inner cutoff as possible.  This avoids fitting splines
   to very steep parts of the potential.
 
-
-
 ----------
 
-
 The format of a tabulated file is a series of one or more sections,
 defined as follows (without the parenthesized comments):
 
-
 .. parsed-literal::
 
    # Morse potential for Fe   (one or more comment or blank lines)
@@ -145,7 +137,7 @@ A section begins with a non-blank line whose 1st character is not a
 "#"; blank lines or lines starting with "#" can be used as comments
 between sections.  The first line begins with a keyword which
 identifies the section.  The line can contain additional text, but the
-initial text must match the argument specified in the pair\_coeff
+initial text must match the argument specified in the pair_coeff
 command.  The next line lists (in any order) one or more parameters
 for the table.  Each parameter is a keyword followed by one or more
 numeric values.
@@ -153,7 +145,7 @@ numeric values.
 The parameter "N" is required and its value is the number of table
 entries that follow.  Note that this may be different than the *N*
 specified in the :doc:`pair_style table/rx <pair_style>` command.  Let
-Ntable = *N* in the pair\_style command, and Nfile = "N" in the
+Ntable = *N* in the pair_style command, and Nfile = "N" in the
 tabulated file.  What LAMMPS does is a preliminary interpolation by
 creating splines using the Nfile tabulated values as nodal points.  It
 uses these to interpolate as needed to generate energy and force
@@ -187,8 +179,8 @@ This ordering is complex, so it is not documented here, since this
 file is typically produced by the :doc:`pair_write <pair_write>` command
 with its *bitmap* option.  When the table is in BITMAP format, the "N"
 parameter in the file must be equal to 2\^M where M is the value
-specified in the pair\_style command.  Also, a cutoff parameter cannot
-be used as an optional 3rd argument in the pair\_coeff command; the
+specified in the pair_style command.  Also, a cutoff parameter cannot
+be used as an optional 3rd argument in the pair_coeff command; the
 entire table extent as specified in the file must be used.
 
 If used, the parameter "FPRIME" is followed by 2 values *fplo* and
@@ -209,10 +201,8 @@ Note that one file can contain many sections, each with a tabulated
 potential.  LAMMPS reads the file section by section until it finds
 one that matches the specified keyword.
 
-
 ----------
 
-
 **Mixing, shift, table, tail correction, restart, rRESPA info**\ :
 
 This pair style does not support mixing.  Thus, coefficients for all
@@ -221,21 +211,19 @@ I,J pairs must be specified explicitly.
 The :doc:`pair_modify <pair_modify>` shift, table, and tail options are
 not relevant for this pair style.
 
-This pair style writes the settings for the "pair\_style table/rx" command
-to :doc:`binary restart files <restart>`, so a pair\_style command does
+This pair style writes the settings for the "pair_style table/rx" command
+to :doc:`binary restart files <restart>`, so a pair_style command does
 not need to specified in an input script that reads a restart file.
 However, the coefficient information is not stored in the restart
-file, since it is tabulated in the potential files.  Thus, pair\_coeff
+file, since it is tabulated in the potential files.  Thus, pair_coeff
 commands do need to be specified in the restart input script.
 
 This pair style can only be used via the *pair* keyword of the
 :doc:`run_style respa <run_style>` command.  It does not support the
 *inner*\ , *middle*\ , *outer* keywords.
 
-
 ----------
 
-
 Styles with a *gpu*\ , *intel*\ , *kk*\ , *omp*\ , or *opt* suffix are
 functionally the same as the corresponding style without the suffix.
 They have been optimized to run faster, depending on your available
@@ -254,14 +242,11 @@ by including their suffix, or you can use the :doc:`-suffix command-line switch
 See the :doc:`Speed packages <Speed_packages>` doc page for more
 instructions on how to use the accelerated styles effectively.
 
-
 ----------
 
-
 Restrictions
 """"""""""""
 
-
 This command is part of the USER-DPD package.  It is only enabled if
 LAMMPS was built with that package.  See the :doc:`Build package <Build_package>` doc page for more info.
 
@@ -272,17 +257,8 @@ Related commands
 
 **Default:** fractional weighting
 
-
 ----------
 
-
 .. _Wolff:
 
-
-
 **(Wolff)** Wolff and Rudd, Comp Phys Comm, 120, 200-32 (1999).
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/pair_tersoff.rst b/doc/src/pair_tersoff.rst
index 071fc6c084..050b1367f3 100644
--- a/doc/src/pair_tersoff.rst
+++ b/doc/src/pair_tersoff.rst
@@ -1,31 +1,30 @@
-.. index:: pair\_style tersoff
+.. index:: pair_style tersoff
 
-pair\_style tersoff command
-===========================
+pair_style tersoff command
+==========================
 
-pair\_style tersoff/table command
-=================================
+pair_style tersoff/table command
+================================
 
-pair\_style tersoff/gpu command
-===============================
-
-pair\_style tersoff/intel command
-=================================
-
-pair\_style tersoff/kk command
+pair_style tersoff/gpu command
 ==============================
 
-pair\_style tersoff/omp command
-===============================
+pair_style tersoff/intel command
+================================
 
-pair\_style tersoff/table/omp command
-=====================================
+pair_style tersoff/kk command
+=============================
+
+pair_style tersoff/omp command
+==============================
+
+pair_style tersoff/table/omp command
+====================================
 
 Syntax
 """"""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    pair_style style
 
@@ -34,28 +33,42 @@ Syntax
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    pair_style tersoff
-   pair_coeff \* \* Si.tersoff Si
-   pair_coeff \* \* SiC.tersoff Si C Si
+   pair_coeff * * Si.tersoff Si
+   pair_coeff * * SiC.tersoff Si C Si
 
    pair_style tersoff/table
-   pair_coeff \* \* SiCGe.tersoff Si(D)
+   pair_coeff * * SiCGe.tersoff Si(D)
 
 Description
 """""""""""
 
 The *tersoff* style computes a 3-body Tersoff potential
-:ref:`(Tersoff\_1) <Tersoff_11>` for the energy E of a system of atoms as
+:ref:`(Tersoff_1) <Tersoff_11>` for the energy E of a system of atoms as
 
-.. image:: Eqs/pair_tersoff_1.jpg
-   :align: center
+.. math::
 
-where f\_R is a two-body term and f\_A includes three-body interactions.
-The summations in the formula are over all neighbors J and K of atom I
-within a cutoff distance = R + D.
+  E & = \frac{1}{2} \sum_i \sum_{j \neq i} V_{ij} \\
+  V_{ij} & = f_C(r_{ij}) \left[ f_R(r_{ij}) + b_{ij} f_A(r_{ij}) \right] \\
+  f_C(r) & = \left\{ \begin{array} {r@{\quad:\quad}l}
+    1 & r < R - D \\
+    \frac{1}{2} - \frac{1}{2} \sin \left( \frac{\pi}{2} \frac{r-R}{D} \right) &
+      R-D < r < R + D \\
+    0 & r > R + D
+    \end{array} \right. \\
+  f_R(r) & =  A \exp (-\lambda_1 r) \\
+  f_A(r) & =  -B \exp (-\lambda_2 r) \\
+  b_{ij} & =  \left( 1 + \beta^n {\zeta_{ij}}^n \right)^{-\frac{1}{2n}} \\
+  \zeta_{ij} & =  \sum_{k \neq i,j} f_C(r_{ik}) g(\theta_{ijk})
+                   \exp \left[ {\lambda_3}^m (r_{ij} - r_{ik})^m \right] \\
+  g(\theta) & =  \gamma_{ijk} \left( 1 + \frac{c^2}{d^2} -
+                  \frac{c^2}{\left[ d^2 + (\cos \theta - \cos \theta_0)^2\right]} \right)
+
+where :math:`f_R` is a two-body term and :math:`f_A` includes three-body
+interactions.  The summations in the formula are over all neighbors
+J and K of atom I within a cutoff distance = R + D.
 
 The *tersoff/table* style uses tabulated forms for the two-body,
 environment and angular functions. Linear interpolation is performed
@@ -63,10 +76,10 @@ between adjacent table entries. The table length is chosen to be
 accurate within 10\^-6 with respect to the *tersoff* style energy.
 The *tersoff/table* should give better performance in terms of speed.
 
-Only a single pair\_coeff command is used with the *tersoff* style
+Only a single pair_coeff command is used with the *tersoff* style
 which specifies a Tersoff potential file with parameters for all
 needed elements.  These are mapped to LAMMPS atom types by specifying
-N additional arguments after the filename in the pair\_coeff command,
+N additional arguments after the filename in the pair_coeff command,
 where N is the number of LAMMPS atom types:
 
 * filename
@@ -78,12 +91,11 @@ to specify the path for the potential file.
 As an example, imagine the SiC.tersoff file has Tersoff values for Si
 and C.  If your LAMMPS simulation has 4 atoms types and you want the
 1st 3 to be Si, and the 4th to be C, you would use the following
-pair\_coeff command:
+pair_coeff command:
 
+.. code-block:: LAMMPS
 
-.. parsed-literal::
-
-   pair_coeff \* \* SiC.tersoff Si Si Si C
+   pair_coeff * * SiC.tersoff Si Si Si C
 
 The 1st 2 arguments must be \* \* so as to span all LAMMPS atom types.
 The first three Si arguments map LAMMPS atom types 1,2,3 to the Si
@@ -104,28 +116,30 @@ above:
 * element 2 (the atom bonded to the center atom)
 * element 3 (the atom influencing the 1-2 bond in a bond-order sense)
 * m
-* gamma
-* lambda3 (1/distance units)
+* :math:`\gamma`
+* :math:`\lambda_3` (1/distance units)
 * c
 * d
-* costheta0 (can be a value < -1 or > 1)
+* :math:`\cos\theta_0` (can be a value < -1 or > 1)
 * n
-* beta
-* lambda2 (1/distance units)
+* :math:`\beta`
+* :math:`\lambda_2` (1/distance units)
 * B (energy units)
 * R (distance units)
 * D (distance units)
-* lambda1 (1/distance units)
+* :math:`\lambda_1` (1/distance units)
 * A (energy units)
 
-The n, beta, lambda2, B, lambda1, and A parameters are only used for
-two-body interactions.  The m, gamma, lambda3, c, d, and costheta0
+The n, :math:`\beta`, :math:`\lambda_2`, B, :math:`\lambda_1`, and A
+parameters are only used for
+two-body interactions.  The m, :math:`\gamma`, :math:`\lambda_3`, c, d,
+and :math:`\cos\theta_0`
 parameters are only used for three-body interactions. The R and D
 parameters are used for both two-body and three-body interactions. The
 non-annotated parameters are unitless.  The value of m must be 3 or 1.
 
 The Tersoff potential file must contain entries for all the elements
-listed in the pair\_coeff command.  It can also contain entries for
+listed in the pair_coeff command.  It can also contain entries for
 additional elements not being used in a particular simulation; LAMMPS
 ignores those entries.
 
@@ -149,14 +163,15 @@ SiCC entry.
 The parameters used for a particular
 three-body interaction come from the entry with the corresponding
 three elements.  The parameters used only for two-body interactions
-(n, beta, lambda2, B, lambda1, and A) in entries whose 2nd and 3rd
+(n, :math:`\beta`, :math:`\lambda_2`, B, :math:`\lambda_1`, and A)
+in entries whose 2nd and 3rd
 element are different (e.g. SiCSi) are not used for anything and can
 be set to 0.0 if desired.
 
 Note that the twobody parameters in entries such as SiCC and CSiSi
 are often the same, due to the common use of symmetric mixing rules,
 but this is not always the case. For example, the beta and n parameters in
-Tersoff\_2 :ref:`(Tersoff\_2) <Tersoff_21>` are not symmetric.
+Tersoff_2 :ref:`(Tersoff_2) <Tersoff_21>` are not symmetric.
 
 We chose the above form so as to enable users to define all commonly
 used variants of the Tersoff potential.  In particular, our form
@@ -164,22 +179,29 @@ reduces to the original Tersoff form when m = 3 and gamma = 1, while
 it reduces to the form of :ref:`Albe et al. <Albe>` when beta = 1 and m = 1.
 Note that in the current Tersoff implementation in LAMMPS, m must be
 specified as either 3 or 1.  Tersoff used a slightly different but
-equivalent form for alloys, which we will refer to as Tersoff\_2
-potential :ref:`(Tersoff\_2) <Tersoff_21>`. The *tersoff/table* style implements
-Tersoff\_2 parameterization only.
+equivalent form for alloys, which we will refer to as Tersoff_2
+potential :ref:`(Tersoff_2) <Tersoff_21>`.
+The *tersoff/table* style implements
+Tersoff_2 parameterization only.
 
-LAMMPS parameter values for Tersoff\_2 can be obtained as follows:
-gamma\_ijk = omega\_ik, lambda3 = 0 and the value of
+LAMMPS parameter values for Tersoff_2 can be obtained as follows:
+:math:`\gamma_{ijk} = \omega_{ik}`, :math:`\lambda_3 = 0` and the value of
 m has no effect.  The parameters for species i and j can be calculated
-using the Tersoff\_2 mixing rules:
+using the Tersoff_2 mixing rules:
 
-.. image:: Eqs/pair_tersoff_2.jpg
-   :align: center
+.. math::
 
-Tersoff\_2 parameters R and S must be converted to the LAMMPS
+   \lambda_1^{i,j} & = \frac{1}{2}(\lambda_1^i + \lambda_1^j)\\
+   \lambda_2^{i,j} & = \frac{1}{2}(\lambda_2^i + \lambda_2^j)\\
+   A_{i,j} & = (A_{i}A_{j})^{1/2}\\
+   B_{i,j} & = \chi_{ij}(B_{i}B_{j})^{1/2}\\
+   R_{i,j} & = (R_{i}R_{j})^{1/2}\\
+   S_{i,j} & = (S_{i}S_{j})^{1/2}
+
+Tersoff_2 parameters R and S must be converted to the LAMMPS
 parameters R and D (R is different in both forms), using the following
 relations: R=(R'+S')/2 and D=(S'-R')/2, where the primes indicate the
-Tersoff\_2 parameters.
+Tersoff_2 parameters.
 
 In the potentials directory, the file SiCGe.tersoff provides the
 LAMMPS parameters for Tersoff's various versions of Si, as well as his
@@ -195,10 +217,8 @@ Many thanks to Rutuparna Narulkar, David Farrell, and Xiaowang Zhou
 for helping clarify how Tersoff parameters for alloys have been
 defined in various papers.
 
-
 ----------
 
-
 Styles with a *gpu*\ , *intel*\ , *kk*\ , *omp*\ , or *opt* suffix are
 functionally the same as the corresponding style without the suffix.
 They have been optimized to run faster, depending on your available
@@ -217,10 +237,8 @@ by including their suffix, or you can use the :doc:`-suffix command-line switch
 See the :doc:`Speed packages <Speed_packages>` doc page for more
 instructions on how to use the accelerated styles effectively.
 
-
 ----------
 
-
 **Mixing, shift, table, tail correction, restart, rRESPA info**\ :
 
 For atom type pairs I,J and I != J, where types I and J correspond to
@@ -231,21 +249,18 @@ This pair style does not support the :doc:`pair_modify <pair_modify>`
 shift, table, and tail options.
 
 This pair style does not write its information to :doc:`binary restart files <restart>`, since it is stored in potential files.  Thus, you
-need to re-specify the pair\_style and pair\_coeff commands in an input
+need to re-specify the pair_style and pair_coeff commands in an input
 script that reads a restart file.
 
 This pair style can only be used via the *pair* keyword of the
 :doc:`run_style respa <run_style>` command.  It does not support the
 *inner*\ , *middle*\ , *outer* keywords.
 
-
 ----------
 
-
 Restrictions
 """"""""""""
 
-
 This pair style is part of the MANYBODY package.  It is only enabled
 if LAMMPS was built with that package.  See the :doc:`Build package <Build_package>` doc page for more info.
 
@@ -256,7 +271,7 @@ The Tersoff potential files provided with LAMMPS (see the potentials
 directory) are parameterized for metal :doc:`units <units>`.  You can
 use the Tersoff potential with any LAMMPS units, but you would need to
 create your own Tersoff potential file with coefficients listed in the
-appropriate units if your simulation doesn't use "metal" units.
+appropriate units if your simulation does not use "metal" units.
 
 Related commands
 """"""""""""""""
@@ -265,30 +280,17 @@ Related commands
 
 **Default:** none
 
-
 ----------
 
+.. _Tersoff_11:
 
-.. _Tersoff\_11:
-
-
-
-**(Tersoff\_1)** J. Tersoff, Phys Rev B, 37, 6991 (1988).
+**(Tersoff_1)** J. Tersoff, Phys Rev B, 37, 6991 (1988).
 
 .. _Albe:
 
-
-
 **(Albe)** J. Nord, K. Albe, P. Erhart, and K. Nordlund, J. Phys.:
 Condens. Matter, 15, 5649(2003).
 
-.. _Tersoff\_21:
+.. _Tersoff_21:
 
-
-
-**(Tersoff\_2)** J. Tersoff, Phys Rev B, 39, 5566 (1989); errata (PRB 41, 3248)
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
+**(Tersoff_2)** J. Tersoff, Phys Rev B, 39, 5566 (1989); errata (PRB 41, 3248)
diff --git a/doc/src/pair_tersoff_mod.rst b/doc/src/pair_tersoff_mod.rst
index d0ba8770be..1761a0b9fb 100644
--- a/doc/src/pair_tersoff_mod.rst
+++ b/doc/src/pair_tersoff_mod.rst
@@ -1,28 +1,27 @@
-.. index:: pair\_style tersoff/mod
+.. index:: pair_style tersoff/mod
 
-pair\_style tersoff/mod command
-===============================
+pair_style tersoff/mod command
+==============================
 
-pair\_style tersoff/mod/c command
-=================================
+pair_style tersoff/mod/c command
+================================
 
-pair\_style tersoff/mod/gpu command
-===================================
-
-pair\_style tersoff/mod/kk command
+pair_style tersoff/mod/gpu command
 ==================================
 
-pair\_style tersoff/mod/omp command
-===================================
+pair_style tersoff/mod/kk command
+=================================
 
-pair\_style tersoff/mod/c/omp command
-=====================================
+pair_style tersoff/mod/omp command
+==================================
+
+pair_style tersoff/mod/c/omp command
+====================================
 
 Syntax
 """"""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    pair_style tersoff/mod
 
@@ -31,39 +30,55 @@ Syntax
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    pair_style tersoff/mod
-   pair_coeff \* \* Si.tersoff.mod Si Si
+   pair_coeff * * Si.tersoff.mod Si Si
 
    pair_style tersoff/mod/c
-   pair_coeff \* \* Si.tersoff.modc Si Si
+   pair_coeff * * Si.tersoff.modc Si Si
 
 Description
 """""""""""
 
 The *tersoff/mod* and *tersoff/mod/c* styles computes a bond-order type
 interatomic potential :ref:`(Kumagai) <Kumagai>` based on a 3-body Tersoff
-potential :ref:`(Tersoff\_1) <Tersoff_12>`, :ref:`(Tersoff\_2) <Tersoff_22>` with
+potential :ref:`(Tersoff_1) <Tersoff_12>`, :ref:`(Tersoff_2) <Tersoff_22>` with
 modified cutoff function and angular-dependent term, giving the energy
 E of a system of atoms as
 
-.. image:: Eqs/pair_tersoff_mod.jpg
-   :align: center
+.. math::
 
-where f\_R is a two-body term and f\_A includes three-body interactions.
+   E & = \frac{1}{2} \sum_i \sum_{j \neq i} V_{ij} \\
+   V_{ij} & = f_C(r_{ij}) \left[ f_R(r_{ij}) + b_{ij} f_A(r_{ij}) \right] \\
+   f_C(r) & = \left\{ \begin{array} {r@{\quad:\quad}l}
+     1 & r < R - D \\
+     \frac{1}{2} - \frac{9}{16} \sin \left( \frac{\pi}{2} \frac{r-R}{D} \right) - \frac{1}{16} \sin \left( \frac{3\pi}{2} \frac{r-R}{D} \right) &
+       R-D < r < R + D \\
+     0 & r > R + D
+     \end{array} \right. \\
+   f_R(r) & = A \exp (-\lambda_1 r) \\
+   f_A(r) & = -B \exp (-\lambda_2 r) \\
+   b_{ij} & = \left( 1 + {\zeta_{ij}}^\eta \right)^{-\frac{1}{2n}} \\
+   \zeta_{ij} & = \sum_{k \neq i,j} f_C(r_{ik}) g(\theta_{ijk})
+                    \exp \left[ \alpha (r_{ij} - r_{ik})^\beta \right] \\
+   g(\theta) & = c_1 + g_o(\theta) g_a(\theta) \\
+   g_o(\theta) & = \frac{c_2 (h - \cos \theta)^2}{c_3 + (h - \cos \theta)^2} \\
+   g_a(\theta) & = 1 + c_4 \exp \left[ -c_5 (h - \cos \theta)^2 \right] \\
+
+where :math:`f_R` is a two-body term and :math:`f_A` includes three-body interactions.
 The summations in the formula are over all neighbors J and K of atom I
 within a cutoff distance = R + D.
 The *tersoff/mod/c* style differs from *tersoff/mod* only in the
-formulation of the V\_ij term, where it contains an additional c0 term.
+formulation of the V_ij term, where it contains an additional c0 term.
 
-.. image:: Eqs/pair_tersoff_mod_c.jpg
-   :align: center
+.. math::
 
-The modified cutoff function f\_C proposed by :ref:`(Murty) <Murty>` and
+   V_{ij}  & = f_C(r_{ij}) \left[ f_R(r_{ij}) + b_{ij} f_A(r_{ij}) + c_0 \right]
+
+The modified cutoff function :math:`f_C` proposed by :ref:`(Murty) <Murty>` and
 having a continuous second-order differential is employed. The
-angular-dependent term g(theta) was modified to increase the
+angular-dependent term :math:`g(\theta)` was modified to increase the
 flexibility of the potential.
 
 The *tersoff/mod* potential is fitted to both the elastic constants
@@ -72,23 +87,22 @@ form in which the angular-dependent term is improved. The model
 performs extremely well in describing the crystalline, liquid, and
 amorphous phases :ref:`(Schelling) <Schelling>`.
 
-Only a single pair\_coeff command is used with the *tersoff/mod* style
+Only a single pair_coeff command is used with the *tersoff/mod* style
 which specifies a Tersoff/MOD potential file with parameters for all
 needed elements.  These are mapped to LAMMPS atom types by specifying
-N additional arguments after the filename in the pair\_coeff command,
+N additional arguments after the filename in the pair_coeff command,
 where N is the number of LAMMPS atom types:
 
 * filename
 * N element names = mapping of Tersoff/MOD elements to atom types
 
-As an example, imagine the Si.tersoff\_mod file has Tersoff values for Si.
+As an example, imagine the Si.tersoff_mod file has Tersoff values for Si.
 If your LAMMPS simulation has 3 Si atoms types, you would use the following
-pair\_coeff command:
+pair_coeff command:
 
+.. code-block:: LAMMPS
 
-.. parsed-literal::
-
-   pair_coeff \* \* Si.tersoff_mod Si Si Si
+   pair_coeff * * Si.tersoff_mod Si Si Si
 
 The 1st 2 arguments must be \* \* so as to span all LAMMPS atom types.
 The three Si arguments map LAMMPS atom types 1,2,3 to the Si element
@@ -105,37 +119,37 @@ not blank or comments (starting with #) define parameters for a triplet
 of elements.  The parameters in a single entry correspond to
 coefficients in the formulae above:
 
-element 1 (the center atom in a 3-body interaction)
-element 2 (the atom bonded to the center atom)
-element 3 (the atom influencing the 1-2 bond in a bond-order sense)
-beta
-alpha
-h
-eta
-beta\_ters = 1 (dummy parameter)
-lambda2 (1/distance units)
-B (energy units)
-R (distance units)
-D (distance units)
-lambda1 (1/distance units)
-A (energy units)
-n
-c1
-c2
-c3
-c4
-c5
-c0 (energy units, tersoff/mod/c only):ul
+* element 1 (the center atom in a 3-body interaction)
+* element 2 (the atom bonded to the center atom)
+* element 3 (the atom influencing the 1-2 bond in a bond-order sense)
+* :math:`\beta`
+* :math:`\alpha`
+* h
+* :math:`\eta`
+* :math:`\beta_{ters}` = 1 (dummy parameter)
+* :math:`\lambda_2` (1/distance units)
+* B (energy units)
+* R (distance units)
+* D (distance units)
+* :math:`\lambda_1` (1/distance units)
+* A (energy units)
+* n
+* c1
+* c2
+* c3
+* c4
+* c5
+* c0 (energy units, tersoff/mod/c only):ul
 
-The n, eta, lambda2, B, lambda1, and A parameters are only used for
-two-body interactions.  The beta, alpha, c1, c2, c3, c4, c5, h
+The n, :math:`\eta`, :math:`\lambda_2`, B, :math:`\lambda_1`, and A parameters are only used for
+two-body interactions.  The :math:`\beta`, :math:`\alpha`, c1, c2, c3, c4, c5, h
 parameters are only used for three-body interactions. The R and D
 parameters are used for both two-body and three-body interactions.
 The c0 term applies to *tersoff/mod/c* only. The non-annotated
 parameters are unitless.
 
 The Tersoff/MOD potential file must contain entries for all the elements
-listed in the pair\_coeff command.  It can also contain entries for
+listed in the pair_coeff command.  It can also contain entries for
 additional elements not being used in a particular simulation; LAMMPS
 ignores those entries.
 
@@ -145,10 +159,8 @@ the center atom in a three-body interaction and it is bonded to the
 2nd atom and the bond is influenced by the 3rd atom.  Thus an entry
 for SiSiSi means Si bonded to a Si with another Si atom influencing the bond.
 
-
 ----------
 
-
 Styles with a *gpu*\ , *intel*\ , *kk*\ , *omp*\ , or *opt* suffix are
 functionally the same as the corresponding style without the suffix.
 They have been optimized to run faster, depending on your available
@@ -167,31 +179,26 @@ by including their suffix, or you can use the :doc:`-suffix command-line switch
 See the :doc:`Speed packages <Speed_packages>` doc page for more
 instructions on how to use the accelerated styles effectively.
 
-
 ----------
 
-
 **Mixing, shift, table, tail correction, restart, rRESPA info**\ :
 
 This pair style does not support the :doc:`pair_modify <pair_modify>`
 shift, table, and tail options.
 
 This pair style does not write its information to :doc:`binary restart files <restart>`, since it is stored in potential files.  Thus, you
-need to re-specify the pair\_style and pair\_coeff commands in an input
+need to re-specify the pair_style and pair_coeff commands in an input
 script that reads a restart file.
 
 This pair style can only be used via the *pair* keyword of the
 :doc:`run_style respa <run_style>` command.  It does not support the
 *inner*\ , *middle*\ , *outer* keywords.
 
-
 ----------
 
-
 Restrictions
 """"""""""""
 
-
 This pair style is part of the MANYBODY package.  It is only enabled
 if LAMMPS was built with that package.  See the :doc:`Build package <Build_package>` doc page for more info.
 
@@ -202,7 +209,7 @@ The Tersoff/MOD potential files provided with LAMMPS (see the potentials
 directory) are parameterized for metal :doc:`units <units>`.  You can
 use the Tersoff/MOD potential with any LAMMPS units, but you would need to
 create your own Tersoff/MOD potential file with coefficients listed in the
-appropriate units if your simulation doesn't use "metal" units.
+appropriate units if your simulation does not use "metal" units.
 
 Related commands
 """"""""""""""""
@@ -211,42 +218,25 @@ Related commands
 
 **Default:** none
 
-
 ----------
 
-
 .. _Kumagai:
 
-
-
 **(Kumagai)** T. Kumagai, S. Izumi, S. Hara, S. Sakai,
 Comp. Mat. Science, 39, 457 (2007).
 
-.. _Tersoff\_12:
+.. _Tersoff_12:
 
+**(Tersoff_1)** J. Tersoff, Phys Rev B, 37, 6991 (1988).
 
+.. _Tersoff_22:
 
-**(Tersoff\_1)** J. Tersoff, Phys Rev B, 37, 6991 (1988).
-
-.. _Tersoff\_22:
-
-
-
-**(Tersoff\_2)** J. Tersoff, Phys Rev B, 38, 9902 (1988).
+**(Tersoff_2)** J. Tersoff, Phys Rev B, 38, 9902 (1988).
 
 .. _Murty:
 
-
-
 **(Murty)** M.V.R. Murty, H.A. Atwater, Phys Rev B, 51, 4889 (1995).
 
 .. _Schelling:
 
-
-
 **(Schelling)** Patrick K. Schelling, Comp. Mat. Science, 44, 274 (2008).
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/pair_tersoff_zbl.rst b/doc/src/pair_tersoff_zbl.rst
index 4b9fc25918..57dc3db51e 100644
--- a/doc/src/pair_tersoff_zbl.rst
+++ b/doc/src/pair_tersoff_zbl.rst
@@ -1,70 +1,94 @@
-.. index:: pair\_style tersoff/zbl
+.. index:: pair_style tersoff/zbl
 
-pair\_style tersoff/zbl command
-===============================
+pair_style tersoff/zbl command
+==============================
 
-pair\_style tersoff/zbl/gpu command
-===================================
-
-pair\_style tersoff/zbl/kk command
+pair_style tersoff/zbl/gpu command
 ==================================
 
-pair\_style tersoff/zbl/omp command
-===================================
+pair_style tersoff/zbl/kk command
+=================================
+
+pair_style tersoff/zbl/omp command
+==================================
 
 Syntax
 """"""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    pair_style tersoff/zbl
 
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    pair_style tersoff/zbl
-   pair_coeff \* \* SiC.tersoff.zbl Si C Si
+   pair_coeff * * SiC.tersoff.zbl Si C Si
 
 Description
 """""""""""
 
 The *tersoff/zbl* style computes a 3-body Tersoff potential
-:ref:`(Tersoff\_1) <zbl-Tersoff_1>` with a close-separation pairwise modification
+:ref:`(Tersoff_1) <zbl-Tersoff_1>` with a close-separation pairwise modification
 based on a Coulomb potential and the Ziegler-Biersack-Littmark
 universal screening function :ref:`(ZBL) <zbl-ZBL>`, giving the energy E of a
 system of atoms as
 
-.. image:: Eqs/pair_tersoff_zbl.jpg
-   :align: center
+.. math::
 
-The f\_F term is a fermi-like function used to smoothly connect the ZBL
+   E & = \frac{1}{2} \sum_i \sum_{j \neq i} V_{ij} \\
+   V_{ij} & =  (1 - f_F(r_{ij})) V^{ZBL}_{ij} + f_F(r_{ij}) V^{Tersoff}_{ij} \\
+   f_F(r_{ij}) & =  \frac{1}{1 + e^{-A_F(r_{ij} - r_C)}}\\
+   \\
+   \\
+   V^{ZBL}_{ij} & = \frac{1}{4\pi\epsilon_0} \frac{Z_1 Z_2 \,e^2}{r_{ij}} \phi(r_{ij}/a) \\
+  a & = \frac{0.8854\,a_0}{Z_{1}^{0.23} + Z_{2}^{0.23}}\\
+  \phi(x) & =  0.1818e^{-3.2x} + 0.5099e^{-0.9423x} + 0.2802e^{-0.4029x} + 0.02817e^{-0.2016x}\\
+  \\
+  \\
+  V^{Tersoff}_{ij} & = f_C(r_{ij}) \left[ f_R(r_{ij}) + b_{ij} f_A(r_{ij}) \right] \\
+  f_C(r) & = \left\{ \begin{array} {r@{\quad:\quad}l}
+    1 & r < R - D \\
+    \frac{1}{2} - \frac{1}{2} \sin \left( \frac{\pi}{2} \frac{r-R}{D} \right) &
+      R-D < r < R + D \\
+    0 & r > R + D
+    \end{array} \right. \\
+  f_R(r) & = A \exp (-\lambda_1 r) \\
+  f_A(r) & = -B \exp (-\lambda_2 r) \\
+  b_{ij} & = \left( 1 + \beta^n {\zeta_{ij}}^n \right)^{-\frac{1}{2n}} \\
+  \zeta_{ij} & = \sum_{k \neq i,j} f_C(r_{ik}) g(\theta_{ijk})
+                   \exp \left[ {\lambda_3}^m (r_{ij} - r_{ik})^m \right] \\
+  g(\theta) & =  \gamma_{ijk} \left( 1 + \frac{c^2}{d^2} -
+                  \frac{c^2}{\left[ d^2 + (\cos \theta - \cos \theta_0)^2\right]} \right)
+
+The :math:`f_F` term is a fermi-like function used to smoothly connect the ZBL
 repulsive potential with the Tersoff potential.  There are 2
-parameters used to adjust it: A\_F and r\_C.  A\_F controls how "sharp"
-the transition is between the two, and r\_C is essentially the cutoff
+parameters used to adjust it: :math:`A_F` and :math:`r_C`.  :math:`A_F`
+controls how "sharp"
+the transition is between the two, and :math:`r_C` is essentially the cutoff
 for the ZBL potential.
 
 For the ZBL portion, there are two terms. The first is the Coulomb
 repulsive term, with Z1, Z2 as the number of protons in each nucleus,
-e as the electron charge (1 for metal and real units) and epsilon0 as
-the permittivity of vacuum.  The second part is the ZBL universal
+e as the electron charge (1 for metal and real units) and :math:`\epsilon_0`
+as the permittivity of vacuum.  The second part is the ZBL universal
 screening function, with a0 being the Bohr radius (typically 0.529
 Angstroms), and the remainder of the coefficients provided by the
 original paper.  This screening function should be applicable to most
 systems.  However, it is only accurate for small separations
 (i.e. less than 1 Angstrom).
 
-For the Tersoff portion, f\_R is a two-body term and f\_A includes
+For the Tersoff portion, :math:`f_R` is a two-body term and :math:`f_A`
+includes
 three-body interactions. The summations in the formula are over all
 neighbors J and K of atom I within a cutoff distance = R + D.
 
-Only a single pair\_coeff command is used with the *tersoff/zbl* style
+Only a single pair_coeff command is used with the *tersoff/zbl* style
 which specifies a Tersoff/ZBL potential file with parameters for all
 needed elements.  These are mapped to LAMMPS atom types by specifying
-N additional arguments after the filename in the pair\_coeff command,
+N additional arguments after the filename in the pair_coeff command,
 where N is the number of LAMMPS atom types:
 
 * filename
@@ -76,12 +100,11 @@ to specify the path for the potential file.
 As an example, imagine the SiC.tersoff.zbl file has Tersoff/ZBL values
 for Si and C.  If your LAMMPS simulation has 4 atoms types and you
 want the 1st 3 to be Si, and the 4th to be C, you would use the
-following pair\_coeff command:
+following pair_coeff command:
 
+.. code-block:: LAMMPS
 
-.. parsed-literal::
-
-   pair_coeff \* \* SiC.tersoff Si Si Si C
+   pair_coeff * * SiC.tersoff Si Si Si C
 
 The 1st 2 arguments must be \* \* so as to span all LAMMPS atom types.
 The first three Si arguments map LAMMPS atom types 1,2,3 to the Si
@@ -102,34 +125,37 @@ in the formula above:
 * element 2 (the atom bonded to the center atom)
 * element 3 (the atom influencing the 1-2 bond in a bond-order sense)
 * m
-* gamma
-* lambda3 (1/distance units)
+* :math:`\gamma`
+* :math:`\lambda_3` (1/distance units)
 * c
 * d
-* costheta0 (can be a value < -1 or > 1)
+* :math:`\cos\theta_0` (can be a value < -1 or > 1)
 * n
-* beta
-* lambda2 (1/distance units)
+* :math:`\beta`
+* :math:`\lambda_2` (1/distance units)
 * B (energy units)
 * R (distance units)
 * D (distance units)
-* lambda1 (1/distance units)
+* :math:`\lambda_1` (1/distance units)
 * A (energy units)
-* Z\_i
-* Z\_j
+* :math:`Z_i`
+* :math:`Z_j`
 * ZBLcut (distance units)
 * ZBLexpscale (1/distance units)
 
-The n, beta, lambda2, B, lambda1, and A parameters are only used for
-two-body interactions.  The m, gamma, lambda3, c, d, and costheta0
+The n, :math:`\beta`, :math:`\lambda_2`, B, :math:`\lambda_1`, and A
+parameters are only used for
+two-body interactions.  The m, :math:`\gamma`, :math:`\lambda_3`, c, d,
+and :math:`\cos\theta_0`
 parameters are only used for three-body interactions. The R and D
 parameters are used for both two-body and three-body interactions. The
-Z\_i,Z\_j, ZBLcut, ZBLexpscale parameters are used in the ZBL repulsive
+:math:`Z_i`, :math:`Z_j`, ZBLcut, ZBLexpscale parameters are used in the
+ZBL repulsive
 portion of the potential and in the Fermi-like function.  The
 non-annotated parameters are unitless.  The value of m must be 3 or 1.
 
 The Tersoff/ZBL potential file must contain entries for all the
-elements listed in the pair\_coeff command.  It can also contain
+elements listed in the pair_coeff command.  It can also contain
 entries for additional elements not being used in a particular
 simulation; LAMMPS ignores those entries.
 
@@ -153,14 +179,15 @@ SiCC entry.
 The parameters used for a particular
 three-body interaction come from the entry with the corresponding
 three elements.  The parameters used only for two-body interactions
-(n, beta, lambda2, B, lambda1, and A) in entries whose 2nd and 3rd
+(n, :math:`\beta`, :math:`\lambda_2`, B, :math:`\lambda_1`, and A)
+in entries whose 2nd and 3rd
 element are different (e.g. SiCSi) are not used for anything and can
 be set to 0.0 if desired.
 
 Note that the twobody parameters in entries such as SiCC and CSiSi
 are often the same, due to the common use of symmetric mixing rules,
 but this is not always the case. For example, the beta and n parameters in
-Tersoff\_2 :ref:`(Tersoff\_2) <zbl-Tersoff_2>` are not symmetric.
+Tersoff_2 :ref:`(Tersoff_2) <zbl-Tersoff_2>` are not symmetric.
 
 We chose the above form so as to enable users to define all commonly
 used variants of the Tersoff portion of the potential.  In particular,
@@ -169,20 +196,26 @@ our form reduces to the original Tersoff form when m = 3 and gamma =
 and m = 1.  Note that in the current Tersoff implementation in LAMMPS,
 m must be specified as either 3 or 1.  Tersoff used a slightly
 different but equivalent form for alloys, which we will refer to as
-Tersoff\_2 potential :ref:`(Tersoff\_2) <zbl-Tersoff_2>`.
+Tersoff_2 potential :ref:`(Tersoff_2) <zbl-Tersoff_2>`.
 
-LAMMPS parameter values for Tersoff\_2 can be obtained as follows:
-gamma = omega\_ijk, lambda3 = 0 and the value of
+LAMMPS parameter values for Tersoff_2 can be obtained as follows:
+:math:`\gamma = \omega_{ijk}`, :math:`\lambda_3 = 0` and the value of
 m has no effect.  The parameters for species i and j can be calculated
-using the Tersoff\_2 mixing rules:
+using the Tersoff_2 mixing rules:
 
-.. image:: Eqs/pair_tersoff_2.jpg
-   :align: center
+.. math::
 
-Tersoff\_2 parameters R and S must be converted to the LAMMPS
+   \lambda_1^{i,j} & = \frac{1}{2}(\lambda_1^i + \lambda_1^j)\\
+   \lambda_2^{i,j} & = \frac{1}{2}(\lambda_2^i + \lambda_2^j)\\
+   A_{i,j} & = (A_{i}A_{j})^{1/2}\\
+   B_{i,j} & = \chi_{ij}(B_{i}B_{j})^{1/2}\\
+   R_{i,j} & = (R_{i}R_{j})^{1/2}\\
+   S_{i,j} & = (S_{i}S_{j})^{1/2}\\
+
+Tersoff_2 parameters R and S must be converted to the LAMMPS
 parameters R and D (R is different in both forms), using the following
 relations: R=(R'+S')/2 and D=(S'-R')/2, where the primes indicate the
-Tersoff\_2 parameters.
+Tersoff_2 parameters.
 
 In the potentials directory, the file SiCGe.tersoff provides the
 LAMMPS parameters for Tersoff's various versions of Si, as well as his
@@ -199,10 +232,8 @@ for helping clarify how Tersoff parameters for alloys have been
 defined in various papers.  Also thanks to Ram Devanathan for
 providing the base ZBL implementation.
 
-
 ----------
 
-
 Styles with a *gpu*\ , *intel*\ , *kk*\ , *omp*\ , or *opt* suffix are
 functionally the same as the corresponding style without the suffix.
 They have been optimized to run faster, depending on your available
@@ -221,10 +252,8 @@ by including their suffix, or you can use the :doc:`-suffix command-line switch
 See the :doc:`Speed packages <Speed_packages>` doc page for more
 instructions on how to use the accelerated styles effectively.
 
-
 ----------
 
-
 **Mixing, shift, table, tail correction, restart, rRESPA info**\ :
 
 For atom type pairs I,J and I != J, where types I and J correspond to
@@ -235,21 +264,18 @@ This pair style does not support the :doc:`pair_modify <pair_modify>`
 shift, table, and tail options.
 
 This pair style does not write its information to :doc:`binary restart files <restart>`, since it is stored in potential files.  Thus, you
-need to re-specify the pair\_style and pair\_coeff commands in an input
+need to re-specify the pair_style and pair_coeff commands in an input
 script that reads a restart file.
 
 This pair style can only be used via the *pair* keyword of the
 :doc:`run_style respa <run_style>` command.  It does not support the
 *inner*\ , *middle*\ , *outer* keywords.
 
-
 ----------
 
-
 Restrictions
 """"""""""""
 
-
 This pair style is part of the MANYBODY package.  It is only enabled
 if LAMMPS was built with that package.  See the :doc:`Build package <Build_package>` doc page for more info.
 
@@ -260,7 +286,7 @@ The Tersoff/ZBL potential files provided with LAMMPS (see the
 potentials directory) are parameterized for metal :doc:`units <units>`.
 You can use the Tersoff potential with any LAMMPS units, but you would
 need to create your own Tersoff potential file with coefficients
-listed in the appropriate units if your simulation doesn't use "metal"
+listed in the appropriate units if your simulation does not use "metal"
 units.
 
 Related commands
@@ -270,37 +296,22 @@ Related commands
 
 **Default:** none
 
-
 ----------
 
+.. _zbl-Tersoff_1:
 
-.. _zbl-Tersoff\_1:
-
-
-
-**(Tersoff\_1)** J. Tersoff, Phys Rev B, 37, 6991 (1988).
+**(Tersoff_1)** J. Tersoff, Phys Rev B, 37, 6991 (1988).
 
 .. _zbl-ZBL:
 
-
-
 **(ZBL)** J.F. Ziegler, J.P. Biersack, U. Littmark, 'Stopping and Ranges
 of Ions in Matter' Vol 1, 1985, Pergamon Press.
 
 .. _zbl-Albe:
 
-
-
 **(Albe)** J. Nord, K. Albe, P. Erhart and K. Nordlund, J. Phys.:
 Condens. Matter, 15, 5649(2003).
 
-.. _zbl-Tersoff\_2:
+.. _zbl-Tersoff_2:
 
-
-
-**(Tersoff\_2)** J. Tersoff, Phys Rev B, 39, 5566 (1989); errata (PRB 41, 3248)
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
+**(Tersoff_2)** J. Tersoff, Phys Rev B, 39, 5566 (1989); errata (PRB 41, 3248)
diff --git a/doc/src/pair_thole.rst b/doc/src/pair_thole.rst
index 9f8cb67714..7adf267469 100644
--- a/doc/src/pair_thole.rst
+++ b/doc/src/pair_thole.rst
@@ -1,26 +1,24 @@
-.. index:: pair\_style thole
+.. index:: pair_style thole
 
-pair\_style thole command
-=========================
+pair_style thole command
+========================
 
-pair\_style lj/cut/thole/long command
-=====================================
+pair_style lj/cut/thole/long command
+====================================
 
-pair\_style lj/cut/thole/long/omp command
-=========================================
+pair_style lj/cut/thole/long/omp command
+========================================
 
 Syntax
 """"""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    pair_style style args
 
 * style = *thole* or *lj/cut/thole/long* or *lj/cut/thole/long/omp*
 * args = list of arguments for a particular style
 
-
 .. parsed-literal::
 
      *thole* args = damp cutoff
@@ -34,13 +32,12 @@ Syntax
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    pair_style hybrid/overlay ... thole 2.6 12.0
    pair_coeff 1 1 thole 1.0
    pair_coeff 1 2 thole 1.0 2.6 10.0
-   pair_coeff \* 2 thole 1.0 2.6
+   pair_coeff * 2 thole 1.0 2.6
 
    pair_style lj/cut/thole/long 2.6 12.0
 
@@ -53,13 +50,13 @@ describes how to use the :doc:`thermalized Drude oscillator model <Howto_drude>`
 discussed on the :doc:`Howto polarizable <Howto_polarizable>` doc page.
 
 The *thole* pair style should be used as a sub-style within in the
-:doc:`pair\_hybrid/overlay <pair_hybrid>` command, in conjunction with a
+:doc:`pair_style hybrid/overlay <pair_hybrid>` command, in conjunction with a
 main pair style including Coulomb interactions, i.e. any pair style
 containing *coul/cut* or *coul/long* in its style name.
 
 The *lj/cut/thole/long* pair style is equivalent to, but more convenient that
 the frequent combination *hybrid/overlay lj/cut/coul/long cutoff thole damp
-cutoff2*\ . It is not only a shorthand for this pair\_style combination, but
+cutoff2*\ . It is not only a shorthand for this pair_style combination, but
 it also allows for mixing pair coefficients instead of listing them all.
 The *lj/cut/thole/long* pair style is also a bit faster because it avoids an
 overlay and can benefit from OMP acceleration. Moreover, it uses a more
@@ -70,12 +67,11 @@ Drude particles.
 The *thole* pair styles compute the Coulomb interaction damped at
 short distances by a function
 
-
 .. math::
 
-   \begin{equation} T_{ij}(r_{ij}) = 1 - \left( 1 +
+   T_{ij}(r_{ij}) = 1 - \left( 1 +
    \frac{s_{ij} r_{ij} }{2} \right)
-   \exp \left( - s_{ij} r_{ij} \right) \end{equation}
+   \exp \left( - s_{ij} r_{ij} \right)
 
 This function results from an adaptation to point charges
 :ref:`(Noskov) <Noskov1>` of the dipole screening scheme originally proposed
@@ -87,12 +83,11 @@ the atom types. The mixing rule for Thole damping parameters is the
 arithmetic average, and for polarizabilities the geometric average
 between the atom-specific values.
 
-
 .. math::
 
-   \begin{equation} s_{ij} = \frac{ a_{ij} }{
+   s_{ij} = \frac{ a_{ij} }{
    (\alpha_{ij})^{1/3} } = \frac{ (a_i + a_j)/2 }{
-   [(\alpha_i\alpha_j)^{1/2}]^{1/3} } \end{equation}
+   [(\alpha_i\alpha_j)^{1/2}]^{1/3} }
 
 The damping function is only applied to the interactions between the
 point charges representing the induced dipoles on polarizable sites,
@@ -109,16 +104,16 @@ non-polarizable atoms are also subject to these weighting factors. The
 Drude particles inherit the 1-2, 1-3 and 1-4 neighbor relations from
 their respective cores.
 
-For pair\_style *thole*\ , the following coefficients must be defined for
+For pair_style *thole*\ , the following coefficients must be defined for
 each pair of atoms types via the :doc:`pair_coeff <pair_coeff>` command
 as in the example above.
 
-* alpha (distance units\^3)
+* :math:`\alpha` (distance units\^3)
 * damp
 * cutoff (distance units)
 
 The last two coefficients are optional.  If not specified the global
-Thole damping parameter or global cutoff specified in the pair\_style
+Thole damping parameter or global cutoff specified in the pair_style
 command are used. In order to specify a cutoff (third argument) a damp
 parameter (second argument) must also be specified.
 
@@ -126,19 +121,17 @@ For pair style *lj/cut/thole/long*\ , the following coefficients must be
 defined for each pair of atoms types via the :doc:`pair_coeff <pair_coeff>`
 command.
 
-* epsilon (energy units)
-* sigma (length units)
-* alpha (distance units\^3)
-* damps
+* :math:`\epsilon` (energy units)
+* :math:`\sigma` (length units)
+* :math:`\alpha` (distance units\^3)
+* damp
 * LJ cutoff (distance units)
 
 The last two coefficients are optional and default to the global values from
-the *pair\_style* command line.
-
+the *pair_style* command line.
 
 ----------
 
-
 Styles with a *gpu*\ , *intel*\ , *kk*\ , *omp*\ , or *opt* suffix are
 functionally the same as the corresponding style without the suffix.
 They have been optimized to run faster, depending on your available
@@ -165,24 +158,19 @@ for all I,J pairs must be specified explicitly.
 The *lj/cut/thole/long* pair style does support mixing. Mixed coefficients
 are defined using
 
-
 .. math::
 
-   \begin{equation} \alpha_{ij} = \sqrt{\alpha_i\alpha_j}\end{equation}
-
-
-.. math::
-
-   \begin{equation} a_{ij} = \frac 1 2 (a_i + a_j)\end{equation}
+   \alpha_{ij} = & \sqrt{\alpha_i\alpha_j} \\
+   & \\
+   a_{ij} = & \frac 1 2 (a_i + a_j)
 
 Restrictions
 """"""""""""
 
-
 These pair styles are part of the USER-DRUDE package. They are only
 enabled if LAMMPS was built with that package. See the :doc:`Build package <Build_package>` doc page for more info.
 
-This pair\_style should currently not be used with the :doc:`charmm dihedral style <dihedral_charmm>` if the latter has non-zero 1-4 weighting
+This pair_style should currently not be used with the :doc:`charmm dihedral style <dihedral_charmm>` if the latter has non-zero 1-4 weighting
 factors. This is because the *thole* pair style does not know which
 pairs are 1-4 partners of which dihedrals.
 
@@ -198,23 +186,12 @@ Related commands
 
 **Default:** none
 
-
 ----------
 
-
 .. _Noskov1:
 
-
-
 **(Noskov)** Noskov, Lamoureux and Roux, J Phys Chem B, 109, 6705 (2005).
 
 .. _Thole1:
 
-
-
 **(Thole)** Chem Phys, 59, 341 (1981).
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/pair_tri_lj.rst b/doc/src/pair_tri_lj.rst
index b9590a02a8..1dd69778ed 100644
--- a/doc/src/pair_tri_lj.rst
+++ b/doc/src/pair_tri_lj.rst
@@ -1,13 +1,12 @@
-.. index:: pair\_style tri/lj
+.. index:: pair_style tri/lj
 
-pair\_style tri/lj command
-==========================
+pair_style tri/lj command
+=========================
 
 Syntax
 """"""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    pair_style tri/lj cutoff
 
@@ -16,11 +15,10 @@ cutoff = global cutoff for interactions (distance units)
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    pair_style tri/lj 3.0
-   pair_coeff \* \* 1.0 1.0
+   pair_coeff * * 1.0 1.0
    pair_coeff 1 1 1.0 1.5 2.5
 
 Description
@@ -43,16 +41,16 @@ its entirety or not at all.
 
 The set of non-overlapping spherical particles that represent a
 triangle, for purposes of this pair style, are generated in the
-following manner.  Assume the triangle is of type I, and sigma\_II has
+following manner.  Assume the triangle is of type I, and sigma_II has
 been specified.  We want a set of spheres with centers in the plane of
-the triangle, none of them larger in diameter than sigma\_II, which
+the triangle, none of them larger in diameter than sigma_II, which
 completely cover the triangle's area, but with minimal overlap and a
 minimal total number of spheres.  This is done in a recursive manner.
 Place a sphere at the centroid of the original triangle.  Calculate
 what diameter it must have to just cover all 3 corner points of the
-triangle.  If that diameter is equal to or smaller than sigma\_II, then
+triangle.  If that diameter is equal to or smaller than sigma_II, then
 include a sphere of the calculated diameter in the set of covering
-spheres.  It the diameter is larger than sigma\_II, then split the
+spheres.  It the diameter is larger than sigma_II, then split the
 triangle into 2 triangles by bisecting its longest side.  Repeat the
 process on each sub-triangle, recursing as far as needed to generate a
 set of covering spheres.  When finished, the original criteria are
@@ -64,8 +62,8 @@ The LJ interaction between 2 spheres on different triangles of types
 I,J is computed with an arithmetic mixing of the sigma values of the 2
 spheres and using the specified epsilon value for I,J atom types.
 Note that because the sigma values for triangles spheres is computed
-using only sigma\_II values, specific to the triangles's type, this
-means that any specified sigma\_IJ values (for I != J) are effectively
+using only sigma_II values, specific to the triangles's type, this
+means that any specified sigma_IJ values (for I != J) are effectively
 ignored.
 
 For style *tri/lj*\ , the following coefficients must be defined for
@@ -81,15 +79,13 @@ commands:
 The last coefficient is optional.  If not specified, the global cutoff
 is used.
 
-
 ----------
 
-
 **Mixing, shift, table, tail correction, restart, rRESPA info**\ :
 
 For atom type pairs I,J and I != J, the epsilon and sigma coefficients
 and cutoff distance for all of this pair style can be mixed.  The
-default mix value is *geometric*\ .  See the "pair\_modify" command for
+default mix value is *geometric*\ .  See the "pair_modify" command for
 details.
 
 This pair style does not support the :doc:`pair_modify <pair_modify>`
@@ -101,14 +97,11 @@ This pair style can only be used via the *pair* keyword of the
 :doc:`run_style respa <run_style>` command.  It does not support the
 *inner*\ , *middle*\ , *outer* keywords.
 
-
 ----------
 
-
 Restrictions
 """"""""""""
 
-
 This style is part of the ASPHERE package.  It is only enabled if
 LAMMPS was built with that package.  See the :doc:`Build package <Build_package>` doc page for more info.
 
@@ -121,8 +114,3 @@ Related commands
 :doc:`pair_coeff <pair_coeff>`, :doc:`pair_style line/lj <pair_line_lj>`
 
 **Default:** none
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/pair_ufm.rst b/doc/src/pair_ufm.rst
index 1656720fd1..2562b2fc2f 100644
--- a/doc/src/pair_ufm.rst
+++ b/doc/src/pair_ufm.rst
@@ -1,22 +1,21 @@
-.. index:: pair\_style ufm
+.. index:: pair_style ufm
 
-pair\_style ufm command
-=======================
+pair_style ufm command
+======================
 
-pair\_style ufm/gpu command
-===========================
+pair_style ufm/gpu command
+==========================
 
-pair\_style ufm/omp command
-===========================
+pair_style ufm/omp command
+==========================
 
-pair\_style ufm/opt command
-===========================
+pair_style ufm/opt command
+==========================
 
 Syntax
 """"""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    pair_style ufm cutoff
 
@@ -25,27 +24,31 @@ Syntax
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    pair_style ufm 4.0
    pair_coeff 1 1 100.0 1.0 2.5
-   pair_coeff \* \* 100.0 1.0
+   pair_coeff * * 100.0 1.0
 
    pair_style ufm 4.0
-   pair_coeff \* \* 10.0 1.0
+   pair_coeff * * 10.0 1.0
    variable prefactor equal ramp(10,100)
-   fix 1 all adapt 1 pair ufm epsilon \* \* v_prefactor
+   fix 1 all adapt 1 pair ufm epsilon * * v_prefactor
 
 Description
 """""""""""
 
 Style *ufm* computes pairwise interactions using the Uhlenbeck-Ford model (UFM) potential :ref:`(Paula Leite2016) <PL2>` which is given by
 
-.. image:: Eqs/pair_ufm.jpg
-   :align: center
+.. math::
 
-where rc is the cutoff, sigma is a distance-scale and epsilon is an energy-scale, i.e., a product of Boltzmann constant kB, temperature T and the Uhlenbeck-Ford p-parameter which is responsible
+   E & = -\varepsilon\, \ln{\left[1-\exp{\left(-r^{2}/\sigma^{2}\right)}\right]} \qquad  r < r_c \\
+   \varepsilon & = p\,k_B\,T
+
+where :math:`r_c` is the cutoff, :math:`\sigma` is a distance-scale and
+:math:`\epsilon` is an energy-scale, i.e., a product of Boltzmann constant
+:math:`k_B`, temperature *T* and the Uhlenbeck-Ford p-parameter which
+is responsible
 to control the softness of the interactions :ref:`(Paula Leite2017) <PL1>`.
 This model is useful as a reference system for fluid-phase free-energy calculations :ref:`(Paula Leite2016) <PL2>`.
 
@@ -55,33 +58,36 @@ or in the data file or restart files read by the
 :doc:`read_data <read_data>` or :doc:`read_restart <read_restart>`
 commands, or by mixing as described below:
 
-* epsilon (energy units)
-* sigma (distance units)
+* :math:`\epsilon` (energy units)
+* :math:`\sigma` (distance units)
 * cutoff (distance units)
 
 The last coefficient is optional.  If not specified, the global *ufm*
 cutoff is used.
 
 The :doc:`fix adapt <fix_adapt>` command can be used to vary epsilon and sigma for this pair style over the course of a simulation, in which case
-pair\_coeff settings for epsilon and sigma must still be specified, but will be
+pair_coeff settings for epsilon and sigma must still be specified, but will be
 overridden.  For example these commands will vary the prefactor epsilon for
 all pairwise interactions from 10.0 at the beginning to 100.0 at the end
 of a run:
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    variable prefactor equal ramp(10,100)
-   fix 1 all adapt 1 pair ufm epsilon \* \* v_prefactor
+   fix 1 all adapt 1 pair ufm epsilon * * v_prefactor
 
 .. note::
 
-   The thermodynamic integration procedure can be performed with this potential using :doc:`fix adapt <fix_adapt>`. This command will rescale the force on each atom by varying a scale variable, which always starts with value 1.0. The syntax is the same described above, however, changing epsilon to scale. A detailed explanation of how to use this command and perform nonequilibrium thermodynamic integration in LAMMPS is given in the paper by :ref:`(Freitas) <Freitas2>`.
-
+   The thermodynamic integration procedure can be performed with this
+   potential using :doc:`fix adapt <fix_adapt>`. This command will
+   rescale the force on each atom by varying a scale variable, which
+   always starts with value 1.0. The syntax is the same described above,
+   however, changing epsilon to scale. A detailed explanation of how to
+   use this command and perform nonequilibrium thermodynamic integration
+   in LAMMPS is given in the paper by :ref:`(Freitas) <Freitas2>`.
 
 ----------
 
-
 Styles with a *gpu*\ , *intel*\ , *kk*\ , *omp*\ , or *opt* suffix are
 functionally the same as the corresponding style without the suffix.
 They have been optimized to run faster, depending on your available
@@ -100,17 +106,15 @@ by including their suffix, or you can use the :doc:`-suffix command-line switch
 See the :doc:`Speed packages <Speed_packages>` doc page for more
 instructions on how to use the accelerated styles effectively.
 
-
 ----------
 
-
 **Mixing, shift, table, tail correction, restart, rRESPA info**\ :
 
 For atom type pairs I,J and I != J, the A coefficient and cutoff
 distance for this pair style can be mixed.  A is always mixed via a
-*geometric* rule.  The cutoff is mixed according to the pair\_modify
+*geometric* rule.  The cutoff is mixed according to the pair_modify
 mix value.  The default mix value is *geometric*\ .  See the
-"pair\_modify" command for details.
+"pair_modify" command for details.
 
 This pair style support the :doc:`pair_modify <pair_modify>` shift option for the energy of the pair interaction.
 
@@ -119,20 +123,18 @@ pair style.
 
 This pair style does not support the :doc:`pair_modify <pair_modify>` tail option for adding long-range tail corrections to energy and pressure.
 
-This pair style writes its information to :doc:`binary restart files <restart>`, so pair\_style and pair\_coeff commands do not need
+This pair style writes its information to :doc:`binary restart files <restart>`, so pair_style and pair_coeff commands do not need
 to be specified in an input script that reads a restart file.
 
 This pair style can only be used via the *pair* keyword of the
 :doc:`run_style respa <run_style>` command.  It does not support the
 *inner*\ , *middle*\ , *outer* keywords.
 
-
 ----------
 
-
 Restrictions
 """"""""""""
- none
+none
 
 Related commands
 """"""""""""""""
@@ -143,25 +145,14 @@ Related commands
 
 .. _PL1:
 
-
-
 **(Paula Leite2017)** Paula Leite, Santos-Florez, and de Koning, Phys Rev E, 96,
 32115 (2017).
 
 .. _PL2:
 
-
-
 **(Paula Leite2016)** Paula Leite , Freitas, Azevedo, and de Koning, J Chem Phys, 126,
 044509 (2016).
 
 .. _Freitas2:
 
-
-
 **(Freitas)** Freitas, Asta, and de Koning, Computational Materials Science, 112, 333 (2016).
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/pair_vashishta.rst b/doc/src/pair_vashishta.rst
index 58baf53143..6fc5cfe015 100644
--- a/doc/src/pair_vashishta.rst
+++ b/doc/src/pair_vashishta.rst
@@ -1,35 +1,33 @@
-.. index:: pair\_style vashishta
+.. index:: pair_style vashishta
 
-pair\_style vashishta command
-=============================
+pair_style vashishta command
+============================
 
-pair\_style vashishta/gpu command
-=================================
-
-pair\_style vashishta/omp command
-=================================
-
-pair\_style vashishta/kk command
+pair_style vashishta/gpu command
 ================================
 
-pair\_style vashishta/table command
-===================================
+pair_style vashishta/omp command
+================================
 
-pair\_style vashishta/table/omp command
-=======================================
+pair_style vashishta/kk command
+===============================
+
+pair_style vashishta/table command
+==================================
+
+pair_style vashishta/table/omp command
+======================================
 
 Syntax
 """"""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    pair_style style args
 
 * style = *vashishta* or *vashishta/table* or *vashishta/omp* or *vashishta/table/omp*
 * args = list of arguments for a particular style
 
-
 .. parsed-literal::
 
      *vashishta* or *vashishta/omp* args = none
@@ -40,14 +38,13 @@ Syntax
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    pair_style vashishta
-   pair_coeff \* \* SiC.vashishta Si C
+   pair_coeff * * SiC.vashishta Si C
 
    pair_style vashishta/table 100000 0.2
-   pair_coeff \* \* SiC.vashishta Si C
+   pair_coeff * * SiC.vashishta Si C
 
 Description
 """""""""""
@@ -63,16 +60,20 @@ including SiO2 :ref:`Vashishta1990 <Vashishta1990>`, SiC
 
 The potential for the energy U of a system of atoms is
 
-.. image:: Eqs/pair_vashishta.jpg
-   :align: center
+.. math::
+
+   U & =  \sum_i^N \sum_{j > i}^N U_{ij}^{(2)} (r_{ij}) + \sum_i^N \sum_{j \neq i}^N \sum_{k > j, k \neq i}^N U_{ijk}^{(3)} (r_{ij}, r_{ik}, \theta_{ijk}) \\
+   U_{ij}^{(2)} (r) & =   \frac{H_{ij}}{r^{\eta_{ij}}} + \frac{Z_i Z_j}{r}\exp(-r/\lambda_{1,ij}) - \frac{D_{ij}}{r^4}\exp(-r/\lambda_{4,ij}) - \frac{W_{ij}}{r^6}, r < r_{c,{ij}} \\
+   U_{ijk}^{(3)}(r_{ij},r_{ik},\theta_{ijk}) & =  B_{ijk} \frac{\left[ \cos \theta_{ijk} - \cos \theta_{0ijk} \right]^2} {1+C_{ijk}\left[ \cos \theta_{ijk} - \cos \theta_{0ijk} \right]^2} \times \\
+                    &  \exp \left( \frac{\gamma_{ij}}{r_{ij} - r_{0,ij}} \right) \exp \left( \frac{\gamma_{ik}}{r_{ik} - r_{0,ik}} \right), r_{ij} < r_{0,ij}, r_{ik} < r_{0,ik}
 
 where we follow the notation used in :ref:`Branicio2009 <Branicio2009>`.
-U2 is a two-body term and U3 is a three-body term.  The
+:math:`U^2` is a two-body term and U3 is a three-body term.  The
 summation over two-body terms is over all neighbors J within
-a cutoff distance = *rc*\ .  The twobody terms are shifted and
+a cutoff distance = :math:`r_c`.  The twobody terms are shifted and
 tilted by a linear function so that the energy and force are
-both zero at *rc*\ . The summation over three-body terms
-is over all neighbors J and K within a cut-off distance = *r0*\ ,
+both zero at :math:`r_c`. The summation over three-body terms
+is over all neighbors *i* and *k* within a cut-off distance :math:`= r_0`,
 where the exponential screening function becomes zero.
 
 The *vashishta* style computes these formulas analytically.  The
@@ -86,10 +87,10 @@ with moderate to little loss of accuracy for Ntable values
 between 10000 and 1000000. It is not recommended to use less than
 5000 tabulation points.
 
-Only a single pair\_coeff command is used with either style which
+Only a single pair_coeff command is used with either style which
 specifies a Vashishta potential file with parameters for all needed
 elements.  These are mapped to LAMMPS atom types by specifying N
-additional arguments after the filename in the pair\_coeff command,
+additional arguments after the filename in the pair_coeff command,
 where N is the number of LAMMPS atom types:
 
 * filename
@@ -101,12 +102,11 @@ to specify the path for the potential file.
 As an example, imagine a file SiC.vashishta has parameters for
 Si and C.  If your LAMMPS simulation has 4 atoms types and you want
 the 1st 3 to be Si, and the 4th to be C, you would use the following
-pair\_coeff command:
+pair_coeff command:
 
+.. code-block:: LAMMPS
 
-.. parsed-literal::
-
-   pair_coeff \* \* SiC.vashishta Si Si Si C
+   pair_coeff * * SiC.vashishta Si Si Si C
 
 The 1st 2 arguments must be \* \* so as to span all LAMMPS atom types.
 The first three Si arguments map LAMMPS atom types 1,2,3 to the Si
@@ -126,24 +126,24 @@ and three-body coefficients in the formulae above:
 * element 1 (the center atom in a 3-body interaction)
 * element 2
 * element 3
-* H (energy units)
-* eta
-* Zi (electron charge units)
-* Zj (electron charge units)
-* lambda1 (distance units)
-* D (energy units)
-* lambda4 (distance units)
-* W (energy units)
-* rc (distance units)
-* B (energy units)
-* gamma
-* r0 (distance units)
-* C
-* costheta0
+* *H* (energy units)
+* :math:`\eta`
+* :math:`Z_i` (electron charge units)
+* :math:`Z_j` (electron charge units)
+* :math:`\lambda_1` (distance units)
+* *D* (energy units)
+* :math:`\lambda_4` (distance units)
+* *W* (energy units)
+* :math:`r_c` (distance units)
+* *B* (energy units)
+* :math:`\gamma`
+* :math:`r_0` (distance units)
+* *C*
+* :math:`\cos\theta_0`
 
 The non-annotated parameters are unitless.  The Vashishta potential
 file must contain entries for all the elements listed in the
-pair\_coeff command.  It can also contain entries for additional
+pair_coeff command.  It can also contain entries for additional
 elements not being used in a particular simulation; LAMMPS ignores
 those entries.  For a single-element simulation, only a single entry
 is required (e.g. SiSiSi).  For a two-element simulation, the file
@@ -159,12 +159,14 @@ unambiguous, general, and simple to code, LAMMPS uses a slightly
 confusing method for specifying parameters.  All parameters are
 divided into two classes: two-body and three-body.  Two-body and
 three-body parameters are handled differently, as described below.
-The two-body parameters are H, eta, lambda1, D, lambda4, W, rc, gamma,
-and r0.  They appear in the above formulae with two subscripts.  The
-parameters Zi and Zj are also classified as two-body parameters, even
-though they only have 1 subscript.  The three-body parameters are B,
-C, costheta0.  They appear in the above formulae with three
-subscripts.  Two-body and three-body parameters are handled
+The two-body parameters are *H*\ , :math:`\eta`, :math:`\lambda_1`,
+*D*\ , :math:`\lambda_4`, *W*, :math:`r_c`, :math:`\gamma`,
+and :math:`r_0`.  They appear in the above formulae with two subscripts.
+The parameters :math:`Z_i` and :math:`Z_j` are also classified
+as two-body parameters, even
+though they only have 1 subscript.  The three-body parameters are *B*\ ,
+*C*\ , :math:`\cos\theta_0`.  They appear in the above formulae with
+three subscripts.  Two-body and three-body parameters are handled
 differently, as described below.
 
 The first element in each entry is the center atom in a three-body
@@ -184,14 +186,13 @@ ensure that these values are equal. Two-body parameters appearing in
 entries where the 2nd and 3rd elements are different are stored but
 never used. It is good practice to enter zero for these values. Note
 that the three-body function U3 above contains the two-body parameters
-gamma and r0. So U3 for a central C atom bonded to an Si atom and a
+:math:`\gamma` and :math:`r_0`. So U3 for a central C atom bonded to
+an Si atom and a
 second C atom will take three-body parameters from the CSiC entry, but
 two-body parameters from the CCC and CSiSi entries.
 
-
 ----------
 
-
 Styles with a *gpu*\ , *intel*\ , *kk*\ , *omp*\ , or *opt* suffix are
 functionally the same as the corresponding style without the suffix.
 They have been optimized to run faster, depending on your available
@@ -210,10 +211,8 @@ by including their suffix, or you can use the :doc:`-suffix command-line switch
 See the :doc:`Speed packages <Speed_packages>` doc page for more
 instructions on how to use the accelerated styles effectively.
 
-
 ----------
 
-
 **Mixing, shift, table, tail correction, restart, rRESPA info**\ :
 
 For atom type pairs I,J and I != J, where types I and J correspond to
@@ -224,21 +223,18 @@ This pair style does not support the :doc:`pair_modify <pair_modify>`
 shift, table, and tail options.
 
 This pair style does not write its information to :doc:`binary restart files <restart>`, since it is stored in potential files.  Thus, you
-need to re-specify the pair\_style and pair\_coeff commands in an input
+need to re-specify the pair_style and pair_coeff commands in an input
 script that reads a restart file.
 
 This pair style can only be used via the *pair* keyword of the
 :doc:`run_style respa <run_style>` command.  It does not support the
 *inner*\ , *middle*\ , *outer* keywords.
 
-
 ----------
 
-
 Restrictions
 """"""""""""
 
-
 These pair style are part of the MANYBODY package.  They is only
 enabled if LAMMPS was built with that package.  See the :doc:`Build package <Build_package>` doc page for more info.
 
@@ -249,7 +245,7 @@ The Vashishta potential files provided with LAMMPS (see the potentials
 directory) are parameterized for metal :doc:`units <units>`.  You can
 use the Vashishta potential with any LAMMPS units, but you would need
 to create your own potential file with coefficients listed in the
-appropriate units if your simulation doesn't use "metal" units.
+appropriate units if your simulation does not use "metal" units.
 
 Related commands
 """"""""""""""""
@@ -258,32 +254,19 @@ Related commands
 
 **Default:** none
 
-
 ----------
 
-
 .. _Vashishta1990:
 
-
-
 **(Vashishta1990)** P. Vashishta, R. K. Kalia, J. P. Rino, Phys. Rev. B
 41, 12197 (1990).
 
 .. _Vashishta2007:
 
-
-
 **(Vashishta2007)** P. Vashishta, R. K. Kalia, A. Nakano,
 J. P. Rino. J. Appl. Phys. 101, 103515 (2007).
 
 .. _Branicio2009:
 
-
-
 **(Branicio2009)** Branicio, Rino, Gan and Tsuzuki, J. Phys Condensed
 Matter 21 (2009) 095002
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/pair_write.rst b/doc/src/pair_write.rst
index eff77b4d68..acb6de4f13 100644
--- a/doc/src/pair_write.rst
+++ b/doc/src/pair_write.rst
@@ -1,13 +1,12 @@
-.. index:: pair\_write
+.. index:: pair_write
 
-pair\_write command
-===================
+pair_write command
+==================
 
 Syntax
 """"""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    pair_write itype jtype N style inner outer file keyword Qi Qj
 
@@ -22,8 +21,7 @@ Syntax
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    pair_write 1 3 500 r 1.0 10.0 table.txt LJ
    pair_write 1 1 1000 rsq 2.0 8.0 table.txt Yukawa_1_1 -0.5 0.5
@@ -67,14 +65,13 @@ and a force (in force units).
 Restrictions
 """"""""""""
 
-
 All force field coefficients for pair and other kinds of interactions
 must be set before this command can be invoked.
 
 Due to how the pairwise force is computed, an inner value > 0.0 must
 be specified even if the potential has a finite value at r = 0.0.
 
-For EAM potentials, the pair\_write command only tabulates the
+For EAM potentials, the pair_write command only tabulates the
 pairwise portion of the potential, not the embedding portion.
 
 Related commands
@@ -84,8 +81,3 @@ Related commands
 :doc:`pair_style <pair_style>`, :doc:`pair_coeff <pair_coeff>`
 
 **Default:** none
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/pair_yukawa.rst b/doc/src/pair_yukawa.rst
index a4a96b15c3..fad035ed4b 100644
--- a/doc/src/pair_yukawa.rst
+++ b/doc/src/pair_yukawa.rst
@@ -1,22 +1,21 @@
-.. index:: pair\_style yukawa
+.. index:: pair_style yukawa
 
-pair\_style yukawa command
-==========================
+pair_style yukawa command
+=========================
 
-pair\_style yukawa/gpu command
-==============================
-
-pair\_style yukawa/omp command
-==============================
-
-pair\_style yukawa/kk command
+pair_style yukawa/gpu command
 =============================
 
+pair_style yukawa/omp command
+=============================
+
+pair_style yukawa/kk command
+============================
+
 Syntax
 """"""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    pair_style yukawa kappa cutoff
 
@@ -26,22 +25,22 @@ Syntax
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    pair_style yukawa 2.0 2.5
    pair_coeff 1 1 100.0 2.3
-   pair_coeff \* \* 100.0
+   pair_coeff * * 100.0
 
 Description
 """""""""""
 
 Style *yukawa* computes pairwise interactions with the formula
 
-.. image:: Eqs/pair_yukawa.jpg
-   :align: center
+.. math::
 
-Rc is the cutoff.
+   E = A \frac{e^{- \kappa r}}{r} \qquad r < r_c
+
+:math:`r_c` is the cutoff.
 
 The following coefficients must be defined for each pair of atoms
 types via the :doc:`pair_coeff <pair_coeff>` command as in the examples
@@ -55,10 +54,8 @@ commands, or by mixing as described below:
 The last coefficient is optional.  If not specified, the global yukawa
 cutoff is used.
 
-
 ----------
 
-
 Styles with a *gpu*\ , *intel*\ , *kk*\ , *omp*\ , or *opt* suffix are
 functionally the same as the corresponding style without the suffix.
 They have been optimized to run faster, depending on your available
@@ -77,16 +74,14 @@ by including their suffix, or you can use the :doc:`-suffix command-line switch
 See the :doc:`Speed packages <Speed_packages>` doc page for more
 instructions on how to use the accelerated styles effectively.
 
-
 ----------
 
-
 **Mixing, shift, table, tail correction, restart, rRESPA info**\ :
 
 For atom type pairs I,J and I != J, the A coefficient and cutoff
 distance for this pair style can be mixed.  A is an energy value mixed
 like a LJ epsilon.  The default mix value is *geometric*\ .  See the
-"pair\_modify" command for details.
+"pair_modify" command for details.
 
 This pair style supports the :doc:`pair_modify <pair_modify>` shift
 option for the energy of the pair interaction.
@@ -98,17 +93,15 @@ This pair style does not support the :doc:`pair_modify <pair_modify>`
 tail option for adding long-range tail corrections to energy and
 pressure.
 
-This pair style writes its information to :doc:`binary restart files <restart>`, so pair\_style and pair\_coeff commands do not need
+This pair style writes its information to :doc:`binary restart files <restart>`, so pair_style and pair_coeff commands do not need
 to be specified in an input script that reads a restart file.
 
 This pair style can only be used via the *pair* keyword of the
 :doc:`run_style respa <run_style>` command.  It does not support the
 *inner*\ , *middle*\ , *outer* keywords.
 
-
 ----------
 
-
 Restrictions
 """"""""""""
  none
@@ -119,8 +112,3 @@ Related commands
 :doc:`pair_coeff <pair_coeff>`
 
 **Default:** none
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/pair_yukawa_colloid.rst b/doc/src/pair_yukawa_colloid.rst
index 74fa1e7e78..f775f37703 100644
--- a/doc/src/pair_yukawa_colloid.rst
+++ b/doc/src/pair_yukawa_colloid.rst
@@ -1,19 +1,18 @@
-.. index:: pair\_style yukawa/colloid
+.. index:: pair_style yukawa/colloid
 
-pair\_style yukawa/colloid command
-==================================
+pair_style yukawa/colloid command
+=================================
 
-pair\_style yukawa/colloid/gpu command
-======================================
+pair_style yukawa/colloid/gpu command
+=====================================
 
-pair\_style yukawa/colloid/omp command
-======================================
+pair_style yukawa/colloid/omp command
+=====================================
 
 Syntax
 """"""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    pair_style yukawa/colloid kappa cutoff
 
@@ -23,33 +22,33 @@ Syntax
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    pair_style yukawa/colloid 2.0 2.5
    pair_coeff 1 1 100.0 2.3
-   pair_coeff \* \* 100.0
+   pair_coeff * * 100.0
 
 Description
 """""""""""
 
 Style *yukawa/colloid* computes pairwise interactions with the formula
 
-.. image:: Eqs/pair_yukawa_colloid.jpg
-   :align: center
+.. math::
 
-where Ri and Rj are the radii of the two particles and Rc is the
-cutoff.
+   E = \frac{A}{\kappa} e^{- \kappa (r - (r_i + r_j))} \qquad r < r_c
+
+where :math:`r_i` and :math:`r_j` are the radii of the two particles
+and :math:`r_c` is the cutoff.
 
 In contrast to :doc:`pair_style yukawa <pair_yukawa>`, this functional
 form arises from the Coulombic interaction between two colloid
 particles, screened due to the presence of an electrolyte, see the
 book by :ref:`Safran <Safran>` for a derivation in the context of DLVO
-theory.  :doc:`Pair\_style yukawa <pair_yukawa>` is a screened Coulombic
+theory.  :doc:`Pair_style yukawa <pair_yukawa>` is a screened Coulombic
 potential between two point-charges and uses no such approximation.
 
 This potential applies to nearby particle pairs for which the Derjagin
-approximation holds, meaning h << Ri + Rj, where h is the
+approximation holds, meaning :math:`h << r_i + r_j`, where *h* is the
 surface-to-surface separation of the two particles.
 
 When used in combination with :doc:`pair_style colloid <pair_colloid>`,
@@ -71,26 +70,23 @@ that the A for this potential style has different units than the A
 used in :doc:`pair_style yukawa <pair_yukawa>`.  For low surface
 potentials, i.e. less than about 25 mV, A can be written as:
 
+.. math::
 
-.. parsed-literal::
-
-   A = 2 \* PI \* R\*eps\*eps0 \* kappa \* psi\^2
+   A = 2 \pi R\varepsilon\varepsilon_0 \kappa \psi^2
 
 where
 
-* R = colloid radius (distance units)
-* eps0 = permittivity of free space (charge\^2/energy/distance units)
-* eps = relative permittivity of fluid medium (dimensionless)
-* kappa = inverse screening length (1/distance units)
-* psi = surface potential (energy/charge units)
+* *R* = colloid radius (distance units)
+* :math:`\varepsilon_0` = permittivity of free space (charge\^2/energy/distance units)
+* :math:`\varepsilon` = relative permittivity of fluid medium (dimensionless)
+* :math:`\kappa` = inverse screening length (1/distance units)
+* :math:`\psi` = surface potential (energy/charge units)
 
 The last coefficient is optional.  If not specified, the global
 yukawa/colloid cutoff is used.
 
-
 ----------
 
-
 Styles with a *gpu*\ , *intel*\ , *kk*\ , *omp*\ , or *opt* suffix are
 functionally the same as the corresponding style without the suffix.
 They have been optimized to run faster, depending on your available
@@ -109,16 +105,14 @@ by including their suffix, or you can use the :doc:`-suffix command-line switch
 See the :doc:`Speed packages <Speed_packages>` doc page for more
 instructions on how to use the accelerated styles effectively.
 
-
 ----------
 
-
 **Mixing, shift, table, tail correction, restart, rRESPA info**\ :
 
 For atom type pairs I,J and I != J, the A coefficient and cutoff
 distance for this pair style can be mixed.  A is an energy value mixed
 like a LJ epsilon.  The default mix value is *geometric*\ .  See the
-"pair\_modify" command for details.
+"pair_modify" command for details.
 
 This pair style supports the :doc:`pair_modify <pair_modify>` shift
 option for the energy of the pair interaction.
@@ -130,21 +124,18 @@ This pair style does not support the :doc:`pair_modify <pair_modify>`
 tail option for adding long-range tail corrections to energy and
 pressure.
 
-This pair style writes its information to :doc:`binary restart files <restart>`, so pair\_style and pair\_coeff commands do not need
+This pair style writes its information to :doc:`binary restart files <restart>`, so pair_style and pair_coeff commands do not need
 to be specified in an input script that reads a restart file.
 
 This pair style can only be used via the *pair* keyword of the
 :doc:`run_style respa <run_style>` command.  It does not support the
 *inner*\ , *middle*\ , *outer* keywords.
 
-
 ----------
 
-
 Restrictions
 """"""""""""
 
-
 This style is part of the COLLOID package.  It is only enabled if
 LAMMPS was built with that package.  See the :doc:`Build package <Build_package>` doc page for more info.
 
@@ -164,18 +155,9 @@ Related commands
 
 **Default:** none
 
-
 ----------
 
-
 .. _Safran:
 
-
-
 **(Safran)** Safran, Statistical Thermodynamics of Surfaces, Interfaces,
 And Membranes, Westview Press, ISBN: 978-0813340791 (2003).
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/pair_zbl.rst b/doc/src/pair_zbl.rst
index 4d08418ce8..26960f71b3 100644
--- a/doc/src/pair_zbl.rst
+++ b/doc/src/pair_zbl.rst
@@ -1,22 +1,21 @@
-.. index:: pair\_style zbl
+.. index:: pair_style zbl
 
-pair\_style zbl command
-=======================
+pair_style zbl command
+======================
 
-pair\_style zbl/gpu command
-===========================
-
-pair\_style zbl/kk command
+pair_style zbl/gpu command
 ==========================
 
-pair\_style zbl/omp command
-===========================
+pair_style zbl/kk command
+=========================
+
+pair_style zbl/omp command
+==========================
 
 Syntax
 """"""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    pair_style zbl inner outer
 
@@ -26,11 +25,10 @@ Syntax
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    pair_style zbl 3.0 4.0
-   pair_coeff \* \* 73.0 73.0
+   pair_coeff * * 73.0 73.0
    pair_coeff 1 1 14.0 14.0
 
 Description
@@ -41,14 +39,18 @@ repulsion for describing high-energy collisions between atoms.
 :ref:`(Ziegler) <Ziegler>`. It includes an additional switching function
 that ramps the energy, force, and curvature smoothly to zero
 between an inner and outer cutoff. The potential
-energy due to a pair of atoms at a distance r\_ij is given by:
+energy due to a pair of atoms at a distance r_ij is given by:
 
-.. image:: Eqs/pair_zbl.jpg
-   :align: center
+.. math::
 
-where e is the electron charge, epsilon\_0 is the electrical
-permittivity of vacuum, and Z\_i and Z\_j are the nuclear charges of the
-two atoms.  The switching function S(r) is identical to that used by
+   E^{ZBL}_{ij} & = \frac{1}{4\pi\epsilon_0} \frac{Z_i Z_j \,e^2}{r_{ij}} \phi(r_{ij}/a)+ S(r_{ij})\\
+   a & =  \frac{0.46850}{Z_{i}^{0.23} + Z_{j}^{0.23}}\\
+   \phi(x) & =  0.18175e^{-3.19980x} + 0.50986e^{-0.94229x} + 0.28022e^{-0.40290x} + 0.02817e^{-0.20162x}\\
+
+where *e* is the electron charge, :math:`\epsilon_0` is the electrical
+permittivity of vacuum, and :math:`Z_i` and :math:`Z_j` are the nuclear
+charges of the
+two atoms.  The switching function :math:`S(r)` is identical to that used by
 :doc:`pair_style lj/gromacs <pair_gromacs>`.  Here, the inner and outer
 cutoff are the same for all pairs of atom types.
 
@@ -56,19 +58,20 @@ The following coefficients must be defined for each pair of atom types
 via the :doc:`pair_coeff <pair_coeff>` command as in the examples above,
 or in the LAMMPS data file.
 
-* Z\_i (atomic number for first atom type, e.g. 13.0 for aluminum)
+* :math:`Z_i` (atomic number for first atom type, e.g. 13.0 for aluminum)
 
-* Z\_j (ditto for second atom type)
+* :math:`Z_j` (ditto for second atom type)
 
-The values of Z\_i and Z\_j are normally equal to the atomic
+The values of :math:`Z_i` and :math:`Z_j` are normally equal to the atomic
 numbers of the two atom types. Thus, the user may optionally
-specify only the coefficients for each I==I pair, and rely
+specify only the coefficients for each :math:`i==i` pair, and rely
 on the obvious mixing rule for cross interactions (see below).
-Note that when I==I it is required that Z\_i == Z\_j. When used
-with :doc:`hybrid/overlay <pair_hybrid>` and pairs are assigned
+Note that when :math:`i==i` it is required that :math:`Z_i == Z_j`.
+When used with :doc:`hybrid/overlay <pair_hybrid>` and pairs are
+assigned
 to more than one sub-style, the mixing rule is not used and
 each pair of types interacting with the ZBL sub-style must
-be included in a pair\_coeff command.
+be included in a pair_coeff command.
 
 .. note::
 
@@ -80,10 +83,8 @@ be included in a pair\_coeff command.
    always be given as multiples of a proton's charge, e.g. 29.0 for
    copper.
 
-
 ----------
 
-
 Styles with a *gpu*\ , *intel*\ , *kk*\ , *omp*\ , or *opt* suffix are
 functionally the same as the corresponding style without the suffix.
 They have been optimized to run faster, depending on your available
@@ -102,19 +103,19 @@ by including their suffix, or you can use the :doc:`-suffix command-line switch
 See the :doc:`Speed packages <Speed_packages>` doc page for more
 instructions on how to use the accelerated styles effectively.
 
-
 ----------
 
-
 **Mixing, shift, table, tail correction, restart, rRESPA info**\ :
 
-For atom type pairs I,J and I != J, the Z\_i and Z\_j coefficients
-can be mixed by taking Z\_i and Z\_j from the values specified for
-I == I and J == J cases. When used
+For atom type pairs *i,j* and :math:`i \neq i`, the :math:`Z_i` and
+:math:`Z_j` coefficients
+can be mixed by taking :math:`Z_i` and :math:`Z_j` from the values
+specified for
+:math:`i == i` and :math:`j == j` cases. When used
 with :doc:`hybrid/overlay <pair_hybrid>` and pairs are assigned
 to more than one sub-style, the mixing rule is not used and
 each pair of types interacting with the ZBL sub-style
-must be included in a pair\_coeff command.
+must be included in a pair_coeff command.
 The :doc:`pair_modify <pair_modify>` mix option has no effect on
 the mixing behavior
 
@@ -130,17 +131,15 @@ tail option for adding long-range tail corrections to energy and
 pressure, since there are no corrections for a potential that goes to
 0.0 at the cutoff.
 
-This pair style does not write information to :doc:`binary restart files <restart>`, so pair\_style and pair\_coeff commands must be
+This pair style does not write information to :doc:`binary restart files <restart>`, so pair_style and pair_coeff commands must be
 specified in an input script that reads a restart file.
 
 This pair style can only be used via the *pair* keyword of the
 :doc:`run_style respa <run_style>` command.  It does not support the
 *inner*\ , *middle*\ , *outer* keywords.
 
-
 ----------
 
-
 Restrictions
 """"""""""""
  none
@@ -152,18 +151,9 @@ Related commands
 
 **Default:** none
 
-
 ----------
 
-
 .. _Ziegler:
 
-
-
 **(Ziegler)** J.F. Ziegler, J. P. Biersack and U. Littmark, "The
 Stopping and Range of Ions in Matter," Volume 1, Pergamon, 1985.
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/pair_zero.rst b/doc/src/pair_zero.rst
index 18afdbf355..a704cf92f2 100644
--- a/doc/src/pair_zero.rst
+++ b/doc/src/pair_zero.rst
@@ -1,30 +1,28 @@
-.. index:: pair\_style zero
+.. index:: pair_style zero
 
-pair\_style zero command
-========================
+pair_style zero command
+=======================
 
 Syntax
 """"""
 
+.. code-block:: LAMMPS
 
-.. parsed-literal::
-
-   pair_style zero cutoff *nocoeff*
+   pair_style zero cutoff [nocoeff]
 
 * zero = style name of this pair style
 * cutoff = global cutoff (distance units)
-* nocoeff = ignore all pair\_coeff parameters (optional)
+* nocoeff = ignore all pair_coeff parameters (optional)
 
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    pair_style zero 10.0
    pair_style zero 5.0 nocoeff
-   pair_coeff \* \*
-   pair_coeff 1 2\*4 3.0
+   pair_coeff * *
+   pair_coeff 1 2*4 3.0
 
 Description
 """""""""""
@@ -43,7 +41,7 @@ used to insure communication of ghost atoms even when a pair style is
 not defined, but it will not trigger neighbor list generation.
 
 The optional *nocoeff* flag allows to read data files with a PairCoeff
-section for any pair style. Similarly, any pair\_coeff commands
+section for any pair style. Similarly, any pair_coeff commands
 will only be checked for the atom type numbers and the rest ignored.
 In this case, only the global cutoff will be used.
 
@@ -56,35 +54,31 @@ commands, or by mixing as described below:
 * cutoff (distance units)
 
 This coefficient is optional.  If not specified, the global cutoff
-specified in the pair\_style command is used. If the pair\_style has
+specified in the pair_style command is used. If the pair_style has
 been specified with the optional *nocoeff* flag, then a cutoff
 pair coefficient is ignored.
 
-
 ----------
 
-
 **Mixing, shift, table, tail correction, restart, rRESPA info**\ :
 
 The cutoff distance for this pair style can be mixed.  The default mix
-value is *geometric*\ .  See the "pair\_modify" command for details.
+value is *geometric*\ .  See the "pair_modify" command for details.
 
 This pair style does not support the :doc:`pair_modify <pair_modify>`
 shift, table, and tail options.
 
-This pair style writes its information to :doc:`binary restart files <restart>`, so pair\_style and pair\_coeff commands do not need
+This pair style writes its information to :doc:`binary restart files <restart>`, so pair_style and pair_coeff commands do not need
 to be specified in an input script that reads a restart file.
 
 This pair style supports the use of the *inner*\ , *middle*\ ,
 and *outer* keywords of the :doc:`run_style respa <run_style>` command.
 
-
 ----------
 
-
 Restrictions
 """"""""""""
- none
+none
 
 Related commands
 """"""""""""""""
@@ -92,8 +86,3 @@ Related commands
 :doc:`pair_style none <pair_none>`
 
 **Default:** none
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/pairs.rst b/doc/src/pairs.rst
index 4fdf2b2c69..b764c74cc7 100644
--- a/doc/src/pairs.rst
+++ b/doc/src/pairs.rst
@@ -1,7 +1,6 @@
 Pair Styles
 ###########
 
-
 .. toctree::
    :maxdepth: 1
    :glob:
diff --git a/doc/src/partition.rst b/doc/src/partition.rst
index 7ee6d76f3c..be0e1152f5 100644
--- a/doc/src/partition.rst
+++ b/doc/src/partition.rst
@@ -6,7 +6,6 @@ partition command
 Syntax
 """"""
 
-
 .. parsed-literal::
 
    partition style N command ...
@@ -18,13 +17,12 @@ Syntax
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    partition yes 1 processors 4 10 6
    partition no 5 print "Active partition"
-   partition yes \*5 fix all nve
-   partition yes 6\* fix all nvt temp 1.0 1.0 0.1
+   partition yes *5 fix all nve
+   partition yes 6* fix all nvt temp 1.0 1.0 0.1
 
 Description
 """""""""""
@@ -61,7 +59,7 @@ from 1 to n (inclusive).  A trailing asterisk means all partitions
 from n to Np (inclusive).  A middle asterisk means all partitions from
 m to n (inclusive).
 
-This command can be useful for the "run\_style verlet/split" command
+This command can be useful for the "run_style verlet/split" command
 which imposed requirements on how the :doc:`processors <processors>`
 command lays out a 3d grid of processors in each of 2 partitions.
 
@@ -75,8 +73,3 @@ Related commands
 :doc:`run_style verlet/split <run_style>`
 
 **Default:** none
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/prd.rst b/doc/src/prd.rst
index a53f8d561e..c3bd1ad1d3 100644
--- a/doc/src/prd.rst
+++ b/doc/src/prd.rst
@@ -6,23 +6,22 @@ prd command
 Syntax
 """"""
 
-
 .. parsed-literal::
 
    prd N t_event n_dephase t_dephase t_correlate compute-ID seed keyword value ...
 
 * N = # of timesteps to run (not including dephasing/quenching)
-* t\_event = timestep interval between event checks
-* n\_dephase = number of velocity randomizations to perform in each dephase run
-* t\_dephase = number of timesteps to run dynamics after each velocity randomization during dephase
-* t\_correlate = number of timesteps within which 2 consecutive events are considered to be correlated
+* t_event = timestep interval between event checks
+* n_dephase = number of velocity randomizations to perform in each dephase run
+* t_dephase = number of timesteps to run dynamics after each velocity randomization during dephase
+* t_correlate = number of timesteps within which 2 consecutive events are considered to be correlated
 * compute-ID = ID of the compute used for event detection
-* random\_seed = random # seed (positive integer)
+* random_seed = random # seed (positive integer)
 * zero or more keyword/value pairs may be appended
 * keyword = *min* or *temp* or *vel*
-  
+
   .. parsed-literal::
-  
+
        *min* values = etol ftol maxiter maxeval
          etol = stopping tolerance for energy, used in quenching
          ftol = stopping tolerance for force, used in quenching
@@ -37,13 +36,10 @@ Syntax
          *steps* = simulation runs for N timesteps on each replica (default)
          *clock* = simulation runs for N timesteps across all replicas
 
-
-
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    prd 5000 100 10 10 100 1 54982
    prd 5000 100 10 10 100 1 54982 min 0.1 0.1 100 200
@@ -100,7 +96,6 @@ A PRD run has several stages, which are repeated each time an "event"
 occurs in one of the replicas, as explained below.  The logic for a
 PRD run is as follows:
 
-
 .. parsed-literal::
 
    while (time remains):
@@ -124,9 +119,9 @@ storing the resulting coordinates for reference.
 In the first stage, dephasing is performed by each replica
 independently to eliminate correlations between replicas.  This is
 done by choosing a random set of velocities, based on the
-*random\_seed* that is specified, and running *t\_dephase* timesteps of
-dynamics.  This is repeated *n\_dephase* times.  At each of the
-*n\_dephase* stages, if an event occurs during the *t\_dephase* steps of
+*random_seed* that is specified, and running *t_dephase* timesteps of
+dynamics.  This is repeated *n_dephase* times.  At each of the
+*n_dephase* stages, if an event occurs during the *t_dephase* steps of
 dynamics for a particular replica, the replica repeats the stage until
 no event occurs.
 
@@ -138,7 +133,7 @@ The style of velocity randomization is controlled using the keyword
 in the :doc:`velocity <velocity>` command.
 
 In the second stage, each replica runs dynamics continuously, stopping
-every *t\_event* steps to check if a transition event has occurred.
+every *t_event* steps to check if a transition event has occurred.
 This check is performed by quenching the system and comparing the
 resulting atom coordinates to the coordinates from the previous basin.
 The first time through the PRD loop, the "previous basin" is the set
@@ -163,8 +158,8 @@ distance.  If so, an "event" has occurred.
 
 In the third stage, the replica on which the event occurred (event
 replica) continues to run dynamics to search for correlated events.
-This is done by running dynamics for *t\_correlate* steps, quenching
-every *t\_event* steps, and checking if another event has occurred.
+This is done by running dynamics for *t_correlate* steps, quenching
+every *t_event* steps, and checking if another event has occurred.
 
 The first time no correlated event occurs, the final state of the
 event replica is shared with all replicas, the new basin reference
@@ -186,10 +181,8 @@ elapsed.  This aggregate time is the "clock" time defined below, which
 typically advances nearly M times faster than the timestepping on a
 single replica, where M is the number of replicas.
 
-
 ----------
 
-
 Four kinds of output can be generated during a PRD run: event
 statistics, thermodynamic output by each replica, dump files, and
 restart files.
@@ -237,19 +230,17 @@ when a correlated event occurs during the third stage of the loop
 listed above, i.e. when only one replica is running dynamics.
 
 When more than one replica detects an event at the end of the same
-event check (every *t\_event* steps) during the second stage, then
+event check (every *t_event* steps) during the second stage, then
 one of them is chosen at random.  The number of coincident events is
 the number of replicas that detected an event.  Normally, this value
 should be 1.  If it is often greater than 1, then either the number of
-replicas is too large, or *t\_event* is too large.
+replicas is too large, or *t_event* is too large.
 
 The replica number is the ID of the replica (from 0 to M-1) in which
 the event occurred.
 
-
 ----------
 
-
 When running on multiple partitions, LAMMPS produces additional log
 files for each partition, e.g. log.lammps.0, log.lammps.1, etc.  For
 the PRD command, these contain the thermodynamic output for each
@@ -262,10 +253,8 @@ After the PRD command completes, timing statistics for the PRD run are
 printed in each replica's log file, giving a breakdown of how much CPU
 time was spent in each stage (dephasing, dynamics, quenching, etc).
 
-
 ----------
 
-
 Any :doc:`dump files <dump>` defined in the input script, will be
 written to during a PRD run at timesteps corresponding to both
 uncorrelated and correlated events.  This means the requested dump
@@ -280,19 +269,17 @@ snapshot corresponding to the initial minimum state used for event
 detection is written to the dump file at the beginning of each PRD
 run.
 
-
 ----------
 
-
 If the :doc:`restart <restart>` command is used, a single restart file
 for all the partitions is generated, which allows a PRD run to be
 continued by a new input script in the usual manner.
 
 The restart file is generated at the end of the loop listed above.  If
 no correlated events are found, this means it contains a snapshot of
-the system at time T + *t\_correlate*, where T is the time at which the
+the system at time T + *t_correlate*, where T is the time at which the
 uncorrelated event occurred.  If correlated events were found, then it
-contains a snapshot of the system at time T + *t\_correlate*, where T
+contains a snapshot of the system at time T + *t_correlate*, where T
 is the time of the last correlated event.
 
 The restart frequency specified in the :doc:`restart <restart>` command
@@ -305,24 +292,21 @@ event.
 
 When an input script reads a restart file from a previous PRD run, the
 new script can be run on a different number of replicas or processors.
-However, it is assumed that *t\_correlate* in the new PRD command is
+However, it is assumed that *t_correlate* in the new PRD command is
 the same as it was previously.  If not, the calculation of the "clock"
 value for the first event in the new run will be slightly off.
 
-
 ----------
 
-
 Restrictions
 """"""""""""
 
-
 This command can only be used if LAMMPS was built with the REPLICA
 package.  See the :doc:`Build package <Build_package>` doc
 page for more info.
 
-The *N* and *t\_correlate* settings must be integer multiples of
-*t\_event*.
+The *N* and *t_correlate* settings must be integer multiples of
+*t_event*.
 
 Runs restarted from restart file written during a PRD run will not
 produce identical results due to changes in the random numbers used
@@ -348,24 +332,13 @@ Default
 The option defaults are min = 0.1 0.1 40 50, no temp setting, vel =
 geom gaussian, and time = steps.
 
-
 ----------
 
-
 .. _Voter1998:
 
-
-
 **(Voter1998)** Voter, Phys Rev B, 57, 13985 (1998).
 
 .. _Voter2002prd:
 
-
-
 **(Voter2002)** Voter, Montalenti, Germann, Annual Review of Materials
 Research 32, 321 (2002).
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/print.rst b/doc/src/print.rst
index 93b1224993..b9ed8555fa 100644
--- a/doc/src/print.rst
+++ b/doc/src/print.rst
@@ -6,7 +6,6 @@ print command
 Syntax
 """"""
 
-
 .. parsed-literal::
 
    print string keyword value
@@ -14,21 +13,18 @@ Syntax
 * string = text string to print, which may contain variables
 * zero or more keyword/value pairs may be appended
 * keyword = *file* or *append* or *screen* or *universe*
-  
+
   .. parsed-literal::
-  
+
        *file* value = filename
        *append* value = filename
        *screen* value = *yes* or *no*
        *universe* value = *yes* or *no*
 
-
-
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    print "Done with equilibration" file info.dat
    print Vol=$v append info.dat screen no
@@ -94,8 +90,3 @@ Default
 """""""
 
 The option defaults are no file output, screen = yes, and universe = no.
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/processors.rst b/doc/src/processors.rst
index 6f593ffc6a..899c87f4b0 100644
--- a/doc/src/processors.rst
+++ b/doc/src/processors.rst
@@ -6,7 +6,6 @@ processors command
 Syntax
 """"""
 
-
 .. parsed-literal::
 
    processors Px Py Pz keyword args ...
@@ -14,9 +13,9 @@ Syntax
 * Px,Py,Pz = # of processors in each dimension of 3d grid overlaying the simulation domain
 * zero or more keyword/arg pairs may be appended
 * keyword = *grid* or *map* or *part* or *file*
-  
+
   .. parsed-literal::
-  
+
        *grid* arg = gstyle params ...
          gstyle = *onelevel* or *twolevel* or *numa* or *custom*
            onelevel params = none
@@ -39,21 +38,18 @@ Syntax
        *file* arg = outfile
          outfile = name of file to write 3d grid of processors to
 
-
-
 Examples
 """"""""
 
+.. code-block:: LAMMPS
 
-.. parsed-literal::
-
-   processors \* \* 5
+   processors * * 5
    processors 2 4 4
-   processors \* \* 8 map xyz
-   processors \* \* \* grid numa
-   processors \* \* \* grid twolevel 4 \* \* 1
+   processors * * 8 map xyz
+   processors * * * grid numa
+   processors * * * grid twolevel 4 * * 1
    processors 4 8 16 grid custom myfile
-   processors \* \* \* part 1 2 multiple
+   processors * * * part 1 2 multiple
 
 Description
 """""""""""
@@ -97,8 +93,7 @@ Px,Py,Pz values for different partitions.
 You can use the :doc:`partition <partition>` command to specify
 different processor grids for different partitions, e.g.
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    partition yes 1 processors 4 4 4
    partition yes 2 processors 2 3 2
@@ -127,10 +122,8 @@ different sizes and shapes which no longer have a logical 3d
 connectivity.  If that occurs, all the information specified by the
 processors command is ignored.
 
-
 ----------
 
-
 The *grid* keyword affects the factorization of P into Px,Py,Pz and it
 can also affect how the P processor IDs are mapped to the 3d grid of
 processors.
@@ -194,7 +187,6 @@ blank or comment lines (starting with a "#" character) can be present.
 The first non-blank, non-comment line should have
 3 values:
 
-
 .. parsed-literal::
 
    Px Py Py
@@ -205,7 +197,6 @@ and the Px, Py, Pz settings of the processors command.
 This line should be immediately followed by
 P = Px\*Py\*Pz lines of the form:
 
-
 .. parsed-literal::
 
    ID I J K
@@ -215,18 +206,16 @@ processors location in the 3d grid.  I must be a number from 1 to Px
 (inclusive) and similarly for J and K.  The P lines can be listed in
 any order, but no processor ID should appear more than once.
 
-
 ----------
 
-
 The *map* keyword affects how the P processor IDs (from 0 to P-1) are
 mapped to the 3d grid of processors.  It is only used by the
 *onelevel* and *twolevel* grid settings.
 
 The *cart* style uses the family of MPI Cartesian functions to perform
-the mapping, namely MPI\_Cart\_create(), MPI\_Cart\_get(),
-MPI\_Cart\_shift(), and MPI\_Cart\_rank().  It invokes the
-MPI\_Cart\_create() function with its reorder flag = 0, so that MPI is
+the mapping, namely MPI_Cart_create(), MPI_Cart_get(),
+MPI_Cart_shift(), and MPI_Cart_rank().  It invokes the
+MPI_Cart_create() function with its reorder flag = 0, so that MPI is
 not free to reorder the processors.
 
 The *cart/reorder* style does the same thing as the *cart* style
@@ -241,7 +230,6 @@ ID in the K direction varies slowest.  For example, if you select
 style *xyz* and you have a 2x2x2 grid of 8 processors, the assignments
 of the 8 octants of the simulation domain will be:
 
-
 .. parsed-literal::
 
    proc 0 = lo x, lo y, lo z octant
@@ -256,7 +244,7 @@ of the 8 octants of the simulation domain will be:
 Note that, in principle, an MPI implementation on a particular machine
 should be aware of both the machine's network topology and the
 specific subset of processors and nodes that were assigned to your
-simulation.  Thus its MPI\_Cart calls can optimize the assignment of
+simulation.  Thus its MPI_Cart calls can optimize the assignment of
 MPI processes to the 3d grid to minimize communication costs.  In
 practice, however, few if any MPI implementations actually do this.
 So it is likely that the *cart* and *cart/reorder* styles simply give
@@ -267,10 +255,8 @@ used to first map the nodes to the 3d grid, then again to the cores
 within each node.  For the latter step, the *cart* and *cart/reorder*
 styles are not supported, so an *xyz* style is used in their place.
 
-
 ----------
 
-
 The *part* keyword affects the factorization of P into Px,Py,Pz.
 
 It can be useful when running in multi-partition mode, e.g. with the
@@ -310,10 +296,8 @@ processors, it could create a 4x2x10 grid, but it will not create a
    this, but your simulation will likely hang in its setup phase if this
    error has been made.
 
-
 ----------
 
-
 The *file* keyword writes the mapping of the factorization of P
 processors and their mapping to the 3d grid to the specified file
 *outfile*\ .  This is useful to check that you assigned physical
@@ -344,19 +328,16 @@ I,J,K are the indices of the processor in the regular 3d grid, each
 from 1 to Nd, where Nd is the number of processors in that dimension
 of the grid.
 
-The *name* is what is returned by a call to MPI\_Get\_processor\_name()
+The *name* is what is returned by a call to MPI_Get_processor_name()
 and should represent an identifier relevant to the physical processors
 in your machine.  Note that depending on the MPI implementation,
 multiple cores can have the same *name*\ .
 
-
 ----------
 
-
 Restrictions
 """"""""""""
 
-
 This command cannot be used after the simulation box is defined by a
 :doc:`read_data <read_data>` or :doc:`create_box <create_box>` command.
 It can be used before a restart file is read to change the 3d
@@ -378,8 +359,3 @@ Default
 
 The option defaults are Px Py Pz = \* \* \*, grid = onelevel, and map =
 cart.
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/python.rst b/doc/src/python.rst
index ea874fbf87..70dfbb70ba 100644
--- a/doc/src/python.rst
+++ b/doc/src/python.rst
@@ -6,16 +6,15 @@ python command
 Syntax
 """"""
 
-
 .. parsed-literal::
 
    python func keyword args ...
 
 * func = name of Python function
 * one or more keyword/args pairs must be appended
-  
+
   .. parsed-literal::
-  
+
      keyword = *invoke* or *input* or *return* or *format* or *length* or *file* or *here* or *exists* or *source*
        *invoke* arg = none = invoke the previously defined Python function
        *input* args = N i1 i2 ... iN
@@ -44,13 +43,10 @@ Syntax
          inline = one or more lines of Python code which will be executed immediately
                   must be a single argument, typically enclosed between triple quotes
 
-
-
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    python pForce input 2 v_x 20.0 return v_f format fff file force.py
    python pForce invoke
@@ -58,7 +54,7 @@ Examples
    python factorial input 1 myN return v_fac format ii here """
    def factorial(n):
      if n == 1: return n
-     return n \* factorial(n-1)
+     return n * factorial(n-1)
     """
 
    python loop input 1 SELF return v_value format pf here """
@@ -69,10 +65,10 @@ Examples
      # loop N times, increasing cutoff each time
 
      for i in range(N):
-       cut = cut0 + i\*0.1
-       lmp.set_variable("cut",cut)                 # set a variable in LAMMPS
+       cut = cut0 + i*0.1
+       lmp.set_variable("cut",cut)               # set a variable in LAMMPS
        lmp.command("pair_style lj/cut ${cut}")   # LAMMPS commands
-       lmp.command("pair_coeff \* \* 1.0 1.0")
+       lmp.command("pair_coeff * * 1.0 1.0")
        lmp.command("run 100")
     """
 
@@ -110,10 +106,8 @@ A broader overview of how Python can be used with LAMMPS is given on
 the :doc:`Python <Python_head>` doc page.  There is an examples/python
 directory which illustrates use of the python command.
 
-
 ----------
 
-
 The *func* setting specifies the name of the Python function.  The
 code for the function is defined using the *file* or *here* keywords
 as explained below. In case of the *source* keyword, the name of
@@ -145,14 +139,14 @@ itself.  This enables the function to call back to LAMMPS through its
 library interface as explained below.  This allows the Python function
 to query or set values internal to LAMMPS which can affect the
 subsequent execution of the input script.  A LAMMPS variable can also
-be used as an argument, specified as v\_name, where "name" is the name
+be used as an argument, specified as v_name, where "name" is the name
 of the variable.  Any style of LAMMPS variable can be used, as defined
 by the :doc:`variable <variable>` command.  Each time the Python
 function is invoked, the LAMMPS variable is evaluated and its value is
 passed to the Python function.
 
 The *return* keyword is only needed if the Python function returns a
-value.  The specified *varReturn* must be of the form v\_name, where
+value.  The specified *varReturn* must be of the form v_name, where
 "name" is the name of a python-style LAMMPS variable, defined by the
 :doc:`variable <variable>` command.  The Python function can return a
 numeric or string value, as specified by the *format* keyword.
@@ -162,8 +156,7 @@ of a python-style variable associates a Python function name with the
 variable.  This must match the *func* setting for this command.  For
 example these two commands would be self-consistent:
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    variable foo python myMultiply
    python myMultiply return v_foo format f file funcs.py
@@ -195,10 +188,8 @@ include the string terminator).  If the Python function generates a
 string longer than the default 63 or the specified *Nlen*\ , it will be
 truncated.
 
-
 ----------
 
-
 Either the *file*\ , *here*\ , or *exists* keyword must be used, but only
 one of them.  These keywords specify what Python code to load into the
 Python interpreter.  The *file* keyword gives the name of a file,
@@ -226,10 +217,8 @@ later invoked, the function code must match the *input* and
 *return* and *format* keywords specified by the python command.
 Otherwise Python will generate an error.
 
-
 ----------
 
-
 This section describes how Python code can be written to work with
 LAMMPS.
 
@@ -242,7 +231,7 @@ conflict with the triple-quote parsing that the LAMMPS input script
 performs.
 
 All the Python code you specify via one or more python commands is
-loaded into the Python "main" module, i.e. \__main\__.  The code can
+loaded into the Python "main" module, i.e. __main__.  The code can
 define global variables or statements that are outside of function
 definitions.  It can contain multiple functions, only one of which
 matches the *func* setting in the python command.  This means you can
@@ -261,8 +250,7 @@ python-style variable associated with the function.  For example,
 consider this function loaded with two global variables defined
 outside the function:
 
-
-.. parsed-literal::
+.. code-block:: python
 
    nsteplast = -1
    nvaluelast = 0
@@ -313,22 +301,19 @@ LAMMPS with that library.
 
 Third, if your Python code calls back to LAMMPS (discussed in the
 next section) and causes LAMMPS to perform an MPI operation requires
-global communication (e.g. via MPI\_Allreduce), such as computing the
+global communication (e.g. via MPI_Allreduce), such as computing the
 global temperature of the system, then you must insure all your Python
 functions (running independently on different processors) call back to
 LAMMPS.  Otherwise the code may hang.
 
-
 ----------
 
-
 Your Python function can "call back" to LAMMPS through its
 library interface, if you use the SELF input to pass Python
 a pointer to LAMMPS.  The mechanism for doing this in your
 Python function is as follows:
 
-
-.. parsed-literal::
+.. code-block:: python
 
    def foo(lmpptr,...):
      from lammps import lammps
@@ -337,16 +322,15 @@ Python function is as follows:
      ...
 
 The function definition must include a variable (lmpptr in this case)
-which corresponds to SELF in the python command.  The first line of
-the function imports the Python module lammps.py in the python dir of
+which corresponds to SELF in the python command.  The first line of the
+function imports the Python module lammps.py in the python directory of
 the distribution.  The second line creates a Python object "lmp" which
-wraps the instance of LAMMPS that called the function.  The
-"ptr=lmpptr" argument is what makes that happen.  The third line
-invokes the command() function in the LAMMPS library interface.  It
-takes a single string argument which is a LAMMPS input script command
-for LAMMPS to execute, the same as if it appeared in your input
-script.  In this case, LAMMPS should output
-
+wraps the instance of LAMMPS that called the function.  The "ptr=lmpptr"
+argument is what makes that happen.  The third line invokes the
+command() function in the LAMMPS library interface.  It takes a single
+string argument which is a LAMMPS input script command for LAMMPS to
+execute, the same as if it appeared in your input script.  In this case,
+LAMMPS should output
 
 .. parsed-literal::
 
@@ -363,8 +347,7 @@ library interface.
 A more interesting example is in the examples/python/in.python script
 which loads and runs the following function from examples/python/funcs.py:
 
-
-.. parsed-literal::
+.. code-block:: python
 
    def loop(N,cut0,thresh,lmpptr):
      print "LOOP ARGS",N,cut0,thresh,lmpptr
@@ -373,13 +356,13 @@ which loads and runs the following function from examples/python/funcs.py:
      natoms = lmp.get_natoms()
 
      for i in range(N):
-       cut = cut0 + i\*0.1
+       cut = cut0 + i*0.1
 
        lmp.set_variable("cut",cut)                 # set a variable in LAMMPS
        lmp.command("pair_style lj/cut ${cut}")     # LAMMPS command
        #lmp.command("pair_style lj/cut %d" % cut)  # LAMMPS command option
 
-       lmp.command("pair_coeff \* \* 1.0 1.0")       # ditto
+       lmp.command("pair_coeff * * 1.0 1.0")       # ditto
        lmp.command("run 10")                       # ditto
        pe = lmp.extract_compute("thermo_pe",0,0)   # extract total PE from LAMMPS
        print "PE",pe/natoms,thresh
@@ -387,7 +370,6 @@ which loads and runs the following function from examples/python/funcs.py:
 
 with these input script commands:
 
-
 .. parsed-literal::
 
    python          loop input 4 10 1.0 -4.0 SELF format iffp file funcs.py
@@ -402,15 +384,15 @@ with complex logic, much more so than can be created using the LAMMPS
 :doc:`jump <jump>` and :doc:`if <if>` commands.
 
 Several LAMMPS library functions are called from the loop function.
-Get\_natoms() returns the number of atoms in the simulation, so that it
+Get_natoms() returns the number of atoms in the simulation, so that it
 can be used to normalize the potential energy that is returned by
-extract\_compute() for the "thermo\_pe" compute that is defined by
-default for LAMMPS thermodynamic output.  Set\_variable() sets the
+extract_compute() for the "thermo_pe" compute that is defined by
+default for LAMMPS thermodynamic output.  Set_variable() sets the
 value of a string variable defined in LAMMPS.  This library function
 is a useful way for a Python function to return multiple values to
 LAMMPS, more than the single value that can be passed back via a
 return statement.  This cutoff value in the "cut" variable is then
-substituted (by LAMMPS) in the pair\_style command that is executed
+substituted (by LAMMPS) in the pair_style command that is executed
 next.  Alternatively, the "LAMMPS command option" line could be used
 in place of the 2 preceding lines, to have Python insert the value
 into the LAMMPS command string.
@@ -440,10 +422,8 @@ being attempted.
 The same applies to Python functions called during a simulation run at
 each time step using :doc:`fix python/invoke <fix_python_invoke>`.
 
-
 ----------
 
-
 If you run Python code directly on your workstation, either
 interactively or by using Python to launch a Python script stored in a
 file, and your code has an error, you will typically see informative
@@ -456,7 +436,6 @@ logic errors, you may get an error from Python pointing to the
 offending line, or you may get one of these generic errors from
 LAMMPS:
 
-
 .. parsed-literal::
 
    Could not process Python file
@@ -465,7 +444,6 @@ LAMMPS:
 When the Python function is invoked, if it does not return properly,
 you will typically get this generic error from LAMMPS:
 
-
 .. parsed-literal::
 
    Python function evaluation failed
@@ -485,16 +463,14 @@ Third, use Python exception handling.  For example, say this statement
 in your Python function is failing, because you have not initialized the
 variable foo:
 
-
-.. parsed-literal::
+.. code-block:: python
 
    foo += 1
 
 If you put one (or more) statements inside a "try" statement,
 like this:
 
-
-.. parsed-literal::
+.. code-block:: python
 
    import exceptions
    print "Inside simple function"
@@ -505,7 +481,6 @@ like this:
 
 then you will get this message printed to the screen:
 
-
 .. parsed-literal::
 
    FOO error: local variable 'foo' referenced before assignment
@@ -514,14 +489,11 @@ If there is no error in the try statements, then nothing is printed.
 Either way the function continues on (unless you put a return or
 sys.exit() in the except clause).
 
-
 ----------
 
-
 Restrictions
 """"""""""""
 
-
 This command is part of the PYTHON package.  It is only enabled if
 LAMMPS was built with that package.  See the :doc:`Build package <Build_package>` doc page for more info.
 
@@ -549,8 +521,3 @@ Related commands
 :doc:`shell <shell>`, :doc:`variable <variable>`, :doc:`fix python/invoke <fix_python_invoke>`
 
 **Default:** none
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/quit.rst b/doc/src/quit.rst
index 2129920022..8059232c6a 100644
--- a/doc/src/quit.rst
+++ b/doc/src/quit.rst
@@ -6,7 +6,6 @@ quit command
 Syntax
 """"""
 
-
 .. parsed-literal::
 
    quit status
@@ -16,8 +15,7 @@ status = numerical exit status (optional)
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    quit
    if "$n > 10000" then "quit 1"
@@ -51,8 +49,3 @@ Related commands
 :doc:`if <if>`
 
 **Default:** none
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/read_data.rst b/doc/src/read_data.rst
index 59ce92ca34..642f930b9d 100644
--- a/doc/src/read_data.rst
+++ b/doc/src/read_data.rst
@@ -1,22 +1,21 @@
-.. index:: read\_data
+.. index:: read_data
 
-read\_data command
-==================
+read_data command
+=================
 
 Syntax
 """"""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    read_data file keyword args ...
 
 * file = name of data file to read in
 * zero or more keyword/arg pairs may be appended
 * keyword = *add* or *offset* or *shift* or *extra/atom/types* or *extra/bond/types* or *extra/angle/types* or *extra/dihedral/types* or *extra/improper/types* or *extra/bond/per/atom* or *extra/angle/per/atom* or *extra/dihedral/per/atom* or *extra/improper/per/atom* or *group* or *nocoeff* or *fix*
-  
+
   .. parsed-literal::
-  
+
        *add* arg = *append* or *IDoffset* or *IDoffset MOLoffset* or *merge*
          append = add new atoms with atom IDs appended to current IDs
          IDoffset = add new atoms with atom IDs having IDoffset added
@@ -48,13 +47,10 @@ Syntax
          header-string = header lines containing this string will be passed to fix
          section-string = section names with this string will be passed to fix
 
-
-
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    read_data data.lj
    read_data ../run7/data.polymer.gz
@@ -87,7 +83,7 @@ the :doc:`displace_atoms <displace_atoms>` command.  Note that atoms
 read from the data file are also always added to the "all" group.  The
 :doc:`group <group>` command discusses atom groups, as used in LAMMPS.
 
-The *nocoeff* keyword tells read\_data to ignore force field parameters.
+The *nocoeff* keyword tells read_data to ignore force field parameters.
 The various Coeff sections are still read and have to have the correct
 number of lines, but they are not applied. This also allows to read a
 data file without having any pair, bond, angle, dihedral or improper
@@ -95,28 +91,26 @@ styles defined, or to read a data file for a different force field.
 
 The use of the *fix* keyword is discussed below.
 
-
 ----------
 
-
 **Reading multiple data files**
 
-The read\_data command can be used multiple times with the same or
+The read_data command can be used multiple times with the same or
 different data files to build up a complex system from components
 contained in individual data files.  For example one data file could
 contain fluid in a confined domain; a second could contain wall atoms,
 and the second file could be read a third time to create a wall on the
 other side of the fluid.  The third set of atoms could be rotated to
 an opposing direction using the :doc:`displace_atoms <displace_atoms>`
-command, after the third read\_data command is used.
+command, after the third read_data command is used.
 
 The *add*\ , *offset*\ , *shift*\ , *extra*\ , and *group* keywords are
 useful in this context.
 
 If a simulation box does not yet exist, the *add* keyword
-cannot be used; the read\_data command is being used for the first
+cannot be used; the read_data command is being used for the first
 time.  If a simulation box does exist, due to using the
-:doc:`create_box <create_box>` command, or a previous read\_data command,
+:doc:`create_box <create_box>` command, or a previous read_data command,
 then the *add* keyword must be used.
 
 .. note::
@@ -180,12 +174,12 @@ to move a subset of atoms after they have been read from a data file.
 Likewise, the :doc:`delete_atoms <delete_atoms>` command can be used to
 remove overlapping atoms.  Note that the shift values (Sx, Sy, Sz) are
 also added to the simulation box information (xlo, xhi, ylo, yhi, zlo,
-zhi) in the data file to shift its boundaries.  E.g. xlo\_new = xlo +
-Sx, xhi\_new = xhi + Sx.
+zhi) in the data file to shift its boundaries.  E.g. xlo_new = xlo +
+Sx, xhi_new = xhi + Sx.
 
-The *extra* keywords can only be used the first time the read\_data
+The *extra* keywords can only be used the first time the read_data
 command is used.  They are useful if you intend to add new atom, bond,
-angle, etc types later with additional read\_data commands.  This is
+angle, etc types later with additional read_data commands.  This is
 because the maximum number of allowed atom, bond, angle, etc types is
 set by LAMMPS when the system is first initialized.  If you do not use
 the *extra* keywords, then the number of these types will be limited
@@ -211,18 +205,16 @@ you would still need to specify coefficients for H/Si and O/Si
 interactions in your input script to have a complete pairwise
 interaction model.
 
-An alternative to using the *extra* keywords with the read\_data
+An alternative to using the *extra* keywords with the read_data
 command, is to use the :doc:`create_box <create_box>` command to
 initialize the simulation box and all the various type limits you need
-via its *extra* keywords.  Then use the read\_data command one or more
+via its *extra* keywords.  Then use the read_data command one or more
 times to populate the system with atoms, bonds, angles, etc, using the
 *offset* keyword if desired to alter types used in the various data
 files you read.
 
-
 ----------
 
-
 **Format of a data file**
 
 The structure of the data file is important, though many settings and
@@ -235,7 +227,7 @@ description of the file.  Then lines are read one at a time.  Lines
 can have a trailing comment starting with '#' that is ignored.  If the
 line is blank (only white-space after comment is deleted), it is
 skipped.  If the line contains a header keyword, the corresponding
-value(s) is read from the line.  If it doesn't contain a header
+value(s) is read from the line.  If it does not contain a header
 keyword, the line begins the body of the file.
 
 The body of the file contains zero or more sections.  The first line
@@ -266,10 +258,8 @@ be capitalized as shown and can't have extra white-space between their
 words - e.g. two spaces or a tab between the 2 words in "xlo xhi" or
 the 2 words in "Bond Coeffs", is not valid.
 
-
 ----------
 
-
 **Format of the header of a data file**
 
 These are the recognized header keywords.  Header lines can come in
@@ -389,13 +379,13 @@ data file.
    "shrink-wrap" boundary conditions (see the :doc:`boundary <boundary>`
    command), a huge (mostly empty) box may cause a parallel simulation to
    lose atoms when LAMMPS shrink-wraps the box around the atoms.  The
-   read\_data command will generate an error in this case.
+   read_data command will generate an error in this case.
 
 The "extra bond per atom" setting (angle, dihedral, improper) is only
 needed if new bonds (angles, dihedrals, impropers) will be added to
 the system when a simulation runs, e.g. by using the :doc:`fix bond/create <fix_bond_create>` command. Using this header flag
 is deprecated; please use the *extra/bond/per/atom* keyword (and
-correspondingly for angles, dihedrals and impropers) in the read\_data
+correspondingly for angles, dihedrals and impropers) in the read_data
 command instead. Either will pre-allocate space in LAMMPS data
 structures for storing the new bonds (angles, dihedrals, impropers).
 
@@ -415,7 +405,7 @@ pages for more discussion of 1-2,1-3,1-4 neighbors.
 
    All of the "extra" settings are only applied in the first data
    file read and when no simulation box has yet been created; as soon as
-   the simulation box is created (and read\_data implies that), these
+   the simulation box is created (and read_data implies that), these
    settings are *locked* and cannot be changed anymore. Please see the
    description of the *add* keyword above for reading multiple data files.
    If they appear in later data files, they are ignored.
@@ -440,10 +430,8 @@ are point particles.  See the discussion of ellipsoidflag and the
    keywords, though it is not necessary.  If specified, they must match
    the maximum values defined in any of the template molecules.
 
-
 ----------
 
-
 **Format of the body of a data file**
 
 These are the section keywords for the body of the file.
@@ -460,7 +448,6 @@ currently defined style:
 
 For example, these lines:
 
-
 .. parsed-literal::
 
    Atoms # sphere
@@ -480,120 +467,97 @@ Any individual line in the various sections can have a trailing
 comment starting with "#" for annotation purposes.  E.g. in the
 Atoms section:
 
-
 .. parsed-literal::
 
    10 1 17 -1.0 10.0 5.0 6.0   # salt ion
 
-
 ----------
 
-
 *Angle Coeffs* section:
 
 * one line per angle type
 * line syntax: ID coeffs
-  
+
   .. parsed-literal::
-  
+
        ID = angle type (1-N)
        coeffs = list of coeffs
 
 * example:
-  
+
   .. parsed-literal::
-  
+
        6 70 108.5 0 0
 
-
-
 The number and meaning of the coefficients are specific to the defined
 angle style.  See the :doc:`angle_style <angle_style>` and
 :doc:`angle_coeff <angle_coeff>` commands for details.  Coefficients can
 also be set via the :doc:`angle_coeff <angle_coeff>` command in the
 input script.
 
-
 ----------
 
-
 *AngleAngle Coeffs* section:
 
 * one line per improper type
 * line syntax: ID coeffs
-  
+
   .. parsed-literal::
-  
+
        ID = improper type (1-N)
        coeffs = list of coeffs (see :doc:`improper_coeff <improper_coeff>`)
 
-
-
-
 ----------
 
-
 *AngleAngleTorsion Coeffs* section:
 
 * one line per dihedral type
 * line syntax: ID coeffs
-  
+
   .. parsed-literal::
-  
+
        ID = dihedral type (1-N)
        coeffs = list of coeffs (see :doc:`dihedral_coeff <dihedral_coeff>`)
 
-
-
-
 ----------
 
-
 *Angles* section:
 
 * one line per angle
 * line syntax: ID type atom1 atom2 atom3
-  
+
   .. parsed-literal::
-  
+
        ID = number of angle (1-Nangles)
        type = angle type (1-Nangletype)
        atom1,atom2,atom3 = IDs of 1st,2nd,3rd atoms in angle
 
 example:
-  
+
   .. parsed-literal::
-  
+
        2 2 17 29 430
 
-
-
 The 3 atoms are ordered linearly within the angle.  Thus the central
 atom (around which the angle is computed) is the atom2 in the list.
 E.g. H,O,H for a water molecule.  The *Angles* section must appear
 after the *Atoms* section.  All values in this section must be
 integers (1, not 1.0).
 
-
 ----------
 
-
 *AngleTorsion Coeffs* section:
 
 * one line per dihedral type
 * line syntax: ID coeffs
-  
+
   .. parsed-literal::
-  
+
        ID = dihedral type (1-N)
        coeffs = list of coeffs (see :doc:`dihedral_coeff <dihedral_coeff>`)
 
-
-
-
 ----------
 
-
 *Atoms* section:
 
 * one line per atom
@@ -622,7 +586,7 @@ of analysis.
 +------------+---------------------------------------------------------------------------+
 | dpd        | atom-ID atom-type theta x y z                                             |
 +------------+---------------------------------------------------------------------------+
-| edpd       | atom-ID atom-type edpd\_temp edpd\_cv x y z                               |
+| edpd       | atom-ID atom-type edpd_temp edpd_cv x y z                                 |
 +------------+---------------------------------------------------------------------------+
 | mdpd       | atom-ID atom-type rho x y z                                               |
 +------------+---------------------------------------------------------------------------+
@@ -652,7 +616,7 @@ of analysis.
 +------------+---------------------------------------------------------------------------+
 | tri        | atom-ID molecule-ID atom-type triangleflag density x y z                  |
 +------------+---------------------------------------------------------------------------+
-| wavepacket | atom-ID atom-type charge spin eradius etag cs\_re cs\_im x y z            |
+| wavepacket | atom-ID atom-type charge spin eradius etag cs_re cs_im x y z              |
 +------------+---------------------------------------------------------------------------+
 | hybrid     | atom-ID atom-type x y z sub-style1 sub-style2 ...                         |
 +------------+---------------------------------------------------------------------------+
@@ -664,13 +628,13 @@ The per-atom values have these meanings and units, listed alphabetically:
 * bodyflag = 1 for body particles, 0 for point particles
 * cc = chemical concentration for tDPD particles for each species (mole/volume units)
 * contact-radius = ??? (distance units)
-* cs\_re,cs\_im = real/imaginary parts of wave packet coefficients
+* cs_re,cs_im = real/imaginary parts of wave packet coefficients
 * cv = heat capacity (need units) for SPH particles
 * density = density of particle (mass/distance\^3 or mass/distance\^2 or mass/distance units, depending on dimensionality of particle)
 * diameter = diameter of spherical atom (distance units)
 * e = energy (need units) for SPH particles
-* edpd\_temp = temperature for eDPD particles (temperature units)
-* edpd\_cv = volumetric heat capacity for eDPD particles (energy/temperature/volume units)
+* edpd_temp = temperature for eDPD particles (temperature units)
+* edpd_cv = volumetric heat capacity for eDPD particles (energy/temperature/volume units)
 * ellipsoidflag = 1 for ellipsoidal particles, 0 for point particles
 * eradius = electron radius (or fixed-core radius)
 * etag = integer ID of electron that each wave packet belongs to
@@ -749,12 +713,12 @@ body is unknown.
 Note that for 2d simulations of spheres, this command will treat them
 as spheres when converting density to mass.  However, they can also be
 modeled as 2d discs (circles) if the :doc:`set density/disc <set>`
-command is used to reset their mass after the read\_data command is
+command is used to reset their mass after the read_data command is
 used.  A *disc* keyword can also be used with time integration fixes,
 such as :doc:`fix nve/sphere <fix_nve_sphere>` and :doc:`fix nvt/sphere <fix_nve_sphere>` to time integrate their motion as 2d
 discs (not 3d spheres), by changing their moment of inertia.
 
-For atom\_style hybrid, following the 5 initial values (ID,type,x,y,z),
+For atom_style hybrid, following the 5 initial values (ID,type,x,y,z),
 specific values for each sub-style must be listed.  The order of the
 sub-styles is the same as they were listed in the
 :doc:`atom_style <atom_style>` command.  The sub-style specific values
@@ -763,22 +727,19 @@ example, for the "charge" sub-style, a "q" value would appear.  For
 the "full" sub-style, a "molecule-ID" and "q" would appear.  These are
 listed in the same order they appear as listed above.  Thus if
 
-
 .. parsed-literal::
 
    atom_style hybrid charge sphere
 
 were used in the input script, each atom line would have these fields:
 
-
 .. parsed-literal::
 
    atom-ID atom-type x y z q diameter density
 
 Note that if a non-standard value is defined by multiple sub-styles,
 it must appear multiple times in the atom line.  E.g. the atom line
-for atom\_style hybrid dipole full would list "q" twice:
-
+for atom_style hybrid dipole full would list "q" twice:
 
 .. parsed-literal::
 
@@ -827,7 +788,6 @@ that use unwrapped coordinates internally are as follows:
   continued run (restarted from a data file) begins with image flags
   that are consistent with the previous run.
 
-
 .. note::
 
    If your system is an infinite periodic crystal with bonds then
@@ -841,40 +801,36 @@ a *Velocities* section in the data file or by a
 :doc:`velocity <velocity>` or :doc:`set <set>` command in the input
 script.
 
-
 ----------
 
-
 *Bodies* section:
 
 * one or more lines per body
 * first line syntax: atom-ID Ninteger Ndouble
-  
+
   .. parsed-literal::
-  
+
        Ninteger = # of integer quantities for this particle
        Ndouble = # of floating-point quantities for this particle
 
 * 0 or more integer lines with total of Ninteger values
 * 0 or more double lines with total of Ndouble values
 * example:
-  
+
   .. parsed-literal::
-  
+
        12 3 6
        2 3 2
        1.0 2.0 3.0 1.0 2.0 4.0
 
 * example:
-  
+
   .. parsed-literal::
-  
+
        12 0 14
        1.0 2.0 3.0 1.0 2.0 4.0 1.0
        2.0 3.0 1.0 2.0 4.0 4.0 2.0
 
-
-
 The *Bodies* section must appear if :doc:`atom_style body <atom_style>`
 is used and any atoms listed in the *Atoms* section have a bodyflag =
 1.  The number of bodies should be specified in the header section via
@@ -896,186 +852,154 @@ particular type, no lines appear for that type.
 
 The *Bodies* section must appear after the *Atoms* section.
 
-
 ----------
 
-
 *Bond Coeffs* section:
 
 * one line per bond type
 * line syntax: ID coeffs
-  
+
   .. parsed-literal::
-  
+
        ID = bond type (1-N)
        coeffs = list of coeffs
 
 * example:
-  
+
   .. parsed-literal::
-  
+
        4 250 1.49
 
-
-
 The number and meaning of the coefficients are specific to the defined
 bond style.  See the :doc:`bond_style <bond_style>` and
 :doc:`bond_coeff <bond_coeff>` commands for details.  Coefficients can
 also be set via the :doc:`bond_coeff <bond_coeff>` command in the input
 script.
 
-
 ----------
 
-
 *BondAngle Coeffs* section:
 
 * one line per angle type
 * line syntax: ID coeffs
-  
+
   .. parsed-literal::
-  
+
        ID = angle type (1-N)
        coeffs = list of coeffs (see class 2 section of :doc:`angle_coeff <angle_coeff>`)
 
-
-
-
 ----------
 
-
 *BondBond Coeffs* section:
 
 * one line per angle type
 * line syntax: ID coeffs
-  
+
   .. parsed-literal::
-  
+
        ID = angle type (1-N)
        coeffs = list of coeffs (see class 2 section of :doc:`angle_coeff <angle_coeff>`)
 
-
-
-
 ----------
 
-
 *BondBond13 Coeffs* section:
 
 * one line per dihedral type
 * line syntax: ID coeffs
-  
+
   .. parsed-literal::
-  
+
        ID = dihedral type (1-N)
        coeffs = list of coeffs (see class 2 section of :doc:`dihedral_coeff <dihedral_coeff>`)
 
-
-
-
 ----------
 
-
 *Bonds* section:
 
 * one line per bond
 * line syntax: ID type atom1 atom2
-  
+
   .. parsed-literal::
-  
+
        ID = bond number (1-Nbonds)
        type = bond type (1-Nbondtype)
        atom1,atom2 = IDs of 1st,2nd atoms in bond
 
 * example:
-  
+
   .. parsed-literal::
-  
+
        12 3 17 29
 
-
-
 The *Bonds* section must appear after the *Atoms* section.  All values
 in this section must be integers (1, not 1.0).
 
-
 ----------
 
-
 *Dihedral Coeffs* section:
 
 * one line per dihedral type
 * line syntax: ID coeffs
-  
+
   .. parsed-literal::
-  
+
        ID = dihedral type (1-N)
        coeffs = list of coeffs
 
 * example:
-  
+
   .. parsed-literal::
-  
+
        3 0.6 1 0 1
 
-
-
 The number and meaning of the coefficients are specific to the defined
 dihedral style.  See the :doc:`dihedral_style <dihedral_style>` and
 :doc:`dihedral_coeff <dihedral_coeff>` commands for details.
 Coefficients can also be set via the
 :doc:`dihedral_coeff <dihedral_coeff>` command in the input script.
 
-
 ----------
 
-
 *Dihedrals* section:
 
 * one line per dihedral
 * line syntax: ID type atom1 atom2 atom3 atom4
-  
+
   .. parsed-literal::
-  
+
        ID = number of dihedral (1-Ndihedrals)
        type = dihedral type (1-Ndihedraltype)
        atom1,atom2,atom3,atom4 = IDs of 1st,2nd,3rd,4th atoms in dihedral
 
 * example:
-  
+
   .. parsed-literal::
-  
+
        12 4 17 29 30 21
 
-
-
 The 4 atoms are ordered linearly within the dihedral.  The *Dihedrals*
 section must appear after the *Atoms* section.  All values in this
 section must be integers (1, not 1.0).
 
-
 ----------
 
-
 *Ellipsoids* section:
 
 * one line per ellipsoid
 * line syntax: atom-ID shapex shapey shapez quatw quati quatj quatk
-  
+
   .. parsed-literal::
-  
+
        atom-ID = ID of atom which is an ellipsoid
        shapex,shapey,shapez = 3 diameters of ellipsoid (distance units)
        quatw,quati,quatj,quatk = quaternion components for orientation of atom
 
 * example:
-  
+
   .. parsed-literal::
-  
+
        12 1 2 1 1 0 0 0
 
-
-
 The *Ellipsoids* section must appear if :doc:`atom_style ellipsoid <atom_style>` is used and any atoms are listed in the
 *Atoms* section with an ellipsoidflag = 1.  The number of ellipsoids
 should be specified in the header section via the "ellipsoids"
@@ -1099,73 +1023,61 @@ specified as a unit vector.
 
 The *Ellipsoids* section must appear after the *Atoms* section.
 
-
 ----------
 
-
 *EndBondTorsion Coeffs* section:
 
 * one line per dihedral type
 * line syntax: ID coeffs
-  
+
   .. parsed-literal::
-  
+
        ID = dihedral type (1-N)
        coeffs = list of coeffs (see class 2 section of :doc:`dihedral_coeff <dihedral_coeff>`)
 
-
-
-
 ----------
 
-
 *Improper Coeffs* section:
 
 * one line per improper type
 * line syntax: ID coeffs
-  
+
   .. parsed-literal::
-  
+
        ID = improper type (1-N)
        coeffs = list of coeffs
 
 * example:
-  
+
   .. parsed-literal::
-  
+
        2 20 0.0548311
 
-
-
 The number and meaning of the coefficients are specific to the defined
 improper style.  See the :doc:`improper_style <improper_style>` and
 :doc:`improper_coeff <improper_coeff>` commands for details.
 Coefficients can also be set via the
 :doc:`improper_coeff <improper_coeff>` command in the input script.
 
-
 ----------
 
-
 *Impropers* section:
 
 * one line per improper
 * line syntax: ID type atom1 atom2 atom3 atom4
-  
+
   .. parsed-literal::
-  
+
        ID = number of improper (1-Nimpropers)
        type = improper type (1-Nimpropertype)
        atom1,atom2,atom3,atom4 = IDs of 1st,2nd,3rd,4th atoms in improper
 
 * example:
-  
+
   .. parsed-literal::
-  
+
        12 3 17 29 13 100
 
-
-
 The ordering of the 4 atoms determines the definition of the improper
 angle used in the formula for each :doc:`improper style <improper_style>`.  See the doc pages for individual styles
 for details.
@@ -1173,29 +1085,25 @@ for details.
 The *Impropers* section must appear after the *Atoms* section.  All
 values in this section must be integers (1, not 1.0).
 
-
 ----------
 
-
 *Lines* section:
 
 * one line per line segment
 * line syntax: atom-ID x1 y1 x2 y2
-  
+
   .. parsed-literal::
-  
+
        atom-ID = ID of atom which is a line segment
        x1,y1 = 1st end point
        x2,y2 = 2nd end point
 
 * example:
-  
+
   .. parsed-literal::
-  
+
        12 1.0 0.0 2.0 0.0
 
-
-
 The *Lines* section must appear if :doc:`atom_style line <atom_style>`
 is used and any atoms are listed in the *Atoms* section with a
 lineflag = 1.  The number of lines should be specified in the header
@@ -1210,138 +1118,118 @@ for defining some interactions.
 
 The *Lines* section must appear after the *Atoms* section.
 
-
 ----------
 
-
 *Masses* section:
 
 * one line per atom type
 * line syntax: ID mass
-  
+
   .. parsed-literal::
-  
+
        ID = atom type (1-N)
        mass = mass value
 
 * example:
-  
+
   .. parsed-literal::
-  
+
        3 1.01
 
-
-
 This defines the mass of each atom type.  This can also be set via the
 :doc:`mass <mass>` command in the input script.  This section cannot be
 used for atom styles that define a mass for individual atoms -
 e.g. :doc:`atom_style sphere <atom_style>`.
 
-
 ----------
 
-
 *MiddleBondTorsion Coeffs* section:
 
 * one line per dihedral type
 * line syntax: ID coeffs
-  
+
   .. parsed-literal::
-  
+
        ID = dihedral type (1-N)
        coeffs = list of coeffs (see class 2 section of :doc:`dihedral_coeff <dihedral_coeff>`)
 
-
-
-
 ----------
 
-
 *Pair Coeffs* section:
 
 * one line per atom type
 * line syntax: ID coeffs
-  
+
   .. parsed-literal::
-  
+
        ID = atom type (1-N)
        coeffs = list of coeffs
 
 * example:
-  
+
   .. parsed-literal::
-  
+
        3 0.022 2.35197 0.022 2.35197
 
-
-
 The number and meaning of the coefficients are specific to the defined
 pair style.  See the :doc:`pair_style <pair_style>` and
 :doc:`pair_coeff <pair_coeff>` commands for details.  Since pair
 coefficients for types I != J are not specified, these will be
 generated automatically by the pair style's mixing rule.  See the
-individual pair\_style doc pages and the :doc:`pair_modify mix <pair_modify>` command for details.  Pair coefficients can also
+individual pair_style doc pages and the :doc:`pair_modify mix <pair_modify>` command for details.  Pair coefficients can also
 be set via the :doc:`pair_coeff <pair_coeff>` command in the input
 script.
 
-
 ----------
 
-
 *PairIJ Coeffs* section:
 
 * one line per pair of atom types for all I,J with I <= J
 * line syntax: ID1 ID2 coeffs
-  
+
   .. parsed-literal::
-  
+
        ID1 = atom type I = 1-N
        ID2 = atom type J = I-N, with I <= J
        coeffs = list of coeffs
 
 * examples:
-  
+
   .. parsed-literal::
-  
+
        3 3 0.022 2.35197 0.022 2.35197
        3 5 0.022 2.35197 0.022 2.35197
 
-
-
 This section must have N\*(N+1)/2 lines where N = # of atom types.  The
 number and meaning of the coefficients are specific to the defined
 pair style.  See the :doc:`pair_style <pair_style>` and
 :doc:`pair_coeff <pair_coeff>` commands for details.  Since pair
 coefficients for types I != J are all specified, these values will
 turn off the default mixing rule defined by the pair style.  See the
-individual pair\_style doc pages and the :doc:`pair_modify mix <pair_modify>` command for details.  Pair coefficients can also
+individual pair_style doc pages and the :doc:`pair_modify mix <pair_modify>` command for details.  Pair coefficients can also
 be set via the :doc:`pair_coeff <pair_coeff>` command in the input
 script.
 
-
 ----------
 
-
 *Triangles* section:
 
 * one line per triangle
 * line syntax: atom-ID x1 y1 z1 x2 y2 z2 x3 y3 z3
-  
+
   .. parsed-literal::
-  
+
        atom-ID = ID of atom which is a line segment
        x1,y1,z1 = 1st corner point
        x2,y2,z2 = 2nd corner point
        x3,y3,z3 = 3rd corner point
 
 * example:
-  
+
   .. parsed-literal::
-  
+
        12 0.0 0.0 0.0 2.0 0.0 1.0 0.0 2.0 1.0
 
-
-
 The *Triangles* section must appear if :doc:`atom_style tri <atom_style>` is used and any atoms are listed in the *Atoms*
 section with a triangleflag = 1.  The number of lines should be
 specified in the header section via the "triangles" keyword.
@@ -1354,10 +1242,8 @@ orientation may be important for defining some interactions.
 
 The *Triangles* section must appear after the *Atoms* section.
 
-
 ----------
 
-
 *Velocities* section:
 
 * one line per atom
@@ -1391,7 +1277,7 @@ Vx, vy, vz, and ervel are in :doc:`units <units>` of velocity.  Lx, ly,
 lz are in units of angular momentum (distance-velocity-mass).  Wx, Wy,
 Wz are in units of angular velocity (radians/time).
 
-For atom\_style hybrid, following the 4 initial values (ID,vx,vy,vz),
+For atom_style hybrid, following the 4 initial values (ID,vx,vy,vz),
 specific values for each sub-style must be listed.  The order of the
 sub-styles is the same as they were listed in the
 :doc:`atom_style <atom_style>` command.  The sub-style specific values
@@ -1400,15 +1286,13 @@ example, for the "sphere" sub-style, "wx", "wy", "wz" values would
 appear.  These are listed in the same order they appear as listed
 above.  Thus if
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    atom_style hybrid electron sphere
 
 were used in the input script, each velocity line would have these
 fields:
 
-
 .. parsed-literal::
 
    atom-ID vx vy vz ervel wx wy wz
@@ -1416,16 +1300,13 @@ fields:
 Translational velocities can also be set by the
 :doc:`velocity <velocity>` command in the input script.
 
-
 ----------
 
-
 Restrictions
 """"""""""""
 
-
 To read gzipped data files, you must compile LAMMPS with the
--DLAMMPS\_GZIP option.  See the :doc:`Build settings <Build_settings>`
+-DLAMMPS_GZIP option.  See the :doc:`Build settings <Build_settings>`
 doc page for details.
 
 Related commands
@@ -1438,8 +1319,3 @@ Default
 """""""
 
 The default for all the *extra* keywords is 0.
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/read_dump.rst b/doc/src/read_dump.rst
index 030d55f25a..c46c12c951 100644
--- a/doc/src/read_dump.rst
+++ b/doc/src/read_dump.rst
@@ -1,22 +1,21 @@
-.. index:: read\_dump
+.. index:: read_dump
 
-read\_dump command
-==================
+read_dump command
+=================
 
 Syntax
 """"""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    read_dump file Nstep field1 field2 ... keyword values ...
 
 * file = name of dump file to read
 * Nstep = snapshot timestep to read from file
 * one or more fields may be appended
-  
+
   .. parsed-literal::
-  
+
      field = *x* or *y* or *z* or *vx* or *vy* or *vz* or *q* or *ix* or *iy* or *iz* or *fx* or *fy* or *fz*
        *x*\ ,\ *y*\ ,\ *z* = atom coordinates
        *vx*\ ,\ *vy*\ ,\ *vz* = velocity components
@@ -26,9 +25,9 @@ Syntax
 
 * zero or more keyword/value pairs may be appended
 * keyword = *nfile* or *box* or *replace* or *purge* or *trim* or *add* or *label* or *scaled* or *wrapped* or *format*
-  
+
   .. parsed-literal::
-  
+
        *nfile* value = Nfiles = how many parallel dump files exist
        *box* value = *yes* or *no* = replace simulation box with dump box
        *replace* value = *yes* or *no* = overwrite atoms with dump atoms
@@ -50,13 +49,10 @@ Syntax
            style = *dcd* or *xyz* or others supported by molfile plugins
            path = optional path for location of molfile plugins
 
-
-
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    read_dump dump.file 5000 x y z
    read_dump dump.xyz 5 x y z box no format xyz
@@ -84,9 +80,9 @@ commands for alternative methods to do this.  Also see the
 from a dump file.
 
 Note that a simulation box must already be defined before using the
-read\_dump command.  This can be done by the
+read_dump command.  This can be done by the
 :doc:`create_box <create_box>`, :doc:`read_data <read_data>`, or
-:doc:`read_restart <read_restart>` commands.  The read\_dump command can
+:doc:`read_restart <read_restart>` commands.  The read_dump command can
 reset the simulation box dimensions, as explained below.
 
 Also note that reading per-atom information from a dump snapshot is
@@ -96,13 +92,11 @@ a valid simulation, such as atom charge, or bond topology information
 for a molecular system, are not read from (or even contained in) dump
 files.  Thus this auxiliary information should be defined in the usual
 way, e.g. in a data file read in by a :doc:`read_data <read_data>`
-command, before using the read\_dump command, or by the :doc:`set <set>`
+command, before using the read_dump command, or by the :doc:`set <set>`
 command, after the dump snapshot is read.
 
-
 ----------
 
-
 If the dump filename specified as *file* ends with ".gz", the dump
 file is read in gzipped format.  You cannot (yet) read a dump file
 that was written in binary format with a ".bin" suffix.
@@ -141,39 +135,36 @@ contain multiple directories separated by a colon (or semi-colon on
 windows).  The *path* keyword is optional and defaults to ".",
 i.e. the current directory.
 
-The *adios* format supports reading data that was written by the 
-:doc:`dump adios <dump_adios>` command. The 
+The *adios* format supports reading data that was written by the
+:doc:`dump adios <dump_adios>` command. The
 entire dump is read in parallel across all the processes, dividing
 the atoms evenly among the processes. The number of writers that
 has written the dump file does not matter. Using the adios style for
-dump and read_dump is a convenient way to dump all atoms from *N* 
-writers and read it back by *M* readers. If one is running two 
-LAMMPS instances concurrently where one dumps data and the other is 
-reading it with the rerun command, the timeout option can be specified 
-to wait on the reader side for the arrival of the requested step. 
+dump and read_dump is a convenient way to dump all atoms from *N*
+writers and read it back by *M* readers. If one is running two
+LAMMPS instances concurrently where one dumps data and the other is
+reading it with the rerun command, the timeout option can be specified
+to wait on the reader side for the arrival of the requested step.
 
 Support for other dump format readers may be added in the future.
 
-
 ----------
 
-
 Global information is first read from the dump file, namely timestep
 and box information.
 
 The dump file is scanned for a snapshot with a timestamp that matches
 the specified *Nstep*\ .  This means the LAMMPS timestep the dump file
-snapshot was written on for the *native* or *adios* formats.  
+snapshot was written on for the *native* or *adios* formats.
 
-The list of timestamps available in an adios .bp file is stored in the 
+The list of timestamps available in an adios .bp file is stored in the
 variable *ntimestep*:
 
 .. parsed-literal::
 
   $ bpls dump.bp -d ntimestep
-    uint64_t  ntimestep  5*scalar 
-      (0)    0 50 100 150 200 
-
+    uint64_t  ntimestep  5*scalar
+      (0)    0 50 100 150 200
 
 Note that the *xyz*
 and *molfile* formats do not store the timestep.  For these formats,
@@ -201,13 +192,11 @@ orthogonal/triclinic box shape is available.  The USER-MOLFILE package
 makes a best effort to guess based on heuristics, but this may not
 always work perfectly.
 
-
 ----------
 
-
 Per-atom information from the dump file snapshot is then read from the
 dump file snapshot.  This corresponds to the specified *fields* listed
-in the read\_dump command.  It is an error to specify a z-dimension
+in the read_dump command.  It is an error to specify a z-dimension
 field, namely *z*\ , *vz*\ , or *iz*\ , for a 2d simulation.
 
 For dump files in *native* format, each column of per-atom data has a
@@ -215,7 +204,6 @@ text label listed in the file.  A matching label for each field must
 appear, e.g. the label "vy" for the field *vy*\ .  For the *x*\ , *y*\ , *z*
 fields any of the following labels are considered a match:
 
-
 .. parsed-literal::
 
    x, xs, xu, xsu for field *x*
@@ -261,7 +249,7 @@ See the :doc:`dump_modify sort <dump_modify>` command if the dump file
 was written by LAMMPS.
 
 The *adios* format supports all fields that the *native* format supports
-except for the *q* charge field. 
+except for the *q* charge field.
 The list of fields stored in an adios .bp file is recorded in the attributes
 *columns* (array of short strings) and *columnstr* (space-separated single string).
 
@@ -271,11 +259,8 @@ The list of fields stored in an adios .bp file is recorded in the attributes
     string    columns            attr   = {"id", "type", "x", "y", "z", "vx", "vy", "vz"}
     string    columnstr          attr   = "id type x y z vx vy vz "
 
-
-
 ----------
 
-
 Information from the dump file snapshot is used to overwrite or
 replace properties of the current system.  There are various options
 for how this is done, determined by the specified fields and optional
@@ -330,10 +315,8 @@ Any other attributes (e.g. charge or particle diameter for spherical
 particles) will be set to default values, the same as if the
 :doc:`create_atoms <create_atoms>` command were used.
 
-
 ----------
 
-
 Atom coordinates read from the dump file are first converted into
 unscaled coordinates, relative to the box dimensions of the snapshot.
 These coordinates are then be assigned to an existing or new atom in
@@ -382,16 +365,13 @@ coordinates are scaled and the simulation box is triclinic, then all 3
 of the *x*\ , *y*\ , *z* fields must be specified, since they are all
 needed to generate absolute, unscaled coordinates.
 
-
 ----------
 
-
 Restrictions
 """"""""""""
 
-
 To read gzipped dump files, you must compile LAMMPS with the
--DLAMMPS\_GZIP option.  See the :doc:`Build settings <Build_settings>`
+-DLAMMPS_GZIP option.  See the :doc:`Build settings <Build_settings>`
 doc page for details.
 
 The *molfile* dump file formats are part of the USER-MOLFILE package.
@@ -416,10 +396,3 @@ The option defaults are box = yes, replace = yes, purge = no, trim =
 no, add = no, scaled = no, wrapped = yes, and format = native.
 
 .. _vmd: http://www.ks.uiuc.edu/Research/vmd
-
-
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/read_restart.rst b/doc/src/read_restart.rst
index 321b533acb..90cc426b0d 100644
--- a/doc/src/read_restart.rst
+++ b/doc/src/read_restart.rst
@@ -1,13 +1,12 @@
-.. index:: read\_restart
+.. index:: read_restart
 
-read\_restart command
-=====================
+read_restart command
+====================
 
 Syntax
 """"""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    read_restart file flag
 
@@ -17,14 +16,13 @@ Syntax
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    read_restart save.10000
    read_restart save.10000 remap
-   read_restart restart.\*
-   read_restart restart.\*.mpiio
-   read_restart poly.\*.% remap
+   read_restart restart.*
+   read_restart restart.*.mpiio
+   read_restart poly.*.% remap
 
 Description
 """""""""""
@@ -46,11 +44,11 @@ changed by the :doc:`balance <balance>` or :doc:`fix balance <fix_balance>` comm
    Normally, restart files are written by the
    :doc:`restart <restart>` or :doc:`write_restart <write_restart>` commands
    so that all atoms in the restart file are inside the simulation box.
-   If this is not the case, the read\_restart command will print an error
+   If this is not the case, the read_restart command will print an error
    that atoms were "lost" when the file is read.  This error should be
    reported to the LAMMPS developers so the invalid writing of the
    restart file can be fixed.  If you still wish to use the restart file,
-   the optional *remap* flag can be appended to the read\_restart command.
+   the optional *remap* flag can be appended to the read_restart command.
    This should avoid the error, by explicitly remapping each atom back
    into the simulation box, updating image flags for the atom
    appropriately.
@@ -94,16 +92,16 @@ value.  The file with the largest timestep value is read in.  Thus,
 this effectively means, read the latest restart file.  It's useful if
 you want your script to continue a run from where it left off.  See
 the :doc:`run <run>` command and its "upto" option for how to specify
-the run command so it doesn't need to be changed either.
+the run command so it does not need to be changed either.
 
 If a "%" character appears in the restart filename, LAMMPS expects a
 set of multiple files to exist.  The :doc:`restart <restart>` and
 :doc:`write_restart <write_restart>` commands explain how such sets are
-created.  Read\_restart will first read a filename where "%" is
+created.  Read_restart will first read a filename where "%" is
 replaced by "base".  This file tells LAMMPS how many processors
-created the set and how many files are in it.  Read\_restart then reads
+created the set and how many files are in it.  Read_restart then reads
 the additional files.  For example, if the restart file was specified
-as save.% when it was written, then read\_restart reads the files
+as save.% when it was written, then read_restart reads the files
 save.base, save.0, save.1, ... save.P-1, where P is the number of
 processors that created the restart file.
 
@@ -124,8 +122,7 @@ MPI-IO is part of the MPI standard for versions 2.0 and above.  Using
 MPI-IO requires two steps.  First, build LAMMPS with its MPIIO package
 installed, e.g.
 
-
-.. parsed-literal::
+.. code-block:: bash
 
    make yes-mpiio    # installs the MPIIO package
    make mpi          # build LAMMPS for your platform
@@ -135,10 +132,8 @@ does not have to end in ".mpiio", just contain those characters.
 Unlike MPI-IO dump files, a particular restart file must be both
 written and read using MPI-IO.
 
-
 ----------
 
-
 Here is the list of information included in a restart file, which
 means these quantities do not need to be re-specified in the input
 script that reads the restart file, though you can redefine many of
@@ -174,7 +169,7 @@ reading the restart file.
 The :doc:`newton <newton>` command has two settings, one for pairwise
 interactions, the other for bonded.  Both settings are stored in the
 restart file.  For the bond setting, the value in the file will
-overwrite the current value (at the time the read\_restart command is
+overwrite the current value (at the time the read_restart command is
 issued) and warn if the two values are not the same and the current
 value is not the default.  For the pair setting, the value in the file
 will not overwrite the current value (so that you can override the
@@ -229,7 +224,7 @@ its calculations in a consistent manner.
 
    There are a handful of commands which can be used before or
    between runs which may require a system initialization.  Examples
-   include the "balance", "displace\_atoms", "delete\_atoms", "set" (some
+   include the "balance", "displace_atoms", "delete_atoms", "set" (some
    options), and "velocity" (some options) commands.  This is because
    they can migrate atoms to new processors.  Thus they will also discard
    unused "state" information from fixes.  You will know the discard has
@@ -263,14 +258,11 @@ Bonds that have been broken by the :doc:`fix bond/break <fix_bond_break>` comman
 system.  No information about these bonds is written to the restart
 file.
 
-
 ----------
 
-
 Restrictions
 """"""""""""
 
-
 To write and read restart files in parallel with MPI-IO, the MPIIO
 package must be installed.
 
@@ -281,8 +273,3 @@ Related commands
 :doc:`write_restart <write_restart>`, :doc:`restart <restart>`
 
 **Default:** none
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/region.rst b/doc/src/region.rst
index 81e247a8e2..9f2d996b20 100644
--- a/doc/src/region.rst
+++ b/doc/src/region.rst
@@ -6,16 +6,15 @@ region command
 Syntax
 """"""
 
-
 .. parsed-literal::
 
    region ID style args keyword arg ...
 
 * ID = user-assigned name for the region
 * style = *delete* or *block* or *cone* or *cylinder* or *plane* or *prism* or *sphere* or *union* or *intersect*
-  
+
   .. parsed-literal::
-  
+
        *delete* = no args
        *block* args = xlo xhi ylo yhi zlo zhi
          xlo,xhi,ylo,yhi,zlo,zhi = bounds of block in all dimensions (distance units)
@@ -51,9 +50,9 @@ Syntax
 
 * zero or more keyword/arg pairs may be appended
 * keyword = *side* or *units* or *move* or *rotate* or *open*
-  
+
   .. parsed-literal::
-  
+
        *side* value = *in* or *out*
          *in* = the region is inside the specified geometry
          *out* = the region is outside the specified geometry
@@ -70,12 +69,10 @@ Syntax
 
 * accelerated styles (with same args) = *block/kk*
 
-
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    region 1 block -3.0 5.0 INF 10.0 INF INF
    region 2 sphere 0.0 0.0 0.0 5 side out
@@ -189,7 +186,7 @@ geometrically equivalent.
 
 The *radius* value for style *sphere* and *cylinder* can be specified
 as an equal-style :doc:`variable <variable>`.  If the value is a
-variable, it should be specified as v\_name, where name is the variable
+variable, it should be specified as v_name, where name is the variable
 name.  In this case, the variable will be evaluated each timestep, and
 its value used to determine the radius of the region. For style *sphere*
 also the x-, y-, and z- coordinate of the center of the sphere and for
@@ -218,10 +215,8 @@ consisting of the volume that is common to all the listed regions.
    from their list of sub-regions.  Thus you cannot delete the
    sub-regions after defining a *union* or *intersection* region.
 
-
 ----------
 
-
 The *side* keyword determines whether the region is considered to be
 inside or outside of the specified geometry.  Using this keyword in
 conjunction with *union* and *intersect* regions, complex geometries
@@ -266,10 +261,8 @@ define the lattice spacings which are used as follows:
   applied to the sphere center x,y,z.  The spacing in dimension x is
   applied to the sphere radius.
 
-
 ----------
 
-
 If the *move* or *rotate* keywords are used, the region is "dynamic",
 meaning its location or orientation changes with time.  These keywords
 cannot be used with a *union* or *intersect* style region.  Instead,
@@ -280,7 +273,7 @@ point), though this is not a requirement.
 
 The *move* keyword allows one or more :doc:`equal-style variables <variable>` to be used to specify the x,y,z displacement
 of the region, typically as a function of time.  A variable is
-specified as v\_name, where name is the variable name.  Any of the
+specified as v_name, where name is the variable name.  Any of the
 three variables can be specified as NULL, in which case no
 displacement is calculated in that dimension.
 
@@ -296,8 +289,7 @@ For example, these commands would displace a region from its initial
 position, in the positive x direction, effectively at a constant
 velocity:
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    variable dx equal ramp(0,10)
    region 2 sphere 10.0 10.0 0.0 5 move v_dx NULL NULL
@@ -307,17 +299,16 @@ Note that the initial displacement is 0.0, though that is not required.
 Either of these variables would "wiggle" the region back and forth in
 the y direction:
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    variable dy equal swiggle(0,5,100)
-   variable dysame equal 5\*sin(2\*PI\*elaplong\*dt/100)
+   variable dysame equal 5*sin(2*PI*elaplong*dt/100)
    region 2 sphere 10.0 10.0 0.0 5 move NULL v_dy NULL
 
 The *rotate* keyword rotates the region around a rotation axis *R* =
 (Rx,Ry,Rz) that goes through a point *P* = (Px,Py,Pz).  The rotation
 angle is calculated, presumably as a function of time, by a variable
-specified as v\_theta, where theta is the variable name.  The variable
+specified as v_theta, where theta is the variable name.  The variable
 should generate its result in radians.  The direction of rotation for
 the region around the rotation axis is consistent with the right-hand
 rule: if your right-hand thumb points along *R*\ , then your fingers
@@ -327,10 +318,8 @@ The *move* and *rotate* keywords can be used together.  In this case,
 the displacement specified by the *move* keyword is applied to the *P*
 point of the *rotate* keyword.
 
-
 ----------
 
-
 The *open* keyword can be used (multiple times) to indicate that one
 or more faces of the region are ignored for purposes of particle/wall
 interactions.  This keyword is only relevant for regions used by the
@@ -380,10 +369,8 @@ For all other styles, the *open* keyword is ignored.  As indicated
 above, this includes the *intersect* and *union* regions, though their
 sub-regions can be defined with the *open* keyword.
 
-
 ----------
 
-
 Styles with a *gpu*\ , *intel*\ , *kk*\ , *omp*\ , or *opt* suffix are
 functionally the same as the corresponding style without the suffix.
 They have been optimized to run faster, depending on your available
@@ -405,14 +392,11 @@ by including their suffix, or you can use the :doc:`-suffix command-line switch
 See the :doc:`Speed packages <Speed_packages>` doc page for more
 instructions on how to use the accelerated styles effectively.
 
-
 ----------
 
-
 Restrictions
 """"""""""""
 
-
 A prism cannot be of 0.0 thickness in any dimension; use a small z
 thickness for 2d simulations.  For 2d simulations, the xz and yz
 parameters must be 0.0.
@@ -428,8 +412,3 @@ Default
 
 The option defaults are side = in, units = lattice, and no move or
 rotation.
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/replicate.rst b/doc/src/replicate.rst
index f7682c3d54..18038ae2dd 100644
--- a/doc/src/replicate.rst
+++ b/doc/src/replicate.rst
@@ -6,26 +6,22 @@ replicate command
 Syntax
 """"""
 
-
 .. parsed-literal::
 
    replicate nx ny nz *keyword*
 
-nx,ny,nz = replication factors in each dimension 
+nx,ny,nz = replication factors in each dimension
 
 * optional *keyword* = *bbox*
-  
+
   .. parsed-literal::
-  
+
        *bbox* = only check atoms in replicas that overlap with a processor's sub-domain
 
-
-
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    replicate 2 3 2
 
@@ -66,7 +62,6 @@ replicated.
 Restrictions
 """"""""""""
 
-
 A 2d simulation cannot be replicated in the z dimension.
 
 If a simulation is non-periodic in a dimension, care should be used
@@ -109,8 +104,3 @@ command before and redefined after the replicate command.
 **Related commands:** none
 
 **Default:** none
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/rerun.rst b/doc/src/rerun.rst
index 6563ef7dd0..16b036b449 100644
--- a/doc/src/rerun.rst
+++ b/doc/src/rerun.rst
@@ -6,16 +6,15 @@ rerun command
 Syntax
 """"""
 
-
 .. parsed-literal::
 
    rerun file1 file2 ... keyword args ...
 
 * file1,file2,... = dump file(s) to read
 * one or more keywords may be appended, keyword *dump* must appear and be last
-  
+
   .. parsed-literal::
-  
+
      keyword = *first* or *last* or *every* or *skip* or *start* or *stop* or *dump*
       *first* args = Nfirst
         Nfirst = dump timestep to start on
@@ -31,20 +30,17 @@ Syntax
         Nstop = timestep to which pseudo run will end
       *dump* args = same as :doc:`read_dump <read_dump>` command starting with its field arguments
 
-
-
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    rerun dump.file dump x y z vx vy vz
    rerun dump1.txt dump2.txt first 10000 every 1000 dump x y z
    rerun dump.vels dump x y z vx vy vz box yes format molfile lammpstrj
    rerun dump.dcd dump x y z box no format molfile dcd
    rerun ../run7/dump.file.gz skip 2 dump x y z box yes
-   rerun dump.bp dump x y z box no format adios 
+   rerun dump.bp dump x y z box no format adios
    rerun dump.bp dump x y z vx vy vz format adios timeout 10.0
 
 Description
@@ -57,9 +53,9 @@ computed on the shapshot to produce thermodynamic or other output.
 This can be useful in the following kinds of scenarios, after an
 initial simulation produced the dump file:
 
-* Compute the energy and forces of snaphots using a different potential.
+* Compute the energy and forces of snapshots using a different potential.
 * Calculate one or more diagnostic quantities on the snapshots that
-  weren't computed in the initial run.  These can also be computed with
+  were not computed in the initial run.  These can also be computed with
   settings not used in the initial run, e.g. computing an RDF via the
   :doc:`compute rdf <compute_rdf>` command with a longer cutoff than was
   used initially.
@@ -69,7 +65,6 @@ initial simulation produced the dump file:
   Doing this in the original script would result in different (bad)
   dynamics.
 
-
 Conceptually, using the rerun command is like running an input script
 that has a loop in it (see the :doc:`next <next>` and :doc:`jump <jump>`
 commands).  Each iteration of the loop reads one snapshot from the
@@ -101,10 +96,8 @@ same as for output from any LAMMPS simulation.  See further info below
 as to what that means if the timesteps for snapshots read from dump
 files do not match the specified output frequency.
 
-
 ----------
 
-
 If more than one dump file is specified, the dump files are read one
 after the other.  It is assumed that snapshot timesteps will be in
 ascending order.  If a snapshot is encountered that is not in
@@ -115,13 +108,13 @@ However if you specify a series of dump files in an incorrect order
 (with respect to the timesteps they contain), you may skip large
 numbers of snapshots
 
-Note that the dump files specified as part of the *dump* keyword can
-be parallel files, i.e. written as multiple files either per processor
+Note that the dump files specified as part of the *dump* keyword can be
+parallel files, i.e. written as multiple files either per processor
 and/or per snapshot.  If that is the case they will also be read in
 parallel which can make the rerun command operate dramatically faster
-for large systems.  See the doc page for the `read\_dump <read_dump>`_ and
-:doc:`dump <dump>` commands which describe how to read and write
-parallel dump files.
+for large systems.  See the doc page for the :doc:`read_dump
+<read_dump>` and :doc:`dump <dump>` commands which describe how to read
+and write parallel dump files.
 
 The *first*\ , *last*\ , *every*\ , *skip* keywords determine which
 snapshots are read from the dump file(s).  Snapshots are skipped until
@@ -162,10 +155,8 @@ options it allows for extracting information from the dump file
 snapshots, and for using that information to alter the LAMMPS
 simulation.
 
-
 ----------
 
-
 In general, a LAMMPS input script that uses a rerun command can
 include and perform all the usual operations of an input script that
 uses the :doc:`run <run>` command.  There are a few exceptions and
@@ -209,16 +200,13 @@ but no output will be produced.  If you want output for every dump
 snapshot, you can simply use N=1 for an output frequency, e.g. for
 thermodynamic output or new dump file output.
 
-
 ----------
 
-
 Restrictions
 """"""""""""
 
-
 To read gzipped dump files, you must compile LAMMPS with the
--DLAMMPS\_GZIP option.  See the :doc:`Build settings <Build_settings>`
+-DLAMMPS_GZIP option.  See the :doc:`Build settings <Build_settings>`
 doc page for details.
 
 Related commands
@@ -232,8 +220,3 @@ Default
 The option defaults are first = 0, last = a huge value (effectively
 infinity), start = same as first, stop = same as last, every = 0, skip
 = 1;
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/reset_ids.rst b/doc/src/reset_ids.rst
index e41745fa52..13a374fc29 100644
--- a/doc/src/reset_ids.rst
+++ b/doc/src/reset_ids.rst
@@ -1,21 +1,19 @@
-.. index:: reset\_ids
+.. index:: reset_ids
 
-reset\_ids command
-==================
+reset_ids command
+=================
 
 Syntax
 """"""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    reset_ids
 
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    reset_ids
 
@@ -27,8 +25,8 @@ for bond, angle, dihedral, improper topology data.  This will
 create a set of IDs that are numbered contiguously from 1 to N
 for a N atoms system.
 
-This can be useful to do after performing a "delete\_atoms" command for
-a molecular system.  The delete\_atoms compress yes option will not
+This can be useful to do after performing a "delete_atoms" command for
+a molecular system.  The delete_atoms compress yes option will not
 perform this operation due to the existence of bond topology.  It can
 also be useful to do after any simulation which has lost atoms,
 e.g. due to atoms moving outside a simulation box with fixed
@@ -49,12 +47,12 @@ as the :doc:`create_atoms <create_atoms>` command explains.
    communication was not sufficient to find atoms in bonds, angles, etc
    that are owned by other processors.  The :doc:`comm_modify cutoff <comm_modify>` command can be used to correct this issue.
    Or you can define a pair style before using this command.  If you do
-   the former, you should unset the comm\_modify cutoff after using
-   reset\_ids so that subsequent communication is not inefficient.
+   the former, you should unset the comm_modify cutoff after using
+   reset_ids so that subsequent communication is not inefficient.
 
 Restrictions
 """"""""""""
- none
+none
 
 Related commands
 """"""""""""""""
@@ -62,8 +60,3 @@ Related commands
 :doc:`delete_atoms <delete_atoms>`
 
 **Default:** none
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/reset_timestep.rst b/doc/src/reset_timestep.rst
index e9f8818653..b985bd4154 100644
--- a/doc/src/reset_timestep.rst
+++ b/doc/src/reset_timestep.rst
@@ -1,13 +1,12 @@
-.. index:: reset\_timestep
+.. index:: reset_timestep
 
-reset\_timestep command
-=======================
+reset_timestep command
+======================
 
 Syntax
 """"""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    reset_timestep N
 
@@ -16,8 +15,7 @@ Syntax
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    reset_timestep 0
    reset_timestep 4000000
@@ -37,7 +35,7 @@ was written.
 
 Restrictions
 """"""""""""
- none
+none
 
 This command cannot be used when any fixes are defined that keep track
 of elapsed time to perform certain kinds of time-dependent operations.
@@ -65,8 +63,3 @@ Related commands
 :doc:`rerun <rerun>`
 
 **Default:** none
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/restart.rst b/doc/src/restart.rst
index 6cfbdec475..fd4c1e9e24 100644
--- a/doc/src/restart.rst
+++ b/doc/src/restart.rst
@@ -6,7 +6,6 @@ restart command
 Syntax
 """"""
 
-
 .. parsed-literal::
 
    restart 0
@@ -19,21 +18,18 @@ Syntax
 * file1,file2 = two full filenames, toggle between them when writing file
 * zero or more keyword/value pairs may be appended
 * keyword = *fileper* or *nfile*
-  
+
   .. parsed-literal::
-  
+
        *fileper* arg = Np
          Np = write one file for every this many processors
        *nfile* arg = Nf
          Nf = write this many files, one from each of Nf processors
 
-
-
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    restart 0
    restart 1000 poly.restart
@@ -89,8 +85,7 @@ file via the MPI-IO library, which is part of the MPI standard for
 versions 2.0 and above.  Using MPI-IO requires two steps.  First,
 build LAMMPS with its MPIIO package installed, e.g.
 
-
-.. parsed-literal::
+.. code-block:: bash
 
    make yes-mpiio    # installs the MPIIO package
    make mpi          # build LAMMPS for your platform
@@ -108,7 +103,7 @@ timestep of a run unless it is a multiple of N.  A restart file is
 written on the last timestep of a minimization if N > 0 and the
 minimization converges.
 
-Instead of a numeric value, N can be specified as an :doc:`equal-style variable <variable>`, which should be specified as v\_name, where
+Instead of a numeric value, N can be specified as an :doc:`equal-style variable <variable>`, which should be specified as v_name, where
 name is the variable name.  In this case, the variable is evaluated at
 the beginning of a run to determine the next timestep at which a
 restart file will be written out.  On that timestep, the variable will
@@ -122,16 +117,13 @@ For example, the following commands will write restart files
 every step from 1100 to 1200, and could be useful for debugging
 a simulation where something goes wrong at step 1163:
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    variable       s equal stride(1100,1200,1)
    restart        v_s tmp.restart
 
-
 ----------
 
-
 See the :doc:`read_restart <read_restart>` command for information about
 what is stored in a restart file.
 
@@ -152,10 +144,8 @@ another machine.  In this case, you can use the :doc:`-r command-line switch <Ru
    to re-use that information.  See the :doc:`read_restart <read_restart>`
    command for information about what is stored in a restart file.
 
-
 ----------
 
-
 The optional *nfile* or *fileper* keywords can be used in conjunction
 with the "%" wildcard character in the specified restart file name(s).
 As explained above, the "%" character causes the restart file to be
@@ -174,14 +164,11 @@ file for every Np processors.  For example, if Np = 4, every 4th
 processor (0,4,8,12,etc) will collect information from itself and the
 next 3 processors and write it to a restart file.
 
-
 ----------
 
-
 Restrictions
 """"""""""""
 
-
 To write and read restart files in parallel with MPI-IO, the MPIIO
 package must be installed.
 
@@ -193,12 +180,6 @@ Related commands
 Default
 """""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    restart 0
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/run.rst b/doc/src/run.rst
index 0cf9f3de1d..f36fb73187 100644
--- a/doc/src/run.rst
+++ b/doc/src/run.rst
@@ -6,7 +6,6 @@ run command
 Syntax
 """"""
 
-
 .. parsed-literal::
 
    run N keyword values ...
@@ -14,9 +13,9 @@ Syntax
 * N = # of timesteps
 * zero or more keyword/value pairs may be appended
 * keyword = *upto* or *start* or *stop* or *pre* or *post* or *every*
-  
+
   .. parsed-literal::
-  
+
        *upto* value = none
        *start* value = N1
          N1 = timestep at which 1st run started
@@ -29,13 +28,10 @@ Syntax
          c1,c2,...,cN = one or more LAMMPS commands, each enclosed in quotes
          c1 = NULL means no command will be invoked
 
-
-
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    run 10000
    run 1000000 upto
@@ -74,8 +70,7 @@ keywords.
 
 For example, consider this fix followed by 10 run commands:
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    fix         1 all nvt 200.0 300.0 1.0
    run         1000 start 0 stop 10000
@@ -149,16 +144,14 @@ of M steps each.  After each M-length run, the specified commands are
 invoked.  If only a single command is specified as NULL, then no
 command is invoked.  Thus these lines:
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    variable q equal x[100]
    run 6000 every 2000 "print 'Coord = $q'"
 
 are the equivalent of:
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    variable q equal x[100]
    run 2000
@@ -176,8 +169,7 @@ Note that by using the line continuation character "&", the run every
 command can be spread across many lines, though it is still a single
 command:
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    run 100000 every 1000 &
      "print 'Minimum value = $a'" &
@@ -195,8 +187,7 @@ skipped for intermediate runs.
    You might wish to specify a command that exits the run by
    jumping out of the loop, e.g.
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    variable t equal temp
    run 10000 every 100 "if '$t < 300.0' then 'jump SELF afterrun'"
@@ -210,7 +201,6 @@ has additional options for how to exit the run.
 Restrictions
 """"""""""""
 
-
 When not using the *upto* keyword, the number of specified timesteps N
 must fit in a signed 32-bit integer, so you are limited to slightly
 more than 2 billion steps (2\^31) in a single run.  When using *upto*\ ,
@@ -234,8 +224,3 @@ Default
 
 The option defaults are start = the current timestep, stop = current
 timestep + N, pre = yes, and post = yes.
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/run_style.rst b/doc/src/run_style.rst
index b320c57ea8..474eab2b85 100644
--- a/doc/src/run_style.rst
+++ b/doc/src/run_style.rst
@@ -1,20 +1,19 @@
-.. index:: run\_style
+.. index:: run_style
 
-run\_style command
-==================
+run_style command
+=================
 
 Syntax
 """"""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    run_style style args
 
 * style = *verlet* or *verlet/split* or *respa* or *respa/omp*
-  
+
   .. parsed-literal::
-  
+
        *verlet* args = none
        *verlet/split* args = none
        *respa* args = N n1 n2 ... keyword values ...
@@ -52,13 +51,10 @@ Syntax
            *kspace* value = M
              M = which level (1-N) to compute kspace forces in
 
-
-
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    run_style verlet
    run_style respa 4 2 2 2 bond 1 dihedral 2 pair 3 kspace 4
@@ -73,10 +69,8 @@ simulations performed by LAMMPS.
 
 The *verlet* style is a standard velocity-Verlet integrator.
 
-
 ----------
 
-
 The *verlet/split* style is also a velocity-Verlet integrator, but it
 splits the force calculation within each timestep over 2 partitions of
 processors.  See the :doc:`-partition command-line switch <Run_options>`
@@ -89,7 +83,7 @@ partition.  This include the :doc:`pair style <pair_style>`, :doc:`bond style <b
 :doc:`kspace_style <kspace_style>` portion of the calculation is
 performed on the 2nd partition.
 
-This is most useful for the PPPM kspace\_style when its performance on
+This is most useful for the PPPM kspace_style when its performance on
 a large number of processors degrades due to the cost of communication
 in its 3d FFTs.  In this scenario, splitting your P total processors
 into 2 subsets of processors, P1 in the 1st partition and P2 in the
@@ -111,17 +105,15 @@ match the integer multiple constraint.  See the
 :doc:`processors <processors>` command with its *part* keyword for a way
 to control this, e.g.
 
+.. code-block:: LAMMPS
 
-.. parsed-literal::
-
-   procssors \* \* \* part 1 2 multiple
+   processors * * * part 1 2 multiple
 
 You can also use the :doc:`partition <partition>` command to explicitly
 specify the processor layout on each partition.  E.g. for 2 partitions
 of 60 and 15 processors each:
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    partition yes 1 processors 3 4 5
    partition yes 2 processors 3 1 5
@@ -140,10 +132,8 @@ processors in the 2 partitions to the physical cores of a parallel
 machine.  The :doc:`processors <processors>` command has options to
 support this, and strategies are discussed in :doc:`Section 5 <Speed>` of the manual.
 
-
 ----------
 
-
 The *respa* style implements the rRESPA multi-timescale integrator
 :ref:`(Tuckerman) <Tuckerman3>` with N hierarchical levels, where level 1 is
 the innermost loop (shortest timestep) and level N is the outermost
@@ -206,7 +196,7 @@ levels.  This can be useful, for example, to set different timesteps
 for hybrid coarse-grained/all-atom models.  The *hybrid* keyword
 requires as many level assignments as there are hybrid sub-styles,
 which assigns each sub-style to a rRESPA level, following their order
-of definition in the pair\_style command. Since the *hybrid* keyword
+of definition in the pair_style command. Since the *hybrid* keyword
 operates on pair style computations, it is mutually exclusive with
 either the *pair* or the *inner*\ /\ *middle*\ /\ *outer* keywords.
 
@@ -234,8 +224,7 @@ cutoffs) works reasonably well.  We thus recommend the following
 settings for use of the *respa* style without SHAKE in biomolecular
 simulations:
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    timestep  4.0
    run_style respa 4 2 2 2 inner 2 4.5 6.0 middle 3 8.0 10.0 outer 4
@@ -256,8 +245,7 @@ the size of the time steps in the respa hierarchy.  The following
 settings can be used for biomolecular simulations with SHAKE and
 rRESPA:
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    fix             2 all shake 0.000001 500 0 m 1.0 a 1
    timestep        4.0
@@ -272,8 +260,7 @@ advantageous if there is a clear separation of time scales - fast and
 slow modes in the simulation.  For example, a system of slowly-moving
 charged polymer chains could be setup as follows:
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    timestep 4.0
    run_style respa 2 8
@@ -291,16 +278,13 @@ In real units, for a pure LJ fluid at liquid density, with a sigma of
 3.0 angstroms, and epsilon of 0.1 Kcal/mol, the following settings
 seem to work well:
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    timestep  36.0
    run_style respa 3 3 4 inner 1 3.0 4.0 middle 2 6.0 7.0 outer 3
 
-
 ----------
 
-
 The *respa/omp* style is a variant of *respa* adapted for use with
 pair, bond, angle, dihedral, improper, or kspace styles with an *omp*
 suffix. It is functionally equivalent to *respa* but performs
@@ -317,14 +301,11 @@ input script.
 See the :doc:`Speed packages <Speed_packages>` doc page for more
 instructions on how to use the accelerated styles effectively.
 
-
 ----------
 
-
 Restrictions
 """"""""""""
 
-
 The *verlet/split* style can only be used if LAMMPS was built with the
 REPLICA package. Correspondingly the *respa/omp* style is available
 only if the USER-OMP package was included. See the :doc:`Build package <Build_package>` doc page for more info.
@@ -341,12 +322,11 @@ Related commands
 Default
 """""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    run_style verlet
 
-For run\_style respa, the default assignment of interactions
+For run_style respa, the default assignment of interactions
 to rRESPA levels is as follows:
 
 * bond forces = level 1 (innermost loop)
@@ -357,18 +337,9 @@ to rRESPA levels is as follows:
 * kspace forces = same level as pair forces
 * inner, middle, outer forces = no default
 
-
 ----------
 
-
 .. _Tuckerman3:
 
-
-
 **(Tuckerman)** Tuckerman, Berne and Martyna, J Chem Phys, 97, p 1990
 (1992).
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/server.rst b/doc/src/server.rst
index f366639812..a25d97ba40 100644
--- a/doc/src/server.rst
+++ b/doc/src/server.rst
@@ -6,7 +6,6 @@ server command
 Syntax
 """"""
 
-
 .. parsed-literal::
 
    server protocol
@@ -16,8 +15,7 @@ Syntax
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    server md
 
@@ -53,14 +51,11 @@ For protocol *md*\ , LAMMPS can be either a client (via the :doc:`fix client/md
 
 For protocol *mc*\ , LAMMPS can be the server.  See the :doc:`server mc <server_mc>` doc page for details on the protocol.
 
-
 ----------
 
-
 Restrictions
 """"""""""""
 
-
 This command is part of the MESSAGE package.  It is only enabled if
 LAMMPS was built with that package.  See the :doc:`Build package <Build_package>` doc page for more info.
 
@@ -74,8 +69,3 @@ Related commands
 :doc:`message <message>`, :doc:`fix client/md <fix_client_md>`
 
 **Default:** none
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/server_mc.rst b/doc/src/server_mc.rst
index 850eceb008..e4846a7a33 100644
--- a/doc/src/server_mc.rst
+++ b/doc/src/server_mc.rst
@@ -6,7 +6,6 @@ server mc command
 Syntax
 """"""
 
-
 .. parsed-literal::
 
    server mc
@@ -16,8 +15,7 @@ mc = the protocol argument to the :doc:`server <server>` command
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    server mc
 
@@ -43,12 +41,10 @@ processed.
 
 The :doc:`server <server>` doc page gives other options for using LAMMPS
 See an example of how this command is used in
-examples/COUPLE/lammps\_mc/in.server.
-
+examples/COUPLE/lammps_mc/in.server.
 
 ----------
 
-
 When using this command, LAMMPS (as the server code) receives
 instructions from a Monte Carlo (MC) driver to displace random atoms,
 compute the energy before and after displacement, and run dynamics to
@@ -61,19 +57,18 @@ runs.
 The format and content of the exchanged messages are explained here in
 a conceptual sense.  Python-style pseudo code for the library calls to
 the CSlib is shown, which performs the actual message exchange between
-the two codes.  See the `CSlib website <http://cslib.sandia.gov>`_ doc
+the two codes.  See the `CSlib website <https://cslib.sandia.gov>`_ doc
 pages for more details on the actual library syntax.  The "cs" object
 in this pseudo code is a pointer to an instance of the CSlib.
 
-See the src/MESSAGE/server\_mc.cpp file for details on how LAMMPS uses
-these messages.  See the examples/COUPLE/lammps\_mc/mc.cpp file for an
+See the src/MESSAGE/server_mc.cpp file for details on how LAMMPS uses
+these messages.  See the examples/COUPLE/lammps_mc/mc.cpp file for an
 example of how an MC driver code can use these messages.
 
 Define NATOMS=1, EINIT=2, DISPLACE=3, ACCEPT=4, RUN=5.
 
 **Client sends one of these kinds of message**\ :
 
-
 .. parsed-literal::
 
    cs->send(NATOMS,0)      # msgID = 1 with no fields
@@ -92,7 +87,6 @@ Define NATOMS=1, EINIT=2, DISPLACE=3, ACCEPT=4, RUN=5.
 
 **Server replies**\ :
 
-
 .. parsed-literal::
 
    cs->send(NATOMS,1)      # msgID = 1 with 1 field
@@ -109,14 +103,11 @@ Define NATOMS=1, EINIT=2, DISPLACE=3, ACCEPT=4, RUN=5.
 
    cs->send(RUN,0)         # msgID = 5 with no fields
 
-
 ----------
 
-
 Restrictions
 """"""""""""
 
-
 This command is part of the MESSAGE package.  It is only enabled if
 LAMMPS was built with that package.  See the :doc:`Build package <Build_package>` doc page for more info.
 
@@ -130,8 +121,3 @@ Related commands
 :doc:`message <message>`
 
 **Default:** none
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/server_md.rst b/doc/src/server_md.rst
index 26fd65a797..8304c808b2 100644
--- a/doc/src/server_md.rst
+++ b/doc/src/server_md.rst
@@ -6,7 +6,6 @@ server md command
 Syntax
 """"""
 
-
 .. parsed-literal::
 
    server md
@@ -16,8 +15,7 @@ md = the protocol argument to the :doc:`server <server>` command
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    server md
 
@@ -45,10 +43,8 @@ The :doc:`server <server>` doc page gives other options for using LAMMPS
 in server mode.  See an example of how this command is used in
 examples/message/in.message.server.
 
-
 ----------
 
-
 When using this command, LAMMPS (as the server code) receives the
 current coordinates of all particles from the client code each
 timestep, computes their interaction, and returns the energy, forces,
@@ -64,20 +60,20 @@ forces, and pressure values from the server code.
 The format and content of the exchanged messages are explained here in
 a conceptual sense.  Python-style pseudo code for the library calls to
 the CSlib is shown, which performs the actual message exchange between
-the two codes.  See the `CSlib website <http://cslib.sandia.gov>`_ doc
+the two codes.  See the `CSlib website <https://cslib.sandia.gov>`_ doc
 pages for more details on the actual library syntax.  The "cs" object
 in this pseudo code is a pointer to an instance of the CSlib.
 
-See the src/MESSAGE/server\_md.cpp and src/MESSAGE/fix\_client\_md.cpp
+See the src/MESSAGE/server_md.cpp and src/MESSAGE/fix_client_md.cpp
 files for details on how LAMMPS uses these messages.  See the
-examples/COUPLE/lammps\_vasp/vasp\_wrapper.py file for an example of how
-a quantum code (VASP) can use these messages.
+examples/COUPLE/lammps_vasp/vasp_wrap.py or
+examples/COUPLE/lammps_nwchem/nwchem_wrap.py files for examples of how
+a quantum code (VASP or NWChem) can use these messages.
 
 The following pseudo-code uses these values, defined as enums.
 
 Define:
 
-
 .. parsed-literal::
 
    SETUP=1, STEP=2
@@ -86,7 +82,6 @@ Define:
 
 **Client sends 2 kinds of messages**\ :
 
-
 .. parsed-literal::
 
    # required fields: DIM, PERIODICTY, ORIGIN, BOX, NATOMS, NTYPES, TYPES, COORDS
@@ -116,7 +111,6 @@ Define:
 
 **Server replies to either kind of message**\ :
 
-
 .. parsed-literal::
 
    # required fields: FORCES, ENERGY, PRESSURE
@@ -128,10 +122,8 @@ Define:
    cs->pack(PRESSURE,6,press)   # global pressure tensor (6-vector)
    cs->pack_int(ERROR,flag)     # server had an error (e.g. DFT non-convergence)
 
-
 ----------
 
-
 The units for various quantities that are sent and received iva
 messages are defined for atomic-scale simulations in the table below.
 The client and server codes (including LAMMPS) can use internal units
@@ -150,14 +142,11 @@ If you wish to run LAMMPS in another its non-atomic units, e.g. :doc:`lj units <
 message as indicated above, and both the client and server should
 agree on the units for the data they exchange.
 
-
 ----------
 
-
 Restrictions
 """"""""""""
 
-
 This command is part of the MESSAGE package.  It is only enabled if
 LAMMPS was built with that package.  See the :doc:`Build package <Build_package>` doc page for more info.
 
@@ -167,8 +156,3 @@ Related commands
 :doc:`message <message>`, :doc:`fix client/md <fix_client_md>`
 
 **Default:** none
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/set.rst b/doc/src/set.rst
index 613c19bcca..84792d1a58 100644
--- a/doc/src/set.rst
+++ b/doc/src/set.rst
@@ -6,7 +6,6 @@ set command
 Syntax
 """"""
 
-
 .. parsed-literal::
 
    set style ID keyword values ...
@@ -14,10 +13,10 @@ Syntax
 * style = *atom* or *type* or *mol* or *group* or *region*
 * ID = atom ID range or type range or mol ID range or group ID or region ID
 * one or more keyword/value pairs may be appended
-* keyword = *type* or *type/fraction* or *type/ratio* or *type/subset* or *mol* or *x* or *y* or *z* or           *charge* or *dipole* or *dipole/random* or *quat* or           *spin* or *spin/random* or *quat* or           *quat/random* or *diameter* or *shape* or           *length* or *tri* or *theta* or *theta/random* or           *angmom* or *omega* or           *mass* or *density* or *density/disc* or *volume* or *image* or           *bond* or *angle* or *dihedral* or *improper* or           *meso/e* or *meso/cv* or *meso/rho* or           *smd/contact/radius* or *smd/mass/density* or *dpd/theta* or           *edpd/temp* or *edpd/cv* or *cc* or *i\_name* or *d\_name*
-  
+* keyword = *type* or *type/fraction* or *type/ratio* or *type/subset* or *mol* or *x* or *y* or *z* or           *charge* or *dipole* or *dipole/random* or *quat* or           *spin* or *spin/random* or *quat* or           *quat/random* or *diameter* or *shape* or           *length* or *tri* or *theta* or *theta/random* or           *angmom* or *omega* or           *mass* or *density* or *density/disc* or *volume* or *image* or           *bond* or *angle* or *dihedral* or *improper* or           *meso/e* or *meso/cv* or *meso/rho* or           *smd/contact/radius* or *smd/mass/density* or *dpd/theta* or           *edpd/temp* or *edpd/cv* or *cc* or *i_name* or *d_name*
+
   .. parsed-literal::
-  
+
        *type* value = atom type
          value can be an atom-style variable (see below)
        *type/fraction* values = type fraction seed
@@ -118,22 +117,19 @@ Syntax
        *i_name* value = value for custom integer vector with name
        *d_name* value = value for custom floating-point vector with name
 
-
-
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    set group solvent type 2
    set group solvent type/fraction 2 0.5 12393
    set group edge bond 4
    set region half charge 0.5
    set type 3 charge 0.5
-   set type 1\*3 charge 0.5
-   set atom \* charge v_atomfile
-   set atom 100\*200 x 0.5 y 1.0
+   set type 1*3 charge 0.5
+   set atom * charge v_atomfile
+   set atom 100*200 x 0.5 y 1.0
    set atom 100 vx 0.0 vy 0.0 vz -1.0
    set atom 1492 type 3
 
@@ -158,10 +154,8 @@ their properties reset.  The remaining keywords specify which
 properties to reset and what the new values are.  Some strings like
 *type* or *mol* can be used as a style and/or a keyword.
 
-
 ----------
 
-
 This section describes how to select which atoms to change
 the properties of, via the *style* and *ID* arguments.
 
@@ -184,17 +178,15 @@ style *region* selects all the atoms in the specified geometric
 region.  See the :doc:`group <group>` and :doc:`region <region>` commands
 for details of how to specify a group or region.
 
-
 ----------
 
-
 This section describes the keyword options for which properties to
 change, for the selected atoms.
 
 Note that except where explicitly prohibited below, all of the
 keywords allow an :doc:`atom-style or atomfile-style variable
 <variable>` to be used as the specified value(s).  If the value is a
-variable, it should be specified as v\_name, where name is the
+variable, it should be specified as v_name, where name is the
 variable name.  In this case, the variable will be evaluated, and its
 resulting per-atom value used to determine the value assigned to each
 selected atom.  Note that the per-atom value from the variable will be
@@ -235,7 +227,7 @@ that a particular atom is changed or not changed, regardless of how
 many processors are being used.  This keyword does not allow use of an
 atom-style variable.
 
-Keywords *type/ratio* and *type/subset" also set the atom type for a
+Keywords *type/ratio* and *type/subset* also set the atom type for a
 fraction of the selected atoms.  The actual number of atoms changed
 will be exactly the requested number.  For *type/ratio* the specified
 fraction (0 <= *fraction* <= 1) determines the number.  For
@@ -359,9 +351,9 @@ particles must be ellipsoids as defined by the :doc:`atom_style ellipsoid <atom_
 of the particles is set to the 3 specified components.
 
 Keyword *omega* sets the angular velocity of selected atoms.  The
-particles must be spheres as defined by the "atom\_style sphere"_
-atom\_style.html command.  The angular velocity vector of the particles
-is set to the 3 specified components.
+particles must be spheres as defined by the
+:doc:`atom_style sphere <atom_style>` command.  The angular velocity
+vector of the particles is set to the 3 specified components.
 
 Keyword *mass* sets the mass of all selected particles.  The particles
 must have a per-atom mass attribute, as defined by the
@@ -462,28 +454,27 @@ value >= 0.0, the internal temperature is set to that value.  If it is
 temperature is set to that value.
 
 Keywords *edpd/temp* and *edpd/cv* set the temperature and volumetric
-heat capacity of an eDPD particle as defined by the USER-MESO package.
+heat capacity of an eDPD particle as defined by the USER-MESODPD package.
 Currently, only :doc:`atom_style edpd <atom_style>` defines particles
 with these attributes. The values for the temperature and heat
 capacity must be positive.
 
 Keyword *cc* sets the chemical concentration of a tDPD particle for a
-specified species as defined by the USER-MESO package. Currently, only
+specified species as defined by the USER-MESODPD package. Currently, only
 :doc:`atom_style tdpd <atom_style>` defines particles with this
 attribute. An integer for "index" selects a chemical species (1 to
-Nspecies) where Nspecies is set by the atom\_style command. The value
+Nspecies) where Nspecies is set by the atom_style command. The value
 for the chemical concentration must be >= 0.0.
 
-Keywords *i\_name* and *d\_name* refer to custom integer and
+Keywords *i_name* and *d_name* refer to custom integer and
 floating-point properties that have been added to each atom via the
 :doc:`fix property/atom <fix_property_atom>` command.  When that command
 is used specific names are given to each attribute which are what is
-specified as the "name" portion of *i\_name* or *d\_name*.
+specified as the "name" portion of *i_name* or *d_name*.
 
 Restrictions
 """"""""""""
 
-
 You cannot set an atom attribute (e.g. *mol* or *q* or *volume*\ ) if
 the :doc:`atom_style <atom_style>` does not have that attribute.
 
@@ -506,8 +497,3 @@ Related commands
 :doc:`read_data <read_data>`
 
 **Default:** none
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/shell.rst b/doc/src/shell.rst
index 59ff9e42fb..4eb2652c1a 100644
--- a/doc/src/shell.rst
+++ b/doc/src/shell.rst
@@ -6,15 +6,14 @@ shell command
 Syntax
 """"""
 
-
 .. parsed-literal::
 
-   shell cmd args
+   shell command args
+
+* command = *cd* or *mkdir* or *mv* or *rm* or *rmdir* or *putenv* or arbitrary command
 
-* cmd = *cd* or *mkdir* or *mv* or *rm* or *rmdir* or *putenv* or arbitrary command
-  
   .. parsed-literal::
-  
+
        *cd* arg = dir
          dir = directory to change to
        *mkdir* args = dir1 dir2 ...
@@ -30,13 +29,10 @@ Syntax
          var=value = one of more definitions of environment variables
        anything else is passed as a command to the shell for direct execution
 
-
-
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    shell cd sub1
    shell cd ..
@@ -66,35 +62,34 @@ With the exception of *cd*\ , all commands, including ones invoked via a
 system() call, are executed by only a single processor, so that
 files/directories are not being manipulated by multiple processors.
 
-The *cd* cmd executes the Unix "cd" command to change the working
+The *cd* command executes the Unix "cd" command to change the working
 directory.  All subsequent LAMMPS commands that read/write files will
 use the new directory.  All processors execute this command.
 
-The *mkdir* cmd executes the Unix "mkdir" command to create one or
+The *mkdir* command executes the Unix "mkdir" command to create one or
 more directories.
 
-The *mv* cmd executes the Unix "mv" command to rename a file and/or
+The *mv* command executes the Unix "mv" command to rename a file and/or
 move it to a new directory.
 
-The *rm* cmd executes the Unix "rm" command to remove one or more
+The *rm* command executes the Unix "rm" command to remove one or more
 files.
 
-The *rmdir* cmd executes the Unix "rmdir" command to remove one or
+The *rmdir* command executes the Unix "rmdir" command to remove one or
 more directories.  A directory must be empty to be successfully
 removed.
 
-The *putenv* cmd defines or updates an environment variable directly.
+The *putenv* command defines or updates an environment variable directly.
 Since this command does not pass through the shell, no shell variable
 expansion or globbing is performed, only the usual substitution for
 LAMMPS variables defined with the :doc:`variable <variable>` command is
 performed.  The resulting string is then used literally.
 
-Any other cmd is passed as-is to the shell along with its arguments as
+Any other command is passed as-is to the shell along with its arguments as
 one string, invoked by the C-library system() call.  For example,
 these lines in your input script:
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    variable n equal 10
    variable foo string file2
@@ -102,18 +97,16 @@ these lines in your input script:
 
 would be the same as invoking
 
-
-.. parsed-literal::
+.. code-block:: bash
 
    % my_setup file1 10 file2
 
-from a command-line prompt.  The executable program "my\_setup" is run
+from a command-line prompt.  The executable program "my_setup" is run
 with 3 arguments: file1 10 file2.
 
 Restrictions
 """"""""""""
 
-
 LAMMPS does not detect errors or print warnings when any of these
 commands execute.  E.g. if the specified directory does not exist,
 executing the *cd* command will silently do nothing.
@@ -121,8 +114,3 @@ executing the *cd* command will silently do nothing.
 **Related commands:** none
 
 **Default:** none
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/special_bonds.rst b/doc/src/special_bonds.rst
index 824ed5ead0..d00467b3e8 100644
--- a/doc/src/special_bonds.rst
+++ b/doc/src/special_bonds.rst
@@ -1,21 +1,20 @@
-.. index:: special\_bonds
+.. index:: special_bonds
 
-special\_bonds command
-======================
+special_bonds command
+=====================
 
 Syntax
 """"""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    special_bonds keyword values ...
 
 * one or more keyword/value pairs may be appended
 * keyword = *amber* or *charmm* or *dreiding* or *fene* or *lj/coul* or *lj* or *coul* or *angle* or *dihedral*
-  
+
   .. parsed-literal::
-  
+
        *amber* values = none
        *charmm* values = none
        *dreiding* values = none
@@ -29,12 +28,9 @@ Syntax
        *angle* value = *yes* or *no*
        *dihedral* value = *yes* or *no*
 
-
-
 Examples:
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    special_bonds amber
    special_bonds charmm
@@ -69,7 +65,7 @@ atoms should be excluded (or reduced by a weighting factor).
    sense to define permanent bonds between atoms that interact via these
    potentials, though such bonds may exist elsewhere in your system,
    e.g. when using the :doc:`pair_style hybrid <pair_hybrid>` command.
-   Thus LAMMPS ignores special\_bonds settings when many-body potentials
+   Thus LAMMPS ignores special_bonds settings when many-body potentials
    are calculated.  Please note, that the existence of explicit bonds
    for atoms that are described by a many-body potential will alter the
    neighbor list and thus can render the computation of those interactions
@@ -187,10 +183,8 @@ interaction between atoms 2 and 5 will be unaffected (full weighting
 of 1.0).  If the *dihedral* keyword is specified as *no* which is the
 default, then the 2,5 interaction will also be weighted by 0.5.
 
-
 ----------
 
-
 .. note::
 
    LAMMPS stores and maintains a data structure with a list of the
@@ -205,32 +199,27 @@ default, then the 2,5 interaction will also be weighted by 0.5.
    neighbors to be added.  If you do not do this, you may get an error
    when bonds (or molecules) are added.
 
-
 ----------
 
-
 .. note::
 
    If you reuse this command in an input script, you should set all
    the options you need each time.  This command cannot be used a 2nd
    time incrementally.  E.g. these two commands:
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    special_bonds lj 0.0 1.0 1.0
    special_bonds coul 0.0 0.0 1.0
 
 are not the same as
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    special_bonds lj 0.0 1.0 1.0 coul 0.0 0.0 1.0
 
 In the first case you end up with (after the 2nd command):
 
-
 .. parsed-literal::
 
    LJ: 0.0 0.0 0.0
@@ -238,7 +227,6 @@ In the first case you end up with (after the 2nd command):
 
 while only in the second case, you get the desired settings of:
 
-
 .. parsed-literal::
 
    LJ: 0.0 1.0 1.0
@@ -246,11 +234,11 @@ while only in the second case, you get the desired settings of:
 
 This happens because the LJ (and Coul) settings are reset to
 their default values before modifying them, each time the
-*special\_bonds* command is issued.
+*special_bonds* command is issued.
 
 Restrictions
 """"""""""""
- none
+none
 
 Related commands
 """"""""""""""""
@@ -263,38 +251,23 @@ Default
 All 3 Lennard-Jones and 3 Coulombic weighting coefficients = 0.0,
 angle = no, dihedral = no.
 
-
 ----------
 
-
 .. _Cornell:
 
-
-
 **(Cornell)** Cornell, Cieplak, Bayly, Gould, Merz, Ferguson,
 Spellmeyer, Fox, Caldwell, Kollman, JACS 117, 5179-5197 (1995).
 
 .. _Kremer:
 
-
-
 **(Kremer)** Kremer, Grest, J Chem Phys, 92, 5057 (1990).
 
 .. _MacKerell:
 
-
-
 **(MacKerell)** MacKerell, Bashford, Bellott, Dunbrack, Evanseck, Field,
 Fischer, Gao, Guo, Ha, et al, J Phys Chem, 102, 3586 (1998).
 
 .. _Mayo:
 
-
-
 **(Mayo)** Mayo, Olfason, Goddard III, J Phys Chem, 94, 8897-8909
 (1990).
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/suffix.rst b/doc/src/suffix.rst
index f7737b00d9..ba94214a9b 100644
--- a/doc/src/suffix.rst
+++ b/doc/src/suffix.rst
@@ -6,7 +6,6 @@ suffix command
 Syntax
 """"""
 
-
 .. parsed-literal::
 
    suffix style args
@@ -17,8 +16,7 @@ Syntax
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    suffix off
    suffix on
@@ -44,7 +42,7 @@ package.
 
 These are the variants these packages provide:
 
-* GPU = a handful of pair styles and the PPPM kspace\_style, optimized to
+* GPU = a handful of pair styles and the PPPM kspace_style, optimized to
   run on one or more GPUs or multicore CPU/GPU nodes
 * USER-INTEL = a collection of pair styles and neighbor routines
   optimized to run in single, mixed, or double precision on CPUs and
@@ -59,10 +57,9 @@ These are the variants these packages provide:
   performance
 * HYBRID = a combination of two packages can be specified (see below)
 
-
 As an example, all of the packages provide a :doc:`pair_style lj/cut <pair_lj>` variant, with style names lj/cut/opt, lj/cut/omp,
 lj/cut/gpu, lj/cut/intel, or lj/cut/kk.  A variant styles
-can be specified explicitly in your input script, e.g. pair\_style
+can be specified explicitly in your input script, e.g. pair_style
 lj/cut/gpu. If the suffix command is used with the appropriate style,
 you do not need to modify your input script.  The specified suffix
 (opt,omp,gpu,intel,kk) is automatically appended whenever your
@@ -95,9 +92,9 @@ commands in your input script.
 
    The default :doc:`run_style <run_style>` verlet is invoked prior to
    reading the input script and is therefore not affected by a suffix command
-   in the input script. The KOKKOS package requires "run\_style verlet/kk",
+   in the input script. The KOKKOS package requires "run_style verlet/kk",
    so when using the KOKKOS package it is necessary to either use the command
-   line "-sf kk" command or add an explicit "run\_style verlet" command to the
+   line "-sf kk" command or add an explicit "run_style verlet" command to the
    input script.
 
 Restrictions
@@ -110,8 +107,3 @@ Related commands
 :doc:`-suffix command-line switch <Run_options>`
 
 **Default:** none
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/tad.rst b/doc/src/tad.rst
index d74fb2e8fb..7f4845dc3c 100644
--- a/doc/src/tad.rst
+++ b/doc/src/tad.rst
@@ -6,23 +6,22 @@ tad command
 Syntax
 """"""
 
-
 .. parsed-literal::
 
    tad N t_event T_lo T_hi delta tmax compute-ID keyword value ...
 
 * N = # of timesteps to run (not including dephasing/quenching)
-* t\_event = timestep interval between event checks
-* T\_lo = temperature at which event times are desired
-* T\_hi = temperature at which MD simulation is performed
+* t_event = timestep interval between event checks
+* T_lo = temperature at which event times are desired
+* T_hi = temperature at which MD simulation is performed
 * delta = desired confidence level for stopping criterion
 * tmax = reciprocal of lowest expected pre-exponential factor (time units)
 * compute-ID = ID of the compute used for event detection
 * zero or more keyword/value pairs may be appended
-* keyword = *min* or *neb* or *min\_style* or *neb\_style* or *neb\_log*
-  
+* keyword = *min* or *neb* or *min_style* or *neb_style* or *neb_log*
+
   .. parsed-literal::
-  
+
        *min* values = etol ftol maxiter maxeval
          etol = stopping tolerance for energy (energy units)
          ftol = stopping tolerance for force (force units)
@@ -39,13 +38,10 @@ Syntax
          dtneb = timestep for NEB damped dynamics minimization
        *neb_log* value = file where NEB statistics are printed
 
-
-
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    tad 2000 50 1800 2300 0.01 0.01 event
    tad 2000 50 1800 2300 0.01 0.01 event &
@@ -103,7 +99,6 @@ page for further discussion of multi-replica simulations.
 A TAD run has several stages, which are repeated each time an event is
 performed.  The logic for a TAD run is as follows:
 
-
 .. parsed-literal::
 
    while (time remains):
@@ -124,7 +119,7 @@ initial state and storing the resulting coordinates for reference.
 
 Inside the inner loop, dynamics is run continuously according to
 whatever integrator has been specified by the user, stopping every
-*t\_event* steps to check if a transition event has occurred.  This
+*t_event* steps to check if a transition event has occurred.  This
 check is performed by quenching the system and comparing the resulting
 atom coordinates to the coordinates from the previous basin.
 
@@ -145,19 +140,17 @@ distance.  If so, an "event" has occurred.
 The NEB calculation is similar to that invoked by the :doc:`neb <neb>`
 command, except that the final state is generated internally, instead
 of being read in from a file.  The style of minimization performed by
-NEB is determined by the *neb\_style* keyword and must be a damped
+NEB is determined by the *neb_style* keyword and must be a damped
 dynamics minimizer.  The tolerances and limits for each NEB
 calculation can be set by the *neb* keyword.  As discussed on the
 :doc:`neb <neb>`, it is often advantageous to use a larger timestep for
 NEB than for normal dynamics.  Since the size of the timestep set by
 the :doc:`timestep <timestep>` command is used by TAD for performing
-dynamics, there is a *neb\_step* keyword which can be used to set a
+dynamics, there is a *neb_step* keyword which can be used to set a
 larger timestep for each NEB calculation if desired.
 
-
 ----------
 
-
 A key aspect of the TAD method is setting the stopping criterion
 appropriately.  If this criterion is too conservative, then many
 events must be generated before one is finally executed.  Conversely,
@@ -171,16 +164,14 @@ are not well characterized (the most common case), it will be
 necessary to experiment with the values of *delta* and *tmax* to get a
 good trade-off between accuracy and performance.
 
-A second key aspect is the choice of *t\_hi*. A larger value greatly
+A second key aspect is the choice of *t_hi*. A larger value greatly
 increases the rate at which new events are generated.  However, too
 large a value introduces errors due to anharmonicity (not accounted
 for within hTST). Once again, for any given system, experimentation is
-necessary to determine the best value of *t\_hi*.
-
+necessary to determine the best value of *t_hi*.
 
 ----------
 
-
 Five kinds of output can be generated during a TAD run: event
 statistics, NEB statistics, thermodynamic output by each replica, dump
 files, and restart files.
@@ -188,7 +179,7 @@ files, and restart files.
 Event statistics are printed to the screen and master log.lammps file
 each time an event is executed. The quantities are the timestep, CPU
 time, global event number *N*\ , local event number *M*\ , event status,
-energy barrier, time margin, *t\_lo* and *delt\_lo*.  The timestep is
+energy barrier, time margin, *t_lo* and *delt_lo*.  The timestep is
 the usual LAMMPS timestep, which corresponds to the high-temperature
 time at which the event was detected, in units of timestep.  The CPU
 time is the total processor time since the start of the TAD run.  The
@@ -203,9 +194,9 @@ The time margin is the ratio of the high temperature time in the
 current basin to the stopping time. This last number can be used to
 judge whether the stopping time is too short or too long (see above).
 
-*t\_lo* is the low-temperature event time when the current basin was
-entered, in units of timestep.  del*t\_lo* is the time of each detected
-event, measured relative to *t\_lo*.  *delt\_lo* is equal to the
+*t_lo* is the low-temperature event time when the current basin was
+entered, in units of timestep.  del*t_lo* is the time of each detected
+event, measured relative to *t_lo*.  *delt_lo* is equal to the
 high-temperature time since entering the current basin, scaled by an
 exponential factor that depends on the hi/lo temperature ratio and the
 energy barrier for that event.
@@ -214,11 +205,11 @@ On lines for executed events, with status *E*\ , the global event number
 is incremented by one,
 the local event number and time margin are reset to zero,
 while the global event number, energy barrier, and
-*delt\_lo* match the last event with status *DF*
+*delt_lo* match the last event with status *DF*
 in the immediately preceding block of detected events.
-The low-temperature event time *t\_lo* is incremented by *delt\_lo*.
+The low-temperature event time *t_lo* is incremented by *delt_lo*.
 
-NEB statistics are written to the file specified by the *neb\_log*
+NEB statistics are written to the file specified by the *neb_log*
 keyword. If the keyword value is "none", then no NEB statistics are
 printed out. The statistics are written every *Nevery* timesteps.  See
 the :doc:`neb <neb>` command for a full description of the NEB
@@ -276,19 +267,16 @@ files do not always increase monotonically. However, the timestep
 values printed to the master log file, dump files, and restart files
 are always monotonically increasing.
 
-
 ----------
 
-
 Restrictions
 """"""""""""
 
-
 This command can only be used if LAMMPS was built with the REPLICA
 package.  See the :doc:`Build package <Build_package>` doc
 page for more info.
 
-*N* setting must be integer multiple of *t\_event*.
+*N* setting must be integer multiple of *t_event*.
 
 Runs restarted from restart files written during a TAD run will only
 produce identical results if the user-specified integrator supports
@@ -313,27 +301,16 @@ Default
 """""""
 
 The option defaults are *min* = 0.1 0.1 40 50, *neb* = 0.01 100 100
-10, *neb\_style* = *quickmin*\ , *neb\_step* = the same timestep set by
-the :doc:`timestep <timestep>` command, and *neb\_log* = "none".
-
+10, *neb_style* = *quickmin*\ , *neb_step* = the same timestep set by
+the :doc:`timestep <timestep>` command, and *neb_log* = "none".
 
 ----------
 
-
 .. _Voter2000:
 
-
-
 **(Voter2000)** Sorensen and Voter, J Chem Phys, 112, 9599 (2000)
 
 .. _Voter2002:
 
-
-
 **(Voter2002)** Voter, Montalenti, Germann, Annual Review of Materials
 Research 32, 321 (2002).
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/temper.rst b/doc/src/temper.rst
index ef73ef4094..bb470f0cc0 100644
--- a/doc/src/temper.rst
+++ b/doc/src/temper.rst
@@ -6,7 +6,6 @@ temper command
 Syntax
 """"""
 
-
 .. parsed-literal::
 
    temper N M temp fix-ID seed1 seed2 index
@@ -22,8 +21,7 @@ Syntax
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    temper 100000 100 $t tempfix 0 58728
    temper 40000 100 $t tempfix 0 32285 $w
@@ -52,8 +50,7 @@ variable previously set in the input script, so that each partition is
 assigned a different temperature.  See the :doc:`variable <variable>`
 command for more details.  For example:
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    variable t world 300.0 310.0 320.0 330.0
    fix myfix all nvt temp $t $t 100.0
@@ -80,7 +77,6 @@ The main screen and log file (log.lammps) will list information about
 which temperature is assigned to each replica at each thermodynamic
 output timestep.  E.g. for a simulation with 16 replicas:
 
-
 .. parsed-literal::
 
    Running on 16 partitions of processors
@@ -106,11 +102,10 @@ screen.N files as time proceeds.
 You can have each replica create its own dump file in the following
 manner:
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    variable rep world 0 1 2 3 4 5 6 7
-   dump 1 all atom 1000 dump.temper.$\ *rep*
+   dump 1 all atom 1000 dump.temper.${rep}
 
 .. note::
 
@@ -123,9 +118,9 @@ manner:
    dump file with snapshots at 300K (from all replicas), another with
    snapshots at 310K, etc.  Note that these new dump files will not
    contain "continuous trajectories" for individual atoms, because two
-   successive snapshots (in time) may be from different replicas. The 
-   reorder\_remd\_traj python script can do the reordering for you 
-   (and additionally also calculated configurational log-weights of 
+   successive snapshots (in time) may be from different replicas. The
+   reorder_remd_traj python script can do the reordering for you
+   (and additionally also calculated configurational log-weights of
    trajectory snapshots in the canonical ensemble). The script can be found
    in the tools/replica directory while instructions on how to use it is
    available in doc/Tools (in brief) and as a README file in tools/replica
@@ -142,29 +137,24 @@ the variable to the *N* values listed in the log file for the previous
 run for the replica temperatures at that timestep.  For example if the
 log file listed the following for a simulation with 5 replicas:
 
-
 .. parsed-literal::
 
    500000 2 4 0 1 3
 
 then a setting of
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    variable w world 2 4 0 1 3
 
 would be used to restart the run with a tempering command like the
 example above with $w as the last argument.
 
-
 ----------
 
-
 Restrictions
 """"""""""""
 
-
 This command can only be used if LAMMPS was built with the REPLICA
 package.  See the :doc:`Build package <Build_package>` doc
 page for more info.
@@ -175,8 +165,3 @@ Related commands
 :doc:`variable <variable>`, :doc:`prd <prd>`, :doc:`neb <neb>`
 
 **Default:** none
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/temper_grem.rst b/doc/src/temper_grem.rst
index e686ef23a4..c492adfa69 100644
--- a/doc/src/temper_grem.rst
+++ b/doc/src/temper_grem.rst
@@ -6,7 +6,6 @@ temper/grem command
 Syntax
 """"""
 
-
 .. parsed-literal::
 
    temper/grem N M lambda fix-ID thermostat-ID seed1 seed2 index
@@ -14,7 +13,7 @@ Syntax
 * N = total # of timesteps to run
 * M = attempt a tempering swap every this many steps
 * lambda = initial lambda for this ensemble
-* fix-ID = ID of fix\_grem
+* fix-ID = ID of *fix grem*
 * thermostat-ID = ID of the thermostat that controls kinetic temperature
 * seed1 = random # seed used to decide on adjacent temperature to partner with
 * seed2 = random # seed for Boltzmann factor in Metropolis swap
@@ -23,11 +22,10 @@ Syntax
 Examples
 """"""""
 
+.. code-block:: LAMMPS
 
-.. parsed-literal::
-
-   temper/grem 100000 1000 $\ *lambda* fxgREM fxnvt 0 58728
-   temper/grem 40000 100 $\ *lambda* fxgREM fxnpt 0 32285 $\ *walkers*
+   temper/grem 100000 1000 ${lambda} fxgREM fxnvt 0 58728
+   temper/grem 40000 100 ${lambda} fxgREM fxnpt 0 32285 ${walkers}
 
 Description
 """""""""""
@@ -49,18 +47,18 @@ has the same dependencies, restraints, and input variables which are
 discussed there in greater detail.
 
 Instead of temperature, this command performs replica exchanges in
-lambda as per the generalized ensemble enforced by :doc:`fix grem <fix_grem>`.  The desired lambda is specified by *lambda*\ ,
-which is typically a variable previously set in the input script, so
-that each partition is assigned a different temperature.  See the
-:doc:`variable <variable>` command for more details.  For example:
+lambda as per the generalized ensemble enforced by :doc:`fix grem
+<fix_grem>`.  The desired lambda is specified by *lambda*\ , which is
+typically a variable previously set in the input script, so that each
+partition is assigned a different temperature.  See the :doc:`variable
+<variable>` command for more details.  For example:
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    variable lambda world 400 420 440 460
    fix fxnvt all nvt temp 300.0 300.0 100.0
-   fix fxgREM all grem $\ *lambda* -0.05 -50000 fxnvt
-   temper 100000 100 $\ *lambda* fxgREM fxnvt 3847 58382
+   fix fxgREM all grem ${lambda} -0.05 -50000 fxnvt
+   temper/grem 100000 100 ${lambda} fxgREM fxnvt 3847 58382
 
 would define 4 lambdas with constant kinetic temperature but unique
 generalized temperature, and assign one of them to :doc:`fix grem <fix_grem>` used by each replica, and to the grem command.
@@ -84,30 +82,25 @@ replica) which had previously swapped to new lambda.  This is done
 using a variable. For example if the log file listed the following for
 a simulation with 5 replicas:
 
-
 .. parsed-literal::
 
    500000 2 4 0 1 3
 
 then a setting of
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    variable walkers world 2 4 0 1 3
 
 would be used to restart the run with a grem command like the example
-above with $\ *walkers* as the last argument. This functionality is
+above with ${walkers} as the last argument. This functionality is
 identical to :doc:`temper <temper>`.
 
-
 ----------
 
-
 Restrictions
 """"""""""""
 
-
 This command can only be used if LAMMPS was built with the USER-MISC
 package.  See the :doc:`Build package <Build_package>` doc
 page for more info.
@@ -123,11 +116,4 @@ Related commands
 
 .. _KimStraub:
 
-
-
 **(Kim)** Kim, Keyes, Straub, J Chem Phys, 132, 224107 (2010).
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/temper_npt.rst b/doc/src/temper_npt.rst
index 847d91fb1b..e0897886f4 100644
--- a/doc/src/temper_npt.rst
+++ b/doc/src/temper_npt.rst
@@ -6,7 +6,6 @@ temper/npt command
 Syntax
 """"""
 
-
 .. parsed-literal::
 
    temper/npt  N M temp fix-ID seed1 seed2 pressure index
@@ -23,8 +22,7 @@ Syntax
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    temper/npt 100000 100 $t nptfix 0 58728 1
    temper/npt 2500000 1000 300 nptfix  0 32285 $p
@@ -48,14 +46,11 @@ of pressure, this command works much like the :doc:`temper <temper>`
 command. See the documentation on :doc:`temper <temper>` for information
 on how the parallel tempering is handled in general.
 
-
 ----------
 
-
 Restrictions
 """"""""""""
 
-
 This command can only be used if LAMMPS was built with the USER-MISC
 package.  See the :doc:`Build package <Build_package>` doc page for more
 info.
@@ -72,17 +67,8 @@ Related commands
 
 .. _Okabe2:
 
-
-
 **(Okabe)** T. Okabe, M. Kawata, Y. Okamoto, M. Masuhiro, Chem. Phys. Lett., 335, 435-439 (2001).
 
 .. _Mori2:
 
-
-
 **(Mori)** Y. Mori, Y. Okamoto, J. Phys. Soc. Jpn., 7, 074003 (2010).
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/thermo.rst b/doc/src/thermo.rst
index 503ef84f6d..154fd59431 100644
--- a/doc/src/thermo.rst
+++ b/doc/src/thermo.rst
@@ -6,7 +6,6 @@ thermo command
 Syntax
 """"""
 
-
 .. parsed-literal::
 
    thermo N
@@ -17,8 +16,7 @@ Syntax
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    thermo 100
 
@@ -34,7 +32,7 @@ The content and format of what is printed is controlled by the
 :doc:`thermo_style <thermo_style>` and
 :doc:`thermo_modify <thermo_modify>` commands.
 
-Instead of a numeric value, N can be specified as an :doc:`equal-style variable <variable>`, which should be specified as v\_name, where
+Instead of a numeric value, N can be specified as an :doc:`equal-style variable <variable>`, which should be specified as v_name, where
 name is the variable name.  In this case, the variable is evaluated at
 the beginning of a run to determine the next timestep at which
 thermodynamic info will be written out.  On that timestep, the
@@ -47,8 +45,7 @@ options for :doc:`equal-style variables <variable>`.
 For example, the following commands will output thermodynamic info at
 timesteps 0,10,20,30,100,200,300,1000,2000,etc:
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    variable        s equal logfreq(10,3,10)
    thermo          v_s
@@ -65,12 +62,6 @@ Related commands
 Default
 """""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    thermo 0
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/thermo_modify.rst b/doc/src/thermo_modify.rst
index c0ec18b465..3cec230189 100644
--- a/doc/src/thermo_modify.rst
+++ b/doc/src/thermo_modify.rst
@@ -1,20 +1,19 @@
-.. index:: thermo\_modify
+.. index:: thermo_modify
 
-thermo\_modify command
-======================
+thermo_modify command
+=====================
 
 Syntax
 """"""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    thermo_modify keyword value ...
 
 * one or more keyword/value pairs may be listed
-  
+
   .. parsed-literal::
-  
+
      keyword = *lost* or *lost/bond* or *norm* or *flush* or *line* or *format* or *temp* or *press*\ :l
        *lost* value = *error* or *warn* or *ignore*
        *lost/bond* value = *error* or *warn* or *ignore*
@@ -27,13 +26,10 @@ Syntax
        *temp* value = compute ID that calculates a temperature
        *press* value = compute ID that calculates a pressure
 
-
-
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    thermo_modify lost ignore flush yes
    thermo_modify temp myTemp format 3 %15.8g
@@ -51,9 +47,9 @@ by LAMMPS.
    These options apply to the currently defined thermo style.  When
    you specify a :doc:`thermo_style <thermo_style>` command, all
    thermodynamic settings are restored to their default values, including
-   those previously reset by a thermo\_modify command.  Thus if your input
-   script specifies a thermo\_style command, you should use the
-   thermo\_modify command after it.
+   those previously reset by a thermo_modify command.  Thus if your input
+   script specifies a thermo_style command, you should use the
+   thermo_modify command after it.
 
 The *lost* keyword determines whether LAMMPS checks for lost atoms
 each time it computes thermodynamics and what it does if atoms are
@@ -108,7 +104,7 @@ The *line* keyword determines whether thermodynamics will be output as
 a series of numeric values on one line or in a multi-line format with
 3 quantities with text strings per line and a dashed-line header
 containing the timestep and CPU time.  This modify option overrides
-the *one* and *multi* thermo\_style settings.
+the *one* and *multi* thermo_style settings.
 
 The *format* keyword can be used to change the default numeric format
 of any of quantities the :doc:`thermo_style <thermo_style>` command
@@ -148,7 +144,7 @@ The specified compute ID must have been previously defined by the user
 via the :doc:`compute <compute>` command and it must be a style of
 compute that calculates a temperature.  As described in the
 :doc:`thermo_style <thermo_style>` command, thermo output uses a default
-compute for temperature with ID = *thermo\_temp*.  This option allows
+compute for temperature with ID = *thermo_temp*.  This option allows
 the user to override the default.
 
 The *press* keyword is used to determine how thermodynamic pressure is
@@ -158,13 +154,13 @@ must have been previously defined by the user via the
 :doc:`compute <compute>` command and it must be a style of compute that
 calculates a pressure.  As described in the
 :doc:`thermo_style <thermo_style>` command, thermo output uses a default
-compute for pressure with ID = *thermo\_press*.  This option allows the
+compute for pressure with ID = *thermo_press*.  This option allows the
 user to override the default.
 
 .. note::
 
    If both the *temp* and *press* keywords are used in a single
-   thermo\_modify command (or in two separate commands), then the order in
+   thermo_modify command (or in two separate commands), then the order in
    which the keywords are specified is important.  Note that a :doc:`pressure compute <compute_pressure>` defines its own temperature compute as
    an argument when it is specified.  The *temp* keyword will override
    this (for the pressure compute being used by thermodynamics), but only
@@ -175,7 +171,7 @@ user to override the default.
 
 Restrictions
 """"""""""""
- none
+none
 
 Related commands
 """"""""""""""""
@@ -187,14 +183,9 @@ Default
 
 The option defaults are lost = error, norm = yes for unit style of
 *lj*\ , norm = no for unit style of *real* and *metal*\ , flush = no,
-and temp/press = compute IDs defined by thermo\_style.
+and temp/press = compute IDs defined by thermo_style.
 
 The defaults for the line and format options depend on the thermo
 style.  For styles "one" and "custom", the line and format defaults
 are "one", "%8d", and "%12.8g".  For style "multi", the line and
 format defaults are "multi", "%8d", and "%14.4f".
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/thermo_style.rst b/doc/src/thermo_style.rst
index 0aa401dd96..dbb634a2b0 100644
--- a/doc/src/thermo_style.rst
+++ b/doc/src/thermo_style.rst
@@ -1,21 +1,20 @@
-.. index:: thermo\_style
+.. index:: thermo_style
 
-thermo\_style command
-=====================
+thermo_style command
+====================
 
 Syntax
 """"""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    thermo_style style args
 
 * style = *one* or *multi* or *custom*
 * args = list of arguments for a particular style
-  
+
   .. parsed-literal::
-  
+
        *one* args = none
        *multi* args = none
        *custom* args = list of keywords
@@ -51,7 +50,7 @@ Syntax
            ke = kinetic energy
            etotal = total energy (pe + ke)
            enthalpy = enthalpy (etotal + press\*vol)
-           evdwl = VanderWaal pairwise energy (includes etail)
+           evdwl = van der Waals pairwise energy (includes etail)
            ecoul = Coulombic pairwise energy
            epair = pairwise energy (evdwl + ecoul + elong)
            ebond = bond energy
@@ -60,7 +59,7 @@ Syntax
            eimp = improper energy
            emol = molecular energy (ebond + eangle + edihed + eimp)
            elong = long-range kspace energy
-           etail = VanderWaal energy long-range tail correction
+           etail = van der Waals energy long-range tail correction
            vol = volume
            density = mass density of system
            lx,ly,lz = box lengths in x,y,z
@@ -84,18 +83,15 @@ Syntax
            v_name = value calculated by an equal-style variable with name
            v_name[I] = value calculated by a vector-style variable with name
 
-
-
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    thermo_style multi
    thermo_style custom step temp pe etotal press vol
    thermo_style custom step temp etotal c_myTemp v_abc
-   thermo_style custom step temp etotal c_myTemp[\*] v_abc
+   thermo_style custom step temp etotal c_myTemp[*] v_abc
 
 Description
 """""""""""
@@ -104,17 +100,17 @@ Set the style and content for printing thermodynamic data to the
 screen and log file.
 
 Style *one* prints a one-line summary of thermodynamic info that is
-the equivalent of "thermo\_style custom step temp epair emol etotal
+the equivalent of "thermo_style custom step temp epair emol etotal
 press".  The line contains only numeric values.
 
 Style *multi* prints a multiple-line listing of thermodynamic info
-that is the equivalent of "thermo\_style custom etotal ke temp pe ebond
+that is the equivalent of "thermo_style custom etotal ke temp pe ebond
 eangle edihed eimp evdwl ecoul elong press".  The listing contains
 numeric values and a string ID for each quantity.
 
 Style *custom* is the most general setting and allows you to specify
 which of the keywords listed above you want printed on each
-thermodynamic timestep.  Note that the keywords c\_ID, f\_ID, v\_name are
+thermodynamic timestep.  Note that the keywords c_ID, f_ID, v_name are
 references to :doc:`computes <compute>`, :doc:`fixes <fix>`, and
 equal-style :doc:`variables <variable>` that have been defined elsewhere
 in the input script or can even be new styles which users have added
@@ -128,7 +124,7 @@ outputs if the simulation box volume changes during the simulation.
 The values printed by the various keywords are instantaneous values,
 calculated on the current timestep.  Time-averaged quantities, which
 include values from previous timesteps, can be output by using the
-f\_ID keyword and accessing a fix that does time-averaging such as the
+f_ID keyword and accessing a fix that does time-averaging such as the
 :doc:`fix ave/time <fix_ave_time>` command.
 
 Options invoked by the :doc:`thermo_modify <thermo_modify>` command can
@@ -139,28 +135,25 @@ atoms in the system), and the numeric precision of each printed value.
 
 .. note::
 
-   When you use a "thermo\_style" command, all thermodynamic
+   When you use a "thermo_style" command, all thermodynamic
    settings are restored to their default values, including those
    previously set by a :doc:`thermo_modify <thermo_modify>` command.  Thus
-   if your input script specifies a thermo\_style command, you should use
-   the thermo\_modify command after it.
-
+   if your input script specifies a thermo_style command, you should use
+   the thermo_modify command after it.
 
 ----------
 
-
 Several of the thermodynamic quantities require a temperature to be
 computed: "temp", "press", "ke", "etotal", "enthalpy", "pxx", etc.  By
 default this is done by using a *temperature* compute which is created
 when LAMMPS starts up, as if this command had been issued:
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    compute thermo_temp all temp
 
 See the :doc:`compute temp <compute_temp>` command for details.  Note
-that the ID of this compute is *thermo\_temp* and the group is *all*\ .
+that the ID of this compute is *thermo_temp* and the group is *all*\ .
 You can change the attributes of this temperature (e.g. its
 degrees-of-freedom) via the :doc:`compute_modify <compute_modify>`
 command.  Alternatively, you can directly assign a new compute (that
@@ -173,13 +166,12 @@ computed: "press", "enthalpy", "pxx", etc.  By default this is done by
 using a *pressure* compute which is created when LAMMPS starts up, as
 if this command had been issued:
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    compute thermo_press all pressure thermo_temp
 
 See the :doc:`compute pressure <compute_pressure>` command for details.
-Note that the ID of this compute is *thermo\_press* and the group is
+Note that the ID of this compute is *thermo_press* and the group is
 *all*\ .  You can change the attributes of this pressure via the
 :doc:`compute_modify <compute_modify>` command.  Alternatively, you can
 directly assign a new compute (that calculates pressure) which you
@@ -192,28 +184,25 @@ be computed: "pe", "etotal", "ebond", etc.  This is done by using a
 *pe* compute which is created when LAMMPS starts up, as if this
 command had been issued:
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    compute thermo_pe all pe
 
 See the :doc:`compute pe <compute_pe>` command for details.  Note that
-the ID of this compute is *thermo\_pe* and the group is *all*\ .  You can
+the ID of this compute is *thermo_pe* and the group is *all*\ .  You can
 change the attributes of this potential energy via the
 :doc:`compute_modify <compute_modify>` command.
 
-
 ----------
 
-
 The kinetic energy of the system *ke* is inferred from the temperature
-of the system with 1/2 Kb T of energy for each degree of freedom.
-Thus, using different :doc:`compute commands <compute>` for calculating
-temperature, via the :doc:`thermo_modify temp <thermo_modify>` command,
-may yield different kinetic energies, since different computes that
-calculate temperature can subtract out different non-thermal
-components of velocity and/or include different degrees of freedom
-(translational, rotational, etc).
+of the system with :math:`\frac{1}{2} k_B T` of energy for each degree
+of freedom.  Thus, using different :doc:`compute commands <compute>` for
+calculating temperature, via the :doc:`thermo_modify temp
+<thermo_modify>` command, may yield different kinetic energies, since
+different computes that calculate temperature can subtract out different
+non-thermal components of velocity and/or include different degrees of
+freedom (translational, rotational, etc).
 
 The potential energy of the system *pe* will include contributions
 from fixes if the :doc:`fix_modify thermo <fix_modify>` option is set
@@ -221,16 +210,14 @@ for a fix that calculates such a contribution.  For example, the :doc:`fix wall/
 interacting with the wall.  See the doc pages for "individual fixes"
 to see which ones contribute.
 
-A long-range tail correction *etail* for the VanderWaal pairwise
+A long-range tail correction *etail* for the van der Waals pairwise
 energy will be non-zero only if the :doc:`pair_modify tail <pair_modify>` option is turned on.  The *etail* contribution
 is included in *evdwl*\ , *epair*\ , *pe*\ , and *etotal*\ , and the
 corresponding tail correction to the pressure is included in *press*
 and *pxx*\ , *pyy*\ , etc.
 
-
 ----------
 
-
 The *step*\ , *elapsed*\ , and *elaplong* keywords refer to timestep
 count.  *Step* is the current timestep, or iteration count when a
 :doc:`minimization <minimize>` is being performed.  *Elapsed* is the
@@ -246,7 +233,7 @@ The *dt* keyword is the current timestep size in time
 simulation time, also in time :doc:`units <units>`, which is simply
 (step\*dt) if the timestep size has not changed and the timestep has
 not been reset.  If the timestep has changed (e.g. via :doc:`fix dt/reset <fix_dt_reset>`) or the timestep has been reset (e.g. via
-the "reset\_timestep" command), then the simulation time is effectively
+the "reset_timestep" command), then the simulation time is effectively
 a cumulative value up to the current point.
 
 The *cpu* keyword is elapsed CPU seconds since the beginning of this
@@ -285,8 +272,7 @@ If the timeout timer is inactive, the value of this keyword is 0.0 and
 if the timer is expired, it is negative. This allows for example to exit
 loops cleanly, if the timeout is expired with:
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    if "$(timeremain) < 0.0" then "quit 0"
 
@@ -316,12 +302,10 @@ of triclinic periodic cells, including a precise definition of these
 quantities in terms of the internal LAMMPS cell dimensions *lx*\ , *ly*\ ,
 *lz*\ , *yz*\ , *xz*\ , *xy*\ .
 
-
 ----------
 
-
 For output values from a compute or fix, the bracketed index I used to
-index a vector, as in *c\_ID[I]* or *f\_ID[I]*, can be specified
+index a vector, as in *c_ID[I]* or *f_ID[I]*, can be specified
 using a wildcard asterisk with the index to effectively specify
 multiple values.  This takes the form "\*" or "\*n" or "n\*" or "m\*n".
 If N = the size of the vector (for *mode* = scalar) or the number of
@@ -332,31 +316,28 @@ all indices from n to N (inclusive).  A middle asterisk means all
 indices from m to n (inclusive).
 
 Using a wildcard is the same as if the individual elements of the
-vector had been listed one by one.  E.g. these 2 thermo\_style commands
+vector had been listed one by one.  E.g. these 2 thermo_style commands
 are equivalent, since the :doc:`compute temp <compute_temp>` command
 creates a global vector with 6 values.
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    compute myTemp all temp
-   thermo_style custom step temp etotal c_myTemp[\*]
+   thermo_style custom step temp etotal c_myTemp[*]
    thermo_style custom step temp etotal &
                 c_myTemp[1] c_myTemp[2] c_myTemp[3] &
                 c_myTemp[4] c_myTemp[5] c_myTemp[6]
 
-
 ----------
 
-
-The *c\_ID* and *c\_ID[I]* and *c\_ID[I][J]* keywords allow global
+The *c_ID* and *c_ID[I]* and *c_ID[I][J]* keywords allow global
 values calculated by a compute to be output.  As discussed on the
 :doc:`compute <compute>` doc page, computes can calculate global,
 per-atom, or local values.  Only global values can be referenced by
 this command.  However, per-atom compute values for an individual atom
 can be referenced in a :doc:`variable <variable>` and the variable
-referenced by thermo\_style custom, as discussed below.  See the
-discussion above for how the I in *c\_ID[I]* can be specified with a
+referenced by thermo_style custom, as discussed below.  See the
+discussion above for how the I in *c_ID[I]* can be specified with a
 wildcard asterisk to effectively specify multiple values from a global
 compute vector.
 
@@ -370,18 +351,18 @@ Note that some computes calculate "intensive" global quantities like
 temperature; others calculate "extensive" global quantities like
 kinetic energy that are summed over all atoms in the compute group.
 Intensive quantities are printed directly without normalization by
-thermo\_style custom.  Extensive quantities may be normalized by the
+thermo_style custom.  Extensive quantities may be normalized by the
 total number of atoms in the simulation (NOT the number of atoms in
 the compute group) when output, depending on the :doc:`thermo_modify norm <thermo_modify>` option being used.
 
-The *f\_ID* and *f\_ID[I]* and *f\_ID[I][J]* keywords allow global
+The *f_ID* and *f_ID[I]* and *f_ID[I][J]* keywords allow global
 values calculated by a fix to be output.  As discussed on the
 :doc:`fix <fix>` doc page, fixes can calculate global, per-atom, or
 local values.  Only global values can be referenced by this command.
 However, per-atom fix values can be referenced for an individual atom
 in a :doc:`variable <variable>` and the variable referenced by
-thermo\_style custom, as discussed below.  See the discussion above for
-how the I in *f\_ID[I]* can be specified with a wildcard asterisk to
+thermo_style custom, as discussed below.  See the discussion above for
+how the I in *f_ID[I]* can be specified with a wildcard asterisk to
 effectively specify multiple values from a global fix vector.
 
 The ID in the keyword should be replaced by the actual ID of a fix
@@ -393,13 +374,13 @@ brackets will reference a scalar value from the fix.
 Note that some fixes calculate "intensive" global quantities like
 timestep size; others calculate "extensive" global quantities like
 energy that are summed over all atoms in the fix group.  Intensive
-quantities are printed directly without normalization by thermo\_style
+quantities are printed directly without normalization by thermo_style
 custom.  Extensive quantities may be normalized by the total number of
 atoms in the simulation (NOT the number of atoms in the fix group)
 when output, depending on the :doc:`thermo_modify norm <thermo_modify>`
 option being used.
 
-The *v\_name* keyword allow the current value of a variable to be
+The *v_name* keyword allow the current value of a variable to be
 output.  The name in the keyword should be replaced by the variable
 name that has been defined elsewhere in the input script.  Only
 equal-style and vector-style variables can be referenced; the latter
@@ -415,17 +396,14 @@ output.
 
 Note that equal-style and vector-style variables are assumed to
 produce "intensive" global quantities, which are thus printed as-is,
-without normalization by thermo\_style custom.  You can include a
+without normalization by thermo_style custom.  You can include a
 division by "natoms" in the variable formula if this is not the case.
 
-
 ----------
 
-
 Restrictions
 """"""""""""
 
-
 This command must come after the simulation box is defined by a
 :doc:`read_data <read_data>`, :doc:`read_restart <read_restart>`, or
 :doc:`create_box <create_box>` command.
@@ -440,12 +418,6 @@ Related commands
 Default
 """""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    thermo_style one
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/third_order.rst b/doc/src/third_order.rst
index d49f790812..2a6de933e0 100644
--- a/doc/src/third_order.rst
+++ b/doc/src/third_order.rst
@@ -1,13 +1,12 @@
-.. index:: third\_order
+.. index:: third_order
 
-third\_order command
-====================
+third_order command
+===================
 
 Syntax
 """"""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    third_order group-ID style delta args keyword value ...
 
@@ -15,20 +14,17 @@ Syntax
 * style = *regular* or *eskm*
 * delta = finite different displacement length (distance units)
 * one or more keyword/arg pairs may be appended
-  
+
   .. parsed-literal::
-  
+
        keyword = *file* or *binary*
          *file* name = name of output file for the third order tensor
          *binary* arg = *yes* or *no* or *gzip*
 
-
-
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    third_order 1 regular 0.000001
    third_order 1 eskm 0.000001
@@ -50,13 +46,12 @@ three elements correspond to the three gamma elements for a specific i/alpha/j/b
 The initial five numbers are i, alpha, j, beta, and k respectively.
 
 If the style eskm is selected, the tensor will be using energy units of 10 J/mol.
-These units conform to eskm style from the dynamical\_matrix command, which
+These units conform to eskm style from the dynamical_matrix command, which
 will simplify operations using dynamical matrices with third order tensors.
 
 Restrictions
 """"""""""""
 
-
 The command collects a 9 times the number of atoms in the group on every single MPI rank,
 so the memory requirements can be very significant for large systems.
 
@@ -71,9 +66,4 @@ Related commands
 Default
 """""""
 
-The default settings are file = "third\_order.dat", binary = no
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
+The default settings are file = "third_order.dat", binary = no
diff --git a/doc/src/timer.rst b/doc/src/timer.rst
index a5ef8ca137..eac86656af 100644
--- a/doc/src/timer.rst
+++ b/doc/src/timer.rst
@@ -6,7 +6,6 @@ timer command
 Syntax
 """"""
 
-
 .. parsed-literal::
 
    timer args
@@ -27,8 +26,7 @@ Syntax
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    timer full sync
    timer timeout 2:00:00 every 100
@@ -127,14 +125,8 @@ Related commands
 Default
 """""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    timer normal nosync
    timer timeout off
    timer every 10
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/timestep.rst b/doc/src/timestep.rst
index ddbe33a9d2..7ee090740a 100644
--- a/doc/src/timestep.rst
+++ b/doc/src/timestep.rst
@@ -6,7 +6,6 @@ timestep command
 Syntax
 """"""
 
-
 .. parsed-literal::
 
    timestep dt
@@ -16,8 +15,7 @@ Syntax
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    timestep 2.0
    timestep 0.003
@@ -67,8 +65,3 @@ Default
 +--------------------------------+------------+-----------------------+
 | nano                           | nsec       | 0.00045 nsec          |
 +--------------------------------+------------+-----------------------+
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/uncompute.rst b/doc/src/uncompute.rst
index 941a7b7b38..16efdb86bf 100644
--- a/doc/src/uncompute.rst
+++ b/doc/src/uncompute.rst
@@ -6,7 +6,6 @@ uncompute command
 Syntax
 """"""
 
-
 .. parsed-literal::
 
    uncompute compute-ID
@@ -16,8 +15,7 @@ Syntax
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    uncompute 2
    uncompute lower-boundary
@@ -39,8 +37,3 @@ Related commands
 :doc:`compute <compute>`
 
 **Default:** none
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/undump.rst b/doc/src/undump.rst
index e79269e8dd..b45e10082b 100644
--- a/doc/src/undump.rst
+++ b/doc/src/undump.rst
@@ -6,7 +6,6 @@ undump command
 Syntax
 """"""
 
-
 .. parsed-literal::
 
    undump dump-ID
@@ -16,8 +15,7 @@ Syntax
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    undump mine
    undump 2
@@ -38,8 +36,3 @@ Related commands
 :doc:`dump <dump>`
 
 **Default:** none
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/unfix.rst b/doc/src/unfix.rst
index 016ac211aa..e5696a1d7d 100644
--- a/doc/src/unfix.rst
+++ b/doc/src/unfix.rst
@@ -6,7 +6,6 @@ unfix command
 Syntax
 """"""
 
-
 .. parsed-literal::
 
    unfix fix-ID
@@ -16,8 +15,7 @@ Syntax
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    unfix 2
    unfix lower-boundary
@@ -39,8 +37,3 @@ Related commands
 :doc:`fix <fix>`
 
 **Default:** none
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/units.rst b/doc/src/units.rst
index 57558a4f53..95792f7edf 100644
--- a/doc/src/units.rst
+++ b/doc/src/units.rst
@@ -6,7 +6,6 @@ units command
 Syntax
 """"""
 
-
 .. parsed-literal::
 
    units style
@@ -16,8 +15,7 @@ Syntax
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    units metal
    units lj
@@ -51,33 +49,32 @@ new units.  And you must correctly convert all output from the new
 units to the old units when comparing to the original results.  That
 is often not simple to do.
 
-
 ----------
 
-
 For style *lj*\ , all quantities are unitless.  Without loss of
-generality, LAMMPS sets the fundamental quantities mass, sigma,
-epsilon, and the Boltzmann constant = 1.  The masses, distances,
-energies you specify are multiples of these fundamental values.  The
-formulas relating the reduced or unitless quantity (with an asterisk)
-to the same quantity with units is also given.  Thus you can use the
-mass & sigma & epsilon values for a specific material and convert the
-results from a unitless LJ simulation into physical quantities.
+generality, LAMMPS sets the fundamental quantities mass, :math:`\sigma`,
+:math:`\epsilon`, and the Boltzmann constant :math:`k_B = 1`.  The
+masses, distances, energies you specify are multiples of these
+fundamental values.  The formulas relating the reduced or unitless
+quantity (with an asterisk) to the same quantity with units is also
+given.  Thus you can use the mass & :math:`\sigma` & :math:`\epsilon`
+values for a specific material and convert the results from a unitless
+LJ simulation into physical quantities.
 
-* mass = mass or m
-* distance = sigma, where x\* = x / sigma
-* time = tau, where t\* = t (epsilon / m / sigma\^2)\^1/2
-* energy = epsilon, where E\* = E / epsilon
-* velocity = sigma/tau, where v\* = v tau / sigma
-* force = epsilon/sigma, where f\* = f sigma / epsilon
-* torque = epsilon, where t\* = t / epsilon
-* temperature = reduced LJ temperature, where T\* = T Kb / epsilon
-* pressure = reduced LJ pressure, where P\* = P sigma\^3 / epsilon
-* dynamic viscosity = reduced LJ viscosity, where eta\* = eta sigma\^3 / epsilon / tau
-* charge = reduced LJ charge, where q\* = q / (4 pi perm0 sigma epsilon)\^1/2
-* dipole = reduced LJ dipole, moment where \*mu = mu / (4 pi perm0 sigma\^3 epsilon)\^1/2
-* electric field = force/charge, where E\* = E (4 pi perm0 sigma epsilon)\^1/2 sigma / epsilon
-* density = mass/volume, where rho\* = rho sigma\^dim
+* mass = mass or *m*
+* distance = :math:`\sigma`, where :math:`x^* = \frac{x}{\sigma}`
+* time = :math:`\tau`, where :math:`\tau^* = \tau \sqrt{\frac{\epsilon}{m \sigma^2}}`
+* energy = :math:`\epsilon`, where :math:`E^* = \frac{E}{\epsilon}`
+* velocity = :math:`\frac{\sigma}{\tau}`, where :math:`v^* = v \frac{\tau}{\sigma}`
+* force = :math:`\frac{\epsilon}{\sigma}`, where :math:`f^* = f \frac{\sigma}{\epsilon}`
+* torque = :math:`\epsilon`, where :math:`t^* = \frac{t}{\epsilon}`
+* temperature = reduced LJ temperature, where :math:`T^* = \frac{T k_B}{\epsilon}`
+* pressure = reduced LJ pressure, where :math:`p^* = p \frac{\sigma^3}{\epsilon}`
+* dynamic viscosity = reduced LJ viscosity, where :math:`\eta^* = \eta \frac{\sigma^3}{\epsilon\tau}`
+* charge = reduced LJ charge, where :math:`q^* = q \frac{1}{\sqrt{4 \pi \varepsilon_0 \sigma \epsilon}}`
+* dipole = reduced LJ dipole, moment where :math:`\mu^* = \mu \frac{1}{\sqrt{4 \pi \varepsilon_0 \sigma^3 \epsilon}}`
+* electric field = force/charge, where :math:`E^* = E \frac{\sqrt{4 \pi \varepsilon_0 \sigma \epsilon} \sigma}{\epsilon}`
+* density = mass/volume, where :math:`\rho^* = \rho \sigma^{dim}`
 
 Note that for LJ units, the default mode of thermodynamic output via
 the :doc:`thermo_style <thermo_style>` command is to normalize all
@@ -218,7 +215,6 @@ distance to default values for each style:
 Restrictions
 """"""""""""
 
-
 This command cannot be used after the simulation box is defined by a
 :doc:`read_data <read_data>` or :doc:`create_box <create_box>` command.
 
@@ -227,12 +223,6 @@ This command cannot be used after the simulation box is defined by a
 Default
 """""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    units lj
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/variable.rst b/doc/src/variable.rst
index 3e44b56f37..0e30efc0ab 100644
--- a/doc/src/variable.rst
+++ b/doc/src/variable.rst
@@ -6,16 +6,15 @@ variable command
 Syntax
 """"""
 
-
 .. parsed-literal::
 
    variable name style args ...
 
 * name = name of variable to define
 * style = *delete* or *index* or *loop* or *world* or *universe* or *uloop* or *string* or *format* or *getenv* or *file* or *atomfile* or *python* or *internal* or *equal* or *vector* or *atom*
-  
+
   .. parsed-literal::
-  
+
        *delete* = no args
        *index* args = one or more strings
        *loop* args = N
@@ -74,22 +73,19 @@ Syntax
          fix references = f_ID, f_ID[i], f_ID[i][j], F_ID, F_ID[i]
          variable references = v_name, v_name[i]
 
-
-
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    variable x index run1 run2 run3 run4 run5 run6 run7 run8
    variable LoopVar loop $n
    variable beta equal temp/3.0
-   variable b1 equal x[234]+0.5\*vol
-   variable b1 equal "x[234] + 0.5\*vol"
+   variable b1 equal x[234]+0.5*vol
+   variable b1 equal "x[234] + 0.5*vol"
    variable b equal xcm(mol1,x)/2.0
    variable b equal c_myTemp
-   variable b atom x\*y/vol
+   variable b atom x*y/vol
    variable foo string myfile
    variable foo internal 3.5
    variable myPy python increase
@@ -198,7 +194,7 @@ There are two exceptions to this rule.  First, variables of style
 allows these style of variables to be redefined multiple times in an
 input script.  In a loop, this means the formula associated with an
 *equal* or *atom* style variable can change if it contains a
-substitution for another variable, e.g. $x or v\_x.
+substitution for another variable, e.g. $x or v_x.
 
 Second, as described below, if a variable is iterated on to the end of
 its list of strings via the :doc:`next <next>` command, it is removed
@@ -206,10 +202,8 @@ from the list of active variables, and is thus available to be
 re-defined in a subsequent variable command.  The *delete* style does
 the same thing.
 
-
 ----------
 
-
 The :doc:`Commands parse <Commands_parse>` doc page explains how
 occurrences of a variable name in an input script line are replaced by
 the variable's string.  The variable name can be referenced as $x if
@@ -231,8 +225,7 @@ script or when the input script is looped over.  This can be useful
 when breaking out of a loop via the :doc:`if <if>` and :doc:`jump <jump>`
 commands before the variable would become exhausted.  For example,
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    label       loop
    variable    a loop 5
@@ -243,10 +236,8 @@ commands before the variable would become exhausted.  For example,
    label       break
    variable    a delete
 
-
 ----------
 
-
 This section describes how all the various variable styles are defined
 and what they store.  Except for the *equal* and *vector* and *atom*
 styles, which are explained in the next section.
@@ -379,7 +370,6 @@ the count N of per-atom lines to immediately follow.  N can be the
 total number of atoms in the system, or only a subset.  The next N
 lines have the following format
 
-
 .. parsed-literal::
 
    ID value
@@ -398,8 +388,7 @@ to match a function name specified in a :doc:`python <python>` command
 which returns a value to this variable as defined by its *return*
 keyword.  For example these two commands would be self-consistent:
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    variable foo python myMultiply
    python myMultiply return v_foo format f file funcs.py
@@ -430,10 +419,8 @@ internal-style variable can be used in place of an equal-style
 variable anywhere else in an input script, e.g. as an argument to
 another command that allows for equal-style variables.
 
-
 ----------
 
-
 For the *equal* and *vector* and *atom* styles, a single string is
 specified which represents a formula that will be evaluated afresh
 each time the variable is used.  If you want spaces in the string,
@@ -468,10 +455,9 @@ simple, but multiple quantities can be nested and combined in various
 ways to build up formulas of arbitrary complexity.  For example, this
 is a valid (though strange) variable formula:
 
+.. code-block:: LAMMPS
 
-.. parsed-literal::
-
-   variable x equal "pe + c_MyTemp / vol\^(1/3)"
+   variable x equal "pe + c_MyTemp / vol^(1/3)"
 
 Specifically, a formula can contain numbers, constants, thermo
 keywords, math operators, math functions, group functions, region
@@ -499,11 +485,11 @@ references, and references to other variables.
 +--------------------+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
 | Atom vectors       | id, mass, type, mol, x, y, z, vx, vy, vz, fx, fy, fz, q                                                                                                                                                                                                                                                                                                   |
 +--------------------+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
-| Compute references | c\_ID, c\_ID[i], c\_ID[i][j], C\_ID, C\_ID[i]                                                                                                                                                                                                                                                                                                             |
+| Compute references | c_ID, c_ID[i], c_ID[i][j], C_ID, C_ID[i]                                                                                                                                                                                                                                                                                                                  |
 +--------------------+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
-| Fix references     | f\_ID, f\_ID[i], f\_ID[i][j], F\_ID, F\_ID[i]                                                                                                                                                                                                                                                                                                             |
+| Fix references     | f_ID, f_ID[i], f_ID[i][j], F_ID, F_ID[i]                                                                                                                                                                                                                                                                                                                  |
 +--------------------+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
-| Other variables    | v\_name, v\_name[i]                                                                                                                                                                                                                                                                                                                                       |
+| Other variables    | v_name, v_name[i]                                                                                                                                                                                                                                                                                                                                         |
 +--------------------+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
 
 Most of the formula elements produce a scalar value.  Some produce a
@@ -530,10 +516,8 @@ the atom-style variable, only atoms in the group are included in the
 formula evaluation.  The variable evaluates to 0.0 for atoms not in
 the group.
 
-
 ----------
 
-
 Numbers, constants, and thermo keywords
 ---------------------------------------
 
@@ -551,8 +535,7 @@ adapt automatically to LAMMPS versions, when non-backwards compatible
 syntax changes are introduced. Here is an illustrative example (which
 will not work, since the *version* has been introduced more recently):
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    if $(version<20140513) then "communicate vel yes" else "comm_modify vel yes"
 
@@ -562,7 +545,7 @@ require a :doc:`compute <compute>` to calculate their values such as
 "temp" or "press", use computes stored and invoked by the
 :doc:`thermo_style <thermo_style>` command.  This means that you can
 only use those keywords in a variable if the style you are using with
-the thermo\_style command (and the thermo keywords associated with that
+the thermo_style command (and the thermo keywords associated with that
 style) also define and use the needed compute.  Note that some thermo
 keywords use a compute indirectly to calculate their value (e.g. the
 enthalpy keyword uses temp, pe, and pressure).  If a variable is
@@ -570,10 +553,8 @@ evaluated directly in an input script (not during a run), then the
 values accessed by the thermo keyword must be current.  See the
 discussion below about "Variable Accuracy".
 
-
 ----------
 
-
 Math Operators
 --------------
 
@@ -622,10 +603,8 @@ whose properties satisfy one or more criteria could be calculated by
 taking the returned per-atom vector of ones and zeroes and passing it
 to the :doc:`compute reduce <compute_reduce>` command.
 
-
 ----------
 
-
 Math Functions
 --------------
 
@@ -673,7 +652,6 @@ The ramp(x,y) function uses the current timestep to generate a value
 linearly interpolated between the specified x,y values over the course
 of a run, according to this formula:
 
-
 .. parsed-literal::
 
    value = x + (y-x) \* (timestep-startstep) / (stopstep-startstep)
@@ -691,7 +669,6 @@ timestep in the sequence is returned.  Thus if stagger(1000,100) is
 used in a variable by the :doc:`dump_modify every <dump_modify>`
 command, it will generate the sequence of output timesteps:
 
-
 .. parsed-literal::
 
    100,1000,1100,2000,2100,3000,etc
@@ -706,7 +683,6 @@ any current timestep, the next timestep in the sequence is returned.
 Thus if logfreq(100,4,10) is used in a variable by the :doc:`dump_modify every <dump_modify>` command, it will generate this sequence of
 output timesteps:
 
-
 .. parsed-literal::
 
    100,200,300,400,1000,2000,3000,4000,10000,20000,etc
@@ -718,7 +694,6 @@ logfreq2(100,18,10) is used in a variable by the :doc:`dump_modify every <dump_m
 1000 is divided as 900/18 = 50 steps, and it will generate the
 sequence of output timesteps:
 
-
 .. parsed-literal::
 
    100,150,200,...950,1000,1500,2000,...9500,10000,15000,etc
@@ -731,7 +706,6 @@ between 10 and 1000 is divided into 24 parts with a multiplicative
 separation of ~1.21, and it will generate the following sequence of output
 timesteps:
 
-
 .. parsed-literal::
 
    10, 13, 15, 18, 22, 27, 32,...384, 465, 563, 682, 826, 1000
@@ -746,7 +720,6 @@ in the sequence is returned.  Thus if stride(1000,2000,100) is used
 in a variable by the :doc:`dump_modify every <dump_modify>` command, it
 will generate the sequence of output timesteps:
 
-
 .. parsed-literal::
 
    1000,1100,1200, ... ,1900,2000
@@ -766,7 +739,6 @@ if stride2(1000,2000,100,1350,1360,1) is used in a variable by the
 :doc:`dump_modify every <dump_modify>` command, it will generate the
 sequence of output timesteps:
 
-
 .. parsed-literal::
 
    1000,1100,1200,1300,1350,1351,1352, ... 1359,1360,1400,1500, ... ,2000
@@ -776,7 +748,6 @@ velocity, and uses the elapsed time to change the value by a linear
 displacement due to the applied velocity over the course of a run,
 according to this formula:
 
-
 .. parsed-literal::
 
    value = value0 + velocity\*(timestep-startstep)\*dt
@@ -794,7 +765,6 @@ x = value0, y = amplitude, z = period.  They use the elapsed time to
 oscillate the value by a sin() or cos() function over the course of a
 run, according to one of these formulas, where omega = 2 PI / period:
 
-
 .. parsed-literal::
 
    value = value0 + Amplitude \* sin(omega\*(timestep-startstep)\*dt)
@@ -808,10 +778,8 @@ the *start* keyword of the :doc:`run <run>` command.  See the
 :doc:`thermo_style <thermo_style>` keyword elaplong =
 timestep-startstep.
 
-
 ----------
 
-
 Group and Region Functions
 --------------------------
 
@@ -845,10 +813,8 @@ The function is computed for all atoms that are in both the group and
 the region.  If the group is "all", then the only criteria for atom
 inclusion is that it be in the region.
 
-
 ----------
 
-
 Special Functions
 -----------------
 
@@ -856,15 +822,15 @@ Special functions take specific kinds of arguments, meaning their
 arguments cannot be formulas themselves.
 
 The sum(x), min(x), max(x), ave(x), trap(x), and slope(x) functions
-each take 1 argument which is of the form "c\_ID" or "c\_ID[N]" or
-"f\_ID" or "f\_ID[N]" or "v\_name".  The first two are computes and the
+each take 1 argument which is of the form "c_ID" or "c_ID[N]" or
+"f_ID" or "f_ID[N]" or "v_name".  The first two are computes and the
 second two are fixes; the ID in the reference should be replaced by
 the ID of a compute or fix defined elsewhere in the input script.  The
 compute or fix must produce either a global vector or array.  If it
 produces a global vector, then the notation without "[N]" should be
 used.  If it produces a global array, then the notation with "[N]"
 should be used, when N is an integer, to specify which column of the
-global array is being referenced.  The last form of argument "v\_name"
+global array is being referenced.  The last form of argument "v_name"
 is for a vector-style variable where "name" is replaced by the name of
 the variable.
 
@@ -909,7 +875,7 @@ variables.  It returns a 1 for atoms that are in both the group and
 region, and a 0 for atoms that are not in both.
 
 The next(x) function takes 1 argument which is a variable ID (not
-"v\_foo", just "foo").  It must be for a file-style or atomfile-style
+"v_foo", just "foo").  It must be for a file-style or atomfile-style
 variable.  Each time the next() function is invoked (i.e. each time
 the equal-style or atom-style variable is evaluated), the following
 steps occur.
@@ -933,10 +899,8 @@ invoked more times than there are lines or sets of lines in the file,
 the variable is deleted, similar to how the :doc:`next <next>` command
 operates.
 
-
 ----------
 
-
 Feature Functions
 -----------------
 
@@ -948,23 +912,23 @@ themselves (only $-style immediate variable expansion is possible).
 Return value is either 1.0 or 0.0 depending on whether the function
 evaluates to true or false, respectively.
 
-The *is\_active()* function allows to query for active settings which
+The *is_active()* function allows to query for active settings which
 are grouped by categories. Currently supported categories and
 arguments are:
 
 * *package* (argument = *gpu* or *intel* or *kokkos* or *omp*\ )
 * *newton* (argument = *pair* or *bond* or *any*\ )
 * *pair* (argument = *single* or *respa* or *manybody* or *tail* or *shift*\ )
-* *comm\_style* (argument = *brick* or *tiled*\ )
-* *min\_style* (argument = any of the compiled in minimizer styles)
-* *run\_style* (argument = any of the compiled in run styles)
-* *atom\_style* (argument = any of the compiled in atom styles)
-* *pair\_style* (argument = any of the compiled in pair styles)
-* *bond\_style* (argument = any of the compiled in bond styles)
-* *angle\_style* (argument = any of the compiled in angle styles)
-* *dihedral\_style* (argument = any of the compiled in dihedral styles)
-* *improper\_style* (argument = any of the compiled in improper styles)
-* *kspace\_style* (argument = any of the compiled in kspace styles)
+* *comm_style* (argument = *brick* or *tiled*\ )
+* *min_style* (argument = any of the compiled in minimizer styles)
+* *run_style* (argument = any of the compiled in run styles)
+* *atom_style* (argument = any of the compiled in atom styles)
+* *pair_style* (argument = any of the compiled in pair styles)
+* *bond_style* (argument = any of the compiled in bond styles)
+* *angle_style* (argument = any of the compiled in angle styles)
+* *dihedral_style* (argument = any of the compiled in dihedral styles)
+* *improper_style* (argument = any of the compiled in improper styles)
+* *kspace_style* (argument = any of the compiled in kspace styles)
 
 Most of the settings are self-explanatory, the *single* argument in the
 *pair* category allows to check whether a pair style supports a
@@ -975,8 +939,7 @@ the checking is also done using suffix flags, if available and enabled.
 
 Example 1: disable use of suffix for pppm when using GPU package (i.e. run it on the CPU concurrently to running the pair style on the GPU), but do use the suffix otherwise (e.g. with USER-OMP).
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    pair_style lj/cut/coul/long 14.0
    if $(is_active(package,gpu)) then "suffix off"
@@ -984,20 +947,19 @@ Example 1: disable use of suffix for pppm when using GPU package (i.e. run it on
 
 Example 2: use r-RESPA with inner/outer cutoff, if supported by pair style, otherwise fall back to using pair and reducing the outer time step
 
+.. code-block:: LAMMPS
 
-.. parsed-literal::
-
-   timestep $(2.0\*(1.0+2.0\*is_active(pair,respa))
+   timestep $(2.0*(1.0+2.0*is_active(pair,respa))
    if $(is_active(pair,respa)) then "run_style respa 4 3 2 2  improper 1 inner 2 5.5 7.0 outer 3 kspace 4" else "run_style respa 3 3 2  improper 1 pair 2 kspace 3"
 
-The *is\_defined()* function allows to query categories like *compute*\ ,
+The *is_defined()* function allows to query categories like *compute*\ ,
 *dump*\ , *fix*\ , *group*\ , *region*\ , and *variable* whether an entry
 with the provided name or id is defined.
 
-The *is\_available(category,name)* function allows to query whether
+The *is_available(category,name)* function allows to query whether
 a specific optional feature is available, i.e. compiled in.
 This currently works for the following categories: *command*\ ,
-*compute*\ , *fix*\ , *pair\_style* and *feature*\ . For all categories
+*compute*\ , *fix*\ , *pair_style* and *feature*\ . For all categories
 except *command* and *feature* also appending active suffixes is
 tried before reporting failure.
 
@@ -1009,30 +971,27 @@ and C++ exceptions for error handling. Corresponding values for name are
 This enables writing input scripts which only dump using a given format if
 the compiled binary supports it.
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    if "$(is_available(feature,png))" then "print 'PNG supported'" else "print 'PNG not supported'"
 
    if "$(is_available(feature,ffmpeg)" then "dump 3 all movie 25 movie.mp4 type type zoom 1.6 adiam 1.0"
 
-
 ----------
 
-
 Atom Values and Vectors
 -----------------------
 
 Atom values take an integer argument I from 1 to N, where I is the
 atom-ID, e.g. x[243], which means use the x coordinate of the atom
-with ID = 243.  Or they can take a variable name, specified as v\_name,
-where name is the name of the variable, like x[v\_myIndex].  The
+with ID = 243.  Or they can take a variable name, specified as v_name,
+where name is the name of the variable, like x[v_myIndex].  The
 variable can be of any style except *vector* or *atom* or *atomfile*
 variables.  The variable is evaluated and the result is expected to be
 numeric and is cast to an integer (i.e. 3.4 becomes 3), to use an
 index, which must be a value from 1 to N.  Note that a "formula"
 cannot be used as the argument between the brackets, e.g. x[243+10]
-or x[v\_myIndex+1] are not allowed.  To do this a single variable can
+or x[v_myIndex+1] are not allowed.  To do this a single variable can
 be defined that contains the needed formula.
 
 Note that the 0 < atom-ID <= N, where N is the largest atom ID
@@ -1052,10 +1011,8 @@ Note that many other atom attributes can be used as inputs to a
 variable by using the :doc:`compute property/atom <compute_property_atom>` command and then specifying
 a quantity from that compute.
 
-
 ----------
 
-
 Compute References
 ------------------
 
@@ -1081,15 +1038,15 @@ reference means, since computes only produce either global or per-atom
 quantities, never both.
 
 +-------------+-------------------------------------------------------------------------------------------------------+
-| c\_ID       | global scalar, or per-atom vector                                                                     |
+| c_ID       | global scalar, or per-atom vector                                                                      |
 +-------------+-------------------------------------------------------------------------------------------------------+
-| c\_ID[I]    | Ith element of global vector, or atom I's value in per-atom vector, or Ith column from per-atom array |
+| c_ID[I]    | Ith element of global vector, or atom I's value in per-atom vector, or Ith column from per-atom array  |
 +-------------+-------------------------------------------------------------------------------------------------------+
-| c\_ID[I][J] | I,J element of global array, or atom I's Jth value in per-atom array                                  |
+| c_ID[I][J] | I,J element of global array, or atom I's Jth value in per-atom array                                   |
 +-------------+-------------------------------------------------------------------------------------------------------+
 
 For I and J indices, integers can be specified or a variable name,
-specified as v\_name, where name is the name of the variable.  The
+specified as v_name, where name is the name of the variable.  The
 rules for this syntax are the same as for the "Atom Values and
 Vectors" discussion above.
 
@@ -1099,17 +1056,16 @@ global vector.  Consider a compute with ID "foo" that does this,
 referenced as follows by variable "a", where "myVec" is another
 vector-style variable:
 
+.. code-block:: LAMMPS
 
-.. parsed-literal::
+   variable a vector c_foo*v_myVec
 
-   variable a vector c_foo\*v_myVec
-
-The reference "c\_foo" could refer to either the global scalar or
-global vector produced by compute "foo".  In this case, "c\_foo" will
-always refer to the global scalar, and "C\_foo" can be used to
+The reference "c_foo" could refer to either the global scalar or
+global vector produced by compute "foo".  In this case, "c_foo" will
+always refer to the global scalar, and "C_foo" can be used to
 reference the global vector.  Similarly if the compute produces both a
-global vector and global array, then "c\_foo[I]" will always refer to
-an element of the global vector, and "C\_foo[I]" can be used to
+global vector and global array, then "c_foo[I]" will always refer to
+an element of the global vector, and "C_foo[I]" can be used to
 reference the Ith column of the global array.
 
 Note that if a variable containing a compute is evaluated directly in
@@ -1117,10 +1073,8 @@ an input script (not during a run), then the values accessed by the
 compute must be current.  See the discussion below about "Variable
 Accuracy".
 
-
 ----------
 
-
 Fix References
 --------------
 
@@ -1144,15 +1098,15 @@ as to what a reference means, since fixes only produce either global
 or per-atom quantities, never both.
 
 +-------------+-------------------------------------------------------------------------------------------------------+
-| f\_ID       | global scalar, or per-atom vector                                                                     |
+| f_ID       | global scalar, or per-atom vector                                                                      |
 +-------------+-------------------------------------------------------------------------------------------------------+
-| f\_ID[I]    | Ith element of global vector, or atom I's value in per-atom vector, or Ith column from per-atom array |
+| f_ID[I]    | Ith element of global vector, or atom I's value in per-atom vector, or Ith column from per-atom array  |
 +-------------+-------------------------------------------------------------------------------------------------------+
-| f\_ID[I][J] | I,J element of global array, or atom I's Jth value in per-atom array                                  |
+| f_ID[I][J] | I,J element of global array, or atom I's Jth value in per-atom array                                   |
 +-------------+-------------------------------------------------------------------------------------------------------+
 
 For I and J indices, integers can be specified or a variable name,
-specified as v\_name, where name is the name of the variable.  The
+specified as v_name, where name is the name of the variable.  The
 rules for this syntax are the same as for the "Atom Values and
 Vectors" discussion above.
 
@@ -1160,10 +1114,10 @@ One source of ambiguity for fix references is the same ambiguity
 discussed for compute references above.  Namely when a vector-style
 variable refers to a fix that produces both a global scalar and a
 global vector.  The solution is the same as for compute references.
-For a fix with ID "foo", "f\_foo" will always refer to the global
-scalar, and "F\_foo" can be used to reference the global vector.  And
+For a fix with ID "foo", "f_foo" will always refer to the global
+scalar, and "F_foo" can be used to reference the global vector.  And
 similarly for distinguishing between a fix's global vector versus
-global array with "f\_foo[I]" versus "F\_foo[I]".
+global array with "f_foo[I]" versus "F_foo[I]".
 
 Note that if a variable containing a fix is evaluated directly in an
 input script (not during a run), then the values accessed by the fix
@@ -1176,10 +1130,8 @@ error is generated.  For example, the :doc:`fix ave/time <fix_ave_time>`
 command may only generate averaged quantities every 100 steps.  See
 the doc pages for individual fix commands for details.
 
-
 ----------
 
-
 Variable References
 -------------------
 
@@ -1195,7 +1147,7 @@ generate a per-atom vector of numeric values.  All other variables
 store one or more strings.
 
 The formula for an equal-style variable can use any style of variable
-including a vector\_style or atom-style or atomfile-style.  For these
+including a vector_style or atom-style or atomfile-style.  For these
 3 styles, a subscript must be used to access a single value from
 the vector-, atom-, or atomfile-style variable.  If a string-storing
 variable is used, the string is converted to a numeric value.  Note
@@ -1217,26 +1169,24 @@ There is no ambiguity as to what a reference means, since variables
 produce only a global scalar or global vector or per-atom vector.
 
 +------------+----------------------------------------------------------------------+
-| v\_name    | global scalar from equal-style variable                              |
+| v_name    | global scalar from equal-style variable                               |
 +------------+----------------------------------------------------------------------+
-| v\_name    | global vector from vector-style variable                             |
+| v_name    | global vector from vector-style variable                              |
 +------------+----------------------------------------------------------------------+
-| v\_name    | per-atom vector from atom-style or atomfile-style variable           |
+| v_name    | per-atom vector from atom-style or atomfile-style variable            |
 +------------+----------------------------------------------------------------------+
-| v\_name[I] | Ith element of a global vector from vector-style variable            |
+| v_name[I] | Ith element of a global vector from vector-style variable             |
 +------------+----------------------------------------------------------------------+
-| v\_name[I] | value of atom with ID = I from atom-style or atomfile-style variable |
+| v_name[I] | value of atom with ID = I from atom-style or atomfile-style variable  |
 +------------+----------------------------------------------------------------------+
 
 For the I index, an integer can be specified or a variable name,
-specified as v\_name, where name is the name of the variable.  The
+specified as v_name, where name is the name of the variable.  The
 rules for this syntax are the same as for the "Atom Values and
 Vectors" discussion above.
 
-
 ----------
 
-
 **Immediate Evaluation of Variables:**
 
 If you want an equal-style variable to be evaluated immediately, it
@@ -1250,12 +1200,12 @@ named variable.
 
 More generally, there is a difference between referencing a variable
 with a leading $ sign (e.g. $x or ${abc}) versus with a leading "v\_"
-(e.g. v\_x or v\_abc).  The former can be used in any input script
+(e.g. v_x or v_abc).  The former can be used in any input script
 command, including a variable command.  The input script parser
 evaluates the reference variable immediately and substitutes its value
 into the command.  As explained on the :doc:`Commands parse <Commands_parse>` doc page, you can also use un-named
 "immediate" variables for this purpose.  For example, a string like
-this $((xlo+xhi)/2+sqrt(v\_area)) in an input script command evaluates
+this $((xlo+xhi)/2+sqrt(v_area)) in an input script command evaluates
 the string between the parenthesis as an equal-style variable formula.
 
 Referencing a variable with a leading "v\_" is an optional or required
@@ -1269,23 +1219,21 @@ evaluated.
 As an example, suppose you use this command in your input script to
 define the variable "v" as
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    variable v equal vol
 
 before a run where the simulation box size changes.  You might think
 this will assign the initial volume to the variable "v".  That is not
 the case.  Rather it assigns a formula which evaluates the volume
-(using the thermo\_style keyword "vol") to the variable "v".  If you
+(using the thermo_style keyword "vol") to the variable "v".  If you
 use the variable "v" in some other command like :doc:`fix ave/time <fix_ave_time>` then the current volume of the box will be
 evaluated continuously during the run.
 
 If you want to store the initial volume of the system, you can do it
 this way:
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    variable v equal vol
    variable v0 equal $v
@@ -1294,8 +1242,7 @@ The second command will force "v" to be evaluated (yielding the
 initial volume) and assign that value to the variable "v0".  Thus the
 command
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    thermo_style custom step v_v v_v0
 
@@ -1305,8 +1252,7 @@ during the run.
 Note that it is a mistake to enclose a variable formula in double
 quotes if it contains variables preceded by $ signs.  For example,
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    variable vratio equal "${vfinal}/${v0}"
 
@@ -1314,10 +1260,8 @@ This is because the quotes prevent variable substitution (explained on
 the :doc:`Commands parse <Commands_parse>` doc page), and thus an error
 will occur when the formula for "vratio" is evaluated later.
 
-
 ----------
 
-
 **Variable Accuracy:**
 
 Obviously, LAMMPS attempts to evaluate variables containing formulas
@@ -1365,8 +1309,7 @@ timestep of the preceding run, e.g. by thermodynamic output.
 One way to get around this problem is to perform a 0-timestep run
 before using the variable.  For example, these commands
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    variable t equal temp
    print "Initial temperature = $t"
@@ -1378,8 +1321,7 @@ a compute for calculating the temperature to be invoked.
 
 However, this sequence of commands would be fine:
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    run 0
    variable t equal temp
@@ -1413,8 +1355,7 @@ a 0-timestep run before printing the variable has the desired effect.
 way to detect this has occurred.  Consider the following sequence of
 commands:
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    pair_coeff 1 1 1.0 1.0
    run 1000
@@ -1440,8 +1381,7 @@ the system is up-to-date.  For example, this sequence of commands
 would print a potential energy that reflected the changed pairwise
 coefficient:
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    pair_coeff 1 1 1.0 1.0
    run 1000
@@ -1450,14 +1390,11 @@ coefficient:
    variable e equal pe
    print "Final potential energy = $e"
 
-
 ----------
 
-
 Restrictions
 """"""""""""
 
-
 Indexing any formula element by global atom ID, such as an atom value,
 requires the :doc:`atom style <atom_style>` to use a global mapping in
 order to look up the vector indices.  By default, only atom styles
@@ -1474,8 +1411,3 @@ Related commands
 :doc:`temper <temper>`, :doc:`fix print <fix_print>`, :doc:`print <print>`
 
 **Default:** none
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/velocity.rst b/doc/src/velocity.rst
index 314a5681e5..59ce0a19f6 100644
--- a/doc/src/velocity.rst
+++ b/doc/src/velocity.rst
@@ -6,16 +6,15 @@ velocity command
 Syntax
 """"""
 
-
 .. parsed-literal::
 
    velocity group-ID style args keyword value ...
 
 * group-ID = ID of group of atoms whose velocity will be changed
 * style = *create* or *set* or *scale* or *ramp* or *zero*
-  
+
   .. parsed-literal::
-  
+
        *create* args = temp seed
          temp = temperature value (temperature units)
          seed = random # seed (positive integer)
@@ -35,9 +34,9 @@ Syntax
 
 * zero or more keyword/value pairs may be appended
 * keyword = *dist* or *sum* or *mom* or *rot* or *temp* or *bias* or *loop* or *units*
-  
+
   .. parsed-literal::
-  
+
        *dist* value = *uniform* or *gaussian*
        *sum* value = *no* or *yes*
        *mom* value = *no* or *yes*
@@ -49,13 +48,10 @@ Syntax
          fix-ID = ID of rigid body fix
        *units* value = *box* or *lattice*
 
-
-
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    velocity all create 300.0 4928459 rot yes dist gaussian
    velocity border set NULL 4.0 v_vz sum yes units box
@@ -78,7 +74,7 @@ The *set* style sets the velocities of all atoms in the group to the
 specified values.  If any component is specified as NULL, then it is
 not set.  Any of the vx,vy,vz velocity components can be specified as
 an equal-style or atom-style :doc:`variable <variable>`.  If the value
-is a variable, it should be specified as v\_name, where name is the
+is a variable, it should be specified as v_name, where name is the
 variable name.  In this case, the variable will be evaluated, and its
 value used to determine the velocity component.  Note that if a
 variable is used, the velocity it calculates must be in box units, not
@@ -124,10 +120,8 @@ coordinates depend on whether the *units* keyword is set to *box* or
 For all styles, no atoms are assigned z-component velocities if the
 simulation is 2d; see the :doc:`dimension <dimension>` command.
 
-
 ----------
 
-
 The keyword/value options are used in the following ways by the
 various styles.
 
@@ -145,10 +139,8 @@ The *mom* and *rot* keywords are used by *create*\ .  If mom = yes, the
 linear momentum of the newly created ensemble of velocities is zeroed;
 if rot = yes, the angular momentum is zeroed.
 
-
 ----------
 
-
 If specified, the *temp* keyword is used by *create* and *scale* to
 specify a :doc:`compute <compute>` that calculates temperature in a
 desired way, e.g. by first subtracting out a velocity bias, as
@@ -156,8 +148,7 @@ discussed on the :doc:`Howto thermostat <Howto_thermostat>` doc page.
 If this keyword is not specified, *create* and *scale* calculate
 temperature using a compute that is defined internally as follows:
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    compute velocity_temp group-ID temp
 
@@ -190,10 +181,8 @@ specifying the ID of a :doc:`compute temp/ramp <compute_temp_ramp>` or
 :doc:`compute temp/profile <compute_temp_profile>` command, and the
 *bias* keyword set to a *yes* value.
 
-
 ----------
 
-
 The *loop* keyword is used by *create* in the following ways.
 
 If loop = all, then each processor loops over all atoms in the
@@ -226,10 +215,8 @@ This is because the computations based on xyz coordinates are
 sensitive to tiny differences in the double-precision value for a
 coordinate as stored on a particular machine.
 
-
 ----------
 
-
 The *rigid* keyword only has meaning when used with the *zero* style.
 It allows specification of a fix-ID for one of the :doc:`rigid-body fix <fix_rigid>` variants which defines a set of rigid bodies.  The
 zeroing of linear or angular momentum is then performed for each rigid
@@ -243,14 +230,11 @@ are in units of lattice spacings per time (e.g. spacings/fmsec) and
 coordinates are in lattice spacings.  The :doc:`lattice <lattice>`
 command must have been previously used to define the lattice spacing.
 
-
 ----------
 
-
 Restrictions
 """"""""""""
 
-
 Assigning a temperature via the *create* style to a system with :doc:`rigid bodies <fix_rigid>` or :doc:`SHAKE constraints <fix_shake>` may not
 have the desired outcome for two reasons.  First, the velocity command
 can be invoked before all of the relevant fixes are created and
@@ -262,8 +246,7 @@ temperature than desired.  A workaround for this is to perform a :doc:`run 0 <ru
 properly, and then rescale the temperature to the desired value before
 performing a simulation.  For example:
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    velocity all create 300.0 12345
    run 0                             # temperature may not be 300K
@@ -281,8 +264,3 @@ Default
 The keyword defaults are dist = uniform, sum = no, mom = yes, rot =
 no, bias = no, loop = all, and units = lattice.  The temp and rigid
 keywords are not defined by default.
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/write_coeff.rst b/doc/src/write_coeff.rst
index 4a293f7e3f..71cfe9cb02 100644
--- a/doc/src/write_coeff.rst
+++ b/doc/src/write_coeff.rst
@@ -1,23 +1,21 @@
-.. index:: write\_coeff
+.. index:: write_coeff
 
-write\_coeff command
-====================
+write_coeff command
+===================
 
 Syntax
 """"""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    write_coeff file
 
-   file = name of data file to write out
+* file = name of data file to write out
 
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    write_coeff polymer.coeff
 
@@ -32,18 +30,15 @@ the Coeffs sections from a data file into a separate file.
 
 .. note::
 
-   The write\_coeff command is not yet fully implemented as
+   The write_coeff command is not yet fully implemented as
    some pair styles do not output their coefficient information.
    This means you will need to add/copy this information manually.
 
-
 ----------
 
-
 Restrictions
 """"""""""""
 
-
 none
 
 Related commands
@@ -51,8 +46,3 @@ Related commands
 
 :doc:`read_data <read_data>`, :doc:`write_restart <write_restart>`,
 :doc:`write_data <write_data>`
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/write_data.rst b/doc/src/write_data.rst
index 3ff9f155b0..13a6476ac4 100644
--- a/doc/src/write_data.rst
+++ b/doc/src/write_data.rst
@@ -1,38 +1,34 @@
-.. index:: write\_data
+.. index:: write_data
 
-write\_data command
+write_data command
 ===================
 
 Syntax
 """"""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    write_data file keyword value ...
 
 * file = name of data file to write out
 * zero or more keyword/value pairs may be appended
 * keyword = *pair* or *nocoeff*
-  
+
   .. parsed-literal::
-  
+
        *nocoeff* = do not write out force field info
        *nofix* = do not write out extra sections read by fixes
        *pair* value = *ii* or *ij*
          *ii* = write one line of pair coefficient info per atom type
          *ij* = write one line of pair coefficient info per IJ atom type pair
 
-
-
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    write_data data.polymer
-   write_data data.\*
+   write_data data.*
 
 Description
 """""""""""
@@ -55,7 +51,7 @@ value.
    the :doc:`pair_coeff <pair_coeff>` command.  Second, a few of the :doc:`atom styles <atom_style>` (body, ellipsoid, line, tri) that store
    auxiliary "bonus" information about aspherical particles, do not yet
    write the bonus info into the data file.  Both these functionalities
-   will be added to the write\_data command later.
+   will be added to the write_data command later.
 
 Because a data file is in text format, if you use a data file written
 out by this command to restart a simulation, the initial state of the
@@ -87,10 +83,8 @@ Bonds that are broken (e.g. by a bond-breaking potential) are not
 written to the data file.  Thus these bonds will not exist when the
 data file is read.
 
-
 ----------
 
-
 The *nocoeff* keyword requests that no force field parameters should
 be written to the data file. This can be very helpful, if one wants
 to make significant changes to the force field or if the parameters
@@ -123,14 +117,11 @@ in the input script after reading the data file, by specifying
 additional :doc:`pair_coeff <pair_coeff>` commands for any desired I,J
 pairs.
 
-
 ----------
 
-
 Restrictions
 """"""""""""
 
-
 This command requires inter-processor communication to migrate atoms
 before the data file is written.  This means that your system must be
 ready to perform a simulation before using this command (force fields
@@ -145,8 +136,3 @@ Default
 """""""
 
 The option defaults are pair = ii.
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/write_dump.rst b/doc/src/write_dump.rst
index afd7470ce8..f0f57bd674 100644
--- a/doc/src/write_dump.rst
+++ b/doc/src/write_dump.rst
@@ -1,13 +1,12 @@
-.. index:: write\_dump
+.. index:: write_dump
 
-write\_dump command
-===================
+write_dump command
+==================
 
 Syntax
 """"""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    write_dump group-ID style file dump-args modify dump_modify-args
 
@@ -18,20 +17,18 @@ Syntax
 * modify = all args after this keyword are passed to :doc:`dump_modify <dump_modify>` (optional)
 * dump-modify-args = args for :doc:`dump_modify <dump_modify>` (optional)
 
-
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    write_dump all atom dump.atom
    write_dump subgroup atom dump.run.bin
-   write_dump all custom dump.myforce.\* id type x y vx fx
+   write_dump all custom dump.myforce.* id type x y vx fx
    write_dump flow custom dump.%.myforce id type c_myF[3] v_ke modify sort id
    write_dump all xyz system.xyz modify sort id element O H
-   write_dump all image snap\*.jpg type type size 960 960 modify backcolor white
-   write_dump all image snap\*.jpg element element &
+   write_dump all image snap*.jpg type type size 960 960 modify backcolor white
+   write_dump all image snap*.jpg element element &
       bond atom 0.3 shiny 0.1 ssao yes 6345 0.2 size 1600 1600  &
       modify backcolor white element C C O H N C C C O H H S O H
 
@@ -52,24 +49,21 @@ added.  The latter is so that the full range of
 :doc:`dump_modify <dump_modify>` options can be specified for the single
 snapshot, just as they can be for multiple snapshots.  The *modify*
 keyword separates the arguments that would normally be passed to the
-*dump* command from those that would be given the *dump\_modify*.  Both
+*dump* command from those that would be given the *dump_modify*.  Both
 support optional arguments and thus LAMMPS needs to be able to cleanly
 separate the two sets of args.
 
 Note that if the specified filename uses wildcard characters "\*" or
 "%", as supported by the :doc:`dump <dump>` command, they will operate
 in the same fashion to create the new filename(s).  Normally, :doc:`dump image <dump_image>` files require a filename with a "\*" character
-for the timestep.  That is not the case for the write\_dump command; no
+for the timestep.  That is not the case for the write_dump command; no
 wildcard "\*" character is necessary.
 
-
 ----------
 
-
 Restrictions
 """"""""""""
 
-
 All restrictions for the :doc:`dump <dump>` and
 :doc:`dump_modify <dump_modify>` commands apply to this command as well,
 with the exception of the :doc:`dump image <dump_image>` filename not
@@ -98,8 +92,3 @@ Default
 The defaults are listed on the doc pages for the :doc:`dump <dump>` and
 :doc:`dump image <dump_image>` and :doc:`dump_modify <dump_modify>`
 commands.
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/src/write_restart.rst b/doc/src/write_restart.rst
index 734bbb3a44..bdb77dd4b4 100644
--- a/doc/src/write_restart.rst
+++ b/doc/src/write_restart.rst
@@ -1,38 +1,34 @@
-.. index:: write\_restart
+.. index:: write_restart
 
-write\_restart command
-======================
+write_restart command
+=====================
 
 Syntax
 """"""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    write_restart file keyword value ...
 
 * file = name of file to write restart information to
 * zero or more keyword/value pairs may be appended
 * keyword = *fileper* or *nfile*
-  
+
   .. parsed-literal::
-  
+
        *fileper* arg = Np
          Np = write one file for every this many processors
        *nfile* arg = Nf
          Nf = write this many files, one from each of Nf processors
 
-
-
 Examples
 """"""""
 
-
-.. parsed-literal::
+.. code-block:: LAMMPS
 
    write_restart restart.equil
    write_restart restart.equil.mpiio
-   write_restart poly.%.\* nfile 10
+   write_restart poly.%.* nfile 10
 
 Description
 """""""""""
@@ -41,7 +37,7 @@ Write a binary restart file of the current state of the simulation.
 
 During a long simulation, the :doc:`restart <restart>` command is
 typically used to output restart files periodically.  The
-write\_restart command is useful after a minimization or whenever you
+write_restart command is useful after a minimization or whenever you
 wish to write out a single current restart file.
 
 Similar to :doc:`dump <dump>` files, the restart filename can contain
@@ -62,8 +58,7 @@ file via the MPI-IO library, which is part of the MPI standard for
 versions 2.0 and above.  Using MPI-IO requires two steps.  First,
 build LAMMPS with its MPIIO package installed, e.g.
 
-
-.. parsed-literal::
+.. code-block:: bash
 
    make yes-mpiio    # installs the MPIIO package
    make mpi          # build LAMMPS for your platform
@@ -92,10 +87,8 @@ another machine.  In this case, you can use the :doc:`-r command-line switch <Ru
    :doc:`read_restart <read_restart>` command for general information about
    what is stored in a restart file.
 
-
 ----------
 
-
 The optional *nfile* or *fileper* keywords can be used in conjunction
 with the "%" wildcard character in the specified restart file name.
 As explained above, the "%" character causes the restart file to be
@@ -114,14 +107,11 @@ file for every Np processors.  For example, if Np = 4, every 4th
 processor (0,4,8,12,etc) will collect information from itself and the
 next 3 processors and write it to a restart file.
 
-
 ----------
 
-
 Restrictions
 """"""""""""
 
-
 This command requires inter-processor communication to migrate atoms
 before the restart file is written.  This means that your system must
 be ready to perform a simulation before using this command (force
@@ -137,8 +127,3 @@ Related commands
 :doc:`write_data <write_data>`
 
 **Default:** none
-
-
-.. _lws: http://lammps.sandia.gov
-.. _ld: Manual.html
-.. _lc: Commands_all.html
diff --git a/doc/utils/check-packages.py b/doc/utils/check-packages.py
new file mode 100755
index 0000000000..99968f9a22
--- /dev/null
+++ b/doc/utils/check-packages.py
@@ -0,0 +1,97 @@
+#!/usr/bin/env python3
+
+from __future__ import print_function
+from glob import glob
+from argparse import ArgumentParser
+import os, re, sys
+
+parser = ArgumentParser(prog='check-packages.py',
+                        description="Check package table completeness")
+
+parser.add_argument("-v", "--verbose",
+                    action='store_const',
+                    const=True, default=False,
+                    help="Enable verbose output")
+
+parser.add_argument("-d", "--doc",
+                    help="Path to LAMMPS documentation sources")
+parser.add_argument("-s", "--src",
+                    help="Path to LAMMPS sources")
+
+args = parser.parse_args()
+verbose = args.verbose
+src = args.src
+doc = args.doc
+
+if not args.src or not args.doc:
+  parser.print_help()
+  sys.exit(1)
+
+if not os.path.isdir(src):
+    sys.exit("LAMMPS source path %s does not exist" % src)
+
+if not os.path.isdir(doc):
+    sys.exit("LAMMPS documentation source path %s does not exist" % doc)
+
+pkgdirs = glob(os.path.join(src, '[A-Z][A-Z]*'))
+dirs = re.compile(".*/([0-9A-Z-]+)$")
+user = re.compile("USER-.*")
+
+stdpkg = []
+usrpkg = []
+
+# find package names and add to standard and user package lists.
+# anything starting with at least two upper case characters, is a
+# folder, and is not called 'MAKE' is a package 
+
+for d in pkgdirs:
+  pkg = dirs.match(d)[1]
+  if not os.path.isdir(os.path.join(src,pkg)): continue
+  if pkg in ['DEPEND','MAKE','STUBS']: continue
+  if user.match(pkg):
+    usrpkg.append(pkg)
+  else:
+    stdpkg.append(pkg)
+
+print("Found %d standard and %d user packages" % (len(stdpkg),len(usrpkg)))
+
+counter = 0
+fp = open(os.path.join(doc,'Packages_standard.rst'))
+text = fp.read()
+fp.close()
+matches = re.findall(':ref:`([A-Z0-9-]+) <[A-Z0-9-]+>`',text,re.MULTILINE)
+for p in stdpkg:
+  if not p in matches:
+    ++counter
+    print("Standard package %s missing in Packages_standard.rst"
+          % p)
+
+fp = open(os.path.join(doc,'Packages_user.rst'))
+text = fp.read()
+fp.close()
+matches = re.findall(':ref:`([A-Z0-9-]+) <[A-Z0-9-]+>`',text,re.MULTILINE)
+for p in usrpkg:
+  if not p in matches:
+    ++counter
+    print("User package %s missing in Packages_user.rst"
+          % p)
+
+fp = open(os.path.join(doc,'Packages_details.rst'))
+text = fp.read()
+fp.close()
+matches = re.findall(':ref:`([A-Z0-9]+) <PKG-\\1>`',text,re.MULTILINE)
+for p in stdpkg:
+  if not p in matches:
+    ++counter
+    print("Standard package %s missing in Packages_details.rst"
+          % p)
+matches = re.findall(':ref:`(USER-[A-Z0-9]+) <PKG-\\1>`',text,re.MULTILINE)
+for p in usrpkg:
+  if not p in matches:
+    ++counter
+    print("User package %s missing in Packages_details.rst"
+          % p)
+
+if counter:
+    print("Found %d issue(s) with package lists" % counter)
+
diff --git a/doc/utils/converters/lammpsdoc/eqImg2mathjaxInline.py b/doc/utils/converters/lammpsdoc/eqImg2mathjaxInline.py
deleted file mode 100644
index 353eed8b6e..0000000000
--- a/doc/utils/converters/lammpsdoc/eqImg2mathjaxInline.py
+++ /dev/null
@@ -1,255 +0,0 @@
-#! /usr/bin/env python3
-# LAMMPS Documentation Utilities
-#
-# Scan for duplicate anchor labels in documentation files
-#
-# Copyright (C) 2019 E. Anne Gunn
-# Based largely on doc_anchor_check.py by Richard Berger
-#
-# 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 <http://www.gnu.org/licenses/>.
-import argparse
-import os
-import re
-import shutil
-import sys
-
-
-# We only want to replace image lines where image is
-# pulled from Eqs subfolder
-image_pattern = re.compile(r'.*image:: Eqs/(.*)\.jpg')
-tex_eq_pattern = re.compile(r'\$\$')
-latex_begin_eq_pattern = re.compile(r'\\begin{equation}')
-latex_end_eq_pattern = re.compile(r'\\end{equation}')
-latex_begin_eqArray_pattern = re.compile(r'\\begin{eqnarray\*}')
-latex_end_eqArray_pattern = re.compile(r'\\end{eqnarray\*}')
-
-imageMarker = ">>>image was here"
-image_marker_pattern = re.compile(r'>>>image was here')
-align_pattern = re.compile(r'.*:align: center')
-
-modifiedRstFolder = "src/modifiedRst/"
-safeRstFolder = "src/safeRst/"
-# Since this is a proof of concept implementation,
-# skip any rst files that are known to cause problems
-skipFileList = ["pair_tersoff_zbl.rst"]
-
-runReport = {
-}
-
-
-def checkForEquationStart(texLine):
-    eqType = None
-    texMatch = tex_eq_pattern.match(texLine)
-    if texMatch:
-        eqType = "texMatch"
-    else:
-        eqMatch = latex_begin_eq_pattern.match(texLine)
-        if eqMatch:
-            eqType = "eqMatch"
-        else:
-            eqArrayMatch = latex_begin_eqArray_pattern.match(texLine)
-            if eqArrayMatch:
-                eqType = "eqArrayMatch"
-    return eqType
-
-
-def checkForEquationEnd(texLine, eqType):
-    endPattern = tex_eq_pattern
-    if eqType == "texMatch":
-        endPattern = tex_eq_pattern
-    elif eqType == "eqMatch":
-        endPattern = latex_end_eq_pattern
-    elif eqType == "eqArrayMatch":
-        endPattern = latex_end_eqArray_pattern
-    else:
-        print("***error: unexpected eqType %s, will look for tex delimiter" % eqType)
-
-    endMatch = endPattern.match(texLine)
-    endFound = endMatch is not None
-    if endFound:
-        print("found pattern end, line: %s" % texLine)
-    return endFound
-
-
-def startMathjax():
-    mathjaxLines = []
-    mathjaxLines.append(".. math::\n\n")
-    return mathjaxLines
-
-
-def endMathjax(mathjaxLines):
-    mathjaxLines.append("\n")
-    mathjaxLines.append("%s\n" % imageMarker)
-    return mathjaxLines
-
-
-def processFile(filename):
-    print("in processFile for filename: %s" % filename)
-    imageCount = 0
-
-    modifiedFileLines = []
-    doWriteModifiedFile = False
-    with open(filename, 'rt') as f:
-        for line_number, line in enumerate(f):
-            m = image_pattern.match(line)
-            if m:
-                fileroot = m.group(1)
-                print("fileroot: {0}".format(fileroot))
-                imageCount += 1
-                texFilename = "src/Eqs/{0}.tex".format(fileroot)
-                print("will try to open %s" % texFilename)
-                eqType = None
-                eqLines = []
-                try:
-                    with open(texFilename, 'rt', encoding='utf-8') as t:
-                        print("%s file opened ok" % texFilename)
-                        eqLines = startMathjax()
-                        try:
-                            for dummy, texLine in enumerate(t):
-                                #print(texLine)
-                                if eqType == None:
-                                    eqType = checkForEquationStart(texLine)
-                                    if eqType != None:
-                                        print("equation type: {0}".format(eqType))
-                                else:
-                                    endFound = checkForEquationEnd(texLine, eqType)
-                                    if endFound != True:
-                                        eqLines.append(texLine)
-                                    else:
-                                        eqType = None
-                                        eqLines = endMathjax(eqLines)
-                                        print("Equation lines will be:")
-                                        print("-----------------------------")
-                                        print(*eqLines, sep="\n")
-                                        print("-----------------------------")
-                        except UnicodeDecodeError:
-                            print("UnicodeDecodeError reading file file %s, image markup will be left in place" % texFilename)
-                            break
-                except EnvironmentError:
-                    error = "could not open source tex file {0}, line: {1}".format(texFilename, line)
-                    print(error)
-                    print("image markup will be left in place")
-                    if filename not in runReport:
-                        runReport[filename] = []
-                    runReport[filename].append(error)
-                    # put the image line we could not replace back into the output
-                    eqLines.append(line)
-                if len(eqLines) > 0:
-                    modifiedFileLines.extend(eqLines)
-                    doWriteModifiedFile = True
-                    eqLines = []
-            else:
-                # not an equation line, so simply queue it up for output as is
-                modifiedFileLines.append(line)
-    if doWriteModifiedFile:
-        # We're going to write out a modified file, so first copy the original rst
-        # file into the original file folder.
-        nameParts = filename.split("/")
-        filenamePos = len(nameParts) - 1
-        safeFilePath = "{0}{1}".format(safeRstFolder, nameParts[filenamePos])
-        shutil.copyfile(filename, safeFilePath)
-
-        print("modifiedFileLines has %d lines before align center cleanup" % len(modifiedFileLines))
-        # First, go through the file and pull out the lines where there is
-        # now an image file marker followed by an align center directive
-        deleteLines = []
-        for lineNumber, line in enumerate(modifiedFileLines):
-            m = image_marker_pattern.match(line)
-            if m:
-                print("found image marker in line %d" % lineNumber)
-                n = align_pattern.match(modifiedFileLines[lineNumber+1])
-                if n:
-                    print("found align center")
-                    deleteLines.append(lineNumber)
-                    deleteLines.append(lineNumber+1)
-        #When deleting, always work from the back of the list to the front
-        for lineNumber in reversed(deleteLines):
-            print(lineNumber)
-            del modifiedFileLines[lineNumber]
-        print("modifiedFileLines has %d lines after align center cleanup" % len(modifiedFileLines))
-        # Now we can actually write out the new contents
-        try:
-            modFilePath = "{0}{1}".format(modifiedRstFolder, nameParts[filenamePos])
-            modRst = open(modFilePath, "w")
-            for rstLine in modifiedFileLines:
-                modRst.write(rstLine)
-            modRst.close()
-        except OSError:
-            print('Error: Creating directory. ' + modifiedRstFolder)
-    return imageCount
-
-
-def main():
-    fileCount = 0
-    totalImageCount = 0
-
-    parser = argparse.ArgumentParser(description='replace image markup in rst files with inline mathjax markup from .txt source of images')
-    parser.add_argument('files',  metavar='file', nargs='+', help='one or more files to scan')
-    parsed_args = parser.parse_args()
-    print(parsed_args)
-
-    if not os.path.exists(safeRstFolder):
-        os.makedirs(safeRstFolder)
-    if not os.path.exists(modifiedRstFolder):
-        os.makedirs(modifiedRstFolder)
-
-    # Because we may decide to add files to the skip list between runs,
-    # if we have more than one file to process,
-    # files from both original and modified folders
-    # zombie modifications
-    if len(parsed_args.files) > 1:
-        for outputFile in os.listdir(modifiedRstFolder):
-            filePath = os.path.join(modifiedRstFolder, outputFile)
-            try:
-                if os.path.isfile(filePath):
-                    os.unlink(filePath)
-            except Exception as e:
-                print(e)
-                sys.exit(1)
-        for safeFile in os.listdir(safeRstFolder):
-            filePath = os.path.join(safeRstFolder, safeFile)
-            try:
-                if os.path.isfile(filePath):
-                    os.unlink(filePath)
-            except Exception as e:
-                print(e)
-                sys.exit(1)
-
-    for filename in parsed_args.files:
-        print("filename: %s" % filename)
-        doSkip = False
-        for skipName in skipFileList:
-            if filename.find(skipName) != -1:
-                print("skipping file: %s" % filename)
-                doSkip = True
-                runReport[filename] = ["skipped based on skipFileList"]
-                break
-        if not doSkip:
-            fileCount += 1
-            ic = processFile(filename)
-            totalImageCount += ic
-
-    print("============================================")
-    print("Processed %d rst files." % fileCount)
-    print("Found %d image lines." % totalImageCount)
-
-    for fileKey in runReport:
-        print("--------------------------------------------")
-        print("run report for %s:" % fileKey)
-        print(*runReport[fileKey], sep="\n")
-
-    print("============================================")
-
-if __name__ == "__main__":
-    main()
diff --git a/doc/utils/sphinx-config/LAMMPSLexer.py b/doc/utils/sphinx-config/LAMMPSLexer.py
index 6436be410d..72536d494f 100644
--- a/doc/utils/sphinx-config/LAMMPSLexer.py
+++ b/doc/utils/sphinx-config/LAMMPSLexer.py
@@ -1,31 +1,53 @@
-from pygments.lexer import RegexLexer, words
+from pygments.lexer import RegexLexer, words, include, default
 from pygments.token import *
 
 LAMMPS_COMMANDS = ("angle_coeff", "angle_style", "atom_modify", "atom_style",
 "balance", "bond_coeff", "bond_style", "bond_write", "boundary", "box",
-"change_box", "clear", "comm_modify", "comm_style", "compute",
+"clear", "comm_modify", "comm_style",
 "compute_modify", "create_atoms", "create_bonds", "create_box", "delete_atoms",
 "delete_bonds", "dielectric", "dihedral_coeff", "dihedral_style", "dimension",
-"displace_atoms", "dump", "dump_modify", "dynamical_matrix", "echo", "fix",
-"fix_modify", "group", "group2ndx", "hyper", "if", "improper_coeff",
+"displace_atoms", "dump_modify", "dynamical_matrix", "echo",
+"fix_modify", "group2ndx", "hyper", "if", "improper_coeff",
 "improper_style", "include", "info", "jump", "kim_init", "kim_interactions",
 "kim_param", "kim_query", "kspace_modify", "kspace_style", "label", "lattice",
 "log", "mass", "message", "minimize", "min_modify", "min_style", "molecule",
 "ndx2group", "neb", "neb/spin", "neighbor", "neigh_modify", "newton", "next",
 "package", "pair_coeff", "pair_modify", "pair_style", "pair_write",
 "partition", "prd", "print", "processors", "python", "quit", "read_data",
-"read_dump", "read_restart", "region", "replicate", "rerun", "reset_ids",
+"read_dump", "read_restart", "replicate", "rerun", "reset_ids",
 "reset_timestep", "restart", "run", "run_style", "server", "set", "shell",
 "special_bonds", "suffix", "tad", "temper", "temper/grem", "temper/npt",
 "thermo", "thermo_modify", "thermo_style", "then", "third_order", "timer", "timestep",
-"uncompute", "undump", "unfix", "units", "variable", "velocity", "write_coeff",
-"write_data", "write_dump", "write_restart")
+"units", "velocity", "write_coeff",
+"write_data", "write_restart")
+
+#fix ID group-ID style args
+#compute ID group-ID style args
+#dump ID group-ID style N file args
+#region ID style args keyword arg ...
+#variable name style args ...
+#group ID style args
+#uncompute compute-ID
+#undump dump-ID
+#unfix fix-ID
+#write_dump group-ID style file dump-args modify dump_modify-args
 
 class LAMMPSLexer(RegexLexer):
     name = 'LAMMPS'
     tokens = {
         'root': [
-            (words(LAMMPS_COMMANDS, suffix=r'\b', prefix=r'^'), Keyword),
+            (r'fix\s+', Keyword, 'fix'),
+            (r'compute\s+', Keyword, 'compute'),
+            (r'dump\s+', Keyword, 'dump'),
+            (r'region\s+', Keyword, 'region'),
+            (r'variable\s+', Keyword, 'variable'),
+            (r'group\s+', Keyword, 'group'),
+            (r'change_box\s+', Keyword, 'change_box'),
+            (r'uncompute\s+', Keyword, 'uncompute'),
+            (r'unfix\s+', Keyword, 'unfix'),
+            (r'undump\s+', Keyword, 'undump'),
+            (r'write_dump\s+', Keyword, 'write_dump'),
+            include('keywords'),
             (r'#.*?\n', Comment),
             ('"', String, 'string'),
             ('\'', String, 'single_quote_string'),
@@ -35,8 +57,12 @@ class LAMMPSLexer(RegexLexer):
             (r'[\w_\.\[\]]+', Name),
             (r'\$[\w_]+', Name.Variable),
             (r'\s+', Whitespace),
-            (r'[\+\-\*\/&=<>]', Operator),
+            (r'[\+\-\*\^\|\/\!%&=<>]', Operator),
         ],
+        'keywords' : [
+            (words(LAMMPS_COMMANDS, suffix=r'\b', prefix=r'^'), Keyword)
+        ]
+        ,
         'variable' : [
             ('[^\}]+', Name.Variable),
             ('\}', Name.Variable, '#pop'),
@@ -53,5 +79,56 @@ class LAMMPSLexer(RegexLexer):
             ('[^\(\)]+', Name.Variable),
             ('\(', Name.Variable, 'expression'),
             ('\)', Name.Variable, '#pop'),
+        ],
+        'fix' : [
+            (r'[\w_\-\.\[\]]+', Name.Variable.Identifier),
+            (r'\s+', Whitespace, 'group_id'),
+            default('#pop')
+        ],
+        'compute' : [
+            (r'[\w_\-\.\[\]]+', Name.Variable.Identifier),
+            (r'\s+', Whitespace, 'group_id'),
+            default('#pop')
+        ],
+        'dump' : [
+            (r'[\w_\-\.\[\]]+', Name.Variable.Identifier),
+            (r'\s+', Whitespace, 'group_id'),
+            default('#pop')
+        ],
+        'region' : [
+            (r'[\w_\-\.\[\]]+', Name.Variable.Identifier),
+            default('#pop')
+        ],
+        'variable' : [
+            (r'[\w_\-\.\[\]]+', Name.Variable.Identifier),
+            default('#pop')
+        ],
+        'group' : [
+            (r'[\w_\-\.\[\]]+', Name.Variable.Identifier),
+            default('#pop')
+        ],
+        'change_box' : [
+            (r'[\w_\-\.\[\]]+', Name.Variable.Identifier),
+            default('#pop')
+        ],
+        'unfix' : [
+            (r'[\w_\-\.\[\]]+', Name.Variable.Identifier),
+            default('#pop')
+        ],
+        'undump' : [
+            (r'[\w_\-\.\[\]]+', Name.Variable.Identifier),
+            default('#pop')
+        ],
+        'uncompute' : [
+            (r'[\w_\-\.\[\]]+', Name.Variable.Identifier),
+            default('#pop')
+        ],
+        'write_dump' : [
+            (r'[\w_\-\.\[\]]+', Name.Variable.Identifier),
+            default('#pop')
+        ],
+        'group_id' : [
+            (r'[\w_\-\.\[\]]+', Name.Variable.Identifier),
+            default('#pop:2')
         ]
     }
diff --git a/doc/utils/sphinx-config/_themes/lammps_theme/breadcrumbs.html b/doc/utils/sphinx-config/_themes/lammps_theme/breadcrumbs.html
index 1eb53c70a2..7c3bd2d6f4 100644
--- a/doc/utils/sphinx-config/_themes/lammps_theme/breadcrumbs.html
+++ b/doc/utils/sphinx-config/_themes/lammps_theme/breadcrumbs.html
@@ -1,5 +1,4 @@
 <div role="navigation" aria-label="breadcrumbs navigation">
-  <div style="text-align: center; margin-bottom: -1.5em; display: block"><b>LAMMPS</b> {{ version }}</div>
   <ul class="wy-breadcrumbs">
     <li><a href="{{ pathto(master_doc) }}">Docs</a> &raquo;</li>
       {% for doc in parents %}
@@ -22,7 +21,7 @@
         {% endif %}
       </li>
   </ul>
-  <hr/>
+  <hr style="margin-top: 6px; margin-bottom: 6px;" width="100%"/>
   {% if next or prev %}
     <div class="rst-footer-buttons" style="margin-bottom: 1em" role="navigation" aria-label="footer navigation">
       {% if next %}
diff --git a/doc/utils/sphinx-config/_themes/lammps_theme/footer.html b/doc/utils/sphinx-config/_themes/lammps_theme/footer.html
index 6347a440d7..0d2c9ce033 100644
--- a/doc/utils/sphinx-config/_themes/lammps_theme/footer.html
+++ b/doc/utils/sphinx-config/_themes/lammps_theme/footer.html
@@ -10,7 +10,7 @@
     </div>
   {% endif %}
 
-  <hr/>
+  <hr style="margin-top: 6px; margin-bottom: 6px;" width="100%"/>
 
   <div role="contentinfo">
     <p>
diff --git a/doc/utils/sphinx-config/_themes/lammps_theme/layout.html b/doc/utils/sphinx-config/_themes/lammps_theme/layout.html
index 9e672151d1..3d11a92b32 100644
--- a/doc/utils/sphinx-config/_themes/lammps_theme/layout.html
+++ b/doc/utils/sphinx-config/_themes/lammps_theme/layout.html
@@ -100,6 +100,8 @@
         {% endif %}
         </a>
 
+        <div class="lammps_version">Version: <b>{{ version }}</b></div>
+
         {% include "searchbox.html" %}
 
         {% endblock %}
diff --git a/doc/utils/sphinx-config/_themes/lammps_theme/static/css/theme.css b/doc/utils/sphinx-config/_themes/lammps_theme/static/css/theme.css
index 5e0d43b128..303222df8a 100644
--- a/doc/utils/sphinx-config/_themes/lammps_theme/static/css/theme.css
+++ b/doc/utils/sphinx-config/_themes/lammps_theme/static/css/theme.css
@@ -4189,8 +4189,7 @@ div[class^='highlight'] pre {
   }
 }
 .wy-affix {
-  position: fixed;
-  top: 1.618em;
+  position: fixed;  top: 0.618em;
 }
 
 .wy-menu a:hover {
@@ -4411,7 +4410,7 @@ div[class^='highlight'] pre {
   font-weight: bold;
   display: inline-block;
   padding: 4px 6px;
-  margin-bottom: 0.809em;
+  /*margin-bottom: 0.809em;*/
 }
 .wy-side-nav-search > a:hover, .wy-side-nav-search .wy-dropdown > a:hover {
   background: rgba(255, 255, 255, 0.1);
@@ -4540,7 +4539,7 @@ div[class^='highlight'] pre {
 }
 
 .wy-nav-content {
-  padding: 1.618em 3.236em;
+  padding: 0.5em 1.0em;
   height: 100%;
   margin: auto;
 }
@@ -5105,4 +5104,10 @@ span[id*='MathJax-Span'] {
   padding: 0;
 }
 
+.lammps_version {
+    text-align: center;
+    display: block;
+    margin-bottom: 0.809em;
+}
+
 /*# sourceMappingURL=theme.css.map */
diff --git a/doc/utils/sphinx-config/conf.py b/doc/utils/sphinx-config/conf.py
index 3e16963f01..ffb43e7bff 100644
--- a/doc/utils/sphinx-config/conf.py
+++ b/doc/utils/sphinx-config/conf.py
@@ -60,7 +60,7 @@ master_doc = 'Manual'
 
 # General information about the project.
 project = 'LAMMPS'
-copyright = '2013 Sandia Corporation'
+copyright = '2003-2020 Sandia Corporation'
 
 def get_lammps_version():
     import os
@@ -128,7 +128,9 @@ html_theme = 'lammps_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 = {}
+html_theme_options = {
+   'logo_only' : True
+}
 
 # Add any paths that contain custom themes here, relative to this directory.
 html_theme_path = ['_themes']
@@ -142,7 +144,7 @@ html_title = "LAMMPS documentation"
 
 # The name of an image file (relative to this directory) to place at the top
 # of the sidebar.
-#html_logo = None
+html_logo = 'lammps-logo.png'
 
 # 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
@@ -210,6 +212,9 @@ if 'epub' in sys.argv:
 else:
   html_math_renderer = 'mathjax'
 
+# use relative path for mathjax, so it is looked for in the
+# html tree and the manual becomes readable when offline 
+mathjax_path = 'mathjax/es5/tex-mml-chtml.js'
 # -- Options for LaTeX output ---------------------------------------------
 
 latex_elements = {
@@ -329,3 +334,6 @@ from sphinx.highlighting import lexers
 lexers['LAMMPS'] = LAMMPSLexer.LAMMPSLexer(startinline=True)
 
 sys.path.append(os.path.join(os.path.dirname(__file__), '../../../python'))
+
+# avoid syntax highlighting in blocks that don't specify language
+highlight_language = 'none'
diff --git a/doc/utils/sphinx-config/false_positives.txt b/doc/utils/sphinx-config/false_positives.txt
index 43a4207fc1..91b5c09b93 100644
--- a/doc/utils/sphinx-config/false_positives.txt
+++ b/doc/utils/sphinx-config/false_positives.txt
@@ -72,6 +72,7 @@ allocaters
 allosws
 AlO
 Alonso
+alphashrink
 amap
 Amatrix
 AMD
@@ -172,6 +173,7 @@ backcolor
 Baczewski
 Bagi
 Bagnold
+Bkappa
 Bal
 balancer
 Balankura
@@ -200,7 +202,6 @@ bcolor
 bdiam
 bdw
 Beckman
-behaviour
 Belak
 Bellott
 benchmarking
@@ -258,6 +259,8 @@ Bogaerts
 Bogusz
 Bohrs
 Boltzman
+BondAngle
+BondBond
 bondchk
 bondmax
 bondtype
@@ -273,8 +276,8 @@ Bouguet
 Bourne
 boxcolor
 bp
-bpls
 bpclermont
+bpls
 br
 Branduardi
 Branicio
@@ -314,6 +317,7 @@ Caswell
 Cates
 cauchy
 cauchystat
+Cavazzoni
 Cavium
 Cawkwell
 cbecker
@@ -388,6 +392,7 @@ cmake
 CMake
 cmap
 Cmax
+cmd
 cmdlist
 Cmin
 cmm
@@ -483,6 +488,7 @@ cstring
 cstyle
 csvr
 Ctypes
+ctypes
 cuda
 Cuda
 CUDA
@@ -557,6 +563,7 @@ defgrad
 defn
 deformable
 del
+delaystep
 deleteIDs
 Dellago
 delocalization
@@ -610,7 +617,8 @@ dimgray
 dipolar
 dir
 Direc
-dirs
+dirname
+disarmmd
 discoverable
 discretization
 discretized
@@ -632,6 +640,7 @@ dnf
 DNi
 Dobson
 Dodds
+docenv
 dodgerblue
 dof
 doi
@@ -639,6 +648,7 @@ Donadio
 dotc
 Doty
 doxygen
+downarrow
 Doye
 dpd
 DPD
@@ -660,7 +670,9 @@ DRUDE
 dsf
 dsmc
 dt
+dtgrow
 dtheta
+dtshrink
 du
 dU
 Dudarev
@@ -705,6 +717,7 @@ edgeIDs
 edihed
 edim
 edip
+edn
 edpd
 eDPD
 edu
@@ -737,6 +750,8 @@ electronegative
 electronegativity
 Eleftheriou
 ElementN
+elementset
+elementsets
 elif
 Elj
 Ellad
@@ -762,6 +777,7 @@ engrot
 engtrans
 engvib
 enobonds
+EnSight
 enthalpy
 enums
 envoke
@@ -804,6 +820,8 @@ erotate
 Ertas
 ervel
 Espanol
+Eshelby
+eshelby
 eskm
 esu
 esub
@@ -816,6 +834,9 @@ ethernet
 etol
 etot
 etotal
+Eulerian
+eulerian
+eulerimplicit
 Europhys
 ev
 eV
@@ -835,6 +856,8 @@ extrema
 exy
 ey
 ez
+faceset
+facesets
 factorizable
 factorizations
 Fahrenberger
@@ -852,6 +875,7 @@ fdotr
 fdt
 Fehlberg
 Fellinger
+fe
 femtosecond
 femtoseconds
 fene
@@ -875,6 +899,7 @@ fhg
 Fi
 Fichthorn
 Fickian
+fieldname
 figshare
 Fij
 filelink
@@ -958,10 +983,10 @@ Gahler
 gainsboro
 Galindo
 gamA
-gamR
 gammaA
 gammaFactor
 gammaR
+gamR
 Gan
 GaN
 ganzenmueller
@@ -1017,6 +1042,7 @@ Gmask
 gneb
 GNEB
 Goldfarb
+Gonzalez-Melchor
 googlemail
 Gordan
 GPa
@@ -1053,6 +1079,7 @@ gstyle
 GTL
 Gubbins
 Guericke
+Guenole
 gui
 Gumbsch
 Gunsteren
@@ -1064,6 +1091,7 @@ gz
 gzipped
 Haak
 Hafskjold
+halfstepback
 Halperin
 Halver
 Hamaker
@@ -1075,6 +1103,7 @@ Harting
 Hartree
 Hartrees
 Hasan
+Hashtable
 Haswell
 Haugk
 Hayoun
@@ -1124,6 +1153,7 @@ Homebrew
 hooke
 Hookean
 hotpink
+Houlle
 howto
 Howto
 Hoyt
@@ -1141,6 +1171,8 @@ Hugoniot
 Hura
 hux
 hwloc
+hx
+hy
 hydrophobicity
 hydrostatic
 hydrostatically
@@ -1150,6 +1182,7 @@ hyperdynamics
 hyperradius
 hyperspherical
 hysteretic
+hz
 Ibanez
 ibar
 ibm
@@ -1197,8 +1230,9 @@ infty
 inhomogeneities
 inhomogeneous
 init
-initio
+initialdelay
 initializations
+initio
 InP
 inregion
 Institut
@@ -1228,6 +1262,7 @@ iostreams
 iparam
 ipi
 ipp
+Ippolito
 IPv
 IPython
 Isele
@@ -1275,6 +1310,7 @@ Izvekov
 izz
 Izz
 Jacobsen
+Jadhav
 jagreat
 Jalalvand
 james
@@ -1283,6 +1319,7 @@ Janssens
 Jaramillo
 Jarzynski
 jatempl
+javascript
 jcp
 jea
 jec
@@ -1328,6 +1365,7 @@ Kai
 Kalia
 Kamberaj
 Kapfer
+Karls
 Karlsruhe
 Karniadakis
 Karplus
@@ -1348,7 +1386,6 @@ kcl
 Kd
 KDevelop
 ke
-kepler
 KE
 Keblinski
 keflag
@@ -1356,6 +1393,7 @@ Keir
 Kelchner
 Kelkar
 Kemper
+kepler
 keV
 Keyes
 Khersonskii
@@ -1364,6 +1402,7 @@ Khvostov
 Ki
 Kikugawa
 kim
+kinetostats
 kJ
 kk
 Klahn
@@ -1396,6 +1435,7 @@ Kraus
 Kremer
 Kress
 Kronik
+ksh
 kspace
 Kspace
 KSpace
@@ -1451,8 +1491,8 @@ lcbop
 ld
 ldfftw
 ldg
-Lebedeva
 lebedeva
+Lebedeva
 Lebold
 Lechman
 Lehoucq
@@ -1530,6 +1570,7 @@ Liu
 Livermore
 lj
 llammps
+LLVM
 lm
 lmp
 lmpptr
@@ -1565,6 +1606,7 @@ lucy
 Luding
 Lussetti
 Lustig
+lval
 lwsock
 lx
 ly
@@ -1576,7 +1618,7 @@ Mackay
 Mackrodt
 Macromolecules
 macroparticle
-macOS
+MacOS
 Madura
 Magda
 Magdeburg
@@ -1606,11 +1648,14 @@ manybody
 MANYBODY
 Maras
 Marchetti
+Mariella
 Marrink
 Marroquin
 Marsaglia
 Marseille
 Martyna
+mary
+marys
 Masaglia
 Mashayak
 Massimilliano
@@ -1620,6 +1665,7 @@ Masuhiro
 Matchett
 Materias
 mathbf
+mathjax
 matlab
 matplotlib
 Matsubara
@@ -1643,6 +1689,7 @@ maxwell
 Maxwellian
 maxX
 Mayergoyz
+Mayoral
 mbt
 Mbytes
 MBytes
@@ -1671,6 +1718,7 @@ mediumvioletred
 Mees
 Mehl
 Mei
+Melchor
 Meloni
 Melrose
 Mem
@@ -1685,6 +1733,8 @@ Merz
 meshless
 meso
 mesocnt
+MESODPD
+mesodpd
 mesoparticle
 mesoscale
 mesoscopic
@@ -1715,8 +1765,8 @@ Mie
 Mikami
 Militzer
 Minary
-Mindlin
 mincap
+Mindlin
 mingw
 minima
 minimizations
@@ -1907,6 +1957,7 @@ Nelement
 Nelements
 nemd
 netcdf
+netstat
 Nettleton
 Neumann
 Nevent
@@ -1957,6 +2008,9 @@ Nocedal
 nocite
 nocoeff
 nodeless
+nodeset
+nodesets
+Noehring
 noforce
 Noid
 nolib
@@ -1997,6 +2051,7 @@ Nrecompute
 Nrepeat
 nreset
 Nrho
+Nroff
 nrun
 Ns
 Nsample
@@ -2024,6 +2079,7 @@ nucleotides
 num
 numa
 numactl
+numdiff
 numericalfreedom
 numerics
 numpy
@@ -2040,6 +2096,7 @@ Nvidia
 nvk
 nvt
 Nwait
+nwchem
 nx
 Nx
 nxnodes
@@ -2076,8 +2133,8 @@ ons
 OO
 opencl
 openKIM
-OpenMP
 openmp
+OpenMP
 openmpi
 opls
 Oppelstrup
@@ -2131,6 +2188,7 @@ parameterizations
 parameterize
 parameterized
 params
+ParaView
 parmin
 Parrinello
 Partay
@@ -2222,6 +2280,7 @@ pN
 png
 Podhorszki
 Poiseuille
+poisson
 Polak
 polarizabilities
 polarizability
@@ -2234,6 +2293,7 @@ polyA
 polybond
 polydisperse
 polydispersity
+polyelectrolyte
 polyhedra
 popen
 Popov
@@ -2250,11 +2310,10 @@ powderblue
 ppn
 pppm
 prd
+Prakash
 pre
 Pre
 prec
-preceed
-preceeded
 precession
 prefactor
 prefactors
@@ -2283,6 +2342,7 @@ pthread
 pthreads
 ptm
 PTM
+ptol
 ptr
 pu
 purdue
@@ -2305,6 +2365,7 @@ pymbar
 pymodule
 pymol
 pypar
+pythonic
 Pyy
 pz
 Pz
@@ -2388,6 +2449,7 @@ reflectionstyle
 regoin
 Reinders
 reinit
+relaxbox
 relink
 relTol
 remappings
@@ -2496,6 +2558,7 @@ Rr
 rRESPA
 Rspace
 rsq
+rst
 rstyle
 Rubensson
 Rubia
@@ -2525,8 +2588,7 @@ Salles
 sandia
 Sandia
 sandybrown
-Sanitizer
-sanitizers
+sanitizer
 Sanyal
 sc
 scafacos
@@ -2594,6 +2656,7 @@ Shenderova
 Shi
 Shiga
 Shinoda
+shlib
 shockvel
 si
 SiC
@@ -2643,7 +2706,6 @@ smtbq
 sna
 snad
 snapcoeff
-snaphots
 snapparam
 snav
 Snodin
@@ -2653,6 +2715,7 @@ solvated
 solvation
 Sorensen
 soundspeed
+sourceforge
 Souza
 sp
 spacings
@@ -2672,6 +2735,7 @@ sqdistharm
 sqrt
 src
 srd
+sright
 Srinivasan
 Srolovitz
 srp
@@ -2687,9 +2751,9 @@ Startstep
 statcoul
 statcoulombs
 statvolt
-stdlib
 stdin
 stdio
+stdlib
 steelblue
 Stegailov
 Steinbach
@@ -2725,6 +2789,8 @@ Stukowski
 Su
 subbox
 subcutoff
+subcycle
+subcycling
 Subramaniyan
 subscripted
 subscripting
@@ -2739,6 +2805,7 @@ superset
 supersphere
 Supinski
 Surblys
+surfactant
 surfactants
 Suter
 Sutmann
@@ -2785,7 +2852,6 @@ tdamp
 tdpd
 tDPD
 Tdrude
-Technolgy
 Telsa
 tempCorrCoeff
 templated
@@ -2802,6 +2868,7 @@ tfmc
 tfMC
 th
 Thakkar
+Thaokar
 thb
 thei
 Theodorou
@@ -2853,6 +2920,7 @@ tlsph
 tmax
 Tmax
 tmd
+tmin
 Tmin
 tmp
 tN
@@ -2943,6 +3011,7 @@ uInfParallel
 uk
 ul
 ulb
+Uleft
 uloop
 ulsph
 uMech
@@ -2975,6 +3044,7 @@ unsplit
 unstrained
 untar
 untilted
+uparrow
 upenn
 upto
 Urbakh
@@ -2988,10 +3058,13 @@ util
 utils
 utsa
 Uttormark
+uval
 uvm
 uwo
 Uzdin
 vacf
+Vaid
+Vaiwala
 valent
 Valeriu
 valgrind
@@ -3009,6 +3082,7 @@ Vashishta
 vasp
 vcm
 Vcm
+vdfmax
 vdim
 vdisplace
 vdW
@@ -3019,6 +3093,7 @@ Vectorization
 vectorized
 Vegt
 vel
+Velázquez
 Verlag
 verlet
 Verlet
@@ -3096,13 +3171,14 @@ webpage
 Weckner
 WeinanE
 Wennberg
+Westmere
 Westview
 wget
 Whelan
 whitesmoke
+whitespace
 Wi
 Wicaksono
-wih
 Wijk
 Wikipedia
 wildcard
@@ -3138,6 +3214,7 @@ xhi
 xHost
 Xiaohu
 Xiaowang
+Xie
 xk
 xlat
 xlo
@@ -3145,6 +3222,7 @@ xmax
 Xmax
 xmgrace
 xMIC
+xmin
 xmovie
 Xmovie
 xmu
@@ -3163,9 +3241,10 @@ xy
 xyz
 xz
 xzhou
-YAFF
 yaff
+YAFF
 Yamada
+Yaser
 Yazdani
 Ybar
 ybox
@@ -3178,6 +3257,8 @@ yhi
 yi
 ylat
 ylo
+ymax
+ymin
 Yoshida
 ys
 ysu
@@ -3211,6 +3292,8 @@ Ziegenhain
 Zj
 zlim
 zlo
+zmax
+zmin
 zmq
 zN
 zs
diff --git a/doc/utils/sphinx-config/lammps-logo.png b/doc/utils/sphinx-config/lammps-logo.png
new file mode 120000
index 0000000000..37d35bece1
--- /dev/null
+++ b/doc/utils/sphinx-config/lammps-logo.png
@@ -0,0 +1 @@
+../../src/JPG/lammps-logo.png
\ No newline at end of file
diff --git a/examples/COUPLE/README b/examples/COUPLE/README
index 0e611befbd..5a9f297b0f 100644
--- a/examples/COUPLE/README
+++ b/examples/COUPLE/README
@@ -6,23 +6,16 @@ codes or calling LAMMPS as a library.  The examples are provided for
 demonstration purposes.  The physics they calculate is too simple to
 model a realistic problem.
 
-See these sections of the LAMMPS manaul for details:
+In many of the examples included here, LAMMPS must first be built as a
+library.
 
-2.5 Building LAMMPS as a library (doc/Section_start.html#start_5)
-6.10 Coupling LAMMPS to other codes (doc/Section_howto.html#howto_10)
-6.29 Using LAMMPS in client/server mode (doc/Section_howto.html#howto_29)
+See these sections of the LAMMPS manual for details:
 
-In all of the examples included here, LAMMPS must first be built as a
-library.  Basically, in the src dir you type one of
-
-make mode=lib machine
-make mode=shlib machine
-
-to create the static library liblammps_machine.a or the shared library
-liblammps_machine.so for your code to link against.  A soft link
-(liblammps.a or liblammps.so) is also created that points to the most
-recently built static or shared library.  Your code build can simply
-use the soft link if you prefer.
+Build LAMMPS as a library (doc/Build_basics.html)
+Link LAMMPS as a library to another code (doc/Build_link.html)
+Coupling LAMMPS to other codes (doc/Howto_couple.html)
+Using LAMMPS in client/server mode (doc/Howto_client_server.html)
+Library interface to LAMMPS (doc/Howto_library.html)
 
 The library interface to LAMMPS is in src/library.cpp.  Routines can
 be easily added to this file so an external program can perform the
@@ -34,12 +27,15 @@ These are the sub-directories included in this directory:
 
 simple		    simple example of driver code calling LAMMPS as a lib
 multiple	    example of driver code calling multiple instances of LAMMPS
+plugin              example for loading LAMMPS at runtime from a shared library
 lammps_mc           client/server coupling of Monte Carlo client 
                       with LAMMPS server for energy evaluation
+lammps_nwchem       client/server coupling of LAMMPS client with 
+                      NWChem quantum DFT as server for quantum forces
 lammps_quest	    MD with quantum forces, coupling to Quest DFT code
 lammps_spparks	    grain-growth Monte Carlo with strain via MD,
 		    coupling to SPPARKS kinetic MC code
-lammps_vasp         client/server coupling of LAMMPS client  with 
+lammps_vasp         client/server coupling of LAMMPS client with 
                       VASP quantum DFT as server for quantum forces
 library		    collection of useful inter-code communication routines
 fortran             a simple wrapper on the LAMMPS library API that
diff --git a/examples/COUPLE/lammps_nwchem/README b/examples/COUPLE/lammps_nwchem/README
new file mode 100644
index 0000000000..cb5c5b58cf
--- /dev/null
+++ b/examples/COUPLE/lammps_nwchem/README
@@ -0,0 +1,197 @@
+Sample LAMMPS MD wrapper on NWChem via client/server coupling
+
+See the MESSAGE package (doc/Section_messages.html#MESSAGE) and
+Section_howto.html#howto10 for more details on how client/server
+coupling works in LAMMPS.
+
+In this dir, the nwchem_wrap.py is a wrapper on the NWChem electronic
+structure code so it can work as a "server" code which LAMMPS drives
+as a "client" code to perform ab initio MD.  LAMMPS performs the MD
+timestepping, sends NWChem a current set of coordinates each timestep,
+NWChem computes forces and energy (and virial) and returns that info
+to LAMMPS.
+
+Messages are exchanged between NWChem and LAMMPS via a client/server
+library (CSlib), which is included in the LAMMPS distribution in
+lib/message.  As explained below you can choose to exchange data
+between the two programs either via files or sockets (ZMQ).  If the
+nwchem_wrap.py program became parallel, or the CSlib library calls were
+integrated into NWChem directly, then data could also be exchanged via
+MPI.
+
+There are 2 examples provided in the planeware and ao_basis
+sub-directories.  See details below.
+
+----------------
+
+Build LAMMPS with its MESSAGE package installed:
+
+See the Build extras doc page and its MESSAGE package
+section for details.
+
+CMake:
+
+-D PKG_MESSAGE=yes      # include the MESSAGE package
+-D MESSAGE_ZMQ=value    # build with ZeroMQ support, value = no (default) or yes
+
+Traditional make:
+
+cd lammps/lib/message
+python Install.py -m -z       # build CSlib with MPI and ZMQ support
+cd lammps/src
+make yes-message
+make mpi
+
+You can leave off the -z if you do not have ZMQ on your system.
+
+----------------
+
+Build the CSlib in a form usable by the nwchem_wrapper.py script:
+
+% cd lammps/lib/message/cslib/src
+% make shlib            # build serial and parallel shared lib with ZMQ support
+% make shlib zmq=no     # build serial and parallel shared lib w/out ZMQ support
+
+This will make a shared library versions of the CSlib, which Python
+requires.  Python must be able to find both the cslib.py script and
+the libcsnompi.so library in your lammps/lib/message/cslib/src
+directory.  If it is not able to do this, you will get an error when
+you run nwchem_wrapper.py.
+
+You can do this by augmenting two environment variables, either from
+the command line, or in your shell start-up script.  Here is the
+sample syntax for the csh or tcsh shells:
+
+setenv PYTHONPATH ${PYTHONPATH}:/home/sjplimp/lammps/lib/message/cslib/src
+setenv LD_LIBRARY_PATH ${LD_LIBRARY_PATH}:/home/sjplimp/lammps/lib/message/cslib/src
+
+----------------
+
+Prepare to use NWChem and the nwchem_wrap.py script
+
+You can run the nwchem_wrap.py script as-is to test that the coupling
+between it and LAMMPS is functional.  This will use the included
+nwchem_lammps.out files output by a previous NWChem run.
+
+But note that the as-is version of nwchem_wrap.py will not attempt to
+run NWChem.
+
+To do this, you must edit the 1st nwchemcmd line at the top of
+nwchem_wrapper.py to be the launch command needed to run NWChem on
+your system.  It can be a command to run NWChem in serial or in
+parallel, e.g. an mpirun command.  Then comment out the 2nd nwchemcmd
+line immediately following it.
+
+Ensure you have the necessary NWChem input file in this directory,
+suitable for the NWChem calculation you want to perform.
+
+Example input files are provided for both atom-centered AO basis sets
+and plane-wave basis sets. Note that the NWChem template file should
+be matched to the LAMMPS input script (# of atoms and atom types, box
+size, etc).
+
+Once you run NWChem yourself, the nwchem_lammps.out file will be
+overwritten.
+
+The syntax of the wrapper is:
+nwchem_wrap.py file/zmq ao/pw input_template
+* file/zmg = messaging mode, must match LAMMPS messaging mode
+* ao/pw = basis set mode, selects between atom-centered and plane-wave
+          the input_template file must correspond to the appropriate basis set mode:
+          the "ao" mode supports the scf and dft modules in NWChem,
+          the "pw" mode supports the nwpw module.
+* input_template = NWChem input file used as template, must include a
+                   "geometry" block with the atoms in the simulation, dummy
+                   xyz coordinates should be included (but are not used).
+                   Atom ordering must match LAMMPS input.
+
+During a simulation, the molecular orbitals from the previous timestep
+will be used as the initial guess for the next NWChem calculation. If
+a file named "nwchem_lammps.movecs" is in the directory the wrapper is
+called from, these orbitals will be used as the initial guess orbitals
+in the first step of the simulation.
+
+----------------
+
+Example directories
+
+(1) planewave
+
+Demonstrates coupling of the nwpw module in NWChem with LAMMPS. Only fully
+periodic boundary conditions and orthogonal simulation boxes are currently
+supported by the wrapper. The included files provide an example run using a
+2 atom unit cell of tungsten.
+
+Files:
+  * data.W               LAMMPS input with geometry information
+  * in.client.W          LAMMPS simulation input
+  * log.client.output    LAMMPS simulation output
+  * w.nw                 NWChem template input file
+  * nwchem_lammps.out    NWChem output
+
+(2) ao_basis
+
+Demonstrates coupling of the scf (or dft) modules in NWChem with
+LAMMPS.  Only fully aperiodic boundary conditions are currently
+supported by the wrapper. The included files provide an example run
+using a single water molecule.
+
+Files:
+  * data.h2o               LAMMPS input with geometry information
+  * in.client.h2o          LAMMPS simulation input
+  * log.client.output      LAMMPS simulation output
+  * h2o.nw                 NWChem template input file
+  * nwchem_lammps.out      NWChem output
+
+As noted above, you can run the nwchem_wrap.py script as-is to test that
+the coupling between it and LAMMPS is functional.  This will use the included
+nwchem_lammps.out files.
+
+----------------
+
+To run in client/server mode:
+
+NOTE: The nwchem_wrap.py script must be run with Python version 2, not
+3.  This is because it used the CSlib python wrapper, which only
+supports version 2.  We plan to upgrade CSlib to support Python 3.
+
+Both the client (LAMMPS) and server (nwchem_wrap.py) must use the same
+messaging mode, namely file or zmq.  This is an argument to the
+nwchem_wrap.py code; it can be selected by setting the "mode" variable
+when you run LAMMPS.  The default mode = file.
+
+Here we assume LAMMPS was built to run in parallel, and the MESSAGE
+package was installed with socket (ZMQ) support.  This means either of
+the messaging modes can be used and LAMMPS can be run in serial or
+parallel.  The nwchem_wrap.py code is always run in serial, but it
+launches NWChem from Python via an mpirun command which can run NWChem
+itself in parallel.
+
+When you run, the server should print out thermodynamic info every
+timestep which corresponds to the forces and virial computed by NWChem.
+NWChem will also generate output files each timestep.  Output files from
+previous timesteps are archived in a "nwchem_logs" directory.
+
+The examples below are commands you should use in two different
+terminal windows.  The order of the two commands (client or server
+launch) does not matter.  You can run them both in the same window if
+you append a "&" character to the first one to run it in the
+background.
+
+--------------
+
+File mode of messaging:
+
+% mpirun -np 1 lmp_mpi -v mode file < in.client.W
+% python nwchem_wrap.py file pw w.nw
+
+% mpirun -np 2 lmp_mpi -v mode file < in.client.h2o
+% python nwchem_wrap.py file ao h2o.nw
+
+ZMQ mode of messaging:
+
+% mpirun -np 1 lmp_mpi -v mode zmq < in.client.W
+% python nwchem_wrap.py zmq pw w.nw
+
+% mpirun -np 2 lmp_mpi -v mode zmq < in.client.h2o
+% python nwchem_wrap.py zmq ao h2o.nw
diff --git a/examples/COUPLE/lammps_nwchem/ao_basis/data.h2o b/examples/COUPLE/lammps_nwchem/ao_basis/data.h2o
new file mode 100644
index 0000000000..90f63e17ce
--- /dev/null
+++ b/examples/COUPLE/lammps_nwchem/ao_basis/data.h2o
@@ -0,0 +1,20 @@
+LAMMPS H2O data file
+ 
+3 atoms
+ 
+2 atom types
+
+-10.0 10.0 xlo xhi
+-10.0 10.0 ylo yhi
+-10.0 10.0 zlo zhi
+
+Masses
+
+1  15.994915008544922
+2  1.0078250169754028
+ 
+Atoms
+ 
+1 1 0.0  0.0        0.0
+2 2 0.0  0.756723  -0.585799
+3 2 0.0 -0.756723  -0.585799
diff --git a/examples/COUPLE/lammps_nwchem/ao_basis/h2o.nw b/examples/COUPLE/lammps_nwchem/ao_basis/h2o.nw
new file mode 100644
index 0000000000..285a2a33c8
--- /dev/null
+++ b/examples/COUPLE/lammps_nwchem/ao_basis/h2o.nw
@@ -0,0 +1,25 @@
+echo
+
+memory global 40 mb stack 23 mb heap 5 mb
+
+geometry units angstrom noautosym
+ O   0.0 0.0 0.0
+ H   1.0 0.5 0.0
+ H  -1.0 0.5 0.0
+end
+
+basis
+  O library 6-31g*
+  H library 6-31g*
+end
+
+scf
+ maxiter 100
+end
+
+#dft
+# xc b3lyp
+#end
+
+task scf gradient
+#task dft gradient
diff --git a/examples/COUPLE/lammps_nwchem/ao_basis/in.client.h2o b/examples/COUPLE/lammps_nwchem/ao_basis/in.client.h2o
new file mode 100644
index 0000000000..20072f50aa
--- /dev/null
+++ b/examples/COUPLE/lammps_nwchem/ao_basis/in.client.h2o
@@ -0,0 +1,27 @@
+# H2O with NWChem 
+
+variable        mode index file
+ 
+if "${mode} == file" then &
+  "message client md file tmp.couple" &
+elif "${mode} == zmq" &
+  "message client md zmq localhost:5555" &
+
+units		metal
+atom_style	atomic
+atom_modify     sort 0 0.0 map yes
+
+boundary        m m m
+read_data       data.h2o
+
+velocity	all create 300.0 87287 loop geom
+
+neighbor	0.3 bin
+neigh_modify	delay 0 every 10 check no
+
+fix		1 all nve
+fix             2 all client/md
+fix_modify      2 energy yes
+
+thermo          1
+run		3
diff --git a/examples/COUPLE/lammps_nwchem/ao_basis/in.client.h2o.min b/examples/COUPLE/lammps_nwchem/ao_basis/in.client.h2o.min
new file mode 100644
index 0000000000..4a506d0924
--- /dev/null
+++ b/examples/COUPLE/lammps_nwchem/ao_basis/in.client.h2o.min
@@ -0,0 +1,30 @@
+# H2O with NWChem 
+
+variable        mode index file
+ 
+if "${mode} == file" then &
+  "message client md file tmp.couple" &
+elif "${mode} == zmq" &
+  "message client md zmq localhost:5555" &
+
+units		metal
+atom_style	atomic
+atom_modify     sort 0 0.0 map yes
+
+boundary        m m m
+read_data       data.h2o
+
+group           one id 2
+displace_atoms  one move 0.1 0.2 0.3
+
+velocity	all create 300.0 87287 loop geom
+
+neighbor	0.3 bin
+neigh_modify	delay 0 every 10 check no
+
+fix		1 all nve
+fix             2 all client/md
+fix_modify      2 energy yes
+
+thermo          1
+minimize        1.0e-6 1.0e-6 10 50
diff --git a/examples/COUPLE/lammps_nwchem/ao_basis/log.client.output b/examples/COUPLE/lammps_nwchem/ao_basis/log.client.output
new file mode 100644
index 0000000000..49ec904bea
--- /dev/null
+++ b/examples/COUPLE/lammps_nwchem/ao_basis/log.client.output
@@ -0,0 +1,66 @@
+LAMMPS (19 Sep 2019)
+OMP_NUM_THREADS environment is not set. Defaulting to 1 thread. (src/comm.cpp:93)
+  using 1 OpenMP thread(s) per MPI task
+# H2O with NWChem
+
+variable        mode index file
+
+if "${mode} == file" then   "message client md file tmp.couple" elif "${mode} == zmq"   "message client md zmq localhost:5555"
+message client md file tmp.couple
+units		metal
+atom_style	atomic
+atom_modify     sort 0 0.0 map yes
+
+boundary        m m m
+read_data       data.h2o
+  orthogonal box = (-10 -10 -10) to (10 10 10)
+  1 by 1 by 1 MPI processor grid
+  reading atoms ...
+  3 atoms
+  read_data CPU = 0.000627125 secs
+
+velocity	all create 300.0 87287 loop geom
+
+neighbor	0.3 bin
+neigh_modify	delay 0 every 10 check no
+
+fix		1 all nve
+fix             2 all client/md
+fix_modify      2 energy yes
+
+thermo          1
+run		3
+WARNING: Communication cutoff is 0.0. No ghost atoms will be generated. Atoms may get lost. (src/comm_brick.cpp:166)
+Per MPI rank memory allocation (min/avg/max) = 0.0276 | 0.0276 | 0.0276 Mbytes
+Step Temp E_pair E_mol TotEng Press Volume 
+       0          300            0            0  0.077556087    10.354878         8000 
+       1          300            0            0  0.077556087    10.354878         8000 
+       2          300            0            0  0.077556087    10.354878         8000 
+       3          300            0            0  0.077556087    10.354878         8000 
+Loop time of 0.30198 on 1 procs for 3 steps with 3 atoms
+
+Performance: 0.858 ns/day, 27.961 hours/ns, 9.934 timesteps/s
+0.0% CPU use with 1 MPI tasks x 1 OpenMP threads
+
+MPI task timing breakdown:
+Section |  min time  |  avg time  |  max time  |%varavg| %total
+---------------------------------------------------------------
+Pair    | 0          | 0          | 0          |   0.0 |  0.00
+Neigh   | 0          | 0          | 0          |   0.0 |  0.00
+Comm    | 2.5979e-06 | 2.5979e-06 | 2.5979e-06 |   0.0 |  0.00
+Output  | 0.00012053 | 0.00012053 | 0.00012053 |   0.0 |  0.04
+Modify  | 0.30185    | 0.30185    | 0.30185    |   0.0 | 99.96
+Other   |            | 8.211e-06  |            |       |  0.00
+
+Nlocal:    3 ave 3 max 3 min
+Histogram: 1 0 0 0 0 0 0 0 0 0
+Nghost:    0 ave 0 max 0 min
+Histogram: 1 0 0 0 0 0 0 0 0 0
+Neighs:    0 ave 0 max 0 min
+Histogram: 1 0 0 0 0 0 0 0 0 0
+
+Total # of neighbors = 0
+Ave neighs/atom = 0
+Neighbor list builds = 0
+Dangerous builds not checked
+Total wall time: 0:00:07
diff --git a/examples/COUPLE/lammps_nwchem/ao_basis/log.lammps.h2o.31Jan20 b/examples/COUPLE/lammps_nwchem/ao_basis/log.lammps.h2o.31Jan20
new file mode 100644
index 0000000000..f4dedfcce5
--- /dev/null
+++ b/examples/COUPLE/lammps_nwchem/ao_basis/log.lammps.h2o.31Jan20
@@ -0,0 +1,66 @@
+LAMMPS (19 Sep 2019)
+OMP_NUM_THREADS environment is not set. Defaulting to 1 thread. (src/comm.cpp:93)
+  using 1 OpenMP thread(s) per MPI task
+# H2O with NWChem
+
+variable        mode index file
+
+if "${mode} == file" then   "message client md file tmp.couple" elif "${mode} == zmq"   "message client md zmq localhost:5555"
+message client md file tmp.couple
+units		metal
+atom_style	atomic
+atom_modify     sort 0 0.0 map yes
+
+boundary        m m m
+read_data       data.h2o
+  orthogonal box = (-10 -10 -10) to (10 10 10)
+  1 by 1 by 1 MPI processor grid
+  reading atoms ...
+  3 atoms
+  read_data CPU = 0.000608759 secs
+
+velocity	all create 300.0 87287 loop geom
+
+neighbor	0.3 bin
+neigh_modify	delay 0 every 10 check no
+
+fix		1 all nve
+fix             2 all client/md
+fix_modify      2 energy yes
+
+thermo          1
+run		3
+WARNING: Communication cutoff is 0.0. No ghost atoms will be generated. Atoms may get lost. (src/comm_brick.cpp:166)
+Per MPI rank memory allocation (min/avg/max) = 0.0276 | 0.0276 | 0.0276 Mbytes
+Step Temp E_pair E_mol TotEng Press Volume 
+       0          300            0            0   -2068.2746    10.354878         8000 
+       1    200.33191            0            0   -2068.2704    6.9147085         8000 
+       2    152.36218            0            0    -2068.269    5.2589726         8000 
+       3    227.40679            0            0   -2068.2722    7.8492321         8000 
+Loop time of 1.90319 on 1 procs for 3 steps with 3 atoms
+
+Performance: 0.136 ns/day, 176.221 hours/ns, 1.576 timesteps/s
+0.0% CPU use with 1 MPI tasks x 1 OpenMP threads
+
+MPI task timing breakdown:
+Section |  min time  |  avg time  |  max time  |%varavg| %total
+---------------------------------------------------------------
+Pair    | 0          | 0          | 0          |   0.0 |  0.00
+Neigh   | 0          | 0          | 0          |   0.0 |  0.00
+Comm    | 3.9274e-06 | 3.9274e-06 | 3.9274e-06 |   0.0 |  0.00
+Output  | 0.00011798 | 0.00011798 | 0.00011798 |   0.0 |  0.01
+Modify  | 1.9031     | 1.9031     | 1.9031     |   0.0 | 99.99
+Other   |            | 1.054e-05  |            |       |  0.00
+
+Nlocal:    3 ave 3 max 3 min
+Histogram: 1 0 0 0 0 0 0 0 0 0
+Nghost:    0 ave 0 max 0 min
+Histogram: 1 0 0 0 0 0 0 0 0 0
+Neighs:    0 ave 0 max 0 min
+Histogram: 1 0 0 0 0 0 0 0 0 0
+
+Total # of neighbors = 0
+Ave neighs/atom = 0
+Neighbor list builds = 0
+Dangerous builds not checked
+Total wall time: 0:00:07
diff --git a/examples/COUPLE/lammps_nwchem/ao_basis/log.lammps.h2o.min.31Jan20 b/examples/COUPLE/lammps_nwchem/ao_basis/log.lammps.h2o.min.31Jan20
new file mode 100644
index 0000000000..5fb1f93318
--- /dev/null
+++ b/examples/COUPLE/lammps_nwchem/ao_basis/log.lammps.h2o.min.31Jan20
@@ -0,0 +1,82 @@
+LAMMPS (19 Sep 2019)
+OMP_NUM_THREADS environment is not set. Defaulting to 1 thread. (src/comm.cpp:93)
+  using 1 OpenMP thread(s) per MPI task
+# H2O with NWChem
+
+variable        mode index file
+
+if "${mode} == file" then   "message client md file tmp.couple" elif "${mode} == zmq"   "message client md zmq localhost:5555"
+message client md file tmp.couple
+units		metal
+atom_style	atomic
+atom_modify     sort 0 0.0 map yes
+
+boundary        m m m
+read_data       data.h2o
+  orthogonal box = (-10 -10 -10) to (10 10 10)
+  1 by 1 by 1 MPI processor grid
+  reading atoms ...
+  3 atoms
+  read_data CPU = 0.000615383 secs
+
+group           one id 2
+1 atoms in group one
+displace_atoms  one move 0.1 0.2 0.3
+
+velocity	all create 300.0 87287 loop geom
+
+neighbor	0.3 bin
+neigh_modify	delay 0 every 10 check no
+
+fix		1 all nve
+fix             2 all client/md
+fix_modify      2 energy yes
+
+thermo          1
+minimize        1.0e-6 1.0e-6 10 50
+WARNING: Using 'neigh_modify every 1 delay 0 check yes' setting during minimization (src/min.cpp:174)
+WARNING: Communication cutoff is 0.0. No ghost atoms will be generated. Atoms may get lost. (src/comm_brick.cpp:166)
+Per MPI rank memory allocation (min/avg/max) = 0.0279 | 0.0279 | 0.0279 Mbytes
+Step Temp E_pair E_mol TotEng Press Volume 
+       0          300            0            0   -2067.8909    10.354878         8000 
+       1          300            0            0   -2068.0707    10.354878         8000 
+       2          300            0            0    -2068.252    10.354878         8000 
+WARNING: Communication cutoff is 0.0. No ghost atoms will be generated. Atoms may get lost. (src/comm_brick.cpp:166)
+       3          300            0            0   -2068.2797    10.354878         8000 
+WARNING: Communication cutoff is 0.0. No ghost atoms will be generated. Atoms may get lost. (src/comm_brick.cpp:166)
+       4          300            0            0   -2068.2799    10.354878         8000 
+Loop time of 5.71024 on 1 procs for 4 steps with 3 atoms
+
+0.1% CPU use with 1 MPI tasks x 1 OpenMP threads
+
+Minimization stats:
+  Stopping criterion = energy tolerance
+  Energy initial, next-to-last, final = 
+        -2067.96847053     -2068.35730416     -2068.35745184
+  Force two-norm initial, final = 4.54685 0.124714
+  Force max component initial, final = 3.48924 0.0859263
+  Final line search alpha, max atom move = 1 0.0859263
+  Iterations, force evaluations = 4 8
+
+MPI task timing breakdown:
+Section |  min time  |  avg time  |  max time  |%varavg| %total
+---------------------------------------------------------------
+Pair    | 0          | 0          | 0          |   0.0 |  0.00
+Neigh   | 6.2305e-07 | 6.2305e-07 | 6.2305e-07 |   0.0 |  0.00
+Comm    | 1.1522e-05 | 1.1522e-05 | 1.1522e-05 |   0.0 |  0.00
+Output  | 8.4217e-05 | 8.4217e-05 | 8.4217e-05 |   0.0 |  0.00
+Modify  | 5.7099     | 5.7099     | 5.7099     |   0.0 | 99.99
+Other   |            | 0.0002355  |            |       |  0.00
+
+Nlocal:    3 ave 3 max 3 min
+Histogram: 1 0 0 0 0 0 0 0 0 0
+Nghost:    0 ave 0 max 0 min
+Histogram: 1 0 0 0 0 0 0 0 0 0
+Neighs:    0 ave 0 max 0 min
+Histogram: 1 0 0 0 0 0 0 0 0 0
+
+Total # of neighbors = 0
+Ave neighs/atom = 0
+Neighbor list builds = 2
+Dangerous builds not checked
+Total wall time: 0:00:10
diff --git a/examples/COUPLE/lammps_nwchem/ao_basis/nwchem_lammps.out b/examples/COUPLE/lammps_nwchem/ao_basis/nwchem_lammps.out
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/examples/COUPLE/lammps_nwchem/ao_basis/nwchem_lammps.out.h2o.31Jan20 b/examples/COUPLE/lammps_nwchem/ao_basis/nwchem_lammps.out.h2o.31Jan20
new file mode 100644
index 0000000000..bba8a12a22
--- /dev/null
+++ b/examples/COUPLE/lammps_nwchem/ao_basis/nwchem_lammps.out.h2o.31Jan20
@@ -0,0 +1,626 @@
+ argument  1 = nwchem_lammps.nw
+
+
+
+============================== echo of input deck ==============================
+echo
+
+memory global 40 mb stack 23 mb heap 5 mb
+
+geometry units angstrom noautosym nocenter
+O  0.00197082 0.0012463 -0.00298048
+H  -0.0432066 0.769363 -0.596119
+H  0.0119282 -0.789143 -0.528177
+end
+
+scf
+ vectors input nwchem_lammps.movecs
+end
+
+dft
+ vectors input nwchem_lammps.movecs
+end
+
+basis
+  O library 6-31g*
+  H library 6-31g*
+end
+
+scf
+ maxiter 100
+end
+
+#dft
+# xc b3lyp
+#end
+
+task scf gradient
+#task dft gradient
+================================================================================
+
+
+                                         
+                                         
+
+
+              Northwest Computational Chemistry Package (NWChem) 6.8
+              ------------------------------------------------------
+
+
+                    Environmental Molecular Sciences Laboratory
+                       Pacific Northwest National Laboratory
+                                Richland, WA 99352
+
+                              Copyright (c) 1994-2018
+                       Pacific Northwest National Laboratory
+                            Battelle Memorial Institute
+
+             NWChem is an open-source computational chemistry package
+                        distributed under the terms of the
+                      Educational Community License (ECL) 2.0
+             A copy of the license is included with this distribution
+                              in the LICENSE.TXT file
+
+                                  ACKNOWLEDGMENT
+                                  --------------
+
+            This software and its documentation were developed at the
+            EMSL at Pacific Northwest National Laboratory, a multiprogram
+            national laboratory, operated for the U.S. Department of Energy
+            by Battelle under Contract Number DE-AC05-76RL01830. Support
+            for this work was provided by the Department of Energy Office
+            of Biological and Environmental Research, Office of Basic
+            Energy Sciences, and the Office of Advanced Scientific Computing.
+
+
+           Job information
+           ---------------
+
+    hostname        = almondjoy
+    program         = /home/jboschen/nwchem-6.8.1-release/bin/LINUX64/nwchem
+    date            = Fri Jan 31 00:31:00 2020
+
+    compiled        = Tue_Oct_01_13:20:43_2019
+    source          = /home/jboschen/nwchem-6.8.1-release
+    nwchem branch   = Development
+    nwchem revision = N/A
+    ga revision     = 5.6.5
+    use scalapack   = F
+    input           = nwchem_lammps.nw
+    prefix          = nwchem_lammps.
+    data base       = ./nwchem_lammps.db
+    status          = restart
+    nproc           =        1
+    time left       =     -1s
+
+
+
+           Memory information
+           ------------------
+
+    heap     =     655358 doubles =      5.0 Mbytes
+    stack    =    3014651 doubles =     23.0 Mbytes
+    global   =    5242880 doubles =     40.0 Mbytes (distinct from heap & stack)
+    total    =    8912889 doubles =     68.0 Mbytes
+    verify   = yes
+    hardfail = no 
+
+
+           Directory information
+           ---------------------
+
+  0 permanent = .
+  0 scratch   = .
+
+
+           Previous task information
+           -------------------------
+
+    Theory    = scf                             
+    Operation = gradient                      
+    Status    = ok                            
+    Qmmm      = F
+    Ignore    = F
+
+
+           Geometries in the database
+           --------------------------
+
+       Name                              Natoms  Last Modified
+       --------------------------------  ------  ------------------------
+    1  geometry                               3  Fri Jan 31 00:30:59 2020  
+
+  The geometry named "geometry" is the default for restart
+
+
+
+           Basis sets in the database
+           --------------------------
+
+       Name                              Natoms  Last Modified
+        --------------------------------  ------  ------------------------
+    1  ao basis                               2  Fri Jan 31 00:30:59 2020  
+
+  The basis set named "ao basis" is the default AO basis for restart
+
+
+
+
+                                NWChem Input Module
+                                -------------------
+
+
+
+ Scaling coordinates for geometry "geometry" by  1.889725989
+ (inverse scale =  0.529177249)
+
+
+          ------
+          auto-z
+          ------
+  no constraints, skipping    0.0000000000000000     
+  no constraints, skipping    0.0000000000000000     
+
+
+                             Geometry "geometry" -> ""
+                             -------------------------
+
+ Output coordinates in angstroms (scale by  1.889725989 to convert to a.u.)
+
+  No.       Tag          Charge          X              Y              Z
+ ---- ---------------- ---------- -------------- -------------- --------------
+    1 O                    8.0000     0.00197082     0.00124630    -0.00298048
+    2 H                    1.0000    -0.04320660     0.76936300    -0.59611900
+    3 H                    1.0000     0.01192820    -0.78914300    -0.52817700
+
+      Atomic Mass 
+      ----------- 
+
+      O                 15.994910
+      H                  1.007825
+
+
+ Effective nuclear repulsion energy (a.u.)       9.1573270473
+
+            Nuclear Dipole moment (a.u.) 
+            ----------------------------
+        X                 Y               Z
+ ---------------- ---------------- ----------------
+    -0.0293131272    -0.0185374561    -2.1696696942
+
+
+
+                                Z-matrix (autoz)
+                                -------- 
+
+ Units are Angstrom for bonds and degrees for angles
+
+      Type          Name      I     J     K     L     M      Value
+      ----------- --------  ----- ----- ----- ----- ----- ----------
+    1 Stretch                  1     2                       0.97152
+    2 Stretch                  1     3                       0.94902
+    3 Bend                     2     1     3               108.72901
+
+
+            XYZ format geometry
+            -------------------
+     3
+ geometry
+ O                     0.00197082     0.00124630    -0.00298048
+ H                    -0.04320660     0.76936300    -0.59611900
+ H                     0.01192820    -0.78914300    -0.52817700
+
+ ==============================================================================
+                                internuclear distances
+ ------------------------------------------------------------------------------
+       center one      |      center two      | atomic units |  angstroms
+ ------------------------------------------------------------------------------
+    2 H                |   1 O                |     1.83591  |     0.97152
+    3 H                |   1 O                |     1.79339  |     0.94902
+ ------------------------------------------------------------------------------
+                         number of included internuclear distances:          2
+ ==============================================================================
+
+
+
+ ==============================================================================
+                                 internuclear angles
+ ------------------------------------------------------------------------------
+        center 1       |       center 2       |       center 3       |  degrees
+ ------------------------------------------------------------------------------
+    2 H                |   1 O                |   3 H                |   108.73
+ ------------------------------------------------------------------------------
+                            number of included internuclear angles:          1
+ ==============================================================================
+
+
+
+                      Basis "ao basis" -> "" (cartesian)
+                      -----
+  O (Oxygen)
+  ----------
+            Exponent  Coefficients 
+       -------------- ---------------------------------------------------------
+  1 S  5.48467170E+03  0.001831
+  1 S  8.25234950E+02  0.013950
+  1 S  1.88046960E+02  0.068445
+  1 S  5.29645000E+01  0.232714
+  1 S  1.68975700E+01  0.470193
+  1 S  5.79963530E+00  0.358521
+
+  2 S  1.55396160E+01 -0.110778
+  2 S  3.59993360E+00 -0.148026
+  2 S  1.01376180E+00  1.130767
+
+  3 P  1.55396160E+01  0.070874
+  3 P  3.59993360E+00  0.339753
+  3 P  1.01376180E+00  0.727159
+
+  4 S  2.70005800E-01  1.000000
+
+  5 P  2.70005800E-01  1.000000
+
+  6 D  8.00000000E-01  1.000000
+
+  H (Hydrogen)
+  ------------
+            Exponent  Coefficients 
+       -------------- ---------------------------------------------------------
+  1 S  1.87311370E+01  0.033495
+  1 S  2.82539370E+00  0.234727
+  1 S  6.40121700E-01  0.813757
+
+  2 S  1.61277800E-01  1.000000
+
+
+
+ Summary of "ao basis" -> "" (cartesian)
+ ------------------------------------------------------------------------------
+       Tag                 Description            Shells   Functions and Types
+ ---------------- ------------------------------  ------  ---------------------
+ O                           6-31g*                  6       15   3s2p1d
+ H                           6-31g*                  2        2   2s
+
+
+                                 NWChem SCF Module
+                                 -----------------
+
+
+
+  ao basis        = "ao basis"
+  functions       =    19
+  atoms           =     3
+  closed shells   =     5
+  open shells     =     0
+  charge          =   0.00
+  wavefunction    = RHF 
+  input vectors   = ./nwchem_lammps.movecs
+  output vectors  = ./nwchem_lammps.movecs
+  use symmetry    = F
+  symmetry adapt  = F
+
+
+ Summary of "ao basis" -> "ao basis" (cartesian)
+ ------------------------------------------------------------------------------
+       Tag                 Description            Shells   Functions and Types
+ ---------------- ------------------------------  ------  ---------------------
+ O                           6-31g*                  6       15   3s2p1d
+ H                           6-31g*                  2        2   2s
+
+
+
+ Forming initial guess at       0.0s
+
+
+ Loading old vectors from job with title :
+
+
+
+
+ Starting SCF solution at       0.0s
+
+
+
+ ----------------------------------------------
+         Quadratically convergent ROHF
+
+ Convergence threshold     :          1.000E-04
+ Maximum no. of iterations :          100
+ Final Fock-matrix accuracy:          1.000E-07
+ ----------------------------------------------
+
+
+ #quartets = 1.540D+03 #integrals = 1.424D+04 #direct =  0.0% #cached =100.0%
+
+
+ Integral file          = ./nwchem_lammps.aoints.0
+ Record size in doubles =    65536    No. of integs per rec  =    43688
+ Max. records in memory =        2    Max. records in file   =  1392051
+ No. of bits per label  =        8    No. of bits per value  =       64
+
+
+              iter       energy          gnorm     gmax       time
+             ----- ------------------- --------- --------- --------
+                 1      -76.0095751323  4.63D-02  1.64D-02      0.1
+                 2      -76.0097628164  8.13D-04  2.83D-04      0.1
+                 3      -76.0097629130  3.92D-06  1.55D-06      0.1
+
+
+       Final RHF  results 
+       ------------------ 
+
+         Total SCF energy =    -76.009762913030
+      One-electron energy =   -123.002897732381
+      Two-electron energy =     37.835807772101
+ Nuclear repulsion energy =      9.157327047250
+
+        Time for solution =      0.0s
+
+
+             Final eigenvalues
+             -----------------
+
+              1      
+    1  -20.5584
+    2   -1.3367
+    3   -0.7128
+    4   -0.5617
+    5   -0.4959
+    6    0.2104
+    7    0.3038
+    8    1.0409
+    9    1.1202
+   10    1.1606
+   11    1.1691
+   12    1.3840
+   13    1.4192
+   14    2.0312
+   15    2.0334
+
+                       ROHF Final Molecular Orbital Analysis
+                       -------------------------------------
+
+ Vector    2  Occ=2.000000D+00  E=-1.336749D+00
+              MO Center= -2.8D-03, -1.3D-02, -1.7D-01, r^2= 5.1D-01
+   Bfn.  Coefficient  Atom+Function         Bfn.  Coefficient  Atom+Function  
+  ----- ------------  ---------------      ----- ------------  ---------------
+     2      0.476636  1 O  s                  6      0.442369  1 O  s          
+     1     -0.210214  1 O  s          
+
+ Vector    3  Occ=2.000000D+00  E=-7.127948D-01
+              MO Center= -4.9D-03,  3.9D-03, -2.1D-01, r^2= 7.8D-01
+   Bfn.  Coefficient  Atom+Function         Bfn.  Coefficient  Atom+Function  
+  ----- ------------  ---------------      ----- ------------  ---------------
+     4      0.504894  1 O  py                 8      0.303932  1 O  py         
+    18     -0.234724  3 H  s                 16      0.229765  2 H  s          
+
+ Vector    4  Occ=2.000000D+00  E=-5.617306D-01
+              MO Center=  3.6D-03,  9.0D-03,  5.6D-02, r^2= 6.9D-01
+   Bfn.  Coefficient  Atom+Function         Bfn.  Coefficient  Atom+Function  
+  ----- ------------  ---------------      ----- ------------  ---------------
+     5      0.559565  1 O  pz                 9      0.410981  1 O  pz         
+     6      0.315892  1 O  s                  2      0.157960  1 O  s          
+
+ Vector    5  Occ=2.000000D+00  E=-4.959173D-01
+              MO Center=  1.4D-03,  6.9D-05, -2.2D-02, r^2= 6.0D-01
+   Bfn.  Coefficient  Atom+Function         Bfn.  Coefficient  Atom+Function  
+  ----- ------------  ---------------      ----- ------------  ---------------
+     3      0.638390  1 O  px                 7      0.511530  1 O  px         
+
+ Vector    6  Occ=0.000000D+00  E= 2.103822D-01
+              MO Center= -2.3D-02,  3.5D-02, -7.3D-01, r^2= 2.6D+00
+   Bfn.  Coefficient  Atom+Function         Bfn.  Coefficient  Atom+Function  
+  ----- ------------  ---------------      ----- ------------  ---------------
+     6      1.416869  1 O  s                 17     -1.068330  2 H  s          
+    19     -1.014775  3 H  s                  9     -0.490951  1 O  pz         
+     5     -0.212990  1 O  pz         
+
+ Vector    7  Occ=0.000000D+00  E= 3.037943D-01
+              MO Center= -1.8D-02, -8.9D-02, -7.1D-01, r^2= 2.8D+00
+   Bfn.  Coefficient  Atom+Function         Bfn.  Coefficient  Atom+Function  
+  ----- ------------  ---------------      ----- ------------  ---------------
+    19     -1.426837  3 H  s                 17      1.332767  2 H  s          
+     8     -0.842141  1 O  py                 4     -0.327553  1 O  py         
+
+ Vector    8  Occ=0.000000D+00  E= 1.040852D+00
+              MO Center= -7.4D-03,  1.3D-01, -1.6D-01, r^2= 1.4D+00
+   Bfn.  Coefficient  Atom+Function         Bfn.  Coefficient  Atom+Function  
+  ----- ------------  ---------------      ----- ------------  ---------------
+    16      0.931594  2 H  s                 18     -0.747590  3 H  s          
+     8     -0.655817  1 O  py                17     -0.523035  2 H  s          
+    19      0.366407  3 H  s                 14     -0.357109  1 O  dyz        
+
+ Vector    9  Occ=0.000000D+00  E= 1.120172D+00
+              MO Center= -6.8D-03, -2.9D-02, -3.1D-01, r^2= 1.5D+00
+   Bfn.  Coefficient  Atom+Function         Bfn.  Coefficient  Atom+Function  
+  ----- ------------  ---------------      ----- ------------  ---------------
+     6      1.145090  1 O  s                 18      0.841596  3 H  s          
+     2     -0.727471  1 O  s                 16      0.684927  2 H  s          
+     9      0.559191  1 O  pz                19     -0.546678  3 H  s          
+    17     -0.538778  2 H  s                 10     -0.344609  1 O  dxx        
+    15     -0.250035  1 O  dzz        
+
+ Vector   10  Occ=0.000000D+00  E= 1.160603D+00
+              MO Center=  1.2D-02, -4.3D-02,  2.5D-01, r^2= 1.0D+00
+   Bfn.  Coefficient  Atom+Function         Bfn.  Coefficient  Atom+Function  
+  ----- ------------  ---------------      ----- ------------  ---------------
+     6      1.137949  1 O  s                  5     -0.844233  1 O  pz         
+     9      0.595088  1 O  pz                 2     -0.475986  1 O  s          
+    18     -0.455932  3 H  s                 16     -0.357325  2 H  s          
+    13     -0.317117  1 O  dyy               15     -0.196968  1 O  dzz        
+
+ Vector   11  Occ=0.000000D+00  E= 1.169054D+00
+              MO Center=  1.9D-03,  1.2D-03, -6.4D-03, r^2= 1.1D+00
+   Bfn.  Coefficient  Atom+Function         Bfn.  Coefficient  Atom+Function  
+  ----- ------------  ---------------      ----- ------------  ---------------
+     7     -1.034653  1 O  px                 3      0.962043  1 O  px         
+
+ Vector   12  Occ=0.000000D+00  E= 1.384034D+00
+              MO Center=  6.0D-04, -2.6D-03, -5.0D-02, r^2= 1.4D+00
+   Bfn.  Coefficient  Atom+Function         Bfn.  Coefficient  Atom+Function  
+  ----- ------------  ---------------      ----- ------------  ---------------
+     8      1.557767  1 O  py                 4     -1.035829  1 O  py         
+    17     -0.900920  2 H  s                 19      0.901756  3 H  s          
+
+ Vector   13  Occ=0.000000D+00  E= 1.419205D+00
+              MO Center= -1.3D-02, -4.9D-02, -5.2D-01, r^2= 1.4D+00
+   Bfn.  Coefficient  Atom+Function         Bfn.  Coefficient  Atom+Function  
+  ----- ------------  ---------------      ----- ------------  ---------------
+     6      3.605136  1 O  s                  2     -1.454853  1 O  s          
+     9     -1.107532  1 O  pz                19     -0.874208  3 H  s          
+    17     -0.757016  2 H  s                 13     -0.634436  1 O  dyy        
+     5      0.516593  1 O  pz                15     -0.401100  1 O  dzz        
+    10     -0.319873  1 O  dxx               16     -0.260650  2 H  s          
+
+ Vector   14  Occ=0.000000D+00  E= 2.031234D+00
+              MO Center=  1.9D-03,  2.3D-03, -3.0D-03, r^2= 6.1D-01
+   Bfn.  Coefficient  Atom+Function         Bfn.  Coefficient  Atom+Function  
+  ----- ------------  ---------------      ----- ------------  ---------------
+    11      1.727083  1 O  dxy        
+
+ Vector   15  Occ=0.000000D+00  E= 2.033369D+00
+              MO Center=  3.4D-03,  3.4D-03,  4.3D-02, r^2= 6.2D-01
+   Bfn.  Coefficient  Atom+Function         Bfn.  Coefficient  Atom+Function  
+  ----- ------------  ---------------      ----- ------------  ---------------
+    15      1.012642  1 O  dzz               13     -0.512441  1 O  dyy        
+    10     -0.438481  1 O  dxx                6     -0.226567  1 O  s          
+
+
+ center of mass
+ --------------
+ x =  -0.00000001 y =  -0.00000003 z =  -0.12388979
+
+ moments of inertia (a.u.)
+ ------------------
+           6.378705068992           0.153373998471          -0.069687034145
+           0.153373998471           2.014476065716           0.150739744400
+          -0.069687034145           0.150739744400           4.379134195179
+
+  Mulliken analysis of the total density
+  --------------------------------------
+
+    Atom       Charge   Shell Charges
+ -----------   ------   -------------------------------------------------------
+    1 O    8     8.87   2.00  0.90  2.90  0.92  2.08  0.08
+    2 H    1     0.56   0.46  0.11
+    3 H    1     0.56   0.47  0.10
+
+       Multipole analysis of the density wrt the origin
+       ------------------------------------------------
+
+     L   x y z        total         open         nuclear
+     -   - - -        -----         ----         -------
+     0   0 0 0     -0.000000      0.000000     10.000000
+
+     1   1 0 0     -0.026417      0.000000     -0.029313
+     1   0 1 0     -0.023604      0.000000     -0.018537
+     1   0 0 1     -0.846090      0.000000     -2.169670
+
+     2   2 0 0     -5.373227      0.000000      0.007286
+     2   1 1 0     -0.085617      0.000000     -0.152252
+     2   1 0 1      0.038215      0.000000      0.069311
+     2   0 2 0     -2.927589      0.000000      4.337695
+     2   0 1 1     -0.071410      0.000000     -0.149465
+     2   0 0 2     -4.159949      0.000000      2.265483
+
+
+ Parallel integral file used       1 records with       0 large values
+
+                              NWChem Gradients Module
+                              -----------------------
+
+
+
+  wavefunction    =   RHF     
+
+
+
+                         RHF ENERGY GRADIENTS
+
+    atom               coordinates                        gradient
+                 x          y          z           x          y          z
+   1 O       0.003724   0.002355  -0.005632    0.000909  -0.019294   0.007866
+   2 H      -0.081649   1.453885  -1.126502   -0.001242   0.025549  -0.011605
+   3 H       0.022541  -1.491264  -0.998110    0.000333  -0.006255   0.003739
+
+                 ----------------------------------------
+                 |  Time  |  1-e(secs)   |  2-e(secs)   |
+                 ----------------------------------------
+                 |  CPU   |       0.00   |       0.03   |
+                 ----------------------------------------
+                 |  WALL  |       0.00   |       0.03   |
+                 ----------------------------------------
+
+ Task  times  cpu:        0.1s     wall:        0.1s
+
+
+                                NWChem Input Module
+                                -------------------
+
+
+ Summary of allocated global arrays
+-----------------------------------
+  No active global arrays
+
+
+
+                         GA Statistics for process    0
+                         ------------------------------
+
+       create   destroy   get      put      acc     scatter   gather  read&inc
+calls:  182      182     2869      728      468        0        0       68     
+number of processes/call 1.00e+00 1.00e+00 1.00e+00 0.00e+00 0.00e+00
+bytes total:             6.18e+05 3.56e+05 1.04e+05 0.00e+00 0.00e+00 5.44e+02
+bytes remote:            0.00e+00 0.00e+00 0.00e+00 0.00e+00 0.00e+00 0.00e+00
+Max memory consumed for GA by this process: 39432 bytes
+
+MA_summarize_allocated_blocks: starting scan ...
+MA_summarize_allocated_blocks: scan completed: 0 heap blocks, 0 stack blocks
+MA usage statistics:
+
+	allocation statistics:
+					      heap	     stack
+					      ----	     -----
+	current number of blocks	         0	         0
+	maximum number of blocks	        18	        28
+	current total bytes		         0	         0
+	maximum total bytes		   1060104	  16000888
+	maximum total K-bytes		      1061	     16001
+	maximum total M-bytes		         2	        17
+
+
+                                     CITATION
+                                     --------
+                Please cite the following reference when publishing
+                           results obtained with NWChem:
+
+                 M. Valiev, E.J. Bylaska, N. Govind, K. Kowalski,
+              T.P. Straatsma, H.J.J. van Dam, D. Wang, J. Nieplocha,
+                        E. Apra, T.L. Windus, W.A. de Jong
+                 "NWChem: a comprehensive and scalable open-source
+                  solution for large scale molecular simulations"
+                      Comput. Phys. Commun. 181, 1477 (2010)
+                           doi:10.1016/j.cpc.2010.04.018
+
+                                      AUTHORS
+                                      -------
+          E. Apra, E. J. Bylaska, W. A. de Jong, N. Govind, K. Kowalski,
+       T. P. Straatsma, M. Valiev, H. J. J. van Dam, D. Wang, T. L. Windus,
+        J. Hammond, J. Autschbach, K. Bhaskaran-Nair, J. Brabec, K. Lopata,
+    S. A. Fischer, S. Krishnamoorthy, M. Jacquelin, W. Ma, M. Klemm, O. Villa,
+      Y. Chen, V. Anisimov, F. Aquino, S. Hirata, M. T. Hackler, V. Konjkov,
+            D. Mejia-Rodriguez, T. Risthaus, M. Malagoli, A. Marenich,
+   A. Otero-de-la-Roza, J. Mullin, P. Nichols, R. Peverati, J. Pittner, Y. Zhao,
+        P.-D. Fan, A. Fonari, M. J. Williamson, R. J. Harrison, J. R. Rehr,
+      M. Dupuis, D. Silverstein, D. M. A. Smith, J. Nieplocha, V. Tipparaju,
+    M. Krishnan, B. E. Van Kuiken, A. Vazquez-Mayagoitia, L. Jensen, M. Swart,
+      Q. Wu, T. Van Voorhis, A. A. Auer, M. Nooijen, L. D. Crosby, E. Brown,
+      G. Cisneros, G. I. Fann, H. Fruchtl, J. Garza, K. Hirao, R. A. Kendall,
+      J. A. Nichols, K. Tsemekhman, K. Wolinski, J. Anchell, D. E. Bernholdt,
+      P. Borowski, T. Clark, D. Clerc, H. Dachsel, M. J. O. Deegan, K. Dyall,
+    D. Elwood, E. Glendening, M. Gutowski, A. C. Hess, J. Jaffe, B. G. Johnson,
+     J. Ju, R. Kobayashi, R. Kutteh, Z. Lin, R. Littlefield, X. Long, B. Meng,
+      T. Nakajima, S. Niu, L. Pollack, M. Rosing, K. Glaesemann, G. Sandrone,
+      M. Stave, H. Taylor, G. Thomas, J. H. van Lenthe, A. T. Wong, Z. Zhang.
+
+ Total times  cpu:        0.1s     wall:        0.2s
diff --git a/examples/COUPLE/lammps_nwchem/ao_basis/nwchem_lammps.out.h2o.min.31Jan20 b/examples/COUPLE/lammps_nwchem/ao_basis/nwchem_lammps.out.h2o.min.31Jan20
new file mode 100644
index 0000000000..0595813728
--- /dev/null
+++ b/examples/COUPLE/lammps_nwchem/ao_basis/nwchem_lammps.out.h2o.min.31Jan20
@@ -0,0 +1,626 @@
+ argument  1 = nwchem_lammps.nw
+
+
+
+============================== echo of input deck ==============================
+echo
+
+memory global 40 mb stack 23 mb heap 5 mb
+
+geometry units angstrom noautosym nocenter
+O  -0.00836667 0.0010006 0.0866404
+H  0.0968795 0.837453 -0.346117
+H  0.0114839 -0.638453 -0.612122
+end
+
+scf
+ vectors input nwchem_lammps.movecs
+end
+
+dft
+ vectors input nwchem_lammps.movecs
+end
+
+basis
+  O library 6-31g*
+  H library 6-31g*
+end
+
+scf
+ maxiter 100
+end
+
+#dft
+# xc b3lyp
+#end
+
+task scf gradient
+#task dft gradient
+================================================================================
+
+
+                                         
+                                         
+
+
+              Northwest Computational Chemistry Package (NWChem) 6.8
+              ------------------------------------------------------
+
+
+                    Environmental Molecular Sciences Laboratory
+                       Pacific Northwest National Laboratory
+                                Richland, WA 99352
+
+                              Copyright (c) 1994-2018
+                       Pacific Northwest National Laboratory
+                            Battelle Memorial Institute
+
+             NWChem is an open-source computational chemistry package
+                        distributed under the terms of the
+                      Educational Community License (ECL) 2.0
+             A copy of the license is included with this distribution
+                              in the LICENSE.TXT file
+
+                                  ACKNOWLEDGMENT
+                                  --------------
+
+            This software and its documentation were developed at the
+            EMSL at Pacific Northwest National Laboratory, a multiprogram
+            national laboratory, operated for the U.S. Department of Energy
+            by Battelle under Contract Number DE-AC05-76RL01830. Support
+            for this work was provided by the Department of Energy Office
+            of Biological and Environmental Research, Office of Basic
+            Energy Sciences, and the Office of Advanced Scientific Computing.
+
+
+           Job information
+           ---------------
+
+    hostname        = almondjoy
+    program         = /home/jboschen/nwchem-6.8.1-release/bin/LINUX64/nwchem
+    date            = Fri Jan 31 00:33:40 2020
+
+    compiled        = Tue_Oct_01_13:20:43_2019
+    source          = /home/jboschen/nwchem-6.8.1-release
+    nwchem branch   = Development
+    nwchem revision = N/A
+    ga revision     = 5.6.5
+    use scalapack   = F
+    input           = nwchem_lammps.nw
+    prefix          = nwchem_lammps.
+    data base       = ./nwchem_lammps.db
+    status          = restart
+    nproc           =        1
+    time left       =     -1s
+
+
+
+           Memory information
+           ------------------
+
+    heap     =     655358 doubles =      5.0 Mbytes
+    stack    =    3014651 doubles =     23.0 Mbytes
+    global   =    5242880 doubles =     40.0 Mbytes (distinct from heap & stack)
+    total    =    8912889 doubles =     68.0 Mbytes
+    verify   = yes
+    hardfail = no 
+
+
+           Directory information
+           ---------------------
+
+  0 permanent = .
+  0 scratch   = .
+
+
+           Previous task information
+           -------------------------
+
+    Theory    = scf                             
+    Operation = gradient                      
+    Status    = ok                            
+    Qmmm      = F
+    Ignore    = F
+
+
+           Geometries in the database
+           --------------------------
+
+       Name                              Natoms  Last Modified
+       --------------------------------  ------  ------------------------
+    1  geometry                               3  Fri Jan 31 00:33:40 2020  
+
+  The geometry named "geometry" is the default for restart
+
+
+
+           Basis sets in the database
+           --------------------------
+
+       Name                              Natoms  Last Modified
+        --------------------------------  ------  ------------------------
+    1  ao basis                               2  Fri Jan 31 00:33:40 2020  
+
+  The basis set named "ao basis" is the default AO basis for restart
+
+
+
+
+                                NWChem Input Module
+                                -------------------
+
+
+
+ Scaling coordinates for geometry "geometry" by  1.889725989
+ (inverse scale =  0.529177249)
+
+
+          ------
+          auto-z
+          ------
+  no constraints, skipping    0.0000000000000000     
+  no constraints, skipping    0.0000000000000000     
+
+
+                             Geometry "geometry" -> ""
+                             -------------------------
+
+ Output coordinates in angstroms (scale by  1.889725989 to convert to a.u.)
+
+  No.       Tag          Charge          X              Y              Z
+ ---- ---------------- ---------- -------------- -------------- --------------
+    1 O                    8.0000    -0.00836667     0.00100060     0.08664040
+    2 H                    1.0000     0.09687950     0.83745300    -0.34611700
+    3 H                    1.0000     0.01148390    -0.63845300    -0.61212200
+
+      Atomic Mass 
+      ----------- 
+
+      O                 15.994910
+      H                  1.007825
+
+
+ Effective nuclear repulsion energy (a.u.)       9.2881144400
+
+            Nuclear Dipole moment (a.u.) 
+            ----------------------------
+        X                 Y               Z
+ ---------------- ---------------- ----------------
+     0.0782914233     0.3911823503    -0.5009962172
+
+
+
+                                Z-matrix (autoz)
+                                -------- 
+
+ Units are Angstrom for bonds and degrees for angles
+
+      Type          Name      I     J     K     L     M      Value
+      ----------- --------  ----- ----- ----- ----- ----- ----------
+    1 Stretch                  1     2                       0.94763
+    2 Stretch                  1     3                       0.94740
+    3 Bend                     2     1     3               104.86952
+
+
+            XYZ format geometry
+            -------------------
+     3
+ geometry
+ O                    -0.00836667     0.00100060     0.08664040
+ H                     0.09687950     0.83745300    -0.34611700
+ H                     0.01148390    -0.63845300    -0.61212200
+
+ ==============================================================================
+                                internuclear distances
+ ------------------------------------------------------------------------------
+       center one      |      center two      | atomic units |  angstroms
+ ------------------------------------------------------------------------------
+    2 H                |   1 O                |     1.79077  |     0.94763
+    3 H                |   1 O                |     1.79032  |     0.94740
+ ------------------------------------------------------------------------------
+                         number of included internuclear distances:          2
+ ==============================================================================
+
+
+
+ ==============================================================================
+                                 internuclear angles
+ ------------------------------------------------------------------------------
+        center 1       |       center 2       |       center 3       |  degrees
+ ------------------------------------------------------------------------------
+    2 H                |   1 O                |   3 H                |   104.87
+ ------------------------------------------------------------------------------
+                            number of included internuclear angles:          1
+ ==============================================================================
+
+
+
+                      Basis "ao basis" -> "" (cartesian)
+                      -----
+  O (Oxygen)
+  ----------
+            Exponent  Coefficients 
+       -------------- ---------------------------------------------------------
+  1 S  5.48467170E+03  0.001831
+  1 S  8.25234950E+02  0.013950
+  1 S  1.88046960E+02  0.068445
+  1 S  5.29645000E+01  0.232714
+  1 S  1.68975700E+01  0.470193
+  1 S  5.79963530E+00  0.358521
+
+  2 S  1.55396160E+01 -0.110778
+  2 S  3.59993360E+00 -0.148026
+  2 S  1.01376180E+00  1.130767
+
+  3 P  1.55396160E+01  0.070874
+  3 P  3.59993360E+00  0.339753
+  3 P  1.01376180E+00  0.727159
+
+  4 S  2.70005800E-01  1.000000
+
+  5 P  2.70005800E-01  1.000000
+
+  6 D  8.00000000E-01  1.000000
+
+  H (Hydrogen)
+  ------------
+            Exponent  Coefficients 
+       -------------- ---------------------------------------------------------
+  1 S  1.87311370E+01  0.033495
+  1 S  2.82539370E+00  0.234727
+  1 S  6.40121700E-01  0.813757
+
+  2 S  1.61277800E-01  1.000000
+
+
+
+ Summary of "ao basis" -> "" (cartesian)
+ ------------------------------------------------------------------------------
+       Tag                 Description            Shells   Functions and Types
+ ---------------- ------------------------------  ------  ---------------------
+ O                           6-31g*                  6       15   3s2p1d
+ H                           6-31g*                  2        2   2s
+
+
+                                 NWChem SCF Module
+                                 -----------------
+
+
+
+  ao basis        = "ao basis"
+  functions       =    19
+  atoms           =     3
+  closed shells   =     5
+  open shells     =     0
+  charge          =   0.00
+  wavefunction    = RHF 
+  input vectors   = ./nwchem_lammps.movecs
+  output vectors  = ./nwchem_lammps.movecs
+  use symmetry    = F
+  symmetry adapt  = F
+
+
+ Summary of "ao basis" -> "ao basis" (cartesian)
+ ------------------------------------------------------------------------------
+       Tag                 Description            Shells   Functions and Types
+ ---------------- ------------------------------  ------  ---------------------
+ O                           6-31g*                  6       15   3s2p1d
+ H                           6-31g*                  2        2   2s
+
+
+
+ Forming initial guess at       0.0s
+
+
+ Loading old vectors from job with title :
+
+
+
+
+ Starting SCF solution at       0.0s
+
+
+
+ ----------------------------------------------
+         Quadratically convergent ROHF
+
+ Convergence threshold     :          1.000E-04
+ Maximum no. of iterations :          100
+ Final Fock-matrix accuracy:          1.000E-07
+ ----------------------------------------------
+
+
+ #quartets = 1.540D+03 #integrals = 1.424D+04 #direct =  0.0% #cached =100.0%
+
+
+ Integral file          = ./nwchem_lammps.aoints.0
+ Record size in doubles =    65536    No. of integs per rec  =    43688
+ Max. records in memory =        2    Max. records in file   =  1392051
+ No. of bits per label  =        8    No. of bits per value  =       64
+
+
+              iter       energy          gnorm     gmax       time
+             ----- ------------------- --------- --------- --------
+                 1      -76.0107350035  4.75D-05  2.49D-05      0.1
+
+
+       Final RHF  results 
+       ------------------ 
+
+         Total SCF energy =    -76.010735003510
+      One-electron energy =   -123.220958992568
+      Two-electron energy =     37.922109549024
+ Nuclear repulsion energy =      9.288114440035
+
+        Time for solution =      0.0s
+
+
+             Final eigenvalues
+             -----------------
+
+              1      
+    1  -20.5583
+    2   -1.3466
+    3   -0.7130
+    4   -0.5721
+    5   -0.4985
+    6    0.2129
+    7    0.3068
+    8    1.0286
+    9    1.1338
+   10    1.1678
+   11    1.1807
+   12    1.3845
+   13    1.4334
+   14    2.0187
+   15    2.0311
+
+                       ROHF Final Molecular Orbital Analysis
+                       -------------------------------------
+
+ Vector    2  Occ=2.000000D+00  E=-1.346587D+00
+              MO Center=  1.1D-02,  3.1D-02, -8.5D-02, r^2= 5.0D-01
+   Bfn.  Coefficient  Atom+Function         Bfn.  Coefficient  Atom+Function  
+  ----- ------------  ---------------      ----- ------------  ---------------
+     2      0.475648  1 O  s                  6      0.435095  1 O  s          
+     1     -0.209463  1 O  s          
+
+ Vector    3  Occ=2.000000D+00  E=-7.129747D-01
+              MO Center=  1.5D-02,  3.8D-02, -1.3D-01, r^2= 7.6D-01
+   Bfn.  Coefficient  Atom+Function         Bfn.  Coefficient  Atom+Function  
+  ----- ------------  ---------------      ----- ------------  ---------------
+     4      0.500246  1 O  py                 8      0.299047  1 O  py         
+    16      0.232138  2 H  s                 18     -0.232195  3 H  s          
+
+ Vector    4  Occ=2.000000D+00  E=-5.720760D-01
+              MO Center= -1.5D-02, -9.7D-03,  1.5D-01, r^2= 6.8D-01
+   Bfn.  Coefficient  Atom+Function         Bfn.  Coefficient  Atom+Function  
+  ----- ------------  ---------------      ----- ------------  ---------------
+     5      0.545527  1 O  pz                 9      0.395332  1 O  pz         
+     6      0.326735  1 O  s                  2      0.164593  1 O  s          
+
+ Vector    5  Occ=2.000000D+00  E=-4.984552D-01
+              MO Center= -6.2D-03,  4.4D-03,  6.7D-02, r^2= 6.0D-01
+   Bfn.  Coefficient  Atom+Function         Bfn.  Coefficient  Atom+Function  
+  ----- ------------  ---------------      ----- ------------  ---------------
+     3      0.634559  1 O  px                 7      0.507891  1 O  px         
+
+ Vector    6  Occ=0.000000D+00  E= 2.128732D-01
+              MO Center=  7.5D-02,  1.3D-01, -6.6D-01, r^2= 2.6D+00
+   Bfn.  Coefficient  Atom+Function         Bfn.  Coefficient  Atom+Function  
+  ----- ------------  ---------------      ----- ------------  ---------------
+     6      1.437795  1 O  s                 17     -1.050892  2 H  s          
+    19     -1.050374  3 H  s                  9     -0.494696  1 O  pz         
+     5     -0.208359  1 O  pz         
+
+ Vector    7  Occ=0.000000D+00  E= 3.067764D-01
+              MO Center=  7.1D-02,  1.3D-01, -6.3D-01, r^2= 2.7D+00
+   Bfn.  Coefficient  Atom+Function         Bfn.  Coefficient  Atom+Function  
+  ----- ------------  ---------------      ----- ------------  ---------------
+    17      1.413885  2 H  s                 19     -1.414835  3 H  s          
+     8     -0.824411  1 O  py                 4     -0.320355  1 O  py         
+
+ Vector    8  Occ=0.000000D+00  E= 1.028607D+00
+              MO Center=  7.1D-03,  2.6D-02, -5.2D-02, r^2= 1.4D+00
+   Bfn.  Coefficient  Atom+Function         Bfn.  Coefficient  Atom+Function  
+  ----- ------------  ---------------      ----- ------------  ---------------
+    16      0.839269  2 H  s                 18     -0.838060  3 H  s          
+     8     -0.692349  1 O  py                17     -0.426291  2 H  s          
+    19      0.425092  3 H  s                 14     -0.319117  1 O  dyz        
+
+ Vector    9  Occ=0.000000D+00  E= 1.133833D+00
+              MO Center= -2.7D-02, -2.9D-02,  2.6D-01, r^2= 1.5D+00
+   Bfn.  Coefficient  Atom+Function         Bfn.  Coefficient  Atom+Function  
+  ----- ------------  ---------------      ----- ------------  ---------------
+     6      1.621086  1 O  s                  2     -0.910150  1 O  s          
+     9      0.744864  1 O  pz                16      0.490586  2 H  s          
+    18      0.491102  3 H  s                  5     -0.484186  1 O  pz         
+    17     -0.426087  2 H  s                 19     -0.425823  3 H  s          
+    10     -0.375325  1 O  dxx               15     -0.317874  1 O  dzz        
+
+ Vector   10  Occ=0.000000D+00  E= 1.167849D+00
+              MO Center= -8.0D-03,  1.6D-03,  8.3D-02, r^2= 1.1D+00
+   Bfn.  Coefficient  Atom+Function         Bfn.  Coefficient  Atom+Function  
+  ----- ------------  ---------------      ----- ------------  ---------------
+     7     -1.028149  1 O  px                 3      0.955686  1 O  px         
+
+ Vector   11  Occ=0.000000D+00  E= 1.180721D+00
+              MO Center=  1.8D-02,  4.2D-02, -1.5D-01, r^2= 1.1D+00
+   Bfn.  Coefficient  Atom+Function         Bfn.  Coefficient  Atom+Function  
+  ----- ------------  ---------------      ----- ------------  ---------------
+    16      0.710073  2 H  s                 18      0.711177  3 H  s          
+     5      0.704677  1 O  pz                17     -0.389719  2 H  s          
+    19     -0.389376  3 H  s                  6     -0.326170  1 O  s          
+     9     -0.288739  1 O  pz                13      0.229749  1 O  dyy        
+
+ Vector   12  Occ=0.000000D+00  E= 1.384514D+00
+              MO Center= -7.4D-04,  1.3D-02,  1.8D-02, r^2= 1.4D+00
+   Bfn.  Coefficient  Atom+Function         Bfn.  Coefficient  Atom+Function  
+  ----- ------------  ---------------      ----- ------------  ---------------
+     8      1.510506  1 O  py                 4     -1.021750  1 O  py         
+    17     -0.934844  2 H  s                 19      0.935260  3 H  s          
+     9      0.272171  1 O  pz                 5     -0.184286  1 O  pz         
+
+ Vector   13  Occ=0.000000D+00  E= 1.433397D+00
+              MO Center=  4.7D-02,  8.7D-02, -4.1D-01, r^2= 1.4D+00
+   Bfn.  Coefficient  Atom+Function         Bfn.  Coefficient  Atom+Function  
+  ----- ------------  ---------------      ----- ------------  ---------------
+     6      3.628985  1 O  s                  2     -1.436467  1 O  s          
+     9     -1.143870  1 O  pz                17     -0.805578  2 H  s          
+    19     -0.806493  3 H  s                 13     -0.635948  1 O  dyy        
+     5      0.489050  1 O  pz                15     -0.410417  1 O  dzz        
+    16     -0.312860  2 H  s                 18     -0.312722  3 H  s          
+
+ Vector   14  Occ=0.000000D+00  E= 2.018721D+00
+              MO Center= -1.4D-02, -7.1D-03,  1.3D-01, r^2= 6.2D-01
+   Bfn.  Coefficient  Atom+Function         Bfn.  Coefficient  Atom+Function  
+  ----- ------------  ---------------      ----- ------------  ---------------
+    15      0.947149  1 O  dzz               14     -0.531399  1 O  dyz        
+    13     -0.526961  1 O  dyy               10     -0.358371  1 O  dxx        
+    12     -0.297495  1 O  dxz                6     -0.233087  1 O  s          
+
+ Vector   15  Occ=0.000000D+00  E= 2.031133D+00
+              MO Center= -8.4D-03,  1.0D-03,  8.7D-02, r^2= 6.1D-01
+   Bfn.  Coefficient  Atom+Function         Bfn.  Coefficient  Atom+Function  
+  ----- ------------  ---------------      ----- ------------  ---------------
+    11      1.681563  1 O  dxy               12      0.314688  1 O  dxz        
+
+
+ center of mass
+ --------------
+ x =  -0.00258245 y =   0.02272235 z =   0.04407491
+
+ moments of inertia (a.u.)
+ ------------------
+           6.155330507195          -0.266185800841           0.185335033231
+          -0.266185800841           2.211585220634          -0.350250164177
+           0.185335033231          -0.350250164177           4.020009073007
+
+  Mulliken analysis of the total density
+  --------------------------------------
+
+    Atom       Charge   Shell Charges
+ -----------   ------   -------------------------------------------------------
+    1 O    8     8.87   2.00  0.90  2.91  0.91  2.06  0.08
+    2 H    1     0.57   0.47  0.10
+    3 H    1     0.57   0.47  0.10
+
+       Multipole analysis of the density wrt the origin
+       ------------------------------------------------
+
+     L   x y z        total         open         nuclear
+     -   - - -        -----         ----         -------
+     0   0 0 0     -0.000000      0.000000     10.000000
+
+     1   1 0 0      0.094145      0.000000      0.078291
+     1   0 1 0      0.148179      0.000000      0.391182
+     1   0 0 1     -0.851621      0.000000     -0.500996
+
+     2   2 0 0     -5.338111      0.000000      0.035987
+     2   1 1 0      0.149191      0.000000      0.263306
+     2   1 0 1     -0.084723      0.000000     -0.165556
+     2   0 2 0     -3.114464      0.000000      3.960160
+     2   0 1 1      0.205130      0.000000      0.362991
+     2   0 0 2     -4.329185      0.000000      1.980308
+
+
+ Parallel integral file used       1 records with       0 large values
+
+                              NWChem Gradients Module
+                              -----------------------
+
+
+
+  wavefunction    =   RHF     
+
+
+
+                         RHF ENERGY GRADIENTS
+
+    atom               coordinates                        gradient
+                 x          y          z           x          y          z
+   1 O      -0.015811   0.001891   0.163727   -0.000201  -0.000505   0.001671
+   2 H       0.183076   1.582557  -0.654066    0.000065  -0.000505  -0.001056
+   3 H       0.021701  -1.206501  -1.156743    0.000136   0.001011  -0.000616
+
+                 ----------------------------------------
+                 |  Time  |  1-e(secs)   |  2-e(secs)   |
+                 ----------------------------------------
+                 |  CPU   |       0.00   |       0.03   |
+                 ----------------------------------------
+                 |  WALL  |       0.00   |       0.03   |
+                 ----------------------------------------
+
+ Task  times  cpu:        0.1s     wall:        0.1s
+
+
+                                NWChem Input Module
+                                -------------------
+
+
+ Summary of allocated global arrays
+-----------------------------------
+  No active global arrays
+
+
+
+                         GA Statistics for process    0
+                         ------------------------------
+
+       create   destroy   get      put      acc     scatter   gather  read&inc
+calls:   46       46     2296      477       27        0        0       68     
+number of processes/call 1.00e+00 1.00e+00 1.00e+00 0.00e+00 0.00e+00
+bytes total:             2.70e+05 1.39e+05 2.27e+04 0.00e+00 0.00e+00 5.44e+02
+bytes remote:            0.00e+00 0.00e+00 0.00e+00 0.00e+00 0.00e+00 0.00e+00
+Max memory consumed for GA by this process: 37544 bytes
+
+MA_summarize_allocated_blocks: starting scan ...
+MA_summarize_allocated_blocks: scan completed: 0 heap blocks, 0 stack blocks
+MA usage statistics:
+
+	allocation statistics:
+					      heap	     stack
+					      ----	     -----
+	current number of blocks	         0	         0
+	maximum number of blocks	        18	        28
+	current total bytes		         0	         0
+	maximum total bytes		   1060104	  16000888
+	maximum total K-bytes		      1061	     16001
+	maximum total M-bytes		         2	        17
+
+
+                                     CITATION
+                                     --------
+                Please cite the following reference when publishing
+                           results obtained with NWChem:
+
+                 M. Valiev, E.J. Bylaska, N. Govind, K. Kowalski,
+              T.P. Straatsma, H.J.J. van Dam, D. Wang, J. Nieplocha,
+                        E. Apra, T.L. Windus, W.A. de Jong
+                 "NWChem: a comprehensive and scalable open-source
+                  solution for large scale molecular simulations"
+                      Comput. Phys. Commun. 181, 1477 (2010)
+                           doi:10.1016/j.cpc.2010.04.018
+
+                                      AUTHORS
+                                      -------
+          E. Apra, E. J. Bylaska, W. A. de Jong, N. Govind, K. Kowalski,
+       T. P. Straatsma, M. Valiev, H. J. J. van Dam, D. Wang, T. L. Windus,
+        J. Hammond, J. Autschbach, K. Bhaskaran-Nair, J. Brabec, K. Lopata,
+    S. A. Fischer, S. Krishnamoorthy, M. Jacquelin, W. Ma, M. Klemm, O. Villa,
+      Y. Chen, V. Anisimov, F. Aquino, S. Hirata, M. T. Hackler, V. Konjkov,
+            D. Mejia-Rodriguez, T. Risthaus, M. Malagoli, A. Marenich,
+   A. Otero-de-la-Roza, J. Mullin, P. Nichols, R. Peverati, J. Pittner, Y. Zhao,
+        P.-D. Fan, A. Fonari, M. J. Williamson, R. J. Harrison, J. R. Rehr,
+      M. Dupuis, D. Silverstein, D. M. A. Smith, J. Nieplocha, V. Tipparaju,
+    M. Krishnan, B. E. Van Kuiken, A. Vazquez-Mayagoitia, L. Jensen, M. Swart,
+      Q. Wu, T. Van Voorhis, A. A. Auer, M. Nooijen, L. D. Crosby, E. Brown,
+      G. Cisneros, G. I. Fann, H. Fruchtl, J. Garza, K. Hirao, R. A. Kendall,
+      J. A. Nichols, K. Tsemekhman, K. Wolinski, J. Anchell, D. E. Bernholdt,
+      P. Borowski, T. Clark, D. Clerc, H. Dachsel, M. J. O. Deegan, K. Dyall,
+    D. Elwood, E. Glendening, M. Gutowski, A. C. Hess, J. Jaffe, B. G. Johnson,
+     J. Ju, R. Kobayashi, R. Kutteh, Z. Lin, R. Littlefield, X. Long, B. Meng,
+      T. Nakajima, S. Niu, L. Pollack, M. Rosing, K. Glaesemann, G. Sandrone,
+      M. Stave, H. Taylor, G. Thomas, J. H. van Lenthe, A. T. Wong, Z. Zhang.
+
+ Total times  cpu:        0.1s     wall:        0.1s
diff --git a/examples/COUPLE/lammps_nwchem/nwchem_wrap.py b/examples/COUPLE/lammps_nwchem/nwchem_wrap.py
new file mode 100644
index 0000000000..6fddc35da8
--- /dev/null
+++ b/examples/COUPLE/lammps_nwchem/nwchem_wrap.py
@@ -0,0 +1,447 @@
+#!/usr/bin/env python
+
+# ----------------------------------------------------------------------
+# LAMMPS - Large-scale Atomic/Molecular Massively Parallel Simulator
+# http://lammps.sandia.gov, Sandia National Laboratories
+# Steve Plimpton, sjplimp@sandia.gov
+# ----------------------------------------------------------------------
+
+# Syntax: nwchem_wrap.py file/zmq ao/pw input_template
+# file/zmg = messaging mode, must match LAMMPS messaging mode
+# ao/pw = basis set mode, selects between atom-centered and plane-wave
+#         the input_template file must correspond to the appropriate basis set mode:
+#         the "ao" mode supports the scf and dft modules in NWChem,
+#         the "pw" mode supports the nwpw module.
+# input_template = NWChem input file used as template, must include a
+#                  "geometry" block with the atoms in the simulation, dummy
+#                  xyz coordinates should be included (but are not used).
+#                  Atom ordering must match LAMMPS input.
+
+# wrapper on NWChem
+#   receives message with list of coords
+#   creates NWChem inputs
+#   invokes NWChem to calculate self-consistent energy of that config
+#   reads NWChem outputs
+#   sends message with energy, forces, pressure to client
+
+from __future__ import print_function
+import sys
+
+version = sys.version_info[0]
+if version == 3:
+  sys.exit("The CSlib python wrapper does not yet support python 3")
+
+import subprocess
+import re
+import os
+import shutil
+from cslib import CSlib
+
+# comment out 2nd line once 1st line is correct for your system
+
+nwchemcmd = "mpirun -np 1 /usr/bin/nwchem"
+nwchemcmd = "touch tmp"
+
+# enums matching FixClientMD class in LAMMPS
+
+SETUP,STEP = range(1,2+1)
+DIM,PERIODICITY,ORIGIN,BOX,NATOMS,NTYPES,TYPES,COORDS,UNITS,CHARGE = range(1,10+1)
+FORCES,ENERGY,VIRIAL,ERROR = range(1,4+1)
+
+# -------------------------------------
+# functions
+
+# error message and exit
+
+def error(txt):
+  print("ERROR:",txt)
+  sys.exit(1)
+
+# -------------------------------------
+# read initial input file to setup problem
+# return natoms
+
+def nwchem_setup_ao(input):
+
+  template = open(input,'r')
+
+  geometry_block = False
+  natoms = 0
+
+  while True:
+    line = template.readline()
+    if not line: break
+
+    if geometry_block and re.search("end",line):
+      geometry_block = False
+    if geometry_block and not re.match("#",line) :
+      natoms += 1
+    if re.search("geometry",line):
+      geometry_block = True
+
+  return natoms
+
+# -------------------------------------
+# write a new input file for NWChem
+# assumes the NWChem input geometry is to be specified in angstroms
+
+def nwchem_input_write_ao(input,coords):
+
+  template = open(input,'r')
+  new_input = open("nwchem_lammps.nw",'w')
+
+  geometry_block = False
+  i = 0
+
+  while True:
+    line = template.readline()
+    if not line: break
+
+    if geometry_block and not re.match("#",line) and re.search("end",line):
+      geometry_block = False
+      if os.path.exists("nwchem_lammps.movecs"):
+        # The below is hacky, but one of these lines will be ignored
+        # by NWChem depending on if the input file is for scf/dft.
+        append = "\nscf\n vectors input nwchem_lammps.movecs\nend\n"
+        append2 = "\ndft\n vectors input nwchem_lammps.movecs\nend\n"
+        line = line + append + append2
+
+    if geometry_block and not re.match("#",line):
+      x = coords[3*i+0]
+      y = coords[3*i+1]
+      z = coords[3*i+2]
+      coord_string = "  %g %g %g \n" % (x,y,z)
+      atom_string = line.split()[0]
+      line = atom_string + coord_string
+      i += 1
+
+    if (not re.match("#",line)) and re.search("geometry",line):
+      geometry_block = True
+      line = "geometry units angstrom noautosym nocenter\n"
+
+    print(line,file=new_input,end='')
+
+  new_input.close()
+
+# -------------------------------------
+# read a NWChem output nwchem_lammps.out file
+
+def nwchem_read_ao(natoms, log):
+
+  nwchem_output = open(log, 'r')
+  energy_pattern = r"Total \w+ energy"
+  gradient_pattern = "x          y          z           x          y          z"
+
+  eout = 0.0
+  fout = []
+
+  while True:
+    line = nwchem_output.readline()
+    if not line: break
+
+    # pattern match for energy
+    if re.search(energy_pattern,line):
+      eout = float(line.split()[4])
+
+    # pattern match for forces
+    if re.search(gradient_pattern, line):
+      for i in range(natoms):
+        line = nwchem_output.readline()
+        forces = line.split()
+        fout += [float(forces[5]), float(forces[6]), float(forces[7])]
+
+  # convert units
+  hartree2eV = 27.21138602
+  bohr2angstrom = 0.52917721092
+  eout = eout * hartree2eV
+  fout = [i * -hartree2eV/bohr2angstrom for i in fout]
+
+  return eout,fout
+
+# -------------------------------------
+# read initial planewave input file to setup problem
+# return natoms,box
+def nwchem_setup_pw(input):
+
+  template = open(input,'r')
+
+  geometry_block = False
+  system_block = False
+  coord_pattern = r"^\s*\w{1,2}(?:\s+-?(?:\d+.?\d*|\d*.?\d+)){3}"
+  natoms = 0
+  box = []
+
+  while True:
+    line = template.readline()
+    if not line: break
+
+    if geometry_block and re.search("system crystal",line):
+      system_block = True
+      for i in range(3):
+        line = template.readline()
+        line = re.sub(r'd|D', 'e', line)
+        box += [float(line.split()[1])]
+
+    if geometry_block and not system_block and re.match("#",line) and re.search("end",line):
+      geometry_block = False
+
+    if system_block and re.search("end",line):
+      system_block = False
+
+    if geometry_block and not re.match("#",line) and re.search(coord_pattern,line):
+      natoms += 1
+
+    if re.search("geometry",line) and not re.match("#",line):
+      geometry_block = True
+
+  return natoms,box
+
+# -------------------------------------
+# write a new planewave input file for NWChem
+# assumes the NWChem input geometry is to be specified fractional coordinates
+
+def nwchem_input_write_pw(input,coords,box):
+
+  template = open(input,'r')
+  new_input = open("nwchem_lammps.nw",'w')
+
+  writing_atoms = False
+  geometry_block = False
+  system_block = False
+  coord_pattern = r"^\s*\w{1,2}(?:\s+-?(?:\d+.?\d*|\d*.?\d+)){3}"
+  i = 0
+
+  while True:
+    line = template.readline()
+    if not line: break
+
+    if geometry_block and re.search("system crystal",line):
+      system_block = True
+
+    if geometry_block and not system_block and not re.match("#",line) and re.search("end",line):
+      geometry_block = False
+      if os.path.exists("nwchem_lammps.movecs"):
+        append = "\nnwpw\n vectors input nwchem_lammps.movecs\nend\n"
+        line = line + append
+
+    if system_block and re.search("end",line):
+      system_block = False
+
+    if geometry_block and not re.match("#",line) and re.search(coord_pattern,line):
+      x = coords[3*i+0] / box[0]
+      y = coords[3*i+1] / box[1]
+      z = coords[3*i+2] / box[2]
+      coord_string = "  %g %g %g \n" % (x,y,z)
+      atom_string = line.split()[0]
+      line = atom_string + coord_string
+      i += 1
+
+    if re.search("geometry",line) and not re.match("#",line):
+      geometry_block = True
+
+    print(line,file=new_input,end='')
+
+  new_input.close()
+
+# -------------------------------------
+# read a NWChem output nwchem_lammps.out file for planewave calculation
+
+def nwchem_read_pw(log):
+  nw_output = open(log, 'r')
+
+  eout = 0.0
+  sout = []
+  fout = []
+  reading_forces = False
+
+  while True:
+    line = nw_output.readline()
+    if not line: break
+
+    # pattern match for energy
+    if re.search("PSPW energy",line):
+      eout = float(line.split()[4])
+
+    # pattern match for forces
+    if re.search("C\.O\.M", line):
+      reading_forces = False
+    if reading_forces:
+      forces = line.split()
+      fout += [float(forces[3]), float(forces[4]), float(forces[5])]
+    if re.search("Ion Forces",line):
+      reading_forces = True
+
+    # pattern match for stress
+    if re.search("=== total gradient ===",line):
+      stensor = []
+      for i in range(3):
+        line = nw_output.readline()
+        line = line.replace("S =","   ")
+        stress = line.split()
+        stensor += [float(stress[1]), float(stress[2]), float(stress[3])]
+      sxx = stensor[0]
+      syy = stensor[4]
+      szz = stensor[8]
+      sxy = 0.5 * (float(stensor[1]) + float(stensor[3]))
+      sxz = 0.5 * (stensor[2] + stensor[6])
+      syz = 0.5 * (stensor[5] + stensor[7])
+      sout = [sxx,syy,szz,sxy,sxz,syz]
+
+  # convert units
+  hartree2eV = 27.21138602
+  bohr2angstrom = 0.52917721092
+  austress2bar = 294210156.97
+  eout = eout * hartree2eV
+  fout = [i * hartree2eV/bohr2angstrom for i in fout]
+  sout = [i * austress2bar for i in sout]
+
+  return eout,fout,sout
+
+# -------------------------------------
+# main program
+
+# command-line args
+#
+if len(sys.argv) != 4:
+  print("Syntax: python nwchem_wrap.py file/zmq ao/pw input_template")
+  sys.exit(1)
+
+comm_mode = sys.argv[1]
+basis_type = sys.argv[2]
+input_template = sys.argv[3]
+
+if comm_mode == "file": cs = CSlib(1,comm_mode,"tmp.couple",None)
+elif comm_mode == "zmq": cs = CSlib(1,comm_mode,"*:5555",None)
+else:
+  print("Syntax: python nwchem_wrap.py file/zmq")
+  sys.exit(1)
+
+
+natoms = 0
+box = []
+if basis_type == "ao":
+  natoms = nwchem_setup_ao(input_template)
+elif basis_type == "pw":
+  natoms,box = nwchem_setup_pw(input_template)
+
+# initial message for AIMD protocol
+
+msgID,nfield,fieldID,fieldtype,fieldlen = cs.recv()
+if msgID != 0: error("Bad initial client/server handshake")
+protocol = cs.unpack_string(1)
+if protocol != "md": error("Mismatch in client/server protocol")
+cs.send(0,0)
+
+# endless server loop
+
+i = 0
+if not os.path.exists("nwchem_logs"):
+  os.mkdir("nwchem_logs")
+
+while 1:
+
+  # recv message from client
+  # msgID = 0 = all-done message
+
+  msgID,nfield,fieldID,fieldtype,fieldlen = cs.recv()
+  if msgID < 0: break
+
+  # SETUP receive at beginning of each run
+  # required fields: DIM, PERIODICITY, ORIGIN, BOX,
+  #                  NATOMS, COORDS
+  # optional fields: others in enum above, but NWChem ignores them
+
+  if msgID == SETUP:
+
+    origin = []
+    box_lmp = []
+    natoms_recv = ntypes_recv = 0
+    types = []
+    coords = []
+
+    for field in fieldID:
+      if field == DIM:
+        dim = cs.unpack_int(DIM)
+        if dim != 3: error("NWChem only performs 3d simulations")
+      elif field == PERIODICITY:
+        periodicity = cs.unpack(PERIODICITY,1)
+        if basis_type == "ao":
+          if periodicity[0] or periodicity[1] or periodicity[2]:
+            error("NWChem AO basis wrapper only currently supports fully aperiodic systems")
+        elif basis_type == "pw":
+          if not periodicity[0] or not periodicity[1] or not periodicity[2]:
+            error("NWChem PW basis wrapper only currently supports fully periodic systems")
+      elif field == ORIGIN:
+        origin = cs.unpack(ORIGIN,1)
+      elif field == BOX:
+        box_lmp = cs.unpack(BOX,1)
+        if (basis_type == "pw"):
+          if (box[0] != box_lmp[0] or box[1] != box_lmp[4] or box[2] != box_lmp[8]):
+            error("NWChem wrapper mismatch in box dimensions")
+      elif field == NATOMS:
+        natoms_recv = cs.unpack_int(NATOMS)
+        if natoms != natoms_recv:
+          error("NWChem wrapper mismatch in number of atoms")
+      elif field == COORDS:
+        coords = cs.unpack(COORDS,1)
+
+    if not origin or not box_lmp or not natoms or not coords:
+      error("Required NWChem wrapper setup field not received");
+
+  # STEP receive at each timestep of run or minimization
+  # required fields: COORDS
+  # optional fields: ORIGIN, BOX
+
+  elif msgID == STEP:
+
+    coords = []
+
+    for field in fieldID:
+      if field == COORDS:
+        coords = cs.unpack(COORDS,1)
+
+    if not coords: error("Required NWChem wrapper step field not received");
+
+  else: error("NWChem wrapper received unrecognized message")
+
+  # unpack coords from client
+  # create NWChem input
+
+  if basis_type == "ao":
+    nwchem_input_write_ao(input_template,coords)
+  elif basis_type == "pw":
+    nwchem_input_write_pw(input_template,coords,box)
+
+  # invoke NWChem
+
+  i += 1
+  log = "nwchem_lammps.out"
+  archive = "nwchem_logs/nwchem_lammps" + str(i) + ".out"
+  cmd = nwchemcmd + " nwchem_lammps.nw > " + log
+  print("\nLaunching NWChem ...")
+  print(cmd)
+  subprocess.check_output(cmd,stderr=subprocess.STDOUT,shell=True)
+
+  shutil.copyfile(log,archive)
+
+  # process NWChem output
+
+  if basis_type == "ao":
+    energy,forces = nwchem_read_ao(natoms,log)
+    virial = [0,0,0,0,0,0]
+  elif basis_type == "pw":
+    energy,forces,virial = nwchem_read_pw(log)
+
+  # return forces, energy to client
+  cs.send(msgID,3)
+  cs.pack(FORCES,4,3*natoms,forces)
+  cs.pack_double(ENERGY,energy)
+  cs.pack(VIRIAL,4,6,virial)
+
+# final reply to client
+
+cs.send(0,0)
+
+# clean-up
+
+del cs
diff --git a/examples/COUPLE/lammps_nwchem/planewave/data.W b/examples/COUPLE/lammps_nwchem/planewave/data.W
new file mode 100644
index 0000000000..8accd9ca79
--- /dev/null
+++ b/examples/COUPLE/lammps_nwchem/planewave/data.W
@@ -0,0 +1,15 @@
+LAMMPS W data file
+ 
+2 atoms
+ 
+1  atom types
+
+0.0 3.16 xlo xhi
+0.0 3.16 ylo yhi
+0.0 3.16 zlo zhi
+ 
+Atoms
+ 
+1 1 0.000   0.000   0.000
+2 1 1.58    1.58    1.58
+
diff --git a/examples/COUPLE/lammps_nwchem/planewave/in.client.W b/examples/COUPLE/lammps_nwchem/planewave/in.client.W
new file mode 100644
index 0000000000..8eef888b5b
--- /dev/null
+++ b/examples/COUPLE/lammps_nwchem/planewave/in.client.W
@@ -0,0 +1,34 @@
+# small W unit cell for use with NWChem
+
+variable        mode index file
+ 
+if "${mode} == file" then &
+  "message client md file tmp.couple" &
+elif "${mode} == zmq" &
+  "message client md zmq localhost:5555" &
+
+variable	x index 1
+variable	y index 1
+variable	z index 1
+
+units		metal
+atom_style	atomic
+atom_modify     sort 0 0.0 map yes
+
+read_data       data.W
+mass		1 183.85
+
+replicate       $x $y $z
+
+velocity	all create 300.0 87287 loop geom
+
+neighbor	0.3 bin
+neigh_modify	delay 0 every 10 check no
+
+fix		1 all nve
+fix             2 all client/md
+fix_modify      2 energy yes
+
+thermo          1
+run		3
+
diff --git a/examples/COUPLE/lammps_nwchem/planewave/in.client.W.min b/examples/COUPLE/lammps_nwchem/planewave/in.client.W.min
new file mode 100644
index 0000000000..2cdca6b006
--- /dev/null
+++ b/examples/COUPLE/lammps_nwchem/planewave/in.client.W.min
@@ -0,0 +1,38 @@
+# small W unit cell for use with NWChem
+
+variable        mode index file
+ 
+if "${mode} == file" then &
+  "message client md file tmp.couple" &
+elif "${mode} == zmq" &
+  "message client md zmq localhost:5555" &
+
+variable	x index 1
+variable	y index 1
+variable	z index 1
+
+units		metal
+atom_style	atomic
+atom_modify     sort 0 0.0 map yes
+
+read_data       data.W
+mass		1 183.85
+
+group           one id 2
+displace_atoms  one move 0.1 0.2 0.3
+
+replicate       $x $y $z
+
+velocity	all create 300.0 87287 loop geom
+
+neighbor	0.3 bin
+neigh_modify	delay 0 every 10 check no
+
+fix		1 all nve
+fix             2 all client/md
+fix_modify      2 energy yes
+
+dump            1 all custom 1 dump.W.min id type x y z
+
+thermo          1
+minimize        1.0e-6 1.0e-6 10 50
diff --git a/examples/COUPLE/lammps_nwchem/planewave/log.client.output b/examples/COUPLE/lammps_nwchem/planewave/log.client.output
new file mode 100644
index 0000000000..b797816583
--- /dev/null
+++ b/examples/COUPLE/lammps_nwchem/planewave/log.client.output
@@ -0,0 +1,76 @@
+LAMMPS (18 Sep 2018)
+# small W unit cell for use with NWChem
+
+variable        mode index file
+
+if "${mode} == file" then   "message client md file tmp.couple" elif "${mode} == zmq"   "message client md zmq localhost:5555"
+message client md file tmp.couple
+variable	x index 1
+variable	y index 1
+variable	z index 1
+
+units		metal
+atom_style	atomic
+atom_modify     sort 0 0.0 map yes
+
+read_data       data.W
+  orthogonal box = (0 0 0) to (3.16 3.16 3.16)
+  1 by 1 by 1 MPI processor grid
+  reading atoms ...
+  2 atoms
+mass		1 183.85
+
+replicate       $x $y $z
+replicate       1 $y $z
+replicate       1 1 $z
+replicate       1 1 1
+  orthogonal box = (0 0 0) to (3.16 3.16 3.16)
+  1 by 1 by 1 MPI processor grid
+  2 atoms
+  Time spent = 0.000187325 secs
+
+velocity	all create 300.0 87287 loop geom
+
+neighbor	0.3 bin
+neigh_modify	delay 0 every 10 check no
+
+fix		1 all nve
+fix             2 all client/md
+fix_modify      2 energy yes
+
+thermo          1
+run		3
+Per MPI rank memory allocation (min/avg/max) = 1.8 | 1.8 | 1.8 Mbytes
+Step Temp E_pair E_mol TotEng Press 
+       0          300            0            0   -549.75686     36815830 
+       1          300            0            0   -549.75686     36815830 
+       2          300            0            0   -549.75686     36815830 
+       3          300            0            0   -549.75686     36815830 
+Loop time of 0.400933 on 1 procs for 3 steps with 2 atoms
+
+Performance: 0.646 ns/day, 37.123 hours/ns, 7.483 timesteps/s
+0.1% CPU use with 1 MPI tasks x 1 OpenMP threads
+
+MPI task timing breakdown:
+Section |  min time  |  avg time  |  max time  |%varavg| %total
+---------------------------------------------------------------
+Pair    | 0          | 0          | 0          |   0.0 |  0.00
+Neigh   | 0          | 0          | 0          |   0.0 |  0.00
+Comm    | 4.755e-06  | 4.755e-06  | 4.755e-06  |   0.0 |  0.00
+Output  | 0.00010114 | 0.00010114 | 0.00010114 |   0.0 |  0.03
+Modify  | 0.40082    | 0.40082    | 0.40082    |   0.0 | 99.97
+Other   |            | 1.232e-05  |            |       |  0.00
+
+Nlocal:    2 ave 2 max 2 min
+Histogram: 1 0 0 0 0 0 0 0 0 0
+Nghost:    7 ave 7 max 7 min
+Histogram: 1 0 0 0 0 0 0 0 0 0
+Neighs:    0 ave 0 max 0 min
+Histogram: 1 0 0 0 0 0 0 0 0 0
+
+Total # of neighbors = 0
+Ave neighs/atom = 0
+Neighbor list builds = 0
+Dangerous builds not checked
+
+Total wall time: 0:00:09
diff --git a/examples/COUPLE/lammps_nwchem/planewave/log.lammps.W.3Oct19 b/examples/COUPLE/lammps_nwchem/planewave/log.lammps.W.3Oct19
new file mode 100644
index 0000000000..6087cd22bb
--- /dev/null
+++ b/examples/COUPLE/lammps_nwchem/planewave/log.lammps.W.3Oct19
@@ -0,0 +1,78 @@
+LAMMPS (19 Sep 2019)
+# small W unit cell for use with NWChem
+
+variable        mode index file
+
+if "${mode} == file" then   "message client md file tmp.couple" elif "${mode} == zmq"   "message client md zmq localhost:5555"
+message client md file tmp.couple
+variable	x index 1
+variable	y index 1
+variable	z index 1
+
+units		metal
+atom_style	atomic
+atom_modify     sort 0 0.0 map yes
+
+read_data       data.W
+  orthogonal box = (0 0 0) to (3.16 3.16 3.16)
+  1 by 1 by 1 MPI processor grid
+  reading atoms ...
+  2 atoms
+  read_data CPU = 0.0014801 secs
+mass		1 183.85
+
+replicate       $x $y $z
+replicate       1 $y $z
+replicate       1 1 $z
+replicate       1 1 1
+  orthogonal box = (0 0 0) to (3.16 3.16 3.16)
+  1 by 1 by 1 MPI processor grid
+  2 atoms
+  replicate CPU = 0.000123978 secs
+
+velocity	all create 300.0 87287 loop geom
+
+neighbor	0.3 bin
+neigh_modify	delay 0 every 10 check no
+
+fix		1 all nve
+fix             2 all client/md
+fix_modify      2 energy yes
+
+thermo          1
+run		3
+WARNING: Communication cutoff is 0.0. No ghost atoms will be generated. Atoms may get lost. (../comm_brick.cpp:166)
+Per MPI rank memory allocation (min/avg/max) = 1.801 | 1.801 | 1.801 Mbytes
+Step Temp E_pair E_mol TotEng Press 
+       0          300            0            0   -549.75686     36815830 
+       1    298.93216            0            0   -549.75686     36815825 
+       2    295.76254            0            0   -549.75687     36814830 
+       3    290.55935            0            0   -549.75687     36811865 
+Loop time of 2.60414 on 1 procs for 3 steps with 2 atoms
+
+Performance: 0.100 ns/day, 241.124 hours/ns, 1.152 timesteps/s
+0.0% CPU use with 1 MPI tasks x no OpenMP threads
+
+MPI task timing breakdown:
+Section |  min time  |  avg time  |  max time  |%varavg| %total
+---------------------------------------------------------------
+Pair    | 0          | 0          | 0          |   0.0 |  0.00
+Neigh   | 0          | 0          | 0          |   0.0 |  0.00
+Comm    | 7.1526e-06 | 7.1526e-06 | 7.1526e-06 |   0.0 |  0.00
+Output  | 0.00012779 | 0.00012779 | 0.00012779 |   0.0 |  0.00
+Modify  | 2.604      | 2.604      | 2.604      |   0.0 | 99.99
+Other   |            | 9.06e-06   |            |       |  0.00
+
+Nlocal:    2 ave 2 max 2 min
+Histogram: 1 0 0 0 0 0 0 0 0 0
+Nghost:    7 ave 7 max 7 min
+Histogram: 1 0 0 0 0 0 0 0 0 0
+Neighs:    0 ave 0 max 0 min
+Histogram: 1 0 0 0 0 0 0 0 0 0
+
+Total # of neighbors = 0
+Ave neighs/atom = 0
+Neighbor list builds = 0
+Dangerous builds not checked
+
+Total wall time: 0:00:05
diff --git a/examples/COUPLE/lammps_nwchem/planewave/log.lammps.W.min.3Oct19 b/examples/COUPLE/lammps_nwchem/planewave/log.lammps.W.min.3Oct19
new file mode 100644
index 0000000000..e54cc3c433
--- /dev/null
+++ b/examples/COUPLE/lammps_nwchem/planewave/log.lammps.W.min.3Oct19
@@ -0,0 +1,92 @@
+LAMMPS (19 Sep 2019)
+# small W unit cell for use with NWChem
+
+variable        mode index file
+
+if "${mode} == file" then   "message client md file tmp.couple" elif "${mode} == zmq"   "message client md zmq localhost:5555"
+message client md file tmp.couple
+variable	x index 1
+variable	y index 1
+variable	z index 1
+
+units		metal
+atom_style	atomic
+atom_modify     sort 0 0.0 map yes
+
+read_data       data.W
+  orthogonal box = (0 0 0) to (3.16 3.16 3.16)
+  1 by 1 by 1 MPI processor grid
+  reading atoms ...
+  2 atoms
+  read_data CPU = 0.00183487 secs
+mass		1 183.85
+
+group           one id 2
+1 atoms in group one
+displace_atoms  one move 0.1 0.2 0.3
+
+replicate       $x $y $z
+replicate       1 $y $z
+replicate       1 1 $z
+replicate       1 1 1
+  orthogonal box = (0 0 0) to (3.16 3.16 3.16)
+  1 by 1 by 1 MPI processor grid
+  2 atoms
+  replicate CPU = 0.000159979 secs
+
+velocity	all create 300.0 87287 loop geom
+
+neighbor	0.3 bin
+neigh_modify	delay 0 every 10 check no
+
+fix		1 all nve
+fix             2 all client/md
+fix_modify      2 energy yes
+
+dump            1 all custom 1 tmp.dump id type x y z
+
+thermo          1
+minimize        1.0e-6 1.0e-6 10 50
+WARNING: Using 'neigh_modify every 1 delay 0 check yes' setting during minimization (../min.cpp:174)
+WARNING: Communication cutoff is 0.0. No ghost atoms will be generated. Atoms may get lost. (../comm_brick.cpp:166)
+Per MPI rank memory allocation (min/avg/max) = 4.676 | 4.676 | 4.676 Mbytes
+Step Temp E_pair E_mol TotEng Press 
+       0          300            0            0   -547.52142     28510277 
+       1          300            0            0   -549.43104     35614471 
+       2          300            0            0   -549.75661     36815830 
+       3          300            0            0   -549.75662     36815830 
+Loop time of 7.71121 on 1 procs for 3 steps with 2 atoms
+
+0.0% CPU use with 1 MPI tasks x no OpenMP threads
+
+Minimization stats:
+  Stopping criterion = energy tolerance
+  Energy initial, next-to-last, final = 
+        -547.560202518     -549.795386038     -549.795398827
+  Force two-norm initial, final = 16.0041 0.00108353
+  Force max component initial, final = 9.57978 0.000719909
+  Final line search alpha, max atom move = 1 0.000719909
+  Iterations, force evaluations = 3 5
+
+MPI task timing breakdown:
+Section |  min time  |  avg time  |  max time  |%varavg| %total
+---------------------------------------------------------------
+Pair    | 0          | 0          | 0          |   0.0 |  0.00
+Neigh   | 9.5367e-07 | 9.5367e-07 | 9.5367e-07 |   0.0 |  0.00
+Comm    | 1.3113e-05 | 1.3113e-05 | 1.3113e-05 |   0.0 |  0.00
+Output  | 0.00017023 | 0.00017023 | 0.00017023 |   0.0 |  0.00
+Modify  | 7.7109     | 7.7109     | 7.7109     |   0.0 |100.00
+Other   |            | 0.0001729  |            |       |  0.00
+
+Nlocal:    2 ave 2 max 2 min
+Histogram: 1 0 0 0 0 0 0 0 0 0
+Nghost:    0 ave 0 max 0 min
+Histogram: 1 0 0 0 0 0 0 0 0 0
+Neighs:    0 ave 0 max 0 min
+Histogram: 1 0 0 0 0 0 0 0 0 0
+
+Total # of neighbors = 0
+Ave neighs/atom = 0
+Neighbor list builds = 1
+Dangerous builds not checked
+Total wall time: 0:00:19
diff --git a/examples/COUPLE/lammps_nwchem/planewave/nwchem_lammps.out b/examples/COUPLE/lammps_nwchem/planewave/nwchem_lammps.out
new file mode 100644
index 0000000000..92f2ff0037
--- /dev/null
+++ b/examples/COUPLE/lammps_nwchem/planewave/nwchem_lammps.out
@@ -0,0 +1,2305 @@
+ argument  1 = w.nw
+
+
+
+============================== echo of input deck ==============================
+echo
+
+#**** Enter the geometry using fractional coordinates ****
+geometry units angstrom noautosym
+  system crystal
+    lat_a 3.16d0
+    lat_b 3.16d0
+    lat_c 3.16d0
+  end
+W 0.0 0.0 0.0
+W 0.5 0.5 0.5
+end
+
+#***** setup the nwpw gamma point code ****
+nwpw
+   simulation_cell
+     ngrid 16 16 16
+   end
+   ewald_ncut 8
+   mulliken
+   lcao #old default
+end
+
+nwpw
+  tolerances 1.0d-9 1.0d-9
+end
+
+task pspw stress
+================================================================================
+
+
+                                         
+                                         
+
+
+              Northwest Computational Chemistry Package (NWChem) 6.8
+              ------------------------------------------------------
+
+
+                    Environmental Molecular Sciences Laboratory
+                       Pacific Northwest National Laboratory
+                                Richland, WA 99352
+
+                              Copyright (c) 1994-2017
+                       Pacific Northwest National Laboratory
+                            Battelle Memorial Institute
+
+             NWChem is an open-source computational chemistry package
+                        distributed under the terms of the
+                      Educational Community License (ECL) 2.0
+             A copy of the license is included with this distribution
+                              in the LICENSE.TXT file
+
+                                  ACKNOWLEDGMENT
+                                  --------------
+
+            This software and its documentation were developed at the
+            EMSL at Pacific Northwest National Laboratory, a multiprogram
+            national laboratory, operated for the U.S. Department of Energy
+            by Battelle under Contract Number DE-AC05-76RL01830. Support
+            for this work was provided by the Department of Energy Office
+            of Biological and Environmental Research, Office of Basic
+            Energy Sciences, and the Office of Advanced Scientific Computing.
+
+
+           Job information
+           ---------------
+
+    hostname        = mcq
+    program         = nwchem
+    date            = Mon Sep 23 14:29:18 2019
+
+    compiled        = Wed_Aug_15_19:14:19_2018
+    source          = /home/edo/debichem-team/nwchem/nwchem-6.8.1
+    nwchem branch   = 6.8.1
+    nwchem revision = v6.8-133-ge032219
+    ga revision     = 5.6.5
+    use scalapack   = T
+    input           = w.nw
+    prefix          = w.
+    data base       = ./w.db
+    status          = startup
+    nproc           =        1
+    time left       =     -1s
+
+
+
+           Memory information
+           ------------------
+
+    heap     =   13107194 doubles =    100.0 Mbytes
+    stack    =   13107199 doubles =    100.0 Mbytes
+    global   =   26214400 doubles =    200.0 Mbytes (distinct from heap & stack)
+    total    =   52428793 doubles =    400.0 Mbytes
+    verify   = yes
+    hardfail = no 
+
+
+           Directory information
+           ---------------------
+
+  0 permanent = .
+  0 scratch   = .
+
+
+
+
+                                NWChem Input Module
+                                -------------------
+
+
+
+  !!!!!!!!!  geom_3d NEEDS TESTING !!!!!!!!!! 
+
+
+                             Geometry "geometry" -> ""
+                             -------------------------
+
+ Output coordinates in angstroms (scale by  1.889725989 to convert to a.u.)
+
+  No.       Tag          Charge          X              Y              Z
+ ---- ---------------- ---------- -------------- -------------- --------------
+    1 W                   74.0000     0.00000000     0.00000000     0.00000000
+    2 W                   74.0000     1.58000000     1.58000000     1.58000000
+
+      Lattice Parameters 
+      ------------------ 
+
+      lattice vectors in angstroms (scale by  1.889725989 to convert to a.u.)
+
+      a1=<   3.160   0.000   0.000 >
+      a2=<   0.000   3.160   0.000 >
+      a3=<   0.000   0.000   3.160 >
+      a=       3.160 b=      3.160 c=       3.160
+      alpha=  90.000 beta=  90.000 gamma=  90.000
+      omega=    31.6
+
+      reciprocal lattice vectors in a.u.
+
+      b1=<   1.052   0.000  -0.000 >
+      b2=<  -0.000   1.052  -0.000 >
+      b3=<   0.000   0.000   1.052 >
+
+      Atomic Mass 
+      ----------- 
+
+      W                183.951000
+
+
+
+            XYZ format geometry
+            -------------------
+     2
+ geometry
+ W                     0.00000000     0.00000000     0.00000000
+ W                     1.58000000     1.58000000     1.58000000
+
+ ==============================================================================
+                                internuclear distances
+ ------------------------------------------------------------------------------
+       center one      |      center two      | atomic units |  angstroms
+ ------------------------------------------------------------------------------
+    2 W                |   1 W                |     5.17150  |     2.73664
+ ------------------------------------------------------------------------------
+                         number of included internuclear distances:          1
+ ==============================================================================
+
+
+
+ >>>> PSPW Parallel Module - stress <<<<
+          ****************************************************
+          *                                                  *
+          *               NWPW PSPW Calculation              *
+          *                                                  *
+          * [ (Grassmann/Stiefel manifold implementation)  ] *
+          *                                                  *
+          *      [ NorthWest Chemistry implementation ]      *
+          *                                                  *
+          *            version #5.10   06/12/02              *
+          *                                                  *
+          *    This code was developed by Eric J. Bylaska,   *
+          *    and was based upon algorithms and code        *
+          *    developed by the group of Prof. John H. Weare *
+          *                                                  *
+          ****************************************************
+     >>>  JOB STARTED       AT Mon Sep 23 14:29:18 2019  <<<
+          ================ input data ========================
+  library name resolved from: compiled reference
+  NWCHEM_NWPW_LIBRARY set to: </usr/share/nwchem/libraryps/>
+ Generating 1d pseudopotential for W   
+
+ Generated formatted_filename: ./W.vpp
+  library name resolved from: compiled reference
+  NWCHEM_NWPW_LIBRARY set to: </usr/share/nwchem/libraryps/>
+
+ Generated formatted atomic orbitals, filename: ./W.aorb
+
+ lcao guess, initial psi:w.movecs                                          
+ -   spin, nalpha, nbeta:                    1                    6                    0
+
+ input psi filename:./w.movecs
+
+ initializing pspw_APC data structure
+ ------------------------------------
+ nga, ngs:                    3                    6
+ Gc      :   2.5000000000000000     
+ APC gamma:                    1  0.59999999999999998     
+ APC gamma:                    2  0.90000000000000002     
+ APC gamma:                    3   1.3500000000000001     
+
+ number of processors used:         1
+ processor grid           :   1 x   1
+ parallel mapping         :2d hilbert
+ parallel mapping         :  balanced
+ number of threads        :         1
+ parallel io              :       off
+
+ options:
+      boundary conditions  = periodic    (version3)
+      electron spin        = restricted
+      exchange-correlation = LDA (Vosko et al) parameterization
+
+ elements involved in the cluster:
+      1: W   valence charge:  6.0000  lmax=  2
+             comment    : Troullier-Martins pseudopotential
+             pseudpotential type            :   0
+             highest angular component      :   2
+             local potential used           :   0
+             number of non-local projections:   8
+             semicore corrections included  :  1.800 (radius)  4.533 (charge)
+             cutoff =   2.389   3.185   2.244
+
+
+ total charge:   0.000
+
+ atomic composition:
+     W   :    2
+
+ number of electrons: spin up=     6 (   6 per task)  down=     6 (   6 per task) (Fourier space)
+ number of orbitals : spin up=     6 (   6 per task)  down=     6 (   6 per task) (Fourier space)
+
+ supercell:
+      cell_name:  cell_default                                      
+      lattice:    a1=<   5.972   0.000   0.000 >
+                  a2=<   0.000   5.972   0.000 >
+                  a3=<   0.000   0.000   5.972 >
+      reciprocal: b1=<   1.052   0.000  -0.000 >
+                  b2=<  -0.000   1.052  -0.000 >
+                  b3=<   0.000   0.000   1.052 >
+      lattice:    a=       5.972 b=      5.972 c=       5.972
+                  alpha=  90.000 beta=  90.000 gamma=  90.000
+                  omega=       212.9
+
+      density cutoff=  8.857  fft= 16x 16x 16(      126 waves      126 per task)
+      wavefnc cutoff=  8.857  fft= 16x 16x 16(      126 waves      126 per task)
+      Ewald summation: cut radius=    1.90  and  8
+                       Madelung Wigner-Seitz= 1.76011888 (alpha= 2.83729748 rs= 3.70444413)
+
+ technical parameters:
+      time step=      5.80     fictitious mass=  400000.0
+      tolerance=0.100E-08 (energy)   0.100E-08 (density)
+      maximum iterations =      1000 (   10 inner    100 outer )
+
+
+
+
+
+== Energy Calculation ==
+
+
+          ====== Grassmann conjugate gradient iteration ======
+     >>>  ITERATION STARTED AT Mon Sep 23 14:29:20 2019  <<<
+    iter.           Energy         DeltaE       DeltaRho 
+    ------------------------------------------------------
+     -  15 steepest descent iterations performed
+      10   -0.2000104801E+02   -0.37587E-05    0.13338E-06
+      20   -0.2000105396E+02   -0.10125E-07    0.37843E-09
+      30   -0.2000105397E+02   -0.67882E-09    0.25413E-10
+  *** tolerance ok. iteration terminated
+     >>>  ITERATION ENDED   AT Mon Sep 23 14:29:20 2019  <<<
+
+
+==  Summary Of Results  ==
+
+ number of electrons: spin up=    6.00000  down=    6.00000 (real space)
+
+ total     energy    :  -0.2000105397E+02 (   -0.10001E+02/ion)
+ total orbital energy:   0.5258382071E+01 (    0.87640E+00/electron)
+ hartree   energy    :   0.2613505492E+00 (    0.43558E-01/electron)
+ exc-corr  energy    :  -0.9420636831E+01 (   -0.15701E+01/electron)
+ ion-ion   energy    :  -0.2193948839E+02 (   -0.10970E+02/ion)
+
+ kinetic (planewave) :   0.1407870943E+02 (    0.23465E+01/electron)
+ V_local (planewave) :   0.1138092693E+02 (    0.18968E+01/electron)
+ V_nl    (planewave) :  -0.1436191566E+02 (   -0.23937E+01/electron)
+ V_Coul  (planewave) :   0.5227010984E+00 (    0.87117E-01/electron)
+ V_xc.   (planewave) :  -0.6362039732E+01 (   -0.10603E+01/electron)
+ Virial Coefficient  :  -0.6265011295E+00
+
+ orbital energies:
+     0.5487535E+00 (  14.932eV)
+     0.5487525E+00 (  14.932eV)
+     0.5487517E+00 (  14.932eV)
+     0.3889676E+00 (  10.584eV)
+     0.3889667E+00 (  10.584eV)
+     0.2049989E+00 (   5.578eV)
+
+ Total PSPW energy     :  -0.2000105397E+02
+
+
+=== Spin Contamination ===
+
+ <Sexact^2> =    0.0000000000000000     
+ <S^2>      =    0.0000000000000000     
+
+
+
+== Center of Charge ==
+
+spin up     (   -0.0000,   -0.0000,   -0.0000 )
+spin down   (   -0.0000,   -0.0000,   -0.0000 )
+     total  (   -0.0000,   -0.0000,   -0.0000 )
+ionic       (    1.4929,    1.4929,    1.4929 )
+
+
+== Molecular Dipole wrt Center of Mass ==
+
+mu   =  (   17.9146,   17.9146,   17.9146 ) au
+|mu| =    31.0290 au,      78.8633 Debye
+
+== W.psp1   expansion coefficients ==
+
+ATOM       S            P            D            F
+W  :   0.93998E-01  0.56488E-01  0.13036E+01  0.00000E+00
+
+
+
+ Generated formatted atomic orbitals, filename: ./W.aorb
+
+
+
+ *************************************************************
+ **                                                         **
+ **                  PSPW Mulliken analysis                 **
+ **                                                         **
+ ** Population analysis algorithm devloped by Ryoichi Kawai **
+ **                                                         **
+ **                   Mon Sep 23 14:29                      **
+ **                                                         **
+ *************************************************************
+
+
+== XYZ OUTPUT ==
+
+
+                    2
+
+W             0.000000      0.000000      0.000000
+W             1.579999      1.579999      1.579999
+
+
+== Atomic Orbital Expansion ==
+
+ W    nodamping
+
+
+ =====================================================
+ | POPULATION ANALYSIS OF FILLED MOLECULAR ORBITALS  |
+ =====================================================
+
+
+== Using pseudoatomic orbital expansion          ==
+
+
+------------------------------------------------------------------------------
+
+
+*** ORBITAL=   1***  SPIN=BOTH    SUM= 0.12495E+01 E= 0.54875E+00 (  14.932eV)
+
+NO  ATOM  L  POPULATION
+                            s
+ 1   W      0    0.00000   -0.00000
+                            px         pz         py
+ 1   W      1    0.00000   -0.00000   -0.00000    0.00000
+                            dx2-y2     dzx        d3z2-1     dyz        dxy
+ 1   W      2    0.50000    0.00000   -0.42734   -0.00000    0.56337   -0.00000
+                            fx(x2-3y2) fz(5z2-1)  fx(5z2-1)  fz(5z2-3)  fy(5z2-1)  fxyz       fy(3x2-y2)
+ 1   W      3    0.00000    0.00000   -0.00000   -0.00000   -0.00000   -0.00000    0.00000    0.00000
+                            s
+ 2   W      0    0.00000   -0.00000
+                            px         pz         py
+ 2   W      1    0.00000    0.00000    0.00000   -0.00000
+                            dx2-y2     dzx        d3z2-1     dyz        dxy
+ 2   W      2    0.50000    0.00000   -0.42734   -0.00000    0.56337   -0.00000
+                            fx(x2-3y2) fz(5z2-1)  fx(5z2-1)  fz(5z2-3)  fy(5z2-1)  fxyz       fy(3x2-y2)
+ 2   W      3    0.00000    0.00000   -0.00000   -0.00000   -0.00000   -0.00000   -0.00000    0.00000
+
+
+=== DISTRIBUTION ===
+
+     1(W   )   0.5000     2(W   )   0.5000
+
+
+== ANGULAR MOMENTUM POPULATIONS ===
+
+      s         p         d         f
+    0.0000    0.0000    1.0000    0.0000
+
+
+------------------------------------------------------------------------------
+
+
+*** ORBITAL=   2***  SPIN=BOTH    SUM= 0.12495E+01 E= 0.54875E+00 (  14.932eV)
+
+NO  ATOM  L  POPULATION
+                            s
+ 1   W      0    0.00000    0.00000
+                            px         pz         py
+ 1   W      1    0.00000    0.00000    0.00000   -0.00000
+                            dx2-y2     dzx        d3z2-1     dyz        dxy
+ 1   W      2    0.50000   -0.00000   -0.00000    0.00002    0.00000    0.70711
+                            fx(x2-3y2) fz(5z2-1)  fx(5z2-1)  fz(5z2-3)  fy(5z2-1)  fxyz       fy(3x2-y2)
+ 1   W      3    0.00000   -0.00001    0.00000    0.00000   -0.00000    0.00000    0.00000   -0.00000
+                            s
+ 2   W      0    0.00000    0.00000
+                            px         pz         py
+ 2   W      1    0.00000   -0.00000   -0.00000    0.00000
+                            dx2-y2     dzx        d3z2-1     dyz        dxy
+ 2   W      2    0.50000   -0.00000   -0.00000    0.00002    0.00000    0.70711
+                            fx(x2-3y2) fz(5z2-1)  fx(5z2-1)  fz(5z2-3)  fy(5z2-1)  fxyz       fy(3x2-y2)
+ 2   W      3    0.00000   -0.00001    0.00000    0.00000   -0.00000    0.00000   -0.00000   -0.00000
+
+
+=== DISTRIBUTION ===
+
+     1(W   )   0.5000     2(W   )   0.5000
+
+
+== ANGULAR MOMENTUM POPULATIONS ===
+
+      s         p         d         f
+    0.0000    0.0000    1.0000    0.0000
+
+
+------------------------------------------------------------------------------
+
+
+*** ORBITAL=   3***  SPIN=BOTH    SUM= 0.12495E+01 E= 0.54875E+00 (  14.932eV)
+
+NO  ATOM  L  POPULATION
+                            s
+ 1   W      0    0.00000   -0.00000
+                            px         pz         py
+ 1   W      1    0.00000   -0.00000    0.00000    0.00000
+                            dx2-y2     dzx        d3z2-1     dyz        dxy
+ 1   W      2    0.50000    0.00000   -0.56337   -0.00000   -0.42734   -0.00000
+                            fx(x2-3y2) fz(5z2-1)  fx(5z2-1)  fz(5z2-3)  fy(5z2-1)  fxyz       fy(3x2-y2)
+ 1   W      3    0.00000    0.00000    0.00000   -0.00000    0.00000   -0.00000   -0.00000    0.00000
+                            s
+ 2   W      0    0.00000   -0.00000
+                            px         pz         py
+ 2   W      1    0.00000    0.00000   -0.00000   -0.00000
+                            dx2-y2     dzx        d3z2-1     dyz        dxy
+ 2   W      2    0.50000    0.00000   -0.56337   -0.00000   -0.42734   -0.00000
+                            fx(x2-3y2) fz(5z2-1)  fx(5z2-1)  fz(5z2-3)  fy(5z2-1)  fxyz       fy(3x2-y2)
+ 2   W      3    0.00000    0.00000    0.00000   -0.00000   -0.00000   -0.00000   -0.00000    0.00000
+
+
+=== DISTRIBUTION ===
+
+     1(W   )   0.5000     2(W   )   0.5000
+
+
+== ANGULAR MOMENTUM POPULATIONS ===
+
+      s         p         d         f
+    0.0000    0.0000    1.0000    0.0000
+
+
+------------------------------------------------------------------------------
+
+
+*** ORBITAL=   4***  SPIN=BOTH    SUM= 0.14281E+01 E= 0.38897E+00 (  10.584eV)
+
+NO  ATOM  L  POPULATION
+                            s
+ 1   W      0    0.00000    0.00000
+                            px         pz         py
+ 1   W      1    0.00000    0.00000    0.00000   -0.00000
+                            dx2-y2     dzx        d3z2-1     dyz        dxy
+ 1   W      2    0.49992    0.42773    0.00000    0.56299    0.00000   -0.00000
+                            fx(x2-3y2) fz(5z2-1)  fx(5z2-1)  fz(5z2-3)  fy(5z2-1)  fxyz       fy(3x2-y2)
+ 1   W      3    0.00009    0.00925    0.00000    0.00000    0.00000   -0.00000   -0.00000    0.00000
+                            s
+ 2   W      0    0.00000    0.00000
+                            px         pz         py
+ 2   W      1    0.00000   -0.00000    0.00000    0.00000
+                            dx2-y2     dzx        d3z2-1     dyz        dxy
+ 2   W      2    0.49991   -0.42773    0.00000   -0.56299    0.00000    0.00000
+                            fx(x2-3y2) fz(5z2-1)  fx(5z2-1)  fz(5z2-3)  fy(5z2-1)  fxyz       fy(3x2-y2)
+ 2   W      3    0.00009   -0.00925    0.00000    0.00000    0.00000   -0.00000   -0.00000    0.00000
+
+
+=== DISTRIBUTION ===
+
+     1(W   )   0.5000     2(W   )   0.5000
+
+
+== ANGULAR MOMENTUM POPULATIONS ===
+
+      s         p         d         f
+    0.0000    0.0000    0.9998    0.0002
+
+
+------------------------------------------------------------------------------
+
+
+*** ORBITAL=   5***  SPIN=BOTH    SUM= 0.15051E+01 E= 0.38897E+00 (  10.584eV)
+
+NO  ATOM  L  POPULATION
+                            s
+ 1   W      0    0.00000   -0.00000
+                            px         pz         py
+ 1   W      1    0.00000   -0.00000    0.00000   -0.00000
+                            dx2-y2     dzx        d3z2-1     dyz        dxy
+ 1   W      2    0.47435   -0.54841    0.00000    0.41665    0.00000   -0.00000
+                            fx(x2-3y2) fz(5z2-1)  fx(5z2-1)  fz(5z2-3)  fy(5z2-1)  fxyz       fy(3x2-y2)
+ 1   W      3    0.02565   -0.16016   -0.00000    0.00000    0.00000    0.00000    0.00000   -0.00000
+                            s
+ 2   W      0    0.00000   -0.00000
+                            px         pz         py
+ 2   W      1    0.00000    0.00000    0.00000    0.00000
+                            dx2-y2     dzx        d3z2-1     dyz        dxy
+ 2   W      2    0.47435    0.54841    0.00000   -0.41665    0.00000    0.00000
+                            fx(x2-3y2) fz(5z2-1)  fx(5z2-1)  fz(5z2-3)  fy(5z2-1)  fxyz       fy(3x2-y2)
+ 2   W      3    0.02565    0.16016   -0.00000    0.00000    0.00000    0.00000   -0.00000   -0.00000
+
+
+=== DISTRIBUTION ===
+
+     1(W   )   0.5000     2(W   )   0.5000
+
+
+== ANGULAR MOMENTUM POPULATIONS ===
+
+      s         p         d         f
+    0.0000    0.0000    0.9487    0.0513
+
+
+------------------------------------------------------------------------------
+
+
+*** ORBITAL=   6***  SPIN=BOTH    SUM= 0.19550E+01 E= 0.20500E+00 (   5.578eV)
+
+NO  ATOM  L  POPULATION
+                            s
+ 1   W      0    0.49970    0.70689
+                            px         pz         py
+ 1   W      1    0.00000    0.00000    0.00000    0.00000
+                            dx2-y2     dzx        d3z2-1     dyz        dxy
+ 1   W      2    0.00000   -0.00000   -0.00000    0.00000    0.00000   -0.00000
+                            fx(x2-3y2) fz(5z2-1)  fx(5z2-1)  fz(5z2-3)  fy(5z2-1)  fxyz       fy(3x2-y2)
+ 1   W      3    0.00030   -0.01746   -0.00000    0.00000   -0.00000    0.00000   -0.00000   -0.00000
+                            s
+ 2   W      0    0.49970    0.70689
+                            px         pz         py
+ 2   W      1    0.00000   -0.00000   -0.00000   -0.00000
+                            dx2-y2     dzx        d3z2-1     dyz        dxy
+ 2   W      2    0.00000    0.00000   -0.00000   -0.00000    0.00000   -0.00000
+                            fx(x2-3y2) fz(5z2-1)  fx(5z2-1)  fz(5z2-3)  fy(5z2-1)  fxyz       fy(3x2-y2)
+ 2   W      3    0.00030   -0.01746   -0.00000    0.00000   -0.00000    0.00000   -0.00000   -0.00000
+
+
+=== DISTRIBUTION ===
+
+     1(W   )   0.5000     2(W   )   0.5000
+
+
+== ANGULAR MOMENTUM POPULATIONS ===
+
+      s         p         d         f
+    0.9994    0.0000    0.0000    0.0006
+
+
+ ========================================
+ |   POPULATION ANALYSIS ON EACH ATOM   |
+ ========================================
+
+
+NO  ATOM  SPIN    TOTAL       s          p          d          f
+ 1   W      UP      3.00000    0.49970    0.00000    2.47426    0.02604
+ 1   W      DOWN    3.00000    0.49970    0.00000    2.47426    0.02604
+ 2   W      UP      3.00000    0.49970    0.00000    2.47426    0.02604
+ 2   W      DOWN    3.00000    0.49970    0.00000    2.47426    0.02604
+
+
+
+=== TOTAL ANGULAR MOMENTUM POPULATION ===
+
+ SPIN       s           p           d           f
+  UP       16.66%       0.00%      82.48%       0.87% 
+  UP       16.66%       0.00%      82.48%       0.87% 
+ TOTAL     16.66%       0.00%      82.48%       0.87% 
+
+ *************************************************************
+ **                                                         **
+ **          PSPW Atomic Point Charge (APC) Analysis        **
+ **                                                         **
+ **   Point charge analysis based on paper by P.E. Blochl   **
+ **         (J. Chem. Phys. vol 103, page 7422, 1995)       **
+ **                                                         **
+ *************************************************************
+
+ pspw_APC data structure
+ -----------------------
+ nga, ngs:                    3                    6
+ Gc      :   2.5000000000000000     
+ APC gamma:                    1  0.59999999999999998     
+ APC gamma:                    2  0.90000000000000002     
+ APC gamma:                    3   1.3500000000000001     
+
+ charge analysis on each atom
+ ----------------------------
+
+    no  atom        Qelc        Qion      Qtotal
+    --  ----     -------     -------     -------
+     1  W         -3.500       6.000       2.500
+     2  W         -9.500       6.000      -3.500
+     Total Q     -13.000      12.000      -1.000
+
+
+ gaussian coefficients of model density
+ --------------------------------------
+
+    no  atom     g=0.000     g=0.600     g=0.900     g=1.350
+    --  ----     -------     -------     -------     -------
+     1  W          6.000      46.000     -75.500      26.000
+     2  W          6.000     -17.625      40.500     -32.375
+
+
+=== Electric Field at Atoms ===
+
+      1 W    Atomic Electric Field =(   -0.00000    0.00000    0.00000 )
+                    (ion)          =(    0.00000    0.00000   -0.00000 )
+                    (electronic)   =(   -0.00000    0.00000    0.00000 )
+      2 W    Atomic Electric Field =(   -0.00000   -0.00000    0.00000 )
+                    (ion)          =(   -0.00000   -0.00000    0.00000 )
+                    (electronic)   =(   -0.00000   -0.00000    0.00000 )
+
+ output psi filename:./w.movecs
+
+
+== Timing ==
+
+cputime in seconds
+  prologue    :   0.246520E+01
+  main loop   :   0.218408E+00
+  epilogue    :   0.196378E+00
+  total       :   0.287999E+01
+  cputime/step:   0.186674E-02       (     117 evalulations,      25 linesearches)
+
+
+Time spent doing                        total          step       percent
+  total time                 :   0.288044E+01  0.246191E-01       100.0 %
+  i/o time                   :   0.793162E+00  0.677916E-02        27.5 %
+  FFTs                       :   0.794410E-01  0.678983E-03         2.8 %
+  dot products               :   0.401928E-02  0.343528E-04         0.1 %
+  geodesic                   :   0.812297E-02  0.694271E-04         0.3 %
+  ffm_dgemm                  :   0.340981E-03  0.291437E-05         0.0 %
+  fmf_dgemm                  :   0.111075E-02  0.949356E-05         0.0 %
+  mmm_dgemm                  :   0.146757E-03  0.125433E-05         0.0 %
+  m_diagonalize              :   0.464895E-03  0.397346E-05         0.0 %
+  exchange correlation       :   0.105077E+00  0.898093E-03         3.6 %
+  local pseudopotentials     :   0.326800E-04  0.279316E-06         0.0 %
+  non-local pseudopotentials :   0.585081E-02  0.500069E-04         0.2 %
+  hartree potentials         :   0.774990E-03  0.662385E-05         0.0 %
+  ion-ion interaction        :   0.368566E-02  0.315014E-04         0.1 %
+  structure factors          :   0.526235E+00  0.449774E-02        18.3 %
+  phase factors              :   0.173820E-04  0.148564E-06         0.0 %
+  masking and packing        :   0.134380E+00  0.114855E-02         4.7 %
+  queue fft                  :   0.649379E-01  0.555025E-03         2.3 %
+  queue fft (serial)         :   0.461475E-01  0.394423E-03         1.6 %
+  queue fft (message passing):   0.166764E-01  0.142533E-03         0.6 %
+  non-local psp FFM          :   0.303331E-02  0.259257E-04         0.1 %
+  non-local psp FMF          :   0.706270E-03  0.603650E-05         0.0 %
+  non-local psp FFM A        :   0.298729E-03  0.255324E-05         0.0 %
+  non-local psp FFM B        :   0.252926E-02  0.216176E-04         0.1 %
+
+     >>>  JOB COMPLETED     AT Mon Sep 23 14:29:21 2019  <<<
+          ****************************************************
+          *                                                  *
+          *               NWPW PSPW Calculation              *
+          *                                                  *
+          * [ (Grassmann/Stiefel manifold implementation)  ] *
+          *                                                  *
+          *      [ NorthWest Chemistry implementation ]      *
+          *                                                  *
+          *            version #5.10   06/12/02              *
+          *                                                  *
+          *    This code was developed by Eric J. Bylaska,   *
+          *    and was based upon algorithms and code        *
+          *    developed by the group of Prof. John H. Weare *
+          *                                                  *
+          ****************************************************
+     >>>  JOB STARTED       AT Mon Sep 23 14:29:21 2019  <<<
+          ================ input data ========================
+
+ input psi filename:./w.movecs
+
+ initializing pspw_APC data structure
+ ------------------------------------
+ nga, ngs:                    3                    6
+ Gc      :   2.5000000000000000     
+ APC gamma:                    1  0.59999999999999998     
+ APC gamma:                    2  0.90000000000000002     
+ APC gamma:                    3   1.3500000000000001     
+
+ number of processors used:         1
+ processor grid           :   1 x   1
+ parallel mapping         :2d hilbert
+ parallel mapping         :  balanced
+ number of threads        :         1
+ parallel io              :       off
+
+ options:
+      boundary conditions  = periodic    (version3)
+      electron spin        = restricted
+      exchange-correlation = LDA (Vosko et al) parameterization
+
+ elements involved in the cluster:
+      1: W   valence charge:  6.0000  lmax=  2
+             comment    : Troullier-Martins pseudopotential
+             pseudpotential type            :   0
+             highest angular component      :   2
+             local potential used           :   0
+             number of non-local projections:   8
+             semicore corrections included  :  1.800 (radius)  4.537 (charge)
+             cutoff =   2.389   3.185   2.244
+
+
+ total charge:   0.000
+
+ atomic composition:
+     W   :    2
+
+ number of electrons: spin up=     6 (   6 per task)  down=     6 (   6 per task) (Fourier space)
+ number of orbitals : spin up=     6 (   6 per task)  down=     6 (   6 per task) (Fourier space)
+
+ supercell:
+      cell_name:  cell_default                                      
+      lattice:    a1=<   5.972   0.000   0.000 >
+                  a2=<   0.000   5.972   0.000 >
+                  a3=<   0.000   0.000   5.972 >
+      reciprocal: b1=<   1.052   0.000  -0.000 >
+                  b2=<  -0.000   1.052  -0.000 >
+                  b3=<   0.000   0.000   1.052 >
+      lattice:    a=       5.972 b=      5.972 c=       5.972
+                  alpha=  90.000 beta=  90.000 gamma=  90.000
+                  omega=       212.9
+
+      density cutoff= 17.714  fft= 16x 16x 16(      370 waves      370 per task)
+      wavefnc cutoff= 17.714  fft= 16x 16x 16(      370 waves      370 per task)
+      Ewald summation: cut radius=    1.90  and  8
+                       Madelung Wigner-Seitz= 1.76011888 (alpha= 2.83729748 rs= 3.70444413)
+
+ technical parameters:
+      time step=      5.80     fictitious mass=  400000.0
+      tolerance=0.100E-08 (energy)   0.100E-08 (density)
+      maximum iterations =      1000 (   10 inner    100 outer )
+
+
+
+
+
+== Energy Calculation ==
+
+
+          ====== Grassmann conjugate gradient iteration ======
+     >>>  ITERATION STARTED AT Mon Sep 23 14:29:21 2019  <<<
+    iter.           Energy         DeltaE       DeltaRho 
+    ------------------------------------------------------
+      10   -0.2020117257E+02   -0.65975E-06    0.18611E-07
+      20   -0.2020117265E+02   -0.51757E-09    0.18099E-10
+  *** tolerance ok. iteration terminated
+     >>>  ITERATION ENDED   AT Mon Sep 23 14:29:21 2019  <<<
+
+
+==  Summary Of Results  ==
+
+ number of electrons: spin up=    6.00000  down=    6.00000 (real space)
+
+ total     energy    :  -0.2020117265E+02 (   -0.10101E+02/ion)
+ total orbital energy:   0.5095674266E+01 (    0.84928E+00/electron)
+ hartree   energy    :   0.2895200675E+00 (    0.48253E-01/electron)
+ exc-corr  energy    :  -0.9444169901E+01 (   -0.15740E+01/electron)
+ ion-ion   energy    :  -0.2193948849E+02 (   -0.10970E+02/ion)
+
+ kinetic (planewave) :   0.1440959829E+02 (    0.24016E+01/electron)
+ V_local (planewave) :   0.1156148265E+02 (    0.19269E+01/electron)
+ V_nl    (planewave) :  -0.1507811526E+02 (   -0.25130E+01/electron)
+ V_Coul  (planewave) :   0.5790401350E+00 (    0.96507E-01/electron)
+ V_xc.   (planewave) :  -0.6376331545E+01 (   -0.10627E+01/electron)
+ Virial Coefficient  :  -0.6463694432E+00
+
+ orbital energies:
+     0.5415668E+00 (  14.737eV)
+     0.5415663E+00 (  14.737eV)
+     0.5415658E+00 (  14.737eV)
+     0.3599778E+00 (   9.796eV)
+     0.3599778E+00 (   9.796eV)
+     0.2031826E+00 (   5.529eV)
+
+ Total PSPW energy     :  -0.2020117265E+02
+
+
+=== Spin Contamination ===
+
+ <Sexact^2> =    0.0000000000000000     
+ <S^2>      =    0.0000000000000000     
+
+
+
+== Center of Charge ==
+
+spin up     (   -0.0000,   -0.0000,    0.0000 )
+spin down   (   -0.0000,   -0.0000,    0.0000 )
+     total  (   -0.0000,   -0.0000,    0.0000 )
+ionic       (    1.4929,    1.4929,    1.4929 )
+
+
+== Molecular Dipole wrt Center of Mass ==
+
+mu   =  (   17.9146,   17.9146,   17.9146 ) au
+|mu| =    31.0290 au,      78.8633 Debye
+
+
+
+ *************************************************************
+ **                                                         **
+ **                  PSPW Mulliken analysis                 **
+ **                                                         **
+ ** Population analysis algorithm devloped by Ryoichi Kawai **
+ **                                                         **
+ **                   Mon Sep 23 14:29                      **
+ **                                                         **
+ *************************************************************
+
+
+== XYZ OUTPUT ==
+
+
+                    2
+
+W             0.000000      0.000000      0.000000
+W             1.579999      1.579999      1.579999
+
+
+== Atomic Orbital Expansion ==
+
+ W    nodamping
+
+
+ =====================================================
+ | POPULATION ANALYSIS OF FILLED MOLECULAR ORBITALS  |
+ =====================================================
+
+
+== Using pseudoatomic orbital expansion          ==
+
+
+------------------------------------------------------------------------------
+
+
+*** ORBITAL=   1***  SPIN=BOTH    SUM= 0.12471E+01 E= 0.54157E+00 (  14.737eV)
+
+NO  ATOM  L  POPULATION
+                            s
+ 1   W      0    0.00000    0.00000
+                            px         pz         py
+ 1   W      1    0.00000    0.00000    0.00000   -0.00000
+                            dx2-y2     dzx        d3z2-1     dyz        dxy
+ 1   W      2    0.50000   -0.00000    0.49980    0.00000   -0.50020    0.00000
+                            fx(x2-3y2) fz(5z2-1)  fx(5z2-1)  fz(5z2-3)  fy(5z2-1)  fxyz       fy(3x2-y2)
+ 1   W      3    0.00000   -0.00000    0.00000    0.00000    0.00000    0.00000   -0.00000   -0.00000
+                            s
+ 2   W      0    0.00000    0.00000
+                            px         pz         py
+ 2   W      1    0.00000   -0.00000   -0.00000    0.00000
+                            dx2-y2     dzx        d3z2-1     dyz        dxy
+ 2   W      2    0.50000   -0.00000    0.49980    0.00000   -0.50020    0.00000
+                            fx(x2-3y2) fz(5z2-1)  fx(5z2-1)  fz(5z2-3)  fy(5z2-1)  fxyz       fy(3x2-y2)
+ 2   W      3    0.00000   -0.00000    0.00000    0.00000   -0.00000    0.00000    0.00000   -0.00000
+
+
+=== DISTRIBUTION ===
+
+     1(W   )   0.5000     2(W   )   0.5000
+
+
+== ANGULAR MOMENTUM POPULATIONS ===
+
+      s         p         d         f
+    0.0000    0.0000    1.0000    0.0000
+
+
+------------------------------------------------------------------------------
+
+
+*** ORBITAL=   2***  SPIN=BOTH    SUM= 0.12471E+01 E= 0.54157E+00 (  14.737eV)
+
+NO  ATOM  L  POPULATION
+                            s
+ 1   W      0    0.00000   -0.00000
+                            px         pz         py
+ 1   W      1    0.00000   -0.00000   -0.00000    0.00000
+                            dx2-y2     dzx        d3z2-1     dyz        dxy
+ 1   W      2    0.50000    0.00000    0.00000   -0.00001   -0.00000   -0.70711
+                            fx(x2-3y2) fz(5z2-1)  fx(5z2-1)  fz(5z2-3)  fy(5z2-1)  fxyz       fy(3x2-y2)
+ 1   W      3    0.00000    0.00001   -0.00000   -0.00000   -0.00000   -0.00000   -0.00000    0.00000
+                            s
+ 2   W      0    0.00000   -0.00000
+                            px         pz         py
+ 2   W      1    0.00000    0.00000    0.00000   -0.00000
+                            dx2-y2     dzx        d3z2-1     dyz        dxy
+ 2   W      2    0.50000    0.00000    0.00000   -0.00001   -0.00000   -0.70711
+                            fx(x2-3y2) fz(5z2-1)  fx(5z2-1)  fz(5z2-3)  fy(5z2-1)  fxyz       fy(3x2-y2)
+ 2   W      3    0.00000    0.00001   -0.00000   -0.00000    0.00000   -0.00000    0.00000    0.00000
+
+
+=== DISTRIBUTION ===
+
+     1(W   )   0.5000     2(W   )   0.5000
+
+
+== ANGULAR MOMENTUM POPULATIONS ===
+
+      s         p         d         f
+    0.0000    0.0000    1.0000    0.0000
+
+
+------------------------------------------------------------------------------
+
+
+*** ORBITAL=   3***  SPIN=BOTH    SUM= 0.12471E+01 E= 0.54157E+00 (  14.737eV)
+
+NO  ATOM  L  POPULATION
+                            s
+ 1   W      0    0.00000   -0.00000
+                            px         pz         py
+ 1   W      1    0.00000   -0.00000    0.00000    0.00000
+                            dx2-y2     dzx        d3z2-1     dyz        dxy
+ 1   W      2    0.50000    0.00000   -0.50020   -0.00000   -0.49980   -0.00000
+                            fx(x2-3y2) fz(5z2-1)  fx(5z2-1)  fz(5z2-3)  fy(5z2-1)  fxyz       fy(3x2-y2)
+ 1   W      3    0.00000    0.00000    0.00000   -0.00000    0.00000   -0.00000   -0.00000    0.00000
+                            s
+ 2   W      0    0.00000   -0.00000
+                            px         pz         py
+ 2   W      1    0.00000    0.00000   -0.00000   -0.00000
+                            dx2-y2     dzx        d3z2-1     dyz        dxy
+ 2   W      2    0.50000    0.00000   -0.50020   -0.00000   -0.49980   -0.00000
+                            fx(x2-3y2) fz(5z2-1)  fx(5z2-1)  fz(5z2-3)  fy(5z2-1)  fxyz       fy(3x2-y2)
+ 2   W      3    0.00000    0.00000    0.00000   -0.00000   -0.00000   -0.00000    0.00000    0.00000
+
+
+=== DISTRIBUTION ===
+
+     1(W   )   0.5000     2(W   )   0.5000
+
+
+== ANGULAR MOMENTUM POPULATIONS ===
+
+      s         p         d         f
+    0.0000    0.0000    1.0000    0.0000
+
+
+------------------------------------------------------------------------------
+
+
+*** ORBITAL=   4***  SPIN=BOTH    SUM= 0.14815E+01 E= 0.35998E+00 (   9.796eV)
+
+NO  ATOM  L  POPULATION
+                            s
+ 1   W      0    0.00000    0.00000
+                            px         pz         py
+ 1   W      1    0.00000    0.00000   -0.00000    0.00000
+                            dx2-y2     dzx        d3z2-1     dyz        dxy
+ 1   W      2    0.48214    0.68695   -0.00000   -0.10120   -0.00000    0.00000
+                            fx(x2-3y2) fz(5z2-1)  fx(5z2-1)  fz(5z2-3)  fy(5z2-1)  fxyz       fy(3x2-y2)
+ 1   W      3    0.01786    0.13364    0.00000   -0.00000   -0.00000   -0.00000    0.00000   -0.00000
+                            s
+ 2   W      0    0.00000    0.00000
+                            px         pz         py
+ 2   W      1    0.00000   -0.00000   -0.00000   -0.00000
+                            dx2-y2     dzx        d3z2-1     dyz        dxy
+ 2   W      2    0.48214   -0.68695   -0.00000    0.10120   -0.00000   -0.00000
+                            fx(x2-3y2) fz(5z2-1)  fx(5z2-1)  fz(5z2-3)  fy(5z2-1)  fxyz       fy(3x2-y2)
+ 2   W      3    0.01786   -0.13364    0.00000    0.00000   -0.00000   -0.00000   -0.00000    0.00000
+
+
+=== DISTRIBUTION ===
+
+     1(W   )   0.5000     2(W   )   0.5000
+
+
+== ANGULAR MOMENTUM POPULATIONS ===
+
+      s         p         d         f
+    0.0000    0.0000    0.9643    0.0357
+
+
+------------------------------------------------------------------------------
+
+
+*** ORBITAL=   5***  SPIN=BOTH    SUM= 0.14420E+01 E= 0.35998E+00 (   9.796eV)
+
+NO  ATOM  L  POPULATION
+                            s
+ 1   W      0    0.00000   -0.00000
+                            px         pz         py
+ 1   W      1    0.00000   -0.00000    0.00000   -0.00000
+                            dx2-y2     dzx        d3z2-1     dyz        dxy
+ 1   W      2    0.49535    0.10258    0.00000    0.69630    0.00000   -0.00000
+                            fx(x2-3y2) fz(5z2-1)  fx(5z2-1)  fz(5z2-3)  fy(5z2-1)  fxyz       fy(3x2-y2)
+ 1   W      3    0.00465   -0.06819    0.00000    0.00000    0.00000    0.00000   -0.00000    0.00000
+                            s
+ 2   W      0    0.00000   -0.00000
+                            px         pz         py
+ 2   W      1    0.00000    0.00000    0.00000    0.00000
+                            dx2-y2     dzx        d3z2-1     dyz        dxy
+ 2   W      2    0.49535   -0.10258    0.00000   -0.69630    0.00000    0.00000
+                            fx(x2-3y2) fz(5z2-1)  fx(5z2-1)  fz(5z2-3)  fy(5z2-1)  fxyz       fy(3x2-y2)
+ 2   W      3    0.00465    0.06819    0.00000   -0.00000    0.00000   -0.00000    0.00000   -0.00000
+
+
+=== DISTRIBUTION ===
+
+     1(W   )   0.5000     2(W   )   0.5000
+
+
+== ANGULAR MOMENTUM POPULATIONS ===
+
+      s         p         d         f
+    0.0000    0.0000    0.9907    0.0093
+
+
+------------------------------------------------------------------------------
+
+
+*** ORBITAL=   6***  SPIN=BOTH    SUM= 0.19541E+01 E= 0.20318E+00 (   5.529eV)
+
+NO  ATOM  L  POPULATION
+                            s
+ 1   W      0    0.49972    0.70691
+                            px         pz         py
+ 1   W      1    0.00000   -0.00000    0.00000    0.00000
+                            dx2-y2     dzx        d3z2-1     dyz        dxy
+ 1   W      2    0.00000   -0.00000   -0.00000    0.00000    0.00000   -0.00000
+                            fx(x2-3y2) fz(5z2-1)  fx(5z2-1)  fz(5z2-3)  fy(5z2-1)  fxyz       fy(3x2-y2)
+ 1   W      3    0.00028   -0.01665    0.00000    0.00000    0.00000   -0.00000    0.00000   -0.00000
+                            s
+ 2   W      0    0.49972    0.70691
+                            px         pz         py
+ 2   W      1    0.00000    0.00000   -0.00000   -0.00000
+                            dx2-y2     dzx        d3z2-1     dyz        dxy
+ 2   W      2    0.00000    0.00000   -0.00000   -0.00000    0.00000   -0.00000
+                            fx(x2-3y2) fz(5z2-1)  fx(5z2-1)  fz(5z2-3)  fy(5z2-1)  fxyz       fy(3x2-y2)
+ 2   W      3    0.00028   -0.01665    0.00000   -0.00000    0.00000    0.00000    0.00000    0.00000
+
+
+=== DISTRIBUTION ===
+
+     1(W   )   0.5000     2(W   )   0.5000
+
+
+== ANGULAR MOMENTUM POPULATIONS ===
+
+      s         p         d         f
+    0.9994    0.0000    0.0000    0.0006
+
+
+ ========================================
+ |   POPULATION ANALYSIS ON EACH ATOM   |
+ ========================================
+
+
+NO  ATOM  SPIN    TOTAL       s          p          d          f
+ 1   W      UP      3.00000    0.49972    0.00000    2.47749    0.02279
+ 1   W      DOWN    3.00000    0.49972    0.00000    2.47749    0.02279
+ 2   W      UP      3.00000    0.49972    0.00000    2.47749    0.02279
+ 2   W      DOWN    3.00000    0.49972    0.00000    2.47749    0.02279
+
+
+
+=== TOTAL ANGULAR MOMENTUM POPULATION ===
+
+ SPIN       s           p           d           f
+  UP       16.66%       0.00%      82.58%       0.76% 
+  UP       16.66%       0.00%      82.58%       0.76% 
+ TOTAL     16.66%       0.00%      82.58%       0.76% 
+
+ *************************************************************
+ **                                                         **
+ **          PSPW Atomic Point Charge (APC) Analysis        **
+ **                                                         **
+ **   Point charge analysis based on paper by P.E. Blochl   **
+ **         (J. Chem. Phys. vol 103, page 7422, 1995)       **
+ **                                                         **
+ *************************************************************
+
+ pspw_APC data structure
+ -----------------------
+ nga, ngs:                    3                    6
+ Gc      :   2.5000000000000000     
+ APC gamma:                    1  0.59999999999999998     
+ APC gamma:                    2  0.90000000000000002     
+ APC gamma:                    3   1.3500000000000001     
+
+ charge analysis on each atom
+ ----------------------------
+
+    no  atom        Qelc        Qion      Qtotal
+    --  ----     -------     -------     -------
+     1  W         -8.000       6.000      -2.000
+     2  W         -5.500       6.000       0.500
+     Total Q     -13.500      12.000      -1.500
+
+
+ gaussian coefficients of model density
+ --------------------------------------
+
+    no  atom     g=0.000     g=0.600     g=0.900     g=1.350
+    --  ----     -------     -------     -------     -------
+     1  W          6.000      37.000     -52.000       7.000
+     2  W          6.000      -7.500      18.000     -16.000
+
+
+=== Electric Field at Atoms ===
+
+      1 W    Atomic Electric Field =(   -0.00000   -0.00000    0.00000 )
+                    (ion)          =(    0.00000    0.00000   -0.00000 )
+                    (electronic)   =(   -0.00000   -0.00000    0.00000 )
+      2 W    Atomic Electric Field =(    0.00000   -0.00000    0.00000 )
+                    (ion)          =(   -0.00000   -0.00000    0.00000 )
+                    (electronic)   =(    0.00000   -0.00000    0.00000 )
+
+ output psi filename:./w.movecs
+
+
+== Timing ==
+
+cputime in seconds
+  prologue    :   0.745387E-01
+  main loop   :   0.136737E+00
+  epilogue    :   0.182997E-01
+  total       :   0.229575E+00
+  cputime/step:   0.210365E-02       (      65 evalulations,      15 linesearches)
+
+
+Time spent doing                        total          step       percent
+  total time                 :   0.230022E+00  0.353880E-02       100.0 %
+  i/o time                   :   0.368268E-02  0.566566E-04         1.6 %
+  FFTs                       :   0.118074E-01  0.181652E-03         5.1 %
+  dot products               :   0.278644E-02  0.428683E-04         1.2 %
+  geodesic                   :   0.648055E-02  0.997007E-04         2.8 %
+  ffm_dgemm                  :   0.284575E-03  0.437808E-05         0.1 %
+  fmf_dgemm                  :   0.189982E-02  0.292280E-04         0.8 %
+  mmm_dgemm                  :   0.513420E-04  0.789877E-06         0.0 %
+  m_diagonalize              :   0.289267E-03  0.445026E-05         0.1 %
+  exchange correlation       :   0.533441E-01  0.820678E-03        23.2 %
+  local pseudopotentials     :   0.185780E-04  0.285815E-06         0.0 %
+  non-local pseudopotentials :   0.490618E-02  0.754796E-04         2.1 %
+  hartree potentials         :   0.506539E-03  0.779291E-05         0.2 %
+  ion-ion interaction        :   0.228455E-02  0.351469E-04         1.0 %
+  structure factors          :   0.998308E-02  0.153586E-03         4.3 %
+  phase factors              :   0.119090E-04  0.183215E-06         0.0 %
+  masking and packing        :   0.834395E-02  0.128368E-03         3.6 %
+  queue fft                  :   0.432896E-01  0.665994E-03        18.8 %
+  queue fft (serial)         :   0.309097E-01  0.475534E-03        13.4 %
+  queue fft (message passing):   0.111107E-01  0.170934E-03         4.8 %
+  non-local psp FFM          :   0.270164E-02  0.415637E-04         1.2 %
+  non-local psp FMF          :   0.966417E-03  0.148680E-04         0.4 %
+  non-local psp FFM A        :   0.351360E-03  0.540554E-05         0.2 %
+  non-local psp FFM B        :   0.216041E-02  0.332371E-04         0.9 %
+
+     >>>  JOB COMPLETED     AT Mon Sep 23 14:29:21 2019  <<<
+          ****************************************************
+          *                                                  *
+          *               NWPW PSPW Calculation              *
+          *                                                  *
+          * [ (Grassmann/Stiefel manifold implementation)  ] *
+          *                                                  *
+          *      [ NorthWest Chemistry implementation ]      *
+          *                                                  *
+          *            version #5.10   06/12/02              *
+          *                                                  *
+          *    This code was developed by Eric J. Bylaska,   *
+          *    and was based upon algorithms and code        *
+          *    developed by the group of Prof. John H. Weare *
+          *                                                  *
+          ****************************************************
+     >>>  JOB STARTED       AT Mon Sep 23 14:29:21 2019  <<<
+          ================ input data ========================
+
+ input psi filename:./w.movecs
+
+ initializing pspw_APC data structure
+ ------------------------------------
+ nga, ngs:                    3                    6
+ Gc      :   2.5000000000000000     
+ APC gamma:                    1  0.59999999999999998     
+ APC gamma:                    2  0.90000000000000002     
+ APC gamma:                    3   1.3500000000000001     
+
+ number of processors used:         1
+ processor grid           :   1 x   1
+ parallel mapping         :2d hilbert
+ parallel mapping         :  balanced
+ number of threads        :         1
+ parallel io              :       off
+
+ options:
+      boundary conditions  = periodic    (version3)
+      electron spin        = restricted
+      exchange-correlation = LDA (Vosko et al) parameterization
+
+ elements involved in the cluster:
+      1: W   valence charge:  6.0000  lmax=  2
+             comment    : Troullier-Martins pseudopotential
+             pseudpotential type            :   0
+             highest angular component      :   2
+             local potential used           :   0
+             number of non-local projections:   8
+             semicore corrections included  :  1.800 (radius)  4.538 (charge)
+             cutoff =   2.389   3.185   2.244
+
+
+ total charge:   0.000
+
+ atomic composition:
+     W   :    2
+
+ number of electrons: spin up=     6 (   6 per task)  down=     6 (   6 per task) (Fourier space)
+ number of orbitals : spin up=     6 (   6 per task)  down=     6 (   6 per task) (Fourier space)
+
+ supercell:
+      cell_name:  cell_default                                      
+      lattice:    a1=<   5.972   0.000   0.000 >
+                  a2=<   0.000   5.972   0.000 >
+                  a3=<   0.000   0.000   5.972 >
+      reciprocal: b1=<   1.052   0.000  -0.000 >
+                  b2=<  -0.000   1.052  -0.000 >
+                  b3=<   0.000   0.000   1.052 >
+      lattice:    a=       5.972 b=      5.972 c=       5.972
+                  alpha=  90.000 beta=  90.000 gamma=  90.000
+                  omega=       212.9
+
+      density cutoff= 26.570  fft= 16x 16x 16(      679 waves      679 per task)
+      wavefnc cutoff= 26.570  fft= 16x 16x 16(      679 waves      679 per task)
+      Ewald summation: cut radius=    1.90  and  8
+                       Madelung Wigner-Seitz= 1.76011888 (alpha= 2.83729748 rs= 3.70444413)
+
+ technical parameters:
+      time step=      5.80     fictitious mass=  400000.0
+      tolerance=0.100E-08 (energy)   0.100E-08 (density)
+      maximum iterations =      1000 (   10 inner    100 outer )
+
+
+
+
+
+== Energy Calculation ==
+
+
+          ====== Grassmann conjugate gradient iteration ======
+     >>>  ITERATION STARTED AT Mon Sep 23 14:29:21 2019  <<<
+    iter.           Energy         DeltaE       DeltaRho 
+    ------------------------------------------------------
+      10   -0.2020451899E+02   -0.26409E-08    0.50388E-10
+      20   -0.2020451899E+02   -0.97153E-09    0.52248E-11
+  *** tolerance ok. iteration terminated
+     >>>  ITERATION ENDED   AT Mon Sep 23 14:29:21 2019  <<<
+
+
+==  Summary Of Results  ==
+
+ number of electrons: spin up=    6.00000  down=    6.00000 (real space)
+
+ total     energy    :  -0.2020451899E+02 (   -0.10102E+02/ion)
+ total orbital energy:   0.5093462286E+01 (    0.84891E+00/electron)
+ hartree   energy    :   0.2902599490E+00 (    0.48377E-01/electron)
+ exc-corr  energy    :  -0.9444898225E+01 (   -0.15741E+01/electron)
+ ion-ion   energy    :  -0.2193948849E+02 (   -0.10970E+02/ion)
+
+ kinetic (planewave) :   0.1441599938E+02 (    0.24027E+01/electron)
+ V_local (planewave) :   0.1156112031E+02 (    0.19269E+01/electron)
+ V_nl    (planewave) :  -0.1508751191E+02 (   -0.25146E+01/electron)
+ V_Coul  (planewave) :   0.5805198980E+00 (    0.96753E-01/electron)
+ V_xc.   (planewave) :  -0.6376665384E+01 (   -0.10628E+01/electron)
+ Virial Coefficient  :  -0.6466799038E+00
+
+ orbital energies:
+     0.5414224E+00 (  14.733eV)
+     0.5414220E+00 (  14.733eV)
+     0.5414216E+00 (  14.733eV)
+     0.3596618E+00 (   9.787eV)
+     0.3596618E+00 (   9.787eV)
+     0.2031417E+00 (   5.528eV)
+
+ Total PSPW energy     :  -0.2020451899E+02
+
+
+=== Spin Contamination ===
+
+ <Sexact^2> =    0.0000000000000000     
+ <S^2>      =    0.0000000000000000     
+
+
+
+== Center of Charge ==
+
+spin up     (   -0.0000,   -0.0000,    0.0000 )
+spin down   (   -0.0000,   -0.0000,    0.0000 )
+     total  (   -0.0000,   -0.0000,    0.0000 )
+ionic       (    1.4929,    1.4929,    1.4929 )
+
+
+== Molecular Dipole wrt Center of Mass ==
+
+mu   =  (   17.9146,   17.9146,   17.9146 ) au
+|mu| =    31.0290 au,      78.8633 Debye
+
+
+
+ *************************************************************
+ **                                                         **
+ **                  PSPW Mulliken analysis                 **
+ **                                                         **
+ ** Population analysis algorithm devloped by Ryoichi Kawai **
+ **                                                         **
+ **                   Mon Sep 23 14:29                      **
+ **                                                         **
+ *************************************************************
+
+
+== XYZ OUTPUT ==
+
+
+                    2
+
+W             0.000000      0.000000      0.000000
+W             1.579999      1.579999      1.579999
+
+
+== Atomic Orbital Expansion ==
+
+ W    nodamping
+
+
+ =====================================================
+ | POPULATION ANALYSIS OF FILLED MOLECULAR ORBITALS  |
+ =====================================================
+
+
+== Using pseudoatomic orbital expansion          ==
+
+
+------------------------------------------------------------------------------
+
+
+*** ORBITAL=   1***  SPIN=BOTH    SUM= 0.12471E+01 E= 0.54142E+00 (  14.733eV)
+
+NO  ATOM  L  POPULATION
+                            s
+ 1   W      0    0.00000    0.00000
+                            px         pz         py
+ 1   W      1    0.00000    0.00000   -0.00000   -0.00000
+                            dx2-y2     dzx        d3z2-1     dyz        dxy
+ 1   W      2    0.50000   -0.00000   -0.50150    0.00000    0.49850    0.00000
+                            fx(x2-3y2) fz(5z2-1)  fx(5z2-1)  fz(5z2-3)  fy(5z2-1)  fxyz       fy(3x2-y2)
+ 1   W      3    0.00000   -0.00000   -0.00000    0.00000   -0.00000    0.00000    0.00000   -0.00000
+                            s
+ 2   W      0    0.00000    0.00000
+                            px         pz         py
+ 2   W      1    0.00000   -0.00000    0.00000    0.00000
+                            dx2-y2     dzx        d3z2-1     dyz        dxy
+ 2   W      2    0.50000   -0.00000   -0.50150    0.00000    0.49850    0.00000
+                            fx(x2-3y2) fz(5z2-1)  fx(5z2-1)  fz(5z2-3)  fy(5z2-1)  fxyz       fy(3x2-y2)
+ 2   W      3    0.00000   -0.00000   -0.00000    0.00000    0.00000    0.00000   -0.00000   -0.00000
+
+
+=== DISTRIBUTION ===
+
+     1(W   )   0.5000     2(W   )   0.5000
+
+
+== ANGULAR MOMENTUM POPULATIONS ===
+
+      s         p         d         f
+    0.0000    0.0000    1.0000    0.0000
+
+
+------------------------------------------------------------------------------
+
+
+*** ORBITAL=   2***  SPIN=BOTH    SUM= 0.12471E+01 E= 0.54142E+00 (  14.733eV)
+
+NO  ATOM  L  POPULATION
+                            s
+ 1   W      0    0.00000    0.00000
+                            px         pz         py
+ 1   W      1    0.00000    0.00000   -0.00000   -0.00000
+                            dx2-y2     dzx        d3z2-1     dyz        dxy
+ 1   W      2    0.50000   -0.00000    0.00000    0.00001   -0.00000    0.70711
+                            fx(x2-3y2) fz(5z2-1)  fx(5z2-1)  fz(5z2-3)  fy(5z2-1)  fxyz       fy(3x2-y2)
+ 1   W      3    0.00000   -0.00001   -0.00000    0.00000   -0.00000    0.00000    0.00000   -0.00000
+                            s
+ 2   W      0    0.00000    0.00000
+                            px         pz         py
+ 2   W      1    0.00000   -0.00000    0.00000    0.00000
+                            dx2-y2     dzx        d3z2-1     dyz        dxy
+ 2   W      2    0.50000   -0.00000    0.00000    0.00001   -0.00000    0.70711
+                            fx(x2-3y2) fz(5z2-1)  fx(5z2-1)  fz(5z2-3)  fy(5z2-1)  fxyz       fy(3x2-y2)
+ 2   W      3    0.00000   -0.00001   -0.00000    0.00000    0.00000    0.00000   -0.00000   -0.00000
+
+
+=== DISTRIBUTION ===
+
+     1(W   )   0.5000     2(W   )   0.5000
+
+
+== ANGULAR MOMENTUM POPULATIONS ===
+
+      s         p         d         f
+    0.0000    0.0000    1.0000    0.0000
+
+
+------------------------------------------------------------------------------
+
+
+*** ORBITAL=   3***  SPIN=BOTH    SUM= 0.12471E+01 E= 0.54142E+00 (  14.733eV)
+
+NO  ATOM  L  POPULATION
+                            s
+ 1   W      0    0.00000   -0.00000
+                            px         pz         py
+ 1   W      1    0.00000   -0.00000   -0.00000    0.00000
+                            dx2-y2     dzx        d3z2-1     dyz        dxy
+ 1   W      2    0.50000    0.00000    0.49850   -0.00000    0.50150   -0.00000
+                            fx(x2-3y2) fz(5z2-1)  fx(5z2-1)  fz(5z2-3)  fy(5z2-1)  fxyz       fy(3x2-y2)
+ 1   W      3    0.00000    0.00000   -0.00000   -0.00000   -0.00000   -0.00000    0.00000    0.00000
+                            s
+ 2   W      0    0.00000   -0.00000
+                            px         pz         py
+ 2   W      1    0.00000    0.00000    0.00000   -0.00000
+                            dx2-y2     dzx        d3z2-1     dyz        dxy
+ 2   W      2    0.50000    0.00000    0.49850   -0.00000    0.50150   -0.00000
+                            fx(x2-3y2) fz(5z2-1)  fx(5z2-1)  fz(5z2-3)  fy(5z2-1)  fxyz       fy(3x2-y2)
+ 2   W      3    0.00000    0.00000   -0.00000   -0.00000    0.00000   -0.00000   -0.00000    0.00000
+
+
+=== DISTRIBUTION ===
+
+     1(W   )   0.5000     2(W   )   0.5000
+
+
+== ANGULAR MOMENTUM POPULATIONS ===
+
+      s         p         d         f
+    0.0000    0.0000    1.0000    0.0000
+
+
+------------------------------------------------------------------------------
+
+
+*** ORBITAL=   4***  SPIN=BOTH    SUM= 0.14906E+01 E= 0.35966E+00 (   9.787eV)
+
+NO  ATOM  L  POPULATION
+                            s
+ 1   W      0    0.00000    0.00000
+                            px         pz         py
+ 1   W      1    0.00000    0.00000   -0.00000    0.00000
+                            dx2-y2     dzx        d3z2-1     dyz        dxy
+ 1   W      2    0.47918    0.62168    0.00000   -0.30446    0.00000    0.00000
+                            fx(x2-3y2) fz(5z2-1)  fx(5z2-1)  fz(5z2-3)  fy(5z2-1)  fxyz       fy(3x2-y2)
+ 1   W      3    0.02082    0.14429    0.00000   -0.00000   -0.00000   -0.00000   -0.00000   -0.00000
+                            s
+ 2   W      0    0.00000    0.00000
+                            px         pz         py
+ 2   W      1    0.00000   -0.00000   -0.00000   -0.00000
+                            dx2-y2     dzx        d3z2-1     dyz        dxy
+ 2   W      2    0.47918   -0.62168   -0.00000    0.30446    0.00000   -0.00000
+                            fx(x2-3y2) fz(5z2-1)  fx(5z2-1)  fz(5z2-3)  fy(5z2-1)  fxyz       fy(3x2-y2)
+ 2   W      3    0.02082   -0.14429    0.00000    0.00000   -0.00000    0.00000   -0.00000    0.00000
+
+
+=== DISTRIBUTION ===
+
+     1(W   )   0.5000     2(W   )   0.5000
+
+
+== ANGULAR MOMENTUM POPULATIONS ===
+
+      s         p         d         f
+    0.0000    0.0000    0.9584    0.0416
+
+
+------------------------------------------------------------------------------
+
+
+*** ORBITAL=   5***  SPIN=BOTH    SUM= 0.14301E+01 E= 0.35966E+00 (   9.787eV)
+
+NO  ATOM  L  POPULATION
+                            s
+ 1   W      0    0.00000    0.00000
+                            px         pz         py
+ 1   W      1    0.00000    0.00000   -0.00000    0.00000
+                            dx2-y2     dzx        d3z2-1     dyz        dxy
+ 1   W      2    0.49946   -0.31083   -0.00000   -0.63470    0.00000    0.00000
+                            fx(x2-3y2) fz(5z2-1)  fx(5z2-1)  fz(5z2-3)  fy(5z2-1)  fxyz       fy(3x2-y2)
+ 1   W      3    0.00054    0.02331   -0.00000   -0.00000   -0.00000   -0.00000   -0.00000   -0.00000
+                            s
+ 2   W      0    0.00000    0.00000
+                            px         pz         py
+ 2   W      1    0.00000   -0.00000   -0.00000   -0.00000
+                            dx2-y2     dzx        d3z2-1     dyz        dxy
+ 2   W      2    0.49946    0.31083    0.00000    0.63470    0.00000   -0.00000
+                            fx(x2-3y2) fz(5z2-1)  fx(5z2-1)  fz(5z2-3)  fy(5z2-1)  fxyz       fy(3x2-y2)
+ 2   W      3    0.00054   -0.02331   -0.00000   -0.00000   -0.00000    0.00000   -0.00000    0.00000
+
+
+=== DISTRIBUTION ===
+
+     1(W   )   0.5000     2(W   )   0.5000
+
+
+== ANGULAR MOMENTUM POPULATIONS ===
+
+      s         p         d         f
+    0.0000    0.0000    0.9989    0.0011
+
+
+------------------------------------------------------------------------------
+
+
+*** ORBITAL=   6***  SPIN=BOTH    SUM= 0.19541E+01 E= 0.20314E+00 (   5.528eV)
+
+NO  ATOM  L  POPULATION
+                            s
+ 1   W      0    0.49973    0.70692
+                            px         pz         py
+ 1   W      1    0.00000   -0.00000    0.00000    0.00000
+                            dx2-y2     dzx        d3z2-1     dyz        dxy
+ 1   W      2    0.00000   -0.00000    0.00000    0.00000   -0.00000   -0.00000
+                            fx(x2-3y2) fz(5z2-1)  fx(5z2-1)  fz(5z2-3)  fy(5z2-1)  fxyz       fy(3x2-y2)
+ 1   W      3    0.00027   -0.01628    0.00000    0.00000    0.00000   -0.00000   -0.00000   -0.00000
+                            s
+ 2   W      0    0.49973    0.70692
+                            px         pz         py
+ 2   W      1    0.00000    0.00000    0.00000   -0.00000
+                            dx2-y2     dzx        d3z2-1     dyz        dxy
+ 2   W      2    0.00000    0.00000    0.00000   -0.00000    0.00000   -0.00000
+                            fx(x2-3y2) fz(5z2-1)  fx(5z2-1)  fz(5z2-3)  fy(5z2-1)  fxyz       fy(3x2-y2)
+ 2   W      3    0.00027   -0.01628    0.00000   -0.00000    0.00000   -0.00000   -0.00000    0.00000
+
+
+=== DISTRIBUTION ===
+
+     1(W   )   0.5000     2(W   )   0.5000
+
+
+== ANGULAR MOMENTUM POPULATIONS ===
+
+      s         p         d         f
+    0.9995    0.0000    0.0000    0.0005
+
+
+ ========================================
+ |   POPULATION ANALYSIS ON EACH ATOM   |
+ ========================================
+
+
+NO  ATOM  SPIN    TOTAL       s          p          d          f
+ 1   W      UP      3.00000    0.49973    0.00000    2.47864    0.02163
+ 1   W      DOWN    3.00000    0.49973    0.00000    2.47864    0.02163
+ 2   W      UP      3.00000    0.49973    0.00000    2.47864    0.02163
+ 2   W      DOWN    3.00000    0.49973    0.00000    2.47864    0.02163
+
+
+
+=== TOTAL ANGULAR MOMENTUM POPULATION ===
+
+ SPIN       s           p           d           f
+  UP       16.66%       0.00%      82.62%       0.72% 
+  UP       16.66%       0.00%      82.62%       0.72% 
+ TOTAL     16.66%       0.00%      82.62%       0.72% 
+
+ *************************************************************
+ **                                                         **
+ **          PSPW Atomic Point Charge (APC) Analysis        **
+ **                                                         **
+ **   Point charge analysis based on paper by P.E. Blochl   **
+ **         (J. Chem. Phys. vol 103, page 7422, 1995)       **
+ **                                                         **
+ *************************************************************
+
+ pspw_APC data structure
+ -----------------------
+ nga, ngs:                    3                    6
+ Gc      :   2.5000000000000000     
+ APC gamma:                    1  0.59999999999999998     
+ APC gamma:                    2  0.90000000000000002     
+ APC gamma:                    3   1.3500000000000001     
+
+ charge analysis on each atom
+ ----------------------------
+
+    no  atom        Qelc        Qion      Qtotal
+    --  ----     -------     -------     -------
+     1  W         -6.906       6.000      -0.906
+     2  W         -5.625       6.000       0.375
+     Total Q     -12.531      12.000      -0.531
+
+
+ gaussian coefficients of model density
+ --------------------------------------
+
+    no  atom     g=0.000     g=0.600     g=0.900     g=1.350
+    --  ----     -------     -------     -------     -------
+     1  W          6.000     -25.719      50.250     -31.438
+     2  W          6.000      -5.000      12.188     -12.812
+
+
+=== Electric Field at Atoms ===
+
+      1 W    Atomic Electric Field =(   -0.00000   -0.00000    0.00000 )
+                    (ion)          =(    0.00000    0.00000   -0.00000 )
+                    (electronic)   =(   -0.00000   -0.00000    0.00000 )
+      2 W    Atomic Electric Field =(    0.00000   -0.00000   -0.00000 )
+                    (ion)          =(   -0.00000   -0.00000    0.00000 )
+                    (electronic)   =(    0.00000   -0.00000   -0.00000 )
+
+ output psi filename:./w.movecs
+
+
+== Timing ==
+
+cputime in seconds
+  prologue    :   0.745646E-01
+  main loop   :   0.114422E+00
+  epilogue    :   0.186484E-01
+  total       :   0.207635E+00
+  cputime/step:   0.233514E-02       (      49 evalulations,      11 linesearches)
+
+
+Time spent doing                        total          step       percent
+  total time                 :   0.208073E+00  0.424639E-02       100.0 %
+  i/o time                   :   0.369110E-02  0.753285E-04         1.8 %
+  FFTs                       :   0.938805E-02  0.191593E-03         4.5 %
+  dot products               :   0.334735E-02  0.683133E-04         1.6 %
+  geodesic                   :   0.620612E-02  0.126655E-03         3.0 %
+  ffm_dgemm                  :   0.410025E-03  0.836786E-05         0.2 %
+  fmf_dgemm                  :   0.262005E-02  0.534703E-04         1.3 %
+  mmm_dgemm                  :   0.403200E-04  0.822857E-06         0.0 %
+  m_diagonalize              :   0.265351E-03  0.541533E-05         0.1 %
+  exchange correlation       :   0.403655E-01  0.823786E-03        19.4 %
+  local pseudopotentials     :   0.218100E-04  0.445102E-06         0.0 %
+  non-local pseudopotentials :   0.583915E-02  0.119166E-03         2.8 %
+  hartree potentials         :   0.445709E-03  0.909610E-05         0.2 %
+  ion-ion interaction        :   0.230654E-02  0.470722E-04         1.1 %
+  structure factors          :   0.101746E-01  0.207644E-03         4.9 %
+  phase factors              :   0.125530E-04  0.256184E-06         0.0 %
+  masking and packing        :   0.763773E-02  0.155872E-03         3.7 %
+  queue fft                  :   0.369776E-01  0.754645E-03        17.8 %
+  queue fft (serial)         :   0.262466E-01  0.535645E-03        12.6 %
+  queue fft (message passing):   0.969198E-02  0.197796E-03         4.7 %
+  non-local psp FFM          :   0.320117E-02  0.653300E-04         1.5 %
+  non-local psp FMF          :   0.137954E-02  0.281539E-04         0.7 %
+  non-local psp FFM A        :   0.490631E-03  0.100129E-04         0.2 %
+  non-local psp FFM B        :   0.245399E-02  0.500814E-04         1.2 %
+
+     >>>  JOB COMPLETED     AT Mon Sep 23 14:29:21 2019  <<<
+          ****************************************************
+          *                                                  *
+          *               NWPW PSPW Calculation              *
+          *                                                  *
+          * [ (Grassmann/Stiefel manifold implementation)  ] *
+          *                                                  *
+          *      [ NorthWest Chemistry implementation ]      *
+          *                                                  *
+          *            version #5.10   06/12/02              *
+          *                                                  *
+          *    This code was developed by Eric J. Bylaska,   *
+          *    and was based upon algorithms and code        *
+          *    developed by the group of Prof. John H. Weare *
+          *                                                  *
+          ****************************************************
+     >>>  JOB STARTED       AT Mon Sep 23 14:29:21 2019  <<<
+          ================ input data ========================
+
+ input psi filename:./w.movecs
+
+ initializing pspw_APC data structure
+ ------------------------------------
+ nga, ngs:                    3                    6
+ Gc      :   2.5000000000000000     
+ APC gamma:                    1  0.59999999999999998     
+ APC gamma:                    2  0.90000000000000002     
+ APC gamma:                    3   1.3500000000000001     
+
+ number of processors used:         1
+ processor grid           :   1 x   1
+ parallel mapping         :2d hilbert
+ parallel mapping         :  balanced
+ number of threads        :         1
+ parallel io              :       off
+
+ options:
+      boundary conditions  = periodic    (version3)
+      electron spin        = restricted
+      exchange-correlation = LDA (Vosko et al) parameterization
+
+ elements involved in the cluster:
+      1: W   valence charge:  6.0000  lmax=  2
+             comment    : Troullier-Martins pseudopotential
+             pseudpotential type            :   0
+             highest angular component      :   2
+             local potential used           :   0
+             number of non-local projections:   8
+             semicore corrections included  :  1.800 (radius)  4.538 (charge)
+             cutoff =   2.389   3.185   2.244
+
+
+ total charge:   0.000
+
+ atomic composition:
+     W   :    2
+
+ number of electrons: spin up=     6 (   6 per task)  down=     6 (   6 per task) (Fourier space)
+ number of orbitals : spin up=     6 (   6 per task)  down=     6 (   6 per task) (Fourier space)
+
+ supercell:
+      cell_name:  cell_default                                      
+      lattice:    a1=<   5.972   0.000   0.000 >
+                  a2=<   0.000   5.972   0.000 >
+                  a3=<   0.000   0.000   5.972 >
+      reciprocal: b1=<   1.052   0.000  -0.000 >
+                  b2=<  -0.000   1.052  -0.000 >
+                  b3=<   0.000   0.000   1.052 >
+      lattice:    a=       5.972 b=      5.972 c=       5.972
+                  alpha=  90.000 beta=  90.000 gamma=  90.000
+                  omega=       212.9
+
+      density cutoff= 35.427  fft= 16x 16x 16(     1052 waves     1052 per task)
+      wavefnc cutoff= 35.427  fft= 16x 16x 16(     1052 waves     1052 per task)
+      Ewald summation: cut radius=    1.90  and  8
+                       Madelung Wigner-Seitz= 1.76011888 (alpha= 2.83729748 rs= 3.70444413)
+
+ technical parameters:
+      time step=      5.80     fictitious mass=  400000.0
+      tolerance=0.100E-08 (energy)   0.100E-08 (density)
+      maximum iterations =      1000 (   10 inner    100 outer )
+
+
+
+
+
+== Energy Calculation ==
+
+
+          ====== Grassmann conjugate gradient iteration ======
+     >>>  ITERATION STARTED AT Mon Sep 23 14:29:21 2019  <<<
+    iter.           Energy         DeltaE       DeltaRho 
+    ------------------------------------------------------
+      10   -0.2020461705E+02   -0.23340E-09    0.27270E-11
+  *** tolerance ok. iteration terminated
+     >>>  ITERATION ENDED   AT Mon Sep 23 14:29:21 2019  <<<
+
+
+==  Summary Of Results  ==
+
+ number of electrons: spin up=    6.00000  down=    6.00000 (real space)
+
+ total     energy    :  -0.2020461705E+02 (   -0.10102E+02/ion)
+ total orbital energy:   0.5093528357E+01 (    0.84892E+00/electron)
+ hartree   energy    :   0.2902733730E+00 (    0.48379E-01/electron)
+ exc-corr  energy    :  -0.9445058980E+01 (   -0.15742E+01/electron)
+ ion-ion   energy    :  -0.2193948849E+02 (   -0.10970E+02/ion)
+
+ kinetic (planewave) :   0.1441576162E+02 (    0.24026E+01/electron)
+ V_local (planewave) :   0.1156121019E+02 (    0.19269E+01/electron)
+ V_nl    (planewave) :  -0.1508731476E+02 (   -0.25146E+01/electron)
+ V_Coul  (planewave) :   0.5805467460E+00 (    0.96758E-01/electron)
+ V_xc.   (planewave) :  -0.6376675440E+01 (   -0.10628E+01/electron)
+ Virial Coefficient  :  -0.6466694934E+00
+
+ orbital energies:
+     0.5414197E+00 (  14.733eV)
+     0.5414193E+00 (  14.733eV)
+     0.5414189E+00 (  14.733eV)
+     0.3596821E+00 (   9.788eV)
+     0.3596821E+00 (   9.788eV)
+     0.2031419E+00 (   5.528eV)
+
+ Total PSPW energy     :  -0.2020461705E+02
+
+
+=== Spin Contamination ===
+
+ <Sexact^2> =    0.0000000000000000     
+ <S^2>      =    0.0000000000000000     
+
+
+
+== Center of Charge ==
+
+spin up     (   -0.0000,   -0.0000,   -0.0000 )
+spin down   (   -0.0000,   -0.0000,   -0.0000 )
+     total  (   -0.0000,   -0.0000,   -0.0000 )
+ionic       (    1.4929,    1.4929,    1.4929 )
+
+
+== Molecular Dipole wrt Center of Mass ==
+
+mu   =  (   17.9146,   17.9146,   17.9146 ) au
+|mu| =    31.0290 au,      78.8633 Debye
+
+
+Translation force removed: (   -0.00000   -0.00000   -0.00000)
+
+
+          =============  Ion Gradients =================
+ Ion Forces:
+        1 W    (    0.000000    0.000000   -0.000000 )
+        2 W    (   -0.000000   -0.000000   -0.000000 )
+        C.O.M. (    0.000000    0.000000   -0.000000 )
+          ===============================================
+          |F|       =   0.418432E-08
+          |F|/nion  =   0.209216E-08
+          max|Fatom|=   0.295876E-08 (   0.000eV/Angstrom)
+
+
+
+ Outputting formatted_stress_filename: ./W.vpp2
+
+
+======================
+= Stress calculation =
+======================
+
+
+          ============= total gradient ==============
+      S =  (    0.12513    0.00001    0.00000 )
+           (    0.00001    0.12513    0.00000 )
+           (    0.00000    0.00000    0.12513 )
+          ===================================================
+          |S|      = 0.21673E+00
+          pressure = 0.125E+00 au
+                   = 0.368E+02 Mbar
+                   = 0.368E+04 GPa
+                   = 0.363E+08 atm
+
+
+       dE/da     =     0.12513
+       dE/db     =     0.12513
+       dE/dc     =     0.12513
+       dE/dalpha =     0.00000
+       dE/dbeta  =     0.00000
+       dE/dgamma =    -0.00004
+
+
+
+
+ *************************************************************
+ **                                                         **
+ **                  PSPW Mulliken analysis                 **
+ **                                                         **
+ ** Population analysis algorithm devloped by Ryoichi Kawai **
+ **                                                         **
+ **                   Mon Sep 23 14:29                      **
+ **                                                         **
+ *************************************************************
+
+
+== XYZ OUTPUT ==
+
+
+                    2
+
+W             0.000000      0.000000      0.000000
+W             1.579999      1.579999      1.579999
+
+
+== Atomic Orbital Expansion ==
+
+ W    nodamping
+
+
+ =====================================================
+ | POPULATION ANALYSIS OF FILLED MOLECULAR ORBITALS  |
+ =====================================================
+
+
+== Using pseudoatomic orbital expansion          ==
+
+
+------------------------------------------------------------------------------
+
+
+*** ORBITAL=   1***  SPIN=BOTH    SUM= 0.12471E+01 E= 0.54142E+00 (  14.733eV)
+
+NO  ATOM  L  POPULATION
+                            s
+ 1   W      0    0.00000    0.00000
+                            px         pz         py
+ 1   W      1    0.00000    0.00000   -0.00000   -0.00000
+                            dx2-y2     dzx        d3z2-1     dyz        dxy
+ 1   W      2    0.50000   -0.00000   -0.50144    0.00000    0.49855    0.00000
+                            fx(x2-3y2) fz(5z2-1)  fx(5z2-1)  fz(5z2-3)  fy(5z2-1)  fxyz       fy(3x2-y2)
+ 1   W      3    0.00000   -0.00000   -0.00000    0.00000   -0.00000    0.00000    0.00000   -0.00000
+                            s
+ 2   W      0    0.00000    0.00000
+                            px         pz         py
+ 2   W      1    0.00000   -0.00000    0.00000   -0.00000
+                            dx2-y2     dzx        d3z2-1     dyz        dxy
+ 2   W      2    0.50000   -0.00000   -0.50144    0.00000    0.49855    0.00000
+                            fx(x2-3y2) fz(5z2-1)  fx(5z2-1)  fz(5z2-3)  fy(5z2-1)  fxyz       fy(3x2-y2)
+ 2   W      3    0.00000   -0.00000   -0.00000    0.00000    0.00000    0.00000   -0.00000   -0.00000
+
+
+=== DISTRIBUTION ===
+
+     1(W   )   0.5000     2(W   )   0.5000
+
+
+== ANGULAR MOMENTUM POPULATIONS ===
+
+      s         p         d         f
+    0.0000    0.0000    1.0000    0.0000
+
+
+------------------------------------------------------------------------------
+
+
+*** ORBITAL=   2***  SPIN=BOTH    SUM= 0.12471E+01 E= 0.54142E+00 (  14.733eV)
+
+NO  ATOM  L  POPULATION
+                            s
+ 1   W      0    0.00000   -0.00000
+                            px         pz         py
+ 1   W      1    0.00000   -0.00000    0.00000    0.00000
+                            dx2-y2     dzx        d3z2-1     dyz        dxy
+ 1   W      2    0.50000    0.00000   -0.00000   -0.00001    0.00000   -0.70711
+                            fx(x2-3y2) fz(5z2-1)  fx(5z2-1)  fz(5z2-3)  fy(5z2-1)  fxyz       fy(3x2-y2)
+ 1   W      3    0.00000    0.00001    0.00000   -0.00000    0.00000   -0.00000   -0.00000    0.00000
+                            s
+ 2   W      0    0.00000   -0.00000
+                            px         pz         py
+ 2   W      1    0.00000    0.00000   -0.00000   -0.00000
+                            dx2-y2     dzx        d3z2-1     dyz        dxy
+ 2   W      2    0.50000    0.00000   -0.00000   -0.00001    0.00000   -0.70711
+                            fx(x2-3y2) fz(5z2-1)  fx(5z2-1)  fz(5z2-3)  fy(5z2-1)  fxyz       fy(3x2-y2)
+ 2   W      3    0.00000    0.00001    0.00000   -0.00000   -0.00000   -0.00000    0.00000    0.00000
+
+
+=== DISTRIBUTION ===
+
+     1(W   )   0.5000     2(W   )   0.5000
+
+
+== ANGULAR MOMENTUM POPULATIONS ===
+
+      s         p         d         f
+    0.0000    0.0000    1.0000    0.0000
+
+
+------------------------------------------------------------------------------
+
+
+*** ORBITAL=   3***  SPIN=BOTH    SUM= 0.12471E+01 E= 0.54142E+00 (  14.733eV)
+
+NO  ATOM  L  POPULATION
+                            s
+ 1   W      0    0.00000    0.00000
+                            px         pz         py
+ 1   W      1    0.00000    0.00000    0.00000   -0.00000
+                            dx2-y2     dzx        d3z2-1     dyz        dxy
+ 1   W      2    0.50000   -0.00000   -0.49855    0.00000   -0.50144    0.00000
+                            fx(x2-3y2) fz(5z2-1)  fx(5z2-1)  fz(5z2-3)  fy(5z2-1)  fxyz       fy(3x2-y2)
+ 1   W      3    0.00000   -0.00000    0.00000    0.00000    0.00000    0.00000   -0.00000   -0.00000
+                            s
+ 2   W      0    0.00000    0.00000
+                            px         pz         py
+ 2   W      1    0.00000   -0.00000   -0.00000    0.00000
+                            dx2-y2     dzx        d3z2-1     dyz        dxy
+ 2   W      2    0.50000   -0.00000   -0.49855    0.00000   -0.50144    0.00000
+                            fx(x2-3y2) fz(5z2-1)  fx(5z2-1)  fz(5z2-3)  fy(5z2-1)  fxyz       fy(3x2-y2)
+ 2   W      3    0.00000   -0.00000    0.00000    0.00000   -0.00000    0.00000    0.00000   -0.00000
+
+
+=== DISTRIBUTION ===
+
+     1(W   )   0.5000     2(W   )   0.5000
+
+
+== ANGULAR MOMENTUM POPULATIONS ===
+
+      s         p         d         f
+    0.0000    0.0000    1.0000    0.0000
+
+
+------------------------------------------------------------------------------
+
+
+*** ORBITAL=   4***  SPIN=BOTH    SUM= 0.14893E+01 E= 0.35968E+00 (   9.788eV)
+
+NO  ATOM  L  POPULATION
+                            s
+ 1   W      0    0.00000   -0.00000
+                            px         pz         py
+ 1   W      1    0.00000   -0.00000    0.00000   -0.00000
+                            dx2-y2     dzx        d3z2-1     dyz        dxy
+ 1   W      2    0.47961   -0.61917   -0.00000    0.31022   -0.00000   -0.00000
+                            fx(x2-3y2) fz(5z2-1)  fx(5z2-1)  fz(5z2-3)  fy(5z2-1)  fxyz       fy(3x2-y2)
+ 1   W      3    0.02039   -0.14281   -0.00000    0.00000    0.00000    0.00000    0.00000    0.00000
+                            s
+ 2   W      0    0.00000   -0.00000
+                            px         pz         py
+ 2   W      1    0.00000    0.00000    0.00000    0.00000
+                            dx2-y2     dzx        d3z2-1     dyz        dxy
+ 2   W      2    0.47961    0.61917    0.00000   -0.31022   -0.00000    0.00000
+                            fx(x2-3y2) fz(5z2-1)  fx(5z2-1)  fz(5z2-3)  fy(5z2-1)  fxyz       fy(3x2-y2)
+ 2   W      3    0.02039    0.14281   -0.00000   -0.00000    0.00000   -0.00000   -0.00000   -0.00000
+
+
+=== DISTRIBUTION ===
+
+     1(W   )   0.5000     2(W   )   0.5000
+
+
+== ANGULAR MOMENTUM POPULATIONS ===
+
+      s         p         d         f
+    0.0000    0.0000    0.9592    0.0408
+
+
+------------------------------------------------------------------------------
+
+
+*** ORBITAL=   5***  SPIN=BOTH    SUM= 0.14299E+01 E= 0.35968E+00 (   9.788eV)
+
+NO  ATOM  L  POPULATION
+                            s
+ 1   W      0    0.00000   -0.00000
+                            px         pz         py
+ 1   W      1    0.00000   -0.00000    0.00000   -0.00000
+                            dx2-y2     dzx        d3z2-1     dyz        dxy
+ 1   W      2    0.49953    0.31660    0.00000    0.63190    0.00000   -0.00000
+                            fx(x2-3y2) fz(5z2-1)  fx(5z2-1)  fz(5z2-3)  fy(5z2-1)  fxyz       fy(3x2-y2)
+ 1   W      3    0.00047   -0.02171    0.00000    0.00000    0.00000    0.00000   -0.00000    0.00000
+                            s
+ 2   W      0    0.00000   -0.00000
+                            px         pz         py
+ 2   W      1    0.00000    0.00000    0.00000    0.00000
+                            dx2-y2     dzx        d3z2-1     dyz        dxy
+ 2   W      2    0.49953   -0.31660   -0.00000   -0.63190   -0.00000    0.00000
+                            fx(x2-3y2) fz(5z2-1)  fx(5z2-1)  fz(5z2-3)  fy(5z2-1)  fxyz       fy(3x2-y2)
+ 2   W      3    0.00047    0.02171    0.00000    0.00000    0.00000   -0.00000   -0.00000   -0.00000
+
+
+=== DISTRIBUTION ===
+
+     1(W   )   0.5000     2(W   )   0.5000
+
+
+== ANGULAR MOMENTUM POPULATIONS ===
+
+      s         p         d         f
+    0.0000    0.0000    0.9991    0.0009
+
+
+------------------------------------------------------------------------------
+
+
+*** ORBITAL=   6***  SPIN=BOTH    SUM= 0.19540E+01 E= 0.20314E+00 (   5.528eV)
+
+NO  ATOM  L  POPULATION
+                            s
+ 1   W      0    0.49974    0.70692
+                            px         pz         py
+ 1   W      1    0.00000   -0.00000   -0.00000    0.00000
+                            dx2-y2     dzx        d3z2-1     dyz        dxy
+ 1   W      2    0.00000   -0.00000    0.00000    0.00000   -0.00000   -0.00000
+                            fx(x2-3y2) fz(5z2-1)  fx(5z2-1)  fz(5z2-3)  fy(5z2-1)  fxyz       fy(3x2-y2)
+ 1   W      3    0.00026   -0.01609    0.00000    0.00000    0.00000   -0.00000   -0.00000   -0.00000
+                            s
+ 2   W      0    0.49974    0.70692
+                            px         pz         py
+ 2   W      1    0.00000    0.00000    0.00000   -0.00000
+                            dx2-y2     dzx        d3z2-1     dyz        dxy
+ 2   W      2    0.00000    0.00000    0.00000   -0.00000    0.00000   -0.00000
+                            fx(x2-3y2) fz(5z2-1)  fx(5z2-1)  fz(5z2-3)  fy(5z2-1)  fxyz       fy(3x2-y2)
+ 2   W      3    0.00026   -0.01609   -0.00000   -0.00000    0.00000   -0.00000    0.00000    0.00000
+
+
+=== DISTRIBUTION ===
+
+     1(W   )   0.5000     2(W   )   0.5000
+
+
+== ANGULAR MOMENTUM POPULATIONS ===
+
+      s         p         d         f
+    0.9995    0.0000    0.0000    0.0005
+
+
+ ========================================
+ |   POPULATION ANALYSIS ON EACH ATOM   |
+ ========================================
+
+
+NO  ATOM  SPIN    TOTAL       s          p          d          f
+ 1   W      UP      3.00000    0.49974    0.00000    2.47913    0.02112
+ 1   W      DOWN    3.00000    0.49974    0.00000    2.47913    0.02112
+ 2   W      UP      3.00000    0.49974    0.00000    2.47913    0.02112
+ 2   W      DOWN    3.00000    0.49974    0.00000    2.47913    0.02112
+
+
+
+=== TOTAL ANGULAR MOMENTUM POPULATION ===
+
+ SPIN       s           p           d           f
+  UP       16.66%       0.00%      82.64%       0.70% 
+  UP       16.66%       0.00%      82.64%       0.70% 
+ TOTAL     16.66%       0.00%      82.64%       0.70% 
+
+ *************************************************************
+ **                                                         **
+ **          PSPW Atomic Point Charge (APC) Analysis        **
+ **                                                         **
+ **   Point charge analysis based on paper by P.E. Blochl   **
+ **         (J. Chem. Phys. vol 103, page 7422, 1995)       **
+ **                                                         **
+ *************************************************************
+
+ pspw_APC data structure
+ -----------------------
+ nga, ngs:                    3                    6
+ Gc      :   2.5000000000000000     
+ APC gamma:                    1  0.59999999999999998     
+ APC gamma:                    2  0.90000000000000002     
+ APC gamma:                    3   1.3500000000000001     
+
+ charge analysis on each atom
+ ----------------------------
+
+    no  atom        Qelc        Qion      Qtotal
+    --  ----     -------     -------     -------
+     1  W         -5.594       6.000       0.406
+     2  W         -6.250       6.000      -0.250
+     Total Q     -11.844      12.000       0.156
+
+
+ gaussian coefficients of model density
+ --------------------------------------
+
+    no  atom     g=0.000     g=0.600     g=0.900     g=1.350
+    --  ----     -------     -------     -------     -------
+     1  W          6.000      -6.219      15.062     -14.438
+     2  W          6.000      -8.281      20.125     -18.094
+
+
+=== Electric Field at Atoms ===
+
+      1 W    Atomic Electric Field =(   -0.00000   -0.00000    0.00000 )
+                    (ion)          =(    0.00000    0.00000   -0.00000 )
+                    (electronic)   =(   -0.00000   -0.00000    0.00000 )
+      2 W    Atomic Electric Field =(    0.00000   -0.00000    0.00000 )
+                    (ion)          =(   -0.00000   -0.00000    0.00000 )
+                    (electronic)   =(    0.00000   -0.00000   -0.00000 )
+
+ output psi filename:./w.movecs
+
+
+== Timing ==
+
+cputime in seconds
+  prologue    :   0.746791E-01
+  main loop   :   0.359966E+00
+  epilogue    :   0.187162E-01
+  total       :   0.453362E+00
+  cputime/step:   0.133321E-01       (      27 evalulations,       6 linesearches)
+
+
+Time spent doing                        total          step       percent
+  total time                 :   0.453809E+00  0.168078E-01       100.0 %
+  i/o time                   :   0.371068E-02  0.137433E-03         0.8 %
+  FFTs                       :   0.870071E-02  0.322248E-03         1.9 %
+  dot products               :   0.347239E-02  0.128607E-03         0.8 %
+  geodesic                   :   0.430554E-02  0.159464E-03         0.9 %
+  ffm_dgemm                  :   0.322600E-03  0.119481E-04         0.1 %
+  fmf_dgemm                  :   0.226656E-02  0.839466E-04         0.5 %
+  mmm_dgemm                  :   0.241260E-04  0.893554E-06         0.0 %
+  m_diagonalize              :   0.143440E-03  0.531259E-05         0.0 %
+  exchange correlation       :   0.226012E-01  0.837082E-03         5.0 %
+  local pseudopotentials     :   0.247782E-03  0.917711E-05         0.1 %
+  non-local pseudopotentials :   0.596243E-02  0.220831E-03         1.3 %
+  hartree potentials         :   0.303066E-03  0.112247E-04         0.1 %
+  ion-ion interaction        :   0.742231E-01  0.274901E-02        16.4 %
+  structure factors          :   0.100176E-01  0.371024E-03         2.2 %
+  phase factors              :   0.123850E-04  0.458704E-06         0.0 %
+  masking and packing        :   0.747819E-02  0.276970E-03         1.6 %
+  queue fft                  :   0.227258E-01  0.841697E-03         5.0 %
+  queue fft (serial)         :   0.159551E-01  0.590931E-03         3.5 %
+  queue fft (message passing):   0.615529E-02  0.227974E-03         1.4 %
+  non-local psp FFM          :   0.252122E-02  0.933787E-04         0.6 %
+  non-local psp FMF          :   0.112022E-02  0.414896E-04         0.2 %
+  non-local psp FFM A        :   0.456889E-03  0.169218E-04         0.1 %
+  non-local psp FFM B        :   0.186526E-02  0.690838E-04         0.4 %
+
+     >>>  JOB COMPLETED     AT Mon Sep 23 14:29:22 2019  <<<
+
+ Task  times  cpu:        5.6s     wall:        3.8s
+
+
+                                NWChem Input Module
+                                -------------------
+
+
+ Summary of allocated global arrays
+-----------------------------------
+  No active global arrays
+
+
+
+                         GA Statistics for process    0
+                         ------------------------------
+
+       create   destroy   get      put      acc     scatter   gather  read&inc
+calls:    8        8       86       10        0        0        0        0     
+number of processes/call 1.00e+00 1.00e+00 0.00e+00 0.00e+00 0.00e+00
+bytes total:             1.81e+05 8.19e+04 0.00e+00 0.00e+00 0.00e+00 0.00e+00
+bytes remote:            0.00e+00 0.00e+00 0.00e+00 0.00e+00 0.00e+00 0.00e+00
+Max memory consumed for GA by this process: 65536 bytes
+
+MA_summarize_allocated_blocks: starting scan ...
+heap block 'sw1t', handle 348, address 0x55eea965d008:
+	type of elements:		double precision
+	number of elements:		16
+	address of client space:	0x55eea965d080
+	index for client space:		10242743
+	total number of bytes:		256
+MA_summarize_allocated_blocks: scan completed: 1 heap block, 0 stack blocks
+MA usage statistics:
+
+	allocation statistics:
+					      heap	     stack
+					      ----	     -----
+	current number of blocks	         1	         0
+	maximum number of blocks	       304	        17
+	current total bytes		       256	         0
+	maximum total bytes		   5596824	    351896
+	maximum total K-bytes		      5597	       352
+	maximum total M-bytes		         6	         1
+
+
+                                     CITATION
+                                     --------
+                Please cite the following reference when publishing
+                           results obtained with NWChem:
+
+                 M. Valiev, E.J. Bylaska, N. Govind, K. Kowalski,
+              T.P. Straatsma, H.J.J. van Dam, D. Wang, J. Nieplocha,
+                        E. Apra, T.L. Windus, W.A. de Jong
+                 "NWChem: a comprehensive and scalable open-source
+                  solution for large scale molecular simulations"
+                      Comput. Phys. Commun. 181, 1477 (2010)
+                           doi:10.1016/j.cpc.2010.04.018
+
+                                      AUTHORS
+                                      -------
+          E. Apra, E. J. Bylaska, W. A. de Jong, N. Govind, K. Kowalski,
+       T. P. Straatsma, M. Valiev, H. J. J. van Dam, D. Wang, T. L. Windus,
+        J. Hammond, J. Autschbach, K. Bhaskaran-Nair, J. Brabec, K. Lopata,
+    S. A. Fischer, S. Krishnamoorthy, M. Jacquelin, W. Ma, M. Klemm, O. Villa,
+      Y. Chen, V. Anisimov, F. Aquino, S. Hirata, M. T. Hackler, V. Konjkov,
+            D. Mejia-Rodriguez, T. Risthaus, M. Malagoli, A. Marenich,
+   A. Otero-de-la-Roza, J. Mullin, P. Nichols, R. Peverati, J. Pittner, Y. Zhao,
+        P.-D. Fan, A. Fonari, M. J. Williamson, R. J. Harrison, J. R. Rehr,
+      M. Dupuis, D. Silverstein, D. M. A. Smith, J. Nieplocha, V. Tipparaju,
+    M. Krishnan, B. E. Van Kuiken, A. Vazquez-Mayagoitia, L. Jensen, M. Swart,
+      Q. Wu, T. Van Voorhis, A. A. Auer, M. Nooijen, L. D. Crosby, E. Brown,
+      G. Cisneros, G. I. Fann, H. Fruchtl, J. Garza, K. Hirao, R. A. Kendall,
+      J. A. Nichols, K. Tsemekhman, K. Wolinski, J. Anchell, D. E. Bernholdt,
+      P. Borowski, T. Clark, D. Clerc, H. Dachsel, M. J. O. Deegan, K. Dyall,
+    D. Elwood, E. Glendening, M. Gutowski, A. C. Hess, J. Jaffe, B. G. Johnson,
+     J. Ju, R. Kobayashi, R. Kutteh, Z. Lin, R. Littlefield, X. Long, B. Meng,
+      T. Nakajima, S. Niu, L. Pollack, M. Rosing, K. Glaesemann, G. Sandrone,
+      M. Stave, H. Taylor, G. Thomas, J. H. van Lenthe, A. T. Wong, Z. Zhang.
+
+ Total times  cpu:        5.6s     wall:        3.8s
diff --git a/examples/COUPLE/lammps_nwchem/planewave/nwchem_lammps.out.W.3Oct19 b/examples/COUPLE/lammps_nwchem/planewave/nwchem_lammps.out.W.3Oct19
new file mode 100644
index 0000000000..36b6cfa4c4
--- /dev/null
+++ b/examples/COUPLE/lammps_nwchem/planewave/nwchem_lammps.out.W.3Oct19
@@ -0,0 +1,817 @@
+ argument  1 = nwchem_lammps.nw
+
+
+
+============================== echo of input deck ==============================
+echo
+
+#**** Enter the geometry using fractional coordinates ****
+geometry units angstrom noautosym
+  system crystal
+    lat_a 3.16d0
+    lat_b 3.16d0
+    lat_c 3.16d0
+  end
+W  0.999335 0.99967 0.998875
+W  0.500665 0.50033 0.501125
+end
+
+nwpw
+ vectors input nwchem_lammps.movecs
+end
+
+#***** setup the nwpw gamma point code ****
+nwpw
+   simulation_cell
+     ngrid 16 16 16
+   end
+   ewald_ncut 8
+   mulliken
+   lcao #old default
+end
+
+nwpw
+  tolerances 1.0d-9 1.0d-9
+end
+
+task pspw stress
+================================================================================
+
+
+                                         
+                                         
+
+
+              Northwest Computational Chemistry Package (NWChem) 6.8
+              ------------------------------------------------------
+
+
+                    Environmental Molecular Sciences Laboratory
+                       Pacific Northwest National Laboratory
+                                Richland, WA 99352
+
+                              Copyright (c) 1994-2018
+                       Pacific Northwest National Laboratory
+                            Battelle Memorial Institute
+
+             NWChem is an open-source computational chemistry package
+                        distributed under the terms of the
+                      Educational Community License (ECL) 2.0
+             A copy of the license is included with this distribution
+                              in the LICENSE.TXT file
+
+                                  ACKNOWLEDGMENT
+                                  --------------
+
+            This software and its documentation were developed at the
+            EMSL at Pacific Northwest National Laboratory, a multiprogram
+            national laboratory, operated for the U.S. Department of Energy
+            by Battelle under Contract Number DE-AC05-76RL01830. Support
+            for this work was provided by the Department of Energy Office
+            of Biological and Environmental Research, Office of Basic
+            Energy Sciences, and the Office of Advanced Scientific Computing.
+
+
+           Job information
+           ---------------
+
+    hostname        = singsing
+    program         = /home/sjplimp/tools/nwchem-6.8.1-release/bin/LINUX64/nwchem
+    date            = Thu Oct  3 16:57:17 2019
+
+    compiled        = Wed_Oct_02_09:25:27_2019
+    source          = /home/sjplimp/tools/nwchem-6.8.1-release
+    nwchem branch   = Development
+    nwchem revision = N/A
+    ga revision     = 5.6.5
+    use scalapack   = F
+    input           = nwchem_lammps.nw
+    prefix          = nwchem_lammps.
+    data base       = ./nwchem_lammps.db
+    status          = restart
+    nproc           =        1
+    time left       =     -1s
+
+
+
+           Memory information
+           ------------------
+
+    heap     =   13107200 doubles =    100.0 Mbytes
+    stack    =   13107197 doubles =    100.0 Mbytes
+    global   =   26214400 doubles =    200.0 Mbytes (distinct from heap & stack)
+    total    =   52428797 doubles =    400.0 Mbytes
+    verify   = yes
+    hardfail = no 
+
+
+           Directory information
+           ---------------------
+
+  0 permanent = .
+  0 scratch   = .
+
+
+           Previous task information
+           -------------------------
+
+    Theory    = pspw                            
+    Operation = stress                        
+    Status    = unknown                       
+    Qmmm      = F
+    Ignore    = F
+
+
+           Geometries in the database
+           --------------------------
+
+       Name                              Natoms  Last Modified
+       --------------------------------  ------  ------------------------
+    1  geometry                               2  Thu Oct  3 16:57:16 2019  
+
+  The geometry named "geometry" is the default for restart
+
+
+
+           Basis sets in the database
+           --------------------------
+
+  There are no basis sets in the database
+
+
+
+                                NWChem Input Module
+                                -------------------
+
+
+
+  !!!!!!!!!  geom_3d NEEDS TESTING !!!!!!!!!! 
+
+
+                             Geometry "geometry" -> ""
+                             -------------------------
+
+ Output coordinates in angstroms (scale by  1.889725989 to convert to a.u.)
+
+  No.       Tag          Charge          X              Y              Z
+ ---- ---------------- ---------- -------------- -------------- --------------
+    1 W                   74.0000     3.15789860     3.15895720     3.15644500
+    2 W                   74.0000     1.58210140     1.58104280     1.58355500
+
+      Lattice Parameters 
+      ------------------ 
+
+      lattice vectors in angstroms (scale by  1.889725989 to convert to a.u.)
+
+      a1=<   3.160   0.000   0.000 >
+      a2=<   0.000   3.160   0.000 >
+      a3=<   0.000   0.000   3.160 >
+      a=       3.160 b=      3.160 c=       3.160
+      alpha=  90.000 beta=  90.000 gamma=  90.000
+      omega=    31.6
+
+      reciprocal lattice vectors in a.u.
+
+      b1=<   1.052   0.000  -0.000 >
+      b2=<  -0.000   1.052  -0.000 >
+      b3=<   0.000   0.000   1.052 >
+
+      Atomic Mass 
+      ----------- 
+
+      W                183.951000
+
+
+
+            XYZ format geometry
+            -------------------
+     2
+ geometry
+ W                     3.15789860     3.15895720     3.15644500
+ W                     1.58210140     1.58104280     1.58355500
+
+ ==============================================================================
+                                internuclear distances
+ ------------------------------------------------------------------------------
+       center one      |      center two      | atomic units |  angstroms
+ ------------------------------------------------------------------------------
+    2 W                |   1 W                |     5.15689  |     2.72891
+ ------------------------------------------------------------------------------
+                         number of included internuclear distances:          1
+ ==============================================================================
+
+
+
+ >>>> PSPW Parallel Module - stress <<<<
+          ****************************************************
+          *                                                  *
+          *               NWPW PSPW Calculation              *
+          *                                                  *
+          * [ (Grassmann/Stiefel manifold implementation)  ] *
+          *                                                  *
+          *      [ NorthWest Chemistry implementation ]      *
+          *                                                  *
+          *            version #5.10   06/12/02              *
+          *                                                  *
+          *    This code was developed by Eric J. Bylaska,   *
+          *    and was based upon algorithms and code        *
+          *    developed by the group of Prof. John H. Weare *
+          *                                                  *
+          ****************************************************
+     >>>  JOB STARTED       AT Thu Oct  3 16:57:17 2019  <<<
+          ================ input data ========================
+
+ input psi filename:./nwchem_lammps.movecs
+
+ initializing pspw_APC data structure
+ ------------------------------------
+ nga, ngs:                    3                    6
+ Gc      :   2.5000000000000000     
+ APC gamma:                    1  0.59999999999999998     
+ APC gamma:                    2  0.90000000000000002     
+ APC gamma:                    3   1.3500000000000001     
+
+ number of processors used:         1
+ processor grid           :   1 x   1
+ parallel mapping         :2d hilbert
+ parallel mapping         :  balanced
+ number of threads        :         1
+ parallel io              :       off
+
+ options:
+      boundary conditions  = periodic    (version3)
+      electron spin        = restricted
+      exchange-correlation = LDA (Vosko et al) parameterization
+
+ elements involved in the cluster:
+      1: W   valence charge:  6.0000  lmax=  2
+             comment    : Troullier-Martins pseudopotential
+             pseudpotential type            :   0
+             highest angular component      :   2
+             local potential used           :   0
+             number of non-local projections:   8
+             semicore corrections included  :  1.800 (radius)  4.538 (charge)
+             cutoff =   2.389   3.185   2.244
+
+
+ total charge:   0.000
+
+ atomic composition:
+     W   :    2
+
+ number of electrons: spin up=     6 (   6 per task)  down=     6 (   6 per task) (Fourier space)
+ number of orbitals : spin up=     6 (   6 per task)  down=     6 (   6 per task) (Fourier space)
+
+ supercell:
+      cell_name:  cell_default                                      
+      lattice:    a1=<   5.972   0.000   0.000 >
+                  a2=<   0.000   5.972   0.000 >
+                  a3=<   0.000   0.000   5.972 >
+      reciprocal: b1=<   1.052   0.000  -0.000 >
+                  b2=<  -0.000   1.052  -0.000 >
+                  b3=<   0.000   0.000   1.052 >
+      lattice:    a=       5.972 b=      5.972 c=       5.972
+                  alpha=  90.000 beta=  90.000 gamma=  90.000
+                  omega=       212.9
+
+      density cutoff= 35.427  fft= 16x 16x 16(     1052 waves     1052 per task)
+      wavefnc cutoff= 35.427  fft= 16x 16x 16(     1052 waves     1052 per task)
+      Ewald summation: cut radius=    1.90  and  8
+                       Madelung Wigner-Seitz= 1.76011888 (alpha= 2.83729748 rs= 3.70444413)
+
+ technical parameters:
+      time step=      5.80     fictitious mass=  400000.0
+      tolerance=0.100E-08 (energy)   0.100E-08 (density)
+      maximum iterations =      1000 (   10 inner    100 outer )
+
+
+
+
+
+== Energy Calculation ==
+
+
+          ====== Grassmann conjugate gradient iteration ======
+     >>>  ITERATION STARTED AT Thu Oct  3 16:57:17 2019  <<<
+    iter.           Energy         DeltaE       DeltaRho 
+    ------------------------------------------------------
+      10   -0.2020457267E+02   -0.12753E-06    0.54770E-09
+      20   -0.2020457281E+02   -0.96520E-09    0.65680E-11
+  *** tolerance ok. iteration terminated
+     >>>  ITERATION ENDED   AT Thu Oct  3 16:57:18 2019  <<<
+
+
+==  Summary Of Results  ==
+
+ number of electrons: spin up=    6.00000  down=    6.00000 (real space)
+
+ total     energy    :  -0.2020457281E+02 (   -0.10102E+02/ion)
+ total orbital energy:   0.5093546150E+01 (    0.84892E+00/electron)
+ hartree   energy    :   0.2903382088E+00 (    0.48390E-01/electron)
+ exc-corr  energy    :  -0.9445078100E+01 (   -0.15742E+01/electron)
+ ion-ion   energy    :  -0.2193939674E+02 (   -0.10970E+02/ion)
+
+ kinetic (planewave) :   0.1441586264E+02 (    0.24026E+01/electron)
+ V_local (planewave) :   0.1156111351E+02 (    0.19269E+01/electron)
+ V_nl    (planewave) :  -0.1508741234E+02 (   -0.25146E+01/electron)
+ V_Coul  (planewave) :   0.5806764176E+00 (    0.96779E-01/electron)
+ V_xc.   (planewave) :  -0.6376694082E+01 (   -0.10628E+01/electron)
+ Virial Coefficient  :  -0.6466707350E+00
+
+ orbital energies:
+     0.5414291E+00 (  14.733eV)
+     0.5414285E+00 (  14.733eV)
+     0.5414070E+00 (  14.733eV)
+     0.3596871E+00 (   9.788eV)
+     0.3596781E+00 (   9.787eV)
+     0.2031433E+00 (   5.528eV)
+
+ Total PSPW energy     :  -0.2020457281E+02
+
+
+=== Spin Contamination ===
+
+ <Sexact^2> =    0.0000000000000000     
+ <S^2>      =    0.0000000000000000     
+
+
+
+== Center of Charge ==
+
+spin up     (   -0.0030,   -0.0015,   -0.0050 )
+spin down   (   -0.0030,   -0.0015,   -0.0050 )
+     total  (   -0.0030,   -0.0015,   -0.0050 )
+ionic       (   -1.4929,   -1.4929,   -1.4929 )
+
+
+== Molecular Dipole wrt Center of Mass ==
+
+mu   =  (  -17.8792,  -17.8970,  -17.8547 ) au
+|mu| =    30.9638 au,      78.6976 Debye
+
+
+Translation force removed: (   -0.00000   -0.00000   -0.00000)
+
+
+          =============  Ion Gradients =================
+ Ion Forces:
+        1 W    (    0.002737    0.001358    0.004631 )
+        2 W    (   -0.002737   -0.001358   -0.004631 )
+        C.O.M. (    0.000000    0.000000    0.000000 )
+          ===============================================
+          |F|       =   0.784689E-02
+          |F|/nion  =   0.392344E-02
+          max|Fatom|=   0.554859E-02 (   0.285eV/Angstrom)
+
+
+
+
+======================
+= Stress calculation =
+======================
+
+
+          ============= total gradient ==============
+      S =  (    0.12512    0.00000    0.00000 )
+           (    0.00000    0.12512    0.00001 )
+           (    0.00000    0.00001    0.12511 )
+          ===================================================
+          |S|      = 0.21671E+00
+          pressure = 0.125E+00 au
+                   = 0.368E+02 Mbar
+                   = 0.368E+04 GPa
+                   = 0.363E+08 atm
+
+
+       dE/da     =     0.12512
+       dE/db     =     0.12512
+       dE/dc     =     0.12511
+       dE/dalpha =    -0.00003
+       dE/dbeta  =    -0.00002
+       dE/dgamma =    -0.00001
+
+
+
+
+ *************************************************************
+ **                                                         **
+ **                  PSPW Mulliken analysis                 **
+ **                                                         **
+ ** Population analysis algorithm devloped by Ryoichi Kawai **
+ **                                                         **
+ **                   Thu Oct  3 16:57                      **
+ **                                                         **
+ *************************************************************
+
+
+== XYZ OUTPUT ==
+
+
+                    2
+
+W            -0.002101     -0.001043     -0.003555
+W            -1.577898     -1.578956     -1.576444
+
+
+== Atomic Orbital Expansion ==
+
+ W    nodamping
+
+
+ =====================================================
+ | POPULATION ANALYSIS OF FILLED MOLECULAR ORBITALS  |
+ =====================================================
+
+
+== Using pseudoatomic orbital expansion          ==
+
+
+------------------------------------------------------------------------------
+
+
+*** ORBITAL=   1***  SPIN=BOTH    SUM= 0.12471E+01 E= 0.54143E+00 (  14.733eV)
+
+NO  ATOM  L  POPULATION
+                            s
+ 1   W      0    0.00000    0.00000
+                            px         pz         py
+ 1   W      1    0.00000   -0.00018   -0.00011    0.00005
+                            dx2-y2     dzx        d3z2-1     dyz        dxy
+ 1   W      2    0.49999    0.00003   -0.68532    0.00001    0.10591    0.13824
+                            fx(x2-3y2) fz(5z2-1)  fx(5z2-1)  fz(5z2-3)  fy(5z2-1)  fxyz       fy(3x2-y2)
+ 1   W      3    0.00001   -0.00003   -0.00187   -0.00238   -0.00028    0.00001    0.00000   -0.00017
+                            s
+ 2   W      0    0.00000    0.00000
+                            px         pz         py
+ 2   W      1    0.00000    0.00018    0.00011   -0.00005
+                            dx2-y2     dzx        d3z2-1     dyz        dxy
+ 2   W      2    0.49999    0.00003   -0.68532    0.00001    0.10591    0.13824
+                            fx(x2-3y2) fz(5z2-1)  fx(5z2-1)  fz(5z2-3)  fy(5z2-1)  fxyz       fy(3x2-y2)
+ 2   W      3    0.00001   -0.00003    0.00187    0.00238    0.00028   -0.00001   -0.00000    0.00017
+
+
+=== DISTRIBUTION ===
+
+     1(W   )   0.5000     2(W   )   0.5000
+
+
+== ANGULAR MOMENTUM POPULATIONS ===
+
+      s         p         d         f
+    0.0000    0.0000    1.0000    0.0000
+
+
+------------------------------------------------------------------------------
+
+
+*** ORBITAL=   2***  SPIN=BOTH    SUM= 0.12472E+01 E= 0.54143E+00 (  14.733eV)
+
+NO  ATOM  L  POPULATION
+                            s
+ 1   W      0    0.00000    0.00000
+                            px         pz         py
+ 1   W      1    0.00000    0.00002   -0.00005   -0.00011
+                            dx2-y2     dzx        d3z2-1     dyz        dxy
+ 1   W      2    0.49998   -0.00001   -0.02322    0.00001   -0.61187    0.35363
+                            fx(x2-3y2) fz(5z2-1)  fx(5z2-1)  fz(5z2-3)  fy(5z2-1)  fxyz       fy(3x2-y2)
+ 1   W      3    0.00002   -0.00001    0.00071   -0.00049   -0.00015   -0.00283    0.00006    0.00266
+                            s
+ 2   W      0    0.00000    0.00000
+                            px         pz         py
+ 2   W      1    0.00000   -0.00002    0.00005    0.00011
+                            dx2-y2     dzx        d3z2-1     dyz        dxy
+ 2   W      2    0.49998   -0.00001   -0.02322    0.00001   -0.61187    0.35363
+                            fx(x2-3y2) fz(5z2-1)  fx(5z2-1)  fz(5z2-3)  fy(5z2-1)  fxyz       fy(3x2-y2)
+ 2   W      3    0.00002   -0.00001   -0.00071    0.00049    0.00015    0.00283   -0.00006   -0.00266
+
+
+=== DISTRIBUTION ===
+
+     1(W   )   0.5000     2(W   )   0.5000
+
+
+== ANGULAR MOMENTUM POPULATIONS ===
+
+      s         p         d         f
+    0.0000    0.0000    1.0000    0.0000
+
+
+------------------------------------------------------------------------------
+
+
+*** ORBITAL=   3***  SPIN=BOTH    SUM= 0.12472E+01 E= 0.54141E+00 (  14.733eV)
+
+NO  ATOM  L  POPULATION
+                            s
+ 1   W      0    0.00000   -0.00000
+                            px         pz         py
+ 1   W      1    0.00000    0.00010    0.00006    0.00020
+                            dx2-y2     dzx        d3z2-1     dyz        dxy
+ 1   W      2    0.49999    0.00000    0.17259    0.00000    0.33820    0.59651
+                            fx(x2-3y2) fz(5z2-1)  fx(5z2-1)  fz(5z2-3)  fy(5z2-1)  fxyz       fy(3x2-y2)
+ 1   W      3    0.00001    0.00000    0.00001   -0.00015    0.00015   -0.00033   -0.00325   -0.00033
+                            s
+ 2   W      0    0.00000   -0.00000
+                            px         pz         py
+ 2   W      1    0.00000   -0.00010   -0.00006   -0.00020
+                            dx2-y2     dzx        d3z2-1     dyz        dxy
+ 2   W      2    0.49999    0.00000    0.17259    0.00000    0.33820    0.59651
+                            fx(x2-3y2) fz(5z2-1)  fx(5z2-1)  fz(5z2-3)  fy(5z2-1)  fxyz       fy(3x2-y2)
+ 2   W      3    0.00001    0.00000   -0.00001    0.00015   -0.00015    0.00033    0.00325    0.00033
+
+
+=== DISTRIBUTION ===
+
+     1(W   )   0.5000     2(W   )   0.5000
+
+
+== ANGULAR MOMENTUM POPULATIONS ===
+
+      s         p         d         f
+    0.0000    0.0000    1.0000    0.0000
+
+
+------------------------------------------------------------------------------
+
+
+*** ORBITAL=   4***  SPIN=BOTH    SUM= 0.14577E+01 E= 0.35969E+00 (   9.788eV)
+
+NO  ATOM  L  POPULATION
+                            s
+ 1   W      0    0.00000   -0.00000
+                            px         pz         py
+ 1   W      1    0.00002    0.00162   -0.00440    0.00049
+                            dx2-y2     dzx        d3z2-1     dyz        dxy
+ 1   W      2    0.48998   -0.09896    0.00001    0.69296    0.00001   -0.00001
+                            fx(x2-3y2) fz(5z2-1)  fx(5z2-1)  fz(5z2-3)  fy(5z2-1)  fxyz       fy(3x2-y2)
+ 1   W      3    0.00999   -0.09993    0.00031   -0.00131   -0.00234   -0.00064    0.00000    0.00022
+                            s
+ 2   W      0    0.00000    0.00000
+                            px         pz         py
+ 2   W      1    0.00002    0.00162   -0.00440    0.00049
+                            dx2-y2     dzx        d3z2-1     dyz        dxy
+ 2   W      2    0.48998    0.09896   -0.00001   -0.69296   -0.00001    0.00001
+                            fx(x2-3y2) fz(5z2-1)  fx(5z2-1)  fz(5z2-3)  fy(5z2-1)  fxyz       fy(3x2-y2)
+ 2   W      3    0.00999    0.09993    0.00031   -0.00131   -0.00234   -0.00064    0.00000    0.00022
+
+
+=== DISTRIBUTION ===
+
+     1(W   )   0.5000     2(W   )   0.5000
+
+
+== ANGULAR MOMENTUM POPULATIONS ===
+
+      s         p         d         f
+    0.0000    0.0000    0.9800    0.0200
+
+
+------------------------------------------------------------------------------
+
+
+*** ORBITAL=   5***  SPIN=BOTH    SUM= 0.14616E+01 E= 0.35968E+00 (   9.787eV)
+
+NO  ATOM  L  POPULATION
+                            s
+ 1   W      0    0.00000    0.00000
+                            px         pz         py
+ 1   W      1    0.00001    0.00206    0.00063   -0.00121
+                            dx2-y2     dzx        d3z2-1     dyz        dxy
+ 1   W      2    0.48871   -0.69206   -0.00002   -0.09883    0.00001    0.00000
+                            fx(x2-3y2) fz(5z2-1)  fx(5z2-1)  fz(5z2-3)  fy(5z2-1)  fxyz       fy(3x2-y2)
+ 1   W      3    0.01129   -0.10621    0.00214    0.00009    0.00033    0.00014    0.00000    0.00063
+                            s
+ 2   W      0    0.00000   -0.00000
+                            px         pz         py
+ 2   W      1    0.00001    0.00206    0.00063   -0.00121
+                            dx2-y2     dzx        d3z2-1     dyz        dxy
+ 2   W      2    0.48871    0.69206    0.00002    0.09883   -0.00001   -0.00000
+                            fx(x2-3y2) fz(5z2-1)  fx(5z2-1)  fz(5z2-3)  fy(5z2-1)  fxyz       fy(3x2-y2)
+ 2   W      3    0.01129    0.10621    0.00214    0.00009    0.00033    0.00014    0.00000    0.00063
+
+
+=== DISTRIBUTION ===
+
+     1(W   )   0.5000     2(W   )   0.5000
+
+
+== ANGULAR MOMENTUM POPULATIONS ===
+
+      s         p         d         f
+    0.0000    0.0000    0.9774    0.0226
+
+
+------------------------------------------------------------------------------
+
+
+*** ORBITAL=   6***  SPIN=BOTH    SUM= 0.19540E+01 E= 0.20314E+00 (   5.528eV)
+
+NO  ATOM  L  POPULATION
+                            s
+ 1   W      0    0.49974   -0.70692
+                            px         pz         py
+ 1   W      1    0.00000    0.00028    0.00047    0.00014
+                            dx2-y2     dzx        d3z2-1     dyz        dxy
+ 1   W      2    0.00000   -0.00000   -0.00000   -0.00000   -0.00000   -0.00000
+                            fx(x2-3y2) fz(5z2-1)  fx(5z2-1)  fz(5z2-3)  fy(5z2-1)  fxyz       fy(3x2-y2)
+ 1   W      3    0.00026    0.01609   -0.00000   -0.00007    0.00021   -0.00003    0.00000   -0.00004
+                            s
+ 2   W      0    0.49974   -0.70692
+                            px         pz         py
+ 2   W      1    0.00000   -0.00028   -0.00047   -0.00014
+                            dx2-y2     dzx        d3z2-1     dyz        dxy
+ 2   W      2    0.00000   -0.00000   -0.00000   -0.00000   -0.00000   -0.00000
+                            fx(x2-3y2) fz(5z2-1)  fx(5z2-1)  fz(5z2-3)  fy(5z2-1)  fxyz       fy(3x2-y2)
+ 2   W      3    0.00026    0.01609    0.00000    0.00007   -0.00021    0.00003   -0.00000    0.00004
+
+
+=== DISTRIBUTION ===
+
+     1(W   )   0.5000     2(W   )   0.5000
+
+
+== ANGULAR MOMENTUM POPULATIONS ===
+
+      s         p         d         f
+    0.9995    0.0000    0.0000    0.0005
+
+
+ ========================================
+ |   POPULATION ANALYSIS ON EACH ATOM   |
+ ========================================
+
+
+NO  ATOM  SPIN    TOTAL       s          p          d          f
+ 1   W      UP      3.00000    0.49974    0.00003    2.47866    0.02157
+ 1   W      DOWN    3.00000    0.49974    0.00003    2.47866    0.02157
+ 2   W      UP      3.00000    0.49974    0.00003    2.47866    0.02157
+ 2   W      DOWN    3.00000    0.49974    0.00003    2.47866    0.02157
+
+
+
+=== TOTAL ANGULAR MOMENTUM POPULATION ===
+
+ SPIN       s           p           d           f
+  UP       16.66%       0.00%      82.62%       0.72% 
+  UP       16.66%       0.00%      82.62%       0.72% 
+ TOTAL     16.66%       0.00%      82.62%       0.72% 
+
+ *************************************************************
+ **                                                         **
+ **          PSPW Atomic Point Charge (APC) Analysis        **
+ **                                                         **
+ **   Point charge analysis based on paper by P.E. Blochl   **
+ **         (J. Chem. Phys. vol 103, page 7422, 1995)       **
+ **                                                         **
+ *************************************************************
+
+ pspw_APC data structure
+ -----------------------
+ nga, ngs:                    3                    6
+ Gc      :   2.5000000000000000     
+ APC gamma:                    1  0.59999999999999998     
+ APC gamma:                    2  0.90000000000000002     
+ APC gamma:                    3   1.3500000000000001     
+
+ charge analysis on each atom
+ ----------------------------
+
+    no  atom        Qelc        Qion      Qtotal
+    --  ----     -------     -------     -------
+     1  W         -6.000       6.000      -0.000
+     2  W         -6.000       6.000      -0.000
+     Total Q     -12.000      12.000      -0.000
+
+
+ gaussian coefficients of model density
+ --------------------------------------
+
+    no  atom     g=0.000     g=0.600     g=0.900     g=1.350
+    --  ----     -------     -------     -------     -------
+     1  W          6.000      -7.235      17.653     -16.419
+     2  W          6.000      -7.235      17.653     -16.419
+
+
+=== Electric Field at Atoms ===
+
+      1 W    Atomic Electric Field =(   -0.00022   -0.00011   -0.00038 )
+                    (ion)          =(    0.00094    0.00047    0.00159 )
+                    (electronic)   =(   -0.00116   -0.00058   -0.00197 )
+      2 W    Atomic Electric Field =(    0.00022    0.00011    0.00038 )
+                    (ion)          =(   -0.00094   -0.00047   -0.00159 )
+                    (electronic)   =(    0.00116    0.00058    0.00197 )
+
+ output psi filename:./nwchem_lammps.movecs
+
+
+== Timing ==
+
+cputime in seconds
+  prologue    :   0.114428E+00
+  main loop   :   0.475396E+00
+  epilogue    :   0.316691E-01
+  total       :   0.621493E+00
+  cputime/step:   0.559289E-02       (      85 evalulations,      20 linesearches)
+
+
+Time spent doing                        total          step       percent
+  total time                 :   0.623259E+00  0.733246E-02       100.0 %
+  i/o time                   :   0.103071E-01  0.121260E-03         1.7 %
+  FFTs                       :   0.348712E-01  0.410250E-03         5.6 %
+  dot products               :   0.981057E-02  0.115418E-03         1.6 %
+  geodesic                   :   0.696999E-01  0.819999E-03        11.2 %
+  ffm_dgemm                  :   0.104145E-02  0.122523E-04         0.2 %
+  fmf_dgemm                  :   0.565297E-01  0.665055E-03         9.1 %
+  mmm_dgemm                  :   0.129490E-03  0.152342E-05         0.0 %
+  m_diagonalize              :   0.701885E-03  0.825747E-05         0.1 %
+  exchange correlation       :   0.764353E-01  0.899239E-03        12.3 %
+  local pseudopotentials     :   0.439882E-03  0.517509E-05         0.1 %
+  non-local pseudopotentials :   0.271890E-01  0.319871E-03         4.4 %
+  hartree potentials         :   0.202482E-02  0.238214E-04         0.3 %
+  ion-ion interaction        :   0.104062E+00  0.122426E-02        16.7 %
+  structure factors          :   0.152984E-01  0.179981E-03         2.5 %
+  phase factors              :   0.107278E-04  0.126210E-06         0.0 %
+  masking and packing        :   0.304392E-01  0.358108E-03         4.9 %
+  queue fft                  :   0.111536E+00  0.131219E-02        17.9 %
+  queue fft (serial)         :   0.708244E-01  0.833228E-03        11.4 %
+  queue fft (message passing):   0.360800E-01  0.424470E-03         5.8 %
+  non-local psp FFM          :   0.860008E-02  0.101177E-03         1.4 %
+  non-local psp FMF          :   0.111482E-01  0.131155E-03         1.8 %
+  non-local psp FFM A        :   0.214632E-02  0.252509E-04         0.3 %
+  non-local psp FFM B        :   0.560879E-02  0.659858E-04         0.9 %
+
+     >>>  JOB COMPLETED     AT Thu Oct  3 16:57:18 2019  <<<
+
+ Task  times  cpu:        0.6s     wall:        0.6s
+ Summary of allocated global arrays
+-----------------------------------
+  No active global arrays
+
+
+
+                         GA Statistics for process    0
+                         ------------------------------
+
+       create   destroy   get      put      acc     scatter   gather  read&inc
+calls:    0        0        0        0        0        0        0        0     
+number of processes/call 0.00e+00 0.00e+00 0.00e+00 0.00e+00 0.00e+00
+bytes total:             0.00e+00 0.00e+00 0.00e+00 0.00e+00 0.00e+00 0.00e+00
+bytes remote:            0.00e+00 0.00e+00 0.00e+00 0.00e+00 0.00e+00 0.00e+00
+Max memory consumed for GA by this process: 0 bytes
+MA_summarize_allocated_blocks: starting scan ...
+MA_summarize_allocated_blocks: scan completed: 0 heap blocks, 0 stack blocks
+MA usage statistics:
+
+	allocation statistics:
+					      heap	     stack
+					      ----	     -----
+	current number of blocks	         0	         0
+	maximum number of blocks	       294	        17
+	current total bytes		         0	         0
+	maximum total bytes		   4879496	    351944
+	maximum total K-bytes		      4880	       352
+	maximum total M-bytes		         5	         1
+
+
+                                NWChem Input Module
+                                -------------------
+
+
+
+
+
+                                     CITATION
+                                     --------
+                Please cite the following reference when publishing
+                           results obtained with NWChem:
+
+                 M. Valiev, E.J. Bylaska, N. Govind, K. Kowalski,
+              T.P. Straatsma, H.J.J. van Dam, D. Wang, J. Nieplocha,
+                        E. Apra, T.L. Windus, W.A. de Jong
+                 "NWChem: a comprehensive and scalable open-source
+                  solution for large scale molecular simulations"
+                      Comput. Phys. Commun. 181, 1477 (2010)
+                           doi:10.1016/j.cpc.2010.04.018
+
+                                      AUTHORS
+                                      -------
+          E. Apra, E. J. Bylaska, W. A. de Jong, N. Govind, K. Kowalski,
+       T. P. Straatsma, M. Valiev, H. J. J. van Dam, D. Wang, T. L. Windus,
+        J. Hammond, J. Autschbach, K. Bhaskaran-Nair, J. Brabec, K. Lopata,
+    S. A. Fischer, S. Krishnamoorthy, M. Jacquelin, W. Ma, M. Klemm, O. Villa,
+      Y. Chen, V. Anisimov, F. Aquino, S. Hirata, M. T. Hackler, V. Konjkov,
+            D. Mejia-Rodriguez, T. Risthaus, M. Malagoli, A. Marenich,
+   A. Otero-de-la-Roza, J. Mullin, P. Nichols, R. Peverati, J. Pittner, Y. Zhao,
+        P.-D. Fan, A. Fonari, M. J. Williamson, R. J. Harrison, J. R. Rehr,
+      M. Dupuis, D. Silverstein, D. M. A. Smith, J. Nieplocha, V. Tipparaju,
+    M. Krishnan, B. E. Van Kuiken, A. Vazquez-Mayagoitia, L. Jensen, M. Swart,
+      Q. Wu, T. Van Voorhis, A. A. Auer, M. Nooijen, L. D. Crosby, E. Brown,
+      G. Cisneros, G. I. Fann, H. Fruchtl, J. Garza, K. Hirao, R. A. Kendall,
+      J. A. Nichols, K. Tsemekhman, K. Wolinski, J. Anchell, D. E. Bernholdt,
+      P. Borowski, T. Clark, D. Clerc, H. Dachsel, M. J. O. Deegan, K. Dyall,
+    D. Elwood, E. Glendening, M. Gutowski, A. C. Hess, J. Jaffe, B. G. Johnson,
+     J. Ju, R. Kobayashi, R. Kutteh, Z. Lin, R. Littlefield, X. Long, B. Meng,
+      T. Nakajima, S. Niu, L. Pollack, M. Rosing, K. Glaesemann, G. Sandrone,
+      M. Stave, H. Taylor, G. Thomas, J. H. van Lenthe, A. T. Wong, Z. Zhang.
+
+ Total times  cpu:        0.6s     wall:        0.7s
diff --git a/examples/COUPLE/lammps_nwchem/planewave/nwchem_lammps.out.W.min.3Oct19 b/examples/COUPLE/lammps_nwchem/planewave/nwchem_lammps.out.W.min.3Oct19
new file mode 100644
index 0000000000..519df5d8ba
--- /dev/null
+++ b/examples/COUPLE/lammps_nwchem/planewave/nwchem_lammps.out.W.min.3Oct19
@@ -0,0 +1,816 @@
+ argument  1 = nwchem_lammps.nw
+
+
+
+============================== echo of input deck ==============================
+echo
+
+#**** Enter the geometry using fractional coordinates ****
+geometry units angstrom noautosym
+  system crystal
+    lat_a 3.16d0
+    lat_b 3.16d0
+    lat_c 3.16d0
+  end
+W  0.0158218 0.0316436 0.0474661
+W  0.515824 0.531647 0.547471
+end
+
+nwpw
+ vectors input nwchem_lammps.movecs
+end
+
+#***** setup the nwpw gamma point code ****
+nwpw
+   simulation_cell
+     ngrid 16 16 16
+   end
+   ewald_ncut 8
+   mulliken
+   lcao #old default
+end
+
+nwpw
+  tolerances 1.0d-9 1.0d-9
+end
+
+task pspw stress
+================================================================================
+
+
+                                         
+                                         
+
+
+              Northwest Computational Chemistry Package (NWChem) 6.8
+              ------------------------------------------------------
+
+
+                    Environmental Molecular Sciences Laboratory
+                       Pacific Northwest National Laboratory
+                                Richland, WA 99352
+
+                              Copyright (c) 1994-2018
+                       Pacific Northwest National Laboratory
+                            Battelle Memorial Institute
+
+             NWChem is an open-source computational chemistry package
+                        distributed under the terms of the
+                      Educational Community License (ECL) 2.0
+             A copy of the license is included with this distribution
+                              in the LICENSE.TXT file
+
+                                  ACKNOWLEDGMENT
+                                  --------------
+
+            This software and its documentation were developed at the
+            EMSL at Pacific Northwest National Laboratory, a multiprogram
+            national laboratory, operated for the U.S. Department of Energy
+            by Battelle under Contract Number DE-AC05-76RL01830. Support
+            for this work was provided by the Department of Energy Office
+            of Biological and Environmental Research, Office of Basic
+            Energy Sciences, and the Office of Advanced Scientific Computing.
+
+
+           Job information
+           ---------------
+
+    hostname        = singsing
+    program         = /home/sjplimp/tools/nwchem-6.8.1-release/bin/LINUX64/nwchem
+    date            = Thu Oct  3 16:58:54 2019
+
+    compiled        = Wed_Oct_02_09:25:27_2019
+    source          = /home/sjplimp/tools/nwchem-6.8.1-release
+    nwchem branch   = Development
+    nwchem revision = N/A
+    ga revision     = 5.6.5
+    use scalapack   = F
+    input           = nwchem_lammps.nw
+    prefix          = nwchem_lammps.
+    data base       = ./nwchem_lammps.db
+    status          = restart
+    nproc           =        1
+    time left       =     -1s
+
+
+
+           Memory information
+           ------------------
+
+    heap     =   13107200 doubles =    100.0 Mbytes
+    stack    =   13107197 doubles =    100.0 Mbytes
+    global   =   26214400 doubles =    200.0 Mbytes (distinct from heap & stack)
+    total    =   52428797 doubles =    400.0 Mbytes
+    verify   = yes
+    hardfail = no 
+
+
+           Directory information
+           ---------------------
+
+  0 permanent = .
+  0 scratch   = .
+
+
+           Previous task information
+           -------------------------
+
+    Theory    = pspw                            
+    Operation = stress                        
+    Status    = unknown                       
+    Qmmm      = F
+    Ignore    = F
+
+
+           Geometries in the database
+           --------------------------
+
+       Name                              Natoms  Last Modified
+       --------------------------------  ------  ------------------------
+    1  geometry                               2  Thu Oct  3 16:58:53 2019  
+
+  The geometry named "geometry" is the default for restart
+
+
+
+           Basis sets in the database
+           --------------------------
+
+  There are no basis sets in the database
+
+
+
+                                NWChem Input Module
+                                -------------------
+
+
+
+  !!!!!!!!!  geom_3d NEEDS TESTING !!!!!!!!!! 
+
+
+                             Geometry "geometry" -> ""
+                             -------------------------
+
+ Output coordinates in angstroms (scale by  1.889725989 to convert to a.u.)
+
+  No.       Tag          Charge          X              Y              Z
+ ---- ---------------- ---------- -------------- -------------- --------------
+    1 W                   74.0000     0.04999689     0.09999378     0.14999288
+    2 W                   74.0000     1.63000384     1.68000452     1.73000836
+
+      Lattice Parameters 
+      ------------------ 
+
+      lattice vectors in angstroms (scale by  1.889725989 to convert to a.u.)
+
+      a1=<   3.160   0.000   0.000 >
+      a2=<   0.000   3.160   0.000 >
+      a3=<   0.000   0.000   3.160 >
+      a=       3.160 b=      3.160 c=       3.160
+      alpha=  90.000 beta=  90.000 gamma=  90.000
+      omega=    31.6
+
+      reciprocal lattice vectors in a.u.
+
+      b1=<   1.052   0.000  -0.000 >
+      b2=<  -0.000   1.052  -0.000 >
+      b3=<   0.000   0.000   1.052 >
+
+      Atomic Mass 
+      ----------- 
+
+      W                183.951000
+
+
+
+            XYZ format geometry
+            -------------------
+     2
+ geometry
+ W                     0.04999689     0.09999378     0.14999288
+ W                     1.63000384     1.68000452     1.73000836
+
+ ==============================================================================
+                                internuclear distances
+ ------------------------------------------------------------------------------
+       center one      |      center two      | atomic units |  angstroms
+ ------------------------------------------------------------------------------
+    2 W                |   1 W                |     5.17154  |     2.73666
+ ------------------------------------------------------------------------------
+                         number of included internuclear distances:          1
+ ==============================================================================
+
+
+
+ >>>> PSPW Parallel Module - stress <<<<
+          ****************************************************
+          *                                                  *
+          *               NWPW PSPW Calculation              *
+          *                                                  *
+          * [ (Grassmann/Stiefel manifold implementation)  ] *
+          *                                                  *
+          *      [ NorthWest Chemistry implementation ]      *
+          *                                                  *
+          *            version #5.10   06/12/02              *
+          *                                                  *
+          *    This code was developed by Eric J. Bylaska,   *
+          *    and was based upon algorithms and code        *
+          *    developed by the group of Prof. John H. Weare *
+          *                                                  *
+          ****************************************************
+     >>>  JOB STARTED       AT Thu Oct  3 16:58:54 2019  <<<
+          ================ input data ========================
+
+ input psi filename:./nwchem_lammps.movecs
+
+ initializing pspw_APC data structure
+ ------------------------------------
+ nga, ngs:                    3                    6
+ Gc      :   2.5000000000000000     
+ APC gamma:                    1  0.59999999999999998     
+ APC gamma:                    2  0.90000000000000002     
+ APC gamma:                    3   1.3500000000000001     
+
+ number of processors used:         1
+ processor grid           :   1 x   1
+ parallel mapping         :2d hilbert
+ parallel mapping         :  balanced
+ number of threads        :         1
+ parallel io              :       off
+
+ options:
+      boundary conditions  = periodic    (version3)
+      electron spin        = restricted
+      exchange-correlation = LDA (Vosko et al) parameterization
+
+ elements involved in the cluster:
+      1: W   valence charge:  6.0000  lmax=  2
+             comment    : Troullier-Martins pseudopotential
+             pseudpotential type            :   0
+             highest angular component      :   2
+             local potential used           :   0
+             number of non-local projections:   8
+             semicore corrections included  :  1.800 (radius)  4.538 (charge)
+             cutoff =   2.389   3.185   2.244
+
+
+ total charge:   0.000
+
+ atomic composition:
+     W   :    2
+
+ number of electrons: spin up=     6 (   6 per task)  down=     6 (   6 per task) (Fourier space)
+ number of orbitals : spin up=     6 (   6 per task)  down=     6 (   6 per task) (Fourier space)
+
+ supercell:
+      cell_name:  cell_default                                      
+      lattice:    a1=<   5.972   0.000   0.000 >
+                  a2=<   0.000   5.972   0.000 >
+                  a3=<   0.000   0.000   5.972 >
+      reciprocal: b1=<   1.052   0.000  -0.000 >
+                  b2=<  -0.000   1.052  -0.000 >
+                  b3=<   0.000   0.000   1.052 >
+      lattice:    a=       5.972 b=      5.972 c=       5.972
+                  alpha=  90.000 beta=  90.000 gamma=  90.000
+                  omega=       212.9
+
+      density cutoff= 35.427  fft= 16x 16x 16(     1052 waves     1052 per task)
+      wavefnc cutoff= 35.427  fft= 16x 16x 16(     1052 waves     1052 per task)
+      Ewald summation: cut radius=    1.90  and  8
+                       Madelung Wigner-Seitz= 1.76011888 (alpha= 2.83729748 rs= 3.70444413)
+
+ technical parameters:
+      time step=      5.80     fictitious mass=  400000.0
+      tolerance=0.100E-08 (energy)   0.100E-08 (density)
+      maximum iterations =      1000 (   10 inner    100 outer )
+
+
+
+
+
+== Energy Calculation ==
+
+
+          ====== Grassmann conjugate gradient iteration ======
+     >>>  ITERATION STARTED AT Thu Oct  3 16:58:54 2019  <<<
+    iter.           Energy         DeltaE       DeltaRho 
+    ------------------------------------------------------
+      10   -0.2020460841E+02   -0.37164E-09    0.13892E-11
+  *** tolerance ok. iteration terminated
+     >>>  ITERATION ENDED   AT Thu Oct  3 16:58:54 2019  <<<
+
+
+==  Summary Of Results  ==
+
+ number of electrons: spin up=    6.00000  down=    6.00000 (real space)
+
+ total     energy    :  -0.2020460841E+02 (   -0.10102E+02/ion)
+ total orbital energy:   0.5093526999E+01 (    0.84892E+00/electron)
+ hartree   energy    :   0.2902689593E+00 (    0.48378E-01/electron)
+ exc-corr  energy    :  -0.9445045626E+01 (   -0.15742E+01/electron)
+ ion-ion   energy    :  -0.2193948849E+02 (   -0.10970E+02/ion)
+
+ kinetic (planewave) :   0.1441573280E+02 (    0.24026E+01/electron)
+ V_local (planewave) :   0.1156119613E+02 (    0.19269E+01/electron)
+ V_nl    (planewave) :  -0.1508727219E+02 (   -0.25145E+01/electron)
+ V_Coul  (planewave) :   0.5805379185E+00 (    0.96756E-01/electron)
+ V_xc.   (planewave) :  -0.6376667662E+01 (   -0.10628E+01/electron)
+ Virial Coefficient  :  -0.6466688811E+00
+
+ orbital energies:
+     0.5414223E+00 (  14.733eV)
+     0.5414201E+00 (  14.733eV)
+     0.5414174E+00 (  14.733eV)
+     0.3596809E+00 (   9.787eV)
+     0.3596804E+00 (   9.787eV)
+     0.2031424E+00 (   5.528eV)
+
+ Total PSPW energy     :  -0.2020460841E+02
+
+
+=== Spin Contamination ===
+
+ <Sexact^2> =    0.0000000000000000     
+ <S^2>      =    0.0000000000000000     
+
+
+
+== Center of Charge ==
+
+spin up     (    0.0106,    0.0203,    0.0283 )
+spin down   (    0.0106,    0.0203,    0.0283 )
+     total  (    0.0106,    0.0203,    0.0283 )
+ionic       (   -1.3984,   -1.3039,   -1.2094 )
+
+
+== Molecular Dipole wrt Center of Mass ==
+
+mu   =  (  -16.9083,  -15.8910,  -14.8528 ) au
+|mu| =    27.5503 au,      70.0218 Debye
+
+
+Translation force removed: (   -0.00002    0.00000    0.00002)
+
+
+          =============  Ion Gradients =================
+ Ion Forces:
+        1 W    (   -0.000001    0.000005    0.000014 )
+        2 W    (    0.000001   -0.000005   -0.000014 )
+        C.O.M. (   -0.000000    0.000000    0.000000 )
+          ===============================================
+          |F|       =   0.216488E-04
+          |F|/nion  =   0.108244E-04
+          max|Fatom|=   0.153080E-04 (   0.001eV/Angstrom)
+
+
+
+
+======================
+= Stress calculation =
+======================
+
+
+          ============= total gradient ==============
+      S =  (    0.12513    0.00001   -0.00003 )
+           (    0.00001    0.12513   -0.00001 )
+           (   -0.00003   -0.00001    0.12513 )
+          ===================================================
+          |S|      = 0.21673E+00
+          pressure = 0.125E+00 au
+                   = 0.368E+02 Mbar
+                   = 0.368E+04 GPa
+                   = 0.363E+08 atm
+
+
+       dE/da     =     0.12513
+       dE/db     =     0.12513
+       dE/dc     =     0.12513
+       dE/dalpha =     0.00006
+       dE/dbeta  =     0.00020
+       dE/dgamma =    -0.00008
+
+
+
+
+ *************************************************************
+ **                                                         **
+ **                  PSPW Mulliken analysis                 **
+ **                                                         **
+ ** Population analysis algorithm devloped by Ryoichi Kawai **
+ **                                                         **
+ **                   Thu Oct  3 16:58                      **
+ **                                                         **
+ *************************************************************
+
+
+== XYZ OUTPUT ==
+
+
+                    2
+
+W             0.049997      0.099994      0.149993
+W            -1.529995     -1.479995     -1.429991
+
+
+== Atomic Orbital Expansion ==
+
+ W    nodamping
+
+
+ =====================================================
+ | POPULATION ANALYSIS OF FILLED MOLECULAR ORBITALS  |
+ =====================================================
+
+
+== Using pseudoatomic orbital expansion          ==
+
+
+------------------------------------------------------------------------------
+
+
+*** ORBITAL=   1***  SPIN=BOTH    SUM= 0.12471E+01 E= 0.54142E+00 (  14.733eV)
+
+NO  ATOM  L  POPULATION
+                            s
+ 1   W      0    0.00000    0.00000
+                            px         pz         py
+ 1   W      1    0.00000    0.00000    0.00000    0.00000
+                            dx2-y2     dzx        d3z2-1     dyz        dxy
+ 1   W      2    0.50000   -0.00001   -0.03953    0.00002    0.50309    0.49532
+                            fx(x2-3y2) fz(5z2-1)  fx(5z2-1)  fz(5z2-3)  fy(5z2-1)  fxyz       fy(3x2-y2)
+ 1   W      3    0.00000   -0.00001   -0.00000   -0.00000    0.00000    0.00000   -0.00001   -0.00000
+                            s
+ 2   W      0    0.00000    0.00000
+                            px         pz         py
+ 2   W      1    0.00000   -0.00000   -0.00000   -0.00000
+                            dx2-y2     dzx        d3z2-1     dyz        dxy
+ 2   W      2    0.50000   -0.00001   -0.03953    0.00002    0.50309    0.49532
+                            fx(x2-3y2) fz(5z2-1)  fx(5z2-1)  fz(5z2-3)  fy(5z2-1)  fxyz       fy(3x2-y2)
+ 2   W      3    0.00000   -0.00001    0.00000    0.00000   -0.00000   -0.00000    0.00001    0.00000
+
+
+=== DISTRIBUTION ===
+
+     1(W   )   0.5000     2(W   )   0.5000
+
+
+== ANGULAR MOMENTUM POPULATIONS ===
+
+      s         p         d         f
+    0.0000    0.0000    1.0000    0.0000
+
+
+------------------------------------------------------------------------------
+
+
+*** ORBITAL=   2***  SPIN=BOTH    SUM= 0.12471E+01 E= 0.54142E+00 (  14.733eV)
+
+NO  ATOM  L  POPULATION
+                            s
+ 1   W      0    0.00000   -0.00000
+                            px         pz         py
+ 1   W      1    0.00000    0.00000    0.00000    0.00000
+                            dx2-y2     dzx        d3z2-1     dyz        dxy
+ 1   W      2    0.50000    0.00004    0.62658    0.00003   -0.20360    0.25680
+                            fx(x2-3y2) fz(5z2-1)  fx(5z2-1)  fz(5z2-3)  fy(5z2-1)  fxyz       fy(3x2-y2)
+ 1   W      3    0.00000   -0.00004    0.00000    0.00000   -0.00000   -0.00000   -0.00001    0.00000
+                            s
+ 2   W      0    0.00000   -0.00000
+                            px         pz         py
+ 2   W      1    0.00000   -0.00000   -0.00000   -0.00000
+                            dx2-y2     dzx        d3z2-1     dyz        dxy
+ 2   W      2    0.50000    0.00004    0.62658    0.00003   -0.20360    0.25680
+                            fx(x2-3y2) fz(5z2-1)  fx(5z2-1)  fz(5z2-3)  fy(5z2-1)  fxyz       fy(3x2-y2)
+ 2   W      3    0.00000   -0.00004   -0.00000   -0.00000   -0.00000    0.00000    0.00001   -0.00000
+
+
+=== DISTRIBUTION ===
+
+     1(W   )   0.5000     2(W   )   0.5000
+
+
+== ANGULAR MOMENTUM POPULATIONS ===
+
+      s         p         d         f
+    0.0000    0.0000    1.0000    0.0000
+
+
+------------------------------------------------------------------------------
+
+
+*** ORBITAL=   3***  SPIN=BOTH    SUM= 0.12471E+01 E= 0.54142E+00 (  14.733eV)
+
+NO  ATOM  L  POPULATION
+                            s
+ 1   W      0    0.00000    0.00001
+                            px         pz         py
+ 1   W      1    0.00000    0.00000   -0.00000   -0.00000
+                            dx2-y2     dzx        d3z2-1     dyz        dxy
+ 1   W      2    0.50000   -0.00001   -0.32532   -0.00000   -0.45327    0.43441
+                            fx(x2-3y2) fz(5z2-1)  fx(5z2-1)  fz(5z2-3)  fy(5z2-1)  fxyz       fy(3x2-y2)
+ 1   W      3    0.00000    0.00001    0.00000   -0.00000   -0.00000   -0.00000   -0.00000    0.00000
+                            s
+ 2   W      0    0.00000    0.00001
+                            px         pz         py
+ 2   W      1    0.00000   -0.00000    0.00000    0.00000
+                            dx2-y2     dzx        d3z2-1     dyz        dxy
+ 2   W      2    0.50000   -0.00001   -0.32532   -0.00000   -0.45327    0.43441
+                            fx(x2-3y2) fz(5z2-1)  fx(5z2-1)  fz(5z2-3)  fy(5z2-1)  fxyz       fy(3x2-y2)
+ 2   W      3    0.00000    0.00001   -0.00000    0.00001    0.00000    0.00000    0.00000   -0.00000
+
+
+=== DISTRIBUTION ===
+
+     1(W   )   0.5000     2(W   )   0.5000
+
+
+== ANGULAR MOMENTUM POPULATIONS ===
+
+      s         p         d         f
+    0.0000    0.0000    1.0000    0.0000
+
+
+------------------------------------------------------------------------------
+
+
+*** ORBITAL=   4***  SPIN=BOTH    SUM= 0.14785E+01 E= 0.35968E+00 (   9.787eV)
+
+NO  ATOM  L  POPULATION
+                            s
+ 1   W      0    0.00000   -0.00000
+                            px         pz         py
+ 1   W      1    0.00000   -0.00000    0.00001   -0.00000
+                            dx2-y2     dzx        d3z2-1     dyz        dxy
+ 1   W      2    0.48310    0.33381    0.00000   -0.60965    0.00000    0.00000
+                            fx(x2-3y2) fz(5z2-1)  fx(5z2-1)  fz(5z2-3)  fy(5z2-1)  fxyz       fy(3x2-y2)
+ 1   W      3    0.01690    0.13001   -0.00000    0.00000    0.00000    0.00000    0.00000   -0.00000
+                            s
+ 2   W      0    0.00000    0.00000
+                            px         pz         py
+ 2   W      1    0.00000   -0.00000    0.00001   -0.00000
+                            dx2-y2     dzx        d3z2-1     dyz        dxy
+ 2   W      2    0.48310   -0.33381   -0.00000    0.60965   -0.00000   -0.00000
+                            fx(x2-3y2) fz(5z2-1)  fx(5z2-1)  fz(5z2-3)  fy(5z2-1)  fxyz       fy(3x2-y2)
+ 2   W      3    0.01690   -0.13001   -0.00000    0.00000    0.00000    0.00000    0.00000   -0.00000
+
+
+=== DISTRIBUTION ===
+
+     1(W   )   0.5000     2(W   )   0.5000
+
+
+== ANGULAR MOMENTUM POPULATIONS ===
+
+      s         p         d         f
+    0.0000    0.0000    0.9662    0.0338
+
+
+------------------------------------------------------------------------------
+
+
+*** ORBITAL=   5***  SPIN=BOTH    SUM= 0.14407E+01 E= 0.35968E+00 (   9.787eV)
+
+NO  ATOM  L  POPULATION
+                            s
+ 1   W      0    0.00000   -0.00000
+                            px         pz         py
+ 1   W      1    0.00000   -0.00000   -0.00000    0.00001
+                            dx2-y2     dzx        d3z2-1     dyz        dxy
+ 1   W      2    0.49580    0.61761   -0.00000    0.33817    0.00000   -0.00000
+                            fx(x2-3y2) fz(5z2-1)  fx(5z2-1)  fz(5z2-3)  fy(5z2-1)  fxyz       fy(3x2-y2)
+ 1   W      3    0.00420    0.06484   -0.00001    0.00000   -0.00000   -0.00000   -0.00000   -0.00000
+                            s
+ 2   W      0    0.00000    0.00000
+                            px         pz         py
+ 2   W      1    0.00000   -0.00000   -0.00000    0.00001
+                            dx2-y2     dzx        d3z2-1     dyz        dxy
+ 2   W      2    0.49580   -0.61761    0.00000   -0.33817   -0.00000    0.00000
+                            fx(x2-3y2) fz(5z2-1)  fx(5z2-1)  fz(5z2-3)  fy(5z2-1)  fxyz       fy(3x2-y2)
+ 2   W      3    0.00420   -0.06484   -0.00001    0.00000   -0.00000   -0.00000   -0.00000   -0.00000
+
+
+=== DISTRIBUTION ===
+
+     1(W   )   0.5000     2(W   )   0.5000
+
+
+== ANGULAR MOMENTUM POPULATIONS ===
+
+      s         p         d         f
+    0.0000    0.0000    0.9916    0.0084
+
+
+------------------------------------------------------------------------------
+
+
+*** ORBITAL=   6***  SPIN=BOTH    SUM= 0.19540E+01 E= 0.20314E+00 (   5.528eV)
+
+NO  ATOM  L  POPULATION
+                            s
+ 1   W      0    0.49974   -0.70692
+                            px         pz         py
+ 1   W      1    0.00000    0.00000   -0.00000    0.00000
+                            dx2-y2     dzx        d3z2-1     dyz        dxy
+ 1   W      2    0.00000    0.00000   -0.00000   -0.00000   -0.00000    0.00000
+                            fx(x2-3y2) fz(5z2-1)  fx(5z2-1)  fz(5z2-3)  fy(5z2-1)  fxyz       fy(3x2-y2)
+ 1   W      3    0.00026    0.01609   -0.00000   -0.00000   -0.00000   -0.00000   -0.00000   -0.00000
+                            s
+ 2   W      0    0.49974   -0.70692
+                            px         pz         py
+ 2   W      1    0.00000   -0.00000    0.00000   -0.00000
+                            dx2-y2     dzx        d3z2-1     dyz        dxy
+ 2   W      2    0.00000    0.00000   -0.00000   -0.00000   -0.00000    0.00000
+                            fx(x2-3y2) fz(5z2-1)  fx(5z2-1)  fz(5z2-3)  fy(5z2-1)  fxyz       fy(3x2-y2)
+ 2   W      3    0.00026    0.01609    0.00000    0.00000   -0.00000    0.00000    0.00000    0.00000
+
+
+=== DISTRIBUTION ===
+
+     1(W   )   0.5000     2(W   )   0.5000
+
+
+== ANGULAR MOMENTUM POPULATIONS ===
+
+      s         p         d         f
+    0.9995    0.0000    0.0000    0.0005
+
+
+ ========================================
+ |   POPULATION ANALYSIS ON EACH ATOM   |
+ ========================================
+
+
+NO  ATOM  SPIN    TOTAL       s          p          d          f
+ 1   W      UP      3.00000    0.49974    0.00000    2.47889    0.02137
+ 1   W      DOWN    3.00000    0.49974    0.00000    2.47889    0.02137
+ 2   W      UP      3.00000    0.49974    0.00000    2.47889    0.02137
+ 2   W      DOWN    3.00000    0.49974    0.00000    2.47889    0.02137
+
+
+
+=== TOTAL ANGULAR MOMENTUM POPULATION ===
+
+ SPIN       s           p           d           f
+  UP       16.66%       0.00%      82.63%       0.71% 
+  UP       16.66%       0.00%      82.63%       0.71% 
+ TOTAL     16.66%       0.00%      82.63%       0.71% 
+
+ *************************************************************
+ **                                                         **
+ **          PSPW Atomic Point Charge (APC) Analysis        **
+ **                                                         **
+ **   Point charge analysis based on paper by P.E. Blochl   **
+ **         (J. Chem. Phys. vol 103, page 7422, 1995)       **
+ **                                                         **
+ *************************************************************
+
+ pspw_APC data structure
+ -----------------------
+ nga, ngs:                    3                    6
+ Gc      :   2.5000000000000000     
+ APC gamma:                    1  0.59999999999999998     
+ APC gamma:                    2  0.90000000000000002     
+ APC gamma:                    3   1.3500000000000001     
+
+ charge analysis on each atom
+ ----------------------------
+
+    no  atom        Qelc        Qion      Qtotal
+    --  ----     -------     -------     -------
+     1  W         -6.000       6.000      -0.000
+     2  W         -6.000       6.000       0.000
+     Total Q     -12.000      12.000      -0.000
+
+
+ gaussian coefficients of model density
+ --------------------------------------
+
+    no  atom     g=0.000     g=0.600     g=0.900     g=1.350
+    --  ----     -------     -------     -------     -------
+     1  W          6.000      -7.235      17.654     -16.419
+     2  W          6.000      -7.234      17.651     -16.418
+
+
+=== Electric Field at Atoms ===
+
+      1 W    Atomic Electric Field =(   -0.00002    0.00000    0.00001 )
+                    (ion)          =(    0.00000    0.00000    0.00000 )
+                    (electronic)   =(   -0.00002   -0.00000    0.00001 )
+      2 W    Atomic Electric Field =(   -0.00002    0.00000    0.00002 )
+                    (ion)          =(   -0.00000   -0.00000   -0.00000 )
+                    (electronic)   =(   -0.00002    0.00000    0.00002 )
+
+ output psi filename:./nwchem_lammps.movecs
+
+
+== Timing ==
+
+cputime in seconds
+  prologue    :   0.991130E-01
+  main loop   :   0.101190E+00
+  epilogue    :   0.203540E-01
+  total       :   0.220657E+00
+  cputime/step:   0.252975E-01       (       4 evalulations,       1 linesearches)
+
+
+Time spent doing                        total          step       percent
+  total time                 :   0.222262E+00  0.555655E-01       100.0 %
+  i/o time                   :   0.847340E-02  0.211835E-02         3.8 %
+  FFTs                       :   0.576015E-02  0.144004E-02         2.6 %
+  dot products               :   0.157053E-02  0.392634E-03         0.7 %
+  geodesic                   :   0.203228E-02  0.508070E-03         0.9 %
+  ffm_dgemm                  :   0.641376E-04  0.160344E-04         0.0 %
+  fmf_dgemm                  :   0.202988E-02  0.507471E-03         0.9 %
+  mmm_dgemm                  :   0.286302E-05  0.715756E-06         0.0 %
+  m_diagonalize              :   0.101088E-03  0.252721E-04         0.0 %
+  exchange correlation       :   0.287819E-02  0.719547E-03         1.3 %
+  local pseudopotentials     :   0.346661E-03  0.866652E-04         0.2 %
+  non-local pseudopotentials :   0.268912E-02  0.672280E-03         1.2 %
+  hartree potentials         :   0.163791E-03  0.409476E-04         0.1 %
+  ion-ion interaction        :   0.699389E-01  0.174847E-01        31.5 %
+  structure factors          :   0.889608E-02  0.222402E-02         4.0 %
+  phase factors              :   0.102510E-04  0.256275E-05         0.0 %
+  masking and packing        :   0.839656E-02  0.209914E-02         3.8 %
+  queue fft                  :   0.418949E-02  0.104737E-02         1.9 %
+  queue fft (serial)         :   0.264608E-02  0.661519E-03         1.2 %
+  queue fft (message passing):   0.136477E-02  0.341193E-03         0.6 %
+  non-local psp FFM          :   0.391964E-03  0.979910E-04         0.2 %
+  non-local psp FMF          :   0.407219E-03  0.101805E-03         0.2 %
+  non-local psp FFM A        :   0.144235E-03  0.360588E-04         0.1 %
+  non-local psp FFM B        :   0.216961E-03  0.542402E-04         0.1 %
+
+     >>>  JOB COMPLETED     AT Thu Oct  3 16:58:54 2019  <<<
+
+ Task  times  cpu:        0.2s     wall:        0.2s
+ Summary of allocated global arrays
+-----------------------------------
+  No active global arrays
+
+
+
+                         GA Statistics for process    0
+                         ------------------------------
+
+       create   destroy   get      put      acc     scatter   gather  read&inc
+calls:    0        0        0        0        0        0        0        0     
+number of processes/call 0.00e+00 0.00e+00 0.00e+00 0.00e+00 0.00e+00
+bytes total:             0.00e+00 0.00e+00 0.00e+00 0.00e+00 0.00e+00 0.00e+00
+bytes remote:            0.00e+00 0.00e+00 0.00e+00 0.00e+00 0.00e+00 0.00e+00
+Max memory consumed for GA by this process: 0 bytes
+MA_summarize_allocated_blocks: starting scan ...
+MA_summarize_allocated_blocks: scan completed: 0 heap blocks, 0 stack blocks
+MA usage statistics:
+
+	allocation statistics:
+					      heap	     stack
+					      ----	     -----
+	current number of blocks	         0	         0
+	maximum number of blocks	       294	        17
+	current total bytes		         0	         0
+	maximum total bytes		   4879496	    351944
+	maximum total K-bytes		      4880	       352
+	maximum total M-bytes		         5	         1
+
+
+                                NWChem Input Module
+                                -------------------
+
+
+
+
+
+                                     CITATION
+                                     --------
+                Please cite the following reference when publishing
+                           results obtained with NWChem:
+
+                 M. Valiev, E.J. Bylaska, N. Govind, K. Kowalski,
+              T.P. Straatsma, H.J.J. van Dam, D. Wang, J. Nieplocha,
+                        E. Apra, T.L. Windus, W.A. de Jong
+                 "NWChem: a comprehensive and scalable open-source
+                  solution for large scale molecular simulations"
+                      Comput. Phys. Commun. 181, 1477 (2010)
+                           doi:10.1016/j.cpc.2010.04.018
+
+                                      AUTHORS
+                                      -------
+          E. Apra, E. J. Bylaska, W. A. de Jong, N. Govind, K. Kowalski,
+       T. P. Straatsma, M. Valiev, H. J. J. van Dam, D. Wang, T. L. Windus,
+        J. Hammond, J. Autschbach, K. Bhaskaran-Nair, J. Brabec, K. Lopata,
+    S. A. Fischer, S. Krishnamoorthy, M. Jacquelin, W. Ma, M. Klemm, O. Villa,
+      Y. Chen, V. Anisimov, F. Aquino, S. Hirata, M. T. Hackler, V. Konjkov,
+            D. Mejia-Rodriguez, T. Risthaus, M. Malagoli, A. Marenich,
+   A. Otero-de-la-Roza, J. Mullin, P. Nichols, R. Peverati, J. Pittner, Y. Zhao,
+        P.-D. Fan, A. Fonari, M. J. Williamson, R. J. Harrison, J. R. Rehr,
+      M. Dupuis, D. Silverstein, D. M. A. Smith, J. Nieplocha, V. Tipparaju,
+    M. Krishnan, B. E. Van Kuiken, A. Vazquez-Mayagoitia, L. Jensen, M. Swart,
+      Q. Wu, T. Van Voorhis, A. A. Auer, M. Nooijen, L. D. Crosby, E. Brown,
+      G. Cisneros, G. I. Fann, H. Fruchtl, J. Garza, K. Hirao, R. A. Kendall,
+      J. A. Nichols, K. Tsemekhman, K. Wolinski, J. Anchell, D. E. Bernholdt,
+      P. Borowski, T. Clark, D. Clerc, H. Dachsel, M. J. O. Deegan, K. Dyall,
+    D. Elwood, E. Glendening, M. Gutowski, A. C. Hess, J. Jaffe, B. G. Johnson,
+     J. Ju, R. Kobayashi, R. Kutteh, Z. Lin, R. Littlefield, X. Long, B. Meng,
+      T. Nakajima, S. Niu, L. Pollack, M. Rosing, K. Glaesemann, G. Sandrone,
+      M. Stave, H. Taylor, G. Thomas, J. H. van Lenthe, A. T. Wong, Z. Zhang.
+
+ Total times  cpu:        0.2s     wall:        0.3s
diff --git a/examples/COUPLE/lammps_nwchem/planewave/w.nw b/examples/COUPLE/lammps_nwchem/planewave/w.nw
new file mode 100644
index 0000000000..5f78801174
--- /dev/null
+++ b/examples/COUPLE/lammps_nwchem/planewave/w.nw
@@ -0,0 +1,28 @@
+echo
+
+#**** Enter the geometry using fractional coordinates ****
+geometry units angstrom noautosym 
+  system crystal
+    lat_a 3.16d0
+    lat_b 3.16d0
+    lat_c 3.16d0
+  end
+W 0.0 0.0 0.0 
+W 0.5 0.5 0.5
+end
+
+#***** setup the nwpw gamma point code ****
+nwpw
+   simulation_cell
+     ngrid 16 16 16
+   end
+   ewald_ncut 8
+   mulliken
+   lcao #old default
+end
+
+nwpw
+  tolerances 1.0d-9 1.0d-9
+end
+
+task pspw stress
diff --git a/examples/COUPLE/lammps_quest/lmpqst.cpp b/examples/COUPLE/lammps_quest/lmpqst.cpp
index 76a89f1d06..6d31a9251b 100644
--- a/examples/COUPLE/lammps_quest/lmpqst.cpp
+++ b/examples/COUPLE/lammps_quest/lmpqst.cpp
@@ -84,7 +84,7 @@ int main(int narg, char **arg)
 
   lmp->input->file(lammps_input);
 
-  // make info avaiable to callback function
+  // make info available to callback function
 
   Info info;
   info.me = me;
diff --git a/examples/COUPLE/plugin/README b/examples/COUPLE/plugin/README
new file mode 100644
index 0000000000..b035ed3c0e
--- /dev/null
+++ b/examples/COUPLE/plugin/README
@@ -0,0 +1,63 @@
+This directory has a simple C code that shows how LAMMPS can be included
+in an application as a shared library loaded at runtime. The code is
+essentially the same as in the "simple" example that links to LAMMPS
+either with a static or shared library. The purpose is to illustrate
+how another code could be built without having a LAMMPS library present
+and then load the (separately compiled) shared library.
+
+simple.c           is the C driver
+liblammpsplugin.c  is the LAMMPS library plugin loader
+
+You can then build the driver executable codes with a compile line
+like below.
+
+mpicc -c -O -Wall -g -I$HOME/lammps/src liblammpsplugin.c
+mpicc -c -O -Wall -g simple.c
+mpicc simple.o liblammsplugin.o -ldl -o simpleC
+
+You also need to build LAMMPS as a shared library
+(see examples/COUPLE/README), e.g. 
+
+cd $HOME/lammps/src
+make mode=shlib mpi
+
+or 
+
+cd $HOME/lammps
+mkdir build-shared
+cd build-shared
+cmake -D BUILD_LIB=on -D BUILD_SHARED_LIBS=on ../cmake
+make
+
+You then run simpleC on a parallel machine
+on some number of processors Q with 3 arguments:
+
+% mpirun -np Q simpleC P in.lj $HOME/lammps/src/liblammps.so
+
+or
+
+% mpirun -np Q simpleC P in.lj $HOME/lammps/build-shared/liblammps.so
+
+P is the number of procs you want LAMMPS to run on (must be <= Q) and
+in.lj is a LAMMPS input script and the last argument is the path to
+the LAMMPS shared library. This either has to be an absolute path, or
+liblammps.so has to be in a folder that is included in the environment
+variable LD_LIBRARY_PATH so it will be found by the dynamic object loader.
+
+The driver will launch LAMMPS on P procs, read the input script a line
+at a time, and pass each command line to LAMMPS.  The final line of
+the script is a "run" command, so LAMMPS will run the problem.
+
+The driver then requests all the atom coordinates from LAMMPS, moves
+one of the atoms a small amount "epsilon", passes the coordinates back
+to LAMMPS, and runs LAMMPS again.  If you look at the output, you
+should see a small energy change between runs, due to the moved atom.
+
+The C driver is calling C-style routines in the src/library.cpp file
+of LAMMPS through the function pointers in the liblammpsplugin_t struct.
+This has the benefit that your binary is not linked to liblammps.so directly
+and thus you can change the name of the shared library (e.g. to have 
+different variants compiled, or to load a different LAMMPS versions without
+having to update your executable). The shared library still has to be
+compatible with the compilation settings the plugin code.
+
diff --git a/examples/COUPLE/plugin/in.lj b/examples/COUPLE/plugin/in.lj
new file mode 100644
index 0000000000..3dc80bdfea
--- /dev/null
+++ b/examples/COUPLE/plugin/in.lj
@@ -0,0 +1,25 @@
+# 3d Lennard-Jones melt
+
+units		lj
+atom_style	atomic
+atom_modify	map array
+
+lattice		fcc 0.8442
+region		box block 0 4 0 4 0 4
+create_box	1 box
+create_atoms	1 box
+mass		1 1.0
+
+velocity	all create 1.44 87287 loop geom
+
+pair_style	lj/cut 2.5
+pair_coeff	1 1 1.0 1.0 2.5
+
+neighbor	0.3 bin
+neigh_modify	delay 0 every 20 check no
+
+fix		1 all nve
+
+variable        fx atom fx
+
+run		10
diff --git a/examples/COUPLE/plugin/liblammpsplugin.c b/examples/COUPLE/plugin/liblammpsplugin.c
new file mode 100644
index 0000000000..a66d87dfcc
--- /dev/null
+++ b/examples/COUPLE/plugin/liblammpsplugin.c
@@ -0,0 +1,99 @@
+/* -*- c++ -*- ----------------------------------------------------------
+   LAMMPS - Large-scale Atomic/Molecular Massively Parallel Simulator
+   http://lammps.sandia.gov, Sandia National Laboratories
+   Steve Plimpton, sjplimp@sandia.gov
+
+   Copyright (2003) Sandia Corporation.  Under the terms of Contract
+   DE-AC04-94AL85000 with Sandia Corporation, the U.S. Government retains
+   certain rights in this software.  This software is distributed under
+   the GNU General Public License.
+
+   See the README file in the top-level LAMMPS directory.
+------------------------------------------------------------------------- */
+
+/*
+   Variant of the C style library interface to LAMMPS
+   that uses a shared library and dynamically opens it,
+   so this can be used as a prototype code to integrate
+   a LAMMPS plugin to some other software.
+*/
+
+#include "library.h"
+#include "liblammpsplugin.h"
+#include <stdlib.h>
+#include <dlfcn.h>
+
+liblammpsplugin_t *liblammpsplugin_load(const char *lib)
+{
+  liblammpsplugin_t *lmp;
+  void *handle;
+
+  if (lib == NULL) return NULL;
+  handle = dlopen(lib,RTLD_NOW|RTLD_GLOBAL);
+  if (handle == NULL) return NULL;
+  
+  lmp = (liblammpsplugin_t *) malloc(sizeof(liblammpsplugin_t));
+  lmp->handle = handle;
+
+#define ADDSYM(symbol) lmp->symbol = dlsym(handle,"lammps_" #symbol)
+  ADDSYM(open);
+  ADDSYM(open_no_mpi);
+  ADDSYM(close);
+  ADDSYM(version);
+  ADDSYM(file);
+  ADDSYM(command);
+  ADDSYM(commands_list);
+  ADDSYM(commands_string);
+  ADDSYM(free);
+  ADDSYM(extract_setting);
+  ADDSYM(extract_global);
+  ADDSYM(extract_box);
+  ADDSYM(extract_atom);
+  ADDSYM(extract_compute);
+  ADDSYM(extract_fix);
+  ADDSYM(extract_variable);
+
+  ADDSYM(get_thermo);
+  ADDSYM(get_natoms);
+
+  ADDSYM(set_variable);
+  ADDSYM(reset_box);
+
+  ADDSYM(gather_atoms);
+  ADDSYM(gather_atoms_concat);
+  ADDSYM(gather_atoms_subset);
+  ADDSYM(scatter_atoms);
+  ADDSYM(scatter_atoms_subset);
+
+  ADDSYM(set_fix_external_callback);
+
+  ADDSYM(config_has_package);
+  ADDSYM(config_package_count);
+  ADDSYM(config_package_name);
+  ADDSYM(config_has_gzip_support);
+  ADDSYM(config_has_png_support);
+  ADDSYM(config_has_jpeg_support);
+  ADDSYM(config_has_ffmpeg_support);
+  ADDSYM(config_has_exceptions);
+  ADDSYM(create_atoms);
+#ifdef LAMMPS_EXCEPTIONS
+  lmp->has_exceptions = 1;
+  ADDSYM(has_error);
+  ADDSYM(get_last_error_message);
+#else
+  lmp->has_exceptions = 0;
+  lmp->has_error = NULL;
+  lmp->get_last_error_message = NULL;
+#endif
+  return lmp;
+}
+
+int liblammpsplugin_release(liblammpsplugin_t *lmp)
+{
+  if (lmp == NULL) return 1;
+  if (lmp->handle == NULL) return 2;
+
+  dlclose(lmp->handle);
+  free((void *)lmp);
+  return 0;
+}
diff --git a/examples/COUPLE/plugin/liblammpsplugin.h b/examples/COUPLE/plugin/liblammpsplugin.h
new file mode 100644
index 0000000000..83d0dfa557
--- /dev/null
+++ b/examples/COUPLE/plugin/liblammpsplugin.h
@@ -0,0 +1,126 @@
+/* -*- c++ -*- ----------------------------------------------------------
+   LAMMPS - Large-scale Atomic/Molecular Massively Parallel Simulator
+   http://lammps.sandia.gov, Sandia National Laboratories
+   Steve Plimpton, sjplimp@sandia.gov
+
+   Copyright (2003) Sandia Corporation.  Under the terms of Contract
+   DE-AC04-94AL85000 with Sandia Corporation, the U.S. Government retains
+   certain rights in this software.  This software is distributed under
+   the GNU General Public License.
+
+   See the README file in the top-level LAMMPS directory.
+------------------------------------------------------------------------- */
+
+#ifndef LIBLAMMPSPLUGIN_H
+#define LIBLAMMPSPLUGIN_H
+/*
+   Variant of the C style library interface to LAMMPS
+   that uses a shared library and dynamically opens it,
+   so this can be used as a prototype code to integrate
+   a LAMMPS plugin to some other software.
+*/
+
+/*
+ * Follow the behavior of regular LAMMPS compilation and assume
+ * -DLAMMPS_SMALLBIG when no define is set.
+ */
+#if !defined(LAMMPS_BIGBIG) && !defined(LAMMPS_SMALLBIG) && !defined(LAMMPS_SMALLSMALL)
+#define LAMMPS_SMALLBIG
+#endif
+
+#include <mpi.h>
+#if defined(LAMMPS_BIGBIG) || defined(LAMMPS_SMALLBIG)
+#include <inttypes.h>  /* for int64_t */
+#endif
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#if defined(LAMMPS_BIGBIG)
+typedef void (*FixExternalFnPtr)(void *, int64_t, int, int64_t *, double **, double **);
+#elif defined(LAMMPS_SMALLBIG)
+typedef void (*FixExternalFnPtr)(void *, int64_t, int, int *, double **, double **);
+#else
+typedef void (*FixExternalFnPtr)(void *, int, int, int *, double **, double **);
+#endif
+
+  
+struct _liblammpsplugin {
+  int abiversion;
+  int has_exceptions;
+  void *handle;
+  void (*open)(int, char **, MPI_Comm, void **);
+  void (*open_no_mpi)(int, char **, void **);
+  void (*close)(void *);
+  int  (*version)(void *);
+  void (*file)(void *, char *);
+  char *(*command)(void *, char *);
+  void (*commands_list)(void *, int, char **);
+  void (*commands_string)(void *, char *);
+  void (*free)(void *);
+  int (*extract_setting)(void *, char *);
+  void *(*extract_global)(void *, char *);
+  void (*extract_box)(void *, double *, double *,
+		      double *, double *, double *, int *, int *);
+  void *(*extract_atom)(void *, char *);
+  void *(*extract_compute)(void *, char *, int, int);
+  void *(*extract_fix)(void *, char *, int, int, int, int);
+  void *(*extract_variable)(void *, char *, char *);
+
+  double (*get_thermo)(void *, char *);
+  int (*get_natoms)(void *);
+
+  int (*set_variable)(void *, char *, char *);
+  void (*reset_box)(void *, double *, double *, double, double, double);
+
+  void (*gather_atoms)(void *, char *, int, int, void *);
+  void (*gather_atoms_concat)(void *, char *, int, int, void *);
+  void (*gather_atoms_subset)(void *, char *, int, int, int, int *, void *);
+  void (*scatter_atoms)(void *, char *, int, int, void *);
+  void (*scatter_atoms_subset)(void *, char *, int, int, int, int *, void *);
+
+  void (*set_fix_external_callback)(void *, char *, FixExternalFnPtr, void*);
+
+  int (*config_has_package)(char * package_name);
+  int (*config_package_count)();
+  int (*config_package_name)(int index, char * buffer, int max_size);
+  int (*config_has_gzip_support)();
+  int (*config_has_png_support)();
+  int (*config_has_jpeg_support)();
+  int (*config_has_ffmpeg_support)();
+  int (*config_has_exceptions)();
+
+  int (*find_pair_neighlist)(void* ptr, char * style, int exact, int nsub, int request);
+  int (*find_fix_neighlist)(void* ptr, char * id, int request);
+  int (*find_compute_neighlist)(void* ptr, char * id, int request);
+  int (*neighlist_num_elements)(void* ptr, int idx);
+  void (*neighlist_element_neighbors)(void * ptr, int idx, int element, int * iatom, int * numneigh, int ** neighbors);
+
+// lammps_create_atoms() takes tagint and imageint as args
+// ifdef insures they are compatible with rest of LAMMPS
+// caller must match to how LAMMPS library is built
+
+#ifdef LAMMPS_BIGBIG
+  void (*create_atoms)(void *, int, int64_t *, int *,
+                         double *, double *, int64_t *, int);
+#else
+  void (*create_atoms)(void *, int, int *, int *,
+                         double *, double *, int *, int);
+#endif
+
+  int (*has_error)(void *);
+  int (*get_last_error_message)(void *, char *, int);
+};
+
+typedef struct _liblammpsplugin liblammpsplugin_t;
+
+liblammpsplugin_t *liblammpsplugin_load(const char *);
+int liblammpsplugin_release(liblammpsplugin_t *);
+  
+#undef LAMMPS
+#ifdef __cplusplus
+}
+#endif
+
+#endif
diff --git a/examples/COUPLE/plugin/log.simple.plugin.1 b/examples/COUPLE/plugin/log.simple.plugin.1
new file mode 100644
index 0000000000..ba4be378f4
--- /dev/null
+++ b/examples/COUPLE/plugin/log.simple.plugin.1
@@ -0,0 +1,294 @@
+LAMMPS (18 Feb 2020)
+Lattice spacing in x,y,z = 1.6796 1.6796 1.6796
+Created orthogonal box = (0 0 0) to (6.71838 6.71838 6.71838)
+  1 by 1 by 1 MPI processor grid
+Created 256 atoms
+  create_atoms CPU = 0.000297844 secs
+Neighbor list info ...
+  update every 20 steps, delay 0 steps, check no
+  max neighbors/atom: 2000, page size: 100000
+  master list distance cutoff = 2.8
+  ghost atom cutoff = 2.8
+  binsize = 1.4, bins = 5 5 5
+  1 neighbor lists, perpetual/occasional/extra = 1 0 0
+  (1) pair lj/cut, perpetual
+      attributes: half, newton on
+      pair build: half/bin/atomonly/newton
+      stencil: half/bin/3d/newton
+      bin: standard
+Setting up Verlet run ...
+  Unit style    : lj
+  Current step  : 0
+  Time step     : 0.005
+Per MPI rank memory allocation (min/avg/max) = 2.63 | 2.63 | 2.63 Mbytes
+Step Temp E_pair E_mol TotEng Press 
+       0         1.44   -6.7733681            0   -4.6218056   -5.0244179 
+      10    1.1298532   -6.3095502            0   -4.6213906   -2.6058175 
+Loop time of 0.00164276 on 1 procs for 10 steps with 256 atoms
+
+Performance: 2629719.113 tau/day, 6087.313 timesteps/s
+93.7% CPU use with 1 MPI tasks x no OpenMP threads
+
+MPI task timing breakdown:
+Section |  min time  |  avg time  |  max time  |%varavg| %total
+---------------------------------------------------------------
+Pair    | 0.0014956  | 0.0014956  | 0.0014956  |   0.0 | 91.04
+Neigh   | 0          | 0          | 0          |   0.0 |  0.00
+Comm    | 8.045e-05  | 8.045e-05  | 8.045e-05  |   0.0 |  4.90
+Output  | 1.1399e-05 | 1.1399e-05 | 1.1399e-05 |   0.0 |  0.69
+Modify  | 3.7431e-05 | 3.7431e-05 | 3.7431e-05 |   0.0 |  2.28
+Other   |            | 1.789e-05  |            |       |  1.09
+
+Nlocal:    256 ave 256 max 256 min
+Histogram: 1 0 0 0 0 0 0 0 0 0
+Nghost:    1431 ave 1431 max 1431 min
+Histogram: 1 0 0 0 0 0 0 0 0 0
+Neighs:    9984 ave 9984 max 9984 min
+Histogram: 1 0 0 0 0 0 0 0 0 0
+
+Total # of neighbors = 9984
+Ave neighs/atom = 39
+Neighbor list builds = 0
+Dangerous builds not checked
+Setting up Verlet run ...
+  Unit style    : lj
+  Current step  : 10
+  Time step     : 0.005
+Per MPI rank memory allocation (min/avg/max) = 2.63 | 2.63 | 2.63 Mbytes
+Step Temp E_pair E_mol TotEng Press 
+      10    1.1298532   -6.3095502            0   -4.6213906   -2.6058175 
+      20    0.6239063    -5.557644            0   -4.6254403   0.97451173 
+Loop time of 0.00199768 on 1 procs for 10 steps with 256 atoms
+
+Performance: 2162504.180 tau/day, 5005.797 timesteps/s
+99.8% CPU use with 1 MPI tasks x no OpenMP threads
+
+MPI task timing breakdown:
+Section |  min time  |  avg time  |  max time  |%varavg| %total
+---------------------------------------------------------------
+Pair    | 0.0018518  | 0.0018518  | 0.0018518  |   0.0 | 92.70
+Neigh   | 0          | 0          | 0          |   0.0 |  0.00
+Comm    | 7.9768e-05 | 7.9768e-05 | 7.9768e-05 |   0.0 |  3.99
+Output  | 1.1433e-05 | 1.1433e-05 | 1.1433e-05 |   0.0 |  0.57
+Modify  | 3.6904e-05 | 3.6904e-05 | 3.6904e-05 |   0.0 |  1.85
+Other   |            | 1.773e-05  |            |       |  0.89
+
+Nlocal:    256 ave 256 max 256 min
+Histogram: 1 0 0 0 0 0 0 0 0 0
+Nghost:    1431 ave 1431 max 1431 min
+Histogram: 1 0 0 0 0 0 0 0 0 0
+Neighs:    9952 ave 9952 max 9952 min
+Histogram: 1 0 0 0 0 0 0 0 0 0
+
+Total # of neighbors = 9952
+Ave neighs/atom = 38.875
+Neighbor list builds = 0
+Dangerous builds not checked
+Setting up Verlet run ...
+  Unit style    : lj
+  Current step  : 20
+  Time step     : 0.005
+Per MPI rank memory allocation (min/avg/max) = 2.63 | 2.63 | 2.63 Mbytes
+Step Temp E_pair E_mol TotEng Press 
+      20    0.6239063   -5.5404291            0   -4.6082254    1.0394285 
+      21   0.63845863   -5.5628733            0   -4.6089263   0.99398278 
+Loop time of 0.000304321 on 1 procs for 1 steps with 256 atoms
+
+Performance: 1419553.695 tau/day, 3286.004 timesteps/s
+98.9% CPU use with 1 MPI tasks x no OpenMP threads
+
+MPI task timing breakdown:
+Section |  min time  |  avg time  |  max time  |%varavg| %total
+---------------------------------------------------------------
+Pair    | 0.00027815 | 0.00027815 | 0.00027815 |   0.0 | 91.40
+Neigh   | 0          | 0          | 0          |   0.0 |  0.00
+Comm    | 8.321e-06  | 8.321e-06  | 8.321e-06  |   0.0 |  2.73
+Output  | 1.0513e-05 | 1.0513e-05 | 1.0513e-05 |   0.0 |  3.45
+Modify  | 3.968e-06  | 3.968e-06  | 3.968e-06  |   0.0 |  1.30
+Other   |            | 3.365e-06  |            |       |  1.11
+
+Nlocal:    256 ave 256 max 256 min
+Histogram: 1 0 0 0 0 0 0 0 0 0
+Nghost:    1431 ave 1431 max 1431 min
+Histogram: 1 0 0 0 0 0 0 0 0 0
+Neighs:    9705 ave 9705 max 9705 min
+Histogram: 1 0 0 0 0 0 0 0 0 0
+
+Total # of neighbors = 9705
+Ave neighs/atom = 37.9102
+Neighbor list builds = 0
+Dangerous builds not checked
+Force on 1 atom via extract_atom: 26.9581
+Force on 1 atom via extract_variable: 26.9581
+Setting up Verlet run ...
+  Unit style    : lj
+  Current step  : 21
+  Time step     : 0.005
+Per MPI rank memory allocation (min/avg/max) = 2.63 | 2.63 | 2.63 Mbytes
+Step Temp E_pair E_mol TotEng Press 
+      21   0.63845863   -5.5628733            0   -4.6089263   0.99398278 
+      31    0.7494946   -5.7306417            0   -4.6107913   0.41043597 
+Loop time of 0.00196027 on 1 procs for 10 steps with 256 atoms
+
+Performance: 2203779.175 tau/day, 5101.341 timesteps/s
+99.7% CPU use with 1 MPI tasks x no OpenMP threads
+
+MPI task timing breakdown:
+Section |  min time  |  avg time  |  max time  |%varavg| %total
+---------------------------------------------------------------
+Pair    | 0.0018146  | 0.0018146  | 0.0018146  |   0.0 | 92.57
+Neigh   | 0          | 0          | 0          |   0.0 |  0.00
+Comm    | 8.0268e-05 | 8.0268e-05 | 8.0268e-05 |   0.0 |  4.09
+Output  | 1.0973e-05 | 1.0973e-05 | 1.0973e-05 |   0.0 |  0.56
+Modify  | 3.6913e-05 | 3.6913e-05 | 3.6913e-05 |   0.0 |  1.88
+Other   |            | 1.756e-05  |            |       |  0.90
+
+Nlocal:    256 ave 256 max 256 min
+Histogram: 1 0 0 0 0 0 0 0 0 0
+Nghost:    1431 ave 1431 max 1431 min
+Histogram: 1 0 0 0 0 0 0 0 0 0
+Neighs:    9688 ave 9688 max 9688 min
+Histogram: 1 0 0 0 0 0 0 0 0 0
+
+Total # of neighbors = 9688
+Ave neighs/atom = 37.8438
+Neighbor list builds = 0
+Dangerous builds not checked
+Setting up Verlet run ...
+  Unit style    : lj
+  Current step  : 31
+  Time step     : 0.005
+Per MPI rank memory allocation (min/avg/max) = 2.63 | 2.63 | 2.63 Mbytes
+Step Temp E_pair E_mol TotEng Press 
+      31    0.7494946   -5.7306417            0   -4.6107913   0.41043597 
+      51   0.71349216   -5.6772387            0   -4.6111811   0.52117681 
+Loop time of 0.00433063 on 1 procs for 20 steps with 256 atoms
+
+Performance: 1995088.941 tau/day, 4618.261 timesteps/s
+99.3% CPU use with 1 MPI tasks x no OpenMP threads
+
+MPI task timing breakdown:
+Section |  min time  |  avg time  |  max time  |%varavg| %total
+---------------------------------------------------------------
+Pair    | 0.0035121  | 0.0035121  | 0.0035121  |   0.0 | 81.10
+Neigh   | 0.00050258 | 0.00050258 | 0.00050258 |   0.0 | 11.61
+Comm    | 0.00019444 | 0.00019444 | 0.00019444 |   0.0 |  4.49
+Output  | 1.2092e-05 | 1.2092e-05 | 1.2092e-05 |   0.0 |  0.28
+Modify  | 7.2917e-05 | 7.2917e-05 | 7.2917e-05 |   0.0 |  1.68
+Other   |            | 3.647e-05  |            |       |  0.84
+
+Nlocal:    256 ave 256 max 256 min
+Histogram: 1 0 0 0 0 0 0 0 0 0
+Nghost:    1421 ave 1421 max 1421 min
+Histogram: 1 0 0 0 0 0 0 0 0 0
+Neighs:    9700 ave 9700 max 9700 min
+Histogram: 1 0 0 0 0 0 0 0 0 0
+
+Total # of neighbors = 9700
+Ave neighs/atom = 37.8906
+Neighbor list builds = 1
+Dangerous builds not checked
+Setting up Verlet run ...
+  Unit style    : lj
+  Current step  : 51
+  Time step     : 0.005
+Per MPI rank memory allocation (min/avg/max) = 2.63 | 2.63 | 2.63 Mbytes
+Step Temp E_pair E_mol TotEng Press 
+      51   0.71349216   -5.6772387            0   -4.6111811   0.52117681 
+      61   0.78045421   -5.7781094            0   -4.6120011  0.093808941 
+Loop time of 0.00196567 on 1 procs for 10 steps with 256 atoms
+
+Performance: 2197727.285 tau/day, 5087.332 timesteps/s
+99.7% CPU use with 1 MPI tasks x no OpenMP threads
+
+MPI task timing breakdown:
+Section |  min time  |  avg time  |  max time  |%varavg| %total
+---------------------------------------------------------------
+Pair    | 0.0018222  | 0.0018222  | 0.0018222  |   0.0 | 92.70
+Neigh   | 0          | 0          | 0          |   0.0 |  0.00
+Comm    | 7.8285e-05 | 7.8285e-05 | 7.8285e-05 |   0.0 |  3.98
+Output  | 1.0862e-05 | 1.0862e-05 | 1.0862e-05 |   0.0 |  0.55
+Modify  | 3.6719e-05 | 3.6719e-05 | 3.6719e-05 |   0.0 |  1.87
+Other   |            | 1.764e-05  |            |       |  0.90
+
+Nlocal:    256 ave 256 max 256 min
+Histogram: 1 0 0 0 0 0 0 0 0 0
+Nghost:    1421 ave 1421 max 1421 min
+Histogram: 1 0 0 0 0 0 0 0 0 0
+Neighs:    9700 ave 9700 max 9700 min
+Histogram: 1 0 0 0 0 0 0 0 0 0
+
+Total # of neighbors = 9700
+Ave neighs/atom = 37.8906
+Neighbor list builds = 0
+Dangerous builds not checked
+Setting up Verlet run ...
+  Unit style    : lj
+  Current step  : 61
+  Time step     : 0.005
+Per MPI rank memory allocation (min/avg/max) = 2.63 | 2.63 | 2.63 Mbytes
+Step Temp E_pair E_mol TotEng Press 
+      61   0.78045421   -5.7781094            0   -4.6120011  0.093808941 
+      81   0.77743907   -5.7735004            0   -4.6118971  0.090822641 
+Loop time of 0.00430528 on 1 procs for 20 steps with 256 atoms
+
+Performance: 2006838.581 tau/day, 4645.460 timesteps/s
+99.8% CPU use with 1 MPI tasks x no OpenMP threads
+
+MPI task timing breakdown:
+Section |  min time  |  avg time  |  max time  |%varavg| %total
+---------------------------------------------------------------
+Pair    | 0.0034931  | 0.0034931  | 0.0034931  |   0.0 | 81.13
+Neigh   | 0.00050437 | 0.00050437 | 0.00050437 |   0.0 | 11.72
+Comm    | 0.0001868  | 0.0001868  | 0.0001868  |   0.0 |  4.34
+Output  | 1.1699e-05 | 1.1699e-05 | 1.1699e-05 |   0.0 |  0.27
+Modify  | 7.3308e-05 | 7.3308e-05 | 7.3308e-05 |   0.0 |  1.70
+Other   |            | 3.604e-05  |            |       |  0.84
+
+Nlocal:    256 ave 256 max 256 min
+Histogram: 1 0 0 0 0 0 0 0 0 0
+Nghost:    1405 ave 1405 max 1405 min
+Histogram: 1 0 0 0 0 0 0 0 0 0
+Neighs:    9701 ave 9701 max 9701 min
+Histogram: 1 0 0 0 0 0 0 0 0 0
+
+Total # of neighbors = 9701
+Ave neighs/atom = 37.8945
+Neighbor list builds = 1
+Dangerous builds not checked
+Deleted 256 atoms, new total = 0
+Setting up Verlet run ...
+  Unit style    : lj
+  Current step  : 81
+  Time step     : 0.005
+Per MPI rank memory allocation (min/avg/max) = 2.63 | 2.63 | 2.63 Mbytes
+Step Temp E_pair E_mol TotEng Press 
+      81    0.6239063   -5.5404291            0   -4.6082254    1.0394285 
+      91   0.75393007   -5.7375259            0   -4.6110484   0.39357367 
+Loop time of 0.00195843 on 1 procs for 10 steps with 256 atoms
+
+Performance: 2205851.941 tau/day, 5106.139 timesteps/s
+99.7% CPU use with 1 MPI tasks x no OpenMP threads
+
+MPI task timing breakdown:
+Section |  min time  |  avg time  |  max time  |%varavg| %total
+---------------------------------------------------------------
+Pair    | 0.0018143  | 0.0018143  | 0.0018143  |   0.0 | 92.64
+Neigh   | 0          | 0          | 0          |   0.0 |  0.00
+Comm    | 7.8608e-05 | 7.8608e-05 | 7.8608e-05 |   0.0 |  4.01
+Output  | 1.0786e-05 | 1.0786e-05 | 1.0786e-05 |   0.0 |  0.55
+Modify  | 3.7106e-05 | 3.7106e-05 | 3.7106e-05 |   0.0 |  1.89
+Other   |            | 1.762e-05  |            |       |  0.90
+
+Nlocal:    256 ave 256 max 256 min
+Histogram: 1 0 0 0 0 0 0 0 0 0
+Nghost:    1431 ave 1431 max 1431 min
+Histogram: 1 0 0 0 0 0 0 0 0 0
+Neighs:    9705 ave 9705 max 9705 min
+Histogram: 1 0 0 0 0 0 0 0 0 0
+
+Total # of neighbors = 9705
+Ave neighs/atom = 37.9102
+Neighbor list builds = 0
+Dangerous builds not checked
+Total wall time: 0:00:00
diff --git a/examples/COUPLE/plugin/log.simple.plugin.4 b/examples/COUPLE/plugin/log.simple.plugin.4
new file mode 100644
index 0000000000..d76719dd7c
--- /dev/null
+++ b/examples/COUPLE/plugin/log.simple.plugin.4
@@ -0,0 +1,296 @@
+LAMMPS (18 Feb 2020)
+Lattice spacing in x,y,z = 1.6796 1.6796 1.6796
+Created orthogonal box = (0 0 0) to (6.71838 6.71838 6.71838)
+  1 by 1 by 2 MPI processor grid
+Created 256 atoms
+  create_atoms CPU = 0.000265157 secs
+Neighbor list info ...
+  update every 20 steps, delay 0 steps, check no
+  max neighbors/atom: 2000, page size: 100000
+  master list distance cutoff = 2.8
+  ghost atom cutoff = 2.8
+  binsize = 1.4, bins = 5 5 5
+  1 neighbor lists, perpetual/occasional/extra = 1 0 0
+  (1) pair lj/cut, perpetual
+      attributes: half, newton on
+      pair build: half/bin/atomonly/newton
+      stencil: half/bin/3d/newton
+      bin: standard
+Setting up Verlet run ...
+  Unit style    : lj
+  Current step  : 0
+  Time step     : 0.005
+Per MPI rank memory allocation (min/avg/max) = 2.624 | 2.624 | 2.624 Mbytes
+Step Temp E_pair E_mol TotEng Press 
+       0         1.44   -6.7733681            0   -4.6218056   -5.0244179 
+      10    1.1298532   -6.3095502            0   -4.6213906   -2.6058175 
+Loop time of 0.00115264 on 2 procs for 10 steps with 256 atoms
+
+Performance: 3747912.946 tau/day, 8675.724 timesteps/s
+94.5% CPU use with 2 MPI tasks x no OpenMP threads
+
+MPI task timing breakdown:
+Section |  min time  |  avg time  |  max time  |%varavg| %total
+---------------------------------------------------------------
+Pair    | 0.00074885 | 0.00075021 | 0.00075156 |   0.0 | 65.09
+Neigh   | 0          | 0          | 0          |   0.0 |  0.00
+Comm    | 0.00031829 | 0.00031943 | 0.00032056 |   0.0 | 27.71
+Output  | 9.306e-06  | 2.6673e-05 | 4.4041e-05 |   0.0 |  2.31
+Modify  | 2.0684e-05 | 2.0891e-05 | 2.1098e-05 |   0.0 |  1.81
+Other   |            | 3.544e-05  |            |       |  3.07
+
+Nlocal:    128 ave 128 max 128 min
+Histogram: 2 0 0 0 0 0 0 0 0 0
+Nghost:    1109 ave 1109 max 1109 min
+Histogram: 2 0 0 0 0 0 0 0 0 0
+Neighs:    4992 ave 4992 max 4992 min
+Histogram: 2 0 0 0 0 0 0 0 0 0
+
+Total # of neighbors = 9984
+Ave neighs/atom = 39
+Neighbor list builds = 0
+Dangerous builds not checked
+Setting up Verlet run ...
+  Unit style    : lj
+  Current step  : 10
+  Time step     : 0.005
+Per MPI rank memory allocation (min/avg/max) = 2.624 | 2.624 | 2.624 Mbytes
+Step Temp E_pair E_mol TotEng Press 
+      10    1.1298532   -6.3095502            0   -4.6213906   -2.6058175 
+      20    0.6239063    -5.557644            0   -4.6254403   0.97451173 
+Loop time of 0.00120443 on 2 procs for 10 steps with 256 atoms
+
+Performance: 3586761.860 tau/day, 8302.689 timesteps/s
+95.5% CPU use with 2 MPI tasks x no OpenMP threads
+
+MPI task timing breakdown:
+Section |  min time  |  avg time  |  max time  |%varavg| %total
+---------------------------------------------------------------
+Pair    | 0.00087798 | 0.00091359 | 0.0009492  |   0.0 | 75.85
+Neigh   | 0          | 0          | 0          |   0.0 |  0.00
+Comm    | 0.00016739 | 0.00020368 | 0.00023997 |   0.0 | 16.91
+Output  | 1.0124e-05 | 3.0513e-05 | 5.0901e-05 |   0.0 |  2.53
+Modify  | 1.89e-05   | 1.9812e-05 | 2.0725e-05 |   0.0 |  1.64
+Other   |            | 3.683e-05  |            |       |  3.06
+
+Nlocal:    128 ave 134 max 122 min
+Histogram: 1 0 0 0 0 0 0 0 0 1
+Nghost:    1109 ave 1115 max 1103 min
+Histogram: 1 0 0 0 0 0 0 0 0 1
+Neighs:    4976 ave 5205 max 4747 min
+Histogram: 1 0 0 0 0 0 0 0 0 1
+
+Total # of neighbors = 9952
+Ave neighs/atom = 38.875
+Neighbor list builds = 0
+Dangerous builds not checked
+Setting up Verlet run ...
+  Unit style    : lj
+  Current step  : 20
+  Time step     : 0.005
+Per MPI rank memory allocation (min/avg/max) = 2.624 | 2.624 | 2.624 Mbytes
+Step Temp E_pair E_mol TotEng Press 
+      20    0.6239063   -5.5404291            0   -4.6082254    1.0394285 
+      21   0.63845863   -5.5628733            0   -4.6089263   0.99398278 
+Loop time of 0.000206062 on 2 procs for 1 steps with 256 atoms
+
+Performance: 2096456.406 tau/day, 4852.908 timesteps/s
+94.1% CPU use with 2 MPI tasks x no OpenMP threads
+
+MPI task timing breakdown:
+Section |  min time  |  avg time  |  max time  |%varavg| %total
+---------------------------------------------------------------
+Pair    | 0.00012947 | 0.00013524 | 0.00014101 |   0.0 | 65.63
+Neigh   | 0          | 0          | 0          |   0.0 |  0.00
+Comm    | 1.858e-05  | 2.4113e-05 | 2.9647e-05 |   0.0 | 11.70
+Output  | 8.699e-06  | 2.4204e-05 | 3.9708e-05 |   0.0 | 11.75
+Modify  | 2.34e-06   | 2.3705e-06 | 2.401e-06  |   0.0 |  1.15
+Other   |            | 2.013e-05  |            |       |  9.77
+
+Nlocal:    128 ave 135 max 121 min
+Histogram: 1 0 0 0 0 0 0 0 0 1
+Nghost:    1109 ave 1116 max 1102 min
+Histogram: 1 0 0 0 0 0 0 0 0 1
+Neighs:    4852.5 ave 5106 max 4599 min
+Histogram: 1 0 0 0 0 0 0 0 0 1
+
+Total # of neighbors = 9705
+Ave neighs/atom = 37.9102
+Force on 1 atom via extract_atom: -18.109
+Force on 1 atom via extract_variable: -18.109
+Neighbor list builds = 0
+Dangerous builds not checked
+Force on 1 atom via extract_atom: 26.9581
+Force on 1 atom via extract_variable: 26.9581
+Setting up Verlet run ...
+  Unit style    : lj
+  Current step  : 21
+  Time step     : 0.005
+Per MPI rank memory allocation (min/avg/max) = 2.624 | 2.624 | 2.624 Mbytes
+Step Temp E_pair E_mol TotEng Press 
+      21   0.63845863   -5.5628733            0   -4.6089263   0.99398278 
+      31    0.7494946   -5.7306417            0   -4.6107913   0.41043597 
+Loop time of 0.00119048 on 2 procs for 10 steps with 256 atoms
+
+Performance: 3628802.105 tau/day, 8400.005 timesteps/s
+98.0% CPU use with 2 MPI tasks x no OpenMP threads
+
+MPI task timing breakdown:
+Section |  min time  |  avg time  |  max time  |%varavg| %total
+---------------------------------------------------------------
+Pair    | 0.00085276 | 0.00089699 | 0.00094123 |   0.0 | 75.35
+Neigh   | 0          | 0          | 0          |   0.0 |  0.00
+Comm    | 0.00016896 | 0.00021444 | 0.00025992 |   0.0 | 18.01
+Output  | 9.413e-06  | 2.5939e-05 | 4.2465e-05 |   0.0 |  2.18
+Modify  | 1.8977e-05 | 2.0009e-05 | 2.1042e-05 |   0.0 |  1.68
+Other   |            | 3.31e-05   |            |       |  2.78
+
+Nlocal:    128 ave 135 max 121 min
+Histogram: 1 0 0 0 0 0 0 0 0 1
+Nghost:    1109 ave 1116 max 1102 min
+Histogram: 1 0 0 0 0 0 0 0 0 1
+Neighs:    4844 ave 5096 max 4592 min
+Histogram: 1 0 0 0 0 0 0 0 0 1
+
+Total # of neighbors = 9688
+Ave neighs/atom = 37.8438
+Neighbor list builds = 0
+Dangerous builds not checked
+Setting up Verlet run ...
+  Unit style    : lj
+  Current step  : 31
+  Time step     : 0.005
+Per MPI rank memory allocation (min/avg/max) = 2.624 | 2.624 | 2.624 Mbytes
+Step Temp E_pair E_mol TotEng Press 
+      31    0.7494946   -5.7306417            0   -4.6107913   0.41043597 
+      51   0.71349216   -5.6772387            0   -4.6111811   0.52117681 
+Loop time of 0.00252603 on 2 procs for 20 steps with 256 atoms
+
+Performance: 3420382.192 tau/day, 7917.551 timesteps/s
+99.2% CPU use with 2 MPI tasks x no OpenMP threads
+
+MPI task timing breakdown:
+Section |  min time  |  avg time  |  max time  |%varavg| %total
+---------------------------------------------------------------
+Pair    | 0.0016245  | 0.0017014  | 0.0017784  |   0.2 | 67.36
+Neigh   | 0.00025359 | 0.0002563  | 0.00025901 |   0.0 | 10.15
+Comm    | 0.00036863 | 0.00045124 | 0.00053385 |   0.0 | 17.86
+Output  | 9.839e-06  | 2.8031e-05 | 4.6223e-05 |   0.0 |  1.11
+Modify  | 3.7027e-05 | 3.9545e-05 | 4.2063e-05 |   0.0 |  1.57
+Other   |            | 4.948e-05  |            |       |  1.96
+
+Nlocal:    128 ave 132 max 124 min
+Histogram: 1 0 0 0 0 0 0 0 0 1
+Nghost:    1100 ave 1101 max 1099 min
+Histogram: 1 0 0 0 0 0 0 0 0 1
+Neighs:    4850 ave 4953 max 4747 min
+Histogram: 1 0 0 0 0 0 0 0 0 1
+
+Total # of neighbors = 9700
+Ave neighs/atom = 37.8906
+Neighbor list builds = 1
+Dangerous builds not checked
+Setting up Verlet run ...
+  Unit style    : lj
+  Current step  : 51
+  Time step     : 0.005
+Per MPI rank memory allocation (min/avg/max) = 2.624 | 2.624 | 2.624 Mbytes
+Step Temp E_pair E_mol TotEng Press 
+      51   0.71349216   -5.6772387            0   -4.6111811   0.52117681 
+      61   0.78045421   -5.7781094            0   -4.6120011  0.093808941 
+Loop time of 0.00115444 on 2 procs for 10 steps with 256 atoms
+
+Performance: 3742065.976 tau/day, 8662.190 timesteps/s
+96.5% CPU use with 2 MPI tasks x no OpenMP threads
+
+MPI task timing breakdown:
+Section |  min time  |  avg time  |  max time  |%varavg| %total
+---------------------------------------------------------------
+Pair    | 0.00087346 | 0.00089311 | 0.00091275 |   0.0 | 77.36
+Neigh   | 0          | 0          | 0          |   0.0 |  0.00
+Comm    | 0.00016192 | 0.0001823  | 0.00020269 |   0.0 | 15.79
+Output  | 9.49e-06   | 2.6234e-05 | 4.2978e-05 |   0.0 |  2.27
+Modify  | 1.9095e-05 | 1.9843e-05 | 2.0591e-05 |   0.0 |  1.72
+Other   |            | 3.296e-05  |            |       |  2.85
+
+Nlocal:    128 ave 132 max 124 min
+Histogram: 1 0 0 0 0 0 0 0 0 1
+Nghost:    1100 ave 1101 max 1099 min
+Histogram: 1 0 0 0 0 0 0 0 0 1
+Neighs:    4850 ave 4953 max 4747 min
+Histogram: 1 0 0 0 0 0 0 0 0 1
+
+Total # of neighbors = 9700
+Ave neighs/atom = 37.8906
+Neighbor list builds = 0
+Dangerous builds not checked
+Setting up Verlet run ...
+  Unit style    : lj
+  Current step  : 61
+  Time step     : 0.005
+Per MPI rank memory allocation (min/avg/max) = 2.624 | 2.624 | 2.624 Mbytes
+Step Temp E_pair E_mol TotEng Press 
+      61   0.78045421   -5.7781094            0   -4.6120011  0.093808941 
+      81   0.77743907   -5.7735004            0   -4.6118971  0.090822641 
+Loop time of 0.00244325 on 2 procs for 20 steps with 256 atoms
+
+Performance: 3536279.919 tau/day, 8185.833 timesteps/s
+99.0% CPU use with 2 MPI tasks x no OpenMP threads
+
+MPI task timing breakdown:
+Section |  min time  |  avg time  |  max time  |%varavg| %total
+---------------------------------------------------------------
+Pair    | 0.0016916  | 0.0017038  | 0.001716   |   0.0 | 69.73
+Neigh   | 0.00025229 | 0.00025512 | 0.00025795 |   0.0 | 10.44
+Comm    | 0.00035772 | 0.00036918 | 0.00038064 |   0.0 | 15.11
+Output  | 1.0858e-05 | 2.7875e-05 | 4.4891e-05 |   0.0 |  1.14
+Modify  | 3.817e-05  | 3.9325e-05 | 4.048e-05  |   0.0 |  1.61
+Other   |            | 4.796e-05  |            |       |  1.96
+
+Nlocal:    128 ave 128 max 128 min
+Histogram: 2 0 0 0 0 0 0 0 0 0
+Nghost:    1088.5 ave 1092 max 1085 min
+Histogram: 1 0 0 0 0 0 0 0 0 1
+Neighs:    4850.5 ave 4851 max 4850 min
+Histogram: 1 0 0 0 0 0 0 0 0 1
+
+Total # of neighbors = 9701
+Ave neighs/atom = 37.8945
+Neighbor list builds = 1
+Dangerous builds not checked
+Deleted 256 atoms, new total = 0
+Setting up Verlet run ...
+  Unit style    : lj
+  Current step  : 81
+  Time step     : 0.005
+Per MPI rank memory allocation (min/avg/max) = 2.624 | 2.624 | 2.624 Mbytes
+Step Temp E_pair E_mol TotEng Press 
+      81    0.6239063   -5.5404291            0   -4.6082254    1.0394285 
+      91   0.75393007   -5.7375259            0   -4.6110484   0.39357367 
+Loop time of 0.00118092 on 2 procs for 10 steps with 256 atoms
+
+Performance: 3658158.625 tau/day, 8467.960 timesteps/s
+98.6% CPU use with 2 MPI tasks x no OpenMP threads
+
+MPI task timing breakdown:
+Section |  min time  |  avg time  |  max time  |%varavg| %total
+---------------------------------------------------------------
+Pair    | 0.0008476  | 0.00089265 | 0.00093771 |   0.0 | 75.59
+Neigh   | 0          | 0          | 0          |   0.0 |  0.00
+Comm    | 0.00016335 | 0.00020946 | 0.00025557 |   0.0 | 17.74
+Output  | 8.87e-06   | 2.5733e-05 | 4.2595e-05 |   0.0 |  2.18
+Modify  | 1.8755e-05 | 1.9814e-05 | 2.0872e-05 |   0.0 |  1.68
+Other   |            | 3.326e-05  |            |       |  2.82
+
+Nlocal:    128 ave 135 max 121 min
+Histogram: 1 0 0 0 0 0 0 0 0 1
+Nghost:    1109 ave 1116 max 1102 min
+Histogram: 1 0 0 0 0 0 0 0 0 1
+Neighs:    4852.5 ave 5106 max 4599 min
+Histogram: 1 0 0 0 0 0 0 0 0 1
+
+Total # of neighbors = 9705
+Ave neighs/atom = 37.9102
+Neighbor list builds = 0
+Dangerous builds not checked
+Total wall time: 0:00:00
diff --git a/examples/COUPLE/plugin/simple.c b/examples/COUPLE/plugin/simple.c
new file mode 100644
index 0000000000..541e4fd432
--- /dev/null
+++ b/examples/COUPLE/plugin/simple.c
@@ -0,0 +1,175 @@
+/* ----------------------------------------------------------------------
+   LAMMPS - Large-scale Atomic/Molecular Massively Parallel Simulator
+   www.cs.sandia.gov/~sjplimp/lammps.html
+   Steve Plimpton, sjplimp@sandia.gov, Sandia National Laboratories
+
+   Copyright (2003) Sandia Corporation.  Under the terms of Contract
+   DE-AC04-94AL85000 with Sandia Corporation, the U.S. Government retains
+   certain rights in this software.  This software is distributed under 
+   the GNU General Public License.
+
+   See the README file in the top-level LAMMPS directory.
+------------------------------------------------------------------------- */
+
+/* c_driver = simple example of how an umbrella program
+              can invoke LAMMPS as a library on some subset of procs
+   Syntax: simpleC P in.lammps
+           P = # of procs to run LAMMPS on
+               must be <= # of procs the driver code itself runs on
+           in.lammps = LAMMPS input script
+   See README for compilation instructions */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <mpi.h>
+#include "liblammpsplugin.h"  /* this is the include for the plugin loader */
+
+int main(int narg, char **arg)
+{
+  int n,me,nprocs;
+  int nprocs_lammps, lammps;
+  char line[1024];
+  MPI_Comm comm_lammps;
+  FILE *fp = NULL;
+  liblammpsplugin_t *plugin = NULL;
+  void *lmp = NULL;
+  double *x = NULL;
+  double *v = NULL;
+  char *strtwo;
+  char *cmds[2];
+  int *type = NULL;
+
+  /* setup MPI and various communicators
+     driver runs on all procs in MPI_COMM_WORLD
+     comm_lammps only has 1st P procs (could be all or any subset) */
+
+  MPI_Init(&narg,&arg);
+
+  if (narg != 4) {
+    printf("Syntax: simpleC P in.lammps /path/to/liblammps.so\n");
+    exit(1);
+  }
+
+  MPI_Comm_rank(MPI_COMM_WORLD,&me);
+  MPI_Comm_size(MPI_COMM_WORLD,&nprocs);
+
+  nprocs_lammps = atoi(arg[1]);
+  if (nprocs_lammps > nprocs) {
+    if (me == 0)
+      printf("ERROR: LAMMPS cannot use more procs than available\n");
+    MPI_Abort(MPI_COMM_WORLD,1);
+  }
+
+  if (me < nprocs_lammps) lammps = 1;
+  else lammps = MPI_UNDEFINED;
+  MPI_Comm_split(MPI_COMM_WORLD,lammps,0,&comm_lammps);
+
+  /* open LAMMPS input script */
+
+  if (me == 0) {
+    fp = fopen(arg[2],"r");
+    if (fp == NULL) {
+      printf("ERROR: Could not open LAMMPS input script\n");
+      MPI_Abort(MPI_COMM_WORLD,1);
+    }
+  }
+
+  /* run the input script thru LAMMPS one line at a time until end-of-file
+     driver proc 0 reads a line, Bcasts it to all procs
+     (could just send it to proc 0 of comm_lammps and let it Bcast)
+     all LAMMPS procs call lammps_command() on the line */
+
+  if (lammps == 1) {
+    plugin = liblammpsplugin_load(arg[3]);
+    if (plugin == NULL) {
+      if (me == 0) printf("ERROR: Could not load shared LAMMPS library\n");
+      MPI_Abort(MPI_COMM_WORLD,1);
+    }
+  }
+  if (lammps == 1) plugin->open(0,NULL,comm_lammps,&lmp);
+
+  while (1) {
+    if (me == 0) {
+      if (fgets(line,1024,fp) == NULL) n = 0;
+      else n = strlen(line) + 1;
+      if (n == 0) fclose(fp);
+    }
+    MPI_Bcast(&n,1,MPI_INT,0,MPI_COMM_WORLD);
+    if (n == 0) break;
+    MPI_Bcast(line,n,MPI_CHAR,0,MPI_COMM_WORLD);
+    if (lammps == 1) plugin->command(lmp,line);
+  }
+
+  /* run 10 more steps
+     get coords from LAMMPS
+     change coords of 1st atom
+     put coords back into LAMMPS
+     run a single step with changed coords */
+
+  if (lammps == 1) {
+    plugin->command(lmp,"run 10");
+
+    int natoms = plugin->get_natoms(lmp);
+    x = (double *) malloc(3*natoms*sizeof(double));
+    plugin->gather_atoms(lmp,"x",1,3,x);
+    v = (double *) malloc(3*natoms*sizeof(double));
+    plugin->gather_atoms(lmp,"v",1,3,v);
+    double epsilon = 0.1;
+    x[0] += epsilon;
+    plugin->scatter_atoms(lmp,"x",1,3,x);
+
+    plugin->command(lmp,"run 1");
+  }
+
+  // extract force on single atom two different ways
+
+  if (lammps == 1) {
+    double **f = (double **) plugin->extract_atom(lmp,"f");
+    printf("Force on 1 atom via extract_atom: %g\n",f[0][0]);
+
+    double *fx = (double *) plugin->extract_variable(lmp,"fx","all");
+    printf("Force on 1 atom via extract_variable: %g\n",fx[0]);
+  }
+
+  /* use commands_string() and commands_list() to invoke more commands */
+
+  strtwo = (char *)"run 10\nrun 20";
+  if (lammps == 1) plugin->commands_string(lmp,strtwo);
+
+  cmds[0] = (char *)"run 10";
+  cmds[1] = (char *)"run 20";
+  if (lammps == 1) plugin->commands_list(lmp,2,cmds);
+
+  /* delete all atoms
+     create_atoms() to create new ones with old coords, vels
+     initial thermo should be same as step 20 */
+
+  if (lammps == 1) {
+    int natoms = plugin->get_natoms(lmp);
+    type = (int *) malloc(natoms*sizeof(double));
+    int i;
+    for (i = 0; i < natoms; i++) type[i] = 1;
+
+    plugin->command(lmp,"delete_atoms group all");
+    plugin->create_atoms(lmp,natoms,NULL,type,x,v,NULL,0);
+    plugin->command(lmp,"run 10");
+  }
+
+  if (x) free(x);
+  if (v) free(v);
+  if (type) free(type);
+
+  // close down LAMMPS
+
+  if (lammps == 1) {
+    plugin->close(lmp);
+    liblammpsplugin_release(plugin);
+  }
+
+  /* close down MPI */
+
+  if (lammps == 1) MPI_Comm_free(&comm_lammps);
+  MPI_Barrier(MPI_COMM_WORLD);
+  MPI_Finalize();
+}
diff --git a/examples/HEAT/README b/examples/HEAT/README
index 89ad04398f..ff6abb8dd6 100644
--- a/examples/HEAT/README
+++ b/examples/HEAT/README
@@ -6,7 +6,7 @@ All input scripts are part of the supplementary (open access) material
 supporting the publication of Wirnsberger et al. [J. Chem. Phys. 143,
 124104 (2015)] and allow one to reproduce the key results reported in
 that paper. The full article is available for download under
-http://dx.doi.org/10.1063/1.4931597 or http://arxiv.org/pdf/1507.07081
+https://doi.org/10.1063/1.4931597 or http://arxiv.org/pdf/1507.07081
 and the supplementary material is available under
 https://www.repository.cam.ac.uk/handle/1810/250539.
 
diff --git a/examples/README b/examples/README
index 996176c548..dbb9623e3f 100644
--- a/examples/README
+++ b/examples/README
@@ -93,6 +93,7 @@ msst:     MSST shock dynamics
 nb3b:     use of nonbonded 3-body harmonic pair style
 neb:      nudged elastic band (NEB) calculation for barrier finding
 nemd:     non-equilibrium MD of 2d sheared system
+numdiff: numerical difference computation of forces
 obstacle: flow around two voids in a 2d channel
 peptide:  dynamics of a small solvated peptide chain (5-mer)
 peri:     Peridynamic model of cylinder impacted by indenter
diff --git a/examples/UNITS/README b/examples/UNITS/README
index 3980b38688..7271e5d62b 100644
--- a/examples/UNITS/README
+++ b/examples/UNITS/README
@@ -27,7 +27,7 @@ The real and metal scripts each have a set of variables at the top
 which define scale factors for converting quantities like distance,
 energy, pressure from reduced LJ units to real or metal units.  Once
 these are defined the rest of the input script is very similar to the
-LJ script.  The approprate scale factor is applied to every input.
+LJ script.  The appropriate scale factor is applied to every input.
 Output quantities are printed in both the native real/metal units and
 unscaled back to LJ units.  So that you can see the outputs are the
 same if you examine the log files.  Comments about this comparison
@@ -49,6 +49,6 @@ identical input script in an alternate set of units.  Where
 "identical" means it runs the same simulation in a statistical sense.
 
 You can find the full set of scale factors LAMMPS uses internally for
-different unit systems it supports, at the top of the src/udpate.cpp
+different unit systems it supports, at the top of the src/update.cpp
 file.  A couple of those values are used in the real and metal
 scripts.
diff --git a/examples/USER/atc/README b/examples/USER/atc/README
index aa874f3300..73996edb9a 100644
--- a/examples/USER/atc/README
+++ b/examples/USER/atc/README
@@ -68,7 +68,7 @@ elastic:
     in.cnt_electrostatic2 - Mechanical response of CNT with self-consistent charge density and electric field
     in.cnt_fixed_charge - Mechancial response of CNT with fixed atomic charges in an electric field
     in.eam_energy - Quasi-static/quasi-1D coupling and transfer extraction of energy density for EAM gold
-    in.electron_density - Mechanical response of differnt CNT models with a self-consistent electron density and electric field
+    in.electron_density - Mechanical response of different CNT models with a self-consistent electron density and electric field
     in.electrostatic_bending_dos - Quasi-static bending of a CNT using a quantum density of states model for electron density
     in.no_atoms - FE solution of a box subject to an initial displacement condition
     in.no_atoms_cb - FE solution of a box subject to an initial displacement condition with a Cauchy-Born material model
@@ -149,7 +149,7 @@ elastic:
     in.cnt_electrostatic2 - Mechanical response of CNT with self-consistent charge density and electric field
     in.cnt_fixed_charge - Mechancial response of CNT with fixed atomic charges in an electric field
     in.eam_energy - Quasi-static/quasi-1D coupling and transfer extraction of energy density for EAM gold
-    in.electron_density - Mechanical response of differnt CNT models with a self-consistent electron density and electric field
+    in.electron_density - Mechanical response of different CNT models with a self-consistent electron density and electric field
     in.electrostatic_bending_dos - Quasi-static bending of a CNT using a quantum density of states model for electron density
     in.no_atoms - FE solution of a box subject to an initial displacement condition
     in.no_atoms_cb - FE solution of a box subject to an initial displacement condition with a Cauchy-Born material model
diff --git a/examples/USER/atc/fluids/in.bar1d_fluids b/examples/USER/atc/fluids/in.bar1d_fluids
index af152bfbab..79a6c8a4c2 100644
--- a/examples/USER/atc/fluids/in.bar1d_fluids
+++ b/examples/USER/atc/fluids/in.bar1d_fluids
@@ -85,7 +85,7 @@ fix_modify	AtC control localized_lambda on
 fix_modify      AtC  filter type exponential
 fix_modify      AtC  filter scale 1000.0
 fix_modify      AtC  filter on
-# ouput commands
+# output commands
 fix_modify      AtC  output bar1d_fluidsFE 100 text
 #undump          D1
 #dump		D2 all atom 200 dump.bar1d
diff --git a/examples/USER/atc/fluids/in.conducting_interface b/examples/USER/atc/fluids/in.conducting_interface
index 7ee906e45a..c534231fca 100644
--- a/examples/USER/atc/fluids/in.conducting_interface
+++ b/examples/USER/atc/fluids/in.conducting_interface
@@ -1,6 +1,6 @@
 # simulation of negatively charge liquid argon-positively charged solid/frozen argon
 # MAKE this conducting_interface then interface (major difference: non-uniform grid)
-# START with extrinsic charges on both and then use an instrinsic charge density for frozen
+# START with extrinsic charges on both and then use an intrinsic charge density for frozen
 echo both
 units     	real
 atom_style full
diff --git a/examples/USER/atc/fluids/in.dielectric_interface b/examples/USER/atc/fluids/in.dielectric_interface
index e9cbe7882a..dd6034a0cc 100644
--- a/examples/USER/atc/fluids/in.dielectric_interface
+++ b/examples/USER/atc/fluids/in.dielectric_interface
@@ -1,6 +1,6 @@
 # simulation of negatively charge liquid argon-positively charged solid/frozen argon
 # MAKE this dielectric_interface then interface (major difference: non-uniform grid)
-# START with extrinsic charges on both and then use an instrinsic charge density for frozen
+# START with extrinsic charges on both and then use an intrinsic charge density for frozen
 echo both
 units     	real
 atom_style full
diff --git a/examples/USER/atc/fluids/in.shear_flow b/examples/USER/atc/fluids/in.shear_flow
index c5a53b1273..3c06676c64 100644
--- a/examples/USER/atc/fluids/in.shear_flow
+++ b/examples/USER/atc/fluids/in.shear_flow
@@ -75,7 +75,7 @@ fix_modify	AtC control localized_lambda on
 #fix_modify      AtC  filter scale 1000.0
 #fix_modify      AtC  filter on
 
-# ouput commands
+# output commands
 fix_modify      AtC  output shear_flowFE 100 text #binary
 #undump          D1
 #dump		D1 all custom 100 shear_flow.dmp id type xs ys zs vx vy vz
diff --git a/examples/USER/atc/fluids/in.shear_no_atoms b/examples/USER/atc/fluids/in.shear_no_atoms
index 8bd350f06c..6c778578c9 100644
--- a/examples/USER/atc/fluids/in.shear_no_atoms
+++ b/examples/USER/atc/fluids/in.shear_no_atoms
@@ -25,7 +25,7 @@ fix_modify      AtC  reset_time
 fix_modify      AtC  fix velocity y rbc 0.1
 fix_modify	AtC fix velocity y lbc 0.
 
-# ouput commands
+# output commands
 fix_modify      AtC  output shear_no_atomsFE 200 text binary
 # set-up non-equilibrium IC
 thermo          100
diff --git a/examples/USER/atc/thermal/bar1d.screen b/examples/USER/atc/thermal/bar1d.screen
index 33f6590e4d..3c7f8db212 100644
--- a/examples/USER/atc/thermal/bar1d.screen
+++ b/examples/USER/atc/thermal/bar1d.screen
@@ -239,7 +239,7 @@ fix_modify      AtC  output bar1dFE 100 text binary
  ATC: Warning : text output can create _LARGE_ files
  ATC: output custom names:
 
-# ouput command
+# output command
 #dump            D1 all atom 1000 dump.bar1d
 # run with FE
 reset_timestep 0
diff --git a/examples/USER/atc/thermal/in.bar1d b/examples/USER/atc/thermal/in.bar1d
index 5591f7177d..3f70577ec3 100644
--- a/examples/USER/atc/thermal/in.bar1d
+++ b/examples/USER/atc/thermal/in.bar1d
@@ -71,7 +71,7 @@ thermo		1
 run		100
 # set up output, should be before a "run"
 fix_modify      AtC  output bar1dFE 100 text binary
-# ouput command
+# output command
 #dump            D1 all atom 1000 dump.bar1d
 # run with FE
 reset_timestep 0
diff --git a/examples/USER/atc/thermal/in.bar1d_all_atoms b/examples/USER/atc/thermal/in.bar1d_all_atoms
index 2c8851137f..2219b803ec 100644
--- a/examples/USER/atc/thermal/in.bar1d_all_atoms
+++ b/examples/USER/atc/thermal/in.bar1d_all_atoms
@@ -93,7 +93,7 @@ fix_modify	AtC  fix_flux temperature lbndy  0.0000000001
 fix_modify      AtC  fix_flux temperature rbndy -0.0000000001
 # set up output, should be before a "run"
 fix_modify      AtC  output bar1d_all_atomsFE 200 text binary
-# ouput command
+# output command
 #dump            D1 all atom 1000 dump.bar1d
 # run with FE
 reset_timestep 	0
diff --git a/examples/USER/atc/thermal/in.bar1d_combined b/examples/USER/atc/thermal/in.bar1d_combined
index 767544d2d4..70dafe72be 100644
--- a/examples/USER/atc/thermal/in.bar1d_combined
+++ b/examples/USER/atc/thermal/in.bar1d_combined
@@ -79,7 +79,7 @@ thermo		100
 
 # set up output, should be before a "run"
 fix_modify      AtC  output bar1d_combinedFE 100 text
-# ouput command
+# output command
 #dump            D1 all atom 100 dump.bar1d_combined
 # run with FE
 reset_timestep 0
diff --git a/examples/USER/atc/thermal/in.bar1d_flux b/examples/USER/atc/thermal/in.bar1d_flux
index eae32ec5b2..2b79aa6339 100644
--- a/examples/USER/atc/thermal/in.bar1d_flux
+++ b/examples/USER/atc/thermal/in.bar1d_flux
@@ -71,7 +71,7 @@ fix_modify      AtC  fix temperature rbc 20.
 run		100
 # set up output, should be before a "run"
 fix_modify      AtC  output bar1d_fluxFE 100 text binary
-# ouput command
+# output command
 #dump            D1 all atom 1000 dump.bar1d
 # run with FE
 reset_timestep 0
diff --git a/examples/USER/atc/thermal/in.bar1d_frac_step b/examples/USER/atc/thermal/in.bar1d_frac_step
index eddec44b52..e8540d9151 100644
--- a/examples/USER/atc/thermal/in.bar1d_frac_step
+++ b/examples/USER/atc/thermal/in.bar1d_frac_step
@@ -72,7 +72,7 @@ fix_modify      AtC  filter scale 1000.0
 fix_modify      AtC  filter on
 # set up output, should be before a "run"
 fix_modify      AtC  output bar1d_frac_stepFE 200 text
-# ouput command
+# output command
 #dump            D1 all atom 1000 dump.bar1d
 # run with FE
 reset_timestep 0
diff --git a/examples/USER/cgdna/README b/examples/USER/cgdna/README
index 49b7cd1f84..a403ce0321 100644
--- a/examples/USER/cgdna/README
+++ b/examples/USER/cgdna/README
@@ -46,7 +46,7 @@ moment of inertia set to the value used in the standalone implementation
 of oxDNA (M = I = 1). The masses can be set directly in the input and 
 data file, whereas the moment of inertia is set via the diameter of the 
 ellipsoid in the data file and has a value of 3.16227766.
-The change of mass and moment of inertia allows direct comparision of 
+The change of mass and moment of inertia allows direct comparison of
 trajectory data or time-dependent observables on a per-timestep basis. 
 
 As mentioned above, the stacking and hydrogen-bonding interactions 
diff --git a/examples/USER/cgdna/examples/oxDNA2/unique_bp/generate_unique.py b/examples/USER/cgdna/examples/oxDNA2/unique_bp/generate_unique.py
index e5141bc47a..131f51e9b4 100644
--- a/examples/USER/cgdna/examples/oxDNA2/unique_bp/generate_unique.py
+++ b/examples/USER/cgdna/examples/oxDNA2/unique_bp/generate_unique.py
@@ -105,7 +105,7 @@ EXCL_RC2 =  0.335388426126
 EXCL_RC3 =  0.52329943261
 
 """
-Define auxillary variables for the construction of a helix
+Define auxiliary variables for the construction of a helix
 """
 # center of the double strand
 COM_CENTRE_DS = POS_BASE + 0.2
@@ -127,7 +127,7 @@ number_to_base = {1 : 'A', 2 : 'C', 3 : 'G', 4 : 'T'}
 base_to_number = {'A' : 1, 'a' : 1, 'C' : 2, 'c' : 2,
                   'G' : 3, 'g' : 3, 'T' : 4, 't' : 4}
 
-# auxillary arrays
+# auxiliary arrays
 positions = []
 a1s = []
 a3s = []
@@ -373,7 +373,7 @@ def generate_strand(bp, sequence=None, start_pos=np.array([0, 0, 0]), \
     # if not provided switch off random orientation
     if perp is None or perp is False:
         v1 = np.random.random_sample(3)
-        # comment in to suppress randomised base vector
+        # comment in to suppress randomized base vector
         v1 = [1,0,0]
         v1 -= dir * (np.dot(dir, v1))
         v1 /= np.sqrt(sum(v1*v1))
@@ -551,7 +551,7 @@ def read_strands(filename):
                 smallest_n_bases = n_g
              
             if smallest_n_bases < N_BASE_TYPES:
-                print('## Not enough occurances of base types in the sequence for ' + str(N_BASE_TYPES))
+                print('## Not enough occurrences of base types in the sequence for ' + str(N_BASE_TYPES))
                 print('## unique base types, switching to ' + str(smallest_n_bases) + ' unique types')
             else:
                 smallest_n_bases = N_BASE_TYPES
@@ -644,12 +644,12 @@ def read_strands(filename):
 
             # generate random position of the first nucleotide
             com = box_offset + np.random.random_sample(3) * box
-            # comment out to randomise
+            # comment out to randomize
             com = [0,0,0]
 
             # generate the random direction of the helix 
             axis = np.random.random_sample(3)
-            # comment out to randomise
+            # comment out to randomize
             axis = [0,0,1]
             axis /= np.sqrt(np.dot(axis, axis))
 
@@ -702,12 +702,12 @@ def read_strands(filename):
 
 	    # generate random position of the first nucleotide
             com = box_offset + np.random.random_sample(3) * box
-            # comment out to randomise
+            # comment out to randomize
             com = [-30,0,0]
 
             # generate the random direction of the helix 
             axis = np.random.random_sample(3)
-            # comment out to randomise
+            # comment out to randomize
             axis = [0,0,1]
             axis /= np.sqrt(np.dot(axis, axis))
 
diff --git a/examples/USER/cgdna/util/generate.py b/examples/USER/cgdna/util/generate.py
index eb97f482cc..e175455970 100644
--- a/examples/USER/cgdna/util/generate.py
+++ b/examples/USER/cgdna/util/generate.py
@@ -81,7 +81,7 @@ EXCL_RC2 =  0.335388426126
 EXCL_RC3 =  0.52329943261
 
 """
-Define auxillary variables for the construction of a helix
+Define auxiliary variables for the construction of a helix
 """
 # center of the double strand
 CM_CENTER_DS = POS_BASE + 0.2
@@ -103,7 +103,7 @@ number_to_base = {1 : 'A', 2 : 'C', 3 : 'G', 4 : 'T'}
 base_to_number = {'A' : 1, 'a' : 1, 'C' : 2, 'c' : 2,
                   'G' : 3, 'g' : 3, 'T' : 4, 't' : 4}
 
-# auxillary arrays
+# auxiliary arrays
 positions = []
 a1s = []
 a3s = []
diff --git a/examples/USER/colvars/log.27Nov18.peptide-colvars.g++.1 b/examples/USER/colvars/log.27Nov18.peptide-colvars.g++.1
index 3b5203ba6f..1003b9729e 100644
--- a/examples/USER/colvars/log.27Nov18.peptide-colvars.g++.1
+++ b/examples/USER/colvars/log.27Nov18.peptide-colvars.g++.1
@@ -101,7 +101,7 @@ colvars: Creating proxy instance
 colvars: ----------------------------------------------------------------------
 colvars: Initializing the collective variables module, version 2018-11-16.
 colvars: Please cite Fiorin et al, Mol Phys 2013:
-colvars:  http://dx.doi.org/10.1080/00268976.2013.813594
+colvars:  https://doi.org/10.1080/00268976.2013.813594
 colvars: in any publication based on this calculation.
 colvars: SMP parallelism is available.
 colvars: Using LAMMPS interface, version 2018-08-29.
@@ -405,7 +405,7 @@ colvars: Creating proxy instance
 colvars: ----------------------------------------------------------------------
 colvars: Initializing the collective variables module, version 2018-11-16.
 colvars: Please cite Fiorin et al, Mol Phys 2013:
-colvars:  http://dx.doi.org/10.1080/00268976.2013.813594
+colvars:  https://doi.org/10.1080/00268976.2013.813594
 colvars: in any publication based on this calculation.
 colvars: SMP parallelism is available.
 colvars: Using LAMMPS interface, version 2018-08-29.
diff --git a/examples/USER/colvars/log.27Nov18.peptide-colvars.g++.4 b/examples/USER/colvars/log.27Nov18.peptide-colvars.g++.4
index 586ebbc5c5..91ef59b619 100644
--- a/examples/USER/colvars/log.27Nov18.peptide-colvars.g++.4
+++ b/examples/USER/colvars/log.27Nov18.peptide-colvars.g++.4
@@ -101,7 +101,7 @@ colvars: Creating proxy instance
 colvars: ----------------------------------------------------------------------
 colvars: Initializing the collective variables module, version 2018-11-16.
 colvars: Please cite Fiorin et al, Mol Phys 2013:
-colvars:  http://dx.doi.org/10.1080/00268976.2013.813594
+colvars:  https://doi.org/10.1080/00268976.2013.813594
 colvars: in any publication based on this calculation.
 colvars: SMP parallelism is available.
 colvars: Using LAMMPS interface, version 2018-08-29.
@@ -405,7 +405,7 @@ colvars: Creating proxy instance
 colvars: ----------------------------------------------------------------------
 colvars: Initializing the collective variables module, version 2018-11-16.
 colvars: Please cite Fiorin et al, Mol Phys 2013:
-colvars:  http://dx.doi.org/10.1080/00268976.2013.813594
+colvars:  https://doi.org/10.1080/00268976.2013.813594
 colvars: in any publication based on this calculation.
 colvars: SMP parallelism is available.
 colvars: Using LAMMPS interface, version 2018-08-29.
diff --git a/examples/USER/colvars/log.27Nov18.peptide-colvars2.g++.1 b/examples/USER/colvars/log.27Nov18.peptide-colvars2.g++.1
index 8e5c990f40..df7aca475f 100644
--- a/examples/USER/colvars/log.27Nov18.peptide-colvars2.g++.1
+++ b/examples/USER/colvars/log.27Nov18.peptide-colvars2.g++.1
@@ -100,7 +100,7 @@ colvars: Creating proxy instance
 colvars: ----------------------------------------------------------------------
 colvars: Initializing the collective variables module, version 2018-11-16.
 colvars: Please cite Fiorin et al, Mol Phys 2013:
-colvars:  http://dx.doi.org/10.1080/00268976.2013.813594
+colvars:  https://doi.org/10.1080/00268976.2013.813594
 colvars: in any publication based on this calculation.
 colvars: SMP parallelism is available.
 colvars: Using LAMMPS interface, version 2018-08-29.
diff --git a/examples/USER/colvars/log.27Nov18.peptide-colvars2.g++.4 b/examples/USER/colvars/log.27Nov18.peptide-colvars2.g++.4
index 47f1b672df..b1916fda17 100644
--- a/examples/USER/colvars/log.27Nov18.peptide-colvars2.g++.4
+++ b/examples/USER/colvars/log.27Nov18.peptide-colvars2.g++.4
@@ -100,7 +100,7 @@ colvars: Creating proxy instance
 colvars: ----------------------------------------------------------------------
 colvars: Initializing the collective variables module, version 2018-11-16.
 colvars: Please cite Fiorin et al, Mol Phys 2013:
-colvars:  http://dx.doi.org/10.1080/00268976.2013.813594
+colvars:  https://doi.org/10.1080/00268976.2013.813594
 colvars: in any publication based on this calculation.
 colvars: SMP parallelism is available.
 colvars: Using LAMMPS interface, version 2018-08-29.
diff --git a/examples/USER/diffraction/README b/examples/USER/diffraction/README
index 265201beb1..e36062923b 100644
--- a/examples/USER/diffraction/README
+++ b/examples/USER/diffraction/README
@@ -1,4 +1,4 @@
-This is a simple example of showing the computation of virutal x-ray 
+This is a simple example of showing the computation of virtual x-ray
 and electron diffraction patterns for Ni.  
 
 In addition to the LAMMPS output, a simple visualizaiton of the electron 
diff --git a/examples/USER/eff/Li-dendritic/README b/examples/USER/eff/Li-dendritic/README
index 24eed28f85..4fdaed1efb 100644
--- a/examples/USER/eff/Li-dendritic/README
+++ b/examples/USER/eff/Li-dendritic/README
@@ -1,2 +1,2 @@
-Shows the formation of lithium dendrites during the minimization of a volume expanded lithium cell with particle positions remaped to fit the cell.
+Shows the formation of lithium dendrites during the minimization of a volume expanded lithium cell with particle positions remapped to fit the cell.
 This depicts the process of electrode replating in lithium batteries, which leads to failure (short-circuit).
diff --git a/examples/USER/lb/fourspheres/in.fourspheres_default_gamma b/examples/USER/lb/fourspheres/in.fourspheres_default_gamma
index 2fa161aefa..bce9aec0e9 100755
--- a/examples/USER/lb/fourspheres/in.fourspheres_default_gamma
+++ b/examples/USER/lb/fourspheres/in.fourspheres_default_gamma
@@ -1,5 +1,5 @@
 #===========================================================================#
-# Sytem of 2 pairs of rigid particles moving towards one another.           #
+# System of 2 pairs of rigid particles moving towards one another.          #
 # At each timestep, the hydrodynamic force acting on one of these four      #
 # rigid particles is printed to the screen.                                 #
 #                                                                           #
diff --git a/examples/USER/lb/fourspheres/in.fourspheres_set_gamma b/examples/USER/lb/fourspheres/in.fourspheres_set_gamma
index 452d90ba00..8c32051536 100755
--- a/examples/USER/lb/fourspheres/in.fourspheres_set_gamma
+++ b/examples/USER/lb/fourspheres/in.fourspheres_set_gamma
@@ -1,5 +1,5 @@
 #===========================================================================#
-# Sytem of 2 pairs of rigid particles moving towards one another.           #
+# System of 2 pairs of rigid particles moving towards one another.          #
 # At each timestep, the hydrodynamic force acting on one of these four      #
 # rigid particles is printed to the screen.                                 #
 #                                                                           #
diff --git a/examples/USER/manifold/diffusion/plot_msd.gpl b/examples/USER/manifold/diffusion/plot_msd.gpl
index dbc87eee07..4694343ad4 100644
--- a/examples/USER/manifold/diffusion/plot_msd.gpl
+++ b/examples/USER/manifold/diffusion/plot_msd.gpl
@@ -47,7 +47,7 @@ set object 1 rectangle from graph 0,0 to graph 1,1 fillcolor rgb "white" behind
 unset key
 set grid front
 
-set title 'Short time behaviour' offset 0,-0.8
+set title 'Short time behavior' offset 0,-0.8
 set ylabel ''
 set xrange[0:10]
 set yrange[0:40]
diff --git a/examples/USER/meso/README b/examples/USER/mesodpd/README
similarity index 100%
rename from examples/USER/meso/README
rename to examples/USER/mesodpd/README
diff --git a/examples/USER/meso/edpd/in.edpd b/examples/USER/mesodpd/edpd/in.edpd
similarity index 100%
rename from examples/USER/meso/edpd/in.edpd
rename to examples/USER/mesodpd/edpd/in.edpd
diff --git a/examples/USER/meso/edpd/log.16Aug17.edpd.g++.1 b/examples/USER/mesodpd/edpd/log.16Aug17.edpd.g++.1
similarity index 100%
rename from examples/USER/meso/edpd/log.16Aug17.edpd.g++.1
rename to examples/USER/mesodpd/edpd/log.16Aug17.edpd.g++.1
diff --git a/examples/USER/meso/edpd/log.16Aug17.edpd.g++.4 b/examples/USER/mesodpd/edpd/log.16Aug17.edpd.g++.4
similarity index 100%
rename from examples/USER/meso/edpd/log.16Aug17.edpd.g++.4
rename to examples/USER/mesodpd/edpd/log.16Aug17.edpd.g++.4
diff --git a/examples/USER/meso/edpd/temp.profile.16Aug17.edpd.g++.1 b/examples/USER/mesodpd/edpd/temp.profile.16Aug17.edpd.g++.1
similarity index 100%
rename from examples/USER/meso/edpd/temp.profile.16Aug17.edpd.g++.1
rename to examples/USER/mesodpd/edpd/temp.profile.16Aug17.edpd.g++.1
diff --git a/examples/USER/meso/edpd/temp.profile.16Aug17.edpd.g++.4 b/examples/USER/mesodpd/edpd/temp.profile.16Aug17.edpd.g++.4
similarity index 100%
rename from examples/USER/meso/edpd/temp.profile.16Aug17.edpd.g++.4
rename to examples/USER/mesodpd/edpd/temp.profile.16Aug17.edpd.g++.4
diff --git a/examples/USER/meso/mdpd/in.mdpd b/examples/USER/mesodpd/mdpd/in.mdpd
similarity index 100%
rename from examples/USER/meso/mdpd/in.mdpd
rename to examples/USER/mesodpd/mdpd/in.mdpd
diff --git a/examples/USER/meso/mdpd/log.16Aug17.mdpd.g++.1 b/examples/USER/mesodpd/mdpd/log.16Aug17.mdpd.g++.1
similarity index 100%
rename from examples/USER/meso/mdpd/log.16Aug17.mdpd.g++.1
rename to examples/USER/mesodpd/mdpd/log.16Aug17.mdpd.g++.1
diff --git a/examples/USER/meso/mdpd/log.16Aug17.mdpd.g++.4 b/examples/USER/mesodpd/mdpd/log.16Aug17.mdpd.g++.4
similarity index 100%
rename from examples/USER/meso/mdpd/log.16Aug17.mdpd.g++.4
rename to examples/USER/mesodpd/mdpd/log.16Aug17.mdpd.g++.4
diff --git a/examples/USER/meso/tdpd/cc.profile.16Aug17.tdpd.g++.1 b/examples/USER/mesodpd/tdpd/cc.profile.16Aug17.tdpd.g++.1
similarity index 100%
rename from examples/USER/meso/tdpd/cc.profile.16Aug17.tdpd.g++.1
rename to examples/USER/mesodpd/tdpd/cc.profile.16Aug17.tdpd.g++.1
diff --git a/examples/USER/meso/tdpd/cc.profile.16Aug17.tdpd.g++.4 b/examples/USER/mesodpd/tdpd/cc.profile.16Aug17.tdpd.g++.4
similarity index 100%
rename from examples/USER/meso/tdpd/cc.profile.16Aug17.tdpd.g++.4
rename to examples/USER/mesodpd/tdpd/cc.profile.16Aug17.tdpd.g++.4
diff --git a/examples/USER/meso/tdpd/in.tdpd b/examples/USER/mesodpd/tdpd/in.tdpd
similarity index 100%
rename from examples/USER/meso/tdpd/in.tdpd
rename to examples/USER/mesodpd/tdpd/in.tdpd
diff --git a/examples/USER/meso/tdpd/log.16Aug17.tdpd.g++.1 b/examples/USER/mesodpd/tdpd/log.16Aug17.tdpd.g++.1
similarity index 100%
rename from examples/USER/meso/tdpd/log.16Aug17.tdpd.g++.1
rename to examples/USER/mesodpd/tdpd/log.16Aug17.tdpd.g++.1
diff --git a/examples/USER/meso/tdpd/log.16Aug17.tdpd.g++.4 b/examples/USER/mesodpd/tdpd/log.16Aug17.tdpd.g++.4
similarity index 100%
rename from examples/USER/meso/tdpd/log.16Aug17.tdpd.g++.4
rename to examples/USER/mesodpd/tdpd/log.16Aug17.tdpd.g++.4
diff --git a/examples/USER/misc/bond_react/nylon,6-6_melt/large_nylon_melt.data.gz b/examples/USER/misc/bond_react/nylon,6-6_melt/large_nylon_melt.data.gz
deleted file mode 100644
index c620b879a8..0000000000
Binary files a/examples/USER/misc/bond_react/nylon,6-6_melt/large_nylon_melt.data.gz and /dev/null differ
diff --git a/examples/USER/e3b/README b/examples/USER/misc/e3b/README
similarity index 100%
rename from examples/USER/e3b/README
rename to examples/USER/misc/e3b/README
diff --git a/examples/USER/e3b/e3b_box.data b/examples/USER/misc/e3b/e3b_box.data
similarity index 100%
rename from examples/USER/e3b/e3b_box.data
rename to examples/USER/misc/e3b/e3b_box.data
diff --git a/examples/USER/e3b/in.e3b-tip4p2005 b/examples/USER/misc/e3b/in.e3b-tip4p2005
similarity index 100%
rename from examples/USER/e3b/in.e3b-tip4p2005
rename to examples/USER/misc/e3b/in.e3b-tip4p2005
diff --git a/examples/USER/e3b/log.29Mar2019.e3b-tip4p2005.g++.1 b/examples/USER/misc/e3b/log.29Mar2019.e3b-tip4p2005.g++.1
similarity index 100%
rename from examples/USER/e3b/log.29Mar2019.e3b-tip4p2005.g++.1
rename to examples/USER/misc/e3b/log.29Mar2019.e3b-tip4p2005.g++.1
diff --git a/examples/USER/e3b/log.29Mar2019.e3b-tip4p2005.g++.4 b/examples/USER/misc/e3b/log.29Mar2019.e3b-tip4p2005.g++.4
similarity index 100%
rename from examples/USER/e3b/log.29Mar2019.e3b-tip4p2005.g++.4
rename to examples/USER/misc/e3b/log.29Mar2019.e3b-tip4p2005.g++.4
diff --git a/examples/USER/misc/ees/README b/examples/USER/misc/ees/README
index 9f4cb4f159..bfc55e4375 100644
--- a/examples/USER/misc/ees/README
+++ b/examples/USER/misc/ees/README
@@ -5,7 +5,7 @@ Here one may find simple examples showing how "fix wall/ess" and "fix wall/regio
 	
 	This input uses "Data_region" to setup a system of three particles colliding with a
 	cubic region which its walls interact with particle with EES potential. To find out details
-	of how to set parameters of "fix wall/region/ees" see documentaion. 
+	of how to set parameters of "fix wall/region/ees" see documentation.
 
 --in.fix_wall
 	
diff --git a/examples/USER/misc/entropy/log.entropy b/examples/USER/misc/entropy/log.entropy
index 333214ada8..3545c74020 100644
--- a/examples/USER/misc/entropy/log.entropy
+++ b/examples/USER/misc/entropy/log.entropy
@@ -1,4 +1,4 @@
-LAMMPS (4 Jan 2019)
+LAMMPS (18 Feb 2020)
 
 units		metal
 atom_style	full
@@ -6,7 +6,7 @@ atom_style	full
 read_data	data.interface
 Reading data file ...
   triclinic box = (0 0 0) to (138.4 34.57 34.57) with tilt (0 0 0)
-  4 by 1 by 1 MPI processor grid
+  1 by 1 by 1 MPI processor grid
   reading atoms ...
   4096 atoms
   reading velocities ...
@@ -18,6 +18,8 @@ Finding 1-2 1-3 1-4 neighbors ...
   0 = max # of 1-3 neighbors
   0 = max # of 1-4 neighbors
   1 = max # of special neighbors
+  special bonds CPU = 0.00048995 secs
+  read_data CPU = 0.0104239 secs
 mass            1 22.98977
 
 neigh_modify    delay 10 every 1
@@ -45,28 +47,28 @@ fix             1 all nph x 1. 1. 10.
 fix             2 all temp/csvr 350. 350. 0.1 64582
 
 run             1000
-WARNING: More than one compute entropy/atom (../compute_entropy_atom.cpp:139)
-WARNING: More than one compute entropy/atom (../compute_entropy_atom.cpp:139)
-WARNING: More than one compute entropy/atom (../compute_entropy_atom.cpp:139)
-WARNING: More than one compute entropy/atom (../compute_entropy_atom.cpp:139)
+WARNING: More than one compute entropy/atom (src/USER-MISC/compute_entropy_atom.cpp:136)
+WARNING: More than one compute entropy/atom (src/USER-MISC/compute_entropy_atom.cpp:136)
+WARNING: More than one compute entropy/atom (src/USER-MISC/compute_entropy_atom.cpp:136)
+WARNING: More than one compute entropy/atom (src/USER-MISC/compute_entropy_atom.cpp:136)
 Neighbor list info ...
   update every 1 steps, delay 10 steps, check yes
   max neighbors/atom: 2000, page size: 100000
   master list distance cutoff = 13.2
   ghost atom cutoff = 13.2
   binsize = 6.6, bins = 21 6 6
-  5 neighbor lists, perpetual/occasional/extra = 5 0 0
-  (1) pair eam/fs, perpetual, half/full from (2)
+  5 neighbor lists, perpetual/occasional/extra = 3 2 0
+  (1) pair eam/fs, perpetual
       attributes: half, newton on
-      pair build: halffull/newton
+      pair build: half/bin/newton/tri
+      stencil: half/bin/3d/newton/tri
+      bin: standard
+  (2) compute entropy/atom, occasional, copy from (4)
+      attributes: full, newton on
+      pair build: copy
       stencil: none
       bin: none
-  (2) compute entropy/atom, perpetual
-      attributes: full, newton on
-      pair build: full/bin
-      stencil: full/bin/3d
-      bin: standard
-  (3) compute entropy/atom, perpetual, copy from (2)
+  (3) compute entropy/atom, occasional, copy from (4)
       attributes: full, newton on
       pair build: copy
       stencil: none
@@ -85,35 +87,35 @@ Setting up Verlet run ...
   Unit style    : metal
   Current step  : 0
   Time step     : 0.002
-Per MPI rank memory allocation (min/avg/max) = 19.6 | 19.6 | 19.6 Mbytes
+Per MPI rank memory allocation (min/avg/max) = 58.81 | 58.81 | 58.81 Mbytes
 Step Temp E_pair E_mol TotEng Press Volume 
        0    346.29871    -4285.222            0   -4101.9191    594.65353    165399.75 
      500    359.33769   -4285.2472            0   -4095.0424    472.02043    165847.09 
     1000    348.99683   -4276.2282            0   -4091.4971    149.38771    166965.86 
-Loop time of 4.4394 on 4 procs for 1000 steps with 4096 atoms
+Loop time of 20.309 on 1 procs for 1000 steps with 4096 atoms
 
-Performance: 38.924 ns/day, 0.617 hours/ns, 225.256 timesteps/s
-99.5% CPU use with 4 MPI tasks x no OpenMP threads
+Performance: 8.509 ns/day, 2.821 hours/ns, 49.239 timesteps/s
+99.4% CPU use with 1 MPI tasks x no OpenMP threads
 
 MPI task timing breakdown:
 Section |  min time  |  avg time  |  max time  |%varavg| %total
 ---------------------------------------------------------------
-Pair    | 3.5298     | 3.5931     | 3.6669     |   2.6 | 80.94
-Bond    | 8.2099e-05 | 0.00011444 | 0.00014673 |   0.0 |  0.00
-Neigh   | 0.43384    | 0.4445     | 0.45558    |   1.4 | 10.01
-Comm    | 0.048904   | 0.11122    | 0.16728    |  12.7 |  2.51
-Output  | 0.22595    | 0.22595    | 0.22596    |   0.0 |  5.09
-Modify  | 0.053103   | 0.053795   | 0.054549   |   0.3 |  1.21
-Other   |            | 0.01068    |            |       |  0.24
+Pair    | 17.851     | 17.851     | 17.851     |   0.0 | 87.89
+Bond    | 0.00029588 | 0.00029588 | 0.00029588 |   0.0 |  0.00
+Neigh   | 1.5377     | 1.5377     | 1.5377     |   0.0 |  7.57
+Comm    | 0.083142   | 0.083142   | 0.083142   |   0.0 |  0.41
+Output  | 0.59598    | 0.59598    | 0.59598    |   0.0 |  2.93
+Modify  | 0.20727    | 0.20727    | 0.20727    |   0.0 |  1.02
+Other   |            | 0.03411    |            |       |  0.17
 
-Nlocal:    1024 ave 1040 max 1001 min
-Histogram: 1 0 0 0 0 0 2 0 0 1
-Nghost:    4614.25 ave 4700 max 4540 min
-Histogram: 1 1 0 0 0 0 0 1 0 1
-Neighs:    121747 ave 126398 max 116930 min
-Histogram: 1 0 0 1 0 0 1 0 0 1
-FullNghs:  243494 ave 252523 max 233841 min
-Histogram: 1 0 0 1 0 0 1 0 0 1
+Nlocal:    4096 ave 4096 max 4096 min
+Histogram: 1 0 0 0 0 0 0 0 0 0
+Nghost:    11116 ave 11116 max 11116 min
+Histogram: 1 0 0 0 0 0 0 0 0 0
+Neighs:    486987 ave 486987 max 486987 min
+Histogram: 1 0 0 0 0 0 0 0 0 0
+FullNghs:  973974 ave 973974 max 973974 min
+Histogram: 1 0 0 0 0 0 0 0 0 0
 
 Total # of neighbors = 973974
 Ave neighs/atom = 237.787
@@ -121,4 +123,4 @@ Ave special neighs/atom = 0
 Neighbor list builds = 13
 Dangerous builds = 0
 
-Total wall time: 0:00:04
+Total wall time: 0:00:20
diff --git a/examples/USER/misc/hma/README b/examples/USER/misc/hma/README
index 5af6ec15fa..75c24705d3 100644
--- a/examples/USER/misc/hma/README
+++ b/examples/USER/misc/hma/README
@@ -15,7 +15,7 @@ Averages of the potential energy (#3 and #4) agree although #4 (HMA) is more pre
 Averages of the pressure (#5 and #6) agree once the ideal gas
 contribution is included; #6 (HMA) is more precise.
 
-The heat capacity can be computed from colume #3 (convential) as
+The heat capacity can be computed from colume #3 (conventional) as
 Cv = Var(#3)/(k T^2)
 
 With HMA, the heat capacity can be computed from column #4 and #7 as
diff --git a/examples/USER/misc/rhok/README.md b/examples/USER/misc/rhok/README.md
index 4e011255fc..cbef8e9e14 100644
--- a/examples/USER/misc/rhok/README.md
+++ b/examples/USER/misc/rhok/README.md
@@ -19,7 +19,7 @@ For future reference we note that the structure factor S(k) is given by the vari
 
 It is recommended to get familiar with the interface pinning method by reading:
 
-  [Ulf R. Pedersen, JCP 139, 104102 (2013)](http://dx.doi.org/10.1063/1.4818747)
+  [Ulf R. Pedersen, JCP 139, 104102 (2013)](https://doi.org/10.1063/1.4818747)
 
 A detailed bibliography is provided at
 
@@ -63,8 +63,8 @@ can be used to show this. The present directory contains the input files that we
   the value fluctuates around the anchor point (a) -- showing that this is indeed a coexistence
   state point.
 
-The reference [JCP 139, 104102 (2013)](http://dx.doi.org/10.1063/1.4818747) gives details on using the method to find coexistence state points,
-and the reference [JCP 142, 044104 (2015)](http://dx.doi.org/10.1063/1.4818747) show how the crystal growth rate can be computed from fluctuations.
+The reference [JCP 139, 104102 (2013)](https://doi.org/10.1063/1.4818747) gives details on using the method to find coexistence state points,
+and the reference [JCP 142, 044104 (2015)](https://doi.org/10.1063/1.4818747) show how the crystal growth rate can be computed from fluctuations.
 That method have been experienced to be most effective in the slightly super-heated regime above the melting temperature.
 
 ## Contact
diff --git a/examples/USER/misc/slater/data.after_equilibration b/examples/USER/misc/slater/data.after_equilibration
new file mode 100644
index 0000000000..27d6b99188
--- /dev/null
+++ b/examples/USER/misc/slater/data.after_equilibration
@@ -0,0 +1,6020 @@
+LAMMPS data file via write_data, version 27 Nov 2018, timestep = 100000
+
+3000 atoms
+3 atom types
+
+0.0000000000000000e+00 1.0000000000000000e+01 xlo xhi
+0.0000000000000000e+00 1.0000000000000000e+01 ylo yhi
+0.0000000000000000e+00 1.0000000000000000e+01 zlo zhi
+
+Masses
+
+1 1
+2 1
+3 1
+
+Atoms # charge
+
+657 1 0.0000000000000000e+00 1.2294315016955035e+00 4.8754276299250893e-01 1.2118465665945548e+00 0 -8 -2
+2175 1 0.0000000000000000e+00 2.3164555047786015e+00 6.9845360389465294e-01 2.4142242089353414e+00 3 2 2
+1900 1 0.0000000000000000e+00 3.5625331454604198e-01 2.1981204932836338e+00 1.3366724541047856e+00 1 0 2
+360 1 0.0000000000000000e+00 2.0895603361093782e+00 2.4549720666315684e+00 1.0320377923642758e+00 -1 -5 2
+1860 1 0.0000000000000000e+00 1.3275792365017520e+00 8.6099237428295405e-01 1.9139960339024802e+00 -6 -2 3
+23 1 0.0000000000000000e+00 1.6642339027501267e+00 1.5577566857379970e+00 1.6804622139289418e+00 -6 3 0
+2797 1 0.0000000000000000e+00 5.0003204102730192e-01 7.5067967687516723e-01 1.5720016693076493e+00 0 5 -1
+1094 1 0.0000000000000000e+00 2.1001825771234097e+00 6.0980401814598983e-01 3.7730512216726748e-02 0 -2 3
+1915 1 0.0000000000000000e+00 8.6504972483752363e-01 6.9529562892300301e-01 2.1409383282066144e-01 -6 2 -1
+2254 1 0.0000000000000000e+00 8.4709225642098163e-01 1.6764907332941801e+00 2.3902229212668153e+00 -3 2 4
+2222 1 0.0000000000000000e+00 3.2276348008660966e-01 1.2241204043836138e+00 1.6686429354553034e+00 -6 -1 2
+295 1 0.0000000000000000e+00 1.9487232676299715e+00 1.0213051480532678e+00 8.9948266336871641e-01 -2 0 2
+1880 1 0.0000000000000000e+00 2.3468938911622801e+00 2.0286524416751570e+00 2.1941502270881865e+00 -2 -1 -1
+1478 1 0.0000000000000000e+00 1.2905884503602709e+00 4.2556467268017134e-01 7.7074363470816909e-01 2 2 4
+2687 1 0.0000000000000000e+00 2.4935407413815841e-01 1.3670723508591945e-01 1.3071566843654943e+00 3 5 5
+1178 1 0.0000000000000000e+00 1.2523002916465782e+00 1.6575493769797520e+00 6.4247903800569173e-01 0 6 0
+2662 1 0.0000000000000000e+00 1.7000796180603881e+00 4.5215402918845349e-01 1.3231957241488037e+00 -2 -2 3
+1386 1 0.0000000000000000e+00 1.7726236464283465e+00 1.0815723168930323e-01 7.8623670270351120e-01 -6 0 -3
+1433 1 0.0000000000000000e+00 2.4420720833941090e+00 5.9579528091996958e-01 8.0952392120540795e-01 -3 5 4
+1245 1 0.0000000000000000e+00 2.4791493035754693e+00 7.7748834432190461e-01 1.5241253793997307e+00 2 1 -1
+2734 1 0.0000000000000000e+00 9.3100246215522353e-01 2.2767642587479693e+00 2.2864983189416774e+00 8 1 0
+1730 1 0.0000000000000000e+00 1.2174663590969930e+00 1.1526504746705513e+00 7.8270337932143308e-01 7 4 2
+2781 1 0.0000000000000000e+00 2.2281461511925231e+00 3.5709735101343887e-01 3.9247210141592720e-01 -2 3 1
+259 1 0.0000000000000000e+00 2.1368631216963094e+00 2.0587394876396545e+00 4.3858784075461615e-01 1 4 0
+1109 1 0.0000000000000000e+00 1.1267209835275558e+00 1.7998515052656139e+00 1.4479472402814413e+00 -3 5 5
+2126 1 0.0000000000000000e+00 1.7234999304350955e+00 1.5377879534675687e+00 5.4236670573791856e-01 -1 -1 -4
+319 1 0.0000000000000000e+00 1.5640680776895053e+00 2.4022315178398230e+00 1.8713314660465894e+00 -3 3 0
+307 1 0.0000000000000000e+00 2.1477162783001660e+00 1.4016860035497622e+00 9.8290760821820464e-02 -5 5 2
+2343 1 0.0000000000000000e+00 1.2671254589570664e+00 1.9028737357040748e+00 3.0584689155388055e-02 6 1 4
+1162 1 0.0000000000000000e+00 9.9385877625695271e-03 1.3834059644864716e+00 6.8815269206697660e-01 -1 2 -3
+1154 1 0.0000000000000000e+00 1.4418694229240092e+00 1.1455981200197769e-01 4.6674313624619074e-02 -5 2 -1
+1138 1 0.0000000000000000e+00 7.0143527631015445e-01 9.6619679646717327e-01 6.4000816249950321e-01 -3 0 0
+2873 2 -1.0000000000000000e+00 1.2441420842034001e+00 4.1393590605366909e-01 1.9652971408800111e+00 4 5 -6
+118 1 0.0000000000000000e+00 4.5684822453318186e-01 1.8254057968479911e+00 1.7692818044476950e+00 -7 -7 0
+2023 1 0.0000000000000000e+00 5.9414992979255621e-01 1.7042570689935168e+00 3.6856583747702226e-01 -2 0 -1
+2179 1 0.0000000000000000e+00 8.8560892251441614e-01 2.1175891770320732e+00 9.4253464535643883e-01 1 5 5
+2395 1 0.0000000000000000e+00 5.2775070133739437e-02 5.3637713433594292e-01 2.3143182426880098e+00 5 4 -5
+2546 1 0.0000000000000000e+00 1.1265451254411663e+00 1.2949091275290223e+00 2.0031575040394292e+00 -3 -2 4
+863 1 0.0000000000000000e+00 2.0897910289677961e+00 1.7328926247657581e+00 1.3671406997367481e+00 -1 9 -2
+1560 1 0.0000000000000000e+00 2.0134073326150315e+00 8.2514057427402232e-01 1.5642128977791498e+00 1 -6 -1
+1567 1 0.0000000000000000e+00 2.4762151214309722e+00 1.9820034900288224e+00 4.0619377321249245e-01 -10 -2 1
+1960 1 0.0000000000000000e+00 7.0225018861803001e-01 1.7384792491759022e+00 1.3951119278456705e+00 0 0 3
+2636 1 0.0000000000000000e+00 6.5761321765887754e-02 8.1374825085868774e-01 8.7359406253994554e-01 2 4 -6
+568 1 0.0000000000000000e+00 1.7403318067351436e+00 1.8780377949192477e+00 2.4024895224751592e+00 0 2 0
+414 1 0.0000000000000000e+00 1.5961990678977317e-01 2.2533142944334292e+00 2.1926238173946149e+00 2 1 3
+452 1 0.0000000000000000e+00 2.7767909968111923e+00 1.2846432520047726e+00 4.3960960537703270e-01 2 3 -3
+2097 1 0.0000000000000000e+00 3.1761597015111507e+00 2.1821909037681078e+00 7.3493208013908484e-01 -1 3 6
+2242 1 0.0000000000000000e+00 3.4553327473328146e+00 1.6699386951674831e+00 2.4663857213018843e+00 -3 6 -3
+1458 1 0.0000000000000000e+00 4.7329815118611647e+00 7.5855606498241923e-01 1.6118530035081400e+00 1 9 7
+1690 1 0.0000000000000000e+00 3.7415668616442286e+00 1.5070194843078388e-01 8.4445776759546443e-01 7 -5 2
+2890 2 -1.0000000000000000e+00 4.7145627837817088e+00 1.3161447873205676e+00 5.5731741915683064e-01 3 3 -5
+941 1 0.0000000000000000e+00 4.5669443543722368e+00 1.8483500834617175e+00 1.4105752427209630e+00 3 1 -3
+2307 1 0.0000000000000000e+00 2.6134395043295640e+00 1.6159508581574462e+00 1.9525409360285315e+00 4 6 2
+2757 1 0.0000000000000000e+00 3.2399945247689117e+00 7.3523256032153317e-02 2.3544393565980388e+00 3 0 1
+292 1 0.0000000000000000e+00 3.2313117080878104e+00 8.2928213582292798e-01 1.7053316899184474e+00 0 7 -4
+2408 1 0.0000000000000000e+00 4.4612753265650040e+00 3.7679774218080976e-02 6.7702198442033135e-01 5 4 2
+1733 1 0.0000000000000000e+00 4.0533980289861331e+00 2.4001027179691397e+00 1.7525193928692415e+00 6 3 0
+313 1 0.0000000000000000e+00 3.1447801970093883e+00 2.4994159497826209e+00 2.7169956584620136e-01 -6 -2 -1
+1888 1 0.0000000000000000e+00 2.9868631125020269e+00 2.7782669344138120e-02 1.5504349442251604e+00 -8 1 -2
+809 1 0.0000000000000000e+00 4.0004108258896443e+00 2.0518225944997885e+00 2.0162506726285283e+00 4 1 1
+1824 1 0.0000000000000000e+00 3.0760621828456527e+00 4.3170537293536099e-01 3.5745549880644926e-02 4 -1 -2
+705 1 0.0000000000000000e+00 2.7919624671063166e+00 1.4289031553108618e+00 1.1029735296049670e+00 2 0 -2
+24 1 0.0000000000000000e+00 3.6314220354916182e+00 1.7208106755091936e+00 1.3565846885782091e+00 3 -2 3
+186 1 0.0000000000000000e+00 2.9796595169243241e+00 7.1412273904887513e-01 7.3644455307131307e-01 -5 1 2
+1344 1 0.0000000000000000e+00 4.3095233242940294e+00 2.7104539306398634e-01 7.5171192648935153e-02 1 3 3
+153 1 0.0000000000000000e+00 3.5509257096001763e+00 1.4389813746925797e+00 1.8346004572453154e+00 2 -1 0
+2246 1 0.0000000000000000e+00 4.3587644767225404e+00 7.1097753359274318e-01 8.0537632391406200e-01 -2 6 -6
+1999 1 0.0000000000000000e+00 2.6195447457169356e+00 7.7713610310780862e-02 9.0990487275747212e-01 -1 -3 0
+2737 1 0.0000000000000000e+00 4.0481677548413417e+00 2.2143576082291658e+00 6.0248749269903512e-01 -7 2 6
+252 1 0.0000000000000000e+00 4.6664072483440373e+00 2.4382351024484890e+00 1.2594819900845593e+00 4 -5 0
+2320 1 0.0000000000000000e+00 4.1637232038805374e+00 1.6152455367049663e+00 1.0331058809970348e+00 -1 0 -3
+2128 1 0.0000000000000000e+00 3.2190817399104268e+00 2.4471600673818172e+00 2.0341923302561189e+00 -2 3 -3
+1449 1 0.0000000000000000e+00 3.7875604580578952e+00 2.4567587091751797e+00 1.1604679955360948e+00 -3 -2 1
+1966 1 0.0000000000000000e+00 4.6656118980939638e+00 9.5332525870604312e-01 1.5107741234142941e-01 -3 4 3
+2681 1 0.0000000000000000e+00 3.9950334466062167e+00 1.1840724734496522e+00 2.1256343649287688e+00 -4 0 -2
+2986 3 1.0000000000000000e+00 3.7992671212747875e+00 4.0449670747083988e-01 1.5161621796965576e+00 4 -1 3
+1507 1 0.0000000000000000e+00 4.9191903634224436e+00 1.0850386164340555e+00 1.1914982005251722e+00 -4 7 3
+2196 1 0.0000000000000000e+00 4.0312866257015312e+00 1.2527641599282306e+00 1.5218616343660638e+00 1 3 -3
+49 1 0.0000000000000000e+00 3.4564174139189827e+00 5.2844721518028603e-01 3.4261836281253538e-01 -3 -2 -2
+1365 1 0.0000000000000000e+00 4.7883464383814189e+00 1.5987919580003158e+00 2.2436322620504736e+00 2 -2 2
+1452 1 0.0000000000000000e+00 4.4881797771485985e+00 1.4883387889813435e+00 2.1055232490688205e+00 1 -1 -7
+1770 1 0.0000000000000000e+00 4.0468665302840696e+00 1.7030347849833458e+00 9.3870072212299885e-02 -3 -1 1
+1238 1 0.0000000000000000e+00 2.8050385688585946e+00 1.3684449759828055e+00 1.1472351808454632e-01 6 0 1
+140 1 0.0000000000000000e+00 3.1851238409875609e+00 1.6170105118889988e+00 1.4391811048669350e+00 2 2 -4
+900 1 0.0000000000000000e+00 4.6727070008332099e+00 5.8655424208445139e-01 2.1828428980591608e+00 2 1 1
+596 1 0.0000000000000000e+00 2.6578533071815009e+00 8.2031851461831784e-01 1.8937647482789628e+00 1 -4 4
+1771 1 0.0000000000000000e+00 3.6936329411202995e+00 1.4669174207242024e+00 7.3212283726369931e-01 0 -1 5
+638 1 0.0000000000000000e+00 2.7494624010763871e+00 2.3100393397227430e+00 1.2576741281063295e+00 -1 -1 -2
+2879 2 -1.0000000000000000e+00 3.9182128494845991e+00 7.6287191191636650e-01 1.9421209005256836e+00 -4 -1 0
+1932 1 0.0000000000000000e+00 3.9856155915376164e+00 7.8003515073412666e-01 2.9391259063716074e-01 -5 -4 4
+1827 1 0.0000000000000000e+00 4.6970898089668616e+00 2.2213435039680620e+00 2.4743271517922086e-01 3 -3 -5
+143 1 0.0000000000000000e+00 4.8981719632179344e+00 1.5162870887829505e-01 1.1198398548572199e+00 0 3 -3
+1603 1 0.0000000000000000e+00 3.2654398049777940e+00 1.8468158745020600e+00 2.7112633835670863e-03 1 2 -2
+687 1 0.0000000000000000e+00 1.2286474952581528e+00 4.2505347721498881e+00 2.4065321338499883e+00 -2 3 2
+1128 1 0.0000000000000000e+00 2.1869045768095092e+00 4.5569781461421002e+00 1.8564573343573272e+00 -3 -5 -3
+359 1 0.0000000000000000e+00 1.6200179602348741e+00 3.7984048146452412e+00 1.3538693271568969e+00 -4 0 2
+7 1 0.0000000000000000e+00 1.9973159346882916e+00 4.0538128096340875e+00 1.9407096673970528e+00 -8 3 -1
+2226 1 0.0000000000000000e+00 1.8003682542462831e+00 3.3131053570441442e+00 2.3890904959121673e+00 -3 3 -2
+298 1 0.0000000000000000e+00 1.5990893913330586e+00 4.0291363510586766e+00 2.0597995204184421e+00 -1 1 -4
+1347 1 0.0000000000000000e+00 1.0381611178220669e+00 4.5124422285239589e+00 5.2754855166159664e-01 1 6 -3
+2310 1 0.0000000000000000e+00 1.5536504106107059e+00 3.1475484716009094e+00 9.6642192466495047e-01 0 1 0
+617 1 0.0000000000000000e+00 1.0806482870082104e-01 4.8608734413370103e+00 1.0983369991600154e+00 -7 1 0
+74 1 0.0000000000000000e+00 1.8428090322705997e+00 4.9106069363557303e+00 2.7897999254228878e-01 5 2 -2
+2002 1 0.0000000000000000e+00 1.1595568086473071e+00 3.5605603382683948e+00 4.8829376396476876e-01 -2 1 0
+965 1 0.0000000000000000e+00 1.7269290347842217e+00 2.5064429036109179e+00 8.6335957473663738e-02 -1 -6 0
+958 1 0.0000000000000000e+00 9.2665776141629463e-02 2.7755569308096484e+00 2.3656291165454109e+00 2 8 -4
+138 1 0.0000000000000000e+00 2.2815736812759848e+00 3.8405140359908327e+00 4.3283096963681872e-01 2 1 -1
+2349 1 0.0000000000000000e+00 5.0949539563130775e-01 2.5920885673883092e+00 1.6587550071562118e+00 -2 2 1
+741 1 0.0000000000000000e+00 3.0864578914811203e-01 3.0043489180919534e+00 8.0760638556009412e-01 4 3 -4
+847 1 0.0000000000000000e+00 1.2598326863560310e+00 3.5429836852141783e+00 1.9299780846671590e+00 -5 5 -2
+2925 3 1.0000000000000000e+00 2.2651428006112870e+00 3.2924343501755606e+00 1.6230110912121215e-01 -1 7 0
+37 1 0.0000000000000000e+00 8.8223524283848054e-01 2.8560924724117043e+00 2.0029932133436663e+00 2 1 3
+2923 3 1.0000000000000000e+00 6.2191221841897726e-01 3.3175666344479517e+00 6.5127374239876623e-01 -1 -1 8
+1091 1 0.0000000000000000e+00 7.7364798657018952e-01 4.2732233048608004e+00 1.7268578160836041e+00 -4 2 2
+331 1 0.0000000000000000e+00 2.3507311742858641e+00 4.1527048075321913e+00 1.0773204308337370e+00 -2 0 2
+2891 2 -1.0000000000000000e+00 2.1510816198611007e-01 4.1214132342619152e+00 6.3986823605853671e-01 4 -2 2
+626 1 0.0000000000000000e+00 1.0170496046019284e+00 2.8074199379997755e+00 3.9142611765596563e-01 8 2 -6
+2197 1 0.0000000000000000e+00 2.3853187876709763e+00 2.7282031707678991e+00 1.6197952026596660e+00 -1 -1 -3
+2247 1 0.0000000000000000e+00 3.7269233861904327e-01 4.2212322304069128e+00 2.1857504410985045e+00 -5 5 -3
+2125 1 0.0000000000000000e+00 6.9284524997248553e-01 4.3036446712436405e+00 1.5949771794791737e-01 -4 -5 1
+1256 1 0.0000000000000000e+00 8.4386636721656427e-01 3.2033978205761851e+00 1.3415791455423023e+00 4 4 3
+2327 1 0.0000000000000000e+00 3.9086694991450099e-01 2.5975798404980779e+00 7.2943473505031198e-01 1 7 1
+2227 1 0.0000000000000000e+00 7.6952219565061264e-01 4.2653461365656451e+00 1.0025164785182570e+00 3 -3 3
+1549 1 0.0000000000000000e+00 1.3703504063234426e+00 4.5746486883308268e+00 1.0394194531578096e+00 -1 -1 3
+1174 1 0.0000000000000000e+00 6.1219564523283454e-01 4.8217990117558438e+00 3.2502350180394624e-01 -3 0 -4
+1775 1 0.0000000000000000e+00 1.5170462541840117e+00 4.2361831803661216e+00 3.6160082352442846e-01 -6 -1 4
+2706 1 0.0000000000000000e+00 3.3141990057147869e-01 3.9148664700434281e+00 1.8713209064913066e+00 2 -2 3
+1689 1 0.0000000000000000e+00 1.9389651805611680e-01 3.0620789348224542e+00 1.5396007313123605e+00 9 -1 -2
+1963 1 0.0000000000000000e+00 5.4509694131332408e-02 4.7656872820158025e+00 2.2624397734306525e+00 3 3 -2
+2967 3 1.0000000000000000e+00 1.4510419992056482e+00 2.8506162765652729e+00 2.2119832034216871e+00 7 -2 -5
+1014 1 0.0000000000000000e+00 1.5718877270986540e+00 3.2222067507724170e+00 1.2634163729108416e-02 -6 -3 -2
+2069 1 0.0000000000000000e+00 2.2622328184074778e+00 4.8039847797001727e+00 9.2446086496383117e-01 0 -2 0
+2715 1 0.0000000000000000e+00 5.8842193052673242e-01 3.9614386783539532e+00 1.1006688405627962e+00 1 -1 3
+1597 1 0.0000000000000000e+00 1.4476151567629474e+00 4.3590224137725837e+00 1.4814184478010701e+00 1 1 -2
+1237 1 0.0000000000000000e+00 1.8579356863272509e+00 3.3192067698117969e+00 1.3836223551419939e+00 -2 -3 -3
+97 1 0.0000000000000000e+00 1.2124788340232597e+00 2.5829705094009663e+00 1.0566876481323435e+00 -5 2 -1
+451 1 0.0000000000000000e+00 1.7700627404940239e+00 2.8886817990194231e+00 6.3015199035926805e-01 -1 0 2
+1092 1 0.0000000000000000e+00 1.3942051771965671e+00 3.6528121263347795e+00 1.4436279816429537e-01 -3 1 -11
+494 1 0.0000000000000000e+00 3.5180915153985015e-01 3.4394463748899713e+00 2.2791291740153179e+00 -3 -3 2
+1545 1 0.0000000000000000e+00 4.7781005293462702e+00 3.4218988782187898e+00 7.6702477276438041e-01 -2 -7 3
+1082 1 0.0000000000000000e+00 3.2896451098282222e+00 4.5711814852549510e+00 1.2594822320296610e+00 3 -1 4
+1367 1 0.0000000000000000e+00 4.6172604270860296e+00 3.1956716562109273e+00 1.6878022745310945e+00 3 3 0
+689 1 0.0000000000000000e+00 4.0956834736296299e+00 3.7392971820905974e+00 1.0649170389315152e+00 1 -5 0
+814 1 0.0000000000000000e+00 2.9662845473661532e+00 4.9451618754524223e+00 1.2899907761753879e+00 -1 4 -4
+2798 1 0.0000000000000000e+00 2.8802587378446409e+00 4.4734308005556738e+00 5.5517917484081125e-01 9 -3 -1
+1759 1 0.0000000000000000e+00 4.9729047707161333e+00 4.8275950525811115e+00 1.1381067907824658e+00 0 2 0
+430 1 0.0000000000000000e+00 2.9404042624316484e+00 3.8737513462711162e+00 1.0102721249518734e+00 -3 -3 3
+619 1 0.0000000000000000e+00 2.7957702961458506e+00 3.7224642501372451e+00 2.2330516323796266e+00 1 -3 0
+346 1 0.0000000000000000e+00 2.8699256512088360e+00 2.9319713775738863e+00 9.6268880314552752e-01 -7 2 -5
+703 1 0.0000000000000000e+00 4.8816947152112835e+00 4.9270022811962484e+00 1.7008914385339713e+00 -3 1 0
+1062 1 0.0000000000000000e+00 4.5297793967195901e+00 4.5444236700195333e+00 2.0377483209475242e+00 0 -4 1
+349 1 0.0000000000000000e+00 4.8988296119038655e+00 3.8928494841886114e+00 1.4084479164946182e+00 1 2 -8
+1173 1 0.0000000000000000e+00 3.8027084866646454e+00 4.1233236308514591e+00 1.2560028121529132e+00 -4 -1 -1
+1125 1 0.0000000000000000e+00 3.8972047694608682e+00 3.0422644805291172e+00 4.5739172837516590e-01 3 2 1
+1825 1 0.0000000000000000e+00 3.8186982282823703e+00 4.7578933840936593e+00 2.0955382812519243e+00 0 -2 2
+294 1 0.0000000000000000e+00 2.5468691118106972e+00 3.3839775709980837e+00 8.8927795396394771e-01 -1 -5 4
+1084 1 0.0000000000000000e+00 4.3896568348418246e+00 4.8877974096585000e+00 1.4073976200894920e+00 -1 2 -1
+1659 1 0.0000000000000000e+00 4.4437112347667194e+00 3.1474463377711497e+00 1.1422740416666306e+00 1 4 -2
+1743 1 0.0000000000000000e+00 4.4781588445667166e+00 3.6541247421130651e+00 6.0747937804730878e-01 -4 3 -4
+2703 1 0.0000000000000000e+00 3.3376488747759185e+00 3.9290666507788301e+00 5.7512507099521459e-01 4 3 5
+442 1 0.0000000000000000e+00 3.3449995863805113e+00 4.9608695322869707e+00 2.4491146967768667e+00 -8 3 0
+1310 1 0.0000000000000000e+00 2.5946737524033177e+00 2.9684472699253570e+00 1.9678852890355198e+00 -4 2 -1
+1873 1 0.0000000000000000e+00 3.8074326669959815e+00 3.1995422160941684e+00 2.3156875751509083e+00 6 -2 4
+2282 1 0.0000000000000000e+00 4.6448540997602183e+00 4.3119660086270279e+00 8.5306859111816458e-01 3 1 -2
+2336 1 0.0000000000000000e+00 3.5296359204291017e+00 2.9996710079856537e+00 1.2368505419212257e+00 -2 6 -8
+2804 1 0.0000000000000000e+00 3.3322507060181872e+00 2.7825327214066928e+00 1.7637611202413976e+00 4 0 6
+2431 1 0.0000000000000000e+00 4.8041895896760201e+00 2.5764828570635823e+00 2.0942602701561888e+00 4 0 -3
+57 1 0.0000000000000000e+00 3.5171105855049323e+00 4.7392425964197322e+00 3.5143421397004326e-01 -3 -1 6
+137 1 0.0000000000000000e+00 2.7329522679829164e+00 4.6076788617560007e+00 2.3154315487926920e+00 -3 4 2
+686 1 0.0000000000000000e+00 4.3689320267129013e+00 2.9820892984560983e+00 3.1169287553978486e-01 -1 1 2
+2288 1 0.0000000000000000e+00 3.8459553014843988e+00 4.2749321673132830e+00 3.8850723958354133e-01 1 1 -1
+2473 1 0.0000000000000000e+00 4.3951997705798833e+00 3.4069602500216991e+00 2.4210464742644739e+00 -3 0 5
+2233 1 0.0000000000000000e+00 2.7174962578232176e+00 3.1430705697896468e+00 5.1455130025646600e-01 4 2 5
+2293 1 0.0000000000000000e+00 2.6771874045198603e+00 3.9073280843779958e+00 1.6787448974738681e+00 -3 1 -4
+167 1 0.0000000000000000e+00 4.6930725498972130e+00 3.9545285214573931e+00 2.4292202343015985e+00 1 0 0
+2817 2 -1.0000000000000000e+00 3.5963773215548924e+00 3.9804260117355579e+00 2.1184997315152545e+00 -2 -4 1
+2747 1 0.0000000000000000e+00 4.3431192525393696e+00 4.3062334086156415e+00 1.3901356711129780e+00 2 -6 0
+2469 1 0.0000000000000000e+00 3.6728013476578290e+00 4.7737793597787865e+00 1.6366785134260260e+00 0 7 0
+915 1 0.0000000000000000e+00 3.2300430303159313e+00 3.1379431785439622e+00 2.4026871760965389e+00 3 0 5
+874 1 0.0000000000000000e+00 3.8920696948093476e+00 3.8446313753414665e+00 1.9517171616474061e+00 -2 -3 -2
+1917 1 0.0000000000000000e+00 2.8093038291552768e+00 3.4473645600608824e+00 1.4854186466747856e+00 3 5 -1
+134 1 0.0000000000000000e+00 3.8901886445333203e+00 3.2701274651551451e+00 1.5063124510253021e+00 2 -2 4
+1809 1 0.0000000000000000e+00 3.0390865951220722e+00 4.4149445571747448e+00 1.8018944496607519e+00 1 7 1
+758 1 0.0000000000000000e+00 3.8548456954701016e+00 3.4556425990146766e+00 5.7738443817049057e-01 -1 -5 -3
+66 1 0.0000000000000000e+00 3.0993878657675533e+00 3.3927903741959953e+00 1.0073299769452908e-01 0 -2 3
+2731 1 0.0000000000000000e+00 4.8411215525057880e+00 4.1950557970015998e+00 3.7647412426014210e-01 0 4 5
+2328 1 0.0000000000000000e+00 1.3504820834142079e+00 2.4741428502607499e+00 3.1321309334682854e+00 -2 4 -1
+534 1 0.0000000000000000e+00 2.3609151528360734e+00 2.2019029371597165e+00 3.3313199265395506e+00 -2 -5 3
+1496 1 0.0000000000000000e+00 2.0448165975677672e+00 2.2072313974237182e-01 3.1507538374165724e+00 1 2 1
+732 1 0.0000000000000000e+00 2.0024016460135008e+00 2.4765465819777788e+00 4.4196346201786341e+00 1 -4 -5
+1582 1 0.0000000000000000e+00 1.7395266753271077e+00 7.5510695949270112e-01 4.5869080219741853e+00 4 -3 -5
+484 1 0.0000000000000000e+00 1.0034871316431830e+00 6.0318069109102679e-01 4.0235954209126463e+00 1 -3 -3
+839 1 0.0000000000000000e+00 1.4602732672373155e+00 2.3720410629719906e+00 4.0384316392322308e+00 -3 2 -1
+1110 1 0.0000000000000000e+00 1.6020751988910185e+00 3.0592952837862591e-01 3.3166437670843436e+00 -5 8 2
+2353 1 0.0000000000000000e+00 2.1884546697868226e+00 4.5393690145853666e-01 3.8803796542540154e+00 2 -3 -2
+1488 1 0.0000000000000000e+00 2.2180321827394783e-01 2.3062671299843385e+00 4.1869331789302047e+00 -1 -5 5
+59 1 0.0000000000000000e+00 1.5421370648118005e+00 2.0718006623521861e+00 3.2489985119904659e+00 2 -5 -5
+2099 1 0.0000000000000000e+00 1.6289327180304212e+00 1.6012851759252136e+00 4.4689883086346640e+00 1 2 -7
+84 1 0.0000000000000000e+00 6.0976953696375591e-01 7.0390840281476974e-01 2.5744479591727010e+00 2 -1 -1
+1879 1 0.0000000000000000e+00 4.0615990828567128e-01 1.4641300257627567e+00 3.6602891483217124e+00 -5 3 6
+736 1 0.0000000000000000e+00 1.6942993371799835e+00 7.9667936178945831e-01 3.1513167015656349e+00 0 1 -1
+1332 1 0.0000000000000000e+00 4.3459600792348663e-01 2.1182261133045417e+00 4.8452805057752810e+00 5 -2 -3
+2394 1 0.0000000000000000e+00 1.8620742390220777e+00 8.0000631044595627e-01 2.6905738970495565e+00 -5 2 0
+1235 1 0.0000000000000000e+00 5.2048609776880450e-01 2.1686588954293176e+00 2.7540366573653179e+00 -3 2 0
+2573 1 0.0000000000000000e+00 7.6241922881672464e-01 4.7142513977802114e-01 4.5210994006918588e+00 3 -2 3
+220 1 0.0000000000000000e+00 8.6274610416258890e-01 3.9625474679630468e-01 2.9848046899740308e+00 -2 2 0
+2555 1 0.0000000000000000e+00 7.6386058882674246e-01 1.3157314623824063e+00 3.0724886890837060e+00 -4 3 7
+1274 1 0.0000000000000000e+00 1.4363626807591476e+00 5.2020819350010383e-01 4.5344089582591698e+00 -2 0 1
+2585 1 0.0000000000000000e+00 8.8712447631047198e-01 1.3599599897061154e+00 4.9647338295079804e+00 6 -1 -2
+216 1 0.0000000000000000e+00 2.2996866197068941e+00 1.0999814868418869e+00 4.8980200775995364e+00 0 2 4
+1029 1 0.0000000000000000e+00 6.2033774762998012e-02 1.5844417493308851e+00 4.8889157029830459e+00 -3 -2 2
+1070 1 0.0000000000000000e+00 3.2087898728822212e-01 7.3591885896851228e-01 4.6873827913429986e+00 0 2 -7
+1249 1 0.0000000000000000e+00 2.2970107471001927e-01 2.4897538804264920e+00 3.5405874905871451e+00 4 -1 2
+2593 1 0.0000000000000000e+00 2.4985024346718503e+00 2.4121406814513038e+00 4.2558497568097309e+00 7 -2 -4
+1265 1 0.0000000000000000e+00 4.5309108217541832e-01 1.3211106956525096e+00 4.5650069316345769e+00 7 2 0
+422 1 0.0000000000000000e+00 1.8071232408530631e+00 1.4581849665971973e+00 3.0552659197316561e+00 1 2 2
+479 1 0.0000000000000000e+00 9.5929629795529991e-01 1.8658789754636040e+00 3.0727527513413926e+00 -2 -2 1
+2209 1 0.0000000000000000e+00 1.6060499321884869e-01 2.1355210624001462e+00 3.5498044606345469e+00 -4 -2 3
+999 1 0.0000000000000000e+00 7.0959039653791267e-01 8.8877390285051150e-01 3.4032915586725188e+00 1 -3 -2
+581 1 0.0000000000000000e+00 8.1411717500190128e-01 1.7548317416347138e-02 2.9215909977210868e+00 -3 -1 1
+1939 1 0.0000000000000000e+00 1.4203882923891240e+00 1.5050670537556470e+00 4.7572241181701607e+00 5 5 -3
+13 1 0.0000000000000000e+00 1.5023126523227059e+00 9.8290084325644705e-02 3.8379569984607058e+00 2 2 -1
+1471 1 0.0000000000000000e+00 2.4049186242967959e+00 1.6752495153104396e+00 4.2707872342577824e+00 4 -2 4
+263 1 0.0000000000000000e+00 1.2719705986659036e-01 2.6645215683374712e-01 3.1410842473895677e+00 1 6 9
+1577 1 0.0000000000000000e+00 9.7959840360025274e-01 1.6723519961592157e+00 4.0742087733512813e+00 7 1 -4
+2690 1 0.0000000000000000e+00 1.4028800271630313e+00 1.1176268271951064e+00 3.6545514424446166e+00 0 -5 -2
+824 1 0.0000000000000000e+00 1.8542252436859432e+00 1.6709110576384665e+00 3.8594663674473004e+00 -2 0 3
+2818 2 -1.0000000000000000e+00 5.9611161954943448e-01 1.6499347608480389e-01 4.0597783484616201e+00 0 -1 2
+830 1 0.0000000000000000e+00 2.3126337390953449e+00 1.1710914680489817e+00 3.6056817402081367e+00 2 1 -7
+1871 1 0.0000000000000000e+00 5.7558224556634792e-02 1.1407748039483800e+00 3.0472993834225073e+00 4 -2 -1
+1864 1 0.0000000000000000e+00 1.8648487731354730e+00 1.1212252110084743e-01 4.5925504650952584e+00 -6 4 -3
+2961 3 1.0000000000000000e+00 1.8905584846011956e+00 1.5313589163569628e+00 2.5074036979296861e+00 0 0 3
+1682 1 0.0000000000000000e+00 4.5509984371914296e+00 2.1245826834328896e+00 4.0314635528085363e+00 -2 3 6
+2960 3 1.0000000000000000e+00 3.8784313280131291e+00 1.5135771558985247e+00 2.6029198228495480e+00 -1 1 -6
+799 1 0.0000000000000000e+00 3.8273047903299293e+00 7.4228078169330514e-01 3.4639408743865774e+00 -3 7 1
+2595 1 0.0000000000000000e+00 2.5144656486198160e+00 8.7040954057869446e-01 2.7912623707414124e+00 -6 4 0
+1956 1 0.0000000000000000e+00 4.1403921428018222e+00 3.0493260073437167e-01 3.4798613211300458e+00 -5 -1 1
+2857 2 -1.0000000000000000e+00 3.2486550769016960e+00 2.0312236616932382e+00 4.2225712917291363e+00 -7 0 -1
+789 1 0.0000000000000000e+00 4.8539094291018268e+00 2.6486380379331453e-01 4.0002805375206272e+00 -2 -1 -3
+1591 1 0.0000000000000000e+00 4.8531301650811027e+00 6.8255610101173064e-02 3.5661782868548726e+00 2 -8 -6
+605 1 0.0000000000000000e+00 3.1494184817884849e+00 2.7624231910979374e-02 4.4496919831596440e+00 2 0 2
+2261 1 0.0000000000000000e+00 4.3628333543564839e+00 9.6475492099956217e-01 4.0259646638620845e+00 2 4 1
+1738 1 0.0000000000000000e+00 4.3095067017870035e+00 2.4036827080600176e-03 2.7515087877930360e+00 -4 2 2
+1737 1 0.0000000000000000e+00 2.8194461006864970e+00 1.9467631397500196e+00 4.5193127853390145e+00 -2 1 -5
+1384 1 0.0000000000000000e+00 3.1360737294450458e+00 6.9414646738557839e-01 2.5223736148272313e+00 -4 -1 4
+2509 1 0.0000000000000000e+00 4.3145300588459170e+00 1.4342344573947057e+00 3.8883843448941482e+00 1 2 3
+2048 1 0.0000000000000000e+00 4.0410247442435407e+00 1.5511153102928494e+00 3.0576947834055592e+00 -2 -2 6
+69 1 0.0000000000000000e+00 2.5672011513161190e+00 1.9154878078092794e+00 2.7742761682513701e+00 -3 1 4
+1465 1 0.0000000000000000e+00 4.0340081390875433e+00 2.4618075247220648e+00 4.5330068415258102e+00 -2 -1 -1
+2332 1 0.0000000000000000e+00 2.8299907077718127e+00 6.7645020378579124e-01 3.1970785903406704e+00 2 -2 -1
+2812 2 -1.0000000000000000e+00 3.1264966692619076e+00 1.3944207704218452e+00 3.4951128303502337e+00 0 0 -3
+287 1 0.0000000000000000e+00 4.5140515213162642e+00 8.5386730287414003e-01 3.2415410563283280e+00 -3 4 -7
+1816 1 0.0000000000000000e+00 3.1798725806817467e+00 4.5984413751914305e-01 3.4797467238738733e+00 2 -2 4
+565 1 0.0000000000000000e+00 3.6169518716320805e+00 3.2950899219213731e-01 2.6207407444832875e+00 3 -3 0
+2400 1 0.0000000000000000e+00 4.7040515540883092e+00 2.1250275079407643e-01 4.7527353590633599e+00 -3 2 3
+2864 2 -1.0000000000000000e+00 2.7364725235974836e+00 2.3107994430823915e+00 2.6173826314416444e+00 2 -2 -4
+2463 1 0.0000000000000000e+00 3.6429736286644365e+00 7.4423680572369333e-01 2.8991041150755499e+00 10 -2 -2
+1181 1 0.0000000000000000e+00 4.6611335959120499e+00 2.4379678113501679e+00 2.6296914387471189e+00 0 -5 -4
+254 1 0.0000000000000000e+00 3.4522158320047640e+00 4.5059828731836393e-01 4.1697496376561132e+00 4 9 0
+1320 1 0.0000000000000000e+00 3.8464998241848929e+00 1.4718134914214016e+00 4.3734548780662950e+00 -2 -2 1
+1608 1 0.0000000000000000e+00 4.6670101554240819e+00 1.0795365127026961e+00 4.7085899065488386e+00 4 -9 -3
+2915 3 1.0000000000000000e+00 4.2748106709299059e+00 2.4649799106199928e+00 3.3603378528727292e+00 -2 0 -1
+2062 1 0.0000000000000000e+00 3.1207469686999674e+00 1.3653652930946873e+00 2.7453384259696629e+00 3 3 -6
+2621 1 0.0000000000000000e+00 4.8815068646532609e+00 1.0433843991345024e+00 2.7795813355230550e+00 -7 0 7
+899 1 0.0000000000000000e+00 4.2758853307417146e+00 3.0069948848524358e-01 4.3840585947113802e+00 -2 2 2
+1668 1 0.0000000000000000e+00 3.2319170268028934e+00 1.1220879543736240e+00 4.7459395867346750e+00 3 4 -7
+2545 1 0.0000000000000000e+00 4.8553758364273634e+00 1.5015973817579942e+00 3.1899292202705847e+00 1 3 0
+2972 3 1.0000000000000000e+00 2.8347073466780923e+00 1.8918790533517427e+00 3.5716657817826087e+00 4 -6 0
+2501 1 0.0000000000000000e+00 4.5275378175181968e+00 1.6300714548439770e+00 4.7500486602155840e+00 -1 0 -2
+33 1 0.0000000000000000e+00 2.7667759390215911e+00 1.3438901884741956e+00 4.2649053894657287e+00 -3 1 -5
+1102 1 0.0000000000000000e+00 2.7226773712541754e+00 5.7034117107152305e-01 3.9658552885908795e+00 -4 4 3
+1961 1 0.0000000000000000e+00 4.4133897118948804e+00 1.8610229565221879e+00 3.4440783249691758e+00 6 1 5
+2560 1 0.0000000000000000e+00 2.7932442600949723e+00 3.2789439453906105e-01 4.7111016226402551e+00 0 1 -2
+1427 1 0.0000000000000000e+00 3.7871574028740205e+00 2.0154681289280769e+00 4.1412268529252465e+00 4 1 -3
+1677 1 0.0000000000000000e+00 4.0134617403341108e+00 6.9516616636642192e-01 4.6721376252904578e+00 2 1 -8
+1786 1 0.0000000000000000e+00 4.2407086419792615e+00 2.4319481010463599e+00 2.6553928754272875e+00 2 1 -2
+1501 1 0.0000000000000000e+00 3.7072792713405542e+00 1.6154425105934580e+00 3.5213722742860001e+00 -1 -4 -2
+2992 3 1.0000000000000000e+00 3.2992373922126537e+00 8.3902600062535748e-01 4.1379712437304823e+00 -4 4 0
+245 1 0.0000000000000000e+00 3.5909763984777285e+00 2.0035414006947945e+00 3.3123353556532504e+00 -6 -5 -2
+1215 1 0.0000000000000000e+00 4.8600315004874117e+00 6.7189094637832036e-01 4.8196183351359947e+00 -3 -1 1
+1678 1 0.0000000000000000e+00 4.4522321439855235e+00 8.1868921324666355e-01 2.7228655677130833e+00 0 -2 3
+1263 1 0.0000000000000000e+00 2.6575537645545229e+00 1.3119397536875965e-03 3.3364666910055560e+00 1 6 4
+2003 1 0.0000000000000000e+00 3.0679681475665288e-01 3.0932460523043201e+00 4.5138766331529174e+00 1 -2 0
+873 1 0.0000000000000000e+00 9.1773820060796674e-01 3.1640733782877479e+00 3.3835845620976173e+00 2 -1 2
+2932 3 1.0000000000000000e+00 1.9433988042567480e+00 3.5247751098152338e+00 2.8190339261353703e+00 1 1 0
+2303 1 0.0000000000000000e+00 7.0426748297581721e-01 3.5629090681754501e+00 2.7405223391175921e+00 -2 2 3
+918 1 0.0000000000000000e+00 1.5037939830513534e+00 3.0487343214569029e+00 4.0624877734762750e+00 -9 -1 1
+1273 1 0.0000000000000000e+00 9.3089778469437112e-01 2.6412298232581422e+00 4.0867855845304311e+00 -5 3 4
+1822 1 0.0000000000000000e+00 1.3389452439478056e+00 4.3839811613723949e+00 3.1416694752857244e+00 1 2 -4
+2589 1 0.0000000000000000e+00 1.9966657491406965e+00 2.5026973800026302e+00 2.7551281161438190e+00 -2 -3 -8
+2802 1 0.0000000000000000e+00 7.7395222926414931e-01 4.5420156625699502e+00 4.7977399210076550e+00 2 3 5
+2037 1 0.0000000000000000e+00 2.3766708937649255e+00 3.8319594018208010e+00 2.9605194107251567e+00 -2 -2 -1
+1085 1 0.0000000000000000e+00 1.5970465847438233e+00 3.6418730119671077e+00 3.1738463843434412e+00 -5 0 7
+1290 1 0.0000000000000000e+00 2.4103909656391354e+00 3.5986234032520983e+00 3.7448912373834915e+00 0 -2 2
+265 1 0.0000000000000000e+00 1.8989770144042278e-01 3.7640613280758779e+00 4.4089492368109466e+00 4 0 4
+1808 1 0.0000000000000000e+00 1.4389824823246005e+00 4.5267785379344385e+00 4.9528386250856391e+00 -2 1 0
+2770 1 0.0000000000000000e+00 2.3451412673551859e+00 3.9545478861309591e+00 3.6172032818364936e+00 -3 0 -5
+1524 1 0.0000000000000000e+00 7.8667137789386610e-01 4.3350977017708185e+00 3.8614428381329855e+00 5 2 -6
+2143 1 0.0000000000000000e+00 4.9775141442283774e-02 3.7455397732178191e+00 3.4244890461182180e+00 4 -3 3
+867 1 0.0000000000000000e+00 1.0184510917826928e+00 4.8102186925259467e+00 3.3167649174432321e+00 4 3 1
+199 1 0.0000000000000000e+00 1.8914940603268382e+00 4.4141757477590344e+00 3.7872732441761343e+00 -1 -1 -1
+2477 1 0.0000000000000000e+00 1.8794618344562042e+00 2.9843952093428014e+00 3.4897188081562778e+00 7 -1 0
+2626 1 0.0000000000000000e+00 1.3587191942361756e+00 3.8287840206110539e+00 4.3730887462974621e+00 6 4 -1
+2988 3 1.0000000000000000e+00 7.4376791082491200e-01 2.5507613582596473e+00 3.5669580321766929e+00 6 3 0
+232 1 0.0000000000000000e+00 1.7420365164152063e+00 4.8779182533773655e+00 3.3329174254191973e+00 -1 1 -8
+2357 1 0.0000000000000000e+00 1.5018966831398866e+00 3.8251075506187813e+00 3.9304602201193850e+00 5 0 -4
+2672 1 0.0000000000000000e+00 6.3761324421684418e-01 2.9038927078535868e+00 2.7842372065393746e+00 2 1 -3
+1736 1 0.0000000000000000e+00 1.4369597112061858e+00 3.9369996898492836e+00 4.7281328127868720e+00 -3 -1 6
+2360 1 0.0000000000000000e+00 2.2864925179351290e+00 2.8417726897183408e+00 3.1768995279633105e+00 7 -1 1
+2300 1 0.0000000000000000e+00 2.2670518968800528e+00 3.7559998544511228e+00 4.8552489005166883e+00 4 1 -5
+249 1 0.0000000000000000e+00 4.3931560518786633e-02 4.3487463680300360e+00 3.3751616014411225e+00 1 2 1
+345 1 0.0000000000000000e+00 6.2198749143180833e-02 3.0097357461854886e+00 3.1370104246783197e+00 -1 2 3
+43 1 0.0000000000000000e+00 7.3289650817576502e-01 3.6104891221980164e+00 3.6551081809996586e+00 6 -2 2
+967 1 0.0000000000000000e+00 1.7257857645084467e+00 4.9880936194308276e+00 4.6776183741795903e+00 5 -2 0
+457 1 0.0000000000000000e+00 2.0085333069264366e+00 4.3431377133292948e+00 2.7369709800572202e+00 0 -5 3
+2295 1 0.0000000000000000e+00 1.2548513375408599e+00 4.7393991132394193e+00 4.1157376565974140e+00 5 0 -1
+1921 1 0.0000000000000000e+00 3.8871377222111791e-01 4.9551986254553171e+00 3.4754431809227020e+00 1 -5 -2
+2217 1 0.0000000000000000e+00 1.1408104330210689e+00 2.8535600761364246e+00 2.7490158491338992e+00 7 7 -2
+1588 1 0.0000000000000000e+00 1.3388577303550819e+00 2.9688487973714524e+00 4.6368023121674007e+00 2 1 4
+2480 1 0.0000000000000000e+00 2.2230143534001406e-01 3.1144729534151439e+00 4.0171712434295284e+00 1 4 0
+935 1 0.0000000000000000e+00 1.1729195451644510e+00 3.9310530195211024e+00 2.7988904121389031e+00 1 -1 -7
+290 1 0.0000000000000000e+00 1.1169889863891167e+00 3.2588029907531921e+00 4.3080599946149993e+00 1 -1 -2
+2290 1 0.0000000000000000e+00 2.2203140804650614e+00 3.9280102099532459e+00 4.3611042896548078e+00 -3 3 1
+1182 1 0.0000000000000000e+00 7.2289599330078025e-01 3.5447752062583859e+00 4.3663659159811772e+00 1 3 0
+1600 1 0.0000000000000000e+00 6.2989874136182833e-01 4.2088794203894455e+00 2.8257368391565723e+00 5 1 0
+2207 1 0.0000000000000000e+00 2.2607587829569860e+00 4.7918019230475641e+00 3.1662580556161166e+00 0 6 4
+876 1 0.0000000000000000e+00 2.3022582343792690e+00 4.6958230810945745e+00 4.0539969367192272e+00 6 6 0
+1506 1 0.0000000000000000e+00 1.7806199499214441e+00 2.5690295524526716e+00 4.9370954619553542e+00 -2 4 0
+1602 1 0.0000000000000000e+00 2.4509419526146145e-01 2.7370083806078256e+00 4.9129692317715561e+00 7 1 -3
+144 1 0.0000000000000000e+00 1.8602986353937132e+00 4.7169685657334490e+00 2.5422960254435365e+00 2 6 6
+19 1 0.0000000000000000e+00 4.0995290828991324e+00 2.6557593506776258e+00 3.9171594622973465e+00 -4 1 8
+1380 1 0.0000000000000000e+00 2.8871722247535603e+00 4.0316555278402166e+00 2.5591932219940494e+00 3 0 8
+1988 1 0.0000000000000000e+00 3.1243174039910566e+00 2.9425819651263092e+00 2.9340968358478845e+00 0 1 -3
+2257 1 0.0000000000000000e+00 3.2421134678142431e+00 4.7317980774276727e+00 4.0591042418140244e+00 3 -2 -1
+934 1 0.0000000000000000e+00 3.4760967330926777e+00 2.6283694675986724e+00 3.4945143406826782e+00 2 1 -1
+187 1 0.0000000000000000e+00 2.6692986088321815e+00 2.8121346478859732e+00 3.6188092965372380e+00 5 2 -4
+1949 1 0.0000000000000000e+00 4.4765068690416161e+00 4.7797507438461393e+00 4.0883797270977595e+00 2 5 1
+854 1 0.0000000000000000e+00 3.4164438413307234e+00 4.2390615196886516e+00 3.5630201315048735e+00 -4 4 0
+2093 1 0.0000000000000000e+00 3.5046629291608560e+00 2.6205277929863291e+00 2.9473301886784675e+00 1 2 11
+2253 1 0.0000000000000000e+00 4.9520010583581167e+00 2.9830371323541596e+00 3.5653354663449823e+00 -1 4 -2
+392 1 0.0000000000000000e+00 4.3834847331781726e+00 4.5593067062215811e+00 3.4680459281114162e+00 -8 0 3
+250 1 0.0000000000000000e+00 3.7920884955139611e+00 3.5195851806389520e+00 2.9085560618443935e+00 7 0 -8
+2029 1 0.0000000000000000e+00 3.7023570704196236e+00 4.6993339085300443e+00 4.6693757375719009e+00 1 9 3
+2006 1 0.0000000000000000e+00 3.4403334753236048e+00 3.5249441126117356e+00 4.1614414645782443e+00 2 -2 4
+424 1 0.0000000000000000e+00 4.5019560543949977e+00 2.7002784898293828e+00 4.5120550294821955e+00 0 5 -4
+1352 1 0.0000000000000000e+00 3.2619122363821504e+00 4.5933848138468010e+00 2.7029864584531964e+00 -1 1 3
+2361 1 0.0000000000000000e+00 3.0382559521765047e+00 3.6346606412904530e+00 3.4620021771920944e+00 7 4 1
+2109 1 0.0000000000000000e+00 3.7947088597548277e+00 4.5671411933548400e+00 3.7957349294230713e+00 2 -4 2
+2358 1 0.0000000000000000e+00 2.7249099410824336e+00 4.4385774493535877e+00 4.7245627602272764e+00 0 -3 10
+2181 1 0.0000000000000000e+00 4.9585158372251001e+00 4.5475591970405835e+00 4.4049825006086749e+00 -1 -5 -3
+1002 1 0.0000000000000000e+00 3.8984858524746584e+00 4.5682487302627983e+00 3.0411499633985182e+00 -1 2 -6
+1132 1 0.0000000000000000e+00 4.5573731460357827e+00 3.7642746509599285e+00 3.1455836819734233e+00 -5 1 2
+2170 1 0.0000000000000000e+00 4.8865407835802817e+00 2.7402998634314368e+00 4.9256973994174356e+00 -3 6 -3
+1803 1 0.0000000000000000e+00 2.5716913150691689e+00 4.9655718343462745e+00 2.8132009655303967e+00 4 -1 5
+2550 1 0.0000000000000000e+00 2.5947635853795714e+00 3.0732770414497081e+00 2.5273652132862638e+00 11 4 -2
+2537 1 0.0000000000000000e+00 4.1330044405131368e+00 3.8679848788434601e+00 4.3896900719824341e+00 3 -1 1
+53 1 0.0000000000000000e+00 3.2126468501902710e+00 4.0999860691804706e+00 4.1581110247232678e+00 3 0 -5
+472 1 0.0000000000000000e+00 3.9791588574993040e+00 3.7155554185536541e+00 3.7543498288972645e+00 2 1 -2
+233 1 0.0000000000000000e+00 4.5711789148164828e+00 3.4517356347992791e+00 3.3721215801819557e+00 0 5 3
+2164 1 0.0000000000000000e+00 4.7449092073617480e+00 3.1005952758461852e+00 2.6928906621847948e+00 -2 4 -3
+1823 1 0.0000000000000000e+00 3.3546693563671837e+00 3.5431741772289631e+00 3.4185195491415965e+00 -3 6 -2
+2031 1 0.0000000000000000e+00 3.5849382968141681e+00 3.1639951690900281e+00 3.9336807048311573e+00 8 -4 3
+525 1 0.0000000000000000e+00 4.3610049819235037e+00 3.9918153418470563e+00 4.8943829776541330e+00 3 -1 1
+1527 1 0.0000000000000000e+00 4.2592505228135948e+00 2.6149260551674782e+00 3.0388735597425280e+00 3 6 -1
+1129 1 0.0000000000000000e+00 2.8773481181299636e+00 2.9924309310330286e+00 4.5660616628402781e+00 -1 0 5
+405 1 0.0000000000000000e+00 4.7364791599922551e+00 4.2955222522646777e+00 2.7021143639119303e+00 9 2 -1
+2440 1 0.0000000000000000e+00 4.3328853469947077e+00 3.0743643078273255e+00 3.7821408995845354e+00 -1 -3 -5
+268 1 0.0000000000000000e+00 3.6741486699273449e+00 4.1275900657343065e+00 2.7858870597100491e+00 1 5 3
+1664 1 0.0000000000000000e+00 4.7661627036312506e+00 4.8122611271858844e+00 3.4258643096734991e+00 -1 3 -2
+2755 1 0.0000000000000000e+00 2.6332970584804674e+00 3.5831353800884336e+00 4.7626428406888506e+00 0 -2 4
+2445 1 0.0000000000000000e+00 2.9890432705605763e+00 4.5258025627498046e+00 3.3965017735385028e+00 -5 0 -9
+1710 1 0.0000000000000000e+00 3.6571601422023980e+00 3.1852467154093644e+00 4.9355278585693485e+00 -2 4 -1
+1936 1 0.0000000000000000e+00 4.7368869499969612e+00 3.8500315218337655e+00 4.2415899777956740e+00 6 -2 3
+1869 1 0.0000000000000000e+00 4.2660580836996340e+00 4.7754858489173895e+00 4.4918497082326114e+00 0 1 -1
+2391 1 0.0000000000000000e+00 3.3277351114029430e+00 2.6309513456850384e+00 4.0597698186279363e+00 0 0 1
+2439 1 0.0000000000000000e+00 4.6101382932190427e-01 6.9120399162567303e-01 5.4515832100801633e+00 -1 2 -3
+882 1 0.0000000000000000e+00 7.6698661834788051e-01 1.8561199842007987e+00 6.3432401562308103e+00 2 1 -1
+795 1 0.0000000000000000e+00 2.4244186165370882e+00 1.9025337821425743e+00 6.0591939678124698e+00 -3 3 -1
+2867 2 -1.0000000000000000e+00 2.4651221981474731e+00 6.0655501585653726e-01 6.2754009482871549e+00 3 0 -4
+840 1 0.0000000000000000e+00 1.9491083218181178e+00 4.0897133256962021e-01 5.1921879908923287e+00 -2 5 -4
+928 1 0.0000000000000000e+00 2.1554509299941533e+00 1.7918654086431147e+00 5.3125631065205727e+00 -1 3 3
+1099 1 0.0000000000000000e+00 6.6429346184775168e-02 2.1027367507648492e-01 5.8205127911983148e+00 -5 2 1
+1894 1 0.0000000000000000e+00 2.1734653318310935e+00 9.0956052676262500e-01 6.6536707054792403e+00 2 1 -1
+837 1 0.0000000000000000e+00 8.1325487941057995e-01 2.4186628673219945e+00 6.7372756499874011e+00 3 -1 6
+2863 2 -1.0000000000000000e+00 1.7111850046013788e+00 3.2828921901994212e-02 7.3317935748293870e+00 5 0 3
+2977 3 1.0000000000000000e+00 1.2120224290486887e+00 9.1181632877366714e-01 6.2147844700920487e+00 -2 -4 6
+171 1 0.0000000000000000e+00 1.6029005370723253e+00 6.4335850273437678e-01 5.3882589096187514e+00 4 7 -2
+2619 1 0.0000000000000000e+00 1.0655935547509576e+00 1.2768477428046989e+00 5.9147518195103022e+00 0 -4 -2
+710 1 0.0000000000000000e+00 1.7034139332183487e-01 8.0773853458927980e-01 6.8333289057281661e+00 -5 7 10
+1872 1 0.0000000000000000e+00 6.6489654488793815e-01 6.8005331746677689e-01 6.0511733292619878e+00 1 -2 0
+1969 1 0.0000000000000000e+00 2.2519042250420865e-01 2.3552127969270917e+00 5.3534566557162568e+00 -4 -2 -6
+2566 1 0.0000000000000000e+00 5.5609865661584157e-01 1.6423912675436334e+00 7.3303805619772300e+00 -3 0 -4
+738 1 0.0000000000000000e+00 1.1192619066822129e+00 1.7246220796809886e+00 5.6292635147313588e+00 1 5 2
+861 1 0.0000000000000000e+00 1.6910065144202164e+00 1.7581855255746421e+00 7.3198823015096472e+00 -1 5 1
+215 1 0.0000000000000000e+00 1.0192308106968826e+00 2.1062971692443027e+00 5.0585151632198526e+00 3 1 -3
+2356 1 0.0000000000000000e+00 3.6538692410449630e-01 2.1179222714819154e-01 6.3860808227391939e+00 -1 1 1
+2176 1 0.0000000000000000e+00 3.9231816557397758e-01 2.5133178155170738e-01 7.2247335486940667e+00 5 3 5
+1286 1 0.0000000000000000e+00 8.8756984137023409e-01 2.8945182854800061e-01 5.6600812015239148e+00 -1 0 2
+1351 1 0.0000000000000000e+00 1.8092075901872451e+00 1.6224467383641712e+00 6.3495838247842098e+00 6 -2 -2
+2631 1 0.0000000000000000e+00 1.5683812515591620e+00 2.4569433035653163e+00 6.2366782498100308e+00 1 -2 -1
+2378 1 0.0000000000000000e+00 2.3698411829424382e-01 1.2604481246418124e+00 6.4047132466719248e+00 -1 -3 -5
+434 1 0.0000000000000000e+00 1.2140780935076789e+00 1.0262576372343934e+00 5.1313293037116576e+00 -6 6 3
+2425 1 0.0000000000000000e+00 5.2415426901268569e-01 4.8795430021086278e-01 6.7024766854728366e+00 -2 -3 2
+2004 1 0.0000000000000000e+00 2.0508654503558517e+00 5.3309762340005812e-02 6.4356282036507944e+00 4 -3 -2
+1021 1 0.0000000000000000e+00 1.4457994607455404e+00 2.4038122598204943e+00 7.3281798429633129e+00 -3 -7 3
+2260 1 0.0000000000000000e+00 1.1380276009421182e+00 1.0556736416945081e+00 6.8360332386991924e+00 7 2 -2
+2788 1 0.0000000000000000e+00 1.0946112464692281e+00 7.5056461489747250e-01 7.1836756005437907e+00 -1 -3 1
+1440 1 0.0000000000000000e+00 2.7574978301686331e-01 2.1641968363759090e+00 7.2815207148273977e+00 -1 -12 -4
+2777 1 0.0000000000000000e+00 2.3277613431356858e+00 9.4455979217175079e-01 5.6974871368361653e+00 1 4 7
+1457 1 0.0000000000000000e+00 1.7544182610600942e+00 1.4115202271807472e+00 5.2203454605701021e+00 -2 4 -4
+2859 2 -1.0000000000000000e+00 1.8701539455607556e+00 2.4650007985534677e+00 5.9157131901613917e+00 -2 4 2
+762 1 0.0000000000000000e+00 2.0901510058736067e-01 1.1975579841606947e+00 5.2876606800131061e+00 3 -3 -7
+1152 1 0.0000000000000000e+00 1.9831139816341457e+00 1.7488280040892930e+00 6.8553465079590143e+00 1 4 -1
+1437 1 0.0000000000000000e+00 1.2062716392391810e+00 1.6878641726426649e+00 7.0679075341387003e+00 -1 -3 -1
+2713 1 0.0000000000000000e+00 1.3511875756238032e+00 2.2476234257575132e+00 6.4641397609451730e+00 3 1 -2
+2696 1 0.0000000000000000e+00 6.2788630187024819e-01 1.2143172291703641e+00 7.4905791506867292e+00 -2 2 -2
+1562 1 0.0000000000000000e+00 2.4783647027388186e-01 1.3738677721312247e+00 5.9711902964739885e+00 -2 -5 -3
+2064 1 0.0000000000000000e+00 1.3565226653306028e+00 2.2010309903495054e-01 5.1061588497063157e+00 -1 -3 -2
+647 1 0.0000000000000000e+00 1.8904081467323599e+00 1.1100591079157887e+00 7.0681709579169762e+00 -1 -2 0
+2970 3 1.0000000000000000e+00 7.1957844974946839e-01 1.9271703706840710e+00 5.6001390351853733e+00 3 3 -2
+2903 3 1.0000000000000000e+00 1.6060271568021192e+00 4.8285168161378528e-01 6.5399527765091729e+00 5 5 -3
+2806 2 -1.0000000000000000e+00 2.0296605018087099e+00 2.0686221833866996e+00 5.0322660422184420e+00 10 -11 2
+2399 1 0.0000000000000000e+00 3.5128263435004001e+00 3.8746488352259245e-01 7.4426319545630095e+00 0 0 1
+509 1 0.0000000000000000e+00 4.2596249237297910e+00 2.1620091954796683e+00 5.3500602741476513e+00 3 1 1
+1136 1 0.0000000000000000e+00 4.6674934835710697e+00 2.0205105506163887e+00 7.3619882815842477e+00 6 4 -2
+2228 1 0.0000000000000000e+00 3.2125448191705908e+00 2.4867817760912230e+00 7.1978258149737320e+00 2 5 0
+1642 1 0.0000000000000000e+00 4.3382865064947493e+00 2.2035148836322005e+00 6.7866934128230749e+00 9 -2 0
+1319 1 0.0000000000000000e+00 4.9739936786988030e+00 5.1621002922217507e-01 5.5644052407513644e+00 -5 1 2
+1520 1 0.0000000000000000e+00 4.5826760543611709e+00 2.3907932643636434e+00 5.8372789132991230e+00 2 2 -1
+1574 1 0.0000000000000000e+00 4.5544055621606514e+00 6.2107822310201788e-01 6.5741067625735603e+00 -2 4 1
+2524 1 0.0000000000000000e+00 3.7405885243154104e+00 2.0037687282460137e+00 6.6051861848577937e+00 -1 3 2
+2856 2 -1.0000000000000000e+00 2.9970912386082120e+00 8.4710121639336367e-01 6.0498987508213045e+00 2 -1 -5
+1982 1 0.0000000000000000e+00 4.3926321760665132e+00 1.0593004044313465e+00 5.2238078997181470e+00 5 3 4
+2939 3 1.0000000000000000e+00 2.8647383646354969e+00 1.3785029130863709e+00 5.8666473346606587e+00 -4 1 1
+328 1 0.0000000000000000e+00 3.4794420280351677e+00 1.2171852417146423e+00 5.8901872463947180e+00 -2 -3 3
+1661 1 0.0000000000000000e+00 3.4416845289826230e+00 2.0559400167057005e+00 5.7909339615874602e+00 -1 1 -1
+658 1 0.0000000000000000e+00 2.7818929741766603e+00 9.1498258400468113e-01 6.7205784701235602e+00 4 0 -7
+2533 1 0.0000000000000000e+00 3.5894051582597810e+00 1.0353444777149670e+00 5.2706317644282965e+00 4 -2 1
+1248 1 0.0000000000000000e+00 3.4082017711395731e+00 7.3569975727540171e-01 6.6186491872097895e+00 2 -3 -2
+1663 1 0.0000000000000000e+00 3.7104279079727873e+00 1.5786597802217168e+00 6.9473350468784298e+00 0 -3 4
+1142 1 0.0000000000000000e+00 3.0412025051115048e+00 1.5482602585351474e-01 5.4903666159799291e+00 1 3 -1
+1175 1 0.0000000000000000e+00 3.8984507732603473e+00 1.9876849258122360e+00 7.2639893887506011e+00 2 3 2
+2421 1 0.0000000000000000e+00 3.8630237652680348e+00 7.0726858898118694e-01 5.3463530878238599e+00 0 1 1
+2659 1 0.0000000000000000e+00 3.4976743172575198e+00 4.5255889997802023e-01 5.5293173860255020e+00 -2 3 3
+634 1 0.0000000000000000e+00 3.2939032355559430e+00 2.1280180624978068e-01 6.8872133074434849e+00 -7 -5 2
+2710 1 0.0000000000000000e+00 4.1311465720630860e+00 1.2541161466910338e+00 6.3296578706127500e+00 -2 -1 1
+2341 1 0.0000000000000000e+00 2.5522813470061454e+00 1.6514807877690985e+00 6.7409509293204160e+00 0 0 -4
+583 1 0.0000000000000000e+00 2.7060576985860192e+00 1.8704422095887021e+00 7.2593357400659428e+00 3 4 -3
+2754 1 0.0000000000000000e+00 3.2440914104656922e+00 1.4990875768430119e+00 6.9456530466339323e+00 4 2 0
+1163 1 0.0000000000000000e+00 2.8151650123114567e+00 1.7056231486742599e+00 5.1791747863372359e+00 1 -2 -5
+2314 1 0.0000000000000000e+00 3.7362766655408670e+00 9.3108605369955993e-02 5.9920856647414711e+00 1 -3 -3
+1172 1 0.0000000000000000e+00 2.5427000405747586e+00 2.4242925481170507e+00 6.5441973637021391e+00 6 -2 2
+1625 1 0.0000000000000000e+00 3.2204331159485884e+00 1.0765600368856683e+00 7.3245274394994704e+00 4 3 0
+1204 1 0.0000000000000000e+00 2.8034996819666977e+00 3.9126223892778061e-01 7.1602062885097748e+00 2 3 -8
+2705 1 0.0000000000000000e+00 4.5863135922555163e+00 7.5494927750808105e-01 5.9498107640130646e+00 1 3 -1
+706 1 0.0000000000000000e+00 3.1698310330130939e+00 2.4946309867542769e+00 6.4784214120749981e+00 -1 -3 -2
+1419 1 0.0000000000000000e+00 3.8163746383627588e+00 7.0352070853294979e-01 6.6851876917098298e+00 0 1 0
+1752 1 0.0000000000000000e+00 2.5655105238032117e+00 6.9183604665523513e-01 5.1878330852755585e+00 -1 -1 -3
+2783 1 0.0000000000000000e+00 4.5903466196446825e+00 1.4246226241698481e+00 6.7495855505385158e+00 11 0 -1
+2968 3 1.0000000000000000e+00 4.3283440643030309e+00 1.9787788286639068e+00 5.9417316698734028e+00 0 -2 -4
+1222 1 0.0000000000000000e+00 4.4863949173760833e+00 6.8423348689737962e-01 7.2080222877413247e+00 -3 1 -7
+2678 1 0.0000000000000000e+00 2.9434781110551604e+00 2.3311004045153156e+00 5.7811783141757234e+00 -5 1 -6
+538 1 0.0000000000000000e+00 4.0094571489133095e+00 2.8466337053380059e-01 5.9844935257350409e+00 -1 1 -2
+482 1 0.0000000000000000e+00 4.9577438216810599e+00 1.8853684741286596e+00 7.2762597589146614e+00 3 3 2
+2544 1 0.0000000000000000e+00 4.2816404263279422e+00 1.4334752992238877e+00 5.4755669100120121e+00 3 -2 -2
+2548 1 0.0000000000000000e+00 3.9757114089071295e+00 6.5799916871504160e-01 7.2451322883612690e+00 4 -7 -3
+352 1 0.0000000000000000e+00 3.5031401633269748e+00 1.8309860698969600e+00 5.2198669011534600e+00 1 -2 2
+1315 1 0.0000000000000000e+00 4.1345566097702662e+00 2.3440619243804122e+00 5.0498244115450284e+00 1 -6 -1
+1018 1 0.0000000000000000e+00 2.7502363872649975e+00 3.7854199371381014e-03 6.0591167004448740e+00 6 -3 5
+1187 1 0.0000000000000000e+00 1.9412036373230628e+00 2.5016999355429972e+00 7.1662045497800877e+00 -2 1 0
+1516 1 0.0000000000000000e+00 4.7896530281157940e-01 3.5289777166607235e+00 7.1651168917181112e+00 2 -1 -7
+862 1 0.0000000000000000e+00 1.0635535372067224e+00 4.1656149441972792e+00 6.7205737990214702e+00 1 0 -2
+2155 1 0.0000000000000000e+00 1.0812114724421678e+00 4.8522786543419940e+00 7.4268994267101096e+00 6 1 6
+2772 1 0.0000000000000000e+00 9.1648743235133445e-01 4.6285121206472031e+00 5.2349943210506629e+00 -3 -4 0
+2698 1 0.0000000000000000e+00 1.9445712193127063e+00 2.9080025501384301e+00 6.6473935009963157e+00 -2 3 5
+205 1 0.0000000000000000e+00 8.7288666680886684e-01 4.3166382723587349e+00 6.9610624616788019e+00 -5 -2 1
+221 1 0.0000000000000000e+00 9.5213177536059346e-01 3.8635347835233640e+00 7.2822683750183996e+00 3 5 2
+110 1 0.0000000000000000e+00 2.9170821091931259e-01 3.3540355608409942e+00 7.3602812239520716e+00 10 -1 12
+2649 1 0.0000000000000000e+00 8.0643032773850831e-01 4.9876194332280930e+00 6.3590121880193466e+00 3 -2 2
+591 1 0.0000000000000000e+00 2.2798370493162387e-01 2.5704382565763382e+00 6.9876611037193470e+00 5 -4 -5
+1069 1 0.0000000000000000e+00 7.1498321797544795e-01 4.5962957817576289e+00 6.0611954387599321e+00 2 -1 4
+2751 1 0.0000000000000000e+00 8.2408811645618385e-01 3.8820025114202887e+00 5.3445589110804512e+00 -4 2 8
+1887 1 0.0000000000000000e+00 8.8915969287527097e-01 2.9039829350045037e+00 6.3656764096090601e+00 6 0 5
+2964 3 1.0000000000000000e+00 1.9704070293171720e+00 3.1921619869666888e+00 7.4424954525902631e+00 4 -3 -3
+1666 1 0.0000000000000000e+00 3.6670855931056051e-01 4.0828485996226744e+00 6.1143974458875823e+00 -1 1 -2
+2259 1 0.0000000000000000e+00 9.3501650701399860e-02 4.3978769473063313e+00 6.8877188357682186e+00 2 5 -5
+445 1 0.0000000000000000e+00 2.2650844232095793e+00 3.7558393548002957e+00 6.4384483453544208e+00 1 2 -4
+2862 2 -1.0000000000000000e+00 1.6555824775334447e+00 3.5164803427208455e+00 6.9120844284312337e+00 -1 -9 -4
+1200 1 0.0000000000000000e+00 3.9192980713342807e-01 2.7668102593525150e+00 6.0622062237641687e+00 0 -4 2
+2503 1 0.0000000000000000e+00 1.9422402582865796e+00 3.7511287586264599e+00 5.6031770471462918e+00 0 1 2
+1376 1 0.0000000000000000e+00 1.3659079448710085e+00 3.7198007601087144e+00 5.9939014642169166e+00 11 -7 4
+2082 1 0.0000000000000000e+00 6.5063716625412923e-02 4.9396193749075126e+00 5.9605354605007426e+00 1 1 -1
+2810 2 -1.0000000000000000e+00 2.0211445786816946e+00 4.6468393035996112e+00 5.1953634660191756e+00 -4 3 -3
+481 1 0.0000000000000000e+00 2.0941928886156558e+00 3.2986274016947648e+00 5.1484653480099363e+00 3 2 3
+2419 1 0.0000000000000000e+00 1.9090631460025713e+00 3.3853397819477351e+00 6.4026877266127622e+00 7 2 1
+2828 2 -1.0000000000000000e+00 2.1593740464153641e+00 4.3330653254317353e+00 5.2414676434470211e+00 -9 4 0
+1821 1 0.0000000000000000e+00 5.9867288114208472e-01 2.9615390209797932e+00 5.4601787296586481e+00 -1 -4 5
+1536 1 0.0000000000000000e+00 8.8018920620112640e-01 3.2310465661741929e+00 6.6373881416679126e+00 -2 -3 4
+562 1 0.0000000000000000e+00 4.1437895756703702e-01 3.6577838903440925e+00 6.4512406660861670e+00 0 -2 3
+521 1 0.0000000000000000e+00 2.1373122496173065e+00 4.5523951015512658e+00 6.1208753543215773e+00 3 2 -1
+58 1 0.0000000000000000e+00 9.6091053782638836e-01 3.6286016157339627e+00 5.7955280960255156e+00 1 1 -2
+776 1 0.0000000000000000e+00 2.3741645897153809e+00 4.5761270605663595e+00 7.0436254961436289e+00 1 1 -1
+303 1 0.0000000000000000e+00 2.4896868960824321e+00 4.0413312528980070e+00 5.8503620308861768e+00 -2 1 -7
+2039 1 0.0000000000000000e+00 1.1476039710776496e+00 4.0876518305626224e+00 6.1567511503674188e+00 5 -3 -2
+1612 1 0.0000000000000000e+00 1.1274720529567848e+00 2.7680073821888969e+00 5.5249738215034991e+00 0 6 -2
+785 1 0.0000000000000000e+00 1.7645536076442490e+00 4.4051672322413200e+00 7.0604426187765057e+00 0 2 4
+2121 1 0.0000000000000000e+00 8.0417432378390985e-01 3.8632660054981454e+00 5.0463099865275645e+00 7 3 2
+1778 1 0.0000000000000000e+00 1.0352185208645095e+00 2.9758702355996829e+00 7.1093877887228780e+00 -3 -4 2
+816 1 0.0000000000000000e+00 1.3271142755168908e+00 4.6140016879709362e+00 5.4952000100625513e+00 -1 2 8
+2370 1 0.0000000000000000e+00 2.3686939922499430e+00 3.9764774812617087e+00 7.2312166697744189e+00 -1 -1 -11
+788 1 0.0000000000000000e+00 2.2403277116635687e+00 4.9495466959530932e+00 6.2761815468255042e+00 -2 4 1
+2032 1 0.0000000000000000e+00 1.7751001939481827e+00 4.2500423175581368e+00 6.2044187808548985e+00 3 3 4
+2127 1 0.0000000000000000e+00 2.1203134238635615e-01 4.8929701346007368e+00 6.8947466490814628e+00 2 1 0
+1276 1 0.0000000000000000e+00 2.3777676581786102e+00 2.6419504285832613e+00 5.9465073307187186e+00 4 1 5
+2872 2 -1.0000000000000000e+00 1.4263119205451420e+00 4.7120224775416419e+00 6.6748157643075317e+00 -2 -2 0
+1469 1 0.0000000000000000e+00 1.5410752005337245e+00 3.1670838553559788e+00 6.0155709376695770e+00 4 1 1
+577 1 0.0000000000000000e+00 1.4761191046974487e+00 3.4564474621519397e+00 5.0732599077524396e+00 3 0 2
+2068 1 0.0000000000000000e+00 1.5058997643216640e-01 4.1196597266187860e+00 5.0428608261326477e+00 0 3 -1
+340 1 0.0000000000000000e+00 2.2862150387510383e-03 3.7101673945655276e+00 5.7268275387259786e+00 -3 -3 -1
+2152 1 0.0000000000000000e+00 3.4946015202217935e+00 3.0387847023295773e+00 5.8054188567882461e+00 1 3 -1
+370 1 0.0000000000000000e+00 4.6533427151757634e+00 4.8642017020650874e+00 7.2551011649826487e+00 -5 -3 1
+2413 1 0.0000000000000000e+00 2.7249888000869573e+00 3.2077299018706520e+00 6.7245122772765713e+00 2 2 -1
+1388 1 0.0000000000000000e+00 2.8794664536615628e+00 3.0544839767974565e+00 5.5613196633094955e+00 4 -2 -9
+2993 3 1.0000000000000000e+00 3.9937454515290178e+00 4.3171045321529213e+00 5.0218763234157606e+00 -4 2 1
+2496 1 0.0000000000000000e+00 4.3687953219368740e+00 2.6632062441459476e+00 6.9728072425810517e+00 -1 5 0
+2232 1 0.0000000000000000e+00 4.7936832088225190e+00 3.9295043633156044e+00 5.3002917875821600e+00 2 -1 -3
+2600 1 0.0000000000000000e+00 4.6490458281147289e+00 4.2965284204307750e+00 6.8737703047289793e+00 4 0 0
+947 1 0.0000000000000000e+00 4.8030462044637234e+00 2.6892543811781322e+00 6.3127030117663212e+00 5 5 0
+974 1 0.0000000000000000e+00 2.9000887277721410e+00 3.7019064735309057e+00 6.8240130480542778e+00 4 5 4
+1892 1 0.0000000000000000e+00 3.7943695753161655e+00 4.4031261561149693e+00 6.8979073211454374e+00 4 1 -1
+507 1 0.0000000000000000e+00 3.7873019188210564e+00 2.7953781574180230e+00 7.1195958542517088e+00 -1 1 -5
+674 1 0.0000000000000000e+00 3.6226973783750465e+00 2.8705749963042537e+00 5.3837966236316745e+00 -6 2 1
+1045 1 0.0000000000000000e+00 3.6858809976925433e+00 4.0280429363491832e+00 6.3149142394343007e+00 3 -4 2
+1499 1 0.0000000000000000e+00 4.2388266811689386e+00 4.9485490518278477e+00 7.1976327302593406e+00 -5 -3 1
+2871 2 -1.0000000000000000e+00 4.4889186350850885e+00 3.4121425215509658e+00 5.1405388811977550e+00 2 5 1
+1862 1 0.0000000000000000e+00 4.1267524255671288e+00 3.4400209340127099e+00 6.6020365190249928e+00 0 0 -3
+1292 1 0.0000000000000000e+00 3.0004920016458407e+00 3.7416366930059404e+00 5.0399747283333758e+00 5 1 0
+124 1 0.0000000000000000e+00 3.9507688231878464e+00 2.5923993258197382e+00 5.8951787426867135e+00 2 5 1
+1114 1 0.0000000000000000e+00 4.8609258813191012e+00 3.4101354674524309e+00 5.9908690581992259e+00 -4 1 -2
+1566 1 0.0000000000000000e+00 2.8781924140167163e+00 3.3443546212728537e+00 5.9971682603749752e+00 0 -1 3
+960 1 0.0000000000000000e+00 3.7828816511040677e+00 4.5202809615830368e+00 5.5078498981905772e+00 -1 -1 -2
+1532 1 0.0000000000000000e+00 4.5510704127940746e+00 3.8206676576526801e+00 6.0582918108051000e+00 0 1 -2
+2883 2 -1.0000000000000000e+00 2.7322711437982616e+00 4.9860882543955372e+00 5.5749401268725300e+00 0 4 -2
+542 1 0.0000000000000000e+00 3.8084709831145900e+00 4.4751296891168852e+00 6.4352442192114347e+00 1 -5 2
+1226 1 0.0000000000000000e+00 2.9947270082559756e+00 4.1883857212251030e+00 6.4234085314825036e+00 -3 -1 3
+889 1 0.0000000000000000e+00 2.8137686158754578e+00 4.3193589746883427e+00 5.4022187701441018e+00 1 0 3
+2910 3 1.0000000000000000e+00 3.6132218213063809e+00 3.5131760202773723e+00 7.2620100901452602e+00 1 -4 2
+1137 1 0.0000000000000000e+00 4.9293960286207987e+00 2.5803132719883832e+00 5.3734475081683275e+00 -4 2 -5
+800 1 0.0000000000000000e+00 2.9494021648476019e+00 2.7972670195138418e+00 7.1513653137009676e+00 3 0 -4
+904 1 0.0000000000000000e+00 4.4173146698770873e+00 3.4263916343988643e+00 7.0327404129218065e+00 1 -5 8
+1895 1 0.0000000000000000e+00 4.7989899664737754e+00 3.3983532384261017e+00 7.4372704685002331e+00 -1 1 -4
+522 1 0.0000000000000000e+00 4.2889821882958783e+00 4.6828370862239872e+00 6.0801544083774530e+00 -1 -1 -10
+1230 1 0.0000000000000000e+00 4.2164341204586488e+00 3.1178558996638439e+00 5.5898629904076902e+00 -1 1 0
+897 1 0.0000000000000000e+00 3.6720340271773964e+00 2.7830890137186253e+00 6.5089565591333658e+00 -3 1 0
+2604 1 0.0000000000000000e+00 4.2268391995726269e+00 3.8304438329844639e+00 6.7995505739904409e+00 -5 -3 6
+923 1 0.0000000000000000e+00 4.3969646259855493e+00 4.3129310763972990e+00 6.2457399495634576e+00 3 2 -1
+301 1 0.0000000000000000e+00 4.8249418096325236e+00 4.7546005509737155e+00 6.7421145218652834e+00 -1 -5 1
+2025 1 0.0000000000000000e+00 3.1759641440525606e+00 4.4244442926253997e+00 5.8106545223135910e+00 1 0 -3
+1884 1 0.0000000000000000e+00 3.7733472564287815e+00 3.8981668567128636e+00 5.6393657169453144e+00 0 1 2
+2140 1 0.0000000000000000e+00 3.2362463936689898e+00 4.6342092064303735e+00 7.0138704757203794e+00 -4 1 -1
+1253 1 0.0000000000000000e+00 2.5979635139738675e+00 2.6642713661276902e+00 5.1127393951805651e+00 -4 1 5
+2750 1 0.0000000000000000e+00 4.5573745739605975e+00 4.5574766190027907e+00 5.5245543410718767e+00 0 -4 1
+1722 1 0.0000000000000000e+00 3.8313288912857608e+00 4.3864815938235218e+00 7.3673958211512396e+00 3 8 3
+2423 1 0.0000000000000000e+00 4.0846690682289237e+00 3.5742203100531875e+00 5.0688373183902753e+00 0 3 -3
+1653 1 0.0000000000000000e+00 2.6383343432082489e+00 4.9584695937108156e+00 6.5258741241126037e+00 -1 -6 1
+1676 1 0.0000000000000000e+00 2.9355509902398818e+00 4.1342860421023566e+00 7.4486392558539185e+00 -11 -4 -2
+2602 1 0.0000000000000000e+00 3.4404078749458167e+00 4.1004580250533333e+00 5.0074988069186048e+00 -6 1 -1
+15 1 0.0000000000000000e+00 3.6670113336595966e-01 2.3093519131120677e-01 8.4681971017392303e+00 0 0 3
+1223 1 0.0000000000000000e+00 1.4511029519630800e+00 1.2646449306456600e+00 8.5777260402761328e+00 0 7 -3
+2467 1 0.0000000000000000e+00 2.2945708906855580e+00 1.6340614291894590e-01 8.0738462556685118e+00 -1 2 -2
+2892 2 -1.0000000000000000e+00 1.3047241130532297e+00 1.9731706485776672e+00 9.3502859265170049e+00 3 -5 -6
+223 1 0.0000000000000000e+00 2.0325884501154352e+00 5.7322788611219888e-01 8.9037631032565319e+00 -5 -5 -5
+61 1 0.0000000000000000e+00 1.8674145510663731e-01 1.9213834624503614e+00 8.5900344768326740e+00 3 2 -2
+1729 1 0.0000000000000000e+00 8.4417858690300429e-01 2.2233384592788724e-01 9.4525044155584315e+00 1 0 4
+1210 1 0.0000000000000000e+00 1.9494321645984458e+00 1.4329979945410642e+00 9.2765784747062074e+00 3 -6 -1
+475 1 0.0000000000000000e+00 1.4709527613650955e+00 4.6361736707248596e-01 9.3027178736229850e+00 1 -5 2
+2256 1 0.0000000000000000e+00 2.1644533678994229e+00 4.8287678348932528e-01 7.6981604341125633e+00 -3 7 -2
+2001 1 0.0000000000000000e+00 1.8484807253090827e+00 1.7116203377495054e-01 8.7246263703351605e+00 -2 -1 1
+1306 1 0.0000000000000000e+00 3.3354928986436716e-01 1.9986346354407423e+00 9.7100908088947904e+00 5 1 5
+1950 1 0.0000000000000000e+00 5.9941438702753491e-01 2.3122672710575003e+00 8.5931398095323441e+00 5 -2 -2
+2204 1 0.0000000000000000e+00 2.1146435457828492e+00 9.9304268505948712e-01 9.3633504613890359e+00 1 3 -1
+2971 3 1.0000000000000000e+00 3.1189652135033441e-02 1.1187862576940132e-01 7.7384606949720869e+00 -3 7 1
+790 1 0.0000000000000000e+00 1.7889756425968963e+00 1.8694845228263517e+00 8.6237252227391537e+00 -3 11 -1
+1693 1 0.0000000000000000e+00 3.3075094251601705e-01 1.2071122602517819e+00 9.5759542232875994e+00 -2 -5 1
+1544 1 0.0000000000000000e+00 4.3727257988756707e-01 1.6943243397428245e+00 7.8495083389740028e+00 -4 0 -5
+501 1 0.0000000000000000e+00 1.4734315469506742e+00 2.4747354813782219e-01 7.8370959670196463e+00 1 0 2
+412 1 0.0000000000000000e+00 2.2979410744307485e+00 3.7231184902312436e-01 9.6328416851830472e+00 -1 8 0
+2742 1 0.0000000000000000e+00 1.5360172805140626e+00 6.6401955223774978e-01 8.4122999599769308e+00 -1 0 2
+202 1 0.0000000000000000e+00 1.0594127383843182e+00 6.8401896653074812e-01 9.1051331775286251e+00 6 -3 -5
+1485 1 0.0000000000000000e+00 1.9056374397730127e+00 1.1332968948122273e+00 7.8779168771449930e+00 -2 0 -3
+2407 1 0.0000000000000000e+00 8.1914147210112545e-02 5.7881124629631664e-01 9.7552050910886781e+00 3 -6 -3
+995 1 0.0000000000000000e+00 1.2725046165173082e+00 1.4363398557037488e+00 9.7814959861345532e+00 5 0 4
+2422 1 0.0000000000000000e+00 1.9746731940677881e-01 2.4643801422251577e+00 7.8111117522020175e+00 4 -1 0
+718 1 0.0000000000000000e+00 1.9556799491357020e+00 1.5663434972760859e+00 7.9622024205552782e+00 1 2 0
+1300 1 0.0000000000000000e+00 2.2937792256731591e+00 1.0790760827096679e+00 8.8904017812971841e+00 -5 -1 5
+2581 1 0.0000000000000000e+00 1.7943843547633294e-02 2.4531085275260478e-01 8.9353192339838614e+00 2 7 -1
+2648 1 0.0000000000000000e+00 1.0238668034089597e+00 2.2677930512124318e+00 7.7995812434730487e+00 4 2 2
+2302 1 0.0000000000000000e+00 8.9691091172572901e-02 1.1106770657708049e+00 8.2111556728821444e+00 -5 -5 -3
+514 1 0.0000000000000000e+00 6.7880927441697581e-01 6.2142294763871320e-01 7.9577737590138931e+00 -3 1 -3
+1060 1 0.0000000000000000e+00 6.4689416743901773e-01 6.3810089704885664e-02 7.8884820716990571e+00 0 0 -1
+865 1 0.0000000000000000e+00 9.9026762355225417e-01 1.6595211858578376e+00 8.8421526512964093e+00 -2 0 6
+2736 1 0.0000000000000000e+00 2.3333241026108373e+00 1.9378583670121199e+00 9.5217538013216600e+00 1 1 -4
+1331 1 0.0000000000000000e+00 1.2364814953720542e+00 1.1071571413437173e+00 7.8590582134367200e+00 5 -2 -1
+2598 1 0.0000000000000000e+00 8.4936376114169898e-01 1.7102498037106624e+00 8.1268716139908648e+00 4 -5 -6
+2430 1 0.0000000000000000e+00 7.9042235618615342e-01 9.3556570169984299e-01 8.6531845722838412e+00 0 2 -2
+2050 1 0.0000000000000000e+00 1.6226386989360297e+00 1.9377402279241294e+00 8.2156203599764321e+00 0 -3 1
+375 1 0.0000000000000000e+00 8.2644244026765443e-02 2.2154100852860603e+00 9.3376386372693485e+00 5 -2 6
+2022 1 0.0000000000000000e+00 4.0413406957145936e-01 1.2778068353422503e+00 8.9316297696661682e+00 -4 -5 1
+927 1 0.0000000000000000e+00 2.4785946570475206e+00 1.7970829996570732e+00 8.8966909851224116e+00 2 1 -2
+1920 1 0.0000000000000000e+00 1.8717026962568708e+00 2.3594128075063856e+00 9.1877055211364489e+00 -7 3 -4
+2647 1 0.0000000000000000e+00 6.5018795684142006e-01 1.0851205762467675e+00 9.7451729587840212e+00 1 -1 -3
+1346 1 0.0000000000000000e+00 1.3714779464147580e+00 2.3536847523332156e+00 9.9452600867057406e+00 1 1 1
+2416 1 0.0000000000000000e+00 7.8115536966268850e-01 2.2525609012654031e+00 9.9408122367029819e+00 -2 2 1
+1687 1 0.0000000000000000e+00 1.3713216522233944e+00 7.6340647940074546e-01 9.9899250378845554e+00 -1 -2 -4
+695 1 0.0000000000000000e+00 4.3120130495616289e+00 1.3421496290579067e+00 7.6014281207428018e+00 -2 3 -1
+2552 1 0.0000000000000000e+00 2.5318895122186631e+00 9.9486323136339527e-01 7.6636689559140070e+00 6 2 1
+2401 1 0.0000000000000000e+00 4.1249580828315544e+00 1.3808112363911211e+00 8.6667509211358205e+00 -1 3 1
+2415 1 0.0000000000000000e+00 3.5920960194373079e+00 1.4526863665015568e+00 9.7026270544481168e+00 3 4 0
+682 1 0.0000000000000000e+00 3.8410383388928926e+00 2.2870165529220339e+00 9.7711696532761465e+00 1 3 -4
+1564 1 0.0000000000000000e+00 4.3438523230791377e+00 1.7823757455326408e+00 9.4783995357078847e+00 -6 -6 8
+1497 1 0.0000000000000000e+00 3.4974701890808353e+00 7.5581378364743967e-01 8.8772972565716426e+00 4 1 -1
+2625 1 0.0000000000000000e+00 2.7286184903140511e+00 1.0504190193854110e+00 9.1873330371999256e+00 -5 4 -1
+832 1 0.0000000000000000e+00 4.3047943828342055e+00 5.8830503497397169e-01 8.3146210320824512e+00 -2 9 -7
+1278 1 0.0000000000000000e+00 3.9223186116817885e+00 7.9051083716602877e-01 8.9993719233224834e+00 -2 -2 7
+850 1 0.0000000000000000e+00 2.7124410237646606e+00 1.0159258151361958e+00 8.2578579456094623e+00 -4 -4 0
+420 1 0.0000000000000000e+00 3.6358570341675027e+00 4.3338977725984290e-01 7.9489789907718809e+00 5 -1 6
+2895 2 -1.0000000000000000e+00 3.9737818721011302e+00 1.6918833313582933e+00 9.1311221977226591e+00 -3 -2 0
+523 1 0.0000000000000000e+00 2.9058948350753280e+00 1.5360850608530097e+00 9.3347316227016179e+00 0 5 -2
+1393 1 0.0000000000000000e+00 3.0749623613980788e+00 7.6671450825549403e-01 9.0942726418683328e+00 -5 6 1
+1227 1 0.0000000000000000e+00 3.9617236520498271e+00 1.3915899579879565e+00 7.8967080839140049e+00 7 4 -3
+714 1 0.0000000000000000e+00 2.5116640961621699e+00 1.9579136973572224e+00 7.8808306451751466e+00 1 1 -3
+2514 1 0.0000000000000000e+00 4.5322707787785266e+00 1.2541226141342759e-01 9.3385452635319535e+00 1 3 8
+2088 1 0.0000000000000000e+00 4.7029739565189912e+00 6.9400998783577306e-01 9.3288461835562337e+00 2 3 2
+1447 1 0.0000000000000000e+00 2.9003872423109822e+00 1.1749948107325857e-01 8.5579371251680652e+00 4 1 2
+468 1 0.0000000000000000e+00 2.7047018659096222e+00 2.1448595844756033e+00 9.6352682957943454e+00 -3 -3 3
+2519 1 0.0000000000000000e+00 4.8754627675623130e+00 2.4381558456950416e+00 9.2348263596467479e+00 -3 0 2
+1371 1 0.0000000000000000e+00 4.4413266432556462e+00 2.4650956703538931e+00 9.3204991131990429e+00 -3 -6 -4
+1553 1 0.0000000000000000e+00 3.7725624534154250e+00 2.3770821101943254e+00 8.8397438609146288e+00 -3 -3 -1
+588 1 0.0000000000000000e+00 4.5895352697921767e+00 1.0325410480529928e-01 7.8790202764444714e+00 -7 -1 0
+2289 1 0.0000000000000000e+00 3.5549860796561896e+00 1.5969643645461562e+00 7.8226294267786232e+00 0 -1 0
+2466 1 0.0000000000000000e+00 4.4461519186944614e+00 2.4780592770273069e+00 8.7785495843716799e+00 4 8 -2
+701 1 0.0000000000000000e+00 4.2090397914335549e+00 1.9418075659308067e+00 8.0853645300523134e+00 4 2 -4
+2114 1 0.0000000000000000e+00 3.0834248978921734e+00 1.0944166773440343e-01 7.7234294442338935e+00 4 -5 5
+246 1 0.0000000000000000e+00 4.7366191436784240e+00 1.6289627733972498e+00 8.7744281873953600e+00 -3 -1 5
+2216 1 0.0000000000000000e+00 4.5372227420183000e+00 7.6531577268133533e-02 8.6018190569765185e+00 -2 5 2
+2912 3 1.0000000000000000e+00 4.1086576739594447e+00 9.3729884916294481e-01 9.7440979041593181e+00 0 2 -4
+1804 1 0.0000000000000000e+00 2.7023241692386537e+00 6.9873120567941316e-01 8.5113879234242624e+00 4 -7 1
+1986 1 0.0000000000000000e+00 2.8707297710953110e+00 2.6085241859018730e-02 9.1273066296021650e+00 1 1 3
+708 1 0.0000000000000000e+00 4.2095228254073822e+00 2.3867177447995642e+00 8.0670673923623202e+00 1 -1 -3
+1509 1 0.0000000000000000e+00 2.8457007715693474e+00 1.7888960819982862e+00 8.0186486710790223e+00 2 5 8
+312 1 0.0000000000000000e+00 3.8340243992283511e+00 6.9326039660089744e-01 8.1925697405973068e+00 4 4 5
+2438 1 0.0000000000000000e+00 3.5563793593286488e+00 2.3417947015310010e+00 7.9789946716299252e+00 -4 1 -1
+1914 1 0.0000000000000000e+00 4.7498869425826991e+00 1.3073128197303479e+00 8.5447282541792475e+00 4 1 0
+2836 2 -1.0000000000000000e+00 3.1942605078444686e+00 2.2284055809721273e+00 9.0470998448908073e+00 -5 -1 3
+77 1 0.0000000000000000e+00 3.6671421652072675e+00 1.7914479516908639e+00 8.7540794348810902e+00 -1 2 -7
+2956 3 1.0000000000000000e+00 4.7804566673146960e+00 1.7942320598503192e+00 9.5098110792510280e+00 0 0 -6
+2984 3 1.0000000000000000e+00 3.2922259025567389e+00 2.1731434577014355e+00 8.2237245979538134e+00 0 4 0
+1431 1 0.0000000000000000e+00 3.2725882309346108e+00 1.2812404119170222e+00 8.6359163859649186e+00 -4 4 5
+96 1 0.0000000000000000e+00 3.5205618553914286e+00 2.4800626459413308e-01 9.6164885479944413e+00 0 1 -1
+2076 1 0.0000000000000000e+00 4.7243172879355564e+00 7.9853284832299642e-01 7.6980931073785790e+00 4 -4 -2
+436 1 0.0000000000000000e+00 3.1280188831705793e+00 1.1850926187471176e+00 7.8749782739606786e+00 2 0 1
+1546 1 0.0000000000000000e+00 2.0631785328603836e+00 2.6031797981421465e+00 8.2999841001193460e+00 3 -3 6
+101 1 0.0000000000000000e+00 1.4172805140492366e+00 4.1788435415988081e+00 9.2991721864502814e+00 3 3 -3
+1646 1 0.0000000000000000e+00 8.0029098042214730e-01 3.3375234608878914e+00 8.2337167006411960e+00 3 6 -1
+400 1 0.0000000000000000e+00 3.5872124733229255e-01 3.5748401778058376e+00 9.8139649073910284e+00 6 -4 -2
+1000 1 0.0000000000000000e+00 7.9340886679712053e-01 4.2568395846350846e+00 8.0087227781772494e+00 4 -1 1
+2331 1 0.0000000000000000e+00 1.4966584866974602e+00 4.1600218092314725e+00 8.5892315727773134e+00 4 -1 2
+190 1 0.0000000000000000e+00 6.3101219218845939e-01 4.0359257022523876e+00 9.6072946457102155e+00 0 -4 0
+2252 1 0.0000000000000000e+00 1.0165511216212433e+00 3.7643184651086257e+00 8.5847557566550865e+00 -3 -2 3
+1853 1 0.0000000000000000e+00 8.4470816004196281e-01 4.8791119039031781e+00 8.2882136006456673e+00 5 -4 -1
+2080 1 0.0000000000000000e+00 1.0314109153501261e+00 2.5398106711440698e+00 8.6620761332157592e+00 -3 1 3
+2908 3 1.0000000000000000e+00 2.0539286640189558e+00 3.6467453744329479e+00 9.3421014836061982e+00 0 -7 -2
+570 1 0.0000000000000000e+00 2.3975487264794069e+00 4.4343327815691334e+00 8.1897875076273916e+00 1 -2 -1
+1909 1 0.0000000000000000e+00 1.3556707223704332e+00 3.7351421125567570e+00 7.9508254610267173e+00 2 -4 -4
+2273 1 0.0000000000000000e+00 2.1502201785931887e+00 4.8225470814389579e+00 8.5972039893991283e+00 2 4 -2
+1829 1 0.0000000000000000e+00 5.2529011422157224e-01 4.3608602707368052e+00 8.9971884632207164e+00 2 -3 1
+906 1 0.0000000000000000e+00 1.1691207142799670e-01 2.5088363060666072e+00 8.5873304318964774e+00 5 -4 -4
+1696 1 0.0000000000000000e+00 1.5726723614635960e+00 3.7943151616044770e+00 8.5154722308567994e+00 6 -2 1
+556 1 0.0000000000000000e+00 1.6437363337237820e+00 2.7466203341023303e+00 9.1047984949477634e+00 -3 -6 -1
+586 1 0.0000000000000000e+00 1.4250091182116171e+00 4.9393272349989807e+00 8.3149951871737731e+00 -5 0 3
+1308 1 0.0000000000000000e+00 2.2489153840467138e+00 4.8054273336507238e+00 9.6674060783890283e+00 3 -3 -3
+675 1 0.0000000000000000e+00 1.1590808132966972e+00 3.1403430350017820e+00 8.9682645372675793e+00 0 -3 -1
+1463 1 0.0000000000000000e+00 1.9581659341900948e-01 4.4031161202136930e+00 8.0624531169149289e+00 1 -2 -1
+1832 1 0.0000000000000000e+00 1.2890844292795349e+00 3.1984834281332630e+00 9.4676575439819732e+00 2 6 -1
+572 1 0.0000000000000000e+00 2.8222534843621094e-01 3.8304365059100571e+00 8.5558751309586025e+00 5 3 3
+1270 1 0.0000000000000000e+00 2.0721560226725382e+00 4.4363520519038628e+00 8.9988297407422255e+00 -1 2 -2
+922 1 0.0000000000000000e+00 1.1604545969419715e+00 4.9546923453349230e+00 9.7003993763655565e+00 -1 -2 0
+683 1 0.0000000000000000e+00 1.5173818326164485e+00 4.7758559082351768e+00 8.7946933842512784e+00 -4 -2 -2
+387 1 0.0000000000000000e+00 2.3495967796237660e+00 2.5254624098172185e+00 8.8515643747063777e+00 2 1 0
+2900 2 -1.0000000000000000e+00 2.3857395649606188e+00 2.7351555416089894e+00 9.6251355991407799e+00 -2 3 2
+1077 1 0.0000000000000000e+00 4.4438269766369948e-01 4.1894248293946150e+00 7.5724436366228733e+00 1 5 -5
+2901 2 -1.0000000000000000e+00 2.1910381714077505e+00 3.2505577257756397e+00 8.2964933016331948e+00 -5 0 2
+2902 2 -1.0000000000000000e+00 3.0532091545847595e-01 3.0518581255128980e+00 9.8980295350507035e+00 0 5 -1
+2402 1 0.0000000000000000e+00 1.6276027580018089e+00 3.6060720339657237e+00 9.5214948101196910e+00 6 4 3
+526 1 0.0000000000000000e+00 1.6262025503456610e+00 2.5798609943423649e+00 8.3652023941368139e+00 -1 -3 1
+38 1 0.0000000000000000e+00 6.0259848885678857e-01 3.9440898262362034e+00 9.2006985780355368e+00 0 -2 -2
+681 1 0.0000000000000000e+00 2.4749061800179675e+00 2.7599082191889712e+00 8.3499910665736401e+00 4 -2 -1
+1032 1 0.0000000000000000e+00 1.8633439475171250e+00 4.2798857329840052e+00 9.8664418521071013e+00 -3 6 -4
+2452 1 0.0000000000000000e+00 9.4667997916285807e-01 3.1825986959524672e+00 7.7569678572394274e+00 4 -3 -1
+5 1 0.0000000000000000e+00 2.1461619107725145e+00 2.5186943592816826e+00 7.7823681789251511e+00 -4 -5 9
+1258 1 0.0000000000000000e+00 1.4891481280785503e+00 3.0542173899653000e+00 7.9079785206660675e+00 0 -2 -2
+469 1 0.0000000000000000e+00 2.3517208325700580e+00 3.7764864960295821e+00 7.7816389962550172e+00 -3 6 -4
+2759 1 0.0000000000000000e+00 3.4797438562630340e-01 2.9286917895173485e+00 9.2570451013766331e+00 -2 -2 2
+6 1 0.0000000000000000e+00 7.4923152648123237e-01 4.8234275226294683e+00 8.8205839252928993e+00 5 -3 -2
+818 1 0.0000000000000000e+00 1.8693395603134386e+00 4.4320859271066837e+00 7.9612866307463142e+00 6 1 -1
+964 1 0.0000000000000000e+00 3.2254292740626167e-01 3.1324664691241972e+00 8.0636487417513489e+00 0 2 3
+2120 1 0.0000000000000000e+00 8.5061556229019536e-02 3.7089628279116900e+00 7.8196665267504670e+00 -1 -2 1
+2979 3 1.0000000000000000e+00 1.4795956647642352e+00 4.0699792289984780e+00 7.5672744721210199e+00 -5 -6 -1
+2860 2 -1.0000000000000000e+00 7.2735507000432090e-02 2.7453864057970425e+00 8.4346157198482583e+00 0 -4 -3
+1421 1 0.0000000000000000e+00 2.2220818618154596e+00 4.9900084233095789e+00 9.7035048136173820e+00 -1 -1 4
+704 1 0.0000000000000000e+00 3.2152960703207301e+00 4.8322922348485928e+00 8.2034833802887039e+00 1 2 -3
+28 1 0.0000000000000000e+00 4.4213844429615898e+00 4.1110893133570814e+00 8.4137232771370503e+00 0 3 -3
+296 1 0.0000000000000000e+00 3.8343931185184652e+00 4.4688001767438958e+00 8.5351401353470937e+00 -3 1 1
+79 1 0.0000000000000000e+00 3.1725509192204111e+00 4.6488555362718476e+00 8.4202433235003813e+00 0 1 2
+868 1 0.0000000000000000e+00 2.9393117789916632e+00 4.0634542732312724e+00 9.2548275208408022e+00 0 3 -4
+1205 1 0.0000000000000000e+00 4.5708584103570251e+00 3.1467023508498202e+00 8.6879846774769085e+00 0 -1 6
+1126 1 0.0000000000000000e+00 3.5598334032347903e+00 4.3464386095144629e+00 9.0466885707868236e+00 -2 1 5
+2782 1 0.0000000000000000e+00 3.9539685713026853e+00 3.3955874148269833e+00 8.7150623397416034e+00 -1 -1 3
+1267 1 0.0000000000000000e+00 3.3991883690506821e+00 3.5111267234074854e+00 8.7455014351588609e+00 0 0 -8
+29 1 0.0000000000000000e+00 3.9987630641060283e+00 4.2134753763584749e+00 9.8954540436188303e+00 -3 -2 2
+851 1 0.0000000000000000e+00 2.6257284515602075e+00 4.2288632459539750e+00 9.9220266866362010e+00 -1 2 -2
+2346 1 0.0000000000000000e+00 2.9532317512669106e+00 2.6715245155832954e+00 7.9112899996551995e+00 -4 -1 1
+2761 1 0.0000000000000000e+00 2.5008700704379594e+00 3.6346340211102404e+00 8.5755747008798142e+00 2 -3 3
+1708 1 0.0000000000000000e+00 4.1126627536546296e+00 3.1811080329665260e+00 9.4906468441342593e+00 3 1 -2
+811 1 0.0000000000000000e+00 4.5473005262333208e+00 4.8830903415585381e+00 8.5986716412288207e+00 1 -2 3
+26 1 0.0000000000000000e+00 4.8385875580710627e+00 4.6637265827788017e+00 9.4835659660088982e+00 3 -1 3
+1643 1 0.0000000000000000e+00 3.2408069175019372e+00 4.3321757922258666e+00 7.7647010842313824e+00 -5 -1 -2
+196 1 0.0000000000000000e+00 3.1482478364841642e+00 2.7144952193252161e+00 8.8759044547988069e+00 0 2 0
+1410 1 0.0000000000000000e+00 4.1311595065630389e+00 4.6052441902540364e+00 9.0057288455964635e+00 0 -1 1
+2115 1 0.0000000000000000e+00 2.6142408628614313e+00 3.2577305751662244e+00 9.0154743724147455e+00 -4 4 -8
+944 1 0.0000000000000000e+00 3.6899701134401828e+00 3.7120483117822092e+00 9.4045430588888141e+00 -5 4 -4
+631 1 0.0000000000000000e+00 3.7439599882595602e+00 3.6780976535698042e+00 9.9332169311952700e+00 -3 -1 6
+2335 1 0.0000000000000000e+00 3.5636477324030276e+00 3.7929756671430424e+00 7.8449495483117913e+00 2 -4 0
+1944 1 0.0000000000000000e+00 4.9581595569650121e+00 3.5370542882305704e+00 8.3318413390243382e+00 -4 -4 6
+870 1 0.0000000000000000e+00 2.8155962972486557e+00 3.9890520453561988e+00 8.6508634246748652e+00 2 2 -8
+2373 1 0.0000000000000000e+00 4.4413407710915775e+00 4.9252410879693995e+00 9.9308243211887408e+00 1 3 -3
+2362 1 0.0000000000000000e+00 4.7277025754709410e+00 4.1108400225585564e+00 9.5959550907754672e+00 -1 2 7
+1746 1 0.0000000000000000e+00 4.8886942977212255e+00 3.4013320314274882e+00 9.6413369290835806e+00 -3 0 -1
+1732 1 0.0000000000000000e+00 3.7452430358844961e+00 2.8710141842453067e+00 8.1645089697419380e+00 -5 3 -1
+1241 1 0.0000000000000000e+00 3.9829942893973569e+00 4.8819046393275594e+00 8.0537823912219295e+00 2 2 0
+1429 1 0.0000000000000000e+00 4.6668591265401238e+00 3.9384829609536243e+00 7.8566969857934179e+00 1 1 1
+314 1 0.0000000000000000e+00 4.4131506221154302e+00 2.6205156554537421e+00 7.7778968404066484e+00 2 -2 3
+771 1 0.0000000000000000e+00 3.5292550652995005e+00 4.4533719188608103e+00 9.7958300461739114e+00 5 3 -7
+1779 1 0.0000000000000000e+00 2.7641556873060855e+00 3.6057187004712565e+00 8.0799289287240796e+00 3 -5 0
+2403 1 0.0000000000000000e+00 4.4444220506056835e+00 4.0713903164167853e+00 9.1650621397144718e+00 1 0 0
+2811 2 -1.0000000000000000e+00 2.6766537970805895e+00 3.4676296779382496e+00 9.6895659295278307e+00 -4 0 7
+1260 1 0.0000000000000000e+00 4.4321312903505561e+00 3.5988679651018569e+00 7.7743499338270246e+00 3 6 -5
+688 1 0.0000000000000000e+00 3.3213975646257126e+00 3.1701907893274872e+00 8.8661370669119872e+00 -1 1 1
+213 1 0.0000000000000000e+00 3.9579369652953402e+00 3.3142952894822266e+00 7.9793728563460720e+00 1 0 2
+2414 1 0.0000000000000000e+00 4.9539613220290022e+00 4.4389479354874410e+00 8.6023080210761211e+00 5 -1 -4
+1724 1 0.0000000000000000e+00 2.9923369619106950e+00 4.9771822804063861e+00 7.6689916677287222e+00 1 -3 -3
+1407 1 0.0000000000000000e+00 2.8739128437480086e+00 4.7785634075772672e+00 8.9970973418618865e+00 3 0 3
+320 1 0.0000000000000000e+00 2.9603113853075156e+00 3.0769200734992590e+00 7.8939659720398883e+00 3 -4 -4
+8 1 0.0000000000000000e+00 3.2268892542435630e+00 2.6323678037165785e+00 9.5860584854261468e+00 -2 -4 -2
+598 1 0.0000000000000000e+00 4.1882052691863674e+00 3.2040972028105181e+00 9.2376232612159388e+00 4 2 -4
+411 1 0.0000000000000000e+00 3.1689469169313340e+00 4.4632278461455499e+00 9.7822527066039466e+00 0 -6 -1
+2930 3 1.0000000000000000e+00 2.5816039489393483e+00 4.8626647792010358e+00 7.6273034399569299e+00 5 -1 -7
+1158 1 0.0000000000000000e+00 3.5528149396256703e+00 4.9750947742963758e+00 9.2117112250030857e+00 0 -4 -6
+2959 3 1.0000000000000000e+00 4.6732256726428094e+00 2.6933495829614911e+00 9.9194537600887021e+00 -1 3 -3
+2848 2 -1.0000000000000000e+00 3.2340192948970015e+00 3.3362542822670833e+00 9.9130248897466426e+00 2 5 1
+1856 1 0.0000000000000000e+00 5.0401176848755225e-01 5.8189689989066293e+00 1.2287233607172887e+00 3 -1 2
+380 1 0.0000000000000000e+00 1.3565560605656073e+00 5.6341757813375226e+00 6.3546395521892718e-01 1 2 0
+632 1 0.0000000000000000e+00 4.4476225433390654e-01 7.2805910201971038e+00 2.2344929765226659e-02 -3 -2 2
+2572 1 0.0000000000000000e+00 1.1403320220495012e+00 5.1976605593463079e+00 2.1730915537293316e+00 7 0 1
+2240 1 0.0000000000000000e+00 1.6758758849425353e+00 5.6991425228324823e+00 1.0282393858251715e+00 -1 1 -1
+1512 1 0.0000000000000000e+00 1.0411203259494517e+00 6.7254170672907287e+00 3.8524319057873802e-01 -2 -1 1
+1630 1 0.0000000000000000e+00 1.3287776236346651e+00 7.3894674734992583e+00 7.3690707513990084e-01 1 -1 5
+367 1 0.0000000000000000e+00 1.7218276360385889e+00 7.1717406908037731e+00 1.9724028953743128e-01 -3 -5 2
+1586 1 0.0000000000000000e+00 9.1857528819069290e-01 5.3953702209960070e+00 1.3828055797854273e+00 -3 -3 -5
+506 1 0.0000000000000000e+00 2.2011818361862887e+00 5.0772742095834555e+00 1.0273273937796983e+00 -4 0 1
+2976 3 1.0000000000000000e+00 2.2861720385804887e+00 6.3267965810503837e+00 2.1572739237280658e-01 1 2 2
+423 1 0.0000000000000000e+00 2.2526660279124942e+00 5.2546548494954877e+00 1.6068939835904112e+00 -7 0 -4
+1404 1 0.0000000000000000e+00 1.7499757912581859e+00 5.3098678368763883e+00 2.1186155343179283e+00 2 1 -2
+2839 2 -1.0000000000000000e+00 2.0558417022641655e+00 5.6633786226030329e+00 2.4798813089082796e+00 1 3 0
+2517 1 0.0000000000000000e+00 1.0458675056088176e+00 7.1393474727416608e+00 2.4396015719629500e+00 -3 10 1
+2539 1 0.0000000000000000e+00 1.6047799430346741e+00 5.7254573469608623e+00 4.0765125128664809e-01 1 3 -4
+2147 1 0.0000000000000000e+00 1.6920819818637962e+00 6.2002871206017884e+00 2.1422949850919126e+00 -2 1 0
+278 1 0.0000000000000000e+00 1.3784334482693850e+00 5.0743220663887003e+00 1.3156064831481680e+00 2 4 0
+1623 1 0.0000000000000000e+00 1.1498811576217618e+00 6.0888873102464229e+00 1.3815064271284323e+00 -2 1 6
+276 1 0.0000000000000000e+00 8.3398232925536039e-02 6.9184063005816814e+00 7.1082279845712781e-01 -1 -2 1
+607 1 0.0000000000000000e+00 3.9490084619975142e-02 5.0047028180067459e+00 1.3548957033189901e+00 3 4 1
+2807 2 -1.0000000000000000e+00 4.8714947852950441e-01 5.3118600510572449e+00 2.2686629025765231e-01 4 -1 2
+1118 1 0.0000000000000000e+00 1.7781119690479635e-01 5.7180843452465080e+00 1.6319379878503921e+00 5 -3 7
+2998 3 1.0000000000000000e+00 2.4647507866673739e+00 6.5161118977552928e+00 2.4434758825578391e+00 -1 -3 2
+1151 1 0.0000000000000000e+00 1.7855754157057997e+00 5.8878318601003725e+00 1.5747912070525272e+00 5 1 1
+2694 1 0.0000000000000000e+00 2.1000512588655451e+00 6.2381729807233004e+00 1.1015789410270396e+00 0 -3 -1
+2675 1 0.0000000000000000e+00 8.9536751141473817e-02 6.7321182991567339e+00 1.3310188307574637e+00 2 -5 2
+642 1 0.0000000000000000e+00 9.2016703255462462e-01 7.4992861961118384e+00 8.0314607654087100e-01 -4 -4 -6
+2139 1 0.0000000000000000e+00 2.1857729617784627e+00 6.8907930276055271e+00 7.9052419336718349e-01 10 0 4
+1149 1 0.0000000000000000e+00 2.4371417855684117e+00 6.1884961511774819e+00 1.6972596409911727e+00 -5 -2 1
+1854 1 0.0000000000000000e+00 1.3101025147814072e+00 5.9078919677143418e+00 2.2807769590681839e+00 1 -3 5
+1508 1 0.0000000000000000e+00 1.6672113886409792e+00 6.4814277255972392e+00 1.1196948859752995e+00 -2 2 -9
+1979 1 0.0000000000000000e+00 1.6381578721557801e+00 7.3162364775616524e+00 1.1457173651840313e+00 1 -3 0
+2028 1 0.0000000000000000e+00 2.2521039084550778e+00 7.0237150423328440e+00 1.4471549883786665e+00 2 -1 -2
+2368 1 0.0000000000000000e+00 8.5473136003818362e-01 6.9035038937897690e+00 1.0584980130912454e+00 0 1 -4
+1288 1 0.0000000000000000e+00 3.4801533148495534e-01 6.5773781432832727e+00 3.2219701340199414e-01 -2 -1 -4
+2728 1 0.0000000000000000e+00 1.4094685542636889e+00 6.6636867902409858e+00 1.6759303459786805e+00 -2 -4 3
+2277 1 0.0000000000000000e+00 6.1214335778374718e-01 5.4545211387484587e+00 2.2495733912034055e+00 0 1 1
+2906 3 1.0000000000000000e+00 5.6177211273326610e-01 5.9575720233652616e+00 5.1041272794358394e-01 4 0 -4
+2151 1 0.0000000000000000e+00 1.7505160933657191e-01 6.5893926226018245e+00 1.9999486073451704e+00 5 -3 -1
+2490 1 0.0000000000000000e+00 5.7592063980946306e-01 6.9964426043220911e+00 1.7743677835890634e+00 2 -6 -3
+1685 1 0.0000000000000000e+00 6.6907772442350055e-01 6.2488187796655676e+00 2.1620505491542339e+00 9 0 -5
+2914 3 1.0000000000000000e+00 1.6264144522025490e+00 7.3237422204788576e+00 2.4031206983128883e+00 8 -2 -1
+2612 1 0.0000000000000000e+00 2.0908932295542679e+00 6.4256152308051009e+00 2.4959139651874152e+00 -1 -3 0
+662 1 0.0000000000000000e+00 4.9507230895598626e+00 6.1239905854149495e+00 1.5002906009212174e+00 -1 1 -1
+1923 1 0.0000000000000000e+00 3.1321895131051924e+00 5.3600195305756211e+00 1.3970429893110916e+00 4 4 4
+949 1 0.0000000000000000e+00 4.5469638996533330e+00 6.6318498432000030e+00 2.0497399598188397e+00 2 5 4
+2813 2 -1.0000000000000000e+00 2.6990611479246089e+00 6.0535533136809327e+00 9.5491706411666621e-01 3 1 1
+224 1 0.0000000000000000e+00 3.4694402867345531e+00 6.3100893375002869e+00 8.9025942328512719e-01 -1 2 -3
+1024 1 0.0000000000000000e+00 4.2684333943037531e+00 6.5244645710569005e+00 7.3515607382110471e-01 1 4 3
+2130 1 0.0000000000000000e+00 3.1798284422402987e+00 6.3094344830603273e+00 3.8689396229090661e-01 -3 1 -2
+1787 1 0.0000000000000000e+00 3.1899009442731208e+00 6.2727057576865262e+00 2.0805998831560930e+00 1 -3 -7
+2034 1 0.0000000000000000e+00 3.1166351059514268e+00 7.1391508527562033e+00 1.0636260727779352e+00 -1 -1 4
+2024 1 0.0000000000000000e+00 4.1285955302929258e+00 5.3733542331513737e+00 2.1582411243382711e+00 -6 -4 2
+1374 1 0.0000000000000000e+00 2.9089941830372172e+00 5.2535860479565990e+00 2.0938963095432439e+00 1 -8 -2
+2683 1 0.0000000000000000e+00 4.5003631082727944e+00 7.0400500003230917e+00 1.3734488683732693e+00 -2 0 2
+1550 1 0.0000000000000000e+00 2.9209368279640340e+00 5.9946304407692308e+00 2.2774226316533603e+00 -1 3 -3
+2073 1 0.0000000000000000e+00 3.6525296187718994e+00 6.7000894800306607e+00 1.5043126248738854e+00 4 3 5
+1362 1 0.0000000000000000e+00 2.8213324426601560e+00 6.9054938766347487e+00 3.1440390177750660e-01 -4 3 -6
+2241 1 0.0000000000000000e+00 3.6300330856977543e+00 6.7531613907774490e+00 3.8732474195558619e-01 -3 -2 -2
+4 1 0.0000000000000000e+00 3.8550574306161400e+00 5.5786567338603437e+00 1.9510483307440876e+00 -3 -1 -1
+1951 1 0.0000000000000000e+00 4.8058692892356909e+00 6.7014049226514025e+00 1.4006197157306439e+00 2 0 0
+612 1 0.0000000000000000e+00 3.9363935526952996e+00 7.0963741836183729e+00 1.0629849128386382e+00 0 3 -2
+1232 1 0.0000000000000000e+00 3.9084311759149717e+00 5.6206741781064267e+00 1.2985533704798182e+00 2 -2 4
+1157 1 0.0000000000000000e+00 3.3116317946530653e+00 5.3828084917494081e+00 6.9353352376428012e-01 3 2 8
+175 1 0.0000000000000000e+00 3.8580617777291528e+00 6.4931924992900107e+00 1.7999343904289844e+00 4 -1 2
+2749 1 0.0000000000000000e+00 3.9047950249394479e+00 5.1363803282244263e+00 7.0764868352908916e-01 -7 0 -2
+1470 1 0.0000000000000000e+00 2.8409868766562281e+00 5.6355847110710435e+00 5.1662654462257396e-01 2 -2 1
+492 1 0.0000000000000000e+00 3.0389268951724207e+00 7.3308601038272139e+00 6.5614616712015983e-01 -1 2 2
+2858 2 -1.0000000000000000e+00 4.5189767572494448e+00 5.6263534129355524e+00 1.6432091568138622e-02 -3 3 3
+1916 1 0.0000000000000000e+00 2.7813255886546679e+00 6.7481630157688066e+00 1.5508914277959238e+00 5 -2 -5
+2435 1 0.0000000000000000e+00 3.5879730880160063e+00 7.2048686524397425e+00 1.5051712223448304e+00 0 3 -1
+2767 1 0.0000000000000000e+00 4.4063793496814405e+00 5.6760285441903369e+00 9.4002430330245001e-01 -3 -2 7
+535 1 0.0000000000000000e+00 4.6892187999383435e+00 5.2963841278400219e+00 5.5414048561028129e-01 2 3 -3
+618 1 0.0000000000000000e+00 3.9825435311478774e+00 6.0230386640465836e+00 2.3224063236129773e+00 -3 5 -6
+1061 1 0.0000000000000000e+00 3.1634604887032380e+00 5.9423685138526450e+00 1.4301338836077226e+00 1 0 -3
+1058 1 0.0000000000000000e+00 4.6721720851649735e+00 6.8607316379768006e+00 3.8150427934676950e-01 2 4 -3
+1855 1 0.0000000000000000e+00 2.5527896327971726e+00 5.4054205866104112e+00 2.1916990892232716e-01 -2 -1 -2
+2159 1 0.0000000000000000e+00 3.8393708726742375e+00 7.1237373991855408e+00 2.2735169458091837e+00 -8 -2 -1
+1408 1 0.0000000000000000e+00 4.5054171992578596e+00 5.5895242499463436e+00 1.8645653540825800e+00 7 2 -8
+125 1 0.0000000000000000e+00 4.5308221065881060e+00 7.1354683172598676e+00 2.4973678881378647e+00 4 0 1
+2852 2 -1.0000000000000000e+00 4.7698175617239755e+00 5.8481906404205377e+00 1.0298124449548665e+00 5 0 -3
+1333 1 0.0000000000000000e+00 2.9525803955123719e+00 7.1682465235801223e+00 1.9942138107658558e+00 2 -2 1
+1902 1 0.0000000000000000e+00 2.7490880172697216e+00 7.1850073605151579e+00 1.9049662921522542e-01 -1 -4 4
+2165 1 0.0000000000000000e+00 2.8002887049240988e+00 7.0184049380092661e+00 2.3662745463084609e+00 0 -8 3
+2096 1 0.0000000000000000e+00 4.4996329770503447e+00 7.2555532977319181e+00 1.7824076555585272e-01 3 -2 5
+1043 1 0.0000000000000000e+00 4.4640888551850297e+00 6.1547758436175517e+00 3.0942250647641373e-01 -6 1 -1
+344 1 0.0000000000000000e+00 3.8201748903573405e+00 5.7730071248319019e+00 2.9197632874386020e-01 2 -3 0
+330 1 0.0000000000000000e+00 4.4714724631400262e+00 5.3358385675416473e+00 2.4863930709116242e+00 6 -9 3
+172 1 0.0000000000000000e+00 8.6664969164955108e-01 7.6339903027153717e+00 2.0126188540374828e+00 -3 0 -2
+119 1 0.0000000000000000e+00 7.4899818263507711e-01 7.5749351353391852e+00 1.2235761206418705e+00 2 -3 0
+2330 1 0.0000000000000000e+00 1.1596766066600381e+00 8.1056545231966410e+00 1.7208650300417181e+00 1 -3 1
+1322 1 0.0000000000000000e+00 2.1648298612500003e+00 8.5766835004600299e+00 1.5111338380105943e+00 0 0 0
+2840 2 -1.0000000000000000e+00 7.6970107492315176e-01 8.0824784755291521e+00 2.4302134135071789e+00 -3 1 -3
+2180 1 0.0000000000000000e+00 2.0864371595862314e+00 7.6707741107044161e+00 2.1013663299844354e+00 0 -2 2
+2758 1 0.0000000000000000e+00 1.8821291110176848e+00 8.2718008176484812e+00 1.0182511937226661e+00 5 0 0
+1103 1 0.0000000000000000e+00 1.6894681678370942e+00 7.8521407981944975e+00 2.1830545772115513e+00 6 0 -2
+1758 1 0.0000000000000000e+00 2.2975722102894807e+00 9.9818930706105515e+00 2.1075783247892899e+00 -1 -6 6
+975 1 0.0000000000000000e+00 1.2851844090666038e+00 8.2113205260752800e+00 1.1847497526513993e+00 -1 -3 4
+1028 1 0.0000000000000000e+00 2.2234568658935938e+00 9.2186547305216866e+00 2.2852262977485918e+00 -7 0 8
+197 1 0.0000000000000000e+00 6.8615264596162101e-02 9.0620691887417610e+00 1.0353956800363839e+00 1 -7 1
+665 1 0.0000000000000000e+00 4.8323891562868215e-01 9.7991793281426336e+00 3.7558318329742663e-01 -2 -3 2
+2338 1 0.0000000000000000e+00 1.4726272837826526e+00 9.5195766363336194e+00 1.7628779524220362e+00 2 7 3
+1184 1 0.0000000000000000e+00 1.0731771054482739e+00 9.0875780456623243e+00 2.2462606087540229e-01 -5 -1 -2
+2717 1 0.0000000000000000e+00 1.7333531926997825e-01 8.2627007542677973e+00 2.3058984652408610e+00 1 -2 -3
+557 1 0.0000000000000000e+00 1.6247914760642115e+00 8.6669500776577291e+00 2.2619881422741295e+00 -4 1 1
+864 1 0.0000000000000000e+00 6.0221501611472761e-01 8.9726762056332809e+00 1.7935581700740053e+00 0 -1 -1
+212 1 0.0000000000000000e+00 2.1952568624133528e-01 7.9213946633293633e+00 2.0204453965015685e+00 2 4 3
+1327 1 0.0000000000000000e+00 7.3895445527707315e-01 9.6453980587629786e+00 1.3541313867222251e+00 2 -5 -5
+1962 1 0.0000000000000000e+00 3.0407889808189831e-01 8.5361771835633959e+00 1.4636346460985781e+00 2 -1 -1
+652 1 0.0000000000000000e+00 2.0822213755668306e+00 9.8936298849856730e+00 1.5747084822519655e+00 -5 -4 2
+264 1 0.0000000000000000e+00 6.6204961390851103e-01 9.1269688406470344e+00 1.0260285089026722e+00 4 1 -2
+1984 1 0.0000000000000000e+00 1.8791056791692232e-01 9.1033742825144852e+00 1.7349247549910446e-01 2 8 0
+2405 1 0.0000000000000000e+00 7.0334172836971331e-01 8.0664214332337618e+00 7.3189696661687054e-01 8 -2 6
+158 1 0.0000000000000000e+00 5.2125119119772897e-02 9.7626297136980646e+00 8.3513873598983190e-01 2 0 5
+1402 1 0.0000000000000000e+00 1.8897841419334436e+00 9.6889616701242964e+00 8.2283114157037029e-01 1 4 0
+20 1 0.0000000000000000e+00 7.0512320039116549e-01 9.8437732575239991e+00 1.8394157028302476e+00 -4 2 -5
+875 1 0.0000000000000000e+00 1.7617182351842700e+00 9.0011078150799548e+00 1.6668975794633674e+00 0 0 -3
+1699 1 0.0000000000000000e+00 1.1564999263417146e+00 8.5227814573007947e+00 2.5989519054430776e-01 3 -3 -7
+602 1 0.0000000000000000e+00 1.9116013853197176e+00 9.3243891881575767e+00 4.1450172238238137e-01 -7 -3 -3
+2997 3 1.0000000000000000e+00 1.9602107952685326e+00 7.6218282098734838e+00 5.9646348218710998e-01 1 3 0
+2561 1 0.0000000000000000e+00 2.3680645405440042e+00 7.5854547728748303e+00 1.5021199553840394e+00 -1 -6 2
+2134 1 0.0000000000000000e+00 2.0115617543388531e+00 8.3644866145874630e+00 3.9191179786357283e-01 4 3 4
+1640 1 0.0000000000000000e+00 2.1945318167950792e-01 9.6625342332167250e+00 2.1164851185931086e+00 1 -3 0
+1569 1 0.0000000000000000e+00 2.2922924327839591e+00 8.9809805299633325e+00 1.0429545991665592e+00 -1 0 -2
+792 1 0.0000000000000000e+00 1.3785694105652371e+00 8.2476509398933899e+00 9.7136183528489817e-01 2 5 8
+1609 1 0.0000000000000000e+00 2.4118945961985032e+00 8.3160290598972697e+00 1.7381063272022432e+00 4 -4 1
+341 1 0.0000000000000000e+00 2.3923802904192257e+00 8.4740474967489039e+00 2.1920883416976782e+00 1 -2 -4
+998 1 0.0000000000000000e+00 1.4909997128376375e+00 7.7553507390947898e+00 1.5042990519134682e+00 -3 3 0
+2697 1 0.0000000000000000e+00 1.1202252055354549e+00 9.7551350249821400e+00 9.0730903655589568e-01 1 2 0
+2285 1 0.0000000000000000e+00 9.5890078967200332e-01 8.8118159805012422e+00 2.1259949517505254e+00 1 0 -1
+1922 1 0.0000000000000000e+00 1.5000204977118541e+00 8.9180847028205683e+00 1.0085979216201784e+00 2 0 1
+653 1 0.0000000000000000e+00 1.3413763662489344e+00 9.0988969022419557e+00 1.4147349696410785e+00 1 1 4
+980 1 0.0000000000000000e+00 2.1142287378745754e+00 9.9912663475192325e+00 2.4112508341768639e+00 -2 2 -2
+2996 3 1.0000000000000000e+00 1.5738275793042578e+00 9.9940461496817932e+00 2.2107157633020300e+00 11 -5 0
+1511 1 0.0000000000000000e+00 1.4400174095875337e-02 9.3293407638670143e+00 1.5636478827847451e+00 6 1 -6
+2220 1 0.0000000000000000e+00 1.4452720515153632e+00 7.8861314687152628e+00 2.0040404068874096e-01 -3 6 -2
+1412 1 0.0000000000000000e+00 5.3598841123410579e-01 7.5898886988126941e+00 9.6867576986703341e-04 5 -1 4
+917 1 0.0000000000000000e+00 3.8671613023836482e+00 8.6650053500471369e+00 1.4585128916497598e+00 -2 1 4
+1041 1 0.0000000000000000e+00 2.8515177697171774e+00 9.9980251256977954e+00 1.1027733272941929e-01 6 0 2
+136 1 0.0000000000000000e+00 4.2978170148970332e+00 7.7402330537822648e+00 2.2246428827286358e+00 2 -3 3
+253 1 0.0000000000000000e+00 3.8170285186648161e+00 7.7099471239901867e+00 5.4082031552467505e-02 1 5 -4
+67 1 0.0000000000000000e+00 3.9949754071044827e+00 8.7145388765699199e+00 2.3307478751671282e+00 -1 1 -4
+1940 1 0.0000000000000000e+00 3.8563633514178304e+00 9.4239607558651546e+00 7.0901983081793929e-01 2 -6 4
+1193 1 0.0000000000000000e+00 4.7807189581803318e+00 8.0310453990180246e+00 1.4469647487817439e-01 -2 5 6
+449 1 0.0000000000000000e+00 2.5871274707162790e+00 8.0628812630907731e+00 8.1382043098183232e-01 -1 -4 -5
+211 1 0.0000000000000000e+00 4.9711102626672670e+00 9.3191997686112220e+00 2.3726369403919412e+00 4 -3 -2
+444 1 0.0000000000000000e+00 4.9416730960458279e+00 8.0516435111290345e+00 2.0233758927910368e+00 -4 4 1
+2168 1 0.0000000000000000e+00 4.4025315815811670e+00 8.8490995778183716e+00 1.9997159631465751e+00 4 0 2
+1251 1 0.0000000000000000e+00 3.5608515591185750e+00 8.6497732681212636e+00 2.0532975485140530e+00 -3 -3 1
+2531 1 0.0000000000000000e+00 3.9962048168417308e+00 7.7136479033184573e+00 1.6361642771470040e+00 0 7 -4
+561 1 0.0000000000000000e+00 2.5379197498068060e+00 9.4998439770383811e+00 1.4173988007529987e+00 2 6 2
+2739 1 0.0000000000000000e+00 2.7291138733695970e+00 9.6335087669693760e+00 5.3916326178618701e-01 -1 3 -6
+971 1 0.0000000000000000e+00 4.4379265869956841e+00 8.8205894822351478e+00 1.3518491271575614e+00 3 -2 -5
+2478 1 0.0000000000000000e+00 4.2647816682059734e+00 9.1752923134380406e+00 2.2723759499305213e-01 4 1 -7
+1958 1 0.0000000000000000e+00 2.6568202286888472e+00 7.7696796023908519e+00 1.7097435362150954e+00 -2 5 -2
+1216 1 0.0000000000000000e+00 4.2959285441472153e+00 8.2093873373277191e+00 1.5152941504877289e+00 -2 -4 2
+604 1 0.0000000000000000e+00 2.6482135979910750e+00 8.6463744756139338e+00 5.3686106852089199e-01 -4 3 -3
+1649 1 0.0000000000000000e+00 3.2576175741796622e+00 7.7867540978077532e+00 1.8017387007471688e+00 3 -2 -1
+554 1 0.0000000000000000e+00 4.8783733531436351e+00 8.1554762892176829e+00 1.3561418094231492e+00 -1 3 -2
+1692 1 0.0000000000000000e+00 4.1251379883175057e+00 7.6915578680882009e+00 8.9213053724309610e-01 -5 -4 4
+1037 1 0.0000000000000000e+00 3.1856552292649174e+00 8.6610971244052148e+00 2.1910315880247349e+00 -6 -2 -5
+584 1 0.0000000000000000e+00 3.3612769466830699e+00 9.0414397802141320e+00 5.7891060603412725e-01 -7 0 2
+1904 1 0.0000000000000000e+00 3.8315798289684357e+00 9.7509378577412757e+00 1.4999635052197163e-01 -5 0 6
+2917 3 1.0000000000000000e+00 4.3709341929143424e+00 9.0811000509909015e+00 2.4422899453016531e+00 -3 5 -1
+182 1 0.0000000000000000e+00 4.1239026251401754e+00 9.3843908024672142e+00 9.1901002516196872e-01 -3 0 6
+2692 1 0.0000000000000000e+00 3.0464237994656616e+00 8.4535418921763537e+00 4.0419674725804638e-01 1 3 1
+2060 1 0.0000000000000000e+00 3.6042634485364098e+00 8.0284401210850902e+00 2.0641735523196845e+00 -3 4 -1
+180 1 0.0000000000000000e+00 4.2188454670658091e+00 8.0764275291323955e+00 3.1621657611340309e-01 6 7 0
+2661 1 0.0000000000000000e+00 4.7288724323765861e+00 8.5682716654712721e+00 1.1508280406209399e+00 1 12 2
+903 1 0.0000000000000000e+00 4.1857114073966626e+00 9.9110374558034824e+00 1.8642102646801713e+00 -6 1 1
+1841 1 0.0000000000000000e+00 3.3707295018804535e+00 8.0989588202931575e+00 1.2171582250194459e+00 -2 -6 1
+310 1 0.0000000000000000e+00 3.5041351612579281e+00 8.7622936903476809e+00 8.6131192434375092e-01 0 0 7
+145 1 0.0000000000000000e+00 4.6502414651084454e+00 8.9161953615563458e+00 2.3286916839794639e-01 6 -3 0
+2843 2 -1.0000000000000000e+00 4.2890041908619203e+00 9.3030938529893952e+00 1.4653524665244573e+00 -2 0 3
+2301 1 0.0000000000000000e+00 3.1133918334035311e+00 8.6502522149744401e+00 1.2777268401980975e+00 -4 -2 1
+803 1 0.0000000000000000e+00 2.8798286937144502e+00 9.3525739181204344e+00 2.4851278706255626e+00 3 -4 0
+376 1 0.0000000000000000e+00 3.4530757996480803e+00 8.6417504099208564e+00 2.4518671586221354e+00 0 -3 -2
+1311 1 0.0000000000000000e+00 2.7275640199064330e+00 9.4490003036565309e+00 1.9293207113573843e+00 -2 3 -1
+2224 1 0.0000000000000000e+00 2.6891343787053636e+00 9.0079627085165992e+00 2.0044621929314177e+00 3 4 0
+1628 1 0.0000000000000000e+00 3.3464343082688823e+00 9.3783336415771217e+00 1.5243124969727053e+00 2 -2 3
+192 1 0.0000000000000000e+00 3.5614219134043812e+00 9.5425109310849994e+00 1.3299485232474146e+00 3 4 0
+2498 1 0.0000000000000000e+00 3.8907328072391372e+00 8.4570988737382802e+00 6.3354360034781365e-01 -5 -6 0
+527 1 0.0000000000000000e+00 3.6208903798656067e+00 9.5126025367518938e+00 2.1246824533059483e+00 -4 -2 9
+759 1 0.0000000000000000e+00 4.7249168940035311e+00 9.7005561455812472e+00 5.4327465462104174e-01 5 1 2
+364 1 0.0000000000000000e+00 2.8822599628946484e+00 7.9030467093627959e+00 6.2264458054882865e-01 4 1 0
+1587 1 0.0000000000000000e+00 4.6329221232772504e+00 7.5582937931245082e+00 9.5087952048039293e-01 -1 4 3
+1165 1 0.0000000000000000e+00 2.0795443135079417e+00 6.4077023861630868e+00 3.2590315349954238e+00 -3 5 0
+152 1 0.0000000000000000e+00 4.5494508213091256e-01 5.6555282166840852e+00 3.2814564674607696e+00 -1 -6 -2
+1019 1 0.0000000000000000e+00 8.1280801354206422e-01 5.0584301705293884e+00 2.6561680518525304e+00 -8 -3 8
+2072 1 0.0000000000000000e+00 4.8420435314112560e-03 7.1905524503402765e+00 4.7195078244779731e+00 3 -3 3
+987 1 0.0000000000000000e+00 1.5208623389933278e+00 5.7461811605349089e+00 4.0933141448474268e+00 -2 0 1
+2847 2 -1.0000000000000000e+00 1.0638675063739098e+00 6.3063936924857220e+00 4.2885132647169328e+00 -2 7 -1
+1289 1 0.0000000000000000e+00 2.0530397896025041e-01 7.4376295255088358e+00 3.7977365625566133e+00 6 -2 -2
+1505 1 0.0000000000000000e+00 8.6027816755065556e-01 5.0043457170654992e+00 4.7296510529612323e+00 2 10 -1
+2973 3 1.0000000000000000e+00 6.7691805213796874e-01 6.7271288271580687e+00 4.9659563097155459e+00 3 -2 2
+248 1 0.0000000000000000e+00 1.6981713699505694e+00 7.0263034986515871e+00 3.5312423556971031e+00 1 -1 -4
+1345 1 0.0000000000000000e+00 9.9972622517204912e-01 5.3770236376962588e+00 3.0928998156380292e+00 2 -5 -3
+878 1 0.0000000000000000e+00 1.6324151131681810e+00 5.7354101965139215e+00 3.2563158062534749e+00 -3 -8 0
+2926 3 1.0000000000000000e+00 1.4394290857403933e+00 6.5264723842972243e+00 2.6894745010203018e+00 2 4 -3
+1115 1 0.0000000000000000e+00 1.3375480706788034e+00 6.3799574178219833e+00 3.4542660840066097e+00 -6 -1 3
+715 1 0.0000000000000000e+00 1.7467058125775512e+00 6.9404173299201384e+00 4.2202727536587235e+00 -5 -3 -3
+855 1 0.0000000000000000e+00 2.0109273945470525e+00 7.3209217023735693e+00 2.9046025176738626e+00 1 1 5
+672 1 0.0000000000000000e+00 2.3176781632218830e+00 5.7312162820970602e+00 3.2827842744257456e+00 11 -1 4
+1652 1 0.0000000000000000e+00 5.9972261284563089e-01 7.0158324439672342e+00 3.6905278190387611e+00 0 -3 3
+815 1 0.0000000000000000e+00 9.6249923740401688e-01 5.3547490013457759e+00 4.3455021667283962e+00 0 1 -3
+1195 1 0.0000000000000000e+00 2.3988851880869473e+00 7.4259037444507596e+00 4.2585933347502394e+00 -1 1 2
+1370 1 0.0000000000000000e+00 8.3679961777582179e-01 6.2919521894868149e+00 2.8351804816347119e+00 -1 3 -3
+2664 1 0.0000000000000000e+00 2.3931075030031796e+00 5.2589978978204623e+00 4.8928210292179637e+00 4 -2 2
+3 1 0.0000000000000000e+00 4.7415629309216868e-02 5.8594169914744754e+00 4.0865047394811089e+00 0 3 3
+1057 1 0.0000000000000000e+00 1.2085273629170290e+00 7.2337511930226235e+00 4.1984871281410321e+00 4 -1 -3
+2142 1 0.0000000000000000e+00 1.9803242005351411e+00 6.1460630374592995e+00 4.9101528265679582e+00 3 3 3
+355 1 0.0000000000000000e+00 7.0635620040072589e-01 5.2218493859689641e+00 3.9551301825381731e+00 -5 7 -2
+2869 2 -1.0000000000000000e+00 1.8604435142329536e+00 6.9348153059504662e+00 3.2214964553935159e+00 1 -3 3
+2488 1 0.0000000000000000e+00 1.3625437753743830e+00 5.3824635002710641e+00 3.8294904604518880e+00 -1 0 -4
+231 1 0.0000000000000000e+00 1.8217946457991132e+00 5.6743979821309480e+00 4.5745379958011370e+00 -2 4 1
+1631 1 0.0000000000000000e+00 1.6186355140806337e+00 6.9968459063095674e+00 4.7314583818839315e+00 -4 3 -2
+559 1 0.0000000000000000e+00 2.1132335629599130e-01 6.5380546968696525e+00 3.3002210438501947e+00 1 -2 3
+2481 1 0.0000000000000000e+00 5.7365108565679362e-02 6.6208461375693046e+00 3.6861240535597379e+00 -1 2 2
+45 1 0.0000000000000000e+00 1.9304304765509011e+00 6.2996991013030676e+00 3.9074798967776627e+00 -1 -4 -3
+1599 1 0.0000000000000000e+00 9.0914479104498833e-02 5.5351648898180725e+00 3.6002757367877027e+00 2 -4 1
+936 1 0.0000000000000000e+00 1.3038450689435301e+00 6.6787993754299535e+00 4.3495829264459358e+00 -3 0 -1
+1938 1 0.0000000000000000e+00 2.9524417238377959e-01 7.4278973093388228e+00 2.7904357942645874e+00 3 -5 -1
+2934 3 1.0000000000000000e+00 2.3628327236011817e+00 5.5049077044880192e+00 3.7437974159560161e+00 5 2 -3
+2297 1 0.0000000000000000e+00 1.3797482275044419e+00 5.1922328534046738e+00 2.7936963867065172e+00 1 1 3
+1401 1 0.0000000000000000e+00 9.0982673141074610e-01 7.0481115641183791e+00 3.1709008183309191e+00 1 -11 -1
+2326 1 0.0000000000000000e+00 3.0903724722014619e-01 5.6388066087868420e+00 4.2429373773310832e+00 4 -1 -1
+1751 1 0.0000000000000000e+00 4.2318008855279426e-01 6.0298511098545813e+00 2.6954037758231357e+00 -3 -7 4
+309 1 0.0000000000000000e+00 1.0077110878166855e+00 5.8587907660245042e+00 4.7312635334936477e+00 3 -7 0
+51 1 0.0000000000000000e+00 4.5091791268830927e-01 6.7492618772067452e+00 4.3912413458213173e+00 1 3 5
+2412 1 0.0000000000000000e+00 1.1045296527997577e+00 6.0476622613547955e+00 3.8727964909115999e+00 2 2 9
+2760 1 0.0000000000000000e+00 2.4637105050167567e+00 7.1159503143868728e+00 4.8514432473708329e+00 1 -2 2
+1795 1 0.0000000000000000e+00 4.7996346117578975e-01 6.7963838553691112e+00 2.5211435324532889e+00 2 4 -2
+1022 1 0.0000000000000000e+00 3.3184185241591053e+00 6.3566619693665096e+00 4.7347344340180255e+00 8 -1 10
+914 1 0.0000000000000000e+00 2.8209281936038537e+00 6.0462850894129110e+00 3.9757150094497380e+00 -2 -3 8
+1721 1 0.0000000000000000e+00 4.6995615955417724e+00 7.4930616610537317e+00 3.1253763331859186e+00 -5 0 4
+2379 1 0.0000000000000000e+00 4.7755740960818098e+00 5.9432262411528010e+00 4.4094962776511162e+00 4 0 -4
+1557 1 0.0000000000000000e+00 4.5949990301626515e+00 6.9072548844116683e+00 4.0273002883806948e+00 -3 4 -4
+2187 1 0.0000000000000000e+00 4.8980853826260908e+00 5.5775833043610987e+00 3.7600080131737608e+00 2 -3 0
+2122 1 0.0000000000000000e+00 4.9995559773896048e+00 6.4422326545800441e+00 3.8381802687039754e+00 -4 3 0
+2059 1 0.0000000000000000e+00 2.5146660204699613e+00 6.5443017544833770e+00 4.5578520920182317e+00 1 5 3
+1169 1 0.0000000000000000e+00 3.6130405282261555e+00 5.4644529358088070e+00 4.1441122882638695e+00 2 4 4
+2487 1 0.0000000000000000e+00 3.3756567863583946e+00 7.2945290809016949e+00 2.9668417867496677e+00 1 4 -1
+2454 1 0.0000000000000000e+00 4.8971447383078184e+00 5.6933382614095400e+00 2.5468921545706888e+00 4 2 -1
+1298 1 0.0000000000000000e+00 3.2523190616818618e+00 6.7196673542077674e+00 4.4805810818794827e+00 1 2 -3
+519 1 0.0000000000000000e+00 3.1239718832590708e+00 5.9317049689179520e+00 3.0837426297394113e+00 0 0 0
+318 1 0.0000000000000000e+00 3.4013586308977493e+00 6.2547189111172079e+00 3.9169079397689543e+00 3 -5 -4
+2319 1 0.0000000000000000e+00 2.5482988639442263e+00 5.6949251475603901e+00 3.9584060859778512e+00 5 6 -1
+1356 1 0.0000000000000000e+00 3.7749421355373571e+00 5.1938064385765443e+00 3.7055226779922545e+00 -3 2 1
+65 1 0.0000000000000000e+00 3.0920727162591195e+00 5.1364906029683617e+00 4.5828053971806071e+00 4 -1 -2
+2947 3 1.0000000000000000e+00 4.6573181183874723e+00 5.6465409554512753e+00 4.2968743031715908e+00 2 2 -4
+1510 1 0.0000000000000000e+00 3.9275000326033229e+00 6.4357548170611798e+00 3.5468460185625683e+00 -3 0 -1
+2588 1 0.0000000000000000e+00 2.6627928777796588e+00 6.4545240726921662e+00 3.5857270572238265e+00 2 0 -5
+86 1 0.0000000000000000e+00 3.8966535122055515e+00 6.7191897019219162e+00 4.7810526024186730e+00 -5 3 -1
+2830 2 -1.0000000000000000e+00 4.8239599456378128e+00 6.7630787301451054e+00 3.1536073188472549e+00 -10 -1 -3
+2966 3 1.0000000000000000e+00 3.0116838935256500e+00 6.7529310368896240e+00 2.8165800805451768e+00 3 1 2
+530 1 0.0000000000000000e+00 3.7839192218690059e+00 6.0234143037266676e+00 4.5287656554083977e+00 1 2 -1
+421 1 0.0000000000000000e+00 4.8542898342990473e+00 5.0998588164723051e+00 4.4218367143130477e+00 -1 -1 2
+1656 1 0.0000000000000000e+00 3.8448091971900751e+00 5.7086237830009265e+00 3.1359353197749211e+00 3 0 6
+1330 1 0.0000000000000000e+00 3.8586222346710635e+00 7.2250011010032162e+00 3.8587359917082309e+00 2 -2 -2
+1065 1 0.0000000000000000e+00 4.3975943851232460e+00 6.1930078490657179e+00 2.7916160772108478e+00 4 -4 5
+2324 1 0.0000000000000000e+00 4.4222184816903507e+00 6.4267188990508464e+00 3.4220625606265314e+00 -1 -4 1
+1264 1 0.0000000000000000e+00 4.1348902121461935e+00 5.0261016647058065e+00 2.9689347491913303e+00 3 -3 3
+302 1 0.0000000000000000e+00 4.2649416705010346e+00 5.8508918628609505e+00 4.0604885868556000e+00 -1 3 2
+543 1 0.0000000000000000e+00 3.7930185588148619e+00 6.6198962693472430e+00 2.8785286820457063e+00 8 1 0
+1150 1 0.0000000000000000e+00 3.1010708448544753e+00 5.1142096644317636e+00 3.4421894174401748e+00 -5 3 2
+2211 1 0.0000000000000000e+00 3.5634073347463615e+00 5.3602657706239896e+00 2.7202924165876805e+00 -1 -6 -4
+912 1 0.0000000000000000e+00 2.7810380576736260e+00 6.8835311303197573e+00 3.7867701653537673e+00 1 -4 -1
+711 1 0.0000000000000000e+00 3.5960825182289975e+00 6.5808024957363669e+00 3.3048897776182984e+00 -5 2 -7
+970 1 0.0000000000000000e+00 2.5801250528314958e+00 6.2206119561356976e+00 3.0847678002998116e+00 -5 6 3
+1833 1 0.0000000000000000e+00 3.1397851993491992e+00 5.7402920394568859e+00 4.4367013955788703e+00 9 -3 0
+719 1 0.0000000000000000e+00 2.6328481206202889e+00 7.2333663417183027e+00 3.2448611061184280e+00 -4 -8 4
+1945 1 0.0000000000000000e+00 2.8381175601569408e+00 5.4827073500647874e+00 2.6720416349489158e+00 -2 6 -1
+2861 2 -1.0000000000000000e+00 3.3136266497770706e+00 7.0816408730119953e+00 3.6482345284695925e+00 -3 3 -3
+1203 1 0.0000000000000000e+00 2.6979395102504586e+00 6.0236958906488276e+00 4.9799645947931772e+00 1 1 3
+1977 1 0.0000000000000000e+00 3.2228282693561425e+00 6.1695115587426814e+00 2.5181909479611875e+00 3 -3 2
+1112 1 0.0000000000000000e+00 4.3208987262107801e+00 6.6728513022710567e+00 4.2430123255713781e+00 -1 2 7
+32 1 0.0000000000000000e+00 4.3723718096440001e+00 5.6186322121583085e+00 3.4356284053508461e+00 0 1 -1
+2957 3 1.0000000000000000e+00 3.3862523460185705e+00 7.2128641674214382e+00 4.5616986825443666e+00 -1 -1 -2
+950 1 0.0000000000000000e+00 1.3878985470810605e+00 9.3776846866992489e+00 2.6833214904614562e+00 2 -6 -5
+1357 1 0.0000000000000000e+00 2.2757950063694810e+00 7.7413877319012458e+00 3.0324852486758154e+00 4 0 -3
+1819 1 0.0000000000000000e+00 1.5400085458221505e-01 9.3600713094643915e+00 3.8709230674860775e+00 -4 -3 1
+1716 1 0.0000000000000000e+00 2.2432755041265509e+00 8.4454995931375620e+00 4.2246720875197505e+00 8 -3 -2
+1711 1 0.0000000000000000e+00 9.3705327278031036e-01 8.3361439534978796e+00 3.9675475173526094e+00 -6 1 -3
+2334 1 0.0000000000000000e+00 2.6420290282075942e-01 8.3265176108499670e+00 3.8426871609775941e+00 4 -3 0
+744 1 0.0000000000000000e+00 1.3756904307294222e+00 8.5137228259280491e+00 4.9850836007647734e+00 2 -3 -5
+1475 1 0.0000000000000000e+00 4.2751032436005404e-01 8.7051485064734297e+00 2.6252525255049841e+00 4 3 0
+782 1 0.0000000000000000e+00 4.1195149684948029e-01 7.9563990075555022e+00 3.0018146970038968e+00 -2 6 6
+255 1 0.0000000000000000e+00 1.1930154232317375e-01 9.7487759294531440e+00 3.0525904454317780e+00 -3 -2 -3
+592 1 0.0000000000000000e+00 6.6714073356084558e-01 7.6763175247514255e+00 3.2662652647657255e+00 2 -2 2
+2666 1 0.0000000000000000e+00 7.0485410523370395e-01 8.7123410703616937e+00 4.1677036389926485e+00 -2 -1 -2
+173 1 0.0000000000000000e+00 5.7832745620110193e-01 8.3714235454007948e+00 4.8853532322708233e+00 -1 -6 1
+955 1 0.0000000000000000e+00 1.2649838733018275e+00 7.6960950828907366e+00 3.8432473099830839e+00 2 -1 0
+10 1 0.0000000000000000e+00 5.4814901034180574e-01 7.7023948604932926e+00 4.4864431132785372e+00 1 3 -2
+2607 1 0.0000000000000000e+00 2.3136541220366733e+00 9.4464233646659856e+00 3.1451991818018241e+00 2 1 0
+2418 1 0.0000000000000000e+00 4.4690215861476518e-01 9.8527667377947701e+00 3.6062302083548698e+00 4 -1 0
+2455 1 0.0000000000000000e+00 2.1304719013473647e+00 8.8354142002769436e+00 4.7903662466209198e+00 4 0 -4
+822 1 0.0000000000000000e+00 1.9994732020386208e+00 8.3598031626723976e+00 3.9099597995876780e+00 1 -8 -1
+1761 1 0.0000000000000000e+00 8.3013153539808837e-01 7.5063934924893898e+00 4.5546725503369547e+00 1 -1 0
+1805 1 0.0000000000000000e+00 7.5459760739807802e-01 9.9202047054667624e+00 4.8262217966823480e+00 -4 -1 4
+2651 1 0.0000000000000000e+00 1.3703612277164403e+00 7.6065074842892111e+00 3.4417805919045481e+00 -2 -8 -1
+1621 1 0.0000000000000000e+00 1.8823532763633903e+00 9.4817150911683186e+00 4.9177833606648962e+00 4 -7 -1
+1970 1 0.0000000000000000e+00 5.8708980871880223e-01 9.4645439997980176e+00 4.5375688626069897e+00 0 -5 -1
+1343 1 0.0000000000000000e+00 2.1028331876200559e+00 9.5931645892980892e+00 3.0393192207040873e+00 -2 -1 0
+1133 1 0.0000000000000000e+00 1.7978629346528170e+00 9.1557703562275474e+00 3.6168038343046884e+00 1 -4 0
+1123 1 0.0000000000000000e+00 1.3843762925953984e+00 8.3865853422304220e+00 3.3351204691807483e+00 1 0 -1
+1197 1 0.0000000000000000e+00 7.6637250628708176e-01 9.4006170669244788e+00 2.6018728780715126e+00 0 1 0
+2590 1 0.0000000000000000e+00 7.5579554621881773e-01 8.7016388946555914e+00 3.5264831368439573e+00 -2 5 -4
+76 1 0.0000000000000000e+00 2.2458320751113048e+00 7.7012765706640813e+00 3.7275847182040382e+00 -1 -2 1
+2208 1 0.0000000000000000e+00 2.3803695609466367e+00 8.3064881095288605e+00 2.5969537645995380e+00 -1 3 -1
+2615 1 0.0000000000000000e+00 1.5106996230182559e+00 9.1829060843198551e+00 4.0903561476924670e+00 1 -1 -7
+139 1 0.0000000000000000e+00 1.4976996235790896e+00 8.0679337157797946e+00 2.8137074494097258e+00 -4 1 -6
+1080 1 0.0000000000000000e+00 5.4226577650767306e-02 8.9265049620459447e+00 2.6222316653833451e+00 -3 -2 1
+1674 1 0.0000000000000000e+00 1.3340851800978373e+00 8.9855003617833038e+00 2.5207021679532979e+00 -9 4 -2
+2745 1 0.0000000000000000e+00 1.3340407929406688e+00 8.8995278469635437e+00 4.3274980758821506e+00 1 -3 3
+766 1 0.0000000000000000e+00 2.0965603760482172e+00 9.7989232998312623e+00 3.9568248941704067e+00 1 -2 5
+1907 1 0.0000000000000000e+00 1.9521806780411084e+00 8.8755373448117165e+00 3.3230054726607632e+00 5 -3 -2
+2691 1 0.0000000000000000e+00 1.1925373186232762e+00 9.3305754472578606e+00 3.3187578278321319e+00 2 3 2
+2564 1 0.0000000000000000e+00 2.0373478148491735e+00 8.9377663000351095e+00 2.9390061326557717e+00 -6 0 1
+2695 1 0.0000000000000000e+00 6.4885896253485176e-01 9.5178924236288509e+00 3.5986383970592661e+00 -1 -9 -1
+1615 1 0.0000000000000000e+00 1.2259751651212880e+00 8.2596598425650605e+00 4.4416620785436081e+00 1 -2 2
+1119 1 0.0000000000000000e+00 1.9464021992975751e+00 7.7719008277755313e+00 4.2852028706658345e+00 -2 -1 2
+2786 1 0.0000000000000000e+00 6.8870979941325228e-01 8.2241197379715985e+00 3.4198784239557880e+00 9 4 3
+432 1 0.0000000000000000e+00 1.2349769370847514e+00 9.6432244719963123e+00 4.2057119338455751e+00 -1 -2 -8
+283 1 0.0000000000000000e+00 3.6598993648884632e+00 9.3567350355410852e+00 2.6951626983244377e+00 -1 -7 1
+2178 1 0.0000000000000000e+00 4.5572002085478891e+00 7.5410009297162146e+00 4.3713164448617832e+00 -2 -3 2
+1423 1 0.0000000000000000e+00 3.6653957114724864e+00 9.8376288043497784e+00 3.3063386816664146e+00 -1 -2 -7
+35 1 0.0000000000000000e+00 4.8195374510719091e+00 9.1939715045337493e+00 3.9393657490946299e+00 5 5 -2
+229 1 0.0000000000000000e+00 4.2495219111023079e+00 9.4212047585673719e+00 4.0674671730840064e+00 -3 -1 2
+230 1 0.0000000000000000e+00 3.0908461288568234e+00 9.8750753894230954e+00 4.9644959938699547e+00 -2 0 -6
+1717 1 0.0000000000000000e+00 3.3912721184745362e+00 9.7247171285879723e+00 2.5213563406446724e+00 7 -1 5
+926 1 0.0000000000000000e+00 4.9637051763037281e+00 8.3309354201564680e+00 4.5585656249806394e+00 5 0 5
+1139 1 0.0000000000000000e+00 4.1230123176183646e+00 8.6187442563798253e+00 3.9518781635707412e+00 -1 -4 3
+1448 1 0.0000000000000000e+00 4.6203727893581163e+00 8.1573976404557342e+00 3.5516353720205665e+00 2 2 0
+1434 1 0.0000000000000000e+00 3.0590328673764073e+00 7.7780402685808818e+00 4.8636172358282961e+00 -8 5 -8
+907 1 0.0000000000000000e+00 2.6792522825796419e+00 8.4150925430279635e+00 3.3248985475298030e+00 0 3 -5
+1773 1 0.0000000000000000e+00 2.6106240745287859e+00 9.2507091283537193e+00 3.7022036251928685e+00 4 -1 4
+798 1 0.0000000000000000e+00 3.7543371266058707e+00 8.1629531150401000e+00 4.5989060427600261e+00 5 2 0
+1698 1 0.0000000000000000e+00 4.0879469371190060e+00 9.8393385139436784e+00 3.6576889673172994e+00 3 2 1
+1618 1 0.0000000000000000e+00 2.9661975580743953e+00 7.8140927581312072e+00 3.0721878623160754e+00 1 3 0
+373 1 0.0000000000000000e+00 3.9792638246320640e+00 7.5217232752189629e+00 4.1290376031347735e+00 1 -4 6
+1543 1 0.0000000000000000e+00 2.9312389339124789e+00 8.3747623327389622e+00 4.0709765771239246e+00 5 -6 4
+2518 1 0.0000000000000000e+00 4.5464689793524240e+00 8.1298093501801887e+00 4.6908572772816939e+00 1 -4 -5
+284 1 0.0000000000000000e+00 4.1068082504493519e+00 9.9563471928420455e+00 4.9716378973743520e+00 -1 8 1
+323 1 0.0000000000000000e+00 3.8060677590295686e+00 8.8437402916077570e+00 4.0361847619702376e+00 4 -2 0
+2701 1 0.0000000000000000e+00 3.2320397743443237e+00 9.0644498008882639e+00 3.7755073844349503e+00 -1 4 3
+219 1 0.0000000000000000e+00 2.6980423633817439e+00 9.3005588174004110e+00 4.5249128784403698e+00 -2 -1 -7
+2053 1 0.0000000000000000e+00 4.0524025810528173e+00 7.7146500124956212e+00 3.3075171956453358e+00 -1 -4 7
+694 1 0.0000000000000000e+00 3.8456743096021362e+00 7.5810630408079831e+00 4.7319983216702388e+00 -3 1 3
+2491 1 0.0000000000000000e+00 3.5190734457201658e+00 9.6087433840126071e+00 4.1439113509092147e+00 1 2 -5
+511 1 0.0000000000000000e+00 3.4153383013763028e+00 8.6678752821291756e+00 2.9520201916294360e+00 -1 -6 -3
+2383 1 0.0000000000000000e+00 3.1629981660718576e+00 7.5845620736996917e+00 3.8677122530361401e+00 -1 5 4
+362 1 0.0000000000000000e+00 3.6136925865225806e+00 7.9801362864522085e+00 2.6594586192010863e+00 3 -4 0
+2489 1 0.0000000000000000e+00 4.4976401853452925e+00 8.6688984423426341e+00 3.8065549216457661e+00 0 7 -3
+179 1 0.0000000000000000e+00 4.9226353093368749e+00 9.7786390390695122e+00 4.4985114255827119e+00 5 -3 -2
+1767 1 0.0000000000000000e+00 4.8154144239544738e+00 8.8279849370030252e+00 2.9136210306496357e+00 -7 -2 -1
+1837 1 0.0000000000000000e+00 4.3968122453431837e+00 9.6288095147491024e+00 2.8257347368134789e+00 1 -6 11
+2244 1 0.0000000000000000e+00 4.7577192730222411e+00 8.8407409590240000e+00 4.9550340152313446e+00 -2 -5 1
+415 1 0.0000000000000000e+00 3.0687010761598152e+00 8.6147964995249371e+00 4.8702038657806410e+00 -5 2 3
+883 1 0.0000000000000000e+00 3.1997522885537162e+00 8.2297348619086250e+00 3.4034772273032798e+00 0 -5 8
+2264 1 0.0000000000000000e+00 4.9385559586024446e+00 9.5386401597168504e+00 3.1115734744265677e+00 -1 5 0
+2565 1 0.0000000000000000e+00 2.6447930686403303e+00 8.0013728759125495e+00 4.8867799870994570e+00 -1 5 -1
+752 1 0.0000000000000000e+00 2.9924883868065728e+00 8.8989918733918358e+00 3.2514940313988756e+00 0 -2 1
+361 1 0.0000000000000000e+00 4.2699058513809680e+00 9.5598611046200688e+00 4.3175684677727189e+00 -4 -2 6
+2342 1 0.0000000000000000e+00 2.8026386972085642e+00 9.4853683899691337e+00 2.8380453434924000e+00 -3 -2 1
+1739 1 0.0000000000000000e+00 4.7894944920367353e+00 9.1038048162900278e+00 3.5883808990305841e+00 -4 -2 -5
+1209 1 0.0000000000000000e+00 3.7309510152179617e+00 7.8049274848269059e+00 3.3164526565112009e+00 0 1 1
+1756 1 0.0000000000000000e+00 4.4064540417309344e+00 8.3452172796373674e+00 2.9126122484164445e+00 2 0 -2
+1391 1 0.0000000000000000e+00 3.8831825134206199e+00 8.8733016206055950e+00 3.2029469738370291e+00 -10 -1 -1
+418 1 0.0000000000000000e+00 2.5773085435115943e+00 9.7836585911704770e+00 4.2414994444448872e+00 -2 -10 -1
+2601 1 0.0000000000000000e+00 2.9043669421451686e+00 7.6233528273078637e+00 2.5875104313850117e+00 -1 4 -3
+2194 1 0.0000000000000000e+00 2.4362575048990367e+00 7.4117275076575648e+00 5.2822637467960583e+00 0 1 -1
+707 1 0.0000000000000000e+00 1.3772023595826155e+00 5.7378050912040344e+00 6.8843289086250570e+00 1 -2 0
+988 1 0.0000000000000000e+00 2.0984257343334888e-02 6.6733040943444948e+00 5.1987926828965598e+00 -5 1 3
+611 1 0.0000000000000000e+00 5.6458964104891818e-01 5.1708045836325986e+00 7.1643414995712558e+00 3 -4 -3
+304 1 0.0000000000000000e+00 1.8375497529224958e+00 6.1030453652896508e+00 6.2753953811341194e+00 2 -2 1
+2392 1 0.0000000000000000e+00 2.5128616817087013e-01 5.8114859856341701e+00 5.5735694673753056e+00 -4 3 -1
+130 1 0.0000000000000000e+00 6.5267402776256778e-01 7.0292981060250801e+00 5.7760395268910818e+00 3 -2 2
+1459 1 0.0000000000000000e+00 8.7976498615225074e-01 5.9284779761153743e+00 5.8443061543985770e+00 1 -9 5
+2182 1 0.0000000000000000e+00 1.0237759072438548e+00 5.2087650418606826e+00 5.6845910983093200e+00 1 0 -2
+1626 1 0.0000000000000000e+00 1.3263622568447766e+00 5.5267366308159360e+00 7.1799106707990727e+00 6 1 -6
+2816 2 -1.0000000000000000e+00 2.1764761238526273e+00 7.4443849239935540e+00 5.9324935704789574e+00 1 0 6
+1595 1 0.0000000000000000e+00 1.6197075290422283e-01 6.0919435570528941e+00 6.5171996482895080e+00 3 -2 -4
+2834 2 -1.0000000000000000e+00 6.6117235423782217e-01 6.1653262099060093e+00 6.7685149607540875e+00 4 -2 -1
+2385 1 0.0000000000000000e+00 1.5815514056491233e+00 7.3141107209010894e+00 6.7897954173004793e+00 -4 -5 -1
+207 1 0.0000000000000000e+00 7.0169657922252326e-01 7.3346022940393869e+00 7.3615848308604237e+00 5 0 -3
+476 1 0.0000000000000000e+00 5.8204577046938266e-01 5.4588161485913629e+00 6.0897702990625557e+00 3 0 1
+737 1 0.0000000000000000e+00 2.0994271742118369e+00 6.8263881753122426e+00 6.1311148573719745e+00 -3 2 1
+1016 1 0.0000000000000000e+00 1.8319964729205107e+00 7.1793441171844847e+00 5.6197789936864844e+00 -3 5 0
+2202 1 0.0000000000000000e+00 2.4973654699699837e+00 6.2782942369974020e+00 5.6971716315778309e+00 4 3 0
+2193 1 0.0000000000000000e+00 8.5130672913143768e-01 6.5249826975069576e+00 5.7189412621946012e+00 -4 -1 -4
+2814 2 -1.0000000000000000e+00 1.2201504805676535e+00 6.7606091386039591e+00 6.4497868173517912e+00 -1 -6 5
+326 1 0.0000000000000000e+00 2.3958857074987097e-01 5.0584605226895949e+00 5.4175749597646403e+00 7 3 2
+1789 1 0.0000000000000000e+00 1.3924149770333929e+00 6.7151095264580496e+00 5.5018902781898236e+00 2 -2 -4
+174 1 0.0000000000000000e+00 1.7174072746987623e+00 6.3844068217440668e+00 6.7131764612168157e+00 -1 -3 4
+2443 1 0.0000000000000000e+00 1.5429251092510445e+00 5.1947089316246000e+00 6.2481663802685645e+00 -2 1 -1
+460 1 0.0000000000000000e+00 1.0542459403688411e+00 5.4821160549310353e+00 5.1527039980843750e+00 1 -1 5
+1309 1 0.0000000000000000e+00 1.8489426201840131e+00 5.5403292528871591e+00 6.0279536045315929e+00 1 -3 -2
+1790 1 0.0000000000000000e+00 2.2889242769304987e+00 6.4365630022267473e+00 6.8835491164096130e+00 1 -1 8
+760 1 0.0000000000000000e+00 1.6559997000793154e+00 6.8232694429763470e+00 6.7347326551111264e+00 6 0 1
+165 1 0.0000000000000000e+00 1.7619621725953598e+00 5.1472245533602914e+00 7.4134562679963443e+00 -6 1 0
+781 1 0.0000000000000000e+00 1.2540757099826045e+00 7.2847203138631533e+00 5.5038721657703000e+00 0 -4 -3
+2052 1 0.0000000000000000e+00 1.7187456485668124e+00 5.7696929273077231e+00 5.3854840788815981e+00 2 1 6
+844 1 0.0000000000000000e+00 7.6313099409986263e-01 6.1929113011114998e+00 5.0555263583785415e+00 3 4 3
+408 1 0.0000000000000000e+00 1.9536343048688221e+00 5.5687834439333530e+00 6.7528083410339352e+00 1 -1 1
+2920 3 1.0000000000000000e+00 1.6354948510022382e+00 6.3133290036249008e+00 5.7469934031251126e+00 -8 5 0
+1316 1 0.0000000000000000e+00 2.1317090136240857e+00 6.7954914353950739e+00 5.2561487602129766e+00 3 -6 1
+2234 1 0.0000000000000000e+00 3.0180269733010034e-01 7.4302012775715287e+00 5.1337359011109802e+00 1 2 -7
+1359 1 0.0000000000000000e+00 5.7581669276547220e-01 6.7428290404918094e+00 7.0766845143858097e+00 -1 5 4
+1943 1 0.0000000000000000e+00 1.3950566164979157e+00 6.0474892730674563e+00 6.2368542898220278e+00 -4 -1 3
+1177 1 0.0000000000000000e+00 6.0417538395988635e-01 5.5151649914702841e+00 6.8643420571685692e+00 1 3 4
+1929 1 0.0000000000000000e+00 1.6226463879439421e+00 5.4190012239963696e+00 5.4411678076107242e+00 3 -4 1
+2732 1 0.0000000000000000e+00 2.1811315242634857e+00 5.0975404705575977e+00 5.7309994503609696e+00 1 0 3
+755 1 0.0000000000000000e+00 1.6369255377301598e-01 6.5763750508799204e+00 5.9882068076948851e+00 -3 -4 2
+1658 1 0.0000000000000000e+00 1.3805112438962714e+00 6.4144862915397676e+00 7.4825401991467668e+00 -4 -3 -1
+2457 1 0.0000000000000000e+00 8.6682559417383065e-01 6.9112216396983834e+00 7.3685001941413457e+00 10 -6 -1
+2575 1 0.0000000000000000e+00 1.0648233312834070e+00 5.7155180059278701e+00 7.4930615755399943e+00 -2 3 -3
+2450 1 0.0000000000000000e+00 3.6098867116160044e-01 5.3236023043909304e+00 5.0116470129445005e+00 2 4 0
+2978 3 1.0000000000000000e+00 4.4633182658868824e+00 6.2731666029151087e+00 6.2296476729215922e+00 5 -1 -2
+968 1 0.0000000000000000e+00 4.5193158838764687e+00 5.2229209801627823e+00 5.0178105476869419e+00 7 -1 0
+1170 1 0.0000000000000000e+00 4.5048355281598056e+00 5.4604661275174173e+00 6.2324969252231162e+00 5 0 -3
+1828 1 0.0000000000000000e+00 4.4061946210244596e+00 7.0013521412201856e+00 5.1925438048644219e+00 2 -2 0
+1168 1 0.0000000000000000e+00 2.8297733246672765e+00 7.3074799782681428e+00 6.8566945096520584e+00 4 6 -1
+1183 1 0.0000000000000000e+00 3.8514667252772421e+00 5.7592586959545704e+00 6.1800429947966320e+00 1 -2 3
+1568 1 0.0000000000000000e+00 4.2703308764338939e+00 5.0898718698048331e+00 6.1292080268101206e+00 1 -3 -1
+260 1 0.0000000000000000e+00 3.5040998646488011e+00 6.5089787289705026e+00 7.3015453820148295e+00 -4 1 2
+515 1 0.0000000000000000e+00 2.7231439235387658e+00 6.8571421542735473e+00 5.7198009262528036e+00 -7 -3 -1
+407 1 0.0000000000000000e+00 4.6878842682715565e+00 5.5216001378083686e+00 5.9904695941001895e+00 7 0 1
+1570 1 0.0000000000000000e+00 4.0309006109466905e+00 6.3644282563707000e+00 5.4840772936775766e+00 -1 -1 -4
+547 1 0.0000000000000000e+00 3.2350057499426708e+00 6.9616727484857588e+00 5.4563272578138511e+00 -3 0 2
+2885 2 -1.0000000000000000e+00 3.6084791901510482e+00 7.2109135568686540e+00 5.2014253185533281e+00 1 1 -4
+1218 1 0.0000000000000000e+00 3.3337001777529700e+00 6.5280123520379645e+00 6.8435328668809055e+00 -3 2 0
+2499 1 0.0000000000000000e+00 4.8630093365318059e+00 6.5083853648479852e+00 6.5799264426518684e+00 1 -2 4
+2239 1 0.0000000000000000e+00 3.9911524004029841e+00 5.2840292834003382e+00 5.5966476911201868e+00 -6 7 0
+2640 1 0.0000000000000000e+00 2.7280393481230059e+00 7.4026454067854015e+00 6.4380224100827368e+00 2 0 2
+2748 1 0.0000000000000000e+00 3.9513642310970365e+00 6.2815900323261351e+00 6.4733259941463936e+00 1 1 -4
+1838 1 0.0000000000000000e+00 2.7618114472511883e+00 6.7982272093894514e+00 6.3908473859021608e+00 -2 -9 4
+2505 1 0.0000000000000000e+00 3.4507501407374788e+00 6.8884350103528789e+00 6.3417357327585409e+00 0 -1 1
+2471 1 0.0000000000000000e+00 3.7794206053224704e+00 5.2779583478341356e+00 6.9491109695435380e+00 -1 -3 -1
+2613 1 0.0000000000000000e+00 4.0556647098058374e+00 7.0551067788733759e+00 6.1804347840041327e+00 -1 3 9
+251 1 0.0000000000000000e+00 3.2519608688046584e+00 6.1774226941453847e+00 6.0751492204991893e+00 -5 0 -2
+2322 1 0.0000000000000000e+00 4.4964661097353860e+00 7.0358730483086660e+00 7.2083657872582547e+00 6 -1 7
+633 1 0.0000000000000000e+00 2.7712648900955195e+00 5.1221707879313092e+00 5.2136712017016897e+00 -3 -3 4
+316 1 0.0000000000000000e+00 4.1440284115824282e+00 6.2296664185191206e+00 7.2060732307407376e+00 -2 -4 3
+1013 1 0.0000000000000000e+00 4.1383996310462647e+00 5.8634027557021637e+00 5.2172464981664346e+00 0 6 4
+406 1 0.0000000000000000e+00 3.1344432902509549e+00 6.1690285442681372e+00 7.2649437315663175e+00 5 -4 5
+743 1 0.0000000000000000e+00 2.7805626133400456e+00 5.7293949041867807e+00 7.0912312485339397e+00 0 2 -1
+394 1 0.0000000000000000e+00 4.2898574814300821e+00 7.3733134321903204e+00 6.6256682113920329e+00 -2 0 -1
+651 1 0.0000000000000000e+00 3.3722990032346187e+00 5.2467669588954857e+00 6.4044332478333112e+00 -4 3 4
+793 1 0.0000000000000000e+00 4.0007262321371089e+00 6.9970868521875156e+00 7.1409741717195425e+00 -4 1 1
+1559 1 0.0000000000000000e+00 3.3833660369186158e+00 6.6582413770604001e+00 5.7390285051477843e+00 1 -1 -5
+1613 1 0.0000000000000000e+00 3.8650132680743514e+00 5.9166942814259826e+00 6.9837609929717068e+00 -1 -3 -4
+147 1 0.0000000000000000e+00 4.8472112009929909e+00 5.4903359563208323e+00 6.8024572497742843e+00 0 1 3
+1713 1 0.0000000000000000e+00 4.5925341034344829e+00 6.1638310552406868e+00 7.1056085450172262e+00 1 2 2
+393 1 0.0000000000000000e+00 3.0009977797136664e+00 6.5261692700798832e+00 5.1407043671905219e+00 -3 2 3
+1242 1 0.0000000000000000e+00 3.0655417258707325e+00 6.0611556365525869e+00 5.2108009970794322e+00 2 -7 -5
+2007 1 0.0000000000000000e+00 2.5107705588420943e+00 5.7406550348068510e+00 6.6604139663136497e+00 -6 -7 -1
+773 1 0.0000000000000000e+00 3.3331217123934520e+00 5.5013556074136796e+00 5.4241819818803307e+00 0 -1 1
+2116 1 0.0000000000000000e+00 4.5164820833912298e+00 6.7836290672641395e+00 6.0510006112855175e+00 4 4 -3
+1358 1 0.0000000000000000e+00 4.8201384743009026e+00 6.2129389968138371e+00 5.2807599490317259e+00 -2 1 1
+921 1 0.0000000000000000e+00 2.9254176675444663e+00 5.9307419206595853e+00 6.3320782178686139e+00 2 -7 1
+2684 1 0.0000000000000000e+00 4.5897964082967935e+00 5.4778465819343030e+00 7.4662805725709926e+00 2 0 -5
+2367 1 0.0000000000000000e+00 4.9415161974469903e+00 6.7798046891616943e+00 7.4184576073149886e+00 -7 2 0
+2325 1 0.0000000000000000e+00 3.7786795088463756e+00 5.4561996865620452e+00 5.0231665423254128e+00 -2 -3 0
+2036 1 0.0000000000000000e+00 4.9381750535504754e+00 5.0632520151591356e+00 5.1990302861076216e+00 -8 2 4
+1073 1 0.0000000000000000e+00 2.4339334406819707e-01 8.4716659084117829e+00 5.5412189574279846e+00 3 4 0
+2525 1 0.0000000000000000e+00 1.1525964863741633e+00 9.8349058899245883e+00 6.4234296636277257e+00 4 -4 1
+754 1 0.0000000000000000e+00 1.0767498328555425e+00 9.9782506272267302e+00 7.1452085300259762e+00 -2 2 0
+1931 1 0.0000000000000000e+00 3.9011067114640086e-01 7.8743304996507746e+00 6.5134026458188590e+00 4 -6 -2
+2210 1 0.0000000000000000e+00 3.5893367651205238e-01 8.7071271813247755e+00 6.4623616476770165e+00 -1 1 -3
+2763 1 0.0000000000000000e+00 1.9520246496585969e+00 9.9958072340866782e+00 6.0717330351164209e+00 4 -9 -1
+1695 1 0.0000000000000000e+00 2.0673531019458169e+00 9.3670387495158369e+00 5.8259723361184417e+00 2 -1 4
+1176 1 0.0000000000000000e+00 1.1490390627456624e+00 9.2544275775697749e+00 5.8207498797513963e+00 10 -1 -3
+599 1 0.0000000000000000e+00 1.9574710878530666e+00 7.6405767673510043e+00 6.4463910044852302e+00 4 -2 -2
+477 1 0.0000000000000000e+00 1.5590473131283789e+00 7.5733879239581583e+00 5.1409180592984933e+00 -3 0 6
+1104 1 0.0000000000000000e+00 1.6491159329431840e-01 7.8081171758227406e+00 5.4748197394539444e+00 3 1 0
+2281 1 0.0000000000000000e+00 1.4190526769250262e+00 7.8225099198640526e+00 6.7008174973828138e+00 -4 6 1
+1420 1 0.0000000000000000e+00 2.6399624730251020e-01 8.6195871627819152e+00 6.2592001753557298e+00 3 0 1
+690 1 0.0000000000000000e+00 2.5008107488913756e-01 8.3294763862494854e+00 7.3787812240745945e+00 3 -1 -2
+1098 1 0.0000000000000000e+00 1.2824168850462105e+00 8.4098160892926135e+00 6.2357048681790426e+00 0 2 1
+1875 1 0.0000000000000000e+00 2.3661152614303962e-01 7.5610458478907656e+00 6.0624792046796623e+00 7 -5 -4
+1740 1 0.0000000000000000e+00 1.6742067552245028e+00 9.3616623226071098e+00 6.6014965324537638e+00 8 3 1
+81 1 0.0000000000000000e+00 1.8632187900127390e+00 7.9288952893412628e+00 6.9257083340315182e+00 3 1 1
+2605 1 0.0000000000000000e+00 1.6175570247221049e+00 8.8053866229660400e+00 6.9155427178655779e+00 2 -2 -2
+2365 1 0.0000000000000000e+00 1.7687010400294030e+00 8.8360799393222873e+00 6.1018965410088759e+00 0 3 -1
+1214 1 0.0000000000000000e+00 2.4644985434710365e+00 9.0292587724595172e+00 6.7464098734082452e+00 3 6 -7
+2044 1 0.0000000000000000e+00 9.6206831527852965e-01 8.7486030147460951e+00 6.5335599995238711e+00 5 -4 -4
+2090 1 0.0000000000000000e+00 1.5907795380338063e+00 9.7782492166681809e+00 5.4863293341134201e+00 1 4 1
+141 1 0.0000000000000000e+00 1.7263639337197443e+00 9.2830100341178330e+00 7.3691807493888319e+00 2 -1 -3
+1846 1 0.0000000000000000e+00 1.0222100162362548e+00 7.7312547857709264e+00 6.2753387581672664e+00 4 7 0
+553 1 0.0000000000000000e+00 2.1641431809663954e+00 8.3769886227780646e+00 5.7010403803625804e+00 4 -3 -3
+2726 1 0.0000000000000000e+00 3.4268153212362124e-01 9.3674799784283529e+00 6.5435613377800985e+00 -2 3 2
+728 1 0.0000000000000000e+00 2.4676477833487249e+00 9.5177962602268451e+00 5.4620581163497892e+00 2 -1 -2
+1325 1 0.0000000000000000e+00 2.1988577597925465e+00 9.9923686428649923e+00 6.9267816442420536e+00 -2 -2 -1
+2753 1 0.0000000000000000e+00 5.5802761643389953e-01 7.6197949772816305e+00 6.8602696576392077e+00 5 2 -2
+487 1 0.0000000000000000e+00 1.3225686020615652e+00 9.4890609015190002e+00 5.1528492960009125e+00 6 -2 6
+697 1 0.0000000000000000e+00 1.0060633234272303e+00 7.8023079300452212e+00 5.7621154973261897e+00 5 -2 -7
+2019 1 0.0000000000000000e+00 8.1936103437330110e-01 8.4584136559024845e+00 5.6563227027838403e+00 1 1 8
+2086 1 0.0000000000000000e+00 9.1998522537964067e-01 9.1868487952226037e+00 7.1899648435181307e+00 -7 -5 -6
+551 1 0.0000000000000000e+00 1.5193630876655226e+00 8.6169457270049694e+00 5.3339513414469328e+00 2 -2 0
+831 1 0.0000000000000000e+00 1.3338359996180893e+00 8.7774605676407091e+00 7.1291434571401888e+00 1 -2 6
+946 1 0.0000000000000000e+00 2.3822969604614586e+00 8.5339181569002562e+00 6.7029332446728409e+00 -1 1 8
+1714 1 0.0000000000000000e+00 9.0449759971003296e-01 7.9910646855642895e+00 5.1005667637422256e+00 -1 2 3
+2118 1 0.0000000000000000e+00 7.0082268985530549e-01 8.1158584756187171e+00 6.9657158064260374e+00 -5 -4 2
+1131 1 0.0000000000000000e+00 2.0792955190481246e+00 8.2793018133994973e+00 7.2474296016935682e+00 -1 2 3
+2396 1 0.0000000000000000e+00 3.3584136852056290e-01 9.8617776757502966e+00 5.3365626897219514e+00 2 3 4
+9 1 0.0000000000000000e+00 8.8136989112050712e-01 9.7660800640504597e+00 6.0782402840302954e+00 -3 -5 -4
+2199 1 0.0000000000000000e+00 2.0759550538725300e+00 8.1913648242158512e+00 5.0006653270563408e+00 -2 -5 -1
+2596 1 0.0000000000000000e+00 1.8830242739103471e+00 8.0479931395437454e+00 5.6676216057464721e+00 1 5 2
+1997 1 0.0000000000000000e+00 6.3005702764977689e-01 9.0581669899433255e+00 5.8324412336144933e+00 -1 4 1
+1390 1 0.0000000000000000e+00 1.6717188875219402e+00 8.2288253683544248e+00 6.3608020521264033e+00 2 -4 -4
+2882 2 -1.0000000000000000e+00 2.6969590494999257e-01 8.9185386095042336e+00 5.0181658894469736e+00 3 -1 1
+2350 1 0.0000000000000000e+00 3.2214526879058475e-01 9.7341342901176606e+00 7.4462014247248218e+00 2 -3 4
+2950 3 1.0000000000000000e+00 8.6142029199373660e-01 9.2058373239140305e+00 5.1127294021519445e+00 0 1 2
+1473 1 0.0000000000000000e+00 3.6289166595983760e-02 7.6947514900750456e+00 7.2172547494056998e+00 5 3 -4
+2113 1 0.0000000000000000e+00 2.3487091733062200e+00 9.3705787751869725e+00 7.4821192917686856e+00 5 0 1
+2183 1 0.0000000000000000e+00 3.4288144414901502e+00 9.5786762381222985e+00 6.3177870365449555e+00 -4 -2 -4
+1196 1 0.0000000000000000e+00 4.6380109195027162e+00 7.7857986206834990e+00 5.2349662085639865e+00 -5 4 -2
+2723 1 0.0000000000000000e+00 4.4936057740997279e+00 9.3441555312017943e+00 5.1092191987915294e+00 0 4 -1
+495 1 0.0000000000000000e+00 4.8699732784891125e+00 9.4287566797619426e+00 5.7545429121303355e+00 -2 4 4
+1107 1 0.0000000000000000e+00 3.1918607684127411e+00 9.0996304267930572e+00 6.8969366484367303e+00 2 0 3
+1764 1 0.0000000000000000e+00 3.3913599794149762e+00 9.4126187314855390e+00 5.6273732819340028e+00 1 0 -2
+943 1 0.0000000000000000e+00 2.6876585237229289e+00 8.8713496661415228e+00 5.3560816705302274e+00 1 -7 2
+2942 3 1.0000000000000000e+00 4.1228430476947047e+00 8.9316540020648638e+00 5.0126356139849957e+00 0 -2 0
+2571 1 0.0000000000000000e+00 3.2973955271001607e+00 8.4433575950720652e+00 6.5659209189238297e+00 10 -1 4
+2323 1 0.0000000000000000e+00 4.7695054983356782e+00 8.5890756852375656e+00 5.7748791768655909e+00 0 6 -1
+1924 1 0.0000000000000000e+00 2.7624237826167417e+00 8.4002837784493849e+00 6.2030117178702140e+00 -1 0 2
+1849 1 0.0000000000000000e+00 2.8556114051717789e+00 7.8369720513065682e+00 6.6635396473769077e+00 0 -1 1
+2092 1 0.0000000000000000e+00 4.4066163457619503e+00 8.8104513943925102e+00 6.3948632909889742e+00 0 -2 -6
+1858 1 0.0000000000000000e+00 4.2247061401088501e+00 9.7485373789881749e+00 6.7775516584893856e+00 5 -4 0
+1918 1 0.0000000000000000e+00 3.7005013322160272e+00 8.2872884749418496e+00 7.1179345211972107e+00 -2 -1 0
+1392 1 0.0000000000000000e+00 2.6189535131658950e+00 9.5626488708439012e+00 5.0705494120049099e+00 3 -1 4
+2014 1 0.0000000000000000e+00 4.4537651548611423e+00 8.7255871990367240e+00 7.0358333768027910e+00 1 -3 -4
+2263 1 0.0000000000000000e+00 4.2916238703408691e+00 9.7723943252698273e+00 7.2837396810986448e+00 -4 2 -4
+1432 1 0.0000000000000000e+00 2.9172437522314612e+00 9.1748904067000989e+00 6.0124815507859832e+00 3 3 -6
+2497 1 0.0000000000000000e+00 3.2863539509361988e+00 9.3348881254386900e+00 7.1518284410925430e+00 -3 -4 -1
+2465 1 0.0000000000000000e+00 2.7829786256084246e+00 9.7307624628728195e+00 7.3856327174773133e+00 4 10 -8
+1731 1 0.0000000000000000e+00 3.4649881650297534e+00 9.4313249677939233e+00 5.1450021780994879e+00 6 0 2
+1955 1 0.0000000000000000e+00 3.4191540611179070e+00 7.7142805518543023e+00 5.9417435262865954e+00 1 0 0
+1760 1 0.0000000000000000e+00 4.5036328658009506e+00 9.9332981115114549e+00 6.2808641298493209e+00 -2 2 -2
+1353 1 0.0000000000000000e+00 4.0488980876692979e+00 8.0081365184646582e+00 5.4632957933669291e+00 9 5 1
+2054 1 0.0000000000000000e+00 4.9271600699287363e+00 9.7545999579462901e+00 7.1882122633447540e+00 -3 -3 -5
+2653 1 0.0000000000000000e+00 3.8260233670715866e+00 7.6775330602670104e+00 5.5574542764248944e+00 -7 7 1
+2606 1 0.0000000000000000e+00 4.4366760062397663e+00 9.2704455581047736e+00 6.7511646030506114e+00 3 5 4
+2784 1 0.0000000000000000e+00 2.9143865685634815e+00 8.4125485695081927e+00 7.2621022520930705e+00 -1 -1 -2
+1450 1 0.0000000000000000e+00 4.4370429217547747e+00 9.5134759483678693e+00 5.9106070744285191e+00 -4 -3 -3
+2225 1 0.0000000000000000e+00 2.5165746331033501e+00 7.8846996338860436e+00 5.4504038286874223e+00 1 3 2
+2866 2 -1.0000000000000000e+00 3.3244042526467661e+00 8.0838583983612580e+00 5.5003622120541626e+00 2 0 -1
+1378 1 0.0000000000000000e+00 4.2849888038786750e+00 8.2190611578078894e+00 6.0557870280548407e+00 6 -1 1
+2528 1 0.0000000000000000e+00 2.5071028295993316e+00 9.2803340595043142e+00 6.1719918559021743e+00 4 -6 -1
+462 1 0.0000000000000000e+00 3.9276800616199266e+00 7.8446152923772896e+00 6.3291271017652617e+00 -1 2 -2
+14 1 0.0000000000000000e+00 2.9869934052437546e+00 8.0572005506246640e+00 5.7822464909388520e+00 -7 -3 7
+1460 1 0.0000000000000000e+00 4.5775206501942867e+00 7.5885326129465724e+00 5.7375142253343165e+00 1 1 0
+2397 1 0.0000000000000000e+00 2.8421987449796946e+00 7.7362156702890905e+00 7.2566838417756019e+00 -2 6 2
+616 1 0.0000000000000000e+00 4.3395242715410589e+00 8.2149190349456251e+00 6.6431732606813094e+00 0 2 3
+2538 1 0.0000000000000000e+00 4.5636925728964286e+00 7.8703573366236865e+00 7.1831139459825035e+00 5 -4 0
+2387 1 0.0000000000000000e+00 3.3558004005911770e+00 8.7327314408628780e+00 5.9782590974852576e+00 2 7 -1
+1179 1 0.0000000000000000e+00 3.8410974474500055e+00 9.2534709756024682e+00 6.0833049779878534e+00 -4 4 0
+2889 2 -1.0000000000000000e+00 4.9234417767751202e+00 7.7030914866681934e+00 7.0672308977550653e+00 0 3 -4
+1694 1 0.0000000000000000e+00 4.0586518014146504e+00 9.9567414210609293e+00 5.4905435585953102e+00 -2 -4 0
+2172 1 0.0000000000000000e+00 3.8373225797760626e+00 8.8188122503008852e+00 5.4481173263223113e+00 4 -11 -1
+582 1 0.0000000000000000e+00 4.8406071250512026e+00 9.1029310359943540e+00 7.4958520223013716e+00 2 -3 3
+2991 3 1.0000000000000000e+00 1.5215402220854910e+00 6.2635790042992721e+00 9.2710942495090407e+00 4 0 3
+751 1 0.0000000000000000e+00 1.0735560042445132e-01 5.2635603620508942e+00 8.3723884026712110e+00 0 -2 -1
+574 1 0.0000000000000000e+00 3.3614944341925623e-01 6.1042550193679359e+00 7.7970891682796344e+00 -6 0 1
+2832 2 -1.0000000000000000e+00 6.9093233180610159e-01 7.2111509839740462e+00 8.9553419957132068e+00 -1 -5 5
+458 1 0.0000000000000000e+00 8.2472127047293931e-01 5.2315967890405277e+00 9.1099961946994057e+00 -2 5 -3
+1763 1 0.0000000000000000e+00 1.0581255300017647e+00 6.4652187487794350e+00 8.0147440158429575e+00 0 -2 -5
+464 1 0.0000000000000000e+00 2.2554337504007695e+00 6.1094261346481584e+00 7.5858357879903675e+00 -4 2 7
+2363 1 0.0000000000000000e+00 7.9109415517150805e-01 5.6919515149759228e+00 9.0669338589044557e+00 -2 0 1
+1974 1 0.0000000000000000e+00 1.7691755537319143e+00 5.4090851348900273e+00 9.4358271491204047e+00 0 2 -5
+2622 1 0.0000000000000000e+00 2.3912735376945795e+00 7.1222043164494950e+00 9.3066642242883528e+00 -3 -3 -2
+350 1 0.0000000000000000e+00 1.7542887668423537e+00 5.4912137758437272e+00 7.8559517909755625e+00 -2 -8 1
+17 1 0.0000000000000000e+00 1.7113307710986785e+00 6.1761788776346735e+00 9.7600090892592757e+00 -1 -6 0
+1672 1 0.0000000000000000e+00 2.2897428119214749e+00 6.1448069166798076e+00 8.4632303422792017e+00 -2 1 4
+2665 1 0.0000000000000000e+00 2.1951413632703112e+00 5.8482617430006636e+00 9.1376421840305913e+00 2 5 -7
+857 1 0.0000000000000000e+00 2.6311329365264247e-01 5.0715188009765209e+00 7.5086390491861090e+00 -3 -1 -3
+90 1 0.0000000000000000e+00 3.2321095741973910e-01 7.0810391815810734e+00 8.0614390444066082e+00 4 -3 -6
+2543 1 0.0000000000000000e+00 1.4169327431874388e+00 5.9414971884388423e+00 8.3223370903766902e+00 6 1 -1
+2969 3 1.0000000000000000e+00 5.5454519688182569e-01 6.7454857797652741e+00 9.6800931997607265e+00 3 -2 2
+2987 3 1.0000000000000000e+00 1.9647021744149975e+00 6.7691246988156140e+00 7.6037661375950609e+00 0 -7 -3
+336 1 0.0000000000000000e+00 2.1483392233599510e+00 6.9340647291987763e+00 8.4653184426552652e+00 -2 4 2
+1438 1 0.0000000000000000e+00 8.4512435165263844e-01 5.5414222539353997e+00 8.4228594082547552e+00 1 3 5
+2078 1 0.0000000000000000e+00 2.4535822523426840e+00 5.9348142173469771e+00 9.6830900338580417e+00 1 -3 -7
+924 1 0.0000000000000000e+00 1.1969392872728049e+00 7.1482512592685516e+00 8.0779540566696220e+00 3 1 -1
+1912 1 0.0000000000000000e+00 1.8243902611216782e+00 5.7292959120456128e+00 8.8936344458865655e+00 -3 3 4
+678 1 0.0000000000000000e+00 7.6078621484028630e-01 5.4164189679297037e+00 8.1721856289799941e+00 -2 -3 1
+2886 2 -1.0000000000000000e+00 1.5307206291212816e+00 6.4680489836708155e+00 9.7441075076272252e+00 3 -3 -2
+389 1 0.0000000000000000e+00 6.2732233795009640e-02 5.2649960727522487e+00 9.0097594968389760e+00 3 3 3
+576 1 0.0000000000000000e+00 1.3971369941360838e+00 7.0452743252063090e+00 9.6830168558466188e+00 -3 0 -2
+226 1 0.0000000000000000e+00 1.0372459006773906e+00 6.5163490747963477e+00 9.0146513110585591e+00 6 1 -3
+34 1 0.0000000000000000e+00 1.8012785575738437e+00 6.7720949739260057e+00 9.0272050005450684e+00 -1 -6 4
+1064 1 0.0000000000000000e+00 1.4021886122019840e+00 6.4728716058540963e+00 8.2610014717607534e+00 -2 0 -6
+2136 1 0.0000000000000000e+00 4.1865345421816280e-01 5.0027007706623330e+00 9.4234209400958502e+00 -4 3 -1
+636 1 0.0000000000000000e+00 6.0913659251945440e-01 5.8791467811225333e+00 9.7880471174462116e+00 6 -7 0
+1551 1 0.0000000000000000e+00 2.1155638106416830e+00 6.9721943846154870e+00 9.8025872958373128e+00 -3 1 2
+2442 1 0.0000000000000000e+00 4.7312150756986632e-01 6.2985022140222133e+00 8.5661944608362237e+00 -3 -2 -6
+1665 1 0.0000000000000000e+00 1.0587179763746830e+00 6.9386799977956324e+00 8.6363727404747834e+00 -1 4 2
+2876 2 -1.0000000000000000e+00 1.0178593479125915e+00 6.3743755406999947e+00 9.9122961063826747e+00 6 -1 1
+812 1 0.0000000000000000e+00 5.5720456490054984e-02 6.9332347942238393e+00 8.0464570281240544e+00 -4 5 1
+2131 1 0.0000000000000000e+00 1.6024607334555263e-01 6.8845928894587543e+00 9.3769921894710428e+00 -4 0 -1
+763 1 0.0000000000000000e+00 9.7590021949474615e-01 5.7484346197896867e+00 9.8712927536376736e+00 -3 0 2
+1220 1 0.0000000000000000e+00 1.3081064554526389e-01 6.3395503510156610e+00 8.4565471179776619e+00 -1 2 -1
+2000 1 0.0000000000000000e+00 1.2766742796352610e+00 5.3141377985182086e+00 9.8842987788911234e+00 7 -1 2
+1671 1 0.0000000000000000e+00 2.1448017975746203e+00 5.6550397267005881e+00 7.6847323828387131e+00 5 0 1
+504 1 0.0000000000000000e+00 2.7620583401578522e+00 6.4932224481997647e+00 7.9260290655821750e+00 2 -6 6
+2374 1 0.0000000000000000e+00 4.0029391664770042e+00 7.3329056135016417e+00 7.8842670146133704e+00 0 -4 0
+1476 1 0.0000000000000000e+00 3.8098972794567563e+00 5.4988943485998920e+00 7.6495109982642226e+00 0 3 -7
+2255 1 0.0000000000000000e+00 3.6770772581003279e+00 5.4869965502958902e+00 8.4801884482050411e+00 -2 -1 -6
+2369 1 0.0000000000000000e+00 3.2653904604191961e+00 6.8637384504580607e+00 7.7563849200220920e+00 -1 5 1
+1606 1 0.0000000000000000e+00 4.0810879420299386e+00 6.2315495098432967e+00 7.8064312217962399e+00 -5 0 4
+1573 1 0.0000000000000000e+00 4.4662564019048165e+00 5.3863405984210644e+00 8.0866723964340075e+00 4 -1 -4
+1686 1 0.0000000000000000e+00 3.2216257155910508e+00 5.6663052292501854e+00 9.0240912453294939e+00 6 -3 -5
+1239 1 0.0000000000000000e+00 4.1410904648516462e+00 7.3852234163415336e+00 8.4619497559500854e+00 1 0 1
+2094 1 0.0000000000000000e+00 4.3443306604236067e+00 6.4279051283400097e+00 8.6924719195560716e+00 -3 1 6
+1794 1 0.0000000000000000e+00 4.8140138934696752e+00 6.5594156015242051e+00 8.4996600838977905e+00 0 2 1
+894 1 0.0000000000000000e+00 3.6355730039503276e+00 6.5009883542104321e+00 8.7771950318355998e+00 -3 1 -2
+1645 1 0.0000000000000000e+00 4.2904802370734219e+00 6.8690738242420579e+00 9.7268153694787376e+00 -1 -8 0
+155 1 0.0000000000000000e+00 2.6037606794604904e+00 5.7925418044530854e+00 8.2639604930403543e+00 3 -1 3
+1810 1 0.0000000000000000e+00 3.0045981100772154e+00 6.4766554624734356e+00 9.7068986216262072e+00 2 5 -1
+1164 1 0.0000000000000000e+00 3.7555921251222384e+00 5.4751990300139344e+00 9.9041306328088119e+00 5 -7 0
+135 1 0.0000000000000000e+00 2.7603688828931494e+00 5.3387398754108295e+00 9.5345109254520413e+00 0 0 0
+1812 1 0.0000000000000000e+00 2.6009439372917864e+00 5.3352595121617483e+00 8.6944493518337556e+00 2 3 2
+1466 1 0.0000000000000000e+00 3.7160906474639650e+00 6.3507705432623842e+00 9.8107610884704446e+00 -2 2 -5
+1985 1 0.0000000000000000e+00 4.7437086568317897e+00 6.9800235567956408e+00 8.1434066880819156e+00 1 4 -2
+127 1 0.0000000000000000e+00 3.6210555086129688e+00 7.3097779602230997e+00 7.6106704898306070e+00 -4 2 0
+439 1 0.0000000000000000e+00 2.9178072611861849e+00 6.9187970806122392e+00 9.5633365097222587e+00 4 -2 10
+228 1 0.0000000000000000e+00 4.9916780146038011e+00 5.7624010015822407e+00 8.7607963498253731e+00 5 8 2
+2084 1 0.0000000000000000e+00 2.9566116801909934e+00 6.5379354292142624e+00 8.6092438853462276e+00 -3 4 0
+241 1 0.0000000000000000e+00 3.7909343128685538e+00 5.1704858358890462e+00 9.6182012989133625e+00 9 -2 4
+977 1 0.0000000000000000e+00 3.5437494165543009e+00 7.3979295614620320e+00 9.1334267336293475e+00 -2 0 4
+2913 3 1.0000000000000000e+00 4.3348920234027464e+00 5.9509960030045921e+00 9.4325944580923213e+00 -1 -3 3
+1647 1 0.0000000000000000e+00 4.8780339106178685e+00 7.4694387491122081e+00 8.3716117107690593e+00 -3 -1 -4
+1414 1 0.0000000000000000e+00 4.9592663823908518e+00 5.6602403075996159e+00 9.5549751322478009e+00 -4 3 1
+235 1 0.0000000000000000e+00 3.2382468200145573e+00 5.4419362794933690e+00 7.6576611145649753e+00 -2 1 -4
+447 1 0.0000000000000000e+00 3.3541157682852751e+00 5.8321570780579215e+00 8.1245618614874182e+00 -4 0 -1
+1372 1 0.0000000000000000e+00 4.5008027663928187e+00 6.0947191607030167e+00 8.0102447415249518e+00 0 -3 -8
+178 1 0.0000000000000000e+00 2.8631120740375424e+00 6.8928726423313931e+00 7.6351687102128922e+00 -2 2 8
+2258 1 0.0000000000000000e+00 2.8426594777379024e+00 7.2575574435828623e+00 8.1228559631798145e+00 0 1 -2
+2085 1 0.0000000000000000e+00 4.6103445739567901e+00 7.1107710109386852e+00 9.7326510583883792e+00 0 -1 2
+243 1 0.0000000000000000e+00 3.4653039727092745e+00 6.1523651255860781e+00 8.1972060834460194e+00 0 -3 5
+1441 1 0.0000000000000000e+00 4.8427422767049935e+00 6.4933125453344420e+00 7.7032250238438706e+00 0 -4 -3
+193 1 0.0000000000000000e+00 3.8824978650583710e+00 6.4231235757370833e+00 9.1638536266574881e+00 -2 -3 -1
+1255 1 0.0000000000000000e+00 3.3444516059543123e+00 5.9425284475426512e+00 9.5798467057460801e+00 3 1 -2
+505 1 0.0000000000000000e+00 3.3355523321368628e+00 6.8345623302338963e+00 9.3168948127903395e+00 2 0 -6
+1281 1 0.0000000000000000e+00 3.9033220449287529e+00 6.9457197570422524e+00 9.5018539257087600e+00 -3 6 -2
+1015 1 0.0000000000000000e+00 4.3135116520853067e+00 5.5598300855416651e+00 8.9794629717660257e+00 2 1 -1
+2150 1 0.0000000000000000e+00 2.6879015998312012e+00 6.3237749898976325e+00 9.0873717368016269e+00 -1 -5 0
+1750 1 0.0000000000000000e+00 3.7157352970013320e+00 6.9322411936233204e+00 8.1180623967377610e+00 -1 2 3
+600 1 0.0000000000000000e+00 2.7174673631099560e+00 7.2957632166993092e+00 8.5921063370697315e+00 7 -6 -2
+1430 1 0.0000000000000000e+00 4.9425284489429009e+00 6.6377386139247756e+00 9.1982299119342539e+00 -3 -1 -3
+2106 1 0.0000000000000000e+00 2.5141207199873441e+00 5.1364595238769226e+00 7.9991199941665565e+00 3 -2 0
+2752 1 0.0000000000000000e+00 7.1849110074764855e-01 7.8535246158548597e+00 8.6645564133326758e+00 -1 1 7
+2313 1 0.0000000000000000e+00 9.7125224960666978e-01 9.6243498687594506e+00 7.5694315328350461e+00 -2 1 3
+1247 1 0.0000000000000000e+00 6.1204352278403829e-01 9.2110524339175104e+00 9.4119043048252031e+00 5 -3 -4
+2380 1 0.0000000000000000e+00 3.8738240512166822e-01 8.8457219869856356e+00 8.7549278502163883e+00 5 -6 -1
+1802 1 0.0000000000000000e+00 4.5587447876793336e-01 7.6423617347720265e+00 8.3633730010187346e+00 1 -2 0
+1361 1 0.0000000000000000e+00 1.9085724132228323e+00 9.7055126712997950e+00 7.9862767166379527e+00 7 0 4
+2483 1 0.0000000000000000e+00 1.0979806031220332e+00 9.2133319792657780e+00 9.4925322492109032e+00 1 -3 0
+1166 1 0.0000000000000000e+00 1.5408520893532569e+00 8.7225720982884400e+00 9.0160443173083973e+00 3 -4 2
+1930 1 0.0000000000000000e+00 1.8768376773209317e+00 8.5830535692918559e+00 9.1917639804708902e+00 -2 -9 1
+1530 1 0.0000000000000000e+00 1.2002799257494210e+00 7.5141924715439350e+00 9.6369752334104071e+00 -4 -9 -3
+1820 1 0.0000000000000000e+00 1.4778690274230530e+00 9.1907835024685909e+00 8.3417092359607707e+00 4 -2 -4
+1723 1 0.0000000000000000e+00 2.2630484507620166e+00 9.6854730235109834e+00 9.0610738937909936e+00 5 -2 -3
+1680 1 0.0000000000000000e+00 9.5933633559154552e-01 9.2342805350815915e+00 8.0513229486183899e+00 2 2 0
+1605 1 0.0000000000000000e+00 4.1179584961832966e-01 8.4875827061372728e+00 7.9147091996473771e+00 -6 -5 -2
+1715 1 0.0000000000000000e+00 1.5980039742566501e+00 8.2609592125649414e+00 8.4530656622783908e+00 1 1 1
+1973 1 0.0000000000000000e+00 9.1267434419652915e-01 7.5414408668041846e+00 7.7459718265028972e+00 9 4 5
+1927 1 0.0000000000000000e+00 7.0039051842963196e-01 9.6838690658997688e+00 9.2457281299498231e+00 -4 0 0
+2315 1 0.0000000000000000e+00 7.1279828265437128e-01 8.6153293335963141e+00 9.1450684713500277e+00 1 0 1
+826 1 0.0000000000000000e+00 1.1654699276342002e+00 8.3189829671265620e+00 9.3664652925808216e+00 6 0 0
+2138 1 0.0000000000000000e+00 2.3889412560080751e-02 8.1901471532321395e+00 9.8077766303431648e+00 2 7 0
+1644 1 0.0000000000000000e+00 1.7905537867378059e+00 8.1053669471632102e+00 9.6441707238512162e+00 -6 -3 -2
+1398 1 0.0000000000000000e+00 1.8878641531028124e+00 7.5025335976920253e+00 7.5055450293024411e+00 3 0 -2
+1303 1 0.0000000000000000e+00 1.2082187931305146e+00 7.5125917814214835e+00 7.7560152567124057e+00 0 -3 0
+512 1 0.0000000000000000e+00 6.2648867957158294e-01 8.3019062641865062e+00 9.9461467083376043e+00 0 -6 2
+2067 1 0.0000000000000000e+00 2.1997515353601549e+00 8.5979167186493104e+00 9.8344740997013087e+00 -1 4 0
+692 1 0.0000000000000000e+00 2.3161888479493764e+00 8.5902634163848308e+00 7.8302408919434816e+00 1 1 3
+1233 1 0.0000000000000000e+00 2.0950022081567315e-01 9.4352265081964912e+00 8.6644272849370640e+00 6 -4 -2
+1337 1 0.0000000000000000e+00 2.1461464670120454e+00 7.7350797379852283e+00 8.9574103734155930e+00 -5 6 3
+892 1 0.0000000000000000e+00 9.3443359043109686e-01 9.8144501997886611e+00 7.9735294034461157e+00 4 -6 1
+2398 1 0.0000000000000000e+00 1.4090205992228597e+00 9.8269854226793107e+00 9.2560389620374597e+00 4 -3 -4
+123 1 0.0000000000000000e+00 1.5229725927936395e+00 7.7947704643409388e+00 8.6490179085105279e+00 1 2 4
+2010 1 0.0000000000000000e+00 6.9690903048242686e-02 9.3862642754403325e+00 8.2553334201637245e+00 3 2 2
+1903 1 0.0000000000000000e+00 1.9240995044180982e+00 7.6499632321781350e+00 9.7578747546961555e+00 9 -7 -3
+564 1 0.0000000000000000e+00 2.2437101772799206e+00 8.0142316184918378e+00 8.4034554843744012e+00 -3 -1 -1
+2337 1 0.0000000000000000e+00 2.4361043391728510e+00 8.0114954680192181e+00 7.9868733587747629e+00 -4 3 10
+214 1 0.0000000000000000e+00 4.0323017849240422e-01 7.7410200923558241e+00 9.0795186083923447e+00 -3 -3 1
+1883 1 0.0000000000000000e+00 1.7055820341969359e+00 8.6976754104026153e+00 7.9939368906399695e+00 5 -2 4
+102 1 0.0000000000000000e+00 2.0741119099302372e+00 9.3274034154729897e+00 8.5171141844759468e+00 8 -3 3
+1657 1 0.0000000000000000e+00 2.1904639822907931e-01 9.8863727511423907e+00 9.3451253982638942e+00 -6 -1 3
+1364 1 0.0000000000000000e+00 1.2158862526199601e+00 7.7309130983414240e+00 9.0552342280493647e+00 1 -2 2
+497 1 0.0000000000000000e+00 1.5145785120987245e+00 9.3887158542977680e+00 8.9572134631508682e+00 0 4 2
+1660 1 0.0000000000000000e+00 8.5470432810547403e-01 8.6016119804175784e+00 8.4897120334511307e+00 -4 -2 0
+1990 1 0.0000000000000000e+00 1.2470784357070628e+00 9.8972411427192117e+00 8.6465146363775904e+00 1 2 6
+2635 1 0.0000000000000000e+00 7.8517834958008026e-01 8.4009402385671734e+00 7.7074108592028985e+00 2 -1 -5
+1134 1 0.0000000000000000e+00 9.8050997575144427e-01 9.2211678920757940e+00 8.4925039816155810e+00 0 -3 -7
+802 1 0.0000000000000000e+00 2.3653582621609681e+00 7.5232806324397110e+00 7.6536292688521508e+00 2 1 -2
+1461 1 0.0000000000000000e+00 2.0351899809452645e+00 8.6504838832125461e+00 8.8343480676554886e+00 -7 1 0
+2800 1 0.0000000000000000e+00 2.4378020156176174e+00 9.0055449709834647e+00 9.2459956844563944e+00 -1 -4 -5
+2237 1 0.0000000000000000e+00 1.9624041924188602e+00 9.5654783522491584e+00 9.7057231885723940e+00 0 4 0
+2111 1 0.0000000000000000e+00 1.3753158222057087e+00 8.1732686498264187e+00 7.8630743320928627e+00 0 -2 7
+680 1 0.0000000000000000e+00 1.3016920071955813e+00 9.4861970323289757e+00 9.8893877998213249e+00 4 2 3
+1753 1 0.0000000000000000e+00 5.0244602314363107e-01 8.8571166779490635e+00 9.9531482616993472e+00 3 -8 -7
+114 1 0.0000000000000000e+00 6.9340349613928864e-01 9.8407102048381638e+00 9.8734370524358113e+00 3 2 5
+2047 1 0.0000000000000000e+00 2.2661367125068015e+00 9.2648745344693548e+00 9.9968919037965254e+00 -6 -2 3
+2411 1 0.0000000000000000e+00 4.2121668163413899e+00 9.0527578641395312e+00 8.3582742999209731e+00 -1 2 1
+2451 1 0.0000000000000000e+00 4.1623896527526840e+00 8.3887637737035039e+00 8.7967649915136317e+00 -2 -7 -5
+1081 1 0.0000000000000000e+00 4.3827239359968715e+00 8.0620570086853913e+00 7.6529355508770633e+00 1 5 -1
+1926 1 0.0000000000000000e+00 3.9539367310562690e+00 8.0503156887727414e+00 7.7751077571701082e+00 9 2 1
+2845 2 -1.0000000000000000e+00 3.8427031722814369e+00 7.9914846509360187e+00 9.2479259063549790e+00 -3 -1 3
+2904 3 1.0000000000000000e+00 2.5456949793713766e+00 9.6120792258161423e+00 8.0634908469058235e+00 -6 2 -3
+1406 1 0.0000000000000000e+00 4.9494894815554602e+00 8.2080632094779595e+00 7.9555243068050689e+00 -5 -5 7
+2171 1 0.0000000000000000e+00 4.0930315545043712e+00 9.8095214768450898e+00 8.8230523913004593e+00 0 -2 -1
+1935 1 0.0000000000000000e+00 4.7492881080496563e+00 8.1554764402585214e+00 8.9955750546988913e+00 1 4 1
+1180 1 0.0000000000000000e+00 3.4009547409035825e+00 8.8125383444195879e+00 8.8750738216558958e+00 2 6 3
+1534 1 0.0000000000000000e+00 4.0772850555815374e+00 7.5684706583579020e+00 9.2927492349515450e+00 0 2 -4
+2795 1 0.0000000000000000e+00 4.1153170788164495e+00 8.1250806848011550e+00 8.4284936745254271e+00 1 0 -11
+149 1 0.0000000000000000e+00 3.2726799049060169e+00 7.6982040109420176e+00 8.8457308708901827e+00 -4 2 -1
+2512 1 0.0000000000000000e+00 2.6272338801426387e+00 7.8777892747757994e+00 8.5572149734219085e+00 4 5 -4
+461 1 0.0000000000000000e+00 3.5856511518881700e+00 9.1098308580191105e+00 9.8166064899624459e+00 1 0 0
+1655 1 0.0000000000000000e+00 3.8209835779060315e+00 8.8491634468661005e+00 7.5676014951090300e+00 4 -1 0
+1059 1 0.0000000000000000e+00 4.7184355910951856e+00 7.9042639735601723e+00 9.6536879879401845e+00 -4 0 3
+2938 3 1.0000000000000000e+00 3.1361557807949612e+00 8.4070225402043164e+00 8.3013394252640254e+00 -4 0 3
+929 1 0.0000000000000000e+00 3.3820979001890499e+00 7.5330758598141614e+00 8.2924369984244297e+00 -1 -1 0
+2529 1 0.0000000000000000e+00 4.4093040519067239e+00 8.7299887521221340e+00 7.7532663553086856e+00 -8 1 -3
+1688 1 0.0000000000000000e+00 3.5037812234291508e+00 8.1023474010588448e+00 7.9642816798445066e+00 1 -2 -1
+378 1 0.0000000000000000e+00 2.5460046628581416e+00 8.7179478077585948e+00 8.6848829147275861e+00 -1 -6 1
+56 1 0.0000000000000000e+00 2.8816246256856997e+00 8.9209518256264051e+00 7.8540933461779252e+00 -3 1 -2
+2156 1 0.0000000000000000e+00 3.5411648126557234e+00 8.7388254077642884e+00 8.0326038987045827e+00 3 0 2
+606 1 0.0000000000000000e+00 4.1056851446108773e+00 8.8309673259197776e+00 9.8669421421644010e+00 -6 1 -5
+1831 1 0.0000000000000000e+00 3.3578568878678579e+00 9.1243307650869827e+00 7.7352006419898558e+00 -1 1 -3
+1411 1 0.0000000000000000e+00 3.1998398103073971e+00 9.3301903910695483e+00 8.8997293156590587e+00 1 0 0
+2685 1 0.0000000000000000e+00 2.5403810711946320e+00 9.3759874642596710e+00 9.7949628593273257e+00 4 -1 1
+1850 1 0.0000000000000000e+00 3.1854941898109610e+00 7.7623993962483135e+00 7.8736479577469529e+00 3 0 -3
+2563 1 0.0000000000000000e+00 3.4376291744418888e+00 8.0839534096536951e+00 9.9198158249277402e+00 1 -1 1
+166 1 0.0000000000000000e+00 3.8754421640296717e+00 9.5074306651528335e+00 9.2573568716514067e+00 -1 -11 -3
+1954 1 0.0000000000000000e+00 4.6620457673351350e+00 7.5947052334952243e+00 9.1060120147768178e+00 6 1 -1
+2787 1 0.0000000000000000e+00 3.3619196602982737e+00 9.5334706161233100e+00 8.3150643666506863e+00 2 1 9
+112 1 0.0000000000000000e+00 4.3125872572123498e+00 8.6425475157541936e+00 9.4259282936849207e+00 -4 -8 2
+1038 1 0.0000000000000000e+00 4.9419010712046889e+00 8.7517839641443409e+00 8.5869443128261551e+00 0 3 -6
+1796 1 0.0000000000000000e+00 4.5062069877830959e+00 7.6737370859463088e+00 8.4212355683332021e+00 -1 -2 3
+571 1 0.0000000000000000e+00 3.1634366689672579e+00 8.3679527843580033e+00 9.5726950376294528e+00 -1 2 -1
+157 1 0.0000000000000000e+00 4.4683082573634030e+00 9.6034272393469902e+00 9.6001498653646440e+00 -3 -1 0
+589 1 0.0000000000000000e+00 2.8045818804964102e+00 8.9760981699748683e+00 9.5573036230967077e+00 1 -2 -3
+2827 2 -1.0000000000000000e+00 2.6650156158919134e+00 7.6933363901560705e+00 9.7257368608174666e+00 2 4 4
+200 1 0.0000000000000000e+00 4.7838998498725225e+00 9.1475725610559220e+00 9.2156648040312525e+00 -2 -5 -1
+1851 1 0.0000000000000000e+00 2.7345206429921247e+00 8.0734386767554600e+00 9.3097954437366202e+00 -2 0 -3
+981 1 0.0000000000000000e+00 3.7571987391759172e+00 9.9740437010829996e+00 8.3582203320349109e+00 -1 -2 -4
+1188 1 0.0000000000000000e+00 2.7192309419634957e+00 9.9709032552062755e+00 9.5459223654922702e+00 0 -2 -4
+416 1 0.0000000000000000e+00 3.9797333817825500e+00 9.6097548353905839e+00 7.6318298451264015e+00 -2 -3 -2
+466 1 0.0000000000000000e+00 4.3635989325174629e+00 9.3199324110463948e+00 8.5290506725701825e+00 0 0 3
+285 1 0.0000000000000000e+00 3.2062476362470282e+00 9.5246201771085754e+00 9.8438018722032155e+00 1 1 2
+731 1 0.0000000000000000e+00 5.7226689423569814e+00 1.3981663141727603e+00 3.9561724984871427e-01 -5 2 -7
+2716 1 0.0000000000000000e+00 6.0409849878969464e+00 6.9765766883454106e-01 1.6536021982820728e-01 1 2 0
+2610 1 0.0000000000000000e+00 6.5179309692678160e+00 1.4590347547070597e+00 4.8027608457803433e-01 7 3 -1
+490 1 0.0000000000000000e+00 5.4629126188006483e+00 1.1408331384821573e+00 4.2903042031921572e-02 -2 5 1
+2520 1 0.0000000000000000e+00 6.5324649926192526e+00 1.4248226251882581e+00 1.3956728077394647e+00 2 -6 4
+1991 1 0.0000000000000000e+00 5.3868837234707652e+00 1.8811532174440884e+00 1.9256144489792411e+00 1 -3 2
+2720 1 0.0000000000000000e+00 6.7616777986184795e+00 2.4571240706663380e+00 1.4627141867472779e+00 1 0 2
+2650 1 0.0000000000000000e+00 6.6490308093626673e+00 2.0294183431579684e+00 1.2000866351277486e+00 2 -3 4
+1978 1 0.0000000000000000e+00 6.6475318914075592e+00 2.4075068418910779e+00 2.3202989747835581e+00 1 -3 3
+100 1 0.0000000000000000e+00 7.0193108275551621e+00 1.9225898395832608e+00 6.9502464787489793e-01 4 1 2
+729 1 0.0000000000000000e+00 5.7520489994822039e+00 4.3527256672768766e-01 1.5941205483345842e+00 5 -6 -2
+2063 1 0.0000000000000000e+00 5.0407915426917418e+00 1.9479400132867963e+00 1.0334345856270049e+00 6 3 1
+1363 1 0.0000000000000000e+00 6.3677814087180096e+00 2.0104956339706588e+00 2.2107515513235221e+00 2 1 0
+610 1 0.0000000000000000e+00 5.2191284862047604e+00 2.4842061523789210e+00 3.9272618446056762e-01 3 -3 -1
+1592 1 0.0000000000000000e+00 5.8302869841086746e+00 8.5882171024932641e-01 8.9459842518200572e-01 -5 4 -1
+2470 1 0.0000000000000000e+00 6.6812985020158395e+00 2.1582586342757617e+00 2.3452822656476274e-01 -2 -5 2
+1268 1 0.0000000000000000e+00 6.6561638287686042e+00 5.0125202310239314e-01 6.3785213721926481e-01 -1 4 -4
+1074 1 0.0000000000000000e+00 5.6386204948277943e+00 2.4156801229288236e+00 2.4778885521369300e+00 3 -7 1
+2916 3 1.0000000000000000e+00 7.4436321087817303e+00 1.5036221221874730e+00 1.4518927843019023e+00 -1 -3 0
+2291 1 0.0000000000000000e+00 7.0162316027984746e+00 1.3678082960639184e+00 2.0005065359577343e+00 -3 -2 -6
+27 1 0.0000000000000000e+00 5.7682735687472260e+00 2.0349870764056273e+00 5.6102524086341132e-01 0 3 -4
+162 1 0.0000000000000000e+00 5.5733014135700039e+00 3.6576762761639142e-01 2.1137170228769211e+00 0 -1 -2
+1538 1 0.0000000000000000e+00 6.6683170886758782e+00 2.7308325519626248e-01 1.6528351468169384e+00 2 -1 0
+2688 1 0.0000000000000000e+00 6.0621234659230563e+00 9.9306240292864356e-01 2.0473899015952890e+00 -3 2 7
+1859 1 0.0000000000000000e+00 5.5423489160044559e+00 2.3300291061819189e+00 1.2975712520170835e+00 -4 4 1
+2231 1 0.0000000000000000e+00 7.1255427242795628e+00 1.1493799082103917e+00 1.0832016502887298e+00 -4 2 -1
+266 1 0.0000000000000000e+00 6.3247296551952239e+00 2.9383094388996794e-01 2.0506441738434784e+00 -4 -2 -2
+1718 1 0.0000000000000000e+00 7.3069127380422429e+00 1.7588836047989813e+00 1.7365907152105120e-02 5 0 1
+1146 1 0.0000000000000000e+00 6.6875326779246551e+00 8.9391969155249773e-01 1.7009817778201399e+00 -4 -1 -4
+1911 1 0.0000000000000000e+00 6.0572758865196770e+00 1.5300230807571211e+00 1.2329667701683911e+00 -1 0 4
+1891 1 0.0000000000000000e+00 7.3424770450470858e+00 1.6120149240922692e+00 4.9268074804899376e-01 0 -1 2
+2311 1 0.0000000000000000e+00 7.3622076106322734e+00 5.2898537108282584e-01 2.2322126746086606e+00 0 2 2
+365 1 0.0000000000000000e+00 5.9707727451811525e+00 5.5786200341385053e-02 1.7467413188539369e-01 0 1 -1
+339 1 0.0000000000000000e+00 7.3350908204783964e+00 1.8230711035423930e+00 1.5498063783098548e+00 0 3 5
+1313 1 0.0000000000000000e+00 5.2923823524306624e+00 1.2519273118533658e+00 2.2251491907904861e+00 0 4 3
+1946 1 0.0000000000000000e+00 7.4616076520856076e+00 9.6520753891448019e-01 1.5966709292284920e+00 1 -5 -1
+888 1 0.0000000000000000e+00 7.3001530669211814e+00 5.5733055469257586e-01 1.1373377808209202e+00 -1 -2 7
+1124 1 0.0000000000000000e+00 6.5359845463393400e+00 1.4621295067448856e-01 9.6991364003998981e-01 -4 -3 0
+2820 2 -1.0000000000000000e+00 7.0904664811008757e+00 2.1101524698824159e+00 1.9878829147854136e+00 2 -7 1
+2815 2 -1.0000000000000000e+00 6.3879682036649603e+00 5.1946219882564371e-02 4.4052240105953322e-02 3 1 -9
+98 1 0.0000000000000000e+00 5.9488092327107607e+00 6.1246555421057658e-01 1.1898275927807984e+00 -1 0 0
+2132 1 0.0000000000000000e+00 6.7407604427525580e+00 1.0046245159021472e+00 4.0458231759319147e-01 -2 -3 4
+40 1 0.0000000000000000e+00 5.5516726399590439e+00 1.7133822625989616e+00 2.2857630470872738e+00 0 5 2
+1889 1 0.0000000000000000e+00 5.2760078496862013e+00 2.9799760971825662e-01 5.3899528454783308e-01 0 2 4
+1097 1 0.0000000000000000e+00 5.4749639113810913e+00 1.5672017122309827e+00 1.2117498607035069e+00 -1 -1 -4
+2321 1 0.0000000000000000e+00 5.6020639534838441e+00 8.9754073891548480e-01 1.8727484980200160e+00 0 -5 4
+1190 1 0.0000000000000000e+00 6.1860812082468035e+00 2.0703324597474668e+00 1.5369234350614178e+00 -4 2 3
+2773 1 0.0000000000000000e+00 6.5885777828427070e+00 1.7811365912391208e+00 2.4726260742771551e+00 -4 -6 1
+1036 1 0.0000000000000000e+00 7.7695851683935793e+00 1.3673714639641379e+00 5.3856085619595728e-01 -8 -2 2
+1294 1 0.0000000000000000e+00 7.5619531290016058e+00 2.4931330644208543e+00 2.5147670351344958e-01 1 1 1
+2881 2 -1.0000000000000000e+00 8.5402259550170712e+00 1.3106786494131921e+00 2.1825847800219011e+00 -5 1 -3
+794 1 0.0000000000000000e+00 9.8187579244601970e+00 3.2329947925868679e-01 1.9768856680843830e-01 -3 -1 7
+2922 3 1.0000000000000000e+00 9.2136063303514071e+00 2.5905287700012736e-01 5.8235165995788996e-01 -1 2 1
+709 1 0.0000000000000000e+00 7.6687840353821874e+00 9.5235882867269206e-01 9.1867006929421158e-01 -3 4 3
+390 1 0.0000000000000000e+00 9.1909094686335706e+00 1.0470514800743926e+00 6.3692588085168478e-01 -2 -1 0
+992 1 0.0000000000000000e+00 8.7602040592442325e+00 1.1037956317960989e+00 1.4286726399438590e+00 1 2 0
+649 1 0.0000000000000000e+00 9.4328066746253718e+00 1.7225325938879719e+00 1.9918932834338474e+00 -9 7 -1
+209 1 0.0000000000000000e+00 9.2182164794019883e+00 8.4275957004996871e-01 1.8785119506741192e+00 1 -1 7
+2714 1 0.0000000000000000e+00 8.3987482717968689e+00 6.7804921063926515e-01 6.6376891728381460e-01 -2 -5 3
+1585 1 0.0000000000000000e+00 9.3141407975527155e+00 2.2756426308133690e-01 1.1320081480061017e+00 2 -3 2
+1995 1 0.0000000000000000e+00 8.8760787083298744e+00 6.5225103623800362e-01 1.1921813527255174e+00 7 -7 4
+358 1 0.0000000000000000e+00 9.6808742496025637e+00 2.2409429614227210e+00 1.6825464704246931e+00 -5 -4 -4
+1304 1 0.0000000000000000e+00 9.7110993379525219e+00 1.9107415480840122e+00 9.9936419607972038e-01 -2 3 -4
+1648 1 0.0000000000000000e+00 8.4573480511744030e+00 6.1750376112138738e-01 1.7579795275772614e+00 3 -1 -4
+1031 1 0.0000000000000000e+00 7.5959849193188997e+00 4.1913675649557991e-01 5.0365433035781682e-01 -3 7 -4
+1998 1 0.0000000000000000e+00 8.7104508686765811e+00 3.1690118035851839e-01 1.8763842024530401e-02 -8 -4 3
+1329 1 0.0000000000000000e+00 7.9562509158946417e+00 3.3482990297598925e-01 1.1590742437196042e+00 -3 3 -4
+2083 1 0.0000000000000000e+00 8.2266831254945707e+00 2.2084631807562936e+00 5.3184083558774387e-01 0 -1 0
+2504 1 0.0000000000000000e+00 8.8123402639463393e+00 2.1436607615350733e+00 1.1857581689660897e+00 0 2 0
+2458 1 0.0000000000000000e+00 8.1702786902841797e+00 1.6310929250464510e+00 1.8851814128459085e-01 1 6 9
+774 1 0.0000000000000000e+00 9.7838081518341067e+00 5.3892221043965061e-01 3.9821009510108041e-01 5 -5 5
+663 1 0.0000000000000000e+00 7.8270993358689003e+00 8.7905247655643337e-01 1.8572351528041597e+00 -10 -7 1
+2776 1 0.0000000000000000e+00 7.8458781077362172e+00 1.7329892495765555e+00 2.1547260200772675e+00 1 6 5
+188 1 0.0000000000000000e+00 8.5604942444543983e+00 2.4435293186514069e+00 4.5700571570592768e-01 -10 -3 0
+1282 1 0.0000000000000000e+00 7.9573107386891211e+00 3.5483753825460174e-01 1.6428425418987065e+00 3 3 4
+1228 1 0.0000000000000000e+00 7.6326217487435244e+00 2.4217995942912056e+00 8.1934366199259467e-01 4 0 0
+1727 1 0.0000000000000000e+00 9.4370047271004367e+00 1.3642859388285238e+00 1.8604706474068495e+00 2 -2 2
+2305 1 0.0000000000000000e+00 7.5017072509055502e+00 2.3076565162437075e+00 1.3817264081282448e+00 1 1 -1
+1840 1 0.0000000000000000e+00 9.8941845974241804e+00 6.3486327037888168e-01 1.8368105486516519e+00 2 6 2
+2530 1 0.0000000000000000e+00 9.1148949299405349e+00 2.1114952789691408e+00 2.4536241339017133e+00 -1 3 -3
+1067 1 0.0000000000000000e+00 9.5860480143788873e+00 9.5655127488751734e-01 2.2888975387149255e+00 -6 2 7
+2941 3 1.0000000000000000e+00 8.9437109157333463e+00 2.3783892669939644e-01 1.8668467867667096e+00 5 0 -3
+363 1 0.0000000000000000e+00 8.3657897307389852e+00 1.3625812351008428e+00 1.1121972775741293e+00 4 1 3
+860 1 0.0000000000000000e+00 7.7378429084380222e+00 2.1183486328829768e+00 2.1084621993313597e+00 -6 -2 -3
+465 1 0.0000000000000000e+00 8.7227565508651921e+00 1.7751879549513414e+00 1.9705688812428293e+00 3 3 3
+1252 1 0.0000000000000000e+00 9.4707376226284321e+00 2.4111070068712706e+00 2.0426537572799672e+00 3 -2 3
+489 1 0.0000000000000000e+00 8.1277819959746491e+00 1.9175285088281586e+00 1.4366059183297206e+00 2 -2 2
+2119 1 0.0000000000000000e+00 9.2865821978412875e+00 2.0935950571668571e+00 4.1772209666693255e-01 -3 -1 -1
+2507 1 0.0000000000000000e+00 8.8048083906973016e+00 2.4740500561123175e+00 1.7538689520949429e+00 -4 1 4
+122 1 0.0000000000000000e+00 8.8556861684803341e+00 1.5998261949429362e+00 8.7283549214936407e-01 4 -1 -4
+1111 1 0.0000000000000000e+00 9.0756229325249933e+00 2.4000403195966387e+00 9.2450852726374033e-01 2 1 -3
+667 1 0.0000000000000000e+00 9.5799953995975358e+00 1.2030871889600987e+00 1.1352949952031630e+00 -9 6 4
+726 1 0.0000000000000000e+00 7.5021985411548782e+00 1.4406482172299624e+00 2.4286730599847179e+00 -2 -4 1
+2541 1 0.0000000000000000e+00 8.0953779178956129e+00 3.2201579474054087e-01 6.9543055010257149e-03 3 -5 3
+164 1 0.0000000000000000e+00 7.1879667682774491e+00 3.2437107427805660e+00 9.8567970702654661e-01 0 0 4
+2935 3 1.0000000000000000e+00 6.9331716033364428e+00 3.5416304092110189e+00 7.5588512566032051e-02 3 -4 6
+2808 2 -1.0000000000000000e+00 6.0814316264516064e+00 4.5488918180847957e+00 2.0068075362420177e+00 -2 0 0
+2949 3 1.0000000000000000e+00 6.6096944482655626e+00 3.1145066366753640e+00 9.5426105426760377e-01 1 2 -2
+1368 1 0.0000000000000000e+00 6.6025604403766440e+00 3.9966154530761622e+00 1.8312745489862554e+00 4 3 3
+685 1 0.0000000000000000e+00 5.7401091544122469e+00 3.1349632466740069e+00 1.7744697947775352e+00 2 4 2
+1772 1 0.0000000000000000e+00 6.2546369374443351e+00 2.9498039676908050e+00 1.0094324477402372e+00 -1 -3 0
+2578 1 0.0000000000000000e+00 6.2293668438210439e+00 4.5684710263098012e+00 9.6153677613418953e-01 2 1 1
+1007 1 0.0000000000000000e+00 6.9568097698642264e+00 4.1910590878569991e+00 6.0603992838234844e-01 3 -1 -6
+2851 2 -1.0000000000000000e+00 5.4508582316386098e+00 2.5040311292682373e+00 2.1326746898399365e+00 -4 0 0
+1236 1 0.0000000000000000e+00 5.3263496196981492e+00 3.6287017487415336e+00 2.2104714416269222e+00 1 4 2
+627 1 0.0000000000000000e+00 6.3504936194115107e+00 4.9684148220539841e+00 8.3234985194303424e-01 1 -1 -2
+1231 1 0.0000000000000000e+00 6.7668047058377585e+00 3.0440389829241794e+00 2.4001484525749248e+00 0 -2 -5
+1826 1 0.0000000000000000e+00 7.4677984473817229e+00 4.0324462983698650e+00 7.2970555585203190e-01 2 -1 8
+1667 1 0.0000000000000000e+00 6.7746514968867864e+00 3.6971457827006611e+00 1.2200448876383008e+00 -2 -1 -5
+2744 1 0.0000000000000000e+00 6.9967620530552939e+00 2.7164715823125816e+00 3.1963014288620373e-01 -2 1 2
+1742 1 0.0000000000000000e+00 7.3715238191939374e+00 3.4731288372292335e+00 2.0337085202867078e+00 -7 2 3
+2833 2 -1.0000000000000000e+00 5.4262234950713424e+00 3.0720379902909443e+00 5.1495662507179563e-01 2 0 -3
+852 1 0.0000000000000000e+00 5.7064378212330329e+00 4.1382291208877406e+00 1.1363122392114577e+00 -3 -4 2
+972 1 0.0000000000000000e+00 5.2662774214123989e+00 3.5388287696776795e+00 9.1837958054128921e-01 2 -4 -1
+42 1 0.0000000000000000e+00 6.0426309838460854e+00 3.5322050320618321e+00 7.9564768981540704e-02 -6 1 -4
+2785 1 0.0000000000000000e+00 6.5475559215287165e+00 3.9519824908281387e+00 9.0416251818909332e-01 0 1 2
+3000 3 1.0000000000000000e+00 5.7200064194920808e+00 4.4038200522944502e+00 6.2315936734108790e-01 4 -3 2
+2123 1 0.0000000000000000e+00 5.2560856585230793e+00 4.1856108411650412e+00 1.9126017786880301e+00 4 5 -1
+575 1 0.0000000000000000e+00 6.6670248382017778e+00 4.8884411477435599e+00 2.1147365503669340e+00 2 6 2
+2015 1 0.0000000000000000e+00 7.1449174909628663e+00 2.7622181901745861e+00 1.4216487891066900e+00 6 -6 3
+750 1 0.0000000000000000e+00 5.2185087520887121e+00 3.0524428317572232e+00 6.9411832242752589e-02 4 1 5
+546 1 0.0000000000000000e+00 5.0939616482267533e+00 2.5628726521800216e+00 9.3562441144610453e-01 1 6 -1
+448 1 0.0000000000000000e+00 7.2649650198094005e+00 4.4782652412760964e+00 1.2279971977170243e+00 -2 -6 2
+1426 1 0.0000000000000000e+00 6.5403209983061235e+00 2.5162921341016804e+00 2.0715201096958821e-01 -1 -4 3
+1275 1 0.0000000000000000e+00 6.7831797375327545e+00 3.2858522554263518e+00 1.8857504139639694e+00 -4 1 1
+1867 1 0.0000000000000000e+00 5.9724886866208688e+00 3.1859022221669093e+00 2.3313932173100680e+00 0 1 2
+2627 1 0.0000000000000000e+00 6.7551609747332027e+00 4.7048533570874858e+00 4.9875024541666124e-01 2 -1 1
+1156 1 0.0000000000000000e+00 6.9001350292118024e+00 4.1767873377570739e+00 2.4434884207073089e+00 -3 -5 -2
+2464 1 0.0000000000000000e+00 5.6169555712740280e+00 4.6888091255451831e+00 4.6780146641118795e-03 4 6 -5
+671 1 0.0000000000000000e+00 6.0369508724005376e+00 4.2259553821922662e+00 1.5440572311834443e-02 0 2 -1
+2945 3 1.0000000000000000e+00 5.3588354136992313e+00 3.1925732887930280e+00 2.0027226680339152e+00 -1 2 5
+529 1 0.0000000000000000e+00 5.9167180485111874e+00 2.6757053796021291e+00 5.2165742239683144e-01 0 -7 3
+1211 1 0.0000000000000000e+00 5.4431640370559196e+00 4.7648927814033017e+00 1.6235470630008795e+00 -6 -3 4
+767 1 0.0000000000000000e+00 5.9769482997392211e+00 3.6937215648507729e+00 6.6050132918043503e-01 -4 -1 5
+1194 1 0.0000000000000000e+00 6.1945539993200569e+00 2.7746450588538893e+00 2.0540585985256223e+00 4 0 -1
+550 1 0.0000000000000000e+00 5.5444544683674311e+00 4.7853558994712291e+00 9.4865865036971964e-01 8 -4 7
+2479 1 0.0000000000000000e+00 5.3285345193757392e+00 2.8950667402348556e+00 1.3892135724850461e+00 -3 4 0
+609 1 0.0000000000000000e+00 7.4885675593919983e+00 4.8732529871006163e+00 1.8287986717620626e+00 -3 3 0
+2038 1 0.0000000000000000e+00 6.9172391348815889e+00 4.6875916815611207e+00 1.4307521183147507e+00 5 -3 -3
+1783 1 0.0000000000000000e+00 6.1685052376909546e+00 3.6628901385439723e+00 1.6444735696458910e+00 0 7 0
+1285 1 0.0000000000000000e+00 7.4770839901672579e+00 3.2377807584775793e+00 1.0547372320434040e-01 1 -3 -1
+409 1 0.0000000000000000e+00 7.5403115153717764e+00 3.2424137046870976e+00 1.8901364737878315e+00 -3 3 1
+2940 3 1.0000000000000000e+00 7.5835917092877452e+00 4.2425247727925743e+00 1.8420996846295357e+00 -5 1 -4
+696 1 0.0000000000000000e+00 7.6131123239312943e+00 4.4661370091678902e+00 2.4966591365193374e+00 5 2 7
+1490 1 0.0000000000000000e+00 8.4894312041937638e+00 3.9973602881301087e+00 1.5877849265976343e+00 -5 0 -6
+116 1 0.0000000000000000e+00 9.0331837629342271e+00 4.6577301573980030e+00 5.7362078847521336e-01 -1 2 -6
+2502 1 0.0000000000000000e+00 8.3887255210268652e+00 4.9798501952986420e+00 1.1812153272933490e+00 -2 2 1
+1636 1 0.0000000000000000e+00 9.8877177947496442e+00 2.9728197836574646e+00 6.5456144587378629e-01 3 -4 -3
+1044 1 0.0000000000000000e+00 8.5595501179213613e+00 2.8976053676015949e+00 7.6409155826985864e-01 0 6 0
+121 1 0.0000000000000000e+00 9.2548760043515532e+00 4.1937771022467363e+00 1.9357381626937140e+00 1 -4 -2
+2213 1 0.0000000000000000e+00 9.2296225457824956e+00 3.1697458046848026e+00 7.1145748236325590e-01 -3 2 3
+177 1 0.0000000000000000e+00 9.4675081147339792e+00 3.7056741954304853e+00 4.4567035657254966e-01 6 -5 1
+2679 1 0.0000000000000000e+00 7.8470426112786047e+00 3.4496331833016605e+00 1.0818280194749681e+00 7 4 -2
+1027 1 0.0000000000000000e+00 8.3513894910582955e+00 3.5998147941329708e+00 4.5281885991350940e-01 1 -1 5
+2719 1 0.0000000000000000e+00 9.5149833987083845e+00 3.0013388205233551e+00 1.4917320880353513e+00 -2 -1 -3
+1053 1 0.0000000000000000e+00 8.7789350798342856e+00 3.2108020645774737e+00 1.1898114688465706e+00 2 -1 -4
+91 1 0.0000000000000000e+00 9.3869024655284665e+00 4.6894337004725992e+00 1.9273463573276697e+00 1 0 6
+486 1 0.0000000000000000e+00 8.1943799147253671e+00 3.2450542739570558e+00 2.3139687241035500e+00 -2 8 -1
+321 1 0.0000000000000000e+00 9.3996950047332302e+00 2.5364541346418372e+00 1.7142393196689709e-01 -2 -7 -2
+775 1 0.0000000000000000e+00 7.9612549025246864e+00 4.6010072524232015e+00 2.0195756155303080e-01 -1 4 3
+198 1 0.0000000000000000e+00 7.6123268283780234e+00 2.6996789298482713e+00 2.4868190495912121e+00 0 0 -5
+1617 1 0.0000000000000000e+00 7.9810213420710809e+00 2.9612409686518051e+00 7.6257497294483667e-01 0 2 2
+1806 1 0.0000000000000000e+00 9.0872846716911688e+00 4.7657910287982270e+00 1.2843327444327872e+00 0 -3 1
+2351 1 0.0000000000000000e+00 8.5688272890203034e+00 2.7977800573176559e+00 1.7457864800187013e+00 5 -3 6
+637 1 0.0000000000000000e+00 8.6163176458148225e+00 4.3290778971246615e+00 2.0111591242623224e+00 2 2 -1
+578 1 0.0000000000000000e+00 7.9819874595733973e+00 2.7084306580387110e+00 1.7043029793327584e+00 0 -1 -1
+1547 1 0.0000000000000000e+00 7.7768575079543290e+00 3.7076269086115099e+00 1.6684981890560116e-01 2 3 -5
+474 1 0.0000000000000000e+00 8.5267333149442734e+00 3.5549725672322010e+00 1.2562931713393524e+00 -2 -2 3
+1572 1 0.0000000000000000e+00 9.3387904137943334e+00 3.6675703297668063e+00 1.3946709687529883e+00 -2 0 6
+21 1 0.0000000000000000e+00 9.8853198622548923e+00 4.9698874875472328e+00 4.7563894788497030e-01 -2 3 3
+332 1 0.0000000000000000e+00 8.2171292789343724e+00 3.1889232825342444e+00 4.9644995669449032e-01 -4 1 2
+2287 1 0.0000000000000000e+00 8.8507653492216924e+00 3.8457243952637334e+00 1.2703196823366814e-01 2 2 8
+299 1 0.0000000000000000e+00 8.4553416342081658e+00 4.2598071327585867e+00 9.6202987912246296e-01 -1 3 4
+1472 1 0.0000000000000000e+00 7.7483225522652175e+00 4.6808660462924712e+00 8.6620006150815942e-01 3 0 3
+2074 1 0.0000000000000000e+00 8.9886390714266398e+00 3.2419512596304720e+00 2.0963138838330071e+00 1 -2 3
+1518 1 0.0000000000000000e+00 9.0595105063899233e+00 4.3715899175901507e+00 1.5623552918765666e+00 5 -5 -2
+351 1 0.0000000000000000e+00 9.8694024192942855e+00 3.4024340640945763e+00 1.9908990304137082e+00 -3 9 -5
+635 1 0.0000000000000000e+00 7.9311235183988096e+00 4.0128167032784763e+00 1.6121742207537366e+00 5 -3 0
+2230 1 0.0000000000000000e+00 9.6858786147666098e+00 2.7797178145940880e+00 1.2339956056198813e+00 -7 1 -3
+664 1 0.0000000000000000e+00 8.2421658027990112e+00 3.6484754821729983e+00 2.1821466474409474e+00 3 4 0
+1885 1 0.0000000000000000e+00 9.2474540875240105e+00 3.9307464666467560e+00 2.4721111352777161e+00 -1 0 1
+1579 1 0.0000000000000000e+00 9.9130198663363434e+00 4.3566237252064903e+00 1.4544305398578217e+00 5 5 -1
+1033 1 0.0000000000000000e+00 8.5394510304245763e+00 4.4790697244574096e+00 7.6729889110862828e-02 -4 -2 -4
+1886 1 0.0000000000000000e+00 9.6860885398895498e+00 3.9171033030526834e+00 8.0824671025155592e-01 2 3 0
+269 1 0.0000000000000000e+00 5.2023731480763447e+00 1.8506105583194170e+00 4.3526191431382086e+00 -2 -4 -4
+2030 1 0.0000000000000000e+00 6.5865971448673015e+00 5.5277666656420221e-01 2.8980109933972478e+00 -2 -5 -3
+2645 1 0.0000000000000000e+00 7.4409545135135131e+00 2.4725919693221887e+00 4.8497754917567537e+00 -4 0 4
+1842 1 0.0000000000000000e+00 5.2277702728450075e+00 2.3494414118183529e+00 3.6481073437104965e+00 4 3 4
+2482 1 0.0000000000000000e+00 5.6108945465025730e+00 9.9943204909578243e-01 3.7310239835421468e+00 8 1 2
+71 1 0.0000000000000000e+00 6.4297692406920213e+00 2.4789314194932288e+00 4.4156391037228300e+00 1 -2 -1
+783 1 0.0000000000000000e+00 5.8481501147144002e+00 1.2323193707772434e-01 2.5469901912271760e+00 1 -5 -3
+2733 1 0.0000000000000000e+00 6.5990734133707738e+00 1.0293860772432621e+00 4.9288203447081509e+00 2 5 5
+503 1 0.0000000000000000e+00 6.3350583326627996e+00 2.0852118543441396e+00 3.4423302084363425e+00 0 4 -2
+1006 1 0.0000000000000000e+00 6.7220503460710281e+00 2.1064879834063457e+00 3.3622428377504048e+00 0 -1 -1
+2515 1 0.0000000000000000e+00 6.0651048504171943e+00 1.8728203309202620e+00 4.9992240657885363e+00 -4 1 -3
+2556 1 0.0000000000000000e+00 7.1849484628254832e+00 1.9156388101404132e+00 3.9442641687723667e+00 6 -4 1
+470 1 0.0000000000000000e+00 5.8414889486273829e+00 6.0935767006353636e-01 4.5956082148095492e+00 -10 -4 -2
+1400 1 0.0000000000000000e+00 5.8696718110037134e+00 1.9573770740047796e+00 3.7725213982183345e+00 -2 -3 -1
+329 1 0.0000000000000000e+00 7.4920537103304268e+00 2.6968606432957659e-01 4.1630432818769467e+00 0 2 -5
+108 1 0.0000000000000000e+00 6.5932920250594087e+00 1.9008955565234313e+00 4.2545742888557507e+00 1 0 4
+1355 1 0.0000000000000000e+00 7.0540647636842282e+00 8.1294559891467583e-02 4.7203739274894740e+00 3 -3 -1
+727 1 0.0000000000000000e+00 5.7605306624503649e+00 1.4655819190740358e+00 4.7798335254772315e+00 4 -3 1
+1229 1 0.0000000000000000e+00 5.6085685778004608e+00 2.6219416708215448e-01 4.3393578952471472e+00 -1 5 -3
+1584 1 0.0000000000000000e+00 6.6601479600348217e+00 1.1960315591344948e+00 3.9564983353856169e+00 2 -2 1
+2146 1 0.0000000000000000e+00 5.6927756261019100e+00 2.3110135340950300e-01 3.8317470233038482e+00 2 0 3
+655 1 0.0000000000000000e+00 6.4297918486055909e+00 4.1808655972392678e-01 4.9135480533630362e+00 3 4 2
+524 1 0.0000000000000000e+00 6.6991542457087316e+00 1.1806359330765772e+00 3.5212955230195475e+00 -6 0 0
+2144 1 0.0000000000000000e+00 6.8155634022764300e+00 1.1128299663238743e+00 2.6460726602287781e+00 0 0 7
+1619 1 0.0000000000000000e+00 5.3906637605124139e+00 8.0984230875675045e-01 2.8093104478443771e+00 1 2 -1
+2215 1 0.0000000000000000e+00 6.8665177089158345e+00 6.7925474548774090e-01 3.4775635007165873e+00 -3 -1 3
+2169 1 0.0000000000000000e+00 5.9788429852160370e+00 1.7257113923386282e+00 2.8112400301286811e+00 -1 0 -3
+969 1 0.0000000000000000e+00 7.4662039968523599e+00 5.6456681975566592e-01 2.7084382073158189e+00 -3 2 -1
+954 1 0.0000000000000000e+00 5.8478411033373359e+00 2.0198149065707951e+00 4.1164479691469573e+00 0 3 3
+382 1 0.0000000000000000e+00 5.5374008101556109e+00 3.2300216170697726e-01 3.2856141543289166e+00 10 -3 0
+2012 1 0.0000000000000000e+00 7.1381811536727096e+00 1.1875859045286972e+00 4.4693889141704748e+00 -1 -2 1
+1467 1 0.0000000000000000e+00 7.2866157861285226e+00 9.7216102865681897e-01 3.2242845886520355e+00 5 -1 -5
+39 1 0.0000000000000000e+00 7.3284628920753043e+00 1.7671856112295563e+00 3.4057140597772926e+00 -6 0 -4
+2809 2 -1.0000000000000000e+00 5.3129087991705015e+00 2.3504264081351085e+00 3.0749628633354238e+00 1 -6 4
+1340 1 0.0000000000000000e+00 5.1103689068154194e+00 9.8974901722019137e-01 3.7358254563861006e+00 2 2 -2
+2354 1 0.0000000000000000e+00 5.8597823633189998e+00 1.5884554942082063e+00 3.4884042297404232e+00 3 2 -2
+1382 1 0.0000000000000000e+00 5.8758669576805893e+00 1.1987274629899285e+00 4.2426449306499698e+00 4 -1 -4
+2574 1 0.0000000000000000e+00 7.4930850638763538e+00 1.9456903372378020e+00 2.8217758480489454e+00 -6 -3 -2
+1744 1 0.0000000000000000e+00 7.2261937687920454e+00 2.7967800592622838e-01 4.9902309595759569e+00 7 -3 -5
+1171 1 0.0000000000000000e+00 6.6113791754276994e+00 1.7613493617837896e+00 3.0244115392896860e+00 -2 4 -2
+748 1 0.0000000000000000e+00 5.1956273562955699e+00 2.3851450928890183e+00 4.6829808324538291e+00 1 2 1
+1379 1 0.0000000000000000e+00 5.9029345137878853e+00 1.1149430025852498e+00 2.9767048207064293e+00 5 -3 4
+2799 1 0.0000000000000000e+00 6.7298876797712666e+00 1.6429475751844853e+00 4.7223291971671069e+00 -5 0 1
+2965 3 1.0000000000000000e+00 5.3256533859373292e+00 1.2859505659056463e+00 4.6275407849022487e+00 -1 -1 0
+2041 1 0.0000000000000000e+00 5.1647597028362702e+00 1.6014306832151426e+00 3.9330708056780517e+00 -1 -1 2
+1266 1 0.0000000000000000e+00 6.2258744867737672e+00 6.8040643097673970e-01 3.6264484649732225e+00 3 4 -3
+1908 1 0.0000000000000000e+00 6.5426905195550411e+00 9.5618013279540268e-03 3.1006845104654488e+00 3 -1 4
+1691 1 0.0000000000000000e+00 7.6458048469992042e+00 9.8544268343709507e-01 4.0671849765314088e+00 4 -9 7
+227 1 0.0000000000000000e+00 7.8128951024018489e+00 7.5039555290326021e-01 3.2333426461461006e+00 6 -6 -1
+12 1 0.0000000000000000e+00 9.0934373790978569e+00 2.5990100259770360e-01 3.7204629225671373e+00 4 -4 1
+722 1 0.0000000000000000e+00 8.7135759438508149e+00 1.3706122165420003e+00 3.5009473799819681e+00 0 -4 -1
+2819 2 -1.0000000000000000e+00 9.3313095906266632e+00 2.4647067272201775e-01 4.5314708588314181e+00 -5 1 1
+2730 1 0.0000000000000000e+00 9.6405327590681527e+00 1.0171398297581409e+00 4.5888512872184881e+00 1 -1 8
+372 1 0.0000000000000000e+00 9.3343950927176156e+00 2.4431683381881877e+00 4.6181024311922592e+00 -4 -5 -2
+1493 1 0.0000000000000000e+00 9.2382531853377170e+00 1.5503172416452018e+00 3.7006723060064344e+00 0 0 1
+2658 1 0.0000000000000000e+00 8.2925433451448605e+00 7.2939810393093440e-01 2.5481104792878635e+00 3 0 2
+238 1 0.0000000000000000e+00 8.9732881083465390e+00 1.3727644841698268e+00 3.1286790902844062e+00 0 2 1
+73 1 0.0000000000000000e+00 7.5193309818656617e+00 4.3400856990290226e-01 4.3414897067848504e+00 -3 3 -4
+1071 1 0.0000000000000000e+00 7.7532873975030867e+00 1.3547645047503540e+00 3.7128103043485683e+00 0 0 -1
+2663 1 0.0000000000000000e+00 7.7661855019486152e+00 6.2968032919723627e-01 4.9141748681343769e+00 3 -4 -1
+2485 1 0.0000000000000000e+00 8.2954420338303549e+00 2.5202112687611494e-01 2.8570789501130198e+00 0 0 3
+996 1 0.0000000000000000e+00 9.5237011069337658e+00 1.0011390790291934e+00 4.0542291600441631e+00 5 4 -2
+89 1 0.0000000000000000e+00 8.2765604775420343e+00 7.6032525403227380e-01 4.6482047496535834e+00 -6 -4 7
+2221 1 0.0000000000000000e+00 8.7709116514968493e+00 4.2092261371789746e-01 4.5413901578052975e+00 -6 2 -8
+1439 1 0.0000000000000000e+00 8.0407546155953220e+00 2.2310421819871320e+00 3.1187726710613703e+00 -1 5 -5
+2312 1 0.0000000000000000e+00 7.9138150210703619e+00 2.4052553091431568e+00 4.1573838299433792e+00 -2 2 -2
+1042 1 0.0000000000000000e+00 9.8294513352412185e+00 1.9820828823746695e-02 3.9977077470983584e+00 5 -4 1
+2877 2 -1.0000000000000000e+00 7.9110190278396697e+00 1.9179321281618247e+00 3.4115492117669062e+00 1 1 1
+2306 1 0.0000000000000000e+00 8.7982821721522679e+00 1.2493039446175702e+00 4.4195070915299199e+00 -4 0 3
+1610 1 0.0000000000000000e+00 8.9336473428456014e+00 5.6476232893259948e-01 2.6967325791149377e+00 2 -2 -1
+2148 1 0.0000000000000000e+00 9.6327855573334578e+00 1.8790885667497346e+00 3.9914665169358643e+00 -4 -1 4
+580 1 0.0000000000000000e+00 7.7085122239750783e+00 1.4496916969732148e+00 4.6542386774831952e+00 -4 4 2
+2055 1 0.0000000000000000e+00 7.8405749065573893e+00 1.1985109185793836e+00 2.7021614328484125e+00 1 -9 3
+305 1 0.0000000000000000e+00 9.3496116423803741e+00 7.9739793277284743e-01 2.9601632055907299e+00 2 1 2
+531 1 0.0000000000000000e+00 9.8640675653553522e+00 1.2697783780279062e+00 3.8773717648773660e+00 3 -5 -5
+801 1 0.0000000000000000e+00 8.2491130715118004e+00 1.5393096666508581e+00 3.0552086355927242e+00 0 4 3
+2689 1 0.0000000000000000e+00 7.8031924932732997e+00 1.7887761365063513e+00 4.6409178119618426e+00 -1 3 2
+404 1 0.0000000000000000e+00 8.4614369114483594e+00 1.1272526039566522e-02 3.4700504063563820e+00 0 1 4
+2838 2 -1.0000000000000000e+00 9.6293687927655522e+00 1.7763806056154348e+00 4.8186640409337187e+00 -2 8 2
+700 1 0.0000000000000000e+00 9.9303204585166061e+00 1.9834249257650394e-01 2.8475203508232121e+00 -2 3 1
+2020 1 0.0000000000000000e+00 7.5350460061634719e+00 2.1375344297679869e-01 3.5699129510041843e+00 -1 -7 -3
+1552 1 0.0000000000000000e+00 8.3530932092749541e+00 1.9379313574090082e+00 3.9014614958884297e+00 -1 0 1
+779 1 0.0000000000000000e+00 8.5998132020855209e+00 2.2467276441464192e+00 4.1006283819659410e+00 0 2 -2
+2918 3 1.0000000000000000e+00 9.9306334610842075e+00 5.2939424818044711e-01 4.1344008740951042e+00 -5 0 -2
+1964 1 0.0000000000000000e+00 9.5412566268298402e+00 2.3402007182734264e+00 3.1076624521041096e+00 -2 -4 3
+1684 1 0.0000000000000000e+00 8.3449109256105665e+00 6.1834730029628715e-01 3.6450445174985786e+00 1 -6 -4
+41 1 0.0000000000000000e+00 8.6048335766593453e+00 2.4488339851189656e+00 3.2392476725060737e+00 0 -3 -2
+2762 1 0.0000000000000000e+00 9.7519428006156854e+00 1.8171522374850011e+00 3.4379660425591854e+00 2 3 3
+239 1 0.0000000000000000e+00 9.3483281544564392e+00 1.5031950471936937e+00 2.5187671223203782e+00 0 3 3
+2203 1 0.0000000000000000e+00 8.6166517463143943e+00 1.6635902111661776e+00 2.7129739507868353e+00 -1 0 -3
+1706 1 0.0000000000000000e+00 9.9931995781900493e+00 7.1143787196103758e-01 3.4577594919380208e+00 1 0 3
+1324 1 0.0000000000000000e+00 8.8648798202310104e+00 2.0158504628952150e+00 4.4164203085383402e+00 6 8 1
+1578 1 0.0000000000000000e+00 8.4274498141626566e+00 3.4464954092068717e-01 4.0829857835932666e+00 2 -4 -2
+2404 1 0.0000000000000000e+00 9.0209885438932851e+00 1.2398606803449550e+00 4.2188528726206433e+00 4 1 -2
+2149 1 0.0000000000000000e+00 7.6184528684280188e+00 1.0364440347365773e+00 4.9915787893844286e+00 6 6 -3
+2844 2 -1.0000000000000000e+00 7.1109751630469038e+00 3.6255067312567864e+00 4.9235676280198302e+00 -1 -1 0
+1405 1 0.0000000000000000e+00 6.5567920876289945e+00 3.1869411992950449e+00 3.2285485803206626e+00 -6 2 1
+1250 1 0.0000000000000000e+00 5.4773552447321334e+00 4.9260879665355377e+00 2.8988513056491190e+00 -3 3 10
+48 1 0.0000000000000000e+00 6.0883207440315976e+00 3.4233948039357878e+00 3.6007986316667226e+00 -3 -2 -1
+613 1 0.0000000000000000e+00 7.2188783880969432e+00 2.9861754718065123e+00 4.0948603780471577e+00 -1 -7 1
+2495 1 0.0000000000000000e+00 7.4964687133455179e+00 4.5659126574857227e+00 4.1715946370996004e+00 1 -2 0
+1234 1 0.0000000000000000e+00 6.6036421151695066e+00 4.0512713193726277e+00 4.2704655106936640e+00 -8 4 2
+2911 3 1.0000000000000000e+00 6.7460455843830083e+00 2.7355989094851534e+00 4.6886576739251238e+00 1 4 6
+1937 1 0.0000000000000000e+00 6.8393968347121552e+00 4.9458338063157488e+00 4.4822051433204848e+00 0 -1 3
+1017 1 0.0000000000000000e+00 7.0798931240892555e+00 4.0022710262681729e+00 3.8509483572316636e+00 3 -2 -3
+1444 1 0.0000000000000000e+00 7.0148156439343525e+00 4.3324221252252730e+00 4.8915146775182494e+00 3 -3 0
+2214 1 0.0000000000000000e+00 5.8643918489274949e+00 3.8253678552994912e+00 2.7514539685780242e+00 -1 3 1
+1500 1 0.0000000000000000e+00 6.0251481734010239e+00 4.7063838153385449e+00 2.5834072521906046e+00 -2 3 4
+953 1 0.0000000000000000e+00 6.6151869169787663e+00 4.4268838997944044e+00 4.5211721173573647e+00 2 1 -1
+1697 1 0.0000000000000000e+00 5.2924847384582270e+00 4.2224936260700314e+00 4.6694509194437837e+00 -5 2 -5
+151 1 0.0000000000000000e+00 5.9436186523015211e+00 3.0367777432715917e+00 3.2082624942831566e+00 2 -3 2
+185 1 0.0000000000000000e+00 7.3184988378958122e+00 3.0961320504964496e+00 3.3364708047667015e+00 -6 4 -4
+2633 1 0.0000000000000000e+00 5.4934549223888185e+00 2.8249312894046810e+00 3.9721248489100023e+00 7 5 7
+2329 1 0.0000000000000000e+00 6.6520022458984709e+00 3.4998893160583284e+00 4.2739467213336280e+00 4 -1 -1
+1451 1 0.0000000000000000e+00 5.1499407140373075e+00 3.3927162642320026e+00 3.5000038740275121e+00 0 -3 -2
+1701 1 0.0000000000000000e+00 5.1718450127987916e+00 3.1956070670310979e+00 4.4918221067541682e+00 -6 -3 1
+806 1 0.0000000000000000e+00 6.5878974558287027e+00 2.8549064147805141e+00 3.8334780985877779e+00 2 -1 4
+1800 1 0.0000000000000000e+00 5.6656318716512226e+00 4.3263702062019229e+00 3.8062439292836228e+00 1 1 2
+902 1 0.0000000000000000e+00 6.7769608607324487e+00 4.7596865843017389e+00 3.3174427341217925e+00 3 3 -3
+485 1 0.0000000000000000e+00 6.5882640322442878e+00 4.0204601875989203e+00 2.7624456308054208e+00 -3 3 -6
+1948 1 0.0000000000000000e+00 7.4482089943990788e+00 3.7764387698672266e+00 4.7099151063791611e+00 0 3 9
+150 1 0.0000000000000000e+00 5.3278061442585978e+00 3.1713065585852092e+00 2.8696057153239898e+00 6 -9 2
+994 1 0.0000000000000000e+00 7.4970935727842081e+00 3.6649579485520882e+00 2.5457799703283479e+00 -1 0 1
+2294 1 0.0000000000000000e+00 5.1383080870075135e+00 4.1762811774558566e+00 3.1539743125201452e+00 -4 0 -5
+2389 1 0.0000000000000000e+00 5.3934781988838632e+00 3.9472017322004618e+00 3.7549375613531786e+00 -3 1 -6
+1428 1 0.0000000000000000e+00 6.0260702165073132e+00 2.8870419584049696e+00 4.1831250421821062e+00 -2 0 1
+1293 1 0.0000000000000000e+00 6.0519375924217966e+00 4.3217113348841423e+00 4.4040601572619735e+00 -3 4 -3
+2376 1 0.0000000000000000e+00 5.5345476774465450e+00 4.6088590633842639e+00 3.9382415611832182e+00 -4 1 1
+267 1 0.0000000000000000e+00 6.4065841412915399e+00 2.9898868988190239e+00 2.7806832981416898e+00 -5 -3 -6
+54 1 0.0000000000000000e+00 6.4327993877242831e+00 4.2974650212469507e+00 3.7356400760193784e+00 5 5 4
+772 1 0.0000000000000000e+00 6.7888804122413635e+00 3.8259145426612564e+00 3.2299466552859175e+00 -3 5 1
+1593 1 0.0000000000000000e+00 5.9849536912880366e+00 3.3186777522876927e+00 4.7129073902404111e+00 -2 -7 0
+222 1 0.0000000000000000e+00 6.2918718929205859e+00 2.6687710876136057e+00 4.8869104744430185e+00 -1 0 2
+2846 2 -1.0000000000000000e+00 5.5328943449466452e+00 4.9861590334967758e+00 3.4389149497799041e+00 2 1 5
+194 1 0.0000000000000000e+00 5.2618408451713634e+00 3.4632291775978601e+00 4.3247575614143017e+00 1 1 -2
+2796 1 0.0000000000000000e+00 7.2820800647514767e+00 2.6116532331018787e+00 2.8080718902539208e+00 -4 3 4
+2270 1 0.0000000000000000e+00 6.1786082930163193e+00 4.7861695330637142e+00 3.0284708150357535e+00 -2 0 6
+440 1 0.0000000000000000e+00 5.6614745623297216e+00 4.4543363772805753e+00 2.7287457703396027e+00 -2 4 1
+1818 1 0.0000000000000000e+00 5.7850419236425665e+00 3.7213548819992250e+00 4.3100230882715120e+00 0 5 -2
+1254 1 0.0000000000000000e+00 6.8371999044255167e+00 4.9761515987770792e+00 2.5264741483133775e+00 -1 1 0
+16 1 0.0000000000000000e+00 7.5387449583956556e+00 3.0366972710606985e+00 4.7361619109039683e+00 5 -2 3
+1788 1 0.0000000000000000e+00 9.5236299891801988e+00 2.6150611311769714e+00 4.2900201315975330e+00 3 -1 3
+558 1 0.0000000000000000e+00 7.6055321106354539e+00 4.9392995358117577e+00 4.7801951604170201e+00 3 -4 1
+85 1 0.0000000000000000e+00 9.5973450224592138e+00 3.3887510766682860e+00 3.7897535902251698e+00 2 6 1
+493 1 0.0000000000000000e+00 9.5435577666889966e+00 4.0655379521002324e+00 2.6464546052547107e+00 -7 1 0
+2275 1 0.0000000000000000e+00 9.4210929515930939e+00 3.6102865583785464e+00 4.4762102152622836e+00 3 2 1
+858 1 0.0000000000000000e+00 9.1550947951692088e+00 3.1905624469211267e+00 4.5393355671303466e+00 5 1 -2
+2229 1 0.0000000000000000e+00 8.6181118727794637e+00 3.6112971195177246e+00 4.3964353781603105e+00 -2 6 -2
+2472 1 0.0000000000000000e+00 9.4513372723452047e+00 4.5988776050770968e+00 2.9781480949157908e+00 5 -4 -8
+1280 1 0.0000000000000000e+00 8.0509229067530477e+00 2.6972671872194911e+00 2.6101324200509319e+00 1 2 -3
+353 1 0.0000000000000000e+00 7.8356213197323727e+00 3.4726281463352433e+00 4.0921492895867031e+00 4 -5 3
+1001 1 0.0000000000000000e+00 8.8870108831288732e+00 4.0826889933595121e+00 3.6372990866369554e+00 5 -6 4
+1813 1 0.0000000000000000e+00 8.1966353905382121e+00 3.1040937538206834e+00 4.8632185914870938e+00 0 4 -1
+730 1 0.0000000000000000e+00 7.9700304471623253e+00 4.0939553288758299e+00 4.8320405742745303e+00 7 6 0
+1202 1 0.0000000000000000e+00 8.8780030493118485e+00 2.6090995388689344e+00 4.0923852961092795e+00 5 -2 2
+280 1 0.0000000000000000e+00 8.3662367501740693e+00 3.6104084739730133e+00 3.8180055665667627e+00 0 5 -3
+2056 1 0.0000000000000000e+00 9.8488015685532577e+00 4.3696641109353305e+00 4.6046799546883390e+00 -1 -2 3
+2865 2 -1.0000000000000000e+00 9.7366123770637181e+00 3.8573252605923312e+00 2.7680743684929254e+00 1 0 2
+2508 1 0.0000000000000000e+00 9.0445049737135630e+00 3.1861724051782350e+00 4.9666843516862667e+00 1 5 0
+1525 1 0.0000000000000000e+00 8.2999011820167059e+00 3.3075892464645480e+00 3.1438584545928889e+00 -2 -2 8
+1611 1 0.0000000000000000e+00 7.5075092346781895e+00 4.4181088199073448e+00 3.3672804835585302e+00 3 -6 4
+1815 1 0.0000000000000000e+00 8.0043803046352799e+00 4.2891141026044091e+00 2.6540852426492019e+00 8 -5 -3
+2805 2 -1.0000000000000000e+00 8.9863054251788501e+00 3.6046757566070231e+00 3.1163304996203962e+00 -1 2 -1
+1305 1 0.0000000000000000e+00 9.0214764149520228e+00 3.7505641951514423e+00 3.9227296773282316e+00 -2 2 -1
+2486 1 0.0000000000000000e+00 7.6573701813155672e+00 2.7035107915399470e+00 3.6939365304833305e+00 -6 -3 1
+1155 1 0.0000000000000000e+00 8.8306061229906252e+00 2.8907611335621772e+00 3.4071574619389184e+00 -2 1 1
+2420 1 0.0000000000000000e+00 8.3195295067431712e+00 4.3192000272135793e+00 4.4465223945138375e+00 -1 2 0
+1797 1 0.0000000000000000e+00 9.2615144291110454e+00 4.8878086908439800e+00 4.7882693457550030e+00 1 -3 2
+676 1 0.0000000000000000e+00 9.7637258519293511e+00 4.9082230842217651e+00 3.8774377459032792e+00 5 3 6
+786 1 0.0000000000000000e+00 8.2903837042617496e+00 3.6250394692378771e+00 4.7240770055224113e+00 1 9 -2
+1952 1 0.0000000000000000e+00 8.0569539729981532e+00 4.7758301558151279e+00 3.7705231015578349e+00 2 -6 -1
+1318 1 0.0000000000000000e+00 9.4490612864578196e+00 4.5013676524220827e+00 3.3983644259897239e+00 2 -2 -1
+670 1 0.0000000000000000e+00 9.3649001163519561e+00 2.9053931944981786e+00 3.7415122933656684e+00 -7 1 1
+2708 1 0.0000000000000000e+00 8.9434325395077821e+00 4.5803962037693813e+00 3.7858789445681542e+00 2 2 -3
+2129 1 0.0000000000000000e+00 8.2473977012438606e+00 4.7705222611262110e+00 2.6416124420188711e+00 2 2 2
+272 1 0.0000000000000000e+00 8.8480773859443715e+00 2.6447324778929961e+00 2.6118845284626317e+00 -1 2 -1
+2579 1 0.0000000000000000e+00 8.6444512761849701e+00 2.5632071039753677e+00 4.8037842448823804e+00 -6 -1 -1
+1409 1 0.0000000000000000e+00 8.7593428732640000e+00 4.5562992866408836e+00 4.9186425285524056e+00 3 2 8
+963 1 0.0000000000000000e+00 7.6276969307308837e+00 3.8139065060000048e+00 3.2361750519461596e+00 -1 5 -1
+2584 1 0.0000000000000000e+00 8.1938462140377162e+00 4.2809156533913342e+00 3.7595358328456348e+00 4 -1 -2
+843 1 0.0000000000000000e+00 8.0458023227349109e+00 3.0060657797138983e+00 4.0768780001802760e+00 0 5 4
+1700 1 0.0000000000000000e+00 9.8036664063671299e+00 3.0600964697083777e+00 2.9375070081585664e+00 3 0 4
+1679 1 0.0000000000000000e+00 8.8948412266879018e+00 4.4936375918039477e+00 2.9291125590116547e+00 0 1 5
+1048 1 0.0000000000000000e+00 9.0916346228904121e+00 4.0767833587431710e+00 4.5262427928678672e+00 -3 -1 -1
+2526 1 0.0000000000000000e+00 9.1516959153249253e+00 4.9273147695686799e+00 4.0321542625552196e+00 3 6 3
+1576 1 0.0000000000000000e+00 7.5269949229659332e+00 4.8309240710522303e+00 3.0279314600345537e+00 -5 -1 0
+1257 1 0.0000000000000000e+00 9.9500152434882292e+00 4.4432759380909861e+00 3.9383120626628902e+00 -1 5 4
+1941 1 0.0000000000000000e+00 5.0749060404480346e+00 8.0860355152880370e-02 6.1945597799506000e+00 -1 1 -3
+869 1 0.0000000000000000e+00 6.1376852038707304e+00 2.4021146721185040e+00 7.4870881517428973e+00 0 3 0
+275 1 0.0000000000000000e+00 5.7109971274254914e+00 5.2190127055195767e-01 6.5792363209729983e+00 -1 -2 -5
+1594 1 0.0000000000000000e+00 6.7930347606744350e+00 2.9040698507521306e-02 5.8237714028244332e+00 -6 5 1
+2793 1 0.0000000000000000e+00 6.1835778452519348e+00 9.3989918035750741e-01 6.8009324356984173e+00 0 -1 3
+541 1 0.0000000000000000e+00 6.8236127543792433e+00 1.8792061305985794e+00 6.6930840060109462e+00 3 0 0
+787 1 0.0000000000000000e+00 6.0823643110457724e+00 2.1885470116043315e+00 6.6553429365166927e+00 1 2 7
+669 1 0.0000000000000000e+00 5.1344053061266068e+00 1.6391789514525212e-01 7.1583945724872793e+00 3 1 -2
+2587 1 0.0000000000000000e+00 5.6887723198170628e+00 1.4627448503976648e+00 7.2558538570528750e+00 -2 0 -1
+753 1 0.0000000000000000e+00 5.4520411900748105e+00 1.4225407196147921e+00 7.0512963101473920e+00 -5 2 0
+2333 1 0.0000000000000000e+00 5.5707905945140768e+00 2.0165332140680423e+00 6.4482896041941462e+00 8 -7 -3
+2775 1 0.0000000000000000e+00 6.7467342052473667e+00 2.7435326305316671e-01 6.4510201052621126e+00 3 3 1
+1338 1 0.0000000000000000e+00 6.5441190491994581e+00 1.0883672690702484e+00 6.0342244590818366e+00 2 5 5
+560 1 0.0000000000000000e+00 5.5255241426882948e+00 1.4134792632393112e+00 6.5181869965964019e+00 1 9 2
+2907 3 1.0000000000000000e+00 5.6033217407664084e+00 6.7414263764354221e-01 7.0806608290213706e+00 1 -2 3
+901 1 0.0000000000000000e+00 5.9452218062579858e+00 1.5739623570628050e+00 6.4216219673589103e+00 -2 1 3
+1994 1 0.0000000000000000e+00 6.7235855766469781e+00 5.8100248088541817e-01 5.5969858299834483e+00 0 6 -4
+2274 1 0.0000000000000000e+00 7.0276161586757722e+00 1.3892911479219854e+00 6.1172541689775306e+00 4 2 2
+746 1 0.0000000000000000e+00 5.1024107493854487e+00 1.6228719985989801e+00 5.4416775400013400e+00 1 -2 0
+1491 1 0.0000000000000000e+00 6.8028259093200294e+00 2.2549710679805304e+00 6.2210658734033641e+00 0 2 0
+1396 1 0.0000000000000000e+00 6.9310942322742788e+00 2.0142040278042219e+00 5.1263526866384286e+00 -2 0 1
+2638 1 0.0000000000000000e+00 5.1446030141921213e+00 1.3077515478922208e+00 6.0266048299430555e+00 -3 0 -6
+2061 1 0.0000000000000000e+00 5.9005049348296694e+00 1.3078732437141158e+00 5.7552889877771465e+00 -8 6 -2
+1020 1 0.0000000000000000e+00 6.3042299342315546e+00 1.2870395570643123e+00 7.2265756242867845e+00 -6 5 -1
+1066 1 0.0000000000000000e+00 6.9526778978088997e+00 1.5064227311866694e+00 5.5692000485084083e+00 2 2 0
+1484 1 0.0000000000000000e+00 6.1606132675198602e+00 7.6676995662017333e-01 7.3066830001610281e+00 3 -5 -3
+587 1 0.0000000000000000e+00 7.3791055313405272e+00 2.0896896767406359e+00 6.3752141815640755e+00 1 1 0
+2265 1 0.0000000000000000e+00 7.3000665529263333e+00 2.4752511861374900e+00 5.6106444282349104e+00 -4 -5 2
+1650 1 0.0000000000000000e+00 7.3428346098496977e+00 8.1373931145275735e-01 5.6581017638406399e+00 3 5 -3
+1514 1 0.0000000000000000e+00 7.4122846305789842e+00 5.3368565655314582e-01 6.4326393360203040e+00 1 -8 -1
+1354 1 0.0000000000000000e+00 5.8544369263911502e+00 2.4014433534189235e+00 5.5868718977189804e+00 1 0 -3
+2608 1 0.0000000000000000e+00 6.1608444764004133e+00 1.0361800539282821e-01 5.4140821615948642e+00 0 1 2
+823 1 0.0000000000000000e+00 6.6395151018156415e+00 7.1013420866012622e-01 7.0709788004998693e+00 2 6 -3
+1269 1 0.0000000000000000e+00 6.8308981196106648e+00 1.8601867186918237e+00 7.1800841724537134e+00 3 5 -2
+410 1 0.0000000000000000e+00 5.1400884091438908e+00 7.6736606769455240e-01 6.5206694341671341e+00 1 3 -6
+1387 1 0.0000000000000000e+00 5.2750345342072027e+00 1.1503861064753795e+00 5.2270588766730661e+00 0 -4 -3
+2154 1 0.0000000000000000e+00 5.7386443301369070e+00 1.9134792104181835e+00 5.7856519699315108e+00 -1 4 -1
+1145 1 0.0000000000000000e+00 5.8840258915523069e+00 4.5326896214299617e-01 5.5243373372198539e+00 -5 6 4
+2042 1 0.0000000000000000e+00 6.8000255882061120e+00 7.3920039980828245e-01 5.2124249542567647e+00 -4 0 2
+1604 1 0.0000000000000000e+00 7.1295048313135556e+00 1.0158115037024644e+00 7.2083615753631314e+00 2 -1 0
+1323 1 0.0000000000000000e+00 6.5271332297665765e+00 1.8489711789602801e+00 5.7638990101883723e+00 -7 3 4
+540 1 0.0000000000000000e+00 5.7907685827180737e+00 8.2183375673157844e-01 5.4814561103920800e+00 0 -1 4
+2943 3 1.0000000000000000e+00 6.8110715815586280e+00 1.1653567063636594e+00 6.7984593849340484e+00 -3 -3 1
+1720 1 0.0000000000000000e+00 5.7276563960079967e+00 2.1231493281154559e+00 7.4892619579170541e+00 0 -6 -4
+2936 3 1.0000000000000000e+00 9.0638157451271493e+00 7.6931946004342833e-02 5.9185260793052086e+00 6 2 2
+679 1 0.0000000000000000e+00 9.3765613807575452e+00 9.2576078355557223e-01 6.4627308526458380e+00 2 0 5
+450 1 0.0000000000000000e+00 9.1232269042168017e+00 1.6058650607754503e+00 5.0551287842619219e+00 -2 -2 0
+499 1 0.0000000000000000e+00 9.9550571586842445e+00 2.1428794533291484e-01 5.0974640260978274e+00 -3 -1 -4
+1934 1 0.0000000000000000e+00 7.7957037173316692e+00 1.8451052747322727e+00 6.0870378570780197e+00 6 1 -1
+1186 1 0.0000000000000000e+00 8.1654316067800412e+00 1.5956227326640875e+00 5.7164571525644279e+00 1 6 -1
+2521 1 0.0000000000000000e+00 8.2554156936917966e+00 4.7690116163901519e-01 6.5275151442149255e+00 -2 -5 2
+1843 1 0.0000000000000000e+00 8.7155986015011777e+00 9.2561108447810425e-01 5.1331539481527475e+00 0 0 -2
+2644 1 0.0000000000000000e+00 9.8655157729051997e+00 2.0870509288604437e+00 6.5251406908546645e+00 0 6 1
+191 1 0.0000000000000000e+00 9.7374336662326382e+00 3.4666893076756217e-01 7.0483903370911092e+00 -3 2 -4
+1757 1 0.0000000000000000e+00 8.4618767431070694e+00 1.1871077848330678e+00 7.4211115795878717e+00 -4 1 1
+1262 1 0.0000000000000000e+00 9.5234397397870492e+00 1.5592442791175189e+00 5.9775396569378323e+00 0 -1 -3
+1541 1 0.0000000000000000e+00 8.6451168062848804e+00 2.0138881791179699e+00 5.0203949712931806e+00 -6 2 2
+2124 1 0.0000000000000000e+00 9.3220476308263347e+00 6.4563629247542487e-01 5.1656016391003616e+00 -4 3 -3
+2831 2 -1.0000000000000000e+00 7.9488978586291790e+00 1.0717105061589272e+00 7.2891203575667110e+00 -1 1 -2
+437 1 0.0000000000000000e+00 8.7690753629662517e+00 1.2866455596512376e+00 5.7023727760983229e+00 -1 0 3
+1321 1 0.0000000000000000e+00 7.5361229856347034e+00 1.6058602018477153e+00 7.0126471293153205e+00 2 -4 0
+608 1 0.0000000000000000e+00 7.6523861480571611e+00 2.2201590548256736e-01 7.1907492768729986e+00 -2 1 3
+1208 1 0.0000000000000000e+00 9.2151980505506010e+00 1.2850876584231889e+00 7.3938297828150912e+00 1 -2 -2
+425 1 0.0000000000000000e+00 8.2109349482888323e+00 1.5179271097330718e+00 5.1030883301257113e+00 1 -1 -4
+1213 1 0.0000000000000000e+00 8.7339217851557347e+00 2.4640414859813111e+00 6.7837388649458017e+00 3 6 4
+720 1 0.0000000000000000e+00 8.3124631237322735e+00 2.3965273454030451e+00 6.2370240710067550e+00 4 0 1
+1537 1 0.0000000000000000e+00 8.4574474498027765e+00 5.3230936093209535e-01 7.1225307803616733e+00 -1 2 -6
+1987 1 0.0000000000000000e+00 9.8709208737487781e+00 2.2038925674245435e+00 5.8128232628933771e+00 -1 -3 5
+18 1 0.0000000000000000e+00 7.9908437336325413e+00 2.2019126932980577e+00 5.4526114222029962e+00 -6 -2 -6
+2535 1 0.0000000000000000e+00 7.5171215855666826e+00 1.7931876411820131e+00 5.4465207957487012e+00 -5 -1 0
+1495 1 0.0000000000000000e+00 8.5969525146743599e+00 2.2881487504154263e+00 5.7570939307684066e+00 -2 -2 0
+872 1 0.0000000000000000e+00 9.6510112242668047e+00 1.3134660715930202e+00 5.6059720296474671e+00 3 0 -1
+2634 1 0.0000000000000000e+00 7.8830062912146701e+00 1.2161282088284937e+00 6.6620825590794199e+00 -1 -3 0
+563 1 0.0000000000000000e+00 9.0654318641280387e+00 2.2408111542107050e+00 6.0659136334352839e+00 -2 -1 2
+2070 1 0.0000000000000000e+00 9.3309313937376448e+00 2.1426056200562427e-01 6.5115122270441947e+00 1 -3 1
+979 1 0.0000000000000000e+00 8.1232972383017934e+00 1.9049270163071623e+00 6.8184480894131347e+00 -2 0 1
+2205 1 0.0000000000000000e+00 8.6590334128738125e+00 8.2698669428302107e-01 6.3177074594877682e+00 -1 0 -1
+1981 1 0.0000000000000000e+00 9.8307345179761771e+00 7.2457260790556199e-01 7.4544540907272214e+00 -5 0 1
+1967 1 0.0000000000000000e+00 9.7527585091177844e+00 1.4304729978908677e+00 7.1299013205657733e+00 0 1 2
+334 1 0.0000000000000000e+00 9.5158522991244325e+00 2.3023390390462053e+00 5.2194492738881966e+00 2 0 0
+279 1 0.0000000000000000e+00 8.4880851854501067e+00 6.5963844384070547e-02 5.0445054671590404e+00 3 4 -2
+2824 2 -1.0000000000000000e+00 8.5711954270986759e+00 1.6681401793954227e+00 6.2974048648693577e+00 6 2 -2
+2674 1 0.0000000000000000e+00 9.1290721209596999e+00 8.1646546756708660e-01 6.9754475925807267e+00 3 -2 0
+620 1 0.0000000000000000e+00 9.0916902453753607e+00 1.9364644108597178e+00 5.3123202627625696e+00 -4 0 -6
+176 1 0.0000000000000000e+00 7.9944649619458676e+00 5.4027306730218205e-01 5.6556121030370070e+00 -4 -5 -4
+2946 3 1.0000000000000000e+00 7.6026335852741873e+00 7.5066715649365545e-01 5.9542260719402815e+00 2 -1 -1
+2735 1 0.0000000000000000e+00 9.1998701911284382e+00 1.6158894238281141e+00 6.5937092099581527e+00 1 4 -2
+1415 1 0.0000000000000000e+00 8.2321896287428089e+00 8.5382166661859193e-01 5.6620603241387437e+00 0 -2 2
+1373 1 0.0000000000000000e+00 8.2977616553333444e+00 2.9934704124348388e-01 6.0563845850657358e+00 -3 6 1
+2909 3 1.0000000000000000e+00 9.1313080321467925e+00 2.0612307584778913e+00 7.4330730153949096e+00 -11 1 -1
+417 1 0.0000000000000000e+00 7.7805734160556392e+00 2.1914073407903301e+00 7.2431555392013953e+00 3 0 4
+244 1 0.0000000000000000e+00 9.8241912307744386e+00 6.4334085302150013e-01 6.1259124352347225e+00 -3 -1 -3
+1389 1 0.0000000000000000e+00 9.0467539736140683e+00 5.3200430432861556e-01 5.6291665683075642e+00 1 5 1
+813 1 0.0000000000000000e+00 5.2919497340902177e+00 2.6838153184722668e+00 6.6357514726010836e+00 -3 -1 5
+1866 1 0.0000000000000000e+00 5.6964463972577688e+00 3.6272011874631973e+00 7.2423387991155721e+00 -2 6 0
+1117 1 0.0000000000000000e+00 5.6192099962073421e+00 2.7790137958507590e+00 5.2056754202338107e+00 3 -5 1
+1291 1 0.0000000000000000e+00 6.0303240214996716e+00 4.9698723560704918e+00 5.0289356757323027e+00 1 1 -10
+2771 1 0.0000000000000000e+00 6.8583428983034329e+00 4.6332951117893009e+00 6.6756478955888348e+00 -6 -1 5
+1748 1 0.0000000000000000e+00 6.3474019875986363e+00 4.2855697921694711e+00 7.3456773681257905e+00 -1 0 3
+2577 1 0.0000000000000000e+00 5.4906148673538970e+00 3.4344698645572564e+00 5.2845366221262822e+00 4 -1 3
+99 1 0.0000000000000000e+00 7.2608189640761616e+00 4.9840066121636539e+00 5.8820998968199181e+00 -3 1 2
+2173 1 0.0000000000000000e+00 6.8674987500583295e+00 3.5199451960892576e+00 7.3207650624235958e+00 3 -2 4
+2382 1 0.0000000000000000e+00 5.2255019771157363e+00 4.0984497705583038e+00 6.7013463520955376e+00 -1 -1 1
+585 1 0.0000000000000000e+00 6.1303738355749493e+00 3.2113485346968429e+00 6.3883262477789291e+00 -7 2 -1
+1079 1 0.0000000000000000e+00 5.6451287426688950e+00 4.9169011921724834e+00 6.4414936975484531e+00 1 -1 -2
+925 1 0.0000000000000000e+00 5.7409677681355262e+00 4.7393178300902425e+00 7.4610142563499053e+00 -2 -1 1
+990 1 0.0000000000000000e+00 5.9314909291861202e+00 4.5968293166268861e+00 5.7113710324377411e+00 -5 -6 0
+625 1 0.0000000000000000e+00 6.3246389515512078e+00 3.7256585330047147e+00 6.1000963863659434e+00 -4 4 3
+2616 1 0.0000000000000000e+00 5.5097972157657171e+00 3.2895140138727430e+00 6.0656033724218048e+00 -2 3 -4
+1207 1 0.0000000000000000e+00 6.6993525017455777e+00 4.5596112563638549e+00 5.9728871328755098e+00 -2 9 3
+898 1 0.0000000000000000e+00 5.7845862562765120e+00 4.1062658526298286e+00 6.0639693298036788e+00 2 -3 -2
+2248 1 0.0000000000000000e+00 5.3790026710532013e+00 2.7882724060300443e+00 6.0153017451668536e+00 -7 -2 -4
+2304 1 0.0000000000000000e+00 6.6777821487254574e+00 3.2745803590784113e+00 5.1894668484545381e+00 3 -3 -2
+2235 1 0.0000000000000000e+00 5.6942297879100394e+00 4.4761358517402092e+00 5.3973913226550740e+00 -3 -1 2
+517 1 0.0000000000000000e+00 6.4228304097114730e+00 2.9782856330332348e+00 6.6432157649514281e+00 -2 -2 -4
+1326 1 0.0000000000000000e+00 6.1563324455039945e+00 3.7107580349333311e+00 6.8069416560371296e+00 4 0 3
+660 1 0.0000000000000000e+00 5.7406203329321750e+00 3.0928993477124571e+00 7.1441251544433904e+00 -4 -2 -4
+756 1 0.0000000000000000e+00 5.1003648973352389e+00 3.9617183298786802e+00 5.7779483053698488e+00 -4 4 2
+1515 1 0.0000000000000000e+00 6.3291099033241789e+00 3.9583478784203674e+00 5.1738519822340736e+00 4 -2 -5
+1012 1 0.0000000000000000e+00 6.0101812789022562e+00 2.5538055114935854e+00 6.1653988952487699e+00 -3 5 -1
+1675 1 0.0000000000000000e+00 6.0946489582926064e+00 4.6599088067132630e+00 6.5240463759974556e+00 9 1 8
+532 1 0.0000000000000000e+00 5.8561902300092319e+00 4.1403997344610097e+00 6.4844809360019688e+00 -3 -2 -3
+1734 1 0.0000000000000000e+00 5.0545759629737441e+00 3.3943948572382183e+00 6.8792772643669196e+00 -3 0 0
+1035 1 0.0000000000000000e+00 6.9340529425345903e+00 3.8285400778932512e+00 6.4644324714815040e+00 4 -1 1
+1206 1 0.0000000000000000e+00 6.4556008432834329e+00 3.1912646581726292e+00 7.4868851431154306e+00 -5 1 -4
+1556 1 0.0000000000000000e+00 6.9313562345821209e+00 2.6456275840238930e+00 7.1215884894263857e+00 -3 -6 2
+1996 1 0.0000000000000000e+00 7.3866697968295778e+00 3.7681877553428516e+00 7.2168484811836224e+00 -10 3 -2
+1705 1 0.0000000000000000e+00 5.0656006823225335e+00 2.5617697357622689e+00 7.2561325828372318e+00 6 -4 3
+2562 1 0.0000000000000000e+00 6.5007949122291180e+00 2.9161138807082119e+00 5.6546398337495996e+00 1 -2 1
+70 1 0.0000000000000000e+00 6.5537027040761817e+00 4.5106415257707271e+00 5.3874645165769666e+00 0 -1 3
+745 1 0.0000000000000000e+00 7.0870613695106437e+00 3.0884800977463160e+00 5.6792302379482491e+00 -3 2 1
+327 1 0.0000000000000000e+00 6.6917389823633764e+00 3.6052724831676777e+00 5.7647593582965779e+00 -1 -1 4
+1224 1 0.0000000000000000e+00 5.3738499113214049e+00 4.4702351802975917e+00 6.9794762810025404e+00 -9 -3 4
+2192 1 0.0000000000000000e+00 5.0111762994387892e+00 4.6623961538259140e+00 6.0013355570523528e+00 -5 0 -5
+160 1 0.0000000000000000e+00 7.2079964295920709e+00 3.1811175937504439e+00 6.9023902199193516e+00 2 4 1
+64 1 0.0000000000000000e+00 7.4428096936323982e+00 2.7511046711972336e+00 6.5352197115772297e+00 -4 0 -4
+2740 1 0.0000000000000000e+00 7.3710806305296614e+00 4.9701996081827833e+00 6.6115024464136596e+00 4 -1 2
+435 1 0.0000000000000000e+00 6.9900304249789924e+00 4.1079017778749760e+00 6.0951285945362903e+00 -9 1 -7
+1726 1 0.0000000000000000e+00 5.8462713099719981e+00 3.4403846502552935e+00 5.5163324904940882e+00 -1 6 8
+2554 1 0.0000000000000000e+00 8.4321939908274572e+00 2.6277628943430793e+00 6.6699420714398974e+00 5 -3 -1
+1704 1 0.0000000000000000e+00 9.4118165123682367e+00 2.5705860281711739e+00 6.7208356401227292e+00 -3 -4 -4
+597 1 0.0000000000000000e+00 9.7375387485800307e+00 4.5299093507189312e+00 6.0818501888242995e+00 -5 -7 6
+300 1 0.0000000000000000e+00 7.6771879562550103e+00 3.8859888902929889e+00 7.1576010966014039e+00 -3 1 5
+1481 1 0.0000000000000000e+00 7.9130440889070019e+00 4.1806141811123814e+00 6.7207567464845210e+00 2 1 1
+343 1 0.0000000000000000e+00 8.6916254280248726e+00 3.0011912985659475e+00 5.5715739821475383e+00 3 -2 1
+271 1 0.0000000000000000e+00 8.4792674013350027e+00 3.9615687379265614e+00 5.8923428743787030e+00 -2 -1 -1
+2079 1 0.0000000000000000e+00 7.5938469266450594e+00 3.3353362718320501e+00 5.2124487201320955e+00 -9 -1 6
+502 1 0.0000000000000000e+00 9.2329425634659348e+00 4.4532639336587732e+00 6.6996259657351391e+00 2 -2 -7
+1517 1 0.0000000000000000e+00 7.9869120699817824e+00 3.2073744059598970e+00 5.8800232134869503e+00 0 3 0
+2 1 0.0000000000000000e+00 7.5592931771315195e+00 3.2574443442782899e+00 6.2717761795714830e+00 -1 -4 5
+2189 1 0.0000000000000000e+00 9.9693426548407977e+00 3.6973655080658956e+00 5.3895086411618065e+00 -1 0 3
+2049 1 0.0000000000000000e+00 8.3314904967613028e+00 4.7262125721417112e+00 5.5389834838772520e+00 2 4 -2
+2974 3 1.0000000000000000e+00 8.8061599779424391e+00 4.3521100851971264e+00 6.0765586679494179e+00 -2 -1 -4
+2642 1 0.0000000000000000e+00 9.7530613265557236e+00 2.8398872413489871e+00 6.0951395557925574e+00 5 0 5
+845 1 0.0000000000000000e+00 8.9328792657048979e+00 4.8740618558007771e+00 6.3746191618534578e+00 4 3 0
+1010 1 0.0000000000000000e+00 8.1404661406364838e+00 4.6261964446695591e+00 7.2514528640044214e+00 -3 1 3
+274 1 0.0000000000000000e+00 7.5235118589644348e+00 3.6456901580321643e+00 5.7673462549539893e+00 2 2 3
+1272 1 0.0000000000000000e+00 9.0908674445153874e+00 3.6257740428254865e+00 5.7851211605403563e+00 1 3 -1
+438 1 0.0000000000000000e+00 7.5649131309849817e+00 4.7457599319214365e+00 7.3377248273888629e+00 -3 2 1
+1403 1 0.0000000000000000e+00 9.0932569650526816e+00 4.6039030381678270e+00 5.3379135203654844e+00 -3 3 -5
+1972 1 0.0000000000000000e+00 8.8087698845470204e+00 3.7418660370445096e+00 5.2753900081393024e+00 4 -8 1
+491 1 0.0000000000000000e+00 8.1015591140395280e+00 3.7205172115147169e+00 6.9222512801010785e+00 -1 3 1
+549 1 0.0000000000000000e+00 9.4962014557910486e+00 3.8620177718412285e+00 6.5269975920039673e+00 -4 0 -8
+747 1 0.0000000000000000e+00 9.4502192447422058e+00 2.6376070648243135e+00 5.4455428453451473e+00 3 -2 2
+1034 1 0.0000000000000000e+00 7.8213859792005662e+00 4.1605010130012881e+00 6.3427012033941033e+00 3 2 -7
+2500 1 0.0000000000000000e+00 8.0565816197494780e+00 2.7452477638329658e+00 6.2542466956442615e+00 1 3 3
+1004 1 0.0000000000000000e+00 8.9563223042101647e+00 4.1223194937996830e+00 7.0358719850443956e+00 -2 6 -1
+428 1 0.0000000000000000e+00 9.0065952985505557e+00 3.0515504641890114e+00 5.9329600884616625e+00 -5 8 -2
+2711 1 0.0000000000000000e+00 8.2262157608459479e+00 4.1109141188262441e+00 5.3191159728820194e+00 -1 2 -1
+931 1 0.0000000000000000e+00 8.2771478624905193e+00 3.0435310095146066e+00 6.8519792745645640e+00 9 3 3
+881 1 0.0000000000000000e+00 8.7261810761560739e+00 3.5819139411105687e+00 6.3976756747441588e+00 -5 1 -9
+2377 1 0.0000000000000000e+00 7.6203763514079714e+00 2.8990975103815337e+00 7.3353162922319459e+00 1 4 -1
+2896 2 -1.0000000000000000e+00 9.3546810594996916e+00 4.3547664082283708e+00 5.7874131403638076e+00 3 -2 0
+1425 1 0.0000000000000000e+00 9.8795362808081464e+00 3.2533719540308454e+00 6.9878732114950131e+00 -2 6 -1
+181 1 0.0000000000000000e+00 8.2033284395009129e+00 2.7556228316734250e+00 5.4691379210706028e+00 2 4 3
+891 1 0.0000000000000000e+00 7.6764340914231823e+00 4.2379981376768487e+00 5.7421716402338170e+00 1 7 1
+1868 1 0.0000000000000000e+00 9.0787680757488012e+00 3.2205939771990120e+00 6.5815365750535948e+00 2 -5 0
+1271 1 0.0000000000000000e+00 9.6491009965078014e+00 3.7018257099161813e+00 5.1452267551204045e+00 -3 -2 0
+2316 1 0.0000000000000000e+00 7.7633508560085662e+00 4.6992954667179943e+00 5.7553158439221352e+00 1 2 -4
+1558 1 0.0000000000000000e+00 8.3042252994873991e+00 4.5867459290168391e+00 6.5951095914066569e+00 1 -1 2
+2646 1 0.0000000000000000e+00 8.3919960947087233e+00 3.4438694537146297e+00 6.3479877561058373e+00 -4 -1 3
+836 1 0.0000000000000000e+00 9.6309301333661068e+00 2.8017528394753137e+00 7.3161722565093923e+00 -6 -1 3
+2580 1 0.0000000000000000e+00 9.9391300872847967e+00 4.4948071455369600e+00 5.2278381359341539e+00 0 2 6
+1896 1 0.0000000000000000e+00 9.5894766116443151e+00 3.7278701787058588e+00 7.1838094314978100e+00 3 -4 4
+2188 1 0.0000000000000000e+00 5.3065659351596652e+00 1.9403848283585114e+00 9.6028256198016066e+00 1 2 0
+1009 1 0.0000000000000000e+00 6.8493157805370721e+00 2.3430835438920967e+00 9.1545720015608012e+00 -2 -2 -1
+2768 1 0.0000000000000000e+00 6.8939896796151396e+00 8.3383677006919377e-01 9.9276950286031820e+00 1 1 0
+761 1 0.0000000000000000e+00 5.1979713351713110e+00 2.3822120825216802e+00 8.5267675572183457e+00 9 -3 0
+1504 1 0.0000000000000000e+00 6.5614138544437113e+00 7.7076857837337531e-02 8.5394513185946739e+00 1 -6 1
+2371 1 0.0000000000000000e+00 5.7607346778776822e+00 1.5032578744423950e+00 8.4806879740535859e+00 0 4 3
+1191 1 0.0000000000000000e+00 5.9072960203146296e+00 1.7117532040239252e+00 9.6337376344793046e+00 0 1 -3
+2153 1 0.0000000000000000e+00 5.6473146859316454e+00 8.2441924371784925e-01 7.8531260626013770e+00 1 -4 -5
+1479 1 0.0000000000000000e+00 5.1982055286005000e+00 1.1001045357827741e+00 8.8728662638403595e+00 3 4 1
+2629 1 0.0000000000000000e+00 6.8408033176714165e+00 9.4725896496367112e-01 7.9409854786206884e+00 -2 -1 5
+2592 1 0.0000000000000000e+00 7.4446265652736887e+00 1.9531368802250251e+00 8.9143012844014820e+00 0 2 -4
+2980 3 1.0000000000000000e+00 7.2677057238576772e+00 9.3804993904884892e-01 8.9618894568333616e+00 1 -3 0
+629 1 0.0000000000000000e+00 5.5694511052140783e+00 2.4808502395697438e-01 7.5473069225062268e+00 2 -1 1
+871 1 0.0000000000000000e+00 5.7116797981143419e+00 2.1979638151679679e+00 8.5258016208880498e+00 -3 4 -1
+154 1 0.0000000000000000e+00 7.3548481620232717e+00 4.5362545847663494e-01 9.2547118798002135e+00 -6 -3 2
+1555 1 0.0000000000000000e+00 6.7005243761519226e+00 2.3989305608546370e+00 8.6087922308301845e+00 2 -3 -1
+1277 1 0.0000000000000000e+00 5.1069106799350017e+00 1.4391711125670947e+00 7.8780095403632231e+00 7 3 2
+398 1 0.0000000000000000e+00 5.8251932168812708e+00 6.7816154586201716e-01 8.2841756526318040e+00 -2 0 0
+973 1 0.0000000000000000e+00 6.3602401761029537e+00 1.6905247759941008e-01 8.4503194089144795e+00 -3 1 -1
+1335 1 0.0000000000000000e+00 6.0509507863019172e+00 1.4774382387697202e+00 8.0355055056271567e+00 6 2 3
+2981 3 1.0000000000000000e+00 6.3569718620523519e+00 1.7396565197071616e+00 7.8946067874176249e+00 -1 -3 2
+142 1 0.0000000000000000e+00 5.6565972190277840e+00 6.7699459953610464e-01 9.6737760957545227e+00 0 -3 -5
+2632 1 0.0000000000000000e+00 6.9592264417394283e+00 3.2079884782390522e-01 8.4476989981543689e+00 4 2 0
+2686 1 0.0000000000000000e+00 6.8009612310655871e+00 1.6166509406267542e+00 9.4851988377960375e+00 8 2 -5
+1673 1 0.0000000000000000e+00 6.2512690377536364e+00 2.0089567668899795e+00 9.2923551888362006e+00 -1 3 6
+833 1 0.0000000000000000e+00 6.7098427053595975e+00 1.9906319303246689e+00 8.0837210910634099e+00 1 2 -1
+989 1 0.0000000000000000e+00 7.3860807016945289e+00 1.0419540611667548e+00 9.9698453159506784e+00 -8 0 -3
+566 1 0.0000000000000000e+00 6.9096746286896549e+00 1.2361690876618505e+00 9.4048090208853008e+00 -3 12 6
+733 1 0.0000000000000000e+00 5.0648429902847001e+00 1.9397746737201083e+00 7.9598427787434538e+00 -4 0 -6
+443 1 0.0000000000000000e+00 6.2391539887838903e+00 1.6875003333859540e+00 9.9304602130508162e+00 -3 3 -3
+1221 1 0.0000000000000000e+00 5.2738511375255648e+00 4.8617171467757614e-01 9.2928619473190075e+00 1 -1 -1
+1046 1 0.0000000000000000e+00 5.5575035007332954e+00 2.0505477436081860e+00 8.7368026613458625e+00 2 2 -3
+1487 1 0.0000000000000000e+00 5.1022206997382549e+00 1.7019529127852930e+00 9.0965272608013965e+00 -5 0 0
+189 1 0.0000000000000000e+00 5.7482535543133659e+00 1.1706846980733479e+00 8.9263018734981756e+00 -2 -5 1
+1198 1 0.0000000000000000e+00 7.4413715277364281e+00 1.4935749749676304e+00 7.9109545668889414e+00 1 2 3
+2145 1 0.0000000000000000e+00 7.3608451044478667e+00 2.1047451007487675e-01 7.5966532281280639e+00 7 -6 -1
+702 1 0.0000000000000000e+00 5.7616243842752386e+00 2.2456996670685516e+00 9.8338816123643387e+00 0 2 -4
+893 1 0.0000000000000000e+00 6.5708841768891872e+00 4.9525760759464649e-01 9.3236801541015915e+00 8 3 0
+2779 1 0.0000000000000000e+00 6.3743567815675819e+00 1.2583195426464588e+00 8.7165651860680171e+00 -1 -6 4
+454 1 0.0000000000000000e+00 6.8682424862574578e+00 1.1099075246050787e+00 8.6665269251038506e+00 1 0 -2
+2266 1 0.0000000000000000e+00 7.4383998804267222e+00 1.6371153048255999e-01 9.9816634557531057e+00 -3 6 0
+2821 2 -1.0000000000000000e+00 6.9056575415031967e+00 1.4729815321258140e+00 8.4356410076009567e+00 -3 6 -3
+2582 1 0.0000000000000000e+00 6.5456768073369966e+00 1.3669680380859234e-01 7.7701451954290253e+00 0 -1 4
+810 1 0.0000000000000000e+00 6.5264647847171018e+00 7.5009601309220597e-01 7.9594773981205531e+00 -2 4 -4
+639 1 0.0000000000000000e+00 6.4433131082849151e+00 1.0251510784119189e+00 9.6107662301690198e+00 3 -3 4
+2549 1 0.0000000000000000e+00 5.9640296324134523e+00 4.1337946415073379e-01 9.0956681951229008e+00 -2 -1 -1
+262 1 0.0000000000000000e+00 5.2811393733473597e+00 3.5934406280285391e-01 8.5891164287347781e+00 1 -5 2
+234 1 0.0000000000000000e+00 9.6419216045806273e+00 1.7326001248716920e+00 9.8537899380500402e+00 1 -4 1
+317 1 0.0000000000000000e+00 8.5913065633710044e+00 2.8351199968578339e-01 9.2601786613281085e+00 -5 5 3
+1201 1 0.0000000000000000e+00 8.1354707793859262e+00 1.4977334012462533e+00 8.0023912019319354e+00 3 3 -1
+1462 1 0.0000000000000000e+00 9.0202730743191601e+00 1.9161865317314821e+00 9.9925379872025619e+00 -2 -1 -4
+961 1 0.0000000000000000e+00 7.7629584331640302e+00 6.3798345062345141e-01 8.2495782269637754e+00 -5 7 0
+2944 3 1.0000000000000000e+00 8.5658309579845486e+00 4.4186842440943808e-01 8.3956921892036203e+00 -3 4 -3
+1906 1 0.0000000000000000e+00 9.2818896041802645e+00 9.6658577632589548e-01 7.9705175367654322e+00 2 -1 1
+2475 1 0.0000000000000000e+00 9.8030529613951209e+00 6.1624286506746651e-01 8.7441736404386656e+00 -4 -5 0
+60 1 0.0000000000000000e+00 9.2900516650675051e+00 1.8566693206724061e+00 9.3654400401194327e+00 -2 -4 0
+1709 1 0.0000000000000000e+00 9.4898033967161020e+00 1.0087245442315869e+00 9.7706302560684293e+00 4 1 2
+2855 2 -1.0000000000000000e+00 7.5010915352616037e+00 8.1221527170167429e-01 8.0758258879396116e+00 -4 4 -2
+1051 1 0.0000000000000000e+00 8.9405172827411690e+00 2.4456331827700923e+00 9.4261976096503801e+00 -1 2 6
+1980 1 0.0000000000000000e+00 8.3915357440997482e+00 8.4594229918280994e-01 9.8451256340953019e+00 -5 2 3
+386 1 0.0000000000000000e+00 8.8617628972885178e+00 2.0856708849135366e-01 7.5300729640247690e+00 1 -1 -7
+46 1 0.0000000000000000e+00 9.7540646752310902e+00 1.6969575595909159e+00 8.8201144086363659e+00 1 -3 1
+1445 1 0.0000000000000000e+00 9.7410856698178954e+00 4.9496389953468423e-01 8.0498859378137571e+00 2 6 -3
+289 1 0.0000000000000000e+00 8.6409139224785001e+00 8.1319740987714395e-01 8.4884039930668269e+00 -7 -7 -4
+1492 1 0.0000000000000000e+00 9.1198769827766686e+00 2.3048076088165459e+00 8.3666328822275542e+00 -2 2 0
+933 1 0.0000000000000000e+00 9.6718834784431333e+00 2.2872322163369896e+00 7.6854788089836381e+00 -1 6 0
+2223 1 0.0000000000000000e+00 8.1810966985615234e+00 2.4379978878008055e+00 8.9571694181226249e+00 3 -3 -2
+948 1 0.0000000000000000e+00 8.0227627330130211e+00 2.0033677475385057e+00 9.7518450544174033e+00 -6 3 -2
+2095 1 0.0000000000000000e+00 8.6711098799428292e+00 7.2439144328112082e-01 8.0180331042582207e+00 1 0 -1
+1953 1 0.0000000000000000e+00 9.0605425286308794e+00 1.9602795201552279e+00 9.0363142111437718e+00 -1 -1 0
+1857 1 0.0000000000000000e+00 9.1021862329796264e+00 1.8508242523556706e+00 8.1255099706056129e+00 7 2 -9
+579 1 0.0000000000000000e+00 8.3491440298035666e+00 1.5702098299506910e+00 8.8214677744440202e+00 9 10 0
+919 1 0.0000000000000000e+00 9.0830724868575174e+00 1.1328983900780498e+00 9.0170938282955575e+00 -3 3 1
+2426 1 0.0000000000000000e+00 7.6224036611150678e+00 2.2800539120970740e+00 8.8592386702067962e+00 1 1 -3
+1498 1 0.0000000000000000e+00 9.2058369952540104e+00 4.3825433605652309e-01 9.5990058780728820e+00 -5 4 2
+1336 1 0.0000000000000000e+00 9.2478713071690795e+00 4.9881150998055353e-02 9.1703764561691710e+00 0 2 1
+1993 1 0.0000000000000000e+00 8.6378894554193941e+00 1.7943651951195081e+00 9.4431190465252808e+00 4 1 -3
+2021 1 0.0000000000000000e+00 7.9046723070410172e+00 1.4738143257179712e+00 9.2861458057666031e+00 3 -5 0
+1246 1 0.0000000000000000e+00 7.5861199533386952e+00 2.1002619591019549e+00 8.2223983293250971e+00 -3 3 6
+1375 1 0.0000000000000000e+00 9.5517685887159942e+00 1.0015837698072998e+00 8.7673200418630675e+00 2 -4 -3
+2456 1 0.0000000000000000e+00 8.3422001841622464e+00 6.6764539644848309e-01 9.1122354363819138e+00 -5 3 1
+2655 1 0.0000000000000000e+00 7.6384423363150074e+00 2.4076280732802737e+00 7.5805542728108861e+00 -2 -2 -6
+2267 1 0.0000000000000000e+00 8.0711703106968269e+00 1.1967607520656416e+00 9.7879590613363856e+00 6 4 4
+1342 1 0.0000000000000000e+00 7.6378244877444148e+00 8.9065212556968065e-01 7.5450876370535482e+00 2 -2 4
+2780 1 0.0000000000000000e+00 8.5479446643908439e+00 1.9858225719877618e+00 7.7190544959017418e+00 -4 -4 -1
+603 1 0.0000000000000000e+00 7.6110657461706079e+00 1.4842975249737349e+00 8.6812992867068139e+00 4 7 1
+661 1 0.0000000000000000e+00 9.9513907236508654e+00 1.3601884818556564e+00 7.9561310091017221e+00 -2 -9 -2
+2778 1 0.0000000000000000e+00 8.8870481035193514e+00 1.3810779063482923e+00 8.2394283108021575e+00 -5 -1 2
+354 1 0.0000000000000000e+00 8.0501650545774321e+00 2.4872478231613610e-02 7.8124295576208951e+00 -6 0 -2
+2372 1 0.0000000000000000e+00 9.6969132149906372e+00 1.9525292578890823e+00 8.0569190777842064e+00 1 -3 -1
+1607 1 0.0000000000000000e+00 9.1403678446720473e+00 7.9010006858545770e-02 7.5241677765656521e+00 -5 0 -4
+2725 1 0.0000000000000000e+00 9.9263005957590114e+00 2.4393478092875136e+00 9.9829968996720932e+00 1 5 2
+1799 1 0.0000000000000000e+00 8.6629164862625405e+00 1.2451162696344289e+00 9.9916148587824107e+00 4 0 1
+115 1 0.0000000000000000e+00 5.9397532190339026e+00 3.5228542812018371e+00 8.8250969007811637e+00 -2 2 -3
+2112 1 0.0000000000000000e+00 7.4494064532832596e+00 2.5503392001286902e+00 9.5784335016266287e+00 -3 6 -2
+133 1 0.0000000000000000e+00 5.9080219314730265e+00 3.8522843192273308e+00 7.7405556791543111e+00 4 4 0
+2990 3 1.0000000000000000e+00 6.3293659580470090e+00 4.9783151157341017e+00 8.0421552202906597e+00 -2 -1 -4
+1116 1 0.0000000000000000e+00 5.3177890363097626e+00 2.9973034691870337e+00 8.3428992571162421e+00 -2 -1 -2
+1083 1 0.0000000000000000e+00 5.1266335603256703e+00 3.3915250840413278e+00 9.8992834664304148e+00 4 7 0
+1078 1 0.0000000000000000e+00 5.1441713659584973e+00 2.8359330259213906e+00 7.6604976270923144e+00 -3 7 -7
+286 1 0.0000000000000000e+00 6.4975866198271692e+00 4.6660716140009466e+00 7.5983103360438840e+00 -3 -1 -1
+2460 1 0.0000000000000000e+00 5.1420646672422583e+00 3.5529402028373869e+00 9.0685114850555539e+00 2 -4 -5
+2190 1 0.0000000000000000e+00 5.6722119946414011e+00 4.4434452009162895e+00 7.9138183601773076e+00 -1 2 0
+717 1 0.0000000000000000e+00 5.9534530006401729e+00 2.8093026064288105e+00 9.1180037479952407e+00 3 -1 -9
+1992 1 0.0000000000000000e+00 7.4041467143953597e+00 2.9501953243598265e+00 8.4765576942435530e+00 0 5 4
+62 1 0.0000000000000000e+00 5.1594663741232871e+00 3.8430700570400136e+00 8.6038076416558038e+00 -1 -8 1
+2364 1 0.0000000000000000e+00 5.5081986178490530e+00 4.9653450893801931e+00 9.4368048702811986e+00 3 -2 -5
+1047 1 0.0000000000000000e+00 7.4236845372261344e+00 4.2734413401080635e+00 9.2713761143075040e+00 -2 0 5
+699 1 0.0000000000000000e+00 6.8889919135835678e+00 4.2961176367284342e+00 8.5101651048041393e+00 2 -3 2
+1307 1 0.0000000000000000e+00 5.2989250657553830e+00 4.7181177950231268e+00 9.9107539934910100e+00 -3 5 -1
+117 1 0.0000000000000000e+00 7.0623756218682070e+00 2.6186983731838418e+00 7.5893886522089806e+00 3 -2 2
+391 1 0.0000000000000000e+00 7.1376855933313603e+00 2.6738273023612060e+00 8.3899463390654994e+00 1 0 0
+827 1 0.0000000000000000e+00 6.4249180000098640e+00 4.3303348382987847e+00 8.0552166666157721e+00 -3 -4 -4
+120 1 0.0000000000000000e+00 6.2977011310837270e+00 4.9756002844595004e+00 8.9484253978300572e+00 3 -2 0
+2958 3 1.0000000000000000e+00 5.3885454802325494e+00 4.5127922220333003e+00 7.9237980522574230e+00 3 -2 -2
+131 1 0.0000000000000000e+00 5.5248662768610464e+00 3.2801606835883983e+00 7.7179113524806988e+00 -1 -3 -5
+2262 1 0.0000000000000000e+00 6.8859211030715954e+00 3.4243872335269345e+00 7.8422685496192566e+00 1 -2 -2
+2133 1 0.0000000000000000e+00 5.3962070215325699e+00 2.6494052271247561e+00 9.2452354347381167e+00 3 1 5
+1442 1 0.0000000000000000e+00 6.4488016775078680e+00 2.8974460468089331e+00 8.2155386999575164e+00 7 -1 -1
+1785 1 0.0000000000000000e+00 6.5139887009837940e+00 4.4284860155408872e+00 9.9734202578073958e+00 3 -1 -1
+2893 2 -1.0000000000000000e+00 6.7810068104109211e+00 4.3172230718955360e+00 9.4523286997102485e+00 -4 6 -2
+1147 1 0.0000000000000000e+00 7.4033307690665877e+00 4.7967166380722368e+00 8.5886492767363638e+00 1 4 -1
+94 1 0.0000000000000000e+00 6.0553309225230905e+00 4.1901714180708369e+00 9.6558350271772628e+00 -3 1 0
+2937 3 1.0000000000000000e+00 5.8583778582335952e+00 4.4274149567348724e+00 8.5353640848046997e+00 -3 2 -4
+2417 1 0.0000000000000000e+00 6.0815581138777439e+00 4.7327842892583707e+00 8.7491412630189185e+00 0 -11 2
+1933 1 0.0000000000000000e+00 5.9628482302822494e+00 3.8061378025542036e+00 8.4606999776414789e+00 1 -3 1
+725 1 0.0000000000000000e+00 7.4525581734229958e+00 3.0671607371277703e+00 9.5320122857675322e+00 4 -4 2
+2005 1 0.0000000000000000e+00 7.2712678422724792e+00 4.2151976140082468e+00 7.7489614158409763e+00 3 -1 4
+1088 1 0.0000000000000000e+00 6.2935516352564393e+00 2.8573833422761954e+00 9.7471548242901154e+00 -3 -4 -6
+2624 1 0.0000000000000000e+00 5.9790320121480311e+00 2.9311632275831494e+00 8.0768640985014439e+00 7 6 3
+1130 1 0.0000000000000000e+00 7.1574908832407642e+00 3.8299095420812130e+00 8.9137428492785631e+00 -5 -7 -2
+807 1 0.0000000000000000e+00 5.1975938037955398e+00 4.0654910986844248e+00 7.5258744387365271e+00 6 -4 -2
+1614 1 0.0000000000000000e+00 6.5861711530511871e+00 3.5694987097987818e+00 9.3818279252902350e+00 2 4 -5
+1328 1 0.0000000000000000e+00 5.4393955532520222e+00 4.5378133857610674e+00 8.9474406448557584e+00 3 -1 -4
+113 1 0.0000000000000000e+00 6.6019238467999362e+00 3.4630649272051781e+00 8.4725073076632977e+00 5 -3 4
+1161 1 0.0000000000000000e+00 6.8684209981763535e+00 3.2743242872641134e+00 9.0169170772022316e+00 1 6 -5
+513 1 0.0000000000000000e+00 6.7583995175790719e+00 2.6573283459482702e+00 9.5344609482832841e+00 0 3 -4
+1899 1 0.0000000000000000e+00 5.8736047995561460e+00 3.8658928411417204e+00 9.4987180739624346e+00 1 2 0
+2586 1 0.0000000000000000e+00 5.8138948398337345e+00 3.4214810488545928e+00 9.6116646600374409e+00 0 4 -4
+805 1 0.0000000000000000e+00 6.4735921830782726e+00 4.2329830891726790e+00 8.6439636999534617e+00 0 5 -10
+2854 2 -1.0000000000000000e+00 7.4086088547471940e+00 3.2641359912264214e+00 7.8802930753055573e+00 3 1 -7
+1394 1 0.0000000000000000e+00 6.8898254440526232e+00 4.7196476653820447e+00 7.5738327036002913e+00 2 8 -1
+401 1 0.0000000000000000e+00 7.3167907320456491e+00 4.4124681138058026e+00 9.9822471714316396e+00 -6 0 -6
+1863 1 0.0000000000000000e+00 9.0995003160453845e+00 3.5458187528928669e+00 9.2375849604438471e+00 5 -1 0
+2553 1 0.0000000000000000e+00 9.6490571730362493e+00 3.1650565914618811e+00 9.4331277138050762e+00 -4 -4 0
+208 1 0.0000000000000000e+00 7.8264370142379223e+00 4.3933115132267808e+00 8.3019568318813857e+00 0 -5 -1
+545 1 0.0000000000000000e+00 7.9735037251285421e+00 3.6117064031281059e+00 9.6075114034518414e+00 4 -1 -3
+1762 1 0.0000000000000000e+00 8.9734360121437966e+00 3.0348995123443041e+00 9.0118256872950706e+00 2 -5 -5
+2272 1 0.0000000000000000e+00 8.7085906633585157e+00 4.3951238824189929e+00 8.3841233046196901e+00 -4 -3 1
+2849 2 -1.0000000000000000e+00 7.6015646725569557e+00 3.6612392594709813e+00 9.0812034075858232e+00 0 1 -6
+2198 1 0.0000000000000000e+00 9.0239947679500130e+00 4.1903135462577961e+00 8.7348924864291639e+00 -4 -1 1
+2299 1 0.0000000000000000e+00 8.4196047047459039e+00 3.7633807379892659e+00 8.9774847269542697e+00 2 -1 -7
+2045 1 0.0000000000000000e+00 8.4885937141746854e+00 4.8521543701450138e+00 8.5469321903700841e+00 6 1 -3
+2249 1 0.0000000000000000e+00 7.6382305088694986e+00 4.9413412643774688e+00 9.2580554487336517e+00 7 -1 -2
+1464 1 0.0000000000000000e+00 9.6272285345928665e+00 2.6997355339611246e+00 9.1226590779890167e+00 1 -1 0
+2989 3 1.0000000000000000e+00 9.4517661073369617e+00 4.1376237446875459e+00 9.7542541940254708e+00 1 -6 1
+1381 1 0.0000000000000000e+00 9.3090274651343812e+00 4.8030151301736206e+00 9.6964640827342645e+00 -1 -2 1
+2448 1 0.0000000000000000e+00 9.2164823292252880e+00 3.1031728388043707e+00 7.6218629419628439e+00 4 -6 -4
+1259 1 0.0000000000000000e+00 9.3949165580723264e+00 4.5280484589057357e+00 8.0985821744315238e+00 -3 -4 -3
+2017 1 0.0000000000000000e+00 9.7190488825619941e+00 3.4146324361679206e+00 9.9788950177285773e+00 -1 -1 -3
+1416 1 0.0000000000000000e+00 8.7295027460542460e+00 2.5853060084583386e+00 8.5277921426960663e+00 -3 -4 -5
+2245 1 0.0000000000000000e+00 8.4835730297970056e+00 3.2979360898512278e+00 7.9220324315676596e+00 -3 -2 -4
+1769 1 0.0000000000000000e+00 9.4102393010459569e+00 4.0148992672255162e+00 7.8531253416487550e+00 0 -5 -5
+1121 1 0.0000000000000000e+00 9.5060326841913252e+00 4.8426263214537570e+00 9.0422602967871022e+00 2 6 0
+908 1 0.0000000000000000e+00 8.7273231811662324e+00 4.2561072989215907e+00 7.5211744037201820e+00 0 -1 -2
+2292 1 0.0000000000000000e+00 9.8314174384952349e+00 3.2495376347937337e+00 7.8457034814309221e+00 3 1 0
+1754 1 0.0000000000000000e+00 9.5812335967703923e+00 4.4534128541933446e+00 7.5194946751159577e+00 3 -1 -3
+1261 1 0.0000000000000000e+00 8.9275828130359152e+00 3.3166830600074535e+00 8.3938640544808258e+00 -4 2 7
+2794 1 0.0000000000000000e+00 8.8861360024523890e+00 4.7391396864661912e+00 7.7537942814977718e+00 -2 1 -2
+2087 1 0.0000000000000000e+00 9.2211588490901573e+00 3.5335696503994987e+00 8.4980455145171536e+00 1 -4 5
+1167 1 0.0000000000000000e+00 9.6225086426937718e+00 4.2713944368367800e+00 9.2497996540484788e+00 5 0 0
+2513 1 0.0000000000000000e+00 7.9019314454335410e+00 3.8421028776623509e+00 8.0425953961714303e+00 6 1 -5
+643 1 0.0000000000000000e+00 8.6197235219329222e+00 4.2548925556651866e+00 9.4015918951622499e+00 -5 -2 0
+2623 1 0.0000000000000000e+00 9.9394310482165942e+00 4.6173902299006535e+00 8.4894224346754950e+00 -2 3 4
+644 1 0.0000000000000000e+00 8.2997960556910240e+00 2.7753956677988518e+00 9.1713723274215262e+00 -1 -2 -2
+217 1 0.0000000000000000e+00 9.1545125829859550e+00 2.9001452312023783e+00 7.8138447434770644e+00 4 -7 -4
+1052 1 0.0000000000000000e+00 8.7014933034737432e+00 3.9026619072365576e+00 7.8181401095432319e+00 2 6 -6
+2195 1 0.0000000000000000e+00 8.2321809346177552e+00 3.0929984126554060e+00 8.4634706376588511e+00 3 7 5
+2137 1 0.0000000000000000e+00 7.6864417054114575e+00 3.3993307026743160e+00 8.6918873717843841e+00 -3 0 -2
+659 1 0.0000000000000000e+00 9.7173902672412762e+00 4.6722772213036841e+00 9.9476973696327367e+00 2 0 1
+1905 1 0.0000000000000000e+00 9.6517388382226201e+00 3.6933922712251914e+00 8.9742124220575690e+00 1 -2 0
+2823 2 -1.0000000000000000e+00 8.3525331402118788e+00 2.8947950375779414e+00 9.8143168065061754e+00 -3 -3 -1
+2953 3 1.0000000000000000e+00 7.9889961101473803e+00 2.6436275594210339e+00 7.9399004079207369e+00 -2 1 4
+453 1 0.0000000000000000e+00 8.1905813164661918e+00 4.3672634866398914e+00 9.0887024603001816e+00 -3 0 -2
+1793 1 0.0000000000000000e+00 9.8273211655081667e+00 4.1656353376490571e+00 9.5319434342989542e+00 4 3 -1
+293 1 0.0000000000000000e+00 8.5524181407240274e+00 2.6268655213763128e+00 7.5139269235961708e+00 1 -4 3
+2641 1 0.0000000000000000e+00 5.7717188844257210e+00 6.9685641674419010e+00 4.6462671162736829e-01 1 1 -1
+2963 3 1.0000000000000000e+00 6.0276738223190467e+00 7.3625979458949438e+00 1.1497251254460839e+00 1 3 -2
+1669 1 0.0000000000000000e+00 6.5719974959124263e+00 6.6697430852086681e+00 1.3772961660039531e+00 3 -1 -1
+88 1 0.0000000000000000e+00 7.2403211836153147e+00 6.8878104314758186e+00 2.1972994852167544e+00 -3 0 0
+1011 1 0.0000000000000000e+00 7.2823677311284989e+00 5.5685038443015049e+00 1.7089402349225984e+00 -4 -1 -3
+92 1 0.0000000000000000e+00 6.6507583039837588e+00 6.8217604079846357e+00 2.0722762936758077e+00 -4 9 4
+1106 1 0.0000000000000000e+00 6.7287384644523556e+00 6.3962550499078379e+00 9.7327908919268069e-02 2 9 3
+2951 3 1.0000000000000000e+00 5.8108177039476150e+00 6.4664080874879248e+00 1.9526749345205896e+00 0 1 3
+2286 1 0.0000000000000000e+00 6.5966238159590116e+00 5.3363566729523768e+00 3.0820393449491407e-01 -1 0 -3
+808 1 0.0000000000000000e+00 6.8898457743262176e+00 7.1012118491711833e+00 1.7036054712086127e-01 -5 3 3
+648 1 0.0000000000000000e+00 5.6390073707535997e+00 6.3626713796078942e+00 9.5989075486101375e-02 -4 -2 -1
+986 1 0.0000000000000000e+00 6.1721991836154322e+00 5.2581526524949549e+00 1.7919212189802900e+00 -3 -5 0
+1971 1 0.0000000000000000e+00 5.5533679621824303e+00 7.2420143109141231e+00 1.4275776944252252e+00 -3 7 5
+2875 2 -1.0000000000000000e+00 6.7466319920788829e+00 7.2172892296257336e+00 1.0602726938873281e+00 3 -1 0
+2614 1 0.0000000000000000e+00 5.0696225831714994e+00 7.2162344044727025e+00 1.9749900028001275e+00 4 0 -2
+2738 1 0.0000000000000000e+00 6.8495239921863877e+00 5.4801465235573747e+00 2.2920412333397500e+00 10 3 3
+1127 1 0.0000000000000000e+00 6.0845886401275751e+00 5.8835947828611381e+00 1.9753472573825448e+00 2 -1 3
+1589 1 0.0000000000000000e+00 7.1771989468632986e+00 5.3230034109041373e+00 8.0444006605197471e-01 2 -2 -1
+2381 1 0.0000000000000000e+00 5.1646387525344251e+00 5.5262263584451974e+00 1.8906379820249659e+00 1 2 -1
+2536 1 0.0000000000000000e+00 5.7326070557482955e+00 6.9534031176202147e+00 2.4278801030832478e+00 -3 -7 5
+2051 1 0.0000000000000000e+00 5.0739421141343790e+00 6.2225760515212540e+00 2.0841466021207773e+00 -8 -9 4
+2743 1 0.0000000000000000e+00 7.0742512782423477e+00 6.3905257447667125e+00 1.0310800125622823e+00 5 -1 1
+68 1 0.0000000000000000e+00 6.2028634292793123e+00 6.0724695875492092e+00 5.9691392159152290e-01 -3 0 -3
+2046 1 0.0000000000000000e+00 7.4928717418293784e+00 5.6792980858914728e+00 9.4803597417778551e-01 -2 -2 0
+2766 1 0.0000000000000000e+00 6.2329821192762109e+00 7.0242596590650708e+00 2.2751821081299162e+00 1 -2 -2
+621 1 0.0000000000000000e+00 5.2763294250695365e+00 5.3703984029383651e+00 1.4031988863020817e+00 1 -6 -1
+371 1 0.0000000000000000e+00 5.1984821451309218e+00 5.0979709376299516e+00 6.5359055236667207e-01 2 4 -1
+273 1 0.0000000000000000e+00 5.1989627209413856e+00 6.8473216693570240e+00 8.6366720586742718e-01 -6 -5 -2
+1847 1 0.0000000000000000e+00 5.1876167229993770e+00 5.1945304971859052e+00 2.3639061011036140e+00 0 -1 3
+2103 1 0.0000000000000000e+00 6.5173448255137183e+00 5.8377074952528929e+00 1.3422038141317354e+00 0 2 5
+1005 1 0.0000000000000000e+00 7.4034945117108633e+00 7.2800269721791908e+00 1.4095130181774691e+00 0 3 -2
+1728 1 0.0000000000000000e+00 6.7403093697119543e+00 5.3498967448059744e+00 1.1679625163756155e+00 -3 5 3
+2484 1 0.0000000000000000e+00 5.9704865457420038e+00 5.0420250946271787e+00 8.9078825369990122e-02 -5 -1 5
+2617 1 0.0000000000000000e+00 7.1769267884863472e+00 6.6400754270004549e+00 2.0070309852681181e+00 -2 2 -3
+456 1 0.0000000000000000e+00 5.6788763582638211e+00 5.8740094200482185e+00 2.3755654954688117e+00 -8 -6 4
+203 1 0.0000000000000000e+00 6.2839248972022297e+00 7.3713503774043803e+00 5.6288193568664968e-01 -4 -3 1
+2027 1 0.0000000000000000e+00 5.4488849702040421e+00 6.0460377637914124e+00 1.4421665059494715e+00 2 4 4
+938 1 0.0000000000000000e+00 5.3297152922261999e+00 6.3269555347047888e+00 6.5423671675019923e-01 -6 0 2
+397 1 0.0000000000000000e+00 7.3487469460634633e+00 6.2667774303477310e+00 1.5932330619732142e+00 8 1 3
+1217 1 0.0000000000000000e+00 6.1212956809686307e+00 5.5817485305056316e+00 8.8128891704609280e-01 3 0 -2
+2406 1 0.0000000000000000e+00 6.7342777993166854e+00 6.9415241133148351e+00 2.8527803401909546e-01 0 2 3
+2434 1 0.0000000000000000e+00 5.9493316865918153e+00 6.5305074427875445e+00 1.3402594858054968e+00 -2 -4 -3
+347 1 0.0000000000000000e+00 6.2247672364113571e+00 5.8007335599057743e+00 1.9309711663213527e-01 -6 3 1
+395 1 0.0000000000000000e+00 7.3703509093990158e+00 6.6767857752910800e+00 8.4744241103012163e-01 2 2 4
+2298 1 0.0000000000000000e+00 5.4946283243616216e+00 5.6358238463289014e+00 1.8682454028083376e-01 3 -2 0
+1122 1 0.0000000000000000e+00 7.1901971144244818e+00 5.0762684993364511e+00 1.7517862503027876e-01 0 -9 0
+2540 1 0.0000000000000000e+00 7.0209336058091640e+00 5.8279349211386631e+00 9.9487662959359235e-02 -7 -3 1
+533 1 0.0000000000000000e+00 5.5800160708130591e+00 7.0675522464751879e+00 1.9379689465858136e+00 -6 2 -4
+2386 1 0.0000000000000000e+00 6.7429810982715859e+00 6.0939149439448723e+00 2.1600154838562173e+00 1 4 -5
+842 1 0.0000000000000000e+00 9.3005085647581307e+00 6.9260865593514636e+00 6.5868863267424538e-01 -4 1 3
+1975 1 0.0000000000000000e+00 7.8204177315152519e+00 6.3326538736073870e+00 2.3178084160095813e+00 -7 -4 3
+2009 1 0.0000000000000000e+00 7.7100468894259278e+00 6.9781865806178702e+00 1.5642743645909601e-01 1 -3 1
+282 1 0.0000000000000000e+00 8.3748264796487515e+00 6.5576766932591379e+00 9.2513782848480075e-01 3 8 -3
+2117 1 0.0000000000000000e+00 8.0016807608578322e+00 5.1474049875113259e+00 5.6045448885591531e-01 -5 -1 -5
+1185 1 0.0000000000000000e+00 7.9178931189104906e+00 7.0422286659447870e+00 1.2560552015778081e+00 0 -4 -2
+2874 2 -1.0000000000000000e+00 7.6290509663108681e+00 5.6478570742945884e+00 2.4621332231666475e+00 4 -1 -4
+1590 1 0.0000000000000000e+00 9.2153087569703640e+00 5.5078653393777879e+00 2.4612417340453336e+00 -1 -1 -2
+2850 2 -1.0000000000000000e+00 9.1084966236507867e+00 6.4047698409472469e+00 3.1956466934359123e-01 -2 -1 7
+82 1 0.0000000000000000e+00 9.0715980256337794e+00 6.0367980334368294e+00 2.1808907896266488e-01 -6 3 5
+1638 1 0.0000000000000000e+00 7.6765649019927675e+00 7.2831813153062299e+00 1.9337810160404263e+00 -2 5 6
+2532 1 0.0000000000000000e+00 9.1725225527222438e+00 5.8449570391794650e+00 1.9056237487057222e+00 -3 4 1
+368 1 0.0000000000000000e+00 8.9248521458470229e+00 6.0184846254120119e+00 1.1619543810019646e+00 -4 4 -2
+2700 1 0.0000000000000000e+00 8.9687324817829328e+00 5.1046744882725790e+00 5.9129774737883911e-01 3 1 -3
+884 1 0.0000000000000000e+00 8.1867729361402830e+00 7.2931237207965820e+00 2.0179253988643238e+00 -2 4 5
+44 1 0.0000000000000000e+00 8.8157100434014950e+00 7.1665368531394336e+00 1.6368355209928322e+00 -4 -4 -3
+2789 1 0.0000000000000000e+00 9.8594081940133851e+00 6.0333327071312119e+00 1.0942039015560330e+00 0 0 -1
+1072 1 0.0000000000000000e+00 8.5565335816320385e+00 5.0983313275284239e+00 1.9048068097100586e+00 -2 -2 -2
+103 1 0.0000000000000000e+00 8.2953984758020241e+00 7.4099375446896500e+00 9.4689897295098979e-01 4 1 -3
+2271 1 0.0000000000000000e+00 9.3191901052626580e+00 7.2080977366961472e+00 2.1275379971519808e+00 -8 1 2
+1 1 0.0000000000000000e+00 9.9184969750560263e+00 7.1876312912291187e+00 1.2949764067357750e+00 -3 2 -6
+1474 1 0.0000000000000000e+00 8.4863236395560158e+00 6.6525455821737944e+00 2.4450794281038455e+00 0 -4 -1
+1086 1 0.0000000000000000e+00 8.4571711298676071e+00 6.6715891069248530e+00 1.5801406619623930e+00 -4 -2 4
+2559 1 0.0000000000000000e+00 8.7895533543924955e+00 6.1017948282686287e+00 2.3612168913500131e+00 0 5 0
+1113 1 0.0000000000000000e+00 7.9810257770999371e+00 5.0991862610217202e+00 1.8678695516042989e+00 -4 2 -1
+247 1 0.0000000000000000e+00 8.6198804490573178e+00 5.2407858264886862e+00 1.0148946183872238e+00 5 -1 0
+1284 1 0.0000000000000000e+00 7.7313763570675107e+00 6.0663574945043326e+00 8.0587734535083655e-01 3 -3 5
+939 1 0.0000000000000000e+00 9.2837302526346530e+00 5.6430209427758475e+00 4.1472981657440379e-02 2 0 -3
+2569 1 0.0000000000000000e+00 8.3844483915198911e+00 6.9291338928683581e+00 5.1516291592614538e-01 -3 4 -3
+1424 1 0.0000000000000000e+00 8.6381165777892548e+00 7.0388506466108209e+00 1.1232172726956811e+00 -3 -2 -1
+240 1 0.0000000000000000e+00 8.3233571888103963e+00 5.7395532008505459e+00 2.3438960152472839e+00 -1 -4 0
+2583 1 0.0000000000000000e+00 7.8598271707176828e+00 6.1434457183334894e+00 1.6219587642676629e+00 1 0 0
+1443 1 0.0000000000000000e+00 8.8294786724820504e+00 5.9649045824407914e+00 7.5923844884234404e-01 -3 0 -8
+984 1 0.0000000000000000e+00 9.6072468525890518e+00 5.8641961421848796e+00 1.5666114106491367e+00 -3 -1 3
+1240 1 0.0000000000000000e+00 9.2115072399491300e+00 6.5041889901592915e+00 1.6128804508555923e+00 -6 1 -2
+2427 1 0.0000000000000000e+00 8.2884301097153692e+00 5.4828912601658821e+00 8.1200368086964347e-02 -2 2 2
+2100 1 0.0000000000000000e+00 9.8277769879695409e+00 7.4629642169151102e+00 1.8556106704757411e+00 -7 4 -3
+650 1 0.0000000000000000e+00 9.9446548490731370e+00 6.6539274280289202e+00 2.3435542985675708e+00 -1 2 -2
+1539 1 0.0000000000000000e+00 8.0602541341001928e+00 6.2492749921005268e+00 4.2367268084460091e-01 3 -3 -2
+2105 1 0.0000000000000000e+00 9.3919585411716273e+00 5.2272758567787889e+00 1.2441054231124831e+00 -5 0 -2
+2243 1 0.0000000000000000e+00 9.6858744537327670e+00 5.7523331896400904e+00 2.3257808515705429e+00 5 -2 1
+2707 1 0.0000000000000000e+00 9.9088886993581546e+00 6.1491473972840449e+00 5.4298345320786978e-01 0 -2 -3
+829 1 0.0000000000000000e+00 8.2304225228592482e+00 5.9206375549954835e+00 1.3418974779260950e+00 0 2 0
+2709 1 0.0000000000000000e+00 8.4287172461798079e+00 6.0398074292706321e+00 2.5420817983802640e-01 3 -1 -1
+548 1 0.0000000000000000e+00 8.8789734723144598e+00 7.4473761613650655e+00 4.6142884540643647e-01 1 -6 -4
+712 1 0.0000000000000000e+00 8.2405302371206801e+00 5.4931686050859954e+00 1.6898286560346876e+00 -6 -1 4
+47 1 0.0000000000000000e+00 9.9807106008922926e+00 5.0247508294490277e+00 1.9714382279991296e+00 2 0 1
+1296 1 0.0000000000000000e+00 5.7119184794871094e+00 9.3217871697767585e+00 2.9567589139364464e-01 1 2 6
+920 1 0.0000000000000000e+00 6.8783352197571608e+00 9.8113621514271347e+00 2.2228792821340821e+00 4 -2 -1
+1225 1 0.0000000000000000e+00 7.0096003344321618e+00 9.1344846590365130e+00 1.5925075954680687e+00 -5 2 3
+1897 1 0.0000000000000000e+00 5.4129675733375775e+00 8.3976606086299874e+00 1.4022009026319335e+00 -4 -4 1
+1616 1 0.0000000000000000e+00 7.3207916143046035e+00 9.7264302929321484e+00 1.8242970086539112e+00 -1 1 -3
+1397 1 0.0000000000000000e+00 5.4620756453759833e+00 9.5511654070698491e+00 2.2536511578371403e+00 -5 -5 2
+724 1 0.0000000000000000e+00 5.2719550638150015e+00 7.7539193338968833e+00 1.3658776729000799e-01 1 -1 4
+615 1 0.0000000000000000e+00 6.2734353581002971e+00 8.2257873855678412e+00 1.1369402092962424e+00 -4 -4 2
+2429 1 0.0000000000000000e+00 5.5464381875355144e+00 9.6839765125461259e+00 1.0964742095381332e+00 -3 2 1
+2929 3 1.0000000000000000e+00 7.1906425853127596e+00 7.9084123560642441e+00 1.9723669526557717e+00 -5 3 5
+646 1 0.0000000000000000e+00 5.7946579633745712e+00 8.0878578925946822e+00 5.5959494649267472e-01 6 -7 -5
+820 1 0.0000000000000000e+00 6.3631456448394248e+00 9.8296158339096937e+00 1.3031990164409197e+00 3 3 -5
+1670 1 0.0000000000000000e+00 6.3399805968284539e+00 8.8022003824632478e+00 5.3950151402658686e-01 7 2 -8
+1494 1 0.0000000000000000e+00 6.8899134658199150e+00 7.9248491796381231e+00 1.2663838156999925e+00 0 -7 -2
+488 1 0.0000000000000000e+00 5.0865605949365822e+00 8.6552779103867454e+00 1.0945444413780585e-03 2 3 -3
+1482 1 0.0000000000000000e+00 6.5031936191477051e+00 9.2004204564520862e+00 1.8862545939550690e+00 -3 -5 5
+716 1 0.0000000000000000e+00 5.5593134829829109e+00 8.6066589749414426e+00 9.3933858250399871e-01 -2 -5 -2
+2660 1 0.0000000000000000e+00 6.7929632628304555e+00 9.1411393814252282e+00 7.7102428504378506e-01 -1 -4 0
+982 1 0.0000000000000000e+00 6.3770121792770720e+00 9.1666259890119921e+00 1.1849720481416310e+00 -3 0 5
+2035 1 0.0000000000000000e+00 5.7827676206966716e+00 7.9785755927160542e+00 1.1986106685178815e+00 1 1 1
+2013 1 0.0000000000000000e+00 6.0860352809694316e+00 7.8902950552743203e+00 1.8798272459852259e+00 2 8 3
+1792 1 0.0000000000000000e+00 5.0239200609318013e+00 9.2871166677000030e+00 9.2463778697125054e-01 0 -3 -2
+1766 1 0.0000000000000000e+00 7.2873821484245536e+00 8.5566941739074505e+00 2.7182220335381257e-01 1 -1 6
+1881 1 0.0000000000000000e+00 5.2426988057344470e+00 8.9820333338421587e+00 1.5783068253729797e+00 -3 1 -3
+2982 3 1.0000000000000000e+00 6.6813107702976300e+00 8.1843208216262902e+00 4.0414737699762332e-01 1 -3 8
+877 1 0.0000000000000000e+00 6.5959362944010529e+00 8.7473209148773350e+00 1.4792003352406546e+00 1 -1 -3
+2842 2 -1.0000000000000000e+00 6.1270033565966378e+00 9.7469931065544522e+00 2.2541956943202073e+00 -2 -3 4
+2905 3 1.0000000000000000e+00 5.6240329528498059e+00 9.1819244629146937e+00 2.1670516826679487e+00 -2 2 2
+1049 1 0.0000000000000000e+00 5.9003515673517803e+00 8.2707721194360406e+00 2.1910583307122615e+00 2 0 -2
+1852 1 0.0000000000000000e+00 5.9587439677190632e+00 9.6040004132986319e+00 1.3033763038305728e+00 -3 1 -2
+1596 1 0.0000000000000000e+00 7.0788295373611199e+00 7.8877222063695118e+00 8.1433935197925800e-01 -3 -4 -1
+825 1 0.0000000000000000e+00 5.0971637364154283e+00 9.7088633966702282e+00 2.0133735353538276e+00 6 -6 -5
+516 1 0.0000000000000000e+00 5.8519170499430260e+00 8.8197258338396889e+00 1.8177464272850135e+00 0 2 4
+742 1 0.0000000000000000e+00 6.5707815031199290e+00 7.5744640733069311e+00 1.6168661784367997e+00 1 4 0
+446 1 0.0000000000000000e+00 7.2498756460454157e+00 8.7624056895292775e+00 8.5365322594056403e-01 -1 0 3
+2409 1 0.0000000000000000e+00 6.8774362357520635e+00 7.8814910479428759e+00 2.0082376289455572e+00 -1 -2 2
+2462 1 0.0000000000000000e+00 5.7873341520965136e+00 9.1311013490257942e+00 8.9724147524767650e-01 0 0 -2
+1159 1 0.0000000000000000e+00 5.8327864531614679e+00 7.5650123400431220e+00 6.3939738639338120e-02 2 1 -1
+1548 1 0.0000000000000000e+00 6.1935487786314916e+00 8.8225941156184753e+00 1.9963337187673003e-01 -1 -1 -2
+2212 1 0.0000000000000000e+00 7.0385925780075667e+00 8.5757392387698221e+00 1.7680214746058998e+00 0 0 4
+1651 1 0.0000000000000000e+00 7.1833059169174192e+00 9.9635419454214968e+00 1.0242861795401843e+00 -3 -1 2
+257 1 0.0000000000000000e+00 7.2490401160695495e+00 8.0278256412211508e+00 5.7719868351825701e-02 2 6 -4
+95 1 0.0000000000000000e+00 5.0006851516620481e+00 7.6073631059433611e+00 9.1379648449303474e-01 1 -4 -4
+218 1 0.0000000000000000e+00 8.4827892298753955e+00 9.8634612076355470e+00 4.8232945633117363e-01 1 0 -5
+2894 2 -1.0000000000000000e+00 7.6910167023951956e+00 9.8356330938762948e+00 1.2708128695049934e+00 -4 6 -2
+1865 1 0.0000000000000000e+00 9.6041584236855808e+00 7.8410083357166123e+00 1.4064367234041075e+00 1 -2 4
+2718 1 0.0000000000000000e+00 8.4923699720338739e+00 8.9977260006995223e+00 1.3656191680890395e+00 4 -5 -2
+797 1 0.0000000000000000e+00 8.3785482010046231e+00 7.9686849899137675e+00 2.4028142673258075e+00 -2 0 -2
+2040 1 0.0000000000000000e+00 7.7896247852929008e+00 8.7096305266019556e+00 1.3541444883230764e+00 -1 2 -2
+2954 3 1.0000000000000000e+00 9.7000263747196804e+00 7.6728889628947945e+00 2.3467251350149607e-01 0 -1 -9
+2933 3 1.0000000000000000e+00 7.6246231813292029e+00 9.7706732374546394e+00 2.1208982182720293e+00 -1 3 1
+1528 1 0.0000000000000000e+00 9.4753795258836444e+00 8.6934780398268892e+00 2.3660095305536890e+00 -4 1 3
+183 1 0.0000000000000000e+00 9.0647786345734005e+00 9.8016759993113016e+00 1.8591439604103202e+00 -2 -1 1
+2167 1 0.0000000000000000e+00 7.5676052720369507e+00 9.0542664981207501e+00 1.8886115358257722e+00 0 2 -3
+2191 1 0.0000000000000000e+00 7.9789946014219062e+00 8.1076971117309338e+00 7.3495189393365168e-01 -2 1 0
+36 1 0.0000000000000000e+00 8.7883341861342661e+00 8.1809345137016525e+00 8.7456024269899046e-01 -2 2 -2
+1913 1 0.0000000000000000e+00 9.1690336483754358e+00 8.2131917403813475e+00 1.4800699413660370e+00 5 4 1
+1189 1 0.0000000000000000e+00 8.4229787223231707e+00 9.6359054873349148e+00 1.1393524920435176e+00 4 0 -6
+1540 1 0.0000000000000000e+00 9.4053353875247243e+00 9.8778691687565026e+00 2.4348167966418259e+00 -4 -4 -4
+1502 1 0.0000000000000000e+00 9.7552915311710269e+00 8.5425306146510351e+00 2.2678074923443972e-01 3 -3 1
+441 1 0.0000000000000000e+00 8.7771739498811634e+00 7.5878147223318191e+00 1.6996886998464795e+00 -5 -5 -3
+2878 2 -1.0000000000000000e+00 9.2869637803940339e+00 8.9419973827643293e+00 9.4917017158263872e-01 -3 2 -1
+2296 1 0.0000000000000000e+00 8.0817198739573861e+00 8.9454530810772095e+00 8.3966588419922883e-01 -6 0 2
+348 1 0.0000000000000000e+00 7.5170434070428511e+00 8.1500942136055343e+00 1.1834033775595685e+00 -4 -1 -2
+769 1 0.0000000000000000e+00 9.3039100994986423e+00 9.4007329783003968e+00 6.1951550292630087e-01 -5 -6 -1
+1637 1 0.0000000000000000e+00 9.2544173019158986e+00 7.7921136123341936e+00 7.4435969073732688e-01 0 -2 -5
+1928 1 0.0000000000000000e+00 8.2986434867050036e+00 9.8605074354245765e+00 1.9318773145415762e+00 -4 -2 2
+2841 2 -1.0000000000000000e+00 8.1438888043170135e+00 8.7890607827789360e+00 2.4311014829433848e+00 -7 -3 0
+1435 1 0.0000000000000000e+00 9.2960644080487018e+00 9.2908923364686888e+00 2.2066036178415911e+00 8 -4 -1
+1919 1 0.0000000000000000e+00 7.7995025832405869e+00 8.2614092559923407e+00 2.0889301624066707e+00 3 0 4
+2677 1 0.0000000000000000e+00 8.8318690627141354e+00 8.9525396968007271e+00 2.3599981601495976e+00 -8 -2 0
+2741 1 0.0000000000000000e+00 8.9822302274649619e+00 9.5492180016204422e+00 1.3944922066453584e+00 3 -4 2
+83 1 0.0000000000000000e+00 8.7153577652138807e+00 8.5407692558382298e+00 5.4412197870597279e-01 1 1 -7
+80 1 0.0000000000000000e+00 8.9640906649030754e+00 8.7448737067784243e+00 1.3050067599833191e+00 -7 7 0
+2835 2 -1.0000000000000000e+00 8.4600635578452650e+00 9.1181440728042169e+00 1.5160197422120678e-01 5 -4 2
+2366 1 0.0000000000000000e+00 9.7984366441142328e+00 8.5327791728307947e+00 1.1823831167116752e+00 4 -3 -2
+913 1 0.0000000000000000e+00 9.8622121238891562e+00 9.8517303773752971e+00 1.7791411782598543e+00 -1 -3 4
+288 1 0.0000000000000000e+00 8.2799818465357227e+00 9.1233880574741448e+00 1.8036012689186052e+00 0 3 5
+673 1 0.0000000000000000e+00 7.7911158568601486e+00 9.4197957515362027e+00 5.5402807042329605e-01 -2 -1 0
+1377 1 0.0000000000000000e+00 9.9368274631268729e+00 9.7904216725545048e+00 5.0201650652972968e-02 -1 -6 4
+1976 1 0.0000000000000000e+00 9.8048806536190458e+00 7.6401255952136671e+00 1.0448530361130597e+00 4 0 0
+2825 2 -1.0000000000000000e+00 8.7325386721463047e+00 8.5440490751702605e+00 2.6885811577687868e-01 -4 1 4
+2643 1 0.0000000000000000e+00 8.4354888588738337e+00 8.0115920456424448e+00 1.7104394343785081e+00 -1 0 0
+734 1 0.0000000000000000e+00 7.6551423365962847e+00 9.7743736509231844e+00 2.4012602358826651e+00 -1 -5 1
+325 1 0.0000000000000000e+00 8.9334518922739701e+00 8.5038691721187316e+00 2.0156682455401831e+00 4 -5 5
+1882 1 0.0000000000000000e+00 7.8664214028052148e+00 8.6112813074230328e+00 1.7863014170408681e-01 3 -4 7
+930 1 0.0000000000000000e+00 7.7715749246323735e+00 7.6684927638561451e+00 5.7433029892969523e-01 2 0 -1
+75 1 0.0000000000000000e+00 9.9853130505667114e+00 8.0700916700187335e+00 6.4291379801283233e-01 -3 3 5
+356 1 0.0000000000000000e+00 9.4648026342517273e+00 8.1472898398840154e+00 8.5039290441244475e-03 0 2 7
+1076 1 0.0000000000000000e+00 6.6137684524312883e+00 7.3855771503528160e+00 4.9519717230609874e+00 -6 5 -1
+2557 1 0.0000000000000000e+00 5.6980741615993127e+00 6.3666653825870272e+00 4.0731757437425200e+00 -6 7 0
+905 1 0.0000000000000000e+00 6.0663395518202998e+00 5.9411639038482207e+00 3.4888550621088084e+00 1 0 -1
+2955 3 1.0000000000000000e+00 5.8668162015156513e+00 5.3576168842226934e+00 4.3755410761774947e+00 -3 4 1
+2764 1 0.0000000000000000e+00 5.3431968617424896e+00 6.3975591469394439e+00 4.7645502432433888e+00 3 -6 1
+735 1 0.0000000000000000e+00 7.3836814053773372e+00 6.8674633215041574e+00 2.8207610568929296e+00 4 2 0
+2511 1 0.0000000000000000e+00 5.7803253317784673e+00 5.5656327166606898e+00 2.6169507412382296e+00 -2 4 3
+834 1 0.0000000000000000e+00 7.1218972531251197e+00 5.4576570992134679e+00 4.3476396989877859e+00 -2 -5 -4
+2104 1 0.0000000000000000e+00 6.1321063278865164e+00 6.1395432204073961e+00 3.9252001449442950e+00 -2 7 1
+2468 1 0.0000000000000000e+00 5.3695117052822887e+00 6.9802694079204333e+00 3.4769695752460503e+00 3 -1 -2
+985 1 0.0000000000000000e+00 7.2133588985383543e+00 5.9792062014387852e+00 3.7194034992696898e+00 1 -3 5
+1878 1 0.0000000000000000e+00 7.2251312501273910e+00 7.4630505742371787e+00 4.1797618391861313e+00 -1 3 0
+463 1 0.0000000000000000e+00 5.0458208561330666e+00 7.1376783526976002e+00 2.5546186826422805e+00 0 -6 -7
+2769 1 0.0000000000000000e+00 7.1820890547195164e+00 5.1010038777456579e+00 3.8867039090489737e+00 2 -8 0
+31 1 0.0000000000000000e+00 5.5017771591609819e+00 5.1876807774468583e+00 4.8248833320403479e+00 2 -1 -7
+817 1 0.0000000000000000e+00 7.1828988451974265e+00 5.2926449853195647e+00 3.2309652312037374e+00 3 3 -3
+2765 1 0.0000000000000000e+00 5.2171765853105496e+00 5.4207348315501589e+00 3.1688656511690003e+00 2 2 6
+399 1 0.0000000000000000e+00 6.4012880009839428e+00 5.2392303496922521e+00 4.4550198685337374e+00 -8 -2 1
+537 1 0.0000000000000000e+00 5.3867149709605497e+00 7.0573045018517639e+00 4.4295082779721424e+00 0 -1 0
+1454 1 0.0000000000000000e+00 7.2479567863327850e+00 6.1408877501412515e+00 2.9202523607627220e+00 2 9 -1
+1513 1 0.0000000000000000e+00 6.1252445623648688e+00 5.2214805926102494e+00 3.2475080421541809e+00 1 7 6
+1957 1 0.0000000000000000e+00 7.1008860348332101e+00 6.8883144791757616e+00 4.0380397985336369e+00 -6 -3 -2
+1801 1 0.0000000000000000e+00 6.1277388005756404e+00 7.0231022400209770e+00 3.5063915681645796e+00 -2 4 -5
+765 1 0.0000000000000000e+00 6.5093881393443009e+00 5.7155550011011380e+00 4.8792681232862929e+00 3 -2 -5
+2081 1 0.0000000000000000e+00 6.6673918297540311e+00 7.4862577813834124e+00 2.7337599750017025e+00 1 3 -1
+2433 1 0.0000000000000000e+00 5.6553993743906288e+00 6.3597012885254731e+00 3.0466464257818777e+00 3 -6 3
+2340 1 0.0000000000000000e+00 5.3239279018366847e+00 5.3613136415220577e+00 3.9859062294848373e+00 2 3 8
+2948 3 1.0000000000000000e+00 6.0266630907149210e+00 7.0828103407844010e+00 4.7825753924329168e+00 0 5 -5
+2542 1 0.0000000000000000e+00 6.8996122933414448e+00 7.0356347184923189e+00 4.9042185164723602e+00 -2 -2 6
+357 1 0.0000000000000000e+00 6.2535638141080749e+00 6.1880548728358722e+00 2.8895368936458090e+00 -2 1 4
+427 1 0.0000000000000000e+00 6.6014034512699480e+00 6.4571659041885177e+00 2.7574725772798323e+00 1 -3 -3
+1219 1 0.0000000000000000e+00 7.2259366751192831e+00 6.6477236995867530e+00 4.7644921151398059e+00 -5 1 3
+1598 1 0.0000000000000000e+00 6.4791128071447091e+00 6.0610619211809240e+00 4.5184167451985759e+00 -3 -2 -4
+740 1 0.0000000000000000e+00 6.0170359904944029e+00 7.1701246283403801e+00 3.9995508834586584e+00 8 1 -4
+2276 1 0.0000000000000000e+00 5.8650164143233221e+00 5.9947645081387790e+00 4.7041430917167251e+00 -3 4 -4
+2166 1 0.0000000000000000e+00 7.0471100858044569e+00 6.9330444310175601e+00 3.2560542092508875e+00 2 -3 -4
+770 1 0.0000000000000000e+00 6.6185862961245840e+00 5.2354753024730449e+00 3.9288091009752231e+00 0 2 -1
+841 1 0.0000000000000000e+00 6.6250993828569698e+00 5.5049830681801213e+00 3.8238168678448856e+00 -6 -2 5
+2597 1 0.0000000000000000e+00 6.7743004521528025e+00 6.2779550207649581e+00 4.1459239138273452e+00 -5 2 5
+72 1 0.0000000000000000e+00 6.5948894362227195e+00 6.3601456685564539e+00 3.2507022385652777e+00 0 1 -2
+315 1 0.0000000000000000e+00 6.4425634474523461e+00 5.6208410124560553e+00 2.8632891324233976e+00 0 1 -3
+1901 1 0.0000000000000000e+00 5.9246626190770781e+00 7.0931317780501315e+00 2.9240023745420007e+00 -1 1 6
+1055 1 0.0000000000000000e+00 5.3053818486618276e+00 6.5988617912083409e+00 2.7024289541654953e+00 -4 2 -4
+849 1 0.0000000000000000e+00 5.4706656844151844e+00 6.0418608692140063e+00 3.3005261977479914e+00 2 3 -2
+757 1 0.0000000000000000e+00 5.1315469428648832e+00 6.7763313950440232e+00 4.7667969751681722e+00 -5 -2 1
+1521 1 0.0000000000000000e+00 5.5610215574828539e+00 7.4250819507424906e+00 4.7457083611481243e+00 -1 -8 4
+1054 1 0.0000000000000000e+00 9.2981634114664846e+00 5.5029966174873559e+00 3.9043545754916629e+00 0 4 2
+2570 1 0.0000000000000000e+00 8.6029616996374028e+00 6.5904196645509119e+00 3.3702430433667758e+00 1 -6 0
+2375 1 0.0000000000000000e+00 8.0646452039234759e+00 5.1922249377969161e+00 3.9107140864677872e+00 -6 -4 3
+1153 1 0.0000000000000000e+00 9.9598889036480998e+00 5.0525495920655796e+00 2.6134419888797660e+00 -3 -1 3
+2803 1 0.0000000000000000e+00 7.8269290164768925e+00 5.8908285684896020e+00 3.0510088755812790e+00 -6 4 3
+2927 3 1.0000000000000000e+00 9.0459443834215332e+00 6.8264346563936993e+00 4.6947556872972003e+00 5 7 6
+2162 1 0.0000000000000000e+00 8.5674828521528319e+00 5.1164276916643994e+00 2.9324062263252757e+00 3 1 -3
+1526 1 0.0000000000000000e+00 9.2287198986264389e+00 6.5499127101983881e+00 3.1528375583626209e+00 -6 -5 1
+2671 1 0.0000000000000000e+00 8.4141884280791075e+00 6.8114878678765436e+00 3.8961569083474812e+00 -4 0 0
+1523 1 0.0000000000000000e+00 8.5122320854797646e+00 5.9674193744995927e+00 3.7923255880573836e+00 4 -4 1
+2628 1 0.0000000000000000e+00 8.0194073634295009e+00 5.2950868546167280e+00 3.0356932542968633e+00 -5 -1 -2
+2826 2 -1.0000000000000000e+00 8.2283050957965820e+00 6.9119754293241620e+00 4.6574115009183901e+00 -1 -7 2
+146 1 0.0000000000000000e+00 8.5609725413186144e+00 7.2649774750996032e+00 3.7597190311590634e+00 -10 5 -5
+256 1 0.0000000000000000e+00 8.9241734619183806e+00 7.0741261324573363e+00 3.3949503798372320e+00 -3 1 -2
+455 1 0.0000000000000000e+00 9.4061722671632104e+00 6.2700798082241622e+00 3.8456792445118348e+00 1 -3 2
+1989 1 0.0000000000000000e+00 8.5542438151097482e+00 5.3943451563769642e+00 4.3592237660411675e+00 0 -1 -6
+1632 1 0.0000000000000000e+00 8.7351295885807811e+00 5.2059143422189980e+00 3.5458129451524258e+00 1 7 7
+2352 1 0.0000000000000000e+00 9.8856492358624646e+00 7.0217851958622823e+00 3.0322356934400001e+00 -2 -3 3
+2702 1 0.0000000000000000e+00 9.3857196610614562e+00 7.2289953681316881e+00 3.8763592324158793e+00 -4 -1 -4
+2576 1 0.0000000000000000e+00 9.1790872972663582e+00 7.1401136247078707e+00 4.9198889910505379e+00 -4 3 2
+1707 1 0.0000000000000000e+00 8.3027951988052688e+00 6.4037936622741292e+00 4.1350292578870649e+00 1 -1 1
+1635 1 0.0000000000000000e+00 8.8220377548262459e+00 6.2045151408781836e+00 4.6904786087206789e+00 -3 2 2
+2527 1 0.0000000000000000e+00 9.4697897124838697e+00 7.0943611381431326e+00 4.2712070638518389e+00 7 -5 -1
+1477 1 0.0000000000000000e+00 8.2385535386663182e+00 7.3342942630148231e+00 2.9878412160137056e+00 -2 -3 2
+1768 1 0.0000000000000000e+00 9.9485393849302479e+00 6.3033438921406342e+00 3.0194546695812994e+00 -4 -3 0
+2656 1 0.0000000000000000e+00 9.7380335239192863e+00 5.0455037571332193e+00 4.3816171003066371e+00 1 3 5
+764 1 0.0000000000000000e+00 8.9317022589907094e+00 7.3711953029254689e+00 2.6232846925926294e+00 -1 -2 -2
+909 1 0.0000000000000000e+00 8.9390557456473037e+00 6.3584862550803152e+00 3.8578248543194453e+00 0 1 0
+2339 1 0.0000000000000000e+00 7.7078983116973756e+00 6.2246735421525488e+00 3.7111580287442814e+00 2 0 7
+1399 1 0.0000000000000000e+00 7.9391642452371860e+00 7.2024297533333401e+00 3.9727848186689929e+00 -1 -7 4
+1446 1 0.0000000000000000e+00 8.7366044993412970e+00 5.4957110742349968e+00 2.8539113868770105e+00 -1 0 -1
+50 1 0.0000000000000000e+00 9.4513473136488244e+00 5.7081652383006523e+00 4.5053973056891934e+00 0 -2 3
+552 1 0.0000000000000000e+00 9.4961196204279776e+00 6.5277583864286912e+00 2.5693953985451050e+00 3 -1 2
+2999 3 1.0000000000000000e+00 8.7852585472759070e+00 7.4648006827702922e+00 4.4136437414574399e+00 1 -4 5
+2924 3 1.0000000000000000e+00 8.5536504771993940e+00 6.4219484933379887e+00 3.1800090056956405e+00 7 -7 3
+236 1 0.0000000000000000e+00 7.9081950911936216e+00 5.2732355498023322e+00 3.6205582830141272e+00 -1 6 1
+1898 1 0.0000000000000000e+00 7.9268127842566551e+00 6.8888250107786906e+00 3.3976128809840000e+00 0 0 -1
+1893 1 0.0000000000000000e+00 9.4476250169635225e+00 5.3275946200242776e+00 3.1882955406515014e+00 -3 7 -1
+2899 2 -1.0000000000000000e+00 9.2973794130289207e+00 5.7919963229582807e+00 3.3205102188176365e+00 6 0 0
+791 1 0.0000000000000000e+00 7.7088989025973174e+00 6.5185553214901439e+00 4.2338648290542151e+00 0 1 0
+2897 2 -1.0000000000000000e+00 7.7491357731980219e+00 5.7379027174493116e+00 4.5911448917936264e+00 2 -7 1
+1148 1 0.0000000000000000e+00 9.7792129512030694e+00 6.4309233471135538e+00 4.5916426458233790e+00 0 0 -1
+2283 1 0.0000000000000000e+00 8.0241021316524783e+00 5.1451338375745905e+00 4.6649987056807998e+00 -5 -2 2
+1349 1 0.0000000000000000e+00 8.0527741802758985e+00 6.7725233343961158e+00 2.6400565760554722e+00 1 -3 -4
+2453 1 0.0000000000000000e+00 7.8325382243353525e+00 5.5335146083537170e+00 4.8821605080071464e+00 -6 -2 -4
+866 1 0.0000000000000000e+00 6.5074973020371010e+00 8.5115216674672158e+00 3.8521668611986697e+00 7 5 9
+887 1 0.0000000000000000e+00 6.7462870622851714e+00 9.9773855107980154e+00 3.7994481274081648e+00 1 5 -1
+258 1 0.0000000000000000e+00 5.6021923204397632e+00 9.7660420966737185e+00 4.5915672104406644e+00 1 -4 -4
+768 1 0.0000000000000000e+00 7.0371110353342567e+00 8.4127679162884892e+00 3.4159126061094893e+00 -2 -1 -1
+1565 1 0.0000000000000000e+00 5.8896556244972764e+00 7.8141682838402460e+00 2.6154600270379871e+00 -3 3 1
+1317 1 0.0000000000000000e+00 5.8406438396659253e+00 9.0485335490383925e+00 3.1496126165378313e+00 4 -5 3
+1782 1 0.0000000000000000e+00 5.2137763098093304e+00 8.4002010731953121e+00 3.6872902225535134e+00 -3 1 0
+2250 1 0.0000000000000000e+00 6.2623818112637952e+00 8.5144219250383859e+00 4.7374894565950028e+00 3 -4 -7
+2089 1 0.0000000000000000e+00 7.1770731926590408e+00 9.4663339158274482e+00 3.7155260157770686e+00 0 0 5
+403 1 0.0000000000000000e+00 6.3360998956355274e+00 7.8098444574510335e+00 4.7350552445017549e+00 -2 2 2
+1968 1 0.0000000000000000e+00 5.3273915443626221e+00 9.1108279301220687e+00 4.9693619105875682e+00 4 1 1
+109 1 0.0000000000000000e+00 5.2324799708492309e+00 8.1054043951949577e+00 2.8069775724356512e+00 2 0 0
+1814 1 0.0000000000000000e+00 5.1528036425964787e+00 9.9313114796126598e+00 2.7000468111288392e+00 -4 -7 -2
+698 1 0.0000000000000000e+00 7.0150165777323767e+00 9.2527758686779844e+00 4.3723917905638023e+00 0 -6 -3
+2384 1 0.0000000000000000e+00 5.8678768309761571e+00 8.1138879033190268e+00 3.0847215702363382e+00 -5 4 2
+2880 2 -1.0000000000000000e+00 6.9831186861978498e+00 7.8241116492517362e+00 3.8795058271405320e+00 -3 2 0
+828 1 0.0000000000000000e+00 5.6138978071817096e+00 9.1791637885645851e+00 3.1215812471508344e+00 -4 1 -3
+2444 1 0.0000000000000000e+00 7.0694099323120296e+00 7.5915372137789809e+00 2.6911261310341610e+00 -1 7 1
+1571 1 0.0000000000000000e+00 7.0109727997333069e+00 9.8606168595087578e+00 2.7440737670329711e+00 3 -2 0
+2693 1 0.0000000000000000e+00 6.0166677133818220e+00 9.5988010701121507e+00 4.3912805272078188e+00 5 -2 5
+2436 1 0.0000000000000000e+00 7.0678992110809924e+00 9.0043279311695752e+00 2.7979704241130658e+00 3 -5 2
+1341 1 0.0000000000000000e+00 7.4069769510032133e+00 7.5036511954108454e+00 4.7679204793340793e+00 1 3 -8
+242 1 0.0000000000000000e+00 6.9565847222647985e+00 8.2952903493954935e+00 4.5920434244741406e+00 4 1 2
+2594 1 0.0000000000000000e+00 5.1816997236755169e+00 7.5913939394449779e+00 2.5949076403184863e+00 -3 -7 2
+713 1 0.0000000000000000e+00 5.7783034120729653e+00 8.4591609280705526e+00 4.8848162466676257e+00 -5 -3 -2
+1641 1 0.0000000000000000e+00 5.2116820729562559e+00 9.0954293390288417e+00 4.2525597304570484e+00 -1 -2 1
+129 1 0.0000000000000000e+00 5.5575974593448239e+00 8.8450690830043488e+00 4.8678556559577650e+00 -3 -5 -3
+1030 1 0.0000000000000000e+00 7.1114299094681970e+00 8.7092553616160853e+00 4.1715302434582409e+00 1 1 1
+2952 3 1.0000000000000000e+00 6.5566642130852486e+00 7.7848022531259913e+00 3.8251393986860318e+00 -1 -2 2
+1965 1 0.0000000000000000e+00 6.0826628846581441e+00 9.4766376683501807e+00 3.4659505107117630e+00 1 5 3
+1925 1 0.0000000000000000e+00 6.5381881024650346e+00 9.0854327534288117e+00 4.8742340644398388e+00 0 0 -7
+2108 1 0.0000000000000000e+00 6.8285701690612886e+00 8.5537713226303822e+00 2.5276152555911193e+00 -2 3 5
+911 1 0.0000000000000000e+00 6.6689653166381664e+00 9.4458597395054191e+00 4.2359335798172371e+00 0 3 3
+895 1 0.0000000000000000e+00 6.4341390775266927e+00 7.6438191979780790e+00 3.1143659004013893e+00 -2 -1 9
+859 1 0.0000000000000000e+00 7.3688456490907628e+00 7.5639072733536024e+00 3.3102961466313068e+00 2 -7 0
+2591 1 0.0000000000000000e+00 6.4069319070724005e+00 9.3076891551727758e+00 3.8802819551174910e+00 3 -1 -1
+957 1 0.0000000000000000e+00 6.3047889863838718e+00 8.8959313668665985e+00 2.7876315892337611e+00 -4 5 -5
+573 1 0.0000000000000000e+00 7.4926470442882751e+00 8.1744989399732564e+00 4.1691448504048427e+00 -5 -3 -3
+1747 1 0.0000000000000000e+00 6.7877855214530358e+00 9.0478227780167995e+00 3.3097171423363494e+00 3 -3 -2
+2174 1 0.0000000000000000e+00 7.2023047391226829e+00 8.2705522696199054e+00 2.5429092051848960e+00 -7 3 0
+2058 1 0.0000000000000000e+00 6.1059687812629457e+00 8.4213181546993461e+00 3.4638587408497505e+00 -1 2 -5
+2348 1 0.0000000000000000e+00 5.8730679262380843e+00 8.2922043227703046e+00 4.1190723747146887e+00 3 0 -4
+693 1 0.0000000000000000e+00 5.5686453026015563e+00 7.7636817304713199e+00 3.5012570989859331e+00 1 0 4
+1483 1 0.0000000000000000e+00 5.4627465945344715e+00 7.8253658699737958e+00 3.9855872589582555e+00 2 -1 -2
+2829 2 -1.0000000000000000e+00 5.7099414542239417e+00 9.4301373970312827e+00 4.0338021256730565e+00 -1 -1 0
+2410 1 0.0000000000000000e+00 5.1382267520028249e+00 8.7260948661883670e+00 2.5190296680920010e+00 -4 -7 -1
+2071 1 0.0000000000000000e+00 5.0387532151356176e+00 7.9700697047471678e+00 4.0898090843664558e+00 -1 4 6
+2609 1 0.0000000000000000e+00 5.5077910616387289e+00 9.8402366173909037e+00 3.2223613648314107e+00 0 2 4
+1522 1 0.0000000000000000e+00 5.5744661905584243e+00 7.7186539977794490e+00 4.6713450185449776e+00 4 2 7
+976 1 0.0000000000000000e+00 6.6259089141476997e+00 8.1446005612454009e+00 2.9099564654071317e+00 -8 -2 0
+132 1 0.0000000000000000e+00 7.3729518642351666e+00 9.4666826264255857e+00 4.9048383380242129e+00 -2 -6 -6
+2657 1 0.0000000000000000e+00 9.8364261993870130e+00 8.8744183174635669e+00 3.2701684730636797e+00 -5 2 -1
+1624 1 0.0000000000000000e+00 9.1225107604793596e+00 8.6402668808039369e+00 3.0217119917971877e+00 3 0 1
+169 1 0.0000000000000000e+00 9.6834693791370334e+00 9.8238567066394378e+00 4.7601704987722329e+00 -5 0 3
+237 1 0.0000000000000000e+00 8.8098893638154845e+00 9.5715514938894302e+00 2.6033608715520975e+00 7 -2 0
+2347 1 0.0000000000000000e+00 7.8346398630766680e+00 9.3529619399519905e+00 2.9608557768785917e+00 -2 -6 2
+402 1 0.0000000000000000e+00 8.4460983215245822e+00 8.3351101999429691e+00 4.1991099253571482e+00 -1 1 0
+1023 1 0.0000000000000000e+00 8.0847519689879022e+00 7.5870660045189551e+00 4.9336568227815647e+00 -3 -2 0
+1563 1 0.0000000000000000e+00 7.8065606990785836e+00 9.5856530356084786e+00 4.0302579115827699e+00 -2 4 -1
+159 1 0.0000000000000000e+00 9.5365720065527206e+00 7.9500158527546061e+00 4.4880709474800033e+00 -5 0 4
+1798 1 0.0000000000000000e+00 8.3134176627969030e+00 9.5200250411999630e+00 4.4597168903924107e+00 5 0 0
+1719 1 0.0000000000000000e+00 8.5286040827197382e+00 8.4313741620541585e+00 2.8525945361927869e+00 -1 4 0
+1639 1 0.0000000000000000e+00 9.9805155217352137e+00 7.8773151921135591e+00 4.9193935813834324e+00 -3 4 0
+2506 1 0.0000000000000000e+00 7.9383502431026463e+00 8.0335629971144193e+00 3.6456401367126374e+00 -2 -1 -1
+1417 1 0.0000000000000000e+00 8.3468833319439284e+00 9.2640461176650941e+00 2.6869172166904352e+00 -3 7 5
+1279 1 0.0000000000000000e+00 9.1999733735274791e+00 8.5271020474431332e+00 3.9624334400242360e+00 2 2 5
+885 1 0.0000000000000000e+00 9.5888757265647797e+00 7.7533037921532921e+00 3.8314192278697687e+00 0 2 -3
+126 1 0.0000000000000000e+00 8.5866251285421793e+00 8.0747284253417320e+00 4.8756714768810046e+00 -2 0 3
+778 1 0.0000000000000000e+00 7.5025515611478015e+00 9.5910940093227133e+00 3.2823341200487963e+00 -6 -5 -1
+1811 1 0.0000000000000000e+00 7.8394750292138760e+00 8.0856558488310437e+00 4.6831846476877388e+00 -5 -3 -1
+1784 1 0.0000000000000000e+00 7.8179592818206274e+00 7.5887890250444849e+00 2.5491164302909910e+00 3 0 -1
+2493 1 0.0000000000000000e+00 9.5159930757801519e+00 9.3727213485946947e+00 4.1063160312382907e+00 -2 -2 4
+2704 1 0.0000000000000000e+00 9.6581108224943701e+00 8.2331075637317852e+00 3.2344807350343499e+00 -2 0 -1
+1456 1 0.0000000000000000e+00 9.3188725013975144e+00 9.5332121403723047e+00 3.4378753473221768e+00 -4 0 2
+1942 1 0.0000000000000000e+00 8.4636391180096755e+00 7.9546411853629886e+00 3.6708584477904789e+00 1 1 -4
+2428 1 0.0000000000000000e+00 7.8153929976680416e+00 8.7548070686874961e+00 3.9406126466462954e+00 3 -2 1
+2670 1 0.0000000000000000e+00 8.8031453686431220e+00 9.6896478669586141e+00 4.9052679470716329e+00 -2 3 -2
+1834 1 0.0000000000000000e+00 9.7509881777408580e+00 8.6981195022162794e+00 3.9544037130958665e+00 -3 -2 2
+1039 1 0.0000000000000000e+00 8.7922553026764376e+00 8.1122727077443386e+00 2.7949318018557454e+00 0 2 -3
+467 1 0.0000000000000000e+00 9.5574346903359189e+00 7.6848310259755301e+00 3.1618788531675328e+00 3 -1 -3
+206 1 0.0000000000000000e+00 8.8785533676705786e+00 7.7945064753558437e+00 3.8654886434662106e+00 3 2 0
+1489 1 0.0000000000000000e+00 8.7674321394871182e+00 9.0252014646382150e+00 3.2356666918463945e+00 0 3 5
+1003 1 0.0000000000000000e+00 8.6931903726775861e+00 8.6730536121013682e+00 4.8467211760602593e+00 1 2 -4
+2278 1 0.0000000000000000e+00 7.7229754495096108e+00 8.9495517871627062e+00 2.7471267419154417e+00 2 -2 -3
+2077 1 0.0000000000000000e+00 9.9870551532670930e+00 9.6430134707579178e+00 4.4830096475715067e+00 3 0 1
+952 1 0.0000000000000000e+00 8.6740429217719264e+00 9.6161770447180448e+00 4.0099060925635932e+00 4 4 0
+201 1 0.0000000000000000e+00 8.0653551976069959e+00 8.5918880629029353e+00 3.4442094126688101e+00 0 -4 -5
+2568 1 0.0000000000000000e+00 9.3881255012472717e+00 9.1388434733586372e+00 3.1573721482764578e+00 3 -2 -1
+384 1 0.0000000000000000e+00 7.7573301817317111e+00 8.1152214396377076e+00 3.0207276797838332e+00 3 -3 -4
+2236 1 0.0000000000000000e+00 8.1319458521096806e+00 9.3329122332101448e+00 3.5133238848014856e+00 2 -1 0
+419 1 0.0000000000000000e+00 7.8663798389602055e+00 9.2157433418250072e+00 4.4692165555634276e+00 2 -6 -2
+1025 1 0.0000000000000000e+00 8.8154847921665453e+00 8.7668412461742005e+00 4.1926730871711309e+00 0 1 2
+2669 1 0.0000000000000000e+00 9.7032569187294744e+00 8.5682013815325035e+00 4.4194556850167919e+00 -3 6 -8
+630 1 0.0000000000000000e+00 9.5637042769666358e+00 8.2984689615224010e+00 2.6466868681886462e+00 4 1 5
+2355 1 0.0000000000000000e+00 9.4145782405366525e+00 9.7766672473013454e+00 3.3943012052049952e+00 4 0 -3
+483 1 0.0000000000000000e+00 9.6088076553762871e+00 7.6844693275561502e+00 2.6408628959857872e+00 2 -4 4
+2928 3 1.0000000000000000e+00 6.2465621821053707e+00 7.4161544037776732e+00 5.6031998926548603e+00 -1 -1 -3
+2424 1 0.0000000000000000e+00 7.4156436333600002e+00 6.2998520214947744e+00 6.0523309502240821e+00 -2 -7 1
+569 1 0.0000000000000000e+00 6.9959100498309645e+00 6.3121743798274954e+00 6.4209084612380840e+00 -4 -3 -4
+520 1 0.0000000000000000e+00 5.1072650572383420e+00 6.1038196381945760e+00 5.6757986830375504e+00 -1 1 0
+1807 1 0.0000000000000000e+00 7.1762915123524333e+00 5.9999109359109584e+00 5.1577718048539278e+00 -2 -2 1
+377 1 0.0000000000000000e+00 5.0671292490377500e+00 6.7921978278469064e+00 6.7959506121571360e+00 0 0 2
+1765 1 0.0000000000000000e+00 5.8309486906556875e+00 5.8814391264579111e+00 5.0978616920890207e+00 -1 -2 4
+2308 1 0.0000000000000000e+00 5.2068978742922729e+00 6.6179152000845951e+00 6.1756988954023848e+00 2 -2 -1
+1199 1 0.0000000000000000e+00 6.2569957242950744e+00 6.0095764343770073e+00 6.4686517031219433e+00 -3 1 2
+55 1 0.0000000000000000e+00 5.0751781245172136e+00 5.1499269932289993e+00 5.8760559565694956e+00 -3 6 2
+1089 1 0.0000000000000000e+00 5.6890131771245374e+00 7.2320987800147609e+00 6.8934895364395663e+00 -1 -1 4
+381 1 0.0000000000000000e+00 5.7783140351218183e+00 6.6172022342928027e+00 5.7680090716468824e+00 2 -5 -2
+2637 1 0.0000000000000000e+00 5.7093513422848705e+00 5.4976280749698789e+00 6.1644408618392843e+00 7 -2 -4
+1314 1 0.0000000000000000e+00 7.3353627957961525e+00 6.2120764027338717e+00 6.9922938555470955e+00 -4 1 4
+896 1 0.0000000000000000e+00 5.1817470771474703e+00 5.3718322319189573e+00 7.1403987608373214e+00 1 0 3
+2476 1 0.0000000000000000e+00 7.0633655276181511e+00 5.9436858390960792e+00 7.3331987006150401e+00 8 -4 -6
+1050 1 0.0000000000000000e+00 6.7694544908742573e+00 7.1735642458859692e+00 5.8773999942604807e+00 3 2 -2
+1835 1 0.0000000000000000e+00 6.5180673586344220e+00 6.5048010684449489e+00 6.4901292130777124e+00 0 0 2
+739 1 0.0000000000000000e+00 7.2788400489903884e+00 7.0169740669859602e+00 6.7408366833105262e+00 7 -2 0
+2551 1 0.0000000000000000e+00 5.1982125650233506e+00 7.1406623632527184e+00 5.5854878450535024e+00 -5 0 -1
+2066 1 0.0000000000000000e+00 6.4840278882303863e+00 5.2955544712927836e+00 7.1343134807042539e+00 1 -2 1
+2474 1 0.0000000000000000e+00 6.0351581782042274e+00 5.3260721872832981e+00 6.5548622772422540e+00 3 3 1
+723 1 0.0000000000000000e+00 5.4942252133201999e+00 7.0004143032743551e+00 5.5416061389395477e+00 -4 1 -2
+2110 1 0.0000000000000000e+00 6.2475902012984150e+00 6.2208820982101569e+00 5.1655511048022174e+00 0 2 5
+374 1 0.0000000000000000e+00 5.3225026765999806e+00 5.8269773605708082e+00 6.3499929810209199e+00 -4 -2 2
+2388 1 0.0000000000000000e+00 6.9297640357131227e+00 5.5150280459246908e+00 6.3700806760935560e+00 -1 0 5
+1662 1 0.0000000000000000e+00 6.2538255744081983e+00 7.1926111217995503e+00 6.3385241823509988e+00 -3 1 3
+2186 1 0.0000000000000000e+00 6.7075657659023351e+00 7.2013862334485070e+00 5.4206063766307189e+00 1 3 0
+11 1 0.0000000000000000e+00 7.3743347117226783e+00 6.4874153436894577e+00 5.3248166483413089e+00 0 12 -6
+1413 1 0.0000000000000000e+00 6.1752023069026158e+00 5.7754439538096127e+00 7.0477825180083276e+00 -2 -2 1
+2884 2 -1.0000000000000000e+00 6.4980878586998383e+00 5.3259427924765372e+00 6.2239766130220744e+00 -1 8 -1
+163 1 0.0000000000000000e+00 5.2248500110382370e+00 7.3274761145955267e+00 6.4128919761581109e+00 -1 -1 -1
+2075 1 0.0000000000000000e+00 6.1453939333894620e+00 7.0508491710576733e+00 7.4092662828815223e+00 1 3 5
+22 1 0.0000000000000000e+00 6.5567664940902715e+00 6.9105320843890823e+00 6.9215084779256246e+00 -1 2 0
+473 1 0.0000000000000000e+00 7.2660499994119538e+00 7.0612934519183748e+00 5.7731833864778146e+00 1 -1 0
+2317 1 0.0000000000000000e+00 6.2569800719417668e+00 6.6974607135430784e+00 5.2287856380982625e+00 0 -1 6
+691 1 0.0000000000000000e+00 6.7038454869997564e+00 5.1320860864249820e+00 5.4809009693769566e+00 1 -2 -4
+890 1 0.0000000000000000e+00 6.9117928579696626e+00 5.7670790716735203e+00 5.2991059592052938e+00 0 7 -1
+601 1 0.0000000000000000e+00 5.8889239895495162e+00 6.0114655438126503e+00 5.7169879154251211e+00 2 -2 -5
+966 1 0.0000000000000000e+00 5.4577078644835426e+00 5.4973792117439659e+00 5.1949406857794465e+00 0 -1 -7
+1781 1 0.0000000000000000e+00 5.7418595279679998e+00 6.0903779347524507e+00 7.0227345646307668e+00 0 -5 2
+459 1 0.0000000000000000e+00 5.9180263585878379e+00 6.6607773472907921e+00 6.3719009198658041e+00 3 -2 -1
+544 1 0.0000000000000000e+00 5.7209156831146224e+00 6.6974659806708852e+00 6.6042105208339645e+00 -5 -1 -1
+1531 1 0.0000000000000000e+00 5.6014074207920084e+00 5.1714728299291055e+00 7.3686510979570894e+00 0 0 1
+2682 1 0.0000000000000000e+00 6.5225559001026880e+00 6.2281767181483234e+00 5.9167454165855977e+00 -1 6 3
+277 1 0.0000000000000000e+00 6.4974600985436455e+00 6.1764709685772727e+00 7.1733776131282827e+00 0 -6 2
+1861 1 0.0000000000000000e+00 5.3051564308249519e+00 6.8498948449924058e+00 7.4075454864026158e+00 2 5 1
+2107 1 0.0000000000000000e+00 9.9816363385334039e+00 6.0402716164222490e+00 5.3392581198422810e+00 -1 2 6
+2461 1 0.0000000000000000e+00 8.7265920390966603e+00 6.8288943816620673e+00 6.4681958611794297e+00 -2 6 1
+1144 1 0.0000000000000000e+00 8.3373770889637644e+00 6.2516650160662524e+00 5.9676714697112754e+00 -10 4 1
+2962 3 1.0000000000000000e+00 9.7513614672095983e+00 7.2200837335539161e+00 7.4709471587414091e+00 -2 -1 -1
+1703 1 0.0000000000000000e+00 8.1960064536692752e+00 5.1209483443709072e+00 6.0386314889511903e+00 5 -1 1
+1105 1 0.0000000000000000e+00 9.7774544947248074e+00 7.1168699709363628e+00 6.8459302409758438e+00 2 3 6
+2792 1 0.0000000000000000e+00 7.7008063851828519e+00 6.2631930396247872e+00 6.7906237568125265e+00 3 8 -1
+2668 1 0.0000000000000000e+00 8.8100560963677470e+00 5.2451573338097841e+00 5.4461091180221439e+00 -5 2 -4
+87 1 0.0000000000000000e+00 7.7644723609068871e+00 5.3981725226207802e+00 6.8212950174133260e+00 6 2 4
+2018 1 0.0000000000000000e+00 8.2947719601138914e+00 6.1316918877147000e+00 7.2750405109105154e+00 -4 4 1
+624 1 0.0000000000000000e+00 9.3163139854344763e+00 5.8442656792865222e+00 6.5594291363055310e+00 -3 5 -3
+195 1 0.0000000000000000e+00 8.8055043403120923e+00 5.3479881402182130e+00 6.7273029076184434e+00 -2 1 -4
+396 1 0.0000000000000000e+00 9.1211740471021248e+00 7.4900242844777356e+00 6.6384521492323181e+00 0 -5 -1
+997 1 0.0000000000000000e+00 8.5443827607588076e+00 7.2188395299389194e+00 7.1265505946403183e+00 0 3 -5
+1780 1 0.0000000000000000e+00 9.7189801956756661e+00 5.3216549929976358e+00 7.3568860536670604e+00 3 4 0
+1755 1 0.0000000000000000e+00 9.6789165823240122e+00 5.6550031888974699e+00 7.2580130673478633e+00 0 -1 -4
+52 1 0.0000000000000000e+00 9.9931186988957847e+00 5.7650082497582531e+00 5.8399384767307101e+00 -1 -1 -3
+30 1 0.0000000000000000e+00 9.9654691326935172e+00 5.6695601312503046e+00 7.4319734491654126e+00 -2 -5 0
+848 1 0.0000000000000000e+00 9.3986532088089056e+00 6.4580987488041472e+00 6.5772815586539828e+00 0 3 -8
+2652 1 0.0000000000000000e+00 9.2778311923645944e+00 6.0972677119798684e+00 7.1142041845036648e+00 6 3 0
+2065 1 0.0000000000000000e+00 7.6261723193284956e+00 5.3548940942327237e+00 5.6430328257736226e+00 -2 2 -1
+1075 1 0.0000000000000000e+00 9.4900430981320287e+00 5.0057041643741167e+00 6.1835868114392563e+00 -2 0 -4
+2558 1 0.0000000000000000e+00 9.1054090281418141e+00 6.8987604987807831e+00 5.6487106177719113e+00 -3 -2 2
+2534 1 0.0000000000000000e+00 7.9248383728745013e+00 6.1604673416318407e+00 5.4596542900416960e+00 4 -3 -3
+2729 1 0.0000000000000000e+00 8.9120376217870962e+00 6.0116945383668217e+00 7.1018416568066369e+00 1 -2 4
+2158 1 0.0000000000000000e+00 9.2098078584013745e+00 5.1541884262282123e+00 7.1142238322331952e+00 -1 2 6
+2888 2 -1.0000000000000000e+00 9.7368485667485363e+00 7.4405486313055471e+00 6.2514390003803291e+00 -2 -1 -3
+2033 1 0.0000000000000000e+00 8.5012468100509135e+00 5.1313748458179811e+00 6.9644876716496702e+00 -4 -4 -2
+204 1 0.0000000000000000e+00 7.6755375607496363e+00 6.6330929694396046e+00 5.1007576850430434e+00 4 -3 3
+156 1 0.0000000000000000e+00 8.3230915781675083e+00 6.7539563605180035e+00 5.0638201779550007e+00 -3 -5 -5
+337 1 0.0000000000000000e+00 9.8642222703318652e+00 6.8201032186070130e+00 5.7943093659572762e+00 -5 1 3
+684 1 0.0000000000000000e+00 9.5717392077798369e+00 5.2780979481098571e+00 5.0846237963107601e+00 -4 1 -2
+2994 3 1.0000000000000000e+00 9.7909433654858891e+00 5.6350042303673469e+00 6.3824549416369507e+00 0 -6 -1
+510 1 0.0000000000000000e+00 8.6313666682342696e+00 5.9274204244925599e+00 5.0641642813877032e+00 1 5 0
+1299 1 0.0000000000000000e+00 7.6230977338681587e+00 5.7431350242512877e+00 6.5194102103820581e+00 0 -3 -3
+2447 1 0.0000000000000000e+00 7.9252736634051342e+00 5.5958372517511803e+00 5.4872430137715780e+00 -5 -1 2
+2446 1 0.0000000000000000e+00 8.2100829752579330e+00 7.2089608167996753e+00 5.4693451977728360e+00 2 -5 -2
+2722 1 0.0000000000000000e+00 9.3280335951657651e+00 6.3794525263588735e+00 6.0026874719347640e+00 -2 7 -1
+668 1 0.0000000000000000e+00 8.1746313655759248e+00 6.8634585978640992e+00 6.9007842013876477e+00 1 1 0
+1101 1 0.0000000000000000e+00 9.8353608322252075e+00 6.5239304810955403e+00 7.2658678287912615e+00 3 -2 -4
+2680 1 0.0000000000000000e+00 9.1926481071648105e+00 7.4456198212881493e+00 5.5378194092976472e+00 2 -4 4
+2177 1 0.0000000000000000e+00 9.0595981628813060e+00 6.5706879979066581e+00 7.3977588899230069e+00 3 2 0
+2523 1 0.0000000000000000e+00 8.5066635575671636e+00 5.6728434763213658e+00 6.1219078177565729e+00 -6 -1 2
+932 1 0.0000000000000000e+00 8.7306955998418179e+00 5.8933435286276712e+00 5.6970533106328354e+00 -5 5 2
+1468 1 0.0000000000000000e+00 8.2759617618145764e+00 5.4522715701326510e+00 6.9871360827159519e+00 -1 -1 1
+433 1 0.0000000000000000e+00 9.3918435019938400e+00 5.9253130835583612e+00 5.2447893034577833e+00 -2 -2 2
+1533 1 0.0000000000000000e+00 7.8618291357577164e+00 6.7664464483180558e+00 6.2822636516228085e+00 -5 6 -7
+2853 2 -1.0000000000000000e+00 5.5826575727967391e+00 9.4097388211791504e+00 7.3289705701186323e+00 2 2 4
+1839 1 0.0000000000000000e+00 7.4962642782921654e+00 7.8226002875996024e+00 6.3060289310397133e+00 5 2 2
+1095 1 0.0000000000000000e+00 6.8524201916999852e+00 8.5148004586887698e+00 7.2875521336594762e+00 -9 4 -3
+338 1 0.0000000000000000e+00 5.2643099540325355e+00 8.6134001382333381e+00 6.6434969260089138e+00 3 -1 5
+780 1 0.0000000000000000e+00 5.3628691146173093e+00 9.1893464048668978e+00 7.0060325464918973e+00 6 3 -4
+93 1 0.0000000000000000e+00 5.6115841621767526e+00 7.7820335026147704e+00 5.6723735515689997e+00 -6 0 2
+1777 1 0.0000000000000000e+00 6.1026863962129090e+00 8.1454841958929070e+00 6.6392640814029091e+00 2 3 3
+148 1 0.0000000000000000e+00 5.4287681557904843e+00 8.6842344641970062e+00 5.8084083753020961e+00 3 -1 -5
+25 1 0.0000000000000000e+00 6.0674193189816448e+00 9.8339741482250034e+00 6.9559217075679154e+00 -7 -1 0
+910 1 0.0000000000000000e+00 5.1834578567774585e+00 8.3064624082034619e+00 5.2504932242719553e+00 -2 -2 2
+2868 2 -1.0000000000000000e+00 5.6675360508137613e+00 7.7962020574306496e+00 7.0716496275011931e+00 3 1 -1
+1575 1 0.0000000000000000e+00 6.0195604290624676e+00 9.3394984162165180e+00 6.1878895088008292e+00 -7 -1 -2
+1140 1 0.0000000000000000e+00 6.2309355258686043e+00 8.6719417324310815e+00 5.7013433540011524e+00 1 -4 0
+1366 1 0.0000000000000000e+00 7.2134434236306033e+00 9.6381356007993872e+00 6.6903432524954498e+00 1 -3 6
+2567 1 0.0000000000000000e+00 6.6965999029704442e+00 7.9320205858983632e+00 5.9770429922555115e+00 0 -2 0
+1503 1 0.0000000000000000e+00 5.9199523355232300e+00 8.5724733348348430e+00 7.1172607990883217e+00 -3 0 -3
+1776 1 0.0000000000000000e+00 7.0435134524378391e+00 8.9530413928179016e+00 5.2757680118758410e+00 4 0 -3
+2459 1 0.0000000000000000e+00 6.8850694957301792e+00 7.6637729706994220e+00 6.8743560080895696e+00 -6 -8 1
+2219 1 0.0000000000000000e+00 5.0593860771483019e+00 8.3175320626907698e+00 7.3160203698215653e+00 -2 7 1
+2016 1 0.0000000000000000e+00 7.1621959887161299e+00 9.5688244717093909e+00 5.8206287762492215e+00 2 -2 -2
+1741 1 0.0000000000000000e+00 6.4797063348808157e+00 9.4446624555891923e+00 6.2625385223775245e+00 3 1 3
+471 1 0.0000000000000000e+00 6.6314695054204069e+00 9.0799772428769199e+00 6.1667272767051342e+00 1 -7 1
+2441 1 0.0000000000000000e+00 5.8992164782920211e+00 7.9848753625959521e+00 5.5105422638230346e+00 2 1 -6
+1453 1 0.0000000000000000e+00 5.8379667054152202e+00 9.9458663837130601e+00 5.8918056335843509e+00 -5 3 1
+413 1 0.0000000000000000e+00 6.7891161863613263e+00 8.0613937924639636e+00 5.3429645424549559e+00 -3 2 -1
+2251 1 0.0000000000000000e+00 7.4175231629115022e+00 8.6534330147837260e+00 5.3922077568311204e+00 4 4 3
+1096 1 0.0000000000000000e+00 6.7715714977965904e+00 9.4163728744027839e+00 7.2663715404591471e+00 -3 -1 0
+2318 1 0.0000000000000000e+00 7.4854019789101782e+00 9.3304272987247661e+00 6.4912301857629195e+00 3 -7 -2
+666 1 0.0000000000000000e+00 7.3784719709598088e+00 8.8576988033107753e+00 6.0377852558760097e+00 2 -3 -3
+2359 1 0.0000000000000000e+00 6.1939205763084138e+00 8.9117813052596180e+00 7.0481706532197492e+00 -6 2 -3
+2218 1 0.0000000000000000e+00 5.0423152962671525e+00 7.7925950859052557e+00 6.1633518922033756e+00 -5 3 -1
+2921 3 1.0000000000000000e+00 5.2562080287072881e+00 8.9909297977647746e+00 6.3584986971664073e+00 -4 -2 -5
+2603 1 0.0000000000000000e+00 5.8641625586228532e+00 9.8824604571514758e+00 6.7202919396949712e+00 3 -3 2
+1844 1 0.0000000000000000e+00 6.8973224465589169e+00 8.8417041175855342e+00 6.8647656818648279e+00 -4 -4 -6
+322 1 0.0000000000000000e+00 5.5937680866957109e+00 9.7155102398998601e+00 6.0831261579653439e+00 -4 1 -5
+1535 1 0.0000000000000000e+00 5.4013081559455109e+00 8.5013082053526503e+00 7.2990966877163110e+00 2 2 1
+2870 2 -1.0000000000000000e+00 5.0830041699020816e+00 9.9152235562779865e+00 5.2486604272024753e+00 -3 -3 -3
+819 1 0.0000000000000000e+00 5.7489751972204699e+00 9.1855802611600534e+00 5.3883078595576945e+00 6 -3 0
+2161 1 0.0000000000000000e+00 6.4497019056122049e+00 9.4677544943328993e+00 5.2374406559587889e+00 -2 -1 1
+1601 1 0.0000000000000000e+00 7.3667652694796431e+00 7.6691730609467621e+00 5.1560727680538925e+00 0 0 2
+749 1 0.0000000000000000e+00 6.8648674967123000e+00 8.1183570839400598e+00 6.5273389892473093e+00 -2 -1 -1
+2756 1 0.0000000000000000e+00 6.3076638556037157e+00 7.6305832503516999e+00 6.8786815611436660e+00 0 -4 -7
+916 1 0.0000000000000000e+00 6.4976493791001717e+00 8.7857135139582994e+00 5.8080543208818725e+00 -6 -2 4
+385 1 0.0000000000000000e+00 7.4091184362295737e+00 8.4018836523756413e+00 6.8990249317570544e+00 4 -2 1
+2393 1 0.0000000000000000e+00 7.0180718390906023e+00 9.9685801397949980e+00 6.9553385212692191e+00 5 1 2
+104 1 0.0000000000000000e+00 8.7037867331398520e+00 8.4497661205412484e+00 6.7491757866254085e+00 0 -5 1
+1529 1 0.0000000000000000e+00 7.9768737194449271e+00 8.0832269875903204e+00 5.4215552970291379e+00 3 8 -4
+1301 1 0.0000000000000000e+00 9.0455938685095827e+00 9.4010554847812742e+00 7.1200603927468364e+00 -4 -1 1
+1334 1 0.0000000000000000e+00 9.9522109701541712e+00 9.4230590667997287e+00 5.4222331677283533e+00 2 0 6
+1629 1 0.0000000000000000e+00 9.9356459730043909e+00 8.8476303883867899e+00 5.6220168684943701e+00 -6 3 0
+2269 1 0.0000000000000000e+00 8.6953305607115929e+00 9.0410062707429404e+00 6.4270344906711419e+00 -1 2 -1
+2026 1 0.0000000000000000e+00 9.1920784859441991e+00 9.2347192140606644e+00 5.8218200145778356e+00 3 -10 1
+2667 1 0.0000000000000000e+00 9.0758097206200716e+00 9.0384987254859102e+00 5.0431836974538831e+00 0 -3 1
+1385 1 0.0000000000000000e+00 8.2840754318805381e+00 8.9826770740780031e+00 6.1202110490220800e+00 2 -8 0
+1702 1 0.0000000000000000e+00 9.4420065660309298e+00 9.1881407859417052e+00 6.4592135697907009e+00 4 2 1
+1422 1 0.0000000000000000e+00 7.6353765510688554e+00 9.3516659834053595e+00 7.2844148760018737e+00 -2 -2 3
+388 1 0.0000000000000000e+00 8.3490648106130241e+00 8.3812376475137125e+00 6.0669572077949088e+00 1 5 4
+2837 2 -1.0000000000000000e+00 8.2830852868018940e+00 7.6163057637696143e+00 6.7121200043657634e+00 -8 -1 -3
+2284 1 0.0000000000000000e+00 9.5456932628892570e+00 8.4634943185000946e+00 5.2018644869737978e+00 3 -7 -4
+2746 1 0.0000000000000000e+00 7.6476977514223572e+00 7.6428164357229651e+00 7.4627523529005488e+00 -2 3 1
+536 1 0.0000000000000000e+00 7.8256482778085781e+00 8.2187661392418061e+00 5.8178140915464835e+00 -3 1 5
+1302 1 0.0000000000000000e+00 8.0758869298356668e+00 7.5629184787230175e+00 6.0526205252159935e+00 -6 -3 -1
+993 1 0.0000000000000000e+00 7.5986824095706949e+00 8.4231845919321806e+00 6.3413414275318587e+00 -2 -3 0
+1848 1 0.0000000000000000e+00 8.1178697472669423e+00 8.5215336805568249e+00 7.1131997894888297e+00 4 4 -6
+937 1 0.0000000000000000e+00 7.5182976441286815e+00 9.0484017237457817e+00 6.7801490915902418e+00 -4 -6 -1
+2390 1 0.0000000000000000e+00 8.5439508288536583e+00 9.5789201065920313e+00 5.1596439611329679e+00 2 2 -4
+886 1 0.0000000000000000e+00 8.7969137811106801e+00 7.5157884729080653e+00 5.3275658548148828e+00 3 0 0
+1633 1 0.0000000000000000e+00 8.5718738598755859e+00 9.7471834208596153e+00 5.8710382786249777e+00 1 2 -5
+2268 1 0.0000000000000000e+00 7.9898902832271235e+00 8.8017220438802077e+00 7.2341285246392930e+00 0 2 3
+383 1 0.0000000000000000e+00 9.9666367189231799e+00 9.0948471203199812e+00 7.3470992212094819e+00 -7 -5 1
+956 1 0.0000000000000000e+00 8.7171860924114988e+00 8.1224088510622448e+00 5.7781082269352426e+00 4 -4 6
+1192 1 0.0000000000000000e+00 9.7406882840352651e+00 8.9715907232057024e+00 5.1783263771524126e+00 -8 -4 -6
+640 1 0.0000000000000000e+00 7.8081780317729024e+00 9.1001243312947864e+00 5.4671839830834825e+00 -5 3 1
+225 1 0.0000000000000000e+00 9.3179126780783221e+00 8.2501477384302593e+00 7.3903808211409645e+00 -5 5 2
+1087 1 0.0000000000000000e+00 8.7657848845619508e+00 8.9571875793988145e+00 6.8437710239407155e+00 1 2 -4
+777 1 0.0000000000000000e+00 7.9358329573212414e+00 9.3056881185246940e+00 6.4474532554083197e+00 -3 -2 -3
+168 1 0.0000000000000000e+00 9.6314663417830921e+00 8.0804229630125448e+00 6.8704855195825862e+00 -4 0 -5
+1369 1 0.0000000000000000e+00 9.0603790750145787e+00 9.6695789538940158e+00 6.9834893900458992e+00 -3 -2 -4
+2238 1 0.0000000000000000e+00 8.2659097439614051e+00 9.7466271592409779e+00 6.9601732142711015e+00 6 -3 -3
+1008 1 0.0000000000000000e+00 7.6830063182941144e+00 7.6055595256375756e+00 7.0220035513726256e+00 1 4 3
+1312 1 0.0000000000000000e+00 9.5359318424623982e+00 8.5904412239931567e+00 6.3327307950681142e+00 1 -9 -3
+1654 1 0.0000000000000000e+00 7.8933585530534121e+00 9.9225649319820857e+00 5.6638973627630183e+00 -2 -2 -1
+1876 1 0.0000000000000000e+00 9.3347295227241496e+00 8.9914768965747474e+00 5.7353672195897101e+00 -1 1 2
+1100 1 0.0000000000000000e+00 9.7378002124320382e+00 8.0454917420121355e+00 6.0269298230222654e+00 3 -3 -1
+1845 1 0.0000000000000000e+00 9.4385764529369709e+00 8.5781810620045160e+00 7.2569370523026029e+00 1 -3 4
+2699 1 0.0000000000000000e+00 7.6793587277622795e+00 8.8404951865763000e+00 5.0799888056508635e+00 -5 -2 -2
+2185 1 0.0000000000000000e+00 7.8810379985298011e+00 9.8266003445577557e+00 5.1918009621448977e+00 0 3 1
+2157 1 0.0000000000000000e+00 9.3102677160944705e+00 9.9831283190915681e+00 5.6078655407105424e+00 -4 1 -3
+1026 1 0.0000000000000000e+00 9.1758641414500204e+00 7.9458531474812544e+00 5.3426467779018703e+00 3 2 -1
+2983 3 1.0000000000000000e+00 8.5648585320624502e+00 8.9436220872239289e+00 5.6202978129459611e+00 -2 -2 5
+1040 1 0.0000000000000000e+00 9.7539423605943760e+00 9.8377205463677839e+00 6.6493425987220753e+00 0 -3 1
+991 1 0.0000000000000000e+00 8.9002889473874394e+00 8.0453301179561816e+00 7.2331047267012414e+00 -7 1 5
+1160 1 0.0000000000000000e+00 8.4352721488102365e+00 9.5180159765500356e+00 7.3734817989267274e+00 0 -3 -8
+2091 1 0.0000000000000000e+00 9.9563431797521158e+00 9.4645641336841848e+00 5.8445719055966361e+00 2 3 -2
+170 1 0.0000000000000000e+00 8.2585516929080676e+00 8.6989582098977429e+00 5.0346921292424538e+00 -1 0 -2
+1874 1 0.0000000000000000e+00 6.4419758159451419e+00 5.7277225058183934e+00 8.0460414829076825e+00 2 -1 -5
+2931 3 1.0000000000000000e+00 7.3446835180994530e+00 5.5458510215328998e+00 7.6743290717580246e+00 -4 -4 4
+2432 1 0.0000000000000000e+00 5.8329230889650576e+00 6.1340254116350996e+00 7.7397948908270413e+00 5 6 -4
+2494 1 0.0000000000000000e+00 5.8345977535447018e+00 6.2318497894760627e+00 8.1339342032262358e+00 4 0 -1
+2898 2 -1.0000000000000000e+00 7.1473408799389819e+00 6.5526093880108203e+00 9.5366711284365024e+00 -5 7 2
+1561 1 0.0000000000000000e+00 5.9156681790865351e+00 5.3666797742825691e+00 8.1017436439156398e+00 3 -4 1
+1360 1 0.0000000000000000e+00 5.1571676160293167e+00 5.2428595377969121e+00 8.0646539699471393e+00 0 2 -5
+1870 1 0.0000000000000000e+00 7.3931830727006229e+00 6.3809701253862539e+00 8.8821609551138927e+00 -4 2 -1
+2102 1 0.0000000000000000e+00 6.4988341674497931e+00 7.3805840377075187e+00 9.2057874393230428e+00 1 -6 4
+431 1 0.0000000000000000e+00 5.4808612205455827e+00 6.8494927465708777e+00 8.0447346761814487e+00 -2 1 -3
+1580 1 0.0000000000000000e+00 5.3939320745336108e+00 5.7469923887454755e+00 9.0363834679650878e+00 -6 -5 -2
+2727 1 0.0000000000000000e+00 5.5850521995173494e+00 7.1367438054947892e+00 9.6806182362386615e+00 4 -6 -6
+2043 1 0.0000000000000000e+00 6.5462408353222337e+00 6.6079908984681310e+00 7.9864245998405847e+00 3 4 -2
+821 1 0.0000000000000000e+00 5.3494753122315739e+00 6.8900940427658188e+00 8.7530293551028322e+00 -1 -3 -3
+2309 1 0.0000000000000000e+00 7.3823471340988025e+00 6.6616182692055856e+00 8.2482897734866594e+00 -1 3 3
+270 1 0.0000000000000000e+00 5.5936100415325276e+00 6.6123440723082405e+00 9.1722891000645461e+00 5 6 -4
+1627 1 0.0000000000000000e+00 5.7207339819200067e+00 6.0912020525072856e+00 8.4915067802361612e+00 4 2 -3
+1554 1 0.0000000000000000e+00 5.2564805571778939e+00 5.1181994349645219e+00 8.5662181877347940e+00 -1 -3 4
+835 1 0.0000000000000000e+00 6.8913412680199535e+00 6.6679172828949875e+00 7.5351418499703797e+00 -1 0 0
+1455 1 0.0000000000000000e+00 6.1595710580738103e+00 7.2543206436714840e+00 8.4113900668651027e+00 -4 -10 -6
+1620 1 0.0000000000000000e+00 6.9517816507003003e+00 7.0019267306118547e+00 9.2366337397583997e+00 -2 2 3
+106 1 0.0000000000000000e+00 5.1813267407056021e+00 6.0589649010527928e+00 9.7567113195969970e+00 0 0 4
+656 1 0.0000000000000000e+00 6.9272309516084860e+00 7.1782679636409696e+00 8.4010122734730022e+00 8 -7 0
+1681 1 0.0000000000000000e+00 5.2705443524169366e+00 5.3557807074171322e+00 9.7523290070750104e+00 0 5 4
+1542 1 0.0000000000000000e+00 5.9020058605396928e+00 5.4966307947232513e+00 9.1361765924972058e+00 -3 5 -2
+2200 1 0.0000000000000000e+00 5.8984817354892813e+00 7.4269341585801030e+00 8.9249720541582569e+00 3 -5 2
+2516 1 0.0000000000000000e+00 7.0751066124037978e+00 5.8440464721804632e+00 9.3627510598083834e+00 5 1 -5
+1910 1 0.0000000000000000e+00 7.0959681677775750e+00 6.1779766378841305e+00 8.1887793957605481e+00 -4 1 -3
+677 1 0.0000000000000000e+00 6.5807251381611289e+00 6.1334216516358353e+00 9.1114489861340555e+00 2 1 2
+853 1 0.0000000000000000e+00 7.0113985925515818e+00 5.0164392748813276e+00 8.3895294047925528e+00 0 -3 -1
+1436 1 0.0000000000000000e+00 6.5002427957124711e+00 6.6558150986930054e+00 8.6942245795767583e+00 -2 1 0
+1135 1 0.0000000000000000e+00 5.4685362436621032e+00 7.4236634806901174e+00 8.0250503304005534e+00 -2 2 -4
+1583 1 0.0000000000000000e+00 6.4125019737842610e+00 7.3248195188699681e+00 7.8512575324259943e+00 -3 1 -3
+1243 1 0.0000000000000000e+00 5.1593980238487998e+00 7.4005106265297789e+00 9.1455366113714245e+00 2 -5 5
+528 1 0.0000000000000000e+00 7.0444105039909095e+00 7.3534051250285444e+00 7.6201695146994508e+00 1 1 2
+2098 1 0.0000000000000000e+00 6.6651291454088275e+00 5.2950429173589111e+00 8.6202560431529651e+00 1 -6 -2
+2449 1 0.0000000000000000e+00 7.2631196018790289e+00 6.0595108846864552e+00 9.9318110171098137e+00 6 0 -2
+1817 1 0.0000000000000000e+00 6.7300849226274551e+00 5.7157162370117218e+00 8.7443265711716958e+00 2 -1 -2
+2135 1 0.0000000000000000e+00 7.4355771392418362e+00 5.5684743199262741e+00 9.0805653137158284e+00 -8 6 1
+539 1 0.0000000000000000e+00 6.3981796045146790e+00 5.4159126616788997e+00 9.5195762687030712e+00 -7 4 2
+2887 2 -1.0000000000000000e+00 5.0785009235730758e+00 5.9679980639545658e+00 7.8286467925020613e+00 -4 -5 -1
+959 1 0.0000000000000000e+00 5.2545088739682511e+00 6.9889718973361186e+00 9.9061206924916050e+00 -3 -5 0
+496 1 0.0000000000000000e+00 6.3036034082266612e+00 7.0945234827676114e+00 9.8470267797678250e+00 -3 3 3
+1486 1 0.0000000000000000e+00 7.4697621140943475e+00 7.4141364337765365e+00 9.7995886463204886e+00 -4 -1 -4
+796 1 0.0000000000000000e+00 6.1942366537401110e+00 6.8737894713307695e+00 8.4883316069713253e+00 -1 2 1
+2280 1 0.0000000000000000e+00 6.0335248993091453e+00 6.1534756742839649e+00 9.4604247717955872e+00 -7 1 -3
+107 1 0.0000000000000000e+00 6.1774258043666785e+00 5.0832172924109003e+00 9.7311375934549087e+00 5 3 1
+595 1 0.0000000000000000e+00 7.1705223151732538e+00 5.1333119099689162e+00 9.2806114344365245e+00 -1 4 -2
+2163 1 0.0000000000000000e+00 9.8398293493691007e+00 6.6040148032327339e+00 9.8827004474395235e+00 0 -1 3
+641 1 0.0000000000000000e+00 8.3929147033666496e+00 7.3355153909241428e+00 8.4037984635176972e+00 -4 -8 4
+2184 1 0.0000000000000000e+00 9.9464043459377063e+00 5.8369561487856716e+00 8.2019984837146698e+00 3 5 1
+1056 1 0.0000000000000000e+00 8.2546788906489788e+00 5.4097635764766654e+00 8.4482515510991014e+00 -4 4 -7
+342 1 0.0000000000000000e+00 8.0893790907999339e+00 5.9555370607888580e+00 9.8572030022770765e+00 4 -1 0
+1836 1 0.0000000000000000e+00 8.8366504969873887e+00 6.2666656784103658e+00 8.3563605405560022e+00 -2 -5 3
+1519 1 0.0000000000000000e+00 7.8225334741913475e+00 6.5263768883650188e+00 9.6901260567027840e+00 -1 6 -2
+2712 1 0.0000000000000000e+00 9.8249429856248263e+00 5.6220904052258929e+00 9.2054070144452460e+00 -3 1 -1
+1622 1 0.0000000000000000e+00 9.7839293399762344e+00 5.9094804431264025e+00 9.9064091331704702e+00 5 0 -3
+945 1 0.0000000000000000e+00 8.0868769106540039e+00 6.1669093166275868e+00 9.2111889191467586e+00 -2 3 4
+63 1 0.0000000000000000e+00 8.4743323358088798e+00 6.9601046532600881e+00 9.7398951797600439e+00 3 0 -2
+2611 1 0.0000000000000000e+00 7.7023124750291565e+00 6.9404246792937840e+00 7.5124065320061924e+00 1 -1 -1
+1090 1 0.0000000000000000e+00 9.4182281165564969e+00 7.3033824908405940e+00 8.4294509708997811e+00 -1 -3 1
+2790 1 0.0000000000000000e+00 9.8001623072549755e+00 6.2450716952119736e+00 9.1314927287150844e+00 1 0 -1
+1712 1 0.0000000000000000e+00 8.8920071141033326e+00 7.0096986029405182e+00 8.9145060026307945e+00 3 -3 5
+1418 1 0.0000000000000000e+00 8.2931776533647348e+00 6.8050924099880374e+00 7.7443280708427595e+00 4 -3 -3
+594 1 0.0000000000000000e+00 9.0892189433349646e+00 5.1441638468105575e+00 7.6235629483527685e+00 -6 1 -1
+2620 1 0.0000000000000000e+00 8.7406721065531574e+00 6.5689538834482599e+00 8.3449335152845396e+00 0 4 3
+1983 1 0.0000000000000000e+00 7.5206819564642462e+00 6.4905737162041133e+00 7.5604402352232887e+00 -6 4 1
+2510 1 0.0000000000000000e+00 9.2617876878299299e+00 6.2959082933382655e+00 9.5493892541890872e+00 4 1 -3
+311 1 0.0000000000000000e+00 9.0654680470354680e+00 6.8999925836744964e+00 9.6223688143178041e+00 4 -5 -2
+2057 1 0.0000000000000000e+00 7.6021021289536588e+00 5.6324888747040607e+00 8.1524743195213354e+00 2 1 3
+962 1 0.0000000000000000e+00 9.5934199175940726e+00 6.1574193883964687e+00 8.7451204575047292e+00 -1 -4 1
+978 1 0.0000000000000000e+00 9.5936171786006668e+00 6.2226668611984834e+00 7.9368156171892537e+00 -4 2 3
+2676 1 0.0000000000000000e+00 8.4888455258806452e+00 6.1104625692807542e+00 8.4269887774277432e+00 -8 0 -5
+555 1 0.0000000000000000e+00 9.2020595919914197e+00 5.7333261894936234e+00 7.8507707015692478e+00 0 -5 2
+623 1 0.0000000000000000e+00 9.4805797092748563e+00 7.0174144899562778e+00 8.8242209295970486e+00 -1 3 -3
+2618 1 0.0000000000000000e+00 7.7932542477680071e+00 5.5648094965122343e+00 9.6722618202313981e+00 -7 1 0
+942 1 0.0000000000000000e+00 8.0263570472751535e+00 6.7992789278134271e+00 8.5955325387706552e+00 1 2 4
+784 1 0.0000000000000000e+00 8.7299673564574665e+00 7.3739642264172289e+00 9.7201240035111010e+00 2 -3 -7
+210 1 0.0000000000000000e+00 8.6524408888509150e+00 5.9228838213908066e+00 7.7698153323802650e+00 0 -4 -7
+1959 1 0.0000000000000000e+00 8.4092712360029207e+00 5.6371219336486060e+00 8.9385520791658664e+00 -3 -8 -2
+804 1 0.0000000000000000e+00 9.9692379663009625e+00 7.1911866262246580e+00 8.9210127337575802e+00 4 0 -8
+645 1 0.0000000000000000e+00 7.6505969193831014e+00 7.3050899054877867e+00 8.8187407505970263e+00 -3 -3 0
+500 1 0.0000000000000000e+00 7.9822575349574665e+00 7.2967895320075611e+00 9.2090576440830159e+00 -5 1 1
+951 1 0.0000000000000000e+00 8.0216126464512048e+00 6.9341308766316070e+00 7.7189311776313794e+00 4 0 1
+2724 1 0.0000000000000000e+00 9.6193994894428645e+00 7.3841476409083606e+00 9.7126055590958380e+00 5 2 1
+1063 1 0.0000000000000000e+00 9.2922313822890548e+00 5.4985496516114907e+00 8.6508241630713698e+00 0 8 0
+2437 1 0.0000000000000000e+00 8.9123077628293697e+00 6.0072522796104231e+00 9.5028002992599063e+00 5 2 1
+281 1 0.0000000000000000e+00 8.2579206968864263e+00 5.0039372607628865e+00 7.6124523193482725e+00 0 7 1
+1634 1 0.0000000000000000e+00 9.2304592758159707e+00 6.9365125319988659e+00 8.0947239331035057e+00 -6 2 -1
+498 1 0.0000000000000000e+00 8.8041869864676059e+00 5.1028595433393473e+00 9.6320415799322863e+00 1 -3 4
+1244 1 0.0000000000000000e+00 8.6430734434635692e+00 5.3566983031019699e+00 9.0105576596771293e+00 0 5 -2
+590 1 0.0000000000000000e+00 8.4203688415224374e+00 6.5712543020710861e+00 9.4539160852919188e+00 7 3 1
+1350 1 0.0000000000000000e+00 9.7412806798646994e+00 5.0257726293081459e+00 8.1190134593706738e+00 -8 3 -5
+983 1 0.0000000000000000e+00 5.0462101346198009e+00 7.6487898729142012e+00 7.7236264836951491e+00 -2 -7 1
+128 1 0.0000000000000000e+00 6.2230659673624054e+00 9.9072658227920076e+00 7.5863546581548915e+00 8 -3 0
+2919 3 1.0000000000000000e+00 6.4879618359364351e+00 7.9212262997335854e+00 8.4779496966894659e+00 -8 -4 -2
+1774 1 0.0000000000000000e+00 6.1935003821414627e+00 9.6524309728693698e+00 9.3377345407813674e+00 -3 2 -6
+2985 3 1.0000000000000000e+00 6.6630123361953837e+00 9.0576709953543446e+00 9.7430196903232282e+00 4 -1 1
+1877 1 0.0000000000000000e+00 7.1746451124250035e+00 7.8218246693383300e+00 8.9002033576318169e+00 4 -5 -2
+567 1 0.0000000000000000e+00 6.3274753385725697e+00 9.1025380648800933e+00 7.5702634780449634e+00 6 -5 -7
+721 1 0.0000000000000000e+00 7.1764236443105709e+00 9.5369542169230321e+00 7.8756708561676776e+00 -2 3 -1
+1395 1 0.0000000000000000e+00 7.3094760961184537e+00 8.7402824056512074e+00 8.9938437365788353e+00 -4 0 -6
+333 1 0.0000000000000000e+00 5.7852817178723210e+00 9.0958014051875349e+00 9.6170386441451523e+00 1 2 -1
+1093 1 0.0000000000000000e+00 7.2722393385489319e+00 9.9696984020567907e+00 8.0828270906225725e+00 -2 -4 -4
+2279 1 0.0000000000000000e+00 5.2355977985841680e+00 8.8191890579210863e+00 9.3282447673722775e+00 5 -5 -2
+2522 1 0.0000000000000000e+00 5.4979922148036700e+00 8.2938872584227656e+00 9.8219593693382290e+00 -2 3 1
+1947 1 0.0000000000000000e+00 6.6692812462732620e+00 8.2835176427636039e+00 7.5940824516550505e+00 2 4 2
+1339 1 0.0000000000000000e+00 6.9018287128416036e+00 9.3829721025860682e+00 9.9608395790142321e+00 4 -1 3
+184 1 0.0000000000000000e+00 5.7384539504578553e+00 7.9124777836503295e+00 9.2081917677300016e+00 0 2 3
+2721 1 0.0000000000000000e+00 5.4551476392638021e+00 8.2137803015998472e+00 9.3600053255793192e+00 -5 -6 -2
+105 1 0.0000000000000000e+00 6.3997830156062241e+00 9.1619164517776266e+00 8.2522339462479870e+00 -3 -1 5
+2673 1 0.0000000000000000e+00 5.7002616793794889e+00 7.8291516405464634e+00 8.3009219949430086e+00 -1 -2 -5
+1749 1 0.0000000000000000e+00 6.2433905438491912e+00 7.9052566719904878e+00 9.7312037476487419e+00 -2 -6 -5
+1143 1 0.0000000000000000e+00 6.9050486777311271e+00 8.0736802416608988e+00 8.0148857706506487e+00 7 -4 -5
+880 1 0.0000000000000000e+00 6.4151623595179013e+00 7.9487094625800276e+00 9.5704774877407974e+00 -4 0 -4
+1581 1 0.0000000000000000e+00 6.8264315295507867e+00 8.4856664786137337e+00 8.7997687883942763e+00 7 -3 1
+2011 1 0.0000000000000000e+00 5.5699969483570193e+00 8.4939517929300123e+00 8.3413176090786418e+00 0 4 -2
+2008 1 0.0000000000000000e+00 5.0150559025949271e+00 9.6526156169356323e+00 8.5027654503925572e+00 2 0 4
+1735 1 0.0000000000000000e+00 5.1721679946843455e+00 9.8306461477154272e+00 8.2166609449748673e+00 0 0 5
+1791 1 0.0000000000000000e+00 5.9857016383632233e+00 7.7783027529433246e+00 7.7334613229237581e+00 -1 -2 2
+2201 1 0.0000000000000000e+00 6.1513916148008772e+00 8.4757390351992150e+00 8.0909657595275597e+00 1 -2 2
+856 1 0.0000000000000000e+00 7.3500166237129925e+00 9.2158697002040828e+00 8.4822373635606176e+00 4 -3 -7
+1890 1 0.0000000000000000e+00 5.5722621056671260e+00 9.7785572236857412e+00 9.1156792514766192e+00 -4 -1 4
+366 1 0.0000000000000000e+00 6.8947252523036289e+00 9.1561072410002318e+00 7.9904307382894908e+00 1 -2 -4
+654 1 0.0000000000000000e+00 6.6686528840692487e+00 8.6691100321756949e+00 9.4593342549493276e+00 -4 2 -1
+622 1 0.0000000000000000e+00 7.1306686640388630e+00 8.4957051086754269e+00 8.2561767724960653e+00 3 0 3
+426 1 0.0000000000000000e+00 7.2125003310903724e+00 8.3264697146459437e+00 9.5515503520906222e+00 -5 -3 0
+940 1 0.0000000000000000e+00 5.6979260006683550e+00 9.8342079866957057e+00 8.2483021742642997e+00 4 0 6
+1212 1 0.0000000000000000e+00 5.8357015624165625e+00 8.5129529312245840e+00 8.8325128383852469e+00 1 1 1
+1297 1 0.0000000000000000e+00 6.8381194152456706e+00 9.6214790995936852e+00 9.4136130903181350e+00 0 -1 -2
+2654 1 0.0000000000000000e+00 7.4770878639603673e+00 7.8121288456658835e+00 9.7324180586919535e+00 -2 3 1
+335 1 0.0000000000000000e+00 5.1263752680187009e+00 9.5444619120576899e+00 9.8803542543752485e+00 -2 2 3
+261 1 0.0000000000000000e+00 5.3274169347785874e+00 9.1284023154799101e+00 8.3187486777829491e+00 -2 0 -4
+2345 1 0.0000000000000000e+00 6.0976393987168107e+00 9.3561159467095418e+00 8.9601945860598775e+00 -2 3 1
+838 1 0.0000000000000000e+00 7.4509020408286384e+00 8.7905282667168994e+00 7.7392061578680540e+00 2 -1 0
+1383 1 0.0000000000000000e+00 7.0378762393710170e+00 9.3761867914082409e+00 8.8595245136419774e+00 1 -4 2
+2344 1 0.0000000000000000e+00 5.5423300598263232e+00 9.1670310926120937e+00 7.9659329098429721e+00 -5 0 2
+2160 1 0.0000000000000000e+00 5.1477654028550042e+00 9.9619916806137336e+00 9.9880627444013026e+00 1 1 0
+1725 1 0.0000000000000000e+00 8.7677275053056043e+00 9.2122258194545470e+00 8.8088385528969155e+00 2 0 2
+2801 1 0.0000000000000000e+00 8.4660831536850143e+00 7.8583114162058818e+00 9.1868382599890293e+00 -3 1 -1
+2639 1 0.0000000000000000e+00 7.6803877961057365e+00 9.7051730690910389e+00 9.1899332379065761e+00 3 -5 2
+2101 1 0.0000000000000000e+00 7.6003676821269881e+00 9.3288831152649898e+00 9.8903123515452531e+00 9 3 3
+369 1 0.0000000000000000e+00 8.0117535225811807e+00 8.4989409869766330e+00 8.7287438782718105e+00 -4 1 -2
+78 1 0.0000000000000000e+00 8.8665309738510310e+00 9.6784405488802179e+00 9.9591175166010704e+00 -2 3 -2
+1745 1 0.0000000000000000e+00 7.7382077926084403e+00 8.1295403996823392e+00 8.5469083168816020e+00 -1 3 3
+518 1 0.0000000000000000e+00 7.9976818850966307e+00 8.9638896838137683e+00 8.1423978149103746e+00 -1 2 -1
+480 1 0.0000000000000000e+00 7.5949649730997866e+00 7.8961711127160052e+00 8.2594119727411535e+00 -2 -3 4
+308 1 0.0000000000000000e+00 8.6295673167080587e+00 9.3147981801723923e+00 8.0038197000534321e+00 4 -2 -2
+324 1 0.0000000000000000e+00 9.4455472951160946e+00 8.8150538585996827e+00 8.0194753004761896e+00 2 5 4
+379 1 0.0000000000000000e+00 8.2692670814113622e+00 8.0982093742464354e+00 7.8923157683555978e+00 -2 -1 -1
+1348 1 0.0000000000000000e+00 8.2260387960213901e+00 9.8260930882241144e+00 9.7054807302230959e+00 -3 0 4
+846 1 0.0000000000000000e+00 8.1763357133686085e+00 8.7158063335930436e+00 9.5362243937224225e+00 0 -3 -3
+2822 2 -1.0000000000000000e+00 7.6398265451879848e+00 8.7562772407223566e+00 9.7370421366795483e+00 -2 -1 -4
+2492 1 0.0000000000000000e+00 8.5871088675816587e+00 9.3037790821608244e+00 9.9219669637962031e+00 0 4 9
+614 1 0.0000000000000000e+00 9.3683423729756363e+00 9.3698991262380762e+00 8.7008231443039215e+00 3 5 -3
+1120 1 0.0000000000000000e+00 9.7165488629813836e+00 8.8881181582201023e+00 9.5853225880575774e+00 -7 -3 1
+429 1 0.0000000000000000e+00 9.6064668838337504e+00 7.9042597441805542e+00 9.2489921432322078e+00 -4 -2 2
+2791 1 0.0000000000000000e+00 7.9456622472047380e+00 9.1729750177457579e+00 8.9546287628665659e+00 -3 -4 2
+161 1 0.0000000000000000e+00 9.5719876753046318e+00 8.8617126711734127e+00 9.2089690424722850e+00 3 -6 -1
+879 1 0.0000000000000000e+00 9.4364512203280189e+00 9.9390033027959852e+00 8.4307203029367930e+00 5 -6 0
+1480 1 0.0000000000000000e+00 9.5690570751224389e+00 8.7586468436171803e+00 8.4659526507389220e+00 -2 0 -2
+593 1 0.0000000000000000e+00 9.6370218310582505e+00 9.6783165547912944e+00 9.3774960827902589e+00 -9 1 3
+2630 1 0.0000000000000000e+00 9.8815606974372017e+00 8.1610447199242344e+00 9.1564685654959312e+00 2 -1 -6
+628 1 0.0000000000000000e+00 8.9138072213332453e+00 8.5841945708506433e+00 9.5000949312906524e+00 1 2 4
+2599 1 0.0000000000000000e+00 7.6170684833168965e+00 7.7565921945440710e+00 7.7486099129065344e+00 1 -1 -2
+508 1 0.0000000000000000e+00 8.5971305327736047e+00 8.2163371212419705e+00 9.5881808919244715e+00 0 -8 1
+478 1 0.0000000000000000e+00 7.8076697541061995e+00 9.7335231923331342e+00 7.9941495259717090e+00 0 0 -6
+1108 1 0.0000000000000000e+00 8.4086033464148393e+00 9.7693716602181020e+00 9.0355830930382393e+00 2 -5 -1
+1287 1 0.0000000000000000e+00 7.8163108500757987e+00 8.4796936165572578e+00 9.2922985834646905e+00 1 1 -2
+2206 1 0.0000000000000000e+00 9.5765903987656866e+00 9.0719304856579051e+00 7.8108201297765296e+00 -2 -3 1
+306 1 0.0000000000000000e+00 9.3847205063653192e+00 8.2072955224636370e+00 8.4070541016567990e+00 -6 4 -5
+1068 1 0.0000000000000000e+00 7.6791234727445552e+00 9.9492264259877015e+00 8.8567408343080523e+00 -2 6 0
+1830 1 0.0000000000000000e+00 8.8503435498268654e+00 8.6667852567370076e+00 8.3752669240342925e+00 -2 1 2
+1683 1 0.0000000000000000e+00 9.7408684383722033e+00 8.1539532245533195e+00 8.1936917871183343e+00 -2 -4 4
+2774 1 0.0000000000000000e+00 8.7782331685044959e+00 7.7171502955404385e+00 7.8330054345030273e+00 3 -5 -2
+1283 1 0.0000000000000000e+00 9.2942468022201492e+00 9.0486965676468252e+00 9.8946827556257606e+00 -5 3 3
+1141 1 0.0000000000000000e+00 9.8451905102328894e+00 7.8564474673993194e+00 7.7019725802440924e+00 6 -3 -6
+297 1 0.0000000000000000e+00 8.8637549306624557e+00 8.6350127577292657e+00 7.6746487045547465e+00 -1 -2 3
+2995 3 1.0000000000000000e+00 8.4889494133915804e+00 7.9384501458815251e+00 9.9955153982149394e+00 -4 5 -2
+111 1 0.0000000000000000e+00 8.8130132207545344e+00 7.6591221065343804e+00 8.5792614179446964e+00 -3 3 -7
+2975 3 1.0000000000000000e+00 9.3245310397566215e+00 9.3778510763781426e+00 9.2530434261568413e+00 -9 0 3
+2141 1 0.0000000000000000e+00 9.0065152590339164e+00 9.6787859475809181e+00 8.0902855810248795e+00 7 0 -8
+291 1 0.0000000000000000e+00 9.2093464753120688e+00 7.5945480619139154e+00 9.3835361684226815e+00 -1 -2 -1
+2547 1 0.0000000000000000e+00 8.3196098269833367e+00 8.0826100277752602e+00 8.5383310167881703e+00 5 -1 -3
+1295 1 0.0000000000000000e+00 8.6578035850849790e+00 8.9868856426317230e+00 9.1866800970735625e+00 3 4 2
+
+Velocities
+
+657 7.6155382082231127e-01 -2.3445559464023527e-01 1.1436731372546243e+00
+2175 -1.8856601492377073e-01 7.8270365787464535e-01 -3.2193215229649408e-01
+1900 -8.9366236509353481e-01 -5.8614578045241017e-01 -2.0292645138888479e+00
+360 -1.7328632495525559e-01 -6.2850786631145295e-01 -1.8694019651490439e+00
+1860 1.3250527081080097e+00 2.9957835794953203e-02 7.1227933802270316e-01
+23 -6.4455590945780461e-01 4.1211201955083876e-01 -1.2094897313206421e+00
+2797 -6.3633327848799370e-01 1.1236568210671998e+00 -4.4425464900192219e-01
+1094 1.4589307512180327e-01 2.9260035009990909e-01 -4.2825202303948462e-01
+1915 -1.4555952514393083e-01 -4.2806799763109171e-01 -6.6306713895109703e-01
+2254 1.0407205171603719e+00 -1.7883325257750465e-01 1.0724623054778928e+00
+2222 1.8966810308473486e-01 -1.7459554639589776e+00 -1.4504097415363788e+00
+295 -4.1829182784602259e-01 1.6904231180034218e-01 3.2725847933287394e-02
+1880 6.0602606446069163e-01 5.4195272933812400e-01 -9.5962058882644818e-01
+1478 2.6441395755386010e-02 1.2436171389191381e-01 5.1613443210533172e-01
+2687 3.2016478475855581e-01 -1.3945169569767399e+00 -3.2660272239544341e-01
+1178 6.5486135750008656e-01 -1.0959193270492912e-03 -1.2523172021850488e+00
+2662 -3.7617589069446011e-02 -1.6598961735360780e+00 7.1610888392915939e-01
+1386 -5.1080567968770096e-01 -6.0164780920465377e-01 5.2165779087016084e-01
+1433 -3.3684025702382631e-01 6.2753002813341507e-01 -8.9286669551854425e-01
+1245 -2.7502164294017978e-01 -1.3023742260088400e-01 -8.9327147367393489e-01
+2734 -6.9274854842794953e-01 3.5802774863665726e-01 2.1573647129525939e-01
+1730 2.2860867473320091e-02 -1.2195987938693307e+00 5.4568628023986510e-01
+2781 -1.1278179500278320e+00 -1.1958634227958604e+00 4.8850146695130364e-01
+259 -1.3259217596216539e+00 2.4867492897014648e-01 -4.5068025255777239e-01
+1109 -1.3595753054140580e+00 -1.9408753185583807e+00 -9.7525885066762830e-01
+2126 -6.7133321466861495e-01 2.7362453366658601e-01 1.4126533751241650e+00
+319 -3.6140591133603178e-01 1.6554545965112859e+00 1.2732468518451996e+00
+307 6.4379624225187448e-01 7.5874593723021966e-01 9.7160710234742953e-01
+2343 -1.4024187129248242e+00 4.2263764995885938e-01 -2.1403391291334897e+00
+1162 -4.6007542258527800e-01 2.3691643192861428e-01 -1.1593398782577449e+00
+1154 -4.0538947782919404e-01 4.6222082878712756e-01 1.9098460453050534e+00
+1138 6.7770422159130950e-01 5.4694371418799326e-01 1.8078360607183117e-01
+2873 -1.3848009090844828e+00 3.8644261369316296e-01 3.8345664999046414e-01
+118 -1.3756572277221293e+00 -6.5168191162337097e-01 9.7536532305462487e-01
+2023 2.9556984236313349e-01 -6.5140901327693024e-01 1.1137907257923460e-01
+2179 -9.5186563904875132e-01 -4.1267347957086233e-02 -9.9997240277649047e-01
+2395 -1.9715199359337823e+00 1.0654955462412299e+00 1.2846495826932671e+00
+2546 -1.8193080030057789e+00 5.7638497896147456e-01 -2.8691523203175268e-01
+863 -2.5140390209572383e-01 -1.4240826449094706e+00 -5.3927112811301237e-01
+1560 -7.5301252184068612e-01 -4.0421738528587581e-01 7.3558425548932260e-01
+1567 -1.1551207067860993e+00 1.0848839634291216e+00 -5.9430707576541730e-02
+1960 -8.8149469233940325e-01 8.0264878528444061e-01 -8.6328191599251991e-01
+2636 -3.8245732493643669e-01 -4.1258364056646724e-01 -1.2446905741949328e+00
+568 2.7922011585183226e-01 6.1977864987700276e-02 -1.2869748824348123e-01
+414 1.0656290143775076e+00 -3.4316802882692454e-01 -3.0232882032514952e-02
+452 1.2785431858182952e-01 8.9795513015727568e-01 -2.9958672836666878e-01
+2097 1.4964979969140246e+00 6.7986283011548487e-01 -4.2072629673414219e-01
+2242 -1.4247381355864369e-01 -4.1437539982188060e-01 6.7667506509073694e-01
+1458 -4.1340593661362124e-01 -7.2761687786533624e-01 9.8806651929155342e-01
+1690 -3.6355934624969122e-01 -5.8714864521921195e-01 -1.5864693808125166e-01
+2890 -1.1565027175028204e-01 -1.0087267642371691e+00 -1.3810391786254792e+00
+941 -5.4356313439776882e-01 -3.4522648006952344e-02 5.4697557056800961e-01
+2307 -1.3550703606114256e+00 -1.4938185883314932e+00 -1.5947272684193334e+00
+2757 -1.2271845005428599e+00 1.6534124822891811e+00 2.6100951161997763e+00
+292 -3.1934335684683157e-01 -4.7251153942549265e-02 7.9452274153899394e-01
+2408 -2.9899243272620515e-02 9.0812701086746761e-01 9.3750239504865251e-01
+1733 4.7758773554296396e-01 6.8110308925471486e-01 -2.3799700545413227e-01
+313 -1.2668617312910015e+00 -5.1556154634196694e-01 -1.8760437565456051e-01
+1888 -3.0946354089798187e+00 -6.4578734425735618e-01 -1.8328243159930618e-01
+809 4.5465764187083946e-01 -6.0295503898317360e-01 -3.7467050167270310e-02
+1824 -2.4704840345995152e-01 -8.2381105667836341e-01 -1.9898173054051990e-01
+705 -3.5650828368605988e-03 -5.9439335684744476e-01 7.8276605765879725e-01
+24 1.5847360898265861e+00 1.6477733089316815e-01 1.9647421148862906e-01
+186 -1.1321600798310107e+00 8.5130321222794936e-01 1.1065710304143563e+00
+1344 -8.2505880882286398e-01 2.1100296052707088e-01 4.4961821836274063e-01
+153 -1.3321050464839201e+00 -1.0156948978018130e+00 -8.8279921505556735e-01
+2246 6.6945996545731401e-01 5.5843038968422576e-02 -4.6183272546849552e-01
+1999 9.9951531037912766e-01 2.4649905213172767e+00 -3.4377008005602394e-01
+2737 -6.4092871713428395e-02 2.1956081893951547e+00 7.9310693909142516e-01
+252 1.6996218386532433e+00 1.6981936776933118e-01 -1.6186576176944705e+00
+2320 -1.0721478242472640e+00 1.7379869585408547e+00 3.9014683408839373e-02
+2128 -1.5064925816051316e+00 4.0165487993874543e-01 7.4285469746576918e-02
+1449 1.2732426126271805e+00 3.6431372461612122e-01 4.2415224758171577e-01
+1966 -5.4553296381962202e-01 5.8607521366162230e-01 -1.9249489986153745e-01
+2681 -5.5647194315531323e-01 -9.2165072512414070e-02 -1.4473088687460958e+00
+2986 -4.5718815207203095e-01 1.5601248533271439e-01 -6.7303921655245746e-01
+1507 -1.1239581753380896e+00 -6.5216528150593844e-01 8.4035386264692791e-01
+2196 -3.1496580694657478e-01 7.5886723251640387e-01 -5.4970737745844467e-01
+49 -5.5143156068245658e-01 4.9415322736994371e-01 5.2579260082444557e-01
+1365 -3.2502989601098181e-02 9.1664688955907969e-01 1.1875890347783642e+00
+1452 5.7721590640750775e-01 2.4191481837335529e-01 -8.3687595967837591e-01
+1770 -1.4263292457260919e+00 4.1578123243103093e-01 8.7523246844910685e-01
+1238 1.1765781550400201e+00 -7.1274892965811942e-01 2.4201231718053418e+00
+140 1.1475487739465227e+00 7.2896219511455518e-01 -4.7687484467271241e-01
+900 7.3641924082137389e-01 3.5170823386579914e-01 -1.1337720005781358e+00
+596 -1.5119215521450948e+00 -1.7807874208172272e-01 -6.4352870067843826e-01
+1771 1.0903112371692649e+00 -7.0040642888884885e-01 2.9491877736206484e-01
+638 4.0107930804056968e-01 -1.3098165394483039e+00 1.0053390585932596e+00
+2879 -5.8093707310056975e-01 7.4592963862464901e-01 5.0259510945778407e-01
+1932 2.9823717722420062e-01 7.9561319178395140e-01 -2.2117054139311372e+00
+1827 -1.2529496750949370e-01 -7.7379493234877050e-01 -8.5412714268816936e-01
+143 -8.6993427984045557e-01 -1.1933218453436458e+00 -3.0634848636600207e+00
+1603 7.6152204439174642e-01 3.5856327880019445e-01 5.7509434997142195e-01
+687 1.0794883931213466e-01 1.1702448494463111e+00 -9.6174805061741830e-01
+1128 1.4814955459241228e+00 -2.4079987941497571e+00 1.4497919072032892e+00
+359 -1.8485060364945560e+00 1.0309326265110881e+00 2.6802414025992465e+00
+7 1.7288617115117477e-02 2.1656179135778451e+00 -1.1421767332791515e+00
+2226 -8.1462614676335876e-01 9.0847158380625437e-01 9.5753509106045231e-01
+298 -8.2610929213187523e-02 -6.4083168820093628e-01 -1.9672810131586926e+00
+1347 8.4728080994036703e-01 -1.4525741329032243e-01 9.9062222293606483e-01
+2310 6.4873062484029143e-01 -2.2058191347796124e-01 5.4853236764119195e-01
+617 9.2973139486546352e-01 -4.6366461428691241e-01 -6.0402066921435893e-01
+74 2.1215067825531690e+00 -2.2977328038852868e-01 4.2288705676312571e-01
+2002 -6.2603432314636787e-01 -1.0436385905667089e+00 9.5144405400868670e-01
+965 -1.0889674270953842e+00 5.1272582105896802e-02 4.9962442193607803e-01
+958 -3.2501755858135861e-01 -6.3521295227608265e-01 -2.9144101858521598e-01
+138 4.0450288304592064e-01 -4.4736461104888325e-01 -1.8772592360577314e-01
+2349 2.7076046818601729e-01 -1.2406961954556741e+00 -9.2966109000731698e-02
+741 6.0771474470373199e-01 9.0558712494667237e-02 1.3207689098577036e+00
+847 2.4260353594256183e+00 -1.3022670095610123e+00 1.0083724917734183e+00
+2925 1.3943702093623593e+00 9.5430257814164399e-01 -1.1195597413566719e-01
+37 -2.4085604637043373e-01 5.2779879635477178e-01 -1.4032467441643828e+00
+2923 -7.1537898494614061e-01 6.7251323376149452e-01 -3.0520333580411085e-01
+1091 -1.4710838655136733e-02 -7.8577005851262149e-01 8.1014160331920748e-01
+331 -1.4579784011231285e+00 5.3500895325497022e-01 -4.4082123052781202e-01
+2891 -1.0983895659356882e+00 8.9415634321489912e-01 7.7600195007493336e-02
+626 -2.7513248520931610e-01 9.4876580922990700e-02 5.4081711927629783e-01
+2197 9.0430583799144915e-01 1.4863438510674836e+00 8.6160311813644141e-01
+2247 4.6720016208637222e-02 1.1811491184862386e+00 9.5119309263116769e-01
+2125 -9.2454684234741902e-01 -6.3483993191288779e-01 6.7651385692589705e-01
+1256 6.2318946127385844e-01 -1.0402359645663120e+00 -1.2906013833086181e+00
+2327 1.2944677734400947e+00 -3.8573753542073402e-01 -9.1843446609140877e-01
+2227 7.6396733884053802e-01 2.3228081351133754e+00 -1.8446426664797226e+00
+1549 1.2668801633677169e+00 3.6419405056485044e-01 8.1612628215362260e-01
+1174 -5.4036904329091329e-01 -2.4726915370094094e-01 -1.8404985591950396e+00
+1775 1.5320993629316195e+00 5.7610272434020138e-01 4.3593039020575008e-01
+2706 7.0625431155188365e-02 -3.6751525158654819e-01 1.4443609679399412e+00
+1689 -1.4017979291893981e+00 1.0560340495504192e+00 1.3039816494898211e+00
+1963 1.3856301932068149e+00 8.0733945435580290e-01 7.0500061974233252e-01
+2967 -3.0002545081464893e-01 8.1238234089387495e-01 1.2407514532386501e+00
+1014 2.7213595312739386e-01 2.8852913310938777e-01 -1.8829843585263530e+00
+2069 -9.4988910365692536e-01 -6.1808737882472486e-01 9.4079034531891081e-01
+2715 7.4099240671968847e-01 2.5645656868199040e-01 5.7352646193404055e-01
+1597 -8.4620465454249172e-01 1.1481077441402017e+00 6.2625283355350070e-01
+1237 -8.6589557745789136e-01 2.9902915712495806e+00 -2.2796494385684518e+00
+97 -1.7894847462591692e+00 -3.2382895911848175e+00 8.0887375618915713e-01
+451 6.9474089459201083e-02 2.5055172778345276e+00 8.8997250112634052e-01
+1092 9.2685315328416437e-02 5.5670449509918685e-01 1.7560750672309786e+00
+494 -8.1324894963862815e-01 -2.5034079600232113e+00 -6.7278749581109532e-01
+1545 1.4426536265230436e+00 -1.0202034657276178e+00 6.2482459047331673e-01
+1082 9.3138276671333120e-01 -1.2125134456373257e+00 8.2670225841117606e-01
+1367 1.6651165712732424e-01 -1.3874072581038726e+00 -4.8033884431446616e-01
+689 -1.0777483477765337e+00 6.6200035899927256e-01 -8.1354972995454911e-01
+814 3.0495130389644176e-01 1.7489443289200640e-01 1.8226832530539510e+00
+2798 -1.6065200318390125e+00 4.0003015753858140e-01 -1.1665882415620343e+00
+1759 9.8517855046648928e-01 5.9801493854290988e-01 -6.6072715281823990e-01
+430 7.2244112434500263e-01 -7.8614158373779663e-02 9.8692696814983649e-01
+619 1.6508888114297939e+00 -1.3957184303419317e+00 1.3084353914972306e+00
+346 -8.5727126932511799e-01 7.5299164836283350e-01 1.1166465925871030e+00
+703 -4.5298831178392396e-01 -1.8320953039786947e-01 2.0696243334167780e-01
+1062 -1.4046382109955169e+00 -1.7980678945757986e+00 -4.4712284368934396e-01
+349 -9.0566676904091523e-02 7.9533917932676723e-01 1.6438316092055507e+00
+1173 -5.7474844815199833e-01 -1.8655046344528023e+00 -1.1384268700124105e+00
+1125 -4.2319614498921632e-01 1.1373214123302213e+00 5.3540945702888321e-01
+1825 1.6846037864438148e+00 1.1883599353546266e+00 1.1794325660196798e+00
+294 8.4390110459659473e-01 -1.9224471864041554e-01 1.1929396326149313e+00
+1084 -1.8240005158809307e+00 1.6229851094333908e-01 -1.9369232761305516e-01
+1659 3.3306319740712503e-01 -1.1753916233065698e+00 -4.7083724335795213e-01
+1743 -6.4399775384346181e-01 -1.1041565918360872e+00 -3.2101334164244999e-01
+2703 -5.3322030897900297e-01 -4.0515894208914877e-01 8.3690712727486294e-01
+442 -1.0174830024134760e+00 -1.9465360642956302e+00 9.1710753666918632e-01
+1310 -2.7129930048960943e-01 -1.0270497648988899e+00 -4.2203127141039126e-01
+1873 -3.6947243669867630e-01 1.0041266660199948e+00 4.3800660837072997e-01
+2282 -3.9824183044842643e-01 3.5079588464216604e-01 -1.1437560239412230e+00
+2336 -1.6112746617051998e+00 -5.5923450826528764e-01 -9.9615174644517718e-02
+2804 8.4119141500542297e-02 -3.0814595881974067e-02 9.3651713604180542e-01
+2431 3.1991947705482839e-02 1.6857710317378136e+00 -9.7553581379318755e-01
+57 -5.4986684057288215e-01 1.2961206195857020e+00 -6.8250246820448490e-01
+137 3.5917985708798683e-01 6.5611033948702005e-02 -2.6246349132902325e-01
+686 8.0445202843357533e-01 1.6442867165014977e-02 1.2533620044380138e+00
+2288 3.8163712516046816e-01 -3.1363545265995052e-01 -5.6267559769600306e-01
+2473 1.4825364495380380e-01 5.7837249053464213e-02 1.7314546669033777e+00
+2233 -2.9401281598436158e-01 3.7101535641381639e-01 -9.7645757739483008e-01
+2293 -7.6601662628261280e-01 7.7136913265534734e-01 1.6526030679858628e-01
+167 -1.0892725013416333e+00 -6.1542906900772498e-01 9.0628716871281834e-01
+2817 1.0775653293115676e-01 7.9918240360758463e-01 -2.1699969256056609e-01
+2747 -1.4327205727241676e+00 -6.4227357368967408e-01 -1.7737188620327715e+00
+2469 1.5059917306196385e-01 -2.1041944581436063e+00 2.0887868018875486e+00
+915 -4.0703240360709703e-01 1.2561312647470657e+00 4.0836474417405272e-01
+874 -3.8491170273133590e-03 -1.1899265943133783e+00 1.3474465934261584e+00
+1917 7.6451210436038597e-01 1.4496385182960483e-01 5.1883868079718239e-02
+134 -2.7632914138675142e+00 6.7354961891769116e-01 1.4833778622461646e+00
+1809 8.1777285712948877e-01 6.3128804601287791e-01 -1.3649540916047498e+00
+758 6.2756992847911897e-01 3.7159681981125636e-01 -1.2598772649157313e+00
+66 -4.5661863390911772e-01 1.0219888801154746e+00 7.7856222539881914e-01
+2731 -1.1411086466518245e+00 6.7598077812000801e-01 3.0846801660379741e-01
+2328 1.2936520716699476e+00 -1.3261347985992167e+00 -8.9704082286724607e-01
+534 -8.2802677278899195e-01 1.0621661965982849e+00 -1.3994977393953774e+00
+1496 1.0710595552750224e-01 1.5161186463252144e-01 -5.4996183241052676e-01
+732 5.9779125326212834e-01 5.9135823843614696e-02 1.5014249428820647e-01
+1582 -1.6614236982695167e+00 -6.6075356087158810e-01 8.7148440296684226e-01
+484 1.5708791285882255e-02 -1.5700101512286532e-01 -4.1664518952432855e-01
+839 2.1433326018773724e+00 -1.2914020836079305e+00 2.3290257813817412e+00
+1110 5.1258186465722599e-01 -9.9216005510306893e-01 8.8450995858529280e-01
+2353 -1.4481625369466355e+00 -4.1136735122189644e-01 -1.3887268833022370e+00
+1488 8.9960230390366414e-01 -2.8068343064071233e-01 2.2601213582154250e-01
+59 2.2090746200277156e+00 -2.4600011214720713e-01 -4.4162720611364997e-01
+2099 -3.8192660324241184e-01 -1.1466189741315391e+00 1.2002553507748788e+00
+84 -1.9425005808646707e+00 -8.4658704535629425e-01 -1.0972788859385791e+00
+1879 -1.2029871396772192e+00 -2.3502708256896837e-01 -5.1997187269828504e-01
+736 1.2027254278459039e+00 9.0476224046695988e-02 1.6849937872796916e+00
+1332 -1.6538648920065333e+00 7.6733394795595444e-01 2.7244667066989597e-01
+2394 -2.2319173344813592e-03 -1.1018180114688843e-01 -6.9047633255852903e-01
+1235 -1.2422994546412017e-01 -1.0247727746675777e+00 2.6935796722027905e-01
+2573 2.5474920538641208e+00 -8.0251359163674496e-01 -1.6489872829374261e-01
+220 4.2867575165662664e-01 -9.4288923497778587e-01 4.2343982507516076e-01
+2555 1.1455559948789402e+00 1.3616231290436889e-01 -5.9447372045385505e-01
+1274 8.2820542334017047e-02 2.1881408980535220e+00 1.4137947133136632e+00
+2585 4.1917695239077027e-02 1.4705092698239497e+00 4.7889648913727983e-01
+216 9.1082520697963898e-01 -1.5324059977519011e+00 -1.3941617862319300e+00
+1029 -1.1769077721742960e+00 5.0202521309260284e-01 8.5311732843556554e-01
+1070 -3.9136595148279402e-01 1.7426536063726932e+00 -2.0467536641208710e+00
+1249 6.5863170802570137e-01 -1.6555684342700216e-01 -1.9648958660378548e-02
+2593 -2.0509091392870360e+00 1.8617037161907475e+00 2.4332868462294724e-01
+1265 4.4987275460457538e-01 -1.9981036079466172e+00 -7.9870888932818107e-01
+422 -7.4778574585916624e-01 -1.9602799813563382e-01 8.6114429227410982e-01
+479 -9.3347991591468105e-01 2.0101432655632596e+00 -3.4035113691867597e-02
+2209 -9.6536744930610274e-01 2.2770116835858795e-01 -8.0147209263074315e-01
+999 -9.4873254727034639e-01 -2.3636903011677354e-01 1.2545185089050415e+00
+581 9.2128377588545329e-01 3.4461654979275641e-01 9.1655663705584378e-01
+1939 -3.2194552224679018e-01 -6.0397821072334357e-01 -1.1954304053605278e+00
+13 -3.4905302797369614e-01 -1.7505012162382921e-01 7.6504387153591502e-01
+1471 1.8402754733149487e+00 1.2863592557319823e+00 1.4620642594539071e+00
+263 -1.9273270959894437e-02 -7.7828052321432351e-01 4.4741045780734356e-01
+1577 9.3395823124085009e-01 1.2331848077589089e+00 -1.4339448154299117e-01
+2690 -1.0819430709537026e+00 -2.3688250672121153e-01 3.3159445378290447e-01
+824 1.4826009651280772e+00 4.5859681936305330e-01 3.6018936949926234e-01
+2818 -9.0968317863094519e-02 -1.0837109628406269e-01 -1.5878812957013735e+00
+830 -5.8960772870377220e-01 8.6074314846189615e-01 -6.6353715085631559e-01
+1871 -3.8602355107348613e-01 -1.7834458762770919e-01 -1.5807510478730604e+00
+1864 3.0724989076975706e-01 9.1432841787000907e-01 -1.0207902182069575e+00
+2961 6.1044298742877090e-01 6.5108326848486653e-01 1.6026492166474390e-01
+1682 -7.6510400886153174e-01 3.6174252654897515e-01 7.0568878384363709e-02
+2960 -4.0052117926183267e-01 6.9336064593410518e-01 -9.6386853895200020e-01
+799 7.3476857178460120e-01 -3.3354415660651243e-01 -2.0497987972494935e+00
+2595 3.0187959322827806e-02 4.2907010229622589e-01 -9.9978194477216870e-02
+1956 -5.8194328556163272e-03 -4.9590066892012313e-01 5.8656604657843059e-01
+2857 -1.2113600912712479e+00 -3.7606528059734246e-02 8.3860058953513850e-01
+789 6.9777441199042733e-01 1.2070585228006121e+00 -8.9586953475153375e-01
+1591 5.3785413703586404e-01 -9.0827944601540900e-01 7.6416410333012585e-01
+605 -9.5867610688475668e-01 4.1233178787255576e-01 -3.7170000582637031e-01
+2261 -2.1436099163838529e-01 -5.2219339906366447e-01 9.1682815283021663e-02
+1738 -1.8874917322999878e+00 7.4210597228094466e-01 4.6679408435903086e-01
+1737 -3.4639494698559875e-01 -1.2200788120376282e+00 -1.6001686988688339e+00
+1384 -3.4041100395690727e-01 2.6990299612060298e-01 1.1262920294775952e-01
+2509 -1.2748173785631161e+00 2.7628530611030511e-01 -6.7585694181962763e-01
+2048 6.7441455179666454e-01 2.0539328776536284e-01 -2.0239238861336512e-01
+69 1.0145756534663075e+00 1.6795785611491241e+00 8.2184094668549179e-01
+1465 -2.4854011993538652e-01 5.1217018831414629e-01 1.5501308646720893e-01
+2332 -1.0715535198683908e+00 -6.8195445886065675e-01 7.7539527721269641e-01
+2812 8.1539251970995918e-01 2.0159358427147920e+00 -1.2712293789562590e+00
+287 9.2180732600222404e-01 -9.3186636908079001e-01 1.1654146158056511e+00
+1816 -1.1338990346798240e-01 3.1839354009105347e-01 -5.5683835388321423e-01
+565 -9.3401951356445556e-01 -1.3004780792771067e+00 -2.4598216202769005e-01
+2400 -2.8520200358958955e-02 1.4115051082433108e+00 1.0017714658199655e+00
+2864 1.8845494510086298e+00 -1.5411624113022753e+00 -2.2149521051613301e+00
+2463 -4.5988412974725840e-01 1.9177027581599326e-01 -8.7522809956734038e-01
+1181 8.7403114720076269e-01 1.2539138346967977e+00 4.1809564216069001e-01
+254 5.3796293635701808e-01 -8.6633357125414645e-01 5.5913388650556173e-01
+1320 -7.5115326366067359e-01 8.2843093760109432e-01 5.4885575465511682e-01
+1608 -1.7593945199131882e+00 -1.2249116789070904e+00 -8.0881856908727534e-01
+2915 -1.7530249238005169e-02 3.3317920236733128e-01 -4.6213953042720651e-01
+2062 -8.0619135744832415e-01 3.6025977589029018e-01 1.5789061237863524e+00
+2621 1.3151759713592421e+00 -8.8358477484977871e-01 7.2787989682844334e-01
+899 1.6275687877051106e+00 1.0836271302281114e-01 4.3962839857731351e-01
+1668 -1.3155841231572279e-01 -6.1927980248351000e-01 7.1268219067933858e-01
+2545 1.4505267633674221e+00 1.3414772927187795e+00 -1.6828959664984627e-02
+2972 1.0800096732460136e+00 -1.6946188055391338e+00 2.1647394826788311e+00
+2501 -5.7541607358634894e-01 1.1732771866002614e+00 -1.2173225163036765e+00
+33 -5.7237477254192992e-01 -4.5313163896223412e-02 -6.2487400557657190e-02
+1102 5.7946313984139486e-01 -1.4457351890169727e+00 1.2212696964248009e+00
+1961 -2.9109634546011875e-01 4.9836980252778379e-01 1.3902918442426424e+00
+2560 -2.8721364412199129e+00 3.7880120658926036e-01 -7.2189300455389585e-02
+1427 -1.6577720904794802e-01 -5.3186262048375410e-01 3.9354993029658036e-01
+1677 -1.6142810676688124e+00 -5.6973236888537382e-01 2.7070859919954776e-01
+1786 3.7437536019690854e-01 3.6586975806715122e-01 2.4793732190080048e-01
+1501 -4.5582534114667700e-01 -2.5221261447136434e-01 4.8893057978816712e-02
+2992 -3.5083444038522632e-01 -4.4675525127174931e-01 -1.3702284200163556e-01
+245 8.0842974898215081e-01 1.4104002400372067e+00 -1.1251051838495202e-03
+1215 1.7791376408146631e-01 3.8855137342201468e-01 8.4374154372925603e-01
+1678 4.5734221081195547e-01 -4.2243097965867893e-01 4.8779974555100580e-02
+1263 -8.3436893435887705e-01 6.1599328366840056e-01 -1.0551802449037315e+00
+2003 6.5866194511663456e-01 8.1395768247412703e-01 -8.9085053415121362e-01
+873 -1.9332223823490751e+00 -1.6481715277268341e+00 -2.6626179649568433e+00
+2932 -2.6333254060354672e-01 8.9518019656208558e-01 3.6681635719981315e-02
+2303 -4.2729964631106920e-01 1.5936340302924477e+00 4.4663929556068616e-01
+918 6.4607200092469586e-01 1.8748569132442267e-01 1.3403506752884089e+00
+1273 -1.4949224542840462e+00 -1.1597685583297264e+00 1.6461194901456764e+00
+1822 -1.4979489683173914e+00 2.7610971999967182e-01 1.5749859422623277e-01
+2589 -2.6778458800501131e-01 -1.2882618165446653e+00 -8.3375106940456245e-02
+2802 1.3841298260661443e+00 3.7291174777405778e-01 -1.4795947424413591e+00
+2037 -4.7176569011598857e-01 5.0559199226642343e-02 -1.0606256630827688e+00
+1085 3.9361395272042315e-01 2.0065129772018042e-01 -9.1906237953142872e-02
+1290 -3.4152479055574719e-01 1.3936424564299674e-01 1.2154764098902320e+00
+265 1.3994822133328105e-01 1.2967416649451438e-01 -6.1625629915757851e-01
+1808 -2.0543475029794482e+00 1.5672388998207483e+00 1.3976888037297501e+00
+2770 -9.9124739967920494e-01 -2.2676870776609542e-02 5.0618428252823200e-01
+1524 6.4886327000523525e-01 4.1824471973553112e-01 1.8328144780369957e-01
+2143 3.3454216725258001e-02 -1.2458788496900104e+00 -1.0037457160797378e+00
+867 -5.0798342328710699e-01 9.8645026505291877e-01 8.1314536310597230e-01
+199 -1.5702123687696994e+00 -3.4076418443120859e-01 -1.1338052275828903e+00
+2477 1.9118783665678944e+00 9.7937102461006753e-01 -1.1709226715220151e+00
+2626 -6.8098143022127500e-01 -8.1139538185421856e-02 2.0617126943553604e-01
+2988 1.0689277304418485e+00 -6.2281656079815972e-01 1.0930695967371740e+00
+232 -4.2115572602060877e-02 9.0070163049447771e-01 2.9462771158520806e+00
+2357 1.4627778335974755e+00 7.1921429774836398e-01 -1.9085604965173830e+00
+2672 7.4434941479153938e-01 -4.1911128971253025e-01 -1.3507832472703467e+00
+1736 -3.8305353539033449e-01 8.3967030038561163e-01 2.7437541565069008e+00
+2360 -8.1200196973446959e-01 -1.0537112382001987e-01 -1.2185190791453384e+00
+2300 -1.2668786097958731e+00 1.3698735937365110e+00 2.4817769196673001e-01
+249 -1.4487888341721313e+00 -9.7001948122040355e-03 1.2061403976239289e+00
+345 2.1377120500924274e-01 -7.8774266850797658e-01 1.0336845846207254e+00
+43 -1.6460289221012414e-01 1.6635316862634106e-01 7.9227336164070183e-01
+967 -2.6520343829685084e-01 2.7292669124982494e+00 1.4397657651919833e+00
+457 3.4873265722940533e-01 2.1552413566655729e-02 7.4436455955602365e-01
+2295 1.3144455383204476e-01 1.6984216313347011e+00 -1.1795754071643414e+00
+1921 1.9572054186939474e+00 -1.4108324527444516e+00 9.0474624635682832e-01
+2217 1.6460592673830694e+00 -1.0710302059517138e+00 -1.3035761918196234e+00
+1588 1.1189610285546003e+00 3.5363542283969995e-01 5.2916118278896951e-01
+2480 -8.3665685574549309e-01 -8.3533305889576581e-01 3.7529273603720303e-01
+935 -1.0364683707348381e+00 1.8452042238018185e+00 -4.1051901959887938e-01
+290 1.7831083912594343e+00 3.6233997863429113e-01 4.1375160272179362e-01
+2290 4.6078913140404237e-01 3.8790954352256907e-01 -3.6104150424017079e-01
+1182 -1.2397460991231317e+00 -1.2575257188840623e+00 1.4946291007065133e+00
+1600 -1.3849809714130281e+00 -3.1016241753956403e-01 -3.4019139687917921e-01
+2207 -1.7025985642821129e+00 1.6395592250764215e+00 1.2290444840406509e-01
+876 -2.6016203303620045e-01 2.0896548960209862e+00 -6.7173313884957864e-01
+1506 3.2224970060021318e-01 7.2759133633348583e-01 1.2478260729367736e+00
+1602 -6.1679800913145497e-02 6.0978199753289930e-01 -3.8170393712599043e-01
+144 -1.8751975621033798e-01 -1.2717008716338916e+00 9.7097245645659602e-01
+19 1.1777912014587795e+00 -8.0518065223303670e-01 3.6346516044713650e-01
+1380 -1.4507548146663490e-01 -1.0485677359896921e+00 1.0774616527947716e+00
+1988 1.3521646158640610e+00 -1.4026886281376549e-02 -5.2591672826309588e-01
+2257 3.3513854638611190e-01 -2.1087897020175945e+00 -8.6301775390865199e-01
+934 -8.8289066547197326e-01 -1.7211699949857676e-01 9.6872066996795902e-01
+187 4.7542746439891703e-01 2.9203612490005082e-01 9.1501517368893270e-01
+1949 -4.7140210233914848e-01 1.2634104193899851e+00 -1.0371661412320909e+00
+854 -5.8833136146831277e-01 1.7823713046406733e-01 1.3346805808328384e+00
+2093 8.8112247228653096e-01 -1.5813807953511100e-01 -2.3472403437493139e-01
+2253 -2.0879405937418496e-01 4.8602571967493430e-01 8.1991142356862423e-01
+392 -1.6020912122108114e-01 -6.5209422774164005e-01 -1.9100564626811536e+00
+250 -6.1633433529541626e-01 2.1902488098775676e+00 8.1631981829823708e-01
+2029 -6.2746273739068015e-01 8.2330357928026920e-01 -3.5376144791226155e-01
+2006 2.5533038571674699e-01 2.1927251601305504e+00 -9.4578471697033850e-01
+424 -1.3972608838460239e+00 1.0172678379259725e+00 -6.5938209816331872e-01
+1352 -1.3228269510943640e+00 -1.0471795244532232e+00 -1.3395495518552321e+00
+2361 -5.3263395608312081e-01 2.1348292896665493e+00 -4.7593985564661240e-01
+2109 -1.5250410057208497e-01 -3.1016117970316837e-01 -1.7401734844629499e+00
+2358 1.2658230144893925e+00 2.7642874012417340e-01 2.9775719447231733e-02
+2181 1.0344781427251841e+00 -9.3789097421208079e-01 4.7327200957039267e-01
+1002 2.3014447928257638e+00 1.3996932171220750e-02 6.1402222333616674e-01
+1132 -2.5655709384739898e-02 6.7549453985616792e-01 -1.5197488828562589e+00
+2170 7.3728748888146534e-01 -1.1557421296260515e+00 1.1102235261644644e-01
+1803 6.2362406933848369e-01 -4.9215027427720059e-01 -1.7499725481228650e+00
+2550 -7.6036189462404014e-01 6.8910664139546163e-01 -1.3834161155677365e+00
+2537 2.6151482150929362e-01 -2.9259628733753712e-01 1.6808832079337910e+00
+53 1.0225824841876689e+00 -5.6163489623198093e-01 1.6404970771000253e+00
+472 -1.3461895741054704e+00 -2.2670712612677638e-01 -1.8665247958037059e+00
+233 2.3140665969263996e-01 7.3352015128086345e-01 -8.6149572930420715e-01
+2164 3.1195637348457150e-01 2.7882361946785008e+00 -2.0891151974286037e-02
+1823 6.8114063339382047e-01 -3.7903542439514498e-01 1.1082372979447808e-01
+2031 -7.8416287372142146e-01 3.3307801520676555e-02 8.5344980762197098e-01
+525 -2.3864548845555034e-01 -1.4147680434633471e-02 3.3327722875230648e-01
+1527 3.9292363767001143e-01 -6.6522540319830048e-01 -8.1850049752756027e-01
+1129 2.2197970165244382e-01 7.5226391939621373e-01 -7.1936394604783993e-01
+405 -4.3463055499376457e-04 -6.8830047768700997e-01 9.2534521252129809e-01
+2440 -1.4803968025518566e-01 -3.3547153918918704e-01 2.6006236020004136e-01
+268 -8.9258942790660201e-01 -5.1977496325811989e-01 1.1990120925981229e+00
+1664 -2.0251045888536625e+00 1.2641347066857175e-01 5.2785556959553233e-02
+2755 -1.2348919633991602e+00 -2.4264869641189044e-01 2.3165130095084224e-01
+2445 -1.0715674578254800e-02 6.8300936693695491e-01 5.1207501382617565e-02
+1710 -6.1227120006186164e-01 9.8015936674460469e-01 -1.3530327067950257e-01
+1936 -1.7609527977971051e-01 -1.8284812240037462e-01 -2.2121194529186897e-01
+1869 1.2446653275505021e-01 3.2191628952227036e-01 1.0510106952806346e+00
+2391 2.6851648074380469e-01 2.4108127654444786e-01 1.1963980131847900e+00
+2439 1.7246825756564781e+00 2.8184373357079501e-01 1.1750021266645141e+00
+882 -2.7000042465965390e+00 -6.4593672480339856e-02 5.1450725302477940e-01
+795 6.7857474544168395e-01 -3.8220409457904991e-01 -1.3781101129903204e+00
+2867 3.8701203296121739e-01 6.5397706685474766e-01 -2.0606037228546894e+00
+840 2.7185843058410977e+00 3.9876984544055361e-01 2.7854444122078875e-01
+928 9.7046685332788196e-01 1.0294699241861223e-01 7.9114610645282402e-01
+1099 6.8011700014994636e-01 -1.3180463941794993e-01 9.4618902645145142e-01
+1894 6.4581847429391659e-01 1.5040673841132903e+00 3.6179920270286797e-01
+837 4.5646922288530056e-01 6.1084210642032288e-01 -8.8174010891849164e-01
+2863 -1.4384457817555729e+00 -1.0100403164631369e+00 5.3164174017656551e-01
+2977 2.1046102709307406e+00 1.1548132394997052e-01 -1.6653649283456520e+00
+171 -9.9799893527083450e-01 -5.7742466820285077e-01 1.9097748560287908e+00
+2619 3.0148292992525971e-01 -5.4022452450619829e-01 -1.3061628969382477e+00
+710 9.8794135285017692e-01 -5.2670254719402421e-01 3.7670540387702905e-01
+1872 2.1448753393375233e+00 -8.4914808720708979e-01 -6.7371195731706490e-01
+1969 -7.4207469972298912e-01 -1.6216616572462057e+00 -5.1413016041311133e-01
+2566 9.1030411558215918e-01 8.8042526235734941e-01 -3.3569439670550413e-02
+738 -1.5480598605849738e+00 1.8340890014605435e+00 8.7311858779751561e-01
+861 -5.8339461305477402e-01 5.8990218692498897e-01 1.0125267633529849e+00
+215 6.9184688691413543e-01 4.6375903046289269e-01 -1.8573147685361215e+00
+2356 -6.8533400768951114e-01 8.6730459975929264e-01 -1.3138063096802317e+00
+2176 -3.1455530500752760e-01 1.4907121436294046e-01 -2.3479220896781170e+00
+1286 2.8415738175274896e-01 -4.2291170759701896e-01 7.7792967587976669e-01
+1351 -2.4070709791058895e-01 3.2313492500967250e-01 -2.2906697182156172e-01
+2631 3.4177386426675421e-01 -1.0660122399260237e+00 8.1026650021631985e-01
+2378 -3.2358931929044418e-02 -2.9358002223876584e-01 -4.8557613258997651e-01
+434 -6.9260469307620670e-02 -1.1185161889397695e+00 1.8865530287999893e-03
+2425 3.8105925522744061e-01 1.1004469162773698e+00 3.1316809083259295e-01
+2004 2.2555773510568122e-01 -1.3746381747651026e+00 1.8262514396700535e+00
+1021 7.4312867409984684e-01 -4.5730494253395249e-01 1.2309664731401495e+00
+2260 -1.6812800127648437e+00 -7.2379284020003198e-01 4.6820977534831265e-01
+2788 -1.4108941314864509e+00 -3.2338121503493134e-01 8.7354960253144209e-01
+1440 1.4902607659344980e-01 -7.7662415794201889e-01 -2.4999343326838119e-01
+2777 4.4622968974974303e-01 8.8811142193844728e-01 1.3723896514993623e+00
+1457 -1.6657241278846138e+00 -1.8226943403781446e+00 -9.3266071872936496e-01
+2859 -1.2535548498874036e+00 6.5893169354553027e-02 -9.5426508397429810e-01
+762 1.1338297038962932e+00 1.4193771633807188e+00 -1.1266300643115317e+00
+1152 2.2504787729299952e-01 9.6729660885801250e-01 6.4192478099090489e-01
+1437 8.8857036743994211e-01 3.5413796804230846e-01 -1.2745701448988556e+00
+2713 -7.4884816717409819e-01 -2.7302178420952855e-01 4.1217878732342916e-01
+2696 6.2761555879136244e-01 5.0214354054503496e-01 2.7740203483363424e-01
+1562 1.0003710891252393e+00 1.2813154908152955e+00 3.9099160448452031e-01
+2064 -2.8495451308829645e-01 5.7673268560919511e-01 -4.2230464215993158e-01
+647 1.1007877551788250e+00 3.8797989622188717e-01 -8.4074578305560632e-01
+2970 1.7767772784906442e+00 -4.9830998213576788e-01 -3.5688523097174507e-01
+2903 6.1095988004967250e-01 7.0068298952358909e-01 -6.8639268414040289e-01
+2806 -1.3864539708656038e+00 8.9579736237003355e-03 9.8976874958303307e-01
+2399 -1.1524929849189545e+00 8.1119049903442153e-01 1.1169419976142398e+00
+509 -1.0883601748178702e+00 -2.9932709883731623e-01 -7.8785362399798931e-01
+1136 -6.0006467267644670e-01 -6.4699369994971034e-01 -1.5095007190137610e+00
+2228 1.9446222485172179e-01 -2.3494553491646788e+00 1.0870347723205183e+00
+1642 1.0739389427193140e+00 -3.1857351896748609e-01 -1.4091621445790770e+00
+1319 2.1209568707242132e+00 -6.8730194165611685e-03 2.0144816961464174e+00
+1520 5.3931315621065168e-01 1.1372656713591984e+00 5.2343010141844537e-01
+1574 7.7876400166687579e-02 9.9481001337825181e-01 -2.3408727362510047e+00
+2524 6.2767978729285190e-01 5.4193561191331652e-01 8.1609720350830439e-01
+2856 -2.0086596838009729e+00 1.3947575645585131e+00 -5.1864922567543836e-01
+1982 -6.7547044132137163e-02 -6.5448040361370174e-01 -5.4225614884141582e-01
+2939 -1.0355648498203629e+00 -1.7287936457991631e+00 -2.3217495598676168e+00
+328 1.0025635852989624e-01 5.7693787692275389e-01 3.5383583564016441e-01
+1661 -9.2147560143087770e-01 -1.1325702418840808e+00 -5.5753989445738450e-03
+658 5.1174362750372904e-02 7.5569570427860344e-01 1.6002282918329274e+00
+2533 5.7609096008984673e-01 -1.0025254259447711e+00 -1.2739954945422975e+00
+1248 -3.0806494351237164e+00 1.6839987299465451e+00 1.4448884361513220e-01
+1663 1.4402718058535708e+00 2.9220976515649000e-01 -3.0503044812231572e-01
+1142 1.5066177222333625e+00 4.8981106984179823e-01 -7.0663325918331132e-01
+1175 8.4538989513890239e-01 9.7842549340289009e-01 -4.6393595381085811e-01
+2421 1.9194248276003079e-01 4.4390151753055901e-01 1.1945388921330127e+00
+2659 5.1938600847238781e-02 7.4014874892715132e-02 2.5178427127581773e+00
+634 1.5283140135580315e+00 -5.1243245711743324e-01 7.6525387592399596e-01
+2710 -2.8166845388405806e+00 -7.7290516975252965e-01 1.1218609759101426e+00
+2341 1.0784275132268188e+00 2.2520144256696389e-01 -1.5460519391650649e+00
+583 6.8116403196185427e-01 1.5690278418905603e+00 -1.4512624944689215e-01
+2754 3.4532692014750677e-03 1.5546416951724280e+00 1.7210705829324213e+00
+1163 -1.5742882523465768e-01 -4.0356454721886564e-01 -5.1431407009617691e-01
+2314 -4.0842523597725139e-01 -8.5292918738939028e-01 5.8373338469285552e-02
+1172 5.7696658787185440e-01 5.1657550447410294e-01 -1.2744204506421255e+00
+1625 1.3900962103790127e+00 -7.0945650791048043e-01 2.5094874410968284e+00
+1204 1.7874506791812184e+00 -3.1867071872335484e-01 3.5451883061040146e-01
+2705 -1.7448465919633069e+00 8.6085938188183397e-01 -2.2546829271961724e-01
+706 -8.7690228866224840e-01 -1.6069745513531448e+00 -7.1606328600878932e-01
+1419 -7.0945877867587559e-01 3.8515358478778949e-01 1.8801666995181110e-01
+1752 1.6785692583697343e-01 -2.0907647215816927e+00 -1.3489285061439955e+00
+2783 4.9863694972191025e-01 3.3270013791054148e-01 -5.1510096931474147e-01
+2968 2.1673814302378980e+00 -5.3078449815825979e-01 -1.6234945156148115e+00
+1222 1.4155893359777014e+00 -3.5024134218131620e-01 1.6847517890031611e+00
+2678 5.0150359678895562e-01 2.1220751111917510e-01 3.3170499125432462e-02
+538 -8.9551018404842841e-01 2.1829409087557226e+00 -2.9707251302762400e-01
+482 -6.2056929637983438e-01 7.0510888008252248e-01 2.8516767300701762e-01
+2544 -1.5471301905727328e+00 -2.8107750608517412e-01 -1.2801530111607040e+00
+2548 -1.2499540579985038e+00 -6.8672559617992335e-01 3.8421684015874141e-01
+352 4.2293423980735989e-01 1.2939050053901977e-02 2.4129060069168670e-01
+1315 -6.9592633684633781e-02 -1.3339732045825854e+00 1.1470634348128650e+00
+1018 3.3653807550841663e-01 1.7514421229621309e+00 9.4446288294717429e-01
+1187 -1.2658522451871148e+00 4.6956622645846779e-01 -3.2836213652111901e-01
+1516 5.0665435878069742e-01 1.1326373265102114e+00 8.4028777567104385e-01
+862 2.0680300727090266e+00 -2.3338655109366183e-01 1.9124391300533103e-01
+2155 1.6023160987154572e+00 -1.4066492585689405e-01 -2.7544572769443149e-01
+2772 -6.2681182913138858e-02 -1.9822641986407372e+00 7.2785064535882316e-01
+2698 1.5814082589326994e+00 1.7747344708161841e+00 -1.8729046982229763e-01
+205 -1.7342275305054311e+00 -3.1158241253910840e-01 1.9900325276740596e-01
+221 5.0814774435625842e-01 1.7597792327208996e+00 -1.2247545791036996e+00
+110 3.7220244967731508e-01 1.4971274979177387e-01 -9.1438441298939466e-02
+2649 1.8895489747626608e+00 -5.5517067572359979e-01 5.6017634008005905e-02
+591 1.1678058553423585e+00 8.4970195740719290e-01 4.6711234518520833e-01
+1069 1.3582786368822872e+00 1.0890007800689878e+00 7.6347507749399401e-01
+2751 2.8566787351563538e-02 -1.4907723957640382e+00 -1.3078284279029220e+00
+1887 4.3346324138133663e-01 -1.4630551232253004e+00 6.3227961604552096e-01
+2964 1.5586055553943596e+00 -5.0858334138981470e-02 -8.8675950052694086e-01
+1666 1.6520703937645447e+00 -1.1690318227597347e+00 2.2043695750141892e-01
+2259 -4.8120051769564026e-01 -3.1803652265767193e+00 9.5648569873897560e-01
+445 -5.3739427852929822e-01 -1.0567296296752469e+00 9.2881000046306328e-01
+2862 -8.3580063194062371e-01 -5.7585379083658461e-01 -1.3238038421371472e+00
+1200 -4.9396680835392109e-01 -7.0732915736101287e-01 -4.2714412704702998e-01
+2503 -1.6557837055970659e-01 -1.7521523353604218e-01 -8.1922226748263793e-01
+1376 -3.0582801057611858e-01 3.4961762229073423e-01 5.8627828724995368e-01
+2082 1.4139123951207220e+00 1.2792579227269349e+00 1.1922615120969164e+00
+2810 -6.7735913244410495e-01 8.4779666704953467e-03 -1.0409357179188248e+00
+481 3.4645632158293599e-01 -2.0056261734492847e-02 1.5567176706963318e-01
+2419 3.6110045409531294e-01 7.6971216388351738e-01 -5.8159648930473984e-01
+2828 -3.3750520681254292e-01 1.9137606343459562e-01 1.1283332467078040e+00
+1821 3.6889738581758003e-01 -6.5950737582020114e-01 2.5842785198756846e-01
+1536 1.8175347698104821e-01 -7.5892827029713306e-01 -2.3710947211069119e-01
+562 6.0952679407558197e-01 -5.1811828136933724e-01 4.2705948233702867e-01
+521 -4.5117721289106932e-01 -1.2487922782614139e-01 8.5519434949230011e-01
+58 1.6399500634041255e+00 1.8349371989792884e+00 -1.5188129677773197e+00
+776 4.1661055705206246e-01 2.9477822170956325e-01 -4.7802816305920745e-02
+303 -1.5840570194282483e-01 2.0763065328169295e+00 -1.4237558702601623e+00
+2039 -1.6832861619469974e+00 2.1207553046092293e+00 -2.1022270856827804e-01
+1612 1.5744200002427624e+00 -1.2241358306029071e+00 -8.8434473900684007e-01
+785 1.1782114660513918e+00 2.6055955259612520e+00 1.6340869252239296e+00
+2121 2.1710717993071458e+00 1.0912239611420358e+00 -9.8558154644701068e-01
+1778 6.4230335128776184e-02 3.9712196455529636e-01 1.0863222348562283e-01
+816 -8.1725926154738548e-01 6.5767676579811118e-01 5.8424042911514262e-01
+2370 8.3656408554457895e-01 -2.6077423744478107e-02 2.2250480433795294e+00
+788 2.7146695934772890e-02 2.8117020991516756e-01 -1.0177193950531271e+00
+2032 -7.4840015602748233e-01 5.3866231701238476e-01 -4.6631080073965048e-02
+2127 -3.9680662364553043e-01 -5.2189139782244087e-01 -9.2588497864278807e-01
+1276 -8.9196220524976899e-01 1.8171320196406371e+00 3.9051973540547541e-02
+2872 -2.1166869169769362e+00 -5.3282142194446569e-01 -8.3138254513737730e-01
+1469 7.6043080147253184e-01 1.0211501872667426e+00 1.6638213952105523e+00
+577 2.7710215572307365e-02 4.7597988892078980e-01 -8.8094622816236168e-01
+2068 -6.1218806522799141e-01 -9.0790614102147371e-01 1.2418506191808645e+00
+340 2.1154447069967461e-01 -9.7702138790745074e-01 1.0047261394049172e+00
+2152 -1.5822472035907105e+00 -1.4118425089413762e+00 -6.6208275420363571e-01
+370 3.0030385406734467e-01 1.6508806688509392e+00 -1.7709541447349414e-01
+2413 1.7232375256757566e+00 -1.4695989358884781e-01 1.0914162724827179e+00
+1388 -3.5375264140148854e-01 5.1742614898577621e-01 -6.8504715354822954e-01
+2993 3.5716318218383852e-01 8.4261196966264340e-01 -5.4173206011010389e-01
+2496 -1.6230154668859789e-01 8.0618558924957873e-01 2.6017890334850052e-01
+2232 1.0062973969694842e+00 5.9949411166433353e-01 -9.7813230826120123e-01
+2600 -3.8910912547609644e-01 7.5008406723918442e-01 -4.7914964128475263e-01
+947 5.2413930227441632e-02 5.8512350670073321e-01 1.2081682764630703e+00
+974 -1.4095145434603129e-01 1.3311790198508722e+00 1.3033335346537149e+00
+1892 3.2668887967084381e-01 2.0326431040349426e+00 3.4909394881347705e-01
+507 1.0390039730724463e+00 1.8672883762111042e-02 3.3926713906564132e-01
+674 3.2274503305952290e-01 -1.6531869513354092e+00 -1.5585130765817008e+00
+1045 5.6081991672179032e-02 -9.0804863555345472e-01 1.1045669209467477e+00
+1499 -4.5207674065138281e-01 6.2807237268612903e-01 1.1261666221833808e-02
+2871 -8.0682328674596770e-01 -2.2010652426565819e-01 9.3062640854086387e-01
+1862 -8.5792536397430330e-01 -7.0554848169526885e-01 -1.0469043224124283e-01
+1292 3.4985585587744344e-01 -1.0955949248619562e-02 -4.7639266242345174e-01
+124 2.2300495728489578e-01 1.6111573558083511e-01 -3.0521902933038791e-01
+1114 1.5041612448261641e+00 -7.5656399017958642e-01 2.2695491788321314e+00
+1566 1.5283858092972452e-01 -1.0416578195730133e+00 1.0530273487078334e+00
+960 -6.1230350578208381e-01 1.8127771156080907e-01 -8.5292333381032104e-01
+1532 -7.8527973105231619e-01 2.4122381030342144e-01 -9.0073421196473769e-01
+2883 8.3976795403186810e-01 1.5884022577990138e+00 -9.2040613903320956e-01
+542 -1.1786177784901122e+00 2.1886461270923660e-01 -2.0145895006794784e-01
+1226 -1.8940074796001996e-01 -2.4463397093388195e-01 8.5295678288813279e-02
+889 9.1910621261333103e-01 1.3692697231004418e+00 3.8158023120390927e-01
+2910 -1.2342515968988765e+00 -1.4615111270470853e+00 7.8369244178805153e-01
+1137 1.1536708298432490e+00 -1.0725079159528079e+00 -1.3486315153522386e+00
+800 -3.2293971878886180e-01 2.1531888081369468e+00 1.3397464709451770e-01
+904 -4.3362032195918099e-01 4.9662031723816613e-01 2.4270249113226214e-02
+1895 6.4630668840006544e-01 -2.0979924573338571e-01 1.0117060778531475e+00
+522 -1.3815164733923802e+00 -2.8268350496494343e-01 7.3663515730638743e-02
+1230 -2.2073101674529823e+00 -2.3007643662287158e-01 8.0614328504465649e-01
+897 2.9767270481767993e-01 -2.2426533288571098e+00 1.0631516728583552e-01
+2604 -1.5066882873742733e+00 9.9324433647027299e-01 -6.5023625338584268e-01
+923 -5.2569764654169038e-01 -1.6039286437844424e-01 9.1094411321065216e-01
+301 -3.5548529085826946e-01 1.8436355498575041e-01 -2.0128108284199429e+00
+2025 -8.4712940957314853e-01 -3.4580946913567279e-01 2.5739632191151812e-01
+1884 -4.0409389072870883e-01 -8.4486795117421659e-02 1.5249176738037675e+00
+2140 -1.5047822160103328e+00 -1.5880999728846945e-01 2.1832217661937772e-01
+1253 3.3993088404557842e-01 -5.8423344413259704e-01 1.3503208520960841e-01
+2750 1.0240301138584749e+00 7.2381704582219131e-01 1.4622014277425441e+00
+1722 -1.8603627599101527e+00 4.0308819969214493e-01 -1.2441951223735352e+00
+2423 8.4928544749204904e-01 -6.3005609150923375e-02 8.7984212854057997e-01
+1653 6.1209717961888288e-01 -7.7519505510236542e-01 -1.9332663369759973e-01
+1676 2.0634185283615389e+00 -1.2270125835045953e+00 -1.1529997173514877e+00
+2602 -1.0031881188098810e+00 7.9700097116892510e-01 1.0906747971204687e+00
+15 8.4132064136504425e-01 2.8074537507785435e-01 1.1425380633162852e+00
+1223 -5.7359414783312135e-02 -5.9915768868397712e-01 8.5677382797427429e-03
+2467 -4.6951761179043217e-01 -1.4064764580442572e+00 9.7053044388003762e-01
+2892 4.8284897869280846e-01 2.7552399339356803e-01 -1.3665325921847575e+00
+223 1.3640879450755137e+00 1.3722078510071010e+00 3.1805034581326974e-01
+61 -5.7664046621204990e-01 -1.6732881001132704e+00 1.2570785895842880e-02
+1729 4.4440466031429110e-01 -4.4602213685291514e-01 2.5412415192377491e+00
+1210 3.3553910500064857e-02 -1.7831997399127753e+00 1.1070735962591196e+00
+475 -2.6427155379046691e-03 -4.1788043275961706e-01 2.9508920003855590e-02
+2256 1.5868233012664837e-01 -6.1983694180532978e-01 -1.1195888342544154e+00
+2001 2.7003006040001160e-01 5.6888302945040792e-01 4.8121245985008693e-01
+1306 5.3856552103685829e-01 -5.5598672482808886e-01 1.9220898694050623e+00
+1950 -1.1512650168226510e-01 4.9359951869747731e-01 3.4842762466203703e-01
+2204 -7.8733481133059124e-01 -2.5003257194815820e-01 -7.1674965986129746e-01
+2971 1.4664437651147515e+00 2.3822735805028170e-01 -1.9399791718114889e-01
+790 -2.0095461673836756e+00 -5.8116418701512207e-01 -1.3103212543832810e+00
+1693 9.9500552339096521e-02 1.1884106766167546e+00 9.7536104078852637e-01
+1544 1.5992475706718992e+00 -1.6804398707573420e+00 5.8572835832412073e-01
+501 1.4006915518156712e-01 1.5584457097496793e-01 -3.5588349409910391e-01
+412 1.6560385072646266e+00 8.7817984289310458e-01 -4.2691560155131048e-01
+2742 -7.0256555097599527e-01 -1.3055107451670906e+00 1.0012649847320032e-01
+202 1.3474928588054669e+00 -1.0159928633467294e+00 5.9875018849632999e-01
+1485 8.6149796886785313e-02 2.0910817491245029e-02 -5.5460050960497431e-01
+2407 2.7054060578873418e-01 6.4441474499114704e-01 -4.3898917306681895e-01
+995 -1.5054063789748657e+00 -1.1748905650087564e+00 -2.2084129775319994e+00
+2422 -1.3070923198642401e+00 -1.1993277389722339e+00 -4.9866281287603363e-02
+718 3.5951024203654297e-01 -3.2475717600384375e-02 -2.7491648447361499e+00
+1300 -1.2413357510780492e+00 1.4381690931545386e+00 2.0417493503294972e+00
+2581 7.1978594597177370e-01 1.6956221152432811e+00 -7.4571721119402828e-02
+2648 5.5686757453903835e-01 2.6525829712039506e-01 7.7467662825701156e-01
+2302 1.0460507386104585e+00 -1.7277603409056412e+00 6.7419970854754840e-01
+514 -2.1107964203737861e+00 -1.0447409780433337e+00 -1.9419904374478651e+00
+1060 -1.3227041011796703e+00 -9.8877971534891052e-01 -9.8030355538500380e-01
+865 -1.8191756371587642e+00 4.3764726927894776e-01 -9.9999081787227706e-01
+2736 4.9948267297620996e-01 -1.6955691910416644e+00 4.5565567970126192e-01
+1331 -2.0057415110761365e+00 -9.3685427758241835e-01 4.7528896348041760e-01
+2598 -6.5452563726177981e-01 9.5721911390087444e-01 -1.9966507953426245e+00
+2430 -1.9087990470630350e-01 3.3809377840924981e-01 -6.6863998440031480e-01
+2050 -1.7308532078102790e-01 3.7614578906993662e-01 2.0649403080573334e+00
+375 -1.0385896969466741e+00 8.5486909411537682e-01 -1.8959784967007165e+00
+2022 6.4831279592845237e-01 -9.9085347228326537e-01 -1.0332789604652104e+00
+927 2.2442471313643150e-01 -5.4214534338452913e-01 1.9538279454712024e+00
+1920 1.5815547446839815e+00 6.1165062626404143e-01 2.7152842121919257e-01
+2647 -1.1883373123439367e+00 -1.0447078687421771e+00 -6.3882308752857631e-01
+1346 2.6330939929402182e+00 4.6118285690071026e-01 -8.6747107660701303e-02
+2416 1.3719615356067980e-01 4.9082368321797791e-02 -2.3451947269328173e+00
+1687 -2.5683707250314325e-01 6.9139322335389197e-01 -1.2498122736840092e+00
+695 4.0051877759960153e-01 -1.7324089737638044e+00 2.2844426032157622e-01
+2552 3.3379281855957788e-01 2.5381261504318609e-01 -5.3318937065819250e-01
+2401 1.8243289762779427e-01 7.2159563549080608e-01 -8.5602980270126039e-01
+2415 1.4637813565621207e+00 9.6525488935385728e-01 6.5050935794373832e-01
+682 7.6320947977153297e-01 2.0295136780809577e+00 1.4631600583701352e+00
+1564 1.2510561564122504e+00 -1.2013157396737166e+00 9.6927989016962590e-01
+1497 -6.9018907841075783e-03 -1.5500566446511994e+00 9.3143993088425214e-01
+2625 -5.8925267131304193e-01 8.4999063280298950e-02 1.7556102311109152e+00
+832 -1.3158289874539215e+00 -4.3327227512375044e-01 -2.6173486231643356e-01
+1278 -5.9811012193899782e-01 6.4839499233311637e-01 1.6663795188561867e+00
+850 8.3876092148481618e-01 -4.2438057591727651e-01 1.6141032680227108e+00
+420 -8.1349069866998103e-01 -2.2632866325309897e-01 1.3900677411287404e-01
+2895 -1.0974486525170175e+00 1.4645892049886908e-01 -1.3978856602798542e+00
+523 -7.5371097893727534e-01 -1.8876759178973530e+00 4.6521002630889963e-01
+1393 -1.3785139212041693e+00 9.0389712222182494e-01 5.9052901299479732e-01
+1227 -3.2584830729709613e-01 -8.1527474865719807e-01 -8.2966629093159527e-01
+714 8.8229099248251874e-01 2.8797477058161824e-02 1.9413818524527321e-01
+2514 -6.0159292076696480e-01 -4.2748295228790684e-01 2.5290193080202350e-01
+2088 -4.9241387669927467e-01 1.0076784092335583e-01 -3.1156875697772102e-01
+1447 7.3585208576906125e-01 2.1777256222084490e-01 4.7149366709929219e-01
+468 -1.6492946918497042e-01 -8.8022789952267544e-01 3.8483619912380007e-01
+2519 5.1738593618710360e-01 3.3061835086580460e-01 6.4484059254601822e-01
+1371 4.0084723142682033e-01 -4.3976503477369366e-02 -3.1853139292381571e-01
+1553 1.0919228684765423e+00 -2.3212300654136531e-01 2.1412085125959912e+00
+588 -2.0079763481153674e+00 -6.7265580118599066e-01 -1.5155762088369673e-01
+2289 -1.2554430832082648e+00 -9.3744418997284695e-01 3.6437810559865841e-01
+2466 -1.0788065698844349e+00 -1.1213692362078524e+00 -1.6913668487732034e+00
+701 -1.4977309396806782e+00 2.5615413706377471e-01 -7.2936214920669062e-01
+2114 -9.4573976607981614e-01 6.9401803418133146e-01 -1.0835219896509558e+00
+246 -1.1052079679626754e+00 7.5719156492088269e-01 -7.1332176895372523e-02
+2216 -2.3187752108705356e-01 3.6104424243751787e-01 1.9636209863895333e+00
+2912 1.1205713556377770e+00 1.1139219177578725e+00 5.6636439097420277e-01
+1804 -8.7474061608586118e-01 2.0090968255208569e-01 5.2719340218762645e-01
+1986 1.2731794573091733e+00 -8.3856061539405136e-01 -5.6562863928498186e-01
+708 7.5751716083043918e-01 9.9274190022716091e-02 7.4273588830773687e-02
+1509 -2.1814326002206363e+00 -2.5366597925498174e-01 -9.8926180936223673e-01
+312 -6.3999680110634516e-01 2.3636719376065946e-01 -3.8811772708371224e-02
+2438 4.9841539291175735e-01 -2.8966261785741093e-01 1.2892657252254838e+00
+1914 1.5071883852315116e+00 -2.3187790934090304e+00 -1.0104771976115485e+00
+2836 2.1394974351043272e+00 9.7212573563948901e-01 -1.5197787756569510e+00
+77 -6.1001743898955740e-01 6.8265960238316015e-01 -5.1376552709643342e-01
+2956 1.7545614039078008e+00 7.9599105671820869e-01 -3.7840158336889995e-01
+2984 3.1095199343203356e-01 1.5774499834882805e+00 -2.5798207542179175e-01
+1431 -8.4844715767029644e-01 -1.2406152103157382e+00 -1.0392293285392717e+00
+96 5.4830510572900726e-01 7.3790870774224859e-01 5.8340639241111292e-01
+2076 -1.4790973059127426e+00 -4.7466890783873950e-01 -1.3982357978549509e-01
+436 -9.3611798228408571e-01 -1.5634766983311549e-01 -1.0614242394540876e+00
+1546 -7.1901822451048436e-01 -9.5391743663202500e-01 3.3871362203508409e-01
+101 -5.7506648027406237e-01 -1.7509360833179390e+00 -1.2670589428251566e+00
+1646 -7.3566348506538537e-01 8.2009915385576782e-01 -2.6030642284731217e-02
+400 -2.2417264812267290e+00 -8.6727743059424134e-01 4.0976891715443253e-01
+1000 2.2121707918467437e+00 7.2717652916939579e-01 7.0394124176546113e-01
+2331 6.5445621103937146e-02 -9.7340120681221842e-01 -9.2446874333055290e-02
+190 -1.5144969143435683e+00 -9.1262383811229664e-01 1.4363411580908352e+00
+2252 2.2766728113760100e+00 -1.0034235451320970e+00 1.2546288382666496e-01
+1853 -8.8721184941527775e-01 -2.1241539502692114e-01 1.4883233146719697e+00
+2080 -5.2093514172208444e-01 -2.0984882714739825e-01 5.0672043634955685e-02
+2908 -5.2475422334676713e-01 -2.7787845436431224e-01 9.3061625492414146e-01
+570 7.8659007835350758e-01 5.8283852719170637e-01 6.2003911114003396e-01
+1909 9.5925286659219261e-02 -1.3632803778374047e+00 -7.3918720719878733e-02
+2273 9.5708634350376076e-01 9.3290057637800600e-02 -8.5076422809491981e-01
+1829 1.2645555575111065e+00 9.0979856185938823e-01 4.0038264283177549e-01
+906 3.1673827072007660e-01 -2.6301700697870195e-01 -2.1631261550632197e+00
+1696 -2.1139583517941229e-01 -5.9460598644335128e-01 1.7393767458403292e-02
+556 1.9595835448025800e-01 9.7471143507689051e-01 -1.5032821057605064e+00
+586 -1.0541237949510489e+00 -1.3740838569101794e+00 -2.9178963286864501e-01
+1308 2.3749918766390263e+00 -9.4726938239229774e-01 1.6940258835025035e-01
+675 1.3776047588890135e+00 1.2214450970412079e+00 -1.3795272165763424e+00
+1463 1.7702337468066981e-01 5.7276975173495792e-01 1.9034705535707892e+00
+1832 6.9695526116503792e-01 6.8004100044638716e-01 -5.8889752510060989e-01
+572 1.6266043737400135e-01 4.6438851377732759e-01 3.6487453819088511e-01
+1270 -1.2953909455770893e+00 -6.3500841993099288e-01 -1.5920462091623857e+00
+922 -2.8699371471599022e-01 5.3670596624835221e-01 9.8312347983103632e-01
+683 1.6424543443276307e-01 3.0595739508914221e-01 8.6355295665632048e-02
+387 -9.4760775272423259e-01 1.3040066515395690e-01 4.3619903388146558e-01
+2900 4.9074310986507397e-01 -7.5375635796433815e-01 1.9320546482420804e+00
+1077 -6.4778466650697386e-01 1.2409535757103864e+00 8.6495937193774186e-01
+2901 -1.0965814165554253e+00 -1.2186544030675956e+00 6.1827998250063687e-01
+2902 5.8560052210694846e-01 1.0219764425355384e+00 -1.1864422998338389e+00
+2402 -1.0578435137576179e+00 2.9699058756089869e-01 2.4314765972522654e+00
+526 -5.8278813507544347e-01 1.0614306218164626e-01 -4.2906631067777340e-01
+38 1.1552315813130272e+00 3.6119023486356544e-01 4.9014318971250803e-03
+681 -2.3711108229158748e-01 8.1774545536474963e-01 -5.6990031875041602e-01
+1032 -8.8507660105693708e-01 -8.6413191891903074e-01 1.1760667648060172e+00
+2452 -3.3331372708356571e-01 -1.6558287300101420e+00 -1.3071657371815364e+00
+5 -9.6263982458935449e-01 -6.2005824222628092e-01 3.0142120732549094e-01
+1258 -4.2677503165843572e-01 -1.8318605239412826e+00 1.7717941551002523e+00
+469 4.7250456744703184e-01 -1.7817293683293156e+00 -5.9137719327694638e-01
+2759 1.5703954135535643e+00 -1.1350976329986755e+00 4.3168042028172732e-01
+6 -1.1946654441479585e+00 -3.2407539858142248e-01 4.8779339642751640e-01
+818 3.0553447355711327e-01 1.7856881435460423e+00 1.5589300485820970e-01
+964 5.5488580117942055e-02 -2.9737131106026626e-01 3.3421473938076746e-01
+2120 -1.5018548359286885e+00 6.6700917629173739e-01 1.7008248655458973e+00
+2979 1.2966944172739721e+00 4.1372205959961217e-02 -1.3721455134099956e+00
+2860 6.5302587548637758e-01 2.3476611748165386e+00 -1.6410345870683194e+00
+1421 -9.8976266366455135e-01 -4.6538399848622558e-01 -4.7477479911408427e-01
+704 6.2604463440723823e-01 -1.1217707567799848e+00 -3.2417823767676074e-02
+28 -1.0809281819029287e-01 -8.0772383497357980e-01 -1.4427842688218444e+00
+296 -1.0841454998350444e+00 -6.6325200531327744e-01 -1.4137456572725329e+00
+79 1.5324102384584276e-01 2.9422922670659685e-01 -8.5652348943128764e-01
+868 7.0081986799297569e-01 1.2132768305511035e-02 -4.9561519854849012e-01
+1205 -5.3815364846009806e-01 -2.2309365152456926e+00 7.5382362436815398e-02
+1126 -8.2207279230216590e-01 -7.2436689104713103e-01 -1.5821268343183208e+00
+2782 1.2355636191433197e-01 4.2920293795724968e-01 4.3524915499020982e-02
+1267 -1.6726596783302988e-01 -3.4153965456044468e+00 -9.3773811237906746e-01
+29 1.2202582415317789e+00 -1.2014000419032296e+00 -5.4529725526551909e-01
+851 2.0095270171641380e-01 -6.2741567500916501e-02 1.1243547026401091e-01
+2346 -7.2149945460414366e-03 1.0592087512707491e+00 -1.1634975448686597e+00
+2761 -4.0209163779034440e-01 2.1228616256204633e-01 1.0250330946343391e+00
+1708 -2.0438506481640206e-01 3.1188984907095629e-01 5.8937296639331738e-01
+811 -2.1819980421146717e-01 -1.9682145244255750e-01 1.2905128737905189e+00
+26 4.1872344022539754e-01 -4.1041488063279108e-01 1.1138124405903349e+00
+1643 2.1188289494728674e-01 1.0768002110102086e+00 7.5744458144229965e-01
+196 -3.1011129861693099e-01 5.9787106937590795e-01 6.5488942830601538e-01
+1410 -1.0909817066523140e+00 -2.0280166512691492e-01 3.1787018201184414e-01
+2115 -8.2433373126852050e-01 6.9930280235618836e-01 3.8796456107856986e-01
+944 -2.6079616203272443e-01 8.1026446801471219e-01 -9.5112930769120335e-02
+631 1.7849985825748099e-01 9.4554941661579028e-01 -1.1432460043724819e+00
+2335 -2.5955657127863674e-01 3.8549083195178258e-01 -1.5205841221570280e+00
+1944 2.9238575997953975e-01 -1.1546311550575988e-01 -7.0557412141169118e-01
+870 1.6191134229330324e+00 -3.2382823672233335e-01 8.3423698869988627e-01
+2373 3.6404416415104074e-01 -1.5418356498954351e+00 -3.5426738085606380e-01
+2362 -6.5599772495662789e-01 7.9835830545293773e-01 -9.0206953694199721e-01
+1746 -1.2086448646454173e+00 2.4524428396085131e-02 1.8958752682134947e+00
+1732 -5.6011915678946755e-01 -1.5413816851692692e+00 7.8571975289669105e-01
+1241 -1.6286370125644078e+00 1.8150061467148333e+00 -1.3529811453595926e+00
+1429 1.2508173518392391e+00 4.8677704232302560e-01 1.3375486101271865e+00
+314 -1.5830229932585924e+00 3.1669208366936241e-01 -1.0689242290636525e+00
+771 1.0199765618253631e+00 -3.9077709575159325e-01 6.5047609311733312e-01
+1779 -4.3263010640545518e-01 -2.4378903646406962e+00 1.7260773927194222e+00
+2403 -4.8312355743155067e-01 2.4239235934274395e-01 5.5385823112131183e-01
+2811 -1.9279394729978255e-01 -2.4406341127557676e-01 1.4955449057645724e+00
+1260 -6.2590786196495829e-01 -1.5349261908485046e-01 -8.8317001709779708e-01
+688 1.2227804055026745e+00 4.5381017293419179e-01 2.2160238113780234e-02
+213 2.2898836764824497e+00 1.3886525665752703e+00 -1.1036651826476023e+00
+2414 1.5921976805194518e+00 -3.6791513398896708e-01 -3.9948573166392676e-01
+1724 -2.5450572055523291e-01 -2.7916088148218066e-01 -7.4985148140947222e-01
+1407 -3.4353553368532613e-01 -6.7049232015867610e-01 -1.2927123946386532e-01
+320 -8.9135891526494826e-01 -1.0765603697359816e-01 6.2973040483989295e-01
+8 -1.0409238232235285e-01 -1.1079689624013680e+00 -1.0888595124891385e+00
+598 -2.1048690320657473e+00 2.9518440522568384e-01 -4.2096447336984721e-01
+411 -1.2471989384751614e+00 1.1583322374058447e-01 -5.3205094948238518e-01
+2930 -1.4406382636043173e+00 2.7905976940674737e-01 2.2950883823991775e+00
+1158 8.3718451774452562e-01 -1.1398226887740208e+00 -4.6799566719579508e-02
+2959 3.0605606798771245e+00 5.0046200526491902e-01 -1.0268510429163336e+00
+2848 1.8660083866485999e-01 1.2261993954634578e+00 -4.4357664662204952e+00
+1856 7.7620166042056782e-01 8.0596674207995822e-01 1.9078464515573992e-01
+380 -4.7178768056921105e-01 1.1324492906158763e+00 1.0193254274846331e+00
+632 1.4096523593659867e+00 -5.0906729924996008e-01 5.6206893657579104e-01
+2572 -1.2324099532032013e+00 3.0833196220417902e-01 -1.0365119155017699e+00
+2240 -1.4210869087409075e+00 7.6421836501388329e-01 -1.6741016969742766e+00
+1512 -6.1945232141200679e-01 -6.4374668458077966e-01 4.6144625622827462e-01
+1630 1.3006355796657804e-01 -6.0454874814569515e-01 -4.8504873303263696e-01
+367 5.9130630726133371e-01 -1.4583183852946089e+00 -2.8636826876793736e-01
+1586 2.0464788128357869e-01 8.2295996533745330e-01 1.2804678712217179e+00
+506 1.1558720938319422e+00 6.9836116068035547e-01 9.6729895812494393e-01
+2976 8.3691565779187749e-01 1.4144246220268695e+00 -7.8691642079342872e-01
+423 1.5873548409360547e+00 7.5371191075407151e-01 2.0715895682517291e+00
+1404 6.2946163533625632e-01 -6.0999011374861323e-01 2.3377954833195878e+00
+2839 -1.2018465784432100e+00 -1.5033620151269309e+00 8.8541675300840261e-01
+2517 2.9568160733855452e-02 9.3454171108072726e-01 -1.4207696343011906e+00
+2539 6.9574913192852894e-01 -5.7550750640221571e-01 -8.5317996493236170e-01
+2147 -7.5731511051363254e-01 8.4888700075189172e-01 7.2037422553839964e-02
+278 1.1796167748802646e+00 -5.5736057921160209e-01 -2.9548299844168943e-02
+1623 1.8167621986540157e+00 -1.3139978779616259e+00 -1.9720859760553261e-01
+276 -5.5644684268237676e-01 1.4438465640655798e+00 -5.4734550975483898e-01
+607 1.2712041153625566e+00 5.3852907479972023e-01 1.2330121148032183e+00
+2807 2.7106026188366455e-01 1.1472957465790737e-01 -6.6805381917955697e-01
+1118 1.5812319671726593e+00 -2.0339974462001367e+00 -4.5380748860872433e-01
+2998 -1.0641003787206699e-02 -1.1870462847755825e+00 -1.8949174976481293e+00
+1151 -5.0961671239625339e-01 3.1946157950930482e-01 -1.0775288817004318e+00
+2694 1.6521530072563309e+00 5.2882697204441442e-02 3.7637318103500766e-01
+2675 6.7021147427853189e-01 1.6354932064677232e+00 -2.2322766213767351e+00
+642 -4.2872650540527868e-01 -8.0386696648220823e-01 -1.7548198963937658e+00
+2139 4.0995450945606005e-01 -6.4140067751682728e-01 6.9951914510700552e-01
+1149 8.7841536300188050e-01 -1.4455115262096034e+00 -1.0959281065009123e+00
+1854 1.2122717124195994e+00 5.8134171147587010e-01 6.3058757556866352e-02
+1508 9.5476209663216349e-01 -9.9407304133309382e-01 -1.0302334601605041e+00
+1979 -5.4461443626748762e-01 3.8190040999587338e-01 -8.3559798086780956e-01
+2028 5.6597953979769100e-01 2.7474552641168176e-01 6.2333750729720983e-01
+2368 -1.3702372879554243e+00 -2.1521033801869414e+00 6.2204965369567411e-01
+1288 5.2717313422106271e-01 2.7656833031830103e-01 -7.7997648003929210e-01
+2728 -9.0593454192367098e-02 -2.9435970652428656e-01 1.2476846435344426e+00
+2277 7.6403647843648348e-01 -6.4790935228073554e-01 1.7036118368215387e+00
+2906 1.2583976193109645e+00 -1.4132804120643714e+00 1.2688457537637128e+00
+2151 -3.3857234097212857e-01 -2.5273492660434660e-02 -1.0818784255647067e+00
+2490 1.3904939107748211e+00 -9.6612184354333464e-01 -1.3485221475868927e+00
+1685 9.5223666627411108e-01 1.2152668564109022e+00 -4.5377715930562379e-01
+2914 2.8493978965922095e-01 2.1139126844360523e+00 -1.2861935096789849e+00
+2612 -1.7474463042192951e+00 -9.5704569294936681e-01 -1.1234703289997143e+00
+662 -1.5657896385072800e-01 8.6087059139408606e-01 -1.6673007453990235e-01
+1923 8.4970689540691735e-01 -7.4823958777653377e-01 -1.1927019475661886e+00
+949 -1.1018437967930019e+00 -1.0012420092044358e+00 6.6251071847296217e-01
+2813 2.7507074447363689e-01 -3.6022305578296887e-01 -2.5353542498060000e-01
+224 4.7323556955965046e-02 1.1969692147337923e+00 -1.4064846510953521e-01
+1024 1.0523471441946126e+00 7.4307660199719139e-01 1.2030869117405682e-02
+2130 -2.4466144094914091e-01 -2.4914439375867556e+00 -2.6191750168987787e-01
+1787 1.3648205859050182e+00 -1.3029917111840741e+00 -2.4349633205025412e-01
+2034 8.6821592036636930e-01 3.4821369260323787e-01 2.4741724965001088e-01
+2024 1.3341895488539468e-01 1.4178749937839621e+00 -4.6623870613853896e-01
+1374 8.8516707895732094e-01 1.3187795790206771e+00 -1.7072144292325664e-01
+2683 -7.4341304147843357e-01 4.4840433973543620e-02 -5.9298608997166635e-01
+1550 -6.2033835157186634e-01 -2.8689810776678071e-01 6.5130469180099015e-01
+2073 -1.2358570489050089e+00 1.9643809590939363e+00 1.3089185997580235e+00
+1362 1.1528308300727212e+00 1.6703580306764010e-01 3.6318832780964316e-01
+2241 3.9257826918460975e-01 -1.0589433903429193e+00 1.7560058726692938e+00
+4 2.8622758639230039e-01 4.0720851823536997e-01 -1.6880873406849310e+00
+1951 2.2261682989942266e-01 8.2068694089200700e-01 -2.4633496659642901e-01
+612 -8.2033532789425356e-01 -2.0799390676296330e+00 -4.8567682466309603e-01
+1232 -1.4455664395005960e+00 1.3641237497549277e+00 2.5866243697273805e-02
+1157 -9.8577104947957669e-02 1.4380174505873198e+00 5.6431201431311417e-01
+175 -3.2263346266830752e+00 -1.4030317591040571e+00 6.2624332296979968e-01
+2749 -1.8781722711552467e+00 4.2689056349944732e-01 2.0588601433342122e+00
+1470 -5.1656796368577562e-01 3.3789094821826655e+00 1.1140000577828328e+00
+492 -2.2940220081790086e-01 -7.2052940668173762e-02 1.2253415562079144e+00
+2858 2.4225756745481208e-01 -5.2789668665675138e-01 -2.7668516597223619e-01
+1916 -5.6286176456563908e-01 -1.8184369544275830e-01 -1.5236006606617647e-01
+2435 1.2412387634720643e+00 -5.0044196065894408e-01 -6.8487725358764084e-01
+2767 2.5164284105379742e+00 2.1143016853688215e-01 3.5930448322126773e-01
+535 4.2918673462823925e-01 7.0722842365539373e-01 7.0524995602964691e-01
+618 -8.1737024076836501e-02 -3.9472567778847512e-01 -3.4448115883402874e-01
+1061 -6.1807613902747072e-01 4.1318513862543227e-01 -4.9592487907593963e-01
+1058 6.8735717325175549e-01 8.6251547437369613e-01 -6.0755513206924439e-01
+1855 5.0826284661712884e-01 -1.7405694536022934e-01 -2.9630003605837302e-01
+2159 1.0457534582375658e+00 -7.4265554794608268e-01 6.3449121823439425e-01
+1408 1.5239677853232931e+00 4.0472179887810034e-01 1.1862206008569085e+00
+125 -9.0200119153467284e-01 -4.7715771789413691e-01 6.6521419697847084e-01
+2852 3.3244456372693526e-01 -9.8582782844051087e-01 3.3282834247215776e-01
+1333 1.1322654348930736e+00 1.7406748563520578e+00 -8.7581835274261244e-01
+1902 6.5827781798879847e-01 4.0171800327294649e-01 -5.2979113813161678e-02
+2165 -2.3021329719706674e-01 1.3840634941366763e+00 -5.1040465010400604e-02
+2096 5.8438853272869451e-01 -2.2430054471250760e-01 -8.3818740486438670e-01
+1043 1.3247172830549381e-01 7.2950949055030634e-01 2.1178747188778501e-02
+344 -3.9164254237038976e-01 2.0207155490928699e+00 2.2393914674873763e+00
+330 -5.6602479999479915e-01 -2.2646563120329102e+00 -2.0062555581306309e+00
+172 -5.3600765807822515e-01 -5.0328209078203889e-01 -3.7534134120514040e-03
+119 -8.1136241009661414e-01 -4.7207166309866010e-02 -4.0864356066330498e-01
+2330 1.4172048707894946e+00 1.7484869068323006e+00 2.3807147437332223e+00
+1322 9.6456776194477878e-01 5.8835673499884933e-01 -1.1666192449725261e+00
+2840 -8.6475611011663378e-01 -7.5521968134159456e-01 7.9990677346863481e-01
+2180 -5.8340196181714939e-02 -4.3775420782231655e-01 -7.7490730105138450e-01
+2758 9.4530532926091052e-02 -1.5111141249189941e-01 3.4188827452084153e-02
+1103 -6.3732655311500186e-02 9.1124404250779423e-01 1.3561844768198941e-01
+1758 1.2404320800795812e+00 9.2167862401648454e-02 2.7649988330085795e-01
+975 -1.7408720944641265e+00 -8.5582202550518405e-01 4.9792534912118247e-01
+1028 -4.8088120075704677e-02 -2.5695724673287151e-01 1.3736489234625280e+00
+197 -5.3057376200800321e-01 -8.4609340961931900e-02 8.7460254250366176e-01
+665 3.5435516079793239e-01 1.8469309605474876e-01 1.1228944877622444e+00
+2338 -6.5874363767540425e-02 2.9806514343970242e-01 1.1127296085697127e+00
+1184 -7.8010873707181017e-02 4.4417220533673460e-02 -1.2433148078242318e+00
+2717 2.1617210127423547e-01 -7.5651038103398827e-01 -1.1737140517535316e-01
+557 1.3654905775065418e-01 1.7996009359957899e-01 -2.0703049552970252e+00
+864 2.4468886105697599e-01 -1.3402423914093353e+00 -1.0141183503540601e+00
+212 -1.6447168412660225e+00 -2.2781766974032494e-01 -9.6223366751320072e-01
+1327 1.1184701031067390e+00 1.2954306442977546e+00 -1.0875516147197393e+00
+1962 8.3361966230431794e-01 -7.3161685121326436e-01 -1.7844074596304205e-01
+652 1.0522822557450520e+00 1.3066928652843601e+00 1.2200613065523988e-02
+264 8.7859194238620722e-02 1.1384104071192878e+00 2.1409629619696230e-01
+1984 1.5606494905021820e-01 -8.3761143434012947e-02 -5.4808359452611843e-01
+2405 -1.4878085593116730e-01 -1.2172597137676475e+00 8.2634237429047219e-01
+158 1.2844332163295571e+00 -7.3534322273163766e-01 -1.5645211532970751e+00
+1402 -3.5198808665338999e-01 5.8991494645659892e-01 8.5244071158991214e-02
+20 3.0875371725436901e-01 2.7219415294148380e-01 1.1101075578394265e-02
+875 -2.8061517827873739e-01 6.9076138392185293e-01 1.0666000323879330e+00
+1699 9.4104732592841123e-01 -8.4751456896291710e-01 9.9562450829249038e-01
+602 -5.2184741269750667e-01 1.8381438034162517e-01 5.7599814732377685e-01
+2997 5.9846549444513808e-01 6.3182920720859259e-01 4.8321810330017856e-01
+2561 -8.3681389133333367e-02 -1.7021291458497874e+00 4.9540776920323748e-01
+2134 4.1610075771842281e-02 1.6306839233707373e+00 3.1794587519662597e-02
+1640 -1.9380126034670897e+00 -6.8062023736444721e-01 -8.0937538563017120e-01
+1569 1.8350745451402719e+00 -6.5518830508820336e-01 5.7877962520898996e-01
+792 2.3010060343778843e-01 -1.7902346620544514e+00 -1.2642264512881964e+00
+1609 -3.1163114974329237e-01 1.2326119304698757e+00 2.0053070498957881e-01
+341 6.3175605690071046e-01 -1.2357422909501323e+00 -9.1217749702488859e-02
+998 1.1174001632580959e+00 1.5606969682757621e+00 -1.8147639941965549e-01
+2697 4.5232680550968962e-01 1.6170963989643763e+00 1.0906514347490033e+00
+2285 1.5735340869537398e+00 6.5431460041329847e-01 -4.9236677853364003e-01
+1922 1.4268673397161791e+00 2.2136474406647902e-01 -1.0176034788870838e+00
+653 -7.2417752842949534e-01 1.3909534360856685e-01 -9.1278184580584409e-01
+980 1.0678304909863262e-01 4.0566001517903122e-01 -4.2020081844108803e-01
+2996 -1.6113921974121681e+00 1.5338142216398148e-01 -6.8607704883883991e-01
+1511 -2.3198016651832352e+00 2.1391781050148467e-02 -1.5944628076909471e+00
+2220 3.6230298601427618e-01 2.2893535003378265e+00 -6.6717178270399946e-01
+1412 2.1454976424473921e-01 1.7224917756847560e+00 9.7794232999043662e-02
+917 -3.4739189408772830e-01 4.9355356695195762e-01 -3.5736175426516789e-02
+1041 1.2843900748103076e+00 2.2313342931381255e-01 1.1724974317096932e+00
+136 5.6808341031256460e-01 -1.3711299398088770e+00 -1.8764192368535075e+00
+253 -5.2079709441543665e-01 4.9734126378215088e-01 5.7189565323199987e-01
+67 -4.5329952875655138e-01 8.7130494325326113e-01 3.0903992641633077e-01
+1940 -1.7666705806690992e+00 -1.2316333017970014e+00 1.0924224366844062e+00
+1193 -1.6461582738878184e+00 -1.5610337511035188e+00 -6.9804773569333622e-01
+449 -4.0562192427858706e-01 1.5245926746016147e+00 -1.1457103276464538e+00
+211 4.7854962157473468e-01 -1.3723065599805373e-01 -6.6185286065861526e-01
+444 -1.1122741804087461e+00 -8.8952094439184248e-01 -5.4849908429802696e-01
+2168 2.8608184313570828e-01 -3.1567905932615375e-01 -3.9419250203647987e-01
+1251 1.2753165130951166e-01 -1.9384367685915331e+00 3.9154344052459289e-01
+2531 1.3217645491389003e+00 -3.4827593010832147e-01 -6.3945032877790325e-02
+561 3.1928263285218903e+00 -4.8160103794242348e-01 3.5892840670040305e-01
+2739 -6.0271024690917774e-01 2.0471181431461103e+00 1.3193068025194929e+00
+971 -9.3740869651137992e-01 -4.6300867886111491e-01 -5.6321053279478239e-01
+2478 -2.0760300034823648e-01 1.4053407985334139e+00 -3.1913975880856171e-01
+1958 6.7634725334804302e-01 1.1642139455161549e-01 -1.6786338195957698e-01
+1216 -9.6015964673998977e-01 1.6360822048819599e+00 -2.1046642133936055e+00
+604 3.4813897209057171e-02 -4.5032743671550424e-01 -5.0100923026921063e-01
+1649 1.2167096993617736e+00 -3.9359558366933362e-01 -1.1305384604918303e+00
+554 1.2254412484023647e-01 9.0155437261100577e-02 2.0779831277117373e+00
+1692 -1.8618573747825118e+00 4.6971425451203502e-02 -8.8371205337669612e-01
+1037 -1.1274819580079363e+00 2.1357983182797775e+00 -9.2135238572217754e-02
+584 2.1911023992431528e-01 5.3961729057927443e-01 4.4725957389221549e-01
+1904 2.3881371386254306e+00 2.3029204746099158e-01 -5.8939321358844832e-01
+2917 -8.1430138762833415e-01 3.2238094409186174e-01 -1.1893431883636467e+00
+182 3.4683084100268186e-01 -1.4637846950684246e+00 3.1612354528245834e-01
+2692 -1.7507595691886442e+00 -3.3715338299573311e-01 1.2745843222161131e+00
+2060 7.8231480757526728e-01 7.5923087624701147e-01 -3.2209687051432168e-01
+180 -1.0616968139169320e+00 6.5337861435635958e-01 -1.9111055218066759e+00
+2661 -4.1780893772530642e-01 1.5745137251819028e+00 -6.0298481693173189e-01
+903 1.3016735088743292e+00 -5.7314092457051724e-01 -9.5348208221445407e-01
+1841 -6.2794041492471908e-01 -4.7545955051353223e-01 -5.0254582517884638e-01
+310 1.1146463954376831e+00 1.6127950945449123e+00 1.2696457847735620e-01
+145 2.3046176266889123e-01 6.5342474805317896e-01 -1.0817099707936457e+00
+2843 1.2145040950340942e+00 -5.4282638788341309e-01 4.5577953386918718e-01
+2301 -5.9594121271770828e-01 -2.3713880991495528e-01 2.5353905322077031e-01
+803 -1.6800295950800481e+00 9.4243290733699514e-01 -5.1111917433257004e-01
+376 1.2954757780076745e-01 -2.4996146910583150e-01 5.7991793902572608e-01
+1311 1.0955493928151354e+00 -2.3055073636087773e+00 -5.0151880249204484e-01
+2224 2.8886547861825096e-02 7.2853901554397882e-01 1.3056253552091126e+00
+1628 -5.3804094062120489e-01 3.6116947797140553e-01 1.1058426815228395e+00
+192 -4.9879894099254496e-01 -5.8185442166767487e-01 2.5429230176205508e-01
+2498 -8.6725505235505906e-01 -7.2064424243958716e-02 7.6234755605002869e-01
+527 1.0949373339681210e+00 -1.7703198034309831e+00 -9.2030855706510151e-01
+759 6.1363394380431024e-01 1.2923757492654040e+00 -1.1046869788460685e+00
+364 6.5701033866737124e-01 -8.4700976285565044e-01 1.1624596237801041e+00
+1587 -7.6927118753370549e-01 1.2593147694809508e+00 9.3246968768540794e-01
+1165 1.7803303962612762e+00 5.4849546649108805e-01 -2.0414587130364121e+00
+152 -7.4481673757842315e-01 -1.5745580804875103e-01 9.0686390719581711e-01
+1019 -1.4854943266358427e+00 -8.4509615328705801e-01 -1.8420034208054932e+00
+2072 1.0821075475681158e-01 4.5003296415608918e-01 -1.0419241866505065e+00
+987 -4.3816006898819193e-01 8.6766552000779840e-01 -2.7580118843564116e-01
+2847 1.3408551473375676e+00 6.4755771424130493e-01 3.3202073707202912e-01
+1289 1.1025297963353498e+00 5.9515492160975603e-01 3.0041285865451561e-01
+1505 -7.8006125874682108e-01 2.0712602092736225e-02 -1.4010676201803984e+00
+2973 -5.9021045639286773e-01 1.6122470773227676e-02 1.2009251778226273e+00
+248 1.0280035955360236e+00 3.7040269447307272e-01 2.0012030745873837e+00
+1345 4.2599971992790961e-02 4.5248830155759234e-01 1.6372961596151496e+00
+878 -6.0827098116829847e-01 1.3275223995503742e+00 -2.7981437915413565e+00
+2926 -5.1955893431002309e-01 -7.4069546702387884e-02 8.6829347849439564e-01
+1115 4.6471629481106358e-01 1.6904905073086995e+00 4.7715608503009743e-01
+715 -1.0396420662880161e+00 -1.7088817412677615e+00 -3.0268182297123397e-01
+855 -5.1496195330645034e-01 -7.8771679498132807e-01 -2.0447960085429487e-01
+672 5.5256346545497714e-01 2.0398486653065706e-04 7.7989169189732588e-01
+1652 -1.5869125789126783e+00 -2.3631831527907150e+00 7.9259886176286903e-02
+815 -6.8838465901406476e-01 -1.1706475263832992e+00 2.6947401866341569e+00
+1195 1.6473606106368996e+00 -6.7648992670644237e-01 -4.5829946917275233e-01
+1370 7.9231539943560558e-01 -1.0800365398309253e+00 4.7431570564709963e-01
+2664 -4.0861844329517283e-01 7.6080297248184936e-01 1.7650726510578651e-01
+3 -4.3196344125689690e-01 -1.2012985468352178e-01 5.2085236113787259e-01
+1057 2.2297843705648477e+00 7.3487800100012113e-01 -1.9555445772775237e+00
+2142 3.6540276670204297e-01 5.8938809433388528e-01 -5.1009217301436638e-01
+355 3.6420602449716288e-01 6.2959398622919216e-01 -3.5714307152922498e-01
+2869 1.0612415590966333e+00 -5.2261510404577183e-01 -4.7600143457100225e-01
+2488 -6.5893828008758615e-01 -1.0415809956006865e+00 -4.1222026209434726e-01
+231 1.2198196393233518e+00 1.3112445318862440e+00 -1.1432433484985316e+00
+1631 8.8152238058452723e-02 2.9077035285519770e+00 -1.8660217146879979e-01
+559 9.3112008604348095e-01 -6.0169261510162864e-01 -6.9200452309887944e-02
+2481 -1.1032848832654398e+00 -1.2372002153092234e+00 -8.8075022608218823e-01
+45 1.6828064556161229e+00 5.0772666258862420e-01 1.1432980655803469e+00
+1599 -5.9706233844341650e-01 -4.0608373488523986e-01 -1.8144214805817827e+00
+936 5.8418899448462225e-01 -1.0765830397450276e+00 1.4794634321733641e-01
+1938 7.6040666102649757e-01 1.2401833228281600e+00 1.3560062005422818e-01
+2934 -7.7622562095187375e-01 3.6377533768109926e-01 -3.7603713142869877e-01
+2297 -9.2316479909792248e-03 8.6298697294169613e-01 -7.7283979459616026e-01
+1401 5.9741340553671141e-01 -1.0458876117142992e+00 9.2968993863650196e-01
+2326 8.4134863755612121e-01 6.4062632897831573e-01 -7.8401060563562719e-02
+1751 -3.1673921596585225e-01 2.5375896213723270e-02 -3.0399829966248321e-01
+309 -4.6618999613781659e-01 8.8026560747093441e-01 6.7719293869720099e-01
+51 -2.4376005181751970e-01 -5.0661375707747858e-01 -2.7474809173104187e-01
+2412 6.3033142475397930e-02 3.9555663635907595e-01 -2.0956238700635235e-01
+2760 7.8654163461965787e-01 -1.7958980407926290e+00 2.7332219093358728e-01
+1795 1.9529011604217299e+00 1.9162233649201301e+00 1.7846490219985216e+00
+1022 1.5390120228511344e+00 -1.5710524499138441e+00 -2.4829151722090423e-01
+914 -1.7311016237716996e+00 2.8136125017949238e+00 4.1998564072478728e-01
+1721 -2.2063804907606446e-01 -2.9711562622345250e-01 3.9716599058555083e-02
+2379 1.4379420140929269e+00 6.8517508246291015e-01 -1.2399651503861692e-01
+1557 -8.0617253877387751e-01 2.9357239639048743e-01 -4.1291092970440724e-01
+2187 -4.8953228632337897e-01 8.0879094066936630e-01 -4.4567813776486542e-01
+2122 -4.2385138796370625e-01 5.1645970744506808e-01 -1.3832269524564655e-01
+2059 8.1611292558878756e-01 -7.6858702738866125e-01 -6.0456007059256489e-01
+1169 -7.5112582428574615e-01 -9.1735333405278674e-03 -1.5778522125702048e+00
+2487 1.1377783321785746e+00 -1.0463251075610664e+00 -8.6244723504477472e-01
+2454 -9.2405124413921680e-01 -5.3070355338955011e-01 1.5458078038734517e+00
+1298 -1.6163703958348577e-01 1.0146291315477488e-01 4.9744977316469685e-01
+519 1.0374440722467060e+00 -2.0182678315244504e+00 7.0776734123992091e-01
+318 -3.0016444751875071e-01 2.3633411584982471e+00 1.8883205324351828e+00
+2319 -1.4362404577330090e-01 1.4328454553127599e+00 1.4281304812327749e+00
+1356 5.0864750066302433e-01 -7.3533463375607910e-01 -1.0194993369232392e+00
+65 1.7776562664108142e-01 -2.6464146760418134e-01 -4.2792157604402448e-01
+2947 3.7669067855826999e-01 1.3233882161073007e+00 -6.9066317906976715e-01
+1510 -1.4451735995388015e-02 -2.2126179490340583e+00 -5.8443997048133867e-01
+2588 9.2255510280009403e-02 -5.1853807588330331e-02 -9.2809002086773784e-02
+86 -9.6826718622807917e-01 1.6445947618622783e+00 -3.7424084943427216e-01
+2830 -6.0800683525447374e-01 -4.2896806223080515e-02 -1.6071944691565304e-01
+2966 9.1859246861098942e-01 1.7622737689830997e-02 -1.3773811930829698e+00
+530 -2.5870350737214509e-01 6.7050297993742047e-01 9.0712431009673899e-01
+421 4.2520803137724605e-01 6.6963011791640015e-01 -6.0576474110951251e-01
+1656 -1.3861228436397131e+00 -5.5327396202900703e-01 6.4092047470882985e-02
+1330 1.4520301213069260e+00 -2.5761402459348515e-01 -6.2892425867130086e-01
+1065 6.2657351463712341e-01 1.6591406703243901e+00 -8.2261091407011633e-01
+2324 1.1624249099552488e+00 -1.8831788080564162e+00 2.3321903884527400e+00
+1264 3.5995540459961547e-02 -2.3812307744118991e-01 -8.2706699624282587e-01
+302 -1.2268154146329548e+00 2.6089158631402796e-02 4.5677185310780177e-01
+543 -6.9549873468112899e-01 1.7237041139966922e+00 -9.4364936491899265e-01
+1150 3.8568893747168559e-01 -2.7952944836052235e-02 -1.2278327088404999e+00
+2211 1.1198930839490768e+00 -1.9344175742951775e-01 4.1925631194946411e-01
+912 -2.7065027698756428e-01 -5.6727951404655030e-01 -8.7419194871769568e-01
+711 7.4229954396947928e-01 2.1542902132863979e+00 2.8331129716505121e-01
+970 2.3610921769956894e+00 1.0421040975998219e+00 -5.1965952818396111e-01
+1833 -1.0289821611351675e+00 -6.4446172288016534e-01 -1.4121855269857042e+00
+719 3.0883251754030550e-01 5.3600248497330627e-01 4.9814950126439511e-01
+1945 -3.0649349355380678e-01 -2.8631481550025195e-01 -4.5315433304444330e-01
+2861 9.1850420183426673e-01 7.2329656428436850e-01 3.3671992253209498e-01
+1203 -1.1616283207941080e+00 -1.8876765573465746e+00 1.1811814383124641e+00
+1977 4.5158632756642547e-01 -3.6256489178778595e-01 -5.5999344238078330e-01
+1112 1.0660287760062110e+00 -1.8394104145742976e-01 -8.0762569400279771e-01
+32 -2.0605070384177104e-01 -7.4733821968480732e-02 1.2295665521386057e+00
+2957 1.5459294384878458e-01 -3.7842831303630253e-01 -6.3253979143722683e-01
+950 -1.9014903471226108e-01 1.7438654203395680e+00 -4.2692506109212069e-01
+1357 2.3754516967129735e-01 -1.6757674578111057e+00 -1.5775684957012071e-01
+1819 5.3607175441541788e-01 1.5971511125142096e-01 -1.5486155133859405e+00
+1716 -2.6045185642702556e-01 1.8096543301289020e-01 6.0367660568696935e-01
+1711 4.3591000266100249e-01 -1.9858511567524082e+00 2.8596553984016157e-02
+2334 4.7377216754022267e-01 7.2947839613668286e-01 -4.1953473487437232e-01
+744 5.8944515593941471e-01 8.7135119276252182e-01 4.4553835262259023e-01
+1475 -7.9769675910532922e-01 -6.2321045641683115e-03 1.0739747612945578e+00
+782 1.3367630786091755e+00 1.0175676869286499e+00 1.3217083721247656e+00
+255 6.9411479547064925e-01 -8.9371467902491286e-01 6.1688245535851238e-01
+592 -5.1026620094890041e-01 3.9796708744164966e-02 -2.3696756380676574e+00
+2666 8.5609351133549472e-01 -3.4439577396288634e-01 -9.0808649945452991e-01
+173 -7.0215105178603709e-01 1.1719071454344759e-01 -5.0713168115137131e-01
+955 -1.4264167057283575e-02 6.6995444034159668e-01 -2.6058736543159300e-01
+10 -1.7427449270572846e+00 -9.2542510831153590e-01 3.5277365524803778e-01
+2607 -1.8064822491956347e+00 -6.7326663455726354e-02 8.4206673732361947e-01
+2418 7.4743098749603265e-01 1.5127644024907254e+00 -5.2448523995967533e-01
+2455 -2.3028790424706758e+00 -4.3567607609319034e-02 1.3876736342046112e+00
+822 -2.0763884727871496e-01 2.2948095395104851e+00 -4.8726016373898839e-01
+1761 -8.2424117475432837e-02 1.4713615659670114e+00 1.7363940771676536e-01
+1805 8.3731929865913679e-01 -1.7369817720140004e+00 -4.0388211670063484e-01
+2651 1.2778756834492247e-01 -2.0118078493776528e+00 -3.7030927982833597e-02
+1621 -6.8334429870407043e-01 -1.6083951976960045e+00 -9.1745607546772412e-01
+1970 -6.9854701578673595e-01 1.0877315728179338e+00 -3.3545441592353342e-01
+1343 -9.3578054286630208e-01 1.4324461399703325e+00 1.1744009373504309e-01
+1133 -9.1653728911947374e-01 -2.4157298169706425e+00 -1.9526895949927030e+00
+1123 1.6499958058154462e+00 5.4500540616179771e-01 2.9207012673682692e-01
+1197 -4.0068609785108916e-01 -5.0097644913624606e-01 -4.8077399809506999e-01
+2590 -4.8675986438274099e-01 4.5470809502027371e-01 -2.4778587896115922e-01
+76 6.4291933270593460e-02 5.4368034196825854e-01 5.4324850495092758e-01
+2208 -4.8429847005956034e-01 -7.0214904074467219e-02 -1.2873799423069296e+00
+2615 -1.4192475303362522e+00 7.3279624716145020e-01 4.4638482503348276e-01
+139 5.9649541954476903e-01 -8.2567977790149877e-02 -1.2367398226055575e+00
+1080 1.8098018846136782e-01 1.5957075138032861e-01 8.2128013256429866e-01
+1674 1.5505354336723662e+00 -5.7421772515290381e-01 5.3992522279942723e-01
+2745 2.7988186877817598e+00 -1.6456692065991103e+00 1.5981590867320483e-02
+766 9.9504270189195820e-01 2.4679365084537025e-01 1.9327487017521710e+00
+1907 -6.3988709171063651e-01 -1.2601408134770176e+00 -8.6810004720727307e-01
+2691 1.9759656327109185e+00 1.1195683391520419e+00 -1.3086512747723877e+00
+2564 5.2270974618539701e-01 -3.0098726156184830e-01 -2.8232637383827308e-01
+2695 3.0034374349272980e-01 -6.4813815697548449e-01 -5.3547103182817535e-01
+1615 -3.7440473532146945e-01 9.9366469427783677e-01 5.8618246943208330e-01
+1119 -5.8386672041917698e-01 4.2690566022372983e-01 -9.1774387042929273e-01
+2786 -1.7904783085675040e+00 -1.0004261503808702e+00 5.5080743840391477e-01
+432 -3.9893408937662422e-01 -1.3493918118771340e+00 1.0754843475320299e+00
+283 2.9790113893877757e-01 -1.0135451468391190e+00 5.0201532767858097e-02
+2178 1.4411178147135324e+00 -1.6631906011369443e-01 -4.8088872237649488e-01
+1423 -5.7714068384073225e-03 8.4417382794171908e-02 2.2223300846249391e-02
+35 -1.6145843009571645e-01 -4.3861234069997873e-01 6.1125462674660302e-01
+229 1.9660867432920002e+00 -5.3322944710189746e-01 -2.4232849439485690e-01
+230 -3.3036435801710329e-01 1.8601729858340608e+00 -3.3740271979399927e-01
+1717 -1.2805135697478558e+00 -5.0910128639311558e-01 -2.9786513388979841e-01
+926 4.4823926838329742e-01 -1.3817162994835617e+00 -1.1776179812545760e+00
+1139 9.7648822832228233e-01 -1.7275793830153086e-01 1.7165567366501497e+00
+1448 6.9428222498333547e-01 -4.2751605235020479e-01 3.4003429416111730e-01
+1434 9.3248823655691082e-01 1.6077797091920340e-01 -4.6553536116392646e-01
+907 -4.3580240434688200e-01 5.8453533479568526e-02 -4.2355131652418326e-01
+1773 4.0530371173702462e-01 -1.3838878527448977e+00 3.9134431321696611e-01
+798 8.2220768069784356e-01 -2.3447734697689855e-02 4.4905308177844883e-01
+1698 -1.2459292885786781e+00 2.6912681813219541e-01 6.0957672504713112e-01
+1618 -2.1520868601221629e-01 8.5590632181649817e-01 4.9296793949354883e-01
+373 -7.4952116753709344e-02 4.6357813035771189e-01 -8.3646441283511197e-01
+1543 -2.3896248344935564e+00 -1.1382946167503669e+00 -2.1620619019407539e-02
+2518 -1.7839413441431418e-01 -2.3822258223446890e-01 -1.1497901876618813e-01
+284 -4.9589238751071146e-01 -6.4853036078262183e-01 5.7286062057373244e-02
+323 8.3810448375451796e-01 1.2184580406942600e+00 1.4488887202199094e+00
+2701 -1.0359387859693187e-01 2.5157908348720165e-01 -6.6696196274705677e-01
+219 -1.0474107562037001e+00 4.1258343918215729e-02 -1.3093554652397050e+00
+2053 1.6519974972221081e+00 1.6982857716429707e+00 4.7316040991695368e-01
+694 5.4858915860132018e-01 -2.0405321233816052e+00 3.1866250046019218e-01
+2491 1.3605735558862600e-01 4.0080036038610023e-01 1.1984550162613372e+00
+511 -2.0101841053501035e-01 -1.9720329373128513e+00 -2.0691456391271572e+00
+2383 1.2455642195114884e+00 -7.5136240576766866e-01 -5.9277664448436185e-01
+362 4.4856099389215448e-01 -5.2822917423869520e-01 -9.2332122653968318e-01
+2489 1.2742408072088125e+00 -5.0999349308158504e-01 8.5012983722548185e-01
+179 -4.8526711075988332e-01 -4.3322426188006946e-01 2.4159714748780865e+00
+1767 -1.2608821911767061e+00 6.6836580887815467e-02 5.1563040793011161e-01
+1837 9.1854063640550732e-01 3.2953106922982967e-01 1.7550787385463298e-01
+2244 5.4868890515262336e-01 -7.2191109142669407e-01 4.9077803054659008e-01
+415 1.6017629490527361e+00 -1.0829610802797740e+00 -5.6019043644839706e-01
+883 5.6733875851968679e-02 7.5615065326787201e-01 -4.3236961041515171e-01
+2264 1.3552839443894600e+00 9.5117096654860467e-01 -8.1296536653858265e-01
+2565 -8.2556137538820029e-01 -8.2436166257377907e-01 -1.5273250755324406e+00
+752 7.2719029312079353e-02 3.6718249381766566e-01 -3.4332167571234792e-02
+361 -2.7907032688595113e-01 2.3093853395455494e-01 -7.7942919749081985e-01
+2342 1.0048385410644114e+00 -6.2451756784653945e-01 -1.0360831550803908e+00
+1739 7.4141754242060420e-01 5.4369541237666974e-01 7.4291220785567957e-01
+1209 1.6547801687371575e+00 3.8103554041017218e-01 -2.1039966503718061e-02
+1756 4.8735459934667591e-01 -2.1182232091454827e+00 1.2804542138158503e+00
+1391 1.2847741245445783e+00 1.4429252032975197e+00 3.6705856728142228e-01
+418 4.6517551261753476e-01 -1.3860272674872138e+00 4.2988471627347008e-01
+2601 -1.5970750829851746e-01 6.8226626140172619e-01 -6.1135938585012506e-01
+2194 -1.1111136459692084e+00 -4.8009186281227939e-01 2.3507216834409914e-01
+707 -2.3500726189795124e-01 -3.1194074299300345e-01 1.0923857107823376e+00
+988 -2.4951991228968996e-02 1.8647552906818303e+00 1.3269486788258678e-01
+611 -5.2088336847708172e-01 4.3822881956442272e-01 1.7478263546890974e-01
+304 -8.9566249964401234e-01 1.8017776600678472e+00 -1.0523498679995549e+00
+2392 -2.3586311631392520e-02 -1.5966185274476594e+00 -1.1022381912764354e+00
+130 6.8647539231038746e-01 -1.4836516103123047e+00 4.3431162306956278e-01
+1459 9.0226097926509408e-01 -6.1037049647267783e-01 9.8932711057140610e-01
+2182 -8.3952990159808938e-01 -1.6910498217023635e+00 -1.4269596843475101e+00
+1626 2.1690345930794490e+00 -9.6931476977982733e-01 7.4734718684427159e-01
+2816 -3.6682616828452297e-01 -1.4241964281857069e+00 1.6687213720931064e+00
+1595 -7.5082971437529344e-01 4.9187562534276730e-01 -1.0710897360218798e+00
+2834 7.2075161265557852e-02 1.2886425112414768e+00 -6.2639733211737647e-01
+2385 -1.1791996897919660e-01 6.3150334702642241e-01 2.1498838148990097e-02
+207 1.1161073726636039e-01 -1.1309298414495655e-01 1.1857917248950280e+00
+476 -1.5421123910756229e-01 2.4291520212770151e-01 -2.2256928233033371e+00
+737 1.0798522907008881e+00 1.4791892061399450e+00 5.4776427773629988e-01
+1016 7.0909689523631678e-02 -1.5609269376477131e-01 -1.1417620602116654e+00
+2202 1.2320538465093187e+00 2.2000987603708949e-01 7.9693022773894562e-01
+2193 -5.9702992378537334e-01 -1.3853491123553265e+00 -3.0755913258397127e-01
+2814 1.8441704420332823e+00 5.7437305042525200e-01 -3.2940261556001943e-01
+326 7.1174793194356356e-01 -2.9539181630513617e-01 5.8895120902500186e-01
+1789 1.8254970463936304e-01 9.2950734171798921e-01 9.2241011605959122e-01
+174 2.5770318526194258e-01 1.3921689461989200e+00 -1.8833810821790424e+00
+2443 2.5412924503142459e-01 1.8643028371881911e+00 -7.2945406418549547e-02
+460 -2.9783111838065945e+00 2.4267699799073505e-01 -3.2103473718468339e-01
+1309 -7.3244915374082720e-01 -5.1067470139937809e-01 1.2417755075131294e+00
+1790 -3.5932428033776209e-01 7.0471065053544468e-01 -4.9762439520335056e-01
+760 -6.3454560135561144e-01 -6.1775810127703812e-01 2.2110530010787168e+00
+165 1.1809687253830037e+00 1.1729335861319417e+00 1.7482386401788350e-01
+781 -4.1804079000369415e-01 4.5282348774770648e-01 -1.0675445574689764e+00
+2052 -8.5770036871389055e-01 -1.3278415816556668e+00 -5.5307970418916785e-01
+844 2.5710065330050058e-01 -2.8188432190337742e-01 1.5734005145254737e+00
+408 7.4949332889038567e-01 -8.0746717565345494e-01 3.9563342782793459e-01
+2920 -6.6161808657785182e-01 -1.0667450139685997e+00 -3.6705994568889722e-01
+1316 3.5399185148417889e-01 7.4507872389925944e-01 -9.3872588275762059e-01
+2234 9.1451047683184861e-01 -3.1963378617357968e-01 3.0970020174264451e-01
+1359 2.3485213026597221e-01 9.1726879314922105e-01 -1.4674712597749653e+00
+1943 -4.6189705151387483e-02 2.3180178383707833e-01 -7.2427485978554729e-01
+1177 -1.7093969027557784e-01 1.3196017481960538e+00 -6.3084296891919911e-01
+1929 3.4984618672110590e-01 2.9079315211379098e-01 -3.5940399226878128e-01
+2732 1.0688827356700781e-01 -2.0734028989475983e+00 -1.2794911451579891e-01
+755 5.4463411313455112e-01 1.6603763585230741e-01 1.5011543389003608e+00
+1658 -1.2430279327405256e+00 6.9674931932703466e-01 8.8600341425071671e-01
+2457 7.4061860494507947e-01 -1.9195582253122008e+00 -1.1753825978340280e+00
+2575 -9.7533917677012305e-01 -5.9653602997461885e-01 -2.6681266118668401e-01
+2450 8.5175755152590765e-02 -8.6149398767495833e-01 1.2045226645491778e+00
+2978 -8.7425342334917633e-01 -5.4239826989458106e-01 4.3957994712672491e-02
+968 -1.1042369430660008e+00 -4.6057673964581319e-01 1.8377733201316970e-01
+1170 3.6734109114632002e-01 -2.0179017539358859e+00 -6.6313540882412658e-01
+1828 -8.8137938787138126e-01 -1.2007801466498795e+00 3.7250700166159623e-01
+1168 7.8843407232900231e-01 1.4023604965435396e-01 -9.8399306510268680e-02
+1183 -3.0117043472669991e-01 8.6713713053104891e-01 3.0126853430225381e-01
+1568 -1.6436413594355248e-01 1.3430126758569266e-01 -3.2036098189434148e-01
+260 -5.4305841869629390e-01 1.0452001998080773e-01 -4.4463088397202999e-01
+515 9.6532319138006595e-01 2.8563873739813234e-01 -1.8291061932135533e+00
+407 -8.7811572147831762e-01 -1.7900506764162096e+00 -1.6032903254285100e-01
+1570 8.5294304020290132e-02 -1.0178473791494613e+00 1.0043047519379102e-01
+547 5.1202543818694979e-01 -9.9797016943428996e-01 1.7628023475990162e+00
+2885 -1.0306485585766896e+00 -1.6058438042954964e-01 -1.3957774253277198e+00
+1218 -7.5628725114011286e-01 -1.8257367623606049e+00 1.3925189124742270e+00
+2499 1.4649798214175342e+00 -1.1434726046357768e+00 -9.5041263026905687e-02
+2239 8.9428359257883872e-01 -6.1313770801257828e-01 7.2050082591894249e-01
+2640 -2.4167999619521154e+00 5.7086784311522268e-03 1.2225910892370611e+00
+2748 1.7991796958790194e+00 6.2817314805112512e-01 -1.3644712451094243e-01
+1838 3.5000522550465962e-01 -1.1836195600863587e-01 -1.7365477596430312e+00
+2505 3.6701363714448454e-01 -2.7526565267281491e+00 1.2753319476465006e+00
+2471 -1.0299305972725918e+00 -1.4968270431412717e-01 1.0781038142916005e-02
+2613 -5.2848408149460147e-01 -4.9148634135480279e-01 2.5985043376639727e-01
+251 2.1818699745076481e-01 3.6834954123846686e-01 7.5627609321918776e-01
+2322 6.3140988330929348e-01 -1.0302649154360385e-01 -1.4905714310574497e-01
+633 5.2244059753871058e-03 4.1079708960375971e-01 -1.6439150833528418e+00
+316 -5.3573660884555818e-01 3.1416007807144575e-01 1.5988176009245516e+00
+1013 -1.5075924117687540e+00 2.1231680060621771e+00 1.9983966364372319e-01
+406 2.8027024157166924e-01 -2.2277708684143569e+00 -9.1672323503389486e-01
+743 -1.8443093381309370e+00 -1.7171507323919777e-01 8.2770656920425245e-01
+394 -1.3591439540870234e+00 -1.4358171546494544e-01 3.4546477166221834e-01
+651 2.5987672985632276e-01 1.0090160463988564e+00 -1.0975965804766816e+00
+793 -9.8540197737376600e-01 -1.6128173319420669e+00 -2.5395642482706360e-01
+1559 -3.8978211332813650e-02 -8.7648657540059582e-01 -6.5323889930322510e-01
+1613 8.8696780428613314e-02 -1.2125658734624840e+00 2.3898385541096823e-01
+147 -1.9081477582208710e+00 -1.0435565433538181e+00 3.9019718394129832e-01
+1713 5.0840363941994360e-01 -3.3886648781695727e-01 2.5168530892472873e-01
+393 -8.1089936081416236e-01 -4.7217098844869421e-01 1.3984212609024285e+00
+1242 3.9606722772870528e-01 -8.6265218242712483e-01 -6.2861111404220427e-01
+2007 1.6438472978041763e-01 -1.2299849988750695e+00 -2.1402657683473931e+00
+773 -1.5001111138788710e+00 2.1987919727011479e-01 4.5536419932025851e-01
+2116 -4.1004357396353419e-01 1.0173324225390561e+00 -9.4834539061337353e-01
+1358 2.1679214116815322e+00 -4.1333059377226411e-01 -6.1345883432442383e-01
+921 -8.6332599194729187e-01 -1.2387210622188689e+00 7.6825414765414546e-01
+2684 1.8063484066422302e+00 8.3758520046913354e-01 -4.6649196849132757e-01
+2367 1.2675425354742755e+00 5.5845798865691509e-01 -1.7479971891332453e+00
+2325 -2.0371531454865091e+00 -8.2559046002409098e-02 -2.1451771218040130e-01
+2036 6.6033259079822226e-01 1.6215419552903083e+00 -4.3982757814361084e-01
+1073 6.5788697456454837e-01 9.7062966542402918e-01 -3.5017573034504770e-02
+2525 -1.9315102708283221e+00 -8.0401640861043289e-02 -1.0516200543655879e-01
+754 6.6388572775102864e-02 5.9359824908064429e-01 5.8136738189185699e-01
+1931 -2.0557953664246242e-01 -1.2429182238261596e+00 1.8223310635119205e-01
+2210 2.2330849033726330e+00 -6.5938058327581550e-01 -1.4459855195192781e+00
+2763 6.1814550560015680e-01 4.9895147220496239e-01 -9.0008780156762169e-02
+1695 3.1689622730441708e-01 9.6478180527482171e-01 1.2457859540187857e+00
+1176 -8.9607760590942043e-01 -1.4410305533458598e+00 1.1027421199977012e+00
+599 2.0108398968202407e-02 1.7416572011361695e-01 -7.1720112798203783e-01
+477 1.5243563046023185e+00 -2.0206215255157516e+00 1.4428982134638415e+00
+1104 -6.3631905125432417e-03 1.6129118366858939e+00 -9.0866488160625619e-02
+2281 7.7416920493685959e-01 1.7210570154476801e-02 -7.7608439647086624e-01
+1420 8.5202175907834854e-01 9.2067535115321353e-01 6.8777562160374117e-01
+690 1.8400036425566171e+00 -1.0101939769777832e+00 -1.0263645415944378e+00
+1098 -2.4906389300822934e-01 -1.5429283688847696e-02 -4.3535784782362219e-01
+1875 9.2485133587813451e-01 -2.4023744688924700e-01 -5.7201675655573525e-01
+1740 9.2795490181252893e-01 -6.0139526137560650e-01 1.1546238752853069e-01
+81 1.8527266091291004e+00 8.2772532888514372e-01 4.1042790989014127e-01
+2605 8.1267618346741077e-01 -3.7676592726010011e-02 2.9408377922555634e-01
+2365 -2.7853541198809428e-01 8.7731439828437163e-01 -2.5702554213034190e-01
+1214 8.2407175708136582e-01 -5.6601395877435601e-01 -4.3354662701344981e-01
+2044 -2.5642076928014251e-01 1.4836441224054966e+00 5.7999772342686240e-01
+2090 5.0931701276847297e-01 -9.2237942697830244e-01 3.4312553768996190e-01
+141 8.8820308809352400e-01 -1.6623529114825957e+00 1.6445645095245084e-02
+1846 6.0125305608399071e-01 2.2941520163909628e+00 -7.4590641130550217e-01
+553 1.4059034276518991e+00 -1.3172352101322557e-01 -1.2200738021217758e-01
+2726 -1.5018963212061651e+00 2.5883136794881534e-01 -2.1516472456464451e+00
+728 -7.1729099874577895e-01 -1.1338551476594296e+00 2.8057382089656295e+00
+1325 -3.9803700472968484e-01 7.5698672458003302e-01 9.8217171495841374e-02
+2753 -2.6315985765638733e-01 -4.9353669324093102e-01 8.4029182273057978e-01
+487 -7.3622394770465882e-01 6.5954910744509687e-01 -2.3711182999073910e-01
+697 5.7630598588439597e-01 -1.0832665554639911e-01 -5.6363323631097462e-01
+2019 -4.0715377733340813e-01 -6.2573749622807318e-01 -5.3017281853321152e-01
+2086 -1.3626576578975425e-01 -9.9727192708682555e-01 1.8419130701021955e+00
+551 8.1942048338918738e-01 3.8357178832347638e-01 1.2362696024955460e+00
+831 -1.4712678799979173e-02 4.2652838971410145e-01 4.5218210517541640e-01
+946 2.8631339330711270e-01 -8.1136227151565460e-02 6.8733702353458626e-01
+1714 7.6263125291521827e-01 -8.0157686175486609e-01 -4.8615678615134961e-01
+2118 8.2254780099372349e-01 1.3560503063324671e+00 3.4294197241933155e-01
+1131 -2.7487318681486039e+00 -1.3869654370151479e+00 1.4724161913080807e+00
+2396 -7.4950006066702135e-01 1.3952299125428677e-01 5.5341100984371283e-01
+9 1.7669076634745520e+00 -1.0516446565788033e+00 -3.2082238922000234e-01
+2199 4.6035378990586007e-01 3.1853785406428853e-01 -5.0882181546772198e-01
+2596 -2.3411903635962156e-01 1.2907115777973006e+00 4.2088822494401995e-01
+1997 3.1084172257122267e-01 2.1383709146147059e+00 -1.4639476155212672e+00
+1390 1.4560440714150815e+00 -1.0492280391874391e+00 1.7380530852115788e+00
+2882 -5.5177500926100098e-01 4.3054380546260251e-01 -7.9300207359784669e-01
+2350 5.6167933244517498e-01 -3.1402343594315668e-01 1.6241106570756969e+00
+2950 1.2083739399976972e+00 -1.1826927592229137e+00 7.3531592940338120e-01
+1473 1.3232752498350020e+00 3.8800763289200207e-02 -1.6849484247878682e-01
+2113 -2.1422614449842614e-01 2.2279772542572385e-01 -5.4063647124567904e-01
+2183 -5.1263427480961643e-01 -7.9535076077242728e-01 4.7955903292145963e-01
+1196 -6.7761056086818483e-01 7.3412358636516295e-02 8.0987575237983067e-01
+2723 -3.3558671068871687e-01 -1.3481559701011323e+00 8.4262165686208634e-01
+495 -7.4176918841984729e-01 -5.1666428317393320e-01 -1.8894480339457137e-01
+1107 -8.7374633892419395e-01 5.3450220276239191e-01 7.4485465749278168e-01
+1764 -3.3768204400765761e-01 -4.8378253470969801e-01 7.9943168882287607e-01
+943 1.2769087970675823e+00 1.0151500645599698e+00 -1.6362107771114243e-01
+2942 -4.5453644294614987e-01 -1.1829706200841014e-01 -6.3717059217279270e-01
+2571 -1.3806302534322572e+00 -1.3602881027496816e+00 -3.5506124968143837e-01
+2323 -8.4594213950323890e-02 2.0077818313657317e-01 1.2658540018506431e-01
+1924 3.0120561287757364e-01 1.5321565257011957e-01 2.0024578649612901e-01
+1849 -1.7307243274334591e-01 2.5058459216653929e-02 8.3341067473350894e-01
+2092 2.7083765127372459e+00 -6.3611886243029869e-01 -1.3703436296479871e-01
+1858 -7.1721757355823235e-01 -3.9244459603364346e-01 -1.2053933437420483e+00
+1918 7.4080016089803302e-01 7.0037713489403930e-01 5.1953629779462629e-01
+1392 -4.4750073791119382e-01 1.5300793080513959e+00 -5.7712195366552987e-01
+2014 5.0163082170224571e-01 -7.2262531517860829e-01 1.8348976629325153e-01
+2263 -7.0680439753149060e-01 -4.8460230472830401e-01 9.1640047767559096e-01
+1432 -1.3101636658464513e+00 1.3171833439626970e+00 1.4251285213008363e-01
+2497 2.2668260024576548e-01 2.9054592922486411e-01 1.2224616273388569e+00
+2465 3.5046969375645881e-01 4.4301560124982930e-01 -1.1614579619602924e-01
+1731 -1.4857511683333446e+00 1.9139033554941093e-01 1.1201676456671668e+00
+1955 -2.5575198365074969e-01 1.1603644149050456e+00 2.4438219078602996e+00
+1760 6.7935935720292639e-01 -5.4778060114206351e-01 -1.3990740259183885e+00
+1353 2.4741464316079845e-01 -2.2535534124677303e+00 -1.9695950229183801e+00
+2054 -3.2041290767421932e-01 1.3386725908684560e+00 1.8970443318506161e-01
+2653 6.5615942891898005e-01 1.2441041146782965e+00 -1.0276668904052311e+00
+2606 -3.5520218606936566e-01 1.0659845143298814e+00 1.7790381934473171e-01
+2784 -4.6188469198370952e-01 -8.3010657943402699e-01 2.0678444313591507e-01
+1450 -2.3350450426431552e-02 -1.8137048329776313e+00 -5.4884264200314381e-01
+2225 1.4090650538940233e+00 -1.1354382520149910e+00 2.0156056036000414e-01
+2866 -4.6849357620507426e-01 -9.0169043270546401e-01 8.5340172783071944e-01
+1378 1.4861844360968262e+00 1.0790553680086463e+00 -7.9776925135626053e-01
+2528 -2.4440007145041749e+00 1.6957453304549062e+00 5.4911350719445606e-01
+462 -9.6668161782510198e-01 -4.3910488952931293e-01 1.2489769408508860e+00
+14 1.5486539939942752e+00 1.6122341121842765e+00 -3.0150338932779436e-01
+1460 -5.7036875955226918e-01 2.1064805091160173e+00 -1.7046932795453165e+00
+2397 1.1312711019715729e+00 -1.5426793844168685e-01 -1.2737887247040112e+00
+616 3.1701180247447502e-01 -4.6244201538847773e-01 -9.4920676971516726e-01
+2538 1.4581306196231242e-02 6.7751843643039389e-01 1.2461864212405444e-02
+2387 1.8845751048581347e-01 -1.3187714362185021e+00 -1.5611715916974089e+00
+1179 -3.0215839544568934e-01 4.0763980649989950e-01 -2.3568717097570999e-01
+2889 1.5508888933369771e+00 6.4932129240441105e-01 5.9151169750440880e-01
+1694 2.4372849773491650e-01 4.7106796190436256e-02 -1.6117254574135833e+00
+2172 2.1394010171808278e+00 -1.3104805276167100e+00 2.3230898712429036e+00
+582 2.3458769590915354e-01 -1.1045764671597134e+00 -8.9226061939962853e-02
+2991 1.6901113142054764e+00 -4.7763488868858373e-01 -5.4463031224494196e-01
+751 -1.1332739649154924e+00 -2.0123363538464517e-01 -3.1296515553903631e-01
+574 1.0614899575122156e+00 -2.8798521603840915e-02 -1.1119084603388358e+00
+2832 1.6936807339877016e+00 -1.0069401229272481e+00 1.1035454314218619e-01
+458 3.8037164913579258e-01 9.0765997117780184e-01 4.9519010483806908e-01
+1763 -1.3315353596147295e-01 -1.3074168964232907e-01 1.0500059273259180e-01
+464 1.1232657671721386e-01 1.9694013078136980e+00 -2.1923696254401523e+00
+2363 -4.3223174508754236e-01 2.1984205481543864e-01 -3.8445694038232014e-01
+1974 4.1031723815747861e-01 -6.9676240703792969e-01 -1.3110365860320750e+00
+2622 7.3147006535557543e-02 -7.1210825348889686e-02 -3.3133579687720123e+00
+350 5.0786096299237626e-01 -2.6269258625493996e-01 1.0123042696880202e+00
+17 -6.7166338544741067e-01 4.0071392839522751e-01 2.5024805825217405e-01
+1672 -1.7680674444874660e+00 5.5481563980323401e-01 2.2037735437103687e+00
+2665 -1.1069155575357363e+00 -5.5024528137353187e-02 -9.7452214133762471e-01
+857 -5.7875556455638155e-01 -1.9111818342612330e+00 -1.4032284692916780e-01
+90 1.0716055046664830e+00 -6.4901428406249989e-02 9.9197496215022984e-01
+2543 -6.1703524362692708e-01 7.2088547823773774e-01 1.1081525385425035e+00
+2969 5.1521273051736677e-02 -1.3580464555706586e+00 -8.8775371722479268e-01
+2987 -1.0051135541427927e+00 -7.4490655119771487e-02 3.2458095239541723e-01
+336 2.9574559444661657e+00 2.7637043267768530e-01 1.3659766530616360e+00
+1438 -1.1689279453374701e+00 5.4965060127079479e-01 1.3395409492263133e-01
+2078 2.4312203805149138e-01 -3.5513904680204361e-01 -7.8073210731148479e-02
+924 -8.6550253766173413e-01 -2.7019785311481592e-01 -1.5269264196043122e+00
+1912 -7.4545206715821766e-02 -4.4995744006554261e-02 -1.0646705120916062e+00
+678 -4.4798706290234754e-02 1.3394952827849655e+00 1.4982444332588045e+00
+2886 2.2066051419638699e-01 -1.3637667291016995e+00 2.0900971974890575e-01
+389 -5.6373992574735798e-01 -1.0818560364006640e+00 -9.9116236637785982e-01
+576 2.9883556530425831e-01 5.2423233655790269e-01 -3.3142222261781934e-01
+226 4.8332915321470710e-01 -1.1815608847067867e+00 -1.5062589556708823e+00
+34 1.1188167335962045e+00 2.6403686491718590e+00 4.7195436728974374e-02
+1064 3.1981844597413500e-01 3.6565811945360510e-01 -2.3008109191856372e+00
+2136 -3.8666117264732902e-03 -1.5551075177277487e+00 2.2501012256720992e-02
+636 -6.8963092165097695e-01 4.2170887684557334e-01 1.3898933511681326e+00
+1551 3.8051366905440642e-02 -2.0865504012289535e+00 -9.1796360218375794e-01
+2442 8.4948829228781042e-01 -2.4609755301694816e-01 7.5510969046569898e-01
+1665 6.2206976587302210e-01 1.3902611186938942e+00 -1.9129192759119826e+00
+2876 7.2947724412124537e-01 -1.0421638278405172e+00 -1.5770638869835636e+00
+812 1.0187748035459572e+00 -1.0225588278894006e-01 2.3512151651666087e+00
+2131 -8.1109344241394632e-01 -7.3546285298895842e-02 1.8427276454697650e+00
+763 7.2137540341943263e-01 8.7330561106606933e-02 -2.6134662206387826e-02
+1220 2.1239536709835141e-01 -5.2997187574382032e-01 -8.7795845019134189e-01
+2000 1.3606582961783766e+00 1.1756793437920254e+00 4.2707518043753123e-01
+1671 -2.9582216430290220e-01 9.3340371500440911e-01 -4.2631690314905352e-02
+504 1.2148365066379454e+00 -2.0526697750911846e-01 7.4553556581182831e-02
+2374 2.1176911719334349e-01 -2.5733142875498376e+00 -8.1481280760999009e-01
+1476 -7.2982582352010397e-02 -2.8084524542162626e-01 -1.3720016373450603e+00
+2255 -6.1885222988686384e-01 -5.7990721740248874e-01 1.2006332087932758e+00
+2369 -3.3370062287067281e-01 -8.4886423768376951e-01 8.3687406888755111e-01
+1606 -3.5866907756632105e-01 -7.0794884415622553e-02 5.6781472716800152e-01
+1573 5.2821043577470483e-01 -2.6202316517753677e-01 -1.0395370515491720e+00
+1686 -3.2703835354920802e-01 -2.1047738217301259e-01 -1.2423514658538590e+00
+1239 -7.0930347140987571e-01 -2.3875506125059367e+00 -5.2825151116439106e-01
+2094 -1.1733265204184373e+00 9.6452227472814600e-01 7.5753794160219312e-01
+1794 9.7377714560324113e-01 -9.1184045351384702e-01 -3.0283639210134761e-01
+894 7.7494866928850092e-01 3.5091360141312961e-01 -5.8378352977432386e-02
+1645 -1.2255907865249478e+00 6.4610778881790787e-01 1.8586334098596187e+00
+155 7.5543257149833520e-01 5.2836616788925994e-01 -7.0515223635491719e-01
+1810 -4.1511003107740516e-02 4.8069534695407268e-01 5.4291335414654973e-01
+1164 -1.5541129276622956e+00 -7.5466831355913977e-01 -2.2006110033435772e-01
+135 -6.4793637360131284e-01 -7.1244130405225614e-01 8.0555244873462495e-01
+1812 -1.7351464184704868e+00 7.6478145177184054e-01 -3.3972156212727567e-01
+1466 -4.3571642043213688e-01 -1.3178509286422102e-01 -1.6763558714499016e+00
+1985 1.0547674743719859e+00 1.1486140389846968e+00 3.3865130130549398e-01
+127 -1.8324268266966786e+00 -2.6769713436336218e-02 6.3503006811349283e-01
+439 -1.1997557150638805e+00 -1.0679616822578664e+00 4.2503418082824634e-01
+228 -4.1524700654284230e-01 -5.3844697032384869e-01 -9.9965420780565162e-01
+2084 1.5012065954512417e+00 5.6847006535962352e-01 1.6957957072767764e+00
+241 -5.3575747994209677e-01 1.2201698639387113e+00 -1.7679596763081840e+00
+977 -8.7037043969479450e-02 -1.4311405242062634e+00 -2.4483923733991424e+00
+2913 -1.2562791611925390e+00 -4.6986571346480532e-01 2.1351652931203519e-01
+1647 -1.0763498697149350e+00 7.7331735899354048e-02 1.1629084584294977e+00
+1414 -8.1148282049029197e-01 2.8240953181697215e-01 -1.4041848591593395e+00
+235 3.0944745897058701e-01 -1.3494961495278390e+00 7.9668805509832286e-01
+447 4.6172009757615229e-01 1.7831856760614417e-01 1.5743189967442556e-01
+1372 4.7745500195768376e-01 1.4205561168404024e+00 1.0278106739401920e+00
+178 -1.4456211205564105e+00 -4.1253637318764852e-01 -2.2197601168102490e-01
+2258 1.1395421331356321e+00 3.0674374501322466e-01 2.8106324670061650e-01
+2085 1.6368531755789604e+00 2.0119109524513972e+00 4.0594847798796779e-01
+243 6.3071502780760802e-01 1.6207812010317839e+00 -3.9345537936945785e-01
+1441 5.1356069198182752e-02 -6.6067726664730397e-01 2.3887599443311200e-01
+193 -6.2573037486665173e-01 -7.3201161827734229e-01 1.8016679404322162e+00
+1255 1.3261437748992908e+00 1.1745748716484812e+00 5.8514805260195912e-01
+505 -4.3369872737733378e-01 1.4822512154189995e+00 1.0993638826106360e+00
+1281 6.0580172414547895e-01 -3.9125023813646256e-02 -1.9437530419073812e+00
+1015 1.9921432672768244e+00 -2.2763166729067577e-01 -1.3438496244780518e-01
+2150 1.3092026723089695e-01 1.0567830287480353e+00 4.8670265284679126e-01
+1750 -1.5095479217955146e+00 -3.9770960921501242e-01 -5.6528296611813100e-01
+600 -1.7851217222695034e-01 1.7997796985299859e+00 -6.5183894893457051e-01
+1430 -4.2394810005923322e-01 -5.5659974938246715e-01 -5.5676007513941261e-01
+2106 4.6861430238644608e-01 1.1093402587270251e+00 1.6368039559000191e-01
+2752 2.6357332693108587e-01 -4.1310482865363224e-01 7.8266097704312054e-01
+2313 -1.1456536222651243e+00 -1.4955659989047237e-01 6.1545581536346672e-01
+1247 1.0070825493894403e-01 -6.1942052396719327e-01 -2.4957867218434399e-01
+2380 -9.9297427523291704e-01 -1.5796770561526530e+00 -3.8883624371046083e-01
+1802 9.8302990539574686e-01 -8.9733199915219986e-01 -1.4191888973104401e+00
+1361 3.2472372493290874e-01 1.8523232666072412e-01 -5.8929729187651669e-01
+2483 4.4505630760306059e-01 -1.4343079580892018e-01 7.5267939053374655e-01
+1166 2.2027497949135694e-01 -5.6710184764267224e-01 -6.4757189277563754e-01
+1930 -7.5047456345668373e-01 -2.7215930070499550e-01 2.8125944799176192e+00
+1530 -1.2691294211751680e+00 9.6119758653566323e-01 5.8988497799515915e-01
+1820 9.1472090363807512e-01 2.4682161171108302e-01 1.9372441692127098e+00
+1723 -2.1465903515013318e+00 1.6170725998498892e-03 7.0849800369894245e-01
+1680 4.9779440517509921e-01 5.4879007550558578e-02 -2.9395615548045217e-01
+1605 1.4450105564844060e-01 2.5843932582330109e-01 -3.4913118388271613e-01
+1715 -1.5434483838882072e+00 4.7386304045608929e-01 5.8304678209163974e-01
+1973 -1.7065925801915813e-01 -2.4949972087387651e+00 -2.2388196003359639e+00
+1927 -8.3433451888122434e-01 4.6210516458678674e-01 6.8481386986776649e-01
+2315 6.7313332391702618e-01 -3.2827810668608315e-01 5.3943194625549951e-01
+826 1.4904046229025754e+00 -1.2277281235404309e+00 -2.7894718739564857e+00
+2138 6.4416861131235870e-01 -4.1455904909079394e-01 9.6461679335236494e-01
+1644 -9.1622979219458356e-01 3.4235026601272983e-01 1.2248511416150192e+00
+1398 1.1581023311021388e+00 -9.6921844849224759e-01 -3.3639147562411720e-01
+1303 2.6892190347780220e-01 -3.3519247356223097e-01 -1.1219749848535585e+00
+512 -5.1986478250809232e-01 4.3964623128344810e-01 7.3367485205098087e-02
+2067 -7.1729842983160430e-01 7.6012389310466388e-01 -1.8446470218396743e-01
+692 -2.7909642607947838e-01 2.6180972815067483e-03 4.5687671961498927e-01
+1233 -9.5384471350642430e-01 -1.0778664681052619e+00 1.7634220912452665e+00
+1337 -1.4784334974833531e+00 7.5203082572302474e-02 -3.3604399735725538e-01
+892 1.5917365706531219e+00 -6.4277102603045355e-01 5.8599600169856836e-01
+2398 5.5899664963394025e-01 6.2007445932852778e-01 1.6863013192879384e+00
+123 8.7352732542872444e-02 1.1953505198251373e+00 4.0530376260705747e-01
+2010 8.2547723460842670e-01 -1.0420958474649161e-02 -1.0291753214303305e+00
+1903 -1.6165981600982471e-01 -1.6519344977777867e-01 1.0620864415123052e+00
+564 5.0970849575169108e-01 4.0040302202259431e-02 1.6924969458534198e-01
+2337 -4.0788461900347212e-01 -1.9662679178968573e-01 9.4543796817066650e-02
+214 -5.0734602929792150e-01 -1.2449895148456297e-01 9.6930003084360117e-02
+1883 -1.0108752545156381e+00 -7.5434548333878837e-01 3.3280667392191360e-01
+102 2.6140625659990979e-01 -1.2529345968371799e+00 -8.6270228116382885e-01
+1657 -3.7588067448410012e-01 6.5331161486240474e-01 -1.0032972208878363e+00
+1364 -2.6920872443101890e-01 -6.8183132565430482e-01 1.0021791869063124e+00
+497 -1.1161495407251529e+00 -7.6777965502447587e-01 2.4107617730675440e-01
+1660 6.3299895235732762e-01 1.0458743920668963e+00 -4.9841166758249261e-01
+1990 1.4078029251047217e+00 -6.9395208175247558e-01 -7.0676018644814509e-01
+2635 2.6839512585221520e-02 3.7220316773020998e-02 -4.0862792086880034e-01
+1134 5.2978072205647087e-01 3.2068469315241188e-01 9.9489056578619306e-01
+802 4.2522849647146296e-03 -1.1686966894164486e+00 -3.4951084423865503e-01
+1461 6.2853941864866569e-01 -8.8347282274131267e-01 2.5974124182564617e-01
+2800 7.5632194179595325e-01 1.3825611323331539e+00 1.5833090940019872e+00
+2237 5.0404702471819762e-01 3.8398581355119582e-01 6.2097147305098765e-01
+2111 -1.2645405969822905e+00 6.6419624811094891e-01 1.1822224764971501e+00
+680 -1.2242935332685327e+00 -6.9713274754421606e-01 -9.3058655201561957e-01
+1753 5.4321073654330268e-02 -1.2807236350538229e+00 4.0114514660325212e-01
+114 -2.4537646250220213e-01 1.1937645294142905e+00 -1.4098164556020705e+00
+2047 6.3755609187328255e-01 5.3912253232352447e-01 -8.6360630240619107e-01
+2411 1.3425260293833745e+00 -1.7931324212480912e-01 5.2543343710215473e-01
+2451 -9.0735749843813485e-01 -6.0286794087961693e-01 -1.7197608139618353e-01
+1081 9.9121719260428909e-01 -9.5110112710379968e-01 1.0699778403436737e+00
+1926 1.9206976811670184e+00 2.3696141372543755e-01 -1.1052721493734470e+00
+2845 1.1497752221743278e+00 1.3210320209162494e+00 1.1796080074101982e+00
+2904 -1.1391846777407912e+00 1.2055799842255852e+00 1.9940845799519717e+00
+1406 2.5521598948546231e-01 1.5199808254090281e+00 -7.3007951592145204e-01
+2171 1.0879566877844673e+00 1.0730119175360373e+00 7.5103343736116468e-01
+1935 1.5565025522497995e+00 6.6863671827660370e-02 2.2833194083019333e+00
+1180 6.7890471537311892e-01 1.6862014297731183e+00 -7.2415615715864323e-01
+1534 -1.0603859210033248e-02 4.3349580686040690e-01 -8.5821747633081935e-01
+2795 3.7537140531911151e-02 1.7318326244022826e+00 1.1189217210182369e+00
+149 -1.3996786021025259e-01 -6.7006472218142965e-01 9.8979039456661477e-02
+2512 1.3659116789713879e+00 -7.3651037254190899e-01 3.9986686970501467e-01
+461 -3.9625064229942963e-01 -7.5137542025189119e-01 6.4364524957221292e-01
+1655 -9.1691658816156751e-01 -1.6730293573803579e+00 -1.0029631944730786e+00
+1059 8.3796186343611234e-01 -9.0497843377475906e-01 -6.9830866629445609e-01
+2938 1.6447977998348982e+00 -1.8986656171022137e-01 -1.0752977603754554e-01
+929 1.0015763619012381e+00 -5.7911511848083208e-01 2.6226088469549114e-01
+2529 1.1865949537803939e+00 -1.2163860373165966e-01 -1.7453904056089586e-01
+1688 -9.2078808939716310e-03 -1.5044006710758800e-01 -1.7929416548804145e-01
+378 1.8262484530706693e+00 -3.1869415753488450e-01 -6.1325817417120498e-01
+56 -3.8234648270589633e-01 7.3706306762905383e-01 -1.0559677733306647e+00
+2156 -1.4714577137901536e-01 -4.0935012725890263e-01 1.3142712489647903e+00
+606 1.0358089154309780e+00 7.6582758381201044e-01 -1.2900642702649592e+00
+1831 9.6980126299625979e-01 5.1168929267291141e-01 3.5656889944742060e-01
+1411 -1.5469718505645726e+00 -1.7994901896374973e+00 1.6093638880344782e-01
+2685 1.9915834774866215e+00 6.3077374648515505e-01 -5.5644913033247378e-01
+1850 1.0707948944272354e+00 -4.2525995082859980e-02 2.1431382444060980e+00
+2563 6.8544139354502998e-01 1.2625825058944479e-01 6.2369459453304144e-01
+166 -1.8275994352019735e+00 3.3367045015430981e-03 -1.3092268126806708e+00
+1954 -2.9017645177552015e-01 -1.6909172916116977e-01 3.6066191916349088e-01
+2787 4.8881463862060978e-02 1.5596954913406342e+00 -9.9806457421063277e-01
+112 -1.8802627358365429e-01 3.1789206810108717e-02 7.2579523467722218e-01
+1038 4.4481539715769947e-01 -4.4391509874188584e-01 1.1774788635218207e-01
+1796 4.7376350627188341e-02 -5.8949835435421309e-03 1.2668604701746260e+00
+571 -5.8319695873302957e-01 -1.3686583581006648e+00 -6.1887034490520343e-01
+157 -1.9577166425908565e-01 -7.1842052927751143e-01 9.5174945626638432e-02
+589 -2.7428961192436545e+00 -5.5549669448955263e-01 1.2876481386379277e-01
+2827 -2.3878300087664197e+00 7.9687023084276787e-01 3.6247992276435426e-01
+200 -8.2824393141716146e-01 -1.0712711107460499e-01 1.0051656502469479e+00
+1851 -3.2734915996982916e-02 4.4290433440506594e-01 1.1735739759196624e+00
+981 1.4176972123083076e+00 4.7491079612751946e-01 3.7384387749602338e-01
+1188 1.8731126019539543e+00 6.7741459978282259e-01 -8.0422818177112887e-01
+416 5.4860960175182050e-04 9.5543338631434360e-01 8.9127456295431140e-01
+466 6.3036819167946878e-01 1.2941122584698417e+00 -5.7932835068807920e-01
+285 7.1104375527075314e-01 3.5069583844144858e-01 -9.0628046650532290e-01
+731 -1.1880023560209487e+00 1.1703729908055514e-01 -1.8669997748626410e-01
+2716 1.8008620667414085e-01 -2.1566052525330312e-01 -5.5133409995768123e-01
+2610 -1.5038354676870589e+00 1.0540191061865469e+00 8.0548194127003858e-01
+490 6.6261274237286238e-01 -5.5713181798834532e-01 2.9659242469945435e-01
+2520 1.1263913893607050e-02 2.8703716440270399e-01 -7.0717486852527878e-01
+1991 -5.5010959546067517e-01 -2.7803879245647306e-01 1.5228121864364080e-01
+2720 3.6128034136731230e-01 -7.3986006917279012e-01 -1.1445490789762920e+00
+2650 -2.4552807323865353e-01 1.0661538926143994e+00 1.1465371513510727e+00
+1978 -3.7495828693096317e-01 -8.9821560705698722e-01 -2.1957903384551609e+00
+100 -2.9228230011866774e-01 -2.2661876820187579e+00 -1.8713692128319841e+00
+729 1.9683809770117591e-01 1.2238908707238121e+00 -8.4829634465447212e-01
+2063 1.3537282056810934e-01 -8.6381924065171412e-01 2.8937782015379437e-01
+1363 1.5266185198447362e+00 5.9896695179031434e-01 -7.0969644416520494e-01
+610 -1.4236407581079505e-01 -9.4630376351877332e-01 8.2147434007905729e-01
+1592 3.3219339353015170e-01 -7.2623048047122274e-01 7.9370328720232641e-01
+2470 9.9011373427930738e-01 1.6045905095754291e+00 9.8198038457762982e-01
+1268 6.0469545107127647e-02 -1.3936020684062829e+00 -1.7651879457246726e+00
+1074 -5.8476567375262323e-01 -2.4190653185191427e-01 -7.6695682822629130e-01
+2916 6.7587585974136888e-01 -7.5959709839236655e-01 4.3630066144312124e-01
+2291 8.1981286268039535e-02 4.5300233535736700e-01 -7.1969791719642595e-01
+27 -1.6783039451300272e+00 -1.5594967004506186e+00 -1.2199332114272978e+00
+162 -3.1588240351253621e-01 -1.8572268559815946e-02 4.2387071205121413e-01
+1538 1.1434390506588423e+00 -6.3973149593909995e-01 -2.2949907162457034e-01
+2688 -1.5710328448916244e+00 8.4117621491830019e-01 6.5620803998619737e-01
+1859 -6.4004341459227021e-01 -2.0022720724514625e-01 1.2045649066881567e+00
+2231 -1.2985744737290648e+00 7.5542264933221664e-02 2.2869423730836265e+00
+266 -4.5407838128652611e-01 -5.3479782192362546e-01 -1.1219277182627940e-01
+1718 5.5316174892821757e-01 -5.3100643464225927e-01 3.9457620365011054e-01
+1146 1.5500084827590732e-01 -1.0680565503413981e+00 2.0710110175317635e+00
+1911 5.4379990630329167e-02 -2.2559249159891666e+00 -9.4266813909284417e-02
+1891 -2.0124653326505211e+00 -7.2492422444286242e-01 -4.9326197986180154e-01
+2311 1.6947559355533499e+00 -4.5546477912744382e-02 1.4946304014382955e-01
+365 4.0961006126123728e-01 -1.8048296567632351e+00 -3.8306563665245769e-01
+339 1.2399716567819383e+00 -1.2849082073740362e-01 -3.6469904706091760e-01
+1313 -6.0397104061123685e-01 2.5541351734744239e-01 1.7624755732111752e-02
+1946 1.8647977557583340e-01 -4.5414576932260858e-01 -2.0975172349423956e+00
+888 -8.3121675392704897e-01 -2.3535086418125262e-01 3.9588750300921677e-01
+1124 1.5115658568923502e+00 -7.8114081118262046e-01 9.4716586744514097e-01
+2820 7.5908308357841925e-01 -1.3189953522831205e-01 -8.7444315961650632e-01
+2815 1.1501705949080913e-01 4.9358512536760069e-01 1.0705530534318078e-01
+98 5.3481807398055636e-01 -1.8123713131756745e+00 -8.3390327226177896e-01
+2132 -1.2698371477343200e+00 -1.8983692054949153e-02 -8.1713320827481206e-01
+40 4.7931410675976238e-01 8.5999223971509653e-01 -1.0511445967547484e+00
+1889 -4.1572152569288634e-01 -1.7365002772439531e+00 -5.2188418440023654e-01
+1097 -8.4650113040520258e-01 -1.1421910704715619e+00 4.4538006711429623e-01
+2321 -2.9284113308820936e-01 1.9772655813551487e-01 2.3121523219453458e-01
+1190 -1.5551847869695812e+00 3.2853017687404928e-01 5.0811085635761943e-01
+2773 8.8733782328966970e-01 1.0923334892491612e+00 -1.6809008814214836e+00
+1036 -6.8781169126220931e-01 -9.4692984210659081e-01 1.4722827312305069e+00
+1294 -5.8437028428041116e-01 1.0590863600745071e+00 -2.5263479611314068e+00
+2881 1.3571727075599402e-01 9.9506916363900033e-01 1.2560688089584973e+00
+794 1.6652732390476095e+00 6.5392014046697078e-01 1.0325857577539943e-01
+2922 -1.0047105056952343e+00 -1.1610456126878332e+00 -4.3748659216961161e-01
+709 1.4215525003833016e+00 -6.3994200007946989e-01 3.8517320541465683e-01
+390 1.4696339459042029e-01 1.0479596178750472e+00 1.0620135356651876e+00
+992 -1.6323572956087118e+00 2.4477654922448768e+00 9.9893857797511351e-02
+649 5.8324596671942952e-01 -3.2654910675389243e-01 -5.4632480948787043e-01
+209 2.5686314855748460e-01 -1.6509539906182269e-01 -2.9600316113709496e-01
+2714 7.9681350335968748e-01 2.1341822484566917e+00 -3.4901181139178644e-01
+1585 1.8364635174229460e-01 6.7893142692893416e-01 1.3757156861216716e-01
+1995 8.6983451731996508e-01 -8.3910381279634783e-01 1.7777489518995666e+00
+358 6.4458796665344165e-01 -1.7913804128665836e+00 7.8932202988441602e-01
+1304 4.8813567031279442e-01 -5.5917962552520725e-02 -7.5466119459388614e-01
+1648 4.2813095711455035e-01 -1.0249794599176825e+00 -2.8320059755777399e-01
+1031 -9.4633377638090510e-01 -1.0731424270824297e+00 -6.3246228235980939e-01
+1998 4.8588522186546812e-01 -3.2713308972042748e-01 -6.7174887976646880e-01
+1329 9.7319506420938562e-02 2.1790336471478109e+00 -2.1857018548157803e+00
+2083 6.8154519227887167e-01 -9.3036398746248172e-01 2.7835603376223172e-01
+2504 3.1450408617165521e-01 3.2715215513693482e-02 1.0578110665228441e-01
+2458 -1.8301331643991015e+00 8.5630235590619025e-02 -6.6870999562262601e-01
+774 -6.8781271908776365e-01 -1.4171184761693871e+00 -1.1521430986283803e+00
+663 -1.2734848072550595e+00 1.6972131728143869e-01 4.1943720630999692e-01
+2776 1.8836841250606819e+00 5.0744990529201961e-01 8.5012270135031731e-01
+188 2.0457853145871572e+00 -1.2951530833058309e+00 -5.2815949710758392e-01
+1282 1.2506125724175676e+00 2.0814805829849461e-01 1.9847042803312764e-01
+1228 -7.3940101325752627e-03 -2.7855174434335050e-01 9.3157321393712611e-01
+1727 6.3525047448596772e-02 9.5682300141267052e-02 -1.3280366626301121e+00
+2305 -1.5175584941099862e+00 5.4955565840714149e-01 -1.1894776539783396e+00
+1840 3.9996659736817275e-01 -1.5822837864367145e+00 -1.1911947219773686e+00
+2530 -4.2903886170161221e-01 -1.7063159137594061e-01 1.2095794443088681e+00
+1067 1.0983500016350263e+00 -1.3830027408031249e+00 4.4505312245560208e-01
+2941 1.7689467265497909e+00 -6.0414615127849003e-01 -5.2587939272749229e-01
+363 -1.4184667107514889e-01 1.3450360424139278e+00 1.7190802886201075e+00
+860 -1.2059727568295850e+00 -3.0634029235547200e-01 1.2858838021721355e+00
+465 -2.3583097434195416e-01 1.9930654556798699e+00 -1.5919850064187808e+00
+1252 2.0975767922315280e-01 -3.1865890167602789e-01 3.0586340765584152e-01
+489 -1.8497393086596653e-01 -9.7254678472285916e-01 8.7491057347247481e-01
+2119 8.5022924969847935e-01 -8.8843490206654985e-01 -2.4881968786161968e-01
+2507 -7.9934631820789881e-01 5.9084811711657714e-01 6.3656669616734751e-01
+122 8.8797474136046750e-01 -1.3054756840479365e+00 -1.4610036565861224e+00
+1111 9.2120358149982884e-01 -1.4297546909881249e+00 -7.2511763180503930e-01
+667 3.5212178681460404e-01 1.3500826992140322e+00 1.2705433588375386e+00
+726 9.4629187428432382e-01 -1.1450264070543281e+00 -3.9292961094985646e-01
+2541 1.4495450188992029e-01 2.2518284571883691e+00 1.0891664965102019e+00
+164 -4.6891059569092303e-01 -1.1408318369005497e+00 -1.3766142407720006e+00
+2935 -1.7155554240707294e-01 -7.0730142300985310e-01 5.2025352188030305e-01
+2808 -7.2054697232789178e-01 -5.4326607022759454e-01 -1.4677566486340943e+00
+2949 -2.9001568225941965e-02 -3.1513149885243363e-01 -9.2172569962359521e-02
+1368 7.3157906611468881e-01 -1.0015771868219201e+00 1.4020681717811636e+00
+685 7.2282056220186097e-01 3.0976593029601063e-01 -6.9562990147908454e-01
+1772 -1.0910466347202816e+00 1.6338893218444444e+00 -7.0282569038858944e-01
+2578 1.0688208265638630e+00 -1.4851289360956021e+00 -9.1708768818086761e-02
+1007 3.6611331380515305e-01 1.0156926261209656e+00 1.8580495391768997e-01
+2851 -8.3520759046018467e-02 -4.0216463094297034e-01 9.2160062554023303e-01
+1236 1.1458969215641392e+00 -5.5507405441894486e-01 -7.3253188553382986e-01
+627 2.3152861998608070e+00 1.0555485326385250e+00 6.5964173231209644e-01
+1231 -1.8829044330328428e+00 -7.6513119869458712e-01 1.9914812185223263e-01
+1826 -5.6568505869467023e-01 -1.4201105247676152e-01 -1.0076752363086112e+00
+1667 9.1432199839581885e-01 1.2954550209716966e+00 1.5843194774455960e+00
+2744 -7.4056758196274908e-01 8.3787194542779964e-01 -1.6814081227619324e+00
+1742 -6.3030909041244776e-01 1.1780382157353182e+00 -5.2797652932909567e-01
+2833 -7.8689577839787483e-01 5.0825164268051648e-01 -2.2231164864763489e-01
+852 -5.7607552324752939e-02 8.4536918563523877e-01 5.5089074806404104e-01
+972 -2.4242928981513220e-01 -1.4060484760687051e+00 -8.0155596694424858e-01
+42 -2.4420672269444905e+00 -2.6753333128891593e-01 -6.9696812043623690e-01
+2785 -6.2806068374167456e-01 -1.1465648741756360e+00 -9.8055326569283463e-01
+3000 2.0294402365697186e+00 -5.3217686578630663e-01 -6.8566254630574741e-01
+2123 2.0559270391818187e+00 6.2544079999007962e-01 1.9400899510934375e-01
+575 -1.3023401651754627e+00 -7.6927022555381724e-02 -3.5501348030019025e-01
+2015 -1.0741324115265392e+00 -1.5934812142468975e+00 -6.7886094979261080e-01
+750 -2.8983283390932391e-01 1.0725299852953001e+00 -1.8868055164071791e+00
+546 -6.0910897854529589e-01 1.6194909166570171e-01 1.0448600329654524e-01
+448 -1.1547018227948172e-01 9.1786679865524889e-01 3.0302695127329826e-01
+1426 5.3128178375547408e-01 -1.4910258551135116e+00 -4.6847470858391360e-01
+1275 9.5132561730565313e-01 1.2225164405749802e+00 1.7671039337390841e+00
+1867 -6.9304009511898290e-01 3.7681852711984648e-01 8.8388576650765716e-01
+2627 9.0028465914332834e-01 6.2588583988653546e-01 4.3999197905916787e-01
+1156 -4.1433804922916201e-01 7.9508752785533421e-01 9.8699791821552973e-01
+2464 1.1456471147013987e+00 -6.1740449270858400e-01 -3.4847657248467473e-01
+671 4.0406369709429962e-01 2.2275169702595270e+00 5.8791074662154630e-01
+2945 -8.9276083017016594e-01 1.6827791997659385e+00 4.4904163546194620e-01
+529 4.7958093755599801e-01 -8.9074705768067830e-01 7.3417776692256165e-01
+1211 7.1324276630250028e-01 -9.0747479017413457e-01 -4.9960090058295359e-01
+767 -3.6437334987867881e-01 -1.0149281189305150e+00 -6.8637358787729519e-01
+1194 1.5347203533254633e-01 -8.9096864570621670e-01 -1.8208663870178537e-01
+550 -6.9712098631606600e-01 6.2026970521003300e-01 -1.2940371018914068e-01
+2479 -6.6852329001280575e-01 2.5413838328460647e+00 5.3500703547183237e-01
+609 -1.0865502812787953e+00 2.6376349148380593e+00 1.3301968182523334e+00
+2038 -2.9579504661866129e-01 8.9932961519903390e-02 -6.2395912489639405e-01
+1783 -2.8299971852137495e-01 -7.5519986305563624e-01 4.5759479016231275e-01
+1285 2.5356468948671235e-01 8.3388792999607331e-01 1.3067877333749023e-01
+409 6.6964589033398580e-01 -8.0564785808248562e-01 -3.8006983670797762e-01
+2940 -1.4439430138113387e+00 1.5409719072751797e+00 7.5554773794821273e-01
+696 3.9997586897535742e-01 -6.5334719475081660e-01 6.3303475217048466e-01
+1490 -1.9768071823629194e+00 7.5742375641505466e-01 1.5869011711412317e-01
+116 -7.1094895602964936e-01 1.4517853939512876e-01 -4.6453430092584025e-01
+2502 1.3641522803182764e+00 -9.8560091361766555e-01 2.9859736123923164e-01
+1636 1.4503708867169216e+00 8.6758442026440397e-02 2.0367388472301826e-01
+1044 8.0607152966424189e-01 7.0079190771077926e-01 -9.7716157915031732e-01
+121 -1.3382310541959701e+00 -8.7702125379409845e-01 -7.1656514445124164e-01
+2213 8.9274020316187641e-01 5.0225319608431329e-01 9.7857244748007066e-01
+177 -1.5916887362484657e+00 -2.6848923062934765e-01 -5.4041901340515619e-01
+2679 -1.1616517077824935e-01 -1.2570599355747469e-01 -3.9889041497370992e-01
+1027 1.1919271416329174e+00 4.0584452806984983e-01 8.4932402398610285e-01
+2719 -1.1655091257808878e+00 6.9479950535492918e-01 3.4478073707679058e-01
+1053 -4.1206925486452661e-01 -8.3714251661864469e-02 1.9100575592709710e+00
+91 1.7463382389596289e+00 -7.0538908659871502e-02 -2.3491371273540689e+00
+486 8.0761214081284671e-01 -9.7568912739834168e-01 -1.2563075327741813e+00
+321 5.9365423634849512e-01 1.2663293443913322e+00 -7.5407469636792415e-02
+775 -1.5557671114437110e-01 -2.8313097297609335e-01 -1.8543168213480582e-01
+198 1.0774395318842611e+00 -7.0495663980951151e-01 -3.6039988547495377e-02
+1617 -5.2181973909334189e-01 1.1963308610115175e-01 1.7526642320927257e+00
+1806 2.9424900862237136e-01 2.0256172546088602e-01 4.5215266111740543e-01
+2351 -6.3422508301049074e-01 9.5214464937181020e-01 7.2054401544161062e-01
+637 1.0909459905730163e+00 -7.6332227274921061e-01 1.4837142588094228e+00
+578 5.8120727526900273e-01 -8.4480872664481371e-02 -3.2448532939099684e-01
+1547 -1.9023019861849211e+00 9.4499495306960435e-01 -1.3495682326609038e+00
+474 -4.4663317063615082e-01 -2.3716764711402201e+00 -5.8725877257131659e-02
+1572 -6.3004530159917571e-01 -6.7195970618311329e-01 2.6543477706339075e-01
+21 -1.4080347556557132e-01 3.1466241892764230e-01 -1.5811230796164379e+00
+332 -3.6330536780723810e-01 8.1393878066321790e-01 -1.4783974741096806e+00
+2287 2.0661588266358089e+00 -1.2049120288450508e+00 -1.0441935535952735e+00
+299 -1.7103236606305883e+00 7.8438270616205297e-01 -1.5526186464154283e+00
+1472 -2.1409624604670348e+00 -1.6440741561050722e+00 -1.3566044495063073e-01
+2074 -1.4493541997473158e+00 1.8165280826322481e+00 2.6616369935712292e-01
+1518 5.5740695601828816e-01 -2.5071746382916016e-01 1.9311753041215757e-01
+351 -5.2335576182274435e-01 -1.8909760411227519e-01 -3.4987179518585387e-01
+635 5.3507243752698241e-01 -8.6622435273805787e-01 1.5043970372360842e+00
+2230 6.8084541245661059e-02 -8.4765851269107240e-01 -1.2119804586312038e-02
+664 -1.4871795053485657e+00 -2.6358973603369884e-01 7.1066679328399440e-01
+1885 1.9252747591470332e+00 -1.5338386087903293e+00 -3.8704831907369175e-01
+1579 -5.3733932249430127e-01 8.0541018046231261e-01 4.1184187910475845e-01
+1033 -1.0565059570003221e-01 1.6702724388863177e-01 -4.7918025995028363e-01
+1886 -4.9926102620253898e-01 -7.7833116889968512e-01 -1.9265584344089368e-01
+269 1.1515766631558915e+00 1.3810800419351876e+00 -1.3305682143814881e-01
+2030 -3.1671727754969375e-01 8.1752836021054265e-01 5.5545614351176165e-01
+2645 -1.1680266018583014e+00 -4.1901225183269952e-01 -3.0151349421233903e-01
+1842 -4.8455900743229557e-01 1.0998939977997618e-02 -2.8197055021940293e-01
+2482 1.2965928980877293e+00 -1.2326478025914915e+00 -1.0862018126003927e+00
+71 -1.3834583063209539e-02 -4.4637707450413372e-02 6.3741944458385924e-01
+783 5.2116481733977704e-01 -8.8293367583562243e-01 3.9928834735112839e-01
+2733 4.1275462598355889e-01 -1.1076325846443313e-01 3.7476401851921213e+00
+503 9.6299125435439392e-01 -8.4116410724843285e-02 3.4464256056185388e-02
+1006 1.0421084505362268e+00 -1.4449504982447843e+00 2.0345881401052499e+00
+2515 1.3691676185713626e+00 -1.0437097558117845e+00 2.6414299085820919e-01
+2556 1.1597165883702236e+00 1.2355931643610260e-01 3.4611718966629484e-02
+470 -2.1707568574262634e-01 4.4948751888090416e-01 -1.1966274844961531e+00
+1400 3.7692357588345005e-01 -3.6822904551435598e-01 -2.6792730410821841e-01
+329 2.5265416739595559e-01 1.8205405109576744e-01 -9.6755084732490915e-01
+108 -1.6813725290349386e+00 -1.2031648080810158e+00 -1.4284389784393003e-01
+1355 -1.1464252857028145e+00 2.9040785920647272e+00 8.1335304166695865e-01
+727 -1.3786132286301063e+00 -6.4639401539278474e-01 -1.2520319112384648e-01
+1229 -1.5270530457766449e+00 -5.4203843050364509e-01 -1.1375735623582468e+00
+1584 -1.3234941113083447e+00 -1.3738144541020463e+00 -6.7381223061039941e-01
+2146 -2.5168835260548633e-01 -2.5274369199726316e+00 3.3345964461846545e-01
+655 -2.3895499593483001e+00 -1.8597149385672526e-01 6.6755548308526008e-02
+524 -1.1436184604860873e+00 -4.5550118988617588e-01 -5.8144102378038287e-01
+2144 6.6813065306583508e-01 -7.0896879872475593e-01 -1.7418267205075506e+00
+1619 6.8761116439674830e-01 -1.2768168382723015e+00 -6.8864552921029010e-01
+2215 -1.1688791830516696e+00 -8.1691244737043200e-02 -1.2400294168919206e+00
+2169 1.0142692333224625e+00 -4.3752201437176202e-01 1.4336696441657670e+00
+969 -1.6956642438733063e+00 -1.0124354028426690e+00 -1.1172385195105725e+00
+954 -1.9926990749830624e+00 1.2220767217525532e+00 -6.6113881816620934e-01
+382 1.0717121791177045e-01 -1.9508899907823982e-01 5.5913039513008367e-01
+2012 -7.1709853741589002e-01 -3.3579390355340924e-02 -1.0611756038681015e+00
+1467 4.2036797789807046e-01 5.2543136904456000e-03 6.7099203299282217e-01
+39 2.9108816631581325e-02 9.2383942645548367e-01 -1.9181532061892932e+00
+2809 1.3832120279823179e-01 -7.1429957275264955e-01 4.8351510754211119e-01
+1340 -6.2998240944035155e-01 -1.1954633222230011e+00 -9.4184273712168587e-02
+2354 -7.9058834674580025e-01 2.2078019201434729e+00 -6.2660623232083135e-01
+1382 -3.1799903817693492e-01 3.3876089057959546e-01 7.4690480926599712e-01
+2574 -6.1238678889028786e-01 1.3932802588387823e+00 1.1565063487770373e+00
+1744 2.2702689127382585e+00 1.8241578390635033e-01 1.3582629926552432e+00
+1171 -1.1039488999485250e+00 -7.2255520756122671e-01 4.0019436153523896e-01
+748 4.0433776248164577e-02 -2.2391464216796370e-01 1.2106497159742477e-01
+1379 -1.6218338897471889e+00 -7.1672611610336778e-02 5.2786500784863544e-01
+2799 -1.5634811646148922e-01 -3.1509641093662322e-01 -8.8638726842399906e-01
+2965 -1.8083550650062348e+00 2.0742208987515401e-01 5.8407003930045742e-01
+2041 -1.5456637218095461e+00 -1.9536494874710331e-01 -1.9147721528940898e-02
+1266 7.0958815003753772e-01 1.4445297332519377e-01 -8.9890910699562426e-02
+1908 8.8790721248266424e-01 1.3808207858049587e-01 -4.8909560054212947e-01
+1691 -1.6528625310921770e+00 4.3014791507074679e-01 4.7902197495524301e-01
+227 -7.4729393878769124e-01 2.4101839023014210e-01 1.0641956525440026e+00
+12 -1.4420166182420611e+00 -1.0960541418613992e+00 1.3759545006011933e+00
+722 8.4653463233922399e-01 3.2540740809771085e-01 1.2897549176882477e+00
+2819 4.7248356929452834e-01 7.4945102615788195e-01 -5.7401289226463059e-01
+2730 -6.7377754995547234e-01 1.4640302542676111e+00 -6.7125897958925562e-01
+372 2.5792607471623374e-01 -3.5610619298218549e-01 -1.9074863732621239e+00
+1493 -7.5135376869609782e-01 -5.7647581953128735e-01 2.5396746013674132e-01
+2658 1.0315857441258740e-01 -1.4801712733888470e+00 -2.0085789084011645e+00
+238 -9.0572059315921949e-01 1.8257486430024089e-01 -1.5632470154923475e+00
+73 8.3229700239391335e-01 1.5307491829626809e+00 -8.9525662139504159e-01
+1071 -1.2689017523560386e+00 -9.9031817099666142e-01 4.8623082711626570e-01
+2663 -4.3611993302666741e-01 1.5425398501724608e+00 1.0066535259013658e+00
+2485 2.1805208751273097e+00 -4.2135786403323977e-01 6.3951515806128312e-01
+996 -1.6844544226913594e-01 -6.8583754832800270e-01 -1.2020128740506602e+00
+89 1.7045452318197523e+00 -1.3097958246840333e-01 -1.1504071781817173e+00
+2221 1.2786376841880194e+00 -1.2948091675990276e+00 -2.7099160248297993e-01
+1439 -7.0056487984047611e-01 1.4269851952800461e+00 -6.1540422001314932e-01
+2312 8.5295357365396318e-01 5.7455222072984702e-01 2.4031359882976799e+00
+1042 -3.9378975232236846e-01 1.1342440813334469e+00 6.4076605688365862e-01
+2877 -7.6249723309493075e-02 2.5028655789241666e-01 -8.2003896731247872e-01
+2306 8.3064458550426012e-01 -2.1439671809200336e+00 4.1011194534645801e-02
+1610 1.5453663218090001e+00 3.0821895939194038e-01 -1.2848718248157011e-02
+2148 -6.2843401865701576e-01 4.0593138276875917e-01 -1.6125491543985520e+00
+580 -8.5089964670190477e-01 -1.0506563629131078e+00 -4.0902299131592945e-01
+2055 6.4083332095246182e-01 1.0710714785877027e+00 2.1578091168786256e-01
+305 -3.9682593215303430e-01 -1.2330449471321532e+00 1.3034360309000377e+00
+531 1.7353118722045853e+00 -4.6778439869246746e-01 1.2757338296830528e-01
+801 -1.3899912019333645e+00 -1.2803064747278357e+00 -3.4640998748482610e-01
+2689 4.0563879916072287e-01 -4.1824397690934684e-01 7.1487712563972095e-01
+404 -1.2999935018433011e+00 -2.7118283199224669e+00 1.2107072760012316e+00
+2838 -1.8812523475335030e-01 -1.0582492370109722e+00 5.3138082868760227e-02
+700 -8.3781801590837290e-01 9.1993758388532409e-01 1.8420571004121572e-01
+2020 -1.1345829010535280e+00 1.5188963401657737e-01 -1.3270352551731837e-01
+1552 -1.2877552007461557e+00 1.0091711336471827e+00 -2.1163801776856945e+00
+779 -1.8768570872333363e+00 -4.5485640057441801e-01 5.4418296254020215e-01
+2918 1.4097832961475598e+00 -1.3132643925274814e+00 -5.1656850430545365e-01
+1964 -3.1067905264905593e+00 6.8783120223773242e-01 -4.9073760089888729e-01
+1684 -5.5297097063861211e-01 -1.3375872026780633e+00 -1.1341936738093981e+00
+41 3.6124909278043121e-01 -1.6552965907200765e+00 -2.4662069155998453e-01
+2762 1.6563495866117783e+00 -6.3166381443468322e-01 2.2219149512901587e-01
+239 6.8577364949818687e-01 1.8781132897489623e+00 2.7917355188358961e-01
+2203 -1.7858449853980693e-01 1.8847819228087455e+00 -1.6744533643640733e-01
+1706 6.4029189197021730e-01 -1.2812573589343428e+00 6.5213728186616249e-01
+1324 -2.1430809594750637e+00 8.6552159738878887e-01 -5.0965518425641843e-02
+1578 -4.0533892932054044e-01 -4.1400889480901459e-01 7.6218663733452308e-01
+2404 -1.2937801862218994e+00 3.6262494850465921e-01 5.2380482315735921e-01
+2149 -5.0305534877719671e-01 -2.3847666986657985e+00 -7.3076733716937414e-01
+2844 -8.6472144599594666e-02 6.4114648470234259e-01 2.3793694398553089e-01
+1405 1.9477127578576475e-02 -1.0716848206696139e+00 1.8483791667880456e+00
+1250 1.2944562623012943e+00 -7.6415346208543455e-01 1.3173631619101431e+00
+48 8.7512927967776377e-01 -1.0166903892814101e+00 4.7053283215691860e-01
+613 1.2206362651568106e+00 -2.5287660825161412e-01 8.1135823263597884e-01
+2495 5.3189318962740695e-01 -1.0450248011120387e+00 3.8439595603751131e-01
+1234 -7.3502585535057174e-01 -1.4117668767640377e+00 1.0908201581117054e+00
+2911 -1.2290676515866965e+00 3.4872399697363210e-01 -8.5316123507766251e-01
+1937 5.5879513197359887e-01 -1.0358198793416273e-01 -6.5276438883576393e-01
+1017 9.6606192159988169e-01 -1.2266874754879078e+00 1.3835763044595701e+00
+1444 -1.8906585298954515e+00 -8.7230288725892347e-01 -3.0456796106478007e-01
+2214 1.2884405751121679e+00 9.7265674122355761e-01 -9.1907716430162623e-01
+1500 3.2471285456853066e-01 5.6766677160365520e-01 3.9408653611464339e-01
+953 -4.5193114076177476e-01 -2.6824574510276838e-01 -4.3933360746740474e-01
+1697 3.6722209804353989e-01 -6.8565309514596740e-01 3.5721939772524025e-01
+151 9.4662463121224427e-01 3.6355553209666192e-01 -7.1670692738098918e-01
+185 -7.6330218776583347e-01 1.2875767415473414e+00 -1.7701826111605103e+00
+2633 -1.3666000094817796e+00 -5.5178006865764961e-01 8.7002661674892057e-01
+2329 -1.4278313823292643e-02 -4.8496558563299602e-01 -2.9326665879872338e-01
+1451 1.1696786316780923e+00 6.2407931822419804e-01 4.6095931750361419e-02
+1701 3.2657414871614282e-01 -1.5429654365773157e-01 -1.6127116696229555e+00
+806 -1.1671472674514018e+00 1.1460433213579975e+00 -3.2127425662967235e-01
+1800 3.0869532332530408e-01 1.0243366766919548e+00 6.6744176269019895e-01
+902 1.5586988923262560e-02 -1.7892985997070963e+00 -6.5697265456982623e-02
+485 3.6829731244196251e-01 2.0241442323245468e-01 -1.0205274597964933e+00
+1948 5.4782675855066099e-01 1.6893689300853409e-01 4.1398538785263880e-02
+150 -2.6359633812679523e-01 -2.1767044682195058e-01 -2.7009391570854718e-01
+994 -4.2850567168450690e-02 1.3240072831902266e-01 6.5898112466228453e-01
+2294 2.6305205934040654e-01 -1.5969655114639714e+00 -5.7134805427645752e-01
+2389 6.0654338148097731e-01 -1.4475280308643854e+00 -6.5093853152483749e-01
+1428 9.8587773175902316e-01 1.0157960793413070e+00 1.4592294683803382e+00
+1293 -8.0418886408572254e-01 3.2122640193926300e-01 8.8598772046744556e-01
+2376 -1.1947934720205184e+00 4.2808461273440079e-01 4.6486065339935473e-01
+267 -2.2857056547049359e-01 -1.3814884748680076e-01 2.7442025597743802e-01
+54 3.9813239986495713e-01 1.6782985042425553e+00 -1.3111267103950128e+00
+772 -1.2447169260936137e+00 -3.4142861605117003e-01 4.2263336914170663e-01
+1593 6.9267967708617995e-01 2.1416457572663474e+00 6.0839902409609636e-01
+222 -1.1943265492588809e-01 8.6095308127370526e-02 7.8858988160796673e-01
+2846 9.9678840027860105e-01 1.0135863904222511e+00 -1.2421730764332302e+00
+194 5.0760234516961034e-01 -1.2302726524215668e+00 -1.2064784840619194e+00
+2796 5.3068033176615925e-01 1.0051650461400456e+00 -6.4608490785496520e-02
+2270 -3.1911917694459047e-01 -1.4646281213347296e+00 4.5188648531529196e-01
+440 1.0146924343663097e+00 2.8179268290078363e-01 -3.8098075766497452e-01
+1818 -4.3607704229412136e-01 4.9671109606532726e-01 8.4342645799893839e-02
+1254 -8.0946263315755190e-02 8.1017058104026274e-01 1.1658978589407312e+00
+16 -8.5836063221035741e-01 1.2073603733809264e+00 2.3992146431996370e-01
+1788 1.5033647396964389e+00 3.9830552447565160e-01 -1.9924830634024315e-01
+558 1.4662424869195649e+00 -2.1311772223771781e+00 3.7996966969798196e-01
+85 4.1853489090456142e-01 3.5538811435441148e-01 9.1585299152124322e-01
+493 5.7575530766325211e-02 7.7725038981338157e-01 9.2095179732428678e-01
+2275 8.4046258301859067e-01 2.4390057923938591e-01 4.0746856875455101e-01
+858 4.2900826550381443e-01 -4.0017499609525076e-01 -9.8806507504869612e-01
+2229 -2.0069903184775213e+00 4.9809458844239490e-01 1.4328222741375656e+00
+2472 2.3757446477940242e-01 -9.6964611511265930e-01 1.4625358416544940e+00
+1280 -2.8362874391870507e-01 8.3214877363498552e-01 1.8154480446520985e-01
+353 -4.6877582300080334e-01 -4.3961710019945882e-01 1.3373390618046144e+00
+1001 -2.6746558095567230e-01 2.8211550797975893e-01 -5.3909621757048998e-01
+1813 4.6803490748508259e-01 1.8840980508695084e+00 -7.6575033776122892e-01
+730 1.0926675300841515e-01 2.2354758347256101e-02 4.3083389751235146e-01
+1202 3.9974568487647311e-01 -2.4189742239796637e+00 3.8308583807914487e-01
+280 -3.4068936341448108e-01 -4.7527204753272234e-01 -7.8028734179329995e-01
+2056 1.5562324232076030e+00 -1.6917296775945210e+00 -1.6904241785482352e+00
+2865 6.4728840126826837e-01 -7.5364827451322525e-01 6.3969897871372650e-01
+2508 -1.4106800608789836e+00 -1.5606747708182780e+00 1.5073085406010587e+00
+1525 2.4165130737257376e+00 1.7527138971817926e+00 1.2841143003784308e+00
+1611 -1.5765207858881880e+00 5.5645343705938155e-01 6.2347914060278720e-01
+1815 -1.9476689167589314e+00 1.9881933299800361e-01 1.5103986453494813e+00
+2805 6.6443312538104504e-01 7.0476344994594387e-01 -7.1855732066170452e-01
+1305 -8.7783372181518582e-01 1.1768201323182734e+00 -5.9198271688232093e-02
+2486 2.2761594017335538e+00 -2.4960075314371874e-02 1.1415418154265806e+00
+1155 9.6095433930222773e-01 -1.8566385793189277e-01 3.0608672963643524e-01
+2420 1.8971819431993262e+00 9.4477524466527019e-01 1.3547637542039737e-01
+1797 -1.3954098091790492e+00 -1.3578415621999367e+00 2.9559174839985852e-01
+676 2.7976491901563638e-01 1.3654535226510727e+00 2.4148633439003137e-01
+786 2.7736424469109583e-01 -1.0927075555562413e+00 1.0505229359087276e+00
+1952 3.3034937747732263e-01 4.8281986747376088e-01 3.0400633901943475e-01
+1318 -3.1283972139250993e-01 7.0064906582180086e-01 7.0520302672019008e-01
+670 -1.4813448759433201e+00 -1.1101689427136552e+00 7.8409043139837953e-01
+2708 4.7831625840827285e-01 -6.7337036888966251e-01 1.3421840938068652e+00
+2129 7.1867613540491881e-01 1.0813053490078632e-01 5.2092746629039099e-01
+272 1.2224036302199351e-02 -1.5159988845227002e-01 -5.9286706121333710e-01
+2579 6.7229997462974855e-01 -8.3121672371427213e-01 -3.0737379503293333e-01
+1409 1.9515476565809872e-01 1.2060584265496022e+00 2.0758907617032452e-01
+963 3.1439350520002529e-01 -1.2516948266505430e+00 1.8094943777431909e+00
+2584 7.0202019826558493e-02 -3.8288973738163290e-01 4.2848207725441051e-01
+843 2.1393831711986266e-01 1.2433352433730699e-01 -1.9481002668799339e+00
+1700 -3.0673347177662796e-01 -4.4222969687750247e-01 5.2908528494775342e-01
+1679 -8.7813195630002094e-01 8.8123876547802016e-01 4.4650789122720669e-01
+1048 2.5558219939481175e-01 8.1318932508979236e-01 -5.4402361314064462e-01
+2526 1.1266163532335913e+00 1.2871007354747452e+00 -1.4157579441336223e+00
+1576 1.4574851027872879e-01 1.1692980199328158e+00 4.9774948907527178e-02
+1257 -1.9577412390993214e+00 -9.7719213426436913e-01 -2.6229171648793603e-01
+1941 -1.0714784725114851e-01 1.7898342728774075e+00 4.7377242055784385e-01
+869 -7.1979958127931190e-02 -9.3994739247438586e-01 2.6624027734894535e+00
+275 -2.6820574050944435e-01 -4.1251369542603739e-01 6.2889296427195462e-01
+1594 -1.8463883360994437e+00 -3.1013087191547384e-01 1.6637185947670476e+00
+2793 -2.5240738316832010e+00 -7.8124467635674910e-01 6.9669896707605816e-02
+541 3.8495138820957803e-01 6.7113012176975739e-01 -1.1160629329504279e+00
+787 1.1456882801202053e+00 5.4285437262750158e-01 -1.9736461193421290e-01
+669 -9.9599517085214406e-01 -3.8810811063129858e-01 6.0301171612378357e-01
+2587 -1.5903343506497242e-01 -1.3998849197941035e+00 -1.3071727088815518e-01
+753 -1.3356752485429318e-01 6.8597666826885251e-01 3.1295316400615947e-01
+2333 -4.8923940950862344e-01 -9.5822712285638689e-01 1.0719449058937233e-01
+2775 -4.2223158157698693e-01 5.2204607840254036e-01 2.0598739652348802e-01
+1338 1.6924425336341847e-01 -3.8666470221692006e-01 -7.8328064349701887e-01
+560 -1.0730043537950666e+00 5.9995792897858757e-01 1.2427267468570953e+00
+2907 1.6598762077071200e-03 -4.9809036134499574e-01 -3.4565671282473245e-02
+901 8.3501638069976358e-01 7.5599544087262982e-01 3.3176404624810368e-01
+1994 -3.0229446258537986e-02 -3.0185215926507913e-01 6.7170133544637456e-01
+2274 4.4158110279876073e-01 -4.6415115403445095e-01 5.0503205489244340e-01
+746 -1.6291737970956603e+00 -2.7017315653900498e-01 -5.2294906951489895e-01
+1491 2.6022757161586724e-01 -3.7590594838291019e-01 1.9735209932534505e+00
+1396 7.0877401333295609e-01 1.4535528007657585e+00 -4.1506607073419782e-01
+2638 2.6703699747813864e-01 3.9577905966812482e-01 -1.9058596496803792e+00
+2061 1.2168767093796680e+00 2.9464366232810080e-01 -1.4193172112689210e+00
+1020 -3.9829591543263904e-02 -7.3244958831484672e-02 -9.1290622945233246e-01
+1066 -4.1467999010836798e-01 8.1651368986503614e-01 -4.8905678389746465e-01
+1484 2.2204776392953868e-01 1.2904985568760963e+00 -1.5328897187339380e-01
+587 -2.3308798631876604e-01 4.4131409233156060e-01 9.0683001801240415e-01
+2265 4.4681034641586648e-01 -9.8651619283617473e-02 2.3874295820747607e-01
+1650 -1.0535952361125547e+00 4.6185048038356097e-01 2.4018902421736466e-01
+1514 1.0950505323566355e+00 2.8064520008848087e-01 4.7802846276548761e-01
+1354 -7.2927851350221884e-01 1.0883385894683417e+00 -2.6638090070066256e-01
+2608 8.0350822932298371e-01 -1.5901757288046783e+00 -6.8239844844895114e-01
+823 7.6329968862839270e-01 1.0451422431011026e+00 3.0922124667031781e-01
+1269 -2.1190713785003237e-01 -2.4588145824794044e-01 1.3511763595125481e+00
+410 -1.4940721917261874e+00 8.3844734743586047e-01 7.3284897792954662e-01
+1387 2.6221690289664963e+00 5.7477568220813313e-01 -8.1562370360849545e-01
+2154 -6.0807061742257373e-01 8.3000577963417155e-01 -3.1311765968701921e-01
+1145 -9.6577456168747217e-02 -3.0016684841627866e-01 -5.6770847860777052e-01
+2042 8.7710998868707657e-01 -1.0542965810637843e+00 -1.9702247842620976e-01
+1604 -1.7867307547665889e-01 5.2684699473926588e-01 3.3951335507832614e-01
+1323 1.9063572712515453e+00 1.7509595613859663e+00 4.1177068476518852e-01
+540 3.9153162695740312e-01 -2.6560309909901997e-01 -6.6026061003369818e-01
+2943 9.9997171296866971e-03 7.0068051672810872e-01 -8.3487485404326800e-01
+1720 -9.9553864250653679e-01 2.2364775819061791e+00 -2.7067326480245941e+00
+2936 -2.7766109856181664e-02 2.0349947739187026e+00 -3.2837497237032487e-01
+679 -8.2340327740807773e-01 -1.6860112552405861e+00 3.6399273514758085e-01
+450 -6.9512155355646121e-01 8.6747425210166790e-02 5.4624293464418971e-01
+499 3.8617216610043642e-01 -6.6181652182826323e-01 2.9487423589548173e-01
+1934 3.3482776625423738e-01 -1.5586269440962355e+00 1.1939627096193886e+00
+1186 5.2591042731245730e-01 7.9573501126826374e-01 1.5071429294242711e+00
+2521 1.4713165924249061e+00 8.5298266907116693e-01 -2.2075387364838135e+00
+1843 -1.7745310537313436e-01 1.5064409127073164e+00 -5.1220972465073666e-01
+2644 -7.4558851510498159e-01 1.1905514681144520e+00 -6.8701474714288047e-01
+191 -3.2705139276094433e-02 -2.2059681181003530e+00 9.4121382832044398e-01
+1757 3.6141331291226664e-01 8.7544053482630058e-02 -6.5798980409206265e-01
+1262 -2.5014565659619366e+00 -2.7142699327828601e+00 -7.4946085683375641e-01
+1541 -1.8390338643252940e-01 1.0725128350403041e+00 7.6119754085143576e-01
+2124 1.9532156593759814e-02 1.0926625491651093e-01 -5.1323361911346055e-01
+2831 -3.5511943591592665e-01 9.3183475346297995e-01 1.2019675886846664e+00
+437 1.2537233445634255e+00 1.1296205887757227e+00 8.0162195431139416e-01
+1321 -1.0894833457786719e+00 -1.2833666418793741e+00 -2.6068355063478502e-02
+608 1.8858863494360407e+00 8.3170791029221169e-01 -1.8387277116556683e-01
+1208 6.0268907938797234e-01 -8.9803715421974961e-01 -1.7048803450251302e+00
+425 1.8069082329382937e+00 9.6153918058010435e-02 -1.5860840334071939e+00
+1213 -6.4021360974470509e-01 -1.0272778993079528e+00 8.2004564012228476e-01
+720 1.0306098345621939e+00 -1.5871614412342860e-01 7.1077279640501290e-01
+1537 -6.5258226526094276e-01 1.0745689771056470e+00 2.2365433036228470e+00
+1987 -2.7690600965395240e-01 1.9246709298056035e+00 4.3842928549114202e-01
+18 -1.2647125161218273e+00 -4.4680199924767994e-01 1.0107551074365162e+00
+2535 4.0342105293488595e-01 1.9670707774059382e+00 -8.7749751766368023e-01
+1495 1.6664384327809902e+00 1.4754082174266034e+00 1.9514227770865603e-01
+872 5.5479862467665941e-01 1.1432601774954609e+00 -1.0576491188504311e+00
+2634 6.6949650645075220e-01 1.0774058000539404e+00 1.0341222215511922e-01
+563 -2.7319080535672846e-01 2.1880505766776842e-01 1.0744006306426388e+00
+2070 9.2323239661749523e-01 -1.0601916032806913e+00 -1.1131563908792423e+00
+979 1.1444985572162107e-01 -1.7378923519317995e+00 -6.1037516621877674e-02
+2205 8.2678346106457620e-02 -1.5223789254359470e+00 2.8647659790794056e-01
+1981 8.5092487667668015e-01 -2.0974374783768301e-01 -6.6420384082830264e-01
+1967 1.7731438262610066e+00 5.8017764903441305e-01 -1.8728770214315478e+00
+334 -4.0251351151752379e-01 -8.6905045819299676e-01 -5.9311174165674851e-01
+279 -2.2700932399290641e-01 8.5282410347228021e-01 -3.0326927929506253e-01
+2824 -1.6969114784944683e+00 5.3456749417753024e-01 -9.3893560792054653e-01
+2674 2.3073609065010823e+00 7.6098729774916829e-01 -1.4817345237033126e+00
+620 -6.4849761628282843e-01 -3.8930787019227914e-01 1.5110373599273126e+00
+176 -2.3470993751309983e+00 -2.3537535362691248e-01 4.9968586188964603e-01
+2946 5.2726145129722268e-01 9.1513483926869110e-01 1.4738639462207850e+00
+2735 1.0560027554981741e+00 8.0364647721719051e-01 8.2448077481085541e-02
+1415 -4.0992578520123202e-01 -2.2152242961223770e-01 -3.5512861991378791e-01
+1373 1.3077995984512561e-01 -1.2762468051438973e+00 -8.8581332412653213e-01
+2909 9.0378538826013355e-01 -2.3101595612485459e-01 -3.5268087381604563e-01
+417 2.2996491820299406e-03 8.8037466178060020e-02 -4.7554246310834158e-01
+244 2.6286200353163118e+00 -3.7428707164500830e-01 -2.0582195276383706e+00
+1389 5.2061445658651961e-01 -9.2304272146285404e-01 -1.5554478811658432e+00
+813 -2.3427152494816386e+00 -6.6733820580853798e-01 2.8324302459476314e-01
+1866 2.8807552587807217e-01 1.3606647535043965e+00 -9.9032602675649228e-02
+1117 -4.8006018348984475e-01 -1.4801299404806907e+00 1.0858656427951676e+00
+1291 -2.6301586401404464e-01 9.8430716794163620e-01 6.7732551269691854e-01
+2771 -6.8450624546287020e-01 -3.1569819684598788e-01 5.1342767702396008e-01
+1748 -7.5461040191146422e-01 -4.0485835057874293e-02 -1.0699446992082693e+00
+2577 -8.3574955013711572e-01 1.7188169642993667e-01 -2.2410558772569728e-01
+99 2.1250976785104864e-01 1.4663729268953696e+00 -3.7724920575386539e-01
+2173 -1.5524344409102018e+00 1.6082039064186484e+00 9.8525467286149104e-01
+2382 -1.0273187697456947e+00 1.2277050318832861e+00 -2.6645811087393279e-01
+585 -2.0502468278058061e+00 2.0958664091093455e+00 9.8193618399149873e-01
+1079 -9.2696202932667671e-01 -1.8106433742509722e+00 -6.6608141249680652e-01
+925 6.8674690591886112e-01 -3.2606851656892533e-01 -2.0312296327229826e+00
+990 -1.9983339317014587e-01 -2.2245949828004314e+00 -4.5696115353511968e-01
+625 -3.5255488995603673e-01 -1.2313212655690156e+00 1.1422906039961078e+00
+2616 -8.8576904526094991e-01 -3.1152353659652260e-01 -6.4477807986440627e-01
+1207 -1.4257740219305697e+00 -5.4823849846553618e-01 -7.5968769493378607e-01
+898 3.1843936741263779e-01 2.8486469498127631e-01 -1.4100020464056120e+00
+2248 4.1598951144604296e-01 -1.1012615125850905e-01 9.4514489838611737e-01
+2304 9.1696677842161045e-01 -6.4400741252359073e-01 2.7105527804568236e-01
+2235 3.9866263293758342e-01 6.7734959853527776e-01 -2.7672965514398298e+00
+517 5.9863241168028707e-02 -1.1929715597282667e-01 1.0599800877224712e+00
+1326 1.2478109212229864e+00 5.6987107299440032e-01 3.3381506203858541e-01
+660 1.3026645942082387e+00 7.8191351505155393e-01 5.8566561533843164e-01
+756 5.3674630034652748e-01 -3.0647345202593307e-01 -4.4043164330542856e-01
+1515 -1.5328619481890898e-01 -1.0075851638453646e+00 -7.8802323777516489e-02
+1012 -7.2545117972605155e-01 8.6948142889112123e-02 -6.4527965778713681e-01
+1675 4.0652524824483761e-02 1.6219517891134019e-01 -9.1710407180901266e-01
+532 9.1581833896168985e-01 -4.6347349673376691e-02 -6.7771454079685944e-01
+1734 -1.6203519762761467e+00 5.9909345383675883e-01 -1.5972750646892175e+00
+1035 -3.2192551394879192e-02 8.8671005990543972e-01 -3.2840492608105613e-02
+1206 2.5413016561319562e-01 1.0071121828479401e+00 7.6259617121768208e-01
+1556 1.1538785853705962e+00 -8.1150534093201920e-01 -2.9460427415690602e+00
+1996 -2.5866069372763389e-01 9.8310080705158165e-01 -1.3688650850729576e+00
+1705 -4.8223284149224216e-01 -1.1359069045711683e+00 8.7690917296806603e-01
+2562 -7.5682783220726546e-01 4.1198263005206182e-01 -1.5329895445350008e+00
+70 1.4692209406811066e-01 -3.0110902471152634e-01 1.0721303162466453e+00
+745 -9.2014035314054521e-01 -4.9182810713680358e-01 -1.2205894116116038e+00
+327 1.6624531810318905e+00 -1.0467878014374772e+00 -1.2790983975374431e-01
+1224 -1.8959627147031457e+00 -8.8416812889196472e-01 -1.5607753159940390e+00
+2192 -1.1402278752976100e+00 1.7368335777996156e+00 -5.9288386634133972e-01
+160 -5.8930579803196736e-01 7.6123065006610124e-01 1.5645285885616715e+00
+64 7.8969656759599927e-01 6.3812767368043555e-01 -1.8748576467448814e+00
+2740 -4.4952350581272044e-01 1.0676972315207753e-01 -4.7642408759509480e-01
+435 8.1865857747221804e-01 -2.4417492182864231e-01 9.6647218573733162e-01
+1726 -1.3768085871201230e+00 -3.8648729178945890e-01 2.6278647838575830e-01
+2554 3.6845126647383340e-02 6.4051769585701757e-01 -9.6267580482192594e-01
+1704 -1.0885253692890196e-01 -2.3546634099340233e-01 -1.4983389235749487e+00
+597 -4.5889981047609024e-01 -1.6971496304947181e-02 -4.6372977101438245e-01
+300 -3.3284890025688174e-01 -1.0265678810983974e+00 6.1157982106022990e-01
+1481 9.6381332500617511e-01 3.3114326135828576e-01 -1.3910100928544973e+00
+343 -8.0352601074671082e-01 -1.8381106361951421e-01 -6.2574689947461226e-01
+271 -6.3881386171446908e-01 -1.8006025134787027e+00 -9.8726635890946501e-01
+2079 6.4856037793729804e-01 -3.6335335091248033e-01 2.3025935155631300e-01
+502 -9.1663158340491835e-01 5.5766554475798286e-02 2.4671065054462962e-01
+1517 7.6845761499614340e-01 -2.0797935755044263e+00 8.7931287417586923e-01
+2 -8.7484072128161605e-01 -1.2831589300594048e+00 -3.9334606120022847e-01
+2189 3.1962557578952461e-01 -2.1502512025207615e-02 6.8577504366020614e-02
+2049 2.8771057608466255e-01 9.8420224098107167e-01 9.3894952820732736e-01
+2974 1.8373457077104680e+00 -2.8151673583394127e-02 -2.0851961579691333e-01
+2642 -2.1065995683611194e-01 6.9822802370923043e-01 1.1312459431173894e+00
+845 4.6391429768797771e-01 2.2492478320460346e-01 1.6679206191815363e+00
+1010 -1.9700993836601395e+00 -2.1093104193100478e+00 -7.6478663458751872e-01
+274 -1.8926205474838893e+00 -5.1030647179190236e-01 -1.9558290329843148e-01
+1272 -7.3746612410279033e-01 1.6964316859465174e+00 -7.5990589506740225e-01
+438 -4.7633112132802213e-01 1.2243249487995613e+00 -1.6041700250850934e+00
+1403 7.2010389839003097e-01 -1.9162050569819091e+00 -4.2052714822334625e-01
+1972 2.0578805177717019e+00 1.4657783998442693e+00 8.3925142693483790e-01
+491 -2.8878705296429913e-01 -7.1050920000169104e-01 -8.8093182313724105e-01
+549 4.1968387974649640e-01 3.4541202597412113e-01 2.4204280887885581e+00
+747 6.2740459254174685e-01 -8.1069959469391828e-01 2.5368000215787961e-01
+1034 1.6762350610669294e-01 2.6311399720948075e-01 -2.6011275949606749e-01
+2500 -4.6200186024694667e-04 2.7605658945009548e-01 2.0902646217209647e-01
+1004 5.4265246629695973e-01 4.5888085704313591e-01 2.2341632309249686e+00
+428 -2.4374489927504300e-01 8.1478401054953875e-01 -8.6152796954621622e-02
+2711 -6.2144975743123976e-01 -2.7839653469215586e-01 -1.6618489945122856e+00
+931 1.7538635171522396e+00 8.7540203971052033e-01 -1.3836275717441322e+00
+881 1.9606717978682373e-01 1.1186275513400483e+00 -7.9157403723488873e-01
+2377 -1.3580834007002418e-01 -1.6558202318214024e+00 6.5237733451217639e-01
+2896 -1.0302238661776995e+00 3.2512125508551037e-01 8.5309720052763149e-01
+1425 1.3029334056795944e-01 -3.0722710507569237e+00 -8.8504697503927199e-01
+181 1.3144427124653983e+00 -2.1325085851319822e-01 -3.9568679975378807e-01
+891 4.5211437537414145e-01 -1.1350866899899505e+00 1.3438228640688434e+00
+1868 -1.9712965866248233e+00 -2.7495712075605050e-01 7.5528215401558119e-01
+1271 4.1790783566855805e-01 1.2648863641822348e+00 2.1940715306962258e-01
+2316 -1.5591335824525970e-01 -1.0034904139791336e+00 1.3341110567885837e+00
+1558 -1.3082231548379392e-01 -5.1031569642284291e-01 -9.9882325075399736e-01
+2646 -1.9531478872135826e+00 8.3123737843963041e-01 6.4295700037791648e-01
+836 7.4614166520704439e-01 4.1933066193455543e-01 5.8277373981217495e-01
+2580 1.8526597710008397e+00 1.1107961269153463e+00 1.7056733479111791e-01
+1896 6.7281038081612599e-01 -3.9839498458945838e-01 2.6519853257676418e-01
+2188 1.4237344107274680e-01 2.4194723468395885e+00 4.7528944233952353e-01
+1009 -1.0879124209094868e-01 -6.2164012111652733e-01 -9.0818613540482229e-01
+2768 -7.7817291393876420e-01 -1.6928069691077358e-01 1.9459244427942446e-01
+761 -5.7899704388919138e-01 -4.1025268491989492e-01 5.8390666266869407e-01
+1504 7.5377387807390606e-01 1.7165129990237922e+00 -6.8954176037508530e-01
+2371 2.5844629449487638e-01 3.8930383047920847e-01 3.0103161124213926e+00
+1191 3.9296940097027194e-01 -5.1771314702365478e-01 -9.3800198297606563e-01
+2153 7.4241122608256616e-01 8.5308075082726587e-01 9.7375653354246716e-01
+1479 3.8198166366886235e-02 5.0537472891999546e-01 9.3419907551332768e-02
+2629 4.3702432231814292e-01 -6.2163521519783460e-01 -9.9493560776954781e-01
+2592 -3.1181410609592963e-01 2.9144569547567212e-01 2.3491669786983832e-01
+2980 1.8460198837706479e+00 -2.1941400169457886e-01 -2.1474901685168160e+00
+629 1.2354954259412741e-01 1.2183539478509145e-01 -7.8390299731809054e-01
+871 -1.9174334943359161e-01 5.8312784127244299e-01 -1.0836489119752097e+00
+154 9.5220251605954320e-01 8.4645397100654463e-01 1.2808363615184513e+00
+1555 1.0806976133046733e+00 -2.1898224543109830e+00 1.8269893720191130e+00
+1277 6.3994641131866270e-01 -1.9584579957412496e-01 -4.1220404493759866e-01
+398 -1.0748956647420387e-01 -8.5456859362825344e-01 -3.8106722603710969e-01
+973 2.5233737796456648e+00 8.0563460893029937e-01 8.5423712507010460e-02
+1335 5.9248148404444057e-01 -6.0686444892659108e-01 -2.9000864959301614e-01
+2981 -5.6988042795362359e-01 -6.6347360507397257e-01 -6.0720430648385970e-01
+142 -1.2274842171239522e+00 3.3751253833448075e-01 -4.9839348278924778e-01
+2632 1.0389914859106504e+00 -1.0769163977348224e+00 -5.9805878938792900e-01
+2686 9.8985789655073653e-01 -1.7208983043347847e-01 -5.4467822435953261e-01
+1673 1.6447891405651658e+00 -3.9926831382044503e-01 1.1410330881874999e+00
+833 -5.6263766419099626e-01 2.2338648933983030e+00 1.4090284767656533e+00
+989 1.0647827950126345e+00 6.5862386398042427e-02 4.2509764747018064e-01
+566 3.4081771508683423e-01 -6.0514871523396030e-01 6.9337403879874604e-01
+733 -8.5545642191823867e-01 1.0157078531154979e+00 7.4068935346046264e-02
+443 1.5071738750781711e+00 1.2975812835528208e-01 -3.0889270359807941e-01
+1221 -8.0007958918711053e-01 1.2504751607650582e+00 7.9469050567267974e-01
+1046 9.9069028395844916e-01 2.4257424877378930e-01 -2.3013453184679375e-01
+1487 -1.2915924687607008e+00 7.3771182282702230e-01 3.6311577154130226e-01
+189 1.4086474331094905e+00 6.0775605951811951e-01 -5.4868468787833802e-01
+1198 3.3011936768693434e-01 3.6000945586877348e-01 5.1147737724246167e-01
+2145 1.8894553761594721e+00 2.1295985000429235e-01 -1.2246610880504709e+00
+702 -2.1673314194288301e-01 -1.8545777444871128e+00 -9.5540112860082038e-01
+893 -1.4102611552152398e+00 4.5230032520918878e-01 -2.2179481117062614e+00
+2779 -5.4364237992727538e-01 5.6582233709501439e-01 -3.7987174418989372e-01
+454 9.5531511770981281e-01 -1.1110923433383830e+00 -7.7671234670515654e-01
+2266 -9.4107772114271926e-01 -4.3931500226932138e-02 2.3540620186421793e-01
+2821 1.4193160284445545e+00 2.0633801460701989e-01 1.8459250878194103e-01
+2582 -8.1232005203620627e-01 -8.6055735601927322e-02 -1.8919958616729596e-01
+810 1.1354970981041712e+00 -1.3193929782905129e+00 -2.2478506334912468e-01
+639 7.1125678184268459e-01 3.3602117458835334e-01 -5.3240042751564598e-01
+2549 1.3189687753382966e+00 -6.8997780525077912e-01 1.3990864166929735e+00
+262 1.0649384853027226e+00 -7.3741277184706522e-01 1.0105456827138393e+00
+234 5.2315136358697589e-01 -1.1819630127186481e-01 1.3852917766579125e+00
+317 -1.0126908359304498e+00 1.5044966106478536e-01 -5.9952514979855165e-01
+1201 4.4593346487281199e-01 2.0129629769476343e-01 1.7503566080425466e+00
+1462 4.9032994839926480e-01 -8.6139087674863590e-01 -2.0777169542807525e-01
+961 1.6631181790594938e+00 -1.3047821229231062e+00 -2.7161470176470337e-01
+2944 2.0830376014421628e+00 -1.5854107234893937e+00 -1.5811239380566769e-01
+1906 -4.6413754380388933e-01 1.2094262704004701e+00 -2.0068662942321880e+00
+2475 -6.1372055608659415e-01 -1.4703622589742720e+00 3.1598538185048168e+00
+60 2.8410934702489443e-01 -1.1875045213963251e+00 1.7388796260544754e+00
+1709 -2.6226998251029376e-01 1.7523655429055821e-01 -1.1656858090562843e+00
+2855 -8.1187432988635466e-01 -2.7326657438284307e-01 -1.2204102415450460e-02
+1051 2.0400361369041433e+00 -2.6095971181744302e+00 9.3943195005612146e-01
+1980 6.7450528619031658e-01 8.9991946457740157e-01 9.1359560347824642e-01
+386 -1.5650973060869597e+00 -1.2837018137965219e+00 9.5291022771650624e-01
+46 -7.1398273142354918e-01 -5.0973466364446940e-01 2.7518028411474305e-01
+1445 2.2174837629612382e-01 -1.3958376975910878e+00 2.4759334838364311e-01
+289 -7.2450158274528012e-02 4.5080173154245101e-01 -1.2026526205688945e+00
+1492 2.3294497916710437e+00 -4.1634888986672058e-02 4.2255090030908898e-01
+933 -3.6078877479362736e-01 2.3587098716427338e-01 6.9651601586743855e-02
+2223 5.4675108740814382e-01 -1.4895640751890988e+00 -1.2189399346581249e+00
+948 -7.5320189451953423e-01 1.4713200636525765e+00 -1.2172745030824483e+00
+2095 3.3115524135945174e-01 -2.1452315187802484e+00 3.3401512735910244e-01
+1953 5.3879823856786913e-01 1.1277688844241698e+00 -8.6871487185818941e-03
+1857 5.3920212582451232e-01 -1.1369921704963357e+00 -3.3485781526581537e-01
+579 3.0574406970947260e-01 -2.2417256279383602e-01 1.1195954437461175e+00
+919 -1.2154568871519096e+00 -8.9786326457414434e-01 1.4258845271625107e+00
+2426 2.5318143655593297e+00 -1.0859333490610625e+00 -9.2803211213869763e-01
+1498 9.3938189777298453e-02 1.0050405205573336e+00 1.3067666477270281e+00
+1336 5.7901503267818877e-01 3.0904983572186684e-02 -7.5993094908278791e-01
+1993 -6.4914111484279757e-01 2.8969217627125449e-01 3.0082884289394261e+00
+2021 1.4441191367891577e+00 2.2736025477028901e-01 6.9288351125139114e-01
+1246 -1.1928602841877591e+00 -1.8510828779418453e-01 -1.9405481621943821e-01
+1375 2.1686344323948831e-01 1.2960055726226014e+00 1.0003801416614384e+00
+2456 8.1605602410182487e-01 -8.8621093862302980e-01 4.1948827541386186e-01
+2655 -2.6816477913853061e+00 -1.2923034045037277e-01 -1.0756647795224125e-01
+2267 5.7311405848149954e-01 2.1873890133914622e-01 1.5013560285109737e+00
+1342 1.0622355762743967e+00 -2.9031479398152327e-01 2.8651025920091822e-01
+2780 3.8711001160227737e-01 1.8470550557913989e-01 -1.4361669756964214e-02
+603 1.1560334071871756e+00 5.7658481560925534e-01 -1.2693241646707085e+00
+661 5.0062185751430477e-01 1.4905812774846527e+00 1.2419404293734180e+00
+2778 -1.7137483649000553e+00 1.2326615953357631e+00 -5.0381612204215642e-01
+354 -3.2699029213436603e-01 1.0500877711012335e+00 -1.6606345412268075e-03
+2372 7.5944987467650410e-02 -9.6589332985505805e-01 6.7704228356137675e-01
+1607 3.2424281196769503e-02 -1.2568049714698706e+00 6.7874168697064086e-01
+2725 -2.1317670651934182e+00 -4.1069018447731753e-01 6.7795572468220833e-01
+1799 1.2237193169968938e+00 1.2142720007293943e+00 -1.0489325744242122e+00
+115 1.9915377333311393e-01 1.5484793878924543e+00 1.3317157899998799e+00
+2112 -7.2703095711697563e-01 5.8375524492848363e-01 -5.4493131414907547e-01
+133 -4.0927829972677932e-01 2.1431231605245732e-01 4.0188464940729002e-01
+2990 1.4033014419719019e+00 1.1658652943450201e+00 8.0219155961959554e-01
+1116 1.5768105893593867e-01 2.0294584834278892e-01 1.4362045127321144e-01
+1083 -1.3733733507670437e-01 -4.8004773554684360e-01 1.1142175507724190e-01
+1078 1.2831207147391388e-02 4.0062286492155486e-01 1.6598381412081545e-01
+286 1.6490880270159153e-01 -4.9602561855452720e-01 -6.2877563715591556e-02
+2460 1.2357034039373642e+00 -6.8647984902241876e-01 1.5875367174889730e+00
+2190 -7.3359461645951729e-01 -5.3168300910155497e-01 -5.5512440920660089e-01
+717 -4.2113517320006588e-01 1.5852467448151146e+00 -2.3853199895994467e-01
+1992 -9.5597465488458089e-01 -2.1809545788346060e-01 -1.0558312678691029e+00
+62 8.8234000587593042e-01 -2.7372109513084480e-01 -3.3760600171480010e-01
+2364 -1.8964809516491952e+00 -1.0359095775562772e+00 -2.1636785953555209e+00
+1047 -2.9631287263832135e-01 -1.4579411437107104e-01 -6.5610220233718519e-01
+699 -1.3808479610983297e-02 -1.2057202814454180e+00 -1.1375652587469629e+00
+1307 3.8123499679029454e-01 7.2057580699658286e-01 8.5412280045849354e-01
+117 -8.8843153199277758e-01 2.2199963158623798e-01 -1.9635214745292942e-01
+391 -8.1302270141377464e-01 -3.1329371172976095e-01 1.5233877437083990e-01
+827 2.6860346790889134e-01 -2.0966271297458336e-01 2.2582734660364129e-01
+120 5.5666261103461190e-01 -5.4049084955431503e-01 -1.2978108269058095e+00
+2958 -2.2427683753007932e-01 1.2349201186961158e+00 -3.5537906806727672e-02
+131 -7.3832644094815947e-01 -2.9133648893089736e-01 1.5960067339140720e+00
+2262 1.6435195998226939e+00 -8.4450834127464347e-02 1.6009037690984829e-01
+2133 -5.8957718014631944e-01 1.0271359080395577e+00 -6.2435255752056784e-01
+1442 -7.8653868744690347e-01 -1.0790082372480614e+00 4.4779606201185984e-01
+1785 -8.8563122568644692e-01 -1.7535056518423681e-01 -6.5357053253696040e-01
+2893 -9.1761712758493597e-02 -8.4609576450829685e-02 -8.0070962642756616e-01
+1147 -1.2781597224562808e+00 -2.7499848636411217e-01 1.4486914426147177e+00
+94 -1.3193090819998969e+00 4.1727068101063663e-01 -2.4724803239616008e-01
+2937 -1.7279596786746330e+00 -4.5288802232862763e-01 -1.2697648610158905e+00
+2417 1.6780162307261512e+00 -1.5822266882344469e+00 -3.7078417486387821e-02
+1933 3.5932785655626909e-02 4.6573325833480467e-01 -1.6162750262960818e-01
+725 -9.9583057575624723e-01 1.3420368137797862e+00 6.4129236589514538e-01
+2005 -1.3859129922775815e+00 -2.7289021009419095e-01 -6.9414875158576039e-01
+1088 3.1283562451558145e-01 -1.2779221686635345e+00 6.0974912733437925e-01
+2624 -1.1841560229496353e+00 -1.4995220530575091e+00 -1.6140312406678252e+00
+1130 -1.0371104453747724e+00 -8.3267382750504804e-01 -8.9700352819159224e-02
+807 -1.4713380406120962e+00 1.2790477701707961e+00 -5.4631018898973871e-01
+1614 4.2736013258219135e-01 8.4744984581662033e-02 6.4243054828506063e-01
+1328 1.0161366782078984e+00 -3.8138480650444652e-02 6.4666847850432263e-01
+113 -1.4525524981237148e+00 -3.0127443831640544e-01 2.1856246625963036e-01
+1161 -9.2218723722638551e-01 -8.0995587891925847e-01 -1.0463288562380069e+00
+513 -1.1210018103521133e+00 9.2779040582751926e-01 1.9034586534825737e+00
+1899 -1.6636116232422569e+00 1.9034858896515067e-01 -5.2506861226868629e-01
+2586 -6.1681148096146710e-01 5.9752115512524218e-01 -2.1761516821465245e-02
+805 6.0821953320840794e-01 2.6347847096682842e-01 1.5331383150646498e+00
+2854 -2.2751937735521341e-01 -4.0712894838626079e-01 1.8377565909723252e+00
+1394 1.1609632619196049e+00 2.5698372815889281e-01 1.4343922701174034e+00
+401 3.9491505475711025e-01 -9.5800372316100579e-01 -1.5980158836334437e+00
+1863 -9.7182763033333774e-01 7.2493108027764125e-02 1.8632688103766004e+00
+2553 2.4626861842004186e+00 1.2771461712847798e+00 -9.4210355208126650e-01
+208 2.6805040900920218e-01 6.0606023891588601e-01 -5.8177123432548705e-01
+545 -1.9850535786068368e+00 1.3159420380533657e+00 4.7148656807568678e-01
+1762 -1.3212668561949703e+00 4.3448075751519283e-01 3.1366712407022721e+00
+2272 7.7473527388298924e-01 9.1312038987414079e-02 1.3122924930982600e+00
+2849 -2.0178203329288963e-02 1.7804092212516891e+00 3.7701997989991476e+00
+2198 2.1090771373919077e+00 1.2351956009143096e-01 -1.9677112185478249e-01
+2299 1.2682685262257762e-01 1.2451634170818757e+00 6.2648273082572692e-01
+2045 -1.5135967038287912e-01 -5.1782079162811001e-01 1.1168199147579314e-02
+2249 -4.6682086276478285e-01 -8.4727038504358387e-01 -1.1254356928691727e+00
+1464 -1.1527183005070736e+00 -3.2998313991646006e-01 -2.5915040196989994e+00
+2989 6.8258632017126053e-01 -4.9477141231622701e-01 4.4364894765025248e-01
+1381 1.1983352259909602e-01 1.2453648302089140e-01 -2.0758006239635010e+00
+2448 -4.8501320008203141e-01 1.5532182121190599e-01 -1.0564662486225154e+00
+1259 3.6009639568864754e-01 5.0704022183038178e-01 1.0841641579674401e+00
+2017 2.0645419537594840e+00 -1.5501570749357976e+00 -4.2409335003984625e-02
+1416 2.2130917628961491e-01 -1.0178176393409899e+00 2.3912606384870733e-01
+2245 1.3441176957937611e+00 -1.3051297871283276e+00 8.4556669796923078e-01
+1769 2.5407613066133289e-01 1.3534154898928574e+00 -1.8669446030718031e+00
+1121 3.6665583948082697e-01 -1.0685877119651185e-01 -3.3738510828595214e-01
+908 -1.0557193952099553e-01 -5.4374028560914967e-01 4.5126751485433303e-01
+2292 -2.2996067541970842e+00 2.3633611207325735e+00 -1.5260615949406828e+00
+1754 5.6524045783893806e-02 -1.5991524093864238e+00 -2.0329987970575325e+00
+1261 -6.6246880292327481e-01 3.2508823052666380e-01 1.8669572579027192e+00
+2794 8.7614514467450133e-01 4.3430573211055906e-01 -9.9665775847736005e-01
+2087 1.1554360437132833e+00 1.0077443213209356e+00 1.7175418444539547e-01
+1167 1.5932148191308644e+00 3.0846658198640614e-01 -7.9560397039043884e-01
+2513 -1.0637941505436661e+00 1.4030297977759552e+00 1.1007654163513227e+00
+643 -1.3724375858202249e+00 6.1448752398909137e-02 9.8238829419118601e-01
+2623 1.4099539933939378e+00 -1.1475371628700937e+00 -7.0538519468293426e-01
+644 -1.7976548894395474e+00 7.2376857965867714e-01 1.9897424054885755e+00
+217 1.1539777915248299e+00 6.6920847710524289e-01 3.8601956988455721e-01
+1052 4.9234390946691764e-01 1.5062195163410078e-01 5.7264900702416743e-01
+2195 3.2694059973992240e-01 1.9603829045353283e+00 2.3431570258801365e-01
+2137 -9.9845122164503042e-01 -3.2570492113744487e-01 -2.7629709882636833e-01
+659 -7.2331144269993153e-01 3.4105316176119160e-01 3.0241484924535750e-01
+1905 2.0606914098470147e-01 -1.1115781551641113e+00 2.5021834776821184e-01
+2823 2.0716229410312503e-01 2.0038187554445841e+00 -1.7197075300368150e+00
+2953 6.5298088203841576e-01 3.6962442433597736e-01 -7.8754270713704971e-02
+453 -1.5358681971999727e-01 8.2244724868599584e-01 3.8086318591742685e-01
+1793 8.7390497657564692e-01 1.9774806724301581e+00 3.2882943384047947e-01
+293 8.8798457130377129e-01 8.7957866310264210e-01 1.8252244329698579e+00
+2641 -8.1004648520492584e-01 -8.7984078245325026e-01 1.6187034722566501e-01
+2963 7.4421635806286979e-01 7.7415386068197112e-01 5.8733938997439977e-02
+1669 2.9301859343343584e-01 -4.2642429918428049e-01 6.5128361447367972e-02
+88 1.1549781595222429e-01 -2.1597547151548961e+00 5.1239602801235107e-01
+1011 -1.1997429387592176e+00 -1.1298432931202746e+00 1.0791997600933390e-01
+92 -4.7145434534714348e-01 4.3220555175107478e-03 -1.3937727793994727e+00
+1106 -7.9295619783957183e-01 -1.9032557435346071e+00 -1.8267070918869401e+00
+2951 -1.2992272794286866e-01 1.2555484149568525e+00 8.0943565932520833e-01
+2286 -1.3086432523594835e+00 -4.6512564760916197e-01 -1.3722725420914310e+00
+808 1.2196560423578695e+00 1.3062227836055457e-01 6.4796280658885475e-01
+648 -5.4377640011579104e-02 -4.6026134316037892e-01 -4.5658553597102219e-02
+986 -1.0637519289089505e+00 1.6289010271319715e-01 1.0566910119338893e+00
+1971 -5.1382284620655894e-01 -6.5800281738210800e-02 6.1016548962286854e-01
+2875 1.5056617983914884e+00 1.1572777643173460e+00 1.8799529353889399e+00
+2614 -8.8363616646202436e-01 1.0154959010804898e+00 7.4429837247378716e-01
+2738 -9.1427279950272478e-01 -1.5504429596350336e-01 1.1753618111412378e+00
+1127 -3.7104935785696058e-01 4.2675193196520139e-01 -1.0851519234810183e+00
+1589 -4.5297942499874544e-01 -4.5885195584151245e-02 -1.2939236805148799e+00
+2381 4.4918376095881757e-01 7.2182118544124974e-01 -1.5482476030858430e+00
+2536 -6.2396494287030424e-01 -7.2990702053162415e-01 -1.2210287073733572e+00
+2051 8.1622781025687485e-01 5.1390610336130482e-01 -1.8348991777333405e+00
+2743 -6.1936892331318871e-01 -1.0275958459767418e+00 4.5573149103678318e-01
+68 1.4330983039662553e+00 9.0073787712325959e-01 -9.6004143032735645e-01
+2046 -1.2102629992846778e+00 5.5210563361989684e-01 -3.8113713811663735e-01
+2766 3.8590557698850458e-01 2.9450884595159601e+00 -1.7754987765122074e+00
+621 4.5985196343110230e-01 -4.1960242661824210e-01 1.4462316711132623e+00
+371 1.8001906164394383e+00 -1.0636309639168193e+00 1.3975153174425234e+00
+273 -2.6554848153046646e+00 1.5986034494485246e+00 -1.8536323551285372e+00
+1847 4.3829775341891247e-01 -7.3323344183969041e-01 -7.2665881330831339e-01
+2103 -1.1446861168943503e+00 -2.1256053329681674e+00 8.3024508981967571e-01
+1005 -1.6967559345834045e+00 -1.2934675226340604e+00 -6.5305343367236746e-01
+1728 -2.8172349132909502e-01 -5.7559329326010267e-01 1.6035377206792638e+00
+2484 -4.9273667406473931e-01 -1.0825501212472475e+00 -1.4038109427017826e+00
+2617 -9.9728440042489330e-01 1.8761571228187460e-01 -4.1754456714834423e-02
+456 9.0228844514083062e-01 8.8368414981354892e-01 -1.0310374997204184e+00
+203 -1.5405198600501020e+00 -1.0381523542682893e+00 8.8984348147250825e-01
+2027 1.3505832969938212e+00 -2.5941619525390704e+00 -6.0913296170359132e-01
+938 -1.0239798185157791e+00 5.1492799267049272e-01 3.5300530699869714e-01
+397 1.2378843549964158e-02 1.5257379281613932e+00 5.7436460014470259e-01
+1217 1.1805619819166113e-02 -2.9460020821548027e-01 1.9602321630393931e+00
+2406 7.8897120286919242e-01 2.1050147017970824e+00 -6.4770629091923904e-01
+2434 -6.1570653455768831e-01 -1.6968905910075802e+00 -4.0532744112205676e-01
+347 -5.9281344243471323e-01 1.3396756593370659e-01 7.6384599976322853e-01
+395 1.1769055521776643e+00 8.8867224452932170e-01 2.9139759746482068e+00
+2298 -1.7900876164661289e-01 7.2428418463406619e-01 3.2835661895343737e-01
+1122 1.1011179356005805e+00 1.7147052693799020e-01 -1.0702854843939649e+00
+2540 5.7064006370835085e-01 7.6056321219108447e-01 1.3128511781025760e+00
+533 -1.5447011905466417e+00 1.0281815850818619e+00 -5.6345515851532502e-01
+2386 5.7717161016213048e-04 -5.3182984690167190e-01 -7.9475808311475948e-01
+842 5.4614574729511467e-01 2.3287732956781100e+00 -1.3721210155772934e-01
+1975 2.1427969161440679e+00 -3.1312814626301616e-01 -1.1587070715933190e+00
+2009 4.4857124086816780e-01 1.5463534254118316e+00 -2.3449855158429134e-01
+282 1.6982799757863756e-01 -6.1411509422912480e-01 -1.4530440852624442e+00
+2117 -1.0693775403823302e+00 -3.4570741266836219e-01 -1.5153176480880465e-01
+1185 1.6387069954386863e-01 9.0373841865861249e-01 -2.0997546497665220e-01
+2874 -1.2353077555765588e+00 1.7138827636796876e+00 3.7237608738285299e-01
+1590 -3.6779594787794778e-01 -9.1837947697741429e-01 -4.3873621971695775e-01
+2850 1.3062710826719628e-01 -2.6260868183870971e+00 8.1964368330394044e-01
+82 -7.6163581678352921e-01 -4.4469322006865453e-01 -2.3808972391163025e-01
+1638 -6.4949087344343159e-01 -9.1008735488569559e-01 4.1151649532975815e-02
+2532 3.0214367300473854e-01 5.8648566997059259e-01 9.0410536323495183e-01
+368 1.2515903073523962e+00 -1.2748158090674253e+00 -7.8952643492085139e-01
+2700 6.0768274750172913e-01 -6.0306780185381340e-02 -1.8011650005008331e+00
+884 -1.1058703905756000e+00 6.3266983894408346e-01 1.2396447211125894e+00
+44 -1.9386705588247424e+00 6.7865880770755349e-01 5.6886529575015865e-01
+2789 4.9396961707579123e-02 1.8003617100980567e+00 -1.5487993207624204e+00
+1072 2.7031490125172958e-01 2.1247190129127752e-01 6.1199230497279666e-01
+103 -9.0515625444101444e-01 -8.6825795905723480e-02 -3.4678573631823514e-02
+2271 1.6776658188606057e+00 9.2457635075575784e-01 5.5024568502756011e-01
+1 2.9243544384798548e-01 1.6128745892446936e+00 -3.3782876929403444e-01
+1474 7.1475430779780924e-01 5.7288683702161014e-01 -4.0385085370303764e-01
+1086 -1.0234067260395394e+00 -3.6756176004524593e-01 5.2671842645761213e-01
+2559 -8.6591359627260633e-01 -1.1092116229651905e+00 7.1629716619894390e-01
+1113 -3.0648575831174318e-01 -4.1633629271658046e-01 -1.6645855728401076e+00
+247 3.7108970473858383e-01 -1.0132924162014245e+00 -1.1192408175488580e+00
+1284 1.5048592591326954e-01 9.3845790635483328e-01 -1.0490783322760504e+00
+939 3.5016274722786273e-01 -1.6397099086325886e-01 -2.8475658534364778e-01
+2569 -1.8448735784746977e+00 -9.8247078444570868e-01 -1.8677297381403497e+00
+1424 -8.0752382040754536e-02 5.0232130617055148e-01 -3.3997180532667393e-01
+240 1.3183945298757862e+00 1.3222137924962196e+00 9.3286068235661559e-02
+2583 6.4586977465639328e-01 1.7554463388451340e+00 -5.8639753653112747e-01
+1443 1.6372800933436877e+00 2.3907530627759577e-02 7.7931176093551602e-01
+984 1.1530462810422746e+00 4.3888453632707236e-01 1.7955475382230293e+00
+1240 2.3214389292981821e-01 7.5365178350198891e-01 -6.5740297340745402e-01
+2427 -1.0045600266947792e+00 9.8135835263460458e-01 -1.3480302845486980e-01
+2100 -1.9838921085513253e+00 -1.3070890473317687e+00 -3.5343176580410540e-01
+650 1.1821872128840714e+00 -2.5003750492430972e+00 3.4766602268204838e-01
+1539 1.6565336452314769e+00 1.8620969750255842e+00 1.7049578166014727e+00
+2105 -1.1024126172396180e+00 5.5645781676749362e-01 6.7197294650957629e-01
+2243 -2.4505881967820961e-01 3.0003303811303881e+00 -1.0464525098240900e+00
+2707 9.4955236419466904e-02 -1.8090668472101185e-01 5.2988447839987218e-01
+829 7.2751618963471965e-01 4.0024518741486670e-01 -5.5781520426289843e-01
+2709 3.1101522781673635e-01 -1.6046339690385116e+00 -8.4629064582905134e-01
+548 1.2303462514340342e+00 2.9889542491341414e-01 8.1335106833945015e-02
+712 9.9876895534969978e-01 1.2184410019227676e+00 -1.6209736848689240e+00
+47 -7.2582269180358083e-01 1.4976225435415620e+00 5.1315250616072317e-01
+1296 -2.2387535305166528e+00 1.4458364909973977e+00 1.1572515379802535e+00
+920 1.0407986769376218e+00 -4.0525362259407427e-01 3.4213843445421538e-01
+1225 1.7737146511785404e+00 -3.2846496823541654e-02 3.8427013451074499e-01
+1897 -1.2535979122050169e+00 1.3667328968070214e+00 -1.1553117154106058e+00
+1616 -3.5933384234248961e-01 4.1992815648606419e-01 -1.0600397108635697e+00
+1397 3.7725399995277015e-01 2.4748129608246366e-01 1.1824319518925126e-01
+724 -2.2443811405850940e+00 -2.5723366796579743e+00 -2.8809138596048389e-01
+615 -7.3279216043836037e-01 5.5560595452292061e-01 3.0173217054986856e-01
+2429 -7.2048338504774256e-01 -9.0874190260695897e-01 1.1378684711729423e-01
+2929 -4.7637255672244527e-01 1.2265395543438480e+00 -6.1124784100212759e-01
+646 -7.9423826233861239e-01 -1.0498030298140373e+00 -4.1574215351363575e-01
+820 1.2472096797239889e-01 -2.1961724734079930e+00 3.5300533757920767e+00
+1670 -6.0144918574557615e-01 8.4620842023148832e-02 3.9100702182063019e-01
+1494 -7.3719863382588002e-01 -2.7467702509548858e-02 -5.9153324806250063e-01
+488 -7.5622595917507240e-01 8.6736698070074314e-01 -4.6098405148757277e-01
+1482 -1.3309628650776981e+00 2.8792612230324915e-01 6.9801655620019554e-01
+716 -2.0782636205519642e+00 -4.8492049404137955e-01 -6.1503399682955773e-01
+2660 -4.9284937331111639e-01 2.6077303901988724e-01 -4.5813000537156909e-02
+982 6.8069217833101284e-02 3.2398297210238575e-01 1.7585913519716773e-01
+2035 7.6076503054088285e-01 2.2654637105963921e-01 -3.1152073672420644e-01
+2013 -1.0008290896136247e+00 -6.7013119073976457e-01 2.6521493439471677e-01
+1792 5.1248635137868204e-01 2.7183967448004620e-01 -7.8099535547847920e-01
+1766 -5.2431720922415614e-01 3.0127971993863556e-01 6.2442381902151689e-01
+1881 5.5110656723038087e-01 -2.0666209865675383e-01 2.6166124225072696e-01
+2982 1.3716764883242039e+00 -1.6531675877235488e+00 2.5870301662987061e-01
+877 -1.3142760154839621e+00 -3.8030848002575712e-01 1.9945974753466900e+00
+2842 -1.6331243747398333e-02 2.4740079719051786e-01 -2.8425403016706208e-02
+2905 3.8739804430328961e-01 -9.5828637565269559e-01 1.0970848047323056e+00
+1049 -1.7242977380312241e-01 1.0938955649493902e+00 5.3140545949230877e-01
+1852 -2.2991301987406010e-01 -7.2204758964807092e-01 1.8085817372382798e-01
+1596 3.4908086399044186e-01 8.5118267635177958e-01 -1.9746438296598496e+00
+825 2.6940261975578933e-01 1.2166005334238497e+00 1.2671427716115943e-01
+516 4.5043646282947047e-03 1.8383501411403763e-01 2.6360561962612905e-01
+742 -1.5399275726488797e+00 3.5093689015693114e-01 4.0274910796783497e-01
+446 -1.9481827273783989e-02 -7.9205786162984781e-01 2.8037691621982730e-01
+2409 -9.6782869054828258e-01 -6.3332620678483595e-02 -1.0140468005261840e+00
+2462 1.3127279566870576e+00 2.7666151793530169e-01 5.6777415342823129e-03
+1159 -6.3511768425176274e-01 -1.6710342373375286e+00 -1.3558863808547679e+00
+1548 1.0663703546545538e+00 5.6359992474719167e-01 -8.6006325586600596e-01
+2212 3.8672463875513796e-01 -9.8104141360448982e-01 -1.2163286037116476e+00
+1651 -7.3915693496079604e-01 3.8868198314014984e-01 1.1247625528087173e+00
+257 -1.4289307616289566e+00 9.9450748959948820e-01 1.8487438141197743e+00
+95 5.9692027495452327e-01 -6.7267174211880398e-01 7.0750726882328707e-01
+218 3.5071708634888354e-01 -2.3895515901369491e-01 -1.3906923862142977e+00
+2894 5.3602164042556466e-01 -8.4575096087583768e-01 1.0670326422858405e+00
+1865 9.0852008942427742e-01 7.7849458121360771e-01 -2.4379136077337052e-01
+2718 1.4575532746802187e+00 9.4597702472560252e-01 -1.1283522311363623e+00
+797 8.2940263782156376e-01 -4.2179191413295680e-01 6.8255546964844302e-02
+2040 -3.9880501876232671e-01 4.0928247735736573e-01 7.6901452028950767e-01
+2954 -7.2503890954182457e-02 4.3334193202886628e-01 -4.1430727927996103e-01
+2933 3.9156094871475394e-01 -8.7148731982315542e-01 3.4432757927388541e-01
+1528 -6.5717746715399361e-01 7.0633092067820935e-01 8.3805674458113999e-01
+183 6.8419890055495070e-01 7.8409170914924542e-01 1.0952292146411906e+00
+2167 -1.6357341631812123e+00 -7.0046044247598704e-01 1.1560195120710230e+00
+2191 -6.0413053048393939e-01 2.2651025542783221e+00 9.5230705567700902e-01
+36 -1.4944796938435962e+00 1.8810569436599067e-01 2.3508279093408938e-01
+1913 -9.1793137679325865e-01 -5.3101198184282739e-01 1.5174243260839331e+00
+1189 -6.9811056878669037e-02 -2.3461223939326184e-01 -1.2599223316319608e+00
+1540 -2.2813617094442015e-01 -1.3670690581057914e+00 4.9780620048119040e-01
+1502 1.5757862280499838e-01 3.7931483987872971e-01 -3.1300221992920735e-01
+441 -2.7679736814583777e-01 2.0878113860075480e+00 -1.3621365677588493e+00
+2878 2.1665314724998774e-02 -1.1506548797973257e+00 9.5519778158108204e-01
+2296 1.4759350186313486e-01 1.1888560372016053e+00 3.3077381248596965e-03
+348 1.1243773285675254e+00 2.2155479846930017e+00 -5.4993745178729861e-02
+769 -8.8638707737499078e-01 9.8503401473847518e-01 4.1148005519897679e-01
+1637 6.4065091820934950e-01 1.6736493053565560e+00 1.1054749804663624e+00
+1928 -6.3740681746209782e-01 3.0089850935099155e-01 -2.7901660920294480e-01
+2841 -2.0069529516031728e+00 9.5854047485613736e-01 -1.1897719770521187e+00
+1435 1.4297655514476322e+00 4.4048536521139825e-01 9.1459966029821049e-01
+1919 -1.2410702881307942e+00 -6.2781581630150496e-01 4.6677260572821830e-02
+2677 -1.9648310894639243e-01 9.7870363246180286e-02 7.4968412005435958e-01
+2741 5.5556659619269433e-01 -1.3642085252283040e+00 -4.4429393850331511e-04
+83 -3.4172713363173318e-01 4.5574809237969305e-04 -7.0119185096939285e-01
+80 6.3343059019614179e-02 -2.2578292514880799e-01 1.0345532876573051e+00
+2835 -2.6370152982914974e-01 1.9312777101336762e-02 5.3149209409318932e-01
+2366 -1.3923829544271396e+00 1.8743100407693647e+00 -5.1462117802717033e-01
+913 -2.0367887234965001e+00 9.5077855130099664e-01 -1.1432330743857351e+00
+288 -1.2297984020749803e-02 3.0265560224162824e-01 -1.4416865475636180e+00
+673 1.4714339296866583e-01 -1.7457958898374439e+00 1.4969857563451821e+00
+1377 -7.6956891564500740e-01 1.2520065793290874e-01 -4.0752460842420861e+00
+1976 1.3288090267727151e+00 5.6125919345456887e-01 -2.3554170378443509e+00
+2825 2.0138837240275498e-01 2.5239352437245854e-01 1.6745969023836589e+00
+2643 2.1777476029950338e-02 5.0870569408371369e-01 -9.4145125993676815e-01
+734 -8.1075387700626195e-02 1.1507823160190905e-01 8.8363183908362597e-01
+325 -8.3856995944773172e-01 -1.0008022699003918e+00 -1.0294218560466719e+00
+1882 7.7922850371344798e-01 2.8935707573943248e-01 1.1544836373861043e+00
+930 5.8495978423246642e-01 5.9516779901701088e-02 -3.4992709331497274e-01
+75 -1.8264661828358726e+00 2.5196211421545929e+00 -3.8688176271667385e-01
+356 8.0630784266268563e-01 -1.3070796473189441e+00 1.0257894102358902e+00
+1076 6.8654270215135338e-01 2.3279322119303006e-01 -5.2951812525502040e-01
+2557 -5.9960586270939020e-01 -6.8547380933628430e-02 -1.8490773205605480e+00
+905 -4.7296551665091846e-01 1.0032791058542578e+00 -3.4105381029638138e-01
+2955 -6.6994201445748303e-01 -7.1286506154387064e-01 2.4643958593322343e-01
+2764 2.7162926879290228e-01 -9.3027052711051439e-02 1.0972449788076395e+00
+735 1.0689381817628194e+00 -2.2432324288828687e-01 3.3638637705153379e-01
+2511 -1.1314285501448789e+00 1.3952515059011655e-01 -2.0964116770779129e-01
+834 1.8529271712537312e-01 -9.6871990433558097e-01 1.6339454790750182e-01
+2104 -8.0304627244495930e-01 -6.4657108729002588e-01 4.4266278215969218e-01
+2468 -1.2933864812750322e+00 -7.0432490234800471e-02 -8.6585705678204328e-01
+985 2.5991124942386965e+00 8.4423664467567028e-01 -1.2833375103245701e+00
+1878 6.3824195584862520e-01 -3.1362749137714668e-01 5.3421786307992902e-01
+463 -1.0559013181253090e+00 1.2117246001147537e+00 9.3388171043345880e-01
+2769 4.6437420539195140e-01 5.0803387449296321e-02 -3.4604844444933519e-01
+31 1.0016784912036216e+00 1.1549990948110094e+00 -5.2467835384421269e-01
+817 1.4524807011224436e-01 4.8362791998608240e-01 5.0232205473468416e-01
+2765 -2.8697886882792236e+00 1.0348209750161532e+00 -1.2431893415170987e+00
+399 5.2614784900302747e-01 1.5131342430768233e+00 7.0059204825423438e-01
+537 -2.7295019514486363e-01 -7.4577814889290017e-01 -9.1867424758838367e-01
+1454 -9.8130110709162532e-01 -8.7676031746525440e-01 -8.5280800370092669e-01
+1513 7.0653113466708650e-01 -6.8414420091616734e-01 3.8173645298707060e-01
+1957 -7.5189660250338863e-01 5.3334648143268726e-01 5.1614375532531642e-01
+1801 -4.1653824297997305e-01 -1.4876750510777998e+00 7.7310041057939560e-01
+765 7.2905112068329470e-01 -1.3216287005214853e+00 2.2647425847727347e+00
+2081 -3.7869883779325253e-01 -2.4281366092605963e-01 3.6627122399246687e-01
+2433 -2.0166433729886227e-01 -8.8282134958476377e-01 2.8161844538778541e-01
+2340 -6.3263687001905600e-01 1.5795658904646559e+00 1.0060565827212857e+00
+2948 1.3024120733376332e-01 -1.2460326509607424e+00 2.5591170594488610e-01
+2542 2.0183135812803359e+00 -2.1290474138198214e+00 3.3141508432690264e-01
+357 1.3825477946057201e+00 -1.6405754630386016e+00 2.4745873027212198e-01
+427 5.9852702622016152e-01 -1.0349248313983970e+00 2.0399587187870255e-01
+1219 -5.0200085857145749e-01 -2.3268632797379292e+00 1.0755705098893378e+00
+1598 -8.5920451809958132e-01 -1.6678892096518949e+00 -4.8539840587195032e-01
+740 3.2406392098413694e-01 -9.1289041926890846e-01 9.3191798457216601e-01
+2276 -1.4327465917035922e+00 1.1878757480452644e+00 -9.5663840008488554e-01
+2166 -9.1693190031040442e-02 -1.8304862900708549e-01 -2.6817574829036315e+00
+770 5.5482146828404533e-01 2.8853953750118022e-01 -7.0738129456794574e-01
+841 -1.0334304909064065e+00 1.2272292904985833e-01 1.7942355591210155e+00
+2597 -4.5293123879323494e-01 1.3614379486007528e+00 1.2762288187136586e-01
+72 -3.0123412480321559e+00 4.2927341361482280e-01 6.7701873094322162e-01
+315 1.0574813977868582e+00 -3.8145646058367261e-02 -1.3524078105663058e+00
+1901 -6.6742615478603240e-01 -3.7700721131697812e-01 1.1236821388832132e+00
+1055 2.2396219308464255e-01 3.0554924670231454e-01 2.7236917662530191e-01
+849 1.8611080406702514e+00 1.5468901761920559e+00 -1.1295902913280522e+00
+757 -2.5563219647170687e-01 6.0321150276107893e-01 6.1736871995533449e-01
+1521 -3.6194078805724195e-01 -8.0198722485012253e-01 -4.0649309738174999e-01
+1054 7.9304051179548890e-02 -6.2516328190569126e-01 7.3605500576585925e-01
+2570 6.0302978320230427e-01 -4.9850698409585120e-01 1.2242152310473255e+00
+2375 3.9993902265007764e-01 5.1317794381075754e-02 -7.5425730390472490e-01
+1153 -1.1304415849227230e+00 -3.0171722653590871e-01 4.7016399195562475e-01
+2803 2.1353640733774819e+00 7.1789174562869662e-01 1.2030187789197175e-01
+2927 -7.6447855698171341e-01 -1.6974033054545548e+00 3.5338068774739351e-01
+2162 1.2995267998971809e+00 -3.2306925900499733e-01 6.1040471778428584e-01
+1526 -1.7677876135988622e+00 2.6339596866613468e-01 -1.3705775060416159e+00
+2671 -3.0170204114494408e+00 1.3658105885356009e+00 3.6824873846768846e-01
+1523 1.4407011327421750e+00 1.0941771571232739e+00 -4.8146177366300341e-01
+2628 6.1722634989828551e-01 -2.6797887986297614e-01 8.0736805183558547e-01
+2826 7.9692899015293195e-01 1.1092124968171320e-01 1.1040011053438614e+00
+146 1.5623288351173634e+00 -1.0596355648839741e+00 6.8398072550099354e-01
+256 -2.5517935865646901e-01 -1.1068492000991741e+00 -8.9336970120768300e-02
+455 -1.1395138178936655e+00 -3.1835789928883124e-01 -1.3535416061009047e+00
+1989 7.9451900371610673e-01 3.1285132947954614e-01 1.3171575349678564e+00
+1632 8.3673650153970047e-01 -9.1213243945482236e-01 2.4177361662616406e+00
+2352 -2.0482661923807632e-01 -3.8931169880180772e-01 -1.3610369450140627e-01
+2702 -3.6172285038096291e-01 3.7747261102157587e-01 -6.9589733809056142e-01
+2576 -1.4882635186599480e-01 -1.2446724074105806e+00 5.3755985633221343e-03
+1707 -9.1827695032689993e-01 -5.4635696699393921e-01 -1.6568236687911870e+00
+1635 -1.2194083755390621e+00 -5.1290892485927797e-01 5.0262010847090011e-01
+2527 -1.5584673967809624e+00 9.7235655958748723e-01 2.3937297725126512e+00
+1477 -3.9953399166410253e-01 -9.8721223169308880e-01 -1.4952605463228363e+00
+1768 -3.4896805920499974e-01 -1.2224260394605773e+00 5.3209155452889678e-01
+2656 -1.0970820280039792e+00 -1.7668144486362607e+00 -2.2413357168210251e+00
+764 -1.2293493791151819e+00 1.1158811376882816e+00 3.0067043008985478e-01
+909 -2.3080243333968534e-01 -1.4398901673057147e+00 -1.5834720736781349e+00
+2339 -3.7307101995073755e-02 3.6499467137568481e-01 -2.6530411875011006e-01
+1399 1.0378985033157302e+00 8.3203558601312444e-01 -1.2047056835206493e+00
+1446 1.1491958642264382e+00 -3.6116271217614415e-01 1.5996850894938399e+00
+50 8.5221888471117280e-03 -6.7398454176769351e-01 -1.9269368822682404e+00
+552 1.6522090132661953e+00 9.3135156613166903e-01 8.0118448624748539e-01
+2999 -8.2201016394998633e-02 5.6645037299371304e-01 1.3295209860243038e+00
+2924 6.2716240278483781e-01 -5.0008954164954256e-01 -2.8526607320985081e-01
+236 -2.9792244342769081e-01 1.9613454101385774e-01 2.5250454606583622e-01
+1898 -1.2155512013201167e-01 -5.3862878159845951e-01 -1.6332486915493476e+00
+1893 -1.6574941447366534e+00 1.4519286919234442e+00 6.6255867028198745e-01
+2899 -1.9341476229181722e+00 3.9387977347634329e-01 -8.0947187305072288e-01
+791 7.2965013739607743e-01 1.0459650830862415e+00 1.6918317900454833e+00
+2897 -1.7002104545387497e-01 -1.4426324530047647e+00 -1.6687596919858064e-01
+1148 1.7939501929106960e+00 -1.8792860496307656e-03 -1.8793608240890095e-01
+2283 -3.5464887558649755e-01 -3.1827848455593699e-01 -1.9455245704466200e+00
+1349 -2.4053527871945535e-01 1.1320436592884449e+00 2.8958174152337085e-01
+2453 -3.1464733095152625e-01 1.7363704131172999e+00 -1.2082537293942672e+00
+866 -1.1771375763260756e+00 1.8301746301851534e+00 8.0933695900425184e-01
+887 -1.1330205113594678e-01 6.0559299204994721e-01 7.4218929174211012e-01
+258 -4.9726559716559282e-01 9.3050755700688459e-01 -5.4433688270071234e-01
+768 -1.7734251850781269e+00 8.3250204686198948e-01 -6.3657990400601339e-01
+1565 -6.8757051573078809e-01 1.8867797563135946e+00 2.3061778861562340e-01
+1317 -1.0041392247487320e+00 -1.4100486518449915e-01 -1.5945125076137592e+00
+1782 -1.8130853808711003e-01 -6.0871191608637298e-01 -2.5702871777341152e-01
+2250 -6.8811733052654062e-02 6.9748039140809004e-01 -7.9411698905034955e-01
+2089 -1.3393648505116279e-01 -1.2636255758988668e+00 -2.6571032336119416e-01
+403 1.1567008404641734e+00 -4.2925118566296244e-01 -1.5022347422819332e-01
+1968 -1.0726048411927009e+00 9.5465358085201868e-01 -4.1072787945106010e-01
+109 6.5730051164240488e-01 3.0846161183914111e-01 8.1067979233575949e-01
+1814 -5.9459051292158005e-02 6.7412234965063017e-02 6.2931645415212012e-01
+698 9.7638708776681837e-01 -1.1702411557369932e+00 -1.6331162747535546e+00
+2384 1.4985823764750961e+00 2.4655643658360268e-01 3.5969015646625180e-01
+2880 4.1622629987816839e-01 -8.9564128006098354e-01 -8.4664856892179036e-02
+828 1.9448610235709524e-01 -4.9758572283080865e-01 -1.2061280590666408e+00
+2444 -1.3870159192532678e+00 -1.0784434257563542e+00 -5.3589617297371361e-01
+1571 7.7636993559530731e-01 6.7135820267705104e-01 -1.9302044157807787e+00
+2693 -1.1853080938616078e+00 1.2156905429516778e+00 -2.5579669175803932e-01
+2436 -1.2022847184769119e+00 1.1234618403125174e+00 -2.9393717810541242e-01
+1341 -7.8823216362104631e-01 -1.0720257031112951e-01 -1.5036154791099363e-02
+242 8.9487114956256630e-01 8.9544720665285860e-01 -1.0201733042059875e+00
+2594 -1.3234210481347566e+00 2.9822421484468498e-01 8.7082120847678302e-01
+713 1.4087875327158732e+00 -5.1942651133594175e-01 -9.2382901867549583e-01
+1641 -6.3194321338642934e-01 1.2098786564504684e-01 9.4272531999732501e-01
+129 3.4321425621403147e-02 -5.3079080222071107e-01 6.7231705490978433e-01
+1030 -5.6083014551694765e-01 4.4560333256377219e-02 -7.1726139144581080e-01
+2952 -3.4492328601185540e-01 -1.3804995117811216e+00 -2.7360909318160720e-01
+1965 2.2543723306718016e-01 -7.3541419020370924e-02 4.2535876290893088e-01
+1925 -1.0977219743756448e+00 -5.3076994306604997e-01 -1.4621651088390388e+00
+2108 1.2034745999469521e+00 -7.3558908648623911e-01 1.5476743555301081e-01
+911 1.1463217832214548e-01 -1.1268733182101518e+00 -1.0586984946598696e+00
+895 4.6517612262935426e-01 -1.5251939854239185e+00 -2.2115534376838120e-01
+859 -8.6770476454009315e-02 -5.2277834747366736e-01 7.0344712215833205e-01
+2591 1.5249634393146598e+00 2.9193349031461086e-01 -7.7868612877549814e-01
+957 9.2606554809496300e-01 5.1603947498982361e-01 -9.1717786173790150e-01
+573 -8.6432143904908820e-01 -1.0861900326388834e+00 -4.2083658981012684e-01
+1747 -1.4347972056004528e-02 -1.6644261387672847e+00 2.0647467852060051e+00
+2174 -9.2616724117018445e-01 2.9827068095415271e-02 3.7145932834511969e-01
+2058 -1.8467639389187855e+00 1.2939922599838671e-01 1.2617050072395359e+00
+2348 5.9351430069770605e-01 -7.8740451781919307e-01 8.2871058280164955e-01
+693 -6.2160252684257311e-01 1.5627160182915964e-01 1.0983771952715946e+00
+1483 1.4978752735939940e-01 9.8394458329835288e-02 4.7284419211060225e-01
+2829 3.1928996626756132e+00 2.1596642301886010e-01 -9.8495436855133567e-01
+2410 1.0890686326475899e-01 -1.8757686155414433e+00 9.1012364513783722e-02
+2071 -1.4964605633342924e+00 -1.5933586699272007e+00 3.6016486667983316e-01
+2609 6.0948760159993753e-01 4.2533215776364475e-01 1.1922732812579688e+00
+1522 1.2514876265941210e+00 4.5865546670046820e-01 7.5275994753918218e-01
+976 1.0492962628446734e+00 -9.7093823433680559e-01 1.8307463993932600e+00
+132 -1.5031252774584428e-01 3.8341146799461512e-01 -2.0129930131649817e-01
+2657 6.1672690545702769e-01 -1.2145301923484837e+00 8.0424711119132797e-03
+1624 -4.2304021564036132e-01 2.0984510941536916e-02 -9.9620096980617678e-01
+169 1.1402678204471111e+00 -1.1454736664823668e+00 -5.6634613805509215e-01
+237 1.2690508256022162e-01 -6.8154246408194452e-01 -1.7732700519510676e+00
+2347 -1.1329744900051701e+00 2.2035053608807792e-01 7.7873382652885970e-01
+402 -4.6995283781706776e-01 2.7653169131907129e-01 -1.9190802951245889e+00
+1023 5.5023197304879801e-01 -5.8813740345039889e-01 -8.7301906783109429e-01
+1563 -6.5066299299020836e-01 4.1980679769458740e-01 -1.7149486632372657e+00
+159 8.8382934055531093e-01 -2.0811675258545073e+00 1.5132889946753933e-01
+1798 1.6053847822821345e+00 1.3928413027025950e+00 3.1336557948997718e-01
+1719 7.7647134969909715e-01 1.6913497813963621e-01 4.4706559180437105e-01
+1639 5.0827869259038061e-01 8.7639621361324416e-01 -8.8728473949718656e-01
+2506 -1.7481831129859360e-01 -5.5369291539147381e-01 4.4972188538406560e-01
+1417 -1.8110224984669065e-01 -2.4873900274369038e+00 -4.1973269166158511e-01
+1279 -8.0900035805793025e-01 9.8420459906992108e-01 1.6996986460645344e-01
+885 -2.1217848405894544e+00 -9.4412506460498036e-02 4.4953383549945802e-01
+126 3.2541144933158384e+00 1.3016475254016417e+00 7.7546025808683072e-01
+778 -1.7665628047481723e+00 1.6653273922068368e-01 -1.9106773420423262e+00
+1811 -1.5686581173080334e+00 4.7640332719040740e-01 -1.3210251241780933e+00
+1784 7.4499643703348950e-01 6.3394118660064114e-01 -1.1134198689857486e+00
+2493 3.3623710717764577e-01 -7.1422613580578020e-01 3.5962408392002509e-01
+2704 -1.2127650091568640e-01 -7.9410725589646824e-01 1.4959949824387344e+00
+1456 -1.7760919116613760e+00 3.6129102657297629e-02 -8.7870398152316453e-01
+1942 7.1010470294988615e-01 7.7814555954630560e-01 -1.1995271778297114e+00
+2428 -1.2020688049516073e+00 -5.0712880735542265e-01 -6.6086646286953987e-01
+2670 -7.1927259560130674e-01 1.1200773696591764e+00 3.2424187320741487e+00
+1834 4.8511783941984343e-01 -1.0413438158370736e+00 2.4964385660870367e-01
+1039 -2.1663251850064030e-01 -4.2171167179034674e-01 1.3022282426623326e+00
+467 8.4086889455988800e-01 -1.3165187746412424e-01 4.3432695611225630e-01
+206 -1.5984727985432463e+00 1.0206088046377731e-01 -1.5911308676468970e-02
+1489 -6.1789858485445837e-01 -4.7217491617723595e-01 -3.4860294065138570e-01
+1003 -1.7294449510750218e+00 -4.5681303377117605e-01 7.6981568882419624e-02
+2278 1.0377063158215443e+00 9.4811158589343991e-01 -6.1910753073946090e-01
+2077 4.4851849225585083e-01 -8.3965979548022374e-01 7.8631077264781218e-02
+952 2.4136971844525545e+00 -8.6419409073453812e-01 -7.7706177882574767e-01
+201 1.4199307475618834e+00 3.3827753638849045e-01 7.6158747647001346e-01
+2568 -4.8756405349198800e-01 4.5299453266390566e-02 -5.4776054459126167e-01
+384 -1.2248064971795367e+00 -2.2193267326235069e-01 -6.7654812503055939e-01
+2236 -1.3963753847270695e+00 -9.5501926540716667e-02 2.1127185764443310e+00
+419 3.4939083201045462e-01 2.1209112101374679e+00 2.9394925804908101e-01
+1025 8.3773538828781385e-02 8.8704950515486936e-01 -4.9781138439136446e-01
+2669 -1.9105913112872199e+00 1.0316942104856171e-01 3.3081577991537808e-01
+630 -3.9060319063166005e-01 3.4059082011738478e-01 9.4115676296071182e-01
+2355 1.7399548050504634e+00 -1.7001421479715706e-01 -1.0002999483531735e-01
+483 -7.3980178635780058e-01 -1.1111295660424301e+00 5.4885851543039887e-01
+2928 -3.3808696872505645e-01 1.0156882813451340e-02 -1.2221158341287848e+00
+2424 -2.5432322056200496e+00 1.1585886672725576e+00 -4.6726008295732668e-01
+569 -8.4883347977432355e-01 7.2887715745612613e-01 -2.0063334344333361e+00
+520 -4.3391890648554760e-01 2.0334836615612257e+00 -3.7292409030117257e-01
+1807 8.0098002668810353e-01 9.0540962469230246e-01 -1.0024599039618578e+00
+377 2.7372677523967776e-01 -4.9073775852674673e-01 -2.0091569741585316e+00
+1765 -1.5256462393167516e+00 -1.5312151316427552e-02 1.4378844733623881e+00
+2308 -1.5728303943717943e+00 1.4330209812658337e+00 -1.5354011013936859e+00
+1199 4.2798974017369124e-01 -2.0151717436798394e-01 -8.5169582426845847e-01
+55 8.4862062775622937e-01 1.0849412445755155e-01 -1.0184975978239719e-01
+1089 1.1054585979352152e-01 -2.5310006679671337e+00 1.3836717418606030e+00
+381 7.9054345798371936e-02 1.2573493952830430e+00 -6.3032723952568515e-01
+2637 -8.8185682949709565e-01 1.3056943025184862e+00 1.9762628673915734e+00
+1314 -2.8245984463782886e-01 -1.8768596217583638e-01 -1.2146432707709240e+00
+896 1.5359777515181788e-01 -1.1148542207646421e+00 9.1654800618188115e-01
+2476 -1.7723416938639347e-01 1.0520462587508814e+00 7.8757737831871358e-02
+1050 5.8666569282218484e-01 -4.5729583073183006e-02 -5.2021046385041858e-01
+1835 -1.5252093769997068e+00 1.0321581007505320e-01 2.7629056549093756e-02
+739 -2.0559281427762074e-01 5.7838294158274162e-01 4.0696714055161082e-01
+2551 -6.6050477743354685e-01 -2.3442107911466500e-01 -6.7022327574042598e-03
+2066 1.4794678673886918e+00 -6.2621798274430940e-01 -4.5558445286292874e-02
+2474 2.4684524954451215e-01 -3.5122672169823066e-01 1.2546673190488060e+00
+723 -2.7368359566762718e-01 9.5652304914821662e-01 5.8087843519237214e-01
+2110 -2.5333577822980685e-01 2.9516746128825899e-01 -8.5012472053039856e-01
+374 9.0011312603896970e-02 1.8878834596711486e-01 1.9096750941710148e+00
+2388 1.1475947247478817e+00 -6.5082137207025637e-01 -7.9587563949928442e-02
+1662 -2.8413911716279994e-01 1.3862891282071771e-01 -2.6438852521956435e-01
+2186 1.0680174061459922e+00 -1.0607979223011097e+00 8.1279756443411444e-01
+11 -1.3301027610767852e-01 5.6067751048973269e-02 -2.4167604176126063e+00
+1413 -5.1858444576065066e-01 1.5592111193671718e+00 6.4063865439593848e-01
+2884 2.1551720004327697e+00 1.0544660748159369e+00 7.9183394001355667e-01
+163 4.7499308911883348e-01 8.1266667465430886e-01 9.4382705285446200e-01
+2075 -2.0841611478317140e-01 5.1606161896627434e-01 -7.2379844427739892e-01
+22 -3.8563453668775255e-01 1.6213983523067172e+00 8.5419937200948304e-01
+473 -2.2489879236938433e+00 6.0493993823120351e-01 -8.8033241855191036e-01
+2317 -6.8789855137811995e-01 -2.4744152174664330e-01 8.3143432666912997e-01
+691 6.0402427972765582e-01 -8.2451571696309789e-03 8.0935303379244694e-01
+890 1.2810827184890194e+00 -1.6449770790958069e+00 -1.1453944173411662e-01
+601 -3.1348878354595000e-01 -7.1071003127549826e-02 5.0861865758320945e-01
+966 -8.2889597064972564e-01 -6.8266364472018526e-01 -2.3124959682699800e-02
+1781 1.8918370567058973e-01 -7.9240251543409401e-01 -4.6912280157963310e-01
+459 -1.3228192349690302e+00 2.5173133148637311e-01 -5.6958040483347142e-02
+544 -7.6540371741941127e-01 3.8061682963443744e-01 -5.1076114315499677e-01
+1531 8.4535726900698283e-01 -7.3735424420762169e-02 -1.8629554786119243e-01
+2682 9.9423163288911015e-03 -5.1554261998731721e-01 -9.4083763808902254e-01
+277 1.0595364976209527e+00 -3.2536970784744745e-01 -1.2285519029424183e+00
+1861 -3.0586995837720652e+00 -1.9389642315569061e-01 -1.2608459278550230e+00
+2107 2.4348408530386516e+00 1.2168119331790506e-01 7.7477716527720331e-01
+2461 -2.1039520576849995e+00 -1.2297734366579038e+00 -1.2152037398186226e+00
+1144 9.9447941753244173e-01 -9.6103891657840457e-01 -8.9027631749015090e-01
+2962 1.0666315693386017e+00 1.4427690762682382e-01 4.9929555068952836e-01
+1703 -4.8688906087236611e-01 -2.4774418151891751e+00 -1.2798655815132758e+00
+1105 -1.8820316031795064e+00 -9.1449791693122354e-02 1.5023380706494200e+00
+2792 -7.2535355655226952e-01 6.4664457160802624e-01 -1.2532624466613720e+00
+2668 1.9301530501418351e+00 2.0325570920509609e-01 1.6375052230310065e+00
+87 -2.9423476415940661e-02 -1.3839400005759939e+00 2.7534931329854156e-01
+2018 -1.9594446327401198e+00 -7.8415377199274061e-01 4.7474943690133903e-01
+624 -7.3186750695187847e-02 -1.1690327343035365e+00 -9.0533629075447808e-01
+195 -8.4064542356009031e-01 2.0217017101080992e+00 -3.5549611140592896e-01
+396 -1.5184599832977306e+00 3.5008182698407242e-01 7.9609898395211676e-01
+997 -2.1048537195049982e-01 -4.2058697865150463e-01 2.2008486727459249e+00
+1780 -4.8556325159584290e-01 -9.0006367655154840e-01 7.2930141098436374e-01
+1755 7.0854941819094575e-03 1.9975095164262782e+00 1.7357378439655058e+00
+52 1.0764523690920541e-01 -6.4754764229031647e-02 8.6479961469269329e-01
+30 -1.0983722869750834e-01 -1.0054727904128939e+00 -1.5265196764847253e+00
+848 1.1963269470078650e+00 1.0407744717303424e+00 -1.4677614144150453e+00
+2652 1.6611744424851058e+00 1.2300725355272710e+00 3.7431917207860439e-02
+2065 5.2117364760499463e-01 1.4421384857364936e+00 -4.0794431644719215e-01
+1075 4.1495125387628295e-01 -1.2744898612184616e+00 -1.2152663290624519e-01
+2558 -1.6154293312538159e-01 -1.4434516677652585e+00 2.6309067456899621e-01
+2534 -7.3481901341082678e-01 -6.8963806423667795e-01 9.4048420816877532e-01
+2729 1.2694513941498811e+00 1.2288901825769261e+00 -7.5402513500098067e-01
+2158 1.0319778130054497e-02 2.7949682635523870e-01 1.7188102737335553e+00
+2888 6.5962067331117513e-01 -2.7548519848231146e-01 -1.2339176050888094e+00
+2033 -6.0029574630941232e-02 2.4331946168516555e-01 -2.3828861039607158e-01
+204 8.5134272702448421e-01 1.1808826079915289e+00 -1.2516850147688716e+00
+156 -2.1672379558066064e+00 1.2721829026623130e-01 -1.6458774707305983e+00
+337 4.4079368319297374e-01 -1.9407256281568053e-01 -9.3713307530668999e-01
+684 1.0711202226965728e+00 -6.2594870952707726e-01 -8.1779252330029445e-02
+2994 -2.8760453467357343e+00 8.9809314649597294e-01 2.1199317062755010e+00
+510 1.0410743350499150e+00 -6.6838291988524323e-01 -1.4137452125799987e+00
+1299 -7.6280581593990793e-01 9.3206474019944330e-01 -7.8628650540375467e-01
+2447 1.0029336052660251e-01 1.6101579957700314e+00 -1.1368599145434197e+00
+2446 1.0849304782746125e+00 -2.1968211468682872e-01 1.8429329955487186e+00
+2722 6.6228501981957877e-01 -1.3284145244249395e+00 -1.1457791274551175e+00
+668 1.5168921042735681e-01 9.9966476833591680e-02 -1.8447754651913173e+00
+1101 -4.6223795846339805e-01 -1.1273116229819202e+00 -9.3643927384005932e-01
+2680 -1.6783220292533920e+00 -3.0784480267047276e-02 1.6770323381868157e+00
+2177 2.4600594586441515e-01 -1.4560900909472370e+00 -3.3287702370339989e-01
+2523 -2.5066833301709779e-01 -2.0088227914751550e-01 -5.4763036369858342e-01
+932 2.3256039664362902e+00 -1.3339931753357909e-01 1.2714450442256919e+00
+1468 3.5750889675561298e-01 1.3629918130509560e+00 2.0137236150153742e-01
+433 -2.0208600962847664e-01 3.0521490999384954e-01 -3.0494066179377211e-01
+1533 3.4271757811725734e-01 1.1434850664214555e+00 7.2439844190738545e-01
+2853 8.4424125335242928e-01 9.5803302138763202e-01 1.3017093261922755e-01
+1839 1.6221198146540383e+00 1.1157859655599267e+00 2.4455078579103740e-01
+1095 -1.3948459554725270e+00 1.6476310803439467e+00 -4.1821052918903595e-01
+338 -8.9221402859992138e-01 -7.1545171566348154e-01 -7.8784218321094124e-01
+780 2.6855728920296786e+00 2.1995982757801683e-01 -1.6394956938787333e+00
+93 1.3511660043878626e-01 2.7327437870161159e-01 -5.8861749084464654e-01
+1777 1.6867172035983424e-01 6.1262551194999626e-01 -1.1860814700731508e+00
+148 7.8376328346683877e-01 1.3640422794852152e+00 -1.5788833678289815e-01
+25 1.4975381276659598e+00 1.6736456631170007e+00 1.3322922214353647e+00
+910 5.8435547666417809e-01 1.0258493721979496e+00 -1.7739560017926397e+00
+2868 -3.3810573558453294e-02 -8.2783898697676650e-01 -8.9835084837100765e-01
+1575 9.5705338328189737e-01 -3.4823518474383186e-01 2.5391595685779489e-01
+1140 -8.0985386635996803e-01 -6.3645178198319974e-01 -1.5653175408301618e+00
+1366 8.4690983099429828e-01 1.5173891756232596e+00 7.1893429561874722e-01
+2567 -7.7942072598460410e-01 1.0697125254985181e-01 4.8678624792785952e-02
+1503 -5.9450028351859974e-01 -2.8240247479882441e-01 5.6590733166804164e-01
+1776 -3.4646960926579207e-02 -1.5206016464692156e+00 -2.4489700343173287e-01
+2459 -9.5427295449997340e-02 4.5894968764284405e-01 1.3513598764111507e+00
+2219 1.3676927543240942e+00 5.0997569399800236e-01 -7.1482025749943934e-01
+2016 1.1522440441930586e+00 4.4413028149972700e-01 -2.5164162877812973e-01
+1741 1.6596499525645270e+00 -1.8865517268173004e-01 4.4457295102903427e-01
+471 6.7967389928812894e-01 1.4904521256011233e-01 -4.0069467590401026e-01
+2441 1.2051052705044878e+00 2.5669389324286080e+00 1.0087932266910964e+00
+1453 1.3241255354874151e-01 1.2130854060733973e+00 4.5120949108419262e-01
+413 2.1100235216073222e+00 2.1610349489157832e-01 1.0523389645546448e-01
+2251 -2.2183077911129616e+00 -1.3914638514914113e+00 -2.3883991420181201e+00
+1096 1.1876154483301866e-01 -6.9860099650044472e-01 -8.4415078116540965e-01
+2318 -1.5973330364946476e+00 -2.0631714159195114e+00 -1.0771282527774788e+00
+666 -5.9702661809933610e-01 -7.2896981911857117e-01 1.0003602889125336e+00
+2359 -4.9503237872013844e-01 -1.0682086265104846e+00 -4.6667037352324570e-01
+2218 3.2452868227886339e-01 -7.9423949346980538e-01 -5.8779250681839357e-01
+2921 -5.9650189492102113e-01 -6.1119834679692786e-01 -3.7981370383964763e-02
+2603 1.4402832103788061e+00 -8.3594034350433455e-01 4.8865486235289168e-01
+1844 -4.7694488922792999e-01 -1.2534096134603450e+00 1.6791596354674041e+00
+322 8.4825593536090926e-01 -1.6184411336173948e-01 -1.3479782915354064e+00
+1535 -4.5843262766290499e-01 -1.5457087506057143e+00 -6.9085094238998490e-01
+2870 -1.8587890517680805e+00 -9.3918158068761226e-01 1.0329243005995489e-01
+819 2.5636602993684465e-01 1.8916962495342640e+00 -1.6438776729048332e-01
+2161 1.1933564305915836e+00 9.4014375096287428e-01 1.0469871350491144e-01
+1601 -8.0634596250491275e-01 -1.0105448868322466e+00 6.5884023265427971e-01
+749 9.7920188559965787e-02 1.8217634353663801e+00 -1.0339993673748757e-01
+2756 -5.1367364544994321e-01 -5.0636053720828988e-01 -8.2314187853360676e-01
+916 2.4029810239055149e-01 1.0745632476573637e+00 -1.1705107510917802e-01
+385 1.7494106275962293e+00 -1.8359519319086443e-01 -9.4784529132938902e-02
+2393 2.8360118034094595e-01 -2.5852230397399928e-01 6.0616099358495712e-01
+104 3.3465311172034334e-01 -9.4752142975131992e-01 9.7501170941217108e-01
+1529 -5.5670453506645290e-01 7.1327462956255638e-01 8.7850327577895682e-02
+1301 -1.3000676506400688e+00 -3.1091883833608247e-01 3.3521064384468127e-02
+1334 5.1146691208710915e-01 4.8402798400195046e-01 -6.8048871921984555e-01
+1629 1.9191912504192757e-01 5.4125505362839510e-01 1.5402781016278748e+00
+2269 4.4379067547635459e-02 -1.0733856261482562e+00 -2.3632439984181455e-01
+2026 -6.6082024656951982e-02 -2.3968720560367784e-01 -6.4027544136987058e-01
+2667 -4.8250045485755955e-02 3.1097162325992256e-01 -3.1437191446998108e-01
+1385 3.9631953216442850e-01 1.1442858242307081e+00 7.8822486922158574e-01
+1702 7.7801859805621154e-01 1.4658840679806022e+00 -6.6696249378638606e-02
+1422 -2.6041390418278498e-01 -1.1768107725025532e+00 -8.4972062779361157e-01
+388 1.0361269315712449e+00 1.2385437916085937e+00 -2.8716522747407982e+00
+2837 1.8890785191734011e-01 -7.8414118749336037e-01 -8.7045855443621556e-01
+2284 2.3303283754344156e-01 7.5584537029835541e-01 7.0764849445118141e-02
+2746 1.6728088821811167e+00 -1.9038864558410631e+00 1.8373081263104907e+00
+536 2.5645627234460444e-01 -3.3322131546063510e-01 -5.7857694201194443e-01
+1302 1.0102227431542019e+00 8.4383393960283282e-01 -8.5250834852126167e-01
+993 4.5585543991773636e-01 -2.0287875897712877e+00 -8.1759456248202933e-01
+1848 -7.8333661086268391e-01 -4.5161946510362744e-01 1.7423531855443282e+00
+937 2.9013337212438006e-01 2.5701631298873140e-01 1.2334077185996923e+00
+2390 9.1386146749596342e-01 3.2968208779980612e-01 -2.4309744742785178e-01
+886 -1.3191752278519597e+00 1.0045984633858480e+00 4.6931872252683871e-01
+1633 -1.5135724513235511e+00 1.4747283164259302e+00 1.4841075294065391e+00
+2268 -5.6089954714101020e-01 -1.6128641801758936e+00 1.7562761397481580e-01
+383 -5.6262438150071858e-01 -1.1317347398604685e-01 8.1649141255027802e-01
+956 -6.1667959270857775e-01 -6.3283346420433417e-01 6.6685139537891369e-01
+1192 6.9486799254344145e-01 1.0267417924847797e+00 -1.8269216130502428e-01
+640 7.7507147339639648e-01 -5.5733238113504480e-01 9.0219939639533120e-01
+225 1.1503042133227721e+00 7.7611147013599757e-01 4.8601471827338005e-01
+1087 -1.4984662076198194e-01 -9.3299949068108246e-01 2.1314192239286149e+00
+777 -7.4306548602332834e-01 1.3559106676066490e+00 7.2176193369017128e-01
+168 1.5498293355123449e-01 -7.2763539311532488e-01 -8.8060980776178377e-01
+1369 2.3887557101079175e+00 1.5134752097949065e+00 -1.1403457720565862e+00
+2238 -1.4174013865838657e+00 9.1155972467667035e-01 6.6273266627803196e-01
+1008 -1.8054794585509124e-01 -6.5541147870750993e-03 1.3726018818443253e+00
+1312 -1.2701701975376258e+00 -8.6581765923033696e-02 2.0467299829878134e+00
+1654 7.0880983301306033e-01 1.0736066457026743e+00 -9.1187435264613625e-01
+1876 -3.7315960940232062e-01 1.5811482984463432e-01 4.1160327750655729e-01
+1100 6.9951037874042965e-01 -7.1658407484615039e-01 -6.2721542158944699e-01
+1845 1.7001192294448662e+00 5.8962393870471264e-01 -9.9776480700660330e-01
+2699 1.2752303498713230e-01 -2.1135577589193182e+00 1.3722469182585333e+00
+2185 -1.1431414943131741e+00 -2.8773023833482118e-02 2.0506253709188829e+00
+2157 3.2939553341784578e-01 1.7106737042272750e+00 -8.7756803752455470e-01
+1026 -5.4267423764359286e-02 -1.1878557215449509e-01 2.1179424813283290e+00
+2983 -1.6714416220295467e+00 7.6711816222799523e-01 -4.8700285290402212e-01
+1040 6.2927468515988705e-01 1.7912974173081189e+00 -2.0108556855139140e-01
+991 1.1158225210594765e+00 1.3112746983729056e+00 -1.3859753254159104e+00
+1160 -2.2875800089218075e+00 -4.8922571391954511e-01 -6.7256025188784374e-01
+2091 2.1234444139653427e-01 -1.6844074254632246e+00 1.5550680729801278e-01
+170 7.4843351319947460e-01 4.6006259355736667e-01 9.9739741543988958e-01
+1874 -6.1898349876889736e-01 -8.0745092399841745e-01 3.9699964196111476e-01
+2931 7.5945617659695097e-03 2.6483902132721893e-01 -1.1775888501573790e+00
+2432 -3.1587559412613897e-01 -8.7049454619206668e-01 6.1608214334367029e-01
+2494 1.4574754271347199e+00 -7.2800342424453612e-01 -1.1733825643362885e+00
+2898 -1.2904102982381536e+00 -6.8676417806712786e-01 -2.8492641355840148e-01
+1561 -3.7372618984367734e-01 3.5925223806141127e-01 -1.1905688822509518e-01
+1360 -1.3231714987907015e+00 1.3321188261362202e-01 1.6758190569076423e+00
+1870 -5.2477230129339658e-01 -8.0725104542936199e-01 9.6112874424306649e-01
+2102 -8.1323130638801013e-03 1.0901635966175440e+00 -2.1427168362297815e+00
+431 -3.2237713940052182e-01 -3.1679539370873617e+00 -1.0278948939189975e-01
+1580 -1.8121116726924433e+00 8.3717658515843107e-01 2.5064678023286575e+00
+2727 -5.0929573206815315e-01 1.2695930145208849e+00 -4.0096349245623103e-01
+2043 -4.0633962083521291e-01 1.2344391110431923e+00 -4.8036667728614596e-01
+821 -1.8049052282793965e-01 -1.5328793226362816e+00 1.4411554078446812e-01
+2309 9.3555595678558701e-01 2.5705318953182199e-01 2.9686560154341635e+00
+270 -1.6500772322202670e+00 -8.7207567769233230e-01 4.5157001126830115e-01
+1627 5.6196237057286558e-01 -5.5077217350090446e-01 6.3628370223321995e-01
+1554 1.0855885783576591e+00 2.5225630942766336e-02 -1.0965436222249674e+00
+835 8.1139899654298919e-01 1.7212450206125609e+00 -6.8692965910995918e-01
+1455 -4.0955141242304421e-01 1.9625496108407509e-01 -1.0113625735889782e+00
+1620 -1.0443760868042646e+00 -8.5697810720843515e-01 8.3811047301914376e-01
+106 -6.2231870852645932e-01 4.1846237026197203e-01 3.1362209177615114e-01
+656 1.9052917549952086e-02 8.7410706128105076e-01 -1.3831725305915434e+00
+1681 -8.9458093919893866e-01 -6.6851238336039254e-01 -6.5180147496936125e-01
+1542 -1.2942753599284678e+00 -6.0665227777283136e-02 1.1733449232763347e+00
+2200 1.1348252608576022e-01 1.1802908071650138e+00 -1.2168379908002851e+00
+2516 2.6790038045916098e-01 7.2922231987357600e-01 8.7273668591270365e-02
+1910 8.8151341043302162e-02 -1.2847322385194995e+00 8.9786528030551827e-01
+677 -9.7242652579282529e-01 9.6403395997142233e-02 1.6917262631663768e+00
+853 2.4912012996566393e-01 -5.7418584828856270e-02 7.2413579751795865e-01
+1436 -4.5981059295214710e-01 1.7291468382694346e+00 -3.5520147468863855e-01
+1135 -1.0221472408647758e+00 2.5091211609220312e+00 1.4019342121693845e+00
+1583 8.3891782791957747e-01 5.4242874694297483e-01 -8.5251783307903906e-01
+1243 -2.3951756873875973e-01 -2.3521587228927077e-01 -1.9734497598481487e-01
+528 -1.9104520029375618e+00 -1.6561665161210987e-01 1.0512694411654884e+00
+2098 -1.7670165529516939e+00 -5.9910791256679885e-01 -1.6609474586708108e+00
+2449 1.1792636126090086e+00 4.2122377213899165e-01 1.0091561589744316e+00
+1817 -3.6957635843003950e-01 2.8637473720940565e-01 4.3395434045492032e-01
+2135 -4.2398945866297910e-01 -1.7544198501217818e+00 -1.1041843824989503e-01
+539 -5.2599997054005332e-01 -9.7938973863006273e-01 -8.4018472970850400e-01
+2887 -2.2289899736947656e+00 6.5204951160928365e-02 -1.2155479697098366e+00
+959 1.2560986214304022e+00 7.1487285517833232e-01 -1.4559545108979894e+00
+496 -1.4966734449922181e-01 1.0562364865927387e+00 1.0007661268721133e+00
+1486 -8.5038525961971723e-01 -3.3129345261325938e+00 -1.2114576829745767e+00
+796 4.2643818734886751e-01 -4.8576987331932808e-01 8.9736795353820165e-01
+2280 -2.0425490621246115e-01 1.8181031450308749e-02 5.2208905777059555e-01
+107 -1.8244062431372055e-01 -4.5042552821019666e-01 3.3829769458253595e-01
+595 6.2275559717818618e-01 5.7659794496429884e-01 2.3524153173413592e-01
+2163 1.2886519707682220e-01 -7.0825171027276412e-01 -1.3636505538795189e+00
+641 2.2492256680994271e-01 4.4336511732994860e-01 2.8810016087542267e-01
+2184 -8.3618795723210959e-01 8.6225622758965703e-01 -4.4317676329749583e-01
+1056 -2.5112771881729459e+00 -1.5182687734351012e+00 2.7341267893045584e-01
+342 3.5784616365648486e-01 1.5744765347609407e-01 -4.2055257081767256e-01
+1836 3.0415786883910390e-01 4.0210522835353940e-01 -3.7351232658336464e-01
+1519 -2.6584165792648891e-02 -3.4088409732677416e-01 -1.5523284300022298e+00
+2712 -1.9507176241041518e-01 1.5379400029914314e-01 -5.2057007139014222e-01
+1622 -6.7277944375087140e-01 1.5238412404970070e-01 -6.6251866237103696e-01
+945 8.9693645289614232e-01 -4.2036054777489971e-02 -2.8245327760019334e-01
+63 -7.8365495765350968e-01 -6.2032015459145740e-01 -9.8779355486287701e-01
+2611 2.4355909012818361e-01 -1.3969538878320624e+00 -8.4810937991559698e-02
+1090 3.2819376505660991e-01 1.6568132233630768e+00 -1.0856092085810354e+00
+2790 1.2376048536565663e+00 -1.1642538298685181e+00 6.2195889907878577e-01
+1712 -4.6168614910134370e-01 2.8093382889817353e-01 -8.2739616360802060e-01
+1418 -5.4299620545547134e-01 -3.8797398977184039e-01 2.8983811568653506e-01
+594 -5.3582166830668954e-01 1.7140031265452460e-01 -4.9174686024756542e-01
+2620 1.4854959467410918e+00 8.4511378282516991e-01 4.0643369768260607e-02
+1983 1.3412882959617670e-01 -1.8518236000914094e+00 -1.3697198961051368e-01
+2510 1.0890480917301832e+00 -3.7762561641258652e-01 1.9909310994756362e+00
+311 -1.8073479730063358e-01 1.3929109734536996e-01 -3.7737439001232598e-01
+2057 -1.3183913306706081e+00 7.6201996074255027e-02 -6.4424334117741566e-01
+962 2.0300586597938066e+00 -1.6774888493577284e-01 1.3558637798250648e+00
+978 2.2556969226783313e-01 -1.3198439842057579e+00 9.6911186062376387e-01
+2676 -7.0809334308310889e-01 2.3249228177999323e-01 1.6506066672669489e-01
+555 -9.7921877036691929e-01 1.3224073808239489e+00 1.2263294504047151e+00
+623 -6.9830920103002914e-01 2.5079714827530014e-01 -2.0722708690426574e+00
+2618 5.6625606765538783e-01 -5.8184388165894146e-03 5.2511695194155639e-01
+942 -6.3183696135903533e-01 5.5313502184253693e-01 -1.3173356270753533e+00
+784 1.9821905115604062e+00 -1.0101326695576618e+00 1.0952073092031522e+00
+210 3.3273010947566328e-01 -2.3242165660848801e-01 -3.9418334562879459e-01
+1959 1.1261368540199845e+00 -2.9300343090767478e-01 5.1011465168423265e-01
+804 1.2722366384025827e+00 -8.5586819218138643e-01 2.5495737832067338e+00
+645 -2.0621833282582006e-01 -1.0735876764570107e+00 1.7784804573957986e+00
+500 -8.4080554351248371e-01 -1.3699966039544118e+00 -4.8660247030824583e-01
+951 1.4502139926863464e+00 -2.8617147958781834e+00 5.4063456770374452e-01
+2724 1.5734219157835201e+00 4.8835308947509237e-01 6.0485370649837411e-01
+1063 -1.7460723187396847e+00 9.0313988193951045e-01 -2.0242222734463081e-01
+2437 -1.0019082973336311e+00 5.2307602136890985e-01 9.0299440606275233e-02
+281 -1.2403677604875698e+00 1.3493809081812351e+00 -4.1942902617295852e-01
+1634 1.6326355765687237e+00 -4.1215148696738280e-01 8.7788507647240166e-01
+498 7.0938329919112841e-01 -9.7697476683891971e-01 8.4651816648798756e-02
+1244 2.2342182104964379e+00 2.1455439204920673e-01 -8.1982228603773988e-01
+590 6.2054131918160438e-01 1.1208364388688190e+00 -3.0490089234262124e-01
+1350 -1.4142501023383044e-01 4.4449896761756946e-01 2.4185148746275611e+00
+983 4.4527033729373211e-01 -7.5609317539207743e-01 -1.6376616356114104e-01
+128 -1.9010890350873696e-01 -2.8678904160022950e-01 7.7359088516962479e-02
+2919 2.5626234752029609e-01 -1.4001707735391318e+00 1.2228502038741698e+00
+1774 -9.3147518018170650e-01 -4.1993902509523826e-02 1.0197220404183656e+00
+2985 -2.4815864084682535e-01 -2.5698955607207907e-01 9.8857338505395409e-01
+1877 -4.6396485103431262e-01 8.2315997044456446e-01 2.0337015818897664e-01
+567 -5.2778203627451914e-01 -1.0048758564258948e+00 4.8406786592034123e-02
+721 1.2222311523296097e+00 4.2665585572722287e-01 7.2387231137990182e-01
+1395 1.2622061075377169e+00 8.5482663334368258e-01 -1.1126621338587379e+00
+333 1.9330369598565689e+00 -3.9444001369958281e-01 1.8463697302095035e+00
+1093 -5.4208569309034138e-01 6.5935729393665765e-02 6.4416623086261859e-01
+2279 1.0837273948834465e+00 -1.2480131473905562e+00 -2.6730046794107898e-02
+2522 8.0772967537636187e-01 -1.3370045885210574e-01 -1.3117577779219158e-01
+1947 1.3921548206073140e+00 2.6988764678210937e+00 6.6334582743438297e-01
+1339 4.3771556688908608e-01 3.2188873439914611e-01 3.0753313454429343e-01
+184 1.0576795024451016e+00 -9.0775010712682624e-02 7.8945990628078244e-01
+2721 -8.9498048248034179e-01 1.1988591167686954e-01 1.2420859544989244e+00
+105 2.6368904485780686e+00 -3.5205416617336638e-01 3.1025705562167903e-02
+2673 3.4562651783717840e-02 -8.3993094514673339e-01 1.5102568639389868e-01
+1749 2.0149505602630597e+00 1.2559095460128777e+00 2.3560492012741907e-02
+1143 8.3682311354860273e-01 -5.6395546334604241e-01 9.8485609874991431e-01
+880 1.8681186817590945e-01 3.5204203135507900e-02 2.7449307329492922e-01
+1581 -8.9855457486367085e-01 -1.2545716284634822e+00 -5.5049277268103691e-01
+2011 -2.5155982396817611e-01 -2.9521712792885280e-01 1.3025598452535385e+00
+2008 4.0592662833613091e-01 -5.0316398372413265e-02 -4.1196439680758612e-01
+1735 -5.9467446106335431e-01 -1.4030707160298656e-01 -7.3285605969189316e-02
+1791 1.1861544745757624e+00 1.1825352243301668e-01 -7.6170840726931166e-01
+2201 -8.9559977558476375e-02 -1.2074699430429372e+00 6.9861037192862918e-01
+856 -6.2498730491587662e-01 6.4235087657318224e-01 -7.1035818844238585e-01
+1890 1.8971502192197529e+00 -6.0926284221531912e-01 1.7729013604512606e-01
+366 -9.6186184524423568e-01 2.8890065049604047e-01 9.5903805495304928e-01
+654 -4.1052573698498636e-02 5.5116971726337316e-01 -1.0562878283934421e-01
+622 5.6487480883744834e-01 -1.3350557450421718e-01 -2.7972832684394999e-01
+426 5.7283448366087397e-02 4.6178072547124333e-02 8.5112941317865054e-01
+940 -5.6130731578162463e-01 -1.0384099812721865e+00 2.5553588680488275e+00
+1212 -1.2935326681732713e+00 2.9391688947038421e+00 -6.7854898157921395e-01
+1297 1.5384309870313779e+00 -8.5305711317395616e-01 9.4816784945322918e-01
+2654 4.6365260040712997e-01 1.9936709665407296e-01 8.3682965270346066e-01
+335 9.7725058657171404e-01 4.5755935120176094e-01 -1.8382113156199422e+00
+261 -1.0038324899271628e-01 3.1985675897901839e-01 3.6107265708078701e-01
+2345 -1.2535649810218290e+00 -5.5968867071525286e-01 -2.0311866268928678e+00
+838 8.8292590387356817e-02 5.7401396793423132e-01 -3.1074056952767415e-01
+1383 5.0879025169719438e-01 -1.1067128892520275e+00 5.6380896769143829e-01
+2344 1.0266742174638657e+00 6.0583476079555526e-02 5.6585423601628035e-02
+2160 7.9088377317118785e-01 -5.8160513438165429e-01 2.5441128707927918e-01
+1725 1.2835979521526755e-01 -9.7414217187572416e-01 1.2517959525653113e+00
+2801 5.2496057803152557e-02 -3.9103275085252287e-01 1.3202343836644970e+00
+2639 2.1231152330852129e-01 6.1294789424297091e-01 1.0424889403517834e+00
+2101 -8.5679375309329586e-01 -1.4868798420949978e+00 -1.1084037497895294e+00
+369 -8.2661843744388164e-01 9.4431901243060801e-01 -5.8471908358768110e-01
+78 -4.6718628898000780e-01 -1.6126703264941999e+00 -1.4283470612237184e-02
+1745 -1.2572583750533315e+00 -2.7815523463280711e-01 2.7329804613760045e-01
+518 4.0803046452605418e-01 9.4631098844019809e-02 3.7483938647948661e-01
+480 -1.0110055144127488e+00 -2.5084700896337198e-01 1.8722493304550683e-01
+308 -5.1638923616856780e-01 -4.2118242051944776e-01 -1.5760670463168258e+00
+324 -1.3086509855793165e+00 5.0838190983526821e-02 -1.3790505423259807e+00
+379 -3.1829364340225336e-01 4.1686747757166176e-01 8.3133433701508289e-02
+1348 8.4687411924278300e-01 1.2095801993064805e+00 5.4316258011255325e-01
+846 4.2662817315912038e-01 -2.6883188008892822e-01 -4.2180070606286002e-01
+2822 -2.1947659219587399e+00 1.2549770672390459e-01 5.1384230430988187e-01
+2492 -8.8158833019454652e-01 1.8312691817506543e+00 6.9112977957627897e-01
+614 -1.7917836577234725e-01 -1.0249487105190520e+00 4.2052719994641441e-02
+1120 3.9879028297046343e-01 -1.3177812529120396e+00 -2.8571007580786284e-01
+429 2.0929346164258278e+00 -3.5428274929505116e-01 2.5061334806707847e-01
+2791 8.6272610553033346e-01 1.5509618694706140e+00 4.6639459224927238e-02
+161 -1.8342250798930850e+00 1.3281225245000849e+00 -4.2030324981544676e-01
+879 -2.5280188582367141e-01 1.2508955472378023e+00 -1.5468138112045033e+00
+1480 7.5714122443644816e-01 -5.0052555474701077e-01 9.0214134999618267e-01
+593 -8.0292368304627004e-01 1.5111087204258622e-01 -4.4788882561948595e-01
+2630 1.4003272932843063e+00 5.6277943963895705e-01 1.9411241996381054e-01
+628 7.6823482359579276e-01 -6.0560884735202797e-02 -1.6581427957125143e+00
+2599 -1.8652231507342673e-01 -2.0420440872206638e+00 -3.1325509736060592e-01
+508 -2.9499791576962225e-01 -6.9939254581706822e-01 4.8680569219342823e-01
+478 -2.1106423008303730e+00 -1.0629059723656491e+00 -5.6544036374380668e-01
+1108 -9.3214289607497458e-01 -6.8586753611816542e-01 1.4488161174803740e-02
+1287 -4.3378296475092337e-02 7.3319041324781531e-01 1.3806528026091885e-01
+2206 -1.9594899180037456e-01 -1.6239372866667867e-01 -7.0744545642112500e-01
+306 1.8639300649893233e+00 3.8308120456498618e-01 -8.2562775761388563e-01
+1068 -1.3411107148132149e+00 1.1513211554534475e+00 5.2508512348327285e-01
+1830 -1.3040205463842869e+00 4.4547962367046706e-01 -1.8501661044065437e-01
+1683 -2.2527771545623607e-01 1.7793439146772414e+00 -1.7534153349654222e-01
+2774 7.4223080492962223e-03 1.5054637839115721e+00 6.9917034163939662e-01
+1283 -1.5385848886427687e+00 1.9232689270369725e+00 -3.6000155391695465e-01
+1141 -5.2008159267051157e-01 6.6066836345739044e-01 1.2050790699496818e+00
+297 1.3546626558465038e+00 1.6510152342439495e+00 -1.0500313578554221e+00
+2995 -7.2878829329717998e-01 7.5922633524812821e-01 1.5471415353323215e-01
+111 -3.2482169244284198e-01 -2.4564650695843731e+00 3.0053761321246553e-01
+2975 3.6162153942351560e-01 4.9574273908711686e-01 1.9772146682367244e+00
+2141 -1.4165678008727816e+00 3.0530731901594463e+00 -1.1485653736283277e+00
+291 -3.0102986697905043e-01 2.9523053824884221e-01 1.7117901314407435e-01
+2547 8.1159982054074098e-02 1.2858414619226630e+00 -1.2633851617521349e-01
+1295 1.7114129953618200e+00 -8.8179621205220071e-01 8.1986166670176175e-01
diff --git a/examples/USER/misc/slater/data.after_production_run b/examples/USER/misc/slater/data.after_production_run
new file mode 100644
index 0000000000..bf8529019e
--- /dev/null
+++ b/examples/USER/misc/slater/data.after_production_run
@@ -0,0 +1,6020 @@
+LAMMPS data file via write_data, version 27 Nov 2018, timestep = 110000
+
+3000 atoms
+3 atom types
+
+0.0000000000000000e+00 1.0000000000000000e+01 xlo xhi
+0.0000000000000000e+00 1.0000000000000000e+01 ylo yhi
+0.0000000000000000e+00 1.0000000000000000e+01 zlo zhi
+
+Masses
+
+1 1
+2 1
+3 1
+
+Atoms # charge
+
+19 1 0.0000000000000000e+00 7.5187051494075097e-01 2.0905597410953747e+00 8.9368906594943753e-01 -3 1 7
+1837 1 0.0000000000000000e+00 2.4079878273901700e+00 1.5894674966997427e-01 1.2396627731014433e+00 2 -4 10
+1141 1 0.0000000000000000e+00 1.2771116528188356e-01 2.3349393851557374e+00 3.8518525010489157e-01 6 -1 -5
+2623 1 0.0000000000000000e+00 4.7245255482036119e-01 1.2409407456107373e+00 1.0892325910963225e+00 1 3 5
+399 1 0.0000000000000000e+00 1.6394944064715502e-02 6.7330715219373094e-01 1.0799113438893224e+00 -7 -2 1
+2653 1 0.0000000000000000e+00 9.1449041699715439e-01 2.4017328867827983e+00 1.6887984620553140e+00 -7 6 1
+810 1 0.0000000000000000e+00 9.9951234091558860e-01 1.8876734392365806e+00 2.0196100364556062e+00 0 4 -5
+117 1 0.0000000000000000e+00 1.1575079935429848e+00 1.9967780121776293e+00 5.6418169177971567e-01 4 -1 2
+2626 1 0.0000000000000000e+00 2.0408906200611892e+00 2.2382919483803527e+00 1.6209928365546817e+00 7 4 -2
+2717 1 0.0000000000000000e+00 1.2903504856649775e+00 7.1967766325139948e-01 2.4484072413942592e-01 1 -1 -4
+2238 1 0.0000000000000000e+00 6.9645100926305592e-01 8.4899676722682715e-01 1.3941328283419346e-01 7 -3 -2
+1028 1 0.0000000000000000e+00 5.2099155341071501e-01 1.3569061559627065e+00 1.2071750324463572e-01 -6 2 8
+2244 1 0.0000000000000000e+00 1.6161533817585623e+00 1.7074378127559602e+00 2.2207444205161844e+00 -2 -5 1
+683 1 0.0000000000000000e+00 1.9802085063673878e+00 2.4852855232872857e+00 7.7804544955829780e-01 -5 -1 0
+1708 1 0.0000000000000000e+00 2.1298614169258498e+00 1.4787133063155760e+00 1.6876966221909275e+00 3 2 -1
+106 1 0.0000000000000000e+00 6.3212371930047562e-01 3.1898766193202012e-02 2.3795315466359898e-01 -1 2 4
+244 1 0.0000000000000000e+00 2.1625340773871859e+00 5.6126129890661969e-01 9.3761334571009214e-01 -3 -2 -3
+2343 1 0.0000000000000000e+00 3.4913916986122123e-01 1.1596523641862642e+00 2.0233901337387623e+00 7 2 3
+109 1 0.0000000000000000e+00 1.8877314844179121e+00 7.4014683764236378e-01 4.2958998868816589e-01 3 2 1
+2603 1 0.0000000000000000e+00 3.8963298024559784e-01 1.3362525681927812e-01 2.1507798894101565e-01 5 -1 3
+345 1 0.0000000000000000e+00 1.9102444100822842e+00 1.1881779874699319e+00 9.0226993325569205e-01 -3 2 4
+2812 2 -1.0000000000000000e+00 1.8737361878544001e+00 1.0673094149266005e+00 2.4075845270403344e+00 1 2 -2
+1495 1 0.0000000000000000e+00 1.1375966630630674e+00 2.1316060855521839e-02 1.1877979624755810e+00 0 -1 -1
+489 1 0.0000000000000000e+00 9.1336827046601377e-01 4.2186496611789870e-01 5.8285148762903172e-01 3 -2 3
+1928 1 0.0000000000000000e+00 9.5382100282831905e-01 6.4568172941581692e-01 1.5079537542335133e+00 -3 -2 2
+1878 1 0.0000000000000000e+00 2.1284457143187820e+00 1.5107107725394375e+00 1.0500410580339243e+00 1 3 0
+1542 1 0.0000000000000000e+00 8.6594514545973567e-01 1.7414444463202041e+00 1.5364557056914236e+00 -3 7 -1
+1535 1 0.0000000000000000e+00 1.1535885238218720e-01 1.7650147205198587e+00 1.7649029055684320e+00 2 4 1
+1290 1 0.0000000000000000e+00 9.0633984369853027e-01 1.3096472580961449e+00 1.9710584569613168e+00 1 -1 3
+1443 1 0.0000000000000000e+00 1.9223074928421398e+00 7.3584860308896882e-01 1.5888107588414018e+00 -1 -1 -10
+1530 1 0.0000000000000000e+00 5.8688216662222521e-02 2.1552428429214858e+00 2.0829760402816047e+00 -4 -9 -3
+955 1 0.0000000000000000e+00 2.0151650262440550e+00 1.7359466450410073e+00 2.2516442039294396e-01 1 0 0
+2584 1 0.0000000000000000e+00 1.4720840159523454e+00 2.1243452843481268e+00 1.6890226624883953e-01 4 1 -1
+312 1 0.0000000000000000e+00 2.4539549867870964e+00 3.5913272897497006e-01 1.3726548709575229e-01 5 5 8
+1129 1 0.0000000000000000e+00 1.5496190021132403e+00 2.3002307889408349e+00 1.5735350882722994e+00 -1 -1 5
+1964 1 0.0000000000000000e+00 1.5481243437804775e+00 3.1664670624238778e-01 1.1129360061940878e+00 -1 -4 3
+2923 3 1.0000000000000000e+00 4.4152636030284803e-01 3.4208707349295125e-01 1.7681250659569263e+00 -3 1 7
+1148 1 0.0000000000000000e+00 2.5476572639268685e-01 5.7686711714977623e-01 2.2926212604932972e+00 0 1 0
+738 1 0.0000000000000000e+00 1.9614736620063316e+00 4.9314962525645528e-01 2.1680196061840897e+00 3 7 2
+1523 1 0.0000000000000000e+00 2.1325142436104882e+00 1.1488798033631773e+00 9.4910381816324219e-02 4 -4 0
+2765 1 0.0000000000000000e+00 1.6379002999364247e+00 1.7051094887092322e+00 1.1993620115215609e+00 3 5 5
+1696 1 0.0000000000000000e+00 1.5527909429831608e+00 1.6654077362540770e-01 2.1500337883657155e+00 7 -2 1
+1359 1 0.0000000000000000e+00 7.8277452101307432e-03 1.7603522238062537e+00 7.5289767387463769e-01 -3 4 6
+1024 1 0.0000000000000000e+00 1.2674376388222481e+00 1.0507898049382196e+00 1.3152422918383284e+00 2 4 4
+183 1 0.0000000000000000e+00 1.1780467789712916e+00 1.1861885641577543e+00 7.2307322622818104e-01 0 0 1
+585 1 0.0000000000000000e+00 2.7640020828803800e+00 3.2604411438234626e-01 2.4108050738451570e+00 -6 3 1
+1220 1 0.0000000000000000e+00 3.6671729632866157e+00 8.3199701056081643e-01 2.3565347914868524e+00 -3 5 -1
+1412 1 0.0000000000000000e+00 3.0889341256139433e+00 1.2298097893840818e+00 1.6726853112666358e+00 5 1 5
+1764 1 0.0000000000000000e+00 2.9229934529634218e+00 1.9320742902623798e+00 1.2255520460960516e+00 1 1 -1
+2450 1 0.0000000000000000e+00 2.6910451298466240e+00 2.3382389074065459e+00 2.3499885597385739e+00 1 5 1
+1023 1 0.0000000000000000e+00 3.6603922747717035e+00 1.4980697950069166e+00 6.7335428343966153e-01 -4 -1 -1
+2370 1 0.0000000000000000e+00 4.0273169233959285e+00 1.1146235113655234e+00 2.1856868667861176e-01 0 -2 -11
+1896 1 0.0000000000000000e+00 2.6490783284317487e+00 1.9544344708212431e+00 3.5456333568975795e-01 5 -4 5
+2767 1 0.0000000000000000e+00 4.0998737125814086e+00 2.0973164235633313e+00 1.6437442645597322e+00 -2 -3 7
+950 1 0.0000000000000000e+00 4.3261215821545713e+00 1.6280055177668531e+00 4.0157869510004510e-02 0 -5 -5
+2065 1 0.0000000000000000e+00 4.7519297420520772e+00 8.8202366811542476e-01 8.3471271040278860e-01 1 3 0
+1798 1 0.0000000000000000e+00 3.7548411044943077e+00 2.4182851987140279e+00 1.0074170343615860e+00 4 0 -1
+341 1 0.0000000000000000e+00 4.9807430465703559e+00 1.2192715101874703e+00 3.4779795668503610e-01 1 -2 -5
+1407 1 0.0000000000000000e+00 4.2980366087312492e+00 2.2652065895643014e+00 7.2951106504019758e-01 4 -1 4
+2463 1 0.0000000000000000e+00 3.2381186309812522e+00 6.1083392136723880e-01 1.9217043747829510e+00 11 -1 -3
+2819 2 -1.0000000000000000e+00 3.9242453151499976e+00 1.5952619408745727e+00 2.1083201315068969e+00 -3 2 2
+2126 1 0.0000000000000000e+00 4.0591275797840742e+00 2.0859094741285049e+00 2.5489040455002726e-01 -1 -2 -5
+532 1 0.0000000000000000e+00 3.4111513817582328e+00 1.0152587042428054e+00 3.0190523296057109e-01 -3 -4 -3
+832 1 0.0000000000000000e+00 3.1665131230946586e+00 1.3705384753554648e+00 1.3849754676678525e+00 -2 8 -7
+2153 1 0.0000000000000000e+00 3.4814243961918305e+00 2.0339696787044601e+00 1.4095001472150253e+00 0 -4 -5
+674 1 0.0000000000000000e+00 4.1098774892988930e+00 2.7121893820511517e-01 1.5219934117764478e-01 -7 0 1
+44 1 0.0000000000000000e+00 2.5856963026632398e+00 1.1534100563558911e+00 7.8855432165941131e-01 -3 -3 -1
+560 1 0.0000000000000000e+00 4.4743850168474797e+00 1.8201748730473293e+00 1.2649319550521121e+00 0 10 1
+786 1 0.0000000000000000e+00 3.9530643454612311e+00 8.8974062145958888e-01 1.3155705344965034e+00 1 7 -1
+2736 1 0.0000000000000000e+00 3.0701048835224487e+00 8.6929350229425661e-02 1.6015178282610731e+00 1 1 -4
+583 1 0.0000000000000000e+00 2.9415108264617595e+00 1.6391850469547788e+00 2.4591049351408878e+00 4 3 0
+755 1 0.0000000000000000e+00 4.2616403429705745e+00 2.2191678403837365e+00 1.8923366562569064e+00 -4 -3 2
+2823 2 -1.0000000000000000e+00 2.7763844317800643e+00 6.1457301412021537e-01 1.0592591891043839e+00 -2 -2 -2
+2215 1 0.0000000000000000e+00 4.8560475072438614e+00 2.3477654444431675e+00 8.2176936210454998e-01 -3 0 3
+148 1 0.0000000000000000e+00 3.3368273428279873e+00 5.7114729922422236e-01 9.1308060469818364e-01 3 0 -4
+1887 1 0.0000000000000000e+00 4.2481414885031592e+00 6.9760001898053337e-01 1.0553266678264295e+00 5 -1 6
+876 1 0.0000000000000000e+00 4.1273727123083042e+00 2.8037589318937971e-02 7.7515808760923954e-01 5 7 0
+1063 1 0.0000000000000000e+00 4.2415584723879434e+00 1.5428126650662759e+00 9.2634919641542812e-01 0 9 0
+2000 1 0.0000000000000000e+00 2.5953091157661952e+00 5.5794167933303418e-01 1.9368563350975203e+00 7 -1 3
+2668 1 0.0000000000000000e+00 2.6288318368458530e+00 1.9398564922968795e+00 1.4667531812816865e+00 -5 0 -3
+2491 1 0.0000000000000000e+00 4.4484928267389146e+00 4.4969742963534259e-01 4.3652327265793595e-01 1 4 -6
+1385 1 0.0000000000000000e+00 3.2327517644130146e+00 2.3632459484249120e+00 8.1617862237314709e-01 4 -7 0
+2994 3 1.0000000000000000e+00 2.6743855272077117e+00 1.1822047392102715e+00 2.2933576685363541e+00 -2 -4 2
+1073 1 0.0000000000000000e+00 4.1046212984996604e+00 2.3630079626077441e-01 1.7736457000498522e+00 3 5 0
+2297 1 0.0000000000000000e+00 3.0740830623019346e+00 1.9326867589403394e+00 2.2695289553403422e+00 0 1 3
+82 1 0.0000000000000000e+00 2.9517130940953811e+00 1.7065994608855106e+00 4.6581282579119915e-01 -5 4 4
+2945 3 1.0000000000000000e+00 4.5236775203852178e+00 1.0131768437535431e+00 2.4700795162320364e+00 -2 2 5
+1069 1 0.0000000000000000e+00 4.1713560353189045e+00 5.4919256123336047e-01 1.8824363554882564e+00 1 0 4
+1849 1 0.0000000000000000e+00 4.2950445603454970e+00 1.0818139230049069e+00 1.6384446443133480e+00 -3 0 3
+2406 1 0.0000000000000000e+00 4.6995576404975878e+00 2.3869580161702468e+00 2.1644446916537308e+00 -1 1 2
+186 1 0.0000000000000000e+00 4.5246713650074852e+00 1.7965743940069470e+00 1.9507415765739047e+00 -5 0 3
+491 1 0.0000000000000000e+00 3.5998362602518181e+00 3.1358104320843572e-02 1.8456033482260112e-01 -1 3 2
+1456 1 0.0000000000000000e+00 4.8955803356635057e+00 2.1415780508394366e+00 1.4076070171252997e-01 -6 1 2
+2498 1 0.0000000000000000e+00 3.9883627349888080e+00 2.1698250209566816e+00 2.4904344638938114e+00 -6 -4 2
+2562 1 0.0000000000000000e+00 4.8426333138373181e+00 1.4836659262020182e+00 1.4070458398575856e+00 1 -2 0
+86 1 0.0000000000000000e+00 1.0474551001807451e+00 4.3768184042036777e+00 6.6068873744071421e-01 -5 3 0
+2897 2 -1.0000000000000000e+00 4.8768786963480892e-01 3.3805694332120066e+00 1.4912752436941339e+00 2 -6 0
+2112 1 0.0000000000000000e+00 1.3091746326724334e+00 3.7028624851431160e+00 2.5862616855199878e-02 -2 8 -1
+2026 1 0.0000000000000000e+00 9.5277775081507379e-02 3.8982142144788390e+00 2.0586954443842500e+00 4 -10 2
+2189 1 0.0000000000000000e+00 1.9642169236883580e+00 4.9455872775765348e+00 7.1145750502086691e-01 1 -1 3
+1993 1 0.0000000000000000e+00 2.3913264760350055e+00 2.7860177741582532e+00 1.0934108807929022e+00 2 0 -3
+26 1 0.0000000000000000e+00 2.4696457334806401e+00 4.5973031296042084e+00 9.4917876856056427e-01 3 -1 5
+2818 2 -1.0000000000000000e+00 9.8281149764821873e-01 4.5639217056398618e+00 2.0683058161934205e+00 -1 0 1
+1587 1 0.0000000000000000e+00 2.4260355515680123e+00 2.5628603982400615e+00 6.0084919645982093e-01 1 5 3
+1258 1 0.0000000000000000e+00 2.3733857431817174e+00 3.3034179296677642e+00 1.8978666925069685e+00 -1 -2 -3
+2379 1 0.0000000000000000e+00 2.2881829455613700e-01 3.2988760386065108e+00 1.8505582315578595e+00 5 -1 -3
+2174 1 0.0000000000000000e+00 1.5990686189137100e+00 3.7154492324602733e+00 1.8138044583074808e+00 -7 2 -1
+1017 1 0.0000000000000000e+00 6.9001562902323066e-01 4.1158648227424361e+00 1.3621332442808258e+00 3 -2 -1
+2870 2 -1.0000000000000000e+00 1.4791070458048408e+00 2.8694321512072931e+00 8.4614018602994989e-01 -1 -2 -1
+1471 1 0.0000000000000000e+00 1.5511262843877383e-01 3.6937690886084109e+00 7.7733947454013597e-01 3 -3 5
+1981 1 0.0000000000000000e+00 2.0552539984661183e-01 2.8697291776614571e+00 8.6410919006780884e-01 -3 -1 1
+1351 1 0.0000000000000000e+00 2.4700334373458754e+00 3.4252628048168310e+00 3.4640781881578114e-01 5 0 -1
+2043 1 0.0000000000000000e+00 1.2525967185255109e+00 4.6795710529584653e+00 7.1790025881717109e-02 4 4 0
+2901 2 -1.0000000000000000e+00 4.4460831793348360e-01 4.9475431331860067e+00 1.2818004670358596e+00 -5 -1 2
+1952 1 0.0000000000000000e+00 1.3751770398134306e+00 4.7024161899193082e+00 9.8781354218691675e-01 1 -7 0
+2984 3 1.0000000000000000e+00 1.8860189786024695e+00 3.2178807873281365e+00 6.2610445194742947e-01 0 4 1
+37 1 0.0000000000000000e+00 1.0581166175595589e+00 3.2081308903469825e+00 1.7847689673641489e+00 2 1 2
+407 1 0.0000000000000000e+00 2.0500793655745748e+00 4.6170625017978963e+00 1.9734312067650854e+00 7 0 1
+1264 1 0.0000000000000000e+00 1.2746947583003001e+00 3.0150435808831846e+00 2.2577320551387792e+00 3 -4 4
+572 1 0.0000000000000000e+00 2.0128001587081359e+00 3.0207174308335865e+00 2.3621701363921308e+00 7 4 5
+2261 1 0.0000000000000000e+00 8.9120267407608678e-01 3.5669609172587302e+00 8.6719579519852885e-01 2 5 0
+1943 1 0.0000000000000000e+00 9.7927298784303862e-01 2.5845553442421116e+00 1.2635628247887352e+00 -3 -1 2
+677 1 0.0000000000000000e+00 3.5934247388268559e-01 3.0092099706319306e+00 1.1485567725270979e-01 1 0 4
+781 1 0.0000000000000000e+00 1.5580697362264959e+00 3.6898788226463779e+00 1.3007538608699238e+00 1 -3 -1
+273 1 0.0000000000000000e+00 9.4829163006080719e-01 3.3892182075110528e+00 2.3189788644890448e+00 -6 -6 -3
+2291 1 0.0000000000000000e+00 2.3372749119579002e+00 3.9987133179314527e+00 1.6825910999268576e+00 -2 -3 -8
+986 1 0.0000000000000000e+00 2.4298368439720148e+00 4.7681617389885211e+00 1.5901072740537295e-01 -2 -4 1
+945 1 0.0000000000000000e+00 9.2628423972805918e-01 2.8967205926560178e+00 5.5341149786518906e-01 -2 4 6
+910 1 0.0000000000000000e+00 1.8078467079224136e-01 4.2990375292581717e+00 1.2239581764872949e+00 -3 -1 2
+2607 1 0.0000000000000000e+00 2.6989401224527945e-02 3.1704475533059164e+00 5.3758775925211277e-01 2 1 1
+854 1 0.0000000000000000e+00 1.6698633202990230e+00 4.5312959761909424e+00 1.4167450622661160e+00 -5 4 -1
+2931 3 1.0000000000000000e+00 9.3006493543957147e-01 4.1580905293046238e+00 1.6830532324641860e+00 -4 -5 3
+1144 1 0.0000000000000000e+00 1.9256332710510258e+00 3.7488533996535662e+00 2.4101985260470782e+00 -10 4 2
+477 1 0.0000000000000000e+00 3.5634749210646882e-01 4.8130074980092381e+00 2.4406919539369341e+00 -4 -1 7
+2318 1 0.0000000000000000e+00 8.1301360574089798e-01 3.7699225899879938e+00 3.8280273619743199e-01 3 -6 -1
+1259 1 0.0000000000000000e+00 1.5992181166679378e+00 4.2189130436148830e+00 2.4174739989261131e+00 -1 -5 -2
+1621 1 0.0000000000000000e+00 1.6764703643681613e+00 4.0768699842853202e+00 4.0987661925903263e-01 3 -7 0
+1054 1 0.0000000000000000e+00 1.5598897733600667e+00 4.0346312990541282e+00 9.1864351408590161e-01 0 1 1
+1421 1 0.0000000000000000e+00 2.7638360277536961e-01 4.1059700937531192e+00 3.6154633668643493e-01 1 0 5
+897 1 0.0000000000000000e+00 2.5939321176305846e-01 4.6123506605590538e+00 1.5714080269767683e+00 -1 0 0
+2851 2 -1.0000000000000000e+00 1.8577075639850658e+00 2.5580725005125906e+00 1.9659475730448139e+00 -3 -1 1
+1809 1 0.0000000000000000e+00 5.3431088492265655e-01 2.5829736620077726e+00 1.9392752557908401e+00 0 7 1
+100 1 0.0000000000000000e+00 3.0004507632121546e-01 4.8137872195018341e+00 4.1317032792051639e-01 6 1 2
+2175 1 0.0000000000000000e+00 8.6802271962623534e-01 3.7835564649198399e+00 2.4028665071881452e+00 4 1 3
+138 1 0.0000000000000000e+00 1.6450418741067037e+00 3.0114286737316998e+00 4.4886023050935364e-02 1 2 -3
+2482 1 0.0000000000000000e+00 4.4511477355847386e+00 3.4352590266810878e+00 1.3144186918041492e+00 9 0 2
+547 1 0.0000000000000000e+00 3.6821210064340422e+00 3.2441554986278849e+00 1.2372951529349481e+00 -1 0 2
+2019 1 0.0000000000000000e+00 2.6308877733238831e+00 3.9795552841489106e+00 9.9010016491957975e-01 2 3 8
+2831 2 -1.0000000000000000e+00 4.4690696906009988e+00 3.2362402706182438e+00 1.9287730385720370e+00 -1 -1 0
+240 1 0.0000000000000000e+00 4.5224494485251787e+00 4.4203783852261243e+00 1.7963931219827756e+00 -3 -2 -2
+1971 1 0.0000000000000000e+00 3.9851339793549125e+00 4.5593133841085267e+00 1.7490593659742628e+00 -2 8 8
+254 1 0.0000000000000000e+00 4.6163407193480968e+00 3.6807646117297774e+00 7.8998244769176207e-01 5 7 1
+307 1 0.0000000000000000e+00 4.2461461875544417e+00 4.7679044161821178e+00 1.1697194504753836e+00 -4 5 3
+842 1 0.0000000000000000e+00 4.7156282656996140e+00 4.7927385966718843e+00 2.2944745032801785e+00 -5 2 2
+2369 1 0.0000000000000000e+00 2.9451450369044503e+00 3.0473949085165670e+00 2.4011953885108004e+00 -1 6 1
+85 1 0.0000000000000000e+00 2.8972111116882759e+00 2.6261093677175484e+00 1.8562616469680515e+00 4 5 1
+2916 3 1.0000000000000000e+00 2.5877870414360267e+00 3.2418647426987146e+00 1.4798223286177419e+00 -1 -2 1
+468 1 0.0000000000000000e+00 2.8188974541932197e+00 3.0699095225131434e+00 3.4366216834827662e-01 -4 -4 3
+255 1 0.0000000000000000e+00 3.1166710122664356e+00 3.6195963219722906e+00 5.8806654039367012e-01 -2 -1 -3
+2996 3 1.0000000000000000e+00 3.2844167423025281e+00 2.9413882795708042e+00 1.4389072766558197e+00 12 -4 0
+268 1 0.0000000000000000e+00 3.5715481077381144e+00 2.5428598760631109e+00 1.9994015604428452e+00 1 5 4
+360 1 0.0000000000000000e+00 3.7581323209546085e+00 3.8902339833393138e+00 2.5675086194365471e-02 -1 -6 3
+646 1 0.0000000000000000e+00 4.2642587166668706e+00 3.0123722645627549e+00 3.3144608396201286e-01 4 -6 -5
+2021 1 0.0000000000000000e+00 3.0562122941315706e+00 3.5517828325068730e+00 2.4944764537841984e+00 4 -5 1
+390 1 0.0000000000000000e+00 3.0028610149367458e+00 4.4250795287784621e+00 1.3960209003404611e+00 -1 -2 -1
+115 1 0.0000000000000000e+00 3.7796391818237249e+00 3.9430954791569905e+00 9.6504297959302898e-01 0 3 -1
+1883 1 0.0000000000000000e+00 3.5810201007039111e+00 2.9461801416478259e+00 9.9436736474951082e-01 4 -2 6
+790 1 0.0000000000000000e+00 4.5933801473815237e+00 3.9820380877642836e+00 2.4444897253348832e+00 -5 11 0
+2921 3 1.0000000000000000e+00 2.5766042619504428e+00 3.2439211017154004e+00 2.1931679693482016e+00 -3 0 -6
+2230 1 0.0000000000000000e+00 4.9549002279003709e+00 3.0900378380695344e+00 2.3169385676046997e-01 -5 0 -5
+882 1 0.0000000000000000e+00 3.3766341342460584e+00 4.9997976053130380e+00 2.3840712254462231e+00 2 0 0
+602 1 0.0000000000000000e+00 4.3136575133244408e+00 2.9770224716742995e+00 1.1642569634282773e+00 -8 -3 -2
+535 1 0.0000000000000000e+00 3.1625827224575644e+00 3.6870269574064314e+00 1.7638411878349094e+00 2 5 -3
+2226 1 0.0000000000000000e+00 3.8719279918624983e+00 4.3843723454073791e+00 2.2541674709572548e+00 -2 4 -2
+1744 1 0.0000000000000000e+00 3.0911847451375301e+00 4.6634343941814427e+00 1.9428679483445963e+00 7 -2 -4
+223 1 0.0000000000000000e+00 4.8398302718053632e+00 3.3420728709548961e+00 1.2492710607153608e+00 -5 -5 -4
+892 1 0.0000000000000000e+00 3.6093893433894997e+00 4.5433025914197334e+00 5.4444429937318439e-01 5 -5 2
+505 1 0.0000000000000000e+00 4.1294906836967797e+00 3.7872831203320132e+00 1.9416033613769599e+00 1 -1 -7
+1047 1 0.0000000000000000e+00 4.6852563321756202e+00 4.3716217035220923e+00 1.0758272233120325e+00 -1 1 5
+2731 1 0.0000000000000000e+00 2.8273050690001589e+00 4.5187695639770356e+00 2.4085583396873629e+00 0 3 5
+529 1 0.0000000000000000e+00 3.5702783167689116e+00 4.1245260199279681e+00 1.5221968831410964e+00 -1 -9 3
+131 1 0.0000000000000000e+00 3.0435243353922266e+00 3.2723461078964453e+00 1.1455272628268132e-01 2 -3 -5
+887 1 0.0000000000000000e+00 3.3791634216755830e+00 3.3923082792719281e+00 1.8180605560772154e+00 2 6 0
+1253 1 0.0000000000000000e+00 2.6271930828541570e+00 4.0333628905125334e+00 2.1753352345939319e+00 -4 1 5
+2612 1 0.0000000000000000e+00 4.1316314078056067e+00 3.0352624851624870e+00 2.1380751197235428e+00 -2 -1 0
+495 1 0.0000000000000000e+00 3.1912245919239295e+00 4.2532916512663794e+00 5.5748523861514643e-01 -2 3 3
+1176 1 0.0000000000000000e+00 2.8003357655993000e+00 3.9917680090788026e+00 1.6113545428596932e-01 11 0 -1
+287 1 0.0000000000000000e+00 4.0483522425880665e+00 4.6607475913314254e+00 4.9369497811454177e-01 -1 2 -6
+989 1 0.0000000000000000e+00 4.2259564058052366e+00 3.8631023044464006e+00 4.9712631148303865e-01 -7 2 -1
+416 1 0.0000000000000000e+00 4.9276701733128032e+00 3.1091472010355181e+00 5.6816912411480480e-01 -3 -3 -1
+1061 1 0.0000000000000000e+00 4.9781901305208454e+00 3.9898878466387830e+00 1.3209824051740190e-01 2 -1 -1
+1513 1 0.0000000000000000e+00 4.0648380049176707e+00 4.0575872257688177e+00 8.7791530286818187e-03 2 7 6
+2461 1 0.0000000000000000e+00 1.9954726105523684e+00 2.0973180473619695e+00 2.6431877118421738e+00 0 8 1
+719 1 0.0000000000000000e+00 1.3246635234337518e+00 1.2271814420903244e+00 3.5724735487455597e+00 -4 -6 5
+1598 1 0.0000000000000000e+00 4.4457311909703229e-01 1.0260690153301033e+00 4.9730761027939101e+00 -2 -3 -3
+1439 1 0.0000000000000000e+00 2.1698406403452366e+00 8.2815141273618420e-01 3.8631822135126708e+00 -1 4 -5
+1661 1 0.0000000000000000e+00 1.9805472534438731e+00 5.1353982678434240e-01 3.2338851160059394e+00 2 0 0
+118 1 0.0000000000000000e+00 8.3734450979267672e-01 1.6906486738214397e+00 3.6801411248851306e+00 -10 -7 0
+1732 1 0.0000000000000000e+00 1.3107933053871481e+00 1.3532071007849762e+00 2.7895861726983107e+00 -4 6 -1
+2386 1 0.0000000000000000e+00 1.1156477709164515e-01 9.9452292293319688e-01 3.9464681361485359e+00 2 6 -5
+637 1 0.0000000000000000e+00 1.6081691439267238e+00 1.9828909507425065e+00 4.2357860493342292e+00 4 2 -1
+1079 1 0.0000000000000000e+00 1.0486538826596199e+00 4.4300614355795076e-01 2.5152982300244355e+00 2 0 -1
+286 1 0.0000000000000000e+00 3.5569994879681027e-01 1.7542340655237512e-01 4.5691558732985200e+00 -3 1 1
+2514 1 0.0000000000000000e+00 4.6342604389827474e-01 8.6209878712364019e-01 3.4468513313349032e+00 1 0 9
+1718 1 0.0000000000000000e+00 2.2377146388024668e-01 1.1623682045558245e-01 3.3903949855175060e+00 6 -1 0
+949 1 0.0000000000000000e+00 2.2656364791515773e+00 9.0628176837086361e-01 3.2263059469247124e+00 3 3 2
+2025 1 0.0000000000000000e+00 7.0149329234879501e-02 1.4946934785280508e+00 2.7534526564647717e+00 1 1 -2
+2020 1 0.0000000000000000e+00 3.4327364982607456e-01 2.2864773181096343e+00 4.5466513053356117e+00 -1 -7 -4
+388 1 0.0000000000000000e+00 1.7834987593226086e+00 1.5318398984461494e+00 3.3088500533002820e+00 0 5 2
+1502 1 0.0000000000000000e+00 2.5757033027076021e-01 4.6158312874790874e-01 2.9747589924701034e+00 4 -2 0
+2137 1 0.0000000000000000e+00 8.3670901488572957e-01 8.2112892516824743e-01 2.8702717699367644e+00 -1 1 -1
+2183 1 0.0000000000000000e+00 3.9384340747681740e-01 2.1611329209078067e+00 3.9716056473693673e+00 -4 -4 -5
+2658 1 0.0000000000000000e+00 3.2090540332995426e-01 1.4262655588414790e+00 2.9533505395463031e+00 4 0 2
+2983 3 1.0000000000000000e+00 1.3941597851280392e+00 7.1972057457159552e-02 4.0657251967464427e+00 -2 -1 6
+1828 1 0.0000000000000000e+00 1.4591041219791951e+00 4.9915981524895392e-01 2.9634039112231347e+00 1 0 0
+1729 1 0.0000000000000000e+00 2.1469887818591875e+00 2.2304290084011349e+00 4.4408538886075481e+00 0 0 6
+2624 1 0.0000000000000000e+00 8.8132447451702345e-01 5.2031840444507504e-01 3.8940591909932283e+00 9 7 3
+1525 1 0.0000000000000000e+00 9.2930107765452452e-01 1.8788808229099070e+00 4.8196602003435478e+00 -1 -2 7
+2337 1 0.0000000000000000e+00 1.2182031204409036e+00 2.3642870782116829e+00 3.8831400996229215e+00 -5 4 11
+323 1 0.0000000000000000e+00 2.1285764819220461e+00 2.0937783318415106e+00 3.4035117692691741e+00 4 -2 0
+2900 2 -1.0000000000000000e+00 1.4695339707164718e+00 1.5759560967720498e+00 3.0369674738410608e+00 -1 5 2
+987 1 0.0000000000000000e+00 1.4174605752309410e+00 4.8343146919142704e-01 3.5653967920396732e+00 -2 0 1
+906 1 0.0000000000000000e+00 2.4346179568806821e+00 1.7497677275539238e+00 2.8155703915216583e+00 5 -1 -4
+2339 1 0.0000000000000000e+00 4.0223568277536970e-01 1.5291629823677451e+00 4.1500810249799658e+00 0 0 6
+2905 3 1.0000000000000000e+00 1.1950963946572786e+00 1.1272562342249810e-01 4.9780862772637589e+00 -1 5 2
+1646 1 0.0000000000000000e+00 2.2658054124102804e+00 1.5071577403032774e+00 3.8660548983048524e+00 3 8 0
+1867 1 0.0000000000000000e+00 1.0722848485399643e+00 8.9581401466391430e-01 4.0781758855182897e+00 0 0 3
+649 1 0.0000000000000000e+00 2.0530609131259014e+00 1.1480244389074707e+00 3.0170696872777572e+00 -9 6 -1
+1532 1 0.0000000000000000e+00 1.7660692664886752e+00 4.0845780902184409e-02 2.9071632032494401e+00 2 1 -2
+1338 1 0.0000000000000000e+00 1.7123472852593018e+00 9.6555435119048116e-01 4.7312081909320067e+00 3 6 6
+2466 1 0.0000000000000000e+00 7.9703239779603485e-01 2.1209785591818977e+00 2.7951501903713210e+00 5 7 -2
+1925 1 0.0000000000000000e+00 1.0903821917447556e-01 2.4273079522114598e+00 3.0699921252203213e+00 1 0 -7
+724 1 0.0000000000000000e+00 1.6740511596086229e+00 5.5451977159148180e-02 4.7257878594831997e+00 3 -2 3
+395 1 0.0000000000000000e+00 1.6437773723314533e+00 2.2954827196799195e+00 2.7745351428357883e+00 3 2 4
+2402 1 0.0000000000000000e+00 6.1837361648597466e-01 2.2839585868047627e+00 3.6123105403975146e+00 6 5 4
+1779 1 0.0000000000000000e+00 2.1578912900821514e+00 2.1854284848529977e+00 4.9515571791906057e+00 5 -5 0
+1980 1 0.0000000000000000e+00 2.3293307776054699e+00 1.4296872443222988e+00 4.5922535069900672e+00 -4 -1 6
+1521 1 0.0000000000000000e+00 1.4382528061636439e+00 1.0125588490032300e+00 4.4996540031702228e+00 0 -4 7
+1357 1 0.0000000000000000e+00 9.0776243577163662e-01 2.3421338648808772e+00 2.5909386176702247e+00 4 -1 -4
+993 1 0.0000000000000000e+00 2.4679104237636409e+00 8.4931327056377470e-01 2.8636197043336611e+00 -2 -3 1
+2128 1 0.0000000000000000e+00 1.9508266549845572e+00 2.4242652578006627e-01 4.0058490238242754e+00 -2 4 -4
+2713 1 0.0000000000000000e+00 2.5040996856421014e+00 3.7552818089457390e-01 4.2975894476286749e+00 5 3 -2
+448 1 0.0000000000000000e+00 3.6910749368033877e+00 1.9633099166808756e+00 3.9682645764836240e+00 -1 -7 2
+2127 1 0.0000000000000000e+00 3.3898574123481131e+00 7.8932251700830985e-02 4.0837715853050574e+00 2 1 -1
+553 1 0.0000000000000000e+00 4.5603780997334331e+00 1.5579291042652690e+00 4.2790083849384057e+00 4 -2 -4
+2177 1 0.0000000000000000e+00 3.4133490091924217e+00 1.6863542374680629e+00 3.3773586576838084e+00 6 3 0
+279 1 0.0000000000000000e+00 4.8479318337467960e+00 2.2019633991669788e-01 3.4818281306841015e+00 2 3 0
+1776 1 0.0000000000000000e+00 4.3085619232334862e+00 7.8179167016071216e-01 3.3224720069278635e+00 4 -1 -3
+2196 1 0.0000000000000000e+00 4.6177351094041557e+00 1.0366615964506218e+00 3.2440980554605425e+00 2 2 -1
+1109 1 0.0000000000000000e+00 4.9767287883044355e+00 1.4880648433857970e+00 2.9348635164347980e+00 -3 5 3
+2796 1 0.0000000000000000e+00 3.4219085370620204e+00 6.3146755940024213e-01 3.7976530829193393e+00 -3 2 2
+2125 1 0.0000000000000000e+00 4.2443940038847243e+00 5.2099974498748522e-02 4.5560768371067599e+00 -2 -3 1
+2400 1 0.0000000000000000e+00 3.6156640002472695e+00 7.1247391251463621e-01 3.1668661462911127e+00 -4 2 4
+430 1 0.0000000000000000e+00 3.4360539961988699e+00 1.0885389339175948e+00 4.4736124279083498e+00 -4 -5 3
+846 1 0.0000000000000000e+00 4.9801400300628620e+00 1.2641306422516690e-01 4.1261981880352021e+00 2 -1 -2
+1316 1 0.0000000000000000e+00 2.8145664506216637e+00 5.5320082894622880e-01 3.5126288044395899e+00 3 -6 0
+1578 1 0.0000000000000000e+00 4.0669510142176017e+00 3.6003089345569850e-01 3.6559731397869908e+00 0 -5 -4
+1422 1 0.0000000000000000e+00 3.3150406738470575e+00 6.3779529162109516e-01 4.6469471918972758e+00 -2 -2 3
+1975 1 0.0000000000000000e+00 2.7051303518576884e+00 7.2384908053927638e-02 4.3144343415674600e+00 -6 -2 4
+1336 1 0.0000000000000000e+00 3.9030221330016328e+00 1.5117545360871243e+00 4.2496095144757913e+00 0 1 2
+935 1 0.0000000000000000e+00 4.1969413473893571e+00 1.0730966707724701e+00 3.8556466724546232e+00 1 0 -8
+2193 1 0.0000000000000000e+00 4.2330404083299591e+00 2.4646662642439749e+00 3.9659016988306912e+00 -4 0 -4
+1550 1 0.0000000000000000e+00 2.9171886198681780e+00 1.8547126751951795e+00 4.0698101008842569e+00 0 3 -5
+873 1 0.0000000000000000e+00 3.9394486759335705e+00 5.8162305932977176e-01 4.6198822615563344e+00 4 1 3
+2365 1 0.0000000000000000e+00 2.7571968186572784e+00 1.7494177619424256e+00 4.5888327967331222e+00 2 5 -2
+1249 1 0.0000000000000000e+00 3.2395967897474720e+00 1.2687493121275140e-01 4.8937873458641636e+00 3 -2 2
+1790 1 0.0000000000000000e+00 4.4234801074907173e+00 1.9324859769187230e+00 3.6091953570923110e+00 2 -2 10
+1146 1 0.0000000000000000e+00 4.8647342156390225e+00 9.8341054352205370e-01 4.1335108518073902e+00 -3 -2 -3
+242 1 0.0000000000000000e+00 4.5423659146203601e+00 2.1257714775085068e+00 2.7766056069117746e+00 3 1 1
+1689 1 0.0000000000000000e+00 4.6894657895307033e+00 1.7231185753366893e+00 4.8531590477185480e+00 9 0 -2
+2411 1 0.0000000000000000e+00 4.0279887384710511e+00 2.1743800956093664e+00 3.4031293892553656e+00 -2 3 2
+1606 1 0.0000000000000000e+00 4.2698583936994057e+00 1.6176432506875613e+00 3.2408026350065930e+00 -5 1 4
+1209 1 0.0000000000000000e+00 2.9242495475395716e+00 1.0754703983812433e+00 3.2366289575803400e+00 0 2 1
+1409 1 0.0000000000000000e+00 3.5885017049139973e+00 1.1648848458692034e+00 3.7127776311455030e+00 4 3 8
+1811 1 0.0000000000000000e+00 3.3857377046546366e+00 1.8178410370559794e+00 2.7086359680957433e+00 -5 -3 0
+1719 1 0.0000000000000000e+00 4.4022736822586452e+00 6.7264943497441376e-01 4.2389431546582639e+00 1 3 0
+112 1 0.0000000000000000e+00 4.5829967185586113e+00 4.6533795847186049e-01 2.7170013530408048e+00 -4 -6 2
+2743 1 0.0000000000000000e+00 2.8103287462970532e+00 1.5674794019436045e-01 3.1846109265291518e+00 4 -1 3
+2951 3 1.0000000000000000e+00 2.5656519703694234e+00 7.0231912396192531e-01 4.8340785276432676e+00 2 3 3
+2936 3 1.0000000000000000e+00 3.5854031840607634e+00 1.8969956690731846e+00 4.7015835202313037e+00 6 1 4
+2808 2 -1.0000000000000000e+00 2.9259379943019730e+00 1.0470757035536884e+00 4.1703096051164499e+00 0 -1 -1
+2211 1 0.0000000000000000e+00 3.0946088296877283e+00 2.3038818496100011e+00 3.4785589631966745e+00 -1 -6 -4
+1464 1 0.0000000000000000e+00 3.0769131946270156e+00 2.3182336579843064e+00 4.6483189194910608e+00 2 -3 0
+2123 1 0.0000000000000000e+00 4.5619968527074430e+00 9.0005692198923376e-02 3.1453044216076846e+00 4 5 1
+2804 1 0.0000000000000000e+00 3.1679761913298319e+00 5.2276144221208964e-01 2.6253870647568007e+00 4 -1 7
+231 1 0.0000000000000000e+00 4.8978210137065563e+00 9.4083753518229951e-01 4.9922199257164221e+00 -2 7 1
+1105 1 0.0000000000000000e+00 3.8811646851823238e+00 1.3367654073738786e+00 2.5137033628796686e+00 2 3 7
+2069 1 0.0000000000000000e+00 1.4590811827932439e+00 3.0924716073063738e+00 2.7915609991290231e+00 2 -2 -3
+1731 1 0.0000000000000000e+00 2.3034641708978874e+00 4.0700107929057703e+00 3.5221655363187629e+00 6 1 0
+304 1 0.0000000000000000e+00 1.5635314031213043e+00 3.5908211598174771e+00 4.0001742309715613e+00 2 -2 2
+1969 1 0.0000000000000000e+00 1.3327370094417033e+00 2.5453435456525662e+00 3.2147520744484157e+00 -5 0 -8
+2805 2 -1.0000000000000000e+00 6.1182116664378150e-01 3.5654991784283649e+00 3.4596321077735883e+00 2 2 -1
+2963 3 1.0000000000000000e+00 1.8072894826664645e+00 4.9482152509094455e+00 3.5351082195400680e+00 1 2 -2
+1046 1 0.0000000000000000e+00 1.7681777199960151e+00 2.7404139944643315e+00 4.3440935787210435e+00 3 1 -2
+1963 1 0.0000000000000000e+00 2.1561396304143558e-02 4.6706495151071197e+00 4.7008020425495722e+00 2 3 -3
+377 1 0.0000000000000000e+00 9.5536310463982621e-01 3.6039251694204855e+00 4.4637007507524933e+00 1 1 4
+419 1 0.0000000000000000e+00 2.4025697965245580e+00 2.8211839778420766e+00 2.9333969861717719e+00 2 -7 -2
+1685 1 0.0000000000000000e+00 1.9444305108306772e+00 4.9245236435668174e+00 2.9271681253540391e+00 10 0 -7
+1539 1 0.0000000000000000e+00 1.3655120239513041e+00 3.2021445437168605e+00 3.5520185924643277e+00 4 -3 -2
+966 1 0.0000000000000000e+00 3.7964502595011373e-01 2.7244554016273983e+00 4.4923354832489570e+00 1 0 -8
+2331 1 0.0000000000000000e+00 5.9504997854394470e-01 2.8047120905413556e+00 3.2672225559727410e+00 5 -2 3
+1726 1 0.0000000000000000e+00 2.2587358049849837e+00 2.6534906594800316e+00 3.6311408952086746e+00 1 6 8
+874 1 0.0000000000000000e+00 1.8740615375605696e-01 3.3102480488809545e+00 3.0655025875496671e+00 -1 -4 -2
+1527 1 0.0000000000000000e+00 9.8999834874296344e-01 4.2856893963957692e+00 3.2232978872495388e+00 3 5 0
+1664 1 0.0000000000000000e+00 2.3509059491159352e+00 3.9912653937802549e+00 4.0231847119845945e+00 -3 2 -1
+1268 1 0.0000000000000000e+00 2.0947684587771938e+00 3.9969254609653633e+00 3.0868929741021054e+00 0 3 -3
+2384 1 0.0000000000000000e+00 1.1117322919826809e+00 2.6153454499168269e+00 4.4342016461156577e+00 -2 4 3
+326 1 0.0000000000000000e+00 6.1750019412154034e-01 4.0670423749444566e+00 2.8763903592918796e+00 7 3 3
+2423 1 0.0000000000000000e+00 5.8901429544291406e-01 4.1388419777977727e+00 3.8959862115778665e+00 2 3 -3
+2650 1 0.0000000000000000e+00 5.5275263536808894e-01 4.1248434319645364e+00 4.8097973891634966e+00 2 -2 3
+1821 1 0.0000000000000000e+00 1.5555633631414949e+00 4.2028559164334327e+00 3.2658859624016183e+00 -2 -4 4
+1354 1 0.0000000000000000e+00 2.2387676057651067e+00 3.6786724388482730e+00 4.6965240497329193e+00 1 1 -2
+2231 1 0.0000000000000000e+00 9.3798834185379221e-01 3.2347213981730110e+00 3.8217924208383569e+00 -3 2 -2
+1120 1 0.0000000000000000e+00 1.3671292644633606e+00 4.6964758578984656e+00 4.6359699162543135e+00 -7 -3 0
+288 1 0.0000000000000000e+00 1.8405366740337709e-01 3.9470248787793798e+00 4.3343452085274583e+00 2 2 6
+1393 1 0.0000000000000000e+00 1.1776889391557481e-01 3.2315055237975088e+00 4.8422285616666239e+00 -5 6 2
+2647 1 0.0000000000000000e+00 1.3822730831648642e+00 3.5971721559732641e+00 2.9873717266352751e+00 2 -2 -2
+1610 1 0.0000000000000000e+00 1.3674242518540478e+00 4.0949454061694164e+00 4.7248040386436410e+00 5 -4 -1
+1745 1 0.0000000000000000e+00 1.2324874580196508e+00 4.0727235039151450e+00 3.7977440767721751e+00 -1 5 4
+2618 1 0.0000000000000000e+00 4.3564509348280639e-01 4.6338117061680544e+00 3.9189833877496385e+00 -9 2 -1
+2503 1 0.0000000000000000e+00 1.9413843369504948e+00 4.1159399052471493e+00 4.7196802756898597e+00 -1 1 1
+2801 1 0.0000000000000000e+00 2.4253185015778564e+00 2.9286458890239859e+00 4.3162962066599846e+00 -2 2 -1
+2826 2 -1.0000000000000000e+00 1.0704157047639196e+00 4.9222239861828010e+00 3.9780484090051553e+00 1 -5 3
+1584 1 0.0000000000000000e+00 2.4806148106238104e+00 3.5026555557671628e+00 2.8929808912227246e+00 1 -3 1
+1573 1 0.0000000000000000e+00 2.0799898624473894e+00 3.4565820179744144e+00 3.3339796147944161e+00 4 -1 -5
+2114 1 0.0000000000000000e+00 7.3891767166198619e-01 4.9407171080397347e+00 4.5191822766675216e+00 4 -5 7
+1979 1 0.0000000000000000e+00 2.4247219607452855e+00 4.1943073084401172e+00 3.0083621259221669e+00 3 -3 1
+1185 1 0.0000000000000000e+00 1.7827704878520723e-01 3.0909392073148503e+00 3.8497587877285735e+00 2 -2 -4
+2024 1 0.0000000000000000e+00 2.0387182033992222e+00 4.6401190196088287e+00 4.1550840938833078e+00 -5 -6 1
+643 1 0.0000000000000000e+00 1.0704199391930558e+00 4.8702854991803832e+00 2.7439015779734914e+00 -3 -3 2
+216 1 0.0000000000000000e+00 1.8985121445959279e+00 3.2355247068865043e+00 4.3799418366053988e+00 0 2 4
+355 1 0.0000000000000000e+00 1.6132139743266454e+00 3.2736816723643423e+00 4.9790346892595849e+00 -5 7 -2
+696 1 0.0000000000000000e+00 1.7179622849680862e-02 3.7220694980107889e+00 3.7433123828102217e+00 5 4 6
+1531 1 0.0000000000000000e+00 9.5951024870796167e-02 4.1949428082123301e+00 2.9246379852233302e+00 1 0 0
+548 1 0.0000000000000000e+00 3.3603222848764225e-01 2.9689416602959531e+00 2.5220491757811532e+00 3 -5 -6
+2218 1 0.0000000000000000e+00 4.7653187167657958e+00 3.7113640672969073e+00 3.4415435461319395e+00 -2 6 -1
+2203 1 0.0000000000000000e+00 3.3528337731257731e+00 3.8756703448179723e+00 4.7860292473750308e+00 -2 0 -3
+871 1 0.0000000000000000e+00 4.7747516294793080e+00 4.4552043162817299e+00 3.9665423683344043e+00 -2 3 1
+2748 1 0.0000000000000000e+00 3.3704804351812356e+00 4.4699401861603718e+00 3.9879630422853451e+00 0 2 -4
+1482 1 0.0000000000000000e+00 2.5908488116302855e+00 3.2761128123044561e+00 3.6298123781838707e+00 -3 -4 6
+1330 1 0.0000000000000000e+00 3.7017647941372855e+00 4.7770160758253297e+00 4.7545755466639434e+00 3 -2 -3
+308 1 0.0000000000000000e+00 3.0435529550215654e+00 2.8674673054815387e+00 2.9706568306908729e+00 4 -2 -2
+1948 1 0.0000000000000000e+00 4.0377099116648321e+00 4.1028799734601060e+00 4.2635060836541392e+00 -1 3 10
+2998 3 1.0000000000000000e+00 2.5731454348975058e+00 4.6197224207344343e+00 3.0136607524641983e+00 0 -2 2
+665 1 0.0000000000000000e+00 3.1513903856449543e+00 2.7039494559350201e+00 4.6474344528208054e+00 -2 -3 1
+2930 3 1.0000000000000000e+00 3.9770900751821028e+00 4.5659569270207587e+00 2.8429936441810146e+00 7 -1 -7
+2683 1 0.0000000000000000e+00 4.7109769738841827e+00 2.8239398910520150e+00 3.3594951437192440e+00 -1 -1 3
+1920 1 0.0000000000000000e+00 3.0545864568006476e+00 4.0982767278239534e+00 3.1212120075424208e+00 -6 5 -2
+2644 1 0.0000000000000000e+00 4.1096546790772734e+00 3.4445788619177860e+00 3.3702010182416680e+00 2 8 3
+190 1 0.0000000000000000e+00 4.2726504867181845e+00 3.4070883706764374e+00 4.7187895262251107e+00 0 -6 1
+2097 1 0.0000000000000000e+00 4.4414828752067388e+00 2.7746235304927036e+00 4.8427341191887656e+00 -1 3 6
+2877 2 -1.0000000000000000e+00 4.9196407661788397e+00 4.8034598449891135e+00 2.9603669132211072e+00 0 -1 0
+156 1 0.0000000000000000e+00 4.9578110799328465e+00 4.1678974034200689e+00 3.2672268253392494e+00 -3 -3 -4
+2828 2 -1.0000000000000000e+00 3.4302773230241494e+00 4.0045559672072484e+00 2.6015689099207755e+00 -9 3 -1
+2962 3 1.0000000000000000e+00 4.9338289793069210e+00 4.9147191139268251e+00 4.8850424215631154e+00 0 -1 1
+1921 1 0.0000000000000000e+00 3.2783962693866457e+00 2.7164364695659202e+00 3.6600927904774303e+00 0 -5 0
+1789 1 0.0000000000000000e+00 2.9202018829787302e+00 4.0093878093095503e+00 4.8694839517524722e+00 3 -1 -4
+501 1 0.0000000000000000e+00 3.3764345391650239e+00 4.9944017206143645e+00 3.1597500347428000e+00 1 0 1
+2711 1 0.0000000000000000e+00 3.3442031101992336e+00 3.2227521889102175e+00 3.0574860058911093e+00 1 2 -1
+2786 1 0.0000000000000000e+00 2.6282204283792239e+00 4.4724760436032325e+00 4.5146149604617918e+00 7 3 5
+543 1 0.0000000000000000e+00 2.9286554898915127e+00 3.0621878979679966e+00 4.9051668302246094e+00 10 1 0
+1505 1 0.0000000000000000e+00 3.7688438114361831e+00 3.4470599735553722e+00 2.6157383566882841e+00 0 11 -2
+944 1 0.0000000000000000e+00 2.9597369305436123e+00 3.4545316839415032e+00 4.2257753449169497e+00 -4 6 -3
+1214 1 0.0000000000000000e+00 3.8457329501004542e+00 2.5981907384677920e+00 4.4843264369622720e+00 4 6 -7
+1643 1 0.0000000000000000e+00 3.8623309919036517e+00 3.0571076589452351e+00 4.1422029061330763e+00 -5 -3 -1
+534 1 0.0000000000000000e+00 4.6587050345357373e+00 2.6186698069005732e+00 4.5219449479911997e+00 -2 -4 2
+1623 1 0.0000000000000000e+00 3.8980497064433970e+00 4.3951771843000040e+00 3.7567163597920077e+00 -3 2 6
+2413 1 0.0000000000000000e+00 4.1106285825293725e+00 3.9758631239886966e+00 2.9845671775433962e+00 3 1 1
+749 1 0.0000000000000000e+00 4.5404460665049218e+00 4.7721627129694317e+00 3.3064856857676013e+00 -4 -1 0
+1514 1 0.0000000000000000e+00 2.7201836379971316e+00 4.9685913631587262e+00 4.9793846157386294e+00 2 -10 -1
+2012 1 0.0000000000000000e+00 4.8215666361970815e+00 2.7908669695167170e+00 2.8973507853763052e+00 0 -3 1
+1572 1 0.0000000000000000e+00 3.8302262529609741e+00 2.8806539552896226e+00 3.2895094146387778e+00 0 1 7
+2305 1 0.0000000000000000e+00 4.4020749039631788e+00 3.3520544195067035e+00 4.0493437192234056e+00 0 2 0
+1629 1 0.0000000000000000e+00 3.3571475501474635e+00 3.6205839107656814e+00 3.4825604320939361e+00 -7 5 1
+530 1 0.0000000000000000e+00 4.0155456528078064e+00 4.0355856671327688e+00 4.9014018797507006e+00 1 1 0
+2390 1 0.0000000000000000e+00 4.4718429809726388e+00 4.1899460660336532e+00 3.8530706791251355e+00 3 3 -5
+2517 1 0.0000000000000000e+00 4.9343071993613838e+00 3.5161225236415081e+00 4.4352188647179940e+00 -3 10 2
+759 1 0.0000000000000000e+00 2.4126534542272116e+00 2.2535356882922839e+00 5.8407847315387036e+00 4 0 0
+1159 1 0.0000000000000000e+00 1.3339212945746228e+00 7.1453452757279823e-01 5.8722697598131415e+00 1 1 -1
+605 1 0.0000000000000000e+00 1.7848392995547386e+00 6.7642261721967689e-01 5.3594721014509599e+00 2 -1 1
+840 1 0.0000000000000000e+00 1.2512387102697395e+00 2.3566116727410216e-01 7.3313318861765513e+00 -2 5 -4
+1033 1 0.0000000000000000e+00 1.0966475403893550e+00 2.4048196411328639e+00 7.3160306767769425e+00 -4 -1 -6
+2439 1 0.0000000000000000e+00 2.0706295034126860e+00 1.0464968184226722e+00 6.9054107834674570e+00 -1 3 -3
+103 1 0.0000000000000000e+00 8.8241822746757390e-02 1.9574545638312879e+00 6.3193839810485875e+00 5 1 -4
+1446 1 0.0000000000000000e+00 2.2447545560484841e+00 1.7497210777328449e+00 6.4508160427318293e+00 1 0 -1
+1580 1 0.0000000000000000e+00 2.0012626540564177e-01 9.6964804764472923e-01 6.5128147870392823e+00 -5 -3 -2
+1151 1 0.0000000000000000e+00 1.5995384380739430e+00 2.2476613454523795e+00 7.2343245846352913e+00 5 0 1
+317 1 0.0000000000000000e+00 2.5986289677795932e-01 2.4216559720700550e+00 6.0101570086046170e+00 -4 5 3
+417 1 0.0000000000000000e+00 1.2726358500945305e+00 2.4684926175971387e+00 6.3111817890132347e+00 3 0 3
+2745 1 0.0000000000000000e+00 5.4760822663307285e-01 1.0850100300986983e-01 5.5976835454061273e+00 2 -1 4
+1758 1 0.0000000000000000e+00 2.3064464704171046e+00 1.3680463149404973e+00 5.5865981467680053e+00 0 -6 6
+2989 3 1.0000000000000000e+00 1.2540689082519973e+00 1.7075073212016330e+00 5.8721010334580406e+00 1 -6 1
+2078 1 0.0000000000000000e+00 3.8745389433852495e-01 6.9701424725624683e-01 6.0861623070835691e+00 0 -3 -7
+624 1 0.0000000000000000e+00 8.8015991020992623e-01 3.9323357017743243e-01 6.4140872645432339e+00 0 6 -2
+447 1 0.0000000000000000e+00 1.7376805139618696e+00 3.2525927645399488e-01 6.2543958672502358e+00 -3 -2 0
+1212 1 0.0000000000000000e+00 5.5617529408608687e-02 1.3648375468543108e+00 5.5671405179526881e+00 1 0 0
+2895 2 -1.0000000000000000e+00 1.4536222111348669e+00 6.7866310620506493e-02 5.5082525934914521e+00 -4 -2 0
+857 1 0.0000000000000000e+00 2.0828422289353790e+00 7.0275810264696159e-01 6.5973780181643624e+00 -3 -1 -4
+99 1 0.0000000000000000e+00 1.9883453462236096e+00 1.8248578269045292e+00 5.9361023671735582e+00 -2 1 1
+1233 1 0.0000000000000000e+00 1.6064010430821405e+00 1.3164907761991862e+00 5.1920699777263462e+00 7 -4 -1
+2115 1 0.0000000000000000e+00 5.1707984634283033e-01 4.1025748885474211e-01 5.5696366575628771e+00 -5 5 -6
+1240 1 0.0000000000000000e+00 1.2134354930957778e+00 8.9934785215522939e-01 5.2997233255224803e+00 -6 1 -1
+2368 1 0.0000000000000000e+00 6.3270848374490141e-01 1.6957827075888907e+00 7.0562616596676673e+00 -1 0 -3
+372 1 0.0000000000000000e+00 5.7340688101286563e-01 1.2114513669543834e+00 5.6839027651129879e+00 -3 -6 0
+1020 1 0.0000000000000000e+00 1.8903999120777573e+00 1.6665773664810886e+00 6.9096714875435739e+00 -6 7 0
+2308 1 0.0000000000000000e+00 1.1621731203894548e+00 1.5948454826835348e+00 5.0982905317960725e+00 1 -3 1
+483 1 0.0000000000000000e+00 6.1655755447609673e-01 2.2502452935734953e+00 5.1797280642253734e+00 4 -2 5
+2911 3 1.0000000000000000e+00 2.4659765979926584e+00 2.2715884065490677e+00 6.6892669435607122e+00 2 6 5
+1382 1 0.0000000000000000e+00 1.3472729592844277e+00 1.6407038225854018e+00 6.6051269389797662e+00 4 -2 -4
+2575 1 0.0000000000000000e+00 5.4578325253196103e-01 1.1479201434889192e+00 6.9221471230168099e+00 -1 4 -3
+1666 1 0.0000000000000000e+00 8.2276043211053662e-01 2.0197906421889114e+00 7.2342050580783219e+00 0 0 -2
+2620 1 0.0000000000000000e+00 1.3045113244997691e-01 2.1325010014440293e+00 6.7270769259193006e+00 3 4 4
+1213 1 0.0000000000000000e+00 1.4839389195434292e+00 2.2382586226757373e+00 5.3907935877647013e+00 5 6 4
+1988 1 0.0000000000000000e+00 3.8788850547971915e-01 2.2491892530435136e+00 7.3895293966351296e+00 0 2 -4
+819 1 0.0000000000000000e+00 2.4094957766962395e+00 5.6998656684697024e-01 6.0860036827397304e+00 6 -2 -2
+2799 1 0.0000000000000000e+00 2.4850519335829584e+00 1.3706665134870468e+00 7.4011565029411353e+00 -5 -1 1
+1757 1 0.0000000000000000e+00 2.1673855294645792e+00 1.7457913455470027e+00 7.4319032193496453e+00 -2 1 -2
+1511 1 0.0000000000000000e+00 1.2793377074529084e+00 7.3974851785206053e-01 6.8868114734595078e+00 5 2 -5
+2679 1 0.0000000000000000e+00 6.2953344145890833e-01 2.0507219196676636e+00 5.0813042790929179e+00 8 3 -2
+2770 1 0.0000000000000000e+00 1.6741263774596360e+00 5.9882134227880579e-02 7.4792738158837997e+00 -2 0 -5
+200 1 0.0000000000000000e+00 7.3532183815220609e-01 1.2172168971514066e+00 6.3418459008496084e+00 -2 -4 0
+1461 1 0.0000000000000000e+00 2.2374770680867639e+00 2.8069073099893938e-01 7.3558234269737151e+00 -7 2 0
+303 1 0.0000000000000000e+00 1.7398912139556535e+00 1.2034420932855880e+00 6.0551080405538267e+00 -1 2 -6
+510 1 0.0000000000000000e+00 2.6316915107333871e-01 3.4512948699142038e-01 7.3452065377457103e+00 0 4 -1
+2121 1 0.0000000000000000e+00 1.8489696362277119e+00 2.4489505127762001e+00 5.6060032098402139e+00 8 3 2
+601 1 0.0000000000000000e+00 9.0043731332208488e-01 2.0120749591512848e+00 6.1689630050137811e+00 2 -1 -4
+2567 1 0.0000000000000000e+00 1.6530039260454839e+00 2.4535014112959042e+00 6.6264997057451422e+00 1 -2 1
+2286 1 0.0000000000000000e+00 1.4215823864039109e-01 1.7051946232306086e+00 7.4573425298793721e+00 -1 1 -3
+1103 1 0.0000000000000000e+00 2.2011841685291738e+00 6.4853366651107247e-02 5.5016311363773225e+00 6 0 -2
+1627 1 0.0000000000000000e+00 1.9272163413853335e-01 7.3101849549403874e-01 5.1125208566419635e+00 5 3 -4
+22 1 0.0000000000000000e+00 4.3139628579395024e-02 1.5685335218861731e+00 6.0459958632955244e+00 2 3 1
+2896 2 -1.0000000000000000e+00 7.7613160494876232e-01 1.0112993764841562e+00 7.2504072604394265e+00 5 0 0
+1215 1 0.0000000000000000e+00 2.0757957552325821e+00 1.4636991362134999e+00 5.0010704631238987e+00 -2 -2 -1
+1441 1 0.0000000000000000e+00 4.7516528440833694e+00 1.6319771894357540e+00 6.6403963942485396e+00 1 -4 -2
+1982 1 0.0000000000000000e+00 2.9336179832489235e+00 2.2393008372291812e+00 6.9252545486835366e+00 5 3 2
+2433 1 0.0000000000000000e+00 2.5212902454902300e+00 1.8483340572589719e+00 6.7519382691909557e+00 3 -5 1
+2776 1 0.0000000000000000e+00 3.1413522269958096e+00 1.8316802154797163e+00 6.0557831278068806e+00 2 7 6
+1992 1 0.0000000000000000e+00 3.4941735561523903e+00 1.9464314212963634e+00 6.4399787893970410e+00 0 6 2
+2354 1 0.0000000000000000e+00 4.3784412003205171e+00 2.1472470972421775e+00 7.1516699122308651e+00 1 2 -3
+455 1 0.0000000000000000e+00 4.3781488477546571e+00 9.2613483678011432e-01 5.5093948089199092e+00 2 -4 3
+462 1 0.0000000000000000e+00 4.3671215674255235e+00 5.8815443600626571e-01 6.2464034982263934e+00 0 2 -3
+134 1 0.0000000000000000e+00 3.7043263614145916e+00 1.1673126709999961e+00 7.1782115372310891e+00 4 -2 3
+456 1 0.0000000000000000e+00 2.7501350724097926e+00 2.1969252172532507e+00 5.3722038478920755e+00 -8 -6 5
+2441 1 0.0000000000000000e+00 4.0555667881290427e+00 1.8234288252117026e+00 5.7300935813845966e+00 2 4 -7
+1558 1 0.0000000000000000e+00 4.3365305903693265e+00 4.4616108512768801e-02 5.7568538686364965e+00 1 -1 5
+600 1 0.0000000000000000e+00 4.3943110649856925e+00 2.2950506393762371e+00 6.3889666291712066e+00 9 -7 -3
+1803 1 0.0000000000000000e+00 4.0670943838847116e+00 1.2530338091926094e+00 5.9640266307027545e+00 4 -3 4
+1395 1 0.0000000000000000e+00 4.9219128821236904e+00 2.4038725164232537e+00 6.3263336054220227e+00 -5 0 -7
+359 1 0.0000000000000000e+00 3.1868712489931830e+00 2.0539932171777324e+00 5.4484199535310829e+00 -4 -1 1
+2186 1 0.0000000000000000e+00 4.8206405543054371e+00 8.2454112663647394e-01 6.6151419590549203e+00 3 3 1
+2997 3 1.0000000000000000e+00 3.9830687667877904e+00 1.7861322335529919e+00 6.3880300087911612e+00 1 2 -1
+1255 1 0.0000000000000000e+00 2.7747769840774779e+00 1.2812254421938285e+00 5.2169762433453046e+00 2 1 -1
+531 1 0.0000000000000000e+00 2.7688648894832157e+00 7.6900006951248390e-01 6.2334473668840626e+00 3 -6 -6
+2872 2 -1.0000000000000000e+00 3.6312774502601033e+00 5.9364109361645645e-01 5.3804293726862475e+00 -4 -2 1
+2251 1 0.0000000000000000e+00 3.6460032811865055e+00 7.5965291988475081e-01 6.6526575441945210e+00 5 4 3
+2783 1 0.0000000000000000e+00 3.0255339952760321e+00 1.4294930965217734e+00 5.6395957886271590e+00 11 0 -2
+2363 1 0.0000000000000000e+00 3.5687022345892667e+00 4.5414592954235500e-01 7.2847917479242028e+00 -3 1 1
+2701 1 0.0000000000000000e+00 3.0427005546581825e+00 8.5603165173972640e-01 6.9430739591256794e+00 -2 4 4
+2425 1 0.0000000000000000e+00 4.2784962470997163e+00 1.6431324826310389e+00 6.7732647905814005e+00 -2 -4 1
+24 1 0.0000000000000000e+00 3.9585195879651467e+00 5.3066460946261418e-01 6.1271065338018680e+00 4 0 3
+470 1 0.0000000000000000e+00 3.9484513813350124e+00 1.8377157015687660e+00 5.2950854304539163e+00 -11 -4 -1
+1853 1 0.0000000000000000e+00 4.6381594960042127e+00 2.3011135310611173e+00 5.4385446297039248e+00 5 -5 -2
+2600 1 0.0000000000000000e+00 4.7140266472062144e+00 1.4529418142584729e+00 5.6432521960222068e+00 4 0 1
+919 1 0.0000000000000000e+00 3.5264438031997605e+00 2.0176545079560824e+00 6.9323528338900609e+00 -6 3 1
+2686 1 0.0000000000000000e+00 2.8963422311556384e+00 4.8845819237566568e-01 7.4305030810599311e+00 8 3 -6
+2659 1 0.0000000000000000e+00 3.4276838773606535e+00 3.9780611840371977e-01 6.0976144455433570e+00 1 3 3
+492 1 0.0000000000000000e+00 4.3518169810288487e+00 5.3673972622162136e-01 7.3023883811997159e+00 0 1 1
+1746 1 0.0000000000000000e+00 4.6094186497942671e+00 5.2306957194653214e-01 5.0892419329752281e+00 -5 1 0
+2403 1 0.0000000000000000e+00 3.0350424272678893e+00 5.1613154495050662e-01 5.6261530764886505e+00 1 0 -1
+2902 2 -1.0000000000000000e+00 4.8507905747711852e+00 7.2579145277497070e-01 6.3763614691875175e+00 -1 5 -1
+1098 1 0.0000000000000000e+00 3.5684870574562524e+00 1.5172979200303005e+00 5.1323417558738527e+00 0 1 3
+2329 1 0.0000000000000000e+00 2.8041857934396601e+00 1.2387193250346398e+00 6.8366836760460101e+00 5 0 -1
+1682 1 0.0000000000000000e+00 4.1904727376599658e+00 1.1327423067097500e+00 6.9283233344865911e+00 -3 2 6
+785 1 0.0000000000000000e+00 3.3563977840498533e+00 1.3273304760156241e+00 6.1550976574186400e+00 -2 2 3
+30 1 0.0000000000000000e+00 4.8578857415557284e+00 1.9098497668475120e-01 7.0167290091618160e+00 -1 -4 -1
+1414 1 0.0000000000000000e+00 4.0663026144604935e+00 1.0828066505032343e+00 5.0645042564842022e+00 -3 5 4
+802 1 0.0000000000000000e+00 4.9462798094904645e+00 1.7111898793460210e+00 6.1208545435024799e+00 4 1 -2
+374 1 0.0000000000000000e+00 1.8722858940545486e+00 4.2951206159171802e+00 6.1331058500495423e+00 -3 -1 3
+2159 1 0.0000000000000000e+00 1.9826102473070351e+00 3.7350801200063963e+00 5.9979502620471319e+00 -7 -2 -2
+2696 1 0.0000000000000000e+00 1.1545990426571957e+00 3.1819957086755379e+00 6.9286650768299678e+00 -1 2 -1
+425 1 0.0000000000000000e+00 4.9571420212494521e-01 4.9367129990872485e+00 5.1711271703099797e+00 2 -1 -6
+1918 1 0.0000000000000000e+00 1.3717546283037401e+00 4.5073118178976461e+00 7.2839256259577185e+00 -3 0 -1
+2560 1 0.0000000000000000e+00 2.4261873243314120e+00 3.8151842571527239e+00 5.3504814150619096e+00 1 2 -3
+513 1 0.0000000000000000e+00 1.3829458399531125e+00 2.7715598478649097e+00 5.6399597554135967e+00 1 1 -3
+2547 1 0.0000000000000000e+00 1.5858392676086570e+00 3.7363274936295756e+00 5.7761611875651706e+00 5 0 -3
+931 1 0.0000000000000000e+00 2.1759525461517550e+00 4.6453469666200142e+00 6.3759690485420091e+00 8 2 2
+562 1 0.0000000000000000e+00 5.5654385449587562e-01 3.9899568251371655e+00 6.4099912675840489e+00 0 -2 3
+2577 1 0.0000000000000000e+00 1.1153462469988580e+00 3.0206645903332641e+00 5.0457512853604332e+00 5 -2 3
+538 1 0.0000000000000000e+00 4.4841200094079089e-02 3.6615479685491210e+00 5.2247660029521477e+00 -1 0 -2
+2925 3 1.0000000000000000e+00 8.0587304486118483e-01 4.0209109654297386e+00 7.3202613516783250e+00 0 8 -1
+2048 1 0.0000000000000000e+00 4.7740346943161305e-01 4.9476227243499951e+00 7.0097739349501165e+00 -1 -1 8
+2709 1 0.0000000000000000e+00 1.8458885068762534e+00 3.1793169055123363e+00 6.4873009118887657e+00 3 -2 -1
+171 1 0.0000000000000000e+00 3.0675739275196645e-01 4.6159611886139764e+00 7.4185010216457039e+00 2 7 -3
+209 1 0.0000000000000000e+00 1.1241564620712590e+00 4.7319557958822154e+00 5.5470434167315679e+00 0 -1 8
+383 1 0.0000000000000000e+00 3.1521604781984641e-01 4.2852733968707248e+00 6.8996649190941381e+00 -6 -5 1
+1488 1 0.0000000000000000e+00 2.2911753024119026e+00 3.1813394998632809e+00 5.4827730124366054e+00 -1 -6 6
+1871 1 0.0000000000000000e+00 2.0360719220743312e-01 3.7436610970717341e+00 5.9122244090624267e+00 3 -1 2
+2692 1 0.0000000000000000e+00 2.3305912465796199e+00 2.6257451335474702e+00 6.7344588892311412e+00 1 2 -1
+1563 1 0.0000000000000000e+00 2.2791325750787368e+00 4.7428246715578615e+00 7.2934460103569227e+00 -2 3 -2
+2827 2 -1.0000000000000000e+00 2.4668835149043580e+00 3.3617483376160813e+00 6.4660400749397828e+00 2 5 5
+2971 3 1.0000000000000000e+00 1.8627338419311361e+00 3.2208499782812052e+00 7.1235479059234512e+00 -4 6 0
+2266 1 0.0000000000000000e+00 9.8823316330976307e-01 4.7785459506887698e+00 6.8301653103588542e+00 -3 7 0
+918 1 0.0000000000000000e+00 2.0986765124021227e+00 3.9062150045754227e+00 6.9804650432113799e+00 -8 -1 -1
+2205 1 0.0000000000000000e+00 1.3587455256411463e+00 3.6516641304404920e+00 6.9531487908390561e+00 0 -1 -1
+1280 1 0.0000000000000000e+00 2.0764178095721428e+00 2.7462986615861769e+00 6.0293012199808143e+00 1 3 -3
+1053 1 0.0000000000000000e+00 5.5780688821167079e-01 3.2833669671686136e+00 5.2732700973677744e+00 1 -3 -2
+49 1 0.0000000000000000e+00 7.3764778772802386e-01 4.9304282749853670e+00 6.3204109305611809e+00 -4 -2 -2
+1954 1 0.0000000000000000e+00 9.5881936199461593e-01 3.3996719040569836e+00 5.8293467261029273e+00 8 3 -1
+1004 1 0.0000000000000000e+00 1.7115309967716763e+00 4.1954995493189458e+00 5.3740888186606846e+00 -3 6 -1
+64 1 0.0000000000000000e+00 7.3410467612257913e-01 4.5329661527354146e+00 5.9662481966645036e+00 -3 1 -7
+1396 1 0.0000000000000000e+00 3.0822407765298176e-01 3.6251878250868459e+00 6.9624928333792893e+00 -1 -1 1
+188 1 0.0000000000000000e+00 7.7701235610259090e-01 3.8470662889485312e+00 6.3688735035675919e+00 -7 -3 0
+2418 1 0.0000000000000000e+00 2.4498656086460087e+00 2.8512857547512733e+00 5.2909979388327919e+00 4 0 2
+1221 1 0.0000000000000000e+00 1.3826260465915712e+00 4.2952409992912548e+00 6.2841948611406968e+00 2 2 -1
+2105 1 0.0000000000000000e+00 1.8949565486250083e-01 3.0242748487138069e+00 5.5420693207705494e+00 -4 -1 -3
+2385 1 0.0000000000000000e+00 2.2402021161367466e-01 4.6917704771772009e+00 5.7678105681034362e+00 -4 -5 0
+998 1 0.0000000000000000e+00 9.1574911957703209e-01 2.7705511963332294e+00 6.0011963436219888e+00 -3 5 2
+2408 1 0.0000000000000000e+00 6.1458569988365699e-02 3.0856193677801076e+00 6.2829529820529979e+00 6 3 1
+2484 1 0.0000000000000000e+00 1.9544550937186362e+00 4.2305614509979899e+00 6.7624281872276502e+00 -6 0 4
+1110 1 0.0000000000000000e+00 7.9536873155027699e-01 3.9338386238294660e+00 5.4774558384250973e+00 -5 8 -1
+144 1 0.0000000000000000e+00 5.4348255967590053e-01 2.6374405955974427e+00 6.6389352823133638e+00 3 5 3
+2088 1 0.0000000000000000e+00 2.3988649624523521e+00 4.7570636559745623e+00 5.1719005128217885e+00 1 2 2
+2435 1 0.0000000000000000e+00 1.4591074045883801e+00 2.9358545899256012e+00 7.2197373605334088e+00 0 5 -2
+2073 1 0.0000000000000000e+00 2.5637818308368621e-01 3.1234967954783701e+00 6.9832437568511665e+00 5 3 4
+1365 1 0.0000000000000000e+00 4.5081543100644712e+00 4.9257686932380293e+00 7.0957489567756378e+00 3 -2 2
+1590 1 0.0000000000000000e+00 3.5948127405585635e+00 3.0479277080200045e+00 5.1208835164791182e+00 0 -1 -2
+176 1 0.0000000000000000e+00 4.9844056197137210e+00 4.2903079786391309e+00 6.4484344142517633e+00 -5 -6 -3
+911 1 0.0000000000000000e+00 4.4694306537087742e+00 3.3545784673846573e+00 6.7370597713648976e+00 1 4 3
+1142 1 0.0000000000000000e+00 3.4229798766331263e+00 4.5225590141181673e+00 6.5243749431417362e+00 3 4 0
+1271 1 0.0000000000000000e+00 3.0830205761988196e+00 2.6179657818774715e+00 6.0942072374612852e+00 0 -1 2
+2756 1 0.0000000000000000e+00 3.5417167159682057e+00 3.5508725311241895e+00 6.0720640625087912e+00 1 -2 -8
+1935 1 0.0000000000000000e+00 4.7096936663420204e+00 2.8440381347867190e+00 5.3334408217292548e+00 3 4 1
+2311 1 0.0000000000000000e+00 4.7205472021363111e+00 3.3968437018018554e+00 5.0836981932181882e+00 0 1 2
+500 1 0.0000000000000000e+00 3.5346800742986089e+00 2.5829299312831386e+00 6.0075597290808247e+00 -5 0 1
+1373 1 0.0000000000000000e+00 3.8607174342471366e+00 2.6393842362862321e+00 5.1685024584229069e+00 -4 5 1
+823 1 0.0000000000000000e+00 3.3134973878338982e+00 2.7207884376071889e+00 6.6956778102816621e+00 2 6 -2
+258 1 0.0000000000000000e+00 3.4733021218943469e+00 4.5030957246108603e+00 5.0198856614252412e+00 2 -5 -4
+1254 1 0.0000000000000000e+00 2.9144487150911305e+00 4.1353314426321006e+00 6.7727950872370588e+00 0 2 0
+2091 1 0.0000000000000000e+00 2.5360533864421146e+00 4.1829429559920204e+00 5.6325986396990757e+00 2 2 -2
+984 1 0.0000000000000000e+00 4.9326733836924461e+00 4.7053530494096423e+00 7.3766605799714613e+00 -1 -1 4
+177 1 0.0000000000000000e+00 3.8278383504026201e+00 2.5294837191863255e+00 5.7160353165690383e+00 8 -4 1
+1940 1 0.0000000000000000e+00 4.4650051725471416e+00 3.9293473767282943e+00 7.0960050721854246e+00 3 -4 2
+1870 1 0.0000000000000000e+00 3.9866873501900906e+00 4.9566568928726156e+00 5.6296279441094121e+00 -4 1 1
+261 1 0.0000000000000000e+00 4.7050126329472821e+00 4.0391249810045053e+00 6.0436150109164339e+00 -3 -1 -3
+1460 1 0.0000000000000000e+00 4.1944005370293800e+00 4.2178803911810938e+00 6.7732594498979690e+00 0 2 -1
+196 1 0.0000000000000000e+00 3.4842358078633855e+00 4.7794025506978128e+00 7.1533258323809195e+00 0 3 3
+349 1 0.0000000000000000e+00 3.9183508452321627e+00 2.7135348072935495e+00 6.8678737911007284e+00 1 2 -9
+2555 1 0.0000000000000000e+00 3.7320558050902410e+00 3.7627543711523304e+00 6.8577953954341702e+00 -4 4 7
+2729 1 0.0000000000000000e+00 3.6299442544261118e+00 3.7629152089876241e+00 5.3139496963511137e+00 1 -3 4
+2569 1 0.0000000000000000e+00 2.7313071920007461e+00 3.0393820198423045e+00 7.3109692219262561e+00 -2 4 -1
+1293 1 0.0000000000000000e+00 3.9985619619682984e+00 4.0756088742139474e+00 6.1540258319085774e+00 -3 1 -4
+1094 1 0.0000000000000000e+00 3.9690565848057084e+00 3.0478473786938296e+00 6.1105435230797838e+00 -1 0 3
+1978 1 0.0000000000000000e+00 4.6415074778561412e+00 2.9166524968244767e+00 7.1020828463401271e+00 0 -4 2
+74 1 0.0000000000000000e+00 3.6780091381458093e+00 4.2660659048192082e+00 7.3630484438331258e+00 5 2 -3
+1231 1 0.0000000000000000e+00 3.1242651853584711e+00 3.3291357395805714e+00 5.5896126001393966e+00 0 -1 -5
+1260 1 0.0000000000000000e+00 2.7725887611158821e+00 3.8719871853070518e+00 6.0809107394457502e+00 4 6 -6
+2518 1 0.0000000000000000e+00 3.4450467039940063e+00 3.9491335560280154e+00 5.7585862001665591e+00 1 -4 -6
+2086 1 0.0000000000000000e+00 3.1909328029684807e+00 4.5747134036278894e+00 5.6732367962355870e+00 -9 -5 -5
+2879 2 -1.0000000000000000e+00 2.6999207688250411e+00 4.9812003826714335e+00 7.0798973769222258e+00 -4 -2 -1
+333 1 0.0000000000000000e+00 3.2820656926789096e+00 2.9432447972407649e+00 7.3769943069878918e+00 1 2 -1
+2428 1 0.0000000000000000e+00 2.5188580547842259e+00 4.9167774163528275e+00 5.8647402957168158e+00 4 -2 1
+1036 1 0.0000000000000000e+00 2.9686428123058457e+00 3.9545830961412851e+00 6.8476186098144352e+00 -7 -3 0
+325 1 0.0000000000000000e+00 4.4578456382597196e+00 4.1647444023163347e+00 5.2135019395152780e+00 6 -5 3
+2637 1 0.0000000000000000e+00 3.2998117905041915e+00 3.2342571054413116e+00 6.3277771687646069e+00 7 -3 -4
+1310 1 0.0000000000000000e+00 4.1873520598546481e+00 4.8030649287831197e+00 6.1765385844720591e+00 -3 3 -1
+776 1 0.0000000000000000e+00 4.3345486507352291e+00 3.3374431284237702e+00 5.7257034077317970e+00 1 0 -2
+2744 1 0.0000000000000000e+00 4.8980953032161780e+00 4.7463367781919885e+00 5.4127932203585933e+00 0 1 1
+2621 1 0.0000000000000000e+00 3.5308623462902102e+00 3.5995340019156008e+00 7.2267030636277303e+00 -6 0 8
+613 1 0.0000000000000000e+00 4.9987060619414470e+00 4.1765311519108801e+00 6.8020366694720229e+00 -1 -6 2
+2438 1 0.0000000000000000e+00 2.5659170111991174e+00 3.5775028520748382e+00 7.4960223197831555e+00 -5 -1 0
+1313 1 0.0000000000000000e+00 1.1290936100071898e+00 2.3573698724825372e+00 9.7740527526521177e+00 1 2 2
+1019 1 0.0000000000000000e+00 2.1321992726065717e-01 1.0033083115558830e+00 7.8276953062277963e+00 -8 -2 8
+343 1 0.0000000000000000e+00 2.3517816583913755e+00 5.4463404248732417e-03 9.2050164587228753e+00 3 -1 2
+1076 1 0.0000000000000000e+00 1.3111299808086361e+00 6.2058084370629207e-02 9.0105007762098559e+00 -5 5 -2
+1688 1 0.0000000000000000e+00 1.5093340853925898e+00 1.2790777281152618e-01 8.1503214737051906e+00 2 -1 -1
+2446 1 0.0000000000000000e+00 7.5484031896857040e-01 1.1299707279849385e+00 8.4257374004777361e+00 5 -4 -3
+1854 1 0.0000000000000000e+00 1.4866438666685677e+00 1.1221501228699857e+00 8.0144731676089300e+00 1 -1 6
+1206 1 0.0000000000000000e+00 2.0788467110362987e+00 8.5774697812881195e-01 7.5174911323561542e+00 -5 4 -3
+1492 1 0.0000000000000000e+00 3.8530058172953607e-01 1.8289057886826379e+00 8.1445164606775382e+00 -2 2 0
+124 1 0.0000000000000000e+00 1.5159615426167867e+00 1.9253184849837850e+00 9.6226406105792996e+00 2 6 0
+299 1 0.0000000000000000e+00 8.0538767303417558e-01 1.5718003280621220e+00 9.5026650831761810e+00 -1 1 3
+1945 1 0.0000000000000000e+00 1.1382486798286622e+00 2.2321155802085739e+00 8.9401242481145466e+00 -2 6 -1
+453 1 0.0000000000000000e+00 7.4606199153503727e-01 6.7097068969475382e-01 7.6613799945762979e+00 1 0 -1
+811 1 0.0000000000000000e+00 1.3823324157282297e+00 6.2458298278040958e-01 9.0035859709548092e+00 -1 -1 1
+1774 1 0.0000000000000000e+00 1.5286378244907217e-01 2.3929828135324129e+00 7.8072545998745273e+00 -2 4 -5
+2023 1 0.0000000000000000e+00 1.4514008307016477e+00 1.2647629109133145e+00 7.5193214916707589e+00 0 1 -2
+2280 1 0.0000000000000000e+00 8.5448961285918013e-01 2.1070653114345070e+00 8.7673070672852873e+00 -6 1 -2
+1816 1 0.0000000000000000e+00 5.1171782536980903e-02 1.5887238944196074e+00 9.9198918543799905e+00 3 -3 4
+2319 1 0.0000000000000000e+00 1.4258349533418133e+00 2.7049513694027977e-01 9.2065651318039077e+00 4 5 -2
+2964 3 1.0000000000000000e+00 5.0007972657621180e-01 2.1856784695669620e+00 9.9661097317690643e+00 5 -4 -4
+582 1 0.0000000000000000e+00 1.4419439788916348e+00 2.3131005302824930e+00 8.1599689963109707e+00 3 -2 3
+2958 3 1.0000000000000000e+00 1.3156060300602704e-01 6.2718218827430838e-03 8.4686937926594830e+00 3 -2 -4
+2782 1 0.0000000000000000e+00 1.1949958514760093e+00 1.0419647221523427e+00 8.1101219860567220e+00 0 0 4
+2563 1 0.0000000000000000e+00 2.1256057538095754e+00 1.5425986609842033e+00 9.2522243898555114e+00 2 -2 0
+302 1 0.0000000000000000e+00 6.0241739120392834e-01 2.1035693492322474e-01 8.8292334894898907e+00 -2 5 2
+2240 1 0.0000000000000000e+00 1.8487147514011553e+00 2.0879917877160654e+00 8.4824220013964400e+00 -1 1 -2
+551 1 0.0000000000000000e+00 1.7059933920375678e+00 1.6898423725263247e+00 7.6060395746532254e+00 0 1 0
+1045 1 0.0000000000000000e+00 1.1731746193869437e+00 1.1935614957973912e+00 8.9212248568082497e+00 2 -4 4
+2262 1 0.0000000000000000e+00 2.3022024939755483e+00 4.3949514226692482e-01 8.3669782275704936e+00 3 -3 0
+2757 1 0.0000000000000000e+00 1.8405817635925048e-01 8.2934967013003480e-01 8.9068547781887375e+00 6 1 1
+533 1 0.0000000000000000e+00 1.2859796767800113e+00 1.8490652967990429e+00 8.7294688074373017e+00 -7 4 -6
+1739 1 0.0000000000000000e+00 2.0904118588892651e+00 1.1401762078542381e+00 8.3741311445266877e+00 -5 0 -6
+2794 1 0.0000000000000000e+00 7.2882325529968939e-01 6.1600247001094655e-01 9.2787228542476594e+00 -2 2 -4
+2359 1 0.0000000000000000e+00 6.9888500930090913e-01 3.9661395577164393e-01 8.4059000352083277e+00 -5 5 -3
+2499 1 0.0000000000000000e+00 7.9713149368692970e-01 2.3984368413203114e+00 8.2460621198751234e+00 -1 -1 5
+806 1 0.0000000000000000e+00 8.1386546168409268e-01 1.9120309868310101e+00 7.9143047435383815e+00 4 0 5
+1510 1 0.0000000000000000e+00 2.2669184445263832e+00 1.0857159124575104e+00 8.9781997482317593e+00 -3 1 -2
+693 1 0.0000000000000000e+00 1.7926978483104328e+00 1.5653102825967355e+00 8.7149060686682116e+00 1 0 4
+1295 1 0.0000000000000000e+00 2.3939524908102761e+00 2.4966982256588190e+00 8.9262598749798236e+00 2 7 3
+1378 1 0.0000000000000000e+00 2.2836032903107419e+00 2.3909208198600731e+00 7.7720928943025154e+00 6 0 2
+2536 1 0.0000000000000000e+00 2.0759432421931834e+00 3.0636449536446858e-01 9.6614326356655376e+00 -4 -4 5
+888 1 0.0000000000000000e+00 1.9569011064579727e+00 2.4088680546685453e+00 9.8023730364340604e+00 -1 -4 5
+714 1 0.0000000000000000e+00 1.9874058297269059e+00 1.7755762687009433e+00 9.1532245081522348e+00 0 0 -3
+439 1 0.0000000000000000e+00 1.4809704656003402e+00 1.2764308129277750e+00 9.7899138682409070e+00 3 -1 10
+2169 1 0.0000000000000000e+00 4.0909223082720181e-01 4.7194045507752197e-01 9.6338401758419963e+00 -1 1 -5
+660 1 0.0000000000000000e+00 1.0976345746823801e+00 1.9720975753201256e-01 8.0725628677375862e+00 -4 -4 -5
+1932 1 0.0000000000000000e+00 3.4960648903732772e-01 1.5687569099544720e+00 9.0748702151528047e+00 -4 -2 6
+387 1 0.0000000000000000e+00 1.4319267101646986e+00 7.3676776246103381e-01 9.6426184784916007e+00 0 1 -1
+427 1 0.0000000000000000e+00 2.7575779336771538e+00 5.2417444170748573e-01 8.0322065860329310e+00 1 -2 -3
+192 1 0.0000000000000000e+00 3.7358119585477270e+00 2.0416106691057884e-01 8.3287331261421240e+00 3 5 -1
+104 1 0.0000000000000000e+00 4.6893122038981065e+00 1.7414905805114147e+00 9.2786283516804939e+00 1 -3 2
+1489 1 0.0000000000000000e+00 2.8677932178483991e+00 2.4485052864318764e+00 8.9213353916415468e+00 0 3 5
+2684 1 0.0000000000000000e+00 2.7034493997799309e+00 1.5642320589055783e+00 8.5368926493217376e+00 3 1 -7
+2009 1 0.0000000000000000e+00 3.2037248358688717e+00 2.1782967054513883e-01 9.2522842132752565e+00 3 -3 -2
+1284 1 0.0000000000000000e+00 4.0692110774313850e+00 7.8873354973824683e-01 7.9199225243206692e+00 3 -3 4
+1362 1 0.0000000000000000e+00 3.7226303071682723e+00 2.4702198821618406e+00 7.5306893776097565e+00 -5 3 -8
+943 1 0.0000000000000000e+00 3.1547746763530267e+00 1.6014118671620636e+00 9.9198098252213125e+00 1 -7 2
+2416 1 0.0000000000000000e+00 3.4532765995028942e+00 2.4980823954544240e+00 9.2842981011347252e+00 -1 2 1
+75 1 0.0000000000000000e+00 2.9524969987962111e+00 2.6873558138395393e-01 9.7209117721030882e+00 -2 2 3
+2387 1 0.0000000000000000e+00 2.5855880158757851e+00 8.7762812429232584e-01 9.1512273718369723e+00 1 8 -2
+2287 1 0.0000000000000000e+00 3.0206927345621191e+00 2.4778572884953030e+00 9.8187708974091539e+00 2 1 8
+1337 1 0.0000000000000000e+00 3.1334669057252151e+00 2.3411959382619321e+00 8.2431878466114590e+00 -6 6 3
+2815 2 -1.0000000000000000e+00 4.8691449554741588e+00 1.7225967180139503e+00 8.4651753498321494e+00 4 1 -9
+2220 1 0.0000000000000000e+00 4.9565117454309746e+00 8.9908483905626835e-01 7.6951656146144378e+00 -3 8 -3
+293 1 0.0000000000000000e+00 4.9665834388899306e+00 1.5960015472067799e+00 9.1377635214446293e+00 3 -5 2
+2991 3 1.0000000000000000e+00 3.7375954235187518e+00 4.0883445761686754e-01 9.2388183630493046e+00 3 1 3
+102 1 0.0000000000000000e+00 3.1634161301201731e+00 4.6926926512748945e-01 8.9440230385059731e+00 8 -3 2
+1041 1 0.0000000000000000e+00 3.7460010988187018e+00 1.4496312098266695e+00 8.4678727942816430e+00 6 3 0
+1358 1 0.0000000000000000e+00 4.4543093863117589e+00 1.7092034022002032e+00 7.6535071463920401e+00 -2 2 1
+2979 3 1.0000000000000000e+00 3.6596612940152755e+00 1.1548251635909452e+00 9.0041552073696209e+00 -7 -5 -1
+1749 1 0.0000000000000000e+00 3.3275542519526251e+00 1.6184938970411922e+00 7.5623349777006830e+00 -5 -7 -6
+921 1 0.0000000000000000e+00 4.5434974063952218e+00 4.6576435928366205e-01 8.5780115268568231e+00 2 -7 0
+2118 1 0.0000000000000000e+00 4.5647157235258158e+00 9.1511243633807693e-01 9.3716914565635552e+00 -5 -2 3
+2861 2 -1.0000000000000000e+00 3.6424750582566414e+00 1.8296083275132504e+00 9.0894221537821576e+00 -3 4 -5
+2918 3 1.0000000000000000e+00 3.5201786933640533e+00 1.9238375208566729e+00 8.2261219037837776e+00 -7 1 -3
+1504 1 0.0000000000000000e+00 3.8875938759733235e+00 1.5534577620876577e-01 7.6084692749505853e+00 1 -6 1
+1418 1 0.0000000000000000e+00 3.1793121899521886e+00 1.0701883065385915e+00 7.9093872980124296e+00 5 -1 -3
+485 1 0.0000000000000000e+00 4.7958451152108195e+00 2.3772193957668611e-01 9.8046513591579938e+00 -4 4 -6
+5 1 0.0000000000000000e+00 4.2503183131967548e+00 1.5553057445535028e+00 8.2239286795407267e+00 -4 -4 8
+2593 1 0.0000000000000000e+00 4.3995913909447557e+00 1.2125472327008828e+00 8.1714004451001152e+00 8 -2 -4
+459 1 0.0000000000000000e+00 4.2462603326522341e+00 1.7454768907184634e-01 9.0378129340532976e+00 3 -2 -1
+1805 1 0.0000000000000000e+00 3.8383644658410083e+00 3.6893977619739317e-02 9.6356986248266967e+00 -4 1 2
+881 1 0.0000000000000000e+00 3.4719128485934170e+00 1.2016301402295360e+00 9.7954191620275317e+00 -4 1 -11
+648 1 0.0000000000000000e+00 3.5774999391113904e+00 2.0737447521712578e+00 7.5142264506812166e+00 -2 -2 -1
+2314 1 0.0000000000000000e+00 4.3005450310691202e+00 9.6877943096822539e-01 9.2338028864183919e+00 1 -4 -3
+449 1 0.0000000000000000e+00 3.8136792120270453e+00 1.1836491898311232e+00 7.7839553432571993e+00 0 -3 -5
+1189 1 0.0000000000000000e+00 4.1430082687820038e+00 3.8148279798378792e-01 8.5692921287429353e+00 4 1 -5
+808 1 0.0000000000000000e+00 2.9499538847625262e+00 1.8476203647516392e+00 9.0033276079756650e+00 -5 4 1
+1484 1 0.0000000000000000e+00 4.0603353747400153e+00 2.3027230650637427e+00 8.8268840082372719e+00 3 -5 -4
+290 1 0.0000000000000000e+00 3.6267100312614735e+00 8.0314487077777119e-01 8.1987088441463136e+00 2 -1 -3
+1826 1 0.0000000000000000e+00 4.1358421989161283e+00 1.5299521351524965e+00 9.4951080898461022e+00 1 -3 6
+1113 1 0.0000000000000000e+00 2.5374696269291985e+00 1.7721644471842033e+00 9.4509878349687177e+00 -4 4 -2
+1795 1 0.0000000000000000e+00 3.2064326167370929e+00 1.0709750901045363e+00 8.8963822098024217e+00 2 4 -3
+1537 1 0.0000000000000000e+00 4.4844804894439605e+00 2.3330786317257806e+00 9.0696198563893287e+00 1 0 -7
+2807 2 -1.0000000000000000e+00 4.8450041250358957e+00 8.6041370343484036e-01 8.3026917058986474e+00 4 -1 1
+2362 1 0.0000000000000000e+00 3.0035434756857353e+00 1.0707645049486050e+00 8.2346530562773133e+00 -2 2 6
+1465 1 0.0000000000000000e+00 3.2043513867400040e+00 2.8173339339539016e-01 9.8787249295454558e+00 -2 -1 -2
+2082 1 0.0000000000000000e+00 3.6424144335685904e+00 1.9764361882737520e+00 9.7970155060624133e+00 2 2 -2
+367 1 0.0000000000000000e+00 4.5891768219044540e+00 2.3989275033643516e+00 9.4544738101913044e+00 -5 -4 1
+476 1 0.0000000000000000e+00 2.7459636086144967e+00 2.0020938756372781e+00 7.6415516370807248e+00 2 1 1
+2893 2 -1.0000000000000000e+00 2.7105137862388404e+00 1.3289627486872817e+00 9.6588613142860194e+00 -4 7 -3
+1780 1 0.0000000000000000e+00 1.2686673183986306e+00 3.1183551432030336e+00 9.3176489599359584e+00 2 3 0
+1500 1 0.0000000000000000e+00 1.5843956714388783e+00 4.0552176835668776e+00 7.5430211803496681e+00 -4 3 4
+158 1 0.0000000000000000e+00 4.8529340731321818e-01 3.2522315515117000e+00 7.6368328792331628e+00 2 -2 5
+1912 1 0.0000000000000000e+00 2.6461707383521288e-01 4.4961231904012955e+00 8.4833254208798152e+00 -1 4 3
+2898 2 -1.0000000000000000e+00 2.3418250396486062e+00 4.1669046720755807e+00 9.7452609634691871e+00 -6 8 3
+1973 1 0.0000000000000000e+00 4.0857773635384548e-01 3.1478724613966671e+00 8.6841354404564548e+00 7 3 6
+1706 1 0.0000000000000000e+00 5.6767272914260170e-01 4.8803064743710785e+00 9.9609270885721788e+00 0 -1 3
+573 1 0.0000000000000000e+00 1.6629404661238405e+00 3.1828754834787674e+00 7.9373338216102303e+00 -5 -2 -2
+1273 1 0.0000000000000000e+00 2.4209344319750601e+00 3.5494994050686892e+00 9.9536827918903210e+00 -5 3 2
+2710 1 0.0000000000000000e+00 1.0161818997430025e+00 4.4147296979100092e+00 9.5538505951450894e+00 -2 -1 0
+956 1 0.0000000000000000e+00 2.1813120250521818e+00 3.5587772519031482e+00 9.3500056467932176e+00 5 -2 6
+2763 1 0.0000000000000000e+00 1.6808709338558090e+00 4.5717461413029490e+00 8.4539978308793362e+00 5 -9 -2
+502 1 0.0000000000000000e+00 2.0913300197545195e+00 4.4744213643627795e+00 9.7210382212900956e+00 3 -2 -6
+1145 1 0.0000000000000000e+00 2.4472700945871018e+00 3.6744208692428231e+00 8.0965797576657739e+00 -3 5 6
+2943 3 1.0000000000000000e+00 1.7756597231692854e+00 4.9881098765689220e+00 9.5901778326851232e+00 -2 -2 -1
+35 1 0.0000000000000000e+00 9.9700445206531729e-01 3.9705904119745510e+00 7.5224613981634683e+00 6 5 -1
+1503 1 0.0000000000000000e+00 1.7703616406153142e+00 4.9317061612445503e+00 7.7449029157400284e+00 -3 1 -1
+2816 2 -1.0000000000000000e+00 1.2779499768355200e-03 4.0702826385597932e+00 9.6951106144070085e+00 1 0 6
+608 1 0.0000000000000000e+00 1.0474015172652718e+00 4.8261947404569945e+00 8.3994218367889673e+00 -1 -1 1
+1026 1 0.0000000000000000e+00 2.4737376254561729e+00 4.7331811550618346e+00 9.0351964346030815e+00 4 3 -2
+1717 1 0.0000000000000000e+00 1.5066826245824367e+00 4.0644762294548684e+00 9.3757425684698035e+00 6 -3 3
+1668 1 0.0000000000000000e+00 1.8558166154333968e+00 3.7562063694728693e+00 9.0762554282986017e+00 5 2 -8
+983 1 0.0000000000000000e+00 1.0237915608873576e+00 4.4070116407447255e+00 9.0217213869092454e+00 1 -5 1
+2075 1 0.0000000000000000e+00 2.0387610975662351e+00 2.6599340627465269e+00 8.2704344494440782e+00 2 6 6
+2139 1 0.0000000000000000e+00 1.2097341694617876e+00 4.1935397593072441e+00 8.9975522358167055e+00 10 2 5
+2833 2 -1.0000000000000000e+00 9.0075514873811802e-01 3.6215825592558870e+00 9.3130497386606272e+00 1 0 -4
+1089 1 0.0000000000000000e+00 2.2314831419488212e-01 3.3601429419658815e+00 9.2280459008005025e+00 0 1 2
+381 1 0.0000000000000000e+00 1.6832664379639568e+00 3.5541569921062082e+00 8.4132951473127644e+00 1 -7 -2
+2029 1 0.0000000000000000e+00 7.9491188365576582e-01 2.9410414098968323e+00 9.4756147667375483e+00 2 9 4
+1547 1 0.0000000000000000e+00 1.6167089607363805e+00 2.8830824590789441e+00 8.7714270836956594e+00 3 3 -4
+1173 1 0.0000000000000000e+00 8.0227211298592627e-01 4.0116351381644151e+00 9.6146608661448631e+00 -2 -1 -2
+2421 1 0.0000000000000000e+00 1.5920835461606370e-01 4.2143019182964077e+00 9.0732268611377851e+00 0 2 1
+581 1 0.0000000000000000e+00 1.0488890405282814e+00 2.8454302970944543e+00 8.4283628724960860e+00 -1 -2 1
+465 1 0.0000000000000000e+00 3.7705572434162088e-01 4.0178010797637800e+00 7.7825513742194650e+00 4 2 3
+2364 1 0.0000000000000000e+00 2.6426190028822838e-01 4.1565609885104546e+00 8.0552969458514720e+00 4 -2 -4
+1908 1 0.0000000000000000e+00 1.0572121372754835e+00 3.3273778137360566e+00 7.8798103958128278e+00 3 -1 5
+199 1 0.0000000000000000e+00 2.6464934262027784e-01 2.6566577940767560e+00 9.1248669053669342e+00 -2 -1 0
+2062 1 0.0000000000000000e+00 5.8822810780864732e-01 3.5266952290271361e+00 8.3814368470780742e+00 3 1 -6
+2248 1 0.0000000000000000e+00 2.3692449962879212e+00 3.0311928494794049e+00 9.4997812902814918e+00 -7 -1 -5
+612 1 0.0000000000000000e+00 1.1771499877081255e+00 4.3251592874462048e+00 8.0541087430074203e+00 -1 4 -5
+619 1 0.0000000000000000e+00 2.3955942591735426e+00 3.4650763279164405e+00 8.9884763112752051e+00 1 -3 0
+201 1 0.0000000000000000e+00 2.0919720891408242e+00 4.3832779677947480e+00 8.6679351819251469e+00 2 -3 -5
+62 1 0.0000000000000000e+00 2.4022611674992461e-01 2.5402184791050710e+00 8.5549224819653169e+00 -2 -8 2
+2862 2 -1.0000000000000000e+00 2.0562189935625810e+00 4.2550760722712342e+00 8.0860878497943389e+00 1 -8 -3
+187 1 0.0000000000000000e+00 1.4180045832455450e+00 3.5369044942898578e+00 9.8125186886595444e+00 6 2 -5
+204 1 0.0000000000000000e+00 4.4335955583898548e+00 3.3449038947025236e+00 8.4293483507825382e+00 3 -3 3
+320 1 0.0000000000000000e+00 2.8303657723524687e+00 3.7739832020683530e+00 9.4084421121590953e+00 1 -4 -5
+1645 1 0.0000000000000000e+00 2.5727797965490016e+00 4.0292871644255523e+00 7.5077751262196708e+00 1 -7 1
+2634 1 0.0000000000000000e+00 4.7287083446898288e+00 3.0687612657945427e+00 7.8500104253311003e+00 -1 -3 1
+2728 1 0.0000000000000000e+00 2.8046710274907030e+00 2.8504975267177182e+00 7.6219767024854663e+00 -1 -4 2
+2899 2 -1.0000000000000000e+00 4.5318795696569669e+00 4.7980255445743509e+00 9.8270921233728306e+00 5 0 0
+2381 1 0.0000000000000000e+00 4.1457425589467718e+00 3.2378988312785020e+00 7.5091691681093673e+00 3 1 -1
+542 1 0.0000000000000000e+00 4.1299763880415181e+00 4.2580039983422493e+00 8.0194837709045323e+00 -1 -4 5
+1931 1 0.0000000000000000e+00 4.0524275939408279e+00 4.8185882791543371e+00 9.7325694042355178e+00 4 -7 -2
+2184 1 0.0000000000000000e+00 3.0873854410981187e+00 4.6238012139617979e+00 8.2129612550178699e+00 5 4 2
+2995 3 1.0000000000000000e+00 3.7184838554313955e+00 2.9489082878215362e+00 9.0439585483475113e+00 -1 5 -2
+147 1 0.0000000000000000e+00 4.8455359726372338e+00 3.9350621701808404e+00 8.5578082314205854e+00 1 2 6
+633 1 0.0000000000000000e+00 4.0038384907353963e+00 2.7475920191958010e+00 7.9892886564261252e+00 -2 -3 2
+2781 1 0.0000000000000000e+00 3.2242763151673679e+00 3.3518896979266932e+00 9.6688622899733758e+00 -2 1 0
+2730 1 0.0000000000000000e+00 4.5694949268027045e+00 2.6066134966976433e+00 8.3262609286258282e+00 0 -1 8
+2207 1 0.0000000000000000e+00 4.4064362185596009e+00 2.9557830855539780e+00 9.6899726390303940e+00 -1 4 4
+618 1 0.0000000000000000e+00 2.9333554623609381e+00 3.3740491410957283e+00 8.9226808615142676e+00 -2 7 -6
+1951 1 0.0000000000000000e+00 3.7431844205869726e+00 4.6987940417908387e+00 8.6690555919530716e+00 3 1 1
+245 1 0.0000000000000000e+00 3.7803973981614742e+00 3.2747704746815480e+00 8.3208258794834258e+00 -7 -5 -4
+579 1 0.0000000000000000e+00 3.1971735988844929e+00 4.7010687261637329e+00 7.6797703360187866e+00 10 8 1
+757 1 0.0000000000000000e+00 3.0837092120517160e+00 3.2007563585170589e+00 7.9781231995680626e+00 -6 -1 -1
+1326 1 0.0000000000000000e+00 3.5351699068418467e+00 4.5131082646968927e+00 9.2035215148037661e+00 6 -1 4
+2409 1 0.0000000000000000e+00 3.0552925040062955e+00 4.5940670577946801e+00 9.4111665525085790e+00 -2 -3 1
+2817 2 -1.0000000000000000e+00 3.7781440734695959e+00 3.1005882640036178e+00 7.7035761302364021e+00 -3 -2 2
+963 1 0.0000000000000000e+00 3.8559433217777972e+00 3.3054252029025548e+00 9.9178857072018740e+00 -2 5 -1
+1170 1 0.0000000000000000e+00 3.0226036031384522e+00 3.3302397612534644e+00 8.3907937236005594e+00 5 2 -4
+861 1 0.0000000000000000e+00 3.3329735512075760e+00 3.9293839023799397e+00 8.6518325153766664e+00 -3 4 -1
+2913 3 1.0000000000000000e+00 4.0039383213434565e+00 3.0244820543539590e+00 9.8023002270914859e+00 -3 -4 3
+1802 1 0.0000000000000000e+00 4.3666896552812906e+00 3.7520379515742039e+00 8.0347454148504074e+00 0 0 -2
+2970 3 1.0000000000000000e+00 2.7241742752257738e+00 4.1155463961084608e+00 8.4726153013899879e+00 4 1 -1
+1200 1 0.0000000000000000e+00 4.0152301398721546e+00 2.6880120301204689e+00 8.5973037664619341e+00 -1 -3 0
+1709 1 0.0000000000000000e+00 3.5526776684758068e+00 4.1177390944672645e+00 8.0579084345974508e+00 4 1 -1
+2824 2 -1.0000000000000000e+00 4.2462620587068196e+00 3.5855279497078532e+00 9.0717800848856687e+00 7 4 -1
+2793 1 0.0000000000000000e+00 4.8628656576281157e+00 3.9182189938745111e+00 9.2786061510715783e+00 -1 -2 3
+42 1 0.0000000000000000e+00 3.7685767380089628e+00 3.9056646245470001e+00 9.3247842643881338e+00 -7 2 -4
+1959 1 0.0000000000000000e+00 4.6967344114349974e+00 4.7891650114048812e+00 9.1975385645312144e+00 -3 -8 -1
+2132 1 0.0000000000000000e+00 3.9718967879075513e+00 4.7506340446637854e+00 7.6665942715906867e+00 -1 -1 4
+793 1 0.0000000000000000e+00 4.7762403100101150e+00 3.2105338211986618e+00 8.6957119643865806e+00 -3 1 2
+2546 1 0.0000000000000000e+00 4.0265350298286933e+00 4.6494901660374452e+00 8.5824319222809731e+00 -5 -2 4
+2172 1 0.0000000000000000e+00 3.0388885657108720e+00 4.4038859752168937e+00 9.9096991830086818e+00 5 -9 -1
+2165 1 0.0000000000000000e+00 4.6241480035028859e+00 3.9612392431806449e+00 9.7485769406681140e+00 1 -8 2
+2301 1 0.0000000000000000e+00 5.9060877231317466e-01 6.5700417566038443e+00 1.7806265370957803e+00 -3 -2 -1
+736 1 0.0000000000000000e+00 1.3173306358554628e+00 6.1778337696363046e+00 1.7897582266820566e+00 -1 1 0
+971 1 0.0000000000000000e+00 7.3388765303860803e-01 5.3043223408243483e+00 1.7483327720366595e+00 4 -2 -4
+1066 1 0.0000000000000000e+00 1.4542297498942491e+00 5.2273958080879197e+00 1.6217369284384511e+00 0 2 2
+152 1 0.0000000000000000e+00 2.7091986166663246e-01 5.2613173417949906e+00 2.1468276953391152e+00 -1 -7 -1
+450 1 0.0000000000000000e+00 1.3699903833782226e-01 6.1043668291101447e+00 9.2824672752894091e-02 -1 -3 -1
+2116 1 0.0000000000000000e+00 7.1834364870751777e-01 7.2453041443965747e+00 3.3465018651050971e-01 5 3 -2
+2956 3 1.0000000000000000e+00 1.2569636497099941e+00 7.1675659799518998e+00 2.2597224992990657e+00 0 0 -3
+2553 1 0.0000000000000000e+00 2.3273936435491849e+00 5.5878930416203785e+00 5.0514631139135469e-01 -4 -5 1
+16 1 0.0000000000000000e+00 1.8978559421481582e+00 7.4451518348635037e+00 3.3722469643892633e-01 6 -3 4
+2778 1 0.0000000000000000e+00 1.0750120567201847e-01 6.4079863854503838e+00 1.1872061833497667e+00 -6 -2 1
+1690 1 0.0000000000000000e+00 1.3819529952860661e+00 6.7072080120220230e+00 9.0177258825170725e-01 7 -5 2
+2324 1 0.0000000000000000e+00 2.3234653259919355e-01 7.3653433875163845e+00 9.6887955836520712e-01 -2 -5 2
+2539 1 0.0000000000000000e+00 8.3818679791837569e-01 6.3903087806790477e+00 2.7980014269642847e-02 1 3 -5
+352 1 0.0000000000000000e+00 1.5869258891931943e+00 5.0493186381943431e+00 2.1717953313573366e+00 1 -1 3
+342 1 0.0000000000000000e+00 7.2395582071508657e-01 6.7336936965266423e+00 1.3330413649390853e+00 5 -2 2
+441 1 0.0000000000000000e+00 1.9835339041283744e+00 7.3208065703325786e+00 1.2576793837881040e+00 -5 -7 -4
+2241 1 0.0000000000000000e+00 1.7167739898296541e+00 5.7138170821465923e+00 2.4419889048066046e+00 -2 -5 -3
+2451 1 0.0000000000000000e+00 9.1221866470809698e-01 7.1703510131620121e+00 1.8595778935905554e+00 0 -6 -2
+517 1 0.0000000000000000e+00 7.1926878188130383e-01 6.9532192744662478e+00 5.0436355538868172e-01 -1 -3 -4
+552 1 0.0000000000000000e+00 6.0537510039271580e-01 6.2214133796922768e+00 5.8302806062201495e-01 2 0 3
+2497 1 0.0000000000000000e+00 1.1243389545578981e+00 5.9289122454144820e+00 1.4910162625352761e+00 -1 -4 -1
+1536 1 0.0000000000000000e+00 2.3957005422080897e+00 6.2992014352140284e+00 1.8934332361924824e+00 -3 -4 3
+1112 1 0.0000000000000000e+00 1.3837372178658307e+00 6.9346752508639424e+00 1.5390087323459207e+00 1 2 8
+1187 1 0.0000000000000000e+00 1.3372971866854704e+00 5.8613288182577481e+00 3.6661934927104470e-02 -2 1 1
+212 1 0.0000000000000000e+00 1.1571543935434887e+00 5.8076220574925479e+00 2.1817986274822188e+00 1 4 3
+2181 1 0.0000000000000000e+00 1.5701037642714699e+00 5.3357786255909909e+00 1.9041139591150191e-01 -1 -4 -3
+1025 1 0.0000000000000000e+00 2.1448101505194832e+00 7.0510343681515906e+00 2.3017881599870842e+00 1 2 1
+39 1 0.0000000000000000e+00 1.9833865177104300e+00 6.6702403417408922e+00 2.0190867040640517e+00 -6 1 -6
+1022 1 0.0000000000000000e+00 2.1759979356289074e+00 6.6692788686857698e+00 1.2713339947507789e+00 6 1 10
+472 1 0.0000000000000000e+00 2.4649803080618344e+00 7.0716436379611238e+00 1.6620123886173090e+00 2 2 -1
+1064 1 0.0000000000000000e+00 1.7877704010026503e+00 5.9771383643237606e+00 1.2056042778950664e+00 -1 -3 -4
+2070 1 0.0000000000000000e+00 1.9451569494834313e+00 5.8083202753466106e+00 1.4858454620585884e+00 2 -3 1
+1516 1 0.0000000000000000e+00 2.3253621060689122e-01 7.0360764581405553e+00 1.9292360935497483e+00 1 -1 -7
+1509 1 0.0000000000000000e+00 1.5971153383832974e+00 5.1955482206026407e+00 1.2909379336777258e+00 2 3 9
+1065 1 0.0000000000000000e+00 3.8508442911992918e-01 5.6814883609135824e+00 6.0527349899912108e-01 2 -4 4
+136 1 0.0000000000000000e+00 2.4801780996782901e+00 6.9531603713790453e+00 1.2072494578296895e+00 2 -5 3
+1911 1 0.0000000000000000e+00 1.6691141500177766e+00 6.9286344436760086e+00 5.1785388834623280e-01 -1 -2 3
+1245 1 0.0000000000000000e+00 1.3203474215552706e+00 6.2845203285549633e+00 2.4240351313461059e+00 2 2 -1
+1639 1 0.0000000000000000e+00 1.7339651086374976e+00 6.1975745467556731e+00 6.7698194998453609e-01 -1 4 -1
+2434 1 0.0000000000000000e+00 2.2877927078880043e+00 5.2347578482678587e+00 1.7140175944075511e+00 -2 -3 -1
+130 1 0.0000000000000000e+00 1.2407543752883610e+00 5.7591595429097087e+00 5.2303052889222690e-01 4 -3 1
+2752 1 0.0000000000000000e+00 5.0731456272735909e-01 5.9571715973669601e+00 2.0948397942073718e+00 1 2 7
+195 1 0.0000000000000000e+00 1.4904735777026237e-01 5.4554881442053684e+00 1.5186650766078442e+00 0 1 -4
+361 1 0.0000000000000000e+00 9.3354182671294150e-01 5.3412925814771972e+00 7.7794765405513833e-01 -5 0 8
+1452 1 0.0000000000000000e+00 1.2201708345268716e+00 5.3500486162020700e+00 2.3896408839997689e+00 3 -2 -7
+518 1 0.0000000000000000e+00 4.6056891383360860e-01 6.1290392819760671e+00 2.3118362606411935e+00 0 1 -1
+1199 1 0.0000000000000000e+00 1.9224336190067528e+00 5.0134059755083396e+00 2.4163817417737721e+00 -2 0 3
+768 1 0.0000000000000000e+00 4.8883387177216537e+00 5.7368973928975677e+00 2.3084612376228703e-01 -1 -1 -1
+2347 1 0.0000000000000000e+00 4.2440527643696369e+00 5.5394345236467526e+00 3.1405097313325087e-01 -1 -6 1
+721 1 0.0000000000000000e+00 4.4079105968895380e+00 6.4257595028064118e+00 4.1205057638483211e-01 -1 3 -1
+796 1 0.0000000000000000e+00 4.4498867669349726e+00 7.4917664390510899e+00 1.2991805643871237e+00 -1 2 1
+1919 1 0.0000000000000000e+00 3.9686276590489076e+00 6.3421051027890254e+00 6.9565632309220404e-01 6 0 4
+2003 1 0.0000000000000000e+00 2.8677278319263819e+00 6.1600902973392628e+00 1.6359428619592618e+00 1 -2 1
+2795 1 0.0000000000000000e+00 4.4331063400847439e+00 7.4759182997502318e+00 2.1820414972111899e+00 2 1 -11
+934 1 0.0000000000000000e+00 4.0050079837121970e+00 5.1776569616634509e+00 1.9599011746261825e+00 2 1 -1
+2068 1 0.0000000000000000e+00 3.2284853944456051e+00 5.4226632450846939e+00 7.5479691552182360e-01 0 2 0
+1986 1 0.0000000000000000e+00 4.5888810229904697e+00 6.4299463815324405e+00 1.0014940498667888e+00 -1 0 3
+1995 1 0.0000000000000000e+00 2.6118611090537649e+00 6.6802026929486225e+00 7.0042741550861065e-01 8 -9 5
+1029 1 0.0000000000000000e+00 4.9264094942663643e+00 5.2410944461315276e+00 2.0783130232880462e+00 -4 0 1
+9 1 0.0000000000000000e+00 3.5677242928646744e+00 6.4946318222594863e+00 1.1229203729382109e+00 -4 -4 -4
+1652 1 0.0000000000000000e+00 4.8092082613473774e+00 7.4921408907938352e+00 3.1422973177419067e-01 0 -2 6
+205 1 0.0000000000000000e+00 3.9624462665434996e+00 7.3693953512443837e+00 9.0724819496773945e-01 -7 -3 3
+1586 1 0.0000000000000000e+00 4.1975707532195923e+00 5.7672748365493245e+00 7.9498132497833285e-01 -4 -4 -5
+474 1 0.0000000000000000e+00 4.3113318691352163e+00 6.9754681366163851e+00 4.3810867822779404e-01 -1 -4 2
+1442 1 0.0000000000000000e+00 4.7298684413804573e+00 7.1201685506931875e+00 1.4233658087905490e+00 8 -3 1
+1827 1 0.0000000000000000e+00 4.3671678380257575e+00 7.4686014981050342e+00 6.6160267000334827e-01 3 -4 -6
+2643 1 0.0000000000000000e+00 4.0552238726882184e+00 5.7309505642207874e+00 1.2294641756474496e+00 0 1 0
+2436 1 0.0000000000000000e+00 3.2795613193122501e+00 7.1294259424643522e+00 8.8017623446897397e-01 3 -5 2
+1191 1 0.0000000000000000e+00 4.0616897718818823e+00 6.0979934756822729e+00 1.9160973269073460e+00 1 0 -4
+2356 1 0.0000000000000000e+00 4.4635988973480609e+00 7.0086052259223512e+00 2.3535547119244398e+00 -3 -2 2
+954 1 0.0000000000000000e+00 4.1443664196059888e+00 6.7500340774556449e+00 2.0156236267969616e+00 -1 3 1
+895 1 0.0000000000000000e+00 3.3593675505802305e+00 6.9605321657032970e+00 1.4582151475848987e-01 -3 2 11
+2152 1 0.0000000000000000e+00 3.2171071572339534e+00 7.1784057502035123e+00 1.4739173432299244e+00 0 3 -1
+2886 2 -1.0000000000000000e+00 3.5226595903313345e+00 6.2561711815753114e+00 3.3566313254294755e-01 1 -3 0
+2496 1 0.0000000000000000e+00 2.5069329785965735e+00 6.1655518296335314e+00 9.1137849533733617e-01 -2 5 1
+2448 1 0.0000000000000000e+00 2.6783482145882531e+00 5.4581736291133485e+00 2.1084737108687981e+00 2 -5 -2
+1697 1 0.0000000000000000e+00 3.3633088371322284e+00 6.1561170941996313e+00 2.1770489479801789e+00 -3 2 -6
+315 1 0.0000000000000000e+00 2.8704157217942843e+00 5.4506134044028061e+00 1.2622009409520405e+00 -1 2 -3
+1049 1 0.0000000000000000e+00 4.7535085088051172e+00 5.2112039675926987e+00 1.5967251523077479e+00 2 -1 -3
+1707 1 0.0000000000000000e+00 3.2172526165434721e+00 6.6754901470449948e+00 5.2190531117490802e-01 0 -1 0
+321 1 0.0000000000000000e+00 3.3544658146107604e+00 5.0110437400085743e+00 1.5151322824760960e-01 -1 -8 -1
+2619 1 0.0000000000000000e+00 3.2539042443239246e+00 7.2541895242309371e+00 2.4385778623163867e+00 0 -4 -1
+2216 1 0.0000000000000000e+00 3.4709688534169523e+00 5.0515817848845561e+00 1.3083870377175411e+00 -2 6 3
+442 1 0.0000000000000000e+00 3.2431440516423575e+00 5.2461907108855339e+00 1.6593823164928716e+00 -9 3 2
+1035 1 0.0000000000000000e+00 3.2938382183020662e+00 5.6433573785432776e+00 4.3682648090423509e-01 6 -1 2
+1557 1 0.0000000000000000e+00 3.5958887719283945e+00 5.8409297910925089e+00 1.5241282192736743e+00 -3 5 -4
+1893 1 0.0000000000000000e+00 4.8142028059106696e+00 6.4919555731132741e+00 1.5492737424801473e+00 -2 8 -2
+1806 1 0.0000000000000000e+00 2.9961164064831829e+00 5.2885270582247870e+00 2.3300893561582838e+00 0 -4 0
+863 1 0.0000000000000000e+00 3.2047271257693701e+00 5.6892957818997179e+00 2.2999439153143775e+00 0 8 -3
+1383 1 0.0000000000000000e+00 4.2367079221650084e+00 5.2317409683735123e+00 8.3757918795473740e-01 4 -4 4
+2667 1 0.0000000000000000e+00 4.5055877266423803e+00 5.0317406706125647e+00 2.4141168056936735e+00 1 -4 1
+2829 2 -1.0000000000000000e+00 7.1684142468664802e-01 8.9658949335115192e+00 1.1655901493877867e+00 1 -1 0
+2832 2 -1.0000000000000000e+00 8.8827903651423346e-01 9.8251432542802277e+00 2.4830601362910039e+00 -2 -6 6
+893 1 0.0000000000000000e+00 1.0766495189371705e+00 7.5303605490691821e+00 6.3194249905783872e-01 10 2 1
+2564 1 0.0000000000000000e+00 4.4986193581431178e-01 9.8039877066338068e+00 1.1639404604819239e+00 -5 0 1
+1965 1 0.0000000000000000e+00 1.9030478701058581e-01 7.8506927049825741e+00 1.6321864493727452e+00 0 6 3
+630 1 0.0000000000000000e+00 2.3673953399341738e+00 7.7877760678512002e+00 1.1394484297520071e+00 4 2 6
+2910 3 1.0000000000000000e+00 1.6641060024933338e-01 9.5490824847579159e+00 2.3883056815780024e-01 1 -5 2
+2525 1 0.0000000000000000e+00 1.4905688914049670e-01 8.1612235993900306e+00 2.3776479929414256e+00 5 -2 3
+393 1 0.0000000000000000e+00 1.3423895912057018e+00 9.3168162266872354e+00 2.2166461719643236e+00 -4 2 3
+671 1 0.0000000000000000e+00 4.8364916625904880e-01 9.8113817670993306e+00 1.7958899746052492e+00 1 0 -1
+2087 1 0.0000000000000000e+00 7.5155575939963604e-01 7.5628917267868161e+00 2.4271059204585779e+00 3 -7 6
+63 1 0.0000000000000000e+00 1.3436211264892308e+00 8.2965788934627458e+00 6.4785037114610000e-01 5 2 -2
+1380 1 0.0000000000000000e+00 9.7413257606612058e-01 8.9983190546430460e+00 1.8353127289909654e+00 3 -2 8
+1156 1 0.0000000000000000e+00 3.7435168423228166e-01 8.0367741738677587e+00 1.6656983556089933e-01 -3 -4 -1
+2788 1 0.0000000000000000e+00 1.3850590760386381e+00 9.0744407464509678e+00 2.2502538345129566e-01 -3 -5 1
+14 1 0.0000000000000000e+00 1.1016010401628220e+00 9.1611895016595426e+00 4.2895574145770182e-01 -10 -3 6
+1991 1 0.0000000000000000e+00 2.4157072783539233e+00 7.6445989720983034e+00 1.4073667993282027e-01 2 -4 4
+2407 1 0.0000000000000000e+00 2.4747107747449322e+00 9.1314669112173164e+00 2.1381592719883677e+00 2 -8 -3
+65 1 0.0000000000000000e+00 1.3731950128574462e+00 9.7424978363220163e+00 1.7962802783426541e+00 4 0 -3
+58 1 0.0000000000000000e+00 1.4513622889572015e+00 8.0405669507162560e+00 2.0766969763262069e-01 0 1 -1
+1958 1 0.0000000000000000e+00 3.9064711214569914e-01 8.1335391458929784e+00 9.2016092150550155e-01 -1 6 -1
+1791 1 0.0000000000000000e+00 1.9427742631054592e+00 8.3806280383458560e+00 1.8917028674447287e+00 0 -2 2
+1560 1 0.0000000000000000e+00 2.1610138559803937e+00 8.6918955177413313e+00 1.3721334461755452e+00 2 -7 -1
+2947 3 1.0000000000000000e+00 1.8425532582367838e+00 9.2625550889770079e+00 1.3658058203997894e+00 -1 1 -3
+729 1 0.0000000000000000e+00 2.0364483918759335e+00 9.1504080419919731e+00 2.9457646005255578e-01 3 -5 -3
+2360 1 0.0000000000000000e+00 2.1369586513691501e+00 9.6300471197627875e+00 4.4164725318320830e-01 9 -1 3
+1671 1 0.0000000000000000e+00 7.5874135403495291e-01 7.6445108395897936e+00 1.7359945379925135e+00 6 -2 2
+1369 1 0.0000000000000000e+00 9.5386662398665489e-01 8.3847092975440276e+00 1.3656750634507653e+00 -2 0 -2
+880 1 0.0000000000000000e+00 9.3313107725592237e-01 7.6903083314484721e+00 1.1302021447718107e+00 -5 0 -3
+2457 1 0.0000000000000000e+00 9.8397604177409059e-02 7.6640932286424803e+00 3.5845811898093777e-01 9 -5 -2
+249 1 0.0000000000000000e+00 1.9058521329803549e-01 8.9194512015468206e+00 1.2512921445208872e-01 1 2 1
+2566 1 0.0000000000000000e+00 1.4831355368964616e+00 7.6212895931915465e+00 1.0869220016367274e+00 -3 -2 -5
+2322 1 0.0000000000000000e+00 3.1068383687428830e-01 9.1222774478850308e+00 2.2571713402077074e+00 8 -2 10
+2035 1 0.0000000000000000e+00 2.0272941767482315e+00 7.9957102771601374e+00 2.2331845770667158e+00 0 0 0
+1269 1 0.0000000000000000e+00 5.7941243776856333e-01 9.2897724176562484e+00 6.4969189520776216e-01 2 4 0
+2579 1 0.0000000000000000e+00 1.9659620028495004e+00 8.2429613602439531e+00 5.7582078067759623e-01 -6 1 -3
+851 1 0.0000000000000000e+00 9.7330294797841255e-01 8.3385367528258261e+00 2.2296454635410479e+00 1 3 0
+1347 1 0.0000000000000000e+00 2.4272682565381767e+00 9.6434596649109352e+00 1.7902151648780615e+00 1 5 -4
+1728 1 0.0000000000000000e+00 7.2547250367335370e-01 8.3134239213150352e+00 4.6746681518201927e-01 -2 4 6
+2081 1 0.0000000000000000e+00 1.2360698918189099e+00 8.2572832706717403e+00 1.8520224323755219e+00 2 3 -1
+2616 1 0.0000000000000000e+00 4.3393155058532272e-02 8.1252803934007520e+00 8.8708715597564392e-01 -1 3 -3
+371 1 0.0000000000000000e+00 1.4922738076164059e+00 7.6445718010577846e+00 1.8506638618921758e+00 3 4 0
+988 1 0.0000000000000000e+00 2.1318373308446228e+00 9.7775470478320106e+00 1.2889099051008774e+00 -6 0 2
+2671 1 0.0000000000000000e+00 4.4875014129467550e-01 8.9493617056126880e+00 1.5149581765539524e+00 -3 -1 0
+2374 1 0.0000000000000000e+00 1.9160275922623291e+00 8.5840058504562737e+00 1.1923845019446699e+00 -2 -3 1
+2156 1 0.0000000000000000e+00 1.9099451116753094e+00 8.4275251523387595e+00 2.4586527771207347e+00 4 1 4
+2982 3 1.0000000000000000e+00 1.6574048008273083e+00 9.8915733534989450e+00 4.7621578160282746e-01 1 -4 8
+1567 1 0.0000000000000000e+00 1.5887727181431421e+00 9.6012472487106457e+00 9.0565589697181947e-01 -11 -2 1
+836 1 0.0000000000000000e+00 1.1720551786798401e+00 8.7192091293655629e+00 2.4761699017472889e+00 -7 -1 5
+2554 1 0.0000000000000000e+00 4.5615868270741897e+00 9.1212983573337816e+00 1.0414296537320082e+00 7 -3 0
+259 1 0.0000000000000000e+00 3.3395063842606576e+00 8.0102867191927114e+00 1.2021729085388142e+00 1 3 2
+2580 1 0.0000000000000000e+00 4.1173779396949373e+00 9.0495020873248944e+00 1.2880103522261352e+00 0 2 4
+691 1 0.0000000000000000e+00 3.7146811918827587e+00 9.8819408991621440e+00 2.2410995689755455e+00 3 -2 -2
+1483 1 0.0000000000000000e+00 3.8669968618643038e+00 8.8215616407832584e+00 1.9984802548264484e+00 1 -1 -1
+985 1 0.0000000000000000e+00 2.6362121339812341e+00 7.8533498706790645e+00 1.7130659452234303e+00 2 -2 6
+571 1 0.0000000000000000e+00 4.1401552848068697e+00 9.2887397122745696e+00 2.2324285322355800e-01 -2 3 1
+2977 3 1.0000000000000000e+00 2.6058368417555600e+00 9.9851625023154984e+00 3.1935954938779448e-01 -2 -3 7
+2922 3 1.0000000000000000e+00 3.3148728826732610e+00 9.0559016694206935e+00 1.2520395033112772e+00 0 2 2
+1549 1 0.0000000000000000e+00 4.8011502116338498e+00 8.1194953494671402e+00 7.3361076579314388e-01 -3 -1 3
+2219 1 0.0000000000000000e+00 4.3417203679711527e+00 8.4358094538814967e+00 1.6861358805979270e+00 -4 9 1
+2512 1 0.0000000000000000e+00 4.7602745807883080e+00 8.9451020762361360e+00 1.3204109141043325e+00 2 5 -3
+1355 1 0.0000000000000000e+00 4.1537291483938876e+00 8.3755187605069352e+00 2.0444079143435316e+00 3 -5 -1
+1763 1 0.0000000000000000e+00 2.7854939686825788e+00 8.7684803299042411e+00 1.8056918545333918e+00 -1 -2 -4
+1164 1 0.0000000000000000e+00 3.1437713000094254e+00 9.4600643151433932e+00 4.2407331908439705e-01 4 -8 -1
+2707 1 0.0000000000000000e+00 4.7085837175725800e+00 9.8129004234997854e+00 2.2840444535664499e+00 0 -2 -2
+2197 1 0.0000000000000000e+00 3.2288203676733214e+00 9.3030630794932474e+00 1.7872012478167298e+00 -2 -3 -1
+1772 1 0.0000000000000000e+00 2.7836860137431718e+00 9.6731602860320116e+00 2.2719376423111557e+00 -1 -5 -1
+1106 1 0.0000000000000000e+00 4.6588677713755429e+00 9.6362764755683159e+00 5.3010629646584795e-01 1 9 3
+1015 1 0.0000000000000000e+00 3.8656930000459071e+00 9.4575663161841241e+00 2.0974210614515054e+00 1 0 0
+2878 2 -1.0000000000000000e+00 3.2370778581306610e+00 8.8405595309450629e+00 2.3361189286717936e+00 -3 1 -2
+1279 1 0.0000000000000000e+00 4.8947395654096342e+00 7.8005408077621832e+00 1.3383668467360452e+00 1 3 6
+805 1 0.0000000000000000e+00 4.5083090839517723e+00 9.8617641806115621e+00 1.5396333998801293e+00 0 5 -9
+1252 1 0.0000000000000000e+00 4.2338360507947206e+00 8.3678589785646604e+00 8.8692223169180362e-01 5 -2 3
+2751 1 0.0000000000000000e+00 4.9657269465200295e+00 8.9477917759514156e+00 1.9122624340660486e+00 -2 1 7
+426 1 0.0000000000000000e+00 2.9868804991119804e+00 9.6935563461603103e+00 1.2853399757308133e+00 -4 -4 0
+1957 1 0.0000000000000000e+00 4.9103876142257228e+00 8.7714140688254219e+00 2.3368414416243771e-01 -6 -2 -1
+1800 1 0.0000000000000000e+00 3.5008648988366047e+00 8.0910033818813041e+00 4.2512009163262254e-01 1 2 1
+1611 1 0.0000000000000000e+00 2.8072128213352752e+00 9.9949679795148239e+00 8.1740277541997819e-01 4 -7 5
+655 1 0.0000000000000000e+00 4.6857563400459510e+00 8.2113380839031489e+00 2.2888514999171012e+00 4 4 2
+2837 2 -1.0000000000000000e+00 3.9228222263109807e+00 8.6374846832346517e+00 3.9212702522346221e-01 -8 -1 -3
+813 1 0.0000000000000000e+00 3.5394494264793535e+00 7.5735566154793901e+00 1.8896658096693510e+00 -2 -1 6
+923 1 0.0000000000000000e+00 2.7668522549656109e+00 8.2889140395950811e+00 2.1420168743215440e+00 3 2 0
+715 1 0.0000000000000000e+00 2.6749328422465957e+00 9.1806341596789096e+00 1.1295273150104488e+00 -5 -3 -2
+1211 1 0.0000000000000000e+00 4.6237142944531122e+00 9.1524937954956052e+00 3.2716414384994758e-02 -5 -4 4
+2993 3 1.0000000000000000e+00 3.7937869088723275e+00 9.7577514388408222e+00 1.1934926159747004e+00 -5 2 4
+2520 1 0.0000000000000000e+00 2.7608863297341397e+00 7.5112023726368164e+00 9.2851016655524898e-01 3 -9 5
+904 1 0.0000000000000000e+00 3.3365676691514450e+00 8.0428227705554320e+00 6.7910570801500614e-01 0 -4 10
+680 1 0.0000000000000000e+00 3.0254510187230048e+00 8.6714233590368757e+00 6.8101130053745906e-01 2 3 3
+2185 1 0.0000000000000000e+00 4.8803874131344331e+00 9.0797167387576323e+00 2.4513260659819207e+00 -1 2 3
+679 1 0.0000000000000000e+00 2.8206471315394372e+00 8.6779694026272640e+00 2.1992803034871425e-01 2 -1 5
+1084 1 0.0000000000000000e+00 3.3530021760611972e+00 9.0032156387865250e+00 7.2394009553248040e-01 -1 2 1
+2479 1 0.0000000000000000e+00 4.1548716116157776e+00 9.3695112283496513e+00 2.4766705787880290e+00 -5 3 1
+1450 1 0.0000000000000000e+00 3.3396104708788013e+00 8.3678526814456085e+00 1.8521842525310444e+00 -3 -3 -2
+1062 1 0.0000000000000000e+00 2.6673443593991095e+00 7.8040723897223057e+00 2.2123982258614787e+00 1 -5 1
+265 1 0.0000000000000000e+00 3.9029055067072136e+00 7.9252031441723796e+00 1.5759075604569153e+00 3 0 2
+294 1 0.0000000000000000e+00 2.6229189638768213e+00 7.9897294615114118e+00 4.5711210864438795e-01 0 -5 3
+2013 1 0.0000000000000000e+00 4.5320167942197109e+00 9.9567417286469784e+00 1.1988783017168105e+00 3 9 2
+2967 3 1.0000000000000000e+00 4.4858840971351199e+00 8.0681163771316413e+00 8.2543086263696497e-02 5 -1 -3
+710 1 0.0000000000000000e+00 1.3805821307903716e+00 5.9559554000576238e+00 3.8006595418446980e+00 -4 6 9
+60 1 0.0000000000000000e+00 1.7564547175664194e-01 6.3329898326641549e+00 4.7353107525647182e+00 -1 -4 0
+1736 1 0.0000000000000000e+00 1.5694714094207745e+00 5.2656995359571166e+00 4.3631958613706336e+00 -3 -1 6
+224 1 0.0000000000000000e+00 1.7574493997558955e+00 6.5935948787339189e+00 4.1296649475976634e+00 1 4 -5
+1876 1 0.0000000000000000e+00 1.7473927866604781e+00 6.1579941388221133e+00 4.4487565075212805e+00 -1 2 2
+2237 1 0.0000000000000000e+00 2.1676228384249754e+00 7.0703219799167085e+00 4.5068153307169503e+00 1 3 0
+626 1 0.0000000000000000e+00 2.4053913015669703e+00 5.4871496157839248e+00 2.8992761248843912e+00 9 3 -6
+1147 1 0.0000000000000000e+00 1.2907437648034259e+00 5.8111666040364662e+00 3.2060750717077857e+00 0 6 0
+607 1 0.0000000000000000e+00 1.6408748709923624e+00 5.6724348594391900e+00 3.5584301725169718e+00 4 3 0
+2720 1 0.0000000000000000e+00 8.9784055425966958e-01 5.7679727106276211e+00 2.9275162434446731e+00 2 1 3
+2010 1 0.0000000000000000e+00 1.0550180845500506e-01 6.9049922206182943e+00 2.7233265314177584e+00 3 2 3
+1021 1 0.0000000000000000e+00 7.3817110798544505e-01 6.6813980279159555e+00 2.6627216903760274e+00 -1 -6 4
+713 1 0.0000000000000000e+00 2.1572134940053527e+00 6.3474618619105323e+00 3.3584639418152875e+00 -5 -2 -3
+2063 1 0.0000000000000000e+00 1.4598114857593187e+00 6.9912526280906819e+00 3.0727552618923255e+00 7 3 0
+2455 1 0.0000000000000000e+00 1.2954201634642430e+00 7.3009579242250444e+00 3.4196773613105411e+00 4 1 -5
+2051 1 0.0000000000000000e+00 9.0264325298686288e-01 6.9713776057458690e+00 4.0839063908745326e+00 -8 -10 2
+43 1 0.0000000000000000e+00 2.2281455366590217e+00 6.3603876738902301e+00 3.8386188039284521e+00 8 -2 3
+92 1 0.0000000000000000e+00 3.4891444639434710e-01 6.9208205879228784e+00 4.8029049914138460e+00 -4 10 4
+2270 1 0.0000000000000000e+00 1.3194812641016126e-01 5.4119240862717763e+00 3.4051167350775340e+00 -2 -1 7
+2242 1 0.0000000000000000e+00 9.5390394420942015e-01 7.1783864767498722e+00 4.7892968702806362e+00 -2 6 -2
+1710 1 0.0000000000000000e+00 7.5401733692010975e-01 6.3745158784686309e+00 3.6925820505381828e+00 -1 3 -1
+77 1 0.0000000000000000e+00 2.0672902671699327e+00 5.7628372897149358e+00 2.6677508543933071e+00 1 2 -6
+2574 1 0.0000000000000000e+00 5.1718911640230958e-01 7.1924125028560244e+00 3.0822729471190082e+00 -5 -3 -2
+716 1 0.0000000000000000e+00 8.4855310035185638e-01 6.2130510235560719e+00 4.4968295462676355e+00 -3 -3 -2
+2333 1 0.0000000000000000e+00 9.7717893309633397e-01 6.5834375152932800e+00 3.2894403692428216e+00 11 -7 -3
+143 1 0.0000000000000000e+00 2.1410696812617411e+00 6.8148869993550676e+00 4.9675111148356059e+00 0 2 -4
+1172 1 0.0000000000000000e+00 1.9397198744131896e+00 5.7496830734147251e+00 4.3972057811678580e+00 4 -3 1
+1263 1 0.0000000000000000e+00 1.3029570235198771e+00 6.4351504619270274e+00 3.1678400205263877e+00 -1 7 5
+1430 1 0.0000000000000000e+00 2.4545926224291104e+00 5.6047151057823630e+00 3.3098985634971889e+00 -4 -1 -3
+1669 1 0.0000000000000000e+00 2.4077662579406862e+00 5.7060911965727898e+00 4.7813090336107047e+00 2 0 -2
+1712 1 0.0000000000000000e+00 9.5158514597254107e-02 5.6915395328467131e+00 2.5963321643690844e+00 4 -4 3
+2641 1 0.0000000000000000e+00 4.3767004076513405e-01 5.6553384198770091e+00 4.0185405566269958e+00 2 2 -1
+2920 3 1.0000000000000000e+00 2.2592051448931740e+00 5.7548264597774681e+00 3.8515574608119518e+00 -7 5 1
+214 1 0.0000000000000000e+00 2.0765548503069873e+00 7.3612929436616543e+00 3.3201275359132376e+00 -3 -4 2
+347 1 0.0000000000000000e+00 5.2012101143927264e-02 6.8551114401218349e+00 3.6207398888572122e+00 -7 4 2
+2293 1 0.0000000000000000e+00 4.6225681112945499e-01 5.0134200763364483e+00 3.0618443120868579e+00 -2 3 -4
+2133 1 0.0000000000000000e+00 1.7867795335713039e+00 6.9678219184179024e+00 3.6116306792445818e+00 3 1 4
+1181 1 0.0000000000000000e+00 1.4255433245095872e+00 6.9967970523368086e+00 4.4460167244184108e+00 2 -6 -4
+1768 1 0.0000000000000000e+00 4.6972174617259099e-01 7.1024984837629592e+00 4.4950793380757332e+00 -2 -4 -2
+1615 1 0.0000000000000000e+00 1.2025908409679533e+00 5.1051516511252695e+00 3.4502876139238738e+00 0 -2 1
+2629 1 0.0000000000000000e+00 3.5516402501465860e-01 5.5962407285249531e+00 3.0534855699610977e+00 -2 -1 6
+1581 1 0.0000000000000000e+00 1.1671433452930307e+00 5.3932007124859780e+00 4.9457242131160886e+00 6 -3 1
+2228 1 0.0000000000000000e+00 8.9091716734683168e-01 5.6429594057458212e+00 4.2911720422358295e+00 2 4 3
+2777 1 0.0000000000000000e+00 2.8987305497266114e-01 5.9441413876422260e+00 4.3494923404851376e+00 1 3 7
+1440 1 0.0000000000000000e+00 1.1132556173630093e-01 6.3116234738952501e+00 4.3081648779966741e+00 -2 -13 -6
+1080 1 0.0000000000000000e+00 6.1531095824118864e-03 6.0467383932483383e+00 2.8944581195104711e+00 -2 -1 1
+432 1 0.0000000000000000e+00 4.0942684810497108e+00 6.7333026902426054e+00 2.8714600410856943e+00 -2 0 -8
+1039 1 0.0000000000000000e+00 4.8425701340380956e+00 7.2474745448055522e+00 3.0881879802164081e+00 2 -1 -1
+1737 1 0.0000000000000000e+00 4.2817296439568500e+00 7.3361091151323619e+00 3.4042694861606364e+00 -3 1 -4
+1487 1 0.0000000000000000e+00 3.8908743654454270e+00 6.7697472012639128e+00 4.7282317189555920e+00 -2 0 0
+1174 1 0.0000000000000000e+00 2.5349287296595646e+00 5.2442392270535239e+00 4.0300610211935739e+00 -5 -1 -2
+1924 1 0.0000000000000000e+00 3.6302284248893537e+00 7.1594172797499116e+00 4.4830623126739360e+00 -2 0 4
+1060 1 0.0000000000000000e+00 3.7647386430855407e+00 6.5857529532417214e+00 3.8573245173794883e+00 0 -1 1
+1405 1 0.0000000000000000e+00 4.0044470871620144e+00 5.0962630847086539e+00 4.3831623058023919e+00 -7 2 0
+1363 1 0.0000000000000000e+00 3.4972258531728704e+00 6.7943434629244646e+00 2.5004882109776361e+00 2 -1 0
+2046 1 0.0000000000000000e+00 4.8406490861206439e+00 6.4334153945954355e+00 3.1575589364683880e+00 -2 0 0
+1034 1 0.0000000000000000e+00 3.5816745544214381e+00 7.3128096415793422e+00 3.4927664221952175e+00 2 3 -8
+2349 1 0.0000000000000000e+00 4.4492759141590241e+00 6.5194524671367287e+00 4.8828114582839586e+00 -2 1 0
+2844 2 -1.0000000000000000e+00 3.5199268278696256e+00 5.9956469108232477e+00 4.2205451714380802e+00 -2 0 0
+2493 1 0.0000000000000000e+00 4.8792654737121062e+00 6.1751944682710436e+00 4.0157287048970103e+00 -1 -1 6
+2294 1 0.0000000000000000e+00 4.9820266203454722e+00 5.3647138893522346e+00 3.4876702628769403e+00 -5 -2 -6
+2210 1 0.0000000000000000e+00 3.1841515889346366e+00 5.3909054143699446e+00 4.7759768829124587e+00 0 1 -4
+700 1 0.0000000000000000e+00 4.6062440116855079e+00 7.0829091062319396e+00 3.9297167573150613e+00 -1 2 0
+860 1 0.0000000000000000e+00 3.3240498586062870e+00 5.1366900757049025e+00 3.7809087737871732e+00 -6 -2 -3
+2907 3 1.0000000000000000e+00 3.0942603670905693e+00 5.0772646071873231e+00 4.2623570377040938e+00 4 -3 4
+620 1 0.0000000000000000e+00 4.0597449906434484e+00 5.2620318123451746e+00 3.5032054688112320e+00 -4 -1 -6
+1256 1 0.0000000000000000e+00 4.2664640939616048e+00 6.4712741735424508e+00 4.0760922730307803e+00 4 2 2
+270 1 0.0000000000000000e+00 2.5010762377913949e+00 6.9456788092078900e+00 2.9967322987534040e+00 5 5 -5
+2592 1 0.0000000000000000e+00 3.1899848582261465e+00 5.5744415407787811e+00 3.3700020370119064e+00 1 1 -4
+1936 1 0.0000000000000000e+00 4.9334325001832591e+00 7.2956538424212773e+00 4.1174001962236337e+00 7 -4 2
+2521 1 0.0000000000000000e+00 4.8897808306223460e+00 5.4677316624306211e+00 4.1627344683830154e+00 -2 -5 1
+1983 1 0.0000000000000000e+00 2.7176109179544223e+00 6.5258928639019631e+00 2.5614604617932768e+00 -6 3 1
+322 1 0.0000000000000000e+00 3.9607400426490802e+00 5.1337595649622596e+00 2.9730950236981313e+00 -3 1 -4
+2059 1 0.0000000000000000e+00 4.2845072898269274e+00 5.9828318081050593e+00 4.6997441000891609e+00 2 6 2
+1553 1 0.0000000000000000e+00 4.1881343113991836e+00 6.3666294713351981e+00 2.7809188077076707e+00 -1 -4 -1
+965 1 0.0000000000000000e+00 4.2556714809031204e+00 7.2480442119501500e+00 4.4157894881848510e+00 0 -7 0
+527 1 0.0000000000000000e+00 2.9105084055267540e+00 5.7957628181024887e+00 4.2339283057431318e+00 -6 -2 9
+2839 2 -1.0000000000000000e+00 2.7774514730918689e+00 6.3905352268688427e+00 4.4271675543262150e+00 -1 2 -1
+1695 1 0.0000000000000000e+00 3.1565932624027631e+00 6.5287167868056217e+00 3.0336722684554256e+00 1 1 3
+640 1 0.0000000000000000e+00 4.8838917926678658e+00 5.5307695053119197e+00 2.7075859246539120e+00 -4 3 0
+1667 1 0.0000000000000000e+00 2.8268806911277258e+00 6.4575525331171812e+00 3.7941481540463693e+00 -1 0 -4
+2038 1 0.0000000000000000e+00 3.5295359709453740e+00 6.4501283420738735e+00 4.9416949988631984e+00 6 -2 -3
+2835 2 -1.0000000000000000e+00 3.4934442577228548e+00 6.0728885002516426e+00 3.1682045426097760e+00 6 -4 2
+1115 1 0.0000000000000000e+00 3.9149774465151808e+00 6.2457716012992543e+00 3.4794360744187833e+00 -5 -2 3
+2456 1 0.0000000000000000e+00 4.5387688907685382e+00 5.7860463890164402e+00 3.3130115502463808e+00 -4 5 0
+376 1 0.0000000000000000e+00 2.6208461804939387e+00 6.3530362557370177e+00 4.9781808159161773e+00 0 -2 -1
+164 1 0.0000000000000000e+00 2.9750355633930003e+00 6.8920868993299305e+00 4.5202526057190546e+00 -2 -1 3
+905 1 0.0000000000000000e+00 2.6705981552448388e+00 7.0568071843715900e+00 3.8072589146332732e+00 0 0 -1
+1222 1 0.0000000000000000e+00 3.9040945890387380e+00 5.3060922354693307e+00 3.7282152255045551e+00 -3 0 -7
+2940 3 1.0000000000000000e+00 3.4010440363920238e+00 7.0122555591491746e+00 3.9841504339873541e+00 -7 0 -5
+1128 1 0.0000000000000000e+00 2.5770526107020624e+00 5.1484686202485559e+00 3.1641020522218666e+00 -3 -3 -3
+1879 1 0.0000000000000000e+00 4.1833882311659796e+00 5.6795057910332023e+00 4.1633519486354347e+00 -6 2 7
+1595 1 0.0000000000000000e+00 4.0423027717961668e+00 7.0408789179351201e+00 3.4388733973100818e+00 3 -1 -4
+2279 1 0.0000000000000000e+00 4.6641624317633807e+00 6.7059694605905955e+00 3.3306666610571658e+00 4 -4 -2
+1481 1 0.0000000000000000e+00 4.4733268638951502e+00 5.0082833389543806e+00 4.9334817263315127e+00 2 -1 3
+357 1 0.0000000000000000e+00 4.1442020199745482e+00 5.8371776080374316e+00 2.6111863743018402e+00 -2 4 5
+883 1 0.0000000000000000e+00 2.0645583453196865e+00 8.7510251691030749e+00 3.8191601304682896e+00 0 -6 8
+1225 1 0.0000000000000000e+00 5.2849463582565903e-01 7.9819855377621813e+00 2.7694675391798844e+00 -4 4 5
+2516 1 0.0000000000000000e+00 2.3340250299969459e-01 8.9800113908091177e+00 2.8080027064327311e+00 7 1 -5
+1116 1 0.0000000000000000e+00 1.1795739616703178e+00 8.6672238621223681e+00 4.6930637030877751e+00 -2 -3 -2
+78 1 0.0000000000000000e+00 2.2971970462370161e+00 9.7389287431622087e+00 3.5398925007583375e+00 -1 3 1
+2117 1 0.0000000000000000e+00 8.2780138101671219e-01 8.4672273603197219e+00 3.3461467120178598e+00 -5 -1 -6
+2393 1 0.0000000000000000e+00 5.0700337435144627e-01 9.4133298152053726e+00 3.8476629910095999e+00 6 1 3
+2758 1 0.0000000000000000e+00 5.6152509786525651e-01 9.2918853414255445e+00 3.4080869114014480e+00 4 0 -1
+2874 2 -1.0000000000000000e+00 2.4270349575934680e+00 9.6397661407193116e+00 3.0310159147202862e+00 3 -1 -4
+1087 1 0.0000000000000000e+00 2.1141901725557921e+00 8.2928239937540287e+00 3.2124022320996075e+00 2 2 -2
+2942 3 1.0000000000000000e+00 1.7013534120352811e+00 7.8923833629801212e+00 3.7502747047903360e+00 -1 -1 0
+1601 1 0.0000000000000000e+00 1.2668568702882652e+00 9.0936914727867695e+00 2.7687318325503587e+00 -1 -1 2
+2785 1 0.0000000000000000e+00 1.4642098828705072e+00 8.9495188333878630e+00 3.8706400330184665e+00 1 4 2
+2508 1 0.0000000000000000e+00 6.5525353149168275e-01 8.6470460544401408e+00 4.0994323309836522e+00 3 5 0
+2565 1 0.0000000000000000e+00 1.4225715861721044e+00 9.4926329460626206e+00 3.5889208715947993e+00 -3 5 -1
+932 1 0.0000000000000000e+00 2.4577989716299533e+00 7.7077151259818688e+00 3.9945968848799707e+00 -4 6 1
+2838 2 -1.0000000000000000e+00 8.6774744819248095e-01 9.9373366464704826e+00 3.3565128884807707e+00 -3 5 2
+769 1 0.0000000000000000e+00 1.9273912173225927e+00 9.4123463780336234e+00 4.6739564544081142e+00 -2 -5 -4
+1376 1 0.0000000000000000e+00 1.6839101935112335e+00 7.9884423948283274e+00 2.6205179242095951e+00 11 -7 5
+2639 1 0.0000000000000000e+00 1.9422960151831943e+00 8.5088552093812133e+00 4.3824399457193968e+00 4 -5 3
+1190 1 0.0000000000000000e+00 1.2863637831679964e+00 9.2756423483044319e+00 3.0972515573244270e+00 -3 0 4
+2822 2 -1.0000000000000000e+00 6.0203953101096908e-01 7.7681305757402779e+00 4.5752960214873557e+00 0 -3 -5
+913 1 0.0000000000000000e+00 1.2014940102346177e+00 7.8453742671267772e+00 2.7597458971121323e+00 0 -3 4
+1756 1 0.0000000000000000e+00 3.5601715325750780e-02 9.9142517792387252e+00 4.2750942755830943e+00 2 -1 -3
+409 1 0.0000000000000000e+00 3.2169156519080833e-01 8.0691728312121302e+00 4.1272738210506708e+00 -2 3 1
+1431 1 0.0000000000000000e+00 9.0931872096328470e-01 7.6127944798328793e+00 4.1310112432630737e+00 -4 3 4
+175 1 0.0000000000000000e+00 1.5075592349286220e+00 7.7175130632562121e+00 4.3140499809608608e+00 3 -1 0
+180 1 0.0000000000000000e+00 1.2666024678519248e+00 8.3101521352760557e+00 4.0903836076187163e+00 5 6 -1
+1594 1 0.0000000000000000e+00 1.6709194966577243e+00 8.9272849178335303e+00 4.9970352065485715e+00 -8 4 -2
+311 1 0.0000000000000000e+00 1.5983827340730057e+00 8.5596907452432056e+00 3.3668348873754748e+00 4 -6 -2
+1941 1 0.0000000000000000e+00 2.4733001751348471e+00 8.6188776861680179e+00 4.0915567979603154e+00 -1 1 -3
+1613 1 0.0000000000000000e+00 9.7871791809952730e-02 8.9233511051894627e+00 4.3101302050217489e+00 -1 -3 -3
+1250 1 0.0000000000000000e+00 2.0687344276258468e+00 9.3877156630624210e+00 4.4494360782864772e+00 -2 3 11
+431 1 0.0000000000000000e+00 3.9057469742695555e-01 8.2552775097036992e+00 3.5694387647944290e+00 -2 1 -3
+2214 1 0.0000000000000000e+00 7.4307786743403070e-01 7.7278553537359587e+00 3.6711831066183178e+00 -1 3 1
+1703 1 0.0000000000000000e+00 2.1077269902075002e-01 7.6955804687853355e+00 3.4249666135307915e+00 5 0 2
+1625 1 0.0000000000000000e+00 3.9015034691855432e-01 9.4015761599320573e+00 4.5236781007320301e+00 3 2 1
+827 1 0.0000000000000000e+00 1.7943751313355432e+00 7.7881107421693683e+00 4.6948677924887585e+00 -5 -4 -4
+1605 1 0.0000000000000000e+00 3.5613703199875002e-01 8.1404058983619869e+00 4.8676141043081325e+00 -5 -5 -2
+1007 1 0.0000000000000000e+00 2.3221592055734619e+00 9.3924723729544848e+00 3.9134211590847188e+00 3 -1 -5
+2060 1 0.0000000000000000e+00 2.1209743370188532e+00 9.1033023046846129e+00 2.9213361987983970e+00 -2 5 -2
+2884 2 -1.0000000000000000e+00 2.0944473739806275e+00 7.9230187539996866e+00 3.2470261032659806e+00 -1 8 -3
+1059 1 0.0000000000000000e+00 2.2627075573125466e+00 7.5743450753370238e+00 4.7052821070753055e+00 -4 -1 3
+389 1 0.0000000000000000e+00 2.0974557151087794e+00 9.7807512742058069e+00 2.6402305859735344e+00 3 2 4
+831 1 0.0000000000000000e+00 1.3343103181596694e+00 9.4231665176473243e+00 4.2681329479057482e+00 2 -1 5
+2906 3 1.0000000000000000e+00 4.3902689951818594e+00 9.1022371285884933e+00 4.7433166396101853e+00 4 1 -4
+1517 1 0.0000000000000000e+00 4.3126450920281529e+00 9.7032737063289431e+00 3.3470823733383601e+00 0 3 -1
+807 1 0.0000000000000000e+00 4.9571798592183942e+00 8.5072576683629677e+00 3.3466909113356622e+00 7 -3 -3
+858 1 0.0000000000000000e+00 3.4471609055789902e+00 9.7203109350299215e+00 3.3344737912551023e+00 6 1 -1
+2171 1 0.0000000000000000e+00 4.2463868326197298e+00 9.9379740005657666e+00 2.5915080724165294e+00 1 -4 0
+2168 1 0.0000000000000000e+00 3.1991319137220273e+00 8.1076265213254626e+00 3.0842270604926907e+00 4 0 3
+656 1 0.0000000000000000e+00 2.9434268380157529e+00 8.9955857733742590e+00 3.8860485073802820e+00 8 -8 1
+415 1 0.0000000000000000e+00 3.5995243470292149e+00 8.0215021138401834e+00 2.5486277973162035e+00 -3 3 4
+1977 1 0.0000000000000000e+00 3.9414796901221183e+00 8.2692468480654480e+00 3.7404955578094095e+00 2 -4 3
+2475 1 0.0000000000000000e+00 3.4334111912219227e+00 8.1015111420938499e+00 4.5084384482781106e+00 -4 -6 0
+2865 2 -1.0000000000000000e+00 3.7393215307391445e+00 7.9364132817854101e+00 3.5540520977398096e+00 0 -3 2
+815 1 0.0000000000000000e+00 4.5327608139058162e+00 8.1863049476764900e+00 4.1161448828027956e+00 -1 0 -3
+1267 1 0.0000000000000000e+00 4.3390794403787609e+00 9.7290551924926145e+00 4.1588906095153568e+00 1 2 -6
+978 1 0.0000000000000000e+00 4.0293776013632270e+00 7.7422440329906461e+00 3.0067960097336930e+00 -2 1 3
+1323 1 0.0000000000000000e+00 4.5164910149107431e+00 9.1323590963917898e+00 2.9604731837881690e+00 -7 1 5
+940 1 0.0000000000000000e+00 2.5728473028383996e+00 7.6451937722112584e+00 2.8625711618482730e+00 5 1 7
+2398 1 0.0000000000000000e+00 3.0153832455279663e+00 9.2595924861004182e+00 3.7500871471755448e+00 1 -3 -2
+226 1 0.0000000000000000e+00 3.2265435191160852e+00 8.7285186617831663e+00 4.8474806613915629e+00 5 -1 -2
+2190 1 0.0000000000000000e+00 3.0500948491095414e+00 7.5589408238240967e+00 4.2726206789028600e+00 0 1 -1
+95 1 0.0000000000000000e+00 2.6378513065894666e+00 9.2773433260404641e+00 4.9218538704587314e+00 1 -5 -3
+1604 1 0.0000000000000000e+00 3.9931524410441841e+00 9.1391020330961155e+00 2.9756484545644883e+00 2 -2 0
+126 1 0.0000000000000000e+00 3.2184035283835026e+00 8.5335140674283512e+00 3.2224075632201705e+00 -2 0 4
+838 1 0.0000000000000000e+00 2.6109087170448046e+00 8.4128690490927340e+00 4.2841716601336532e+00 5 0 1
+1904 1 0.0000000000000000e+00 3.7728358142287841e+00 8.9724979564415523e+00 3.5226221399980644e+00 -5 0 6
+2074 1 0.0000000000000000e+00 3.0147722810793507e+00 9.0036307255230916e+00 2.9401899041877382e+00 1 -4 3
+1470 1 0.0000000000000000e+00 4.5777370519767180e+00 8.1207940074809812e+00 4.8493168598348300e+00 3 -2 1
+2147 1 0.0000000000000000e+00 2.5868044250185358e+00 8.6844222014239048e+00 2.7196765730552075e+00 -3 1 2
+2067 1 0.0000000000000000e+00 3.1342986783496949e+00 8.3956317856376828e+00 3.8635743392449631e+00 -2 4 1
+1515 1 0.0000000000000000e+00 4.6643442724476838e+00 9.4907989863537399e+00 3.8298890712237696e+00 4 -4 -5
+2632 1 0.0000000000000000e+00 2.9585765613021695e+00 9.4298510733208438e+00 4.4628146030907967e+00 5 1 0
+264 1 0.0000000000000000e+00 3.5631996277847970e+00 8.7559603017703935e+00 4.1366664963129498e+00 3 1 -3
+1551 1 0.0000000000000000e+00 2.6446743011265150e+00 8.9612222061629918e+00 3.2373677733317097e+00 -4 1 3
+1419 1 0.0000000000000000e+00 3.9024552613430830e+00 7.6610348974377409e+00 4.4522482836104462e+00 0 0 2
+522 1 0.0000000000000000e+00 4.5576665574477087e+00 8.8076568113812463e+00 3.6352085485567529e+00 -2 0 -11
+994 1 0.0000000000000000e+00 4.6052873418993805e+00 8.7338229251730990e+00 4.5711915115095056e+00 -2 0 1
+1711 1 0.0000000000000000e+00 4.0304536046103481e+00 8.4096409045601259e+00 2.9265660330164609e+00 -5 0 -4
+1296 1 0.0000000000000000e+00 4.3971739552681477e+00 8.4062867476385428e+00 3.0410128559597522e+00 2 2 6
+2199 1 0.0000000000000000e+00 3.5072670462302193e+00 7.5008857279568240e+00 2.9064942002405978e+00 -3 -7 0
+1292 1 0.0000000000000000e+00 3.6497372591912867e+00 9.5361845437258470e+00 4.7603528189004747e+00 5 -2 0
+1723 1 0.0000000000000000e+00 3.8517258673470280e+00 9.7417935381216960e+00 3.2398453659482258e+00 6 -2 -2
+2705 1 0.0000000000000000e+00 3.9703776500687198e+00 8.4496485675375563e+00 4.9079951462229898e+00 3 3 -2
+32 1 0.0000000000000000e+00 3.0255633342541035e+00 7.6223285970775603e+00 3.8457692348979924e+00 2 -1 1
+565 1 0.0000000000000000e+00 3.5963915038692873e+00 9.6387876594795063e+00 3.9544847182370595e+00 2 -3 0
+995 1 0.0000000000000000e+00 3.2572128583616573e+00 9.9161953023940264e+00 2.7948659171201293e+00 5 0 5
+2309 1 0.0000000000000000e+00 2.7308736407646585e+00 7.8432553514954479e+00 4.9739203896053930e+00 -1 5 3
+1137 1 0.0000000000000000e+00 6.6671599509218499e-02 7.3528841066748276e+00 7.2630696947888609e+00 -2 1 -6
+672 1 0.0000000000000000e+00 1.8906956972949669e+00 6.0839474107788289e+00 6.6710675279185718e+00 10 -1 4
+1626 1 0.0000000000000000e+00 4.0167664017828419e-01 7.2945685228542656e+00 5.7295119043445766e+00 5 1 -7
+1138 1 0.0000000000000000e+00 2.4560074117911062e+00 7.4611619212476921e+00 7.1106304840063643e+00 -2 -1 -1
+942 1 0.0000000000000000e+00 2.0806946522915166e+00 6.1215927834770216e+00 5.5472506590368154e+00 3 1 4
+1161 1 0.0000000000000000e+00 1.2565662702457079e+00 6.3353424120415083e+00 5.9203398266493625e+00 0 4 -4
+1641 1 0.0000000000000000e+00 1.2578628008428212e+00 7.4969208534424085e+00 6.5581607935056834e+00 -1 -3 1
+503 1 0.0000000000000000e+00 1.6163365744043345e+00 6.3858858711019444e+00 5.1184215536821238e+00 1 4 -2
+87 1 0.0000000000000000e+00 6.4395178597922820e-01 7.2699612080845464e+00 5.5281979287334559e+00 8 2 5
+1071 1 0.0000000000000000e+00 2.3402250005616825e+00 7.3966065995981465e+00 6.5894115597464697e+00 0 -1 -1
+1913 1 0.0000000000000000e+00 2.6431992206960297e-01 5.6179350398082297e+00 6.7442560082782084e+00 6 4 1
+1125 1 0.0000000000000000e+00 1.6152653315472720e+00 6.0315826877160985e+00 7.2179856578346255e+00 3 2 1
+460 1 0.0000000000000000e+00 1.8602798579087136e+00 6.8594523334896627e+00 5.9122239314448803e+00 0 -2 5
+2557 1 0.0000000000000000e+00 1.8826333061461957e+00 6.7854172749611283e+00 7.1821206724000612e+00 -5 8 0
+1180 1 0.0000000000000000e+00 1.1080189995213439e+00 6.4105736141667879e+00 5.2587011057315296e+00 3 5 3
+801 1 0.0000000000000000e+00 2.0855277329144140e-01 6.0307218436946259e+00 7.3383663772218863e+00 0 5 3
+1204 1 0.0000000000000000e+00 5.6538148051974380e-01 6.8106878186977653e+00 6.8443519298664830e+00 2 4 -7
+2903 3 1.0000000000000000e+00 7.7693527432693288e-01 7.3568095887927365e+00 6.1199791040619802e+00 4 5 -1
+2072 1 0.0000000000000000e+00 1.4377238840264130e+00 5.1406168866237172e+00 6.0276973087326127e+00 4 -2 4
+1224 1 0.0000000000000000e+00 1.5065234512153827e+00 6.9293784823737790e+00 6.4253450146118141e+00 -8 -3 5
+1548 1 0.0000000000000000e+00 1.3995136776128665e+00 7.0561060226749737e+00 5.2753696426493502e+00 -1 -5 -2
+1861 1 0.0000000000000000e+00 1.9200629673390095e+00 5.3759680964703973e+00 5.2353134045880587e+00 3 5 1
+753 1 0.0000000000000000e+00 7.0870582677164196e-01 5.6555006624760606e+00 5.1365429837599912e+00 -4 2 0
+2992 3 1.0000000000000000e+00 1.5440344602750267e+00 5.4863347303883891e+00 6.0982305193786113e+00 -5 3 0
+2779 1 0.0000000000000000e+00 2.4200164018565840e+00 6.6206011285075776e+00 6.2690851357919080e+00 -1 -6 3
+1158 1 0.0000000000000000e+00 1.8522248466357571e+00 5.6860483677622904e+00 5.7032152931561040e+00 -1 -3 -5
+1198 1 0.0000000000000000e+00 2.3625948870452840e+00 5.9864153230337429e+00 6.8767133688132613e+00 1 3 5
+2648 1 0.0000000000000000e+00 2.3308823507640009e+00 5.5935736633656932e+00 6.5595768808473487e+00 4 1 2
+1152 1 0.0000000000000000e+00 2.1004771101570361e+00 7.3233976662478852e+00 6.3134963487263311e+00 1 4 -2
+594 1 0.0000000000000000e+00 1.0786821983962009e+00 6.3477189417363498e+00 7.0965088885249266e+00 -5 1 -1
+1679 1 0.0000000000000000e+00 6.0814140460900779e-01 5.4090757497124473e+00 5.7720476464115711e+00 2 0 5
+1901 1 0.0000000000000000e+00 7.1145096718069512e-01 5.7546567548049801e+00 6.1368035560031071e+00 0 1 5
+1930 1 0.0000000000000000e+00 2.5121168812285344e-01 5.9392216384098848e+00 5.5244399914502695e+00 -1 -9 2
+1248 1 0.0000000000000000e+00 1.1844668352517678e+00 5.1547287144234506e+00 7.1123956728039532e+00 3 -2 -3
+2120 1 0.0000000000000000e+00 1.0815663184600650e+00 6.8847098730710012e+00 7.4362999994548105e+00 -3 -1 3
+38 1 0.0000000000000000e+00 1.2023217273596238e+00 5.6785013379220421e+00 5.4314840842460326e+00 -1 -2 -3
+2590 1 0.0000000000000000e+00 5.9987570387524491e-01 6.4628980438419772e+00 5.8612611902292473e+00 -1 3 -4
+2888 2 -1.0000000000000000e+00 7.6268874103098505e-01 7.1692517655276733e+00 6.6547774292973232e+00 -1 0 -3
+2221 1 0.0000000000000000e+00 2.2850529304453424e+00 6.5771979042484352e+00 5.3277555283096625e+00 -6 1 -8
+514 1 0.0000000000000000e+00 1.1256695476899392e+00 6.0365160930057602e+00 6.6628201722073150e+00 -2 2 -3
+169 1 0.0000000000000000e+00 1.9919426545451342e+00 5.1593714680734140e+00 7.1115598552720085e+00 -3 1 2
+1377 1 0.0000000000000000e+00 1.6927423273221314e+00 5.3062332472293710e+00 6.6490169577432292e+00 0 -6 4
+752 1 0.0000000000000000e+00 7.6464188135271594e-01 6.3737401066553243e+00 6.3825486233052828e+00 0 0 -1
+1463 1 0.0000000000000000e+00 1.8402401549714738e+00 5.0157233238652879e+00 5.4296768826399742e+00 1 -3 0
+610 1 0.0000000000000000e+00 2.7299427670332372e+00 6.2027621278195380e+00 7.2803541209923104e+00 3 -5 -4
+699 1 0.0000000000000000e+00 2.9912199489888396e+00 5.8399020527819250e+00 5.4455786820396286e+00 2 -4 2
+1833 1 0.0000000000000000e+00 3.3368773176068318e+00 5.5578690882276982e+00 7.3847623700598355e+00 8 -3 0
+645 1 0.0000000000000000e+00 2.8665360731279907e+00 5.1696012780229399e+00 6.5369178530533008e+00 -4 -2 0
+469 1 0.0000000000000000e+00 3.2946904211335264e+00 5.0389399721974453e+00 6.1274553245483059e+00 -5 7 -5
+2543 1 0.0000000000000000e+00 4.9451776298779979e+00 7.1619953898964930e+00 5.0894863104873265e+00 7 1 -1
+2876 2 -1.0000000000000000e+00 3.9625596058814376e+00 6.5124077394787987e+00 5.4196229956218369e+00 7 0 0
+2061 1 0.0000000000000000e+00 3.3244474502463395e+00 5.6812594122408813e+00 5.9806172098050752e+00 -8 7 0
+332 1 0.0000000000000000e+00 4.6125312677323427e+00 7.4465513413300490e+00 5.0879714712844413e+00 -1 0 0
+346 1 0.0000000000000000e+00 4.5608543328765476e+00 7.0364984120513592e+00 7.2297299037601013e+00 -9 2 -6
+281 1 0.0000000000000000e+00 3.8359913673616304e+00 5.0865186774945972e+00 6.8090661954975600e+00 2 6 0
+412 1 0.0000000000000000e+00 4.7497560124725346e+00 6.3896012712628494e+00 6.0327450808597440e+00 -1 7 1
+818 1 0.0000000000000000e+00 3.0786043728747448e+00 6.1178504730235197e+00 6.4649959805936676e+00 5 0 -1
+1477 1 0.0000000000000000e+00 2.6643284544003940e+00 5.9959789646884349e+00 6.0578692720320797e+00 -4 -3 2
+2674 1 0.0000000000000000e+00 3.8757715873427561e+00 7.3143681448668989e+00 5.7765488900388497e+00 4 -2 -1
+57 1 0.0000000000000000e+00 4.0145855600531091e+00 6.0819232436462745e+00 5.6546870961366373e+00 -3 -2 5
+305 1 0.0000000000000000e+00 4.6234123746040128e+00 6.3878608677364621e+00 6.4140551830701087e+00 2 1 1
+1160 1 0.0000000000000000e+00 4.4827876999442742e+00 5.8568340345603298e+00 5.1689784498071791e+00 -1 -4 -7
+2959 3 1.0000000000000000e+00 4.0147500711397601e+00 6.1790186873103474e+00 6.0096531807784910e+00 -1 2 -3
+1554 1 0.0000000000000000e+00 2.9372326114022735e+00 6.6452802327179734e+00 6.9375610624451651e+00 1 -4 4
+2232 1 0.0000000000000000e+00 3.3569021398633541e+00 5.8889855573762766e+00 6.7013510792864057e+00 1 0 -2
+397 1 0.0000000000000000e+00 3.4155079315889405e+00 6.9550623674425331e+00 6.0189153059347635e+00 10 2 3
+1684 1 0.0000000000000000e+00 4.3307334712925725e+00 7.4682354609827959e+00 6.0018255669692655e+00 0 -8 -4
+1955 1 0.0000000000000000e+00 4.8826220771444317e+00 5.0491804133161944e+00 6.2070498609389873e+00 3 3 0
+667 1 0.0000000000000000e+00 3.6262574620674703e+00 6.6493528716513941e+00 6.7914135360770285e+00 -6 6 1
+584 1 0.0000000000000000e+00 3.4946863846062484e+00 6.9860722223160110e+00 5.1414009791176545e+00 -9 1 0
+1663 1 0.0000000000000000e+00 2.7722552754752372e+00 6.3918753339447347e+00 5.7455120773776613e+00 1 -3 4
+2313 1 0.0000000000000000e+00 4.7940945985417223e+00 5.3295454047255042e+00 7.0652244897627741e+00 -2 1 4
+1008 1 0.0000000000000000e+00 2.6073585437686795e+00 7.2609744685564506e+00 5.5805701497045712e+00 2 2 2
+558 1 0.0000000000000000e+00 3.0279781046224086e+00 7.2494186322069547e+00 6.9573811343923770e+00 2 -5 4
+1850 1 0.0000000000000000e+00 4.8026335247213314e+00 7.4861716049133458e+00 6.4745690458054153e+00 4 1 -2
+580 1 0.0000000000000000e+00 2.6415298352593792e+00 5.2622141861436997e+00 5.6907259965031880e+00 -4 4 3
+651 1 0.0000000000000000e+00 3.7677472609942462e+00 5.5887875859725975e+00 7.3327624161832921e+00 -5 1 1
+66 1 0.0000000000000000e+00 4.7977302772142920e+00 6.8950185953204395e+00 6.5118571174658930e+00 0 -4 3
+2022 1 0.0000000000000000e+00 3.4701913505991593e+00 5.5065628990752691e+00 5.3515167069073861e+00 -4 -6 0
+2158 1 0.0000000000000000e+00 3.9460296125941272e+00 6.3880606686722645e+00 6.7923864515689161e+00 0 3 6
+2233 1 0.0000000000000000e+00 4.0927519367964997e+00 7.1070113299938793e+00 7.1511610483706285e+00 4 2 3
+2015 1 0.0000000000000000e+00 4.2501589303990661e+00 5.9104431447206034e+00 7.4234941884859111e+00 8 -7 3
+1716 1 0.0000000000000000e+00 4.5184809127409906e+00 5.5436434346492058e+00 5.8378462448485031e+00 5 -5 -2
+2275 1 0.0000000000000000e+00 4.8431941942468804e+00 6.3021160074795084e+00 7.2245516932931242e+00 3 3 2
+536 1 0.0000000000000000e+00 3.4248352480470357e+00 6.4410300406499079e+00 6.0218124703108806e+00 -4 1 7
+528 1 0.0000000000000000e+00 3.9183141029040707e+00 7.0344457420779820e+00 6.5222365606515496e+00 1 1 2
+300 1 0.0000000000000000e+00 4.2876669463276240e+00 6.9847063089205719e+00 5.8492888030833781e+00 -3 1 7
+907 1 0.0000000000000000e+00 4.5275192017467054e+00 5.8219148543848247e+00 6.5177270534616527e+00 0 3 -7
+2760 1 0.0000000000000000e+00 3.9400712709469334e+00 5.7293804994525956e+00 5.1003136578229196e+00 1 -1 3
+912 1 0.0000000000000000e+00 3.8042356143291043e+00 5.7407947654271041e+00 6.2662608677359657e+00 0 -4 -2
+364 1 0.0000000000000000e+00 4.9902879047847142e+00 6.2682783778459052e+00 5.3952534485963017e+00 4 0 0
+2209 1 0.0000000000000000e+00 1.2969952520647032e+00 9.3649092215495955e+00 6.9435369592929161e+00 -3 -2 3
+1630 1 0.0000000000000000e+00 1.6349628443954329e+00 8.0109402851600837e+00 6.7648587438031926e+00 2 -2 2
+2380 1 0.0000000000000000e+00 8.7182076646311613e-02 8.5756026547085131e+00 6.8013080983105114e+00 4 -5 0
+2754 1 0.0000000000000000e+00 7.8159532454503933e-01 8.0371618696896654e+00 5.8896492601586932e+00 5 2 0
+234 1 0.0000000000000000e+00 2.0960218639468930e+00 8.2377374357479596e+00 6.7686416164578986e+00 3 -4 0
+350 1 0.0000000000000000e+00 1.5186507381704137e-01 9.4440246871596614e+00 5.1334438215450344e+00 0 -9 2
+739 1 0.0000000000000000e+00 2.4711275069921639e+00 9.0385012154647040e+00 6.3185617225388215e+00 9 -2 1
+1614 1 0.0000000000000000e+00 1.7640400754159852e-01 8.6422493510070097e+00 5.0335928315277494e+00 2 6 -5
+2530 1 0.0000000000000000e+00 1.7570428525672710e+00 9.8765179764213133e+00 6.5143958031709861e+00 -1 3 -2
+2988 3 1.0000000000000000e+00 7.4316326470335270e-01 8.9664759215367233e+00 5.3943834446297858e+00 6 4 0
+89 1 0.0000000000000000e+00 6.0420261250334639e-01 7.6851976261898631e+00 7.0751115078776152e+00 -7 -5 8
+213 1 0.0000000000000000e+00 1.2934225718715882e+00 9.4618456967112525e+00 6.0889235767388508e+00 1 -1 2
+564 1 0.0000000000000000e+00 4.8039438949206842e-01 9.3818517210542165e+00 6.4355895758254222e+00 -2 -1 1
+1519 1 0.0000000000000000e+00 1.9580444515178363e+00 7.6663875058903637e+00 5.7135785126531395e+00 0 4 -2
+1895 1 0.0000000000000000e+00 4.8177826257051670e-01 9.9741308624009442e+00 6.9109096088429069e+00 -2 2 -3
+1282 1 0.0000000000000000e+00 1.2652840380838939e-01 7.9698672629439118e+00 6.2365511444307042e+00 5 2 5
+1435 1 0.0000000000000000e+00 1.0567411931400881e+00 9.5176984737043462e+00 5.0369493817738231e+00 7 -4 -2
+1647 1 0.0000000000000000e+00 1.6609365874636732e+00 8.3588963324649779e+00 5.7722167455894136e+00 -2 0 -3
+1272 1 0.0000000000000000e+00 1.4300408789987449e+00 9.0059950744458988e+00 5.9842771302666842e+00 1 5 -1
+2050 1 0.0000000000000000e+00 6.4363588406458228e-01 8.0305482938609405e+00 5.7463827358369706e+00 -1 -2 1
+2523 1 0.0000000000000000e+00 2.4441578634296395e+00 9.6201429177889271e+00 6.1857378908477463e+00 -6 -3 3
+1831 1 0.0000000000000000e+00 2.1586889692552513e+00 9.8552380996975977e+00 6.9838151326624667e+00 -2 3 -2
+1232 1 0.0000000000000000e+00 3.3670710192195707e-01 9.2246703241156887e+00 6.6295485367013507e+00 3 -3 3
+2790 1 0.0000000000000000e+00 2.3538651955376846e+00 8.2072238478751167e+00 5.1292082691802152e+00 0 1 -1
+2522 1 0.0000000000000000e+00 1.3183512278049909e+00 8.3339211955747690e+00 6.5949052671418409e+00 -1 2 1
+1479 1 0.0000000000000000e+00 1.7360842101784471e+00 9.0011353711290774e+00 6.3705948169308035e+00 2 4 0
+2610 1 0.0000000000000000e+00 4.7671513895691076e-01 9.8330559090487846e+00 6.0896725527803506e+00 7 3 0
+2140 1 0.0000000000000000e+00 1.5448629333031170e+00 7.5201734596175136e+00 7.2394304371352893e+00 -3 1 -1
+2649 1 0.0000000000000000e+00 1.4948717106413072e+00 7.5041485076597754e+00 5.4390780442242397e+00 2 -3 2
+936 1 0.0000000000000000e+00 6.9812491530072762e-01 7.6507695147692623e+00 5.1404242299081551e+00 -4 0 -2
+845 1 0.0000000000000000e+00 7.6357528838296485e-01 8.7320532080445457e+00 6.5446514315173605e+00 4 2 0
+1403 1 0.0000000000000000e+00 6.9574449025029672e-01 8.3857048774086849e+00 7.1930215679716714e+00 -2 2 -7
+2852 2 -1.0000000000000000e+00 1.9644930383206380e+00 9.6385076986605007e+00 5.4339922223233321e+00 6 1 -5
+780 1 0.0000000000000000e+00 2.2365586171755578e+00 8.7826850051716967e+00 5.3490574639181219e+00 9 2 -5
+2495 1 0.0000000000000000e+00 2.3296119169969187e+00 8.4145528693039484e+00 6.0737128557460514e+00 0 -1 -3
+1656 1 0.0000000000000000e+00 1.0119405666149874e+00 9.8743151910109166e+00 6.9139028347778044e+00 4 0 6
+2613 1 0.0000000000000000e+00 7.7017759897560012e-01 8.8979018660342479e+00 5.8857954841453068e+00 0 2 10
+161 1 0.0000000000000000e+00 8.1362818669274573e-01 7.5357448509838356e+00 7.4919803495936863e+00 3 -6 -1
+1512 1 0.0000000000000000e+00 1.4722682077133529e+00 8.4029275600313671e+00 5.4267988887893948e+00 -1 -3 0
+1342 1 0.0000000000000000e+00 6.9173325312261846e-01 9.4530905311535474e+00 7.3883196392384480e+00 1 -1 3
+266 1 0.0000000000000000e+00 2.3085231231027090e+00 9.1259571360450789e+00 6.8497860676769076e+00 -4 -3 -3
+2016 1 0.0000000000000000e+00 1.6068642008136180e-02 9.4701265631202354e+00 5.7699003276226986e+00 4 -2 -2
+2285 1 0.0000000000000000e+00 1.1768709335891994e+00 8.1632140703419935e+00 5.0084638036098434e+00 0 1 -2
+1518 1 0.0000000000000000e+00 3.7697768540376648e+00 8.1538771493577844e+00 5.3401663269987525e+00 7 -6 -3
+833 1 0.0000000000000000e+00 3.3839051312183206e+00 9.8170547704780873e+00 5.5261606828720105e+00 1 1 0
+1665 1 0.0000000000000000e+00 4.5783292621155169e+00 9.6899421227265972e+00 6.4675327612092595e+00 -2 4 3
+2235 1 0.0000000000000000e+00 4.5984006553948165e+00 9.1344191900781588e+00 5.7682806532430773e+00 -2 -3 2
+933 1 0.0000000000000000e+00 4.5646891881512763e+00 8.7820150288057430e+00 6.0251438961476254e+00 -2 6 0
+1490 1 0.0000000000000000e+00 3.0787450732578181e+00 9.0308108045571878e+00 5.8339854014425070e+00 -3 -1 -6
+929 1 0.0000000000000000e+00 4.3462517835741776e+00 8.3074608079392238e+00 7.1772604614455213e+00 2 -1 0
+2170 1 0.0000000000000000e+00 3.5525379016321814e+00 9.7138498874153996e+00 5.7961115037002777e+00 -3 6 -3
+382 1 0.0000000000000000e+00 4.3022108949270237e+00 9.4881420932506160e+00 6.7301770019398361e+00 9 -2 1
+901 1 0.0000000000000000e+00 4.5810728582526190e+00 8.5230570247141006e+00 5.0679182660124447e+00 -2 2 1
+2698 1 0.0000000000000000e+00 2.9223172696371300e+00 9.7801013704172455e+00 6.7365855776396035e+00 -2 4 4
+692 1 0.0000000000000000e+00 4.6046673931647151e+00 7.9351199836855599e+00 7.0227547025604826e+00 1 -2 4
+1032 1 0.0000000000000000e+00 4.6267844903908806e+00 8.7396002200007317e+00 6.8385713171327174e+00 -5 6 -1
+2611 1 0.0000000000000000e+00 2.7638946849227044e+00 9.0465695002360462e+00 5.5951432952993265e+00 2 -3 -3
+45 1 0.0000000000000000e+00 3.7675166159258580e+00 7.6082622927992043e+00 7.2394909330768265e+00 -3 -5 -4
+707 1 0.0000000000000000e+00 2.8062628526608773e+00 8.5381837538340832e+00 7.0995142013602814e+00 3 -2 0
+110 1 0.0000000000000000e+00 3.1591527792364280e+00 8.6348032108572088e+00 5.0956499987642339e+00 9 -1 13
+2151 1 0.0000000000000000e+00 3.9751178585013403e+00 8.4150193989317863e+00 6.5384813849201686e+00 6 -2 -3
+1762 1 0.0000000000000000e+00 3.0981297666877334e+00 8.1496228046304111e+00 6.1821457914877529e+00 1 -5 -6
+1388 1 0.0000000000000000e+00 4.6717813016616754e+00 9.5591629950104444e+00 7.3149217093341123e+00 3 -2 -8
+2260 1 0.0000000000000000e+00 3.4439873963532053e+00 9.7903486015043093e+00 6.4452211783534841e+00 8 1 -4
+2135 1 0.0000000000000000e+00 3.6947194158397263e+00 9.9995356560699928e+00 7.0042299804737906e+00 -8 5 1
+1894 1 0.0000000000000000e+00 4.3215407815835940e+00 9.7236239743589277e+00 5.0244657608304797e+00 1 0 -1
+2389 1 0.0000000000000000e+00 4.0574441221701143e+00 8.2425633978619288e+00 5.7786103104046935e+00 -2 2 -7
+2572 1 0.0000000000000000e+00 3.6821383910587522e+00 7.7507418429025758e+00 5.1763545508421016e+00 8 -1 -1
+641 1 0.0000000000000000e+00 3.2941311336203856e+00 8.1327345257513972e+00 7.2811875598977327e+00 -5 -10 3
+167 1 0.0000000000000000e+00 3.7996017332490784e+00 8.9760412607477296e+00 6.5508660680448090e+00 2 -3 -1
+120 1 0.0000000000000000e+00 2.5590411152113441e+00 7.5544709336907383e+00 6.1875748452319126e+00 3 0 1
+1458 1 0.0000000000000000e+00 2.8018322385770364e+00 8.8725970713755125e+00 6.5030408316347987e+00 2 8 8
+337 1 0.0000000000000000e+00 2.7374787275383983e+00 9.8002503683561315e+00 5.9248063012772727e+00 -4 2 5
+1474 1 0.0000000000000000e+00 4.4695105269977375e+00 8.0252458082955922e+00 5.8875995387702655e+00 2 -3 -3
+797 1 0.0000000000000000e+00 2.6125293597636463e+00 9.9039940940559763e+00 5.2464965985719472e+00 -2 0 -4
+2391 1 0.0000000000000000e+00 3.9958821903320745e+00 9.0820385038865226e+00 5.4938819360112383e+00 0 0 1
+926 1 0.0000000000000000e+00 3.5041079941699893e+00 8.7707017864187584e+00 5.8387212658118095e+00 5 0 4
+1433 1 0.0000000000000000e+00 3.2412211311130639e+00 7.7845505526554719e+00 5.3256581111065735e+00 -3 5 5
+2858 2 -1.0000000000000000e+00 3.6358757704588132e+00 7.6341945993421882e+00 6.6341200996371184e+00 -3 1 3
+1817 1 0.0000000000000000e+00 3.5256012849107750e+00 9.6077650855601373e+00 6.9919256747406218e+00 2 0 -3
+2594 1 0.0000000000000000e+00 3.4919417238835564e+00 8.6464858918639553e+00 6.8045779480431765e+00 -4 -6 0
+1808 1 0.0000000000000000e+00 3.6901823485381131e+00 8.2427237104073576e+00 7.3850720609522016e+00 -2 -2 1
+2749 1 0.0000000000000000e+00 4.4445122136633222e+00 9.2049603975343235e+00 6.8110986756910501e+00 -7 -3 -4
+250 1 0.0000000000000000e+00 4.1082812003761209e+00 9.4316425255273373e+00 5.8775875968362445e+00 7 -1 -10
+975 1 0.0000000000000000e+00 3.3487681058423879e+00 7.5214909350295294e+00 5.8158393525967753e+00 -2 -3 3
+1830 1 0.0000000000000000e+00 1.0504446125325109e+00 7.4325773831440340e+00 9.7359283133591763e+00 -3 2 1
+1016 1 0.0000000000000000e+00 9.8712226523956581e-01 7.2468011169226543e+00 7.8674903152372400e+00 -1 4 -2
+2809 2 -1.0000000000000000e+00 3.5649704249426001e-01 5.1278068813684508e+00 8.7768073327666887e+00 3 -5 5
+980 1 0.0000000000000000e+00 2.2685686780238088e+00 6.7902090119846088e+00 8.6564428815880152e+00 -4 2 0
+1068 1 0.0000000000000000e+00 3.6918215595478626e-01 6.5059903741308380e+00 8.9723373710121450e+00 1 9 0
+2346 1 0.0000000000000000e+00 1.2883840574920571e+00 6.1924523738188784e+00 9.1687246691289470e+00 -4 1 0
+194 1 0.0000000000000000e+00 1.0470636548848300e+00 6.9893198671237773e+00 9.4425441189034043e+00 0 1 -2
+47 1 0.0000000000000000e+00 3.5826475268858321e-01 5.0352159720199827e+00 7.9599894590046336e+00 2 0 0
+330 1 0.0000000000000000e+00 9.1961129926615218e-02 6.6925571422642793e+00 8.4186027276009003e+00 7 -8 2
+1238 1 0.0000000000000000e+00 1.5878085091318304e+00 6.4750885338316717e+00 9.0641802658037118e+00 8 -2 0
+1332 1 0.0000000000000000e+00 2.4685466130037015e+00 5.3384081809278294e+00 9.7470210700464932e+00 5 -1 -5
+1448 1 0.0000000000000000e+00 2.2687356386563762e+00 6.6324833944840993e+00 7.6687304138843313e+00 3 3 -1
+2540 1 0.0000000000000000e+00 1.4128255167772161e+00 7.0387343830022697e+00 9.1794033890616902e+00 -5 -4 -2
+2089 1 0.0000000000000000e+00 1.7922949032908881e+00 5.6708723543166899e+00 9.9829343462362239e+00 1 -2 5
+356 1 0.0000000000000000e+00 2.3468354462337797e+00 6.4177152376921738e+00 9.0453934823481461e+00 0 1 7
+654 1 0.0000000000000000e+00 1.9329174659420125e+00 5.9119150565564684e+00 8.4524906898958267e+00 -3 3 0
+1851 1 0.0000000000000000e+00 1.7614793693389381e+00 6.4093723831204592e+00 7.6131594359904211e+00 -3 0 -4
+1872 1 0.0000000000000000e+00 4.6820662657330980e-02 7.0185599154779128e+00 9.0794829299077886e+00 2 -1 1
+218 1 0.0000000000000000e+00 7.8588752247469962e-01 5.7585456607871954e+00 8.5482186802402804e+00 4 0 -6
+1444 1 0.0000000000000000e+00 7.4299962955517940e-01 6.5236517235034093e+00 9.7220579374616580e+00 5 -3 0
+1027 1 0.0000000000000000e+00 1.4177017166685011e+00 5.7926067582374969e+00 8.1434709823764475e+00 1 0 4
+647 1 0.0000000000000000e+00 1.8131050678485536e+00 6.4389930093698933e+00 8.1183307869430745e+00 -1 -2 1
+1847 1 0.0000000000000000e+00 2.2567952819190364e+00 7.2244493422847844e+00 8.0814636910438349e+00 2 0 3
+788 1 0.0000000000000000e+00 4.0522932056050814e-01 6.3221694090780387e+00 8.0818079249641066e+00 0 3 0
+2961 3 1.0000000000000000e+00 1.3870427668696184e+00 6.4830609219007176e+00 8.4390214412706772e+00 -1 1 2
+1926 1 0.0000000000000000e+00 1.2620608045112107e+00 5.3374664297676766e+00 8.9140488855195148e+00 9 3 1
+1970 1 0.0000000000000000e+00 2.3004422043251065e+00 6.0048983036254162e+00 7.7393098498439379e+00 1 -5 0
+1556 1 0.0000000000000000e+00 1.0038032568596160e+00 5.8290659541509573e+00 7.5433860257938337e+00 -2 -7 2
+400 1 0.0000000000000000e+00 7.2923537052343568e-01 5.3357115232998433e+00 9.5721256727224091e+00 5 -6 -2
+391 1 0.0000000000000000e+00 1.8836517767756298e+00 6.7048558919803263e+00 9.8696139720276488e+00 0 -1 -1
+2651 1 0.0000000000000000e+00 7.4671604310708239e-01 5.7657836830320228e+00 9.5823443086035933e+00 -2 -10 -4
+328 1 0.0000000000000000e+00 8.7741575301915198e-01 6.4583491877351582e+00 7.6045498575080215e+00 -2 -3 3
+1130 1 0.0000000000000000e+00 1.9568881138492396e+00 5.5184483298732108e+00 9.2733189056402576e+00 -5 -7 -1
+1933 1 0.0000000000000000e+00 2.3943565971120635e+00 6.1821218300242915e+00 9.3092886334190599e+00 1 -3 1
+2053 1 0.0000000000000000e+00 1.9704755608260780e+00 5.1419082301623167e+00 7.9415720320098133e+00 -1 -1 7
+2505 1 0.0000000000000000e+00 7.3869440929761354e-01 6.3277029549570125e+00 8.6151209490848135e+00 1 -1 0
+1787 1 0.0000000000000000e+00 2.4792140102593709e+00 5.2024867796476988e+00 8.5606738272601319e+00 1 0 -10
+2843 2 -1.0000000000000000e+00 2.2829648903210260e+00 5.7735383478775262e+00 8.5016300992073308e+00 0 -1 2
+1545 1 0.0000000000000000e+00 2.1068678739666051e+00 7.1354839291301539e+00 9.6133707515316082e+00 -2 -6 4
+1761 1 0.0000000000000000e+00 1.8384214420767266e+00 5.4417602743842286e+00 9.0411726673208328e+00 1 1 1
+1725 1 0.0000000000000000e+00 4.3998674898179091e-01 7.0061516392800938e+00 8.5513986908465771e+00 4 0 2
+1454 1 0.0000000000000000e+00 2.1168497314059675e-01 6.4783643887866686e+00 7.8294061055526027e+00 2 10 1
+1210 1 0.0000000000000000e+00 1.8440308551063715e+00 7.4529715033085910e+00 7.9088559393011781e+00 3 -8 -1
+2587 1 0.0000000000000000e+00 3.9562572225596820e-01 5.6861265512959074e+00 8.3600952316184500e+00 -2 -1 -3
+2699 1 0.0000000000000000e+00 1.3882096498059389e+00 7.1489805519231364e+00 8.3368651567445600e+00 -5 -1 -2
+1157 1 0.0000000000000000e+00 9.3629573559587009e-01 7.3168573846765970e+00 8.4218449389330452e+00 2 2 6
+1633 1 0.0000000000000000e+00 1.0922778069026617e+00 5.3159645832857452e+00 7.6341049261096723e+00 2 4 -6
+604 1 0.0000000000000000e+00 5.6773637726908666e-01 7.4141984945245758e+00 9.5503742401398171e+00 -2 3 -5
+2617 1 0.0000000000000000e+00 1.7957350600457134e-01 5.6959959035736594e+00 7.6432848705377356e+00 -3 2 -4
+2693 1 0.0000000000000000e+00 1.1973120094989815e+00 5.1617728928972992e+00 8.4056451967614194e+00 6 -2 3
+2882 2 -1.0000000000000000e+00 1.9569709758312639e+00 5.9833472062552540e+00 9.8696505237967127e+00 2 -2 1
+1100 1 0.0000000000000000e+00 3.7738571749360306e+00 5.7961587018647069e+00 8.3707860001669196e+00 3 -2 -1
+2608 1 0.0000000000000000e+00 3.8426099210203479e+00 7.1682675544387147e+00 8.2865256787130175e+00 0 1 2
+2102 1 0.0000000000000000e+00 4.5541589289591480e+00 6.7437031066476116e+00 8.3900543272677215e+00 2 -6 5
+2282 1 0.0000000000000000e+00 3.0050501330681443e+00 5.4414002318008947e+00 8.0596170448292259e+00 3 3 -2
+2353 1 0.0000000000000000e+00 4.5582551270943830e+00 5.2384986044852866e+00 8.9266720074323125e+00 3 -5 -3
+2307 1 0.0000000000000000e+00 3.0442256900749123e+00 5.2998223203573662e+00 8.7502952130614737e+00 5 7 3
+1445 1 0.0000000000000000e+00 3.4653280379788476e+00 6.4450546452643440e+00 8.9369679242248843e+00 3 5 -4
+2664 1 0.0000000000000000e+00 2.7031119057714852e+00 5.0850412185493425e+00 7.8481958663023024e+00 4 -3 2
+1424 1 0.0000000000000000e+00 3.4202351722121125e+00 7.3418595764864900e+00 9.2870673389861249e+00 -1 -1 -1
+2054 1 0.0000000000000000e+00 3.8762232608643781e+00 6.1369801117747533e+00 9.2973402572898642e+00 -2 -2 -3
+2924 3 1.0000000000000000e+00 3.6004657127825670e+00 7.4392640450104199e+00 9.1216563818835663e+00 6 -7 2
+1468 1 0.0000000000000000e+00 3.3072449326155779e+00 6.7953398074026570e+00 7.6775111873141615e+00 -1 -2 2
+1674 1 0.0000000000000000e+00 4.7081557134659580e+00 5.5460727425016731e+00 8.2360344186470265e+00 -9 4 -5
+751 1 0.0000000000000000e+00 3.7479862249719984e+00 5.3364078237575034e+00 9.1220231175645257e+00 -1 -2 1
+2033 1 0.0000000000000000e+00 2.6336261319393093e+00 6.9049585473290636e+00 9.7250873691753092e+00 -3 -3 -1
+830 1 0.0000000000000000e+00 4.4474339429449774e+00 6.2425900846752125e+00 8.8440001552131999e+00 2 -1 -9
+1067 1 0.0000000000000000e+00 4.5830156120794969e+00 6.8784366537562898e+00 7.8661902114949678e+00 -5 0 7
+1009 1 0.0000000000000000e+00 4.4324985410080755e+00 6.0056984008018466e+00 7.9234021538255766e+00 -1 -2 -3
+2321 1 0.0000000000000000e+00 2.8168682736350688e+00 6.6824332711771683e+00 8.0688195902327848e+00 1 -7 3
+1741 1 0.0000000000000000e+00 3.2926131097951639e+00 7.4813907189230866e+00 8.5440088643371670e+00 3 3 3
+2609 1 0.0000000000000000e+00 3.0036702200762941e+00 5.9538719923446735e+00 9.0724998655462059e+00 0 3 3
+451 1 0.0000000000000000e+00 3.7974638381747674e+00 6.8759880266193960e+00 7.8385084618168408e+00 -2 3 2
+41 1 0.0000000000000000e+00 2.9910112413186805e+00 6.0417763603094841e+00 8.7380873673590784e+00 1 -4 -2
+1392 1 0.0000000000000000e+00 3.5111181868276136e+00 6.5188837744301926e+00 8.4587928940183481e+00 1 2 4
+3000 3 1.0000000000000000e+00 2.7434607638993609e+00 5.3241442401834300e+00 9.6097506117435998e+00 4 -3 2
+2762 1 0.0000000000000000e+00 3.8969093803963006e+00 5.1465084915644654e+00 7.9002543347147931e+00 1 3 0
+567 1 0.0000000000000000e+00 3.6160207899632821e+00 6.6262387292502165e+00 9.6523193578876540e+00 7 -5 -7
+338 1 0.0000000000000000e+00 4.6550422361024291e+00 6.3710876751881251e+00 9.5352945031930751e+00 2 1 3
+1335 1 0.0000000000000000e+00 2.8133790730241985e+00 5.8760814445213621e+00 9.8405184247290158e+00 7 2 3
+1001 1 0.0000000000000000e+00 4.2772928751297217e+00 6.2559648067494686e+00 9.6958757102803421e+00 6 -7 3
+681 1 0.0000000000000000e+00 3.9517449716984867e+00 6.1904978185300088e+00 8.1694201335320962e+00 4 -5 -3
+1288 1 0.0000000000000000e+00 3.3754059678470751e+00 5.8601641526483386e+00 9.6110172627940660e+00 -3 0 -5
+2802 1 0.0000000000000000e+00 4.4946340879871620e+00 6.9563650770136700e+00 9.0915448333550444e+00 1 5 3
+1720 1 0.0000000000000000e+00 3.0612666626615002e+00 6.8769868510738625e+00 8.6078303703525485e+00 1 -6 -3
+429 1 0.0000000000000000e+00 4.0456214173695582e+00 5.4289358377529711e+00 9.8383517543612520e+00 -3 0 2
+1785 1 0.0000000000000000e+00 2.8941793364319790e+00 6.3868709421910106e+00 9.8451221377209226e+00 3 0 -5
+1014 1 0.0000000000000000e+00 3.0409362550705947e+00 7.4807419310638084e+00 9.9352074796133429e+00 -5 -4 -3
+1922 1 0.0000000000000000e+00 2.6793618608513534e+00 7.0975461948476291e+00 8.9257033606546834e+00 4 -1 1
+1451 1 0.0000000000000000e+00 4.9906348099044218e+00 5.4312644590259849e+00 9.1750624253884574e+00 0 -4 -3
+2376 1 0.0000000000000000e+00 3.1747249884460418e+00 6.1982324157403177e+00 7.9683215046112696e+00 -6 1 1
+1631 1 0.0000000000000000e+00 4.5620116030997488e+00 5.1279356468791732e+00 7.8150396042730481e+00 -6 4 -2
+2440 1 0.0000000000000000e+00 4.7706110263809594e+00 7.1451708120416733e+00 9.6938191520292154e+00 -3 -3 -6
+1565 1 0.0000000000000000e+00 3.8845923721881479e+00 6.2609541041721508e+00 7.5956413430389702e+00 -3 4 0
+436 1 0.0000000000000000e+00 4.1342887661987335e+00 7.1610001686259546e+00 9.9755950909787181e+00 2 -2 0
+2726 1 0.0000000000000000e+00 2.8713855583654597e+00 7.2996618741370956e+00 7.7348339336208385e+00 -1 4 3
+1777 1 0.0000000000000000e+00 9.1977065986631856e-01 8.0807242432112254e+00 7.9486885544469628e+00 2 1 3
+2944 3 1.0000000000000000e+00 1.6279399698140447e+00 9.5371756882783156e+00 9.1946953328320422e+00 -2 2 -2
+2045 1 0.0000000000000000e+00 5.8604106784909038e-01 9.3593084467898819e+00 9.0610190355600757e+00 6 0 -3
+1302 1 0.0000000000000000e+00 4.8161471170021647e-01 8.8947703531628832e+00 9.7743834902237907e+00 -5 -4 -1
+1947 1 0.0000000000000000e+00 1.9892402341343529e+00 8.6073537686730077e+00 7.6105913743958880e+00 3 2 2
+1179 1 0.0000000000000000e+00 1.2196347924541615e+00 9.3527307787650837e+00 9.4581926402692531e+00 -5 4 -2
+1974 1 0.0000000000000000e+00 2.2729190329620744e-01 8.5624650577403685e+00 9.5771114094866530e+00 -1 2 -7
+2090 1 0.0000000000000000e+00 2.0738446299005828e-02 7.5115865630922691e+00 8.2049989093315308e+00 1 3 -1
+925 1 0.0000000000000000e+00 1.4809703029988495e+00 8.1565208315840003e+00 8.3597993711233549e+00 -1 0 0
+1937 1 0.0000000000000000e+00 6.0404344556707790e-01 7.9545850136477174e+00 8.9472323550678770e+00 -1 0 2
+1929 1 0.0000000000000000e+00 3.8204838337915653e-01 8.9065499366619143e+00 7.6002180134265194e+00 1 -2 0
+849 1 0.0000000000000000e+00 1.8034766522629355e+00 7.5342849154614671e+00 8.5447749594979321e+00 3 4 -5
+2864 2 -1.0000000000000000e+00 8.1865871152691572e-01 8.4238063509887429e+00 9.5721938870574288e+00 2 -4 -4
+2101 1 0.0000000000000000e+00 2.4724784945167828e+00 9.1136598706647067e+00 8.8085410024813289e+00 9 1 4
+170 1 0.0000000000000000e+00 2.1942920687785223e+00 8.8381883814001849e+00 8.4401946360286022e+00 -3 1 -2
+2740 1 0.0000000000000000e+00 2.8246037896406490e-01 9.5269684690547169e+00 8.5270272640417009e+00 4 -3 2
+961 1 0.0000000000000000e+00 2.0407797853475720e+00 8.2268776907844838e+00 8.6035726146736415e+00 -4 6 1
+990 1 0.0000000000000000e+00 1.5416678151795019e-01 9.3872114142489114e+00 8.6818997059882346e+00 -5 -7 0
+1781 1 0.0000000000000000e+00 1.5805480947876758e+00 8.6804374822536019e+00 9.2303598555066309e+00 1 -4 3
+2759 1 0.0000000000000000e+00 9.7380287654998110e-01 9.5784622490153648e+00 8.1113811757409433e+00 -2 -3 2
+2289 1 0.0000000000000000e+00 7.9581231691440235e-01 9.1345141384214408e+00 9.3223022839004308e+00 -1 0 -1
+576 1 0.0000000000000000e+00 1.3596905277946429e+00 8.7104350953773704e+00 8.7917414888606462e+00 -3 0 -3
+718 1 0.0000000000000000e+00 1.8086795898427239e+00 9.5874162707643098e+00 8.5440690654068501e+00 2 0 0
+1897 1 0.0000000000000000e+00 1.8440479803717060e+00 9.6333916602276304e+00 9.8130399611706327e+00 -4 -3 1
+125 1 0.0000000000000000e+00 6.2353764149130142e-01 8.9277020230323068e+00 8.0615844411772919e+00 5 1 0
+1793 1 0.0000000000000000e+00 3.0537246031229442e-01 8.5518344070323487e+00 8.9881333999781123e+00 5 5 -2
+2143 1 0.0000000000000000e+00 6.5429585989453509e-01 8.4428087613866794e+00 8.3407971252412505e+00 6 -4 1
+2509 1 0.0000000000000000e+00 2.0833065754411351e+00 9.5401102622810612e+00 7.7212554348338562e+00 1 1 2
+777 1 0.0000000000000000e+00 1.4698069407380046e+00 9.1746119471983860e+00 8.4144869210853415e+00 -1 -2 -3
+526 1 0.0000000000000000e+00 1.6329907017653285e+00 8.6278106229959484e+00 9.6614529000402065e+00 -3 -3 2
+1857 1 0.0000000000000000e+00 1.0985164691994220e+00 7.8569119893651012e+00 9.0916633140711856e+00 7 0 -10
+272 1 0.0000000000000000e+00 1.7377850889013642e+00 8.0056677861618226e+00 9.3788991272554156e+00 -2 2 -3
+596 1 0.0000000000000000e+00 2.2841174737173393e+00 8.8580009115739760e+00 9.7087111751015751e+00 0 -6 2
+34 1 0.0000000000000000e+00 2.5587994280236759e-01 9.6365807810752422e+00 7.5723281139552991e+00 0 -6 4
+2253 1 0.0000000000000000e+00 2.8472164820399432e-01 7.8299818390622971e+00 8.3384369310223523e+00 -1 3 -4
+2028 1 0.0000000000000000e+00 2.2633283783068596e+00 8.1719077543166261e+00 8.0087893672509729e+00 2 0 -3
+1624 1 0.0000000000000000e+00 6.1409763007390296e-02 7.8146643227628880e+00 7.8650557427583845e+00 4 -1 0
+2383 1 0.0000000000000000e+00 1.1494106524083270e+00 9.1659011010296663e+00 7.9273813122933241e+00 0 5 4
+2732 1 0.0000000000000000e+00 2.3041623421930169e+00 8.4328842151114998e+00 9.0790376869598024e+00 1 0 1
+2377 1 0.0000000000000000e+00 3.0765059106148801e-01 9.7741507926080047e+00 9.3776272707118640e+00 2 3 -1
+1552 1 0.0000000000000000e+00 2.2706436290699354e+00 7.5103469955871534e+00 8.7969214348809999e+00 1 -1 2
+717 1 0.0000000000000000e+00 1.5883859293215123e+00 9.9693174082174778e+00 9.9024905840994126e+00 4 -1 -9
+2030 1 0.0000000000000000e+00 2.4083871978474907e+00 7.9738365385613008e+00 7.5298881631002832e+00 -3 -4 -5
+784 1 0.0000000000000000e+00 8.3036651166716746e-01 9.9751026457589944e+00 7.9817500944999562e+00 4 -2 -5
+331 1 0.0000000000000000e+00 2.1128993830335658e+00 9.7242491841773777e+00 8.5266497490363715e+00 1 -2 2
+2724 1 0.0000000000000000e+00 1.2406253574295527e+00 8.5824530821643386e+00 7.5963979050715009e+00 6 4 1
+1528 1 0.0000000000000000e+00 1.5783708970917227e+00 8.7201441713754697e+00 7.5525736953911302e+00 -5 2 4
+206 1 0.0000000000000000e+00 3.9678515510514223e+00 9.6480822422220154e+00 9.3434171442758931e+00 5 1 -1
+2774 1 0.0000000000000000e+00 4.5538481052181536e+00 8.3442722835103549e+00 9.5627528802801063e+00 5 -6 -2
+1742 1 0.0000000000000000e+00 2.6171687830427630e+00 9.6876766333260633e+00 9.7085453459826851e+00 -7 1 1
+2531 1 0.0000000000000000e+00 3.1522563035953817e+00 8.0761193656759591e+00 9.9047365079504228e+00 0 8 -3
+481 1 0.0000000000000000e+00 3.3437286574883895e+00 9.2977721320591105e+00 7.9165270485205177e+00 1 1 2
+1886 1 0.0000000000000000e+00 3.7213698559744808e+00 8.1325612123534512e+00 9.5870525402351063e+00 2 3 -2
+2933 3 1.0000000000000000e+00 4.5094186502765705e+00 9.4829992731587396e+00 8.7637388831229117e+00 -1 4 1
+2166 1 0.0000000000000000e+00 4.1454166628699758e+00 7.8337161915089126e+00 9.4161325034494858e+00 2 -3 -5
+2840 2 -1.0000000000000000e+00 2.8097196445571817e+00 8.7678834392242475e+00 7.9288069903701288e+00 -3 1 -3
+1303 1 0.0000000000000000e+00 4.4290149083727055e+00 8.3265036649814430e+00 8.5508039498868307e+00 0 -2 1
+2243 1 0.0000000000000000e+00 4.6426668928455319e+00 9.0264635620237890e+00 8.0048332383336795e+00 6 -2 1
+1126 1 0.0000000000000000e+00 3.0910377561134403e+00 9.7298381462385173e+00 8.5655500812790617e+00 -1 1 4
+54 1 0.0000000000000000e+00 3.4238291354914590e+00 8.0185433023458366e+00 8.5486741991163395e+00 6 4 5
+490 1 0.0000000000000000e+00 4.7412961873110469e+00 9.7615573771249817e+00 9.7270530565187574e+00 -1 3 0
+246 1 0.0000000000000000e+00 4.2670226486928673e+00 7.6253534309097146e+00 8.0233046525733620e+00 -4 -4 6
+353 1 0.0000000000000000e+00 2.6439539419613811e+00 9.3051066509771054e+00 9.3516889043436002e+00 3 -6 2
+1686 1 0.0000000000000000e+00 2.5617581705296462e+00 9.4610902085317132e+00 8.2095379734667855e+00 7 -3 -6
+324 1 0.0000000000000000e+00 2.9204399229522160e+00 8.9617583615010599e+00 9.7159090068396345e+00 2 5 5
+119 1 0.0000000000000000e+00 3.5414552560315569e+00 9.1025258576267305e+00 9.6325144226294874e+00 2 -2 -2
+160 1 0.0000000000000000e+00 3.7683353554079879e+00 9.5423254578486620e+00 8.1281074142781318e+00 2 2 0
+2556 1 0.0000000000000000e+00 3.3187331736841390e+00 8.6448356531080268e+00 9.0762047946679552e+00 6 -4 1
+162 1 0.0000000000000000e+00 2.6573218417847562e+00 7.5914864398878468e+00 9.4161244077772235e+00 1 -1 -1
+1467 1 0.0000000000000000e+00 4.9152671031650881e+00 8.4971359053109694e+00 8.2452841830328865e+00 6 0 -5
+744 1 0.0000000000000000e+00 3.7718214895669306e+00 8.3135167771196361e+00 8.9357531516746320e+00 3 -2 -5
+1167 1 0.0000000000000000e+00 2.6911363098725691e+00 7.5593816688352780e+00 8.2857838061361271e+00 6 -1 0
+555 1 0.0000000000000000e+00 4.1865467567708308e+00 8.9151081000386121e+00 8.3831856183082465e+00 2 -5 3
+2250 1 0.0000000000000000e+00 4.9895521482234120e+00 9.7696563581452036e+00 9.0492947471323060e+00 1 -2 -7
+1818 1 0.0000000000000000e+00 3.4568550308792925e+00 7.7275502949928994e+00 7.9450660303152585e+00 1 4 -2
+1644 1 0.0000000000000000e+00 4.0791037249484576e+00 8.5081209314319022e+00 9.4087993834272066e+00 -8 -4 -3
+852 1 0.0000000000000000e+00 2.9711706283865387e+00 7.9949310931193507e+00 8.9619508083251009e+00 -3 -4 -2
+2361 1 0.0000000000000000e+00 2.8322417293867095e+00 8.2871611863627734e+00 7.7001533390246433e+00 6 2 1
+595 1 0.0000000000000000e+00 3.8429137911881868e+00 8.1787209388539317e+00 8.1281777514064864e+00 -1 3 -2
+445 1 0.0000000000000000e+00 2.6000336702548550e+00 8.2761641680417544e+00 9.5862873139231937e+00 1 1 -3
+2890 2 -1.0000000000000000e+00 3.1117007572582764e+00 8.9056476060233880e+00 8.7980829340990958e+00 3 0 -6
+1398 1 0.0000000000000000e+00 4.9711306890529308e+00 7.8525130723599030e+00 9.4955285952871940e+00 4 -1 -3
+1201 1 0.0000000000000000e+00 3.3374512857165111e+00 9.6563630480529419e+00 9.2057812398702232e+00 4 3 -1
+2471 1 0.0000000000000000e+00 3.7553782907630127e+00 8.8620423908807435e+00 7.6315883618171325e+00 0 -3 1
+767 1 0.0000000000000000e+00 2.5990215646975452e+00 8.6451158553815670e+00 8.6412086331172482e+00 -3 -1 4
+891 1 0.0000000000000000e+00 3.6067906832987346e+00 8.7316862750975162e+00 8.3930553111503201e+00 3 6 2
+1202 1 0.0000000000000000e+00 4.2480390299075586e+00 7.5971963243733738e+00 8.7840404611682210e+00 6 -2 1
+1478 1 0.0000000000000000e+00 3.9416103647892493e+00 9.3036076739335485e+00 9.2431987562737596e+00 3 2 4
+697 1 0.0000000000000000e+00 3.7546067974761623e+00 8.6410363226591400e+00 9.9417047016771747e+00 6 -2 -7
+1659 1 0.0000000000000000e+00 4.7696739977827880e+00 7.8099920712360724e+00 7.9563121246376944e+00 1 5 -2
+1900 1 0.0000000000000000e+00 2.6118511619800593e+00 9.1664942550908624e+00 7.6195283773105524e+00 2 -1 1
+2894 2 -1.0000000000000000e+00 2.9207656173857321e+00 9.5557200927438739e+00 7.8544310298736244e+00 -2 5 -2
+2957 3 1.0000000000000000e+00 3.0119248972860522e+00 9.8888669394890414e+00 7.5645314886821637e+00 -1 -3 -2
+1687 1 0.0000000000000000e+00 4.0838618631120003e+00 9.4049953413922278e+00 7.5191979732624317e+00 -3 -4 -7
+1311 1 0.0000000000000000e+00 4.6822521115508744e+00 9.9884011645615871e+00 7.8507566397862929e+00 -2 4 -1
+1678 1 0.0000000000000000e+00 4.4109061171434760e+00 8.5765243003858380e+00 7.5276741357838679e+00 -1 -4 3
+1496 1 0.0000000000000000e+00 6.0497117718960371e+00 1.9311115820042586e+00 2.1010164563763820e+00 -1 3 2
+762 1 0.0000000000000000e+00 6.9758982353778132e+00 1.7963561727639519e+00 1.5231838278825643e-01 2 -2 -9
+1582 1 0.0000000000000000e+00 7.0322328046363376e+00 1.1882138421583486e+00 3.6251015907244061e-01 4 -2 -4
+803 1 0.0000000000000000e+00 7.3533100224029955e+00 9.5020523525999190e-01 2.3026939278489227e+00 2 -1 -1
+149 1 0.0000000000000000e+00 5.7127421887175540e+00 1.2742272934797774e+00 1.7503541648001895e+00 -5 3 0
+2598 1 0.0000000000000000e+00 5.8161640004988300e+00 1.9089666878210140e-01 1.6666433132790759e+00 6 -5 -4
+1778 1 0.0000000000000000e+00 7.4465934374099181e+00 1.6544466906243420e+00 5.8012279602166927e-01 -3 -4 3
+1244 1 0.0000000000000000e+00 5.3235482800672607e+00 1.9229561730055553e+00 1.6472019814957333e+00 -1 7 -1
+1972 1 0.0000000000000000e+00 6.5849591489698236e+00 1.8526446629038527e+00 2.2641336989498999e+00 3 -9 2
+2004 1 0.0000000000000000e+00 6.2702192289811007e+00 8.4911082000607663e-01 2.0053993037484417e+00 3 -4 -1
+2148 1 0.0000000000000000e+00 7.1848979644541116e+00 1.4735009154972072e+00 1.4287696241141361e+00 -6 -1 3
+2302 1 0.0000000000000000e+00 6.6569663068304816e+00 2.1404943083947408e+00 1.8492379432362065e+00 -7 -5 -2
+708 1 0.0000000000000000e+00 7.3559224099126688e+00 6.5238748023710447e-01 1.6258235824112055e+00 0 -1 -1
+999 1 0.0000000000000000e+00 6.1662631089873248e+00 5.9185398614839879e-01 4.9716447937546848e-01 -1 -4 0
+446 1 0.0000000000000000e+00 5.4636591064889499e+00 1.7928336345411033e+00 2.0411227725504544e+00 -1 1 2
+2661 1 0.0000000000000000e+00 7.2290707262220124e+00 2.4303537408496760e+00 2.3165092720367833e+00 1 16 1
+1097 1 0.0000000000000000e+00 6.2621918571162061e+00 2.3608057141522929e+00 8.9545620649211788e-02 0 -2 -5
+1163 1 0.0000000000000000e+00 7.1022718005355756e+00 2.0195440645346894e+00 9.2844592467872467e-01 0 -2 -4
+1691 1 0.0000000000000000e+00 6.3984091845598243e+00 1.3544822512096852e+00 1.5325373346237436e+00 4 -11 9
+1829 1 0.0000000000000000e+00 5.6519211958233679e+00 7.9435031853504134e-01 7.6809021642851949e-01 0 -4 2
+2955 3 1.0000000000000000e+00 7.3315866913086252e+00 9.6869326331500394e-01 9.6621064224751929e-01 -4 4 1
+309 1 0.0000000000000000e+00 6.6628316049526237e+00 2.1280116426611611e+00 8.6688961889170635e-01 0 -6 -1
+1814 1 0.0000000000000000e+00 6.7431198529625114e+00 7.9694529651055124e-01 1.0385181244786155e+00 -3 -4 -3
+760 1 0.0000000000000000e+00 6.7526462887937608e+00 1.8187673634779442e-01 6.7272237726309125e-01 5 2 2
+1944 1 0.0000000000000000e+00 6.1402772425045908e+00 1.1241020408290071e-01 4.6164017380851113e-01 -3 -4 6
+2092 1 0.0000000000000000e+00 5.3177006203524160e+00 9.2835223787536392e-01 7.3495343596203444e-01 -1 1 -7
+2990 3 1.0000000000000000e+00 7.1238917467332294e+00 2.9388558059461528e-01 2.4508293447011744e+00 -4 0 -4
+544 1 0.0000000000000000e+00 5.6853911888789197e+00 2.0874537119260230e+00 6.3615191634082691e-01 -5 1 -1
+2633 1 0.0000000000000000e+00 5.8549487226507333e+00 5.7761712955021294e-01 1.2171764397010501e+00 8 6 8
+2444 1 0.0000000000000000e+00 7.4679924805844893e+00 2.0582624812788928e+00 1.5551998636262734e+00 0 7 1
+2378 1 0.0000000000000000e+00 5.7211399501097109e+00 1.6617562591630597e+00 8.6568565987599067e-01 -2 -2 -3
+2948 3 1.0000000000000000e+00 5.1226768913898724e+00 1.8022396517753352e+00 2.2916972803850291e+00 2 6 -4
+735 1 0.0000000000000000e+00 6.5287571335647394e+00 1.5048552764165986e+00 6.8110125798656052e-01 3 1 0
+1132 1 0.0000000000000000e+00 6.7806236349078928e+00 2.1142247894862568e-01 1.8154437514491886e+00 -6 1 3
+2049 1 0.0000000000000000e+00 5.8961813108944297e+00 1.4387405401166884e+00 1.6666641585785769e-01 2 5 0
+2875 2 -1.0000000000000000e+00 7.4745746033129761e+00 8.7360052909586450e-01 2.9342166193364083e-01 4 0 0
+1533 1 0.0000000000000000e+00 5.1313520001812032e+00 4.1286408191678614e-01 1.0275446223928764e+00 -4 9 -7
+319 1 0.0000000000000000e+00 6.1322059103471007e+00 4.6611722497755487e-01 2.3188652142341502e+00 -3 4 1
+2798 1 0.0000000000000000e+00 6.3549467560770347e+00 2.8427311042093961e-01 1.2622564839813455e+00 8 -1 0
+1735 1 0.0000000000000000e+00 6.8688273192910909e+00 1.1989545567945854e+00 2.1759716151267745e+00 0 2 4
+2366 1 0.0000000000000000e+00 5.0585848230942272e+00 3.8340624762652603e-01 1.9907459386404902e+00 4 -1 -1
+394 1 0.0000000000000000e+00 6.3582566859693896e+00 1.9136155127040635e+00 1.4977923033323628e+00 -2 -2 -1
+1683 1 0.0000000000000000e+00 5.9550305278997930e+00 9.8049111251592114e-01 1.2623616000930082e-01 0 -2 5
+2883 2 -1.0000000000000000e+00 5.2016706744466106e+00 3.0628598286091158e-01 1.5408544861578158e-01 -1 5 0
+632 1 0.0000000000000000e+00 6.0997000803927044e+00 2.1539909891978652e+00 1.0279358846944615e+00 -3 -3 2
+471 1 0.0000000000000000e+00 5.3149798863444406e+00 1.0492073919241129e+00 1.2228404283325702e+00 0 -7 2
+2715 1 0.0000000000000000e+00 5.2061855909067498e+00 7.8837043208946034e-01 2.1268542842384384e+00 0 1 3
+520 1 0.0000000000000000e+00 6.4581761496676666e+00 3.8340566419759281e-01 1.5361243942793029e-01 0 1 0
+1057 1 0.0000000000000000e+00 7.6256873415101110e+00 2.0018747970586164e+00 6.5348550359081659e-01 4 -2 -4
+210 1 0.0000000000000000e+00 7.5262078129205134e+00 1.5198260762469291e+00 2.1657147033589488e+00 0 -4 -7
+2113 1 0.0000000000000000e+00 9.4999032559458492e+00 2.1724580173880765e+00 1.3510038494103984e+00 4 2 1
+1251 1 0.0000000000000000e+00 9.1618913233345687e+00 2.3777778848538405e+00 4.4253458486376024e-01 -3 -2 1
+494 1 0.0000000000000000e+00 9.8299704400890260e+00 7.8419268914169993e-01 6.6187217972125900e-02 -4 -5 2
+772 1 0.0000000000000000e+00 9.5439120036937961e+00 8.2548604273552195e-01 2.0652351418214199e+00 -5 7 3
+2987 3 1.0000000000000000e+00 8.9565661434053485e+00 9.8050947695406687e-01 1.3545282391385096e+00 -3 -8 -4
+1561 1 0.0000000000000000e+00 9.1297633096251154e+00 2.2053516973614831e+00 4.7547350597012517e-01 3 -5 2
+1845 1 0.0000000000000000e+00 9.1038743127020840e+00 6.1154701363524622e-01 1.8520949173886694e+00 1 -2 6
+1906 1 0.0000000000000000e+00 9.5288606794178961e+00 1.4831585547967050e+00 2.8913825626671735e-01 3 0 1
+252 1 0.0000000000000000e+00 8.1008796016992726e+00 4.4872347947329701e-02 2.2202519440162810e-01 4 -6 0
+652 1 0.0000000000000000e+00 9.0787396000910796e+00 7.6833220861973209e-02 8.4102820131256195e-02 -6 -3 4
+2225 1 0.0000000000000000e+00 9.6461951557286820e+00 1.0683433523767132e+00 2.8023860023080882e-01 0 3 4
+29 1 0.0000000000000000e+00 7.5835822239128996e+00 4.3368517137745499e-01 1.2335865449989474e+00 -2 -1 0
+2131 1 0.0000000000000000e+00 8.0982630643015732e+00 2.0095106961799178e+00 1.2175915980469056e+00 -3 1 0
+2542 1 0.0000000000000000e+00 8.5204743475591851e+00 1.0642026172247125e+00 2.2588003901942941e+00 -2 -2 5
+478 1 0.0000000000000000e+00 7.7591972098301270e+00 1.1036715304572180e+00 1.0997434822671255e+00 0 0 -6
+629 1 0.0000000000000000e+00 8.8918370345361222e+00 2.1350834367532596e+00 2.1255523686900313e+00 3 -1 1
+1813 1 0.0000000000000000e+00 9.9945573880547585e+00 2.7856303563523321e-01 7.1494554504963581e-01 0 5 -1
+98 1 0.0000000000000000e+00 8.7277975633048737e+00 1.1222178198350619e+00 1.8293748166136958e+00 0 -1 -1
+2326 1 0.0000000000000000e+00 9.5399928126967524e+00 1.5000292588229691e+00 1.4358934550521043e+00 2 -2 -1
+900 1 0.0000000000000000e+00 8.5715159376254721e+00 2.4516483394223321e+00 2.2829982049981217e+00 0 -1 2
+1150 1 0.0000000000000000e+00 8.4145237278826723e+00 2.0681773162351691e+00 6.2848042325192033e-01 -5 3 2
+870 1 0.0000000000000000e+00 9.4890376921377104e+00 1.7595590633491609e-01 2.6588844598844213e-01 1 3 -7
+521 1 0.0000000000000000e+00 7.7884963549355488e+00 3.9217652142196840e-01 2.3024314457537294e+00 2 3 -1
+1438 1 0.0000000000000000e+00 8.1539369013652809e+00 1.0358666506730900e+00 2.0493142385441127e-01 1 2 7
+1447 1 0.0000000000000000e+00 8.2206117948806359e+00 5.2662789182255787e-01 1.0724574297399319e+00 2 1 2
+879 1 0.0000000000000000e+00 8.1008770201562967e+00 1.9186323687625402e+00 2.3288401387219255e+00 6 -6 0
+2332 1 0.0000000000000000e+00 8.4919110503437363e+00 1.9499446545914212e+00 1.1996773354020842e+00 2 -3 -2
+1379 1 0.0000000000000000e+00 7.5396710158117202e+00 1.4093584885582938e-01 8.0005775201714613e-01 6 -4 5
+155 1 0.0000000000000000e+00 9.4361951855141406e+00 1.4431292177505910e+00 2.0348916605232517e+00 3 1 4
+939 1 0.0000000000000000e+00 8.3817273795255502e+00 3.0723505471390449e-02 1.8099664016840717e+00 3 0 -3
+685 1 0.0000000000000000e+00 9.5181813439084273e+00 8.4938220007842991e-01 8.8952893132639488e-01 1 4 2
+862 1 0.0000000000000000e+00 8.8291060359348208e+00 1.9069924222529069e+00 1.3492406938943153e+00 -1 1 -2
+2532 1 0.0000000000000000e+00 8.3045629918929293e+00 1.5867520517662586e+00 9.7957235642836163e-02 -5 4 1
+537 1 0.0000000000000000e+00 8.0035649990031619e+00 1.2539823436128359e+00 1.8544247256630961e+00 1 0 -1
+2538 1 0.0000000000000000e+00 8.6716818431138858e+00 4.3285765847860741e-01 6.7982223723068735e-01 4 -4 0
+2265 1 0.0000000000000000e+00 8.5914129195399020e+00 1.2125684724258030e+00 8.5609317706631394e-01 -5 -4 0
+2630 1 0.0000000000000000e+00 7.9985490641031873e+00 1.5900365824104641e+00 1.9735460068475077e+00 1 -1 -6
+101 1 0.0000000000000000e+00 8.7341390687419089e+00 1.8129871696521398e+00 2.6812821958879862e-01 0 3 -1
+792 1 0.0000000000000000e+00 8.8544249344305559e+00 6.2151187766494753e-01 2.3681691537733141e+00 2 6 8
+13 1 0.0000000000000000e+00 9.2932671832887621e+00 1.4406082596235683e+00 7.2579413858911035e-01 1 0 -1
+2397 1 0.0000000000000000e+00 8.8999359497533792e+00 1.5554730678181101e+00 1.2125686119714274e+00 -2 6 3
+1371 1 0.0000000000000000e+00 8.0754602762112206e+00 2.3662045287083284e+00 1.8589598555104812e+00 -3 -7 -4
+2340 1 0.0000000000000000e+00 9.1103665520721151e+00 2.9693365572270247e-01 1.1672758755782962e+00 1 4 9
+868 1 0.0000000000000000e+00 9.4325660684347259e+00 3.3352827773519095e-01 1.5692074210589255e+00 -1 4 -1
+2462 1 0.0000000000000000e+00 6.0857751533757289e+00 2.5907799699122513e+00 1.3880336662563024e+00 0 1 -2
+1043 1 0.0000000000000000e+00 7.3853102984127998e+00 3.6863702601078043e+00 1.6607042606024278e+00 -6 -1 -2
+2559 1 0.0000000000000000e+00 6.6785162629853083e+00 2.6237831290067786e+00 1.6829026624966861e+00 0 6 1
+2263 1 0.0000000000000000e+00 6.1868022278287151e+00 4.6905977584904459e+00 1.8992997498996291e+00 -4 3 -3
+2176 1 0.0000000000000000e+00 5.2998075257246278e+00 4.2462908857373121e+00 1.9484865028509122e+00 5 3 7
+222 1 0.0000000000000000e+00 6.5115774264584347e+00 3.3612855030717923e+00 1.2296188434386448e+00 -1 -2 3
+794 1 0.0000000000000000e+00 7.0862626588853574e+00 4.0673547706323054e+00 6.2154576458115496e-01 -2 -1 7
+107 1 0.0000000000000000e+00 6.0476514661993024e+00 2.9135533587585893e+00 1.6846382422770123e+00 6 2 2
+2680 1 0.0000000000000000e+00 5.4063145309129013e+00 3.5210618840746117e+00 5.9149659736898841e-02 -1 -2 4
+457 1 0.0000000000000000e+00 5.0660138234578351e+00 4.8118681097544869e+00 3.5171382494184289e-01 -2 -4 5
+1880 1 0.0000000000000000e+00 6.8683805519344361e+00 4.5634942715293860e+00 2.1567538218476718e+00 -2 -2 0
+2310 1 0.0000000000000000e+00 5.1060496986186923e+00 2.8537119895232315e+00 2.2923556354287875e+00 1 0 -1
+73 1 0.0000000000000000e+00 5.8625075308027457e+00 3.0601359861304727e+00 9.0004417570779172e-01 -3 2 -5
+2454 1 0.0000000000000000e+00 5.6325364963005811e+00 4.8268634977997138e+00 1.0406500396637675e+00 4 1 -2
+789 1 0.0000000000000000e+00 7.0753235114386452e+00 4.1586710573879992e+00 1.5057744340313797e+00 -3 -1 -3
+418 1 0.0000000000000000e+00 5.9362916421191363e+00 3.6579109426551097e+00 1.5449507500027349e+00 -2 -10 -1
+1083 1 0.0000000000000000e+00 6.1442746815947071e+00 3.1282945221204645e+00 5.7381567821063872e-01 4 9 0
+2972 3 1.0000000000000000e+00 7.4631933923014362e+00 2.9476497002515742e+00 2.2547086304399455e+00 4 -8 0
+2034 1 0.0000000000000000e+00 6.6375617031456757e+00 4.0330533397703743e+00 2.3582329931352528e+00 1 -1 6
+458 1 0.0000000000000000e+00 6.6772982536948913e+00 2.9406204756984184e+00 2.2134181035172245e+00 -3 5 -4
+1494 1 0.0000000000000000e+00 5.8170013090389459e+00 3.4414332340670821e+00 2.2972896722892671e+00 -1 -5 -2
+379 1 0.0000000000000000e+00 6.6634939364668933e+00 3.4672636323452792e+00 9.1642956972266099e-01 -2 0 0
+20 1 0.0000000000000000e+00 5.8698896037787947e+00 4.0717204686326367e+00 1.8274245721488762e+00 -6 5 -7
+1568 1 0.0000000000000000e+00 7.2211509972412591e+00 3.3175423297075510e+00 1.9021719649226803e+00 1 -3 0
+1416 1 0.0000000000000000e+00 5.0148615803144621e+00 3.8350600027308981e+00 1.9250061157625928e+00 -1 -4 -5
+1782 1 0.0000000000000000e+00 5.2347738483087847e+00 2.6731456442384305e+00 1.4247125945616550e+00 -4 1 0
+1632 1 0.0000000000000000e+00 6.8134865469332375e+00 3.3173988969279802e+00 1.8897476526727956e-02 1 6 7
+628 1 0.0000000000000000e+00 5.8574193119217561e+00 4.8249130288222055e+00 1.5344553652719925e-01 4 3 5
+1366 1 0.0000000000000000e+00 5.9437815361574513e+00 4.2163298459349807e+00 1.6670424391286351e-01 3 -5 8
+1247 1 0.0000000000000000e+00 5.4118661011652289e+00 3.2764035424632576e+00 1.6892468532655696e+00 4 -4 -1
+401 1 0.0000000000000000e+00 6.4298664095383122e+00 4.2070219658460069e+00 5.3415200616716907e-01 -7 1 -5
+2283 1 0.0000000000000000e+00 6.9287622528853330e+00 2.8094330038897977e+00 3.8285545195036930e-01 -5 -2 2
+550 1 0.0000000000000000e+00 5.1887739213979556e+00 4.5187351424758750e+00 2.0951545150774573e-01 8 -4 6
+191 1 0.0000000000000000e+00 6.8733709304648913e+00 3.0202957529049290e+00 9.6258817858210100e-01 -3 2 -4
+1875 1 0.0000000000000000e+00 5.8130091183917090e+00 2.7917156310975413e+00 2.9353100030825963e-01 8 -5 -5
+1863 1 0.0000000000000000e+00 5.3898417550319033e+00 3.2462947039820742e+00 8.8649350453705922e-01 6 -2 0
+627 1 0.0000000000000000e+00 6.0824248055986452e+00 4.2528708284012042e+00 1.1174164069065038e+00 0 -1 -2
+220 1 0.0000000000000000e+00 5.8539911425264464e+00 3.9821291514476105e+00 5.2177152504344626e-01 -2 3 0
+1426 1 0.0000000000000000e+00 6.1888101610924702e+00 2.9931744621647427e+00 2.4138767954014297e+00 -2 -6 4
+2414 1 0.0000000000000000e+00 6.9991780321514616e+00 4.9638894558316986e+00 2.1205093190843050e+00 3 0 -4
+1699 1 0.0000000000000000e+00 6.7296070435995112e+00 4.6291430485496825e+00 7.1751043249821611e-01 3 -1 -6
+1265 1 0.0000000000000000e+00 6.7039918536190655e+00 3.8826796000355563e+00 1.6616043878726305e+00 9 2 -2
+1760 1 0.0000000000000000e+00 5.1535159699686490e+00 3.2597077436149848e+00 2.1213565413276219e+00 -2 4 -1
+2625 1 0.0000000000000000e+00 6.3690221534903229e+00 4.3797171381731728e+00 1.7364716186438838e+00 -5 2 0
+1603 1 0.0000000000000000e+00 6.4124491952419298e+00 3.5072171881172252e+00 1.8549028068083122e+00 0 0 -3
+219 1 0.0000000000000000e+00 5.0553756811907382e+00 4.1122639576690716e+00 8.2015931285687349e-01 -2 -1 -6
+546 1 0.0000000000000000e+00 6.8049195625633674e+00 4.7831547189227734e+00 1.3286938661682863e+00 1 6 -1
+2430 1 0.0000000000000000e+00 5.3321574062219428e+00 4.8933997341834656e+00 2.2950642214184542e+00 0 2 -1
+1576 1 0.0000000000000000e+00 6.2439383752215205e+00 3.6260243229363032e+00 4.9238685150063166e-01 -5 -2 0
+225 1 0.0000000000000000e+00 7.5755923362681958e+00 2.6249530995227834e+00 1.3193831768170434e+00 -5 5 2
+1583 1 0.0000000000000000e+00 9.3841763478318434e+00 4.5450950502904242e+00 2.2750190072648338e-01 -3 1 -4
+1391 1 0.0000000000000000e+00 8.1699126208609467e+00 3.8860216534403147e+00 1.3806360246272487e+00 -9 -1 0
+257 1 0.0000000000000000e+00 9.0493148969759822e+00 4.1982372546272044e+00 2.3026834505530216e+00 2 6 -4
+404 1 0.0000000000000000e+00 9.3125864668838556e+00 2.7656712458293233e+00 2.0766089540915136e+00 1 2 4
+1635 1 0.0000000000000000e+00 8.9351547388880217e+00 3.6248364208182582e+00 1.8949827944833746e+00 -2 3 2
+2180 1 0.0000000000000000e+00 7.7187828395452360e+00 4.1684223149085931e+00 1.2465905026467881e+00 0 -2 1
+2534 1 0.0000000000000000e+00 8.6437594675748315e+00 3.1355648419705076e+00 1.8163343385553079e+00 5 -3 -4
+1449 1 0.0000000000000000e+00 7.7295984788574383e+00 4.3767759515843849e+00 2.3560388851604408e+00 -3 -4 0
+2697 1 0.0000000000000000e+00 8.5003818722477202e+00 4.1579396917942617e+00 3.7620948737727067e-01 0 2 1
+977 1 0.0000000000000000e+00 8.5328087960505545e+00 3.0087775356305801e+00 7.6466949559792530e-01 0 0 5
+2298 1 0.0000000000000000e+00 8.6388972478701884e+00 4.7608926298268512e+00 8.7448051505688129e-01 3 -1 -1
+2252 1 0.0000000000000000e+00 9.4387593180279712e+00 4.4985656673719951e+00 2.4653340809751869e+00 -4 -3 3
+1675 1 0.0000000000000000e+00 7.9641580788225825e+00 4.8030413647253658e+00 1.2306743631644546e+00 9 0 9
+2596 1 0.0000000000000000e+00 7.5918905106519370e+00 4.8856364907392296e+00 6.4724882208087930e-01 1 7 5
+566 1 0.0000000000000000e+00 9.2639133753269345e+00 3.2417915975782763e+00 9.0041072327241589e-01 -2 11 7
+2094 1 0.0000000000000000e+00 9.7115492563970687e+00 3.9220302949202637e+00 1.2612317242412334e+00 -4 1 6
+1773 1 0.0000000000000000e+00 9.5741449448375366e+00 4.8784181486130382e+00 1.7613455619029028e+00 4 1 4
+1843 1 0.0000000000000000e+00 9.1906668866708401e+00 2.9085472664613938e+00 5.2056851990605624e-01 0 -1 -1
+2246 1 0.0000000000000000e+00 9.5578304020693903e+00 4.4110027298659853e+00 1.7928334948946636e+00 -2 7 -7
+1425 1 0.0000000000000000e+00 9.5328595115564951e+00 3.4960278837888890e+00 8.8436531662607676e-02 -1 6 0
+247 1 0.0000000000000000e+00 7.5953907502985389e+00 4.0173668718717686e+00 7.1595229063852772e-01 4 1 1
+1824 1 0.0000000000000000e+00 8.8817229495805758e+00 4.3717820119613942e+00 1.3812964703121715e+00 0 1 -2
+1178 1 0.0000000000000000e+00 8.1688808301698863e+00 2.7087034746673400e+00 8.7261889847747531e-01 -1 6 0
+1852 1 0.0000000000000000e+00 8.0985439573231108e+00 4.2834786887263405e+00 1.1429800489883271e-02 -3 1 -2
+1197 1 0.0000000000000000e+00 7.5029988183675780e+00 3.1207103020203291e+00 2.4068101525183158e-01 0 1 1
+592 1 0.0000000000000000e+00 7.8145001235767753e+00 3.4165464030297441e+00 1.1950732249097265e+00 -1 -2 2
+2742 1 0.0000000000000000e+00 8.6119156989380734e+00 2.7665113536478620e+00 1.5411741949157602e+00 -2 -1 2
+1345 1 0.0000000000000000e+00 9.9295956071299614e+00 2.6156613802613471e+00 1.1393271691212898e+00 2 -4 -1
+1462 1 0.0000000000000000e+00 8.6401125351788934e+00 4.8988055119151310e+00 1.9874870140421907e+00 -3 -2 -4
+2449 1 0.0000000000000000e+00 7.7919887385356423e+00 3.9586687726946770e+00 2.2263046596876204e-01 5 1 -1
+1367 1 0.0000000000000000e+00 9.4287487776827295e+00 3.4204762321205529e+00 2.2664745100257448e+00 4 3 0
+461 1 0.0000000000000000e+00 8.9819397255041231e+00 4.8011137568061448e+00 1.4809581470943040e-01 0 -1 2
+185 1 0.0000000000000000e+00 9.5440556013745255e+00 3.3318465678204521e+00 1.5915671665490458e+00 -8 5 -4
+1909 1 0.0000000000000000e+00 9.6080721559929234e+00 4.4271747411804920e+00 4.7621615062868161e-01 3 -3 -5
+2188 1 0.0000000000000000e+00 8.2424803645650773e+00 3.4844174518781972e+00 4.8252326199661921e-01 1 2 1
+2700 1 0.0000000000000000e+00 8.7427844112453474e+00 3.8911429921416207e+00 1.2772323085036055e+00 1 1 -3
+848 1 0.0000000000000000e+00 8.1603217815214020e+00 3.5802501038497465e+00 1.9099495121920922e+00 2 4 -9
+578 1 0.0000000000000000e+00 9.1510956146639746e+00 3.9816385868798680e+00 4.6042777837363130e-01 3 -1 -2
+545 1 0.0000000000000000e+00 9.3251919235299106e+00 4.4644200903248228e+00 1.1146669329945806e+00 3 0 -3
+146 1 0.0000000000000000e+00 8.1600856989475936e+00 2.9858880562737666e+00 2.3836341136229366e+00 -10 5 -4
+1834 1 0.0000000000000000e+00 8.2874134205152519e+00 4.1628287648512758e+00 8.5447323066150738e-01 -4 -2 2
+2352 1 0.0000000000000000e+00 8.3311558422597241e+00 4.5618460563916434e+00 2.4229507603817062e+00 -2 -2 3
+591 1 0.0000000000000000e+00 7.8378871903698872e+00 2.5168737153016876e+00 9.6539025238480833e-02 6 -4 -4
+232 1 0.0000000000000000e+00 9.7971188413291781e+00 2.8655786737914215e+00 1.5510001795722388e+00 -1 1 -8
+2303 1 0.0000000000000000e+00 8.6781435727889100e+00 3.4176525860837370e+00 1.8601839188905453e-01 -4 0 2
+554 1 0.0000000000000000e+00 7.8318431247153901e+00 4.3845190233888669e+00 1.8831735412908079e+00 -2 3 -3
+2928 3 1.0000000000000000e+00 8.6894960352917074e+00 3.8714641117906923e+00 2.4335449545607575e+00 -1 -1 -1
+6 1 0.0000000000000000e+00 5.5377079234927269e+00 1.9990417499598778e-01 3.8971004731025536e+00 5 -3 0
+1698 1 0.0000000000000000e+00 5.7601177156514805e+00 1.4719185968935042e+00 2.8896748378572341e+00 3 2 -1
+1052 1 0.0000000000000000e+00 7.1568109101192174e+00 2.6079182104080423e-01 3.7535697259456442e+00 1 7 -6
+2316 1 0.0000000000000000e+00 5.9150346052606926e+00 1.7146348623117824e+00 4.3810965183900992e+00 0 1 -3
+1771 1 0.0000000000000000e+00 5.5021654684963224e+00 1.0999245261641728e+00 2.5547276449943590e+00 2 -2 3
+36 1 0.0000000000000000e+00 6.6433120267692241e+00 1.7515148957878715e+00 3.7373660119769623e+00 -1 4 -1
+2358 1 0.0000000000000000e+00 7.1513695136454274e+00 1.5908817899318515e+00 4.9259274513728561e+00 -1 -2 9
+606 1 0.0000000000000000e+00 6.7745654929410595e+00 1.5401093772153878e+00 3.3937859111989792e+00 -7 2 -4
+1299 1 0.0000000000000000e+00 5.9828536284479137e+00 1.0897727556489094e+00 4.4834853544654347e+00 0 -2 -5
+12 1 0.0000000000000000e+00 7.1087383029890168e+00 1.5337967875454683e+00 3.8888916199233758e+00 6 -5 2
+1740 1 0.0000000000000000e+00 6.4967021780131535e+00 1.9708766713163002e+00 2.7467473956545270e+00 7 4 2
+1278 1 0.0000000000000000e+00 6.5182214367169946e+00 1.0908089249784647e+00 2.6358761229678804e+00 -1 -1 8
+2465 1 0.0000000000000000e+00 6.4325794869039203e+00 3.7244218539540053e-01 3.1288116580084742e+00 4 9 -9
+151 1 0.0000000000000000e+00 5.5229512416202295e+00 1.2357124195528473e+00 4.0945623004585947e+00 2 -2 2
+2545 1 0.0000000000000000e+00 7.0939434502794949e+00 2.4297566726857460e+00 3.3918207323236405e+00 0 2 3
+725 1 0.0000000000000000e+00 6.2221764216956323e+00 1.8929850323001900e+00 3.1799800008437327e+00 5 -5 3
+1562 1 0.0000000000000000e+00 5.7142335341964507e+00 1.3839516091738296e-01 2.5087922020519686e+00 -3 -3 -3
+1131 1 0.0000000000000000e+00 7.3212874864577735e+00 1.7287085008068910e+00 2.7030279011532858e+00 -1 3 4
+362 1 0.0000000000000000e+00 6.5262998500650768e+00 1.1227965180620776e+00 4.0526799026437628e+00 2 -5 2
+682 1 0.0000000000000000e+00 5.1668707925826380e+00 1.6589181261972474e+00 4.8657199640759226e+00 1 3 -3
+1754 1 0.0000000000000000e+00 6.7319937728176988e+00 4.0269473265417949e-01 4.4934242846141466e+00 2 1 -5
+1734 1 0.0000000000000000e+00 6.0552106048880106e+00 4.9946164729332360e-02 3.6712930334730296e+00 -3 -1 0
+1090 1 0.0000000000000000e+00 6.0019749319216613e+00 2.1973814448791780e+00 3.5598709158679869e+00 -2 -4 0
+2096 1 0.0000000000000000e+00 7.4028639992392460e+00 9.5940337647544505e-01 4.5345013428275802e+00 5 -1 5
+1002 1 0.0000000000000000e+00 7.3863042491372610e+00 2.0533683816632289e+00 4.5048006042418836e+00 -2 1 -7
+1133 1 0.0000000000000000e+00 5.3701628678606861e+00 7.5605672952774960e-01 4.0044671555935043e+00 -1 -4 -1
+1168 1 0.0000000000000000e+00 7.0122885127174905e+00 7.1798848626821987e-01 3.2411240169879871e+00 4 8 0
+770 1 0.0000000000000000e+00 5.1100087117306936e+00 1.5350908091256659e+00 3.5430464201838330e+00 -1 2 0
+948 1 0.0000000000000000e+00 6.4039027368876003e+00 3.7846556493997552e-01 3.7394605941567893e+00 -5 1 -1
+1404 1 0.0000000000000000e+00 5.6804991536487890e+00 1.0712409914511105e+00 4.6703177874015696e+00 2 -1 -3
+2687 1 0.0000000000000000e+00 5.1697945066047151e+00 9.3999370608602695e-01 3.4233424682154241e+00 0 5 5
+1966 1 0.0000000000000000e+00 5.3469057440165404e+00 2.2124153109752438e+00 2.7252282845646549e+00 -3 5 3
+1093 1 0.0000000000000000e+00 6.8146957813428557e+00 2.1857989491289480e+00 4.2163962756908813e+00 -1 -5 -4
+1593 1 0.0000000000000000e+00 7.3951929485913892e+00 6.5595864766656431e-01 4.0523103413520580e+00 -2 -6 1
+2631 1 0.0000000000000000e+00 7.3682735043799408e+00 3.7177552337750652e-01 4.9491250127098674e+00 -1 0 0
+2513 1 0.0000000000000000e+00 5.1659763749274621e+00 2.2062722596772892e+00 3.6619734403841617e+00 6 1 -6
+1727 1 0.0000000000000000e+00 5.6107968955652066e+00 6.7890130953816019e-01 2.9714977904526769e+00 3 -2 2
+2472 1 0.0000000000000000e+00 5.0649751697362575e+00 1.4844228713332153e+00 4.3592642379031012e+00 5 -5 -8
+269 1 0.0000000000000000e+00 6.0665715311263773e+00 1.8070824693264106e-01 4.1683708024934418e+00 -2 -5 -4
+2107 1 0.0000000000000000e+00 6.1054925460714680e+00 1.0872731440665999e+00 3.6207366359415536e+00 -2 1 5
+1415 1 0.0000000000000000e+00 7.4070669376515221e+00 2.2554297413395560e-01 3.2905998044057458e+00 1 -2 2
+111 1 0.0000000000000000e+00 7.0044496798004188e+00 1.6801468511565936e+00 3.0994321954810129e+00 -3 2 -6
+1859 1 0.0000000000000000e+00 5.9090145907709051e+00 3.6267068225754961e-01 4.9734583158185846e+00 -5 5 2
+1807 1 0.0000000000000000e+00 5.9230378750006905e+00 1.9909682187805344e+00 4.1883792968282183e+00 -3 0 -1
+2039 1 0.0000000000000000e+00 5.1531540984589359e+00 2.4592804924701039e+00 4.5011169190996787e+00 5 -5 -1
+493 1 0.0000000000000000e+00 6.8387889349999780e+00 1.9424456274723869e+00 4.7649087278142348e+00 -8 1 -1
+1738 1 0.0000000000000000e+00 9.6499641306759525e+00 7.6891153277408564e-01 3.6453576674737604e+00 -3 1 1
+877 1 0.0000000000000000e+00 9.8814140340662107e+00 1.6262706375066958e+00 3.6418370020551634e+00 0 1 -5
+1236 1 0.0000000000000000e+00 8.7129029678097378e+00 1.5329373749371307e+00 4.1060681436687059e+00 1 4 2
+2548 1 0.0000000000000000e+00 7.5894260375123492e+00 9.1848496510375854e-01 3.4341894935504853e+00 5 -8 -3
+2504 1 0.0000000000000000e+00 7.7538814298767784e+00 1.4722518077429643e+00 3.1662794753244823e+00 1 3 -3
+1006 1 0.0000000000000000e+00 8.3680096830136357e+00 1.2350886231908509e+00 4.4240788287571604e+00 -1 -1 -1
+2320 1 0.0000000000000000e+00 9.1142187606229861e+00 2.1014387739001479e+00 4.6617038372944180e+00 -1 -2 -4
+1855 1 0.0000000000000000e+00 9.7711275573600798e+00 1.4732109801128059e+00 4.7395434573912691e+00 -2 0 -2
+1914 1 0.0000000000000000e+00 9.6735105633013312e+00 5.1461198168726352e-01 2.8799202442993401e+00 3 2 2
+1962 1 0.0000000000000000e+00 7.9612502564302021e+00 5.1394213365781038e-01 4.9051787859922689e+00 0 -1 0
+690 1 0.0000000000000000e+00 9.5233082533655207e+00 7.4855541127359829e-02 2.5227679924829922e+00 3 0 0
+2269 1 0.0000000000000000e+00 8.2763667521428825e+00 5.1091022981528145e-01 3.2836890879217120e+00 -2 3 -1
+1534 1 0.0000000000000000e+00 8.3657984727219628e+00 2.3570810738000532e+00 4.5971299651422894e+00 -1 1 -2
+2192 1 0.0000000000000000e+00 9.1947613941506727e+00 1.0758934531627605e-01 3.2113969867097487e+00 -5 0 -5
+703 1 0.0000000000000000e+00 7.5575960336633949e+00 2.2870465652759244e+00 4.0705539242949680e+00 -2 1 0
+855 1 0.0000000000000000e+00 7.7280520198907130e+00 1.8777522698269397e-01 4.0136213852291061e+00 2 2 4
+2867 2 -1.0000000000000000e+00 8.0739574492948449e+00 4.1867342443707392e-02 3.4878886556008726e+00 1 -1 -2
+2304 1 0.0000000000000000e+00 9.8449043157596350e+00 2.3512355540188759e-01 4.3294529286683279e+00 2 -2 -3
+1600 1 0.0000000000000000e+00 9.8396929688206640e+00 1.3482925871231826e+00 4.4057402817745643e+00 4 2 0
+2881 2 -1.0000000000000000e+00 9.2397151160150610e+00 1.7846900309969376e+00 2.5403139445317460e+00 -7 -1 -1
+809 1 0.0000000000000000e+00 8.2313058466444176e+00 2.1381434383889690e+00 2.9354349169590681e+00 3 2 1
+2688 1 0.0000000000000000e+00 7.8149010365118459e+00 1.3771847276039522e+00 4.7585376833431869e+00 -4 2 7
+278 1 0.0000000000000000e+00 7.5920800527251062e+00 1.9801253839663850e+00 3.6758378634744608e+00 1 5 -1
+1597 1 0.0000000000000000e+00 8.9840902357463790e+00 2.0862061245859485e+00 3.1749456334884107e+00 -1 2 -4
+1694 1 0.0000000000000000e+00 8.5981231028125009e+00 7.6357981984455980e-01 4.9385391846815248e+00 -2 -4 1
+1832 1 0.0000000000000000e+00 8.1250085487221195e+00 1.8490852274087797e+00 2.8814873214471213e+00 1 6 0
+122 1 0.0000000000000000e+00 9.2861201330495735e+00 1.9348611079413451e+00 3.9593526083994615e+00 4 -2 -5
+822 1 0.0000000000000000e+00 8.8371579236723985e+00 1.3789265525263023e-01 2.8444318163592923e+00 1 -5 -1
+2999 3 1.0000000000000000e+00 8.4510271387810274e+00 1.3734384092919352e+00 3.5459804616921891e+00 2 -3 4
+1051 1 0.0000000000000000e+00 8.5979397641005590e+00 1.0460065509755418e+00 4.1892209906608349e+00 0 1 5
+1751 1 0.0000000000000000e+00 9.3451091501464099e+00 2.3438640318527706e+00 3.6842580825658242e+00 -4 -7 5
+2952 3 1.0000000000000000e+00 9.6910807488567414e+00 2.4536090911381980e+00 3.3646689363423126e+00 -3 -1 0
+916 1 0.0000000000000000e+00 7.9070254122338559e+00 8.9429420420123040e-01 2.8397973548160604e+00 -4 1 4
+2551 1 0.0000000000000000e+00 9.7356669942329930e+00 2.0266949990245227e+00 4.3753219734130893e+00 -5 1 -2
+844 1 0.0000000000000000e+00 8.6839475634165542e+00 9.9648847328034773e-01 3.4713244519975355e+00 4 6 3
+153 1 0.0000000000000000e+00 8.6623590196030147e+00 1.4551168091878937e+00 2.7135122027902039e+00 2 -1 -1
+2926 3 1.0000000000000000e+00 9.4566469950216234e+00 1.0164347621276291e+00 2.8062113658542311e+00 2 4 -5
+1493 1 0.0000000000000000e+00 8.9814751457600703e+00 1.6875397563322658e+00 4.9003302723937150e+00 -2 0 -1
+737 1 0.0000000000000000e+00 8.3997102803788515e+00 2.0997131142548793e+00 3.7073320789889448e+00 -4 4 1
+658 1 0.0000000000000000e+00 7.8264195091684785e+00 1.4403982967150708e+00 3.9127378537722994e+00 4 -1 -8
+2845 2 -1.0000000000000000e+00 8.6593851394285846e+00 2.9722770681987498e-01 4.2967652254770821e+00 -3 1 3
+599 1 0.0000000000000000e+00 9.5029826818428873e+00 1.5525559686458599e+00 3.3211768708759504e+00 5 0 -1
+782 1 0.0000000000000000e+00 9.0607846270322607e+00 2.4996320164964234e-01 4.9051911962117938e+00 -4 8 4
+2685 1 0.0000000000000000e+00 7.6713679665308838e+00 1.9388052041103669e+00 4.8710251454819380e+00 3 -1 1
+2558 1 0.0000000000000000e+00 9.9146609243999926e+00 2.2876068847623534e+00 2.6205867838766057e+00 -2 -2 2
+2341 1 0.0000000000000000e+00 9.5577136453899900e+00 2.8089916749404453e-01 3.8188510438609886e+00 0 0 -4
+1466 1 0.0000000000000000e+00 9.3932789246250206e+00 1.2011020359865205e+00 4.1192115494572903e+00 -2 2 -2
+524 1 0.0000000000000000e+00 9.2253818483587917e+00 7.3379714383910655e-01 4.5102051234833080e+00 -4 -2 1
+1101 1 0.0000000000000000e+00 9.6438610608073265e+00 2.1803437697177381e+00 4.8771831161744128e+00 5 -3 -2
+1300 1 0.0000000000000000e+00 8.6296553603269093e+00 2.4533038241968935e-01 3.7767562010557651e+00 -6 -1 4
+386 1 0.0000000000000000e+00 5.1818301079271416e+00 4.0270581683335980e+00 2.6514843635659706e+00 1 -2 -8
+414 1 0.0000000000000000e+00 7.3104031738803075e+00 3.6232339286711754e+00 4.0037087258178330e+00 3 2 4
+507 1 0.0000000000000000e+00 5.7227909174440059e+00 3.2395677535441743e+00 4.3881696969573945e+00 -1 1 -4
+2162 1 0.0000000000000000e+00 5.6694091353423177e+00 4.9448838235426589e+00 3.4736217583484232e+00 3 2 -2
+1153 1 0.0000000000000000e+00 5.9865676971645598e+00 2.5863806223014580e+00 2.6697735521653052e+00 -3 1 3
+2735 1 0.0000000000000000e+00 5.1562900810598098e+00 2.7063725559327341e+00 4.0305795135511140e+00 1 3 -3
+497 1 0.0000000000000000e+00 5.7268069201690972e+00 4.4069146964967345e+00 3.7479724776855314e+00 -1 5 3
+1114 1 0.0000000000000000e+00 6.9664646728253699e+00 4.8454739117137438e+00 3.8866406582194890e+00 -4 -1 -2
+981 1 0.0000000000000000e+00 6.4996116357631539e+00 4.6576838252611745e+00 3.1342998000322564e+00 -3 -2 -3
+2146 1 0.0000000000000000e+00 5.0653917831592423e+00 4.4244483862309325e+00 4.6259141399313997e+00 1 0 3
+603 1 0.0000000000000000e+00 6.5873095820370091e+00 4.2365104679994108e+00 4.3553895376867366e+00 5 6 2
+2106 1 0.0000000000000000e+00 7.2670298761113861e+00 2.8781511058207498e+00 4.7138968674507780e+00 2 -2 -1
+2501 1 0.0000000000000000e+00 6.1738620964425053e+00 2.8351579559160647e+00 4.2554716898612917e+00 2 0 -1
+2537 1 0.0000000000000000e+00 7.1969497950631585e+00 3.7004276484150842e+00 2.5107428582321956e+00 3 1 2
+2256 1 0.0000000000000000e+00 6.4881890626480949e+00 3.8003880539025578e+00 4.2750825407498416e+00 -3 8 0
+1559 1 0.0000000000000000e+00 6.2946195790731299e+00 3.5598420073186192e+00 4.8511921355221226e+00 0 -1 -7
+1984 1 0.0000000000000000e+00 6.0821452149049717e+00 3.9504802662976535e+00 3.2580851255662839e+00 1 9 -2
+2138 1 0.0000000000000000e+00 5.8167269738216563e+00 4.5440557734318183e+00 2.5904224913962297e+00 2 7 -1
+688 1 0.0000000000000000e+00 5.4217016937042581e+00 4.1031297288521067e+00 3.9319121432509583e+00 0 1 1
+1651 1 0.0000000000000000e+00 6.4215338489541862e+00 3.6422865435495528e+00 3.6395299148542062e+00 -5 0 1
+2367 1 0.0000000000000000e+00 5.5036125831018623e+00 3.3595007631309666e+00 4.1752513537624241e+00 -6 4 1
+541 1 0.0000000000000000e+00 5.3578784359580300e+00 3.5287171997590145e+00 2.9388885587895532e+00 2 -2 3
+2429 1 0.0000000000000000e+00 5.8979926053073894e+00 2.6078252842151182e+00 3.8933402970252811e+00 -5 0 0
+1218 1 0.0000000000000000e+00 6.2296724473303149e+00 4.4571322076889697e+00 4.0176905662964062e+00 -4 0 1
+80 1 0.0000000000000000e+00 6.6516324764655588e+00 3.4017957278927788e+00 2.6235543024641053e+00 -7 8 -1
+2515 1 0.0000000000000000e+00 6.8943005146560665e+00 2.9190923922610663e+00 4.2021854796436573e+00 -6 2 -2
+88 1 0.0000000000000000e+00 5.4990635372331846e+00 3.1160981661249698e+00 4.9029103386708695e+00 -3 1 -1
+2110 1 0.0000000000000000e+00 6.4393474407103097e+00 2.6872055548722531e+00 3.5030918950782430e+00 0 3 6
+2108 1 0.0000000000000000e+00 5.7504471188841890e+00 2.7745761424052127e+00 3.0591346172156064e+00 -1 5 5
+59 1 0.0000000000000000e+00 6.2873334162719701e+00 3.8615135391239983e+00 2.8929743504286254e+00 4 -5 -5
+1423 1 0.0000000000000000e+00 6.8147058091078998e+00 2.5797399128187775e+00 3.0837912050734184e+00 0 -2 -6
+670 1 0.0000000000000000e+00 7.4280482064048874e+00 3.2773884369081769e+00 3.0469018246273003e+00 -7 1 0
+663 1 0.0000000000000000e+00 5.3646802157657341e+00 3.2847064256301888e+00 3.5336907958678943e+00 -10 -6 1
+121 1 0.0000000000000000e+00 6.8785426795095512e+00 4.2931730296155566e+00 3.7321621754556280e+00 3 -5 -2
+365 1 0.0000000000000000e+00 7.0513090642186054e+00 3.2524574792008454e+00 3.7595633716569448e+00 0 1 -3
+2468 1 0.0000000000000000e+00 5.7652085681124117e+00 3.7131662600425774e+00 3.1005657267013755e+00 3 2 -2
+577 1 0.0000000000000000e+00 7.3358837745345156e+00 3.0120802907227451e+00 2.7573943764131039e+00 1 -1 1
+2635 1 0.0000000000000000e+00 6.3190432880410823e+00 2.8448493838809399e+00 4.9133573790971088e+00 2 0 -4
+890 1 0.0000000000000000e+00 6.1996747065609101e+00 4.1612541304387198e+00 4.8185109352964535e+00 0 7 -1
+1193 1 0.0000000000000000e+00 7.4396399117786558e+00 2.5201087724214872e+00 2.7667901042545400e+00 -2 7 5
+48 1 0.0000000000000000e+00 7.3842857686015879e+00 4.4459239091436240e+00 2.9189180559975694e+00 -2 -3 -1
+588 1 0.0000000000000000e+00 6.2240276157120489e+00 3.2065709065116175e+00 3.5657688140295383e+00 -7 -3 2
+2976 3 1.0000000000000000e+00 7.2752160052494839e+00 4.0585997392425446e+00 3.4574478887843658e+00 1 2 3
+799 1 0.0000000000000000e+00 5.6938985282655254e+00 4.2817560437070057e+00 4.8096311326225134e+00 -3 6 2
+825 1 0.0000000000000000e+00 7.4995805949429792e+00 4.9151185921920524e+00 3.2103300790538758e+00 7 -5 -5
+1230 1 0.0000000000000000e+00 6.9493966557991778e+00 4.3359687441940080e+00 4.6449816045328669e+00 0 3 0
+2529 1 0.0000000000000000e+00 7.4341083127197116e+00 3.6792511142858713e+00 4.6132642022675165e+00 -7 1 -3
+17 1 0.0000000000000000e+00 5.3400169049014909e+00 2.5266444392551328e+00 4.9916011043374269e+00 -1 -6 0
+2055 1 0.0000000000000000e+00 8.5763987247030933e+00 4.5694177906880515e+00 4.4041530594445897e+00 3 -9 2
+1588 1 0.0000000000000000e+00 8.9250932724138465e+00 4.2928839526186042e+00 3.4536728062393625e+00 3 1 4
+622 1 0.0000000000000000e+00 8.0391765671456596e+00 3.3651206153040243e+00 4.7137963177537969e+00 4 -1 3
+2395 1 0.0000000000000000e+00 8.5458830211434638e+00 4.7571506091440536e+00 3.2507316313552144e+00 4 4 -4
+46 1 0.0000000000000000e+00 8.9518186484807867e+00 2.7281470635039322e+00 4.1758017648604664e+00 1 -3 2
+1804 1 0.0000000000000000e+00 8.1646850782173903e+00 4.6926728885150784e+00 4.2551230394761772e+00 3 -8 1
+2161 1 0.0000000000000000e+00 9.1599099216954460e+00 4.5751831339091646e+00 4.5926951955765816e+00 -5 -1 1
+740 1 0.0000000000000000e+00 7.6090296524930947e+00 4.2526292155379695e+00 4.6053083309384881e+00 9 1 -3
+2836 2 -1.0000000000000000e+00 9.7159082727158665e+00 3.3901982616452400e+00 4.2136622218330775e+00 -5 -3 6
+2524 1 0.0000000000000000e+00 8.5310801839909445e+00 3.3677187742253647e+00 3.3525640351421568e+00 -3 6 4
+473 1 0.0000000000000000e+00 9.9160623297960697e+00 4.7142070445372841e+00 3.5997726237428935e+00 3 -1 -1
+1987 1 0.0000000000000000e+00 8.2390307661760360e+00 2.5834552779052831e+00 3.1622489557177555e+00 0 -5 4
+2803 1 0.0000000000000000e+00 8.7001828469370359e+00 3.9629999374283242e+00 3.9727870599019921e+00 -8 3 4
+843 1 0.0000000000000000e+00 9.4522638243789210e+00 3.2234546800106409e+00 3.6034666905030117e+00 0 4 5
+1524 1 0.0000000000000000e+00 8.1428549873046041e+00 4.2389103554701579e+00 4.7996028226077714e+00 6 3 -7
+2755 1 0.0000000000000000e+00 9.2227244392136836e+00 4.0936418099024587e+00 4.0105375351687771e+00 -1 -3 5
+617 1 0.0000000000000000e+00 7.9460390132763594e+00 3.5694960782892626e+00 2.6131942106443873e+00 -8 0 2
+2764 1 0.0000000000000000e+00 8.2658443794975227e+00 3.5118675136653521e+00 3.5166467516893123e+00 3 -4 -1
+369 1 0.0000000000000000e+00 9.9218647327270375e+00 3.8520556554335776e+00 2.9739224858498998e+00 -4 3 -2
+1078 1 0.0000000000000000e+00 8.1218523991885139e+00 4.0753953512158549e+00 2.8112482403801087e+00 -5 7 -6
+1846 1 0.0000000000000000e+00 9.7547954928151217e+00 2.7112244272237054e+00 3.9166670942012267e+00 2 9 -1
+1091 1 0.0000000000000000e+00 9.0667811707756378e+00 4.9046009666830326e+00 3.5699416936320665e+00 -3 1 2
+51 1 0.0000000000000000e+00 9.4635875352150638e+00 2.7620477030939661e+00 2.5258991949955694e+00 -1 5 4
+1546 1 0.0000000000000000e+00 9.2803929583368472e+00 4.6379251641479762e+00 3.0748952102383060e+00 2 -3 7
+1411 1 0.0000000000000000e+00 9.2499606229879969e+00 2.5602550009332106e+00 2.9946363904700228e+00 1 1 0
+1497 1 0.0000000000000000e+00 9.5743199037514000e+00 4.7421961634853611e+00 3.3633475665927159e+00 5 1 -2
+2257 1 0.0000000000000000e+00 7.8465940636324696e+00 2.8724787937029324e+00 3.5915181578237374e+00 3 -1 -2
+722 1 0.0000000000000000e+00 9.7217699533830224e+00 3.2740112420473468e+00 3.0168211858674781e+00 2 -5 -2
+1775 1 0.0000000000000000e+00 9.8117626892192558e+00 4.4933603488202190e+00 3.9653752137094029e+00 -7 0 5
+11 1 0.0000000000000000e+00 8.1029252023024334e+00 2.7178549753322798e+00 4.2442106783949800e+00 0 11 -5
+1343 1 0.0000000000000000e+00 7.6345927662043342e+00 4.5078604662865560e+00 4.0027644004111158e+00 -5 0 0
+2750 1 0.0000000000000000e+00 7.8235494807879364e+00 3.6264482358050540e+00 3.8601799517040978e+00 0 -3 1
+1171 1 0.0000000000000000e+00 9.3183346507922913e+00 3.1112322160772274e+00 4.7415384162661791e+00 -3 5 -2
+915 1 0.0000000000000000e+00 9.0499975951980147e+00 4.0141031154023530e+00 2.9457718016036587e+00 2 0 7
+1237 1 0.0000000000000000e+00 8.4897407346572340e+00 2.6771484947782493e+00 3.7902242733495983e+00 -2 -4 -3
+2323 1 0.0000000000000000e+00 9.5225783830706128e+00 3.4827514199944600e+00 2.6996877569469628e+00 1 4 -1
+2396 1 0.0000000000000000e+00 8.9708225400248320e+00 3.6030338822058074e+00 4.2207807006129832e+00 1 4 2
+511 1 0.0000000000000000e+00 7.7310518988261192e+00 4.0728860460040401e+00 3.2698113976325773e+00 -1 -6 -3
+2675 1 0.0000000000000000e+00 8.7001178103556196e+00 2.9029474454352475e+00 2.7138296591650897e+00 1 -6 1
+2254 1 0.0000000000000000e+00 9.4743594422068096e+00 4.0523942787519847e+00 4.5583035364244431e+00 -3 4 5
+2422 1 0.0000000000000000e+00 8.1456007783988014e+00 4.8572182005427909e+00 3.6327067214398125e+00 3 -1 -2
+1916 1 0.0000000000000000e+00 9.1358587116588783e+00 4.9855270930672981e+00 4.3286250850439947e+00 5 0 -6
+463 1 0.0000000000000000e+00 5.4954444545695811e+00 2.4645161390934627e+00 5.1334123018600257e+00 -2 -5 -8
+434 1 0.0000000000000000e+00 7.1845589075874523e+00 5.6415151749415741e-02 6.9275821579614938e+00 -6 6 2
+2702 1 0.0000000000000000e+00 6.0267219163678867e+00 1.1233083803341313e+00 6.0621242096118655e+00 -3 -2 -5
+2473 1 0.0000000000000000e+00 6.9160594661413590e+00 4.7139480460099970e-01 6.2074870150239274e+00 -4 1 5
+2665 1 0.0000000000000000e+00 6.9335640903710454e+00 1.6440924285506804e+00 6.8750581041609227e+00 -1 6 -5
+1673 1 0.0000000000000000e+00 7.3751631071943100e+00 1.3017285414033992e+00 6.5807021485137867e+00 -1 2 6
+1819 1 0.0000000000000000e+00 6.7283887022193749e+00 2.3851796166836774e+00 7.1760423860401756e+00 -3 -1 0
+1564 1 0.0000000000000000e+00 5.8830820337844161e+00 1.5969594436623618e+00 5.5384831756385848e+00 -6 -6 8
+689 1 0.0000000000000000e+00 6.4868005792311623e+00 1.5974874113756521e-01 6.8612194177788979e+00 2 -6 -1
+2856 2 -1.0000000000000000e+00 5.1363794633066622e+00 2.3071866168208724e-01 5.6419300248531910e+00 1 -1 -4
+1640 1 0.0000000000000000e+00 6.6972310390834604e+00 1.4669614421541211e+00 6.9646364686787745e+00 1 0 -1
+129 1 0.0000000000000000e+00 6.8282120887728093e+00 7.8351618200933837e-01 5.9559368132349926e+00 -2 -3 -3
+2195 1 0.0000000000000000e+00 5.3743867620048347e+00 1.4700115389040547e+00 7.3998464552496461e+00 5 9 4
+368 1 0.0000000000000000e+00 6.1641979140834833e+00 2.4733373058876924e+00 5.5499922092029923e+00 -3 5 -3
+2144 1 0.0000000000000000e+00 5.5650988419474254e+00 6.3099580962864132e-01 7.1713354485404750e+00 2 1 6
+2372 1 0.0000000000000000e+00 5.9891922919696530e+00 1.5274885511038172e-01 6.3168570741338552e+00 1 -2 -2
+2299 1 0.0000000000000000e+00 6.1133967438859091e+00 1.2234584725253879e+00 6.7948735738466324e+00 2 -1 -7
+1946 1 0.0000000000000000e+00 7.0856106677773436e+00 2.3640607126001648e-01 5.4681075522041152e+00 2 -5 -2
+973 1 0.0000000000000000e+00 6.0388680418911038e+00 4.8146925064387808e-01 5.7723197603063241e+00 -2 1 1
+3 1 0.0000000000000000e+00 7.1832792683423543e+00 1.2067139652589194e+00 5.8029852995665152e+00 0 3 2
+482 1 0.0000000000000000e+00 5.6471107500621676e+00 2.2284288937265861e+00 6.0498778220713980e+00 1 4 3
+2182 1 0.0000000000000000e+00 6.6356934994093875e+00 2.1870197255479122e+00 5.1184860540690513e+00 -2 -1 -2
+133 1 0.0000000000000000e+00 5.1281953299117875e+00 2.8835377225822894e-02 6.4282468185097441e+00 3 4 1
+1318 1 0.0000000000000000e+00 6.6381956215211604e+00 1.3385562664826622e+00 5.2609073586819672e+00 3 -3 -2
+1321 1 0.0000000000000000e+00 5.8747505503120365e+00 1.8823002913319291e+00 7.1452281633924892e+00 1 -5 0
+1139 1 0.0000000000000000e+00 6.4161997376808522e+00 1.0146418993110027e+00 6.7261291823956695e+00 -2 -4 3
+1540 1 0.0000000000000000e+00 6.8641340559740218e+00 1.1411343620801784e+00 5.0038877382217439e+00 -5 -3 -6
+516 1 0.0000000000000000e+00 6.3782974114931230e+00 1.9140618890720458e+00 6.1904230038370995e+00 0 3 4
+1241 1 0.0000000000000000e+00 5.8560522410291957e+00 1.4125252304752711e+00 6.5499505853888760e+00 1 2 -1
+515 1 0.0000000000000000e+00 6.8624257827726556e+00 2.2710057260238128e+00 6.3030305769951589e+00 -8 -2 -2
+1923 1 0.0000000000000000e+00 5.3333014425187013e+00 2.0527706379575590e+00 6.9239446239808116e+00 4 4 4
+1453 1 0.0000000000000000e+00 5.0581187487678569e+00 1.4591595703391451e+00 5.9669150249260605e+00 -6 5 2
+1770 1 0.0000000000000000e+00 7.3928559660739683e+00 3.6991883014692367e-01 7.0885166832654640e+00 -4 -1 0
+616 1 0.0000000000000000e+00 6.1392641180007077e+00 7.4976020357225459e-01 5.1262108278139165e+00 1 3 3
+1822 1 0.0000000000000000e+00 6.9627504501540400e+00 7.9696482676922253e-01 7.3580666204749825e+00 -1 3 -2
+1305 1 0.0000000000000000e+00 5.5056937488915896e+00 1.0609452054475110e+00 5.4266364616815572e+00 0 2 -1
+597 1 0.0000000000000000e+00 5.2264749465648723e+00 7.4096474037258209e-01 5.9402039986776156e+00 -5 -6 6
+253 1 0.0000000000000000e+00 5.2452628002949080e+00 1.1764943247049373e+00 7.0718533379608965e+00 0 8 -4
+972 1 0.0000000000000000e+00 5.1025978710438373e+00 3.0568326409137581e-01 5.0389818379718525e+00 2 -4 -1
+928 1 0.0000000000000000e+00 6.3058986420573033e+00 8.0165595398809109e-01 7.3794262739303287e+00 0 2 2
+2142 1 0.0000000000000000e+00 5.5401794539810538e+00 2.3371066188130030e+00 6.4951624302967375e+00 3 3 3
+10 1 0.0000000000000000e+00 6.8613306202291486e+00 1.5543869232246630e+00 6.0206581221041899e+00 0 3 -3
+2672 1 0.0000000000000000e+00 6.9504375672821084e+00 2.2667524739883436e+00 5.5961674440587457e+00 1 2 -3
+1088 1 0.0000000000000000e+00 6.7890287804451512e+00 6.8104505435402074e-01 5.3684026723213112e+00 -4 -6 -6
+2317 1 0.0000000000000000e+00 6.2276663976370088e+00 2.4068956367157024e+00 6.8692864324707834e+00 -1 -1 3
+1344 1 0.0000000000000000e+00 5.8362834334110270e+00 1.8571018913573449e+00 5.1762980886969778e+00 -1 3 3
+2469 1 0.0000000000000000e+00 7.4097367615478795e+00 8.7555150870355813e-01 6.9707669844809956e+00 -2 7 -2
+2855 2 -1.0000000000000000e+00 7.4943995305372555e+00 2.6287183581382034e-01 5.4508831570165830e+00 -5 3 -4
+559 1 0.0000000000000000e+00 9.6224210920267677e+00 1.9376351828908076e+00 5.0990660494694930e+00 -2 -3 2
+2405 1 0.0000000000000000e+00 7.6994750682531494e+00 1.1462207148764942e+00 6.2469888963765658e+00 7 1 6
+1473 1 0.0000000000000000e+00 7.5271069959837114e+00 1.0914584985714197e+00 7.2323010261308767e+00 5 5 -4
+1149 1 0.0000000000000000e+00 9.9839652602948146e+00 8.8398955911877009e-01 6.1400367355686614e+00 -4 -2 -1
+411 1 0.0000000000000000e+00 9.7579809562986739e+00 1.4706133219966806e+00 7.1675804196455450e+00 -1 -7 0
+166 1 0.0000000000000000e+00 8.6769698832152411e+00 1.4032315627340199e+00 6.2926014232097511e+00 -2 -10 -4
+924 1 0.0000000000000000e+00 7.9581304492955649e+00 6.8603812513310825e-01 5.6945526914116380e+00 4 -1 -2
+676 1 0.0000000000000000e+00 8.8640425519965618e+00 8.7416042210412470e-01 6.7408771242684651e+00 5 2 7
+687 1 0.0000000000000000e+00 8.5472535903801994e+00 6.6888647224651521e-01 6.0732556702738520e+00 -3 4 4
+1003 1 0.0000000000000000e+00 9.2314354886791641e+00 1.2489655020375472e+00 5.1516513192039186e+00 2 3 -4
+1648 1 0.0000000000000000e+00 8.1578851963979488e+00 6.6843844190596746e-02 5.3671614712618130e+00 3 0 -6
+243 1 0.0000000000000000e+00 7.6748005109424859e+00 1.9808701313389396e+00 6.3313202882119528e+00 -1 -3 6
+952 1 0.0000000000000000e+00 9.6825987209427726e+00 7.6643875255767324e-01 7.0534081424750594e+00 5 4 1
+1607 1 0.0000000000000000e+00 8.8938557502874733e+00 2.0968585958576775e+00 6.2083238990297005e+00 -5 -1 -3
+2797 1 0.0000000000000000e+00 7.9356211043771294e+00 1.1635141367779698e+00 5.6749535341392932e+00 -1 4 -2
+902 1 0.0000000000000000e+00 9.6773485526409484e+00 1.5338678845372300e-01 6.5766241623624095e+00 4 2 -4
+2636 1 0.0000000000000000e+00 9.4348342868561677e+00 1.0785351898009628e-01 5.1031941207915219e+00 1 4 -8
+239 1 0.0000000000000000e+00 7.7973756214841492e+00 6.3954041759843164e-02 6.5921937050444734e+00 1 2 3
+1860 1 0.0000000000000000e+00 8.5504502950827828e+00 2.3762166947696306e+00 6.9896563785395314e+00 -6 -3 3
+2249 1 0.0000000000000000e+00 9.4041504021153788e+00 2.3354341334124706e+00 6.2834990856856940e+00 7 -2 -4
+970 1 0.0000000000000000e+00 8.7188163283443689e+00 1.7919840596806065e+00 7.0655389389955161e+00 -6 7 4
+976 1 0.0000000000000000e+00 7.7691273098833937e+00 2.3374317957311241e+00 6.4590488802841373e+00 -6 -2 -1
+1681 1 0.0000000000000000e+00 9.3647389745458938e+00 1.2426210305865837e+00 5.7606720246284526e+00 -1 5 4
+2737 1 0.0000000000000000e+00 8.9724494413821301e+00 5.4423688635421308e-01 7.4563950424967480e+00 -8 3 6
+734 1 0.0000000000000000e+00 7.9670016906430483e+00 1.2949144424533501e+00 5.1771144400322262e+00 -1 -5 0
+292 1 0.0000000000000000e+00 8.4034604935122577e+00 2.0988588208261221e+00 6.2353099089914146e+00 -1 7 -5
+664 1 0.0000000000000000e+00 9.2839264708100373e+00 1.7911766693290379e+00 6.8556751319776179e+00 3 5 0
+2784 1 0.0000000000000000e+00 9.2589019722364956e+00 1.2995601120705420e+00 6.3396890975572004e+00 -1 1 -4
+2245 1 0.0000000000000000e+00 8.6930282534431296e+00 1.0234930487445939e+00 7.3212655707996870e+00 -3 -2 -6
+937 1 0.0000000000000000e+00 7.9688867899887956e+00 5.9048264516473625e-01 7.0718912464627550e+00 -4 -4 -1
+2276 1 0.0000000000000000e+00 8.5718649412696060e+00 1.5004673497807963e+00 7.2104669176238350e+00 -2 6 -2
+758 1 0.0000000000000000e+00 8.1867733736432715e+00 2.1909950516563685e+00 5.7782689197471848e+00 -1 -4 -5
+519 1 0.0000000000000000e+00 9.0075880730267563e+00 2.2039662611320860e+00 5.3224411443564108e+00 -2 0 -1
+56 1 0.0000000000000000e+00 9.1267752068344556e+00 2.0014724952394651e+00 5.8706399009375216e+00 -4 1 -3
+800 1 0.0000000000000000e+00 7.6930885106599129e+00 2.8835032925016701e-01 6.1937357234641803e+00 3 -1 -5
+2122 1 0.0000000000000000e+00 8.2220486806813486e+00 1.0289101304884665e+00 6.8905754708362270e+00 -4 3 -1
+1599 1 0.0000000000000000e+00 9.0185657734736218e+00 2.3450206169479690e-01 5.7158588151795744e+00 2 -4 1
+747 1 0.0000000000000000e+00 8.6021602495100158e+00 9.8943823190565250e-01 5.5959665494189341e+00 4 -3 2
+1609 1 0.0000000000000000e+00 9.4928374105590532e+00 2.0208934426215368e+00 7.4577853885267951e+00 3 -4 0
+2443 1 0.0000000000000000e+00 7.5108506083046098e+00 1.8436231538306040e+00 5.5677425132012841e+00 -1 2 1
+2229 1 0.0000000000000000e+00 8.5898771145971207e+00 5.1543670371058647e-01 6.4972561232926509e+00 -2 6 -4
+991 1 0.0000000000000000e+00 9.4073368758044413e+00 4.5425700981387157e-01 6.3675621025660112e+00 -7 2 4
+2810 2 -1.0000000000000000e+00 8.1954566971705649e+00 2.0571978301717011e+00 5.0010685613128798e+00 -4 3 -3
+2727 1 0.0000000000000000e+00 8.4543270623927214e+00 1.6760822327484456e-01 5.8904371106560944e+00 6 -5 -6
+1570 1 0.0000000000000000e+00 9.8965436586871913e+00 1.6315724704080445e-01 5.6882944048386452e+00 -2 1 -3
+1177 1 0.0000000000000000e+00 7.6975292125990347e+00 1.8951792270912360e+00 7.1943550483257734e+00 0 5 3
+2614 1 0.0000000000000000e+00 5.9089213154641520e+00 4.8177092220800901e+00 7.4289818493151323e+00 3 0 -2
+2056 1 0.0000000000000000e+00 6.7229427992771731e+00 3.4181564570758232e+00 7.2024868774679476e+00 -1 -2 4
+2227 1 0.0000000000000000e+00 5.1505579889592239e+00 3.7204428991704530e+00 5.8196911103359215e+00 2 -3 3
+2099 1 0.0000000000000000e+00 5.7501539673595135e+00 4.2450231888574228e+00 5.2710837751897603e+00 1 3 -6
+549 1 0.0000000000000000e+00 7.1960587054946483e+00 4.1217448874496920e+00 7.1879657521605909e+00 -5 1 -8
+174 1 0.0000000000000000e+00 6.9139889706495961e+00 3.4799206653509618e+00 6.5686273067188905e+00 -1 -2 6
+2792 1 0.0000000000000000e+00 7.2312275119707445e+00 4.9273290831194601e+00 6.7341497393489753e+00 3 6 -2
+1227 1 0.0000000000000000e+00 7.3296393832031974e+00 3.4311791517808858e+00 7.3310059431464349e+00 8 2 -3
+2453 1 0.0000000000000000e+00 6.2132959661451430e+00 4.8434420379186971e+00 5.4231203454424080e+00 -4 -3 -5
+2850 2 -1.0000000000000000e+00 6.6200337865033712e+00 3.9020965684157600e+00 5.4535584279683631e+00 -3 0 6
+1748 1 0.0000000000000000e+00 7.2286373953284171e+00 4.7093927892680716e+00 5.9981167587067752e+00 -1 1 4
+366 1 0.0000000000000000e+00 5.4726920167016964e+00 3.4166414222715242e+00 7.0492972563353957e+00 0 0 -5
+2292 1 0.0000000000000000e+00 5.9957014799523973e+00 3.2389731280804694e+00 5.1602335209948071e+00 1 2 -1
+2052 1 0.0000000000000000e+00 6.3958770554419972e+00 2.7155266011946475e+00 6.2923623850962800e+00 1 1 6
+2834 2 -1.0000000000000000e+00 6.2343920748734227e+00 3.4776426898102533e+00 6.9835694146088914e+00 4 -3 -2
+1869 1 0.0000000000000000e+00 5.5807966404322498e+00 4.8061838116541660e+00 5.2494659300932947e+00 -1 1 -1
+2841 2 -1.0000000000000000e+00 5.3710653817724960e+00 4.6296849287360411e+00 6.8192594341065211e+00 -7 -3 2
+2288 1 0.0000000000000000e+00 5.1057912721226373e+00 3.3303159725004035e+00 6.5871297250292464e+00 2 0 0
+50 1 0.0000000000000000e+00 6.4975015451364779e+00 4.3328877023959533e+00 6.1052308756059963e+00 1 -1 3
+1086 1 0.0000000000000000e+00 6.5012681412071736e+00 3.1701693683434407e+00 5.7860572025224046e+00 -4 -2 3
+344 1 0.0000000000000000e+00 6.2138657370195896e+00 4.3090546876091356e+00 7.3273492002916401e+00 2 -2 -2
+1658 1 0.0000000000000000e+00 5.6791183584878366e+00 3.8387097154143408e+00 7.4899713159468391e+00 -5 -3 -1
+2586 1 0.0000000000000000e+00 5.1053325333239599e+00 4.6133612083176896e+00 5.4873475506762537e+00 1 4 -3
+2937 3 1.0000000000000000e+00 6.1981089733880363e+00 3.0020160535401890e+00 5.8056665761943504e+00 -2 0 -6
+498 1 0.0000000000000000e+00 5.3669173189383059e+00 2.6337821926290963e+00 7.0778602836085893e+00 2 -4 4
+1759 1 0.0000000000000000e+00 5.1055956022738416e+00 2.8598148934536436e+00 6.2408152081886916e+00 1 1 -2
+2719 1 0.0000000000000000e+00 5.7413468048449952e+00 4.9910934471442587e+00 5.9246922959182671e+00 -1 0 -5
+2690 1 0.0000000000000000e+00 5.5748423580480431e+00 3.2653609964967636e+00 5.6889440967277354e+00 -1 -5 -2
+2145 1 0.0000000000000000e+00 6.8947381470689324e+00 3.0834492229490933e+00 5.1825085909436970e+00 7 -5 -2
+957 1 0.0000000000000000e+00 7.1448497189344593e+00 3.1968287427670972e+00 5.8574518352313936e+00 -5 6 -5
+1910 1 0.0000000000000000e+00 5.4770897278774218e+00 2.9818535320844908e+00 6.9585396689847601e+00 -3 1 -4
+150 1 0.0000000000000000e+00 5.9780452127445658e+00 4.6792837650220180e+00 6.0053920982593194e+00 6 -10 1
+295 1 0.0000000000000000e+00 7.2856650035205410e+00 3.6821293820491725e+00 5.2909916598278519e+00 -3 0 2
+1275 1 0.0000000000000000e+00 6.2300318151656118e+00 4.1894964764604863e+00 6.7441152707186429e+00 -5 2 -1
+824 1 0.0000000000000000e+00 5.8232512819187523e+00 3.1724706918265868e+00 6.5084232668620841e+00 -2 2 3
+1506 1 0.0000000000000000e+00 5.1928460689610496e+00 2.8354925255749848e+00 5.7143915887267855e+00 -4 3 0
+947 1 0.0000000000000000e+00 6.4238151948074504e+00 3.8012467379862618e+00 6.0146801544336430e+00 4 4 0
+659 1 0.0000000000000000e+00 5.5688754850662043e+00 3.7488884948328640e+00 7.1051391064759928e+00 2 0 0
+1842 1 0.0000000000000000e+00 7.0884238322425581e+00 4.0660112935581934e+00 6.0391763487929442e+00 0 3 2
+2739 1 0.0000000000000000e+00 6.9736936546964543e+00 4.2810631954813250e+00 6.8736058438349756e+00 -3 4 -7
+2663 1 0.0000000000000000e+00 5.9950145940956219e+00 3.7296797672894710e+00 6.2000344131855494e+00 2 -6 0
+2163 1 0.0000000000000000e+00 5.6262220987294356e+00 4.2975167757396875e+00 6.0871239360094895e+00 0 -1 4
+701 1 0.0000000000000000e+00 6.9799570454878559e+00 4.3586634894730283e+00 5.3108475452695449e+00 4 1 -4
+1960 1 0.0000000000000000e+00 5.3556423089762673e+00 3.7470350654148517e+00 5.1194440263869758e+00 0 -1 4
+2528 1 0.0000000000000000e+00 8.5590447829528067e+00 2.7806911513182730e+00 5.1029239038713667e+00 5 -5 -1
+2164 1 0.0000000000000000e+00 8.1373585440377454e+00 3.4425757840867059e+00 6.0997402916921013e+00 -3 5 -3
+2040 1 0.0000000000000000e+00 7.7096786073020542e+00 2.5639474037664653e+00 5.3059210716548399e+00 -1 1 -1
+248 1 0.0000000000000000e+00 7.8416970946997120e+00 4.7551412220151335e+00 7.2048684340864648e+00 1 -1 -5
+865 1 0.0000000000000000e+00 9.2438474505747621e+00 3.2920677978813568e+00 6.7505170879580492e+00 -3 -2 6
+642 1 0.0000000000000000e+00 8.8646494871665169e+00 4.1926709276758238e+00 6.0643647937353986e+00 -3 -5 -6
+2708 1 0.0000000000000000e+00 7.5737047964573030e+00 3.7458175545988865e+00 6.9447719306529638e+00 2 4 -3
+574 1 0.0000000000000000e+00 9.5673137782055466e+00 3.0038115011813442e+00 5.2638480285565032e+00 -5 1 0
+2597 1 0.0000000000000000e+00 8.9222317458496825e+00 2.8722161189930264e+00 5.8823543351041359e+00 -5 2 4
+771 1 0.0000000000000000e+00 9.2241392162398128e+00 3.8306240465060979e+00 5.4185787025535417e+00 5 3 -5
+2842 2 -1.0000000000000000e+00 8.5212528111599504e+00 4.9527098015870328e+00 6.5257546235329800e+00 -3 -2 3
+2541 1 0.0000000000000000e+00 8.6446254155903635e+00 4.2913968545284407e+00 6.7192526347996120e+00 0 -7 3
+1429 1 0.0000000000000000e+00 9.1872725055667050e+00 4.7881865787027866e+00 7.3446490225048056e+00 0 2 -1
+1934 1 0.0000000000000000e+00 9.2384602136192129e+00 3.6304199414073541e+00 6.3935036640739655e+00 4 1 -2
+635 1 0.0000000000000000e+00 8.2189359213570814e+00 4.5009912986117220e+00 5.9343071814158650e+00 6 -4 -2
+1370 1 0.0000000000000000e+00 7.5879532407393695e+00 3.5941359378706537e+00 6.2507331745119767e+00 -4 5 -3
+2201 1 0.0000000000000000e+00 8.7155619616173201e+00 3.3405153145252697e+00 5.6035410663412719e+00 1 -1 1
+1692 1 0.0000000000000000e+00 9.4343387535906995e+00 2.6856996160602504e+00 7.1561381584491164e+00 -8 -4 3
+1953 1 0.0000000000000000e+00 9.1211938429510706e+00 4.4928999856365301e+00 5.4751435546801686e+00 -4 -2 0
+2401 1 0.0000000000000000e+00 8.5541396745687095e+00 3.5557833791448452e+00 6.6123074064689922e+00 0 4 0
+1797 1 0.0000000000000000e+00 8.8340374587360859e+00 2.8414792708641166e+00 6.6251348391702978e+00 1 -3 2
+1166 1 0.0000000000000000e+00 8.6182920704836210e+00 3.3642664220872844e+00 7.1569903253005913e+00 2 -4 3
+1574 1 0.0000000000000000e+00 9.0802668024132611e+00 3.6913008189996499e+00 5.1388926682640674e+00 -2 3 1
+673 1 0.0000000000000000e+00 8.2845628886055245e+00 2.8464048984096602e+00 6.0257101891313507e+00 -2 0 -1
+2746 1 0.0000000000000000e+00 9.8692046254204850e+00 2.7040105700575108e+00 7.3719749527961076e+00 -3 4 1
+1042 1 0.0000000000000000e+00 7.6318422587414156e+00 4.3333865849053668e+00 6.1212676176988774e+00 5 -5 0
+2200 1 0.0000000000000000e+00 7.5666513943568621e+00 2.8701536070081342e+00 5.9892546094192705e+00 2 -6 4
+1997 1 0.0000000000000000e+00 9.9850365516730069e+00 4.8734862456645587e+00 5.8642994305092344e+00 -2 5 1
+509 1 0.0000000000000000e+00 9.4205990602957872e+00 3.3061868107043835e+00 5.9434214729925632e+00 2 0 2
+1072 1 0.0000000000000000e+00 9.5986837219546945e+00 2.6425678199156164e+00 6.6807444042660471e+00 -2 0 -4
+1013 1 0.0000000000000000e+00 9.3872700864424345e+00 4.1281084066093880e+00 7.1476620860821418e+00 -1 7 3
+2660 1 0.0000000000000000e+00 8.7236931839863274e+00 4.7123813330388566e+00 5.1849027196742465e+00 -1 -5 -2
+135 1 0.0000000000000000e+00 8.4048539716059310e+00 4.1796295576623717e+00 7.1252506335900536e+00 0 1 1
+84 1 0.0000000000000000e+00 7.7844330631356682e+00 2.6875801693504071e+00 6.8964995945055048e+00 2 -2 -2
+864 1 0.0000000000000000e+00 9.8958127529434794e+00 3.8253014732874746e+00 6.7446330619561907e+00 -1 1 -1
+756 1 0.0000000000000000e+00 8.8129848566167706e+00 4.1187622496822440e+00 5.2066223139933374e+00 -5 3 1
+276 1 0.0000000000000000e+00 9.4171190389891457e+00 3.3526206607281361e+00 7.4074991926865534e+00 -4 -1 1
+686 1 0.0000000000000000e+00 9.6364664204951573e+00 4.6032070426878393e+00 5.2828790885180297e+00 -1 1 1
+525 1 0.0000000000000000e+00 7.7492721363040333e+00 4.1713096569835413e+00 6.7138053296233622e+00 4 -3 0
+55 1 0.0000000000000000e+00 7.8011378218426453e+00 4.9032952228803506e+00 5.0472092052000495e+00 -4 7 0
+2445 1 0.0000000000000000e+00 9.5168704638988455e+00 4.1072977347081849e+00 6.4287027546874116e+00 -6 0 -10
+1038 1 0.0000000000000000e+00 9.6383657730803218e+00 4.1177561184293587e+00 5.8669224876554429e+00 0 2 -7
+1642 1 0.0000000000000000e+00 8.3034612088292530e+00 3.7986456767983219e+00 5.0705594899629620e+00 8 -3 -1
+1297 1 0.0000000000000000e+00 8.0278523508064215e+00 3.8692245099763185e+00 5.4957200444545142e+00 0 -1 -1
+1352 1 0.0000000000000000e+00 7.5588887629788504e+00 4.7123782106587262e+00 5.5024359052910725e+00 0 0 3
+444 1 0.0000000000000000e+00 9.4929499137446189e+00 2.6568008904014238e+00 5.6063056173568597e+00 -7 5 0
+182 1 0.0000000000000000e+00 7.7127479083793116e+00 3.3497851003420740e+00 5.2816066641381259e+00 -4 2 7
+1917 1 0.0000000000000000e+00 9.6326364387465269e+00 4.9804457018823758e+00 6.6596129344000135e+00 4 5 -1
+1219 1 0.0000000000000000e+00 9.0819122352662074e+00 4.7322210818666139e+00 6.1471767094038769e+00 -6 0 3
+1885 1 0.0000000000000000e+00 7.0462894090870689e+00 1.2363445854498931e+00 9.6569977228086898e+00 0 0 2
+424 1 0.0000000000000000e+00 6.9247698229399264e+00 2.0854076837435875e+00 8.4352092463277479e+00 -1 5 -5
+1907 1 0.0000000000000000e+00 6.3552458109138028e+00 1.1287199070038383e+00 9.8858921706412755e+00 5 -2 -3
+2452 1 0.0000000000000000e+00 7.4751299963748412e+00 5.6238616075105252e-01 8.6699334336886960e+00 2 -3 -1
+1577 1 0.0000000000000000e+00 6.8527725834571518e+00 1.9832562586255291e+00 9.0214710577789958e+00 7 2 -5
+2490 1 0.0000000000000000e+00 5.7951542681082522e+00 1.2697289875100086e+00 8.0203153585778715e+00 2 -6 -2
+614 1 0.0000000000000000e+00 6.6941332666979569e+00 1.0254094026577121e+00 8.7171801907962596e+00 3 7 -3
+2085 1 0.0000000000000000e+00 7.3353731648668745e+00 1.0212424275649099e+00 8.0116984075572084e+00 1 -1 2
+1866 1 0.0000000000000000e+00 7.2350331781018751e+00 1.5372632252234926e+00 8.4836274402080782e+00 -3 5 0
+974 1 0.0000000000000000e+00 7.1664556804882675e+00 7.0624031018312405e-01 9.0132622993937463e+00 4 4 5
+1472 1 0.0000000000000000e+00 6.0612325258064104e+00 2.9080123697581478e-01 9.6318162863230068e+00 3 2 3
+1203 1 0.0000000000000000e+00 6.5141305490972785e+00 1.4947344525242976e+00 9.4640333636573803e+00 0 1 3
+4 1 0.0000000000000000e+00 6.1061848580744309e+00 2.0996449403914723e+00 7.7535662751149088e+00 -4 0 -1
+1985 1 0.0000000000000000e+00 7.1240604377542560e+00 2.6232350354506895e-01 9.4787656217935847e+00 0 6 -2
+1306 1 0.0000000000000000e+00 6.4774821127038935e+00 1.3781112794789372e+00 8.0953600533107117e+00 5 1 6
+1592 1 0.0000000000000000e+00 6.6620647395309076e+00 3.0129670389443347e-01 8.9949035433400262e+00 -5 4 -2
+2602 1 0.0000000000000000e+00 5.2325905395666696e+00 2.2266961866972608e+00 7.8235949244918048e+00 -7 -1 -1
+2487 1 0.0000000000000000e+00 6.6480846623891985e+00 1.2585195961257352e+00 7.8429899849358060e+00 0 5 -3
+2494 1 0.0000000000000000e+00 5.6276090797979741e+00 2.3965495227289324e+00 7.9809023880958048e+00 5 -1 -1
+557 1 0.0000000000000000e+00 5.5638510157913732e+00 2.7451626383028521e-01 9.8389054050189593e+00 -4 1 1
+2706 1 0.0000000000000000e+00 6.2609521310335614e+00 3.3508618382754686e-02 8.2972181820272795e+00 2 -1 1
+2968 3 1.0000000000000000e+00 6.7032504283948615e+00 4.5228509208181156e-01 8.2614773211788695e+00 -2 -2 -3
+1328 1 0.0000000000000000e+00 7.3058110360996436e+00 1.9456111834699630e+00 9.7575410269403040e+00 2 -1 -3
+2488 1 0.0000000000000000e+00 7.1338378577110824e+00 1.3079796039056184e+00 8.8813461236563267e+00 -1 0 -6
+1889 1 0.0000000000000000e+00 5.9127995567106399e+00 1.8341037690503510e+00 9.0418086100051163e+00 0 2 3
+2295 1 0.0000000000000000e+00 6.6174902785499450e+00 2.3271197189504171e+00 8.0513246427805161e+00 5 0 0
+1672 1 0.0000000000000000e+00 5.3662592655594104e+00 3.8764246747684117e-01 7.6778697002986496e+00 -1 1 6
+2467 1 0.0000000000000000e+00 6.9842304272539790e+00 1.9937668702519438e+00 7.5244103363844612e+00 -1 1 -3
+867 1 0.0000000000000000e+00 7.1651964497466309e+00 2.3762149968734483e-01 8.0326870276449220e+00 4 3 1
+2605 1 0.0000000000000000e+00 5.4219891765809525e+00 2.0800265011414987e+00 9.9174807859715806e+00 1 -2 -2
+408 1 0.0000000000000000e+00 5.2973300166494592e+00 1.4389489406431206e+00 9.8489584819878182e+00 0 0 -1
+207 1 0.0000000000000000e+00 5.5880598326586792e+00 1.2951888361341950e+00 8.4597153108700134e+00 3 1 -3
+2348 1 0.0000000000000000e+00 6.0759317120972227e+00 2.3973751438135951e+00 9.4893715629807200e+00 3 2 -4
+313 1 0.0000000000000000e+00 5.7670029440526216e+00 2.1989908287938738e+00 8.8490783031696818e+00 -7 -3 -2
+1769 1 0.0000000000000000e+00 5.1148797514614284e+00 8.6548773373681032e-01 8.9261080650927145e+00 1 -4 -6
+1967 1 0.0000000000000000e+00 6.3526033322761881e+00 5.0244231165306782e-02 7.5655991746834799e+00 0 2 2
+1961 1 0.0000000000000000e+00 5.4063941088301251e+00 2.4599798129933118e-01 8.4081566985119753e+00 7 0 4
+181 1 0.0000000000000000e+00 5.3611138935980041e+00 8.0363752335453276e-01 9.6727044908131603e+00 3 4 1
+2271 1 0.0000000000000000e+00 6.2487554533516070e+00 1.6141762624205034e+00 8.4740097064114011e+00 -8 1 2
+1721 1 0.0000000000000000e+00 5.9646402631788620e+00 1.2339555852383128e+00 9.0751932371092110e+00 -6 -2 5
+2677 1 0.0000000000000000e+00 6.5854637018460807e+00 1.7762787984316755e+00 9.7239559984514194e+00 -8 -1 -2
+1637 1 0.0000000000000000e+00 5.4575680045274906e+00 1.5048317699535541e+00 8.2643736367102960e+00 1 -3 -5
+1810 1 0.0000000000000000e+00 5.2939785504581467e+00 4.0866760558402210e-01 9.0745684360219894e+00 1 6 -2
+920 1 0.0000000000000000e+00 5.1369273900553365e+00 2.0755397519110379e+00 9.2493814565937384e+00 4 -1 -1
+420 1 0.0000000000000000e+00 8.1773575625533130e+00 1.6818423957870428e+00 7.5608888695774503e+00 5 -3 9
+2373 1 0.0000000000000000e+00 8.8633097577338198e+00 2.3336248731491374e+00 7.5875779391728866e+00 1 3 -2
+1397 1 0.0000000000000000e+00 9.8758974072756960e+00 3.8800079874559701e-01 8.4516408019650378e+00 -6 -4 -2
+197 1 0.0000000000000000e+00 9.8370682474189763e+00 2.0186061615654332e+00 8.3187757055119551e+00 1 -8 0
+2119 1 0.0000000000000000e+00 9.5569149430146219e+00 7.5068078626340073e-01 7.7903773359461006e+00 -4 1 -1
+2622 1 0.0000000000000000e+00 7.8200020797257306e+00 9.7418353810258751e-01 8.4243764287616152e+00 -5 -1 -3
+1099 1 0.0000000000000000e+00 9.3228989302647864e+00 1.7714211980655705e+00 9.5635501454524334e+00 -5 2 1
+1320 1 0.0000000000000000e+00 8.9807403673606636e+00 1.3858365233483998e+00 7.8260719259912133e+00 -3 -2 0
+1294 1 0.0000000000000000e+00 7.7585105823486691e+00 2.2314955156926288e+00 9.2277736150212650e+00 2 0 0
+2747 1 0.0000000000000000e+00 9.8653810682131446e+00 4.0692363507309820e-01 7.6423997030774586e+00 3 -6 -1
+709 1 0.0000000000000000e+00 8.0650965009649749e+00 1.2859833442304741e-01 8.6459777418880215e+00 -3 4 2
+1317 1 0.0000000000000000e+00 7.5513337707994976e+00 1.7547568639850826e+00 8.0104479830521633e+00 5 -4 2
+2371 1 0.0000000000000000e+00 8.5838360289517777e+00 6.0875532832411183e-01 9.9026988061683188e+00 0 3 4
+1077 1 0.0000000000000000e+00 9.4577736300095054e+00 2.4251392630608612e+00 8.5416200104046993e+00 1 5 -3
+208 1 0.0000000000000000e+00 9.7316474032950016e+00 4.3800451969619691e-01 9.2782675045445675e+00 1 -4 -1
+2830 2 -1.0000000000000000e+00 8.2276373842919401e+00 9.4798401586608583e-01 9.0952577305073508e+00 -10 -1 -2
+2417 1 0.0000000000000000e+00 9.0767013162910448e+00 1.7061665473113248e+00 9.0126731804166589e+00 2 -9 3
+70 1 0.0000000000000000e+00 8.0183797590505499e+00 1.5239959902046789e+00 9.2727948141374927e+00 0 0 5
+903 1 0.0000000000000000e+00 7.9343408851473569e+00 1.3749743649686608e+00 8.2071144800686433e+00 -6 1 0
+2573 1 0.0000000000000000e+00 8.5418349599575567e+00 1.7617274500033433e+00 9.4268624884760897e+00 2 -3 1
+128 1 0.0000000000000000e+00 7.5512745058120219e+00 2.0742909188509167e+00 8.8005051514661066e+00 7 -1 -1
+488 1 0.0000000000000000e+00 9.2491233005226849e+00 7.0244495448694300e-01 9.6473963281434347e+00 2 4 -4
+403 1 0.0000000000000000e+00 8.6087922179304925e+00 1.9588778600321248e+00 8.5601674496440410e+00 -3 3 0
+370 1 0.0000000000000000e+00 7.7487604781468598e+00 1.7022957204046198e+00 9.7803771852042569e+00 -4 -1 0
+657 1 0.0000000000000000e+00 9.4493739713747189e+00 6.8133042393280163e-01 9.0636395840518187e+00 0 -8 -3
+217 1 0.0000000000000000e+00 9.3258910261168939e+00 1.2755645623221170e+00 8.4580385920072132e+00 4 -7 -4
+1387 1 0.0000000000000000e+00 8.4958285432597158e+00 6.8245920382006986e-01 8.0689744499482536e+00 -2 -4 -2
+1075 1 0.0000000000000000e+00 7.6608929993071282e+00 1.2387707014843655e-01 7.7277736897703200e+00 -1 0 -5
+1117 1 0.0000000000000000e+00 8.8189746622258838e+00 2.2623405351681001e+00 9.3440122416729743e+00 3 -4 1
+575 1 0.0000000000000000e+00 8.4283100683309762e+00 1.1564889549879269e+00 8.6279011327732054e+00 0 7 3
+1676 1 0.0000000000000000e+00 8.8432741054044133e+00 2.2954859801213501e+00 8.5320507039495990e+00 -12 -3 -3
+2666 1 0.0000000000000000e+00 8.1712059999639610e+00 2.1457020982742110e+00 9.9282955078284889e+00 -2 -2 -2
+927 1 0.0000000000000000e+00 7.7895872431797528e+00 8.0252442708726091e-01 7.8118299912392315e+00 2 1 -2
+1243 1 0.0000000000000000e+00 9.6196329555256792e+00 1.1842164584729893e+00 9.1864242782860543e+00 3 -8 6
+1030 1 0.0000000000000000e+00 8.8644390325840625e+00 1.0423722405224392e+00 9.7749174142306146e+00 2 2 2
+1575 1 0.0000000000000000e+00 9.9077182815388536e+00 1.7135911575904064e+00 8.8298153351129045e+00 -7 -1 -1
+1455 1 0.0000000000000000e+00 9.9093373264946489e+00 2.1806583316503012e+00 9.4099569325993837e+00 -4 -10 -6
+2654 1 0.0000000000000000e+00 8.8601288753177769e+00 4.8363112731809171e-01 8.7073135235072634e+00 -2 4 1
+2420 1 0.0000000000000000e+00 7.8079630811045524e+00 2.1894883210194549e+00 7.6716145831545894e+00 -1 6 1
+105 1 0.0000000000000000e+00 8.5974089672469365e+00 1.2105718498214443e-01 8.8838878800500716e+00 -2 0 4
+2689 1 0.0000000000000000e+00 8.3121618667611052e+00 2.2387410034668207e+00 9.0786916755540865e+00 -3 2 1
+959 1 0.0000000000000000e+00 8.8393843030525243e+00 8.5350697764941130e-01 8.3787613753920809e+00 -3 -5 -2
+2001 1 0.0000000000000000e+00 7.8389804144171533e+00 5.5147448847709268e-01 9.3693402459007498e+00 -2 -3 1
+2975 3 1.0000000000000000e+00 7.5995910494836156e+00 9.0150787153646861e-01 9.3764569947025631e+00 -10 1 3
+896 1 0.0000000000000000e+00 8.9429258672526792e+00 1.3057575440426912e+00 9.5962372998600998e+00 1 0 5
+2628 1 0.0000000000000000e+00 9.7725431383090982e+00 1.1124787219150480e+00 8.1375744317387575e+00 -4 0 -1
+363 1 0.0000000000000000e+00 7.9691496245510320e+00 2.8542822786875971e-01 9.8648920513499476e+00 5 1 1
+484 1 0.0000000000000000e+00 8.0979082643798410e+00 7.6333063967604795e-02 8.1778867883626685e+00 2 -3 -3
+2695 1 0.0000000000000000e+00 9.2751957727830838e+00 2.5274755458463853e-02 7.7752296115496389e+00 -3 -7 -2
+1722 1 0.0000000000000000e+00 6.1922040904980591e+00 3.7704570040786991e+00 8.0450176355197733e+00 4 8 4
+2431 1 0.0000000000000000e+00 7.4768703195056299e+00 2.5734795127207764e+00 8.2242171737522138e+00 6 0 -2
+2204 1 0.0000000000000000e+00 6.1685619716813616e+00 3.4758568281077329e+00 9.1996683565991013e+00 2 2 -1
+2638 1 0.0000000000000000e+00 5.8698531489716279e+00 2.9444488063729222e+00 7.5877892193728265e+00 -4 1 -7
+2005 1 0.0000000000000000e+00 7.2558818375162115e+00 2.8072936357544105e+00 9.3590495962827482e+00 3 1 5
+2932 3 1.0000000000000000e+00 7.2804202059847816e+00 4.9258695340661420e+00 8.8031059980845274e+00 0 1 0
+2949 3 1.0000000000000000e+00 5.6247026466720582e+00 4.3068723409551302e+00 8.2079528115755647e+00 0 1 -3
+479 1 0.0000000000000000e+00 6.6992910302609676e+00 3.1348835754861910e+00 8.5080733926123351e+00 -3 -2 1
+741 1 0.0000000000000000e+00 5.2850183571658640e+00 4.5344823376314993e+00 9.0728699390937706e+00 5 4 -3
+1182 1 0.0000000000000000e+00 5.2856725911761586e+00 2.5281708862910945e+00 9.9258970575458569e+00 0 3 -1
+203 1 0.0000000000000000e+00 7.3275210553995684e+00 3.5734532943386434e+00 8.7781041938412638e+00 -4 -2 -1
+334 1 0.0000000000000000e+00 5.0514162718037046e+00 3.2092856724527365e+00 9.1361665326319361e+00 4 -1 0
+1653 1 0.0000000000000000e+00 7.3420954038960478e+00 4.1742641793276665e+00 9.4916204447362471e+00 -3 -4 1
+1499 1 0.0000000000000000e+00 5.3943466494472041e+00 2.7319455653066114e+00 8.3331866470793585e+00 -5 0 -1
+1796 1 0.0000000000000000e+00 5.0897757254299041e+00 3.4210285798588407e+00 7.5015685537111354e+00 -2 0 4
+598 1 0.0000000000000000e+00 6.5929171382035063e+00 2.7965413999202675e+00 7.6310343790732968e+00 5 0 -2
+2224 1 0.0000000000000000e+00 5.1923028686217005e+00 2.5806527224467932e+00 8.5846796768956217e+00 2 3 -3
+263 1 0.0000000000000000e+00 6.6812082160748796e+00 4.3826576879038308e+00 8.2826701915410936e+00 1 6 8
+2084 1 0.0000000000000000e+00 7.2986603004200754e+00 3.6655545367214741e+00 8.4781460477666375e+00 -5 3 1
+228 1 0.0000000000000000e+00 5.3042409834593114e+00 3.5197183593811130e+00 7.9664869327596204e+00 4 7 2
+2718 1 0.0000000000000000e+00 6.5595194614445722e+00 3.4134676431242794e+00 9.9114369602575998e+00 4 -4 -5
+2419 1 0.0000000000000000e+00 5.1568242346513760e+00 4.3414037319788843e+00 8.1829886338579971e+00 6 2 1
+2723 1 0.0000000000000000e+00 7.0672940343260953e+00 3.7707830200077619e+00 8.0588153092143688e+00 -1 4 0
+2208 1 0.0000000000000000e+00 5.0727329845438511e+00 4.9974670132862586e+00 8.6899074562213787e+00 0 2 -2
+1339 1 0.0000000000000000e+00 6.8924171704835802e+00 4.1580477882992399e+00 8.8619408386030365e+00 3 0 6
+728 1 0.0000000000000000e+00 7.3979405346167768e+00 3.3207656877075684e+00 9.8718260437555649e+00 2 -1 -2
+1102 1 0.0000000000000000e+00 6.8107395117828862e+00 2.7501070134131997e+00 8.8932835289629466e+00 -5 3 2
+1037 1 0.0000000000000000e+00 6.6760066175819004e+00 2.5398285355424211e+00 9.3610420235894054e+00 -5 0 -7
+1670 1 0.0000000000000000e+00 6.5253076473800409e+00 3.0258253836113176e+00 9.3357151930434323e+00 5 4 -8
+402 1 0.0000000000000000e+00 7.0424106821453556e+00 3.2505061893361904e+00 7.9567247962799525e+00 -2 1 -1
+2014 1 0.0000000000000000e+00 5.7024504414575752e+00 3.3889589572512895e+00 8.6805949347358151e+00 -1 -3 -4
+1619 1 0.0000000000000000e+00 6.0984690778542028e+00 2.5451074643439551e+00 8.6244397313112824e+00 2 1 -2
+2136 1 0.0000000000000000e+00 6.0396051477158501e+00 4.9793878087783430e+00 8.6508140078171483e+00 -5 4 -1
+81 1 0.0000000000000000e+00 6.1951335577314328e+00 3.4562779295679102e+00 7.7984485001799140e+00 4 1 2
+623 1 0.0000000000000000e+00 5.8247297246955361e+00 4.7790434065898797e+00 9.0855710287071858e+00 0 4 -3
+750 1 0.0000000000000000e+00 5.0652358843596010e+00 4.5237870414916106e+00 7.5932207837702546e+00 4 2 5
+1183 1 0.0000000000000000e+00 6.7691630589572984e+00 3.7134752674621425e+00 9.1484966440929050e+00 1 -1 2
+1246 1 0.0000000000000000e+00 7.3806910148210720e+00 4.5157789250963889e+00 8.2636942735919803e+00 -4 5 4
+1018 1 0.0000000000000000e+00 7.3425975661243283e+00 4.5880049168495418e+00 9.9354837187775757e+00 5 -5 5
+67 1 0.0000000000000000e+00 5.3967610021385841e+00 3.5729571603612666e+00 8.8332967697889053e+00 -1 0 -4
+2167 1 0.0000000000000000e+00 6.0211546863784129e+00 3.4428007421016575e+00 9.6164902388466658e+00 0 1 -4
+1856 1 0.0000000000000000e+00 5.8496918326909029e+00 4.0773970341822716e+00 8.8397300321736783e+00 2 -2 3
+2194 1 0.0000000000000000e+00 5.7231559523230393e+00 2.5545570854685260e+00 9.5045037378310830e+00 -2 2 -2
+435 1 0.0000000000000000e+00 5.8042821295293292e+00 4.1345249598832030e+00 9.5928209625019907e+00 -8 1 -7
+1374 1 0.0000000000000000e+00 6.5173206917552431e+00 4.9619140685883663e+00 8.2956278196185433e+00 -1 -6 -2
+277 1 0.0000000000000000e+00 6.8465618786485534e+00 4.8012382759011327e+00 7.6587308301039743e+00 0 -4 1
+1996 1 0.0000000000000000e+00 6.4210621255343625e+00 4.4728868285158141e+00 9.2635674742738914e+00 -9 4 -2
+766 1 0.0000000000000000e+00 6.4392431587323617e+00 4.8728435210341070e+00 9.5916334629677298e+00 0 0 4
+2657 1 0.0000000000000000e+00 6.8022358031587791e+00 2.5963945358166871e+00 9.7565684680572264e+00 -5 4 -2
+1096 1 0.0000000000000000e+00 6.8609180600818460e+00 4.6626740202450856e+00 9.9233564557053562e+00 -2 -1 0
+1346 1 0.0000000000000000e+00 6.6685153633817160e+00 3.9582757152156103e+00 7.5428238541068522e+00 1 2 4
+839 1 0.0000000000000000e+00 9.0559020947201567e+00 3.7381681967808604e+00 7.5252711899951672e+00 -6 2 -3
+1724 1 0.0000000000000000e+00 9.9342751408611978e+00 3.5029831545841343e+00 7.5775651560416346e+00 0 -2 -2
+229 1 0.0000000000000000e+00 8.5113866487997178e+00 4.6786876933585582e+00 8.2034564437952238e+00 -4 0 2
+256 1 0.0000000000000000e+00 7.9260111251900733e+00 2.8659191098880492e+00 9.1139785651969429e+00 -3 1 -2
+1175 1 0.0000000000000000e+00 9.7838465932218153e+00 3.0427518779719036e+00 9.7319268892007180e+00 0 4 2
+141 1 0.0000000000000000e+00 8.3801927799229752e+00 3.1138499418540353e+00 7.6270462419862595e+00 2 1 -3
+2178 1 0.0000000000000000e+00 8.4868216356007924e+00 4.5426918186053591e+00 7.5192826703691216e+00 -1 -2 1
+884 1 0.0000000000000000e+00 8.8269469517531007e+00 3.2476536333400388e+00 9.3127746835819316e+00 -3 5 5
+2941 3 1.0000000000000000e+00 9.1721377234023720e+00 4.4856323851664799e+00 7.9828447542871954e+00 5 -1 0
+2330 1 0.0000000000000000e+00 9.2038005728444432e+00 3.4592094013430228e+00 9.0904745448066411e+00 0 -4 0
+1127 1 0.0000000000000000e+00 9.5466793372611232e+00 2.6562377437896485e+00 7.9821872680313772e+00 3 -1 3
+354 1 0.0000000000000000e+00 8.6363757104724321e+00 4.6602137053985011e+00 9.2924470972303403e+00 -6 0 -2
+1476 1 0.0000000000000000e+00 8.7098355695067777e+00 3.7549748943236909e+00 8.2652703666490286e+00 -1 4 -8
+733 1 0.0000000000000000e+00 8.2447398297381724e+00 2.9439877546567943e+00 8.6185405592880358e+00 -4 -1 -6
+2336 1 0.0000000000000000e+00 8.8174173363806041e+00 4.0609749573190870e+00 8.7711293688942256e+00 -4 6 -10
+283 1 0.0000000000000000e+00 9.0329115418040651e+00 2.6509862202278685e+00 9.7384180769405386e+00 -4 -8 0
+754 1 0.0000000000000000e+00 8.7043333388832114e+00 2.7903474030028685e+00 7.8170916619163187e+00 -3 1 0
+179 1 0.0000000000000000e+00 9.8122555524089172e+00 3.9631726610766926e+00 8.8447941355299804e+00 2 -2 -2
+2027 1 0.0000000000000000e+00 9.7510626017873605e+00 4.9680730917786944e+00 9.4151020089272190e+00 3 4 2
+2761 1 0.0000000000000000e+00 9.4259017110658387e+00 4.8091174062427839e+00 8.9194173185814112e+00 1 -3 2
+1169 1 0.0000000000000000e+00 9.3929465502218790e+00 3.7478685633141806e+00 8.2115809531204622e+00 0 5 3
+1612 1 0.0000000000000000e+00 8.6091065800989650e+00 4.1967677591632597e+00 9.3682661584845324e+00 1 4 -2
+2470 1 0.0000000000000000e+00 7.7313336881869983e+00 4.0378465601732749e+00 7.8962867023586414e+00 -1 -7 1
+145 1 0.0000000000000000e+00 9.3245673385727166e+00 3.3145120862548820e+00 9.7572546151633350e+00 5 -3 -1
+908 1 0.0000000000000000e+00 8.0113712087195967e+00 4.0727397672253183e+00 8.8321633679806997e+00 -1 0 -2
+2507 1 0.0000000000000000e+00 9.7105971045256272e+00 2.6556762468218462e+00 9.1375019521132490e+00 -3 -1 3
+1522 1 0.0000000000000000e+00 7.8730830122286699e+00 3.6207864659604363e+00 8.1272501121914011e+00 5 3 8
+310 1 0.0000000000000000e+00 9.1969725221225183e+00 3.1811099197331321e+00 8.1217367608336755e+00 -1 -1 6
+373 1 0.0000000000000000e+00 7.9641272845869198e+00 3.4145458862114784e+00 9.2440491029579270e+00 0 -4 8
+2978 3 1.0000000000000000e+00 9.6395032641987921e+00 4.9263902440024268e+00 7.5186137934251045e+00 5 -1 -3
+2578 1 0.0000000000000000e+00 8.0743872837560442e+00 3.8716525086205609e+00 7.5477820198336296e+00 2 2 -1
+889 1 0.0000000000000000e+00 9.2719888654234079e+00 4.3547030958387456e+00 9.1580951431674897e+00 -1 3 4
+2691 1 0.0000000000000000e+00 7.7695601675055279e+00 4.7331787472612232e+00 8.8523733666876883e+00 1 4 2
+406 1 0.0000000000000000e+00 8.5534826295945372e+00 2.7746138833238438e+00 8.7716142989508068e+00 4 -5 5
+669 1 0.0000000000000000e+00 9.6900470172991326e+00 2.8738363127553610e+00 8.2751269452939997e+00 2 2 -3
+979 1 0.0000000000000000e+00 7.5422330578091445e+00 2.8679907540970584e+00 8.4649292788843393e+00 -2 2 3
+2535 1 0.0000000000000000e+00 9.7347036420219322e+00 4.0025662195742164e+00 9.5526838099888369e+00 -4 -1 -1
+2404 1 0.0000000000000000e+00 9.2403701022514753e+00 3.0401241580942902e+00 8.9299391215946695e+00 3 0 -1
+2041 1 0.0000000000000000e+00 7.6940624802047903e+00 2.9685321242935854e+00 7.7707844506861194e+00 -1 -1 0
+1882 1 0.0000000000000000e+00 8.9127254670025557e+00 4.0197733780854659e+00 9.6253559248659588e+00 3 -5 6
+569 1 0.0000000000000000e+00 9.4679854900003217e+00 3.1218635449195871e+00 8.5799493526166355e+00 -6 -2 -2
+1891 1 0.0000000000000000e+00 8.5776078686039607e+00 4.9448847381382324e+00 9.7740092926895912e+00 0 -4 2
+2432 1 0.0000000000000000e+00 8.0417034633495295e+00 3.4277917708054906e+00 9.8108186780246474e+00 5 6 -2
+274 1 0.0000000000000000e+00 8.2255870429431663e+00 2.8072612334392155e+00 9.7825533803618523e+00 2 1 2
+27 1 0.0000000000000000e+00 9.8511346383815059e+00 3.5131987509212528e+00 8.7598653319059707e+00 0 2 -6
+2814 2 -1.0000000000000000e+00 7.9994067248644720e+00 4.9650963322316413e+00 9.9709832290365821e+00 -3 -8 5
+140 1 0.0000000000000000e+00 7.4406445541717350e+00 6.7421529203464976e+00 1.4558862885035613e+00 3 1 -5
+705 1 0.0000000000000000e+00 5.5362677135614220e+00 7.3171523394581275e+00 3.5060541626147362e-01 2 -1 -3
+297 1 0.0000000000000000e+00 5.0879576747538930e+00 6.1982094579806377e+00 1.0876956463610925e+00 1 -3 4
+2645 1 0.0000000000000000e+00 6.6667806809312706e+00 6.9284422479917867e+00 1.4628708369876202e+00 -5 -1 4
+2424 1 0.0000000000000000e+00 5.5240046178021540e+00 5.5821664302232561e+00 1.2240363509273555e+00 -2 -7 1
+694 1 0.0000000000000000e+00 6.1939337079507046e+00 5.6028495067693900e+00 7.1670786369349848e-01 -4 0 3
+1873 1 0.0000000000000000e+00 5.8687444760791792e+00 5.4711846828787172e+00 2.4545974703960960e+00 3 -2 3
+2141 1 0.0000000000000000e+00 6.6136860476329282e+00 5.4506692977570914e+00 1.2918622952275727e+00 10 0 -7
+634 1 0.0000000000000000e+00 7.3124076319446170e+00 7.0164181057238038e+00 1.8101884161488881e+00 -8 -7 3
+1312 1 0.0000000000000000e+00 5.0873795197352107e+00 6.9680321002918229e+00 2.3783777442160816e+00 2 -6 -2
+267 1 0.0000000000000000e+00 6.9409834305032740e+00 6.3834409063671798e+00 1.8013245019054736e+00 -7 -5 -7
+1591 1 0.0000000000000000e+00 6.9616418737767161e+00 5.5069090365666913e+00 2.4793234919819840e+00 2 -8 -4
+1375 1 0.0000000000000000e+00 6.8473610232226925e+00 5.6567701763885960e+00 1.9017434332204441e+00 1 -5 -4
+1877 1 0.0000000000000000e+00 5.1326874930635871e+00 6.1368842205364444e+00 1.7972315663362672e+00 4 -5 -2
+775 1 0.0000000000000000e+00 5.0219028180586278e+00 5.5261150075189818e+00 1.0404719108149099e+00 -3 5 3
+291 1 0.0000000000000000e+00 6.6647203799758126e+00 7.1114056379652935e+00 5.4651122713823730e-01 -3 -2 -1
+2134 1 0.0000000000000000e+00 6.2260986198801938e+00 6.8792248189471916e+00 1.9240034656988672e-01 3 5 5
+2846 2 -1.0000000000000000e+00 6.3452466250286088e+00 6.4174798751462321e+00 8.3746575013169300e-01 1 2 8
+1389 1 0.0000000000000000e+00 5.5629063760938102e+00 6.7309355101015571e+00 1.1543932177604574e+00 2 4 3
+189 1 0.0000000000000000e+00 5.0694687910074867e+00 5.8493743626996313e+00 2.3125069917902530e+00 -1 -4 2
+1277 1 0.0000000000000000e+00 5.5218053592401635e+00 7.1684169209544857e+00 1.7393786265102296e+00 6 2 4
+238 1 0.0000000000000000e+00 7.3000301959863281e+00 6.4100131661372739e+00 3.2699463197861356e-01 -1 2 2
+392 1 0.0000000000000000e+00 6.3477771841620632e+00 6.5917438771044417e+00 2.1304649008301990e-01 -8 -1 3
+2474 1 0.0000000000000000e+00 6.2567036063889967e+00 6.7356398304088598e+00 1.7643850695643490e+00 3 4 2
+40 1 0.0000000000000000e+00 6.6931542305896592e+00 7.0244064064340703e+00 2.4240011284149929e+00 0 5 2
+866 1 0.0000000000000000e+00 5.0459141723637160e+00 6.4717363459117347e+00 3.8560545335749774e-01 8 4 9
+454 1 0.0000000000000000e+00 6.8026486995448776e+00 6.1284691765595065e+00 1.0915308420569567e+00 1 -1 -4
+428 1 0.0000000000000000e+00 6.3813835256535656e+00 6.9941326752974566e+00 8.2767692444712981e-01 -5 8 0
+2006 1 0.0000000000000000e+00 5.6867275720245880e+00 6.2331644029551798e+00 3.9425184605933217e-01 0 -3 4
+1884 1 0.0000000000000000e+00 7.0010753324114523e+00 5.8536675627727792e+00 5.8436761545993132e-01 1 -1 4
+1234 1 0.0000000000000000e+00 5.3537910634603145e+00 6.6525046637869902e+00 2.4143480700239666e+00 -7 4 1
+885 1 0.0000000000000000e+00 6.0155855616696412e+00 5.4353488089193025e+00 1.7141675055704590e+00 1 3 -3
+2919 3 1.0000000000000000e+00 6.3813708291217237e+00 5.9307925215039123e+00 2.0187793381293351e+00 -9 -5 -1
+2300 1 0.0000000000000000e+00 7.1238355220258338e+00 5.5091163479789991e+00 3.7299371037591816e-01 4 2 -4
+1815 1 0.0000000000000000e+00 5.7514375772662962e+00 6.8685319947787686e+00 9.4309723085134034e-01 9 -5 -2
+2480 1 0.0000000000000000e+00 7.3393849890032090e+00 6.3156097383697238e+00 2.2110279410081661e+00 0 3 1
+748 1 0.0000000000000000e+00 5.8560798553204236e+00 5.1244238025294520e+00 2.2432519149957994e-01 2 2 2
+178 1 0.0000000000000000e+00 6.9383680812630297e+00 5.2312851124959083e+00 1.2759574780963248e+00 -3 2 10
+1360 1 0.0000000000000000e+00 6.1481512748034612e+00 7.3473432253194479e+00 1.9062447719625721e+00 -1 0 -6
+2036 1 0.0000000000000000e+00 7.0395575310189766e+00 6.4660050788628576e+00 8.9791576679410912e-01 -7 1 3
+1208 1 0.0000000000000000e+00 5.7114323723025775e+00 6.4364507988836168e+00 1.8944414196191686e+00 2 -2 -2
+1070 1 0.0000000000000000e+00 6.7746274753215490e+00 5.3038792071248215e+00 6.1422408676592849e-02 -1 3 -7
+25 1 0.0000000000000000e+00 5.4667681903733270e+00 5.8822417493142130e+00 8.6536431477615902e-02 -8 0 -2
+2103 1 0.0000000000000000e+00 6.0408993202680135e+00 6.1556213115423306e+00 2.4777714205038195e+00 0 2 5
+1998 1 0.0000000000000000e+00 7.5724422786946191e+00 5.6128248877096931e+00 1.2071123675854405e+00 -9 -5 3
+2981 3 1.0000000000000000e+00 8.8433480122359853e+00 5.1327016439159658e+00 8.3225728712907165e-01 1 -2 2
+1108 1 0.0000000000000000e+00 7.9969693358499132e+00 6.7028242277151922e+00 5.3696259333319851e-01 1 -6 -1
+1755 1 0.0000000000000000e+00 8.4898641936780290e+00 6.0020122495245820e+00 1.2683926318958734e+00 2 -1 -4
+675 1 0.0000000000000000e+00 9.3798724205002380e+00 7.4634937544409006e+00 4.4723569617111381e-01 0 -4 1
+1195 1 0.0000000000000000e+00 8.1224980988641899e+00 7.2981226512794990e+00 1.7839055269843642e+00 -1 1 2
+172 1 0.0000000000000000e+00 8.1905717414838861e+00 5.1026666213012524e+00 5.5567580505139080e-01 -3 1 -4
+1704 1 0.0000000000000000e+00 9.4472483154313256e+00 6.7478207943482564e+00 6.4702099316101003e-01 -4 -3 -4
+2965 3 1.0000000000000000e+00 9.1466402310321158e+00 7.2813597878127254e+00 6.4228066057065436e-01 -1 -1 0
+723 1 0.0000000000000000e+00 8.9580025805964851e+00 7.2763075428333970e+00 1.2332956676205979e+00 -5 4 -2
+2213 1 0.0000000000000000e+00 8.5106976131879204e+00 6.7925153724226641e+00 1.7373558474258144e-01 -4 0 5
+2571 1 0.0000000000000000e+00 9.8584701586660515e+00 5.9290280674586517e+00 1.9367332301104141e+00 10 -3 7
+1733 1 0.0000000000000000e+00 9.9827176705203033e+00 5.0519596577750452e+00 6.8243412920038138e-01 4 2 1
+1660 1 0.0000000000000000e+00 7.9710422250418684e+00 6.1931935576860404e+00 1.4768722369321305e+00 -4 -2 0
+83 1 0.0000000000000000e+00 9.6319355591159130e+00 5.9873146538657256e+00 1.7980374420029321e+00 1 1 -8
+499 1 0.0000000000000000e+00 9.5120587157883278e+00 7.2833749055798238e+00 1.9903319903685157e+00 -3 -2 -4
+967 1 0.0000000000000000e+00 9.8667651607693578e+00 6.9044578494987130e+00 1.1384062249327487e+00 3 -2 1
+2206 1 0.0000000000000000e+00 9.1154634747975489e+00 5.5606348915139439e+00 3.3237901565674860e-01 -3 -2 3
+1012 1 0.0000000000000000e+00 8.6777139994020605e+00 7.4821219803480288e+00 2.0073813890792769e+00 -2 5 -1
+1835 1 0.0000000000000000e+00 7.9285025844749244e+00 7.0558238858009368e+00 9.7619329285587308e-03 0 0 3
+198 1 0.0000000000000000e+00 9.6451238231427787e+00 5.5896646860596038e+00 4.0534905846772001e-01 -2 0 -6
+227 1 0.0000000000000000e+00 8.2213435620829021e+00 5.8211561971579213e+00 2.0930864552290398e+00 5 -6 1
+615 1 0.0000000000000000e+00 9.3067825786122409e+00 5.8246873315893817e+00 1.2270222239519752e+00 -5 -5 2
+1898 1 0.0000000000000000e+00 9.1951536916430019e+00 6.4812267533691674e+00 2.1046396974525122e-01 1 -3 -1
+97 1 0.0000000000000000e+00 9.2767446879419104e+00 5.1873097497402689e+00 1.4302185870011646e+00 -6 2 0
+914 1 0.0000000000000000e+00 8.7825228313592749e+00 6.4124354540433455e+00 2.0613377362696985e+00 -2 -3 8
+2712 1 0.0000000000000000e+00 8.4015932377650291e+00 6.8867214973304716e+00 2.3221878036039616e+00 -4 1 -1
+1457 1 0.0000000000000000e+00 8.7531806935222125e+00 7.0690814895222545e+00 1.3575876984613080e+00 -3 3 -4
+2627 1 0.0000000000000000e+00 8.6538655345008415e+00 5.1330812531219863e+00 2.4588779755932970e+00 3 -2 1
+2042 1 0.0000000000000000e+00 8.5826884771520469e+00 6.1442825859284431e+00 3.0793389779147967e-01 -3 -1 2
+2111 1 0.0000000000000000e+00 9.7520250530650010e+00 6.5771859994863195e+00 2.3849265794346017e+00 -2 -3 7
+930 1 0.0000000000000000e+00 7.6713391400918773e+00 7.1820610157074558e+00 1.8764937186898234e+00 4 2 -2
+2873 2 -1.0000000000000000e+00 8.2195694811255553e+00 7.2493671154345636e+00 1.0037054255101019e+00 3 4 -6
+1892 1 0.0000000000000000e+00 8.0752018057118136e+00 6.6138115357579741e+00 1.1734520170054759e+00 5 0 0
+1165 1 0.0000000000000000e+00 8.6410318341544912e+00 6.3681723773784755e+00 1.7865646353285025e+00 -4 5 -1
+52 1 0.0000000000000000e+00 7.9951359636245627e+00 5.6693536172746013e+00 2.4244826792581115e-01 1 -2 -2
+1270 1 0.0000000000000000e+00 8.2270159440598540e+00 5.9532329546055633e+00 5.4246033910229852e-01 -2 3 -1
+2527 1 0.0000000000000000e+00 8.5536405071295416e+00 5.3858238758786436e+00 1.2685905066123535e+00 8 -3 1
+8 1 0.0000000000000000e+00 9.5466484005141510e+00 5.3816501828371797e+00 2.7820118504239477e-01 -5 -3 -1
+2255 1 0.0000000000000000e+00 9.6614751199463029e+00 5.1321172463255182e+00 2.1059918653416170e+00 -2 -1 -4
+837 1 0.0000000000000000e+00 8.9642589860944497e+00 6.1746751159313709e+00 9.6670737079225366e-01 2 -1 7
+358 1 0.0000000000000000e+00 7.6868635539884336e+00 5.3274398381185222e+00 1.7460105277367941e+00 -4 -4 -5
+157 1 0.0000000000000000e+00 7.6976425343818899e+00 5.8651898426806675e+00 9.6410304444792227e-01 -6 -1 0
+202 1 0.0000000000000000e+00 9.8822030410127937e+00 5.9871722651711972e+00 1.0642407334100248e+00 6 -4 -4
+1350 1 0.0000000000000000e+00 7.8168341319579957e+00 7.4538667113741237e+00 1.1227252831917498e+00 -8 2 -6
+1229 1 0.0000000000000000e+00 9.0921223879885869e+00 6.7360809675641882e+00 1.6013563127857531e+00 -2 2 -3
+745 1 0.0000000000000000e+00 8.9217842725015153e+00 5.5933745874902661e+00 1.9442663137584624e+00 -3 0 2
+2410 1 0.0000000000000000e+00 7.5315573734688783e+00 5.6670853070862339e+00 2.3984816159451903e+00 -4 -5 -2
+1406 1 0.0000000000000000e+00 9.7741801716029588e+00 5.4598581609680759e+00 1.1526591488183364e+00 -6 -6 8
+2437 1 0.0000000000000000e+00 9.9979375528657481e+00 6.9023976829787292e+00 3.9887878217529565e-01 5 2 2
+2773 1 0.0000000000000000e+00 9.7575120134112936e+00 6.3756495336138483e+00 3.8313104379113266e-01 -4 -6 0
+1184 1 0.0000000000000000e+00 9.2019026595130224e+00 6.2974343618078708e+00 2.2656330786028351e+00 -5 -2 0
+1207 1 0.0000000000000000e+00 7.1215393823491207e+00 9.3126631159319775e+00 9.1295512969294590e-01 -2 8 4
+2355 1 0.0000000000000000e+00 5.7754669114866060e+00 8.8273323521335563e+00 1.1767093334812102e+00 3 2 -3
+1617 1 0.0000000000000000e+00 5.9379454113465595e+00 8.2208348944004381e+00 1.8724933273281257e+00 0 4 4
+1437 1 0.0000000000000000e+00 5.4919930490896105e+00 8.0258139312618972e+00 6.0838848202965301e-01 -4 -4 0
+348 1 0.0000000000000000e+00 5.8297128908267108e+00 9.7017465039044808e+00 7.5686611271423065e-01 -5 0 -2
+1325 1 0.0000000000000000e+00 7.1132922729885024e+00 9.9106170840599770e+00 1.8532928107847149e-01 -2 -3 1
+163 1 0.0000000000000000e+00 6.6399927038679731e+00 7.5566679842163369e+00 9.1782937145532772e-01 -1 -2 0
+795 1 0.0000000000000000e+00 7.4894095541165751e+00 7.5795455323414052e+00 2.2090410013133308e+00 -4 2 -2
+464 1 0.0000000000000000e+00 5.3644156540448940e+00 9.0621362811137889e+00 2.4657649831312494e+00 -3 3 7
+2733 1 0.0000000000000000e+00 5.3688556064397437e+00 8.5876348956885682e+00 5.2873605913971866e-01 3 4 6
+2394 1 0.0000000000000000e+00 5.6993305920848947e+00 8.9421917740680126e+00 7.3871279829087710e-01 -6 1 -2
+1005 1 0.0000000000000000e+00 6.9250275272845823e+00 8.3470219923883509e+00 5.2371657508943159e-01 -2 3 -2
+1413 1 0.0000000000000000e+00 7.1995370703626946e+00 8.7958182768917403e+00 2.4821851964442803e+00 -4 -2 2
+783 1 0.0000000000000000e+00 6.6744354563965382e+00 8.8155831075615598e+00 2.2731525650233575e-01 2 -4 -2
+1938 1 0.0000000000000000e+00 6.8164327589700076e+00 9.7626657337184675e+00 1.1614138100612372e+00 2 -6 -3
+1432 1 0.0000000000000000e+00 5.8299041004864618e+00 8.6423982251849676e+00 1.8135016395496355e+00 5 2 -6
+684 1 0.0000000000000000e+00 6.2624990976670718e+00 8.3050875363696246e+00 2.4162683120594699e+00 -3 2 -2
+2673 1 0.0000000000000000e+00 6.8307894707759544e+00 8.9852772777185486e+00 1.3654826081380838e+00 -2 -5 -4
+1520 1 0.0000000000000000e+00 5.5694910704703382e+00 7.7338107522961836e+00 1.1009559004105738e+00 2 2 -1
+791 1 0.0000000000000000e+00 6.3189510629746239e+00 9.3097448786526904e+00 1.2498787630676214e+00 0 0 1
+2044 1 0.0000000000000000e+00 6.3638986943922697e+00 9.4884313739267796e+00 4.7137055948345313e-01 4 -4 -3
+1705 1 0.0000000000000000e+00 6.4547995029620582e+00 8.9708092649151112e+00 1.1468861476196841e+00 4 -4 3
+2154 1 0.0000000000000000e+00 7.4289233595972863e+00 8.4840998857853052e+00 8.8432927005930695e-01 -3 3 -1
+2866 2 -1.0000000000000000e+00 5.4443020366720081e+00 9.6059359646143037e+00 1.9300353537739288e+00 3 -1 -4
+2277 1 0.0000000000000000e+00 7.0575835465314709e+00 8.8114076564469332e+00 1.6992518982982709e+00 -2 -1 0
+1315 1 0.0000000000000000e+00 6.5836857256464425e+00 8.6326007957869795e+00 2.0012162666613924e+00 4 -8 1
+1261 1 0.0000000000000000e+00 6.6967419954034657e+00 7.7147842210209916e+00 2.4286913260010432e+00 -3 2 6
+1217 1 0.0000000000000000e+00 6.8661146292178872e+00 9.3996548581638066e+00 2.0903027082367052e+00 2 0 -3
+1 1 0.0000000000000000e+00 6.0952246544317408e+00 7.6456733885606489e+00 2.1073522874488209e+00 -2 2 -8
+18 1 0.0000000000000000e+00 6.4216349761097424e+00 8.5505724744103127e+00 9.3017162389186570e-01 -5 -2 -5
+2124 1 0.0000000000000000e+00 5.4487617658673955e+00 7.8661560855438388e+00 2.2620437539146909e+00 -3 1 -2
+132 1 0.0000000000000000e+00 6.4134018822749175e+00 9.5822773628705296e+00 2.1918626563807724e+00 -3 -5 -4
+960 1 0.0000000000000000e+00 5.1779016131836251e+00 8.6564633251587857e+00 1.5463154852317011e+00 -2 1 -1
+467 1 0.0000000000000000e+00 5.0383023580017907e+00 9.5863352986568167e+00 8.3542045800637332e-01 1 -1 -3
+438 1 0.0000000000000000e+00 5.3964463082266132e+00 7.6065128323991207e+00 1.3550664542400976e+00 -3 3 3
+1408 1 0.0000000000000000e+00 5.3150372991013430e+00 9.6684875882604473e+00 1.1726494033147444e-01 7 1 -9
+173 1 0.0000000000000000e+00 7.1121856734671454e+00 9.0842803425160348e+00 1.8738628239335031e-01 -2 -5 1
+856 1 0.0000000000000000e+00 7.1657054212640086e+00 7.8400563183688909e+00 1.4837102791963805e+00 5 -3 -5
+1048 1 0.0000000000000000e+00 7.1437488049653313e+00 7.5256649175187942e+00 1.1423478915239405e+00 -2 -2 -1
+1939 1 0.0000000000000000e+00 7.0921589712321893e+00 7.9824571514689140e+00 2.2321709283863354e+00 6 5 -3
+816 1 0.0000000000000000e+00 5.3520241069287691e+00 8.2196602638534237e+00 1.6045653688797128e+00 -1 2 8
+512 1 0.0000000000000000e+00 5.9623631025617412e+00 9.6434142052682201e+00 1.5743866754754676e+00 -1 -7 3
+2464 1 0.0000000000000000e+00 7.1675903922476660e+00 7.9404465233922554e+00 4.4130794222612690e-01 4 8 -6
+1216 1 0.0000000000000000e+00 6.2568249423292395e+00 7.8539811746586130e+00 1.8208520310994056e-01 -2 -5 3
+962 1 0.0000000000000000e+00 5.5091025687563695e+00 9.9524885924543103e+00 1.3484098851235005e+00 -2 -5 0
+1715 1 0.0000000000000000e+00 6.4950792387616039e+00 9.3904976471026522e+00 5.9261132955759577e-02 -1 1 1
+1242 1 0.0000000000000000e+00 7.2875774143975498e+00 9.4392685542651602e+00 1.7108530654168916e+00 2 -7 -4
+2825 2 -1.0000000000000000e+00 6.3248880317878227e+00 8.0968632176433086e+00 1.0549756968723516e+00 -3 1 5
+466 1 0.0000000000000000e+00 5.9669592521617236e+00 9.1718181750328114e+00 2.0857122689156893e+00 3 0 4
+1702 1 0.0000000000000000e+00 8.7007455430751328e+00 8.9398877277854982e+00 6.2361549889779133e-01 4 1 2
+2478 1 0.0000000000000000e+00 9.8773694985902161e+00 8.4733922809945224e+00 1.5828000241782936e+00 2 2 -9
+698 1 0.0000000000000000e+00 9.7603543019705921e+00 9.8450930458355153e+00 1.1453659980060626e+00 -1 -5 -1
+1498 1 0.0000000000000000e+00 9.3034430618199089e+00 9.2714171361417606e+00 1.6122597052159637e+00 -5 1 4
+820 1 0.0000000000000000e+00 9.4891085709318137e+00 9.1810928796533524e+00 2.0973957679180648e+00 2 2 -5
+94 1 0.0000000000000000e+00 9.0065269743342604e+00 9.8497814180852021e+00 1.9696167181760931e+00 -4 0 1
+2259 1 0.0000000000000000e+00 7.8655056184844296e+00 9.7016192496770000e+00 9.4262698633427722e-01 2 5 -3
+2268 1 0.0000000000000000e+00 9.0829744861770880e+00 7.8742075951316925e+00 8.1978994480654932e-01 1 2 5
+2187 1 0.0000000000000000e+00 8.6392301957538677e+00 8.8860709517025622e+00 2.3100298942589856e+00 2 -3 0
+2296 1 0.0000000000000000e+00 9.0148777623322953e+00 9.4278211232942581e+00 7.5747858927082679e-01 -7 0 3
+2791 1 0.0000000000000000e+00 8.3647386059912279e+00 9.8674087913814734e+00 1.1787502505573297e+00 -4 -5 3
+1040 1 0.0000000000000000e+00 8.0590060529999743e+00 9.3834255114843543e+00 3.9181283877023415e-01 0 -6 1
+1767 1 0.0000000000000000e+00 9.2343751755117172e+00 8.2854081211701729e+00 7.7824245050019014e-01 -8 -4 -1
+2334 1 0.0000000000000000e+00 7.9670613252748819e+00 9.0412926512866356e+00 2.7618455771692324e-01 2 -4 -1
+335 1 0.0000000000000000e+00 8.9159132341643570e+00 8.3473606757408163e+00 2.0728965255209366e+00 -3 2 3
+1390 1 0.0000000000000000e+00 9.4848459870940083e+00 7.8746939759625452e+00 1.8459748863143008e+00 0 -3 -4
+704 1 0.0000000000000000e+00 9.7839387715752402e+00 9.0370629940389051e+00 8.2908355471012773e-01 1 0 -1
+2057 1 0.0000000000000000e+00 8.7391141245104738e+00 8.0206118051158342e+00 1.2193331323346177e+00 2 1 2
+2601 1 0.0000000000000000e+00 9.2963646177909194e+00 7.7008244595529680e+00 1.4086630419143518e+00 -2 2 -1
+1327 1 0.0000000000000000e+00 9.3914530958452058e+00 9.2723684371140127e+00 4.7155915543647141e-02 1 -4 -5
+385 1 0.0000000000000000e+00 7.9849973105583318e+00 8.6682774857543166e+00 1.7402688469610399e+00 3 -1 2
+2 1 0.0000000000000000e+00 9.9946788382980021e+00 7.6197285731545312e+00 2.1932270038845862e+00 -3 -3 5
+711 1 0.0000000000000000e+00 8.7393613320476931e+00 8.4520745653618690e+00 4.6135654167420959e-01 -5 2 -6
+779 1 0.0000000000000000e+00 7.6026286910436145e+00 9.2600789321723731e+00 1.1442352792076813e+00 -1 1 -1
+1368 1 0.0000000000000000e+00 8.1006629893483399e+00 9.3069965134725265e+00 1.8129656551409987e+00 5 3 1
+108 1 0.0000000000000000e+00 8.9122542700992291e+00 8.8500305931965695e+00 1.5539617586605146e+00 1 0 6
+763 1 0.0000000000000000e+00 7.8124036356112176e+00 8.1607752727819598e+00 1.5066198677886591e+00 -5 0 2
+563 1 0.0000000000000000e+00 8.0871539110906294e+00 8.2001831173413215e+00 2.4079287186549072e+00 1 -1 1
+1485 1 0.0000000000000000e+00 9.7482729341282361e+00 7.7579715237444429e+00 1.1810820311894282e-01 -5 -2 -1
+1714 1 0.0000000000000000e+00 9.7784064278542733e+00 8.6667124384762602e+00 2.0377876826470835e+00 -3 2 3
+1401 1 0.0000000000000000e+00 8.3211934447437432e+00 7.8591357651588201e+00 1.5416202831132184e+00 -1 -11 -3
+1905 1 0.0000000000000000e+00 7.9155403739419707e+00 7.7580707713926573e+00 2.2620032489477987e-01 1 0 2
+621 1 0.0000000000000000e+00 7.7318242714614058e+00 9.4813458471314025e+00 2.1403451432550820e+00 2 -7 0
+2606 1 0.0000000000000000e+00 8.5166611138599535e+00 8.8823847347991762e+00 1.2328160460210531e+00 3 4 4
+1881 1 0.0000000000000000e+00 7.5448611712134914e+00 7.6556667687012814e+00 9.0150842282182331e-01 -4 1 -3
+720 1 0.0000000000000000e+00 8.4655296982848363e+00 9.4979718086209068e+00 1.9915902382376616e-02 4 0 2
+997 1 0.0000000000000000e+00 9.3446909414531767e+00 8.3232783725329202e+00 3.1780460968792729e-01 1 4 -4
+1677 1 0.0000000000000000e+00 8.0063203566786125e+00 8.4055399849854311e+00 1.1213574118597389e+00 1 1 -7
+817 1 0.0000000000000000e+00 9.4465094779908512e+00 8.3343609608938536e+00 2.2775776575816540e+00 2 0 -3
+2780 1 0.0000000000000000e+00 8.7643337062828550e+00 9.6486926213369593e+00 1.0834966190374054e+00 -5 -3 1
+2582 1 0.0000000000000000e+00 7.5860503731327116e+00 9.9033450185694267e+00 1.8763012331565512e+00 0 -3 4
+899 1 0.0000000000000000e+00 8.3817649406115802e+00 8.2865401502106035e+00 6.6898702791174836e-01 -4 1 1
+1118 1 0.0000000000000000e+00 9.9270255673887906e+00 9.2046774692967404e+00 1.4127500079751234e+00 5 -4 8
+570 1 0.0000000000000000e+00 9.4870037923706203e+00 9.8567578186733815e+00 6.9912313932569692e-01 2 -2 0
+2458 1 0.0000000000000000e+00 7.7559263407527448e+00 8.8054180485906528e+00 2.3806890957647977e+00 3 6 10
+1331 1 0.0000000000000000e+00 5.3909818814446542e+00 5.0619601704562802e+00 4.3590887408328056e+00 6 -2 -1
+2615 1 0.0000000000000000e+00 5.4966361207793950e+00 7.2696185648874900e+00 3.4804061366841474e+00 -1 -2 -7
+1111 1 0.0000000000000000e+00 6.7543665910257396e+00 5.8445890297812300e+00 4.6051459123610812e+00 3 0 -5
+1700 1 0.0000000000000000e+00 7.1344052086222849e+00 6.1931737807276432e+00 4.3655598000387341e+00 4 1 3
+262 1 0.0000000000000000e+00 6.8731347305517581e+00 5.8544360202672623e+00 3.4870257166914902e+00 0 -6 1
+872 1 0.0000000000000000e+00 5.4134579868615837e+00 6.4429042464001069e+00 2.7220914751446665e+00 3 0 -2
+778 1 0.0000000000000000e+00 7.0961312564592580e+00 6.3800513375767478e+00 3.8403145088054238e+00 -6 -5 -2
+1223 1 0.0000000000000000e+00 6.8064489448491186e+00 5.0315617839496358e+00 3.3390029409049693e+00 0 3 -1
+2820 2 -1.0000000000000000e+00 6.6076771079395327e+00 7.3159158427848903e+00 4.6905575991454596e+00 1 -6 2
+298 1 0.0000000000000000e+00 7.1093536929267804e+00 5.5376918267103878e+00 3.3214687127920497e+00 -1 0 -4
+1507 1 0.0000000000000000e+00 5.9911776956871936e+00 6.0359716813281121e+00 4.5324617461572627e+00 -3 7 2
+894 1 0.0000000000000000e+00 6.6187812214659134e+00 7.0954127884770877e+00 3.2526178112700053e+00 -5 -1 -1
+731 1 0.0000000000000000e+00 6.1794260546001976e+00 5.2346055094671335e+00 3.0103843006892075e+00 -5 2 -6
+405 1 0.0000000000000000e+00 6.1052910932509885e+00 6.2731893516507018e+00 3.7841843478459478e+00 9 1 -3
+2908 3 1.0000000000000000e+00 5.3350817526539824e+00 6.3064151069641969e+00 3.8682473843465384e+00 0 -6 -3
+31 1 0.0000000000000000e+00 7.3922533800884969e+00 6.8456711968735853e+00 4.7412170932493236e+00 0 -3 -4
+2345 1 0.0000000000000000e+00 7.4611502108488743e+00 5.2805017419487079e+00 4.3162125855463085e+00 -2 2 2
+1743 1 0.0000000000000000e+00 7.1603534276601808e+00 6.8837881578771523e+00 2.6844578496600255e+00 -4 3 -5
+282 1 0.0000000000000000e+00 5.4945845337374699e+00 5.9234036562480403e+00 3.4545384064643709e+00 3 8 -4
+2526 1 0.0000000000000000e+00 5.3032573913565280e+00 5.6170003452135475e+00 2.9723434531303479e+00 3 7 3
+1949 1 0.0000000000000000e+00 5.6158106866867286e+00 6.8622125125717925e+00 3.1029639400687747e+00 1 5 1
+982 1 0.0000000000000000e+00 6.2949952467100987e+00 5.0148040505761928e+00 4.5071062528021724e+00 -3 0 6
+230 1 0.0000000000000000e+00 5.8400335271953612e+00 5.1556489049529315e+00 3.9271035642258956e+00 0 1 -3
+475 1 0.0000000000000000e+00 7.2316091462247707e+00 5.0435501146098982e+00 4.8414804286427371e+00 0 -5 2
+2734 1 0.0000000000000000e+00 6.3912255583967434e+00 6.5390090512521537e+00 4.3856705974633261e+00 7 1 -2
+301 1 0.0000000000000000e+00 5.1406913553672533e+00 6.1870497782570428e+00 4.2869570113673046e+00 -1 -5 3
+1434 1 0.0000000000000000e+00 6.3480838078109523e+00 5.4659003448018186e+00 3.9211629269291537e+00 -8 5 -8
+2357 1 0.0000000000000000e+00 6.2104390849581845e+00 7.3824150838126092e+00 3.6505326061313323e+00 6 -2 -6
+1622 1 0.0000000000000000e+00 6.9501496395935760e+00 5.4438846465079367e+00 3.9504634521787567e+00 7 2 -3
+2974 3 1.0000000000000000e+00 5.6298707265110046e+00 6.7718829828482896e+00 3.7681129817029348e+00 -1 -2 -5
+1820 1 0.0000000000000000e+00 7.2217013271818509e+00 6.6059811080006536e+00 4.8730016246816303e+00 4 -1 -3
+1349 1 0.0000000000000000e+00 6.3088816488745589e+00 6.6704305603580556e+00 3.2502021918665833e+00 2 -3 -2
+1844 1 0.0000000000000000e+00 7.1711416332583200e+00 6.7316286258888125e+00 3.1012433365250174e+00 -5 -2 -6
+2284 1 0.0000000000000000e+00 6.1581350006396081e+00 5.7942956133858798e+00 3.2065116372151845e+00 4 -7 -3
+523 1 0.0000000000000000e+00 6.2605531532614798e+00 6.0831928906397117e+00 3.7839142152068748e+00 0 5 -2
+139 1 0.0000000000000000e+00 5.9321107242620217e+00 6.8110754147487560e+00 4.8475710662548153e+00 -3 2 -7
+2460 1 0.0000000000000000e+00 5.7657955720549534e+00 6.8727227448945163e+00 4.5407911269583190e+00 0 -6 -3
+168 1 0.0000000000000000e+00 5.0573971199870025e+00 5.6556588686137026e+00 4.9054654534430266e+00 -3 0 -5
+1840 1 0.0000000000000000e+00 5.5210991606675330e+00 6.0858426320733487e+00 4.8352577357631565e+00 2 5 1
+1298 1 0.0000000000000000e+00 7.3920850814985881e+00 7.0147293748000887e+00 3.5663752827986475e+00 1 4 -3
+774 1 0.0000000000000000e+00 5.1154629534185458e+00 6.7317854660778522e+00 4.8915462637845248e+00 6 -5 5
+2811 2 -1.0000000000000000e+00 6.8756204789109150e+00 6.9671566479622182e+00 4.1881437424332031e+00 -4 0 8
+2806 2 -1.0000000000000000e+00 6.6414096332870081e+00 6.0873194725792521e+00 2.6944789890840197e+00 9 -12 2
+76 1 0.0000000000000000e+00 9.0820238719442781e+00 5.6841953080894880e+00 4.5469197681730780e+00 -3 -1 2
+2247 1 0.0000000000000000e+00 9.9595974303326180e+00 6.2129485866031793e+00 3.2979902062149486e+00 -5 5 -3
+165 1 0.0000000000000000e+00 9.5189434954017571e+00 5.2537466408760869e+00 3.0285171453679838e+00 -6 2 0
+958 1 0.0000000000000000e+00 7.9370658193002219e+00 6.1021282317444037e+00 4.7947458545383403e+00 1 7 -5
+413 1 0.0000000000000000e+00 8.0781186409051209e+00 5.0589801888786639e+00 2.8134607297423289e+00 -5 2 -2
+1143 1 0.0000000000000000e+00 9.3472006997901644e+00 6.7814547235147842e+00 2.9769842648161839e+00 6 -4 -4
+2863 2 -1.0000000000000000e+00 7.7688684602650735e+00 5.9096844520496585e+00 3.0763972245160840e+00 2 0 3
+1618 1 0.0000000000000000e+00 9.4642242217474131e+00 6.8224670022717904e+00 4.2891602679053937e+00 1 3 0
+184 1 0.0000000000000000e+00 8.7982347969413830e+00 5.9902064209640065e+00 3.6854562529770472e+00 0 2 3
+2483 1 0.0000000000000000e+00 8.4148824168577043e+00 6.6032389309520747e+00 4.1084711224619150e+00 2 -1 -1
+2848 2 -1.0000000000000000e+00 7.8058061999228450e+00 5.7461588658779039e+00 3.8628518054726282e+00 2 4 1
+33 1 0.0000000000000000e+00 9.3317462069512622e+00 6.3539269273449186e+00 3.8566563010358981e+00 -4 0 -6
+1526 1 0.0000000000000000e+00 8.4730628595272908e+00 6.4992374398808490e+00 2.6713617727886421e+00 -7 -4 1
+821 1 0.0000000000000000e+00 8.0698553134335516e+00 7.0920182237812224e+00 4.1400307428183565e+00 -1 -3 -4
+2891 2 -1.0000000000000000e+00 8.6464527293774243e+00 5.5255867702764849e+00 3.4252077459033337e+00 4 -3 4
+2100 1 0.0000000000000000e+00 9.3951919831484556e+00 6.1636659094252613e+00 3.1354249630581990e+00 -8 4 -5
+1794 1 0.0000000000000000e+00 8.4547023911741928e+00 5.8967538174585181e+00 2.7645220090628531e+00 -1 2 2
+1341 1 0.0000000000000000e+00 9.3068097547883397e+00 5.6278889516494575e+00 4.0149539599923223e+00 1 4 -7
+661 1 0.0000000000000000e+00 9.3008118890467770e+00 5.5363383734255827e+00 2.7931971245674716e+00 -3 -10 -1
+1529 1 0.0000000000000000e+00 9.2830136336484408e+00 6.0252491323107940e+00 2.8837109753328685e+00 2 7 -5
+398 1 0.0000000000000000e+00 8.8178733309951962e+00 7.2082030613923358e+00 4.5633362281441334e+00 -2 0 0
+587 1 0.0000000000000000e+00 7.7311886048040810e+00 5.4085607685990835e+00 3.1151770563450643e+00 2 1 -2
+644 1 0.0000000000000000e+00 8.5373637175267607e+00 5.3626784220992567e+00 2.6591062914456192e+00 -2 -3 -2
+2281 1 0.0000000000000000e+00 7.7292581303003978e+00 5.3961631524650304e+00 4.8461056712010437e+00 -5 6 2
+1348 1 0.0000000000000000e+00 8.6041566415055151e+00 5.9206611492310346e+00 4.4001681593780324e+00 -4 1 6
+2351 1 0.0000000000000000e+00 9.6733595179476222e+00 5.3134649724230227e+00 3.7900239657776242e+00 4 -3 7
+2954 3 1.0000000000000000e+00 8.5932991150269977e+00 5.7657597873196380e+00 3.7791020165759992e+00 0 -1 -10
+898 1 0.0000000000000000e+00 7.9971275592471542e+00 6.4452824158161697e+00 3.4920230344924135e+00 2 -4 -3
+2093 1 0.0000000000000000e+00 8.9893575589112178e+00 7.1244015383155777e+00 3.5180936254077859e+00 0 1 10
+909 1 0.0000000000000000e+00 9.9717956635386997e+00 7.3061869470997420e+00 3.7455062261986516e+00 0 1 -1
+1135 1 0.0000000000000000e+00 9.3964539228847173e+00 6.4362459441730220e+00 4.5146842671772696e+00 -3 3 -2
+1287 1 0.0000000000000000e+00 8.0272372444316655e+00 5.9149683476516062e+00 4.0336662041623343e+00 1 3 1
+1322 1 0.0000000000000000e+00 8.4561261448080689e+00 7.3946613475156271e+00 2.7221158589577352e+00 1 -2 0
+410 1 0.0000000000000000e+00 7.9073030626063643e+00 6.7901845554443376e+00 2.6711854033770459e+00 0 2 -4
+91 1 0.0000000000000000e+00 8.5696870021245406e+00 7.3862739298641644e+00 3.2231839027580231e+00 0 -1 6
+1680 1 0.0000000000000000e+00 8.1052511877198974e+00 6.7798885042679924e+00 3.8085829712406980e+00 3 1 0
+540 1 0.0000000000000000e+00 8.5158236814902093e+00 7.4635001164441626e+00 3.8652742265897908e+00 -1 -2 6
+1188 1 0.0000000000000000e+00 8.7890903311275412e+00 6.7378717285766481e+00 3.5478656795493166e+00 1 -2 -2
+1092 1 0.0000000000000000e+00 7.6635426493436976e+00 6.1817775867096767e+00 4.2114731827489749e+00 -4 -1 -12
+1010 1 0.0000000000000000e+00 9.2372526405316187e+00 6.4696829577002735e+00 4.9626890574916471e+00 -2 0 2
+2953 3 1.0000000000000000e+00 7.6730614812434910e+00 7.3699129572535425e+00 4.9770695858190050e+00 -1 1 5
+2985 3 1.0000000000000000e+00 9.5197252775280230e+00 7.4652756997865364e+00 4.8195463010130064e+00 3 0 2
+2212 1 0.0000000000000000e+00 8.1762374598113681e+00 6.5498826265000938e+00 4.5992045360964440e+00 -1 1 5
+339 1 0.0000000000000000e+00 9.8524081789841222e+00 5.7431447880274105e+00 4.6959296985864816e+00 1 2 2
+2769 1 0.0000000000000000e+00 7.6737791414664089e+00 6.4172920412236660e+00 2.5042057665775910e+00 3 -8 0
+314 1 0.0000000000000000e+00 6.9892442377855453e+00 7.9760246565010604e+00 3.0053525935590004e+00 3 -4 2
+1956 1 0.0000000000000000e+00 7.4326568762776741e+00 8.3446684388067105e+00 3.3419712108785076e+00 -4 -3 0
+2703 1 0.0000000000000000e+00 7.3683099460561188e+00 9.1508489233674002e+00 2.7985774348657513e+00 3 1 4
+1501 1 0.0000000000000000e+00 6.4378897062931939e+00 9.9109373774870591e+00 4.7258691980558893e+00 -2 -4 -1
+678 1 0.0000000000000000e+00 7.3902738868667166e+00 9.4986335667186399e+00 3.7496268807658861e+00 -2 -4 2
+1356 1 0.0000000000000000e+00 5.1852759276679246e+00 8.4896980298569602e+00 4.2548671645381519e+00 -3 2 0
+316 1 0.0000000000000000e+00 6.1013010714215472e+00 9.3481316280730624e+00 3.4308624007086079e+00 -3 -4 4
+2853 2 -1.0000000000000000e+00 6.2801765172316451e+00 8.8217391449495821e+00 4.0317853772113841e+00 5 0 5
+1074 1 0.0000000000000000e+00 6.6236981234410246e+00 9.8958394939551457e+00 2.6722813927647264e+00 4 -8 1
+437 1 0.0000000000000000e+00 5.7999414784456249e+00 8.8781696415427334e+00 2.8745940112558088e+00 -3 0 3
+969 1 0.0000000000000000e+00 5.7036627828240150e+00 8.1461036773388251e+00 3.1515769751661478e+00 -3 1 -2
+1569 1 0.0000000000000000e+00 6.0173518045372960e+00 7.5738415801874250e+00 4.0553668426566674e+00 -3 0 -1
+727 1 0.0000000000000000e+00 6.8154282743450478e+00 9.3086943393879356e+00 4.5065229738414807e+00 3 -5 1
+96 1 0.0000000000000000e+00 5.6561225676264018e+00 7.6677868345253133e+00 2.7550112962604558e+00 0 0 0
+826 1 0.0000000000000000e+00 6.1924010057251504e+00 7.8327872805463059e+00 4.9262858374814726e+00 7 0 2
+1427 1 0.0000000000000000e+00 6.9550041538871605e+00 8.2283576545682120e+00 3.8744262059804222e+00 5 1 -5
+2223 1 0.0000000000000000e+00 6.9195585099796739e+00 8.7109742236356151e+00 3.2552489626981345e+00 2 -3 -1
+233 1 0.0000000000000000e+00 7.3452094610714322e+00 7.6534686379476335e+00 3.3456011997647805e+00 -2 6 5
+2929 3 1.0000000000000000e+00 5.5885701438206876e+00 8.3677471420492378e+00 4.7251961867353600e+00 -5 3 5
+2502 1 0.0000000000000000e+00 7.3763638031557477e+00 9.8197849411901039e+00 2.7509391825869156e+00 -1 1 1
+1608 1 0.0000000000000000e+00 7.3185168059315089e+00 7.7886462542013968e+00 3.9792515971926474e+00 4 -10 -4
+2290 1 0.0000000000000000e+00 5.8910311287341521e+00 9.5339245562105290e+00 2.7755200067451833e+00 -1 3 0
+787 1 0.0000000000000000e+00 5.5679619797491231e+00 7.5530204196791555e+00 4.6806041486821446e+00 2 1 9
+1838 1 0.0000000000000000e+00 7.1893515179163421e+00 9.6307579240408856e+00 4.1956277928647072e+00 -2 -10 5
+1638 1 0.0000000000000000e+00 6.3761393162250650e+00 9.0487433564361304e+00 3.0465595515329222e+00 -2 7 5
+327 1 0.0000000000000000e+00 5.3306484691431120e+00 8.4592542518814131e+00 2.9255826330617474e+00 -1 -2 3
+561 1 0.0000000000000000e+00 6.1393845131281406e+00 9.4837918950130859e+00 3.9290503275772526e+00 2 4 3
+2071 1 0.0000000000000000e+00 5.4574663401477022e+00 9.0216974295302244e+00 3.5488516530295962e+00 -2 5 7
+68 1 0.0000000000000000e+00 7.0730148255121073e+00 8.8944152519732178e+00 3.7634845243240447e+00 -4 1 -4
+1784 1 0.0000000000000000e+00 6.6990142958804046e+00 9.1030552689309339e+00 4.2548828254047031e+00 2 0 1
+2669 1 0.0000000000000000e+00 6.3527996602365029e+00 8.5604833036450998e+00 3.1201772525408482e+00 -4 5 -8
+1649 1 0.0000000000000000e+00 6.7610107927806293e+00 8.6720129084199460e+00 4.6749571052161070e+00 3 -2 -2
+1544 1 0.0000000000000000e+00 7.2514397463486029e+00 8.9320276835603707e+00 4.2809535816846287e+00 -6 -3 -3
+2927 3 1.0000000000000000e+00 5.2024655282702508e+00 9.2366449032220963e+00 3.5668967592777623e+00 4 6 6
+2934 3 1.0000000000000000e+00 5.7294814007793429e+00 9.4296933429155736e+00 4.1981892070061573e+00 5 3 -3
+847 1 0.0000000000000000e+00 5.1391017299770549e+00 9.5784307826104254e+00 2.8197066959819326e+00 -7 3 -2
+1541 1 0.0000000000000000e+00 5.3564944910031222e+00 7.7889408671320011e+00 4.1201559895861477e+00 -6 1 3
+1459 1 0.0000000000000000e+00 5.5772549782187584e+00 8.2027289301283997e+00 3.7381018640876884e+00 -1 -10 6
+590 1 0.0000000000000000e+00 6.2450284252244836e+00 8.9738760301308940e+00 4.9516509510452487e+00 7 2 1
+2031 1 0.0000000000000000e+00 5.4459285751229283e+00 9.8823762382712239e+00 3.3769809927200343e+00 9 -3 3
+2198 1 0.0000000000000000e+00 5.7813430480858763e+00 8.4826001982289529e+00 4.2276281024421456e+00 -2 -1 2
+2129 1 0.0000000000000000e+00 5.0909009930276214e+00 7.7059872668159315e+00 3.0129662611738519e+00 2 2 2
+1257 1 0.0000000000000000e+00 5.2141252141725127e+00 9.6429273490506091e+00 4.2082042593193956e+00 -1 3 5
+1585 1 0.0000000000000000e+00 6.2830025825884537e+00 8.0489190970229636e+00 3.4812994154630803e+00 2 -6 3
+2909 3 1.0000000000000000e+00 7.2397487043141338e+00 7.6126998322368662e+00 4.9183779047516509e+00 -9 -1 -1
+2442 1 0.0000000000000000e+00 6.4139980450376521e+00 8.3134885271104899e+00 4.6543608374860685e+00 -2 -4 -3
+2160 1 0.0000000000000000e+00 5.0233675348886715e+00 9.2623143455066526e+00 4.5855333660372253e+00 0 1 -1
+878 1 0.0000000000000000e+00 5.2093692997764913e+00 9.9680141683972145e+00 2.8848096857056906e+00 -3 -11 0
+2676 1 0.0000000000000000e+00 9.1465407196277280e+00 9.5253959926976961e+00 4.2988637395511216e+00 -9 2 -2
+2155 1 0.0000000000000000e+00 7.9490793374587065e+00 9.1061993480078325e+00 4.4947274971796620e+00 4 0 7
+1162 1 0.0000000000000000e+00 7.6482391917408163e+00 8.3914649463805713e+00 4.6121340895241598e+00 0 2 -3
+2481 1 0.0000000000000000e+00 8.6154640148376682e+00 8.3122433582766924e+00 2.8647604345756639e+00 -1 3 2
+2427 1 0.0000000000000000e+00 8.2927592705480819e+00 9.8451572890332812e+00 4.4771289790175306e+00 -3 2 3
+2642 1 0.0000000000000000e+00 9.6842599536009750e+00 8.6384632632220377e+00 3.8380472313982001e+00 4 -1 6
+850 1 0.0000000000000000e+00 9.1128269061543072e+00 7.9980190717942978e+00 4.8228602777582612e+00 -7 -5 1
+2236 1 0.0000000000000000e+00 9.6641737566333266e+00 9.3932475281112584e+00 4.2671107811325513e+00 3 -1 1
+2519 1 0.0000000000000000e+00 9.9087331883939864e+00 8.0350495825544996e+00 4.4845735435220169e+00 -3 2 2
+2476 1 0.0000000000000000e+00 9.9338128010939535e+00 9.0810724332818413e+00 3.4032091236523772e+00 7 -2 -4
+2328 1 0.0000000000000000e+00 8.8195529786100124e+00 9.0795286426820905e+00 4.7732859697884340e+00 -1 4 -1
+1655 1 0.0000000000000000e+00 8.7268316399939501e+00 8.0755998136434233e+00 3.5079044324685644e+00 1 1 0
+114 1 0.0000000000000000e+00 7.8841898308365623e+00 9.2915577166882048e+00 3.9126580283884436e+00 2 3 6
+1994 1 0.0000000000000000e+00 7.9232299317157509e+00 9.7133203217139190e+00 2.7398354209853406e+00 -1 6 -2
+2327 1 0.0000000000000000e+00 8.6989460015182107e+00 9.6029447934370449e+00 3.8547415096371593e+00 1 6 0
+396 1 0.0000000000000000e+00 9.4841961721936769e+00 8.0720940796503768e+00 3.3583373519447837e+00 0 -7 0
+123 1 0.0000000000000000e+00 7.8657755339093409e+00 9.0541385909146683e+00 3.0959223293153042e+00 -1 2 6
+2278 1 0.0000000000000000e+00 8.1211756613461112e+00 9.8472745718414441e+00 4.4672223097159653e+00 0 -2 -3
+1353 1 0.0000000000000000e+00 8.3134137829290911e+00 9.2479034909840454e+00 2.7288060488819119e+00 8 3 2
+1616 1 0.0000000000000000e+00 8.9959817103949025e+00 8.1460215276947565e+00 4.1509374821987208e+00 -1 1 -3
+1865 1 0.0000000000000000e+00 8.4073200020304899e+00 8.6497755890983647e+00 3.9139035791312766e+00 0 -2 3
+260 1 0.0000000000000000e+00 9.1747755587571422e+00 8.4102406359787967e+00 2.8266266369762278e+00 -6 1 3
+2007 1 0.0000000000000000e+00 8.2097324274193806e+00 8.4247518045537930e+00 3.1702964159200815e+00 -8 -6 -1
+730 1 0.0000000000000000e+00 9.0066043669664051e+00 7.6326951910760892e+00 3.8649443214985739e+00 10 7 2
+2489 1 0.0000000000000000e+00 9.5432355090989969e+00 8.4268457098804390e+00 4.7267175544800137e+00 0 8 -4
+2588 1 0.0000000000000000e+00 8.3893799724847486e+00 7.9331153075926357e+00 4.6095440524028835e+00 2 0 -4
+662 1 0.0000000000000000e+00 9.3329807482977749e+00 7.6291585982665993e+00 2.5843558752631255e+00 -2 1 0
+1765 1 0.0000000000000000e+00 9.6477410820748588e+00 7.9782449087784313e+00 2.8217426411441799e+00 -1 -1 4
+340 1 0.0000000000000000e+00 9.3699103390583254e+00 8.8126024069064659e+00 4.4539890962291455e+00 -5 -4 0
+2080 1 0.0000000000000000e+00 7.5062423092986199e+00 8.3900404984707215e+00 3.7391476216415094e+00 -3 1 3
+611 1 0.0000000000000000e+00 7.9214538398989767e+00 7.6521095056144208e+00 3.2499906297722818e+00 2 -4 -3
+2595 1 0.0000000000000000e+00 9.8360831836181912e+00 9.7367776134851258e+00 2.5571054168668415e+00 -7 5 0
+2917 3 1.0000000000000000e+00 9.7096278830873324e+00 8.7045908185672278e+00 2.6137223090574611e+00 -4 5 -1
+2973 3 1.0000000000000000e+00 8.9538270928534889e+00 9.4819141070522175e+00 2.8149438022420932e+00 2 -2 2
+318 1 0.0000000000000000e+00 9.8926205760800272e+00 9.9448469857255439e+00 4.9762612830329287e+00 2 -5 -3
+443 1 0.0000000000000000e+00 8.0084417408928168e+00 7.8562917296598167e+00 2.6607965429178302e+00 -2 2 -2
+241 1 0.0000000000000000e+00 8.7242320223245926e+00 9.3128721365824099e+00 3.4087275051827088e+00 9 -2 5
+2561 1 0.0000000000000000e+00 7.8370363348317609e+00 8.2878489945291900e+00 3.9623844338924483e+00 -1 -4 4
+221 1 0.0000000000000000e+00 8.7429900822141526e+00 9.0004988823062053e+00 4.5045480722620921e+00 1 5 2
+1056 1 0.0000000000000000e+00 9.7868930403938013e+00 9.7082234896105302e+00 3.2465597140211608e+00 -4 2 -6
+1286 1 0.0000000000000000e+00 9.4717141862186693e+00 8.9622186079671700e+00 3.3140509357792469e+00 -1 0 2
+440 1 0.0000000000000000e+00 8.7979523010558083e+00 8.7882038958830293e+00 3.6719734575126934e+00 -2 3 1
+2066 1 0.0000000000000000e+00 8.9975596614532449e+00 7.7067891554577335e+00 3.0249788829498687e+00 1 0 2
+742 1 0.0000000000000000e+00 9.5500089178993175e+00 7.7595644768208052e+00 4.1710920530227398e+00 1 4 -2
+859 1 0.0000000000000000e+00 6.7845164854355664e+00 6.6535647825293180e+00 6.5719854488593263e+00 1 -8 -2
+351 1 0.0000000000000000e+00 6.1243124460839757e+00 6.5324094840088378e+00 6.2069000114269564e+00 -2 7 -2
+2860 2 -1.0000000000000000e+00 7.4991320745293004e+00 5.9806351394148569e+00 5.2322737536750532e+00 -3 -5 -1
+2130 1 0.0000000000000000e+00 6.8777525133071720e+00 6.2249664573107495e+00 7.3294754953260783e+00 -2 1 -2
+2869 2 -1.0000000000000000e+00 5.4218622270791466e+00 5.4645570074370555e+00 6.6356036010876762e+00 0 -4 3
+2871 2 -1.0000000000000000e+00 5.6728062977191618e+00 7.1878012601923009e+00 6.5648731247447314e+00 2 3 1
+2552 1 0.0000000000000000e+00 5.9660222070774322e+00 6.2537952929562106e+00 5.1794158348962549e+00 5 1 2
+127 1 0.0000000000000000e+00 6.5713229343596762e+00 5.0073482007421726e+00 6.1740127108874319e+00 -7 1 -1
+1602 1 0.0000000000000000e+00 6.6927051682684251e+00 5.2038841392244608e+00 5.4382620684589460e+00 7 -1 -4
+2892 2 -1.0000000000000000e+00 5.5316319225089110e+00 6.3810550740428686e+00 7.0027527827034017e+00 3 -6 -5
+917 1 0.0000000000000000e+00 6.8963751681441066e+00 7.3825660207676309e+00 5.4998399034668788e+00 -2 0 2
+1836 1 0.0000000000000000e+00 7.1005377575499713e+00 5.5906477135560602e+00 6.3856130508679163e+00 -2 -5 4
+946 1 0.0000000000000000e+00 6.1158555227059379e+00 5.4693825274515584e+00 5.4774406731497711e+00 -1 3 9
+1410 1 0.0000000000000000e+00 6.3645074116279563e+00 7.4803613084969998e+00 6.7375059531515351e+00 1 0 2
+761 1 0.0000000000000000e+00 5.2840315816464365e+00 7.2924370507415093e+00 5.2007296821408939e+00 9 -2 -2
+1596 1 0.0000000000000000e+00 6.0641168903473286e+00 6.2231852413011026e+00 6.9883527221807782e+00 -4 -5 -1
+486 1 0.0000000000000000e+00 6.0815866481912657e+00 6.0258345186108411e+00 7.2317111924197928e+00 0 9 -3
+636 1 0.0000000000000000e+00 7.2074754634037479e+00 6.0043604109672728e+00 6.7403879769646631e+00 6 -8 0
+593 1 0.0000000000000000e+00 6.9742647697653073e+00 5.8566070792757481e+00 5.3427681452032019e+00 -9 2 2
+72 1 0.0000000000000000e+00 6.7972268738017618e+00 7.0065839039461206e+00 5.9263355428729900e+00 -1 3 -2
+1329 1 0.0000000000000000e+00 6.0990428609951453e+00 5.6760524613833256e+00 6.1083066475401822e+00 0 3 -5
+1730 1 0.0000000000000000e+00 5.7004008463885327e+00 5.1371157424934610e+00 7.0488874399032353e+00 9 4 3
+2847 2 -1.0000000000000000e+00 5.6858812452254028e+00 7.4867673436603788e+00 7.4900985195169696e+00 -4 6 -1
+23 1 0.0000000000000000e+00 7.2911734392442655e+00 6.8567324814873070e+00 5.5476901727908396e+00 -7 4 -1
+1394 1 0.0000000000000000e+00 5.8998232319762547e+00 6.8657296141376944e+00 5.7320156933547066e+00 3 7 1
+798 1 0.0000000000000000e+00 6.2247704161286173e+00 7.0551794931100051e+00 7.2264985711031580e+00 4 1 -1
+1155 1 0.0000000000000000e+00 7.0851482373030468e+00 6.3603966232417726e+00 5.9455797158713244e+00 -3 1 0
+2568 1 0.0000000000000000e+00 5.4637908063817742e+00 5.4473520678005691e+00 5.0306589725092712e+00 4 -1 -1
+1289 1 0.0000000000000000e+00 7.1452577911451334e+00 7.2190762790055043e+00 7.0160376253914505e+00 5 0 -2
+2741 1 0.0000000000000000e+00 5.3960064868201201e+00 6.7996103645095438e+00 6.4746692802393655e+00 3 -6 2
+2969 3 1.0000000000000000e+00 6.5077588579733234e+00 7.0903850071616663e+00 5.1385961138607259e+00 1 -1 1
+1839 1 0.0000000000000000e+00 5.1130325226995295e+00 6.6707146700052951e+00 7.4637490002887894e+00 4 3 0
+804 1 0.0000000000000000e+00 5.1374279545427539e+00 5.5928394694332404e+00 5.8476862899695092e+00 4 1 -6
+2388 1 0.0000000000000000e+00 6.2416548362569459e+00 6.0305198117542229e+00 6.3109788891523291e+00 -1 0 5
+2382 1 0.0000000000000000e+00 5.3834418744478096e+00 6.2552432198975234e+00 6.4284012774793169e+00 0 0 2
+380 1 0.0000000000000000e+00 5.4259013223543135e+00 7.1368231316947544e+00 7.3679106809832726e+00 1 2 1
+568 1 0.0000000000000000e+00 5.1418512063239374e+00 6.7425526215926750e+00 5.7890037006525370e+00 2 0 1
+1902 1 0.0000000000000000e+00 5.5565194540174341e+00 5.9260938466490369e+00 5.7285217411787750e+00 1 -4 2
+1154 1 0.0000000000000000e+00 6.0632734526390113e+00 5.2869428546016000e+00 6.9195893789480767e+00 -6 1 -2
+1285 1 0.0000000000000000e+00 6.2662603213040651e+00 7.4563937909637508e+00 5.8906897643177460e+00 1 -3 -4
+15 1 0.0000000000000000e+00 6.5645246301322704e+00 6.9067383501812394e+00 6.4736194024191436e+00 -1 0 3
+1140 1 0.0000000000000000e+00 6.7437931708830368e+00 5.1855212036992189e+00 7.2315631767038022e+00 2 -5 1
+539 1 0.0000000000000000e+00 7.0978682591216549e+00 6.9435917853458839e+00 7.2983824463955331e+00 -5 2 2
+433 1 0.0000000000000000e+00 7.5075306779525830e+00 6.0814924697021953e+00 7.2479774231393428e+00 -2 -3 2
+2549 1 0.0000000000000000e+00 8.5440226690201033e+00 6.8195281471044940e+00 5.2370312587190995e+00 -2 -2 0
+1701 1 0.0000000000000000e+00 8.3839178921312492e+00 7.1807212192086451e+00 6.9450550215352882e+00 -6 -3 1
+2222 1 0.0000000000000000e+00 9.9889386039160559e+00 6.8338092374700841e+00 6.9441226433865211e+00 -6 -1 2
+2002 1 0.0000000000000000e+00 9.0899206078105124e+00 6.0611169930377438e+00 5.0206780283188790e+00 -3 2 -1
+423 1 0.0000000000000000e+00 7.9360051756444854e+00 6.6622415296218671e+00 6.2757950543983627e+00 -7 -1 -6
+1334 1 0.0000000000000000e+00 9.2604972466185878e+00 7.0098836810676906e+00 6.2850749237624104e+00 1 -1 6
+2570 1 0.0000000000000000e+00 7.8627246364943888e+00 7.2439542172090894e+00 5.5996008895653091e+00 2 -8 -1
+2037 1 0.0000000000000000e+00 8.8733633046467641e+00 6.3262275723498815e+00 6.0670384801305106e+00 -2 -3 0
+1990 1 0.0000000000000000e+00 9.0572587212098146e+00 7.3958683013469839e+00 5.7209947637994043e+00 0 0 7
+2681 1 0.0000000000000000e+00 8.0715433505245375e+00 6.5916634073010609e+00 5.4214294049021570e+00 -3 0 -3
+1314 1 0.0000000000000000e+00 9.7797486376342047e+00 6.2742847082446049e+00 5.7082297417951526e+00 -4 1 2
+2544 1 0.0000000000000000e+00 8.4058009155998352e+00 5.3869149028470247e+00 7.4876283324422062e+00 5 -2 -4
+2350 1 0.0000000000000000e+00 8.8400289468087099e+00 6.8993459127644048e+00 6.9909892986441493e+00 3 -2 3
+2682 1 0.0000000000000000e+00 8.4871506755773627e+00 5.1839858219993484e+00 5.8535769744739614e+00 1 6 4
+2312 1 0.0000000000000000e+00 7.7638699450068813e+00 5.2819080509976217e+00 5.7217064267702513e+00 -3 2 -1
+1491 1 0.0000000000000000e+00 9.1361760373254537e+00 6.8083957671759023e+00 5.4793397391210883e+00 0 2 1
+1340 1 0.0000000000000000e+00 9.6335945220670709e+00 5.0764037569918363e+00 5.3248993732187611e+00 3 4 -3
+2646 1 0.0000000000000000e+00 8.9169674083571753e+00 5.4071318379049478e+00 5.2189617928560921e+00 -4 -2 3
+1976 1 0.0000000000000000e+00 8.5694738732620355e+00 5.3535025133591940e+00 7.2318823348507797e+00 5 1 1
+2083 1 0.0000000000000000e+00 8.0893997238028508e+00 5.4517008652404630e+00 7.3123227941503339e+00 -1 -2 0
+2753 1 0.0000000000000000e+00 9.1885027789055833e+00 5.6584532458202421e+00 6.6948809246096088e+00 4 1 -1
+1620 1 0.0000000000000000e+00 9.9252901552726023e+00 6.6401687329165613e+00 5.9015679016368816e+00 -2 2 3
+812 1 0.0000000000000000e+00 9.8037441422671243e+00 5.5288011122501119e+00 7.0785954641846365e+00 -6 4 0
+589 1 0.0000000000000000e+00 9.2609691025231839e+00 5.4625354392981578e+00 5.7762772071569142e+00 0 -2 -3
+1825 1 0.0000000000000000e+00 8.5139648240384513e+00 6.2133465309239924e+00 7.4693860360078519e+00 0 -2 2
+2076 1 0.0000000000000000e+00 7.6541958879342529e+00 6.3498445962140089e+00 5.5892736378405017e+00 3 -5 -3
+2315 1 0.0000000000000000e+00 7.9694662244782188e+00 5.6556606169984978e+00 6.5288499968868496e+00 1 -1 2
+2889 2 -1.0000000000000000e+00 7.6070277351375344e+00 6.2501776054427065e+00 6.2908625795146902e+00 1 3 -4
+28 1 0.0000000000000000e+00 9.6204218161447699e+00 6.2020503148203039e+00 7.3204358777796683e+00 0 5 -3
+1192 1 0.0000000000000000e+00 8.8223609684869633e+00 6.2917963563711430e+00 6.5493185944049630e+00 -7 -4 -5
+2966 3 1.0000000000000000e+00 9.7441331689195732e+00 5.6388665306434058e+00 6.3970798802523010e+00 3 1 3
+2109 1 0.0000000000000000e+00 9.5171866721616993e+00 6.3422412756691724e+00 6.7653209622342088e+00 2 -3 3
+1858 1 0.0000000000000000e+00 9.9784046651918743e+00 7.1073826258292820e+00 6.1136805740966711e+00 4 -5 -2
+2656 1 0.0000000000000000e+00 8.8475270888899509e+00 5.5600752399147071e+00 6.7049186779062699e+00 2 4 4
+834 1 0.0000000000000000e+00 8.0183502320170081e+00 6.7539346360180481e+00 7.1540291343606164e+00 -1 -5 -5
+2912 3 1.0000000000000000e+00 7.7200912765968406e+00 5.0558755124764350e+00 6.4919470130994901e+00 0 2 -5
+1226 1 0.0000000000000000e+00 7.5639857015296155e+00 5.5743063164925974e+00 5.7214208814897258e+00 -4 -2 4
+2652 1 0.0000000000000000e+00 8.5254044660430868e+00 5.8883001889193709e+00 5.5416532276482569e+00 6 2 0
+1364 1 0.0000000000000000e+00 9.8267066773528882e+00 6.8192144450480603e+00 5.0350547898791396e+00 0 0 2
+964 1 0.0000000000000000e+00 8.6318540219534032e+00 6.6924769424753219e+00 5.6634398904997765e+00 -3 3 3
+142 1 0.0000000000000000e+00 8.3217732534251283e+00 6.1728225347568015e+00 7.0009763456191969e+00 -2 -4 -6
+653 1 0.0000000000000000e+00 7.6440967440046474e+00 7.1085043056848143e+00 6.6189886796148194e+00 0 2 2
+1081 1 0.0000000000000000e+00 7.8218260794485834e+00 7.3288041577525211e+00 7.3141559161170253e+00 0 6 -4
+2338 1 0.0000000000000000e+00 8.3009620058508808e+00 5.5617370724462223e+00 5.1294730127272743e+00 2 7 2
+2768 1 0.0000000000000000e+00 8.7559659866704038e+00 6.7766216478378665e+00 7.4224870995890697e+00 0 1 -1
+1402 1 0.0000000000000000e+00 9.3365461000992429e+00 7.4610301853733780e+00 5.1936663715578222e+00 -2 3 1
+1205 1 0.0000000000000000e+00 9.9307921739290776e+00 5.9069722099254856e+00 5.2891065382252069e+00 -1 -1 5
+1713 1 0.0000000000000000e+00 9.9951760485001113e+00 6.5823162597781391e+00 6.4725594600841454e+00 2 2 4
+2032 1 0.0000000000000000e+00 9.6753072423527833e+00 5.0135133383214114e+00 6.0659854602202978e+00 3 3 4
+829 1 0.0000000000000000e+00 6.0102428764909215e+00 9.7739410681571108e+00 6.7626221828542903e+00 0 2 2
+2775 1 0.0000000000000000e+00 6.5646933950382200e+00 9.3129409733743103e+00 7.1444910680980529e+00 1 1 2
+1121 1 0.0000000000000000e+00 5.8133354231562651e+00 9.2231580078505981e+00 6.9365618413919945e+00 2 5 -1
+79 1 0.0000000000000000e+00 5.8146655586516962e+00 8.1430957169696168e+00 6.1531694608879031e+00 0 -1 3
+487 1 0.0000000000000000e+00 6.1118276057644012e+00 8.1880072525768064e+00 7.2202778273081680e+00 6 -3 5
+1304 1 0.0000000000000000e+00 6.5985247043477626e+00 7.9794004416016335e+00 5.4034850593924828e+00 -3 4 -5
+639 1 0.0000000000000000e+00 5.7898304284353808e+00 9.9744498093295899e+00 6.9922356024127943e+00 4 -5 6
+211 1 0.0000000000000000e+00 5.1125245322536443e+00 8.1838343664190756e+00 6.5734294918917202e+00 5 -2 -1
+2789 1 0.0000000000000000e+00 6.7629397463407761e+00 8.7108365967040058e+00 6.7093387900926178e+00 0 -1 -2
+1055 1 0.0000000000000000e+00 5.4548245636611377e+00 9.7242432593242789e+00 6.2529734949533982e+00 -4 1 -3
+1235 1 0.0000000000000000e+00 7.2743960308405775e+00 9.6156207318437588e+00 7.3713316573958299e+00 -5 1 -1
+922 1 0.0000000000000000e+00 5.0751389720984337e+00 9.0367342774561479e+00 5.2416175801687706e+00 -2 -1 -2
+2500 1 0.0000000000000000e+00 7.4796758609872986e+00 8.6895329052831016e+00 6.2956176372551580e+00 1 2 3
+2335 1 0.0000000000000000e+00 6.6698057180689867e+00 9.4435144058282408e+00 5.0829709135746013e+00 3 -3 -1
+2274 1 0.0000000000000000e+00 5.1314033873503035e+00 9.6731762106379424e+00 5.0801975554129015e+00 3 0 1
+1044 1 0.0000000000000000e+00 6.6008765129480569e+00 7.6017035180624521e+00 6.1894138912904992e+00 0 6 0
+2342 1 0.0000000000000000e+00 6.4794508241066548e+00 9.7153533978593654e+00 5.5757334204354381e+00 -3 -1 1
+2704 1 0.0000000000000000e+00 6.0751925885405882e+00 9.9318477913135474e+00 5.2338368106585298e+00 -1 -3 -2
+695 1 0.0000000000000000e+00 6.0675235117809940e+00 8.3746294424369179e+00 6.4546565770131359e+00 -1 4 -1
+2904 3 1.0000000000000000e+00 6.9318507124371624e+00 7.9669436671829903e+00 7.0285562347028963e+00 -6 1 -3
+1927 1 0.0000000000000000e+00 6.8135055330985939e+00 9.9547222285402395e+00 6.2170100650766118e+00 -5 2 0
+2173 1 0.0000000000000000e+00 5.6603441952156617e+00 8.8326305665295113e+00 7.3660548090658606e+00 3 -3 5
+1747 1 0.0000000000000000e+00 5.3097326682907804e+00 9.4060437683130775e+00 6.4920147021845969e+00 5 -3 -3
+1386 1 0.0000000000000000e+00 5.4161323509605932e+00 8.9036544770934327e+00 5.7047330002162013e+00 -8 -1 -3
+941 1 0.0000000000000000e+00 5.4718977033383505e+00 7.5912447618847709e+00 6.7209482029586320e+00 2 0 -3
+992 1 0.0000000000000000e+00 7.1967834908569515e+00 7.6201751326929275e+00 6.8854525957660533e+00 1 -1 -1
+2098 1 0.0000000000000000e+00 5.2810650277962408e+00 8.8130341355699446e+00 6.8166297889279193e+00 0 -5 -1
+2960 3 1.0000000000000000e+00 5.5103175027111275e+00 7.5838937502012111e+00 5.9540901275763538e+00 -1 1 -5
+1693 1 0.0000000000000000e+00 7.2694601139114736e+00 9.3615726681191394e+00 5.7984910091901565e+00 -5 -7 1
+1283 1 0.0000000000000000e+00 5.5969449882168503e+00 9.0279333963109476e+00 5.2913392150996739e+00 -6 3 3
+1752 1 0.0000000000000000e+00 6.9247591926511438e+00 8.4111657588620155e+00 6.4569201195133212e+00 -3 -2 -3
+2585 1 0.0000000000000000e+00 5.4197976490463979e+00 8.1129244718297002e+00 5.2684932639543973e+00 6 -3 -1
+1508 1 0.0000000000000000e+00 5.0610290675997236e+00 8.3708863978880625e+00 6.0767476342782407e+00 -2 2 -8
+2217 1 0.0000000000000000e+00 6.2225181358021304e+00 9.5363316014986435e+00 5.8579675400279312e+00 7 6 -2
+2581 1 0.0000000000000000e+00 6.8500779317600129e+00 9.4337064082773932e+00 6.5246839159375511e+00 2 4 -2
+1812 1 0.0000000000000000e+00 5.3640599411363716e+00 9.6704394623379635e+00 7.3226642584754869e+00 1 2 3
+2662 1 0.0000000000000000e+00 6.4615614337704805e+00 8.5538987565367393e+00 6.4282740854071561e+00 0 -3 3
+329 1 0.0000000000000000e+00 7.0380393850596725e+00 8.3216910175009247e+00 5.0659045084443495e+00 0 1 -7
+284 1 0.0000000000000000e+00 6.0767320603708317e+00 9.1231918843728010e+00 6.3092391047958358e+00 -2 8 2
+2415 1 0.0000000000000000e+00 6.6694911500653955e+00 8.6373820207781407e+00 5.4564664386398931e+00 4 3 1
+702 1 0.0000000000000000e+00 7.4420446159973528e+00 8.3966081971127959e+00 5.7771799453865800e+00 0 1 -4
+1058 1 0.0000000000000000e+00 6.7518211889451498e+00 8.9989893260760940e+00 5.9238654659225229e+00 1 3 -4
+2150 1 0.0000000000000000e+00 5.5523663115613546e+00 7.6841428352181058e+00 5.4598173980932065e+00 1 -6 1
+668 1 0.0000000000000000e+00 7.4295378739326621e+00 8.9527762081867071e+00 5.3279922540345197e+00 0 -2 3
+2511 1 0.0000000000000000e+00 7.2313144583323954e+00 9.4275423433648466e+00 5.1325972878763784e+00 -3 4 3
+1319 1 0.0000000000000000e+00 8.0202808197427036e+00 9.2613307788587083e+00 5.5668025641822938e+00 -5 0 3
+1134 1 0.0000000000000000e+00 8.4293228908482547e+00 8.0751093998992030e+00 6.8697410786037638e+00 0 -3 -5
+2849 2 -1.0000000000000000e+00 8.1096477767752759e+00 8.4943792462849412e+00 5.0892668034183428e+00 1 1 -7
+53 1 0.0000000000000000e+00 8.4573454138879107e+00 8.1750098366223600e+00 5.4274213777066551e+00 2 1 -5
+2576 1 0.0000000000000000e+00 7.5709415420746282e+00 8.4051697091873852e+00 6.9193800666775376e+00 -3 1 2
+2399 1 0.0000000000000000e+00 9.0709783643928734e+00 9.8288635475371535e+00 7.1782380716270868e+00 -1 -2 2
+2714 1 0.0000000000000000e+00 9.2939145764702769e+00 9.1205158144786527e+00 6.3582018565963194e+00 -1 -4 2
+1899 1 0.0000000000000000e+00 8.6697979433382404e+00 7.5018969017727768e+00 6.6285965969160765e+00 0 1 0
+1654 1 0.0000000000000000e+00 9.2425511839439309e+00 8.5840598966414756e+00 6.5680669078463367e+00 -2 -3 1
+1903 1 0.0000000000000000e+00 9.4191416222346298e+00 7.5284453438132122e+00 6.8917001296738283e+00 8 -9 -3
+2011 1 0.0000000000000000e+00 9.9372649014981498e+00 9.3498072578582896e+00 6.9233317920439097e+00 0 5 -1
+2239 1 0.0000000000000000e+00 7.5086998902910427e+00 7.8748750844755655e+00 5.7520670795307298e+00 -7 9 0
+2678 1 0.0000000000000000e+00 8.3876273471700706e+00 7.5332761089405054e+00 6.1140774471393646e+00 -6 -1 -5
+1766 1 0.0000000000000000e+00 8.5405066856465446e+00 7.6342844207765577e+00 5.2804143579665892e+00 -1 0 6
+951 1 0.0000000000000000e+00 8.7464934529416443e+00 9.4751147667888063e+00 6.5908169341608964e+00 5 -2 1
+1579 1 0.0000000000000000e+00 9.5705392488545353e+00 9.3870273481477362e+00 5.1874791254538133e+00 5 5 0
+422 1 0.0000000000000000e+00 8.2311602351612247e+00 9.6608331920031070e+00 7.3148154020609351e+00 2 2 0
+1657 1 0.0000000000000000e+00 8.3818040450457847e+00 9.7827578624919465e+00 6.4226731019243326e+00 -7 0 5
+2771 1 0.0000000000000000e+00 8.7594916740529047e+00 8.8936099517891609e+00 7.1093960253139628e+00 -6 -1 5
+1428 1 0.0000000000000000e+00 9.1205654824390816e+00 9.7156034753463061e+00 6.3014021335050279e+00 -2 1 0
+1266 1 0.0000000000000000e+00 9.3874479552671204e+00 8.1463709054289097e+00 6.4605868155651640e+00 4 3 -5
+2064 1 0.0000000000000000e+00 8.1678752220405340e+00 9.1244602033830109e+00 6.9428639364242439e+00 -1 -3 -2
+1361 1 0.0000000000000000e+00 9.6961785161674641e+00 8.8007941746886384e+00 6.0697320400033803e+00 5 2 4
+2694 1 0.0000000000000000e+00 8.1793492388161901e+00 8.1347985408381831e+00 6.2407179734272784e+00 0 -4 -1
+2149 1 0.0000000000000000e+00 7.8547886268243374e+00 9.6787922934172759e+00 6.6627582153466873e+00 5 6 -2
+1950 1 0.0000000000000000e+00 8.9058216048861834e+00 9.4855565450974098e+00 5.4479252038829769e+00 3 -2 -1
+193 1 0.0000000000000000e+00 9.1845172296679625e+00 7.9204205647930808e+00 5.9963410319171944e+00 -3 -5 -1
+504 1 0.0000000000000000e+00 9.1273412812098336e+00 8.5490588450922829e+00 5.7401132753514750e+00 3 -6 6
+1082 1 0.0000000000000000e+00 9.0776498498691538e+00 8.0171136211783995e+00 7.2690603527335185e+00 3 -1 5
+2485 1 0.0000000000000000e+00 9.6247548460976819e+00 8.5619783418623161e+00 7.1171108236066498e+00 1 1 3
+1890 1 0.0000000000000000e+00 9.4732572465350025e+00 7.6536867945389515e+00 7.2824322273465825e+00 -6 1 5
+113 1 0.0000000000000000e+00 7.5510829595473599e+00 8.6578898880381985e+00 7.0106114727864570e+00 5 -3 4
+2859 2 -1.0000000000000000e+00 9.9698874974893403e+00 8.4207507305649649e+00 5.8744696250659123e+00 -3 4 1
+1301 1 0.0000000000000000e+00 8.4991464298328125e+00 8.5993655234694089e+00 5.9669943509867043e+00 -5 1 1
+2095 1 0.0000000000000000e+00 7.6779237915433063e+00 7.6478047984883641e+00 6.3315761086164501e+00 2 0 0
+1538 1 0.0000000000000000e+00 9.7805176293833416e+00 7.8528599211164059e+00 5.4877979715663976e+00 3 -2 -1
+1942 1 0.0000000000000000e+00 7.9587240439183926e+00 8.0305739709976809e+00 7.3734784711820138e+00 -2 0 -4
+215 1 0.0000000000000000e+00 9.9222822277352023e+00 7.5003749485418325e+00 6.4983844841868708e+00 3 -1 -5
+2506 1 0.0000000000000000e+00 9.5268697033119274e+00 9.5012727645370845e+00 7.3631651104469009e+00 -2 0 -2
+1589 1 0.0000000000000000e+00 8.1624648376508393e+00 8.9658919025981305e+00 6.5954234167177459e+00 3 -1 -1
+1750 1 0.0000000000000000e+00 8.5831246646744219e+00 9.1444882116631359e+00 6.1769671550630720e+00 0 3 3
+2533 1 0.0000000000000000e+00 7.5337383354857188e+00 9.2238555240236533e+00 6.2667626904432510e+00 4 -3 2
+384 1 0.0000000000000000e+00 8.3458866002382344e+00 8.8414279641153222e+00 5.1766349558037792e+00 5 -3 -4
+2058 1 0.0000000000000000e+00 7.9966229170057952e+00 8.5671926022881486e+00 5.7576140424491129e+00 -1 2 -5
+251 1 0.0000000000000000e+00 8.5564496131169463e+00 9.7320444509266704e+00 5.5263638488663069e+00 -6 -1 0
+2766 1 0.0000000000000000e+00 7.7285454105330249e+00 9.0397604800088480e+00 7.3835773514836855e+00 0 -3 -2
+1124 1 0.0000000000000000e+00 9.3478314219213452e+00 8.6800611102174727e+00 5.2961930746216481e+00 -5 -5 0
+2722 1 0.0000000000000000e+00 9.9615581569120710e+00 7.9631907065538670e+00 7.3521607948058758e+00 -4 6 -1
+2640 1 0.0000000000000000e+00 7.9416385874295106e+00 9.7269314441588541e+00 5.4482471843851892e+00 3 0 2
+1888 1 0.0000000000000000e+00 8.3166581325155544e+00 9.9526441987595202e+00 7.4865076015357586e+00 -10 -1 -3
+275 1 0.0000000000000000e+00 5.5794365262568961e+00 5.1319081687951389e+00 8.0606660209790011e+00 -3 -4 -3
+886 1 0.0000000000000000e+00 6.3403775316908373e+00 5.9782216391613465e+00 9.8433967450941875e+00 3 1 -1
+1841 1 0.0000000000000000e+00 5.9749285296279941e+00 5.3076211580827755e+00 9.2856464794893281e+00 -3 -6 -1
+1384 1 0.0000000000000000e+00 5.3054209458230268e+00 6.8005117726869946e+00 8.7330752242921967e+00 -5 0 3
+1753 1 0.0000000000000000e+00 6.2262098878551155e+00 6.3809343025477396e+00 7.7066117397908265e+00 3 -5 -8
+1783 1 0.0000000000000000e+00 6.6312250060031142e+00 6.3059018848709147e+00 9.0059860533254739e+00 2 8 -2
+2447 1 0.0000000000000000e+00 6.0376103122244267e+00 7.1414661390538434e+00 8.1196058407438656e+00 -3 -1 2
+2583 1 0.0000000000000000e+00 7.2084583220513316e+00 5.9664038309877423e+00 9.4972536990547685e+00 1 2 -2
+2486 1 0.0000000000000000e+00 6.8184243079848361e+00 5.4312403438512762e+00 8.2604297290545698e+00 -5 -4 0
+1968 1 0.0000000000000000e+00 7.3215731207792931e+00 5.2595707810716457e+00 8.0149324188671294e+00 4 2 1
+2915 3 1.0000000000000000e+00 6.9434630832667112e+00 7.0463712445200795e+00 7.9954496674094058e+00 -1 -1 -2
+235 1 0.0000000000000000e+00 5.2791908886371122e+00 5.1726681682293778e+00 9.9023276582797521e+00 -2 0 -5
+1381 1 0.0000000000000000e+00 5.4935409822937933e+00 7.1120550348876090e+00 8.3308590649647201e+00 0 -2 1
+2104 1 0.0000000000000000e+00 6.8667863257518418e+00 6.6953958475689079e+00 8.9924827348587684e+00 -2 7 0
+1480 1 0.0000000000000000e+00 5.9950174731261940e+00 6.6814510681286716e+00 9.0080395019187307e+00 1 0 -2
+2375 1 0.0000000000000000e+00 6.5956923100716383e+00 6.5348052444846241e+00 7.7225892067998005e+00 -6 -3 3
+726 1 0.0000000000000000e+00 5.6655759762912350e+00 6.2088877538507914e+00 9.1758096977049473e+00 -2 -5 2
+765 1 0.0000000000000000e+00 5.1870991888955116e+00 7.2676642618579255e+00 9.0530719741004155e+00 4 -3 -6
+1186 1 0.0000000000000000e+00 5.5503828704501545e+00 5.8849361028044269e+00 7.5748756459859292e+00 1 5 -3
+2079 1 0.0000000000000000e+00 5.7067168465628022e+00 6.0772226219741130e+00 8.2853780079493120e+00 -8 0 5
+875 1 0.0000000000000000e+00 5.8026617880728528e+00 6.1768625979177942e+00 9.7001996328685127e+00 0 1 -5
+2325 1 0.0000000000000000e+00 5.2865559795530030e+00 6.7758499260878464e+00 9.5835736804772527e+00 -1 -2 0
+1372 1 0.0000000000000000e+00 6.0488671933645524e+00 5.8284769116976536e+00 8.4062608132090233e+00 0 -3 -9
+2477 1 0.0000000000000000e+00 6.4989892501709248e+00 5.8382814446920142e+00 8.9603291310190905e+00 7 -2 -1
+2938 3 1.0000000000000000e+00 7.1367333185240938e+00 7.1811538317862675e+00 8.4595791384031767e+00 -4 -1 3
+2868 2 -1.0000000000000000e+00 7.3666939709086074e+00 5.8174350282714347e+00 9.0595757124616050e+00 3 2 -2
+116 1 0.0000000000000000e+00 6.5434508319796665e+00 7.4123603751685421e+00 7.7833435454473543e+00 -2 3 -9
+2273 1 0.0000000000000000e+00 6.5235427333443532e+00 6.5503367056779407e+00 8.2865990647143040e+00 2 4 -1
+1031 1 0.0000000000000000e+00 5.7037012933950058e+00 7.4723911074708962e+00 9.1253460369464872e+00 -3 8 -4
+1486 1 0.0000000000000000e+00 7.0383337275281654e+00 6.7400876958351894e+00 9.8053844200948017e+00 -6 -3 -5
+2604 1 0.0000000000000000e+00 6.6874806154939153e+00 5.2019633555199176e+00 8.7724409097897542e+00 -5 -2 6
+1333 1 0.0000000000000000e+00 6.3044754488068948e+00 7.0735382171614853e+00 9.4437775212270871e+00 2 -2 0
+2800 1 0.0000000000000000e+00 5.2898207524626129e+00 6.1068973094075361e+00 8.9790936184158792e+00 -1 -5 -3
+1989 1 0.0000000000000000e+00 7.4575164682076220e+00 6.4702641604112383e+00 8.1101296719757023e+00 1 -1 -7
+1085 1 0.0000000000000000e+00 5.3194408058721159e+00 5.4138628443471584e+00 9.2089993144971700e+00 -6 0 5
+2018 1 0.0000000000000000e+00 6.2457229070290055e+00 5.4748109251221031e+00 7.5935195445680206e+00 -6 4 2
+2047 1 0.0000000000000000e+00 6.2577260433295585e+00 7.2251723027400248e+00 8.5211143921276165e+00 -6 -3 3
+764 1 0.0000000000000000e+00 5.4580487846068824e+00 5.5308017428674683e+00 8.2668539340989184e+00 -2 -1 -3
+271 1 0.0000000000000000e+00 5.0162286340054481e+00 6.3385489956811449e+00 8.2883281209569333e+00 -5 0 -1
+968 1 0.0000000000000000e+00 6.7485259184942068e+00 6.0270564797906605e+00 9.6816831979824602e+00 6 -1 -3
+2202 1 0.0000000000000000e+00 7.0362272834433073e+00 7.4844080401042818e+00 9.1691591538536805e+00 3 4 1
+2939 3 1.0000000000000000e+00 5.3990834930083285e+00 5.4327670325306636e+00 7.6493423024341292e+00 -4 -1 0
+306 1 0.0000000000000000e+00 7.3811555142128924e+00 5.8985478636625537e+00 8.7596397085411102e+00 -8 4 -6
+2492 1 0.0000000000000000e+00 7.0947862656155900e+00 6.2059179433890694e+00 8.0667872392371311e+00 -1 6 7
+2914 3 1.0000000000000000e+00 6.1467164614019465e+00 7.3151594556350474e+00 9.6110511041468367e+00 6 -1 -2
+1262 1 0.0000000000000000e+00 7.1846844073950749e+00 5.0552218479312918e+00 9.3114813324435541e+00 1 -1 -3
+1000 1 0.0000000000000000e+00 7.2239382413892779e+00 5.3783498271483543e+00 7.5188360238248997e+00 3 -1 1
+2258 1 0.0000000000000000e+00 8.3558924121364715e+00 5.1667020929594978e+00 9.4159130465538894e+00 -1 2 -3
+631 1 0.0000000000000000e+00 9.8659152303578903e+00 6.9222676135844639e+00 9.8681086287130704e+00 -3 -2 5
+1095 1 0.0000000000000000e+00 8.7245031921616238e+00 5.7488847066666642e+00 8.3306298381790640e+00 -9 5 -2
+480 1 0.0000000000000000e+00 8.3659696884402450e+00 6.7491753628552269e+00 9.1238975772209123e+00 -2 -2 7
+2599 1 0.0000000000000000e+00 8.9809947916462729e+00 5.7193324803288617e+00 9.7762299510553419e+00 1 -1 -2
+280 1 0.0000000000000000e+00 8.5741230112245805e+00 6.5152865485959923e+00 8.6611756146957113e+00 -1 4 -4
+2725 1 0.0000000000000000e+00 7.8573405324124561e+00 7.4229956540471553e+00 9.2098187183696911e+00 1 3 3
+1123 1 0.0000000000000000e+00 7.6956147020832155e+00 6.2758750951354134e+00 9.9336315520630549e+00 1 1 -1
+2935 3 1.0000000000000000e+00 9.8538346681853017e+00 5.5869032055171388e+00 9.3236829067127029e+00 5 -7 7
+650 1 0.0000000000000000e+00 9.5380771325344362e+00 5.6645250827055973e+00 9.4827529743247823e+00 0 1 -3
+421 1 0.0000000000000000e+00 8.5518906592931909e+00 7.2300198329065211e+00 9.7234860141799277e+00 -1 -1 1
+1636 1 0.0000000000000000e+00 9.7074096108349330e+00 7.2599745014264636e+00 9.4072347370295617e+00 3 -5 -4
+2821 2 -1.0000000000000000e+00 9.2094534150674026e+00 5.2621715685126169e+00 8.6931582007570398e+00 -4 6 -4
+1792 1 0.0000000000000000e+00 9.0942340195959677e+00 7.0459355360387734e+00 9.7892973322007446e+00 -1 -4 -2
+1555 1 0.0000000000000000e+00 9.4880311174114453e+00 7.1470618068611751e+00 9.0329332203189772e+00 2 -4 -2
+289 1 0.0000000000000000e+00 8.2003297845039818e+00 5.9770512899172470e+00 9.1883212362317579e+00 -7 -6 -4
+2772 1 0.0000000000000000e+00 9.6600342051557551e+00 6.1317094053976593e+00 9.6920567111053693e+00 -4 -3 1
+1309 1 0.0000000000000000e+00 9.3755967429311085e+00 6.3464008016433215e+00 8.7892642432600940e+00 -2 -3 -2
+1196 1 0.0000000000000000e+00 7.7415868569288353e+00 5.8769549441362878e+00 7.9496218757716504e+00 -5 7 -3
+609 1 0.0000000000000000e+00 9.8994039170629886e+00 5.5859650395529430e+00 8.8775367200004904e+00 -3 5 -3
+828 1 0.0000000000000000e+00 7.7875664939126787e+00 6.9331830911061072e+00 9.0512567375295472e+00 -3 3 -3
+1011 1 0.0000000000000000e+00 8.4439032988920726e+00 7.2297165561819803e+00 8.2511264262255413e+00 -4 0 -4
+712 1 0.0000000000000000e+00 9.1904464135172912e+00 5.5185117407698883e+00 7.7669833366954890e+00 -6 1 3
+1239 1 0.0000000000000000e+00 8.4424023346817201e+00 5.1456261890752053e+00 8.2636462371127717e+00 1 -1 0
+1274 1 0.0000000000000000e+00 8.0306130271310696e+00 5.2501693946303618e+00 8.8776757394667243e+00 -3 1 2
+1475 1 0.0000000000000000e+00 9.7710810863788211e+00 5.0055593959782945e+00 8.4041120736421373e+00 2 3 -4
+2077 1 0.0000000000000000e+00 8.1158327417135681e+00 6.6948202757514643e+00 8.0038333376249629e+00 3 0 -2
+732 1 0.0000000000000000e+00 7.9037104090097987e+00 6.5105902881160196e+00 9.0828989235166926e+00 0 -4 -5
+2191 1 0.0000000000000000e+00 7.8565646976840888e+00 7.3363347951744808e+00 8.5687554674395336e+00 -5 1 1
+1801 1 0.0000000000000000e+00 7.9370577589148512e+00 6.4746040757555505e+00 8.5234405477258743e+00 -1 6 -3
+1566 1 0.0000000000000000e+00 8.6410747792360212e+00 5.6248552767316005e+00 9.3133361617430399e+00 2 -1 2
+506 1 0.0000000000000000e+00 7.5878558483886973e+00 7.2656098749582068e+00 8.0320119936628238e+00 -6 -2 0
+666 1 0.0000000000000000e+00 8.9877983919399380e+00 6.3894552176139916e+00 9.3588908818300762e+00 4 -4 -4
+2887 2 -1.0000000000000000e+00 9.3987688235582780e+00 6.0438580272318889e+00 7.8512721868386315e+00 -5 -5 0
+69 1 0.0000000000000000e+00 8.8281169388358478e+00 7.4233065540907228e+00 8.8588461675720627e+00 -2 2 4
+1417 1 0.0000000000000000e+00 8.0856491269739106e+00 7.4252823062047923e+00 8.0309846353350487e+00 -3 8 6
+2885 2 -1.0000000000000000e+00 9.5727609237487918e+00 6.8132419580995487e+00 7.9360743119884036e+00 -1 0 -5
+556 1 0.0000000000000000e+00 9.5890078553416895e+00 5.3029272040784710e+00 7.9406110234773042e+00 -4 -5 -1
+1436 1 0.0000000000000000e+00 8.1223993471755414e+00 5.7616277576581130e+00 8.0681841928312519e+00 -2 1 -1
+1862 1 0.0000000000000000e+00 8.2292589738408477e+00 6.1466180331107640e+00 9.7143339615167292e+00 1 2 -4
+93 1 0.0000000000000000e+00 9.0118287536180528e+00 6.9251642906249549e+00 8.4656050780668686e+00 -5 0 2
+1400 1 0.0000000000000000e+00 7.8211032581199422e+00 6.0132861822686179e+00 8.4929661803517629e+00 -3 -3 -2
+2738 1 0.0000000000000000e+00 9.2801066470933549e+00 5.8189652811656751e+00 8.7169027225525806e+00 10 3 2
+586 1 0.0000000000000000e+00 7.7721434312204094e+00 5.4034689198287742e+00 9.6110013748541459e+00 -5 0 4
+1136 1 0.0000000000000000e+00 7.6876669484065960e+00 5.0110410740741491e+00 8.0831908609008387e+00 6 4 -2
+1107 1 0.0000000000000000e+00 5.1641817873628648e+00 9.0014941258773664e+00 8.4561540418816605e+00 3 0 3
+7 1 0.0000000000000000e+00 6.9994996076110141e+00 9.5626969229086285e+00 8.0547307081170327e+00 -10 3 0
+2510 1 0.0000000000000000e+00 5.1084980980253727e+00 8.8828757530064433e+00 9.2581055401440846e+00 5 1 -4
+1786 1 0.0000000000000000e+00 5.1142092006456705e+00 7.5687120889649595e+00 7.5636689587223307e+00 4 2 -3
+154 1 0.0000000000000000e+00 5.4285467644947989e+00 7.5867373034625736e+00 8.2634532956461104e+00 -5 -4 1
+938 1 0.0000000000000000e+00 6.6477919088604764e+00 8.9451263769865665e+00 9.4737924570894076e+00 -6 0 0
+496 1 0.0000000000000000e+00 6.5712128637491327e+00 9.2788292625682249e+00 8.5723661877234303e+00 -4 3 4
+853 1 0.0000000000000000e+00 5.5632294431189653e+00 8.7357678659223872e+00 8.7138485492579196e+00 0 -5 -1
+2946 3 1.0000000000000000e+00 5.1239971617170506e+00 9.5775688283236367e+00 8.1268998961697925e+00 2 -1 -2
+1848 1 0.0000000000000000e+00 7.4522659149123189e+00 9.3569745483169147e+00 9.8195356826224902e+00 3 4 -6
+1874 1 0.0000000000000000e+00 5.2440921607652804e+00 7.7349442600300131e+00 9.8533660894640516e+00 4 -2 -5
+159 1 0.0000000000000000e+00 5.7956468948365076e+00 7.9008327710345405e+00 9.5580148813221939e+00 -4 0 4
+2880 2 -1.0000000000000000e+00 5.9946012738043528e+00 9.0850307866905098e+00 9.2777489863764266e+00 -3 1 0
+1308 1 0.0000000000000000e+00 7.3739557082933835e+00 9.8400768811957704e+00 9.3123222840612776e+00 1 -4 -4
+90 1 0.0000000000000000e+00 6.2788113442528832e+00 9.8904301790342206e+00 9.1851033332770626e+00 4 -2 -7
+2392 1 0.0000000000000000e+00 5.8423067197421306e+00 9.4453165268242039e+00 8.4800555018836068e+00 -4 3 -1
+746 1 0.0000000000000000e+00 5.4751616619054531e+00 8.7995639702747557e+00 8.1190799992239153e+00 1 -3 0
+706 1 0.0000000000000000e+00 7.3294454724439664e+00 8.4149027818925664e+00 9.3890330034526865e+00 -3 -4 -3
+1915 1 0.0000000000000000e+00 6.1126263865978547e+00 8.5026046243577547e+00 8.3037281504959832e+00 -7 1 -2
+2550 1 0.0000000000000000e+00 7.1395095988763604e+00 8.6986287461229423e+00 7.9373690756628035e+00 11 4 -2
+2008 1 0.0000000000000000e+00 7.2656287165162521e+00 7.5283591398962058e+00 7.6921511353195422e+00 0 1 4
+2670 1 0.0000000000000000e+00 6.5809684275692355e+00 8.6142191628260019e+00 8.7182454352748202e+00 -2 2 -3
+1399 1 0.0000000000000000e+00 5.7353895434933229e+00 9.5074440640692011e+00 9.8256162381877203e+00 -2 -8 3
+336 1 0.0000000000000000e+00 7.4206067250955057e+00 8.1147110945078484e+00 8.4750847674299354e+00 -2 3 1
+869 1 0.0000000000000000e+00 7.0439365189743723e+00 9.6577687653672530e+00 8.6934722141044425e+00 0 1 1
+2655 1 0.0000000000000000e+00 5.8096546365709587e+00 8.5612422518931393e+00 9.2462558224323548e+00 -1 -3 -7
+2412 1 0.0000000000000000e+00 6.6081544504304697e+00 7.5709031400655062e+00 9.0347142704264254e+00 1 1 8
+378 1 0.0000000000000000e+00 7.3835998214749567e+00 8.8048260317103306e+00 8.6058944323565996e+00 -2 -7 1
+1324 1 0.0000000000000000e+00 6.1822812702869996e+00 9.0676977541418200e+00 7.9231361680221744e+00 6 9 -1
+1420 1 0.0000000000000000e+00 6.6045281816000143e+00 8.2372378935130275e+00 9.6598614366118607e+00 3 -2 1
+1628 1 0.0000000000000000e+00 6.9413896180992571e+00 8.0064393487758529e+00 7.7676540344340737e+00 2 -1 1
+375 1 0.0000000000000000e+00 6.8556863586566879e+00 8.7428408650561327e+00 7.6673854626566431e+00 5 -2 7
+2459 1 0.0000000000000000e+00 6.0676106692018017e+00 9.5645990820666924e+00 7.8337229659810426e+00 -6 -9 0
+996 1 0.0000000000000000e+00 5.4172062560041319e+00 8.1893374706619699e+00 7.7551065485787678e+00 6 3 -1
+1122 1 0.0000000000000000e+00 6.7485911424928213e+00 7.6666165090472411e+00 9.9295879340097137e+00 0 -9 1
+2980 3 1.0000000000000000e+00 6.9394505517252165e+00 7.8116096778175841e+00 8.6092120777776842e+00 1 -5 0
+237 1 0.0000000000000000e+00 7.2693975921284144e+00 7.5292902409657465e+00 9.9241695896120241e+00 7 -4 0
+452 1 0.0000000000000000e+00 5.1193727314411106e+00 9.1609224077430582e+00 9.5814488540146030e+00 3 3 -3
+1276 1 0.0000000000000000e+00 6.2375343146247664e+00 7.9588566184613043e+00 8.0717402821621889e+00 3 0 8
+71 1 0.0000000000000000e+00 6.2291421742838651e+00 8.1825007347638419e+00 9.1067927538067988e+00 2 -1 -1
+1868 1 0.0000000000000000e+00 6.5821253220388636e+00 9.7119296374399546e+00 7.5519816734684460e+00 4 -6 -1
+285 1 0.0000000000000000e+00 7.1879445838901672e+00 9.2288263076859067e+00 9.0376570534814427e+00 1 1 2
+1291 1 0.0000000000000000e+00 7.3897156208398451e+00 8.3126531600667484e+00 7.5990766376105006e+00 1 1 -8
+1194 1 0.0000000000000000e+00 5.1201204027914269e+00 7.9617161300352306e+00 8.9015539063743834e+00 2 -1 -2
+2813 2 -1.0000000000000000e+00 5.4019024229639117e+00 9.9362633103993634e+00 7.6575517407478753e+00 3 0 0
+1307 1 0.0000000000000000e+00 5.4921653714995848e+00 9.5290755840776384e+00 9.0537087030192183e+00 -3 5 -1
+2426 1 0.0000000000000000e+00 6.3965473312298373e+00 8.3496344991032529e+00 7.5622155643186328e+00 1 0 -2
+2716 1 0.0000000000000000e+00 5.5489713467722597e+00 9.9731850428676783e+00 8.5166964062130397e+00 1 2 1
+1050 1 0.0000000000000000e+00 5.9881491447777675e+00 8.4231054522493647e+00 9.9724330012437630e+00 4 3 -1
+2267 1 0.0000000000000000e+00 5.7709358987340993e+00 8.7433120083507418e+00 9.9973609180290435e+00 6 2 4
+2234 1 0.0000000000000000e+00 8.1882034987556782e+00 8.0321984341917343e+00 8.1079324140724740e+00 1 3 -6
+21 1 0.0000000000000000e+00 8.7891405751000136e+00 9.5553061910394046e+00 8.5185002476242833e+00 -1 2 1
+61 1 0.0000000000000000e+00 8.2245277262365999e+00 9.5652832206015788e+00 9.2333867225764763e+00 3 2 -3
+2306 1 0.0000000000000000e+00 9.9182671747067310e+00 8.6984177278172847e+00 8.2525987619635650e+00 -4 0 2
+953 1 0.0000000000000000e+00 8.5931521851165371e+00 7.5244464937855620e+00 7.6862990972975593e+00 2 0 -3
+2157 1 0.0000000000000000e+00 9.2231859219075467e+00 7.6053724926535811e+00 8.2099396237640025e+00 -6 0 -3
+773 1 0.0000000000000000e+00 7.8452591752095033e+00 8.6020401315600612e+00 8.0133325146339835e+00 0 -1 1
+1571 1 0.0000000000000000e+00 9.3628360227611012e+00 9.2211295439534844e+00 7.8314173956878994e+00 3 -1 -2
+1823 1 0.0000000000000000e+00 9.8601422001083687e+00 9.5939488527309926e+00 9.1598745394610663e+00 -5 5 -2
+236 1 0.0000000000000000e+00 8.3532352687679854e+00 7.7795168533629342e+00 8.8513137673528544e+00 1 7 1
+2272 1 0.0000000000000000e+00 8.5599615024483722e+00 9.2001893256083722e+00 8.8069085181150317e+00 -5 -4 1
+1999 1 0.0000000000000000e+00 9.0401950422452408e+00 9.8492810777786293e+00 9.3734259239619355e+00 -3 -5 -1
+2591 1 0.0000000000000000e+00 8.9181380614224892e+00 9.0330010980282527e+00 9.6948124310117709e+00 4 -3 -3
+1281 1 0.0000000000000000e+00 8.8462766089064875e+00 7.9313306340170229e+00 8.4688309119328959e+00 -4 6 -2
+1864 1 0.0000000000000000e+00 7.5138662901579334e+00 9.7474207815526999e+00 8.8565258633383053e+00 -3 4 -6
+296 1 0.0000000000000000e+00 8.8296822093031988e+00 7.9028662263249307e+00 9.9305314861999889e+00 -3 0 2
+1662 1 0.0000000000000000e+00 7.5022430224069785e+00 8.0722401068168050e+00 9.8213600675227788e+00 -2 1 4
+638 1 0.0000000000000000e+00 8.9414584928702965e+00 8.9995970780520373e+00 8.9541670088137568e+00 -2 -1 -1
+2017 1 0.0000000000000000e+00 8.5987178609809902e+00 9.0293747598209375e+00 7.9274082370297210e+00 -1 -3 0
+2721 1 0.0000000000000000e+00 8.6429911299634465e+00 8.5040310353537123e+00 9.6596375423373573e+00 -8 -5 -2
+1799 1 0.0000000000000000e+00 8.2117895859542998e+00 7.9421607689031770e+00 9.9897263479051599e+00 4 0 2
+835 1 0.0000000000000000e+00 9.3959992435918309e+00 8.2739615445091097e+00 9.0252683958706346e+00 -3 1 -1
+1650 1 0.0000000000000000e+00 9.1808718857026683e+00 8.6441299823702078e+00 9.0247549384718031e+00 1 4 -3
+1788 1 0.0000000000000000e+00 9.8345360812504943e+00 8.8531427017462914e+00 8.9876129049174338e+00 3 -2 3
+1543 1 0.0000000000000000e+00 9.0216576400661417e+00 7.6909149535250378e+00 9.3245523985120968e+00 6 -6 4
+1104 1 0.0000000000000000e+00 8.6387333672860116e+00 8.4077107893894336e+00 8.6594891628843662e+00 3 -1 -2
+1119 1 0.0000000000000000e+00 7.9045629854784716e+00 9.2442474561313475e+00 8.2643378914323975e+00 -4 0 4
+841 1 0.0000000000000000e+00 8.5058880257053531e+00 9.6392144209583819e+00 7.9495803895130397e+00 -5 -2 5
+2857 2 -1.0000000000000000e+00 9.7025409797701148e+00 9.6525979322002780e+00 9.5898867748907737e+00 -10 0 -1
+2589 1 0.0000000000000000e+00 9.8869358666760618e+00 8.3306740237897543e+00 8.4491450390306042e+00 -1 -3 -7
+814 1 0.0000000000000000e+00 9.7076750791241615e+00 9.3406545094163320e+00 8.0846177244739525e+00 0 5 -5
+2344 1 0.0000000000000000e+00 9.6470020912768817e+00 7.8261807988823024e+00 8.8689396661238611e+00 -4 0 1
+625 1 0.0000000000000000e+00 9.5922307311828625e+00 8.5635154609099331e+00 7.6026369015979078e+00 -5 2 3
+2986 3 1.0000000000000000e+00 9.1820451185755836e+00 8.5402099664654578e+00 8.1808116596793266e+00 2 -3 2
+508 1 0.0000000000000000e+00 7.6770429943273975e+00 9.5620342569393593e+00 7.5640042184218261e+00 -1 -9 2
+1228 1 0.0000000000000000e+00 7.6193263545845165e+00 7.9886014558049236e+00 9.0808463916323205e+00 5 -1 -2
+1469 1 0.0000000000000000e+00 7.8569845110780090e+00 8.6664317504404185e+00 8.8490201113029201e+00 5 0 0
+743 1 0.0000000000000000e+00 9.3259023787196327e+00 9.5844176315902896e+00 8.4787173294180995e+00 -1 3 -2
+137 1 0.0000000000000000e+00 8.3986513262585696e+00 8.7617183710988833e+00 7.5655908436593347e+00 -5 3 1
+2854 2 -1.0000000000000000e+00 7.7026825249995090e+00 9.1501032854948381e+00 9.4395930165201225e+00 2 0 -8
+2950 3 1.0000000000000000e+00 9.6168376049514102e+00 8.6951540647792420e+00 9.9619143739632925e+00 1 1 1
+1634 1 0.0000000000000000e+00 9.9468897860508569e+00 8.0292009150117618e+00 9.5509654757455618e+00 -7 1 -3
+2787 1 0.0000000000000000e+00 8.0485549760665833e+00 8.7721318997247870e+00 9.5944249963757304e+00 0 2 8
+2179 1 0.0000000000000000e+00 9.1288858456541604e+00 9.9887525184356658e+00 8.3159328887927746e+00 0 3 2
+2264 1 0.0000000000000000e+00 8.8634526585401172e+00 7.9226690232413537e+00 7.5913761533017423e+00 -3 6 0
+
+Velocities
+
+19 3.2700823975451121e-01 -2.3482296159526705e-01 -1.3504792563985044e+00
+1837 -1.6540795819863389e-02 3.9920451516076327e-01 -2.1575964664702893e-01
+1141 -1.0082784186451264e-01 -1.1870621912596457e+00 8.9846841591413251e-01
+2623 1.1887805320289524e+00 1.2285756389305773e+00 -2.2702103147430971e-01
+399 2.3718552417234723e-01 -3.8325146563028983e-01 5.2744587229096518e-01
+2653 6.2707287797100331e-01 -1.4562998308698396e+00 -3.2556025919104259e-01
+810 -3.8153419985334336e-01 -7.1683806638414213e-02 1.2674966458174839e+00
+117 6.3439493294121974e-01 -1.6028064925249053e+00 3.8861375737376558e-01
+2626 1.0730304222873874e-01 4.4343081169931448e-01 -4.5254543389840596e-01
+2717 5.0015120083480802e-01 1.1880917205337667e+00 -1.3881728221527352e+00
+2238 -1.1130314727233175e+00 -8.0854973598076818e-01 3.0933257076151188e-01
+1028 3.5831949361376125e-01 -1.4328534266368537e-01 -1.1887701998740750e+00
+2244 1.8542983928372554e+00 9.2738113605741290e-01 -4.6889365104376579e-01
+683 -1.4573375981525365e+00 -5.9165507141755469e-01 -8.6904881536281364e-01
+1708 4.3476144407715700e-01 5.0375722868076100e-01 -1.1074975942346148e+00
+106 -1.0434476723766684e+00 -7.0553254080173522e-01 2.6426494292565494e-01
+244 3.1642645163142025e-02 8.6183619974657832e-01 2.5057974365357871e-01
+2343 -8.6930004766564917e-01 6.6811268938361357e-01 5.3644739405058206e-01
+109 -6.9707707982761369e-01 6.8366761819299560e-01 4.2109516601691022e-01
+2603 -9.3525065062390866e-01 1.4543975214736535e+00 -9.0827165621820083e-01
+345 -6.3354228823605130e-01 2.4270754152015256e-01 1.5421863362821406e+00
+2812 -1.6163297826564873e+00 -6.2128016255326740e-02 1.4337111587396101e+00
+1495 -1.3564773233492369e+00 -2.0662862329464247e+00 -5.0906651864061209e-03
+489 -2.4799526555839085e-01 4.1433455158455329e-01 -1.3034678132320479e+00
+1928 -1.2958600482914779e+00 1.0159330561269766e+00 -8.7240665555080721e-01
+1878 -3.7661372655255287e-01 -4.3948241116749465e-01 6.1494133487396285e-01
+1542 5.4961492717829530e-01 -9.7374823199060068e-01 -5.6100295947455114e-01
+1535 1.0470602445256434e+00 2.1418303132974492e-01 3.9330091253064087e-01
+1290 -5.6882050410612195e-01 -2.1755543148890158e-01 -2.3122019532997545e-01
+1443 2.0356850830332283e+00 4.4048727429529932e-01 -8.0178857944629822e-01
+1530 5.7035720760003450e-01 7.3007259365591837e-01 -3.0732413261132838e+00
+955 -1.9290868322987673e+00 -7.2416820009675209e-01 1.0579779352970342e+00
+2584 3.7786544496704222e-01 -1.1645664330705219e+00 -4.7807576763848503e-02
+312 1.6929739060320321e+00 -2.4024024794937218e-01 -5.1163583079355190e-01
+1129 -1.5635632665624453e+00 -1.4869309947683393e+00 2.3320206012274021e+00
+1964 3.9483255531113609e-01 9.9225386356683798e-01 8.9705762781732745e-01
+2923 9.0058556756842023e-01 -1.1936810340401516e+00 -1.0545192214142789e+00
+1148 3.6126069564487218e-01 -2.4717776630566834e-01 -7.5202483272646670e-01
+738 1.1531180335262523e+00 8.4078445679281077e-01 2.1474231674296124e-01
+1523 -3.0373690174092513e-02 -1.2247770565859744e+00 -2.6398603970934043e-01
+2765 -3.0084286347107703e-01 -1.6827821697763705e+00 -5.4478299352682069e-01
+1696 -2.8829709912710483e-01 -1.2978722980714901e+00 4.5135776786823134e-01
+1359 8.6367103128388389e-01 -1.1609995689064589e+00 4.0789584119437694e-01
+1024 -1.7756895618508877e+00 1.5248225114350420e+00 -3.3260713443985200e-03
+183 -1.2831821681191378e+00 -4.5470860582610789e-01 1.1495449770165882e+00
+585 -1.3854120702993980e-01 3.0137049966531892e-01 1.8033692507991386e-01
+1220 -9.4585406925267790e-01 -1.1079508853203286e+00 -8.4286548848658560e-01
+1412 -9.3816233708512131e-01 1.9120680132387591e-01 1.4699034707718779e+00
+1764 -9.1301101032556031e-01 3.9258546206488520e-01 2.6431256297921035e-01
+2450 9.0198089566874184e-01 8.4292790069739387e-01 4.1406179766461798e-02
+1023 1.2943341653992451e+00 -2.6964012538870317e+00 4.8620891127296778e-01
+2370 -1.7980099320060170e+00 -9.3052317643705851e-01 -1.0268951732313759e-01
+1896 2.3591610673049392e+00 -1.0704217202708326e+00 7.2062187681461864e-01
+2767 6.9385920561905831e-02 1.0506955528319117e+00 2.2757031566201930e-01
+950 -2.4670462822424638e-01 1.2347452405488921e+00 -1.2676686133552260e+00
+2065 -4.2093564690733803e-02 3.5148000656154244e-01 -1.8471519929381151e+00
+1798 3.4326525258175167e-01 -5.9055433632644760e-01 1.2825174231925973e-01
+341 1.9894013447548091e+00 4.1508951921007131e-01 -1.2047542186126685e+00
+1407 -6.7061020051503084e-01 1.2686140675388407e+00 7.0680691797215878e-01
+2463 1.1841154936851672e-02 1.0303670646922956e+00 -3.7122669820510296e-01
+2819 -5.5032792313978307e-01 -8.4556567004047833e-01 2.1499287353812843e-01
+2126 5.0466122547823578e-01 6.9297880534208223e-01 2.3027524857852322e-01
+532 -1.1753372063951659e-01 1.6871500655844920e+00 -1.1051748858475270e+00
+832 3.8222275541757583e-03 -1.1012082186859695e+00 -1.0900111315887069e-01
+2153 1.3949120987467938e+00 9.7503270562756567e-02 -1.9831411916210413e+00
+674 -9.8822856965284450e-02 -1.1484943584127059e+00 7.1160708922196225e-02
+44 -1.6695421121771789e-01 -3.1001415660159670e-01 1.3202939677591791e-01
+560 -2.2644371666667436e+00 -1.2955709883264116e-01 1.1129190845953607e-01
+786 -5.0252329662639483e-01 -1.6410265429668800e+00 -2.1435858422095680e-02
+2736 2.4186462133849425e+00 -5.0662680871551380e-01 1.5113547313990201e+00
+583 -2.5244380222634444e-01 -2.8052873822909152e+00 1.4278513955500147e-01
+755 2.2348430896888616e-01 2.4912463223972930e-01 1.4503143536881806e+00
+2823 8.0871057311283157e-01 1.8055211204131474e-01 -1.8572152991095278e-01
+2215 -1.9840210469909536e+00 4.1801919258118053e-01 -5.1106188048010259e-01
+148 3.6121686885154734e-02 1.1863560322123421e+00 8.1028527451638632e-01
+1887 1.2955973963090992e+00 1.0276438478668979e+00 -1.0236508098326493e+00
+876 -1.0137656157157209e+00 -3.3129151046631000e-02 1.3114150759035603e-01
+1063 1.1415161707766397e+00 -1.4220083795826968e+00 -1.2123722165643072e-01
+2000 1.8310259474383392e+00 -5.2729331802233059e-01 -2.4346985561752379e-01
+2668 -8.9162783800172085e-01 -6.4366129819895213e-01 2.4737468628830817e+00
+2491 -1.7780550803694213e+00 -4.5103656851290180e-01 -3.2458406399124867e-01
+1385 -9.6617837933375450e-01 1.5409893305023312e+00 7.9047241172012095e-01
+2994 -1.3360929707734039e+00 -2.5740809885775484e-02 6.1169027537387377e-01
+1073 -5.4177735327962395e-01 -3.7914156704590279e-05 9.8374030286759828e-01
+2297 3.5024221130034078e-01 -7.2588795400549400e-01 9.9339584140501724e-01
+82 1.2258048150311589e+00 -5.0396113126243938e-02 1.3666310914067146e+00
+2945 1.1123548552711147e+00 -5.3864784449516256e-01 3.1512548199283114e-01
+1069 -8.5338346165274659e-01 9.3872382025005785e-01 -1.8416520596003045e+00
+1849 -1.1081723153109149e+00 -2.0575775833986024e-01 -3.2041697452671997e-01
+2406 2.4068966252042877e-02 -2.0390622480667170e-01 2.0224044950761617e+00
+186 3.6399324664911092e-01 2.4241043751700193e+00 -6.3229577874550713e-01
+491 -1.0706348232017588e+00 8.9856503749145522e-01 1.5696122495789397e+00
+1456 -6.7389993554709882e-01 4.5497297428239172e-02 -3.1833982480376810e-01
+2498 9.5352018597331334e-01 -2.8871444134261315e-01 1.5165218127344040e+00
+2562 -2.1174201488445439e+00 5.5371549511580687e-01 -4.0295563711882654e-01
+86 1.0560580233265300e+00 -5.0467370736565736e-02 7.6978382825144864e-01
+2897 1.2478528233129800e+00 2.5141654051587575e-01 -1.4862946648203414e+00
+2112 4.9840891724410052e-01 -3.7123925589898465e-01 -1.1298868997953952e+00
+2026 7.9826950760107152e-02 -6.1420876214254583e-01 -1.3123985706685100e+00
+2189 -9.5103238795093381e-01 1.1318789676927001e+00 6.7998905230782758e-01
+1993 -2.9272687113520912e-01 -1.0546161900333435e+00 -1.4863329978974764e+00
+26 9.6943059816696175e-01 -5.9900661682452661e-01 1.3755451416413553e+00
+2818 -1.4008436299437570e+00 2.6460242616390763e+00 -1.7083741875211327e+00
+1587 -4.7293240511613527e-01 9.3297451552225286e-01 -1.4884702801256817e+00
+1258 4.5342627934454699e-01 -8.4846056303741368e-01 -3.5341894289410453e-01
+2379 2.3846541067238562e+00 -2.2169478893202310e+00 -3.5919261983458894e-01
+2174 1.9014589662002828e+00 -5.2001414814182623e-01 1.1259526070266177e+00
+1017 3.0735827087053935e-01 7.8733407283331514e-01 -1.0848833718267274e+00
+2870 -1.0522558940742135e+00 3.7208304129933695e-01 -5.7961365997004410e-01
+1471 -7.4234384140725862e-02 -3.1939741250006204e-01 -1.4603434432560469e+00
+1981 8.2100296792814320e-01 1.2722586893068728e+00 -4.2130778396791801e-01
+1351 1.3362619738665320e+00 -2.8914398924692042e-01 6.9413186845879127e-01
+2043 2.1785905950605877e-01 6.9244730051231343e-02 1.6372626678769460e+00
+2901 1.3756509483249317e+00 2.0140751969242188e+00 8.5996395622364785e-01
+1952 -2.6702193760274245e-01 -1.0901093838023008e+00 3.4408413347052058e-01
+2984 -1.3568983534685459e+00 -6.7242442792798174e-01 -8.8817601490135056e-01
+37 9.0872134841561425e-01 6.4062472996871722e-01 -2.4179982438306960e-01
+407 1.3145856049615157e-01 -4.9319539305383980e-01 1.8294237454621892e-01
+1264 6.3067035318861031e-01 -9.1644758615158839e-01 4.2599837902587490e-01
+572 8.9625649720260436e-01 -5.5162535416042685e-02 -1.9387970625590059e+00
+2261 -6.8450792630354418e-01 5.8532838562027323e-01 -4.1496956633695720e-01
+1943 4.0671626279828554e-01 -8.7584318893893554e-01 -7.8931435795641136e-01
+677 -1.5778573691673921e+00 -1.4453457521717758e-01 -1.5487453836145118e+00
+781 -2.0842779445245769e+00 -5.6950691332399994e-02 -8.7907136641041911e-02
+273 1.4496232701366349e-01 1.4288776875267266e+00 3.9208148696770800e-01
+2291 -1.4523042079910742e-01 8.9668054570455369e-01 1.3728549210711321e+00
+986 6.0093415209579293e-01 8.4994973138740937e-01 -4.5432000690324686e-01
+945 1.8543720166569547e-01 1.2189364934703235e+00 -4.1370136974845173e-01
+910 -9.8921689724131734e-01 7.3866930566856159e-01 1.7860843662760719e+00
+2607 -3.0705252566198400e-02 -2.7620761413990114e-01 1.2680129009717944e+00
+854 1.0338104339004948e+00 -2.1677481782484840e+00 1.2776522453078489e+00
+2931 -9.4221182936084183e-02 1.5256440204019426e+00 -6.4528461685560790e-01
+1144 -4.3963731185362141e-02 -9.6765860578115681e-01 -4.7668178554012341e-01
+477 -1.8032380460171660e-01 -1.1677172993862708e+00 1.0624799520653421e+00
+2318 -5.6520281663590333e-01 3.2057974819327828e-01 -4.9000523626003700e-01
+1259 1.0498694050209780e+00 -1.1656594745355626e+00 -3.8474042452236956e-02
+1621 4.7292639391514418e-01 5.0626943855307160e-01 -2.4982480012166337e+00
+1054 2.5768597647820196e-01 1.8286378021058092e+00 -1.3023081410634263e-01
+1421 4.3145051970816306e-01 -3.7430356624462446e-01 -9.2127556486869211e-02
+897 8.6447329207757539e-01 1.0358031671465775e+00 -3.8999346134150914e-01
+2851 8.5596490468332431e-01 8.9885580808826548e-01 -1.1233664427761405e+00
+1809 -5.0017075915839271e-01 -8.6588124486619833e-01 5.1655371620001900e-01
+100 -4.6571433103936299e-01 1.2866199220323771e+00 -1.0675389831308673e+00
+2175 6.8137399114533648e-01 -1.4450348379622338e+00 -9.3301773839527466e-02
+138 -9.7096254988070463e-01 -5.7993061394279488e-01 2.5205690317828435e+00
+2482 -9.0597199665448158e-01 -2.5152110818229496e+00 -5.9521775405937838e-01
+547 3.7252863278675014e-01 1.8740898485281550e+00 -8.3839130427942754e-01
+2019 -3.5032666358701553e-01 2.3786171128317524e-01 8.0290399474748725e-02
+2831 -6.9201765996952203e-01 -2.2121164659991082e+00 -8.2696331554536662e-01
+240 1.1020169129124964e+00 9.7875293720307199e-01 5.6353340215126690e-01
+1971 -8.5306577044260645e-02 1.0320038366481228e+00 -4.6544730018512914e-01
+254 1.2994499873930621e+00 1.9790292136323995e-01 6.6782774137117595e-01
+307 3.9241918950297661e-01 7.7706077506577143e-01 -9.1387179311909073e-01
+842 -1.5410250014475841e+00 -4.0095702620116841e-01 -7.2429333258257533e-01
+2369 9.8157764778159073e-01 1.4512170034847149e-01 1.0348420365925508e+00
+85 5.5444698033958562e-01 7.2464807180226423e-02 -5.8483654197614465e-01
+2916 -1.1608523652321059e+00 -1.8807942141961915e+00 -5.3154856650206028e-03
+468 1.7984608353704534e-01 -6.5508440294196046e-01 -1.3602255934871310e+00
+255 1.4680233827223930e+00 1.1119318409471757e+00 2.4931835073044700e-01
+2996 2.3888054846047099e-01 -5.1012905085367088e-01 8.5891750700577707e-01
+268 -1.7496084806708694e+00 -1.7405303584147320e+00 1.5345436137770505e+00
+360 1.5799738592916464e+00 1.8135171195253291e-01 1.8842185952139637e-01
+646 1.9049623700279059e-01 1.6405072846580728e+00 4.0966632487603960e-01
+2021 -1.3061457092944841e+00 3.1398821154154488e-01 6.8148138775040423e-01
+390 -1.0594375269766749e+00 4.3490757836190613e-01 -6.4742478863610309e-01
+115 -1.2517494844378616e+00 -3.8547374782341981e-01 5.6808656429509741e-01
+1883 1.0818713089981675e+00 3.5256543223449338e-01 -3.4781170667754208e-01
+790 1.6456353465291846e+00 -1.6566568268215724e+00 1.9449990049802401e-01
+2921 -1.0993425940631332e+00 -3.6863375225814154e-01 1.6277561124063650e-01
+2230 -8.0857730665153421e-02 7.7622200068349434e-01 3.2887402001616267e-01
+882 5.7900237846718994e-02 3.3826152501672002e-01 -3.3210161736300745e-02
+602 1.0483976594870934e+00 5.3538722603327860e-01 2.8085507893976391e+00
+535 1.8671545383887350e-01 5.3429691980433319e-02 1.7292983897942105e+00
+2226 -1.1399598703447771e+00 -5.1152341449091887e-01 9.5316494249814365e-01
+1744 -4.8701400250142229e-01 1.4065891126093346e+00 -3.2199070332228019e-01
+223 4.5102957867532073e-02 -1.1210416842494773e+00 -4.8649568039184266e-01
+892 -2.0407656411512284e-01 -3.7564799994656001e-01 1.6796162781121811e+00
+505 5.9614993630778657e-01 -1.0781451266024145e+00 -2.9609308443350740e-01
+1047 -1.0611982192035738e+00 -1.4508139915386968e+00 4.8075092114653528e-01
+2731 8.4438382284660884e-01 4.3613684677423303e-01 1.1822761164577460e-01
+529 -9.4475751601749858e-01 2.1291875593174590e+00 4.9934318416516904e-01
+131 4.9224421561572046e-01 9.7792253886291514e-01 7.4052213712433912e-01
+887 -1.0586818698421374e+00 6.2906504126507523e-01 -9.4522372034884505e-01
+1253 -2.6968338671892913e+00 7.7488225286661028e-01 8.6465307392442947e-01
+2612 6.0218294131927907e-01 3.8620340662620944e-01 -7.7655617398181498e-02
+495 -1.0248918629752806e+00 -2.4005460269395246e-01 6.6461456809062042e-02
+1176 -9.4060631936097416e-01 -3.5246192434001500e-01 1.9419876322454274e-01
+287 2.4050284811543547e+00 8.5373384623376114e-01 -8.3201629533389643e-01
+989 -3.2820165521332895e-01 -2.5722473646124433e+00 -8.4009457818994743e-02
+416 -1.5343342592256426e+00 -5.7304530649705121e-01 1.3661242545335894e+00
+1061 -8.3040586318882825e-01 -6.1692382176226634e-01 4.6205360486129493e-01
+1513 -4.8724533859656716e-01 3.4347622779805587e-01 5.4123547685772322e-01
+2461 2.1857445845254539e-01 -4.5142231258271398e-01 -1.2919747348191881e+00
+719 -2.1425004496840319e+00 2.1919991262159471e+00 1.1782078096022783e+00
+1598 7.9785957490062787e-01 -9.0356516720390900e-01 -1.6644966288392127e-02
+1439 -1.3062705227017080e-02 -1.3896866313637064e+00 6.0849850973587638e-01
+1661 -1.5446053612854954e-01 4.6327762052814475e-01 -2.9310888982915739e-01
+118 3.3604347883088548e+00 -2.4892825694969334e+00 -7.3480607434821510e-01
+1732 1.2409020383785718e+00 -7.8077821492410326e-01 2.9148431720795570e-01
+2386 -3.2087747189636073e-01 6.8079766945614995e-01 1.8056614246472005e+00
+637 -6.3855029762201510e-01 1.2627838630919197e+00 1.9922958864496425e+00
+1079 -1.1952021203864166e-01 -1.1514836232003054e+00 -4.6432836945714445e-01
+286 1.4076762146261128e+00 2.8075454708127223e+00 -1.5955231306637827e+00
+2514 -6.7384230514113563e-01 8.9980954621791787e-01 -3.9542994326609049e-01
+1718 8.9788477515019927e-01 2.2225682232847515e+00 1.2472706404749265e+00
+949 8.2488604166094381e-01 7.5565110081264508e-01 9.3951559283590169e-01
+2025 1.7976889829921455e-01 1.8106598299979385e-01 -1.1908466052035123e+00
+2020 2.4672841944304302e+00 -2.1616803766791435e+00 -2.0411295865909740e-01
+388 2.8458773704424511e-01 7.8577533238760022e-01 1.1125406299655534e+00
+1502 -7.2646153768610910e-01 -1.4488738286655332e+00 -4.2029072584160443e-01
+2137 1.7980983751399224e+00 -9.1022419435570087e-02 1.0016466846653468e-02
+2183 -2.9624690175172008e-01 -1.6136237765158077e+00 -4.5630868474905334e-01
+2658 8.6993926690001888e-01 6.0156583828210319e-03 -4.8338960622248066e-02
+2983 7.9925108712999193e-01 5.7894583402931754e-01 9.2291899454298709e-01
+1828 5.2855728134349811e-01 -8.1549730042777588e-02 1.6553307056239999e+00
+1729 2.4140095602214351e+00 1.0041457117425137e+00 5.8993878036865399e-03
+2624 -5.6537994665642788e-01 9.4655522669954362e-02 5.5319320768393643e-01
+1525 1.0235471573177441e+00 -4.9751902574645918e-01 5.9314498676958205e-01
+2337 -1.1258543602525932e+00 1.6164860856058172e+00 3.0542773535611450e-01
+323 -6.2344250375148680e-01 5.3618449496495058e-01 -1.1304061411995110e+00
+2900 8.0586742080716423e-01 1.8862412658036274e+00 6.7414041281439574e-01
+987 -3.5819138382733806e-01 -5.6132888185192120e-01 -5.2115216367156669e-01
+906 -1.4083532918165900e-01 1.3342541244295303e+00 -2.6353534906397863e-01
+2339 -3.9910413434129050e-01 1.0228238885365866e+00 3.2211560291842367e-01
+2905 -1.6988397349875899e+00 4.9041883069060721e-01 8.0097278713046949e-02
+1646 -8.5622056810846836e-01 3.6315510296620507e-01 -1.0421115337856990e-01
+1867 -1.6701870080313186e+00 2.0248517105442151e-01 1.4520921439147614e+00
+649 2.8990387459336253e-01 -6.2637613566904005e-02 2.3073327809976754e-01
+1532 -1.1036242622221395e+00 1.2827561795770197e+00 8.0943735211452861e-01
+1338 -1.4097518077396384e-01 -1.0835334693810688e+00 -1.1019290654377920e+00
+2466 5.7771593995403647e-01 -7.4328241070494183e-01 1.0565752759374289e+00
+1925 -1.2138080253710964e-02 1.5775689744989066e-01 -1.5503462915889064e+00
+724 1.1766027840057007e+00 -1.3312895575875150e+00 -4.2197586148045368e-01
+395 4.5891379346855821e-01 -1.7282995186515688e+00 -8.6514809488790567e-01
+2402 9.3685027059648274e-01 -3.3939404399068007e-01 4.1544304351913519e-01
+1779 -1.2586973398484143e-02 -1.7918330323751583e+00 -2.6512777070192739e-01
+1980 -1.3756215518614652e+00 -1.4550190191868118e+00 -1.0974142021052151e+00
+1521 1.1448060719398010e+00 4.2147249384520658e-01 6.8866120741602688e-01
+1357 1.0070332297204474e+00 -2.4001799150155798e+00 -6.3985665363630562e-01
+993 -3.5050831692530443e-01 -7.9405441606516824e-01 1.3338353272907252e-01
+2128 1.4466291171737555e+00 -1.2543648845335600e+00 -7.1586100959465149e-01
+2713 1.5231239194531112e+00 -8.5124771704552890e-02 2.1704502951472909e-01
+448 -1.0633190746050087e+00 -1.4475635879690882e+00 8.9810217839524101e-02
+2127 -1.9869431875601992e-01 -6.9750346681924313e-01 -6.9045305622198280e-02
+553 -1.1971849322332482e+00 -1.1738009769829290e+00 4.7471526010896392e-01
+2177 -7.0509868404459475e-01 -4.0590767962153212e-01 -2.7001576779417596e-01
+279 -2.5156613326018740e-01 1.3386926538306150e+00 -4.8776645327897550e-02
+1776 -9.8808769316447842e-01 3.3593115593487882e-01 -1.8373572508033043e+00
+2196 -8.1425014322475520e-01 -3.8242826804091601e-01 2.4630611896965506e+00
+1109 2.0581386913483866e+00 -1.0915067841876340e+00 -1.2953679559657456e+00
+2796 9.0719744856172246e-01 -4.0780741484023852e-01 4.3042580427391863e-01
+2125 1.4557416133057680e-01 -5.8760616023579026e-01 -4.2560307658783664e-01
+2400 2.9337420654688344e+00 4.5181293310301052e-01 5.4895963979776374e-01
+430 8.7378255769761948e-01 -1.0427158659058369e-01 4.3098482761893853e-01
+846 -1.1717649419807510e+00 -9.7159580106291266e-01 -3.4576068765723522e-01
+1316 1.6345712581971175e-01 5.9248125822321307e-02 1.7019722517488876e+00
+1578 2.6375763135799102e-01 -1.3183208179064831e+00 -6.1296154322167662e-01
+1422 3.6707123985466195e-01 1.8777909488679798e-01 -1.2307527838320711e+00
+1975 -4.6908030366612896e-01 1.1400240065216787e-01 1.0093239198154610e-01
+1336 -1.2782501844335156e-01 -9.3012672957711395e-01 -1.0443993942525494e+00
+935 1.1944523247128302e+00 5.3202179935851912e-01 8.2375160718627638e-01
+2193 -7.1924609633855519e-01 -7.3495455152010414e-01 -1.4414332415337918e+00
+1550 -4.0068062621422684e-01 8.0877251119267446e-01 7.2511819458716265e-01
+873 1.3975470611365990e+00 -9.8151880668419722e-01 6.1238141307455352e-01
+2365 -2.6692991439204466e-01 1.0339787945306036e+00 -1.8888549869375126e+00
+1249 -2.4210883696140417e-01 1.0544822443577528e+00 -2.2643978529809872e-01
+1790 7.2735457127924197e-01 -8.1036262919422453e-01 1.3869904678495684e+00
+1146 -3.7622016695694893e-01 5.4360591172480532e-01 -9.9200951205140075e-01
+242 6.7788087790541962e-02 3.2133706751254726e-01 1.6688379592121327e+00
+1689 -1.7860928235281508e+00 -9.0512551125792351e-01 6.9417069988236846e-01
+2411 5.4239361190171675e-01 -6.4019586964367570e-01 -2.5284134469723218e-01
+1606 -1.7519275808174881e+00 2.4422789480975315e-02 -1.5152722186569170e+00
+1209 5.9246672379989473e-01 6.5902850012478797e-01 3.8218005066215166e-01
+1409 1.3960825656174232e+00 2.3902847209190128e-01 1.3366858795889487e+00
+1811 9.6171708871042882e-01 2.2968287013227116e+00 1.3338728794342898e+00
+1719 -4.5144195963732336e-01 1.2865293029016498e+00 -1.2426427811666558e+00
+112 -7.3791511151279188e-01 1.0866707777835141e+00 -1.1303647315945349e+00
+2743 -6.9738635991887532e-01 2.7756053096541091e+00 -7.4100219052737981e-01
+2951 -4.9471026785228045e-01 6.7367997814866937e-02 2.7770098202558419e-01
+2936 -2.6089951817883594e-01 -6.0655129071906635e-02 -7.3933315654066489e-01
+2808 1.1670577460241005e-01 8.8141463583374782e-02 -1.3834477126293170e+00
+2211 2.7934983889385911e-01 -2.2145560242155596e-01 1.8515626097089435e+00
+1464 -9.7406935535860095e-01 4.1143076666741263e-01 -8.8955906361251758e-01
+2123 -5.2210506635960630e-01 8.6987187518942022e-01 1.5011114691071703e+00
+2804 2.0715606631453767e+00 -4.0541100544785391e-01 1.2989035681259724e+00
+231 -2.5971916596598976e-01 5.7300245119410653e-01 -6.6265785177617209e-01
+1105 -1.1174727650481462e+00 2.9514940676943119e-01 1.2553071612980358e+00
+2069 -2.0686358614153569e-01 -2.3136873267190583e-01 -3.1485204643643411e-01
+1731 9.0946158168882574e-01 6.4611030817559145e-01 -1.5530082010354701e-01
+304 -2.4537221408770926e-01 3.0656606602096059e-01 -1.6094151459887251e-01
+1969 7.6412690796474092e-01 5.7835253583093293e-01 7.4692719234924287e-01
+2805 1.2315075326702261e+00 -5.5450248044339312e-01 -5.5258720785460569e-01
+2963 1.3228213343443587e+00 -8.6110615108460853e-02 -3.4769803439074731e-01
+1046 6.3670918956336175e-01 3.6780812876272601e-01 4.4865837868649416e-01
+1963 3.3737896358036518e-01 1.8034657147903632e+00 -2.3788142393667358e-01
+377 -5.8399615897531643e-01 1.0691671653444985e+00 -1.3303448514790939e+00
+419 4.7738629812766820e-01 8.9322725496452060e-01 1.4276641471676577e+00
+1685 -4.6964509760787077e-01 2.2282294368663380e-01 -1.4485831854341020e+00
+1539 9.1957203347407146e-01 -2.5915962787399061e-01 8.3050191280740049e-01
+966 5.8446293433879123e-03 -5.0899517984961007e-01 3.3986374965707444e-01
+2331 -3.4955281299791557e-01 8.7404175127024653e-01 -6.1242104519375340e-01
+1726 -1.1237896310250977e+00 -8.1570328323593899e-01 -6.4441612121611824e-01
+874 -1.4245722782670958e+00 -5.5000355979488680e-01 1.8115872173062488e+00
+1527 -7.4441620244978066e-02 -6.4708720129805675e-01 -1.0536611619243239e+00
+1664 -1.5932365251030784e+00 1.1247746068440210e+00 -2.7240710752909858e-01
+1268 -7.5751109303165665e-01 -3.2783736335505043e-01 3.2535469141124235e-02
+2384 9.8439402797311792e-01 1.9947216939959138e+00 -2.3483998036056530e-01
+326 3.8498896653842796e-01 1.2606279861971537e+00 -3.6648862809372318e-01
+2423 -5.2141410220354312e-01 1.9635239895767023e+00 9.2763150988396692e-01
+2650 6.3821743817095056e-01 -2.0576120308088031e-02 -6.6183490871601924e-01
+1821 1.4193382478727463e+00 -1.7040396737730956e+00 9.4846557227378914e-01
+1354 -6.6008439627205651e-01 -1.8965734256977840e+00 -2.6285937266884285e-01
+2231 2.6027576885977333e-01 1.0036946022415165e+00 2.5303158267393833e-01
+1120 -3.3307557221253620e-01 -6.5703728444286424e-01 4.9793319193865959e-01
+288 1.2448511768189097e+00 -7.3897071910915524e-01 -2.0261713234350745e-01
+1393 -6.0803546763551319e-01 1.8101007420936241e-01 -1.1190258427699606e+00
+2647 3.7614545591995285e-01 3.9308409739152844e-01 3.1033287544437888e-01
+1610 1.3109646633119119e+00 -3.1460150898516379e-02 6.9884365644604796e-01
+1745 7.5686370297848971e-01 2.1242115610972248e-01 -1.7404415267480047e+00
+2618 -1.0517820853121032e+00 -6.1887455673477088e-01 -1.8539402936979307e-01
+2503 -7.3366119201429214e-02 -5.2306328770027710e-01 2.0054633562379993e+00
+2801 -2.3359789023008326e+00 -4.1975791614229629e-01 -9.0744838830738239e-01
+2826 1.0662039830307222e+00 4.6785759747884836e-01 4.3716687062680354e-01
+1584 6.4570110649802015e-01 1.1212237465395578e+00 7.6108156647906558e-02
+1573 -6.4145880401037991e-01 -3.4955337152434290e-01 -3.7784339898479424e-01
+2114 -4.9075611348624731e-01 -1.0302865143219913e+00 -2.1456953370574223e+00
+1979 9.6049876896754938e-01 -1.5815782697583860e+00 5.5529503779334355e-01
+1185 1.0495902696733868e+00 1.1018751907035587e+00 1.1398206650130114e+00
+2024 1.1683878794834319e+00 -1.6122113477667338e-01 -5.1889929170752924e-01
+643 -8.3461396491660922e-01 -8.4352491017350451e-01 6.8498576877222495e-01
+216 1.1493660810730315e+00 -9.0940128095570338e-01 2.3508406645811289e-01
+355 3.8113032600812230e-01 -1.1962483741823098e+00 3.0736364000379290e-01
+696 3.2520807111700245e-01 4.0907472471725614e-01 1.0302315427455468e-01
+1531 3.5421229397682046e+00 7.3237301263804677e-01 -7.9674239237488864e-01
+548 6.9116328816758416e-02 -9.6365038842120720e-01 1.0867326131710158e+00
+2218 -3.0572574249859152e-01 8.5489616978088698e-02 4.3127983284572052e-01
+2203 5.7349978847714445e-01 -4.9181688318066977e-02 -1.3255670592425703e+00
+871 6.5439360419344617e-01 7.8638265431495824e-01 2.0490215109689234e+00
+2748 5.5503384036299075e-01 7.6155630658642959e-01 1.9552791685660373e+00
+1482 9.2359305423361082e-01 9.0314861040691852e-01 1.6306948808755037e+00
+1330 6.3735003259550005e-01 -3.0208853191263491e-01 -8.3776056108994446e-01
+308 8.4904610189726681e-01 -1.3837558221500212e+00 -1.4419182889947160e-01
+1948 1.0712606841398191e+00 -2.4768744389901882e+00 7.2802037297189215e-01
+2998 5.0511675059210170e-02 6.9090195405674582e-01 6.3469321796932909e-01
+665 -6.0473215087536436e-01 -5.6952244202943858e-01 -8.3512490766163905e-01
+2930 1.2046408967616506e+00 -6.1531072092071301e-02 3.7666069696563026e-01
+2683 -3.0871652345175843e-01 -3.3430422710854357e-01 -1.1959205791373038e+00
+1920 -5.0278130973304569e-01 6.7491040578299766e-01 4.8370868905225317e-01
+2644 -4.8361912849684108e-02 -1.1448894145948207e+00 4.4621426806775921e-01
+190 -1.8125158633856908e+00 1.7773217591213823e+00 -1.8013960636659870e-01
+2097 5.5022751150034155e-01 -3.8623495024248911e-01 -6.2773935255780056e-01
+2877 -6.2096267250828363e-01 1.7535050250791231e-02 2.6819290046278588e-02
+156 -4.1875857977910302e-01 4.2451402158462770e-01 5.9157296748054877e-01
+2828 1.0711094480794618e+00 6.1796533050280733e-01 -3.9042412632582379e-01
+2962 1.4116468721337585e+00 6.3013672402262655e-01 3.3002435546685938e-01
+1921 1.0668985935631112e+00 1.1021933332607705e+00 1.7212776492575743e-01
+1789 -1.2366864720056969e+00 6.9512587515466717e-01 5.7114601405651222e-01
+501 6.6428978202405578e-02 -5.0805299279492955e-02 1.2954727827742962e+00
+2711 -1.4746489522623325e+00 1.3544488029701476e+00 9.2984522383576662e-01
+2786 -1.6570461471893985e+00 7.6954012904582503e-01 -1.3126146769020761e+00
+543 -6.9896060570547203e-01 -1.4462862084900779e-01 -2.6395683024223354e-01
+1505 -2.6663348347137983e-01 1.2148096828874113e+00 -3.3723384196459616e-01
+944 2.0538433628449818e-01 -2.9232657753592850e-01 -1.0411923827010838e+00
+1214 1.4604531346543714e+00 -9.4004384739556346e-01 -8.6496305292060560e-01
+1643 6.2956235270197947e-01 4.0764682425605359e-01 -5.0965382697628991e-01
+534 1.2273542136123066e+00 1.2138055413693381e-01 3.3030715212758044e-01
+1623 4.9444380127675031e-01 1.3975261936183405e+00 -1.4528457466456619e+00
+2413 -1.2450414257358533e+00 5.6792859657784134e-01 1.3806737007886621e-01
+749 1.3079302359005500e+00 -2.0741771115148475e-01 -6.9690403039909565e-01
+1514 6.8193768993715342e-01 1.6031002253664213e+00 6.3778116017830022e-01
+2012 -2.8463769441609776e-01 -6.9962962612999147e-01 -8.3521021684655605e-01
+1572 2.6321803988929676e-01 -1.6271549049924602e-01 2.2659729951235169e-01
+2305 4.4213798733892512e-01 -1.3441733427086140e+00 -1.4218389355193470e+00
+1629 1.1265134256712726e+00 -4.6064890690149501e-01 1.7758297445394045e+00
+530 5.0873482717113416e-01 1.2494350368175024e-01 2.5097734594763954e-01
+2390 -7.4580200505574523e-01 6.2559907058928310e-01 -1.0488482534012600e+00
+2517 -1.1252491253391304e+00 -1.9437319707426490e+00 -1.0047669140947807e-01
+759 -2.0995093254096975e-01 -3.1925248670678696e-02 -1.0727970180953226e+00
+1159 -8.7478618041365919e-01 -3.1809732024350679e-01 3.3629943360958947e-01
+605 -5.3523124104678665e-01 1.0310700190932409e+00 -1.6377485274819921e+00
+840 -6.4471044710168279e-01 -3.7688523952437930e-01 1.5950998159298950e+00
+1033 -1.0842945380553908e+00 1.4120487465442260e+00 -8.3923069000863681e-01
+2439 -3.9299134064355079e-01 2.7540380013365867e-01 1.3672042235439841e-01
+103 -9.6320868651846858e-02 -7.5042152351551372e-01 2.5325116074047171e-01
+1446 9.1171877767500839e-02 1.7166166843346808e-01 6.0198847406012879e-01
+1580 1.7098891067756057e+00 -5.9109741325194454e-01 1.3767801648278952e+00
+1151 -5.8614370278405847e-01 -1.6681750557398939e-01 2.7650515112876133e+00
+317 -7.6087023206326010e-01 1.3510983528037979e+00 5.4050742143578401e-01
+417 -1.3499884874520054e+00 7.4846109616899581e-02 1.4439337645963404e+00
+2745 -2.1286498073399765e-01 -7.6337827435585437e-01 3.6246510054100295e-01
+1758 -1.2824969160462951e+00 -3.7341280221875789e-01 -1.4106497162449754e+00
+2989 -2.0847020712987416e-01 4.2040075170503982e-01 -1.7152778132258959e+00
+2078 1.3539395262005853e+00 -4.5617364882333439e-01 3.7339042626283298e-01
+624 6.5971163251959131e-01 7.0014339876055676e-01 8.0266077268747105e-01
+447 1.6009326794091810e-02 1.3241474983573005e+00 -2.4785631676142789e-01
+1212 4.9446077978434852e-02 7.5869331180103528e-01 8.2758468978912791e-01
+2895 6.3474153973870606e-01 4.3898538932926540e-01 -1.6845809334190645e-01
+857 8.5448916277583753e-01 2.6545893112472525e+00 1.2927285303576499e+00
+99 5.1498536442414999e-01 -1.9758933972637963e-01 -1.2506479459683262e+00
+1233 2.2959149173384524e-01 9.1371120585226062e-01 9.0777579697006705e-01
+2115 -2.1045097120289764e+00 9.5848332224401123e-01 1.1365027073645808e+00
+1240 -9.1830550817818368e-01 5.8439299270056444e-01 -2.8232666753572888e-01
+2368 5.3630636977124191e-01 -2.9016450244524206e-01 -1.0950417460971731e+00
+372 5.8460608487200061e-01 7.8033780524881813e-01 1.5430814629087929e-02
+1020 2.9006999506424985e-01 -1.5340927590684533e-01 -2.1087676471201569e-01
+2308 -3.3352491570647916e-02 -5.7712897861638712e-01 6.2749920462852193e-01
+483 2.4658602331387597e-01 6.0054665383139860e-01 -9.6704306960073794e-01
+2911 9.1223444600285941e-01 2.2732473988060373e-01 -3.8427230030922443e-01
+1382 -4.6022383127597144e-01 1.5909632823852486e+00 -2.1869685571132885e-01
+2575 -5.1181766254775174e-01 5.1182564290652466e-01 1.1053751475520694e+00
+1666 6.8994881896918925e-01 -1.3133763280923216e+00 5.3407005246138461e-01
+2620 -3.2406562258088850e-01 7.7684093579194535e-01 1.7745613869611205e+00
+1213 8.1600497953357265e-01 -8.1570987788428051e-01 1.1960423726704357e+00
+1988 -2.6158570716250917e+00 2.4100655500170225e+00 -5.4958830873520059e-01
+819 7.3166625481536651e-01 3.6961127720502862e-02 9.3517737867481310e-01
+2799 -4.7580629472733793e-01 -3.2506968696489358e-01 -1.2865011136068023e+00
+1757 1.4654079931615499e-01 3.4067555374848335e-01 -1.5104540033139839e+00
+1511 2.4258501318797240e-01 -7.1065138531513791e-02 -4.1133032652306478e-01
+2679 1.2829425178797436e+00 -1.1979090770112322e+00 -3.0931377424623363e-01
+2770 2.8817410549503281e-01 -4.4982706926908844e-01 5.8611553286691009e-01
+200 -2.2945888466065378e-02 -9.7786083688900360e-01 8.6553424265578438e-01
+1461 1.0223872123268479e-01 -1.3833327415313552e+00 -4.4358775383263943e-01
+303 -1.4386407377223003e+00 1.3775774909582153e-01 -8.4610370416992620e-01
+510 2.8858917163098669e-01 1.9308117597875218e-01 -4.2788796387108097e-01
+2121 2.0498573490909586e-01 5.2324082005962724e-01 1.1026746136785166e+00
+601 2.1481675189014853e+00 -5.3116222265700452e-01 1.2362314809374777e+00
+2567 3.8143645091916245e-01 -1.3559476617115849e+00 -3.4347670689449206e-01
+2286 -2.6735952766642268e-01 -1.1477182720908718e+00 1.4264699269633771e-01
+1103 3.0573799138160596e-01 -1.4690092898158497e-01 -9.9732341164082672e-01
+1627 3.7502485495682758e-01 -6.5944194265419720e-01 -1.6775218456708834e+00
+22 -8.1953070815943052e-02 -2.5348718769370693e-01 1.3429556046130325e-01
+2896 -6.7982088344986169e-01 8.5832952093126769e-01 -2.1450151619951279e+00
+1215 1.4792128285598061e-01 -7.7422952450155735e-01 1.7466098067770870e+00
+1441 1.4034069412659644e-01 -9.3814744029663677e-01 2.9239181829421468e-01
+1982 2.9362418327039386e-01 -5.0231128117641233e-01 4.0098895427076231e-01
+2433 -3.4784830980521486e-01 1.2118414786066902e+00 1.4686829205041960e+00
+2776 -3.6747487222123582e-01 -7.1782408786819540e-01 1.5467964918337532e-01
+1992 1.1389215406475974e+00 -2.6919926346034773e-01 3.6320342149898233e-01
+2354 -1.6366587884799397e-01 7.4837892992693844e-01 7.7272729969076293e-01
+455 2.9380427484168670e-01 2.0356843201298322e+00 4.1297190798899613e-01
+462 -3.8087397869189488e-01 -1.4240174799585885e+00 5.3357784894218507e-01
+134 8.9086081944896744e-01 3.2883351828693175e-02 -1.0146977125408974e+00
+456 6.6265510272379968e-01 1.1044052947126060e+00 3.4816388770709750e-01
+2441 -2.0461645519621569e-01 7.0003761610705750e-01 -1.4511642210285183e+00
+1558 5.5710032310474511e-01 -4.5464865747351302e-01 -4.5445273766814948e-01
+600 1.1444115467215307e-01 -5.2188202792205396e-01 -1.3562755243713274e+00
+1803 -1.5657758703983609e+00 8.5846309361364767e-02 -9.7476756573678025e-01
+1395 -1.4537128056615027e+00 1.4070151820006489e+00 1.0163455437427293e+00
+359 -9.2849941605977065e-02 1.5870769522242367e+00 -1.0077251853661853e+00
+2186 2.7060411524823352e-01 2.7668887986485680e-01 -2.4851539819538337e-01
+2997 -4.6551627301459048e-01 -1.9460381485608971e+00 1.3025000694298985e+00
+1255 -6.1326034779018257e-01 -6.9716013340829636e-02 -1.7807246495140323e+00
+531 5.5090328374908237e-01 4.2216432544047422e-01 5.1783167147864784e-01
+2872 -1.5427534061222176e-01 2.7066093183777046e-01 5.7564118000956499e-01
+2251 2.4864851975157670e-02 -8.4301644052317715e-01 -2.3070201553584382e+00
+2783 9.8182016392682581e-01 -1.2660235165522755e+00 2.1560357580964953e-01
+2363 -6.4360069590216806e-01 -6.9294765116129631e-01 1.4345918584784989e-01
+2701 -2.5212392162862474e-01 -8.2511309278176737e-01 -5.4658739284951441e-01
+2425 1.2651332759618963e-01 -2.5249808665429713e-01 -4.0026264228482888e-01
+24 2.5415122078221070e-01 3.7239186542436065e-01 -1.2584910398795029e-01
+470 -1.0370343113625496e-01 -2.8440658013968623e+00 -5.8899340380417664e-01
+1853 1.4038556273491676e+00 2.8484503319011023e-01 3.1757899045152449e-01
+2600 -8.0000036341888647e-01 2.3913512178609209e-01 1.1354193877793026e-01
+919 2.9522922164128129e-01 -1.9517390663681006e-01 -6.0285190892133467e-01
+2686 2.1876938334894334e+00 -1.1254034704888394e-03 -3.6441564983516661e-01
+2659 -5.7789053058981421e-01 2.6409599328294093e+00 4.0921374593399767e-01
+492 -1.5622399177525459e-01 1.0899792210762178e-01 -1.3068313886395453e+00
+1746 -5.4133907997623776e-01 1.5837271534147062e+00 -6.0505417700508546e-01
+2403 -8.1045692343418740e-01 1.5385291075769331e-01 1.0055073971889370e+00
+2902 8.2644694142859909e-01 -2.2425075740149364e-01 -5.2884612083613391e-01
+1098 1.1139871529633588e-01 -2.4601167803576827e+00 5.4258366116844214e-01
+2329 -4.9789973574560764e-01 4.7931944925794367e-01 -5.9083765495336127e-01
+1682 -7.2627062942475273e-01 -8.0471356175432363e-01 1.7285702098691419e-01
+785 -2.8492906543288482e-01 5.8150521090908303e-01 -3.8369461185242820e-01
+30 -1.7745682593117837e-01 6.0587686043202515e-01 1.1959561320237342e+00
+1414 2.1195033631345042e+00 3.4401303733150002e-01 -1.0690885487955197e+00
+802 -5.2183112300231849e-01 -2.0031793084783538e+00 -5.6646985605551459e-01
+374 -4.6568194759979908e-01 5.5377804678218401e-01 3.4414246067154314e-01
+2159 2.2376025913270362e-01 9.5713813846138363e-02 -1.5742249296687252e+00
+2696 8.8321535469865986e-01 1.3088977186131701e+00 -7.0169269244017651e-01
+425 -5.1649859539112178e-02 5.4430937074171737e-01 -1.4262278592157865e-01
+1918 1.5815504943601472e-01 2.6200309560819770e+00 5.8051149140054104e-01
+2560 -4.7327125132811715e-01 -7.8505616311040471e-01 -5.3576049877849508e-01
+513 -3.5675833183896832e-01 2.7169393139558608e-02 -7.4840541895498525e-01
+2547 -6.2072745649528083e-01 8.6590044241072639e-01 -1.1866275881398622e+00
+931 6.2228635033622037e-01 8.3066877036237818e-01 5.2123313237631619e-01
+562 -2.5331696809137227e-01 -1.8144722945163956e+00 -1.9490257937275826e+00
+2577 -6.9598644079338867e-01 -5.4713914670571362e-01 6.8108433732150397e-01
+538 -3.2359672779077825e-01 -2.0425144726247204e+00 -7.1693422034220078e-01
+2925 -8.8337447264185542e-01 6.5209751347537770e-01 1.3421621750218882e+00
+2048 5.0190759437572752e-01 7.0042759052566939e-01 1.8626375329264130e-02
+2709 1.6862526500254253e+00 1.1530653790816929e+00 1.3708551911515743e-01
+171 -5.1344824438156544e-01 1.4003214139877707e+00 6.8949399119092192e-01
+209 1.7017635791987198e+00 7.7523354055487881e-01 -1.4061833531446863e+00
+383 1.0617041523526849e+00 -5.6412942961009971e-01 2.3828522721108722e+00
+1488 -6.1071187516520364e-01 -1.9882516704563113e-01 -2.2022223708226502e-01
+1871 -5.7318015392512112e-01 -1.9665543876343503e+00 1.2389930039364677e-01
+2692 1.7684005022938223e+00 -2.3204724467629564e-01 1.3981709499908264e+00
+1563 -1.9962928096994551e-01 -7.6592883355874330e-01 1.2488321679122494e+00
+2827 6.8524269786021974e-01 1.0234125715508204e+00 -1.7566106747796610e+00
+2971 4.6571223169073855e-01 -6.1317168562826885e-01 7.6470373099847400e-01
+2266 -1.3961009688026664e+00 3.5540661111957356e-01 5.5780651099734824e-01
+918 -4.6207950537933862e-01 9.0370154677845621e-02 2.2209083294395051e+00
+2205 3.2549187407194607e-01 -1.8109446737825072e-01 1.9240875375873684e-01
+1280 8.4170114018040154e-01 5.1533454584582827e-01 -2.5788973178977770e-01
+1053 -1.9237166063475875e-01 -1.3182965137212848e+00 1.1760178100600016e+00
+49 -4.5571130768988610e-01 -2.2750489724634865e-01 8.5783858159060966e-01
+1954 1.1967004623617028e+00 8.3550518056876810e-01 -3.0893029211715650e-01
+1004 -1.0876769737944398e+00 -2.1167025785547873e+00 4.8331761606028534e-01
+64 2.1902715576446052e-01 1.3303875869419579e+00 -1.2726439165491115e+00
+1396 9.0164134308732669e-01 -6.0319726268911578e-01 2.9011843012777694e-01
+188 -3.0693151165525034e-01 6.4858761110978214e-01 4.0593320704029390e-01
+2418 8.4060955139212939e-02 4.7958581378665677e-01 -8.6280745395617808e-01
+1221 2.2733440558384763e+00 7.4518198724271012e-01 1.8166479963917035e+00
+2105 1.5284221384691572e+00 -9.7742755306404849e-01 2.4651966843152479e-02
+2385 -1.2954462440835639e+00 1.7307443291403535e+00 -9.7931507145246052e-02
+998 1.0470483587575459e+00 8.7603115528100028e-01 -1.4263692173871767e+00
+2408 -4.8784921230461875e-01 2.1268546220803911e-01 1.2049969141690000e+00
+2484 -4.2441608762689120e-01 -4.2789871739947655e-01 4.6166128051362465e-01
+1110 1.1788396919489128e+00 2.0305972824293250e+00 -5.8889939837622185e-01
+144 -1.9510752286803856e+00 -1.6818733705093125e-02 -2.0988218402445797e+00
+2088 -7.3380862186019447e-01 -1.0423674559655338e-01 1.4666537570586113e+00
+2435 1.3647290196256519e+00 -2.5865280896043302e-01 2.7354018590993026e-02
+2073 -7.3716889340708625e-01 -4.1481145860096758e-01 -2.1313329615202088e+00
+1365 -1.8407668665615347e+00 -1.7262846160633263e+00 -2.0205443586052937e-01
+1590 -2.7153024732460236e+00 -1.4470412266234094e+00 -1.3731858593052817e+00
+176 1.4291203148061640e+00 -1.5481139828894037e+00 7.0903671882336761e-02
+911 -6.4929794922263395e-01 -9.1187615339287997e-01 -3.8144326294229247e-01
+1142 9.4165064474320748e-01 5.2802976602033169e-01 -1.4731999992227214e+00
+1271 1.8930913953879844e+00 -1.8935859653082177e+00 -6.2750552633317691e-02
+2756 1.0263862748946859e+00 -5.6218388677357112e-01 1.8345626001326949e+00
+1935 -7.4161110814503428e-01 2.0674334141535414e-01 -8.6122433331503434e-01
+2311 5.1489004392611437e-01 5.0977675196836636e-01 5.2759015136353193e-01
+500 1.2600199355604695e+00 -7.2502620596498157e-01 7.7688035759433771e-01
+1373 -1.9865809465398461e+00 -2.0565592244219655e-01 -9.3490944725537461e-01
+823 7.9167260584975963e-01 2.6894245751243612e-01 3.4039328735272534e-01
+258 1.8216370267872635e+00 7.0726301424418225e-01 3.5821952817576641e-01
+1254 -2.1141936943421666e+00 -9.1204726824436977e-02 4.8684719831254591e-01
+2091 9.2385127801849753e-01 -4.1201142547191483e-01 2.2243762351167329e-01
+984 -5.7135012999636769e-01 3.0341026686397182e-01 -1.0386310719761704e+00
+177 -9.9468993980418230e-01 2.6481464869342808e-01 6.5518538915691882e-01
+1940 -9.4013852050146529e-01 -1.4268729959849167e+00 6.9872776427381700e-01
+1870 1.0214446625671625e+00 6.6825215659679049e-01 5.5351194300952367e-01
+261 -1.1285626152899197e-01 -2.2215045649631762e-01 -1.0869951070927066e+00
+1460 -2.6876699730216647e-01 -4.3556793987304049e-01 2.7145977801909438e-01
+196 8.9398365086656595e-01 7.3426341497592817e-01 -9.8311394537445440e-01
+349 -5.4387883683111438e-01 -7.0132873063872159e-01 -5.2561025619258928e-01
+2555 7.9173412638780305e-02 5.9436983568857549e-01 1.9081546360895103e-02
+2729 4.4448532940783647e-01 -4.8651938212837309e-01 -5.2719999447361679e-02
+2569 3.8970949080413814e-01 -5.2196169717224505e-01 -4.0365120617555089e-01
+1293 5.5214909595229944e-01 8.3191113180053261e-02 1.4021448692440278e-01
+1094 -7.9034020115451564e-01 -6.7502064397703532e-01 8.0584811469652551e-01
+1978 2.5510603868669026e+00 -4.4116213002979543e-01 1.3239144768646946e-02
+74 -1.1920340789939821e-01 5.9862837816129078e-01 -9.7601762804402026e-01
+1231 1.5439300971194896e+00 -4.8686177581400247e-01 -9.7188242693038518e-01
+1260 -8.8788098748534305e-01 4.8897459866010429e-01 9.2887452749564448e-01
+2518 5.9175408778324790e-01 1.4946619301493660e+00 -7.7058932719809581e-01
+2086 -3.6757326057719308e-01 -2.6468668949789276e-01 1.1961145181082191e+00
+2879 -2.9675206258916687e-01 8.6057060156078014e-01 -5.4662665023162516e-01
+333 3.9091433021553983e-02 -7.5772037722206587e-01 -8.2206204457977461e-01
+2428 -3.4419842010464075e-01 -5.3654351344854601e-01 9.5438139773731390e-01
+1036 1.0237698450999366e+00 -4.9163564200257981e-01 2.5145197939706811e+00
+325 6.1302845888361135e-01 6.8138996858332923e-01 1.4169624411354778e-01
+2637 3.6443200168065426e-01 -1.3975122312897901e+00 -9.6300348854470730e-01
+1310 3.5526170308933536e-01 -3.9130980720266484e-01 1.8059737043614976e-01
+776 -5.7278808174619400e-01 -4.1112062261940041e-01 -5.9957302389966627e-01
+2744 -9.0663152820776449e-01 -1.2461460724052167e-01 1.3794588696121199e+00
+2621 7.6517583093364573e-03 4.3329569703285747e-01 -2.1590705024100201e+00
+613 6.4738573682745837e-01 1.5138895616407861e+00 -2.4475597376615912e-01
+2438 -1.6468082259455255e+00 1.8357989244144408e+00 -1.1606312554625311e+00
+1313 3.0458018757368011e-01 3.3174063141918719e-01 9.6261957839491008e-01
+1019 -1.4532037658219230e+00 1.9344690711278771e+00 -2.3000206245599886e-01
+343 -1.1907406174609503e+00 5.0863694931844305e-01 -1.1249620117471559e+00
+1076 1.5357298479102655e+00 -6.2326338574108364e-01 1.7067173033817756e-01
+1688 -5.6953496088823802e-02 5.4639209002861866e-01 -1.2771800159248829e-02
+2446 -1.1909231533816897e+00 1.6195568245969520e+00 5.9240675486600158e-01
+1854 6.6381542747992128e-01 2.5214188628157790e+00 -2.7243102942207531e-01
+1206 -4.9469844443671129e-01 1.7795676429385024e-01 -2.2645897314164221e-01
+1492 -3.6188185585058202e-01 2.3878276355722317e-02 6.2095097773189334e-01
+124 6.5590126936405713e-01 1.8102725973367426e-01 -1.2244394095354272e+00
+299 1.8203876781537198e+00 1.4277281182073680e+00 2.0401473277666442e+00
+1945 6.9039760822510329e-02 -9.8176999701211054e-01 -3.3528971066316249e-01
+453 -1.4395872423787143e-01 -1.3714167223230849e+00 8.9252111709344695e-01
+811 -9.4842591279742450e-01 -4.0296847993036561e-01 -7.6060493471845225e-01
+1774 2.4145007850244322e-02 -6.5752789623919183e-01 -6.5208064422606560e-01
+2023 -2.6297973600319652e-01 1.2192310266745550e+00 -1.1389281276606202e+00
+2280 2.4307134028826616e-02 1.9089384326475769e+00 -9.2322183663741819e-01
+1816 -1.5006544662610419e+00 1.5662081272690151e+00 -8.0851277441899250e-01
+2319 8.5194522228974900e-01 -1.2996276531416238e+00 2.3983841130212640e+00
+2964 2.3583144869625078e-01 -4.5584214753215285e-01 1.3196360683952524e-01
+582 -1.8118298750901733e+00 -8.3005803728273486e-01 -1.4713533201395714e+00
+2958 2.3264263449231601e-01 -7.0876760103228065e-01 -2.2663164849366757e-01
+2782 1.6952836000263138e+00 1.0862027919820119e+00 1.3850441302575159e-01
+2563 1.6352532301656753e+00 -1.4225734634420134e-01 -1.1647603439874863e+00
+302 -2.7409802665160232e-01 4.0777485583891465e-01 -8.9417647739131434e-01
+2240 1.2113599496164881e-01 -8.7598102401353739e-01 1.7162591377090644e-01
+551 2.0707384647699612e-02 1.0652685524950802e+00 -4.3134332704814243e-01
+1045 2.1716984760653175e+00 -1.3443955216955921e+00 -2.5263006969484320e-01
+2262 1.0514813025774317e+00 1.6593599103298187e+00 6.1949297326161790e-01
+2757 1.6548061219663507e-01 5.1753647488939158e-01 1.0321973080318712e+00
+533 -4.9132758448408403e-01 2.2623169393963721e-01 5.9897386967940180e-01
+1739 1.0227738174688714e+00 4.3043130363329191e-01 7.8387406733884291e-01
+2794 -4.2351073726802790e-01 -4.4188652367115577e-01 7.3975934418739708e-01
+2359 -1.1928327684249149e+00 1.5754605174660616e+00 3.7120482077474842e-01
+2499 2.9677385834528069e-01 -1.1662118434949840e+00 6.9456584479374195e-01
+806 -3.5597037466525616e-01 2.7792694566873144e-01 -2.1409256847155884e+00
+1510 -3.6078047076399938e-01 3.6060701608104984e-01 -7.1147631349381714e-03
+693 -4.7372540561331256e-01 -1.2479851843491925e+00 -1.1439457482363427e+00
+1295 -1.3033306486843139e+00 1.5511526147854457e+00 8.8849432782870585e-01
+1378 -7.3647993835446679e-01 1.3619727077159591e+00 -1.8838117636461356e+00
+2536 1.1987354090257709e+00 5.6091484106225009e-01 1.2173243020683457e+00
+888 9.2032585496019870e-01 -1.2616283586546162e-01 7.3866186818848512e-01
+714 -3.4411207017390477e-03 -4.6763545877490015e-01 -1.5022522644840268e+00
+439 1.2885538476098264e+00 1.6078646506427410e-01 4.8936524635137280e-01
+2169 1.7567211534915639e+00 8.2170392146637128e-01 3.7411810617291985e-01
+660 9.9609654128945357e-01 2.9757610200911178e-01 8.5032509171580201e-02
+1932 7.9063728119753873e-02 1.2573087005439447e+00 7.9552614649591513e-01
+387 8.1347868822134062e-01 -9.8961635560708971e-03 6.6055073702961375e-01
+427 1.9647046941213961e-01 1.7601990226943798e-01 4.4056678453206155e-01
+192 1.3473897317882515e+00 -6.5596592805812559e-01 -4.8582255027080823e-01
+104 2.4661236007092873e+00 -3.1908191547924361e-02 1.3080699607078097e+00
+1489 -1.3598824658172060e+00 -7.7795277007011143e-01 5.1051732334610100e-01
+2684 5.3448673122192425e-01 1.9393304449754822e+00 -8.5003362006847050e-01
+2009 -7.9664612682026559e-01 7.5502984640065551e-01 -1.9911378247483862e+00
+1284 6.2629030743545822e-01 8.4766423553987114e-01 6.7246066906658275e-01
+1362 2.8935625159340977e-01 -5.4945866157235046e-01 -3.4461404271627749e-01
+943 5.4130809732364685e-02 -1.0626249135146648e+00 -5.9817803313734264e-01
+2416 1.7763715579582564e+00 1.3485508737505290e+00 -6.5485830933028422e-01
+75 -4.0574594142752529e-01 1.1524427751314366e+00 1.4975728186746867e-01
+2387 7.8875006950871918e-01 -1.0908004385005838e+00 1.3741793822096291e+00
+2287 -7.4816576920866740e-01 -3.3071326073116336e-01 -3.9081923430382387e-02
+1337 -1.7205462201620192e+00 -2.5171525470821132e-01 -5.8143952785327901e-01
+2815 1.2482602677408006e+00 1.9470762803617039e+00 4.6351408195707822e-01
+2220 -6.3826920157477207e-01 -3.0558779118077299e-02 1.5456416459868219e+00
+293 -2.2142892441432327e-01 1.1836876219733655e-01 -9.9621831944996520e-01
+2991 -1.0846301006009678e+00 -6.9140611198378032e-01 3.1051058431623674e-01
+102 7.3756623886630235e-01 -1.3388841892503973e+00 -7.7522720312137516e-01
+1041 -1.3669923847588183e+00 1.8492775837536324e-01 9.3691724617027816e-01
+1358 3.6597458355772150e-01 1.6239859561415126e+00 1.5214865661509211e+00
+2979 1.7043501608616731e+00 -6.1971156226174628e-01 2.4910197082512848e+00
+1749 -1.6387946795386785e-01 -6.3157684799775582e-01 -4.2593047949975776e-01
+921 -3.7172137636567959e-01 -3.3787522882284282e-01 2.5292982822884560e+00
+2118 -1.1227966291906504e+00 -6.4829934464704753e-01 -5.8970180104374159e-01
+2861 3.4510056414868717e-01 -5.1393758202456596e-01 -2.8667931081666809e+00
+2918 -9.2139755925251299e-01 1.9413461851957645e+00 6.2191576107435420e-01
+1504 2.5052689569848935e-01 -1.0007076868145198e-01 -6.8289055956236722e-01
+1418 3.7088195804323515e-01 -2.1575930421792219e-01 2.2037076244907405e+00
+485 -8.4646496592991660e-01 -2.0442627299577460e+00 1.1551093734104929e+00
+5 -2.6954923019553523e-01 1.8034762893119975e+00 -1.6076320117633229e+00
+2593 -3.3662225732891810e-01 2.5510310628408733e-01 1.2913529912119787e-01
+459 1.2445827073290348e+00 -3.8986739100786583e-01 7.0295733680912298e-01
+1805 9.6021642343142699e-01 3.0975659926657417e-01 5.6911527619692037e-01
+881 -1.2722164109603693e+00 1.4169288890484555e+00 -2.2272322363196270e-01
+648 5.5089009860247207e-01 -8.3357294416754779e-01 -1.8874656096945650e+00
+2314 -1.3828408555078047e+00 -5.3993743522718451e-01 9.7400893669369770e-01
+449 6.2839056276271754e-01 -2.1793236371665414e-01 1.7751184509651902e-01
+1189 1.0528698202260944e+00 6.8257265472602968e-01 7.2170310111821157e-01
+808 1.0673466524961953e-01 -2.1121779348034058e+00 -6.3419217539774630e-01
+1484 -1.2264351566207146e+00 -9.1469823136987838e-01 7.0310998287866289e-01
+290 -2.9264404409971367e-01 1.3269266985884545e+00 5.7118787113035419e-01
+1826 -2.0528641460628254e+00 -2.3934538483616563e-01 -4.8359156805833176e-01
+1113 -1.1101263815484190e+00 -1.0531127647012517e-01 7.2131040570224425e-01
+1795 1.4322355407164020e-01 -7.6167331321840281e-01 -9.9435995943037359e-01
+1537 -9.4350022465800903e-02 -2.1750755336523651e+00 1.1677217032889444e+00
+2807 1.0277336550190956e+00 -1.9102212344411740e-01 1.2491567893224145e+00
+2362 -3.7918195838261060e-01 -2.2467865286415004e-01 -4.8504694292812317e-02
+1465 1.0050190279406848e+00 -5.7245252775171351e-01 5.6832518634069434e-02
+2082 6.4541969512014075e-01 -8.1533670715930895e-01 -2.7796568639774566e-01
+367 1.0459043470324396e+00 -3.9027267631767537e-01 -1.0345628219426597e-01
+476 8.9751307546288128e-01 -8.1417762795528659e-01 7.2844071971142454e-01
+2893 4.9168652883722552e-01 1.0796008146883713e+00 2.2309039723992535e-01
+1780 -1.2876842809161275e+00 -1.2333504377566018e-01 -5.9049936190789654e-01
+1500 1.5417434938156063e+00 4.7419006308551104e-01 -7.8719858718181512e-01
+158 -2.0115965846159680e+00 -1.4482689364086831e+00 1.8465859756191958e+00
+1912 -2.7147114660334204e-02 -9.5033693740848701e-01 -2.5048378829901893e-02
+2898 -1.2629658897859395e+00 8.3845314450840502e-01 2.1687527074367434e+00
+1973 1.7899889664050948e+00 1.9317665666276077e-01 -1.4355036410778372e+00
+1706 6.2500058639622957e-01 -3.4194537937505076e-01 1.0641818952857141e+00
+573 7.0623630696831463e-01 -6.6741576245210998e-01 -6.9636435551318909e-01
+1273 8.0400631494534225e-01 2.9917538342400385e-01 5.5139728875381822e-01
+2710 3.1496331169568825e-01 -2.1522246643495030e-02 -1.8867857965291962e-01
+956 -8.1819249766606639e-01 9.3118465736194256e-01 7.0039556985348883e-01
+2763 1.8287016039560295e+00 -1.4314169132026970e+00 -2.4073404612565297e-02
+502 5.7272168499609832e-01 2.1124296030351526e+00 4.8469042152972475e-01
+1145 3.7216840989183941e-01 -2.4598246888970113e-01 1.5590658978190577e+00
+2943 6.0531455806508272e-01 1.0989329047956053e+00 1.6620766350055205e-01
+35 1.4188469676385443e-01 1.2430204024403929e-01 1.0401230696988917e+00
+1503 6.2376131503144527e-01 -4.5950343522785647e-01 -6.6215245218329311e-01
+2816 -5.8731146944066823e-02 5.6269629403931054e-01 -7.3099562570110277e-01
+608 1.7545682992693932e+00 -6.6204307430929232e-01 -1.9981613290433755e+00
+1026 -3.3739088770035169e-01 7.3939241433491842e-01 -7.3407551719095721e-01
+1717 -1.5633403951679423e+00 -7.3725700736574995e-01 -8.6025743070269856e-01
+1668 7.5952863572998491e-03 6.0265819732978343e-01 -4.1299029402032772e-01
+983 1.5942074044247416e+00 1.5634716787937755e+00 1.7212372935738962e+00
+2075 -5.7809702114030048e-01 -6.9255321961363192e-01 2.8326952792103048e+00
+2139 8.1481125341261373e-01 8.1491992675572500e-01 -3.0745685942649001e+00
+2833 1.9828288614710693e-01 -1.1389383611975112e+00 -7.9159637930457938e-01
+1089 2.0054328012968958e-01 -3.4986444816374118e-01 -5.4104821849756746e-01
+381 3.2681613932980985e-01 1.9568204774406057e+00 -2.9093075471134808e+00
+2029 -4.0986879086950345e-01 -1.1394181721895218e+00 6.4499642849659278e-01
+1547 -5.7956115383385465e-02 -1.2607834224207055e+00 1.9338416015040027e+00
+1173 5.6482544400060786e-01 5.9316630371664569e-01 5.2322918980096200e-01
+2421 -7.3546658028871975e-02 -1.2998198239607932e+00 -4.1848503255166780e-01
+581 4.7069834302649716e-01 -7.1270267685180044e-01 3.4078623567530042e-01
+465 1.2018735862380923e+00 1.2177790151171142e+00 1.3172227530692997e+00
+2364 -1.0797045539845954e-01 8.7409861541920120e-01 -1.1481205106528285e+00
+1908 1.0255666660904410e+00 5.2073363743336676e-01 -3.2813130914193100e-01
+199 -1.4041492639034212e-01 -5.5318217359969912e-01 -5.8628742513253373e-01
+2062 -1.3768495971351895e+00 2.4355770194626769e-01 -3.7815120050407369e-01
+2248 9.3819113764768436e-01 -1.6401307820387605e+00 -1.9211906844005116e+00
+612 1.3740228049723575e+00 -3.9838886084398878e-01 -7.4573476184526843e-01
+619 -4.1901759472743433e-01 1.9757614051701433e-01 -3.9644204046402454e-01
+201 3.8215911247311074e-01 5.0571297823272632e-01 3.5888802597981773e-01
+62 -6.3874514372492008e-01 -4.0162095558040578e-01 4.9058308579291821e-01
+2862 -7.3999918318474378e-01 -1.3386508870715270e+00 -1.4668338400713568e+00
+187 1.1014801552079432e+00 4.0430387978549293e-01 -8.3943771417108359e-01
+204 8.6733126201771471e-01 9.7199286339442792e-01 1.9615238441648724e+00
+320 -5.1693609499734738e-01 9.1239430413329581e-01 1.2671174459859785e-01
+1645 8.0934329841910502e-01 -2.6023990415789844e-02 -2.0398601329505754e+00
+2634 -5.2044250802561698e-01 2.9326312112631131e-01 8.6146174986732649e-01
+2728 2.0242794205186869e+00 1.2235300918256340e+00 -2.7243912464797826e-01
+2899 -1.8840360504435987e+00 1.0821933191242674e+00 -8.0627831433260821e-01
+2381 9.4404011310510585e-02 -1.0401277498130821e+00 1.6906368571578342e-01
+542 1.1868812269393818e+00 -1.5886926823588057e+00 8.0186378438252826e-01
+1931 5.2741136575415459e-04 6.9386445357085758e-01 -1.3963967441525993e+00
+2184 1.1742189006992017e+00 -2.9749624081303894e-01 -3.3596222292526129e-01
+2995 -2.1457446307814654e-01 -1.5569329199981402e-01 4.4834252329915075e-01
+147 1.6579398352285563e-01 1.3743234266786559e+00 3.4037854180289728e-01
+633 -4.6920905021147119e-01 -1.4727428175249340e+00 -6.1412068295085454e-01
+2781 -5.7530515144173289e-01 -3.4196202934703390e-01 8.9407366095933383e-01
+2730 -4.4893746762680137e-01 -7.0917035909987192e-01 -1.1446842991977986e+00
+2207 -7.5415608080658425e-01 1.3148107170758344e-01 7.6874317095966233e-02
+618 8.5311806016213776e-01 6.3426081462195871e-01 7.7066441166139932e-01
+1951 1.0536676929993363e+00 1.5416850783608149e+00 -5.4426588648081153e-01
+245 -2.0050857889826075e+00 1.7629594761888134e+00 1.0775747924412267e+00
+579 5.3824556088290920e-01 -1.2527710026406667e+00 4.6730817260383077e-02
+757 8.8172586261339903e-01 -1.2579224713275523e+00 -1.0209162361347601e+00
+1326 1.6522109862933374e+00 -3.4375151953356009e-01 -2.9731328597277246e-01
+2409 -1.5078470312029935e+00 -1.6968830916676714e+00 -2.0882150339157043e-01
+2817 -4.4171329780401597e-01 -5.3985973364268081e-01 1.8597538423851698e-01
+963 1.6216840232990262e-01 1.0379228215749872e+00 -8.3699698560352243e-01
+1170 -1.1472830444862252e+00 1.0934910272082097e+00 2.2908496922926760e-01
+861 -8.7853812253656227e-01 9.3182324284514972e-01 7.8887319208027185e-01
+2913 -9.7131375652828444e-01 4.9369109563727842e-01 7.5774018343192540e-01
+1802 2.1969071504811177e+00 1.0144598339947541e+00 -1.2948665779058055e-01
+2970 -6.3177503219055214e-02 8.5753407836979245e-01 -9.2387311050582920e-03
+1200 6.0824571099752733e-01 -5.4233859227068221e-02 -3.9029421408515930e-01
+1709 9.3228976788631868e-01 1.4657422484807608e-01 -2.0235362895716111e+00
+2824 2.3540652988845414e+00 -1.7283519493481874e+00 -1.3111429448795178e+00
+2793 -7.9097618321811969e-01 -2.5394772341750724e+00 9.6172862517596414e-01
+42 2.2503597475290142e+00 1.4805425583717144e+00 -1.2487839722666620e+00
+1959 -1.1390290806957157e+00 -9.7651644868908039e-01 -7.6900354688296513e-01
+2132 -2.3913201042081851e+00 -1.6256159749737640e+00 5.5599784621769333e-01
+793 -1.4517665413872749e+00 3.6580697900943149e-01 -1.5371522870084303e-01
+2546 1.4642786003490782e-01 -1.7704663291433442e-01 -1.6197999418352280e+00
+2172 8.3800228036500068e-01 -5.5288441521374232e-01 1.2774522778384054e+00
+2165 4.0877747680593168e-01 1.6236707737168139e+00 -3.6892320193608685e-01
+2301 6.6920614369907011e-02 1.1932021669706410e+00 -7.5145512799820735e-01
+736 3.8609751592421959e-01 -1.2645947073915560e+00 8.3336561895236716e-01
+971 -1.0145519659546172e+00 1.2423171046805805e+00 -1.0958270407774706e-01
+1066 -3.0587767990958203e-01 2.0908676558169981e-01 -1.1812270420051043e+00
+152 1.9055968006299354e-01 -2.7479259598843925e-01 -7.3916577287852681e-01
+450 1.9108829648734129e+00 -4.5335617695880409e-01 1.0659019776097829e+00
+2116 -3.1509731165549969e-02 -8.8511614413143469e-01 2.1287267452852441e+00
+2956 6.9547183651595357e-01 -2.7874919373575874e-01 2.4503066253129173e+00
+2553 2.9390520320371838e-01 -6.5243339416043566e-01 -7.1411503395619658e-01
+16 -7.5072145138363544e-01 1.5192476588970625e+00 -9.7641317678480111e-02
+2778 -1.4204248682040668e+00 1.7045948943964380e+00 -4.0187188610658547e-01
+1690 1.0871935707005718e+00 1.2869321287421807e+00 -2.0392868077852677e-01
+2324 -1.5528185184344105e+00 1.7332437239077163e+00 7.5637006456050315e-01
+2539 -1.6599069185331252e+00 -6.0596708749460049e-01 -1.1357794725738009e+00
+352 -1.1728214003366784e+00 -3.0832382667826197e-01 -8.7079934866980235e-01
+342 -1.3039222216559025e+00 -5.5639259945177455e-01 -3.1875796322991645e-01
+441 3.8157697670888313e-01 1.1054067053797134e+00 -1.4292647311594959e+00
+2241 2.2816075374426717e-01 -7.5414682444668613e-01 -3.1982572601669351e-01
+2451 -1.7604049988273196e+00 -2.2256436701833637e-02 3.7528041267243506e-01
+517 -2.8212614747907533e-01 4.7262620334399036e-01 3.3977090657626413e-01
+552 7.1812536555501488e-02 5.6410117354553646e-03 -1.3484270136422924e+00
+2497 1.1470350880298927e+00 1.1242944479505244e+00 2.9280563682267069e-01
+1536 9.1153238758167321e-01 5.8989312839031061e-01 -1.4658932800756104e+00
+1112 -1.0907843766718790e+00 -3.1927168047746202e-01 -4.7131138907648341e-02
+1187 -7.2059664672476220e-01 3.6386062472391645e-01 -7.2203974583397024e-01
+212 -4.8001983989268804e-01 4.8137731031131814e-01 -3.5955719263937064e-01
+2181 2.7763273066558103e-01 4.0797340988869635e-01 -4.7138122612180355e-01
+1025 -2.4284886261440106e+00 -1.2061149738848956e-01 2.7742779261888004e+00
+39 -7.3811509153721877e-01 8.0019309128924310e-01 -1.0667374587645104e+00
+1022 4.1990461164780368e-01 -1.8827755690361798e+00 9.6565688220081591e-01
+472 -2.2162936702438737e-01 -5.6074719891355629e-01 5.0141403070194865e-02
+1064 -6.1779881450681817e-01 5.2056551969543197e-01 -8.9412966478228689e-02
+2070 4.6872514365872597e-01 -8.4599289756382379e-01 -1.6949037754525986e+00
+1516 -2.5607619980961460e+00 9.0283667948738222e-01 2.3780210111106911e-01
+1509 -1.5959401850430746e+00 -8.1225388815345723e-01 -5.4200435122583823e-02
+1065 1.4473489096083292e+00 5.4047491776223289e-01 1.2353530328447098e+00
+136 3.9584878074830010e-01 -8.4707778958052793e-01 2.1583816232938594e-01
+1911 -5.3933716795380271e-01 2.1935241096601241e+00 1.3345697277070168e+00
+1245 6.9660893218917525e-02 5.1788809756531795e-01 3.2176665923174474e-01
+1639 1.1498627408696052e+00 -7.8622122056134436e-01 1.9547923815533499e+00
+2434 -2.0761875779273031e-01 3.0787496015637744e-01 1.1829190686796993e+00
+130 1.2797987733091598e+00 2.9538686541841974e+00 -1.0621058889994739e+00
+2752 -8.1525334432008312e-01 -1.7215338151021933e-01 2.6624111082617459e+00
+195 4.9499330809425901e-01 -7.8667177430384927e-01 -4.6039529231279119e-01
+361 4.1707764907429601e-01 1.9871466692991429e+00 -3.7110517797542336e-01
+1452 -6.8927551473114601e-01 1.0133795817988607e+00 -5.0492376631933367e-01
+518 -4.2828252730226246e-01 2.7710646962402674e-01 -5.4563026373779844e-01
+1199 2.1944696017463652e-01 2.8832597168307289e-01 8.0541714540319942e-01
+768 -9.1267583633173144e-01 1.7772870017018921e-01 -5.3059375192954217e-01
+2347 -6.0125280879294807e-02 1.9724063247885393e+00 1.7335362415383344e+00
+721 -6.5684352214983333e-01 6.2320576951817319e-01 1.0636857275010145e-01
+796 6.0557805918165797e-01 5.4953196253348813e-01 -2.0743992613769446e-01
+1919 -1.0362850652890965e+00 -1.8161725468177752e+00 -3.2983394882087819e-01
+2003 1.3855925841675272e+00 -1.0123176234016509e+00 -4.4970718391198755e-01
+2795 -1.7707826806480571e+00 7.7824005783107519e-01 1.9137736376251548e+00
+934 3.2183632277340307e-01 -1.3905481698938129e+00 -4.1844283436834379e-01
+2068 -8.6551151339877230e-01 7.5444574113529106e-01 5.0821448288466531e-01
+1986 -1.1734394351117574e+00 4.0305002239257592e-01 1.3219291831744773e+00
+1995 -5.2842063688677465e-01 -6.7571694893213685e-01 -5.3190947307900216e-01
+1029 1.1244700285962808e+00 -9.8764712960389822e-01 -1.1928327541745229e+00
+9 6.6773080824952591e-01 9.9477352939254235e-02 8.3138602505894266e-01
+1652 -4.4153102514799075e-01 9.5911266698689712e-01 -2.5157124712892404e-01
+205 -2.3602853751416275e-01 -2.2272588286508618e-01 -1.0112537158755755e-01
+1586 -4.5387616337851178e-01 -1.5901729856701692e+00 8.1744204697649681e-01
+474 -2.6847631994718590e-01 -5.7736152728324985e-01 -2.1651038912702409e+00
+1442 -3.5833542156596820e-01 -5.6955194304109980e-01 -4.7169178525139704e-01
+1827 1.2769687946982877e-01 -3.5369147031352338e-01 1.4064468346376586e+00
+2643 2.0554485893993939e+00 -2.6308794904438106e+00 -2.2709706653042572e+00
+2436 2.0006502114344701e-01 2.4887950369049219e-01 -3.9303227558915921e-01
+1191 3.5244568493491046e-01 6.3183806965562986e-02 1.7544643051940525e+00
+2356 1.1911552465607980e+00 -6.2237288641152376e-02 -1.3553891421561848e+00
+954 1.1459085467820347e+00 2.5897067774880664e+00 -1.8816137677301290e+00
+895 1.3365097854308676e+00 1.5575974596978153e+00 2.9347775700556256e-01
+2152 1.0069989188213673e+00 1.1533654735077821e+00 -1.0503947101862150e+00
+2886 2.6029257692447866e-01 5.8315845813381129e-01 6.2212620663903095e-01
+2496 3.5672670993437655e-01 -1.0930670279561430e+00 7.4745857133227389e-01
+2448 1.1962323941549198e+00 -2.8817993212978915e-01 -3.5674240602503149e-01
+1697 3.5428664750704819e-01 7.5009391117799362e-01 -4.3517867065017324e-01
+315 -1.7374337502474990e+00 -6.0921038688243345e-01 1.0774981030242330e+00
+1049 -2.8540037170430416e-01 -6.8139852584393867e-02 -2.1479573529412938e-01
+1707 1.0544147333798568e+00 1.6142327445672968e+00 1.4869562223875055e+00
+321 -7.0346456510722166e-01 1.7054857138029045e-01 -3.6789057005625347e-03
+2619 6.0816816325523722e-02 -2.8168884197526300e-01 1.0138650663406019e+00
+2216 8.7477791059172827e-01 3.4976125310296224e-01 1.3914253199890112e+00
+442 -1.3763206069127718e+00 4.6715371852192322e-01 -6.0364816509895869e-01
+1035 1.1485367561868549e+00 8.4159360030706509e-01 -1.2691988928645501e+00
+1557 1.7669552348364503e+00 -4.1923557851310606e-01 7.0216403817653172e-01
+1893 -4.7753275729122874e-01 3.4661980523148683e-01 -4.5983720589913957e-01
+1806 5.7394259026828065e-01 -2.5772639453776003e-02 1.6222039864429050e-02
+863 2.5217238089767424e-01 -1.1556840410617215e+00 -6.6893154976781033e-01
+1383 -1.4362315005021360e+00 2.7170463114592400e+00 1.7517678992950516e+00
+2667 -4.4513321260082350e-01 2.6670926250748905e-02 -9.1824039210072983e-01
+2829 4.2048760190958800e-01 6.6327094472885972e-01 -7.4695153892732380e-01
+2832 -7.9558296240818538e-01 1.0564235693536617e+00 8.4954861744190313e-01
+893 -1.1410325139288223e-01 -9.1897268979855240e-01 -9.9104943076816843e-01
+2564 5.9742507877605400e-01 -7.2231473825530551e-02 -1.2419692578052910e-01
+1965 4.0664422171620057e-02 -1.6537675372855178e+00 -1.1590273321557063e+00
+630 6.7842633191887158e-01 -5.5944323648373517e-01 1.5953909165598984e-01
+2910 -1.7419489211217726e-01 -8.3327440605788961e-01 -1.6110840321409512e+00
+2525 1.0535376307335158e+00 -2.8042620441705446e-01 -8.0793160514918541e-02
+393 -1.5321680918119704e+00 -1.0897728552037216e+00 -6.4255642355166576e-01
+671 -5.2995769809322923e-01 1.1226239136587839e+00 -4.9404851617123036e-01
+2087 -3.8259726271904632e-01 4.5843922956299965e-01 8.7400006358583093e-01
+63 -7.9729512851606854e-01 -8.7401830738057351e-01 7.4910906040378789e-01
+1380 -4.0958530508971541e-01 -6.2108609078956334e-01 4.0447686938267208e-01
+1156 1.2887085624999253e-01 9.0196470741494195e-01 1.9484411722031755e-01
+2788 6.3325580104064605e-01 -2.4577644317579081e-01 -1.4699504009726108e+00
+14 6.3338946739251067e-01 4.6326339191155530e-01 -4.0798377372123251e-01
+1991 1.0690286550886099e+00 2.0915013497237025e+00 -1.5044678492224414e-01
+2407 -1.3861531352413796e+00 -7.0472842365535093e-01 8.2094553064827414e-01
+65 7.6527707367223285e-01 1.5663746768542151e+00 -1.0549830769344113e+00
+58 9.2685352014786515e-01 1.1693177553889924e+00 -1.2562653150300125e+00
+1958 -7.2318882742580992e-01 5.8098065791239051e-01 -3.1102903696273243e-01
+1791 -5.6052857673277268e-01 -1.6286720857118726e+00 1.1211418944633933e-01
+1560 -1.0674146208911482e-01 6.1733359626295370e-01 -1.8574268735053107e-02
+2947 -1.3916553342469560e+00 -7.2184999794306459e-01 8.6013244780180620e-01
+729 5.7800589410337588e-01 2.3298301986164138e+00 -1.9344002257637061e-01
+2360 4.4280272839683599e-01 -5.8348545788379502e-01 -2.6942285195192178e-02
+1671 1.5550233185207202e-01 -1.9396975909736820e+00 7.2793231755729060e-01
+1369 2.1124450120791742e+00 -1.1601288655050331e-01 3.5770067145367651e-01
+880 -6.5860669390838122e-01 -5.1882126979260312e-01 1.3302152797020348e+00
+2457 8.0810230483682455e-01 5.0594581811127937e-01 -1.5555557037472401e+00
+249 -2.5136036192301370e-01 -4.3394597902394350e-01 2.8010868855849658e-01
+2566 -5.8514171680942728e-01 -4.8641441963613807e-01 4.8856121863325602e-01
+2322 1.4761827173268285e+00 -1.4383952352493179e+00 2.2237033587061337e+00
+2035 -3.5773536765294273e-01 -1.0491494808068352e-01 -2.2231736084540414e+00
+1269 1.9208875690647570e-01 6.2270921999937545e-01 6.2318024693713081e-01
+2579 -1.0279335610129441e-01 -1.8283980546635564e-01 2.0177751155321405e-01
+851 1.6351323708553356e+00 2.1112224034850740e+00 3.0980338751542436e-01
+1347 -4.1840354207235073e+00 6.9723064959783709e-01 -1.0498829647881474e+00
+1728 9.7994708442441625e-02 -1.7912534113687623e-02 1.4524570807551556e+00
+2081 9.3046646607176309e-01 4.8859382470045676e-01 1.1033507209244788e+00
+2616 -5.8067533446589670e-01 4.9215693395281346e-01 -9.3377792728158904e-01
+371 -1.1469210304936037e+00 -1.1182070579084955e+00 -1.4750150891062455e+00
+988 1.9286331231946865e+00 1.8741987570351015e-01 2.1754871727193414e-01
+2671 -1.7506624622771838e+00 1.4504314113619836e+00 1.1717513102031132e-01
+2374 -5.3605342736770001e-01 4.8658454643266857e-01 -1.2619802188686919e+00
+2156 -1.5625440546978293e+00 1.2938711424981046e+00 3.6158277927575483e-01
+2982 -1.7612440412731631e+00 1.4887231186297206e-01 -1.3803628959146406e+00
+1567 -5.9483949244614598e-01 -1.2508620555847194e+00 -2.4061083639445510e-01
+836 -2.6345225182591299e+00 1.8978293928815022e+00 -3.4611393533276091e-01
+2554 1.8451443400281093e+00 -3.3863523224254344e-02 -1.0673850785066024e+00
+259 1.2612154530768704e+00 -9.9536825806326745e-01 -1.2307833785349849e+00
+2580 1.8914800524484165e-01 -2.3742557016979795e+00 1.1791385660405875e+00
+691 8.5437718891800940e-01 9.7552627900459932e-01 -2.3760952252049089e-01
+1483 7.4275214627752872e-01 -8.0198057006204049e-01 -3.7199160699698197e-01
+985 -9.7999094076531190e-01 1.9869609013470357e+00 1.6502194118729445e+00
+571 1.1927727496686082e+00 -6.3341832903543116e-01 -8.6982264101760853e-01
+2977 -3.5219799038120631e-01 6.9783296337475698e-01 -8.1823708095275727e-01
+2922 1.1996002596086908e+00 5.7824962923744783e-01 -5.3960914451170205e-01
+1549 3.2473574835127406e-01 -6.4402515003647731e-01 -2.9558073964941489e-01
+2219 9.5404308717534275e-02 2.0264293315957760e+00 4.7967653344338190e-01
+2512 2.9563355648993062e-01 2.1397723313468966e-01 -9.6033675443612665e-01
+1355 -1.2587164379325047e+00 -5.1716853895373741e-02 -1.2020246058720303e+00
+1763 2.8425513699704079e+00 1.2303156461895788e-01 1.3233726166089181e+00
+1164 1.2083498910349926e+00 9.9365150788441581e-01 7.3946157112006605e-01
+2707 -2.9712743086099846e-01 -1.2481749296213220e+00 -1.4163691153399207e+00
+2197 7.0167366758588923e-02 1.3494371310056763e+00 -2.0664789054070459e-01
+1772 -1.6259921937262782e+00 -2.2300537876834854e+00 -1.8142646814352068e+00
+1106 -9.0360130980267039e-01 -1.6349943324098273e+00 3.5059206298884710e-01
+1015 -1.8896734176327308e+00 -4.0682994002056438e-01 -1.2922728326746935e+00
+2878 6.6996416353988217e-02 -7.9658275621203778e-01 -6.3212982416692154e-01
+1279 -7.7967653087593236e-01 6.0194202167081420e-02 -1.5286433547941984e+00
+805 -2.9544500686545622e-01 -1.0626818015267048e-02 5.8035433040382400e-01
+1252 -1.5768215657446907e+00 -2.5743745852594507e-01 1.0114341094777317e+00
+2751 1.6083119483158803e+00 1.2691029101584639e+00 -4.4694952129366039e-01
+426 1.1295258476149765e+00 1.3455775898072155e+00 -5.4704059987453355e-02
+1957 -1.2636169124227872e+00 1.7204686342771397e-01 -1.0936250551459934e+00
+1800 1.5768730772320747e+00 4.6179304517287700e-01 7.1529685371355706e-02
+1611 -4.7712879209945819e-01 9.4434599040132239e-01 -3.9524102447550513e-01
+655 1.6330661069808411e-01 1.6836238556628602e+00 -4.7746597410764829e-01
+2837 -6.4680866692982264e-01 1.3052716272343297e+00 -9.4969600838980062e-01
+813 -2.3987674971946371e-01 -7.4793620437535435e-01 8.8092558687199585e-01
+923 -5.6897744828865204e-01 -9.9409324148436354e-02 -1.2901341961554622e+00
+715 1.2031455756396758e+00 4.1773512086312725e-01 -1.4204126964365155e-01
+1211 -2.1653648494853439e-01 1.3553103219385241e+00 2.4519747682923726e-01
+2993 -2.9751503864644074e-01 -1.0957292260368519e+00 1.4108396291064584e-01
+2520 -6.5429972626378852e-01 -4.6419796184518108e-01 -1.7923251728004663e-01
+904 1.2927711519980680e+00 4.8215713307075103e-01 -2.8813447313358574e-02
+680 -6.3559269126163687e-01 -9.2557755646769557e-01 -1.4003853401433092e-01
+2185 9.3213424487124663e-03 2.3596713990681473e-03 1.1994288582914980e+00
+679 3.4389292672285821e-01 -1.0158762523224707e+00 -1.6181295209839391e-01
+1084 -1.6567301971088453e+00 4.0307078941898367e-01 -1.0349897321352185e-01
+2479 -1.7407406223988350e-01 -5.9188419414382257e-02 1.0408497501000922e+00
+1450 -1.3095588312787594e+00 -3.2328139771926889e-01 -1.2475312657763062e+00
+1062 -1.6729735269852708e-01 -2.4633058752556385e-02 1.8931786342703535e-01
+265 -8.3693860304307732e-01 1.6466320094137726e-01 -7.6815559320729965e-01
+294 -9.3861826029147458e-02 -1.4668992497813276e+00 2.3547322911292237e-01
+2013 -1.2337299080535311e+00 -7.2874968117006933e-01 -3.0859746233334390e-01
+2967 -2.5021724031730108e-01 8.1246934663684989e-01 2.4930596511801077e+00
+710 6.9923562626767605e-02 1.3699744935968685e+00 3.1165014010725542e+00
+60 1.1855388274295673e+00 -1.0619842195624685e+00 -1.7030103872418896e+00
+1736 1.6834776731836093e-01 -2.6138135700262475e+00 4.7317886676741294e-01
+224 -4.3270232082595714e-02 2.7223031961758770e-01 -7.2966718902224048e-01
+1876 -7.3413808071289399e-01 7.7947532108504636e-01 4.7897928053924921e-01
+2237 -6.1575811192746566e-01 3.8026994643786904e-01 -7.2020528296310715e-01
+626 1.8040931334536694e+00 1.1125082147222123e-01 -3.1556117024748309e-02
+1147 -6.3496395828290186e-01 3.1037480736568945e-01 2.5114578913749468e+00
+607 1.3148180839559218e+00 -1.7574579433900317e+00 7.1258230209546547e-01
+2720 7.7258486918897751e-03 1.3380123755753888e+00 2.2921917280293895e+00
+2010 8.2980120324475382e-02 1.7902678052912213e+00 -1.0874842098914728e+00
+1021 -2.6590812557642035e-01 -8.9870999139775998e-01 8.1092198271567301e-02
+713 1.9678812733426246e-01 -1.9265458435253291e+00 3.3701488892157494e-01
+2063 -5.3232479110162423e-01 4.8016781425969773e-01 1.0658620394803240e+00
+2455 7.4209960877453773e-01 1.2081238189236478e+00 9.2274666774544889e-01
+2051 6.2474563853645179e-02 5.5127473813973837e-01 -1.8602518110468061e-01
+43 -4.1508779861284206e-01 -3.1767083090861015e-01 -2.4692874800490996e+00
+92 -2.7836453055304394e-01 9.2618106316052518e-01 -1.6067528850695817e-01
+2270 -4.5647673134176225e-01 1.0934589649926589e+00 8.7720081440121156e-01
+2242 -3.5703162253649257e-01 4.7295110043206051e-01 4.2191069423294791e-01
+1710 -1.9176172109337450e-01 -1.1306607811850495e+00 5.6216611487001211e-01
+77 -5.4985372329664461e-01 -2.9236294541469454e-01 -2.2871705293261085e-01
+2574 5.7868872578280106e-01 3.9031081361328723e-01 -6.5551651295321145e-01
+716 1.5676271825421424e+00 2.1409003967572876e-01 1.8560485072150947e+00
+2333 -6.2972753599588904e-01 3.3527030895544607e-01 -3.8772517603125434e-01
+143 3.0337970852655820e+00 -2.4002113484959273e+00 6.2788927496749725e-01
+1172 3.4783634442676070e-01 1.1536150156952119e+00 -1.2907086715808977e+00
+1263 7.6058816505970650e-01 -2.1979104376713341e+00 2.0085291822283363e-01
+1430 4.8078175648480992e-01 5.6268184363969367e-02 -5.3153594009237926e-01
+1669 -6.4260755663669367e-01 8.9668823358725847e-01 3.8849288628555539e-01
+1712 3.1225177692886782e-02 3.5451927163102515e-01 -1.9164860071459044e-01
+2641 7.5444050340082791e-01 7.0316913244149792e-02 5.0209023485142101e-01
+2920 -7.7920207285815946e-01 -6.9945226544898398e-01 -1.6951783660850717e+00
+214 6.7494172274059439e-01 -1.1400500160627145e+00 1.3931970644840546e+00
+347 8.7772979499520531e-01 -9.2574304305570365e-01 9.7454899688894547e-01
+2293 1.2129773666962422e-01 9.6314431455736593e-01 -6.6336683464928836e-01
+2133 1.3674899959239459e+00 1.8574616072776449e+00 1.1780678003383265e+00
+1181 7.1591998708957538e-01 1.1041697500901282e+00 2.1314267489859692e-02
+1768 -1.4001595237858136e-01 1.9064898347867905e+00 2.5038414501680889e-01
+1615 2.4242788665215542e+00 3.0501846361526030e-01 -4.6838029775500056e-01
+2629 -8.1120327403100589e-01 -2.0832823361505490e-01 -1.0390391755192447e+00
+1581 7.4562070710313788e-01 5.9111771700156446e-01 1.7202077322849829e+00
+2228 -1.2439900237532031e+00 -1.7710044655405941e+00 1.4800857610253804e+00
+2777 -9.7863089053141017e-01 -1.1398100628068002e+00 -1.5896674486749505e+00
+1440 -3.5778699118413820e-01 -9.1127500155811436e-01 -6.0228627499051224e-01
+1080 7.5756197630042721e-01 -7.7990518415749821e-01 -9.1197577907801697e-02
+432 -6.0421889512911531e-01 1.5063976642179902e+00 -5.1567260564118700e-01
+1039 -1.4015862205258580e+00 -9.8134798737478901e-01 5.4931734881831507e-01
+1737 1.2368594223735767e+00 2.2443114016528782e+00 2.8015316352474390e-01
+1487 4.6114406065363622e-01 -6.5170286389448107e-01 -1.0877185704485859e-01
+1174 9.3623160932946736e-01 1.3709001568295076e+00 1.2199304398494450e+00
+1924 5.9658648139129844e-01 -1.2947723031810063e+00 1.3040310849899190e+00
+1060 -2.1058460204833653e+00 -1.1437544260168742e-02 -4.1580093555459996e-01
+1405 -6.0798919995235512e-01 -5.2773346266370466e-02 1.3923471832565320e+00
+1363 -1.3544714199997261e-02 1.9697028748024161e+00 -1.0721050895031035e+00
+2046 -1.0540285177543969e+00 1.0874239549098765e+00 -1.1070031817395259e-01
+1034 9.5032951026430779e-01 2.1917699241878763e+00 -2.4020601040989127e+00
+2349 2.2584767317693397e+00 1.3478651284820919e-01 1.5445875030845773e+00
+2844 -9.5102140989582773e-01 1.6880066153026634e+00 5.3664552362874440e-01
+2493 -1.1163559625846688e+00 -6.0453922308303043e-01 -9.1982021000131209e-01
+2294 2.9264591354917502e-01 2.4494763704706624e-01 -7.3199611144446908e-01
+2210 -3.5972383270287123e-01 1.0161416601368123e+00 1.4110206494054717e-01
+700 -6.3463198347720040e-01 1.6161260037756715e+00 -1.0847912253733170e+00
+860 8.5342068417516859e-01 3.4489473298504059e-01 1.4774903363771685e+00
+2907 8.4503808043440576e-01 -1.0567726027083182e+00 6.3264760350330818e-01
+620 -1.0678777401619373e+00 -7.7058287625671451e-01 -1.5050881562195180e+00
+1256 -5.9354139748890677e-01 -4.9446260451878349e-01 1.6888139208622885e+00
+270 1.4028212921048080e+00 5.2456744145897671e-01 -8.4834763853871231e-01
+2592 7.5530984087877928e-01 -9.2107580410126777e-01 4.6708031289447366e-02
+1936 8.3069436088874782e-01 9.6538658520445686e-02 -2.0233642278449310e-01
+2521 2.8933945218237334e-01 -5.5925256834722370e-01 -4.6049127940207568e-01
+1983 5.1382002076533329e-01 -2.1516743206820603e+00 1.4990927035403201e-01
+322 6.3889390810272206e-01 -1.8426150610994843e-01 7.5681111822376490e-01
+2059 1.2730120194862806e+00 -2.1537579261867998e-01 -6.1195055522801889e-01
+1553 9.9338017039044413e-01 -1.1675319496943795e+00 -1.8467174779277393e+00
+965 9.7157020110448566e-01 -1.3000105816677514e+00 -4.8012989652500906e-02
+527 -7.6149811382518628e-01 -7.1800834739890118e-01 4.0957715485709373e-01
+2839 7.8658532263444714e-01 -3.3241401994626774e-01 -4.4129957911283518e-01
+1695 -1.3966920668394271e+00 -1.1659819925516723e+00 1.4541904670488048e-02
+640 2.2410625731722282e+00 2.5554608216118790e-01 -3.7297070124473031e-01
+1667 -7.3220578355424060e-01 -1.1401158261481488e+00 -1.0926561176688914e+00
+2038 -1.1339228882440948e+00 -2.0327784784524516e-02 -1.3669925568823577e-01
+2835 1.8131559448848729e+00 -3.5953386156684131e-01 -1.4849214827181183e+00
+1115 4.0830942102287604e-01 -9.3575752950899338e-01 1.1239339188010378e+00
+2456 -6.6308441033781840e-01 -4.1632168295167099e-01 2.2624002122200837e-01
+376 -1.3933310017735723e-01 -5.8441434418880145e-01 1.6571096822502376e+00
+164 -7.1432659376207200e-03 2.7205205837150261e+00 1.9374418731130114e+00
+905 -5.4127313649527387e-01 -2.0698317854817583e-01 -7.3758284605033486e-01
+1222 -1.1178904176871909e-01 2.8962386906311921e-01 -1.0192008129889747e+00
+2940 -1.8510072315884654e-01 -1.5584900704835936e-01 1.4353035018607480e-01
+1128 -1.9712089701572474e-01 2.1284837561884991e+00 -3.6153640765232398e-01
+1879 -1.4116305785305774e+00 -1.9045324411624460e+00 -2.3867204234285753e+00
+1595 -1.1729784420116476e+00 1.9643466349657712e+00 -1.3238665038286421e+00
+2279 4.0137110902437989e-01 -3.6374491482962817e-01 -2.2894137870864326e-01
+1481 -1.0520304941078402e+00 -1.5407949493913466e+00 -1.7336849945166249e-01
+357 -1.3149191376745721e+00 9.1361322594693228e-01 4.8198968255941993e-01
+883 -1.5124515198033572e+00 -4.1381673856736895e-01 8.3134753195881617e-01
+1225 -1.6086817484861557e+00 -7.0659594619089594e-01 -1.1530916609986092e-01
+2516 6.6517660053218786e-01 9.8414006894926109e-01 1.0681224630703837e-01
+1116 -4.9820679821522779e-01 1.1552289024452393e+00 -7.3914538649835104e-01
+78 -7.0126477589454217e-01 -1.0995680601521249e+00 6.6054195205726218e-01
+2117 2.8838080333260879e-01 1.0178788154867395e+00 1.8793006203360909e+00
+2393 4.9585276069421103e-01 -1.6458946486506028e+00 -7.1057710795936990e-01
+2758 -5.0677947128130729e-01 1.6074843495999369e+00 1.6955840217945755e+00
+2874 -1.1839214143232555e+00 -4.2111912951370079e-01 1.1317231668984842e+00
+1087 2.8667642282012991e+00 -9.1546430944053492e-01 1.2088036667870472e+00
+2942 8.5499684179515412e-01 6.2440693927511670e-02 -2.4052964794327152e+00
+1601 -1.0745259709093351e+00 -2.3317001143967425e-01 1.0495145770121875e-01
+2785 -6.2511381658362442e-01 -1.2183586066320709e+00 -9.4459231376726360e-01
+2508 -1.2570295904666300e+00 9.0402986899251059e-01 1.1281708214801140e+00
+2565 1.3658995966021403e+00 -1.5369506566277338e+00 9.8001805504915107e-01
+932 -6.2366597578945204e-01 1.8449545662508926e+00 -1.3063644794726206e+00
+2838 -2.2032356093866485e+00 -1.2864236483432601e+00 9.6997395081310356e-01
+769 9.2144698262769975e-01 -2.6418669658300575e-01 -1.0474616494698008e+00
+1376 -1.6569057464671608e+00 -4.4750671341408213e-02 6.5689050003920890e-01
+2639 -5.5560537099273866e-01 -4.6665651172625738e-01 -9.1357795602593916e-01
+1190 5.6207645826203068e-01 3.0139139950307570e-01 -2.5793483462873479e-01
+2822 7.0702196371110082e-01 5.0409139992044338e-01 1.1710696662155227e+00
+913 -1.6494148363463335e+00 5.7733566379090595e-01 -3.4435223821595151e-01
+1756 8.7751625103694153e-01 1.7073616461104530e+00 -3.4379569146982752e-01
+409 -7.6794164811226279e-02 2.6258422746542481e-01 -9.2574590123488787e-02
+1431 1.6991476604668392e+00 -2.5524076393770273e-01 -1.0943987388387817e+00
+175 -3.0435128026107727e-01 -1.4786396791791437e-01 -1.6836704053526688e+00
+180 -8.0121379107234159e-01 -4.7509082785074341e-01 3.0848881786124804e-01
+1594 1.0256732606849088e+00 2.1285205546688080e-01 3.3988799726236524e-01
+311 5.0703701665907563e-01 2.4358602971667478e-01 -5.5677508635603307e-02
+1941 1.7897120389802734e+00 9.0095521228252995e-01 -9.6359502221185678e-01
+1613 2.0738788415898404e-01 -5.5208026898643914e-01 -1.1227527477442829e+00
+1250 2.8716922240016973e-01 8.3143741639296165e-01 4.6452670742124502e-02
+431 -7.3806066540688375e-01 -4.0168482928058907e-01 -1.1537417161462513e+00
+2214 -6.2355549613994055e-01 -2.3653193451244958e-01 -5.8806451039499297e-01
+1703 -2.9713313604530528e-02 3.2636520916908673e-01 -1.4378399188520934e+00
+1625 -7.8304526814915387e-01 -1.3357587716101282e-01 -1.3235964923386849e+00
+827 3.6747700319094029e-01 5.9396573213200121e-01 -6.3612323324673081e-01
+1605 1.5345240890102452e-01 -4.0161572625123704e-01 9.6611855723123263e-01
+1007 -1.0786696845399923e+00 1.6206228779007570e-01 -4.8360004235398657e-02
+2060 -2.9104952439685439e-01 1.7694007797242428e+00 3.4775860090360960e-01
+2884 9.7055176536413457e-01 -1.2212078110744318e-02 -2.9583048954502461e-01
+1059 6.8916409112578320e-02 -8.0138154951265761e-01 1.8540507312020171e-01
+389 7.3816088541918368e-01 1.4687910725290949e+00 1.5471838349738153e-02
+831 -2.2264296875812279e+00 2.8169493108399113e-01 -7.0780139593350699e-01
+2906 -1.1789716674660904e+00 1.1404178719399081e+00 6.0091486865108201e-01
+1517 1.1429813490386715e+00 5.4930980760351256e-01 -4.0118905384817527e-01
+807 3.7035268388779718e-01 1.5888719193362117e+00 2.4185093043862216e-01
+858 2.1054962489734459e+00 9.2245193853151353e-01 -2.1135027666738057e-01
+2171 9.1252426488664551e-01 -1.2268467559172065e+00 -3.8713116361858535e-02
+2168 3.0192656202156687e-01 -3.8185071514559993e-01 8.7048150164616722e-01
+656 6.2751519885138518e-01 3.7767815543317590e-01 2.1579262725747950e-02
+415 -8.6113784670247762e-01 1.3422685858997743e-01 -1.0240403696477949e+00
+1977 1.4551346030472168e+00 -2.7050556763534850e-02 -1.5313633438829632e+00
+2475 -1.7022463415528761e+00 3.1756442391079370e-01 3.5833012589613317e-01
+2865 -1.2819063923009286e+00 -7.3636929440290977e-01 1.4945830153908266e-01
+815 -1.5522790947168899e-01 3.5228538971165574e-01 8.2971897872908129e-01
+1267 3.8976787888785591e-01 1.2420678233670372e+00 7.5314823413391341e-01
+978 -1.6009389921780552e+00 1.6069975364595650e+00 -1.8708866527592871e-01
+1323 -3.4413450066284568e-01 -1.2002838138944168e-01 8.0578918355355286e-02
+940 1.8781483713880549e+00 8.2800274877746471e-01 -5.0701422615186664e-01
+2398 6.9391315206294130e-02 -9.1356452817468714e-01 -6.2590880903189861e-01
+226 5.9609296221412172e-02 -2.8954435484535479e-01 5.1410437911298057e-01
+2190 -1.3649547505831483e-01 -1.6164928007119606e-01 1.8285493752506249e-01
+95 1.2376075253758123e+00 -1.4785776950178009e-01 -1.7573303225156613e+00
+1604 1.0342084902941822e+00 -1.5902593414715231e+00 8.6521410200708726e-01
+126 -1.3610121202132739e+00 1.0169880168501364e+00 -1.8150373967184783e+00
+838 -2.0604334749023775e-02 -7.7732800912676175e-02 1.2398409219244271e+00
+1904 -7.2199107429301967e-01 -5.5838964170117145e-01 3.0118901692931715e-02
+2074 -3.9609249179166844e-01 1.7564509384460392e-01 2.2192140691875811e-01
+1470 -1.9214620290293066e-01 1.4226088975949225e-01 8.7185794511428616e-01
+2147 -5.6515857048632456e-01 4.0255747034102257e-02 1.0997042732594048e-01
+2067 -5.8111430030431732e-01 -4.0823360459222391e-01 -4.2852288715960951e-01
+1515 1.7985230807342545e-01 -7.6198947435560649e-01 1.0758554051286606e+00
+2632 -5.6031877999054214e-01 -4.4032435268309689e-02 -2.0849712695098102e-01
+264 6.5475602386440179e-01 -1.5419675279127629e+00 -7.0495027202286686e-01
+1551 -1.6250348522952742e+00 -7.0804361579461483e-01 4.8699376300570330e-01
+1419 -1.1637464882287030e+00 4.0716513519340330e-01 3.3617963998721201e-01
+522 8.2761725520559515e-01 1.9905813740947493e+00 1.8387998900634177e+00
+994 6.6754537816319837e-01 1.7048260844803140e+00 -7.7726397190757901e-01
+1711 7.2133030450038460e-01 -9.9607085967536613e-01 3.9377546467021962e-02
+1296 -6.8887700296852017e-01 7.8444152690683144e-01 1.1290559685844495e+00
+2199 2.1116296886907984e-01 1.1117688619974186e+00 9.0341411489962331e-01
+1292 -3.7327052609194072e-01 -5.7624690458576355e-01 -3.6715275836438888e-01
+1723 -1.0235145493569271e+00 6.6102304771951070e-01 -8.5994052189726544e-01
+2705 8.1309636380333239e-01 5.8175810047202148e-01 8.0704302635402980e-01
+32 6.9154533459776635e-01 1.8604698393196843e+00 2.7796513346712454e-01
+565 2.9189934197709905e-01 3.3319020144502770e-01 1.4003855042278823e+00
+995 -4.2146057081357363e-01 3.2350764465278831e-01 -1.3867451869083840e+00
+2309 4.1097295517109611e-01 1.0962777622648843e+00 8.8988537340753390e-02
+1137 -8.3861466954706254e-01 2.8426975025518070e-01 -3.7604975418501169e-01
+672 1.5465839660746719e+00 -5.0505044476498018e-01 2.0780852885364581e-03
+1626 4.9412359515692006e-01 -2.4868190508877133e-01 1.6618077156407607e+00
+1138 -1.9942509956902407e-01 2.0455978520809706e-01 -4.3989006420067001e-01
+942 -1.2002951403534616e+00 2.1462733609894604e+00 -6.4972722229091062e-03
+1161 3.6071397394301818e-01 -1.1385549278533704e+00 2.8420504309814304e-01
+1641 -1.1393083409888138e+00 1.8301989421160449e+00 1.1092028356913095e+00
+503 -5.0228973399450505e-01 3.6845840551819509e-01 -1.1695293325299547e+00
+87 9.4808108423761039e-01 -1.4160320522686473e-01 9.2851896112364463e-01
+1071 -1.2544560143622163e-01 3.4106888914153810e-01 1.1126976802931472e+00
+1913 3.2550813861275829e-01 -1.3874031705008012e+00 -1.0134426076458167e+00
+1125 2.8109634072964762e-01 8.8008854244261780e-01 7.0499468933753962e-01
+460 -1.0800627018911637e+00 5.8183790423612394e-02 -9.5790639745262174e-01
+2557 3.1621337325911697e-01 -1.8793153685074168e-01 -1.6766021794093602e+00
+1180 -4.3020686995923235e-01 -3.9828593917410915e-01 6.3602753899232656e-01
+801 -2.4413256145470430e-01 4.4656026292887874e-01 -1.8663637520341386e-01
+1204 9.0345840638739938e-01 -7.6035969017581229e-01 4.9731457354763020e-01
+2903 -8.6023509020519540e-01 4.6156644533495267e-01 -4.7654006244280056e-01
+2072 -8.4006265895085042e-01 -5.6029056648371406e-02 -8.9321592665648986e-01
+1224 -1.1364248531308729e+00 -2.0383157595535528e+00 1.5548999164621594e-01
+1548 -1.0515890643163694e+00 -5.7811620645305029e-01 1.1030397413164561e+00
+1861 -5.8602477426241018e-01 2.2760092595967940e+00 -5.4049712102467229e-01
+753 1.0181219178057321e+00 -1.9330535431407256e+00 8.2876586730427104e-01
+2992 -7.9998183709622261e-01 -2.8595835970971301e-01 5.7917676621878056e-01
+2779 3.3370318450720859e-01 3.4460340301237963e-01 5.0910522568061334e-02
+1158 -5.1878066949564516e-01 5.4668652796001277e-02 -5.8480875405386024e-01
+1198 -8.5154478341924078e-01 4.5915815007921418e-01 -4.8069113368908267e-01
+2648 -2.8214832043760465e+00 -9.2740598166272292e-01 -6.4137105239698422e-01
+1152 -1.3460207222343927e+00 8.3765001640203252e-01 -1.2727040648130936e+00
+594 1.7622278384484984e+00 7.6282020382268528e-02 -2.0749034785495768e-01
+1679 1.4845884251551333e-01 5.5801763134294635e-01 -2.9836077275238293e-01
+1901 4.3020991876875142e-01 -1.5718346765272093e+00 1.3518435691247597e+00
+1930 -1.5644371846537257e+00 5.4793076822411402e-01 -7.7483835046068417e-01
+1248 -2.7275821265337596e-01 -9.0981112804324293e-01 3.1736002634760613e-01
+2120 4.6959310004675681e-02 9.2880119731142596e-01 -3.9787724594519475e-01
+38 5.6584765701462625e-01 8.1437534564433567e-01 5.5305071000804029e-01
+2590 -2.4597760955116513e-01 1.8647963610462095e+00 7.1624156642782710e-01
+2888 8.3939734307028235e-01 5.3523210477944527e-01 -1.3692979093279620e+00
+2221 1.1282507520014977e-01 -1.5107957391488058e-01 -1.2157883061035211e+00
+514 1.9547171287146520e-01 -1.6104687782573184e+00 -8.8817551350338042e-01
+169 -7.5277850832950599e-01 7.8137822268296797e-01 9.2788645567568362e-01
+1377 1.0774589424882880e-01 9.7084188708057773e-01 -2.0818104267716983e-01
+752 -1.1810019012861277e+00 9.9937186592222199e-02 -4.1902106286138524e-01
+1463 -2.4335915635334020e+00 -2.5220108502411465e-01 -1.1544235121032049e+00
+610 1.7775542987859843e+00 -1.8391786306341906e+00 -4.3649633490024986e-02
+699 -1.0532311294079605e-01 1.1184650925321149e+00 6.3687043342388749e-01
+1833 1.2152379957708619e+00 7.7896911831605753e-01 2.7273877099310728e-01
+645 5.8720401238330444e-01 1.4998971784760615e+00 -6.5254281608604725e-01
+469 -2.1300734926100982e-02 2.4063750788550320e-01 -2.9098047671561761e-01
+2543 3.5872567388575238e-01 -1.4500637106111485e+00 1.1238222904656117e+00
+2876 -5.5045574785924090e-01 6.9778188392154450e-01 -2.3756828308427175e-01
+2061 1.6539752393107889e+00 -7.0147425887331816e-01 -2.3568273655366098e-01
+332 1.0689070430025260e+00 -6.0682426542117229e-01 -4.4562785926971138e-01
+346 -9.9049328359801647e-01 1.2106088378903465e-01 -9.3720888030223992e-01
+281 2.0953937219528176e+00 -6.0610992527739260e-01 1.6419082913645483e-01
+412 -3.8815570319101245e-01 -1.0850023842421008e+00 -9.3702645966969766e-01
+818 3.0827208400552286e-01 -1.2692049947971855e+00 1.5604303661123584e+00
+1477 5.5813672696675393e-02 -4.2184690648342460e-01 -1.4518746031352399e+00
+2674 5.6753860189100280e-01 1.5913410676249782e+00 -3.7633879669975623e-01
+57 6.6424284695926039e-01 -1.4664651171404491e-01 1.2275515989393331e+00
+305 -4.1384825707776313e-01 5.0787318347653365e-01 -2.4972246288777256e-01
+1160 -8.7498590647112751e-01 -6.6936240392111523e-01 -2.4431723645749281e+00
+2959 7.9601121806201436e-01 1.1697311120535308e+00 1.6526307355176879e+00
+1554 -2.3254486972554200e-01 5.7491858305410570e-01 -1.1363286420418894e+00
+2232 -1.3686327208209068e+00 1.1942655088667740e+00 3.7206798443895328e-01
+397 1.2773529819556519e+00 4.2208641837990579e-01 1.3498659215145605e+00
+1684 7.9520274577248196e-01 -6.5812035701679761e-01 -5.7735287826655424e-01
+1955 1.5994424542110794e+00 -7.9027988408047189e-01 9.5455573645409286e-01
+667 5.3102108130983328e-01 2.9993349400062430e-02 -9.7793108919751282e-01
+584 8.2557611054583080e-01 6.1231283779982149e-01 1.2651265070967628e+00
+1663 3.7890113930904523e-01 -1.5370618132133220e+00 4.7125446371999480e-01
+2313 1.0996162349326610e-01 -8.3085183868277923e-01 -1.0235132228023407e+00
+1008 1.2166087281833038e+00 8.5207713418568887e-01 -3.1415425379297568e-01
+558 6.5709548493841263e-01 9.7760764356830376e-01 3.2939972324420980e-01
+1850 7.2588703988382819e-01 -5.5957295210814040e-01 -1.8113683990751879e+00
+580 -6.1744935937768819e-01 -8.5945851806971030e-01 -1.3679162940745691e+00
+651 9.5319603737050840e-02 5.8274227898537911e-01 7.7177422395289227e-02
+66 -9.5874948457306663e-01 -6.6012108293535110e-01 1.3904281151716131e+00
+2022 6.8611325233407211e-02 8.7755023006501753e-01 2.4755799080717532e-02
+2158 -9.8879839181065088e-01 -7.0225431146303441e-01 3.5015815765450897e-01
+2233 -4.5989925790316161e-01 -1.4707879667165256e+00 -1.2268932034084610e+00
+2015 8.4643651537304776e-01 1.2714920272834913e+00 -1.8982388678426005e+00
+1716 8.0971685545449557e-01 1.0922262284807944e+00 -3.0089528295709594e-01
+2275 -2.4275250747560645e-01 6.2979593961978875e-01 1.8372974083295694e+00
+536 -1.5822767280837635e-01 -1.4063817495198812e+00 -1.4236303979182213e-01
+528 -4.5931558403854972e-01 1.2159221857475093e+00 1.8690668820550518e+00
+300 -2.0217597115271086e+00 1.0738338004470771e+00 -6.5321153488055228e-02
+907 5.9261099273655582e-01 9.4817360562298170e-01 9.4051605287407236e-01
+2760 3.5750525082160256e-01 -1.0774144714707603e+00 1.9376853596619246e+00
+912 9.6226852794134743e-01 -1.8909316511163634e+00 -9.3147755038745528e-01
+364 -1.1034657485362640e+00 -2.4009013771713761e-01 -7.2814148048726435e-02
+2209 -1.4463073112628586e+00 8.1656869809097671e-02 5.1574126359262462e-01
+1630 1.9928413796241671e+00 2.0351366948510266e+00 7.9394303261592070e-01
+2380 -2.6639551266018024e-01 4.5473621022964886e-02 3.9173965700619301e-01
+2754 -1.3094208401261700e+00 3.0714533078858247e-01 1.5274646417467103e-01
+234 -6.6794377803277283e-01 4.3053573185675936e-01 -8.8743870804348327e-02
+350 4.6015870978773815e-01 -1.3248176976339694e+00 -5.1152446086910763e-01
+739 9.1243183072202028e-01 -1.1066026934821602e+00 4.4123056816185446e-01
+1614 -9.3886954766554065e-01 -1.2126634803861345e+00 -3.5994637340308561e-01
+2530 3.9409837901566447e-01 -4.7231707863862754e-01 -3.7497368136878989e-01
+2988 4.6309482151514730e-01 -1.3040343198136981e+00 -1.6541720059654321e+00
+89 4.3021994931100066e-02 7.8726652658093732e-01 -2.3938832341614669e-01
+213 -1.1926040741161388e+00 8.5135751288296924e-02 -5.7298693989139249e-01
+564 1.3454484405564315e-01 6.8390445936299271e-01 -1.9580406786170620e-01
+1519 1.2268882862451174e+00 1.4207711378219484e-01 1.1232454252401933e+00
+1895 5.8758077139002918e-01 -8.4526677615527701e-01 1.4896971528309888e+00
+1282 1.5275601246728507e-01 1.4060083697686385e+00 2.0769499456778476e-01
+1435 -3.3749531194411292e-01 -4.3075399874758136e-01 -6.1645243571290691e-02
+1647 -1.2676363107612996e+00 -1.7123127707780486e+00 -1.0463444309468664e+00
+1272 8.8489859820106043e-02 -6.7170554963757256e-01 -9.6968628107786259e-01
+2050 3.0789259822326731e-01 -2.7350735292915873e-01 -4.8298929120459944e-01
+2523 -7.3258615006058214e-01 -6.4016199629281212e-01 -7.5771200301598307e-01
+1831 -1.0213357221978356e-01 -4.1642971603448947e-01 7.1582432433899157e-01
+1232 -1.0715724201505505e+00 -6.3375050393603460e-01 4.4962052893040583e-01
+2790 1.6167020390464164e+00 1.0984855247909826e+00 7.3088507494654242e-01
+2522 -6.2945258136364968e-01 -1.6783417201253357e+00 -1.0039131034527875e+00
+1479 -1.6212137702502276e+00 -1.3883847085076220e+00 7.3990168840080550e-01
+2610 -2.4062975122260485e-01 6.0739497243411877e-01 -2.0212885599729646e-01
+2140 -5.3334913314001675e-01 -8.5326965687182832e-01 1.1903496306805186e+00
+2649 -8.0411305185848114e-01 2.1123800156109651e-01 -3.5418152453670540e-02
+936 -1.0600417298608962e+00 -1.3339873882799995e+00 -1.0448542152967246e+00
+845 -5.6849937543473961e-01 -3.9485066556068654e-01 1.1009133043910946e+00
+1403 1.1335880941617515e+00 -4.5169797080296170e-01 1.0243370464015258e-01
+2852 9.0216585287495632e-01 1.4385705839081593e+00 -1.5775026906275352e-01
+780 -4.2731050838665063e-01 1.6032627458515121e+00 2.5320150584924053e-02
+2495 3.9422655022077258e-01 1.2394116762422296e+00 6.1384796478383929e-01
+1656 2.9374973558798878e-01 1.6288508974257143e-01 1.3501180142256755e+00
+2613 -1.0578335242147033e-01 1.7535060806639421e-01 -1.1166338208221043e+00
+161 6.2839047881899168e-01 1.0586315191986493e+00 -1.9202913001585947e-01
+1512 7.9079567456086464e-01 -4.2090515861119360e-01 3.4708116197883537e-01
+1342 5.4417392174184365e-01 3.0337377567101625e-02 -8.7072790534206701e-01
+266 1.6830359142348497e+00 -7.8186422827187171e-02 -4.9456614173801455e-01
+2016 1.2365519000304415e+00 1.7878067886737670e+00 -1.6432830353863656e-01
+2285 4.9732450055929592e-02 2.3080726102192511e-01 1.5458600042782242e+00
+1518 3.7166315099460873e-01 1.4744166539349144e+00 8.9271430133530039e-01
+833 3.9970101076859627e-01 1.6562861520862143e-01 9.8373806597954805e-01
+1665 -1.3437242818571726e+00 -4.6266922867942983e-01 5.7958169415449692e-02
+2235 2.5184346165067567e-01 5.0933201245193449e-01 5.8370492184232148e-01
+933 1.1207861301802644e+00 -3.6210401439168682e-01 4.8219886074347573e-01
+1490 -9.5735010380398622e-01 -4.2676852271182131e-01 -1.0948072946744976e+00
+929 4.3320749393128233e-01 -3.5221162353786820e-02 2.9556151523178881e-01
+2170 5.1907309896684772e-01 4.3971801318745607e-01 1.0266738113738645e+00
+382 -1.4564059710155937e+00 2.0850123498033368e-01 -2.6207274197458524e-01
+901 -1.3841347797970529e+00 5.7292160551990767e-01 1.0011161016032570e+00
+2698 3.3779180891739125e-01 -7.2071354594425707e-01 6.8340457961063106e-01
+692 9.0291408079745872e-01 -5.9009316979066562e-01 2.7741155458079880e-01
+1032 7.3145824659498360e-01 -4.3374205254301174e-01 7.6222798639241884e-01
+2611 -7.0655563203498445e-04 -9.5058323519080989e-01 2.7757328761439739e+00
+45 -8.9098358107702347e-01 -6.0371117966931287e-02 -5.6147096855039946e-01
+707 5.6299263139307920e-01 -1.8453678956549144e+00 5.4779830050100520e-01
+110 -3.5737609636677031e-01 -5.2896875778850416e-01 1.5192806369913952e+00
+2151 -4.4409895129826760e-01 -2.1470333741280223e-01 7.7760100495698770e-01
+1762 4.0101470397641376e-01 1.1184608787797068e+00 8.2052921166956927e-01
+1388 -4.6725895385863220e-02 -1.4453135936516875e-01 -2.0807997743965130e+00
+2260 4.8280731675265198e-01 -3.8301822251588707e-01 1.3804528969482235e+00
+2135 -7.4485003956345153e-01 2.0382977974857197e-01 -6.9637204439044753e-03
+1894 -4.3451592412867684e-01 -1.3431888994342256e+00 1.9866694170602350e-01
+2389 -8.2466832004769830e-01 -2.4670695072900864e-01 4.2783372815870940e-01
+2572 1.5164112413705372e-01 6.4196204802200252e-01 5.7255420085863340e-01
+641 -5.1873481475043093e-01 -8.1643053715257341e-01 -9.2777254556663968e-01
+167 -6.3508898075386433e-01 1.2904652652693527e-03 -5.6381792912146467e-01
+120 1.2733037982344604e+00 2.3990621469608478e-01 4.4048455002793568e-01
+1458 -5.0112571293182850e-01 1.4703548008382672e+00 1.3879846811141464e-01
+337 -1.9956615085018679e+00 -4.9310783064791347e-01 -9.3281471086158396e-01
+1474 5.5516941879431947e-01 -1.3572232243567481e+00 -1.2765144514504598e-01
+797 4.0819434532966048e-01 -8.9916735086520982e-02 1.9240063068551394e-01
+2391 1.4273384572613629e-01 1.1596748655618123e+00 -7.6865094495921849e-01
+926 1.5801176416847555e+00 4.1179115446473263e-01 5.2636904153055564e-01
+1433 7.3822584978084427e-01 1.2702488934765670e+00 -1.7015751796200462e+00
+2858 1.5703812744686780e+00 -1.3935367270856478e+00 -3.3480466002971832e-01
+1817 -8.9553219149551416e-02 2.2835050124762009e+00 4.3965407339668516e-01
+2594 5.3706966332061046e-01 -2.9601929571929231e-01 -6.1833860732314461e-01
+1808 1.2659266213357458e+00 1.5793100986756703e+00 -1.2718523446873370e-01
+2749 3.9144034740139666e-01 -6.4000478304144215e-01 -7.4843208848538356e-01
+250 -6.1510518970230232e-01 6.9939836131591671e-01 1.2406177736082853e+00
+975 -5.5608307465655493e-01 -2.5848455677465494e+00 -1.4812947846406506e+00
+1830 9.3581457589976463e-02 -1.4016227976147990e+00 -1.3297548650070623e-01
+1016 1.0332274535133830e+00 -2.8206261324166360e-01 -1.4167327538157881e+00
+2809 -1.0479437514443724e+00 -5.1188042687589286e-01 4.5314896179766262e-01
+980 -2.7122904151656263e-01 -1.2596789320891286e+00 1.8411685215595961e+00
+1068 2.7841766061865298e+00 -1.2083689013579464e+00 -1.6055679127388982e+00
+2346 -6.4032064490915075e-01 -7.3353297200351064e-01 -7.5484201011167962e-01
+194 4.6784570739010746e-02 1.1147497612252671e-01 2.3284248673590363e-01
+47 8.9162602721068751e-01 -8.2227771988605802e-01 -2.9844078125045775e-02
+330 1.5143155061925546e+00 1.1190764296245537e+00 8.1900347619966452e-02
+1238 -6.7281589840892242e-01 1.2217196206459737e+00 -2.3968817938369504e+00
+1332 5.2031107117856512e-01 -1.1804691999898189e+00 1.8492640185765357e+00
+1448 -2.3624939617553317e-01 1.3270167195196598e+00 3.0761078035002648e-01
+2540 5.8683263768619842e-01 6.0863899366586816e-01 -2.0816231518267840e+00
+2089 2.0448419428894438e+00 8.7455117376444258e-01 2.0570690684255993e-01
+356 -6.2812715455493329e-02 1.7654418596215669e+00 3.5610596604059847e-01
+654 -1.6488621070953922e+00 1.3429867270563736e+00 -1.1015043178534034e+00
+1851 1.0026132344482963e+00 -1.0141390281974625e+00 -1.1329794245291354e+00
+1872 -1.1291005887220869e+00 -2.1865824673977272e+00 1.6394253199442599e+00
+218 1.0752601787837088e+00 8.3453835820583544e-01 -1.7452855971388397e+00
+1444 -1.0014501681816774e+00 2.3739010851624398e-01 4.6871903802959039e-02
+1027 1.3601908574138402e+00 3.6530934801170845e-01 -1.6892812365155765e-01
+647 -5.5264535356612410e-02 3.8383713391578262e+00 -8.2260560441484998e-02
+1847 -1.7240640303191817e+00 -1.0840078239861841e+00 -5.6417658857607156e-01
+788 -3.1076696693324568e-01 -9.3343609021381080e-01 -5.1867938359420507e-01
+2961 -5.2345773604223433e-01 -7.5335778181973856e-01 -1.1479312932002381e+00
+1926 4.4714873893711310e-01 7.3122364458803812e-01 8.0203948078326603e-01
+1970 1.0198911621386584e+00 2.9798607337257843e-01 -1.7494965331218040e-01
+1556 1.0052591496021661e+00 -8.9030492049914778e-01 -1.1962677380754516e+00
+400 4.2015109282078600e-01 7.7421112141652121e-02 2.1847352027669613e+00
+391 -2.1766516004891971e+00 -2.3010076639838917e-01 -1.2769546653402411e-01
+2651 4.0403149600143268e-01 2.0954155964684702e+00 3.7690254708785370e-01
+328 -1.0790362589378427e-01 -2.6964368867422545e-01 -3.4217833181906663e+00
+1130 -1.1648880639085053e+00 2.1649486397117741e+00 -1.3255437881348935e+00
+1933 1.2498133223260020e+00 -9.7428256910446520e-01 7.2940488359755029e-01
+2053 -2.0371391184744252e+00 8.2383939941938344e-01 -2.3510674778730078e-01
+2505 5.3870403455816651e-01 -6.7836701248599418e-01 2.0308716401661320e-03
+1787 8.0763049459490921e-01 -1.2197029924680973e+00 1.4880520630207235e+00
+2843 7.2630072155325187e-02 6.3694963755868139e-01 3.1515282615364859e-01
+1545 -2.6144240327274126e-01 2.0178878253698726e-02 4.4067419953222969e-01
+1761 -1.3362103630183822e-01 -5.9665593549493345e-01 -2.0973101881541584e-02
+1725 -1.2583180540205346e-01 -9.8849759164510398e-01 5.6661876539528999e-01
+1454 -2.2587470949420325e+00 -4.5242125297084584e-01 -4.0648350240535358e-01
+1210 1.1161573906758090e-01 -1.8048865210200854e-02 -4.0270896051335192e-01
+2587 -1.1584272663415210e-01 1.0356390569772561e-01 4.6028184200375311e-01
+2699 3.4422428049430109e-01 -4.1696617639350109e-01 -1.2254066954462219e+00
+1157 -1.8418876268740039e+00 1.7594918774250246e+00 -1.2847235611847688e-01
+1633 4.0023734450500492e-01 -1.0297100548237959e+00 -5.0516759512018938e-01
+604 1.6154294950569168e+00 3.8968949897470989e-01 -2.5742787361976971e-01
+2617 1.5731199323206542e+00 6.9248110748141828e-02 3.6928557200658546e-02
+2693 1.0165680411886429e+00 1.5588073193905314e+00 5.4420128033785109e-01
+2882 7.9787698408717345e-01 -2.9644955271336149e-01 1.9400345926100387e-01
+1100 4.1287102022462385e-01 9.4546404934283723e-01 1.3681622717772486e+00
+2608 -1.3547023315116509e+00 -8.8177923829925642e-01 -9.9314921651464649e-01
+2102 4.0518971541779170e-01 -2.8932202704055909e-01 6.7256629712404137e-01
+2282 -1.6101919729371141e+00 1.6867027199075071e-01 -7.6901241521253583e-01
+2353 -1.3413256058649947e-01 -3.3327430749973752e-01 -8.1054017553379620e-01
+2307 -1.2153354049160985e+00 -2.6411220010166514e-01 8.3263754304322490e-01
+1445 7.3661736322752269e-01 9.1009098627907059e-01 9.3183350612537619e-01
+2664 1.0803377496020186e+00 1.0641810315618441e+00 -1.6006885018401233e+00
+1424 -1.5039797213964696e+00 -3.3873823330280034e-01 1.3765876227027185e-02
+2054 7.6549786840499989e-01 -6.6125699166515040e-01 1.1976760072020260e+00
+2924 -8.6834584048950592e-01 -2.0730224984102189e-01 -4.9931521776884680e-01
+1468 -2.5849473583733071e+00 2.3952845536313741e-01 -1.2303982821603761e+00
+1674 -1.3033156042615093e+00 1.4711915529360848e+00 -1.3659213833269186e+00
+751 -2.2971906892587608e+00 1.6571556472557152e+00 -3.7123063351601066e-01
+2033 -1.1672187659120817e-01 1.2567858630386362e+00 -1.6070425707270035e+00
+830 -2.2435741013870611e+00 -6.1510719630541433e-01 5.3618916747463075e-01
+1067 5.8117284133168667e-01 -6.4424143930932409e-01 1.5959269311021003e+00
+1009 -7.5752255588069595e-01 -9.8316040706810465e-02 8.0475623908781713e-01
+2321 2.5767291703968902e+00 2.1677559201005930e-01 -2.9079592969136703e-01
+1741 -1.1462903537329252e+00 -1.3776574227009557e+00 8.7930054694886170e-02
+2609 -4.4040296987646155e-01 -1.1929372160209644e+00 -4.5671402340898054e-01
+451 1.0192898352539059e+00 1.2271619266096467e+00 -6.8635000823105141e-03
+41 5.6918662365462191e-01 -3.7255530554897143e-01 2.0321091630216745e+00
+1392 3.0211839729570075e-02 1.3932929895778652e+00 -1.1741665302771169e+00
+3000 -7.2632800556035271e-01 6.1858265403395962e-01 -9.3829733525396908e-01
+2762 1.6176642460139463e+00 2.3198111794989051e+00 2.5603970827579636e-01
+567 -3.9419286271883935e-01 8.6830233937380419e-01 2.7381274158084662e-01
+338 1.0215373802788907e+00 -3.2676142586956380e-01 2.7031011237668051e-01
+1335 3.9910188124234708e-01 -3.3217866328068296e-01 1.4765097894068628e+00
+1001 3.8327320888278227e-01 1.1636312223848830e+00 2.4342392670136044e+00
+681 5.0367528218731450e-01 -2.0249207709290246e-01 2.6170669656028667e-01
+1288 5.1383988644416234e-01 -2.7801759247463848e-01 2.2617294739807431e-01
+2802 7.2651292738664974e-01 -1.4647364166720007e+00 5.0805147045713894e-01
+1720 1.9862128624122594e-01 7.5696341518952145e-02 -6.8015814050824797e-01
+429 -2.7989180234101974e-01 -5.2591236815087250e-01 4.2369789411704772e-02
+1785 -6.8676936030799862e-01 -2.2510061089107830e-03 -7.5911049397656238e-01
+1014 2.1240376952972750e-01 1.2782718387849770e+00 -6.6139360212326048e-01
+1922 -9.5919944651118783e-01 9.3624432434581545e-02 9.6458236278931742e-01
+1451 -3.2240109848537363e-01 -6.1124744820045362e-01 -1.4491154300094389e+00
+2376 -1.1950188494160425e+00 -7.6502978637122954e-01 4.5447694250409082e-01
+1631 -1.6134449716815467e+00 -7.8705758676663995e-01 -2.4400920435573057e+00
+2440 1.1847278505685208e+00 8.2581536404082634e-01 -2.0776209135394480e-01
+1565 -1.3932458981362084e+00 4.3953787970968561e-01 -8.3312713556604501e-01
+436 -6.7742892854477665e-01 -2.0253512776044986e+00 -5.1400828094162077e-02
+2726 9.4407680134330141e-01 -1.0046377839588960e+00 1.2966283412371948e-01
+1777 -1.2089032047581147e+00 5.0526609500102260e-01 -1.2418648163130941e+00
+2944 5.6029105072625851e-01 1.0671160172775078e+00 1.4552993001441346e+00
+2045 -3.0227383916345640e-01 1.6114494082742439e-01 1.7858958301714085e+00
+1302 2.9108647363890428e-01 4.4799054702965357e-01 6.3753944117599393e-01
+1947 7.6786855357795294e-02 -8.9397209194549632e-01 1.1345693921175155e+00
+1179 -6.0814436089616408e-01 -1.3790830909749157e+00 2.0407202513871692e+00
+1974 -2.3171681801156419e-02 -1.5137099065593436e+00 -1.9517781829101255e+00
+2090 -4.4181294385650277e-01 -3.2424430076407984e-01 5.5763118884567683e-02
+925 7.7114153964568233e-01 7.9767698922403241e-01 2.8232541154772002e+00
+1937 5.6593587480178587e-01 1.0899356706731589e+00 -7.5454832368957891e-01
+1929 6.7381931748575208e-01 8.1571269081203746e-01 -2.8258158485614110e-02
+849 -6.8076910149459147e-01 -1.3417772390553424e+00 -1.1369062906579335e+00
+2864 1.2354450702508842e-01 1.1175202228210521e+00 -8.4414882535330715e-01
+2101 -1.2419179580147237e+00 3.1695135188469864e-01 3.2023208230264116e-01
+170 1.7171267639342019e-01 -1.3508478065457903e+00 4.1534934509414934e-01
+2740 -2.2997541734597818e-01 -1.4778716347753087e+00 5.9790227275681507e-01
+961 9.9893499793056906e-01 7.0626717213270129e-01 -4.6163335596841309e-01
+990 -7.3335872521641365e-01 -2.5554817599806962e-02 -1.8746432231975889e+00
+1781 -9.6010984717606018e-01 -6.8550085288852292e-01 1.4737790184839022e-01
+2759 -4.0678697040843409e-01 5.9628076643536176e-01 1.5512338438450379e-01
+2289 -7.3009257540269779e-01 1.2541840357665563e+00 5.9706288528580154e-01
+576 1.0498881069316259e+00 -4.5758668113642886e-01 9.7436699693123985e-01
+718 1.3117297745039904e+00 9.2316743354262443e-01 1.7025722018583096e+00
+1897 1.7629386865592917e-02 6.5138180365641285e-01 -1.2355439562791566e+00
+125 7.6716666376579506e-02 -8.4153247124078429e-02 8.4313341699463906e-01
+1793 2.3346326862087530e-01 3.4350656497429272e-01 1.3085238867500240e+00
+2143 -1.4550503347478208e+00 -2.0940260713248077e-01 -9.1745629995597122e-01
+2509 -4.2264654188123568e-01 -4.5195319871073020e-01 4.5061755063509318e-01
+777 -1.6466542062858349e+00 -1.7921904213005764e+00 -2.6406668474336166e+00
+526 1.7110010533379733e-01 -8.5169006944750408e-02 2.8644576105509245e-01
+1857 4.0893561462208722e-01 1.4321837016767587e+00 -1.5488756061302245e+00
+272 2.3412878793376870e+00 1.3398107653604894e+00 2.7356926508199675e-01
+596 2.9223476710689156e-01 3.2564866369817985e-01 -3.9680517889362457e-02
+34 9.6950522836408648e-01 1.0037604863795506e+00 3.5082648093358870e-01
+2253 -8.8799613135765754e-01 -9.2012737714156545e-01 -3.6419615345861095e-01
+2028 -3.7792575083756086e-01 5.1230483491253676e-01 2.7726695383518657e-01
+1624 -3.6748965902014047e-01 1.3964277563256766e+00 6.6295881039305260e-01
+2383 -7.1697818012335046e-01 1.4770074772374140e+00 -7.9376324019547750e-02
+2732 7.3467202618214683e-02 -2.1968989279091771e+00 -1.4400531987758716e+00
+2377 -3.5626752793281420e+00 -8.4483345512340768e-02 -7.5671003697786265e-01
+1552 1.6934193687030863e+00 2.8814517099108850e-01 2.2366369043233281e+00
+717 -1.8856919896741497e-01 -5.4491266195403765e-01 7.5564279808963825e-02
+2030 -7.7391068260357399e-01 1.5034591063379732e+00 1.9337708380017557e-01
+784 -1.0447421914962610e-01 -1.8551041843307400e-01 4.4534552819363249e-01
+331 -2.6159404675737075e-01 -4.9904682536867452e-02 -2.6906777225159256e-01
+2724 -1.1171873824270344e+00 5.3515017802948317e-02 -3.5384241764435209e-01
+1528 4.6039619219563793e-01 -7.5898719807419468e-02 1.2102308056998681e+00
+206 -4.3139055170259094e-01 -1.4802062519984232e+00 -2.7226965915924367e-01
+2774 7.5007144132567161e-01 -1.9510027834563632e+00 4.5874728862005415e-02
+1742 -5.4284338638945211e-02 1.1781267263319112e-01 -1.4138942064816500e+00
+2531 -6.4170657168539080e-01 1.8448145536893836e+00 1.2120113282220963e+00
+481 -1.2813755341322464e-01 -1.9961725980428147e+00 -1.4472153944976607e+00
+1886 4.5165520272742071e-01 -9.5232228848628597e-01 1.1980293296386066e+00
+2933 -1.6361191278228184e+00 -2.3395171603129450e-01 -1.4264387016559063e-01
+2166 9.5565950271339384e-01 5.0863477411652713e-01 -1.6386085892369393e+00
+2840 -5.1158326586253555e-01 -8.1457084734815011e-01 1.3984102284633684e-01
+1303 1.2942530227162863e-01 8.0197935560988132e-01 -2.0652725018882734e-01
+2243 3.2687599863180450e-01 -1.4893933083868964e+00 -7.2554393587245553e-02
+1126 1.0387850237942315e+00 1.8454529051049197e-02 -1.8130549066658980e-02
+54 -1.4287462599517406e+00 1.8024128333241665e-01 1.1125032075897270e+00
+490 4.8400317327758663e-01 3.7126344144412243e-01 -4.2870779436722317e-01
+246 -6.9496767606893739e-01 -5.2338525993628288e-02 2.3247312060578895e-02
+353 7.5539001227893576e-01 -1.8918172370020159e-01 -9.1839477191184482e-01
+1686 -1.2088010895525274e-01 -2.5589121712289098e-01 3.8257825974310322e-01
+324 9.0199969854606166e-01 1.1135877893956030e+00 -1.0488857699821161e+00
+119 5.6964075354500621e-01 1.3207727362241198e-02 -6.3448742294753613e-02
+160 -2.4187758155056671e+00 1.2924349545101503e+00 1.6464864404873669e+00
+2556 1.0097182885851910e+00 8.9030386410416618e-01 -2.2577498026128334e-01
+162 -1.0847591643701187e+00 -1.5033355377391133e-01 -1.2556939593543257e+00
+1467 5.3941997233390837e-01 -2.1840309221999946e-01 6.5960491964171042e-01
+744 9.6597477916595031e-01 2.9232194679325896e-01 -1.5560882166630017e+00
+1167 1.2757835499019539e+00 1.2358094759239349e+00 7.7148320673533166e-02
+555 2.0130809579522722e+00 -1.7533584218052440e+00 -1.8864047731478167e-01
+2250 1.7610548699141380e+00 -1.5765509557816868e+00 -1.6166011782122669e-01
+1818 -3.4821365630738993e-01 1.4765726740432719e+00 -9.5267855767064169e-01
+1644 -5.2074356573275171e-01 4.6852811631637914e-01 -1.6919040107917334e+00
+852 -1.3125138170419608e+00 -8.0642044368078636e-01 8.0660468623614545e-01
+2361 6.7416078166194771e-01 6.8193531953088971e-01 1.5882191508753635e-01
+595 -1.2867447049926040e-01 2.6685796651732492e+00 -4.4468180003204361e-01
+445 1.2867086956044171e+00 8.9017004914425057e-01 1.0499469725918364e+00
+2890 -1.4882564918344723e+00 9.7621450724549064e-01 -1.8778691458872926e-01
+1398 1.4454696108667242e-01 6.4866881651268166e-02 7.6745787529192411e-01
+1201 -3.4809263791114742e-01 7.2704214244315113e-02 1.3210916272566359e-01
+2471 -1.4876540457476777e+00 8.6208870714493036e-01 8.8482481211277209e-01
+767 3.5644368103330376e-01 -1.3415562750289702e+00 1.8271195690204545e+00
+891 -1.0164410359984838e-01 8.0680635383824528e-01 3.4407002388196051e-01
+1202 -1.1213440505726142e+00 -6.1992306484650561e-01 8.5450913143445539e-01
+1478 -1.9311847453118876e+00 1.3275623766584113e+00 -6.0737365958111555e-01
+697 3.2272440570969269e-01 1.0482648524910326e-01 -5.9497717986404630e-02
+1659 -8.7863957525158709e-01 4.4334734068559967e-01 7.3708216471349253e-01
+1900 7.9014048702101780e-01 -1.5155246207490529e+00 -3.0053642706875749e-01
+2894 -9.2099708823073123e-01 5.7057699662636741e-02 -9.2865732699065462e-01
+2957 4.4770053040685370e-01 1.4181151446572886e-02 1.7043931986779457e+00
+1687 -7.5344978560347065e-01 9.5560885221374670e-01 6.9944363913737795e-01
+1311 6.5483577526270798e-01 -1.1293663011223058e+00 -1.3942231133774077e+00
+1678 -3.7417134643410233e-01 1.7423682932197933e+00 1.6032970279898242e+00
+1496 -2.2293852692130217e-01 -1.2082886202058642e+00 -7.8848393049297794e-01
+762 -2.1301240447953766e+00 -8.6609155948740180e-01 -9.4473801741406438e-01
+1582 9.6819116964053076e-01 4.0935502189362302e-02 1.2628775405468604e+00
+803 6.4758689332518438e-01 2.5654191035078255e-01 7.4292100836798503e-01
+149 9.4985709954717257e-01 2.2678316931085035e-01 -1.1098627075900533e+00
+2598 1.5484180831524413e-01 4.4572309546259237e-01 6.9585160332145723e-01
+1778 1.7490008129257100e+00 -1.4120759115946717e+00 3.6113485368737303e-01
+1244 -1.0573200405985836e+00 -3.0223374376738904e-01 1.6839961519271096e+00
+1972 1.1212267240218596e-01 1.8307995795401011e-01 4.8936871413325894e-01
+2004 1.4960040266833172e+00 -1.8993227552378869e-01 -9.5632478885567851e-01
+2148 1.1525066711902408e+00 -7.4477113967603792e-01 8.6273069451120943e-01
+2302 -3.6730919847744131e-01 -6.2295859035968237e-01 1.5661365883591101e+00
+708 7.0624993303338712e-03 -4.8581653686465859e-01 1.5293782398198119e-01
+999 -1.0565709353966979e+00 6.6373473637488456e-01 -1.9983780635459483e-01
+446 -9.6729316250400399e-01 3.6372744001021792e-02 -1.4579072450249209e+00
+2661 1.1640821952189127e+00 1.4381487691344400e-01 8.6160521474042073e-01
+1097 -6.0515531965623581e-01 6.5749008630746575e-01 -1.8065537312756970e+00
+1163 -2.3514186423532131e+00 -5.3107113261433792e-01 8.7970448108986160e-02
+1691 3.6626451654250325e-01 2.8483208658062548e-01 -2.2557329602140355e-01
+1829 1.7821876925953370e-02 -2.2336158985538390e-01 9.6261211842248817e-01
+2955 6.8572883716114830e-01 7.4354023877439257e-01 1.0869187168153216e+00
+309 1.6598879910252193e+00 -5.0275586810087858e-01 -1.0793352689532165e-01
+1814 1.0453450560334689e+00 -1.6575037305784277e+00 -1.0844856564702863e+00
+760 7.7117572917970667e-01 -3.7261691744388542e-01 7.5311384426501105e-01
+1944 -1.0816922534215974e+00 -4.6254479632282469e-01 4.9554942656582598e-02
+2092 7.3683567703665276e-01 1.7111431738783628e-01 -1.1236141607624250e+00
+2990 1.2844689315720006e+00 7.5251492476062465e-01 3.9777628240738705e-01
+544 -4.4519708564045951e-01 -3.1147343426541085e-01 4.1288280081343709e-01
+2633 7.0394236910719787e-01 -6.6874909372471691e-01 6.0161482108675313e-01
+2444 1.7935346994366912e+00 -2.0347746601125771e+00 8.6513760095935588e-01
+2378 3.9142976317055933e-01 -7.3028898211163340e-01 -9.7574057660574795e-02
+2948 -2.3545583745935921e+00 -1.4686273434108188e+00 1.6465567995717323e+00
+735 -1.4877287124018723e+00 1.2438365902134389e-01 3.3390520633104270e-02
+1132 -2.7929297844015549e-01 -5.2921018815094689e-01 -9.1429111775463368e-01
+2049 1.7966162502311727e+00 2.2079530560752803e-01 -9.5329397770028898e-02
+2875 2.2402351406807459e+00 -8.3620197624974324e-01 9.0957967426489461e-01
+1533 -2.3639419644520809e-01 6.6378252733711496e-01 -7.2273859862163981e-01
+319 -8.8211056028644197e-01 -1.3654379124264784e+00 1.0071880414960317e+00
+2798 2.7532814450863119e-01 -9.5663645355424365e-01 7.0295919859142919e-01
+1735 -2.6773786168207514e-01 -4.0922848493068964e-01 1.3395372480617642e+00
+2366 -9.6103963884258836e-01 3.4945954549958969e-01 -1.2018752442896877e-01
+394 1.7977216030126919e-01 1.2059151967069743e+00 -9.3823594978062208e-01
+1683 1.4471410070445712e+00 1.3512227114928221e-02 2.2612572697316746e-01
+2883 -2.6697058042118410e-01 9.9019013459377270e-01 1.2101088286384723e-01
+632 -5.2779919264347153e-01 -4.3872156801371243e-01 8.3055033583146842e-01
+471 -4.8712796944579528e-01 -1.5784910458623785e-01 -6.5016331033968755e-01
+2715 -2.2001362045140510e-01 9.8287375658489218e-01 -8.1859213932090036e-01
+520 9.6482114399172714e-01 -1.2013431813068147e+00 3.5521847924707250e-02
+1057 3.2946876170997491e-01 6.3624106952403181e-01 7.1332737238736221e-01
+210 1.9385234867370291e-01 -2.7843084018801634e-01 -5.8158755158530939e-01
+2113 -1.4275720589150755e+00 1.0062866591666790e+00 -2.3134228572297147e-01
+1251 -5.3954685230030885e-01 7.2604213830663622e-01 1.0614485222550609e+00
+494 -4.9031338317449658e-01 -5.1885397318196835e-01 -2.0184825904561539e+00
+772 -8.1646417558911233e-01 2.9430416655102903e-02 -6.0185796619928311e-01
+2987 7.3955065147107946e-01 -3.0201219110321553e-01 -2.3386643539943636e-01
+1561 -4.3962985472888527e-01 -6.2442409775289320e-01 -9.6378498886879507e-02
+1845 -7.5039564402335579e-01 -7.7774040876797745e-01 3.8401628787877407e-01
+1906 -1.3745760077649125e+00 -5.7516961393075616e-01 1.5443016108248619e+00
+252 -3.1506204557138096e-01 6.9765883088945280e-01 -1.8218418496867322e-01
+652 9.1694161211259861e-01 7.8868509947496324e-01 1.3758063911529144e+00
+2225 -8.3648952735807647e-01 8.6038631229894313e-01 1.2912884942388749e+00
+29 6.9008455247368061e-01 -1.5418360411915575e+00 -1.6335761278866689e+00
+2131 -1.6769712974282063e+00 -2.9253895578739464e-01 -1.1500601025079327e+00
+2542 8.7558547581583457e-01 1.2614132725790319e+00 6.4448645220255529e-01
+478 -1.6463446600549592e+00 -5.4919521292845941e-01 1.0418069021596639e+00
+629 4.4876558866543248e-01 4.5396365654066823e-01 6.9230288574520471e-01
+1813 -1.0608327368326428e-01 1.1763775989285383e+00 -5.2895551239520788e-01
+98 2.3894565775151464e+00 -2.6330076353994092e-01 -6.2638994364003742e-01
+2326 -1.0339553410033177e-01 -5.4887880581677040e-01 2.1546351458832556e+00
+900 1.7714107561719122e-02 3.1774926226074068e-01 6.8714571462004170e-01
+1150 8.2021218213746672e-01 1.7151980326102159e-01 2.3925140736208799e+00
+870 1.1871086508353061e+00 -1.0484941434907482e+00 2.6482270497519544e-01
+521 2.0680251336427098e+00 -7.3673997860749629e-01 1.0844168569682269e+00
+1438 5.8990633249814672e-01 5.1116829790261697e-01 -7.3865293416230959e-01
+1447 -4.6079972626718618e-01 8.4993401884191755e-01 -3.3261975261173865e-01
+879 1.7252819120722223e+00 -1.7977470572177018e-01 -1.1748738236071454e+00
+2332 -2.1316115365048752e-01 9.5864601796690274e-01 2.4534426687985358e-01
+1379 -1.5599007474925703e+00 -1.4679520842299476e+00 -7.6777040274002761e-01
+155 -2.2115493078562869e+00 -6.1743659957055841e-01 -3.9749415199596466e-01
+939 1.1940536867330938e+00 -6.8197901650271486e-01 1.0518828932349440e+00
+685 2.0704532471698385e+00 1.4847018022225975e+00 -5.5446451211763736e-01
+862 2.3191710195049803e-01 7.2895309637244943e-02 -3.5681853386815071e-01
+2532 1.4937825841614090e+00 3.6824377777358813e-01 -7.7282533359778394e-01
+537 1.2143424967120668e+00 1.5523497883216431e-01 1.0369918874521604e+00
+2538 -1.1693116442679428e+00 -9.7528029615061063e-01 -1.0434113517299541e+00
+2265 3.7398159050045843e-01 -4.0269786556962905e-01 -8.5025630656735574e-01
+2630 7.5642456034375027e-01 -6.8920871729879651e-01 -5.6771251499588826e-01
+101 2.4364803377574882e+00 1.7309863512000694e+00 1.8722073862278144e-01
+792 1.0678589178648665e+00 -8.2238860967703820e-01 4.2002731624479345e-02
+13 -1.3565855454805626e+00 1.3724802791329431e+00 -3.3082515449809602e-01
+2397 1.9821024921737607e+00 1.5073164136405321e+00 -1.1636943754195870e+00
+1371 -1.5075496315747754e+00 -2.2084731781246492e-01 -2.3857518435254715e-02
+2340 -4.7137072954365933e-01 3.7838430982890275e-01 -7.4992861189485238e-01
+868 4.8533211501302637e-01 1.5153098194561947e+00 5.7184812467366930e-01
+2462 6.1405065395674696e-01 -4.8536412040118604e-01 9.3780825245768951e-01
+1043 5.9825022613708301e-01 -6.4950520813323331e-01 5.4340767775257870e-01
+2559 -2.2307205212814987e-01 5.0467480450415866e-02 -1.5701779608246924e+00
+2263 -5.4611840490512620e-01 2.3506813063203564e+00 9.5762956324422388e-01
+2176 1.6028304026343212e+00 5.5124336855359723e-04 2.3242320874590799e-02
+222 -3.8016386290805870e-01 -8.3003373390090951e-01 4.1669302311864836e-01
+794 -8.3615548418820837e-02 5.2827548304453686e-01 2.3988642825946332e-01
+107 2.5707172217335006e-01 3.1596408237036305e-01 5.9804474981491185e-01
+2680 8.5376396295086010e-01 8.1338979398137201e-01 4.5270142303964461e-01
+457 -1.0827311006035010e+00 1.0165759131677328e+00 -1.7206855545859496e+00
+1880 -1.1520084127011814e+00 -1.6090918588187784e+00 5.8187417528225027e-01
+2310 -1.9115534152898432e+00 -7.3698286784908618e-01 9.6834390650913349e-01
+73 -4.7238239993312114e-01 2.2561179543788745e-01 -7.7894178154077887e-01
+2454 -7.4310250428565550e-01 4.6357521952917669e-01 2.0264086639379694e-01
+789 -1.0244030353112417e+00 -4.1278863085345263e-01 -1.8729986094502593e+00
+418 2.9753251245225010e-01 -4.5080612630225406e-02 -5.6925777270508859e-01
+1083 -2.6194664380679117e-01 3.3033604331533689e-01 1.7557425858212945e+00
+2972 -1.7009548144980573e+00 9.5001640309097579e-01 -9.8368750813558770e-01
+2034 -8.8370524106156012e-01 1.9633480608310614e+00 2.1592550807954114e-01
+458 -7.0077926844845928e-01 1.9614809647308200e+00 9.8453246006714956e-01
+1494 -3.5747206660597039e-02 4.5019023422963628e-01 9.9018710465769932e-01
+379 -4.3309645981619010e-01 8.7886255196717156e-01 -2.1583792426046677e-01
+20 9.1728993678260290e-02 2.7046367606747914e+00 6.7528813332387150e-01
+1568 3.9291384792049344e-01 -2.2594878257229896e+00 -9.1958741155904167e-01
+1416 -2.5804207968763482e-02 -1.1667868752793656e-01 3.7536156832195744e-01
+1782 3.3525947403270057e-01 -7.1368350733152341e-01 -4.6298325581323613e-01
+1632 1.2375215002218929e+00 1.5786776849571499e-02 1.1696309313146194e-01
+628 -1.0455216475894129e+00 -5.8744920685196755e-01 -1.3964188660013377e+00
+1366 1.2511333881633918e-02 -8.7830059858501963e-01 -3.7599129616636640e-01
+1247 8.0381574363849184e-03 2.7937430450597367e-01 -3.4202963523706886e-02
+401 -2.1290322760148139e-02 -1.8537526687239998e+00 -9.9378672889971043e-02
+2283 -4.5958117136313481e-01 -1.8895453538010605e+00 6.6188926688676181e-02
+550 -3.1535181897323072e-01 1.7290729830928458e-01 -1.3422766001359279e+00
+191 8.7482006370501519e-02 1.7213935133265776e+00 -1.7174331265716321e+00
+1875 -3.9501043727854068e-01 4.4122518445071296e-01 1.6910933226002706e-02
+1863 -1.7995515739653631e+00 -7.3898701664000110e-01 3.8919164070975165e-01
+627 1.3433322450689911e+00 4.0169877586123076e-01 -9.8279218148411396e-01
+220 6.2375104391334335e-01 6.2459627826148745e-01 1.9894460470946680e+00
+1426 -3.8851942974593698e-02 1.5860609170016291e+00 -5.9128181968887406e-01
+2414 1.7146565799523492e+00 8.9020418088454334e-01 2.3022370447786611e+00
+1699 -5.5695742519514124e-01 -7.8915215426155561e-01 -1.5574012325893076e+00
+1265 -6.4786885104986902e-01 4.9118253779455423e-01 -1.4491040655066010e+00
+1760 -2.3332879594160554e+00 4.2089138199641773e-02 4.8989764150505571e-01
+2625 -1.9006030706079775e+00 -1.6490359838276597e-01 5.5147532300766222e-01
+1603 -6.7042401475790414e-01 -9.5328424913607934e-01 -1.0496638287280324e+00
+219 8.7963042479041365e-01 -6.4525352114479784e-01 -1.8687215887767328e-01
+546 -4.0077759194678292e-01 3.9195316471800634e-01 -8.5108305233354387e-01
+2430 9.5946640435623831e-01 6.0283835216360687e-02 5.6982557806883005e-01
+1576 1.7143569386116171e+00 -1.0611570031408629e-01 3.0087006628893707e+00
+225 -2.4492565584215198e-01 2.3968346100893739e-01 4.5025323964333307e-02
+1583 -8.5045935354123497e-02 1.1197750358980043e+00 -2.8906794653904677e-01
+1391 -7.7505078158581897e-01 7.0812682370606783e-03 1.1408985230344901e+00
+257 -1.0707685098102360e+00 5.1496209705708540e-01 -6.7969972555874142e-02
+404 -1.1777588856605286e+00 -5.0529764567680946e-01 -2.2434998086368996e-01
+1635 -5.5431895362828543e-01 -2.3478029003871792e-01 5.1085145982879510e-01
+2180 -1.0422672903972949e+00 -6.4113600816158134e-01 -7.9162049513715915e-01
+2534 1.7129967034395035e+00 4.2729091779020983e-01 -1.1343198601369173e+00
+1449 4.1829763244704721e-01 2.3827943645834759e+00 -1.1287150666844215e+00
+2697 2.3298020383469042e-01 6.7304189956337968e-01 1.6599679219142081e+00
+977 -1.4340740223048147e+00 1.2481608119471252e-02 -1.7906933615499763e+00
+2298 -3.7321517005317312e-01 9.9023910201307741e-01 2.0762203941804622e-01
+2252 3.5865884360012001e-01 1.9619400737950710e+00 5.0190161426745983e-01
+1675 5.6956699438406411e-01 5.6634872797752078e-01 -1.8758555798031171e+00
+2596 -1.4345975784710063e-01 9.7102891912581901e-01 1.3762484240702324e+00
+566 8.6307495332850337e-01 -1.2439074625718403e+00 1.0416477156897210e+00
+2094 5.3200188990361066e-02 -5.9962566209228707e-01 -5.9830299300883905e-01
+1773 1.4729931142602044e+00 6.5805889612712287e-01 -1.4452441052157146e+00
+1843 -1.9579308689588654e-02 6.1467784164306571e-01 -1.1785374067674130e+00
+2246 7.0624150850323064e-01 -2.9657685535722184e-01 -3.0318660982413809e-01
+1425 7.4264783852367922e-01 -1.1222029563070588e+00 -6.9880111066170669e-01
+247 1.0423502393233935e-01 -2.5775437491878711e-01 -1.3512415944540448e+00
+1824 -6.3746682010399713e-01 -2.6809112524848883e-02 2.0042635765282277e-01
+1178 6.7359544831680440e-01 -7.9835042652530441e-01 -2.9139487265912845e-01
+1852 1.1836154633259141e-01 -3.5284615297029115e-01 1.0788581340634829e-01
+1197 2.4877367155915766e+00 -9.8902584340135558e-01 -1.3796677026048323e-01
+592 1.1177567665656067e+00 2.3249793160486432e-01 -2.2806429990936605e+00
+2742 1.1060958493938542e+00 1.1051126675234821e+00 -8.4091578358396546e-01
+1345 -1.3424041090428013e-01 -2.8622236785462135e-02 7.4466010381393288e-01
+1462 -6.4027848907329454e-01 -5.5087029187473324e-01 6.8386850947561739e-01
+2449 1.7191393323244160e+00 -4.3549482515866000e-01 -6.0282516661078933e-01
+1367 -1.3222867483010869e+00 5.0276763724051854e-01 1.2160298397648388e+00
+461 -8.2948215772351874e-01 2.5584393946401773e+00 -1.2540565911223258e+00
+185 4.3509072545792787e-01 -8.0904429191535598e-01 -9.3179012700091246e-01
+1909 1.8990940242811838e+00 -9.6493918031671622e-01 -1.0163947045711095e+00
+2188 -1.0660645922314749e+00 -9.0564551170487051e-01 -6.0579455632484769e-01
+2700 9.8694895845394726e-01 1.9920852341028317e-01 2.2538812647416664e-01
+848 -6.7022009673349192e-01 7.6981959808683431e-01 -1.0601552833228904e+00
+578 4.4822868262569870e-01 1.2433130094309086e+00 -5.1047109986576455e-01
+545 -1.6911411472894655e+00 -2.3675120294568894e-01 -5.3036848714129248e-01
+146 2.8589743379358872e+00 1.5514470720087949e+00 -1.0575429262983567e+00
+1834 -1.0599336422787571e+00 -4.6203145135264651e-01 1.0161093168191973e+00
+2352 -9.1285708182307568e-01 -6.1788480487201136e-01 -1.3318471126657494e+00
+591 -4.6501419943294336e-01 -2.3419023155972023e+00 3.0869214186310823e-01
+232 -2.0966041264303539e+00 -1.9980111275826506e-01 4.6514449199982028e-01
+2303 4.1605004880103147e-01 8.3696436948879160e-01 -1.9588589109339749e+00
+554 2.2701089015552594e+00 -6.3554067599677455e-01 -1.8611017797202545e-01
+2928 1.0063931563017359e+00 2.6882943372973894e-01 -1.8150111324489571e+00
+6 8.0852822269646318e-01 -1.2592374615274184e+00 -6.9145928360896092e-01
+1698 -1.7850999926067943e+00 -6.6134049150549346e-01 8.5703711307022457e-01
+1052 -7.0366413526413962e-01 -7.3373857124345498e-01 1.7610472127422965e+00
+2316 2.9331954669352595e-01 3.1618750650151589e-01 9.1181488750743422e-01
+1771 2.3995422355255291e+00 1.1897273431704376e+00 -1.1343664287350977e-01
+36 2.4426473788044523e-04 7.4165315422521805e-01 -7.5424094191795543e-01
+2358 1.5409613602682120e+00 2.2575144086404602e+00 -9.7552597931007490e-01
+606 -2.2369338228235730e-01 1.9316256887824110e+00 6.0849914178296682e-01
+1299 -6.1836798830848183e-01 1.1490492899907512e+00 2.5949287086958361e-01
+12 -1.8923293197166347e-02 3.7746386958104555e-01 -6.6248726246419998e-01
+1740 6.0899512473965234e-01 -8.2103425842127753e-01 2.6345132178897457e-01
+1278 -7.1076748499873654e-01 1.1286400795998146e+00 5.8393443641355625e-01
+2465 -7.0272248485288680e-01 -1.0832636633209369e+00 8.5146454102187286e-01
+151 -2.1045406281261789e-01 8.7557580066055768e-02 6.9855895702268100e-01
+2545 7.1957291672065560e-01 -7.8768067725738844e-01 -2.5861973172767894e-01
+725 -4.1487944049324543e-01 3.8186181060886132e-01 -1.2021120448790192e+00
+1562 -6.2006949971575098e-01 1.5790409859266026e+00 -1.7231169015274521e+00
+1131 1.3296705923641710e+00 1.0659381944794941e+00 -2.1740666076120911e+00
+362 9.9164301627150464e-01 1.3742233975310698e+00 -4.8803447293180746e-01
+682 2.1584410074264260e+00 1.3981169577881822e+00 -8.2924347278634430e-02
+1754 4.1933165888727073e-02 -2.7047202161528106e-01 8.1758741492023546e-01
+1734 -3.5692886124282891e-01 -1.9782483435249829e+00 -2.1789432776373983e+00
+1090 4.5102563740519142e-01 1.3680892511519018e+00 8.0899198709346823e-02
+2096 -4.0200649527516785e-01 -6.5434498498220084e-02 8.6640730453076598e-01
+1002 4.1735923438640982e-01 4.8049877307630390e-01 1.5639739656300145e+00
+1133 -1.4799466985486401e-01 1.2815578958186280e-01 -7.6917397019942180e-01
+1168 1.6267121844534335e-01 -5.4630435396354982e-01 6.0738530299628446e-01
+770 1.8826951702463629e-01 7.7595700872878681e-01 2.0571225865447423e-01
+948 2.1927701328419413e+00 5.5094791030369661e-01 -1.6909763091168095e+00
+1404 6.6638562245347788e-01 -1.5506523569611257e+00 -5.8812916183271474e-02
+2687 -5.6433107645631719e-01 -4.9841559117951267e-01 -5.6692022453294494e-02
+1966 -3.5764477477596868e-01 6.7956634327289933e-01 4.3470858824083775e-02
+1093 5.2880600952634782e-01 -1.3046063088788460e+00 9.2354256130744417e-01
+1593 -7.4470430155537826e-01 -4.8763045367416957e-01 -1.5035022254134347e+00
+2631 2.2781343872511255e+00 -1.6845595232244401e-01 -1.2088994933112121e-01
+2513 1.8976644479467830e+00 1.3389977492886087e+00 -1.5735888374648350e+00
+1727 2.5168397282463424e+00 -1.1971889246590187e-01 -1.5898865517519656e+00
+2472 6.7343304945596177e-02 -2.5517182253103043e+00 -1.4620586102702049e-01
+269 -1.9124303930684228e+00 -1.5863025719706845e+00 6.7335781074558643e-01
+2107 7.7950972936749308e-01 -3.9020784183279494e-01 -1.1122970779120656e+00
+1415 -2.3136810581585734e+00 -2.9343037443848200e-02 -1.6917746572608530e+00
+111 -6.0528642807755639e-01 -6.5035492237366810e-01 -2.5979916161377281e-01
+1859 -3.8455780662267181e-02 -1.5220233495567415e+00 7.3993971996766039e-01
+1807 9.0264060897134679e-01 1.3008353538522477e+00 -2.6598999632087644e-01
+2039 1.0479957360832186e+00 -2.1136767696305765e+00 2.7465244234146124e-01
+493 4.8301669604019326e-01 1.7566199955743786e+00 6.2115037573560350e-01
+1738 -3.4055049563451822e-01 -1.4937235379865119e+00 8.4879282058111971e-01
+877 3.9137403962354700e-01 4.4993006192230811e-01 2.9094191679082976e-02
+1236 9.0015477129096744e-03 3.8149965022031501e-01 7.5032013528423114e-01
+2548 1.0127061769025298e+00 -4.2521470441770137e-01 1.1643600466678097e+00
+2504 6.4445801320981810e-01 -1.8520382188001536e+00 2.8215335803737429e-01
+1006 -1.7513012685459545e-01 -6.1871369721889435e-01 -1.1312452231603052e+00
+2320 8.1467450059819091e-02 2.0793162129427351e-01 6.4954409009152092e-01
+1855 2.0839802375247114e+00 -4.4962184099266067e-01 -1.3290202206814453e-01
+1914 4.7012920836616306e-01 -7.1353165806028385e-01 7.8118706255509673e-01
+1962 7.8253177463076828e-01 4.6886527250388271e-01 5.4465743108119280e-01
+690 -1.2706114209457298e+00 2.5610517710509367e-01 4.1680269727065433e-01
+2269 5.7205571477571437e-01 1.9275529629099383e-02 -5.2493919687838109e-01
+1534 5.0169209884576449e-01 -1.3398798930150964e+00 4.5877285971713833e-01
+2192 1.3333339574758332e+00 -3.3633741939003170e-01 -5.3981665148436997e-01
+703 1.5854822690050363e+00 -2.4218669090829287e-02 1.2198144423296339e-01
+855 -7.1365501775795104e-01 7.1533536136260223e-01 1.7324884108811156e+00
+2867 1.2024714184358256e+00 5.4938163387249950e-01 6.2955523709245054e-01
+2304 -7.2917459435777865e-01 -2.3628123998095968e-02 -1.0158349612270487e+00
+1600 -3.8211721515770111e-02 -7.1091986927088979e-01 2.0188157339158552e+00
+2881 2.3360218094134411e-01 -2.3232119944362528e-01 1.7244336036686594e+00
+809 3.2165331884904652e-01 9.9729049349924126e-01 5.8191546608889255e-01
+2688 -1.5017310579721534e+00 5.6380851485588468e-01 -2.9138467479521424e-01
+278 -2.3455481244454285e-01 -1.5719124665759823e+00 1.0193378332380527e+00
+1597 2.0223205695997504e-02 -1.1144813995578682e+00 -5.0891070715420067e-02
+1694 -1.3793124646610373e+00 -9.0198767829896176e-01 8.9546679926584294e-01
+1832 3.9990904105879882e-01 -9.4182977829607717e-01 2.4377436012751597e+00
+122 -1.5573026109101604e+00 -1.3180116460311453e+00 1.4369822578247873e+00
+822 -1.0432661976907913e+00 1.1528321321031940e+00 6.7468384477737875e-01
+2999 3.1889280278486434e-02 -1.9943857045315547e-01 -9.6357720994013230e-01
+1051 -4.7609596002585625e-01 -1.5388134252758001e-01 -2.1570973315730786e+00
+1751 6.5152325080933282e-01 1.8936058135367947e-01 -1.0054987808765593e-01
+2952 7.7646985774808575e-01 -9.5869426690445725e-01 -8.8590739873234148e-01
+916 9.2044244518085350e-01 6.7493134701536350e-01 1.6984659950430003e-01
+2551 8.8474595367183551e-01 3.5379330233282807e-01 -7.9902582218581164e-01
+844 -1.4287874366013102e+00 1.0787929678796475e+00 2.4439956371865246e+00
+153 1.0283453271764771e+00 5.3634646860840030e-01 1.4608774803415383e+00
+2926 3.1925102248331491e-02 -8.2063823786264201e-01 -2.4482412667893962e+00
+1493 -3.4075328846293063e-01 1.5581185858267524e-01 -3.2973626691970653e-02
+737 -5.8534959383123897e-01 2.1867023590950718e+00 -9.9408060767747841e-01
+658 -1.4354185539936484e+00 -5.2618256756857562e-01 2.9427269372706955e-01
+2845 -8.4741976519522744e-01 9.5773023901856616e-02 -7.6529328156975329e-01
+599 8.5481986248196606e-01 6.1024192072798833e-01 4.4241562499392340e-01
+782 1.7735578822200944e+00 -2.0834633511557338e-01 -7.1047559421915019e-01
+2685 -8.2691679966416687e-01 1.1260081053726008e+00 -1.2491682667183306e+00
+2558 9.5317234218597124e-01 -1.8328476020812612e+00 2.7165073407559015e-01
+2341 -1.6863877614321592e+00 1.2151986962205905e-02 -1.3802249278735466e+00
+1466 9.1764176343356940e-01 -5.6582288136841208e-01 8.4645804984794126e-02
+524 9.5004586627127752e-01 -1.0229841863663838e+00 -1.6984848373831063e-01
+1101 1.0689863416746019e-01 2.9230535788581030e-01 -1.0729954317752814e+00
+1300 4.9262257496573342e-02 1.9416078307330593e+00 -4.5078142456757830e-01
+386 -6.5499715882219212e-01 8.2120948629976986e-01 8.5408056162329482e-01
+414 -1.2450021061516048e-01 3.6868781415095364e-01 -1.0147395945608917e+00
+507 1.2312845076664336e+00 1.0615380426522598e+00 -3.6978974116870289e-01
+2162 -1.9337417797950445e+00 -9.6339811092588667e-01 -7.3706605532119984e-01
+1153 -1.4953748619175542e+00 3.9099092771052296e-01 -3.4069792839285706e-01
+2735 1.5843769325236068e+00 -5.1567004161367247e-01 -8.4516492286256184e-01
+497 -9.9137246604161189e-01 -1.7446408980252159e-01 3.6738304103096853e-01
+1114 -2.6181672554702656e-01 -6.2609240029972213e-01 -8.2788673734242990e-01
+981 2.7217961285817338e-01 -7.1957450905298503e-01 -2.0354685192360203e-01
+2146 8.2299718939949185e-01 -1.5592590525422059e+00 -1.3471810572211138e+00
+603 3.5356816154190707e-01 7.1682720561037971e-01 -1.8718654027677731e-01
+2106 1.2005207148963246e+00 -6.2969266825248205e-01 -7.7176257127325298e-01
+2501 1.5032965472320137e-02 2.3289803229595160e-01 -1.1641002922114241e+00
+2537 4.5059962695740230e-01 8.2121051059111505e-01 -1.4889394856241940e+00
+2256 -9.7440702983941543e-02 1.1709725175106047e+00 5.5562495585535471e-02
+1559 1.5951550627032016e+00 -1.0734516547199588e+00 -1.4635182200961325e+00
+1984 -1.1749427843945115e-01 -6.7386039913484352e-02 4.2682080956932877e-01
+2138 -3.8766770921392524e-01 -1.6483037335856698e-01 -7.5454326685860440e-01
+688 -5.7997189228663548e-01 3.3204993506411340e-01 -2.5711741459919096e-02
+1651 -2.3022670257720310e-01 -5.1498455187131820e-01 -3.3252359783430702e-01
+2367 1.0116789589567650e+00 -1.7308817504897691e+00 1.5663952937209444e-01
+541 -2.9437363446796050e-01 1.5005752125246301e+00 -1.9123371266024186e-01
+2429 2.3904003136389562e-01 7.3513820641994598e-01 1.0217304102350404e+00
+1218 1.0546048170423505e+00 3.7652709254491856e-01 -1.0521996305299259e-02
+80 -5.1422249925866970e-01 3.7948060702207131e-01 -3.9067372435398751e-01
+2515 8.1957441938712805e-01 2.3931089906578037e-01 1.6360517475127465e+00
+88 1.4012811516481698e+00 1.2354043296539459e+00 2.3897296234475375e-02
+2110 -1.2827604266463566e+00 -2.0577960120176630e-01 1.1382229083221489e+00
+2108 7.0483303959022814e-01 -5.1255265906481606e-01 7.1782239234091483e-01
+59 4.5794034427073860e-01 4.4937046317070994e-01 -5.2834094369253459e-01
+1423 7.0973237287173074e-01 2.4476973340035088e-01 -6.7393710950687102e-01
+670 -9.2879097394053645e-01 -3.4234318444531384e+00 -6.3374434774565680e-01
+663 -8.9723367542817267e-01 -3.6498085053279572e-01 -1.7419995631195502e+00
+121 -8.1334619540734931e-01 -3.9737769550847568e-02 -1.5567899970947159e+00
+365 -4.8306949962670642e-01 -1.7265370608781125e+00 -6.9218701141115413e-01
+2468 2.1317848062578739e+00 9.0990001742978222e-01 -9.4034432654962707e-01
+577 -8.0327979890916745e-01 8.9232305803208856e-01 -2.3725603231632683e-02
+2635 2.2083171514153294e-01 -1.2778079349562665e+00 -4.4263615331466588e-01
+890 -7.7634823772703809e-01 1.5552158934817198e-02 6.8222069741295199e-01
+1193 7.8237740562050473e-01 -4.2378391900834667e-01 1.7814644971991367e-01
+48 2.5509633080943633e-01 -9.0417423755196458e-02 -1.3955952319010438e+00
+588 -4.8727590682076477e-01 -2.1689079555695154e+00 1.3575336373095717e+00
+2976 7.1822310421889535e-01 1.5573572639614561e-01 -3.4377997275389371e-01
+799 -3.9613017793205552e-01 -7.5742328713080920e-01 -1.9182229801731926e-01
+825 7.0935290429546521e-02 8.7595763896746237e-01 -8.6186615994743487e-01
+1230 -2.0607768194553769e-01 -3.8041312268379429e-01 -1.0463536915662057e+00
+2529 -2.1474573272143604e-01 1.1830281396762499e+00 4.2554014290161188e-02
+17 -1.8698978258869503e+00 -1.3588966337464132e+00 -5.4140025586260898e-01
+2055 -9.5668585255110294e-01 2.7721701523758113e-01 -6.8991763805864725e-01
+1588 -3.1224166704207834e-01 8.4344091644426789e-01 -5.1485569839593892e-01
+622 6.2092284952128241e-01 -1.6481652791565717e+00 -1.2531400444712402e+00
+2395 2.5026499447811712e-01 3.7643018871704986e-01 4.0254103830746679e-01
+46 -1.7659849450558707e+00 5.7379221831446968e-02 3.8803687897087752e-01
+1804 5.5168867872330429e-01 1.0283314772092831e+00 -1.5662740909899611e+00
+2161 -1.1803393216275496e-01 9.6436910439808607e-02 5.9055068167537937e-02
+740 -1.8017762123932891e-02 -4.5674257318337852e-01 -9.6859479796028425e-01
+2836 -4.4886339990774560e-01 -1.2073202620806385e+00 2.3946645192505236e-01
+2524 -2.8209439383514140e-02 1.2268819580790893e+00 -4.3006417617552295e-01
+473 -1.9900480663144349e+00 2.2612998606234666e-01 9.5624063121485392e-01
+1987 2.4614732432822319e+00 5.2335720151027854e-01 -4.5289819925679770e-01
+2803 7.2411184899640313e-01 -2.5191725959663303e-01 -6.2008498865304976e-02
+843 -7.6614882751074787e-01 -5.3151014283150766e-01 -3.5596986460634333e-01
+1524 -7.6010362527841935e-01 6.8389504988062777e-01 1.7697679275574403e+00
+2755 -1.9891397437338292e+00 -2.1002146718574353e+00 -2.3036151223677560e-02
+617 8.0072400620078565e-01 6.6386394531988346e-01 -4.3486458655585913e-01
+2764 2.9734837623125534e+00 6.0634870036119015e-01 -2.2191901311367032e-01
+369 9.2698913586000242e-01 -1.0790884269709196e-01 1.7564465304617676e+00
+1078 -3.5938050560812562e-01 3.9465639817721965e-01 1.9164691347156237e+00
+1846 -7.1198172667686410e-02 2.2775416051666617e-01 1.1747575269070305e+00
+1091 -6.8088658228601617e-01 8.8930604862970308e-01 6.9432413408434013e-01
+51 1.2202011865618609e+00 -7.6215904369167109e-01 -7.5304202307941126e-01
+1546 -2.1524992898296497e-01 5.0345157137841379e-01 9.2697580341773178e-01
+1411 -7.2610961335207991e-01 2.6800643432597049e-01 1.1871375978236030e-02
+1497 2.1562283062078688e-01 1.5752874990737895e-01 9.9348880744395762e-01
+2257 -1.7510539100744138e-01 -1.3515309173040140e+00 -1.6425194629067454e+00
+722 -1.6498152316242509e-01 6.2178027025963123e-01 9.0871577826165706e-01
+1775 -1.3443079481705786e+00 -9.6049588251215412e-01 2.0998189973737502e-01
+11 -1.0959367058637459e+00 -5.4241366271999891e-01 -9.2797478541518919e-01
+1343 -4.8436919817479795e-01 6.1506053695869853e-02 -4.5558702685755170e-01
+2750 -2.0992583293254028e+00 1.1086366483839574e+00 -2.5643141219581991e+00
+1171 -1.3660377560400723e+00 -5.6153888578064015e-01 -6.4754086743073891e-01
+915 9.8106644978478574e-01 -1.3899128397977756e+00 1.5748836624267843e+00
+1237 -1.0061341864029613e-02 -6.7484510262816522e-01 9.9943528427554462e-01
+2323 -2.3375626878860674e+00 -2.0476234940596369e-01 1.0345985622584528e+00
+2396 -8.8081477971432232e-02 -1.2903377024715053e+00 8.2578747751327086e-01
+511 -2.1437212193339636e+00 -3.0234086084411671e-01 -8.2241406942700393e-02
+2675 4.7368176823612385e-01 1.2539030383113805e+00 3.6451590546645107e-01
+2254 -1.3987116832838216e+00 7.2856028611822965e-01 -4.0737861667319769e-01
+2422 1.3884251973083034e-01 -1.9719545414489859e-01 7.5598242178534569e-01
+1916 -3.2402412864873525e-01 -7.7356619718881259e-01 -8.8586930585543089e-01
+463 2.9590383453729602e-01 3.5331894653071977e-01 -4.4187673684745132e-01
+434 1.0996699993098060e+00 -1.9597236177767434e+00 4.8653346375170869e-01
+2702 1.1163491928817355e+00 6.8688518816827759e-01 7.1305797895906214e-02
+2473 4.8438652123613912e-01 2.5013297989680827e-01 -8.8576133806677415e-01
+2665 -1.0855674296367539e+00 4.7037495636966742e-01 7.6523535138425047e-01
+1673 1.0138158986677401e+00 -1.6259143298926484e+00 -7.9892277673522727e-01
+1819 -1.1864778909855298e+00 -1.5691209052646191e-02 1.4857927421332329e-01
+1564 -2.0339273579692910e-01 -1.0416321080646820e-01 -3.9354050813107257e-02
+689 7.2879187699166392e-01 1.9269469521518884e-01 5.4901483939293760e-01
+2856 1.0290878907228984e+00 -1.0769741950217333e+00 -5.9045517764779998e-01
+1640 6.3704166702444875e-01 9.4160036045247064e-01 2.0959262625406918e+00
+129 -3.7393171797391864e+00 -1.2813501975317776e-01 -3.9561172696129759e-01
+2195 1.2510070702805867e+00 9.6292194428536357e-02 -1.4544083704370636e-01
+368 1.6775819541648405e+00 -1.8053706155215707e+00 -8.1308425549196750e-01
+2144 4.9024304565714782e-01 -4.8186958225718574e-01 -7.6676997934389857e-01
+2372 7.9323198562128849e-01 -3.5928212031477630e-01 -9.7850939275450877e-01
+2299 2.2848693246389802e+00 1.2305389339569544e+00 -1.1960062594727878e+00
+1946 -2.0099808348587045e+00 -7.7958801818375245e-01 -1.2359830821686493e+00
+973 2.7084189883007803e-01 -5.0935167186563457e-01 -4.7168538187643111e-01
+3 3.5726340676893609e-01 -4.1120058363179490e-01 -1.5478470588646649e+00
+482 3.6098440818374705e-01 -3.0211903705645415e-01 -3.3200218388450325e-01
+2182 1.6443781481875042e-01 -1.8284080676637282e-02 1.1657569677943154e+00
+133 1.8871601632916543e-01 3.9769954202930946e-02 2.4249876968923043e-01
+1318 -6.7363070558526561e-01 2.3448725074193337e+00 -8.1846269587331211e-01
+1321 1.5928763735771116e+00 1.8096017488376732e+00 -2.1568152848798605e+00
+1139 -1.4738094044243111e-01 -2.4441426352752804e-01 -1.2119142000581922e+00
+1540 6.4652583280292208e-01 -1.1105632326165620e+00 -4.3613694074139564e-01
+516 -5.0124765873529831e-01 2.5386034349716546e-01 -5.0378794000979821e-01
+1241 2.5063028359693373e-01 -5.2908601721212889e-01 -1.2358222556627219e+00
+515 -1.0842860660629794e+00 1.4137957884597394e+00 7.2346563521794294e-01
+1923 1.5780038840368318e-01 -1.7001366082303815e+00 -8.9146816572093734e-01
+1453 2.2504310974225614e+00 1.2016629698719097e-01 -4.4743182562436701e-01
+1770 -7.5896693603582810e-02 1.3598047674901623e+00 1.8912239140506300e+00
+616 -4.2027275763941108e-01 1.2388757763686362e+00 -1.1914093044917187e+00
+1822 -1.0104603012949913e+00 -3.5006110860097826e-02 -8.2421289203766207e-02
+1305 -1.6227318286628020e-01 5.8357008347229655e-01 2.1045829614572003e+00
+597 -7.1933744484926054e-01 -9.1099741352164232e-01 -1.2664385427628636e-01
+253 4.9784653099038673e-01 9.7378313287970086e-01 -9.8170081217068106e-01
+972 -5.0462806217593748e-01 4.8636041107161958e-02 -3.6338784939140750e-01
+928 -1.2989751390363409e+00 8.6282413601859809e-01 6.6611588173731584e-01
+2142 -1.5728225962542151e+00 -1.2714230998753129e-01 6.9153815148659470e-01
+10 -3.7458212076992409e-01 5.9016793111288557e-01 -2.4743684837322917e+00
+2672 -7.8359583871183147e-01 1.7690030603693119e-01 -9.0422489790018723e-01
+1088 -3.7816647944575110e-01 1.4199490673528994e+00 -4.0040010067300336e-01
+2317 -1.9618992739955321e-02 1.0755747992725509e-01 -3.4654197269237663e-01
+1344 -4.0015568013903498e-03 1.3673610931824562e+00 -2.9931731061714056e-01
+2469 -1.5414244791100162e+00 -6.6907595292941324e-01 -2.7176998810389827e+00
+2855 1.8962930721794726e+00 5.0126352932933949e-01 -5.5491429940753989e-01
+559 8.6313400040251131e-01 -1.7741616804116709e+00 -1.1498990602780796e+00
+2405 1.2073836108062421e+00 -1.0435412299413864e+00 -5.0964837542944486e-01
+1473 -8.2411120843303720e-01 3.7137469905998477e-01 -1.1144694232025432e+00
+1149 -8.3601947454092618e-01 -7.4462927358994080e-01 -8.3322011177681643e-01
+411 -2.5699003632314813e-02 -1.5013611141292146e-01 9.2036802887514368e-01
+166 -2.0492325054903797e+00 -2.5677284223936303e-01 -1.4167221987443341e+00
+924 -5.7097826511603993e-02 -2.6187071265551071e-01 -1.2660874874222319e+00
+676 -2.1809677721648959e+00 1.6972544153171457e-01 -1.5270550101481108e+00
+687 -4.9597422461904084e-01 -1.0319420866349813e+00 4.5995659190988442e-01
+1003 -6.6633219075050421e-01 9.8350599151333729e-01 -4.1085403666829146e-01
+1648 -1.2496213098446658e-01 -1.5431425911593799e+00 -5.3024199914586401e-03
+243 1.0057979338300638e+00 -6.2096199851090816e-01 -2.4044327370491216e+00
+952 3.8395724191850744e-01 -1.0821807909511674e+00 1.0168951489710896e+00
+1607 3.4791468441228668e-01 -3.3873435401788149e-01 -6.7242635060063427e-01
+2797 5.7096353288295398e-01 -9.6329516822840050e-02 -2.0635049649295802e+00
+902 2.2601812772550034e-01 -6.9175646719547712e-01 4.1459785184566528e-01
+2636 7.1050573515673388e-01 -3.2915941964222933e-01 -1.6916573341130203e+00
+239 6.8912345947789033e-01 7.4455364586165329e-01 1.0868643703685099e+00
+1860 5.7137355284502700e-01 1.2989698351051107e+00 1.1824237999124634e+00
+2249 -9.6905752535117129e-01 2.8630662347856323e-01 -8.5150325426002238e-01
+970 1.2390513541528767e+00 3.1824411863938817e-01 4.9997411071752551e-01
+976 2.3276953011817694e-01 -1.2315632715545059e-01 -7.3090292572985227e-01
+1681 -2.7324730018618050e-02 2.6768635607543566e-02 1.9758169513362032e+00
+2737 -4.2586942927123639e-01 -1.2282114643874387e+00 -4.4605727009263921e-02
+734 1.2476979433515774e+00 1.1823004738131986e+00 -1.8046874695843624e+00
+292 8.1383245408729254e-01 -1.9118934496300735e+00 -5.5342057165245084e-01
+664 7.1218231889226369e-01 -7.9120560206653279e-01 7.7748479720964703e-01
+2784 -1.0476101584008976e-01 -6.1384186680452063e-02 1.7336129578432109e+00
+2245 -3.7443842304975639e-01 -7.8996484177554083e-01 3.2088984311043567e-01
+937 -2.2491404014710548e+00 -2.1936866181765366e-01 -1.1749022310160724e+00
+2276 -1.0021351739317512e+00 -1.4867761064983005e+00 -7.1661386080985012e-01
+758 -4.7646977678653002e-01 -1.2190511050781643e+00 -1.2212928345398877e+00
+519 -1.9749290252441960e+00 1.0466385617230543e+00 -2.3571874558403916e-01
+56 1.5308969585538665e+00 1.8908319335439088e+00 2.0586900284371739e+00
+800 -1.0611568311956314e+00 -1.0816926085833432e+00 -4.0654761084573399e-01
+2122 -7.1508881823577242e-01 3.3441453862503967e-01 -6.3783151998235366e-02
+1599 9.3984872565323063e-01 -1.4370144274458477e-01 3.6372968396064248e-01
+747 1.8451567430230253e+00 -1.5034240923572948e+00 -7.0665323436051308e-02
+1609 4.9578562939940041e-01 3.9894143005412985e-01 3.2251919265146556e-01
+2443 1.5174220982932052e-01 -1.7205850943161201e+00 1.6984652681997403e-01
+2229 6.4139698375458143e-01 -1.0272332287688222e+00 -1.9091818613986842e+00
+991 1.6384773139046751e+00 6.0211258668566903e-01 -2.6131494327729667e+00
+2810 1.6936869282154900e-02 3.8199542254448804e-01 -2.9212714017593305e-01
+2727 -1.2799232579580302e+00 3.0774722395783438e-01 -2.9997074219831199e-01
+1570 1.8116955072743218e-03 1.0810324301182006e+00 1.7425476963872477e-02
+1177 7.0153899023349020e-01 -6.2140007382383866e-01 -1.6816067752449260e+00
+2614 -1.4015552392954358e+00 1.2801967387215507e+00 -1.2848056027336158e-01
+2056 -1.2769864459105023e+00 -3.1900631412816816e-01 2.1565656216934020e-01
+2227 1.7922923839608326e-01 2.0237736374594517e-01 9.0515365698852635e-01
+2099 2.3882554149046658e+00 -6.3711566851952917e-01 5.2200388703138978e-01
+549 -1.2472599606304832e-01 -8.0430804662177724e-01 -6.0347562755475537e-02
+174 -8.1454771031000917e-01 3.5320416074653049e-01 9.9644065368259804e-01
+2792 4.2831509725862815e-01 -2.7034763320119684e-02 3.5753462321635160e-01
+1227 -1.0728148660537731e+00 2.6049151963654786e+00 8.1226013918157602e-01
+2453 -8.7725686645150902e-02 4.3613499316016452e-01 -2.5765170526291348e-01
+2850 2.9832977811117828e-01 -8.4957356605827272e-01 4.3926051546863265e-01
+1748 -8.1574596734410187e-01 -1.5572256846819696e+00 -5.7929410322002806e-01
+366 -9.0708242947698159e-01 1.6810297759584869e+00 -7.8156167513076291e-01
+2292 -3.9407589486379174e-01 -7.7531644550371126e-01 -2.7819855613058697e-01
+2052 -2.4119575209572333e-01 3.9411914555993782e-01 4.4917112052161479e-02
+2834 6.1182577126918725e-01 4.1482784303457731e-01 4.6791793086459821e-01
+1869 4.2280560267424755e-01 -1.1003895682006859e+00 1.2227376994769239e+00
+2841 4.3784563182678071e-01 -3.9405728283790969e-01 -1.0292695298207971e-01
+2288 1.3147086743415433e+00 2.1694465231935481e-01 -5.9657203453253604e-01
+50 -6.1979738754367752e-01 -1.4272648077401262e+00 1.0641502607579412e+00
+1086 -2.1167854770852812e-02 4.6146420758769435e-01 -9.9139046480561233e-01
+344 2.1375082421639044e+00 -7.5464126568807188e-02 1.3993548951423038e-01
+1658 -3.7962230810342523e-01 6.6833091043125015e-03 8.8975710325099766e-01
+2586 1.4088028654779627e+00 9.1918205488355587e-01 9.3423065964622831e-01
+2937 -1.8076450191150546e+00 1.6212705374529435e+00 2.4051787816020612e-01
+498 1.0514537524123579e+00 9.6024377170738562e-01 -1.8985585131149814e+00
+1759 -1.3409961801129983e-01 2.4724398465854047e-01 -9.2500181414172045e-02
+2719 3.4191465762700946e-01 1.7783915029327320e+00 1.4340149460967724e+00
+2690 8.6437784763322456e-01 3.7086914431257234e-01 4.4157115156206173e-01
+2145 1.4587002695237705e-01 1.8792057981785076e-01 2.8953915222049442e-01
+957 4.3705330081468619e-01 -8.9153155172081888e-01 1.2471922437940299e+00
+1910 -1.1194938083838200e+00 -1.7704740755375548e+00 4.6812420719248682e-02
+150 -1.0663743358379483e+00 5.7064136562091206e-01 3.9711484037833722e-01
+295 -9.6482167809973074e-01 1.1444500425782851e+00 1.0869606304791810e+00
+1275 -1.4919000427672733e+00 1.3930409608674918e-01 -5.6132807983753774e-01
+824 4.1410411888129006e-01 8.2934645353009406e-01 1.7461643408823865e-01
+1506 4.6536335856201849e-01 1.3550032483487244e+00 -1.2566752035905069e+00
+947 1.0776635585463312e+00 1.1074640390881428e-01 -7.1128090911745212e-02
+659 -1.0788947721746878e+00 3.4879195796187634e-01 -1.1576971972765151e+00
+1842 1.8004251365318447e+00 -1.4028224543682652e+00 9.3548791491359629e-01
+2739 -1.5152556248422879e+00 -1.1496646169975910e-01 4.5564321470748004e-01
+2663 6.2693793749051774e-01 4.0039946319035907e-01 1.1134247681607623e+00
+2163 -2.9160037558142453e+00 1.4846734848678058e+00 2.3136719446551937e-01
+701 8.3988782697342201e-01 -2.0852199038377535e+00 -3.2849286599538480e-01
+1960 -1.7538937070093827e+00 -6.4669701495039644e-02 -8.0211203805022432e-02
+2528 -7.2794005378333781e-01 -1.4082509159424395e-01 3.1644616446338785e+00
+2164 -8.5721514488887422e-03 -5.5387175795213195e-01 1.6207639281617536e+00
+2040 -5.7182906975079328e-01 9.8645797625206255e-01 -1.2432794311527697e+00
+248 8.3712415791555295e-01 -8.9765948155729480e-01 1.2092072576628896e+00
+865 -1.8116599341142947e+00 9.6375139077116301e-01 -6.7203357979558542e-01
+642 -5.5280977750372873e-01 1.1430545443370090e+00 1.8212078009293622e-01
+2708 -1.2129088656416037e-01 7.5610648622864729e-01 8.3335530502889754e-01
+574 5.2235772181401208e-01 3.4676247803256621e-01 5.0012814367242076e-01
+2597 -4.6327869010612016e-01 1.5440812505280666e-01 7.9047858034053597e-01
+771 1.6129980623522420e+00 1.5857035592438748e+00 -1.7278695316134769e+00
+2842 1.0346427239502209e+00 1.4376331991762747e+00 -3.5002619945562075e-01
+2541 2.9472033879848752e-01 -1.1651371199736033e-01 -8.6451424446339159e-02
+1429 -9.9430121674152527e-01 -1.8284772352035896e+00 -8.4441976147518838e-01
+1934 -1.3350082131859100e+00 -2.2492948115228448e-01 1.7488897358802593e+00
+635 -8.1776800910956726e-01 1.2104993792696919e+00 1.0894951451946528e+00
+1370 1.0510704567366573e-01 -6.6540340524665498e-01 9.8053261762996669e-01
+2201 2.3124636462792628e-01 -1.1620854666294855e+00 8.6855297226666262e-01
+1692 -1.4442290595071061e-01 -1.2529789535641329e+00 -4.0706243957131905e-02
+1953 3.7573107910973746e-01 -1.2210436939867462e+00 1.2648224740325393e+00
+2401 -6.2963080282899486e-01 4.1924731125940595e-01 -1.3971371262791377e+00
+1797 -6.9884877432411541e-01 -5.1423444811330310e-01 8.6779599729005230e-01
+1166 -5.2650181299482846e-01 2.3380893862915747e-01 -9.1678853113813596e-01
+1574 6.6349117537649960e-01 4.4218340605143153e-03 1.2342135048761853e+00
+673 8.0304823072934106e-01 5.3562783105967648e-01 6.8913576579697811e-01
+2746 -3.1697770567291922e-01 -1.0585035672348129e+00 1.0588568509645253e+00
+1042 1.3687663413902706e-03 3.0276570063879971e-01 3.5799573221386227e-01
+2200 4.2141863261817358e-01 4.6545904824478079e-01 6.0949415024039211e-01
+1997 3.9258268535481194e-01 -6.6890472558165459e-01 3.4781007460971386e-01
+509 -5.2113972774181727e-01 -4.7438867544530994e-01 5.4911851955869317e-01
+1072 6.7908909713352028e-01 1.0360355489294277e+00 -7.4902307115544220e-01
+1013 1.2910932024466439e+00 1.0630897730014661e+00 9.8489014055187662e-01
+2660 -5.5312433278768969e-01 -3.7225765708651104e-01 -1.0363531906532921e+00
+135 -5.2789569765862798e-01 -5.4547460976877460e-01 -3.6606376756808984e-01
+84 -8.7006882678116959e-01 -6.8128423146336647e-01 -3.1376785384507555e-01
+864 -7.8851491418912700e-01 5.5540028779885386e-01 -1.2266860251593668e+00
+756 -3.1083074713315811e-01 -3.7233478991085550e-01 -1.4334717746588883e+00
+276 -6.2819281522699466e-01 1.2873788032133848e+00 1.0945090447970589e+00
+686 1.2075576999952971e+00 7.0404185369792538e-02 1.4149804221429299e+00
+525 -5.0129225450180637e-01 1.2799766604574696e+00 -3.4110442453184819e-01
+55 1.8393455499580198e+00 -4.9029044224244056e-01 -5.2841228590880052e-01
+2445 -3.1309260558388724e-01 -7.3331826715248938e-01 -9.1710956656671516e-01
+1038 -5.8222454534963575e-01 -1.0414372789095523e+00 -7.1704881770750184e-01
+1642 -4.6115032423432223e-01 -3.4659600253121253e-01 -1.3168274867728347e+00
+1297 1.5156854436409726e+00 -1.0849777862655365e+00 -4.0610107998542405e-01
+1352 4.8150007189085109e-01 -6.9493197790378214e-01 1.3207559647688492e+00
+444 -1.3515523237896662e-01 9.9523487262628041e-01 2.0017372762527135e+00
+182 -8.6250842736599220e-01 1.1914184341445333e+00 6.7959866582224304e-01
+1917 1.0555663825006720e+00 1.0608765803845924e-01 -4.7135886677929378e-01
+1219 2.8826162131957828e-01 -6.9400165825542981e-01 -1.5866615322951934e+00
+1885 1.5159658061240897e+00 8.3530182886692894e-01 1.1329208242187747e+00
+424 -7.0242286580157287e-01 -1.1365362835432475e+00 -1.1627606048513630e+00
+1907 -4.2653403131929296e-01 -2.8635253502437424e-01 -2.1642366384546490e+00
+2452 -6.0120592688992169e-01 -5.8338071189541429e-02 1.0052017608001700e+00
+1577 -4.3974454966732934e-01 -7.9730160665822769e-01 3.9785200653170394e-01
+2490 -4.6904138625422531e-01 -4.0712375602400946e-01 -1.2854963956781653e+00
+614 6.5281190066218087e-01 6.3606617725192904e-01 -6.9222738241056736e-02
+2085 -5.6885928787549922e-01 -2.5039753468517922e+00 -6.9983685298117271e-03
+1866 7.7338788064534070e-01 3.5433824546477521e-01 2.8371838773575880e-01
+974 1.9111369534789388e-01 -1.2637341679947647e+00 -2.2564150221201584e-01
+1472 -1.5669569715562295e+00 -3.1061299695678130e-01 -2.4097288787405810e-01
+1203 1.7420479071686847e+00 1.1571351994707137e+00 -6.3807514241594199e-01
+4 -1.1251629304184816e+00 -1.0691543896257132e+00 2.0081931664034339e-02
+1985 -3.3056684914199908e-01 -1.3273286012283234e+00 1.2060273374853305e+00
+1306 2.8066348536109655e-02 2.7405129252345850e-01 -4.6908956611615221e-01
+1592 -9.5237089867692537e-01 9.9025298604573320e-01 1.6400926339559327e-01
+2602 8.7820145845951103e-02 9.6369772027349709e-01 -5.8776170503370173e-01
+2487 3.5712929817584493e-01 1.9376295831845705e+00 -5.0729286108681781e-01
+2494 7.5212984849521258e-01 -1.9786857820694845e+00 -1.4356964529510579e+00
+557 -1.0507609430513660e+00 8.8859906295762769e-01 8.7333923714417994e-01
+2706 -5.2862251804620286e-01 4.9562254785945969e-01 4.2887346532190174e-01
+2968 -6.6829990022079844e-01 -8.9224627533960238e-02 3.9811431982367351e-01
+1328 -6.2745420598666585e-02 4.8935898331610311e-01 -1.1848567880497822e+00
+2488 -8.0659382931590462e-01 9.3536620319268904e-01 -1.0091355344770054e+00
+1889 1.5709345871975720e+00 -4.4586032505159784e-01 -9.9901335223859661e-02
+2295 1.3482061281688551e+00 6.7463031259340023e-01 -5.5068254670367234e-01
+1672 -1.6794785695092389e+00 -3.1824697471438396e-01 -6.1600309927297736e-01
+2467 1.3047403677869014e+00 1.1781222957992794e+00 -7.1436105881411038e-01
+867 4.2304084206726289e-01 -3.5085670035226313e-01 -4.8799405400175111e-01
+2605 1.3917973674222484e-01 -1.4934959607894880e+00 2.1730836744061972e+00
+408 7.3661804509643258e-01 1.6299452881701872e+00 -2.7698940359159419e-01
+207 -1.2951767723943355e+00 7.1070416328784125e-01 6.9193280318411779e-02
+2348 3.3309815411164878e-01 -5.8656678427339115e-01 5.1958165126911737e-01
+313 -6.9441152466159695e-01 -8.3222736702925237e-01 -2.5698227012377284e-02
+1769 7.2162434253949082e-02 2.3327166320989234e+00 -2.0733135509155864e-01
+1967 -1.9719020998318304e+00 1.8746893141600507e+00 1.2150233827790811e+00
+1961 -3.9281044251873509e-01 5.5920437694848379e-01 5.5072437520357531e-01
+181 -1.5148069585637740e+00 4.8309735203316784e-01 -9.2303275756235315e-01
+2271 -6.4404814866571336e-01 1.5401046188403835e+00 1.3053469053541356e+00
+1721 -3.5191384635968975e-01 8.8198009106934094e-01 1.3119099546632781e-01
+2677 2.0371378825443553e+00 1.1885835013795785e+00 9.8947249612725474e-01
+1637 -7.2746234588332281e-01 5.9453463678880325e-01 1.7695992561349605e-01
+1810 -3.4265503490216559e-01 3.1709918200126258e-01 -8.1356862197359425e-01
+920 -3.7286450273552735e-02 6.7162173934494640e-01 -1.1757333930452973e+00
+420 1.2100273320266941e+00 -3.1070363014823610e-01 1.5975548559016954e+00
+2373 -1.1464378835221671e+00 -1.3784589860380065e+00 -2.1090659462111058e-01
+1397 7.4004858393749307e-01 -7.4629897117961252e-01 1.3550106825594370e+00
+197 1.7848025397432721e+00 -1.6780073507857949e+00 1.0451833525696390e+00
+2119 5.7545758173285599e-01 -1.2037370961352974e-01 -1.4186760250912478e+00
+2622 -1.0958050931632457e-01 8.8945641881336002e-01 -1.0533102365228413e+00
+1099 -7.2584152617386799e-01 2.0509813798597989e+00 -9.9629127795189865e-01
+1320 -7.4495844018679225e-01 -7.7670906967774389e-01 1.1774998482690574e-01
+1294 -5.5656265039080965e-01 -1.1110902009482830e+00 -3.9008970685037175e-01
+2747 -1.9349040001331752e-01 -6.3910695150270214e-01 6.1723443988042626e-01
+709 6.4773968086345113e-01 3.2315600071396189e-01 8.2386287111303758e-01
+1317 3.1217388385936129e-01 7.4470995100003468e-01 5.7534433916728778e-01
+2371 1.4170538541966107e-02 2.1684896295237799e+00 4.3311217752680742e-01
+1077 -1.1178929939007698e+00 -8.4404205249377184e-01 1.2981725925983383e+00
+208 -3.8816530256165327e-01 -8.2949182366017382e-01 -1.7990988363384999e+00
+2830 -9.4956041892999110e-02 4.8755876320920638e-01 5.7869517960939487e-01
+2417 2.2970199527633975e-01 1.9013075787586604e+00 2.0171861773873828e-01
+70 -1.7119933913026184e+00 -1.6967909291928858e+00 7.1849040542110454e-01
+903 -1.1637281945795557e+00 -1.0276614195861664e+00 1.2197545086919994e+00
+2573 1.1538676832349255e+00 9.6620036643890472e-01 -2.1280076432381637e-01
+128 -2.2144712795857306e+00 1.5645683020089047e+00 4.2499180463651576e-01
+488 -7.4712489190010639e-02 6.1554517659475272e-01 -1.4168908676707150e+00
+403 4.6561263217982529e-01 1.2191295621717215e+00 -2.0136586536595216e+00
+370 -1.3024146823808507e+00 7.3270317459351819e-01 3.1819461833920193e-01
+657 4.3288376179934779e-01 9.5817244036551052e-01 1.2099024277843589e+00
+217 1.4988211267935925e+00 -3.0516484475849037e-02 -5.5667948553732471e-01
+1387 2.0662842358431485e-01 -4.6198018243831224e-01 -3.4846498665763992e-01
+1075 2.3917147063389449e-01 1.8430280108372128e+00 1.7758476006043961e-01
+1117 2.2529370335967797e-01 -3.9103166710899390e-02 2.2666759165729764e+00
+575 -9.3440761577069442e-01 -5.9470863507505156e-01 8.8644266802950489e-01
+1676 1.7839035398718797e+00 -2.6190622341103154e-01 -1.1049256502803479e+00
+2666 2.1120026543890880e-01 -2.2160657558441841e+00 -4.7525281054447543e-01
+927 8.5972298235508848e-01 8.8360445526701648e-01 3.8924190001793946e-01
+1243 -1.7646832878469276e+00 7.6521003490910289e-01 3.9855540868000550e-01
+1030 1.5010454765172379e+00 1.5108397850944857e-01 -5.9781817786005675e-01
+1575 -7.4189391075941502e-01 -3.3078743769604563e-01 8.1827415715103391e-01
+1455 1.3914817653190892e+00 3.2338772678442185e-01 2.3209027246405829e+00
+2654 1.1046347107787778e-01 -2.6608201584792301e-01 -9.2300067984765377e-01
+2420 2.6097125764392731e-01 2.4007759844401122e-01 6.2709108886037690e-01
+105 1.0423309431531269e+00 1.0257675976475054e+00 5.1842735517983463e-01
+2689 -2.7674943247763983e-02 1.9742894925441141e+00 6.3082650088998304e-01
+959 1.0249680143986986e+00 -5.1889575079229067e-01 -5.4534848211036013e-01
+2001 -1.0834501411287469e+00 5.9096843939828902e-01 -9.8430890159890805e-01
+2975 -1.3878758018532946e+00 -2.5427215026355228e+00 3.8350283863003798e-01
+896 -6.5502402385574698e-01 -6.1258213252779525e-01 -8.8524581063518959e-01
+2628 1.0277294452866672e+00 4.6879424115941215e-01 1.6015813750110373e+00
+363 -5.4465492009068228e-01 -5.4430650051314478e-01 -9.8145524378813187e-01
+484 4.6644483846768431e-01 -3.1816412556570484e-01 1.5469391606440295e+00
+2695 -1.1270895546191919e+00 1.1928783334136863e+00 1.1565649007103862e+00
+1722 2.6880487172896955e-01 8.9350442121492191e-01 5.3604367562269206e-01
+2431 6.4854156907639360e-01 1.2549234928458026e+00 -1.4184231094036921e+00
+2204 -5.6351761630143171e-01 8.7128653918225385e-01 5.9989409679579708e-01
+2638 8.1018088008699696e-01 -1.8467539517627025e+00 -8.1438610516840060e-01
+2005 7.3824556834764310e-01 1.6969822267899775e+00 1.1816532642783968e+00
+2932 1.8786026997580502e-01 -3.0063219726649093e-01 4.5118158085414933e-01
+2949 -1.5691856972562495e+00 5.7811646041196452e-01 7.4308421093466803e-01
+479 -3.7148842743066818e-01 -4.0415828057437020e-01 -2.0538192307773234e-01
+741 -1.6708900298115137e-01 9.5141700246087191e-01 4.6396294509943831e-01
+1182 -4.4754346652860938e-01 2.9138313851379172e-01 -8.5316767720468190e-01
+203 -4.6620286987832271e-01 2.9507542130777586e-01 -1.0686426147536099e+00
+334 -2.2364194228951181e-02 -4.3701487030829705e-01 -1.4817344666210439e-01
+1653 -7.1117639947954192e-01 -2.7253439285821166e+00 -5.9324463592757182e-01
+1499 4.4727680511536050e-01 1.2202262385208871e+00 1.1005356021654705e-01
+1796 1.3517243432945065e+00 -1.3840939843065674e+00 3.7901929668744505e-02
+598 -1.1143781389869771e+00 7.8707817577346328e-01 -8.3969558274455791e-01
+2224 2.3918385707177531e-01 -4.9300183622978949e-01 -3.8639635241261500e-01
+263 8.2531775566055443e-01 1.1530714594888456e+00 2.9935066564057750e-01
+2084 3.8413029410379995e-01 1.5680928500857111e-01 -4.5516782740923539e-01
+228 8.9709768001764134e-01 1.4777876349189258e+00 -1.6431203632996044e-01
+2718 -2.6266776035040057e-01 -7.6491257402846191e-01 5.7286917645090196e-01
+2419 -1.6721040017307789e+00 -8.0140354128187610e-02 4.3584280918999696e-01
+2723 1.7944124912672748e+00 1.8063926876229279e+00 -9.2590900319959790e-01
+2208 -7.4063681687180118e-03 1.0507422302127525e+00 1.0995090406100800e+00
+1339 1.6440513085653832e+00 9.1429828928150214e-01 1.5573938408683680e-01
+728 6.5018296306403167e-01 -3.1329462589159474e-01 -1.0666131326226092e+00
+1102 2.9212183226304167e-01 1.3704011909653353e+00 1.3676610354910137e+00
+1037 -8.7701476459895303e-02 -2.7006786101990798e-01 5.9900196302473530e-01
+1670 -5.5318112946813724e-01 1.5337362371089303e-01 8.1546764514900894e-01
+402 2.6850644145613987e+00 1.7599706159630168e-01 -1.5711202933723695e-01
+2014 -6.4404257774693030e-01 -9.7088271897304790e-01 -2.0941362962693102e-01
+1619 -5.1159283939391209e-01 -2.4473087765101476e-01 -2.0484174279207776e-01
+2136 -1.2777817340270901e+00 1.7540423107720829e-01 -8.5302366618014924e-01
+81 8.2612870441750519e-01 -8.2507212179024281e-01 1.0014325173295997e+00
+623 2.1539909610390864e-01 1.6259862021707767e+00 -4.2126129741586804e-01
+750 2.9610520039669436e-01 7.9813481024008670e-01 -6.3896571154252069e-02
+1183 -1.3711120191771207e+00 -6.3762189241219042e-02 5.9776842622807735e-01
+1246 -1.1389216859935685e+00 -7.4276282689644813e-01 2.3864031314031497e-01
+1018 8.1364661551722048e-02 1.0541336835750750e+00 1.3041529872248714e+00
+67 1.2207583738443024e+00 -6.8013972333201034e-01 1.1490680867694911e+00
+2167 1.9001583915349931e+00 -8.7491319806321549e-02 4.4392380667433845e-01
+1856 1.9396966892776585e-01 -1.8803621650779334e+00 1.4521714172407477e-01
+2194 6.9621347358365360e-01 -4.2197037111894820e-01 1.4843262819274539e-01
+435 -4.2917794123569504e-02 -4.5435227547364404e-01 -1.0835437280615292e+00
+1374 -1.1702662691667582e+00 2.7951359729946917e-01 4.9637227482350349e-01
+277 1.8551949433625261e+00 1.4774570487315917e+00 -7.3233216080630381e-01
+1996 -4.6982919662909089e-01 -1.1395948606196924e+00 -1.1979235572619926e+00
+766 -6.7053715127946933e-01 1.4755518848024820e+00 -1.1259685264138886e-01
+2657 -1.4905305118636540e+00 3.2793283898467218e-01 2.0474422060569564e-01
+1096 -1.8809140081693911e+00 9.2622258381663636e-01 -3.3906104612817317e-01
+1346 8.7899055205160437e-01 4.5609021385595538e-01 1.1588356519414889e+00
+839 4.5503946924960087e-01 -1.6203948644525363e+00 1.5465807860037852e-03
+1724 1.3096909336287903e+00 -3.1110456315593693e-01 5.4877485676840243e-01
+229 -1.6040910626850341e-01 -7.9034508734249576e-01 1.5463649816700988e+00
+256 -1.9191030763844458e-01 1.3600604059157682e+00 1.3064986178617635e+00
+1175 -5.0790668342996692e-01 8.0100274115663472e-01 -7.0041420569333768e-01
+141 -1.1596088902915744e+00 -6.5236601949465234e-01 6.1960478616948655e-01
+2178 -2.8405220286506921e-01 5.0692521297716231e-01 2.6217898290651898e-01
+884 -2.0700466027597328e+00 3.6058548047815098e-01 -1.2891934684666013e+00
+2941 -8.8514780400282622e-01 -1.0005234042624447e+00 2.4960644991343811e-01
+2330 6.0874486671889827e-01 3.1563306584405260e-01 -3.3731097118487124e-01
+1127 6.7418942606072940e-01 -6.3798662782928106e-01 -6.4074550852890233e-01
+354 -8.5385430275755969e-01 -2.9339448282344383e+00 7.8595855728243413e-01
+1476 1.0306342030901097e+00 -8.2955604891074688e-02 -6.5543210622839587e-01
+733 -1.6541611494700199e+00 4.2503490696862611e-01 -1.4690684325137453e+00
+2336 -6.9270406147998242e-01 -3.7459049923439486e-01 1.3832480593768732e+00
+283 -8.1442334440189645e-01 -7.1365621545261748e-01 1.6129668505067968e-01
+754 1.3553282194021044e-01 6.3849524560327664e-01 1.9146486406785082e+00
+179 -5.0939374063592080e-01 -4.2759861304252283e-01 2.0323132217160405e+00
+2027 3.7627285599158855e-01 1.0327957554938656e+00 7.9846622937127432e-01
+2761 2.0706552093443298e-02 1.4296321467611484e+00 -2.5666853042997451e+00
+1169 -6.9563907739190411e-01 3.0656544265471974e-01 -1.1280993947600351e+00
+1612 8.4283499164694964e-02 -1.7820466383237767e+00 9.1180799904272702e-01
+2470 -4.6785322012559011e-01 1.2740562541946585e+00 -4.3142505055357383e-01
+145 -1.2227207903028963e+00 -1.0190015653725966e+00 -2.5794327539280371e-01
+908 -1.1153682656834588e-01 -5.0971299163265549e-01 4.7575939548271062e-01
+2507 8.0974057026855406e-01 -1.4740482839551405e+00 4.6848100267154547e-01
+1522 2.0579695402135884e-01 -1.9202648369770556e+00 9.1661568901020241e-01
+310 3.5790555525300494e-01 1.5925493922142828e+00 1.3757880015372521e+00
+373 -1.2532909247640994e-01 3.5794440376353381e-01 9.9467941981824048e-01
+2978 8.0055019155410556e-01 1.5229183909287861e-01 3.3191699246137746e-01
+2578 2.6262072376925222e-01 8.6458178076588432e-01 -1.2772523588308398e+00
+889 7.4854208985211290e-01 7.4714634148720049e-01 -6.0410111255404197e-01
+2691 1.8490295859666617e+00 -8.0693350884955561e-01 1.8762888347142528e+00
+406 -8.5167748716247405e-01 -7.7546458043873634e-01 9.9025465868871598e-01
+669 -2.2994659683081956e-01 8.7405275918030712e-01 1.7059039857543723e-01
+979 -3.9875454387776088e-01 1.1333584927549007e+00 6.5157301140670010e-01
+2535 -1.5596257884027727e+00 -1.3290051205152338e+00 1.1711528172584711e+00
+2404 -1.0281331862628856e-01 -9.6165794260973203e-01 -1.8361514276158972e+00
+2041 -3.1138770300855545e-01 2.7342150918996100e-01 -2.0744124179510535e+00
+1882 -5.9976890208637479e-01 1.6482757935654728e+00 1.3222796859895769e+00
+569 2.1475431199273456e+00 5.4299371806816299e-01 6.5516452306641393e-01
+1891 -7.4379060830594446e-01 -7.2383069616581364e-01 -4.6621581753233732e-01
+2432 3.0696454285199314e-02 8.1862495470364272e-01 9.5050752503217573e-01
+274 -2.1419774730847738e+00 -3.1709661464603672e-01 -2.2736525261178548e+00
+27 -2.4623260008261507e+00 -2.3943563094156053e-01 8.6869084769193594e-01
+2814 1.2504493159380601e+00 -1.0874474829551883e-01 -5.5978187019100722e-01
+140 1.8062761116227644e-01 6.3066706056306976e-01 -6.5339042492787192e-01
+705 2.1784423846917444e-01 1.0105388630921921e+00 1.0753310448398146e+00
+297 7.2840909406616339e-01 7.5600766333141256e-01 -4.1489570639571682e-01
+2645 7.0598662604599227e-01 1.6009557129571972e+00 -1.1192132885986250e+00
+2424 5.9906233221710847e-01 5.9035932176408812e-01 5.9240296611133136e-01
+694 1.1890303237529660e+00 9.9162244329663118e-01 3.8418686627919324e-01
+1873 -1.3878536170960643e+00 5.8744616023881646e-01 9.6015975355575189e-01
+2141 1.2018829716683226e-01 1.8666393421484651e-01 5.4674262195834955e-01
+634 1.1411701594562669e+00 5.9163442670807842e-01 -8.5947388435752803e-01
+1312 6.3007443324904822e-01 -1.0747432140884075e+00 -7.7597572878208576e-01
+267 3.3781205027206412e-03 6.4528057675837025e-02 1.3401280127081942e-02
+1591 -2.8435745043722851e+00 3.8604383834234857e-01 -8.7224853980707884e-01
+1375 -3.5584719044086766e-01 -3.5421737241591150e-01 -7.9307460681996145e-01
+1877 -9.1226936910195278e-01 7.0767385642240532e-01 1.4279753541319307e-01
+775 -1.3614532095012275e+00 -6.6233270133173761e-02 -7.7710304877517600e-01
+291 -7.7970697370584241e-01 -4.8092975683746381e-01 1.1209064990264608e+00
+2134 -8.0748847707030613e-03 -4.3173002794483217e-01 1.2235467587116854e-01
+2846 1.3241500615716315e+00 -2.6303860501717224e-01 -1.4914094417656691e+00
+1389 -8.8156570658827016e-01 7.1426718830917724e-01 -1.3082495973928039e+00
+189 4.0323543774798115e-01 6.0406742198762242e-01 2.3146369842628628e-01
+1277 -2.2703828624841965e-01 -3.1358813299324919e+00 7.8991830689369469e-01
+238 1.4454451920325158e+00 -4.9007831521695544e-01 -1.2640262148012082e+00
+392 -7.8840735087103575e-01 -6.5735866273574961e-01 1.3949588174773007e+00
+2474 1.5300692363531627e+00 -1.2503921636480129e+00 -4.1612715588121107e-01
+40 -1.5635096866159559e-01 7.3655871171435694e-01 1.1828342537832266e+00
+866 -6.1192400031192007e-01 2.0230435763734347e+00 1.0533459502240639e+00
+454 -2.7889765737677796e-01 -1.4967277082418451e-01 5.8710836412731282e-01
+428 6.4558051616225198e-01 -7.5472065611526873e-01 -2.5279377677038135e+00
+2006 5.7183404558177775e-02 -5.1010881926273388e-01 3.7542369618935106e-01
+1884 3.0403589776712997e-01 -7.7384780439189105e-01 -6.0587069795505755e-01
+1234 4.4819909111711753e-01 -1.8780425646305068e-01 -2.2473602408513543e-01
+885 -6.8248083288892425e-01 1.0766771774947164e+00 8.1774552723356797e-01
+2919 1.2264812904329856e+00 1.8221442069921386e-02 -1.1837067940970669e+00
+2300 -2.0121435827174885e+00 2.3962884868456338e-02 -1.3320037919367373e+00
+1815 1.2654839159537516e+00 1.0949063225618239e+00 -9.8630049945408482e-01
+2480 -5.7748460496954390e-01 2.5020890375536531e-01 -1.2870691962750507e+00
+748 4.4100439512563361e-01 -3.8358488927444012e-01 -1.9462791072859348e-01
+178 2.2404376586180247e-01 6.6998317718707745e-01 1.4542431544360268e+00
+1360 3.7335744983829589e-01 -8.8770544047000655e-01 1.0114080408786388e+00
+2036 -1.1266564034994242e+00 -5.4658006453861241e-01 -7.2268887959830386e-01
+1208 1.0768958510456033e+00 9.8031932779895092e-01 -8.6506975783773810e-01
+1070 9.8225270031905887e-01 8.9747145613423029e-01 -1.6486069164713175e+00
+25 1.7056947528974492e-01 2.5493204908582930e-02 3.8724609752908556e-01
+2103 -1.1334134284117146e+00 1.4438037063722708e+00 -1.4906113201271252e+00
+1998 2.8318204105477102e-01 1.6115414132644539e+00 -1.5537345288994850e-01
+2981 -4.9851120866210519e-01 -9.2394952021616750e-01 -1.1518049930692566e-01
+1108 -1.2602315201176992e+00 4.2432914263405092e-01 -8.5691778462877913e-02
+1755 -1.1745210474131136e+00 -1.9891285086331987e+00 -1.2612541061409126e+00
+675 -8.6889246997059855e-01 3.6365512966079039e-02 -5.7819284059152554e-01
+1195 -4.9202564797087356e-01 -3.3881625128272941e-01 -4.3310793772563300e-01
+172 -4.8878521939325403e-02 4.8860086457310664e-01 -3.8223702274970883e-01
+1704 6.0589227671752266e-01 1.7429191505372619e+00 1.9878386354728466e+00
+2965 -1.7533763057690650e+00 9.7971473185218527e-01 -1.5738492538659459e+00
+723 -6.9010774598040947e-01 5.4656139484981581e-01 5.2833860890397333e-01
+2213 -5.0942216337581803e-01 1.0182188490011403e-01 -1.0960528407895331e+00
+2571 3.6262246579702606e-01 5.3195539913066969e-01 -1.0072900024007112e+00
+1733 1.2002962940417952e+00 -2.8191445784843727e-01 1.9685065899747394e+00
+1660 -2.2838865528409485e-01 -2.0225448486633448e+00 2.1592477860521433e-01
+83 -1.6520280088453927e+00 2.8595311467148488e-01 4.3208416054593574e-01
+499 2.9799073857086533e+00 -6.4459148259462584e-01 8.2663845438711248e-02
+967 1.6893349489621114e+00 -7.2048136184813305e-01 1.2147149312332839e+00
+2206 -4.6389678576039900e-02 -7.3032641631001594e-01 -1.3476250082329638e-01
+1012 -3.1487332310610261e-01 -8.5739402233759032e-01 4.3395625365049256e-01
+1835 8.5474389044624777e-01 1.4904427849045548e-01 -1.8349399239225375e+00
+198 -1.9656423651877568e+00 4.5584469050933274e-01 -5.9826152463092697e-01
+227 1.1076120860729228e+00 -8.3447289208172259e-01 -5.9699252449452045e-01
+615 -1.4876342131186304e+00 8.0519042157636511e-01 -3.4004760819797436e-01
+1898 -1.9431801557804290e-01 -1.3186995366597625e+00 -1.9888664072917708e+00
+97 -1.7715426459399128e+00 6.6717921663410340e-01 1.1158855684729423e+00
+914 -1.0605166068097434e+00 9.8483573791863899e-01 -6.4457063103108070e-01
+2712 5.3567120453047901e-02 -3.4078875524923713e-01 -5.4457461493237069e-01
+1457 1.9339220367395631e+00 4.7184803655940688e-01 6.1943744273699114e-02
+2627 -1.8969345556283235e-01 -7.9207607212910169e-01 -1.8589194344908092e-01
+2042 -3.7845641422833287e-01 -4.2066179859880276e-01 1.2707946399650043e+00
+2111 -1.9421241361251187e+00 -4.1206260438944209e-01 -4.9649091063203205e-01
+930 4.2766870680909808e-01 9.8704243194167884e-01 5.0896856141483304e-01
+2873 -6.6029204873148639e-01 -1.0848582208905666e+00 -1.3628982487581136e+00
+1892 -1.6869183494546509e+00 6.8443095648037341e-02 -7.5408760126530194e-01
+1165 -7.3295162009368775e-01 -2.5942633696202524e+00 -1.6168451362418421e+00
+52 2.6012869201825217e-01 -1.6321083317622909e+00 8.9570818654576911e-01
+1270 -7.6016373766879097e-01 1.9940294935842029e-01 -1.3138501349417380e+00
+2527 -1.0456757270128616e+00 -1.3898061871780145e+00 1.9642428145015964e+00
+8 2.4532417887481537e+00 1.7237472087146929e-01 -3.3240300723884719e-01
+2255 4.9193817510655208e-01 -9.8809936533289344e-01 1.6699793672792329e+00
+837 1.6185381970908905e+00 2.4957082429783703e-01 -1.7409069826512213e+00
+358 2.8604889279281770e-01 6.6913788408740471e-01 4.6844756132991339e-01
+157 -1.4048498900111182e+00 -7.4803517297849564e-01 1.0435680212222300e+00
+202 -4.9479308058897908e-01 -1.6979093975045995e-01 2.2880740163751607e+00
+1350 8.0048608535039201e-01 1.7962054725712515e+00 -3.3539660570854668e-01
+1229 -9.1866529251481388e-01 1.9460838877847574e-02 8.5463679418594718e-01
+745 -6.2474835603799117e-01 6.1063804647821152e-01 1.0579376067574460e-01
+2410 7.2565213531959538e-01 2.6386118426052513e-01 -9.8177512040214898e-01
+1406 6.1239101404829277e-01 6.6525072518910200e-01 -2.0018031221402777e-01
+2437 9.8160346098263096e-01 -8.2108626175328214e-01 2.8457410891706614e-01
+2773 -1.9825422809231601e+00 1.7942871963625300e+00 -2.1899714466864366e+00
+1184 -9.4756865664276613e-01 -1.2421262121807208e+00 -1.1983579305987206e+00
+1207 8.6913375395633430e-01 -1.7364076836201769e-01 -7.8793327745789321e-01
+2355 4.8360239162730079e-01 -6.7125769878354957e-01 -1.9421985299530551e+00
+1617 -1.2919253335926089e+00 -5.2677517239137739e-01 5.1205903782499729e-01
+1437 4.7978157797657756e-01 -4.5545224493257586e-01 -6.8526534839081876e-01
+348 8.1486705951370553e-01 -2.0962992016053223e+00 1.8253424442739909e+00
+1325 -1.2741662431162232e-01 -1.3648527843920191e-02 -1.0778015818025892e+00
+163 -1.1042464860413264e+00 2.4892401316172985e-01 1.6673235782973467e-01
+795 7.5465722263835355e-01 -8.5530069208085735e-01 -1.4878573397467934e+00
+464 8.1944498291459567e-01 -2.4111444392429515e-03 -1.4589942909873246e+00
+2733 -4.6426957039903505e-01 -1.1143453878981142e+00 1.3918888304552673e-01
+2394 7.3462300041670636e-01 -1.2896577615423857e-01 -8.1388126944600170e-01
+1005 -6.9680684070873466e-01 1.3957380928776597e+00 1.4390461822583696e+00
+1413 2.4917904811349528e-01 -8.3613845212970106e-01 -2.1057456611905509e-01
+783 -1.8633435580213342e+00 1.0367241469445301e+00 -2.0742792600257057e-01
+1938 -6.9099868202603065e-01 -5.5758799020489358e-01 3.3360003891306755e-01
+1432 1.1941509222925986e-01 -8.5666730113259232e-03 3.8245520381832343e-01
+684 -1.1273049555403891e+00 1.9428237063452625e-01 1.5787352002079282e+00
+2673 7.2807080208523955e-01 -2.7317681645552492e+00 -1.8970392550037918e+00
+1520 1.3554845462099767e+00 -5.2821061519670720e-01 -7.3344538270390991e-01
+791 -3.9800279702691416e-01 1.2369689016005347e+00 5.8193949373341258e-01
+2044 -2.3346060919481593e+00 -1.2197718395652204e+00 -1.1710025174343484e+00
+1705 -3.8630872620310597e-01 1.5031638075384482e-01 -6.6394543610801882e-01
+2154 -9.7710710930345807e-02 -3.3828266221500297e-01 -3.9933437676241898e-02
+2866 5.6011241504505216e-01 1.5861087627471324e+00 5.8834945958821439e-01
+2277 6.7670291676204264e-01 1.0162009464676711e+00 1.5540571010532098e+00
+1315 -2.4549913724987701e-01 -8.0069129557278684e-01 2.3063024583918332e-02
+1261 -1.1402182543025383e+00 1.7616056771272623e+00 9.7984246566147326e-01
+1217 -4.2070058153005396e-01 -8.2280976315082507e-02 8.6502712062010201e-01
+1 1.5438823267528388e+00 -1.6019529820774459e-01 6.7267974080411297e-01
+18 3.9426004021344174e+00 -2.0105130235022944e-01 -3.6729439306263850e-01
+2124 2.4078481537641497e-01 -6.0179687813119026e-02 -8.7699084158013618e-01
+132 -3.8223390784352129e-01 2.1980468312556359e-01 1.8653388112505507e+00
+960 1.4701897319928262e-01 -5.6679530454109328e-01 7.1803858051541058e-01
+467 -1.4082210027387270e+00 -2.2846815604495680e+00 -2.0355265203316419e-01
+438 -6.2960863081826601e-01 -1.6564529407407671e+00 -2.5624311993011217e-01
+1408 1.7961828977194783e+00 -1.6118895796742214e+00 1.4345898032380113e+00
+173 7.2372241976768448e-01 -6.1716696045258548e-02 -1.2269230763346908e+00
+856 -4.7741446545726984e-01 1.8743120381535058e-01 -1.2783982812061150e+00
+1048 -5.2464012235842861e-01 -2.6700024279972062e-01 5.0218208324596503e-01
+1939 6.1574763473045147e-01 -5.9406152984478133e-01 1.1723319580250726e+00
+816 6.8906404035617563e-01 -8.1222818944654818e-01 -1.0225570359405505e+00
+512 -3.8830943196545276e-01 1.8827375129417907e+00 -9.9811592695040208e-01
+2464 4.8057160694735174e-01 -3.7059238776954373e-01 3.9329500365029757e-01
+1216 2.6259405107708067e-01 -1.2392315238355631e+00 7.3102288763119416e-01
+962 -2.9255362031316690e-01 -3.1398092196345895e-01 1.2979936434347858e+00
+1715 1.3039471504258507e-02 3.4029627413355445e-01 -3.6344487793889585e-01
+1242 -3.4676120762832235e-01 -1.0126642209290724e+00 -2.7574925288174279e-01
+2825 -1.6027426926706791e+00 -1.4865885354460595e+00 1.5696035832371652e-01
+466 -3.3996302489310509e-01 -1.6612830023490743e+00 -2.5385152021759949e-01
+1702 -1.0725101695011663e-01 2.0464443436630870e+00 7.4785834476915203e-01
+2478 9.8973640857172962e-01 -1.1295446461360035e+00 -8.4163418767271758e-01
+698 4.6027889137873246e-01 8.5892810983959922e-01 2.6724813115907318e+00
+1498 -1.8297861575467751e+00 7.3907344140714015e-01 -1.4169587669412729e+00
+820 -8.7600432255786176e-01 6.6069531210247012e-01 1.0704927839366620e+00
+94 -8.2403132643936158e-02 3.0282592016068421e-02 6.4062335174231932e-01
+2259 1.3429412392286344e+00 -6.3252266733746665e-01 -8.1620743791888473e-01
+2268 -2.7168403359610203e+00 -7.6286754254723033e-01 1.1132606897657258e+00
+2187 -1.1719460591568804e+00 -1.6922120885656207e+00 7.5954935476345153e-01
+2296 2.7937519220018492e-01 -7.0820767186092781e-01 -7.9193353824858281e-01
+2791 -3.6150246679873860e-01 -7.5192633978002144e-01 1.9075533832207422e-01
+1040 1.0750750093274933e-01 -1.1581214656570278e+00 1.7077819038634854e+00
+1767 6.7598394440666798e-01 -5.0813732990427674e-01 -1.0706506205613606e+00
+2334 -1.2568886287875902e+00 -1.7286542396163709e-01 -1.0929790832946484e+00
+335 1.6042938100131492e+00 -8.1925699281664843e-01 7.5532355854734146e-01
+1390 1.6038955009510818e+00 -1.3818806730147259e+00 -2.7060961416830526e-01
+704 5.4665712779596309e-01 3.7440794280254341e-01 -1.3478044707528891e+00
+2057 8.9162604318171823e-01 -7.6347657877002562e-01 -7.5159341020877168e-01
+2601 -4.5297887302974810e-01 4.4256210157366704e-01 8.0506972524764464e-01
+1327 -9.5881584894610872e-01 -1.0714233510146050e+00 1.2149992655866415e+00
+385 -2.6510097323717779e-01 6.0253527391759776e-01 -6.9821424411158983e-01
+2 1.5257174543937493e+00 1.7053707586587163e-01 -4.1153407480698384e-01
+711 1.1639534486858963e-02 4.4098749375550356e-01 8.5051182642700085e-01
+779 6.2823765533881470e-02 -2.1037926933036433e+00 1.6184989605982423e+00
+1368 9.7912808367550908e-01 -1.0738631431246521e+00 1.5327026241870982e+00
+108 6.9838039501763782e-01 -1.9577895514722671e-01 -9.2766896504777663e-01
+763 2.3112589255088336e+00 8.4120225106927504e-01 -1.0294850506275715e+00
+563 3.5886872963308064e-01 1.0514034882969088e+00 5.7941439521653559e-01
+1485 -6.3807097483033215e-01 -1.1823567157971877e+00 -2.5941542894284392e-01
+1714 -3.2066797348438342e-01 -9.2452966007858473e-01 1.6277554834736121e+00
+1401 -7.5115274623016326e-01 -1.5843961494409322e+00 1.3260036626894380e+00
+1905 -1.0121500711138294e+00 4.8569806855267117e-01 -1.4718585487153988e+00
+621 4.2988295174027946e-01 9.3300808405006386e-01 3.0965943648922223e-01
+2606 -2.4863967394514170e+00 -5.9349758987119572e-01 1.7616475858236910e-01
+1881 -1.0832468481686199e+00 2.0549050307645027e+00 -7.4852938634125052e-02
+720 2.2183433364625055e-02 1.4513374705130713e-02 -1.9877938373814275e+00
+997 -2.1429204291270987e-01 -1.0336221461664763e+00 4.0014656655042879e-01
+1677 -1.5093014903514163e-01 3.4571052734881830e-01 -3.5782551850467975e-01
+817 8.5586429286700194e-01 -9.0190233554050803e-01 1.7376674308916999e+00
+2780 -1.1453813365037138e+00 2.2347600620076404e+00 9.2647648909135169e-02
+2582 -1.2101734798158151e-01 -8.1657478943325457e-01 4.6786385620621718e-01
+899 3.7600718552498624e-01 -1.5355828229168993e+00 1.7433867938675296e+00
+1118 -1.6223718553150319e+00 2.2399729420185971e-01 -6.2240459846779317e-01
+570 1.0092553265147947e-01 -2.2666115580827076e-01 -8.3424286605901610e-01
+2458 1.1533135848670166e+00 2.1971562597309854e-02 -1.1398689680525578e+00
+1331 -5.8258476958876038e-02 -1.5928917075333433e+00 4.2994848484282572e-01
+2615 1.5120567903181031e-01 -1.6309596680042560e+00 1.1510336524980280e-01
+1111 -4.6065303484422615e-01 9.5716903246302554e-01 -8.1731841810099876e-02
+1700 -6.0640984566076894e-01 1.6946817105830645e+00 -8.5642614906715320e-01
+262 -4.1475872307299400e-01 -4.3255958139874706e-01 -6.1838626587006940e-01
+872 5.9732650086576400e-01 -5.4202458157574918e-01 -1.2443427536159903e+00
+778 -1.3952443368787099e-01 6.6061931718754935e-02 4.5472514922073998e-01
+1223 2.2446334557591601e+00 -2.9799729151167853e-02 8.5182892487784401e-01
+2820 1.1985458385811229e-01 -3.1357456374418358e-01 -4.1727311089671570e-01
+298 -4.8696467098723467e-01 -8.8228567852513939e-01 6.2277687350978495e-02
+1507 1.4185215609426769e+00 4.8441906004221541e-01 8.3571342336999088e-01
+894 9.2490964840164880e-01 1.3336161672841568e-01 -1.7162449962898021e+00
+731 1.9783850432346644e+00 1.3224989231606563e+00 -3.9848541143994587e-01
+405 3.8490976615572242e-01 6.7537771446460049e-01 -1.1607430426415639e+00
+2908 3.5686199169910571e-01 2.8111325505540202e-01 -1.7059789953549105e+00
+31 3.1159697158236233e-01 -3.5094789565168971e-01 -1.3757776546233327e+00
+2345 1.6960079474922645e+00 -1.6798667874130746e-01 1.8969657257756534e-01
+1743 -1.0039650705757466e+00 1.1296846816876371e+00 -1.1814672200681992e-01
+282 -2.3611620532702654e-01 1.8754085390321129e-01 1.6122255349689965e+00
+2526 -2.6602427411875074e-01 4.3535349926759831e-01 2.4580076059010896e+00
+1949 4.2081775741592853e-01 -5.2985207429637105e-01 4.6190576270164685e-01
+982 -3.5869707725827205e-01 1.2933653629356643e+00 1.5440486696358076e+00
+230 -3.1778054563948416e-01 -3.8349944720453699e-01 -8.4446510367187178e-01
+475 5.1162892153651596e-01 -8.3439720206672563e-01 2.9745233107681457e-01
+2734 5.3624924818216635e-01 1.9240100384265008e-01 8.4182821403718344e-01
+301 6.7107826913610613e-01 5.1632637176290852e-01 -8.9459081124551731e-01
+1434 1.5114587747042147e+00 1.7667659917184309e-01 1.0875202759831979e+00
+2357 -1.0776940836071758e+00 -5.1153531042800759e-01 -1.3221015095660889e+00
+1622 5.4141824092358937e-01 1.8444782041649752e+00 -2.3146033716313602e-01
+2974 -3.7017707359196822e-02 9.2602504196672830e-01 4.0067807317605897e-02
+1820 -8.2362826832191649e-01 -9.4052161718372029e-01 2.3504765016906343e-01
+1349 2.1688155810544102e-01 -6.7200581753635114e-01 1.3373344180024838e+00
+1844 1.2130049729628354e+00 -1.6979048835479427e-01 1.8604156051098573e+00
+2284 -1.0222328255054640e+00 -2.1598347961718085e+00 1.0682484164578065e+00
+523 1.1843343152833392e+00 -1.3521588246718796e-01 -2.0853226952103796e+00
+139 -3.3043082278529869e+00 8.5253268106276714e-01 -2.8466731602522423e-02
+2460 2.3585779060860607e-01 5.2518040880841899e-01 1.2968931849847790e-01
+168 -1.5446346760852026e+00 1.2766053943115698e+00 -1.2096018164905056e+00
+1840 -4.8119454915051096e-01 5.7437192707426921e-01 -5.4782217798081834e-01
+1298 -6.2544430208694513e-01 -8.8314507314690482e-01 6.5564109335230258e-01
+774 6.1387959268805825e-01 -1.6672011530933741e+00 1.6832261812052093e-01
+2811 9.0385332012394159e-01 5.2519929088590644e-01 1.5026795458152893e+00
+2806 -3.3279518436024925e-02 -6.8853479965958686e-01 1.3354620259497468e-01
+76 5.1475785899964022e-01 -1.5776248989846176e+00 -1.1603506103301879e+00
+2247 -8.7346264200743051e-01 -1.4762525300471260e-01 -3.2815833293095575e-01
+165 -2.0862470104512779e-01 6.8544365252747055e-02 -7.5164580280277860e-01
+958 1.8931091229257779e-01 5.4958258737987531e-01 1.1238682750346531e+00
+413 -1.6160649500336019e-01 -9.6156727335372463e-02 6.4021657870069837e-01
+1143 5.0254281529264866e-02 -1.2671040049703302e+00 1.7185610323577365e+00
+2863 -8.7785363141102524e-01 -9.7972075242235201e-01 3.2993821718412375e-01
+1618 -3.4132369772627813e-01 -1.5564344194614962e-01 -1.8168715097467675e-02
+184 2.2878353664660805e-01 -8.6889537166621111e-01 1.3615247435347639e+00
+2483 3.5194469659812372e-01 -6.0304671388061082e-01 2.1816559528199769e-01
+2848 -2.1684489186341271e+00 -5.8869191719853919e-01 1.2041168309008676e+00
+33 9.6257145803376487e-01 1.5233964993237199e+00 -5.2157449582357140e-01
+1526 1.0637617713952512e+00 1.2506080121620300e+00 -5.5668399909597566e-01
+821 -7.9342830098555084e-02 1.4845512379204822e+00 -9.2973024219038025e-01
+2891 1.7354074139652014e+00 -2.0839662489204328e-01 -6.8167971192344190e-01
+2100 1.9706005398144433e-02 -7.5670113558610141e-01 -2.0269524872417612e+00
+1794 -7.9465701400984678e-01 1.4002640853988522e+00 2.0613293210553381e+00
+1341 -1.2512275191889914e+00 -7.3197773890686790e-01 -4.9704217379221094e-01
+661 -6.1672900118326116e-02 -8.2310525195058182e-01 8.8920539922123565e-01
+1529 5.8142611269608491e-01 -2.2498387640513760e+00 -9.3627845598948944e-01
+398 3.5039835546900688e-01 -5.8519657154706484e-01 -4.0634659059001055e-01
+587 8.0405499633918331e-01 9.5938027463959530e-01 -1.8235811508925175e+00
+644 -1.4736780676786074e-01 -1.0853318705202575e+00 -2.2131648778667457e-01
+2281 -1.4032763521256564e-01 1.2534203494913927e+00 -9.1169867187174469e-01
+1348 -5.6467524197612351e-01 1.3024008776283122e+00 7.2162624147018767e-02
+2351 -3.3568230429741175e-01 4.1597841387446588e-01 1.1794413198111192e-01
+2954 5.7371788092133214e-01 7.6081812461256559e-01 2.8629528536022270e-01
+898 -3.6393217134230105e-01 -9.5254488804872406e-01 -2.9668625326714215e-02
+2093 -9.3349070276696822e-01 -8.0327027500404635e-01 1.5179974274344983e+00
+909 6.6690908230149359e-01 2.0259977231149018e-01 7.9137515267249228e-02
+1135 -3.2939658422688822e-01 -1.7338104629124082e-01 1.2144078390714577e+00
+1287 3.3069710330254021e-02 3.9327205990466574e-01 1.7809547762392690e+00
+1322 -1.8285991837344011e+00 1.4494120003292534e+00 1.0854370117033545e+00
+410 -3.6023346855322913e-01 4.9232501845130061e-01 3.0928010515593121e+00
+91 -1.2611833608516876e+00 1.7836969055487453e+00 6.6277080114864828e-02
+1680 6.6083315399459619e-01 -1.6636352139772661e+00 -7.9134475019379913e-01
+540 1.3593417613475295e-01 3.4406088370378241e-01 9.8126345856617170e-01
+1188 -1.2451588627058776e+00 -2.5638553198891917e-01 2.0566187297952503e+00
+1092 -1.4772235838437526e+00 3.9706781962188759e-01 -4.8705644282199048e-02
+1010 7.8804636672424999e-01 1.0893472122605485e+00 -3.0432958891598560e-01
+2953 -7.7378556878852423e-01 1.0516395144212605e+00 1.6678164584394324e+00
+2985 -9.0572561213712532e-01 -4.7243975319217946e-01 1.3717153210904578e+00
+2212 -1.4036823174343618e+00 -1.1562677003938369e+00 -5.9214516748041834e-01
+339 2.9814901702923524e-01 -1.7610662113011344e-01 -1.9102012424380610e+00
+2769 2.0704626399139650e+00 5.5934710217024963e-01 8.2574189240131701e-01
+314 -7.1899508962855430e-01 7.6844402398596051e-02 1.4453406167028602e+00
+1956 -1.9871468514062218e-01 -7.8239804640334065e-01 -3.5526072786777657e-01
+2703 -1.7939330219202174e+00 -7.3903069679395683e-01 4.1733095394826525e-01
+1501 1.9223264452501723e-01 4.1256323905697145e-01 -3.6793642662053122e-01
+678 -1.5494003074945952e+00 -1.6105904271697391e+00 1.7940301032741119e+00
+1356 -4.0629352754123599e-01 -2.3208201573451537e+00 -6.0477789026032780e-01
+316 -1.0690939621141604e+00 -7.2205345586226155e-01 1.0220664342183028e+00
+2853 -1.2637122981098063e+00 1.6539631609191119e+00 -1.6156440686722457e+00
+1074 1.6286323895810592e-01 7.3054662476911628e-02 -4.2600352586408180e-02
+437 1.4886022178810296e-01 -1.5810174613098196e+00 2.9488283307186619e-01
+969 2.7398152470342940e-01 1.8851327593551683e+00 5.0912308907355286e-01
+1569 4.3333779344615508e-01 -4.2476384297839148e-01 1.2687509476253398e+00
+727 -9.3448910877473590e-02 -2.9236188689529090e+00 4.3945912358066092e-01
+96 -1.8500387086522856e+00 -2.5184904160805375e+00 -6.7514881963196316e-01
+826 8.5944733221259240e-01 -1.1522912779148358e+00 1.0171205243639214e-01
+1427 2.6830095938767740e-01 -3.2327955943655617e-01 2.6389621082595727e+00
+2223 1.2655067093786587e+00 -9.5871942519042286e-01 9.6327688213941842e-01
+233 -1.8373140336030498e+00 -1.4418475558275570e+00 4.3371078829340143e-01
+2929 2.1823427476727689e-01 -3.5638792992760088e-01 3.4525226077817017e-01
+2502 -1.3963425838505514e-01 -9.2035499469042970e-01 -3.3761656505527660e-01
+1608 -5.4368578491732777e-01 3.1642804477704484e-02 5.4278676772287304e-01
+2290 -6.7953618465932264e-01 5.7745402839380081e-02 9.2765985709028209e-01
+787 7.8434969512456898e-01 -1.8564143850327675e+00 7.3122472076422629e-01
+1838 -1.2171485274743750e+00 -1.6054333718532003e+00 -1.2298160601995378e+00
+1638 -4.6263743062729107e-01 -1.1768809617376177e+00 2.8681511315270436e-01
+327 9.7621557491040026e-03 6.9595993322038752e-01 1.1712958655381100e+00
+561 3.7238676123745862e-01 -7.9016615573369797e-01 8.5639642726598320e-01
+2071 1.2782158985019909e-01 5.9541402676078903e-01 -9.9702066738685868e-01
+68 -4.8936863179035794e-01 -8.4883223290863563e-01 -1.3038636856782249e-01
+1784 -1.9927332819844885e+00 -9.9037459215635026e-01 -8.6151921647243890e-02
+2669 2.2593376871737572e-01 3.6927077940794900e-01 -3.9456965881518991e-01
+1649 -9.4705139629703561e-01 -5.8990512997915578e-01 1.7247716191108677e+00
+1544 -6.6089993322082818e-02 -2.3064066991573845e-01 7.5355323574760202e-01
+2927 -1.8490112084786354e+00 -3.6139021866460619e-03 1.6508736880780644e-01
+2934 -1.5819992392904190e+00 6.1692937240028160e-02 -2.4257579127366113e-01
+847 6.7086496436871390e-01 5.3840100904104560e-01 2.7576540004787120e-01
+1541 -3.5472971931357233e-01 -2.0735370139435660e-01 1.3057257942240714e+00
+1459 -1.1627215415828529e+00 1.4101615701797168e+00 -2.3650127788257311e+00
+590 8.0004929476397002e-01 -3.3753962361051010e-01 1.0340613241183176e+00
+2031 -5.7620339624999106e-01 4.4944920431441659e-02 -4.8259935410186233e-01
+2198 -6.2044218454926892e-01 -1.0094154731360403e+00 -4.4492680058641765e-01
+2129 -1.3414975928932391e+00 2.0299890611581531e-01 -2.5919240133682786e-01
+1257 -8.8208517676222320e-01 8.3603461098856513e-01 -8.2020630274756168e-01
+1585 -2.7737959512962584e-01 1.7420539867542981e+00 -1.6526692322224934e-01
+2909 -2.4080478880403952e-01 -6.1314616100363206e-01 1.5798214716029539e+00
+2442 -5.1355795725203102e-01 -3.9464371603279180e-01 8.2150296512367627e-01
+2160 -5.0918373638678971e-01 7.3342594913234371e-01 -1.3481356046880799e+00
+878 -6.2629182030780894e-01 -1.6806772317629504e+00 -4.6139187235157225e-01
+2676 -1.0187132784744911e-01 -2.3325822928891324e+00 4.0423392927809332e-01
+2155 -1.3873963016265338e+00 6.4017113615055132e-01 4.4691102755975454e-01
+1162 1.8980412878104996e-01 -1.6500826319853390e-02 3.0578182424880562e-01
+2481 1.1878892527795031e+00 2.3305851321897495e+00 -1.8598688214229573e+00
+2427 8.8789225353689194e-01 -6.4006456851259774e-01 8.9186027726704231e-01
+2642 3.4939781157586974e-01 -1.0363915379155786e+00 2.4989032965108474e-01
+850 -1.2788462928091671e+00 7.7841914432492987e-01 -8.3455200062686996e-01
+2236 -1.4266634292769040e+00 1.4416175652256362e+00 -1.0750998638739673e+00
+2519 5.1136877439896367e-02 -1.1194941286233095e-01 -1.1978207530415639e+00
+2476 -1.8891431276847823e+00 -4.4327021270884726e-01 1.7638845760447741e-01
+2328 -5.1379944783219611e-01 -9.9646102863069103e-02 -6.8623830684396925e-02
+1655 -7.0245539469285889e-01 1.8201094223957128e+00 3.1372178570750353e-01
+114 -8.0193222514048168e-01 1.2192578578263649e-01 9.6135928338779086e-01
+1994 -8.2180923753682178e-01 -1.3155587701106550e+00 -7.5870707312754371e-01
+2327 -6.9104094078318723e-01 -2.0280702627932192e+00 -5.9249985647965220e-01
+396 -7.1183681819573116e-02 -1.3864650639532075e+00 -5.5123579690933266e-01
+123 4.2315489473592627e-01 -3.3510978378808337e-01 -2.2779007151879460e-01
+2278 -6.4431081887108499e-01 -6.3601682273992211e-02 -1.0741025079679520e+00
+1353 1.2650903222580832e+00 6.4651615487874525e-01 7.4283983696783656e-02
+1616 -3.5487346353953386e-01 -4.0278689007587060e-01 -5.8086325015942825e-02
+1865 -4.8044295507561702e-01 1.1515037320279762e+00 -6.5691091816922187e-01
+260 -6.3336240074535621e-01 -8.7314967178833996e-02 1.2426508929581075e+00
+2007 5.9441677004205551e-01 1.9673209061393868e+00 -1.5340615556990078e-01
+730 1.0514029045369997e+00 -4.8300613632994860e-01 1.3055464878010015e-01
+2489 -3.5937246496914305e-01 -1.1307044206261432e+00 -4.7031953869562176e-01
+2588 -1.0479852401014150e-01 2.1093775365335699e+00 8.0820352134685691e-01
+662 1.0889714307224621e+00 9.3511610275665213e-01 -6.4091601723727831e-01
+1765 -6.0316345248941250e-01 1.8770972570687876e+00 3.0216283455465200e+00
+340 -3.2816401325397915e-01 7.4315626133229584e-01 1.9705137235121617e+00
+2080 2.0119512565858737e+00 4.2594539708041268e-01 7.4162990604341728e-01
+611 -1.1453680509208835e+00 -1.3043648608251333e+00 4.3289723714502604e-01
+2595 -3.3111300977190661e-01 -3.9446615961640896e-01 1.4101223223066566e+00
+2917 -7.5126124510593584e-01 -7.7207870492534336e-01 2.2340919571190176e+00
+2973 -7.0799668576970287e-01 -6.4436649403105262e-01 1.0234728900046224e+00
+318 -1.4562970468570394e-01 8.1968240734330045e-01 -3.3698180041889014e-01
+443 6.6039738328946118e-01 -1.2041038322735051e-01 8.6150062370075692e-02
+241 1.1913035840733046e+00 -1.1611614039573375e+00 1.2267920406188582e+00
+2561 -2.2069426935336284e-01 3.2613457995114514e-01 1.4124615804518255e+00
+221 -3.4604308414352353e-01 -1.8312883657137616e-01 -1.1197555742008132e+00
+1056 -1.0931605038827017e+00 4.8998615426852599e-01 -8.2803985950595027e-01
+1286 7.1813139328086395e-01 7.5626859683811398e-01 2.3272594034389629e+00
+440 -3.8219190483684318e-01 -5.2668476328744807e-01 -6.9571421398196265e-01
+2066 -7.0692517764816953e-01 -1.9104975794995227e-01 -4.4596155063036230e-01
+742 3.0538891617240549e-01 4.5970430116490679e-01 -1.2418536044292241e+00
+859 -1.8753206155612331e-01 -1.1554444466319036e+00 3.4145506492069100e-01
+351 3.4927282270611199e-01 -6.8046373376341396e-01 8.4802654485308460e-01
+2860 4.5564176821371416e-01 2.2722160326031737e+00 -6.4770497135159166e-01
+2130 7.6449081098667970e-01 4.4879240014901434e-01 1.3985666310744185e+00
+2869 -2.3124690247156843e-01 -8.2668288386249966e-01 2.1023820988219866e+00
+2871 3.3156957017253230e-01 -1.5616736644293852e+00 -3.5571166550423911e-01
+2552 -2.7704760334596124e-01 -1.0952283663598983e+00 6.7228234299843287e-02
+127 -1.1553238977757360e-01 -1.5296130587012144e-01 4.4816971660197596e-01
+1602 5.0043201596928943e-01 3.0241980485029955e-02 -5.0751696073882346e-01
+2892 -1.5088665933356666e+00 -8.6876326675055807e-02 5.3671136925474294e-01
+917 -8.4882639528200654e-01 7.9927733031867376e-01 -1.2080346496529319e+00
+1836 1.2991499373446729e+00 9.6915747634576044e-01 6.0661432991642805e-01
+946 9.4525864332719678e-01 -3.5406324704317177e-01 9.8295540556478966e-01
+1410 -1.1489184478426773e+00 1.3950164448110103e-01 1.2576426027720287e+00
+761 4.5271764648870449e-01 2.5025631385992769e-01 -3.8568515886785648e-01
+1596 -1.9273649781520655e-01 -2.9676700114222565e-01 5.6027109036071465e-01
+486 -1.8797849008149781e-01 -1.1492105818853506e+00 -1.6291164789889792e+00
+636 6.9980940228104208e-02 -1.2119160551892745e+00 -1.1525191744539833e+00
+593 2.4250372399706124e-01 1.2074218538232395e-01 -2.4695048009171541e+00
+72 -3.9185326179677377e-02 1.1913927327939107e-01 1.6077520709627908e+00
+1329 -6.6634926013937268e-01 -5.9185929212721766e-01 -1.3508261561055273e+00
+1730 1.5288993200614671e+00 8.2185490981052367e-01 5.2151279507858334e-02
+2847 -1.4167914329944911e+00 1.8204479161161222e-01 5.9131631258078610e-01
+23 3.2066329456337961e-01 -9.4663993957027270e-01 -2.0006606081583986e+00
+1394 3.8228579533503443e-01 1.0689584253966067e+00 -1.9717426150344406e+00
+798 8.2399322338918413e-01 1.0459109948580826e-01 -2.6858592353575339e-01
+1155 4.8108304421644205e-01 5.1083239014704540e-01 -2.9561494529192023e-01
+2568 -7.6642448262107177e-01 -1.1187645379248274e+00 1.1684491399983408e+00
+1289 4.1973249081579478e-01 1.8847723915190890e+00 -1.5887749474150953e-01
+2741 -3.2480981157259614e-03 2.3915740929501586e-01 5.5211045961966954e-01
+2969 1.5162276900795335e-01 5.3965131971994751e-01 8.7907564585420594e-01
+1839 -9.1014034524037413e-01 -2.9894125618448031e-01 1.8533765224577208e+00
+804 8.6343427611858037e-01 3.2564504844238656e-01 -5.0361462519875388e-01
+2388 7.4527537024655788e-01 -2.6474185410276436e+00 -5.7188500572484402e-01
+2382 -9.9335594463155563e-01 -1.9063657845245849e+00 -3.9419731531889324e-02
+380 3.2728243638926641e-01 -1.3481770730044422e+00 2.4037106412423509e-01
+568 6.1846423548260498e-01 -7.2505544829456148e-02 1.6701328461000366e+00
+1902 -1.6435247983102241e-01 -1.1137521779332367e+00 -1.4185035509874151e+00
+1154 8.0362813935852140e-01 -9.3195853463106049e-01 7.5161132159546895e-01
+1285 -1.0452488086644475e-01 -1.4910281294814640e+00 3.2388546364989046e-01
+15 1.0971555674712294e+00 1.1268470347799924e+00 -6.8821815171915812e-01
+1140 -1.8635116978488964e-01 1.6019325080006235e+00 4.9397076849356619e-01
+539 3.3111433516482075e-01 2.6978489855549609e-01 -1.8451999141445279e+00
+433 -1.4104650377531966e-01 3.1059394933209228e-01 -1.6795313618618894e+00
+2549 -1.9739053058054967e-01 1.6024012491707337e-01 -2.1607315301607741e+00
+1701 1.9635900145833801e-01 8.1531918293753824e-01 -1.8566685545190051e+00
+2222 1.3148739924316311e-02 2.6816800980019595e-01 9.3535252580502815e-01
+2002 9.2071901189286931e-02 1.1051090114558635e+00 3.0295308340570470e-01
+423 -1.3450792645416298e+00 2.4216539187108857e-01 -1.5117968918480464e+00
+1334 -5.5099020482743977e-01 -6.2929877415832125e-01 -5.9755045723444422e-01
+2570 4.0119143767633708e-01 -7.1767660502128433e-02 2.2124884903606592e+00
+2037 -1.9653462734755447e+00 -1.0906799583584648e+00 5.1986868676960973e-01
+1990 -9.1839868264018920e-01 -2.3182857540745369e-01 3.4886131353389377e-01
+2681 -1.1727755852598762e+00 1.2898767036739247e+00 -7.0185214497552262e-01
+1314 -2.9400543702347731e-01 1.5464921232287667e+00 1.1397699444457270e+00
+2544 -7.9647260851059914e-02 -1.1505586352705526e+00 1.3226186181053756e-02
+2350 1.1703478236156559e+00 1.6346235385641210e+00 -1.1205429204303108e+00
+2682 -7.0480130333580093e-01 8.4778712208412244e-01 -6.6901749196559535e-01
+2312 7.1388674289978904e-01 -4.0406261758165835e-01 2.1133030350470960e-01
+1491 1.3876561131746015e-01 -7.4893660183936517e-01 -2.1885828230772355e+00
+1340 6.6710206190072119e-01 -2.5019479070045745e+00 1.8116163156588527e-01
+2646 3.9615953247353930e-01 -1.2686774437210206e+00 -9.2932258775048804e-01
+1976 -3.6207243212174833e-02 -1.5468181829432657e+00 -4.5761084437804828e-02
+2083 -5.2177616878323707e-01 3.9739430539862347e-01 -3.2294534785539680e-01
+2753 -5.1221845803124766e-01 -1.7268818661372194e+00 -4.5652545183188664e-01
+1620 -1.8810359816435820e-02 7.9133978632898805e-01 -2.0297337296395510e-01
+812 1.0614474559240707e+00 6.7101233698552776e-01 1.2973363629223349e+00
+589 -2.1051776236920555e-01 -9.7078147512665997e-02 5.9652313839887428e-01
+1825 -7.0311383575479880e-01 2.8111709533448087e-01 1.0569228098659860e+00
+2076 3.1524460579445207e-01 6.3298213861365060e-01 5.1369993280114201e-01
+2315 -1.0517914252147451e+00 2.8394567910054930e-01 -8.2086691833442149e-01
+2889 8.1543148249561637e-01 -4.4068710320285231e-01 3.4470476934422212e-01
+28 -4.1058679145719301e-01 8.5080831466664708e-01 4.8872010625898599e-01
+1192 1.0135515039373162e+00 1.3311040651101229e+00 2.1184286535044379e+00
+2966 1.5587892617029953e+00 -5.9352709970964965e-02 1.0506497281262965e+00
+2109 -4.9955755877464376e-02 1.0143101957462795e+00 -1.8147179764509483e-04
+1858 -4.6039485567501404e-01 1.8927219007748461e-01 -7.6040689801161743e-01
+2656 7.8653924703200068e-02 1.8569163313938131e-01 1.5949030904338990e+00
+834 7.0743844362246755e-01 -6.4542025691605898e-01 2.2415935452207864e-01
+2912 3.3989754600537431e-01 1.0041868158951075e+00 3.8386879331283741e-01
+1226 -1.9395349897545409e+00 -6.6958517943689910e-01 8.9121162182643066e-01
+2652 1.9313551844935359e+00 -8.0186224907122849e-01 -8.4375395544983733e-01
+1364 6.1838785558906172e-02 3.2979939447696852e-02 -6.7910045972099498e-01
+964 1.1298709155057878e+00 -1.4823731131391302e-01 1.1305235678150058e+00
+142 1.3998972315437701e+00 9.3846210232382515e-02 -1.2984158161748000e-02
+653 9.1325410605719054e-02 2.1641351087717049e+00 -3.6143802412006654e-01
+1081 -4.1454834725237455e-01 -1.5356866252912003e+00 3.8828076695029473e-01
+2338 -1.8205422677621673e-02 1.0219633746140677e+00 -3.4309906125534306e-01
+2768 -9.9985862594477326e-01 -7.7291516636514868e-01 -8.0304001851477280e-01
+1402 1.0661964817967673e+00 1.0719601722593586e+00 -8.9632043175343801e-01
+1205 1.0959212862259864e+00 -8.3914837367451023e-01 1.5592242898589264e+00
+1713 -3.2152566811733774e-01 8.0155176927218130e-02 1.2878774674738842e+00
+2032 3.8652210408934817e-01 1.4248837230392941e+00 8.0678927796467959e-01
+829 1.0427508207431102e+00 -2.6735894996049514e-01 1.7452029246472671e+00
+2775 -1.1900909533218651e+00 6.0573687675548094e-01 -1.0572539712095002e+00
+1121 -6.1045503770483500e-01 1.8120951506035115e+00 1.7484490873846870e+00
+79 -9.8143856595096224e-03 -1.4707726410600083e-01 1.1794459090165373e-01
+487 -1.0981626593490144e+00 3.7320352889478736e-01 1.6577738771825368e+00
+1304 -6.7387126220190163e-01 1.6622597674421911e+00 1.2931434958560777e+00
+639 -4.1252577205125518e-01 -4.1905222946053367e-01 1.4835257344087420e+00
+211 -7.4713133190567849e-01 -1.0975837770991903e-01 5.8723193370197158e-01
+2789 -1.4688338437503405e+00 -4.6204950557090807e-01 -1.4571371309261055e-01
+1055 -2.3036926337646552e-01 -1.0223404397961722e-01 -1.5319348334531349e-01
+1235 1.7434337959356565e+00 5.5162747110888888e-01 -1.9419912507726118e+00
+922 7.1363807475597818e-01 2.3717241947838674e-01 3.0715268558048958e-02
+2500 -4.4282093748359436e-01 8.0864813959753512e-01 7.2647135049250577e-01
+2335 -3.2957071478865968e-01 1.5334211170128755e+00 3.2843755037948952e-01
+2274 -1.0155677863719470e+00 -7.2291274039223652e-01 -9.1758424061736854e-01
+1044 -8.3594374182393860e-01 -6.3409081861077410e-01 1.2496908846658201e+00
+2342 -2.1640112142074575e-01 -8.3280412600859810e-01 9.2834303956331043e-01
+2704 -5.0357021284090986e-01 -1.1539726883532002e+00 3.6614572992615957e-01
+695 -1.1175745296130362e+00 -1.1512406486540734e+00 -7.9195699559388921e-01
+2904 1.2673150649835576e+00 -2.2257874774604899e-01 1.0838517939786957e-01
+1927 3.0946229273368375e-01 -5.4730396847899210e-02 2.7532264577113885e-01
+2173 1.3847537981698150e+00 -2.3605596625507368e+00 -7.2798350246593790e-01
+1747 5.6503641047132880e-01 -1.7681062033045438e+00 -9.1771529511416083e-01
+1386 -8.8422685973689930e-01 -1.0250363199653674e+00 4.8164186844203383e-01
+941 2.4037734915732054e-01 -1.2472830168087077e+00 -8.2543222522386117e-01
+992 -3.6391451088208787e-01 -3.9250977789189401e-02 5.6624394061560768e-01
+2098 4.0595754303761622e-01 7.9520156771611672e-01 -8.5613438169052286e-02
+2960 1.8755448768584317e+00 -2.2902325284629127e-01 8.4831702441616252e-01
+1693 -3.8273392372803544e-01 4.4358618055687193e-02 -5.7476802917109637e-01
+1283 1.3581898196329527e+00 8.5496162404592924e-01 5.1205706467971901e-03
+1752 1.1212951063508450e+00 -2.4289483146344387e-01 3.9498891822023463e-01
+2585 2.0042312930386008e-01 -8.6402746016697551e-01 2.1801739495966821e-01
+1508 1.2216130021809273e+00 8.0876923698079028e-01 1.0291261868781780e+00
+2217 5.3000299977127219e-01 2.9210431434336237e-01 -1.0887233156782775e-01
+2581 6.4074489901478371e-01 1.0724194850185174e+00 1.2781105431084505e+00
+1812 3.5090659703033383e-01 -1.3013084666045351e+00 9.0012487171929267e-01
+2662 1.3671024376669889e+00 3.3028268978461972e-01 7.5700352634527590e-01
+329 9.8562030056576722e-01 9.1059267514462450e-01 5.5507328279644907e-01
+284 -1.2550502652436160e+00 -1.2553217306984072e+00 2.4538754037605379e+00
+2415 -2.3613598441767961e-01 1.3628287483975678e+00 9.0193210926269335e-02
+702 -1.3814395025732246e-01 -1.4085690303088942e+00 8.1104074462615428e-01
+1058 2.4093700825700262e-01 -1.3827912380666918e+00 1.7901812025552122e+00
+2150 -3.5740218396303769e-01 -6.2354381791393396e-02 1.4649355922588354e+00
+668 -5.6775799493086687e-01 6.5815674139176217e-01 7.1886355909959079e-02
+2511 -1.3016595572909935e+00 1.1361252301812794e+00 -2.2813876382902246e-01
+1319 1.9889581538315479e+00 1.0764223295635860e+00 -3.4549715141840270e-01
+1134 5.9938016438518135e-02 -1.1847908678841668e+00 1.6229537307539013e-01
+2849 -4.8489125698867436e-01 8.3662980351645644e-01 -1.1540193592651331e+00
+53 -1.3741358054610020e+00 -1.2476823446754264e+00 -1.0552859543097355e+00
+2576 -2.0880067988776380e-01 -9.4578706501114373e-01 3.6300211904702451e-01
+2399 1.8771168900558284e+00 6.9095932585029593e-02 6.5883767619747635e-01
+2714 7.2670515142063730e-01 -6.1616573118458795e-01 -4.1676439708800295e-01
+1899 -1.1509223546313356e+00 -5.6112978574334349e-01 -1.0125585437881128e+00
+1654 -4.8849531940491697e-01 1.1868888645531721e+00 1.1714431641975467e+00
+1903 8.6847969551685866e-01 -6.4216387138151287e-01 -6.9346764249421999e-01
+2011 -2.2829899531248185e-01 -1.9100174218828561e-01 -1.5828248558092459e+00
+2239 -5.8697114302885922e-01 2.7827717175207545e-02 -7.1165242259034145e-01
+2678 2.0282129585234348e+00 1.6956930381319999e+00 -1.4049005878867920e+00
+1766 5.2308621219005691e-01 -6.0739068720538258e-01 1.8492126815077949e+00
+951 1.5973219648725068e+00 -4.1707249446409489e-01 6.8519269483923662e-01
+1579 8.3515535202746549e-01 1.0664173772980816e+00 -5.5413906217778663e-01
+422 8.7706110591064368e-02 -7.2078648597228789e-01 1.8077030410363959e-02
+1657 8.6187529766310478e-01 -1.1597750659597104e+00 -5.4430648241121748e-01
+2771 -3.7559647564830012e-01 1.8057247700024287e-02 -1.3330240175292936e+00
+1428 -8.4420346709400096e-01 -1.1919444175737184e+00 2.7118863907052559e-01
+1266 4.1013689421425314e-01 2.9556702155410119e-01 -2.9073786257577533e-01
+2064 2.3260462139346472e-01 -1.3306856829548990e+00 1.0986058792991673e+00
+1361 -1.3041667576967448e+00 5.0748414409400122e-01 -4.1662838974399014e-02
+2694 7.2265891026475715e-01 -2.0475844765662293e-01 8.0552348922273254e-01
+2149 -8.2805059971622874e-01 -9.4010096830115419e-01 3.2907866601096997e-01
+1950 4.0726274006229901e-01 -8.7583936741552204e-01 1.8008070214873655e+00
+193 6.7771373743469399e-01 7.6859256666814169e-01 6.6923498809100046e-01
+504 3.0428194924996782e-01 -2.2897537892236342e-01 5.0621748655788490e-01
+1082 5.6803479940448465e-01 7.4756124681619196e-01 -1.8951204606008271e-01
+2485 -1.0876125975830284e-01 2.2010324161784873e+00 6.6555325454945558e-01
+1890 -6.1113816642254848e-01 8.7324775747301997e-01 3.7083644360816420e-01
+113 -8.3628682335401217e-01 2.4458649825758549e-01 -2.6336468218830511e-01
+2859 -1.4048776832595872e-01 7.2050305316684204e-01 9.3849857464131903e-01
+1301 -6.4632558624690539e-01 1.6625800258209007e+00 1.4754890428958711e+00
+2095 -1.2547605103416810e+00 1.3449526128799578e+00 -3.0934913971913264e-01
+1538 -9.6270879819212363e-01 1.3652172916152161e+00 9.0453623654590276e-01
+1942 -6.6288925954085642e-01 -1.9841248154156799e+00 -9.5324616816005536e-01
+215 -2.3399460906493955e-01 3.9285896462171688e-01 -3.4743609884651361e-01
+2506 -4.7460223080412883e-01 -2.0466746256726709e-01 -4.6781908946379513e-01
+1589 -2.6860204428362566e-01 1.1830069887197852e+00 1.0661774285159329e+00
+1750 1.0802149705868971e+00 -3.8293232988856507e-01 2.7286307284066880e-01
+2533 2.3080743733773459e+00 -5.5655148395956544e-01 2.8978119463515739e-01
+384 9.8336903647796503e-01 -2.2066583949631610e-01 -1.0976955627201037e+00
+2058 1.0047605746956145e+00 -1.8783422349931228e-01 4.8252549695915520e-01
+251 -3.2983378159259713e-01 -1.0417532500790907e+00 1.7772948391686672e+00
+2766 -5.3742467279778761e-01 -2.0933671182804203e+00 -4.0042538680118989e-01
+1124 7.5933787189360369e-01 3.3170814233920376e-01 1.1090666455056137e+00
+2722 5.1882788275622516e-01 -2.8487435637186369e+00 8.9814429523018802e-01
+2640 1.6049352810119588e+00 -2.3717164994142919e+00 -6.5339646356020398e-01
+1888 1.2665190022196653e+00 4.9597050900553741e-01 7.2470762033311442e-01
+275 5.1358608683383555e-01 -2.3326966191015801e+00 -1.0070059953623041e+00
+886 1.0691041982022305e+00 5.1093216583966672e-01 -6.8787054915374524e-01
+1841 5.8659053632883394e-02 -4.6289567181624391e-01 -1.0267710045337877e+00
+1384 -3.3468025321665207e-01 -6.3542786484793279e-01 -2.7040616043669963e-01
+1753 -2.6355826293148843e-01 -7.5385710792458183e-01 8.2790037523928794e-01
+1783 -9.3229110036394880e-01 -2.0200979235484002e+00 -2.1873403853391374e-01
+2447 -4.7636742343162464e-01 -5.0329656604742916e-02 1.6631851171881036e+00
+2583 -3.9584547154960331e-01 1.8672776780780656e+00 -1.2407952013483601e+00
+2486 -3.0841472759411759e-01 -1.8162730648319814e-01 -1.5092599322012157e-01
+1968 -7.9184047825935300e-01 6.0748090594989690e-01 -1.5501609431568950e+00
+2915 -2.1944333815116450e+00 -1.2438927607804839e+00 -6.9560970494728003e-01
+235 7.0585975688916935e-01 4.4110454931991022e-01 -2.2564857275512934e-01
+1381 2.4769366892050076e-01 7.0919487168512219e-01 7.9692628109686581e-01
+2104 1.7745856230937673e+00 1.2370347695768644e+00 7.2648442124406543e-01
+1480 -1.1419138615058118e+00 5.0357599786452933e-01 -9.6365427288563543e-01
+2375 -1.1981202022979223e+00 -1.6086746495710933e+00 -5.8025763198508118e-01
+726 -1.8582049511784193e-01 -2.4434556892373478e+00 -9.1128473527401577e-01
+765 2.4475587244595076e-01 5.0563149320815837e-01 5.7533496323213629e-01
+1186 -3.3920431068041462e-02 -1.6542238622153635e-01 -2.5085409387902025e-01
+2079 6.0168775053141066e-01 3.4092959291357805e-02 -3.3759298161845841e-01
+875 -3.1697988140497951e-01 8.9020022319239223e-02 -3.5015254717364458e-01
+2325 -7.0745341387121141e-01 -1.6692240476876661e+00 2.7645086483653908e-01
+1372 -1.9033292390096908e+00 1.1596913426307742e+00 -1.3780800006683536e-01
+2477 -4.2064767578631590e-02 -2.4067730353612298e+00 1.3522572481535593e+00
+2938 1.2408284548956590e+00 -2.4496984430821761e-01 -1.6151642927922778e+00
+2868 -1.4549941701623217e+00 -4.8309452780046735e-01 -1.6897625044260414e+00
+116 -5.3681334530608693e-01 1.0711494379448186e-01 -7.2682015698827407e-01
+2273 -4.8221831686039102e-01 8.9490387689392589e-02 2.9036150440267905e-01
+1031 -1.1008061837679628e-01 -6.7052211816700957e-01 -3.2945184291773877e-01
+1486 -6.3633041837381876e-01 -3.4642750109175099e-02 2.7993376834739925e-01
+2604 -5.6841053046503776e-01 1.1597250820197813e+00 9.2572666348252763e-01
+1333 1.1095772690437649e+00 -9.0529706186103875e-01 -1.6910007910439349e+00
+2800 -1.3507738167347432e+00 1.3592652062567916e+00 -6.0739759669599047e-01
+1989 1.7860601931053355e-01 1.5231199221659093e+00 -1.6520986448742194e+00
+1085 2.2733523282266921e+00 1.0990100421725533e+00 2.3232362138300511e+00
+2018 -1.0666764810316420e+00 8.3418337324933023e-01 -3.1602253499641053e-01
+2047 -1.8486603623376199e+00 1.4582348689886235e+00 -2.1414337705042094e-01
+764 1.2417941282519984e+00 7.4908786905398350e-01 1.1815898977914521e+00
+271 -4.0822632841877271e-01 -2.5502649651004922e-01 1.9433590460053881e-02
+968 7.4982339245060547e-01 -9.8252166623957182e-01 2.7885296320655489e-01
+2202 1.2645137475014305e+00 3.7702389672438974e-01 2.6147732497181664e-01
+2939 1.9888444187929874e-01 9.2539838971294652e-01 1.6568560810518289e+00
+306 -2.0421692888081715e+00 -1.1959989392544028e+00 9.1813856953511142e-01
+2492 1.3181947510718570e+00 4.8421774729395028e-01 1.4538122650218499e+00
+2914 -1.6509411023372018e+00 1.2778429084929541e-01 4.1110907541168468e-01
+1262 -5.5690978841150714e-03 1.5320257887552740e+00 2.3118080597850033e-02
+1000 -1.8450559162885030e+00 -2.0949384323165712e-01 2.6491973691836351e-01
+2258 -5.3727968045524732e-01 -8.1132425140060938e-01 -1.0583049131972897e+00
+631 -6.0513018478589709e-01 -2.3387097851884175e+00 -1.9411052837286176e+00
+1095 -3.0327366277320210e-02 5.0648928399230075e-01 -1.4306855715198288e+00
+480 4.5967961771995153e-01 8.4017900557503067e-01 -1.8330766321152736e-01
+2599 -6.3124640104241714e-01 7.0320077166551942e-01 -1.2947910978551366e-01
+280 7.3339559653237218e-01 -2.3292465698695692e+00 6.6901456787474367e-01
+2725 -1.2483157281588639e+00 5.7396887083214010e-01 1.8424230565947424e+00
+1123 1.7786319182493533e+00 -3.7169613596428119e-01 -2.3362087522251179e-01
+2935 2.0896791282194100e+00 1.9640316461023866e+00 -6.1166192236311612e-01
+650 5.6241658483412527e-01 4.5092719190963365e-01 -2.7798453437690235e-01
+421 6.8040796878355803e-01 -5.8178596503610980e-01 2.4045136506014947e-01
+1636 1.0189365982200229e+00 3.0199148730315717e-01 4.2395723011709463e-01
+2821 7.1570639711797801e-01 1.9184652968572699e-01 -2.8736441162994864e-01
+1792 5.8038475836053005e-01 2.5334164806383859e+00 -1.5435421473724829e+00
+1555 7.0919068392490259e-01 6.4448153954805165e-01 -7.0629840662406973e-01
+289 -1.7129885390884239e-01 2.4935909141329177e-02 -4.0983223629578169e-01
+2772 -5.2677995878442752e-01 9.0487299456838199e-01 3.3783888156584735e-01
+1309 8.1157277257497340e-01 -8.3815763080508432e-01 2.6145868423812746e-01
+1196 -2.5064596096752427e+00 7.0291100491648584e-01 -1.0660378513316671e+00
+609 -7.4035613055321636e-02 1.4676039876221618e-02 -1.7677776633172986e+00
+828 -9.7809293735822522e-01 -5.5745890605130555e-01 4.5429794661335038e-01
+1011 9.0184387420540635e-01 8.3492557198545192e-01 -5.5511070272171303e-01
+712 -6.8697784831087946e-02 -1.3409304807453737e-01 -2.9414390022489436e-02
+1239 -9.4295136492371556e-01 -2.4265120027787321e-03 -1.2316142194799615e+00
+1274 -5.7432679360998695e-01 -9.9347108400526773e-01 8.9540900040690252e-01
+1475 -1.7547431878968006e-01 -5.3125403762664614e-01 -7.1156885247435220e-01
+2077 -3.1675218684584061e-01 -1.1274586753098021e+00 -8.6018743054663685e-02
+732 -8.0742548643003920e-01 3.1481847604637525e-01 4.2979436790767744e-01
+2191 7.1231315947704921e-01 -3.9292157505297898e-01 -1.7225324342949855e+00
+1801 3.4636943756252270e-01 -8.1505212712745201e-01 7.6955647735876986e-01
+1566 5.7153239511579279e-01 2.7647735198567963e-01 7.8530475995325977e-01
+506 -3.6591674388013595e-01 -2.6763180371417450e-01 -8.0615159660821401e-01
+666 -3.2306700742602029e-01 -5.4384880802117397e-01 7.7995485244810758e-01
+2887 2.4500070145339264e-01 -3.4072895504942935e-01 3.5797746793091145e-01
+69 -1.7100091587001293e-01 7.3861520460908492e-01 1.2760792765678615e+00
+1417 1.0474821589724568e+00 -3.9497793393366171e-01 -1.1819544869449579e+00
+2885 -1.2501943277883172e+00 -1.1611018098124981e+00 4.7655947133434789e-01
+556 1.3865187688140683e+00 -7.4983294190987926e-01 -3.8428112587489893e-01
+1436 5.3904399883887744e-01 2.5539477987101855e-01 -1.8009698785851400e+00
+1862 6.6220513409282655e-01 9.0404236285556783e-01 9.1445492517205920e-02
+93 1.1146619537261877e-03 -2.3211651596696421e-02 -1.6723754800658375e-01
+1400 -2.3399761137396085e+00 2.2326204532707772e-01 -5.9616098907219983e-01
+2738 -1.5483311528330026e+00 -9.3057146256102297e-01 -7.5188354053932227e-01
+586 -7.4796127233422960e-01 -2.2451132051563000e-01 -1.7620173235314571e+00
+1136 1.7498903649388975e-01 2.6453005250892953e-01 -7.2781840681242105e-01
+1107 1.5118383636136923e-01 -1.1114810578419527e+00 1.7733148785290154e+00
+7 -4.7288790637866418e-01 -1.4730193462000674e-01 -1.2557278405256573e+00
+2510 1.1155194353664037e+00 -6.6225257446778385e-01 1.4212730907888682e-01
+1786 8.2332895339571853e-03 -4.9251264088805191e-01 1.7079494478371995e-01
+154 -1.6621929482717479e-01 3.4999787654684388e-02 9.0632000726146844e-01
+938 1.5811870989122750e-01 -2.6949319064682173e+00 -3.8644257249736458e-01
+496 1.0170360708429986e+00 -1.6172906233946214e+00 3.5059164737166221e-01
+853 4.4195617245466745e-01 -3.5942569676178165e-01 9.0239785833071740e-02
+2946 2.1640248594723981e+00 -1.7911365622765179e+00 1.1076643508814830e+00
+1848 -5.1455077783357128e-01 -4.3792062928956926e-01 -4.2663810828679349e-01
+1874 -1.4174309279923261e+00 -1.8091161025754071e-01 3.5694399808329147e-01
+159 -4.7147675318311877e-01 7.3759266645499066e-01 2.9792969551371884e-01
+2880 8.2558542683912972e-01 -1.2810368672118846e+00 1.1460565821340503e+00
+1308 1.6086669154327082e+00 3.8155864462202477e-01 2.1195810633459133e-01
+90 -6.1103373437939013e-01 -2.1487452860525827e-01 3.6319755465845949e-01
+2392 1.4267587280420682e+00 6.5553909417601008e-01 -1.1877005931815305e+00
+746 -4.6102707099457496e-01 -6.3315358587325743e-01 -1.3384970165097315e-01
+706 -5.5263158259652168e-01 4.8222770279457211e-01 1.5653966785908153e+00
+1915 -1.0859938447770043e-02 -4.7090486501664452e-01 -8.7752806047731702e-01
+2550 9.2360798739183403e-01 -2.2495539583885060e+00 -1.8549193959146402e+00
+2008 6.4570733205181896e-01 -2.0049602035254785e-01 -5.6611223697465840e-01
+2670 3.7216202666291687e-01 -8.5343314273905763e-02 1.8928525159107890e+00
+1399 4.8757673993096856e-01 -9.6461165928766593e-02 2.2908873275546897e+00
+336 -1.2346543845598155e+00 -1.1120116871475780e+00 4.1372415363443338e-01
+869 4.7806778047045689e-01 -2.0218425593079634e+00 1.0497851767956070e+00
+2655 1.1283701320707420e+00 -1.8416601850882144e+00 -1.6814833590395900e-01
+2412 4.5884217235037056e-01 -1.2162896779507086e+00 -8.7724492650844443e-01
+378 -1.5928609674354131e+00 -9.1960394547141777e-01 1.1940483592089482e-01
+1324 1.2733091877500249e+00 2.5154101152119028e+00 -6.4869113614931717e-01
+1420 1.1686159817694137e+00 -1.5263317317095249e+00 -6.6079614501462391e-01
+1628 3.1740595397444493e-01 4.0683954568512354e-01 -1.1424188462891889e+00
+375 -7.9517316907280022e-01 7.7721577922878760e-01 -2.0180140511211278e-01
+2459 1.7214151156412842e+00 1.8235399884082257e+00 2.7896050091952868e-01
+996 6.1591211919306321e-01 3.0241583650997589e-01 -7.2298573295795060e-02
+1122 -4.3125972998676632e-01 1.1077063140882621e+00 -1.3619175401305410e+00
+2980 1.6774798050373985e-01 -7.1361329614598334e-01 -1.9203633352691933e+00
+237 -1.2920139500788326e+00 -2.3218019974741830e+00 7.8617160304935918e-01
+452 5.3200631441924295e-01 -1.7607034056558810e+00 2.1913011087511639e-01
+1276 -1.2349024733016039e+00 -1.1479750195048066e-01 6.6911444107617146e-01
+71 1.0217028577449712e+00 1.7764990081227288e+00 -3.6812731734143828e-01
+1868 -8.2009787506631626e-01 1.4356769695836458e+00 6.4031852851771143e-01
+285 3.1480353983556364e-02 -1.2040904916588506e+00 5.2258729349639355e-01
+1291 -7.0040068651809451e-01 -1.1764150859607718e+00 -9.0638777509417290e-01
+1194 3.4720640001007759e+00 -4.8621707947000270e-01 4.9047921096487750e-02
+2813 1.0724443542230402e+00 1.3315527986006082e+00 -5.3477776935715249e-01
+1307 1.3355549475184600e+00 -1.6652547340360965e-01 4.4361528381046578e-01
+2426 6.5350887813933711e-01 2.1514861632869114e-01 1.1477071783557604e+00
+2716 -9.9937170134217634e-01 -1.1410408988966667e+00 1.6434481318792040e+00
+1050 -1.4179749694037627e+00 -4.2888903754875735e-01 -2.2793803672991721e+00
+2267 -8.7365347265408483e-02 -9.4069204847636212e-01 -4.2493794827790399e-01
+2234 3.5910165971124175e-02 -7.1131899437216053e-02 1.2045964743393125e+00
+21 -2.1797022198528184e+00 -2.6766919374888631e-01 4.7680950946553763e-01
+61 -2.1362765031728568e+00 1.2906723666520750e+00 7.6758327642475074e-02
+2306 -7.8328863286671838e-02 1.7543044154028600e+00 -1.3144261910107142e+00
+953 3.8522635761892221e-01 5.5977253931822762e-02 1.2110088577281652e+00
+2157 -1.5008271046656255e-01 4.1452400798219069e-01 1.0037592425460933e+00
+773 -8.7967923591907402e-02 -6.0961808905354964e-01 1.5582005696198429e+00
+1571 -3.6566521832123833e-01 1.1504560018475969e+00 6.6075077585334552e-01
+1823 -1.2457082975320311e+00 2.4339912508682338e-01 2.2814307524803482e-01
+236 1.6650294266797787e+00 7.6309803596518322e-01 -1.8847523617615497e-01
+2272 -9.8681347113231538e-03 -1.1484021649635817e-01 -7.5436665782482593e-01
+1999 1.7939448977270771e+00 9.2346328716751147e-01 2.1584936805743710e-01
+2591 -5.0712995070496314e-01 -4.0121537480534619e-01 -1.8992188922946140e-01
+1281 4.0635791596889703e-01 5.4405264229948277e-03 -1.6566028760253071e+00
+1864 3.4582462359121657e-01 8.2134176231012157e-01 1.3078567816257650e-01
+296 -2.8193219354855181e-01 -1.2266315784954331e-01 5.8261619325301750e-01
+1662 -1.0686790997422608e+00 1.9478761417868562e+00 9.0118137357380046e-01
+638 9.5478725817783783e-01 2.1304223534214310e+00 -1.1276156480998245e-01
+2017 -2.4225260868322551e-01 -1.7208573768637971e+00 5.7129513161753642e-01
+2721 3.7761919368274560e-01 -2.5768242337918030e+00 9.8861735166956299e-01
+1799 2.0263623307793716e-01 2.5320731008759187e-02 3.3707102662108246e-01
+835 -5.3907608729151224e-01 -1.6855431027197250e+00 7.7024798190622523e-01
+1650 1.6442921929071574e+00 -1.4266117497747115e+00 6.8444816512073570e-02
+1788 3.3506812944341013e-01 2.6018820306719403e-01 -1.1211403123781775e-01
+1543 -5.6710033721879355e-02 6.8945021237477433e-01 -8.7280019948117760e-01
+1104 -1.7604281447823604e+00 7.4815510376560035e-01 -5.9522267563079401e-01
+1119 -6.8001459704091349e-01 -1.4339960745847657e-01 -1.3835862045105707e+00
+841 -1.7471951265700525e+00 -1.5054221218094516e-01 1.9075527308518494e+00
+2857 -1.0988290923739445e+00 7.1882686728660394e-01 -8.6434473601398487e-01
+2589 -4.7116840598625226e-01 5.8567625068690010e-01 5.9559843836540893e-01
+814 1.0797331584205444e-01 6.7111119889995186e-01 -1.5323318029919455e-01
+2344 -1.0465004100133268e+00 3.3681048685190462e-01 -6.3908229839799613e-01
+625 1.5697833115798776e-01 1.8812743642122474e+00 9.5709533639162170e-01
+2986 -1.2573551378101520e+00 -1.7565423684682950e+00 -6.3769224780147171e-01
+508 -3.1353894350046096e-01 5.6311124890644437e-01 -4.8500868917051754e-01
+1228 6.5701401571917561e-01 -2.0522819931706802e+00 8.0112269950629822e-01
+1469 3.4977587482435457e-01 6.4130413256281238e-01 4.5388469872259724e-02
+743 -1.0031597593167190e+00 -1.4206108764368719e+00 3.8981472620992336e-01
+137 -6.9844380091063596e-01 1.7592567433257697e-01 -1.7182758857746949e+00
+2854 -2.7211271562585282e-01 3.7675019013256439e-01 -7.0691240252719578e-01
+2950 -8.9341500633155391e-01 7.0650069609071220e-01 1.3167224411409655e+00
+1634 -6.1189940242381957e-01 3.0222658037821315e-01 -1.3651451043129834e+00
+2787 8.9353095553324746e-01 5.2899727580781297e-01 -2.4076123441939631e-01
+2179 2.9915864619216703e-01 2.3850083378415288e-01 3.6035733946833820e-02
+2264 6.8649239582849061e-02 6.9900148341812796e-01 2.5922024072014875e+00
diff --git a/examples/USER/misc/slater/in.slater b/examples/USER/misc/slater/in.slater
new file mode 100644
index 0000000000..014b55cca4
--- /dev/null
+++ b/examples/USER/misc/slater/in.slater
@@ -0,0 +1,60 @@
+# Bulk polyelectrolyte as described in section IV of J. Chem. Phys. 125, 224107 (2006)
+
+boundary        p p p
+
+units           lj
+atom_style      charge
+
+region 			    my_sim_box block 0.0 10.0 0.0 10.0 0.0 10.0
+create_box 		  3 my_sim_box
+
+create_atoms 	  1 random 2804 100 my_sim_box
+create_atoms    2 random 98 200 my_sim_box
+create_atoms    3 random 98 300 my_sim_box
+
+set				      type 2 charge -1.0
+set 			      type 3 charge  1.0
+
+comm_modify     mode single vel yes
+
+mass            1 1.0
+mass			      2 1.0
+mass			      3 1.0
+
+pair_style      hybrid/overlay dpd 1.0 1.0 245455 coul/slater/long 0.929 3.0
+pair_coeff      * * dpd 25.0 4.5
+pair_coeff		  * * coul/slater/long
+
+kspace_style    ewald 0.00001
+dielectric      1.0
+
+neighbor        2.0 bin
+neigh_modify    every 1 delay 0 check no once no
+
+timestep        0.02
+
+fix             2 all nve
+
+thermo          10
+thermo_style    custom step spcpu temp press etotal pe ke ecoul elong evdwl
+thermo_modify   line one
+
+run             100000
+write_data		  data.after_equilibration
+
+compute         RDF_1_1 all rdf 50 1 1 cutoff 3.0
+compute         RDF_1_2 all rdf 50 1 2 cutoff 3.0
+compute         RDF_1_3 all rdf 50 1 3 cutoff 3.0
+compute         RDF_2_2 all rdf 50 2 2 cutoff 3.0
+compute         RDF_2_3 all rdf 50 2 3 cutoff 3.0
+compute         RDF_3_3 all rdf 50 3 3 cutoff 3.0
+
+fix             11 all ave/time 50 1 50 c_RDF_1_1[*] file tmp_1_1.rdf mode vector
+fix             12 all ave/time 50 1 50 c_RDF_1_2[*] file tmp_1_2.rdf mode vector
+fix             13 all ave/time 50 1 50 c_RDF_1_3[*] file tmp_1_3.rdf mode vector
+fix             14 all ave/time 50 1 50 c_RDF_2_2[*] file tmp_2_2.rdf mode vector
+fix             15 all ave/time 50 1 50 c_RDF_2_3[*] file tmp_2_3.rdf mode vector
+fix             16 all ave/time 50 1 50 c_RDF_3_3[*] file tmp_3_3.rdf mode vector
+
+run				      10000
+write_data		  data.after_production_run
diff --git a/examples/USER/misc/slater/log.lammps b/examples/USER/misc/slater/log.lammps
new file mode 100644
index 0000000000..b814fc4726
--- /dev/null
+++ b/examples/USER/misc/slater/log.lammps
@@ -0,0 +1,11225 @@
+LAMMPS (27 Nov 2018)
+# INPUT FILE FOR DPD_Fluid
+
+boundary        p p p
+
+units           lj
+atom_style      charge
+
+region 		my_sim_box block 0.0 10.0 0.0 10.0 0.0 10.0
+create_box 	3 my_sim_box
+Created orthogonal box = (0 0 0) to (10 10 10)
+  2 by 2 by 4 MPI processor grid
+
+create_atoms 	1 random 2804 100 my_sim_box
+Created 2804 atoms
+  Time spent = 0.000952728 secs
+create_atoms    2 random 98 200 my_sim_box
+Created 98 atoms
+  Time spent = 0.000162095 secs
+create_atoms    3 random 98 300 my_sim_box
+Created 98 atoms
+  Time spent = 9.44212e-05 secs
+
+set		type 2 charge -1.0
+  98 settings made for charge
+set 		type 3 charge  1.0
+  98 settings made for charge
+
+comm_modify     mode single vel yes
+
+mass            1 1.0
+mass		2 1.0
+mass		3 1.0
+
+pair_style      hybrid/overlay dpd 1.0 1.0 245455 coul/slater/long 0.929 3.0
+pair_coeff      * * dpd 25.0 4.5
+pair_coeff	* * coul/slater/long
+
+kspace_style    ewald 0.00001
+dielectric      1.0
+
+neighbor        2.0 bin
+neigh_modify    every 1 delay 0 check no once no
+
+timestep        0.02
+
+fix             2 all nve
+
+thermo          10
+thermo_style    custom step spcpu temp press etotal pe ke ecoul elong evdwl
+thermo_modify   line one
+
+run             100000
+Ewald initialization ...
+  using 12-bit tables for long-range coulomb (../kspace.cpp:321)
+  G vector (1/distance) = 1.0262
+  estimated absolute RMS force accuracy = 1.01103e-05
+  estimated relative force accuracy = 1.01103e-05
+  KSpace vectors: actual max1d max3d = 2787 11 6083
+                  kxmax kymax kzmax  = 11 11 11
+Neighbor list info ...
+  update every 1 steps, delay 0 steps, check no
+  max neighbors/atom: 2000, page size: 100000
+  master list distance cutoff = 5
+  ghost atom cutoff = 5
+  binsize = 2.5, bins = 4 4 4
+  2 neighbor lists, perpetual/occasional/extra = 2 0 0
+  (1) pair dpd, perpetual
+      attributes: half, newton on
+      pair build: half/bin/atomonly/newton
+      stencil: half/bin/3d/newton
+      bin: standard
+  (2) pair coul/slater/long, perpetual, copy from (1)
+      attributes: half, newton on
+      pair build: copy
+      stencil: none
+      bin: none
+Per MPI rank memory allocation (min/avg/max) = 22.65 | 22.66 | 22.68 Mbytes
+Step S/CPU Temp Press TotEng PotEng KinEng E_coul E_long E_vdwl 
+       0            0            0    23.709678    7.8987828    7.8987828            0 2.8532817e-05 -0.0091211487    7.9078754 
+      10    17.569541    1.7790281    26.374992    7.5064872    4.8388345    2.6676527 9.9844199e-05 -0.0099367447    4.8486714 
+      20    20.031454    1.5002692    25.759384    7.1718722    4.9222186    2.2496537 0.00036282778 -0.012042147    4.9338979 
+      30    19.798839    1.3622045    24.737966    6.8990916     4.856466    2.0426256 0.00058998748   -0.0140032    4.8698792 
+      40    20.054382    1.2724856    24.583275    6.6824302     4.774338    1.9080922 0.00090968293 -0.016391181    4.7898195 
+      50    20.084003    1.2186257    24.424877    6.5368602     4.709531    1.8273292  0.001028852 -0.017524842     4.726027 
+      60    19.935403    1.1542008    24.073261    6.4025557    4.6718316    1.7307241 0.00085025495  -0.01678293    4.6877643 
+      70    20.160588    1.1294404    23.953567    6.3153328    4.6217369    1.6935959 0.00086908553 -0.016840848    4.6377087 
+      80    19.756844    1.1028844    24.044958     6.271123    4.6173478    1.6537752 0.00099340445 -0.017997422    4.6343518 
+      90    19.939125    1.0918347    24.335751    6.2262626    4.5890565    1.6372061 0.0014572469 -0.020252213    4.6078515 
+     100    20.427477    1.0987806    23.981304    6.2401353    4.5925139    1.6476214 0.0016000656 -0.020685211     4.611599 
+     110    19.826259     1.089493    24.004129    6.1996945    4.5659997    1.6336948 0.0016337289 -0.021118051     4.585484 
+     120      19.9383    1.0713708    23.867734    6.1742533    4.5677327    1.6065206 0.0016310428 -0.020718338      4.58682 
+     130    20.086792    1.0535647    24.231249    6.1716844    4.5918641    1.5798203 0.0014321718 -0.019394609    4.6098266 
+     140    19.916983    1.0522327    24.022423    6.1522769     4.574454    1.5778229 0.0013298772  -0.01952675    4.5926509 
+     150    20.247366    1.0600282    24.107764    6.1388985    4.5493862    1.5895123 0.0012754897 -0.019683927    4.5677946 
+     160    20.131687    1.0482029    24.040332    6.1167675    4.5449873    1.5717802 0.0015089732 -0.020949103    4.5644274 
+     170    20.347962    1.0267746    23.725364    6.1016092    4.5619607    1.5396484 0.0017636206 -0.022357462    4.5825546 
+     180    20.044592    1.0413167    23.769122    6.1163015    4.5548471    1.5614544 0.0019050301 -0.023431206    4.5763733 
+     190    20.169256    1.0574458    23.848936    6.1345013    4.5488613    1.5856399 0.0020967107 -0.024082696    4.5708473 
+     200    20.313327    1.0813797    24.072612    6.1391115    4.5175827    1.6215288 0.0021318856  -0.02415731    4.5396081 
+     210    20.502547    1.0589526    23.872439    6.1318395    4.5439401    1.5878994 0.0021140439 -0.023886297    4.5657124 
+     220     20.02281    1.0177906    23.607793    6.0945259     4.568349    1.5261769 0.0020151523 -0.023649415    4.5899832 
+     230     19.82144    1.0396332    23.679142    6.0900951    4.5311652    1.5589299 0.0020205339 -0.023837306    4.5529819 
+     240    20.376959    1.0217382    23.556112     6.093491    4.5613946    1.5320964 0.0019577926 -0.023014322    4.5824512 
+     250    19.982708     1.033377    23.947879    6.0865756    4.5370269    1.5495488 0.0020068783 -0.022979404    4.5579994 
+     260    20.157351     1.009243    23.745468    6.0509247    4.5375648    1.5133599 0.0020583333 -0.023154716    4.5586612 
+     270    20.375402    1.0134035    23.689967    6.0608723    4.5412738    1.5195985 0.0019543299  -0.02265718    4.5619766 
+     280    20.243895   0.99951168    23.789506    6.0409869    4.5422191    1.4987678 0.0017787077 -0.021614999    4.5620554 
+     290    20.257812    1.0196121    23.765889    6.0563207    4.5274123    1.5289084 0.0017444584 -0.021421781    4.5470896 
+     300    19.860617    1.0363081    23.681076    6.0836673    4.5297233     1.553944 0.0017754871 -0.021633846    4.5495817 
+     310    19.802983    1.0284379    23.829162    6.0897194    4.5475768    1.5421426 0.0019245786 -0.022727709      4.56838 
+     320    19.976769    1.0120338    23.536548    6.0649237     4.547379    1.5175446 0.0018685193 -0.022566003    4.5680765 
+     330    20.119657    1.0108692    23.546935    6.0798601    4.5640618    1.5157983 0.0018402376 -0.022619023    4.5848405 
+     340    20.068881    1.0238065    23.853296    6.0737527    4.5385549    1.5351979 0.0019601747 -0.022823355    4.5594181 
+     350    20.420941    1.0196714     23.56192     6.078893    4.5498957    1.5289973 0.0019167665   -0.0226736    4.5706525 
+     360    19.959505    1.0156398    23.432356    6.0579495    4.5349976    1.5229518 0.0019197195 -0.022763663    4.5558416 
+     370    20.088928    1.0012792    23.561575    6.0463294    4.5449113    1.5014181 0.0018510586 -0.022678502    4.5657388 
+     380    20.178014    1.0121673    23.698657    6.0489355    4.5311907    1.5177448 0.0019512332 -0.023119281    4.5523587 
+     390    20.256603   0.99833129     23.72817    6.0378828     4.540885    1.4969978 0.0018870155 -0.022763387    4.5617614 
+     400    20.163587      1.00014    23.892306    6.0474526    4.5477426      1.49971 0.0016637755 -0.021797543    4.5678764 
+     410    19.764462    1.0007022    23.763336    6.0372208    4.5366678     1.500553 0.0018544245 -0.022080571    4.5568939 
+     420    19.817595    1.0030417    23.529407    6.0353029    4.5312419     1.504061 0.0018744347 -0.022197474    4.5515649 
+     430     19.96785   0.99562252    23.617419    6.0242728    4.5313369     1.492936  0.001706477 -0.021437964    4.5510684 
+     440    20.086509   0.97559743    23.533481     6.015453    4.5525446    1.4629083 0.0015346031 -0.020633083    4.5716431 
+     450    20.264245   0.99284582    23.703902    6.0018678    4.5130955    1.4887723 0.0014337697 -0.020056354    4.5317181 
+     460    20.350606    1.0009671    23.947347    6.0238797    4.5229295    1.5009502 0.0014818983 -0.020414812    4.5418624 
+     470    20.246083    1.0030408    23.633574    6.0432614    4.5392017    1.5040596  0.001640374 -0.021112386    4.5586737 
+     480    20.031936    1.0029914    23.939825    6.0477612    4.5437756    1.5039856 0.0016542589 -0.020872346    4.5629937 
+     490    20.182181    1.0193123    23.832649    6.0626068    4.5341481    1.5284588 0.0016468582 -0.020491522    4.5529927 
+     500    20.013054    1.0117453    23.813509    6.0533351     4.536223     1.517112 0.0016980106 -0.020721231    4.5552462 
+     510     20.02909    1.0222326     23.91345     6.062037    4.5291992    1.5328379 0.0016401439 -0.020467155    4.5480262 
+     520    20.182938    1.0013105     23.64064    6.0503499    4.5488848    1.5014651 0.0015837114 -0.020074454    4.5673755 
+     530     19.78036    1.0088761    23.681679    6.0538014    4.5409917    1.5128097 0.0016118298 -0.020551991    4.5599319 
+     540    20.231386    1.0077423    23.699246    6.0421999    4.5310902    1.5111096 0.0016414726 -0.020773913    4.5502227 
+     550    20.180427    1.0214614    23.762014     6.065414    4.5337327    1.5316813 0.0016643588 -0.020917128    4.5529855 
+     560    20.303335   0.98891912    23.920853     6.040023    4.5571388    1.4828842 0.0016893949 -0.021125901    4.5765753 
+     570    20.279388    1.0085803    23.525604    6.0489494    4.5365832    1.5123662  0.001452098 -0.019992291    4.5551234 
+     580    20.015732    1.0039313    23.556346     6.040577     4.535182     1.505395 0.0012209739 -0.018901336    4.5528624 
+     590    20.158971   0.97825068    23.493599    6.0162257    4.5493388    1.4668869 0.0011653907 -0.018737263    4.5669107 
+     600    20.083414    1.0042706    23.616431    6.0236842    4.5177804    1.5059038  0.001192702 -0.018628921    4.5352166 
+     610    20.226394   0.98888954    23.466902    6.0194727    4.5366328    1.4828399 0.0012589321 -0.019118593    4.5544924 
+     620    20.497774   0.99300361    23.559141    6.0390623    4.5500534    1.4890089   0.00131453 -0.019626799    4.5683657 
+     630    20.345016   0.99104403    23.927047    6.0118214    4.5257508    1.4860705 0.0013262344 -0.019645776    4.5440704 
+     640    20.405929    1.0019004    23.629469    6.0285419    4.5261922    1.5023496 0.0013592539 -0.019989745    4.5448227 
+     650    19.678348   0.98993601    23.816384    6.0035387    4.5191296    1.4844091 0.0013978356 -0.020031633    4.5377634 
+     660    19.794865   0.98762348    23.518556    5.9905672    4.5096258    1.4809414 0.0014888179 -0.020236983     4.528374 
+     670    20.322889   0.99168945    23.625646     6.004989    4.5179507    1.4870383 0.0015246978 -0.020397024     4.536823 
+     680     20.31147   0.98218447    23.735236    6.0059687     4.533183    1.4727856 0.0014087776 -0.020097914    4.5518722 
+     690    20.439735     1.014918    23.649043    6.0494108    4.5275412    1.5218696 0.0015013336 -0.021079624    4.5471195 
+     700    20.411154   0.99149989    23.619443    6.0207827    4.5340286    1.4867541 0.0015934843 -0.021764276    4.5541994 
+     710    20.289574   0.98902538    23.931232    5.9970032    4.5139596    1.4830436 0.0017136042  -0.02246972    4.5347157 
+     720     19.86192    1.0025517    23.883487     6.026656    4.5233298    1.5033262 0.0017585568 -0.022619362    4.5441906 
+     730    19.702785   0.99505388    23.479099    6.0088152    4.5167319    1.4920833  0.001868408 -0.023334785    4.5381983 
+     740    19.695781    1.0071439    23.776025    6.0386926    4.5284803    1.5102123 0.0019403103 -0.023661805    4.5502018 
+     750    20.316196    1.0054501    23.845237    6.0384003    4.5307279    1.5076725 0.0017031702 -0.022597561    4.5516223 
+     760     20.25838   0.98979904    23.548366    6.0151068    4.5309031    1.4842037 0.0014328943 -0.021572753     4.551043 
+     770    20.225678    1.0118683    23.864783    6.0599562    4.5426596    1.5172966  0.001442126  -0.02165946     4.562877 
+     780    20.198841    1.0146301    23.617622    6.0864074    4.5649697    1.5214378 0.0016728694 -0.022560071    4.5858569 
+     790    20.060475    1.0241376     23.75804    6.0881138    4.5524194    1.5356944 0.0016187848 -0.021962665    4.5727633 
+     800    19.830969    1.0456454    23.750719     6.097253    4.5293078    1.5679453 0.0017257156 -0.022027165    4.5496092 
+     810    20.363968    1.0150981    23.506662    6.0753266    4.5531869    1.5221397 0.0016414421 -0.021092728    4.5726382 
+     820    20.232053    1.0331003    23.722841    6.1025837    4.5534498    1.5491339 0.0017046441 -0.021009093    4.5727542 
+     830    20.293506     1.026814    23.911795    6.0854888    4.5457813    1.5397075 0.0017228015 -0.021350839    4.5654093 
+     840    19.751622    1.0351395     23.97236     6.088333    4.5361414    1.5521916 0.0015368866 -0.020904347    4.5555088 
+     850    20.008232    1.0165624    23.669354    6.0662202    4.5418849    1.5243353 0.0014825203 -0.020563666     4.560966 
+     860    19.856466    1.0152849    23.517364    6.0826036    4.5601839    1.5224197 0.0015147228 -0.020702607    4.5793718 
+     870    20.263129     1.033739    23.650342    6.0804246    4.5303329    1.5500916 0.0015837304 -0.021503948    4.5502532 
+     880     20.38537    1.0317177    23.907593    6.0928852    4.5458245    1.5470606 0.0016637806 -0.021758304     4.565919 
+     890    20.086399     1.021706    23.707376    6.0882113    4.5561631    1.5320482  0.001654957 -0.021739098    4.5762473 
+     900    19.856607    1.0179512    23.573177    6.0650896    4.5386718    1.5264178 0.0016837175 -0.022115639    4.5591037 
+     910    20.258564    1.0161892    23.702731    6.0567145    4.5329387    1.5237757 0.0017040382 -0.022270815    4.5535055 
+     920     20.47285    1.0230721    23.998275    6.0605891    4.5264926    1.5340966 0.0016382693 -0.021813331    4.5466676 
+     930    20.214265    1.0158727    23.801805    6.0594787    4.5361776    1.5233011 0.0015291696  -0.02078426    4.5554327 
+     940    20.260747    1.0318471    24.058856    6.0600079    4.5127531    1.5472548 0.0016072894 -0.020768665    4.5319145 
+     950    20.324324    1.0364855    23.931794    6.0760985    4.5218884      1.55421 0.0017259535 -0.021799342    4.5419618 
+     960    19.936481    1.0290842    23.761361    6.0606017    4.5174899    1.5431118 0.0016327976 -0.021106003    4.5369631 
+     970    20.221066    1.0173232    24.048784    6.0644435    4.5389674    1.5254761 0.0015064475 -0.021230817    4.5586918 
+     980    20.072042     1.019526    23.905845     6.065904    4.5371248    1.5287793 0.0016602653 -0.021930717    4.5573952 
+     990    19.541991    1.0165858    23.996152    6.0342052    4.5098348    1.5243704 0.0017203889 -0.021863324    4.5299777 
+    1000    20.165608   0.99838069    23.529442    6.0115368    4.5144649    1.4970718 0.0018775489 -0.022264264    4.5348516 
+    1010    19.828921    1.0051979    23.547177    6.0369294    4.5296352    1.5072942 0.0019517996 -0.022504296    4.5501877 
+    1020    20.195916    1.0133968    23.539991     6.049044    4.5294555    1.5195885 0.0017095559 -0.021422524    4.5491685 
+    1030    20.002669    1.0022795     23.33566     6.056247     4.553329    1.5029181 0.0014704166 -0.020237593    4.5720962 
+    1040    20.204298    1.0106216    23.801386    6.0737489    4.5583219     1.515427  0.001508019 -0.020388667    4.5772025 
+    1050      20.4881    1.0263449    23.698326    6.0909074    4.5519032    1.5390041 0.0015057225 -0.020189463     4.570587 
+    1060    20.464741    1.0312092    23.742946    6.0847107    4.5384125    1.5462983 0.0014810041 -0.020258996    4.5571905 
+    1070    20.329995    1.0133931    23.688214    6.0687503    4.5491673     1.519583 0.0014938026 -0.020040925    4.5677145 
+    1080    19.835524    1.0159006    23.973236     6.076406     4.553063    1.5233429 0.0015526884 -0.020309304    4.5718196 
+    1090    19.991565    1.0045022     23.85003    6.0669776    4.5607266     1.506251 0.0014575863 -0.020197677    4.5794667 
+    1100    20.204216    1.0043428    23.716554    6.0497582    4.5437462     1.506012  0.001605362 -0.021157181    4.5632981 
+    1110    20.395082   0.99991045    23.768678    6.0349042    4.5355385    1.4993657 0.0014368243 -0.020839603    4.5549412 
+    1120    20.162743    1.0125036    23.901915    6.0531818    4.5349327    1.5182491 0.0012196265 -0.020119304    4.5538324 
+    1130    19.852719   0.99683164    23.770668    6.0405193    4.5457703     1.494749 0.0012736021 -0.020779796    4.5652765 
+    1140    20.322277    1.0006898    23.464666    6.0285231    4.5279888    1.5005343 0.0014392159 -0.021416662    4.5479663 
+    1150    20.246411   0.98711931    23.491067     6.007489    4.5273036    1.4801854 0.0014542261 -0.021364482    4.5472139 
+    1160    20.485618     1.008019    23.783817    6.0077412    4.4962167    1.5115245 0.0014270701 -0.021030223    4.5158198 
+    1170    20.274338   0.98493475    23.527866    6.0116186    4.5347089    1.4769097 0.0014417048 -0.020814572    4.5540818 
+    1180     20.39316   0.98872234    23.573322    6.0243992    4.5418101    1.4825891 0.0014145239 -0.020591199    4.5609867 
+    1190    20.121735    1.0058565    23.597932    6.0336307    4.5253488    1.5082818 0.0013824773  -0.02065071    4.5446171 
+    1200    20.157602    1.0227999    23.697602    6.0458492    4.5121608    1.5336884  0.001371387 -0.020343341    4.5311328 
+    1210    20.359516    1.0048194    23.554307    6.0426509    4.5359242    1.5067267 0.0015835347 -0.021412734    4.5557534 
+    1220    20.305725    1.0093263     23.75165    6.0370961    4.5236114    1.5134847 0.0015811962 -0.021225208    4.5432554 
+    1230    20.397362   0.98622762    23.254349    6.0305059    4.5516576    1.4788483 0.0015556637 -0.021402096     4.571504 
+    1240    20.399965     1.013169    23.694711    6.0348219     4.515575    1.5192469  0.001750922 -0.022211002    4.5360351 
+    1250     20.31915    1.0012034     23.59728    6.0271102    4.5258057    1.5013045 0.0017303175 -0.021918094    4.5459935 
+    1260    20.111035   0.98879549    23.738964    6.0173107    4.5346119    1.4826988 0.0017101805 -0.021843802    4.5547455 
+    1270    19.962296   0.99363866    23.681617    6.0376403    4.5476791    1.4899612 0.0015606983 -0.021281464    4.5673999 
+    1280    20.214667   0.99190697    23.666607    6.0243017    4.5369372    1.4873645 0.0013971879 -0.020467016    4.5560071 
+    1290    20.383582     1.003059     23.88756    6.0322537    4.5281667     1.504087 0.0014011992 -0.020446257    4.5472117 
+    1300    19.881757    1.0029022    23.380119    6.0268012    4.5229494    1.5038518 0.0016120234 -0.021160441    4.5424978 
+    1310    19.743049    1.0198295     23.82374    6.0734414     4.544207    1.5292344 0.0016862468 -0.021554918    4.5640757 
+    1320    20.174004    1.0199786    23.723075     6.061808      4.53235     1.529458 0.0016189206 -0.021392856     4.552124 
+    1330    20.339953    1.0052573    23.632593    6.0588114    4.5514282    1.5073832  0.001762657 -0.021938582    4.5716041 
+    1340    20.486049    0.9951931    23.803473    6.0257342    4.5334421    1.4922921 0.0020485427 -0.023563052    4.5549566 
+    1350    20.410147   0.99924802    23.449797    6.0437995    4.5454271    1.4983724  0.002010393 -0.023475773    4.5668924 
+    1360    20.364126    1.0046912    23.542615    6.0565067    4.5499722    1.5065344  0.001927269  -0.02316167    4.5712066 
+    1370    20.165348    1.0053128    23.446675    6.0367369    4.5292703    1.5074666 0.0019923886 -0.023413412    4.5506914 
+    1380    20.013587    1.0198474    24.047123    6.0696353    4.5403741    1.5292612 0.0020538336 -0.023749436    4.5620697 
+    1390     20.02326   0.99312218     23.53797     6.026323    4.5371363    1.4891867  0.001990696 -0.022978368     4.558124 
+    1400    20.445736    1.0185843    23.973767    6.0410015    4.5136342    1.5273672 0.0018656125 -0.022712142    4.5344808 
+    1410    20.352367    1.0143888    23.995063    6.0444468    4.5233709    1.5210759 0.0020717422 -0.023638894     4.544938 
+    1420    20.411706    1.0260033    23.954531    6.0553378    4.5168459     1.538492 0.0021221427 -0.023467899    4.5381916 
+    1430     20.01811     1.030367    23.824915    6.0755512    4.5305159    1.5450353 0.0021775871 -0.024013004    4.5523513 
+    1440    20.146249    1.0075063    24.057025    6.0636996    4.5529439    1.5107557 0.0020714644 -0.024069121    4.5749416 
+    1450    20.210774    1.0186809    23.612155    6.0827279     4.555216    1.5275119 0.0020065213 -0.023918934    4.5771284 
+    1460    20.124529     1.050927    23.589248    6.1089396    4.5330745    1.5758651 0.0018469128 -0.023494647    4.5547223 
+    1470    19.998079    1.0376979    23.523554     6.113931    4.5579029     1.556028 0.0019589466 -0.023604207    4.5795482 
+    1480    20.301943    1.0313843    24.126929    6.0895722    4.5430115    1.5465607 0.0018425089 -0.023132005     4.564301 
+    1490    20.224255    1.0193982    23.352702    6.0752911    4.5467035    1.5285876 0.0017633792 -0.022313878     4.567254 
+    1500    20.148447    1.0305539    23.797152    6.0890791    4.5437636    1.5453155 0.0017485916 -0.022164059    4.5641791 
+    1510    20.187788    1.0506218    24.201039    6.1393738    4.5639664    1.5754074 0.0018446177 -0.022288353    4.5844101 
+    1520    20.290924    1.0340054    23.743909     6.103769    4.5532779    1.5504911 0.0017451143 -0.021957354    4.5734901 
+    1530     20.07959    1.0298869    23.847486    6.0719264    4.5276111    1.5443153 0.0017763616  -0.02173713    4.5475718 
+    1540    20.488884    1.0046688    23.861228     6.073712    4.5672111    1.5065009 0.0018516435 -0.021795934    4.5871554 
+    1550    20.437002    1.0312818    23.854505    6.0717283    4.5253212    1.5464071  0.001686045 -0.021702941    4.5453381 
+    1560    20.367477    1.0327625    23.646422    6.0750008    4.5263734    1.5486274 0.0017493964 -0.022041519    4.5466655 
+    1570    20.358716    1.0319395    23.700225    6.0656968    4.5183036    1.5473932 0.0019256943 -0.022666723    4.5390446 
+    1580    20.318517    1.0186999    24.117609    6.0512496    4.5237091    1.5275405 0.0019905669 -0.022814171    4.5445327 
+    1590    20.109427    1.0216724    23.895383     6.049546    4.5175482    1.5319978 0.0018019321 -0.021876676    4.5376229 
+    1600    20.262266    1.0180627    23.675826    6.0382708    4.5116857     1.526585 0.0014718219 -0.020622959    4.5308369 
+    1610    20.323649    1.0021182    23.669424    6.0591411    4.5564649    1.5026762 0.0014150502 -0.019758683    4.5748085 
+    1620    20.165766    1.0082154    23.607504    6.0738802    4.5620612     1.511819   0.00152017 -0.020379637    4.5809207 
+    1630    20.121855    1.0083805    23.663074    6.0509157    4.5388492    1.5120665 0.0016548104 -0.021118517    4.5583129 
+    1640    19.818833    1.0151994    23.753902    6.0629344    4.5406428    1.5222916 0.0018556631 -0.022231535    4.5610187 
+    1650    19.896274   0.99991576    23.909943    6.0300776    4.5307039    1.4993737 0.0020260596 -0.023274378    4.5519522 
+    1660    19.884546    1.0148587    23.708757    6.0507604    4.5289798    1.5217806 0.0020074749 -0.023418235    4.5503906 
+    1670    20.041582    1.0081468    23.414578    6.0400643    4.5283482    1.5117161 0.0018551715 -0.022796894    4.5492899 
+    1680     20.32354    1.0004035     23.93244    6.0324677    4.5323627     1.500105 0.0016362042 -0.021675136    4.5524016 
+    1690     20.30974    0.9927811    23.700608    6.0605827    4.5719074    1.4886753 0.0013825236 -0.020245648    4.5907706 
+    1700    20.359923    1.0172794    23.744487      6.09863    4.5732195    1.5254105 0.0014232743  -0.02028303    4.5920793 
+    1710    19.842054     1.010151    23.436287      6.04097    4.5262486    1.5147214 0.0015549355  -0.02113645    4.5458301 
+    1720    20.106727    1.0033926    23.623408    6.0469368    4.5423497    1.5045871 0.0018206107 -0.022463819    4.5629929 
+    1730    20.361124    1.0264814     23.83875    6.0610271    4.5218183    1.5392088 0.0019338762 -0.022909109    4.5427935 
+    1740    20.407986    1.0119539    23.713665    6.0720149    4.5545901    1.5174248 0.0020254769 -0.023168201    4.5757328 
+    1750    20.177228    1.0058373     23.58136    6.0411591     4.532906     1.508253 0.0019748919 -0.023078755    4.5540099 
+    1760    20.234782   0.99947692    23.475343    6.0630762    4.5643606    1.4987156 0.0016292796 -0.021334442    4.5840657 
+    1770    20.033887    1.0138112    23.546265    6.0485033    4.5282934      1.52021 0.0016414172 -0.021303788    4.5479557 
+    1780    20.168666    1.0010804    23.645649     6.036183     4.535063      1.50112  0.001589016 -0.021445872    4.5549199 
+    1790    20.423215    1.0226772    23.601837    6.0455335     4.512029    1.5335045 0.0015104362  -0.02102547    4.5315441 
+    1800    20.140277    0.9999371    23.753032     6.015773    4.5163673    1.4994057 0.0014207837   -0.0207459    4.5356924 
+    1810    19.727346   0.98838742    23.736895    6.0041885    4.5221016    1.4820869 0.0014729824 -0.020912612    4.5415412 
+    1820     20.07692    1.0091638    23.856939    6.0455794    4.5323383    1.5132411 0.0015579371 -0.021377654     4.552158 
+    1830     20.46107    1.0178485    23.845018    6.0512939    4.5250301    1.5262638 0.0017809823 -0.022153613    4.5454027 
+    1840     20.12227    1.0108549    23.644188    6.0652073    4.5494304    1.5157769 0.0019556032 -0.022863375    4.5703382 
+    1850    20.238507     1.044026    23.781373    6.0974406    4.5319236    1.5655169 0.0021087906 -0.023333797    4.5531486 
+    1860    19.953265    1.0179692    23.949776     6.059523    4.5330782    1.5264448 0.0020213093 -0.023114902    4.5541718 
+    1870    20.327935     1.016315    23.694269    6.0510609    4.5270965    1.5239644 0.0019558101 -0.023115022    4.5482558 
+    1880    20.248794    1.0289056    23.966187    6.0757055    4.5328615     1.542844 0.0018267982 -0.022629007    4.5536637 
+    1890    20.121162    1.0059894    23.578128    6.0643189    4.5558378     1.508481 0.0016448915  -0.02170769    4.5759006 
+    1900     19.92841    1.0162959    24.039481    6.0565854    4.5326497    1.5239357 0.0016353218 -0.021799345    4.5528138 
+    1910      19.9838    1.0168836    24.089828    6.0567024    4.5318855    1.5248169 0.0017208525 -0.022168427    4.5523331 
+    1920    20.156795   0.99950269    23.613347    6.0547947    4.5560404    1.4987543 0.0018491826  -0.02238479     4.576576 
+    1930    19.869758    1.0200664     23.90545     6.031301    4.5017115    1.5295895 0.0019911383 -0.022991131    4.5227115 
+    1940    20.139271   0.99563769    23.807313    6.0132875    4.5203288    1.4929587  0.001924573 -0.023039405    4.5414437 
+    1950    20.200809    1.0023368    23.651074    6.0326889     4.529685     1.503004 0.0017155629 -0.022406593     4.550376 
+    1960    20.291424    1.0016138    23.803326    6.0433527    4.5414328    1.5019198 0.0016362606 -0.021867443     4.561664 
+    1970    20.228252    1.0138151    23.295746    6.0603052    4.5400895    1.5202157 0.0016443995 -0.022058616    4.5605037 
+    1980    20.309531    1.0135552    23.888562    6.0808584    4.5610324     1.519826 0.0015084744 -0.021209604    4.5807335 
+    1990    20.106425    1.0173676    23.689877     6.075133    4.5495902    1.5255427 0.0015491967 -0.021479364    4.5695204 
+    2000    20.132693    1.0085872    23.341302    6.0462802    4.5339037    1.5123765 0.0016179097 -0.021803134    4.5540889 
+    2010    20.433364    1.0168269    23.733078    6.0316504    4.5069185     1.524732  0.001782012 -0.022034832    4.5271713 
+    2020    20.579894    1.0194653    23.422689    6.0447926    4.5161044    1.5286882 0.0018515839 -0.022340992    4.5365938 
+    2030    20.231109    1.0175079    23.701986    6.0666981    4.5409451    1.5257531 0.0017750307 -0.021849284    4.5610193 
+    2040     20.47517     1.010786    23.683411    6.0609991    4.5453255    1.5156736 0.0017988897  -0.02175155    4.5652781 
+    2050     20.33691    1.0035173    23.660929    6.0373372    4.5325629    1.5047742 0.0017831434 -0.021851974    4.5526318 
+    2060    20.346407    1.0026354    23.710928    6.0337431    4.5302913    1.5034518 0.0018729226 -0.021989589     4.550408 
+    2070    20.523912    1.0172116    23.966336    6.0419045    4.5165957    1.5253088 0.0017198211 -0.021678876    4.5365547 
+    2080    20.418452    1.0080582    23.639827    6.0366202     4.525037    1.5115833 0.0015714506 -0.021206816    4.5446723 
+    2090    20.056415    1.0099312    23.766639    6.0337486    4.5193567    1.5143919 0.0016648028 -0.021468442    4.5391603 
+    2100     20.29543   0.99820068    23.783994    6.0217597    4.5249578    1.4968019 0.0018359403 -0.022453265    4.5455751 
+    2110       20.305    1.0004849    23.799499     6.036485    4.5362579    1.5002271 0.0019430153 -0.022958881    4.5572738 
+    2120    20.601632   0.99028955    23.658699    6.0362019    4.5512627    1.4849392 0.0017574432 -0.021911033    4.5714163 
+    2130    20.371119    1.0072677    23.546134    6.0509514    4.5405534     1.510398 0.0015430681 -0.020944484    4.5599549 
+    2140     20.23982    1.0212312    23.680133    6.0598811     4.528545    1.5313361 0.0016334995 -0.021423417    4.5483349 
+    2150    20.440816    1.0071693     23.59072    6.0288696    4.5186192    1.5102504 0.0016325018 -0.021503962    4.5384907 
+    2160    20.206882   0.99682621    23.703635    6.0266413    4.5319004    1.4947409 0.0014562419 -0.020980389    4.5514246 
+    2170    19.966949   0.99636846    23.631412    6.0444014    4.5503469    1.4940545 0.0013464569 -0.020600093    4.5696006 
+    2180    20.105097      1.02891    23.926677    6.0591514    4.5163009    1.5428505 0.0011450636 -0.019492301    4.5346482 
+    2190    20.244272    1.0272967     23.26635    6.0724248    4.5319934    1.5404314 0.0012485683  -0.01999494    4.5507398 
+    2200    20.365539    1.0096198    23.386753    6.0628309     4.548906    1.5139249  0.001481191 -0.020995491    4.5684203 
+    2210    20.233042     1.011286    23.611277    6.0471343    4.5307109    1.5164234 0.0017138925 -0.021904722    4.5509018 
+    2220    20.375486    1.0210071    23.828152    6.0774292     4.546429    1.5310002 0.0018450328 -0.022577721    4.5671617 
+    2230    20.201967     1.040763    23.782916    6.0963374    4.5357132    1.5606242 0.0016284547 -0.021904389    4.5559892 
+    2240    20.233976    1.0190505    24.012804    6.0703273     4.542261    1.5280663 0.0014413296 -0.020924401    4.5617441 
+    2250    20.303513    1.0069638    23.998604    6.0640657    4.5541236    1.5099422 0.0015207151 -0.021661978    4.5742648 
+    2260    20.318662    1.0152463    23.859204    6.0737404    4.5513786    1.5223619 0.0016397541 -0.022492608    4.5722314 
+    2270    20.374224    1.0317087    23.819433    6.0761303    4.5290831    1.5470472 0.0016684209  -0.02233018    4.5497449 
+    2280    20.228415    1.0167281    23.895584    6.0548588     4.530275    1.5245838 0.0015003014 -0.021372904    4.5501476 
+    2290    20.354302    1.0158421    23.853532    6.0528381    4.5295829    1.5232552 0.0014287371 -0.020694174    4.5488483 
+    2300    20.263405   0.99258288    23.674329    6.0362835    4.5479054     1.488378 0.0013245488 -0.020252889    4.5668338 
+    2310    20.317011   0.99464107    23.550361     6.031973    4.5405087    1.4914643 0.0013150413 -0.020115608    4.5593092 
+    2320    20.169176     1.006547    23.851024    6.0475222    4.5382049    1.5093173 0.0013411708 -0.019964689    4.5568284 
+    2330    20.192029    1.0007594    23.786412    6.0329425    4.5323038    1.5006388 0.0015926262 -0.021418485    4.5521296 
+    2340    20.165873   0.99544112    23.604859    6.0456121    4.5529481     1.492664 0.0019586023 -0.023457556    4.5744471 
+    2350    20.067412    1.0200141    23.785626    6.0631976    4.5336865    1.5295112 0.0021369629 -0.024315017    4.5558645 
+    2360    20.255089    1.0098193    23.719647    6.0681613    4.5539372    1.5142241 0.0022028311 -0.024776203    4.5765105 
+    2370    20.437756    1.0338124    23.935793    6.0638106     4.513609    1.5502017 0.0021104018 -0.024109675    4.5356082 
+    2380    20.333429    1.0005501    23.719964    6.0565361    4.5562113    1.5003249 0.0020264733 -0.023544678    4.5777295 
+    2390    20.250092     1.006554    23.673376    6.0439398    4.5346121    1.5093278 0.0021292623 -0.023384293    4.5558671 
+    2400    19.820239    1.0093137    23.824881    6.0384123    4.5249464    1.5134659 0.0021458391 -0.023292053    4.5460927 
+    2410    20.157523   0.99434444    23.432234    5.9976937    4.5066742    1.4910195 0.0019673234 -0.022425943    4.5271328 
+    2420    20.449905    1.0026045    23.340147    6.0219823    4.5185769    1.5034054 0.0019608727  -0.02237193    4.5389879 
+    2430    20.238652   0.99310431    23.943715    6.0205065    4.5313465    1.4891599 0.0018901909 -0.022306591    4.5517629 
+    2440    20.150546   0.99357865    23.471988    6.0067572     4.516886    1.4898712 0.0018440129  -0.02222166    4.5372637 
+    2450    20.048617   0.99283535    23.652753    6.0018862    4.5131296    1.4887566  0.002002107 -0.022994209    4.5341217 
+    2460    20.124031     1.005017    23.719734    6.0291445    4.5221215     1.507023 0.0019349399 -0.022604733    4.5427913 
+    2470    20.397614    1.0117397    23.668714    6.0311627    4.5140591    1.5171036 0.0018974774  -0.02239618    4.5345578 
+    2480    20.443165    1.0190567    23.607778    6.0345083    4.5064328    1.5280756  0.001962308  -0.02273419    4.5272046 
+    2490    20.216587    1.0024427    23.714074    6.0487056    4.5455428    1.5031628 0.0020821538 -0.023423723    4.5668844 
+    2500    20.333185   0.99373818    23.478761     6.032684    4.5425736    1.4901104 0.0019806704 -0.023002691    4.5635957 
+    2510    20.258133    1.0109234    23.781097    6.0603716    4.5444919    1.5158797 0.0018029576 -0.022071099      4.56476 
+    2520     20.18178    1.0208666    23.745266    6.0638095    4.5330201    1.5307894 0.0016453098 -0.021321713    4.5526965 
+    2530    20.057492    1.0118999    23.504536    6.0545648    4.5372209    1.5173439 0.0018277784 -0.022242759    4.5576359 
+    2540    20.229988   0.99661525    23.445342    6.0643685    4.5699439    1.4944246 0.0019751836 -0.022542211    4.5905109 
+    2550    20.212691    1.0257302    23.739433    6.0546378    4.5165554    1.5380825 0.0022355738 -0.023754246     4.538074 
+    2560    20.269717    1.0219721    23.606462    6.0499351    4.5174879    1.5324472 0.0023025136  -0.02443755    4.5396229 
+    2570    20.232715    1.0253733    23.700733    6.0620653     4.524518    1.5375473 0.0023542074 -0.024421238     4.546585 
+    2580    19.981627    1.0235035    24.129355    6.0774954    4.5427519    1.5347435  0.002095096 -0.023306347    4.5639632 
+    2590    19.696218    1.0228961    23.623707    6.0831832    4.5493505    1.5338327  0.001936449 -0.022577825    4.5699919 
+    2600    20.061237    1.0245989     23.97006    6.0748586    4.5384726     1.536386 0.0020348224 -0.023396653    4.5598344 
+    2610     20.46422    1.0208274     23.84233     6.043587    4.5128562    1.5307307 0.0021741627 -0.024022117    4.5347042 
+    2620    20.141589    1.0024685    23.756912    6.0471791    4.5439776    1.5032015 0.0022456502 -0.024186325    4.5659183 
+    2630    20.135721    1.0240285    23.563838    6.0969361    4.5614055    1.5355307  0.002224844  -0.02418842     4.583369 
+    2640    20.156181    1.0301767    23.628465    6.0823805    4.5376305      1.54475 0.0021094439 -0.023413295    4.5589343 
+    2650      19.9186     1.018806    23.475059    6.0565673    4.5288677    1.5276996 0.0019296737 -0.022400378    4.5493384 
+    2660    20.447462    1.0068931    23.647854    6.0629708    4.5531347    1.5098362 0.0017723609 -0.021302977    4.5726653 
+    2670    20.383884    1.0077703    23.717171    6.0456672    4.5345156    1.5111516 0.0017897057  -0.02116018    4.5538861 
+    2680    20.140104   0.99382011    23.705492    6.0183942     4.528161    1.4902332 0.0017279722 -0.020753741    4.5471867 
+    2690    19.922453    1.0071346    23.866088     6.033355    4.5231567    1.5101983 0.0020486302 -0.022584537    4.5436926 
+    2700    20.241978   0.99179235    23.527469    6.0295368    4.5423442    1.4871926 0.0020199556 -0.022898736     4.563223 
+    2710    20.236814   0.99827379    23.698283    6.0187905     4.521879    1.4969116 0.0019746592 -0.023355684      4.54326 
+    2720    20.322662    0.9879061    23.529708    6.0109657    4.5296005    1.4813652 0.0018056315  -0.02272607    4.5505209 
+    2730    20.094023   0.99146421    23.890676    6.0208887    4.5341881    1.4867006 0.0018170545 -0.022967654    4.5553387 
+    2740    19.931049    1.0089343    23.698735    6.0398955    4.5269985     1.512897 0.0017650496 -0.022921944    4.5481554 
+    2750    20.343134    1.0020754    23.898989    6.0322608    4.5296488     1.502612 0.0018032885  -0.02316036    4.5510058 
+    2760    20.178875   0.99219528    24.032678     6.024672    4.5368752    1.4877968 0.0016903781 -0.022613104    4.5577979 
+    2770    20.363953   0.96821267    23.614653    6.0008628    4.5490279    1.4518349 0.0015165247 -0.021627163    4.5691386 
+    2780    20.273222   0.97030048     23.62651    5.9801734    4.5252078    1.4549656 0.0016071851 -0.021413697    4.5450144 
+    2790    20.355464   0.99015971    23.694438    6.0113138    4.5265693    1.4847445 0.0017460421 -0.021383868    4.5462071 
+    2800    20.228349   0.97463621     23.52592     5.993435     4.531968     1.461467 0.0016065575 -0.020605784    4.5509672 
+    2810     20.10949   0.99593373    23.332425    6.0290304    4.5356278    1.4934026 0.0015257168 -0.020289063    4.5543911 
+    2820    20.067106    1.0116875     23.55846    6.0576966    4.5406712    1.5170254 0.0016666517 -0.020280221    4.5592847 
+    2830    19.848633    1.0323377     23.85421    6.0547914     4.506801    1.5479904 0.0018226099 -0.021274923    4.5262533 
+    2840    20.267283   0.99752162    23.712296    6.0408631    4.5450794    1.4957837 0.0015077681 -0.020047534    4.5636192 
+    2850     20.10135     1.023678     23.37046    6.0503093    4.5153041    1.5350052 0.0016221083 -0.020459904    4.5341419 
+    2860    19.875722    1.0107221    23.315823    6.0683759    4.5527982    1.5155777  0.001534105 -0.019802326    4.5710664 
+    2870    19.970258    1.0075165    24.048601    6.0347663    4.5239953     1.510771 0.0015376328 -0.019765567    4.5422232 
+    2880      19.9291    1.0050967    23.531061    6.0497407    4.5425982    1.5071425 0.0015662482 -0.020388378    4.5614203 
+    2890    20.120483    0.9987024    23.941549    6.0573609    4.5598067    1.4975543 0.0018000487 -0.021372617    4.5793793 
+    2900    20.247456    1.0371857    23.910189    6.0840361    4.5287761      1.55526 0.0019236632 -0.022250262    4.5491027 
+    2910    20.141721    1.0119424    23.982095    6.0644218    4.5470142    1.5174076  0.001728177 -0.021233047    4.5665191 
+    2920    20.272939    1.0025289    23.766515     6.041691     4.538399     1.503292 0.0015230336 -0.020535323    4.5574113 
+    2930    20.082261   0.99758447    23.858455    6.0387932    4.5429153    1.4958779  0.001678793 -0.021506421    4.5627429 
+    2940    20.061674    1.0086575    23.898762    6.0459669    4.5334849     1.512482 0.0017894922  -0.02181691    4.5535123 
+    2950    20.374928    1.0235129    23.584861    6.0730805    4.5383229    1.5347577 0.0017067297 -0.021528574    4.5581447 
+    2960    19.816923    1.0336795     23.81017    6.0624953    4.5124929    1.5500024 0.0016988228 -0.021675312    4.5324693 
+    2970     20.35156    1.0358275    23.837453     6.089007    4.5357836    1.5532234 0.0017405837 -0.022357942     4.556401 
+    2980     20.06135    1.0344968    23.929858    6.1015093    4.5502814    1.5512279 0.0018983821 -0.023070184    4.5714532 
+    2990    20.117724    1.0161656    23.785529    6.0613171    4.5375767    1.5237404 0.0019805248 -0.023630396    4.5592266 
+    3000    20.331391    1.0128318    23.833739    6.0529186    4.5341773    1.5187413 0.0021480792 -0.024181432    4.5562106 
+    3010    20.422349    1.0021222    23.882206    6.0524965    4.5498143    1.5026823 0.0019695849 -0.022912703    4.5707574 
+    3020     20.33075    1.0184969    23.855482     6.047628     4.520392    1.5272361 0.0016788048 -0.021554548    4.5402677 
+    3030    20.421613    1.0060846    23.588335    6.0444814    4.5358575    1.5086239 0.0016776129 -0.021275773    4.5554557 
+    3040    20.245694   0.99707383    23.622872    6.0355944    4.5404822    1.4951122 0.0016652901 -0.021796944    4.5606139 
+    3050    20.412693    1.0226365    23.874861    6.0601707    4.5267273    1.5334434 0.0017774186 -0.022258546    4.5472085 
+    3060    20.317309    1.0382783    23.714202    6.0935122    4.5366139    1.5568984 0.0017309487 -0.022347408    4.5572303 
+    3070    20.323334    1.0095157    23.867538    6.0669471    4.5531784    1.5137687 0.0017758428 -0.022625385    4.5740279 
+    3080    20.183675    1.0161835    23.760488    6.0598595    4.5360924    1.5237671 0.0017679526 -0.021959506    4.5562839 
+    3090    20.279699    1.0083237    23.663597    6.0534689    4.5414875    1.5119814 0.0017449902 -0.021951765    4.5616943 
+    3100    20.311822    1.0162146    23.633661    6.0810775    4.5572637    1.5238138 0.0017197078 -0.021896693    4.5774407 
+    3110    20.428846    1.0303083    23.986133     6.079392    4.5344447    1.5449473 0.0017427985 -0.022189561    4.5548914 
+    3120    20.283794    1.0266828    23.820563    6.0859517    4.5464408    1.5395109 0.0019462844 -0.022868878    4.5673634 
+    3130    20.268477    1.0137848    23.867297     6.065153    4.5449827    1.5201703 0.0018920438 -0.022783546    4.5658742 
+    3140    20.279038    1.0077133    23.410317    6.0767519    4.5656859     1.511066 0.0019830177  -0.02316618     4.586869 
+    3150    20.336201    1.0036458    23.624312    6.0533035    4.5483367    1.5049668 0.0020755414 -0.023395963    4.5696571 
+    3160    20.075778    1.0274826    23.851019    6.0505841    4.5098739    1.5407102 0.0020501302 -0.023581097    4.5314049 
+    3170    20.219846    1.0081177    23.971065    6.0451096    4.5334371    1.5116725 0.0018818841 -0.022405254    4.5539604 
+    3180    20.291961    1.0394178    24.047801    6.0941927    4.5355857    1.5586071 0.0017025159 -0.021594178    4.5554773 
+    3190    20.171896    1.0231701    23.926469    6.0858018    4.5515582    1.5342436  0.001635934 -0.021325809    4.5712481 
+    3200    20.459051    1.0133448    23.911639    6.0516655    4.5321551    1.5195105 0.0016626249 -0.021392187    4.5518847 
+    3210    20.095451    1.0229734    23.674607    6.0529526     4.519004    1.5339486 0.0016632438 -0.021180887    4.5385217 
+    3220    20.238759   0.98759259    23.667996    6.0184471     4.537552    1.4808951 0.0017114137 -0.021165128    4.5570057 
+    3230    20.332469     1.017709    23.743505     6.045858    4.5198034    1.5260547 0.0017765831 -0.021933183      4.53996 
+    3240    20.480827   0.99238351    23.922353    6.0226435    4.5345644    1.4880791 0.0017106652 -0.021883743    4.5547375 
+    3250    20.480836    1.0049834     23.70313    6.0206775    4.5137049    1.5069726 0.0015859464 -0.021542138     4.533661 
+    3260    20.195021   0.99606001    23.935544    6.0271147    4.5335227     1.493592 0.0016400847 -0.021711326    4.5535939 
+    3270    20.419599   0.98808658    23.656136    6.0291579    4.5475221    1.4816358 0.0016510107 -0.021317218    4.5671883 
+    3280    20.292569    1.0288918    23.676037    6.0733903     4.530567    1.5428233 0.0016561077 -0.021383811    4.5502947 
+    3290    20.262061    1.0051179    23.890845    6.0586757    4.5515014    1.5071743 0.0017764147 -0.022232955    4.5719579 
+    3300    20.165966    1.0132524    23.830861    6.0549628    4.5355907     1.519372 0.0017872425 -0.022807169    4.5566107 
+    3310    20.384279    1.0107719     23.67696    6.0420571    4.5264046    1.5156525 0.0016730293 -0.022438947    4.5471705 
+    3320    20.104748   0.98508958     23.68537    6.0322844    4.5551426    1.4771418 0.0016617405 -0.022866808    4.5763477 
+    3330     20.03328    1.0167157    23.674911    6.0513358    4.5267706    1.5245652 0.0015539772 -0.022325745    4.5475424 
+    3340    20.178276    1.0200252    23.660695    6.0667096    4.5371818    1.5295278 0.0016179134 -0.022327915    4.5578918 
+    3350    20.144619   0.99140774    23.554019    6.0265043    4.5398884    1.4866159 0.0017211352 -0.023003213    4.5611705 
+    3360    20.519067   0.99262911    23.856421    6.0423902    4.5539429    1.4884474 0.0018574695 -0.023798842    4.5758842 
+    3370    20.352193    1.0190661    23.563372    6.0550998    4.5270102    1.5280896 0.0018775834 -0.023658588    4.5487912 
+    3380    19.765296    1.0260255    23.778289    6.0675878    4.5290626    1.5385252 0.0019641345 -0.024144962    4.5512434 
+    3390    20.165301    1.0359543    23.518897    6.0878315    4.5344181    1.5534134  0.002012851 -0.023901518    4.5563068 
+    3400    19.954829    1.0384914     23.92723    6.1041821    4.5469641    1.5572179 0.0020101588 -0.023738057     4.568692 
+    3410    20.128565    1.0395691    23.893331    6.1160064    4.5571726    1.5588338 0.0018041372 -0.023025481    4.5783939 
+    3420    19.757062    1.0209201    23.829866    6.0985056    4.5676359    1.5308697  0.001764494 -0.022983219    4.5888547 
+    3430    19.997626    1.0383315    23.797266    6.0966456    4.5396675    1.5569781 0.0016602008 -0.022248517    4.5602558 
+    3440    20.242643   0.99853128    23.699529      6.04264    4.5453424    1.4972976  0.001573447 -0.021751417    4.5655203 
+    3450    20.430114    1.0186486    23.948753    6.0538794    4.5264158    1.5274636 0.0014849406 -0.021527948    4.5464588 
+    3460    19.931005     1.006988    23.907544    6.0486224     4.538644    1.5099785 0.0015454459 -0.021938893    4.5590374 
+    3470     20.14179    1.0166369     23.68294    6.0417428    4.5172959     1.524447 0.0013869424 -0.021331968    4.5372409 
+    3480    20.325046    1.0012228    23.488869    6.0393841    4.5380504    1.5013336 0.0011443822 -0.019936425    4.5568425 
+    3490    20.394288    1.0196275    23.585183     6.059409    4.5304777    1.5289314 0.0012464594 -0.019980036    4.5492112 
+    3500    20.200316   0.99073988    23.665719    6.0271884     4.541574    1.4856144 0.0013429323 -0.020190459    4.5604215 
+    3510    20.278212   0.98774044    23.381022    6.0231399    4.5420231    1.4811168 0.0014586032 -0.020263659    4.5608282 
+    3520    20.336283    1.0263192    23.707576    6.0491803    4.5102147    1.5389656 0.0013296352   -0.0197707    4.5286557 
+    3530     20.08582   0.99901282    23.707847    6.0346946    4.5366749    1.4980197 0.0013403066  -0.01964495    4.5549795 
+    3540    20.444676    1.0030182    23.561504    6.0375205    4.5334947    1.5040258 0.0013557822 -0.019567665    4.5517066 
+    3550    20.457162     1.001824    23.641061    6.0365738    4.5343387    1.5022351 0.0014824555 -0.020491384    4.5533476 
+    3560    20.311039    1.0014702    23.577267      6.03508    4.5333754    1.5017046 0.0016753145 -0.021658964     4.553359 
+    3570    20.221397    1.0161804    23.666645    6.0520218    4.5282593    1.5237625 0.0017786029 -0.022274797    4.5487555 
+    3580    20.574439    1.0180643    24.099431    6.0586818    4.5320944    1.5265874 0.0017516363 -0.022641805    4.5529845 
+    3590    20.181687    1.0205783    23.695535    6.0623482     4.531991    1.5303571 0.0017709002 -0.022730028    4.5529502 
+    3600    19.977577   0.99981189     23.87203    6.0478578    4.5486399    1.4992179 0.0016481058 -0.021936286    4.5689281 
+    3610    20.193126    1.0230888     23.81056    6.0618275    4.5277058    1.5341217  0.001676183 -0.022048231    4.5480779 
+    3620    19.826034    1.0245697    23.668223    6.0631594    4.5268172    1.5363422 0.0017691783 -0.022091662    4.5471397 
+    3630    20.143803    1.0150515     23.80234    6.0530205    4.5309508    1.5220698 0.0020737693 -0.023504598    4.5523816 
+    3640    20.041362    1.0362965    23.869979    6.0664698    4.5125432    1.5539266 0.0021603545 -0.024238777    4.5346216 
+    3650    20.001568    1.0068769    23.537713    6.0545042    4.5446923     1.509812  0.002238285 -0.024296208    4.5667502 
+    3660    19.727009    1.0008579    23.680002    6.0238244     4.523038    1.5007865 0.0020499189 -0.023009446    4.5439975 
+    3670    20.374034    1.0201135    23.572726    6.0470958    4.5174356    1.5296603  0.001952213 -0.022252689    4.5377361 
+    3680    20.296894    1.0237809     23.90897    6.0598342    4.5246747    1.5351595 0.0016913824 -0.020915789    4.5438991 
+    3690    20.316008    1.0148317    23.958155    6.0504215    4.5286813    1.5217402 0.0015051752 -0.020173117    4.5473493 
+    3700    20.055079    1.0322813     23.78552    6.0671344    4.5192285    1.5479059 0.0015796613 -0.020618687    4.5382675 
+    3710    20.054461    1.0116664     23.73721    6.0640621    4.5470684    1.5169937 0.0015963586 -0.020934991     4.566407 
+    3720    20.357581    1.0346553    23.857699    6.0802083    4.5287427    1.5514656 0.0015314413 -0.020411221    4.5476225 
+    3730     20.29551    1.0275362    24.039217    6.0740786    4.5332881    1.5407905 0.0015020074 -0.020508597    4.5522947 
+    3740    20.275807    1.0281322    23.710995    6.0722898    4.5306055    1.5416843 0.0014596576 -0.020616316    4.5497622 
+    3750    20.312561    1.0140023    23.802105     6.042665    4.5221686    1.5204964 0.0015166979 -0.020965892    4.5416178 
+    3760    20.366681    1.0114703    23.617253    6.0516583    4.5349586    1.5166997 0.0014751232 -0.021016946    4.5545005 
+    3770    19.998677     1.020904    23.585938    6.0530597    4.5222141    1.5308456 0.0015170879  -0.02179571    4.5424927 
+    3780    19.883023    1.0239318    23.984436    6.0499942    4.5146084    1.5353858 0.0016238797 -0.022452967    4.5354375 
+    3790    19.956034   0.99431251    23.428538    6.0385397    4.5475681    1.4909716 0.0017456741 -0.022877303    4.5686997 
+    3800    20.219861    1.0282278    23.893084    6.0580303    4.5162027    1.5418276 0.0017234252 -0.022637446    4.5371167 
+    3810    20.160137    1.0209515    23.524434    6.0796816    4.5487648    1.5309168  0.001721332  -0.02272116    4.5697646 
+    3820    20.120903    1.0218998    23.884909    6.0559703    4.5236315    1.5323388 0.0016002481 -0.022096938    4.5441282 
+    3830    20.380743   0.99973927    23.981799      6.03925    4.5401409     1.499109 0.0017694944 -0.022747992    4.5611194 
+    3840    20.349023    1.0213274    23.620254     6.053797    4.5223166    1.5314805 0.0019228693   -0.0231328    4.5435265 
+    3850    20.455187    1.0325207     23.73917    6.0690185    4.5207538    1.5482648 0.0018260342 -0.022421502    4.5413492 
+    3860    20.472264    1.0263787    23.738683    6.0945296    4.5554748    1.5390549 0.0017426813 -0.021910846    4.5756429 
+    3870    20.331024    1.0191243    23.872424    6.0630148     4.534838    1.5281768 0.0016375752 -0.021138765    4.5543392 
+    3880     20.21689   0.99895581    23.720917    6.0384541    4.5405199    1.4979342 0.0012696083 -0.019429576    4.5586799 
+    3890     20.04722     1.017153    23.717598    6.0635836    4.5383627    1.5252209 0.0011702597 -0.019464542     4.556657 
+    3900    19.962447    1.0197195    23.734328    6.0563608    4.5272914    1.5290695 0.0011774951 -0.019726599    4.5458405 
+    3910    20.347235     1.011076    23.850717    6.0472073    4.5310988    1.5161085 0.0014292758 -0.020831666    4.5505012 
+    3920    20.287304     1.007203    23.636544    6.0275963    4.5172955    1.5103009 0.0016663481 -0.021973732    4.5376028 
+    3930    20.275545   0.99321157    23.357857    6.0112799    4.5219591    1.4893208 0.0018983688 -0.023093064    4.5431538 
+    3940    20.129516   0.97865145    23.763956    5.9752515    4.5077637    1.4674878  0.001879965 -0.023018873    4.5289026 
+    3950     20.45958   0.98309044    23.449919    5.9856452    4.5115011    1.4741441 0.0017810155 -0.022162812    4.5318829 
+    3960    20.146002   0.98426576    23.695273    5.9997487    4.5238422    1.4759065 0.0016826639  -0.02149739    4.5436569 
+    3970    20.275259    1.0002999    23.659287    6.0253189    4.5253691    1.4999498 0.0015088387 -0.020567213    4.5444275 
+    3980    20.375861     1.023953    23.909171    6.0546298    4.5192122    1.5354176 0.0014611227 -0.019789037    4.5375402 
+    3990    20.399314    1.0014005    23.647646    6.0559523    4.5543523       1.5016 0.0015699841 -0.020299891    4.5730822 
+    4000    20.102606    1.0034969    23.582197    6.0618479    4.5571043    1.5047436  0.001743879 -0.021573012    4.5769334 
+    4010    20.178139    1.0292536    23.711951    6.0671575    4.5237916    1.5433658 0.0017249631 -0.021979185    4.5440458 
+    4020    20.116776    1.0254835    23.543628    6.0696817    4.5319692    1.5377124 0.0016531088 -0.022086044    4.5524022 
+    4030    20.421203    1.0096963    23.750336    6.0474477    4.5334081    1.5140396 0.0016983484 -0.022479151    4.5541889 
+    4040    20.525112    1.0062133    23.732223    6.0515784    4.5427615    1.5088169 0.0016969875 -0.022622838    4.5636874 
+    4050    20.378417    1.0010887    23.773433    6.0286535    4.5275209    1.5011325 0.0016313353 -0.022416607    4.5483062 
+    4060    20.155485    0.9967565    23.779601    6.0458684     4.551232    1.4946364  0.001735347 -0.023017522    4.5725142 
+    4070    20.142012    1.0153368    23.645577    6.0472991    4.5248015    1.5224976 0.0018863517 -0.023290492    4.5462056 
+    4080    20.127851    1.0098013     23.69284    6.0227488    4.5085518     1.514197 0.0019245573 -0.022833662     4.529461 
+    4090    20.595518    1.0164172    23.862189    6.0408034    4.5166859    1.5241175 0.0018423211 -0.022148131    4.5369917 
+    4100    20.522923    1.0201014    23.832843    6.0626017    4.5329596     1.529642 0.0018747638 -0.022140368    4.5532252 
+    4110    20.437792    1.0421809    23.943281    6.0869772     4.524227    1.5627503 0.0020256481 -0.022933697     4.545135 
+    4120     20.40493     1.009251    23.701391    6.0467629     4.533391    1.5133718 0.0020237902 -0.023204789     4.554572 
+    4130    20.256841    1.0186978    23.658029    6.0538465    4.5263092    1.5275373 0.0019707633 -0.023388271    4.5477267 
+    4140    19.762145    1.0301741    23.855319    6.0778696    4.5331234    1.5447461 0.0019509269 -0.023279556    4.5544521 
+    4150    20.247034    1.0249484    23.768964    6.0752528    4.5383427    1.5369101 0.0020919031 -0.023696619    4.5599474 
+    4160    19.932551    1.0120151    23.777774    6.0463641    4.5288474    1.5175167 0.0020734138 -0.023629048     4.550403 
+    4170    20.404964   0.99178321    23.565002    6.0181927    4.5310138    1.4871789 0.0018668958 -0.022811378    4.5519582 
+    4180    20.522091    1.0079628    23.607408    6.0120195    4.5005793    1.5114402 0.0018482283 -0.022713823    4.5214449 
+    4190    20.341024   0.99294659    23.609428    6.0140386    4.5251152    1.4889234 0.0017098246 -0.021996436    4.5454018 
+    4200    20.333004    1.0107035     23.68449    6.0228366    4.5072867    1.5155498 0.0015269238 -0.021004704    4.5267645 
+    4210    20.043492    1.0013012    23.614388     6.018083    4.5166318    1.5014512 0.0015057155 -0.020952722    4.5360788 
+    4220    20.102977    1.0094603     24.00008      6.03398    4.5202942    1.5136857 0.0017034079 -0.021752341    4.5403432 
+    4230    19.987327    1.0022762    23.840403    6.0320624    4.5291492    1.5029132 0.0017898468 -0.021879448    4.5492388 
+    4240    19.716014    1.0181196    23.678387    6.0599817    4.5333114    1.5266703 0.0017918404 -0.021813925    4.5533335 
+    4250    20.011092     1.021448    23.867789    6.0655325    4.5338712    1.5316613 0.0017634846  -0.02195334     4.554061 
+    4260    20.171336    1.0207226    23.739029    6.0667828    4.5362093    1.5305735  0.001754246 -0.022095503    4.5565506 
+    4270    20.225662     1.004737    23.565452    6.0359135    4.5293103    1.5066032  0.001978497 -0.023216431    4.5505483 
+    4280    19.616572   0.99591448    23.794845    6.0453888     4.552015    1.4933738 0.0018879577  -0.02270041    4.5728275 
+    4290    20.208954   0.99622883    23.890001    6.0358533    4.5420082    1.4938451 0.0017211064 -0.022045365    4.5623324 
+    4300    20.189136    1.0165747    23.898191    6.0424254    4.5180716    1.5243538  0.001783418 -0.022201962    4.5384902 
+    4310    20.327851    1.0010688    23.462407    6.0219799    4.5208773    1.5011026 0.0017513913 -0.021969863    4.5410958 
+    4320    20.519596   0.99154544     23.36037    6.0125037    4.5256813    1.4868224 0.0016960878 -0.022195672    4.5461809 
+    4330    20.133981   0.99804129    23.874668    6.0225336    4.5259707    1.4965629 0.0016724731 -0.022084502    4.5463828 
+    4340    20.045973    0.9924146     23.57343    6.0217858    4.5336601    1.4881257 0.0016169698 -0.021762354    4.5538054 
+    4350    20.227415    1.0054992    23.638736    6.0482613    4.5405153    1.5077461 0.0015232617 -0.020939491    4.5599315 
+    4360     20.39007    1.0141049    23.859285    6.0550906    4.5344404    1.5206502 0.0015681456 -0.021450032    4.5543223 
+    4370    20.315654    1.0258703    23.880387     6.087494    4.5492014    1.5382926 0.0015450314 -0.021095828    4.5687522 
+    4380    20.182498    1.0158431     23.67433    6.0952383    4.5719816    1.5232567 0.0015928999  -0.02117999    4.5915687 
+    4390    20.198141    1.0337074    23.944434    6.0635641    4.5135198    1.5500442 0.0019103647 -0.022918638    4.5345281 
+    4400    20.177519      1.00972    23.613756    6.0296328    4.5155577    1.5140751 0.0020543182 -0.023408056    4.5369114 
+    4410    20.230843    1.0160429    23.645615    6.0615452     4.537989    1.5235563  0.001929053 -0.022870935    4.5589309 
+    4420    20.194135   0.99658256    23.508236    6.0428187    4.5484432    1.4943755  0.001874646 -0.022469326    4.5690379 
+    4430    20.212127   0.99644564    23.812537    6.0342489    4.5400787    1.4941702 0.0017367983 -0.022116364    4.5604582 
+    4440    20.291578    1.0212963    23.878987    6.0609613    4.5295275    1.5314338 0.0015542871   -0.0213334    4.5493066 
+    4450    20.264387    1.0239287     23.72403    6.0729062    4.5375251    1.5353811 0.0016234283  -0.02172189    4.5576236 
+    4460    20.389679    1.0176224    23.946717    6.0599036    4.5339788    1.5259247 0.0016242289 -0.021634365     4.553989 
+    4470    20.358777    1.0105669    23.741037    6.0616717    4.5463267     1.515345 0.0015558567 -0.021316246    4.5660871 
+    4480    20.077303     1.030594    23.800776    6.0860187     4.540643    1.5453757 0.0016456937 -0.021726214    4.5607235 
+    4490    20.412666   0.99931505    23.753837    6.0485289    4.5500559    1.4984729 0.0017234546 -0.021546847    4.5698793 
+    4500    20.027286    1.0293628    23.843617    6.0335819    4.4900524    1.5435295 0.0017892187 -0.021897372    4.5101605 
+    4510    20.332896    1.0092151    23.995322    6.0309493    4.5176312    1.5133181 0.0016893983 -0.021646673    4.5375885 
+    4520    20.378086   0.98812737    23.588051    6.0198629    4.5381659     1.481697 0.0015694147 -0.021498078    4.5580946 
+    4530    20.059954    1.0057657    23.707487    6.0235616     4.515416    1.5081456 0.0016800902 -0.021856379    4.5355923 
+    4540    20.019913    0.9919924    23.583798     6.006508    4.5190155    1.4874926 0.0016768993 -0.021792092    4.5391306 
+    4550    20.322609   0.98927879    23.745142    6.0033807    4.5199571    1.4834235   0.00165119  -0.02165179    4.5399577 
+    4560    20.400957   0.99263087    23.877678    6.0178034    4.5293534      1.48845 0.0016088226 -0.021339897    4.5490844 
+    4570    19.973948    1.0112756    23.593127    6.0375297    4.5211219    1.5164078 0.0017655157 -0.021619486    4.5409758 
+    4580     20.28867    1.0152653    23.726787    6.0351068    4.5127164    1.5223904 0.0017313947 -0.021870049    4.5328551 
+    4590    20.144048   0.99666219    23.792145    6.0207015    4.5262066     1.494495 0.0017714725 -0.022246536    4.5466816 
+    4600    19.948813    1.0220838    23.779912    6.0369173    4.5043027    1.5326146 0.0018589942 -0.022214009    4.5246577 
+    4610     20.22739   0.99888802    23.378425    6.0492846     4.551452    1.4978326 0.0018315722 -0.021787707    4.5714081 
+    4620    20.554447   0.97961763    23.812521    6.0041222    4.5351856    1.4689366 0.0015713439  -0.02071549    4.5543297 
+    4630    20.209864    1.0002044    23.527775    6.0113891    4.5115827    1.4998065 0.0013450156 -0.019639882    4.5298775 
+    4640    20.386247   0.97774299     23.62431    6.0130031    4.5468775    1.4661256 0.0011414713 -0.018610588    4.5643466 
+    4650     20.15832   0.99424705     23.71465    6.0347966    4.5439232    1.4908734 0.0012041493 -0.018842929    4.5615619 
+    4660    20.268328   0.99761657    23.618824    6.0404937    4.5445677    1.4959261 0.0012835686 -0.019877393    4.5631615 
+    4670    20.293892    1.0014016    23.575299    6.0380516    4.5364498    1.5016017  0.001613988 -0.021426626    4.5562625 
+    4680    20.281502   0.99971935    23.523847    6.0177967    4.5187175    1.4990792 0.0017789947 -0.021952721    4.5388913 
+    4690     20.22411    0.9959397    23.659525    6.0011988    4.5077873    1.4934116 0.0018287015 -0.021740527    4.5276991 
+    4700    20.354244   0.99515157    23.673874    5.9950922    4.5028624    1.4922298 0.0017350419 -0.020959034    4.5220864 
+    4710    20.239314    1.0003638    23.413239    6.0360688    4.5360233    1.5000455 0.0015543981 -0.019922287    4.5543912 
+    4720     20.23917   0.99888697    23.927168    6.0251818    4.5273508     1.497831 0.0016757192 -0.020821565    4.5464966 
+    4730    20.206064    1.0081673     23.53158    6.0306459     4.518899    1.5117469 0.0017602729 -0.021417177    4.5385559 
+    4740    20.469778   0.97294739    23.521365    5.9811034    4.5221688    1.4589346 0.0017680231  -0.02160143    4.5420022 
+    4750    20.360928   0.97936634    23.706532    5.9820606    4.5135008    1.4685598 0.0017330035 -0.021748426    4.5335162 
+    4760    20.279271   0.98074744    23.626393    6.0021402    4.5315094    1.4706308  0.001917502 -0.022800981    4.5523929 
+    4770    20.019407   0.99174447    23.629402    6.0051863    4.5180654    1.4871208 0.0019275899 -0.022753463    4.5388913 
+    4780    19.676801     0.976527    23.604438    5.9864585    4.5221562    1.4643022 0.0019940286 -0.023092431    4.5432546 
+    4790    20.377514   0.98954155    23.740414    5.9951977    4.5113802    1.4838175 0.0019473559 -0.023163482    4.5325963 
+    4800    20.233744    1.0018564    23.889247    6.0176432    4.5153595    1.5022837 0.0020067542  -0.02310706    4.5364598 
+    4810    20.265788   0.98795783    23.806419    6.0122179    4.5307751    1.4814428 0.0018832274 -0.022202128     4.551094 
+    4820    20.099476    0.9940881    23.812567    6.0395758    4.5489407    1.4906351 0.0018073804 -0.021694631    4.5688279 
+    4830    19.804356    1.0060163    23.803257    6.0326243    4.5241029    1.5085214 0.0016898874 -0.021056729    4.5434697 
+    4840    20.249631    1.0248437    23.978786    6.0511738    4.5144208    1.5367531 0.0014604693 -0.020174203    4.5331345 
+    4850    20.227516     1.030456    23.590483    6.0722922    4.5271234    1.5451688 0.0015323351  -0.02063896      4.54623 
+    4860    20.180285    1.0156868    23.256348    6.0904034    4.5673811    1.5230224 0.0017620265 -0.022019093    4.5876382 
+    4870    20.442825    1.0409316     23.70419    6.1012835    4.5404066    1.5608769 0.0019013737 -0.022749328    4.5612546 
+    4880      20.3029    1.0151492    23.534239    6.0578678    4.5356515    1.5222162 0.0019439684 -0.023352526    4.5570601 
+    4890    20.312194    1.0174627    23.633515     6.061646    4.5359607    1.5256853 0.0019356419 -0.023503296    4.5575284 
+    4900     19.80192    1.0314602    23.751607    6.0574433    4.5107686    1.5466746 0.0018877005 -0.022999251    4.5318802 
+    4910    20.044066    1.0153091    23.788742    6.0692463    4.5467903     1.522456 0.0019228596 -0.023425803    4.5682933 
+    4920    20.243162    1.0257634    24.017066    6.0623999    4.5242676    1.5381322 0.0018996994 -0.023083057     4.545451 
+    4930    20.288856    1.0256303    24.009041    6.0588367     4.520904    1.5379327 0.0019124119 -0.022625782    4.5416174 
+    4940    20.404328   0.99760719    23.640548    6.0117021    4.5157901     1.495912 0.0018696769 -0.022277889    4.5361983 
+    4950    20.102476    1.0094722    23.387917    6.0367829    4.5230794    1.5137035 0.0017610387 -0.021522181    4.5428405 
+    4960    20.100895   0.99916944    23.642693    6.0360635    4.5378089    1.4982546 0.0018274936 -0.021682047    4.5576635 
+    4970    20.131621    1.0111816     23.90724     6.035589    4.5193223    1.5162668 0.0018769629 -0.021961696     4.539407 
+    4980    20.001096    1.0032433    23.785376    6.0427639    4.5384006    1.5043633 0.0018961686 -0.022359033    4.5588634 
+    4990    20.574539    1.0147723    23.617254    6.0566145    4.5349633    1.5216511 0.0018223175 -0.022254461    4.5553955 
+    5000    20.390197   0.98644341    23.311789    6.0191862    4.5400144    1.4791719 0.0015891364  -0.02151768    4.5599429 
+    5010    20.203858    1.0244147    23.408369    6.0582312    4.5221213    1.5361099 0.0013764787  -0.02101889    4.5417637 
+    5020    19.940971    1.0159411    23.694402    6.0642715    4.5408678    1.5234037 0.0013651174 -0.020882347     4.560385 
+    5030     20.08505    1.0072553    23.996958    6.0537634    4.5433841    1.5103793 0.0015347992  -0.02144306    4.5632924 
+    5040    20.404274   0.98564784    23.772053    6.0269361    4.5489571    1.4779789 0.0015622712 -0.021164808    4.5685596 
+    5050    20.262099     1.010804     23.75059    6.0444269    4.5287264    1.5157006 0.0016043245 -0.020947144    4.5480692 
+    5060    20.081671    1.0020505     23.70978    6.0307255    4.5281507    1.5025748 0.0015201361 -0.020029403      4.54666 
+    5070     20.27761    1.0148503    23.638579    6.0700464    4.5482784     1.521768 0.0013281956 -0.018834639    4.5657849 
+    5080    20.291935    1.0225477    23.772451    6.0716525    4.5383423    1.5333103 0.0012543766 -0.018405665    4.5554936 
+    5090    20.179643    1.0274745    23.674614    6.0769288    4.5362308     1.540698 0.0013817884  -0.01908549    4.5539345 
+    5100    20.248495    1.0207147      23.5895    6.0557756    4.5252138    1.5305617 0.0016363988 -0.020339908    4.5439174 
+    5110     20.20453   0.99758116    23.625617    6.0452392    4.5493663     1.495873 0.0018476192 -0.021697622    4.5692163 
+    5120    20.142618    1.0070076    23.326249    6.0097112    4.4997033    1.5100079    0.0019747 -0.023169705    4.5208984 
+    5130    20.313272   0.99521133    23.639807    6.0372294      4.54491    1.4923194 0.0019536858 -0.023267776    4.5662241 
+    5140    20.140754    1.0119138    23.789476    6.0371765    4.5198118    1.5173647 0.0016442359 -0.021227216    4.5393948 
+    5150    20.055663   0.99226779    23.696127    6.0297548    4.5418492    1.4879056  0.001582015 -0.020975024    4.5612422 
+    5160    20.290942   0.99578579    23.759355    6.0141572    4.5209764    1.4931808 0.0016890387 -0.021871842    4.5411592 
+    5170    20.097312   0.98868623    23.599431    6.0059563    4.5234213     1.482535 0.0016514448 -0.021538466    4.5433083 
+    5180    20.098165   0.99653935    23.680945    6.0053558     4.511045    1.4943108 0.0016319741 -0.020930121    4.5303431 
+    5190    20.190587    1.0115867    23.453665    6.0324743       4.5156    1.5168743 0.0016237169 -0.021049138    4.5350254 
+    5200    20.090216    1.0050861    23.782974    6.0493831    4.5422565    1.5071266 0.0016364151 -0.021456507    4.5620766 
+    5210    20.011476    1.0116311    23.828326    6.0547556    4.5378148    1.5169408 0.0014882648 -0.020977226    4.5573037 
+    5220    20.160975    1.0059717    23.624243    6.0381801    4.5297254    1.5084546 0.0015015659 -0.020751896    4.5489758 
+    5230    20.266032    1.0097556    23.555668    6.0642716    4.5501431    1.5141285 0.0016485562 -0.021578099    4.5700726 
+    5240    20.117431    1.0256463    23.880783    6.0645185    4.5265619    1.5379566  0.001680464 -0.021987814    4.5468692 
+    5250    20.192545    1.0266277    23.872175    6.0729298    4.5335016    1.5394282 0.0017813901  -0.02238359    4.5541038 
+    5260    20.273298    1.0163914     23.66671     6.067606    4.5435271    1.5240788 0.0019412573 -0.023191318    4.5647772 
+    5270    20.160627    1.0338042    23.623111    6.0774526    4.5272632    1.5501894 0.0019165347 -0.022632924    4.5479796 
+    5280    20.136633    1.0075267    23.863173    6.0459876    4.5352012    1.5107863 0.0017673754 -0.021687262    4.5551211 
+    5290    20.286334   0.99700227    23.607064    6.0222261    4.5272212    1.4950049 0.0017469468 -0.021390558    4.5468648 
+    5300    20.337858     1.003088    23.394605    6.0153635    4.5112331    1.5041304 0.0017617525 -0.021719186    4.5311906 
+    5310    20.178234    1.0126334    23.753863    6.0533134    4.5348695    1.5184438 0.0017315558 -0.021628842    4.5547668 
+    5320    19.961427    1.0258203     23.94348    6.0456039    4.5073864    1.5382175 0.0014058198 -0.020302483    4.5262831 
+    5330    20.200807   0.99789958    23.495749    5.9890286    4.4926782    1.4963504 0.0012109239 -0.019911645    4.5113789 
+    5340    20.264344   0.98472866     23.51189    5.9866398    4.5100392    1.4766006 0.0012351096 -0.019854149    4.5286582 
+    5350    20.360501   0.99113568    23.968789      5.99817    4.5119621    1.4862079  0.001463571  -0.02066918    4.5311677 
+    5360    20.199887    1.0018342    23.799314    6.0304748    4.5282245    1.5022503 0.0015754555   -0.0214486    4.5480976 
+    5370    20.241137    1.0117495    23.970139    6.0435444     4.526426    1.5171184  0.001578892 -0.021740206    4.5465873 
+    5380    20.088276     1.000006    23.741582    6.0193515    4.5198425     1.499509 0.0014425422 -0.020818251    4.5392182 
+    5390    20.281615   0.99489754    23.703819    6.0491377    4.5572888    1.4918489 0.0014429973 -0.020916322    4.5767621 
+    5400    20.305196   0.99227567    23.585165    6.0226961    4.5347787    1.4879174 0.0014919687 -0.021031622    4.5543184 
+    5410    19.991403    1.0091465    23.821842    6.0408903    4.5276752    1.5132151 0.0015209463 -0.021055601    4.5472099 
+    5420    20.174616     1.014676     23.84495    6.0432442    4.5217376    1.5215066 0.0015836068 -0.021718936    4.5418729 
+    5430    20.271262    1.0201324    23.805183     6.051526    4.5218374    1.5296886 0.0017219934  -0.02222279    4.5423382 
+    5440    20.118054   0.98352837    23.655094    5.9983896    4.5235888    1.4748008 0.0018183989 -0.022788474    4.5445589 
+    5450    20.045835   0.97642496    23.805637    5.9680726    4.5039234    1.4641492 0.0018129401 -0.022821093    4.5249315 
+    5460    20.211421   0.96767299    23.638487     5.963269    4.5122434    1.4510256 0.0017237358 -0.022311952    4.5328316 
+    5470    20.289746   0.97758393    23.964947    5.9945397    4.5286526    1.4658871 0.0016841709 -0.022261473    4.5492299 
+    5480    20.392186   0.97247148    23.911556    5.9708782    4.5126573     1.458221  0.001725635 -0.022431489    4.5333631 
+    5490    20.497315   0.97180592     23.23089    5.9750706    4.5178476     1.457223 0.0016679579 -0.022167363     4.538347 
+    5500    20.156082   0.98453787    23.700198    6.0013674    4.5250529    1.4763145 0.0017076465 -0.022488629    4.5458339 
+    5510    20.156927    1.0006969      23.6783    6.0270391    4.5264942     1.500545 0.0017822281 -0.022791328    4.5475033 
+    5520    19.806102    1.0151135    23.976405    6.0610416    4.5388788    1.5221627 0.0018090706 -0.022998689    4.5600685 
+    5530    20.115882    1.0188974    23.689725    6.0518095    4.5239728    1.5278367 0.0018426235 -0.023139544    4.5452697 
+    5540    20.001102   0.99149819    23.664045    6.0246731    4.5379216    1.4867515    0.0018123 -0.022875455    4.5589848 
+    5550    20.051078     1.000945    23.644006    6.0512657    4.5503487    1.5009171 0.0016834831 -0.022540932    4.5712061 
+    5560    20.288717    1.0068226     23.48717    6.0336139    4.5238834    1.5097306  0.001704323  -0.02226492     4.544444 
+    5570    20.357593    1.0138834    23.792894    6.0526276    4.5323094    1.5203182 0.0016842374 -0.022278091    4.5529033 
+    5580    20.185731    1.0152856    24.017128    6.0696381    4.5472173    1.5224207  0.001730271 -0.022678361    4.5681654 
+    5590    19.967997    1.0302259    23.850029    6.0696252    4.5248014    1.5448238 0.0017238202 -0.022726827    4.5458044 
+    5600    20.088808    1.0215384    23.755598    6.0677701    4.5359733    1.5317968 0.0015265354 -0.021892015    4.5563388 
+    5610    20.182278    1.0281058    23.721618    6.0899112    4.5482665    1.5416447 0.0013705257 -0.021143445    4.5680395 
+    5620    20.240773    1.0306302    23.670038     6.094032    4.5486019      1.54543 0.0014247759 -0.021214365    4.5683915 
+    5630    19.948794    1.0365514    23.757589    6.0956288    4.5413199    1.5543089 0.0012511753 -0.020059049    4.5601278 
+    5640    20.465059    1.0250699    23.843376    6.0700045    4.5329123    1.5370923 0.0011080369 -0.019247797     4.551052 
+    5650     20.46319    1.0198587    23.403759    6.0573414    4.5280633    1.5292781 0.0012126317 -0.019476954    4.5463276 
+    5660    20.264393    1.0188441    23.701474    6.0479951    4.5202384    1.5277568 0.0011859978 -0.019096403    4.5381488 
+    5670    20.362566    1.0016238    23.598462    6.0349929     4.533058    1.5019349 0.0013976742 -0.020119182    4.5517795 
+    5680    20.426481    1.0119307    23.630514    6.0614782    4.5440881    1.5173901 0.0015974376  -0.02095203    4.5634427 
+    5690    20.092615    1.0132786    23.977376     6.032398    4.5129868    1.5194112  0.001855234 -0.022344016    4.5334756 
+    5700    19.873818    1.0131208    23.651853    6.0561993    4.5370246    1.5191747  0.001893937   -0.0228184    4.5579491 
+    5710    20.100729   0.99682382    23.743357    6.0392991    4.5445618    1.4947373 0.0017323733 -0.022286023    4.5651155 
+    5720    19.901806   0.98169012    23.601607    6.0028307    4.5307864    1.4720443 0.0015331404 -0.021648437    4.5509017 
+    5730    20.048265   0.98899442    23.851659    5.9847293    4.5017321    1.4829971 0.0014446583 -0.021424276    4.5217118 
+    5740    20.330305    0.9951691    23.714842     6.005635     4.513379    1.4922561 0.0013686689 -0.020823459    4.5328337 
+    5750     20.35226    1.0235619    23.635802     6.065718     4.530887     1.534831  0.001623162 -0.021884191     4.551148 
+    5760    20.427304    1.0402909     23.87086    6.0852682    4.5253519    1.5599163 0.0016633793 -0.022390435     4.546079 
+    5770    20.358055    1.0233771    23.706909    6.0668237    4.5322698    1.5345539 0.0017572192 -0.022520657    4.5530332 
+    5780    20.248181    1.0117661    23.787198    6.0782293     4.561086    1.5171433 0.0020313587 -0.023156818    4.5822114 
+    5790    20.169604    1.0276295    23.791321    6.0963602    4.5554297    1.5409305 0.0020612406  -0.02280932    4.5761778 
+    5800    20.158143    1.0258279    23.637906    6.0666155    4.5283866    1.5382289  0.002095481 -0.022659472    4.5489506 
+    5810    19.987323    1.0265549    23.901792      6.08195    4.5426309    1.5393191 0.0020482495 -0.022581044    4.5631637 
+    5820    19.948055    1.0303831    23.597615    6.0753065    4.5302471    1.5450594 0.0020370985 -0.022316096    4.5505261 
+    5830    20.109377    1.0113339    23.939333    6.0586466    4.5421515    1.5164951 0.0018708025 -0.021857479    4.5621381 
+    5840    20.284211   0.99731297    23.612985      6.03207    4.5365992    1.4954708 0.0016480554 -0.020941066    4.5558923 
+    5850    20.289243    1.0040222    23.939887    6.0426127    4.5370815    1.5055312 0.0013961516 -0.019975638     4.555661 
+    5860    20.122293    1.0139601    23.636759    6.0538632      4.53343    1.5204332 0.0011725291 -0.019007423    4.5512649 
+    5870    20.020738    1.0028083     23.75918       6.0309     4.527189     1.503711 0.0011592168 -0.018549164    4.5445789 
+    5880    19.844827   0.99463798    23.705036    6.0281482    4.5366886    1.4914596 0.0010195791 -0.017476602    4.5531456 
+    5890    20.188925   0.99215233    23.582727    6.0288626    4.5411302    1.4877324  0.001008014 -0.017211634    4.5573338 
+    5900    19.751303    1.0055314    23.663611    6.0374104     4.529616    1.5077944 0.0012644655 -0.018801447     4.547153 
+    5910    20.298512    0.9886218    23.797941    6.0409893    4.5585509    1.4824384 0.0013190862 -0.019199569    4.5764314 
+    5920    20.112756     1.014278    23.628136    6.0739293    4.5530195    1.5209098 0.0013818042 -0.019578737    4.5712165 
+    5930    19.662675    1.0121418    23.602904    6.0861761    4.5684695    1.5177067 0.0014945923 -0.019953279    4.5869282 
+    5940     20.27353    1.0448164    24.109943    6.1034183    4.5367161    1.5667022 0.0014087851 -0.019599578    4.5549069 
+    5950    19.924874    1.0415608    23.804784    6.0838163    4.5219959    1.5618204 0.0013839663 -0.019125121    4.5397371 
+    5960     20.11878    1.0018867    23.558041    6.0689428    4.5666137    1.5023291  0.001335868 -0.018790858    4.5840687 
+    5970    20.202177   0.99975165    23.652035    6.0345905    4.5354629    1.4991276 0.0013695477 -0.019031959    4.5531253 
+    5980    20.187988   0.99842663    23.542953    6.0496639    4.5525231    1.4971407 0.0014927401 -0.019275619     4.570306 
+    5990    20.143192    1.0062075    23.615526    6.0515864    4.5427783    1.5088081 0.0015976173 -0.019850114    4.5610308 
+    6000    20.313038   0.99062696    23.567003    6.0104993    4.5250542    1.4854451 0.0017142309 -0.020086814    4.5434268 
+    6010    20.443106   0.98763708    23.677861    6.0028527    4.5218909    1.4809618 0.0016361214 -0.019408352    4.5396632 
+    6020    20.415671    1.0148105    23.882214    6.0483009    4.5265926    1.5217083 0.0015045234 -0.018554632    4.5436427 
+    6030    20.391724    1.0203523    23.691622    6.0501063     4.520088    1.5300183 0.0015789582 -0.018956336    4.5374654 
+    6040    20.218272    1.0142608    23.821327    6.0527077    4.5318237     1.520884 0.0018167776 -0.020966289    4.5509732 
+    6050    20.213238    1.0036392    23.650078    6.0121746    4.5072176     1.504957 0.0018518627 -0.021052101    4.5264178 
+    6060    20.070538     1.000472     23.52432    5.9950045    4.4947967    1.5002078  0.001655652 -0.020370904    4.5135119 
+    6070     20.35057   0.98955607     23.73273    6.0059882    4.5221489    1.4838393 0.0017125991 -0.020985628    4.5414219 
+    6080    20.392662    0.9796934    23.535933    6.0026883    4.5336381    1.4690502 0.0016767934 -0.021210919    4.5531722 
+    6090    20.108232   0.99220648    23.567414    6.0180688    4.5302552    1.4878136 0.0017061235 -0.021398493    4.5499476 
+    6100    19.986333   0.98037492    23.632267     5.998636    4.5285638    1.4700722 0.0014562521 -0.020250037    4.5473576 
+    6110    20.089134   0.98341106    23.581104    5.9825474    4.5079225    1.4746249 0.0013093146 -0.019556589    4.5261697 
+    6120    20.454143   0.99004966     23.55894    6.0214331    4.5368536    1.4845795 0.0014415039 -0.020264175    4.5556763 
+    6130    20.264044   0.99556611    23.759073    6.0214751    4.5286238    1.4928514 0.0015624095 -0.020809488    4.5478708 
+    6140    20.247169    0.9971383    23.649169    6.0262185    4.5310096    1.4952089 0.0016315858 -0.020723196    4.5501012 
+    6150    19.933737    1.0080889    23.724499    6.0325195    4.5208902    1.5116293 0.0015745821 -0.020533756    4.5398494 
+    6160    20.352948    1.0028113    23.782207    6.0357648    4.5320492    1.5037156 0.0018201576   -0.0215284    4.5517575 
+    6170    20.217598   0.99996716    23.711316    6.0283155    4.5288647    1.4994508 0.0018964273 -0.022125125    4.5490934 
+    6180    20.467221    1.0129528    23.696519    6.0343629    4.5154402    1.5189227 0.0018081075 -0.022085839    4.5357179 
+    6190    20.389425    1.0001323    23.575852    6.0388923    4.5391939    1.4996984 0.0017450545 -0.021649882    4.5590987 
+    6200    20.409927    1.0221465    23.585262    6.0572599    4.5245512    1.5327087 0.0016551019 -0.021424638    4.5443208 
+    6210    20.325426    1.0166256    23.892429    6.0500526    4.5256224    1.5244302 0.0013616241  -0.02012289    4.5443837 
+    6220    19.954819    1.0119531    23.500087    6.0653427     4.547919    1.5174237 0.0010900986 -0.018896604    4.5657255 
+    6230      20.1468    1.0130825    23.744038    6.0685233    4.5494062    1.5191171 0.0011312948 -0.019319449    4.5675943 
+    6240    20.063766    1.0156222    23.714278    6.0781728    4.5552473    1.5229254 0.0013119308  -0.01998254     4.573918 
+    6250    20.240895    1.0263227    23.842777    6.0838363    4.5448653    1.5389709 0.0013614003 -0.020512135    4.5640161 
+    6260    20.439356    1.0140696    23.892372    6.0679206    4.5473232    1.5205974 0.0013837339 -0.021354982    4.5672944 
+    6270     20.30724     1.020773    23.535961    6.0730373    4.5423881    1.5306492 0.0014677291 -0.021462893    4.5623833 
+    6280    20.166189    1.0260848    23.500756     6.093055    4.5544408    1.5386141  0.001725448 -0.022096882    4.5748123 
+    6290    19.748292    1.0287677    23.824927    6.0838528    4.5412156    1.5426372 0.0016997213 -0.021578791    4.5610947 
+    6300    20.002884    1.0116436    23.672823    6.0578291    4.5408695    1.5169596 0.0017734301 -0.021769475    4.5608656 
+    6310    20.285289    1.0144411    23.796838    6.0629512    4.5417967    1.5211544 0.0018453087 -0.021786604     4.561738 
+    6320    20.371006    1.0308323    23.903828     6.068898    4.5231649    1.5457331 0.0017559594 -0.021199691    4.5426086 
+    6330    20.123555    1.0241201    23.841677    6.0601038    4.5244357    1.5356681 0.0017053584 -0.021105598    4.5438359 
+    6340    20.227862    1.0134243    23.868316    6.0543112    4.5346815    1.5196297 0.0017446376  -0.02196956    4.5549064 
+    6350    20.271521   0.99165898    23.805615    6.0278452    4.5408526    1.4869926 0.0014968217 -0.021045159    4.5604009 
+    6360    20.149114    1.0230449    23.563602    6.0513385    4.5172826    1.5340558 0.0012866822 -0.020205023     4.536201 
+    6370    20.105471    1.0191812    23.806033    6.0573515    4.5290894    1.5282622 0.0011856591 -0.019318839    4.5472225 
+    6380    20.376208     1.006594    23.720479    6.0485057     4.539118    1.5093877   0.00137425  -0.01969095    4.5574347 
+    6390    20.465883   0.99611534    23.776915    6.0375648    4.5438899     1.493675 0.0015002658 -0.020306539    4.5626962 
+    6400    20.296373    1.0096882    24.021933    6.0374483    4.5234209    1.5140274 0.0017845426 -0.022002724    4.5436391 
+    6410    20.077165    1.0064459    23.305115     6.034965    4.5257994    1.5091656  0.001839035  -0.02281656     4.546777 
+    6420    20.437982    1.0070123     23.91502    6.0195396    4.5095246     1.510015 0.0020897811 -0.024004995    4.5314398 
+    6430    20.277506   0.98491262    23.576946     6.003389    4.5265126    1.4768765 0.0021868991 -0.024013523    4.5483392 
+    6440    20.546042   0.99108205    23.601631    6.0065427    4.5204152    1.4861275 0.0021159228 -0.023627435    4.5419267 
+    6450    20.450551    1.0177393    23.807933    6.0535148    4.5274147    1.5261001 0.0019663176 -0.022985524    4.5484339 
+    6460    20.365917    1.0090331    23.904116    6.0538605    4.5408153    1.5130452 0.0019648895 -0.023082399    4.5619328 
+    6470    20.449801    1.0275265    23.656998    6.0617812    4.5210051     1.540776 0.0021091835 -0.023225678    4.5421216 
+    6480    20.422081    1.0267301    23.694611    6.0578014    4.5182196    1.5395818 0.0019930158 -0.022423404    4.5386499 
+    6490    20.199729   0.99204561    23.755981    6.0274842    4.5399118    1.4875724 0.0020693188 -0.022513537     4.560356 
+    6500    20.366597    0.9963363    23.646816    6.0309545    4.5369482    1.4940063 0.0019031329 -0.021416359    4.5564615 
+    6510    20.231512   0.99883644    23.473042    6.0332732    4.5355179    1.4977552 0.0018092263 -0.021068717    4.5547774 
+    6520    20.100158    1.0011611    23.777492    6.0190141    4.5177732     1.501241  0.001604033 -0.020462202    4.5366313 
+    6530    20.265109    1.0120629    23.752152    6.0367979    4.5192095    1.5175884 0.0015501216  -0.02060045    4.5382599 
+    6540    19.682966   0.99467716    23.646484    6.0194365    4.5279181    1.4915184 0.0016378419 -0.021028178    4.5473085 
+    6550    20.108464   0.99707811    23.523496    6.0267697     4.531651    1.4951186 0.0015870097 -0.020477184    4.5505412 
+    6560    20.273048    1.0092315     23.72888    6.0481637     4.534821    1.5133426 0.0016782751 -0.021035719    4.5541785 
+    6570    20.251519   0.99724815    23.645216    6.0292393    4.5338657    1.4953736 0.0017205562 -0.021602453    4.5537476 
+    6580    20.300023    1.0070103    23.790345    6.0545946    4.5445826     1.510012 0.0016662183 -0.021032429    4.5639488 
+    6590    19.915952    1.0258242    24.043608    6.0785763    4.5403529    1.5382234  0.001701685 -0.021151124    4.5598024 
+    6600    19.860226    1.0313891     23.84493    6.0738198    4.5272518     1.546568 0.0016709575 -0.021211942    4.5467928 
+    6610    19.966762    1.0294366    23.635641     6.086347    4.5427068    1.5436402 0.0017851256 -0.021824843    4.5627465 
+    6620    20.377807    1.0357482    23.538568    6.1026259    4.5495215    1.5531044 0.0015030118 -0.020366045    4.5683845 
+    6630    20.120685    1.0193022    23.693471    6.0894788    4.5610351    1.5284437 0.0012733663 -0.019268663    4.5790304 
+    6640      20.0122    1.0325257    23.978413    6.0979231    4.5496508    1.5482723 0.0015318683 -0.020338145    4.5684571 
+    6650     20.16335    1.0492577    23.697901    6.1150626    4.5417007    1.5733619 0.0014876755 -0.020171385    4.5603844 
+    6660    20.305236    1.0331508    23.639469    6.0933632    4.5441536    1.5492096 0.0014642708 -0.020552727     4.563242 
+    6670    20.351426    1.0357327    23.820503    6.0981788    4.5450977    1.5530811 0.0014381935 -0.020543217    4.5642027 
+    6680    20.557997    1.0409109    23.775694    6.1182829    4.5574371    1.5608458 0.0015145515 -0.020959535    4.5768821 
+    6690    20.355416    1.0488573    23.791584    6.1221029    4.5493413    1.5727616 0.0014709178 -0.020595896    4.5684663 
+    6700    20.386213    1.0458158    23.976992    6.1287748     4.560574    1.5682008 0.0014426092 -0.019999381    4.5791307 
+    6710     20.37308    1.0590252    23.716872     6.132852    4.5448437    1.5880083 0.0014171389 -0.019475562    4.5629021 
+    6720    20.069783     1.057089    23.882131    6.1382829    4.5531779     1.585105 0.0014522325 -0.020222102    4.5719478 
+    6730    20.083205    1.0253859    23.914979    6.1001313    4.5625651    1.5375661 0.0014506325 -0.020196855    4.5813114 
+    6740    20.191133    1.0431874    23.951006     6.120105    4.5558455    1.5642595 0.0014637194 -0.020198079    4.5745798 
+    6750    20.154982    1.0371827    23.717081    6.0982172    4.5429618    1.5552554 0.0015362591 -0.020769141    4.5621947 
+    6760    20.078014    1.0272418    23.973218    6.0875952    4.5472462     1.540349 0.0014306388 -0.020608427     4.566424 
+    6770    20.099375    1.0286546    23.744949    6.0808649    4.5383973    1.5424676 0.0013898629 -0.020771963    4.5577794 
+    6780    20.348075    1.0280256    23.580755    6.0743269    4.5328025    1.5415244 0.0014544739 -0.020523314    4.5518713 
+    6790    20.157573    1.0041344    23.722357     6.022896    4.5171965    1.5056995 0.0014251579  -0.02038542    4.5361567 
+    6800    20.096124     0.994148    23.681619    6.0328776    4.5421526    1.4907249 0.0015607414 -0.020778677    4.5613706 
+    6810    20.310806   0.99665696    24.096925     6.029664    4.5351769    1.4944871 0.0015934771 -0.020788294    4.5543717 
+    6820    20.196087    1.0095188    23.901206    6.0652598    4.5514863    1.5137735 0.0015926755  -0.02052248    4.5704161 
+    6830    20.012898    1.0094027      23.7962    6.0711971    4.5575977    1.5135994 0.0014538456 -0.019967828    4.5761117 
+    6840    20.230477    1.0216914    23.672898    6.0387026    4.5066763    1.5320263 0.0015650939 -0.020818272    4.5259295 
+    6850    20.436988    1.0151306    23.680771    6.0409856    4.5187973    1.5221883 0.0018309391 -0.021906589    4.5388729 
+    6860    19.840829    1.0049208    23.557406    6.0258831    4.5190044    1.5068787 0.0017598698 -0.021937323    4.5391819 
+    6870    19.622374   0.98601518    23.760483    6.0140933    4.5355636    1.4785298 0.0016786596 -0.021815623    4.5557005 
+    6880    19.991855    1.0002441    23.533089    6.0196642    4.5197982     1.499866 0.0017746051 -0.022292841    4.5403164 
+    6890    20.258774    1.0013866    23.611701    6.0178615    4.5162824    1.5015792 0.0018341478 -0.022550438    4.5369986 
+    6900    20.089141    1.0070321    23.679988    6.0409492    4.5309046    1.5100447 0.0017986984 -0.022417835    4.5515237 
+    6910    20.325703   0.98128713     23.67095     5.997301    4.5258609      1.47144 0.0017641782 -0.022273782    4.5463705 
+    6920    20.375425    1.0073604    23.739155    6.0098152    4.4992783    1.5105369 0.0016283048 -0.021783781    4.5194338 
+    6930    20.247211   0.99023551    23.629456     6.008842    4.5239838    1.4848581 0.0014929327  -0.02105907      4.54355 
+    6940    20.000378   0.99130694    23.720948    6.0152673    4.5288025    1.4864648 0.0016248044  -0.02139537    4.5485731 
+    6950    20.318008     1.014661    23.890805    6.0487771    4.5272929    1.5214842 0.0015344285 -0.021343799    4.5471022 
+    6960    20.110405    1.0068003     23.73154    6.0416868    4.5319898    1.5096971 0.0018065362 -0.022445876    4.5526291 
+    6970    20.357626   0.99504587    23.681684    6.0307414    4.5386702    1.4920713  0.002018679 -0.023102902    4.5597544 
+    6980     20.30144   0.99980652    23.634248    6.0509119     4.551702    1.4992099 0.0020301956   -0.0229374    4.5726092 
+    6990    20.362615   0.99930056    23.787284    6.0482365    4.5497853    1.4984512 0.0019841409  -0.02265197    4.5704531 
+    7000     20.54284    1.0203012    23.955776    6.0303671    4.5004254    1.5299417 0.0018391483 -0.022016413    4.5206027 
+    7010     20.48236    1.0002388    23.687318    6.0404768    4.5406188    1.4998581 0.0016752264 -0.021443743    4.5603873 
+    7020    20.339312     1.000219    24.039944    6.0379763     4.538148    1.4998283  0.001668909  -0.02147412    4.5579532 
+    7030    20.424111      1.00697    23.712845    6.0382848    4.5283333    1.5099515 0.0017718447 -0.022198939    4.5487604 
+    7040    20.418002    0.9980434    23.567774    6.0365184    4.5399523    1.4965661 0.0018031146 -0.022768456    4.5609177 
+    7050    20.522785    1.0185196    23.588699    6.0788727    4.5516026    1.5272701 0.0018676301 -0.022780606    4.5725155 
+    7060    20.415626    1.0242951    23.841767    6.0682866    4.5323561    1.5359305 0.0017708707 -0.022149101    4.5527344 
+    7070    20.464836    1.0144638    23.550757    6.0751485      4.55396    1.5211885 0.0016964168 -0.021637218    4.5739008 
+    7080    20.217165    1.0147727    24.049415    6.0620375    4.5403857    1.5216517 0.0015111362 -0.020905319    4.5597799 
+    7090    20.330174    1.0242495    23.826712    6.0292044    4.4933423    1.5358621 0.0016712038  -0.02211684     4.513788 
+    7100    20.479809   0.99631649    23.670011    6.0233126     4.529336    1.4939766 0.0020138703 -0.023558879    4.5508811 
+    7110    20.484653   0.99043281      23.6889    6.0309811    4.5458271     1.485154 0.0019209662 -0.022871021    4.5667772 
+    7120    20.196424   0.99964396    23.341655    6.0252735    4.5263074    1.4989661 0.0016166882 -0.021347962    4.5460387 
+    7130    19.826641   0.99386929    23.474397    6.0231872    4.5328802     1.490307 0.0014183878 -0.020215723    4.5516775 
+    7140    20.366353   0.99229212    23.610211     6.011352    4.5234099     1.487942 0.0013358399 -0.020244029    4.5423181 
+    7150    20.315302    1.0048129    23.475086    6.0284047    4.5216878    1.5067169 0.0013339368 -0.020361297    4.5407152 
+    7160    20.348106    1.0003306     23.72336     6.046031    4.5460353    1.4999958 0.0014629337 -0.021108274    4.5656806 
+    7170    20.119809    1.0001369     23.69839    6.0527329    4.5530277    1.4997053 0.0015588073 -0.021695902    4.5731648 
+    7180    20.063449    1.0259089    23.610805    6.0858582    4.5475078    1.5383504 0.0014969477 -0.020922628    4.5669335 
+    7190    20.358339    1.0294773    23.852021    6.0815229    4.5378216    1.5437012 0.0016878673 -0.021597707    4.5577315 
+    7200    20.101036    1.0193969    23.686886    6.0546076     4.526022    1.5285856 0.0018407955 -0.022230467    4.5464116 
+    7210    20.213143    1.0237473    23.751549     6.084176    4.5490669     1.535109 0.0018024428 -0.022182114    4.5694466 
+    7220    19.905919    1.0299157    23.412829    6.0875642    4.5432056    1.5443586 0.0017853804 -0.022729658    4.5641499 
+    7230    19.889203    1.0246274    23.730162    6.0702075    4.5337787    1.5364288 0.0018951826 -0.022898081    4.5547816 
+    7240    20.320658    1.0193234    23.912071    6.0608066    4.5323311    1.5284755 0.0019266528 -0.022740815    4.5531452 
+    7250    20.259637    1.0133847    23.625711    6.0359529    4.5163825    1.5195704 0.0020863407 -0.023174575    4.5374708 
+    7260    20.017035    0.9987762    23.756495     6.004242    4.5065771    1.4976649 0.0021449877 -0.023186429    4.5276185 
+    7270    20.311701   0.99656205    23.741278    6.0049546    4.5106098    1.4943448 0.0021216384 -0.023291383    4.5317795 
+    7280    20.136424    1.0035404    23.729866    6.0168301    4.5120212    1.5048089 0.0020660659 -0.023164004    4.5331191 
+    7290    20.372086    1.0225353    23.759028    6.0433005    4.5100089    1.5332916 0.0018727542 -0.022211169    4.5303473 
+    7300     20.22343    1.0132528    23.857525    6.0440482    4.5246757    1.5193725 0.0018052911  -0.02209984    4.5449702 
+    7310    20.232898     1.029327    23.969062    6.0893466    4.5458707    1.5434759 0.0016875747 -0.021359328    4.5655424 
+    7320    19.896565    1.0206385    23.749448    6.0860755    4.5556281    1.5304475 0.0016838219 -0.021138668    4.5750829 
+    7330    20.060367    1.0246936    23.817434    6.0460091    4.5094812     1.536528 0.0017667672 -0.021466719    4.5291811 
+    7340    20.019366    1.0109772    23.716661    6.0384089    4.5224485    1.5159604 0.0017748379 -0.021733255    4.5424069 
+    7350    20.078879     1.015381    23.591002    6.0511598     4.528596    1.5225638 0.0015887752 -0.021160149    4.5481674 
+    7360    20.138739   0.98982246    23.806433    6.0224299    4.5381911    1.4842388 0.0015166586 -0.021122091    4.5577966 
+    7370     19.97909    1.0273592    23.868169    6.0665353    4.5260102    1.5405252 0.0015479645 -0.021131412    4.5455936 
+    7380     19.99689    1.0161813    23.987359    6.0817518    4.5579879    1.5237639 0.0014177459 -0.020306703    4.5768769 
+    7390    20.173673    1.0246782    23.746847    6.0613405    4.5248356    1.5365049 0.0012349623 -0.019241718    4.5428423 
+    7400    20.182861    1.0278301    23.944057    6.0876187    4.5463874    1.5412312 0.0011496299 -0.018615694    4.5638535 
+    7410    20.267768     1.031861    23.592466     6.084755    4.5374795    1.5472755 0.0012870718 -0.018926663    4.5551191 
+    7420    20.094806    1.0313829     23.87017     6.088168    4.5416093    1.5465587 0.0012536827 -0.018953372     4.559309 
+    7430     20.26342    1.0206415    23.601206    6.0770649     4.546613     1.530452 0.0013048668 -0.019467282    4.5647754 
+    7440    20.209394    1.0242886    23.810895    6.0706147     4.534694    1.5359208 0.0012380626 -0.019060648    4.5525165 
+    7450    20.073004    1.0119134    23.689113    6.0392697    4.5219056    1.5173641 0.0011892312 -0.018760678    4.5394771 
+    7460    19.907712    1.0147788    23.790531    6.0538729    4.5322121    1.5216608 0.0011794324 -0.018481721    4.5495144 
+    7470    20.054185    1.0174585    23.756573    6.0665793    4.5409002     1.525679 0.0013208807 -0.019549422    4.5591288 
+    7480    20.036298    1.0156443    23.932702    6.0573041    4.5343455    1.5229586 0.0013546033 -0.019560494    4.5525514 
+    7490    20.259517    1.0278587    23.754863    6.0722784    4.5310043    1.5412742 0.0014669391 -0.020598495    4.5501358 
+    7500    20.171692    1.0076885    23.864595    6.0500947    4.5390658    1.5110289 0.0014989867 -0.021231996    4.5587988 
+    7510    20.227234    1.0204676     23.70683    6.0680407    4.5378496    1.5301912 0.0015094381 -0.021596672    4.5579368 
+    7520    20.062344    0.9982915    23.583425    6.0601301     4.563192    1.4969381 0.0014489215 -0.021604261    4.5833473 
+    7530     20.14791    1.0005911    23.567952    6.0551687    4.5547824    1.5003863 0.0014736535 -0.021986571    4.5752953 
+    7540    20.347729    1.0366708    23.902902    6.0566437    4.5021559    1.5544878 0.0015636343 -0.022311541    4.5229038 
+    7550    20.286753    1.0118124    23.617577     6.056295    4.5390823    1.5172127 0.0014979512 -0.021505723    4.5590901 
+    7560    20.247137    1.0135625     23.82788    6.0632105    4.5433736    1.5198369 0.0013733818 -0.020896899    4.5628971 
+    7570    20.255857     1.003726    23.873634    6.0666309    4.5615438    1.5050871 0.0013959841 -0.020820559    4.5809684 
+    7580    20.424413    1.0197698     23.86769    6.0681444    4.5389996    1.5291448  0.001733204 -0.022237377    4.5595038 
+    7590    20.330671    1.0121234     23.74808    6.0636599    4.5459808    1.5176791 0.0017421265  -0.02205305    4.5662917 
+    7600    20.310817    1.0173911    23.904905    6.0391045    4.5135266    1.5255779 0.0016172494 -0.021546787    4.5334562 
+    7610    20.382761    1.0160613    23.537584    6.0500269     4.526443    1.5235839 0.0014923456 -0.020989934    4.5459406 
+    7620    20.288065    1.0028858    23.648546    6.0241614    4.5203342    1.5038272 0.0015377251 -0.021175817    4.5399722 
+    7630    20.023463   0.99621558    23.837606    6.0348042     4.540979    1.4938253 0.0018531994 -0.022296729    4.5614225 
+    7640    20.226651    1.0199337    23.776899    6.0571264    4.5277359    1.5293905 0.0018459781 -0.022379268    4.5482692 
+    7650    20.213154    1.0209588    23.550469    6.0653616     4.534434    1.5309277 0.0018655427 -0.022414508    4.5549829 
+    7660    20.086717     1.016486    23.707471    6.0754215    4.5512007    1.5242208 0.0016660462 -0.021551673    4.5710863 
+    7670    20.280263    1.0114834    23.790718    6.0758526    4.5591332    1.5167194 0.0016762708 -0.021550938    4.5790079 
+    7680    20.191033    1.0250365    23.737746    6.0938198    4.5567775    1.5370423 0.0018658016 -0.022433196    4.5773449 
+    7690    20.243083    1.0265568    23.910722    6.0724183    4.5330964    1.5393219 0.0020017332 -0.023046047    4.5541407 
+    7700    20.489565    1.0282781    24.206786     6.091722     4.549819     1.541903 0.0021347007 -0.023595363    4.5712797 
+    7710    20.060992    1.0500516    23.801761    6.1088361    4.5342837    1.5745524 0.0022190258 -0.024195282      4.55626 
+    7720    20.303799    1.0359546     23.82185    6.0972092    4.5437953     1.553414  0.002237996 -0.024085716     4.565643 
+    7730    19.997449    1.0409588     23.70258    6.1154489    4.5545312    1.5609177 0.0022368574 -0.024112222    4.5764066 
+    7740    20.180183    1.0347608    23.714191    6.1077907    4.5561669    1.5516238 0.0023726555 -0.024444169    4.5782384 
+    7750    19.999823    1.0115407    23.678634    6.0846374    4.5678322    1.5168053 0.0023494438 -0.024179592    4.5896623 
+    7760    20.201615    1.0220423     23.74042     6.087801    4.5552486    1.5325524 0.0021490952 -0.023361752    4.5764613 
+    7770    20.317778    1.0330721    23.772632    6.0966527    4.5475611    1.5490917  0.001963536 -0.022644064    4.5682416 
+    7780    20.455894    1.0510646    23.979648    6.1156891    4.5396178    1.5760713 0.0017555688 -0.021995198    4.5598574 
+    7790    20.313128    1.0406493    23.978369    6.1049941    4.5445405    1.5604536 0.0015702538 -0.021335499    4.5643057 
+    7800    19.998469    1.0205729    23.721936     6.094721    4.5643719    1.5303491 0.0016180313 -0.021376331    4.5841302 
+    7810    20.399083    1.0361081    23.963334    6.0714293    4.5177853    1.5536441 0.0017525465  -0.02208161    4.5381143 
+    7820    20.563954    1.0231756     23.85961    6.0732791    4.5390274    1.5342518 0.0019633807 -0.023116321    4.5601803 
+    7830    20.090271    1.0064376     23.77229    6.0668841     4.557731    1.5091531 0.0018672762 -0.023073347    4.5789371 
+    7840    19.758963    1.0159435    23.773634    6.0573088    4.5339015    1.5234072 0.0017964326 -0.022448246    4.5545534 
+    7850    19.894252    1.0092383    23.514329    6.0421054    4.5287526    1.5133528 0.0018548698 -0.023040152    4.5499379 
+    7860    20.320243    1.0160239    23.455571      6.04609    4.5225621    1.5235279 0.0016991944  -0.02236373    4.5432266 
+    7870    20.255113     1.002794    23.715701    6.0692009    4.5655114    1.5036896 0.0016279164 -0.021841299    4.5857247 
+    7880    20.482512    1.0331062    23.958199     6.069626    4.5204833    1.5491427 0.0014992072 -0.021207053    4.5401911 
+    7890    20.306477    1.0290768    23.982949    6.0739553    4.5308545    1.5431007 0.0014428157 -0.020728448    4.5501402 
+    7900    20.224481    1.0244937     23.82157    6.0756878    4.5394594    1.5362284 0.0015170478 -0.020587682    4.5585301 
+    7910    20.084069    1.0008151    23.479078    6.0497279    4.5490056    1.5007222 0.0015441592  -0.01992005    4.5673815 
+    7920    20.224865    1.0178761    23.458375    6.0281904    4.5018851    1.5263053 0.0015988124 -0.019907293    4.5201936 
+    7930    20.196492   0.99155256    23.783578    6.0231206    4.5362875    1.4868331 0.0018159169  -0.02119822    4.5556698 
+    7940    20.369626   0.99175391    23.812727    6.0213101    4.5341751     1.487135 0.0018373977 -0.021543908    4.5538816 
+    7950    20.270201    1.0325639      23.8609    6.0721075    4.5237779    1.5483296 0.0018692471 -0.021925344     4.543834 
+    7960    20.182747    1.0121511    23.869935    6.0525454    4.5348249    1.5177205 0.0018334057 -0.022036649    4.5550281 
+    7970    20.173229   0.99672965    23.876572    6.0599484    4.5653523    1.4945961 0.0018746431 -0.022113552    4.5855912 
+    7980     20.19503    1.0153168    23.819226    6.0656693    4.5432017    1.5224676 0.0018683005 -0.022455936    4.5637893 
+    7990    20.184031    1.0135713    23.473339    6.0549333    4.5350831    1.5198502 0.0019012143 -0.022605593    4.5557875 
+    8000    20.320077   0.99363325    23.702198    6.0125433    4.5225902    1.4899531 0.0019073396 -0.022621439    4.5433043 
+    8010    20.472691    1.0027627    23.794248    6.0260697     4.522427    1.5036426 0.0020243586 -0.022818884    4.5432215 
+    8020    20.439088    1.0114056     23.67146    6.0188373    4.5022345    1.5166028 0.0021702415 -0.023928893    4.5239932 
+    8030    20.172383    1.0036659    23.934398    6.0579463    4.5529492    1.5049971 0.0021599728 -0.023971878    4.5747612 
+    8040    20.230478    1.0241954     23.83856    6.0705755    4.5347946     1.535781 0.0020621388 -0.023340535     4.556073 
+    8050    19.982046    1.0238394    23.671999    6.0728894    4.5376422    1.5352472 0.0020116011 -0.022937372    4.5585679 
+    8060    19.850382    1.0348708     23.91777    6.0771942    4.5254054    1.5517888 0.0019273978 -0.022811391    4.5462893 
+    8070    20.115843    1.0135147      23.5309    6.0389239    4.5191587    1.5197652 0.0018534041 -0.022380335    4.5396856 
+    8080    20.266987    1.0050906    23.733926    6.0205394     4.513406    1.5071334 0.0016928532  -0.02164283     4.533356 
+    8090    20.259067    1.0026674    23.988753    6.0367149    4.5332152    1.5034998 0.0019276405 -0.023081557    4.5543691 
+    8100    20.246195    1.0145708    23.982975    6.0386624    4.5173136    1.5213488 0.0020557066 -0.023621306    4.5388792 
+    8110    20.248822   0.97417895    23.720781    6.0155189    4.5547376    1.4607813 0.0020777713  -0.02336018      4.57602 
+    8120    20.293117    1.0192256    23.628158    6.0625335    4.5342047    1.5283288 0.0019268502 -0.022824652    4.5551025 
+    8130    20.111499    1.0054462    23.697573    6.0610103    4.5533438    1.5076666 0.0017888692 -0.022182353    4.5737372 
+    8140    19.565837    1.0267373    23.859878    6.0751907    4.5355981    1.5395926 0.0016044106 -0.021065027    4.5550587 
+    8150    20.170304    1.0359741    23.671017    6.0824073    4.5289641    1.5534432 0.0014982989 -0.020518347    4.5479841 
+    8160    19.985262    1.0470615    23.803944    6.0900985    4.5200297    1.5700688 0.0017143969  -0.02147239    4.5397877 
+    8170    20.270802    1.0295185    23.708093    6.0904188    4.5466558     1.543763 0.0019757813 -0.022676459    4.5673565 
+    8180    20.562371    1.0154554    23.532146    6.0692385    4.5465632    1.5226754 0.0021329542 -0.023629552    4.5680598 
+    8190    20.292346    1.0017856    23.927778    6.0718751    4.5696977    1.5021775 0.0024545644 -0.025237535    4.5924806 
+    8200    20.162104    1.0178771    23.891908    6.0503807    4.5240739    1.5263068 0.0024828394 -0.025466466    4.5470575 
+    8210    20.077802    1.0111217    23.693586    6.0457441    4.5295671     1.516177 0.0022187681 -0.024088554    4.5514368 
+    8220    19.725936    1.0149398    23.458261    6.0405981    4.5186959    1.5219022 0.0020816986 -0.023423741    4.5400379 
+    8230    19.945147    1.0265444    23.662392    6.0671879    4.5278846    1.5393033 0.0019112235 -0.022504109    4.5484775 
+    8240    19.906732    1.0259162    23.785372    6.0872733     4.548912    1.5383613 0.0016846033 -0.021619188    4.5688466 
+    8250    20.208262    1.0244056    23.637781    6.0942657    4.5581695    1.5360962 0.0016394712  -0.02169973    4.5782297 
+    8260    20.025886    1.0441032    23.926411    6.0865309    4.5208981    1.5656328 0.0016597111 -0.021999551     4.541238 
+    8270    20.346198    1.0194514    23.668082    6.0604814     4.531814    1.5286673 0.0018308695 -0.022631778     4.552615 
+    8280       20.288    1.0208269    23.464798    6.0625845    4.5318546    1.5307299 0.0018491791 -0.022629646    4.5526351 
+    8290    20.320929    1.0227967    23.457948    6.0763835    4.5426998    1.5336837 0.0017247131 -0.022345364    4.5633204 
+    8300    20.367577    1.0546132     23.87119    6.1160561    4.5346636    1.5813925 0.0015774282 -0.021850218    4.5549364 
+    8310      20.1037    1.0142952     23.78218    6.1066273    4.5856917    1.5209357  0.001554821 -0.021393724    4.6055306 
+    8320    19.958341    1.0299728    23.624034     6.112815    4.5683708    1.5444442 0.0015415368 -0.021111232    4.5879405 
+    8330    20.182702    1.0370711    23.787515    6.1004834    4.5453954    1.5550881 0.0012708559 -0.019795308    4.5639198 
+    8340    20.285677    1.0194572    23.464492    6.0746436    4.5459676    1.5286761 0.0012092834 -0.019131797    4.5638901 
+    8350    20.248149    1.0195806    23.639986    6.0875405    4.5586794    1.5288611 0.0012478438 -0.019172224    4.5766038 
+    8360    19.713273    1.0284209    23.900522    6.0794962    4.5373791    1.5421171 0.0012090102 -0.019031966    4.5552021 
+    8370    20.035321    1.0091713    23.488772    6.0679476    4.5546953    1.5132523 0.0011221996 -0.019183811    4.5727569 
+    8380    20.185335    1.0239389    23.639858    6.0651503     4.529754    1.5353963 0.0012006913 -0.020037401    4.5485907 
+    8390    20.374778    1.0241903    23.804732    6.0865695    4.5507961    1.5357733 0.0014736841 -0.021323014    4.5706455 
+    8400    20.460452    1.0348309    23.790812    6.0735977    4.5218687     1.551729 0.0018021684 -0.023002537     4.543069 
+    8410    20.280135    1.0271503    23.717086    6.0892086    4.5489967    1.5402119 0.0019325195  -0.02354007    4.5706042 
+    8420    20.496777    1.0265715    23.785821    6.0957965    4.5564526    1.5393439 0.0017584685 -0.022082719    4.5767768 
+    8430    20.289034    1.0338321    23.684557    6.0749148    4.5246836    1.5502312 0.0017401876 -0.021837165    4.5447806 
+    8440    20.226565     1.023511    24.039336    6.0589601    4.5242053    1.5347547 0.0019474567 -0.023070476    4.5453284 
+    8450    20.306064     1.022245    24.034647    6.0793274    4.5464711    1.5328563 0.0020668632 -0.023742411    4.5681466 
+    8460     20.05814    1.0232089    23.483717    6.0742733    4.5399715    1.5343018 0.0018338172 -0.022738101    4.5608758 
+    8470    20.145926     1.017147    23.792164     6.073694     4.548482     1.525212 0.0015386235 -0.021138786    4.5680821 
+    8480    19.865288     1.040543    23.868931    6.0926586    4.5323643    1.5602943  0.001620358  -0.02060341    4.5513473 
+    8490     20.21084    1.0188409    23.601454    6.0661298    4.5383779    1.5277519 0.0017432143  -0.02083792    4.5574726 
+    8500     20.28467     1.012716    23.722066    6.0492392    4.5306716    1.5185677  0.001979601 -0.022273805    4.5509658 
+    8510    20.270166    1.0002128    23.695139    6.0212469    4.5214279     1.499819 0.0020761437 -0.023130148    4.5424819 
+    8520    20.159215    1.0045734    23.631492    6.0291444    4.5227866    1.5063578 0.0018526426 -0.022166573    4.5431005 
+    8530    20.293507   0.99697951    23.537262    6.0332362    4.5382655    1.4949708 0.0017798354 -0.021530476    4.5580161 
+    8540    20.426671    1.0191893    23.847705    6.0584008    4.5301265    1.5282743 0.0018011648 -0.021301401    4.5496267 
+    8550    20.250029    1.0339319    23.673779      6.07189    4.5215091    1.5503809 0.0018122687 -0.021484123     4.541181 
+    8560    20.220383    1.0077466    23.857662    6.0371314    4.5260154     1.511116  0.001814872 -0.021358106    4.5455587 
+    8570    20.300626    1.0185079    23.583946    6.0523486    4.5250959    1.5272526 0.0019024765 -0.022425119    4.5456186 
+    8580    20.466432      0.99984    23.787389     6.028689    4.5294289    1.4992601 0.0019479042 -0.023350014     4.550831 
+    8590    20.161694    1.0057959    23.790437    6.0509259    4.5427349     1.508191 0.0019639815 -0.023247121    4.5640181 
+    8600     19.81856    1.0004803    23.655377    6.0528205    4.5526002    1.5002203  0.001842146 -0.022408654    4.5731667 
+    8610     20.05598    1.0149431    23.940488    6.0488849    4.5269777    1.5219072 0.0020598695 -0.023019503    4.5479373 
+    8620    19.953277     1.012096    23.775877    6.0366338    4.5189958     1.517638 0.0021073642 -0.023191696    4.5400801 
+    8630    20.194413   0.99916488    23.591203    5.9954648    4.4972171    1.4982477 0.0019222148 -0.021768176     4.517063 
+    8640     20.21829   0.97658446     23.54837    5.9933926    4.5290042    1.4643884 0.0015344886  -0.01993393    4.5474037 
+    8650    20.413911   0.99121958     23.78295    6.0079915    4.5216577    1.4863338 0.0014428174 -0.019703311    4.5399182 
+    8660     20.09207    1.0008534    23.612618     6.031219    4.5304394    1.5007796 0.0013913227 -0.019819689    4.5488678 
+    8670    20.372284    1.0048355    23.774493    6.0486548    4.5419041    1.5067508 0.0014430319 -0.020552678    4.5610137 
+    8680     20.21658   0.99101593    23.580058      6.03493    4.5489016    1.4860284 0.0017611072 -0.022055235    4.5691957 
+    8690    20.272041    0.9972947    23.824705    6.0361946    4.5407512    1.4954434  0.002013668 -0.023499777    4.5622373 
+    8700    20.271785    1.0315085    23.940733    6.0648448    4.5180978     1.546747  0.001922333 -0.023461137    4.5396366 
+    8710    20.349159    1.0249399    23.729356    6.0791097    4.5422123    1.5368975 0.0019491338 -0.023590624    4.5638538 
+    8720    20.107953    1.0466331    23.720172     6.108554    4.5391276    1.5694264  0.001941207 -0.023423001    4.5606094 
+    8730     19.86757    1.0259019    23.493392    6.0758045    4.5374647    1.5383398 0.0018934196 -0.022858343    4.5584296 
+    8740    20.377351    1.0161692    23.445802    6.0878117    4.5640659    1.5237458 0.0018705794 -0.022285402    4.5844807 
+    8750     20.06483    1.0443751    23.818537    6.0975201    4.5314796    1.5660404 0.0019481039 -0.022527792    4.5520593 
+    8760    20.425591    1.0192293    23.560214    6.1096359    4.5813016    1.5283343 0.0018852321  -0.02187214    4.6012885 
+    8770    20.173643    1.0243682    23.810903    6.0894589    4.5534187    1.5360401 0.0016465255 -0.020695516    4.5724677 
+    8780    20.179936    1.0071032    23.457063    6.0604438    4.5502926    1.5101513 0.0017159819 -0.020823619    4.5694002 
+    8790      20.1793   0.99594567    23.540831    6.0382235     4.544803    1.4934205 0.0018299189 -0.021673808    4.5646469 
+    8800    20.208862    1.0274755    23.841113    6.0515514    4.5108518    1.5406996 0.0017717983 -0.021221265    4.5303013 
+    8810    20.133415   0.98812592    23.522356     6.029154    4.5474592    1.4816948 0.0019192416 -0.021561454    4.5671014 
+    8820    20.267594   0.99889038    23.744529    6.0356237    4.5377876    1.4978361 0.0018223251 -0.021320967    4.5572863 
+    8830    20.030985    1.0032187    23.664219    6.0182243    4.5138978    1.5043264 0.0017200284 -0.020709674    4.5328875 
+    8840    20.348672    1.0067698    23.821772    6.0483893    4.5387381    1.5096513 0.0016382459 -0.020304279    4.5574041 
+    8850    20.458249    1.0133075    23.919643    6.0739772    4.5545226    1.5194546 0.0016933102 -0.021007401    4.5738367 
+    8860    20.069507    1.0072229    23.733972    6.0647773    4.5544466    1.5103307 0.0018265604 -0.021288333    4.5739083 
+    8870    20.202311    1.0178019    23.460462    6.0762299     4.550036     1.526194 0.0016973422 -0.020933956    4.5692726 
+    8880      20.3853    1.0282782    23.765409    6.0845451    4.5426419    1.5419032 0.0016275814 -0.020841082    4.5618554 
+    8890    20.255963    1.0256506    23.573468    6.0897467    4.5517836    1.5379631 0.0017846486 -0.022154361    4.5721534 
+    8900    20.224197    1.0262638      23.8951    6.0676973    4.5288148    1.5388825  0.001889247 -0.022688459     4.549614 
+    8910    20.277878    1.0086736    23.899768    6.0535213    4.5410152    1.5125061 0.0017219451 -0.021953337    4.5612466 
+    8920    20.212491    1.0045647    23.724084    6.0684167    4.5620719    1.5063448 0.0017681596 -0.021986003    4.5822898 
+    8930    20.440163     1.031065    23.789092     6.080658    4.5345759     1.546082 0.0018416853 -0.022396466    4.5551307 
+    8940    20.420082    1.0286128    23.844093    6.0781118    4.5357069    1.5424049 0.0017262277 -0.021639855    4.5556206 
+    8950    20.150249    1.0154573    23.732329    6.0570163    4.5343381    1.5226782 0.0016546523 -0.021290363    4.5539738 
+    8960    20.021476    1.0139788     23.74218    6.0634878    4.5430266    1.5204612 0.0017961604 -0.021938482    4.5631689 
+    8970    19.800321    1.0100415     23.80023    6.0583548    4.5437976    1.5145572 0.0019723318 -0.022822469    4.5646478 
+    8980    20.443934     1.005308    23.619646    6.0411932    4.5337338    1.5074594 0.0021154876 -0.023317003    4.5549353 
+    8990    20.382694    1.0073871    23.815112     6.031407      4.52083    1.5105769 0.0020854242 -0.023345845    4.5420905 
+    9000    20.206548    1.0256323    24.116455     6.063158    4.5252223    1.5379357 0.0020882041  -0.02331001    4.5464441 
+    9010    20.549571    1.0137269    23.765281    6.0588944     4.538811    1.5200835 0.0018082501 -0.021890255     4.558893 
+    9020    20.344528    1.0080434    23.670401    6.0373723    4.5258113     1.511561 0.0017295652 -0.021710922    4.5457926 
+    9030    20.201007     1.008854    23.666831    6.0465914    4.5338148    1.5127766 0.0016701851 -0.021193073    4.5533377 
+    9040     20.04509   0.98879014    23.571167    6.0345293    4.5518385    1.4826908 0.0015713845 -0.020562676    4.5708298 
+    9050    20.435128    1.0106685    23.766757    6.0361833     4.520686    1.5154973 0.0016653092 -0.021363991    4.5403847 
+    9060    20.544711    1.0114538    23.763348    6.0561351    4.5394602    1.5166749  0.001812839 -0.021971003    4.5596184 
+    9070    20.388057    1.0394975    23.825098    6.0787821    4.5200557    1.5587264  0.001904412 -0.022027013    4.5401783 
+    9080    20.194021    1.0250234    23.746201     6.069487    4.5324643    1.5370226 0.0018670228 -0.021890387    4.5524877 
+    9090    20.293935    1.0055076    23.617623    6.0652376    4.5574789    1.5077586  0.001588704 -0.020874047    4.5767643 
+    9100    20.268971     1.007783    23.792123    6.0643123    4.5531417    1.5111706 0.0014356398 -0.019961549    4.5716676 
+    9110    20.100645    1.0197616    23.918066    6.0380434    4.5089109    1.5291325 0.0014562457 -0.020019002    4.5274737 
+    9120    20.209968   0.99983888    23.446254    6.0299896    4.5307312    1.4992584 0.0013515932 -0.019875816    4.5492554 
+    9130    20.163258    1.0054741    24.030398    6.0489166    4.5412082    1.5077084 0.0013209736 -0.020276701    4.5601639 
+    9140    20.177736    1.0108855     23.61984    6.0445044    4.5286817    1.5158228 0.0014816078  -0.02126456    4.5484646 
+    9150    20.250614   0.99996469     23.59947    6.0197885    4.5203414    1.4994471 0.0015138343 -0.021315048    4.5401426 
+    9160     20.31932   0.98572281    23.807641    5.9905341    4.5124427    1.4780914 0.0015573065 -0.021194581      4.53208 
+    9170    20.283345    0.9924521    23.750354    5.9989018    4.5107199    1.4881819 0.0015474247 -0.020782981    4.5299555 
+    9180    20.441354    0.9924585    23.831823    6.0009546    4.5127631    1.4881915 0.0016211434 -0.020490064     4.531632 
+    9190    20.093336   0.97727406     23.66871    5.9982473    4.5328248    1.4654225 0.0017117747 -0.020759865    4.5518729 
+    9200    20.449845    0.9927324     23.81005     6.017333    4.5287308    1.4886022  0.001748483 -0.020533812    4.5475161 
+    9210    20.323788   0.99665954    23.654214    6.0242519    4.5297609     1.494491  0.001704638  -0.02095745    4.5490137 
+    9220     20.19486    1.0121245    23.702658    6.0427766    4.5250959    1.5176807 0.0014275953 -0.019955935    4.5436242 
+    9230    20.157487    1.0125558    23.690014     6.043727    4.5253996    1.5183274  0.001317488 -0.019587009    4.5436691 
+    9240    20.260973   0.99675809    23.952179    6.0290724    4.5344337    1.4946387 0.0012712665 -0.019543581     4.552706 
+    9250    20.174139    1.0270598    23.710289    6.0582972    4.5182211    1.5400761 0.0013930508 -0.020156821    4.5369849 
+    9260    20.207496    1.0125065    23.745571    6.0691444    4.5508909    1.5182535 0.0015064074 -0.020389434    4.5697739 
+    9270    20.176908     1.012513    23.678714    6.0307132      4.51245    1.5182632 0.0015933565 -0.020220264    4.5310769 
+    9280    20.223904   0.99936533    23.733098    6.0302779    4.5317295    1.4985483 0.0016999883  -0.02043673    4.5504663 
+    9290    20.076664    1.0067829    23.639857    6.0341684    4.5244975    1.5096709 0.0018268249 -0.021609772    4.5442805 
+    9300    20.484151    1.0227374    23.734905    6.0537866    4.5201919    1.5335948 0.0018347029 -0.022300642    4.5406578 
+    9310    20.424544   0.99983393    23.569725    6.0494038    4.5501528     1.499251  0.001736916 -0.022286028    4.5707019 
+    9320     20.42584    1.0089171    23.937471    6.0475813    4.5347101    1.5128711 0.0017466378 -0.022256044    4.5552195 
+    9330    20.486514    1.0184353    23.676604      6.07104    4.5438963    1.5271437  0.001660657 -0.021721741    4.5639574 
+    9340    20.212756    1.0158928      23.5315    6.0786546    4.5553233    1.5233313 0.0015518073 -0.021141757    4.5749132 
+    9350    20.192772    1.0159353    23.595288    6.0426856    4.5192907     1.523395 0.0015955702 -0.021069322    4.5387644 
+    9360    20.055645   0.99827355    23.880949    6.0441333    4.5472221    1.4969112 0.0016126122  -0.02066214    4.5662716 
+    9370    20.359495    1.0082514    23.748909    6.0413224    4.5294494     1.511873 0.0015246509 -0.020454842    4.5483796 
+    9380    20.047363    1.0038981     23.60932     6.030073    4.5247279    1.5053451 0.0016620617 -0.021436323    4.5445022 
+    9390    19.765541     1.015604    24.089705    6.0397007    4.5168025    1.5228982  0.001785137 -0.022719059    4.5377364 
+    9400    20.400023    1.0166013     23.61143    6.0608972    4.5365036    1.5243936  0.001792645 -0.022686607    4.5573975 
+    9410    20.069654    1.0086228     23.61805    6.0319312    4.5195013      1.51243 0.0016652809 -0.022152407    4.5399884 
+    9420    20.192086    1.0030979    23.892271    6.0130043     4.508859    1.5041453 0.0017101211 -0.022290359    4.5294393 
+    9430    20.136611   0.99509294    23.598065    6.0269559     4.534814    1.4921419 0.0014593585 -0.021234321     4.554589 
+    9440    20.301169    1.0053257    23.846483    6.0402359      4.53275    1.5074859 0.0013945753 -0.020579932    4.5519354 
+    9450    20.366732   0.98042097    23.586672    6.0119099    4.5417687    1.4701412 0.0015151734 -0.020797528     4.561051 
+    9460     20.24354   0.98036986    24.013047    6.0120837    4.5420191    1.4700646 0.0017506146 -0.021854814    4.5621233 
+    9470    20.247632    1.0067399    23.713969    6.0185956    4.5089891    1.5096065 0.0020694395 -0.023561341     4.530481 
+    9480    20.209336   0.99716187    23.763152    6.0201592     4.524915    1.4952442 0.0022826756 -0.024548556    4.5471809 
+    9490     20.28983   0.99398815    23.751989    6.0070848    4.5165995    1.4904852  0.002197214 -0.024187131    4.5385894 
+    9500    20.202123    1.0002283     23.52806    6.0326605    4.5328182    1.4998423 0.0021645303 -0.023971117    4.5546248 
+    9510    20.264302    1.0005107    23.716422    6.0349213    4.5346555    1.5002658 0.0020707792 -0.023430296     4.556015 
+    9520    20.307369    1.0210414    23.625806    6.0372327    4.5061812    1.5310515 0.0018307518 -0.022490446    4.5268409 
+    9530    20.175663    0.9985369    23.927302    6.0442102    4.5469041    1.4973061 0.0018624413 -0.022617545    4.5676592 
+    9540    20.404929    1.0127998     23.87934    6.0433867    4.5246935    1.5186932 0.0019931253  -0.02281565     4.545516 
+    9550    20.096947   0.99771217    23.621879    6.0238613    4.5277919    1.4960694  0.002027767 -0.023291857     4.549056 
+    9560    20.049249   0.99505244    23.993875    6.0237784    4.5316972    1.4920811 0.0019708653 -0.022477937    4.5522043 
+    9570    20.051024    1.0132528    23.653665    6.0440202    4.5246477    1.5193725 0.0018299831 -0.021638671    4.5444564 
+    9580     20.08786    1.0009842    23.828978    6.0453151    4.5443394    1.5009758 0.0017805083 -0.021229758    4.5637886 
+    9590    20.326094    1.0295902    23.666951    6.0751934    4.5313228    1.5438705 0.0017009327 -0.020527966    4.5501499 
+    9600    20.391051    1.0200446    23.695122    6.0906493    4.5610924    1.5295569 0.0017796341 -0.020365304    4.5796781 
+    9610    20.260217    1.0305324     23.56321    6.0819429    4.5366595    1.5452834 0.0016605591 -0.019212403    4.5542114 
+    9620    20.375826    1.0249967    23.981714    6.0660576    4.5290751    1.5369825 0.0015028593 -0.018435342    4.5460076 
+    9630    20.336574    1.0260326    23.638424    6.0825609     4.544025    1.5385359 0.0014398814 -0.018488008    4.5610731 
+    9640    19.947566    1.0572953    23.619626    6.1062499    4.5208356    1.5854143 0.0017115667  -0.02034586    4.5394698 
+    9650    20.083384    1.0398048    23.873125     6.110607    4.5514198    1.5591873 0.0017888116 -0.021168763    4.5707997 
+    9660    20.390976    1.0341462    23.805704    6.0890205    4.5383183    1.5507022  0.001662155 -0.020950059    4.5576062 
+    9670    20.050192    1.0266586    23.596764    6.0854369    4.5459624    1.5394745 0.0015146441  -0.02060543    4.5650532 
+    9680     20.39179    1.0154077    23.772005    6.0698064    4.5472025    1.5226038 0.0013500171 -0.020055716    4.5659082 
+    9690    20.194127    1.0166908    23.788525    6.0615496    4.5370217    1.5245279  0.001304761 -0.019911646    4.5556286 
+    9700    20.112162    1.0093147    23.660248    6.0421846    4.5287172    1.5134674 0.0013508729 -0.019635383    4.5470017 
+    9710    20.442114     1.009164     23.77716    6.0582357    4.5449943    1.5132414 0.0012993685 -0.019432053     4.563127 
+    9720    20.028339    1.0072967     23.54661    6.0382778    4.5278365    1.5104413 0.0012640054 -0.019152074    4.5457245 
+    9730    19.938889   0.98853845    23.442573    6.0375632    4.5552497    1.4823134 0.0011354208 -0.018853691     4.572968 
+    9740    20.360013    1.0020944    23.458821    6.0521537    4.5495132    1.5026405 0.0011293652 -0.018779418    4.5671632 
+    9750    20.095111    1.0286048    23.898601    6.0749186    4.5325257     1.542393 0.0010215934 -0.018408728    4.5499128 
+    9760    19.965932    1.0150931    23.890671    6.0580398    4.5359078    1.5221321 0.0011828764 -0.019437863    4.5541628 
+    9770    20.115643    1.0179376    23.519189    6.0540992    4.5277017    1.5263975 0.0012386061 -0.020021146    4.5464842 
+    9780      20.1738    1.0024105    23.769017    6.0393918    4.5362772    1.5031146 0.0013012563 -0.020503362    4.5554793 
+    9790    20.313366    1.0142946    23.955313    6.0313783    4.5104435    1.5209348 0.0013552584 -0.020429961    4.5295182 
+    9800    20.247187   0.99515909    23.608901    6.0294067    4.5371656     1.492241 0.0016803284 -0.021624642    4.5571099 
+    9810    20.357734   0.99168069    23.779984    6.0095896    4.5225645    1.4870252 0.0019499503 -0.022438086    4.5430526 
+    9820    20.132953     1.005836    23.754767    6.0262632    4.5180121    1.5082511 0.0021551174 -0.023745843    4.5396028 
+    9830    20.082911   0.98054982    23.564066    5.9962501    4.5259156    1.4703345  0.002022283  -0.02316146    4.5470548 
+    9840    20.154827   0.98260568    23.810745    6.0085249    4.5351077    1.4734172 0.0016090896  -0.02102099    4.5545196 
+    9850    20.221295   0.98406533    23.679665    5.9917756    4.5161697     1.475606 0.0014672234 -0.020470339    4.5351728 
+    9860    20.262508   0.98931028    23.546142    5.9840272    4.5005565    1.4834708 0.0011745487 -0.019067137    4.5184491 
+    9870    20.429267   0.96975245    23.431297    5.9969225    4.5427788    1.4541438  0.001185783 -0.018727532    4.5603205 
+    9880      20.3794   0.97430963    23.434988    5.9936898    4.5327125    1.4609773 0.0012971358 -0.019432874    4.5508482 
+    9890    20.273881    1.0010524    23.828242    6.0062818    4.5052038     1.501078 0.0015237638 -0.020578184    4.5242582 
+    9900     20.27885   0.99338803    23.639588    6.0238188    4.5342334    1.4895854 0.0015248038  -0.02064248    4.5533511 
+    9910    20.297704    1.0112757    23.638974    6.0303206    4.5139127    1.5164079 0.0014822105 -0.020927017    4.5333575 
+    9920    19.941052    1.0122877    23.925394    6.0480917    4.5301664    1.5179254 0.0014439296 -0.020842907    4.5495653 
+    9930    20.093127    1.0197971    23.895577    6.0457662    4.5165805    1.5291857 0.0015446598 -0.020976162     4.536012 
+    9940    20.095001   0.98477248    23.619137    6.0264156    4.5497492    1.4766663 0.0015675709 -0.021269234    4.5694509 
+    9950    20.190655     1.021588     23.88313    6.0473623    4.5154911    1.5318712  0.001730713  -0.02206587    4.5358263 
+    9960    20.303908     1.010353    23.786774    6.0664357    4.5514114    1.5150244 0.0017104738 -0.022159228    4.5718601 
+    9970    20.195941    1.0156719    23.720378    6.0783373    4.5553373        1.523 0.0019897299 -0.023279582    4.5766271 
+    9980    20.051309    1.0267431    23.868845    6.0748535    4.5352521    1.5396013 0.0022305337 -0.023947459    4.5569691 
+    9990    20.476206    1.0227909    23.919769    6.0740423    4.5403674    1.5336749 0.0022884467 -0.024096262    4.5621752 
+   10000    20.435951    1.0294231     23.56001    6.0908984    4.5472784      1.54362 0.0021509649 -0.023407121    4.5685346 
+   10010    20.373525    1.0105229       23.609    6.0392683    4.5239892    1.5152791 0.0019686999 -0.022528417    4.5445489 
+   10020    20.287414    1.0070445    24.049725      6.02667    4.5166068    1.5100632  0.001657248  -0.02126552     4.536215 
+   10030     20.46244   0.99643655    23.582332    6.0173339    4.5231773    1.4941566 0.0014650383  -0.01993459    4.5416468 
+   10040    20.245801   0.98181138    23.620169    5.9912431     4.519017    1.4722262 0.0014220774  -0.01993473    4.5375296 
+   10050    20.081771    0.9802325    23.832575    5.9877524    4.5178938    1.4698586 0.0015984875 -0.021091576    4.5373869 
+   10060    20.229731   0.97656366    23.628138    5.9833256    4.5189684    1.4643572  0.001847485 -0.022305188    4.5394261 
+   10070    20.462839    1.0010309    23.658146     6.028158    4.5271121    1.5010459 0.0019509357 -0.022513843    4.5476751 
+   10080    20.461519    1.0058936    23.655108    6.0367483    4.5284109    1.5083374 0.0020280095 -0.022764778    4.5491477 
+   10090    20.492418   0.99418475    23.641025     6.015268     4.524488      1.49078 0.0020523911 -0.023205766    4.5456414 
+   10100    20.302769   0.99024112    23.556869    6.0206279    4.5357614    1.4848666 0.0017965766 -0.022360043    4.5563248 
+   10110    20.392412    1.0079967    23.495538    6.0505917    4.5391006    1.5114911 0.0018109164 -0.022301886    4.5595916 
+   10120    20.319378    1.0222041    23.942945    6.0517105    4.5189155     1.532795 0.0019561446 -0.022832238    4.5397916 
+   10130    20.076777    1.0116336    23.752144    6.0411422    4.5241976    1.5169446 0.0018143967 -0.021933618    4.5443169 
+   10140    20.219257    1.0154599    23.467889    6.0606897    4.5380075    1.5226822 0.0016339289 -0.021169094    4.5575427 
+   10150     20.18211   0.99690749    23.923691      6.02988    4.5350172    1.4948628 0.0017327296 -0.021393026    4.5546775 
+   10160    20.401038    1.0187863    23.632493    6.0657988    4.5381288      1.52767 0.0017995793 -0.021701831    4.5580311 
+   10170    20.161214    1.0311503    23.802543    6.0731396    4.5269297    1.5462099 0.0018346593 -0.022137063    4.5472321 
+   10180    19.944487    1.0417591    23.714755    6.0863629     4.524245    1.5621178 0.0019281527 -0.022321397    4.5446383 
+   10190    20.295387     1.015875    23.672555    6.0787884    4.5554839    1.5233045  0.001610457 -0.021609126    4.5754826 
+   10200    20.327172    1.0069704    23.699374    6.0537919    4.5438398    1.5099521 0.0014524241 -0.020498917    4.5628863 
+   10210    20.230363    1.0157771    23.994621    6.0407788     4.517621    1.5231577 0.0013143015  -0.01969599    4.5360027 
+   10220    20.408858    1.0117077    23.596392    6.0491085    4.5320529    1.5170556 0.0012367961 -0.019832466    4.5506486 
+   10230    20.514007    1.0268369    24.030937    6.0732601    4.5335182    1.5397419 0.0013112823 -0.019948367    4.5521553 
+   10240    20.180577     1.028632    23.584291    6.0541382    4.5117044    1.5424337 0.0013630156 -0.019723785    4.5300652 
+   10250     20.24022    1.0026281    23.848412    6.0187911    4.5153502    1.5034408 0.0013795938  -0.02011873    4.5340894 
+   10260    20.229342    1.0027433    23.676015    6.0247804    4.5211669    1.5036135 0.0016912027 -0.021070098    4.5405458 
+   10270    20.126914   0.99149283    23.779056    6.0070688    4.5203253    1.4867435 0.0017254529 -0.021074455    4.5396743 
+   10280    20.145488   0.97646799    23.625613    5.9997332    4.5355195    1.4642137 0.0016439419  -0.02126244     4.555138 
+   10290    19.891549   0.99616771    23.800481    6.0178583    4.5241048    1.4937535 0.0016136696 -0.021524226    4.5440154 
+   10300      20.0855    1.0044306    23.359471    6.0160396     4.509896    1.5061437 0.0015140947 -0.021164179    4.5295461 
+   10310    20.307405   0.98585924    23.573882    6.0147155    4.5364196    1.4782959 0.0016484698 -0.021956696    4.5567278 
+   10320    20.193982     0.996816    23.847055     6.026557    4.5318314    1.4947256 0.0018869105 -0.022962795    4.5529073 
+   10330    20.443974   0.99781066    23.687239    6.0086488    4.5124317    1.4962171 0.0018441005 -0.022752513    4.5333401 
+   10340     20.34368   0.98539476    23.960775     6.027958    4.5503586    1.4775994 0.0018687435  -0.02287865    4.5713685 
+   10350    20.464487    1.0022997    23.793131    6.0270419    4.5240935    1.5029484 0.0018446762  -0.02275958    4.5450084 
+   10360    20.381334   0.99494743    23.458065    6.0147537    4.5228301    1.4919237 0.0018832949 -0.022578331    4.5435251 
+   10370    20.212567    1.0036743    23.554601    6.0217423    4.5167328    1.5050096 0.0018905001 -0.022168286    4.5370105 
+   10380    20.310719    1.0085671    23.528389    6.0185959    4.5062495    1.5123464 0.0015753103 -0.020780506    4.5254547 
+   10390    20.132003    1.0151132    23.489315    6.0501129    4.5279506    1.5221622 0.0013886496 -0.019840859    4.5464028 
+   10400    20.120922    1.0213352    24.156936    6.0428289    4.5113367    1.5314922 0.0014100404 -0.019977202    4.5299038 
+   10410    20.161057    1.0069952    24.006875    6.0576202    4.5476309    1.5099893 0.0014509477 -0.020357328    4.5665372 
+   10420    20.038025   0.99968417    23.899286     6.033266    4.5342396    1.4990264 0.0017201182 -0.021771268    4.5542907 
+   10430    20.279754    1.0000916    23.522102    6.0246904    4.5250531    1.4996373 0.0018010668 -0.022503748    4.5457558 
+   10440    20.397346    1.0144723    23.692056    6.0435841    4.5223829    1.5212012 0.0018091594 -0.022739386    4.5433131 
+   10450    20.337386   0.98916682    23.528154    6.0171827    4.5339271    1.4832556 0.0021624358 -0.024225852    4.5559905 
+   10460    20.195832   0.98428019    23.561339    5.9929929    4.5170647    1.4759281 0.0021639486 -0.024314687    4.5392155 
+   10470    20.327535   0.97906271    23.539562    6.0001124    4.5320078    1.4681045 0.0021431871 -0.024477628    4.5543423 
+   10480    19.761786   0.97318955    23.729785    6.0081377      4.54884    1.4592977 0.0022680737 -0.025059733    4.5716317 
+   10490      20.3136   0.99997349    23.667548    6.0100305    4.5105703    1.4994603 0.0020926969 -0.023882165    4.5323598 
+   10500    20.354792   0.99385145    23.513656     6.046177    4.5558967    1.4902802 0.0019899356 -0.023522508    4.5774293 
+   10510    19.848331   0.99613958    23.660529       6.0335    4.5397887    1.4937113 0.0018310827 -0.022434369     4.560392 
+   10520    20.276231    1.0181307    23.729573    6.0350072    4.5083202    1.5266871 0.0018568723 -0.022153924    4.5286172 
+   10530    20.307859   0.99077418    23.707837    6.0280839    4.5424181    1.4856659 0.0019991568 -0.022644462    4.5630634 
+   10540    19.811001    1.0049377    23.605325    6.0517363    4.5448323     1.506904 0.0019361273 -0.022609377    4.5655055 
+   10550    20.072181   0.99779832    23.831861    6.0283352    4.5321366    1.4961986 0.0018889316 -0.021965181    4.5522129 
+   10560    20.456206    1.0094008    23.676249    6.0288075    4.5152111    1.5135965 0.0017546813 -0.021023895    4.5344803 
+   10570    20.429709   0.99943688    23.568203    6.0067132    4.5080576    1.4986556 0.0018452691 -0.021140305    4.5273526 
+   10580    20.437974   0.99787882    23.774962    6.0506775    4.5543582    1.4963193  0.001942366 -0.021723808    4.5741396 
+   10590    20.010869   0.97723298    23.360834    6.0293891    4.5640282    1.4653609 0.0018367311 -0.021522784    4.5837143 
+   10600     20.03563    1.0289153    23.803323    6.0679428    4.5250844    1.5428584 0.0017401536  -0.02146912    4.5448134 
+   10610    20.322892   0.99199976    23.453504    6.0265909    4.5390872    1.4875036 0.0015451814 -0.020510562    4.5580526 
+   10620    19.834301   0.99774727    23.752033    6.0218226    4.5257006     1.496122  0.001505578 -0.020001676    4.5441967 
+   10630    20.182417   0.99041923    23.720749    6.0218855    4.5367519    1.4851336 0.0015119339 -0.019992688    4.5552326 
+   10640    20.377204   0.98914723    23.442489    6.0100015    4.5267753    1.4832263 0.0015989333 -0.020405645     4.545582 
+   10650    20.225997    1.0003151    23.651507    6.0177853    4.5178129    1.4999724 0.0018567031 -0.021586546    4.5375427 
+   10660    20.314865    0.9972715    23.700847    6.0356075    4.5401989    1.4954086 0.0018955887 -0.022303544    4.5606069 
+   10670    20.286471   0.98325411    23.578924    6.0095075     4.535118    1.4743895 0.0016992801 -0.021482254    4.5549009 
+   10680    20.279871    1.0075095    23.457854    6.0446761    4.5339156    1.5107605 0.0015101701 -0.020312282    4.5527177 
+   10690     20.11017    1.0156149     23.72432     6.066547    4.5436325    1.5229145 0.0014793885 -0.019961027    4.5621141 
+   10700    20.093211    1.0122532    23.778572    6.0540336    4.5361599    1.5178737 0.0015395328 -0.019851213    4.5544715 
+   10710    20.279001    0.9990609    23.867179     6.046704    4.5486122    1.4980918 0.0016519888 -0.020461486    4.5674217 
+   10720    20.128427    1.0047337    23.544436    6.0485045    4.5419063    1.5065982 0.0018679809 -0.021425522    4.5614638 
+   10730    20.134132   0.99536259    23.963917    6.0235834    4.5310372    1.4925462 0.0020097444 -0.022325398    4.5513529 
+   10740    20.320393   0.98741266    24.021789    5.9999683     4.519343    1.4806253 0.0020962355 -0.022698443    4.5399452 
+   10750    20.250199   0.99190392    23.580024    6.0125181    4.5251582    1.4873599 0.0021505456 -0.023236851    4.5462445 
+   10760    20.395573   0.99514757    23.633032    6.0336952    4.5414715    1.4922238 0.0021058724  -0.02405422    4.5634198 
+   10770    20.025171   0.98684369    23.735303    6.0084507    4.5286786    1.4797721 0.0021871072 -0.024067912    4.5505594 
+   10780     19.81398    1.0104701    23.703698    6.0388258     4.523626    1.5151999 0.0022926798 -0.024742948    4.5460762 
+   10790    19.841372    1.0131462    23.615302     6.049474    4.5302613    1.5192127  0.002349805  -0.02498952     4.552901 
+   10800    20.168623    1.0045172    23.745729     6.063679    4.5574055    1.5062735 0.0022485774  -0.02459163    4.5797485 
+   10810    20.209469    1.0214022    23.842829    6.0673625    4.5357699    1.5315926 0.0021157541 -0.023880072    4.5575342 
+   10820    20.049194    1.0397803    24.063457    6.0840707    4.5249201    1.5591505 0.0018815049 -0.022749094    4.5457877 
+   10830    20.205837    1.0330047    23.745517    6.0782578    4.5292672    1.5489906 0.0016579189 -0.021446066    4.5490553 
+   10840    20.265173    1.0352945    23.822971    6.0907003    4.5382762    1.5524241 0.0014415169 -0.020137457    4.5569722 
+   10850    20.322622    1.0155765    23.717706    6.0799498    4.5570928     1.522857 0.0012574531 -0.019085685     4.574921 
+   10860    20.317768    1.0138829    23.412505    6.0883818    4.5680643    1.5203175 0.0010546713 -0.018766769    4.5857764 
+   10870    20.284334    1.0256831    23.665498    6.0793889    4.5413771    1.5380118 0.0013068446 -0.019703253    4.5597735 
+   10880    20.142202    1.0079071    23.899754    6.0518306    4.5404739    1.5113567    0.0016202 -0.021082627    4.5599363 
+   10890    19.877231   0.99455499    23.861595    6.0118298    4.5204946    1.4913352 0.0017041065 -0.021612645    4.5404031 
+   10900    19.761606    1.0026724    23.436021     6.019438    4.5159308    1.5035072 0.0017834701 -0.022288567    4.5364359 
+   10910    20.276285    1.0131511    23.641878    6.0276968    4.5084768      1.51922 0.0020455732 -0.023773027    4.5302043 
+   10920    20.054319    1.0080131    23.421778    6.0340952    4.5225796    1.5115157 0.0019914682 -0.023366017    4.5439541 
+   10930    20.197839   0.99715215     23.74035    6.0243068    4.5290771    1.4952296 0.0019008219 -0.023292995    4.5504693 
+   10940    20.226913    1.0199414    23.883116    6.0753299    4.5459277    1.5294022 0.0018500344 -0.023045136    4.5671228 
+   10950    20.048221    1.0290576    23.809431    6.0725806    4.5295088    1.5430718 0.0018233751  -0.02285349    4.5505389 
+   10960    20.064925    1.0339978    23.525631    6.0861692    4.5356895    1.5504797 0.0019644644 -0.023260851    4.5569859 
+   10970    20.219658    1.0527849    23.880201    6.0923687    4.5137177     1.578651 0.0017495898 -0.022157538    4.5341257 
+   10980    20.337843    1.0136504    23.760383    6.0446293    4.5246606    1.5199687 0.0016840939 -0.021549404    4.5445259 
+   10990    20.287304    1.0076107    23.996542    6.0653351    4.5544229    1.5109122 0.0017549835 -0.021598979    4.5742669 
+   11000    20.267951    1.0026761    23.912757    6.0483683    4.5448554    1.5035129 0.0017207303 -0.021720388    4.5648551 
+   11010    20.492681    1.0058615    23.608627    6.0463629    4.5380735    1.5082893  0.001829414 -0.022022809    4.5582669 
+   11020    20.210361    1.0062533    23.589145    6.0386685    4.5297917    1.5088768 0.0018842449 -0.021994013    4.5499015 
+   11030    20.270737   0.98453477    23.567741    6.0197183    4.5434084    1.4763099 0.0019487579 -0.021965282    4.5634249 
+   11040    20.350343     1.000098    24.097772    6.0262729    4.5266259     1.499647 0.0018201175 -0.021762238    4.5465681 
+   11050    20.546243    1.0096632    23.678905    6.0547937    4.5408038      1.51399 0.0018948592  -0.02252159    4.5614305 
+   11060    19.999028    1.0278534    23.643123     6.054249    4.5129828    1.5412662 0.0019155015 -0.022570557    4.5336379 
+   11070    20.220684   0.99416061    23.745396    6.0252145    4.5344706    1.4907438 0.0018227298 -0.022142443    4.5547903 
+   11080    20.224325    1.0140511    23.795159    6.0400179    4.5194483    1.5205696 0.0017109748 -0.021994144    4.5397314 
+   11090    20.412096    1.0103225      23.7457    6.0377704    4.5227918    1.5149785 0.0018575883 -0.022958049    4.5438923 
+   11100    20.181194    1.0177325    23.831516    6.0520286    4.5259386    1.5260899 0.0020210356 -0.023701618    4.5476192 
+   11110    20.413535   0.99067284    23.736592    6.0490279     4.563514    1.4855139  0.002008386 -0.023790488    4.5852961 
+   11120    20.193091    1.0016085    23.564671    6.0572207    4.5553088    1.5019119 0.0020800959 -0.024130404    4.5773591 
+   11130    20.163928    1.0040969    23.789786    6.0354952    4.5298518    1.5056433 0.0021576673 -0.024217762    4.5519119 
+   11140    20.124373    1.0181091    23.794577     6.052675    4.5260205    1.5266546  0.002051154 -0.023444274    4.5474136 
+   11150    20.224866    1.0064184    23.778594    6.0285314     4.519407    1.5091244 0.0021075515 -0.023825911    4.5411254 
+   11160    20.047793   0.98539329    23.689771    6.0256017    4.5480044    1.4775972 0.0020682226 -0.023837604    4.5697738 
+   11170    20.296965    0.9980717    23.886245    6.0126451    4.5160366    1.4966085 0.0017836141 -0.022510783    4.5367638 
+   11180    20.187428    1.0036868    23.816888    6.0199792    4.5149508    1.5050284 0.0015990425 -0.021411745    4.5347635 
+   11190     20.31575   0.97600542    23.428937    6.0028119    4.5392918    1.4635201  0.001521568 -0.020749553    4.5585197 
+   11200    20.205933   0.98454736    23.815348    6.0086383    4.5323096    1.4763288 0.0015661268 -0.021094838    4.5518383 
+   11210    19.936534    0.9981063    23.792557    6.0231973    4.5265369    1.4966604 0.0016779897 -0.021888697    4.5467476 
+   11220     20.13604     1.002113    23.832095    6.0118154    4.5091469    1.5026685  0.001781752 -0.022352351    4.5297175 
+   11230    20.359412   0.99308968    23.693353    6.0057724    4.5166344     1.489138  0.001666024 -0.021780485    4.5367489 
+   11240    20.586093    1.0064281     23.96378    6.0432588    4.5341199     1.509139 0.0013959342 -0.020350882    4.5530748 
+   11250    20.420404   0.98779518    23.596844    6.0284934    4.5472945    1.4811989 0.0014184957 -0.020215737    4.5660918 
+   11260    20.385855    1.0085589     23.41894     6.053584      4.54125     1.512334 0.0013755699 -0.020297509    4.5601719 
+   11270    20.362276     1.024143    23.746495    6.0311339    4.4954315    1.5357025 0.0014523136  -0.02055535    4.5145345 
+   11280    20.308854    1.0262474    23.702755    6.0754883    4.5366303     1.538858 0.0013986613 -0.020363733    4.5555954 
+   11290    20.149171    1.0058851    23.852997    6.0580685    4.5497438    1.5083247 0.0013071482 -0.020065491    4.5685022 
+   11300    20.064356    1.0046704    23.779677    6.0551868    4.5486836    1.5065032 0.0013172947 -0.019510898    4.5668772 
+   11310    20.369407    1.0153355    23.726762    6.0268193    4.5043237    1.5224956 0.0015042442 -0.020300505    4.5231199 
+   11320    19.958811   0.99878993     23.82082    6.0327705     4.535085    1.4976855 0.0015413673 -0.020495857    4.5540394 
+   11330    20.137897    1.0173038     23.75302    6.0500356    4.5245886     1.525447 0.0015285081 -0.020452499    4.5435126 
+   11340    20.274325    1.0035791    23.639496    6.0307944    4.5259276    1.5048668 0.0013989597 -0.019936233    4.5444649 
+   11350    19.999614    0.9957299    23.595703    6.0141162    4.5210192     1.493097 0.0013959572 -0.020050536    4.5396738 
+   11360    20.094098   0.99930148    23.509824    6.0043067    4.5058541    1.4984526 0.0013734299 -0.020414109    4.5248948 
+   11370    20.281496   0.98605343    23.464334    6.0084219    4.5298348    1.4785871 0.0014036406 -0.020840975    4.5492721 
+   11380    20.535677    1.0099599    23.728257    6.0503068     4.535872    1.5144348 0.0015610711 -0.021769424    4.5560803 
+   11390    20.376997    1.0124261    23.869446    6.0348835    4.5167505    1.5181329 0.0015374187  -0.02169552    4.5369086 
+   11400     19.94008    1.0169563    23.846204    6.0527481    4.5278222    1.5249259 0.0016012477 -0.021524702    4.5477456 
+   11410    20.061132    1.0100902    23.724534    6.0324404    4.5178102    1.5146302 0.0016010671 -0.021492576    4.5377017 
+   11420    20.180879      1.00439    23.582817    6.0191183    4.5130356    1.5060827 0.0015835727 -0.021306295    4.5327583 
+   11430    20.477034    1.0022301    23.985498    6.0249884    4.5221443    1.5028441 0.0016972657 -0.021748111    4.5421951 
+   11440    20.267741   0.98580376    23.602067    6.0216819    4.5434692    1.4782127 0.0017539733 -0.021983872    4.5636991 
+   11450    20.293314    1.0072279    23.414451    6.0297105    4.5193722    1.5103382 0.0016231946 -0.021184802    4.5389338 
+   11460    20.354896    1.0212331    23.495164     6.057949      4.52661    1.5313391 0.0015422411 -0.020924135    4.5459918 
+   11470    19.974018    1.0114357    23.607829     6.054656    4.5380082    1.5166478 0.0013850822 -0.020506925    4.5571301 
+   11480    19.879246    1.0096744    23.755507    6.0464909    4.5324841    1.5140068 0.0014555046 -0.021060593    4.5520891 
+   11490    20.221051    1.0055869    23.766319    6.0279014    4.5200238    1.5078775 0.0016663819 -0.021758286    4.5401158 
+   11500    20.368941   0.99551835    23.376273    6.0178425    4.5250627    1.4927798 0.0017895332 -0.021887602    4.5451608 
+   11510    19.840664   0.99859211    23.697296    6.0305406    4.5331517    1.4973889  0.001845907 -0.021586975    4.5528928 
+   11520    20.234021    0.9884557    23.362005    6.0156641    4.5334747    1.4821893 0.0019137696 -0.021844237    4.5534052 
+   11530    20.180839    0.9823354    23.575245    5.9966047    4.5235928    1.4730119 0.0019889462 -0.022284005    4.5438879 
+   11540    20.383088   0.98421325    23.730438    5.9978656    4.5220379    1.4758278 0.0018778809 -0.021528302    4.5416883 
+   11550    20.377962    1.0003095    23.842073    6.0230784    4.5231143    1.4999641 0.0017851167 -0.021742115    4.5430713 
+   11560    20.228936    1.0014087     23.67862    6.0369065    4.5352942    1.5016123 0.0017922643 -0.022315916    4.5558179 
+   11570    20.340348    1.0015544    23.682809    6.0312391    4.5294082    1.5018309 0.0019718893 -0.022811748    4.5502481 
+   11580    19.921688    1.0028418    23.525397    6.0342056    4.5304443    1.5037613 0.0019128277 -0.022538565      4.55107 
+   11590    19.815131    1.0051075    23.572244    6.0457017     4.538543    1.5071587 0.0017967451 -0.022143226    4.5588895 
+   11600    19.923131   0.98508503    23.768907     6.015788     4.538653     1.477135 0.0017218063 -0.021773644    4.5587048 
+   11610    20.119772   0.99762045    23.617389    6.0324501    4.5365182    1.4959319 0.0017265204 -0.021952905    4.5567446 
+   11620    19.981563   0.98613898    23.763184    6.0290509    4.5503355    1.4787154 0.0014924628 -0.021316977      4.57016 
+   11630    19.574907   0.99721344    23.804429    6.0599941    4.5646726    1.4953216 0.0014435205  -0.02058351    4.5838125 
+   11640    20.395828    1.0101684     23.78432     6.050402    4.5356544    1.5147475 0.0014727838 -0.020695124    4.5548768 
+   11650    20.314252    1.0097849     23.46091    6.0531045     4.538932    1.5141725 0.0015026982 -0.021062966    4.5584923 
+   11660    20.238421    1.0099247    23.720041    6.0417617    4.5273796     1.514382 0.0016477865 -0.022056093    4.5477879 
+   11670    20.227656   0.99781385     23.63919    6.0189484    4.5227266    1.4962219 0.0017182474 -0.022575518    4.5435838 
+   11680    20.131888    1.0166333    23.734154    6.0257678    4.5013262    1.5244416 0.0017685577 -0.022789539    4.5223471 
+   11690    19.949215   0.99683145    23.971018     6.032766    4.5380172    1.4947488 0.0018287601 -0.022482809    4.5586713 
+   11700    20.156262    1.0165477     23.75031    6.0469708    4.5226575    1.5243133  0.001627742 -0.021274872    4.5423047 
+   11710    20.264248   0.99903759    23.713248    6.0450624    4.5470056    1.4980569 0.0015089945 -0.020373665    4.5658702 
+   11720    20.124838    1.0120769     23.72026     6.054549    4.5369397    1.5176093 0.0014468147 -0.020756574    4.5562495 
+   11730    20.271538   0.99380141    23.560995    6.0159408    4.5257356    1.4902052  0.001298322 -0.020321075    4.5447583 
+   11740    20.132702   0.99062392    23.694242    6.0184289    4.5329883    1.4854406 0.0012019501  -0.02010744    4.5518938 
+   11750    19.976367   0.99653412    23.802831     6.014105    4.5198021    1.4943029 0.0010379271 -0.019756344    4.5385205 
+   11760    20.201191   0.99355585     23.65942    6.0066141    4.5167771     1.489837 0.0011309247 -0.019741219    4.5353874 
+   11770    20.144075    0.9794965    23.472891    6.0141684    4.5454134     1.468755 0.0011688793 -0.019694089    4.5639386 
+   11780    20.325876    1.0018095    23.691481    6.0189797    4.5167663    1.5022133 0.0012566439 -0.020048232    4.5355579 
+   11790    20.189961     1.010573    23.656296    6.0114868    4.4961326    1.5153543 0.0013043283 -0.020399076    4.5152273 
+   11800    20.096729   0.99322879     23.77168    6.0194983    4.5301517    1.4893466 0.0013922984 -0.020825218    4.5495846 
+   11810    20.141431    1.0230641    23.640912    6.0538597     4.519775    1.5340846 0.0015028473 -0.021426774     4.539699 
+   11820    20.475032    1.0178595    23.744313    6.0587765    4.5324961    1.5262804 0.0016107236 -0.021790873    4.5526763 
+   11830    20.256977    1.0313374    23.620536    6.0812868    4.5347964    1.5464905 0.0017600989 -0.022489158    4.5555254 
+   11840    20.342434    1.0199137    23.638756     6.074458    4.5450974    1.5293606 0.0018236488 -0.022581564    4.5658553 
+   11850    20.238443    1.0164556    23.510269    6.0639787    4.5398036    1.5241751 0.0017253408 -0.022293112    4.5603714 
+   11860     20.37108    1.0230339    23.372236    6.0614664    4.5274271    1.5340393 0.0017433409 -0.022601089    4.5482848 
+   11870    19.955882    1.0313034    23.866457    6.0786731    4.5322336    1.5464395 0.0018519401 -0.023337381     4.553719 
+   11880      20.2539    1.0072979    23.598033    6.0625955    4.5521523    1.5104432 0.0020066992 -0.024032502    4.5741781 
+   11890     20.09629    1.0265119    23.807705    6.0485127     4.509258    1.5392547 0.0020018476 -0.023772575    4.5310287 
+   11900    20.346693    1.0175924    23.631406    6.0495411    4.5236613    1.5258798 0.0019596908 -0.023573953    4.5452756 
+   11910    20.334151    1.0013839    23.885207    6.0478592     4.546284    1.5015752 0.0019165198 -0.023015755    4.5673833 
+   11920    19.910256    1.0245451    23.580905    6.0600692    4.5237639    1.5363053 0.0017889387  -0.02254197    4.5445169 
+   11930    20.042579    1.0098387     23.77897    6.0690388    4.5547856    1.5142532 0.0017671989 -0.022378613     4.575397 
+   11940    20.247649    1.0282975    23.747202    6.0565866    4.5146546     1.541932 0.0019825808 -0.023184183    4.5358562 
+   11950    20.173315    1.0200944    23.819282    6.0529509    4.5233193    1.5296315  0.002015391 -0.023385317    4.5446892 
+   11960    20.359143   0.98263757    23.632078    6.0420528    4.5685878     1.473465 0.0020930054 -0.023219759    4.5897145 
+   11970    20.191377    1.0055316    23.677599    6.0443303    4.5365357    1.5077946 0.0020726708 -0.023074706    4.5575378 
+   11980    20.206462    1.0084397    23.691217    6.0665176    4.5543622    1.5121554 0.0020174789 -0.022568924    4.5749136 
+   11990    20.482679    1.0113982    23.752662    6.0734642    4.5568726    1.5165916 0.0017348353 -0.021059883    4.5761977 
+   12000    20.149787    1.0320961    23.650782    6.0892694    4.5416413    1.5476282 0.0014684549  -0.02051168    4.5606845 
+   12010    20.280956    1.0307417    23.778387    6.0852474    4.5396503    1.5455971 0.0016088245 -0.021104024    4.5591455 
+   12020     20.29887    1.0122684    23.689017    6.0443733    4.5264769    1.5178965 0.0014867106 -0.020601293    4.5455914 
+   12030    20.239624    1.0166404    23.922341    6.0589632    4.5345109    1.5244523 0.0014989482 -0.020685149    4.5536971 
+   12040    20.347788    1.0179172    23.770378    6.0631565    4.5367896    1.5263669 0.0016941159 -0.022291574    4.5573871 
+   12050    20.481231     1.029917    23.697695    6.0825819    4.5382213    1.5443605 0.0019508566 -0.023781134    4.5600516 
+   12060    20.344214    1.0358126    23.578353    6.0577046    4.5045037    1.5532009  0.001912436 -0.023559256    4.5261505 
+   12070    20.413962     1.024944    24.007937    6.0564415    4.5195379    1.5369036 0.0018274416 -0.023446921    4.5411574 
+   12080     20.31115    1.0295353    23.982892    6.0756909    4.5319028    1.5437882 0.0018215327 -0.023365057    4.5534463 
+   12090    19.929465    1.0215969    23.779092    6.0763431    4.5444586    1.5318845 0.0018467084 -0.023438365    4.5660502 
+   12100    20.303339    1.0397021    23.746378    6.0825801    4.5235469    1.5590332 0.0018876449 -0.023716826    4.5453761 
+   12110    20.073911      1.03126    23.890163    6.0783781    4.5320037    1.5463744 0.0017567259 -0.023092615    4.5533396 
+   12120    20.269341    1.0109534    23.818208    6.0511934    4.5352689    1.5159246 0.0014925153 -0.021717608     4.555494 
+   12130    20.170481    1.0098277    23.822229    6.0592927     4.545056    1.5142367 0.0014603171 -0.021666588    4.5652622 
+   12140    20.112777     1.013986    23.680174    6.0714549     4.550983     1.520472 0.0016904502 -0.022381453     4.571674 
+   12150    20.185474    1.0333875    23.701151      6.09464    4.5450755    1.5495646 0.0017673546 -0.022328074    4.5656362 
+   12160    20.263172    1.0190522    23.631139    6.0821956    4.5541268    1.5280688 0.0016739306 -0.021530672    4.5739836 
+   12170    20.262563    1.0260003    23.709681    6.0761082    4.5376208    1.5384874 0.0015494377 -0.020766622     4.556838 
+   12180    19.963222    1.0203459    23.567083    6.0772625    4.5472539    1.5300087 0.0017390085 -0.022114855    4.5676297 
+   12190      19.9366    1.0308674    23.618252     6.067341    4.5215553    1.5457857  0.001717718  -0.02179281    4.5416304 
+   12200    20.124812    1.0238226    23.544017    6.0848692    4.5496473    1.5352219 0.0018538609 -0.021886862    4.5696803 
+   12210     19.91273    1.0340086    24.009359    6.0888929    4.5383969     1.550496 0.0016517932 -0.021117436    4.5578626 
+   12220    19.911222     1.022005    23.865216    6.0845633    4.5520667    1.5324966 0.0012794064 -0.019270255    4.5700576 
+   12230    20.473826    1.0268901    23.507694    6.0588387    4.5190169    1.5398217 0.0013271333 -0.019489195     4.537179 
+   12240    20.464549   0.98942559    23.784636    6.0428649    4.5592212    1.4836437 0.0014767351 -0.019525572    4.5772701 
+   12250    20.387502    1.0146792    23.656892    6.0421414      4.52063    1.5215115 0.0013371239  -0.01896952    4.5382624 
+   12260     20.07271    1.0068333    23.938257    6.0403283    4.5305817    1.5097466 0.0013564398 -0.018913425    4.5481387 
+   12270    20.433983    1.0165541    23.873983    6.0671857    4.5428627    1.5243229 0.0011812807 -0.018154909    4.5598364 
+   12280    20.062519    1.0316858    23.941144    6.0727791    4.5257662    1.5470129 0.0012337223 -0.018795647    4.5433282 
+   12290    19.928101    1.0109141    23.793078    6.0684554    4.5525896    1.5158657 0.0015678574 -0.021028967    4.5720508 
+   12300    20.055777    1.0212428    23.484268    6.0549163    4.5235628    1.5313535 0.0016771877 -0.021962362     4.543848 
+   12310    20.440862    1.0047783    23.562534    6.0270049    4.5203398    1.5066651 0.0016329315 -0.021550485    4.5402574 
+   12320    20.082277    1.0213615     23.81358     6.074912    4.5433805    1.5315315  0.001864822 -0.022453329     4.563969 
+   12330    19.736061   0.99763168    23.568394    6.0500069    4.5540582    1.4959487 0.0020142913 -0.023049177    4.5750931 
+   12340    20.139459       1.0133    23.461216    6.0518729    4.5324295    1.5194434 0.0020295117 -0.022928888    4.5533289 
+   12350    20.177343   0.99127635    23.443886    6.0424685    4.5560496    1.4864189 0.0017567104 -0.021606801    4.5758997 
+   12360    20.356389    1.0182269    23.793101    6.0739661    4.5471349    1.5268312 0.0017735457  -0.02143821    4.5667995 
+   12370    20.068898    1.0235226    23.617926    6.0796818    4.5449097    1.5347722  0.001820767 -0.022076586    4.5651655 
+   12380    20.378402    1.0220451    23.795012    6.0621001    4.5295435    1.5325566 0.0018070405 -0.022740118    4.5504766 
+   12390    20.601725    1.0264779    23.655477     6.077056    4.5378524    1.5392037 0.0016734066 -0.022272254    4.5584512 
+   12400    19.975857    1.0261957    23.620135    6.0909752    4.5521947    1.5387805 0.0017921274 -0.023099688    4.5735023 
+   12410    20.123504     1.048895    23.912186    6.1135458    4.5407277    1.5728181 0.0018228576 -0.022981649    4.5618865 
+   12420    20.269942    1.0359799    23.664118    6.1119665    4.5585147    1.5534518 0.0018768187 -0.022913365    4.5795512 
+   12430    20.208386    1.0524448    23.898024    6.1317766    4.5536355    1.5781411 0.0019859044  -0.02322772    4.5748774 
+   12440    20.292067    1.0236802    23.417089    6.0782295     4.543221    1.5350085 0.0019891609 -0.023181077     4.564413 
+   12450    20.423123    1.0171165    23.638203    6.0740875    4.5489213    1.5251662 0.0020579745 -0.023573327    4.5704366 
+   12460    20.377367    1.0239309    23.514122    6.0563516    4.5209673    1.5353844 0.0022300213 -0.024485538    4.5432228 
+   12470    20.161535    1.0230395    23.342361    6.0417768     4.507729    1.5340478 0.0022310423 -0.024511426    4.5300094 
+   12480    20.314939    1.0130561    23.908161    6.0529563    4.5338788    1.5190776 0.0021587279 -0.024398836    4.5561189 
+   12490    20.327961    1.0005634    23.796509    6.0401974    4.5398527    1.5003447 0.0020956784 -0.023674169    4.5614312 
+   12500    20.339413   0.99756447     23.83811    6.0358976    4.5400497    1.4958479 0.0018565884 -0.022821758    4.5610149 
+   12510    20.390978   0.99999129    23.442072    6.0228975    4.5234105    1.4994869 0.0016963451 -0.022095565    4.5438098 
+   12520    20.247325    1.0006246    23.529698    6.0157509    4.5153143    1.5004366 0.0017098795 -0.022334285    4.5359387 
+   12530    20.086731    1.0033821    23.504401    6.0225481    4.5179767    1.5045714 0.0017568313  -0.02264426    4.5388641 
+   12540     19.86103    1.0132813    23.771176    6.0257101    4.5062949    1.5194153 0.0017152681 -0.022265189    4.5268448 
+   12550    20.209978    1.0060387    23.648823    6.0333873    4.5248323     1.508555 0.0016900605 -0.021754748     4.544897 
+   12560    20.356859    1.0037501    23.660437     6.038292    4.5331687    1.5051233 0.0016332258 -0.021650541     4.553186 
+   12570    20.120968    1.0021602     23.75809    6.0274611    4.5247219    1.5027392 0.0016157655 -0.021328941    4.5444351 
+   12580      20.2825   0.99162947    23.702614    6.0107842    4.5238358    1.4869484 0.0016291669 -0.021508641    4.5437152 
+   12590    19.987892   0.99787422    23.720333    6.0165605    4.5202481    1.4963124 0.0018096398 -0.022052073    4.5404905 
+   12600    20.190578    1.0265504    23.731456    6.0616016    4.5222894    1.5393123  0.001935664 -0.022272839    4.5426265 
+   12610    20.114747    1.0185463    23.406662    6.0412179    4.5139078    1.5273101  0.001971133 -0.022469081    4.5344057 
+   12620    19.972407   0.99075887    23.655423    6.0381003    4.5524574    1.4856429  0.002130057 -0.023353378    4.5736807 
+   12630    20.115213    1.0035458    23.616341    6.0490324    4.5442156    1.5048169 0.0021114511 -0.023232332    4.5653364 
+   12640    20.210873   0.99651782    23.576137    6.0364735    4.5421951    1.4942785 0.0020157385 -0.023110249    4.5632896 
+   12650    20.066505    1.0079091    23.371717    6.0433458    4.5319862    1.5113596 0.0018366574  -0.02284552    4.5529951 
+   12660    19.917928    1.0018854    23.721155    6.0486786    4.5463515    1.5023271 0.0017849828 -0.022352259    4.5669188 
+   12670    20.257002     1.001973    24.072459    6.0504725     4.548014    1.5024586 0.0019781456 -0.023471074    4.5695069 
+   12680    20.177193   0.99758565    23.487357    6.0413236    4.5454439    1.4958797  0.001845597 -0.022956042    4.5665544 
+   12690    20.070517    1.0280617    23.814181    6.0803846    4.5388061    1.5415785 0.0017654956 -0.022543922    4.5595846 
+   12700    20.251244    1.0363042    23.860923    6.0992664    4.5453282    1.5539382 0.0017349754 -0.022533685    4.5661269 
+   12710    19.863346     1.007835    23.705867    6.0592002    4.5479515    1.5112486 0.0015781536 -0.021566245    4.5679396 
+   12720    19.739718    1.0249399    23.710776    6.0662288    4.5293315    1.5368973  0.001310042 -0.020387748    4.5484092 
+   12730    20.440761     1.018995    23.677506    6.0585187    4.5305357     1.527983 0.0012805819 -0.020065935    4.5493211 
+   12740    20.224677    1.0277915    24.185083    6.0865656    4.5453922    1.5411733 0.0014637499 -0.020611088    4.5645396 
+   12750    20.230354    1.0305641    23.824454    6.1003305    4.5549997    1.5453308 0.0014172253 -0.020149417    4.5737319 
+   12760    20.236231    1.0373056    23.885968    6.1001213    4.5446816    1.5554397 0.0014452053 -0.020772884    4.5640092 
+   12770      20.1725    1.0467902    23.779952    6.1052548    4.5355929    1.5696619 0.0016556012 -0.021686349    4.5556236 
+   12780    20.113945    1.0260935    23.914911    6.0856412    4.5470141    1.5386271 0.0018743163 -0.022852137    4.5679919 
+   12790    20.080512    1.0233777    23.672828     6.061528    4.5269732    1.5345548 0.0019266081 -0.023355986    4.5484025 
+   12800    20.359211    1.0323399    23.662245    6.0817263    4.5337326    1.5479937 0.0017976853 -0.023147547    4.5550825 
+   12810    20.377598    1.0161105     23.53272    6.0446127     4.520955    1.5236577 0.0018915285 -0.023692952    4.5427564 
+   12820    20.483431    1.0019556    23.471388    6.0442776    4.5418452    1.5024324 0.0020365467 -0.023827396    4.5636361 
+   12830    20.496132    1.0271369    23.810538    6.0535268     4.513335    1.5401918 0.0020420165 -0.023560187    4.5348532 
+   12840    20.081073    1.0216181    23.737411    6.0503534    4.5184371    1.5319163 0.0019229252 -0.023131027    4.5396452 
+   12850    20.093419    1.0171165    23.943554    6.0568676    4.5317015    1.5251662 0.0018731772 -0.022615052    4.5524434 
+   12860    20.381122    1.0243017    23.884426    6.0641125    4.5281721    1.5359404 0.0018351027  -0.02241385    4.5487509 
+   12870     20.31433     1.014424     23.80138    6.0597323    4.5386035    1.5211288 0.0018292158 -0.022681018    4.5594553 
+   12880    20.175615    1.0026552    23.735386    6.0422824    4.5388009    1.5034815 0.0019423382  -0.02314976    4.5600083 
+   12890    20.118417    1.0024728     24.05752     6.053204     4.549996     1.503208 0.0019815689  -0.02299501    4.5710094 
+   12900    20.379464    1.0092072    23.722374    6.0477721    4.5344659    1.5133062 0.0018204047 -0.022331374    4.5549769 
+   12910    20.183645    1.0000242    23.807123    6.0448002     4.545264    1.4995362 0.0018423698 -0.021791803    4.5652134 
+   12920    20.425592    1.0250884    23.743603    6.0738441     4.536724      1.53712 0.0017527135 -0.021215837    4.5561872 
+   12930    20.471521    1.0258001    23.851024    6.0832843     4.545097    1.5381872 0.0015837186  -0.02041505    4.5639284 
+   12940    20.546593    1.0334262    24.064373    6.0977379    4.5481153    1.5496226 0.0016682094 -0.020601673    4.5670487 
+   12950    20.186724    1.0248096    23.783904    6.0986137    4.5619117    1.5367021  0.001644526 -0.020739432    4.5810066 
+   12960    19.962155    1.0296546    23.811928    6.0930301    4.5490629    1.5439671 0.0016246789 -0.020503077    4.5679413 
+   12970    20.155087    1.0269411    23.603115     6.087047    4.5471488    1.5398982 0.0017016104 -0.020903054    4.5663503 
+   12980    20.025107    1.0272601    23.575425    6.1002349    4.5598584    1.5403765 0.0017266516 -0.020769143    4.5789009 
+   12990    20.146059    1.0174862     23.62041    6.0801245     4.554404    1.5257205 0.0016961875  -0.02087522     4.573583 
+   13000     20.31275    1.0296673    23.784605    6.0864864    4.5425003    1.5439861 0.0017763503 -0.021312295    4.5620363 
+   13010    20.278241    1.0444856    23.984906    6.1008898    4.5346836    1.5662061 0.0018300132 -0.021806181    4.5546598 
+   13020    20.441747    1.0395062    23.930138    6.0842236    4.5254841    1.5587395 0.0018725437 -0.022206712    4.5458183 
+   13030    20.318782    1.0284224    23.557778    6.0569336    4.5148143    1.5421193 0.0018580198 -0.022297965    4.5352542 
+   13040    20.215858    1.0341701    23.462957    6.0650475    4.5143095     1.550738 0.0017997806 -0.022033227    4.5345429 
+   13050    19.983162    1.0259399    23.362231    6.0645447    4.5261479    1.5383968 0.0017220087 -0.021915545    4.5463414 
+   13060    19.968653    1.0143773    23.798367     6.046965    4.5259063    1.5210587 0.0016062963  -0.02100356    4.5453035 
+   13070    20.161741   0.99405547    23.278261    6.0256152     4.535029    1.4905862 0.0015181154 -0.020892516    4.5544034 
+   13080    20.250443   0.99449184    23.440624    6.0296258    4.5383853    1.4912405   0.00160103 -0.021206036    4.5579903 
+   13090    20.459659    1.0172717    23.865652    6.0426491    4.5172501     1.525399 0.0017638798 -0.021859156    4.5373454 
+   13100    20.523037    1.0201957    23.552299    6.0314887    4.5017052    1.5297835 0.0018433911 -0.022862643    4.5227245 
+   13110    20.325338    1.0054672     23.59086    6.0419143    4.5342162     1.507698 0.0018930924  -0.02334745    4.5556706 
+   13120    20.093012    1.0020728    23.666631    6.0286113    4.5260032    1.5026081 0.0019017572  -0.02336522    4.5474667 
+   13130    20.252795    1.0173359    23.552568    6.0512179    4.5257227    1.5254952 0.0017702359  -0.02270091    4.5466533 
+   13140    20.346501    1.0144124    23.810841    6.0603099    4.5391986    1.5211113 0.0017872185 -0.022459489    4.5598709 
+   13150    20.480838    1.0119526    23.666592    6.0737061    4.5562831     1.517423 0.0017379722 -0.022305238    4.5768504 
+   13160    20.391248    1.0299708    23.805447    6.0698934    4.5254522    1.5444412 0.0017180387  -0.02189625    4.5456304 
+   13170     20.04531    1.0310454    23.614324    6.0935405    4.5474878    1.5460526 0.0016731598 -0.021634325     4.567449 
+   13180    20.129281     1.037933    23.805003    6.0965475     4.540167    1.5563805 0.0015470225 -0.020755289    4.5593752 
+   13190    20.256177    1.0290946    23.437968     6.078799    4.5356717    1.5431273 0.0015241631 -0.020150212    4.5542978 
+   13200     20.21452    1.0106487     23.65515    6.0688616    4.5533939    1.5154678 0.0016913576 -0.021011145    4.5727137 
+   13210    20.408098    1.0275172    23.784078    6.0583995    4.5176375     1.540762 0.0017658909 -0.021124878    4.5369965 
+   13220    20.152451    1.0139052    24.079119    6.0477474    4.5273965    1.5203509  0.001679467 -0.020925025    4.5466421 
+   13230    20.470366    1.0073356    23.641699    6.0259177     4.515418    1.5104997 0.0015770071 -0.020688303    4.5345293 
+   13240    20.232973    1.0016318    23.726046     6.026052    4.5241051    1.5019469 0.0014110938 -0.019784686    4.5424787 
+   13250    20.047421     1.017603    23.713557    6.0318107    4.5059149    1.5258958 0.0015849558  -0.02086635    4.5251963 
+   13260    20.121348    1.0002454    23.760712    6.0162155    4.5163475     1.499868 0.0017655194 -0.022023609    4.5366055 
+   13270    20.200453   0.98635039    23.861212    6.0217534     4.542721    1.4790324  0.001804639 -0.022077556    4.5629939 
+   13280    20.430091    1.0012502    23.498446     6.018565    4.5171903    1.5013747  0.001868737 -0.022540755    4.5378624 
+   13290    20.368487    1.0076117    23.659825    6.0217394    4.5108257    1.5109137 0.0018079529 -0.021916463    4.5309342 
+   13300    20.393275   0.99458175    23.771981    6.0103415    4.5189662    1.4913753 0.0016766656 -0.021378142    4.5386676 
+   13310    20.201438   0.99372676    23.571072    6.0124227    4.5223294    1.4900933 0.0013715982  -0.01988374    4.5408416 
+   13320    20.148878   0.98969332    23.849262    6.0033071    4.5192619    1.4840451 0.0011333613 -0.018748717    4.5368773 
+   13330    19.870814   0.97783202    23.468593    5.9968071     4.530548    1.4662591  0.001084655 -0.018564113    4.5480275 
+   13340    20.227103   0.98269916     23.83814    5.9852455    4.5116882    1.4735574 0.0012236226 -0.019348975    4.5298135 
+   13350    20.016911   0.97669115    23.760223    6.0151101    4.5505617    1.4645484 0.0014222765 -0.020398839    4.5695383 
+   13360    19.907375    1.0001342    23.746209    6.0300652    4.5303639    1.4997012 0.0015453274 -0.021079354     4.549898 
+   13370     20.05706   0.99745534    23.963739    6.0217283     4.526044    1.4956843 0.0017658282 -0.022288749    4.5465669 
+   13380    20.295754    1.0190187    23.653838    6.0300367    4.5020181    1.5280186 0.0019085212  -0.02322723    4.5233368 
+   13390    20.295847    0.9918641    23.809587    6.0092632     4.521963    1.4873002 0.0020029599 -0.023434124    4.5433942 
+   13400    20.044715   0.99651558    23.820189    6.0076584    4.5133833    1.4942751 0.0021452937 -0.024043512    4.5352815 
+   13410    20.108029    1.0026558    23.588048    6.0461201    4.5426378    1.5034823 0.0021017883 -0.023057151    4.5635931 
+   13420    19.859505    1.0017948    23.836491    6.0391302    4.5369389    1.5021913 0.0020741634 -0.022975711    4.5578404 
+   13430     20.09016    1.0048588    23.812891    6.0504111    4.5436253    1.5067858 0.0021036765 -0.023364281    4.5648859 
+   13440    20.105338   0.99863325    23.934787    6.0453231    4.5478725    1.4974506 0.0019534782 -0.022721703    4.5686408 
+   13450    20.131525    1.0068488    23.660441     6.047321    4.5375513    1.5097698 0.0018479826 -0.022645565    4.5583488 
+   13460    20.303537     1.005607    23.643808    6.0558217    4.5479141    1.5079077 0.0018586961  -0.02261221    4.5686676 
+   13470    20.234439    1.0413328    23.777285    6.0724781    4.5109995    1.5614786 0.0017305676 -0.022317038     4.531586 
+   13480    20.275767    1.0320382    23.685891    6.1006224    4.5530811    1.5475413 0.0017096573 -0.021789399    4.5731609 
+   13490    20.201814    1.0313479    23.610811    6.1006382    4.5541321    1.5465061 0.0017429398 -0.021751733    4.5741409 
+   13500     20.31728    1.0307531    23.870617     6.094284    4.5486698    1.5456143 0.0016699599 -0.021112876    4.5681127 
+   13510    20.367917     1.047248    23.897205    6.1229268    4.5525784    1.5703484 0.0015956667 -0.020892925    4.5718756 
+   13520    20.048403    1.0392522    23.597149    6.1180385    4.5596799    1.5583586 0.0015742349 -0.021226818    4.5793325 
+   13530    19.689573    1.0658947    24.018265    6.1292686    4.5309595    1.5983091 0.0015741464 -0.021039843    4.5504252 
+   13540    20.000751    1.0271245      23.6472     6.098121    4.5579477    1.5401732  0.001560455 -0.020840045    4.5772273 
+   13550    19.881547    1.0389575    23.688719    6.0949407    4.5370239    1.5579168 0.0013502795 -0.019992148    4.5556657 
+   13560    19.848219    1.0324402    23.573684    6.0846227    4.5364787     1.548144 0.0013638624 -0.020043475    4.5551583 
+   13570    20.198357    1.0032027    23.800255    6.0626956    4.5583931    1.5043025 0.0013551185 -0.020580193    4.5776182 
+   13580    20.341075    1.0239742    23.818966    6.0705668    4.5351174    1.5354494 0.0013490184 -0.020655765    4.5544242 
+   13590     20.11877    1.0305629     23.64936    6.0688022    4.5234732     1.545329 0.0012510081 -0.020436919    4.5426591 
+   13600    19.882605    1.0046288    23.649027    6.0726093    4.5661683     1.506441 0.0011561269 -0.019881951    4.5848942 
+   13610    19.670663    1.0212876    23.953397    6.0697844    4.5383636    1.5314208 0.0010483375 -0.019038893    4.5563542 
+   13620    19.674753    1.0256906    23.554545     6.053591     4.515568     1.538023 0.0010706688 -0.018996515    4.5334938 
+   13630    20.429843    1.0249526    23.857426    6.0477293    4.5108128    1.5369164 0.0010933567 -0.018756543     4.528476 
+   13640    20.362852    1.0047569    23.738756    6.0331468    4.5265139    1.5066329 0.0013165371 -0.019837521    4.5450349 
+   13650    20.325047    1.0031126    23.644439    6.0467786    4.5426112    1.5041673 0.0014988359 -0.020967245    4.5620797 
+   13660    20.208831    1.0087584    23.680669    6.0499126    4.5372794    1.5126332 0.0017414485 -0.021741299    4.5572792 
+   13670    20.303619    1.0314577    23.664641    6.0537717     4.507101    1.5466708 0.0018939272 -0.022359178    4.5275662 
+   13680     20.06412    1.0173424    23.817625    6.0542945    4.5287896    1.5255049 0.0019489015 -0.022182637    4.5490233 
+   13690    20.135515    1.0051847    23.658106    6.0419099    4.5346355    1.5072744 0.0018508268 -0.021687782    4.5544725 
+   13700     20.05251    1.0249771     23.68044    6.0592851     4.522332    1.5369531 0.0017805021 -0.021470678    4.5420222 
+   13710    20.343678    1.0239363    23.950815    6.0831672    4.5477747    1.5353925 0.0014838436 -0.019657166     4.565948 
+   13720    20.483308   0.99689506    23.844083    6.0584228    4.5635786    1.4948441 0.0014257878 -0.018958298    4.5811111 
+   13730    20.408337   0.98752137    23.507482    6.0215491    4.5407608    1.4807883 0.0015648993 -0.019597635    4.5587936 
+   13740    20.139627   0.98463959    23.593622    5.9944208    4.5179537    1.4764671 0.0017949092 -0.021138128    4.5372969 
+   13750    20.390776   0.99394229    23.782953     6.017966    4.5275495    1.4904165 0.0019130979 -0.022075008    4.5477114 
+   13760    20.257078    1.0173534    23.731297    6.0424636    4.5169422    1.5255214 0.0017703845 -0.021591749    4.5367635 
+   13770     20.26611     1.015305    23.985783    6.0460841    4.5236343    1.5224498 0.0014599316 -0.020139445    4.5423138 
+   13780    20.179211    1.0168089    23.758761    6.0459674    4.5212624    1.5247049 0.0012793877 -0.019235354    4.5392184 
+   13790    20.119622    1.0091942    23.909105    6.0522855    4.5389988    1.5132867 0.0013906246 -0.019459835     4.557068 
+   13800    20.562993     1.024435    23.886234    6.0687015    4.5325612    1.5361403 0.0015576234 -0.020379743    4.5513833 
+   13810    20.329419    1.0016701    23.754497    6.0312527    4.5292484    1.5020043 0.0018020924 -0.021690843    4.5491372 
+   13820    20.333103   0.99049831    23.670525    6.0252539    4.5400016    1.4852522 0.0019517083 -0.022303858    4.5603538 
+   13830    20.087107    1.0080466     23.75817    6.0357394    4.5241735    1.5115659 0.0017841974 -0.021359081    4.5437484 
+   13840    20.322037    1.0111967    23.760768    6.0302338    4.5139445    1.5162894 0.0015388358 -0.020580482    4.5329861 
+   13850    20.458377    1.0104088    23.768546    6.0464315    4.5313235     1.515108 0.0013887536 -0.019864916    4.5497996 
+   13860    20.349844    1.0172291    24.049799    6.0375724    4.5122375     1.525335 0.0014404882 -0.020374751    4.5311717 
+   13870    20.194627    1.0000892    23.899101    6.0387717     4.539138    1.4996338 0.0015250335 -0.020999897    4.5586128 
+   13880    20.278816   0.99513511    23.772187    6.0477925    4.5555874    1.4922051 0.0017017767 -0.021790468    4.5756761 
+   13890    20.171227     1.024556    23.736639    6.0806601    4.5443384    1.5363217 0.0018958947 -0.022767161    4.5652096 
+   13900    20.076817    1.0156596    23.830995    6.0753835    4.5524019    1.5229816 0.0018828339 -0.022821657    4.5733407 
+   13910    20.340298    1.0309842    24.065554    6.0647096    4.5187488    1.5459609 0.0017985451 -0.022520606    4.5394708 
+   13920    20.263594    1.0278289    23.660942     6.083612    4.5423825    1.5412294 0.0017050657 -0.022157435    4.5628349 
+   13930    20.272582    1.0152986    23.682525    6.0679888    4.5455486    1.5224402 0.0017268235 -0.021937133    4.5657589 
+   13940    20.149154   0.99449367    23.939499    6.0284739    4.5372307    1.4912433 0.0016183674 -0.021673879    4.5572862 
+   13950    20.159519    1.0138676    23.593226    6.0312617    4.5109671    1.5202945 0.0014333559 -0.021185102    4.5307189 
+   13960    20.217892    1.0256222      23.8785    6.0409898    4.5030693    1.5379205  0.001305955 -0.020435463    4.5221988 
+   13970    20.030911    1.0062213    23.938665    6.0523923    4.5435635    1.5088288 0.0012418653 -0.019912366     4.562234 
+   13980    20.436487   0.99834109     23.78935     6.037816    4.5408035    1.4970125 0.0012252189 -0.019647407    4.5592257 
+   13990    20.405184      1.01379    23.793829    6.0635383    4.5433602    1.5201782 0.0011829671 -0.019468316    4.5616455 
+   14000    20.262239    1.0050422    23.662819    6.0351668     4.528106    1.5070608 0.0011282847 -0.018952889    4.5459306 
+   14010    20.429268    1.0016171    23.654264    6.0479051    4.5459803    1.5019248 0.0012367309 -0.019458912    4.5642025 
+   14020     20.37101    1.0152529    23.965519     6.063743    4.5413712    1.5223718 0.0013468414 -0.019524335    4.5595487 
+   14030    20.522626    1.0210415    23.585858     6.058015    4.5269633    1.5310517 0.0014921132 -0.020168832      4.54564 
+   14040    20.309866    1.0125519    23.598533    6.0607088    4.5423873    1.5183216 0.0014239076 -0.020122415    4.5610858 
+   14050    20.021019    1.0126388    23.649297    6.0729825    4.5545306    1.5184518 0.0014486309 -0.020342327    4.5734243 
+   14060    19.974297    1.0241197    23.938168    6.0912381    4.5555706    1.5356675 0.0013511584 -0.020009153    4.5742286 
+   14070    20.114129    1.0177175    23.800753      6.05898    4.5329125    1.5260675  0.001330153 -0.019974268    4.5515566 
+   14080    20.376475    1.0143537    23.629843    6.0639943    4.5429709    1.5210234 0.0013990653 -0.019656172     4.561228 
+   14090    20.394608    1.0145926    23.732111    6.0555458    4.5341642    1.5213816  0.001384748 -0.019692791    4.5524723 
+   14100    20.521971    1.0251391    23.710404    6.0747075    4.5375114     1.537196 0.0015183055 -0.020153751    4.5561469 
+   14110    20.305311    1.0278209    23.707886    6.0782333    4.5370159    1.5412174 0.0016190142 -0.020842659    4.5562396 
+   14120    20.007495    1.0242911    23.651958    6.0751315    4.5392069    1.5359246 0.0018911681 -0.022570993    4.5598868 
+   14130    19.999745    1.0280177       23.472    6.0762043    4.5346917    1.5415126 0.0021339225 -0.023522944    4.5560807 
+   14140    20.226017    1.0231422    23.792982    6.0866031    4.5524014    1.5342017 0.0021748535 -0.023638176    4.5738647 
+   14150    20.320134    1.0057622    23.892316    6.0617603    4.5536199    1.5081404 0.0020247061 -0.023365406    4.5749606 
+   14160    20.312304    1.0213609    23.792284    6.0598491    4.5283185    1.5315306 0.0017104571 -0.021729178    4.5483372 
+   14170    20.031581     1.006598    23.802388    6.0572077     4.547814    1.5093938 0.0014926314 -0.021084664     4.567406 
+   14180    20.345163    1.0239419     24.29919    6.0769505    4.5415497    1.5354008 0.0014162868  -0.02079257     4.560926 
+   14190    20.022979    1.0128468     23.88884    6.0721013    4.5533374    1.5187638 0.0016204048 -0.021617973     4.573335 
+   14200     20.17405    1.0075218    23.774424    6.0884015    4.5776225     1.510779 0.0017913561 -0.022227745    4.5980589 
+   14210     20.30842    1.0228555    23.930255    6.0837392    4.5499674    1.5337719 0.0017534007 -0.021945919    4.5701599 
+   14220    20.155831    1.0501524    23.837699    6.0847136    4.5100101    1.5747035 0.0019268332  -0.02277588    4.5308591 
+   14230    20.116613    1.0160373    23.989024    6.0463235    4.5227756    1.5235479 0.0019533366 -0.023075968    4.5438983 
+   14240    20.096489    1.0293797    23.802123    6.0857389    4.5421841    1.5435548 0.0016614469 -0.021966112    4.5624888 
+   14250    20.070034    1.0288513    23.744947    6.0747801    4.5320176    1.5427625 0.0016721899 -0.021878235    4.5522237 
+   14260     19.96577    1.0264123    23.706867    6.0858024     4.546697    1.5391053 0.0017408933 -0.022459883     4.567416 
+   14270     20.38447    1.0449149    24.021074    6.0911746    4.5243247    1.5668499 0.0018917324 -0.022925174    4.5453582 
+   14280    20.159086     1.017383     23.64745    6.0588117    4.5332458    1.5255659  0.002020328 -0.023461776    4.5546873 
+   14290    20.330034     1.019974    23.594705    6.0485544    4.5191034     1.529451 0.0020826687 -0.023877817    4.5408985 
+   14300    20.328412    1.0059506    23.498398    6.0563567    4.5479338    1.5084229 0.0020045565 -0.023658067    4.5695873 
+   14310    20.297042     1.018762    23.751767    6.0530743    4.5254406    1.5276336 0.0020805332 -0.023793077    4.5471532 
+   14320    20.133753    1.0413831    23.805354    6.0696767    4.5081228    1.5615539 0.0019930278   -0.0234734    4.5296032 
+   14330    20.215088    1.0366197    23.419906    6.0796304    4.5252191    1.5544112 0.0020083037 -0.023332406    4.5465432 
+   14340    20.410315    1.0199471     23.59118    6.0652926    4.5358819    1.5294107 0.0020087047 -0.023299599    4.5571728 
+   14350     20.39774    1.0059333    23.652467    6.0199273    4.5115303     1.508397 0.0020972054 -0.023337916    4.5327711 
+   14360     20.38636    0.9982415    23.512036    6.0182671     4.521404    1.4968631 0.0020839011 -0.023315245    4.5426354 
+   14370    20.392255   0.99270217    23.795095    6.0132579     4.524701    1.4885569 0.0020377503 -0.023122873    4.5457861 
+   14380      20.2683    1.0180789    24.087136    6.0239851    4.4973757    1.5266094 0.0020550138 -0.023355764    4.5186764 
+   14390    20.463783    1.0184651    23.794583     6.038233    4.5110446    1.5271884 0.0018960695 -0.022857401    4.5320059 
+   14400    20.136566    0.9965213    23.451251    6.0520366     4.557753    1.4942837 0.0016910939 -0.021640599    4.5777025 
+   14410    19.952476   0.99352898    23.531033     6.022032    4.5322353    1.4897967  0.001357607 -0.020126221    4.5510039 
+   14420     19.83049    1.0053408     23.67221    6.0391203    4.5316119    1.5075085 0.0013990676 -0.020096247     4.550309 
+   14430    20.423376    1.0036485    23.690784    6.0516497    4.5466789    1.5049709   0.00144894 -0.020125438    4.5653554 
+   14440    20.220191    1.0292242     23.81267      6.07296    4.5296384    1.5433216 0.0016054078 -0.020789465    4.5488224 
+   14450    20.343373    1.0196031    23.766219    6.0718333    4.5429384    1.5288949 0.0018046603 -0.021555348     4.562689 
+   14460    20.233422    1.0164975    23.824432    6.0647581    4.5405201     1.524238 0.0019979733 -0.022719729    4.5612418 
+   14470    20.029798    1.0355711    23.736299    6.0808998    4.5280609    1.5528389 0.0018397343 -0.022810475    4.5490316 
+   14480    20.422142    1.0192157    23.848422    6.0604953    4.5321814     1.528314 0.0014197876 -0.021217999    4.5519796 
+   14490    20.306308    1.0344432    23.899626      6.08059    4.5294424    1.5511476 0.0013024666 -0.020260462    4.5484004 
+   14500    19.688316     1.022092    23.606002    6.0766358    4.5440088     1.532627 0.0013524782 -0.019653714      4.56231 
+   14510    20.085546    1.0257792    23.891522    6.0659627    4.5278067    1.5381559 0.0013722879 -0.019307177    4.5457416 
+   14520    20.113101    1.0169716    23.615055    6.0502875    4.5253386    1.5249489 0.0013696114 -0.019218482    4.5431875 
+   14530    19.822921    1.0179434    23.910855    6.0392256    4.5128194    1.5264062 0.0015523673 -0.020268065    4.5315351 
+   14540    20.237557    1.0090051    23.760722    6.0630263    4.5500231    1.5130032 0.0016539862 -0.020903692    4.5692729 
+   14550    20.163666    1.0108798    23.650193    6.0394066    4.5235923    1.5158143 0.0014987923 -0.020599798    4.5426933 
+   14560    20.286429    1.0008318    23.712435    6.0156468    4.5148996    1.5007472 0.0015953792 -0.021166179    4.5344704 
+   14570     20.53543    0.9960561    23.559775    6.0114248    4.5178387    1.4935861 0.0013838196 -0.020343888    4.5367988 
+   14580    20.427245   0.99362302    23.670436    6.0119304    4.5219926    1.4899377 0.0013285341 -0.020235467    4.5408996 
+   14590    20.142548   0.99062008    23.456608    6.0069338    4.5214989    1.4854348 0.0015383872 -0.021064534    4.5410251 
+   14600    19.934488   0.98464087    23.483221    5.9999924    4.5235234     1.476469   0.00175966 -0.022091883    4.5438556 
+   14610    20.482363   0.97300639    23.880015    5.9826167    4.5235937    1.4590231 0.0017972658  -0.02166924    4.5434656 
+   14620    20.257739    1.0102089    23.970721    6.0068217    4.4920134    1.5148083 0.0017152403 -0.021379397    4.5116776 
+   14630    20.523151    1.0093173    23.548555    6.0331182     4.519647    1.5134713 0.0017584138 -0.021859321    4.5397479 
+   14640    20.440619    1.0048857    23.646773    6.0528628    4.5460368     1.506826 0.0017934616  -0.02199869     4.566242 
+   14650    20.380173    1.0096621    23.812307    6.0711138    4.5571255    1.5139883 0.0018667991   -0.0224108    4.5776695 
+   14660    20.052271    1.0080163    23.902795    6.0668096    4.5552892    1.5115205 0.0017780838 -0.021968419    4.5754795 
+   14670    20.275715    1.0224196    23.468417    6.0643296    4.5312113    1.5331182  0.001602564 -0.021521006    4.5511298 
+   14680    20.234415    1.0417547    23.822936    6.1048655    4.5427543    1.5621112    0.0016103 -0.021377205    4.5625212 
+   14690    20.260977    1.0390392    23.647268       6.0887    4.5306607    1.5580394 0.0015745481 -0.020860738    4.5499469 
+   14700     20.10192    1.0238381    23.780606     6.104143    4.5688977    1.5352453  0.001730378 -0.021677231    4.5888446 
+   14710    20.423827    1.0131163    23.498571    6.0746608    4.5554929    1.5191679 0.0018722813 -0.021907615    4.5755282 
+   14720    20.349591    1.0285135     23.79547    6.0988296    4.5565736    1.5422559 0.0018866989 -0.022088364    4.5767753 
+   14730    19.719207    1.0214124    23.842121    6.0737535    4.5421455    1.5316079  0.001737139 -0.021477161    4.5618856 
+   14740    20.243435    1.0170056     23.55263    6.0753427    4.5503428    1.5249999 0.0017100943 -0.021115903    4.5697486 
+   14750    20.349464    1.0168578    23.676831    6.0539195    4.5291413    1.5247783 0.0016472621 -0.021016409    4.5485104 
+   14760     20.20968    1.0083669    23.725544    6.0404119    4.5283657    1.5120462 0.0014789925 -0.020250959    4.5471377 
+   14770    20.246097    1.0079654    23.926976    6.0438832    4.5324391    1.5114442 0.0013845963 -0.019606897    4.5506614 
+   14780    20.347929    1.0049872    23.853146    6.0834187    4.5764403    1.5069783 0.0013922623 -0.019440195    4.5944883 
+   14790    20.267728    1.0088973    23.989947    6.0677945     4.554953    1.5128415 0.0014611895 -0.019584672    4.5730765 
+   14800    20.249851    0.9973285    23.585061    6.0435321     4.548038    1.4954941  0.001464315 -0.019002176    4.5655759 
+   14810    20.309692    1.0043419    23.786736    6.0438658    4.5378551    1.5060107 0.0014583976 -0.018746311     4.555143 
+   14820    20.175753    1.0076708    23.720507    6.0436391    4.5326368    1.5110023 0.0013952521 -0.018534918    4.5497764 
+   14830    20.159473    1.0249789    23.331654    6.0461248    4.5091689    1.5369559  0.001359533  -0.01874454    4.5265539 
+   14840    20.219891    1.0102857    23.738547    6.0598649    4.5449415    1.5149234 0.0012764109 -0.018315048    4.5619802 
+   14850     20.31281   0.99304789    23.806688    6.0382274     4.549152    1.4890753 0.0014810631 -0.019645602    4.5673166 
+   14860    20.354628    1.0100314    23.760971    6.0448439    4.5303019     1.514542 0.0016619211 -0.020894052     4.549534 
+   14870    19.965649    1.0144882    23.934988     6.058458    4.5372329    1.5212251  0.001634602  -0.02130345    4.5569018 
+   14880    20.457739    1.0129891    23.723918    6.0480883    4.5291111    1.5189772  0.001568249 -0.021483348    4.5490262 
+   14890    20.492512    1.0074728    23.831536    6.0265757    4.5158702    1.5107055 0.0016633566 -0.022029677    4.5362365 
+   14900    20.224374    1.0042849    23.619519    6.0484555    4.5425304    1.5059252 0.0017525295 -0.022824074    4.5636019 
+   14910    20.418763    1.0212467     23.79295    6.0550153    4.5236558    1.5313594 0.0018275785 -0.023253809    4.5450821 
+   14920    20.315453   0.99922307    23.799448    6.0442197    4.5458847     1.498335 0.0017307311 -0.022839478    4.5669934 
+   14930    20.449646      1.00251    23.882229    6.0394608     4.536197    1.5032638 0.0017264422 -0.022614344    4.5570849 
+   14940    20.020737    1.0137723    23.845772    6.0340976    4.5139461    1.5201515 0.0017031315 -0.022381342    4.5346244 
+   14950    20.284788    1.0182255    23.515734    6.0627737    4.5359446    1.5268291  0.001865953 -0.022756226    4.5568348 
+   14960    19.833724    1.0268274    23.692001    6.0599886     4.520261    1.5397276 0.0018100906  -0.02269185    4.5411427 
+   14970    20.365879    1.0136715    23.564031    6.0377795    4.5177791    1.5200004 0.0018375721 -0.022803064    4.5387446 
+   14980    20.289658    1.0073219    23.693094    6.0405439    4.5300647    1.5104792 0.0018187694 -0.022526461    4.5507724 
+   14990    19.975911    1.0119382    24.052298    6.0183901    4.5009889    1.5174013 0.0017119778 -0.022101968    4.5213789 
+   15000    19.997068    1.0091337    23.839942     6.037011     4.523815    1.5131959 0.0016445102 -0.021522579    4.5436931 
+   15010    20.483231     1.015107    23.875029    6.0477593    4.5256064     1.522153 0.0017750845 -0.021879637    4.5457109 
+   15020    20.530052    1.0110344    23.684352    6.0699442    4.5538981    1.5160461 0.0018540177 -0.022049542    4.5740936 
+   15030    20.363449    1.0223864    23.627304    6.0789188    4.5458504    1.5330684 0.0016695703 -0.021430398    4.5656113 
+   15040    20.307387    1.0274814    23.484697    6.0495886    4.5088803    1.5407083 0.0014192894  -0.02046048    4.5279215 
+   15050    20.388148   0.99096314     23.56677    6.0238027    4.5378535    1.4859492 0.0013385475 -0.020365234    4.5568802 
+   15060    20.427318    1.0019619    23.670942    6.0076265    4.5051846    1.5024419 0.0013828472  -0.02048441    4.5242861 
+   15070    20.591199   0.99231619    23.637196    6.0052776    4.5172995    1.4879781 0.0014051836 -0.020306292    4.5362006 
+   15080    20.326394   0.98426705     23.54683    6.0038353    4.5279269    1.4759084 0.0014891056 -0.020007394    4.5464451 
+   15090    20.135202   0.97576564    24.002135    6.0011924    4.5380318    1.4631606 0.0013679461 -0.019457811    4.5561217 
+   15100    20.379781   0.99244389    23.699453    5.9904086     4.502239    1.4881696 0.0014991496 -0.019996606    4.5207364 
+   15110    20.330365   0.98366248     23.64745    6.0026258    4.5276239    1.4750019 0.0015546854 -0.020454335    4.5465236 
+   15120    20.222139   0.99115895    23.642015    6.0202051    4.5339623    1.4862429 0.0017416881 -0.021364586    4.5535852 
+   15130    20.266432   0.98260273    23.691918    6.0120195    4.5386067    1.4734128 0.0018505829  -0.02232941    4.5590856 
+   15140     20.05258    1.0099169    23.818826     6.023809    4.5094386    1.5143704 0.0017514084 -0.021897513    4.5295847 
+   15150     20.25355    0.9947939      23.8945    6.0147233    4.5230298    1.4916934 0.0016664251  -0.02157915    4.5429426 
+   15160    20.157063   0.99867059    23.800603    6.0386226    4.5411161    1.4975065   0.00167868 -0.021546446    4.5609839 
+   15170      20.2578    1.0120474    23.489134    6.0178397    4.5002746    1.5175651 0.0015528377 -0.021188029    4.5199098 
+   15180    20.256499   0.99392197    24.005636     6.020975     4.530589     1.490386 0.0012246732 -0.019603169    4.5489675 
+   15190    20.376705   0.99466022    23.782069    6.0363278    4.5448348     1.491493 0.0011300728 -0.019320512    4.5630252 
+   15200    20.242522     1.015085    23.740642    6.0373398    4.5152199    1.5221199  0.001079802 -0.018823011    4.5329631 
+   15210     20.15458   0.99268119    23.633128     6.035558    4.5470326    1.4885254 0.0011741447 -0.019841316    4.5656998 
+   15220    20.277662    1.0017729    23.639225    6.0681081    4.5659496    1.5021585  0.001315919 -0.021100014    4.5857337 
+   15230    20.149014    1.0261959    23.693086    6.0667415    4.5279607    1.5387808 0.0012331306 -0.020703447     4.547431 
+   15240    20.199678    1.0146082    23.583693    6.0477262    4.5263212     1.521405 0.0013020303 -0.020950688    4.5459699 
+   15250    20.338259   0.99695723    23.609727    6.0469606    4.5520233    1.4949374 0.0014983375 -0.021667395    4.5721923 
+   15260    19.979618    1.0164515    23.464755    6.0651081    4.5409391     1.524169 0.0016462284 -0.022453619    4.5617464 
+   15270    20.216014    1.0224266    23.954774    6.0746795    4.5415508    1.5331287 0.0017821162  -0.02273604    4.5625048 
+   15280    20.303869    1.0244403    23.836571    6.0797167    4.5435684    1.5361483 0.0017951375 -0.022865368    4.5646387 
+   15290    20.136384    1.0228034    23.845971    6.0581477     4.524454    1.5336937 0.0019286668 -0.023091115    4.5456165 
+   15300    20.407015    1.0232169      23.7754    6.0484293    4.5141156    1.5343137 0.0019776938 -0.022914481    4.5350524 
+   15310     20.26228    1.0060096     23.57633    6.0658699    4.5573585    1.5085113 0.0020998392 -0.023502969    4.5787617 
+   15320    20.354106    1.0060809    23.686328     6.042565    4.5339468    1.5086183 0.0022373572 -0.024233458    4.5559429 
+   15330    20.308254    1.0112252    23.762903    6.0511779    4.5348458    1.5163322 0.0020723482 -0.023828312    4.5566017 
+   15340    20.300902    1.0214574    23.591953    6.0750341    4.5433587    1.5316754 0.0020063702  -0.02335167     4.564704 
+   15350    20.191769    1.0210184    23.576116    6.0622493    4.5312323     1.531017 0.0017553617 -0.021947806    4.5514247 
+   15360    20.470142    1.0030025    23.938754    6.0454725    4.5414702    1.5040023 0.0015823889 -0.020983824    4.5608716 
+   15370    20.240815    1.0073252    23.812311    6.0596226    4.5491384    1.5104841 0.0016165206 -0.021025024    4.5685469 
+   15380    20.205982     1.001354    23.580834    6.0342828    4.5327525    1.5015303 0.0016944281 -0.020698184    4.5517562 
+   15390    20.345499    1.0158315    23.668477    6.0655935    4.5423542    1.5232393 0.0016384544 -0.019833923    4.5605497 
+   15400     20.36007    1.0107992    23.836292    6.0710391    4.5553456    1.5156935 0.0016389663 -0.019981479    4.5736881 
+   15410     20.18678   0.99138452    23.523908    6.0221361     4.535555    1.4865811 0.0014189832 -0.019093694    4.5532298 
+   15420    20.291408   0.99637039    23.488253     6.010289    4.5162316    1.4940574 0.0015750537 -0.019785832    4.5344424 
+   15430    20.480378    0.9870944    23.647327    6.0007953    4.5206472    1.4801481  0.001561364 -0.019871067    4.5389569 
+   15440    20.399549   0.99346984    23.493016    6.0001554    4.5104473     1.489708 0.0015928254 -0.019972597    4.5288271 
+   15450    20.202521   0.97379298    23.641261    6.0033263    4.5431238    1.4602026 0.0017516246 -0.021362916     4.562735 
+   15460    20.136637    1.0008382    23.795229    6.0128962    4.5121394    1.5007569 0.0017129018  -0.02128767    4.5317141 
+   15470    20.033046   0.99353769    23.595017    6.0139907    4.5241809    1.4898098 0.0017129046 -0.021353741    4.5438218 
+   15480    20.377957    0.9961153    23.586288    6.0161762    4.5225013    1.4936749 0.0017857568 -0.021760887    4.5424764 
+   15490    20.351866    1.0018026    23.512845    6.0381195    4.5359165     1.502203 0.0018906282  -0.02216463    4.5561905 
+   15500    20.247713    1.0202259     23.53587    6.0538148     4.523986    1.5298288 0.0018742887 -0.022326439    4.5444381 
+   15510     20.15804    1.0111346     23.90559    6.0533556    4.5371592    1.5161964 0.0019773938 -0.022881762    4.5580636 
+   15520    20.536661    1.0031267    23.458503    6.0383176    4.5341291    1.5041885 0.0019842999 -0.023051994    4.5551968 
+   15530    20.053986    1.0010454     23.60366    6.0193958    4.5183282    1.5010676 0.0019089993 -0.022711372    4.5391305 
+   15540    20.422063   0.97813937    23.133515    5.9940434    4.5273234      1.46672 0.0017819356 -0.022061201    4.5476027 
+   15550     20.35469   0.97680578    23.551854    5.9977648    4.5330445    1.4647203 0.0018834531 -0.022393061    4.5535541 
+   15560    20.252578   0.97786972    23.557444    5.9974551    4.5311394    1.4663156 0.0019081733 -0.022740201    4.5519715 
+   15570    19.862176   0.99292925    23.823939    6.0122074      4.52331    1.4888974  0.001918914 -0.022966443    4.5443575 
+   15580    20.394853    1.0209335    23.731201    6.0534759    4.5225861    1.5308898 0.0019784908 -0.022936742    4.5435443 
+   15590    20.526207    1.0024995    23.564518    6.0462177    4.5429697     1.503248 0.0018474194  -0.02234779      4.56347 
+   15600    20.163149   0.98582017    23.770294    6.0103614     4.532124    1.4782373 0.0018420792 -0.022338756    4.5526207 
+   15610    20.131793    1.0001781     23.54526     6.031804    4.5320369    1.4997671 0.0018140104 -0.022195753    4.5524186 
+   15620    20.217061   0.99657688    23.663898    6.0182911     4.523924     1.494367 0.0017759423  -0.02204777    4.5441958 
+   15630    20.071994   0.99789928     23.45695    6.0107192    4.5143692      1.49635 0.0016422297 -0.021340782    4.5340677 
+   15640    20.333491    0.9836993    23.641729    5.9988856    4.5238285    1.4750571 0.0016471656 -0.021154938    4.5433362 
+   15650    20.142275   0.98424078    23.517181    5.9925332    4.5166641    1.4758691 0.0017077902 -0.021490106    4.5364464 
+   15660    20.249554    1.0020939    23.474018    6.0053169    4.5026772    1.5026398 0.0016614942 -0.021535605    4.5225513 
+   15670    20.331198    0.9796384    23.646847    6.0126069    4.5436392    1.4689678 0.0016108269 -0.021650813    4.5636792 
+   15680    20.257575   0.99618912    23.711798    6.0399995    4.5462139    1.4937856 0.0016276169 -0.021722695     4.566309 
+   15690    20.531097     1.002513    23.842836    6.0189952     4.515727    1.5032682 0.0014846174 -0.020825231    4.5350676 
+   15700    20.346874    1.0204462    23.806563    6.0805442    4.5503851    1.5301591 0.0015495301  -0.02068441      4.56952 
+   15710     20.51374     1.018098    23.735245    6.0638253    4.5371874    1.5266379 0.0016884833 -0.021282389    4.5567813 
+   15720    20.092249    1.0149671    23.709002    6.0437694    4.5218262    1.5219431 0.0016492869 -0.021086358    4.5412633 
+   15730    20.371624    1.0109544    23.726862     6.045289    4.5293629    1.5159261 0.0016275889 -0.020635174    4.5483705 
+   15740     20.52456    1.0164467    23.678027    6.0556988    4.5315369    1.5241618 0.0016449934 -0.020877507    4.5507694 
+   15750    20.134872    1.0067893    23.883261    6.0197738    4.5100933    1.5096805 0.0018148004 -0.022184922    4.5304634 
+   15760    20.048818    1.0057103    23.541088     6.055691    4.5476285    1.5080625 0.0018245164  -0.02230719    4.5681112 
+   15770    20.079501   0.99288296    23.471643    6.0382016    4.5493736     1.488828 0.0017385815 -0.022192001     4.569827 
+   15780     20.14364   0.99599415    23.505062    6.0271928    4.5336995    1.4934932 0.0016771156 -0.022241205    4.5542636 
+   15790    20.269076   0.97768254    23.460885    6.0025229     4.536488     1.466035 0.0015579241 -0.021416043    4.5563461 
+   15800    20.046845   0.99394392    23.756638    6.0107132    4.5202943    1.4904189 0.0014515666 -0.020822024    4.5396647 
+   15810     20.34862   0.99270791    23.304251    6.0042293    4.5156638    1.4885655  0.001438877 -0.020402474    4.5346274 
+   15820    20.183066   0.99765095    23.672085    6.0225162    4.5265386    1.4959776 0.0013695229 -0.020093054    4.5452621 
+   15830     20.36965    0.9992199    23.691215    6.0284951    4.5301648    1.4983302 0.0014517129  -0.02041175    4.5491249 
+   15840    20.333943   0.98833857    23.552923    6.0174699    4.5354562    1.4820137 0.0016180221 -0.021047676    4.5548859 
+   15850    20.135935    1.0114088    23.956053    6.0514699    4.5348624    1.5166075 0.0017050056 -0.021381685    4.5545391 
+   15860    20.229459    1.0293503    23.761863    6.0491986    4.5056877    1.5435108 0.0014837514 -0.020370576    4.5245746 
+   15870    20.048297    1.0182501    23.364365    6.0634229    4.5365569     1.526866 0.0013559502 -0.020005103     4.555206 
+   15880    20.233794    1.0073761    23.534552    6.0529412    4.5423808    1.5105604 0.0013616414 -0.020135134    4.5611543 
+   15890    20.291684    1.0278538     24.13331    6.0682087    4.5269419    1.5412667 0.0014202997 -0.020342638    4.5458643 
+   15900    19.960951    1.0044849    23.782529    6.0371814    4.5309563    1.5062251 0.0015258191 -0.020759528      4.55019 
+   15910     19.96814   0.99842476    23.498984    6.0284952    4.5313572    1.4971379 0.0016911949 -0.021624874    4.5512909 
+   15920    19.877896    1.0160012    23.520221    6.0277525    4.5042586    1.5234938 0.0017749585 -0.022078394     4.524562 
+   15930    20.024448    1.0234049    23.402103    6.0388383    4.5042426    1.5345957 0.0017886661  -0.02239097    4.5248449 
+   15940    20.261715   0.99581523    23.723675    6.0320453    4.5388203    1.4932249   0.00153766 -0.021507828    4.5587905 
+   15950    20.153886     1.014659    23.647009    6.0586919    4.5372107    1.5214812 0.0015714923 -0.021630765      4.55727 
+   15960    20.426579    1.0203225    23.765723    6.0658496     4.535876    1.5299736 0.0018249241  -0.02244946    4.5565006 
+   15970      20.3653      1.01493    23.837013    6.0706882    4.5488007    1.5218875 0.0019366464 -0.022732441    4.5695965 
+   15980    20.362029    1.0212676    23.788509    6.0611523    4.5297615    1.5313908 0.0019414916 -0.022626906    4.5504469 
+   15990    20.217369    1.0041561    23.578719    6.0533196    4.5475875    1.5057321 0.0017965156 -0.021841009     4.567632 
+   16000    19.725462    1.0381194    24.088478    6.0840585    4.5273985    1.5566601 0.0017746344 -0.021756636    4.5473805 
+   16010    20.229161    1.0249298    24.018872    6.0923329    4.5554507    1.5368822  0.002001166 -0.022928159    4.5763777 
+   16020     19.94768    1.0455669    23.937036    6.1077905     4.539963    1.5678275 0.0020432584 -0.023157095    4.5610768 
+   16030    20.291323    1.0349634     23.60577    6.1046674    4.5527397    1.5519277 0.0020752379 -0.023220554     4.573885 
+   16040    20.440754    1.0212211    23.759567    6.0809984    4.5496773    1.5313211 0.0020228653 -0.023011237    4.5706657 
+   16050    20.203013    1.0383399    24.094393    6.0794155    4.5224248    1.5569907 0.0019116215 -0.022575139    4.5430883 
+   16060    20.369325    1.0195774    23.673679    6.0434609    4.5146046    1.5288564 0.0018249262 -0.021888745    4.5346684 
+   16070    20.141503   0.99435602    23.690581    6.0412434    4.5502066    1.4910369 0.0016835536  -0.02141951    4.5699425 
+   16080    19.827636     1.006356    23.737779    6.0357162    4.5266854    1.5090308 0.0017583746 -0.021827377    4.5467544 
+   16090     20.08588     1.011465    23.545122    6.0196236    4.5029318    1.5166918 0.0017328756 -0.021211981    4.5224109 
+   16100    20.295011    1.0073031     23.66191     6.017408    4.5069569     1.510451 0.0017872648 -0.021383976    4.5265537 
+   16110    20.631885   0.99735161     23.77791    6.0201775    4.5246487    1.4955287 0.0017949529 -0.021443687    4.5442975 
+   16120    20.124564   0.99751541    23.757024    6.0145443    4.5187699    1.4957744 0.0016193809 -0.021070412     4.538221 
+   16130      20.2986    1.0083061    23.899415    6.0229981     4.511043    1.5119551 0.0015065768 -0.020771973    4.5303084 
+   16140     20.47056    1.0225016    23.876987    6.0619944    4.5287531    1.5332412 0.0017211643 -0.022117109    4.5491491 
+   16150     20.41724    1.0190017    23.916527    6.0495366    4.5215435    1.5279931 0.0015820807 -0.021570585     4.541532 
+   16160    20.064624    1.0118627    23.591727    6.0693738    4.5520856    1.5172882 0.0015323332  -0.02125848    4.5718118 
+   16170    20.036576    1.0226161    23.872673     6.057934    4.5245212    1.5334129 0.0019171776 -0.022891288    4.5454953 
+   16180    20.360752    1.0030266    23.763954    6.0424377    4.5383994    1.5040383 0.0019894492 -0.023345737    4.5597557 
+   16190    20.063389    1.0102962    23.701565    6.0554692      4.54053    1.5149391 0.0018604251 -0.022741599    4.5614112 
+   16200    20.317138   0.99862112    23.455238    6.0220467    4.5246143    1.4974324 0.0018767932 -0.022716624    4.5454541 
+   16210    20.402199    1.0015244    23.769043    6.0262734    4.5244876    1.5017858 0.0018825718 -0.022463307    4.5450683 
+   16220    20.335533    1.0208483    23.997961    6.0316298    4.5008677     1.530762 0.0019681777  -0.02296121    4.5218608 
+   16230    20.312639    1.0111136    23.697445    6.0396987    4.5235338    1.5161649 0.0020622524 -0.023446102    4.5449176 
+   16240    20.250141    1.0085549    23.812495    6.0356452    4.5233171    1.5123281 0.0021659385 -0.024058564    4.5452097 
+   16250     20.42743    1.0051302    23.534279    6.0469832    4.5397905    1.5071927 0.0020847432 -0.023698865    4.5614046 
+   16260    20.398591    1.0027437    23.349857    6.0440745    4.5404604    1.5036141 0.0021338474 -0.023840927    4.5621675 
+   16270    20.503968    1.0027703    23.711407    6.0095811    4.5059271     1.503654 0.0020671559  -0.02348801    4.5273479 
+   16280    20.316993   0.99463837    23.566332    6.0171855    4.5257253    1.4914602 0.0019560903  -0.02293084       4.5467 
+   16290    20.111684    1.0154812    23.613084    6.0507454    4.5280313    1.5227141 0.0018148365 -0.022112212    4.5483287 
+   16300    20.174855    1.0000247     23.60987    6.0426257    4.5430887     1.499537 0.0019106913 -0.022387494    4.5635655 
+   16310    20.323942    1.0170612    23.633109    6.0456032    4.5205199    1.5250833 0.0018173405  -0.02166345     4.540366 
+   16320    20.162949    1.0319672    23.722645    6.0829744    4.5355395    1.5474348 0.0017945214 -0.021359163    4.5551042 
+   16330    20.364622    1.0132544    23.874614     6.058134    4.5387591     1.519375 0.0017528033  -0.02080171     4.557808 
+   16340    20.211091    1.0106903    23.877707    6.0822983    4.5667682    1.5155301  0.001792538  -0.02089273    4.5858684 
+   16350    20.291191    1.0405086    23.854397    6.1129646    4.5527219    1.5602427 0.0018061962 -0.021136646    4.5720524 
+   16360     20.30213    1.0569902    23.762638    6.1129322    4.5279753    1.5849568 0.0017544699 -0.021495659    4.5477165 
+   16370    20.392083    1.0171222    23.929853    6.0672079    4.5420332    1.5251747 0.0016825675 -0.021203034    4.5615537 
+   16380    20.332756    1.0284218    23.804275    6.0486982    4.5065797    1.5421185 0.0016953557 -0.021202917    4.5260873 
+   16390    20.140982     1.031676     23.54811    6.0644766    4.5174784    1.5469981  0.001622118 -0.020666016    4.5365223 
+   16400    20.216163    1.0086311    23.400316     6.051394    4.5389517    1.5124424 0.0016519583 -0.020812712    4.5581124 
+   16410    20.103032   0.99806946    23.628754    6.0509007    4.5542955    1.4966052 0.0015068024 -0.019876378    4.5726651 
+   16420    20.199162   0.98838328    23.613616    6.0388964    4.5568156    1.4820807 0.0014811509 -0.019696329    4.5750308 
+   16430    20.127043    1.0001095    23.725973    6.0272211     4.527557    1.4996641 0.0015141522 -0.020263147     4.546306 
+   16440    20.385968    1.0090362    23.984519    6.0588859    4.5458361    1.5130498 0.0016295723 -0.020828666    4.5650352 
+   16450    19.826661    1.0106394    23.729207    6.0430649    4.5276112    1.5154537 0.0015112633 -0.020393899    4.5464938 
+   16460     19.78603   0.98537876    23.785168    6.0114235    4.5338481    1.4775754 0.0013119353 -0.018897341    4.5514335 
+   16470    20.558191   0.98890247    23.785979    6.0175903    4.5347311    1.4828593 0.0014408102 -0.019619117    4.5529094 
+   16480    20.371459   0.98934171    23.649028    6.0118463    4.5283284    1.4835179 0.0016778284 -0.020580627    4.5472312 
+   16490    20.184848     1.001988    23.737823    6.0052556    4.5027746     1.502481 0.0018435748 -0.021146172    4.5220772 
+   16500    20.269323    1.0069335    23.725948    6.0233173    4.5134205    1.5098968 0.0018033035 -0.020842905    4.5324601 
+   16510    20.371016   0.99475438     23.69472    6.0375679    4.5459337    1.4916342 0.0017831385 -0.020638375    4.5647889 
+   16520    20.177662    1.0090861    23.579136    6.0207581    4.5076335    1.5131246 0.0016463905 -0.020555298    4.5265424 
+   16530    20.346211   0.98705765    23.653645    6.0071166    4.5270236    1.4800929 0.0019291229 -0.021999392    4.5470939 
+   16540    20.380189   0.99038678    23.902308    6.0155201    4.5304352     1.485085 0.0020625401 -0.023144239    4.5515169 
+   16550    20.162614    1.0049992    23.690076    6.0107738    4.5037775    1.5069963 0.0022854009 -0.024044353    4.5255364 
+   16560    20.219028   0.99372109    23.858618     6.020629    4.5305442    1.4900848  0.002326814 -0.024661026    4.5528784 
+   16570    20.005535    1.0029057    23.766268    6.0312826    4.5274256    1.5038571 0.0020947919 -0.023805632    4.5491364 
+   16580    19.956803    0.9931175    23.532722    6.0341028    4.5449231    1.4891797 0.0020436398 -0.023329524     4.566209 
+   16590    20.222464     1.017994     23.66108    6.0400399    4.5135579     1.526482  0.001989121 -0.022980243    4.5345491 
+   16600    20.061326    1.0037343     23.87336    6.0402939    4.5351942    1.5050997 0.0019159057 -0.022850197    4.5561285 
+   16610    20.391202    1.0062648    23.669012    6.0562172    4.5473231     1.508894 0.0017079673 -0.021730139    4.5673453 
+   16620    20.401913    1.0319111    23.822952     6.085383    4.5380323    1.5473508 0.0016866889 -0.021402928    4.5577485 
+   16630    20.063947    1.0223621    23.877951    6.0633073    4.5302753     1.533032 0.0017435596 -0.021717473    4.5502492 
+   16640    20.183341    1.0156471    23.877535    6.0752239     4.552261    1.5229628 0.0016404668 -0.021646798    4.5722674 
+   16650    20.071173    1.0230155    23.635638    6.0759511    4.5419393    1.5340118 0.0015955788 -0.021486251      4.56183 
+   16660    20.216495    1.0361806    23.701486    6.1025405    4.5487877    1.5537528 0.0017081667 -0.021947186    4.5690267 
+   16670    20.135433    1.0230232    23.729309    6.0722633    4.5382401    1.5340232 0.0018058668 -0.022547758     4.558982 
+   16680    20.122238    1.0096563    23.663978    6.0509862    4.5370065    1.5139796 0.0018974514 -0.023048733    4.5581578 
+   16690    20.166666    1.0151795    23.843312    6.0576319    4.5353702    1.5222617 0.0020425623 -0.023835368     4.557163 
+   16700    20.050513    1.0387369    23.759565    6.0715062    4.5139202     1.557586 0.0020181414 -0.023293273    4.5351954 
+   16710    20.092098    1.0057161    23.579887    6.0519136    4.5438422    1.5080714 0.0018907655 -0.022445432    4.5643969 
+   16720    20.170722    1.0050866    23.697134    6.0279928    4.5208654    1.5071274 0.0020237672 -0.022665853    4.5415075 
+   16730    20.297028   0.98464541    23.579689    6.0139077    4.5374319    1.4764758 0.0018638025 -0.022157911     4.557726 
+   16740    20.441124   0.99742666    23.647484    6.0293394    4.5336981    1.4956413 0.0017632622 -0.021792136     4.553727 
+   16750    20.201829    1.0012951    23.404146    6.0218995    4.5204574    1.5014421 0.0017318909 -0.021721124    4.5404467 
+   16760    20.217867     1.011123    23.732473    6.0360288    4.5198499    1.5161789 0.0018640374 -0.022481316    4.5404672 
+   16770    20.225253   0.99979886     23.60054    6.0151796    4.5159813    1.4991984 0.0018240066 -0.021920846    4.5360781 
+   16780    20.165993   0.99648062    23.583388    6.0189228    4.5247001    1.4942227 0.0016995359 -0.021145065    4.5441456 
+   16790    20.309164    1.0071407    23.610173    6.0369979    4.5267903    1.5102075 0.0017845543 -0.021455742    4.5464615 
+   16800    20.198518   0.98821003    23.901223    6.0238487    4.5420278    1.4818209 0.0015350358 -0.020451382    4.5609441 
+   16810    19.855754   0.99535074     23.59434    6.0122517    4.5197233    1.4925284 0.0014973492 -0.020577765    4.5388037 
+   16820    20.265465   0.99314641    23.582032    6.0177637    4.5285406     1.489223 0.0015832961 -0.021350409    4.5483077 
+   16830    20.124756    1.0276887    23.743043    6.0709321    4.5299128    1.5410193 0.0016407316 -0.021145731    4.5494178 
+   16840    20.089507     0.998585    23.685026    6.0598043    4.5624261    1.4973782 0.0016388924 -0.020998361    4.5817855 
+   16850     20.15829    1.0167302     23.36113    6.0627317    4.5381448    1.5245869  0.001526261 -0.020440973    4.5570595 
+   16860    20.116272    1.0201162    23.943771    6.0643529    4.5346887    1.5296642 0.0014962654 -0.020483457    4.5536759 
+   16870    20.220116    1.0287026    23.726381    6.0928792    4.5503396    1.5425396  0.001474732 -0.020564235    4.5694291 
+   16880    20.175529    1.0139303    23.756982    6.0535366    4.5331481    1.5203885 0.0014722377 -0.020642923    4.5523188 
+   16890    20.263455    1.0294806    23.492541    6.0738503    4.5301442    1.5437061 0.0012674801 -0.019862669    4.5487394 
+   16900    20.359122    1.0267689     23.47732    6.0879513    4.5483113      1.53964 0.0013978253 -0.020362862    4.5672764 
+   16910    19.994457    1.0284877    23.645746    6.1044513     4.562234    1.5422173  0.001586998  -0.02121292    4.5818599 
+   16920     20.12003    1.0087655    23.562172    6.0881744    4.5755306    1.5126439 0.0019114598 -0.022240944      4.59586 
+   16930    20.393978    1.0267134    23.505106    6.0794741    4.5399174    1.5395567 0.0019225945 -0.022577075    4.5605719 
+   16940    20.243764    1.0344262     23.54892    6.0964175    4.5452953    1.5511221 0.0019489127  -0.02308431    4.5664307 
+   16950    20.148224    1.0251311    23.699938    6.0739311     4.536747    1.5371841 0.0019610254  -0.02292712    4.5577131 
+   16960    20.012084    1.0449623    23.975788    6.0896287    4.5227077     1.566921  0.001782828 -0.021964251    4.5428891 
+   16970    20.165445    1.0341755     24.09059    6.1075209    4.5567747    1.5507461 0.0015536095 -0.020804798    4.5760259 
+   16980    20.008885    1.0379242    23.845778    6.0970119    4.5406446    1.5563673 0.0016938079  -0.02102655    4.5599773 
+   16990    20.238247    1.0393295    23.871239    6.1185478    4.5600732    1.5584746 0.0016239523 -0.019841281    4.5782906 
+   17000    20.424351    1.0286467     23.97387     6.090861    4.5484053    1.5424557 0.0015266536 -0.018979659    4.5658583 
+   17010    20.288364     1.049118    23.759931    6.1065582    4.5334058    1.5731524 0.0016770201 -0.019805852    4.5515346 
+   17020    20.306871    1.0250025    23.603845    6.1004384    4.5634471    1.5369913 0.0016732383  -0.02009016     4.581864 
+   17030    20.187116    1.0432236    23.899358    6.0924018    4.5280881    1.5643137 0.0014640814 -0.019626042    4.5462501 
+   17040    20.143604    1.0048081    23.853787    6.0351231    4.5284134    1.5067098  0.001642006 -0.020783144    4.5475545 
+   17050     20.65798    1.0226237    23.753985    6.0504939    4.5170697    1.5334243 0.0017921915 -0.021386864    4.5366643 
+   17060    20.216496    1.0074733    23.789952    6.0815671    4.5708609    1.5107062 0.0017902793 -0.021167966    4.5902386 
+   17070    20.362044    1.0142307    24.038247    6.0637645    4.5429256    1.5208389  0.001679679  -0.02082329    4.5620692 
+   17080    19.911333    1.0225366    23.804348     6.070701    4.5374073    1.5332937 0.0015327125 -0.020726919    4.5566015 
+   17090    20.201956       1.0277     24.06584    6.0664352    4.5253991    1.5410361 0.0016621494 -0.021554124    4.5452911 
+   17100    20.322479    1.0091364    23.605675    6.0411605    4.5279605       1.5132 0.0017921313 -0.022345451    4.5485139 
+   17110    20.313671    1.0017413    23.599283     6.033453     4.531342     1.502111 0.0018173237 -0.022685796    4.5522105 
+   17120    20.055214    1.0068048    23.855988    6.0672128     4.557509    1.5097038  0.002031198 -0.023571295     4.579049 
+   17130    20.506408    1.0095947    23.597503     6.042982    4.5290948    1.5138872 0.0019727099 -0.023377598    4.5504996 
+   17140    20.318244    1.0123224    23.917755    6.0649194     4.546942    1.5179775 0.0020830358 -0.023632389    4.5684913 
+   17150    20.083662    1.0230746    23.889256    6.0664819    4.5323815    1.5341004 0.0021354682 -0.024292967     4.554539 
+   17160    20.148325    1.0013806    23.767346    6.0718887    4.5703185    1.5015702  0.002043971  -0.02402282    4.5922974 
+   17170    20.520758    1.0243803    24.032427    6.0787473    4.5426891    1.5360582 0.0020477522 -0.024081272    4.5647226 
+   17180    20.488283    1.0356676    23.876224    6.0884718    4.5354882    1.5529836 0.0020290813  -0.02406941    4.5575285 
+   17190    20.549344    1.0130275    23.603266    6.0723484    4.5533137    1.5190347 0.0019145949 -0.023307272    4.5747064 
+   17200    20.417182    1.0278531    24.098181    6.0961068     4.554841    1.5412658 0.0017057883 -0.022253868    4.5753891 
+   17210    20.400637    1.0358415    23.801765      6.07092    4.5176756    1.5532443 0.0015982578 -0.021701764    4.5377792 
+   17220    20.105129    1.0155825    23.188736    6.0672267    4.5443607     1.522866 0.0015647215 -0.021392866    4.5641888 
+   17230    20.332274    1.0159685    23.730306    6.0469142    4.5234695    1.5234448  0.001665296 -0.021340149    4.5431443 
+   17240    20.348322   0.99523592    23.580276    6.0301765    4.5378202    1.4923563 0.0018116211 -0.022205741    4.5582143 
+   17250    19.817014   0.99644395    23.881495    6.0327612    4.5385935    1.4941677 0.0019227005 -0.022600679    4.5592714 
+   17260    20.199943    1.0023264    23.704932     6.034623    4.5316345    1.5029885 0.0019331459 -0.022645482    4.5523469 
+   17270    20.361675    1.0055991    23.718916    6.0374811    4.5295852    1.5078958 0.0017656389 -0.022028768    4.5498484 
+   17280    20.182078   0.99359906    23.538329     6.030135    4.5402332    1.4899018 0.0015827447 -0.021495342    4.5601458 
+   17290     20.48693   0.99903021    23.665574    6.0207039    4.5226581    1.4980458  0.001593612 -0.021468852    4.5425333 
+   17300    20.571849    1.0117044    23.853289     6.046335    4.5292843    1.5170507  0.001598522 -0.020965697    4.5486515 
+   17310    20.533123     1.002527    23.511686    6.0473621    4.5440728    1.5032892 0.0017069016 -0.021507084     4.563873 
+   17320     20.26702    1.0156791    23.689593    6.0470895    4.5240787    1.5230108  0.001829763 -0.022454314    4.5447032 
+   17330    20.333756    1.0138919    23.687531    6.0599267    4.5395958    1.5203309  0.001791565 -0.022223047    4.5600273 
+   17340    19.636881   0.99579807    23.781792    6.0584407    4.5652415    1.4931992 0.0017660237 -0.021671973    4.5851474 
+   17350    19.858667    1.0181745    23.644255    6.0517143    4.5249616    1.5267527 0.0015942361 -0.020396806    4.5437642 
+   17360    20.087582    1.0199606    23.865183    6.0598784    4.5304475    1.5294309 0.0015037109 -0.020375994    4.5493198 
+   17370    20.428664    1.0236967    23.679045    6.0274378    4.4924045    1.5350333 0.0016089004 -0.021097715    4.5118934 
+   17380    20.273136    1.0116019     23.77549    6.0518063    4.5349093     1.516897 0.0016052794 -0.021514882    4.5548189 
+   17390    20.303525    1.0122872    23.905437    6.0538117    4.5358871    1.5179246 0.0017114813 -0.021867156    4.5560428 
+   17400     20.09579    1.0243884    23.855262    6.0589351    4.5228647    1.5360705 0.0018033676 -0.022056445    4.5431178 
+   17410    20.158469   0.99893151    23.803774    6.0284663    4.5305685    1.4978978 0.0018077366 -0.022046587    4.5508074 
+   17420    20.027398   0.99898209    23.874146     6.029673    4.5316994    1.4979737 0.0020109165 -0.022909221    4.5525977 
+   17430    20.255685   0.99556633    23.750465    6.0150093    4.5221576    1.4928517 0.0021065814 -0.023530285    4.5435813 
+   17440    20.300899   0.98996158    23.660161    6.0146641    4.5302167    1.4844474 0.0020754214  -0.02385642    4.5519977 
+   17450    20.081657   0.98616401    23.794106    6.0191069     4.540354    1.4787529 0.0019660489 -0.023663176    4.5620511 
+   17460    20.150348   0.99513531     23.74268    6.0320016    4.5397962    1.4922054 0.0019998236 -0.023870636     4.561667 
+   17470     20.32972   0.99606904    23.800338    6.0336336    4.5400281    1.4936055 0.0021616959 -0.024472347    4.5623388 
+   17480    20.292489   0.99021817    23.585346    6.0254021      4.54057    1.4848321 0.0023347212 -0.025108224    4.5633435 
+   17490     20.36286    1.0055301    23.578046    6.0261269    4.5183346    1.5077924 0.0021101528 -0.024136614     4.540361 
+   17500     20.34036   0.99234284     23.70008    6.0146689    4.5266509    1.4880181 0.0019635656 -0.023292416    4.5479797 
+   17510    20.488695   0.99485783    23.978094    6.0078607    4.5160714    1.4917893 0.0020467765 -0.023631784    4.5376564 
+   17520    20.214264   0.98241695    23.607687    6.0385331    4.5653989    1.4731342 0.0021095033 -0.023700473    4.5869898 
+   17530    20.075408   0.99962016    23.548357    6.0195798    4.5206493    1.4989304 0.0020339738 -0.023454735    4.5420701 
+   17540    20.375799   0.98521301    23.516586    6.0022559     4.524929    1.4773269 0.0018200022  -0.02258372    4.5456927 
+   17550     20.35679   0.99951883    23.441449    6.0238821    4.5251036    1.4987785 0.0017520587 -0.022738398      4.54609 
+   17560    20.190281    1.0026993    23.829925    6.0284138    4.5248662    1.5035476 0.0019875691 -0.023617464    4.5464961 
+   17570    20.011664   0.98199653    23.948072    5.9984668     4.525963    1.4725038 0.0020267684 -0.023775581    4.5477118 
+   17580    20.499449    1.0071553    23.768245    6.0072139    4.4969844    1.5102294 0.0019771975 -0.023657065    4.5186643 
+   17590    20.200803   0.98772047    23.653793    6.0186213    4.5375344    1.4810868 0.0020122039 -0.023886524    4.5594088 
+   17600    20.289475    1.0037996    23.911053    6.0066614     4.501464    1.5051975 0.0019866879 -0.023792701      4.52327 
+   17610    20.406245    1.0044492    24.091044    6.0100663    4.5038947    1.5061715 0.0018568686 -0.023404847    4.5254427 
+   17620    20.327595   0.99550971    23.646318    6.0202139    4.5274471    1.4927668 0.0020158654 -0.024159616    4.5495909 
+   17630    20.307078   0.99720196    23.744347    6.0140578    4.5187535    1.4953043 0.0018633642 -0.022938881     4.539829 
+   17640    19.999223   0.99874143    23.658574     6.043238    4.5456252    1.4976128 0.0015248955 -0.021183926    4.5652843 
+   17650    20.215041    1.0191448    23.863075    6.0667876      4.53858    1.5282076 0.0013204412 -0.019594126    4.5568537 
+   17660    20.163895    1.0188418    23.586584    6.0585355    4.5307821    1.5277533 0.0013179203 -0.019484979    4.5489492 
+   17670     20.11399    1.0199653    23.672068     6.051245    4.5218071    1.5294379 0.0015075542 -0.020110894    4.5404104 
+   17680    19.927472   0.99746006    23.792633    6.0551466    4.5594553    1.4956914 0.0015950148 -0.020650476    4.5785107 
+   17690    20.401776   0.99219792    23.642624     6.033264    4.5454632    1.4878008 0.0016847485 -0.021378486    4.5651569 
+   17700     20.40442   0.99975769    23.874888    6.0346815    4.5355448    1.4991367  0.001877031   -0.0220328    4.5557006 
+   17710    20.243078    1.0052649    23.878688    6.0396813    4.5322867    1.5073946 0.0019354401 -0.022261564    4.5526128 
+   17720    20.102733    1.0240982    23.834497     6.045307    4.5096717    1.5356353 0.0019273269 -0.021967156    4.5297115 
+   17730    20.122183    1.0241051    23.513035    6.0518059    4.5161602    1.5356457 0.0018476412 -0.021416437     4.535729 
+   17740    20.301091     1.002942    23.814648    6.0463478    4.5424363    1.5039116 0.0017358089 -0.021264206    4.5619647 
+   17750    20.150075    1.0129385    23.464059     6.034583    4.5156817    1.5189013 0.0017594957 -0.021392035    4.5353142 
+   17760    20.301707    1.0214295    23.886981    6.0763021    4.5446686    1.5316335 0.0018884308 -0.022001265    4.5647814 
+   17770    20.467895    1.0297503    23.592806    6.0748135    4.5307029    1.5441106 0.0018309658 -0.021668109      4.55054 
+   17780    20.201012    1.0257456     24.00053    6.0771298    4.5390243    1.5381056 0.0018491608 -0.022348024    4.5595231 
+   17790     20.36776     1.011403    23.914094    6.0652697    4.5486709    1.5165988 0.0019825192 -0.022845069    4.5695335 
+   17800    20.229495    1.0310499    23.948732    6.0626693      4.51661    1.5460594 0.0018604097 -0.022473505    4.5372231 
+   17810    19.706944    1.0015299    24.019498    6.0422471     4.540453    1.5017941 0.0019979294 -0.022987602    4.5614427 
+   17820    19.929657    1.0254856    23.685498    6.0637227     4.526007    1.5377157 0.0019853076 -0.022485965    4.5465077 
+   17830    19.918409    1.0054872    23.622998    6.0469843    4.5392562    1.5077281 0.0018105793 -0.021791411     4.559237 
+   17840    20.146675    1.0080536    23.841068    6.0303527    4.5187764    1.5115763 0.0018073912 -0.021683617    4.5386526 
+   17850    20.211727    1.0025124    23.781371    6.0284526    4.5251853    1.5032673 0.0017543642 -0.021693554    4.5451245 
+   17860    20.203553   0.99308002    23.807595    6.0189268    4.5298033    1.4891235 0.0018238288 -0.021665947    4.5496454 
+   17870    20.278195    1.0115084    23.797972    6.0536936    4.5369368    1.5167568 0.0019919964 -0.022396028    4.5573408 
+   17880    20.083069   0.99178888    23.591395    6.0153782    4.5281907    1.4871874 0.0020172707 -0.022931451    4.5491049 
+   17890    20.092142    1.0066356     23.71419    6.0281495    4.5186995    1.5094501 0.0019722527 -0.022864251    4.5395915 
+   17900    20.215166    1.0023274    23.769437    6.0284475    4.5254576    1.5029899 0.0018410843 -0.022624401    4.5462409 
+   17910    20.461374     1.007288    23.589976    6.0270062    4.5165779    1.5104283 0.0018343095  -0.02263938    4.5373829 
+   17920    20.468938    1.0093652    23.755694    6.0393126    4.5257695    1.5135431 0.0016706017 -0.021603067     4.545702 
+   17930    20.276684    1.0014171    23.561698    6.0431213    4.5414963     1.501625 0.0016163844 -0.021481655    4.5613616 
+   17940    20.126476    1.0052224     23.72013    6.0318549    4.5245239     1.507331 0.0015676148 -0.021315209    4.5442715 
+   17950    20.269241   0.99122078    23.618767    6.0399949    4.5536594    1.4863356 0.0014845648  -0.02106343    4.5732382 
+   17960    20.151602    1.0226127    23.620702    6.0492442    4.5158365    1.5334077 0.0014190181 -0.020761613    4.5351791 
+   17970    20.147788   0.99652696    23.887395    6.0353279    4.5410357    1.4942922 0.0014077955 -0.020820915    4.5604488 
+   17980    20.239878    1.0214905    23.754916    6.0586823    4.5269572     1.531725 0.0013810517 -0.020839375    4.5464156 
+   17990    20.327531    1.0188576    23.695287    6.0496498    4.5218728     1.527777 0.0015084743 -0.021180443    4.5415448 
+   18000    20.065922     1.010664    23.603665    6.0460515    4.5305609    1.5154906  0.001630391  -0.02151306    4.5504436 
+   18010    20.271132    1.0096863    23.818622    6.0451133    4.5310887    1.5140246 0.0015775122 -0.020816291    4.5503275 
+   18020    20.390699    1.0169258    23.791426    6.0672126    4.5423323    1.5248803 0.0015391109 -0.020725961    4.5615192 
+   18030    20.502958    1.0155852    23.582955    6.0528006    4.5299306      1.52287 0.0014678724   -0.0204054    4.5488682 
+   18040    20.402482    1.0259624    23.657012    6.0777448    4.5393143    1.5384306 0.0015297113 -0.020561941    4.5583465 
+   18050    20.166586    1.0260622    23.825264    6.0828223    4.5442421    1.5385802 0.0016343188 -0.021538624    4.5641464 
+   18060    20.130449    1.0031756    23.672978     6.047617    4.5433552    1.5042617   0.00154836 -0.021220013    4.5630269 
+   18070    20.164173   0.98042603     23.55293    6.0246237    4.5544749    1.4701488 0.0015499185 -0.021242674    4.5741676 
+   18080    20.229557   0.99742232     23.66768    6.0133693    4.5177345    1.4956348 0.0017307235 -0.021940366    4.5379441 
+   18090    20.289907   0.97179144    23.519324    5.9886914    4.5314901    1.4572013  0.002018953 -0.023394026    4.5528652 
+   18100    20.344499   0.98656677    23.631259    6.0193576    4.5400008    1.4793569 0.0019053201 -0.023146206    4.5612417 
+   18110    20.412821   0.99119377    23.519016     6.018682    4.5323869    1.4862951 0.0018509894 -0.022919725    4.5534557 
+   18120    20.320932   0.99432839    23.419105    6.0058704     4.514875    1.4909954 0.0018340961 -0.022917673    4.5359586 
+   18130     20.38304   0.99967913    23.605924    6.0277089      4.52869    1.4990189 0.0017556866 -0.022706017    4.5496403 
+   18140    19.773209   0.98675344    23.532618    6.0320914    4.5524546    1.4796368 0.0018274227 -0.023482195    4.5741094 
+   18150    19.792301   0.99390722    23.339395    6.0143584    4.5239945    1.4903639 0.0017888188 -0.023183415    4.5453891 
+   18160    20.241275    1.0024623    23.634853    6.0219034    4.5187112    1.5031922 0.0018603276 -0.023380944    4.5402318 
+   18170    19.874499   0.98867478     23.62359     6.013815    4.5312972    1.4825178  0.001903632 -0.023235584    4.5526291 
+   18180    20.013821   0.98137029    23.733059    6.0104163    4.5388515    1.4715648 0.0019421386 -0.023180512    4.5600899 
+   18190    20.128727     1.006363    23.657504    6.0291217    4.5200804    1.5090413 0.0019248078  -0.02329218    4.5414478 
+   18200    20.204451   0.97681951    23.515048    6.0129289     4.548188    1.4647409 0.0019322096 -0.023041986    4.5692978 
+   18210    20.128036   0.99381104     23.64462    6.0374269    4.5472072    1.4902197 0.0018466701 -0.022615703    4.5679763 
+   18220    20.075254   0.99613712     23.69135    6.0205669    4.5268593    1.4937076 0.0017738392 -0.022421381    4.5475068 
+   18230    20.087384   0.99114021    23.745278    6.0176723    4.5314576    1.4862147 0.0017019641 -0.021801371     4.551557 
+   18240    20.106957     0.975931    23.701715    6.0243069    4.5608984    1.4634085  0.001432442 -0.020978023     4.580444 
+   18250    20.271973    0.9940492    23.832632    6.0170944    4.5265177    1.4905768 0.0013535485 -0.020361795    4.5455259 
+   18260    20.211259   0.97871023    23.680474    5.9886918    4.5211158     1.467576 0.0015002394 -0.020852221    4.5404677 
+   18270     20.19078   0.97985478    23.556509     5.991246    4.5219537    1.4692922 0.0016940566 -0.022325612    4.5425853 
+   18280    20.047218   0.99327837    23.662778    6.0313047    4.5418838    1.4894209 0.0017327538 -0.022740499    4.5628915 
+   18290    20.231716   0.99494388    23.653218    6.0259985    4.5340801    1.4919184 0.0018697896 -0.023360055    4.5555704 
+   18300    19.945224   0.99443528     23.79237    6.0170538    4.5258981    1.4911557 0.0018552639 -0.023383594    4.5474265 
+   18310    19.982395    1.0149666    23.760981    6.0521123      4.53017    1.5219424 0.0017654576 -0.022747742    4.5511522 
+   18320    20.152406    1.0388477    23.767245    6.0926684    4.5349163    1.5577521 0.0016968831 -0.021950326    4.5551697 
+   18330    20.322339      1.03332    23.264976    6.0757618    4.5262984    1.5494634 0.0015245913 -0.021358648    4.5461325 
+   18340    20.377755    1.0202435    23.765347    6.0786053    4.5487502    1.5298551 0.0016311014 -0.021655474    4.5687746 
+   18350    20.084699    1.0140517    23.584082    6.0809621    4.5603915    1.5205706 0.0016336418 -0.021354059    4.5801119 
+   18360    19.930488    1.0090665    23.683794    6.0372255    4.5241303    1.5130952 0.0016323419 -0.020900048     4.543398 
+   18370    20.122973    1.0158219    23.962444    6.0454449      4.52222    1.5232249 0.0015996129  -0.02079527    4.5414157 
+   18380    20.521984    1.0035563    23.595573     6.044135    4.5393023    1.5048327 0.0015053461 -0.020483564    4.5582805 
+   18390     20.16785    1.0139667    23.825434    6.0333669    4.5129238    1.5204431  0.001817292 -0.021758213    4.5328647 
+   18400    20.025689    1.0092865    23.785955    6.0499447    4.5365197     1.513425 0.0020011191 -0.022507804    4.5570264 
+   18410    20.063483    1.0008277    23.862667    6.0467974    4.5460562    1.5007412 0.0020789575 -0.022871659    4.5668489 
+   18420    20.296008   0.99026182    23.666648    6.0342484    4.5493508    1.4848976 0.0019402973 -0.022596882    4.5700073 
+   18430    20.105652   0.97893865    23.839583    6.0076869    4.5397684    1.4679185 0.0018576029 -0.022039702    4.5599505 
+   18440    20.158677    1.0081074    23.925624    6.0359518    4.5242947    1.5116571 0.0018168233 -0.021768405    4.5442463 
+   18450    20.260901   0.98576608    23.814839    6.0353392    4.5571829    1.4781562 0.0016671201 -0.021479084    4.5769949 
+   18460    20.233418    1.0156626    23.489983    6.0238961      4.50091    1.5229861 0.0016484877 -0.021137638    4.5203992 
+   18470    20.280501   0.99692627    23.338412    6.0316588    4.5367678    1.4948909  0.001711773 -0.021535566    4.5565916 
+   18480    20.242191     0.999128    23.640161     6.036193    4.5380006    1.4981924 0.0018211576 -0.022068906    4.5582483 
+   18490    20.247144    1.0095713    23.829499    6.0370078    4.5231556    1.5138521 0.0017675087 -0.022330503    4.5437186 
+   18500    20.284638   0.99320803     23.57555    6.0194656    4.5301502    1.4893154 0.0018129025 -0.022422929    4.5507602 
+   18510    20.188429    1.0152172    23.392484    6.0479148    4.5255966    1.5223182 0.0020019535 -0.022935476    4.5465301 
+   18520    20.352643   0.99773762    23.671573    6.0291102    4.5330027    1.4961076 0.0019218264 -0.022326273    4.5534071 
+   18530    20.063249    1.0053403     23.57436    6.0619193    4.5544115    1.5075078 0.0016624482 -0.021138805    4.5738878 
+   18540    20.231982    1.0184339    23.721145    6.0555181    4.5283765    1.5271416 0.0015460776 -0.020219896    4.5470503 
+   18550    20.248894   0.99582516    23.498132    6.0056264    4.5123866    1.4932398  0.001616954   -0.0201683    4.5309379 
+   18560    20.264167    1.0213475    23.976136    6.0409095    4.5093989    1.5315106 0.0017317461 -0.020900986    4.5285681 
+   18570    20.491336    1.0138179    23.634911    6.0488027    4.5285827      1.52022 0.0017929734 -0.021671909    4.5484617 
+   18580    20.351618    1.0204824    23.701644    6.0641289    4.5339155    1.5302134 0.0017950338 -0.021857454    4.5539779 
+   18590    20.063485    1.0185334    23.794409    6.0695501    4.5422592    1.5272909 0.0018500015 -0.022161352    4.5625705 
+   18600    20.032485    1.0235738    23.873597    6.0885899    4.5537411    1.5348489 0.0019989532 -0.022822439    4.5745645 
+   18610    19.893104     1.034546      23.8899    6.0766487    4.5253471    1.5513017 0.0018299804 -0.022098162    4.5456152 
+   18620    20.061911    1.0337009    23.843745    6.0940853    4.5440508    1.5500345 0.0016599586 -0.020933664    4.5633245 
+   18630    20.113244    1.0133442    23.637056    6.0590646     4.539555    1.5195096 0.0015883985 -0.020472177    4.5584388 
+   18640    20.044375    1.0399767    23.747887    6.0846853    4.5252402    1.5594451 0.0015760687 -0.020501811    4.5441659 
+   18650    20.226842    1.0290091    23.897919    6.0791367    4.5361375    1.5429992 0.0016983089 -0.021256947    4.5556961 
+   18660    20.190774    1.0211006    23.574516    6.0732072    4.5420669    1.5311403 0.0019224332  -0.02243727    4.5625817 
+   18670    20.072381      1.01579    23.619905    6.0373354    4.5141584     1.523177 0.0019681505 -0.022999104    4.5351893 
+   18680    20.206638    1.0106675    23.794334    6.0452203    4.5297245    1.5154958 0.0018445078 -0.021963927    4.5498439 
+   18690    20.223339   0.99588125    23.882535      6.01828    4.5249561    1.4933239 0.0017909716 -0.021948301    4.5451134 
+   18700    20.162215   0.98966541    23.653351    6.0081979    4.5241946    1.4840033 0.0017399475 -0.022319349     4.544774 
+   18710    20.411418    0.9986464      23.6904    6.0307609    4.5332906    1.4974703  0.001718106 -0.022305869    4.5538784 
+   18720    20.351732    1.0151738    23.748683    6.0500857    4.5278326    1.5222531 0.0018384192 -0.022877377    4.5488716 
+   18730    20.223946    1.0289398    23.893121    6.0704168    4.5275216    1.5428952 0.0019745605 -0.023508918     4.549056 
+   18740    20.275387     1.021191    23.803789    6.0592209    4.5279449     1.531276 0.0020710016 -0.023866348    4.5497403 
+   18750    20.325906    1.0191876    23.782244    6.0468601    4.5185883    1.5282718 0.0020785692 -0.024278145    4.5407879 
+   18760    20.202004    1.0045469    23.559593    6.0420588    4.5357408     1.506318 0.0020980243 -0.024532092    4.5581748 
+   18770    20.212682    1.0079935    23.618439    6.0505656    4.5390794    1.5114863 0.0022350165 -0.025051744    4.5618961 
+   18780    19.755232   0.99995004    23.830803    6.0444916    4.5450665    1.4994251 0.0022219356 -0.024978099    4.5678227 
+   18790    20.256796    1.0173419    23.878295    6.0420877    4.5165835    1.5255042 0.0020627407 -0.024010581    4.5385314 
+   18800    19.951342    0.9978489    23.784547    6.0322165    4.5359421    1.4962744 0.0019926739 -0.023355689    4.5573051 
+   18810    19.760177    1.0061805    23.452086    6.0526056    4.5438379    1.5087677 0.0018795014 -0.022879467    4.5648378 
+   18820    19.612265    1.0113981    23.363188    6.0479334    4.5313419    1.5165915  0.001638759 -0.021788949     4.551492 
+   18830    20.168371    1.0100221    23.703029    6.0599809    4.5454528    1.5145281 0.0015317917 -0.021370724    4.5652918 
+   18840    20.146212    1.0238526    23.826168    6.0646357    4.5293688     1.535267 0.0014745767 -0.021083335    4.5489775 
+   18850    20.195081    1.0061289    23.863314     6.038169    4.5294787    1.5086903 0.0014059876 -0.020890712    4.5489635 
+   18860    20.367428    1.0234765    23.690744     6.060602     4.525899     1.534703 0.0017219089 -0.022180676    4.5463578 
+   18870    19.980521    1.0118896    23.659193    6.0668106    4.5494822    1.5173284  0.001702425 -0.022031193     4.569811 
+   18880    19.904075    1.0009288    23.829494    6.0395238    4.5386311    1.5008927 0.0015249225 -0.021014584    4.5581208 
+   18890    20.471933    1.0174806    23.617876    6.0524798    4.5267676    1.5257122 0.0015820138 -0.020568807    4.5457544 
+   18900    20.235798   0.99652802    23.593151    6.0289335    4.5346398    1.4942938 0.0015913592 -0.020689101    4.5537375 
+   18910    20.271185    1.0056146    24.044873    6.0344232    4.5265041    1.5079191 0.0014827475 -0.020359225    4.5453806 
+   18920    20.120722    1.0035435    23.781115    6.0427748    4.5379613    1.5048135 0.0016871695 -0.021519038    4.5577932 
+   18930    20.130456    1.0132187    23.850139    6.0693565    4.5500351    1.5193214  0.001888139 -0.022608836    4.5707558 
+   18940    20.027998    1.0205568    23.673463     6.059173    4.5288481    1.5303249 0.0018229579 -0.022589371    4.5496145 
+   18950    20.163375    1.0167124     23.67677    6.0547987    4.5302385    1.5245602 0.0018872878  -0.02278966    4.5511409 
+   18960    20.316087    1.0186827    23.715113    6.0757817     4.548267    1.5275148 0.0016697068 -0.021864617    4.5684619 
+   18970    20.431398    1.0083707    23.580323     6.057817     4.545765    1.5120519 0.0018457492 -0.022826271    4.5667455 
+   18980    19.849926    1.0194154    23.678109    6.0676304     4.539017    1.5286133  0.001754484 -0.022630578    4.5598931 
+   18990    20.169028    1.0379106    23.755569    6.0934043    4.5370574    1.5563469 0.0016117381  -0.02233759    4.5577832 
+   19000    19.890755    1.0409521    23.712285    6.0962016     4.535294    1.5609076 0.0018096972 -0.023268172    4.5567524 
+   19010    20.136923    1.0259929    23.830921    6.0853988    4.5469224    1.5384764 0.0019496044  -0.02374132    4.5687141 
+   19020    20.554234    1.0092973     23.37146    6.0410218    4.5275805    1.5134413  0.002010164 -0.023706221    4.5492765 
+   19030     20.35144     1.018738    23.466661    6.0565443    4.5289467    1.5275976 0.0019053481 -0.023371554    4.5504129 
+   19040    20.162524    1.0190909    23.678239    6.0571639    4.5290372    1.5281268 0.0017276089 -0.022394227    4.5497038 
+   19050    20.428312    1.0181615    23.941912    6.0552636    4.5285305    1.5267331 0.0016745209 -0.022333143    4.5491891 
+   19060    20.326699    1.0153301    23.680073    6.0577293    4.5352418    1.5224875 0.0017015507 -0.022439665    4.5559799 
+   19070    20.373918     1.012219    23.773303    6.0754123      4.55759    1.5178223 0.0016600311 -0.022197674    4.5781276 
+   19080    20.198716    1.0210228    23.863585    6.0595756    4.5285519    1.5310238 0.0017527577 -0.022623654    4.5494228 
+   19090    20.218099    1.0093731    23.903711    6.0506355    4.5370805     1.513555 0.0016576378 -0.021946718    4.5573696 
+   19100    19.997019    1.0216043    23.670864    6.0706386     4.538743    1.5318956 0.0016115919 -0.021567476    4.5586989 
+   19110    20.181118    1.0524941    23.830479    6.1169116    4.5386967    1.5782149 0.0016481913 -0.021181267    4.5582298 
+   19120    20.215235     1.038111    23.706028    6.1262804    4.5696329    1.5566475 0.0017024815 -0.021788672    4.5897191 
+   19130    20.372952    1.0500217    23.918689    6.1023709    4.5278635    1.5745075  0.001773165 -0.022281629    4.5483719 
+   19140    19.852089    1.0162822    23.906924     6.087342    4.5634268    1.5239152 0.0018015711 -0.022044789      4.58367 
+   19150    19.943938    1.0290494    23.871238    6.0896586     4.546599    1.5430596 0.0016647435 -0.021679217    4.5666135 
+   19160    20.202958    1.0086522    24.188658    6.0964291    4.5839551    1.5124739 0.0013803269 -0.020672878    4.6032477 
+   19170    19.986082    1.0085237    23.705718    6.0490718    4.5367905    1.5122813 0.0013456205 -0.020408791    4.5558537 
+   19180    20.323557    1.0156578    23.802006    6.0529786    4.5299998    1.5229789 0.0014936067 -0.020919564    4.5494257 
+   19190    20.088772    1.0140756    23.864996     6.064175    4.5435687    1.5206063 0.0016989159 -0.021880639    4.5637504 
+   19200    20.056933     1.014507    23.960761    6.0811782    4.5599249    1.5212532 0.0017504546 -0.022324648    4.5804991 
+   19210    20.135114    1.0156503    23.675602    6.0753495    4.5523819    1.5229676 0.0017304563 -0.022163911    4.5728153 
+   19220    20.235874    1.0506678    23.841874    6.1195261    4.5440498    1.5754763 0.0015991373 -0.022119723    4.5645704 
+   19230    20.170248    1.0274662    23.800211    6.0874392    4.5467537    1.5406855 0.0016862442 -0.022557617    4.5676251 
+   19240    20.150991    1.0435892    23.940762    6.0971904    4.5323284     1.564862 0.0017569352 -0.022835385    4.5534069 
+   19250     20.15613    1.0288147    23.700721    6.0767703    4.5340627    1.5427076    0.0016575 -0.022232535    4.5546377 
+   19260    20.280661    1.0020378    23.888749    6.0435585    4.5410028    1.5025557 0.0017368556 -0.022529443    4.5617954 
+   19270    20.449703    1.0164157    23.742327     6.043632    4.5195167    1.5241153 0.0019101759 -0.023505357    4.5411118 
+   19280    20.258733    1.0274418    23.639464    6.0560447    4.5153958    1.5406489 0.0020829505 -0.024151186     4.537464 
+   19290    20.186986    1.0111186    23.861445    6.0633445    4.5471721    1.5161724 0.0021039544 -0.024288191    4.5693564 
+   19300    20.216092     1.004781    23.976306    6.0419075    4.5352384     1.506669 0.0019895648 -0.023727973    4.5569768 
+   19310    20.301831   0.99178473     23.55063    6.0309757    4.5437945    1.4871812 0.0019387687 -0.022972214    4.5648279 
+   19320    20.195201    1.0003175    23.922299    6.0150594    4.5150832    1.4999761 0.0017553397 -0.022000154     4.535328 
+   19330     20.28908   0.99213996    23.466253    6.0100179     4.522304    1.4877139 0.0017287185 -0.021428879    4.5420042 
+   19340    20.395795    0.9882176    23.691823     6.028161    4.5463287    1.4818323 0.0016072081 -0.021035579    4.5657571 
+   19350    19.943693   0.97755851    23.432456    6.0060976    4.5402486     1.465849 0.0017937461 -0.021803205    4.5602581 
+   19360     19.98638   0.99769643     23.69112    6.0218039    4.5257581    1.4960458 0.0020926152 -0.023283486    4.5469489 
+   19370    20.143351   0.99126011    23.466049    6.0143338    4.5279393    1.4863945 0.0020293754 -0.023342351    4.5492522 
+   19380    20.015478    1.0060802    23.783919     6.026614    4.5179968    1.5086172 0.0019887783  -0.02294441    4.5389524 
+   19390     19.94011    1.0086257    23.500311    6.0409812     4.528547    1.5124342 0.0018981836 -0.022581955    4.5492307 
+   19400    20.348094    1.0026437    23.875136    6.0444756    4.5410113    1.5034643 0.0018755692 -0.022549183    4.5616849 
+   19410    20.181728    1.0154051    23.799209    6.0486736    4.5260737    1.5225999 0.0019601173 -0.023088538    4.5472021 
+   19420    19.811457    1.0141539    23.994179    6.0486654    4.5279417    1.5207237 0.0019641637 -0.023414367    4.5493919 
+   19430    20.210717    1.0097168    23.550208    6.0575433    4.5434729    1.5140703  0.001969019 -0.023210277    4.5647142 
+   19440    19.885036    1.0211767     23.99319    6.0559134    4.5246589    1.5312545 0.0020890316  -0.02361348    4.5461834 
+   19450    20.289058    1.0127144    23.872175    6.0565388    4.5379736    1.5185652 0.0019650912 -0.023128655    4.5591372 
+   19460    20.495546    1.0211588    23.816664    6.0654907    4.5342631    1.5312276 0.0019100639 -0.022647677    4.5550007 
+   19470    20.182976    1.0268969    23.830056    6.0749863    4.5351544    1.5398319 0.0018904697 -0.022336099    4.5556001 
+   19480    20.013387    1.0065463    23.887742     6.058844    4.5495278    1.5093162 0.0018667913 -0.022479896    4.5701409 
+   19490    20.095468    1.0008374    23.649572    6.0319384    4.5311827    1.5007557 0.0017929392 -0.022178977    4.5515688 
+   19500     20.21262   0.99071435    23.492279    6.0211117    4.5355355    1.4855762 0.0015913171 -0.021431252    4.5553755 
+   19510    20.265909    1.0066912    23.566427    6.0384299    4.5288964    1.5095335 0.0017037389  -0.02198924    4.5491819 
+   19520    20.390236    1.0147323    23.557592    6.0666666    4.5450755     1.521591 0.0018082079 -0.022242915    4.5655103 
+   19530    20.315689    1.0239456    23.587296    6.0755572    4.5401507    1.5354065 0.0018906541 -0.022669413    4.5609294 
+   19540    20.424935    1.0319756    24.046692    6.0688919    4.5214444    1.5474474 0.0019003987 -0.022428015     4.541972 
+   19550     20.42532    1.0189036      23.7936    6.0604494    4.5326034     1.527846 0.0020493084 -0.023179731    4.5537338 
+   19560    20.172061    1.0191909     23.60208    6.0685574    4.5402806    1.5282768  0.002263643 -0.024383787    4.5624007 
+   19570    20.123727    1.0265523    23.602759    6.0856123    4.5462971    1.5393152 0.0021701386 -0.023892232    4.5680192 
+   19580    19.987399    1.0166945       23.963    6.0650599    4.5405264    1.5245335 0.0021857959 -0.024256174    4.5625968 
+   19590     20.32202    1.0072713    23.684153    6.0528879    4.5424847    1.5104033 0.0019813501  -0.02321819    4.5637215 
+   19600    20.246704    1.0059022    23.844481    6.0504093     4.542059    1.5083503 0.0019496565 -0.022597075    4.5627064 
+   19610    20.180826   0.99886334    23.468699    6.0495492    4.5517536    1.4977956 0.0021095021 -0.023612502    4.5732566 
+   19620    20.192578    1.0305641    24.226122    6.0671378     4.521807    1.5453308 0.0021630085 -0.024210779    4.5438548 
+   19630     20.20098   0.99303182    23.748271     6.052383    4.5633318    1.4890512 0.0020734603 -0.023766865    4.5850252 
+   19640    20.209499    1.0153789    23.750185    6.0559341    4.5333735    1.5225607 0.0020630501 -0.024201058    4.5555115 
+   19650    20.070891   0.99213718    23.669137    6.0082699    4.5205602    1.4877097 0.0022183618 -0.024619492    4.5429614 
+   19660    20.223639    1.0070205    23.766326    6.0166633     4.506636    1.5100273 0.0020919568 -0.023917751    4.5284618 
+   19670    20.104954    1.0116346    23.636964    6.0570258    4.5400798     1.516946 0.0020551729 -0.023808028    4.5618327 
+   19680    20.135267    1.0056174    23.874376    6.0474281    4.5395049    1.5079232 0.0019796334 -0.023605866    4.5611311 
+   19690    20.158607   0.98778021    23.494965    6.0445454     4.563369    1.4811764  0.002018731 -0.023928813    4.5852791 
+   19700    20.208683    1.0276394    23.897488    6.0747719    4.5338266    1.5409453 0.0019318488  -0.02334052    4.5552353 
+   19710     20.39481   0.98608298    23.484305    6.0354693    4.5568379    1.4786314  0.001773659 -0.022303701    4.5773679 
+   19720    20.402959    1.0290248    23.848069    6.0516555    4.5086329    1.5430226 0.0017770844 -0.022441376    4.5292972 
+   19730     20.31125    1.0078652    23.693818    6.0503396    4.5390457    1.5112939 0.0016821669 -0.022152909    4.5595164 
+   19740    20.341752    1.0056714     23.80976    6.0302217    4.5222175    1.5080042  0.001843673 -0.023120956    4.5434948 
+   19750    20.134672   0.99794836    23.588805    6.0363129    4.5398893    1.4964236 0.0018914039 -0.023272841    4.5612708 
+   19760    20.002699    1.0115554    23.626861    6.0349935    4.5181662    1.5168273 0.0018887105 -0.023275781    4.5395533 
+   19770    19.729241    1.0189788    24.045976    6.0590785    4.5311198    1.5279587 0.0019213611 -0.023267951    4.5524664 
+   19780    20.093266    1.0190972    23.511641    6.0550546    4.5269183    1.5281363 0.0019105618 -0.023370508    4.5483783 
+   19790    20.158483    1.0111163    23.751925    6.0517563    4.5355874    1.5161689 0.0018104296 -0.022754579    4.5565315 
+   19800    19.645925    1.0124775    23.636062    6.0683073    4.5500973      1.51821 0.0016450052 -0.021464103    4.5699164 
+   19810     19.95121     1.036534    23.773167    6.1040963    4.5498137    1.5542827 0.0016798409 -0.021510266    4.5696441 
+   19820    20.358372    1.0440406    23.782471    6.1126603    4.5471214    1.5655388 0.0017916888 -0.021957128    4.5672869 
+   19830    20.210875    1.0185987    23.868866    6.0967175    4.5693288    1.5273887 0.0020699452 -0.023249608    4.5905085 
+   19840    20.484882    1.0308813    23.760163    6.0561466    4.5103401    1.5458065  0.002091829   -0.0238023    4.5320505 
+   19850    20.077832    1.0395803    23.744023    6.1057489    4.5468983    1.5588506 0.0022277545 -0.024476783    4.5691473 
+   19860    20.104774    1.0294598    23.796542    6.0785567    4.5348817     1.543675 0.0021185736 -0.023719769    4.5564829 
+   19870    20.119504     1.035468    23.655447    6.0879828    4.5352985    1.5526843 0.0019236136 -0.022782935    4.5561578 
+   19880    20.125708    1.0423202    23.896318    6.0891935    4.5262344    1.5629591 0.0017731801 -0.022550347    4.5470116 
+   19890    20.308331    1.0392989    23.845915    6.1079177    4.5494891    1.5584287 0.0016802522  -0.02206895    4.5698778 
+   19900    20.342428    1.0458912    23.941801    6.0994726    4.5311588    1.5683138 0.0015474072 -0.021614628     4.551226 
+   19910    20.384262    1.0244179    23.810078    6.0824004    4.5462857    1.5361147 0.0015499411 -0.021575562    4.5663113 
+   19920    20.346878    1.0163829     23.80793    6.0608422     4.536776    1.5240662 0.0018484993 -0.022854283    4.5577818 
+   19930    20.257272    1.0172512    23.818756    6.0758975    4.5505294    1.5253681 0.0019989389 -0.023508848    4.5720393 
+   19940    20.419245      1.02643    23.864922    6.1001824    4.5610505    1.5391318 0.0019360512 -0.023275343    4.5823898 
+   19950    20.235167    1.0209999    23.943669    6.0830586    4.5520692    1.5309894 0.0017090607 -0.022134044    4.5724942 
+   19960     20.21853    1.0196978    23.876747    6.0850282    4.5559914    1.5290368 0.0016266878 -0.021693576    4.5760583 
+   19970    20.439603    1.0151267    23.440958     6.070689    4.5485066    1.5221825 0.0015996628 -0.021698172    4.5686051 
+   19980    20.188537    1.0207588     23.95843    6.0461819     4.515554    1.5306279 0.0016162847 -0.021529389    4.5354671 
+   19990    20.233206   0.98018336    23.650855    6.0214939     4.551709    1.4697849 0.0016181302 -0.021323498    4.5714144 
+   20000    20.398641     1.007998    23.508061    6.0187832    4.5072902     1.511493 0.0015287962 -0.020723641     4.526485 
+   20010    20.505923    1.0046148    23.955229    6.0279303    4.5215104    1.5064199  0.001508332 -0.020668838    4.5406709 
+   20020     20.54434   0.99574733    23.590909    6.0161161    4.5229929    1.4931231 0.0015085384 -0.021030598     4.542515 
+   20030    20.215377    1.0000483    23.930061    6.0259331    4.5263606    1.4995725 0.0016034355 -0.021999715    4.5467569 
+   20040    20.096165    0.9901323    23.604618    6.0348647    4.5501613    1.4847034 0.0015415681 -0.021621634    4.5702413 
+   20050    20.231676    0.9858099    23.684792    6.0234087    4.5451867    1.4782219 0.0014946849 -0.021255128    4.5649472 
+   20060      20.2058   0.99996234    23.816323    5.9965263    4.4970828    1.4994435 0.0015750953 -0.021317586    4.5168253 
+   20070    20.189696   0.99173276    23.756578    6.0091695    4.5220663    1.4871033 0.0016578546 -0.021737106    4.5421455 
+   20080    20.322871   0.99437809    23.873193    6.0071986    4.5161286    1.4910699   0.00145993 -0.020864708    4.5355334 
+   20090    20.100099     1.010578    23.754303    6.0410083    4.5256465    1.5153617 0.0013659002 -0.020099475    4.5443801 
+   20100    20.331574    1.0103253    23.872218    6.0680259    4.5530431    1.5149829 0.0015338016 -0.020950488    4.5724598 
+   20110    20.454089    1.0227566    23.619539    6.0549211    4.5212976    1.5336235 0.0014611209 -0.020655209    4.5404917 
+   20120    20.306157    1.0088081    23.837326    6.0557371    4.5430293    1.5127078 0.0014486623 -0.020134506    4.5617152 
+   20130    19.973532    1.0108735    23.757844    6.0463579    4.5305531    1.5158048 0.0015414133  -0.02085729     4.549869 
+   20140    19.978029    1.0140981    23.858638    6.0505886    4.5299485    1.5206401 0.0013665328 -0.020082964    4.5486649 
+   20150    19.748253    1.0348654    23.772488    6.0937396     4.541959    1.5517807  0.001251233 -0.019834469    4.5605422 
+   20160    19.832825    1.0342098    23.658162    6.0961839    4.5453863    1.5507977 0.0015544371 -0.021236034    4.5650678 
+   20170     20.19308    1.0306404    24.012309    6.0842709    4.5388257    1.5454453  0.001753635 -0.022243039    4.5593151 
+   20180    20.028288    1.0237638    23.992566     6.078064    4.5429302    1.5351338 0.0016419636 -0.021515438    4.5628037 
+   20190    19.918309    1.0295599    23.766806    6.0461191     4.502294    1.5438251 0.0015781419 -0.021305864    4.5220218 
+   20200    19.814367    1.0048648    23.711497    6.0493943    4.5425995    1.5067948 0.0018736516 -0.023113038    4.5638389 
+   20210    20.017315    1.0154943    23.884501    6.0626624    4.5399286    1.5227338 0.0017604799 -0.022408988    4.5605771 
+   20220    19.976625    1.0036657    23.891859    6.0612407     4.556244    1.5049967 0.0018442141 -0.022747202     4.577147 
+   20230    20.036476    1.0134276    23.592193    6.0639723    4.5443377    1.5196346  0.002013705 -0.023417412    4.5657414 
+   20240    19.962378    1.0154222    23.855301    6.0528442    4.5302187    1.5226255 0.0021285272 -0.023939621    4.5520298 
+   20250    19.902515    1.0056791    23.480075    6.0282199    4.5202041    1.5080158 0.0023340511 -0.024905469    4.5427756 
+   20260    20.071738   0.98777533     23.68751    6.0100723    4.5289032    1.4811691 0.0024101343 -0.025120349    4.5516134 
+   20270    20.450336   0.98604961    23.856945    6.0009778    4.5223964    1.4785814 0.0023027967 -0.024940004    4.5450336 
+   20280    20.288143    0.9981824    23.574674    6.0101603    4.5133858    1.4967745 0.0022223477 -0.024175296    4.5353387 
+   20290    20.289702   0.99029798    23.715782    6.0039304    4.5189786    1.4849518  0.002173998 -0.023929717    4.5407343 
+   20300    20.244483    1.0027084    23.538799    5.9920373     4.488476    1.5035613 0.0021503776  -0.02423858    4.5105642 
+   20310    20.461205   0.99009052    23.623376    6.0055603    4.5209196    1.4846407 0.0023662982 -0.024922767    4.5434761 
+   20320     20.06264   0.99288996    23.800551    6.0150929    4.5262544    1.4888385 0.0023430011 -0.024492829    4.5484042 
+   20330    19.927418    1.0003369    23.792958    6.0299829    4.5299777    1.5000052 0.0024084808 -0.024616002    4.5521852 
+   20340    20.313336    1.0195963    24.032714    6.0475994    4.5187146    1.5288847 0.0023503127 -0.024243077    4.5406074 
+   20350    20.345433   0.99350825    23.700564    6.0445892    4.5548236    1.4897656  0.002128785 -0.023317978    4.5760128 
+   20360    20.266944    1.0194214    23.884716    6.0465028    4.5178805    1.5286223 0.0019954776 -0.022565406    4.5384504 
+   20370    20.269353    1.0156903     23.70528     6.038143    4.5151154    1.5230276 0.0018341835 -0.022089114    4.5353703 
+   20380    20.185083    1.0207703     23.76572    6.0412806    4.5106355    1.5306451 0.0017304048 -0.021695039    4.5306001 
+   20390    20.238974   0.99292509    23.642384    6.0340098    4.5451186    1.4888912 0.0016957496 -0.021044255    4.5644671 
+   20400    20.039617    1.0114737    23.881084    6.0416947    4.5249899    1.5167048 0.0018328867 -0.021165908     4.544323 
+   20410    20.380564    1.0135922    23.398799    6.0602369    4.5403554    1.5198815 0.0017995526 -0.020892559    4.5594484 
+   20420     20.32734    1.0399062    23.837648    6.0856562    4.5263169    1.5593393 0.0017625167 -0.020702213    4.5452566 
+   20430    20.291131    1.0136753    23.627613    6.0653747    4.5453686    1.5200061 0.0016588923 -0.020323374    4.5640331 
+   20440    20.238463    1.0270145    23.936761    6.0918695    4.5518613    1.5400082 0.0016280863 -0.021012739    4.5712459 
+   20450    19.950783    1.0226211    23.615664     6.066381    4.5329606    1.5334203 0.0017034382 -0.021737335    4.5529945 
+   20460    20.167759    1.0008724     23.67139     6.045053    4.5442449    1.5008082 0.0017778395 -0.022257887    4.5647249 
+   20470    20.271546     1.002566    23.629119    6.0455532    4.5422055    1.5033477 0.0016118469 -0.021721063    4.5623148 
+   20480    20.187391    1.0113926    23.562765    6.0323855    4.5158022    1.5165833  0.001626713 -0.022007844    4.5361834 
+   20490     20.33041   0.98810388    23.670442       6.0078    4.5261382    1.4816618 0.0015806283 -0.021821584    4.5463791 
+   20500    20.371099    1.0125788    23.672786    6.0401976    4.5218357    1.5183619 0.0014841112 -0.021400669    4.5417522 
+   20510    20.203811    1.0324716     23.79761    6.0692616    4.5210704    1.5481912 0.0016000625 -0.021400374    4.5408707 
+   20520    20.330235     1.026331    24.023388    6.0417688    4.5027854    1.5389834 0.0017133214 -0.021793991     4.522866 
+   20530    20.393035    1.0068676    23.571027    6.0259788    4.5161809     1.509798 0.0017832095 -0.021711881    4.5361095 
+   20540    20.247726    1.0059367    24.061154     6.018338     4.509936     1.508402 0.0019132054 -0.022406156    4.5304289 
+   20550    20.385343   0.99838414    23.521411    6.0269681    4.5298911     1.497077 0.0018038547 -0.021529614    4.5496168 
+   20560     20.25695   0.99759086    23.735504    6.0383976    4.5425101    1.4958875 0.0018198481 -0.021307084    4.5619973 
+   20570     20.02836    1.0010114    23.445093    6.0589752    4.5579586    1.5010166 0.0017459224 -0.020984582    4.5771973 
+   20580    19.990776    1.0275819     23.65548    6.0790818    4.5382228     1.540859  0.001896679  -0.02204446    4.5583706 
+   20590    20.271225     1.017785    23.663824    6.0641781    4.5380095    1.5261686 0.0017943397  -0.02183591    4.5580511 
+   20600     20.11117    1.0203255    23.515503    6.0671175    4.5371394    1.5299782 0.0016989218 -0.021486297    4.5569267 
+   20610    20.202084    1.0347797    23.658684    6.0921333    4.5404811    1.5516522 0.0017197952 -0.021530632     4.560292 
+   20620    20.393357    1.0365825    23.471774    6.0814602    4.5271047    1.5543555 0.0016431534 -0.021384127    4.5468457 
+   20630     20.42646    1.0166021    23.763664    6.0610126    4.5366177    1.5243949 0.0015009398 -0.020917322    4.5560341 
+   20640     20.10574    1.0193306    24.064694    6.0669128    4.5384266    1.5284862 0.0014189844 -0.020521736    4.5575294 
+   20650    20.319667    1.0320024    23.915139    6.0615886     4.514101    1.5474877 0.0015146618 -0.020869186    4.5334555 
+   20660    20.327571    1.0386985    23.552098    6.0850091    4.5274807    1.5575284 0.0016951636 -0.021207785    4.5469933 
+   20670    20.479171     1.016597    23.815691    6.0745661     4.550179    1.5243871 0.0018039938  -0.02159358    4.5699686 
+   20680    20.369272    1.0276612    23.727528    6.0693483    4.5283704    1.5409779 0.0020988674 -0.022916746    4.5491883 
+   20690    20.073626    1.0258642    23.976037    6.0650337    4.5267503    1.5382834 0.0019322571 -0.022681317    4.5474993 
+   20700    20.193528   0.98882831    23.643372    6.0358605    4.5531124     1.482748 0.0018911502  -0.02244455    4.5736658 
+   20710    20.429264   0.99804491    23.621998    6.0516646    4.5550963    1.4965683 0.0018060705  -0.02219263    4.5754828 
+   20720     20.22526    1.0232655    23.987315    6.0691387    4.5347521    1.5343866 0.0017902539 -0.022537366    4.5554992 
+   20730    20.284123    1.0196951    23.632393    6.0411238     4.512091    1.5290328 0.0017339026 -0.022338486    4.5326956 
+   20740    19.995409    1.0074668    23.936684    6.0402964    4.5295999    1.5106965 0.0016665293 -0.022189149    4.5501225 
+   20750    20.004179   0.99531759    23.803215    6.0330293    4.5405506    1.4924787 0.0017750327 -0.022689987    4.5614655 
+   20760    20.095866    1.0184565    23.996529    6.0655221    4.5383466    1.5271755 0.0016808619 -0.022145093    4.5588108 
+   20770    20.071359    1.0061885    23.775344    6.0570582    4.5482785    1.5087797 0.0017710226 -0.022217542     4.568725 
+   20780    20.274615   0.98847547    23.893349    6.0324887    4.5502697     1.482219 0.0018822955 -0.022580178    4.5709676 
+   20790    20.217553   0.99983819    23.587002    6.0260571    4.5267997    1.4992574 0.0018892366 -0.022778592    4.5476891 
+   20800    20.544873   0.99875624     23.69885    6.0316416    4.5340067     1.497635 0.0018140509   -0.0224289    4.5546215 
+   20810    20.255159    1.0077997    23.790919       6.0253    4.5141043    1.5111957 0.0016310722 -0.021597706    4.5340709 
+   20820    20.135537    1.0003968    23.916812    6.0021815    4.5020864    1.5000951  0.001418932 -0.020504111    4.5211716 
+   20830    20.305658   0.99726626     23.88737    6.0256472    4.5302465    1.4954008 0.0013471182 -0.020028647     4.548928 
+   20840    20.289493    1.0156718     23.92831     6.046136    4.5231361    1.5229999  0.001580222 -0.021155785    4.5427117 
+   20850     20.28638    1.0090528    23.518779    6.0401476    4.5270729    1.5130747 0.0016899409 -0.021529419    4.5469124 
+   20860    20.352842    1.0134562    23.755867    6.0473808    4.5277032    1.5196776 0.0016299201 -0.021147624    4.5472209 
+   20870    20.190607    1.0141908    23.754364    6.0598251     4.539046    1.5207791 0.0015648885 -0.020474265    4.5579554 
+   20880    20.343119    1.0046158    23.633629    6.0341022    4.5276808    1.5064214 0.0015571052 -0.020132011    4.5462557 
+   20890    20.255142    1.0149973    23.836984    6.0279134     4.505925    1.5219884 0.0015265073 -0.019974504     4.524373 
+   20900    20.331245    1.0113055    23.716946    6.0217835    4.5053309    1.5164526 0.0016422489 -0.020791598    4.5244802 
+   20910     20.41374    1.0083772    24.130137    6.0195046     4.507443    1.5120616 0.0016698326 -0.021517223    4.5272903 
+   20920    20.072337   0.99703252    23.747116    6.0233656    4.5283153    1.4950503 0.0014624671  -0.02122653    4.5480794 
+   20930    20.312299    1.0018934    23.582654    6.0317787    4.5294395    1.5023392 0.0012994252 -0.020612816    4.5487529 
+   20940    20.416169   0.99832041    23.499732    6.0418993    4.5449178    1.4969815 0.0012544638 -0.020722797    4.5643861 
+   20950    19.994085    1.0037074    23.407932    6.0287096    4.5236504    1.5050592 0.0011248472 -0.020202857    4.5427284 
+   20960    19.853443    1.0003299    23.599499    6.0076153    4.5076206    1.4999946 0.0013028188 -0.021055745    4.5273736 
+   20970    20.436231   0.99349989    23.687168    6.0118195    4.5220664    1.4897531 0.0016350269 -0.022789336    4.5432207 
+   20980    20.277177    1.0086487    23.863532    6.0393541    4.5268854    1.5124687 0.0019970623 -0.024183747    4.5490721 
+   20990    20.064873    1.0121579    23.830553    6.0582632    4.5405323    1.5177308 0.0021203714 -0.024627003     4.563039 
+   21000    20.181866    1.0018865    23.722026    6.0532555    4.5509268    1.5023288 0.0021305541 -0.024633156    4.5734294 
+   21010    20.268191    1.0061773    23.619016    6.0519603    4.5431975    1.5087628 0.0022195639 -0.024622517    4.5656005 
+   21020    20.367934    1.0225672    23.692641    6.0566068    4.5232673    1.5333395 0.0021524714 -0.024250378    4.5453652 
+   21030    20.077948    1.0219139     23.82591    6.0631168     4.530757    1.5323599 0.0021168806   -0.0238376    4.5524777 
+   21040    20.241658    1.0266968    23.883698    6.0738329    4.5343011    1.5395318 0.0018886128 -0.023145504     4.555558 
+   21050    20.477809    1.0150652    23.871549    6.0605429    4.5384527    1.5220903 0.0021049708 -0.024153392    4.5605011 
+   21060    20.370871    1.0164076     23.97551    6.0644656    4.5403623    1.5241033 0.0021596264 -0.024131311     4.562334 
+   21070    20.322829    1.0285858    23.933769    6.0937337    4.5513693    1.5423644 0.0022054343 -0.024633429    4.5737973 
+   21080    20.326224    1.0213829    23.797944    6.0632945    4.5317308    1.5315636 0.0023310705 -0.024792889    4.5541926 
+   21090    20.384962    1.0223998     23.74577    6.0786589    4.5455704    1.5330885 0.0022626856 -0.024754556    4.5680623 
+   21100    20.273047    1.0291368     23.64922    6.0788255    4.5356348    1.5431906 0.0020616164 -0.023766289    4.5573395 
+   21110    20.096731   0.99872621    23.464435    6.0464837    4.5488938      1.49759 0.0020213688 -0.023301902    4.5701743 
+   21120    20.077595    1.0074335    23.798566    6.0344187    4.5237722    1.5106465 0.0017398849 -0.021981382    4.5440137 
+   21130    20.096746    1.0018843     23.75073    6.0344428    4.5321173    1.5023255 0.0016107069  -0.02134416    4.5518508 
+   21140    19.938665    1.0170474    23.949935    6.0609997    4.5359371    1.5250626 0.0015778453 -0.021072023    4.5554313 
+   21150    19.944329    1.0290728    23.750587     6.038075    4.4949804    1.5430946 0.0017105963 -0.021694404    4.5149642 
+   21160    20.122729    1.0194844    23.788168    6.0853636    4.5566467    1.5287168 0.0018250679 -0.022322322     4.577144 
+   21170    19.825179    1.0227827    23.466433     6.065186    4.5315233    1.5336627 0.0018372098 -0.022376881     4.552063 
+   21180    20.204274     1.010992    23.530418    6.0456255     4.529643    1.5159826 0.0019919614 -0.023568177    4.5512192 
+   21190    19.849452    1.0024016    23.679375    6.0483988    4.5452976    1.5031012 0.0021172122 -0.024071344    4.5672517 
+   21200    19.917757    1.0116645     23.76722     6.045319    4.5283282    1.5169909 0.0023015893 -0.024798205    4.5508248 
+   21210    20.218735    1.0247442    23.738836    6.0583536    4.5217497    1.5366039 0.0022160028 -0.024177439    4.5437111 
+   21220    20.436012    1.0232327    23.563162    6.0923316    4.5579942    1.5343374 0.0020319908 -0.023237017    4.5791992 
+   21230    20.303921    1.0028107    23.744213    6.0644674    4.5607527    1.5037147 0.0019661876 -0.023186552    4.5819731 
+   21240    20.080238    1.0103281    23.636832    6.0702675    4.5552806    1.5149869 0.0018567668 -0.021974996    4.5753988 
+   21250      20.1825    1.0114014    23.678692    6.0650387    4.5484424    1.5165963  0.001835093 -0.021402304    4.5680096 
+   21260    20.238938    1.0179621    23.865164     6.057507    4.5310728    1.5264342 0.0017598011 -0.021314024     4.550627 
+   21270    20.206579    1.0316572    24.262517    6.0658019    4.5188319      1.54697 0.0017630532 -0.020848694    4.5379176 
+   21280    20.465777    1.0218299    23.622224    6.0770702    4.5448363     1.532234 0.0017296775 -0.020147857    4.5632544 
+   21290    20.252156     1.043052    23.891072    6.0893378    4.5252813    1.5640565 0.0016295113 -0.019232197     4.542884 
+   21300    20.369036    1.0254115     23.58124    6.1057669    4.5681623    1.5376045 0.0016565282 -0.019368393    4.5858742 
+   21310    19.794967    1.0176125    23.993584    6.0696122    4.5437022      1.52591 0.0016392976 -0.019768499    4.5618314 
+   21320    19.961925    1.0189854    23.673853    6.0773593    4.5493907    1.5279686 0.0016067832 -0.019950903    4.5677348 
+   21330    20.311037    1.0143835    23.899078    6.0750709    4.5540028    1.5210681 0.0013564001 -0.019629437    4.5722759 
+   21340    20.256914    1.0337025    23.881247    6.0574984    4.5074614     1.550037 0.0014049459 -0.019995839    4.5260523 
+   21350    20.185199    1.0041862    23.790793    6.0578274    4.5520501    1.5057773 0.0014901171  -0.02026418    4.5708242 
+   21360    20.117008    1.0195608    23.916206    6.0736503    4.5448188    1.5288314 0.0016713286 -0.021343597    4.5644911 
+   21370    19.985662    1.0184638    23.842027    6.0797246     4.552538    1.5271865 0.0016644231 -0.021468121    4.5723417 
+   21380    20.310104    1.0214187    23.698083     6.093453    4.5618357    1.5316174 0.0015079464 -0.020616869    4.5809446 
+   21390    20.045848    1.0181461    23.933974    6.0700042    4.5432941    1.5267101 0.0013248906 -0.019746587    4.5617158 
+   21400     20.42325    1.0264732    23.694327    6.0578445    4.5186478    1.5391966 0.0013004314 -0.019592465    4.5369399 
+   21410    20.518487   0.99749388    23.614405    6.0355283    4.5397863    1.4957421 0.0014307319 -0.019999771    4.5583553 
+   21420    20.324767     1.015492    23.611486    6.0284342     4.505704    1.5227302 0.0015040993 -0.020575417    4.5247753 
+   21430    20.013686    1.0011935    23.841702    6.0132844    4.5119947    1.5012897 0.0017277985 -0.021799157    4.5320661 
+   21440     20.06415     1.001238    23.668387    6.0378711    4.5365146    1.5013564 0.0019597378 -0.023034102     4.557589 
+   21450    20.505124   0.99157558     23.77754    6.0213503    4.5344828    1.4868676 0.0022256767 -0.024176218    4.5564333 
+   21460    20.295967    1.0074811    23.743708    6.0319781    4.5212602    1.5107179 0.0021364064 -0.023695522    4.5428193 
+   21470    20.100798    1.0059577    23.585151    6.0532762    4.5448426    1.5084336 0.0020030223  -0.02295862    4.5657982 
+   21480    20.150981    1.0094696     23.73257    6.0399858    4.5262861    1.5136997 0.0020337584 -0.023472256    4.5477246 
+   21490    20.165645    1.0089587    23.890287    6.0292894    4.5163559    1.5129335 0.0022036853 -0.024483084    4.5386353 
+   21500    19.793005   0.99567227    23.765292    6.0100254    4.5170148    1.4930106 0.0023205594 -0.024945915    4.5396402 
+   21510    20.168061   0.99204842    23.610009     6.017423    4.5298464    1.4875766  0.002289817 -0.024905565    4.5524621 
+   21520    20.510331    1.0192926    23.805741    6.0385677    4.5101384    1.5284293 0.0021395678  -0.02435439    4.5323533 
+   21530    20.312158    1.0106887    23.864419    6.0416555    4.5261279    1.5155276 0.0020483182 -0.023908055    4.5479876 
+   21540    20.350417    1.0108583    23.749355    6.0629604    4.5471784    1.5157821 0.0020508556 -0.024001242    4.5691288 
+   21550    20.275423    1.0187662    23.844779    6.0566881    4.5290481    1.5276399 0.0020332936 -0.023370551    4.5503854 
+   21560    20.368362    1.0175263     23.56909    6.0762795    4.5504988    1.5257806 0.0019617377 -0.022842818    4.5713799 
+   21570    20.065984    1.0142603     23.66202    6.0698686    4.5489853    1.5208833 0.0021054455 -0.023484075    4.5703639 
+   21580    20.552166    1.0166717    23.631735    6.0710695    4.5465703    1.5244992 0.0019920036 -0.023116107    4.5676944 
+   21590    20.154933    1.0285673     23.80522     6.089806    4.5474693    1.5423367 0.0017429297   -0.0217579    4.5674843 
+   21600     19.93077     1.036723    23.672675    6.0837783    4.5292121    1.5545661 0.0014568682 -0.020188475    4.5479437 
+   21610    20.384156    1.0164461    23.715724    6.0677754    4.5436144    1.5241609  0.001141195 -0.019068488    4.5615417 
+   21620    20.301812   0.99986282    23.793079    6.0380225    4.5387282    1.4992943 0.0011391068 -0.019032792    4.5566218 
+   21630    20.359371    1.0112679     23.70023      6.04846    4.5320639    1.5163961 0.0013055636 -0.019490793    4.5502491 
+   21640    19.984617    1.0098575    23.755901    6.0624523    4.5481711    1.5142813 0.0013122112 -0.019852323    4.5667112 
+   21650    20.210797    1.0206169    23.960293    6.0554222    4.5250071    1.5304151 0.0012779475 -0.019609242    4.5433384 
+   21660    20.263678    1.0024848    23.560225    6.0594278    4.5562019    1.5032259 0.0012955202 -0.018756073    4.5736624 
+   21670    20.290085   0.99357272    23.762942    6.0249754    4.5351131    1.4898623 0.0012474574 -0.018164053    4.5520297 
+   21680    20.384311   0.99657923    23.586371    6.0457135     4.551343    1.4943706 0.0011696028 -0.017684525    4.5678579 
+   21690     20.06666    1.0114887    23.746927    6.0525072    4.5357799    1.5167272 0.0013511568 -0.019105233     4.553534 
+   21700    20.389749    1.0200696    23.893525    6.0755033    4.5459089    1.5295944 0.0014038838 -0.019836789    4.5643418 
+   21710    20.072918    1.0130148    23.641787    6.0430249    4.5240092    1.5190157 0.0015307704 -0.021304918    4.5437833 
+   21720     19.85223     1.022075    23.828132    6.0414908    4.5088894    1.5326014 0.0015814373 -0.021146554    4.5284545 
+   21730    20.046108    1.0042445    23.708963    6.0256206     4.519756    1.5058646 0.0014208114 -0.020019172    4.5383543 
+   21740     20.26915     0.982157    23.274864    6.0082625    4.5355181    1.4727444 0.0016745708 -0.020980574    4.5548241 
+   21750    20.086253   0.98167383    23.406928    6.0011704    4.5291505    1.4720199 0.0018024955  -0.02165034    4.5489984 
+   21760    20.192145   0.99880433    23.772995    6.0271812    4.5294741    1.4977071 0.0017854057  -0.02162588    4.5493146 
+   21770     19.97545    1.0005503     23.47064    6.0300336    4.5297084    1.5003252 0.0019993103 -0.022504139    4.5502132 
+   21780    20.200169    1.0056872    23.784403    6.0465986    4.5385707    1.5080279 0.0020680534 -0.022794543    4.5592972 
+   21790    20.334558    1.0235862     24.00394     6.053708    4.5188406    1.5348675 0.0019519265 -0.022197156    4.5390858 
+   21800    20.366722    1.0246854    23.833651    6.0800508     4.543535    1.5365158 0.0017811118 -0.021439887    4.5631938 
+   21810    20.031824    1.0111139    23.665419    6.0770743     4.560909    1.5161652 0.0016579177 -0.020614983    4.5798661 
+   21820    20.299828    1.0105929    23.687367    6.0655085    4.5501244    1.5153841 0.0017620638 -0.021171013    4.5695334 
+   21830    19.748385    1.0218492    23.639848    6.0789821    4.5467192    1.5322629 0.0017225905 -0.021459569    4.5664562 
+   21840    20.178646    1.0083888    23.570686    6.0540244    4.5419455    1.5120789 0.0017145203 -0.021439023      4.56167 
+   21850      20.2919    1.0137804    23.913551    6.0229559    4.5027922    1.5201637 0.0018282327  -0.02205276    4.5230167 
+   21860    20.318487    1.0111579    23.987931    6.0350567    4.5188254    1.5162313 0.0018560887 -0.022674163    4.5396435 
+   21870    20.355076    1.0130673    23.826892    6.0482617    4.5291673    1.5190944 0.0018569963 -0.022805735     4.550116 
+   21880    20.189152    1.0097864    23.811198     6.058575    4.5444003    1.5141747  0.001959386 -0.023469292    4.5659102 
+   21890    20.118531    1.0178187    23.582743    6.0538457    4.5276265    1.5262191 0.0017990499 -0.022926163    4.5487537 
+   21900    20.294058    1.0335243    23.664943    6.0818486    4.5320789    1.5497698 0.0017051037 -0.022264459    4.5526382 
+   21910     20.27866    1.0256732    23.741962    6.0996131    4.5616162    1.5379969 0.0017163538 -0.022057679    4.5819575 
+   21920    20.408764    1.0323076    23.679785    6.1179628    4.5700176    1.5479453 0.0018618976 -0.022697761    4.5908534 
+   21930    20.305515     1.045252    23.929551    6.1016736    4.5343183    1.5673553 0.0018081851 -0.022379256    4.5548893 
+   21940    20.177246    1.0228261    23.745083    6.0818665    4.5481388    1.5337277 0.0018208576 -0.022136548    4.5684545 
+   21950     20.12636     1.012271    23.775491    6.0414684     4.523568    1.5179004 0.0019757083  -0.02290995    4.5445022 
+   21960    19.948076   0.99377541    23.633265    6.0421896    4.5520234    1.4901662 0.0019629204 -0.022459312    4.5725197 
+   21970    20.008802    1.0304477     23.63091    6.0635549    4.5183985    1.5451564 0.0018194608 -0.022144128    4.5387231 
+   21980    20.274688    1.0384951    23.895422    6.0847962    4.5275729    1.5572233 0.0016942532 -0.021911139    4.5477897 
+   21990    20.217836    1.0334284    23.764713    6.0983289     4.548703    1.5496259 0.0017274449 -0.022064728    4.5690403 
+   22000    20.150253    1.0137304     23.88265    6.0714512    4.5513625    1.5200888  0.001724744 -0.021863812    4.5715015 
+   22010    20.203329    1.0245755    23.703289    6.0630052    4.5266542     1.536351 0.0018649593 -0.022161725     4.546951 
+   22020    20.500685    1.0263831    23.483118    6.0684512    4.5293897    1.5390615 0.0017100208   -0.0214798    4.5491595 
+   22030    20.330819    1.0229309    23.731863    6.0742066    4.5403217    1.5338849 0.0016700368  -0.02154641    4.5601981 
+   22040    20.477331    1.0044022    23.680151    6.0510376    4.5449365    1.5061011 0.0016646906 -0.021324665    4.5645965 
+   22050     20.17701    1.0363379    24.117775    6.0894492    4.5354605    1.5539887   0.00149019 -0.020420442    4.5543907 
+   22060    19.781717    1.0162007    23.714899    6.0510574    4.5272644     1.523793 0.0014547634  -0.02025066    4.5460603 
+   22070    20.254876    1.0030142    23.763981    6.0388529    4.5348331    1.5040198  0.001642871  -0.02156198    4.5547522 
+   22080    20.332632   0.99098809    23.646336    6.0111898    4.5252032    1.4859866 0.0017411759  -0.02187704     4.545339 
+   22090    20.299433    1.0111441     23.67418     6.030673    4.5144624    1.5162105 0.0017320366 -0.021782426    4.5345128 
+   22100    20.221776    1.0055282    23.812638    6.0340638    4.5262744    1.5077895 0.0018035759 -0.022170359    4.5466411 
+   22110    19.965077    1.0087975    23.857334    6.0291975    4.5165056    1.5126919 0.0019386623 -0.022764968    4.5373319 
+   22120    20.171241   0.99736649    23.961173    6.0223742    4.5268231     1.495551 0.0018536605 -0.022499924    4.5474694 
+   22130    20.168434    1.0081148    23.804901    6.0401476    4.5284794    1.5116682 0.0016112339 -0.021507898    4.5483761 
+   22140    20.293242   0.99497059    23.464422    6.0374117    4.5454533    1.4919584 0.0015351685 -0.020939155    4.5648573 
+   22150    20.304693    1.0047442    23.449554    6.0499945    4.5433806    1.5066139 0.0015510915 -0.021275058    4.5631046 
+   22160     20.23187    1.0262928    23.699474    6.0599081     4.520982    1.5389261  0.001609476 -0.021311873    4.5406844 
+   22170     20.28789    1.0024847    23.769631     6.036879    4.5336532    1.5032258 0.0015709202 -0.021176269    4.5532586 
+   22180    20.149811    1.0327776    23.829869     6.054993     4.506343      1.54865 0.0016689525 -0.021903258    4.5265773 
+   22190    20.404953    1.0210497    23.766376    6.0697822    4.5387182     1.531064 0.0016978716 -0.021991881    4.5590122 
+   22200    20.069611    1.0397707    23.725117    6.0823519    4.5232157    1.5591362 0.0014903073  -0.02098527    4.5427107 
+   22210     20.28449    1.0074315     23.81992     6.057046    4.5464025    1.5106436 0.0013890492 -0.020979155    4.5659926 
+   22220    20.244634    1.0042245    23.674821    6.0448935    4.5390588    1.5058347 0.0013989097 -0.020893801    4.5585537 
+   22230    20.117034    1.0035327     23.85837    6.0490886    4.5442914    1.5047973 0.0013662663 -0.020547255    4.5634723 
+   22240     19.31268    1.0196781    23.846076    6.0466679    4.5176606    1.5290072 0.0015197412 -0.021377868    4.5375188 
+   22250    20.144941    1.0017011    23.932816    6.0355714    4.5335206    1.5020508 0.0017512231  -0.02267159     4.554441 
+   22260    19.952262    1.0129169    23.493329    6.0401724    4.5213036    1.5188688 0.0019662877 -0.023553747     4.542891 
+   22270    20.052104    0.9940935    23.765343    5.9944757    4.5038325    1.4906432 0.0019891861 -0.023071641    4.5249149 
+   22280    20.136835   0.99138825    23.639648    5.9970516    4.5104649    1.4865867 0.0020667184 -0.023197636    4.5315959 
+   22290    20.302649    1.0135443    23.801457    6.0076599    4.4878503    1.5198096 0.0019361497 -0.022138325    4.5080525 
+   22300    19.904448   0.97578635    23.693983    5.9704356     4.507244    1.4631916 0.0015445258 -0.020334236    4.5260337 
+   22310     19.99692   0.99122547    23.547654    6.0199296     4.533587    1.4863426 0.0014553181 -0.019837509    4.5519692 
+   22320    19.989141   0.99951363    23.460807    6.0191478    4.5203771    1.4987707 0.0014115553 -0.019418315    4.5383838 
+   22330    20.333253   0.99604543    23.604891    6.0162834    4.5227133    1.4935701 0.0013831626 -0.019040489    4.5403706 
+   22340    20.126598   0.98875264    23.664188    6.0227426     4.540108    1.4826346 0.0013255383 -0.019078704    4.5578612 
+   22350     20.18238   0.97893702    23.663038    5.9872328    4.5193167    1.4679161 0.0013058587 -0.018584029    4.5365949 
+   22360    20.063011   0.98558279    23.572954    5.9945442    4.5166628    1.4778814 0.0014453813 -0.019044506    4.5342619 
+   22370    20.240589   0.98993321    23.824011    6.0200983    4.5356934    1.4844049 0.0014867913 -0.019342672    4.5535493 
+   22380    20.131829   0.99003726     23.66009    6.0292133    4.5446524    1.4845609 0.0016031791 -0.019835569    4.5628848 
+   22390    19.983828   0.98935004     23.52311    6.0439527    4.5604223    1.4835304 0.0016922764 -0.020151327    4.5788814 
+   22400    20.322735    1.0180216    23.690726    6.0528623    4.5263389    1.5265234 0.0019745521 -0.021760584    4.5461249 
+   22410    19.863569    1.0130297    23.914644    6.0435852    4.5245472     1.519038 0.0020686661 -0.022377506     4.544856 
+   22420    20.185204      1.01091    23.708163    6.0636597    4.5478001    1.5158596 0.0019152093 -0.021718894    4.5676038 
+   22430    20.189988   0.99584655    23.860822    6.0407433    4.5474714    1.4932719  0.001827756 -0.021435785    4.5670794 
+   22440    20.205264    1.0118815    23.692153    6.0441154    4.5267991    1.5173163 0.0018748363 -0.021849954    4.5467742 
+   22450    20.387768    1.0077514    23.556909    6.0289051    4.5177819    1.5111232  0.001847056 -0.021732616    4.5376674 
+   22460    19.908398    1.0029964    23.672183    6.0442178    4.5402247    1.5039931 0.0019143584 -0.021472548    4.5597829 
+   22470    20.467881    1.0210519    23.916567    6.0729855    4.5419182    1.5310673 0.0018021278 -0.020602766    4.5607189 
+   22480    19.999581    1.0079637    24.127983     6.059888    4.5484465    1.5114415 0.0015294859 -0.019603233    4.5665202 
+   22490    20.175428    1.0056965    23.679714    6.0610581    4.5530163    1.5080419 0.0016962956 -0.020289443    4.5716094 
+   22500    20.264934    1.0281118    23.819192    6.0680851    4.5264315    1.5416536  0.001776106 -0.020790324    4.5454457 
+   22510    20.326867    1.0106864    23.672656    6.0632923    4.5477681    1.5155242 0.0018912674 -0.021881317    4.5677581 
+   22520    20.054358    1.0219341    23.659781    6.0724457    4.5400555    1.5323902 0.0019415126    -0.022453     4.560567 
+   22530    20.214068    1.0057864    23.751665    6.0612857     4.553109    1.5081767 0.0018740711 -0.022243851    4.5734788 
+   22540    20.597429    1.0283857    23.732305    6.0795491    4.5374848    1.5420643  0.001658538 -0.021602277    4.5574285 
+   22550     20.29253    1.0162006    23.865746    6.0498646    4.5260718    1.5237929  0.001694691 -0.022107589    4.5464847 
+   22560    20.261609    1.0118599    23.669543    6.0594133    4.5421294    1.5172839 0.0015539052 -0.021320708    4.5618962 
+   22570    20.333885    1.0024921    23.820938    6.0349349    4.5316979     1.503237 0.0017191024 -0.022016606    4.5519954 
+   22580    20.252019    1.0053453    23.660543    6.0352063    4.5276909    1.5075153 0.0017118621 -0.021851694    4.5478308 
+   22590    20.575116    1.0219574    23.954089     6.060362    4.5279368    1.5324252 0.0019490141 -0.022342932    4.5483308 
+   22600    20.411943    1.0096399    23.515484    6.0642015    4.5502464    1.5139551 0.0019981792 -0.023014478    4.5712627 
+   22610    20.039817     1.002439    23.734047    6.0265942    4.5234369    1.5031573 0.0018580292 -0.022725744    4.5443046 
+   22620    20.161258     1.001408    23.348748    6.0509487    4.5493375    1.5016113 0.0018928604 -0.022542096    4.5699867 
+   22630    20.415432    1.0219102    23.802548    6.0753146    4.5429602    1.5323544  0.001967049 -0.022568016    4.5635612 
+   22640    20.189808    1.0247205    23.970509    6.0660813    4.5295129    1.5365684 0.0019779609 -0.022276581    4.5498116 
+   22650    20.311933    1.0073004    23.896822    6.0354164    4.5249695    1.5104469 0.0019550269 -0.022161446    4.5451759 
+   22660    20.073538    1.0068107    23.663731    6.0479756     4.538263    1.5097126 0.0018991688 -0.021863332    4.5582272 
+   22670    20.295365    1.0080874    23.758806    6.0257512    4.5141241     1.511627 0.0020416782 -0.022438712    4.5345212 
+   22680    20.400397   0.98796786    23.797246    6.0116015    4.5301437    1.4814578 0.0019922725 -0.022498273    4.5506497 
+   22690    20.304632    1.0162142    23.790698    6.0310557    4.5072425    1.5238132 0.0018869537  -0.02176259    4.5271181 
+   22700    20.307724    1.0137359    23.686735     6.051879    4.5317821    1.5200969 0.0019369749 -0.022326903     4.552172 
+   22710    20.200684    1.0162631    23.514394    6.0651344    4.5412479    1.5238865  0.001922324 -0.022187431     4.561513 
+   22720    20.168397     1.021993    23.614966    6.0661224    4.5336438    1.5324786  0.001886963 -0.021898518    4.5536554 
+   22730    20.281618   0.99696898    23.374429    6.0381645    4.5432095     1.494955 0.0019003829 -0.021676768    4.5629859 
+   22740    20.419898    1.0166262    23.477015    6.0534049     4.528974    1.5244309  0.001863497 -0.021748876    4.5488594 
+   22750    20.115876    1.0247773    23.951856    6.0762799    4.5396263    1.5366536 0.0019378605  -0.02195264    4.5596411 
+   22760    20.109711    1.0211961    23.844822    6.0628677    4.5315842    1.5312835 0.0019026686 -0.021788337    4.5514699 
+   22770     20.36246    1.0036243    23.606315    6.0512474    4.5463128    1.5049346 0.0017643064 -0.021372492     4.565921 
+   22780    20.135751    1.0220537    23.613473     6.080852    4.5482825    1.5325696  0.001756366 -0.021473979    4.5680001 
+   22790    20.063856    1.0381566    23.608385    6.0900397    4.5333238    1.5567159 0.0015929755 -0.020882759    4.5526136 
+   22800    20.233199    1.0287941     23.48161    6.0615818    4.5189051    1.5426767 0.0015886508 -0.021259533     4.538576 
+   22810    20.315682    1.0365991    23.886744    6.0881856    4.5338052    1.5543804 0.0015891522 -0.021382854    4.5535989 
+   22820    20.242051    1.0235259    23.967806    6.0868563    4.5520793     1.534777 0.0016349034  -0.02129178    4.5717362 
+   22830    20.244411    1.0155801    23.400287    6.0553539    4.5324915    1.5228624 0.0015682834 -0.020483866    4.5514071 
+   22840    20.085936   0.99731616    23.557006    6.0208621    4.5253865    1.4954756 0.0018456765 -0.021575324    4.5451162 
+   22850     20.07855   0.99671853    23.566452    6.0421272    4.5475478    1.4945794 0.0020840095 -0.022957397    4.5684212 
+   22860    20.227184   0.99999116    23.672857    6.0394058    4.5399191    1.4994867 0.0021731193 -0.023353357    4.5610993 
+   22870    20.396121    1.0188485    23.700629     6.056877    4.5291137    1.5277633 0.0021453203 -0.023078748    4.5500471 
+   22880    20.334514    1.0225645    23.669572    6.0711435     4.537808    1.5333355 0.0018484863 -0.021922184    4.5578817 
+   22890    20.364141    1.0419924    23.491416    6.0816042    4.5191367    1.5624676 0.0017503611 -0.021317401    4.5387037 
+   22900    20.269013     1.016347    23.648112    6.0601588    4.5361466    1.5240123 0.0018507871 -0.021750928    4.5560467 
+   22910    20.203501    1.0102068     23.59392    6.0798965    4.5650914    1.5148051 0.0019946234 -0.022460041    4.5855569 
+   22920    20.208668    1.0080037    23.569603    6.0430159    4.5315143    1.5115016 0.0019922384 -0.022385317    4.5519074 
+   22930    20.122912    1.0041827    23.573566    6.0350193    4.5292473    1.5057719 0.0018739649 -0.021686783    4.5490602 
+   22940    19.918239    1.0078098    23.668441    6.0425311    4.5313203    1.5112108 0.0016753379 -0.020560401    4.5502054 
+   22950    20.163427    1.0104106    23.726111    6.0142576    4.4991469    1.5151107 0.0015522779 -0.020222076    4.5178167 
+   22960     20.31179   0.99643949    23.605019    6.0044506    4.5102896     1.494161 0.0016652035 -0.021286054    4.5299105 
+   22970    20.344342   0.99664206    23.906364    6.0161248      4.52166    1.4944648 0.0019805844 -0.022928451    4.5426078 
+   22980    20.417076   0.99371602    23.724031    6.0057707    4.5156935    1.4900772 0.0021357903 -0.023178838    4.5367365 
+   22990    19.755945   0.99159534    23.413577    6.0126832     4.525786    1.4868972 0.0020941514 -0.022797212    4.5464891 
+   23000    19.937979   0.98539856    23.687235    6.0110196    4.5334144    1.4776051 0.0019728314 -0.022836514    4.5542781 
+   23010    20.372589    1.0079476    23.622525    6.0147726    4.5033551    1.5114175 0.0018691008 -0.022579097    4.5240651 
+   23020    20.463418    1.0040991    23.810103    6.0389386    4.5332919    1.5056467 0.0017801594   -0.0221408    4.5536526 
+   23030    20.358985   0.99668406    23.921954    6.0294093    4.5348816    1.4945278 0.0017540014 -0.022179364    4.5553069 
+   23040    20.388499     1.005846    23.804487    6.0198161      4.51155    1.5082661 0.0018440764 -0.023089767    4.5327956 
+   23050    20.321172   0.97605577    23.745711    5.9925407     4.528945    1.4635956 0.0020867556 -0.024229123    4.5510874 
+   23060     20.27744   0.96943921    23.864396    5.9782183    4.5245442    1.4536741 0.0021264173 -0.024099358    4.5465172 
+   23070    20.066456   0.97742001    23.287342    5.9845123     4.518871    1.4656413 0.0022830599 -0.024303492    4.5408915 
+   23080    20.523539   0.98073135    23.737927    5.9922556     4.521649    1.4706067 0.0024589252 -0.024595879    4.5437859 
+   23090    20.236887   0.97804357    23.375175    6.0055995    4.5390232    1.4665763 0.0023644582 -0.024592747    4.5612515 
+   23100    20.153513   0.99203476    23.987471    6.0314062    4.5438501    1.4875561 0.0023915752 -0.025061761    4.5665202 
+   23110    20.454971    1.0022113    23.752161     6.013156    4.5103401    1.5028159 0.0023760886 -0.025054516    4.5330185 
+   23120    20.502668    0.9821091    23.790577    5.9953197    4.5226471    1.4726726 0.0023546769 -0.025305441    4.5455978 
+   23130     20.44373   0.97764703    23.741302    5.9910224    4.5250407    1.4659817 0.0021555227 -0.024740051    4.5476252 
+   23140    20.312627   0.99429897    23.564944    6.0058743    4.5149229    1.4909513 0.0019826912 -0.023975646    4.5369159 
+   23150     20.10847   0.98772031    23.482344    6.0037824    4.5226958    1.4810866 0.0018299983 -0.023279745    4.5441455 
+   23160    20.020376   0.99873788     23.34803    6.0170467    4.5194392    1.4976075 0.0017671806 -0.022821523    4.5404935 
+   23170     20.14332    1.0024315    23.820526    6.0401645    4.5370184    1.5031461 0.0016639853 -0.022178139    4.5575326 
+   23180    20.286491    1.0050483    23.638734    6.0459818     4.538912    1.5070699 0.0015573439 -0.021339292    4.5586939 
+   23190    20.089417    1.0116248    23.971023     6.041684    4.5247526    1.5169313  0.001622761 -0.021617794    4.5447477 
+   23200    20.319764   0.98693766    23.773045     6.038705     4.558792     1.479913 0.0015768683 -0.021045048    4.5782602 
+   23210    20.392168    1.0277447     23.97434    6.0880758    4.5469726    1.5411032 0.0015229304 -0.020902224    4.5663519 
+   23220    20.354154    1.0069194    23.470766    6.0691907     4.559315    1.5098757 0.0014817707 -0.020664486    4.5784977 
+   23230    20.220357    1.0151928    23.755211    6.0619716    4.5396899    1.5222816 0.0015248689 -0.020627574    4.5587926 
+   23240    20.341123   0.99740738    23.778339    6.0300856    4.5344732    1.4956124 0.0017569427 -0.021588424    4.5543047 
+   23250    20.410378    1.0215098    23.523436    6.0526171    4.5208632    1.5317539 0.0019402107 -0.022235669    4.5411587 
+   23260    20.201733    1.0158107    23.590662    6.0651661     4.541958    1.5232081 0.0018830484 -0.022074444    4.5621494 
+   23270    20.018876    1.0109073    23.693698     6.065307    4.5494516    1.5158555 0.0018194272 -0.021961304    4.5695934 
+   23280    20.165259    1.0089386    23.727915    6.0534681    4.5405647    1.5129034 0.0017757017 -0.022070505    4.5608595 
+   23290    20.181013    1.0021824    23.644071     6.045813    4.5430405    1.5027725 0.0017847959 -0.022047656    4.5633033 
+   23300     20.45934    1.0127519    23.805786    6.0237532    4.5051317    1.5186215 0.0016642831 -0.021535195    4.5250026 
+   23310    20.207343   0.99535364    23.576936     6.038778    4.5462452    1.4925328 0.0017107313 -0.021720172    4.5662546 
+   23320    20.336222    1.0119166     23.87021    6.0459052    4.5285363     1.517369 0.0018429457 -0.022176894    4.5488702 
+   23330    20.296599     1.010335    23.748666    6.0639455    4.5489482    1.5149973 0.0019007611 -0.022223667    4.5692711 
+   23340    20.203517    1.0154999    23.691326    6.0725336    4.5497915    1.5227421  0.001890215 -0.022188432    4.5700897 
+   23350    20.182309    1.0342229    23.703362    6.0807475    4.5299302    1.5508173 0.0018247077 -0.021928562     4.550034 
+   23360    20.307151    1.0124282    23.757305    6.0405782    4.5224421    1.5181361 0.0018216106 -0.021795917    4.5424164 
+   23370    20.527577   0.98372727    23.590528    6.0202712    4.5451722     1.475099 0.0016954613 -0.021311521    4.5647883 
+   23380    20.224991    1.0031558    23.752902    6.0261701    4.5219379    1.5042321 0.0016761226 -0.021251995    4.5415138 
+   23390     20.52127    1.0002322    23.735492    6.0110034    4.5111553    1.4998482 0.0014929018 -0.020834189    4.5304966 
+   23400    20.084594   0.99702704    23.665258    6.0212246    4.5261826     1.495042 0.0013159384 -0.020186627    4.5450533 
+   23410    20.204276   0.99499911    23.753301    6.0260968    4.5340956    1.4920012 0.0013830055 -0.020552403     4.553265 
+   23420    20.193805    1.0048255    23.608097    6.0527428    4.5460069    1.5067359 0.0012958329 -0.020358138    4.5650692 
+   23430    20.344671    1.0149158    23.700148    6.0535914    4.5317251    1.5218663 0.0013358943 -0.020567479    4.5509567 
+   23440    20.049944    1.0084026    23.523529    6.0429561    4.5308564    1.5120997 0.0014205349 -0.021135076     4.550571 
+   23450    20.355921   0.99720394    23.679702    6.0394743     4.544167    1.4953073 0.0017812899 -0.022660428    4.5650462 
+   23460    19.809969    1.0104516    23.752641     6.031303    4.5161308    1.5151722 0.0019480776 -0.023589483    4.5377722 
+   23470    19.898534    1.0074961    23.788408    6.0433531    4.5326127    1.5107404 0.0018979344 -0.023212758    4.5539276 
+   23480    20.015915    1.0190631      23.4234    6.0581223    4.5300371    1.5280851  0.001877362 -0.023115237     4.551275 
+   23490    20.089237    1.0279172    23.944977    6.0748173    4.5334555    1.5413618 0.0018402712 -0.022948863    4.5545641 
+   23500    20.336469    1.0150687    23.756757    6.0679483    4.5458527    1.5220956 0.0018198074 -0.022625823    4.5666588 
+   23510    20.375334    1.0161835    23.482178    6.0561117    4.5323445    1.5237672  0.001840172 -0.022694582     4.553199 
+   23520    20.138311    1.0122117    23.934224    6.0326088    4.5147974    1.5178114  0.001748995 -0.022256409    4.5353048 
+   23530    20.189915   0.99303284    23.521761    6.0159507    4.5268979    1.4890527 0.0017227014 -0.022066579    4.5472418 
+   23540    20.145552   0.98956224    23.764267    6.0257386      4.54189    1.4838486 0.0017526356 -0.022407793    4.5625451 
+   23550    19.815203    1.0014007    23.624249    6.0318921    4.5302918    1.5016003 0.0019788336 -0.023455631    4.5517686 
+   23560    20.330104   0.98824946    23.455735    6.0210336    4.5391535    1.4818801 0.0018341916 -0.022667472    4.5599868 
+   23570    20.442491   0.98357644    23.776792     5.993123    4.5182501    1.4748729 0.0017551731 -0.022283413    4.5387783 
+   23580    20.082004   0.99817028    23.543712    6.0374389    4.5406826    1.4967563 0.0019639209 -0.023034104    4.5617527 
+   23590    19.913299    1.0025659    23.539521    6.0321425    4.5287949    1.5033476 0.0017752792 -0.022263913    4.5492835 
+   23600    19.933921    1.0250531    23.755742    6.0403207    4.5032536    1.5370671 0.0018136273 -0.022395807    4.5238357 
+   23610    19.960907    1.0067986    23.913638    6.0599802    4.5502857    1.5096945 0.0018748947 -0.022141878    4.5705527 
+   23620    20.097452    1.0296254    23.751836     6.061017    4.5170937    1.5439232 0.0019965489 -0.022594739    4.5376919 
+   23630     20.06295    1.0129138    23.683994    6.0491369    4.5302727    1.5188642 0.0019397942 -0.022175705    4.5505086 
+   23640    19.321932    1.0069563    23.410589    6.0533312    4.5434002     1.509931 0.0016603555 -0.021354607    4.5630944 
+   23650    20.210138    0.9993507     23.59231    6.0452023     4.546676    1.4985264 0.0015616386   -0.0212218    4.5663361 
+   23660    20.159813    1.0239765    23.668089    6.0623721    4.5269193    1.5354528 0.0015769788 -0.021668288    4.5470106 
+   23670    19.935762    1.0140955    23.730243    6.0458145    4.5251783    1.5206362 0.0017581202 -0.022507625    4.5459278 
+   23680    20.028108    1.0138524    23.701589    6.0482266    4.5279549    1.5202717 0.0018337319 -0.022992341    4.5491135 
+   23690     20.22628   0.98714616    23.607697    6.0248553    4.5446296    1.4802257 0.0018839821 -0.023492432    4.5662381 
+   23700    20.261429   0.97927216    23.381335    5.9987795    4.5303609    1.4684186 0.0019659873 -0.023811135     4.552206 
+   23710    20.212916   0.98785346    23.505425    6.0195926    4.5383063    1.4812863 0.0020424486 -0.024069753    4.5603336 
+   23720    20.133999    1.0029274    23.590425    6.0465354    4.5426457    1.5038897 0.0019739383 -0.023525534    4.5641973 
+   23730    20.302402    0.9984348    23.756984    6.0471427    4.5499898     1.497153 0.0017215009 -0.022169924    4.5704382 
+   23740    20.509586    1.0090476     23.39426    6.0736741    4.5606072    1.5130669 0.0016583788 -0.021927036    4.5808759 
+   23750    20.462974    1.0010604    24.099731     6.042916     4.541826      1.50109 0.0017514215 -0.022396158    4.5624707 
+   23760    20.250502    1.0022378    23.677524     6.016941    4.5140855    1.5028555 0.0019003725 -0.023002585    4.5351877 
+   23770    20.423073   0.99210927    23.611863    6.0254268    4.5377589    1.4876678 0.0019146134 -0.022737288    4.5585816 
+   23780    20.306845    1.0052664    24.068752    6.0437332    4.5363363    1.5073969 0.0020004032 -0.022438208    4.5567741 
+   23790    20.221755     0.997443    23.752954    6.0421335    4.5464677    1.4956658 0.0021804178 -0.022704328    4.5669916 
+   23800     20.20379   0.99591921    23.538409    6.0117548     4.518374    1.4933809 0.0020602959 -0.022504619    4.5388183 
+   23810     20.37116   0.99068423    23.692456    6.0199677    4.5344367     1.485531 0.0018805079 -0.022039089    4.5545953 
+   23820    20.328314     1.003927    23.622848    6.0446528    4.5392642    1.5053886 0.0015901444 -0.020852287    4.5585264 
+   23830    20.220608   0.99319273    23.678386    6.0372644    4.5479719    1.4892925 0.0015677901 -0.020633301    4.5670374 
+   23840    20.310626    1.0199382    23.834727    6.0523385    4.5229412    1.5293973 0.0015312311 -0.020274321    4.5416843 
+   23850    20.015921    1.0257457    23.849586    6.0549787     4.516873    1.5381057  0.001709549 -0.020711769    4.5358752 
+   23860    19.947447    1.0195814    23.529635    6.0701765    4.5413142    1.5288624 0.0016914659 -0.020187404    4.5598101 
+   23870    20.030122    1.0432282    23.863339    6.0752645    4.5109438    1.5643207 0.0015754334 -0.020260205    4.5296285 
+   23880    20.187944     1.021343    23.898747    6.0795122    4.5480083    1.5315038  0.001699513 -0.020645999    4.5669548 
+   23890    19.948342    1.0014293    23.589023    6.0496507    4.5480075    1.5016432 0.0020195126 -0.022353598    4.5683416 
+   23900     20.32962    1.0322013    23.743018    6.0783053    4.5305195    1.5477858 0.0020983128  -0.02339074    4.5518119 
+   23910    20.281093    1.0222308    23.918419     6.051883    4.5190479    1.5328351 0.0020678696 -0.023115259    4.5400953 
+   23920    20.056837    1.0062705    23.622847    6.0552528    4.5463502    1.5089026 0.0018086652  -0.02205012    4.5665916 
+   23930    20.234719    1.0136713    23.668393    6.0731438    4.5531437    1.5200001 0.0016559795 -0.021270489    4.5727582 
+   23940     20.01513    1.0098924    23.423335    6.0511744    4.5368407    1.5143337 0.0017100004 -0.021530094    4.5566608 
+   23950    20.108877    1.0124026    23.984277    6.0445353    4.5264375    1.5180977 0.0018466905 -0.022121359    4.5467122 
+   23960    20.518357    1.0068178    23.785983    6.0540179    4.5442946    1.5097233 0.0018864802 -0.022492907     4.564901 
+   23970    20.146539    1.0120818    23.736721    6.0323823    4.5147657    1.5176166 0.0020100453 -0.022779861    4.5355355 
+   23980     19.85661    0.9861881    23.452708    6.0099621     4.531173     1.478789 0.0021431956 -0.023334368    4.5523642 
+   23990    20.219742     1.017212    24.028372    6.0310706    4.5057611    1.5253094 0.0020364974 -0.023045076    4.5267697 
+   24000    20.371341    1.0025838    23.938287    6.0366011    4.5332267    1.5033744 0.0020414407 -0.023102301    4.5542876 
+   24010    20.483097   0.99372772     23.24688    6.0244295    4.5343348    1.4900947 0.0019018384 -0.022315459    4.5547484 
+   24020    20.580102   0.99735954    23.849946    6.0317649    4.5362243    1.4955406 0.0016916079 -0.021807616    4.5563403 
+   24030    20.359084    1.0117308    23.621408    6.0406048    4.5235144    1.5170904 0.0016401422  -0.02207385    4.5439481 
+   24040    20.481886   0.99625273    23.793891    6.0278107    4.5339298     1.493881 0.0017276388 -0.022738991    4.5549411 
+   24050    20.450733   0.99865193    23.900343    6.0258162    4.5283376    1.4974786 0.0017906946 -0.022339873    4.5488868 
+   24060    20.356616    0.9868164    23.680855    6.0221103    4.5423791    1.4797312 0.0016468203 -0.021359595    4.5620919 
+   24070    20.395222   0.99858476    23.491678    6.0164861    4.5191082    1.4973779 0.0013495633 -0.019702813    4.5374615 
+   24080    20.033622   0.98269033    23.561608    5.9945975    4.5210533    1.4735442 0.0012425904 -0.019032474    4.5388432 
+   24090    20.055942   0.99452838    23.911331    6.0024926    4.5111973    1.4912953   0.00143589 -0.020459369    4.5302208 
+   24100    20.306081   0.98638432    23.696069    6.0044419    4.5253586    1.4790833 0.0015961982 -0.021630234    4.5453927 
+   24110    20.201808    1.0054519    23.719993    6.0277922     4.520117    1.5076752 0.0017151247 -0.021444341    4.5398463 
+   24120    20.076002   0.99249939     23.54113     6.021816    4.5335632    1.4882528  0.001533165 -0.020343812    4.5523738 
+   24130    20.266598     1.013076    23.683007    6.0526347    4.5335272    1.5191075 0.0016690372 -0.021121909      4.55298 
+   24140    20.342216    1.0008883    23.732273    6.0530825    4.5522505    1.5008321 0.0016982252 -0.021383872    4.5719361 
+   24150    19.980161     1.019814    23.852266    6.0729221    4.5437109    1.5292112 0.0017388236  -0.02178912    4.5637612 
+   24160    20.482599    1.0234883    23.799252    6.0576349    4.5229142    1.5347207  0.001969818 -0.022940959    4.5438853 
+   24170     20.29483    1.0023455    23.487109    6.0363911    4.5333741    1.5030171 0.0021144286 -0.023884139    4.5551438 
+   24180    19.968471    1.0193762    23.721699      6.03579    4.5072354    1.5285546 0.0019217971  -0.02321839     4.528532 
+   24190    20.147915   0.99448961    23.739074    6.0106052     4.519368    1.4912372 0.0017795997 -0.022284414    4.5398728 
+   24200    20.154346    1.0035012    23.634191     6.020985     4.516235    1.5047501 0.0017427337 -0.021627298    4.5361195 
+   24210     20.26067    0.9931718    23.785708    6.0341938    4.5449327    1.4892611  0.001653026 -0.020915936    4.5641956 
+   24220    20.219182   0.98590049    23.347193    6.0205957    4.5422379    1.4783578  0.001690746 -0.020909335    4.5614565 
+   24230     20.15099   0.99190927    23.668924     5.994906     4.507538     1.487368  0.001965082 -0.022661238    4.5282342 
+   24240    20.045976   0.98259161    23.891421    5.9992199    4.5258238    1.4733961 0.0021707288 -0.023387697    4.5470407 
+   24250    20.122046    1.0143718    23.891882    6.0495604    4.5285098    1.5210505 0.0020810983 -0.022692848    4.5491216 
+   24260    20.403774     1.007476    23.401581    6.0545221    4.5438119    1.5107102 0.0018306778 -0.022138665    4.5641199 
+   24270    20.232923    1.0198852    23.763324    6.0574052    4.5280873    1.5293179  0.001880628  -0.02268606    4.5488928 
+   24280      20.2091    1.0003575    23.770879    6.0400575    4.5400214    1.5000361 0.0019334529 -0.023165935    4.5612539 
+   24290    20.101674    1.0150857    23.933335    6.0579994    4.5358784     1.522121 0.0018622067 -0.022935572    4.5569518 
+   24300    20.016263    1.0171329    23.878749    6.0604629    4.5352721    1.5251908 0.0018966911 -0.023003949    4.5563794 
+   24310    19.977607     1.013279    23.600627    6.0661891    4.5467773    1.5194118 0.0019666247 -0.023250796    4.5680615 
+   24320    20.239675    1.0112294    23.684728    6.0552669    4.5389285    1.5163385 0.0019230771 -0.022806404    4.5598118 
+   24330    20.173745   0.99446981    23.579075    6.0382531    4.5470456    1.4912075 0.0018293347 -0.022531984    4.5677483 
+   24340     20.04324   0.99780254    23.584076    6.0127919     4.516587    1.4962049 0.0016591903 -0.021710926    4.5366387 
+   24350    19.998913    0.9909856    23.564228    6.0180957    4.5321128    1.4859829 0.0014429054 -0.020547603    4.5512175 
+   24360    20.278724   0.99181256    23.624269    6.0080165    4.5207935    1.4872229 0.0013865863 -0.019872189    4.5392791 
+   24370    20.413235    0.9999033    23.402943    6.0202816    4.5209266     1.499355 0.0016117337 -0.021027523    4.5403424 
+   24380    20.198597   0.99091756    23.757883    6.0337067    4.5478258    1.4858809 0.0017353227  -0.02126279    4.5673533 
+   24390    19.979298   0.99636221    23.753745    6.0337158    4.5396707    1.4940451 0.0016470102 -0.020905242    4.5589289 
+   24400    20.047668    1.0066986    23.663506    6.0505489    4.5410043    1.5095446 0.0017297571 -0.021026203    4.5603008 
+   24410    20.443241    1.0060404    23.608964    6.0465369    4.5379793    1.5085576 0.0017276882 -0.020866751    4.5571184 
+   24420     20.17949    1.0190705    23.537567    6.0625461    4.5344499    1.5280962 0.0018436587 -0.021135418    4.5537417 
+   24430    20.189985     1.015127    24.040827    6.0663676    4.5441847    1.5221829   0.00188475 -0.021567229    4.5638671 
+   24440    19.392368    1.0092381    23.889035    6.0414531    4.5281005    1.5133526 0.0018536215 -0.021578347    4.5478252 
+   24450    19.753525    1.0138394    23.644912    6.0365325    4.5162803    1.5202522 0.0017567732 -0.021528746    4.5360523 
+   24460    20.234212   0.99182396    23.593307    6.0291505    4.5419105      1.48724 0.0018908651 -0.022420409      4.56244 
+   24470    20.118855   0.99926725    23.865718     6.024609    4.5262077    1.4984012 0.0020495997 -0.022993955    4.5471521 
+   24480    20.117777    1.0007823    24.077386    6.0378929    4.5372199     1.500673 0.0020446195 -0.022980759    4.5581561 
+   24490     20.16675    1.0174955      23.7426    6.0516519    4.5259173    1.5257346 0.0021130328 -0.023421701     4.547226 
+   24500    19.983885   0.99982293    23.666569    6.0473099    4.5480754    1.4992345 0.0022483176 -0.024144223    4.5699713 
+   24510     19.90722    1.0115911    23.506979    6.0527788     4.535898    1.5168808 0.0023278561 -0.024470086    4.5580402 
+   24520    19.965426   0.98970047     23.32277    6.0415806    4.5575248    1.4840559  0.002234682 -0.024189502    4.5794796 
+   24530    20.375971    1.0082893    23.621774    6.0327402    4.5208104    1.5119298  0.002283021 -0.024543066    4.5430705 
+   24540    20.353748     1.006443    24.117107    6.0401712    4.5310099    1.5091612 0.0024129167 -0.024997991     4.553595 
+   24550    20.458961   0.98563162    23.836059     6.004758    4.5268034    1.4779546 0.0028174566 -0.026708198    4.5506941 
+   24560    20.326344    0.9787868    23.611414    5.9884484    4.5207576    1.4676908 0.0026802876  -0.02639606    4.5444733 
+   24570    20.252399   0.98712504    23.674026    5.9927686    4.5125746     1.480194 0.0024381228 -0.025351412    4.5354879 
+   24580    20.173422    1.0028187    23.882831    6.0002508    4.4965241    1.5037267 0.0023311142 -0.024669795    4.5188628 
+   24590    20.030554   0.98504827    23.597889    6.0007247    4.5236448    1.4770799 0.0021373815 -0.023757322    4.5452647 
+   24600    20.124768    1.0143158    23.732351    6.0486075     4.527641    1.5209665 0.0019174826 -0.022819903    4.5485434 
+   24610    20.222026    1.0043875     23.87527    6.0381067    4.5320277     1.506079 0.0016854056 -0.021650243    4.5519925 
+   24620    19.937478    1.0162452    23.508031    6.0450323    4.5211726    1.5238596 0.0016615254 -0.020903689    4.5404148 
+   24630    20.269751    1.0011038     23.58564    6.0404851      4.53933    1.5011551 0.0015159422 -0.020087315    4.5579014 
+   24640    20.060332    1.0273158    23.814442    6.0568305    4.5163705    1.5404601 0.0017047798 -0.021134985    4.5358007 
+   24650    20.395184    1.0113913    23.736355    6.0534334    4.5368522    1.5165812 0.0017223741 -0.022032399    4.5571623 
+   24660    20.349418   0.99960436    23.605445     6.051485    4.5525783    1.4989067 0.0017108458  -0.02246284    4.5733303 
+   24670    20.115767    1.0209871    24.113517    6.0472669    4.5162968    1.5309701 0.0017889319 -0.022972428    4.5374803 
+   24680     20.43213    1.0186191    23.832027    6.0585471    4.5311278    1.5274194 0.0019375896 -0.023679615    4.5528698 
+   24690    20.363687    1.0215323     23.50834    6.0666883    4.5349006    1.5317877 0.0018262385  -0.02284055    4.5559149 
+   24700    20.217513    1.0155312    23.595867     6.084924     4.562135    1.5227891 0.0018750212 -0.022613101     4.582873 
+   24710    20.340695    1.0203299    23.789589    6.0676074    4.5376227    1.5299847 0.0015652596 -0.020761146    4.5568186 
+   24720    20.443315    1.0170882    23.587909    6.0565457     4.531422    1.5251238 0.0015471964 -0.020628778    4.5505036 
+   24730    20.182192    1.0173559     23.61138    6.0759115    4.5503863    1.5255252  0.001549381 -0.020416229    4.5692532 
+   24740    20.078957    1.0082874    23.609037    6.0657225    4.5537955     1.511927 0.0012651178 -0.019094258    4.5716246 
+   24750    20.269244    1.0084761    23.579328    6.0466504    4.5344405    1.5122098 0.0012937505 -0.019512745    4.5526595 
+   24760    20.399827    1.0072992    23.845136    6.0197746    4.5093295    1.5104452 0.0013119913 -0.019788258    4.5278057 
+   24770    20.297664     1.004741    23.752244     6.033411     4.526802    1.5066091 0.0011788314 -0.018906938    4.5445301 
+   24780    20.192757    1.0231688    23.700149    6.0666479    4.5324063    1.5342416 0.0012121661 -0.019140896    4.5503351 
+   24790    20.254254    1.0161173    23.984261    6.0570607    4.5333928    1.5236679 0.0011130972 -0.018785807    4.5510655 
+   24800    20.306541    1.0001184    23.594268    6.0456608    4.5459833    1.4996775 0.0013110388 -0.019622468    4.5642947 
+   24810    20.091068    1.0115016    23.652859    6.0504468    4.5337002    1.5167466 0.0013920802 -0.019856329    4.5521644 
+   24820     20.18666    1.0123501    23.862254    6.0656788    4.5476597     1.518019  0.001488879  -0.02021639    4.5663873 
+   24830    20.147359   0.99717924    23.659755    6.0427361    4.5474659    1.4952703 0.0015890384 -0.020176367    4.5660532 
+   24840    20.452721    1.0181561    23.653848    6.0485909    4.5218659     1.526725 0.0015464772 -0.020208004    4.5405274 
+   24850    20.099263   0.99565923    23.754587    6.0226451    4.5296541     1.492991 0.0015060136 -0.020330112    4.5484782 
+   24860    19.891508   0.99273261    23.570189    6.0147834    4.5261809    1.4886025 0.0017409489 -0.021271841    4.5457118 
+   24870    20.039301    1.0082941    23.700694    6.0340306    4.5220936     1.511937 0.0018550848 -0.022280045    4.5425186 
+   24880    19.680543    1.0067243    24.046551     6.032361    4.5227779    1.5095831 0.0018726202 -0.022468846    4.5433741 
+   24890    19.887381    1.0119995    23.393057    6.0668626    4.5493693    1.5174933 0.0017558245 -0.021719582    4.5693331 
+   24900     19.97043    1.0335084    24.125735    6.1022092    4.5524634    1.5497458 0.0015063722 -0.019813399    4.5707704 
+   24910    20.164749    1.0351509    23.787728    6.0897865    4.5375777    1.5522088 0.0010541387 -0.017630723    4.5541543 
+   24920     20.54577    1.0320204    23.674955    6.0871825    4.5396679    1.5475146 0.00086676015 -0.016807035    4.5556082 
+   24930    20.447021     1.035956    23.596779    6.0923723    4.5389562     1.553416 0.0010159619 -0.017726676    4.5556669 
+   24940    20.271032    1.0176531    23.828792    6.0706966    4.5447257    1.5259708 0.0012217961 -0.018919402    4.5624233 
+   24950    20.108607     1.004627    23.801055    6.0386967    4.5322585    1.5064382 0.0012606106 -0.019356925    4.5503548 
+   24960    20.347531    1.0057054    23.590474    6.0141589    4.5061037    1.5080552 0.0013780664 -0.020140849    4.5248665 
+   24970     20.11835   0.99586449    23.743675    6.0188106    4.5255118    1.4932988 0.0015233252 -0.020626777    4.5446152 
+   24980    20.382326     1.009008    23.520243    6.0383929    4.5253854    1.5130076 0.0014176604 -0.020412609    4.5443803 
+   24990    20.407107   0.99589519    23.520758    6.0408981    4.5475533    1.4933448 0.0013954817 -0.020294973    4.5664528 
+   25000    20.269595    1.0056803    23.805905    6.0206856     4.512668    1.5080176 0.0013310086 -0.020496834    4.5318339 
+   25010    20.242267    1.0026959    23.870943    6.0445122    4.5409696    1.5035426 0.0013156547 -0.020826191    4.5604801 
+   25020    20.382995    1.0033332    23.462641    6.0236696    4.5191714    1.5044982 0.0014042865 -0.020828251    4.5385953 
+   25030    20.474421    1.0081175    23.816673     6.043172    4.5314999    1.5116721 0.0013926248  -0.02054164    4.5506489 
+   25040      19.9951    1.0003773    23.869077    6.0263088    4.5262431    1.5000657 0.0016339814 -0.021595405    4.5462045 
+   25050    19.851642    1.0169617    23.786615    6.0323997    4.5074656    1.5249341 0.0018260641  -0.02216869    4.5278083 
+   25060    20.268935   0.99752508    23.851185    6.0515631    4.5557742    1.4957889 0.0017890743 -0.021948809     4.575934 
+   25070    20.307403   0.99371495    23.828906    6.0438037    4.5537281    1.4900756 0.0016400736 -0.021223861    4.5733119 
+   25080    20.463321    1.0100989    23.546078    6.0190376    4.5043943    1.5146433 0.0016493834 -0.021526903    4.5242718 
+   25090    20.139624   0.96558823    23.670539    5.9801386    4.5322391    1.4478995 0.0017581705 -0.021761974    4.5522429 
+   25100    20.138019     1.004282    23.564949    6.0213759     4.515455    1.5059209 0.0018203146 -0.021351675    4.5349863 
+   25110    20.118752    1.0082951     23.80162    6.0390946     4.527156    1.5119386 0.0019066845 -0.021619451    4.5468688 
+   25120     20.14318    1.0090454    23.710715    6.0437441    4.5306805    1.5130635 0.0019876619  -0.02231059    4.5510035 
+   25130    20.251132     1.022646    23.964819    6.0555817    4.5221241    1.5334576 0.0019913539  -0.02243826     4.542571 
+   25140    20.439726    1.0191678    23.647904    6.0477206    4.5194784    1.5282422 0.0019978484 -0.023054503    4.5405351 
+   25150    20.242716    1.0016118    23.741955     6.051886    4.5499691     1.501917 0.0018781285 -0.022465957    4.5705569 
+   25160    20.200647    1.0146245    23.929072    6.0734035    4.5519741    1.5214294 0.0018886674 -0.022691698    4.5727771 
+   25170    20.205374    1.0268008    24.003701      6.06203    4.5223422    1.5396879 0.0020543469 -0.023295434    4.5435833 
+   25180    20.104456    1.0065203    23.645451    6.0590109    4.5497336    1.5092773  0.002107199 -0.023315299    4.5709417 
+   25190     20.16058    1.0077608    23.755292    6.0561036    4.5449663    1.5111373 0.0019590738 -0.022665658    4.5656729 
+   25200    20.244918    1.0248798    23.612745    6.0609893    4.5241821    1.5368072 0.0019404828 -0.023026394     4.545268 
+   25210    20.107336    1.0340613    23.666263    6.0855908    4.5350158     1.550575 0.0017289583  -0.02271772    4.5560046 
+   25220    20.470693    1.0162859    24.005884    6.0804942    4.5565735    1.5239208 0.0017125848  -0.02271439    4.5775753 
+   25230    20.072387    1.0429181    23.712907    6.0941783    4.5303226    1.5638557 0.0015630355 -0.022035862    4.5507954 
+   25240      20.4481    1.0120124    23.565143    6.0601166    4.5426041    1.5175126  0.001537782  -0.02147129    4.5625376 
+   25250    20.107733    1.0369659    23.906266    6.0771158    4.5221854    1.5549304 0.0016330925 -0.021694906    4.5422472 
+   25260    20.199781    1.0239771     23.75735    6.0620558    4.5266021    1.5354536 0.0017532849 -0.022143336    4.5469922 
+   25270    20.153847    1.0142919    23.981477    6.0263677     4.505437    1.5209307 0.0019451488 -0.023020675    4.5265126 
+   25280    20.274998   0.99996043    23.751521    6.0191788    4.5197382    1.4994407 0.0019132677 -0.022760209    4.5405851 
+   25290    20.247917    1.0138259    23.656881     6.053351     4.533119     1.520232 0.0019472368 -0.022938719    4.5541105 
+   25300    20.333509    1.0106058    23.657541    6.0394145    4.5240111    1.5154034 0.0018773123 -0.022869473    4.5450032 
+   25310    20.449877    1.0068595    23.453933    6.0274668     4.517681    1.5097858  0.001716548 -0.022119706    4.5380841 
+   25320    20.373945   0.99487252    23.571311    6.0436598    4.5518485    1.4918114  0.001627448 -0.021744712    4.5719658 
+   25330    19.944463    1.0104201    23.716552    6.0491068    4.5339819    1.5151249 0.0017843566 -0.022597363    4.5547949 
+   25340    20.154918     1.025192    23.768579    6.0689072    4.5316318    1.5372754 0.0019751014 -0.023528127    4.5531848 
+   25350    20.131406   0.99465963    23.719234    6.0439862     4.552494    1.4914921 0.0019805647  -0.02333448    4.5738479 
+   25360    19.885406    1.0084299    24.052215    6.0597791    4.5476384    1.5121407 0.0016993701 -0.022625035    4.5685641 
+   25370    20.250152     1.007815    23.620014    6.0355836     4.524365    1.5112186 0.0018124513 -0.022963992    4.5455165 
+   25380     20.36161    1.0028306    23.685029    6.0272597    4.5235152    1.5037445 0.0019672839 -0.023456772    4.5450047 
+   25390    20.322194    1.0227593     23.88222    6.0639914    4.5303638    1.5336276 0.0019915081 -0.023788409    4.5521607 
+   25400     20.37237    1.0138429    23.892522     6.060033    4.5397755    1.5202575 0.0019990545 -0.023785186    4.5615617 
+   25410     19.99017    1.0126368    23.705512    6.0597446    4.5412957    1.5184489 0.0019626887 -0.023138683    4.5624717 
+   25420    20.289788    1.0196748    23.772719    6.0427171    4.5137147    1.5290024 0.0018708666 -0.022893053    4.5347369 
+   25430     20.44408    1.0188071    23.726483    6.0582452    4.5305439    1.5277012 0.0018893383 -0.023102332    4.5517569 
+   25440    20.285275    1.0111149    23.863184    6.0524502    4.5362835    1.5161667 0.0018272742 -0.022489775     4.556946 
+   25450    20.312881    1.0203449    23.875361    6.0464163    4.5164092    1.5300071 0.0017450964 -0.021915529    4.5365796 
+   25460    20.255831    1.0149573    23.491529    6.0627703    4.5408418    1.5219285 0.0018697204 -0.022203406    4.5611755 
+   25470    20.179611    1.0220289     23.72985    6.0501794    4.5176471    1.5325323 0.0018073499  -0.02229894    4.5381387 
+   25480    20.187703    1.0020121    23.565955    6.0502752    4.5477581    1.5025171 0.0017095463 -0.021951918    4.5680005 
+   25490    20.026514    1.0140066    23.590583    6.0506051    4.5301021    1.5205029 0.0017451331 -0.021983172    4.5503402 
+   25500    20.379278    1.0152259    23.802799    6.0722439    4.5499127    1.5223312  0.001589983 -0.021285174    4.5696079 
+   25510     20.24558    1.0272347     23.85208     6.070997    4.5306586    1.5403384 0.0014640591 -0.020401163    4.5495957 
+   25520    20.254623    1.0061351     23.49545    6.0823962    4.5736967    1.5086996 0.0013876142 -0.020293977     4.592603 
+   25530    20.076307    1.0283607    23.427893    6.0856225    4.5435957    1.5420268 0.0015108916 -0.020741151    4.5628259 
+   25540    20.273226    1.0068704    23.967448     6.051698    4.5418958    1.5098022 0.0015356072 -0.021226181    4.5615864 
+   25550    20.326864    1.0190121     23.54113    6.0527635    4.5247548    1.5280087 0.0017382014 -0.022012269    4.5450289 
+   25560    20.280613    1.0130584    23.947293    6.0514234    4.5323423    1.5190811 0.0018181456 -0.022274664    4.5527988 
+   25570    20.308914    1.0079203    23.821476    6.0295126    4.5181362    1.5113764 0.0019293143  -0.02290315      4.53911 
+   25580     20.11643    1.0064478     23.57777    6.0434223    4.5342538    1.5091684 0.0021204678 -0.023635682     4.555769 
+   25590    20.210984    1.0000781    23.789316    6.0164785    4.5168614    1.4996171 0.0022277129 -0.024164007    4.5387977 
+   25600    20.098015   0.99138083    23.297913    6.0224846    4.5359091    1.4865756 0.0021541524 -0.024250555    4.5580055 
+   25610    20.053783    1.0032343    23.677948     6.041363    4.5370131    1.5043499 0.0022831006 -0.024887871    4.5596179 
+   25620      19.7333    1.0003906    23.467403    6.0374959    4.5374102    1.5000857 0.0022369521 -0.024871446    4.5600447 
+   25630    20.265583    1.0287454    23.927614    6.0818527     4.539249    1.5426038 0.0021418288 -0.024580157    4.5616873 
+   25640    20.114349     1.033674    23.633573    6.0858929    4.5358988    1.5499941 0.0020939636 -0.024607025    4.5584118 
+   25650    20.331169    1.0182267    23.603857    6.0817605    4.5549295     1.526831 0.0020465716 -0.024347932    4.5772309 
+   25660    20.302228   0.99635403    23.705158    6.0349391    4.5409062    1.4940329 0.0020639653 -0.024410865    4.5632531 
+   25670    20.105353    1.0306539    23.682971    6.0578569    4.5123913    1.5454655 0.0019644198  -0.02388131    4.5343082 
+   25680    20.311659    1.0108624    23.891867    6.0604131    4.5446249    1.5157881 0.0017521403 -0.022598087    4.5654709 
+   25690    19.848101    1.0287252    23.763018    6.0855535      4.54298    1.5425735 0.0015102945 -0.021249639    4.5627194 
+   25700    19.981782    1.0345696    23.737472    6.0769619    4.5256248    1.5513371 0.0015101849 -0.021066881    4.5451815 
+   25710    20.235697    1.0281816    23.811028     6.071116    4.5293578    1.5417583 0.0018354936 -0.022394712     4.549917 
+   25720    20.269726    1.0259966    23.882476    6.0656051    4.5271233    1.5384819 0.0017867417 -0.022056825    4.5473933 
+   25730      19.9754    1.0333214    24.237997    6.0724353    4.5229699    1.5494654 0.0016410913 -0.021535526    4.5428644 
+   25740    20.102606    1.0319555    23.941019     6.087264    4.5398468    1.5474172 0.0016280889 -0.021086877    4.5593056 
+   25750    20.004846    1.0282067    23.730459     6.064432    4.5226361    1.5417959 0.0014085726 -0.019436584    4.5406641 
+   25760    20.421342    1.0250504    23.928185    6.0644479    4.5273849     1.537063  0.001379401 -0.019207615    4.5452131 
+   25770    20.158123    1.0025856    23.680816    6.0276916    4.5243144    1.5033772 0.0013878359 -0.019653885    4.5425804 
+   25780    20.051071    1.0051133    23.658295     6.036618    4.5294506    1.5071674 0.0014323845 -0.019813338    4.5478316 
+   25790    20.133687   0.99843842    23.581073    6.0184224    4.5212639    1.4971584 0.0012080504 -0.018812108     4.538868 
+   25800    20.235057   0.99651498    23.748821    6.0166422     4.522368    1.4942742 0.0011413407 -0.018642113    4.5398687 
+   25810    20.010247   0.97692585    23.647867    6.0114596    4.5465593    1.4649003 0.0014233461 -0.019921295    4.5650573 
+   25820    20.078302     0.989559    23.943285    6.0114485    4.5276048    1.4838437 0.0016709848  -0.02113579    4.5470696 
+   25830    20.373486   0.96836741     23.48843     6.003772    4.5517051    1.4520669  0.001625231 -0.021410767    4.5714906 
+   25840    20.262724   0.99540713    23.666197    6.0289447    4.5363317     1.492613 0.0014403544 -0.020422799    4.5553141 
+   25850    20.241073   0.96402169    23.340566    5.9820474    4.5364969    1.4455505 0.0014929533  -0.02049994    4.5555039 
+   25860    20.253803    1.0010266    23.574284    6.0240689    4.5230295    1.5010394 0.0015467206  -0.02072367    4.5422064 
+   25870    19.984499    1.0117336    23.579551    6.0387604    4.5216659    1.5170945 0.0016387018 -0.021471705    4.5414989 
+   25880    19.591585    1.0061141    23.671553    6.0485894    4.5399213    1.5086682 0.0015801336 -0.020903166    4.5592443 
+   25890    19.823102    1.0268911     23.86466    6.0665571    4.5267338    1.5398232 0.0013551033 -0.019925101    4.5453038 
+   25900    20.032266    1.0086645    23.942229    6.0676936    4.5552011    1.5124925 0.0013161591 -0.020026664    4.5739116 
+   25910    20.473218    1.0258388    23.662989    6.0635819    4.5253366    1.5382453 0.0013563158 -0.020316804     4.544297 
+   25920    20.095017    1.0216921    23.573786    6.0734467    4.5414194    1.5320273  0.001458282 -0.021028543    4.5609897 
+   25930    20.105327    1.0214791    24.022272    6.0694161    4.5377081     1.531708 0.0014959262 -0.021340878    4.5575531 
+   25940    20.089785    1.0247964    23.720823    6.0598327    4.5231505    1.5366823 0.0015400855 -0.021458908    4.5430693 
+   25950    19.737703   0.99719256    23.642884    6.0343935    4.5391032    1.4952902 0.0014776967 -0.021050241    4.5586758 
+   25960    20.220075   0.98903943    23.473992     6.030062    4.5469973    1.4830646 0.0015196769 -0.020955363     4.566433 
+   25970    20.224233   0.99610071    23.430553    6.0169962    4.5233432     1.493653 0.0016277776 -0.021044009    4.5427594 
+   25980    20.356817    1.0010061    23.776896    6.0247289    4.5237203    1.5010086 0.0017586961 -0.021535465     4.543497 
+   25990    20.385854   0.98890177    23.884682    6.0118181    4.5289599    1.4828582 0.0020128227 -0.022460585    4.5494076 
+   26000    20.084132    1.0050031    23.734945    6.0292269    4.5222247    1.5070022 0.0020708401 -0.023365483    4.5435193 
+   26010    20.341642   0.99535208    23.536534    6.0100271    4.5174966    1.4925305 0.0022078144 -0.024139482    4.5394283 
+   26020    19.820542    1.0041645    23.465343    6.0395808    4.5338362    1.5057446 0.0022200839 -0.023926908     4.555543 
+   26030     19.98108    1.0164904    23.711739    6.0545965    4.5303691    1.5242274  0.002123316 -0.023953121    4.5521989 
+   26040    20.179504    1.0010601    23.658173    6.0427324    4.5416428    1.5010896 0.0020266092 -0.023503512    4.5631197 
+   26050    20.257833    1.0071336    23.450683    6.0341809    4.5239841    1.5101968 0.0019831254 -0.023123566    4.5451246 
+   26060    20.210094    1.0132233     23.93513    6.0343666    4.5150383    1.5193283 0.0018891789  -0.02249091      4.53564 
+   26070    19.984596     1.017997    24.071838    6.0543616    4.5278752    1.5264864 0.0017522917 -0.022097315    4.5482202 
+   26080    20.117787    1.0070741    23.595604    6.0618909    4.5517833    1.5101076 0.0017249053 -0.022183928    4.5722423 
+   26090    20.176691    1.0178367     23.84841    6.0635779    4.5373317    1.5262462 0.0016579268 -0.021820117    4.5574939 
+   26100    20.335145    1.0418323     23.88821    6.0829364    4.5207088    1.5622275  0.001858525 -0.022483355    4.5413336 
+   26110    20.285117    1.0140885    23.731539    6.0749061    4.5542804    1.5206257 0.0018753014 -0.022880169    4.5752853 
+   26120    20.443755    1.0120804    23.434011    6.0688128    4.5511983    1.5176146 0.0017796388 -0.022418808    4.5718374 
+   26130    20.269421    1.0185981    23.782176    6.0759387    4.5485508    1.5273879 0.0016641709 -0.022039782    4.5689264 
+   26140     20.23762    1.0147652    23.716499    6.0617962    4.5401558    1.5216404  0.001674669 -0.021724694    4.5602058 
+   26150    20.168034    1.0261189    24.030586    6.0481264    4.5094611    1.5386653 0.0015788109 -0.021175941    4.5290582 
+   26160    20.367354   0.99333615    23.592727    6.0331804    4.5436728    1.4895076 0.0017514946 -0.022004092    4.5639254 
+   26170    19.845788    1.0096377    23.371302    6.0365469    4.5225951    1.5139517 0.0018982009 -0.022965942    4.5436629 
+   26180    20.202192    0.9855733    23.459739    5.9983175    4.5204504    1.4778672 0.0020185602 -0.023409769    4.5418416 
+   26190    19.950692   0.99781832     23.69184     6.001508    4.5052794    1.4962286  0.001924158 -0.023068565    4.5264238 
+   26200    20.258764   0.99709976    23.561115    6.0295517    4.5344006    1.4951511 0.0020517147 -0.023612542    4.5559614 
+   26210    20.259808    1.0050671     23.71325    6.0249815    4.5178833    1.5070982 0.0019425034 -0.023185742    4.5391266 
+   26220    20.428428    1.0259328    23.864197    6.0335161    4.4951299    1.5383862 0.0019223048  -0.02319357    4.5164012 
+   26230    20.400366    1.0072468    23.498927    6.0364876     4.526121    1.5103666 0.0018827586 -0.022761698    4.5469999 
+   26240    20.339622    1.0243642    23.719384    6.0261986    4.4901645    1.5360341 0.0016884821 -0.021504348    4.5099803 
+   26250    20.333588   0.98278982    23.701956    6.0095378    4.5358444    1.4736933 0.0015868135 -0.020916221    4.5551738 
+   26260    19.767614    1.0032155    23.775571    6.0314041    4.5270825    1.5043216 0.0016716257 -0.021020299    4.5464311 
+   26270    20.185248    1.0176524    23.768565    6.0376134    4.5116436    1.5259698 0.0016531939 -0.020649994    4.5306404 
+   26280    20.536229    1.0049985    23.674709    6.0633029    4.5563077    1.5069952 0.0014542057 -0.020413776    4.5752673 
+   26290    20.289792   0.99916303     23.80882    6.0447905    4.5465456     1.498245 0.0014226787 -0.020801429    4.5659243 
+   26300    20.157439     1.008179    23.627029    6.0543667    4.5426023    1.5117644 0.0015489952  -0.02135139    4.5624047 
+   26310    20.060288     1.009574    23.803703    6.0516989    4.5378427    1.5138562 0.0016956526 -0.022090093    4.5582372 
+   26320    20.090041    1.0313008    23.687598    6.0568814    4.5104458    1.5464355 0.0018105158 -0.022234749    4.5308701 
+   26330    20.359102    1.0189405    23.986816    6.0531933     4.525292    1.5279012 0.0018375064 -0.021799827    4.5452544 
+   26340    19.700557    1.0120427    23.702811     6.063574     4.546016     1.517558 0.0017003915 -0.020423905    4.5647395 
+   26350    20.368829    1.0143563    23.732327    6.0690031    4.5479757    1.5210273 0.0015324028 -0.019706231    4.5661495 
+   26360    20.322158    1.0038344    23.608979    6.0600784    4.5548287    1.5052497 0.0015404512 -0.019766233    4.5730545 
+   26370    19.903321    1.0187535    23.723788    6.0787712    4.5511504    1.5276208 0.0015389325 -0.020315503    4.5699269 
+   26380    19.949415    1.0188908    24.020441    6.0386536    4.5108268    1.5278268 0.0017759701  -0.02192694    4.5309778 
+   26390    19.817956    1.0060112    23.767686    6.0222127    4.5136989    1.5085138 0.0018040217 -0.022073283    4.5339682 
+   26400    20.111097    1.0144187    23.555762     6.049328    4.5282072    1.5211209 0.0016026129 -0.021571293    4.5481759 
+   26410    20.132947    1.0013426    23.892719    6.0332428    4.5317296    1.5015132 0.0015421156  -0.02139358    4.5515811 
+   26420    20.289568   0.99539476    23.837573    6.0067348    4.5141403    1.4925944 0.0014261238 -0.020762691    4.5334769 
+   26430    20.274778    1.0139726    23.840002    6.0488404    4.5283885    1.5204519 0.0012101962 -0.019615109    4.5467934 
+   26440    19.990833    1.0102954    23.791355    6.0705811     4.555643     1.514938 0.0011453949 -0.019275497    4.5737731 
+   26450    19.707655    1.0202483    23.897849    6.0702408    4.5403784    1.5298624 0.0012674528 -0.019581321    4.5586923 
+   26460    19.866389    1.0157343    23.624818    6.0480295    4.5249359    1.5230936 0.0014916502 -0.020171082    4.5436153 
+   26470    20.159785     1.041976    23.850996    6.0884642    4.5260212    1.5624431 0.0016703584 -0.020606553    4.5449574 
+   26480    19.494424    1.0232232    23.559783    6.0688083    4.5344852    1.5343231 0.0017476871 -0.021390329    4.5541278 
+   26490    20.116929     1.003601    23.488148    6.0435318     4.538632    1.5048998 0.0019189543  -0.02257175    4.5592848 
+   26500    20.251972    1.0068214    23.653794    6.0514293    4.5417006    1.5097287 0.0020276345 -0.023065194    4.5627382 
+   26510    20.031225    1.0041453    23.698444    6.0370776    4.5313617    1.5057159 0.0020352044 -0.023398418    4.5527249 
+   26520    19.978664   0.99872918    24.066028    6.0514096    4.5538152    1.4975944 0.0019809111 -0.023496927    4.5753312 
+   26530    20.430064    1.0102381     23.61462    6.0693158    4.5544639     1.514852 0.0017193799 -0.022236444    4.5749809 
+   26540    20.564716     1.027976    23.955281    6.0695365    4.5280865      1.54145  0.001663282 -0.022083013    4.5485062 
+   26550    20.329397    1.0256989    23.670453    6.0632113    4.5251758    1.5380355 0.0016179019 -0.022096252    4.5456542 
+   26560    20.301825    1.0182097    23.704824    6.0699562    4.5431508    1.5268054 0.0015484433 -0.021846796    4.5634491 
+   26570    20.331594    1.0355449    23.511736    6.0742893    4.5214897    1.5527996 0.0017800179 -0.022408323     4.542118 
+   26580    20.255606   0.99910157    23.574645    6.0450525    4.5468996    1.4981528 0.0018453652 -0.022704425    4.5677587 
+   26590    20.062372    1.0003201     23.78245    6.0293299    4.5293499      1.49998 0.0019229274 -0.023131239    4.5505582 
+   26600    20.118459    1.0038434    23.673658     6.030913    4.5256499    1.5052631 0.0019290539 -0.022624512    4.5463453 
+   26610    20.452277   0.99717509     23.62497    6.0212505    4.5259865     1.495264 0.0016902649 -0.021393063    4.5456893 
+   26620    20.418427    0.9977923    23.841203    6.0210239    4.5248344    1.4961895 0.0017364327 -0.021472287    4.5445702 
+   26630    20.269826   0.99480828    23.577837    6.0195236    4.5278086     1.491715 0.0018868973 -0.022103086    4.5480248 
+   26640    20.207915    1.0026758    23.846955    6.0325278    4.5290153    1.5035124 0.0018165966 -0.021947933    4.5491467 
+   26650    20.141996     0.990882    23.755635    6.0250458    4.5392183    1.4858276 0.0018958229 -0.021867832    4.5591903 
+   26660    20.301732    1.0068017    24.059239    6.0337981    4.5240988    1.5096992 0.0018121215 -0.021694277     4.543981 
+   26670    20.503658      1.00338    23.689501     6.022556    4.5179876    1.5045683 0.0018974881 -0.022217425    4.5383075 
+   26680    20.199198    1.0116709    23.672898    6.0281409    4.5111405    1.5170005 0.0019414117 -0.022865006     4.532064 
+   26690    20.163313    1.0231624    23.697841    6.0508459    4.5166139     1.534232 0.0020612225 -0.023389193    4.5379419 
+   26700    20.254748   0.98952646    23.902454    6.0550585    4.5712636    1.4837949 0.0021423428 -0.023517164    4.5926384 
+   26710    20.245141    1.0042656    23.649978    6.0419893     4.536093    1.5058963 0.0021717158 -0.023480257    4.5574016 
+   26720    19.991628    1.0091762    23.749918    6.0426428    4.5293831    1.5132598 0.0021419595 -0.023557843     4.550799 
+   26730    20.296043     1.031721    23.931898    6.0852832    4.5382175    1.5470657 0.0018847074 -0.022825241     4.559158 
+   26740    19.848529    1.0212723    23.691413    6.0743347    4.5429369    1.5313978 0.0017997823 -0.022642121    4.5637792 
+   26750    20.162172    1.0214205    23.672918    6.0916002    4.5599801    1.5316201 0.0019805167 -0.023393972    4.5813936 
+   26760    20.142548    1.0328583    23.788335    6.0887825    4.5400115     1.548771 0.0020363664 -0.023545734    4.5615208 
+   26770    20.082605    1.0233412    23.611105    6.0762472     4.541747    1.5345002 0.0020468507  -0.02386857    4.5635687 
+   26780    20.088049    1.0257379     23.76365    6.0816931    4.5435991     1.538094  0.001951293 -0.023592369    4.5652402 
+   26790    19.907201    1.0256856    23.969607    6.0431271    4.5051115    1.5380156  0.001957374 -0.024028201    4.5271824 
+   26800    20.326895    1.0018461    23.749491    6.0421437    4.5398755    1.5022682 0.0018250585 -0.023471149    4.5615216 
+   26810    20.051081    1.0175705     23.73798    6.0659906    4.5401437     1.525847 0.0016658819 -0.022494874    4.5609727 
+   26820     20.03194      1.01405    23.548322    6.0717372    4.5511693    1.5205679 0.0017554405 -0.022607607    4.5720214 
+   26830    20.024453    1.0138229    23.915691    6.0490567    4.5288293    1.5202274 0.0019535084 -0.023420321    4.5502961 
+   26840    20.219267    1.0054215    23.868137    6.0528085    4.5451789    1.5076296 0.0020848386 -0.024103632    4.5671977 
+   26850    20.241495    1.0289953    23.758766    6.0617566    4.5187781    1.5429784  0.002069653 -0.023776357    4.5404848 
+   26860    20.432722    1.0230369    23.902395    6.0846158     4.550572    1.5340438  0.001876562 -0.022696939    4.5713924 
+   26870    20.265014    1.0325873     23.67718    6.0918803    4.5435156    1.5483647 0.0018678767 -0.022467421    4.5641151 
+   26880    20.170911    1.0259323     23.74595    6.0865191    4.5481336    1.5383855 0.0019957274 -0.022822009    4.5689599 
+   26890    19.749635    1.0023806    23.607701    6.0477821    4.5447125    1.5030696 0.0019625583 -0.022596685    4.5653466 
+   26900     20.17331    1.0045547    23.846189     6.053471    4.5471412    1.5063298 0.0019420905 -0.022146674    4.5673458 
+   26910    20.324815    1.0103952    23.603711     6.052428    4.5373404    1.5150876  0.001912186 -0.021929963    4.5573582 
+   26920    20.371935     1.023929    24.073523    6.0652567    4.5298751    1.5353816  0.002002949 -0.022647689    4.5505199 
+   26930     20.03556    1.0187601    23.823366    6.0516754    4.5240446    1.5276308 0.0019670136 -0.022843343    4.5449209 
+   26940    20.236701    1.0104867    23.782108    6.0424381    4.5272132    1.5152249 0.0018058612 -0.022236645     4.547644 
+   26950    19.800786     1.025548    23.398668    6.0732306    4.5354214    1.5378092 0.0018209037 -0.022587119    4.5561876 
+   26960    20.283951    1.0416045     24.05575    6.0961169    4.5342311    1.5618859 0.0017634289 -0.022496052    4.5549637 
+   26970    20.333426    1.0132324    23.486893    6.0549256    4.5355836    1.5193419 0.0016388959 -0.022091912    4.5560366 
+   26980    20.062567     1.001629    23.722551     6.056755    4.5548123    1.5019427  0.001508617  -0.02156558    4.5748693 
+   26990    20.122231    1.0072264    23.815521    6.0418373    4.5315014     1.510336 0.0013649954 -0.020685428    4.5508218 
+   27000    20.388435    1.0123249    23.516601    6.0499701     4.531989    1.5179811 0.0013715579 -0.020680248    4.5512977 
+   27010    20.615816    1.0191986     23.69829    6.0677961    4.5395078    1.5282883 0.0014661964 -0.021454586    4.5594962 
+   27020     20.45091    1.0438791    23.935507    6.1028813    4.5375846    1.5652967 0.0017282278  -0.02277426    4.5586306 
+   27030    20.070089     1.033621    24.012846     6.062327    4.5124124    1.5499147 0.0018251969 -0.023027917    4.5336151 
+   27040     20.13452    1.0330455     23.62709    6.0796452    4.5305935    1.5490518 0.0018705105 -0.023123382    4.5518463 
+   27050    20.059447    1.0271728    23.500573    6.0820878    4.5418422    1.5402456 0.0018413169 -0.023298015    4.5632989 
+   27060    20.166086   0.99752218    23.584356    6.0684057    4.5726212    1.4957845 0.0018913656 -0.023801405    4.5945312 
+   27070     20.08212    1.0103311    23.904101    6.0433557    4.5283643    1.5149914 0.0018001961 -0.022987011    4.5495511 
+   27080    20.069152    1.0253054    23.626452    6.0672397    4.5297942    1.5374454 0.0016247248 -0.021789564    4.5499591 
+   27090    20.294516     1.004217    23.937323     6.029595    4.5237717    1.5058233  0.001655879 -0.021227945    4.5433438 
+   27100    20.011372    1.0015847     23.80258    6.0176926    4.5158164    1.5018762 0.0015875456 -0.020654528    4.5348833 
+   27110    20.245443    1.0044265    23.719521    6.0616993    4.5555618    1.5061375 0.0016339697 -0.020456336    4.5743842 
+   27120    20.118939    1.0257058    23.682314    6.0691506    4.5311048    1.5380458 0.0015836438 -0.019959692    4.5494809 
+   27130    20.490777    1.0207525    24.004767    6.0766066    4.5459883    1.5306183   0.00139386 -0.019198533    4.5637929 
+   27140    20.147185     1.029012    23.742857    6.0728196    4.5298161    1.5430035 0.0015466945  -0.01961562     4.547885 
+   27150     19.99685    0.9907331    23.721009    6.0536037    4.5679994    1.4856043 0.0016085263  -0.01985525    4.5862462 
+   27160    20.202623    1.0110779    23.862531    6.0556662    4.5395549    1.5161113 0.0015501985 -0.020078961    4.5580837 
+   27170    20.197341    1.0041632    23.657348    6.0623409    4.5565982    1.5057427   0.00152081 -0.020509321    4.5755868 
+   27180    20.333654    1.0273453    23.561019    6.0811232    4.5406189    1.5405043 0.0014642705 -0.020222184    4.5593768 
+   27190    20.353348    1.0306862    23.818154    6.0931887    4.5476747     1.545514 0.0015983272 -0.020714367    4.5667908 
+   27200    20.151171    1.0194493    23.588139    6.0863885    4.5577243    1.5286642 0.0016583288 -0.021369289    4.5774353 
+   27210    20.335746    1.0133287    23.821727    6.0876407    4.5681543    1.5194864 0.0017156473 -0.021314881    4.5877535 
+   27220    20.542828    1.0074076    23.562987    6.0617298    4.5511221    1.5106077 0.0017804001 -0.021848609    4.5711903 
+   27230    20.138465    1.0125952    23.757851    6.0605529    4.5421664    1.5183865 0.0017313245 -0.021989363    4.5624244 
+   27240    20.144568     1.010461    23.749042    6.0516359    4.5364496    1.5151863 0.0016351086 -0.020953762    4.5557683 
+   27250    19.821947    1.0123869    23.696107    6.0446972     4.526623    1.5180742 0.0018547604 -0.022115505    4.5468837 
+   27260    20.364016    1.0105987    23.455447    6.0574732    4.5420805    1.5153927  0.002099129 -0.023636558     4.563618 
+   27270    20.041184    1.0114665    23.612285    6.0539459    4.5372519     1.516694  0.002089319 -0.023326361    4.5584889 
+   27280    20.122554    1.0181515    23.889074    6.0674752     4.540757    1.5267182 0.0020316816 -0.023008801    4.5617341 
+   27290    20.407153    1.0112772    23.674127    6.0454161    4.5290059    1.5164102 0.0020415383 -0.023316061    4.5502804 
+   27300    20.298409    1.0181062    23.447235    6.0459697    4.5193194    1.5266503 0.0021330991 -0.023889957    4.5410762 
+   27310    20.202694    1.0056816    23.611276    6.0385665    4.5305468    1.5080196 0.0020216996 -0.023203909    4.5517291 
+   27320    20.277867   0.99684699    23.557782    6.0326046    4.5378325    1.4947721 0.0020586069  -0.02324856    4.5590224 
+   27330    19.803996    1.0029081    23.429126    6.0385453    4.5346845    1.5038607  0.002038613 -0.023164279    4.5558102 
+   27340     20.07427   0.99970848    23.799055    6.0179091    4.5188462    1.4990629 0.0019127691 -0.022780567     4.539714 
+   27350    19.638781   0.99339817    23.693113    6.0088491    4.5192485    1.4896005 0.0017947589  -0.02236773    4.5398215 
+   27360    20.223112    1.0026965    23.782745    6.0346413    4.5310978    1.5035434 0.0016622181 -0.021667882    4.5511035 
+   27370    20.366047   0.99994935    23.752432    6.0296018    4.5301778    1.4994241 0.0016188444 -0.021436578    4.5499955 
+   27380    19.611871    1.0141586    23.477646    6.0456907      4.52496    1.5207308 0.0018208593 -0.022487908     4.545627 
+   27390    19.675205    1.0114129    23.437369    6.0550894    4.5384757    1.5166136  0.001904802 -0.022862187    4.5594331 
+   27400    20.249469    1.0124703    23.670769    6.0525227    4.5343235    1.5181992 0.0018122586 -0.022342495    4.5548537 
+   27410       20.304    1.0097694    23.754338    6.0573114    4.5431623    1.5141492 0.0016122233  -0.02140169    4.5629517 
+   27420    20.128857    1.0076695    23.661083    6.0307594     4.519759    1.5110004 0.0016991689  -0.02150283    4.5395627 
+   27430    20.463786    1.0171126    23.883796    6.0450009    4.5198406    1.5251603 0.0017257672 -0.021860882    4.5399757 
+   27440    20.314448    1.0169206    23.754644    6.0722175     4.547345    1.5248725 0.0017102529 -0.021456363    4.5670911 
+   27450    19.920818    1.0171616    23.647723    6.0691858    4.5439519    1.5252339 0.0017933289  -0.02200861    4.5641672 
+   27460    20.038156    1.0152946    23.724159    6.0695644    4.5471301    1.5224343 0.0018537439  -0.02241723    4.5676936 
+   27470    20.033782    1.0039359    23.910569    6.0517169     4.546315    1.5054019 0.0016242648 -0.021513483    4.5662042 
+   27480    20.308285    1.0184559    23.579634    6.0539155    4.5267408    1.5271747  0.001684523 -0.021879197    4.5469355 
+   27490    19.924284      1.02068    23.742003    6.0510391    4.5205294    1.5305097 0.0017202202 -0.022036591    4.5408457 
+   27500    20.126692    1.0197374    23.616018    6.0349164    4.5058201    1.5290962  0.001501995 -0.020907134    4.5252253 
+   27510    20.079655    1.0148794    23.772829    6.0465888    4.5247771    1.5218116 0.0015680168 -0.021303596    4.5445127 
+   27520    20.193949    1.0077198    23.892631    6.0514517    4.5403759    1.5110758 0.0015630833  -0.02141363    4.5602264 
+   27530    19.867119    1.0154602    23.749554    6.0504413    4.5277588    1.5226825 0.0015780621 -0.021288184    4.5474689 
+   27540      20.4037    1.0058452    23.847093    6.0394601    4.5311952    1.5082649 0.0018551696 -0.022625808    4.5519659 
+   27550    20.163515    1.0196055    23.709154    6.0708135    4.5419151    1.5288984 0.0019014057 -0.022943793    4.5629575 
+   27560    20.332806    1.0080704     23.73206    6.0535628    4.5419613    1.5116015 0.0019875576 -0.023026955    4.5630007 
+   27570    20.088561     1.001806     23.97366    6.0368334    4.5346254     1.502208 0.0018992428 -0.022414652    4.5551408 
+   27580    20.300993   0.99496817    23.807351    6.0198606    4.5279059    1.4919548  0.001969392 -0.022666179    4.5486027 
+   27590    20.366374    1.0075069    23.767765    6.0315432    4.5207866    1.5107565 0.0020311174 -0.022963198    4.5417187 
+   27600    19.822658    1.0123106    23.936388    6.0650387     4.547079    1.5179597 0.0020786072 -0.023531029    4.5685314 
+   27610    20.294205    1.0237952    23.964702    6.0673955    4.5322147    1.5351808 0.0020334696 -0.023218291    4.5533995 
+   27620    20.216712    1.0087906    23.991224    6.0313108    4.5186294    1.5126814 0.0018328584 -0.022531615    4.5393281 
+   27630    20.484579   0.99324168    23.457477    6.0145537    4.5251878    1.4893659 0.0016855938 -0.022019525    4.5455217 
+   27640    20.173596   0.98711402    23.518376    6.0428044    4.5626269    1.4801775 0.0017193975 -0.021934184    4.5828417 
+   27650    20.228664   0.99363377    23.507866    6.0363066    4.5463528    1.4899538 0.0017488389 -0.021783622    4.5663875 
+   27660    20.118094    1.0084623    23.983497    6.0547985    4.5426092    1.5121893 0.0017206348 -0.021500506    4.5623891 
+   27670    20.098635    1.0190966    23.701373    6.0381718    4.5100364    1.5281354 0.0017725699 -0.021921944    4.5301858 
+   27680    20.139573    1.0011017     23.70906    6.0474397    4.5462878    1.5011519 0.0017225209 -0.021892892    4.5664581 
+   27690    20.039301    1.0102345    23.506177    6.0557617    4.5409151    1.5148466 0.0018224711 -0.022102323    4.5611949 
+   27700    19.775468    1.0169915     23.91192    6.0462988      4.52132    1.5249788 0.0019659894 -0.022721563    4.5420756 
+   27710    20.041678    1.0346965    23.719576    6.0812594    4.5297321    1.5515273 0.0019159772 -0.022671177    4.5504873 
+   27720    20.109256    1.0067298    23.594128    6.0325457    4.5229543    1.5095913 0.0016555829 -0.021659249     4.542958 
+   27730    20.144169    1.0218772    23.627421    6.0513139    4.5190091    1.5323049 0.0016334571 -0.021730869    4.5391065 
+   27740    20.112887    1.0022584    23.610974    6.0392702    4.5363838    1.5028864 0.0017109179 -0.022497148      4.55717 
+   27750    20.281705    1.0127216    23.607562    6.0597382    4.5411621    1.5185761  0.001644659 -0.022185267    4.5617027 
+   27760    20.145294    1.0115647    23.881282    6.0466932     4.529852    1.5168413 0.0016463016 -0.021430529    4.5496362 
+   27770    20.231315     1.004614    23.827165    6.0439073    4.5374885    1.5064187 0.0017364199 -0.021823746    4.5575759 
+   27780    20.153943    1.0264644    23.792848    6.0715514    4.5323679    1.5391834 0.0018019607 -0.021927706    4.5524937 
+   27790    20.477875      1.02474    23.641877    6.0973777    4.5607801    1.5365977 0.0019952639 -0.022636947    4.5814217 
+   27800    20.208496    1.0313878    23.902742    6.0809271    4.5343611     1.546566 0.0020907178 -0.022921767    4.5551922 
+   27810    19.663944    1.0279937    23.815827    6.0692209    4.5277443    1.5414766 0.0019585912 -0.022571035    4.5483567 
+   27820    20.246318    1.0131034    23.742617    6.0563264    4.5371779    1.5191485 0.0018486268 -0.022351779    4.5576811 
+   27830    20.544953    1.0114991    23.474659    6.0599283    4.5431854    1.5167429 0.0018248129 -0.022116319    4.5634769 
+   27840    20.298271    1.0253195    23.822811    6.0682686     4.530802    1.5374666 0.0015684418 -0.020951994    4.5501855 
+   27850    19.718355    1.0160653    23.684147    6.0650573    4.5414674      1.52359 0.0013568921 -0.019556757    4.5596673 
+   27860    19.709409    1.0265826    23.840304    6.0954272    4.5560665    1.5393606 0.0015590777 -0.020722458    4.5752299 
+   27870    20.107569    1.0229748    23.723469    6.0890676    4.5551169    1.5339508 0.0017455922 -0.021775135    4.5751464 
+   27880    19.976845    1.0012993    23.820316    6.0488379    4.5473896    1.5014483 0.0017090909 -0.021273692    4.5669542 
+   27890    20.194227    1.0180244    24.074071    6.0522892    4.5257616    1.5265276 0.0016290987 -0.021235934    4.5453684 
+   27900    20.230676     1.028601    23.853139    6.0804511    4.5380639    1.5423872 0.0014458086 -0.020725416    4.5573436 
+   27910    20.163434    1.0403847    23.864825     6.100371    4.5403142    1.5600568 0.0015647119  -0.02105108    4.5598005 
+   27920    20.210472    1.0138426    23.520378    6.0867862    4.5665292     1.520257 0.0019733984 -0.022922987    4.5874788 
+   27930    20.266482    1.0280795    23.954254    6.0973845    4.5557793    1.5416052 0.0021925525 -0.023672318    4.5772591 
+   27940    20.178444     1.016477    23.716737    6.0896775    4.5654703    1.5242072 0.0022114197 -0.023752945    4.5870118 
+   27950    20.391624    1.0303641    23.559733    6.0903083    4.5452773     1.545031 0.0020586309 -0.023104041    4.5663227 
+   27960    20.326853    1.0400221     23.83952    6.1180892     4.558576    1.5595132 0.0019715403 -0.022664883    4.5792694 
+   27970    20.126577    1.0202886    23.925061    6.0753392    4.5454165    1.5299227 0.0020335469 -0.022691237    4.5660742 
+   27980    20.274817     1.023664    23.865875    6.0685549    4.5335707    1.5349842 0.0020339261 -0.022926345    4.5544631 
+   27990    20.407492    1.0380255    23.562887    6.0678573    4.5113381    1.5565192 0.0019574968 -0.022720955    4.5321016 
+   28000    20.371358    1.0198621    23.833629    6.0613004    4.5320171    1.5292833 0.0019758659 -0.022881455    4.5529227 
+   28010    20.256614    1.0265022    24.043061    6.0777948    4.5385546    1.5392401 0.0020918691 -0.023612454    4.5600752 
+   28020    20.235702    1.0139516     23.54953    6.0565899    4.5361695    1.5204205 0.0021836449 -0.024352781    4.5583386 
+   28030    19.895689    1.0151072     23.87773    6.0750585    4.5529053    1.5221532  0.002039689 -0.023956263    4.5748218 
+   28040    19.993457    1.0319418    23.986397    6.0823837     4.534987    1.5473967 0.0018079591  -0.02301131    4.5561904 
+   28050    20.343095    1.0234318    23.568014    6.0784212    4.5437852     1.534636 0.0016172868 -0.022297686    4.5644656 
+   28060     20.15654    1.0176013    23.540714    6.0583541     4.532461    1.5258931 0.0016935987 -0.022613613     4.553381 
+   28070    20.248775    1.0094304    23.711696    6.0686479     4.555007    1.5136409 0.0015810407 -0.021924015      4.57535 
+   28080    20.452451    1.0011004    23.489235     6.068625     4.567475      1.50115 0.0016394767 -0.021585004    4.5874205 
+   28090    20.540515    1.0101405    23.814247    6.0666349    4.5519292    1.5147056 0.0016100421 -0.021139874    4.5714591 
+   28100        20.52    1.0166367    23.742014    6.0762871    4.5518404    1.5244467 0.0015880329 -0.021111185    4.5713636 
+   28110    20.177952    1.0440499    23.715788    6.0990259    4.5334731    1.5655529 0.0013738928 -0.020300471    4.5523996 
+   28120    20.166263     1.022916    24.167747    6.0863717    4.5525092    1.5338626 0.0012407315 -0.019231708    4.5705002 
+   28130    20.407818    1.0319134    23.813502    6.0694633    4.5221091    1.5473542 0.0012127494 -0.018979199    4.5398756 
+   28140     20.26515      1.01531    23.580413    6.0698938    4.5474364    1.5224574 0.0013253455 -0.019501609    4.5656126 
+   28150    19.907376    1.0342646     23.90685    6.0784817    4.5276019    1.5508798 0.0014780573 -0.020332514    4.5464564 
+   28160     20.28344     1.026998    24.031852    6.0833157    4.5433322    1.5399835 0.0016238027 -0.021100737    4.5628091 
+   28170    20.285053    1.0112089     23.89422     6.081837    4.5655293    1.5163077 0.0016623201 -0.021140006     4.585007 
+   28180    20.319575    1.0361159    23.809705    6.0877439    4.5340881    1.5536559  0.001458215 -0.020365967    4.5529958 
+   28190    20.346896    1.0523749    24.036426    6.1083647    4.5303286    1.5780361 0.0012633895 -0.018951933    4.5480171 
+   28200    20.177613    1.0105243    23.618827    6.0680392    4.5527581    1.5152811 0.0013769988 -0.019390995     4.570772 
+   28210    20.381237    1.0085196     24.02464     6.031431    4.5191558    1.5122752 0.0017086178 -0.020854921    4.5383021 
+   28220    20.447559    1.0154094     23.79605    6.0613722    4.5387658    1.5226064 0.0017196752 -0.021128189    4.5581743 
+   28230    20.070142    1.0174502    23.933027    6.0609026     4.535236    1.5256666  0.001775833 -0.021378599    4.5548388 
+   28240    20.253383    1.0257189    23.613863    6.0679367    4.5298712    1.5380655  0.001819485 -0.021871177    4.5499229 
+   28250    20.351084    1.0289203    23.674954    6.0637489     4.520883    1.5428659 0.0017192101 -0.021787573    4.5409513 
+   28260    20.238417    1.0128262    23.823303    6.0386588    4.5199259    1.5187329 0.0017404304  -0.02231915    4.5405046 
+   28270    20.192524    1.0050495    23.826474    6.0529354    4.5458636    1.5070718  0.002006794 -0.023560634    4.5674174 
+   28280    19.896091    1.0248716    23.715856    6.0735083    4.5367134    1.5367949 0.0020150957 -0.023570033    4.5582683 
+   28290     20.24824     1.030483    23.846036    6.0563036    4.5110944    1.5452092 0.0018952165 -0.022883968    4.5320831 
+   28300    20.357135    1.0252712    24.229041    6.0834231    4.5460289    1.5373942 0.0019621809 -0.023208621    4.5672753 
+   28310    20.208551    1.0220544    23.639129    6.0777385    4.5451679    1.5325706 0.0020369316 -0.023398272    4.5665293 
+   28320    20.179665    1.0031461    23.812594    6.0448062    4.5405886    1.5042176 0.0019921065 -0.023323225    4.5619197 
+   28330    20.117294    1.0150074    23.596972    6.0602519    4.5382483    1.5220036 0.0019511944 -0.023273742    4.5595709 
+   28340    20.443741    1.0130197    23.466321    6.0557075    4.5366844    1.5190231  0.002073831   -0.0236986    4.5583091 
+   28350    20.488388    1.0196413    23.624452    6.0634543    4.5345022    1.5289521 0.0021414661 -0.024035418    4.5563961 
+   28360    20.218175    1.0261917     23.74347    6.0402833    4.5015089    1.5387744  0.002155244  -0.02444222    4.5237958 
+   28370    20.412186    1.0079097     23.65534    6.0319147    4.5205542    1.5113605 0.0019633007 -0.023831346    4.5424222 
+   28380    20.423093    0.9976846    23.644917    6.0263068    4.5302787    1.4960281 0.0017502206  -0.02256902    4.5510975 
+   28390    20.033592    1.0137507    23.685973    6.0538961     4.533777    1.5201191 0.0013691162 -0.020730407    4.5531383 
+   28400    20.287031    1.0212543    23.819779     6.054021    4.5226502    1.5313708 0.0014258455 -0.021095192    4.5423196 
+   28410    20.285042    1.0039277     23.52916    6.0310055    4.5256159    1.5053896 0.0015617003 -0.021701714    4.5457559 
+   28420    20.308992    1.0042472    23.730153    6.0256904    4.5198218    1.5058686 0.0016369696 -0.021497365    4.5396822 
+   28430     20.45618    1.0193038    23.978718    6.0401426    4.5116966     1.528446 0.0015965178 -0.021106401    4.5312065 
+   28440    20.500456    1.0026983    23.699416    6.0395469    4.5360008    1.5035461 0.0015060071 -0.020924717    4.5554195 
+   28450    20.004423   0.98928241    23.639527     6.035781     4.552352     1.483429 0.0014303644 -0.020766733    4.5716884 
+   28460    20.132001   0.98161356    23.553381    6.0225662    4.5506367    1.4719295 0.0016487508 -0.021941067     4.570929 
+   28470    20.180301     1.000716    23.626634    6.0273609    4.5267873    1.5005736 0.0019840439 -0.023503169    4.5483064 
+   28480    20.135638    1.0292724    23.450161    6.0550109    4.5116169     1.543394  0.001982211 -0.023460105    4.5330948 
+   28490    19.801111      1.02489    23.787947    6.0668449    4.5300224    1.5368225 0.0020009016  -0.02339707    4.5514186 
+   28500     20.12561     1.014402    23.838203    6.0507844    4.5296886    1.5210959 0.0019345983 -0.022955384    4.5507094 
+   28510    20.268076    1.0225752    23.792402     6.072034    4.5386825    1.5333515  0.001956208  -0.02307972     4.559806 
+   28520    20.376401    1.0325351    23.827271    6.0893999    4.5411135    1.5482865 0.0018865107 -0.022717401    4.5619443 
+   28530    20.129332     1.008228    23.498755    6.0508505    4.5390125    1.5118379 0.0016206591 -0.021741418    4.5591333 
+   28540    20.264307    1.0154489    23.921532    6.0474407     4.524775    1.5226657 0.0014948929 -0.021087144    4.5443673 
+   28550    19.813225   0.99156953    23.608578    6.0327777    4.5459192    1.4868585  0.001448035 -0.020903339    4.5653745 
+   28560    20.216012    1.0126643      23.5233     6.042119    4.5236288    1.5184902 0.0013587244 -0.020585059    4.5428551 
+   28570    20.375989     1.004152    23.967935    6.0452939     4.539568    1.5057259 0.0013716981 -0.020644927    4.5588413 
+   28580     20.42629    1.0206165    23.758017    6.0302962    4.4998818    1.5304144 0.0015839147 -0.021260329    4.5195582 
+   28590    20.305482    1.0254064    24.115895    6.0562778    4.5186809    1.5375969 0.0018834607 -0.022412616      4.53921 
+   28600    20.193175    1.0332818    23.895581    6.0580368    4.5086308     1.549406 0.0020344883 -0.023233312    4.5298297 
+   28610     20.19954    1.0255644    23.852207    6.0639195    4.5260857    1.5378338 0.0019920727 -0.023351195    4.5474448 
+   28620     20.18141    1.0085736    23.573001     6.034491    4.5221349    1.5123561  0.001986175 -0.023234839    4.5433836 
+   28630    20.178191   0.99412951     23.82372    6.0097219    4.5190247    1.4906972 0.0019167474 -0.022897912    4.5400059 
+   28640     20.28944   0.99923837    23.667934    6.0289899     4.530632    1.4983579 0.0018488482  -0.02255712    4.5513402 
+   28650    20.164875    1.0179376     23.94078    6.0544827    4.5280853    1.5263974  0.001736328  -0.02174358    4.5480925 
+   28660    20.062213    1.0246294    23.637116    6.0628478     4.526416    1.5364317 0.0017031008 -0.021669042     4.546382 
+   28670    19.964774    1.0262812    23.535772    6.0692353    4.5303266    1.5389086 0.0017014919 -0.021860197    4.5504854 
+   28680     19.96598    1.0235847     23.86302    6.0709742     4.536109    1.5348653 0.0016389358 -0.021531442    4.5560015 
+   28690    20.282369    1.0206127    23.853985    6.0653089    4.5349001    1.5304088 0.0015187156  -0.02136389    4.5547453 
+   28700    20.275208    1.0167576    23.762923    6.0728943    4.5482663     1.524628  0.001404164 -0.020769075    4.5676312 
+   28710    20.269927    1.0179776    23.691838    6.0660851    4.5396277    1.5264574 0.0015592708 -0.021653261    4.5597217 
+   28720    20.251886    1.0159954     23.68677    6.0640206    4.5405355    1.5234851 0.0018494442 -0.022815176    4.5615012 
+   28730    20.244575   0.99847167     23.66399    6.0397253     4.542517    1.4972083 0.0018227712 -0.022255029    4.5629493 
+   28740    20.367534    1.0143378    23.664358    6.0601942    4.5391947    1.5209995 0.0017371768 -0.022022943    4.5594805 
+   28750    20.259447   0.99135759    23.632053    6.0217861    4.5352454    1.4865407 0.0015831834  -0.02135299    4.5550152 
+   28760    20.216753   0.99728519    23.687012    6.0204211     4.524992    1.4954291  0.001457106 -0.020816035    4.5443509 
+   28770    20.024385    1.0170591    23.446366    6.0242452    4.4991651    1.5250801 0.0013541912 -0.020518834    4.5183297 
+   28780    19.984428    1.0001789    23.703704    6.0424991    4.5427308    1.4997683 0.0013600942 -0.020441215    4.5618119 
+   28790    19.954545    1.0245903    23.661853    6.0560631    4.5196899    1.5363732 0.0013777763 -0.020596007    4.5389081 
+   28800    20.200682   0.99717655    23.453672    6.0085459    4.5132797    1.4952662  0.001453497 -0.020572294    4.5323985 
+   28810    20.104446    1.0029851    23.559561    6.0266678    4.5226917    1.5039762 0.0017764346 -0.022172606    4.5430878 
+   28820    20.320903    0.9833852    23.783155    6.0060216    4.5314355    1.4745861 0.0018498389 -0.022332048    4.5519177 
+   28830     20.30697   0.96762861    23.582392    5.9881209    4.5371618    1.4509591 0.0018064703 -0.021903263    4.5572586 
+   28840    19.995414   0.99855232    23.412539    6.0027101    4.5053809    1.4973292  0.001832822 -0.022047948     4.525596 
+   28850    20.220647     1.001567    23.825864     6.016496    4.5146462    1.5018498 0.0019037779 -0.022650532     4.535393 
+   28860    20.328704    1.0081077    23.744433    6.0205079    4.5088504    1.5116575 0.0019256756 -0.023191291     4.530116 
+   28870    20.449098    1.0098266    23.736952     6.046642     4.532407     1.514235 0.0018626234 -0.023108408    4.5536527 
+   28880    20.287687    1.0052571    23.496668    6.0691619    4.5617789     1.507383 0.0016750243 -0.022063568    4.5821675 
+   28890    19.469156    1.0162191    23.706803    6.0735005      4.54968    1.5238205 0.0017032732 -0.022027823    4.5700046 
+   28900    20.137345    1.0024939    23.536122    6.0334656     4.530226    1.5032396 0.0015997836 -0.021539139    4.5501654 
+   28910    20.352436   0.98872314    23.847126    6.0137632    4.5311728    1.4825904 0.0015366503  -0.02129597    4.5509322 
+   28920    20.190489     0.973535     23.72439    6.0214007     4.561585    1.4598157 0.0018654485 -0.022568443     4.582288 
+   28930     20.50213   0.98863641    23.962553    6.0347998    4.5523395    1.4824603 0.0019904975 -0.023160373    4.5735094 
+   28940    20.261007   0.99893259    24.098479    6.0345675    4.5366681    1.4978994 0.0021812847 -0.023863764    4.5583506 
+   28950    20.427314    1.0002565    23.662367    6.0236929    4.5238083    1.4998846 0.0022277769 -0.024049242    4.5456298 
+   28960    20.162296    1.0037291    23.827922    6.0269046    4.5218128    1.5050918  0.002146719 -0.023413741    4.5430798 
+   28970     20.24212    1.0209508    23.769654    6.0584103    4.5274946    1.5309157  0.001966451 -0.022211577    4.5477398 
+   28980    19.963516    1.0059093    23.733022    6.0556894    4.5473284    1.5083611 0.0017577513 -0.021143605    4.5667142 
+   28990    20.016313    1.0089908    23.981971     6.052647    4.5396653    1.5129817 0.0016733648 -0.021142747    4.5591347 
+   29000    20.155903    1.0231393    24.135763    6.0799548    4.5457575    1.5341974 0.0017187074  -0.02151713    4.5655559 
+   29010    20.263303    1.0053706    23.568244    6.0433644    4.5358112    1.5075532  0.001513747 -0.020396453    4.5546939 
+   29020    20.247104   0.98904108    23.831901    6.0193461    4.5362789    1.4830671 0.0015160281 -0.020464286    4.5552272 
+   29030     20.21304    0.9978525     23.50417    6.0244375    4.5281577    1.4962798 0.0016658102 -0.021026302    4.5475182 
+   29040    20.325158    1.0067182    23.718379    6.0535949     4.544021    1.5095739 0.0018971396 -0.022059367    4.5641832 
+   29050    20.349441    1.0243895    23.777832    6.0625736    4.5265016     1.536072 0.0020187164  -0.02273089    4.5472138 
+   29060    20.441066    1.0128964    23.907794    6.0421721     4.523334    1.5188381 0.0021236383 -0.023294644     4.544505 
+   29070    20.014115    1.0025072    23.694684    6.0347784    4.5315189    1.5032595 0.0020762217 -0.023128145    4.5525708 
+   29080    20.167069    1.0224464    23.644912    6.0704647    4.5373062    1.5331584  0.002037502 -0.022828394    4.5580971 
+   29090    20.000459    1.0142649    23.719834    6.0342623    4.5133721    1.5208902 0.0019666231 -0.022513619    4.5339191 
+   29100    20.104532      1.00268    23.515622    6.0334489    4.5299302    1.5035187 0.0017554062 -0.021848186     4.550023 
+   29110    19.887341    1.0014683    23.801401    6.0325648    4.5308631    1.5017018 0.0017891662 -0.021928402    4.5510023 
+   29120    20.298378    1.0191787    23.587935     6.054854    4.5265954    1.5282585 0.0017811774 -0.021948217    4.5467625 
+   29130    20.258533    1.0088072    23.725163    6.0493578    4.5366513    1.5127064 0.0018421293   -0.0221004    4.5569096 
+   29140    20.189658    1.0106706    23.545605    6.0543133    4.5388126    1.5155006 0.0017411149 -0.022123869    4.5591954 
+   29150    20.022471    1.0145398    23.997447    6.0688264     4.547524    1.5213024 0.0016453662 -0.022089335    4.5679679 
+   29160    19.849243    1.0243402     23.78773    6.0868913    4.5508932    1.5359981 0.0014212318  -0.02088416    4.5703561 
+   29170     19.99288     1.034394    23.914967    6.0906299    4.5395561    1.5510738 0.0014728976 -0.020938609    4.5590219 
+   29180    20.324032    1.0411601    24.131789    6.0951917    4.5339721    1.5612196 0.0014151542 -0.020920317    4.5534772 
+   29190    20.421755    1.0337155    23.884831    6.0908994     4.540843    1.5500564 0.0013005116 -0.020442982    4.5599855 
+   29200    20.488061    1.0164226    23.836673    6.0891754    4.5650497    1.5241257 0.0013078502 -0.019967622    4.5837095 
+   29210    20.229828    1.0223969    23.739743    6.0758406    4.5427564    1.5330841 0.0014921583 -0.020747904    4.5620122 
+   29220    20.219162    1.0293252    23.886798    6.0565067    4.5130336    1.5434731 0.0014522281 -0.020449906    4.5320313 
+   29230    19.962454    1.0002971    23.716541    6.0489881    4.5490425    1.4999456 0.0013480515 -0.019857153    4.5675516 
+   29240    20.238782    1.0067439    23.847253    6.0518041    4.5421916    1.5096125 0.0012899254 -0.019442906    4.5603446 
+   29250    20.409598    1.0058406    23.978886    6.0379277    4.5296696     1.508258 0.0014155668  -0.02014921    4.5484033 
+   29260    20.346139    1.0061655    23.739112     6.012514    4.5037688    1.5087452 0.0015210198 -0.020383604    4.5226314 
+   29270     20.41298    0.9934543    23.629913    6.0288765    4.5391918    1.4896847 0.0014224107 -0.020316171    4.5580856 
+   29280    20.143687    1.0099828    23.474017    6.0357671    4.5212979    1.5144692 0.0013386668 -0.020219001    4.5401783 
+   29290    20.148062      1.00333    23.650657    6.0325562    4.5280628    1.5044934 0.0012085128 -0.019967841    4.5468221 
+   29300    20.129254     1.003139    23.600422    6.0455192    4.5413122     1.504207 0.0011699696 -0.020153696     4.560296 
+   29310    20.283614    1.0134931    23.616417    6.0423875    4.5226546     1.519733 0.0013010158 -0.020703525    4.5420571 
+   29320    20.031327    1.0041549    23.811985    6.0285111    4.5227808    1.5057303 0.0013178859 -0.020574361    4.5420372 
+   29330    20.242933    1.0241661    23.771688    6.0552102    4.5194731    1.5357371  0.001345899 -0.020558625    4.5386859 
+   29340    20.280166    1.0205014    23.936367    6.0811898     4.550948    1.5302418 0.0014169998 -0.021020548    4.5705515 
+   29350    20.255188    1.0227878    23.710656    6.0867409    4.5530705    1.5336704 0.0015300292 -0.020932241    4.5724728 
+   29360    20.099186     1.025832    23.734534    6.0898834    4.5516484    1.5382351 0.0015746201 -0.021123869    4.5711976 
+   29370    20.230833    1.0241942    23.843379    6.0774965    4.5417173    1.5357792 0.0013883124 -0.020263116    4.5605922 
+   29380    20.152093    1.0194626    24.021292    6.0676681    4.5389839    1.5286842 0.0013669273 -0.020216232    4.5578332 
+   29390     20.15644    1.0299549    23.855613    6.0871047    4.5426873    1.5444174  0.001298141 -0.019997726    4.5613869 
+   29400    20.354693    1.0263668     23.78785    6.0848736    4.5458365    1.5390371 0.0013428478 -0.020468485    4.5649622 
+   29410    20.168376    1.0205375    23.697249    6.0541748    4.5238788     1.530296 0.0013764989 -0.020721823    4.5432242 
+   29420    19.959524    1.0146342    23.785568    6.0655249    4.5440809     1.521444 0.0013812606 -0.020815312     4.563515 
+   29430    19.866715    1.0007619    23.841698    6.0383536    4.5377111    1.5006425  0.001443895 -0.021039096    4.5573063 
+   29440     20.38995    1.0207218    23.959995     6.070571    4.5399986    1.5305724 0.0015064359 -0.021042803    4.5595349 
+   29450    20.265893    1.0377431    23.820949    6.0957851    4.5396893    1.5560958 0.0016783924 -0.021255923    4.5592668 
+   29460    20.129113    1.0272682    23.825754    6.0726079    4.5322192    1.5403886 0.0018283958 -0.021760568    4.5521514 
+   29470    20.395001    1.0176925    23.607417    6.0511809     4.525151    1.5260299 0.0019358212 -0.022376066    4.5455913 
+   29480    20.037416    1.0166106    23.273508    6.0511352    4.5267276    1.5244076 0.0019071908 -0.022286677    4.5471071 
+   29490    20.171536   0.99182804    23.637137    6.0459307    4.5586846    1.4872461 0.0017122808 -0.021396392    4.5783687 
+   29500    20.187097    1.0029962    23.519738    6.0276739     4.523681    1.5039929 0.0018182644 -0.021689908    4.5435527 
+   29510    19.813951   0.99954958    23.485618    6.0374839    4.5386593    1.4988246 0.0017574307 -0.021749465    4.5586514 
+   29520    20.168279     1.001958    23.524072     6.020352     4.517916     1.502436 0.0017320504  -0.02207239    4.5382564 
+   29530    20.013672   0.99255401    23.523969    6.0276151    4.5392803    1.4883347  0.001538554 -0.021501988    4.5592438 
+   29540    20.454679   0.99493594    23.579039    6.0219753    4.5300689    1.4919064 0.0014731013 -0.021551818    4.5501476 
+   29550    19.984707   0.99460712    23.517681    6.0179502    4.5265368    1.4914134 0.0014184667 -0.021116922    4.5462353 
+   29560    20.175072    1.0163093    23.915434    6.0609399    4.5369842    1.5239557  0.001427346 -0.021207304    4.5567641 
+   29570     20.26029    1.0160214    23.755365     6.055406    4.5318819    1.5235241 0.0015308624 -0.021656967     4.552008 
+   29580    20.360527    1.0242704    23.896449    6.0665603    4.5306668    1.5358935 0.0015024383 -0.021106956    4.5502713 
+   29590    20.188916    1.0186739     23.65207    6.0756067    4.5481052    1.5275015 0.0016106578 -0.021438963    4.5679335 
+   29600    20.100409    1.0065363    23.919594    6.0580293    4.5487281    1.5093012 0.0016548946   -0.0214922    4.5685654 
+   29610    20.159127    1.0176471    23.788967    6.0781015    4.5521396    1.5259619  0.001489968 -0.020617626    4.5712673 
+   29620    20.378778    1.0181103    23.432072    6.0696927    4.5430363    1.5266564 0.0015533306 -0.020798193    4.5622812 
+   29630    19.987295    1.0263518    23.616687     6.090585    4.5515704    1.5390145 0.0016045282 -0.021127662    4.5710936 
+   29640    20.271169    1.0210684    23.818232    6.0611126    4.5300204    1.5310921 0.0018049889 -0.022094126    4.5503096 
+   29650     20.11014    1.0190383    23.986403     6.070466    4.5424181    1.5280479 0.0017724164  -0.02192296    4.5625686 
+   29660    20.118184    1.0260405    23.910554    6.0843374    4.5457897    1.5385477 0.0016550802 -0.021831271    4.5659659 
+   29670    20.312605    1.0143697    23.579884    6.0589498    4.5379024    1.5210474 0.0017499858 -0.022426404    4.5585788 
+   29680    20.454131    1.0128902    23.701052    6.0811286    4.5622997    1.5188289 0.0018947317 -0.022829957    4.5832349 
+   29690    20.419688     1.039753    23.631986    6.0811223    4.5220127    1.5591096 0.0019349701 -0.022918554    4.5429963 
+   29700    20.259552    1.0212961     23.92356    6.0683422    4.5369087    1.5314335 0.0019110771 -0.022672075    4.5576697 
+   29710    20.131972    1.0298023    23.581693    6.0766957    4.5325072    1.5441885 0.0019290936 -0.022878907     4.553457 
+   29720    20.314531    1.0284383    23.762099     6.063766    4.5216227    1.5421433 0.0018021731 -0.021900728    4.5417213 
+   29730    20.310531    1.0020733    23.844916    6.0239744    4.5213655    1.5026089 0.0015374404 -0.020545855    4.5403739 
+   29740    20.110947   0.99929037    23.649559    6.0306106    4.5321747    1.4984359 0.0014461023 -0.020043676    4.5507722 
+   29750    20.279405   0.99786895     23.78209    6.0272236    4.5309191    1.4963045 0.0013689058 -0.020056936    4.5496072 
+   29760    20.300094    1.0077229    23.916431    6.0399335     4.528853    1.5110805  0.001437298  -0.02062365    4.5480394 
+   29770    20.380233    1.0053382    23.744907    6.0309889    4.5234843    1.5075047 0.0013118174 -0.019944103    4.5421166 
+   29780    20.118459    1.0028471    23.453153    6.0384692       4.5347    1.5037692 0.0015205151 -0.020506186    4.5536857 
+   29790    20.323074    1.0263315    23.673437    6.0756165    4.5366325    1.5389841  0.001709284 -0.021559807     4.556483 
+   29800    20.301566    1.0164723    23.481294    6.0704157    4.5462155    1.5242002 0.0016476644 -0.021431064    4.5659989 
+   29810    20.404489    1.0188681    23.697451    6.0538338    4.5260411    1.5277927 0.0013432043 -0.020245025    4.5449429 
+   29820    20.427545    1.0300111    23.621679    6.0613641    4.5168624    1.5445017 0.00090335107 -0.018456326    4.5344154 
+   29830    20.015075     1.026684    24.251512    6.1063001    4.5667873    1.5395127 0.00081182243 -0.018024075    4.5839996 
+   29840    20.161321    1.0427915    23.822393    6.1022457    4.5385798    1.5636658 0.0011854562 -0.019490361    4.5568847 
+   29850    20.047376    1.0308154    23.610221    6.0817816    4.5360738    1.5457078 0.0012637578 -0.019911643    4.5547217 
+   29860    20.118954    1.0379719     24.03852    6.0928127    4.5363738    1.5564388 0.0014844007 -0.020614056    4.5555035 
+   29870     20.31467    1.0360847    23.799496    6.0871387    4.5335297     1.553609 0.0015942842 -0.021338015    4.5532734 
+   29880    20.144822    1.0231125    23.658517    6.0776454    4.5434883    1.5341571 0.0016755653 -0.021281874    4.5630946 
+   29890    20.243238    1.0175965    23.905579     6.066898     4.541012     1.525886 0.0017918422 -0.021782445    4.5610026 
+   29900    19.784544    1.0332758     23.90702    6.0736113    4.5242143     1.549397  0.002034655 -0.023045547    4.5452252 
+   29910    20.270611    1.0292661     23.82927    6.0548211    4.5114366    1.5433845 0.0020632972 -0.023325426    4.5326987 
+   29920    20.493151    1.0100131    23.725735    6.0588157    4.5443011    1.5145146 0.0020451514 -0.022985032     4.565241 
+   29930    20.336191    1.0298409    23.515488    6.0904031    4.5461566    1.5442465 0.0019711672  -0.02259414    4.5667796 
+   29940    20.113634    1.0124254     23.66333    6.0593414    4.5412096    1.5181318 0.0018350003  -0.02191969    4.5612943 
+   29950    19.878832    1.0204734    23.699886    6.0875778     4.557378    1.5301999 0.0016518406 -0.021076903     4.576803 
+   29960    20.231404    1.0381269    23.689952    6.0961702     4.539499    1.5566712 0.0015698718 -0.020651218    4.5585804 
+   29970    20.129273    1.0344943    23.843366    6.0870427    4.5358184    1.5512243 0.0016639322 -0.020699773    4.5548543 
+   29980    20.378193    1.0278951    23.717714    6.0931891    4.5518604    1.5413287  0.001718925 -0.020462694    4.5706041 
+   29990    20.366157    1.0369576    23.686376    6.1164097    4.5614918    1.5549179 0.0016625744 -0.020182341    4.5800115 
+   30000    20.340276    1.0378792    23.909563    6.1130349     4.556735    1.5562999 0.0017300101  -0.02093449    4.5759395 
+   30010    20.222844    1.0637685    24.037961    6.1429759     4.547855    1.5951209 0.0017595108  -0.02078022    4.5668757 
+   30020    19.771485    1.0379102    23.941677    6.1383834     4.582037    1.5563464 0.0017278028 -0.020580027    4.6008892 
+   30030    20.298256    1.0466171    23.934767    6.1036338    4.5342315    1.5694023  0.001698934 -0.020712974    4.5532455 
+   30040    20.184957    1.0281974    23.861329    6.1039599    4.5621779     1.541782  0.001781719 -0.021419167    4.5818154 
+   30050    20.288677    1.0466938    23.921087     6.109562    4.5400446    1.5695174 0.0017504888  -0.02115661    4.5594508 
+   30060    20.263144    1.0304819    23.872964    6.0996263    4.5544186    1.5452077 0.0015213088 -0.020288593    4.5731859 
+   30070     20.56327    1.0046705    23.865678    6.0537797    4.5472763    1.5065034 0.0014106175 -0.019935057    4.5658008 
+   30080    20.400783   0.99610109    23.636481    6.0132166     4.519563    1.4936536 0.0013744287 -0.020086099    4.5382747 
+   30090    20.288502   0.99556968    23.902284    6.0077891    4.5149323    1.4928567 0.0010374843 -0.018693381    4.5325882 
+   30100    19.994323    1.0013858    23.619737    6.0417969    4.5402189    1.5015781 0.00081116065  -0.01774232      4.55715 
+   30110    20.002616    0.9819792    23.691862    6.0383857    4.5659079    1.4724778  0.000786828 -0.017776754    4.5828979 
+   30120    20.191534   0.99999269    23.554805    6.0263889    4.5268999     1.499489 0.00071010915 -0.017648156     4.543838 
+   30130    20.327161      1.01521    23.638175    6.0583074        4.536    1.5223074 0.0007653823 -0.017880854    4.5531155 
+   30140    20.094009    1.0114446    23.780973    6.0570683    4.5404071    1.5166612 0.00096645458 -0.018369605    4.5578103 
+   30150    20.386792    1.0200003    23.857672    6.0611266    4.5316361    1.5294904 0.0012096335 -0.018873962    4.5493004 
+   30160    20.109748     1.023148    23.542493    6.0838157    4.5496052    1.5342105 0.0013377725 -0.019075615     4.567343 
+   30170    20.319356    1.0197484    23.777084    6.0673828    4.5382701    1.5291127 0.0013942451 -0.019438892    4.5563147 
+   30180    20.218152    1.0172956    23.795369     6.069048    4.5436133    1.5254347 0.0015698205  -0.02048472    4.5625282 
+   30190    20.013524    1.0367616    23.719715    6.0892617    4.5346378     1.554624  0.001803334 -0.021530779    4.5543652 
+   30200    20.296438    1.0363797    23.771762    6.1018253    4.5477739    1.5540514 0.0019657007 -0.022549982    4.5683582 
+   30210    20.074027    1.0334452    24.122793    6.0818319    4.5321808    1.5496511 0.0018315201 -0.021997305    4.5523466 
+   30220    20.370684    1.0317199    23.737539    6.0858941      4.53883     1.547064 0.0016922699 -0.021121653    4.5582594 
+   30230    20.028746    1.0183728    23.790282     6.064903     4.537853      1.52705 0.0016652917 -0.020917777    4.5571055 
+   30240     20.12296    1.0120538    23.996834    6.0727648    4.5551901    1.5175747 0.0016833468 -0.021252312    4.5747591 
+   30250    20.169176    1.0163204    23.806092     6.040132    4.5161595    1.5239724 0.0017769763 -0.021918061    4.5363006 
+   30260    20.176584    1.0009042    23.616254     6.011378    4.5105222    1.5008558 0.0018114187 -0.022005051    4.5307158 
+   30270    19.784523     1.012354      23.7346    6.0075713    4.4895464    1.5180249  0.001878949 -0.022695633    4.5103631 
+   30280    20.096129   0.99398726    23.974089    5.9975793    4.5070954    1.4904839 0.0019376807 -0.022794764    4.5279525 
+   30290    20.179604   0.98106296    23.452603    5.9863125    4.5152086    1.4711039 0.0018733981 -0.022088708    4.5354239 
+   30300     19.95925   0.99910088    23.732028    6.0282961    4.5301443    1.4981518 0.0018103953 -0.021754574    4.5500885 
+   30310    20.093257    1.0029151    23.465918    6.0560767    4.5522055    1.5038712  0.001709622 -0.021536083    4.5720319 
+   30320    20.287284    1.0106533     23.69905    6.0787289    4.5632542    1.5154746 0.0018179636 -0.021983005    4.5834193 
+   30330    20.080693    1.0221864    23.379526    6.0523805    4.5196119    1.5327686 0.0018072468 -0.022139228    4.5399439 
+   30340    20.339774    1.0034528    23.387706    6.0540985    4.5494211    1.5046774 0.0017276034 -0.021960343    4.5696538 
+   30350    20.250982    1.0055126    23.947086    6.0314369    4.5236707    1.5077662 0.0017459039 -0.022560671    4.5444855 
+   30360    20.370157     1.006605    23.554501    6.0510002     4.541596    1.5094043 0.0016254407 -0.022131599    4.5621021 
+   30370    20.387228    1.0124936    23.773494     6.035119    4.5168848    1.5182342 0.0015286192 -0.021278992    4.5366351 
+   30380    20.301563    1.0118486    23.889114    6.0566493    4.5393823    1.5172669 0.0016688119 -0.021879588    4.5595931 
+   30390     19.95915   0.99507468       23.734    6.0137222    4.5216077    1.4921145 0.0018272882 -0.022468656    4.5422491 
+   30400    20.190829   0.99736144    23.932746    6.0127655     4.517222    1.4955435 0.0019591089 -0.022968891    4.5382318 
+   30410    20.241059   0.99591651    23.335414    6.0247186    4.5313418    1.4933768 0.0018405902 -0.022300405    4.5518016 
+   30420    20.178631    1.0182262    23.613442    6.0353497    4.5085194    1.5268302 0.0017385423 -0.022227732    4.5290086 
+   30430    20.075004    1.0184628    23.988675    6.0376301    4.5104452    1.5271849 0.0016909121 -0.022057343    4.5308116 
+   30440    20.380041    1.0027546     23.39241     6.035499    4.5318685    1.5036305 0.0018558077 -0.022746556    4.5527592 
+   30450    20.377394    1.0062637    23.921603    6.0591535    4.5502611    1.5088924 0.0021210548 -0.023848407    4.5719885 
+   30460    20.133502    1.0119976    23.686855    6.0360269    4.5185365    1.5174904 0.0021912546 -0.024016817    4.5403621 
+   30470    20.172184    1.0194143    23.599888    6.0412399    4.5126281    1.5286118 0.0019837678 -0.023449294    4.5340937 
+   30480     20.09721    1.0117881     23.63942      6.02307    4.5058938    1.5171763 0.0018061894 -0.022545799    4.5266334 
+   30490    19.837742   0.99457182    23.552014    6.0146825    4.5233221    1.4913604 0.0018043403 -0.022298788    4.5438165 
+   30500    20.172661   0.98060523     23.56431      6.02019    4.5497724    1.4704175 0.0017256807 -0.021611382    4.5696581 
+   30510    20.431696    1.0031016    23.997648    6.0240044    4.5198535    1.5041508 0.0018916453 -0.022391208    4.5403531 
+   30520    20.198712   0.99093286    23.807401    5.9974375    4.5115337    1.4859038 0.0018346853 -0.022271205    4.5319702 
+   30530    20.399105   0.98280969    23.859208    5.9941371     4.520414    1.4737231 0.0016453965 -0.021433646    4.5402023 
+   30540    19.835332   0.97611813    23.398941    5.9902823    4.5265931    1.4636891 0.0016036564 -0.021371781    4.5463613 
+   30550     20.22165   0.98795323    23.808553    6.0006541    4.5192182    1.4814359 0.0016715015 -0.021765288     4.539312 
+   30560    20.054632    0.9883584    23.489045    5.9972893    4.5152459    1.4820434 0.0015947095 -0.021047823     4.534699 
+   30570    20.642461    1.0176442    23.409273    6.0504934     4.524536    1.5259575 0.0015140796 -0.020199597    4.5432215 
+   30580    20.329179     1.027966    23.887374    6.0555412    4.5141063    1.5414349 0.0016660648 -0.020952845    4.5333931 
+   30590    20.035986    1.0207143    23.717504    6.0694662     4.538905    1.5305612 0.0018407572  -0.02217531    4.5592396 
+   30600    20.292981    1.0209787    23.976376    6.0651564    4.5341989    1.5309575 0.0016845176 -0.021508947    4.5540233 
+   30610    19.902635    1.0006203    23.832329    6.0477426    4.5473124    1.5004302 0.0018028457 -0.022204211    4.5677137 
+   30620    20.270081    1.0040258    23.748136    6.0393264    4.5337897    1.5055368 0.0017784996 -0.022223172    4.5542343 
+   30630    20.421875    1.0296331    23.919114    6.0741573    4.5302225    1.5439349 0.0017248599 -0.022315246    4.5508129 
+   30640    20.117991    1.0096607    23.738612    6.0540231    4.5400369    1.5139862 0.0018948067 -0.022628876     4.560771 
+   30650    20.475075    0.9941694    23.807863    6.0346533    4.5438963     1.490757 0.0020214335 -0.022365308    4.5642402 
+   30660    20.186496     1.009253    23.565929    6.0326279     4.519253    1.5133749 0.0019608276  -0.02262019    4.5399124 
+   30670    20.332404    1.0067189    23.822463    6.0237598    4.5141848     1.509575 0.0019174387 -0.022535387    4.5348028 
+   30680    20.246955     1.003564    23.585445    6.0416047    4.5367605    1.5048442  0.002059661 -0.022872424    4.5575733 
+   30690    20.206638   0.99822103    23.598819    6.0404449    4.5436125    1.4968324 0.0019068246 -0.022099403     4.563805 
+   30700    20.420203    1.0210959     23.65569     6.061387    4.5302537    1.5311333 0.0018999872 -0.022215755    4.5505695 
+   30710    20.007545    1.0352809    23.949332    6.0666392    4.5142356    1.5524037 0.0020548429 -0.023529892    4.5357106 
+   30720    20.259265    1.0402397    23.608644    6.0861986    4.5263593    1.5598394 0.0022137955 -0.024272789    4.5484183 
+   30730    20.290591    1.0396735    23.930189    6.0994592    4.5404689    1.5589903 0.0019915519 -0.023388756    4.5618661 
+   30740    20.005232    1.0374277    23.760874    6.1088159    4.5531931    1.5556228 0.0019828834 -0.023582012    4.5747922 
+   30750    20.395825    1.0374181     23.95242     6.103177    4.5475686    1.5556084 0.0019081802 -0.023625161    4.5692856 
+   30760    20.352598    1.0401531    23.747477    6.0947622    4.5350526    1.5597096 0.0020408771 -0.024091936    4.5571037 
+   30770    20.448525     1.044171    23.797095    6.1068941    4.5411597    1.5657344 0.0018864418 -0.023174704     4.562448 
+   30780    20.060956    1.0384074    23.912591    6.1065323    4.5494404    1.5570919 0.0019413539 -0.022768171    4.5702672 
+   30790    19.942294    1.0145606    23.748413    6.0965446     4.575211    1.5213336 0.0018504891  -0.02216184    4.5955224 
+   30800    19.891407    1.0398037    24.048536    6.1330748    4.5738892    1.5591856  0.001987104 -0.022454749    4.5943568 
+   30810    20.087601    1.0442559    23.843649    6.1158814    4.5500196    1.5658618 0.0020782844 -0.022882802    4.5708241 
+   30820     20.38134    1.0329415    24.037798    6.0777157    4.5288199    1.5488958 0.0020686604 -0.023452484    4.5502037 
+   30830    20.189188    1.0083696     23.64696    6.0413275    4.5292772    1.5120502 0.0019005947 -0.022977742    4.5503544 
+   30840     20.22741    1.0178071    23.328086    6.0521239    4.5259222    1.5262018 0.0018108701 -0.023053406    4.5471647 
+   30850    20.039055    1.0023036    24.077076     6.033035    4.5300807    1.5029543 0.0017730937 -0.022868969    4.5511766 
+   30860    20.004005    1.0093942    23.654226    6.0411639    4.5275772    1.5135867 0.0018142397 -0.022990951    4.5487539 
+   30870    20.303473    1.0052556    23.697437    6.0403323    4.5329516    1.5073808 0.0017621648 -0.022386873    4.5535763 
+   30880    20.464999    1.0213659    23.754718    6.0531961    4.5216579    1.5315382 0.0018846454  -0.02293251    4.5427058 
+   30890    20.035177    1.0016696    23.939021     6.034649    4.5326454    1.5020036 0.0019733692  -0.02318045    4.5538525 
+   30900    19.915879   0.98747653    23.397735     6.014537    4.5338159    1.4807211 0.0019516802  -0.02274028    4.5546045 
+   30910    20.308564   0.99874951    23.658309    6.0008325    4.5032076    1.4976249 0.0018744637 -0.022413494    4.5237466 
+   30920    20.071274   0.97998429    23.292304    6.0012918    4.5318054    1.4694864 0.0017691415 -0.021582318    4.5516186 
+   30930    20.434017   0.99294426    23.806417    5.9976654    4.5087455    1.4889199 0.0017998543 -0.021584865    4.5285305 
+   30940    20.452054    1.0147183     23.66012    6.0293132    4.5077431    1.5215701 0.0016983972 -0.020995274      4.52704 
+   30950    20.203752   0.97743217    23.496755    5.9998785    4.5342189    1.4656595 0.0016092669 -0.020160386      4.55277 
+   30960     20.24328   0.98403249    23.606703    6.0018935    4.5263368    1.4755567 0.0015785082 -0.019330153    4.5440885 
+   30970    20.445211   0.99564026    23.515698    6.0202354    4.5272728    1.4929626 0.0013542988 -0.018098142    4.5440167 
+   30980     20.18833   0.99542424    23.925608    6.0191375    4.5264989    1.4926386 0.0012274279 -0.017547098    4.5428185 
+   30990    20.336975   0.98633323    23.654758    6.0295526    4.5505459    1.4790067 0.0013329506 -0.018118051     4.567331 
+   31000    20.124563   0.99973566    23.618339    6.0238836      4.52478    1.4991036 0.0013626218 -0.018575342    4.5419927 
+   31010    20.542351   0.99188064     23.54696    5.9932207    4.5058957     1.487325 0.0016991691 -0.020469114    4.5246656 
+   31020     20.50288   0.98671354    23.864521    5.9926675    4.5130905    1.4795769  0.001922981 -0.021894052    4.5330616 
+   31030    20.465082   0.99580193    23.598675    6.0192414    4.5260364     1.493205 0.0019502449 -0.022546882     4.546633 
+   31040    20.311885    1.0090962    23.920385    6.0341271    4.5209873    1.5131398 0.0019915697 -0.022955923    4.5419516 
+   31050    20.465185     1.004341    23.621378    6.0368517    4.5308423    1.5060094 0.0019882578 -0.023020114    4.5518742 
+   31060    20.213958    1.0046211     23.67147    6.0500492    4.5436199    1.5064293 0.0020881405 -0.023455065    4.5649868 
+   31070    20.326661    1.0289205    23.459794    6.0631944    4.5203281    1.5428663 0.0020231386 -0.023164599    4.5414695 
+   31080     20.11567    1.0053923    23.588068    6.0528738    4.5452881    1.5075858 0.0018927868 -0.022549497    4.5659448 
+   31090    20.525525    1.0385301    23.876415    6.0766277    4.5193518    1.5572759   0.00191733 -0.022765411    4.5401999 
+   31100    20.187133     1.020881    23.964731    6.0676745    4.5368634    1.5308111  0.001640133 -0.021349056    4.5565723 
+   31110    20.336822    1.0276364    23.879274    6.0695126    4.5285718    1.5409408 0.0012762638  -0.01938991    4.5466855 
+   31120    20.027632    1.0105081    23.766237    6.0579423    4.5426854    1.5152568 0.00095841414 -0.017560628    4.5592876 
+   31130    19.983838   0.99072944    23.694719    6.0311244    4.5455256    1.4855988 0.0011083211 -0.018460009    4.5628773 
+   31140     20.36517    1.0114588    24.037816    6.0429118    4.5262294    1.5166824 0.0011932425 -0.019158134    4.5441943 
+   31150    20.159883    1.0031116    23.807938    6.0547245    4.5505587    1.5041658 0.0011716869 -0.019396017     4.568783 
+   31160    20.335629    1.0032987    23.696704    6.0607863      4.55634    1.5044463 0.0014581843 -0.020549686    4.5754315 
+   31170    19.993607    1.0220829    23.700481    6.0669812     4.534368    1.5326133 0.0017706972  -0.02162215    4.5542194 
+   31180     20.29234    1.0188933    23.752839     6.074734    4.5469035    1.5278305 0.0018409038 -0.021629099    4.5666917 
+   31190    20.291504    1.0246367    23.840451    6.0833725    4.5469298    1.5364427 0.0017239481 -0.021215154     4.566421 
+   31200    20.299233    1.0206761    23.821956     6.085473    4.5549692    1.5305039 0.0017738095 -0.021663868    4.5748592 
+   31210    20.232449    1.0178678    23.810898    6.0876533    4.5613605    1.5262927 0.0017330195 -0.021576975    4.5812045 
+   31220    20.061768    1.0188366    23.860425    6.0626992    4.5349537    1.5277455 0.0016725335 -0.021153009    4.5544342 
+   31230    20.196142    1.0125446    23.935702    6.0548869    4.5365763    1.5183106  0.001571599 -0.020905703    4.5559104 
+   31240    20.320744    1.0235954     23.75114    6.0405011    4.5056198    1.5348812 0.0016453836 -0.021701797    4.5256762 
+   31250    20.120269    1.0188293    23.791419    6.0734398    4.5457053    1.5277345 0.0015957044 -0.021460758    4.5655704 
+   31260    20.271375    1.0202983     24.16443    6.0638263    4.5338889    1.5299373 0.0014163509 -0.020803974    4.5532766 
+   31270    20.265278    1.0033666    23.494493    6.0410177    4.5364696    1.5045481 0.0016556392 -0.021652264    4.5564662 
+   31280    19.722584    1.0129527    23.571707    6.0689811    4.5500586    1.5189225 0.0018715507 -0.022578722    4.5707658 
+   31290    19.894656    1.0241523    23.846049    6.0619658    4.5262495    1.5357163 0.0018995197 -0.022654733    4.5470047 
+   31300    20.144958    1.0241637    23.995628    6.0698056    4.5340721    1.5357335 0.0018917752 -0.022486364    4.5546667 
+   31310    20.282901     1.031804    23.983357      6.08453    4.5373398    1.5471902 0.0017394449 -0.021972927    4.5575733 
+   31320    20.295749    1.0263843     23.69564    6.0698773    4.5308141    1.5390632 0.0016474939 -0.021437704    4.5506043 
+   31330    20.190579    1.0256956    24.050495    6.0866668    4.5486363    1.5380305 0.0015065534 -0.020589832    4.5677196 
+   31340     20.05529     1.019105    23.533273    6.0752064    4.5470584     1.528148 0.0014249069 -0.019891303    4.5655248 
+   31350    20.248993    1.0203802    23.832349    6.0539565    4.5238965    1.5300601 0.0015100251 -0.020272171    4.5426586 
+   31360    20.151884    1.0142328    24.084845    6.0520314    4.5311893    1.5208421  0.001740416 -0.021378105     4.550827 
+   31370    20.293274    1.0121784     23.66777    6.0456387    4.5278772    1.5177615 0.0019505788  -0.02269094    4.5486176 
+   31380    20.254264      1.01895    23.532484    6.0353605    4.5074449    1.5279156 0.0018891656 -0.022330508    4.5278862 
+   31390    20.319039    1.0039653     23.71374    6.0322432    4.5267973    1.5054459 0.0017618994 -0.021936265    4.5469716 
+   31400    20.151169    1.0077162    23.891614    6.0297553    4.5186848    1.5110705 0.0016063413 -0.021050891    4.5381293 
+   31410    20.262253    1.0198084    23.784826    6.0485012    4.5192985    1.5292028 0.0014769554 -0.020364828    4.5381863 
+   31420    20.434126   0.99562007    23.522494    6.0182468    4.5253145    1.4929323 0.0014499994 -0.020449028    4.5443136 
+   31430      20.0283    1.0190624    23.796746    6.0571132    4.5290292     1.528084 0.0015123055 -0.020730073     4.548247 
+   31440    19.783353    1.0018552    23.885872    6.0348847    4.5326029    1.5022818 0.0015609075 -0.020875922    4.5519179 
+   31450    20.300943    1.0097769    23.641316    6.0612982    4.5471377    1.5141605 0.0015367621 -0.020607982     4.566209 
+   31460    20.290504    1.0203712    23.819084    6.0494095     4.519363    1.5300466 0.0015363033 -0.020450162    4.5382768 
+   31470    20.241191    1.0142825    23.862268    6.0701837    4.5492671    1.5209166 0.0015536115 -0.020734541     4.568448 
+   31480    20.245255     1.028448    23.893823    6.0817063    4.5395485    1.5421578 0.0018430988 -0.021985592     4.559691 
+   31490    20.255704    1.0187554    23.939924    6.0630326    4.5354089    1.5276237 0.0020212683  -0.02284298    4.5562306 
+   31500    20.191324    1.0126793    24.083495    6.0505171    4.5320046    1.5185126 0.0021035266 -0.023226335    4.5531274 
+   31510    19.999016    1.0156931    23.790823    6.0640362    4.5410044    1.5230319  0.002191949 -0.023507096    4.5623195 
+   31520    19.981806    1.0091781    23.777278     6.067993    4.5547304    1.5132626 0.0020804702 -0.022895995    4.5755459 
+   31530    20.298706    1.0071545    23.583125    6.0452508    4.5350226    1.5102282 0.0019329645 -0.022497091    4.5555867 
+   31540    19.867207    1.0232549     23.58969     6.046698    4.5123272    1.5343708 0.0020315754  -0.02316153    4.5334572 
+   31550    20.112125   0.98693675    23.758855    6.0258088    4.5458972    1.4799117 0.0019440463 -0.022803891     4.566757 
+   31560    19.900345    1.0115026    23.880584    6.0396373    4.5228892    1.5167481 0.0018674639 -0.022894539    4.5439163 
+   31570    20.015188    1.0056027    23.735948    6.0507599    4.5428586    1.5079012 0.0018387393 -0.022826445    4.5638464 
+   31580    20.121881    1.0033125    23.591286    6.0376649    4.5331978    1.5044671 0.0019828136 -0.023376402    4.5545914 
+   31590    20.103343    1.0152245    23.577059    6.0680851    4.5457559    1.5223291 0.0020393276 -0.023750833    4.5674674 
+   31600    20.111705    1.0242021    23.688713    6.0689961    4.5332051     1.535791 0.0020044195 -0.023587634    4.5547883 
+   31610    20.460743   0.99791788    23.598209    6.0658261    4.5694483    1.4963779 0.0020157548  -0.02370412    4.5911367 
+   31620    20.356085    1.0045588    23.512294     6.050646    4.5443101    1.5063359 0.0021547226 -0.024458505    4.5666138 
+   31630     20.08585    1.0204557    23.739428    6.0660829    4.5359096    1.5301733 0.0020690064 -0.024021386     4.557862 
+   31640    20.137889    1.0318393    23.759849     6.084109     4.536866    1.5472431 0.0020268205 -0.023637214    4.5584764 
+   31650     20.10099    1.0252249    23.580283     6.081043    4.5437182    1.5373248 0.0019094793 -0.022974989    4.5647838 
+   31660    20.301224    1.0261265    23.451752    6.0996141    4.5609374    1.5386767  0.001950481 -0.023121364    4.5821083 
+   31670    20.107971    1.0488832    23.869226    6.0874255    4.5146251    1.5728004 0.0019808481 -0.023177414    4.5358217 
+   31680    20.177409    1.0214027    23.735508    6.0736517    4.5420583    1.5315934 0.0020069471 -0.023124443    4.5631758 
+   31690    20.054663   0.99066097    23.725389    6.0292771     4.543781    1.4854961 0.0021154824 -0.023947942    4.5656135 
+   31700    20.286839    1.0098244    23.693502    6.0298449    4.5156132    1.5142317 0.0019967263 -0.023408568    4.5370251 
+   31710    20.076474   0.98910098    23.759265    6.0237854    4.5406285    1.4831569 0.0020014465 -0.023251652    4.5618787 
+   31720    20.059882    1.0092159    23.595802    6.0426605    4.5293413    1.5133192 0.0021029519 -0.023667284    4.5509057 
+   31730    20.137824    1.0088518    23.851374     6.058068    4.5452947    1.5127733 0.0020932371 -0.023682348    4.5668838 
+   31740    20.093092    1.0181214    23.741625    6.0591746    4.5325016     1.526673 0.0020576535 -0.023493162    4.5539371 
+   31750    20.488168    1.0060909    23.931328     6.058896    4.5502628    1.5086332 0.0020623111 -0.023716889    4.5719174 
+   31760    20.150714    1.0015413    23.696506    6.0241925    4.5223814    1.5018111 0.0020112167 -0.023801147    4.5441713 
+   31770    19.908043   0.98872677    23.818737    6.0324416    4.5498458    1.4825958 0.0018908865 -0.023584625    4.5715396 
+   31780    20.035828   0.99443103    23.626815    6.0207112    4.5295619    1.4911493 0.0019524138 -0.023668299    4.5512778 
+   31790    19.982844   0.99680332    23.709126    6.0274455    4.5327389    1.4947066 0.0019975092 -0.023734499    4.5544759 
+   31800    20.200609    1.0126046     23.73821    6.0284687    4.5100681    1.5184007  0.001903179 -0.023510734    4.5316756 
+   31810    20.335054    1.0047788     23.45176    6.0375254    4.5308596    1.5066659 0.0017943393 -0.022469147    4.5515344 
+   31820    20.376639    1.0067316    23.639538    6.0349461     4.525352    1.5095941 0.0017585154 -0.021818596    4.5454121 
+   31830    20.178446   0.99899102    23.732443    6.0493762    4.5513892     1.497987 0.0017532693 -0.021763266    4.5713992 
+   31840    19.998695    1.0201846    23.838859    6.0492822    4.5195154    1.5297668 0.0018347259 -0.021982332     4.539663 
+   31850    20.312639    1.0369907    24.007808    6.1127791    4.5578116    1.5549675 0.0018469324 -0.021980076    4.5779447 
+   31860    19.946928    1.0430171    23.849915    6.1023001     4.538296    1.5640042 0.0017110816 -0.021418864    4.5580038 
+   31870    19.732769    1.0292957    23.812028    6.0893017    4.5458728    1.5434289 0.0017037415 -0.021300065    4.5654691 
+   31880    20.139511    1.0278279    23.886703    6.0868259    4.5455979    1.5412279 0.0016594714 -0.021243286    4.5651817 
+   31890    20.460033    1.0472869    23.920118    6.0989839    4.5285771    1.5704068 0.0017802988 -0.022214842    4.5490116 
+   31900      20.1232    1.0235515     23.72364    6.0947225     4.559907    1.5348155 0.0018268106 -0.022668706    4.5807489 
+   31910    20.060034     1.025217    23.562658    6.0881959     4.550883    1.5373129 0.0018733116 -0.023026807    4.5720365 
+   31920    19.847691    1.0195252    23.630417    6.0670242    4.5382462    1.5287781 0.0018281193 -0.022789419    4.5592075 
+   31930    20.389128    1.0094995    23.598209    6.0442006     4.530456    1.5137446 0.0016579759 -0.021910531    4.5507086 
+   31940    20.318804   0.99321848    23.817731     6.049588    4.5602568    1.4893311 0.0014939458  -0.02075471    4.5795176 
+   31950    20.287113    1.0246509     23.74988    6.0655746    4.5291105    1.5364641 0.0014032325  -0.02032255    4.5480298 
+   31960    20.267545    1.0208373    23.799195    6.0874189    4.5566733    1.5307455 0.0014220997 -0.020889039    4.5761403 
+   31970    20.376612     1.030083    23.936542     6.095196    4.5505866    1.5446095 0.0013504469 -0.020472407    4.5697085 
+   31980    20.409905     1.029576     23.77385    6.0664052     4.522556    1.5438492 0.0013032696 -0.020135865    4.5413886 
+   31990    20.175755    1.0342539    23.721033    6.0761944    4.5253307    1.5508637 0.0013704749 -0.020277461    4.5442377 
+   32000    19.780761     1.011795    23.679764    6.0537043    4.5365177    1.5171867 0.0016379552 -0.021226771    4.5561065 
+   32010    20.031801    1.0016072    23.689626    6.0406865    4.5387765    1.5019101 0.0017179882 -0.021536698    4.5585952 
+   32020    20.604236    0.9889688    23.581109    6.0183685    4.5354098    1.4829587 0.0017135527 -0.021668844    4.5553651 
+   32030    20.305259     1.004034    23.755904    6.0395175    4.5339685     1.505549 0.0016588753 -0.021545513    4.5538551 
+   32040    20.185497     1.008138    23.439417    6.0295122    4.5178092     1.511703 0.0016639201 -0.021319972    4.5374653 
+   32050    20.413218   0.97024856    23.522538    5.9875886    4.5327008    1.4548877 0.0016063449 -0.021059903    4.5521544 
+   32060    20.319924   0.96561477    23.704025    5.9733584    4.5254191    1.4479393 0.0016604656 -0.021720103    4.5454787 
+   32070    20.381856    1.0019484    23.534738    6.0050586     4.502637    1.5024216 0.0016833904 -0.021910107    4.5228637 
+   32080    20.329956     1.001067     23.56396    6.0143287    4.5132288    1.5010999 0.0016740964 -0.021748537    4.5333032 
+   32090    20.298102   0.99248782    23.678074    6.0094849    4.5212494    1.4882355 0.0015832681 -0.021411843     4.541078 
+   32100    20.182624    1.0087134     23.79896    6.0423302    4.5297644    1.5125658  0.001589794 -0.021241787    4.5494164 
+   32110    20.183888   0.99506227    23.569549    6.0183082    4.5262123    1.4920959 0.0016356309 -0.020938795    4.5455155 
+   32120    19.972552    0.9964896    23.425804    6.0270625    4.5328263    1.4942362 0.0016818795 -0.021071865    4.5522163 
+   32130    20.300861    1.0182239    23.594406    6.0554437    4.5286168    1.5268268 0.0017165174 -0.021783979    4.5486843 
+   32140    20.159862    1.0066247    23.698678    6.0541382    4.5447045    1.5094338  0.001776141 -0.022341118    4.5652695 
+   32150    20.290362   0.99172879    23.745517    6.0280834    4.5409861    1.4870973 0.0018055237 -0.022309031    4.5614896 
+   32160     20.29021    1.0006045    23.290324    6.0417634    4.5413569    1.5004065 0.0018085361 -0.022741374    4.5622897 
+   32170    20.030391    1.0151258    23.614563    6.0521413    4.5299602    1.5221811 0.0019109747 -0.023353171    4.5514024 
+   32180    20.086399    1.0043494     23.64508    6.0316808    4.5256589    1.5060219   0.00182814  -0.02293414    4.5467649 
+   32190    20.325746    1.0057081    23.596638    6.0387663     4.530707    1.5080593  0.001800968 -0.022328798    4.5512348 
+   32200    20.299408     1.020095    24.094206    6.0474376    4.5178051    1.5296325 0.0017620044  -0.02254234    4.5385855 
+   32210    20.387266    1.0317079    23.813956     6.068985     4.521939     1.547046  0.001932078 -0.023360042    4.5433669 
+   32220    20.350243    1.0145819    23.703551    6.0628121    4.5414465    1.5213656 0.0019057191 -0.023305304    4.5628461 
+   32230    19.788057    1.0334177    23.731351    6.0857555    4.5361456    1.5496099 0.0018347467 -0.022938368    4.5572492 
+   32240    20.207949    1.0327978    23.922271    6.0707179    4.5220376    1.5486803 0.0017942126 -0.022750075    4.5429934 
+   32250    20.463222    1.0110244    23.604318    6.0547799    4.5387489     1.516031 0.0017409173 -0.022338914    4.5593469 
+   32260    20.235469    1.0006722    23.861006    6.0600603    4.5595523     1.500508 0.0016490829  -0.02175618    4.5796594 
+   32270    20.123225    1.0132973    23.509811    6.0292957    4.5098564    1.5194393 0.0017664015 -0.022256573    4.5303466 
+   32280    20.020233    1.0138583    23.715637    6.0626384     4.542358    1.5202805 0.0018866333 -0.022669775    4.5631411 
+   32290    20.335936    1.0072561    23.712798    6.0548396    4.5444591    1.5103805 0.0017764239 -0.022135298     4.564818 
+   32300    20.123152    1.0080944    23.481217     6.044678    4.5330404    1.5116376 0.0018397168 -0.022445393     4.553646 
+   32310    20.267803    1.0005805    23.708352    6.0425629    4.5421924    1.5003704 0.0019107232 -0.022715613    4.5629973 
+   32320    20.112534   0.99943912    23.847389     6.049881     4.551222     1.498659 0.0018089041 -0.021803715    4.5712168 
+   32330    20.218874    1.0051943    23.826835    6.0321495    4.5248607    1.5072888 0.0016819384 -0.021064396    4.5442432 
+   32340    20.350733   0.99602075    23.982977    6.0343786    4.5408455    1.4935331 0.0016170841 -0.020627153    4.5598556 
+   32350    20.193851     1.002067    23.551734    6.0346432    4.5320438    1.5025994 0.0015009484 -0.020204544    4.5507474 
+   32360     20.31245   0.99383655    23.667662    6.0291872    4.5389293    1.4902579 0.0017253974 -0.021527149     4.558731 
+   32370    20.331155    1.0008297    23.367039    6.0261223    4.5253782    1.5007441 0.0018350192 -0.022397328    4.5459405 
+   32380    20.318025    1.0073859    23.729922     6.032874    4.5222988    1.5105752 0.0018717414 -0.022776237    4.5432033 
+   32390    20.286364   0.98587312    23.718547    6.0163166    4.5379999    1.4783167 0.0020144304 -0.023697496     4.559683 
+   32400    20.318295   0.99855938    23.761933    6.0183721    4.5210323    1.4973398 0.0020667958 -0.023903558    4.5428691 
+   32410    20.240957    1.0051288    23.761059    6.0274203    4.5202296    1.5071907 0.0019541879 -0.023282437    4.5415579 
+   32420     20.36442    1.0063502    23.670041    6.0192803    4.5102582    1.5090221 0.0020492968 -0.023615147    4.5318241 
+   32430    19.988364   0.98393534     23.90487    6.0036495    4.5282384     1.475411 0.0021725455 -0.024078784    4.5501446 
+   32440    20.178019   0.98751188    23.662314      6.02044     4.539666    1.4807741 0.0021884947 -0.024098785    4.5615762 
+   32450     20.27095     1.005196       23.434    6.0277783    4.5204869    1.5072914 0.0019130478 -0.022514472    4.5410883 
+   32460    20.212189   0.99509802    23.307519    6.0183928    4.5262433    1.4921495 0.0018957678 -0.022097917    4.5464454 
+   32470    20.134601    0.9798696     23.55797     6.002317    4.5330025    1.4693145 0.0019500862 -0.022027386    4.5530798 
+   32480    20.275332   0.98915014    23.685836    5.9973041    4.5140735    1.4832306 0.0018938764 -0.021169319    4.5333489 
+   32490    20.048053   0.98907864    23.917818    6.0012152    4.5180918    1.4831234 0.0017480369 -0.019909707    4.5362534 
+   32500    19.986585   0.97305351    23.404805    5.9882105    4.5291168    1.4590937 0.0014882619 -0.018668003    4.5462966 
+   32510     20.52003   0.98220167    23.506168    6.0130392    4.5402278    1.4728114 0.0015141098 -0.018791174    4.5575049 
+   32520    20.367081    1.0084068     23.86421      6.01466    4.5025541    1.5121059 0.0016044869 -0.019969222    4.5209188 
+   32530    20.329031   0.99696923     23.48359    6.0278309    4.5328756    1.4949554 0.0015305166 -0.019668116    4.5510132 
+   32540    20.096686    1.0251783    23.976523    6.0459288     4.508674    1.5372548 0.0015414221 -0.019543061    4.5266756 
+   32550    20.314951    1.0032626    23.356717    6.0365414     4.532149    1.5043923 0.0015597855 -0.020287734     4.550877 
+   32560    20.244355    1.0213579    23.738995    6.0645776    4.5330514    1.5315262 0.0015787848 -0.020710244    4.5521829 
+   32570    20.179261    1.0198661    23.705484    6.0711412     4.541852    1.5292892  0.001615911 -0.021402515    4.5616386 
+   32580    20.461024    1.0093287    23.488726    6.0593831    4.5458948    1.5134883 0.0017516138 -0.022047651    4.5661908 
+   32590    20.490937   0.99534241    23.400957    6.0306716    4.5381557    1.4925159 0.0019685321 -0.023298758    4.5594859 
+   32600    20.174268    1.0131036    23.744778    6.0599793    4.5408305    1.5191488 0.0021600472   -0.0245544    4.5632249 
+   32610    20.054066    1.0125881     23.68571    6.0493397    4.5309639    1.5183758 0.0022490385 -0.024682822    4.5533977 
+   32620    20.062914   0.97201003    23.382354    5.9948966    4.5373675     1.457529 0.0021472467 -0.023994728     4.559215 
+   32630    20.407324   0.97736939    23.381002    5.9904009    4.5248355    1.4655654  0.001988315 -0.023137583    4.5459847 
+   32640     20.23563    0.9983952    23.939011    6.0038536      4.50676    1.4970936 0.0017059614 -0.021878875    4.5269329 
+   32650    20.159227   0.99878539    23.740935    6.0046885    4.5070098    1.4976787 0.0015924523  -0.02138285    4.5268002 
+   32660    20.219496    1.0050004    23.940791    6.0403495    4.5333514    1.5069981 0.0016862277 -0.021828486    4.5534936 
+   32670    20.318148   0.99953818    23.965012    6.0447907    4.5459832    1.4988075 0.0016115677 -0.021618279    4.5659899 
+   32680    20.346636    1.0342943    23.697716    6.0554741    4.5045498    1.5509243 0.0016524142 -0.021803492    4.5247009 
+   32690    20.154615    1.0087017     23.63636    6.0468408    4.5342925    1.5125483 0.0017715339 -0.022183062     4.554704 
+   32700    20.255546    1.0207424     23.80612    6.0619599    4.5313567    1.5306032 0.0019490268 -0.023377435    4.5527851 
+   32710    20.519317    1.0182164    23.815812    6.0609318    4.5341163    1.5268155  0.002004135 -0.024148288    4.5562605 
+   32720    20.349215    1.0159673    23.582128    6.0601771    4.5367342     1.523443 0.0020213672 -0.024197839    4.5589107 
+   32730    20.129177    1.0101298    23.534549    6.0437846    4.5290949    1.5146897 0.0021676888 -0.024736932    4.5516641 
+   32740    20.254483    1.0043168    23.381987    6.0494623    4.5434893     1.505973 0.0021427314 -0.024500606    4.5658471 
+   32750    20.268857    1.0158609    23.665986    6.0521469    4.5288635    1.5232834 0.0021688491 -0.024103095    4.5507978 
+   32760    20.194968    1.0018123    23.368819     6.035917    4.5336995    1.5022175 0.0021171402 -0.023645066    4.5552274 
+   32770    20.284672    1.0362654    23.829429    6.0757107    4.5218307      1.55388  0.001977897 -0.022689499    4.5425423 
+   32780    20.313267    1.0432909    24.000318    6.1175988    4.5531841    1.5644146 0.0018406042 -0.021824618    4.5731681 
+   32790    20.447663    1.0316987    23.796423    6.0633007    4.5162684    1.5470322  0.001763713 -0.021902914    4.5364076 
+   32800    20.259254    1.0154838    23.958848    6.0597412    4.5370233    1.5227179 0.0017864875 -0.021830085    4.5570668 
+   32810     20.10398    1.0196842     23.59144    6.0545978    4.5255813    1.5290165 0.0018782782 -0.021934814    4.5456379 
+   32820      20.0204   0.99908944    23.683573     6.029228    4.5310934    1.4981346 0.0015642099 -0.020517718    4.5500469 
+   32830     19.89995   0.99881995    23.730521    6.0226044    4.5248739    1.4977305 0.0014645925  -0.01998229    4.5433916 
+   32840    20.108441    1.0145777    23.702842    6.0424346    4.5210753    1.5213593 0.0016062507 -0.020786683    4.5402558 
+   32850    20.315345    1.0058468    23.583639    6.0271208    4.5188535    1.5082673 0.0014196096 -0.020264067     4.537698 
+   32860     20.31517    1.0100587    23.731539    6.0438912    4.5293082     1.514583 0.0014192919 -0.020141817    4.5480308 
+   32870    20.447461    1.0109661    23.462077    6.0699432    4.5539995    1.5159436 0.0015883287 -0.020530487    4.5729417 
+   32880    20.251521    1.0276084    23.969288    6.0694133    4.5285145    1.5408988 0.0016293312 -0.020890758    4.5477759 
+   32890    20.263941    1.0159609    23.845709    6.0559023    4.5324689    1.5234334 0.0015880825 -0.020965288    4.5518461 
+   32900    20.444635    1.0115262    23.582665    6.0656542    4.5488706    1.5167836 0.0016277509 -0.021280749    4.5685236 
+   32910    19.960755    1.0358006    24.064776    6.0809042    4.5277213    1.5531829 0.0017205093 -0.021903516    4.5479043 
+   32920    20.078767    1.0262318     23.79661    6.0992521    4.5604176    1.5388345  0.001861227 -0.022104942    4.5806613 
+   32930    20.456939     1.012946    23.859856    6.0555348    4.5366222    1.5189126 0.0019600421 -0.022758721    4.5574209 
+   32940     20.10185    1.0140813    23.557864    6.0598176    4.5392027    1.5206149 0.0018517231 -0.022078836    4.5594299 
+   32950    20.406364     1.011374    23.899577    6.0507385    4.5341832    1.5165553 0.0017070259  -0.02116925    4.5536454 
+   32960    20.440301    1.0197141    23.837391    6.0821132    4.5530518    1.5290614 0.0016537313 -0.020762605    4.5721607 
+   32970    20.472951    1.0122054    23.515828    6.0825568    4.5647549     1.517802  0.001464917 -0.020163146    4.5834531 
+   32980     20.26697    1.0081448    23.929181    6.0591621    4.5474489    1.5117132 0.0015005434 -0.020530124    4.5664785 
+   32990    20.131694   0.98947291    23.745329    6.0157881    4.5320735    1.4837146 0.0014990946 -0.020247443    4.5508218 
+   33000    20.431423   0.98428069     23.73715    6.0130791    4.5371502    1.4759289 0.0014787794 -0.019524957    4.5551964 
+   33010    20.492573   0.99917209    24.132733    6.0216289    4.5233704    1.4982585 0.0012869694 -0.018392877    4.5404763 
+   33020    20.335599   0.99437458    23.853323    6.0242864    4.5332217    1.4910647  0.001285048  -0.01866885    4.5506055 
+   33030    20.299938    1.0031111    23.668071    6.0364801     4.532315    1.5041652 0.0013032013 -0.018793056    4.5498048 
+   33040    20.156715    1.0084432    23.727621    6.0582251    4.5460645    1.5121606 0.0013160942 -0.019226106    4.5639745 
+   33050    20.412347    1.0183983    23.758924    6.0750567    4.5479685    1.5270882  0.001469974 -0.019574655    4.5660732 
+   33060    20.305837    1.0059865    23.683942    6.0444105    4.5359338    1.5084767 0.0012990466  -0.01919601    4.5538307 
+   33070    20.410454     1.013954    23.744032    6.0456965    4.5252724     1.520424 0.0013811277 -0.019974138    4.5438655 
+   33080     20.25604    1.0113678    23.989681    6.0379789     4.521433    1.5165459 0.0015937307 -0.021014646    4.5408539 
+   33090    20.462763   0.99535018    23.813981     6.022413    4.5298854    1.4925276 0.0017711389 -0.022199822    4.5503141 
+   33100    20.366736   0.99145276    23.773049    6.0177852    4.5311018    1.4866834 0.0019167108 -0.023106294    4.5522914 
+   33110    20.244661   0.99783082    23.987219    6.0074228    4.5111755    1.4962473 0.0018226619 -0.022558018    4.5319108 
+   33120    20.339401   0.98225275    23.488236      6.00035     4.527462     1.472888 0.0018195718 -0.022330733    4.5479732 
+   33130    20.164447    1.0131788    24.054289    6.0223552    4.5030936    1.5192616 0.0019903673 -0.023424607    4.5245279 
+   33140     20.22201    1.0083047    23.886395    6.0552743    4.5433213     1.511953  0.002016873 -0.023524415    4.5648288 
+   33150    20.247636    1.0226747    23.665177    6.0612446    4.5277439    1.5335007 0.0021048792 -0.023770742    4.5494098 
+   33160     20.00232    1.0051395      23.8647    6.0635699    4.5563632    1.5072067 0.0020086417 -0.023347803    4.5777023 
+   33170    20.294807    1.0192039     23.65376    6.0669628    4.5386666    1.5282962 0.0021211264 -0.024027057    4.5605725 
+   33180    20.167536    1.0156443    23.958241    6.0691068    4.5461481    1.5229587 0.0020327392 -0.023793022    4.5679084 
+   33190    20.329603    1.0284735    23.807944    6.0749346    4.5327386     1.542196 0.0019243204 -0.023149756     4.553964 
+   33200    20.285579    1.0270033    23.982134    6.0549898    4.5149983    1.5399915 0.0017349543 -0.022304051    4.5355674 
+   33210    20.471766   0.99981668    23.575396     6.040003    4.5407779    1.4992251 0.0016801083 -0.022003267     4.561101 
+   33220    20.339114    1.0040947    23.641056    6.0136158    4.5079757    1.5056401 0.0014406231 -0.021140841    4.5276759 
+   33230    20.181368   0.96483136    23.402001    5.9965831    4.5498185    1.4467646  0.001315181 -0.020826643      4.56933 
+   33240    20.229322    0.9899695    23.714941    5.9946603    4.5102011    1.4844593 0.0015590706 -0.021818077    4.5304601 
+   33250    20.311341   0.97330448    23.772038     5.995838    4.5363679    1.4594701 0.0015504943 -0.021273883    4.5560913 
+   33260    20.201053   0.98367611    23.662151    6.0025761    4.5275538    1.4750223 0.0014294073 -0.020881018    4.5470054 
+   33270    20.449931   0.98831903    23.659264    6.0167434     4.534759    1.4819844 0.0014821797 -0.021090156     4.554367 
+   33280    20.292733    1.0026391    23.559923    6.0030087    4.4995514    1.5034573  0.001602706 -0.021571213    4.5195199 
+   33290    20.302647   0.97475975    23.702172     5.981569    4.5199168    1.4616522 0.0017724132 -0.022450422    4.5405948 
+   33300    20.278976   0.98646387    23.697507    5.9658985    4.4866959    1.4792026 0.0019212599 -0.023524292     4.508299 
+   33310    20.263766   0.97619168    23.725501    5.9705777    4.5067783    1.4637994 0.0018747365 -0.023104831    4.5280083 
+   33320    20.003203   0.98039485    23.800119    5.9812598    4.5111577    1.4701021   0.00178675 -0.022300636    4.5316716 
+   33330    19.747337    0.9881329     23.73422    6.0000872     4.518382    1.4817053 0.0016452903 -0.020767945    4.5375046 
+   33340    20.360386   0.99421187    23.841204    6.0163958    4.5255751    1.4908207 0.0016360323 -0.020487631    4.5444267 
+   33350    20.398749    1.0106148    23.506885    6.0304805    4.5150637    1.5154169 0.0016856263 -0.020988683    4.5343667 
+   33360     20.43556    1.0067094    24.086286    6.0562058     4.546645    1.5095608 0.0016676598 -0.020913646     4.565891 
+   33370    20.373778   0.99400143    23.789414    6.0479712     4.557466    1.4905051 0.0016498646 -0.020508115    4.5763243 
+   33380    20.325384   0.99828711      23.5061    6.0176788    4.5207473    1.4969315 0.0014990004 -0.019862425    4.5391107 
+   33390    20.366173   0.98748076    24.012943    6.0103902    4.5296628    1.4807274 0.0013487764  -0.01938101    4.5476951 
+   33400    20.301316   0.99026592    23.585258    6.0240901    4.5391863    1.4849038 0.0013844565 -0.019414702    4.5572166 
+   33410    20.375408    1.0067511    23.978017    6.0116919    4.5020685    1.5096233 0.0014011067 -0.019220343    4.5198878 
+   33420    20.462852    1.0102302    23.720892    6.0272518    4.5124116    1.5148402 0.0015736863   -0.0200804    4.5309183 
+   33430    20.065872    1.0018247    23.668384    6.0365961      4.53436    1.5022361  0.001799114 -0.021267347    4.5538282 
+   33440    20.359348    1.0269444    23.593614    6.0553849    4.5154818    1.5399031 0.0019381801 -0.022102484    4.5356461 
+   33450     20.28944    1.0191616    23.668741     6.046996    4.5187631    1.5282328 0.0018985998 -0.021909311    4.5387739 
+   33460    20.112994    1.0117601    23.534582    6.0434491    4.5263149    1.5171342 0.0018407436 -0.021731834     4.546206 
+   33470     20.29054    1.0135121     23.66804    6.0310987    4.5113374    1.5197613 0.0018120771 -0.021128687     4.530654 
+   33480    20.289019     1.002245      23.5732    6.0119222    4.5090557    1.5028664 0.0017443379 -0.020840731    4.5281521 
+   33490    20.359859    1.0050744    23.445149    6.0230822    4.5159731    1.5071091 0.0017470883 -0.021042262    4.5352683 
+   33500    20.317342    1.0106048    23.883691    6.0325245    4.5171225    1.5154019 0.0017333469 -0.021111023    4.5365002 
+   33510    20.313076    1.0105688    23.782554    6.0297663    4.5144184     1.515348 0.0018889989 -0.021731964    4.5342613 
+   33520    20.272799   0.99995485    23.561403    6.0410322    4.5415999    1.4994323 0.0019940382 -0.022111515    4.5617174 
+   33530    19.592664     1.004881    23.696088    6.0416982    4.5348791    1.5068191 0.0018504358  -0.02140313    4.5544318 
+   33540    19.643581    1.0022168    23.576399    6.0315788    4.5287547     1.502824 0.0017694211 -0.021101039    4.5480864 
+   33550    20.261746   0.99040722    23.691321    6.0279855    4.5428699    1.4851156 0.0017014605 -0.020905498    4.5620739 
+   33560    20.472554    1.0131909    23.564384    6.0242296    4.5049498    1.5192797 0.0017560442 -0.021138411    4.5243322 
+   33570    20.512122   0.99456299    23.636679     6.027596    4.5362488    1.4913472 0.0017008759 -0.020821207    4.5553691 
+   33580    20.295302    0.9944788    23.720494     6.009268     4.518047     1.491221 0.0016587926 -0.020277829    4.5366661 
+   33590    20.354144   0.98419388    23.460773    6.0017767     4.525978    1.4757987 0.0016516832 -0.020024177    4.5443505 
+   33600    20.073967   0.98220978    23.636021    5.9984874    4.5256639    1.4728236 0.0014867557 -0.019997419    4.5441745 
+   33610    20.203559    0.9854639      23.6415    5.9961224    4.5184193    1.4777031 0.0013894308 -0.019639136     4.536669 
+   33620    20.128796   0.98434517    23.625923    5.9915871    4.5155615    1.4760256 0.0015199997 -0.020305863    4.5343473 
+   33630    20.203859   0.99435042    23.465214    5.9757753    4.4847469    1.4910285 0.0015731102 -0.020714733    4.5038885 
+   33640    20.268921   0.99140134    23.756353    5.9857273    4.4991209    1.4866063 0.0018335653 -0.022524524    4.5198119 
+   33650      20.1721   0.98552657    23.823449    5.9986615    4.5208644    1.4777971 0.0019616241 -0.022861774    4.5417646 
+   33660     20.03411   0.98921095    23.591755    6.0000579    4.5167361    1.4833218 0.0020823059 -0.023844236     4.538498 
+   33670    20.094474   0.98917056    23.835837    6.0030287    4.5197674    1.4832613 0.0021572491 -0.024393043    4.5420032 
+   33680    20.160103   0.99930752     23.40469    5.9915069    4.4930452    1.4984616 0.0022826978 -0.024819608    4.5155821 
+   33690    20.347832    1.0084949    23.625177    6.0377182    4.5254802     1.512238 0.0022364342 -0.024450773    4.5476945 
+   33700    20.482505    1.0153374    23.613143    6.0392883    4.5167899    1.5224984 0.0021257648 -0.023766001    4.5384301 
+   33710     20.23521   0.99885708    23.792575    6.0161385    4.5183523    1.4977862  0.002029993 -0.023275474    4.5395977 
+   33720    20.322645   0.99969152    23.731472    6.0199448    4.5209073    1.4990374 0.0018356504 -0.022326527    4.5413982 
+   33730     20.20813    1.0050325    23.740092    6.0139701    4.5069239    1.5070463 0.0017033739 -0.021547018    4.5267675 
+   33740    20.400983    1.0057194    23.757765    6.0311439    4.5230678    1.5080762 0.0015337788 -0.020875195    4.5424092 
+   33750    20.192691    1.0226609    23.748125    6.0430449    4.5095649      1.53348 0.0016602834  -0.02172764    4.5296322 
+   33760    20.154684    1.0111304    23.995556    6.0561744    4.5399844      1.51619  0.001818891 -0.022642063    4.5608076 
+   33770    20.048795    1.0044873    23.712521    6.0464183    4.5401896    1.5062287 0.0019597787 -0.023153863    4.5613837 
+   33780    20.159459   0.99628992    23.479821     6.052014    4.5580773    1.4939367 0.0019261036 -0.022917264    4.5790684 
+   33790    20.036879    1.0228795    23.751131    6.0862352    4.5524274    1.5338078 0.0018967928 -0.023001277    4.5735319 
+   33800    20.007818    1.0233156    23.718551    6.0578776    4.5234158    1.5344618 0.0017722117 -0.022602636    4.5442462 
+   33810    19.975298    1.0180994    23.898043    6.0397889    4.5131488    1.5266401 0.0014707107 -0.021312174    4.5329902 
+   33820    20.325449    1.0048665    23.547268    6.0443089    4.5375116    1.5067974 0.0015474267 -0.022047539    4.5580117 
+   33830    20.352223    1.0116986     23.76176    6.0432504    4.5262084    1.5170421 0.0015856248  -0.02176757    4.5463903 
+   33840    20.120358    1.0122856     23.68618    6.0363455    4.5184232    1.5179223 0.0016083325 -0.021523066    4.5383379 
+   33850    20.361073    1.0155824    23.694764    6.0498929    4.5270271    1.5228658 0.0014722875 -0.020935221    4.5464901 
+   33860     20.20593    1.0031542    24.025332    6.0308788    4.5266491    1.5042298  0.001168614  -0.01928471    4.5447652 
+   33870    20.378368    1.0003341       23.486    6.0656307    4.5656298    1.5000009 0.0011109126  -0.01892424    4.5834431 
+   33880    19.923924    1.0119791    23.431991    6.0599664    4.5425037    1.5174626 0.0012705105 -0.019396579    4.5606298 
+   33890    20.202878    1.0327786    23.820403    6.0844146    4.5357631    1.5486515 0.0014324554 -0.019937666    4.5542683 
+   33900    20.206521    1.0184816    23.959903    6.0666708    4.5394576    1.5272132 0.0015833079 -0.020434155    4.5583084 
+   33910    20.310264    1.0122979    24.010429    6.0655453    4.5476045    1.5179408 0.0015789909 -0.020484353    4.5665099 
+   33920    20.070495    1.0256154     23.75774    6.0780943     4.540184    1.5379103 0.0016529873 -0.020756248    4.5592873 
+   33930    20.354381    1.0161221    23.752678    6.0621679    4.5384928    1.5236751 0.0016571792 -0.020895021    4.5577306 
+   33940    20.420943    1.0027509    23.801867    6.0462709     4.542646    1.5036249  0.001626269 -0.020726413    4.5617462 
+   33950    20.582155    1.0176982    23.925496     6.041472    4.5154334    1.5260385 0.0016459655 -0.020746522     4.534534 
+   33960     20.34944    1.0082747    23.846478    6.0278353    4.5159275    1.5119079 0.0016725299 -0.020964012    4.5352189 
+   33970    20.221076    1.0124904    23.589174    6.0458609    4.5276316    1.5182293 0.0015940437 -0.020405884    4.5464434 
+   33980    19.872776    1.0051474    23.637891    6.0384739    4.5312554    1.5072185 0.0014913807 -0.019828964     4.549593 
+   33990    20.298622    1.0055062    23.753595    6.0419613    4.5342047    1.5077566 0.0014785011 -0.020130139    4.5528564 
+   34000    19.949703    1.0319408    23.492276    6.0595422     4.512147    1.5473952 0.0014337725 -0.019858257    4.5305715 
+   34010    20.243443    1.0262069     23.64979    6.0589865    4.5201893    1.5387972 0.0015220131 -0.020446731     4.539114 
+   34020    20.531072     1.029084    23.794455    6.0876562    4.5445447    1.5431115 0.0015469626 -0.020845769    4.5638435 
+   34030    20.174737    1.0026577    23.794249     6.058133    4.5546478    1.5034853 0.0016121255  -0.02127909    4.5743147 
+   34040    20.315924    1.0151146    23.647243     6.044346    4.5221817    1.5221643 0.0016315108 -0.021430328    4.5419805 
+   34050    20.065334    1.0138343    23.656495    6.0479723    4.5277279    1.5202445 0.0016033092  -0.02173374    4.5478583 
+   34060      20.2083    1.0049339     23.49171     6.044227    4.5373286    1.5068984 0.0015014214 -0.021431995    4.5572592 
+   34070    20.341037   0.98925094    24.012877    6.0256464    4.5422646    1.4833818 0.0013611651 -0.020766569      4.56167 
+   34080    19.959036   0.98934096    23.691642    5.9919143    4.5083975    1.4835168 0.0013374175 -0.020934069    4.5279942 
+   34090    20.506806   0.97451839     23.72318    5.9895627    4.5282724    1.4612903 0.0014058836 -0.020843358    4.5477098 
+   34100    20.432402   0.98069705    23.677849    5.9993458    4.5287906    1.4705552 0.0012196976 -0.019417825    4.5469887 
+   34110    20.534115   0.98016714    23.715288    5.9908324    4.5210718    1.4697606  0.001034174 -0.018350038    4.5383877 
+   34120    20.291372   0.97622042    23.696356    6.0061904    4.5423479    1.4638425 0.00084819029 -0.017348596    4.5588483 
+   34130    20.294869    1.0106729    23.791005    6.0462475    4.5307435     1.515504 0.00092406185 -0.017513998    4.5473335 
+   34140    20.196406    1.0108435    23.852669    6.0572906    4.5415308    1.5157598 0.0011254306 -0.018683812    4.5590892 
+   34150    19.897588    1.0236997    23.815846    6.0577931    4.5227555    1.5350377 0.0013460871 -0.019252437    4.5406618 
+   34160    20.248918    1.0026905    23.643339     6.076167    4.5726327    1.5035343 0.0014439684 -0.019439322     4.590628 
+   34170    20.351595    1.0335095    23.770449    6.0747755    4.5250281    1.5497474 0.0014152875 -0.019473359    4.5430861 
+   34180    19.987781    1.0280829    23.481274    6.0792809    4.5376706    1.5416103 0.0014705351 -0.019679782    4.5558799 
+   34190    20.304568    1.0028558    23.728788     6.052975    4.5491928    1.5037822 0.0015188269 -0.020184347    4.5678583 
+   34200    20.409735    1.0185943    23.809701    6.0608809    4.5334987    1.5273822 0.0014949096 -0.020280811    4.5522846 
+   34210    20.578628    1.0203043    23.697361    6.0610201    4.5310738    1.5299463 0.0013927829 -0.020088475    4.5497695 
+   34220     20.28355    1.0132479    23.918349    6.0596363    4.5402711    1.5193652 0.0011649661 -0.019173454    4.5582796 
+   34230    20.153922    1.0214264    24.023173    6.0676036    4.5359747    1.5316289 0.0012309596 -0.019606031    4.5543498 
+   34240    20.090333    1.0211137    23.946166    6.0805293    4.5493694    1.5311599   0.00146945  -0.02085939    4.5687593 
+   34250    20.112009    1.0286508    23.619554    6.0838182    4.5413563    1.5424618 0.0016299899 -0.021531627     4.561258 
+   34260    20.045455    1.0287141    23.533939    6.0914285    4.5488717    1.5425569 0.0016852986 -0.021809077    4.5689955 
+   34270    20.282438   0.99670661    23.684791    6.0318627    4.5373011    1.4945616 0.0018207987 -0.022553211    4.5580335 
+   34280    20.051338    1.0135549    23.718489    6.0549428    4.5351172    1.5198256 0.0018144988 -0.022777032    4.5560797 
+   34290    20.024119    1.0213459    23.623497    6.0725058    4.5409976    1.5315082 0.0018428146 -0.023036064    4.5621909 
+   34300    20.249342    1.0209459    23.851597    6.0770373    4.5461288    1.5309084 0.0019467133  -0.02303607    4.5672182 
+   34310    20.336245    1.0219644    23.568055    6.0883321    4.5558964    1.5324357 0.0018525755  -0.02219599    4.5762398 
+   34320    20.118052    1.0141997    23.635582    6.0473057    4.5265133    1.5207924 0.0019029244 -0.022244291    4.5468546 
+   34330    20.124657   0.99430085    23.721732    6.0445695    4.5536154    1.4909541 0.0018709392 -0.022599299    4.5743438 
+   34340    20.228955    1.0162955    23.556085    6.0590029    4.5350678    1.5239352 0.0015947348 -0.021466826    4.5549399 
+   34350    19.924679     1.009268    23.830781    6.0644848    4.5510874    1.5133974 0.0014844262 -0.020666458    4.5702695 
+   34360    20.278837   0.99427341     23.80689    6.0555158    4.5646028     1.490913 0.0015904809 -0.021143131    4.5841554 
+   34370    20.195877    1.0179841    23.708359    6.0348118    4.5083446    1.5264672 0.0016582582 -0.021393372    4.5280797 
+   34380    20.174723    1.0175281    23.680342    6.0470578    4.5212744    1.5257834 0.0017864549 -0.021912991    4.5414009 
+   34390    20.186905    0.9790047    23.535184    6.0040227    4.5360051    1.4680175 0.0016951983 -0.021454369    4.5557643 
+   34400    19.973033   0.99022579    23.759139    6.0067956     4.521952    1.4848436 0.0017481281 -0.021837895    4.5420417 
+   34410    20.187392   0.99723326    23.439468    6.0168091    4.5214578    1.4953513  0.001744799  -0.02181545    4.5415285 
+   34420    19.791828    1.0091852    23.775356    6.0364038    4.5231305    1.5132733 0.0017767625 -0.021946301       4.5433 
+   34430    20.001663    1.0196098    23.901803    6.0538247    4.5249198    1.5289048 0.0017078524 -0.021499623    4.5447116 
+   34440    20.281243    1.0068432    23.734472    6.0460863    4.5363249    1.5097614  0.001763673 -0.021796715     4.556358 
+   34450    20.279815   0.98949928     23.58632    6.0381218    4.5543676    1.4837542 0.0018334792 -0.022350865     4.574885 
+   34460    20.246927    1.0106777    23.746709    6.0641879    4.5486767    1.5155112 0.0018160173 -0.022326023    4.5691867 
+   34470    20.169318    1.0284514    24.068975     6.080688    4.5385251    1.5421629 0.0018091941 -0.022078677    4.5587946 
+   34480    20.383958    1.0406344     23.67497    6.0825691    4.5221378    1.5604313 0.0019840935 -0.022851307     4.543005 
+   34490    20.023624    1.0196875    23.681352    6.0627653    4.5337439    1.5290215 0.0019513477  -0.02283073    4.5546232 
+   34500    20.177461    1.0237329     23.64784    6.0629833    4.5278958    1.5350875 0.0018288954 -0.022639341    4.5487063 
+   34510    19.921291   0.99768735    23.542924    6.0498108    4.5537786    1.4960322 0.0016754298 -0.021569267    4.5736724 
+   34520    20.293858    1.0010307    23.710829    6.0294005     4.528355    1.5010456 0.0014262544 -0.020036162    4.5469649 
+   34530    20.375633    1.0162683    23.719033     6.060805    4.5369107    1.5238943 0.0014733803 -0.019664357    4.5551017 
+   34540    20.097745    1.0135407    23.761457    6.0790486    4.5592444    1.5198042 0.0016622048 -0.020253942    4.5778361 
+   34550    20.082597     1.016951    23.710599    6.0707365    4.5458184    1.5249181 0.0017488356 -0.020731403     4.564801 
+   34560    20.154186    1.0269518    23.929091    6.0756014    4.5356871    1.5399143   0.00182853 -0.020973304    4.5548318 
+   34570    20.008518    1.0255854    24.094079    6.0621996    4.5243344    1.5378653 0.0016090879 -0.020358706     4.543084 
+   34580    20.165947    1.0107661    23.721163    6.0650792    4.5494355    1.5156437 0.0014866968 -0.020255914    4.5682047 
+   34590    19.927461    1.0370005    23.809974    6.0683759    4.5133937    1.5549822 0.0016239478 -0.020645811    4.5324155 
+   34600    20.459555    1.0247584    23.395203    6.0771803    4.5405552    1.5366252 0.0017164446 -0.021181323      4.56002 
+   34610    20.219195     1.024696    23.720084    6.0521265    4.5155948    1.5365317 0.0017969147 -0.021768532    4.5355664 
+   34620    20.112656   0.99456529    23.678074    6.0200959    4.5287452    1.4913507 0.0017148782 -0.021256587    4.5482869 
+   34630    20.173908    1.0100315     23.70695     6.042649    4.5281067    1.5145423 0.0015045528 -0.019748347    4.5463505 
+   34640    20.055738    1.0226221    24.021523    6.0473153    4.5138935    1.5334219 0.0015456893 -0.020046913    4.5323947 
+   34650    20.469477   0.98411167     23.59605    6.0139487    4.5382732    1.4756754 0.0016151098 -0.020087585    4.5567457 
+   34660    20.321508   0.99901309    24.006371     6.022898    4.5248778    1.4980201 0.0017878946 -0.020461144    4.5435511 
+   34670    20.530239    1.0085173    23.830899    6.0271831    4.5149113    1.5122718 0.0018811812 -0.020690665    4.5337208 
+   34680    20.403673    1.0023744    24.101946    6.0367908    4.5337304    1.5030604 0.0018693069 -0.020715152    4.5525762 
+   34690    20.297947   0.98820029    23.493911    6.0336206    4.5518143    1.4818063 0.0016568747  -0.01982368    4.5699811 
+   34700    20.208297   0.99688318    23.881459    6.0090963      4.51427    1.4948263 0.0015443431 -0.019309978    4.5320356 
+   34710    19.846292   0.98938529    23.497304    6.0248175    4.5412343    1.4835832 0.0015260513 -0.018973976    4.5586822 
+   34720    19.955125   0.97734611     23.41333    6.0049183    4.5393878    1.4655305 0.0016264893 -0.019700252    4.5574616 
+   34730    20.024058   0.97993495    23.431504    5.9896556    4.5202431    1.4694125 0.0014938732 -0.019403008    4.5381523 
+   34740    20.308184    0.9955141    23.695345    6.0325542    4.5397808    1.4927734 0.0015877856 -0.019525905    4.5577189 
+   34750    20.455201    1.0151684    23.611925    6.0423016    4.5200566     1.522245 0.0016682168 -0.019998006    4.5383864 
+   34760    20.373967    0.9975406    23.687317    6.0267834    4.5309713    1.4958121 0.0016878307 -0.020098157    4.5493816 
+   34770    20.472083    1.0109374    23.617639    6.0402603    4.5243597    1.5159006 0.0017952763 -0.020460093    4.5430245 
+   34780     20.41914    1.0139556    23.930662    6.0480413    4.5276149    1.5204264 0.0016035451 -0.019284134    4.5452955 
+   34790    20.360135    1.0091172    23.594762    6.0358448    4.5226736    1.5131712 0.0013856415 -0.018300911    4.5395889 
+   34800    20.310393    1.0066565    24.100608    6.0540577    4.5445764    1.5094814 0.0015613865 -0.019777084     4.562792 
+   34810    20.215376     1.022001    23.597981    6.0707279    4.5382374    1.5324905 0.0016791798 -0.020735604    4.5572938 
+   34820    20.040924    1.0186592    23.720562    6.0558168    4.5283373    1.5274795 0.0017887016 -0.021718429     4.548267 
+   34830    20.182564    0.9946753    23.987263     6.031678    4.5401624    1.4915156 0.0020964672 -0.023606393    4.5616723 
+   34840    20.235349     1.014211    23.568028    6.0722429    4.5514335    1.5208093 0.0022086493 -0.024268155     4.573493 
+   34850    20.271125    1.0171283    23.598968    6.0610791    4.5358953    1.5251838 0.0021538967 -0.024146094    4.5578875 
+   34860    19.835075    1.0146037    23.569004    6.0490479    4.5276497    1.5213982 0.0020858431 -0.024113948    4.5496778 
+   34870    20.285888    1.0205692    23.584164    6.0514575     4.521114    1.5303435 0.0019154638 -0.023424829    4.5426234 
+   34880    20.162852    1.0150837    24.070676    6.0516511    4.5295331     1.522118 0.0018501225 -0.022992568    4.5506755 
+   34890    20.199889    1.0122188    23.621065    6.0293642    4.5115421    1.5178222 0.0016183648 -0.022037166    4.5319609 
+   34900    20.234858    1.0163557    23.632855    6.0429674     4.518942    1.5240254 0.0015021856  -0.02103388    4.5384737 
+   34910    20.175951    1.0137788    24.007134    6.0691543     4.548993    1.5201613 0.0014536196 -0.020884509    4.5684239 
+   34920    20.282825    1.0322261    23.805394    6.0679738    4.5201507    1.5478231 0.0015880767  -0.02138643    4.5399491 
+   34930    20.421005    1.0023791    23.865292     6.055099    4.5520316    1.5030674 0.0017171945 -0.021914626     4.572229 
+   34940    20.008221    1.0228815    23.817417    6.0730355    4.5392247    1.5338108 0.0016789057 -0.021702244     4.559248 
+   34950    20.339979    1.0187547    23.435547    6.0532559    4.5256333    1.5276227 0.0016504774 -0.021971172     4.545954 
+   34960    20.273263    1.0053993    23.779591    6.0302828    4.5226865    1.5075963 0.0017403117 -0.022341311    4.5432875 
+   34970    20.093064   0.98482611    23.831185    6.0201213    4.5433745    1.4767468 0.0018017393 -0.022376113    4.5639489 
+   34980    19.991227   0.97891088    23.560123    6.0167867    4.5489098    1.4678769  0.001678549 -0.021688223    4.5689195 
+   34990    20.020421    1.0097625    23.633893     6.047011    4.5328721    1.5141388 0.0017096399 -0.021861351    4.5530238 
+   35000    20.322588    1.0110035    23.730344    6.0550917    4.5390919    1.5159998 0.0015436821 -0.020662613    4.5582109 
+   35010    20.462232    1.0025255     23.70027    6.0306017    4.5273148     1.503287 0.0014895057 -0.020066312    4.5458916 
+   35020    20.395876    1.0073221    23.486276    6.0528134    4.5423338    1.5104796 0.0015366863 -0.020235882     4.561033 
+   35030    20.246972    1.0140219     23.56394    6.0479282    4.5274023    1.5205259 0.0015414287 -0.020391699    4.5462526 
+   35040    20.104842   0.97567254    23.679189    6.0101273    4.5471063     1.463021 0.0016353577 -0.021314826    4.5667858 
+   35050    19.863195   0.98267339    23.579658    6.0128177    4.5392989    1.4735188 0.0018028442 -0.021684384    4.5591805 
+   35060    20.216428    0.9951752    23.507377    6.0169449    4.5246797    1.4922652 0.0019056392 -0.021946731    4.5447207 
+   35070    20.309217    1.0040915    23.600919    6.0382961    4.5326609    1.5056353 0.0019022991 -0.022357969    4.5531166 
+   35080    20.032999    1.0146236     23.68171    6.0535092    4.5320811     1.521428 0.0017958853 -0.022208863    4.5524941 
+   35090    20.100992   0.99642024    24.117433    6.0552886    4.5611564    1.4941321 0.0016804148 -0.021448209    4.5809242 
+   35100    20.332979    1.0104718    23.597412    6.0515157    4.5363133    1.5152024 0.0016099534 -0.020548911    4.5552522 
+   35110    20.446723    1.0013156    23.613183    6.0500173    4.5485445    1.5014728 0.0016659596 -0.020602887    4.5674815 
+   35120    20.323617    1.0356207    23.751412    6.0844675    4.5315543    1.5529132 0.0019313927 -0.021524145    4.5511471 
+   35130    20.221278    1.0347877    23.925171    6.0733911     4.521727    1.5516642 0.0021131344  -0.02253459    4.5421484 
+   35140    20.511904    1.0227563    23.774938    6.0940792    4.5604562     1.533623 0.0022439515 -0.023466448    4.5816787 
+   35150     20.45514    1.0322644    23.937579    6.1008425     4.552962    1.5478804 0.0021392942 -0.022832582    4.5736553 
+   35160    20.325623    1.0397986    23.638282    6.0806098    4.5214319    1.5591779 0.0020036027 -0.022726657    4.5421549 
+   35170    20.054289    1.0213059    23.406379    6.0516926    4.5202444    1.5314482 0.0019452718 -0.022266093    4.5405652 
+   35180    20.289022    0.9920729    23.669222    6.0268733      4.53926    1.4876133  0.001834462 -0.021687675    4.5591132 
+   35190    20.408007   0.99276653    23.634572      6.02746    4.5388065    1.4886534 0.0017148422 -0.021539195    4.5586309 
+   35200    20.336021   0.99501895    23.724683    6.0397459     4.547715    1.4920309 0.0016858694 -0.021494591    4.5675237 
+   35210    20.384827    1.0194641    23.796668    6.0500673    4.5213809    1.5286864  0.001597753 -0.020953007    4.5407362 
+   35220     19.76394    1.0171942    23.581663    6.0694069    4.5441242    1.5252827 0.0016323958 -0.020926389    4.5634182 
+   35230    20.288304    1.0139625    23.645401    6.0548249    4.5343881    1.5204368  0.001654929 -0.021232405    4.5539656 
+   35240    20.077994   0.99893704    23.842525    6.0423674    4.5444613    1.4979061 0.0016549366 -0.020987685     4.563794 
+   35250     20.23983    1.0069415    23.706901    6.0385637     4.528655    1.5099088 0.0015676419 -0.020689205    4.5477765 
+   35260     20.10064    1.0153019    23.835651    6.0715103    4.5490651    1.5224453 0.0015474458  -0.02045942     4.567977 
+   35270    20.092232    1.0141188     23.74533    6.0371303    4.5164591    1.5206712 0.0013373371  -0.01953727     4.534659 
+   35280    20.467232    1.0007237    23.511801    6.0456717    4.5450865    1.5005852 0.0011774119 -0.018985007    4.5628941 
+   35290    20.320369    1.0112701    23.613406    6.0597861    4.5433865    1.5163996 0.0012813143 -0.019570999    4.5616762 
+   35300    20.058155    1.0005153    23.577636    6.0475809    4.5473082    1.5002726 0.0014762521 -0.020399529    4.5662315 
+   35310    20.387638      1.00616    23.770482    6.0215388    4.5128019    1.5087369 0.0018507874 -0.022111706    4.5330628 
+   35320    19.928297   0.99074679    23.610863    6.0274915    4.5418667    1.4856248 0.0020282969 -0.023150077    4.5629885 
+   35330    20.160319   0.99511841    23.615556    6.0107221    4.5185421    1.4921801 0.0019648782 -0.022942698    4.5395199 
+   35340     20.18348     1.001967    23.764374    6.0170764    4.5146269    1.5024495 0.0017916829 -0.022174432    4.5350096 
+   35350    20.385982   0.99248369    23.728324    6.0226567    4.5344274    1.4882293 0.0016591248 -0.021423466    4.5541917 
+   35360    20.360198   0.97777467    23.673428    6.0021866    4.5360135    1.4661731 0.0016370472 -0.021195744    4.5555722 
+   35370    20.462317    1.0066854    23.864117    6.0316657    4.5221409    1.5095248 0.0016554522 -0.021223635    4.5417091 
+   35380    20.049707    1.0049162    23.626528    6.0435981    4.5367262    1.5068719 0.0016465886 -0.021304589    4.5563842 
+   35390    20.230159    1.0261467    23.760466    6.0853469    4.5466399    1.5387069 0.0017983574 -0.022446604    4.5672882 
+   35400    20.111483    1.0370093     23.39395    6.0639554    4.5089599    1.5549955 0.0018308539 -0.022835312    4.5299644 
+   35410    20.407823   0.98948005    23.681035    6.0264633     4.542738    1.4837253 0.0018242715  -0.02269055    4.5636042 
+   35420     20.41638    1.0190123    23.535615    6.0637157    4.5357069    1.5280089 0.0018577533 -0.022972958    4.5568221 
+   35430    20.213142     1.024834    23.643796    6.0694973    4.5327587    1.5367386 0.0016717212 -0.022098952    4.5531859 
+   35440    20.180967    1.0185795    23.841486    6.0500205    4.5226607    1.5273599 0.0015641769 -0.021295004    4.5423915 
+   35450    20.204468    1.0113983    23.562349    6.0625058    4.5459141    1.5165917  0.001628618 -0.021348122    4.5656336 
+   35460    19.994134    1.0123861    23.918339    6.0617532    4.5436802     1.518073 0.0015744052 -0.020975302    4.5630811 
+   35470    19.972681    1.0229153    23.784688     6.066567    4.5327055    1.5338615 0.0015950712 -0.021090298    4.5522008 
+   35480    20.118737    1.0117574    23.496303    6.0526588    4.5355286    1.5171303  0.001523379 -0.020656195    4.5546614 
+   35490    20.150402    1.0185887    23.503949    6.0556909    4.5283172    1.5273737 0.0013907013 -0.020211405    4.5471379 
+   35500    20.099256    1.0022488    23.878593    6.0460199    4.5431479     1.502872 0.0014167056 -0.020004167    4.5617353 
+   35510    20.215864    1.0246517    23.650646    6.0587629    4.5222976    1.5364652 0.0015744235 -0.020814133    4.5415374 
+   35520    20.194208    1.0079578     23.48551    6.0701676    4.5587349    1.5114327 0.0016871368  -0.02169118     4.578739 
+   35530    20.021836    1.0028568    23.402125    6.0478145    4.5440308    1.5037838 0.0017026102 -0.022063389    4.5643915 
+   35540    20.270652    1.0197535    23.695357    6.0503043    4.5211839    1.5291204 0.0016571497 -0.021922335    4.5414491 
+   35550     20.30126    1.0157749    23.837215    6.0550709    4.5319165    1.5231544 0.0015806806 -0.021634423    4.5519702 
+   35560    20.155354    1.0304209    23.919695    6.0649918    4.5198757    1.5451161 0.0018676075 -0.022647666    4.5406558 
+   35570    20.125084   0.99572021    23.530837    6.0393355    4.5462531    1.4930825 0.0020227078 -0.023442461    4.5676728 
+   35580    19.971791    1.0161009    23.742544    6.0339665    4.5103231    1.5236434  0.001800866  -0.02225469    4.5307769 
+   35590    20.097322   0.99085691    23.643675    6.0267342    4.5409443    1.4857899 0.0017337548 -0.021885815    4.5610963 
+   35600    19.938481    1.0024806    23.822212    6.0327584    4.5295388    1.5032196 0.0017564473 -0.021731844    4.5495142 
+   35610    19.978709    1.0034123    23.532504    6.0297346    4.5251178    1.5046167 0.0017729235 -0.021821901    4.5451668 
+   35620    20.113887     1.001327    23.661831    6.0482468     4.546757    1.5014898 0.0015545997 -0.021049032    4.5662515 
+   35630    20.129477     1.017913    23.681821    6.0738915    4.5475309    1.5263606 0.0015055509 -0.021016651     4.567042 
+   35640    20.399357    1.0128652    24.019792      6.08108    4.5622886    1.5187914 0.0013233529 -0.020259564    4.5812248 
+   35650    20.235191    1.0201347    23.795908    6.0820428    4.5523508     1.529692 0.0010921448  -0.01904107    4.5702997 
+   35660    20.156725    1.0189111    23.680499    6.1010249    4.5731677    1.5278572 0.0011530358 -0.019383537    4.5913982 
+   35670    20.085006    1.0263286    23.960467    6.0836433    4.5446635    1.5389798 0.0012607675 -0.020150297     4.563553 
+   35680    20.159068    1.0270937    23.700564    6.0792469    4.5391198    1.5401271 0.0014889234 -0.021680964    4.5593119 
+   35690    20.330615    1.0276956    23.864141    6.0626063    4.5215768    1.5410295 0.0015458742 -0.021509102      4.54154 
+   35700    19.985436    1.0066706    24.044451    6.0327786    4.5232761    1.5095025 0.0014423274 -0.020713277     4.542547 
+   35710    20.133305    1.0013734    23.802056    6.0408079    4.5392485    1.5015595 0.0013030819 -0.020058461    4.5580038 
+   35720    19.993001   0.98284294    23.825826    6.0340089    4.5602359     1.473773 0.0012066869 -0.019429902    4.5784591 
+   35730    20.364427   0.99685609    23.574278    6.0108548    4.5160691    1.4947857 0.00091658822 -0.017965446     4.533118 
+   35740    20.155258    0.9891496    23.840184    6.0267768     4.543547    1.4832298 0.0009011152 -0.017824683    4.5604706 
+   35750    19.952968    1.0172266    23.888751    6.0546504     4.529319    1.5253314 0.00077562114 -0.017137416    4.5456808 
+   35760    20.409418    1.0198219     23.87033    6.0343993    4.5051764     1.529223 0.00089692036 -0.017186117    4.5214656 
+   35770    20.289612    1.0060842    23.663851    6.0378402    4.5292169    1.5086233 0.00098434261 -0.017453581    4.5456862 
+   35780    19.959423    1.0133885    23.848552    6.0544564    4.5348804     1.519576 0.0010641327 -0.017816707     4.551633 
+   35790    19.748099     1.018126    23.512555    6.0488688    4.5221889    1.5266799 0.0011662786 -0.018798909    4.5398215 
+   35800    20.136726    1.0093315    23.696436    6.0483498    4.5348572    1.5134926 0.0012073406  -0.01889282    4.5525426 
+   35810    20.031048    1.0008632    23.795193    6.0424129    4.5416186    1.5007943 0.0011378953 -0.018675175    4.5591558 
+   35820    20.284387    1.0348581    23.949755    6.0844358    4.5326661    1.5517698 0.0010639351 -0.018329475    4.5499316 
+   35830    20.154261    1.0094317    23.611454    6.0804023    4.5667595    1.5136428 0.0013212865 -0.019327718    4.5847659 
+   35840    20.141385    1.0234418    23.734829    6.0656055    4.5309545     1.534651 0.0014845107    -0.020134     4.549604 
+   35850    20.103382   0.99730925    24.159603    6.0352414    4.5397762    1.4954652 0.0016670913 -0.021518446    4.5596276 
+   35860      20.2451   0.99600253    23.706139     6.028012    4.5345062    1.4935058 0.0018226777 -0.022591737    4.5552753 
+   35870    20.241839   0.99310421    23.499466    6.0080844    4.5189247    1.4891598 0.0018463678 -0.022814261    4.5398926 
+   35880    20.284716    1.0155925    23.393185    6.0255812    4.5027003     1.522881 0.0016825879 -0.021714039    4.5227317 
+   35890    20.009678   0.98722553    23.697459    6.0188404    4.5384957    1.4803447 0.0015668271 -0.020904475    4.5578333 
+   35900    20.090796   0.99237431    23.649791    6.0156261    4.5275608    1.4880653 0.0016676069 -0.021103247    4.5469964 
+   35910    20.446467    1.0029695    23.938647    6.0060805    4.5021278    1.5039527 0.0016417136 -0.021323333    4.5218094 
+   35920    20.571634   0.99626058    23.904665    6.0121626    4.5182698    1.4938927 0.0013826728 -0.019930582    4.5368177 
+   35930    19.825684   0.98410303    23.831883    6.0103625       4.5347    1.4756625 0.0013345933 -0.019424319    4.5527897 
+   35940    20.053135   0.98990639    23.471283    6.0120104    4.5276457    1.4843646 0.0016520218 -0.020834972    4.5468287 
+   35950    20.273561    1.0015578    23.860626    6.0112345    4.5093986    1.5018359 0.0019799648 -0.022560247    4.5299789 
+   35960    20.339665     1.005572    23.701925    6.0449901     4.537135    1.5078551 0.0019379123 -0.022769113    4.5579662 
+   35970    20.286493     1.005358    23.900541    6.0531203     4.545586    1.5075343 0.0021235035 -0.023642561    4.5671051 
+   35980    20.222357    1.0223609    23.559238    6.0468427    4.5138125    1.5330301 0.0020631028 -0.023114617    4.5348641 
+   35990    20.226443    1.0151659    23.753198    6.0400178    4.5177765    1.5222413 0.0020173185 -0.023233926    4.5389931 
+   36000    20.048258    1.0206299    23.682335     6.071272    4.5408374    1.5304346 0.0019243458 -0.022616379    4.5615294 
+   36010    20.297063    1.0069718    23.834938    6.0442408    4.5342866    1.5099542 0.0017221132 -0.021560903    4.5541254 
+   36020    20.415943    1.0103913     23.75706    6.0427221    4.5276404    1.5150818 0.0016181866 -0.021043157    4.5470653 
+   36030    20.357198    1.0202614    23.639913    6.0545889     4.524707    1.5298819 0.0015075541  -0.02051377    4.5437132 
+   36040    20.098696    1.0113202    24.096927    6.0613138    4.5448392    1.5164746 0.0015261226 -0.020657932     4.563971 
+   36050    19.875451    1.0182859    23.665564    6.0681618    4.5412421    1.5269198 0.0017651953 -0.021954623    4.5614315 
+   36060    20.079536    1.0181797    23.544446    6.0501507    4.5233902    1.5267605 0.0018777038 -0.022443805    4.5439563 
+   36070    20.436406     1.007567    23.778173    6.0462666    4.5354199    1.5108468 0.0017167911 -0.021726225    4.5554293 
+   36080    20.310656    1.0083944    23.527093    6.0483424     4.536255    1.5120874 0.0016940229 -0.021500401    4.5560614 
+   36090    20.332042   0.99956887    23.563086    6.0375779    4.5387243    1.4988535 0.0016199371 -0.021642019    4.5587464 
+   36100    20.233631   0.98764779    23.988028    6.0177798    4.5368019    1.4809779  0.001854227 -0.023196257     4.558144 
+   36110    20.182079   0.99240162    23.812829    6.0251532     4.537047    1.4881062 0.0016836342 -0.022785999    4.5581494 
+   36120    19.863688   0.99313181    23.611071     6.025995    4.5367939    1.4892011 0.0014914518 -0.021814687    4.5571171 
+   36130     20.29601    1.0155054    23.822995      6.04267    4.5199197    1.5227503 0.0013275896 -0.021110071    4.5397022 
+   36140    20.070456    1.0223062    23.797739    6.0648121     4.531864    1.5329481 0.0011666606 -0.020220657     4.550918 
+   36150    20.103083   0.98387939    23.771044    6.0303382     4.555011    1.4753271 0.0011492913 -0.019847642    4.5737094 
+   36160    20.117894    1.0263905    23.882101    6.0507358    4.5116633    1.5390725 0.00098759445 -0.019095854    4.5297716 
+   36170    20.000878   0.98822475    23.819552    6.0186202    4.5367772     1.481843 0.0011773684 -0.019763125     4.555363 
+   36180    20.036279    1.0081004    23.653032    6.0484578    4.5368113    1.5116465 0.0014266712 -0.021123245    4.5565078 
+   36190    20.255798   0.99740173    23.776392    6.0357363    4.5401324    1.4956039 0.0014279191 -0.021191504     4.559896 
+   36200    20.104903    1.0171667    23.844132    6.0476167    4.5223752    1.5252415 0.0015432953 -0.021604196    4.5424361 
+   36210    20.369214   0.99919499    23.577164    6.0257815    4.5274886    1.4982929 0.0015939661 -0.022127373     4.548022 
+   36220      20.4308    1.0084943    23.954192    6.0674233    4.5551861    1.5122373 0.0016509897 -0.022296894     4.575832 
+   36230    20.230524    1.0100726    23.709445    6.0583193    4.5437155    1.5146038 0.0018076397 -0.022914643    4.5648225 
+   36240    20.226711     1.030956    23.820782    6.0737835    4.5278649    1.5459186 0.0017096853 -0.022048815    4.5482041 
+   36250    20.174904    1.0323481    23.901786    6.0977682    4.5497621     1.548006 0.0017097093 -0.021515919    4.5695683 
+   36260    20.093875    1.0434111    23.572348    6.1119163    4.5473214    1.5645949   0.00164249 -0.021143026    4.5668219 
+   36270    19.889869     1.037676    23.666623    6.0964852      4.54049    1.5559951 0.0013752334  -0.01970542    4.5588202 
+   36280    20.251585    1.0211029    23.740683    6.0609107     4.529767    1.5311437 0.0013513838 -0.019472962    4.5478886 
+   36290    20.216001    1.0020357    23.784232    6.0507418    4.5481893    1.5025525 0.0014857773 -0.020361783    4.5670653 
+   36300    20.298571    1.0088488    23.761534    6.0606188      4.54785    1.5127688 0.0014558046 -0.020097265    4.5664915 
+   36310    20.059461    1.0100033    23.675649    6.0614744    4.5469745    1.5144999 0.0014845042 -0.020383969     4.565874 
+   36320    20.040639    1.0272927    24.078346    6.0719607    4.5315354    1.5404254 0.0016371971   -0.0214892    4.5513874 
+   36330    19.821052    1.0153658    24.101488    6.0727808    4.5502398     1.522541 0.0017967751 -0.022315566    4.5707586 
+   36340    20.387645    1.0331842    23.896117    6.0773728    4.5281131    1.5492597 0.0019194117 -0.022634706    4.5488284 
+   36350    20.165225    1.0160265    23.861422    6.0777042    4.5541725    1.5235317 0.0019831684 -0.023046492    4.5752358 
+   36360    20.046548    1.0279101    23.918957    6.0848857    4.5435344    1.5413513 0.0021568265   -0.0238496    4.5652272 
+   36370    19.782582    1.0283968    23.768654        6.088     4.545919     1.542081 0.0022464898 -0.024381229    4.5680538 
+   36380    20.136938    1.0238889    23.633537    6.0674645     4.532143    1.5353215 0.0023257065 -0.024849341    4.5546666 
+   36390    19.901922    1.0143692    23.786248    6.0514297    4.5303831    1.5210466 0.0022821915 -0.024837717    4.5529386 
+   36400    20.064988   0.99955441    23.603915    6.0299883    4.5311565    1.4988318 0.0022210836 -0.024445233    4.5533806 
+   36410    20.008929    1.0023966     23.76706    6.0450995    4.5420058    1.5030936 0.0021346398 -0.024004914    4.5638761 
+   36420     20.44126    1.0094758    23.647642    6.0485432    4.5348343    1.5137089 0.0022095753 -0.024221743    4.5568465 
+   36430    20.183546    1.0075779    23.710239    6.0387505    4.5278875     1.510863 0.0021664476  -0.02389445    4.5496155 
+   36440    19.931366    1.0195642    23.712716    6.0504348    4.5215983    1.5288365 0.0019857276 -0.023227097    4.5428397 
+   36450    20.105265    1.0082038    23.670229    6.0179009    4.5060993    1.5118016 0.0019740713 -0.023202032    4.5273272 
+   36460    20.459845    1.0075357    23.893384     6.039082    4.5282822    1.5107998 0.0019948593 -0.023315094    4.5496024 
+   36470    20.267893    1.0100523    23.798834    6.0527021    4.5381288    1.5145734 0.0018496297 -0.022610806    4.5588899 
+   36480    20.044127    1.0184551    23.685278    6.0581919    4.5310185    1.5271734   0.00191895  -0.02270476    4.5518043 
+   36490    20.295931    1.0059365    23.687039    6.0659589    4.5575572    1.5084018 0.0021095967 -0.023557707    4.5790053 
+   36500    20.191053    1.0079963    23.876248    6.0627826    4.5512921    1.5114905 0.0019803302   -0.0229556    4.5722674 
+   36510    20.163115    1.0231127    23.820039    6.0819608    4.5478034    1.5341575 0.0018923499 -0.022364839    4.5682759 
+   36520    20.121318    1.0042629    23.683633    6.0429507    4.5370584    1.5058923 0.0018292899  -0.02194847    4.5571776 
+   36530    20.388096    1.0085012    24.010051    6.0645671    4.5523195    1.5122476 0.0017891993 -0.022131945    4.5726623 
+   36540     20.36248    1.0281202    23.680776     6.090753    4.5490868    1.5416663 0.0018220262 -0.022457062    4.5697218 
+   36550     20.20742    1.0178299    23.774915    6.0801154    4.5538795    1.5262359 0.0016995061 -0.022180581    4.5743606 
+   36560    20.432968    1.0305902    23.649858    6.0731182    4.5277482      1.54537 0.0017838098 -0.022640466    4.5486048 
+   36570    20.243714    1.0103138    23.866481    6.0659124    4.5509468    1.5149656 0.0019206267 -0.023371381    4.5723975 
+   36580    19.906228    1.0057221    23.897136    6.0683538    4.5602734    1.5080803  0.001875291 -0.023063428    4.5814616 
+   36590     20.45648    1.0311903     23.54403    6.0860022    4.5397324    1.5462698 0.0016751243 -0.021723068    4.5597803 
+   36600    20.257547    1.0118673    23.445506    6.0434432    4.5261482     1.517295 0.0016452129 -0.021921773    4.5464247 
+   36610    20.254336    1.0053348    23.940805    6.0431413    4.5356418    1.5074995 0.0018509013 -0.022630083     4.556421 
+   36620    20.458285    1.0005594    23.648846    6.0307376    4.5303988    1.5003388 0.0017230949 -0.022166523    4.5508422 
+   36630     20.38506   0.99542657    23.723383    6.0227209    4.5300788    1.4926421 0.0015561529 -0.021610749    4.5501334 
+   36640    20.458911    1.0125072    23.605286     6.026072    4.5078175    1.5182545 0.0015943828  -0.02178114    4.5280043 
+   36650    20.371113   0.99901135    23.777588    6.0393669    4.5413494    1.4980175 0.0016612449 -0.021954354    4.5616425 
+   36660    20.110481   0.99258142    23.786235    6.0340509     4.545675    1.4883758 0.0017102873 -0.022278718    4.5662435 
+   36670    20.458054    1.0292048    23.768404     6.055186    4.5118934    1.5432926 0.0018531543 -0.022584577    4.5326248 
+   36680     20.15878    1.0081769    23.909362    6.0454588    4.5336976    1.5117612 0.0019389247 -0.022706993    4.5544656 
+   36690    20.245263   0.99449712    23.501457    6.0509774     4.559729    1.4912484 0.0018867114 -0.022511363    4.5803536 
+   36700    20.397783    1.0168429    23.818535    6.0552381    4.5304821     1.524756 0.0018781453 -0.022167884    4.5507718 
+   36710    20.216077     1.012153     23.41194    6.0399039    4.5221805    1.5177234 0.0018089132 -0.022220027    4.5425917 
+   36720    20.275787    0.9975629     23.67236    6.0203086    4.5244631    1.4958456 0.0017935932 -0.022396616    4.5450661 
+   36730    20.148163   0.98464289    23.592022    6.0136171    4.5371451     1.476472 0.0016880811 -0.022055029     4.557512 
+   36740    20.222397    1.0154237    23.943185    6.0386096    4.5159818    1.5226278  0.001669769 -0.021714239    4.5360263 
+   36750    20.173932    1.0097326    23.611757    6.0408039    4.5267099     1.514094 0.0016595564 -0.021495915    4.5465463 
+   36760     20.20019    1.0112436    23.486969    6.0324316    4.5160719    1.5163597  0.001643066 -0.021252576    4.5356814 
+   36770    20.372985    1.0109275    23.953288    6.0451674    4.5292815    1.5158859 0.0016698051  -0.02141583    4.5490275 
+   36780    19.683149     1.023722    23.768781    6.0385403    4.5034692    1.5350711 0.0016994414 -0.021719862    4.5234897 
+   36790    19.928149    1.0118157    23.899408    6.0455193    4.5283016    1.5172176 0.0017068768 -0.021966383    4.5485611 
+   36800    20.201174    1.0168876    23.727401    6.0486911    4.5238682    1.5248229 0.0017484156 -0.022210628    4.5443304 
+   36810    20.099748    1.0130346    23.730282    6.0637108    4.5446653    1.5190454 0.0016352123 -0.021866956    4.5648971 
+   36820    20.287249    1.0142339    23.853078    6.0583164    4.5374726    1.5208437 0.0016641149 -0.022465196    4.5582737 
+   36830    20.315544    1.0380975    24.010471    6.0718227    4.5151955    1.5566272 0.0016013909 -0.022101465    4.5356956 
+   36840     20.19976    1.0228642    23.735286    6.0748067    4.5410218    1.5337849 0.0015913804 -0.021649672    4.5610801 
+   36850    20.307039    1.0304926    23.702933    6.0851337      4.53991    1.5452237  0.001489802 -0.020695273    4.5591154 
+   36860    20.030327    1.0274542    23.867567    6.0930573    4.5523898    1.5406675 0.0015119391 -0.021155432    4.5720333 
+   36870    20.152618    1.0265811    23.914898    6.0880096    4.5486513    1.5393584 0.0015705798 -0.021110082    4.5681908 
+   36880    20.563592    1.0121813    23.564881    6.0696909     4.551925    1.5177659 0.0016887997 -0.021760954    4.5719971 
+   36890    20.172023    1.0266965    23.999074    6.0693124    4.5297811    1.5395313 0.0017038613 -0.022020938    4.5500982 
+   36900     20.16835    1.0139681    23.740783    6.0478295    4.5273842    1.5204452 0.0017178763 -0.021900909    4.5475673 
+   36910    20.158242    1.0261621    23.649415    6.0646889    4.5259587    1.5387301 0.0018338013 -0.022285822    4.5464107 
+   36920    20.278409    1.0088995    23.729437    6.0451139    4.5322691    1.5128448 0.0017778163 -0.021925362    4.5524166 
+   36930    20.105932    1.0253936     23.64781    6.0537252    4.5161475    1.5375776 0.0018681888 -0.022522678     4.536802 
+   36940    20.028776    1.0307482    23.833201     6.076103    4.5304961    1.5456069 0.0018622623 -0.022315323    4.5509492 
+   36950    19.969715    1.0279704     23.75467    6.0723032    4.5308616    1.5414416 0.0017809848 -0.022133667    4.5512143 
+   36960     20.22673     1.024546    23.762767    6.0568437    4.5205371    1.5363067 0.0017592302 -0.022234905    4.5410127 
+   36970    20.409274     1.002269    23.773984    6.0304924      4.52759    1.5029024 0.0018396795 -0.022694516    4.5484448 
+   36980     20.38491    1.0240122    23.359589    6.0490828    4.5135765    1.5355063 0.0019586525 -0.023286161     4.534904 
+   36990    20.377522    1.0193741    23.735888     6.073406    4.5448545    1.5285515 0.0020294647 -0.023560236    4.5663853 
+   37000    20.284909    1.0343618    24.055623    6.0901094    4.5390838    1.5510256 0.0021010848 -0.023966159    4.5609489 
+   37010    20.301436    1.0347293    23.450527    6.0771247    4.5255481    1.5515766 0.0022380576 -0.024375398    4.5476854 
+   37020    20.163805    1.0241037    23.653453    6.0654346    4.5297911    1.5356435 0.0021898224 -0.023970031    4.5515713 
+   37030    20.467971    1.0165994    23.783422    6.0472858     4.522895    1.5243908 0.0019975824 -0.023199132    4.5440965 
+   37040    20.385639    1.0130134    23.564949    6.0270507     4.508037    1.5190136 0.0019947676 -0.023411925    4.5294542 
+   37050    20.305547    0.9907677    23.645578    6.0142252     4.528569    1.4856562 0.0019989434 -0.023415666    4.5499857 
+   37060    20.129671   0.98959741    23.493025    6.0349512    4.5510498    1.4839013 0.0020186386 -0.023459229    4.5724904 
+   37070    20.446686    1.0080328    23.775057    6.0213021    4.5097569    1.5115452 0.0019725611 -0.023007165    4.5307915 
+   37080    20.496847     1.008111    23.819798      6.02521    4.5135476    1.5116624 0.0016271194 -0.021710557     4.533631 
+   37090    20.411051   0.98461605    23.726039    5.9960595    4.5196278    1.4764318 0.0016734751 -0.022043895    4.5399982 
+   37100    20.176109   0.98271309    23.445336    5.9754678    4.5018895    1.4735783 0.0017897815 -0.022263466    4.5223632 
+   37110     20.46222     1.000097    23.643638    6.0145562    4.5149108    1.4996454 0.0017568801 -0.022084491    4.5352384 
+   37120    20.252801    1.0052507    23.676928     6.029294    4.5219205    1.5073735 0.0018856894 -0.022869014    4.5429038 
+   37130    20.303883   0.98758887    23.617044    6.0238506    4.5429611    1.4808895 0.0018890516 -0.022931649    4.5640037 
+   37140    20.446665    1.0125019    23.985973    6.0351884    4.5169417    1.5182467 0.0019530988 -0.023004186    4.5379928 
+   37150    20.289956   0.99811987      23.9581    6.0293952    4.5327145    1.4966807 0.0016376721 -0.021887433    4.5529642 
+   37160    20.408824   0.99770726    23.612251    6.0301681    4.5341061     1.496062 0.0017529872 -0.022482317    4.5548354 
+   37170    20.300972    1.0108576    23.745647    6.0249487    4.5091678    1.5157809  0.001724534 -0.022226589    4.5296699 
+   37180    19.881114    1.0063926     23.50157    6.0166654    4.5075798    1.5090856 0.0017490436 -0.021576877    4.5274076 
+   37190    19.994683    1.0040269    23.954675    6.0300368    4.5244984    1.5055384 0.0016554239 -0.020474989     4.543318 
+   37200    19.962162    1.0048695    23.411219    6.0260964    4.5192946    1.5068018 0.0016884819  -0.02034905    4.5379552 
+   37210    20.267209    1.0084193    23.501663    6.0494474    4.5373226    1.5121248 0.0018810885 -0.021387105    4.5568286 
+   37220    20.338822    1.0015088    23.657161     6.024992    4.5232295    1.5017625 0.0019020976 -0.021733944    4.5430613 
+   37230    20.218732     1.011799    23.797534    6.0239672    4.5067747    1.5171926  0.001962549 -0.022148606    4.5269607 
+   37240    20.438237    1.0200843    23.580681    6.0588579    4.5292415    1.5296165 0.0019721745  -0.02219468     4.549464 
+   37250    20.492501    1.0115189    23.818088    6.0547864    4.5380138    1.5167726 0.0019839541 -0.022487275    4.5585171 
+   37260    20.301346    1.0106008    23.718894    6.0277423    4.5123464     1.515396 0.0020226607 -0.022683708    4.5330074 
+   37270    20.250545    0.9945112     23.65157    5.9905104    4.4992409    1.4912695 0.0021035869 -0.023530215    4.5206675 
+   37280    20.211838    0.9978033    23.820474    5.9983799    4.5021738    1.4962061 0.0021464185 -0.024036352    4.5240638 
+   37290    20.138926   0.97692659    23.413301    5.9778839    4.5129825    1.4649014 0.0021172354 -0.023870443    4.5347357 
+   37300    19.932755   0.96396761    23.626546    5.9602657    4.5147963    1.4454694 0.0019583558  -0.02308885    4.5359268 
+   37310    20.221309   0.96813865    23.605596    5.9750803    4.5233564    1.4517239 0.0017771813 -0.022050982    4.5436302 
+   37320    20.509163     1.003508    23.662983    5.9928508    4.4880906    1.5047602  0.001602155 -0.020943093    4.5074315 
+   37330    20.326413   0.99306171    23.770062    6.0305066    4.5414106     1.489096 0.0014780837 -0.020125644    4.5600582 
+   37340    20.286606     1.007678    23.683125    6.0213768    4.5103637    1.5110131 0.0014274153 -0.020214634    4.5291509 
+   37350    20.355744    1.0195049    23.768042    6.0453221    4.5165744    1.5287477  0.001500992 -0.020309985    4.5353834 
+   37360    20.249947    1.0157562    23.558841    6.0677338    4.5446074    1.5231264 0.0017023138 -0.021615677    4.5645207 
+   37370     20.07044    1.0132714    23.592189     6.084056    4.5646554    1.5194005 0.0017890283  -0.02225156     4.585118 
+   37380    20.040501     1.029886    24.012985    6.0598016    4.5154875    1.5443141 0.0018573397 -0.022320923    4.5359511 
+   37390    20.388737    1.0178021    23.839003    6.0629253    4.5367311    1.5261942 0.0016809949 -0.021627402    4.5566775 
+   37400    20.362637    1.0127503    23.730255    6.0532089    4.5345897    1.5186191 0.0015405861   -0.0208273    4.5538764 
+   37410      20.3971    1.0393546    23.884517    6.0718519    4.5133397    1.5585122 0.0015377225 -0.020987471    4.5327894 
+   37420    20.211647   0.99770778    23.631503    6.0388178     4.542755    1.4960628 0.0015370812 -0.020329586    4.5615475 
+   37430    20.294609    0.9818918    23.676533    6.0312558     4.558909    1.4723468 0.0015860375 -0.020957254    4.5782802 
+   37440    20.347282     1.014528    23.914234    6.0504036    4.5291189    1.5212848 0.0017140871 -0.022320749    4.5497255 
+   37450    19.978285    0.9915064    23.563703    6.0336584    4.5468946    1.4867638 0.0016086084 -0.021752806    4.5670388 
+   37460    20.144304    1.0025797    23.667105    6.0338547    4.5304864    1.5033683 0.0014943104 -0.021186584    4.5501787 
+   37470    19.864113   0.98640219     23.63898    6.0125914    4.5334813    1.4791101 0.0015827041 -0.021412999    4.5533116 
+   37480    20.077288   0.99760088    23.694063    6.0519295     4.556027    1.4959025 0.0017044294 -0.021965599    4.5762882 
+   37490    20.192413    1.0104031    23.749593    6.0541762    4.5390768    1.5150994 0.0017673018 -0.022003963    4.5593134 
+   37500     20.15985   0.99182605    23.954514    6.0205396    4.5332965    1.4872432 0.0020146526 -0.023019161     4.554301 
+   37510    20.084545    1.0007135      23.7973    6.0255543    4.5249844    1.5005698 0.0020810412 -0.023260684    4.5461641 
+   37520    20.061404     1.003146    23.787461    6.0093506    4.5051332    1.5042174 0.0019330513 -0.022598989    4.5257992 
+   37530    20.303946    1.0201207     23.74057    6.0456268    4.5159558     1.529671 0.0019022706 -0.022695765    4.5367493 
+   37540    20.037123    1.0111593     23.86141    6.0497065    4.5334731    1.5162334  0.002087532 -0.023609461    4.5549951 
+   37550    19.914318    1.0073718    23.749503    6.0459759    4.5354218     1.510554 0.0020199388 -0.023302536    4.5567044 
+   37560    20.310733   0.99249578    23.777205    6.0276436    4.5393962    1.4882474 0.0019488022 -0.022928444    4.5603759 
+   37570    20.390181   0.99747356    23.826948    6.0295793    4.5338677    1.4957116 0.0019023028 -0.022833666    4.5547991 
+   37580    20.341128    1.0162998    23.761007    6.0342303    4.5102888    1.5239415  0.001676415 -0.021930995    4.5305434 
+   37590    20.210499    1.0075536    23.695934    6.0530839    4.5422573    1.5108266 0.0015183426 -0.021295606    4.5620346 
+   37600    20.404451    1.0161348    23.642311    6.0608628    4.5371686    1.5236942 0.0014121196 -0.020698506     4.556455 
+   37610    20.374877   0.99356174    23.831868    6.0205153    4.5306694    1.4898458 0.0015364439 -0.021590135    4.5507231 
+   37620     20.16642   0.97488063    23.551204    5.9691262    4.5072927    1.4618335 0.0017098218 -0.022578297    4.5281612 
+   37630     20.14119   0.97518141    23.982755    5.9964263    4.5341418    1.4622845 0.0016814324 -0.022325973    4.5547863 
+   37640    20.356914   0.98264934    23.625882    5.9877461    4.5142634    1.4734827 0.0016803953 -0.022184712    4.5347677 
+   37650    20.338544   0.97488183    23.608365    5.9837981    4.5219628    1.4618353 0.0016086673 -0.021759128    4.5421133 
+   37660    19.938302   0.98975906     23.84562    6.0100525    4.5259088    1.4841437 0.0016488178 -0.021646717    4.5459067 
+   37670    18.898604   0.97780407    23.946852    5.9889862     4.522769    1.4662172 0.0016037506 -0.021375417    4.5425407 
+   37680    20.117843   0.99260892    23.460383    6.0234569    4.5350398    1.4884171 0.0013225438 -0.020146332    4.5538636 
+   37690    20.104436   0.98248064    23.507391    6.0221121    4.5488824    1.4732297 0.0011502218 -0.019142306    4.5668745 
+   37700    19.758185    1.0137592    23.699999    6.0447762    4.5246443     1.520132  0.001230449 -0.018867204     4.542281 
+   37710    19.928796    1.0227609    23.675507    6.0422648    4.5086349    1.5336299 0.0015221962 -0.020046276     4.527159 
+   37720    20.082721    1.0237106    23.857287    6.0642629    4.5292089     1.535054 0.0016998541 -0.021015351    4.5485244 
+   37730    20.104607   0.99560467    23.379095    6.0192496    4.5263404    1.4929092 0.0018489849 -0.021798674    4.5462901 
+   37740    19.961937     1.005711     23.68822    6.0523702    4.5443066    1.5080636 0.0019037463 -0.022133474    4.5645363 
+   37750    19.995313     1.024618    23.870619    6.0451727     4.508758    1.5364147 0.0017489995 -0.020997196    4.5280062 
+   37760    20.205209    1.0023812    23.814822    6.0347843    4.5317137    1.5030707  0.001603287 -0.019709598      4.54982 
+   37770    20.232253   0.99977074    23.558162    6.0410263    4.5418701    1.4991562 0.0015483156 -0.019574551    4.5598963 
+   37780     20.21903    1.0204164    24.053368    6.0545886    4.5244742    1.5301144 0.0016685414 -0.020238084    4.5430438 
+   37790    20.126248    1.0175835    23.877774    6.0497291    4.5238626    1.5258665 0.0016091643 -0.020271696    4.5425252 
+   37800    19.892231    1.0249588    23.850901    6.0588441    4.5219183    1.5369258 0.0016359896 -0.020728512    4.5410108 
+   37810    20.236403    1.0087728    23.723205     6.051924    4.5392693    1.5126547 0.0019040214 -0.022352751     4.559718 
+   37820     20.09762    1.0089882    23.408093    6.0294579    4.5164801    1.5129778 0.0021102499 -0.023158359    4.5375282 
+   37830    20.376913    1.0062492      23.7778    6.0371835    4.5283128    1.5088707 0.0023152275 -0.024109724    4.5501073 
+   37840    20.190568    1.0098792    24.063542     6.047888    4.5335741    1.5143139 0.0022198224 -0.023714243    4.5550685 
+   37850    19.953789    1.0174245    23.639565    6.0438545    4.5182264     1.525628 0.0017738666 -0.022018896    4.5384715 
+   37860    20.178166    1.0167287    23.733127    6.0541048    4.5295201    1.5245847   0.00171699 -0.021962071    4.5497652 
+   37870    20.047672    1.0141479    23.738955     6.063082    4.5423672    1.5207148 0.0015669202 -0.021474692    4.5622749 
+   37880    20.197046    1.0157392    23.686353    6.0788365    4.5557356    1.5231009 0.0015966971 -0.021201206    4.5753401 
+   37890     20.32792    1.0336474    23.513138    6.0823906    4.5324364    1.5499542 0.0015394406 -0.021348889    4.5522458 
+   37900    20.254565    1.0091239    23.863375    6.0767828    4.5636015    1.5131813 0.0016747064 -0.022271629    4.5841984 
+   37910    20.245845    1.0260743     23.86511    6.0733699    4.5347715    1.5385985  0.001778475 -0.023144051     4.556137 
+   37920    20.209839    1.0190706    23.763026    6.0697282    4.5416319    1.5280963 0.0020188997 -0.024038657    4.5636517 
+   37930    20.340467    1.0213096    23.447105    6.1009891    4.5695353    1.5314538 0.0021649669 -0.024262244    4.5916326 
+   37940    20.191426    1.0175526    23.517213    6.0761444    4.5503242    1.5258202 0.0021376181 -0.023961695    4.5721483 
+   37950    20.215452    1.0089218    23.523599    6.0644623     4.551584    1.5128783 0.0019603791 -0.023054744    4.5726784 
+   37960    19.879253    1.0209662    23.794117    6.0769667    4.5460279    1.5309388 0.0020733674 -0.023631753    4.5675863 
+   37970    20.044416    1.0302429    23.482448    6.0955825    4.5507332    1.5448492   0.00197264  -0.02280208    4.5715627 
+   37980    19.721647    1.0247323     23.60467    6.0985133    4.5619273     1.536586 0.0017858579 -0.022089468    4.5822309 
+   37990    20.234027    1.0362307    23.804683     6.097319    4.5434911    1.5538279 0.0017360151 -0.021676064    4.5634311 
+   38000    20.267787    1.0390808    23.655461    6.1097388    4.5516371    1.5581017 0.0017091284 -0.021655927    4.5715839 
+   38010    19.761014    1.0194554    23.840463    6.0803846    4.5517112    1.5286734 0.0015676601 -0.020495008    4.5706386 
+   38020     20.09158    1.0428141     24.05003    6.1184848    4.5547851    1.5636997 0.0015437331 -0.020845653     4.574087 
+   38030     20.46181    1.0206637    23.479999    6.0580271    4.5275419    1.5304852 0.0016891981 -0.021824644    4.5476774 
+   38040    20.120876    1.0151945    23.721014    6.0500005    4.5277164    1.5222842 0.0018050917 -0.022329144    4.5482404 
+   38050    20.474215    1.0020487    23.579298    6.0530219    4.5504499     1.502572 0.0019465686 -0.022903409    4.5714067 
+   38060    20.196422    1.0085003    24.203207    6.0580392    4.5457929    1.5122463 0.0019809306 -0.022954194    4.5667662 
+   38070    20.231061   0.99877018     23.68114    6.0308789     4.533223    1.4976559  0.001987273 -0.022911608    4.5541473 
+   38080    20.127287    1.0107261    23.713138    6.0417501    4.5261663    1.5155838 0.0020910001 -0.023563602    4.5476389 
+   38090    20.183179    0.9905981    23.865113     6.022176    4.5367741    1.4854019 0.0021639986 -0.024159743    4.5587698 
+   38100     20.08829   0.99342588     23.83197    6.0013973    4.5117552    1.4896421 0.0018557404 -0.022900828    4.5328003 
+   38110     20.05666    1.0092331    23.741147    6.0548214    4.5414763     1.513345 0.0018693192 -0.022888927    4.5624959 
+   38120    20.323845    1.0115851    23.771432      6.03342    4.5165481    1.5168719 0.0020169646 -0.023693384    4.5382246 
+   38130    20.261558    1.0022574    23.669874     6.024256     4.521371     1.502885 0.0019722583 -0.023305758    4.5427045 
+   38140     19.90384   0.99163607    23.395801    5.9841143     4.497156    1.4869583 0.0019637456 -0.023645529    4.5188378 
+   38150    20.218389   0.99871243     23.97527    6.0131597    4.5155904    1.4975693 0.0019166633  -0.02344556    4.5371193 
+   38160    20.487953    1.0163022    23.568574    6.0446572    4.5207121    1.5239452 0.0017862893 -0.022491826    4.5414176 
+   38170    20.108221    1.0234227    23.947314    6.0700011    4.5353787    1.5346224 0.0017291621 -0.022088003    4.5557376 
+   38180    20.412782    1.0361777    24.047666    6.0863097    4.5325612    1.5537485 0.0016885364 -0.021673547    4.5525462 
+   38190    20.355497    1.0096179    23.928386    6.0370898    4.5231677    1.5139221 0.0016221771 -0.021527538    4.5430731 
+   38200    20.191377    1.0242479    23.768529    6.0539496    4.5180899    1.5358597  0.001498057 -0.021040685    4.5376325 
+   38210    20.076033    1.0088812    23.767074    6.0378443     4.525027    1.5128173 0.0016056725 -0.021581093    4.5450024 
+   38220    20.131081    1.0031076    23.372061    6.0422393    4.5380795    1.5041599 0.0018123568  -0.02268508    4.5589522 
+   38230    20.457924    1.0004235    23.764612    6.0328481    4.5327131     1.500135 0.0019168882 -0.022914359    4.5537106 
+   38240    20.252967   0.99359726    24.014359    6.0293074    4.5394083    1.4898991 0.0019673398 -0.022819997    4.5602609 
+   38250    20.159677   0.98928781    23.843428    6.0426457    4.5592086    1.4834371 0.0019051435 -0.022387733    4.5796912 
+   38260    20.232364   0.99619816    23.818718    6.0347163    4.5409172    1.4937991 0.0016488702 -0.021229786    4.5604981 
+   38270     20.34754   0.99512918    23.461543    6.0224754    4.5302792    1.4921962 0.0018979398 -0.022062578    4.5504438 
+   38280    20.169827    1.0113004    23.701413    6.0216897    4.5052448    1.5164449 0.0019972579 -0.022599201    4.5258467 
+   38290    20.190766    1.0141927    23.691984    6.0448784    4.5240964     1.520782 0.0022224179 -0.023611627    4.5454856 
+   38300    19.991377    1.0250114     23.79708    6.0427486     4.505744    1.5370046 0.0021799721 -0.023292736    4.5268568 
+   38310    20.283457    1.0079837      23.7685    6.0376214    4.5261498    1.5114716 0.0020502921 -0.022737198    4.5468367 
+   38320    20.091233   0.99210393    23.784934    6.0090341    4.5213743    1.4876598 0.0016682417 -0.021347718    4.5410538 
+   38330    19.779506    0.9947195     23.57334    6.0122318      4.52065    1.4915819 0.0013599736 -0.020170165    4.5394602 
+   38340    20.112311   0.98654303    23.575778    6.0123618    4.5330405    1.4793213 0.0011472583 -0.019226139    4.5511194 
+   38350    19.859953   0.99608377    23.654939    6.0095927    4.5159651    1.4936276 0.0011502117 -0.019141175    4.5339561 
+   38360    19.975345    1.0036889    23.830692    6.0130194     4.507988    1.5050314 0.0010308893 -0.018724663    4.5256818 
+   38370    20.308695    1.0022543    23.662491    6.0177369    4.5148566    1.5028804 0.0011655443 -0.019579424    4.5332705 
+   38380    20.246052    1.0048563    23.744754    6.0334952    4.5267132     1.506782 0.0014156447 -0.020981266    4.5462788 
+   38390    20.100194   0.98092466    23.667257    6.0214845     4.550588    1.4708965 0.0015942186 -0.021547666    4.5705414 
+   38400    20.374859   0.99413261    23.846448     6.006469    4.5157672    1.4907018 0.0018622061 -0.022857554    4.5367625 
+   38410    20.247354    1.0059512    23.848824    5.9993217    4.4908979    1.5084238  0.001831402  -0.02247294    4.5115395 
+   38420     20.20117    1.0127064    23.701007    6.0350739    4.5165205    1.5185533 0.0017052258 -0.022116772    4.5369321 
+   38430    20.455773   0.99216647    23.918255    6.0033686     4.515615    1.4877536 0.0016927039 -0.021910897    4.5358332 
+   38440    20.412387    0.9894185    23.595866    6.0117784    4.5281453     1.483633 0.0016210082 -0.020810595    4.5473349 
+   38450    20.340805   0.99417842    23.515254    6.0317532    4.5409826    1.4907705 0.0017523126 -0.021333545    4.5605639 
+   38460    20.218998    1.0162674    24.174165    6.0513006    4.5274076     1.523893 0.0017591709 -0.021486194    4.5471346 
+   38470    20.182626     1.014939    23.674941    6.0506214    4.5287203     1.521901  0.001807259  -0.02189205    4.5488051 
+   38480    19.959591    1.0088741    23.726414    6.0432999    4.5304932    1.5128067 0.0017980873  -0.02212466    4.5508198 
+   38490      20.0683    1.0066666    23.777815    6.0391305    4.5296338    1.5094966 0.0017641034 -0.022279898    4.5501496 
+   38500    20.111066   0.99927937    23.506676    6.0236597    4.5252403    1.4984194 0.0019199794 -0.022889342    4.5462096 
+   38510    20.355535    1.0044829    23.666704    6.0218717    4.5156495    1.5062221 0.0020863478 -0.023585081    4.5371483 
+   38520     19.88712   0.98893224    23.762899    6.0261454    4.5432415    1.4829039 0.0021069641 -0.023646003    4.5647805 
+   38530    20.020167   0.99948046    23.647153    6.0273028    4.5285818     1.498721 0.0020745187 -0.023802263    4.5503095 
+   38540    20.344666   0.99110168    23.655275    6.0155679     4.529411     1.486157 0.0021055962 -0.023816145    4.5511215 
+   38550    20.240163   0.99226642     23.85021    6.0062112    4.5183077    1.4879035 0.0021619913 -0.023938497    4.5400842 
+   38560    20.401663    0.9989368     23.59005    5.9950259    4.4971201    1.4979057 0.0021779716 -0.024314421    4.5192566 
+   38570    20.356969    1.0102699    23.830677    6.0326039    4.5177042    1.5148997 0.0021797986 -0.024309475    4.5398339 
+   38580    20.033069    1.0158351    23.424586    6.0510647    4.5278199    1.5232448 0.0021753671 -0.024491024    4.5501356 
+   38590    20.112754    1.0292836    23.620712    6.0835597    4.5401489    1.5434108 0.0021454175 -0.024204478    4.5622079 
+   38600    20.016203    1.0257173    23.584491    6.0717248    4.5336617    1.5380631 0.0019501371 -0.023483299    4.5551948 
+   38610    20.134361    1.0199921    23.794942    6.0655139    4.5360358    1.5294781 0.0018651188 -0.022615995    4.5567867 
+   38620    20.068101    1.0117882    23.633401     6.055687    4.5385107    1.5171763 0.0018413968 -0.022320299    4.5589896 
+   38630    19.994349    1.0144506    23.518057    6.0333558    4.5121871    1.5211687 0.0020052807 -0.022801747    4.5329836 
+   38640    20.299314   0.99872502    23.655263    6.0210793    4.5234912    1.4975882 0.0020262617 -0.022698511    4.5441634 
+   38650    20.194633   0.98277637     23.76627    6.0194202     4.545747    1.4736732  0.001983251 -0.022346277      4.56611 
+   38660    20.370496   0.97680698     23.74205    6.0044117    4.5396896    1.4647221 0.0017763424 -0.021752025    4.5596653 
+   38670    19.943046    1.0104158    23.628666    6.0228032    4.5076846    1.5151186 0.0015041418  -0.02066502    4.5268455 
+   38680    19.990317   0.98970938    23.577252    6.0253804    4.5413112    1.4840692 0.0014503174 -0.021076981    4.5609379 
+   38690     20.36317   0.98120934    23.472242    6.0005737    4.5292503    1.4713234 0.0016375165 -0.021849389    4.5494621 
+   38700     20.20276   0.98391934    23.687251    5.9940341     4.518647     1.475387 0.0017391897 -0.022537567    4.5394454 
+   38710     20.01369    1.0055579    23.764314    6.0220276    4.5141935    1.5078341 0.0017030861 -0.022084969    4.5345754 
+   38720    20.230119    1.0067908    23.688545     6.025254    4.5155713    1.5096828 0.0015362528 -0.021081615    4.5351166 
+   38730    20.386002   0.98138486    23.549989    6.0234099    4.5518233    1.4715866  0.001810477 -0.022207801    4.5722206 
+   38740    20.454358   0.99766509    23.893481    6.0314966    4.5354978    1.4959988 0.0015208741 -0.021160686    4.5551376 
+   38750    20.156117   0.99500347    23.775158    6.0181109    4.5261032    1.4920077 0.0013127748 -0.020431937    4.5452224 
+   38760    20.249661   0.99468455    23.927757    6.0207958    4.5292663    1.4915295 0.0014002091 -0.020621675    4.5484878 
+   38770    20.218455    1.0032066    23.722126    6.0221494    4.5178411    1.5043083 0.0015773271 -0.021329524    4.5375933 
+   38780    20.091313   0.99064725    23.800892    6.0065189    4.5210434    1.4854755 0.0018153661  -0.02208454    4.5413126 
+   38790    20.180305    0.9870611     23.82785    6.0272299    4.5471318    1.4800981  0.001948022  -0.02277962    4.5679634 
+   38800    19.976531   0.99597228    23.488756    6.0306061    4.5371457    1.4934604 0.0017671249 -0.021954882    4.5573335 
+   38810    20.466213    1.0275223    23.794125    6.0740669    4.5332973    1.5407696 0.0017498718 -0.021756232    4.5533036 
+   38820    20.191282    1.0224324    23.586839    6.0730981    4.5399607    1.5331374 0.0016802257 -0.021133669    4.5594141 
+   38830    20.017958    1.0097275    23.526666    6.0455869    4.5315006    1.5140863 0.0015339518 -0.020533431    4.5505001 
+   38840    20.182992    1.0010784    23.843145    6.0314403    4.5303232    1.5011171 0.0015183019 -0.020546949    4.5493518 
+   38850    20.085194     1.008239    23.861623    6.0533482    4.5414939    1.5118544 0.0015151198 -0.020762741    4.5607415 
+   38860    20.218154     1.002143    23.598501    6.0495849    4.5468715    1.5027134 0.0013849459 -0.020524377    4.5660109 
+   38870    20.409171    1.0189943    23.812603    6.0571964    4.5292145    1.5279819 0.0014362986 -0.020942277    4.5487204 
+   38880    20.403829    1.0257128    23.734781    6.0727031    4.5346467    1.5380564 0.0014783232 -0.021163348    4.5543317 
+   38890    20.035411    1.0279741    23.907434    6.0796338    4.5381867    1.5414472 0.0017447256 -0.022732606    4.5591745 
+   38900    20.037952    1.0217176    23.827736    6.0695478    4.5374823    1.5320655 0.0016878125 -0.022707596    4.5585021 
+   38910    19.936292    1.0269444    23.606678    6.0621529    4.5222497    1.5399032 0.0016429496 -0.022734896    4.5433416 
+   38920    20.234048    1.0124003    23.633388    6.0547762    4.5366819    1.5180943 0.0017554193 -0.023004667    4.5579312 
+   38930    20.302625    1.0146942    23.679229     6.041398     4.519864     1.521534 0.0017284446 -0.022704523    4.5408401 
+   38940    20.304304    1.0152992    23.623868    6.0596176    4.5371764    1.5224412 0.0017081969 -0.022333836     4.557802 
+   38950    19.876964    1.0142262    23.550315    6.0525819    4.5317497    1.5208322 0.0016146887 -0.021855497    4.5519905 
+   38960    20.265554    1.0036307    23.656333    6.0631245    4.5581804    1.5049442 0.0015129104 -0.021546201    4.5782137 
+   38970    20.038586    1.0044576    23.531237    6.0490566    4.5428725    1.5061841 0.0014926457 -0.021273197    4.5626531 
+   38980    20.398704    1.0332748    23.790423    6.0812136    4.5318181    1.5493955  0.001540854  -0.02106231    4.5513395 
+   38990    20.574755    1.0190427    24.076956    6.0649087    4.5368542    1.5280545 0.0015233131 -0.020955993    4.5562869 
+   39000    20.552576    1.0347409    23.941343    6.0989505    4.5473565     1.551594  0.001440345 -0.020314755    4.5662309 
+   39010    20.222208    1.0222077    23.705381    6.0812129    4.5484125    1.5328004 0.0016191383 -0.021352308    4.5681457 
+   39020    20.330537    1.0152109    23.762419      6.05664    4.5343313    1.5223088 0.0014777251 -0.021020157    4.5538737 
+   39030    20.267762    1.0375441    23.796471    6.0733088    4.5175115    1.5557973  0.001377059 -0.020556919    4.5366914 
+   39040    20.316903    1.0261775    23.878832    6.0746481    4.5358949    1.5387532 0.0015404607 -0.020886006    4.5552404 
+   39050    20.393915    1.0224951    23.546593    6.0630876    4.5298561    1.5332314  0.001614145 -0.021121107    4.5493631 
+   39060    20.535951    1.0173806    23.818685    6.0551927    4.5296305    1.5255622 0.0014977108 -0.020333336    4.5484661 
+   39070    20.614581    1.0146542    23.685437    6.0536369    4.5321629    1.5214739 0.0013680529 -0.019902036    4.5506969 
+   39080    20.366838    1.0177596    23.880577    6.0677319    4.5416014    1.5261305 0.0013309647  -0.02003598    4.5603064 
+   39090    20.418226    1.0077605    23.512964    6.0634813    4.5523445    1.5111368 0.0014576373 -0.020723819    4.5716106 
+   39100    20.298084    1.0239397    23.655489    6.0808086     4.545411    1.5353976 0.0017259096 -0.022056614    4.5657417 
+   39110    20.177146    1.0254198    23.842447     6.086099    4.5484819    1.5376171 0.0018151472 -0.022217597    4.5688844 
+   39120    19.961498    1.0396036    23.906927    6.0881617    4.5292761    1.5588856 0.0017767283 -0.021970165    4.5494695 
+   39130    20.077995    1.0430371    24.221168    6.1128374    4.5488033    1.5640341 0.0017523254 -0.021879499    4.5689305 
+   39140    20.412422    1.0349472    23.812411    6.0918853    4.5399819    1.5519034 0.0016326766 -0.021364615    4.5597139 
+   39150     20.36109    1.0106635    23.704165    6.0459388    4.5304489    1.5154899 0.0015328213  -0.02115261    4.5500687 
+   39160    20.482966   0.99759768    23.778005    6.0022909    4.5063932    1.4958977 0.0016756011 -0.021624793    4.5263424 
+   39170     20.25859   0.99010672    23.912128    6.0202939    4.5356288     1.484665 0.0019252764 -0.022893174    4.5565967 
+   39180    20.357577    1.0043616    24.032665    6.0200187    4.5139785    1.5060403 0.0019760735 -0.023070296    4.5350727 
+   39190    20.059832   0.99269807    23.485698    6.0437984    4.5552477    1.4885508 0.0019498222 -0.022914378    4.5762122 
+   39200    20.179526    1.0213888    23.634328    6.0684605     4.536888    1.5315725 0.0020894933 -0.023681673    4.5584802 
+   39210    20.452798    1.0162943    23.794809     6.038208    4.5142747    1.5239333 0.0021874323  -0.02427971     4.536367 
+   39220    20.227077    1.0247594    23.964999    6.0739423    4.5373156    1.5366268 0.0020930702 -0.024046299    4.5592688 
+   39230    20.234664    1.0374901    24.315494    6.0780947    4.5223782    1.5557164 0.0020126518 -0.023259094    4.5436247 
+   39240      20.3151    1.0213147    23.830434    6.0737659    4.5423045    1.5314614 0.0020021052 -0.022904469    4.5632069 
+   39250    19.979329    1.0232646    23.505619    6.0635473     4.529162    1.5343853 0.0019420798 -0.022867028     4.550087 
+   39260    20.141354    1.0220646    23.813319    6.0480252    4.5154393    1.5325859 0.0019581155 -0.023125878    4.5366071 
+   39270    19.774826     1.008274    23.898535    6.0262438     4.514337    1.5119068 0.0018807274 -0.022777721     4.535234 
+   39280    20.192605      1.00326    23.803155    6.0198184    4.5154301    1.5043883 0.0017406259  -0.02250303    4.5361925 
+   39290    20.340306    1.0013038     23.70052    6.0289481    4.5274931    1.5014551 0.0016749784 -0.021676535    4.5474946 
+   39300    20.207441    1.0188509    23.560179    6.0554664    4.5276994     1.527767 0.0016531146 -0.021555108    4.5476014 
+   39310    20.126921    1.0293807     23.68226    6.0629332    4.5193768    1.5435563 0.0015331531 -0.021756217    4.5395999 
+   39320    20.220233    1.0416395    23.807198    6.0826658    4.5207273    1.5619385 0.0016160929 -0.022182592    4.5412938 
+   39330      20.0242    1.0218691    23.600417    6.0755677     4.543275    1.5322927 0.0014992469 -0.021701823    4.5634776 
+   39340    20.423118    1.0025209     23.65918    6.0450158    4.5417357    1.5032801 0.0015823894 -0.022158075    4.5623114 
+   39350     20.32081    1.0167104    23.678899    6.0511694    4.5266122    1.5245572 0.0015832425  -0.02225573    4.5472847 
+   39360    20.231569    1.0113303    23.745094    6.0514663    4.5349764    1.5164899 0.0015812288 -0.022107003    4.5555022 
+   39370    20.190099    1.0190424    23.757612    6.0563183    4.5282642     1.528054 0.0016457954 -0.022089004    4.5487074 
+   39380    19.964996    1.0166277    23.775403    6.0475299    4.5230966    1.5244333 0.0017284719 -0.022514998    4.5438832 
+   39390    20.030376   0.98311473    23.509901    6.0343713    4.5601907    1.4741805  0.001701793 -0.022443211    4.5809321 
+   39400    20.316294   0.98946097    23.546079    6.0292932    4.5455965    1.4836967 0.0017303187 -0.022397952    4.5662641 
+   39410    20.537048    1.0114482    23.876119    6.0334919    4.5168254    1.5166665 0.0018940632 -0.022998272    4.5379296 
+   39420    20.379097   0.98879362    23.593858    6.0026748    4.5199787     1.482696 0.0017922331 -0.021952409    4.5401389 
+   39430    20.494764    1.0058649    23.653577    6.0248993    4.5166048    1.5082945 0.0017550663 -0.021558885    4.5364086 
+   39440    20.006581   0.99773742    23.484471    6.0394489    4.5433417    1.4961073 0.0018642211 -0.021932537      4.56341 
+   39450    20.189641    1.0174574    23.884487    6.0451814    4.5195039    1.5256774 0.0017460054 -0.021050393    4.5388083 
+   39460    20.063132     1.028854    23.765553    6.0551974    4.5124308    1.5427666 0.0019223941 -0.021724556    4.5322329 
+   39470    19.985075    1.0123116    23.452234    6.0522841    4.5343228    1.5179613 0.0019900899 -0.022344463    4.5546772 
+   39480    20.124074    1.0074148    23.580032    6.0186225    4.5080041    1.5106185 0.0019746021 -0.022484996    4.5285145 
+   39490    20.231757   0.99242494    23.805309    6.0155343    4.5273932    1.4881412 0.0017802738 -0.022131027    4.5477439 
+   39500    20.247752   0.99966362    23.765219    6.0243257    4.5253301    1.4989956  0.001617417 -0.021635786    4.5453485 
+   39510    20.022679   0.99736994    23.825594    6.0404658    4.5449096    1.4955562 0.0016067115 -0.021565273    4.5648682 
+   39520    20.225399    1.0077226    24.017843    6.0328768    4.5217968      1.51108 0.0017412861 -0.022223785    4.5422793 
+   39530    20.191278    1.0143266    23.746533    6.0240921    4.5031093    1.5209828 0.0017865217 -0.022390612    4.5237134 
+   39540    20.373873    1.0040659    23.501589    6.0487235    4.5431267    1.5055969 0.0018723002 -0.022659428    4.5639138 
+   39550    20.184564    1.0202417    23.677263    6.0578452    4.5279928    1.5298524 0.0019122655 -0.022750932    4.5488315 
+   39560    20.126669    1.0308333    23.964051    6.0764964    4.5307618    1.5457346  0.001899086 -0.022772292     4.551635 
+   39570    20.275216    1.0149414    23.723542    6.0414529    4.5195483    1.5219046    0.0020789 -0.023807464    4.5412768 
+   39580     20.41085    1.0126754    23.753984    6.0596268      4.54112    1.5185068  0.002093367 -0.024108844    4.5631355 
+   39590    20.282445    1.0131636    23.889576    6.0674216    4.5481828    1.5192389 0.0021226594 -0.023829046    4.5698891 
+   39600    20.453266    1.0355849    23.941071    6.0707456     4.517886    1.5528596 0.0020901997 -0.023680814    4.5394766 
+   39610     20.20662    1.0093909    23.605743    6.0675302    4.5539486    1.5135817 0.0020430089  -0.02366148    4.5755671 
+   39620     20.18662     1.041068    23.609707    6.0831402    4.5220586    1.5610815 0.0020512305 -0.023469464    4.5434769 
+   39630    19.570221    1.0125133    23.753424    6.0671798     4.548916    1.5182637 0.0018101588 -0.022450237    4.5695561 
+   39640     19.98462    1.0050024    23.761487    6.0541152    4.5471142     1.507001 0.0018066081 -0.022371085    4.5676787 
+   39650    20.099585    1.0099733    23.485786    6.0445496    4.5300946     1.514455 0.0016269618 -0.021434572    4.5499022 
+   39660    20.385954    1.0125557    23.726869    6.0311304    4.5128031    1.5183273 0.0015979475 -0.021166145    4.5323713 
+   39670    19.806131   0.98134567    23.551397    6.0058308     4.534303    1.4715278 0.0015575085  -0.02081075    4.5535562 
+   39680    20.014221   0.99717426    23.674963    6.0102227    4.5149599    1.4952628 0.0014255973 -0.020466294    4.5340006 
+   39690    19.937954   0.99242185    23.557403    6.0072681    4.5191315    1.4881366 0.0013017403 -0.020155389    4.5379852 
+   39700    20.228399   0.99019034    23.575766    6.0072972    4.5225067    1.4847904  0.001569437 -0.021380663     4.542318 
+   39710    19.904096    1.0037197    23.529773    6.0336915    4.5286139    1.5050776 0.0018100687 -0.022329046    4.5491329 
+   39720    19.451108   0.99430034    23.461298    6.0143714     4.523418    1.4909534 0.0018286348 -0.022846498    4.5444359 
+   39730    20.213329   0.98924021    23.761371    6.0363252    4.5529595    1.4833657 0.0018059096 -0.022894777    4.5740484 
+   39740    20.142143    1.0107069     23.57618    6.0204592    4.5049041    1.5155551  0.001502689 -0.021363096    4.5247646 
+   39750    19.928855   0.99136462    23.741751    6.0437517    4.5572004    1.4865512 0.0012703865 -0.020317508    4.5762475 
+   39760    20.204526    1.0181148    23.662398    6.0706559    4.5439927    1.5266632 0.0013698957 -0.020537994    4.5631608 
+   39770    20.072866    1.0234005    23.652962    6.0727063    4.5381172    1.5345891 0.0014777633 -0.020933792    4.5575732 
+   39780    20.189534    1.0192919    23.819966    6.0632917    4.5348635    1.5284282 0.0016266418 -0.021166234    4.5544031 
+   39790    19.931155     1.012469    24.043181    6.0498092    4.5316119    1.5181973 0.0017646381 -0.022153656     4.552001 
+   39800    19.945479   0.98962098    23.755063    6.0080478    4.5241112    1.4839367 0.0017174469 -0.021988245     4.544382 
+   39810    20.115457   0.99472481    23.879598    6.0290484    4.5374585    1.4915899 0.0017945721 -0.022151205    4.5578152 
+   39820    20.222446    1.0115851    23.824469    6.0260023    4.5091305    1.5168719 0.0019134545 -0.022270286    4.5294873 
+   39830     19.97281    0.9986741    23.740192    6.0261215    4.5286097    1.4975118 0.0019850372 -0.022295235    4.5489199 
+   39840    19.799556    1.0145852    23.716777    6.0412873    4.5199168    1.5213705 0.0020947538 -0.022683695    4.5405057 
+   39850    20.009208    1.0063827    23.578909     6.021926    4.5128551    1.5090708 0.0022206052 -0.023128589    4.5337631 
+   39860    20.140528   0.99380308    23.784033    6.0186391    4.5284314    1.4902077 0.0022227281 -0.023426228    4.5496349 
+   39870    19.564824    1.0005851    23.399687    6.0401597    4.5397823    1.5003774 0.0021425626 -0.023319391    4.5609592 
+   39880    19.820061    1.0068766    23.689477    6.0349999    4.5251885    1.5098115 0.0021196577 -0.023026324    4.5460951 
+   39890    20.213299   0.99719785    23.582802    6.0449568    4.5496586    1.4952982 0.0019282026 -0.022078625     4.569809 
+   39900    20.184566    1.0297396    23.762717    6.0795417    4.5354471    1.5440946 0.0017046517 -0.021319451    4.5550619 
+   39910    20.214627    1.0074355    24.014443    6.0638756    4.5532262    1.5106495 0.0016984625 -0.021266723    4.5727944 
+   39920    20.198245    1.0174789    23.782246    6.0539136    4.5282039    1.5257097 0.0016924692 -0.021443424    4.5479549 
+   39930    19.833901   0.98293803    23.743033    5.9994654    4.5255498    1.4739156 0.0016017435 -0.021106195    4.5450543 
+   39940    20.113094   0.98906307    24.037458     6.008826    4.5257259    1.4831001 0.0015848241 -0.020686416    4.5448275 
+   39950    20.144406    0.9798903    23.485612    6.0269782    4.5576327    1.4693455 0.0017410342 -0.021496013    4.5773877 
+   39960    19.737587    1.0243293    23.831234    6.0677073    4.5317254    1.5359819 0.0019574693  -0.02254255    4.5523105 
+   39970    19.840254    1.0114132    23.944527    6.0423483    4.5257341    1.5166141 0.0018022526 -0.021761213    4.5456931 
+   39980    19.927926    1.0169877    23.750244    6.0556808    4.5307078     1.524973 0.0016100715 -0.021065756    4.5501635 
+   39990    20.121592    1.0055093    23.617198    6.0597478    4.5519866    1.5077612 0.0013263917 -0.019845548    4.5705058 
+   40000    20.287704   0.99949877    23.714678    6.0415731    4.5428247    1.4987484 0.0013120453 -0.019462374     4.560975 
+   40010    20.445959    1.0206285    23.682598    6.0621332    4.5317008    1.5304325 0.0014201138 -0.019608378    4.5498891 
+   40020    20.162458    1.0170412    23.816061    6.0555422    4.5304889    1.5250533   0.00149878 -0.019874433    4.5488646 
+   40030    20.223364    1.0086061    23.583699    6.0666596    4.5542547    1.5124048 0.0015775831 -0.020701475    4.5733786 
+   40040    19.860349    1.0220394    23.800923    6.0389419    4.5063938    1.5325481 0.0016965184 -0.021530773    4.5262281 
+   40050    20.197034    1.0069152    23.758598    6.0283091    4.5184398    1.5098693 0.0018080944  -0.02254166    4.5391734 
+   40060    20.344679    1.0016025    23.635034    6.0411671    4.5392642    1.5019029 0.0018715357 -0.022914375     4.560307 
+   40070    20.044638    1.0217231    23.549056    6.0445706    4.5124968    1.5320738 0.0019767569  -0.02330316    4.5338232 
+   40080    20.543664    1.0030982    23.590928    6.0323968     4.528251    1.5041458 0.0020178419 -0.023938475    4.5501716 
+   40090    20.109838    1.0073479    23.940532    6.0545814    4.5440633    1.5105182 0.0020696156 -0.023861581    4.5658552 
+   40100    20.456197    1.0222519    23.819218    6.0550902    4.5222235    1.5328667 0.0021961368 -0.024584218    4.5446116 
+   40110    20.156385    1.0222566    23.760763    6.0571018    4.5242281    1.5328738 0.0023138555 -0.024998478    4.5469127 
+   40120    20.072595    1.0024888    23.548335    6.0495277    4.5462957     1.503232 0.0022019405 -0.024143447    4.5682372 
+   40130    19.790335    1.0177464    23.546436    6.0459631    4.5198525    1.5261107 0.0021212034 -0.023710382    4.5414416 
+   40140    20.119373    1.0459968    23.877327    6.0877056    4.5192335    1.5684722  0.001988473 -0.022657847    4.5399028 
+   40150    20.196704     1.043936    23.812093    6.0983871    4.5330051     1.565382 0.0017458958 -0.021529982    4.5527892 
+   40160    20.425048    1.0225628    23.680189    6.0804813    4.5471483     1.533333  0.001602244 -0.021109302    4.5666554 
+   40170    20.291838    1.0242507     23.96865    6.0829583    4.5470943     1.535864  0.001751659 -0.021580657    4.5669233 
+   40180    20.212194    1.0320192    23.522218    6.0837665    4.5362537    1.5475127 0.0017766125 -0.021681031    4.5561582 
+   40190    20.251277    1.0003453    23.629785    6.0579675    4.5579496    1.5000178 0.0016837768 -0.021611793    4.5778777 
+   40200    20.466747    1.0270274    23.862824    6.0695134    4.5294859    1.5400275 0.0017570841  -0.02223212    4.5499609 
+   40210    20.495499    1.0350461    23.822268    6.0603507    4.5082991    1.5520516 0.0018673995 -0.022827339     4.529259 
+   40220    19.702459    1.0135831    23.919868    6.0413144    4.5214465    1.5198679 0.0017297344 -0.022426485    4.5421433 
+   40230    20.107873    1.0161017    23.628246    6.0514453    4.5278007    1.5236445 0.0015128171 -0.021238105     4.547526 
+   40240     20.10996    1.0053595    23.989517    6.0322618    4.5247253    1.5075365 0.0012926092 -0.020085013    4.5435177 
+   40250    20.157722   0.99833705    23.721428     6.028127    4.5311205    1.4970064 0.0013612083  -0.02029212    4.5500515 
+   40260     20.16754    1.0030216    23.671374    6.0680532    4.5640222    1.5040309 0.0013416094 -0.020038895    4.5827195 
+   40270    20.594352    1.0259259    23.598169    6.1027113    4.5643354    1.5383759 0.0012694246 -0.019866565    4.5829325 
+   40280    20.431022    1.0479797    23.730784    6.1008842    4.5294386    1.5714456 0.0012875008 -0.020218125    4.5483693 
+   40290    20.059577    1.0257142    23.735169    6.0731162    4.5350578    1.5380584   0.00118137 -0.019472013    4.5533484 
+   40300    19.935399    1.0192448    23.887584    6.0571562    4.5287986    1.5283576 0.0013762934 -0.019909547    4.5473318 
+   40310    20.120746    1.0100881    23.529777    6.0251513    4.5105242     1.514627 0.0015298431 -0.020047763    4.5290422 
+   40320    20.218039    1.0063106    23.857627    6.0371861    4.5282234    1.5089627 0.0015245619 -0.019905334    4.5466042 
+   40330    20.167489    1.0388948       23.932    6.0846085    4.5267857    1.5578228 0.0015473191 -0.020705701    4.5459441 
+   40340    20.118194    1.0386382    24.026337    6.0674738    4.5100358     1.557438 0.0016998071 -0.021766511    4.5301025 
+   40350    20.320773    1.0142306    23.520872    6.0768746    4.5560357    1.5208388 0.0018522762 -0.022376401    4.5765599 
+   40360    20.248507     1.017182    24.008452    6.0589749    4.5337104    1.5252644 0.0018886662   -0.0225147    4.5543365 
+   40370    19.810349    1.0074988    23.613409    6.0307223    4.5199779    1.5107444 0.0018767989 -0.022242065    4.5403432 
+   40380     19.67256   0.99473314    23.459076    6.0304797    4.5388773    1.4916023 0.0019784595 -0.022879894    4.5597788 
+   40390    20.076505    0.9949236    23.715646    6.0347908    4.5429028    1.4918879 0.0020535684 -0.022696821    4.5635461 
+   40400    19.956263    1.0088005    23.704862    6.0407926    4.5280963    1.5126963 0.0021151667 -0.023115273    4.5490965 
+   40410    20.217381   0.99924816    23.333749    6.0372015    4.5388289    1.4983726 0.0020138752 -0.023074836    4.5598899 
+   40420     20.24149     1.008771    23.758147    6.0650153    4.5523632    1.5126521 0.0018262876  -0.02222273    4.5727597 
+   40430    20.394195    1.0222377    23.719039    6.0663377    4.5334922    1.5328455 0.0016637691  -0.02165365    4.5534821 
+   40440    20.424906    1.0214869    23.696334    6.0363321    4.5046125    1.5317195 0.0014997576 -0.020919887    4.5240327 
+   40450    20.336503    1.0010426    23.573878     6.013824    4.5127606    1.5010634 0.0016977123 -0.021843207    4.5329061 
+   40460    20.260783     1.009053    24.017758    6.0403281    4.5272531     1.513075 0.0014359323 -0.020732359    4.5465495 
+   40470    20.357157     1.018335    23.805717    6.0287783     4.501785    1.5269933 0.0010096675 -0.018690146    4.5194655 
+   40480     20.30018    1.0262357    23.871555    6.0628159    4.5239754    1.5388405 0.00096849029 -0.018353989    4.5413609 
+   40490    20.240706    1.0265679    23.777526    6.0695593    4.5302208    1.5393385 0.0011248826 -0.019357125     4.548453 
+   40500    20.250373    1.0163416    23.925896    6.0910966    4.5670923    1.5240043 0.0012798768 -0.020282122    4.5860946 
+   40510    20.006875    1.0386308    23.810284    6.0897801    4.5323533    1.5574269 0.0014426795 -0.020779643    4.5516902 
+   40520    20.420951    1.0321861    23.919755    6.0779541     4.530191    1.5477631 0.0016767357 -0.021863455    4.5503777 
+   40530    20.137594    1.0045652    23.575001    6.0664281    4.5600826    1.5063455 0.0017826121 -0.022094364    4.5803943 
+   40540    20.111668    1.0338408    23.818805    6.0849267    4.5346824    1.5502443 0.0017063737 -0.021706794    4.5546828 
+   40550    20.284556    1.0280091     23.83434    6.0878319    4.5463322    1.5414997 0.0017795966 -0.022261747    4.5668144 
+   40560      20.1447    1.0341553    23.623757    6.1065022    4.5557863    1.5507158 0.0017794094   -0.0225795    4.5765864 
+   40570    20.183642    1.0404365    23.726481    6.1040779    4.5439433    1.5601346 0.0016198048 -0.022136074    4.5644596 
+   40580    19.970497    1.0306572    24.157849    6.1015054     4.556035    1.5454704 0.0014527276  -0.02176663    4.5763489 
+   40590    20.252012     1.038045    24.058984    6.0802356    4.5236871    1.5565485 0.0011574089 -0.020204411    4.5427341 
+   40600    20.033552    1.0273464    23.576642    6.0886997    4.5481938    1.5405059 0.0011401506 -0.019695529    4.5667492 
+   40610    20.318292    1.0467475    23.702266    6.1029961    4.5333982    1.5695979 0.0011567723 -0.019889361    4.5521308 
+   40620    20.028865    1.0209085    23.848805    6.0619275    4.5310752    1.5308523 0.0014015266 -0.020804766    4.5504784 
+   40630    20.012563    1.0267311    23.692137    6.0951757    4.5555924    1.5395833 0.0015642642 -0.021553231    4.5755814 
+   40640    20.168087    1.0184635    24.090506    6.0692918    4.5421057    1.5271861 0.0014226216 -0.021458549    4.5621416 
+   40650    20.345415   0.99731325    23.796201    6.0215038    4.5260326    1.4954712 0.0013765298 -0.021223363    4.5458794 
+   40660    20.400704    1.0048103      23.4117    6.0316827    4.5249696    1.5067131  0.001555866 -0.021741281     4.545155 
+   40670    19.994426    1.0082668    23.789038    6.0350984    4.5232023    1.5118961 0.0018966851 -0.023253058    4.5445587 
+   40680    19.966165    1.0104549     24.11657    6.0354092    4.5202321    1.5151771 0.0020502413 -0.023960561    4.5421424 
+   40690    20.041172    0.9764427    23.496482    6.0237901    4.5596143    1.4641758 0.0020523177 -0.023732788    4.5812948 
+   40700     20.16462    1.0137426    23.860891    6.0414603    4.5213532    1.5201071 0.0018686196 -0.022834763    4.5423194 
+   40710    19.884428    1.0147999    23.617887    6.0503425      4.52865    1.5216925 0.0015802287 -0.021371716    4.5484415 
+   40720    20.297556    1.0114183    23.449769    6.0433929    4.5267711    1.5166217 0.0015674461 -0.021055901    4.5462596 
+   40730    20.319354   0.99625388    23.598928     6.041408    4.5475253    1.4938827 0.0016030856  -0.02110888    4.5670311 
+   40740     19.67785    1.0081975    23.360875    6.0379426    4.5261505    1.5117922  0.001579923 -0.020732551    4.5453031 
+   40750     20.08799   0.97857516    23.400788     6.008041    4.5406676    1.4673735  0.001381742 -0.020445235    4.5597311 
+   40760     19.94509    1.0098131    23.803778    6.0406912    4.5264765    1.5142148 0.0014121303 -0.020786727    4.5458511 
+   40770    20.275358     1.005138    23.507276    6.0467244    4.5395199    1.5072045  0.001334156 -0.020212242     4.558398 
+   40780     20.10438    1.0105157    23.706549    6.0809736    4.5657054    1.5152682 0.0013187193  -0.02009327      4.58448 
+   40790    19.976926    1.0195846    23.719121    6.0644284    4.5355613    1.5288671 0.0015668867 -0.020924059    4.5549185 
+   40800    20.096896    1.0179755    23.532857    6.0484475    4.5219933    1.5264542 0.0016325988 -0.020974331     4.541335 
+   40810    20.168327     1.007296    23.764598    6.0521307    4.5416903    1.5104404 0.0016416956 -0.021029139    4.5610777 
+   40820    20.032664    1.0098746    23.888435    6.0306859     4.516379     1.514307 0.0015613162 -0.020961917    4.5357796 
+   40830     20.18894    1.0120122    24.101477    6.0503046    4.5327923    1.5175123 0.0016740658 -0.021121944    4.5522401 
+   40840    20.293474   0.98903441    23.720843    6.0160257    4.5329686    1.4830571 0.0018372474 -0.021697113    4.5528285 
+   40850    20.234254    1.0148478    23.447142    6.0520984    4.5303341    1.5217643 0.0017572643  -0.02167163    4.5502485 
+   40860      19.8949    1.0016135    23.632082    6.0493175    4.5473981    1.5019195 0.0016334293 -0.021183504    4.5669482 
+   40870    20.308794    1.0390997    23.932656    6.0744681    4.5163381      1.55813 0.0016214032 -0.021075324     4.535792 
+   40880    20.041105    1.0143926    23.694892    6.0442715    4.5231897    1.5210817 0.0017249034 -0.021743409    4.5432082 
+   40890    20.192584   0.98911244    23.385235    6.0131357    4.5299616    1.4831741 0.0016819138 -0.021726046    4.5500057 
+   40900    19.890217   0.99102346    23.475991    6.0141617     4.528122    1.4860397 0.0017458241 -0.021969558    4.5483458 
+   40910    20.468982   0.99983949    23.563009    6.0211361    4.5218768    1.4992593 0.0018026596 -0.022088212    4.5421624 
+   40920     20.46803   0.98613564    23.791809    6.0002985    4.5215881    1.4787104 0.0017434384 -0.022212173    4.5420568 
+   40930    19.515903   0.98082625    23.736387    5.9958633    4.5251144     1.470749 0.0018377874 -0.022914839    4.5461914 
+   40940    19.601752   0.98949427     23.58645    6.0077836     4.524037    1.4837467 0.0020674732 -0.023796566    4.5457661 
+   40950    20.157267    1.0056302    23.759236    6.0372589    4.5293164    1.5079424 0.0021468357 -0.023901576    4.5510712 
+   40960    20.208477    1.0116942    23.695359      6.03613    4.5190945    1.5170355    0.0021943  -0.02416094    4.5410611 
+   40970     20.25719    1.0142916    23.805003    6.0507999    4.5298696    1.5209303 0.0022147176 -0.024315185      4.55197 
+   40980    20.252378   0.99586653    23.569254    6.0254448     4.532143    1.4933019 0.0023780146 -0.025053216    4.5548182 
+   40990    20.157851   0.99232676    23.738397    5.9994294    4.5114354     1.487994 0.0024445031 -0.025003814    4.5339947 
+   41000    20.205868   0.99544225     23.60894    6.0259159    4.5332503    1.4926657 0.0022577368 -0.024137637    4.5551302 
+   41010    20.212176    1.0068801      23.8823    6.0619215    4.5521048    1.5098167 0.0020986128 -0.023250007    4.5732562 
+   41020    20.349969    1.0149898    23.815047    6.0651771    4.5431999    1.5219772 0.0020110702 -0.022791297    4.5639801 
+   41030    20.439888    1.0149884     23.46338     6.075873    4.5538979    1.5219752 0.0017459204 -0.021313201    4.5734652 
+   41040    20.426132    1.0115587     23.87509    6.0800085    4.5631761    1.5168323 0.0016669355 -0.021153052    4.5826623 
+   41050    20.188096    1.0184639    23.500502     6.067652    4.5404655    1.5271866 0.0018044191 -0.022134591    4.5607956 
+   41060     20.31714     1.010095    23.932172    6.0641628    4.5495253    1.5146375 0.0017888934 -0.022342724    4.5700791 
+   41070    20.179297   0.99957404    23.647908    6.0375828    4.5387215    1.4988613 0.0017023179 -0.022199741     4.559219 
+   41080    20.251252     0.998137    23.708699    6.0157191    4.5190126    1.4967064 0.0018546356 -0.022576911    4.5397349 
+   41090    20.247294   0.99461044    23.842406     6.025043    4.5336246    1.4914184  0.001824864 -0.022532866    4.5543326 
+   41100    20.265725   0.99401513       23.875      6.01652    4.5259943    1.4905257 0.0018785576 -0.022701039    4.5468168 
+   41110    20.160397   0.99519857    23.765228    6.0269259    4.5346257    1.4923003 0.0017783676 -0.022236813    4.5550841 
+   41120    20.428138    1.0131158    23.712109    6.0563782     4.537211    1.5191672 0.0017717534 -0.022360629    4.5577999 
+   41130    20.327667    1.0048359    23.827397     6.036444    4.5296926    1.5067514 0.0017193302 -0.022025872    4.5499992 
+   41140    20.434743    1.0000097     23.48515    6.0251661    4.5256515    1.4995146 0.0016099228 -0.021304932    4.5453465 
+   41150    20.422976   0.98941068    23.772944    6.0104302    4.5268088    1.4836213 0.0016147893  -0.02115891     4.546353 
+   41160    20.093082   0.99624244    24.009731    6.0135548    4.5196893    1.4938655 0.0016412187 -0.021098147    4.5391462 
+   41170     20.25757     1.000301    23.643233    6.0069209    4.5069696    1.4999514 0.0017711356 -0.021793246    4.5269917 
+   41180    20.027007   0.99719978    23.749214    6.0364692    4.5411681    1.4953011 0.0018547629 -0.022025332    4.5613387 
+   41190    19.964226    1.0129093    23.779996    6.0507828    4.5319254    1.5188574 0.0018398053 -0.021934121    4.5520197 
+   41200    20.238776    1.0096772    23.522361    6.0367922    4.5227813    1.5140109 0.0018121817 -0.021693647    4.5426628 
+   41210    20.285477   0.99597454    23.677284    6.0333887    4.5399249    1.4934638 0.0016919666 -0.020886302    4.5591192 
+   41220    20.430427     1.012341    23.634833    6.0568949    4.5388895    1.5180053 0.0014574699 -0.020395063    4.5578271 
+   41230    20.291851    1.0260195    23.963893    6.0726538    4.5341375    1.5385163 0.0012733645 -0.020220372    4.5530845 
+   41240    20.090785    1.0153174    23.830043    6.0562869    4.5338186    1.5224684 0.0014155653  -0.02101037    4.5534134 
+   41250    20.296442   0.99836072    23.653121    6.0124211    4.5153792    1.4970419 0.0015708941  -0.02173789    4.5355462 
+   41260    20.364488    1.0050371    23.427356    6.0158742    4.5088211    1.5070531 0.0014935095 -0.021600677    4.5289282 
+   41270    20.096874    1.0038121    23.811351    6.0583082     4.553092    1.5052162 0.0015398232 -0.021557149    4.5731094 
+   41280    20.319983    1.0268378    23.871399    6.0826023     4.542859    1.5397432 0.0013751427 -0.020369745    4.5618536 
+   41290    20.461235      1.04062    23.876265    6.1105563    4.5501466    1.5604097 0.0011990002  -0.01927832    4.5682259 
+   41300    20.335266    1.0324781    23.808596    6.0927437    4.5445429    1.5482009 0.0013002318 -0.019755948    4.5629986 
+   41310    19.875595     1.028697    23.960968    6.0980027    4.5554715    1.5425312 0.0016331957 -0.021179099    4.5750174 
+   41320    19.789079    1.0286201    23.821262    6.0822187    4.5398028    1.5424159 0.0018020375 -0.022058747    4.5600595 
+   41330    20.293248    1.0245661    23.659422    6.0727119     4.536375    1.5363368 0.0018218612 -0.022075876     4.556629 
+   41340    19.952186    1.0241551     23.63613    6.0711485     4.535428    1.5357205 0.0019477698 -0.022940115    4.5564204 
+   41350     20.10405   0.98735619    23.763558    6.0405938    4.5600532    1.4805406 0.0019871852 -0.023278789    4.5813448 
+   41360    20.190311    1.0119367    23.758902    6.0338735    4.5164744    1.5173991 0.0020329463 -0.023594564     4.538036 
+   41370    20.273713    1.0087671    23.642442    6.0462209    4.5335747    1.5126462 0.0019697604 -0.023367733    4.5549726 
+   41380    20.060783    1.0142931     23.43249    6.0304052    4.5094726    1.5209326 0.0020051118 -0.023989245    4.5314567 
+   41390    20.370835    1.0008435    23.969759    6.0238836    4.5231187    1.5007648 0.0020556475 -0.024657139    4.5457202 
+   41400    20.162906    1.0039909     23.66408    6.0412123    4.5357279    1.5054844 0.0020155353 -0.024116297    4.5578287 
+   41410    20.048541   0.99783566    23.799551    6.0310578    4.5348032    1.4962546 0.0019886943 -0.023597455     4.556412 
+   41420    19.948265    1.0024899    23.649568    6.0603206     4.557087    1.5032336 0.0020039928 -0.023183292    4.5782663 
+   41430    20.191152    1.0134252    23.648933    6.0584481     4.538817    1.5196311  0.002004256 -0.022880022    4.5596928 
+   41440    20.289657    1.0060493    23.781789    6.0565178    4.5479468     1.508571 0.0019990531 -0.022762903    4.5687107 
+   41450    19.984053     1.008629     23.80772    6.0273298    4.5148906    1.5124392 0.0019748241 -0.022816736    4.5357326 
+   41460    19.654655     1.016638    23.523956    6.0389521    4.5145035    1.5244486 0.0018207498  -0.02218337    4.5348661 
+   41470    20.309263    1.0043247    23.498842    6.0388287    4.5328439    1.5059848 0.0019124929 -0.022710161    4.5536415 
+   41480    20.059396    1.0173409    23.635958     6.067522    4.5420193    1.5255027  0.001930002 -0.022936692     4.563026 
+   41490    19.963374    1.0092712    23.848137    6.0439257    4.5305234    1.5134022 0.0018492039 -0.022539478    4.5512137 
+   41500    20.110347   0.99968009    23.747378    6.0320302    4.5330099    1.4990203 0.0016980461 -0.021947456    4.5532594 
+   41510    20.192746   0.98753831     23.51342     6.021778    4.5409643    1.4808137 0.0016624992 -0.021880495    4.5611823 
+   41520    20.148806    1.0033339    23.487044    6.0239519    4.5194527    1.5044992 0.0017362917  -0.02206436    4.5397807 
+   41530    20.197668   0.98509171    23.638545    6.0266242    4.5494792     1.477145 0.0016940187 -0.022226087    4.5700113 
+   41540    20.196165   0.99652015    23.635124    6.0228692    4.5285872     1.494282 0.0015955429 -0.021761409    4.5487531 
+   41550    20.436241   0.98694913     23.44373    6.0164453    4.5365151    1.4799302 0.0014986582  -0.02129685    4.5563133 
+   41560    20.120335    1.0141474      23.3482    6.0188214    4.4981074    1.5207141 0.0014420645 -0.020720216    4.5173855 
+   41570    20.354699    1.0055804     23.84653    6.0435514    4.5356836    1.5078678 0.0014504216 -0.020444041    4.5546772 
+   41580    20.083035   0.99938401    23.847355    6.0277564    4.5291801    1.4985763 0.0015589881 -0.020991171    4.5486123 
+   41590    20.114387    1.0004743    24.012514    6.0206974    4.5204863    1.5002111 0.0016638583 -0.021377015    4.5401995 
+   41600    19.970471   0.98801068    23.381969    6.0206684    4.5391464     1.481522 0.0018165618  -0.02235118     4.559681 
+   41610    19.735476   0.98412886    23.711938    6.0185972     4.542896    1.4757012  0.001758844 -0.021953278    4.5630904 
+   41620    20.076472   0.99098907    23.724464    6.0280666    4.5420785    1.4859881  0.001678734 -0.020975746    4.5613755 
+   41630    20.169775   0.99473482    23.608641     6.014908    4.5233031    1.4916049 0.0018223289 -0.021521982    4.5430028 
+   41640    20.086228    1.0051485    23.877366    6.0059283    4.4987082    1.5072202 0.0017722232 -0.021408908    4.5183448 
+   41650    20.104054   0.98993221    23.741022    6.0174403    4.5330369    1.4844033 0.0018166795 -0.022239028    4.5534593 
+   41660    20.359305   0.98887384    23.847068    6.0058522    4.5230358    1.4828163 0.0019746756 -0.023084467    4.5441456 
+   41670    20.177981    1.0071642     23.53329    6.0223003    4.5120575    1.5102428 0.0020521132 -0.023797569     4.533803 
+   41680    19.857974    1.0104684    23.910724    6.0217831    4.5065857    1.5151974 0.0019428126 -0.023657286    4.5283001 
+   41690    19.960396   0.98536399    24.006154     6.001074    4.5235207    1.4775533  0.001983438  -0.02377069    4.5453079 
+   41700    19.887035    1.0151086    23.546055    6.0321958    4.5100405    1.5221553 0.0020354037 -0.023842104    4.5318472 
+   41710    20.325097   0.98953279    23.662037    6.0271204     4.543316    1.4838044 0.0018637717 -0.022929354    4.5643816 
+   41720    20.253225   0.97083151    23.584269    5.9990649    4.5433031    1.4557619 0.0015768455 -0.021131347    4.5628576 
+   41730    20.274938    0.9989807    23.792921    6.0003182    4.5023466    1.4979716 0.0013771678 -0.019891505     4.520861 
+   41740    20.207539    1.0046336    23.688038    6.0150538    4.5086056    1.5064481 0.0016072345 -0.021312343    4.5283108 
+   41750    20.070816    1.0151561    23.397114    6.0354583    4.5132317    1.5222266 0.0017012064 -0.021976649    4.5335072 
+   41760    20.367094    0.9847139    23.789601    6.0013889    4.5248104    1.4765785  0.001611782 -0.021345498    4.5445441 
+   41770    19.925292   0.99103377    23.725528    5.9729443    4.4868892    1.4860551 0.0013612813 -0.020093498    4.5056214 
+   41780    19.718657   0.98996842    23.694454    5.9982881    4.5138305    1.4844577 0.0013633028  -0.02013198    4.5325991 
+   41790    19.877413   0.99186759    23.576698    6.0188686    4.5315632    1.4873055 0.0014813583 -0.020604289    4.5506861 
+   41800     20.20979    0.9963897    23.800508     6.013478    4.5193916    1.4940864 0.0016188937 -0.021367924    4.5391407 
+   41810    20.263549   0.99331359    23.749421    6.0262412    4.5367674    1.4894737 0.0017875143  -0.02222607     4.557206 
+   41820    20.215442   0.98621442    23.493151    6.0229797    4.5441511    1.4788285 0.0018223509 -0.022681947    4.5650107 
+   41830     20.19679    1.0312837    23.618191    6.0419331    4.4955232    1.5464099 0.0018407459 -0.022486013    4.5161685 
+   41840    20.315437    1.0283854    23.839949    6.0748577    4.5327939    1.5420639 0.0019631438 -0.023115511    4.5539463 
+   41850    20.190519    1.0359782    23.732744    6.0701942    4.5167449    1.5534493 0.0020600828 -0.023617379    4.5383022 
+   41860    20.281606    1.0419484    23.809734    6.0814827    4.5190811    1.5624016 0.0020135514 -0.023405091    4.5404726 
+   41870    20.151697    1.0301779     23.92954    6.0915558    4.5468041    1.5447517 0.0019197962  -0.02286546    4.5677497 
+   41880    20.263014    1.0299692    23.854408    6.0796621    4.5352233    1.5444388 0.0016178612 -0.021595164    4.5552006 
+   41890    20.295567    1.0168004    23.703335    6.0819967    4.5573044    1.5246923 0.0014796868 -0.020525436    4.5763502 
+   41900     20.37271    1.0309934     23.90223    6.0856012    4.5396266    1.5459747 0.0014425651 -0.019846262    4.5580303 
+   41910    20.241643    1.0380523    23.938258    6.0756425     4.519083    1.5565595 0.0014623084 -0.020694702    4.5383154 
+   41920    20.428407    1.0194017    23.901506    6.0834251    4.5548322    1.5285929  0.001639479 -0.021546214     4.574739 
+   41930    20.194241    1.0270127    23.768309    6.0749161    4.5349105    1.5400056 0.0018425392 -0.021817104    4.5548851 
+   41940    20.098259    1.0153569    23.569847    6.0870857    4.5645581    1.5225277 0.0019584397 -0.022123747    4.5847234 
+   41950    20.271631    1.0233979    23.854467    6.0518066    4.5172214    1.5345852 0.0021273095 -0.022872626    4.5379667 
+   41960    20.397823    1.0218832    23.949523    6.0607008    4.5283869    1.5323138 0.0020986968 -0.023284072    4.5495723 
+   41970    20.277731    1.0317944    23.722595    6.0871969    4.5400212    1.5471757 0.0019275513 -0.022663908    4.5607576 
+   41980    20.313231    1.0225445    23.522283    6.0741593    4.5408538    1.5333055 0.0017757282 -0.022065126    4.5611432 
+   41990    20.149051    1.0327477    23.782785    6.0623595    4.5137543    1.5486052 0.0018564773 -0.022245393    4.5341432 
+   42000    20.078259    1.0164171    23.744123    6.0877761    4.5636586    1.5241175  0.002000214 -0.022698249    4.5843566 
+   42010    20.430977    1.0134455    23.685454    6.0744169    4.5547554    1.5196615 0.0018993871 -0.022717791    4.5755738 
+   42020    20.447111    1.0343107     23.87162    6.0651511    4.5142022     1.550949 0.0018604182 -0.022527703    4.5348695 
+   42030    20.496811   0.99747484    23.502021    6.0516234    4.5559099    1.4957135 0.0018373631 -0.022368599    4.5764411 
+   42040    20.390482     1.009111    23.721612    6.0478328    4.5346709    1.5131619 0.0017848492 -0.022434553    4.5553206 
+   42050     20.42002    1.0180135    23.806633    6.0544066    4.5278954    1.5265112 0.0018600528 -0.022902465    4.5489378 
+   42060    20.225839     1.046682    23.679598    6.0878726    4.5183729    1.5694997 0.0019057378 -0.022823031    4.5392902 
+   42070    20.137119    1.0306126    23.629105    6.1018076     4.556404    1.5454035 0.0020077683 -0.022856573    4.5772528 
+   42080    20.247423    1.0247605    23.844895    6.1017374     4.565109    1.5366284 0.0020039243 -0.022699736    4.5858048 
+   42090    20.270489    1.0414095    23.823507    6.1130231    4.5514297    1.5615935  0.002052064 -0.023287837    4.5726654 
+   42100    20.142207    1.0361084    24.006255    6.1011808    4.5475363    1.5536445 0.0019964511  -0.02299159    4.5685314 
+   42110    19.985056    1.0428429    23.878828    6.1140866    4.5503436     1.563743 0.0018715728 -0.022147069    4.5706191 
+   42120    20.399684    1.0329783      23.3951    6.1035409      4.55459    1.5489509  0.001875885 -0.021682097    4.5743962 
+   42130    20.285401    1.0473285    23.723938    6.1288784    4.5584093    1.5704691 0.0020549679 -0.022224408    4.5785787 
+   42140    20.425803    1.0338904    23.775633    6.1208014    4.5704827    1.5503187 0.0020432991 -0.022278258    4.5907176 
+   42150    20.465448     1.031002    23.758213    6.1035345    4.5575469    1.5459875 0.0017789152 -0.020467199    4.5762352 
+   42160    20.193339    1.0346741    23.766171    6.0903425    4.5388487    1.5514938 0.0014575756 -0.019594501    4.5569856 
+   42170    19.858734    1.0155814    24.013576    6.0755166    4.5526523    1.5228643 0.0014305746 -0.018969057    4.5701908 
+   42180    20.153909    1.0163025      23.6138    6.0514993    4.5275537    1.5239457 0.0014083952 -0.019291103    4.5454364 
+   42190    20.324047   0.99765827    23.668275    6.0035147    4.5075262    1.4959886 0.0013598525 -0.019400349    4.5255667 
+   42200     20.16865   0.98341014    23.746218    5.9902449    4.5156214    1.4746235 0.0013417965 -0.019308547    4.5335881 
+   42210    20.324163    0.9715759    23.627311    5.9867997    4.5299217    1.4568781 0.0014999253 -0.019848756    4.5482705 
+   42220    20.197454    1.0054055     23.99475    6.0283904    4.5207849    1.5076055 0.0015714005 -0.019917524     4.539131 
+   42230    20.056187     1.005903    23.762749    6.0358955     4.527544    1.5083515 0.0017138072 -0.020648035    4.5464782 
+   42240    20.069094    1.0026429     24.00654    6.0415077    4.5380448     1.503463 0.0018794693 -0.021334911    4.5575002 
+   42250    20.281323    1.0136769    23.904374    6.0378292    4.5178207    1.5200085 0.0018209477 -0.021223417    4.5372232 
+   42260    20.119719    1.0157948    23.676287    6.0265953     4.503411    1.5231843 0.0019424022 -0.022422349    4.5238909 
+   42270    19.935856    1.0118734    23.753516    6.0489675    4.5316632    1.5173042 0.0018970093 -0.022259745     4.552026 
+   42280    20.194111     1.000306    23.717048    6.0324853    4.5325266    1.4999588 0.0016054793 -0.021465137    4.5523862 
+   42290    19.882568    1.0038226    23.582185    6.0373672    4.5321353    1.5052319 0.0016535551 -0.021630899    4.5521126 
+   42300    19.904539   0.99468123    23.746759    6.0396344    4.5481099    1.4915245 0.0016818215 -0.021513721    4.5679418 
+   42310    20.272093    0.9977326    23.599982    6.0342679    4.5381679       1.4961 0.0016392929 -0.021720039    4.5582486 
+   42320    20.290892    1.0090117    23.969986    6.0477332    4.5347201    1.5130131 0.0017420418 -0.022316121    4.5552942 
+   42330    20.155126   0.98762946    23.513068    6.0334107    4.5524604    1.4809504 0.0017393352 -0.022372874    4.5730939 
+   42340    19.643759    1.0184312    23.822399    6.0339662    4.5068286    1.5271376 0.0017287617 -0.022110963    4.5272108 
+   42350    20.103079    0.9935741    23.449465    6.0251267    4.5352623    1.4898644 0.0017247806 -0.022307017    4.5558446 
+   42360    20.292008    1.0005434    23.724797    6.0562541    4.5559392    1.5003149 0.0015872459 -0.021419417    4.5757714 
+   42370    20.171649   0.99979669    23.427879    6.0440636    4.5448685    1.4991951 0.0014801959 -0.020380934    4.5637692 
+   42380    20.221874    1.0094749    23.821367    6.0318874    4.5181798    1.5137076 0.0014562243 -0.020092172    4.5368158 
+   42390    20.411332   0.98989869    23.820332    6.0193296    4.5349765    1.4843531 0.0013171445 -0.018933358    4.5525927 
+   42400    20.466789   0.99325722    23.567687    6.0122754    4.5228862    1.4893892 0.0013068471 -0.018923066    4.5405025 
+   42410    19.996467    0.9975796    23.932974    6.0513838    4.5555132    1.4958706 0.0013753993 -0.020199219     4.574337 
+   42420    20.326928   0.99935872    23.556549    6.0491626    4.5506242    1.4985384 0.0016629154 -0.021688795    4.5706501 
+   42430    20.388669   0.99874289    23.933131    6.0338764    4.5362614     1.497615 0.0018431127  -0.02257653    4.5569948 
+   42440    20.216385    1.0101421       23.726    6.0318884    4.5171804     1.514708 0.0018998496 -0.022920241    4.5382008 
+   42450    20.112082    1.0043927    23.694941    6.0212753    4.5151885    1.5060868 0.0018412431 -0.022747505    4.5360948 
+   42460    20.148382   0.99449585    23.527373    6.0042944    4.5130479    1.4912465 0.0016841179  -0.02237529    4.5337391 
+   42470    20.334179    1.0051294    23.939019    6.0110115      4.50382    1.5071915 0.0016508395 -0.021699377    4.5238686 
+   42480    20.251931    1.0164306    23.873561    6.0398382    4.5157006    1.5241376 0.0016065769 -0.020924664    4.5350187 
+   42490    19.891331    1.0207266    23.577546    6.0590807    4.5285012    1.5305795 0.0015258448 -0.020903423    4.5478788 
+   42500     20.37353    1.0347884    23.711877    6.0779838    4.5263186    1.5516652 0.0016165896 -0.021271337    4.5459733 
+   42510    20.228403    1.0160981    23.776799    6.0532951    4.5296561    1.5236391 0.0016521709 -0.021638187    4.5496421 
+   42520    20.252191    1.0335815    24.049843    6.0768258    4.5269703    1.5498555 0.0016065408 -0.021316406    4.5466801 
+   42530    20.003227    1.0237041    23.549852    6.0832507    4.5482064    1.5350443 0.0014589285 -0.020889038    4.5676365 
+   42540    20.239776    1.0200785    23.965168    6.0567991    4.5271914    1.5296077 0.0016210259 -0.021755637     4.547326 
+   42550    20.368847    1.0041581    23.334278    6.0501277    4.5443926    1.5057351 0.0018576335 -0.022881886    4.5654169 
+   42560    20.154929    1.0068132    23.565371    6.0269014     4.517185    1.5097163 0.0019833415 -0.023503146    4.5387048 
+   42570    20.293801    1.0087082    23.657102    6.0245376    4.5119797    1.5125579 0.0020573141 -0.023968824    4.5338912 
+   42580    20.123537   0.99690094     23.56164    6.0242826    4.5294297     1.494853 0.0020410305 -0.023818197    4.5512068 
+   42590    19.918875    1.0196547    23.784623    6.0453888    4.5164166    1.5289722 0.0021555698 -0.024236628    4.5384977 
+   42600    20.228092    1.0056577     23.84162    6.0423563    4.5343726    1.5079837 0.0023634953 -0.025120223    4.5571293 
+   42610    20.169069    1.0082439    23.620746    6.0322838    4.5204222    1.5118617 0.0025193324 -0.025666113    4.5435689 
+   42620    20.439626    1.0098318    23.745189    6.0231725    4.5089297    1.5142427 0.0025483341 -0.025526931    4.5319083 
+   42630    20.593248   0.99839609    23.644539    6.0346423    4.5375474    1.4970949 0.0024073693 -0.024893005     4.560033 
+   42640    20.330123    0.9956415     23.60844    6.0371552    4.5441907    1.4929644 0.0021752883 -0.024223147    4.5662386 
+   42650    20.355194    1.0240149     23.73455    6.0584421    4.5229317    1.5355104 0.0020994835 -0.023733673    4.5445659 
+   42660     20.03074    1.0094063    23.730758     6.050519    4.5369143    1.5136047 0.0021606114 -0.023748446    4.5585021 
+   42670    20.141346    1.0227477    23.912682    6.0752439    4.5416336    1.5336102 0.0020651691 -0.023733002    4.5633015 
+   42680    20.028386   0.99895849    23.875453    6.0516273     4.553689    1.4979383 0.0019244396 -0.023148432     4.574913 
+   42690    20.265745    1.0112066    23.598693    6.0191675    4.5028632    1.5163044  0.001936041 -0.022873128    4.5238002 
+   42700    20.028722   0.97519642    23.670353    6.0030027    4.5406957     1.462307 0.0017462509 -0.022199481    4.5611489 
+   42710    20.022137    1.0131597    23.980393    6.0651482    4.5459152     1.519233 0.0016434605 -0.021749693    4.5660214 
+   42720    20.282987    1.0227798    23.621774    6.0404758    4.5068174    1.5336583 0.0018105222 -0.022501525    4.5275084 
+   42730    20.267022    1.0209091    23.753999    6.0524028    4.5215497    1.5308531 0.0017638478 -0.022286764    4.5420726 
+   42740    20.108094     1.009068    23.763187    6.0502145    4.5371171    1.5130974 0.0018544552 -0.022666025    4.5579287 
+   42750    19.665026    1.0341948    23.937879    6.0758781    4.5251029    1.5507752 0.0018885366 -0.022381554     4.545596 
+   42760    19.993129    1.0208683    23.890237    6.0836547    4.5528627     1.530792 0.0017894109 -0.021803666    4.5728769 
+   42770    19.941096    1.0091532    23.705443    6.0652447    4.5520194    1.5132252 0.0016309582 -0.021205976    4.5715945 
+   42780    20.077282    1.0285359    23.846875    6.0681162    4.5258267    1.5422895 0.0016984572 -0.021816098    4.5459443 
+   42790    20.457831    1.0085399    23.633055    6.0624643    4.5501587    1.5123056  0.001795452 -0.022428337    4.5707916 
+   42800    20.192534    1.0129511    23.784324    6.0422548    4.5233346    1.5189202 0.0017578909 -0.022201085    4.5437778 
+   42810    19.892638    1.0202876    23.794671     6.045946    4.5160248    1.5299212 0.0016047389  -0.02165436    4.5360745 
+   42820    19.906216    1.0224583    23.972789    6.0825997    4.5494235    1.5331762 0.0016340302 -0.021645858    4.5694353 
+   42830    20.242748    1.0203841    23.641533    6.0409119     4.510846    1.5300659 0.0014143887 -0.020484336     4.529916 
+   42840    20.128622   0.99829484    23.678987    6.0383188    4.5413757    1.4969431 0.0014585344 -0.020649362    4.5605665 
+   42850    20.175731    1.0145751    23.914408     6.044858    4.5235026    1.5213554 0.0013543141 -0.020470149    4.5426184 
+   42860    20.262876   0.99811522    23.436633    6.0468843    4.5502106    1.4966738 0.0012910314 -0.020184147    4.5691037 
+   42870     20.25746   0.99581799    24.038387    6.0427853    4.5495563    1.4932291 0.0013904816 -0.020141424    4.5683072 
+   42880    20.104195    1.0005111      23.7164    6.0308244     4.530558    1.5002664 0.0011762916 -0.018729097    4.5481108 
+   42890    20.073654     1.001362    23.569457    6.0366245    4.5350822    1.5015423 0.0013094253 -0.019382061    4.5531549 
+   42900    20.311957   0.97969626    23.671619    6.0284096     4.559355    1.4690545 0.0013745463 -0.019509158    4.5774896 
+   42910     20.26266    1.0256198    23.867745    6.0563571    4.5184401    1.5379169 0.0015602823 -0.019921278    4.5368011 
+   42920    20.270648    1.0148107    23.415405    6.0722265    4.5505178    1.5217087 0.0017336521  -0.02125863    4.5700428 
+   42930    20.166176    1.0232889    23.810287    6.0821224    4.5477006    1.5344217 0.0019732352 -0.022358327    4.5680857 
+   42940    19.915453    1.0042187    23.786523    6.0585532    4.5527273    1.5058259 0.0019516365 -0.022303875    4.5730796 
+   42950    19.903808    1.0050705    23.696952    6.0455292     4.538426    1.5071033 0.0017875324 -0.021967063    4.5586055 
+   42960    20.139095    1.0079457    23.673703     6.051608    4.5401935    1.5114145 0.0017196561 -0.021991359    4.5604652 
+   42970    20.131848   0.98855259    23.872717    5.9950245    4.5126899    1.4823346 0.0015065569 -0.021054598    4.5322379 
+   42980    20.196913   0.99914906     23.41247    6.0200522    4.5218282     1.498224  0.001231047 -0.020129396    4.5407266 
+   42990    20.160366    1.0000046    23.541287    6.0186136    4.5191067    1.4995069 0.0015236519 -0.020791344    4.5383744 
+   43000    20.288707    1.0270112    23.673965    6.0509095    4.5109062    1.5400033 0.0018037694 -0.021995555     4.531098 
+   43010    20.365155   0.99835734     23.81694    6.0550038     4.557967    1.4970368 0.0018654218 -0.022624125    4.5787257 
+   43020    20.438574    1.0049173    23.792802    6.0374916    4.5306181    1.5068735 0.0019378577 -0.023052232    4.5517325 
+   43030    20.408557    1.0080957    23.721355    6.0233433    4.5117038    1.5116395 0.0018921667  -0.02265626    4.5324679 
+   43040    20.368064    1.0015679    24.040839    6.0304302    4.5285792     1.501851 0.0016673674    -0.021912    4.5488238 
+   43050    20.482483   0.98729758     23.59613    6.0283245    4.5478717    1.4804527 0.0014609697 -0.021307203     4.567718 
+   43060    20.326838    1.0185183    23.681197    6.0660254    4.5387571    1.5272683 0.0016179892 -0.021847571    4.5589867 
+   43070    20.113219    1.0076044    23.355036    6.0305015    4.5195987    1.5109028 0.0017966207 -0.022775938     4.540578 
+   43080    20.401336    1.0045343    23.765197    6.0223721    4.5160729    1.5062992 0.0018923029 -0.023036308    4.5372169 
+   43090    20.430592   0.98003253    23.652424    6.0166341    4.5470753    1.4695588 0.0019838391 -0.023518876    4.5686104 
+   43100    20.441024    0.9998826     23.63724    6.0060202    4.5066962     1.499324  0.001961484 -0.023529203    4.5282639 
+   43110    20.300665   0.99738951    23.552704    6.0039254    4.5083398    1.4955856 0.0019331327  -0.02320226    4.5296089 
+   43120    20.136749   0.99282536    23.571664    6.0262282    4.5374865    1.4887416 0.0018248739 -0.022819779    4.5584814 
+   43130    20.072861   0.99336391    23.710374    6.0148479    4.5252987    1.4895492 0.0018584692 -0.022796431    4.5462367 
+   43140    20.387242    1.0070559    24.036287    6.0457206    4.5356404    1.5100803 0.0017918777 -0.022295514     4.556144 
+   43150    20.316916    1.0073136    23.768638    6.0402375    4.5297707    1.5104668 0.0018866564 -0.022123876     4.550008 
+   43160    20.137834    1.0142148    23.745829     6.041351     4.520536    1.5208151 0.0018391058 -0.021802875    4.5404997 
+   43170    20.177991    1.0100541     23.98077    6.0443601     4.529784    1.5145761 0.0019686303 -0.022585925    4.5504013 
+   43180    19.918257    1.0310715    23.774865    6.0835482    4.5374565    1.5460917 0.0020712163 -0.023182028    4.5585674 
+   43190    19.941905    1.0263738    23.942755    6.0869015    4.5478539    1.5390476 0.0020701614 -0.023319519    4.5691033 
+   43200    20.328361    1.0215672    23.689204    6.0555362    4.5236961      1.53184 0.0022682153 -0.024258142    4.5456861 
+   43210    20.436722    1.0102271    23.606372    6.0287804    4.5139448    1.5148355 0.0023667071 -0.024966501    4.5365446 
+   43220    20.468657    1.0108211    23.328219     6.052781    4.5370547    1.5157263 0.0022804413 -0.024477336    4.5592516 
+   43230    20.285147    1.0155006    23.523313    6.0423223    4.5195792    1.5227431 0.0021089549 -0.024137614    4.5416079 
+   43240    20.346789    1.0022448    23.933441     6.060368    4.5575019    1.5028661  0.001867117 -0.022896907    4.5785317 
+   43250    19.945527    1.0335933    23.558479    6.0809588    4.5310857    1.5498731 0.0018995929 -0.022897397    4.5520835 
+   43260    20.252839    1.0379694    24.037355    6.0929358    4.5365007    1.5564351 0.0019054627 -0.023008994    4.5576043 
+   43270    20.204069    1.0244726    23.779408    6.0676667    4.5314699    1.5361967  0.001673577  -0.02212454    4.5519209 
+   43280     20.24754   0.99791271    23.520614     6.042081    4.5457109    1.4963701 0.0014499908 -0.020866783    4.5651277 
+   43290    20.154972   0.99975703    23.919102    6.0463342    4.5471985    1.4991357 0.0014489213 -0.021042219    4.5667918 
+   43300    20.027671    1.0022614    23.699409    6.0503234    4.5474325    1.5028909 0.0015194969 -0.021563506    4.5674765 
+   43310    20.197899    1.0280662    23.678603    6.0654549    4.5238696    1.5415852  0.001654473 -0.021922268    4.5441374 
+   43320     20.22415    1.0057813    23.794178    6.0601658    4.5519967    1.5081691 0.0015963704 -0.021402497    4.5718028 
+   43330    19.993142   0.99805224    23.887081    6.0400118    4.5434324    1.4965793 0.0017031575 -0.021668687     4.563398 
+   43340    20.038139   0.99389014    23.575296    6.0206936    4.5303554    1.4903383 0.0018036013 -0.022296074    4.5508478 
+   43350    19.937502    1.0061044    23.801405    6.0048764    4.4962228    1.5086536 0.0016420655 -0.021313315     4.515894 
+   43360    20.196292    1.0075795    23.886243    6.0368999    4.5260345    1.5108655  0.001721408 -0.021639987    4.5459531 
+   43370    20.453458   0.99514867    23.928122    6.0289985    4.5367731    1.4922254 0.0017708086  -0.02224781    4.5572501 
+   43380    20.430538    1.0027377    23.723963    6.0256692     4.522064    1.5036052 0.0018531487 -0.022858765    4.5430696 
+   43390    20.491184    1.0092088    23.785787    6.0425328    4.5292242    1.5133086 0.0018822138 -0.023066754    4.5504088 
+   43400    20.480988    1.0181356     23.82495    6.0678663     4.541172    1.5266943 0.0019596897 -0.023514805    4.5627271 
+   43410    20.128298    1.0111896    23.834073    6.0648933    4.5486145    1.5162788 0.0018632884 -0.022720198    4.5694714 
+   43420    20.101895    1.0190946    23.778834    6.0690043    4.5408719    1.5281323 0.0018636617 -0.022579284    4.5615876 
+   43430    20.208137   0.99394287    23.669275    6.0417421    4.5513247    1.4904173 0.0020354328 -0.023275797    4.5725651 
+   43440    19.791087    1.0053416    23.617741    6.0455958    4.5380861    1.5075097 0.0020764618 -0.023421625    4.5594313 
+   43450    19.940539     1.014485    23.825494    6.0516699    4.5304496    1.5212203 0.0019596366 -0.022536694    4.5510267 
+   43460    20.433257   0.98267203    23.685654    6.0158055    4.5422888    1.4735167 0.0017794923  -0.02178992    4.5622992 
+   43470    20.370185    1.0035737    23.666145    6.0290589    4.5242002    1.5048587 0.0016241749 -0.020868556    4.5434446 
+   43480    20.430219   0.99066437    23.569086    6.0019487    4.5164474    1.4855012 0.0015977563 -0.020860314      4.53571 
+   43490    20.265303   0.97885249    23.654332     5.987309    4.5195197    1.4677893  0.001493703 -0.020486258    4.5385123 
+   43500     20.42999   0.98084822    23.519017     6.003503    4.5327211    1.4707819 0.0017338381 -0.021405314    4.5523926 
+   43510    20.340586   0.95716073    23.753632    5.9566543    4.5213917    1.4352625 0.0016563058 -0.021058764    4.5407942 
+   43520    19.969464    0.9818301    23.656969    5.9930016    4.5207473    1.4722542 0.0016544311 -0.021423921    4.5405168 
+   43530    20.176011   0.99800785     23.58331    6.0322914    4.5357787    1.4965128 0.0017763357 -0.022120337    4.5561227 
+   43540    20.398662    1.0048897    23.488328    6.0400472    4.5332151    1.5068321 0.0019204125 -0.023172257     4.554467 
+   43550     20.43867    1.0099249    23.934509    6.0374913     4.523109    1.5143823 0.0019342953 -0.023549392    4.5447241 
+   43560    20.256702   0.99646488    23.891911    6.0153711     4.521172    1.4941991 0.0022236592 -0.024935841    4.5438842 
+   43570    20.141155    1.0037078    23.797474    6.0282905    4.5232307    1.5050598 0.0024758651 -0.026051554    4.5468064 
+   43580    20.443591    1.0176115    23.604098    6.0438519    4.5179434    1.5259084 0.0024467394  -0.02574008    4.5412368 
+   43590    20.255229     1.004936    23.637065    6.0184647    4.5115632    1.5069015 0.0022599072 -0.024389545    4.5336929 
+   43600    20.342228   0.98974947    23.845164    6.0039438    4.5198144    1.4841293 0.0021337666 -0.023858302     4.541539 
+   43610    20.064676   0.98377235    24.048358     5.995303    4.5201364    1.4751666 0.0019950652 -0.023736463    4.5418778 
+   43620    20.116942   0.98754851    23.627568    5.9998307    4.5190017     1.480829 0.0019639716 -0.023716329    4.5407541 
+   43630    20.238674   0.99581128    23.857206    6.0246953    4.5314763     1.493219 0.0020225837 -0.023757226    4.5532109 
+   43640    20.145801   0.99400091    23.405437    6.0128927    4.5223884    1.4905044 0.0019462574 -0.023531112    4.5439732 
+   43650     20.05332    1.0010708    23.609783    6.0412868    4.5401812    1.5011056 0.0017110583 -0.022343439    4.5608136 
+   43660    20.143764    1.0082375    23.991417    6.0353164    4.5234642    1.5118522 0.0016511314 -0.021601057    4.5434142 
+   43670      20.2264    1.0151833    23.470124    6.0364319    4.5141645    1.5222674 0.0017359722 -0.021821165    4.5342497 
+   43680    20.289748    1.0048648     23.82923    6.0357151    4.5289203    1.5067948 0.0016339113 -0.021332239    4.5486186 
+   43690    20.465176    1.0188958    23.832389    6.0539232    4.5260889    1.5278342 0.0013748742 -0.020453732    4.5451678 
+   43700    20.503218    1.0111939    23.726528    6.0500433    4.5337582    1.5162852 0.0014162064 -0.020650687    4.5529926 
+   43710    20.358354   0.99763946    23.590519    6.0279311    4.5319708    1.4959604 0.0015505857 -0.021180531    4.5516007 
+   43720    20.194601    1.0101068    23.636444    6.0436453    4.5289902    1.5146551 0.0017049168 -0.021849409    4.5491347 
+   43730    20.126198    1.0225611     23.75999    6.0388775    4.5055471    1.5333304 0.0018173886 -0.022119746    4.5258495 
+   43740    20.202431   0.99790777    23.618157    6.0362631    4.5399004    1.4963627 0.0018418531 -0.022333725    4.5603922 
+   43750    19.843584    1.0320197    23.683074    6.0889507    4.5414371    1.5475136 0.0017252076 -0.022201931    4.5619138 
+   43760    19.924037    1.0196313    23.732511    6.0728473    4.5439102    1.5289371 0.0017492333 -0.022510394    4.5646713 
+   43770    20.373656    1.0153077    23.785286    6.0475749     4.525121     1.522454  0.001855871 -0.022823662    4.5460888 
+   43780    20.485339    1.0141995    23.876736     6.044944    4.5241518    1.5207922 0.0017859578 -0.022325391    4.5446913 
+   43790    20.198251    1.0036622    23.765278    6.0216968    4.5167053    1.5049914 0.0017698372 -0.022525698    4.5374612 
+   43800     20.32016    1.0062342    23.471199    6.0405306    4.5316824    1.5088482 0.0017899685 -0.022618956    4.5525113 
+   43810    20.260845    1.0034335    23.940266    6.0351986    4.5305501    1.5046486 0.0017423695 -0.022569064    4.5513767 
+   43820    20.176566    1.0150457    23.867746    6.0268108    4.5047499     1.522061 0.0017051553 -0.022465917    4.5255107 
+   43830    20.297107   0.99973288     23.32723     6.033912    4.5348126    1.4990995 0.0016890254 -0.022083008    4.5552066 
+   43840    20.065714    1.0190973    23.697823    6.0723009    4.5441645    1.5281364 0.0018589201 -0.022332067    4.5646376 
+   43850    20.317976    1.0230894    23.822577    6.0609825    4.5268599    1.5341226 0.0018286556 -0.022179245    4.5472105 
+   43860      20.3763    1.0240914     23.64379    6.0714638    4.5358388     1.535625 0.0017089286 -0.021454251    4.5555841 
+   43870    20.280215    1.0182882    23.525989    6.0787578    4.5518346    1.5269232 0.0015963394   -0.0208681    4.5711063 
+   43880    20.304768    1.0419257    23.929659    6.0848781    4.5225105    1.5623676 0.0016760596 -0.021360605    4.5421951 
+   43890    20.051761    1.0237753    23.749695    6.0568126    4.5216615    1.5351511 0.0017482431 -0.022070688     4.541984 
+   43900    20.332003    1.0038951    23.826434    6.0533625    4.5480218    1.5053407 0.0020164135  -0.02313856     4.569144 
+   43910    20.296564   0.99180857    23.792625     6.031001     4.543784    1.4872169 0.0020236063  -0.02297015    4.5647306 
+   43920    20.436508    0.9825291    23.723307    6.0199019    4.5465996    1.4733024 0.0017405783 -0.021495433    4.5663544 
+   43930    19.992095   0.99281696    23.698283    6.0110233    4.5222943     1.488729  0.001527926 -0.020727228    4.5414936 
+   43940    20.206289    1.0008333    23.770931    6.0014541    4.5007045    1.5007496 0.0016106646 -0.021143383    4.5202372 
+   43950    20.421348    1.0183566    23.727861    6.0433291    4.5163033    1.5270258 0.0016765746 -0.021575052    4.5362018 
+   43960    20.416698    1.0165894    23.638554    6.0594069    4.5350311    1.5243758 0.0016459262 -0.021847737    4.5552329 
+   43970    20.231932    1.0189834    23.909831    6.0541297    4.5261641    1.5279657 0.0016805968  -0.02200069    4.5464842 
+   43980    20.190267    1.0068703     23.68246    6.0441972    4.5343952     1.509802 0.0016892522 -0.021746122    4.5544521 
+   43990    20.173061    1.0017495     23.57848    6.0396861    4.5375627    1.5021234 0.0017565536 -0.021861047    4.5576672 
+   44000    20.269711     1.007641    23.698751    6.0472317     4.536274    1.5109577 0.0018491607 -0.022243311    4.5566681 
+   44010    20.533816    1.0009915    23.616191    6.0317328    4.5307461    1.5009867 0.0019259007 -0.022181158    4.5510013 
+   44020    19.903781    1.0011476    23.821539    6.0565279    4.5553071    1.5012208 0.0019331439 -0.021790116    4.5751641 
+   44030    20.333325    1.0090313    23.821179    6.0752128    4.5621704    1.5130424 0.0019908928 -0.022032485     4.582212 
+   44040    20.308405    1.0311406    23.715946    6.0634916    4.5172963    1.5461953 0.0019043166 -0.021704766    4.5370967 
+   44050    20.344794    1.0179223    23.639845    6.0645594    4.5381849    1.5263745 0.0018032407 -0.021890054    4.5582717 
+   44060    19.900844    1.0099965    23.557616    6.0574547    4.5429649    1.5144898 0.0017689317 -0.021902514    4.5630985 
+   44070    20.079347    1.0273768    23.459193    6.0359071    4.4953556    1.5405515 0.0017352367 -0.021754725    4.5153751 
+   44080    19.841507   0.99746465    23.435802    6.0108742     4.515176    1.4956982 0.0019379059 -0.022242122    4.5354802 
+   44090    20.275355   0.99909721    23.657442    6.0090535    4.5109073    1.4981463 0.0017729118  -0.02149398    4.5306283 
+   44100    20.523178    1.0112408    23.761595    6.0192022    4.5028467    1.5163555 0.0017257722  -0.02178128    4.5229022 
+   44110    20.393908     1.020024    23.886476    6.0425043    4.5129784     1.529526 0.0016549719 -0.021574241    4.5328976 
+   44120    20.142884    1.0055308    23.766583    6.0141531    4.5063597    1.5077934 0.0017661915  -0.02233986    4.5269334 
+   44130    20.265626   0.99560691     23.62658    6.0373663    4.5444537    1.4929126 0.0020121488 -0.023644876    4.5660865 
+   44140    20.153364    1.0045604    23.741817    6.0176223     4.511284    1.5063383 0.0020290467 -0.023377716    4.5326327 
+   44150    20.315304     1.001566    23.773731    6.0329948    4.5311466    1.5018482 0.0018647137 -0.022718552    4.5520004 
+   44160    20.247544    1.0188804    23.830624    6.0447928    4.5169816    1.5278112  0.001736973 -0.022533169    4.5377778 
+   44170    20.133906    1.0137771    24.088727    6.0377109    4.5175522    1.5201587 0.0017060296 -0.022449887     4.538296 
+   44180    20.366741    1.0065558    23.918736    6.0402172    4.5308868    1.5093303 0.0016761868 -0.022329685    4.5515403 
+   44190    20.281684    1.0055635    23.775561    6.0457494    4.5379069    1.5078425 0.0017066509  -0.02233219    4.5585324 
+   44200    20.330536     1.006739    23.310534    6.0554066    4.5458014    1.5096052 0.0015842481  -0.02156383     4.565781 
+   44210    20.222378    1.0266967    23.725172     6.072624    4.5330923    1.5395317 0.0016248181 -0.021532752    4.5530002 
+   44220    20.143024    1.0150814     23.41154    6.0748339    4.5527194    1.5221145 0.0015605158  -0.02127538    4.5724342 
+   44230    20.090926    1.0207063    23.863489    6.0578931    4.5273441    1.5305491 0.0015471646 -0.021345173    4.5471421 
+   44240    20.317618     1.015666    23.631174    6.0459249    4.5229337    1.5229912 0.0017414066 -0.021837542    4.5430299 
+   44250     20.26754   0.99995617    23.729951    6.0347863     4.535352    1.4994343 0.0017700002 -0.021924563    4.5555066 
+   44260    20.246039    1.0076813    23.716708    6.0449081    4.5338899    1.5110181 0.0016932138 -0.021801525    4.5539983 
+   44270    19.995841    1.0171907    23.681667    6.0518178    4.5265404    1.5252774 0.0018137829 -0.022145643    4.5468723 
+   44280    20.188443   0.99518322    23.577837    6.0418596    4.5495824    1.4922772 0.0017193895 -0.021768695    4.5696317 
+   44290       20.161    1.0047672    23.863593    6.0372986    4.5306502    1.5066484 0.0018012325 -0.022392567    4.5512415 
+   44300    20.322606   0.99900094     23.71177    6.0263605    4.5283585    1.4980019 0.0019362011 -0.023335989    4.5497583 
+   44310    20.426437    1.0173469    23.816115    6.0527141    4.5272024    1.5255117 0.0021275511 -0.024010056    4.5490849 
+   44320    19.895288    1.0032787    23.582924     6.039612    4.5351956    1.5044164 0.0021529724 -0.024171277    4.5572139 
+   44330    20.048339   0.99953064    23.589532    6.0618074    4.5630112    1.4987962  0.001805384  -0.02255532    4.5837611 
+   44340    20.306671    1.0148019     23.64594    6.0503664     4.528671    1.5216954 0.0016177455 -0.021002856    4.5480561 
+   44350    20.377291    1.0070023    23.744957    6.0416344    4.5316344    1.5099999 0.0016715036 -0.020729945    4.5506929 
+   44360    20.171572    1.0156732    23.514161      6.06579     4.542788     1.523002 0.0018521177  -0.02169278    4.5626286 
+   44370    20.233332    1.0146442    23.851873    6.0683279     4.546869    1.5214589 0.0018861462 -0.022465824    4.5674487 
+   44380     20.05068    1.0236564    23.934328    6.0562318     4.521259    1.5349728 0.0020006305 -0.023382862    4.5426413 
+   44390    20.038576    1.0198717    23.887324    6.0663738    4.5370763    1.5292975 0.0019795078 -0.023262358    4.5583591 
+   44400    20.011991    1.0291379     23.90358    6.0805228    4.5373305    1.5431923 0.0021766374 -0.024102129     4.559256 
+   44410    20.108092    1.0315125     23.99148    6.0838305    4.5370775     1.546753 0.0021320377  -0.02401651     4.558962 
+   44420    20.241004    1.0219294    23.723293     6.081109    4.5487258    1.5323832 0.0021768232 -0.023679856    4.5702288 
+   44430    20.370307    1.0247324    23.596941    6.0712905    4.5347042    1.5365863 0.0021636268 -0.023598104    4.5561387 
+   44440    20.563631    1.0207837    23.735903    6.0702765    4.5396113    1.5306652 0.0020878986 -0.023125861    4.5606493 
+   44450    20.357875     1.022078    23.820687    6.0629193    4.5303134    1.5326059 0.0017783797 -0.021828564    4.5503635 
+   44460    20.091141    1.0206986     23.82447    6.0562161    4.5256785    1.5305375 0.0017833821 -0.021608478    4.5455036 
+   44470    20.341536    1.0052063    23.783239    6.0221751    4.5148682    1.5073069 0.0017668915 -0.021772196    4.5348735 
+   44480    20.241477    1.0010654    23.579888    6.0572637    4.5561661    1.5010975 0.0018060724  -0.02192486    4.5762849 
+   44490    20.403272   0.98867357    23.438824    6.0269623    4.5444463     1.482516 0.0017159222  -0.02198246    4.5647128 
+   44500    20.294331   0.98858195    23.441215    6.0039786       4.5216    1.4823786 0.0016309606 -0.021067623    4.5410367 
+   44510    20.291634   0.98708601    23.488846    5.9929661    4.5128307    1.4801355 0.0014965047 -0.020478317    4.5318125 
+   44520    20.225597   0.98532414    23.522337    6.0001149    4.5226214    1.4774935 0.0013267142 -0.020227154    4.5415218 
+   44530    20.282479   0.99354414    23.786652    5.9935502    4.5037308    1.4898194 0.0012001074 -0.019350456    4.5218811 
+   44540    20.558216   0.98884605    23.654727    6.0010314    4.5182567    1.4827747 0.0010940332 -0.018419854    4.5355826 
+   44550    20.261652    1.0034766    23.641067    6.0337726    4.5290594    1.5047132 0.0010518547 -0.018171036    4.5461786 
+   44560    20.081148    1.0062802    23.643713    6.0431918    4.5342746    1.5089172 0.00087616567 -0.017009923    4.5504084 
+   44570    20.445567   0.99094454    23.765768    6.0212657    4.5353443    1.4859213 0.00091632761 -0.017291514    4.5517195 
+   44580    20.330573   0.99507448    23.387857    5.9956966    4.5035824    1.4921142 0.00099808819 -0.017702132    4.5202864 
+   44590    20.393624   0.97778729    23.454077    6.0018143    4.5356223     1.466192 0.0011756686 -0.018665042    4.5531117 
+   44600    20.192534    1.0037424    23.716485    6.0176729    4.5125611    1.5051118 0.0014515813 -0.020062845    4.5311724 
+   44610    20.351636    1.0059347    23.666193    6.0366071    4.5282081     1.508399 0.0017955185 -0.021956724    4.5483693 
+   44620    20.222272    1.0014131    23.840127    6.0284167    4.5267978     1.501619 0.0019925474 -0.022716984    4.5475222 
+   44630    20.224496   0.99399245    23.640809    6.0093804    4.5188887    1.4904917 0.0019390274 -0.022860019    4.5398097 
+   44640    20.220994    1.0053876    23.834175    6.0483544    4.5407758    1.5075786 0.0018241393 -0.022251995    4.5612036 
+   44650    20.277031     1.011526     23.68591    6.0379904    4.5212072    1.5167832 0.0016605736 -0.021527352     4.541074 
+   44660    20.161214    1.0012925    23.808282    6.0516834    4.5502453    1.5014381 0.0014317671 -0.020286085    4.5690996 
+   44670    20.312883    1.0160101    23.909027     6.043772    4.5202649    1.5235071 0.0014992474 -0.020491089    4.5392567 
+   44680    20.281946   0.99004596    23.780131    6.0276516    4.5430776    1.4845739 0.0016009161 -0.021310626    4.5627874 
+   44690    20.084593   0.97994648    23.846931    6.0154766    4.5460469    1.4694297 0.0015990336 -0.021189158     4.565637 
+   44700    20.124946     0.991661    23.900656    6.0216578    4.5346621    1.4869957 0.0015685696  -0.02070791    4.5538014 
+   44710    20.346751    1.0038314    23.835375    6.0242251      4.51898    1.5052451  0.001449142 -0.020726205     4.538257 
+   44720    20.232024   0.98508734     23.67129     6.000872    4.5237335    1.4771385 0.0015611419 -0.020986345    4.5431587 
+   44730     20.41249   0.98460828    23.816576     6.007908    4.5314879    1.4764201 0.0017506483 -0.021399152    4.5511364 
+   44740    19.882214   0.99269458     23.55278    5.9927734    4.5042279    1.4885455 0.0019607526 -0.022177242    4.5244444 
+   44750    20.005644   0.96958851    23.576085     5.987128    4.5332301     1.453898 0.0018939916  -0.02214798     4.553484 
+   44760    20.203462   0.98100376    23.503218    5.9956825    4.5246673    1.4710151 0.0018717937 -0.022252052    4.5450476 
+   44770    19.801704   0.99325971    23.487145    6.0062986    4.5169057    1.4893929 0.0016876468 -0.021095474    4.5363135 
+   44780    20.166193    1.0183611    23.768133    6.0231376    4.4961051    1.5270325 0.0015082176 -0.020556582    4.5151535 
+   44790    20.291828   0.99896779    23.625728    6.0207013    4.5227491    1.4979522 0.0015310545 -0.021032092    4.5422501 
+   44800    19.941594    1.0141028    23.828407    6.0330966    4.5124494    1.5206472 0.0014450316 -0.020536975    4.5315414 
+   44810    20.341428    1.0227223    23.332293    6.0639926    4.5304204    1.5335721 0.0013656934 -0.020015057    4.5490698 
+   44820    20.389596    1.0257533    23.730324    6.0707959    4.5326789     1.538117 0.0013564857 -0.020227312    4.5515497 
+   44830    20.347237    1.0119364    23.775839    6.0793115    4.5619129    1.5173986 0.0015941482 -0.021371861    4.5816906 
+   44840    20.609293    1.0086237    23.776091    6.0432043    4.5307731    1.5124312 0.0017531229 -0.022231509    4.5512514 
+   44850    20.485366    1.0033588    23.610596     6.035677    4.5311405    1.5045366 0.0018313483 -0.022500801    4.5518099 
+   44860    20.276979    1.0094159    23.692743    6.0434881    4.5298689    1.5136192 0.0018688241 -0.022743308    4.5507434 
+   44870    19.634036    1.0206501      23.7963    6.0531314    4.5226667    1.5304648 0.0018825911  -0.02323163    4.5440157 
+   44880    19.755094    1.0169414    23.683737    6.0515879    4.5266843    1.5249036 0.0018786679 -0.023171282    4.5479769 
+   44890    20.166447    1.0133906    23.719769    6.0506657    4.5310865    1.5195792 0.0017798085 -0.022492225    4.5517989 
+   44900    19.845655    1.0112233    23.630273    6.0911224    4.5747931    1.5163293 0.0017493131 -0.022537781    4.5955815 
+   44910    20.523049    1.0177707    23.694971    6.0910311     4.564884    1.5261471 0.0017421213 -0.022326376    4.5854682 
+   44920    20.130721    1.0183857    23.464844    6.0615847    4.5345153    1.5270693 0.0017268943 -0.022533951    4.5553224 
+   44930     20.38988     1.017549    23.730448    6.0668929    4.5410782    1.5258147 0.0019242191 -0.023167911    4.5623219 
+   44940    20.262343     1.017668    23.603749     6.055063    4.5290699    1.5259932 0.0019236612 -0.023129986    4.5502762 
+   44950    20.168422    1.0114955    23.529751    6.0206099    4.5038724    1.5167375 0.0018450137 -0.022717014    4.5247444 
+   44960    20.068757    1.0072751    23.728908    6.0199748    4.5095658     1.510409 0.0016463741 -0.022095442    4.5300149 
+   44970    20.044731   0.99206976    23.792847    6.0443044    4.5566958    1.4876086 0.0015601239 -0.021422419    4.5765581 
+   44980    20.086039    1.0228242    23.617083    6.0518908    4.5181659    1.5337249 0.0014967138  -0.02093586     4.537605 
+   44990     20.35346    1.0216621    23.842436    6.0517604    4.5197781    1.5319823  0.001419752 -0.020256882    4.5386153 
+   45000    20.018753    1.0036837    23.623048    6.0388227     4.533799    1.5050236 0.0014450873 -0.019875686    4.5522296 
+   45010    20.317072    1.0008236    23.764661    6.0448769    4.5441419     1.500735 0.0014500467 -0.020388223    4.5630801 
+   45020    20.333659    1.0055414    23.824938    6.0680493    4.5602401    1.5078093 0.0013882292 -0.020268002    4.5791198 
+   45030    20.147405    1.0151158    23.781715    6.0552615    4.5330954    1.5221661 0.0013241913  -0.01997803    4.5517493 
+   45040    20.099059    1.0187238    23.822245    6.0579483    4.5303719    1.5275764 0.0015274727 -0.020862587     4.549707 
+   45050    20.437718    1.0134865    23.853597    6.0619521     4.542229     1.519723 0.0015130446 -0.020788811    4.5615048 
+   45060    20.515286    1.0119573    23.577379    6.0685969    4.5511669    1.5174299 0.0014562551 -0.020762884    4.5704736 
+   45070    20.460253    1.0247923     23.60085    6.0779662    4.5412901    1.5366761  0.001497932 -0.021235454    4.5610276 
+   45080    20.205548    1.0319882    23.832815    6.0894057    4.5419393    1.5474663 0.0014630687 -0.021177011    4.5616533 
+   45090    19.626895    1.0276068    23.828455    6.0848555    4.5439592    1.5408963 0.0012852358 -0.020255114    4.5629291 
+   45100    20.279163    1.0258365    23.777264    6.0939446    4.5557027    1.5382418 0.0015041281 -0.020946884    4.5751455 
+   45110    20.343339    1.0370872    24.013419    6.0856306    4.5305183    1.5551123 0.0015682166 -0.021208207    4.5501583 
+   45120    20.313717    1.0183276    23.895582    6.1013554    4.5743732    1.5269822 0.0016359757 -0.021932253    4.5946695 
+   45130    20.002699    1.0193414    23.681912    6.0587704    4.5302679    1.5285025 0.0015976563 -0.021400327    4.5500706 
+   45140    19.966479     1.015002    23.720741    6.0246737    4.5026783    1.5219955 0.0017022779 -0.021619945    4.5225959 
+   45150    20.408733    1.0066774    23.757777    6.0046958    4.4951831    1.5095127 0.0017780899 -0.022349065    4.5157541 
+   45160    20.355366   0.99530239    23.647702    5.9962104    4.5037545    1.4924559 0.0018782594 -0.022916978    4.5247932 
+   45170    20.353777    1.0043816    23.582832    6.0151802      4.50911    1.5060702 0.0018254768 -0.022818873    4.5301034 
+   45180    19.944494   0.99821783    23.646954    6.0270172    4.5301896    1.4968276 0.0018911357 -0.022873126    4.5511716 
+   45190    19.989222    1.0061018    23.800224     6.053442    4.5447923    1.5086497  0.002065473 -0.023579073    4.5663059 
+   45200    20.150553    1.0272044    23.861395    6.0953408    4.5550478     1.540293 0.0021690582 -0.024199859    4.5770786 
+   45210    19.786704    1.0080007    23.276929     6.060018    4.5485209    1.5114971 0.0018530726 -0.023125049    4.5697928 
+   45220    20.116985    1.0249808    23.886045     6.074971    4.5380122    1.5369587 0.0015737031 -0.021570211    4.5580087 
+   45230    20.251897    1.0055215    23.906775    6.0635397    4.5557602    1.5077795  0.001713715 -0.021788704    4.5758352 
+   45240    19.970928    1.0168697    23.546777    6.0783505    4.5535544     1.524796 0.0019245822 -0.022611111     4.574241 
+   45250    20.346149    1.0168596    23.514954    6.0838181    4.5590372     1.524781 0.0019505316 -0.023126542    4.5802132 
+   45260    20.425398    1.0062635    23.846853     6.072556    4.5636639    1.5088921 0.0018760191 -0.023354096     4.585142 
+   45270    20.251689   0.98812428    23.690474     6.030587    4.5488946    1.4816924  0.001766052 -0.022948153    4.5700767 
+   45280    20.250974    1.0053606    23.652088    6.0315086    4.5239704    1.5075382 0.0018981991 -0.023411801     4.545484 
+   45290    20.288083   0.99765233    23.496401    6.0387223    4.5427427    1.4959797  0.002038811 -0.023865894    4.5645697 
+   45300    20.336108    1.0152336    23.495101    6.0551555    4.5328126    1.5223428 0.0019949231 -0.023784387    4.5546021 
+   45310    20.237128    1.0190188    23.917998    6.0588028     4.530784    1.5280188  0.001960441 -0.023347958    4.5521715 
+   45320    20.167824   0.99688558    23.647442    6.0298786    4.5350487    1.4948299 0.0016337743 -0.021780972    4.5551958 
+   45330    20.104914   0.97597962     23.86071    5.9707172    4.5072357    1.4634814  0.001434699 -0.020634574    4.5264356 
+   45340    20.015794   0.98893656    23.652831    5.9911994    4.5082891    1.4829104 0.0012242736 -0.019392061    4.5264568 
+   45350    20.407756   0.99740261      23.6292    6.0164218    4.5208166    1.4956052 0.0011562773 -0.019310059    4.5389704 
+   45360    20.380069   0.98967328    23.477497    6.0193473    4.5353322    1.4840151 0.0012195037 -0.019102968    4.5532157 
+   45370    20.276489    1.0054436    23.690567    6.0077304    4.5000677    1.5076627 0.0012717583 -0.018694862    4.5174908 
+   45380    20.446543   0.98890973    23.782062    6.0009166    4.5180465    1.4828701  0.001333138 -0.018537678     4.535251 
+   45390    20.387218   0.99362678    23.967697    5.9844422    4.4944988    1.4899434 0.0011156121 -0.017662908    4.5110461 
+   45400    20.413357   0.97884725    23.868136    5.9980696    4.5302881    1.4677815 0.0011828605 -0.018231342    4.5473366 
+   45410    20.403392   0.98931569    23.699197    6.0033778    4.5198989    1.4834789 0.0014529129  -0.01934981    4.5377958 
+   45420    19.987437    0.9772901    23.551933    6.0041134    4.5386669    1.4654465  0.001440874 -0.019364023      4.55659 
+   45430    20.331772   0.98796682    23.732267    6.0059219    4.5244656    1.4814562  0.001358948 -0.018895948    4.5420026 
+   45440    20.346487   0.98684984    23.561601    6.0047515    4.5249702    1.4797813 0.0012581286 -0.018619363    4.5423314 
+   45450    20.276342   0.97972579    23.950055    6.0223352    4.5532364    1.4690988 0.0012436527 -0.018554822    4.5705475 
+   45460    20.332125    1.0105349     23.53114    6.0511055    4.5358084    1.5152971 0.0014058579  -0.01949145     4.553894 
+   45470    20.349914    1.0083696     23.77952    6.0474412     4.535391    1.5120503 0.0013951493 -0.019340169     4.553336 
+   45480     20.19126    1.0123515    23.578505    6.0538244    4.5358034     1.518021 0.0015740989 -0.020198631    4.5544279 
+   45490    20.425133    1.0077739    23.690151    6.0417477    4.5305907     1.511157 0.0015860033 -0.020788345     4.549793 
+   45500    20.107468    1.0286467    23.846241    6.0678129    4.5253572    1.5424557 0.0015010189 -0.020719465    4.5445757 
+   45510     20.13644    1.0078321    23.568845    6.0561073    4.5448631    1.5112442  0.001450646 -0.020674368    4.5640868 
+   45520    20.108029    1.0245268    23.712008    6.0697341    4.5334562    1.5362779 0.0014038515 -0.020496041    4.5525484 
+   45530    20.005981    1.0267868      23.4543    6.0543679    4.5147011    1.5396668 0.0012790702 -0.020088566    4.5335106 
+   45540    19.949095    1.0083203    23.443768    6.0587908    4.5468145    1.5119763 0.0012722698 -0.019981096    4.5655233 
+   45550    20.380856    1.0179326    23.717588    6.0590155    4.5326256    1.5263899 0.0013458792 -0.019949929    4.5512297 
+   45560    20.287012   0.99801831    23.592578    6.0370386    4.5405101    1.4965285  0.001362274 -0.020348049    4.5594959 
+   45570    20.359998     1.002919    23.673101    6.0198092    4.5159323     1.503877 0.0016086893 -0.021968068    4.5362916 
+   45580    20.435922    1.0277527    23.630478    6.0683859    4.5272707    1.5411152 0.0017666273 -0.022578692    4.5480828 
+   45590    20.444889    1.0219921    23.864129    6.0691786    4.5367015    1.5324771 0.0017003562 -0.022280411    4.5572815 
+   45600    20.266231    1.0276557    23.903824    6.0615135    4.5205437    1.5409698 0.0017813331 -0.022556338    4.5413188 
+   45610    20.212159    1.0261079    23.854833    6.0695872    4.5309385    1.5386487 0.0017574358 -0.022540509    4.5517216 
+   45620     20.24112    1.0018865    23.687697    6.0340011    4.5316723    1.5023288 0.0018326671 -0.023081244    4.5529209 
+   45630    20.241456    1.0222783    23.629599    6.0546753    4.5217689    1.5329064 0.0017993169  -0.02289016    4.5428598 
+   45640    20.155134    1.0071547    23.634026    6.0580122    4.5477838    1.5102284 0.0017636729 -0.022637309    4.5686575 
+   45650    20.277697    1.0254981    24.006567    6.0649306    4.5271962    1.5377344  0.001941768 -0.023505038    4.5487595 
+   45660    20.287654    1.0007133    23.878506    6.0463675    4.5457979    1.5005696 0.0021104891 -0.024103012    4.5677904 
+   45670     20.50949    1.0041677     23.62339    6.0305898    4.5248404    1.5057495 0.0022555092 -0.024588876    4.5471737 
+   45680    20.198893    1.0173669    23.518325    6.0529507     4.527409    1.5255417 0.0022809544 -0.024684811    4.5498129 
+   45690    20.278897    1.0165168    23.736069    6.0358282    4.5115613    1.5242669  0.002267039 -0.024590755     4.533885 
+   45700    20.383201   0.99682457    23.580417    6.0328357    4.5380973    1.4947384 0.0022109013 -0.024169431    4.5600558 
+   45710    20.310757   0.99706786    23.764198    6.0334567    4.5383535    1.4951033 0.0021750237 -0.023937417    4.5601159 
+   45720    20.224588   0.98916187    23.906062    6.0075405    4.5242923    1.4832482 0.0022336631 -0.024070163    4.5461288 
+   45730    20.206004    0.9960851    23.786847    6.0089164    4.5152868    1.4936296 0.0021718795 -0.024209282    4.5373242 
+   45740    20.251577   0.99974037     23.65089    6.0065368    4.5074262    1.4991107 0.0021355983  -0.02441188    4.5297024 
+   45750      20.3653    1.0083524    23.884103    6.0583007    4.5462763    1.5120244 0.0020529758  -0.02414603    4.5683693 
+   45760    20.133823    1.0309777    23.713839    6.0757676    4.5298165    1.5459511   0.00173962 -0.022890621    4.5509675 
+   45770    19.927193   0.99979122    23.579157    6.0580683    4.5588813    1.4991869 0.0015909137 -0.022417922    4.5797084 
+   45780    19.946204    1.0251049    23.770173      6.04898    4.5118352    1.5371448 0.0016036334 -0.022371442     4.532603 
+   45790    19.820733    1.0041407    23.784964    6.0224908    4.5167817    1.5057091 0.0016167474 -0.021878373    4.5370433 
+   45800    20.321879   0.99804163    23.709052    6.0381081    4.5415447    1.4965634 0.0014074229 -0.021030606    4.5611679 
+   45810    20.377041    1.0083231    23.562746    6.0475561    4.5355757    1.5119805 0.0014164977 -0.020650139    4.5548093 
+   45820    20.260407    1.0234801    23.618403    6.0514166    4.5167082    1.5347084 0.0014628986 -0.020794637    4.5360399 
+   45830    20.176259    1.0053124     23.79256      6.04378    4.5363141    1.5074659 0.0014751858 -0.020998839    4.5558377 
+   45840    20.119646    1.0202373    23.458887    6.0616939    4.5318481    1.5298459 0.0015220047 -0.020513412    4.5508395 
+   45850    20.216196     1.018994    23.961452    6.0364589    4.5084774    1.5279815  0.001441924 -0.019419584     4.526455 
+   45860    20.239245   0.99972875    23.473143    6.0358095    4.5367162    1.4990933 0.0014714051 -0.019625506    4.5548703 
+   45870    20.234722    1.0078802    23.979298    6.0423334    4.5310171    1.5113163 0.0015131242 -0.019707389    4.5492113 
+   45880    20.382228    1.0122221    23.809762     6.031945     4.514118     1.517827 0.0017001298 -0.020671847    4.5330897 
+   45890     20.39718    1.0035584    23.658136    6.0366075    4.5317717    1.5048358  0.001627666 -0.020708109    4.5508522 
+   45900    20.388407   0.99645437    23.629316     6.017268    4.5230847    1.4941833 0.0014678079 -0.020008583    4.5416255 
+   45910    20.411851   0.99385211    23.885349    6.0339503     4.543669    1.4902812 0.0014558697 -0.020151743    4.5623649 
+   45920    20.332304   0.99711729     23.79672     6.032868    4.5376906    1.4951774 0.0018345694  -0.02239196     4.558248 
+   45930    20.198997    1.0034405    23.838306    6.0472194    4.5425604     1.504659 0.0019359984 -0.023013298    4.5636377 
+   45940    20.159936    0.9961535    23.687424    6.0163894    4.5226572    1.4937322 0.0019600017 -0.023173364    4.5438706 
+   45950    20.388853   0.99647284    23.837353    6.0212772    4.5270662     1.494211  0.001975502 -0.023084691    4.5481753 
+   45960    20.325932    1.0159609    23.540687    6.0322624     4.508829    1.5234333 0.0017646643 -0.022077255    4.5291416 
+   45970     20.32414    1.0058563    23.556094    6.0481593    4.5398778    1.5082815 0.0019199544 -0.022801246    4.5607591 
+   45980    20.184781    1.0021996    23.826382    6.0393968    4.5365985    1.5027982 0.0018556564 -0.022816929    4.5575598 
+   45990    20.423325    1.0109115    23.736769    6.0412078     4.525346    1.5158618 0.0017207213 -0.022399356    4.5460246 
+   46000    20.354032    1.0188118    23.924261    6.0582699    4.5305616    1.5277083  0.001803057 -0.022358358    4.5511169 
+   46010    20.547776    1.0087533    23.693311    6.0453065    4.5326809    1.5126256 0.0017931979 -0.022314162    4.5532019 
+   46020    20.160359   0.99827043    23.740229    6.0256373    4.5287308    1.4969065 0.0016264769 -0.020997619    4.5481019 
+   46030    20.133745   0.98027416    23.601693    6.0087586    4.5388375    1.4699211 0.0017663575 -0.021711966    4.5587832 
+   46040    20.418165     1.002735    23.905243    6.0133488    4.5097477    1.5036012 0.0017161443 -0.021346365    4.5293779 
+   46050    20.291495   0.98883659     23.57078    5.9981687    4.5154082    1.4827605 0.0016712242 -0.020786081    4.5345231 
+   46060    20.269314   0.98013659     23.69455    5.9756422    4.5059274    1.4697148 0.0017101198 -0.020855062    4.5250723 
+   46070    19.984255   0.98950677    23.879205    6.0092362    4.5254708    1.4837654  0.001606715  -0.01995134    4.5438154 
+   46080    20.306756   0.99067847    23.503221    6.0235736    4.5380512    1.4855224 0.0016768979 -0.020020897    4.5563952 
+   46090    20.264275   0.97613994    23.393453     5.988963    4.5252412    1.4637218 0.0016919923 -0.020411373    4.5439606 
+   46100    20.039449    1.0012176    23.713581    6.0138001    4.5124744    1.5013257 0.0016179706 -0.020309459    4.5311658 
+   46110    20.149722     1.010827    23.675237    6.0399887    4.5242536    1.5157351 0.0014019313 -0.019764111    4.5426158 
+   46120    20.232769   0.99512744    23.731169    6.0331915    4.5409979    1.4921936 0.0012991271 -0.019957514    4.5596563 
+   46130    20.172764    1.0204991    23.884651    6.0575057    4.5272673    1.5302384 0.0011826393 -0.019192316    4.5452769 
+   46140    20.272679    1.0070129    23.431223    6.0195166    4.5095008    1.5100158 0.00098767359 -0.018158154    4.5266713 
+   46150    20.126939    1.0088613    23.591249    6.0298709    4.5170833    1.5127876 0.0011185499 -0.018980852    4.5349456 
+   46160     20.29609    1.0056999    23.903623    6.0338144    4.5257674    1.5080469 0.0014187466 -0.020222349     4.544571 
+   46170    20.245946    1.0228317    23.895751    6.0574509    4.5237147    1.5337362 0.0017004272 -0.021726886    4.5437412 
+   46180    20.219624   0.99172377    23.546331    6.0345841    4.5474943    1.4870898 0.0019815862  -0.02289469    4.5684074 
+   46190    20.168748    1.0145075    23.787044       6.0506     4.529346     1.521254 0.0019954333   -0.0232265    4.5505771 
+   46200    19.997857    1.0162405    23.641818    6.0514702    4.5276176    1.5238526  0.001837632 -0.022939638    4.5487196 
+   46210    20.165497    1.0162987    23.936615    6.0562326    4.5322927    1.5239399 0.0016409646 -0.022236211     4.552888 
+   46220    19.973796     1.007513    23.665093    6.0377165    4.5269509    1.5107657 0.0016417313 -0.022484211    4.5477933 
+   46230     20.25002    1.0043985    23.565102    6.0559085    4.5498129    1.5060956 0.0016712163 -0.022429499    4.5705712 
+   46240    20.295464    1.0179466    23.874449    6.0766255    4.5502146    1.5264109 0.0017975751 -0.022716086    4.5711332 
+   46250    20.313259    1.0471035    23.842422    6.0850794    4.5149478    1.5701316 0.0019276282 -0.023331265    4.5363514 
+   46260    20.101379    1.0340884    23.931402    6.0889579    4.5383423    1.5506156 0.0020285136 -0.023751787    4.5600656 
+   46270    20.287529     1.035478    23.821059    6.0758978    4.5231986    1.5526992 0.0020944055 -0.024033144    4.5451373 
+   46280    20.052388     1.010751    24.001801    6.0676842    4.5520631    1.5156211 0.0020752744 -0.023913816    4.5739016 
+   46290    20.219656    1.0315572    24.042625    6.0980616    4.5512416      1.54682 0.0021141266 -0.023738224    4.5728657 
+   46300    20.250187    1.0540256    24.128892    6.1071307    4.5266193    1.5805114 0.0020594499 -0.023741503    4.5483014 
+   46310    20.620722    1.0423684    23.919457    6.1367233    4.5736919    1.5630314 0.0018979167 -0.023097616    4.5948916 
+   46320    20.258514    1.0426135    23.762424      6.12932     4.565921     1.563399  0.001595618 -0.021643429    4.5859689 
+   46330    20.387379    1.0136431     23.95242    6.0793337    4.5593758    1.5199578 0.0013842199 -0.020933574    4.5789252 
+   46340    20.146226     1.022445    23.834422     6.085215    4.5520587    1.5331563 0.0012545297 -0.020457196    4.5712614 
+   46350    20.106344    1.0167989    23.853957    6.0554325    4.5307425      1.52469 0.0012541836 -0.020654129    4.5501425 
+   46360    20.100096     1.018206     23.72359     6.062831    4.5360311    1.5267999  0.001593458 -0.022101199    4.5565388 
+   46370    20.167955     1.035235    23.712802    6.0858518    4.5335169    1.5523349 0.0016893494 -0.021983103    4.5538106 
+   46380    20.204927    1.0062147    23.495558    6.0897244    4.5809054    1.5088189 0.0018317094 -0.022759786    4.6018335 
+   46390    20.224974    1.0191252    23.779391    6.0725138    4.5443356    1.5281782 0.0018481028 -0.023094818    4.5655823 
+   46400    20.349492    1.0261727    23.718865    6.0650835    4.5263376    1.5387459 0.0019406877 -0.023290733    4.5476876 
+   46410    20.416909    1.0227715     23.71615    6.0661126    4.5324667    1.5336459 0.0019300793    -0.023201    4.5537376 
+   46420    19.535083    1.0042739    23.598779    6.0616101    4.5557013    1.5059088 0.0020314871  -0.02377891    4.5774488 
+   46430    20.212887    1.0191338    24.029558    6.0515357    4.5233445    1.5281911 0.0019968185 -0.023650224    4.5449979 
+   46440    20.234365    1.0118928    23.899138    6.0472035    4.5298703    1.5173332 0.0020713328 -0.023878134    4.5516771 
+   46450    19.994307    1.0073313    23.814522    6.0604535    4.5499602    1.5104933 0.0022188349 -0.024227607     4.571969 
+   46460    20.319515    1.0177908    23.741252    6.0737828    4.5476054    1.5261774 0.0020884232 -0.023312898    4.5688299 
+   46470    19.816833    1.0235777    23.620902    6.0621865    4.5273318    1.5348548 0.0020220987 -0.022999328     4.548309 
+   46480    19.725651    1.0295335     23.83477    6.0914001    4.5476145    1.5437855 0.0020354564  -0.02250412    4.5680832 
+   46490     19.97155    1.0233374    23.821064    6.0607008    4.5262064    1.5344944 0.0019687782 -0.022287195    4.5465248 
+   46500    20.157072   0.99915495    23.601435    6.0413148     4.543082    1.4982328 0.0018423652 -0.021443934    4.5626836 
+   46510    20.390398    1.0043227    24.005524     6.044016    4.5380341    1.5059819 0.0017178741 -0.020245067    4.5565613 
+   46520    20.206964    1.0120308    23.805105    6.0462563    4.5287161    1.5175402 0.0015142168 -0.019692482    4.5468943 
+   46530    20.246534     1.018964    23.756681    6.0568912    4.5289547    1.5279365 0.0014358024  -0.01951725    4.5470361 
+   46540    19.984816    1.0249201    23.561673    6.0552032    4.5183356    1.5368677 0.0014749611 -0.019933395     4.536794 
+   46550    20.205028   0.98146428    23.545318    6.0125887     4.540883    1.4717057 0.0015959096 -0.020640671    4.5599278 
+   46560    20.568817   0.99956743    23.610315    6.0007605    4.5019092    1.4988514 0.0014914632 -0.020035706    4.5204534 
+   46570    20.384373   0.99952289    23.829231    6.0308057    4.5320211    1.4987846 0.0014171301 -0.019704911    4.5503089 
+   46580     20.40147    1.0034863     23.89774    6.0338758    4.5291481    1.5047277 0.0016618675  -0.02067595    4.5481622 
+   46590    20.234417    1.0125658    23.778968    6.0518155    4.5334731    1.5183424 0.0017704313 -0.020975799    4.5526785 
+   46600    20.116255    1.0209173    23.437261    6.0482934    4.5174279    1.5308655 0.0018919025 -0.021320369    4.5368564 
+   46610    20.170374    1.0200273    23.770836    6.0566936    4.5271626     1.529531 0.0017622417 -0.020553814    4.5459542 
+   46620    20.258464    1.0037065    23.498853    6.0306598    4.5256018    1.5050579 0.0018413993 -0.020777352    4.5445378 
+   46630    20.141529   0.98643611    23.898438    6.0302318    4.5510708    1.4791609 0.0020482461 -0.022144819    4.5711674 
+   46640    19.722062    1.0006779    23.379846    6.0345112    4.5339946    1.5005166 0.0020281968   -0.0220201    4.5539865 
+   46650    20.059322    1.0104518    23.857697    6.0430047    4.5278321    1.5151725  0.001822416 -0.020718951    4.5467287 
+   46660    20.527365   0.99538086     23.83482    6.0434488    4.5508752    1.4925736 0.0016909424 -0.019971577    4.5691558 
+   46670    20.213873   0.99639386    23.693051    6.0146609    4.5205683    1.4940926 0.0016511325 -0.020152357    4.5390695 
+   46680    20.366996    0.9992374    23.609716    6.0186643    4.5203078    1.4983565 0.0015931954 -0.019834783    4.5385494 
+   46690    20.290831   0.98352756    23.387362    5.9993751    4.5245756    1.4747996 0.0015675946 -0.019893554    4.5429015 
+   46700    20.272005   0.97894064    23.601528    5.9905322    4.5226107    1.4679215 0.0015429827 -0.019950366    4.5410181 
+   46710     20.33819   0.98557772    23.605327    6.0040119    4.5261382    1.4778738 0.0015720206 -0.020132678    4.5446988 
+   46720    19.904245   0.99288795    23.199262    6.0478225    4.5589871    1.4888355 0.0015761736 -0.020220983    4.5776319 
+   46730    20.186293    0.9977901    23.763173    6.0488861    4.5526999    1.4961863 0.0014320499 -0.019974662    4.5712425 
+   46740    20.349368   0.99679145    23.756102    6.0231499    4.5284611    1.4946888 0.0012244808 -0.019346662    4.5465833 
+   46750    19.945429    1.0188064    23.948937    6.0561123     4.528412    1.5277002  0.001336484 -0.019927984    4.5470035 
+   46760    20.003644     1.014415    23.726161    6.0273314    4.5062161    1.5211153  0.001621898 -0.021522853     4.526117 
+   46770    20.192647    1.0228186    23.832994    6.0680901    4.5343735    1.5337165 0.0019006297 -0.022335367    4.5548083 
+   46780    19.986613    1.0099654    23.788086    6.0375282     4.523085    1.5144432 0.0019498706 -0.022213559    4.5433487 
+   46790    20.229675   0.99528146    23.618547     6.008289    4.5158644    1.4924245 0.0019277682 -0.022338736    4.5362754 
+   46800      20.0485   0.99466991    23.871898    6.0162119    4.5247043    1.4915075  0.001835096 -0.021759122    4.5446284 
+   46810    19.939202     1.015162    23.663489    6.0446383    4.5224029    1.5222354 0.0019700217 -0.022066487    4.5424994 
+   46820    20.466262    1.0079055    23.801918    6.0315496    4.5201953    1.5113543 0.0019680067 -0.021529293    4.5397566 
+   46830    20.366609   0.97921656    23.536008    6.0095914    4.5412561    1.4683352 0.0018965788 -0.021200808    4.5605604 
+   46840    20.304585   0.99379903     23.44324    6.0097272    4.5195256    1.4902016 0.0019959986 -0.021937238    4.5394668 
+   46850    20.383372   0.98615173    23.472805    5.9952907    4.5165561    1.4787345  0.002139458  -0.02249527     4.536912 
+   46860    20.275793    1.0040549     23.61554    5.9959112    4.4903309    1.5055803 0.0020945565 -0.022835456    4.5110718 
+   46870    20.203055   0.99876002    23.818707    6.0100744    4.5124337    1.4976406 0.0019050471 -0.022494247    4.5330229 
+   46880    20.226975    1.0135693    23.607137    6.0309583    4.5111112    1.5198472 0.0016402859 -0.021631937    4.5311028 
+   46890     20.00777     1.008458    23.704958    6.0456265    4.5334437    1.5121828 0.0011126724 -0.019525542    4.5518566 
+   46900    20.209649   0.98548119    23.694035    6.0254077    4.5476787     1.477729 0.00092740461 -0.018890942    4.5656422 
+   46910    20.129148   0.99679908    23.652999    6.0315393    4.5368391    1.4947002 0.00097495887 -0.018569506    4.5544337 
+   46920    20.136125    1.0159723    23.727592    6.0509937    4.5275433    1.5234505  0.001107392 -0.019152799    4.5455887 
+   46930    20.232441    1.0016478    23.792075    6.0300686    4.5280977    1.5019708 0.0012240872 -0.019618649    4.5464923 
+   46940    20.425752   0.99865109     23.61989    6.0251606    4.5276833    1.4974773 0.0012436791 -0.019485238    4.5459248 
+   46950    20.294658   0.99924883    24.054162    6.0422171    4.5438435    1.4983736 0.0013611515 -0.019840177    4.5623225 
+   46960    20.363668   0.99609914    23.632394    6.0283374    4.5346868    1.4936507 0.0013909486 -0.019920582    4.5532164 
+   46970    20.181854   0.99421051    23.742458    6.0488781    4.5580594    1.4908187 0.0014648419 -0.019871525    4.5764661 
+   46980    20.354329    1.0204224    24.108324    6.0314017    4.5012783    1.5301234 0.0014265628 -0.019604295     4.519456 
+   46990    20.317892    1.0038655    23.688165    6.0348683    4.5295719    1.5052964 0.0013219459  -0.01923132    4.5474813 
+   47000    20.220307    1.0249363    23.712782    6.0587192    4.5218273    1.5368919 0.0014179278 -0.019824234    4.5402336 
+   47010     20.50938    1.0122374    23.790398    6.0677997    4.5499496      1.51785 0.0015848155 -0.020627508    4.5689923 
+   47020    20.424104    1.0189334     23.67525    6.0661661    4.5382754    1.5278907 0.0018029212 -0.021462779    4.5579352 
+   47030    20.300339    1.0242588    23.942289    6.0829884    4.5471123    1.5358761   0.00186669 -0.021799844    4.5670454 
+   47040    19.752023     1.025861    23.353689    6.0648251    4.5265465    1.5382786 0.0016443725 -0.020868633    4.5457707 
+   47050    20.140405    1.0145686    23.760722    6.0548946     4.533549    1.5213456 0.0017240322 -0.021151884    4.5529768 
+   47060     20.35175     1.013338    23.919537    6.0651233     4.545623    1.5195003 0.0015502052 -0.019834256    4.5639071 
+   47070    19.978224   0.99021723    23.349448    6.0343893    4.5495586    1.4848307 0.0014931956   -0.0195834    4.5676488 
+   47080    20.033795    1.0120477    23.774793    6.0462587    4.5286932    1.5175655 0.0013686415 -0.019553552    4.5468781 
+   47090    20.201998    1.0280982    24.065536    6.0700607    4.5284274    1.5416332 0.0013913465 -0.020063018    4.5470991 
+   47100    20.148119    1.0078634    23.958653    6.0330578    4.5217666    1.5112912 0.0015772835 -0.021243881    4.5414332 
+   47110    20.280686    1.0014669    23.676764     6.028445    4.5267455    1.5016995 0.0017437941 -0.022006414    4.5470081 
+   47120    20.134911   0.99906615    23.726233    6.0186042    4.5205045    1.4980997 0.0018740719 -0.022489723    4.5411202 
+   47130    20.183772   0.99757744    23.666039    6.0153064    4.5194391    1.4958674 0.0019917908 -0.022972165    4.5404194 
+   47140      19.8104    1.0147868     23.78567    6.0305342    4.5088614    1.5216728 0.0020237455 -0.023147479    4.5299851 
+   47150    20.026401   0.99787869     23.40231     6.025765    4.5294459    1.4963191   0.00205452 -0.023095088    4.5504865 
+   47160    20.135623   0.98694088    23.963585    6.0075706    4.5276527    1.4799179 0.0021742088 -0.023680553     4.549159 
+   47170    20.353382   0.99319448    23.757894    6.0073661     4.518071    1.4892951 0.0020252797 -0.022615534    4.5386612 
+   47180     20.27028   0.98419463      23.9502    5.9812208     4.505421    1.4757998 0.0018553346  -0.02172337     4.525289 
+   47190    20.276674    0.9811793    23.603429    5.9702853     4.499007    1.4712784 0.0019631696 -0.022429357    4.5194731 
+   47200    20.257207    0.9797498    23.755831    5.9891956    4.5200608    1.4691348  0.002023462 -0.022604947    4.5406422 
+   47210    19.975639    0.9846563    23.531297    6.0056232    4.5291311    1.4764921 0.0020356712 -0.022774922    4.5498703 
+   47220    20.083996    1.0087878    23.623522    6.0291212    4.5164439    1.5126773 0.0020917667 -0.022968349    4.5373205 
+   47230    20.403805    1.0057014    23.441081    6.0255845    4.5175353    1.5080493 0.0020670604 -0.022511464    4.5379797 
+   47240    20.270216   0.99019934    23.419546    6.0044448    4.5196409    1.4848039  0.002010036 -0.022286265    4.5399171 
+   47250    20.345429   0.98763703     23.71086    5.9918372    4.5108755    1.4809617 0.0019484215 -0.022196636    4.5311237 
+   47260    20.380076   0.97495489    23.629369    6.0051828    4.5432379    1.4619449 0.0019083523 -0.022230312    4.5635599 
+   47270    20.395653   0.99423682    23.826459    6.0123023    4.5214442    1.4908581 0.0018837127 -0.022301439    4.5418619 
+   47280    20.292505    1.0176935    23.954609    6.0064889    4.4804575    1.5260314  0.001845558 -0.022648167    4.5012601 
+   47290    20.287084   0.98136044    23.584329    6.0115371    4.5399871      1.47155  0.001720436 -0.021878641    4.5601453 
+   47300    20.187661    1.0015103    23.473539    6.0335293    4.5317646    1.5017647 0.0017531179 -0.022190817    4.5522023 
+   47310      19.9103    1.0019472    23.730574    6.0012992    4.4988794    1.5024199 0.0018724174 -0.022659342    4.5196663 
+   47320    20.028735   0.98244884    23.792616    5.9852068    4.5120248     1.473182  0.001734441 -0.021917965    4.5322083 
+   47330    19.928813   0.99091737     23.84365    6.0052259    4.5193453    1.4858806 0.0017024607 -0.021204261    4.5388471 
+   47340    20.262531     0.978819    23.831065    6.0115745    4.5438355    1.4677391 0.0017791233 -0.021810739    4.5638671 
+   47350    20.068578    1.0070156    23.711599     6.048589     4.538569      1.51002 0.0018435743 -0.022191722    4.5589171 
+   47360    20.148835    1.0173048    23.761685    6.0626154    4.5371668    1.5254486 0.0016969512 -0.021884246    4.5573541 
+   47370    19.949613    1.0048624    24.018574    6.0639022     4.557111    1.5067912  0.001623409 -0.021632538    4.5771201 
+   47380    19.932486    1.0175791    23.652211     6.069931    4.5440711    1.5258599 0.0015815914 -0.021147356    4.5636369 
+   47390    20.246227    1.0108956    23.671451    6.0714989     4.555661    1.5158379 0.0016423569 -0.021404661    4.5754233 
+   47400    20.293543    1.0261408    23.627805    6.0666797    4.5279817    1.5386981 0.0018230388 -0.022344476    4.5485031 
+   47410    20.366185    1.0247733     23.72478    6.0703253    4.5336778    1.5366475 0.0017392795 -0.021913675    4.5538522 
+   47420    20.370585    1.0004945    23.879403    6.0280601    4.5278185    1.5002415 0.0016045232 -0.021279918    4.5474939 
+   47430    20.314694    1.0149392     23.57572    6.0649676    4.5430664    1.5219013 0.0017953625 -0.022444113    4.5637151 
+   47440    20.351752    1.0356732    24.100429    6.0630465    4.5100545     1.552992 0.0018240065 -0.022779644    4.5310102 
+   47450    20.110574    1.0197027    23.979727    6.0630525    4.5340083    1.5290442 0.0018708391 -0.023147794    4.5552853 
+   47460    20.228573    1.0260573    23.922912    6.0833821    4.5448092    1.5385729 0.0018593821 -0.023247425    4.5661972 
+   47470    19.943196     1.032424    23.700361    6.0853531    4.5372333    1.5481198 0.0016939937 -0.022521605     4.558061 
+   47480    20.249074    1.0095992    23.699381    6.0464826    4.5325886     1.513894 0.0017155229 -0.022239707    4.5531127 
+   47490    20.357758    1.0074554    23.756014    6.0484466    4.5377673    1.5106793 0.0018216553 -0.022457682    4.5584033 
+   47500    20.059444    1.0128217    23.832363    6.0438875    4.5251614    1.5187261 0.0017414477 -0.022150112    4.5455701 
+   47510    20.157198    1.0079509    23.741435     6.063106    4.5516837    1.5114223 0.0016220003 -0.021302975    4.5713647 
+   47520    20.242684    1.0180534    23.459084    6.0718723    4.5453012    1.5265711 0.0016205269 -0.021025702    4.5647064 
+   47530    20.113852      1.02045    23.735538    6.0844784    4.5543137    1.5301647 0.0015834834 -0.021048974    4.5737792 
+   47540    20.003391    1.0186752    23.901987    6.0630849    4.5355814    1.5275034 0.0016357119 -0.021277875    4.5552236 
+   47550    20.081926    1.0020056    23.627988    6.0470123    4.5445048    1.5025075 0.0015100092 -0.020439305    4.5634341 
+   47560    19.926511    1.0065086    23.716054    6.0866542    4.5773947    1.5092596 0.0015348013 -0.020918213    4.5967781 
+   47570     19.92044    1.0285891    23.628881    6.1088666    4.5664972    1.5423694 0.0014576333 -0.020837664    4.5858773 
+   47580    20.211974    1.0177926    23.812434     6.085803    4.5596229    1.5261801 0.0013597619 -0.020497381    4.5787606 
+   47590    20.361412    1.0169379    23.768567     6.063781    4.5388826    1.5248984 0.0011880367 -0.019888318    4.5575829 
+   47600    20.389993   0.98769905    23.570466    6.0467232    4.5656685    1.4810547 0.0011244762  -0.01945627    4.5840003 
+   47610    20.096996    1.0093527    23.739571    6.0481645      4.53464    1.5135244 0.0010388803 -0.018597343    4.5521985 
+   47620    20.252465   0.99865518    23.721641    6.0407225     4.543239    1.4974834 0.0012865518 -0.019084194    4.5610367 
+   47630    20.165988    0.9964592    23.804189    6.0472888    4.5530983    1.4941906 0.0014676059 -0.019571498    4.5712021 
+   47640    19.877504    1.0086997     23.60986    6.0415869    4.5290417    1.5125452  0.001600347 -0.020187347    4.5476287 
+   47650    20.414478   0.99776954    23.392208    6.0310882    4.5349327    1.4961554 0.0015545849 -0.019872118    4.5532503 
+   47660    20.278605    1.0060207     23.88739    6.0194175    4.5108894    1.5085281 0.0013534058 -0.018771496    4.5283075 
+   47670    20.305983    1.0094603    23.637552    6.0541352    4.5404494    1.5136858  0.001251912 -0.018151356    4.5573489 
+   47680    20.098957    1.0177237    23.757708    6.0692736    4.5431969    1.5260767 0.0013394808 -0.019060336    4.5609177 
+   47690    20.197541    1.0246072    23.492438    6.0744778    4.5380792    1.5363986 0.0013928709 -0.019501952    4.5561883 
+   47700    20.120407     1.021446    23.805089    6.0641897    4.5325314    1.5316583 0.0015176354 -0.020194514    4.5512083 
+   47710    20.429473    1.0185517     23.84279    6.0785868    4.5512685    1.5273182 0.0016324828 -0.020578361    4.5702144 
+   47720    19.873779     1.048365    23.552284    6.1040784    4.5320551    1.5720233 0.0016705297 -0.021209947    4.5515945 
+   47730    20.269215    1.0353619     23.92073    6.1027081    4.5501829    1.5525252 0.0017695572 -0.021311552    4.5697249 
+   47740    20.245544    1.0239132    23.922762      6.07381    4.5384521    1.5353579  0.001866689 -0.021496845    4.5580822 
+   47750    19.734743    1.0027269    23.973044    6.0720796    4.5684906    1.5035891 0.0019943951 -0.022143458    4.5886396 
+   47760    20.069041    1.0227674     23.59911    6.0593986     4.525759    1.5336397 0.0021189924  -0.02307539    4.5467154 
+   47770    20.025421    1.0100366    23.667041    6.0689003    4.5543504    1.5145499 0.0021540999 -0.023814837    4.5760112 
+   47780    20.102166    1.0090331    23.985947    6.0212414    4.5081963    1.5130452 0.0022703504 -0.024710902    4.5306368 
+   47790    20.255404   0.97137348    23.625444    5.9932773    4.5367028    1.4565745 0.0023491536 -0.025055897    4.5594095 
+   47800    20.354769   0.97434014     23.53204    6.0043519    4.5433288     1.461023 0.0022762294 -0.024521624    4.5655742 
+   47810    20.285638    1.0069276    23.599325    6.0200429     4.510155    1.5098879 0.0023442483 -0.024643548    4.5324543 
+   47820    20.371202   0.99667405    23.557812    6.0208293    4.5263166    1.4945127  0.002507519 -0.025435551    4.5492446 
+   47830    19.988538   0.98786777    23.652222    6.0302274    4.5489196    1.4813077 0.0023233095 -0.024947065    4.5715434 
+   47840     20.11811   0.98836013     23.58244    6.0092357    4.5271897     1.482046 0.0020101901 -0.023696981    4.5488765 
+   47850    20.001823     1.005781    23.793327    6.0080826    4.4999139    1.5081687 0.0017759881  -0.02269427    4.5208322 
+   47860    20.127744   0.98684488     23.84958    6.0081241    4.5283502    1.4797739 0.0015813468 -0.022121565    4.5488904 
+   47870    20.142337    1.0027677    23.600283    6.0264568    4.5228066    1.5036502 0.0014054967 -0.021373805    4.5427749 
+   47880    20.095954    1.0004908    23.860064     6.025942     4.525706     1.500236   0.00137493 -0.021274466    4.5456056 
+   47890    19.983811    1.0228399    23.737729    6.0571841    4.5234357    1.5337484  0.001361405 -0.021225095    4.5432994 
+   47900    20.125679    1.0171233    23.560813    6.0471672    4.5219908    1.5251763 0.0015417183 -0.021797472    4.5422466 
+   47910    20.268802   0.99877894    23.954014     6.021777     4.524108     1.497669 0.0017683683 -0.022716416     4.545056 
+   47920    20.306393   0.99433371    23.751753    6.0246354     4.533632    1.4910034 0.0019525947 -0.023305072    4.5549845 
+   47930    20.363269    1.0058582    23.481584    6.0280149    4.5197305    1.5082844 0.0020710157 -0.023711645    4.5413711 
+   47940    20.023069    1.0079459    23.819847     6.043227    4.5318122    1.5114148 0.0019940129 -0.023234327    4.5530525 
+   47950    19.658852    1.0253438    23.584125    6.0669426    4.5294395    1.5375031 0.0018770081 -0.022778527     4.550341 
+   47960     20.24951    1.0128941    23.826854    6.0430693    4.5242346    1.5188347 0.0017941536 -0.022164021    4.5446045 
+   47970    20.292848   0.98682901    23.493904    6.0112629    4.5315128    1.4797501 0.0019232562 -0.022174397     4.551764 
+   47980    20.035003   0.99770386    23.855771    6.0384282    4.5423712    1.4960569 0.0017582802 -0.021226988      4.56184 
+   47990    19.772585    1.0048355    23.865033    6.0568687    4.5501178    1.5067508 0.0018161444 -0.021654119    4.5699558 
+   48000     20.08167     1.001627    23.875076    6.0686722    4.5667325    1.5019397 0.0018680824 -0.021814628    4.5866791 
+   48010    20.092742    1.0019165    23.774655    6.0549702    4.5525965    1.5023737 0.0017192083 -0.020771392    4.5716486 
+   48020     20.05018   0.99501817     23.65103    6.0162399    4.5242102    1.4920297 0.0016256647 -0.020476559    4.5430611 
+   48030    20.358242    1.0007593    23.630229    6.0387276    4.5380891    1.5006385 0.0014748894 -0.020171524    4.5567857 
+   48040    20.234779   0.99928325     23.64072    6.0419527    4.5435275    1.4984252 0.0012173925 -0.019469562    4.5617797 
+   48050    20.124575    1.0024013    23.857708    6.0468533    4.5437525    1.5031008 0.0012882113   -0.0201132    4.5625775 
+   48060    20.406104   0.99229689    23.840852    6.0166136    4.5286644    1.4879492 0.0014236845 -0.020860498    4.5481012 
+   48070    20.348032   0.98884642    23.810213    6.0069842     4.524209    1.4827752 0.0013920752  -0.02021279    4.5430297 
+   48080    20.274213    1.0103245    23.688854    6.0017072    4.4867255    1.5149817 0.0012837011 -0.019726937    4.5051688 
+   48090    19.823823   0.97112024    23.856925    5.9954841    4.5392893    1.4561948 0.0014943629 -0.020783044     4.558578 
+   48100    19.952048    0.9931754    23.467261    6.0106116    4.5213451    1.4892665 0.0016626164 -0.021195753    4.5408782 
+   48110    20.258022    1.0017036    23.903545    6.0372146    4.5351601    1.5020546 0.0017066241 -0.021381974    4.5548354 
+   48120    20.208705   0.99997129     23.20547    6.0338958    4.5344389    1.4994569 0.0018437104 -0.022273658    4.5548688 
+   48130    20.312324    1.0084001    23.855871    6.0387411    4.5266452     1.512096 0.0019212357 -0.022528329    4.5472523 
+   48140    19.904025   0.98450382    23.744397    6.0161818    4.5399183    1.4762635  0.001977147  -0.02292946    4.5608706 
+   48150    20.034842     1.009382    23.685714    6.0494692    4.5359009    1.5135684  0.002170814 -0.024241616    4.5579717 
+   48160    19.895368    1.0288368    23.842334    6.0588853    4.5161446    1.5427407 0.0022937893 -0.024834434    4.5386852 
+   48170    20.279039   0.99689888    23.930235    6.0537406    4.5588907    1.4948499 0.0021504998 -0.024483456    4.5812236 
+   48180    20.153317    1.0232138    23.759936    6.0572589    4.5229498    1.5343091 0.0021236599 -0.023869288    4.5446954 
+   48190    20.265341    1.0014229       23.677    6.0584474    4.5568138    1.5016336 0.0019539212 -0.023257391    4.5781173 
+   48200    20.307684    1.0158132    23.598992    6.0323309    4.5091189    1.5232119 0.0018435616 -0.023165975    4.5304413 
+   48210    20.439757    1.0023508    23.639922    6.0291415    4.5261165     1.503025 0.0018501906 -0.022509662    4.5467759 
+   48220    20.346699   0.99081355    23.636845    6.0260049      4.54028    1.4857249 0.0018077143 -0.022352317    4.5608246 
+   48230    20.334696   0.99291667    23.863962    6.0134917    4.5246131    1.4888785  0.001970766 -0.022842018    4.5454844 
+   48240    20.336072    1.0065954    23.721719    6.0305256    4.5211358    1.5093898  0.001865289 -0.022254133    4.5415246 
+   48250    20.270716    1.0068986    23.761505    6.0257953    4.5159509    1.5098444 0.0017760313 -0.022248138     4.536423 
+   48260    19.935017   0.98981074    23.577547    6.0165541    4.5323329    1.4842212 0.0019293455 -0.022836335    4.5532399 
+   48270    20.165507   0.99595478    23.537893    6.0147312     4.521297    1.4934342 0.0020434145 -0.023345072    4.5425987 
+   48280    20.351654   0.98667869    23.474786    6.0305603    4.5510357    1.4795247 0.0021698055 -0.023845293    4.5727111 
+   48290    20.497111    1.0273275    23.823467    6.0808321    4.5403545    1.5404776 0.0022000071 -0.023867309    4.5620218 
+   48300    20.243855    1.0342493    23.428377    6.0835859    4.5327291    1.5508568 0.0022359058 -0.024147464    4.5546407 
+   48310    20.297498   0.99942764     23.60318     6.030615    4.5319733    1.4986417 0.0021033477 -0.024014869    4.5538848 
+   48320    20.033728    1.0042015    23.835166    6.0584636    4.5526635    1.5058002 0.0021239163 -0.024090596    4.5746301 
+   48330    20.232524    1.0019533    23.950586    6.0281649    4.5257359     1.502429 0.0020120001 -0.023153575    4.5468775 
+   48340    20.420627    1.0109796    23.752241    6.0378248    4.5218609    1.5159638 0.0018401673 -0.022231211     4.542252 
+   48350     20.49079    1.0204542    24.082493    6.0470199    4.5168488    1.5301711 0.0016579884 -0.021510869    4.5367017 
+   48360    20.292197    1.0021468    23.671215    6.0394705    4.5367513    1.5027192 0.0015636062  -0.02069066    4.5558784 
+   48370    20.284598   0.96863964    23.625656    6.0018656    4.5493904    1.4524751 0.0015330329 -0.020386201    4.5682436 
+   48380    20.333894   0.99826914    23.911712    6.0050322    4.5081276    1.4969046 0.0014096506 -0.020329102    4.5270471 
+   48390    20.127275    1.0013396    23.586619    6.0274144    4.5259058    1.5015087 0.0012970425 -0.019849215    4.5444579 
+   48400    19.789527    1.0013442    23.943996    6.0186328    4.5171171    1.5015156  0.001219864 -0.019407341    4.5353046 
+   48410    20.152979   0.99332714    23.901862    6.0140938    4.5245997     1.489494 0.0013076475 -0.019458725    4.5427508 
+   48420    20.202981   0.99754939    23.771233    6.0074033    4.5115779    1.4958253 0.0015028139 -0.020625895     4.530701 
+   48430    20.152511   0.99353146    23.589872    6.0175413    4.5277409    1.4898004 0.0016328992 -0.021020594    4.5471286 
+   48440    19.945099   0.98943892    23.786557    6.0086405    4.5249768    1.4836637 0.0015554648 -0.020469302    4.5438907 
+   48450    19.927989   0.99159604    24.093042    5.9955773    4.5086791    1.4868983 0.0012533378 -0.019239381    4.5266651 
+   48460     20.25111   0.97489904    23.606288    5.9615354    4.4996743    1.4618611 0.0010295303 -0.018139235     4.516784 
+   48470    20.088385   0.98196784     23.70195     5.978917    4.5064563    1.4724608 0.00094876287 -0.018104943    4.5236124 
+   48480    20.311597   0.99131235    23.582277    6.0086072    4.5221343    1.4864729 0.00090683956 -0.018077638    4.5393051 
+   48490    20.484543    1.0019601      23.5743    6.0289604    4.5265211    1.5024392 0.0010216926 -0.018320947    4.5438204 
+   48500    20.044673   0.99392094    23.845885    6.0375796    4.5471951    1.4903845 0.0011666269 -0.018663362    4.5646918 
+   48510    20.235941    1.0029812    23.710196    6.0250803    4.5211099    1.5039704 0.0011459188 -0.018660142    4.5386241 
+   48520    20.048768    1.0091277     23.70086    6.0553306    4.5421437    1.5131869 0.0012148793 -0.018700679    4.5596295 
+   48530    20.335223   0.99927343    24.106113     6.028004    4.5295935    1.4984105 0.0013766077 -0.019265038     4.547482 
+   48540     20.26429   0.99158118    23.532455    6.0299034    4.5430274     1.486876 0.0014148893 -0.019301124    4.5609137 
+   48550    19.957404    1.0150225    23.763387    6.0659911    4.5439649    1.5220262 0.0014828216 -0.020066725    4.5625488 
+   48560    20.154192    1.0210738    23.775981    6.0603283    4.5292282    1.5311001 0.0015834165 -0.020924578    4.5485693 
+   48570    20.246622    1.0117254    23.893881    6.0365481    4.5194659    1.5170822 0.0015225276 -0.021129844    4.5390732 
+   48580    20.021251    1.0168515    23.432591    6.0714599     4.546691    1.5247689 0.0016655227 -0.022350914    4.5673764 
+   48590     20.24879    1.0152238    23.914316    6.0590766    4.5367484    1.5223281 0.0017575185 -0.022976455    4.5579674 
+   48600    20.112082    1.0106267    23.470063    6.0529588    4.5375241    1.5154347 0.0016122601  -0.02222541    4.5581373 
+   48610    20.193931    1.0368325    23.558468    6.0484471    4.4937168    1.5547303 0.0014586661 -0.021128591    4.5133867 
+   48620    20.279564   0.99583889    23.643697    6.0242447    4.5309843    1.4932604 0.0015481216 -0.020899508    4.5503357 
+   48630    20.298103   0.97878083    23.707043    6.0199762    4.5522944    1.4676819 0.0016281088 -0.021126418    4.5717927 
+   48640    20.351174    1.0145351    24.075695    6.0643696    4.5430743    1.5212954 0.0017177215 -0.021494692    4.5628513 
+   48650     20.26275    1.0162282     23.83033    6.0483794    4.5245452    1.5238342 0.0017020723  -0.02181046    4.5446536 
+   48660    20.256557    1.0203518    23.405658    6.0970211    4.5670036    1.5300175 0.0016982711 -0.021382198    4.5866875 
+   48670    20.181789    1.0163377    23.847879    6.0622941    4.5382957    1.5239984 0.0017377737 -0.021363198    4.5579211 
+   48680    20.385385    1.0208902    23.589861    6.0814025    4.5505777    1.5308248 0.0020091721 -0.022814541    4.5713831 
+   48690    20.246982    1.0317702    24.100563    6.0722532    4.5251138    1.5471394 0.0019643146  -0.02320974    4.5463593 
+   48700    19.796231    1.0244897    23.749544    6.0868021    4.5505798    1.5362223 0.0021851504 -0.024222167    4.5726168 
+   48710    20.349551    1.0059472    23.438284    6.0306571    4.5222392    1.5084179 0.0018483705  -0.02286769    4.5432585 
+   48720    20.254742   0.98535793    23.834619    6.0231486    4.5456044    1.4775442     0.001523 -0.021612827    4.5656942 
+   48730    20.391908    1.0172019    23.745089    6.0389033    4.5136091    1.5252942 0.0015365906 -0.021498504     4.533571 
+   48740    20.309668   0.99174604    23.504578    6.0384755    4.5513523    1.4871232 0.0016799015 -0.021718418    4.5713908 
+   48750    20.218516    1.0363163    23.962222    6.0822847    4.5283284    1.5539563 0.0016808929 -0.021951124    4.5485986 
+   48760    20.399416     1.011943    23.909258    6.0546801    4.5372716    1.5174085   0.00172953 -0.021749344    4.5572914 
+   48770     20.20317   0.99865105    23.815747    6.0442422    4.5467649    1.4974772  0.001677998 -0.021519921    4.5666068 
+   48780    20.249409    1.0159312    23.944545    6.0447671    4.5213782    1.5233889  0.001625015 -0.021705709    4.5414589 
+   48790    20.063577    1.0181084    23.608338    6.0690206     4.542367    1.5266535 0.0017299225 -0.022246283    4.5628834 
+   48800    19.678108    1.0312136    23.608535    6.0782452    4.5319404    1.5463048 0.0017686197 -0.022160777    4.5523325 
+   48810    20.291697    1.0141484    23.511659    6.0544153    4.5336997    1.5207156 0.0019344633 -0.023042437    4.5548077 
+   48820    19.824579    1.0084694    23.535487    6.0608118    4.5486119    1.5121999  0.001901511 -0.022997617    4.5697081 
+   48830    20.273025    1.0204406    23.703441    6.0751378    4.5449871    1.5301507 0.0018578303 -0.022995408    4.5661246 
+   48840    20.247285    1.0201648     23.70514    6.0520742     4.522337    1.5297372 0.0018488508 -0.023087468    4.5435756 
+   48850    19.952398    1.0130224     23.74935    6.0357562    4.5167291    1.5190271 0.0017871611 -0.022355297    4.5372972 
+   48860    19.928601   0.99666869    23.840669     6.042943    4.5484383    1.4945047 0.0017385015 -0.022274606    4.5689744 
+   48870    19.942909    1.0105979     23.78034    6.0732917    4.5579001    1.5153916 0.0018957446 -0.022858684    4.5788631 
+   48880    19.833689     1.013954    24.041497    6.0602716    4.5398476    1.5204241 0.0018989247 -0.022633051    4.5605817 
+   48890    20.157293    1.0111803    23.912844    6.0539597    4.5376948    1.5162649 0.0018846388 -0.022709337    4.5585195 
+   48900     20.19783    1.0115703    23.743349    6.0578052    4.5409555    1.5168496 0.0019293941 -0.022878355    4.5619045 
+   48910    20.492498    1.0153801    23.755061    6.0444024    4.5218398    1.5225625  0.001846915 -0.022473605    4.5424665 
+   48920    20.282658    1.0122768    23.777633    6.0574881    4.5395789    1.5179091 0.0017879111 -0.022286424    4.5600774 
+   48930    20.103709    1.0180539    23.491373    6.0394463    4.5128746    1.5265718 0.0019108242 -0.022917561    4.5338813 
+   48940    19.659699    1.0048792    23.761484    6.0234746    4.5166582    1.5068164 0.0020325576 -0.023155645    4.5377813 
+   48950    19.246959   0.99742602    23.689223    6.0465909    4.5509506    1.4956403 0.0020053955 -0.023194715    4.5721399 
+   48960    20.135706   0.98150986    23.737876    6.0213494    4.5495754     1.471774 0.0019047173 -0.022652097    4.5703228 
+   48970    20.343295   0.97490556    23.863418    5.9857344    4.5238635    1.4618709 0.0018375077  -0.02225514    4.5442811 
+   48980     20.02101   0.98178507    23.475156    5.9852687     4.513082    1.4721867 0.0018230064 -0.021956217    4.5332152 
+   48990    20.226199   0.97361576    23.637462    6.0057737    4.5458369    1.4599368 0.0017361521 -0.021612769    4.5657135 
+   49000     20.12915    0.9877275    23.515647    5.9953762    4.5142788    1.4810974 0.0017059363 -0.021112474    4.5336854 
+   49010    20.421433   0.99821949     23.75771    6.0134637    4.5166336    1.4968301 0.0015165544 -0.020524927     4.535642 
+   49020    20.321304   0.98876789    23.709311    6.0227552    4.5400977    1.4826574 0.0017052916 -0.021506045    4.5598985 
+   49030    20.311897    1.0159276    23.960057    6.0470454     4.523662    1.5233834  0.001730819 -0.021497114    4.5434283 
+   49040    20.556216    1.0113169    23.794557    6.0493454    4.5328757    1.5164697 0.0016356363 -0.020631665    4.5518717 
+   49050    20.293715    1.0173596    23.636492    6.0477845    4.5222538    1.5255307 0.0015071761 -0.020192248    4.5409389 
+   49060    20.337316    1.0150758     23.86284    6.0470064    4.5249002    1.5221062 0.0013771446  -0.01961251    4.5431355 
+   49070    20.586078     1.010703    23.509753    6.0624415    4.5468924    1.5155491 0.0014557036 -0.020008454    4.5654452 
+   49080    20.496464    1.0272357    23.663025    6.0663555    4.5260156    1.5403399 0.0015424834  -0.02045301    4.5449261 
+   49090    20.287752    1.0127991    23.936894    6.0617244    4.5430321    1.5186922 0.0015837521 -0.020615319    4.5620637 
+   49100    20.179987    1.0238202    23.789623    6.0560682    4.5208498    1.5352183 0.0015939612 -0.020745889    4.5400018 
+   49110    20.330598    1.0066277    23.510065    6.0266251    4.5171869    1.5094382 0.0016062888  -0.02078812    4.5363688 
+   49120    20.023947    1.0019052    23.770185     6.020732    4.5183752    1.5023568 0.0012940149 -0.019855132    4.5369363 
+   49130    20.110319    1.0036891    23.624926    6.0326738    4.5276421    1.5050318 0.0011259168 -0.019217864     4.545734 
+   49140    20.266865    1.0009169     23.61381     6.021361     4.520486     1.500875 0.0013468304 -0.020149604    4.5392888 
+   49150    20.189154    1.0021998    23.515929    6.0280363    4.5252377    1.5027985  0.001554053 -0.021376888    4.5450606 
+   49160    19.944241    1.0074794     23.87188    6.0668797    4.5561643    1.5107154 0.0016836812 -0.022036253    4.5765169 
+   49170    19.686702    1.0342239    23.887574    6.0554757     4.504657    1.5508187 0.0016793557 -0.021646389    4.5246241 
+   49180    20.154913    1.0217633    23.796527     6.070018    4.5378839     1.532134 0.0016186565 -0.020921973    4.5571873 
+   49190    20.228545   0.99462325    23.614145    6.0490148    4.5575772    1.4914376 0.0014184503 -0.019796381    4.5759551 
+   49200    20.149501    1.0124837    23.632356    6.0516763     4.533457    1.5182193  0.001408198 -0.020146922    4.5521957 
+   49210    20.253961    0.9991946    23.523121    6.0478459    4.5495536    1.4982923 0.0015899399 -0.021389452    4.5693531 
+   49220    20.578188    1.0013263    23.808185    6.0414632    4.5399745    1.5014887 0.0015940184 -0.021642935    4.5600234 
+   49230    20.489377   0.99515994     23.99896    6.0449781    4.5527357    1.4922423 0.0015748083  -0.02114808     4.572309 
+   49240    20.169756    1.0037784    23.704539    6.0320426    4.5268769    1.5051657 0.0016773638  -0.02164008    4.5468396 
+   49250    20.274271    1.0168026    23.780086    6.0502321    4.5255366    1.5246954 0.0018283005 -0.022219024    4.5459274 
+   49260    20.234852   0.99550943    23.700839    6.0157468    4.5229804    1.4927664 0.0016209732 -0.021647429    4.5430068 
+   49270    19.951826   0.99778328    23.551597    6.0155048    4.5193288     1.496176 0.0013997358 -0.020839401    4.5387684 
+   49280    20.193136    1.0004644    23.391275    6.0345273    4.5343309    1.5001964 0.0012465156 -0.020273882    4.5533583 
+   49290     20.16189   0.98035293    23.286265    6.0178952     4.547856    1.4700392 0.0013306076 -0.020917519    4.5674429 
+   49300    20.301786    1.0028633    23.595528    6.0079313    4.5041379    1.5037935 0.0014697267 -0.021342128    4.5240103 
+   49310    20.197331    1.0153036    23.991268    6.0267441    4.5042964    1.5224477 0.0015924005 -0.021821722    4.5245257 
+   49320    20.110518   0.98601974    23.562957    6.0221164    4.5435798    1.4785366  0.001638885 -0.021803681    4.5637446 
+   49330    20.369831    1.0070654    23.721963     6.047095    4.5370005    1.5100945 0.0015416312  -0.02135188    4.5568107 
+   49340    20.450949    1.0011549    23.384085    6.0368276    4.5355958    1.5012318 0.0014443102 -0.020909553    4.5550611 
+   49350    20.395552    1.0138367    23.659703    6.0420287    4.5217805    1.5202482 0.0015169933 -0.021323142    4.5415867 
+   49360      20.3724    1.0214411    23.523009    6.0492371    4.5175861     1.531651 0.0014281067 -0.021246497    4.5374044 
+   49370    20.158336    1.0186807    23.677277    6.0665043    4.5389925    1.5275117 0.0016609928 -0.022174185    4.5595057 
+   49380    20.452147    1.0229617    23.795312    6.0848358    4.5509048     1.533931 0.0017290726 -0.022122227    4.5712979 
+   49390    20.252086    1.0261038    23.748581    6.0875935    4.5489508    1.5386427 0.0017841461 -0.022249776    4.5694164 
+   49400    20.391977    1.0044695    23.570779     6.058467     4.552265     1.506202 0.0016614753 -0.021324994    4.5719285 
+   49410    20.260026   0.96612619    23.569609    5.9842193    4.5355131    1.4487062 0.0015884598  -0.02120991    4.5551345 
+   49420    20.371237   0.99861623    23.567279    5.9990798    4.5016548     1.497425 0.0015560108 -0.021245896    4.5213446 
+   49430    20.419084   0.98282454    23.553037    5.9907816    4.5170363    1.4737454 0.0015954955 -0.021737291     4.537178 
+   49440    20.217508   0.99307055    23.642426    5.9919764    4.5028671    1.4891093 0.0016607133 -0.021934643    4.5231411 
+   49450    20.016646   0.97849253    23.802128    6.0011992    4.5339497    1.4672495 0.0017871771 -0.022289207    4.5544517 
+   49460    20.419092   0.99620482    23.572354    6.0162048    4.5223957    1.4938091 0.0018905236 -0.022937351    4.5434425 
+   49470    20.353931   0.98083154    23.673216    5.9999903    4.5292335    1.4707569 0.0019939404 -0.023201809    4.5504413 
+   49480    20.143139   0.98409645    23.527164    6.0146689    4.5390163    1.4756526 0.0020375307 -0.023345402    4.5603242 
+   49490    20.247725    1.0131899    23.921025    6.0273387    4.5080604    1.5192783 0.0020786431 -0.023699769    4.5296815 
+   49500    20.001164    1.0166059     23.88134    6.0399856     4.515585    1.5244006 0.0018651451 -0.022708501    4.5364283 
+   49510    20.187796    1.0066386    23.380853    6.0297901    4.5203354    1.5094547 0.0013603682 -0.020453472    4.5394285 
+   49520    20.035165    1.0060428    23.900885    6.0194075    4.5108463    1.5085612 0.0013713369 -0.020722593    4.5301976 
+   49530    20.161967    1.0044381     23.59164    6.0465345    4.5403795    1.5061549 0.0015329321 -0.021437451    4.5602841 
+   49540    20.326417   0.99775365    23.658955    6.0632017    4.5670701    1.4961316 0.0015139343 -0.020929958    4.5864862 
+   49550    20.422165    1.0199317    23.737265    6.0641224    4.5347349    1.5293875 0.0015590851  -0.02120534    4.5543812 
+   49560    20.352315    1.0251985    23.707818    6.0876907    4.5504055    1.5372852 0.0016833398 -0.021878889    4.5706011 
+   49570    20.308226    1.0333085    23.689489    6.0825021     4.533056    1.5494461 0.0018693984 -0.022818913    4.5540055 
+   49580    20.244398    1.0166015    23.894117    6.0707639      4.54637    1.5243939 0.0018696006 -0.022407379    4.5669078 
+   49590    20.327445    1.0283436    23.785233    6.0780648    4.5360636    1.5420013  0.001803078 -0.022079905    4.5563404 
+   49600      20.2178    1.0476443    23.763777    6.0952589    4.5243162    1.5709427  0.001573043 -0.020888929    4.5436321 
+   49610    20.223364    1.0375874    23.677047    6.0960719    4.5402096    1.5558623 0.0014702163 -0.020439035    4.5591784 
+   49620    20.331084    1.0167826    23.956232    6.0544599    4.5297944    1.5246655 0.0017372775 -0.021718506    4.5497756 
+   49630    20.365098    1.0068766    23.629201    6.0432985    4.5334871    1.5098114 0.0020585746 -0.023208323    4.5546368 
+   49640    20.332175   0.99137073    23.529578    6.0351569    4.5485965    1.4865604 0.0021246313 -0.023365241    4.5698371 
+   49650    20.036399    1.0117609    23.728483    6.0549685     4.537833    1.5171355 0.0019348587 -0.022553872     4.558452 
+   49660    19.883148    1.0020744    23.441634    6.0275668    4.5249562    1.5026106 0.0018764935 -0.022430061    4.5455098 
+   49670    20.152382    1.0045662    23.672501    6.0258117    4.5194646     1.506347 0.0019490492 -0.023101656    4.5406173 
+   49680    20.084614    1.0162295    23.780029    6.0388918    4.5150557    1.5238361 0.0017976323 -0.022311943      4.53557 
+   49690    20.289152    1.0049801    23.669072    6.0474696     4.540502    1.5069676 0.0019078654 -0.023074363    4.5616685 
+   49700    20.329147    1.0100753    23.791167    6.0289011    4.5142931    1.5146079 0.0018790246 -0.023101137    4.5355153 
+   49710    20.417034    1.0097238    23.960489    6.0422259    4.5281451    1.5140808  0.001837642 -0.022446997    4.5487545 
+   49720    20.241195    1.0029771    23.856427    6.0303659    4.5264017    1.5039642 0.0016574553 -0.021187511    4.5459317 
+   49730    20.249616    1.0142653     23.68421    6.0478237    4.5269328    1.5208909 0.0015762467 -0.020721838    4.5460784 
+   49740    20.221873    1.0111096    23.660705     6.060148    4.5439892    1.5161588 0.0016651396 -0.020933744    4.5632578 
+   49750    20.078585    1.0082958     23.76406    6.0344513    4.5225117    1.5119396 0.0017688952  -0.02153225    4.5422751 
+   49760    20.280866   0.99882495    23.684516    6.0278345    4.5300965     1.497738 0.0019132943 -0.022086411    4.5502696 
+   49770    19.907588    1.0070462      23.9037    6.0367673    4.5267015    1.5100658 0.0021930502 -0.023152488    4.5476609 
+   49780    20.274468    0.9994429    23.542574    6.0291941    4.5305295    1.4986646 0.0021645705 -0.023282829    4.5516477 
+   49790    20.266311   0.99426447    23.778971    6.0211002    4.5302006    1.4908996 0.0021759277  -0.02352001    4.5515447 
+   49800    20.481745    1.0225019    23.673419    6.0427981    4.5095565    1.5332416 0.0019203527 -0.021984826     4.529621 
+   49810     20.17896    1.0003297    23.551893    6.0416931    4.5416987    1.4999943 0.0017155182 -0.021064342    4.5610476 
+   49820    20.137353    1.0005453    23.600793    6.0222946    4.5219769    1.5003177 0.0016506126 -0.020827637    4.5411539 
+   49830    20.178748   0.99312983    23.474344    6.0079066    4.5187084    1.4891982 0.0017198067 -0.021390683    4.5383793 
+   49840    19.969132   0.98638973    23.374545    6.0139061    4.5348147    1.4790914 0.0018845806 -0.022350718    4.5552809 
+   49850    20.161297     1.001022    23.510106    6.0243441    4.5233117    1.5010324 0.0018485824  -0.02210462    4.5435678 
+   49860    19.912237    1.0094274    23.902265    6.0234455    4.5098092    1.5136363 0.0018177507 -0.022021776    4.5300132 
+   49870    20.372373    1.0068818    23.600284    6.0387805    4.5289612    1.5098193 0.0016351948  -0.02127823    4.5486042 
+   49880    20.242769    1.0197636    23.496906    6.0557656    4.5266301    1.5291355 0.0016692667  -0.02121687    4.5461777 
+   49890     20.30497   0.98416878    23.684104    6.0256568    4.5498957    1.4757611 0.0016934761 -0.021500502    4.5697027 
+   49900    20.374907   0.99335733    23.718063    6.0187986    4.5292593    1.4895393 0.0017897648 -0.022098499     4.549568 
+   49910    20.167003    1.0119458    23.640922    6.0393727      4.52196    1.5174127 0.0018120921 -0.021939059     4.542087 
+   49920    20.138885   0.99005094    23.784998    6.0249141    4.5403327    1.4845814 0.0017151634 -0.021524261    4.5601418 
+   49930    20.141934    1.0122558     23.80921    6.0456784    4.5278009    1.5178775 0.0016568094 -0.021416483    4.5475606 
+   49940    20.017441    1.0003825    23.832093    6.0415218    4.5414482    1.5000736  0.001739496 -0.021720121    4.5614288 
+   49950    20.129585    1.0103656    23.933006    6.0412711    4.5262279    1.5150433 0.0017483452 -0.021707981    4.5461875 
+   49960    20.289892    1.0237963     23.90489    6.0506861    4.5155034    1.5351826 0.0018165489 -0.021626509    4.5353134 
+   49970    20.107154   0.99919764    23.571025     6.044524    4.5462272    1.4982969 0.0017323985 -0.021278316    4.5657731 
+   49980    19.868258     1.019971    24.054861    6.0512226     4.521776    1.5294466  0.001642951 -0.021018418    4.5411515 
+   49990    20.238464    1.0132942    23.351265     6.068219    4.5487843    1.5194347 0.0015837934 -0.021431437    4.5686319 
+   50000     20.32235    1.0319956    23.750933    6.0775592    4.5300818    1.5474774 0.0017452177 -0.022139025    4.5504756 
+   50010    20.593832    1.0111384    23.817017    6.0602248    4.5440228     1.516202 0.0018103784 -0.022604425    4.5648168 
+   50020     20.40593    1.0066375     23.45924    6.0309777    4.5215247    1.5094529 0.0015642414 -0.021230147    4.5411907 
+   50030    20.393455   0.99669442    23.650083    6.0167279    4.5221846    1.4945433 0.0014489564 -0.020631299    4.5413669 
+   50040    20.300218    1.0158052    23.914803    6.0203468    4.4971469    1.5231999 0.0014744984 -0.020558093    4.5162305 
+   50050    20.143866    1.0046832    23.758339    6.0461934     4.539671    1.5065224  0.001659475 -0.021440259    4.5594518 
+   50060     20.03324    1.0260203    23.871618    6.0504275    4.5119101    1.5385175  0.001721643 -0.021668294    4.5318567 
+   50070    20.391516   0.99447147    23.581478    6.0482941    4.5570841      1.49121  0.001579867 -0.021021681    4.5765259 
+   50080    20.424226    1.0111872    23.784145    6.0609508    4.5446757    1.5162752 0.0015886491 -0.021421161    4.5645082 
+   50090     20.45298    1.0157324    23.970406    6.0576748    4.5345841    1.5230907 0.0016421251 -0.021509217    4.5544512 
+   50100    20.146094    1.0074405    23.498345    6.0419323    4.5312752     1.510657 0.0017926657 -0.022095709    4.5515783 
+   50110    20.254869    1.0165656    23.341154    6.0559216    4.5315814    1.5243402 0.0018857578 -0.022762768    4.5524585 
+   50120    20.303344   0.99495113     23.54103    6.0453804    4.5534512    1.4919292 0.0019909382 -0.023203132    4.5746634 
+   50130    20.091803    1.0117633     23.53821    6.0343619    4.5172228    1.5171391 0.0019765107 -0.022885779    4.5381321 
+   50140    20.272552    1.0067256      23.9568    6.0341949    4.5246099     1.509585 0.0020357394 -0.023138402    4.5457126 
+   50150    20.176029   0.99850459    23.457544    6.0222035    4.5249458    1.4972576 0.0020805138  -0.02345851    4.5463238 
+   50160    20.424644    1.0016325    23.646187    6.0233855    4.5214375     1.501948 0.0021091269 -0.023838157    4.5431665 
+   50170    20.102928   0.98006054    23.409981    5.9893858    4.5197851    1.4696008  0.002067219  -0.02351943    4.5412373 
+   50180    20.302485    1.0037807    23.656431    6.0298884    4.5247193    1.5051691 0.0019541181 -0.023092154    4.5458573 
+   50190    20.142859    1.0085549    23.914005    6.0346946    4.5223665    1.5123281 0.0018127029 -0.022277538    4.5428314 
+   50200    20.279639    1.0024243    23.799334    6.0352859    4.5321507    1.5031352 0.0017503844 -0.021909779    4.5523101 
+   50210    19.965931    1.0219634    23.693977    6.0517407    4.5193066    1.5324341 0.0016965197 -0.021684108    4.5392942 
+   50220    20.245401    1.0139904    23.971868    6.0361654    4.5156868    1.5204786 0.0015774173 -0.020981216    4.5350906 
+   50230    20.247545   0.99909519    23.467385     6.028492    4.5303488    1.4981432 0.0014176351 -0.020116134    4.5490473 
+   50240    20.156064    1.0079691    23.889273    6.0307664    4.5193167    1.5114497 0.0014353776  -0.02045164     4.538333 
+   50250    20.380884   0.98858497    23.747484    6.0358708    4.5534876    1.4823832 0.0016767317  -0.02151735    4.5733282 
+   50260    20.228088   0.99343216    23.653372    6.0224096    4.5327581    1.4896515 0.0017875521 -0.021915843    4.5528864 
+   50270    20.059821    1.0015003    23.323983    6.0234302    4.5216805    1.5017497 0.0017941177 -0.022331129    4.5422175 
+   50280    20.223783    1.0202101    23.767623    6.0509419    4.5211368     1.529805 0.0017543795 -0.021864562     4.541247 
+   50290    20.363716    1.0230419     23.60605    6.0602643     4.526213    1.5340513 0.0015532102 -0.020712242     4.545372 
+   50300    20.232586    1.0041903     23.82473    6.0530918    4.5473085    1.5057833 0.0014729812 -0.020369131    4.5662046 
+   50310    20.284476    1.0212588    23.964725     6.050896    4.5195184    1.5313776 0.0015046798 -0.021024982    4.5390387 
+   50320    20.298691    1.0225421    23.863931    6.0463626    4.5130607    1.5333019 0.0017303403 -0.022048971    4.5333793 
+   50330    20.107887    1.0213438    23.741328    6.0576141    4.5261091     1.531505 0.0018222646  -0.02235609    4.5466429 
+   50340      20.1165    1.0178136    23.480002    6.0606709    4.5344594    1.5262115 0.0017868774 -0.022215178    4.5548877 
+   50350    20.288156    1.0142569    23.840458    6.0491937    4.5283155    1.5208782 0.0018767829 -0.022717405    4.5491561 
+   50360    20.398681    1.0258555     23.66249    6.0595763     4.521306    1.5382703 0.0018747764 -0.022812165    4.5422434 
+   50370    20.089998    1.0159021    23.764975    6.0733507    4.5500056    1.5233452  0.001793111 -0.022549204    4.5707616 
+   50380     20.22337    1.0284175    23.733239    6.0714186    4.5293065    1.5421121 0.0019206629 -0.023242382    4.5506282 
+   50390    20.276761    1.0471726    23.784474    6.0996395    4.5294042    1.5702353 0.0018974737 -0.022960828    4.5504675 
+   50400     20.41781    1.0254276    23.640535    6.0851908    4.5475622    1.5376286 0.0018718376 -0.022873014    4.5685633 
+   50410    20.174664    1.0166121    23.787763    6.0854947    4.5610849    1.5244098 0.0017853754 -0.022235869    4.5815354 
+   50420     19.81291     1.012346    23.861035     6.065803    4.5477902    1.5180128  0.001685514 -0.022059246     4.568164 
+   50430    19.954865    1.0229544    23.658247    6.0628966    4.5289765    1.5339201 0.0018360563 -0.022704446    4.5498449 
+   50440    20.051944    1.0068445     23.48383    6.0373275    4.5275641    1.5097634 0.0019078773 -0.023020202    4.5486764 
+   50450    20.374939   0.99502927    23.565386    6.0147011    4.5226547    1.4920464 0.0018247862  -0.02269837    4.5435283 
+   50460    20.337956   0.98611697    23.808326    6.0009627    4.5222803    1.4786824 0.0018678821 -0.022874274    4.5432867 
+   50470    20.418607   0.98241884    23.521617    5.9732292    4.5000922     1.473137 0.0019115682 -0.023254333     4.521435 
+   50480      20.4112   0.98806832    23.856616    5.9689965    4.4873881    1.4816084 0.0019351099 -0.023132338    4.5085853 
+   50490    20.320728   0.96828092    23.616081     5.973543    4.5216057    1.4519372 0.0020101466 -0.023252062    4.5428477 
+   50500    19.698318    1.0027715    23.790444    6.0042551    4.5005993    1.5036558 0.0019020961 -0.023065549    4.5217627 
+   50510     20.01966   0.96861751    23.696866    6.0079724    4.5555304    1.4524419 0.0019588788 -0.023305301    4.5768769 
+   50520    20.264752    0.9948114    23.624653    6.0265797      4.53486    1.4917197 0.0019150593 -0.022805467    4.5557504 
+   50530     20.08087    1.0005401    23.845878    6.0361313    4.5358214    1.5003099 0.0020254032 -0.023330052    4.5571261 
+   50540    19.968163     1.007577     23.67428    6.0298913    4.5190295    1.5108617 0.0019068028 -0.022821256     4.539944 
+   50550    19.848676    1.0032239    23.432856    6.0222935    4.5179592    1.5043343 0.0021417805 -0.023843739    4.5396612 
+   50560    20.136737    1.0120913    23.919785    6.0512043    4.5335734    1.5176309 0.0022175241 -0.024491073    4.5558469 
+   50570    20.289444    0.9871894    24.001402    6.0163094    4.5360189    1.4802905  0.002206068 -0.024141926    4.5579547 
+   50580     20.44309    1.0008716    23.797466    6.0143867    4.5135798    1.5008069 0.0020754082 -0.023219655     4.534724 
+   50590    20.494589   0.98178248    23.562539    5.9892863    4.5171034    1.4721828 0.0020376806 -0.023488586    4.5385544 
+   50600     20.29656   0.99451157    23.709121    6.0064792    4.5152091    1.4912701 0.0020394338 -0.023882343     4.537052 
+   50610    20.299186     0.977854    23.767685    6.0045628    4.5382707    1.4662921 0.0021107359 -0.024493871    4.5606539 
+   50620    20.160733   0.99362088    23.635507    6.0015002    4.5115657    1.4899345 0.0020350911 -0.024200294    4.5337309 
+   50630    19.883801   0.98078935    23.775532    5.9922755    4.5215819    1.4706936 0.0019220299 -0.023796044    4.5434559 
+   50640    19.827867   0.98926232    23.506207    6.0026623    4.5192635    1.4833989 0.0017623235 -0.023203519    4.5407047 
+   50650     20.09157    1.0188863    23.799503    6.0413883    4.5135684      1.52782 0.0017703239 -0.023211457    4.5350095 
+   50660    20.346393   0.99470228     23.70035    6.0127775    4.5212214    1.4915561 0.0018571502 -0.023387472    4.5427517 
+   50670    20.460892   0.99429583    23.638867    6.0150861    4.5241395    1.4909466 0.0019291786 -0.023720856    4.5459312 
+   50680    20.322544    1.0030098    23.767122    6.0315603    4.5275471    1.5040132  0.001932773 -0.023700626    4.5493149 
+   50690    20.115873    1.0081921    23.564306    6.0425198    4.5307357    1.5117841 0.0018952734 -0.023186647    4.5520271 
+   50700    20.137588    1.0246159    23.657943    6.0542787    4.5178672    1.5364115 0.0017548636 -0.022225567    4.5383379 
+   50710    20.205948    1.0080286    23.891252    6.0501338    4.5385948     1.511539 0.0018264591 -0.022213834    4.5589822 
+   50720    20.017374    1.0418255    24.193185    6.0828894     4.520672    1.5622173 0.0019662076 -0.022359025    4.5410649 
+   50730    20.086309    1.0321413    23.726864    6.0920588    4.5443629    1.5476959 0.0019259014 -0.021900128    4.5643371 
+   50740    19.701441    1.0169954    23.732862    6.0581797    4.5331951    1.5249846 0.0017887018  -0.02148768     4.552894 
+   50750    19.774242    1.0196248    24.033693    6.0809608    4.5520334    1.5289273 0.0016508308 -0.020679044    4.5710616 
+   50760     20.29995    1.0300687    23.826692    6.0636445    4.5190565     1.544588   0.00175709 -0.021130177    4.5384296 
+   50770    20.441758     1.033867    23.738969    6.0820535    4.5317699    1.5502836 0.0016754349  -0.02072771    4.5508222 
+   50780    20.340539    1.0173853    23.659072    6.0654637    4.5398945    1.5255692 0.0015859531 -0.020540423     4.558849 
+   50790    20.270494    1.0315327    23.699086    6.0646604    4.5178771    1.5467833  0.001524556 -0.020535772    4.5368883 
+   50800    20.333477    1.0245156    24.101488    6.0614194    4.5251582    1.5362612 0.0012967311 -0.019408123    4.5432696 
+   50810    20.337024    1.0183149    23.636038    6.0427171     4.515754    1.5269631 0.0012123066 -0.019205998    4.5337477 
+   50820    19.947891     1.009439    23.846963    6.0667355    4.5530818    1.5136537 0.0013517988 -0.019453537    4.5711835 
+   50830    20.252347    1.0263918     23.76917    6.0622683    4.5231937    1.5390746  0.001545353 -0.020476394    4.5421248 
+   50840    20.443331    1.0185553    23.917486    6.0494514    4.5221277    1.5273237 0.0018066378 -0.021820111    4.5421412 
+   50850    19.942654    1.0113126    23.645406    6.0572469    4.5407837    1.5164632 0.0019105099 -0.022326432    4.5611996 
+   50860    20.191577    1.0209579    23.522862    6.0797742    4.5488479    1.5309263 0.0019807785 -0.022827401    4.5696945 
+   50870    19.730122    1.0201884    23.931788    6.0528668    4.5230942    1.5297725 0.0020548917 -0.023327954    4.5443673 
+   50880    19.362007    1.0041245    24.003187    6.0569537    4.5512689    1.5056847 0.0021680607 -0.023869019    4.5729699 
+   50890    19.707453    1.0097778    23.749241    6.0347771    4.5206153    1.5141619 0.0023434922 -0.024887633    4.5431594 
+   50900    20.026521    1.0112591     23.74048    6.0373116    4.5209285    1.5163831  0.002133069 -0.024398779    4.5431942 
+   50910    20.099394    1.0057456    23.542206    6.0236952    4.5155797    1.5081155 0.0021241564  -0.02407833    4.5375339 
+   50920    20.118896    1.0017209    23.675181    6.0184126    4.5163322    1.5020805 0.0020668761 -0.024094533    4.5383598 
+   50930     20.10367     1.002912     23.77415    6.0155464    4.5116799    1.5038665 0.0023776637 -0.025428514    4.5347307 
+   50940    20.449522   0.99994562    23.509707    6.0354225    4.5360041    1.4994185 0.0024042678 -0.025679391    4.5592792 
+   50950    20.570159    1.0020325     23.56575    6.0327071    4.5301594    1.5025477 0.0023622224 -0.025498042    4.5532952 
+   50960    20.222422   0.99714437    23.915939    6.0150585    4.5198405     1.495218 0.0021779578 -0.025002249    4.5426648 
+   50970    20.027422   0.99553896    23.762864    6.0256563    4.5328456    1.4928107 0.0019218044 -0.023626692    4.5545505 
+   50980    20.215125    1.0025409    23.719731    6.0211777    4.5178677    1.5033101 0.0017009053 -0.022376067    4.5385428 
+   50990    20.071752   0.99213819    23.544971    6.0302887    4.5425775    1.4877112 0.0015582667 -0.021329662    4.5623489 
+   51000    20.088243     1.007193    23.856113    6.0143175    4.5040316    1.5102859 0.0015422458 -0.020923632     4.523413 
+   51010    20.481292   0.98531454    23.689506    5.9839407    4.5064616    1.4774792 0.0015669617 -0.021040059    4.5259346 
+   51020    20.181615    0.9909916    23.837873    5.9942995    4.5083076    1.4859919 0.0014092246 -0.020504988    4.5274033 
+   51030    20.140417   0.99485734    23.672081    6.0199325    4.5281439    1.4917886 0.0013592142 -0.020046119    4.5468308 
+   51040    20.057295    1.0044122    23.754362    6.0366362    4.5305201    1.5061161 0.0015794046 -0.021058173    4.5499988 
+   51050    19.989194    1.0161265    23.896175    6.0638671    4.5401854    1.5236817 0.0017070267 -0.022034693     4.560513 
+   51060    20.226049    1.0177982    23.955188    6.0581849    4.5319965    1.5261884 0.0017192117 -0.022233898    4.5525112 
+   51070    20.212645    1.0066043    23.740848    6.0505831    4.5411798    1.5094032 0.0016036515 -0.022021728    4.5615979 
+   51080    20.100334    1.0061591     23.62584    6.0428603    4.5341247    1.5087356 0.0014882736 -0.021595396    4.5542318 
+   51090    20.395422     1.027844    23.944124    6.0744255    4.5331734    1.5412521 0.0016188292 -0.021769104    4.5533237 
+   51100    20.500454    1.0248339     23.40033    6.0742693    4.5375308    1.5367384 0.0016502247 -0.021944674    4.5578253 
+   51110    19.920343    1.0136568    23.923104     6.067047    4.5470686    1.5199784 0.0015997152 -0.021475021    4.5669439 
+   51120    19.914392    1.0199084    23.907583       6.0437    4.5143473    1.5293527 0.0017198659 -0.022285688    4.5349131 
+   51130    19.804154    1.0087475    23.365993    6.0418643    4.5292474    1.5126169 0.0018606812 -0.023401619    4.5507883 
+   51140    19.797105    1.0136725    23.627455     6.062185    4.5421831     1.520002 0.0017538585 -0.022879744    4.5633089 
+   51150    19.797618    1.0140188    23.686157    6.0546111    4.5340899    1.5205213 0.0017539593 -0.022682421    4.5550183 
+   51160    20.159084    1.0076477    23.764335    6.0444811    4.5335134    1.5109677 0.0017207193 -0.022128068    4.5539208 
+   51170    20.224024    1.0104313    23.602932    6.0402618    4.5251201    1.5151417 0.0017095535 -0.022306529    4.5457171 
+   51180     20.07162    1.0090789    23.722168    6.0365418     4.523428    1.5131138 0.0017663665 -0.022298812    4.5439604 
+   51190    20.415317   0.99922064    23.725519    6.0254398    4.5271084    1.4983313 0.0019154809 -0.022681438    4.5478744 
+   51200     20.55344   0.99037479    23.488039    5.9991115    4.5140445     1.485067 0.0018829828 -0.022164147    4.5343257 
+   51210    20.477546   0.98230699    23.510099    5.9920868    4.5191175    1.4729693 0.0017867751  -0.02157421    4.5389049 
+   51220     20.22458    1.0026172    23.913801    6.0369016     4.533477    1.5034245 0.0016740654 -0.020772133    4.5525751 
+   51230    20.205967    1.0204372    23.929062    6.0537146    4.5235691    1.5301456 0.0017101561 -0.020777584    4.5426365 
+   51240    20.272149    1.0117425    23.620536    6.0441345    4.5270266    1.5171079 0.0018901372 -0.021643683    4.5467802 
+   51250    20.037271    1.0233222    23.878577     6.049641    4.5151693    1.5344716 0.0019570084 -0.022287376    4.5354997 
+   51260    20.184665    1.0061211     23.65271    6.0295345    4.5208558    1.5086787 0.0020349602 -0.022745476    4.5415663 
+   51270    19.908592   0.99787492    23.637736    6.0176114     4.521298    1.4963134  0.002025707 -0.022684325    4.5419566 
+   51280    20.271441    1.0121801     23.89374    6.0286311     4.510867    1.5177641 0.0018552855 -0.021859176    4.5308709 
+   51290    20.197723   0.97663904    23.578527    6.0102771    4.5458068    1.4644702 0.0018542708 -0.021670449     4.565623 
+   51300    20.223591   0.99001724    23.565435    5.9978916    4.5133607    1.4845309  0.001875218 -0.022057276    4.5335428 
+   51310    20.100236    0.9998861    23.623865    6.0359971    4.5366679    1.4993292 0.0021102783 -0.023154345    4.5577119 
+   51320    20.061447   0.98790022     23.64231    6.0288194     4.547463    1.4813564 0.0021450954 -0.023571458    4.5688893 
+   51330       20.437   0.99939552    23.613561    6.0271122    4.5285186    1.4985936 0.0021051968 -0.023382184    4.5497956 
+   51340    20.458747    1.0039131    23.712632    6.0356821    4.5303144    1.5053677 0.0020167401 -0.022922353      4.55122 
+   51350    20.092569   0.99872606    23.623848    6.0145517    4.5169619    1.4975897 0.0019531249 -0.022582361    4.5375912 
+   51360    20.215553   0.99151165     23.63468     6.017254    4.5304822    1.4867717  0.001952354 -0.022834924    4.5513648 
+   51370    19.438428    1.0077994    23.943671    6.0294321     4.518237    1.5111952 0.0019015552 -0.022930466    4.5392659 
+   51380    19.719204     1.022435      24.0469    6.0542239    4.5210826    1.5331413 0.0018489028 -0.022639364     4.541873 
+   51390    20.360679    1.0095884     23.80549    6.0375257    4.5236478    1.5138778 0.0018454878 -0.022503569    4.5443059 
+   51400    20.155828    1.0030949    23.391881    6.0319293    4.5277886    1.5041407 0.0018064925 -0.022082602    4.5480647 
+   51410    20.029259   0.98940155    23.816503    6.0343623    4.5507547    1.4836076 0.0016096431 -0.020952755    4.5700978 
+   51420    20.002336    1.0067426    23.690025    6.0387254    4.5291148    1.5096106 0.0016980736 -0.021608586    4.5490253 
+   51430    19.921216    1.0107553    23.746277    6.0532081    4.5375805    1.5156276  0.001754426 -0.021986378    4.5578124 
+   51440    20.223218    1.0218999    23.667974    6.0866024    4.5542635     1.532339 0.0018331685 -0.022634066    4.5750644 
+   51450    20.452993    1.0213305    23.705104     6.069085    4.5375999    1.5314851 0.0017131546  -0.02197337    4.5578601 
+   51460    20.362752    1.0292781    23.600097    6.0747608    4.5313583    1.5434025  0.001622712 -0.021135061    4.5508706 
+   51470     20.26851    1.0281405    23.744262    6.0899545    4.5482578    1.5416967 0.0016243266  -0.02125505    4.5678885 
+   51480    20.245234    1.0234525    23.601995    6.0525981    4.5179311     1.534667 0.0015275795 -0.021124873    4.5375284 
+   51490    20.087564    1.0361796    23.704276    6.0889632    4.5352119    1.5537513  0.001326654 -0.020142477    4.5540277 
+   51500    19.757521     1.029467    23.801036    6.0718564    4.5281706    1.5436857 0.0013337051 -0.020155598    4.5469925 
+   51510    19.888832    1.0333476    23.447337    6.0782208    4.5287161    1.5495047 0.0013172394 -0.020077825    4.5474767 
+   51520    19.976911    1.0224537    23.672001    6.0821409    4.5489716    1.5331693 0.0011905114  -0.01920887    4.5669899 
+   51530    20.409057    1.0336704    23.564273    6.0999112    4.5499224    1.5499888 0.0013192334 -0.019501646    4.5681048 
+   51540    20.388218    1.0248317    23.639609    6.0829556    4.5462204    1.5367352 0.0014321391 -0.019773116    4.5645614 
+   51550    20.182516    1.0220664    23.680397    6.0980961    4.5655076    1.5325885 0.0017381583 -0.021399392    4.5851688 
+   51560    20.307351    1.0367941    24.066901    6.0990087    4.5443359    1.5546728 0.0019589926 -0.023005806    4.5653827 
+   51570      20.1299    1.0126319    23.626075    6.0588309    4.5403893    1.5184416 0.0019082968 -0.022783814    4.5612648 
+   51580     20.33979    1.0184287    23.517486    6.0664133    4.5392795    1.5271339 0.0018841778 -0.022464112    4.5598594 
+   51590    20.227117    1.0359144    23.851595    6.1159604    4.5626066    1.5533537 0.0019823044 -0.023097427    4.5837218 
+   51600     20.04155    1.0525085      23.8877    6.1155131    4.5372766    1.5782364 0.0021258674 -0.023936665    4.5590874 
+   51610    20.021688    1.0340203    23.767117    6.0925745    4.5420611    1.5505134 0.0020144868 -0.023599077    4.5636457 
+   51620    20.242169    1.0074747     23.60015    6.0386933     4.527985    1.5107083  0.001733438 -0.022146187    4.5483978 
+   51630    20.216724    1.0121377    23.971758    6.0258777    4.5081772    1.5177005 0.0014721711 -0.020403259    4.5271083 
+   51640    20.296684    1.0077131    23.853241    6.0462925    4.5352267    1.5110658 0.0014592748 -0.019926436    4.5536939 
+   51650    20.254974   0.99522443    23.917367    6.0469108    4.5545718     1.492339 0.0015673672 -0.020208244    4.5732127 
+   51660    20.052901   0.99408835    23.676693    6.0430238    4.5523884    1.4906355 0.0015947481 -0.020751401     4.571545 
+   51670    20.255143   0.99534811    23.605172    6.0147441    4.5222196    1.4925245 0.0015677462 -0.020946004    4.5415979 
+   51680    20.218606     1.008879    23.678418    6.0383557    4.5255417     1.512814 0.0016712275 -0.021535677    4.5454061 
+   51690    20.073493    1.0183151    23.631313    6.0487925    4.5218291    1.5269634 0.0018019632 -0.022156185    4.5421833 
+   51700    20.214921   0.99832049    23.529244    6.0300327    4.5330511    1.4969816 0.0017770479 -0.021932411    4.5532065 
+   51710    20.267691    1.0035882     23.78808    6.0334577    4.5285771    1.5048805 0.0019892995 -0.023226411    4.5498143 
+   51720    20.177182    1.0065086    23.826483    6.0058522    4.4965926    1.5092596 0.0021811098 -0.024196593    4.5186081 
+   51730    19.965524   0.99614362    23.733753    6.0274447    4.5337274    1.4937174 0.0021504347 -0.024102829    4.5556798 
+   51740    19.844696   0.98343334    23.670852    6.0045198    4.5298615    1.4746583 0.0020593316 -0.023969535    4.5517717 
+   51750    19.939943   0.99067329     23.66283    5.9979403    4.5124257    1.4855146 0.0020780327 -0.023922455    4.5342701 
+   51760    20.159228   0.98939638    23.541989    5.9964101    4.5128102    1.4835999 0.0022575521 -0.024632922    4.5351856 
+   51770    20.269746     1.014461    23.570314    6.0458505    4.5246662    1.5211843 0.0022419077 -0.024593589    4.5470179 
+   51780     20.44734    1.0186471    23.667067    6.0431699    4.5157086    1.5274613 0.0022083485 -0.024453848    4.5379541 
+   51790    20.212669     1.012728    23.703736    6.0430565    4.5244709    1.5185856 0.0020401686 -0.023755163    4.5461859 
+   51800    20.222042    1.0185124    23.568289     6.044849    4.5175896    1.5272594 0.0018050596 -0.022667772    4.5384523 
+   51810    20.181905   0.99982036    23.497483     6.033327    4.5340964    1.4992306 0.0017768796 -0.022500636    4.5548201 
+   51820    20.263609     1.028619    23.684329    6.0849325    4.5425184    1.5424142 0.0018219758 -0.022535851    4.5632322 
+   51830     20.17197    1.0261976    23.871446    6.0780501    4.5392668    1.5387833 0.0019181926 -0.022610219    4.5599589 
+   51840    20.359101    1.0133678      24.0562    6.0660343    4.5464892    1.5195451 0.0018156976  -0.02184002    4.5665135 
+   51850    20.253046    1.0137528     23.62203    6.0638034     4.543681    1.5201224  0.001827223  -0.02154362    4.5633974 
+   51860    20.064638    1.0187583    24.020585    6.0523136    4.5246855    1.5276281 0.0022054862 -0.023427277    4.5459073 
+   51870    20.041015   0.98870247    23.707935    6.0340811    4.5515218    1.4825594 0.0022946425 -0.023730899     4.572958 
+   51880    20.292261    1.0026042    23.989072    6.0103539     4.506949     1.503405   0.00228154 -0.023554335    4.5282218 
+   51890      20.1956    1.0082881    23.873288    6.0688229    4.5568949     1.511928 0.0022801357 -0.023392598    4.5780074 
+   51900     20.08176     1.039639     23.78359    6.0754185    4.5164798    1.5589387  0.002232731 -0.023268345    4.5375154 
+   51910     20.20846    1.0188494    24.015648    6.0589371    4.5311725    1.5277646 0.0022009078 -0.023833508    4.5528051 
+   51920    20.247688     1.010874    23.546097    6.0540627    4.5382571    1.5158056 0.0022157945 -0.023903471    4.5599447 
+   51930    20.120269     1.021941    23.578434    6.0744874    4.5420869    1.5324005 0.0021785185 -0.023641869    4.5635503 
+   51940    20.127882    1.0203329    23.533641    6.0377347    4.5077454    1.5299893 0.0019995001 -0.023029299    4.5287752 
+   51950    20.167839   0.99307171     23.55019    6.0321455    4.5430344     1.489111 0.0017968798  -0.02202815    4.5632657 
+   51960    20.361813   0.99853704    23.596044    6.0215013     4.524195    1.4973063 0.0016970851 -0.021592261    4.5440902 
+   51970    20.436361    1.0030383    23.628949    6.0274892    4.5234332     1.504056 0.0016074052 -0.020981244     4.542807 
+   51980    20.374368   0.99615845    23.379863    6.0189636     4.525224    1.4937396 0.0015054259 -0.020326146    4.5440447 
+   51990    20.018067     1.006338    23.756812     6.032536    4.5235322    1.5090038  0.001531012 -0.019863031    4.5418642 
+   52000    19.976453    0.9890543    23.896822     6.031469    4.5483821    1.4830869  0.001614389  -0.02045341    4.5672211 
+   52010     20.18891    1.0156891    23.431627    6.0398403    4.5168144    1.5230259 0.0017093112 -0.021285935     4.536391 
+   52020    20.368684   0.97776542      23.4328    6.0221227    4.5559634    1.4661592 0.0017549629   -0.0215966    4.5758051 
+   52030    20.273725    1.0064843    23.605025    6.0542622     4.545039    1.5092233 0.0017569347 -0.021654496    4.5649365 
+   52040    20.149414    1.0212259    23.796898    6.0616954    4.5303672    1.5313282 0.0013859809 -0.020119642    4.5491009 
+   52050    20.250779     1.007473    23.762717    6.0540483    4.5433425    1.5107057 0.0011311836 -0.019223625     4.561435 
+   52060    20.239601    1.0135583    23.727539    6.0297986    4.5099679    1.5198307 0.0011159371 -0.019244754    4.5280967 
+   52070    20.206558    1.0253451    23.699991    6.0602263    4.5227212     1.537505 0.0011333784 -0.019594803    4.5411826 
+   52080    20.142676    1.0168217    23.664922     6.055103    4.5303788    1.5247242 0.0012796774  -0.02036695    4.5494661 
+   52090    20.346548    1.0057203    23.707402    6.0346777    4.5266001    1.5080776 0.0011791262 -0.019373535    4.5447945 
+   52100    20.058817    1.0228164    23.509049    6.0361262     4.502413    1.5337132 0.00099986836 -0.018539477    4.5199526 
+   52110    20.199033   0.99533849    23.800697    6.0368885    4.5443785    1.4925101 0.00091981716 -0.018149807    4.5616085 
+   52120    20.255404    1.0064551    23.793639    6.0549319    4.5457524    1.5091795 0.00071198678 -0.017626948    4.5626673 
+   52130    20.212443   0.97997597    23.662197    6.0311909    4.5617169     1.469474 0.00085657631 -0.018669417    4.5795298 
+   52140    20.337511    1.0001732    23.657631    6.0345182    4.5347585    1.4997598 0.00097393367  -0.01913811    4.5529227 
+   52150    20.392293    0.9836572    23.601896    6.0299651    4.5549712     1.474994 0.0011278457 -0.019898713     4.573742 
+   52160    20.395358   0.99080992    23.568605    6.0310115    4.5452921    1.4857195  0.001254239 -0.020458508    4.5644963 
+   52170    20.364431   0.98906403    23.618005    6.0401372    4.5570357    1.4831015 0.0013708759 -0.020989804    4.5766546 
+   52180    20.310477    1.0160867    23.327123    6.0494231    4.5258011     1.523622 0.0013288669 -0.020890065    4.5453623 
+   52190     20.21664    1.0126987    23.664268    6.0520606    4.5335189    1.5185417 0.0014815946 -0.021324775     4.553362 
+   52200    20.081185    1.0130669    23.457176    6.0488298     4.529736    1.5190938 0.0015729882 -0.021545495    4.5497085 
+   52210    19.872798    1.0043136    23.860945    6.0475334    4.5415652    1.5059682 0.0017333214 -0.021691689    4.5615236 
+   52220    20.273282   0.99550911    23.990595    6.0217832    4.5290173    1.4927659 0.0018598375 -0.021827843    4.5489853 
+   52230    20.208401   0.99577169    23.718838    6.0467192    4.5535595    1.4931597 0.0019561329 -0.021887274    4.5734907 
+   52240    20.033387   0.99685777    23.682195    6.0314505    4.5366622    1.4947882 0.0018900625 -0.021880586    4.5566527 
+   52250    20.402489   0.99180555    23.677269    6.0185934     4.531381    1.4872124 0.0018165346 -0.021536719    4.5511011 
+   52260    20.112105   0.99777104    23.945059    6.0405347     4.544377    1.4961577 0.0019698276 -0.022276845     4.564684 
+   52270    19.988349    1.0103516    23.774531    6.0299926    4.5149704    1.5150222 0.0021262513 -0.023700351    4.5365445 
+   52280    20.216386   0.99491152    23.418006    6.0476303    4.5557605    1.4918698 0.0019938713 -0.022680334    4.5764469 
+   52290    20.047278    1.0230364    24.049817    6.0574667    4.5234236    1.5340431 0.0017821113 -0.021593265    4.5432348 
+   52300    20.279196    1.0067304    23.732148    6.0641548    4.5545626    1.5095922 0.0017028076 -0.021326079    4.5741859 
+   52310    20.222345    1.0294571    23.927395    6.0757821    4.5321113    1.5436709 0.0016731929 -0.021040665    4.5514788 
+   52320    20.326186    1.0085703    23.919764     6.040941    4.5285899    1.5123511 0.0017653587 -0.021295991    4.5481205 
+   52330    20.168541    1.0009301    23.881959    6.0385428    4.5376481    1.5008947 0.0018927064 -0.021964293    4.5577197 
+   52340    19.835979    1.0116439    23.589482     6.063806     4.546846      1.51696 0.0017367317 -0.021451101    4.5665604 
+   52350     19.91917    1.0017566    23.417488    6.0473964    4.5452624     1.502134 0.0018767605 -0.022468411    4.5658541 
+   52360     20.32244   0.99216269     23.71612    6.0333401    4.5455922    1.4877479  0.002004871 -0.022909444    4.5664967 
+   52370     20.12945   0.98182396    23.617055    6.0075202    4.5352751     1.472245 0.0021352978 -0.023870315    4.5570102 
+   52380    20.091481    0.9907747    23.693079    5.9925267    4.5068601    1.4856667 0.0021834534 -0.024440308    4.5291169 
+   52390    19.804571   0.99525321    23.395534    6.0107239    4.5183418    1.4923822 0.0020489312 -0.024109901    4.5404027 
+   52400    20.151624    0.9806163     23.87449    5.9996624    4.5292282    1.4704341 0.0019615905 -0.023553836    4.5508205 
+   52410    20.169394    1.0166563     23.65353    6.0336399    4.5091639    1.5244761 0.0018886402 -0.022953871    4.5302291 
+   52420    20.218589    1.0086436    23.801773    6.0513006    4.5388396     1.512461 0.0020229579  -0.02320859    4.5600252 
+   52430    20.180828    1.0075626    23.638378    6.0479844    4.5371442    1.5108402 0.0021565518 -0.023649148    4.5586368 
+   52440    20.072655    1.0212842    23.806389    6.0456791    4.5142635    1.5314156 0.0022440029  -0.02380231    4.5358218 
+   52450    20.070828    1.0416992    23.854733    6.0658923    4.5038643     1.562028  0.002196116 -0.023873816     4.525542 
+   52460    20.308471    1.0008516    23.442076    6.0254716    4.5246947    1.5007769 0.0021356971 -0.023769608    4.5463286 
+   52470    20.157065    1.0092851    23.754361    6.0277768    4.5143539     1.513423 0.0019347307 -0.023041124    4.5354603 
+   52480    20.119971    1.0136809    23.737319    6.0603868    4.5403722    1.5200146 0.0019558794 -0.023189197    4.5616055 
+   52490    20.142053    1.0083884    23.849238    6.0531465    4.5410682    1.5120783 0.0017970216 -0.022503631    4.5617748 
+   52500    20.009497    1.0159478    23.661475    6.0679429    4.5445292    1.5234137 0.0018039295 -0.022026309    4.5647516 
+   52510     20.03553    1.0144992    23.920043    6.0699931    4.5487515    1.5212416  0.001950126 -0.022458962    4.5692603 
+   52520    20.211833    1.0271169    23.677645     6.078472    4.5383102    1.5401618 0.0020128424 -0.022668841    4.5589662 
+   52530    19.697206      1.03598    23.932012    6.0863188    4.5328668     1.553452 0.0019342773 -0.022055339    4.5529878 
+   52540    20.193515    1.0229918     23.70142     6.090314    4.5563377    1.5339762 0.0018632971  -0.02159663    4.5760711 
+   52550      20.1457     1.025551    23.967092    6.0811943    4.5433806    1.5378137 0.0019561625 -0.021940336    4.5633647 
+   52560    19.816006    1.0354785    23.640022    6.0955163    4.5428164       1.5527  0.002034933 -0.022402947    4.5631844 
+   52570    20.247549     1.034362    23.831942    6.0861939    4.5351681    1.5510258 0.0020205621 -0.021827734    4.5549753 
+   52580    19.837255     1.022634    23.964979    6.0647479    4.5313082    1.5334397 0.0020810963 -0.022141993    4.5513691 
+   52590    20.260561    1.0100514    23.957031    6.0615733    4.5470012     1.514572 0.0019567421 -0.021893148    4.5669377 
+   52600    19.886353    1.0204118     23.78709    6.0410305     4.510923    1.5301075 0.0018827968 -0.021522194    4.5305624 
+   52610    20.288725    0.9968827    23.610381    6.0175891    4.5227635    1.4948256 0.0016453871 -0.020508719    4.5416269 
+   52620    20.250038   0.99464688    23.752279    6.0213913    4.5299183     1.491473 0.0014185259 -0.019846842    4.5483466 
+   52630    20.289262   0.98979474    23.544393    6.0184386    4.5342413    1.4841972 0.0010929963 -0.018810469    4.5519588 
+   52640    20.215158    1.0120238    23.804049    6.0264052    4.5088754    1.5175297 0.0011689197 -0.019464564    4.5271711 
+   52650    19.881064    1.0056521    23.713647     6.022842    4.5148666    1.5079753 0.0013534764 -0.020056138    4.5335693 
+   52660    19.983003   0.97636623     23.47363    6.0061205    4.5420593    1.4640612 0.0013322526 -0.020014537    4.5607416 
+   52670    20.011503    1.0160644    23.759169    6.0389782    4.5153896    1.5235885 0.0013294615 -0.019940974    4.5340011 
+   52680    20.495184   0.99034109    23.878365    6.0220437    4.5370273    1.4850165 0.0013903923 -0.019975092     4.555612 
+   52690    19.784714   0.99457874     23.61929     6.001833    4.5104621    1.4913708 0.0012342947 -0.019171477    4.5283993 
+   52700    20.124993    1.0015909    23.799368    6.0127703    4.5108848    1.5018855 0.0011995622 -0.018460496    4.5281457 
+   52710    20.213794   0.99403006    23.741198    6.0128852    4.5223371    1.4905481 0.0013567991 -0.019205853    4.5401862 
+   52720    20.503093   0.98150961    23.418274    6.0066325    4.5348589    1.4717737  0.001374792 -0.019635534    4.5531196 
+   52730    20.428309    1.0034993    23.608277     6.028921    4.5241739    1.5047471 0.0012590367  -0.01949803    4.5424129 
+   52740     20.24096   0.99923119    23.766746    6.0085084    4.5101612    1.4983472 0.0012688488 -0.019703583    4.5285959 
+   52750    19.901879   0.99459434    23.666736     6.007183    4.5157888    1.4913942 0.0013026074 -0.020321916    4.5348081 
+   52760    20.031451   0.97418474    23.683778     5.987469    4.5266789      1.46079 0.0015411518  -0.02154961    4.5466874 
+   52770    19.936332   0.97556235     23.68873    5.9967696    4.5339138    1.4628557 0.0017055449 -0.021952874    4.5541612 
+   52780    20.075118   0.97823632    23.615009     5.987823    4.5209576    1.4668654  0.001527171 -0.021275512     4.540706 
+   52790    19.981671   0.98770359    23.773071    5.9995954    4.5185339    1.4810615 0.0016853749  -0.02201107    4.5388596 
+   52800    20.469441   0.99436459    23.772106     6.012241    4.5211914    1.4910497 0.0019331535 -0.022751768      4.54201 
+   52810    20.292465   0.99890281    23.789995    6.0376565    4.5398017    1.4978548 0.0018524566 -0.022075179    4.5600244 
+   52820    20.178212   0.99432977    23.875724    6.0425912    4.5515937    1.4909975 0.0017819459 -0.021779168    4.5715909 
+   52830    20.248372    1.0064729    23.708511    6.0319634    4.5227573    1.5092061  0.001855234 -0.021802212    4.5427043 
+   52840    20.189974    1.0018548    23.829942    6.0407363    4.5384551    1.5022813  0.001985156  -0.02208275    4.5585526 
+   52850    19.819702   0.99475449    23.395655    6.0259509    4.5343165    1.4916344 0.0020703216 -0.022472846    4.5547191 
+   52860    20.054322    1.0159034    23.796553    6.0545537    4.5312065    1.5233471 0.0022292234   -0.0233159    4.5522932 
+   52870    20.004635    1.0037493    23.788214    6.0511892    4.5460671    1.5051221 0.0021922863 -0.022834345    4.5667091 
+   52880    20.017676   0.99401759    23.472688    6.0220605    4.5315311    1.4905294 0.0021111784 -0.022817621    4.5522375 
+   52890     20.25445    1.0031609    23.672298    6.0289817     4.524742    1.5042397  0.002215114 -0.023606769    4.5461337 
+   52900    20.077096    0.9960063    23.574828    6.0307317    4.5372203    1.4935114 0.0021433315  -0.02370168    4.5587786 
+   52910     20.08907    0.9842161    23.522564    6.0109835    4.5351514     1.475832 0.0020453541 -0.023094446    4.5562005 
+   52920    20.358351   0.99138936    23.474321    6.0224539    4.5358655    1.4865884 0.0020378814  -0.02306565    4.5568933 
+   52930    20.287628    1.0059017    23.685748    6.0345047    4.5261552    1.5083496 0.0019339337 -0.022888447    4.5471097 
+   52940     19.83946    1.0101482    23.797068    6.0579113    4.5431942    1.5147172 0.0019592409 -0.022763545    4.5639985 
+   52950    20.117358    1.0248031    23.447528    6.0706819    4.5339896    1.5366923 0.0019080482 -0.022437833    4.5545194 
+   52960     20.26166    1.0073154    24.006808    6.0450266    4.5345571    1.5104695 0.0018224328  -0.02229851    4.5550332 
+   52970    20.087999     1.022712    23.702131    6.0477729    4.5142163    1.5335566 0.0016821691 -0.021375875      4.53391 
+   52980    20.465322    1.0131942    23.711443    6.0587539    4.5394692    1.5192847 0.0015984044 -0.020953628    4.5588244 
+   52990     20.30294    1.0309287    23.572056    6.0578972    4.5120195    1.5458777 0.0015564174 -0.020619468    4.5310826 
+   53000    20.350786    1.0041983    23.499649    6.0601946    4.5543992    1.5057954 0.0015240323 -0.020788374    4.5736635 
+   53010    20.437736    1.0265021    23.420213    6.0659533    4.5267134    1.5392399 0.0013855162 -0.020340367    4.5456682 
+   53020     20.19779    1.0071424    24.038298    6.0647235    4.5545134      1.51021 0.0014542822 -0.020852217    4.5739114 
+   53030     19.95353    1.0118373    23.642499    6.0633884    4.5461383    1.5172501 0.0016904299 -0.021722531    4.5661704 
+   53040    20.388561   0.99932965    23.488508    6.0518591    4.5533643    1.4984948 0.0016430558 -0.020949186    4.5726704 
+   53050    20.320303   0.99679495    23.678235    6.0318167    4.5371227     1.494694  0.001660525 -0.020599453    4.5560616 
+   53060    20.403038    1.0256276    23.883209    6.0478876     4.509959    1.5379286 0.0015641009 -0.019516259    4.5279112 
+   53070    20.158553    1.0098354    23.820103    6.0453241     4.531076    1.5142481 0.0014886142 -0.019115934    4.5487033 
+   53080    19.877398   0.99968787    23.597848     6.039325    4.5402931     1.499032 0.0014643059 -0.019084795    4.5579135 
+   53090    19.623305    1.0255596    23.790789    6.0590481    4.5212214    1.5378267 0.0014361832 -0.018860216    4.5386455 
+   53100    20.101338    1.0114486    23.702678    6.0570721    4.5404049    1.5166672 0.0015499859 -0.020026463    4.5588813 
+   53110     20.25038    1.0074929     23.95139    6.0382055    4.5274699    1.5107356 0.0016168499 -0.020608129    4.5464612 
+   53120     19.92821    1.0086222    23.713348    6.0375898    4.5251609    1.5124289 0.0015352716  -0.02095025    4.5445759 
+   53130    20.141928    1.0100561    23.776807    6.0261934    4.5116143    1.5145791 0.0014682325 -0.020833887    4.5309799 
+   53140    20.348616   0.98478707    23.452074    6.0296485    4.5529603    1.4766882 0.0015303485 -0.021165115    4.5725951 
+   53150    19.921292    1.0077312    23.685977    6.0303042    4.5192112    1.5110929 0.0014415529 -0.020680662    4.5384504 
+   53160    20.232016    1.0133339    23.782797    6.0227013    4.5032072    1.5194941 0.0013708417 -0.019988557    4.5218249 
+   53170    20.034056    1.0062218    24.019724    6.0258044    4.5169748    1.5088296 0.0013228864 -0.019598282    4.5352502 
+   53180    19.816579    1.0061093      23.2373    6.0373989    4.5287379     1.508661 0.0015291434 -0.020438762    4.5476475 
+   53190    20.013095    1.0270653    23.811518    6.0539334     4.513849    1.5400844 0.0015207635 -0.020100501    4.5324287 
+   53200    20.344463    1.0010942    23.590571    6.0379317     4.536791    1.5011407 0.0016504592 -0.020385634    4.5555261 
+   53210     20.19958   0.98856599    23.540372    6.0238272    4.5414725    1.4823547 0.0017971986 -0.021176202    4.5608515 
+   53220    20.271762    1.0067234    23.763808    6.0194882    4.5099065    1.5095817 0.0018784916 -0.021743522    4.5297715 
+   53230    20.610899    1.0169944    23.814403    6.0288964    4.5039132    1.5249832 0.0018632554 -0.022355156    4.5244051 
+   53240     20.19534    1.0029666     23.63428    6.0262642    4.5223157    1.5039484 0.0018129461  -0.02257069    4.5430735 
+   53250    20.326958   0.98460052    23.205381      6.02265    4.5462415    1.4764085 0.0017538653 -0.022315652    4.5668033 
+   53260    20.598453    1.0192703    23.795033    6.0337826    4.5053868    1.5283958 0.0018833643 -0.022814015    4.5263175 
+   53270    20.285314    1.0169108    23.824755    6.0578262    4.5329685    1.5248577 0.0021728548 -0.024056962    4.5548526 
+   53280    20.201272    1.0151924    23.798304    6.0847055    4.5624245    1.5222811 0.0021206589 -0.024034641    4.5843384 
+   53290    20.328284    1.0343143    23.785691    6.0724887    4.5215343    1.5509543 0.0019849476 -0.023006188    4.5425555 
+   53300    20.314535   0.99992768    23.610845    6.0467049    4.5473133    1.4993916 0.0018104228 -0.022428054    4.5679309 
+   53310     20.26186    1.0010664    23.777835    6.0371365    4.5360375    1.5010991 0.0018484507 -0.022757609    4.5569466 
+   53320    20.236767    1.0057472    23.549153    6.0396253    4.5315074    1.5081179 0.0017227029 -0.022319164    4.5521039 
+   53330    20.436946     1.006148    23.737923     6.031701    4.5229821    1.5087189 0.0017245302 -0.021996593    4.5432541 
+   53340     20.15817    1.0030877    23.894135    6.0478696    4.5437396      1.50413 0.0016933981 -0.021616346    4.5636625 
+   53350    20.125215    1.0015849    24.175424     6.040303    4.5384265    1.5018765 0.0017996146 -0.022136654    4.5587635 
+   53360      20.3679    1.0045489     23.76855    6.0468289    4.5405078    1.5063211  0.001858361 -0.022460661    4.5611101 
+   53370    20.445593    1.0189559     23.63504    6.0454198    4.5174955    1.5279243 0.0017666785 -0.022452589    4.5381814 
+   53380    20.043725    1.0131332    23.874273    6.0554485    4.5362552    1.5191933 0.0017697433 -0.022266137    4.5567516 
+   53390    19.823522    1.0225755    23.653289    6.0885997    4.5552478    1.5333519 0.0017392522 -0.021818441     4.575327 
+   53400    19.944794    1.0033011       23.636     6.073376     4.568926      1.50445 0.0019078125 -0.022441148    4.5894593 
+   53410    20.024035    1.0152083      23.6475    6.0558411    4.5335362    1.5223049  0.002056299 -0.023355853    4.5548358 
+   53420    20.352637    1.0095752    23.895233    6.0593669    4.5455089     1.513858 0.0020668297 -0.023219564    4.5666616 
+   53430     20.18003    1.0188204    23.903128    6.0590815    4.5313602    1.5277212 0.0019586821 -0.022831109    4.5522327 
+   53440    20.300138   0.99794642    23.583157    6.0562049    4.5597842    1.4964207 0.0018358647 -0.022580951    4.5805293 
+   53450    20.110459    1.0123223    23.777426    6.0377265    4.5197493    1.5179772 0.0019123452 -0.023031049     4.540868 
+   53460    20.176082   0.99889543    23.842912    6.0384725    4.5406288    1.4978437 0.0019739452 -0.023368037    4.5620229 
+   53470    19.935873    1.0206816    23.745909    6.0731206    4.5426085    1.5305121 0.0020786986 -0.023757925    4.5642878 
+   53480    19.997361    1.0186971    23.724446    6.0805977    4.5530615    1.5275362 0.0022712359 -0.024458881    4.5752491 
+   53490    20.281657    1.0202533    23.730615    6.0880971    4.5582273    1.5298698 0.0021963055 -0.024114024    4.5801451 
+   53500    20.206905    1.0252939    23.609286    6.0691614    4.5317332    1.5374283 0.0019276687 -0.022617152    4.5524227 
+   53510    20.259309    1.0110706    23.937274    6.0513274    4.5352269    1.5161004 0.0018775337  -0.02211863     4.555468 
+   53520    19.696592    1.0037369    23.834767    6.0287169    4.5236133    1.5051035 0.0019552694  -0.02253108    4.5441891 
+   53530    19.846578    1.0043851    23.551908    6.0552573    4.5491819    1.5060754 0.0019748849  -0.02298227    4.5701893 
+   53540    20.110101    1.0355784    24.046699    6.0807792    4.5279293    1.5528499 0.0020367036 -0.023043457     4.548936 
+   53550    20.016292    1.0298174    24.072592     6.067511    4.5232998    1.5442112 0.0019001909 -0.022650589    4.5440502 
+   53560    20.466863     1.001341    24.005095    6.0247842    4.5232735    1.5015108 0.0018926187 -0.022748778    4.5441296 
+   53570    19.743201   0.99755856    23.697661    6.0117706    4.5159315    1.4958391 0.0019250659 -0.022894744    4.5369012 
+   53580    19.965903   0.98884046    23.531841    6.0088758    4.5261096    1.4827663 0.0018786889 -0.022972002    4.5472029 
+   53590    20.218946   0.98705451    23.686112    6.0223432     4.542255    1.4800882 0.0017434302 -0.022445088    4.5629566 
+   53600    20.280485     1.009209     23.82313    6.0326435    4.5193346    1.5133089 0.0016411846  -0.02153791    4.5392313 
+   53610    20.281083    1.0018538     23.85252    6.0359208    4.5336411    1.5022797 0.0014901404 -0.020660543    4.5528115 
+   53620    20.319852    1.0221389    23.839456    6.0503406    4.5176433    1.5326973 0.0014836111 -0.020717976    4.5368777 
+   53630    20.191359    1.0245162    23.856229    6.0608129    4.5245508    1.5362621 0.0014661514 -0.020104735    4.5431894 
+   53640    20.128207     1.006742    23.662105    6.0412602    4.5316505    1.5096097  0.001445328 -0.020113605    4.5503188 
+   53650     20.31713    1.0033595    23.546963    6.0376639    4.5331263    1.5045376 0.0015081725 -0.020750478    4.5523686 
+   53660    20.378203    1.0146239    23.684688    6.0195109    4.4980824    1.5214286 0.0015690344 -0.021237236    4.5177506 
+   53670    20.124785   0.99917478    23.574962    6.0324842    4.5342216    1.4982626 0.0015254451 -0.020745519    4.5534417 
+   53680    20.329103   0.97922372    23.634443    5.9919438    4.5235978     1.468346 0.0012458839 -0.019458624    4.5418106 
+   53690    20.000525   0.98479889    23.571624    5.9966107    4.5199048    1.4767059 0.0010629402  -0.01875177    4.5375936 
+   53700      20.0702    0.9703372    23.683038    5.9868958    4.5318752    1.4550206 0.0011329513 -0.019307007    4.5500493 
+   53710    20.117581   0.99512018    23.825772    6.0256747    4.5334919    1.4921827 0.0012429594 -0.019917739    4.5521667 
+   53720     20.15606    1.0071702     23.52574    6.0380282    4.5277764    1.5102517 0.0014924375 -0.020980455    4.5472644 
+   53730    20.256774    1.0032155    23.386795    6.0493294    4.5450078    1.5043217 0.0016745078 -0.021674067    4.5650073 
+   53740    20.142922   0.98419981    23.436562    6.0268914    4.5510837    1.4758076 0.0016894392 -0.021886693     4.571281 
+   53750    20.188769   0.99647909    23.688112    6.0374974     4.543277    1.4942204 0.0017875811 -0.022391761    4.5638811 
+   53760    20.230391    1.0097033    23.734224    6.0470116    4.5329615    1.5140501 0.0018201618 -0.022388089    4.5535295 
+   53770    20.084495    1.0122947    23.572407    6.0578643    4.5399284    1.5179359 0.0016785866 -0.021440424    4.5596902 
+   53780    19.852317    1.0099047    23.728812    6.0495857    4.5352337     1.514352 0.0015304301 -0.020347649    4.5540509 
+   53790    20.277133    1.0062074    23.768221    6.0596143    4.5508062     1.508808 0.0013448193 -0.018869255    4.5683307 
+   53800    20.251767    1.0206785    23.597473     6.067371    4.5368636    1.5305074 0.0012226697 -0.018429239    4.5540702 
+   53810    20.329398    1.0257723    23.672487    6.0777711    4.5396256    1.5381455 0.0015062181  -0.01991821    4.5580376 
+   53820    19.910686    1.0128284    23.610754    6.0487957    4.5300595    1.5187362 0.0016606046 -0.020632597    4.5490314 
+   53830     20.16373    0.9991475    23.954449    6.0395911    4.5413695    1.4982217 0.0014573449 -0.019479616    4.5593917 
+   53840    19.930608     1.023516    23.384483    6.0507157    4.5159535    1.5347622 0.0012604752 -0.018984228    4.5336772 
+   53850    19.858552     1.024914     23.75514    6.0614137    4.5245552    1.5368585 0.0013971182 -0.019826403    4.5429845 
+   53860    20.120621    1.0154507     23.82045    6.0612791    4.5386107    1.5226684 0.0014434017 -0.020657264    4.5578246 
+   53870    20.350834    1.0349017    23.970242    6.0793977    4.5275626    1.5518351 0.0014084247 -0.020866509    4.5470206 
+   53880    20.372312    1.0438825    23.696167    6.1068446    4.5415429    1.5653018 0.0016960566 -0.022121532    4.5619683 
+   53890    20.390981    1.0295683    23.939673     6.087052    4.5432143    1.5438377 0.0018916679 -0.023216432    4.5645391 
+   53900    19.783588    1.0261948    23.574622    6.0782845    4.5395054    1.5387791 0.0020228251 -0.023675827    4.5611584 
+   53910    19.995009      1.02259    23.802052     6.078572    4.5451982    1.5333738 0.0022451723 -0.024447724    4.5674007 
+   53920    20.255425     1.031407    23.748788    6.0808633    4.5342685    1.5465948 0.0023386107 -0.024877084    4.5568069 
+   53930    20.120763    1.0205355    23.742066    6.0824132    4.5521202     1.530293 0.0022994793 -0.024836406    4.5746571 
+   53940    20.143254    1.0340447    23.938968    6.0654114    4.5148613    1.5505501 0.0021678093 -0.024407985    4.5371015 
+   53950    20.048175    1.0236885    23.874356    6.0740162    4.5389953    1.5350209 0.0021479884 -0.024446877    4.5612942 
+   53960    19.916381    1.0275322    23.759797    6.0947219    4.5539374    1.5407845 0.0022224829 -0.024317622    4.5760325 
+   53970    20.171217    1.0492982    23.756851     6.119359    4.5459363    1.5734226 0.0023846308 -0.025135428    4.5686871 
+   53980    20.136646    1.0445656    23.900007    6.1133892     4.547063    1.5663262 0.0021517874 -0.024718444    4.5696297 
+   53990    19.913555    1.0439903    23.523226    6.1208005     4.555337    1.5654635 0.0020230599 -0.024372055     4.577686 
+   54000    20.415748    1.0390965    23.798992     6.091495    4.5333699    1.5581251  0.002156783   -0.0248514    4.5560645 
+   54010    20.333492    1.0392144    23.712057    6.0864299    4.5281279     1.558302 0.0020392578 -0.024235517    4.5503242 
+   54020    20.204496    1.0316868    24.117902    6.1015247    4.5545104    1.5470143 0.0020169887 -0.023547352    4.5760407 
+   54030    20.193688    1.0391691    23.640629    6.0987035    4.5404695     1.558234  0.001941598 -0.023528545    4.5620565 
+   54040    20.497026    1.0382377    23.858463    6.0840725     4.527235    1.5568375 0.0018910477 -0.023188786    4.5485328 
+   54050    20.419653    1.0269941    23.763883    6.0778938    4.5379161    1.5399777 0.0018335205 -0.023087775    4.5591703 
+   54060     20.23918    1.0209214    23.358675    6.0827717       4.5519    1.5308717 0.0018533437 -0.023168688    4.5732154 
+   54070    20.219679    1.0340319    23.784595    6.0915014    4.5409706    1.5505308 0.0017734395 -0.022566715    4.5617639 
+   54080    20.073716    1.0370016    23.930383    6.0905378    4.5355539    1.5549839 0.0016433353  -0.02217059    4.5560811 
+   54090    20.055856    1.0506354    24.173305    6.1114314    4.5360036    1.5754278 0.0016983386 -0.022363296    4.5566686 
+   54100    20.136129    1.0344314    23.703452    6.1090342    4.5579043    1.5511299 0.0015032501 -0.021702599    4.5781036 
+   54110    20.182651    1.0360691    24.181226    6.1116774    4.5580918    1.5535856 0.0012142862 -0.020465989    4.5773435 
+   54120    20.327601    1.0307542    23.992651    6.0651725    4.5195566    1.5456159 0.0012703298 -0.020960852    4.5392471 
+   54130    20.039677    1.0112995    23.605531    6.0575042    4.5410606    1.5164436 0.0015500224 -0.021738815    4.5612493 
+   54140    20.418439    1.0009802    23.521889    6.0516345    4.5506647    1.5009697  0.001696111 -0.021415842    4.5703845 
+   54150    20.143703   0.99471878    23.845518    6.0318598     4.540279    1.4915808 0.0017749076 -0.021553109    4.5600572 
+   54160    20.161498   0.99562913    23.699374    6.0440636    4.5511177    1.4929459 0.0015198564 -0.020655699    4.5702536 
+   54170    19.901049    1.0089963    23.663554    6.0663028    4.5533128      1.51299 0.0013647426 -0.019824793    4.5717728 
+   54180     20.20759    1.0123934    23.772559    6.0561314    4.5380476    1.5180838 0.0014820809 -0.020125999    4.5566915 
+   54190    20.167027    1.0209108    23.769418    6.0738572    4.5430015    1.5308557 0.0015525386 -0.020539907    4.5619889 
+   54200    20.297976    1.0029813    23.611088    6.0491861    4.5452156    1.5039704 0.0013780489 -0.019634718    4.5634723 
+   54210    19.889839     1.008379     23.92097    6.0354347    4.5233704    1.5120643 0.0014922061 -0.020459135    4.5423373 
+   54220    20.213045   0.99713483    23.326211    6.0358485    4.5406449    1.4952037 0.0014657129 -0.020528223    4.5597074 
+   54230    20.234493    1.0003169     23.55694    6.0435141    4.5435389    1.4999752 0.0015324655 -0.020901574     4.562908 
+   54240    20.336016    1.0086997    23.838501     6.053121    4.5405758    1.5125453 0.0015831566 -0.021708741    4.5607013 
+   54250    20.370973    1.0398018    23.714257    6.0837269     4.524544    1.5591829 0.0017116556 -0.022087746    4.5449201 
+   54260    19.971035    1.0104406    23.770258    6.0401571    4.5250014    1.5151557 0.0018591036 -0.022844362    4.5459867 
+   54270    20.396892     1.017852    23.965343    6.0623384    4.5360694     1.526269 0.0020258018 -0.023144809    4.5571884 
+   54280    20.228241   0.99797821    23.656146    6.0364449    4.5399766    1.4964683 0.0019401594 -0.022433314    4.5604697 
+   54290    20.446068   0.99465024    23.493761    6.0381431    4.5466651     1.491478 0.0019803493 -0.022739983    4.5674247 
+   54300    20.326227   0.99554733    23.741063    6.0291246    4.5363014    1.4928232 0.0019185057 -0.022597026    4.5569799 
+   54310    20.273564    1.0049843    23.549002    6.0151045    4.5081306     1.506974  0.001903401 -0.022701471    4.5289286 
+   54320     20.24805    1.0020375    23.808942    6.0226513     4.520096    1.5025552 0.0018970603  -0.02245156    4.5406505 
+   54330    20.389182    1.0069534    23.744179    6.0559076     4.545981    1.5099266 0.0018014821 -0.021625528     4.565805 
+   54340    20.414129    1.0194315    23.747348    6.0746673    4.5460298    1.5286375 0.0017012139 -0.021295121    4.5656237 
+   54350    20.376323     1.037721    23.878012    6.0873981    4.5313355    1.5560626 0.0017768074 -0.022148006    4.5517067 
+   54360    20.428474    1.0038039    23.753621    6.0563068    4.5511029    1.5052039 0.0016079488 -0.021517006     4.571012 
+   54370    20.213161    1.0186357    23.842822    6.0699881    4.5425438    1.5274442 0.0016359649  -0.02145526    4.5623631 
+   54380    20.196438    1.0222602    23.846738    6.0804142    4.5475351    1.5328791 0.0017479623 -0.022041114    4.5678282 
+   54390    20.346462    1.0293176    23.491476    6.0810434    4.5375817    1.5434617 0.0016338291 -0.021517789    4.5574657 
+   54400    20.058841    1.0270055    23.813017    6.0794871    4.5394924    1.5399947 0.0016081345 -0.021730037    4.5596143 
+   54410    20.390582    1.0111779    23.635898    6.0698524    4.5535911    1.5162613 0.0018148374 -0.022667134    4.5744434 
+   54420       20.312    1.0277458     23.97718    6.0711563    4.5300515    1.5411048 0.0017584104 -0.022151603    4.5504447 
+   54430    20.386528     1.015036    23.846313    6.0885245     4.566478    1.5220465 0.0018328511 -0.022523638    4.5871688 
+   54440    20.270955     1.021622    23.905818    6.0774905    4.5455684    1.5319221 0.0018863364 -0.023065429    4.5667475 
+   54450    20.282512    1.0041426    23.502447    6.0518657    4.5461539    1.5057119  0.002034314 -0.024096121    4.5682157 
+   54460    20.441956     1.007589     23.72045    6.0260726     4.515193    1.5108796 0.0021513384 -0.024397762    4.5374394 
+   54470    20.005927   0.98855016    23.599642    6.0207993    4.5384683     1.482331 0.0022440607 -0.024701073    4.5609253 
+   54480    20.328109   0.99741881    23.744145    5.9907411    4.4951116    1.4956295 0.0021645769 -0.024055912     4.517003 
+   54490    20.203767   0.97695724    23.638675    5.9983878    4.5334404    1.4649474 0.0020850508 -0.023324375    4.5546797 
+   54500    20.191561   0.99532782    23.575778    6.0058952    4.5134011    1.4924941 0.0021060499 -0.023044085    4.5343391 
+   54510    19.727713    1.0136585    23.860851    6.0378326    4.5178517    1.5199809  0.002113623 -0.023215602    4.5389537 
+   54520    19.989606   0.99863747    24.014252    6.0468712    4.5494143    1.4974569 0.0021193253 -0.023473988     4.570769 
+   54530    20.075037    1.0241573    23.940162    6.0669113    4.5311874    1.5357239 0.0020709146 -0.023035057    4.5521515 
+   54540    20.452457   0.99489319    23.614496    6.0355213     4.543679    1.4918423 0.0018566471 -0.021952079    4.5637744 
+   54550    20.382507    1.0029294    23.609567    6.0482661    4.5443735    1.5038926 0.0016476504 -0.021167976    4.5638938 
+   54560    20.215478    1.0065119    23.605847     6.040202    4.5309375    1.5092645 0.0014193768 -0.020425671    4.5499437 
+   54570    20.488809    1.0028542    24.058035    6.0515557    4.5477758    1.5037799 0.0012500074 -0.019653762    4.5661796 
+   54580    20.268744    1.0221107    23.835261    6.0697859    4.5371309    1.5326551 0.0012616778 -0.019361484    4.5552307 
+   54590    20.338567    1.0300115     23.87113    6.0785908    4.5340886    1.5445022 0.0013935823 -0.020221753    4.5529167 
+   54600    20.415989   0.99558184    23.840643    6.0344968    4.5416218     1.492875 0.0013780735 -0.020341116    4.5605849 
+   54610    20.108857    1.0048679    23.746592    6.0388388    4.5320394    1.5067994   0.00114446 -0.019567487    4.5504624 
+   54620    20.201285    1.0103195    23.848955    6.0352044    4.5202303    1.5149741 0.0011377452 -0.019477248    4.5385698 
+   54630     20.46857    1.0108587    23.607907    6.0679469    4.5521642    1.5157827 0.0010649044 -0.019109393    4.5702087 
+   54640    20.268665    1.0231272     23.76379    6.0862444    4.5520652    1.5341793 0.0012883664 -0.020347092    4.5711239 
+   54650    20.343822    1.0229641    23.550673    6.0866745    4.5527398    1.5339347  0.001566674  -0.02167895    4.5728521 
+   54660    20.134766    1.0282864    23.970232    6.0814435     4.539528    1.5419155 0.0016582708 -0.021805476    4.5596752 
+   54670    20.356572    1.0210105    23.815744    6.0767399    4.5457346    1.5310053 0.0013933684 -0.020475209    4.5648165 
+   54680    20.138976    1.0211823    23.622548    6.0944745    4.5632117    1.5312628 0.0012744946  -0.02009863    4.5820358 
+   54690    20.193651    1.0276371     23.49259     6.092695    4.5517531    1.5409419 0.0015827454 -0.021337992    4.5715084 
+   54700     20.14358      1.03781    23.741003    6.0882208    4.5320247    1.5561961 0.0014463111 -0.020927617     4.551506 
+   54710    20.214971    1.0027117    23.914317    6.0478351    4.5442689    1.5035662 0.0013539829 -0.020250686    4.5631656 
+   54720    20.380811    1.0029117    23.740193    6.0455723    4.5417062    1.5038661 0.0013440705 -0.019444255    4.5598064 
+   54730     20.08939    1.0099001    23.855041    6.0664776    4.5521324    1.5143452 0.0013955347 -0.019448801    4.5701857 
+   54740     19.87253    1.0209938    23.941706    6.0795019    4.5485217    1.5309802  0.001374482  -0.01902913    4.5661764 
+   54750    20.042394    1.0122966     23.60897    6.0455529    4.5276142    1.5179387 0.0014372597 -0.019574302    4.5457513 
+   54760    20.379925    1.0137832     23.53514    6.0544642    4.5342963     1.520168 0.0015476668 -0.020387717    4.5531363 
+   54770    19.871586    1.0019349    23.613583    6.0463661    4.5439648    1.5024013 0.0015080226 -0.020429794    4.5628866 
+   54780    20.005487    1.0143624    23.966027    6.0565579    4.5355215    1.5210364 0.0013538369 -0.019845783    4.5540135 
+   54790    19.789777     0.999071    23.486791    6.0470913    4.5489843     1.498107 0.0015013572 -0.020622318    4.5681053 
+   54800    20.079442    0.9955471     23.77604    6.0273037    4.5344808    1.4928229 0.0015736484 -0.021151552    4.5540587 
+   54810    20.182153    0.9955729    23.542261    6.0068457    4.5139841    1.4928616 0.0017339658 -0.022291854     4.534542 
+   54820    20.212985   0.99635462     23.58979    6.0268976    4.5328638    1.4940338 0.0018484127 -0.022775809    4.5537912 
+   54830    20.209058    1.0120407    23.700946    6.0235495    4.5059945     1.517555 0.0017905099 -0.022662747    4.5268667 
+   54840    20.305687    1.0082179    23.714321    6.0329128    4.5210901    1.5118227 0.0020461987 -0.023370345    4.5424142 
+   54850    20.080395    1.0219715    23.941903    6.0585655    4.5261192    1.5324462 0.0021738071  -0.02385877    4.5478042 
+   54860    20.130389    1.0200697    23.894957    6.0259722    4.4963776    1.5295945 0.0021244212 -0.023612018    4.5178652 
+   54870    20.365999    1.0077941    23.853951    6.0169752     4.505788    1.5111872 0.0018980263 -0.022750538    4.5266405 
+   54880    19.986506     1.010894    23.818079    6.0309911    4.5151555    1.5158356 0.0018963969 -0.022475676    4.5357348 
+   54890    20.233359   0.98950509    23.643176    5.9960411    4.5122782    1.4837629 0.0019020392 -0.022257605    4.5326338 
+   54900    19.959591    0.9910014    23.967559    6.0233354    4.5373288    1.4860066  0.001894427 -0.022220787    4.5576552 
+   54910    20.022937   0.99575429    23.895485    6.0372204    4.5440869    1.4931336 0.0018218892 -0.022164731    4.5644297 
+   54920    20.187634   0.99340945    23.690686    6.0243587    4.5347413    1.4896175  0.001688077 -0.021778395    4.5548316 
+   54930    20.214878    0.9945824    23.471446    6.0215441    4.5301678    1.4913763 0.0016660663 -0.021718202      4.55022 
+   54940    20.140191   0.99057768    23.603744    6.0067848    4.5214136    1.4853712 0.0015603002 -0.021669816    4.5415231 
+   54950    20.291995    1.0012804    23.645994    6.0093962    4.5079763    1.5014199 0.0017883859 -0.022763432    4.5289513 
+   54960     20.34057    1.0086646    23.618988    6.0382541    4.5257615    1.5124926 0.0016792111 -0.021816219    4.5458985 
+   54970    20.219729    1.0078725    23.538298    6.0488549    4.5375501    1.5113048 0.0016170256 -0.021127325    4.5570604 
+   54980    20.251191    1.0238891     23.82218    6.0452473    4.5099256    1.5353216 0.0014414149  -0.01998301    4.5284672 
+   54990    20.181787    1.0097797    23.696602    6.0508079    4.5366432    1.5141646 0.0012475708 -0.018946382     4.554342 
+   55000    20.333351   0.99246857    23.733134    6.0293448    4.5411382    1.4882066 0.0013575669 -0.019465368     4.559246 
+   55010    20.279189    1.0082543    23.582884    6.0529375    4.5410602    1.5118773 0.0012654557 -0.019306792    4.5591015 
+   55020    20.337355     1.029696    23.851829     6.075604    4.5315749    1.5440291 0.0012718441  -0.01891474    4.5492178 
+   55030    20.143285    1.0424168    23.691726    6.0899051    4.5268011     1.563104 0.0012368136 -0.018885017    4.5444493 
+   55040    20.051644    1.0063728    23.562558    6.0700987    4.5610426    1.5090561 0.0011953005 -0.018422864    4.5782702 
+   55050    20.168034    1.0157345    23.767234    6.0692992    4.5462054    1.5230939 0.0013559621 -0.019003744    4.5638531 
+   55060    19.677041    1.0133779     23.79106    6.0830903    4.5635302    1.5195601 0.0016548002  -0.02042444    4.5822998 
+   55070    20.146248    1.0185597    23.622722    6.0774454    4.5501151    1.5273303 0.0016286257 -0.020180712    4.5686672 
+   55080    20.339336    1.0264792    23.686471    6.0807002    4.5414946    1.5392055  0.001663275  -0.02015891    4.5599903 
+   55090    20.455807    1.0139854    23.597674    6.0785155    4.5580443    1.5204711 0.0017731165 -0.021654221    4.5779254 
+   55100    20.309642    1.0272317    24.026627    6.0658425    4.5255086     1.540334 0.0017573479 -0.021867322    4.5456185 
+   55110    20.266314    1.0079714    23.668617    6.0636974    4.5522443    1.5114531 0.0016823987   -0.0216673    4.5722292 
+   55120    20.085886    1.0003205     23.64353    6.0487425    4.5487619    1.4999806 0.0018081619 -0.022522447    4.5694762 
+   55130    20.420811    1.0153934    23.522481    6.0660948    4.5435124    1.5225824 0.0017688743 -0.022741103    4.5644846 
+   55140    20.123178    1.0316325    23.648271     6.074073    4.5271401     1.546933 0.0017439137   -0.0222628    4.5476589 
+   55150    20.167893     1.018057    23.871754    6.0660153    4.5394388    1.5265765 0.0018378145 -0.022718375    4.5603193 
+   55160    20.190269    1.0027429    23.612611    6.0433342    4.5397213     1.503613 0.0019391841 -0.023230586    4.5610127 
+   55170    20.125283    1.0094293     23.58104    6.0596947    4.5460555    1.5136392 0.0018657844 -0.022661668    4.5668514 
+   55180    20.079138    1.0255037    23.922125    6.0715303    4.5337875    1.5377428 0.0015413086  -0.02140308    4.5536493 
+   55190    20.071081    1.0374136     23.84258    6.0970495    4.5414477    1.5556018 0.0016691408 -0.021776141    4.5615547 
+   55200    20.301434    1.0215924    23.809161    6.1000651    4.5681873    1.5318778 0.0015879885 -0.021197805    4.5877971 
+   55210    19.796907    1.0056152     23.73799    6.0646593    4.5567393      1.50792 0.0016149748 -0.021228149    4.5763525 
+   55220    19.700624     1.025177     23.43991    6.0650469     4.527794    1.5372529 0.0017300656 -0.022070444    4.5481344 
+   55230    20.271342    1.0056292    23.733635    6.0574587    4.5495178    1.5079409 0.0015550487 -0.021164009    4.5691268 
+   55240    19.888978   0.99518179    23.519757    6.0295256    4.5372505    1.4922751 0.0013726271 -0.020312629    4.5561905 
+   55250    20.128202    1.0025852    23.677022    6.0319431    4.5285665    1.5033765 0.0014231387 -0.020204788    4.5473482 
+   55260    20.168414   0.99902027    23.848251    6.0314057    4.5333748    1.4980309 0.0014063362 -0.019910213    4.5518787 
+   55270    20.321994   0.99686545    23.614589    6.0371043    4.5423046    1.4947997 0.0016468899 -0.021105485    4.5617632 
+   55280    20.468292    1.0061182    23.670354    6.0444186    4.5357444    1.5086742 0.0017419929 -0.021588803    4.5555912 
+   55290      20.0121    1.0057007    23.650745     6.018812    4.5107638    1.5080482 0.0016969791 -0.021611445    4.5306782 
+   55300      20.1034   0.98695204    23.875717    6.0258921    4.5459575    1.4799346 0.0018020489  -0.02197116    4.5661266 
+   55310    20.215951   0.98858466    23.756565        6.004    4.5216173    1.4823827 0.0018739357  -0.02231128    4.5420547 
+   55320     20.13099    1.0011675    23.725506    6.0162377     4.514987    1.5012507 0.0018268595 -0.022072681    4.5352328 
+   55330    20.015112    1.0149445    23.746784    6.0558148    4.5339055    1.5219093 0.0017121802 -0.021678711     4.553872 
+   55340    20.260469    1.0124947    23.842525    6.0444876    4.5262517    1.5182359 0.0016316167 -0.021555023    4.5461751 
+   55350    19.728752    1.0202494    23.872374    6.0559998    4.5261358     1.529864 0.0017741665 -0.022252315     4.546614 
+   55360    20.052127    1.0062768    24.144951    6.0582653    4.5493533     1.508912 0.0018478947 -0.022513669     4.570019 
+   55370    20.515141     1.042215    23.858022    6.1023455    4.5395442    1.5628014 0.0019020683 -0.022393072    4.5600352 
+   55380    20.383075    1.0182598    23.608948    6.0971561    4.5702755    1.5268806 0.0018591726 -0.022371017    4.5907874 
+   55390    20.443864    1.0267401    23.862601    6.0901582    4.5505615    1.5395967 0.0017178003 -0.021756661    4.5706003 
+   55400    20.392728    1.0215519    23.464386     6.076682    4.5448649    1.5318171  0.001447322 -0.020240357     4.563658 
+   55410    20.167502    1.0070869    23.768245    6.0631924    4.5530655    1.5101269 0.0013388356 -0.019738945    4.5714657 
+   55420     20.26531    1.0105405    23.583948    6.0883576    4.5730521    1.5153055 0.0014403042 -0.020495199     4.592107 
+   55430    20.073655    1.0339471    23.855595    6.0640487     4.513645    1.5504037  0.001221634 -0.019473958    4.5318973 
+   55440    20.321882   0.99929678    23.643656    6.0417754    4.5433299    1.4984455 0.0011943721 -0.019548636    4.5616841 
+   55450    20.380573   0.99832407    23.798143     6.055576     4.558589    1.4969869 0.0012739421 -0.020181521    4.5774966 
+   55460    20.291319     1.032284    23.730503    6.0605409    4.5126311    1.5479098 0.0014107887 -0.020781529    4.5320018 
+   55470    20.180191    1.0075009    23.937331    6.0493614    4.5386138    1.5107477 0.0014837579 -0.021404585    4.5585346 
+   55480    20.246773    1.0098401     23.55953    6.0527664    4.5385111    1.5142553 0.0016238625 -0.021749353    4.5586366 
+   55490    20.291755    1.0013189     23.70256    6.0314481    4.5299704    1.5014776 0.0017463198 -0.022297737    4.5505218 
+   55500    20.116718   0.99621741    23.623877    6.0131925    4.5193645     1.493828 0.0018778648 -0.022805989    4.5402926 
+   55510    20.009509   0.97180984    23.568613    5.9849366    4.5277077    1.4572289 0.0018866397 -0.022571533    4.5483926 
+   55520    20.388136   0.98030115    23.260819    5.9801721    4.5102106    1.4699616 0.0019568168  -0.02349162    4.5317454 
+   55530     19.91382   0.98745173     23.78137      5.98283    4.5021461    1.4806839 0.0021418466 -0.024518066    4.5245223 
+   55540    20.221338   0.97277866    23.672912    5.9815091    4.5228275    1.4586816 0.0021641456 -0.024236359    4.5448997 
+   55550     20.20444     1.004752    23.725674    6.0145468    4.5079211    1.5066257  0.002233296 -0.024677479    4.5303653 
+   55560    20.240183    1.0055572    23.801807    6.0279623    4.5201293    1.5078331 0.0020143737 -0.024039152     4.542154 
+   55570    20.076896   0.99071993    23.884414    6.0008629    4.5152783    1.4855845  0.002077036 -0.024228814    4.5374301 
+   55580    20.053477   0.98497633    23.728879    5.9771233    4.5001513     1.476972 0.0019238268 -0.023331611    4.5215591 
+   55590    20.291079   0.98285304     23.68464    5.9964072    4.5226191    1.4737881 0.0018555884 -0.023611255    4.5443747 
+   55600    20.331849   0.99581127     23.71418    6.0065393    4.5133203     1.493219 0.0018524721 -0.023244481    4.5347123 
+   55610    20.048208    1.0033137    23.810039    6.0341765    4.5297076     1.504469 0.0018560565 -0.022857869    4.5507094 
+   55620    20.238249   0.98146797    23.644076    5.9721062     4.500395    1.4717112 0.0019589564 -0.023217799    4.5216539 
+   55630    20.305893   0.98897417     23.44849    5.9987639    4.5157971    1.4829668 0.0020092731 -0.023433416    4.5372213 
+   55640    20.366378   0.99330757    23.863311    5.9949271    4.5054624    1.4894647 0.0022085629 -0.024109207     4.527363 
+   55650    20.247131   0.99897955     23.56097    6.0066129     4.508643    1.4979698 0.0021453135 -0.023947279     4.530445 
+   55660     20.25839   0.97365287    23.837182      5.98588    4.5258875    1.4599925 0.0020181553 -0.023131929    4.5470013 
+   55670    20.052662   0.97874433    23.700679     6.021902    4.5542749    1.4676271 0.0020777115 -0.023625863    4.5758231 
+   55680    20.016247    1.0088912    23.755106    6.0443546    4.5315222    1.5128324 0.0019224839  -0.02304297    4.5526427 
+   55690    20.018308    1.0162746    23.718934    6.0261236    4.5022198    1.5239038 0.0017617943 -0.022021127    4.5224792 
+   55700    20.282059    1.0146364    23.647991    6.0374518    4.5160045    1.5214473 0.0015928982 -0.021246734    4.5356583 
+   55710    20.279153    1.0012074    23.609253    6.0443608    4.5430503    1.5013105 0.0015125024 -0.020817701    4.5623555 
+   55720    20.304934    1.0013516    23.659275    6.0352111    4.5336843    1.5015268 0.0015227096 -0.020797096    4.5529587 
+   55730    19.908961    1.0097038    23.801873    6.0298561    4.5158053    1.5140508 0.0017003461 -0.021526042     4.535631 
+   55740    20.495517   0.99561396    23.863195    6.0097505    4.5168273    1.4929231 0.0015310847  -0.02082042    4.5361167 
+   55750    20.252449   0.99260359    23.576444    6.0224849    4.5340758    1.4884091 0.0015215324  -0.02068509    4.5532393 
+   55760    20.066494    1.0250331    23.957781    6.0661619    4.5291248    1.5370371 0.0015069521 -0.020807594    4.5484254 
+   55770     20.23543    1.0221941    23.636207    6.0777685    4.5449885      1.53278 0.0014139961 -0.020885363    4.5644598 
+   55780    20.100801     1.036357    23.511915    6.0986004     4.544583    1.5540173 0.0015454701 -0.021502772    4.5645403 
+   55790    20.357805    1.0374938    23.881577     6.079717     4.523995     1.555722 0.0015923855 -0.021499651    4.5439023 
+   55800    20.259542    1.0433215    23.910428    6.1198671    4.5554065    1.5644606 0.0015586359  -0.02117121    4.5750191 
+   55810    20.353112    1.0357276    23.832799    6.0947701    4.5416965    1.5530735  0.001661357 -0.021627857     4.561663 
+   55820    20.358214     1.020254    23.859088    6.0660878    4.5362169    1.5298709 0.0017620213 -0.021984649    4.5564395 
+   55830    20.260609    1.0314942    23.810169    6.0971864    4.5504609    1.5467255 0.0017573316 -0.022089007    4.5707926 
+   55840    19.908247    1.0156413     23.95256     6.073488    4.5505339    1.5229541 0.0017968562 -0.022690538    4.5714276 
+   55850    19.954198    1.0436143    23.785984    6.0923831    4.5274835    1.5648997 0.0019587898 -0.023310382    4.5488351 
+   55860    20.528303    1.0226854    23.911335    6.0649313    4.5314146    1.5335167 0.0020102506 -0.023387014    4.5527913 
+   55870    20.413571    1.0208267    23.732636    6.0656539    4.5349243    1.5307296 0.0017774312 -0.022205917    4.5553528 
+   55880    20.247402     1.015815    23.722521    6.0759293    4.5527147    1.5232146 0.0015938914 -0.021314289    4.5724351 
+   55890    20.216745    1.0062485    23.991335    6.0274716     4.518602    1.5088696 0.0014028235 -0.020270827      4.53747 
+   55900    20.170555   0.98199011    23.527916    6.0209092     4.548415    1.4724942  0.001529632 -0.020783332    4.5676687 
+   55910    20.321216    1.0008258    23.580002     6.038283    4.5375448    1.5007382  0.001581223 -0.021052036    4.5570156 
+   55920    20.462569   0.99306135    23.774007    6.0303222    4.5412267    1.4890955 0.0018239521  -0.02234246    4.5617452 
+   55930     20.27847    1.0188254    23.631681    6.0431141    4.5153854    1.5277287 0.0018838043 -0.022699992    4.5362016 
+   55940    20.184173     1.015324    23.967356    6.0570311    4.5345528    1.5224784 0.0020144425 -0.023853433    4.5563918 
+   55950    20.384889     1.018399    23.667851     6.067446    4.5403567    1.5270893 0.0021079455 -0.024188233     4.562437 
+   55960    19.877666    1.0346524    23.960197    6.0865194    4.5350581    1.5514613 0.0021740905 -0.024638419    4.5575225 
+   55970    20.078911    1.0314505    23.917947    6.0801066    4.5334466      1.54666 0.0021787938 -0.024856901    4.5561247 
+   55980    20.264159    1.0187703    23.608777    6.0557466    4.5281005     1.527646 0.0020827471  -0.02415829    4.5501761 
+   55990    19.857738      1.01681    23.497977    6.0390007    4.5142941    1.5247065 0.0021382416 -0.024165099     4.536321 
+   56000    19.890085    1.0150936    23.794663    6.0439808    4.5218479    1.5221329 0.0021184593  -0.02378097    4.5435104 
+   56010    20.099981   0.99573146    23.641228     6.024154    4.5310547    1.4930993 0.0019618156   -0.0232383    4.5523312 
+   56020    20.323993     1.010388    23.665228    6.0439919     4.528915    1.5150768 0.0018757076 -0.023108456    4.5501478 
+   56030    20.283139    1.0161569    23.737223    6.0419633    4.5182361    1.5237272 0.0020250899 -0.023887106    4.5400981 
+   56040    20.004921   0.99641999    23.520582     6.034266    4.5401342    1.4941318 0.0021839327 -0.024720838    4.5626711 
+   56050    20.194417    1.0099636    23.808443    6.0372673    4.5228269    1.5144404 0.0022275958 -0.024821997    4.5454213 
+   56060    20.135461    1.0027996     23.71002    6.0379603    4.5342623     1.503698 0.0021191209 -0.024359252    4.5565024 
+   56070    20.257783   0.99539558    23.565191    6.0316663    4.5390706    1.4925957 0.0018765167 -0.023195978      4.56039 
+   56080    20.161762   0.99219685    23.461064    6.0342857    4.5464865    1.4877992 0.0017264759 -0.022424784    4.5671848 
+   56090    20.086242    1.0031232    23.623705    6.0426434    4.5384602    1.5041832 0.0015438364 -0.021337222    4.5582536 
+   56100      19.9667   0.99756323    23.851509    6.0225073    4.5266613    1.4958461 0.0014210666 -0.020700965    4.5459412 
+   56110    20.160442    1.0088656    23.820905    6.0373827    4.5245887     1.512794 0.0013878201   -0.0205891      4.54379 
+   56120    20.399852    1.0028887     23.83249     6.037576    4.5337444    1.5038316 0.0014328149 -0.020699173    4.5530108 
+   56130    19.865775   0.99003046    23.789543    6.0345996    4.5500489    1.4845507 0.0014828591 -0.020628481    4.5691946 
+   56140    20.097803    1.0172584    23.701469    6.0610262    4.5356472     1.525379 0.0016548614  -0.02113157    4.5551239 
+   56150    20.412338     1.014098    23.624271    6.0494685    4.5288286    1.5206399 0.0015976136 -0.020603708    4.5478347 
+   56160    20.309164    1.0043823    23.653238    6.0541534    4.5480821    1.5060713 0.0014485956 -0.020312764    4.5669463 
+   56170     20.48713    1.0013966    23.732625    6.0445076    4.5429134    1.5015943 0.0016163216 -0.021252216    4.5625493 
+   56180    20.241927    1.0074629    23.832386    6.0374382    4.5267476    1.5106906 0.0017238832 -0.021841937    4.5468657 
+   56190    20.446589    1.0039589    23.632197    6.0377434    4.5323071    1.5054363 0.0018838027 -0.022527407    4.5529507 
+   56200    20.277245   0.99875454    23.211382    6.0156796    4.5180472    1.4976324 0.0018756963 -0.022869241    4.5390407 
+   56210    20.246286   0.98912343    23.827103    6.0336133    4.5504227    1.4831906 0.0018711905 -0.022784652    4.5713361 
+   56220    20.051191   0.99684147    23.546875    6.0219348     4.527171    1.4947638 0.0018058518 -0.022306354    4.5476715 
+   56230    20.137166    1.0074268    23.701783    6.0250823    4.5144458    1.5106366 0.0019377812 -0.022857321    4.5353653 
+   56240    20.167631    1.0007152    23.880979    6.0200495    4.5194771    1.5005724 0.0019577876 -0.023000902    4.5405202 
+   56250    20.101879   0.97818943    23.543799    6.0147918    4.5479968    1.4667951 0.0018182255 -0.022066731    4.5682453 
+   56260    20.282689    1.0117838    23.872325    6.0421192    4.5249494    1.5171699 0.0018134605 -0.022077784    4.5452137 
+   56270    20.250538    1.0193809    23.713209    6.0543451    4.5257834    1.5285617 0.0015475614 -0.020641035    4.5448768 
+   56280    20.354139    1.0168283     23.84483    6.0487016    4.5239675    1.5247341 0.0014157572 -0.019541556    4.5420933 
+   56290    20.212619    1.0149706    23.735216       6.0623    4.5403515    1.5219484 0.0013521421 -0.018932094    4.5579315 
+   56300    20.418568    1.0214054    23.699839    6.0812244    4.5496271    1.5315973 0.0013329808 -0.018740961    4.5670351 
+   56310    20.265748    1.0159737    23.760101    6.0728356     4.549383    1.5234526 0.0013781494 -0.019000924    4.5670058 
+   56320    20.404188     1.033765    23.764398    6.0725756     4.522445    1.5501306 0.0012918521 -0.018550165    4.5397033 
+   56330     20.29932    1.0174368    23.499102    6.0691016    4.5434552    1.5256464  0.001523044 -0.019988604    4.5619208 
+   56340    20.225896    1.0374633    23.634484    6.1083062    4.5526299    1.5556763 0.0016607471 -0.020989784    4.5719589 
+   56350    20.356212    1.0344889    23.970953    6.0958764    4.5446602    1.5512162 0.0016537864 -0.021213663    4.5642201 
+   56360    20.262941    1.0103178    23.894853    6.0868295     4.571858    1.5149715 0.0017101093 -0.021637635    4.5917856 
+   56370    20.379963    1.0494583    23.921328    6.1183415    4.5446788    1.5736627 0.0019340708 -0.022738861    4.5654836 
+   56380    20.397192    1.0221269    23.716734    6.0962094    4.5635302    1.5326793 0.0019984735 -0.023159271     4.584691 
+   56390    20.285523    1.0338047    24.049461    6.0730826    4.5228924    1.5501902 0.0018234324 -0.022748209    4.5438172 
+   56400    20.423404    1.0181343    23.674051    6.0738987    4.5472063    1.5266924 0.0016617134 -0.021714858    4.5672595 
+   56410    20.445377    1.0181504    23.607079    6.0632628    4.5365462    1.5267166 0.0014555208 -0.020924787    4.5560155 
+   56420    20.043375   0.99713928    23.643142    6.0354534    4.5402431    1.4952103 0.0014235169 -0.020751229    4.5595708 
+   56430    20.144275   0.99229458    23.511749    6.0406479    4.5527021    1.4879457 0.0013774994 -0.020472557    4.5717972 
+   56440    20.283623    1.0129062    23.841872    6.0275091    4.5086563    1.5188528 0.0014149532 -0.020816172    4.5280575 
+   56450    20.433813    1.0051563    23.485014     6.036267    4.5290351    1.5072319 0.0014714262 -0.021004622    4.5485683 
+   56460    20.149835    1.0158362    23.764782    6.0391675    4.5159212    1.5232463 0.0014181946 -0.020514414    4.5350174 
+   56470    20.283444    0.9993059     23.65806    6.0117808    4.5133216    1.4984592 0.0012852736 -0.020137421    4.5321737 
+   56480    20.114184   0.98002112    23.706504    6.0123997    4.5428581    1.4695417 0.0012904637 -0.020367793    4.5619354 
+   56490    20.021757   0.99809279    23.891625    6.0079037    4.5112636    1.4966401  0.001438076 -0.020962846    4.5307883 
+   56500    20.034791   0.99872258    23.571457    6.0165009    4.5189164    1.4975845 0.0016303081 -0.021790555    4.5390767 
+   56510    20.281233    1.0144811    23.777834    6.0349633    4.5137489    1.5212144 0.0018043565 -0.022417421     4.534362 
+   56520    20.211949    1.0148765     23.63938     6.048233    4.5264257    1.5218073 0.0018573621 -0.022669924    4.5472382 
+   56530    20.295934   0.98354193    23.826528    6.0266476    4.5518265    1.4748211 0.0018969768 -0.023032798    4.5729623 
+   56540    20.330213   0.99823945    23.607766    6.0340777    4.5372176    1.4968601 0.0019684674 -0.022744973    4.5579941 
+   56550    20.265968   0.97624802    23.675835    6.0046912    4.5408073    1.4638839 0.0019758516 -0.022591133    4.5614226 
+   56560    20.236764   0.99512901    23.775623    6.0060118    4.5138159     1.492196 0.0019638226 -0.022540966     4.534393 
+   56570    20.022011    1.0022732    23.477208    6.0297372    4.5268285    1.5029087 0.0019682423 -0.022577995    4.5474383 
+   56580    19.888396    1.0139889    23.851775    6.0457593     4.525283    1.5204763 0.0019456154 -0.022396486    4.5457339 
+   56590    20.487911    1.0099912    23.842289    6.0396861    4.5252043    1.5144818 0.0020097326 -0.022720119    4.5459147 
+   56600    20.293999     1.000759    23.732214    6.0392684    4.5386303    1.5006381 0.0021180012 -0.023649782    4.5601621 
+   56610    20.327011    1.0204032    23.813482    6.0710133    4.5409187    1.5300946 0.0021446223  -0.02409665    4.5628707 
+   56620    20.130125     1.009216    23.669858    6.0404123     4.527093    1.5133194 0.0020358564   -0.0234955    4.5485526 
+   56630    19.506286    1.0131811     23.65631    6.0504739    4.5312088    1.5192651 0.0019379588 -0.022856179     4.552127 
+   56640     20.27786    1.0157083     23.50236    6.0568133    4.5337586    1.5230546 0.0018311848  -0.02223141    4.5541588 
+   56650    20.155331   0.99938663     23.52256    6.0397772     4.541197    1.4985803 0.0016362241 -0.021316309     4.560877 
+   56660    20.444605    1.0214399    23.408599    6.0633668    4.5317177    1.5316491  0.001573891  -0.02098316    4.5511269 
+   56670    20.307881    1.0249445    23.853956    6.0531397    4.5162354    1.5369043 0.0017282554 -0.021509588    4.5360167 
+   56680    20.523174    1.0191372    23.805455      6.05481    4.5266137    1.5281963 0.0016686709 -0.021428361    4.5463734 
+   56690    20.096007    1.0163555    23.575827    6.0684463    4.5444212    1.5240251 0.0014095225 -0.020102365     4.563114 
+   56700    19.974876    1.0235691    23.685058    6.0722843    4.5374424    1.5348419 0.0010954439 -0.018893323    4.5552403 
+   56710    20.425896    1.0134235    23.625229    6.0444621    4.5248335    1.5196286 0.0012341531 -0.019500372    4.5430997 
+   56720    20.070674    1.0032674    23.668987    6.0469657    4.5425663    1.5043994  0.001308218 -0.020209854    4.5614679 
+   56730    20.264387    1.0001395    23.777233    6.0520195    4.5523103    1.4997092 0.0015312271 -0.021502844    4.5722819 
+   56740    20.195746    0.9997018    23.754559    6.0412793    4.5422264    1.4990529 0.0017490731 -0.022520855    4.5629982 
+   56750    19.997931    1.0088434    23.532551    6.0369335    4.5241728    1.5127607   0.00194774 -0.023141511    4.5453666 
+   56760    20.134096   0.99845475    23.752548    6.0450865    4.5479036    1.4971829  0.002091683 -0.023452427    4.5692643 
+   56770    19.977543      1.03014    23.665524    6.0845485    4.5398535     1.544695 0.0021343193 -0.023672621    4.5613918 
+   56780    20.124037    1.0094088    23.764321    6.0420571    4.5284487    1.5136084 0.0020863712  -0.02312581    4.5494881 
+   56790    20.421897    1.0364762    23.751636    6.0747057    4.5205097    1.5541961 0.0021652866 -0.024055841    4.5424002 
+   56800    19.948152   0.99809356    23.811399    6.0436694    4.5470281    1.4966413 0.0020980916 -0.024037233    4.5689673 
+   56810    19.992749   0.99930932    23.897615    6.0193488    4.5208845    1.4984643 0.0019673732  -0.02329717    4.5422143 
+   56820    20.407041     1.028652    24.067018    6.0623429    4.5198792    1.5424637 0.0019291161 -0.022781776    4.5407319 
+   56830    20.435534    1.0184665    23.609496    6.0725433    4.5453527    1.5271906 0.0019375874 -0.022979861    4.5663949 
+   56840    20.371564    1.0189137    23.728247    6.0445561    4.5166949    1.5278611 0.0019506324 -0.022518909    4.5372632 
+   56850    20.042721    1.0275149    23.514743    6.0701471    4.5293886    1.5407585 0.0016940016 -0.021230865    4.5489254 
+   56860    19.927024    1.0080151    23.878891    6.0607745     4.549256    1.5115186 0.0015021164 -0.020052605    4.5678064 
+   56870    20.307945    1.0063787    23.916599    6.0495642    4.5404993    1.5090649 0.0016053321 -0.020420201    4.5593142 
+   56880    20.328882    1.0273055    23.783084    6.0661299    4.5256853    1.5404446 0.0017910846 -0.021020688    4.5449149 
+   56890     20.08602     1.000207    23.454692     6.051584    4.5517737    1.4998103 0.0016221157 -0.020222077    4.5703736 
+   56900    20.202247    1.0225439    23.806361    6.0517522    4.5184475    1.5333047 0.0014349455 -0.019390144    4.5364027 
+   56910    20.102255    1.0098499    23.902361     6.041515    4.5272451      1.51427 0.0014423857 -0.020269906    4.5460726 
+   56920    20.230768    1.0034948    23.588567    6.0466183    4.5418779    1.5047404 0.0015283314  -0.02112712    4.5614767 
+   56930    20.476387    1.0166335    23.523909    6.0863174    4.5618755     1.524442 0.0018285855 -0.022658722    4.5827056 
+   56940    20.323737    1.0241474    23.515944    6.0652956    4.5295866     1.535709  0.001961216  -0.02351098    4.5511364 
+   56950    20.352818     1.023951    23.805732     6.066479    4.5310645    1.5354145 0.0020358605 -0.023672987    4.5527016 
+   56960    20.362181    1.0063291    24.099527     6.068698    4.5597076    1.5089904 0.0021000159 -0.023935462     4.581543 
+   56970    20.298089   0.99304173    23.678823     6.052498    4.5634319    1.4890661  0.002063197 -0.023720186    4.5850889 
+   56980    20.300108    1.0240105    23.958313    6.0560492    4.5205456    1.5355037 0.0019960623 -0.023229104    4.5417786 
+   56990    20.533856    1.0271348    23.808557    6.0691541    4.5289654    1.5401887 0.0018037902 -0.022031965    4.5491935 
+   57000    20.429345   0.99908194    23.552099    6.0638778    4.5657544    1.4981234 0.0015288299 -0.020357667    4.5845833 
+   57010    20.362079     1.010047    23.839684    6.0655098    4.5509443    1.5145655 0.0014830188 -0.020028794    4.5694901 
+   57020     20.42795    1.0106482    23.543514    6.0707974    4.5553304     1.515467 0.0015221446 -0.019725558    4.5735338 
+   57030    20.439125     1.007825    23.637835    6.0564845    4.5452508    1.5112336 0.0015826813 -0.020234357    4.5639025 
+   57040    20.170709    1.0223199    24.152792    6.0770287    4.5440599    1.5329688 0.0016488355 -0.020764122    4.5631752 
+   57050    20.326184    1.0189917    23.463848    6.0644873    4.5365093     1.527978  0.001728559 -0.020852815    4.5556336 
+   57060     20.34709    1.0108136    23.447362    6.0504957    4.5347807     1.515715 0.0016249247 -0.020316499    4.5534722 
+   57070    20.539631    1.0078034    23.532647    6.0512442    4.5400429    1.5112012 0.0016493058 -0.020675246    4.5590689 
+   57080    20.459216    1.0044101    23.660752    6.0466837    4.5405707     1.506113 0.0016544269 -0.020820611    4.5597369 
+   57090    20.316482     1.016241     23.74565    6.0520721    4.5282187    1.5238534 0.0017340545 -0.021445568    4.5479303 
+   57100    20.138639    1.0175531    23.439255    6.0596217    4.5338009    1.5258208 0.0018841789 -0.022260009    4.5541767 
+   57110    19.964385    1.0100619    23.627402    6.0683036    4.5537157    1.5145878 0.0017765977 -0.021796507    4.5737356 
+   57120    20.043261    1.0050374    23.634861     6.037213    4.5301594    1.5070536 0.0016247919 -0.020772125    4.5493067 
+   57130    20.167487    1.0076976    23.938829    6.0510666    4.5400241    1.5110425 0.0015256558 -0.020480512     4.558979 
+   57140    20.305228    1.0107573    23.889023    6.0629851    4.5473546    1.5156306 0.0015002427 -0.020287138    4.5661415 
+   57150    20.040032    1.0245906    23.726727    6.0518442    4.5154706    1.5363736 0.0014791002 -0.020299736    4.5342913 
+   57160    19.990143   0.99721971    23.775818    6.0181539    4.5228229     1.495331 0.0015329765 -0.020611846    4.5419018 
+   57170    20.007357   0.98023572    23.665568    6.0047809    4.5349175    1.4698635  0.001844945 -0.021662159    4.5547347 
+   57180    20.078918   0.98674849    23.501699    6.0010103    4.5213809    1.4796294 0.0016694016 -0.020648208    4.5403597 
+   57190    20.290732     1.019758     23.87327     6.022547    4.4934198    1.5291272 0.0015164728 -0.020174979    4.5120783 
+   57200    20.549063    1.0030255    23.651217    6.0424367    4.5383999    1.5040368  0.001434714 -0.019989206    4.5569544 
+   57210    20.301182    1.0115666    23.671099    6.0360009    4.5191568    1.5168441 0.0012990881 -0.019329567    4.5371873 
+   57220    20.093738   0.99097061    23.748509    6.0158066    4.5298462    1.4859604  0.001280136 -0.019462763    4.5480288 
+   57230    20.050643   0.98789429    23.802414    6.0158072    4.5344597    1.4813475 0.0013433484 -0.019638375    4.5527547 
+   57240    19.777568   0.98802899    23.595855    6.0267169    4.5451675    1.4815495 0.0015589377 -0.020878599    4.5644871 
+   57250    20.059526    1.0126947    23.596929    6.0265968    4.5080611    1.5185357 0.0016166415 -0.021464416    4.5279089 
+   57260    20.295745   0.98174062    23.644365     6.021091    4.5489709    1.4721201 0.0015078469 -0.021180807    4.5686439 
+   57270    20.255366    0.9994555    23.696623    6.0359805     4.537297    1.4986835   0.00146811 -0.021039375    4.5568683 
+   57280    20.378725   0.99389691    23.838525    6.0030698    4.5127214    1.4903484 0.0014783388 -0.020839979     4.532083 
+   57290    20.246727    1.0013005    23.848911    6.0281315    4.5266814    1.5014502 0.0015231581 -0.021417575    4.5465758 
+   57300    19.950523   0.99165157    23.753683    6.0250916    4.5381101    1.4869815 0.0016537775 -0.021756621    4.5582129 
+   57310    20.094024     1.002604    23.923635    6.0135143    4.5101095    1.5034048 0.0019328984 -0.023108941    4.5312856 
+   57320    20.202318   0.99717644    23.627437    6.0133869    4.5181208    1.4952661 0.0022143539  -0.02426782    4.5401743 
+   57330    20.278901    1.0047041    23.911769    6.0235704    4.5170167    1.5065537 0.0022492495 -0.024321329    4.5390887 
+   57340    20.262811   0.99177671    23.631051    6.0136787    4.5265095    1.4871692 0.0021613055 -0.023967914    4.5483161 
+   57350    19.727126   0.99905113    23.659182    6.0446044    4.5465272    1.4980772 0.0020210676 -0.023271519    4.5677776 
+   57360    19.882385    1.0084974     23.83479    6.0339739    4.5217321    1.5122419 0.0017914306 -0.022274222    4.5422148 
+   57370    20.021275    1.0037805     23.66661    6.0081869     4.503018    1.5051689 0.0016154282 -0.021847829    4.5232504 
+   57380    20.400921    1.0069222    23.827283    6.0265669    4.5166871    1.5098798 0.0016721377 -0.022036475    4.5370514 
+   57390    20.347815    1.0208262    23.565345    6.0557196    4.5249907    1.5307289 0.0017659137 -0.022063707    4.5452884 
+   57400    20.136893   0.99156292    23.719117     6.036227    4.5493784    1.4868486 0.0016347426 -0.021404024    4.5691477 
+   57410    20.206769    1.0141819    23.841853    6.0545865    4.5338208    1.5207657 0.0016411297 -0.021799253    4.5539789 
+   57420    20.252285    1.0066926    23.422288    6.0393702    4.5298346    1.5095356 0.0017662024 -0.022338934    4.5504074 
+   57430     20.30983    1.0210205    23.419902    6.0610262     4.530006    1.5310202 0.0018754517 -0.023025103    4.5511556 
+   57440    20.253164    1.0093266    23.638096    6.0357097    4.5222245    1.5134852 0.0020683122 -0.023854639    4.5440108 
+   57450    20.054588    1.0149628    23.654669    6.0466311    4.5246943    1.5219368 0.0021295945 -0.024173749    4.5467384 
+   57460    20.275832    1.0106011    23.705544    6.0457553    4.5303589    1.5153963 0.0020058328 -0.023343526    4.5516966 
+   57470    20.306469   0.99774228    23.589992    6.0323556     4.536241    1.4961146 0.0020437463 -0.023273321    4.5574706 
+   57480    20.486078   0.99221049    23.614056     6.005518    4.5176984    1.4878196 0.0019688653 -0.022788185    4.5385177 
+   57490    20.036532     1.003632    23.801128     6.016817    4.5118708    1.5049461 0.0018657724 -0.022496166    4.5325012 
+   57500    20.109815    1.0081044    23.944335    6.0214563    4.5098038    1.5116525 0.0019317342 -0.022637269    4.5305094 
+   57510    20.041482   0.98982374    23.728928    6.0063852    4.5221445    1.4842407 0.0019029946 -0.023026804    4.5432683 
+   57520     19.70351   0.99341236    23.682342    6.0128039    4.5231821    1.4896218 0.0019006409 -0.023050894    4.5443323 
+   57530    20.014954   0.98744597    23.642614    6.0069507    4.5262755    1.4806752 0.0018149232 -0.023002824    4.5474634 
+   57540    20.059545   0.99992368    23.671943    6.0153528    4.5159672    1.4993856 0.0019205522 -0.023234493    4.5372811 
+   57550    19.992149    1.0011072    23.721368    6.0030964    4.5019361    1.5011603 0.0020884144 -0.024196915    4.5240446 
+   57560    20.261819   0.99569937    23.355845    6.0149715    4.5219203    1.4930512 0.0021099936 -0.024362341    4.5441727 
+   57570    20.337041    1.0071129    23.768472    6.0240077     4.513842    1.5101658 0.0021998051 -0.024933894    4.5365761 
+   57580    20.328729   0.99707489    23.477117    6.0196591    4.5245453    1.4951138 0.0023256581 -0.025030177    4.5472498 
+   57590    20.292845    1.0120455    23.693774    6.0108735    4.4933112    1.5175623 0.0022127985 -0.024099455    4.5151978 
+   57600    20.348338   0.99661541    23.363586     5.999948    4.5055232    1.4944248 0.0021761703 -0.023562681    4.5269097 
+   57610    20.266937    1.0026687    23.464754    6.0313651    4.5278634    1.5035018 0.0020845347 -0.023239367    4.5490182 
+   57620     20.24435   0.99323825    23.589241    6.0242153    4.5348546    1.4893608 0.0022889703 -0.024046933    4.5566125 
+   57630    20.086746   0.99866771    23.588423    6.0200329    4.5225307    1.4975022 0.0022528179 -0.024091806    4.5443697 
+   57640     20.39787   0.99617758    23.676993    6.0124584    4.5186901    1.4937683 0.0021204215 -0.023204865    4.5397746 
+   57650    20.221586    1.0145774    23.704517    6.0360827    4.5147239    1.5213588 0.0020348606 -0.023204341    4.5358934 
+   57660     20.33392     1.005727    23.504971    6.0464272    4.5383396    1.5080876 0.0021032736 -0.023658473    4.5598948 
+   57670    20.064296    1.0120168    23.769455    6.0527383    4.5352191    1.5175193 0.0019408879 -0.023355498    4.5566337 
+   57680     20.08656    1.0151228    24.012686    6.0404274    4.5182507    1.5221767 0.0019714251 -0.023465181    4.5397444 
+   57690    19.427385    1.0148948    23.732365    6.0503186    4.5284839    1.5218347 0.0018512977 -0.022939964    4.5495725 
+   57700    19.956779    1.0219872    23.705686    6.0770022    4.5445323    1.5324699 0.0018410967 -0.022984582    4.5656758 
+   57710     20.07015    1.0306942    23.719074    6.0784978    4.5329719    1.5455259 0.0019879459 -0.023618276    4.5546022 
+   57720    20.139643    1.0177117    23.786088    6.0797022    4.5536435    1.5260587 0.0018241041 -0.022819853    4.5746393 
+   57730    20.307267    1.0090891    23.792551    6.0468134    4.5336843    1.5131291 0.0017384989 -0.022124784    4.5540706 
+   57740    19.994307    1.0187592    23.410593    6.0509565    4.5233271    1.5276294 0.0015579169 -0.021330779       4.5431 
+   57750    20.443619     1.015238    23.845401    6.0661827    4.5438334    1.5223494 0.0015050937  -0.02105467    4.5633829 
+   57760    20.490348    1.0188931    23.698518    6.0543764    4.5265462    1.5278302 0.0015346972 -0.020915733    4.5459272 
+   57770     20.34308    1.0254073     23.99481    6.0576667    4.5200686    1.5375982 0.0018424548  -0.02256516    4.5407913 
+   57780    20.364152    1.0026664    23.508935    6.0842014    4.5807032    1.5034982 0.0019515895 -0.023236254    4.6019878 
+   57790    20.161607    1.0128275    23.715192    6.0584264    4.5396915    1.5187349 0.0019308373 -0.023503186    4.5612639 
+   57800    20.289251    1.0107433    23.748139    6.0515312    4.5359217    1.5156095 0.0018859224 -0.023365626    4.5574014 
+   57810    20.255606   0.99910608    23.761238    6.0269619    4.5288023    1.4981596  0.001756258 -0.022881147    4.5499272 
+   57820    20.483798     1.004943    23.663089    6.0358445    4.5289325     1.506912  0.001670432 -0.022235278    4.5494973 
+   57830    20.261073    1.0261755     23.68121    6.0602325    4.5214824    1.5387501 0.0017554872 -0.022557631    4.5422845 
+   57840    20.219395   0.99808292    23.900683    6.0397677    4.5431424    1.4966253 0.0015985143  -0.02175215     4.563296 
+   57850    20.272093     1.001184    23.736757    6.0049324     4.503657    1.5012754 0.0016814606 -0.021793494    4.5237691 
+   57860    20.164822   0.99220315    23.820286    6.0236769    4.5358683    1.4878086 0.0017902694 -0.022209021     4.556287 
+   57870    20.079187    1.0017852    23.682788    6.0254111    4.5232341     1.502177 0.0016968393 -0.021646679     4.543184 
+   57880    20.279913    1.0157456    23.635757    6.0428546     4.519744    1.5231106 0.0016643179 -0.021524053    4.5396038 
+   57890    20.408968   0.99286051    23.921636    6.0248553     4.536061    1.4887943 0.0018336804 -0.022270912    4.5564982 
+   57900     20.09991    1.0148443    23.522039    6.0538196    4.5320606     1.521759 0.0019075172 -0.022297925     4.552451 
+   57910    20.389003   0.99405968    23.837077    6.0553428    4.5647503    1.4905925 0.0018606627 -0.022361041    4.5852507 
+   57920     20.26194    1.0154001    23.514425    6.0603315     4.537739    1.5225925 0.0019628726 -0.022622526    4.5583986 
+   57930    20.294347    1.0219228    23.581947    6.0555218    4.5231486    1.5323732   0.00185953  -0.02234678    4.5436358 
+   57940    20.484895    1.0141615    23.487151    6.0806707    4.5599355    1.5207352 0.0016672865 -0.021388578    4.5796568 
+   57950    19.985252    1.0306456    23.799782    6.0805491     4.535096    1.5454531 0.0016688047  -0.02110061    4.5545278 
+   57960    20.129077    1.0300346    23.695094    6.0814573    4.5369204    1.5445369  0.001783928 -0.021660261    4.5567967 
+   57970      20.3972    1.0265903    23.804717    6.0785786    4.5392064    1.5393722 0.0020178696 -0.022814953    4.5600035 
+   57980    20.378733    1.0098133    23.730246    6.0812881    4.5670731     1.514215 0.0022074738 -0.023851823    4.5887175 
+   57990    20.392415    1.0373503    23.999335    6.0679411    4.5124343    1.5555067 0.0022548782 -0.024027852    4.5342073 
+   58000    20.430895    1.0178556    23.803089    6.0572024    4.5309279    1.5262745 0.0021333372 -0.023513805    4.5523084 
+   58010    20.614186    1.0181426    23.991671    6.0556818     4.528977    1.5267048 0.0020406653 -0.023353032    4.5502894 
+   58020    19.951204    1.0044656    23.699116    6.0429522    4.5367561    1.5061961 0.0019951397 -0.023127803    4.5578887 
+   58030    20.372033     1.021746    23.933117    6.0607801     4.528672    1.5321081 0.0017861802  -0.02240709     4.549293 
+   58040    19.993577    1.0096431    23.797824    6.0411632    4.5272035    1.5139598 0.0016810713 -0.021915009    4.5474374 
+   58050     20.46644    1.0234653    23.288664    6.0684322    4.5337459    1.5346862 0.0016988343 -0.022045106    4.5540922 
+   58060    20.183372    1.0075084    23.786811    6.0524786    4.5417197    1.5107589 0.0017506911 -0.022141535    4.5621105 
+   58070    20.463654    1.0053103     23.77542    6.0491039    4.5416411    1.5074628 0.0019172284 -0.023341701    4.5630656 
+   58080    20.300814    1.0176204    23.727835    6.0462051    4.5202834    1.5259217 0.0020245144 -0.023771019    4.5420299 
+   58090    20.370274    1.0198612    23.777244    6.0740367    4.5447547    1.5292819 0.0021119502 -0.023819086    4.5664619 
+   58100    20.226096    1.0190379     23.81465    6.0950969    4.5670495    1.5280474 0.0019552005 -0.023015545    4.5881098 
+   58110    20.177624    1.0202545    23.911846     6.057545    4.5276734    1.5298717 0.0019511215  -0.02351914    4.5492414 
+   58120    20.364858    1.0140969    23.961543    6.0357955    4.5151571    1.5206384 0.0019127475 -0.023506859    4.5367512 
+   58130    19.793519    1.0059285    23.664263    6.0311601    4.5227704    1.5083897 0.0019188115 -0.023465587    4.5443172 
+   58140     20.26128     1.012449    23.751284    6.0261523     4.507985    1.5181673 0.0018304028 -0.022569434     4.528724 
+   58150    20.521173   0.98879667    23.616528    6.0219573    4.5392567    1.4827006 0.0017492925 -0.021984849    4.5594923 
+   58160    20.198273   0.98915873    23.806693    6.0202468    4.5370033    1.4832435 0.0019337438 -0.022996154    4.5580657 
+   58170    20.187873    1.0038223     23.61381    6.0264145     4.521183    1.5052315 0.0018655898 -0.022307242    4.5416247 
+   58180    20.452591    1.0185068    23.744457    6.0556688    4.5284178     1.527251 0.0017927569 -0.021873819    4.5484989 
+   58190    20.060261   0.99608724    23.711127    6.0377592    4.5441264    1.4936328 0.0018389651 -0.022124297    4.5644117 
+   58200    20.162955    1.0149241    23.620934    6.0516054    4.5297267    1.5218786  0.001899869 -0.021994133     4.549821 
+   58210    19.861214    1.0246608    23.820716     6.066352    4.5298731    1.5364789 0.0018168006  -0.02182898    4.5498853 
+   58220    20.379533    1.0272953    23.733712    6.0540292    4.5135999    1.5404293 0.0018911634 -0.021954415    4.5336632 
+   58230    20.486389    1.0312616    23.815429    6.1073543    4.5609775    1.5463767 0.0020474465 -0.022423342    4.5813534 
+   58240    20.255242    1.0223832    23.800601    6.0983198    4.5652562    1.5330635 0.0021279672 -0.022813673    4.5859419 
+   58250    20.207535    1.0461847    23.761537    6.0967473    4.5279933     1.568754 0.0021643567 -0.023204805    4.5490338 
+   58260    20.320378    1.0473821    24.060461     6.113822    4.5432726    1.5705494 0.0021820339 -0.023733385    4.5648239 
+   58270    20.516472    1.0384618    23.708775    6.0751556    4.5179822    1.5571734 0.0020529432 -0.023239689    4.5391689 
+   58280    20.083037    1.0402299    23.720627    6.0929008    4.5330761    1.5598247 0.0019321373 -0.022929009     4.554073 
+   58290    20.046923    1.0350907    24.063883    6.0961073    4.5439889    1.5521184 0.0018147073 -0.022557917    4.5647321 
+   58300    20.275147    1.0416165    23.893845    6.0747782    4.5128742     1.561904 0.0017845576 -0.022965498    4.5340551 
+   58310    20.417054    1.0416556    23.813755    6.0999054    4.5379428    1.5619626 0.0018752474 -0.023519783    4.5595874 
+   58320     20.20052    1.0243545     23.80509       6.0878    4.5517804    1.5360196 0.0018960951 -0.023134546    4.5730189 
+   58330    20.260929    1.0359921    24.116539    6.0747745    4.5213044    1.5534701 0.0018028927 -0.023052143    4.5425536 
+   58340    19.927168     1.012747     23.94413    6.0583122    4.5396981    1.5186141 0.0018805286 -0.023393033    4.5612106 
+   58350    20.153929    1.0198288     23.61708     6.065066    4.5358328    1.5292332 0.0018909977  -0.02313207    4.5570738 
+   58360    20.289069     1.029316    23.749943    6.0705963    4.5271369    1.5434593 0.0019097523 -0.023149945    4.5483771 
+   58370    19.816007    1.0323992    23.735464    6.0767902    4.5287076    1.5480826  0.002007018  -0.02334722    4.5500478 
+   58380    20.193284    1.0222703    23.523512    6.0533383     4.520444    1.5328943 0.0019466914 -0.023213111    4.5417104 
+   58390     20.20237    1.0181978    23.777634    6.0635409    4.5367534    1.5267875 0.0018800821 -0.023099914    4.5579732 
+   58400    20.142062    1.0070273    23.714483    6.0517401    4.5417026    1.5100375 0.0018027854 -0.022504745    4.5624046 
+   58410    20.078898    0.9986408    23.760632    6.0365777    4.5391158    1.4974619 0.0018503842 -0.022364744    4.5596302 
+   58420    20.216925    1.0103903    23.768062    6.0282788    4.5131985    1.5150803 0.0017601729 -0.021783179    4.5332215 
+   58430    20.288643    1.0133718    23.680687    6.0498413    4.5302902     1.519551 0.0016949017 -0.021527221    4.5501225 
+   58440     20.47934    1.0017372    23.704354    6.0594983    4.5573933     1.502105 0.0019444513 -0.022667836    4.5781167 
+   58450    20.405442   0.99597043    23.665855    6.0432496    4.5497919    1.4934577 0.0022295038 -0.024404135    4.5719665 
+   58460    20.282541    1.0121463    23.756103    6.0748248    4.5571115    1.5177133 0.0023078358 -0.024629044    4.5794327 
+   58470    20.214444     1.014229    23.680806    6.0786248    4.5577884    1.5208364 0.0023554282 -0.025013725    4.5804467 
+   58480    20.100859    1.0446859    23.747457    6.1001131    4.5336066    1.5665065 0.0024457642 -0.025494869    4.5566557 
+   58490    20.171897     1.026612    23.950837     6.079409    4.5400043    1.5394047 0.0023774078 -0.025087353    4.5627143 
+   58500    20.255337    1.0275903    23.895285    6.0784191    4.5375473    1.5408717 0.0022295263 -0.024545906    4.5598637 
+   58510     19.89844    1.0304498     23.58714    6.0973032    4.5521438    1.5451594 0.0021544742 -0.024423902    4.5744132 
+   58520    20.336022    1.0362682     23.70665    6.0997387    4.5458545    1.5538841 0.0021204144 -0.024142014    4.5678761 
+   58530    20.285871     1.015135    23.448593    6.0663435    4.5441485     1.522195 0.0021597381 -0.024336891    4.5663256 
+   58540    20.260195      1.01895    23.708332    6.0602831    4.5323675    1.5279156 0.0022334985 -0.024666572    4.5548006 
+   58550    20.074779   0.99689697    23.805893    6.0291624    4.5343154     1.494847 0.0022304511 -0.024538156    4.5566231 
+   58560    20.263172   0.98612336    23.665596    6.0307902    4.5520982     1.478692 0.0021908384 -0.024004101    4.5739115 
+   58570    20.326284    1.0027147    23.647175    6.0275084    4.5239377    1.5035707 0.0021501972 -0.023968393    4.5457559 
+   58580    19.713405      1.01181    23.814354    6.0410065    4.5237974     1.517209 0.0020930908 -0.024195054    4.5458994 
+   58590     20.40734     1.003781    23.943905    6.0440392    4.5388696    1.5051696 0.0021449283 -0.024375111    4.5610997 
+   58600    19.499989    1.0084907    23.798094    6.0579725    4.5457407    1.5122318 0.0020173815 -0.023865815    4.5675891 
+   58610    19.989219     1.017235    23.739623    6.0701975    4.5448537    1.5253438 0.0020301543 -0.023751997    4.5665755 
+   58620    19.715781    1.0138518    24.063337    6.0831265    4.5628558    1.5202707 0.0021532381 -0.023838725    4.5845413 
+   58630    20.334379    1.0266684    23.564933    6.0778777    4.5383885    1.5394892 0.0021809548 -0.023837698    4.5600453 
+   58640    20.226084    1.0195497    23.794556    6.0750443    4.5462296    1.5288147 0.0019683105 -0.022980206    4.5672415 
+   58650    19.963427     1.026169     24.09369    6.0869755     4.548235    1.5387405 0.0021130415 -0.023958991    4.5700809 
+   58660    20.160392    1.0250833    23.802708    6.0746438    4.5375315    1.5371123  0.002214329 -0.024259518    4.5595767 
+   58670    20.009902   0.99471695    23.519586    6.0428437    4.5512657    1.4915781 0.0020921157  -0.02381428    4.5729878 
+   58680    19.592145    1.0119212    23.539585    6.0518388    4.5344629    1.5173758 0.0018032813 -0.022630542    4.5552902 
+   58690    20.322587     1.016137    23.662693    6.0596934    4.5359959    1.5236975 0.0015584218 -0.021648825    4.5560863 
+   58700    20.343495    1.0137068    23.819094    6.0607784     4.540725    1.5200534 0.0016329633  -0.02203586    4.5611279 
+   58710    20.170408    1.0272072    23.907667     6.075727    4.5354298    1.5402972 0.0017682926 -0.022443086    4.5561046 
+   58720    20.330087    1.0153929    23.401097    6.0629802    4.5403986    1.5225816 0.0018319383 -0.023013171    4.5615798 
+   58730    20.201951     1.015009    23.888547    6.0450022    4.5229963    1.5220059 0.0018055149 -0.023027439    4.5442182 
+   58740    20.218999   0.98894959    23.460903    6.0238346    4.5409047    1.4829299 0.0016588935  -0.02254271    4.5617885 
+   58750    20.258315   0.99498215    23.825711    6.0099283    4.5179526    1.4919757 0.0015759594 -0.022266894    4.5386435 
+   58760    20.167125    1.0112372    23.981288    6.0519426    4.5355923    1.5163502 0.0015599968 -0.022167359    4.5561997 
+   58770    20.141828    1.0188229     23.51183    6.0560076    4.5282827    1.5277249 0.0018509174 -0.023187897    4.5496197 
+   58780    20.135211    1.0267302    23.618288    6.0839694    4.5443875    1.5395819 0.0018925378  -0.02333417    4.5658291 
+   58790    20.246981    1.0101144    23.520912    6.0583152    4.5436487    1.5146666  0.001948452 -0.022943299    4.5646435 
+   58800    20.391822   0.99938906    23.684263    6.0281385    4.5295546    1.4985839 0.0019966508 -0.022516804    4.5500747 
+   58810    20.123546     1.000088    23.570827    6.0519966    4.5523647    1.4996319 0.0019540756 -0.022439496    4.5728501 
+   58820    20.507959    1.0185139    23.876556    6.0643035    4.5370419    1.5272617 0.0020585522 -0.022849909    4.5578332 
+   58830    20.342317    1.0160383    23.610171    6.0559713    4.5324219    1.5235494 0.0021291911 -0.023143937    4.5534366 
+   58840    20.242276    1.0047414    23.760899    6.0479334    4.5413237    1.5066097 0.0022110095 -0.023663544    4.5627762 
+   58850    20.381001     1.022714     23.38905    6.0690775    4.5355179    1.5335596 0.0021401184  -0.02300206    4.5563798 
+   58860    20.167059    1.0295362    23.890267    6.0667507    4.5229612    1.5437895 0.0018423581 -0.021490105    4.5426089 
+   58870    20.400126     1.017841    24.039154    6.0603015     4.534049    1.5262525  0.001727736 -0.021226393    4.5535476 
+   58880    19.947881   0.98450551    23.620731    6.0144133    4.5381473     1.476266 0.0018224218 -0.021837866    4.5581627 
+   58890    20.220138    0.9949206    23.622092    6.0327103    4.5408269    1.4918834 0.0017500325 -0.021338023    4.5604149 
+   58900    20.192097    1.0053078     23.57203    6.0203494    4.5128903    1.5074591 0.0018100418 -0.021356323    4.5324365 
+   58910    20.137469    1.0056638    23.762153    6.0356928    4.5276998    1.5079929 0.0018588976 -0.022284137    4.5481251 
+   58920    20.067686     1.011866    23.496784    6.0440158    4.5267228     1.517293 0.0018908568 -0.023151465    4.5479834 
+   58930    20.392519     1.010091    23.381255    6.0424658    4.5278343    1.5146315 0.0017659354 -0.022451536    4.5485199 
+   58940    20.334345    1.0216818    23.948034    6.0571383    4.5251265    1.5320118 0.0017808598  -0.02237756    4.5457232 
+   58950    20.196639    1.0058389    23.686272    6.0569589    4.5487035    1.5082554 0.0016924054 -0.022191428    4.5692025 
+   58960    20.210815    1.0241395    23.942777    6.0867667    4.5510695    1.5356972 0.0013814541 -0.020912174    4.5706002 
+   58970     20.22974    1.0206568    23.684837    6.0481097    4.5176349    1.5304749 0.0011259446 -0.019396078     4.535905 
+   58980    20.384303    1.0114648    23.749071    6.0451081    4.5284165    1.5166915 0.0011088982 -0.019347568    4.5466552 
+   58990    20.280998    1.0133636    23.526746    6.0459343    4.5263955    1.5195388 0.0010660347 -0.019569945    4.5448994 
+   59000      20.3477   0.99313373    23.858073    6.0321473    4.5429433     1.489204 0.0012281556 -0.020350365    4.5620655 
+   59010    20.313855    1.0135651    23.758764    6.0342414    4.5144004    1.5198409 0.0012798048 -0.020461723    4.5335823 
+   59020    20.494565   0.99004859    23.810366    6.0296079      4.54503    1.4845779 0.0014210462 -0.020830632    4.5644396 
+   59030    20.201158   0.98117079    23.917226    5.9978612    4.5265956    1.4712656 0.0015722554 -0.021481314    4.5465047 
+   59040    19.907918   0.97860685    23.649245    5.9877534    4.5203324     1.467421 0.0016815012 -0.021517089     4.540168 
+   59050    19.868107   0.96985286    23.745673    5.9713198    4.5170254    1.4542944 0.0016781007 -0.020842836    4.5361902 
+   59060    20.103428    0.9880848    23.846032    6.0042581     4.522625    1.4816332 0.0015885441 -0.020556224    4.5415926 
+   59070    20.121954     1.013032    23.667031    6.0294918    4.5104504    1.5190415 0.0015497269 -0.020555054    4.5294557 
+   59080    20.176371   0.99520919    23.980601    6.0336178    4.5413016    1.4923162  0.001602478 -0.021109717    4.5608089 
+   59090    20.528611    1.0024317    23.647798    6.0275153     4.524369    1.5031463 0.0016798073 -0.021129177    4.5438183 
+   59100    20.579235    1.0030537     23.75728    6.0456786    4.5415996     1.504079 0.0017590969 -0.021771616    4.5616121 
+   59110    20.183651    1.0173352    23.747942    6.0568232    4.5313291    1.5254941 0.0017278246 -0.021595376    4.5511967 
+   59120    20.073158    1.0010444    23.771549    6.0487871     4.547721    1.5010661 0.0016857285  -0.02163238    4.5676676 
+   59130    19.876683    1.0071171    23.681409     6.043212    4.5330399    1.5101721 0.0016423088 -0.021850786    4.5532484 
+   59140    20.241107    1.0219992    23.706222    6.0225231    4.4900354    1.5324877    0.0016793 -0.022166935     4.510523 
+   59150    20.194636   0.99651306    23.677819    6.0334483     4.539177    1.4942713 0.0015151873 -0.021382001    4.5590438 
+   59160    20.444161     1.005434    23.802184    6.0277823     4.520134    1.5076483 0.0014877112 -0.021032739     4.539679 
+   59170    20.443344    0.9932337    23.420686    6.0450989    4.5557449    1.4893539 0.0014501326 -0.020752961    4.5750478 
+   59180    20.468518   0.99845991    23.935245    6.0253857    4.5281951    1.4971906 0.0013368945 -0.019847401    4.5467056 
+   59190    20.272686    1.0144142      23.8738    6.0319856    4.5108716    1.5211141 0.0014208923 -0.020047319     4.529498 
+   59200    20.241878    1.0088447    23.776681    6.0470592    4.5342966    1.5127626 0.0016054556 -0.020968682    4.5536598 
+   59210    20.314393    1.0071881    23.395824     6.027552    4.5172735    1.5102786 0.0018108216 -0.021872781    4.5373354 
+   59220    20.156668    1.0121705    23.724012    6.0443933    4.5266437    1.5177496 0.0017668943 -0.021254647    4.5461314 
+   59230    20.074812    1.0147382    23.801461     6.059476    4.5378761    1.5215999 0.0018811561 -0.021662346    4.5576573 
+   59240    20.187853    1.0114266    23.812216    6.0507378    4.5341036    1.5166342 0.0017503703 -0.020984728    4.5533379 
+   59250    20.093575   0.99571769     23.61259    6.0565932    4.5635145    1.4930787 0.0015666303 -0.020288924    4.5822368 
+   59260    20.244994   0.98630047    23.595032    6.0375049    4.5585474    1.4789576 0.0015770082 -0.020355017    4.5773254 
+   59270    20.207233    1.0134737    23.351894    6.0612311    4.5415272    1.5197039 0.0016209169 -0.020800057    4.5607063 
+   59280    20.006866    1.0131403    23.602844    6.0626179     4.543414    1.5192039 0.0016536971 -0.021187428    4.5629478 
+   59290    20.023118     1.023429    23.664377    6.0674582    4.5328265    1.5346317 0.0017490357 -0.021607639    4.5526851 
+   59300    20.035096    1.0189208    23.908326    6.0689162    4.5410443    1.5278718 0.0017947189 -0.022264055    4.5615137 
+   59310    20.368141   0.99538467    23.882735    6.0321803     4.539601    1.4925793 0.0016976174 -0.021617172    4.5595205 
+   59320    20.176441    1.0054716    23.486361    6.0714766    4.5637719    1.5077046 0.0014499961 -0.020456554    4.5827785 
+   59330    20.053581     1.002779    23.560038     6.035621     4.531954    1.5036671 0.0014160415 -0.019989287    4.5505272 
+   59340    20.140156   0.99265177    23.755611    6.0081637    4.5196824    1.4884813 0.0014197326 -0.019902806    4.5381655 
+   59350    20.189943    0.9970124    23.550963    6.0167831    4.5217631    1.4950201 0.0015130662 -0.020384073    4.5406341 
+   59360    20.268384   0.98105719    23.821535    5.9980728    4.5269775    1.4710953 0.0017871807 -0.021350849    4.5465412 
+   59370     20.29932   0.98226933    23.609089    6.0033108    4.5303979    1.4729129 0.0017963157 -0.021571185    4.5501728 
+   59380    20.049646   0.98982253    23.690052    6.0196775    4.5354386    1.4842389 0.0017845409 -0.021620513    4.5552746 
+   59390    20.378594    1.0012236    23.437673    6.0427099    4.5413752    1.5013347 0.0017219391 -0.021622428    4.5612757 
+   59400    20.253518   0.99807584    23.631198    6.0274068     4.530792    1.4966147  0.001650599 -0.021509833    4.5506513 
+   59410    20.223012   0.98492902    23.645458    6.0059964    4.5290953    1.4769011 0.0016673179 -0.021300016     4.548728 
+   59420     20.26226   0.98491049       23.981    6.0012651    4.5243919    1.4768733 0.0018083012 -0.021823843    4.5444074 
+   59430    19.950454   0.98303562    23.864096    6.0006232    4.5265613    1.4740619 0.0017176163 -0.021125032    4.5459687 
+   59440    20.259694   0.97245507    23.491345     5.986204    4.5280076    1.4581964 0.0018170579 -0.021719002    4.5479096 
+   59450    20.211131   0.97915718    23.875976    6.0000414    4.5317952    1.4682462 0.0019069189 -0.022343796    4.5522321 
+   59460    20.269809    1.0015264    23.762264    6.0047749    4.5029861    1.5017888 0.0018550211  -0.02228316    4.5234142 
+   59470    20.068949   0.99516685    23.928871    6.0245949    4.5323422    1.4922527 0.0020236637 -0.022803021    4.5531216 
+   59480    20.387285    1.0094523    23.748424    6.0203952    4.5067214    1.5136738 0.0020595402 -0.022830791    4.5274927 
+   59490    20.122938    1.0063811    23.698202    6.0258742    4.5168057    1.5090685 0.0019161751 -0.022482921    4.5373724 
+   59500     19.90075    1.0204774    23.695515    6.0448957    4.5146898    1.5302059 0.0015534522 -0.021199886    4.5343362 
+   59510    20.128213    1.0198408    23.655229    6.0566289    4.5273777    1.5292513 0.0012767365 -0.020224679    4.5463256 
+   59520    19.967052    1.0102866    23.746666    6.0631202    4.5481954    1.5149248 0.0015224121 -0.021033246    4.5677062 
+   59530    19.781702    1.0180354    23.693904    6.0577977    4.5312536     1.526544  0.001756366 -0.022088102    4.5515854 
+   59540    20.239591    1.0065886    24.063812    6.0762691    4.5668895    1.5093796 0.0017172872 -0.022511477    4.5876837 
+   59550    20.374383    1.0431605    23.848598    6.0679016    4.5036824    1.5642192 0.0017035131 -0.022652225    4.5246311 
+   59560    20.376303    1.0266102    23.731879    6.0788012    4.5393992     1.539402 0.0017379852 -0.022791573    4.5604528 
+   59570    20.169737    1.0380125    23.736899    6.0871426     4.530643    1.5564997  0.001773182  -0.02237008    4.5512399 
+   59580    20.114299    1.0274559    23.705777    6.0815086    4.5408384    1.5406701 0.0017512827 -0.022298958    4.5613861 
+   59590    20.513862    1.0288633    23.640104    6.0785525     4.535772    1.5427806 0.0016447122 -0.021753667    4.5558809 
+   59600    20.205175    1.0067729    23.969367    6.0585265    4.5488706    1.5096559 0.0016575452 -0.021685501    4.5688985 
+   59610     20.34083    1.0016368    23.693754    6.0403428    4.5383884    1.5019543 0.0015817946 -0.021114272    4.5579209 
+   59620    19.928393   0.99991515    23.674871    6.0306879    4.5313151    1.4993728 0.0015447827 -0.020994333    4.5507646 
+   59630     20.23016   0.99469795    23.890045    6.0282519    4.5367024    1.4915496 0.0016142279 -0.021098408    4.5561865 
+   59640    20.085328   0.99577637    23.613897    6.0229131    4.5297464    1.4931667  0.001731916  -0.02203879    4.5500533 
+   59650    20.077777     1.004904     23.64161    6.0448149    4.5379614    1.5068535 0.0018644224  -0.02288488    4.5589818 
+   59660      20.2352    1.0205078    23.799007    6.0638505    4.5335991    1.5302514 0.0018427697 -0.022844831    4.5546012 
+   59670    20.082051     1.016122    23.720798    6.0650067    4.5413319    1.5236749  0.001835947 -0.022932383    4.5624283 
+   59680    20.158828    1.0181568    23.549018    6.0581629    4.5314368    1.5267261  0.001734309 -0.022539451    4.5522419 
+   59690    20.325443    1.0165507    23.834452    6.0670135    4.5426958    1.5243177 0.0018206185 -0.022850823     4.563726 
+   59700     20.28079     1.013964    23.926338    6.0653471     4.544908    1.5204391 0.0019060539 -0.023056043     4.566058 
+   59710     20.06921    1.0229839    23.741356    6.0691753     4.535211    1.5339643 0.0019636963 -0.023241729     4.556489 
+   59720    20.202475    1.0143585     23.56646    6.0571077    4.5360772    1.5210305 0.0020925359 -0.023756008    4.5577407 
+   59730    20.400008    1.0140977    23.729724    6.0594259    4.5387864    1.5206395 0.0021589372 -0.023758003    4.5603855 
+   59740    20.013042    1.0204137    23.645364    6.0687478    4.5386375    1.5301103 0.0021833375 -0.023865132    4.5603193 
+   59750    20.341895    1.0224711     23.80076     6.068443    4.5352475    1.5331955  0.002141558 -0.023604386    4.5567104 
+   59760    19.956427    1.0114646    23.896868    6.0625875    4.5458962    1.5166912 0.0021152493 -0.023483159    4.5672642 
+   59770    20.146667     1.004357    23.583729    6.0308229    4.5247896    1.5060334 0.0020756328 -0.023144659    4.5458586 
+   59780    20.284594   0.99727287    23.631692    6.0124927     4.517082    1.4954107 0.0018855449 -0.022572894    4.5377694 
+   59790    20.186642   0.98672779    23.801886    6.0196053     4.540007    1.4795983 0.0018269073 -0.022568033    4.5607481 
+   59800    20.115957    1.0060553    23.402025    6.0337895    4.5252096    1.5085799 0.0019309126 -0.023114085    4.5463927 
+   59810    20.375197    1.0211366     23.69454    6.0704843      4.53929    1.5311943 0.0018881517 -0.023310241    4.5607121 
+   59820    20.078143    1.0180017    23.880949    6.0799376     4.553444    1.5264936 0.0020224673 -0.023771718    4.5751933 
+   59830     20.19817    1.0096245    23.563698    6.0408232    4.5268914    1.5139319 0.0020923294 -0.023629116    4.5484281 
+   59840    20.117169    1.0327224    23.717279    6.0584867    4.5099195    1.5485672 0.0019977589 -0.023273751    4.5311955 
+   59850    20.407707     1.016797    23.605208    6.0546522    4.5299651    1.5246871 0.0018411339  -0.02221681    4.5503408 
+   59860     20.39284    1.0301949    23.799635    6.0630694    4.5182922    1.5447772 0.0014631808 -0.020539892    4.5373689 
+   59870    20.031552    1.0223166    23.852048    6.0644546    4.5314909    1.5329637 0.0011524258 -0.019504452    4.5498429 
+   59880    19.574819    1.0172007    23.675813    6.0803296    4.5550372    1.5252924  0.001241883 -0.019541653     4.573337 
+   59890    19.952288    1.0419655    23.831263     6.086909    4.5244817    1.5624272 0.0015732778 -0.020796735    4.5437052 
+   59900    20.166778    1.0129064    23.536143    6.0573501     4.538497    1.5188531 0.0017070062 -0.021697135    4.5584871 
+   59910    20.179325    1.0257012    23.582717    6.0851364    4.5470975    1.5380389 0.0018952166 -0.022778873    4.5679812 
+   59920    19.881955    1.0307258     23.75739    6.0871158    4.5415424    1.5455734 0.0018364362  -0.02278574    4.5624917 
+   59930    19.989452    1.0217019     23.75995    6.0622314    4.5301893    1.5320421 0.0016900129 -0.022130724      4.55063 
+   59940    19.978192     1.008577    24.100328    6.0367883    4.5244271    1.5123612 0.0016270494 -0.021801428    4.5446015 
+   59950    20.178632    1.0089723    23.781944    6.0484647    4.5355107     1.512954 0.0014097886 -0.020379297    4.5544802 
+   59960    20.112177    1.0012848    23.659334    6.0394207    4.5379941    1.5014266 0.0011914699 -0.019683225    4.5564859 
+   59970    20.100634   0.99875282    23.935469    6.0498665    4.5522366    1.4976299 0.0011687251 -0.019410309    4.5704782 
+   59980    20.235214    1.0288368    23.770203    6.0799702    4.5372295    1.5427407 0.0012979435  -0.01948017    4.5554118 
+   59990    20.313914    1.0225381    23.804017    6.0838602    4.5505644    1.5332958 0.0014939808 -0.020190995    4.5692614 
+   60000    20.435292    1.0321708     23.86324    6.0844492    4.5367091    1.5477401 0.0018211105 -0.021792924    4.5566809 
+   60010    20.291294    1.0333614    23.860569     6.096946    4.5474205    1.5495254  0.002010281 -0.022749971    4.5681602 
+   60020    20.347312    1.0385326    23.855043    6.0882409    4.5309612    1.5572797 0.0020469769  -0.02254734    4.5514616 
+   60030    20.065899    1.0206418    24.070973    6.0549329    4.5244806    1.5304523 0.0020155124 -0.022925485    4.5453906 
+   60040    20.356691    1.0203505    23.686924    6.0439107    4.5138951    1.5300156 0.0020824463 -0.023544784    4.5353574 
+   60050    20.265408    1.0114476    23.694813    6.0346117     4.517946    1.5166656 0.0021226512 -0.023588562     4.539412 
+   60060    20.088686    1.0028006    23.500589    6.0308123    4.5271129    1.5036994 0.0019498111 -0.022786801    4.5479499 
+   60070    20.115462    1.0164167    23.813724     6.056669    4.5325522    1.5241168 0.0019555321 -0.023433997    4.5540306 
+   60080    20.150126    1.0071113    23.871736    6.0674483    4.5572848    1.5101634 0.0021368102 -0.024650193    4.5797982 
+   60090    20.083956    1.0208899    23.864654    6.0704516    4.5396273    1.5308243 0.0021488092 -0.024533596    4.5620121 
+   60100    20.083339    1.0242273    23.569587    6.0677115    4.5318827    1.5358288 0.0021405454 -0.024583794     4.554326 
+   60110     20.42278    1.0208838     23.87578    6.0767078    4.5458925    1.5308153 0.0021402386 -0.024763923    4.5685162 
+   60120    20.396044    1.0115414     23.84658    6.0294029    4.5125966    1.5168063 0.0020030392 -0.023658961    4.5342526 
+   60130    20.442623    1.0092969    23.719938    6.0240366    4.5105958    1.5134408 0.0016808083 -0.021703461    4.5306184 
+   60140    20.233364   0.97929875    23.632306    6.0017524    4.5332939    1.4684585 0.0013487716 -0.019718983    4.5516641 
+   60150    20.179812   0.98225122    23.886755    6.0156689    4.5427832    1.4728857 0.0012761901 -0.018909552    4.5604165 
+   60160    19.924725   0.97412678    23.703986     5.984274    4.5235709    1.4607031 0.0012161599 -0.018612617    4.5409673 
+   60170    20.045203   0.96542383    23.699955    5.9982968    4.5506437     1.447653 0.0011445378 -0.018180138    4.5676793 
+   60180    20.362911   0.98763576    23.863224    5.9941513    4.5131915    1.4809598 0.0010281658 -0.017448875    4.5296122 
+   60190    20.569199   0.96928613    23.610061    5.9821624    4.5287179    1.4534445 0.0010201243 -0.017659866    4.5453576 
+   60200    20.514112    0.9939258    23.609895    5.9945753    4.5041836    1.4903917 0.00083536848  -0.01706893    4.5204172 
+   60210    20.475332   0.99958431    24.025217     6.022182    4.5233054    1.4988767 0.0010145552 -0.017969947    4.5402608 
+   60220    20.240622    1.0053315    23.854073    6.0261037     4.518609    1.5074946 0.0011991933  -0.01902687    4.5364367 
+   60230    20.217068    1.0053674    23.736237    6.0410614     4.533513    1.5075485 0.0012974675 -0.019710381    4.5519259 
+   60240    20.370402    1.0019379    23.380138     6.020441    4.5180352    1.5024058 0.0014708451 -0.020629638     4.537194 
+   60250    20.095601   0.99981879    23.710923    6.0182982    4.5190699    1.4992283 0.0017349648 -0.021819499    4.5391544 
+   60260    20.167202   0.98250312    23.750846    6.0091266    4.5358632    1.4732634 0.0017228111 -0.021536678    4.5556771 
+   60270    20.091833    1.0067002    23.709795    6.0284746    4.5189277    1.5095469 0.0015813705  -0.02009957    4.5374459 
+   60280    20.323381    1.0233711    23.658895    6.0331566    4.4986117     1.534545 0.0015847022 -0.019632594    4.5166596 
+   60290    20.332217   0.99429809    23.838012    6.0433135    4.5523635      1.49095 0.0016042615 -0.019451514    4.5702108 
+   60300    20.004991   0.98160489    23.687088    6.0139401    4.5420235    1.4719165  0.001484368 -0.019673402    4.5602126 
+   60310    19.959526    1.0073434    23.583633     6.047053    4.5365416    1.5105114 0.0014052907 -0.019629129    4.5547654 
+   60320    20.205862    1.0092854    23.594246    6.0298732    4.5164497    1.5134235 0.0016042909 -0.020548237    4.5353937 
+   60330    20.023719     1.022032    23.663377    6.0274194    4.4948824     1.532537 0.0018257824 -0.021217008    4.5142736 
+   60340    20.341986    1.0059851    23.823754    6.0168974    4.5084227    1.5084747 0.0017738573 -0.021004796    4.5276537 
+   60350    20.282312    0.9951525    23.650595     6.037394    4.5451629    1.4922312 0.0015963881 -0.020455437    4.5640219 
+   60360    20.404171    1.0208763    23.635081    6.0835214    4.5527175    1.5308039  0.001850859 -0.021518056    4.5723847 
+   60370    20.400793    1.0428339     23.66615    6.0777819    4.5140525    1.5637294 0.0018096916 -0.021602611    4.5338454 
+   60380    20.016931    1.0338554    23.510202    6.0858243     4.535558    1.5502662 0.0017269034 -0.021771526    4.5556026 
+   60390    20.522215    1.0156349    23.781686    6.0636825    4.5407379    1.5229446 0.0018861836  -0.02273229     4.561584 
+   60400     20.17596    1.0149404    23.744342    6.0646576    4.5427544    1.5219032 0.0018814128 -0.022915473    4.5637885 
+   60410    20.280086    1.0163677    23.891956    6.0474858    4.5234424    1.5240434 0.0019265363 -0.022867785    4.5443837 
+   60420     20.45628      1.02266    23.629507    6.0595805    4.5261018    1.5334787  0.001922224 -0.022467071    4.5466467 
+   60430    20.116102    1.0203381    23.773344    6.0741483    4.5441513    1.5299969 0.0019766592 -0.022741363     4.564916 
+   60440      20.1792    1.0233242    23.694316    6.0891999    4.5547252    1.5344747 0.0018277291 -0.021906602    4.5748041 
+   60450    19.803727    1.0231882    23.943284    6.0875033    4.5532326    1.5342708 0.0017871685 -0.021729023    4.5731745 
+   60460    20.048422     1.027226    23.822932    6.0690629    4.5287375    1.5403253 0.0019037002 -0.022363455    4.5491973 
+   60470    19.968216    1.0263672    23.790816    6.0695395     4.530502    1.5390376 0.0020736595 -0.023152163    4.5515805 
+   60480    20.108103     1.026234    23.771577    6.0909142    4.5520762    1.5388379 0.0018935896 -0.022802518    4.5729852 
+   60490    19.977111    1.0314896    23.615962    6.0733357     4.526617    1.5467186 0.0018944304   -0.0235202    4.5482428 
+   60500    20.123386    1.0292206    23.780896    6.0754378    4.5321216    1.5433162 0.0018562296 -0.023316097    4.5535815 
+   60510    20.302657    1.0139782    23.897812    6.0466206    4.5261603    1.5204603 0.0017664843 -0.022528266    4.5469221 
+   60520    20.330965    1.0206967    23.743365    6.0578033    4.5272686    1.5305347 0.0018172213 -0.022799237    4.5482506 
+   60530    20.223855    1.0193996    23.771916    6.0636932    4.5351034    1.5285898 0.0019831758 -0.022788418    4.5559086 
+   60540    20.254282   0.99782292     23.82034    6.0226404     4.526405    1.4962355 0.0020587163 -0.023195535    4.5475418 
+   60550    20.268351    1.0051837    23.538732    6.0424708    4.5351979    1.5072729   0.00176574 -0.021779753     4.555212 
+   60560    20.016525   0.98316889    24.025198    6.0142277     4.539966    1.4742617  0.001598748   -0.0208331    4.5592003 
+   60570    20.440578   0.97414608    23.745185    5.9927404    4.5320084     1.460732 0.0014019967 -0.019576913    4.5501833 
+   60580    20.424468   0.99480486    23.682656    5.9822094    4.4904995    1.4917099 0.0015182852  -0.02005629    4.5090375 
+   60590     20.10106   0.97564692    23.694377    5.9955286    4.5325461    1.4629826 0.0016269856 -0.020354811    4.5512739 
+   60600    20.389215      1.01002    23.680256    6.0263136    4.5117886     1.514525 0.0017323325 -0.021117891    4.5311742 
+   60610    20.408671    1.0206469    23.903373     6.077306     4.546846    1.5304601 0.0017700767 -0.021456818    4.5665327 
+   60620    20.281547    1.0105356     23.83571    6.0416448    4.5263467    1.5152981 0.0018402402 -0.022008938    4.5465154 
+   60630    20.401486    1.0083804    23.671659    6.0328062    4.5207398    1.5120664 0.0019295599 -0.022826408    4.5416366 
+   60640    20.296683    1.0068782    23.589033    6.0465461    4.5367323    1.5098138 0.0018524162 -0.022494097     4.557374 
+   60650    19.992235    1.0216431    23.807871     6.057059    4.5251052    1.5319538  0.001608844  -0.02121971    4.5447161 
+   60660     20.20291    1.0099478     23.81566    6.0454542    4.5310375    1.5144167 0.0015250414 -0.020823757    4.5503362 
+   60670    20.216371    1.0096973     23.36476    6.0424226    4.5283815    1.5140411 0.0012453281 -0.019652362    4.5467885 
+   60680    20.066706   0.99622415    23.649676    6.0322193    4.5383812    1.4938381 0.0013306746 -0.019817384    4.5568679 
+   60690    20.039245   0.97974652    23.723474    6.0330716    4.5639417    1.4691299 0.0012296343 -0.019347527    4.5820596 
+   60700    20.398728    0.9982771    23.826499    6.0161554    4.5192389    1.4969165 0.0012213581 -0.018935819    4.5369533 
+   60710    20.272673    1.0098205    23.544184    6.0275944    4.5133685    1.5142259 0.0012657845 -0.019014478    4.5311172 
+   60720    20.495605    0.9803989     23.56953    6.0044403    4.5343322    1.4701082 0.0012304977 -0.019050082    4.5521518 
+   60730    20.283583   0.98192956    23.294046    6.0109559    4.5385525    1.4724034 0.0011207205 -0.019413829    4.5568456 
+   60740    20.256767    1.0213744    23.909798    6.0650668    4.5335159    1.5315509 0.0010062204 -0.018628543    4.5511382 
+   60750    20.208462    1.0163296    23.863336    6.0500177    4.5260315    1.5239862 0.0010988021  -0.01883638    4.5437691 
+   60760    20.376329    1.0204963    24.072986     6.060587    4.5303528    1.5302342 0.0011292466 -0.018936326    4.5481599 
+   60770    19.937958    1.0036509    23.641562     6.044079    4.5391045    1.5049745 0.0011276694 -0.018711372    4.5566882 
+   60780    20.206338    1.0098785     23.59325    6.0415999    4.5272871    1.5143129 0.0011835564 -0.018924091    4.5450276 
+   60790    20.095831    1.0037922    23.593207    6.0490331    4.5438467    1.5051864 0.0012572389 -0.019760225    4.5623496 
+   60800    20.335411    1.0185774    23.548852    6.0542588     4.526902    1.5273568 0.0011973324 -0.019546387    4.5452511 
+   60810    20.018361   0.98535447    23.603231    6.0115693    4.5340302     1.477539 0.0013135955 -0.019950533    4.5526672 
+   60820    20.409661    1.0060221    23.794456    6.0370574    4.5285273    1.5085302 0.0013432999 -0.019842516    4.5470265 
+   60830    20.107651    1.0036574    23.602654    6.0387078    4.5337236    1.5049842 0.0014061233 -0.020278145    4.5525956 
+   60840    19.998014    1.0115318    23.770975    6.0459212    4.5291294    1.5167919 0.0015670534 -0.020949982    4.5485123 
+   60850    20.399084    1.0102804    23.984117    6.0597324     4.544817    1.5149155 0.0015380275 -0.020414485    4.5636934 
+   60860    20.534028    1.0050314    23.586334    6.0244575     4.517413    1.5070446 0.0014237307 -0.019625988    4.5356152 
+   60870    20.422669   0.98927655    23.949629    6.0225967    4.5391766    1.4834202 0.0013055665   -0.0189475    4.5568185 
+   60880    19.886494   0.99289984    23.697476    6.0023683     4.513515    1.4888533 0.0014333921 -0.019767594    4.5318492 
+   60890    20.300748   0.99322279    23.494733     6.019538    4.5302005    1.4893376 0.0014546265 -0.020246784    4.5489926 
+   60900    20.323024   0.98928253    23.449945    6.0060892    4.5226601    1.4834292 0.0014236699 -0.020439747    4.5416762 
+   60910    20.059483   0.98084435    23.614935    6.0133812    4.5426051    1.4707761 0.0015554249 -0.021692372    4.5627421 
+   60920    20.249926   0.99078615    23.997215    6.0246118    4.5389279    1.4856838 0.0016348759 -0.021791826    4.5590849 
+   60930    20.489191   0.99253019    23.871802    6.0245745    4.5362755     1.488299 0.0017076208   -0.0222354    4.5568033 
+   60940    20.018116     1.014495    23.624067    6.0385214    4.5172862    1.5212352 0.0015948716 -0.021739045    4.5374303 
+   60950    20.253504    1.0059371    23.404837    6.0541061    4.5457035    1.5084026 0.0014857831  -0.02137674    4.5655944 
+   60960    20.009857    1.0173592    23.646116    6.0281498    4.5026197    1.5255301 0.0012581867 -0.020532783    4.5218943 
+   60970    20.358929    1.0130653    23.652539    6.0510499    4.5319584    1.5190915 0.0010564182 -0.019946242    4.5508482 
+   60980    20.055423    1.0119016    23.725331    6.0719394    4.5545929    1.5173465 0.0010930882 -0.020194434    4.5736942 
+   60990    19.853957    1.0336636    23.629966    6.0676888    4.5177101    1.5499786 0.0012632653 -0.020682134     4.537129 
+   61000    20.069418    1.0157917    23.823157    6.0745776    4.5513979    1.5231797 0.0013765297 -0.020775993    4.5707974 
+   61010      20.3799     1.018879    23.653616    6.0906809    4.5628719     1.527809 0.0014533612 -0.021075096    4.5824936 
+   61020    20.137457    1.0401563    23.716834    6.0991039    4.5393895    1.5597144 0.0016245997 -0.021798957    4.5595638 
+   61030    20.315281    1.0382852    23.850176    6.0851248    4.5282162    1.5569086 0.0017774433 -0.022604891    4.5490436 
+   61040    20.078406    1.0390828    23.995361    6.0896055    4.5315008    1.5581047 0.0016477208 -0.022215991    4.5520691 
+   61050    20.220868    1.0377957    23.719597    6.1031767     4.547002    1.5561747 0.0015074034 -0.021817823    4.5673125 
+   61060    20.300899    1.0195149    23.852528    6.0749661    4.5462035    1.5287626   0.00160731 -0.022046533    4.5666427 
+   61070     20.28151    1.0264752    24.150919    6.0825291    4.5433295    1.5391995 0.0016726611 -0.021821027    4.5634779 
+   61080    20.275319    1.0035271    23.664689    6.0731284    4.5683395    1.5047889 0.0017300767  -0.02196669    4.5885761 
+   61090    20.135294    1.0353647    24.040549     6.097139    4.5446096    1.5525294 0.0018908927 -0.022794417    4.5655131 
+   61100    20.247634    1.0344513    23.633832    6.0898222    4.5386625    1.5511597 0.0019243418 -0.022737746    4.5594759 
+   61110    20.372726    1.0089178    23.718237    6.0401631    4.5272908    1.5128722 0.0018552311 -0.022343488    4.5477791 
+   61120     20.35051    1.0094904    23.626006    6.0372368     4.523506    1.5137308 0.0015864458 -0.020872163    4.5427917 
+   61130    19.743646    1.0085532    23.449377    6.0393793    4.5270538    1.5123255 0.0016203262 -0.020862131    4.5462956 
+   61140    20.021865     1.010692    23.740152    6.0303901    4.5148574    1.5155327  0.001634053 -0.021095667     4.534319 
+   61150    20.221091    1.0005243    23.423024    6.0380145    4.5377284    1.5002861 0.0016255804 -0.021429965    4.5575328 
+   61160    20.328621   0.99687445    23.803237    6.0588035    4.5639902    1.4948132 0.0017248959 -0.022167388    4.5844327 
+   61170    20.088371    1.0068339    23.669356    6.0379876    4.5282402    1.5097474 0.0014785752 -0.021330751    4.5480924 
+   61180    20.353659    1.0052556     23.47368     6.050092    4.5427112    1.5073808 0.0013680638 -0.020750044    4.5620932 
+   61190    20.517209    1.0195626    23.875428    6.0933133    4.5644791    1.5288342 0.0014266834 -0.020840853    4.5838933 
+   61200    20.130645    1.0221445    23.345853    6.0794043    4.5466987    1.5327057 0.0015351867 -0.021338564     4.566502 
+   61210     19.81297    1.0215137    23.973733    6.0680405    4.5362806    1.5317598    0.0016223 -0.021688645     4.556347 
+   61220    20.177454    1.0234311     23.69828    6.0750904    4.5404554     1.534635 0.0017039657 -0.022293525     4.561045 
+   61230     19.99226    1.0155638    23.699912    6.0789867    4.5561488    1.5228379 0.0018148528 -0.022879547    4.5772134 
+   61240    20.299816    1.0170311    23.288755    6.0788795    4.5538414    1.5250381 0.0018714437 -0.023168602    4.5751385 
+   61250    19.782939    1.0235921    23.708137    6.0634186    4.5285422    1.5348764 0.0017883805 -0.022698426    4.5494522 
+   61260    20.169241    1.0270971    23.811445    6.0947274    4.5545953    1.5401322 0.0017096472 -0.022334859    4.5752205 
+   61270    20.411236    1.0298447    23.963968    6.0739316    4.5296795    1.5442521 0.0014303404 -0.021110716    4.5493599 
+   61280     20.02667    1.0217955    23.802971    6.0616788    4.5294964    1.5321824  0.001275029 -0.020234138    4.5484555 
+   61290    20.124105    1.0308536    23.862204    6.0697692    4.5240043    1.5457649 0.0013912917 -0.020614824    4.5432278 
+   61300    20.163222    1.0169455    23.813277     6.064691    4.5397813    1.5249097  0.001567183  -0.02130441    4.5595185 
+   61310    20.320993    1.0163612    23.846887    6.0585458    4.5345122    1.5240336 0.0016755448 -0.021668462    4.5545051 
+   61320     20.12813    1.0180423    24.088122    6.0605612    4.5340068    1.5265544 0.0016831827 -0.021668171    4.5539918 
+   61330    20.231936    1.0291908    23.916641    6.0800647     4.536793    1.5432717 0.0015524374 -0.021360773    4.5566014 
+   61340    20.533264    1.0177447    23.686052    6.0622345    4.5361264    1.5261081 0.0015463341 -0.021734403    4.5563145 
+   61350    20.121959     1.033474    23.781367    6.0910568    4.5413625    1.5496943 0.0015772068 -0.022147916    4.5619332 
+   61360    20.336339    1.0485781    23.870704    6.1141724    4.5418296    1.5723428 0.0018639689 -0.023312571    4.5632782 
+   61370    20.066749    1.0616169     23.83425     6.135774    4.5438795    1.5918945 0.0019942676 -0.023600503    4.5654857 
+   61380    20.031422    1.0510418    23.759245    6.1451594    4.5691223    1.5760371 0.0019371355 -0.023512742    4.5906979 
+   61390    20.048521    1.0476611    23.996613     6.134605    4.5636372    1.5709679 0.0020179771 -0.023663252    4.5852824 
+   61400    20.340712    1.0409714    24.099065    6.1182626    4.5573259    1.5609367 0.0020645902 -0.023609282    4.5788706 
+   61410    19.957112    1.0519667    23.892752    6.1070776    4.5296536     1.577424 0.0020517515 -0.023254602    4.5508564 
+   61420    20.303113    1.0254162    23.888773    6.0682708    4.5306592    1.5376116 0.0021086966 -0.023266916    4.5518174 
+   61430    20.103388    1.0046125    23.895904    6.0298759    4.5234595    1.5064164 0.0021105826  -0.02337522    4.5447241 
+   61440    20.097603    1.0106987    23.764042    6.0189598    4.5034171    1.5155426 0.0021108546 -0.023463219    4.5247695 
+   61450    20.237252    1.0153993    23.609268    6.0421796    4.5195884    1.5225912 0.0020739267 -0.022981751    4.5404962 
+   61460    20.477371    1.0019077    23.573632    6.0344893    4.5321287    1.5023606 0.0019449733 -0.022373589    4.5525573 
+   61470    20.244293    1.0243402    24.158895    6.0595496    4.5235515    1.5359981 0.0018660151 -0.022175382    4.5438609 
+   61480    20.435072   0.99687357    23.628527    6.0352214    4.5404095    1.4948119 0.0018581909 -0.022167402    4.5607187 
+   61490    20.110906    1.0002428    23.789547    6.0400799    4.5402158    1.4998641  0.001831491 -0.022447342    4.5608317 
+   61500    19.964545    1.0090168    23.638601    6.0313303    4.5183096    1.5130208 0.0017658602   -0.0221526    4.5386963 
+   61510     19.82465   0.98921442    23.782097    6.0110124    4.5276854     1.483327 0.0018602342 -0.022489763    4.5483149 
+   61520    20.235579   0.99637337     23.56533    6.0160286    4.5219668    1.4940619 0.0019956473 -0.023003757    4.5429749 
+   61530    20.122176    1.0043873    23.515023    6.0503809    4.5443022    1.5060787 0.0019180616 -0.022530067    4.5649142 
+   61540     20.39849    1.0099503    23.652238    6.0580185     4.543598    1.5144205 0.0017808673 -0.021984437    4.5638016 
+   61550    20.414428    1.0009584    23.652209    6.0543645    4.5534274    1.5009371 0.0015531066 -0.020938546    4.5728129 
+   61560     20.40363   0.99562734    23.701675    6.0477451    4.5548019    1.4929432 0.0014239895 -0.020535625    4.5739135 
+   61570    20.202617    1.0051501    24.085385     6.045611    4.5383884    1.5072226 0.0013765421 -0.020415896    4.5574278 
+   61580    20.195839    1.0142248    23.878858    6.0586191     4.537789    1.5208301 0.0015463256 -0.021012116    4.5572548 
+   61590    20.264968    1.0108388    23.465373    6.0714504    4.5556976    1.5157528 0.0016442913 -0.021437335    4.5754906 
+   61600    20.273477    1.0103826    23.879159    6.0492336    4.5341649    1.5150686 0.0016821299 -0.021733044    4.5542158 
+   61610    20.095342    1.0129097    23.773143    6.0609441     4.542086    1.5188581 0.0018393939 -0.022253968    4.5625005 
+   61620    20.247191     1.009264     23.63095    6.0603089    4.5469175    1.5133914 0.0016692057 -0.021615857    4.5668641 
+   61630    20.308021     1.015751    23.888349    6.0512891    4.5281704    1.5231187 0.0015556024 -0.021354518    4.5479693 
+   61640    20.321725    1.0086314    23.770011    6.0531439    4.5407012    1.5124427 0.0015796153 -0.021319274    4.5604408 
+   61650    20.287469    1.0228142    23.810983    6.0672902    4.5335803    1.5337099 0.0014106264 -0.020516087    4.5526857 
+   61660    20.247735    1.0069967    23.268653    6.0578416    4.5478502    1.5099915 0.0012149461 -0.019725348    4.5663606 
+   61670    20.086742   0.99765571    23.812151    6.0710295    4.5750447    1.4959847 0.0012575618 -0.020034789     4.593822 
+   61680    20.174093    1.0203331    23.784818    6.0577246    4.5277352    1.5299895 0.0013938617 -0.020935415    4.5472767 
+   61690    19.709489    1.0123263    23.939453    6.0558913     4.537908    1.5179833 0.0015079301 -0.021755665    4.5581558 
+   61700    20.144281    1.0126117     23.90073    6.0469693     4.528558    1.5184113 0.0015462069 -0.021372618    4.5483844 
+   61710     19.72618    1.0116445    23.601977    6.0554024    4.5384415    1.5169609  0.001649711 -0.021686835    4.5584786 
+   61720    20.236145    1.0172224     23.64524    6.0606202    4.5352952     1.525325 0.0016089231 -0.021335595    4.5550219 
+   61730    20.348303    1.0189133    23.815654    6.0569795    4.5291189    1.5278606 0.0015372448 -0.020772674    4.5483543 
+   61740     20.20395    1.0343513    23.423346    6.0843734    4.5333637    1.5510097 0.0017845346 -0.021682648    4.5532618 
+   61750    20.423015    1.0403157    24.063929    6.0786746    4.5187213    1.5599533 0.0019685742 -0.022817629    4.5395703 
+   61760    20.400803    1.0217622    23.504928    6.0633336    4.5312012    1.5321324 0.0021117575 -0.023740361    4.5528298 
+   61770    19.953817    1.0051541    23.372351    6.0522343    4.5450056    1.5072286 0.0020695632 -0.023671929     4.566608 
+   61780     20.24213    1.0175413    23.755291    6.0425332      4.51673    1.5258032 0.0019419426 -0.022724772    4.5375129 
+   61790    20.378127    1.0061297    23.767591    6.0528265    4.5441351    1.5086914 0.0017874069 -0.022231938    4.5645796 
+   61800    20.311147    1.0132136    23.345591    6.0513134    4.5319996    1.5193138 0.0016578004 -0.021762853    4.5521047 
+   61810    20.299237    1.0085624    23.783777     6.059029    4.5466897    1.5123393 0.0017649341 -0.022076658    4.5670015 
+   61820     20.25179    1.0315478    23.734576    6.0543202    4.5075142     1.546806 0.0018316794 -0.022634924    4.5283174 
+   61830    20.422766    1.0220756    23.712861    6.0555298    4.5229274    1.5326024 0.0019953587 -0.023153205    4.5440852 
+   61840    19.948614    1.0022369    23.643237    6.0559981    4.5531439    1.5028542 0.0020329658  -0.02365683    4.5747678 
+   61850    20.191699    1.0129825    23.693933     6.045075    4.5261078    1.5189672 0.0020559496 -0.024264477    4.5483164 
+   61860    20.084166    1.0068187    24.199977    6.0161623    4.5064376    1.5097247 0.0021957596 -0.024836117     4.529078 
+   61870    19.964829   0.99925149    23.725471    6.0351062    4.5367286    1.4983776 0.0023864642 -0.025335603    4.5596777 
+   61880    20.205607    1.0050806    23.919504    6.0285169    4.5213985    1.5071184 0.0023294761 -0.024841279    4.5439103 
+   61890     20.23954    1.0004516    23.680562    6.0389989    4.5388218    1.5001771 0.0021672598 -0.023945685    4.5606002 
+   61900    20.092792    1.0047024    23.912669     6.018253    4.5117017    1.5065513 0.0020859534 -0.023387026    4.5330028 
+   61910    20.378583    0.9780781    23.417606    5.9973742    4.5307461    1.4666281 0.0019759478 -0.022911446    4.5516816 
+   61920    20.292698   0.98230721    23.746536    6.0073259    4.5343562    1.4729697 0.0018720649 -0.022562086    4.5550462 
+   61930    20.181959   0.97302776    23.633009    5.9990547    4.5399995    1.4590551 0.0017595408 -0.022336525    4.5605765 
+   61940    20.161396   0.99007408    23.562883    6.0141719    4.5295558    1.4846161 0.0017161833  -0.02217605    4.5500157 
+   61950    20.195576    1.0069794    23.632695    6.0342034    4.5242378    1.5099656 0.0016391063 -0.021609538    4.5442082 
+   61960    19.970706    1.0037463    23.730685    6.0511069    4.5459893    1.5051176  0.001614143 -0.021204396    4.5655796 
+   61970    20.136378    1.0247636    23.724787    6.0590499     4.522417     1.536633 0.0015935173 -0.020890548     4.541714 
+   61980    20.205921   0.99508514    23.614132    6.0147388    4.5226087    1.4921302 0.0016874927 -0.021516577    4.5424377 
+   61990    20.324951    1.0116819    23.757485    6.0218522    4.5048352    1.5170169 0.0017964721 -0.022397538    4.5254363 
+   62000    20.461171    1.0128276    23.613489    6.0388507    4.5201157     1.518735 0.0016808404 -0.022076668    4.5405116 
+   62010    20.431618    1.0000534    23.480556    6.0377973    4.5382173      1.49958 0.0015558164 -0.021474402    4.5581359 
+   62020    20.283118    1.0063548    23.663107    6.0340847    4.5250556     1.509029  0.001645206 -0.022096082    4.5455065 
+   62030    20.317964    1.0186726    23.804706    6.0643269    4.5368274    1.5274995 0.0018035182 -0.022673562    4.5576974 
+   62040    20.496316    1.0011659    23.717811    6.0341357    4.5328874    1.5012483 0.0019418793 -0.023335763    4.5542813 
+   62050    20.252838   0.99695627    23.679083    6.0303147    4.5353788    1.4949359 0.0017748704 -0.021934839    4.5555388 
+   62060    19.920622    1.0228951    23.768625    6.0536239    4.5197927    1.5338312  0.001557853 -0.020916374    4.5391512 
+   62070    20.425542    1.0208409    23.691438    6.0523308    4.5215799    1.5307509 0.0012685285 -0.019439115    4.5397505 
+   62080    20.190523   0.99307367    23.683728    6.0201243    4.5310103     1.489114 0.0010962581 -0.018722029    4.5486361 
+   62090    20.333614    1.0067742    23.666614    6.0243684    4.5147104    1.5096579 0.0011811769 -0.018453774     4.531983 
+   62100    20.127313   0.99477134    23.525945    6.0358717    4.5442121    1.4916596 0.0013093934 -0.018710646    4.5616133 
+   62110    20.390346    1.0053839    23.579468    6.0374337    4.5298606    1.5075732 0.0014898921 -0.019776958    4.5481476 
+   62120    20.045069    1.0042116      23.7557    6.0336194    4.5278042    1.5058152 0.0015347958 -0.020133207    4.5464026 
+   62130    19.911314    1.0039213    23.590449    6.0482719    4.5428919      1.50538 0.0014382547 -0.020117437    4.5615711 
+   62140    20.064937     1.012756    23.540388    6.0307439    4.5121163    1.5186276 0.0017189908 -0.021432631      4.53183 
+   62150    19.856926    1.0288489    23.759299    6.0788926    4.5361337    1.5427589 0.0018831198 -0.022036866    4.5562874 
+   62160    20.193793    1.0186313    23.581913    6.0586266    4.5311889    1.5274376 0.0020195575  -0.02247401    4.5516434 
+   62170    20.304179    1.0188095    23.669681    6.0561806    4.5284757    1.5277049 0.0018922907  -0.02195805    4.5485414 
+   62180    20.211598    1.0052315    23.863069    6.0422824    4.5349378    1.5073446 0.0018781144 -0.022211374     4.555271 
+   62190    20.365422   0.99408004    23.856632    6.0380499    4.5474269     1.490623 0.0018357088  -0.02235505    4.5679463 
+   62200     20.29025   0.99188509    23.697452     6.022123    4.5347913    1.4873317 0.0015832952  -0.02142755    4.5546356 
+   62210    20.267548    1.0167041    23.696019    6.0291597    4.5046118    1.5245478 0.0016065647 -0.021331641    4.5243369 
+   62220    20.193084    1.0111566    23.785692    6.0686643    4.5524349    1.5162294 0.0016404313 -0.021537413    4.5723319 
+   62230    20.084498    1.0131653    23.628983    6.0641459    4.5449045    1.5192414 0.0015973006  -0.02144504    4.5647522 
+   62240    20.304818    1.0126924    23.426722    6.0597249    4.5411927    1.5185322  0.001544202 -0.021249009    4.5608975 
+   62250    20.205091    1.0142065    23.765062    6.0616502    4.5408475    1.5208027 0.0015594345 -0.021405436    4.5606935 
+   62260    20.127572    1.0084441    23.958667    6.0511595    4.5389976    1.5121619 0.0016101293 -0.021243279    4.5586307 
+   62270     20.20753    1.0211075     23.95091    6.0591417    4.5279909    1.5311507  0.001748051 -0.022096406    4.5483393 
+   62280    20.068259    1.0311227    23.779583    6.0746598    4.5284913    1.5461685 0.0017302406 -0.022229912     4.548991 
+   62290     20.50291    1.0061919    23.754059    6.0558928     4.547108    1.5087848 0.0018157714 -0.022531292    4.5678235 
+   62300     20.25524    1.0083301    23.726866      6.03628     4.524289     1.511991  0.001920405 -0.022551864    4.5449205 
+   62310    20.225078   0.98999351    23.823346    6.0137344    4.5292391    1.4844953 0.0018996116 -0.022012335    4.5493518 
+   62320    20.378629    1.0002704    23.880424    6.0058484     4.505943    1.4999055 0.0018773589 -0.021481521    4.5255471 
+   62330    20.208991   0.98175118    23.710213    6.0084574    4.5363216    1.4721359  0.001936715 -0.021475059    4.5558599 
+   62340    20.033867   0.98998917    23.764021    6.0118886    4.5273999    1.4844888 0.0018607319 -0.021463078    4.5470022 
+   62350    19.759199    1.0044734    23.821391    6.0182169     4.512009    1.5062079 0.0018194735 -0.021226592    4.5314161 
+   62360    20.089499    0.9814946    23.452861    5.9949269    4.5231758    1.4717512 0.0018319102 -0.021202559    4.5425464 
+   62370    20.318345    0.9974453    23.622824    6.0110935    4.5154243    1.4956692 0.0019851198   -0.0220555    4.5354947 
+   62380     20.25365    1.0058885    23.780947    6.0239029    4.5155731    1.5083299 0.0018590932 -0.021581469    4.5352954 
+   62390    20.382649     1.007811    23.709084     6.033954    4.5227413    1.5112127  0.001817952 -0.021325999    4.5422494 
+   62400    20.262277    1.0108468    23.545256    6.0672177     4.551453    1.5157648 0.0017974245 -0.021024936    4.5706805 
+   62410    20.239617    1.0012363    23.750526    6.0217423    4.5203884    1.5013538 0.0017626145 -0.020448374    4.5390742 
+   62420    20.377839    1.0065472     23.66696    6.0184446     4.509127    1.5093176 0.0016773127 -0.020472873    4.5279225 
+   62430    20.258568   0.98266445    23.623982     6.008833    4.5353277    1.4735053 0.0016800495 -0.020767531    4.5544151 
+   62440    20.286318    1.0093897    23.688114    6.0392572    4.5256773    1.5135799 0.0016179162 -0.020335223    4.5443946 
+   62450    20.136318      1.00709    23.959857    6.0499693    4.5398378    1.5101315 0.0015938285 -0.020621931    4.5588659 
+   62460    20.426086    1.0075548     23.65558    6.0308513    4.5200229    1.5108284 0.0019226379 -0.022055411    4.5401557 
+   62470    20.124943    1.0085583    23.764081    6.0426869    4.5303537    1.5123332 0.0019456797 -0.022467091    4.5508751 
+   62480    20.275072    1.0093464    23.830989    6.0269188    4.5134038    1.5135149 0.0018913486 -0.022417915    4.5339304 
+   62490    20.420928    1.0146176    24.064014    6.0369133    4.5154941    1.5214191 0.0018338895 -0.022280615    4.5359409 
+   62500    20.326386   0.99800856    23.666688    6.0426279     4.546114    1.4965138 0.0017720213 -0.021862894    4.5662049 
+   62510    19.949868    1.0201335    23.650199    6.0688053     4.539115    1.5296903 0.0017292239 -0.021409256    4.5587951 
+   62520    20.234893    1.0413424    23.756244    6.0784327    4.5169397     1.561493 0.0016598448 -0.021166849    4.5364467 
+   62530    20.272015    1.0033859    23.676434    6.0479929    4.5434158    1.5045771 0.0016880343 -0.021532721    4.5632605 
+   62540    20.192405    1.0106242    23.592249    6.0598753    4.5444443     1.515431 0.0015939213 -0.021220912    4.5640712 
+   62550    20.221431    1.0000615    23.801739    6.0335978    4.5340055    1.4995922 0.0014341835 -0.020734896    4.5533063 
+   62560    20.559751   0.99828374    23.594951    6.0250159    4.5280894    1.4969265 0.0015829779 -0.021235364    4.5477418 
+   62570     20.50471    1.0060754    23.870916     6.031477    4.5228669    1.5086101 0.0017977902 -0.022024233    4.5430933 
+   62580    20.197375    1.0125043    23.663354    6.0427955    4.5245452    1.5182502 0.0017723753 -0.021853736    4.5446266 
+   62590    20.179293      1.00494    23.866694    6.0396621    4.5327545    1.5069075 0.0015979327 -0.021022318    4.5521789 
+   62600     20.28446    0.9895754    24.004861    6.0278661    4.5439978    1.4838683  0.001508611   -0.0209265    4.5634157 
+   62610    20.440734    1.0098513    23.862087    6.0468501    4.5325781     1.514272 0.0016736734 -0.021687785    4.5525922 
+   62620    20.480351   0.99943781    23.777351    6.0164952    4.5178382     1.498657 0.0016181957 -0.021501048     4.537721 
+   62630    20.077621    1.0000111    23.645159      6.02714    4.5276234    1.4995166 0.0017321904 -0.022043329    4.5479345 
+   62640    19.980535    1.0094251    23.820571    6.0477821    4.5341491     1.513633 0.0018284181 -0.022494489    4.5548152 
+   62650    19.836956    1.0229399    23.627469    6.0813844     4.547486    1.5338984 0.0019363892 -0.022888642    4.5684383 
+   62660    19.986002    1.0181871    23.793091    6.0646882    4.5379165    1.5267716 0.0019116935 -0.022458822    4.5584637 
+   62670     20.26034    1.0099926    23.547508    6.0540956    4.5396117     1.514484 0.0016816628 -0.021320887    4.5592509 
+   62680    20.360704    1.0099243    23.827907    6.0557107    4.5413292    1.5143815 0.0015093086  -0.02070165    4.5605216 
+   62690    20.320679    1.0051276    23.811151    6.0148679    4.5076791    1.5071888 0.0016255416 -0.021438186    4.5274917 
+   62700    20.179999   0.97988885    23.542802    6.0210773     4.551734    1.4693433 0.0017535814 -0.022284134    4.5722645 
+   62710    20.217911      1.01707    23.409101    6.0613809    4.5362845    1.5250964 0.0016276553 -0.021321509    4.5559784 
+   62720    20.034126    1.0212576    23.895746    6.0914684    4.5600927    1.5313758 0.0015198134  -0.02074705    4.5793199 
+   62730    20.296201    1.0043154    23.689234    6.0415091    4.5355382    1.5059709 0.0016451681 -0.021200743    4.5550938 
+   62740    20.289895   0.98775111    23.313422    6.0263996    4.5452668    1.4811328  0.001724171 -0.022012721    4.5655553 
+   62750    20.404427   0.99789294    23.602466    6.0260686    4.5297281    1.4963405  0.001869485 -0.023212435    4.5510711 
+   62760     20.10331    1.0117279    23.592099    6.0387967    4.5217107     1.517086 0.0018966682 -0.023384964     4.543199 
+   62770    20.264217    1.0012391     23.77427    6.0246776    4.5233195    1.5013581 0.0020171601 -0.024031961    4.5453343 
+   62780    20.223886     1.016977    23.786654    6.0723231     4.547366    1.5249571 0.0022150982 -0.024536852    4.5696878 
+   62790    20.243452     1.014675    23.734015       6.0553    4.5337949    1.5215051 0.0022867502 -0.025072368    4.5565805 
+   62800    20.061077    1.0381147    23.927093    6.0729504    4.5162974     1.556653 0.0021872081 -0.024469619    4.5385798 
+   62810      20.2133    1.0246356    23.504887      6.06753    4.5310889    1.5364411 0.0019467963 -0.023422624    4.5525647 
+   62820    20.316821   0.99951131    23.855842    6.0433349    4.5445677    1.4987672  0.001796854 -0.022641555    4.5654124 
+   62830    20.046028   0.99132534    23.774714    6.0492589    4.5627666    1.4864923 0.0016398052 -0.021806854    4.5829336 
+   62840    20.237291    1.0183602    23.520612    6.0571771     4.530146     1.527031 0.0015970088 -0.021463301    4.5500123 
+   62850    19.901892   0.99126405    24.124708    6.0352343    4.5488339    1.4864004 0.0016511735 -0.021859927    4.5690426 
+   62860    20.244317     1.003612    23.858754    6.0356032     4.530687    1.5049162 0.0016608616 -0.021997987    4.5510241 
+   62870    20.138705   0.99925153    23.588326     6.037969    4.5395913    1.4983777 0.0017891357 -0.022337347    4.5601396 
+   62880    20.362112     1.005271    23.584534    6.0323808     4.524977    1.5074038  0.001994152  -0.02330365    4.5462865 
+   62890    20.287523    1.0003978    23.577863    6.0289687    4.5288723    1.5000964 0.0020717715 -0.023359578    4.5501601 
+   62900    19.788422    0.9973222    23.654173     6.019028    4.5235433    1.4954846 0.0020178508 -0.023080383    4.5446058 
+   62910    20.203483   0.99573319     23.77074    6.0116832    4.5185813    1.4931019 0.0018165312 -0.022131626    4.5388964 
+   62920     20.49475   0.99876263     23.90411    6.0189685    4.5213239    1.4976446 0.0016182689 -0.021436237    4.5411419 
+   62930    20.345629   0.99279882    23.710209    6.0380223    4.5493204    1.4887018 0.0014161468 -0.020756831    4.5686611 
+   62940    19.942619    1.0055502    24.020089    6.0364386    4.5286161    1.5078225 0.0015314024 -0.021300872    4.5483855 
+   62950    20.042034    1.0138285    23.812358    6.0704564    4.5502206    1.5202358 0.0016933944 -0.021793005    4.5703202 
+   62960    19.900826    1.0237035    23.689038    6.0746654    4.5396221    1.5350434   0.00170909 -0.022105525    4.5600185 
+   62970    20.154249    1.0234783    23.718044    6.0590866    4.5243809    1.5347058 0.0017563777 -0.022052665    4.5446771 
+   62980    20.394316    1.0080351    23.646873    6.0480781    4.5365295    1.5115486 0.0016590925 -0.021280025    4.5561504 
+   62990    20.541843    1.0067564     23.75811    6.0547846    4.5451533    1.5096313 0.0015712269 -0.021264627    4.5648467 
+   63000    20.177435    1.0251419    23.634739    6.0553902      4.51819    1.5372002 0.0015127782 -0.021311549    4.5379888 
+   63010     20.10024     1.009012    23.621021    6.0435564    4.5305429    1.5130135 0.0013792535 -0.020460979    4.5496247 
+   63020    20.026234   0.99320211    23.641983    6.0328348    4.5435283    1.4893066 0.0012159583 -0.019492814    4.5618051 
+   63030    19.996301     1.001732    23.571962    6.0344394    4.5323422    1.5020972  0.001407585 -0.020233016    4.5511677 
+   63040    20.171647    1.0063909    23.712419    6.0314871    4.5224039    1.5090831 0.0013800307 -0.020375688    4.5413996 
+   63050    20.537809   0.98684102    23.756386    6.0095392    4.5297711    1.4797681 0.0013834825 -0.020845891    4.5492335 
+   63060    20.197519   0.99443025    23.746372    6.0250616    4.5339135    1.4911482 0.0012805831 -0.020705541    4.5533384 
+   63070    20.106533    1.0039032    23.737614    6.0450087    4.5396559    1.5053528  0.001318381  -0.02069362    4.5590311 
+   63080    20.220323    1.0045511    23.992742    6.0306539    4.5243296    1.5063243 0.0015064483  -0.02133444    4.5441576 
+   63090    20.212073   0.99128572      23.6238    6.0354216    4.5489887    1.4864329 0.0014678067 -0.020993095    4.5685139 
+   63100    20.237071    1.0206943    23.816338    6.0482223    4.5176912    1.5305311  0.001369275 -0.020674969    4.5369969 
+   63110    20.133915    1.0255703    23.794739     6.064747    4.5269042    1.5378427 0.0011265072 -0.020048214    4.5458259 
+   63120    20.369956     1.018005    23.722042    6.0601241    4.5336257    1.5264985 0.0011803366 -0.020179527    4.5526249 
+   63130    20.409891    1.0115435    23.151531    6.0583474    4.5415379    1.5168095 0.0012466331 -0.020401997    4.5606932 
+   63140    20.082252    1.0240406    23.726304    6.0732869    4.5377381    1.5355488 0.0011895491 -0.020044149    4.5565927 
+   63150    20.072994     1.038932     24.08214    6.0917429    4.5338644    1.5578786 0.0013048631 -0.020444933    4.5530045 
+   63160    20.476456    1.0267537    23.648222    6.0872761     4.547659    1.5396172 0.0014723639 -0.021149313    4.5673359 
+   63170    20.247139    1.0081386    23.819615    6.0565673    4.5448634    1.5117038 0.0014737094 -0.020952088    4.5643418 
+   63180    20.333039    1.0114705    23.730412    6.0390971    4.5223972    1.5166999 0.0013937676 -0.020106457    4.5411099 
+   63190     20.15053    1.0191576    23.722054    6.0502957    4.5220689    1.5282268  0.001506004 -0.020567599    4.5411305 
+   63200    20.014754    1.0217346    24.032661    6.0841455    4.5520545     1.532091  0.001832683 -0.022578888    4.5728007 
+   63210    20.114664    1.0207843    23.876352    6.0669279    4.5362619     1.530666  0.002072725 -0.024191349    4.5583805 
+   63220    20.332939    1.0270484    23.792572    6.0445123    4.5044532    1.5400591 0.0022537884 -0.025309963    4.5275093 
+   63230     20.09447     1.017864    23.739277    6.0413031     4.515016    1.5262871 0.0022984703 -0.025249421     4.537967 
+   63240    20.453391    1.0147757    23.854279    6.0124937    4.4908376    1.5216561  0.002136262 -0.024258215    4.5129596 
+   63250    20.344056    0.9832819    23.484344    6.0199694    4.5455382    1.4744312 0.0018253857 -0.022920667    4.5666335 
+   63260    20.215883   0.98291581    23.358213    6.0145996    4.5407173    1.4738823 0.0015338705  -0.02163665    4.5608201 
+   63270    20.309438     1.002834    23.701034    6.0302421    4.5264925    1.5037495 0.0015943861 -0.021633234    4.5465314 
+   63280    20.094086    1.0095854    23.704741      6.06777    4.5538967    1.5138733 0.0017905595 -0.022530146    4.5746363 
+   63290    20.243219    1.0172636    23.890971    6.0610628     4.535676    1.5253868  0.001850213 -0.022802797    4.5566286 
+   63300    20.293125    1.0314727    23.689297    6.0691499    4.5224566    1.5466933 0.0019881753 -0.023368985    4.5438374 
+   63310    20.106613    1.0208953    23.395797    6.0639726    4.5331402    1.5308324 0.0020064341 -0.023645631    4.5547794 
+   63320    20.328111   0.99354489    23.820483    6.0420662    4.5522456    1.4898206 0.0018812638 -0.022697357    4.5730617 
+   63330     20.41522   0.99449804    23.755621      6.01495    4.5237002    1.4912498 0.0018283163 -0.022507876    4.5443797 
+   63340    20.248357   0.99335298    23.595101    6.0209545    4.5314217    1.4895328 0.0019128759 -0.022575448    4.5520843 
+   63350    20.122184   0.98833446    23.747748    6.0139064    4.5318989    1.4820075 0.0020702519 -0.023399259    4.5532279 
+   63360    20.164639   0.98843509    23.162327    6.0255612    4.5434028    1.4821584 0.0020594932 -0.023461668     4.564805 
+   63370    20.090013   0.99424468    23.571368    6.0269469     4.536077    1.4908699 0.0020281111 -0.023338897    4.5573878 
+   63380    20.115169   0.99105183    23.589485    6.0417322      4.55565    1.4860822 0.0020187322 -0.023350333    4.5769816 
+   63390    20.116808    1.0192126     23.89279    6.0745557    4.5462464    1.5283093 0.0018655434 -0.022491656    4.5668725 
+   63400    20.104813    1.0191631    23.623074    6.0625307    4.5342956    1.5282351 0.0019181252 -0.022661944    4.5550394 
+   63410    20.015626    1.0198439      23.7477    6.0756972    4.5464413     1.529256  0.001803024 -0.022275451    4.5669137 
+   63420    19.908336    1.0223582    23.657978    6.0669553    4.5339292    1.5330261 0.0016286664 -0.021626155    4.5539267 
+   63430     19.73058    1.0152016    23.818684    6.0589159    4.5366211    1.5222947 0.0016629038 -0.021630366    4.5565886 
+   63440    19.438961    1.0324388    23.970444    6.0714697    4.5233277    1.5481421 0.0013007275  -0.01998915    4.5420161 
+   63450    20.052455     1.022859    24.079522    6.0684786    4.5347015    1.5337771 0.0012242776 -0.019240614    4.5527179 
+   63460    20.234393   0.99927858    23.825366    6.0503953    4.5519771    1.4984182 0.0013758907 -0.020006699    4.5706079 
+   63470    20.254709    1.0010391    23.504286    6.0384854    4.5374273    1.5010582 0.0015429894 -0.020696716     4.556581 
+   63480    20.213079   0.99648392    23.975302    6.0317146    4.5374869    1.4942276 0.0015181056 -0.020925371    4.5568942 
+   63490    20.397593   0.99451772     23.95152    6.0319308    4.5406515    1.4912793  0.001565314 -0.021037283    4.5601234 
+   63500     20.35006    1.0020216     23.63688    6.0456161    4.5430846    1.5025314 0.0016618118 -0.021357566    4.5627804 
+   63510    20.226618    1.0056393    23.755682    6.0627776    4.5548214    1.5079562 0.0016013841 -0.021430526    4.5746506 
+   63520    20.346798    1.0308217    23.592272      6.07876    4.5330429    1.5457171 0.0015583205 -0.021086435     4.552571 
+   63530     20.32081    1.0187005    23.909677    6.0726332    4.5450918    1.5275414 0.0017394151 -0.021897361    4.5652497 
+   63540    20.549996    1.0351371    23.855966    6.0849512    4.5327632     1.552188 0.0018673364 -0.022443947    4.5533398 
+   63550    19.805736    1.0135989    23.665915    6.0563853    4.5364938    1.5198915 0.0019530694  -0.02310628     4.557647 
+   63560    20.053215    1.0127453    23.840621    6.0831046     4.564493    1.5186116  0.001988856 -0.022990196    4.5854943 
+   63570     20.15784    1.0313705    23.674467    6.0712491     4.524709      1.54654 0.0019634107 -0.023141097    4.5458867 
+   63580    20.086225    1.0312975    23.895901    6.1005052    4.5540746    1.5464306 0.0020816899 -0.023808581    4.5758015 
+   63590    20.243962    1.0327585    23.962103    6.0821138    4.5334923    1.5486214 0.0020184603 -0.023412814    4.5548867 
+   63600    20.314343    1.0285875    23.749895    6.0569193    4.5145524    1.5423669  0.001791339 -0.022575431    4.5353365 
+   63610    20.092315    1.0196431    23.363155    6.0663668    4.5374119    1.5289549 0.0019368426 -0.022851908     4.558327 
+   63620    20.036321    1.0157264    23.963759    6.0531621    4.5300803    1.5230818 0.0020610561 -0.023390523    4.5514098 
+   63630    20.389321    1.0288576    23.730151    6.0715818    4.5288098     1.542772 0.0021312739 -0.023259704    4.5499382 
+   63640    19.897911    1.0244623    23.705233    6.0650473    4.5288661    1.5361813 0.0022577048 -0.023376354    4.5499847 
+   63650    20.122075     1.030087    23.778942    6.0683326    4.5237172    1.5446155 0.0022559824 -0.023545094    4.5450063 
+   63660    20.266496    1.0272555    24.017011    6.0928505    4.5524809    1.5403696 0.0022288017 -0.023108906     4.573361 
+   63670    20.505489    1.0235856    23.929624    6.0517121    4.5168456    1.5348665 0.0023137876 -0.023331253    4.5378631 
+   63680    19.961948    1.0035708    23.645034    6.0377354     4.532881    1.5048544 0.0022981716 -0.023147764    4.5537306 
+   63690    20.105947    1.0051358    23.865304    6.0436967    4.5364955    1.5072012 0.0022441029 -0.023247738    4.5574992 
+   63700    20.117191    1.0204856    23.905604     6.068156    4.5379378    1.5302182 0.0019901105 -0.022206347     4.558154 
+   63710    20.222951    1.0176801    23.902954    6.0563355    4.5303242    1.5260113  0.001901046 -0.022212864    4.5506361 
+   63720    20.072535    1.0304017    23.916064    6.0533418    4.5082544    1.5450874 0.0020648282  -0.02306586    4.5292555 
+   63730    20.182028    1.0167563    24.153435    6.0768847    4.5522587     1.524626 0.0020964899 -0.022656777     4.572819 
+   63740    20.371363    1.0129585    23.875103     6.059065    4.5401337    1.5189312 0.0021254845  -0.02280524    4.5608135 
+   63750    20.402141    1.0353394    23.934078    6.0647371    4.5122456    1.5524915 0.0019608374  -0.02218904    4.5324738 
+   63760    20.324379    1.0252796     23.69635    6.0436635    4.5062567    1.5374068 0.0017299261 -0.021360426    4.5258872 
+   63770    20.023587   0.99793758    23.722701    6.0322754     4.535868    1.4964074 0.0014205869 -0.019617696    4.5540651 
+   63780    19.958208   0.98508489    23.599418    6.0232177    4.5460829    1.4771348 0.0014676798 -0.019676755     4.564292 
+   63790    20.185014   0.97485959    23.515691    5.9925292    4.5307272     1.461802 0.0014708568 -0.020090673     4.549347 
+   63800    20.365017   0.99540759    23.749075    6.0116818    4.5190681    1.4926137  0.001616889 -0.021342031    4.5387932 
+   63810    20.399644    1.0072445     23.58631    6.0450151     4.534652    1.5103631 0.0018078962 -0.022260998    4.5551051 
+   63820    20.246792   0.99697895    23.600799    6.0207892    4.5258193    1.4949699 0.0018140236  -0.02281848    4.5468238 
+   63830    20.313389     1.006853    23.568667    6.0069785    4.4972025     1.509776 0.0017905677 -0.022266522    4.5176785 
+   63840    19.982299   0.99518404    23.861076    6.0092319    4.5169534    1.4922785 0.0017891124 -0.022260024    4.5374243 
+   63850    20.122188    1.0006227    23.849847    6.0343361    4.5339024    1.5004337 0.0018600495 -0.022437682      4.55448 
+   63860    20.354164    1.0098862    23.663074    6.0415453     4.527221    1.5143243 0.0016441715  -0.02163288    4.5472097 
+   63870    20.290059    1.0024722    23.695363    6.0501428    4.5469357    1.5032071 0.0016355715 -0.021702694    4.5670028 
+   63880    20.293431    1.0285834    23.592245    6.0669845    4.5246237    1.5423608  0.001735669 -0.021984147    4.5448722 
+   63890    19.981555    1.0167692    23.987593     6.075106    4.5504605    1.5246455 0.0016936585 -0.021466417    4.5702333 
+   63900    20.338479    1.0225523    23.763972    6.0660793    4.5327621    1.5333172 0.0015454781 -0.020937192    4.5521538 
+   63910    20.242686    1.0319645    23.997671    6.0780205    4.5305897    1.5474308 0.0015374825 -0.020391042    4.5494433 
+   63920    20.096807    1.0152186     23.49292    6.0584752     4.536155    1.5223202 0.0014732232 -0.019551095    4.5542329 
+   63930     20.16618    1.0083516    23.777027    6.0646726    4.5526494    1.5120232  0.001389657 -0.019524409    4.5707841 
+   63940    20.103094    1.0349828    23.734732    6.0767654    4.5248086    1.5519568 0.0016157461 -0.020837082    4.5440299 
+   63950    20.082422     1.019671    23.943274      6.07096    4.5419633    1.5289967 0.0016971741 -0.021141933    4.5614081 
+   63960    20.058936     1.020921    23.772339    6.0588403    4.5279692    1.5308711 0.0017693386 -0.021748549    4.5479484 
+   63970    19.922502    1.0069442    23.346136    6.0457379     4.535825    1.5099129 0.0018484762 -0.021903902    4.5558804 
+   63980    20.188533    1.0109732    23.494773     6.056185    4.5402307    1.5159543  0.001837582 -0.021749875     4.560143 
+   63990    20.135409    1.0218656    23.826503    6.0491808    4.5168934    1.5322874 0.0017315924 -0.020959446    4.5361213 
+   64000    20.196627     1.000771     23.74526    6.0375957    4.5369397    1.5006561 0.0016622872 -0.020951932    4.5562293 
+   64010     20.62181     1.004217    23.818874     6.054632    4.5488086    1.5058234 0.0016209496 -0.021043382     4.568231 
+   64020    20.154657    1.0146294    23.776603    6.0605802    4.5391434    1.5214368 0.0017516618 -0.021958486    4.5593502 
+   64030    20.448246   0.99883007    23.703166    6.0568022    4.5590566    1.4977457 0.0017598975 -0.022270251    4.5795669 
+   64040    20.345482    1.0115526    23.863396    6.0534766    4.5366535    1.5168231 0.0015986677 -0.022017775    4.5570726 
+   64050    20.178226   0.99315295    23.274431    6.0559392    4.5667063    1.4892329 0.0015081943 -0.021938995    4.5871371 
+   64060    20.121088    1.0334441    23.717333    6.0787669    4.5291175    1.5496494 0.0017138738 -0.022447867    4.5498514 
+   64070    20.067851    1.0310711    23.704794    6.0718785    4.5257874    1.5460911 0.0018189052 -0.022742771    4.5467113 
+   64080    20.169871    1.0280031    23.836361    6.0638406    4.5223498    1.5414907 0.0018976738 -0.022856774    4.5433089 
+   64090    20.314374    1.0090639    23.938686    6.0336714    4.5205801    1.5130913  0.001920435 -0.022777234    4.5414369 
+   64100    20.416666     1.019467    23.951824    6.0648707      4.53618    1.5286907 0.0021125372 -0.023844315    4.5579117 
+   64110    20.030387     1.020813    23.814646    6.0685564    4.5378472    1.5307092 0.0020638395 -0.023723931    4.5595073 
+   64120    20.395452     1.003482    23.881744    6.0478531    4.5431319    1.5047212 0.0019484387 -0.023305798    4.5644893 
+   64130    20.071373   0.99988761    23.654401    6.0273585     4.528027    1.4993315  0.001802172 -0.022346327    4.5485712 
+   64140    20.047512   0.99291873    23.584421    6.0221135    4.5332319    1.4888816 0.0015691504 -0.021179626    4.5528423 
+   64150    20.175713    0.9923822    23.440952    6.0079662    4.5198891    1.4880771 0.0014168499 -0.020427185    4.5388994 
+   64160    20.350841   0.99732674    23.810292    6.0108732    4.5153818    1.4954914 0.0014384978 -0.020486114    4.5344294 
+   64170    20.265403    0.9909452    23.568764    6.0182182    4.5322959    1.4859223 0.0013496227 -0.020166815    4.5511131 
+   64180    20.096663    1.0035732    23.735842    6.0178356    4.5129776     1.504858 0.0012751474 -0.019585145    4.5312876 
+   64190    20.219797   0.99808764    23.746988    6.0191783    4.5225459    1.4966324   0.00154775 -0.021141497    4.5421396 
+   64200    19.838826    1.0168845    23.832419    6.0272618    4.5024435    1.5248183 0.0019773036 -0.023169903    4.5236361 
+   64210    20.350659    1.0034641    23.635085    6.0341121    4.5294176    1.5046945 0.0021038949 -0.023627505    4.5509412 
+   64220    20.340774    1.0076756    23.623975     6.037053    4.5260434    1.5110096 0.0021387885 -0.023629528    4.5475341 
+   64230    19.974194    1.0082475     23.53813    6.0493656    4.5374985    1.5118671 0.0020191888 -0.023330647    4.5588099 
+   64240    20.095258    1.0175905    23.659555    6.0839184    4.5580415     1.525877 0.0018904351 -0.022831714    4.5789828 
+   64250    20.398222    1.0272588    23.688114    6.0763565     4.535982    1.5403745 0.0019703156 -0.023416296     4.557428 
+   64260    20.370116    1.0142553    23.920279    6.0761336    4.5552578    1.5208758 0.0019446533 -0.023562354    4.5768755 
+   64270     20.28823     1.038063    23.821486    6.0821276    4.5255522    1.5565754 0.0017572548 -0.022710422    4.5465053 
+   64280    20.391607    1.0062013     23.78525    6.0443597    4.5355608    1.5087989 0.0015249093  -0.02143632    4.5554722 
+   64290     20.35461   0.99936818    23.689129    6.0580147    4.5594621    1.4985526 0.0014635868 -0.020957682    4.5789562 
+   64300    20.234741    1.0151598    23.982984    6.0639104    4.5416783    1.5222322 0.0015350916 -0.020957212    4.5611004 
+   64310    20.347756     1.008249    23.718542    6.0673499    4.5554805    1.5118694 0.0013617831 -0.020170118    4.5742889 
+   64320    20.290692    1.0181273    23.671275    6.0453062    4.5186243    1.5266819 0.0012671318 -0.019666242    4.5370234 
+   64330    20.518485    1.0008554    23.874444    6.0310107     4.530228    1.5007827 0.0014686574 -0.020373174    4.5491325 
+   64340    20.582604    1.0167954     23.94984    6.0487793    4.5240946    1.5246848 0.0015124072 -0.020307448    4.5428896 
+   64350    20.179706    1.0194501    23.987854    6.0795657    4.5509002    1.5286654 0.0015627109 -0.020226372    4.5695639 
+   64360    20.028511    1.0320439    23.846318    6.0639083    4.5163585    1.5475498 0.0015576139  -0.02091232    4.5357132 
+   64370    20.222996    1.0291218    23.657872    6.0651746    4.5220065    1.5431681 0.0015427216  -0.02092972    4.5413935 
+   64380     20.26456    1.0109737    23.615002    6.0619546    4.5459995    1.5159551 0.0017610654 -0.022066808    4.5663053 
+   64390    20.265112    1.0332347    23.860059    6.0819881    4.5326527    1.5493354 0.0018902833 -0.022836595     4.553599 
+   64400    20.324857   0.99583701    24.116393    6.0447878    4.5515302    1.4932576 0.0018915935  -0.02296202    4.5726007 
+   64410    20.409703    1.0017411    23.831319    6.0261643    4.5240535    1.5021108 0.0017601306 -0.022016068    4.5443095 
+   64420    20.087203   0.98788208    23.757811    6.0095996    4.5282704    1.4813292  0.001630515 -0.021617359    4.5482572 
+   64430    20.068723    1.0122439     23.60451    6.0416059    4.5237462    1.5178597  0.001479924 -0.021213133    4.5434794 
+   64440    20.500491     1.000096    23.673385     6.023948    4.5243041    1.4996439 0.0014469294 -0.020835506    4.5436926 
+   64450    19.923435   0.98591771    23.481683    6.0025433    4.5241597    1.4783836 0.0016281974 -0.021786912    4.5443184 
+   64460    19.897602   0.98917798    23.798469    6.0067925    4.5235202    1.4832724 0.0015958084 -0.021545822    4.5434702 
+   64470    20.243046   0.98971403    23.564308    6.0230143    4.5389381    1.4840762 0.0013996126 -0.020645697    4.5581842 
+   64480    20.364528   0.97939518     23.97603    6.0082264    4.5396234    1.4686031 0.0013131913 -0.020052909    4.5583631 
+   64490    20.025823   0.98673377    23.588037    6.0299175    4.5503102    1.4796073 0.0015065548 -0.021384154    4.5701878 
+   64500    20.250146   0.97896756    23.575301    6.0098477    4.5418859    1.4679618 0.0015468332  -0.02151627    4.5618553 
+   64510    20.053184   0.99021134    23.745445    6.0157278    4.5309059    1.4848219 0.0016224283 -0.021740408    4.5510239 
+   64520    20.326327     1.015802    23.614286    6.0497411    4.5265461    1.5231951 0.0015107208 -0.021175178    4.5462106 
+   64530    20.110852    1.0069465    23.863557    6.0555288    4.5456126    1.5099162 0.0012956896 -0.020517369    4.5648343 
+   64540    20.443676    1.0040946    23.748744     6.043657    4.5380173    1.5056398 0.0014127101 -0.020800588    4.5574051 
+   64550    20.421613     1.032253     23.60519    6.0587188    4.5108554    1.5478633 0.0016388912   -0.0216686    4.5308852 
+   64560    20.385832    1.0172241    23.793711    6.0571316     4.531804    1.5253275 0.0016160121 -0.021316234    4.5515043 
+   64570    20.528163   0.99702718    23.822213    6.0374362    4.5423939    1.4950423 0.0016246898 -0.021250299    4.5620195 
+   64580    20.323683   0.98925324    23.553782    6.0280804    4.5446952    1.4833852 0.0018946914 -0.022481675    4.5652822 
+   64590    20.229711     1.001921    23.845306    6.0324738    4.5300933    1.5023805 0.0017946456 -0.022047534    4.5503462 
+   64600    20.092044   0.99407568    23.602333    6.0136207    4.5230042    1.4906165 0.0017485361 -0.021971758    4.5432274 
+   64610    20.043196    1.0162247    23.605078    6.0434169    4.5195879     1.523829 0.0017297111 -0.022014416    4.5398726 
+   64620    19.983096    1.0161906    23.887371    6.0926521    4.5688744    1.5237778 0.0015451443 -0.021493579    4.5888228 
+   64630    20.299188     1.044671    23.638797    6.1254561    4.5589719    1.5664842 0.0015399999 -0.021439215    4.5788711 
+   64640    20.157144    1.0429597    23.827184    6.1157563    4.5518383     1.563918  0.001611768 -0.021540137    4.5717667 
+   64650    20.068807    1.0192352    23.574566    6.0670154    4.5386722    1.5283433  0.001426625 -0.020544553    4.5577901 
+   64660    20.136566    1.0195981    23.737893    6.0598615    4.5309741    1.5288874 0.0015734576 -0.020953936    4.5503545 
+   64670    20.272424   0.99942258    23.436373    6.0423445    4.5437103    1.4986342  0.001648071 -0.021099109    4.5631614 
+   64680    20.291484    1.0158446    23.745479    6.0534061    4.5301471     1.523259 0.0017507345 -0.021692799    4.5500891 
+   64690    20.347477    1.0166182    23.535106    6.0659232    4.5415042     1.524419 0.0018693338 -0.022335278    4.5619701 
+   64700    20.186905    0.9993966    23.782464      6.04086    4.5422648    1.4985952 0.0018961801 -0.022410151    4.5627788 
+   64710    20.425847   0.99825721    23.805742    6.0133396    4.5164529    1.4968867 0.0018990735 -0.022442504    4.5369963 
+   64720    20.315398   0.98776177    23.661177    6.0146071    4.5334583    1.4811488 0.0017286723 -0.021736895    4.5534665 
+   64730    20.233596    1.0020051    23.804836    6.0331643    4.5306576    1.5025067 0.0016098393 -0.021202302      4.55025 
+   64740    20.265102    1.0034105     23.93111    6.0264373    4.5218233     1.504614 0.0015770432 -0.021022524    4.5412687 
+   64750    20.415773   0.99083706    23.861607    6.0284654    4.5427053    1.4857602 0.0013382115 -0.020147848    4.5615149 
+   64760    20.026265   0.99604363    23.276329    6.0372796    4.5437122    1.4935674 0.0011633744 -0.019427727    4.5619765 
+   64770    20.245653   0.99642704    23.596486    6.0247339    4.5305916    1.4941424 0.0013562833 -0.020356478    4.5495918 
+   64780    20.328679   0.99788098    23.511095    6.0404135    4.5440909    1.4963225 0.0014721666  -0.02077054    4.5633893 
+   64790    20.292302      1.00031    23.790153    6.0174129    4.5174481    1.4999649 0.0014094083 -0.020479422    4.5365181 
+   64800    20.575649   0.99920386    23.670241    6.0214646    4.5231584    1.4983062 0.0015060825 -0.020940772    4.5425931 
+   64810     20.31046    1.0036719       23.254    6.0300173    4.5250113    1.5050059 0.0018039539 -0.022205806    4.5454132 
+   64820    20.095376    1.0009868    23.585789    6.0476549    4.5466753    1.5009796 0.0018295641 -0.022401337     4.567247 
+   64830    20.118297   0.98134582    23.880428    6.0119038    4.5403757    1.4715281 0.0016616323 -0.021998516    4.5607126 
+   64840    20.357161   0.97709407    23.856624    6.0040391    4.5388866    1.4651526 0.0015203304  -0.02102155    4.5583878 
+   64850    20.195363   0.96732915    23.433113    5.9719925    4.5214824    1.4505101 0.0015463001 -0.020675485    4.5406116 
+   64860     20.07081   0.99071607    23.403062    6.0117486    4.5261698    1.4855788 0.0015427485 -0.020333743    4.5449608 
+   64870    20.240693   0.99256683    23.715206    6.0134286    4.5250747     1.488354 0.0013671149 -0.019711646    4.5434192 
+   64880    20.318118    0.9915373    23.175905    6.0246172     4.537807    1.4868102 0.0015181929 -0.020303017    4.5565919 
+   64890    20.370227   0.99292875    23.598569     6.035558    4.5466613    1.4888967 0.0015669159 -0.020796317    4.5658907 
+   64900    20.249886   0.99274833    23.189481    6.0453811     4.556755    1.4886261 0.0014850263 -0.020507637    4.5757776 
+   64910    20.102223     1.005254    23.613718    6.0308927    4.5235144    1.5073784 0.0014958123 -0.020546896    4.5425654 
+   64920    20.185088   0.99415841     23.56643    6.0179445    4.5272039    1.4907405 0.0015802143 -0.020489966    4.5461137 
+   64930    19.996941    1.0018314    23.678085    6.0292618    4.5270156    1.5022462 0.0015984234 -0.020591326    4.5460085 
+   64940    20.124014    1.0086879    23.747852    6.0360301    4.5235026    1.5125275 0.0017284827 -0.021565364    4.5433395 
+   64950    19.949655    1.0023959    23.725767    6.0475346    4.5444419    1.5030927 0.0017411167 -0.021867331    4.5645681 
+   64960    20.164734    1.0059163    23.587897    6.0509914    4.5426199    1.5083715 0.0016673193 -0.021386726    4.5623393 
+   64970    20.202098   0.99961828    23.723836    6.0559865    4.5570589    1.4989276 0.0016878577 -0.021302599    4.5766737 
+   64980    20.051932    1.0118222    23.834447    6.0549848    4.5377574    1.5172274 0.0017086066 -0.021185258    4.5572341 
+   64990    19.853565    1.0135636    23.644967    6.0395178    4.5196792    1.5198386 0.0015299227 -0.020284427    4.5384337 
+   65000    20.168402    1.0138089    24.052664    6.0212813    4.5010749    1.5202064 0.0015641361 -0.020300276    4.5198111 
+   65010    20.548245    1.0170534    23.586391    6.0350534    4.5099817    1.5250716 0.0017826486 -0.021428218    4.5296273 
+   65020    20.511537   0.99693431    24.001856    6.0134706    4.5185676     1.494903 0.0019191772 -0.022325927    4.5389744 
+   65030    20.271319   0.99695197    24.051484    6.0313753    4.5364458    1.4949295 0.0020381592 -0.022813938    4.5572216 
+   65040    20.434657    1.0087536    23.745574    6.0544579    4.5418319     1.512626 0.0020358132 -0.023074318    4.5628705 
+   65050    20.337451    1.0253763    23.557295     6.065879    4.5283271    1.5375518 0.0021670635 -0.023793766    4.5499538 
+   65060    20.434889    1.0178678    23.726664    6.0572573    4.5309645    1.5262928 0.0021499757 -0.024008151    4.5528226 
+   65070    20.585152    1.0180747    23.940164    6.0707907    4.5441877     1.526603   0.00199493 -0.023461719    4.5656544 
+   65080    20.220404   0.99581992    23.826744    6.0422139     4.548982     1.493232 0.0019056829 -0.022783246    4.5698595 
+   65090    19.735001    1.0074649    23.696781     6.023385    4.5126914    1.5106935 0.0019701695 -0.023322171    4.5340434 
+   65100    19.823522   0.99023322    23.538421    6.0500963    4.5652416    1.4848547 0.0020375497 -0.023452026    4.5866561 
+   65110     20.02254    1.0088587    23.707059    6.0438765    4.5310929    1.5127837 0.0021603695 -0.024329604    4.5532621 
+   65120    20.181209     1.003304    23.982581    6.0325831    4.5281288    1.5044543   0.00220228 -0.024540381    4.5504669 
+   65130    20.419051    1.0018583    23.646154     6.035565    4.5332786    1.5022865 0.0020483723 -0.023803542    4.5550337 
+   65140    20.208702   0.99435913    23.974343    6.0244437    4.5334022    1.4910415 0.0018228859 -0.022758738     4.554338 
+   65150    20.238278    1.0050903    23.809992    6.0417491    4.5346161     1.507133 0.0016660975  -0.02191214    4.5548621 
+   65160    20.151427    1.0238717    24.001066    6.0683106    4.5330149    1.5352956 0.0014427965 -0.020869878     4.552442 
+   65170    19.986723    1.0104117    23.787697    6.0520852    4.5369728    1.5151124 0.0014777944 -0.021117444    4.5566124 
+   65180    20.318977    1.0063589    23.810099    6.0459555    4.5369203    1.5090352 0.0015496884 -0.021209399      4.55658 
+   65190    20.194631    1.0087959    23.656724    6.0731638    4.5604743    1.5126894 0.0014442271 -0.020587932     4.579618 
+   65200    19.983301    1.0223847     23.87541    6.0633159      4.53025    1.5330659 0.0014177445 -0.020198036    4.5490303 
+   65210     20.25224    1.0047396     23.52999    6.0323823    4.5257752    1.5066071 0.0013888724 -0.019971875    4.5443582 
+   65220    20.190769   0.99343086    23.549208    6.0385136    4.5488641    1.4896496 0.0012199174 -0.019203633    4.5668478 
+   65230    20.239753    1.0066837    23.633786    6.0359114    4.5263892    1.5095222  0.001252575 -0.019584632    4.5447213 
+   65240    20.304846    1.0127713    23.953737    6.0346959    4.5160454    1.5186505 0.0014767825 -0.020851557    4.5354202 
+   65250    20.179749   0.99078604    23.787364    6.0298396    4.5441559    1.4856837 0.0015726478 -0.021061951    4.5636452 
+   65260    20.135648     1.010598    23.698902    6.0343719    4.5189801    1.5153917  0.001717626 -0.021515599    4.5387781 
+   65270    20.359634    1.0153795    23.465078    6.0516788    4.5291172    1.5225616   0.00180215 -0.021836535    4.5491516 
+   65280    20.188634    1.0085162    23.543637    6.0628376    4.5505676      1.51227 0.0018676748 -0.022459028    4.5711589 
+   65290    20.120858    1.0200764    23.910415    6.0539647    4.5243601    1.5296045 0.0020471546 -0.023321874    4.5456349 
+   65300    20.005102    1.0169143    23.694768    6.0481471    4.5232841     1.524863 0.0022044552 -0.024042085    4.5451218 
+   65310    20.307041    1.0014889    23.843443     6.044049    4.5423164    1.5017326 0.0020476107 -0.023207664    4.5634765 
+   65320     20.22806     1.019181    23.856368    6.0531645    4.5249026    1.5282619 0.0018686209 -0.022818434    4.5458524 
+   65330    20.187722    1.0157633    23.511226    6.0458384    4.5227013    1.5231371  0.001805308 -0.022357982     4.543254 
+   65340    20.183655   0.99650455    23.335109    6.0375514    4.5432928    1.4942586 0.0017688155 -0.022101021     4.563625 
+   65350    19.741167    1.0151734    23.942025    6.0456986     4.523446    1.5222526 0.0014729848 -0.021124406    4.5430974 
+   65360    20.286266    0.9979905    23.554611    6.0355098    4.5390231    1.4964867 0.0014251937 -0.020539073     4.558137 
+   65370    20.302032    1.0215149    23.665746    6.0437091    4.5119475    1.5317617 0.0015186732 -0.020610472    4.5310393 
+   65380     20.08426    1.0187205    23.798767    6.0853134     4.557742    1.5275714 0.0016781016 -0.021271825    4.5773357 
+   65390    19.835633    1.0136441    23.841085     6.071204    4.5512446    1.5199593   0.00172728 -0.021849186    4.5713666 
+   65400    20.138164    1.0156892    23.608894    6.0735931    4.5505671     1.523026 0.0017842791 -0.021866183     4.570649 
+   65410    20.267762    1.0100817     23.77523    6.0488022    4.5341846    1.5146175 0.0018438804 -0.022095892    4.5544366 
+   65420    20.075285    0.9956558    23.765708     6.033972    4.5409862    1.4929859 0.0018202992 -0.022836433    4.5620023 
+   65430    20.022932    1.0213692    23.833973    6.0510668    4.5195238    1.5315431 0.0017278387  -0.02276461    4.5405606 
+   65440    20.278213    1.0155209     23.76181    6.0608612    4.5380875    1.5227736 0.0016963209 -0.022085371    4.5584766 
+   65450    20.311676    1.0374477    23.683326    6.0739475    4.5182947    1.5556528 0.0017159227 -0.021874028    4.5384528 
+   65460    20.271718    1.0275719    23.775032     6.080886     4.540042    1.5408441 0.0016819424 -0.022104615    4.5604646 
+   65470    20.415838     1.020824    23.857537    6.0520114    4.5212859    1.5307255 0.0017962229 -0.022465402    4.5419551 
+   65480    20.601875    1.0086156     23.94718    6.0340891      4.52167    1.5124191 0.0017778292 -0.022321373    4.5422136 
+   65490    20.286654    1.0000214    23.681779    6.0288117    4.5292796    1.4995321 0.0019008381 -0.022973318    4.5503521 
+   65500     20.29142   0.99269177    23.633336     6.004935    4.5163937    1.4885413 0.0020802945 -0.023629736    4.5379432 
+   65510    20.340507     1.003297    23.575714     6.011749    4.5073051    1.5044439 0.0021243431 -0.024067651    4.5292484 
+   65520    20.277791   0.98675093    23.556482    6.0030672    4.5234342     1.479633 0.0021549933 -0.024011141    4.5452903 
+   65530    20.388145   0.99567056    23.815344    6.0214329    4.5284249     1.493008 0.0020103323 -0.023030802    4.5494453 
+   65540     20.40873    1.0297653    23.630724    6.0805564    4.5364233    1.5441331 0.0021514521 -0.023340809    4.5576127 
+   65550    19.978058    1.0333396    23.814585    6.0881176    4.5386248    1.5494928 0.0022396909 -0.023890723    4.5602758 
+   65560    20.331666    1.0236918    23.852863    6.0823057    4.5472799    1.5350259  0.002164329  -0.02346648     4.568582 
+   65570    20.103869    1.0195955    23.718011    6.0723897    4.5435063    1.5288834 0.0020282206 -0.022929144    4.5644072 
+   65580    20.202183    1.0050772     23.70617    6.0515666    4.5444534    1.5071132 0.0019207365 -0.022439314     4.564972 
+   65590    20.187133    1.0056616    23.759615    6.0373521    4.5293624    1.5079896  0.001836072  -0.02196335    4.5494897 
+   65600    20.061473    1.0243772    23.830772    6.0712646     4.535211    1.5360535 0.0016827637 -0.020802526    4.5543308 
+   65610    19.987377    1.0208109    23.735728    6.0546799    4.5239739     1.530706 0.0017271481 -0.020392214    4.5426389 
+   65620    19.807589    1.0110087     23.65198    6.0574469    4.5414394    1.5160075  0.001693341 -0.020259509    4.5600056 
+   65630    20.134057    1.0056089    23.848718     6.080089    4.5721784    1.5079106 0.0017518858 -0.020889734    4.5913163 
+   65640    20.161873    1.0099084     23.59828    6.0537378    4.5393802    1.5143576 0.0018056897 -0.021475797    4.5590503 
+   65650    20.072095    1.0171065    23.469102    6.0656559    4.5405047    1.5251512 0.0018173875 -0.021308354    4.5599956 
+   65660    20.591932   0.97904051    23.391359    6.0100829    4.5420117    1.4680712 0.0017573004 -0.020522796    4.5607772 
+   65670    20.448478    1.0003055    23.740308    6.0459977    4.5460396    1.4999581 0.0014697742  -0.01939361    4.5639635 
+   65680    19.792471    1.0104823    23.667981    6.0577629    4.5425446    1.5152183 0.0014784145 -0.019025403    4.5600916 
+   65690    19.839528    1.0058767    23.837655    6.0552979    4.5469858    1.5083121 0.0016312643 -0.020479903    4.5658344 
+   65700    20.127723    1.0205172    23.928018    6.0753001    4.5450345    1.5302655 0.0015799627  -0.02062476    4.5640793 
+   65710    20.158947    1.0297647    23.756121     6.061571    4.5174389    1.5441322 0.0015125616  -0.02019378    4.5361201 
+   65720    20.176283     1.028929    23.940713    6.0713204    4.5284413    1.5428791 0.0017295988 -0.021455802    4.5481675 
+   65730    19.808961    1.0188799    23.827071    6.0659301    4.5381197    1.5278105 0.0017359326 -0.022113968    4.5584977 
+   65740    20.212404    1.0201093    23.928456    6.0540078    4.5243538     1.529654 0.0018198835 -0.022292166    4.5448261 
+   65750    20.176712    1.0119886    23.713908    6.0531619     4.535685    1.5174769 0.0021614734 -0.023930227    4.5574537 
+   65760     20.29984   0.98174234    23.672194    6.0126191    4.5404965    1.4721226 0.0021926363 -0.024223192    4.5625271 
+   65770    20.157762    1.0022117    23.969881    6.0201971    4.5173806    1.5028165  0.002171586  -0.02391692    4.5391259 
+   65780    20.036637    1.0117104    23.639816    6.0428004    4.5257406    1.5170598 0.0021769057 -0.023853316     4.547417 
+   65790    20.250027    1.0108754    23.612201    6.0616675    4.5458597    1.5158077 0.0021134663 -0.023701543    4.5674478 
+   65800    20.270558    1.0284504    23.942757    6.0756416    4.5334802    1.5421614 0.0019738084  -0.02304276    4.5545491 
+   65810    20.061247    1.0113361    23.808888    6.0682863    4.5517878    1.5164985 0.0017405078 -0.022396813    4.5724441 
+   65820    19.999057    1.0177756    23.877145    6.0759455     4.549791    1.5261546 0.0019132712 -0.022892444    4.5707701 
+   65830    20.044517    1.0145595    23.853117    6.0685919    4.5472599     1.521332 0.0018197868 -0.022566068    4.5680062 
+   65840    20.293713   0.99635311    23.686804    6.0410739    4.5470424    1.4940315  0.001848452 -0.022614106    4.5678081 
+   65850    20.380133    1.0071935    23.958067    6.0227515    4.5124649    1.5102866 0.0019976694  -0.02310281    4.5335701 
+   65860     20.36797   0.99399033    23.816691    6.0200262    4.5295377    1.4904885 0.0023055557 -0.024636873     4.551869 
+   65870    20.416989    1.0062426    23.640467    6.0142372    4.5053765    1.5088608 0.0022498633 -0.024432277    4.5275589 
+   65880    20.012459   0.99603683    23.439019    6.0204375    4.5268803    1.4935572 0.0020187958 -0.023411075    4.5482726 
+   65890    20.120349   0.99051735    23.843185    6.0221407    4.5368599    1.4852808 0.0018038867 -0.022366206    4.5574222 
+   65900    20.212397   0.99638981    23.899978     6.026488    4.5324014    1.4940865 0.0018859299 -0.022854286    4.5533698 
+   65910    20.091342   0.99232339    23.882706    6.0187656    4.5307766    1.4879889 0.0018475122 -0.023112989    4.5520421 
+   65920    20.108397    1.0095852    23.872807    6.0363576    4.5224846     1.513873 0.0017989574 -0.023148777    4.5438345 
+   65930    20.054464    1.0181215    23.705006     6.049326    4.5226527    1.5266733 0.0017470691 -0.022740553    4.5436462 
+   65940    20.401366    1.0074464    23.774715    6.0485277    4.5378618    1.5106659 0.0016545418 -0.022056327    4.5582636 
+   65950    20.245302    1.0194806    23.511241    6.0642573    4.5355462    1.5287111 0.0015470373 -0.021888966    4.5558882 
+   65960    20.331947    1.0221227    23.747936    6.0723151    4.5396421    1.5326729 0.0014803755 -0.021348876    4.5595106 
+   65970    20.183323    1.0116689    23.429781    6.0682278    4.5512304    1.5169974 0.0013674693 -0.020796742    4.5706596 
+   65980    20.349695    1.0238792    23.709644    6.0628914    4.5275845    1.5353068 0.0015877888 -0.021692861    4.5476896 
+   65990    20.127269   0.99780807    23.762911    6.0339404    4.5377272    1.4962132 0.0017644822 -0.022229407    4.5581921 
+   66000    20.054317    1.0053903    23.963506    6.0250797    4.5174969    1.5075827 0.0017108853  -0.02172215    4.5375082 
+   66010    20.301496    1.0046924    23.819066    6.0818118    4.5752755    1.5065363 0.0018061953 -0.022157143    4.5956264 
+   66020    20.318197    1.0289798     23.73857    6.0965127    4.5535575    1.5429552 0.0018186051 -0.022373224    4.5741121 
+   66030    20.395561    1.0000384    23.341277    6.0338745     4.534317    1.4995575  0.001830634 -0.022563338    4.5550497 
+   66040    20.287956    1.0088413    23.642313    6.0382907    4.5255332    1.5127575 0.0017439964 -0.022291245    4.5460804 
+   66050    20.201932    1.0027421    23.708505    6.0397104    4.5360987    1.5036117 0.0015691198 -0.021812262    4.5563419 
+   66060    20.246025    1.0125644    23.818765    6.0418017    4.5234614    1.5183403 0.0015914529 -0.021513515    4.5433835 
+   66070     20.18513     1.003367    23.771687    6.0281997    4.5236508    1.5045488 0.0012554484 -0.019686528    4.5420819 
+   66080    20.259154    1.0174516    23.655435    6.0646531    4.5389844    1.5256687 0.0011320819 -0.019079146    4.5569315 
+   66090     20.25675    1.0261789    23.798633    6.0771636    4.5384083    1.5387552 0.0011732941 -0.019310707    4.5565458 
+   66100    20.248202    1.0191056    23.772547    6.0777774    4.5496286    1.5281488 0.0012895911 -0.019824256    4.5681632 
+   66110    20.301549    1.0169447    23.831386     6.078329    4.5534204    1.5249085 0.0013503014 -0.019819211    4.5718894 
+   66120    20.170819    1.0295317    23.796399    6.0795502    4.5357674    1.5437828 0.0015647721 -0.021242816    4.5554455 
+   66130    19.943115    1.0148893    23.614129    6.0801216    4.5582952    1.5218265 0.0017012405 -0.022192521    4.5787865 
+   66140    20.009501    1.0236725    23.899223    6.0682258    4.5332289     1.534997 0.0017585027 -0.021766269    4.5532366 
+   66150    20.143669    1.0104593    24.029956    6.0293916    4.5142079    1.5151837 0.0015798838 -0.020875311    4.5335034 
+   66160    20.499519    1.0138751    23.556811    6.0493675    4.5290619    1.5203057 0.0014857192 -0.020740286    4.5483164 
+   66170    20.184569    1.0005984    23.742466     6.052638    4.5522407    1.5003972 0.0015454807 -0.021022673    4.5717179 
+   66180    20.432983    1.0115671    23.529018    6.0515376    4.5346927    1.5168449 0.0014382633 -0.020608883    4.5538634 
+   66190    19.943616    1.0144441    23.715707     6.033607    4.5124481    1.5211589 0.0012993359 -0.020175983    4.5313247 
+   66200    20.085617   0.99868573    23.673056    6.0485501    4.5510208    1.4975293 0.0011902937 -0.019545561    4.5693761 
+   66210    20.271649    1.0059469    23.741646    6.0501577    4.5417403    1.5084174 0.0011464882 -0.019667927    4.5602617 
+   66220    20.255306    1.0201609    23.678907    6.0437698    4.5140385    1.5297313 0.0010801801 -0.019080523    4.5320389 
+   66230    20.292837    1.0122462    23.754745    6.0345032      4.51664    1.5178632 0.0010491432 -0.018821702    4.5344126 
+   66240    19.980384    1.0064462    23.749596    6.0617247    4.5525587     1.509166 0.0012454091 -0.019490711     4.570804 
+   66250    20.342433    1.0087794    23.772585    6.0354947      4.52283    1.5126647 0.0013912983 -0.020057495    4.5414962 
+   66260    20.330282   0.99563985    23.704803    6.0125694    4.5196075     1.492962 0.0016446584 -0.020897737    4.5388606 
+   66270    20.482859   0.98036966    23.814513    6.0135761    4.5435118    1.4700643 0.0017740079 -0.021719088    4.5634569 
+   66280    19.915968    0.9803496    23.833673    5.9915881    4.5215539    1.4700342 0.0018332993 -0.021903789    4.5416244 
+   66290    20.262779   0.99803339    23.457859    6.0226847    4.5261337    1.4965511 0.0018035175 -0.021752939    4.5460831 
+   66300    20.363459   0.99988961    23.445939    6.0403581    4.5410237    1.4993345 0.0016075055 -0.020595989    4.5600121 
+   66310    20.376319    1.0021987    23.941473    6.0615211    4.5587241     1.502797 0.0015021075 -0.020448512    4.5776705 
+   66320    20.401096    1.0128932    23.586764    6.0490676    4.5302342    1.5188334 0.0016524554 -0.021379596    4.5499614 
+   66330    20.022322    1.0115331    23.672586    6.0456743    4.5288804    1.5167939  0.001805341 -0.022107861    4.5491829 
+   66340     19.69346    1.0018775    23.796097    6.0580692    4.5557539    1.5023153 0.0017494936 -0.021782943    4.5757873 
+   66350    20.106427   0.99294609     23.62894    6.0275864    4.5386637    1.4889227  0.001617154  -0.02141441     4.558461 
+   66360    20.279228    1.0194544    23.612775    6.0468027    4.5181309    1.5286718 0.0017348013 -0.022059435    4.5384555 
+   66370    20.269424    1.0258663     23.63827    6.0652371    4.5269507    1.5382865  0.001871743 -0.023219662    4.5482986 
+   66380    20.081626    1.0162039    23.730583    6.0544637     4.530666    1.5237977 0.0017025129 -0.022516797    4.5514803 
+   66390    20.333586    1.0172074    23.714003    6.0548186    4.5295161    1.5253024  0.001663477 -0.022466425    4.5503191 
+   66400    20.385689    1.0355496      23.7499    6.0868306     4.534024    1.5528067 0.0017500311 -0.022867015     4.555141 
+   66410    20.292372    1.0215223    23.664496    6.0987101    4.5669373    1.5317728 0.0018061893  -0.02307867    4.5882098 
+   66420    19.997547    1.0398171    23.499626    6.1065882    4.5473824    1.5592058 0.0016929409 -0.022557026    4.5682465 
+   66430    20.063755    1.0294344    23.946564    6.0900888    4.5464519    1.5436369  0.001894733 -0.023634517    4.5681917 
+   66440    20.091818    1.0430618     23.70602    6.0884873    4.5244161    1.5640712 0.0020788794 -0.024094839    4.5464321 
+   66450    20.311135    1.0268759    23.878177    6.0864948    4.5466943    1.5398004 0.0019422309  -0.02325802    4.5680101 
+   66460    19.940695    1.0202414    23.648254    6.0682327    4.5383807    1.5298519  0.001738452 -0.022303983    4.5589463 
+   66470    19.927653    1.0132468    23.662354    6.0617012    4.5423376    1.5193636 0.0018316426 -0.022819265    4.5633252 
+   66480    20.133462    1.0153145    23.601406    6.0470337    4.5245697     1.522464 0.0019844887 -0.023367843     4.545953 
+   66490    20.491828    1.0126879    23.618245     6.038079    4.5195535    1.5185255  0.002121912 -0.023865806    4.5412974 
+   66500     20.35973   0.99928847    23.639466    6.0546439    4.5562108    1.4984331 0.0019250596 -0.022887628    4.5771734 
+   66510     19.97652    1.0162859    23.437278    6.0543489    4.5304281    1.5239207 0.0018936587 -0.022392287    4.5509268 
+   66520    19.526527    1.0297039    23.675012    6.0701913    4.5261503    1.5440411 0.0019595601 -0.022745742    4.5469364 
+   66530    20.353723    1.0267436    23.911392     6.067086    4.5274839     1.539602 0.0020633482 -0.023328894    4.5487495 
+   66540    20.177042    1.0138739    23.722648    6.0666963    4.5463925    1.5203039 0.0022159134 -0.024197605    4.5683741 
+   66550    20.349155    1.0291055    23.950378    6.0742486    4.5311048    1.5431437 0.0021350047 -0.023851717    4.5528216 
+   66560    20.141941    1.0571489    23.641165    6.1189289    4.5337341    1.5851947 0.0020912797 -0.023865511    4.5555084 
+   66570    20.151956    1.0495203     24.04884    6.1188882    4.5451326    1.5737557 0.0018868724 -0.022547841    4.5657935 
+   66580    19.981628    1.0497649    24.127255     6.109316    4.5351935    1.5741224 0.0016497551 -0.021488184     4.555032 
+   66590    20.045787    1.0237376    23.826015    6.0924365     4.557342    1.5350945 0.0016482762 -0.021573819    4.5772676 
+   66600    19.863527    1.0210821    23.772882    6.0758274    4.5447149    1.5311125 0.0017289701 -0.021480543    4.5644665 
+   66610    19.920659    1.0364498    23.683188    6.1055475    4.5513911    1.5541565 0.0017141859 -0.021133983    4.5708109 
+   66620    20.229612    1.0335906    23.874074    6.0850846    4.5352154    1.5498691 0.0016339357 -0.020780262    4.5543618 
+   66630    20.082484    1.0081678    23.649703    6.0562399    4.5444922    1.5117477 0.0017258952 -0.021145954    4.5639123 
+   66640    20.014078    1.0201825    23.799251    6.0552929    4.5255292    1.5297636  0.001825879 -0.021739203    4.5454426 
+   66650    19.848926     1.006817    23.624861    6.0366503    4.5269283     1.509722 0.0019363152 -0.022354357    4.5473463 
+   66660    20.142184   0.98901157    23.543475     6.024316    4.5412931    1.4830228 0.0020187386 -0.022596125    4.5618705 
+   66670    20.045776    1.0132825    23.763854    6.0552522    4.5358351    1.5194171 0.0021093734 -0.023160925    4.5568867 
+   66680     20.42786   0.99685631    23.679428    6.0312033    4.5364173     1.494786 0.0019311527 -0.022128971    4.5566151 
+   66690    20.169462    1.0258953    24.034174    6.0695702    4.5312403      1.53833 0.0017607722 -0.021313579    4.5507931 
+   66700    20.320695   0.98892685    23.626616    6.0280005    4.5451047    1.4828958 0.0015365893 -0.020190059    4.5637581 
+   66710    20.257445    1.0240204    23.814435     6.054274    4.5187553    1.5355187 0.0015197777 -0.020542719    4.5377782 
+   66720    19.703925    1.0171556    23.615736    6.0831576    4.5579328    1.5252248 0.0016415852 -0.020993935    4.5772852 
+   66730    19.980224     1.031628    23.769547    6.0817108    4.5347846    1.5469262 0.0017408722 -0.021960134    4.5550038 
+   66740    20.244959    1.0463918    23.899994    6.0854797    4.5164151    1.5690645 0.0019101948 -0.023009639    4.5375146 
+   66750    20.155802    1.0093729    23.753665    6.0472277     4.533673    1.5135546 0.0020671897 -0.023736397    4.5553422 
+   66760    20.131579    1.0217101    23.802919    6.0740236    4.5419694    1.5320542 0.0021866145 -0.024298403    4.5640812 
+   66770    20.126139    1.0349477    23.714978    6.0466481     4.494744    1.5519041 0.0022235815 -0.024439091    4.5169595 
+   66780    20.188974    1.0120923    23.704971    6.0316784     4.514046    1.5176324 0.0020342084 -0.023591116    4.5356029 
+   66790    20.077738     1.015535    23.592063    6.0256702    4.5028756    1.5227947 0.0019667002 -0.022498617    4.5234075 
+   66800    20.172094    1.0210723    23.640441    6.0648792    4.5337812    1.5310979 0.0018434944 -0.021767026    4.5537048 
+   66810    19.753165     1.011246    23.591942    6.0451589    4.5287955    1.5163634 0.0015415302 -0.020223084     4.547477 
+   66820    20.099625    1.0262987    23.626518    6.0627115    4.5237765    1.5389349 0.0015925947 -0.020678227    4.5428622 
+   66830     20.33505    1.0038829    23.765605    6.0282704    4.5229479    1.5053224 0.0017422897 -0.021157288    4.5423629 
+   66840    20.091702    1.0087691    23.748607    6.0428094    4.5301601    1.5126493 0.0018518417 -0.021821681      4.55013 
+   66850    19.690035    1.0102801    23.660465    6.0314569    4.5165418     1.514915 0.0019904704 -0.022593798    4.5371452 
+   66860    19.623713    1.0164047    24.033986    6.0576614    4.5335626    1.5240988 0.0019173779 -0.022184864    4.5538301 
+   66870    20.290547    1.0003027    23.620401    6.0468738    4.5469199    1.4999539 0.0018152255  -0.02197371    4.5670784 
+   66880     20.51391    1.0234541    23.677442    6.0740939    4.5394245    1.5346694 0.0017819221 -0.022253939    4.5598965 
+   66890    20.544371    1.0480316    23.861281    6.1096647    4.5381414    1.5715234 0.0016886612 -0.022017485    4.5584702 
+   66900    20.337598    1.0289141    23.648519     6.097232    4.5543754    1.5428566 0.0014978748 -0.021081382    4.5739589 
+   66910    20.454566    1.0485782    23.809801    6.1079998    4.5356568     1.572343 0.0014218646 -0.020830401    4.5550653 
+   66920    20.509868    1.0317955    24.130979    6.0901045    4.5429272    1.5471773 0.0014746703 -0.020739538    4.5621921 
+   66930    20.175311    1.0144417    24.026248      6.08003    4.5588746    1.5211554 0.0016287857 -0.021346883    4.5785927 
+   66940    20.435316    1.0408206    23.701973    6.1026204    4.5419099    1.5607105 0.0017162172 -0.021292871    4.5614866 
+   66950    20.437135    1.0161425    23.676595    6.1074661    4.5837604    1.5237057  0.001586313 -0.020620436    4.6027945 
+   66960    20.275639     1.038674    23.739015    6.1150087     4.557517    1.5574917 0.0015548907 -0.020104728    4.5760668 
+   66970    20.025378    1.0469896    23.768254    6.1040674    4.5341065    1.5699609 0.0014423227 -0.019559398    4.5522236 
+   66980     20.43219    1.0334815    23.723438    6.0798333    4.5301279    1.5497054 0.0013745874 -0.019550099    4.5483034 
+   66990     20.31567    1.0364136    23.692607    6.0909736    4.5368715    1.5541021  0.001337049 -0.019261759    4.5547962 
+   67000    20.193419    1.0235561    23.532769    6.0827956    4.5479733    1.5348223 0.0013937147  -0.01980044      4.56638 
+   67010    20.416709    1.0454596    23.523967    6.1131136    4.5454468    1.5676667 0.0017187621 -0.021245878     4.564974 
+   67020    20.106471    1.0473238    23.862086    6.1085306    4.5380686     1.570462 0.0017096492 -0.021438769    4.5577977 
+   67030    20.251606    1.0472006    23.695581    6.1168954    4.5466181    1.5702773 0.0018700741 -0.022517735    4.5672658 
+   67040    20.404393    1.0306095    23.835806    6.0984109    4.5530119     1.545399 0.0019919059 -0.023299619    4.5743196 
+   67050    19.959775    1.0505136    24.079525    6.1089082     4.533663    1.5752452  0.001898145 -0.022953975    4.5547189 
+   67060    20.299691    1.0296718    23.738988    6.0787452    4.5347523    1.5439929 0.0020093242 -0.023441673    4.5561846 
+   67070    20.447884     1.047762    23.657642    6.1142938    4.5431747    1.5711191 0.0020532858 -0.023369761    4.5644911 
+   67080    20.330232    1.0306731    24.198295    6.0802288    4.5347345    1.5454943 0.0018977944 -0.022556402    4.5553931 
+   67090     20.01482    1.0051411    23.882627    6.0482863    4.5410773     1.507209  0.002034599  -0.02321867    4.5622614 
+   67100    20.082527     1.010677    23.869435    6.0404345    4.5249244    1.5155102 0.0019147528 -0.022958835    4.5459684 
+   67110    19.968571    1.0131015    23.616322     6.050532    4.5313863    1.5191457 0.0017934745 -0.022469065    4.5520619 
+   67120    20.271575    1.0118419    23.743175    6.0607191    4.5434622     1.517257 0.0017751523 -0.022474917    4.5641619 
+   67130    20.176418    1.0101611      23.8578     6.049601    4.5348644    1.5147366 0.0016859742 -0.022083545     4.555262 
+   67140    20.341606    1.0207099    23.854278     6.070524    4.5399695    1.5305545 0.0016497471 -0.021788817    4.5601085 
+   67150    20.324948    1.0149133    23.695244    6.0875402    4.5656777    1.5218624 0.0015259828 -0.021150704    4.5853024 
+   67160    20.279613    1.0139077    23.992385    6.0616617     4.541307    1.5203547 0.0014951044  -0.02133676    4.5611487 
+   67170    19.606725    1.0109114    23.710481     6.065004    4.5491423    1.5158617 0.0014204694 -0.020948352    4.5686702 
+   67180    20.057723    1.0348985    23.638152    6.0728975    4.5210671    1.5518304 0.0013807389 -0.020786582    4.5404729 
+   67190    19.541381    1.0397545    23.719591    6.0664064    4.5072945    1.5591118 0.0012809721 -0.020621316    4.5266349 
+   67200    20.163614     1.003895    23.499475    6.0559953    4.5506548    1.5053405  0.001310079 -0.020812111    4.5701568 
+   67210    20.376653   0.98065891    23.831584    6.0048209    4.5343228     1.470498 0.0013925906   -0.0212512    4.5541814 
+   67220    20.245514   0.98407723    23.324951    6.0406639    4.5650401    1.4756238 0.0014838679 -0.021569577    4.5851258 
+   67230    20.210877    1.0248116    23.875096    6.0614352    4.5247302     1.536705 0.0016807096 -0.022685385    4.5457348 
+   67240    20.178657    1.0242922    23.616949    6.0718018    4.5358757    1.5359261 0.0018483303 -0.022770736    4.5567981 
+   67250    20.269171    1.0107955    23.780766    6.0313492    4.5156615    1.5156878   0.00167231 -0.022237954    4.5362271 
+   67260     20.19225    1.0157795    23.832644    6.0395424     4.516381    1.5231614 0.0016086428 -0.022156177    4.5369286 
+   67270    20.159386     1.018454    23.693894    6.0920159    4.5648441    1.5271718 0.0017547624 -0.022713513    4.5858029 
+   67280    19.702687    1.0353614    23.776618    6.0822576    4.5297331    1.5525245    0.0018607 -0.023039277    4.5509117 
+   67290     20.05459    1.0252566    23.608288    6.0887679    4.5513957    1.5373722 0.0019805198 -0.023115871     4.572531 
+   67300    20.319495    1.0443678    23.667599    6.0876753    4.5216458    1.5660295 0.0020191925 -0.023197154    4.5428238 
+   67310    20.100486    1.0135944    23.466698    6.0581628    4.5382779    1.5198848 0.0018240359 -0.021688466    4.5581424 
+   67320    19.944021    1.0067257      23.7777    6.0398669    4.5302817    1.5095851 0.0017125083 -0.021133906    4.5497031 
+   67330    19.825882    1.0053117    23.447949    6.0435138    4.5360489    1.5074649 0.0018574402 -0.022062916    4.5562544 
+   67340     19.92195    1.0287465    23.731142    6.0624211    4.5198157    1.5426054 0.0018665237 -0.021955109    4.5399043 
+   67350    19.910888    1.0004424    23.530673     6.039031    4.5388676    1.5001634 0.0016908618 -0.021190603    4.5583674 
+   67360     20.35566    1.0042847     23.54579    6.0185018     4.512577    1.5059249 0.0015985934 -0.020663471    4.5316419 
+   67370    20.389515   0.98351557    23.582588    6.0084977    4.5337161    1.4747816 0.0015809895 -0.020502664    4.5526378 
+   67380    20.371259    1.0004312    23.652363    6.0167135    4.5165669    1.5001466 0.0014543642 -0.020139996    4.5352525 
+   67390    20.138724   0.99349324    23.652654    6.0069839    4.5172408    1.4897431  0.001327946 -0.019985951    4.5358988 
+   67400      19.9871     0.986122    23.610612    6.0439968    4.5653069    1.4786899 0.0012410027 -0.019807327    4.5838732 
+   67410    20.020111    1.0173532    23.924947    6.0487839    4.5232627    1.5255212 0.0014407217 -0.020797681    4.5426197 
+   67420     19.78124    1.0028995    23.808702    6.0226631    4.5188153    1.5038478 0.0014256803 -0.020975224    4.5383649 
+   67430    20.345056   0.99080225    23.338453    6.0303792    4.5446712     1.485708 0.0016115657 -0.021929435    4.5649891 
+   67440    20.423203    1.0184645    24.021492    6.0637394    4.5365519    1.5271875 0.0014751877 -0.020841985    4.5559187 
+   67450    20.221572    1.0238849    23.738086    6.0746617    4.5393462    1.5353154 0.0012934809 -0.019707979    4.5577607 
+   67460    20.002272    1.0162146    23.981345    6.0523694    4.5285556    1.5238138 0.0015599007 -0.020682976    4.5476786 
+   67470    20.345135    1.0296767     23.90287    6.0706951    4.5266949    1.5440002  0.001606526 -0.020941467    4.5460298 
+   67480    20.321342    1.0096977    23.631014    6.0641165    4.5500748    1.5140416 0.0015512216 -0.020900531    4.5694241 
+   67490     20.21695    1.0170592    24.130675    6.0377339    4.5126536    1.5250803 0.0016799946 -0.021065247    4.5320388 
+   67500     20.37225    0.9961781    23.579211    6.0327181    4.5389491    1.4937691 0.0016592902 -0.020699774    4.5579895 
+   67510    19.983547   0.99946515    23.436638    6.0335245    4.5348265     1.498698 0.0017595887  -0.02104181    4.5541087 
+   67520    19.959602    1.0026924    23.571065    6.0292121    4.5256749    1.5035372 0.0020694672 -0.022500889    4.5461063 
+   67530    20.138968    1.0049474    23.598141    6.0455329    4.5386143    1.5069186 0.0019641974 -0.021725766    4.5583758 
+   67540     20.49593    1.0240252    23.844995    6.0541524    4.5186265    1.5355258  0.001688963 -0.020558235    4.5374958 
+   67550    20.287888    1.0151597    23.593804     6.037852      4.51562     1.522232 0.0014827363 -0.019389456    4.5335267 
+   67560    20.226907    1.0105503    23.966781    6.0303161     4.514996    1.5153202 0.0014873218 -0.019532196    4.5330408 
+   67570    20.176734   0.99757048    23.565784    6.0081523    4.5122954    1.4958569 0.0015694854 -0.019541115     4.530267 
+   67580    20.459786   0.99040793    23.328707    6.0163744    4.5312577    1.4851167  0.001589022 -0.019321415    4.5489901 
+   67590    19.729141    1.0063487    23.585829     6.036501    4.5274811    1.5090199 0.0016386484 -0.019721834    4.5455643 
+   67600    20.193475   0.98453107    23.501669    6.0059792    4.5296749    1.4763043 0.0017643705 -0.020493587    4.5484041 
+   67610    20.206971   0.97623653     23.91408     6.004181    4.5403143    1.4638667 0.0017767604 -0.020922356    4.5594599 
+   67620    20.222954   0.99845467    23.583077      6.01018    4.5129972    1.4971828 0.0014816449 -0.019613944    4.5311295 
+   67630     20.33765    1.0054118     23.66165    6.0259543    4.5183393     1.507615 0.0013830044  -0.01936888    4.5363252 
+   67640    19.694873     0.985962    23.625986    6.0271014    4.5486514      1.47845 0.0013961365 -0.019935837    4.5671911 
+   67650    20.119994   0.99032106    23.835672    6.0164612    4.5314748    1.4849864 0.0015127583  -0.02000798      4.54997 
+   67660    20.104657    1.0040546    23.801247    6.0221516    4.5165718    1.5055799 0.0014206167 -0.019500713    4.5346519 
+   67670    20.370908   0.99852454    23.719951    6.0225801    4.5252926    1.4972876 0.0014657942 -0.019650772    4.5434775 
+   67680    20.054453   0.98862946    23.661874      6.01876    4.5363102    1.4824499 0.0015801686 -0.020765983     4.555496 
+   67690    20.382914    1.0032478     23.75607    6.0427823    4.5384122    1.5043701  0.001814601 -0.022082678    4.5586803 
+   67700    20.110807    1.0095726    23.590811    6.0229215    4.5090673    1.5138542 0.0020095302 -0.022929737    4.5299875 
+   67710    20.130035    1.0132664    23.935754    6.0391196    4.5197266     1.519393 0.0019450741 -0.022907807    4.5406893 
+   67720    20.220813   0.99037963    23.518207    6.0054274    4.5203531    1.4850743 0.0018607889 -0.022575375    4.5410677 
+   67730    20.151794   0.99005403    23.526211    6.0354768    4.5508908     1.484586 0.0016310698  -0.02150194    4.5707617 
+   67740    20.191488    1.0257648      23.7614     6.047849    4.5097147    1.5381343 0.0014229048 -0.020755934    4.5290477 
+   67750    19.960059    1.0045739    23.632902    6.0585434    4.5521849    1.5063585 0.0012832162 -0.020510616    4.5714123 
+   67760    20.386204    1.0302105    23.803013    6.0773633    4.5325627    1.5448006 0.0010826175 -0.019122503    4.5506026 
+   67770      20.0958    1.0117714    23.438417    6.0536653     4.536514    1.5171513 0.0010731312 -0.018929826    4.5543707 
+   67780    20.398649    1.0266196    23.338796     6.062273     4.522857    1.5394161 0.00073926947  -0.01726995    4.5393876 
+   67790    20.150526    1.0252935    23.657322    6.0833169    4.5458893    1.5374276 0.00073642233 -0.017089286    4.5622422 
+   67800    20.264139    1.0242909    23.488917    6.0804883    4.5445641    1.5359242  0.001242382 -0.019339199    4.5626609 
+   67810    20.260433    1.0460474    23.671257     6.105564    4.5370159    1.5685481 0.0014953329  -0.02085277    4.5563734 
+   67820    20.439915    1.0073431    23.626123    6.0615428    4.5510319    1.5105109 0.0014670093 -0.020807002    4.5703719 
+   67830    20.042189    1.0062403     23.75617    6.0553741    4.5465168    1.5088573 0.0016430665 -0.021534617    4.5664084 
+   67840    20.128617    1.0319084    23.806048    6.0885859    4.5412393    1.5473466 0.0016436489 -0.021057592    4.5606532 
+   67850    19.958435    1.0559537    23.959558    6.1096227    4.5262202    1.5834025 0.0018524431   -0.0220133    4.5463811 
+   67860    19.839479    1.0278083    23.678067     6.094193    4.5529945    1.5411985 0.0018553271 -0.022050669    4.5731898 
+   67870    19.945379    1.0357012    23.789365     6.082737    4.5297031    1.5530339 0.0018969057 -0.022130881    4.5499371 
+   67880    20.023665    1.0237084    23.604711    6.0779347     4.542884    1.5350507 0.0020358244 -0.022740871    4.5635891 
+   67890    20.084088    1.0332253    23.801826    6.0941374     4.544816    1.5493214 0.0021338199 -0.023485338    4.5661675 
+   67900    20.073466    1.0405499    23.802021    6.0978501    4.5375455    1.5603046 0.0021823436 -0.023824832    4.5591879 
+   67910    20.166013    1.0131914    23.514113    6.0843142    4.5650337    1.5192805 0.0020992523 -0.023658504    4.5865929 
+   67920    19.992693    1.0203784    23.506111    6.0576654    4.5276079    1.5300575 0.0020725762 -0.023792727     4.549328 
+   67930    19.901399    1.0285679    23.857665    6.0632816    4.5209441    1.5423375  0.002159212 -0.023854248    4.5426391 
+   67940    19.919999    1.0054599    23.764917    6.0636106    4.5559234    1.5076871 0.0021298813 -0.023732732    4.5775263 
+   67950    20.185937    1.0216503    23.760986    6.0459728    4.5140082    1.5319646 0.0018283812    -0.022891    4.5350709 
+   67960    20.023861     1.003693    23.745771     6.031972    4.5269344    1.5050376 0.0017897639 -0.022569373     4.547714 
+   67970    20.390667   0.97770929    23.572792    5.9957595    4.5296845    1.4660751 0.0018651696 -0.022622912    4.5504422 
+   67980    20.523232   0.97636508    23.531727    5.9932194      4.52916    1.4640594 0.0019784743 -0.023304358    4.5504859 
+   67990    20.271194   0.99981727    23.830172    6.0033486    4.5041226     1.499226 0.0020115306 -0.023639268    4.5257504 
+   68000    20.381772    1.0057026    23.913537    6.0303332    4.5222821    1.5080511 0.0019406739 -0.023214688    4.5435561 
+   68010    20.376438   0.98303041    23.670312    6.0276043    4.5535502    1.4740541 0.0018796536 -0.022899912    4.5745705 
+   68020    20.029818    1.0030602    23.930349    6.0285714    4.5244826    1.5040888 0.0019521708 -0.023226449    4.5457569 
+   68030    19.872953   0.99554583    23.658445    6.0292625    4.5364415     1.492821 0.0018273542 -0.022637301    4.5572515 
+   68040    19.996775    1.0178995    23.875202    6.0500863     4.523746    1.5263404 0.0017113837 -0.022027672    4.5440623 
+   68050    19.636165    1.0057753    23.490252    6.0545354    4.5463754    1.5081601 0.0017818563  -0.02240944    4.5670029 
+   68060    20.207465    1.0099203    23.616214    6.0393875     4.525012    1.5143754 0.0018447733 -0.022890666    4.5460579 
+   68070    20.244115   0.99868212    23.587176    6.0343326    4.5368087    1.4975238 0.0020498806   -0.0237268    4.5584856 
+   68080    20.042336    1.0225023    23.712261       6.0451    4.5118578    1.5332422 0.0022916202 -0.024449068    4.5340153 
+   68090    20.050363    1.0194789    23.644478    6.0512031    4.5224945    1.5287086 0.0022567135 -0.024347245     4.544585 
+   68100    20.349983    1.0092564    23.815843    6.0659828    4.5526029    1.5133799 0.0022910585 -0.024400466    4.5747123 
+   68110    20.548763     1.015216    23.510552     6.060568    4.5382517    1.5223163 0.0022743175 -0.024229029    4.5602064 
+   68120    20.264588    1.0061642    23.789711    6.0423209    4.5335777    1.5087432 0.0024046656 -0.024883337    4.5560564 
+   68130    20.212591    1.0204573    23.635469     6.057016    4.5268402    1.5301758 0.0023462271 -0.024930168    4.5494241 
+   68140    20.108227    1.0125684    23.752585     6.078935    4.5605888    1.5183463 0.0021965536 -0.024132437    4.5825247 
+   68150    20.299381    1.0269994    23.863953    6.0495973    4.5096118    1.5399855 0.0021101058 -0.023308949    4.5308106 
+   68160    20.459824    1.0187368    23.661518    6.0594024    4.5318066    1.5275958 0.0018053951 -0.022093381    4.5520946 
+   68170     20.50406    1.0168457    23.907214    6.0745896    4.5498294    1.5247601  0.001665426 -0.021551573    4.5697156 
+   68180    20.425614    1.0371915    23.837798    6.0896244    4.5343557    1.5552687 0.0018440649  -0.02252792    4.5550396 
+   68190      20.4239    1.0229017    23.825579    6.0610137    4.5271726    1.5338411 0.0017933634 -0.022712862    4.5480921 
+   68200    20.291614    1.0169042    23.838043    6.0399759    4.5151281    1.5248478 0.0019138068 -0.023302862    4.5365171 
+   68210    20.211253    0.9984519     23.72342    6.0519166     4.554738    1.4971786 0.0017928918 -0.022534717    4.5754798 
+   68220    20.044268    1.0135539    23.741484    6.0737288    4.5539048     1.519824 0.0017769979 -0.022259628    4.5743874 
+   68230    20.140702    1.0171313    23.707444    6.0800489    4.5548605    1.5251884 0.0017343658 -0.021962449    4.5750886 
+   68240    19.969846    1.0095404     23.82598      6.06065    4.5468442    1.5138058 0.0016987821 -0.021833113    4.5669786 
+   68250    20.020422      1.00753    23.680922    6.0515363    4.5407451    1.5107912 0.0017313399 -0.021422595    4.5604364 
+   68260    20.371593   0.99165255    23.505742    6.0482285    4.5612455     1.486983 0.0017234966 -0.020821768    4.5803438 
+   68270    20.272803    1.0049184    23.616342     6.052263    4.5453878    1.5068752 0.0015675678 -0.020220985    4.5640413 
+   68280    20.365472    1.0096278    23.667003    6.0459079     4.531971    1.5139369 0.0014634781 -0.019613748    4.5501212 
+   68290    20.335086    1.0075372    23.690395    6.0435344    4.5327323     1.510802 0.0014073194 -0.019523071    4.5508481 
+   68300    20.394992    1.0173681     23.58574    6.0290166    4.5034732    1.5255434 0.0012956148 -0.018892175    4.5210698 
+   68310    20.228316    1.0073024    23.687308    6.0359325    4.5254825      1.51045 0.0010608385 -0.017446069    4.5418678 
+   68320    19.981575    1.0153737    23.782701    6.0271663    4.5046134    1.5225528 0.0011534188 -0.018044902    4.5215049 
+   68330    20.299895    1.0204022    23.811853    6.0468437    4.5167506    1.5300932 0.0014627174 -0.019454311    4.5347422 
+   68340    20.242986    1.0144322    23.921705    6.0569848    4.5358437    1.5211411 0.0017506569 -0.020682555    4.5547756 
+   68350    20.206482    1.0131525     23.84189    6.0553767    4.5361545    1.5192222 0.0018391946 -0.021412211    4.5557276 
+   68360    20.289266    1.0084718    23.698455    6.0457718    4.5335683    1.5122035 0.0017511812 -0.021422584    4.5532397 
+   68370    20.028915    1.0118319    23.826847    6.0507786    4.5335367    1.5172419 0.0016641921  -0.02125216    4.5531247 
+   68380    20.469345    1.0193416     23.63276    6.0617111    4.5332083    1.5285027 0.0013844224 -0.020199982    4.5520239 
+   68390    20.184322    1.0167671    23.604051    6.0365961    4.5119538    1.5246423 0.0011589343 -0.019156706    4.5299516 
+   68400    20.242308    1.0172853    23.658275     6.040948    4.5155287    1.5254193 0.0012241077 -0.019388155    4.5336927 
+   68410    20.397443      1.02456    23.704395     6.072392    4.5360642    1.5363277 0.0012448646 -0.019460362    4.5542797 
+   68420    20.221767    1.0319881    23.657477    6.0931686    4.5457025    1.5474661 0.0011976555 -0.019035452    4.5635403 
+   68430    20.033595    1.0171001    23.622432    6.0834087    4.5582671    1.5251417 0.0012169173 -0.019221925    4.5762721 
+   68440    20.071244    1.0235391    23.815781    6.0870611    4.5522642    1.5347969 0.0013574472 -0.019928407    4.5708351 
+   68450    20.112614    1.0273436    23.891914     6.067401    4.5268993    1.5405017 0.0013343163 -0.019506328    4.5450713 
+   68460    20.269759    1.0121794    23.630462    6.0409486    4.5231856     1.517763 0.0016090802 -0.020416618    4.5419931 
+   68470    20.194626    1.0085535    24.029749    6.0206389    4.5083129    1.5123259  0.001604678 -0.020592054    4.5273003 
+   68480    20.304869   0.98801331     23.68329    6.0068533    4.5253274     1.481526 0.0015337322 -0.020483691    4.5442773 
+   68490    20.417673   0.99078945    23.609112     6.004078    4.5183892    1.4856888 0.0014595353 -0.020833559    4.5377632 
+   68500     20.37194   0.98365309    23.796184    6.0048181    4.5298303    1.4749878 0.0015461535 -0.021587891     4.549872 
+   68510     20.35779    1.0067895    23.812008    6.0280879     4.518407    1.5096808 0.0015583564 -0.021410134    4.5382588 
+   68520    20.444166    1.0026216    23.831071    6.0289436    4.5255126    1.5034311 0.0016825993 -0.021832704    4.5456627 
+   68530    20.168565    1.0029402    23.892987    6.0306879    4.5267791    1.5039088  0.001536294 -0.021175201     4.546418 
+   68540    20.369863    1.0040112    24.014828    6.0379275    4.5324127    1.5055148 0.0015984498  -0.02074207    4.5515563 
+   68550    20.478491   0.98608847    23.521966    6.0207896      4.54215    1.4786397  0.001854932 -0.021358373    4.5616534 
+   68560    20.400548    1.0102514    23.614943     6.035059    4.5201871    1.5148719    0.0020302 -0.022481008    4.5406379 
+   68570    20.006129   0.99588051    23.765256    6.0431306    4.5498078    1.4933228 0.0020058499 -0.022643424    4.5704454 
+   68580    20.263196     1.019621    23.861913    6.0595878    4.5306662    1.5289216 0.0019127136 -0.022477702    4.5512312 
+   68590    19.972546    1.0340078    23.981291    6.0714048    4.5209101    1.5504947 0.0016496025 -0.021875901    4.5411364 
+   68600    20.125843    1.0169101     23.63759    6.0644059    4.5395492    1.5248567  0.001618193 -0.021868362    4.5597993 
+   68610    20.079833    1.0061778    23.627365      6.03977    4.5310065    1.5087636 0.0016344318 -0.021866805    4.5512388 
+   68620    20.350487    0.9896582    23.571255    6.0407614    4.5567689    1.4839925 0.0017905237 -0.022538878    4.5775173 
+   68630    20.305894    1.0237139    23.829152    6.0500262    4.5149672    1.5350591 0.0017800076 -0.022716142    4.5359033 
+   68640    20.001059    1.0110298     23.93916    6.0555311    4.5394919    1.5160392 0.0019115805 -0.022928064    4.5605084 
+   68650    20.108765   0.99186294    23.786996    6.0397007    4.5524022    1.4872985 0.0018421355 -0.022307515    4.5728676 
+   68660    20.341172    1.0209649    23.565806    6.0394572    4.5085204    1.5309368 0.0018408009 -0.022091026    4.5287706 
+   68670    20.291705   0.99171953    23.588673     6.040745    4.5536616    1.4870834 0.0019392993 -0.022311999    4.5740343 
+   68680     20.25158    1.0066322    23.599746    6.0476676    4.5382226    1.5094449 0.0019468593  -0.02263866    4.5589144 
+   68690    20.256992    0.9966253    23.862193    6.0373564    4.5429168    1.4944396 0.0020413856 -0.023174814    4.5640502 
+   68700     20.29122    1.0265253    23.722707    6.0592647      4.51999    1.5392747 0.0021011937 -0.023685309    4.5415741 
+   68710    20.033425    1.0083318     23.69016    6.0295354    4.5175418    1.5119936  0.002114854 -0.024026752    4.5394537 
+   68720    20.182861    1.0034639     23.70858    6.0561776    4.5514835    1.5046941 0.0022230692 -0.024292677    4.5735531 
+   68730    20.101431    1.0044401    23.759509    6.0503141    4.5441561     1.506158 0.0021638645 -0.023725379    4.5657176 
+   68740    20.335394    1.0166997     23.66148    6.0741076    4.5495663    1.5245412 0.0020044853 -0.022779024    4.5703409 
+   68750    20.499748    1.0211245    23.959997    6.0598443    4.5286681    1.5311762 0.0019286859 -0.022406172    4.5491456 
+   68760    20.453201     1.031457    24.009376     6.053915    4.5072452    1.5466698 0.0019706134 -0.022914812    4.5281894 
+   68770    20.111768    1.0111632    23.817491    6.0553146    4.5390753    1.5162393 0.0020803408 -0.023499072     4.560494 
+   68780    19.931609   0.99484011    23.889578    6.0557315    4.5639688    1.4917628 0.0020786174 -0.023472013    4.5853621 
+   68790    20.302886    1.0272374    23.836845    6.0793087    4.5389662    1.5403425 0.0019609521 -0.022849387    4.5598547 
+   68800    20.459932     1.026267    23.720345    6.0731406    4.5342532    1.5388874 0.0018343157 -0.022204465    4.5546234 
+   68810    20.334362    1.0186832    23.880878    6.0581029    4.5305874    1.5275155 0.0018489528 -0.021901055    4.5506395 
+   68820    20.339584   0.99647797    23.692431     6.038889    4.5446703    1.4942187 0.0017130718 -0.021207235    4.5641645 
+   68830    20.275197   0.99067015    23.617525    6.0193723    4.5338624    1.4855099 0.0016209494 -0.020778205    4.5530196 
+   68840    20.199409   0.98829086    23.591102    5.9969204    4.5149782    1.4819421 0.0016334619 -0.020912598    4.5342574 
+   68850    20.147971   0.98866794    23.711166    6.0141897    4.5316821    1.4825076  0.001689879 -0.021286246    4.5512785 
+   68860    20.563455   0.99949807    23.699956    6.0403187    4.5415714    1.4987474 0.0016439803 -0.021052872    4.5609802 
+   68870    20.362072    1.0034304    23.752316    6.0454242    4.5407804    1.5046438 0.0016318916 -0.020797179    4.5599456 
+   68880    20.201691    1.0237424    23.783839    6.0440188    4.5089171    1.5351017 0.0014076924 -0.019439861    4.5269493 
+   68890    19.804816    1.0016446    23.545899     6.042374    4.5404079    1.5019661 0.0014263638 -0.019645788    4.5586273 
+   68900    19.922423    0.9981019    23.626484    6.0369312    4.5402774    1.4966538 0.0016645257 -0.020955765    4.5595687 
+   68910     19.78208    1.0153231    24.000285    6.0517491    4.5292721     1.522477 0.0016171746 -0.021134378    4.5487893 
+   68920    20.029366    1.0316771    23.718244    6.0538474    4.5068476    1.5469998 0.0015997265 -0.021393548    4.5266414 
+   68930    20.166678    1.0082265    23.685202     6.046928    4.5350923    1.5118357  0.001639689 -0.021867852    4.5553205 
+   68940     20.06143    1.0343531    23.660949    6.0589776    4.5079652    1.5510124 0.0016304413  -0.02192413    4.5282589 
+   68950    20.030747    1.0178673    23.850309    6.0939132    4.5676212    1.5262919 0.0017910766 -0.022450937    4.5882811 
+   68960    20.318347    1.0241985    23.918857    6.0681986     4.532413    1.5357856  0.001791394 -0.021958437      4.55258 
+   68970    20.257309    1.0311104    23.756139    6.0825535    4.5364035      1.54615  0.001897311 -0.022357118    4.5568633 
+   68980    20.231041   0.99375243    23.656335    6.0462482    4.5561164    1.4901318 0.0019228122 -0.022216017    4.5764096 
+   68990     20.03099   0.99937307     23.51514    6.0260025    4.5274426    1.4985599 0.0019056621 -0.022056052     4.547593 
+   69000    20.147923   0.98863918    23.732104    6.0265683    4.5441038    1.4824645 0.0018894887 -0.022152833    4.5643671 
+   69010    20.246867    1.0022232    23.922161    6.0420578    4.5392242    1.5028336 0.0018384815 -0.021874358    4.5592601 
+   69020    20.211165    1.0156805    23.603915    6.0541962    4.5311832    1.5230129 0.0016602039 -0.020646505    4.5501695 
+   69030     20.30608    1.0136217    23.567575    6.0720881    4.5521624    1.5199257  0.001583013  -0.02033234    4.5709117 
+   69040    20.124575    1.0167904    23.686533    6.0733693    4.5486921    1.5246772 0.0014536904 -0.020167559     4.567406 
+   69050    20.313642    1.0029134    23.618015    6.0408779    4.5370092    1.5038687 0.0014472904 -0.020128083      4.55569 
+   69060    19.825221    1.0274696    23.719063    6.0663664    4.5256758    1.5406906 0.0014588734 -0.020306134    4.5445231 
+   69070    20.372011    1.0156068    23.895117    6.0745414     4.551639    1.5229024 0.0014809447 -0.020425443    4.5705835 
+   69080    20.170462    1.0503579     23.57594    6.1211422    4.5461305    1.5750117 0.0015591182 -0.020770448    4.5653419 
+   69090    20.266719    1.0406699    23.754247    6.1290843    4.5685998    1.5604845 0.0017481188 -0.021567022    4.5884187 
+   69100     20.24658    1.0389553     23.79542    6.1186136       4.5607    1.5579135 0.0018265864 -0.022067119    4.5809406 
+   69110    19.941982    1.0363286    23.794757    6.1078448      4.55387    1.5539748 0.0017547439 -0.021713668    4.5738289 
+   69120    20.154907    1.0194591    23.903151    6.0779889    4.5493099    1.5286789 0.0019467205 -0.022575681    4.5699389 
+   69130    20.249124      1.02033    23.788267    6.0785154    4.5485305    1.5299848 0.0019234588 -0.022781468    4.5693885 
+   69140    20.253896     1.039332    23.714467    6.0971675    4.5386892    1.5584783 0.0019116812 -0.022980186    4.5597578 
+   69150    19.839405    1.0580844    24.014993    6.1240389    4.5374414    1.5865975 0.0019241579 -0.023326723    4.5588439 
+   69160    20.188729    1.0385412    23.790536    6.0950435     4.537751    1.5572925 0.0018195108 -0.022937464    4.5588689 
+   69170    20.323774    1.0230725    23.780956    6.0708609    4.5367637    1.5340972 0.0018684039 -0.023334277    4.5582296 
+   69180    20.165864     1.015127    23.795699    6.0416826    4.5194997    1.5221829 0.0018607124 -0.023467456    4.5411064 
+   69190    19.924517    1.0102429    23.772932    6.0062853    4.4914261    1.5148592 0.0017518155 -0.022532107    4.5122064 
+   69200    20.426938   0.98942615    23.734079    6.0133199    4.5296754    1.4836445 0.0017566367 -0.022261044    4.5501798 
+   69210    20.189682    1.0030225    23.624916    6.0003957    4.4963635    1.5040322 0.0015689212 -0.021281821    4.5160764 
+   69220    20.047015   0.99823428    23.726239    6.0069556    4.5101033    1.4968523 0.0013855026 -0.020615499    4.5293333 
+   69230    20.179768    0.9866132    23.693621    6.0176149    4.5381884    1.4794265 0.0013220821 -0.020260205    4.5571266 
+   69240    20.180206    1.0060957    23.595807    6.0356544    4.5270139    1.5086405 0.0012391082 -0.019623348    4.5453981 
+   69250    20.224884   0.99639481    23.897249    6.0276208    4.5335268     1.494094 0.0011886854 -0.019177185    4.5515153 
+   69260    20.420153   0.99083182    23.633307    6.0202994    4.5345471    1.4857523 0.0013876032 -0.019888887    4.5530483 
+   69270    20.332978    0.9990159    23.588119    5.9921558    4.4941315    1.4980243 0.0015413107 -0.020694159    4.5132843 
+   69280    20.211714   0.98993609    23.595921    5.9918533    4.5074441    1.4844092 0.0015123308 -0.020732087    4.5266638 
+   69290    20.429201    1.0086668    23.879585    6.0097781    4.4972823    1.5124959 0.0017125777 -0.022010164    4.5175798 
+   69300    20.334149    1.0189311    23.520331    6.0404471    4.5125599    1.5278872 0.0018167323  -0.02241087     4.533154 
+   69310    20.122826    1.0158978    23.596902    6.0608699     4.537531    1.5233388 0.0018087474 -0.022683678     4.558406 
+   69320    19.945154    1.0085742    23.750538    6.0270186    4.5146615     1.512357  0.001816604 -0.022685839    4.5355308 
+   69330    20.253569    1.0182535    23.805437    6.0684823    4.5416111    1.5268712 0.0016928092 -0.022003711     4.561922 
+   69340    20.447867    1.0230508    23.741611    6.0483193    4.5142547    1.5340646 0.0016503735 -0.021782694     4.534387 
+   69350    20.100656    1.0243844    23.664079    6.0770831    4.5410187    1.5360645 0.0015982145 -0.021668666    4.5610891 
+   69360    20.091367    1.0416064    23.737591     6.106853    4.5449642    1.5618888 0.0015844894 -0.021628787    4.5650085 
+   69370    20.249045    1.0336684    23.838212    6.0874091    4.5374234    1.5499857 0.0015572539 -0.021205008    4.5570711 
+   69380    20.014911    1.0437475    23.716001    6.0942269    4.5291275    1.5650994 0.0013193851 -0.020317232    4.5481253 
+   69390    20.141484    1.0336254    23.759927      6.08409    4.5341687    1.5499213 0.0013624348 -0.020641007    4.5534472 
+   69400    20.289577    1.0347915     23.81863    6.1061042    4.5544344    1.5516698 0.0015600821 -0.021684402    4.5745587 
+   69410    20.429265    1.0203838    23.963292    6.0715922    4.5415266    1.5300655 0.0018070951 -0.022840656    4.5625602 
+   69420    20.393254    1.0065307    23.680422     6.066217    4.5569242    1.5092928 0.0020616196  -0.02349677    4.5783594 
+   69430      20.2107    1.0220021    23.794316    6.0681263    4.5356341    1.5324922 0.0021252446 -0.023627389    4.5571363 
+   69440    20.357665    1.0140343    23.567048    6.0691107    4.5485662    1.5205444 0.0018014311 -0.022117672    4.5688825 
+   69450    20.417613    1.0100425    23.703998    6.0683775    4.5538189    1.5145587 0.0014964169 -0.020691037    4.5730135 
+   69460    20.262452    1.0201738    23.632164     6.069581    4.5398304    1.5297506 0.0014072486 -0.020024989    4.5584482 
+   69470    20.220807    1.0202557    23.795304    6.0751038    4.5452304    1.5298734 0.0015572953 -0.020418158    4.5640912 
+   69480    20.126689    1.0234499    23.741298    6.0774735    4.5428103    1.5346631 0.0015085557 -0.020007528    4.5613093 
+   69490    20.575669    1.0090228    23.718617    6.0591284    4.5460987    1.5130297 0.0016902733 -0.021287088    4.5656955 
+   69500    20.396285    1.0010325    23.466557    6.0455997    4.5445514    1.5010483 0.0018959717  -0.02234733    4.5650028 
+   69510    19.984359    1.0064472    23.621323    6.0264301    4.5172625    1.5091676 0.0021742671  -0.02396289    4.5390511 
+   69520    19.816821    1.0026549    23.498755    6.0098703    4.5063892     1.503481 0.0021460884 -0.024199747    4.5284429 
+   69530    20.359196   0.96427096    23.530154    5.9777292    4.5318049    1.4459243 0.0020109135 -0.023721491    4.5535155 
+   69540     20.20088   0.98798391    23.921259    5.9757244    4.4942425    1.4814819 0.0017792105 -0.022684519    4.5151478 
+   69550    20.265629   0.98236749     23.67642    5.9906526    4.5175925      1.47306 0.0017907564 -0.022657291    4.5384591 
+   69560    20.073042    1.0003772    23.298325    6.0215149    4.5214494    1.5000656 0.0018311525 -0.022144143    4.5417624 
+   69570    20.387454   0.98731778    23.825553    5.9897433    4.5092603     1.480483 0.0015152972 -0.020516102    4.5282611 
+   69580    20.361903   0.96764229     23.60444    5.9872699    4.5362902    1.4509796 0.0014145832 -0.019847782    4.5547234 
+   69590    20.109128   0.97820424    23.502361    6.0012523     4.534435    1.4668173 0.0016453485 -0.021216127    4.5540058 
+   69600    20.222011   0.98681842    23.643693    6.0226753    4.5429411    1.4797342 0.0018772025 -0.022296693    4.5633606 
+   69610    20.387938   0.99778359    23.906825    6.0146338    4.5184573    1.4961765 0.0020704754 -0.023261381    4.5396483 
+   69620    20.282345    1.0079031    23.656667    6.0082497     4.496899    1.5113507  0.002202714 -0.023711567    4.5184078 
+   69630    20.320068    1.0027551    23.625005    6.0213908    4.5177595    1.5036313 0.0022041181 -0.023835358    4.5393908 
+   69640    20.305505    1.0064841    23.830245     6.010884    4.5016611    1.5092229 0.0022314826 -0.024035955    4.5234655 
+   69650    20.291327    1.0045753    23.685328    6.0012779    4.4949172    1.5063606  0.002179784 -0.024005352    4.5167428 
+   69660    20.271046    1.0000043    23.519051      6.00663    4.5071235    1.4995065 0.0020540823 -0.023192606     4.528262 
+   69670    20.322649    0.9973275    23.857446    5.9998843    4.5043917    1.4954926 0.0018777192 -0.022641422    4.5251554 
+   69680    20.326141    1.0133864    24.067536     6.047643    4.5280701    1.5195729 0.0016464497 -0.021085892    4.5475095 
+   69690    20.069498    1.0133197    23.711466    6.0580105    4.5385376    1.5194729  0.001543965 -0.020450791    4.5574444 
+   69700    20.174978    1.0169147     23.65699    6.0541348    4.5292712    1.5248636 0.0016077612 -0.021077184    4.5487406 
+   69710    20.079593     1.020546    23.805108    6.0707501    4.5404414    1.5303087 0.0018205916 -0.022072742    4.5606936 
+   69720    20.133673    1.0286682    23.695961    6.0781075    4.5356196     1.542488 0.0018711096 -0.021999283    4.5557478 
+   69730    20.177632    1.0192421     23.58131    6.0776197    4.5492662    1.5283535 0.0019773639 -0.022646965    4.5699358 
+   69740    20.241503    1.0180853    23.941874    6.0731006    4.5464817    1.5266189 0.0018591886  -0.02199637    4.5666189 
+   69750    20.189045    1.0272821    23.922256    6.0586361    4.5182266    1.5404095 0.0015939566 -0.020756182    4.5373889 
+   69760    19.959775    1.0177412    24.070344    6.0603219    4.5342189     1.526103 0.0013752438  -0.01981823    4.5526619 
+   69770    20.387863    1.0112972     23.88234    6.0535186    4.5370784    1.5164402 0.0010175157 -0.018023156     4.554084 
+   69780    20.358441    1.0148264    23.543336    6.0628723      4.54114    1.5217323 0.0011738401   -0.0184359    4.5584021 
+   69790    20.101958   0.99620496    23.879921     6.045668    4.5518586    1.4938093 0.0014361123 -0.019856597    4.5702791 
+   69800     20.19317   0.98106693    23.462799     6.012376    4.5412661    1.4711099 0.0014254709 -0.019533684    4.5593743 
+   69810    20.326632   0.99771814    23.750525    6.0163785    4.5203001    1.4960783 0.0013825832  -0.01958803    4.5385056 
+   69820    20.282324   0.99437902    23.885498    6.0225126    4.5314413    1.4910713 0.0014577644 -0.020101533    4.5500851 
+   69830    20.215564    1.0166688    23.901736    6.0442092    4.5197143    1.5244949 0.0014567666 -0.019966449     4.538224 
+   69840    20.364397    1.0064982    23.945878    6.0362673    4.5270232    1.5092441 0.0015838629 -0.021014853    4.5464542 
+   69850    20.388542    1.0053705    23.863907    6.0379322    4.5303791    1.5075531 0.0015616565  -0.02115618    4.5499736 
+   69860    20.372015    1.0321291    23.859903    6.0839475      4.53627    1.5476775 0.0015391691 -0.021104863    4.5558357 
+   69870    20.424479     1.022499    23.845342    6.0867191    4.5534818    1.5332373 0.0017514038 -0.022210529    4.5739409 
+   69880    20.407722    1.0319607    23.733107    6.0801789    4.5327539     1.547425 0.0020631955 -0.023788357    4.5544791 
+   69890    20.121762    1.0207356    23.745081     6.063217    4.5326239     1.530593 0.0021580119 -0.024155272    4.5546212 
+   69900      20.4559    1.0067849    23.569697    6.0377591     4.528085     1.509674  0.002176611 -0.024405834    4.5503143 
+   69910    20.065806    1.0040771    24.032987    6.0441726     4.538559    1.5056136 0.0023469887  -0.02494462    4.5611566 
+   69920    20.337064   0.99815158    23.619281    6.0420553     4.545327    1.4967283 0.0022703763  -0.02493996    4.5679965 
+   69930    20.220091    1.0066653    23.804035     6.033155    4.5236603    1.5094947  0.002255614 -0.025127037    4.5465317 
+   69940    20.154336    1.0012661    23.861102    6.0382193    4.5368208    1.5013985 0.0021387269 -0.024424128    4.5591062 
+   69950    19.884682   0.99190163    23.843767    6.0129339    4.5255774    1.4873565 0.0019404602   -0.0235901     4.547227 
+   69960    20.256688    1.0105872    23.728289     6.029582    4.5142065    1.5153755 0.0018484473 -0.023011885    4.5353699 
+   69970     20.29594    1.0072832    23.692289    6.0470448    4.5366237    1.5104211 0.0019134072 -0.022952846    4.5576631 
+   69980    20.132664    1.0202639    23.874174    6.0626276    4.5327419    1.5298857 0.0018412735 -0.022246885    4.5531475 
+   69990    20.509329   0.99375834    23.766664    6.0346363    4.5444957    1.4901406 0.0017777271 -0.021688422    4.5644064 
+   70000    20.275567    1.0188939    23.876934    6.0366366    4.5088053    1.5278314 0.0017293336 -0.021850003     4.528926 
+   70010    20.190985    1.0026843    23.833813    6.0253016    4.5217765    1.5035251  0.001704084 -0.021745026    4.5418174 
+   70020    20.394816    1.0039988    23.479388    6.0243916    4.5188954    1.5054962 0.0018314807 -0.022627363    4.5396913 
+   70030    19.756957    1.0085057    23.552409    6.0523185    4.5400642    1.5122543 0.0018971382 -0.023105511    4.5612726 
+   70040    20.186213    1.0183631    23.952692    6.0419888    4.5149533    1.5270355 0.0017314751 -0.022078776    4.5353006 
+   70050    20.238426   0.99862565    23.799342    6.0189801    4.5215409    1.4974392 0.0015892522  -0.02130146    4.5412532 
+   70060    20.411881   0.98992856    23.709188    6.0149973    4.5305994    1.4843979 0.0014391868 -0.020746693    4.5499069 
+   70070    20.286071   0.99356308    23.833363    6.0160392    4.5261913    1.4898478 0.0015180099 -0.020994741    4.5456681 
+   70080    20.047467    1.0088667    23.759694    6.0292377    4.5164421    1.5127956 0.0014568153 -0.020518854    4.5355042 
+   70090     20.14954    1.0047965    23.789947    6.0407793     4.534087    1.5066923 0.0014256736 -0.020299054    4.5529604 
+   70100     19.99783   0.97841579    23.782016    5.9973414    4.5302069    1.4671345 0.0014502721 -0.020355325     4.549112 
+   70110    20.335237   0.99052468    23.618163    6.0226193    4.5373275    1.4852918 0.0011885543 -0.018967864    4.5551069 
+   70120    20.101912   0.99746723    23.609178    6.0327846    4.5370824    1.4957021 0.0011963152 -0.019121512    4.5550076 
+   70130    20.199099    1.0078506    23.699973    6.0339548    4.5226829     1.511272 0.0014571315 -0.020552381    4.5417781 
+   70140    20.270536    1.0037107    23.809497    6.0492465    4.5441824    1.5050641 0.0015794982  -0.02082888    4.5634318 
+   70150    20.296666    1.0073782    23.874263    6.0332124    4.5226487    1.5105637 0.0017132666 -0.021110772    4.5420462 
+   70160    20.405884   0.99382357    23.501031    6.0214627    4.5312242    1.4902384 0.0017864648 -0.021620007    4.5510578 
+   70170    19.887755   0.99621293    23.869084    6.0143285    4.5205072    1.4938213 0.0017375558 -0.021694358     4.540464 
+   70180    20.512668   0.99899375    23.570429    6.0212726    4.5232815    1.4979911 0.0019011971 -0.022406242    4.5437865 
+   70190    20.299937   0.99293222    23.626293    6.0221647    4.5332628    1.4889019 0.0020239743 -0.023029753    4.5542686 
+   70200    19.886833   0.99600847    23.715653    6.0156761    4.5221614    1.4935147 0.0020478687 -0.023389677    4.5435033 
+   70210    20.009124    0.9965118    23.528123    6.0127392    4.5184698    1.4942694  0.002004776 -0.023389293    4.5398543 
+   70220    20.357812   0.98585383     23.76163    6.0067531    4.5284653    1.4782878 0.0020511318 -0.024121003    4.5505352 
+   70230    20.416297   0.98403146    23.575283    5.9997328    4.5241776    1.4755552 0.0019046107 -0.023360202    4.5456332 
+   70240    20.009872    1.0055322    23.926501     6.020541    4.5127455    1.5077955 0.0019190527  -0.02335215    4.5341786 
+   70250     20.32192    1.0072909    23.940162    6.0366932    4.5262605    1.5104327 0.0019427765 -0.023319986    4.5476377 
+   70260    20.207276   0.99394862    23.841657     6.018747    4.5283211     1.490426 0.0019722466 -0.023392117    4.5497409 
+   70270    20.018161   0.97419936     23.38746    6.0111207    4.5503088    1.4608119 0.0019736708 -0.023869569    4.5722047 
+   70280    20.412865   0.99955439    23.745205    6.0351535    4.5363217    1.4988318 0.0018061081 -0.022764324    4.5572799 
+   70290     20.01771     1.012074    23.720943    6.0456363    4.5280313     1.517605 0.0015637791 -0.021641037    4.5481086 
+   70300    20.256318   0.98759018    23.526702    6.0259866    4.5450951    1.4808915 0.0014383373  -0.02125733    4.5649141 
+   70310    20.250569   0.99005244    23.673318    6.0176363    4.5330527    1.4845836  0.001312985 -0.020763676    4.5525034 
+   70320    20.306484   0.99172159    23.666698    5.9866512    4.4995647    1.4870865 0.0013749228 -0.020837141    4.5190269 
+   70330    20.067276    0.9936012    23.683034    6.0076704    4.5177654     1.489905 0.0015655451 -0.021848431    4.5380483 
+   70340    20.146242   0.99854938    23.678773    6.0344806    4.5371558    1.4973248 0.0015902468 -0.021699257    4.5572648 
+   70350    20.270015    1.0065819    23.554925    6.0390815    4.5297118    1.5093696 0.0015516761 -0.020847106    4.5490073 
+   70360     20.30372   0.98334749    23.450241    6.0169703    4.5424407    1.4745296 0.0014754841 -0.020085233    4.5610505 
+   70370    20.144825    1.0091428    23.901994    6.0472874    4.5340778    1.5132096 0.0015622545 -0.020357138    4.5528727 
+   70380    20.242485    1.0168952     23.89999    6.0656924    4.5408581    1.5248343 0.0015374768 -0.020708128    4.5600288 
+   70390    20.286699    1.0383774    23.900621    6.0857963    4.5287493     1.557047 0.0017873439 -0.022121615    4.5490836 
+   70400    20.081222    1.0351929    23.651659    6.0909051    4.5386333    1.5522718 0.0020730373 -0.024026702     4.560587 
+   70410    20.493329    1.0322468    23.573174    6.0880287    4.5401746    1.5478541 0.0021487502 -0.024377449    4.5624033 
+   70420    20.480036       1.0329    23.726582    6.0854543    4.5366207    1.5488336 0.0020998741  -0.02367027    4.5581911 
+   70430     20.21072     1.026753    23.850012    6.0484924    4.5088763    1.5396161 0.0017686782 -0.022436938    4.5295445 
+   70440    20.116005    1.0281958    23.535301     6.076365    4.5345854    1.5417796 0.0014197468 -0.020675089    4.5538408 
+   70450    19.953511    1.0268632    23.908289    6.0626658    4.5228844    1.5397814  0.001220528 -0.019567108    4.5412309 
+   70460    20.133781     1.019312    23.725119    6.0564785    4.5280201    1.5284584   0.00102338 -0.018046246     4.545043 
+   70470    20.386945   0.99891308    23.535747    6.0274029    4.5295328    1.4978702 0.0010195812 -0.017789906    4.5463031 
+   70480    20.230864    1.0188026    23.892954    6.0198961    4.4922016    1.5276945  0.001115146 -0.018532565     4.509619 
+   70490    20.146122    1.0128974    23.464496    6.0373298      4.51849    1.5188397 0.0011738428 -0.019222476    4.5365387 
+   70500    20.267345   0.99092348    23.354481    6.0069741    4.5210844    1.4858898 0.00096584853 -0.018313843    4.5384324 
+   70510    20.467409   0.99059838    23.628779    5.9931575    4.5077552    1.4854023 0.00091226432 -0.018238396    4.5250813 
+   70520    20.361842   0.97186999    23.459697     6.015031     4.557712     1.457319 0.00094609084 -0.018361307    4.5751272 
+   70530    20.306792   0.99211709    23.337264    6.0366525    4.5489729    1.4876796 0.0010215911 -0.018464109    4.5664154 
+   70540    20.493901    1.0058969    23.834186    6.0466215    4.5382791    1.5083424 0.0011199082 -0.018662492    4.5558217 
+   70550    20.068147    1.0038968    23.881055    6.0205328    4.5151895    1.5053433 0.0012027364 -0.018610358    4.5325971 
+   70560    20.212505    1.0059134    23.652097    6.0269025    4.5185354    1.5083671 0.0012175127 -0.018076502    4.5353944 
+   70570    20.259789   0.99642077    23.732461    6.0343455    4.5402126    1.4941329 0.0012743057 -0.017789296    4.5567276 
+   70580    20.410547   0.99686762    23.683175    6.0268807    4.5320777     1.494803  0.001266491 -0.018311386    4.5491226 
+   70590    20.163466   0.99692312     23.59496    6.0274238    4.5325376    1.4948862 0.0013580016 -0.019334604    4.5505142 
+   70600    20.298266      1.00808    23.675216    6.0410335    4.5294175    1.5116159  0.001535937 -0.020455897    4.5483375 
+   70610    20.278878       1.0019    23.502812    6.0265179    4.5241689    1.5023491 0.0017440227 -0.021503203     4.543928 
+   70620    20.275163    1.0101079    23.753367    6.0472361    4.5325793    1.5146568 0.0018853872 -0.021753096     4.552447 
+   70630     20.36934    1.0282986    23.733454    6.0695692    4.5276354    1.5419338 0.0017950772 -0.021165628    4.5470059 
+   70640    20.557008    1.0124605    23.554568    6.0490667    4.5308822    1.5181844 0.0016714592 -0.020393677    4.5496044 
+   70650    20.187432    1.0113366    23.811111    6.0321769    4.5156776    1.5164993 0.0016061832  -0.01936441    4.5334358 
+   70660    20.171009    1.0101624    23.654553     6.048876    4.5341374    1.5147385 0.0014976573 -0.018736023    4.5513758 
+   70670     19.57283    1.0093048    23.672761     6.052264    4.5388114    1.5134526 0.0014754205 -0.019219308    4.5565553 
+   70680     19.76826    1.0150547    23.791391    6.0513388    4.5292642    1.5220746 0.0016524756 -0.020505187    4.5481169 
+   70690    19.695612    1.0069415    23.720823    6.0448346    4.5349258    1.5099088 0.0018525791 -0.021351255    4.5544245 
+   70700    20.012243    1.0113092    23.798236    6.0493596    4.5329013    1.5164582 0.0019211612 -0.021999442    4.5529796 
+   70710    20.263814    1.0188419    23.658508    6.0754955    4.5477421    1.5277534 0.0020090036 -0.022784784    4.5685178 
+   70720    20.154866     1.006217    23.701106    6.0493608    4.5405384    1.5088224 0.0021252286 -0.023955707    4.5623689 
+   70730    20.611095    1.0091459    23.665707    6.0582005    4.5449862    1.5132143 0.0020410686 -0.024126167    4.5670713 
+   70740    20.172013    1.0012472    23.388759    6.0203114    4.5189413    1.5013702 0.0017577701 -0.023133291    4.5403168 
+   70750    20.092079     1.002256    23.834487    6.0444024    4.5415196    1.5028829 0.0016602657 -0.022551663    4.5624109 
+   70760    20.268283    1.0076705    23.679995    6.0542152    4.5432132     1.511002 0.0017948632 -0.022886975    4.5643053 
+   70770     20.08603     1.012478    23.735782    6.0646066    4.5463958    1.5182108  0.001724184 -0.022424611    4.5670962 
+   70780    20.283961    1.0176815    23.872211    6.0569751    4.5309617    1.5260135 0.0015493225 -0.021656742    4.5510691 
+   70790    20.467162    1.0139158    23.917214    6.0583649    4.5379982    1.5203667 0.0013868007 -0.020849092    4.5574605 
+   70800    20.145027    1.0368349    23.751794    6.0777544    4.5230204     1.554734 0.0013128452 -0.020671576    4.5423791 
+   70810    20.053277    1.0333669    23.685669    6.0872665    4.5377329    1.5495336 0.0012560552  -0.02039446    4.5568713 
+   70820    20.409974    1.0208655    23.845446    6.0962586    4.5654708    1.5307878 0.0012089259 -0.020295259    4.5845571 
+   70830    20.510523    1.0323468    23.915032    6.0846407    4.5366367     1.548004 0.0014537864  -0.02125764    4.5564405 
+   70840    20.356183    1.0238385    23.570373    6.0951433    4.5598975    1.5352458 0.0016621844 -0.022352187    4.5805875 
+   70850    20.008541    1.0099547    23.914109    6.0442748    4.5298477    1.5144271 0.0018056332  -0.02298801    4.5510301 
+   70860    20.011466    1.0096338    23.702889    6.0424569     4.528511    1.5139459  0.001861244 -0.023160729    4.5498105 
+   70870    19.989935    1.0367439    23.835378    6.0898453    4.5352479    1.5545975 0.0015406471 -0.021693613    4.5554008 
+   70880    20.136753    1.0305969    23.958733    6.0748076    4.5294276      1.54538 0.0013557834 -0.020878143    4.5489499 
+   70890    20.369922    1.0281186    23.515696    6.0954892    4.5538253    1.5416639 0.0012959863 -0.021090842    4.5736202 
+   70900    20.216738    1.0326736    23.678358    6.1059012    4.5574072     1.548494 0.0012494503 -0.020884813    4.5770425 
+   70910    20.456499     1.025764    23.677561    6.0961011     4.557968    1.5381331 0.0012881641  -0.02072217     4.577402 
+   70920     20.17668    1.0438608    23.959885    6.1273227    4.5620535    1.5652692  0.001417982 -0.021323161    4.5819587 
+   70930    19.987494    1.0211358    23.971162    6.0926403    4.5614472    1.5311931 0.0014421373  -0.02146335    4.5814684 
+   70940    20.339184    1.0270434    23.613802    6.0779406    4.5378891    1.5400515 0.0017266484 -0.022470267    4.5586327 
+   70950    19.975094    1.0104116    23.769721    6.0533051    4.5381929    1.5151122 0.0018153581  -0.02239963    4.5587772 
+   70960    20.390058    1.0121623    23.796586    6.0594824    4.5417451    1.5177373 0.0017326708 -0.021865011    4.5618774 
+   70970    20.346911    1.0174867    23.514431    6.0736495    4.5479282    1.5257213 0.0017785981 -0.021378616    4.5675282 
+   70980    20.300283    1.0276031    23.905185    6.0758171    4.5349262    1.5408908 0.0018637114 -0.021742719    4.5548052 
+   70990    20.364197    1.0311563    23.718288    6.0925303    4.5463114    1.5462189  0.001689088 -0.020863798    4.5654861 
+   71000    20.410979    1.0327138    23.931728    6.0883312    4.5397769    1.5485543 0.0014958663 -0.019822258    4.5581033 
+   71010      20.1255    1.0245973    24.013349    6.0701653    4.5337816    1.5363836  0.001371155 -0.019468848    4.5518793 
+   71020    20.292896    0.9882366    23.579592      6.02414    4.5422792    1.4818608 0.0013019275 -0.019331077    4.5603084 
+   71030     20.27059    1.0040769    23.699969    6.0346299    4.5290166    1.5056133 0.0014739959 -0.019742263    4.5472849 
+   71040    20.080508    1.0044089    23.817339    6.0741028    4.5679917    1.5061111 0.0017297081 -0.021170915    4.5874329 
+   71050    19.986564    1.0100975    24.109795    6.0764402     4.561799    1.5146412  0.001701852 -0.020925436    4.5810226 
+   71060    19.963288    1.0296852    23.787314    6.0958132    4.5518002    1.5440129 0.0014739944 -0.019645558    4.5699718 
+   71070    19.726908    1.0258551    23.632727    6.0691356    4.5308659    1.5382697 0.0016572441 -0.020931313      4.55014 
+   71080    19.805997    1.0186256     23.81057    6.0793038    4.5518747    1.5274291 0.0017397023 -0.021820964    4.5719559 
+   71090    20.061659    1.0273015    23.681061     6.079654    4.5392155    1.5404385 0.0016813831 -0.021831239    4.5593654 
+   71100     20.26719    1.0257659    23.651462    6.0790615    4.5409255    1.5381359 0.0015975443 -0.021380951    4.5607089 
+   71110    20.331609    1.0301346    23.555531    6.0972738     4.552587    1.5446868  0.001597835 -0.021269916    4.5722591 
+   71120    20.474958     0.999863    23.808497    6.0556184    4.5563238    1.4992946 0.0015323567 -0.020578081    4.5753696 
+   71130    20.491534   0.99754031    23.262898    6.0301963    4.5343846    1.4958117 0.0013352004 -0.020014265    4.5530636 
+   71140    20.381062    1.0209368    23.670414    6.0423197     4.511425    1.5308947 0.0012464787 -0.019800787    4.5299793 
+   71150    20.145064   0.99577143    23.520151    6.0505744    4.5574151    1.4931593 0.0013087598 -0.020254846    4.5763612 
+   71160    20.360625   0.99871566    23.768347    6.0318821     4.534308    1.4975741 0.0014176916 -0.021053842    4.5539441 
+   71170    20.140436    1.0152144    23.565333    6.0423914    4.5200774     1.522314 0.0015269574 -0.021724751    4.5402752 
+   71180    20.352263     1.003882    24.140043    6.0204457    4.5151247     1.505321 0.0015647244 -0.021723963    4.5352839 
+   71190    20.229908    1.0130291    23.566026     6.046631    4.5275938    1.5190372 0.0016046587 -0.022152889     4.548142 
+   71200    20.397571   0.98509939    23.779038    6.0064803    4.5293238    1.4771565 0.0017275332 -0.022645771     4.550242 
+   71210    20.419594   0.97419751    23.614452    5.9901326    4.5293234    1.4608092 0.0017177585 -0.022259194    4.5498649 
+   71220    20.456627   0.97433286    23.493331    5.9911239    4.5301118    1.4610121 0.0018251368 -0.022355848    4.5506425 
+   71230    20.451434    1.0268728    23.612188    6.0556352    4.5158394    1.5397957 0.0019634078 -0.022474183    4.5363502 
+   71240    20.299763    1.0113684    23.591595    6.0587853    4.5422384    1.5165469 0.0017452159 -0.021651533    4.5621447 
+   71250    20.357792    1.0307685    23.473247    6.0837805    4.5381432    1.5456373 0.0018208051   -0.0224119    4.5587343 
+   71260    20.194717    1.0352374    23.845256    6.0806894     4.528351    1.5523385  0.001794916 -0.022364399    4.5489204 
+   71270    20.312652    1.0119445    23.722083    6.0792247    4.5618139    1.5174108 0.0017875573 -0.022473399    4.5824997 
+   71280    20.421436    1.0274801    23.840663    6.0755096    4.5348033    1.5407063 0.0018133056 -0.022421579    4.5554115 
+   71290    20.372714     1.042705    23.754857     6.093376    4.5298398    1.5635362 0.0017824796 -0.022127675     4.550185 
+   71300    20.466926    1.0355528    23.913026    6.0907346    4.5379231    1.5528115 0.0017388919 -0.022251366    4.5584356 
+   71310    20.315451    1.0378269    23.809352     6.093531    4.5373095    1.5562215 0.0017519938 -0.022072841    4.5576304 
+   71320    20.390238    1.0486789    23.688895    6.0988862    4.5263921     1.572494 0.0015619681 -0.020865074    4.5456953 
+   71330    20.215387    1.0141035    23.679757    6.0714103    4.5507621    1.5206482 0.0016132639 -0.021303758    4.5704526 
+   71340    20.223368    1.0320555     23.83594    6.0801037    4.5325365    1.5475672 0.0018885389  -0.02302926    4.5536772 
+   71350    20.074645    1.0155159    23.355153    6.0753046    4.5525385    1.5227661 0.0017671487 -0.022281547    4.5730529 
+   71360    20.290303    1.0079971    23.783976    6.0359255    4.5244338    1.5114917 0.0017554155 -0.021819068    4.5444975 
+   71370    20.024043   0.99804623     24.11531    6.0558681    4.5592978    1.4965703  0.001575992 -0.020560498    4.5782823 
+   71380    20.075641    1.0145326    23.352398    6.0440167    4.5227251    1.5212916  0.001592407  -0.02057248    4.5417052 
+   71390    20.284789    1.0366489    23.680303    6.0871216    4.5326666     1.554455 0.0017291401 -0.021271266    4.5522087 
+   71400    20.267533    1.0105929    23.655907    6.0535509    4.5381669    1.5153841 0.0018485749 -0.022073111    4.5583914 
+   71410    20.499218      1.02599    23.668914     6.054669    4.5161971    1.5384719 0.0018703994  -0.02240524    4.5367319 
+   71420    20.083005    1.0224634    23.531911    6.0407705    4.5075866    1.5331839 0.0018662163 -0.022325415    4.5280458 
+   71430    20.210194    1.0046998    23.841159    6.0521457    4.5455984    1.5065473 0.0017276267 -0.021883821    4.5657546 
+   71440    20.373329    1.0131049     23.71974     6.073675    4.5545242    1.5191508 0.0015970688 -0.021477483    4.5744046 
+   71450    20.626329    1.0398031    23.780984    6.0762726    4.5170879    1.5591847 0.0015872108  -0.02111822    4.5366189 
+   71460    20.585889    1.0373542    23.879402    6.0647749    4.5092623    1.5555126 0.0018793109 -0.022350426    4.5297334 
+   71470    19.988936    1.0176159    23.611805    6.0577946    4.5318796     1.525915 0.0019998339 -0.023174745    4.5530545 
+   71480    19.969738    1.0161483    23.671087    6.0420128    4.5182984    1.5237144 0.0019467588 -0.023276583    4.5396282 
+   71490    20.123731    1.0131116    23.800707    6.0443218    4.5251609    1.5191609 0.0017485951 -0.022547103    4.5459594 
+   71500    20.260973    1.0256227    23.834926    6.0714145    4.5334933    1.5379213 0.0016985715 -0.022261001    4.5540557 
+   71510    20.230772    1.0183256    23.621566    6.0304098    4.5034305    1.5269793 0.0016599728  -0.02205481    4.5238253 
+   71520    20.166446   0.99861872    23.536258    6.0291219    4.5316931    1.4974288 0.0016882856 -0.022196777    4.5522016 
+   71530    20.225702   0.99348511    23.889514    6.0285841    4.5388532    1.4897309 0.0016041501 -0.021858935     4.559108 
+   71540    20.088792   0.97420928     23.51749    6.0177008     4.556874    1.4608268 0.0015737868 -0.021653069    4.5769533 
+   71550    20.004447    1.0006032    23.749563    6.0518568    4.5514522    1.5004046 0.0016574808 -0.022150245     4.571945 
+   71560    20.526078    1.0133887    23.696991    6.0366069    4.5170305    1.5195764 0.0016118816 -0.021604518    4.5370231 
+   71570    20.234153    1.0147672    23.918624    6.0328714     4.511228    1.5216434 0.0016216874 -0.022074184    4.5316805 
+   71580    20.162692    1.0070764    23.802095    6.0259152    4.5158041    1.5101111 0.0017281358 -0.022345552    4.5364215 
+   71590    20.312452    1.0060773    23.476105    6.0280285    4.5194156    1.5086129 0.0017434447 -0.022363677    4.5400358 
+   71600    20.192309    1.0260719    23.679564    6.0549789    4.5163841    1.5385948 0.0016802567 -0.022166646    4.5368705 
+   71610    20.092808    1.0096486    23.822245    6.0307627    4.5167946    1.5139681  0.001681143 -0.022261346    4.5373748 
+   71620    20.277168    1.0118987    23.644107    6.0431828    4.5258406    1.5173422 0.0015578272 -0.021578205     4.545861 
+   71630    20.235945    1.0156774    23.936269    6.0335538    4.5105457    1.5230082 0.0015034514 -0.021443819     4.530486 
+   71640     20.06079    1.0013478    23.591228    6.0261828    4.5246618     1.501521 0.0017840694 -0.022710502    4.5455883 
+   71650     20.16905   0.98692091    23.612452    6.0152003    4.5353124    1.4798879 0.0019934757 -0.023559701    4.5568786 
+   71660    20.348768   0.98365636    23.845892     6.018768    4.5437753    1.4749927 0.0019444529 -0.022671235     4.564502 
+   71670    20.350974    1.0138427    23.674136    6.0273988    4.5071417    1.5202571 0.0020796495 -0.022663202    4.5277252 
+   71680    20.317482   0.99970921    23.743926    6.0330381    4.5339741     1.499064  0.001930088 -0.022073584    4.5541176 
+   71690    20.454075   0.97705363     23.31883    5.9966666    4.5315747    1.4650919 0.0018151229 -0.021628926    4.5513885 
+   71700    20.361817   0.98521598    23.525835    5.9924035    4.5150721    1.4773314 0.0018152766 -0.021727579    4.5349844 
+   71710    20.379587   0.98731392    23.787497    5.9994517    4.5189745    1.4804772 0.0018419328  -0.02154181    4.5386744 
+   71720    20.361336   0.99840734    23.712546     6.011234    4.5141221    1.4971118 0.0017345462 -0.021596577    4.5339842 
+   71730    20.385202    1.0053781    23.782624    6.0352951    4.5277306    1.5075645 0.0018429331 -0.022597794    4.5484854 
+   71740    20.239107    1.0186937    23.933837    6.0360675    4.5085362    1.5275313 0.0019632968 -0.023258652    4.5298316 
+   71750    20.142911   0.97846491    23.516744    6.0208506    4.5536425    1.4672081 0.0019981514 -0.023142594    4.5747869 
+   71760    20.065434    1.0171771    23.876823    6.0443618    4.5191047    1.5252571 0.0019469424 -0.023114878    4.5402727 
+   71770    20.213855    1.0102474    23.783123    6.0398746    4.5250087    1.5148659  0.002089514 -0.023651115    4.5465703 
+   71780    20.184133    1.0084514    23.776612    6.0340305    4.5218576    1.5121729 0.0021604846  -0.02418961    4.5438867 
+   71790    20.320419   0.99079253    23.448467    6.0115114     4.525818    1.4856934 0.0021890875 -0.024050805    4.5476797 
+   71800    20.332009   0.98688645    23.609868    6.0148538    4.5350176    1.4798362 0.0021268794 -0.023521389    4.5564121 
+   71810    19.946446   0.98856799    23.463316    6.0153523    4.5329946    1.4823577  0.002026754 -0.023147279    4.5541151 
+   71820    20.049363   0.99872932    23.890322    6.0015126     4.503918    1.4975946 0.0019154106 -0.022834593    4.5248372 
+   71830     20.13098    1.0010844    23.694094    6.0398238    4.5386978    1.5011261 0.0017624263 -0.022321036    4.5592564 
+   71840    20.143632    1.0161212    23.595368    6.0500872    4.5264135    1.5236737 0.0017908777 -0.022198016    4.5468207 
+   71850    20.118905   0.98942083    23.618235    6.0249223    4.5412857    1.4836365 0.0017626862 -0.021710594    4.5612337 
+   71860    19.996311     1.008006     23.51251    6.0459273    4.5344223    1.5115051 0.0016450719 -0.020884232    4.5536614 
+   71870    20.208685    1.0056908     23.76659    6.0547117    4.5466784    1.5080333 0.0016757823 -0.021207204    4.5662098 
+   71880    20.409253    1.0064071    23.685656     6.049068    4.5399607    1.5091074 0.0017936573 -0.021724852    4.5598918 
+   71890    20.465108    1.0072948    23.672274    6.0590587    4.5486202    1.5104386 0.0018392291 -0.021744855    4.5685258 
+   71900    20.182747    1.0248919    23.663005    6.0713704     4.534545    1.5368253 0.0017942037 -0.021569256    4.5543201 
+   71910    20.151095    1.0320562    24.062496    6.0909511    4.5433829    1.5475682 0.0017722759 -0.021817798    4.5634284 
+   71920    19.969827    1.0147929    23.932784    6.0572002    4.5355183    1.5216819 0.0017934806 -0.021846234     4.555571 
+   71930    20.261205    1.0014068    23.529788    6.0244177    4.5228082    1.5016095 0.0016729816  -0.02143317    4.5425684 
+   71940    20.299061    1.0082933     23.67934    6.0118023    4.4998664    1.5119359 0.0018124977 -0.022045317    4.5200992 
+   71950     20.37106   0.99776202    23.814227    6.0154415    4.5192973    1.4961442 0.0019788121 -0.022907137    4.5402256 
+   71960    19.960306   0.98946858    23.645634    6.0260064    4.5422982    1.4837081 0.0019076388  -0.02267333    4.5630639 
+   71970     20.09964    0.9810057    23.635134    6.0228422    4.5518242     1.471018 0.0020646915 -0.023175138    4.5729346 
+   71980    20.435861    1.0136505    23.439303    6.0363057    4.5163368    1.5199689 0.0020867011 -0.023669346    4.5379194 
+   71990    20.239182     1.008206    23.571795     6.012655    4.5008501    1.5118049 0.0020206553  -0.02370808    4.5225376 
+   72000    20.145336   0.99181713    23.650801    6.0184166    4.5311868    1.4872298 0.0020345645  -0.02382085    4.5529731 
+   72010    19.983471   0.98846061    23.474863    6.0191763    4.5369796    1.4821967 0.0019795435 -0.023278097    4.5582781 
+   72020    20.233784    1.0019009    23.699363     6.026204    4.5238535    1.5023505 0.0018057925 -0.022759792    4.5448075 
+   72030    20.357304     1.007962    23.752921    6.0414509    4.5300119     1.511439  0.001910159 -0.023049908    4.5511516 
+   72040    20.351189   0.99985025     23.57266    6.0378895     4.538614    1.4992755 0.0021172634 -0.023827516    4.5603243 
+   72050    20.375748   0.99666865    23.792291    6.0292619    4.5347572    1.4945046 0.0021472325 -0.023929973      4.55654 
+   72060    20.343879   0.99104271    23.474972    6.0355788    4.5495103    1.4860685 0.0018818832 -0.023076683    4.5707051 
+   72070    20.351031   0.99343869    23.759501    6.0148951    4.5252337    1.4896613 0.0017422976 -0.022839335    4.5463308 
+   72080    20.474271   0.99848899    23.716837    6.0207854    4.5235512    1.4972342 0.0017961327 -0.023048669    4.5448037 
+   72090    20.371706   0.99366144    23.752858    6.0400189    4.5500236    1.4899953 0.0016169151 -0.021968177    4.5703748 
+   72100    20.333932    0.9738748    23.397131    6.0445433     4.584218    1.4603253  0.001631528 -0.021801986    4.6043885 
+   72110    20.415372   0.98148694    23.596298    6.0056809    4.5339412    1.4717397 0.0016556815 -0.021995402    4.5542809 
+   72120    20.111019   0.99129606    23.469045    6.0232299    4.5367814    1.4864484 0.0017528316 -0.022103582    4.5571322 
+   72130    20.182301    1.0145512    23.812604    6.0276954    4.5063758    1.5213196 0.0019350983 -0.022660178    4.5271009 
+   72140    20.428026    1.0115314    23.585192    6.0627709    4.5459796    1.5167913 0.0020712813  -0.02296077    4.5668691 
+   72150    20.427158   0.99818266    23.636149    6.0400583    4.5432834    1.4967749 0.0020342258 -0.022896036    4.5641452 
+   72160    20.497098    1.0226039    23.801025     6.078588    4.5451935    1.5333945 0.0018286924 -0.021842437    4.5652072 
+   72170    20.235769    1.0176367    23.618728    6.0621097    4.5361635    1.5259462 0.0016442436 -0.020961568    4.5554808 
+   72180    20.147246    1.0279109    23.437896     6.077103    4.5357507    1.5413523 0.0018554689 -0.021984137    4.5558793 
+   72190    20.349043     1.010648    23.780073    6.0746809    4.5592143    1.5154666 0.0016909927 -0.021276278    4.5787996 
+   72200    20.031904    1.0226866    23.897614    6.0879826     4.554464    1.5335186 0.0016154632 -0.021146338    4.5739949 
+   72210    20.205235    1.0286163    23.694264     6.091579    4.5491688    1.5424102 0.0016133721  -0.02122878    4.5687842 
+   72220    19.978695    1.0459855    23.803299      6.11949    4.5510348    1.5684552 0.0017328272 -0.022068266    4.5713702 
+   72230    20.056324    1.0444406    24.042788    6.1186829    4.5525441    1.5661387 0.0018311395 -0.022474849    4.5731878 
+   72240     19.99051    1.0476178    23.867787    6.1026297    4.5317268    1.5709029 0.0019185947 -0.022550698    4.5523589 
+   72250    20.289096    1.0048553    23.729144    6.0419282    4.5351477    1.5067805 0.0019247894 -0.022352331    4.5555752 
+   72260    20.080944    1.0077766    23.543019    6.0358071    4.5246461     1.511161 0.0018618098 -0.022338697     4.545123 
+   72270    20.175917    1.0071439    23.657613    6.0367376    4.5265254    1.5102122 0.0017909037 -0.022421825    4.5471563 
+   72280    20.200385    1.0154939    23.717543    6.0314768    4.5087437    1.5227331 0.0017259311 -0.022186986    4.5292047 
+   72290    20.211536   0.99425255    23.782229    6.0086172    4.5177355    1.4908817 0.0016954126 -0.021895128    4.5379352 
+   72300     20.13838    1.0073865    23.446967    6.0472364    4.5366604     1.510576 0.0016909767 -0.021646283    4.5566157 
+   72310    19.776825     1.004854    23.766441    6.0451007    4.5383221    1.5067786 0.0015020657 -0.021094073    4.5579141 
+   72320    20.149841    0.9984483    23.468508    6.0426992    4.5455259    1.4971732  0.001645082 -0.022166759    4.5660476 
+   72330    19.829372    1.0045427    23.609456    6.0494425    4.5431308    1.5063117 0.0018413461 -0.022836556     4.564126 
+   72340    19.747837    1.0033645    23.841976    6.0313878    4.5268428     1.504545 0.0017147794 -0.021969592    4.5470976 
+   72350     20.21876    1.0113806    23.834535    6.0488202    4.5322549    1.5165653 0.0016108711 -0.021389321    4.5520334 
+   72360    20.375302   0.99365797    23.944459    6.0049167    4.5149265    1.4899901 0.0015999691 -0.021483073    4.5348096 
+   72370    19.868491    1.0111518    23.856061    6.0280477    4.5118256    1.5162221 0.0017255579 -0.021756102    4.5318562 
+   72380    20.269708    1.0180469    23.664517    6.0491971    4.5226357    1.5265614 0.0019824694 -0.023079503    4.5437327 
+   72390    20.290961    1.0339525    23.792488    6.0733776    4.5229659    1.5504117 0.0021358082 -0.023524314    4.5443544 
+   72400    20.549498    1.0349778    23.826009    6.0772225    4.5252733    1.5519492 0.0020892578 -0.023608565    4.5467926 
+   72410    19.954601    1.0172369    23.664546    6.0484225    4.5230757    1.5253468 0.0019833941 -0.023001582    4.5440939 
+   72420    19.850358    1.0074817    23.779465    6.0358605    4.5251417    1.5107188 0.0016146222 -0.021030917     4.544558 
+   72430    19.855167   0.99749064    23.821997    6.0248755    4.5291382    1.4957372 0.0014996308 -0.020435214    4.5480738 
+   72440    20.481284    1.0331883     23.81987    6.0382252    4.4889594    1.5492658 0.0014349764 -0.020378283    4.5079027 
+   72450    20.345547    1.0086846    23.665716    6.0635322    4.5510096    1.5125225 0.0015398952 -0.021471425    4.5709412 
+   72460    20.004945    1.0183696    24.237829    6.0683174    4.5412722    1.5270453 0.0017816855 -0.022675127    4.5621656 
+   72470    20.126667    1.0168236     23.75802    6.0560766    4.5313495     1.524727 0.0018527764 -0.023197545    4.5526943 
+   72480    20.272862    1.0116885    23.452223    6.0558903    4.5388633     1.517027 0.0017595327 -0.022985053    4.5600888 
+   72490    20.198602   0.98036204    23.556278    6.0086859     4.538633    1.4700529 0.0016398937 -0.022260369    4.5592535 
+   72500    19.917873    1.0011495    23.551812    6.0329583    4.5317347    1.5012236 0.0018372077 -0.023007078    4.5529046 
+   72510    20.395962    1.0158898     23.72048    6.0427246    4.5193978    1.5233268 0.0018638104 -0.022957481    4.5404915 
+   72520    20.229921    1.0097658    23.714325    6.0550304    4.5408866    1.5141438 0.0019773407 -0.023333632    4.5622429 
+   72530    20.221325    1.0157818     23.69444    6.0654872    4.5423224    1.5231648 0.0020589859 -0.023649347    4.5639128 
+   72540    20.053518    1.0021903    23.760622    6.0445176    4.5417333    1.5027843 0.0021612612 -0.023914211    4.5634862 
+   72550    20.185291    1.0056637    23.522666    6.0309379    4.5229452    1.5079927 0.0019712755 -0.022773718    4.5437476 
+   72560    20.342955    1.0106109    23.624132     6.030433     4.515022     1.515411  0.001800758 -0.022062129    4.5352834 
+   72570    20.338833    1.0137504     23.67133    6.0526306    4.5325118    1.5201188 0.0017308176 -0.021819658    4.5526007 
+   72580    20.315113    1.0149087    23.668389    6.0545302    4.5326746    1.5218556 0.0016115231 -0.020956265    4.5520194 
+   72590    20.375296    1.0218988    23.487068    6.0649109    4.5325736    1.5323373 0.0016239757 -0.020591529    4.5515412 
+   72600    20.042229    1.0217476    23.778217    6.0579322    4.5258217    1.5321106 0.0017688185 -0.021016395    4.5450692 
+   72610    20.063335    1.0209802    23.823308    6.0680301    4.5370702    1.5309599 0.0019037187 -0.022392933    4.5575594 
+   72620    20.385894   0.99151436    23.359334     6.037415    4.5506392    1.4867758 0.0019616778 -0.022671039    4.5713486 
+   72630    20.238735   0.99894397    23.477337    6.0283663    4.5304499    1.4979165 0.0018173229 -0.021141339    4.5497739 
+   72640    20.068302     1.005805     23.58076    6.0271012    4.5188966    1.5082046 0.0016743732 -0.020287995    4.5375102 
+   72650    20.404368   0.97177341    23.547027    6.0012134    4.5440392    1.4571742  0.001606665 -0.019930374    4.5623629 
+   72660    20.088405   0.99921087    23.598982     6.016312    4.5179953    1.4983167 0.0012747932 -0.018746026    4.5354665 
+   72670    19.895917   0.99114869    23.769549     5.994672    4.5084445    1.4862275 0.0012766794 -0.019034562    4.5262024 
+   72680    19.760915   0.96963622    23.343877      5.98174    4.5277705    1.4539695 0.0013966997 -0.019636424    4.5460102 
+   72690    20.059736   0.99297629    23.677481    6.0021078    4.5131398     1.488968 0.0012948036 -0.019644545    4.5314896 
+   72700    20.420986   0.99997977    23.636329    6.0273406     4.527871    1.4994697 0.0014722092 -0.020436197    4.5468349 
+   72710    20.354402   0.99359741    23.727502    6.0199352    4.5300359    1.4898993 0.0014622491 -0.020420068    4.5489937 
+   72720     20.32264   0.99299149    24.056969    6.0126604    4.5236697    1.4889907 0.0014157285 -0.020211357    4.5424653 
+   72730    20.111543    1.0145889     23.85557    6.0630425    4.5416664    1.5213761 0.0015079693 -0.020580475     4.560739 
+   72740    20.217203    1.0100985     23.62293    6.0686061    4.5539635    1.5146427 0.0017338544 -0.021456306    4.5736859 
+   72750    20.096923    1.0376231    23.846692     6.098082    4.5421661    1.5559159 0.0016698637 -0.020970835     4.561467 
+   72760    20.230972    1.0387226    23.861768    6.1145977    4.5570331    1.5575646 0.0017253698 -0.020973077    4.5762808 
+   72770    20.459386    1.0565193    23.783288    6.1134674    4.5292168    1.5842507 0.0017707882  -0.02110779    4.5485538 
+   72780    20.386028    1.0329557    23.746393    6.1087751     4.559858    1.5489171  0.001744951 -0.021231511    4.5793445 
+   72790    20.254132    1.0301516     23.56199    6.1021169    4.5574045    1.5447124 0.0017104134 -0.021211328    4.5769054 
+   72800    20.028547    1.0278314    23.848174    6.0697295    4.5284963    1.5412331   0.00188569 -0.022045871    4.5486565 
+   72810    19.961287    1.0117748    23.805323    6.0415946    4.5244382    1.5171564 0.0018847713  -0.02223035    4.5447838 
+   72820    20.138357   0.98630124    23.454791    6.0225183    4.5435596    1.4789587 0.0016933882 -0.021886965    4.5637532 
+   72830    20.350811    1.0050028    23.730918     6.054288    4.5472863    1.5070018 0.0017667972 -0.022206548     4.567726 
+   72840     19.75986    1.0333893    23.817933    6.0789875    4.5294202    1.5495673 0.0020246567 -0.023023087    4.5504187 
+   72850    20.210977    1.0072328    23.978754     6.063281    4.5529354    1.5103457 0.0021658798 -0.023864546     4.574634 
+   72860    20.145886     1.023217     23.75444    6.0617753    4.5274614    1.5343139 0.0024009924 -0.024346236    4.5494067 
+   72870    20.041879    1.0260785    23.926736    6.0909836    4.5523789    1.5386047 0.0023098071 -0.023878001    4.5739471 
+   72880    20.162868    1.0260487    23.878297    6.0885558    4.5499957    1.5385601 0.0020841266 -0.023431533    4.5713431 
+   72890      19.6197     1.018893    23.754933    6.0835995    4.5557696      1.52783 0.0021227435 -0.023921522    4.5775683 
+   72900     20.05098    1.0091733      23.6148    6.0440713     4.530816    1.5132553 0.0022179681 -0.024425139    4.5530232 
+   72910    19.677339      1.01923    23.781616    6.0658387    4.5375033    1.5283354  0.002243387 -0.024721037     4.559981 
+   72920    20.034625    1.0211108    23.615013    6.0815555    4.5503998    1.5311557 0.0020889764 -0.023862463    4.5721733 
+   72930    20.027247    1.0204593    23.819918    6.0592452    4.5290665    1.5301787 0.0019042123 -0.023216141    4.5503784 
+   72940    19.613748    1.0253482    23.882051    6.0730433    4.5355336    1.5375097 0.0018181818 -0.022584389    4.5562998 
+   72950    20.215622     1.020342    23.803762    6.0563968    4.5263939    1.5300029 0.0018517481 -0.022395937    4.5469381 
+   72960     20.18175    1.0184437    23.635328    6.0494305    4.5222742    1.5271564 0.0020229365 -0.023586551    4.5438378 
+   72970    20.232847    1.0363056    24.074814    6.0961376    4.5421974    1.5539402 0.0021523286 -0.024145655    4.5641907 
+   72980    20.497514    1.0141346    23.668143    6.0489004    4.5282056    1.5206949 0.0020465904 -0.023448691    4.5496077 
+   72990    20.129368    1.0111457     23.94071    6.0449892    4.5287762     1.516213 0.0019184745 -0.022512469    4.5493702 
+   73000    20.288652     1.018808    23.699543    6.0420976     4.514395    1.5277026 0.0020816474 -0.022887508    4.5352009 
+   73010    20.601932    1.0339996    23.836686     6.079199    4.5287167    1.5504824 0.0020418132 -0.022548113     4.549223 
+   73020    20.530852    1.0059233    23.985192    6.0699605    4.5615786    1.5083819 0.0020016795 -0.022883434    4.5824604 
+   73030    20.448133    1.0038991     23.75144    6.0535313    4.5481846    1.5053467 0.0019052108 -0.022789902    4.5690693 
+   73040    20.354666    1.0121854    23.578766    6.0540409    4.5362688    1.5177721 0.0016737259 -0.022300165    4.5568953 
+   73050    20.407998    1.0279324     23.87698    6.0774632    4.5360785    1.5413847 0.0017284899 -0.022309938      4.55666 
+   73060    20.360983    1.0104286    23.587367    6.0503542    4.5352166    1.5151377 0.0019178961 -0.023088259    4.5563869 
+   73070    20.305219   0.99950165    23.787918    6.0282275    4.5294748    1.4987527 0.0020746421 -0.023483587    4.5508837 
+   73080    20.384129    1.0034795    23.675039    6.0199017    4.5151842    1.5047175 0.0020538816 -0.023553086    4.5366834 
+   73090    20.421699     1.003851    23.914419    6.0258008    4.5205262    1.5052746 0.0019027638 -0.023023556     4.541647 
+   73100     20.16243   0.98974536    23.441963    6.0234861    4.5393629    1.4841232  0.001927276 -0.023092793    4.5605284 
+   73110    20.180629   0.99249652    23.787256    6.0191405     4.530892    1.4882485  0.001749262 -0.022550973    4.5516937 
+   73120    20.398195   0.98802343    23.671519    6.0238915    4.5423503    1.4815411 0.0015854756 -0.021903067    4.5626679 
+   73130    20.286712    0.9956483    23.723572     6.014364    4.5213894    1.4929746 0.0016206614 -0.021641032    4.5414098 
+   73140    20.325005    1.0008914    23.713394    6.0219086    4.5210719    1.5008367 0.0017382893 -0.022131781    4.5414654 
+   73150    20.186698    1.0085918    23.843571    6.0447992    4.5324158    1.5123834 0.0018287643 -0.022656229    4.5532433 
+   73160    20.152768    1.0194531    23.732249    6.0470896    4.5184197    1.5286699 0.0018748398 -0.023025139      4.53957 
+   73170    20.268611    1.0158381    23.837297     6.051474    4.5282248    1.5232492 0.0017909314 -0.022988422    4.5494223 
+   73180     19.94118   0.97270187    23.492769    6.0193557    4.5607893    1.4585664 0.0016130423 -0.022207718    4.5813839 
+   73190    19.965268    1.0321934    23.715554    6.0581245    4.5103505     1.547774 0.0016160825 -0.021761847    4.5304963 
+   73200    20.494312    1.0021151    23.822558    6.0749578    4.5722863    1.5026716  0.001563444 -0.021399474    4.5921223 
+   73210    20.442769    1.0148314    23.711973    6.0748805    4.5531408    1.5217397 0.0015254659 -0.020736503    4.5723519 
+   73220     20.18588    1.0143566    23.793092     6.057819    4.5367913    1.5210277 0.0015498439 -0.020921709    4.5561631 
+   73230     20.14904     1.017277    23.691499    6.0434081    4.5180013    1.5254068 0.0016145317 -0.021171438    4.5375582 
+   73240    19.870915    1.0227272    23.736858    6.0770616    4.5434822    1.5335794 0.0016122565 -0.021789145    4.5636591 
+   73250    20.266695    1.0076084    23.649061    6.0652527    4.5543439    1.5109088 0.0015053007 -0.021118238    4.5739568 
+   73260    20.312866    1.0273724    23.808916    6.0650655    4.5245206     1.540545 0.0015088305 -0.020880791    4.5438925 
+   73270    20.291268    1.0325728    23.776916    6.0966946    4.5483516     1.548343 0.0017457795 -0.022108746    4.5687146 
+   73280    20.166443    1.0364093    23.976539    6.0940233    4.5399276    1.5540957 0.0020800881 -0.023648773    4.5614963 
+   73290    20.100721    1.0304788    23.949042     6.072475     4.527272     1.545203 0.0021298491 -0.023605465    4.5487476 
+   73300    20.153452    1.0318712     23.92405    6.0744404    4.5271495    1.5472909 0.0018587589 -0.022361336    4.5476521 
+   73310    20.029471    1.0213459    23.599585    6.0588042     4.527296    1.5315082 0.0017511195 -0.021803444    4.5473483 
+   73320    20.098036    1.0240105    23.582278     6.083414    4.5479102    1.5355038 0.0017330781  -0.02235026    4.5685274 
+   73330     20.31929    1.0290218    23.859173    6.0742355    4.5312174    1.5430182 0.0018721439 -0.022996551    4.5523418 
+   73340    20.121093    1.0153793    23.447376     6.057411    4.5348498    1.5225612 0.0018869518  -0.02325661    4.5562195 
+   73350    20.146137    1.0140011    23.697888     6.049093    4.5285983    1.5204946 0.0019700673 -0.023505959    4.5501342 
+   73360    20.001098    1.0093916    23.774907    6.0393039    4.5257212    1.5135827 0.0021806447 -0.024568642    4.5481092 
+   73370    20.403162    1.0104159    23.899252    6.0439171    4.5287984    1.5151187  0.001992933 -0.023574646    4.5503801 
+   73380    20.198649    1.0242534    23.987551    6.0472368    4.5113689     1.535868 0.0016310165 -0.022040935    4.5317788 
+   73390    20.345089    1.0109502    23.680208    6.0364117    4.5204919    1.5159198 0.0015915978 -0.021678852    4.5405791 
+   73400    20.086754    1.0202799     24.06459    6.0698421    4.5399323    1.5299098 0.0016168011 -0.022168603    4.5604841 
+   73410    20.396222     1.025228    23.721364    6.0794287    4.5420993    1.5373294 0.0016272707 -0.022054328    4.5625264 
+   73420     20.19281    1.0076887    24.055562    6.0355447    4.5245155    1.5110292 0.0015736463 -0.022016336    4.5449582 
+   73430    20.518224   0.99949363    23.781987    6.0137829    4.5150422    1.4987407 0.0016064194 -0.022164145    4.5355999 
+   73440      20.0317   0.97078836    23.509319    6.0188781     4.563181    1.4556971 0.0016563437 -0.022713894    4.5842385 
+   73450     20.01684    1.0143786    23.861454    6.0380266    4.5169658    1.5210607 0.0018004883 -0.022960106    4.5381254 
+   73460    20.181268    1.0015069    23.782592    6.0338299    4.5320704    1.5017595 0.0017785705 -0.022641736    4.5529335 
+   73470    20.167357    1.0130683    23.846696    6.0317875    4.5126916     1.519096 0.0016616485 -0.022254964    4.5332849 
+   73480    20.431202    1.0132114    23.854681    6.0504186     4.531108    1.5193105 0.0017780459 -0.022696533    4.5520265 
+   73490    20.393981    1.0086915    23.608749     6.038135    4.5256021    1.5125329 0.0019476815 -0.023567654     4.547222 
+   73500    20.266359   0.99777814    23.673559    6.0239705    4.5278021    1.4961683 0.0017638155  -0.02275353    4.5487919 
+   73510     20.07329    1.0104786    23.437151    6.0382511    4.5230384    1.5152127 0.0017351542 -0.022777612    4.5440809 
+   73520    20.492732    1.0045292    23.738242    6.0365225    4.5302309    1.5062916 0.0017292827 -0.022230021    4.5507317 
+   73530    20.270215   0.99211335    23.840884    6.0521876    4.5645137     1.487674 0.0017055495 -0.022079949    4.5848881 
+   73540    20.421157   0.99372619    23.793615    6.0253644     4.535272    1.4900924 0.0016142453 -0.021439609    4.5550973 
+   73550    20.388791   0.99318028    23.706063    6.0292744    4.5400005    1.4892738 0.0017021724   -0.0216114    4.5599098 
+   73560    20.377391    1.0184122    23.542668     6.058479    4.5313699    1.5271091  0.001778953 -0.021869008    4.5514599 
+   73570    20.521712    1.0014975    23.780654    6.0361401    4.5343946    1.5017455 0.0017886572 -0.021874447    4.5544804 
+   73580    20.206913    1.0064601    23.512977    6.0234823    4.5142953    1.5091869 0.0017085064 -0.021488672    4.5340755 
+   73590    19.898765    1.0071753    23.768645    6.0440871    4.5338277    1.5102594 0.0014071846 -0.020255749    4.5526763 
+   73600    19.713782    1.0021857    23.873676    6.0282585    4.5254811    1.5027774  0.001537131 -0.020692242    4.5446362 
+   73610    20.223579    1.0117325    23.830027    6.0607192    4.5436263    1.5170929 0.0015030313 -0.020123648    4.5622469 
+   73620     19.88078    1.0073488    23.622439    6.0649142    4.5543946    1.5105196 0.0015596524 -0.020797893    4.5736329 
+   73630    20.002016    1.0243701     23.70335    6.0597738    4.5237308     1.536043 0.0015972552 -0.021307261    4.5434408 
+   73640    20.182663    1.0112102    23.809448    6.0455163    4.5292066    1.5163097 0.0014763271 -0.020895357    4.5486256 
+   73650    20.266028    1.0100647    23.933038    6.0408018    4.5262098     1.514592 0.0014700374 -0.020793357    4.5455332 
+   73660      20.4086     1.006948    23.786631    6.0311612    4.5212427    1.5099185 0.0013952565 -0.020120956    4.5399684 
+   73670    20.203691    1.0200392    23.688038    6.0826351    4.5530863    1.5295488 0.0014498406 -0.020062625    4.5716991 
+   73680    19.976588    1.0154079    23.683243    6.0576837    4.5350796    1.5226041 0.0015829895 -0.020926714    4.5544233 
+   73690    19.919572    1.0197127     23.56715    6.0271244    4.4980652    1.5290592  0.001809535 -0.021664074    4.5179198 
+   73700    20.124515   0.98724864    23.785681    6.0095931    4.5292137    1.4803793 0.0019135885 -0.022310046    4.5496102 
+   73710    20.180257   0.98084641    23.538541    5.9948908    4.5241116    1.4707792 0.0018279505 -0.022095131    4.5443788 
+   73720    20.450957    0.9980044     23.74865    6.0200355    4.5235279    1.4965076 0.0018543326 -0.022501624    4.5441752 
+   73730    20.444677    1.0031539    23.736444    6.0225699    4.5183406    1.5042293 0.0018415564 -0.022814115    4.5393132 
+   73740    20.249748   0.99239338    23.766395    6.0114143    4.5233205    1.4880939 0.0016047997 -0.021899485    4.5436152 
+   73750     19.99458     1.004479     23.82076    6.0041854     4.497969    1.5062163 0.0016109188 -0.022034487    4.5183926 
+   73760    19.897934   0.99669252     23.41505    6.0127714     4.518231    1.4945404 0.0017064712 -0.022044708    4.5385693 
+   73770    20.425447   0.98160732    23.653591    6.0110563    4.5391362    1.4719202 0.0017126639 -0.021997878    4.5594214 
+   73780    20.153818    1.0053389    23.916252    6.0037773    4.4962717    1.5075056  0.001695376 -0.022177683     4.516754 
+   73790    19.842824    1.0049471     23.62222    6.0237213    4.5168032    1.5069181 0.0017705076 -0.022507067    4.5375397 
+   73800    20.277026   0.99520135    23.679602    6.0327385    4.5404341    1.4923044 0.0019155109 -0.022785303    4.5613039 
+   73810    20.468748    1.0131584    23.827076    6.0637104    4.5444793     1.519231 0.0020706916 -0.023290473    4.5656991 
+   73820    20.273601    1.0062361    23.438836    6.0430315    4.5341805     1.508851 0.0023538378 -0.024346304     4.556173 
+   73830    20.215587    1.0055571    23.325671    6.0428454    4.5350125    1.5078329  0.002155789   -0.0239249    4.5567816 
+   73840    20.264118    1.0202683    23.575988    6.0547069    4.5248147    1.5298923  0.001819897 -0.022639276     4.545634 
+   73850    20.310634   0.99013177    23.477302    6.0089691    4.5242665    1.4847026 0.0015254299 -0.021632721    4.5443738 
+   73860    20.261773     0.991944    23.620957    6.0242863    4.5368663      1.48742 0.0015633003 -0.021635649    4.5569386 
+   73870     20.30554    1.0148044    23.987179    6.0465744    4.5248751    1.5216992  0.001644913 -0.021404147    4.5446344 
+   73880    20.263573    1.0148707     23.71388    6.0546836     4.532885    1.5217987 0.0016330075 -0.021119181    4.5523711 
+   73890    20.241819    0.9923562    23.824643    6.0410275    4.5529894    1.4880381 0.0015804507 -0.020923316    4.5723322 
+   73900    20.340297    1.0161902    23.760441    6.0555179    4.5317407    1.5237772 0.0015593746 -0.021142343    4.5513237 
+   73910    20.339022    1.0035902    23.711907    6.0424455    4.5375621    1.5048835 0.0017081087 -0.022224051     4.558078 
+   73920    20.198288    1.0145416    23.559063    6.0326638    4.5113587    1.5213051 0.0019468875 -0.023186321    4.5325981 
+   73930    20.176519    1.0179455    24.133934    6.0630708    4.5366615    1.5264093 0.0020175073 -0.023396185    4.5580402 
+   73940     20.39039    1.0244082    23.542128    6.0496452    4.5135451    1.5361001 0.0017904693  -0.02237986    4.5341345 
+   73950    19.983416    1.0106494     23.80813    6.0575683    4.5420996    1.5154687 0.0016191923 -0.021874729    4.5623551 
+   73960     20.35242    1.0192586    23.772978    6.0586693     4.530291    1.5283783 0.0015961128 -0.021648207    4.5503431 
+   73970    20.321465     1.004497    23.454837    6.0506574    4.5444142    1.5062432  0.001681821 -0.021851321    4.5645837 
+   73980     20.38572   0.99400079    23.758886    6.0278089    4.5373047    1.4905042 0.0017383279   -0.0212675    4.5568338 
+   73990    20.360338    1.0044342    23.781146    6.0466932    4.5405441    1.5061491 0.0016485627 -0.020646569    4.5595421 
+   74000    20.334926    1.0123522    23.614331    6.0487902    4.5307681    1.5180221 0.0015909964 -0.020664572    4.5498417 
+   74010    20.625604    1.0058494    23.867882    6.0573766    4.5491054    1.5082712 0.0015158112 -0.020701822    4.5682914 
+   74020     20.33442    1.0093208    23.509797    6.0539235     4.540447    1.5134766 0.0016606419 -0.021344463    4.5601308 
+   74030    20.050283    1.0126632    23.657429    6.0342143    4.5157258    1.5184885 0.0016913363 -0.021573153    4.5356076 
+   74040    20.319048   0.99789294    23.899423    6.0320778    4.5357373    1.4963405 0.0017908581 -0.021779373    4.5557258 
+   74050    20.446164    1.0092959    24.019163    6.0217971    4.5083578    1.5134393 0.0019138554   -0.0223198    4.5287638 
+   74060    20.285894   0.98229106    23.480925    5.9848059    4.5118605    1.4729454 0.0019336495 -0.022387636    4.5323145 
+   74070    20.255137   0.97299123    23.491619    5.9903661    4.5313658    1.4590004  0.001659942 -0.021068586    4.5507744 
+   74080     20.16883   0.97066974     23.39393    5.9930486    4.5375293    1.4555193 0.0016025632 -0.020714653    4.5566414 
+   74090    19.766267    1.0024229    23.578788    6.0111777    4.5080445    1.5031332 0.0016070425 -0.021242747    4.5276802 
+   74100    20.029202    1.0097388    23.611902    6.0225486    4.5084452    1.5141033 0.0015523913 -0.020711429    4.5276043 
+   74110     20.18867   0.98670241    23.638777     6.007631    4.5280707    1.4795603 0.0015811277 -0.021118058    4.5476076 
+   74120    20.349567   0.98522279     23.53457     6.002951    4.5256094    1.4773416 0.0015531947 -0.021156602    4.5452129 
+   74130    20.026477   0.98255349    23.474014    5.9885794    4.5152405     1.473339 0.0015580766 -0.020875683    4.5345581 
+   74140    20.265238   0.97744638    23.731596    5.9923461    4.5266653    1.4656808 0.0016675466 -0.021584027    4.5465818 
+   74150    20.368305   0.98704704    23.848994    5.9794524    4.4993753     1.480077 0.0016624353 -0.021936096     4.519649 
+   74160    20.257545   0.99941486    23.710108    6.0176045     4.518982    1.4986226 0.0016276933 -0.021849534    4.5392038 
+   74170     19.98293    1.0147996    23.711982    6.0418789     4.520187     1.521692  0.001393305 -0.020800836    4.5395945 
+   74180    20.245557    1.0110598    23.687203    6.0449833    4.5288991    1.5160842 0.0014455619 -0.021010243    4.5484638 
+   74190    20.319318    1.0208385     23.63889    6.0583875    4.5276401    1.5307474 0.0013708076 -0.020704195    4.5469735 
+   74200    20.009729    1.0015593    23.759523    6.0349655    4.5331272    1.5018382 0.0013234069 -0.020118427    4.5519223 
+   74210     20.24283   0.98867485    23.790499    6.0188417    4.5363238    1.4825179 0.0012587172 -0.019751803    4.5548169 
+   74220    20.405091    1.0239474     23.85055    6.0487804    4.5133712    1.5354091 0.0011676279 -0.019200843    4.5314044 
+   74230    20.002731   0.99895346    23.764247    6.0047605    4.5068298    1.4979307 0.0013158591 -0.019570619    4.5250846 
+   74240    20.498692     1.008941    23.628223    6.0304671      4.51756    1.5129071 0.0014646759 -0.020073801    4.5361692 
+   74250    20.469094   0.99328856    23.514347    6.0059514    4.5165152    1.4894362 0.0015873997 -0.020924871    4.5358527 
+   74260    20.140689   0.97793668    23.969741    5.9991201     4.532704     1.466416 0.0016323249 -0.021367707    4.5524394 
+   74270    20.361611   0.98616537    23.481702    6.0136095    4.5348545     1.478755  0.001617813 -0.021578524    4.5548152 
+   74280    20.180476   0.99680202    23.579145    6.0063738    4.5116692    1.4947046 0.0016094513 -0.021351832    4.5314116 
+   74290    20.307614   0.97117252    23.881436    5.9763022    4.5200291    1.4562732 0.0017632035 -0.022291713    4.5405576 
+   74300    20.165864   0.99804325    23.837256    6.0189389    4.5223731    1.4965659  0.001743895 -0.022211907    4.5428411 
+   74310    20.158132    1.0113828    23.823237    6.0351343    4.5185657    1.5165685 0.0017277765 -0.021882665    4.5387206 
+   74320    20.273038    1.0091037    23.897586     6.025912     4.512761     1.513151 0.0019178738 -0.022449159    4.5332923 
+   74330    20.268598     1.009418    23.721523    6.0311968    4.5175745    1.5136223 0.0019729742 -0.023069754    4.5386713 
+   74340    20.316458    0.9923239    23.502144    6.0447598    4.5567701    1.4879897 0.0021066379  -0.02396526    4.5786287 
+   74350    20.271014    1.0238176    23.691244    6.0577691    4.5225546    1.5352145 0.0021712193 -0.024261257    4.5446447 
+   74360    20.435667   0.99532135     23.56975    6.0452154     4.552731    1.4924844 0.0021840953 -0.023829293    4.5743762 
+   74370    20.302051     1.006847    23.648878     6.060679     4.550912     1.509767 0.0020907032 -0.023602374    4.5724236 
+   74380    20.223773    1.0169021    23.575754     6.055787    4.5309423    1.5248448 0.0021000204 -0.023853033    4.5526953 
+   74390    19.977437    1.0024731    23.735591    6.0503944     4.547186    1.5032085 0.0022191143 -0.024178107    4.5691449 
+   74400    20.200928    1.0109809    23.647015    6.0235439    4.5075782    1.5159658 0.0022838352 -0.024565318    4.5298596 
+   74410    19.945288    1.0208442    23.838116    6.0611952    4.5304393    1.5307559 0.0024193087 -0.025223024     4.553243 
+   74420    20.220937    1.0237595    23.939435     6.067777    4.5326496    1.5351274 0.0025198403 -0.025282488    4.5554122 
+   74430    20.517566    1.0304223    23.801652    6.0864086    4.5412903    1.5451182 0.0023262356 -0.024501607    4.5634657 
+   74440     20.33086    1.0194945    23.530164    6.0819801    4.5532481    1.5287321 0.0022140446 -0.023794232    4.5748283 
+   74450    20.374671    1.0161876    23.812392    6.0678828    4.5441095    1.5237734  0.002260173 -0.023935964    4.5657853 
+   74460    20.364813    1.0358478    23.751315    6.0902234    4.5369696    1.5532537 0.0023048437 -0.024482592    4.5591474 
+   74470    20.162537    1.0235861    23.473495    6.0608779    4.5260106    1.5348673 0.0023211425 -0.024809935    4.5484993 
+   74480    20.150925    1.0080056    23.807484    6.0512008    4.5396965    1.5115044 0.0023012091 -0.024903155    4.5622984 
+   74490    20.183688   0.99734218    23.648245    6.0369359    4.5414213    1.4955146 0.0023946791 -0.025693293    4.5647199 
+   74500    20.410189    1.0064121    23.636308     6.061163    4.5520481    1.5091149 0.0024347085 -0.025862202    4.5754756 
+   74510    20.266593    1.0304397    23.737593     6.076778    4.5316337    1.5451443  0.002389405 -0.025525076    4.5547694 
+   74520    20.223757    1.0024314    23.662043    6.0388993    4.5357534    1.5031459 0.0022975752 -0.024891266    4.5583471 
+   74530     20.26121    1.0042903    23.480744    6.0399643     4.534031    1.5059333 0.0021562177 -0.024281376    4.5561562 
+   74540    20.316574    1.0024666    23.798413    6.0445265    4.5413278    1.5031987 0.0022092331 -0.024797716    4.5639162 
+   74550    20.488171    1.0119927    23.936648    6.0408778    4.5233947    1.5174831 0.0021810787 -0.024861829    4.5460754 
+   74560    20.151115    1.0059509    23.656728    6.0665852    4.5581619    1.5084233 0.0019637437 -0.024025968    4.5802241 
+   74570    19.939436    1.0130121    23.688147    6.0670177     4.548006    1.5190116 0.0017137691 -0.022767546    4.5690598 
+   74580    19.957877    1.0242212    23.907505    6.0619376    4.5261179    1.5358198 0.0015434826 -0.021791971    4.5463664 
+   74590    19.984469   0.99894619    23.605601    6.0373301    4.5394103    1.4979198 0.0015997486 -0.022124934    4.5599355 
+   74600     20.06696    1.0132498     23.84912     6.050069     4.530701     1.519368 0.0018150339 -0.022655661    4.5515416 
+   74610    20.313916    1.0086691    23.648589    6.0580509    4.5455515    1.5124994 0.0016189261 -0.021868409     4.565801 
+   74620    20.376964    1.0303422     23.54186    6.0647005    4.5197024    1.5449981 0.0016463934 -0.021681683    4.5397377 
+   74630    20.278499    1.0126899    23.922049    6.0570391    4.5385106    1.5185285 0.0016243114 -0.021202474    4.5580888 
+   74640    20.043652    1.0178888    23.921572    6.0634346    4.5371103    1.5263242 0.0016542699 -0.021396929     4.556853 
+   74650    20.068455    0.9954465    23.352174    6.0380315    4.5453595     1.492672 0.0017159234 -0.021982695    4.5656263 
+   74660    20.233328    1.0178863    23.970106    6.0317001    4.5053796    1.5263205 0.0017577089 -0.022230254    4.5258522 
+   74670    20.142708    1.0039966    23.793241    6.0507901    4.5452972    1.5054929  0.001720779 -0.021820049    4.5653965 
+   74680    20.279577    1.0339067    23.797813    6.0808906    4.5305475    1.5503431 0.0019513705  -0.02297432    4.5515704 
+   74690    20.396523    1.0235273     23.72972    6.0677915    4.5330123    1.5347792 0.0020946765 -0.023509815    4.5544274 
+   74700     20.40692    1.0130174    23.758416    6.0741699    4.5551504    1.5190195 0.0020738526 -0.023411897    4.5764884 
+   74710    20.016951    1.0261622    23.989037    6.0871239    4.5483937    1.5387302 0.0019535836 -0.022701804    4.5691419 
+   74720    20.189979    1.0058342    23.823696     6.067759    4.5595105    1.5082484 0.0018440029 -0.022373749    4.5800403 
+   74730    20.378602    1.0146272    23.504829    6.0531208    4.5316873    1.5214335 0.0016966853 -0.021630596    4.5516212 
+   74740    20.280272   0.99969316     23.65755    6.0606242    4.5615843    1.4990399 0.0015277849 -0.021211176    4.5812677 
+   74750    20.368764    1.0159779     23.54816    6.0894629     4.566004    1.5234589 0.0017490428 -0.022479873    4.5867348 
+   74760    20.195694    1.0109332    23.937848    6.0745394    4.5586451    1.5158943 0.0020160888 -0.023594586    4.5802236 
+   74770    20.111982     1.013904    23.747354     6.062126    4.5417769    1.5203491 0.0018348571  -0.02276859    4.5627107 
+   74780    20.057647    1.0121941    23.635469    6.0862473    4.5684623     1.517785  0.001639645  -0.02170259    4.5885252 
+   74790     20.23651    1.0277584    23.842985    6.0822254    4.5411017    1.5411237 0.0016316628 -0.021869006    4.5613391 
+   74800    20.297717    1.0205298    23.799312    6.0613832    4.5310988    1.5302844 0.0016772357 -0.022213025    4.5516346 
+   74810    20.289577    1.0042479    23.757882    6.0536112    4.5477415    1.5058697 0.0016207443  -0.02173257    4.5678533 
+   74820    20.270765     1.004407     23.71522    6.0489977    4.5428893    1.5061083 0.0014815513 -0.021192331    4.5626001 
+   74830    20.298236    1.0220495      23.8382    6.0770911    4.5445278    1.5325633 0.0014421037 -0.020983567    4.5640693 
+   74840    20.459843    1.0178885    23.852245    6.0440743    4.5177504    1.5263239 0.0014523939 -0.020889052    4.5371871 
+   74850      20.0404    1.0135496    23.767446    6.0334663    4.5136486    1.5198177 0.0014861228  -0.02093578    4.5330983 
+   74860    20.214117    1.0168094    23.713138    6.0428649    4.5181593    1.5247057 0.0014856944 -0.021106338    4.5377799 
+   74870    20.268007    1.0160202    23.548382    6.0526211    4.5290988    1.5235223 0.0016270874 -0.021892728    4.5493644 
+   74880    20.443533    1.0083734    23.646133    6.0442415    4.5321856    1.5120559 0.0016186605 -0.022460564    4.5530275 
+   74890    20.301968   0.99936099    23.597285    6.0508921    4.5523503    1.4985418 0.0017277283 -0.022778073    4.5734007 
+   74900    20.322189   0.99681115    23.704977    6.0263189    4.5316006    1.4947183 0.0018433218 -0.023300912    4.5530581 
+   74910    20.269245     1.025287    23.664396    6.0554694    4.5180515    1.5374178 0.0018485392 -0.023617673    4.5398207 
+   74920    19.913963   0.99527556     23.70954    6.0348874    4.5424717    1.4924157 0.0018081231 -0.023034439     4.563698 
+   74930    20.273685   0.99328528    23.958085    6.0102892    4.5208579    1.4894313 0.0017726736 -0.022442117    4.5415274 
+   74940    20.120763    1.0054401    23.749695    6.0352842    4.5276267    1.5076575 0.0017031316 -0.022127433     4.548051 
+   74950    20.180539   0.99968037    23.583973    6.0319148     4.532894    1.4990207 0.0016819103 -0.021559531    4.5527717 
+   74960    20.422952    1.0182284    23.655775    6.0605251    4.5336916    1.5268335 0.0017715731 -0.021967277    4.5538873 
+   74970    19.939284     1.020365     23.89736    6.0667752    4.5367379    1.5300373 0.0019999585 -0.023108581    4.5578465 
+   74980    20.407493   0.99735195    23.792767    6.0310545    4.5355253    1.4955292  0.001974171 -0.023437007    4.5569881 
+   74990    20.191201     1.007059      23.7198     6.054566    4.5444811    1.5100849 0.0018298631 -0.022838317    4.5654895 
+   75000    20.376819   0.99432713    23.658012    6.0129697    4.5219762    1.4909935 0.0017851267 -0.022681343    4.5428724 
+   75010    20.004068   0.99430494    23.625175    6.0224855    4.5315253    1.4909603 0.0017026841 -0.022277007    4.5520996 
+   75020    20.248903   0.99117087     23.67108     6.015064    4.5288032    1.4862607 0.0015207657  -0.02152091    4.5488034 
+   75030    20.165724    1.0012705    23.681609    6.0319252      4.53052    1.5014051 0.0014626004 -0.021080113    4.5501375 
+   75040    20.058609    1.0097083    23.804075     6.044071    4.5300134    1.5140576  0.001362668 -0.020773173    4.5494239 
+   75050    20.111296    1.0145176    23.647309    6.0629716    4.5417024    1.5212692 0.0012924485 -0.020416999     4.560827 
+   75060    20.137284    1.0220779    23.793533    6.0597883    4.5271825    1.5326058  0.001259373 -0.020256571    4.5461797 
+   75070    20.276805    1.0225765    23.730073    6.0516127    4.5182592    1.5333535 0.0014359078 -0.020870066    4.5376933 
+   75080    20.372915    1.0065482    23.787069    6.0502029     4.540884     1.509319 0.0015459283 -0.020973611    4.5603116 
+   75090    20.381758     1.010635    23.764665    6.0518001     4.536353    1.5154471 0.0016085782 -0.021600386    4.5563448 
+   75100    20.218994    1.0075737    23.658565    6.0298954    4.5190386    1.5108568 0.0017523541  -0.02221187    4.5394982 
+   75110    19.975767    1.0063099     23.85687    6.0393953    4.5304336    1.5089617 0.0018737115 -0.022632664    4.5511925 
+   75120    20.081395   0.99518899    23.361269    6.0090567    4.5167708    1.4922859 0.0019473211 -0.023010802    4.5378343 
+   75130    20.089597    1.0012744    23.666095    6.0335766    4.5321656     1.501411 0.0020369262 -0.022788929    4.5529176 
+   75140    20.016239    1.0165886    23.858979      6.06415    4.5397755    1.5243746 0.0019715192 -0.022413899    4.5602179 
+   75150      20.3436    1.0208102    24.161542     6.043455    4.5127502    1.5307048 0.0019060801 -0.022712306    4.5335564 
+   75160    20.231473    1.0041526    23.688359    6.0530115    4.5472847    1.5057268 0.0020451405 -0.023488313    4.5687278 
+   75170     20.13434    1.0091165    23.587495    6.0423978    4.5292277    1.5131702  0.002179181  -0.02424012    4.5512886 
+   75180    20.260487    1.0024425    23.710147    6.0323884    4.5292258    1.5031626 0.0019593747 -0.022856856    4.5501233 
+   75190    20.062245    1.0013494    23.695316     6.024952    4.5234287    1.5015234 0.0018889538 -0.022198772    4.5437385 
+   75200    19.664948   0.98975831    23.744188    6.0383793    4.5542367    1.4841426  0.001850237 -0.021846377    4.5742328 
+   75210     20.08607   0.99795284    23.719365    6.0170064    4.5205761    1.4964303 0.0018820033 -0.022283444    4.5409775 
+   75220    20.264623    0.9948304    23.627494    6.0374883    4.5457402    1.4917482 0.0019905183 -0.022923085    4.5666727 
+   75230    20.323014     1.000977    23.592463    6.0086247    4.5076597     1.500965 0.0019760507 -0.023073304     4.528757 
+   75240     20.23551   0.98254676     23.62559     6.000237    4.5269082    1.4733289 0.0019386024 -0.022979773    4.5479494 
+   75250    20.145526     1.000403    24.139771      6.00895    4.5088457    1.5001043 0.0019607379 -0.022965766    4.5298507 
+   75260    20.285288     0.971555    23.720477    5.9967241    4.5398774    1.4568467    0.0017351 -0.021578297    4.5597206 
+   75270    20.380059   0.98656482    23.498953    5.9860273    4.5066734    1.4793539 0.0015813658 -0.021142973     4.526235 
+   75280    20.114577    1.0081161     23.87358     6.021335    4.5096649    1.5116701 0.0015622881 -0.020950687    4.5290533 
+   75290    20.050472    1.0096367     23.71373    6.0407938    4.5268436    1.5139502 0.0014874581 -0.020473706    4.5458299 
+   75300    20.280233   0.99351923    23.382743    6.0216488    4.5318667    1.4897821 0.0015279878 -0.020683061    4.5510217 
+   75310    20.255905    1.0081055      23.7155    6.0328079    4.5211537    1.5116542 0.0013319918 -0.019742941    4.5395647 
+   75320    19.952792    1.0014319    23.258166    6.0431366    4.5414895    1.5016471 0.0013564344 -0.020118146    4.5602512 
+   75330    20.416047    1.0096227    23.764263    6.0626128    4.5486836    1.5139292 0.0014875097 -0.020985991    4.5681821 
+   75340    20.415238     1.004298    23.738547    6.0577768    4.5518319    1.5059449 0.0017460344 -0.022319868    4.5724057 
+   75350     20.33873    1.0129037    23.634235    6.0581345    4.5392854    1.5188491 0.0016567832 -0.021872326     4.559501 
+   75360    20.292006    1.0230169    23.566842    6.0473581    4.5133442    1.5340139 0.0016844795 -0.022123737    4.5337834 
+   75370    20.325912    1.0205684    23.879392    6.0430787    4.5127365    1.5303422  0.001609846 -0.021620564    4.5327472 
+   75380    20.275441    1.0109342    23.688622    6.0567487    4.5408529    1.5158958 0.0014301854 -0.020335637    4.5597584 
+   75390     20.23707    1.0108764    23.587521    6.0758148    4.5600057    1.5158091 0.0014682795 -0.020207192    4.5787446 
+   75400    20.371886    1.0338358    23.922169    6.0816237    4.5313869    1.5502368 0.0015055498 -0.020052502    4.5499339 
+   75410    20.372215    1.0050981    23.643286    6.0339803    4.5268357    1.5071445 0.0015404588 -0.020117886    4.5454131 
+   75420    20.390218      1.01984    23.702202    6.0496663    4.5204163      1.52925 0.0014785954 -0.019888467    4.5388262 
+   75430     20.14072    1.0120468    23.864025    6.0496383    4.5320741    1.5175642 0.0014963709 -0.020297649    4.5508753 
+   75440    20.215469    1.0098331    23.794137    6.0665594    4.5523146    1.5142448 0.0014447476 -0.020004524    4.5708743 
+   75450    20.206997    1.0181856    23.526554    6.0423347    4.5155653    1.5267693 0.0014711625 -0.019990058    4.5340842 
+   75460    20.313172    1.0185381    23.810286    6.0745402    4.5472423    1.5272978 0.0014888893 -0.019817698    4.5655711 
+   75470    20.260436    1.0446738    23.638615    6.0852941    4.5188057    1.5664884 0.0016456225 -0.020747461    4.5379076 
+   75480    20.369681    1.0360388    23.790155    6.1005989    4.5470587    1.5535402 0.0017273381 -0.021396803    4.5667281 
+   75490    20.232861    1.0397144    24.022056    6.0966196    4.5375678    1.5590517 0.0016006744  -0.02046802    4.5564352 
+   75500     20.46469    1.0542095     23.97086    6.1119022    4.5311151    1.5807871 0.0016273478 -0.019879862    4.5493676 
+   75510     20.15635    1.0080369    23.945272    6.0774729    4.5659216    1.5115513 0.0015548281  -0.01908405    4.5834509 
+   75520    20.268954    1.0184419    23.630898    6.0720724    4.5449188    1.5271536 0.0015767465 -0.019365491    4.5627075 
+   75530    20.085571    1.0104516    23.683122    6.0649011     4.549729    1.5151721 0.0017272501 -0.020103975    4.5681057 
+   75540    20.279364    1.0094495    23.897558    6.0473105     4.533641    1.5136696 0.0016031012 -0.020087456    4.5521253 
+   75550    20.260347   0.98868421    23.378678    6.0359736    4.5534416     1.482532 0.0014518665 -0.019604132    4.5715939 
+   75560    19.937908    1.0048624    23.722308    6.0502502     4.543459    1.5067912 0.0014826836   -0.0199498    4.5619261 
+   75570    20.402857   0.99117302    23.352168    6.0213151    4.5350512    1.4862639 0.0015788477 -0.020823324    4.5542956 
+   75580    20.060931   0.99403292    23.839619    6.0072761    4.5167238    1.4905524  0.001819902 -0.021957948    4.5368618 
+   75590    20.162674   0.99575631    23.729561    6.0220975    4.5289609    1.4931366 0.0019889603 -0.022645722    4.5496177 
+   75600     19.96883   0.99295314    23.612223    6.0108489    4.5219157    1.4889332 0.0021428246 -0.023382623    4.5431554 
+   75610    20.260023    1.0014564     23.32276    6.0374352    4.5357514    1.5016838 0.0020802542 -0.022996587    4.5566677 
+   75620     20.24483    1.0157407    23.446616    6.0544735    4.5313703    1.5231032 0.0018660078 -0.022379955    4.5518842 
+   75630    20.491102    1.0088874    23.665269    6.0493663    4.5365396    1.5128267 0.0017575028 -0.022312509    4.5570946 
+   75640    20.300003     1.002394    23.671466    6.0568178    4.5537281    1.5030897 0.0016836532 -0.021883212    4.5739276 
+   75650    20.031647    1.0053887    23.714673    6.0478822    4.5403019    1.5075803 0.0017105831 -0.021908038    4.5604994 
+   75660    20.120091    1.0050783    23.685138    6.0509276    4.5438127    1.5071149 0.0016483628 -0.021553814    4.5637181 
+   75670      20.4075    1.0079114    23.633726     6.043585    4.5322219    1.5113631 0.0014121955 -0.020359415    4.5511691 
+   75680    20.208986    1.0236413    23.775049    6.0604821    4.5255319    1.5349502 0.0014078481  -0.02035511    4.5444792 
+   75690    20.235773    1.0072984    23.961839    6.0533952    4.5429512     1.510444 0.0014803528 -0.020712251    4.5621831 
+   75700     20.52011    1.0243948    23.553679    6.0552217    4.5191417      1.53608  0.001559351 -0.020985817    4.5385682 
+   75710    20.340612    1.0286639    23.932753    6.0677934    4.5253119    1.5424815 0.0015281604 -0.020885506    4.5446693 
+   75720    20.142955    1.0018391    23.714541    6.0395893    4.5373316    1.5022577 0.0014315711 -0.020681544    4.5565816 
+   75730    19.854463    1.0110839    23.319193    6.0569774    4.5408571    1.5161203 0.0014612493 -0.020555844    4.5599517 
+   75740     20.01946     1.014115    23.878473    6.0602561    4.5395908    1.5206654  0.001390854  -0.01999337    4.5581933 
+   75750    20.175167    1.0107899    23.931096    6.0422047    4.5265253    1.5156794 0.0014000102 -0.019877663    4.5450029 
+   75760    19.942033   0.98983147    23.519103    6.0239048    4.5396525    1.4842523 0.0017072756 -0.021400698    4.5593459 
+   75770    20.142803     1.002259    23.786614    6.0444389    4.5415515    1.5028874 0.0017856905 -0.022267202     4.562033 
+   75780    19.840697    1.0047398    23.883331    6.0450997    4.5384923    1.5066074 0.0018446345 -0.023089222    4.5597369 
+   75790    20.332441   0.98563804    23.705509    6.0322172    4.5542529    1.4779642 0.0016427626 -0.022018092    4.5746283 
+   75800    20.437642   0.98015672    23.502784    6.0448759    4.5751309     1.469745 0.0014448213 -0.020967585    4.5946537 
+   75810    20.638413    1.0040555    23.975562    6.0345975    4.5290163    1.5055812 0.0013655116 -0.020647729    4.5482985 
+   75820    20.196566    1.0094645     23.63874    6.0478864    4.5341944     1.513692 0.0015198139 -0.021083527    4.5537581 
+   75830    20.387161   0.99302146    23.733777    6.0278911    4.5388554    1.4890357 0.0016057341 -0.021373326     4.558623 
+   75840    20.014107   0.98715182    23.489487    6.0149861    4.5347519    1.4802342 0.0017019251  -0.02196764    4.5550176 
+   75850    20.012759    1.0080748    23.822402    6.0380314    4.5264232    1.5116082 0.0017929274 -0.022269786    4.5469001 
+   75860    20.173142    1.0157597    23.706829    6.0459731    4.5228415    1.5231316 0.0019235362 -0.023167159    4.5440852 
+   75870    20.475641    1.0203307    23.576848    6.0435759    4.5135899     1.529986 0.0019131129 -0.023147945    4.5348248 
+   75880     20.31351    0.9967029    23.792735    6.0229651    4.5284091     1.494556 0.0019472213 -0.023278221    4.5497401 
+   75890    20.249515   0.99823754    23.582541    6.0374583    4.5406011    1.4968572 0.0019286978   -0.0231694    4.5618418 
+   75900    20.452577   0.98632887    23.538242    6.0022178    4.5232177    1.4790001 0.0020082647 -0.023527963    4.5447374 
+   75910    20.294578    1.0006875    23.586512    6.0364744    4.5359436    1.5005309 0.0020059825 -0.023856357    4.5577939 
+   75920    20.394101    1.0096048    23.563868    6.0258371    4.5119346    1.5139024 0.0021930666 -0.024669138    4.5344107 
+   75930    20.386168    1.0129894    23.767702    6.0391946    4.5202171    1.5189775 0.0021170103 -0.024390664    4.5424908 
+   75940    20.249638    1.0296536    23.584301    6.0657699    4.5218044    1.5439655 0.0019734005 -0.023463789    4.5432948 
+   75950     20.49531    1.0230888    23.440443    6.0627733    4.5286516    1.5341217 0.0018931858 -0.022836134    4.5495945 
+   75960    20.124307    1.0109759    23.756134    6.0506414     4.534683    1.5159584 0.0016347461 -0.021441293    4.5544895 
+   75970    20.327059    1.0219941    23.581541    6.0632527    4.5307726    1.5324801 0.0013795951 -0.020052435    4.5494455 
+   75980     20.37559    1.0042912    23.617178    6.0588739    4.5529393    1.5059346 0.0013807938  -0.02005689    4.5716154 
+   75990    20.131266    1.0475476    23.744655    6.1042914    4.5334938    1.5707976  0.001601658 -0.020744803     4.552637 
+   76000    19.941457    1.0401581    23.787809    6.0904631     4.530746     1.559717 0.0016817629  -0.02123198    4.5502962 
+   76010    20.441592    1.0398678    23.826637    6.0948816    4.5355999    1.5592818 0.0017442276 -0.021664519    4.5555202 
+   76020    19.992547    1.0258829    23.833528    6.0826484     4.544337    1.5383113 0.0018491729 -0.022508154     4.564996 
+   76030    20.223379    1.0257931    23.560003    6.0675619    4.5293852    1.5381767 0.0019224051 -0.023034369    4.5504972 
+   76040    20.234416    1.0263292    23.699366    6.0665301    4.5275494    1.5389806 0.0018589055 -0.023385237    4.5490758 
+   76050     20.27658    1.0040954     23.66121    6.0620759    4.5564348     1.505641 0.0019274413  -0.02365905    4.5781665 
+   76060    19.937309    1.0095131    23.701693    6.0652181    4.5514532    1.5137649  0.002046341 -0.023958481    4.5733653 
+   76070    19.961164    1.0239495    23.726909    6.0651867    4.5297745    1.5354122 0.0020378292 -0.023984322     4.551721 
+   76080    20.254503     1.014403    23.905274    6.0613709    4.5402737    1.5210973 0.0019697489 -0.023865251    4.5621692 
+   76090    20.250834    1.0376212    23.894366    6.1001379    4.5442249     1.555913 0.0020964337 -0.024381856    4.5665103 
+   76100    20.411743    1.0394348    24.061973    6.0999348    4.5413023    1.5586325 0.0022182009 -0.024975408    4.5640595 
+   76110    20.406104    1.0224255    24.045063    6.0749371    4.5418101     1.533127 0.0023151948 -0.025269409    4.5647643 
+   76120     20.04831    1.0220768    23.678617    6.0716269    4.5390227    1.5326042 0.0022874205 -0.025485572    4.5622209 
+   76130    20.103967    1.0361574    23.812936    6.0939128    4.5401948     1.553718 0.0021834174  -0.02476899    4.5627804 
+   76140    20.295008    1.0270321    23.738954    6.0744198    4.5343852    1.5400346 0.0021035299 -0.023997343     4.556279 
+   76150    20.176489    1.0146755    23.753296     6.056702    4.5351961    1.5215059 0.0020949186 -0.023489896    4.5565911 
+   76160    20.104395    1.0037379    23.272345    6.0431542    4.5380493    1.5051049 0.0022875631 -0.024299434    4.5600612 
+   76170     20.13666     1.016954    23.706346    6.0720919    4.5471693    1.5249226  0.002223837 -0.024341986    4.5692875 
+   76180    20.524005    1.0303339    23.828227    6.0749276    4.5299419    1.5449857 0.0019080144 -0.022999039    4.5510329 
+   76190    20.395251    1.0016696    23.930594    6.0485452    4.5465417    1.5020035 0.0016229444 -0.021687115    4.5666059 
+   76200    20.097555    1.0216765    23.761814    6.0736153    4.5416115    1.5320038 0.0016014095 -0.021679116    4.5616892 
+   76210    20.129963    1.0289695    23.598793    6.0597398       4.5168    1.5429397 0.0017800315 -0.022661988     4.537682 
+   76220    20.294937    1.0119668    23.536127    6.0492817    4.5318374    1.5174442 0.0018254996 -0.022875257    4.5528872 
+   76230    20.379653   0.99966577     23.81316    6.0357219    4.5367231    1.4989988 0.0017224193 -0.022283223    4.5572839 
+   76240    20.224187    1.0064777    23.594321    6.0446165    4.5354032    1.5092133 0.0018409128 -0.022796491    4.5563587 
+   76250    20.381712    1.0266157    23.658771    6.0627665    4.5233562    1.5394103 0.0020337556 -0.023785346    4.5451078 
+   76260    20.409061    1.0204005    23.894716    6.0547534    4.5246628    1.5300906 0.0020540879 -0.023928648    4.5465374 
+   76270    20.359167    1.0154313    23.726309    6.0548758    4.5322366    1.5226392 0.0019419405 -0.023420646    4.5537153 
+   76280    20.225192   0.99761777    23.455945    6.0113439    4.5154161    1.4959279 0.0018543197 -0.023025121    4.5365869 
+   76290    20.231211    1.0012532    23.785079    6.0107322    4.5093531    1.5013791 0.0019082338 -0.023181308    4.5306262 
+   76300    20.428267   0.98673274     23.96823    6.0193531    4.5397473    1.4796057 0.0018260685 -0.022429945    4.5603512 
+   76310    20.130572    1.0106827    23.591789    6.0396575    4.5241389    1.5155186 0.0019125633 -0.022677508    4.5449038 
+   76320    20.253262   0.98585531    23.719142    6.0268942    4.5486042      1.47829 0.0019008741 -0.022465808    4.5691691 
+   76330    20.279572    1.0170522    23.489941    6.0535188    4.5284491    1.5250697 0.0018943708 -0.022422969    4.5489777 
+   76340     20.28242    1.0108038    23.709546    6.0635743     4.547874    1.5157003 0.0018365229 -0.022584459    4.5686219 
+   76350    20.083336    1.0026358    23.779174    6.0385391    4.5350867    1.5034524 0.0018771721 -0.022536684    4.5557463 
+   76360    20.192443    1.0015851    23.793778    6.0356711    4.5337942    1.5018768 0.0017919561 -0.021854281    4.5538566 
+   76370    20.327309   0.99601545     23.55909    6.0204604    4.5269352    1.4935252 0.0016688022 -0.021005624    4.5462721 
+   76380     20.55052   0.99483222    23.844485    6.0022568    4.5105059    1.4917509 0.0018480671 -0.022085361    4.5307432 
+   76390    19.993887   0.99721154    24.247425     6.015476    4.5201573    1.4953187 0.0019407213 -0.022625746    4.5408423 
+   76400    20.315689   0.98507314    23.863028    6.0185429    4.5414257    1.4771172 0.0018150082 -0.022070502    4.5616812 
+   76410    20.383296   0.99118077    23.564443     6.013946    4.5276704    1.4862756 0.0016316221 -0.021350646    4.5473895 
+   76420    20.313807    1.0114914    23.686168    6.0204857    4.5037544    1.5167313 0.0015788085 -0.021167812    4.5233434 
+   76430    20.082123     1.006728    23.696024    6.0500173    4.5404286    1.5095886 0.0015701712 -0.021234336    4.5600928 
+   76440    20.160925    1.0047143    23.724601    6.0423504    4.5357813    1.5065691 0.0016383146 -0.021715865    4.5558588 
+   76450    20.448632    1.0123746    23.793092    6.0572506    4.5391949    1.5180558 0.0017794243 -0.022238077    4.5596535 
+   76460    20.131331    1.0298862    23.923471      6.07624    4.5319257    1.5443143 0.0017986687 -0.022150245    4.5522773 
+   76470    20.142008    1.0226271    23.720695    6.0645576    4.5311281    1.5334294 0.0018453407 -0.022287614    4.5515704 
+   76480    20.445029    1.0355023    23.809831    6.0745241    4.5217884    1.5527357 0.0018146123 -0.022159111    4.5421329 
+   76490     20.34869    1.0157459    23.623432    6.0734164    4.5503055    1.5231109 0.0018730911  -0.02248538    4.5709178 
+   76500    20.535287    1.0270724    23.859799    6.0973978    4.5573027     1.540095 0.0020894925 -0.023265693    4.5784789 
+   76510    20.502184    1.0110902     23.74496    6.0593303    4.5432005    1.5161298 0.0021042607 -0.022837024    4.5639333 
+   76520    20.387849    1.0201439    23.789847    6.0688359    4.5391302    1.5297058 0.0019482269 -0.022188257    4.5593702 
+   76530    20.430098     1.016272    24.068734    6.0512058    4.5273059    1.5238998 0.0019274502 -0.022330001    4.5477085 
+   76540    20.264071     1.018466     23.60017    6.0624631    4.5352734    1.5271897 0.0018121628 -0.021526625    4.5549878 
+   76550    20.399806    1.0189916    23.795513    6.0785468    4.5505688     1.527978 0.0017117452 -0.020913368    4.5697704 
+   76560    20.279254    1.0393863     23.82662     6.086823    4.5282633    1.5585597 0.0014533255 -0.020044262    4.5468542 
+   76570    20.312423    1.0203038    23.898389    6.0975619    4.5676164    1.5299455 0.0015751378 -0.020416517    4.5864578 
+   76580    20.390702    1.0434519    23.777574    6.1179656    4.5533095    1.5646561 0.0015805713 -0.020801936    4.5725309 
+   76590    20.364483    1.0415318    23.816588    6.1307764    4.5689995    1.5617769 0.0017449453 -0.021894167    4.5891488 
+   76600    20.458049    1.0670824     23.91065    6.1573217    4.5572317      1.60009  0.001927317 -0.022889752    4.5781941 
+   76610    20.199927    1.0444118    23.940168    6.1241406    4.5580452    1.5660954 0.0022125408  -0.02419587    4.5800285 
+   76620    20.471406    1.0417751    23.877671    6.1196245    4.5574828    1.5621417 0.0023185559 -0.024758966    4.5799232 
+   76630    20.141207    1.0249184    24.072531    6.1178481     4.580983    1.5368651 0.0020590755 -0.023688245    4.6026121 
+   76640    20.004292    1.0409609    23.856332    6.1110908      4.55017    1.5609208 0.0019086568 -0.022770077    4.5710314 
+   76650    20.224292     1.031352    23.674111    6.0925198    4.5460075    1.5465123 0.0018526911 -0.022660074    4.5668149 
+   76660    20.227523   0.99482237    23.900728    6.0649889    4.5732527    1.4917361 0.0019311433 -0.023224407     4.594546 
+   76670    20.266577    1.0429638    23.638873    6.0886736    4.5247493    1.5639242  0.002030823 -0.023851562    4.5465701 
+   76680    20.278435    1.0242781    23.546998    6.0862139     4.550309     1.535905  0.002123781 -0.024025598    4.5722108 
+   76690    20.261674    1.0389761    23.794537    6.0949087    4.5369639    1.5579447  0.002230332 -0.024519572    4.5592532 
+   76700     20.00567    1.0198757    23.698367    6.0802123    4.5509087    1.5293036 0.0020093348 -0.023613627     4.572513 
+   76710    20.324037    1.0293062    23.764896    6.0813754    4.5379308    1.5434446 0.0016676638 -0.022167238    4.5584303 
+   76720    20.211941    1.0312173     23.91661    6.0919773    4.5456669    1.5463104 0.0014330467 -0.021029674    4.5652635 
+   76730    20.271208    1.0320477    23.842779    6.0843072    4.5367517    1.5475555 0.0016183887 -0.021965766    4.5570991 
+   76740    20.159889    1.0219644    24.007669    6.0599573    4.5275217    1.5324357 0.0015939573  -0.02163462    4.5475623 
+   76750    20.222576    1.0264765    23.847907    6.0653573    4.5261557    1.5392016 0.0014974898  -0.02063506    4.5452933 
+   76760    19.976159    1.0294313     23.66121    6.0800378    4.5364055    1.5436323 0.0014582576 -0.020736672    4.5556839 
+   76770    20.314795    1.0206045     23.86783    6.0624648    4.5320683    1.5303965 0.0015411737 -0.020708308    4.5512354 
+   76780    20.370093    1.0274672    24.192039    6.0744734    4.5337864     1.540687 0.0015812648 -0.020676085    4.5528812 
+   76790    20.446358    1.0149518    23.758247    6.0585429    4.5366228    1.5219202  0.001719653 -0.021144286    4.5560474 
+   76800    20.306211    1.0183567    23.726631    6.0756494    4.5486234    1.5270259 0.0017585717 -0.021486722    4.5683516 
+   76810    19.848935    1.0242824    23.632053    6.0838875     4.547976    1.5359115  0.001818422 -0.022354046    4.5685117 
+   76820    20.286016    1.0157953    23.450257    6.0458015    4.5226165     1.523185 0.0017883103 -0.022175711    4.5430039 
+   76830    20.324382     1.021611    23.663653    6.0340703    4.5021646    1.5319056 0.0016768806 -0.021830274     4.522318 
+   76840    20.239459    1.0253994    23.793077     6.047761    4.5101745    1.5375864 0.0015071573 -0.020848282    4.5295157 
+   76850    20.234493    1.0275699     23.63656    6.0567468    4.5159056    1.5408411 0.0013456741   -0.0198859    4.5344459 
+   76860    20.324591    1.0134135    23.642452    6.0459981    4.5263845    1.5196136 0.0014223696 -0.020455335    4.5454174 
+   76870    20.155231    1.0109897    23.687227    6.0592593    4.5432802    1.5159791 0.0016303178 -0.021163653    4.5628135 
+   76880    20.040413    1.0242601    23.784976      6.05972    4.5238421     1.535878 0.0018709842 -0.022443261    4.5444144 
+   76890    20.146772    1.0098956    23.755115    6.0621476    4.5478091    1.5143385  0.002033753 -0.023390002    4.5691654 
+   76900    20.132625    1.0202296    23.596791    6.0666623     4.536828    1.5298343 0.0018973782 -0.022869115    4.5577998 
+   76910    19.998529    1.0306434    23.757759    6.0765996    4.5311498    1.5454498 0.0017998188 -0.022201694    4.5515517 
+   76920    19.873319    1.0099341    23.698058    6.0426446    4.5282485    1.5143962 0.0017356424 -0.021918461    4.5484313 
+   76930    20.407768    1.0287315    23.686178    6.0553113    4.5127284    1.5425829   0.00157395 -0.021308384    4.5324628 
+   76940    20.307731    1.0051209    23.039333    6.0404072    4.5332284    1.5071788 0.0014619585 -0.020697896    4.5524644 
+   76950    20.093459    1.0086431     23.83849     6.049116    4.5366556    1.5124604 0.0015408325 -0.020926419    4.5560412 
+   76960    20.288475    1.0182945    23.625286    6.0817208    4.5547881    1.5269326 0.0016224093  -0.02143246    4.5745982 
+   76970    20.230964    1.0161377    23.663365    6.0713809    4.5476825    1.5236984 0.0016257053 -0.021237729    4.5672945 
+   76980    20.378146    1.0336764    23.772322     6.081904    4.5319062    1.5499978 0.0016809219 -0.021813699     4.552039 
+   76990     20.20606    1.0219859    23.643249    6.0776226    4.5451548    1.5324678 0.0017315185 -0.022303318    4.5657266 
+   77000    20.118543     1.018308    23.592126    6.0464049     4.519452    1.5269529  0.001821052 -0.022845292    4.5404762 
+   77010    20.483777    1.0295934    23.727475    6.0677157    4.5238404    1.5438753 0.0018963477 -0.023440194    4.5453843 
+   77020    20.341443    1.0137223    23.736417    6.0592371    4.5391605    1.5200767 0.0018270489 -0.022893775    4.5602272 
+   77030    20.213008   0.99884148    23.697002    6.0468736    4.5491108    1.4977628 0.0017734893 -0.022591633    4.5699289 
+   77040    20.225803   0.99605987      23.9069     6.025201    4.5316092    1.4935918 0.0015984569 -0.022205777    4.5522165 
+   77050      20.3927   0.99053322    23.787212    6.0158103    4.5305058    1.4853046 0.0014678855 -0.021694707    4.5507326 
+   77060    20.167509   0.99313556     23.52628    6.0294461    4.5402393    1.4892068 0.0014125076 -0.021212963    4.5600398 
+   77070    20.402054    1.0055613    24.001875    6.0292151    4.5213759    1.5078391 0.0015112948 -0.021458954    4.5413236 
+   77080    20.407601     1.000154    23.720958     6.030297    4.5305661     1.499731  0.001550179 -0.021345354    4.5503613 
+   77090    20.265331    1.0308947    24.088676    6.0639272    4.5181007    1.5458265 0.0017111309 -0.022296449     4.538686 
+   77100    20.317342    1.0166886     23.81175    6.0604948    4.5359703    1.5245246 0.0018857067 -0.022848297    4.5569329 
+   77110     20.44771    1.0152526    23.833319    6.0531846    4.5308133    1.5223712 0.0017314944 -0.021728341    4.5508102 
+   77120    20.365783    1.0286611    23.850823    6.0623395    4.5198621    1.5424774 0.0015511463 -0.020952451    4.5392634 
+   77130     20.25622    1.0106397    23.966376    6.0512993     4.535845    1.5154543 0.0013445193 -0.020081855    4.5545824 
+   77140    19.876215    1.0068656    23.391431    6.0256293    4.5158343     1.509795 0.0012362597 -0.019046679    4.5336447 
+   77150    19.418936   0.99321073     23.79301    6.0104757    4.5211562    1.4893195  0.001488691 -0.019845365    4.5395129 
+   77160    20.210745    1.0064696    23.627858    6.0258643    4.5166631    1.5092012 0.0015074552 -0.019884874    4.5350405 
+   77170    20.409723   0.98900173    23.899253    6.0209884    4.5379803    1.4830081 0.0017498873  -0.02131098    4.5575414 
+   77180    20.276649    1.0118289     23.68664    6.0223593    4.5051219    1.5172374 0.0017102207 -0.021767597    4.5251793 
+   77190    20.314408    1.0114198    23.643662    6.0401156    4.5234916     1.516624 0.0019969783   -0.0231674     4.544662 
+   77200    20.268298    1.0079793    23.648223    6.0560759    4.5446109     1.511465 0.0020737473  -0.02370779    4.5662449 
+   77210     19.85883    1.0264701    23.806159    6.0601579    4.5209661    1.5391918  0.002213133 -0.024296447    4.5430494 
+   77220    20.214896     1.015193    23.743386    6.0542095    4.5319275    1.5222819 0.0021404732 -0.023713947     4.553501 
+   77230    20.200485    1.0321059    23.812685    6.0701118     4.522469    1.5476428 0.0020741145  -0.02301432    4.5434092 
+   77240    20.246106    1.0148503    23.600322    6.0453871     4.523619    1.5217681  0.001863428 -0.022366059    4.5441216 
+   77250    20.246498    1.0179381    23.616153     6.047923    4.5215247    1.5263982  0.001830634  -0.02239871    4.5420928 
+   77260    19.849443    1.0197488    23.704941    6.0700617    4.5409484    1.5291133 0.0018220332 -0.022103286    4.5612297 
+   77270    20.439938     1.014795    23.803519    6.0566908    4.5350056    1.5216852 0.0016298503  -0.02131404    4.5546898 
+   77280    20.282061   0.99850562    23.820267    6.0380265    4.5407674    1.4972592 0.0016081964 -0.021264345    4.5604235 
+   77290    20.377196    1.0120568    23.803021    6.0640867    4.5465076    1.5175791  0.001644406 -0.021587806     4.566451 
+   77300    20.240989    1.0275652    23.703669    6.0848616    4.5440275    1.5408341 0.0015895162 -0.021797035     4.564235 
+   77310     19.78318    1.0221315     23.36768     6.071477    4.5387909    1.5326861 0.0015462712 -0.021547066    4.5587917 
+   77320    20.263074    1.0232489    23.879367    6.0861115    4.5517497    1.5343617  0.001613039  -0.02174893    4.5718856 
+   77330    20.067993    1.0193702    23.598528    6.0633866     4.534841    1.5285455 0.0016305701  -0.02161901    4.5548295 
+   77340     20.29372   0.99684144    23.730745     5.993548    4.4987842    1.4947637 0.0017447247 -0.022353031    4.5193925 
+   77350    20.188494   0.97841266    23.304575    6.0089919    4.5418621    1.4671298 0.0019273234 -0.023082965    4.5630177 
+   77360    20.058075   0.97853447    23.426331    6.0063737    4.5390613    1.4673124 0.0017543303 -0.022306384    4.5596134 
+   77370     20.29181   0.99522492    23.585403    6.0172384    4.5248986    1.4923398 0.0017467438 -0.022208066    4.5453599 
+   77380    20.154146   0.98803073    23.537582    6.0035171     4.521965    1.4815521  0.001791733 -0.021879014    4.5420523 
+   77390      20.1882   0.99786213    23.435647    6.0164509    4.5201566    1.4962943 0.0018225814  -0.02172154    4.5400556 
+   77400    20.071138   0.99293176    23.506833    6.0216971    4.5327959    1.4889012 0.0020131769 -0.022231058    4.5530138 
+   77410    20.347753   0.99803978    23.615878    6.0186758    4.5221151    1.4965607 0.0020889077 -0.023005155    4.5430314 
+   77420    20.361618   0.99459938    23.703126    6.0157168    4.5243151    1.4914018 0.0019718116 -0.022810136    4.5451534 
+   77430    20.026782   0.99478851    23.885335    6.0015206    4.5098352    1.4916854 0.0018169932 -0.022329506    4.5303477 
+   77440    20.203739   0.99517559    23.585022    6.0103938     4.518128    1.4922658 0.0017631269 -0.022762983    4.5391279 
+   77450    20.484102   0.99162334    23.776173    6.0201249    4.5331857    1.4869392 0.0016348148 -0.022036784    4.5535877 
+   77460    19.943175    1.0177215    23.813757    6.0358825    4.5098092    1.5260734 0.0016457376 -0.021806057    4.5299695 
+   77470    20.305467     1.010176    23.781197    6.0490096    4.5342507    1.5147589 0.0016194513 -0.021607569    4.5542388 
+   77480    20.313339    1.0000291    23.601747    6.0269015    4.5273579    1.4995436 0.0016944941 -0.022064792    4.5477282 
+   77490    20.390809    0.9977175    23.718736    6.0193036    4.5232262    1.4960774 0.0017470164 -0.022465098    4.5439443 
+   77500    20.469523    1.0152594    24.042007    6.0311541    4.5087726    1.5223814 0.0018553969  -0.02315576     4.530073 
+   77510    20.271806    1.0352921    23.880019    6.0690386    4.5166181    1.5524205 0.0016939702  -0.02211233    4.5370365 
+   77520    20.089288    1.0045622    23.575921    6.0815825    4.5752414    1.5063411 0.0015913692 -0.021316678    4.5949667 
+   77530    20.165081    1.0296016    23.885632    6.0717399    4.5278522    1.5438876 0.0016658627 -0.021862379    4.5480488 
+   77540    20.155137    1.0170864    23.805733    6.0360129    4.5108918     1.525121 0.0017016418  -0.02166911    4.5308593 
+   77550    20.197908    1.0100815    23.487115    6.0162326    4.5016154    1.5146172 0.0018753644 -0.022348627    4.5220887 
+   77560    19.965563   0.99906206    23.714911    6.0205165    4.5224229    1.4980936 0.0019265106 -0.022703797    4.5432002 
+   77570     19.97153    1.0146913    24.012345    6.0532256     4.531696    1.5215296 0.0020584342 -0.023550962    4.5531886 
+   77580    20.059348    1.0069618     23.78029    6.0490515    4.5391123    1.5099392 0.0018358953 -0.022533104    4.5598095 
+   77590    20.228627    1.0117503    23.818799    6.0384007    4.5212812    1.5171195 0.0016663473  -0.02147263    4.5410875 
+   77600     20.31823   0.99929545    23.319602    6.0332108    4.5347673    1.4984435 0.0016667292 -0.021442428     4.554543 
+   77610    20.196767     0.994389    23.649278    6.0231626    4.5320763    1.4910863 0.0017573232 -0.021665197    4.5519842 
+   77620    20.077045   0.99803032    23.452692    6.0211314    4.5245849    1.4965465 0.0017210724 -0.021645981    4.5445098 
+   77630      20.4778   0.98892205    23.468072    6.0014018    4.5185132    1.4828886 0.0017883168 -0.021479474    4.5382044 
+   77640    20.476846   0.98930128    23.742865    5.9946536    4.5111964    1.4834573 0.0018696185 -0.021849504    4.5311762 
+   77650    20.459772   0.98424682    23.403853    6.0101241     4.534246    1.4758781 0.0018886565 -0.021792969    4.5541503 
+   77660    20.043425    1.0059665    23.789864    6.0347149    4.5262681    1.5084468 0.0018877797 -0.021688956    4.5460693 
+   77670    20.300363    1.0240903    23.599785     6.064264    4.5286406    1.5356234 0.0020478302 -0.022094938    4.5486877 
+   77680    20.160068     1.028335     23.78715    6.0618007    4.5198123    1.5419884 0.0022539515 -0.022976602    4.5405349 
+   77690    20.214914    1.0180796    23.703119     6.055091    4.5284806    1.5266104 0.0021178494  -0.02237235    4.5487351 
+   77700    20.562908   0.99574736    23.655679    6.0475814    4.5544582    1.4931232 0.0021071274 -0.022093464    4.5744446 
+   77710    20.223731    1.0072436    23.855909    6.0521614    4.5417996    1.5103618 0.0018891763  -0.02116555     4.561076 
+   77720    19.939714    1.0290023    23.823019    6.0868155    4.5438265     1.542989 0.0016217478 -0.020304899    4.5625097 
+   77730    20.226366    1.0210272    23.945864    6.0631133     4.532083    1.5310304 0.0016330607 -0.020896764    4.5513467 
+   77740    19.951901    1.0152827    23.633036    6.0760786    4.5536622    1.5224164 0.0017767301 -0.021715859    4.5736013 
+   77750    20.520577    1.0150336    23.669246    6.0365643    4.5145213    1.5220429 0.0018897424 -0.022489185    4.5351208 
+   77760    20.219331    1.0069808    23.764691    6.0500058    4.5400381    1.5099677 0.0018782219 -0.022262897    4.5604227 
+   77770    20.068552    1.0122379    23.610468    6.0611329    4.5432821    1.5178508 0.0018953825 -0.022457335    4.5638441 
+   77780    20.204951    1.0095098    23.666568    6.0453803    4.5316203      1.51376 0.0019182318  -0.02314734    4.5528494 
+   77790    20.258032    1.0112994    23.723396    6.0524503    4.5360069    1.5164434 0.0017904415 -0.022060815    4.5562773 
+   77800    20.281785    1.0238825    23.979643    6.0419142    4.5066023    1.5353119 0.0016185166 -0.020997199     4.525981 
+   77810    20.274719     1.018549    23.684341    6.0885534    4.5612392    1.5273142 0.0016105926 -0.021152731    4.5807813 
+   77820     20.31501    1.0139186    23.863184    6.0589322    4.5385612     1.520371 0.0016994965 -0.021168785    4.5580305 
+   77830    20.346926    1.0204075    23.914993      6.07904    4.5489389    1.5301011 0.0014930855 -0.020071121    4.5675169 
+   77840    20.493256    1.0188064    23.839682    6.0740994    4.5463992    1.5277002 0.0014320454 -0.019790057    4.5647572 
+   77850    20.438423    1.0255789    23.801482    6.0805855      4.54273    1.5378555 0.0016220988 -0.020770588    4.5618785 
+   77860    20.390259    1.0305692    23.776631    6.0703825     4.525044    1.5453385 0.0016986353 -0.021506366    4.5448517 
+   77870    20.257808    1.0224524    23.841962    6.0674217    4.5342544    1.5331673 0.0016874818 -0.021624396    4.5541913 
+   77880    20.228917    1.0167248    23.738252    6.0479567    4.5233779    1.5245789 0.0015032007 -0.021034245    4.5429089 
+   77890    20.473358    1.0175315     23.62142    6.0481134    4.5223249    1.5257885 0.0015325722 -0.021397949    4.5421903 
+   77900    20.295437    1.0003577    23.836513    6.0506967    4.5506603    1.5000364 0.0018115247 -0.022252304    4.5711011 
+   77910    20.095144    1.0025235    23.610426    6.0338642    4.5305802     1.503284   0.00170525 -0.021738776    4.5506137 
+   77920     20.18466    1.0140446    23.872587    6.0427406    4.5221807    1.5205599 0.0015793927 -0.021163709     4.541765 
+   77930    20.367332    1.0152334    23.870482     6.045126    4.5227835    1.5223425 0.0017025308 -0.021630782    4.5427117 
+   77940    20.451634    1.0086408    23.542756    6.0374192    4.5249623    1.5124569 0.0016564964 -0.021949238     4.545255 
+   77950    20.262428    1.0001099    23.689916    6.0227634    4.5230986    1.4996647 0.0016690256 -0.021907895    4.5433375 
+   77960    20.176301    1.0070461    23.609863    6.0398597    4.5297941    1.5100656 0.0015361017 -0.021456219    4.5497143 
+   77970    20.249506    1.0031579    23.747064    6.0496595    4.5454243    1.5042353 0.0015164573 -0.021169967    4.5650778 
+   77980    20.520749    1.0079695    23.612503    6.0297514    4.5183012    1.5114502 0.0017801251 -0.022379148    4.5389003 
+   77990    20.440834     1.019877    23.880207    6.0490269    4.5197214    1.5293055 0.0017280939 -0.022210626    4.5402039 
+   78000    20.318452    1.0085673    23.775114    6.0641539    4.5518072    1.5123466 0.0018015393 -0.022722411    4.5727281 
+   78010     20.38361    1.0272797    23.980802    6.0816177    4.5412118    1.5404059  0.002002633 -0.023684496    4.5628937 
+   78020    20.390213    1.0099034    23.670728    6.0611725    4.5468223    1.5143502 0.0019945812 -0.023883695    4.5687114 
+   78030    20.594544    1.0099102    23.938387    6.0362678    4.5219075    1.5143603 0.0020823107 -0.024043936    4.5438691 
+   78040      20.4477   0.99432327    23.639514    6.0270172    4.5360294    1.4909877 0.0020332223 -0.023810221    4.5578064 
+   78050    20.403961    1.0182084    23.742204    6.0380305     4.511227    1.5268035 0.0020198384 -0.023426245    4.5326334 
+   78060    20.052184   0.98563019    23.701229     6.010032    4.5320795    1.4779525   0.00202915 -0.023497722    4.5535481 
+   78070    20.325253    1.0027955    23.762765    6.0299744    4.5262825    1.5036919 0.0020563839 -0.024114172    4.5483402 
+   78080    20.474502    1.0100386    23.782394    6.0261163    4.5115634    1.5145529 0.0019140898 -0.023555517    4.5332049 
+   78090    20.120202    1.0209888    23.804188    6.0629606    4.5319879    1.5309727 0.0018652284  -0.02295548    4.5530781 
+   78100    20.296198    1.0142401    23.795672    6.0546525    4.5337994     1.520853 0.0019526579 -0.023178135    4.5550249 
+   78110    19.712232    1.0195351    23.983349    6.0576849     4.528892    1.5287929 0.0019502897 -0.023410868    4.5503526 
+   78120    20.042653    1.0047046    23.672323    6.0615028    4.5549483    1.5065545 0.0017538701 -0.022179221    4.5753737 
+   78130    20.253489    1.0067745    23.637694    6.0497068    4.5400485    1.5096583 0.0016575061 -0.021597567    4.5599886 
+   78140    20.157643   0.99930636    23.786979    6.0313875    4.5329276    1.4984599 0.0016683372 -0.021554306    4.5528136 
+   78150    20.159011   0.99409722    23.329421    6.0011801    4.5105313    1.4906488 0.0015457938 -0.020913499     4.529899 
+   78160    20.347305   0.99050191    23.574497     6.020067    4.5348093    1.4852576 0.0014559618 -0.020785841    4.5541392 
+   78170    20.111894    1.0223473    23.756543    6.0541491    4.5211392    1.5330098  0.001476821 -0.021026831    4.5406892 
+   78180    19.796821    1.0323109    24.152488    6.0939915    4.5460414    1.5479501   0.00146363 -0.021166624    4.5657444 
+   78190    19.968942    1.0249517    23.812782    6.0865194    4.5496043    1.5369151 0.0014560434 -0.021234236    4.5693825 
+   78200    20.183393    1.0306168    23.888685    6.0841411    4.5387312    1.5454099 0.0014698091 -0.021201805    4.5584632 
+   78210    20.223392    1.0196553    23.532243     6.067068    4.5380949    1.5289731 0.0015845207 -0.021584223    4.5580947 
+   78220    20.314955    1.0350704    23.621818    6.0902144    4.5381263    1.5520881 0.0014896822 -0.020842263    4.5574789 
+   78230     20.34245    1.0107469    23.749963    6.0512982    4.5356832     1.515615 0.0014422123 -0.020558924    4.5547999 
+   78240    20.287097   0.99818837     23.93529     6.049045    4.5522616    1.4967835 0.0013950578 -0.020230938    4.5710974 
+   78250    20.402882    1.0071653    23.659641    6.0233426    4.5130983    1.5102443 0.0014743849 -0.020575471    4.5321994 
+   78260    20.453748     1.021214    23.705717    6.0381424     4.506832    1.5313104 0.0016083905 -0.021200805    4.5264245 
+   78270    20.298545    1.0036226    23.798918    6.0309769    4.5260449    1.5049321 0.0016710073 -0.021608708    4.5459826 
+   78280    20.229542   0.98470826    23.663539    6.0039446    4.5273745      1.47657 0.0016893986 -0.021830695    4.5475158 
+   78290    20.158129   0.97485422    23.512188    5.9819083    4.5201144    1.4617939 0.0019305176 -0.023129843    4.5413137 
+   78300    20.290469   0.98731923    23.838515    6.0044668    4.5239816    1.4804852 0.0019643292 -0.023177967    4.5451952 
+   78310    20.166253   0.98464201    23.554161    6.0200964    4.5436257    1.4764707 0.0018924888 -0.022959051    4.5646923 
+   78320    19.977683    1.0217451    23.547614    6.0501927    4.5180859    1.5321068 0.0021722726 -0.023837356     4.539751 
+   78330     19.87204    1.0179649    24.116189    6.0480538    4.5216155    1.5264383 0.0020723772 -0.023891289    4.5434344 
+   78340    20.159268    1.0165811    23.571701     6.060148    4.5357847    1.5243633 0.0019439956  -0.02342307    4.5572638 
+   78350    20.036431   0.99604623    23.779886    6.0330406    4.5394693    1.4935713  0.001923251 -0.023431479    4.5609775 
+   78360    20.321806   0.99180848    23.846096     6.017904    4.5306872    1.4872168 0.0021122859 -0.024115815    4.5526908 
+   78370    20.384431    1.0026324    23.592068    6.0131275    4.5096803    1.5034472 0.0021383002 -0.023969068    4.5315111 
+   78380    20.041815   0.99035074     23.61437    6.0069334    4.5219025    1.4850309 0.0018761417 -0.022558591    4.5425849 
+   78390    19.824315   0.97963598    23.575888    5.9859177    4.5169535    1.4689642  0.001659085 -0.021575568      4.53687 
+   78400    20.272684   0.98024734    23.511128    5.9895847    4.5197038    1.4698809 0.0014917329 -0.020920963    4.5391331 
+   78410    20.336856   0.98925143    23.947371     6.003564    4.5201814    1.4833825 0.0013573855 -0.020127366    4.5389514 
+   78420    20.401049   0.97236099    23.411998    6.0108444    4.5527891    1.4580553 0.0012652809 -0.019593942    4.5711178 
+   78430     20.40963    1.0167927    23.697129    6.0422927     4.517612    1.5246807 0.0015685592 -0.021234489     4.537278 
+   78440    19.964613    1.0058905    23.645143    6.0448927    4.5365599    1.5083328  0.001608229 -0.021290522    4.5562422 
+   78450    19.814119    1.0065893    23.964419    6.0408235    4.5314428    1.5093807 0.0015784046 -0.021245832    4.5511103 
+   78460    19.980196     1.019407     24.02234    6.0694208      4.54082    1.5286008 0.0015079097 -0.020986524    4.5602986 
+   78470    20.278028    1.0265482    23.745608    6.0825823    4.5432733     1.539309 0.0016733436 -0.021664687    4.5632646 
+   78480    20.140048    1.0347051    23.791642    6.0842345    4.5326943    1.5515402 0.0017488451 -0.022132563     4.553078 
+   78490    20.398392    1.0219376    23.749278    6.0643193    4.5319238    1.5323955 0.0017412538 -0.021771069    4.5519536 
+   78500    20.192423    1.0113564    23.709128    6.0369702    4.5204413    1.5165289 0.0019399147 -0.023132616     4.541634 
+   78510    20.051667   0.99252273     23.60841    6.0195282    4.5312404    1.4882878 0.0019099667 -0.022975112    4.5523055 
+   78520    20.062597   0.98654567    23.530016    5.9917048    4.5123796    1.4793252 0.0020031636 -0.023054214    4.5334306 
+   78530    20.141541   0.98288289    23.681589    6.0112765    4.5374436    1.4738329 0.0021417093 -0.023490231    4.5587922 
+   78540    20.317872    1.0069313    23.961003    6.0228823    4.5129887    1.5098935 0.0021339757 -0.023378756    4.5342335 
+   78550    20.464114   0.99862012    23.592603    6.0340472    4.5366163    1.4974309  0.002016363 -0.022639415    4.5572394 
+   78560    20.404695    1.0130487    23.662403    6.0443915     4.525325    1.5190665 0.0018705884 -0.021987883    4.5454423 
+   78570    20.353277    1.0110155    23.712479    6.0412947     4.525277    1.5160177 0.0016956145 -0.021260272    4.5448417 
+   78580     20.16759    1.0017234     23.47941    6.0501074    4.5480231    1.5020843 0.0015893516 -0.020855215     4.567289 
+   78590    20.378109     1.013306     23.74561    6.0540566    4.5346043    1.5194523 0.0015615293 -0.020829893    4.5538726 
+   78600    20.329658    1.0184279    23.716892    6.0340855    4.5069529    1.5271326 0.0015189749 -0.020673604    4.5261076 
+   78610    20.277664    1.0087453    23.788983    6.0499571    4.5373436    1.5126135 0.0014770782 -0.020467888    4.5563344 
+   78620    20.198099    1.0052611    23.739316    6.0265183    4.5191293     1.507389 0.0014028152 -0.020353312    4.5380798 
+   78630     20.41673     1.010777    23.633055    6.0295246    4.5138645    1.5156601 0.0014504382 -0.020958332    4.5333724 
+   78640    20.485274    1.0080621    23.768328    6.0357286    4.5241394    1.5115891 0.0017347645   -0.0221789    4.5445836 
+   78650    20.347403   0.99807274    23.881663    6.0213207    4.5247106    1.4966101 0.0019132618 -0.022886012    4.5456834 
+   78660    20.241895   0.98937903    23.615907     6.006906    4.5233321    1.4835739 0.0018059662 -0.022698877    4.5442251 
+   78670     20.08364   0.98681929     23.56187     6.000441    4.5207055    1.4797355 0.0015966224 -0.021641185    4.5407501 
+   78680    20.417873   0.99127646    23.720181    5.9961347    4.5097157    1.4864191 0.0014665503 -0.021273538    4.5295227 
+   78690    20.252697   0.99726422    23.701062    6.0013556    4.5059579    1.4953977 0.0016019516 -0.021764067    4.5261201 
+   78700    19.830729   0.98814287    23.745369    6.0083654    4.5266452    1.4817202 0.0018844461 -0.022753361    4.5475141 
+   78710    20.271541   0.98846188      23.6762    6.0252441    4.5430455    1.4821986 0.0019568591 -0.022904913    4.5639935 
+   78720    20.356305   0.97698297     23.36832    6.0170514    4.5520655     1.464986 0.0019471907 -0.022814951    4.5729332 
+   78730    20.254756   0.99688212    23.430959    6.0268799    4.5320552    1.4948247 0.0018878387 -0.021951663     4.552119 
+   78740    20.289303   0.98964274    23.659092    6.0057296    4.5217603    1.4839693 0.0018647695 -0.021527745    4.5414233 
+   78750    20.372315    1.0018824    23.659163    6.0266862    4.5243635    1.5023227 0.0018183881 -0.021190598    4.5437358 
+   78760      19.7618    1.0292797    23.749692    6.0402496    4.4968447    1.5434049 0.0018985122 -0.021585374    4.5165316 
+   78770    20.054503   0.99560567    23.450405    6.0240411    4.5311304    1.4929107 0.0018325303  -0.02131863    4.5506165 
+   78780    20.053054   0.99763726    23.757324    6.0371364    4.5411793    1.4959571 0.0018510314  -0.02141613    4.5607444 
+   78790    19.919287   0.99445964    23.628053    6.0335492     4.542357    1.4911922 0.0019372523 -0.022114099    4.5625338 
+   78800    20.282267    1.0004899    23.758326    6.0362359    4.5360014    1.5002346 0.0019938441 -0.022438474     4.556446 
+   78810    20.263619   0.98996371    23.601924      6.01017    4.5257194    1.4844506 0.0020197475 -0.022756012    4.5464556 
+   78820    20.510001   0.99453856    23.685176    6.0080396     4.516729    1.4913106 0.0019196515 -0.022133055    4.5369424 
+   78830    20.181668    1.0084167    23.812788    6.0382126    4.5260918    1.5121208 0.0018487824 -0.021483111    4.5457261 
+   78840    20.341186    1.0041705    23.644526    6.0298408    4.5240872    1.5057536   0.00181468 -0.021984841    4.5442573 
+   78850    20.224449   0.99964011    23.575169    6.0461668    4.5472064    1.4989603 0.0015862586 -0.021126145    4.5667463 
+   78860    20.090736   0.98823483    23.567395    6.0533114    4.5714532    1.4818581 0.0013696788 -0.020214459     4.590298 
+   78870    19.965937    1.0155752    23.841858    6.0454338    4.5225788     1.522855 0.0012881146 -0.020098489    4.5413892 
+   78880    19.722064    1.0174348    23.911349    6.0436007    4.5179572    1.5256435 0.0013159549 -0.020284881    4.5369261 
+   78890    20.463848    1.0105162    23.709325    6.0405413    4.5252722    1.5152691 0.0015275396 -0.021296442    4.5450411 
+   78900    20.386634   0.99925607    23.791295    6.0322609    4.5338764    1.4983845  0.001671331 -0.021973292    4.5541784 
+   78910    20.185769     1.018269    23.703829    6.0681591    4.5412647    1.5268944 0.0013819043 -0.020314418    4.5601972 
+   78920    20.059249    1.0309112    23.794862    6.0795612    4.5337098    1.5458514 0.0012969793 -0.019532122     4.551945 
+   78930    20.104674    1.0106516     23.90688    6.0910106    4.5755385    1.5154721 0.0011633078 -0.018789304    4.5931645 
+   78940    20.467706    1.0133393    23.818869    6.0529034     4.533401    1.5195023 0.0010515364 -0.017997166    4.5503467 
+   78950    20.239848    1.0335555    23.777001    6.0847047    4.5348882    1.5498165 0.0010574131 -0.018265707    4.5520965 
+   78960    19.960409    1.0275601    24.217947    6.0844719    4.5436455    1.5408264 0.0011657841 -0.018912818    4.5613925 
+   78970    19.997324    1.0311714    23.906284    6.0966204    4.5503789    1.5462415 0.0012421243 -0.018961697    4.5680984 
+   78980    20.149296    1.0270376    23.839271    6.1074535    4.5674106    1.5400429 0.0013021079 -0.019190693    4.5852992 
+   78990    20.240232    1.0413722    23.891691    6.0975666     4.536029    1.5615376 0.0013174457 -0.019371041    4.5540826 
+   79000    20.281676    1.0386186     23.69663    6.1062232    4.5488146    1.5574086 0.0013749701 -0.019974768    4.5674144 
+   79010     20.51567    1.0411662    23.948939    6.0929366    4.5317079    1.5612287 0.0016491959 -0.021130502    4.5511892 
+   79020    20.583494    1.0126514    23.814632    6.0647753    4.5463045    1.5184708 0.0016827445 -0.021447824    4.5660696 
+   79030    20.322961    1.0052842     23.41091    6.0440568    4.5366331    1.5074237 0.0017179491 -0.022004689    4.5569198 
+   79040    20.264886    1.0033908    23.782461    6.0341388    4.5295544    1.5045845 0.0017453269 -0.021861143    4.5496702 
+   79050    20.175872    1.0057567    23.542214    6.0399242    4.5317921    1.5081321 0.0016526922 -0.021473951    4.5516133 
+   79060    20.357267    1.0157848    23.662578    6.0535769    4.5304076    1.5231693 0.0017533853 -0.021990268    4.5506445 
+   79070    20.380144    1.0039985    23.620282    6.0559793    4.5504836    1.5054957 0.0016307319 -0.021438805    4.5702917 
+   79080    20.508414    1.0141748    23.886249    6.0672243    4.5464692    1.5207551 0.0017927043 -0.022287252    4.5669638 
+   79090    20.278124     1.019006    23.616405    6.0636121    4.5356126    1.5279994 0.0019453528 -0.022915755     4.556583 
+   79100    20.102215    1.0085217    24.003737    6.0736015    4.5613232    1.5122783 0.0019427268 -0.023395244    4.5827757 
+   79110    20.525887    1.0205276     23.95321    6.0844316    4.5541504    1.5302812 0.0018393409 -0.022918601    4.5752297 
+   79120    19.965157    1.0375045    23.817074     6.079869     4.524131     1.555738 0.0017219684 -0.022393327    4.5448024 
+   79130    20.286988    1.0282601    23.727382    6.0694228    4.5275468     1.541876 0.0017299581 -0.022099264    4.5479161 
+   79140    20.132918   0.98503186    23.904911    6.0363173     4.559262    1.4770553 0.0018298474  -0.02212231    4.5795545 
+   79150    20.239638   0.98893326    23.704753    6.0187583    4.5358529    1.4829054 0.0019863713 -0.022916729    4.5567833 
+   79160    19.958756    1.0009543    23.808549    5.9871483    4.4862173     1.500931 0.0019495741 -0.022560342     4.506828 
+   79170    20.231542     0.982538     23.58716     5.996163    4.5228473    1.4733157 0.0018909214 -0.022421079    4.5433775 
+   79180    20.264891   0.98668878    23.460393    6.0099255    4.5303857    1.4795398  0.001798325 -0.022317507    4.5509049 
+   79190    20.173647   0.99131573    23.813896    6.0144546    4.5279767    1.4864779 0.0016274566 -0.021127851     4.547477 
+   79200    20.516279   0.98485311    23.682459    6.0119974    4.5352102    1.4767872 0.0015467005 -0.020785657    4.5544491 
+   79210     20.16173    1.0034864    23.584574    6.0170332    4.5123053    1.5047279 0.0014302281 -0.020457755    4.5313329 
+   79220    20.111508   0.99124783    23.704777    6.0077231     4.521347    1.4863761 0.0012662369 -0.019818957    4.5398997 
+   79230     20.01007   0.98077369    23.560661    6.0085585    4.5378883    1.4706701 0.0012278838 -0.019744571     4.556405 
+   79240     20.21824   0.99309341    23.501737    6.0219853    4.5328417    1.4891436 0.0012916907 -0.020002106    4.5515521 
+   79250    20.310251   0.99024902    23.411964    5.9962176    4.5113392    1.4848784 0.0015822853 -0.020876332    4.5306332 
+   79260    19.680983   0.99211119    23.678102    6.0212688    4.5335981    1.4876707 0.0017086821 -0.021464928    4.5533543 
+   79270    20.165545     1.003569    23.524172    6.0488906    4.5440388    1.5048518 0.0016134519 -0.020842063    4.5632675 
+   79280    20.166326    1.0144268    23.866652    6.0517558    4.5306227    1.5211331  0.001679219  -0.02101468    4.5499582 
+   79290    20.230735    1.0076412    23.640949    6.0396218    4.5286638     1.510958 0.0019083487 -0.022133664    4.5488891 
+   79300    20.340115    1.0038565    23.741832    6.0480558     4.542773    1.5052828  0.002071035 -0.023139453    4.5638414 
+   79310    20.317462    1.0179976    23.827843    6.0193791    4.4928917    1.5264874 0.0022446865 -0.024143249    4.5147902 
+   79320    20.256199   0.99173409    23.795026    6.0087572    4.5216519    1.4871053 0.0023275344 -0.024029488    4.5433539 
+   79330    20.038151    1.0012497     23.71454    6.0489208    4.5475469    1.5013739 0.0023205505 -0.024177148    4.5694035 
+   79340    20.100517    1.0216253    23.890619    6.0485661     4.516639    1.5319272 0.0020542183 -0.022898028    4.5374828 
+   79350    20.464024    1.0005918    23.746084    6.0259499    4.5255626    1.5003873 0.0019799882 -0.022758942    4.5463415 
+   79360    20.388781   0.99493241    23.687201    6.0137886    4.5218875    1.4919011 0.0019522492 -0.023056302    4.5429915 
+   79370    20.204719    0.9941707    23.751335    6.0136922    4.5229332     1.490759 0.0019863473 -0.023194779    4.5441416 
+   79380    20.293392   0.99587308     23.83879    6.0246323    4.5313206    1.4933117 0.0021067707 -0.023893028    4.5531069 
+   79390    20.327499   0.98408657    23.449658    5.9877966    4.5121588    1.4756378 0.0019706032 -0.023276364    4.5334646 
+   79400    20.253799    0.9866627    23.378354    6.0032467     4.523746    1.4795007 0.0019638137 -0.023501063    4.5452833 
+   79410    20.165708   0.98315768    23.644792    6.0132931    4.5390481    1.4742449 0.0019132707 -0.023132404    4.5602673 
+   79420    20.252329    1.0011508    23.640845    6.0284574    4.5272317    1.5012257 0.0017976657 -0.022819331    4.5482534 
+   79430     19.91323    1.0035306    23.724475    6.0151728    4.5103787    1.5047941 0.0018073783 -0.022732593    4.5313039 
+   79440    20.027745    1.0098441    23.891565    6.0536882     4.539427    1.5142613 0.0019369474 -0.023038541    4.5605286 
+   79450     20.12434    1.0237821    23.943409    6.0607214      4.52556    1.5351613 0.0021473165 -0.023853908    4.5472666 
+   79460    20.389505     1.004822    23.845385    6.0625206    4.5557899    1.5067306 0.0022293743 -0.024616549    4.5781771 
+   79470    20.295156    1.0190789     24.05763    6.0596687    4.5315599    1.5281087 0.0021255831 -0.023822676     4.553257 
+   79480    20.070581    1.0126658    23.715618    6.0464638    4.5279714    1.5184924 0.0021845824 -0.024070582    4.5498574 
+   79490    20.309412    1.0118621    23.684838    6.0467986    4.5295113    1.5172873 0.0020939663 -0.023502765    4.5509201 
+   79500    20.309688   0.99728962    23.365422    6.0336907    4.5382549    1.4954358 0.0020615472 -0.023860703    4.5600541 
+   79510    20.161072   0.96501805    23.699966    6.0136814    4.5666368    1.4470446 0.0019364478 -0.023572098    4.5882725 
+   79520    19.844119   0.98696729    23.784271    6.0135982    4.5336407    1.4799575   0.00172703  -0.02210343    4.5540171 
+   79530    20.339613   0.99144907    24.107634     6.038393    4.5517152    1.4866779 0.0018073442 -0.021589203     4.571497 
+   79540    20.322033    1.0014561    23.740793    6.0418326    4.5401491    1.5016835 0.0019544439 -0.022124868    4.5603195 
+   79550    20.205845     1.004123    23.685041    6.0175459    4.5118635    1.5056824 0.0019566454 -0.021748045    4.5316549 
+   79560    20.337368    1.0078669      23.5266    6.0394767    4.5281804    1.5112964 0.0019985875 -0.022456835    4.5486386 
+   79570    20.415024    1.0193306    23.849299    6.0561677    4.5276815    1.5284862 0.0021604695 -0.023608315    4.5491294 
+   79580    19.869613    1.0129157    23.363843    6.0690141    4.5501471     1.518867 0.0021356546 -0.023860911    4.5718723 
+   79590    20.147268      1.03445    23.829634    6.0863046    4.5351469    1.5511577 0.0018947678 -0.023014638    4.5562667 
+   79600    20.192687    1.0357386    23.845601    6.0945983    4.5415083      1.55309 0.0015420787  -0.02148486    4.5614511 
+   79610    20.212048    1.0254322    23.838187    6.0893922    4.5517567    1.5376355 0.0012292561 -0.019719664    4.5702471 
+   79620    20.159345    1.0195765     23.61172    6.0695838    4.5407289     1.528855 0.0011938992 -0.019235637    4.5587706 
+   79630    19.959407    1.0320585    23.948172    6.0780476    4.5304758    1.5475717 0.0012856025 -0.019294415    4.5484847 
+   79640    20.325286    1.0140441    24.169757    6.0736363    4.5530773    1.5205591 0.0016050194 -0.020827305    4.5722995 
+   79650    20.048327    1.0163903    23.771951     6.062428    4.5383507    1.5240773 0.0016493128 -0.021179063    4.5578804 
+   79660     20.04052    1.0198554     23.75593    6.0367795    4.5075064    1.5292731 0.0017619279 -0.021922488     4.527667 
+   79670      20.2165   0.99130998    23.677345    6.0389013     4.552432    1.4864693 0.0019146403 -0.022776825    4.5732942 
+   79680    20.398144    1.0083634    23.859641    6.0715055    4.5594646    1.5120409  0.001973668 -0.022910257    4.5804012 
+   79690    20.170262    1.0130116    23.783587    6.0493273    4.5303163     1.519011 0.0021557106 -0.023290875    4.5514515 
+   79700    20.369692     1.009968    23.783894    6.0465849    4.5321379     1.514447 0.0023121728 -0.024071655    4.5538974 
+   79710    20.348484   0.99702727    23.830973    6.0222457    4.5272033    1.4950424 0.0024024154 -0.024844584    4.5496454 
+   79720    20.226294    1.0203486    23.826638    6.0187348    4.4887221    1.5300127 0.0023628221 -0.024960645    4.5113199 
+   79730    20.061811    1.0070784    23.672615    6.0211501    4.5110361     1.510114 0.0022677361 -0.024235754    4.5330041 
+   79740    20.042991    0.9930783    23.722248    6.0028909      4.51377    1.4891209 0.0021697968 -0.023803443    4.5354036 
+   79750    20.187665   0.99740129    23.916066    6.0207209    4.5251177    1.4956032 0.0020957339  -0.02389504     4.546917 
+   79760    20.207806    1.0062663    23.559194    6.0198704    4.5109741    1.5088963 0.0021811282 -0.024143901    4.5329369 
+   79770    20.353994    1.0043423    23.734247    6.0200809    4.5140696    1.5060113  0.002146354 -0.024329844    4.5362531 
+   79780    20.185058   0.99361491     23.54279    6.0354042    4.5454786    1.4899256 0.0020947819  -0.02383662    4.5672205 
+   79790    20.245301    1.0039674    23.719098    6.0399518    4.5345027    1.5054492 0.0019681125   -0.0227621    4.5552967 
+   79800    20.404046    1.0082529    23.695244    6.0309925    4.5191173    1.5118752 0.0016705091 -0.021467093    4.5389139 
+   79810    20.367165    1.0030135    23.407917    6.0516457    4.5476269    1.5040187 0.0015833735 -0.020892213    4.5669358 
+   79820    20.232406    1.0122403    23.625826    6.0689554    4.5511011    1.5178543 0.0017678947 -0.021862581    4.5711958 
+   79830    20.175504    1.0241562     23.87157    6.0616082    4.5258859    1.5357223 0.0017689504 -0.021979592    4.5460965 
+   79840    20.087654    1.0105085     23.49977    6.0406002    4.5253427    1.5152575 0.0017083409 -0.021671757    4.5453061 
+   79850    20.281283    1.0055486    23.663332    6.0503745    4.5425544    1.5078201 0.0017207989 -0.021846879    4.5626805 
+   79860    20.192957    1.0299798    23.932593    6.0758416    4.5313869    1.5444547 0.0016681978  -0.02135851    4.5510772 
+   79870     20.30506    1.0219298    24.114201    6.0606163    4.5282327    1.5323837 0.0018144836 -0.021896494    4.5483147 
+   79880    20.411008    1.0206778     24.09652    6.0745489    4.5440425    1.5305064  0.001854012 -0.022514628    4.5647031 
+   79890    20.335395    1.0277966    23.652568    6.0611532    4.5199722     1.541181 0.0018411806 -0.022944572    4.5410756 
+   79900    20.368949    1.0236247    23.636152    6.0954725    4.5605472    1.5349253 0.0019749126 -0.023133686     4.581706 
+   79910    20.057606    1.0275506    23.611358    6.0897947    4.5489827    1.5408121 0.0020762431 -0.023480638    4.5703871 
+   79920    20.187367    1.0203618    23.915147    6.0802691    4.5502365    1.5300326 0.0021057001 -0.023543366    4.5716742 
+   79930    20.387493    1.0254352    23.694437    6.0937713    4.5561313    1.5376401 0.0022310642 -0.023854253    4.5777545 
+   79940    20.387437    1.0373723     23.48423    6.1027183    4.5471786    1.5555397  0.002186976 -0.023918338    4.5689099 
+   79950     20.38947    1.0147716    23.556122     6.086472     4.564822    1.5216501 0.0017955289 -0.021764762    4.5847912 
+   79960    20.296184     1.025023     23.88917     6.081558     4.544536     1.537022 0.0014903598 -0.020069269    4.5631149 
+   79970    20.241996    1.0124363    23.891405    6.0580458    4.5398976    1.5181482 0.0014453095 -0.020161369    4.5586136 
+   79980    20.333934      1.01599    23.692825    6.0690028    4.5455257    1.5234771 0.0015865574 -0.020898823     4.564838 
+   79990    20.209063    1.0352505    23.933775    6.0770755    4.5247174    1.5523581 0.0016663154 -0.021635154    4.5446863 
+   80000    20.315463    1.0155674    23.512523    6.0731175    4.5502741    1.5228434 0.0017305778 -0.022313755    4.5708573 
+   80010    20.293648    1.0381442    23.868314    6.0687098    4.5120126    1.5566973 0.0019774005 -0.023294201    4.5333294 
+   80020    20.126552    1.0201416    23.848749     6.069595    4.5398927    1.5297024 0.0021381345 -0.023860245    4.5616148 
+   80030    20.351972    1.0303937    23.906545     6.085393    4.5403177    1.5450753 0.0023376347 -0.024665231    4.5626453 
+   80040    20.319493     1.035601    23.857635    6.0904814    4.5375976    1.5528838 0.0026953601 -0.026102735     4.561005 
+   80050    20.452328    1.0253568    23.841392    6.0748731    4.5373506    1.5375225 0.0026249119 -0.026144159    4.5608698 
+   80060    20.416518    1.0098924    23.833011    6.0515209    4.5371872    1.5143337 0.0025325029 -0.025753274     4.560408 
+   80070    20.093111    1.0207454    23.623196    6.0625036    4.5318958    1.5306078 0.0023996902 -0.024533365    4.5540295 
+   80080    20.112251    1.0022962    23.794357    6.0523577    4.5494145    1.5029432 0.0021810879 -0.023338052    4.5705715 
+   80090    20.351863     1.014078    23.651697    6.0302543    4.5096444    1.5206099 0.0020351974 -0.022502091    4.5301113 
+   80100    20.303027    1.0166591    23.865252    6.0316793    4.5071989    1.5244804 0.0020157152  -0.02240774     4.527591 
+   80110     20.19369   0.98502404    23.180176    6.0101717    4.5331281    1.4770435   0.00199674  -0.02240964     4.553541 
+   80120    20.191469   0.99109551    23.693882    6.0166806    4.5305329    1.4861477 0.0019201292 -0.022118483    4.5507313 
+   80130    20.383597   0.99964125    23.423073    6.0464605    4.5474985    1.4989621 0.0018104581 -0.021945418    4.5676334 
+   80140    20.265843     1.014209     23.92623    6.0602664    4.5394601    1.5208063  0.001818144  -0.02211878    4.5597607 
+   80150    20.337019    1.0095755    23.646973    6.0494919    4.5356334    1.5138585 0.0017979184 -0.022238413    4.5560739 
+   80160    20.149511    1.0075259     23.44484    6.0424674    4.5316822    1.5107852 0.0017392849 -0.022197125    4.5521401 
+   80170    20.352727    1.0165504     23.59309    6.0808515    4.5565342    1.5243173 0.0018159708 -0.022430502    4.5771487 
+   80180    20.035741     1.037165    23.893751    6.0599085    4.5046796    1.5552289 0.0018827043 -0.022601255    4.5253982 
+   80190    20.155628    1.0165048    23.448506    6.0396341    4.5153851     1.524249 0.0019274121 -0.023050481    4.5365082 
+   80200    20.097038    1.0096423    23.720773    6.0301982    4.5162396    1.5139586  0.001908841 -0.022988748    4.5373195 
+   80210    20.053107    1.0168113    23.601961    6.0513048    4.5265962    1.5247086 0.0015985586 -0.021411997    4.5464097 
+   80220    20.176051    1.0047281    23.827682    6.0403764    4.5337866    1.5065898 0.0013539953 -0.020887268    4.5533199 
+   80230    20.078107   0.99418367    23.729212    6.0292193    4.5384409    1.4907784 0.0014304357 -0.021384647    4.5583951 
+   80240    20.020701    1.0070203      23.7318    6.0557375    4.5457106    1.5100269 0.0015740975 -0.021751963    4.5658884 
+   80250    19.843764    1.0081863    23.742001    6.0441557    4.5323804    1.5117753 0.0017402749 -0.022055411    4.5526955 
+   80260     20.29303    1.0086674     23.56315    6.0377631    4.5252663    1.5124968 0.0017431757 -0.022248159    4.5457713 
+   80270    20.232514     1.007136    23.585963    6.0225715     4.512371    1.5102005 0.0015751944  -0.02143739    4.5322332 
+   80280    19.994101   0.99333933    23.687945    6.0213344    4.5318221    1.4895123 0.0014610305 -0.020641203    4.5510023 
+   80290    19.897238   0.99619432    23.917608    6.0138994     4.520106    1.4937934 0.0014682607 -0.020056884    4.5386946 
+   80300    20.380133   0.99971551    23.479917    6.0124555    4.5133821    1.4990734 0.0011880173 -0.018790733    4.5309849 
+   80310    20.257674   0.99452939      23.6397    6.0099787    4.5186819    1.4912968 0.0012347039 -0.018476857    4.5359241 
+   80320    20.426147   0.98605138    23.718825    5.9929035    4.5143195     1.478584 0.0013369715 -0.018536987    4.5315195 
+   80330     20.31631   0.98968986       23.913    6.0049999      4.52096    1.4840399 0.0012150168 -0.018519374    4.5382643 
+   80340    20.477971   0.99088626     23.67843    6.0218762    4.5360422     1.485834 0.0013036992 -0.018825679    4.5535642 
+   80350    20.086505    1.0053465    23.823826    6.0281169    4.5205998    1.5075171 0.0015681655  -0.02057191    4.5396036 
+   80360     20.30824   0.97144332     23.53916    6.0080048    4.5513256    1.4566793 0.0019059172 -0.022515362     4.571935 
+   80370    19.903491   0.98709409    23.835609    6.0105696    4.5304221    1.4801476 0.0019420118 -0.022941772    4.5514218 
+   80380    20.160444   0.99926904    23.699661    6.0028731    4.5044691    1.4984039 0.0018384372 -0.022978025    4.5256087 
+   80390      20.3566    1.0075048     23.58128    6.0407287    4.5299752    1.5107534 0.0018930511 -0.022947824      4.55103 
+   80400    20.348977   0.99362864    23.820077    6.0363267    4.5463806    1.4899462 0.0019640076 -0.023202948    4.5676195 
+   80410    20.421522     1.017168    23.591277    6.0629184     4.537675    1.5252435 0.0018291802 -0.022508089    4.5583539 
+   80420    20.291542    1.0110809    23.614607    6.0463679    4.5302521    1.5161158  0.001548352 -0.020721738    4.5494255 
+   80430    20.249896    1.0057031    23.856564    6.0600114    4.5519596    1.5080517 0.0012909579  -0.01939379    4.5700625 
+   80440    20.025282    1.0134723    23.790564    6.0572274    4.5375257    1.5197017 0.0012512208 -0.019196187    4.5554707 
+   80450    20.208293    1.0307035    24.006387    6.0788023    4.5332624    1.5455399 0.0013935053 -0.019586584    4.5514555 
+   80460    20.292737    1.0137893     23.83763    6.0831923    4.5630153     1.520177 0.0013982208 -0.019415489    4.5810326 
+   80470    20.321896    1.0188283    23.474482    6.0851482    4.5574151     1.527733 0.0014387438 -0.019669271    4.5756457 
+   80480    20.231992    1.0172231    23.785135    6.0892819    4.5639559     1.525326 0.0015592163 -0.020428916    4.5828256 
+   80490    19.925828    1.0083999    23.835383    6.0696989    4.5576033    1.5120956 0.0016939435 -0.021412888    4.5773222 
+   80500    20.290494    1.0285047    23.855765    6.0766168     4.534374    1.5422428 0.0018485762 -0.022042133    4.5545676 
+   80510    19.781773    1.0334104    23.758841    6.0935845    4.5439856    1.5495989 0.0018027982  -0.02192784    4.5641107 
+   80520     19.90069    1.0430136     23.94562    6.1108726    4.5468737    1.5639989 0.0019030129 -0.022395946    4.5673667 
+   80530    20.265305    1.0189814    23.842154    6.0640209    4.5360582    1.5279627 0.0019030652 -0.022711287    4.5568664 
+   80540    20.212556    1.0297549    24.099659    6.0687135     4.524596    1.5441175  0.001901164 -0.022872907    4.5455677 
+   80550    20.171156    1.0154543    23.616506     6.064247    4.5415734    1.5226737  0.001824525 -0.022668066    4.5624169 
+   80560    20.135902    1.0131851    23.507019    6.0573559    4.5380848    1.5192711 0.0019756392 -0.023616601    4.5597258 
+   80570    20.306899    1.0186561    23.699513    6.0759027    4.5484279    1.5274748 0.0019830351 -0.023617997    4.5700629 
+   80580    20.439688    1.0268804    24.099632    6.0512682    4.5114611    1.5398071 0.0017277951 -0.022212028    4.5319453 
+   80590    20.663185     1.012833     23.75481    6.0678092    4.5490661    1.5187431 0.0015926209 -0.021573347    4.5690468 
+   80600    20.455264    1.0150585    23.730068    6.0622049    4.5401247    1.5220803 0.0016598632 -0.021660478    4.5601253 
+   80610    20.062118    1.0259221    23.794261    6.0553604    4.5169902    1.5383703 0.0014454618 -0.020600123    4.5361448 
+   80620    19.981752    1.0034593    23.580999    6.0464719    4.5417847    1.5046872  0.001276749 -0.019886506    4.5603945 
+   80630    20.129139    1.0230855    23.700583    6.0423428    4.5082261    1.5341167 0.0012125415 -0.019514304    4.5265278 
+   80640    19.779734   0.99648176    23.652569     6.030498    4.5362736    1.4942244 0.0011867159 -0.019156286    4.5542432 
+   80650    20.007062    1.0033889    23.810041    6.0221343    4.5175527    1.5045816  0.001336529 -0.019160882     4.535377 
+   80660    20.183115     1.002535     23.63609    6.0178631    4.5145619    1.5033012 0.0012992381 -0.018217307      4.53148 
+   80670    20.070498    1.0067868    23.920395    6.0427732    4.5330963    1.5096769  0.001399196 -0.018144451    4.5498416 
+   80680     20.09105    1.0019204    23.552635    6.0603216    4.5579421    1.5023796 0.0012864507 -0.017894162    4.5745498 
+   80690    19.913989   0.99397375    23.688544    6.0405594    4.5500958    1.4904636  0.001206264 -0.017804472     4.566694 
+   80700    20.065046    1.0058807    23.872153    6.0375823    4.5292642    1.5083181 0.0012349105 -0.018284089    4.5463134 
+   80710    19.753784    1.0139603    23.599223    6.0470726    4.5266392    1.5204334 0.0015311304 -0.019936365    4.5450444 
+   80720    19.366168    1.0053157    23.754268    6.0386803    4.5312095    1.5074708 0.0017542134 -0.021175785    4.5506311 
+   80730    20.236543    1.0123555    23.516188    6.0352614    4.5172343    1.5180271  0.001769304 -0.021142247    4.5366072 
+   80740    20.273054     0.998073    23.679396    6.0330498    4.5364393    1.4966105 0.0015240526 -0.020247165    4.5551624 
+   80750    20.200468    1.0061008    23.498916    6.0483564    4.5397084    1.5086481 0.0012236926  -0.01910691    4.5575916 
+   80760    20.147708    1.0073798    23.840509    6.0379333    4.5273672     1.510566 0.0011200977 -0.018721152    4.5449683 
+   80770    20.313388    1.0026429    23.669985    6.0500709    4.5466078     1.503463 0.0010882768  -0.01833884    4.5638584 
+   80780    20.362206    1.0178787     23.85688    6.0561879    4.5298788    1.5263091 0.0011170213 -0.018218484    4.5469802 
+   80790    20.179682   0.98728507     23.45743    6.0178786    4.5374446     1.480434 0.0010319887 -0.017871421    4.5542841 
+   80800    20.248366   0.98696617    23.407112    6.0170115    4.5370557    1.4799558 0.00099260917 -0.018001072    4.5540642 
+   80810    20.209921    0.9999912    23.794463    6.0205552    4.5210684    1.4994868 0.0012181302  -0.01912992    4.5389802 
+   80820     20.10717    0.9964804    23.620525    6.0189242    4.5247019    1.4942224 0.0011600685 -0.018606089    4.5421479 
+   80830    20.276525    0.9846726    23.550571    6.0028864    4.5263698    1.4765166 0.0011491819 -0.018426361     4.543647 
+   80840    20.258741   0.99037029     23.66281    6.0078264    4.5227662    1.4850603 0.0013027586 -0.019051949    4.5405153 
+   80850    20.064143   0.98528591    23.476306    5.9960266    4.5185904    1.4774362 0.0014527008 -0.020033771    4.5371714 
+   80860    20.251431   0.99268175    23.417106    5.9919312    4.5034049    1.4885263 0.0015052506  -0.02084226    4.5227419 
+   80870    20.388011   0.99246403    23.648552    6.0079902    4.5197903    1.4881998 0.0014223967 -0.020684066     4.539052 
+   80880    20.257359    1.0001223    23.881688    6.0148011    4.5151176    1.4996835  0.001303495 -0.020014067    4.5338282 
+   80890    20.203189    1.0015694    23.895175    5.9975229    4.4956695    1.5018533  0.001137871 -0.019255042    4.5137867 
+   80900    20.028394    1.0052167    23.520951    6.0172821    4.5099596    1.5073225   0.00118112 -0.019478548    4.5282571 
+   80910    20.113188    1.0171682    23.793812    6.0642363    4.5389925    1.5252437 0.0013954183 -0.020589419    4.5581865 
+   80920    20.269509    1.0104655    23.893515    6.0617969    4.5466039     1.515193 0.0015050906 -0.021494052    4.5665928 
+   80930    20.225468    1.0170197    23.834875     6.051134     4.526113     1.525021  0.001492525 -0.021338175    4.5459587 
+   80940    20.145514    1.0009849    23.618427    6.0581246    4.5571478    1.5009768 0.0015939942 -0.021770344    4.5773241 
+   80950    20.033225    1.0086698    23.661029     6.071703    4.5592026    1.5125004 0.0017646966 -0.022516513    4.5799544 
+   80960     20.32443    1.0268928    23.822429    6.0725754    4.5327497    1.5398257 0.0019053421 -0.023127831    4.5539722 
+   80970    20.334898    1.0004965    23.833987     6.058632    4.5583875    1.5002445 0.0019638254  -0.02285304    4.5792767 
+   80980    20.296827    1.0217681    23.870086    6.0577754    4.5256341    1.5321413 0.0020082093 -0.022934012    4.5465599 
+   80990    19.789152    1.0224567    23.620202     6.076954    4.5437802    1.5331738  0.002092921 -0.023377545    4.5650648 
+   81000    20.166825    1.0361276    23.849849    6.0776996    4.5240262    1.5536733  0.001886008  -0.02242462    4.5445649 
+   81010    20.307985    1.0303158    23.621153    6.0753222    4.5303636    1.5449585 0.0015428074  -0.02061124    4.5494321 
+   81020    20.501708    1.0099679    23.707094    6.0572537    4.5428068    1.5144469 0.0014618253 -0.020349749    4.5616947 
+   81030    20.370226    1.0211481    23.616345    6.0535585    4.5223469    1.5312116 0.0014966155 -0.020706044    4.5415563 
+   81040    20.309594    1.0088905    23.633763    6.0605455    4.5477141    1.5128313  0.001494012 -0.020613323    4.5668335 
+   81050    20.400842    1.0029375    23.805234    6.0413547    4.5374498    1.5039048 0.0015323079 -0.020814933    4.5567325 
+   81060    20.121723   0.98026469    23.757879    6.0130432    4.5431363    1.4699069 0.0016888094 -0.021533225    4.5629807 
+   81070     20.35474    1.0011242    23.616373    6.0208991    4.5197134    1.5011857 0.0016773492 -0.021657918     4.539694 
+   81080    20.111075    1.0014244    23.800279    6.0273864    4.5257504    1.5016359 0.0015303957 -0.021178465    4.5453985 
+   81090    20.374616    1.0038865    23.592617    6.0478393    4.5425116    1.5053278 0.0015551825 -0.020860949    4.5618173 
+   81100    20.311644    1.0034105    23.406554    6.0335573    4.5289433     1.504614 0.0015862955 -0.020656014     4.548013 
+   81110    20.244435    1.0132807    23.962251    6.0341895    4.5147752    1.5194143 0.0016856947 -0.021756982    4.5348465 
+   81120    20.004188     1.039809    24.133397    6.0787716    4.5195779    1.5591936 0.0018404184 -0.022713886    4.5404514 
+   81130    20.318008     1.019426    23.774293    6.0950127    4.5663833    1.5286293 0.0018697356 -0.023087969    4.5876016 
+   81140    20.340013    1.0340788    23.895457    6.0777011    4.5270998    1.5506012 0.0018704041 -0.023376141    4.5486056 
+   81150    19.955189    1.0212423     23.71038    6.0831973    4.5518445    1.5313528 0.0018278004  -0.02335994    4.5733766 
+   81160    20.240855    1.0205702    23.754608    6.0583903    4.5280453     1.530345 0.0018005979 -0.022996006    4.5492407 
+   81170    19.985333   0.99208798     23.80701    6.0258085    4.5381725    1.4876359 0.0017595567  -0.02268202     4.559095 
+   81180    20.232778    1.0113788    23.846098    6.0251252    4.5085628    1.5165624 0.0017840396    -0.022471    4.5292498 
+   81190     20.28829   0.98654464    23.692608    6.0129935    4.5336698    1.4793237 0.0017795664 -0.022179551    4.5540698 
+   81200    20.315979   0.99023674    23.548216     6.013938     4.529078      1.48486 0.0018022107 -0.022048368    4.5493241 
+   81210    20.056364   0.98747201    23.604399    6.0273412    4.5466269    1.4807143 0.0018715905 -0.021862587    4.5666179 
+   81220    20.348566    1.0150882    24.016916    6.0584491    4.5363244    1.5221247 0.0017516102 -0.021461139    4.5560339 
+   81230     20.33562    1.0122288     24.03992    6.0677919    4.5499548    1.5178371 0.0015384389 -0.020133609      4.56855 
+   81240    20.136978    1.0272295    23.698914    6.0865273    4.5461967    1.5403306 0.0015216827 -0.019453798    4.5641288 
+   81250    19.897125    1.0189868    23.707322    6.0773042    4.5493334    1.5279708 0.0015457037 -0.019705429    4.5674931 
+   81260    20.032845    1.0274147     23.86421    6.0997369    4.5591286    1.5406083 0.0013932752 -0.018995038    4.5767304 
+   81270    20.229283    1.0060691    23.802013    6.0744803    4.5658797    1.5086006 0.0012115977 -0.018318075    4.5829862 
+   81280    20.078121    1.0259031    23.954416    6.0620227     4.523681    1.5383416 0.0011485271 -0.018479709    4.5410122 
+   81290    20.248255   0.99822697    23.602651    6.0390957    4.5422543    1.4968413 0.0012324729 -0.019169939    4.5601918 
+   81300    20.252944    1.0161762    23.685669     6.059038    4.5352817    1.5237562 0.0014605615 -0.020434581    4.5542558 
+   81310    20.143385    1.0010105    23.689492    6.0425093    4.5414941    1.5010152 0.0016204019 -0.020909402    4.5607831 
+   81320    20.059556    1.0260634    23.898056    6.0722947    4.5337125    1.5385821 0.0016896983 -0.021576837    4.5535997 
+   81330    20.284704    1.0158693     23.88706    6.0528351    4.5295391     1.523296 0.0015041224  -0.02114875    4.5491837 
+   81340    20.009605   0.99277683    23.740276    6.0487918     4.560123    1.4886689 0.0016149306 -0.021536348    4.5800444 
+   81350    20.318913    1.0053321     23.68887    6.0435529    4.5360574    1.5074955 0.0018182514 -0.022354489    4.5565936 
+   81360    20.244388    1.0149068    23.906844    6.0651743    4.5433215    1.5218528 0.0017180634 -0.022022446    4.5636258 
+   81370     20.32941      1.00869    23.861835    6.0524481    4.5399175    1.5125306 0.0016123564 -0.021873842     4.560179 
+   81380    20.425916    1.0146657    23.821159    6.0660668    4.5445756    1.5214911 0.0017334549 -0.022289049    4.5651312 
+   81390    20.220907    1.0295297    23.694689    6.0722278     4.528448    1.5437799 0.0017247922 -0.022489281    4.5492125 
+   81400    20.312109    1.0251564    24.031048     6.076854     4.539632     1.537222 0.0017971192 -0.022862828    4.5606977 
+   81410    20.081639    1.0000845    23.642032    6.0303876    4.5307608    1.4996268 0.0015329584 -0.021159223    4.5503871 
+   81420    20.216754   0.99994986    23.798912    6.0238292    4.5244043    1.4994248 0.0013848545 -0.020589152    4.5436086 
+   81430    19.883392    1.0020747    23.688555    6.0399998    4.5373887    1.5026111  0.001536808 -0.021587363    4.5574393 
+   81440    19.877661   0.99978947    23.573576    6.0224598    4.5232755    1.4991843  0.001642852 -0.022105406     4.543738 
+   81450    19.945575   0.98813153    23.442564    6.0312509    4.5495477    1.4817032 0.0017639909 -0.022764369    4.5705481 
+   81460    20.145952    1.0040888    23.679917    6.0288131     4.523182    1.5056311 0.0017495729 -0.022386123    4.5438185 
+   81470    20.277953    1.0000359    23.916313    6.0384946    4.5389408    1.4995538 0.0017256433 -0.022300539    4.5595157 
+   81480    20.023447    0.9856971     23.36311    6.0372161    4.5591633    1.4780528 0.0017224909 -0.022173807    4.5796146 
+   81490     20.26099    1.0012611    23.638412    6.0483947    4.5470036     1.501391 0.0017663355 -0.022183806    4.5674211 
+   81500    20.148143    1.0123976    23.860307    6.0542711    4.5361809    1.5180902 0.0017710891 -0.022016623    4.5564265 
+   81510    20.241176     1.015572    23.500704    6.0525501    4.5296998    1.5228502 0.0017992514 -0.022040608    4.5499412 
+   81520    20.286063    1.0243212    23.839708    6.0434115    4.5074418    1.5359697 0.0017834752 -0.021474797    4.5271332 
+   81530    20.473139     1.049318    23.888387    6.0797386    4.5062863    1.5734524 0.0016978474 -0.021215404    4.5258038 
+   81540     20.27606    1.0131328    23.671381    6.0666108    4.5474182    1.5191926 0.0016548031   -0.0214218    4.5671852 
+   81550    20.215611     1.028031    23.946839    6.0631533    4.5216208    1.5415325 0.0017268771 -0.021849282    4.5417432 
+   81560      19.8557    1.0321753    23.690587    6.0956513    4.5479044    1.5477468 0.0016818437 -0.021779636    4.5680022 
+   81570    20.198444    1.0300184    23.694315    6.1007477    4.5562352    1.5445125 0.0016169362 -0.021514825    4.5761331 
+   81580    20.324583    1.0578487    23.971923    6.1068302     4.520586    1.5862442 0.0015066666 -0.020877257    4.5399566 
+   81590    20.309187    1.0488463     23.75532    6.1002599    4.5275149    1.5727451 0.0015994982 -0.021130561    4.5470459 
+   81600    19.929478    1.0294725    23.832824    6.0903271     4.546633    1.5436941 0.0016037314 -0.020543581    4.5655728 
+   81610    20.094663    1.0260459    24.045925    6.0763469    4.5377911    1.5385558 0.0017719575 -0.021488385    4.5575075 
+   81620     19.97145    1.0252272    23.753605    6.0747247    4.5373965    1.5373282 0.0019219068  -0.02247296    4.5579476 
+   81630    20.272932   0.99982031    23.936639    6.0632787    4.5640482    1.4992306 0.0020060274 -0.022974935    4.5850171 
+   81640    19.775454    1.0293202    23.518816    6.0750548    4.5315892    1.5434657 0.0019112644  -0.02270045    4.5523783 
+   81650    20.221162    1.0259552    23.688387    6.0631684    4.5247486    1.5384198 0.0018387804 -0.022586116    4.5454959 
+   81660    20.379892    1.0228745    23.809755    6.0765023    4.5427019    1.5338004 0.0019521075 -0.023079367    4.5638292 
+   81670    20.288419    1.0382417    23.656593    6.0832112    4.5263678    1.5568434 0.0020379215 -0.023052192    4.5473821 
+   81680    20.163849    1.0485955    23.902384    6.0895641    4.5171951     1.572369 0.0020550282 -0.023148674    4.5382887 
+   81690    20.465332    1.0291833    23.681563    6.0878265    4.5445662    1.5432603 0.0020858912 -0.023421415    4.5659017 
+   81700     20.59926    1.0280377    24.141291    6.0709308    4.5293883    1.5415425 0.0022745526 -0.024786163    4.5518999 
+   81710    20.447702    1.0266613    23.720847     6.067952    4.5284734    1.5394786 0.0023476597 -0.025492498    4.5516182 
+   81720    20.274456    1.0009955    23.788209    6.0678818    4.5668891    1.5009927 0.0023133742 -0.025308499    4.5898842 
+   81730    20.055588    1.0172336    23.805675    6.0478269    4.5224851    1.5253418 0.0021970895 -0.024703805    4.5449918 
+   81740     20.28652      1.02751    23.665501    6.0679273    4.5271761    1.5407512 0.0019940403 -0.023608771    4.5487908 
+   81750    19.974096    1.0230121    23.901696    6.0679122    4.5339056    1.5340067 0.0018708669 -0.022604454    4.5546391 
+   81760    19.839737    1.0128323    23.793723    6.0407732    4.5220311    1.5187421 0.0017220719 -0.021802843    4.5421119 
+   81770    20.226457    1.0057008    23.380604    6.0526891    4.5446408    1.5080483 0.0017649018 -0.022417146     4.565293 
+   81780    20.349378   0.99781353    23.628338    6.0293932    4.5331718    1.4962214 0.0018755055   -0.0231364    4.5544327 
+   81790    20.293471    1.0261964    23.803397    6.0442615      4.50548    1.5387815 0.0020902591 -0.024027028    4.5274167 
+   81800    19.927273   0.99653319    23.741321    6.0452008    4.5508992    1.4943015 0.0021568198 -0.024122054    4.5728645 
+   81810    20.380794    1.0023567    23.713969    6.0455762    4.5425424    1.5030338 0.0020378064 -0.023687223    4.5641918 
+   81820    20.398714    1.0132609    23.549718    6.0216923    4.5023075    1.5193848 0.0019898108 -0.023358022    4.5236757 
+   81830     20.04797   0.99588286    23.565054    6.0280384    4.5347121    1.4933263 0.0020632563 -0.023516503    4.5561653 
+   81840    19.978225    1.0000052    23.788431     6.028624    4.5291162    1.4995078 0.0021828427 -0.023881857    4.5508152 
+   81850    20.265029    1.0008431    23.549606    6.0315212    4.5307569    1.5007643   0.00209362 -0.023443295    4.5521066 
+   81860    20.188409   0.99914409    23.822696    6.0210405    4.5228239    1.4982166 0.0019674368 -0.023178344    4.5440348 
+   81870    20.265316    1.0172812    23.827573    6.0410164    4.5156032    1.5254131 0.0018751301 -0.023161732    4.5368898 
+   81880    20.244612    0.9962517    23.720731    6.0302533    4.5363739    1.4938794 0.0017767668 -0.022468502    4.5570656 
+   81890    20.077113    1.0148965    23.671019    6.0343239    4.5124865    1.5218374 0.0015378028 -0.021465968    4.5324147 
+   81900    20.081635   0.99230466    23.796044    6.0305833    4.5426225    1.4879608 0.0012289782  -0.02033959    4.5617331 
+   81910    20.183144    1.0081106    23.866471    6.0161564    4.5044945    1.5116619 0.0011527703 -0.019997932    4.5233397 
+   81920    19.857799   0.99612731    23.973148    6.0298604    4.5361675    1.4936929 0.0011411019 -0.019962383    4.5549888 
+   81930    19.846691    1.0032014    23.696753    6.0184802    4.5141797    1.5043005 0.0011215551 -0.019870482    4.5329287 
+   81940    20.339774   0.98796372    23.530453    6.0065886     4.525137    1.4814516 0.0010688195 -0.019614873     4.543683 
+   81950    20.329074   0.99458798    23.737949    6.0069572    4.5155726    1.4913847 0.0013856302 -0.021039216    4.5352261 
+   81960    20.185081   0.97917385    23.491041    5.9891853    4.5209141    1.4682712 0.0016302294 -0.022082329    4.5413662 
+   81970    20.381547   0.99952861    23.662116    6.0088097    4.5100165    1.4987931 0.0018242061 -0.022765543    4.5309579 
+   81980    20.468928   0.98421697    23.708726      6.01381    4.5379766    1.4758334 0.0019889928  -0.02360188    4.5595895 
+   81990    20.317514    1.0008382    23.801988    6.0179131    4.5171562    1.5007569 0.0019591374 -0.023736219    4.5389333 
+   82000    20.187634    1.0016471    23.827559    6.0187705    4.5168007    1.5019699 0.0019660407 -0.023566746    4.5384014 
+   82010    20.149369   0.99291842     23.47085    6.0205957    4.5317145    1.4888812 0.0020420945 -0.023285311    4.5529577 
+   82020    20.281927    1.0062751    23.826833    6.0281724    4.5192629    1.5089095 0.0021347185 -0.023511649    4.5406398 
+   82030    20.325697    1.0032994    23.638472    6.0370764    4.5326288    1.5044475 0.0021203599 -0.023360189    4.5538687 
+   82040    19.973464   0.99645117    23.771964    6.0338634    4.5396849    1.4941785 0.0017807074 -0.021779236    4.5596834 
+   82050    20.306469   0.99490166    23.750535    6.0130823    4.5212272     1.491855 0.0016595078 -0.020962969    4.5405307 
+   82060    20.451372   0.98700996    23.507368    6.0140412    4.5340198    1.4800214 0.0016727847 -0.021254766    4.5536018 
+   82070    19.844665   0.96805007    23.977382    5.9822785    4.5306874    1.4515911 0.0017722308 -0.021713944    4.5506292 
+   82080    19.330731    0.9875473    23.482162    6.0023402     4.521513    1.4808272 0.0017170531 -0.021198575    4.5409945 
+   82090    19.945016   0.98940832    24.050397    6.0049875    4.5213697    1.4836178 0.0017789408 -0.021814231     4.541405 
+   82100     20.36962   0.98469558    23.644406    6.0440772    4.5675262     1.476551 0.0018224764 -0.022301276     4.588005 
+   82110    19.925208     1.011506    23.897924     6.050111    4.5333578    1.5167532 0.0016401063 -0.021117761    4.5528354 
+   82120    20.372005    1.0020406     23.66534    6.0336131    4.5310532    1.5025599   0.00183658 -0.021919247    4.5511359 
+   82130     20.33232    1.0105415    24.146235     6.031338    4.5160311    1.5153069 0.0017898277 -0.022313733     4.536555 
+   82140    20.278543   0.99441815    23.498516    6.0232202    4.5320901      1.49113 0.0019092089 -0.023175007    4.5533559 
+   82150    19.923079    1.0078788    23.624036    6.0314373     4.520123    1.5113142 0.0021091204 -0.024502073     4.542516 
+   82160    19.582018    1.0047903    23.555209    6.0561178    4.5494348    1.5066831 0.0021530466 -0.024745913    4.5720276 
+   82170    20.073645    1.0231105      23.6295     6.047871    4.5137168    1.5341542 0.0020902537 -0.024375916    4.5360024 
+   82180    19.916881    1.0167426    23.548038    6.0620669    4.5374613    1.5246055 0.0020779119 -0.023973275    4.5593567 
+   82190    20.364151    1.0313073    23.654631     6.103205    4.5567597    1.5464453 0.0019133878 -0.023006997    4.5778533 
+   82200     20.15101    1.0513302    23.811569    6.0937787    4.5173092    1.5764696  0.001793568 -0.022569145    4.5380847 
+   82210    19.755842    1.0235146    23.620455    6.0753237    4.5405636    1.5347601 0.0015057193 -0.021094634    4.5601525 
+   82220    19.588889    1.0184026    23.617908    6.0851359    4.5580413    1.5270946 0.0015523628 -0.021216903    4.5777058 
+   82230    19.938809    1.0497136    23.900828    6.0888177    4.5147721    1.5740456 0.0017292943 -0.021971208     4.535014 
+   82240    20.397779    1.0279634     23.54678    6.0644544    4.5230233    1.5414311 0.0017273154 -0.021732426    4.5430284 
+   82250    20.422853    1.0103292    23.728879    6.0454798    4.5304912    1.5149886 0.0016121623  -0.02090279    4.5497818 
+   82260    20.176405    1.0197099    23.694447     6.049571     4.520516     1.529055 0.0013821989 -0.020025709    4.5391595 
+   82270    20.110837    1.0010453    23.791169    6.0350085    4.5339411    1.5010674 0.0015192115 -0.020179061    4.5526009 
+   82280    20.274698    1.0128831    23.847481    6.0504408    4.5316227    1.5188182  0.001576079 -0.020740061    4.5507866 
+   82290    20.037905     1.015842    23.919787    6.0491037    4.5258486     1.523255 0.0018338864 -0.022349032    4.5463638 
+   82300    20.420099    1.0126792    23.779926    6.0642489    4.5457365    1.5185124  0.001744535 -0.022116885    4.5661088 
+   82310    20.297159    1.0193714    23.679065    6.0474175      4.51887    1.5285475 0.0015561045 -0.021006739    4.5383206 
+   82320    20.115746    1.0143239    23.778556    6.0575303    4.5365516    1.5209787 0.0016039559 -0.020894477    4.5558422 
+   82330    20.376668    1.0094715    23.765455      6.07216    4.5584575    1.5137025 0.0015604698 -0.020305148    4.5772022 
+   82340    20.392733    1.0309524    23.769175    6.0741865    4.5282734    1.5459132 0.0017170346 -0.020633778    4.5471901 
+   82350    20.191597    1.0056251    23.752408    6.0427521    4.5348173    1.5079348 0.0016701713 -0.020287407    4.5534346 
+   82360    20.173293     1.002539    23.770622    6.0493428    4.5460355    1.5033073 0.0015031147 -0.019115671     4.563648 
+   82370    20.092451    1.0102514    23.867113    6.0565921    4.5417201    1.5148719 0.0014365419 -0.018491746    4.5587753 
+   82380    19.862742    1.0016495    23.667691    6.0410341    4.5390606    1.5019735 0.0015119185 -0.018905984    4.5564547 
+   82390    20.378577    1.0152385    23.646105    6.0682969    4.5459469    1.5223501 0.0015424749 -0.019542818    4.5639472 
+   82400    20.275469    1.0300361    23.785591    6.0783166    4.5337774    1.5445391 0.0016519207 -0.020622792    4.5527483 
+   82410    20.369694    1.0141061     23.88754    6.0683461    4.5476941    1.5206521 0.0016190678 -0.020911682    4.5669867 
+   82420    20.621514   0.97917499     23.87621    6.0067732    4.5385003    1.4682729 0.0014747781 -0.020111265    4.5571368 
+   82430    20.346498   0.99732903    23.865794    6.0170992    4.5216043    1.4954949 0.0014532305 -0.020018064    4.5401691 
+   82440    20.313402    1.0140509    23.978719    6.0372494    4.5166801    1.5205693 0.0015926832 -0.020852029    4.5359395 
+   82450    20.320589    1.0096324    23.642088    6.0508298     4.536886    1.5139437 0.0019485829 -0.022793728    4.5577312 
+   82460    20.192175   0.99527101    23.482452    6.0269349    4.5345261    1.4924089 0.0019773811 -0.023089012    4.5556377 
+   82470    20.371251     1.006078    23.656003    6.0566225    4.5480085     1.508614 0.0017129497 -0.022212906    4.5685084 
+   82480    20.295588   0.99374447    23.763131    6.0188508    4.5287309    1.4901198 0.0016690762 -0.022174849    4.5492367 
+   82490    19.965146   0.98906069    23.506114     6.007041    4.5239444    1.4830965 0.0016714099 -0.022509127    4.5447822 
+   82500     20.25685   0.98436069    23.871196    6.0378342    4.5617853    1.4760489 0.0017179164 -0.022489222    4.5825566 
+   82510    20.063769    1.0164131    23.617209    6.0650358    4.5409243    1.5241115 0.0016478151 -0.022427402    4.5617039 
+   82520    20.339327    1.0160662    23.504625    6.0482516    4.5246604    1.5235912 0.0016007204  -0.02238966    4.5454493 
+   82530    20.470212    1.0009804    23.720068    6.0220565    4.5210865    1.5009701 0.0015390925 -0.022161293    4.5417087 
+   82540    20.452967    1.0076571    23.630548     6.054613    4.5436311    1.5109818 0.0014476037 -0.021590787    4.5637743 
+   82550    20.012595   0.99450011    23.422666    6.0397699     4.548517    1.4912529 0.0014004933 -0.021389587    4.5685061 
+   82560    20.191013   0.99121663    23.650816    6.0310046    4.5446753    1.4863293 0.0014423597  -0.02126618    4.5644991 
+   82570    20.145429    1.0061084    23.760607    6.0482322    4.5395726    1.5086596 0.0014297934 -0.021153568    4.5592964 
+   82580    19.936221    1.0053089    23.824619    6.0485254    4.5410647    1.5074607  0.001312641 -0.020807442    4.5605595 
+   82590    20.020633    1.0157025    23.911625    6.0373394    4.5142935    1.5230459 0.0013202544  -0.02070642    4.5336797 
+   82600    20.122971    0.9992479    24.156168    6.0227027    4.5243305    1.4983722 0.0012915116 -0.020603454    4.5436424 
+   82610    19.935341   0.99235099    23.544014    6.0199283     4.531898    1.4880303 0.0013760689 -0.020764357    4.5512863 
+   82620    20.343534   0.99516422    23.618192    6.0248496    4.5326009    1.4922487 0.0014489069 -0.020475639    4.5516276 
+   82630    20.102202     1.002208    23.584983    6.0336158    4.5308048    1.5028109 0.0015187909 -0.020617826    4.5499039 
+   82640    20.125881    1.0084461    23.986063    6.0542038    4.5420388     1.512165 0.0014677731  -0.02046472    4.5610358 
+   82650    20.427794    1.0026219    23.485561    6.0341801    4.5307486    1.5034315 0.0013727484 -0.020514282    4.5498902 
+   82660    20.072031    1.0146515    23.610905    6.0478603    4.5263904    1.5214699  0.001287024 -0.020369955    4.5454733 
+   82670    20.288046     1.016483    23.721412    6.0535924    4.5293761    1.5242163 0.0013408082  -0.02043234    4.5484676 
+   82680     20.16665    1.0001595    23.812739    6.0332677    4.5335286    1.4997392 0.0014808874 -0.021073185    4.5531209 
+   82690    20.380046    1.0063511    23.537018    6.0339933    4.5249697    1.5090235 0.0015617944  -0.02119167    4.5445996 
+   82700    20.257551    1.0213751    23.851198    6.0646833    4.5331312     1.531552 0.0014076571 -0.020326919    4.5520505 
+   82710    20.208783    1.0110219    23.706268    6.0873545    4.5713272    1.5160273  0.001200468 -0.019491942    4.5896186 
+   82720    20.418201   0.99721722    24.006301    6.0583675    4.5630403    1.4953272 0.0012923411 -0.019805192    4.5815532 
+   82730    20.314924    1.0090607    23.659547    6.0547898    4.5417032    1.5130866 0.0014194217 -0.020069903    4.5603537 
+   82740    19.979472    1.0299802    23.778954    6.1033739    4.5589186    1.5444553 0.0014340428 -0.020247006    4.5777315 
+   82750    20.258975    1.0311086    24.117266    6.1093092    4.5631618    1.5461474 0.0013617245 -0.020535592    4.5823357 
+   82760    20.248905    1.0242807    23.962829     6.100578     4.564669     1.535909 0.0012861666 -0.019977592    4.5833605 
+   82770    20.041997    1.0378419    23.727581     6.087675    4.5314311     1.556244 0.0014543455 -0.021103343    4.5510801 
+   82780    20.331378    1.0243532    23.785927    6.0788565    4.5428389    1.5360176 0.0016680372 -0.022312938    4.5634838 
+   82790    20.079224    1.0297478    23.822275    6.0732289    4.5291221    1.5441069 0.0016481774 -0.022051867    4.5495258 
+   82800    20.430686    1.0112748    23.328158    6.0490674    4.5326609    1.5164065 0.0016930783 -0.022454373    4.5534222 
+   82810    20.144959    0.9950472     23.58083    6.0245822    4.5325089    1.4920733  0.001637409  -0.02213716    4.5530087 
+   82820    20.163197   0.99814425    23.571838    6.0206715    4.5239542    1.4967173 0.0016563474 -0.021885917    4.5441838 
+   82830    20.189566    1.0192616    23.738856    6.0353946    4.5070119    1.5283827 0.0017052204 -0.022021308     4.527328 
+   82840    20.132281   0.99789635     23.63514    6.0301485     4.533803    1.4963456 0.0016565444 -0.021824868    4.5539713 
+   82850    20.259733   0.99630128    23.924632    6.0273985    4.5334448    1.4939538 0.0015248353 -0.021240113      4.55316 
+   82860    20.016078   0.99488812    23.798647    6.0116578    4.5198231    1.4918347 0.0016181406 -0.021713951    4.5399189 
+   82870    20.222665   0.99704939    23.701742    6.0117033    4.5166278    1.4950756 0.0016449348  -0.02161689    4.5365997 
+   82880    20.260993   0.99541328    23.708858    6.0212794    4.5286572    1.4926222 0.0016076896  -0.02156676    4.5486163 
+   82890    20.139735   0.99792163    23.691705    6.0032169    4.5068334    1.4963835 0.0016517354 -0.021794282     4.526976 
+   82900    20.335839    1.0130562    23.642851    6.0268948    4.5078171    1.5190778 0.0016782831 -0.021850374    4.5279891 
+   82910    20.229761     1.004789    23.782623    6.0226447    4.5159636    1.5066811 0.0016196411 -0.021581362    4.5359253 
+   82920    20.461859    1.0035653    23.991219    6.0243114    4.5194653    1.5048461 0.0017666808 -0.022197616    4.5398962 
+   82930    20.337108    1.0002321    23.658378    6.0337232    4.5338752     1.499848 0.0020060458 -0.022923435    4.5547926 
+   82940    19.808713   0.98902895    23.745661    6.0413861    4.5583372    1.4830489 0.0021212934 -0.023600212    4.5798161 
+   82950    20.420182    1.0081585    23.776252    6.0455616     4.533828    1.5117336 0.0021263596 -0.023954213    4.5556558 
+   82960    19.789083    1.0168474    23.904954    6.0492129    4.5244502    1.5247627 0.0019937059 -0.023218649    4.5456751 
+   82970     19.91605    1.0124005    23.920425    6.0512943    4.5331998    1.5180946 0.0018366118 -0.022308013    4.5536712 
+   82980    20.277286    0.9840871    23.863364    6.0255193    4.5498807    1.4756386 0.0018271615 -0.021987518     4.570041 
+   82990    20.492829     1.003455    23.697572    6.0294251    4.5247444    1.5046807  0.001921392 -0.022860581    4.5456836 
+   83000    20.413246   0.99876495    23.532769    6.0305243    4.5328762     1.497648 0.0021022546 -0.023578891    4.5543528 
+   83010    20.444573   0.99906264    23.426425    6.0479307    4.5498363    1.4980944 0.0020184218 -0.023467668    4.5712855 
+   83020    20.340875    1.0042369    23.890083    6.0416267    4.5357735    1.5058532  0.002157886  -0.02397434      4.55759 
+   83030    20.476008     1.028695    23.843897    6.0898333    4.5473051    1.5425282   0.00231218 -0.024623646    4.5696166 
+   83040     20.41667    1.0208432    23.758201    6.0729068    4.5421524    1.5307544 0.0020769621 -0.022929712    4.5630052 
+   83050    20.176768    1.0215815    23.591147    6.0742667    4.5424053    1.5318614 0.0019141045 -0.022127638    4.5626189 
+   83060    20.295573    1.0326832    23.560362    6.0502612    4.5017528    1.5485084 0.0020251382  -0.02250419    4.5222318 
+   83070    20.360841   0.98901073    23.960855    6.0263266     4.543305    1.4830216   0.00202614 -0.022423424    4.5637023 
+   83080     20.44144   0.99947597    24.038239    6.0309833    4.5322691    1.4987142  0.001777384 -0.021074833    4.5515665 
+   83090    20.206272    1.0177509    23.473867    6.0655155     4.539398    1.5261174 0.0017191801 -0.021266006    4.5589449 
+   83100    20.072663     1.000343    23.666542    6.0681009    4.5680866    1.5000143 0.0017321726 -0.021935165    4.5882896 
+   83110    20.215837    1.0194295     23.71844    6.0722258    4.5435913    1.5286345 0.0015491998 -0.021105494    4.5631476 
+   83120    20.034907    1.0307305    23.386426    6.0623202    4.5167398    1.5455805 0.0014249313 -0.020645457    4.5359603 
+   83130    19.986427    1.0187432    23.628937    6.0711854      4.54358    1.5276054 0.0013933567 -0.020783813    4.5629705 
+   83140    19.958405    1.0295024    23.517788    6.0840796    4.5403408    1.5437388 0.0016036526 -0.021688162    4.5604253 
+   83150    20.262842    1.0323301     23.78815    6.0773526    4.5293736     1.547979 0.0016441978 -0.021787119    4.5495165 
+   83160    20.433834    1.0217505     23.74017     6.083584    4.5514691    1.5321149 0.0015782892 -0.021354948    4.5712458 
+   83170    20.019833    1.0185438    23.793037    6.0744441    4.5471377    1.5273064 0.0014618679 -0.021137077    4.5668129 
+   83180     20.15602    1.0196632    23.684643    6.0801661    4.5511811    1.5289849 0.0015856416 -0.021122291    4.5707178 
+   83190    20.179173    1.0335187      23.6039     6.090878    4.5411168    1.5497613 0.0014685856 -0.020057867     4.559706 
+   83200    20.156584    1.0198751    23.729659    6.0718471    4.5425445    1.5293027 0.0014671486 -0.019765545    4.5608429 
+   83210     20.26374    1.0151022    23.476468    6.0475237     4.525378    1.5221457 0.0016173912 -0.020152797    4.5439134 
+   83220    20.069079   0.99925117    23.700875    6.0318753    4.5334982    1.4983771 0.0017515711 -0.021200533    4.5529472 
+   83230    20.123775   0.99914161    23.831541    6.0637492    4.5655364    1.4982128 0.0018270518  -0.02202472     4.585734 
+   83240    20.191402    1.0369606     23.55459    6.0743969    4.5194744    1.5549225 0.0016166291 -0.021313997    4.5391718 
+   83250    20.332656   0.99916814    23.631932    6.0500021    4.5517494    1.4982526 0.0015272377 -0.021051034    4.5712732 
+   83260    20.382246    1.0255564    23.342771    6.0818317    4.5440099    1.5378218 0.0012882057 -0.020081357     4.562803 
+   83270    20.483304    1.0073778    23.447083    6.0685193    4.5579562    1.5105631 0.0010421195 -0.018571311    4.5754854 
+   83280    19.904131    1.0114492    23.662849    6.0352887    4.5186205    1.5166681 0.0010565811 -0.018651826    4.5362158 
+   83290    20.192009    1.0013209    23.474595    6.0156862    4.5142055    1.5014807 0.0012683089 -0.020180523    4.5331177 
+   83300    20.293856    1.0114173    23.858852     6.050953    4.5343328    1.5166202 0.0015206554 -0.021048533    4.5538607 
+   83310    20.410386    1.0007486    23.796094     6.034121    4.5334984    1.5006225 0.0015372929 -0.021008871      4.55297 
+   83320     19.85204   0.99217934    23.556622    6.0187991    4.5310262    1.4877729 0.0016217802  -0.02104054     4.550445 
+   83330    19.978984    1.0039654    23.643216    6.0383414    4.5328953     1.505446 0.0016978431 -0.021233475    4.5524309 
+   83340    20.151879    1.0002046    23.260315    6.0405601    4.5407533    1.4998068 0.0014727961 -0.020252986    4.5595335 
+   83350      20.3209    1.0103955    23.644352     6.052478    4.5373899    1.5150881 0.0013669385 -0.019900279    4.5559232 
+   83360    20.106288    1.0244639    23.642081    6.0719211    4.5357375    1.5361836 0.0012504608 -0.019534233    4.5540213 
+   83370    20.339265    1.0262398    23.908421    6.0699357    4.5310891    1.5388466 0.0011214767 -0.018835533    4.5488031 
+   83380    20.126943    1.0178409    23.719631    6.0717384    4.5454859    1.5262525 0.0013736458 -0.020132398    4.5642446 
+   83390    20.293478    1.0299823    23.945756    6.0508135     4.506355    1.5444585 0.0015489711 -0.021164173    4.5259702 
+   83400    20.350286    1.0218904    23.683735    6.0718929    4.5395682    1.5323247 0.0016575495  -0.02166988    4.5595805 
+   83410    20.319536    1.0100387    23.881923    6.0386819    4.5241289     1.514553 0.0016713882 -0.021845651    4.5443032 
+   83420    20.378879     1.018312    23.769864    6.0515979    4.5246391    1.5269588 0.0017063485  -0.02185931    4.5447921 
+   83430    20.107996    1.0213588    23.622479    6.0785025     4.546975    1.5315275 0.0018321972 -0.022352337    4.5674951 
+   83440    20.044169    1.0311238    23.914697    6.0841054    4.5379352    1.5461702 0.0019327119 -0.022778188    4.5587807 
+   83450    20.418711    1.0284971    23.990779    6.0726985    4.5304672    1.5422313 0.0019991402  -0.02290322    4.5513712 
+   83460    20.275335    1.0379503    23.985811     6.074964    4.5185575    1.5564065 0.0016462217 -0.021251834    4.5381631 
+   83470    20.033367    1.0248534    23.685085    6.0722066    4.5354389    1.5367677 0.0014865132 -0.020052404    4.5540048 
+   83480    20.363432    1.0449722    23.822518    6.0865743    4.5196384    1.5669359 0.0014009772 -0.019371122    4.5376086 
+   83490    20.243877    1.0149851    23.800353    6.0606395    4.5386694    1.5219701 0.0012975084 -0.018773577    4.5561454 
+   83500    20.138657    1.0065708    23.502981    6.0617326    4.5523796    1.5093529 0.0013057429 -0.018635044    4.5697089 
+   83510    20.174745    1.0218836    23.741939    6.0833778    4.5510633    1.5323145  0.001472085 -0.020080845    4.5696721 
+   83520    20.306374    1.0078064    23.598516    6.0568156    4.5456099    1.5112057 0.0017449493 -0.021817498    4.5656825 
+   83530     20.12628    1.0199592    23.780045     6.050752    4.5213232    1.5294288   0.00190103 -0.022690697    4.5421129 
+   83540    20.200115    1.0317096    23.940985    6.0594549    4.5124063    1.5470486 0.0019624769 -0.023314753    4.5337586 
+   83550    20.382867    1.0154347    23.792797    6.0523162    4.5296718    1.5226444 0.0019473691   -0.0229622    4.5506867 
+   83560    20.347001    1.0074872    23.884852    6.0566763    4.5459493     1.510727  0.001759102 -0.022115801     4.566306 
+   83570    20.255798     1.020585    23.792032    6.0647836    4.5344163    1.5303672 0.0017345058  -0.02188455    4.5545664 
+   83580    20.310829    1.0296973    24.003853    6.0836055    4.5395744    1.5440311 0.0018012054 -0.022111184    4.5598843 
+   83590    20.118327    1.0268208    23.859523    6.1097154    4.5699975    1.5397178 0.0015874789 -0.020893139    4.5893032 
+   83600     20.56564    1.0426906    23.976894    6.1059941    4.5424796    1.5635145 0.0013335376 -0.020142451    4.5612885 
+   83610    20.228491    1.0376599    23.966615    6.1077494    4.5517784     1.555971  0.001419696  -0.02127017    4.5716289 
+   83620    20.198851    1.0324498    23.932601    6.1052821    4.5571236    1.5481585 0.0013852123 -0.020887577     4.576626 
+   83630    20.265413     1.041649    24.017628     6.096294    4.5343412    1.5619527 0.0013049889 -0.020577014    4.5536133 
+   83640    20.103248    1.0331818    24.069095    6.0665871     4.517331    1.5492562 0.0013154513 -0.020200839    4.5362163 
+   83650    20.207864    1.0164221    23.805741    6.0656579    4.5415329     1.524125 0.0012535954  -0.01943834    4.5597177 
+   83660    19.996839    1.0331736    24.088439    6.0712934    4.5220497    1.5492438 0.0012211423  -0.01936706    4.5401956 
+   83670    20.290973    1.0307911    23.716901    6.0817035    4.5360322    1.5456713 0.0011785089 -0.019130738    4.5539844 
+   83680    20.081341    1.0318805    23.856873    6.0725628     4.525258    1.5473048 0.0010544844 -0.018595197    4.5427987 
+   83690     20.30008    1.0321579    23.569671    6.0863926    4.5386718    1.5477208  0.001173224 -0.019001735    4.5565003 
+   83700    20.070864    1.0266947    23.202673    6.0815323    4.5420036    1.5395286  0.001412627 -0.019960181    4.5605512 
+   83710     19.98278    1.0174524    23.844757     6.068808    4.5431382    1.5256699 0.0016048311 -0.020686238    4.5622196 
+   83720    20.377624     1.019336    23.870649    6.0596618    4.5311675    1.5284943 0.0016606965 -0.021128332    4.5506351 
+   83730    20.500448    1.0217372    23.968781    6.0691774    4.5370824     1.532095 0.0016790895 -0.021439682     4.556843 
+   83740    20.299942    1.0094456    23.556153     6.063244    4.5495803    1.5136637 0.0016956561 -0.022056306    4.5699409 
+   83750    20.323456      1.02319    23.841981    6.0670042    4.5327308    1.5342733  0.001901296 -0.023432945    4.5542625 
+   83760    20.438178    1.0344817    23.571909    6.0798956    4.5286903    1.5512053  0.002027484 -0.024187714    4.5508506 
+   83770    19.990236    1.0307906    23.684367    6.0861246    4.5404542    1.5456705 0.0020035169 -0.023780834    4.5622315 
+   83780    19.992086    1.0333872    23.944908    6.0835919    4.5340277    1.5495641 0.0020119691 -0.023813892    4.5558297 
+   83790    20.004999    1.0299458    23.904406    6.0950194    4.5506158    1.5444037 0.0020066407 -0.023904414    4.5725135 
+   83800    20.129755    1.0155967    23.665574    6.0618247    4.5389375    1.5228872 0.0018813522 -0.022751123    4.5598073 
+   83810    20.355286    1.0216769    23.789792    6.0452629    4.5132583    1.5320046 0.0016945462 -0.021989334    4.5335531 
+   83820    20.302072    1.0098875    23.561552    6.0409542     4.526628    1.5143262 0.0015501369 -0.020995866    4.5460737 
+   83830    19.686536    1.0386513    23.736081    6.0845772    4.5271195    1.5574577   0.00168588 -0.021826599    4.5472602 
+   83840    20.015407    1.0264146    23.755435    6.0881122    4.5490035    1.5391086 0.0018384757 -0.022699763    4.5698648 
+   83850    20.004275    1.0194167    23.668247    6.0698942    4.5412789    1.5286153 0.0019883938 -0.023396323    4.5626868 
+   83860    20.305677    1.0213071    23.761276    6.0556184    4.5241684      1.53145 0.0019001379 -0.023406322    4.5456746 
+   83870    20.319242    1.0215849    23.705094    6.0556467    4.5237801    1.5318666 0.0017797338 -0.022791516    4.5447919 
+   83880      20.2631    1.0022457    23.676728    6.0692166    4.5663492    1.5028674  0.001869802 -0.023153498    4.5876329 
+   83890    20.106522   0.99346987    23.686394    6.0394637    4.5497556    1.4897081 0.0017824707 -0.022750501    4.5707237 
+   83900    19.898467   0.99967111    23.598528    6.0281729    4.5291661    1.4990068 0.0017747698 -0.022456302    4.5498476 
+   83910    20.165815    1.0052151    23.775432     6.060713    4.5533929    1.5073201 0.0018027523 -0.022421906    4.5740121 
+   83920    20.269286    1.0027614    23.939119    6.0231147    4.5194741    1.5036407 0.0019582098 -0.022688684    4.5402045 
+   83930    20.330007    1.0019244    23.987391    6.0359579    4.5335722    1.5023856 0.0019146148 -0.022107638    4.5537653 
+   83940    20.424426    1.0045522    23.905849    6.0375695    4.5312434     1.506326 0.0018174651  -0.02138851    4.5508145 
+   83950    20.266232    1.0093807    23.683006    6.0370961    4.5235298    1.5135663 0.0017931082 -0.021250853    4.5429876 
+   83960    20.163865    1.0114044    23.699172    6.0605295    4.5439286    1.5166009 0.0016350383 -0.020973212    4.5632668 
+   83970    20.493806    1.0240659    23.634884    6.0566768      4.52109    1.5355868 0.0014691986 -0.020723641    4.5403444 
+   83980    20.433688    1.0172693    23.621499    6.0767808    4.5513855    1.5253953 0.0015310401 -0.021277895    4.5711324 
+   83990    20.248662    1.0231257    23.709527    6.0778899     4.543713     1.534177 0.0016658145 -0.021897671    4.5639448 
+   84000    20.376732    1.0226029    23.737312    6.0713083    4.5379152    1.5333931 0.0018512654 -0.022478015    4.5585419 
+   84010     20.03638    1.0134983    23.538174    6.0519969    4.5322562    1.5197407 0.0019294248 -0.022123917    4.5524507 
+   84020    20.106421   0.98877948    23.775162    6.0099371    4.5272623    1.4826748 0.0019573529   -0.0222238    4.5475287 
+   84030     19.86288     1.000734    23.471025    6.0252968    4.5246961    1.5006007 0.0018706266 -0.022109356    4.5449348 
+   84040     20.20258   0.99700413    23.621112    6.0234342    4.5284265    1.4950077 0.0017132102 -0.021407468    4.5481208 
+   84050    20.454985   0.99959176    23.762482    6.0500892    4.5512014    1.4988878 0.0018240372 -0.021497522    4.5708749 
+   84060    20.456312    1.0063371    23.800501    6.0291471    4.5201446    1.5090025 0.0019024082 -0.021798707    4.5400409 
+   84070    20.300126    1.0013825    23.629292    6.0091374    4.5075643    1.5015731  0.001999968 -0.022511231    4.5280756 
+   84080    20.230035   0.98098957    23.731365     5.994662    4.5236682    1.4709939 0.0020714101 -0.023072272     4.544669 
+   84090    20.326763    0.9866204    23.810299     6.009485    4.5300477    1.4794373 0.0022021294 -0.023953572    4.5517991 
+   84100    20.293466    1.0026994     23.90743    6.0071871    4.5036394    1.5035477 0.0022565193 -0.024176172    4.5255591 
+   84110     20.20146   0.99238855    24.067939    5.9925499    4.5044633    1.4880866 0.0019906796 -0.023071914    4.5255445 
+   84120    20.399876   0.98476552    23.617483    6.0144728    4.5378169    1.4766559 0.0017698665 -0.021392344    4.5574394 
+   84130    20.250991    1.0069602    23.904775    6.0376414    4.5277045    1.5099369 0.0014185128 -0.019044666    4.5453307 
+   84140     20.23379    0.9988188    23.444165    6.0411507    4.5434219    1.4977288 0.0015037551 -0.019615774    4.5615339 
+   84150    20.414929     1.006237    23.764697    6.0353602    4.5265079    1.5088523 0.0015331465 -0.020494916    4.5454696 
+   84160     20.44743   0.99477173    23.760621    6.0211761    4.5295159    1.4916602 0.0015962866 -0.021276639    4.5491963 
+   84170    20.295951   0.98688644     23.51733    5.9981418    4.5183055    1.4798362 0.0015897921 -0.021366558    4.5380823 
+   84180    20.334593   0.99362335    23.577237     6.009777    4.5198388    1.4899382 0.0014680686 -0.020599327    4.5389701 
+   84190    20.139178   0.99100223    23.407694    6.0058502    4.5198423    1.4860079 0.0013463266 -0.020187455    4.5386835 
+   84200    20.123729   0.99881954    23.782941    6.0463941    4.5486642    1.4977299  0.001395143 -0.020762455    4.5680316 
+   84210    20.067252    1.0237763    23.512987    6.0637874    4.5286348    1.5351526  0.001483436 -0.020986532    4.5481379 
+   84220    20.101215     1.010426    23.902846     6.065981    4.5508473    1.5151338 0.0015706218 -0.021678555    4.5709552 
+   84230    20.318096    1.0444191    23.994222    6.1073646    4.5412581    1.5661065 0.0016802662   -0.0219587    4.5615365 
+   84240    20.387912    1.0468344     24.02206    6.1127564    4.5430282    1.5697282 0.0016784001 -0.022430479    4.5637803 
+   84250    20.513304    1.0325569    23.900526    6.1081308    4.5598118     1.548319 0.0016702042 -0.022073249    4.5802148 
+   84260    20.322659    1.0398756    23.914933    6.1146105    4.5553171    1.5592934 0.0018366621  -0.02262941    4.5761099 
+   84270    19.968395    1.0513709     23.93578    6.1006075    4.5240768    1.5765307 0.0016959359 -0.022028188     4.544409 
+   84280    20.018666    1.0337271    23.734961    6.1149485    4.5648747    1.5500738 0.0017133865 -0.021840727     4.585002 
+   84290    20.182286    1.0388056    23.921586    6.0995803    4.5418913     1.557689 0.0016219639 -0.021234022    4.5615034 
+   84300    20.369332    1.0299047    23.519292    6.0929145    4.5485723    1.5443421 0.0016856808 -0.021649681    4.5685363 
+   84310     20.07181     1.040398    23.828751    6.0858233    4.5257464    1.5600768 0.0017321559 -0.021691342    4.5457056 
+   84320    20.117814    1.0309195    24.037946    6.0834009     4.537537    1.5458638 0.0016283798 -0.021362389     4.557271 
+   84330    20.383576     1.008264    23.623762     6.063487    4.5515952    1.5118919 0.0018234214 -0.022256358    4.5720281 
+   84340     20.39363   0.99911524    23.553076    6.0416167    4.5434433    1.4981733 0.0017057715 -0.022009413     4.563747 
+   84350    19.564988    1.0266104    23.955082    6.0598877    4.5204854    1.5394023  0.001571279 -0.021643192    4.5405573 
+   84360    20.205714    1.0107862    23.480331    6.0498097    4.5341358     1.515674 0.0015083641  -0.02193258      4.55456 
+   84370    20.234515   0.99322794    23.850817    6.0244095    4.5350642    1.4893453 0.0015349586 -0.021856028    4.5553852 
+   84380    20.123667   0.99778093    23.736941    6.0363212    4.5401487    1.4961725 0.0016883438 -0.022501096    4.5609614 
+   84390    20.360394   0.99241276    23.426938    6.0106182    4.5224953    1.4881229 0.0016542296 -0.022583232    4.5434243 
+   84400    20.492609   0.98324844    23.685455    6.0008543    4.5264732     1.474381 0.0016848299 -0.022488558     4.547277 
+   84410    20.294796   0.98407484    23.759041    5.9824895    4.5068693    1.4756202 0.0017247003 -0.022838831    4.5279834 
+   84420     20.22105   0.96730883    23.753618    5.9610368    4.5105572    1.4504796 0.0017930593 -0.023129575    4.5318937 
+   84430    20.081055   0.98262677    23.617129    5.9981977    4.5247489    1.4734488  0.001724033 -0.022559276    4.5455841 
+   84440    20.224472   0.99437393    23.444263    6.0199084    4.5288447    1.4910637 0.0017886788 -0.022842138    4.5498982 
+   84450    20.200747   0.99478011    23.747731    6.0217644    4.5300916    1.4916728 0.0018317509 -0.022909441    4.5511693 
+   84460    20.208677    1.0053631    23.843115    6.0154939    4.5079519     1.507542 0.0019513261 -0.023172048    4.5291726 
+   84470    19.922672   0.99492685    23.643739    6.0195692    4.5276764    1.4918928 0.0018729577 -0.022841623     4.548645 
+   84480    20.144529   0.99827385    23.728399    6.0443071    4.5473954    1.4969116 0.0018431051 -0.022490761    4.5680431 
+   84490    20.254961    1.0092699     23.93119    6.0323395    4.5189393    1.5134002 0.0019741402 -0.023253043    4.5402182 
+   84500    20.355794   0.99124778    23.576211    6.0059788    4.5196028     1.486376 0.0021278181 -0.024050767    4.5415257 
+   84510    20.463387   0.99218316    23.694782     6.013542    4.5257633    1.4877787 0.0021703278 -0.023901859    4.5474949 
+   84520    20.255874   0.98576302    23.530351    5.9879707     4.509819    1.4781517 0.0022062131 -0.023913245    4.5315261 
+   84530    20.317189   0.97677825    23.726614    5.9880442    4.5233652     1.464679 0.0021859986 -0.023402921    4.5445821 
+   84540    20.159145   0.98037402    23.603207    6.0092231    4.5391522    1.4700708 0.0021342469 -0.023367938    4.5603859 
+   84550    20.114154   0.97903408    23.359186    5.9815758    4.5135142    1.4680616 0.0019812506 -0.022455016     4.533988 
+   84560    20.331826   0.97085018     23.48296    5.9960606    4.5402707    1.4557899 0.0019971726 -0.022739404     4.561013 
+   84570    20.381476   0.98605373    23.466405    6.0012739    4.5226863    1.4785876 0.0020240819 -0.022643944    4.5433062 
+   84580    20.094419   0.99111619    23.807288    6.0012499    4.5150712    1.4861787 0.0020435135 -0.022269361    4.5352971 
+   84590    20.177044   0.99090845    23.580709    6.0202625    4.5343953    1.4858672 0.0021167471 -0.022498472     4.554777 
+   84600    20.189482   0.99717836    23.657455    6.0090601    4.5137911    1.4952689 0.0018894887 -0.021898892    4.5338005 
+   84610     20.25673    1.0007947    23.904446     6.018541    4.5178493    1.5006917 0.0016702327 -0.020562239    4.5367413 
+   84620    20.274012    1.0002401    23.787732    6.0038193    4.5039593      1.49986 0.0018072397 -0.021008832    4.5231609 
+   84630    20.099318   0.98246552    23.693831    6.0031368    4.5299298     1.473207 0.0019222661 -0.021531646    4.5495391 
+   84640    20.247967   0.98324009    23.606443     6.022636    4.5482675    1.4743685  0.002006686 -0.022463749    4.5687245 
+   84650    20.133715    1.0064755    23.651867    6.0568812    4.5476713      1.50921 0.0020907092 -0.022587797    4.5681684 
+   84660     20.14517    1.0062107     23.96928    6.0535852    4.5447723    1.5088129 0.0019031746 -0.021867231    4.5647363 
+   84670    20.327735     1.015913    23.601675     6.060172    4.5368104    1.5233616 0.0016851482 -0.021188876    4.5563142 
+   84680    20.419724   0.99871565    23.907426     6.049408    4.5518338    1.4975741 0.0018037096 -0.021514695    4.5715448 
+   84690    20.189386   0.99507243    23.733844    6.0340725    4.5419614    1.4921111 0.0018102982 -0.021281012    4.5614321 
+   84700    20.074085    1.0014778    23.823012    6.0157919    4.5140759    1.5017159 0.0016475075 -0.020510772    4.5329392 
+   84710    20.359903    1.0036556    23.575926    6.0288838    4.5239023    1.5049816 0.0015774106 -0.020038098     4.542363 
+   84720      20.2381   0.98684831    23.515802    6.0198967    4.5401177     1.479779 0.0016419065  -0.02029969    4.5587754 
+   84730    20.343081    1.0111753    23.793588    6.0576195    4.5413622    1.5162573 0.0015346743 -0.019530358    4.5593579 
+   84740    20.418263    1.0001707    23.517167     6.047399     4.547643     1.499756 0.0013572505  -0.01904721     4.565333 
+   84750    20.193863    1.0059758    23.712343    6.0290485    4.5205878    1.5084608 0.0012869295 -0.018569105    4.5378699 
+   84760    20.192629   0.98868957    23.489227    6.0192471    4.5367071      1.48254 0.0012671504 -0.018617158    4.5540571 
+   84770    20.415395   0.98641295    23.588072    6.0440894    4.5649632    1.4791262 0.0013031607 -0.019215307    4.5828753 
+   84780    20.057375    1.0111714     23.68572    6.0450033    4.5287517    1.5162516 0.0012741556 -0.019051233    4.5465288 
+   84790    20.153787    1.0018181    23.669391    6.0289513    4.5267251    1.5022262  0.001100132 -0.018740476    4.5443655 
+   84800    20.180575    1.0060382    23.955402     6.050183    4.5416287    1.5085543 0.0012248955 -0.019897901    4.5603017 
+   84810    20.311522    1.0200234    23.769696    6.0592989    4.5297738    1.5295251 0.0014091399 -0.020828378    4.5491931 
+   84820    20.163926     1.015973    23.674169    6.0658305     4.542379    1.5234515 0.0016245182 -0.021759109    4.5625136 
+   84830    20.163067    1.0235661    23.690968    6.0624752    4.5276378    1.5348374 0.0016906679 -0.021911342    4.5478585 
+   84840    20.174383    1.0153025    23.733011    6.0623663    4.5399203     1.522446 0.0018331723 -0.022297961    4.5603851 
+   84850    20.112312    1.0267315    23.749437    6.0845252    4.5449414    1.5395839 0.0018933825  -0.02219356    4.5652415 
+   84860    20.349966    1.0135701    23.593631    6.0485223    4.5286739    1.5198484 0.0017603414 -0.021577037    4.5484906 
+   84870    20.347235    1.0283986    23.804636    6.0579001    4.5158163    1.5420837 0.0015888506 -0.020985353    4.5352128 
+   84880    20.329972    1.0320988    24.016954    6.0955009    4.5478688    1.5476321 0.0013449649 -0.020235097     4.566759 
+   84890    20.106197      1.04605    23.772683    6.1017744    4.5332224     1.568552 0.0012629754  -0.01969689    4.5516563 
+   84900    20.193396    1.0223334    23.789102    6.0694358     4.536447    1.5329889 0.0011285021  -0.01895391    4.5542724 
+   84910    20.490652   0.99701656    23.491109    6.0315882    4.5365619    1.4950263 0.0010907378 -0.018571404    4.5540425 
+   84920    20.399021   0.99648728    23.662513     6.021584    4.5273513    1.4942327 0.0010772494 -0.018512205    4.5447862 
+   84930    20.486968   0.99011481    23.917857    6.0155872      4.53091    1.4846772 0.0012376156 -0.019762116    4.5494345 
+   84940    20.002434    1.0023106    23.684047    6.0020731    4.4991083    1.5029647 0.0013165055 -0.020123314    4.5179151 
+   84950    20.385137   0.96580888    23.197266    5.9774311    4.5292007    1.4482304 0.0012437856 -0.019771881    4.5477288 
+   84960    20.351494   0.98716699    23.416473    5.9971637    4.5169068    1.4802569 0.0013698032 -0.020216967    4.5357539 
+   84970    20.083123   0.98843226    23.545118     6.001199    4.5190449    1.4821542 0.0014734655 -0.020783221    4.5383546 
+   84980    20.270902   0.98626024    23.639245    5.9917267    4.5128295    1.4788972 0.0015597601 -0.021707603    4.5329773 
+   84990    20.003907    1.0008909    23.757281    6.0331976    4.5323616     1.500836 0.0016003911 -0.021957832    4.5527191 
+   85000    20.087903    1.0289644    23.724912    6.0443363    4.5014043    1.5429321 0.0017748163 -0.022624135    4.5222536 
+   85010    20.115668    1.0143402    23.651761    6.0490094    4.5280063    1.5210031 0.0019960749 -0.023829442    4.5498396 
+   85020    20.273917   0.99179341    23.874608    6.0182951    4.5311008    1.4871942 0.0019824909 -0.023615465    4.5527338 
+   85030    20.460137   0.99926772    23.573238    6.0212339     4.522832     1.498402  0.001941091 -0.023420312    4.5443112 
+   85040    20.228054   0.99551207    23.660885     6.014966    4.5221956    1.4927704 0.0020232456  -0.02371294    4.5438853 
+   85050    20.484512     1.023458    23.752616    6.0300106    4.4953354    1.5346753 0.0020132191 -0.023803044    4.5171252 
+   85060    20.267567   0.99498268    23.851894    6.0290666      4.53709    1.4919765 0.0018987553 -0.023285692     4.558477 
+   85070    20.481549   0.99258345    23.823104     6.022693    4.5343141    1.4883789 0.0016446118 -0.022228442    4.5548979 
+   85080    20.084211   0.99910858    23.609204    6.0212001    4.5230368    1.4981633 0.0015766231 -0.021480237    4.5429404 
+   85090    20.177669    1.0195064    23.717542    6.0498935    4.5211437    1.5287498 0.0016322654 -0.021690931    4.5412024 
+   85100    20.247752    1.0125866    23.619686    6.0508194    4.5324458    1.5183736 0.0014801174 -0.020994552    4.5519602 
+   85110    20.166336    1.0046917    23.791519    6.0494718    4.5429366    1.5065353 0.0014108373 -0.020400848    4.5619266 
+   85120     20.21789   0.99574242    23.495244    6.0357427    4.5426269    1.4931158 0.0014153761 -0.020223032    4.5614346 
+   85130    19.818877    1.0083873    23.728804    6.0338276    4.5217509    1.5120768 0.0013615818  -0.02022046    4.5406097 
+   85140     20.39791    1.0154451    23.553313    6.0515218    4.5288619      1.52266 0.0013159802 -0.020001463    4.5475474 
+   85150     20.16388    1.0241032    23.939207     6.054946    4.5193032    1.5356427 0.0014892598 -0.020920127    4.5387341 
+   85160    20.148999    1.0087767    23.502172    6.0602286    4.5475679    1.5126607 0.0015592118 -0.021345661    4.5673544 
+   85170    20.509606    1.0040191     23.63744    6.0645678    4.5590412    1.5055266 0.0017886498  -0.02260448     4.579857 
+   85180    20.347459    1.0144661    23.837642     6.051717    4.5305251    1.5211919 0.0018741487 -0.022983609    4.5516346 
+   85190    20.451888    1.0111146    23.583087    6.0510324    4.5348661    1.5161663 0.0019400578 -0.023279862    4.5562059 
+   85200    20.334341    1.0201629    23.857271    6.0637859    4.5340517    1.5297342 0.0019776916 -0.023299249    4.5553732 
+   85210    19.952239    1.0196456    23.879572    6.0663338    4.5373752    1.5289586 0.0019063343 -0.022637489    4.5581063 
+   85220    20.322766    1.0057067     23.61251    6.0773615    4.5693043    1.5080572 0.0017315184 -0.021873051    4.5894458 
+   85230     20.18949    1.0033506    23.620563    6.0648701    4.5603459    1.5045242 0.0016255547 -0.021840908    4.5805613 
+   85240    20.249956    1.0032111    23.775199     6.028737    4.5244219    1.5043151 0.0014911322 -0.021061591    4.5439923 
+   85250    20.402833    1.0177613    23.619769    6.0326739    4.5065408     1.526133 0.0015414451 -0.020602096    4.5256015 
+   85260    20.245703   0.99686231    23.523276    6.0329119    4.5381168     1.494795 0.0017307475  -0.02117656    4.5575626 
+   85270    20.202134    1.0072594    23.730149    6.0369689    4.5265834    1.5103855 0.0017250212 -0.020967936    4.5458263 
+   85280     20.47943    1.0080578     23.52902    6.0329088    4.5213261    1.5115827 0.0018752849 -0.021554851    4.5410057 
+   85290    20.264147   0.99257128    23.666767    5.9875709    4.4992102    1.4883606 0.0017947755 -0.021108477    4.5185239 
+   85300    20.172709   0.99421738    23.519067    6.0146255    4.5237966     1.490829 0.0016434965 -0.020564213    4.5427173 
+   85310    20.351468    1.0176131     23.78026    6.0557165    4.5298056    1.5259109 0.0014856749 -0.019557219    4.5478772 
+   85320    20.330445     1.013727      23.8717    6.0698636      4.54978    1.5200836  0.001497004 -0.019797261    4.5680802 
+   85330    19.756195    1.0338671    23.984288    6.0954982    4.5452145    1.5502837  0.001590026 -0.020645129    4.5642696 
+   85340    19.776369    1.0211295    24.022565    6.0845323    4.5533486    1.5311837 0.0017531036 -0.021611985    4.5732075 
+   85350    20.203049    1.0106848    23.781941    6.0717489    4.5562271    1.5155218 0.0018498048 -0.022665178    4.5770425 
+   85360    20.317732    1.0058178    23.834993    6.0509021    4.5426784    1.5082238 0.0019785802 -0.023222626    4.5639224 
+   85370     20.17611    1.0064051    23.509781    6.0383502    4.5292457    1.5091044 0.0018406078 -0.022749005    4.5501541 
+   85380    19.601196    1.0128919    23.971678    6.0337642    4.5149329    1.5188313 0.0018350212  -0.02246005    4.5355579 
+   85390    19.771844    0.9905133    23.826084    6.0251981    4.5399234    1.4852747 0.0018475295 -0.023121327    4.5611972 
+   85400    20.035806    1.0082787    23.936819    6.0302325    4.5183186    1.5119138 0.0018062532  -0.02302578    4.5395382 
+   85410    20.078814   0.99821671    23.835896    6.0342452    4.5374193     1.496826 0.0017628731 -0.022611151    4.5582676 
+   85420    20.255532    1.0026502     23.69158    6.0398817    4.5364076     1.503474 0.0016799567 -0.022166212    4.5568939 
+   85430    20.234077    1.0014036    23.786401    6.0207189    4.5191141    1.5016047 0.0017257333 -0.022280302    4.5396687 
+   85440    20.038121   0.99703307    23.911331    6.0060546    4.5110036    1.4950511 0.0017470536 -0.021963126    4.5312196 
+   85450     20.30421   0.99807504    23.772743    6.0347174    4.5381039    1.4966135 0.0019019236  -0.02202162    4.5582236 
+   85460    20.082687    1.0187907    23.883683    6.0394716     4.511795    1.5276766 0.0018493499 -0.021712427    4.5316581 
+   85470    20.375098    1.0176607    23.758921    6.0599133    4.5339311    1.5259822 0.0017022815 -0.021541304    4.5537701 
+   85480    20.399547    1.0159299     23.90399    6.0425753    4.5191884    1.5233869 0.0018591708 -0.022378547    4.5397078 
+   85490    20.182461   0.99963375    23.636243    6.0396521    4.5407013    1.4989508 0.0020310755 -0.023154862    4.5618251 
+   85500    20.421565    1.0026579    24.000994    6.0146348    4.5111492    1.5034856 0.0019397516 -0.022810089    4.5320195 
+   85510    20.352608   0.99525201    23.647763    6.0160481    4.5236677    1.4923804 0.0016835388 -0.021313404    4.5432976 
+   85520    20.522135   0.98122731    23.524678    5.9938024     4.522452    1.4713503 0.0015082517 -0.020433034    4.5413768 
+   85530    20.419766   0.96743114    23.578265    5.9644077    4.5137447     1.450663 0.0016032854 -0.021047587     4.533189 
+   85540    20.146561   0.97113931    23.586317    5.9606382    4.5044148    1.4562234 0.0019021406 -0.022176482    4.5246891 
+   85550    20.361308   0.97380802    23.813712    5.9777334    4.5175083    1.4602251 0.0019799048 -0.022877373    4.5384058 
+   85560    20.365133   0.98113847    23.830405    5.9985004    4.5272833    1.4712171  0.001692041 -0.021502421    4.5470937 
+   85570    20.370864   0.99969743    23.603736    6.0120465    4.5130002    1.4990463  0.001422509 -0.020611662    4.5321894 
+   85580    20.423818   0.99358243    23.707729    6.0309448     4.541068    1.4898768 0.0014602782  -0.02084561    4.5604533 
+   85590    19.974095    1.0214869    23.550512    6.0396255    4.5079058    1.5317196 0.0017127303 -0.021948514    4.5281416 
+   85600    20.430061     1.027634    23.799177    6.0742868    4.5333495    1.5409372 0.0018402353 -0.022615503    4.5541248 
+   85610    20.515526    1.0204637    23.642588    6.0900149    4.5598295    1.5301853 0.0020534062 -0.022973504    4.5807496 
+   85620    20.046446    1.0282175    23.897159    6.0649264    4.5231143    1.5418121 0.0020331477 -0.022760943    4.5438421 
+   85630      20.1013   0.99110467       23.609    6.0474711    4.5613097    1.4861614 0.0020022333 -0.022488759    4.5817962 
+   85640     20.19885    1.0087712    23.582322     6.034592    4.5219396    1.5126524 0.0020012223 -0.023185337    4.5431238 
+   85650    20.074652   0.99952845    23.893629    6.0282632    4.5294703    1.4987929 0.0019201889 -0.022988391    4.5505385 
+   85660    20.230356   0.99083953    23.705335    6.0040252    4.5182614    1.4857639 0.0017106449 -0.022079686    4.5386304 
+   85670    20.389533    0.9695657     23.58159    6.0137718     4.559908    1.4538638 0.0018116094 -0.022239964    4.5803364 
+   85680    20.326699    1.0028444    23.812795    6.0304916    4.5267265    1.5037651  0.001897048 -0.022354325    4.5471838 
+   85690    20.501909   0.98995425    23.584401    6.0287778    4.5443414    1.4844364 0.0017817012 -0.021782652    4.5643423 
+   85700    20.144396    1.0198619    23.891806    6.0460955    4.5168125     1.529283 0.0017056958 -0.021068257    4.5361751 
+   85710    20.467306    1.0126744    23.734896    6.0459105    4.5274052    1.5185053 0.0017217718 -0.021569301    4.5472527 
+   85720    20.360814    1.0115553    23.694807    6.0585891    4.5417619    1.5168272 0.0015356679 -0.020970995    4.5611973 
+   85730    20.222338   0.99661704    23.763911    6.0600265    4.5655992    1.4944273 0.0014066868 -0.020375026    4.5845676 
+   85740     20.47249   0.99062889    23.891945    6.0415916    4.5561436     1.485448 0.00098314317 -0.017840333    4.5730008 
+   85750    20.529129    1.0149134    23.687588    6.0591785    4.5373158    1.5218626 0.0010183378 -0.017816527     4.554114 
+   85760    20.395148    1.0251029    23.713667    6.0659714    4.5288297    1.5371418 0.0011905183 -0.018681359    4.5463205 
+   85770    20.214498    1.0316323    23.818363    6.0845448    4.5376122    1.5469326   0.00111368 -0.018520543    4.5550191 
+   85780    19.990535    1.0248148    23.835543    6.0868344    4.5501246    1.5367098 0.0011370783 -0.018348851    4.5673364 
+   85790    20.387878    1.0141058    23.958529    6.0618495    4.5411978    1.5206517 0.0012863685 -0.019572939    4.5594843 
+   85800    19.953771    1.0154966    23.844957    6.0713602     4.548623    1.5227372 0.0014178001 -0.020182166    4.5673874 
+   85810    20.100959    1.0092201    23.851916    6.0339749    4.5206493    1.5133255 0.0015194447 -0.020589752    4.5397196 
+   85820    20.112008    1.0056571    23.595251    6.0333514    4.5253686    1.5079829 0.0015914418 -0.020904753    4.5446819 
+   85830    20.091533    1.0141419    23.748414    6.0709245    4.5502187    1.5207058 0.0017357981  -0.02118567    4.5696685 
+   85840    20.030606    1.0125653    23.851538    6.0721739    4.5538323    1.5183416 0.0017330356  -0.02093363    4.5730329 
+   85850    20.261661    1.0182914     23.83506    6.0689882    4.5420603    1.5269279 0.0017347596  -0.02124239    4.5615679 
+   85860    20.132485    1.0245554    23.721049    6.0789843    4.5426635    1.5363209 0.0017755886 -0.021775887    4.5626638 
+   85870    20.369595    1.0056504    24.049919    6.0416686    4.5336958    1.5079728 0.0018002152 -0.022355166    4.5542507 
+   85880    19.984426    0.9989846    23.765896    6.0087664     4.510789    1.4979774 0.0019127369 -0.023063552    4.5319398 
+   85890    19.869703   0.99898955    23.674397    6.0299299     4.531945    1.4979848 0.0019084547 -0.022885656    4.5529222 
+   85900    19.846408    1.0012107    23.777283    6.0246435     4.523328    1.5013155 0.0017142811 -0.021757556    4.5433713 
+   85910    20.108599    1.0097658    24.055475    6.0349193    4.5207755    1.5141438 0.0017742039 -0.022219156    4.5412205 
+   85920    19.991625   0.99446488    23.569532    6.0188835    4.5276834    1.4912001 0.0017711792 -0.022215767     4.548128 
+   85930    19.882728   0.99669524    23.548082    6.0149793    4.5204348    1.4945445 0.0017307354 -0.021743517    4.5404476 
+   85940    20.161638    1.0053343    23.547762     6.038881    4.5313822    1.5074988  0.001837058 -0.021927804     4.551473 
+   85950    20.146241   0.99833245     23.43763    6.0224226    4.5254231    1.4969995 0.0020914923  -0.02290153    4.5462332 
+   85960    20.394602   0.98564591    23.693042    6.0218813    4.5439053     1.477976 0.0022138991 -0.023628565    4.5653199 
+   85970    20.390863    1.0205382    23.709244    6.0558545    4.5255574    1.5302971 0.0021333246 -0.023775225    4.5471993 
+   85980    20.103177     1.025655    23.714196    6.0745878     4.536618    1.5379697 0.0022111792 -0.024126717    4.5585336 
+   85990    19.852288    1.0278576    23.956671    6.0670526    4.5257801    1.5412725 0.0021427513 -0.023565396    4.5472027 
+   86000    20.018071    1.0229344    23.639466    6.0628468    4.5289567    1.5338901 0.0019491603  -0.02310451     4.550112 
+   86010    20.366868    1.0218413    24.009266    6.0297069    4.4974559    1.5322511 0.0020602818 -0.023289879    4.5186855 
+   86020    20.462159    1.0055915     23.66429    6.0419993    4.5341149    1.5078845 0.0019781412 -0.022578636    4.5547154 
+   86030    20.331227    1.0034504    23.498137    6.0477731    4.5430992    1.5046739 0.0017402432 -0.021368393    4.5627273 
+   86040    20.189735    1.0193057    23.713078    6.0451496    4.5167007    1.5284489 0.0015765355 -0.020846318    4.5359704 
+   86050    20.247968    1.0125977    23.860591    6.0245367    4.5061465    1.5183902 0.0017306004 -0.021648884    4.5260648 
+   86060    20.338404    1.0031351    23.922897    6.0388475    4.5346465    1.5042011 0.0018233894  -0.02173005    4.5545531 
+   86070    20.245407    1.0098823     23.97543    6.0456615    4.5313429    1.5143186 0.0018077933 -0.021905068    4.5514402 
+   86080    20.205128    1.0214014     23.65542    6.0703293    4.5387378    1.5315915 0.0018639851 -0.022434245     4.559308 
+   86090    20.308252    1.0143048    23.270835    6.0554713    4.5345214      1.52095 0.0016369204 -0.021560904    4.5544454 
+   86100    20.342076     1.013311    23.782771    6.0559505    4.5364906    1.5194598 0.0016217193  -0.02129367    4.5561626 
+   86110     20.39767   0.99911892    23.802373    6.0489344    4.5507556    1.4981788 0.0018208819  -0.02224781    4.5711825 
+   86120    20.148854   0.99912527    23.518062    6.0447985    4.5466101    1.4981883 0.0019419829 -0.022420362    4.5670885 
+   86130    19.734735    1.0207568    23.802378    6.0677939    4.5371691    1.5306248 0.0017495058 -0.022157698    4.5575773 
+   86140      20.1791    1.0159508    23.796188    6.0656031    4.5421849    1.5234182 0.0018698116 -0.023127154    4.5634422 
+   86150    20.142235    1.0210529    23.791131    6.0579373    4.5268684    1.5310689 0.0019487124 -0.023332088    4.5482518 
+   86160    20.103261    1.0015053    23.853019    6.0203472      4.51859    1.5017572 0.0021112683 -0.023924321     4.540403 
+   86170    20.310883   0.98739233    23.671335    6.0165411    4.5359463    1.4805948 0.0020620841 -0.023819534    4.5577038 
+   86180    20.140401   0.97856757    23.721363    5.9978766    4.5305146    1.4673621 0.0018178005 -0.022795731    4.5514925 
+   86190    20.339049   0.98832043    23.545559    6.0150124    4.5330259    1.4819865 0.0020110602 -0.023345955    4.5543608 
+   86200    20.126282   0.98890537      23.5651    6.0259655    4.5431019    1.4828636 0.0017848464 -0.022279975     4.563597 
+   86210    20.272534    1.0020515    23.636982    6.0415398    4.5389636    1.5025762 0.0015778821 -0.021335694    4.5587214 
+   86220    20.246131    1.0057125    23.629269    6.0368908    4.5288249    1.5080659 0.0016244313 -0.021842167    4.5490426 
+   86230    19.705964    1.0281977     23.98847    6.0582248    4.5164423    1.5417825 0.0018146987 -0.022794815    4.5374224 
+   86240     19.90293    1.0269134    23.891792    6.0725241    4.5326674    1.5398566 0.0020452435 -0.023831935    4.5544541 
+   86250    20.263623     1.009414    23.721054    6.0571006    4.5434843    1.5136163 0.0018850626 -0.023356545    4.5649558 
+   86260    19.961588    1.0020624    23.860285     6.052038    4.5494454    1.5025926 0.0018032043 -0.022560961    4.5702032 
+   86270    20.148505    1.0184973    23.649654    6.0657639    4.5385272    1.5272368 0.0016505937 -0.021882166    4.5587587 
+   86280    20.311118    1.0235472    23.730139    6.0572147    4.5224057     1.534809 0.0014982266  -0.02123832    4.5421458 
+   86290    20.121082    1.0128175    23.601522    6.0668536    4.5481338    1.5187198 0.0015127571 -0.020707336    4.5673284 
+   86300    20.104377    1.0163262    23.651275    6.0684362    4.5444551    1.5239811 0.0015228212  -0.02099181    4.5639241 
+   86310    20.444968    1.0115727    23.576682    6.0477433      4.53089    1.5168533  0.001480092 -0.020556018     4.549966 
+   86320    20.051902    1.0290042    23.963318    6.0493607    4.5063688    1.5429918 0.0015422029  -0.02038292    4.5252095 
+   86330    20.376654    1.0269519    23.536675    6.0678149    4.5279004    1.5399144  0.001732699 -0.021017803    4.5471856 
+   86340    20.382718     1.007777    23.805802    6.0332621    4.5221005    1.5111616 0.0016625463 -0.020581152    4.5410191 
+   86350    20.106674    0.9971934    23.812371    6.0222451    4.5269536    1.4952915 0.0015749279 -0.020386828    4.5457655 
+   86360    20.131015    1.0054298    23.756836    6.0349048    4.5272627     1.507642 0.0016117287 -0.020717079    4.5463681 
+   86370    20.129264   0.99830297    23.699012    6.0238177    4.5268624    1.4969553  0.001671792 -0.021096748    4.5462873 
+   86380     20.07888   0.98796753     23.70778    6.0187982    4.5373409    1.4814573   0.00182606 -0.021888781    4.5574036 
+   86390    20.036028    1.0005586    23.745205    6.0157927    4.5154552    1.5003376 0.0018660812 -0.022529959    4.5361191 
+   86400    20.264582   0.98317436    23.613425    6.0107765    4.5365065      1.47427 0.0020832387 -0.023561169    4.5579844 
+   86410    20.370336   0.99299491     23.91198     6.006746    4.5177502    1.4889959 0.0021976362  -0.02367541    4.5392279 
+   86420    20.498751    0.9968227    23.587345    6.0297944    4.5350588    1.4947356 0.0023227425 -0.023775289    4.5565113 
+   86430    20.233507    1.0070841    23.671201    6.0451637    4.5350411    1.5101226 0.0022910727 -0.023864416    4.5566144 
+   86440     19.85156   0.98495922    23.745459    6.0372264    4.5602801    1.4769463 0.0020966766 -0.023134677    4.5813181 
+   86450    19.669615    1.0127367    23.698464    6.0454899    4.5268912    1.5185987 0.0020333789 -0.023151031    4.5480089 
+   86460     20.09746    1.0114043    23.764046    6.0467221    4.5301214    1.5166007 0.0020910869  -0.02315218    4.5511825 
+   86470    20.143583   0.99376131    23.677306    6.0194136    4.5292685    1.4901451 0.0022834505 -0.024222923    4.5512079 
+   86480    20.401531   0.99362263    23.845424    6.0208802    4.5309431    1.4899371 0.0022103666 -0.023763311     4.552496 
+   86490    20.375686   0.98063503    23.897967    6.0016995    4.5312373    1.4704622 0.0022041866 -0.023758631    4.5527917 
+   86500    20.032823    1.0054304    23.776078    6.0448396    4.5371967    1.5076429 0.0020250694 -0.023348552    4.5585202 
+   86510    20.240244   0.99180006    23.456366    6.0400119    4.5528078    1.4872042 0.0020594073 -0.023496287    4.5742446 
+   86520    20.317292    1.0166911    23.487048    6.0510573    4.5265289    1.5245284 0.0018178366 -0.022575263    4.5472864 
+   86530    20.441634   0.99954316    23.683825    6.0327365    4.5339215     1.498815 0.0014330089 -0.020666345    4.5531549 
+   86540    20.275973    1.0062359    23.891629    6.0546682    4.5458175    1.5088507 0.0016242574  -0.02139992    4.5655931 
+   86550    20.277012    1.0111832    23.913643    6.0663443    4.5500751    1.5162692 0.0016958957 -0.021295412    4.5696746 
+   86560    20.186549    1.0015849    23.662264    6.0303733    4.5284968    1.5018765 0.0019147611 -0.022653038     4.549235 
+   86570    20.129751    1.0055405     23.51973    6.0391327    4.5313247     1.507808 0.0019671265 -0.022943281    4.5523009 
+   86580    20.492957    1.0150106    23.644178    6.0678925     4.545884    1.5220084 0.0019623796 -0.022856404     4.566778 
+   86590    20.452309    1.0188433    23.927494    6.0467454    4.5189899    1.5277555 0.0018640959 -0.022651483    4.5397773 
+   86600     20.18032    1.0103481    23.846789    6.0688508    4.5538339    1.5150169 0.0016875433 -0.021722455    4.5738688 
+   86610    20.318506    1.0240516    23.862264    6.0461049    4.5105395    1.5355653 0.0018608717 -0.022655265    4.5313339 
+   86620    20.378625    1.0182742    23.764641     6.054426    4.5275238    1.5269022 0.0019138035 -0.022132118    4.5477421 
+   86630    20.312705    1.0108173    23.530031    6.0380856    4.5223651    1.5157205 0.0016497512 -0.021037801    4.5417531 
+   86640     20.42824    1.0081359    23.864702    6.0241883    4.5124885    1.5116998 0.0012715887 -0.019346998    4.5305639 
+   86650    19.891833   0.99632677    23.709767    6.0408856    4.5468936     1.493992 0.0011232958 -0.018654261    4.5644246 
+   86660    20.441746    1.0217877    23.811556    6.0601738    4.5280033    1.5321706 0.0012384203 -0.019338331    4.5461032 
+   86670    20.386151    1.0078577     23.45349    6.0761585    4.5648758    1.5112826 0.0014544838 -0.020281634     4.583703 
+   86680    20.113101    1.0291422    23.875763    6.0768618     4.533663    1.5431987  0.001509799 -0.020599798     4.552753 
+   86690    20.026803    1.0205206    23.867465    6.0689216    4.5386509    1.5302706 0.0017123483  -0.02179568    4.5587343 
+   86700    20.402495    1.0097566    23.763716    6.0494422    4.5353121    1.5141301 0.0016423186 -0.021279797    4.5549496 
+   86710    20.264738    1.0178522    23.843698    6.0615565    4.5352871    1.5262694 0.0016652219 -0.020450549    4.5540724 
+   86720    20.075926    1.0235073    23.598658    6.0575661     4.522817    1.5347491 0.0015367441 -0.019739799      4.54102 
+   86730     20.36231    1.0181886    23.862722    6.0710988     4.544325    1.5267739 0.0015700024 -0.020182725    4.5629377 
+   86740    20.245751    1.0222642    23.783742    6.0617613    4.5288762    1.5328852 0.0015509636 -0.020232399    4.5475576 
+   86750    20.554774    1.0455798    23.810441    6.0776842    4.5098373    1.5678469 0.0016348002 -0.021092869    4.5292953 
+   86760    20.408695    1.0165174    23.874988    6.0610748    4.5368069    1.5242679  0.001946521 -0.022835692    4.5576961 
+   86770    20.264474    0.9987546    23.775436    6.0269324    4.5292999    1.4976325 0.0021607189 -0.023763896    4.5509031 
+   86780    20.286364   0.99748976    23.648256    6.0259401    4.5302042    1.4957359 0.0021531105 -0.023431134    4.5514822 
+   86790    20.201696    1.0086554    23.987899    6.0517216    4.5392428    1.5124788 0.0020561284  -0.02281525    4.5600019 
+   86800    20.341987    1.0100293     23.91177     6.036373     4.521834     1.514539 0.0019169342  -0.02202579    4.5419429 
+   86810    20.049645   0.99637669    23.889564    6.0327476    4.5386807    1.4940668 0.0016516704 -0.020927687    4.5579567 
+   86820    20.154313   0.99458407    23.602166    6.0232927    4.5319138    1.4913788 0.0014993327 -0.020588362    4.5510029 
+   86830    20.424565    1.0020575    23.773205    6.0302584    4.5276733    1.5025852 0.0015317977 -0.020970105    4.5471116 
+   86840    20.455571    1.0156895    23.629074    6.0547302    4.5317037    1.5230265 0.0016554642 -0.021452322    4.5515006 
+   86850    20.326766    1.0101211    23.733527    6.0426002    4.5279236    1.5146766 0.0017991852 -0.022294157    4.5484186 
+   86860    20.357907    1.0179995    23.488451    6.0224549    4.4959647    1.5264902  0.001747383 -0.021961286    4.5161786 
+   86870    20.248021     1.014094    23.533648    6.0247968    4.5041628     1.520634 0.0016292884  -0.02133977    4.5238733 
+   86880    20.125593   0.98524117    23.686514    6.0110398    4.5336706    1.4773691 0.0015407325 -0.021240155    4.5533701 
+   86890    20.108751    1.0032044    23.861749    6.0299493    4.5256443    1.5043051 0.0018207642  -0.02286105    4.5466845 
+   86900    20.057566   0.98728658    23.659911    5.9721836    4.4917474    1.4804362 0.0020746166 -0.023572454    4.5132452 
+   86910    20.023174    0.9766985    23.906925    5.9965311    4.5319717    1.4645594 0.0020641013 -0.023431229    4.5533388 
+   86920    20.094977    1.0041905    23.745962    6.0184485    4.5126648    1.5057837 0.0020186146 -0.023361917    4.5340081 
+   86930    20.424503   0.99781031    23.759877    6.0355231    4.5393066    1.4962166 0.0020660485  -0.02364781    4.5608884 
+   86940    20.382791    1.0149248    23.830486    6.0585586    4.5366789    1.5218797 0.0019839687 -0.023101472    4.5577964 
+   86950    19.856087     1.011011     23.57249    6.0689177    4.5529067     1.516011  0.001814778 -0.022253014     4.573345 
+   86960    20.296745    1.0113579    23.988428    6.0544016    4.5378705    1.5165311 0.0014337826  -0.02021577    4.5566524 
+   86970    20.416595    1.0007611    23.867791    6.0253873     4.524746    1.5006413 0.0013087615 -0.019200731     4.542638 
+   86980    20.216179    1.0214938    23.554658    6.0418855    4.5101556    1.5317299 0.0012640289 -0.018824022    4.5277156 
+   86990    19.915299    1.0057638    23.834763    6.0347101    4.5265672    1.5081429 0.0014191895 -0.019382661    4.5445307 
+   87000    20.001532    1.0011493    23.969456    6.0226456    4.5214222    1.5012234 0.0014579079 -0.019262204    4.5392265 
+   87010    20.318565   0.98537445    23.696746    6.0021075    4.5245386     1.477569 0.0015046591 -0.019596046    4.5426299 
+   87020    20.550294   0.98474311    23.924268    6.0214771    4.5448548    1.4766223 0.0016524193 -0.020295375    4.5634978 
+   87030    20.401133   0.99088708    23.682875    6.0006062     4.514771    1.4858352 0.0019904282 -0.022058507    4.5348391 
+   87040    20.322676   0.96646407    23.659513    6.0084329    4.5592201    1.4492129 0.0020866553 -0.022590567     4.579724 
+   87050    20.352702   0.97702766    23.703683    5.9999775    4.5349245     1.465053 0.0021780854 -0.023385292    4.5561317 
+   87060    20.473645   0.99652653    23.828885    5.9942705     4.499979    1.4942915 0.0022004858 -0.023696184    4.5214747 
+   87070     20.30275    1.0003793     23.35429    6.0315246    4.5314559    1.5000687 0.0022739712 -0.023879132     4.553061 
+   87080     20.29835     1.010411     23.57162    6.0360132    4.5209018    1.5151113  0.002237293 -0.023965082    4.5426296 
+   87090    19.980818   0.99469081    23.455846    6.0327461    4.5412073    1.4915389 0.0021945122  -0.02383794    4.5628507 
+   87100    20.071491    1.0140253    23.642944    6.0451321    4.5246012    1.5205309 0.0020767485 -0.023546888    4.5460714 
+   87110    20.262247    1.0019773    23.472396      6.03706     4.534595     1.502465 0.0018779967  -0.02303128    4.5557483 
+   87120    20.528578    1.0100101    23.737808    6.0417998    4.5272897    1.5145101 0.0017441964 -0.022556847    4.5481023 
+   87130    20.354736    1.0244624    23.708655    6.0607067    4.5245253    1.5361814 0.0017087853 -0.022064926    4.5448814 
+   87140    20.045169    1.0091878     23.82907    6.0467682    4.5334911    1.5132771 0.0016981338   -0.0217622    4.5535551 
+   87150    19.841792   0.98573838    23.755475    6.0294862    4.5513715    1.4781147 0.0015074421 -0.020944033    4.5708081 
+   87160    20.229161   0.99344013    23.527249    6.0185154     4.528852    1.4896635 0.0017660738 -0.022119177    4.5492051 
+   87170    20.373813    1.0007034    23.462142    6.0278662    4.5273115    1.5005547 0.0019287614 -0.022587242      4.54797 
+   87180    20.443382   0.99193447     23.59008    6.0126884    4.5252827    1.4874057 0.0020308213  -0.02326615     4.546518 
+   87190    20.060653    1.0043872     23.76887    6.0334503    4.5273716    1.5060787 0.0020136361  -0.02318205      4.54854 
+   87200    20.094852     1.018707    23.689076    6.0529225    4.5253714    1.5275511 0.0018939537 -0.022450849    4.5459283 
+   87210    20.142599    1.0210419    23.833845    6.0494931    4.5184408    1.5310523 0.0018587293 -0.021989495    4.5385715 
+   87220    20.040324    1.0181253    23.725519    6.0401032    4.5134243    1.5266789 0.0017931498 -0.022169983    4.5338012 
+   87230    19.976624    1.0170763    23.851523     6.048848    4.5237421    1.5251059  0.001825356 -0.022837485    4.5447542 
+   87240    20.079935    1.0131039    23.562579    6.0430162    4.5238668    1.5191493 0.0017751474 -0.022471095    4.5445628 
+   87250    20.215541    1.0230904    23.795992    6.0499681    4.5158439    1.5341241 0.0017510201 -0.021946492    4.5360394 
+   87260    20.214146    1.0133321    23.522638    6.0555555     4.536064    1.5194915 0.0018490924 -0.022490574    4.5567055 
+   87270    20.326175    1.0121168    23.901901    6.0408036    4.5231344    1.5176692 0.0019033121 -0.022850834    4.5440819 
+   87280    20.270836   0.99426715    23.491765     6.021747    4.5308434    1.4909036 0.0020153226 -0.023278822    4.5521069 
+   87290    20.401097   0.97668474    23.857629    6.0054016    4.5408628    1.4645388 0.0019986309 -0.023046403    4.5619106 
+   87300    20.183264   0.98103665    23.737373    5.9865658    4.5155014    1.4710645 0.0019211924 -0.022999098    4.5365793 
+   87310    20.095765   0.97907157    23.386362    5.9812146    4.5130968    1.4681178 0.0018444505 -0.022700636     4.533953 
+   87320    20.092078   0.97886198    23.697045    5.9863593    4.5185558    1.4678035 0.0017450653 -0.022178381    4.5389891 
+   87330    20.086407    0.9859697    23.722282    5.9789406     4.500479    1.4784616 0.0015975333 -0.021628047    4.5205095 
+   87340    20.091234   0.96123809    23.746956    5.9838015     4.542425    1.4413765 0.0012917226 -0.020247377    4.5613806 
+   87350    20.018569   0.99009203      23.7188    5.9835382    4.4988952     1.484643  0.001152321 -0.019379386    4.5171223 
+   87360    20.444587    1.0088238    23.591665    6.0294714    4.5167401    1.5127313 0.0012080685  -0.01960248    4.5351345 
+   87370    20.306848    1.0094458    23.685649    6.0338593    4.5201953     1.513664 0.0013383178 -0.019808165    4.5386651 
+   87380    20.341079   0.99705046    23.972686    6.0306469    4.5355698    1.4950772 0.0014002286 -0.019939123    4.5541087 
+   87390    20.118253    1.0028318    23.465737    6.0196511    4.5159047    1.5037463 0.0014540087 -0.020273268     4.534724 
+   87400     19.97754   0.99606629    23.796579    6.0067724     4.513171    1.4936014 0.0015521968 -0.020623046    4.5322419 
+   87410    20.356805     1.013413     23.86617    6.0712683    4.5516555    1.5196128 0.0016824605 -0.021434864    4.5714079 
+   87420    19.988699     1.016426    23.911354    6.0740604    4.5499297    1.5241308 0.0017008823 -0.021577572    4.5698064 
+   87430    20.158651    1.0270835    23.674523    6.0669809    4.5268692    1.5401117 0.0016455785 -0.021141027    4.5463646 
+   87440    20.114048    1.0351247    23.668239     6.078291    4.5261215    1.5521696 0.0015452392 -0.021478241    4.5460545 
+   87450    20.371727    1.0366465    23.776643    6.0958389    4.5413875    1.5544514 0.0016917689  -0.02187441    4.5615702 
+   87460    19.802974    1.0377713    23.923602    6.1061367    4.5499986    1.5561381 0.0017388247 -0.022317312    4.5705771 
+   87470    20.078836    1.0515986    24.169488    6.1045924    4.5277203    1.5768721 0.0019904165 -0.023640272    4.5493701 
+   87480    20.342418    1.0382122    23.959437    6.0758082     4.519009    1.5567992 0.0021383917 -0.024284739    4.5411553 
+   87490    19.996853    1.0157133    23.678415    6.0785955    4.5555335     1.523062 0.0022220852 -0.024580953    4.5778924 
+   87500    20.096188    1.0097817    23.876956    6.0696147     4.555447    1.5141677 0.0021176536 -0.023788051    4.5771174 
+   87510    20.108152    1.0378908    23.788174    6.0734393    4.5171221    1.5563172 0.0020922647 -0.023772718    4.5388025 
+   87520     20.39156    1.0244457    23.730681    6.0647552    4.5285988    1.5361563 0.0021971708 -0.024017364     4.550419 
+   87530    20.487448    1.0093827     23.94261    6.0196051    4.5060357    1.5135693  0.002167948 -0.024181302    4.5280491 
+   87540    20.480344     1.005557    23.808205    6.0359633    4.5281306    1.5078327 0.0021509056 -0.024288083    4.5502678 
+   87550    19.652827    1.0234529    23.544026    6.0532613    4.5185936    1.5346677 0.0021696535 -0.024335147    4.5407591 
+   87560    20.268839    1.0212716     23.63723    6.0671292    4.5357324    1.5313968 0.0019474755 -0.023833132     4.557618 
+   87570    20.338358    1.0295919    23.624556    6.0618217    4.5179487     1.543873 0.0019873853 -0.023741355    4.5397026 
+   87580    20.169921   0.99887318    23.938346    6.0140869    4.5162766    1.4978103 0.0019473376 -0.023314908    4.5376441 
+   87590    20.478075   0.98009961    23.391968    5.9987338    4.5290744    1.4696594 0.0017142727 -0.022048272    4.5494084 
+   87600    20.182287   0.98901491    23.665004    6.0025255    4.5194977    1.4830279 0.0018110464 -0.022122865    4.5398095 
+   87610    20.313827    1.0109088    23.569657    6.0422841    4.5264264    1.5158577 0.0017242441 -0.021742326    4.5464444 
+   87620    20.197651    1.0014698     23.95098     6.045146    4.5434421    1.5017039 0.0019019649 -0.022691363    4.5642315 
+   87630    20.300182   0.98236059    23.524886    5.9810056    4.5079559    1.4730497 0.0021144738  -0.02386094    4.5297023 
+   87640    20.497909   0.99014394    23.609654     5.993277    4.5085561    1.4847208 0.0020946138 -0.023472955    4.5299345 
+   87650    20.273852   0.99582425    23.966941    5.9810693    4.4878308    1.4932385 0.0019662712 -0.022629716    4.5084943 
+   87660    20.342042     1.007414    23.724054    6.0180628    4.5074456    1.5106173 0.0018237198  -0.02175338    4.5273752 
+   87670    20.420321    1.0002425    23.494754    6.0199791    4.5201154    1.4998637 0.0015785976 -0.020495509    4.5390324 
+   87680    20.356573    1.0212616    23.760879    6.0445542    4.5131724    1.5313818 0.0014986163 -0.020947462    4.5326213 
+   87690    20.482006    1.0103708    23.815328    6.0454621    4.5304111     1.515051 0.0015849106 -0.021197219    4.5500234 
+   87700    20.114419    1.0070676    23.739279    6.0449788    4.5348809    1.5100979 0.0017158453 -0.021682377    4.5548475 
+   87710    19.547034    1.0069205     23.61948    6.0376279    4.5277505    1.5098774 0.0018454957   -0.0225577    4.5484627 
+   87720    20.306558    1.0171563    23.414914    6.0634751    4.5382492    1.5252259 0.0017600942 -0.022203631    4.5586927 
+   87730    20.297784    1.0228574    23.778895    6.0645619    4.5307872    1.5337747 0.0018413466 -0.022484255    4.5514301 
+   87740    20.410854    1.0255665    23.686195    6.0663174    4.5284804     1.537837 0.0018454161 -0.022547638    4.5491826 
+   87750    20.344225    1.0079446    23.779843    6.0484621    4.5370492    1.5114129 0.0017828482 -0.022044987    4.5573113 
+   87760    20.270152    1.0132293    23.705093    6.0424277    4.5230903    1.5193374 0.0016168028 -0.021100876    4.5425744 
+   87770    20.110203    1.0166171    23.763637    6.0608671    4.5364497    1.5244174 0.0016665967 -0.020729015    4.5555121 
+   87780    19.513133    1.0064833    23.551452    6.0469046    4.5376829    1.5092218 0.0017296161 -0.021240197    4.5571934 
+   87790    20.117621    1.0093321    23.601882    6.0458857    4.5323922    1.5134935 0.0017251617 -0.021240281    4.5519073 
+   87800    20.179867    1.0130705     23.54238    6.0651804    4.5460812    1.5190992 0.0017232323 -0.021259712    4.5656177 
+   87810    20.318565    1.0278125    23.837306    6.0652996    4.5240948    1.5412048  0.001610813  -0.02072304     4.543207 
+   87820    20.044206    1.0189854    23.789158    6.0605369    4.5325682    1.5279687 0.0017779605 -0.021762937    4.5525532 
+   87830    20.067783    1.0214374    23.868136    6.0404622    4.5088169    1.5316453 0.0017931791 -0.022435208    4.5294589 
+   87840    19.915722    1.0379768    23.941437    6.0818842     4.525438    1.5564463 0.0017325788 -0.022066905    4.5457723 
+   87850    20.160163    1.0148377    23.666662    6.0643641     4.542615    1.5217491 0.0016170308 -0.021672871    4.5626708 
+   87860    20.217726    1.0008446    23.903681    6.0444845    4.5437181    1.5007665 0.0016595891 -0.021930816    4.5639893 
+   87870    20.308801    1.0152871    23.537896    6.0690139    4.5465908    1.5224231 0.0017825817 -0.022798031    4.5676063 
+   87880    20.320358     1.022945    23.741198     6.074134     4.540228     1.533906 0.0019879189 -0.023709063    4.5619492 
+   87890     20.30321    1.0167955    23.805443    6.0636186    4.5389338    1.5246848 0.0020587982 -0.024112111    4.5609871 
+   87900    20.452672    1.0304894    23.747264    6.0763069     4.531088    1.5452188 0.0020230609 -0.023631723    4.5526967 
+   87910     20.28434    1.0125893    23.764643    6.0722832    4.5539055    1.5183777   0.00191294  -0.02276089    4.5747535 
+   87920    20.335729    1.0132884    23.686373    6.0459737    4.5265478     1.519426 0.0020568984 -0.023793052    4.5482839 
+   87930    20.071515    1.0015063    23.689676    6.0381817     4.536423    1.5017588 0.0020955746 -0.023886464    4.5582139 
+   87940    20.229839    1.0109427    23.648227    6.0406156     4.524707    1.5159086  0.002064867 -0.023617599    4.5462597 
+   87950    20.514556   0.99487906    23.754203    6.0287752     4.536954    1.4918212 0.0019131184 -0.022299228    4.5573401 
+   87960    20.180684   0.99878789    23.660122     6.029469    4.5317866    1.4976824 0.0018482829  -0.02219237    4.5521307 
+   87970    20.198738   0.99306262    23.579978     6.039536    4.5504386    1.4890974 0.0020377715 -0.022937935    4.5713388 
+   87980    20.351567    1.0131973    23.959037    6.0275731    4.5082838    1.5192893 0.0018821656 -0.022373097    4.5287748 
+   87990     20.30862    1.0043373    23.557749    6.0340916    4.5280877    1.5060039 0.0015928229 -0.021048531    4.5475434 
+   88000    20.415974    1.0212855    23.652235    6.0536083    4.5221907    1.5314177 0.0015066343 -0.020437189    4.5411212 
+   88010    20.724058    1.0048322    23.951551    6.0427886    4.5360428    1.5067459 0.0015254055 -0.020689828    4.5552072 
+   88020    20.472006    1.0238211    23.767179    6.0631006    4.5278809    1.5352197 0.0017364881 -0.021754483    4.5478989 
+   88030    20.311058    1.0137056    23.790859    6.0605796     4.540528    1.5200516  0.001869758 -0.022309345    4.5609676 
+   88040    20.013796    1.0159231    23.614986    6.0785131    4.5551364    1.5233768 0.0018180504 -0.021743702     4.575062 
+   88050    20.297277    1.0213902    23.875929    6.0697916     4.538217    1.5315746 0.0018419578  -0.02181861    4.5581937 
+   88060     19.87456     1.006611    23.827818    6.0545718    4.5451585    1.5094132 0.0016568723 -0.021228168    4.5647298 
+   88070    20.125105     1.005401    23.751578    6.0269692    4.5193704    1.5075988 0.0014944066 -0.020694498    4.5385705 
+   88080    19.902615   0.99290631    23.744103    6.0245273    4.5356643     1.488863 0.0014575204 -0.020362637    4.5545694 
+   88090     19.94115     1.007563     23.80186    6.0288933    4.5180526    1.5108407 0.0016931398 -0.021459029    4.5378185 
+   88100    20.067755    0.9852243    23.637766    6.0123643    4.5350204    1.4773438 0.0018064044 -0.022095373    4.5553094 
+   88110    20.084972     1.001138    23.683257    6.0314643    4.5302578    1.5012065 0.0016751992 -0.021802821    4.5503855 
+   88120    20.012855    1.0186958    23.329703    6.0656162    4.5380819    1.5275343  0.001782984 -0.022600278    4.5588992 
+   88130    20.198419    1.0132772    23.706844    6.0614976    4.5420884    1.5194092  0.001951201 -0.023214169    4.5633513 
+   88140    20.631114    1.0261494     23.64217    6.0717652    4.5330542     1.538711 0.0018746983 -0.022869829    4.5540493 
+   88150    20.485701    1.0335601    23.864491    6.0867756    4.5369523    1.5498233 0.0017541335 -0.022455985    4.5576541 
+   88160    20.331454     1.014445    23.781922    6.0639915    4.5428311    1.5211603 0.0015924477 -0.021782889    4.5630216 
+   88170    20.299315    1.0129849    23.702522     6.053813    4.5348423    1.5189708 0.0017471681 -0.022194171    4.5552893 
+   88180    20.272379    1.0130574    23.892599    6.0308515     4.511772    1.5190795 0.0016718437 -0.021650505    4.5317506 
+   88190    20.302866     1.021793    23.995121    6.0485274    4.5163489    1.5321786  0.001540798 -0.021151559    4.5359596 
+   88200    20.076698    1.0102942    23.840559    6.0168266    4.5018904    1.5149362 0.0016970848 -0.021470959    4.5216643 
+   88210    19.870515   0.98996555    23.487744    6.0035207    4.5190674    1.4844533 0.0017380886 -0.021351112    4.5386804 
+   88220    20.339625   0.99549108    23.612485    6.0034205    4.5106817    1.4927389 0.0016572805 -0.021491677     4.530516 
+   88230    20.139722    1.0107389    23.616276    6.0291125    4.5135096    1.5156029 0.0014600898 -0.021106107    4.5331556 
+   88240    20.271208   0.98742014    23.507502    6.0155112    4.5348747    1.4806365 0.0012817338 -0.020537756    4.5541308 
+   88250    20.018115   0.99799234    23.548926    6.0436956    4.5472061    1.4964895 0.0013750794 -0.020691907    4.5665229 
+   88260    20.185085    1.0000244    23.712561    6.0356799    4.5361434    1.4995365 0.0015706943  -0.02155255    4.5561252 
+   88270    19.731805   0.98811132    23.625745    6.0179825    4.5363096    1.4816729 0.0015122274 -0.021640241    4.5564376 
+   88280    20.014265   0.99753967    23.420567    6.0382159    4.5424052    1.4958107 0.0014089053 -0.020840371    4.5618366 
+   88290    20.057723   0.99460253    23.531358    6.0114205    4.5200141    1.4914065 0.0014537544 -0.021307721     4.539868 
+   88300    19.761425    1.0006112    23.696229    5.9878248    4.4874083    1.5004165 0.0016753773 -0.022225523    4.5079584 
+   88310    20.261625    1.0036713    24.011015    6.0180766    4.5130715    1.5050051 0.0018539641 -0.022944154    4.5341617 
+   88320    20.302608   0.99547098     23.63705     6.019349    4.5266403    1.4927087 0.0018690581 -0.023031791     4.547803 
+   88330    20.320279   0.98667851    23.562183    5.9984856    4.5189611    1.4795244  0.001688605 -0.022229608    4.5395021 
+   88340    20.022116   0.98885765    23.772846    5.9935995    4.5108075     1.482792 0.0018155444 -0.022601155    4.5315931 
+   88350    20.258834   0.99263904    23.837179    6.0041858    4.5157236    1.4884622 0.0017494918 -0.021859222    4.5358333 
+   88360    20.060066    1.0060503    23.736868    6.0301687    4.5215963    1.5085724 0.0015416196 -0.021030272     4.541085 
+   88370    20.421621    1.0204184    23.682981    6.0400873    4.5099699    1.5301174 0.0015026103 -0.020731472    4.5291988 
+   88380    20.201356   0.98747611    23.840455    6.0222587    4.5415383    1.4807204 0.0015680351 -0.020490797    4.5604611 
+   88390    20.328224   0.99933916    23.478175    6.0148714    4.5163624    1.4985091 0.0015778019  -0.01993747     4.534722 
+   88400    20.253509    1.0083891    23.875045    6.0403048    4.5282253    1.5120795 0.0014994659 -0.019804981    4.5465308 
+   88410    20.235328    1.0004782    23.964631    6.0150152    4.5147982    1.5002171 0.0015750786 -0.020238004    4.5334611 
+   88420    20.558311    1.0137651    23.871765    6.0396191    4.5194783    1.5201408 0.0017277019  -0.02081363    4.5385643 
+   88430     20.45113   0.99891681    23.752513    6.0228612    4.5249854    1.4978758 0.0016779676 -0.021408909    4.5447163 
+   88440    20.386446    1.0177172    23.766113    6.0503552    4.5242883    1.5260669 0.0016091596 -0.021589219    4.5442683 
+   88450    20.432514    0.9955822    23.570223    6.0458506    4.5529751    1.4928755 0.0017207551 -0.021855565    4.5731099 
+   88460    20.424751     1.021709    23.860079    6.0598829    4.5278303    1.5320527 0.0017472123  -0.02189087    4.5479739 
+   88470    19.948397    1.0128666    23.660926    6.0417679    4.5229744    1.5187935 0.0017095017  -0.02165354    4.5429184 
+   88480    20.121074   0.99256464    23.494805    6.0207702    4.5324195    1.4883507 0.0017066262 -0.021472908    4.5521858 
+   88490    20.450176    1.0014957    23.867222    6.0458991    4.5441562    1.5017429  0.001502367 -0.020199881    4.5628537 
+   88500    20.170932    1.0058975      23.9908    6.0212282     4.512885    1.5083432 0.0014149795 -0.019370723    4.5308407 
+   88510     20.32755   0.99967067     23.68429    6.0226171     4.523611    1.4990062 0.0013497971 -0.018770966    4.5410321 
+   88520    20.191604    1.0002149    23.813699    6.0235346    4.5237123    1.4998223 0.0013591905 -0.018991282    4.5413444 
+   88530    20.179963      1.00436    23.867431    6.0510582    4.5450204    1.5060378 0.0012909412 -0.018380851    4.5621103 
+   88540    20.243944   0.99983798    23.699807    6.0467897    4.5475326    1.4992571  0.001287974 -0.018325489    4.5645701 
+   88550    20.274005    1.0088177    23.575262    6.0649396    4.5522174    1.5127222  0.001494444 -0.019089827    4.5698128 
+   88560       20.202    1.0116258    23.753358    6.0844626    4.5675297    1.5169329 0.0014127738  -0.01909444    4.5852114 
+   88570    20.314691    1.0340195    24.071184      6.07585    4.5253378    1.5505122 0.0014578507  -0.01955761    4.5434376 
+   88580    20.201687    1.0192999    23.873569    6.0617162    4.5332759    1.5284403  0.001521768 -0.019945728    4.5516998 
+   88590    20.065538    1.0135606    23.706746    6.0523866    4.5325525    1.5198341 0.0014084326 -0.019938628    4.5510827 
+   88600    20.073807    1.0170673    23.795038    6.0369199    4.5118275    1.5250924 0.0013625566 -0.020087221    4.5305522 
+   88610    20.298995   0.98368611    23.516992    5.9975447    4.5225074    1.4750373 0.0014716927 -0.020879003    4.5419147 
+   88620    20.461123   0.99110323    23.664167    6.0158599    4.5297006    1.4861593 0.0015469691 -0.021246016    4.5493997 
+   88630    20.209691    1.0012432    23.705461    6.0064168    4.5050526    1.5013642 0.0017546012 -0.022187783    4.5254858 
+   88640    20.349177   0.99643809     23.50926    6.0273952    4.5332362    1.4941589 0.0016852363 -0.022253046     4.553804 
+   88650    20.283347    1.0013744    23.450858    6.0375714    4.5360105    1.5015609 0.0017005002 -0.022213729    4.5565238 
+   88660    20.135367    1.0227928     24.07647    6.0267018    4.4930239    1.5336779 0.0018111607 -0.022382631    4.5135954 
+   88670    20.366375   0.99793448    23.708736    6.0473482    4.5509454    1.4964027 0.0019768386 -0.023239042    4.5722076 
+   88680    20.369433    1.0144565    23.813583    6.0371681    4.5159906    1.5211775 0.0020260974 -0.023191706    4.5371562 
+   88690    20.143343    1.0113899    23.630379    6.0338184    4.5172392    1.5165792 0.0021015816 -0.023767025    4.5389046 
+   88700    19.955174   0.99797936    23.653262     6.042431     4.545961    1.4964701 0.0020734038 -0.023476451     4.567364 
+   88710    20.121004    1.0180599    23.836105    6.0437365    4.5171557    1.5265808 0.0017982682 -0.022352855    4.5377103 
+   88720    20.293318    1.0142317    23.716399    6.0635746    4.5427341    1.5208405 0.0018441935 -0.022158941    4.5630488 
+   88730    20.274937     1.022863    23.836406    6.0573606    4.5235776     1.533783 0.0018811726 -0.021877107    4.5435736 
+   88740    19.979469    1.0236769    23.763337    6.0593879    4.5243844    1.5350035 0.0016826623  -0.02079175    4.5434934 
+   88750    20.445113    1.0175912    23.617923    6.0472113    4.5213333    1.5258781 0.0016751604   -0.0213564    4.5410145 
+   88760    20.547676    1.0009287    23.546305    6.0620273    4.5611348    1.5008925 0.0018310259 -0.021803688    4.5811074 
+   88770    20.105118    1.0219073    23.665723    6.0484583    4.5161084      1.53235 0.0018196077 -0.022205221     4.536494 
+   88780    20.418811    1.0043055    23.580738    6.0217889    4.5158329     1.505956 0.0018161634 -0.022019482    4.5360362 
+   88790    20.521022    1.0105149    23.702272    6.0313894    4.5161224    1.5152671 0.0017170615 -0.021702258    4.5361076 
+   88800    20.558547   0.99378709    23.651989    6.0118956    4.5217118    1.4901837 0.0017958538 -0.022154546    4.5420705 
+   88810    19.934941   0.98964266    23.320571    6.0189434    4.5349743    1.4839692 0.0017289966 -0.021702471    4.5549477 
+   88820    19.998791    1.0095216    23.893942    6.0564548    4.5426772    1.5137776 0.0016740185 -0.021393744    4.5623969 
+   88830    20.318893    1.0010267    23.960305    6.0408478    4.5398082    1.5010396 0.0018309969 -0.022541204    4.5605184 
+   88840    20.151263    1.0191896    23.901845    6.0380603    4.5097855    1.5282747  0.001843741 -0.022507065    4.5304489 
+   88850    20.160709   0.99973923    23.694273    6.0152937    4.5161847     1.499109 0.0018031486 -0.022407917    4.5367895 
+   88860    20.049444    1.0043153    23.711373    6.0182945    4.5123236    1.5059709 0.0019608461 -0.023301703    4.5336645 
+   88870    20.097199    1.0203114    23.447803    6.0524911    4.5225341     1.529957 0.0019663029 -0.023437533    4.5440053 
+   88880    20.111972    1.0110846    23.787806    6.0442275    4.5281061    1.5161214 0.0019203889  -0.02319916    4.5493849 
+   88890    20.099178    1.0159754    23.721315    6.0475925    4.5241373    1.5234552 0.0018541457 -0.022931017    4.5452141 
+   88900    19.602022    1.0125422    23.697627    6.0372319    4.5189248    1.5183071 0.0020145337 -0.023531273    4.5404415 
+   88910    19.862785     1.015886    23.492849    6.0505788    4.5272578     1.523321  0.002095603 -0.023815503    4.5489777 
+   88920    20.411954   0.99943594    23.954075    6.0433825    4.5447283    1.4986542 0.0020718274 -0.023344726    4.5660012 
+   88930    20.175196   0.99189897    23.844151    6.0310965     4.543744    1.4873525 0.0020579573 -0.023247795    4.5649338 
+   88940     20.06193   0.99387681     23.48847    6.0217943     4.531476    1.4903183 0.0018794084 -0.022496419     4.552093 
+   88950    20.149994    1.0002753    23.758199    6.0286383    4.5287254    1.4999129 0.0016604673 -0.020994775    4.5480597 
+   88960    20.364071    1.0204808    23.383163    6.0548745    4.5246636    1.5302109 0.0016925286 -0.021393568    4.5443646 
+   88970    20.471831    1.0033347    23.753005    6.0349148    4.5304145    1.5045003 0.0017665129 -0.021584048     4.550232 
+   88980    20.206255    1.0036619    23.581527     6.034648    4.5296571    1.5049909 0.0016494799 -0.020540669    4.5485483 
+   88990    20.378439    1.0203121    23.957206    6.0620304    4.5320725    1.5299579 0.0016087568 -0.019974063    4.5504378 
+   89000    20.363019    0.9990058    23.743548    6.0373131    4.5393039    1.4980092 0.0015704834 -0.020080524     4.557814 
+   89010    20.443123     1.013898    23.600993     6.039507    4.5191669    1.5203401 0.0017939856 -0.021184212    4.5385572 
+   89020    20.232783    1.0166882    23.724896    6.0737039      4.54918    1.5245239 0.0019642282 -0.022203485    4.5694192 
+   89030    20.049703    1.0092962    23.574175    6.0638691    4.5504295    1.5134396 0.0020632349 -0.022716793    4.5710831 
+   89040    20.404037    0.9970282    23.874223    6.0433054    4.5482616    1.4950438 0.0019078236 -0.022049672    4.5684035 
+   89050    19.510904    0.9902153    23.421738    6.0192364    4.5344085    1.4848278 0.0017677271 -0.021643286    4.5542841 
+   89060    20.048737    1.0202073    23.818182    6.0521459    4.5223452    1.5298008  0.001887115 -0.022079946     4.542538 
+   89070    20.106086    1.0159648    23.533743    6.0689129    4.5454736    1.5234392 0.0018493748 -0.022278838    4.5659031 
+   89080    20.059907   0.99743979    23.504406    6.0625706    4.5669096     1.495661  0.001865681 -0.022600946    4.5876449 
+   89090    19.900031    1.0105253    23.820627    6.0667993    4.5515166    1.5152827  0.001803448 -0.022400157    4.5721134 
+   89100    19.789603    1.0245181    23.786417    6.0716206    4.5353558    1.5362648 0.0016495873 -0.021575573    4.5552817 
+   89110    20.359663    1.0079771    24.007767    6.0653295    4.5538678    1.5114617 0.0015973282 -0.021307931    4.5735784 
+   89120     20.17529    1.0189319    23.901352    6.0699942    4.5421058    1.5278884 0.0014337125 -0.020737881      4.56141 
+   89130     20.15745    1.0347214    23.604513    6.0868779    4.5353131    1.5515648 0.0011820485 -0.019895858    4.5540269 
+   89140    19.709987    1.0131789    23.675014    6.0536429    4.5343812    1.5192617 0.0011170284 -0.019662024    4.5529262 
+   89150    20.230509     1.012607    23.678087    6.0276003    4.5091961    1.5184042 0.0013135924 -0.020469149    4.5283517 
+   89160    20.363434     1.004006    23.727708    6.0351827    4.5296756     1.505507 0.0014991847 -0.021308318    4.5494848 
+   89170    20.170297    1.0258833    23.532918    6.0532553    4.5149432    1.5383121 0.0016963074 -0.022448638    4.5356956 
+   89180    20.362289    1.0094749    23.831779    6.0303772    4.5166696    1.5137076 0.0016387864 -0.022185247    4.5372161 
+   89190    20.291134    1.0105596    23.519624    6.0516279    4.5362937    1.5153341 0.0018450227 -0.022633726    4.5570824 
+   89200    20.225399    1.0066974    23.862028    6.0380572    4.5285144    1.5095428 0.0019684855 -0.023025784    4.5495717 
+   89210    19.807501    1.0075215    23.526242    6.0509929    4.5402144    1.5107785 0.0019254604 -0.022964005    4.5612529 
+   89220    20.069062    1.0266698    23.897054    6.0663369    4.5268455    1.5394914 0.0020620383   -0.0239379    4.5487213 
+   89230    20.042967     1.020827     23.63292    6.0621165    4.5313863    1.5307301 0.0021533544 -0.024423178    4.5536561 
+   89240    20.081532    1.0196433    23.762253     6.062043    4.5330879    1.5289551 0.0021699736 -0.024467661    4.5553856 
+   89250    20.212644    1.0164847    23.821747    6.0566675    4.5324487    1.5242188 0.0021515425 -0.024236501    4.5545337 
+   89260    20.210073    1.0167619    24.033758    6.0573214    4.5326869    1.5246345 0.0019989505 -0.023359143    4.5540471 
+   89270    20.004879   0.99329734    23.599275    6.0466099    4.5571606    1.4894494 0.0018713354 -0.022709654    4.5779989 
+   89280    19.916838    1.0119163    23.627175    6.0550996    4.5377312    1.5173685  0.001966464 -0.023106138    4.5588708 
+   89290    20.097222    1.0182924      23.7955     6.039476    4.5125466    1.5269295 0.0021175571 -0.023835596    4.5342646 
+   89300    19.898924    1.0010622    23.639849    6.0411382    4.5400454    1.5010927 0.0020109352 -0.023279635    4.5613141 
+   89310    19.768864    1.0234843    23.879922    6.0580263    4.5233116    1.5347147 0.0018229508 -0.022574234    4.5440628 
+   89320     19.96679    1.0090688    23.819746    6.0614718    4.5483731    1.5130987 0.0015490463 -0.021713966     4.568538 
+   89330    19.952724    1.0155006    23.721873    6.0631895    4.5404463    1.5227432 0.0012844999 -0.019957111    4.5591189 
+   89340    20.293085    1.0170463    23.499874    6.0670844    4.5420235     1.525061 0.0013068968 -0.019602461     4.560319 
+   89350    20.203402    1.0188554    23.760127    6.0595683    4.5317946    1.5277737  0.001289357 -0.019748441    4.5502537 
+   89360    20.242342   0.98766312    23.551243    6.0503995    4.5693987    1.4810009 0.0012570333 -0.019290548    4.5874322 
+   89370    20.437626   0.99889488    23.768306    6.0391891    4.5413462    1.4978429 0.0013430629 -0.019870543    4.5598737 
+   89380    20.324294    1.0086478    23.771255    6.0472866    4.5348193    1.5124673 0.0014710761 -0.020319966    4.5536682 
+   89390    20.143203    1.0063292    23.721173    6.0224606    4.5134699    1.5089906 0.0014916753 -0.020430977    4.5324093 
+   89400    20.107623   0.97769473    23.746028    5.9986296    4.5325764    1.4660533 0.0017744772 -0.021966885    4.5527688 
+   89410    20.172164   0.99913365     23.96118     5.999625    4.5014241    1.4982009  0.002031279 -0.023104626    4.5224974 
+   89420    20.245187   0.98002684    23.411015    6.0140781    4.5445279    1.4695502   0.00189763 -0.022172641    4.5648029 
+   89430    20.267132    1.0097824    23.691785    6.0509122    4.5367435    1.5141688  0.001755813 -0.021188582    4.5561762 
+   89440    19.934437    1.0128911    23.539705    6.0501569    4.5313267    1.5188302  0.001581386 -0.020494309    4.5502396 
+   89450    19.667514    1.0099422    23.743985    6.0492737    4.5348654    1.5144084 0.0014007623 -0.019915949    4.5533806 
+   89460    19.703627   0.99203952     23.52184    6.0428266    4.5552634    1.4875633 0.0012335126 -0.019178515    4.5732084 
+   89470      19.7446    1.0081125    23.874674    6.0288772    4.5172126    1.5116647 0.0012509817 -0.018690495    4.5346521 
+   89480    20.194646    1.0325606    23.705717    6.0465399    4.4982153    1.5483246 0.0014936706 -0.019646885    4.5163685 
+   89490    20.031368    1.0135122    23.798355    6.0796417    4.5598802    1.5197615 0.0016177196 -0.020537713    4.5788002 
+   89500    19.736774    1.0035191    23.602631    6.0610335    4.5562565    1.5047769 0.0015459014 -0.020455305    4.5751659 
+   89510    20.098017    1.0147546    23.757873    6.0559459    4.5343214    1.5216245 0.0015243726 -0.020666177    4.5534632 
+   89520    20.151422    1.0187662    23.547498    6.0645029     4.536863    1.5276399 0.0015781487 -0.020824114     4.556109 
+   89530    20.310871    1.0221234     23.92891    6.0678317    4.5351576    1.5326741   0.00177463 -0.022141322    4.5555243 
+   89540    20.275757    1.0295086    24.122209    6.0821525    4.5384044    1.5437482 0.0018959763 -0.022835473    4.5593439 
+   89550    20.219683    1.0075226    23.532025    6.0484528    4.5376727    1.5107801 0.0018554784 -0.022378196    4.5581954 
+   89560        19.97    1.0035187    23.789955    6.0185057    4.5137293    1.5047764 0.0016875437 -0.021819125    4.5338609 
+   89570    19.918637    1.0017657    23.761023    6.0128696     4.510722    1.5021477 0.0017152855 -0.022009217    4.5310159 
+   89580    20.141625   0.97626908     23.57516    5.9910182    4.5271027    1.4639155 0.0017300831 -0.021788253    4.5471609 
+   89590    19.877562   0.99483868    23.704988      5.99673    4.5049694    1.4917606 0.0016359702 -0.021478321    4.5248118 
+   89600    20.353421   0.98990254    23.742281    6.0071189    4.5227601    1.4843589 0.0016107887 -0.021821164    4.5429705 
+   89610     20.28163    1.0093485    23.465803    6.0581814    4.5446633    1.5135181 0.0017239074  -0.02276196    4.5657014 
+   89620    20.433722    1.0156991    23.655711    6.0404315    4.5173906    1.5230408 0.0015528595 -0.022300936    4.5381387 
+   89630    20.055233    1.0069599    23.609526    6.0466947    4.5367583    1.5099363 0.0014012404 -0.021372775    4.5567299 
+   89640    20.007394    1.0072317    23.670183    6.0409966    4.5306526    1.5103439 0.0013112747 -0.020416727    4.5497581 
+   89650     19.83313    1.0177209     23.87245    6.0649748    4.5389024    1.5260724 0.0012879398 -0.019512874    4.5571273 
+   89660    20.270902    1.0300246    23.718185    6.0684982    4.5239763    1.5445219 0.0013304319 -0.019527551    4.5421734 
+   89670    19.690218    1.0244932    23.665929    6.0687273    4.5324998    1.5362276 0.0014696766 -0.019882448    4.5509125 
+   89680    20.060752    1.0227181    23.846436    6.0756015    4.5420357    1.5335658 0.0014820652 -0.019859696    4.5604133 
+   89690    20.027284    1.0082452    23.576499    6.0641717     4.552308    1.5118637 0.0014057275 -0.019677512    4.5705798 
+   89700    20.032813    1.0070875    23.772822     6.050205    4.5400772    1.5101277 0.0014070372 -0.019988226    4.5586584 
+   89710    20.224367    1.0084333    23.931325    6.0599006    4.5477549    1.5121458 0.0014392155 -0.020546042    4.5668617 
+   89720    20.106696   0.99441167    23.713843    6.0549675    4.5638472    1.4911203 0.0014917318 -0.020808432    4.5831639 
+   89730    20.342589    1.0111108    23.461408    6.0516037     4.535443    1.5161607 0.0015473013 -0.020888075    4.5547838 
+   89740    20.437727    1.0102131    23.845908    6.0527892    4.5379747    1.5148145 0.0015632356 -0.020562895    4.5569744 
+   89750    20.290269    1.0318346    23.881224    6.0513526    4.5041165     1.547236 0.0015947881 -0.021030123    4.5235519 
+   89760    19.975791    1.0183766    23.846749    6.0531216    4.5260658    1.5270558 0.0016971505 -0.021745473    4.5461141 
+   89770    19.805088    1.0059229    23.618314    6.0518672    4.5434859    1.5083813 0.0018476325 -0.022519993    4.5641582 
+   89780    20.265927    1.0104897    23.890124    6.0538147    4.5385854    1.5152294 0.0017950583 -0.022443071    4.5592334 
+   89790    20.071564    1.0058188      23.5671    6.0294243     4.521199    1.5082252 0.0016394859 -0.021974137    4.5415337 
+   89800    20.296656    1.0008498    23.762393     6.005073    4.5042988    1.5007742 0.0016945151  -0.02211092    4.5247152 
+   89810    20.363257   0.99307608    23.696574    6.0067649    4.5176473    1.4891176 0.0017537677 -0.022184859    4.5380784 
+   89820     20.11598   0.97574807     23.69319    5.9773155    4.5141813    1.4631342 0.0017782158 -0.022352657    4.5347557 
+   89830    20.175413   0.98826432    23.428949    5.9982511    4.5163487    1.4819023 0.0020230344 -0.023387554    4.5377132 
+   89840    19.643151   0.97195366     23.75258    5.9809005    4.5234559    1.4574445 0.0020696649 -0.023414881    4.5448012 
+   89850    19.812583   0.99014162    23.511027    6.0076383    4.5229209    1.4847174 0.0018270492 -0.022187691    4.5432815 
+   89860    20.095013   0.99138988    23.873586    6.0082737    4.5216846    1.4865891 0.0017506457 -0.022389202    4.5423232 
+   89870    20.133352   0.99105131    23.628768    5.9928177    4.5067363    1.4860814  0.001878076 -0.022988564    4.5278468 
+   89880    20.420871   0.97268819    23.725322    5.9872168    4.5286708    1.4585459  0.002046987 -0.023846153      4.55047 
+   89890      20.0347    1.0116057    23.753575    6.0169842    4.5000815    1.5169027 0.0020937613 -0.024383756    4.5223715 
+   89900    20.180165   0.99669325    23.797665    6.0171788    4.5226372    1.4945415 0.0019219618 -0.023417232    4.5441325 
+   89910    20.306377   0.99091598    23.738689    5.9941997    4.5083212    1.4858785 0.0018791327  -0.02324724    4.5296893 
+   89920     20.31465   0.99179921    23.740559    6.0132512    4.5260483    1.4872029 0.0017053949 -0.022571494    4.5469144 
+   89930    20.287885    1.0186794    23.494312    6.0535081    4.5259983    1.5275098 0.0016431828 -0.022577747    4.5469328 
+   89940    20.516778    1.0241319    23.473787    6.0702757    4.5345899    1.5356858 0.0016031746 -0.022205897    4.5551926 
+   89950    20.369937    1.0248528    23.980537     6.067412    4.5306452    1.5367668 0.0014927368 -0.021193717    4.5503462 
+   89960    20.362916    1.0255688    23.828308    6.0461723    4.5083318    1.5378405 0.0014465679 -0.020676329    4.5275616 
+   89970      20.0678    1.0033814    23.674766    6.0678527    4.5632824    1.5045703 0.0014623226 -0.020784242    4.5826043 
+   89980    20.375768    1.0138566    23.829101    6.0386964    4.5184183     1.520278 0.0016786711 -0.021528198    4.5382679 
+   89990    20.206088    1.0193896    23.521407    6.0497396    4.5211649    1.5285747 0.0017531684 -0.022036027    4.5414477 
+   90000    19.427738    1.0316518    23.740367    6.0713823    4.5244205    1.5469619 0.0019070642 -0.022479255    4.5449926 
+   90010    20.061017    1.0021963    23.722915    6.0340061    4.5312127    1.5027934 0.0018501255  -0.02220921    4.5515718 
+   90020    20.412926    1.0095257    23.915358    6.0406205    4.5268368    1.5137838 0.0016579626 -0.021350726    4.5465295 
+   90030    20.082276    1.0139214    23.893386     6.029595    4.5092198    1.5203752 0.0016748937 -0.021083587    4.5286285 
+   90040    20.171962    1.0169648    23.864229    6.0678143    4.5428755    1.5249388 0.0015371924 -0.020879081    4.5622174 
+   90050    20.074398    1.0323086    23.984709    6.0877831    4.5398364    1.5479467 0.0015894354 -0.021318932    4.5595659 
+   90060     20.05497    1.0368727    23.698756    6.0843608    4.5295702    1.5547907  0.001611073 -0.021548382    4.5495075 
+   90070    20.221727    1.0257324    23.558091    6.0583868    4.5203011    1.5380857  0.001695846 -0.021509516    4.5401148 
+   90080    20.325188   0.99941774    23.760754    6.0283592    4.5297323    1.4986269 0.0019149105  -0.02280576    4.5506232 
+   90090    20.328073    1.0104456    23.670157    6.0227636    4.5076004    1.5151631 0.0020085157 -0.023563114     4.529155 
+   90100    20.456212   0.98479114    23.225869    6.0071399    4.5304456    1.4766943 0.0020300076 -0.023309216    4.5517248 
+   90110    20.380608   0.99154897    23.433637     6.019108    4.5322803    1.4868277 0.0020175983 -0.022684451    4.5529472 
+   90120    19.976123     0.982028    23.785266    6.0271417    4.5545907     1.472551 0.0020654583 -0.022926005    4.5754513 
+   90130     20.25964    0.9985469    23.726751    6.0302014    4.5328803    1.4973211 0.0020130579  -0.02245503    4.5533223 
+   90140    20.209166     1.017294    23.800903    6.0307589    4.5053266    1.5254323 0.0019852397 -0.022266856    4.5256082 
+   90150    20.199066     1.014164    23.600151    6.0427587    4.5220198     1.520739 0.0018179375 -0.021313652    4.5415155 
+   90160    20.036608    1.0300956    23.781791    6.0619735    4.5173452    1.5446283 0.0015936655 -0.020424232    4.5361758 
+   90170    20.450896   0.99976699    23.724306    6.0515808    4.5524302    1.4991506 0.0015424656  -0.01964154    4.5705293 
+   90180    20.220265    1.0107812    23.653712    6.0445827    4.5289162    1.5156665   0.00153259 -0.020230087    4.5476137 
+   90190    20.204454    1.0029517     23.56477    6.0519444    4.5480183    1.5039261 0.0016880887 -0.020883733     4.567214 
+   90200    20.097027    1.0042796    23.680188    6.0262704    4.5203532    1.5059172 0.0019018372 -0.021713785    4.5401651 
+   90210    20.285476    1.0127392    23.588348    6.0482727    4.5296703    1.5186025 0.0020556179 -0.022188246    4.5498029 
+   90220    19.752988    1.0208278    23.820262    6.0561214    4.5253901    1.5307312 0.0020163187 -0.021798387    4.5451722 
+   90230    20.086056    1.0133405    23.855031     6.071603    4.5520988    1.5195041 0.0017597835 -0.020735875    4.5710749 
+   90240    20.123426     1.015726    23.609368    6.0569009    4.5338198    1.5230811 0.0018052606 -0.021406788    4.5534213 
+   90250    20.453171    1.0221517    23.701737    6.0535404    4.5208239    1.5327165 0.0017978571 -0.021584739    4.5406108 
+   90260     20.26421   0.99982424    23.656891    6.0433337    4.5440972    1.4992365 0.0016889461 -0.021005634    4.5634139 
+   90270    19.850932    1.0214233    23.829651    6.0510987    4.5194744    1.5316242 0.0017250295 -0.020412363    4.5381618 
+   90280    20.121473    1.0243705    23.842227    6.0755296     4.539486    1.5360436 0.0018442252 -0.020615782    4.5582576 
+   90290    20.271006    1.0204193    23.837053    6.0593527     4.529234    1.5301187 0.0017850803 -0.020350758    4.5477997 
+   90300    20.559092   0.99182254    23.703669    6.0416528    4.5544149    1.4872379 0.0016740836 -0.020519491    4.5732603 
+   90310    20.241087    1.0230019    23.651752    6.0625567    4.5285653    1.5339914 0.0015612431 -0.019528147    4.5465322 
+   90320    19.933227    1.0114944    23.635056    6.0456861    4.5289502    1.5167359 0.0013952061  -0.01847497      4.54603 
+   90330    19.647435     1.006748    23.886728    6.0481026    4.5384839    1.5096187 0.0012101713 -0.017243972    4.5545177 
+   90340    19.835961      1.00024    23.921771    6.0317551    4.5318952      1.49986 0.0011188191 -0.016988278    4.5477646 
+   90350    20.242653     1.010166    23.582221    6.0333962    4.5186522     1.514744 0.0011391212 -0.017488466    4.5350015 
+   90360    19.976565   0.98978419    23.697275    6.0310851    4.5469037    1.4841814 0.0013315699 -0.018868359    4.5644405 
+   90370    20.341117   0.99728112    23.708278    6.0148463    4.5194233     1.495423 0.0014313529 -0.019940473    4.5379324 
+   90380    20.313862    1.0052113    23.585435    6.0219736    4.5146593    1.5073143 0.0015502369 -0.020433524    4.5335426 
+   90390    20.445169    1.0033362    23.803718    6.0429947     4.538492    1.5045027 0.0014996671 -0.020239243    4.5572316 
+   90400    20.126894    1.0264298    23.714367    6.0644092    4.5252776    1.5391315  0.001594664 -0.021342499    4.5450255 
+   90410    19.876606    1.0035993    23.592407    6.0698246    4.5649275    1.5048971 0.0017345357  -0.02192239    4.5851153 
+   90420    20.093293    1.0092551    23.587797     6.053573    4.5401949    1.5133781 0.0016764762 -0.021512455    4.5600309 
+   90430    20.406809   0.98831177    23.531446    6.0160874    4.5341139    1.4819735 0.0017372666 -0.021837565    4.5542142 
+   90440    20.097895    1.0060848    23.658597     6.055345    4.5467209    1.5086241 0.0017406786 -0.021821906    4.5668021 
+   90450    20.201478    1.0231312    23.693624    6.0593438    4.5251585    1.5341853 0.0017268328 -0.021714983    4.5451467 
+   90460    20.223177    1.0140189    23.680664     6.054354    4.5338327    1.5205213 0.0017778248 -0.021901072     4.553956 
+   90470    20.281661   0.99967437    23.933084    6.0251323    4.5261206    1.4990117 0.0017506557 -0.021761237    4.5461312 
+   90480    20.274447    1.0010207    23.785659    6.0427822    4.5417517    1.5010305 0.0016595081 -0.021328554    4.5614207 
+   90490     20.41284    1.0167092    23.948653    6.0455278    4.5209724    1.5245554 0.0015440218 -0.021052042    4.5404804 
+   90500     20.23956     1.017472    23.729924    6.0683503     4.542651    1.5256993 0.0014846403 -0.020783712    4.5619501 
+   90510    20.015949     1.024162    23.446873    6.0762539    4.5405229     1.535731 0.0015390345 -0.021210815    4.5601947 
+   90520    20.134237    1.0085249    23.368792     6.050579    4.5382959    1.5122831 0.0015953307 -0.021267549    4.5579681 
+   90530    20.260762    1.0045395    23.867183    6.0399392    4.5336322     1.506307 0.0014986899 -0.021010346    4.5531438 
+   90540    19.879607    1.0167107     23.46325    6.0700351    4.5454775    1.5245576 0.0014173001 -0.020833729    4.5648939 
+   90550    19.890148   0.99803328    23.873029    6.0343292    4.5377783    1.4965509 0.0013980019 -0.020638909    4.5570192 
+   90560    20.323411   0.99879773    23.730214    6.0267656    4.5290684    1.4976972 0.0014690461  -0.02045544    4.5480548 
+   90570     20.03348      1.00324    23.649414    6.0392548    4.5348964    1.5043584 0.0015851449  -0.02102648    4.5543377 
+   90580    20.244358    1.0107194    23.810903    6.0320379    4.5164643    1.5155737 0.0016398006 -0.020810192    4.5356346 
+   90590    20.111719    1.0085903    23.383784    6.0292651     4.516884    1.5123811 0.0016480149 -0.020168862    4.5354049 
+   90600    20.292078    1.0028575    23.764997    6.0382111    4.5344262    1.5037848 0.0017268507 -0.020180609      4.55288 
+   90610    20.337367   0.99350868    23.760902    6.0551721    4.5654058    1.4897663 0.0016477423 -0.019883022    4.5836411 
+   90620    20.232963    1.0103154    23.586655    6.0479425    4.5329745     1.514968 0.0015465089 -0.019147593    4.5505756 
+   90630    20.058259    1.0096655    23.999268    6.0486803    4.5346869    1.5139934 0.0016030685 -0.019255366    4.5523392 
+   90640      20.4286    1.0047993    23.557121     6.023498    4.5168014    1.5066966 0.0016101163 -0.019735785    4.5349271 
+   90650    20.526222    1.0126151    23.670726    6.0534001    4.5349837    1.5184164 0.0015854123 -0.020256329    4.5536547 
+   90660    20.305254   0.99744418    23.272131    6.0308078    4.5351402    1.4956675 0.0015765215 -0.020827292     4.554391 
+   90670    20.338496    1.0180205    23.829834    6.0419756    4.5154538    1.5265218 0.0015583185 -0.020864957    4.5347604 
+   90680    20.509738     1.016189    23.845922    6.0507222    4.5269467    1.5237755 0.0015931239 -0.021111195    4.5464648 
+   90690    20.160214    1.0019496    23.518874    6.0603057    4.5578823    1.5024234 0.0013952298 -0.020527373    4.5770144 
+   90700    19.930926    1.0186695    23.841071    6.0441446    4.5166497    1.5274949 0.0012492162 -0.020067419    4.5354679 
+   90710    20.483083    1.0068482    23.782313    6.0609878     4.551219    1.5097689 0.0012183966 -0.020018469     4.570019 
+   90720    20.463711    1.0318588     23.96892    6.0605752    4.5133029    1.5472723 0.0013518002 -0.020783119    4.5327342 
+   90730    20.404366       1.0179    23.937192     6.054136     4.527795     1.526341 0.0014837707 -0.021314454    4.5476256 
+   90740     20.27904    1.0100301    23.474994    6.0619361    4.5473959    1.5145402  0.001661018 -0.021727637    4.5674625 
+   90750    20.267111    1.0189951    23.746568    6.0834636    4.5554805    1.5279831 0.0017792417 -0.021976741     4.575678 
+   90760    20.130929    1.0206613    24.071322    6.0832623    4.5527806    1.5304817  0.001788014 -0.022255204    4.5732478 
+   90770    20.026162    1.0216503    23.733078    6.0785113    4.5465467    1.5319646  0.001772676 -0.022427288    4.5672013 
+   90780    20.097217     1.018407    23.623516    6.0658496    4.5387483    1.5271013 0.0017945356 -0.022633184     4.559587 
+   90790    20.147358     1.010559    24.017804    6.0541141    4.5387809    1.5153332 0.0017551379 -0.022624949    4.5596507 
+   90800    20.362175    1.0217001    23.657553    6.0630264    4.5309871    1.5320393 0.0017487665 -0.022540497    4.5517788 
+   90810     20.33207    1.0227535    23.871184    6.0811799    4.5475611    1.5336188 0.0017460352 -0.022228738    4.5680438 
+   90820    19.993207    1.0161184    23.848142     6.054072    4.5304025    1.5236695  0.001770715 -0.022023134    4.5506549 
+   90830    20.144113     1.001977    23.787742    6.0202481    4.5177837    1.5024645 0.0020532974 -0.023000119    4.5387305 
+   90840    20.401918   0.98521489    23.525905    6.0112009    4.5338711    1.4773297 0.0020961274 -0.023488668    4.5552637 
+   90850    20.439803   0.99770434    23.895416     6.029864    4.5338063    1.4960577 0.0022320941 -0.024464915    4.5560391 
+   90860     20.13157   0.97885573    23.860246    6.0143558    4.5465616    1.4677942 0.0021959791 -0.024279032    4.5686446 
+   90870     20.05776    1.0064667      23.7878    6.0092541    4.5000573    1.5091968 0.0021546748 -0.023990023    4.5218927 
+   90880    19.860134    1.0019076    23.549088    6.0269578    4.5245973    1.5023605 0.0020971316 -0.023880694    4.5463808 
+   90890    20.084208   0.99976473    23.784234    6.0307211    4.5315738    1.4991472 0.0018847044 -0.022632401    4.5523215 
+   90900    20.306352    0.9962963    23.651562    6.0237699    4.5298236    1.4939463 0.0017163189 -0.021713361    4.5498206 
+   90910    20.425603   0.98469663    23.374704    5.9986731    4.5221205    1.4765526 0.0017842401 -0.022230561    4.5425669 
+   90920    20.308623   0.97878794     23.40472    5.9918936    4.5242011    1.4676925 0.0016661885 -0.021716185    4.5442511 
+   90930    20.277255    1.0005751    23.458059    6.0167018    4.5163395    1.5003623 0.0015268629 -0.020999591    4.5358122 
+   90940    20.339661    1.0035961    23.891833    6.0430671    4.5381748    1.5048923 0.0014552745 -0.020753189    4.5574727 
+   90950    20.196218    1.0106038    23.573446    6.0551173    4.5397169    1.5154004  0.001560822 -0.021308152    4.5594642 
+   90960    20.254197     1.009247     24.11518    6.0392339    4.5258679    1.5133659 0.0016924947  -0.02235559     4.546531 
+   90970    20.323139    1.0334809    23.786649    6.0617527    4.5120481    1.5497046 0.0018859138 -0.022828448    4.5329907 
+   90980    20.343763    1.0155275    23.574394    6.0650526    4.5422692    1.5227835 0.0020422552 -0.023116894    4.5633438 
+   90990    20.225631    1.0244352     23.65986     6.083966    4.5478254    1.5361406 0.0021808471 -0.023383777    4.5690283 
+   91000    20.338638    1.0169137       23.711    6.0578359    4.5329738    1.5248621 0.0022719185  -0.02394592    4.5546478 
+   91010    20.378116    1.0218563    23.826237    6.0712918    4.5390183    1.5322735  0.002119469  -0.02346061    4.5603594 
+   91020    20.566685    1.0263208    23.796025    6.0688706    4.5299025    1.5389681 0.0019514557 -0.023145811    4.5510969 
+   91030    20.310946    1.0373568    23.763365    6.1027566    4.5472401    1.5555165 0.0016426284  -0.02143249    4.5670299 
+   91040    20.181611    1.0271173     23.55748    6.0983167    4.5581543    1.5401625 0.0016448602 -0.021296712    4.5778061 
+   91050     20.25717     1.038389    23.752689     6.080288    4.5232236    1.5570644 0.0019125498 -0.022230702    4.5435417 
+   91060    19.895871    1.0031614    23.690339    6.0443492    4.5401087    1.5042405 0.0020567325 -0.022899734    4.5609517 
+   91070    20.186418    1.0193247    23.847421    6.0672874      4.53881    1.5284774 0.0022421052 -0.023755699    4.5603236 
+   91080    20.334941    1.0028202    23.808222    6.0475355    4.5438066    1.5037289 0.0024226355 -0.024841385    4.5662253 
+   91090     20.34436    1.0162356    23.980485    6.0469835    4.5231382    1.5238452 0.0024994268 -0.025264564    4.5459034 
+   91100    20.444085    1.0272911      23.8413    6.0707205    4.5302975     1.540423 0.0023395114 -0.024500078    4.5524581 
+   91110    20.138102    1.0386621    23.844629    6.0990748    4.5416011    1.5574738 0.0021317963 -0.023526378    4.5629957 
+   91120     20.25326    1.0568587    23.590556    6.1351727    4.5504131    1.5847596 0.0018762913 -0.022663903    4.5712007 
+   91130    20.236829    1.0182441    23.852643    6.1143188    4.5874618     1.526857 0.0017108096 -0.021821452    4.6075724 
+   91140    20.439159    1.0361264    23.700941    6.0878622    4.5341907    1.5536715 0.0018634717 -0.022375732     4.554703 
+   91150    20.255808    1.0003149    23.598799    6.0269326    4.5269604    1.4999722 0.0017905663 -0.022131629    4.5473015 
+   91160    20.181284   0.99202325    23.770751    6.0173772    4.5298384    1.4875389 0.0019767086 -0.022709285     4.550571 
+   91170    20.290458   0.98742731    23.637979     6.009551    4.5289038    1.4806473 0.0021462863 -0.023135988    4.5498935 
+   91180    20.401812   0.99323343    23.618653    6.0289866    4.5396331    1.4893535 0.0022076065 -0.023265189    4.5606906 
+   91190    20.620386    0.9991747    23.794188    6.0522089    4.5539464    1.4982625 0.0021995341  -0.02393755    4.5756844 
+   91200    20.233457    1.0019208    23.861174     6.048835    4.5464548    1.5023802 0.0018916318 -0.022747461    4.5673106 
+   91210    20.116099    1.0035271    23.694609    6.0439248     4.539136    1.5047888 0.0017026829 -0.021648508    4.5590818 
+   91220    20.188859    1.0100596    23.907762      6.03331    4.5187257    1.5145843  0.001781599 -0.021657011    4.5386011 
+   91230    20.275215   0.98248756    23.864589    5.9990625    4.5258224    1.4732401 0.0019880286 -0.022331003    4.5461654 
+   91240    20.472294    1.0029819    23.624024    6.0280364     4.524065    1.5039714 0.0018771465  -0.02189319     4.544081 
+   91250    20.093048   0.99527527    23.580292    6.0149245    4.5225093    1.4924153 0.0015034583 -0.020123431    4.5411292 
+   91260    20.234355   0.99764833    23.837006    6.0205228    4.5245491    1.4959737 0.0015356955 -0.020280365    4.5432938 
+   91270    20.197836   0.99718388    23.423952    6.0182989    4.5230217    1.4952772 0.0015588041 -0.020566723    4.5420296 
+   91280    20.476404    1.0042912     23.72358    6.0350404    4.5291057    1.5059347 0.0015152262 -0.020413704    4.5480042 
+   91290    20.490208    1.0025965    23.707604    6.0473023    4.5439089    1.5033934 0.0015025535 -0.020336436    4.5627428 
+   91300    20.209802    1.0018702    23.892035    6.0132461    4.5109417    1.5023044 0.0015653567 -0.020382178    4.5297585 
+   91310    20.330081   0.99519517    23.704877    6.0320185    4.5397233    1.4922952 0.0016496863 -0.020594748    4.5586684 
+   91320    20.370919    1.0175917    23.582588    6.0604737    4.5345949    1.5258788  0.001659035 -0.020400159    4.5533361 
+   91330     20.40935     1.029028    24.137935    6.0798661    4.5368385    1.5430275 0.0016247877 -0.021216879    4.5564306 
+   91340    20.315103    1.0032276    23.714789    6.0542053    4.5498655    1.5043398 0.0017901674 -0.022456003    4.5705313 
+   91350    20.073189    1.0141673    23.600404    6.0370627    4.5163189    1.5207438 0.0018010333 -0.022656672    4.5371746 
+   91360    20.199906    1.0055364    23.691977    6.0204446    4.5126427    1.5078019  0.001836479 -0.021996367    4.5328026 
+   91370    20.170409    1.0060862    23.544045     6.032264    4.5236377    1.5086262 0.0019323207 -0.022556906    4.5442623 
+   91380    20.068809   0.99613448    23.777655    6.0278504    4.5341468    1.4937037 0.0019430499 -0.022819513    4.5550232 
+   91390    20.250286    1.0007046    23.937358    6.0252108    4.5246542    1.5005566 0.0019756397 -0.022854495    4.5455331 
+   91400    20.037652   0.97954154    23.609723    6.0065778    4.5377553    1.4688225 0.0020342123 -0.022918801    4.5586398 
+   91410    20.228673   0.99451937    23.647835    6.0238903    4.5326085    1.4912818 0.0019246446 -0.022149679    4.5528335 
+   91420    20.229151   0.98989742    23.758269    6.0266016    4.5422505    1.4843512 0.0019606012 -0.022625214    4.5629151 
+   91430     20.25613     1.004552    23.991879    6.0159451    4.5096193    1.5063257 0.0017073604 -0.021920132    4.5298321 
+   91440    20.294674   0.98189017    23.634775    5.9946625    4.5223182    1.4723443 0.0017472409 -0.022321712    4.5428927 
+   91450    20.274317    1.0023907     23.67508    6.0373473    4.5342625    1.5030848 0.0017751697 -0.022342313    4.5548297 
+   91460    20.007696   0.99876451    24.070791    6.0511454    4.5534981    1.4976474  0.001585097 -0.021027423    4.5729404 
+   91470    20.173649    1.0161927    23.831098     6.066274     4.542493     1.523781 0.0014846681 -0.020543685     4.561552 
+   91480    20.287118    1.0077294    23.643948    6.0488698    4.5377796    1.5110902 0.0014429236 -0.020373564    4.5567102 
+   91490    20.262045    1.0163186    24.182088    6.0616066    4.5376369    1.5239697 0.0014752667 -0.020420535    4.5565822 
+   91500    20.527717    1.0457763    23.717058    6.0763244    4.5081827    1.5681416 0.0015696436 -0.020944266    4.5275574 
+   91510    20.028681    1.0173536    23.529835    6.0583049    4.5327832    1.5255217 0.0016625649 -0.021606866    4.5527275 
+   91520    20.158761    1.0145857     23.70294    6.0617007    4.5403294    1.5213713 0.0016875553  -0.02167384    4.5603157 
+   91530    20.230117    1.0188048    23.723152    6.0518995    4.5242017    1.5276978 0.0015667009 -0.020689522    4.5433245 
+   91540    20.194079    1.0099391    23.677275    6.0564443    4.5420406    1.5144036   0.00135287 -0.019827264     4.560515 
+   91550    20.397672   0.99427823    23.606263    6.0381678    4.5472476    1.4909202 0.0013037759 -0.019812479    4.5657563 
+   91560    20.446746   0.98796964    23.856708    6.0063727    4.5249122    1.4814605 0.0013256817 -0.019690849    4.5432774 
+   91570    20.420406    1.0091644    23.733786    6.0524152    4.5391732     1.513242  0.001381303 -0.019850709    4.5576426 
+   91580    19.921091      1.01513    23.696602    6.0494562    4.5272687    1.5221875 0.0015511532 -0.020280579    4.5459981 
+   91590    19.817356   0.98323364     23.55489    6.0308124    4.5564535    1.4743588 0.0016128315 -0.020879271      4.57572 
+   91600    20.189418   0.98745069    23.634719    6.0113921    4.5307098    1.4806823 0.0019050041 -0.022113432    4.5509182 
+   91610    20.186744   0.99483343    23.803548    6.0055577     4.513805    1.4917527 0.0019886691 -0.022630807    4.5344471 
+   91620    20.307873   0.99373103     23.69231    6.0015854    4.5114857    1.4900997 0.0017748515 -0.021741818    4.5314527 
+   91630    20.403076   0.97440025     23.75687    6.0107278    4.5496146    1.4611132 0.0018393074 -0.022463748     4.570239 
+   91640    20.241273   0.99490937    23.997302    6.0210821    4.5292155    1.4918666 0.0018286788 -0.022387478    4.5497743 
+   91650    20.113023    1.0046177    23.993063    6.0448796    4.5384553    1.5064243 0.0017802379 -0.022443101    4.5591182 
+   91660    20.447904    1.0213941    23.646799    6.0515054     4.519925    1.5315804 0.0019047295 -0.023129192    4.5411494 
+   91670    20.168846   0.99987567    23.937032    6.0383214    4.5390078    1.4993136 0.0020332941 -0.023569516     4.560544 
+   91680    20.157129    1.0179338    23.726442    6.0444453    4.5180537    1.5263917 0.0019164761 -0.022962165    4.5390993 
+   91690    20.411606    1.0309644    24.336148     6.066745    4.5208139    1.5459311 0.0017511305 -0.022189807    4.5412526 
+   91700    19.845122     1.008395    23.771258    6.0578833     4.545795    1.5120884 0.0019197864 -0.022859803     4.566735 
+   91710     19.87522     1.025945     23.79031    6.0727338    4.5343293    1.5384045 0.0017114955 -0.021880389    4.5544982 
+   91720    19.846014    1.0310153    23.566532    6.1006955    4.5546881    1.5460074 0.0017567644 -0.022102741    4.5750341 
+   91730    20.317358    1.0257004    23.838413     6.080856    4.5428182    1.5380378 0.0016273395  -0.02101053    4.5622014 
+   91740    20.232612    1.0294594    23.577029    6.0933909    4.5497165    1.5436744 0.0017640362 -0.021179828    4.5691323 
+   91750    19.890935    1.0084957    23.701769    6.0435505    4.5313112    1.5122393 0.0017826146 -0.021106731    4.5506353 
+   91760    20.106138    1.0101449    23.814723    6.0541822      4.53947    1.5147122 0.0018500239 -0.021797629    4.5594176 
+   91770    20.316081   0.99214421    23.642006    6.0215458    4.5338256    1.4877202 0.0018113065 -0.021268947    4.5532832 
+   91780    20.123898   0.98653913    23.475186    6.0022822    4.5229667    1.4793154 0.0016421636 -0.020862958    4.5421875 
+   91790     20.12884   0.99016673    23.842844    6.0126925    4.5279374     1.484755 0.0015516435 -0.020459592    4.5468454 
+   91800    20.260464    1.0067989    23.770461    6.0111638    4.5014689    1.5096949 0.0016223874 -0.020797183    4.5206437 
+   91810    20.402627   0.99112611    23.552292    5.9929404    4.5067468    1.4861936 0.0016058328 -0.021057864    4.5261988 
+   91820    20.050403   0.98485222    23.581405    6.0025509     4.525765    1.4767859 0.0016317083 -0.021407254    4.5455405 
+   91830    20.172984     1.013733    23.699518    6.0471337    4.5270411    1.5200927 0.0016399073 -0.021416413    4.5468176 
+   91840    20.448965    1.0086789    23.551801    6.0410441      4.52853     1.512514 0.0016424145 -0.021407021    4.5482947 
+   91850    20.146052    1.0007866    23.762033    6.0481422    4.5474627    1.5006795 0.0017963792 -0.021987334    4.5676536 
+   91860    20.276325    1.0015915    23.596206     6.030941    4.5290545    1.5018864 0.0019565174 -0.022614443    4.5497125 
+   91870    20.203599    1.0241476    24.058451    6.0599174    4.5242081    1.5357093 0.0017758195 -0.021970149    4.5444024 
+   91880    19.906199   0.99732974    23.510741    6.0407468    4.5452509    1.4954959 0.0014978683 -0.020727077    4.5644801 
+   91890    19.828233    1.0101593    23.808219    6.0253979     4.510664    1.5147339 0.0016479931 -0.021440451    4.5304564 
+   91900    20.217935   0.98923371    23.679118    6.0120952    4.5287392     1.483356 0.0020430965 -0.023552878     4.550249 
+   91910    20.328983    1.0164228    23.641461    6.0498476    4.5257217     1.524126 0.0022903518 -0.024731268    4.5481626 
+   91920    20.301193    1.0093404    23.525452    6.0319952    4.5184892     1.513506 0.0022905521 -0.024516206    4.5407149 
+   91930    20.328828   0.98857594    23.509947    6.0205904    4.5382207    1.4823696 0.0021610784 -0.023756344     4.559816 
+   91940    20.340514    1.0107423    23.702999    6.0448958    4.5292878     1.515608 0.0019256257 -0.022674897     4.550037 
+   91950    19.844803   0.99026479     23.51681    6.0277644    4.5428624     1.484902  0.001807262 -0.021834355    4.5628895 
+   91960    19.958542   0.99418374    23.978001    5.9880429    4.4972644    1.4907785 0.0018614658 -0.022178166    4.5175811 
+   91970    19.800836   0.97550142    23.739672    5.9963867    4.5336223    1.4627644 0.0018641051  -0.02241524    4.5541734 
+   91980    19.793976   0.98945285    23.919077     6.004112    4.5204274    1.4836846  0.001644323 -0.021725416    4.5405085 
+   91990    19.991698   0.99638995    23.683704    6.0260113    4.5319246    1.4940867 0.0014990934 -0.020812814    4.5512383 
+   92000    20.367811    1.0037779    23.358216    6.0271124    4.5219475    1.5051649  0.001508207 -0.020720082    4.5411594 
+   92010    20.461416   0.99539933     23.67222    6.0339283     4.541327    1.4926013 0.0013066141 -0.019687776    4.5597082 
+   92020    20.451574    1.0143088    23.755454    6.0675312    4.5465752     1.520956 0.00099480935 -0.017892898    4.5634733 
+   92030    20.492167    1.0062282    23.614614    6.0417108    4.5328716    1.5088392 0.0011241655 -0.018149587     4.549897 
+   92040    20.326432    1.0048615     23.71966    6.0282156    4.5214257    1.5067899 0.0011167988 -0.018350145     4.538659 
+   92050    20.281753   0.99927953    23.598956    6.0437024    4.5452827    1.4984197 0.0010031375 -0.017949248    4.5622289 
+   92060    20.397845   0.99932208    23.477231    6.0353692    4.5368858    1.4984835 0.0010091326 -0.018147527    4.5540241 
+   92070    20.056203    1.0032188    23.644817    6.0238416     4.519515    1.5043266  0.001154956 -0.018809782    4.5371698 
+   92080    19.082291   0.98785996    23.642958     6.020176      4.53888     1.481296 0.0011940077  -0.01913859    4.5568246 
+   92090     19.83509   0.99398558    23.917316    6.0324828    4.5420014    1.4904814 0.0012244361 -0.019353642    4.5601306 
+   92100    20.256228    1.0115657    23.591682    6.0427837    4.5259409    1.5168428 0.0011242787 -0.019358577    4.5441752 
+   92110    20.198666    1.0052617    23.553708    6.0279547    4.5205648      1.50739 0.0012898549 -0.020332633    4.5396075 
+   92120    20.303543   0.99740216    23.736584    6.0062085    4.5106039    1.4956045 0.0014208638 -0.020490611    4.5296737 
+   92130    20.387047    0.9771755    23.539129    5.9934123    4.5281377    1.4652747 0.0015149824 -0.021002799    4.5476255 
+   92140     20.47061    1.0050473    23.715927     5.995075    4.4880066    1.5070684 0.0016737007 -0.021790403    4.5081233 
+   92150    20.033537   0.99660611     23.77328    6.0199136    4.5255027    1.4944109 0.0017593048 -0.022288859    4.5460323 
+   92160    20.173114    1.0072518     23.61494    6.0473001    4.5369259    1.5103741 0.0015588073 -0.021297131    4.5566642 
+   92170    20.018046    1.0138599    23.768101    6.0555608    4.5352778     1.520283   0.00142114 -0.020344673    4.5542013 
+   92180    20.433638    1.0210856     23.69445    6.0777304    4.5466125    1.5311179 0.0015142279 -0.020988011    4.5660863 
+   92190    20.375832    1.0050675    23.842376    6.0642222    4.5571234    1.5070988 0.0016338161 -0.021756327    4.5772459 
+   92200    19.970109    1.0132031    23.884077    6.0571394    4.5378414     1.519298 0.0016654313 -0.021637138    4.5578131 
+   92210    19.863095    1.0144302    23.980569    6.0546129    4.5334748    1.5211381 0.0017542606 -0.022042328    4.5537629 
+   92220     20.17273    1.0238315    23.862382    6.0748512    4.5396158    1.5352354 0.0018965043  -0.02268257    4.5604018 
+   92230     20.28234    1.0198278    23.868966    6.0542526    4.5250207    1.5292319 0.0020466403  -0.02318197    4.5461561 
+   92240    20.212886    1.0027649     23.67924    6.0472928    4.5436467     1.503646 0.0018477407 -0.022576745    4.5643758 
+   92250    20.051164     1.004673    24.128113    6.0292492     4.522742    1.5065072 0.0018731269 -0.023030312    4.5438992 
+   92260    20.415976    1.0205165    23.670703    6.0577534    4.5274889    1.5302645 0.0020372416   -0.0236326    4.5490842 
+   92270    20.177155    1.0395465    23.788917    6.1040553    4.5452553       1.5588  0.002111712 -0.023584186    4.5667277 
+   92280    19.748921    1.0078276    23.795771    6.0940421    4.5828046    1.5112375 0.0022206528 -0.023891046     4.604475 
+   92290    20.214264    1.0383563    23.650535    6.0868397    4.5298245    1.5570152 0.0022369304 -0.023855561    4.5514431 
+   92300     20.25995    1.0283916     23.63453    6.0754216    4.5333484    1.5420732 0.0021102668  -0.02372116    4.5549593 
+   92310    20.376886   0.99450052    23.510563    6.0448253    4.5535718    1.4912535 0.0018496695  -0.02242119    4.5741433 
+   92320    20.236454    1.0094944    23.681676    6.0314595    4.5177226    1.5137369 0.0017049358 -0.021958101    4.5379757 
+   92330     20.13246    1.0127475    23.665626    6.0476451    4.5290303    1.5186148 0.0017907355 -0.022299882    4.5495395 
+   92340     20.35453    1.0156018    23.590726     6.050438    4.5275432    1.5228948 0.0018658132 -0.022840136    4.5485175 
+   92350    20.268502    1.0064746     23.61286    6.0588673    4.5496586    1.5092087 0.0016721677 -0.022101061    4.5700875 
+   92360    20.362094    1.0295453    23.847735    6.0933463    4.5495432    1.5438032 0.0015626004  -0.02142374    4.5694043 
+   92370    20.298226    1.0384948    23.650591    6.0972737    4.5400507     1.557223 0.0015034244 -0.020905788    4.5594531 
+   92380    20.310435    1.0381733    23.754229    6.0990894    4.5423485    1.5567409 0.0015213007 -0.021101246    4.5619285 
+   92390    20.162459    1.0050273    23.700162    6.0874164     4.580378    1.5070384 0.0016114331 -0.021886061    4.6006526 
+   92400    19.918331    1.0400431    23.757882    6.0918955    4.5323509    1.5595446 0.0016444798 -0.022161002    4.5528674 
+   92410    20.272895    1.0244717    23.726069    6.0869734    4.5507781    1.5361953 0.0017563573 -0.022382929    4.5714047 
+   92420    20.272473    1.0257271    23.642788    6.0947589    4.5566811    1.5380778 0.0018644979 -0.022707391     4.577524 
+   92430      20.3137    1.0433724    23.973692    6.1091052    4.5445683    1.5645369 0.0021062929 -0.023565357    4.5660274 
+   92440    19.935266    1.0248073    23.989959    6.0829158    4.5462172    1.5366986 0.0021168121 -0.023760242    4.5678606 
+   92450    20.323277    1.0145741    24.022807    6.0628453    4.5414915    1.5213539 0.0019568814 -0.023381319    4.5629159 
+   92460    20.280538    1.0288135    23.925062    6.0715176    4.5288118    1.5427058 0.0016734423 -0.022063019    4.5492014 
+   92470    20.357523     1.004199    23.748591    6.0506924    4.5448959    1.5057965 0.0016247581 -0.021849535    4.5651207 
+   92480    20.217933     1.016658    23.624266    6.0472659    4.5227873    1.5244787 0.0015419557 -0.021708553    4.5429539 
+   92490     20.42016    1.0032041     23.86668     6.036405    4.5321005    1.5043045 0.0013210581 -0.020301599     4.551081 
+   92500    20.108929   0.99842726    23.619983    6.0335418    4.5364001    1.4971417 0.0013701495 -0.019836939    4.5548669 
+   92510    20.195825    1.0016109    23.576455    6.0180533    4.5161378    1.5019155 0.0014489757 -0.019985374    4.5346742 
+   92520    20.236182    1.0089411    23.689147    6.0298511    4.5169439    1.5129072 0.0014212221 -0.019652332    4.5351751 
+   92530    20.162442   0.98054126    23.523517      6.02125    4.5509284    1.4703216 0.0012912498 -0.018826442    4.5684636 
+   92540    20.310634    1.0202218    23.861222    6.0291581    4.4993355    1.5298226 0.0012219725 -0.018973036    4.5170866 
+   92550     20.29193    1.0028906    23.810363    6.0315148    4.5276804    1.5038344 0.0011469833 -0.019154701    4.5456881 
+   92560    20.171478    1.0028215     23.57718    6.0308536    4.5271228    1.5037308 0.0011324451  -0.01954467     4.545535 
+   92570    20.293985   0.99931557    23.533016    6.0333368    4.5348631    1.4984737 0.0011685037 -0.019542894    4.5532375 
+   92580    20.270994    1.0129726     23.73776    6.0314835    4.5125311    1.5189524 0.0013990663 -0.020661742    4.5317938 
+   92590    20.306933    1.0257548    23.590511    6.0503616    4.5122424    1.5381193 0.0018272517 -0.022380898     4.532796 
+   92600     20.37149    1.0278159    23.925117    6.0728814    4.5316715    1.5412099 0.0019960558 -0.022931067    4.5526065 
+   92610    20.049974    1.0137823    23.745516    6.0576725    4.5375059    1.5201666 0.0019053063 -0.022755414     4.558356 
+   92620    20.105426   0.98461805    23.618037    6.0360876    4.5596528    1.4764348 0.0016839111 -0.021553102     4.579522 
+   92630    20.164913    1.0043383    23.657286     6.057684    4.5516788    1.5060052 0.0015247387 -0.020713319    4.5708674 
+   92640    20.498371    1.0186751     23.55665    6.0515752    4.5240719    1.5275033 0.0016998301  -0.02157482    4.5439469 
+   92650    20.412018    1.0064719    23.653427    6.0412935    4.5320888    1.5092046 0.0019147298 -0.023170938     4.553345 
+   92660    20.207918   0.99575558    23.827388    6.0102989    4.5171634    1.4931355 0.0021612532 -0.024140747    4.5391429 
+   92670    20.266818   0.97851199    23.507304    5.9869312    4.5196525    1.4672787 0.0022113052 -0.024336319    4.5417775 
+   92680     20.37425   0.97170014    23.584906    5.9684326    4.5113682    1.4570644 0.0023083434 -0.024628625    4.5336885 
+   92690    20.035879    0.9868024    23.498618    6.0302525    4.5505423    1.4797102 0.0023180989 -0.024534979    4.5727592 
+   92700    20.370685    1.0073306    23.379216     6.016673    4.5061808    1.5104923 0.0023288143 -0.024512977    4.5283649 
+   92710    20.527944     1.027478    23.620256    6.0539604    4.5132572    1.5407032 0.0021704371 -0.023871797    4.5349585 
+   92720    20.325777    1.0073839    23.508361    6.0671698    4.5565976    1.5105722 0.0018839988 -0.022310095    4.5770237 
+   92730    20.066906    1.0170678    23.852468    6.0777165    4.5526234    1.5250932 0.0017608227  -0.02161906    4.5724816 
+   92740    20.139886    1.0296324    23.896098    6.0617769    4.5178431    1.5439338 0.0016497849 -0.021450512    4.5376438 
+   92750    20.107006    1.0168785    23.579526      6.07221    4.5474008    1.5248093 0.0016859139 -0.021646036    4.5673609 
+   92760    20.514868     1.020123    23.925236    6.0744122    4.5447377    1.5296745 0.0017183566 -0.022147599    4.5651669 
+   92770    20.545524    1.0394814    23.759893    6.0815048    4.5228024    1.5587023 0.0019690676 -0.023287278    4.5441206 
+   92780     20.40034    1.0403834    23.822897    6.0999304    4.5398755     1.560055 0.0021259218 -0.023630673    4.5613802 
+   92790    20.234866    1.0281305    23.561809    6.0623067     4.520625    1.5416817 0.0021755068 -0.024068004    4.5425175 
+   92800    20.210756    1.0245435    23.841667      6.05453     4.518227    1.5363029  0.002142915 -0.023962181    4.5400463 
+   92810    19.875605    1.0109854    23.984983    6.0224662    4.5064935    1.5159726  0.001995212 -0.023415082    4.5279134 
+   92820     19.93489    1.0170943    23.821629    6.0538334    4.5287004    1.5251329 0.0018361182 -0.022608527    4.5494728 
+   92830    20.377613    1.0242984    23.824947    6.0683762    4.5324407    1.5359355 0.0019263475  -0.02319977    4.5537141 
+   92840     20.31307    1.0269945    23.844259    6.0859287    4.5459505    1.5399782 0.0022002213 -0.024118709     4.567869 
+   92850    20.101906    1.0303867    23.989853    6.0717683    4.5267035    1.5450648 0.0023767464 -0.024749956    4.5490767 
+   92860    20.074911    1.0146147    23.688533     6.055226    4.5338113    1.5214147 0.0022525813 -0.024716225    4.5562749 
+   92870    19.801599    1.0369362    23.786468    6.0845395    4.5296537    1.5548858 0.0020887776 -0.024385975    4.5519509 
+   92880    20.082872    1.0184563    23.595102    6.0804054    4.5532301    1.5271753 0.0017302488 -0.022805287    4.5743052 
+   92890    20.128653    1.0265729    23.897543    6.0517133    4.5123672    1.5393461 0.0015186245   -0.0216945    4.5325431 
+   92900    19.723385    1.0177363    23.895799    6.0562317    4.5301361    1.5260956 0.0015115677 -0.021318301    4.5499428 
+   92910    20.318406    1.0021838    23.556278     6.062842    4.5600673    1.5027747 0.0014985006 -0.021423354    4.5799922 
+   92920    19.921321   0.99216323    23.543477    6.0371035    4.5493547    1.4877488 0.0014601736  -0.02087031    4.5687649 
+   92930    20.025819    1.0059102    23.766878    6.0438315     4.535469    1.5083624 0.0016268113 -0.021626709    4.5554689 
+   92940    20.342386    1.0044294    23.865842    6.0280228    4.5218809    1.5061419 0.0015790107 -0.020850955    4.5411528 
+   92950    20.158709   0.99531726    23.345843    6.0241981    4.5317198    1.4924782 0.0015784141 -0.020631762    4.5507732 
+   92960    20.135949    1.0096502    23.695938    6.0342762    4.5203058    1.5139705 0.0016350233 -0.021293102    4.5399639 
+   92970    19.917968    1.0063701    23.580428    6.0250903    4.5160383     1.509052 0.0016736993 -0.021386433     4.535751 
+   92980    20.187327    1.0139018    23.729119    6.0480817    4.5277359    1.5203458 0.0016534712 -0.021179967    4.5472624 
+   92990    20.173572    1.0136917    23.836279    6.0487365    4.5287057    1.5200308  0.001702978 -0.021137858    4.5481406 
+   93000    20.285123    1.0054422    23.737835    6.0470624    4.5394018    1.5076606 0.0017322549 -0.020596513     4.558266 
+   93010    20.268563    1.0101702    23.722255    6.0504399    4.5356897    1.5147502  0.001670632 -0.019932519    4.5539516 
+   93020    20.076756    1.0119816    23.661938    6.0451406    4.5276742    1.5174663 0.0016582531 -0.019555016     4.545571 
+   93030    20.152332    1.0165496    23.754306    6.0462805    4.5219645    1.5243161  0.001551434  -0.01944066    4.5398537 
+   93040    20.544631    1.0170395    23.594011    6.0698232    4.5447725    1.5250507  0.001395236 -0.018632712      4.56201 
+   93050    20.257849   0.99908073    23.850215    6.0483357    4.5502141    1.4981216 0.0011149406 -0.017568573    4.5666677 
+   93060    20.429229    1.0176631    23.797446    6.0462927    4.5203069    1.5259858 0.00097682858 -0.017037919     4.536368 
+   93070    20.495559    1.0152981    23.718972    6.0542577    4.5318183    1.5224394 0.0012433244 -0.018134669    4.5487096 
+   93080    20.093153    1.0349745    24.001032    6.0569356    4.5049914    1.5519442 0.0013470127 -0.019171873    4.5228163 
+   93090    19.913607    1.0182224     23.67073    6.0660324    4.5392079    1.5268246 0.0013760679  -0.01971114    4.5575429 
+   93100    20.204158    1.0066036    23.573434    6.0466044    4.5372023    1.5094021  0.001505301 -0.020392121    4.5560891 
+   93110    19.644613    1.0178694    23.947059    6.0440137    4.5177186    1.5262951  0.001615697 -0.020851512    4.5369544 
+   93120    20.286158     1.011749    23.769234    6.0458319    4.5287142    1.5171176 0.0017638065 -0.021543905    4.5484943 
+   93130     20.30155    1.0108932    23.792123    6.0391903    4.5233559    1.5158344 0.0019769162 -0.022510096     4.543889 
+   93140    20.199868    1.0079954    23.918011    6.0250482    4.5135591    1.5114891 0.0021459706 -0.023353221    4.5347664 
+   93150    20.034955    1.0062345    23.663784    6.0205473    4.5116987    1.5088487  0.002098128  -0.02326461    4.5328652 
+   93160    19.958278    1.0089054    23.568527    6.0320736      4.51922    1.5128537 0.0021740113 -0.023841839    4.5408878 
+   93170    20.128224    0.9990399     23.84466    6.0265761    4.5285158    1.4980603 0.0021932858 -0.024412637    4.5507352 
+   93180    20.022313    1.0061506    23.678396    6.0548097    4.5460868    1.5087228 0.0020357081 -0.023574729    4.5676259 
+   93190    20.401902    1.0208906    23.851191    6.0744815    4.5436561    1.5308254 0.0019217451 -0.023156172    4.5648905 
+   93200    20.408668    1.0263589    23.688733    6.0773808    4.5383556    1.5390252 0.0016219858 -0.021679704    4.5584133 
+   93210    20.090897    1.0166149    23.546295    6.0583649    4.5339508    1.5244141 0.0016344065 -0.021543166    4.5538596 
+   93220     20.37369    1.0210732      23.7265     6.074575    4.5434757    1.5310993 0.0014633823  -0.02083944    4.5628517 
+   93230     20.45913     1.001596    23.595494    6.0531251    4.5512319    1.5018932 0.0016229283 -0.021605557    4.5712145 
+   93240    20.309028     1.013312    23.939192     6.062325    4.5428637    1.5194613 0.0016713669   -0.0215164    4.5627087 
+   93250    20.066256    1.0219217    23.858783    6.0426504    4.5102788    1.5323716 0.0015817492 -0.020882912      4.52958 
+   93260    19.982766    1.0216326    23.882595    6.0720123    4.5400742    1.5319381 0.0015204377 -0.020813062    4.5593668 
+   93270     20.09335    1.0056839    23.772205    6.0856312    4.5776082     1.508023 0.0015931036 -0.021486638    4.5975018 
+   93280    20.315075    1.0305069    23.857674    6.0727185    4.5274733    1.5452451 0.0015954186 -0.021412041      4.54729 
+   93290    20.411694    1.0247198    23.922922     6.092088    4.5555208    1.5365673 0.0015996572 -0.021384747    4.5753059 
+   93300     20.17863    1.0238163    23.954696    6.0841938    4.5489814    1.5352125 0.0015653975 -0.021368725    4.5687847 
+   93310    20.129165    1.0350898    24.001221     6.075125    4.5230078    1.5521171 0.0017749878 -0.022388422    4.5436213 
+   93320    20.023193    1.0265084    23.696103    6.0835403     4.544291    1.5392493 0.0016341619 -0.021861573    4.5645184 
+   93330    20.081765    1.0215961    23.656021    6.0771626    4.5452793    1.5318833 0.0014982637 -0.021293689    4.5650748 
+   93340    20.183949   0.99741538    23.472328    6.0345061    4.5388818    1.4956244 0.0014798087 -0.021116223    4.5585182 
+   93350    20.227638    1.0026275    23.762724    6.0506582    4.5472182      1.50344 0.0015193475 -0.021116631    4.5668154 
+   93360     20.29649    1.0049677    23.739901    6.0454923    4.5385431    1.5069491 0.0015607755 -0.021370761    4.5583531 
+   93370     20.01774    1.0037894    23.578751    6.0556115    4.5504294    1.5051822 0.0016917436  -0.02147124    4.5702088 
+   93380    20.317039    1.0303287    23.860985    6.0715468     4.526569    1.5449778 0.0015466142 -0.020434951    4.5454573 
+   93390    19.891674    1.0053602    23.487593     6.049834    4.5422964    1.5075376 0.0013256925 -0.019373995    4.5603447 
+   93400    20.098238    0.9947598    23.627026    6.0104588    4.5188165    1.4916423 0.0014887194 -0.020661636    4.5379894 
+   93410    19.819114   0.96770139    23.634104    5.9801529    4.5290846    1.4510682 0.0016619809 -0.021643511    4.5490662 
+   93420    20.240758   0.98642213    23.179452     5.985942     4.506802      1.47914 0.0015273264 -0.021328144    4.5266028 
+   93430    20.174447    0.9966039    23.732922    6.0180289    4.5236214    1.4944075  0.001304419 -0.020573789    4.5428907 
+   93440    20.060811   0.99291029    23.665478    6.0237451    4.5348761     1.488869 0.0013684674 -0.021063075    4.5545708 
+   93450    20.097314     1.002292    23.904815    6.0484907    4.5455539    1.5029369 0.0015176359 -0.021960934    4.5659972 
+   93460    20.102593    1.0219417    23.523046    6.0610286     4.528627    1.5324016 0.0017043078 -0.022383385    4.5493061 
+   93470    20.102175    1.0107138    23.604108    6.0519872    4.5364219    1.5155653 0.0016902402 -0.021850974    4.5565826 
+   93480    20.270263   0.99920895    23.554748      6.03115    4.5328362    1.4983138 0.0017637148 -0.021732699    4.5528052 
+   93490    20.392647    1.0130426    23.715201    6.0110837    4.4920262    1.5190575 0.0018014414 -0.021813803    4.5120386 
+   93500    20.015281   0.99373512    23.606848     6.009305    4.5191992    1.4901058  0.001825296   -0.0219107    4.5392846 
+   93510     19.90847   0.99113861    23.677816    5.9954498    4.5092375    1.4862123 0.0017504257 -0.021112503    4.5285995 
+   93520    20.347441   0.99898068    23.691213    6.0159489    4.5179774    1.4979715 0.0020934502 -0.023390451    4.5392744 
+   93530    20.149705    1.0021055    23.584252    6.0145639    4.5119068    1.5026572 0.0020935201 -0.023636956    4.5334502 
+   93540    20.179495    0.9965363    23.708794    6.0063308    4.5120246    1.4943062 0.0018691949 -0.022277804    4.5324332 
+   93550    20.054828   0.99407725    23.750089     6.034633    4.5440142    1.4906188  0.001606619 -0.021037131    4.5634447 
+   93560    20.293359   0.99976043    23.754634    6.0472297    4.5480889    1.4991408 0.0015489949 -0.020341417    4.5668813 
+   93570    20.208462    1.0183062    23.882312    6.0701582     4.543208    1.5269502 0.0016001688 -0.020928029    4.5625359 
+   93580    20.325754    1.0013686    23.937446    6.0429856    4.5414335    1.5015521 0.0015584402 -0.020717834    4.5605929 
+   93590    20.264875   0.99167437    23.632424    6.0468935    4.5598778    1.4870157 0.0015457497 -0.020424007     4.578756 
+   93600    20.234067    1.0076262    23.762834    6.0454547    4.5345192    1.5109354 0.0015951979 -0.020410407    4.5533344 
+   93610    19.931609    1.0180975     23.77118    6.0550854    4.5284483    1.5266371 0.0016810477 -0.020784428    4.5475517 
+   93620     20.44641    1.0121137    23.616385    6.0781549    4.5604904    1.5176645 0.0016184419 -0.020652702    4.5795247 
+   93630    20.420372    1.0351667    23.814833    6.1048349    4.5526025    1.5522324 0.0015768093 -0.020629013    4.5716547 
+   93640     20.29649    1.0300603    23.868487    6.0880551    4.5434798    1.5445753 0.0015605582 -0.020793443    4.5627127 
+   93650    20.257208    1.0307441    23.653184    6.0881321    4.5425313    1.5456008 0.0015598966 -0.020922635     4.561894 
+   93660    20.412161    1.0179806    23.512822    6.0966992    4.5702372    1.5264619 0.0017124305 -0.021615828    4.5901406 
+   93670    20.478069    1.0355557     23.76632    6.0927911    4.5399754    1.5528157 0.0018372848 -0.022205095    4.5603432 
+   93680    20.313935    1.0283542    23.943909    6.0768305    4.5348135    1.5420171 0.0020567356 -0.023228366    4.5559851 
+   93690    20.067642    1.0129517    23.890354    6.0349576    4.5160364    1.5189211 0.0021100027 -0.023511643    4.5374381 
+   93700    20.225899    1.0242649    23.890721    6.0481368    4.5122516    1.5358852 0.0021087129 -0.023315994    4.5334589 
+   93710    20.228223    1.0112355    23.754088    6.0414389    4.5250912    1.5163477 0.0020694952 -0.022657932    4.5456796 
+   93720    20.371051    1.0115245    23.640906    6.0200887    4.5033078    1.5167809 0.0019751304 -0.022231519    4.5235642 
+   93730    19.915073   0.99659322    23.739443    6.0324656    4.5380741    1.4943915 0.0019224559 -0.021892982    4.5580446 
+   93740    19.875538    1.0300786    23.706859    6.0583273    4.5137245    1.5446029 0.0019782591 -0.022353558    4.5340998 
+   93750    20.174586    1.0153029    23.796325    6.0732464    4.5507996    1.5224467 0.0019169535  -0.02235918    4.5712419 
+   93760    19.847311    1.0341295    23.836759     6.091091    4.5404138    1.5506772 0.0018128464 -0.021998763    4.5605998 
+   93770    20.159863    1.0239872    23.845652    6.0944903    4.5590216    1.5354687 0.0018703542 -0.021776425    4.5789277 
+   93780    19.959597    1.0291986    23.908094    6.0871893     4.543906    1.5432833  0.001673637 -0.020536114    4.5627685 
+   93790    20.060516    1.0501214    23.961175     6.107613    4.5329559    1.5746571 0.0015063546 -0.019713353    4.5511629 
+   93800    20.103582    1.0350476    23.815613    6.0900808     4.538027    1.5520539 0.0014816175 -0.019773939    4.5563193 
+   93810    20.279114    1.0206313    23.763199    6.0965583    4.5661216    1.5304366 0.0012876945 -0.018651187    4.5834851 
+   93820    20.285619    1.0322423    23.925736    6.0943466    4.5464992    1.5478473 0.0011805742 -0.018770132    4.5640888 
+   93830    20.135089    1.0310549    23.691954    6.1043078    4.5582411    1.5460668 0.0012444308 -0.019894169    4.5768908 
+   93840    20.103063     1.034052    23.706014    6.0976668    4.5471058    1.5505609 0.0014674731 -0.021226582     4.566865 
+   93850    19.932525    1.0089332    23.500578    6.0835478    4.5706524    1.5128953 0.0015797642 -0.021110464    4.5901831 
+   93860    20.169666    1.0174635    23.652618    6.0748297    4.5491433    1.5256865 0.0014810102 -0.020770697     4.568433 
+   93870    20.223971    1.0103793    23.414097    6.0732616    4.5581978    1.5150638 0.0014929913 -0.021104256     4.577809 
+   93880    20.102162    1.0287097    23.908334    6.0898167    4.5472665    1.5425502 0.0016620697   -0.0222107    4.5678151 
+   93890    20.344791     1.012402    23.653357    6.0940291    4.5759324    1.5180967  0.001732376 -0.022563863    4.5967639 
+   93900    20.075145    1.0380229    24.127711     6.093742    4.5372266    1.5565153 0.0018238124 -0.023172815    4.5585756 
+   93910    20.094749    1.0438596    23.695778    6.0964768    4.5312093    1.5652675 0.0017197932 -0.022576558     4.552066 
+   93920    20.322432    1.0336399    23.924438    6.0890714    4.5391284     1.549943 0.0015688978 -0.021317871    4.5588774 
+   93930    20.090611    1.0059356    23.972233    6.0522546    4.5438541    1.5084005 0.0016110268 -0.021110814    4.5633539 
+   93940    20.172974     1.011323    23.674964     6.048667    4.5321882    1.5164789 0.0016048731 -0.021227125    4.5518104 
+   93950    20.217921     0.992274    23.727581    6.0434753    4.5555604    1.4879149  0.001756758 -0.021980949    4.5757846 
+   93960    20.252861   0.99855244    23.731374    6.0272197    4.5298903    1.4973294 0.0019336589 -0.022889506    4.5508462 
+   93970    20.179245   0.98373168    23.489771    6.0178186    4.5427129    1.4751057  0.001937219 -0.022903894    4.5636796 
+   93980    20.392154   0.99370977    23.817572    6.0152959    4.5252281    1.4900678 0.0019427181 -0.022689459    4.5459748 
+   93990    20.180185    1.0140149    23.786199     6.037486    4.5169707    1.5205154 0.0019563318 -0.022645381    4.5376597 
+   94000     20.36614    1.0048883    24.090427    6.0345267    4.5276967    1.5068301 0.0021147261 -0.023646816    4.5492287 
+   94010    20.177273    1.0151971    23.622081     6.027768      4.50548    1.5222881 0.0022515653 -0.024475065    4.5277035 
+   94020    20.234009    1.0065649    23.852113    6.0149318    4.5055878     1.509344 0.0021237812 -0.024274679    4.5277387 
+   94030    20.292039   0.98128125    23.781271     6.007774    4.5363427    1.4714312 0.0019184323 -0.023196323    4.5576206 
+   94040    20.067003    0.9884291     23.84833    6.0041259    4.5219765    1.4821494 0.0018704488 -0.022943742    4.5430498 
+   94050     20.32027   0.97508715     23.67094    5.9863088    4.5241656    1.4621432 0.0017921363 -0.022910408    4.5452839 
+   94060     20.12737   0.98210833    24.001216    6.0004476    4.5277761    1.4726714 0.0018541719 -0.023324615    4.5492466 
+   94070    20.237727    0.9881479    23.753843    6.0165065    4.5347787    1.4817278 0.0018430615 -0.023090954    4.5560266 
+   94080    19.984034   0.99936854    23.691836    6.0201969    4.5216438    1.4985531 0.0019319064 -0.023178684    4.5428905 
+   94090    20.157593   0.99170255    23.741386    6.0114832    4.5244253     1.487058  0.002105598 -0.023736034    4.5460557 
+   94100    20.358951   0.99974671    24.011932    6.0028089    4.5036887    1.4991202 0.0021037744 -0.023790732    4.5253757 
+   94110    20.340451   0.98869836    23.680285    6.0010869    4.5185337    1.4825532 0.0018360659 -0.022703464    4.5394011 
+   94120    20.222065   0.99791587    23.769806    6.0201951    4.5238203    1.4963748 0.0016985052 -0.021327711    4.5434495 
+   94130    20.345217    1.0084268    23.659365    6.0334591    4.5213232    1.5121359 0.0015846236 -0.020788933    4.5405275 
+   94140    20.277128   0.99776629    23.488426    6.0254931    4.5293426    1.4961506 0.0017328557  -0.02123922     4.548849 
+   94150    20.339588    1.0146597    23.911013    6.0335978    4.5121155    1.5214823 0.0015570209  -0.02030513    4.5308636 
+   94160    20.050596    1.0107056    23.674412    6.0500735    4.5345204    1.5155531 0.0015589335 -0.019985188    4.5529466 
+   94170    20.061817    1.0133184    23.878553    6.0342736    4.5148026     1.519471 0.0014091187 -0.018839506     4.532233 
+   94180    20.046645    1.0126408    23.664213    6.0602406    4.5417857    1.5184549 0.0013060355 -0.018034652    4.5585143 
+   94190    20.197718    1.0119182    23.647669     6.073198    4.5558267    1.5173713 0.0013223261 -0.018122004    4.5726264 
+   94200    19.832425    1.0135568     23.89545    6.0665485    4.5467201    1.5198285 0.0013901198 -0.018525539    4.5638555 
+   94210    19.933326    1.0395898    23.826891    6.0936685    4.5348037    1.5588648  0.001282578 -0.018489191    4.5520103 
+   94220    20.036545    1.0516464    23.637852      6.11638    4.5394362    1.5769437 0.0013948007 -0.019183855    4.5572253 
+   94230     20.18448     1.023241    23.838624    6.0968362    4.5624863    1.5343499 0.0016050685 -0.020507592    4.5813889 
+   94240    20.352653    1.0502722    23.982195    6.1206975    4.5458144    1.5748831 0.0017922583 -0.021666247    4.5656884 
+   94250    20.054666    1.0389982    23.682839     6.115537    4.5575592    1.5579778 0.0016311713 -0.021161181    4.5770892 
+   94260    20.019498    1.0401377    23.633675    6.1167519    4.5570655    1.5596865 0.0016526824 -0.021765424    4.5771782 
+   94270    20.214752    1.0156095    23.666818    6.0701134     4.547207    1.5229064 0.0018533721 -0.022425575    4.5677792 
+   94280    20.429024    1.0245966     23.64644    6.0925955     4.556213    1.5363826 0.0018810447 -0.022408394    4.5767403 
+   94290    20.192279    1.0239872    23.687856    6.0783265    4.5428577    1.5354689 0.0019305073 -0.022940253    4.5638674 
+   94300    20.136891    1.0181307    23.807474    6.0485295    4.5218425     1.526687 0.0019998611 -0.023216642    4.5430593 
+   94310    20.054154    1.0062184    23.726865    6.0451135    4.5362891    1.5088245 0.0019023764 -0.022696458    4.5570832 
+   94320     20.01268   0.98985697    23.624769    6.0322485    4.5479579    1.4842905 0.0016749984 -0.020898732    4.5671817 
+   94330    20.453561    1.0115223    23.736147    6.0513356    4.5345579    1.5167777 0.0015994042 -0.020121596    4.5530801 
+   94340    20.093925    1.0166823    23.635311    6.0551765    4.5306614    1.5245151 0.0017280558 -0.020765807    4.5496991 
+   94350    20.247679    1.0173165    23.735405    6.0539429    4.5284767    1.5254662 0.0017946503 -0.021241861    4.5479239 
+   94360    20.163584    1.0135366    23.660518    6.0528244    4.5330262    1.5197982 0.0017949764 -0.021691294    4.5529225 
+   94370     20.15362    1.0069374     23.96682    6.0534408    4.5435382    1.5099026 0.0017353587 -0.021811502    4.5636143 
+   94380    20.572726     1.019708    23.858004    6.0721867    4.5431346    1.5290521 0.0017482665  -0.02179859    4.5631849 
+   94390    20.492008    1.0133327    23.702804    6.0502168    4.5307245    1.5194923 0.0015990375 -0.020966721    4.5500922 
+   94400    20.318243    1.0264396    23.839683    6.0894226    4.5502764    1.5391462  0.001649662 -0.021417149    4.5700439 
+   94410    20.267851    1.0155214    23.546837    6.0622661    4.5394918    1.5227743 0.0017968844 -0.022299919    4.5599949 
+   94420    20.385851    1.0132674    24.051157    6.0435735     4.524179    1.5193945 0.0020648997  -0.02341501    4.5455292 
+   94430    20.276568    1.0008529    23.993215    6.0223091    4.5215301     1.500779  0.002147032 -0.023923142    4.5433062 
+   94440    19.922002   0.99549636    23.757938    6.0069425    4.5141957    1.4927468 0.0021327433  -0.02387634    4.5359393 
+   94450     20.07539       1.0035    23.632409    6.0318464    4.5270983    1.5047482 0.0020236277 -0.023497122    4.5485717 
+   94460    20.482615   0.99284331    23.440031    6.0063049    4.5175363    1.4887685 0.0020166046 -0.023398769    4.5389185 
+   94470     20.01997    0.9948731    23.886091    6.0100631    4.5182509    1.4918122 0.0020150918 -0.023331873    4.5395677 
+   94480    19.918342   0.99879979    23.636164    6.0310818    4.5333815    1.4977003 0.0021489218 -0.023943998    4.5551766 
+   94490    19.950915    1.0002533    23.679454    6.0221368    4.5222569    1.4998799 0.0022369611 -0.024302192    4.5443222 
+   94500    20.262427   0.98219602    23.650276    6.0247597    4.5519568    1.4728029 0.0021152281 -0.023431486    4.5732731 
+   94510    20.274661    1.0225409    23.702712    6.0607294    4.5274293    1.5333001 0.0021909605 -0.023747165    4.5489855 
+   94520    20.184727    1.0296242    23.855617    6.0579885     4.514067    1.5439214 0.0020411545 -0.023173901    4.5351998 
+   94530    20.358408    1.0177143    23.805568    6.0557452    4.5296826    1.5260626 0.0020274402 -0.022859903    4.5505151 
+   94540    20.120902    1.0104228     23.95124    6.0649986    4.5498696    1.5151291 0.0020403894 -0.022864293    4.5706935 
+   94550    20.284752    1.0190704    23.927799    6.0507663    4.5226702    1.5280961 0.0018366969 -0.022019629    4.5428531 
+   94560    20.222081    1.0175761    23.694744    6.0565153      4.53066    1.5258554 0.0015938844 -0.020686946     4.549753 
+   94570    20.257802    1.0180539     23.60241    6.0543197    4.5277479    1.5265718 0.0014208774 -0.020157249    4.5464842 
+   94580    20.162479    1.0252123      23.5203    6.0879982    4.5506923    1.5373059 0.0011393737 -0.019238984    4.5687919 
+   94590     20.13254    1.0278584    23.857946     6.068504    4.5272303    1.5412737 0.0011152335 -0.019072995    4.5451881 
+   94600    20.021095    1.0137889     23.93766    6.0647623    4.5445859    1.5201764  0.001056377 -0.018676661    4.5622061 
+   94610     20.22077    1.0089262    23.938373    6.0505677    4.5376829    1.5128848 0.0013965492 -0.020079598     4.556366 
+   94620    20.152885    1.0061261      23.4991    6.0462079    4.5375218     1.508686 0.0012713274 -0.019529252    4.5557797 
+   94630    19.920614    1.0244822    23.742269    6.0682495    4.5320384    1.5362111 0.0014090268 -0.020131611     4.550761 
+   94640    19.953967    1.0109365    23.433046    6.0418749    4.5259756    1.5158993 0.0015565466 -0.021026947     4.545446 
+   94650    20.086898    1.0189003    24.038715    6.0488956    4.5210546    1.5278409 0.0016090222 -0.021277956    4.5407236 
+   94660    20.281102    1.0205422    23.551937    6.0672772    4.5369741     1.530303 0.0016840228  -0.02204516    4.5573353 
+   94670    20.059754    1.0144259    23.686047    6.0781296     4.556998    1.5211316 0.0015994675  -0.02203464    4.5774332 
+   94680    19.948465    1.0406576    23.575257    6.0865842    4.5261182     1.560466 0.0016759727  -0.02254053    4.5469828 
+   94690    20.379061    1.0188044    23.651715    6.0833246    4.5556274    1.5276972 0.0017637266 -0.022813099    4.5766767 
+   94700    20.373263    1.0172294    23.590025    6.0657078    4.5403724    1.5253355 0.0017606555 -0.022517275     4.561129 
+   94710    20.255578    1.0136656    23.358117    6.0499455     4.529954    1.5199916 0.0019565891 -0.023325745    4.5513231 
+   94720    20.428354    1.0052361    23.622257    6.0336273    4.5262758    1.5073515 0.0020062409 -0.023434872    4.5477045 
+   94730    20.032558    1.0039544    23.810691    6.0266031    4.5211735    1.5054296 0.0018355515 -0.022907026     4.542245 
+   94740    20.085205   0.99715583    23.898076    6.0179843    4.5227491    1.4952352 0.0019283476 -0.023426108    4.5442469 
+   94750    20.450079   0.99192608    23.611516    6.0187852    4.5313921    1.4873932 0.0019505729 -0.022938574    4.5523801 
+   94760    20.566955    1.0251212    23.781102    6.0631498    4.5259806    1.5371693 0.0017378754  -0.02215162    4.5463943 
+   94770    20.251411    1.0364205    23.682206    6.1126561    4.5585436    1.5541125 0.0016620036 -0.022052966    4.5789345 
+   94780    19.840627    1.0375879    23.723632    6.1092379    4.5533748     1.555863 0.0015253517 -0.021179938    4.5730294 
+   94790    19.987054    1.0343315    23.680881    6.0931391     4.542159    1.5509801 0.0015961392 -0.021331154     4.561894 
+   94800    19.841742    1.0313182    23.593198    6.0932888    4.5468272    1.5464616 0.0017281921 -0.021996627    4.5670956 
+   94810    19.778186    1.0281001    24.028127    6.0793794    4.5377433    1.5416361 0.0017516142 -0.022151645    4.5581433 
+   94820    20.302484     1.024614    23.881752    6.0773578    4.5409492    1.5364086 0.0017239616 -0.021750651    4.5609759 
+   94830    20.354972    1.0468116    24.170059    6.0977215    4.5280275     1.569694 0.0018500283 -0.022091126    4.5482686 
+   94840    20.237153    1.0342715    23.792215    6.1043929    4.5535028    1.5508901 0.0017307576 -0.022133841    4.5739059 
+   94850    20.401647    1.0217168    23.787891    6.0775763     4.545512    1.5320643 0.0016741398 -0.021679657    4.5655175 
+   94860    20.196323    1.0323093    23.737711    6.0664919    4.5185441    1.5479477 0.0015253322 -0.021109593    4.5381284 
+   94870    20.139498    1.0217329    23.875482     6.089174    4.5570854    1.5320885 0.0014617507 -0.020521141    4.5761448 
+   94880    20.211731    1.0212338    24.023816    6.0994572    4.5681171    1.5313401 0.0013790313 -0.019359939    4.5860981 
+   94890    20.038838    1.0275226    23.891145    6.0743878    4.5336177    1.5407702 0.0014226896 -0.019387231    4.5515822 
+   94900     20.22663    1.0337424    23.762742    6.0843299    4.5342332    1.5500967 0.0013613972 -0.019204573    4.5520764 
+   94910    19.932272    1.0381687    23.650248    6.0910872    4.5343532     1.556734  0.001159409 -0.018546158    4.5517399 
+   94920    20.092364    1.0123113    23.887854     6.071262    4.5533012    1.5179608 0.0010492342 -0.017955565    4.5702075 
+   94930    20.184433    1.0268376    23.628681    6.0953237    4.5555807     1.539743 0.00087280553 -0.017063861    4.5717718 
+   94940    19.945809    1.0344727     23.94762    6.0881446    4.5369528    1.5511918 0.00094016327  -0.01761554    4.5536282 
+   94950    20.141405     1.026276    23.641077     6.089751    4.5508501    1.5389009 0.0011112472 -0.018690963    4.5684298 
+   94960    20.285311    1.0166777    23.716757    6.0584548    4.5339466    1.5245082 0.0012625475 -0.019409273    4.5520933 
+   94970    20.323945    1.0084056    23.811574    6.0555104    4.5434062    1.5121042 0.0013233848 -0.019565168     4.561648 
+   94980    20.474888    1.0182819    23.517108    6.0522591    4.5253454    1.5269137 0.0013153453 -0.019619757    4.5436498 
+   94990    20.432267   0.99826488    23.765332    6.0621035    4.5652054    1.4968982 0.0016033087 -0.021094624    4.5846967 
+   95000    20.197803    1.0154294    23.791503    6.0561937    4.5335573    1.5226364 0.0016453647 -0.021796856    4.5537088 
+   95010    20.397008    1.0114384    23.691109    6.0637329    4.5470811    1.5166518  0.001690254 -0.022285763    4.5676766 
+   95020    20.579046    1.0334191     23.65287    6.0957867    4.5461747     1.549612 0.0016624107 -0.021884554    4.5663968 
+   95030    20.341641    1.0422772      23.7712    6.1168821    4.5539874    1.5628947 0.0014619369 -0.021310318    4.5738358 
+   95040    20.422256    1.0375816    23.881189    6.1050724    4.5492187    1.5558537 0.0015300397 -0.021498137    4.5691868 
+   95050    20.027686    1.0335696    23.903304    6.0980675    4.5482299    1.5498376 0.0015945636 -0.021567058    4.5682024 
+   95060    19.997418    1.0223297    23.688138    6.0681242    4.5351407    1.5329835 0.0015452002 -0.021758563    4.5553541 
+   95070    20.387293    1.0066261       23.829    6.0569823    4.5475464    1.5094359 0.0014727822 -0.021659764    4.5677334 
+   95080    20.393031    1.0031253    23.481583    6.0552221    4.5510357    1.5041864 0.0016181187 -0.021693272    4.5711108 
+   95090    20.318469    1.0079837    23.734239    6.0736856     4.562214    1.5114715  0.001493577 -0.020894375    4.5816148 
+   95100    20.225333    1.0125927    23.743984    6.0471372    4.5287544    1.5183828 0.0013883562  -0.02034066    4.5477067 
+   95110     20.38963    1.0054473     23.58171    6.0569052    4.5492369    1.5076683  0.001206741 -0.019737652    4.5677678 
+   95120    20.391853    1.0155015    23.988051    6.0547539    4.5320094    1.5227445 0.0012080865 -0.019950548    4.5507519 
+   95130    20.244186   0.99673488    23.210581    6.0348298    4.5402258    1.4946039 0.0012975529 -0.020083907    4.5590122 
+   95140    19.614737    1.0029125    23.932611    6.0362278    4.5323605    1.5038672 0.0012515856 -0.019449437    4.5505584 
+   95150    20.422003   0.99637442    24.109251    6.0337001    4.5396367    1.4940634  0.001599494 -0.021043363    4.5590806 
+   95160    20.064006   0.99945046    23.465201    6.0417122    4.5430362     1.498676 0.0017807507 -0.022081376    4.5633369 
+   95170    20.281841    1.0115791    23.638295    6.0520187    4.5351559    1.5168628 0.0018618681 -0.022544893     4.555839 
+   95180    20.361306    1.0102264    23.753745     6.042798    4.5279635    1.5148344 0.0018935874 -0.022587744    4.5486577 
+   95190    20.365595   0.99033404    23.661367    6.0234261    4.5384202    1.4850059  0.001817561  -0.02247041    4.5590731 
+   95200    20.272281    1.0105823    23.468423    6.0242898    4.5089217    1.5153681 0.0017235651 -0.022187449    4.5293856 
+   95210    20.218907    1.0002368    23.579037    6.0180842    4.5182291    1.4998551 0.0016813126 -0.022122642    4.5386704 
+   95220    20.215358   0.99320013    23.843736    6.0076212    4.5183177    1.4893036 0.0017943191 -0.022272215    4.5387956 
+   95230    20.335784   0.98468845    23.689896    6.0070497    4.5305093    1.4765403 0.0019138091 -0.022869507     4.551465 
+   95240    20.311163   0.98073975    23.462823    6.0013882    4.5307689    1.4706193 0.0020293507 -0.023713535    4.5524531 
+   95250    20.260951   0.99731039    23.539746    6.0119594    4.5164925    1.4954669 0.0020402641 -0.023398087    4.5378503 
+   95260     20.39157    1.0141295    23.699686    6.0534377    4.5327505    1.5206872 0.0020247433  -0.02304167    4.5537674 
+   95270    20.357521   0.99874734     23.64174    6.0470981    4.5494765    1.4976216 0.0016937613 -0.021601125    4.5693839 
+   95280    20.546626     1.021335    23.792665    6.0571055    4.5256137    1.5314918 0.0012896762 -0.019301927     4.543626 
+   95290    20.269268    1.0217146    23.567784    6.0703134    4.5382522    1.5320611 0.0011171187 -0.018721435    4.5558566 
+   95300    20.364458    1.0237954    23.694826    6.1024211      4.56724    1.5351811 0.0012126747 -0.019262863    4.5852902 
+   95310    20.368824    1.0309616    23.806191     6.078557    4.5326301    1.5459269 0.0014259745 -0.020669267    4.5518733 
+   95320    20.124072    1.0346017    23.755431    6.0747111    4.5233258    1.5513853 0.0015868161 -0.021269466    4.5430084 
+   95330    20.397966    1.0327739    23.756278    6.0752807    4.5266363    1.5486444 0.0016717766 -0.021764927    4.5467294 
+   95340      20.2656     1.033969    23.921279    6.0789094    4.5284729    1.5504365 0.0016376105 -0.022079685     4.548915 
+   95350    20.141707    1.0334127    24.086365    6.0675662    4.5179637    1.5496024 0.0015613993 -0.021604141    4.5380065 
+   95360     20.38236    1.0222436    23.631331    6.0751842    4.5423299    1.5328543 0.0017712684  -0.02212614    4.5626848 
+   95370    20.283567    1.0302862    23.794031    6.0636061     4.518692    1.5449141 0.0017387601 -0.022013333    4.5389666 
+   95380    20.108059    1.0023431    23.568721    6.0517461    4.5487326    1.5030136 0.0016851081 -0.021260512     4.568308 
+   95390    20.340927    1.0044163    23.672174    6.0560738    4.5499516    1.5061222  0.001639113 -0.020973098    4.5692856 
+   95400    20.120948     1.010867    23.502577    6.0522896    4.5364945     1.515795 0.0016740395 -0.021133274    4.5559538 
+   95410    20.153997    1.0157739    23.500809    6.0460518    4.5228988     1.523153 0.0018306629 -0.021610603    4.5426787 
+   95420    20.168568    1.0267102    23.748299    6.0648393    4.5252874    1.5395519 0.0018398688 -0.021533476     4.544981 
+   95430     19.61209    1.0242591    23.562147    6.0732033    4.5373268    1.5358765 0.0018803441 -0.021816871    4.5572633 
+   95440    19.655395   0.99569375    23.685442    6.0175503    4.5245075    1.4930428 0.0017678947 -0.021016682    4.5437563 
+   95450     20.18854   0.98694267    23.785068    6.0186023    4.5386818    1.4799205 0.0017263316 -0.020739041    4.5576945 
+   95460    20.316286   0.98493663     23.72468    6.0166726    4.5397601    1.4769125 0.0017061409 -0.021302582    4.5593566 
+   95470    20.339867    0.9739807    23.480022    5.9925521     4.532068    1.4604841 0.0016588709 -0.021430411    4.5518396 
+   95480    20.361164   0.99561174    23.446221    5.9969233    4.5040035    1.4929198 0.0015979398 -0.021352926    4.5237585 
+   95490    20.371302   0.99107085    23.653269    6.0274452    4.5413345    1.4861107 0.0016712369 -0.021788127    4.5614514 
+   95500    20.148623   0.99828473    23.926189    6.0305155    4.5335876     1.496928 0.0016167391 -0.021630807    4.5536016 
+   95510    20.188965   0.99291993    23.910503     6.012817    4.5239336    1.4888834 0.0016267319 -0.021528007    4.5438348 
+   95520     19.99945     1.015498    23.953961    6.0721467    4.5494073    1.5227393 0.0016324668 -0.021566056    4.5693409 
+   95530    20.411956    1.0111345    23.501368    6.0508404    4.5346442    1.5161962 0.0016708909 -0.021686622    4.5546599 
+   95540    20.163186    1.0166575    23.948355    6.0523116    4.5278338    1.5244779  0.001636778 -0.021498022     4.547695 
+   95550    20.139381    1.0173963    23.863836    6.0619791    4.5363934    1.5255857 0.0015334928 -0.020763935    4.5556239 
+   95560    19.694594    1.0385427    23.608221    6.0894099    4.5321151    1.5572948 0.0016374924 -0.021326341     4.551804 
+   95570    20.084119    1.0485439    23.788361    6.1255308    4.5532393    1.5722915 0.0013524941 -0.020273553    4.5721603 
+   95580    20.323929    1.0434958    24.123291    6.0918765    4.5271545     1.564722 0.0014912786 -0.020902892    4.5465661 
+   95590    19.959636    1.0212434    23.671078    6.0655403    4.5341859    1.5313545 0.0015123944 -0.020838395    4.5535119 
+   95600    20.029884    1.0024582    23.731599    6.0489652    4.5457792    1.5031861 0.0015281215 -0.020937538    4.5651886 
+   95610    20.433897    1.0192173     23.67494    6.0869024    4.5585861    1.5283164 0.0016229816 -0.021324403    4.5782875 
+   95620    20.249601    1.0169998    23.862343    6.0643642    4.5393729    1.5249913 0.0015052495 -0.021046402    4.5589141 
+   95630    20.363479    1.0276952     23.89724    6.0765157    4.5354868    1.5410289 0.0014408488 -0.020884233    4.5549301 
+   95640    20.191442    1.0316204    23.762693     6.098379    4.5514642    1.5469148 0.0014098551 -0.020696247    4.5707506 
+   95650    20.583781    1.0173169    23.689147    6.0761961    4.5507294    1.5254667 0.0016739051 -0.021634151    4.5706897 
+   95660     20.26664    1.0183508    23.927264     6.062703    4.5356859    1.5270171  0.001944511 -0.022907952    4.5566494 
+   95670    20.209581    1.0156147    23.882509    6.0406684    4.5177542    1.5229142 0.0019322803 -0.022661904    4.5384839 
+   95680    20.154282   0.97983482      23.5422    6.0177784     4.548516    1.4692623 0.0017757837 -0.021877758     4.568618 
+   95690    20.199492   0.97553087    23.615661    5.9786001    4.5157916    1.4628085 0.0017394372 -0.021819946    4.5358721 
+   95700     20.22546    1.0026368    23.683576    5.9955361    4.4920821    1.5034539 0.0018079627 -0.021985906    4.5122601 
+   95710    20.172277    1.0020105    23.820683     6.041722    4.5392072    1.5025148 0.0017967041 -0.022133799    4.5595443 
+   95720    20.262873   0.98856762    23.690591    6.0195721     4.537215    1.4823572 0.0016057085 -0.021035498    4.5566448 
+   95730    19.694161    1.0015013    23.547241    6.0088951     4.507144    1.5017512 0.0014570343 -0.020658351    4.5263453 
+   95740    20.125053   0.98092806    23.491593    6.0161374    4.5452357    1.4709016 0.0015029988 -0.021193132    4.5649259 
+   95750     19.84457    1.0053112    23.481383    6.0287133    4.5212493    1.5074641 0.0015836526 -0.021680785    4.5413464 
+   95760    19.424957   0.99396278    23.360413    6.0196477    4.5292005    1.4904472   0.00154705 -0.021617997    4.5492715 
+   95770    20.052221    1.0032308    23.877907    6.0168266     4.512482    1.5043446 0.0015047813 -0.021611999    4.5325892 
+   95780     20.25529    1.0171274    23.591112    6.0796754    4.5544929    1.5251825  0.001751802 -0.022396291    4.5751374 
+   95790    20.409904    1.0083653    23.872384    6.0982432    4.5861994    1.5120437 0.0018100424 -0.022573886    4.6069633 
+   95800    20.272334    1.0348179    23.553821    6.0911123     4.539403    1.5517094 0.0018476763 -0.022709687     4.560265 
+   95810    20.472614    1.0200518    23.561685    6.0822416     4.552674    1.5295676 0.0017744083 -0.022555134    4.5734547 
+   95820    20.272231    1.0140006    23.717258    6.0611778     4.540684    1.5204939 0.0019393934  -0.02311399    4.5618586 
+   95830    20.013192    1.0155862     23.60121    6.0874037    4.5645322    1.5228715 0.0020926366 -0.023832513     4.586272 
+   95840    20.064847    1.0298086    23.957075    6.0744582    4.5302603    1.5441979 0.0021082943 -0.024023211    4.5521752 
+   95850    20.103053    1.0101241    23.618175    6.0491396    4.5344585    1.5146811 0.0021691918 -0.024401169    4.5566905 
+   95860    20.082278    1.0196796    23.912526    6.0515059    4.5224963    1.5290095 0.0023210319 -0.024630077    4.5448054 
+   95870    20.018975    1.0237587    23.993992    6.0556738    4.5205476    1.5351262 0.0021968899 -0.023985788    4.5423365 
+   95880    20.087923    1.0087098     23.60145    6.0353859    4.5228256    1.5125603 0.0019629483  -0.02296698    4.5438296 
+   95890    20.284193   0.99731103    23.592897    6.0233509     4.527883    1.4954679 0.0020044652 -0.023556681    4.5494352 
+   95900    20.250389     1.014014     23.61527    6.0380455    4.5175316     1.520514 0.0022017365 -0.024389886    4.5397197 
+   95910    20.308973    1.0088938    23.593487    6.0476694    4.5348332    1.5128362 0.0021939237 -0.024656642    4.5572959 
+   95920    20.238246    1.0011422     23.91193    6.0361966    4.5349838    1.5012127 0.0020414509 -0.024356782    4.5572992 
+   95930    20.318237    1.0034002    23.633301    6.0241247    4.5195261    1.5045986 0.0018927258 -0.023635552    4.5412689 
+   95940    20.253053   0.98916374    23.550538    6.0212922    4.5380412     1.483251 0.0017985644 -0.022809088    4.5590517 
+   95950    19.937847    1.0076836    23.936868    6.0316715    4.5206499    1.5110216 0.0018140436 -0.022784882    4.5416207 
+   95960    20.113456    1.0131196    23.992274    6.0403628    4.5211899    1.5191729 0.0020168147 -0.023590857    4.5427639 
+   95970    20.201259      1.01459    23.441204    6.0483071    4.5269293    1.5213778 0.0021590447  -0.02417195    4.5489422 
+   95980    20.106835   0.99887497    23.657167    6.0363569    4.5385438     1.497813  0.002089011 -0.024162318    4.5606172 
+   95990    20.155492    1.0165554    23.853713    6.0536889    4.5293642    1.5243248  0.001906691 -0.023418265    4.5508757 
+   96000    20.457147    1.0066647    23.609201    6.0375788    4.5280851    1.5094937 0.0018206306 -0.022644492     4.548909 
+   96010    20.595658    1.0037802    23.935454    6.0365086    4.5313402    1.5051685 0.0017440621 -0.022104125    4.5517002 
+   96020    20.170421    1.0093735    24.102355    6.0441118    4.5305561    1.5135556 0.0017058095 -0.022213226    4.5510636 
+   96030    20.123726     1.025547    23.656504    6.0652462    4.5274385    1.5378077 0.0016751512 -0.021982999    4.5477463 
+   96040    20.096552    1.0032395    23.908396    6.0424347     4.538077    1.5043577 0.0016548341 -0.021865606    4.5582877 
+   96050    20.516306    1.0040637    23.541904    6.0263145     4.520721    1.5055935 0.0013806498 -0.020890113    4.5402305 
+   96060    20.387673    1.0217728    23.926141    6.0490158    4.5168676    1.5321483 0.0013164186 -0.020546463    4.5360976 
+   96070     20.30708    1.0299108    23.940114     6.062343    4.5179917    1.5443513 0.0014234625 -0.021034996    4.5376033 
+   96080     20.12685    1.0170518    23.668224    6.0531377    4.5280684    1.5250692 0.0015271964 -0.021210113    4.5477514 
+   96090    20.263193    1.0159794    23.687697    6.0627458    4.5392847    1.5234611 0.0015715196 -0.020907615    4.5586208 
+   96100    19.797886     1.030253    23.665976     6.094041    4.5491765    1.5448644 0.0015136562 -0.020535691    4.5681986 
+   96110    20.018803     1.023072    23.895558    6.1021743    4.5680778    1.5340965 0.0011899574 -0.019285812    4.5861737 
+   96120    20.077878    1.0397886    23.969531    6.0797958    4.5206329     1.559163 0.0011585843 -0.019273147    4.5387474 
+   96130     20.16267    1.0068607    23.475137    6.0714333    4.5616457    1.5097876 0.0012205628 -0.019434697    4.5798598 
+   96140    19.784415    1.0065099    23.800056    6.0439064    4.5346447    1.5092617 0.0013337948 -0.019595242    4.5529061 
+   96150    20.129274    1.0147152    23.838262    6.0566479    4.5350824    1.5215655  0.001483085 -0.020406489    4.5540058 
+   96160    20.340584    1.0184986    23.922005    6.0697688    4.5425303    1.5272386 0.0015994214 -0.021068743    4.5619996 
+   96170    19.890999    1.0107439    23.461749    6.0514196    4.5358091    1.5156104 0.0016374787 -0.021400782    4.5555724 
+   96180     20.03776    1.0129415      23.7379    6.0661945    4.5472887    1.5189058 0.0016865099  -0.02167369    4.5672759 
+   96190    20.516119    1.0191294    23.801256    6.0551101    4.5269256    1.5281845 0.0019794921 -0.023065739    4.5480119 
+   96200    20.027169    1.0099652    23.689615    6.0546924    4.5402496    1.5144428 0.0020076247  -0.02319459    4.5614366 
+   96210    20.310152    1.0189917    23.639709    6.0637361     4.535758    1.5279781 0.0020124332 -0.023259825    4.5570054 
+   96220    20.356025    1.0074739    23.633077    6.0580865    4.5473794    1.5107072 0.0020051747 -0.023297699    4.5686719 
+   96230    20.142542   0.98989642    23.582807    6.0336789    4.5493292    1.4843497 0.0018731725 -0.023134434    4.5705905 
+   96240    20.301515    1.0228279    23.798119    6.0379026    4.5041721    1.5337305 0.0018225052 -0.022864726    4.5252143 
+   96250    20.380007    0.9929632    23.702602    6.0334732    4.5445249    1.4889483 0.0016725785 -0.022174519    4.5650269 
+   96260    20.299854     1.014727     23.77701    6.0423637    4.5207807    1.5215831 0.0015283639 -0.021054653    4.5403069 
+   96270    19.957356    0.9930395      23.8214    6.0462387     4.557176    1.4890627 0.0012640676 -0.019959264    4.5758712 
+   96280    20.440419    1.0179746    23.534952    6.0701232    4.5436703    1.5264528 0.0011971939 -0.019636434    4.5621096 
+   96290    20.190894   0.99920228    23.723747    6.0325338    4.5342299    1.4983038 0.0011806671 -0.019460499    4.5525098 
+   96300    20.356792    1.0084776    23.409437     6.014567    4.5023548    1.5122122 0.0010980846 -0.019153342    4.5204101 
+   96310    20.015744   0.98213631    23.659695      6.00048    4.5277667    1.4727134 0.0011262747 -0.019167306    4.5458077 
+   96320    20.051949    1.0074743    23.352846    6.0030359    4.4923281    1.5107077 0.0013374088 -0.019796866    4.5107876 
+   96330    19.993092    1.0066746    23.844055    6.0091963    4.4996876    1.5095086 0.0012963763 -0.019407968    4.5177992 
+   96340    20.084855    1.0198886    23.876711     6.051386    4.5220631     1.529323 0.0014533345 -0.019958135    4.5405679 
+   96350    19.855386    1.0062052    23.838335     6.050513    4.5417083    1.5088047 0.0015450252 -0.020346982    4.5605102 
+   96360    20.031684    1.0021984    23.816643    6.0451544    4.5423579    1.5027965 0.0016618659 -0.020999645    4.5616957 
+   96370    20.584562    1.0124858    23.589809    6.0619048    4.5436823    1.5182225 0.0017992702  -0.02156099     4.563444 
+   96380     20.25277    1.0233658    23.626093    6.0633565    4.5288195     1.534537 0.0016697354 -0.021020679    4.5481704 
+   96390     19.97371    1.0059226     23.67729    6.0703247    4.5619438    1.5083809 0.0015761858 -0.020690065    4.5810577 
+   96400    20.093199    1.0072602    23.852222    6.0536416    4.5432549    1.5103866 0.0014839533 -0.020534443    4.5623054 
+   96410    20.276004     1.018189    23.631523    6.0550245      4.52825    1.5267744 0.0014494592  -0.02066211    4.5474627 
+   96420    20.263264   0.99978788    23.643618    6.0354923    4.5363104    1.4991819 0.0013004861 -0.019791289    4.5548012 
+   96430    19.974987    1.0045542     23.69539    6.0497093    4.5433803     1.506329 0.0011618204 -0.019046168    4.5612646 
+   96440    20.211536     1.011167    23.836642    6.0502354    4.5339904     1.516245 0.0014554869 -0.020459365    4.5529943 
+   96450    20.155353   0.99207312    23.401944    6.0217066     4.534093    1.4876136 0.0017416319 -0.021823283    4.5541746 
+   96460    20.103429    1.0090759    23.781896    6.0459624    4.5328531    1.5131093 0.0017769052 -0.022190418    4.5532666 
+   96470    20.221861    1.0082108    23.549333    6.0530783    4.5412662    1.5118121 0.0017184419 -0.021453412    4.5610012 
+   96480    20.168235    1.0130344    23.367678     6.055074    4.5360289    1.5190451 0.0017052612 -0.021690948    4.5560146 
+   96490    20.318758    1.0085622    23.838012    6.0605407    4.5482016     1.512339  0.001713934   -0.0222068    4.5686945 
+   96500    19.931708    1.0086781    23.861004    6.0717989     4.559286    1.5125129 0.0017946588 -0.022574007    4.5800653 
+   96510    19.983688    1.0381326    23.756506      6.11258    4.5559002    1.5566799 0.0018471373 -0.022314752    4.5763678 
+   96520    20.185847     1.020346    23.778406    6.0807958     4.550787    1.5300088 0.0017049988 -0.021695677    4.5707777 
+   96530    20.464339    1.0113538    23.677719    6.0540121     4.537487     1.516525 0.0017896483  -0.02201871    4.5577161 
+   96540    20.246244    1.0137047    23.568182    6.0533381    4.5332879    1.5200502 0.0017931547 -0.021960459    4.5534552 
+   96550      20.3217    1.0288685    23.337559    6.0572261    4.5144378    1.5427884  0.001822697 -0.022539649    4.5351547 
+   96560    20.239312      1.01969    23.808624    6.0609917    4.5319666    1.5290251 0.0017922417 -0.022419969    4.5525943 
+   96570    20.173091    1.0106326    23.855762    6.0505081    4.5350646    1.5154436 0.0016647956 -0.022221061    4.5556208 
+   96580    19.936286    1.0284329     23.95966    6.0674775    4.5253424    1.5421351 0.0015454814 -0.021431386    4.5452283 
+   96590     20.48017    1.0305577    23.858526    6.0769406    4.5316193    1.5453213 0.0015059662  -0.02142406    4.5515374 
+   96600    19.750671    1.0101207    23.650879    6.0702732    4.5555972     1.514676  0.001549397 -0.021831681    4.5758795 
+   96610    20.415849    1.0197838    23.599983    6.0629362    4.5337704    1.5291658 0.0016110818 -0.022037925    4.5541972 
+   96620    19.808398    1.0210927    23.892007    6.0735729    4.5424444    1.5311285 0.0018405662 -0.022959807    4.5635637 
+   96630    20.168691     1.014176    23.428316    6.0825487    4.5617918     1.520757 0.0019867517  -0.02330392    4.5831089 
+   96640     20.13737    1.0271626    23.907856    6.0755587    4.5353283    1.5402304 0.0019407808 -0.023141495    4.5565291 
+   96650    20.342058    1.0066718    23.771126    6.0639155    4.5544111    1.5095044 0.0019272956 -0.022725069    4.5752088 
+   96660     20.35053    1.0173132     23.77562    6.0493988    4.5239376    1.5254612 0.0019902902 -0.022759347    4.5447067 
+   96670    20.240959    1.0151462    23.757789    6.0379592    4.5157475    1.5222118 0.0019519342 -0.022766285    4.5365618 
+   96680    20.199617    1.0109717    23.373716    6.0471923    4.5312401    1.5159521 0.0018551096 -0.022212416    4.5515975 
+   96690    20.202046    1.0194659    23.838747    6.0665242     4.537835    1.5286892  0.001728914 -0.021785862     4.557892 
+   96700    20.179002    1.0008069    23.725677    6.0526528     4.551943    1.5007099 0.0017072914  -0.02147902    4.5717147 
+   96710    20.363906    1.0161827    23.572883    6.0493049    4.5255389     1.523766 0.0017357494 -0.021418066    4.5452212 
+   96720    20.360768    1.0039268    23.494922    6.0441594    4.5387711    1.5053883 0.0015370495 -0.020067452    4.5573015 
+   96730     20.59344   0.99976679    23.876627    6.0358013     4.536651    1.4991503 0.0012393804 -0.018794901    4.5542065 
+   96740    20.423892    1.0016339    23.817867    6.0289504    4.5270003    1.5019501 0.0012790902 -0.018996311    4.5447175 
+   96750    20.104473    1.0163349     23.54357    6.0655095    4.5415153    1.5239942 0.0012396271 -0.019485605    4.5597613 
+   96760     20.14302    1.0174835    23.904082     6.050585    4.5248685    1.5257165 0.0011444047  -0.01940649    4.5431306 
+   96770    20.361072    1.0147787     23.41754    6.0397434    4.5180827    1.5216607 0.0013035803 -0.019888041    4.5366672 
+   96780    20.306583    1.0116348    23.732864      6.05897    4.5420236    1.5169464 0.0014662051 -0.020802051    4.5613594 
+   96790    20.455846    1.0102558    23.507952     6.044015    4.5291364    1.5148785 0.0015289854 -0.021112337    4.5487198 
+   96800    20.397844    1.0126705    23.999961    6.0421155    4.5236161    1.5184994  0.001452387 -0.020835004    4.5429987 
+   96810    20.143127    1.0044286     23.70203    6.0518613    4.5457207    1.5061406 0.0015806002 -0.021179509    4.5653196 
+   96820    20.436425    1.0241049     23.64798    6.0735687    4.5379233    1.5356454 0.0015076957 -0.020651777    4.5570674 
+   96830     20.45922    1.0170865    23.645135    6.0589987    4.5338775    1.5251212 0.0014593693 -0.020682534    4.5531007 
+   96840    20.422497     1.041615     23.63297    6.1050914    4.5431897    1.5619017 0.0013434572 -0.019932238    4.5617785 
+   96850    20.274096    1.0258282    23.796376     6.085081    4.5468516    1.5382294 0.00096481248 -0.018651979    4.5645387 
+   96860     20.23183    1.0105519    23.546155    6.0826235    4.5673008    1.5153226 0.0008880413 -0.018151426    4.5845642 
+   96870     20.24041    1.0109414    23.632898    6.0678855    4.5519788    1.5159067 0.00074261987 -0.017069551    4.5683057 
+   96880    20.353147    1.0138769    23.284567    6.0494676    4.5291592    1.5203084 0.00079112017 -0.017524233    4.5458923 
+   96890    20.537907   0.99612374    23.346832    6.0572107    4.5635232    1.4936875 0.00086666805 -0.017616887    4.5802734 
+   96900    20.363807   0.98545436    23.733569    6.0259422    4.5482534    1.4776888 0.00086002418 -0.017738294    4.5651317 
+   96910    20.168932    1.0060508    23.729816    6.0660237    4.5574506    1.5085732 0.00094025578 -0.018051214    4.5745615 
+   96920    20.319109    1.0224626    23.613065    6.0686114    4.5354287    1.5331827 0.00088697604 -0.017926498    4.5524682 
+   96930    20.216971    1.0044539    23.846834    6.0767317    4.5705531    1.5061786 0.00086917034 -0.017843444    4.5875273 
+   96940     20.41816   0.99948515    23.751125     6.048803     4.550075     1.498728 0.0010340002 -0.018594108    4.5676351 
+   96950    20.480215    1.0138546     23.64549    6.0514493    4.5311743     1.520275 0.0012201859  -0.01954244    4.5494966 
+   96960    20.438611    1.0265464     23.77064    6.0653478    4.5260415    1.5393063 0.0014759063 -0.020613913    4.5451795 
+   96970    20.565244     1.012615     23.58738    6.0501373    4.5317211    1.5184162 0.0018582996 -0.022217408    4.5520802 
+   96980    20.462859   0.99907255    23.479196    6.0289051    4.5307958    1.4981093 0.0020281899   -0.0232916    4.5520592 
+   96990    20.501901    1.0199243    23.805966    6.0504581    4.5210816    1.5293765 0.0022175831 -0.024200196    4.5430642 
+   97000      20.4492   0.98542559    23.517382    6.0220194    4.5443738    1.4776457 0.0020375722 -0.023299265    4.5656355 
+   97010     20.56884    1.0115111     23.60937    6.0323803    4.5156194    1.5167609 0.0017762097  -0.02221197    4.5360552 
+   97020    20.423152   0.99799395    23.482459    6.0249413    4.5284493    1.4964919 0.0014792049 -0.021096891     4.548067 
+   97030    20.518877   0.98748377    23.791062     5.998629    4.5178971    1.4807319 0.0015861258 -0.021686603    4.5379975 
+   97040    20.273831   0.98035671    23.827748    5.9985098    4.5284649    1.4700449 0.0017160464 -0.022022636    4.5487715 
+   97050    20.291267    1.0040008     23.41845    6.0080556    4.5025564    1.5054992 0.0017643266  -0.02194499     4.522737 
+   97060     20.14757   0.99820393    23.812902    6.0265012    4.5296944    1.4968068 0.0016785311 -0.021424622    4.5494405 
+   97070    20.169494   0.99978227    23.858354       6.0468    4.5476265    1.4991735 0.0016318741 -0.021423494    4.5674181 
+   97080    20.301978    1.0189108    23.642016    6.0604286    4.5325719    1.5278567 0.0016552454 -0.021382116    4.5522988 
+   97090     20.26626    1.0338855    23.759021    6.0706555    4.5203442    1.5503113 0.0016918365 -0.021566568     4.540219 
+   97100    20.231035    1.0160304    23.694084    6.0621387    4.5386011    1.5235376 0.0016639432 -0.021814104    4.5587513 
+   97110    20.229618   0.98613008    23.556067    6.0337485    4.5550464    1.4787021 0.0016201404 -0.021459929    4.5748862 
+   97120    20.347717   0.98412464    23.626127    6.0159411    4.5402462    1.4756949 0.0016210441 -0.021407351    4.5600325 
+   97130    19.959805    1.0216375    23.507864      6.06541    4.5334645    1.5319454 0.0017777694 -0.022668553    4.5543553 
+   97140    20.350725    1.0364547    23.836544    6.0585013    4.5043375    1.5541639 0.0018256406 -0.022698952    4.5252108 
+   97150    20.296872    1.0260781    23.727034    6.0691185    4.5305143    1.5386042 0.0018048053 -0.022287486     4.550997 
+   97160    20.443091    1.0221063    23.919458    6.0562631    4.5236147    1.5326483 0.0016924529 -0.021563968    4.5434862 
+   97170     19.96462    1.0140393    23.856523    6.0731736    4.5526216     1.520552 0.0016871653 -0.021464284    4.5723988 
+   97180    20.332622    1.0057571    23.674422    6.0308331    4.5227004    1.5081327 0.0016760957 -0.021118914    4.5421432 
+   97190    20.213599    1.0076453    23.680767    6.0275248    4.5165606    1.5109642 0.0014799164 -0.020086173    4.5351669 
+   97200    20.388429    1.0120586    23.777736    6.0745893    4.5570075    1.5175819 0.0014181092 -0.020097688     4.575687 
+   97210    20.225511    1.0139459    23.339006    6.0460182    4.5256063    1.5204119 0.0015494707 -0.020544631    4.5446014 
+   97220    20.038388    1.0044396    23.719414    6.0430144    4.5368573    1.5061571 0.0015695318 -0.020726585    4.5560143 
+   97230    20.415922    1.0234557    23.248634    6.0628947    4.5282228    1.5346719 0.0016154819 -0.021373326    4.5479807 
+   97240    20.144258    1.0159763    23.717472    6.0655769    4.5421204    1.5234565 0.0016146529 -0.021362788    4.5618686 
+   97250    20.116305    1.0353447    24.016193    6.0789887    4.5264893    1.5524994 0.0014115902 -0.020178173    4.5452559 
+   97260    20.129895    1.0188373    23.679423     6.062723    4.5349764    1.5277466  0.001385475 -0.020047154    4.5536381 
+   97270    19.976537    1.0296405    23.723339    6.0664443    4.5224983    1.5439459 0.0012330275 -0.019387505    4.5406528 
+   97280    19.998245    1.0139139    23.702421    6.0633272    4.5429633    1.5203639 0.0012718176 -0.019881045    4.5615725 
+   97290    20.189365    1.0140368    23.748807    6.0733637    4.5528155    1.5205482 0.0014631624  -0.02102898    4.5723813 
+   97300    20.165867    1.0098622    23.557458    6.0696202    4.5553319    1.5142883 0.0014658277 -0.021043027    4.5749091 
+   97310    20.056453    1.0083787    23.697302    6.0480121    4.5359482    1.5120639 0.0014989307 -0.021025719     4.555475 
+   97320      20.3135    1.0029308    23.782346    6.0680594    4.5641646    1.5038948 0.0015194037 -0.021423997    4.5840692 
+   97330    19.870769    1.0396727    23.863101    6.0857678    4.5267786    1.5589892 0.0017105728 -0.022065009    4.5471331 
+   97340    20.144214    1.0498122     23.95631    6.1385296    4.5643362    1.5741934 0.0018304206 -0.023063797    4.5855696 
+   97350    20.027386    1.0407693    23.611198    6.1266924    4.5660589    1.5606336  0.001849501 -0.023271887    4.5874813 
+   97360     20.07134    1.0294396    23.848335    6.0799913    4.5363466    1.5436447 0.0017667606 -0.022760093      4.55734 
+   97370     20.36119    1.0146595    23.955477    6.0606007    4.5391188    1.5214819 0.0015000158 -0.021192475    4.5588113 
+   97380    20.112145   0.98998355    23.589789    6.0397636    4.5552833    1.4844803 0.0014108016 -0.020837419    4.5747099 
+   97390    20.054592    1.0075788    23.489372    6.0360522    4.5251877    1.5108644 0.0014107639 -0.020649697    4.5444267 
+   97400    20.152325   0.98642508    23.559713    6.0115356    4.5323912    1.4791444 0.0015225317 -0.021064917    4.5519336 
+   97410    20.431015   0.99114801    23.558577    5.9979585     4.511732    1.4862264 0.0015344946 -0.021379584    4.5315771 
+   97420    20.475725    1.0006823    23.599064    6.0148376    4.5143145    1.5005231 0.0015230296 -0.021249162    4.5340407 
+   97430    20.409332    1.0038324    23.948719    6.0282661    4.5230194    1.5052467 0.0016514859 -0.021356704    4.5427246 
+   97440    20.307207    1.0068069    23.525857    6.0365749    4.5268678     1.509707  0.001728732 -0.022083812    4.5472229 
+   97450    20.274784    0.9916829    23.809455    6.0244825     4.537454    1.4870285 0.0017967956 -0.022025282    4.5576825 
+   97460    19.953927    1.0024491    23.599031    6.0338721    4.5306996    1.5031725 0.0019327806 -0.022551128     4.551318 
+   97470    19.806332    1.0061798    23.566609    6.0386489    4.5298823    1.5087666 0.0021099799 -0.023113784    4.5508861 
+   97480    20.171978     1.014246    23.630689     6.047328    4.5264662    1.5208618 0.0020382562 -0.022963322    4.5473912 
+   97490    20.307622    1.0052321    23.525315     6.034418    4.5270725    1.5073455 0.0020177697 -0.022929753    4.5479845 
+   97500    20.386926   0.99970494    23.466632    6.0352763    4.5362187    1.4990576 0.0018973455 -0.022209622     4.556531 
+   97510    20.217345    1.0145994    23.617187    6.0411896    4.5197978    1.5213919 0.0016030606  -0.02096391    4.5391586 
+   97520    19.957363   0.99914714    23.488601    6.0322857    4.5340645    1.4982211 0.0015624402 -0.020709276    4.5532114 
+   97530    20.361511    1.0063849    23.686586    6.0185884    4.5095142    1.5090742 0.0016753245 -0.021908178     4.529747 
+   97540    20.367532    1.0005503     23.65689    6.0397559    4.5394307    1.5003252 0.0016712919 -0.021977774    4.5597372 
+   97550    20.245171    1.0299124    23.926452    6.0710284    4.5266747    1.5443536 0.0017225756 -0.022053216    4.5470054 
+   97560    20.175203    1.0175652    24.076038    6.0663651     4.540526     1.525839 0.0016855404 -0.022420902    4.5612614 
+   97570    20.110022    1.0321296    23.807634    6.0776922    4.5300138    1.5476783 0.0018196858 -0.022893547    4.5510877 
+   97580    20.091591     1.037267    23.738926    6.0788807    4.5234989    1.5553818 0.0018699827 -0.022522297    4.5441512 
+   97590    20.352004    1.0406896    23.837544    6.0738865    4.5133725     1.560514 0.0019153681 -0.022474154    4.5339312 
+   97600    20.284128    1.0181631    23.586934    6.0623027    4.5355671    1.5267356 0.0017245783 -0.021524976    4.5553675 
+   97610    19.985631    1.0105129    23.824829    6.0476365    4.5323725     1.515264 0.0016053619 -0.020641347    4.5514085 
+   97620    20.207519    1.0115956     23.75463    6.0478406     4.530953    1.5168876 0.0013823455 -0.019820906    4.5493915 
+   97630    20.323639    1.0233267    23.900836    6.0574919    4.5230136    1.5344783 0.0014773383 -0.020218776     4.541755 
+   97640    20.205481   0.99776812    24.054634    6.0437006    4.5475473    1.4961533 0.0016043049 -0.020544954    4.5664879 
+   97650    20.185314    1.0058655    23.624627    6.0475995    4.5393041    1.5082954 0.0015887305 -0.020893761    4.5586091 
+   97660    20.127006    1.0174689    23.814959    6.0575114    4.5318168    1.5256947 0.0016486386 -0.021083781    4.5512519 
+   97670    20.078646    1.0112075    23.674673    6.0554232    4.5391175    1.5163057 0.0018876719 -0.022100208      4.55933 
+   97680    20.240619    1.0004204    23.902426     6.032878    4.5327476    1.5001304    0.0018277 -0.022127487    4.5530474 
+   97690    20.044514    1.0195573    23.747952     6.049961    4.5211349    1.5288262 0.0016426155 -0.021164049    4.5406563 
+   97700    20.339005    1.0032338    23.728695    6.0245393    4.5201902    1.5043491 0.0014237503 -0.020284599    4.5390511 
+   97710     20.12271     1.000368     24.18665    6.0156769    4.5156251    1.5000518 0.0013795146 -0.020202115    4.5344477 
+   97720     20.22608   0.97240957    23.723811    6.0054193    4.5472911    1.4581282 0.0012977608 -0.019732384    4.5657257 
+   97730    20.376704   0.98258734    23.681413    6.0271142    4.5537244    1.4733897 0.0013030746 -0.019768959    4.5721903 
+   97740    20.174349     1.006226    23.753326    6.0254853    4.5166495    1.5088359 0.0015421293  -0.02124395    4.5363513 
+   97750    20.057064   0.99124591    23.643827    6.0227844    4.5364112    1.4863732  0.001670421 -0.021759011    4.5564998 
+   97760    20.240743   0.98153367    23.674319     6.007443    4.5356332    1.4718097 0.0017039244 -0.021772851    4.5557022 
+   97770    20.274037    1.0122698     23.69134    6.0385423    4.5206438    1.5178985 0.0017734277 -0.021867408    4.5407378 
+   97780    20.276452   0.99830176    23.770856    6.0326356    4.5356821    1.4969535 0.0019614911 -0.022122972    4.5558436 
+   97790    20.249285    1.0285058    23.789598    6.0590916    4.5168471    1.5422444 0.0017480723  -0.02130594     4.536405 
+   97800    20.365482   0.99006137    23.860954     6.011147      4.52655     1.484597 0.0016629706 -0.020926056    4.5458131 
+   97810     20.26743    1.0152252    23.800217    6.0440964    4.5217663    1.5223302  0.001635126 -0.020533757    4.5406649 
+   97820    20.280575   0.99660719    23.618456    5.9953925      4.50098    1.4944125 0.0015813909 -0.020533451    4.5199321 
+   97830    20.317268    0.9974252    23.722852    6.0143755    4.5187365    1.4956391 0.0017259281 -0.021633083    4.5386436 
+   97840      20.1633   0.98513963    23.468011    6.0114848    4.5342679    1.4772169 0.0018101161 -0.022341555    4.5547994 
+   97850    20.203121    1.0008845    23.628445    6.0358445    4.5350181    1.5008264 0.0016496168 -0.021120169    4.5544887 
+   97860    20.047404    1.0097455    23.746511    6.0417461    4.5276327    1.5141133 0.0016468475 -0.021087654    4.5470735 
+   97870    20.100291    1.0091975    23.712676    6.0250253    4.5117337    1.5132916 0.0017766658 -0.022093141    4.5320502 
+   97880     20.29824    1.0085091    23.521812    6.0680715    4.5558121    1.5122594 0.0017228622 -0.021846262    4.5759355 
+   97890    19.706234    1.0171543    23.588967    6.0707107    4.5454878    1.5252228 0.0016786204 -0.021840067    4.5656493 
+   97900     20.39594     1.017126    23.751835     6.067182    4.5420017    1.5251804 0.0018366418 -0.022529078    4.5626941 
+   97910     20.46251    1.0419122    23.667925    6.1033499    4.5410026    1.5623473 0.0018281719 -0.022540974    4.5617154 
+   97920    20.428841    1.0465684    23.598813     6.096164    4.5268347    1.5693293 0.0017698313 -0.022425097      4.54749 
+   97930    20.140726    1.0274009    23.785502    6.0920841    4.5514964    1.5405877  0.001718384 -0.022154291    4.5719323 
+   97940     20.37121    1.0370408    23.733698    6.1029312    4.5478885    1.5550427 0.0017686802 -0.022306629    4.5684265 
+   97950    20.127101    1.0423476    23.705306    6.1066285    4.5436283    1.5630002 0.0017747986 -0.021934573    4.5637881 
+   97960    20.305493    1.0315375    23.652896    6.0890916    4.5423011    1.5467905 0.0018119157 -0.021713405    4.5622026 
+   97970    20.219477    1.0226981    23.447272    6.1001868     4.566651    1.5335358 0.0017535271 -0.021586725    4.5864842 
+   97980    20.273224    1.0362239     23.85855    6.1080962    4.5542785    1.5538177  0.001991478 -0.022985198    4.5752722 
+   97990    20.219189    1.0261067    23.642386    6.0956525    4.5570056    1.5386469 0.0021289015 -0.023641827    4.5785185 
+   98000    20.169455    1.0375684    23.737724    6.0999928     4.544159    1.5558338 0.0020742334 -0.023135768    4.5652205 
+   98010    20.519096     1.036108     23.78874    6.0845786    4.5309347    1.5536439 0.0019716908 -0.023242142    4.5522051 
+   98020    20.510492    1.0107146    23.975502    6.0602776     4.544711    1.5155665 0.0019523002 -0.023209508    4.5659682 
+   98030     20.51323    1.0138855    23.688206    6.0517821    4.5314608    1.5203213 0.0019238491 -0.023155041     4.552692 
+   98040    20.174503    1.0244171     23.71058    6.0486948    4.5125812    1.5361135 0.0019322565 -0.023233893    4.5338829 
+   98050    20.212319    1.0178373    23.602541    6.0516207    4.5253736    1.5262471   0.00218143 -0.024215459    4.5474077 
+   98060    20.292948     1.000696    23.368247    6.0369322    4.5363885    1.5005437 0.0023361622 -0.024382696     4.558435 
+   98070    20.347496    1.0377951    23.677383    6.0805483    4.5243746    1.5561737 0.0022333195 -0.024107367    4.5462486 
+   98080    20.383291    1.0004635    23.859181    6.0486393    4.5484443     1.500195 0.0021120894 -0.023352622    4.5696848 
+   98090     20.16357    1.0224852    23.513688    6.0516707    4.5184542    1.5332165 0.0019609778 -0.022296395    4.5387896 
+   98100    19.960835    1.0237591    23.709583    6.0484238    4.5132971    1.5351268 0.0019109041 -0.022657538    4.5340437 
+   98110     19.93908   0.98385174     23.72454    6.0222286    4.5469429    1.4752857 0.0019415338 -0.022648868    4.5676502 
+   98120    20.266164   0.97592499    23.576515    6.0208349    4.5574354    1.4633995 0.0019669046 -0.022310919    4.5777794 
+   98130    20.390584      1.00131    23.638376    6.0269402    4.5254759    1.5014644 0.0019180369 -0.021871063    4.5454289 
+   98140    20.175646    1.0292116    23.884729    6.0707866    4.5274838    1.5433028  0.001894971 -0.021558556    4.5471474 
+   98150    20.038978    1.0270701    23.597351    6.0703303    4.5302387    1.5400916 0.0019167726 -0.022075368    4.5503973 
+   98160    20.301206    1.0284731    23.817621    6.0708754      4.52868    1.5421954 0.0017437125  -0.02168338    4.5486196 
+   98170    20.366635    1.0318885    23.928984    6.0594859     4.512169    1.5473168 0.0017466243 -0.021361312    4.5317837 
+   98180    20.091712    1.0233455    23.785467    6.0535911    4.5190845    1.5345066  0.001620645 -0.021164231    4.5386281 
+   98190    20.232859    1.0018986    23.849422    6.0323312    4.5299842     1.502347 0.0014141623 -0.020262188    4.5488323 
+   98200    20.232291    1.0088042    23.874217    6.0544868    4.5417848    1.5127019 0.0014622627 -0.020337427      4.56066 
+   98210    20.330201    1.0083921    23.692188    6.0458224    4.5337384     1.512084 0.0016129929 -0.021185573     4.553311 
+   98220    20.298619    1.0142666    23.628575    6.0560589    4.5351661    1.5208928 0.0016942249 -0.021045068     4.554517 
+   98230     20.18397    1.0321698    23.813972    6.0664843    4.5187457    1.5477386 0.0017363872 -0.021567332    4.5385766 
+   98240    20.061027    1.0053277    24.016396     6.047494    4.5400052    1.5074888 0.0018734661 -0.022049228    4.5601809 
+   98250    20.208437    1.0357009    23.441501    6.0816091    4.5285756    1.5530335 0.0018443131 -0.021772219    4.5485035 
+   98260    20.025095    1.0141685    23.971627    6.0756989    4.5549532    1.5207457  0.001774391 -0.021386463    4.5745652 
+   98270    20.318165    1.0267776    23.738245    6.0710261    4.5313732     1.539653 0.0017548665  -0.02185938    4.5514777 
+   98280    20.424312    1.0352212    23.645717    6.0839503    4.5316361    1.5523142 0.0019121075 -0.022717126    4.5524411 
+   98290    20.135811    1.0055347    23.796451    6.0518478    4.5440484    1.5077993 0.0018653278 -0.022461225    4.5646443 
+   98300    20.141929    1.0098586     23.46714    6.0524227    4.5381398    1.5142829 0.0018458977 -0.021873525    4.5581674 
+   98310    20.027246   0.99978346     23.92748    6.0297035    4.5305282    1.4991753 0.0017527947 -0.021396447    4.5501718 
+   98320    20.089693    1.0037539    23.582766    6.0229568    4.5178278    1.5051289 0.0017901565 -0.020847244    4.5368849 
+   98330    19.839328    1.0195131    23.590213    6.0465295    4.5177697    1.5287598 0.0016907291 -0.020214194    4.5362932 
+   98340    20.070098     1.007896     23.97587    6.0282136    4.5168736      1.51134 0.0015694167 -0.019439402    4.5347436 
+   98350    20.399556    1.0011338    23.552972    6.0411595    4.5399594    1.5012001  0.001572008 -0.019789908    4.5581773 
+   98360    20.259231    1.0258132    23.677807    6.0578104    4.5196035    1.5382069 0.0015016668 -0.019866395    4.5379682 
+   98370    20.163852   0.97371633    23.691952    6.0082694    4.5481817    1.4600876 0.0016140343 -0.021138016    4.5677057 
+   98380    20.195051   0.99375805    23.850565    6.0059897    4.5158495    1.4901402  0.001615979 -0.021143264    4.5353768 
+   98390    20.248511   0.98973623    23.696462    6.0026371    4.5185276    1.4841095 0.0016151399 -0.020853918    4.5377664 
+   98400    20.394438   0.98839141    23.629328    5.9960532    4.5139603    1.4820929 0.0017591651 -0.021720298    4.5339214 
+   98410    20.307885   0.99991598    23.547765    6.0187805    4.5194065     1.499374 0.0017492715 -0.021788189    4.5394454 
+   98420    20.431353   0.99194363    23.658055    6.0380742    4.5506547    1.4874195 0.0017986184  -0.02204264    4.5708988 
+   98430    20.242071   0.99958055    23.896626     6.041847    4.5429759     1.498871  0.001855689 -0.022116797     4.563237 
+   98440    20.130896    1.0118907    23.876937    6.0591789    4.5418488    1.5173301 0.0017729153 -0.022229693    4.5623056 
+   98450    19.930244    1.0253169    23.728869    6.0639659    4.5265032    1.5374627 0.0019827435 -0.023251258    4.5477717 
+   98460    20.036493    1.0074511    23.901166    6.0384943    4.5278213     1.510673 0.0021453802 -0.023996539    4.5496725 
+   98470    20.055706   0.97980332    23.461318    6.0185109    4.5492958    1.4692151 0.0021890688 -0.024317659    4.5714244 
+   98480    20.198339   0.99296111    23.471567    6.0292433    4.5402981    1.4889452 0.0021735723 -0.024120476     4.562245 
+   98490    20.089147     1.008519     23.69104    6.0235375    4.5112632    1.5122743  0.002032882 -0.022976021    4.5322064 
+   98500    20.400834    0.9902726    23.719101    6.0127489    4.5278352    1.4849138  0.001743883 -0.021474371    4.5475657 
+   98510    20.413741   0.98484542      23.5995    6.0089319    4.5321562    1.4767757 0.0018548243 -0.022069566     4.552371 
+   98520    20.295849   0.98445771    23.566892    6.0120056    4.5358113    1.4761943 0.0019225761 -0.022640339    4.5565291 
+   98530     20.09712    1.0101746    23.625745    6.0415069    4.5267501    1.5147569  0.001880507 -0.022772741    4.5476423 
+   98540    19.933651    1.0019497    23.784752    6.0366784    4.5342549    1.5024235 0.0017927274 -0.022213858     4.554676 
+   98550    20.372942    1.0075937    23.611278    6.0265584    4.5156716    1.5108867 0.0016007184 -0.021458048     4.535529 
+   98560    20.357175   0.99678151    23.928323    6.0063148     4.511641    1.4946739 0.0014369532 -0.020456893    4.5306609 
+   98570    20.263446   0.99452914     23.65621    6.0137338    4.5224374    1.4912964 0.0014078492 -0.019896143    4.5409257 
+   98580     20.51245    0.9907154    23.762444    6.0179141    4.5323364    1.4855777 0.0014919448 -0.020054043    4.5508984 
+   98590    20.340373     1.003337    23.445408    6.0558346    4.5513308    1.5045038 0.0016842012 -0.020501516    4.5701481 
+   98600    20.100258    1.0050403    23.813936     6.048774    4.5417161    1.5070579 0.0018239506 -0.021255034    4.5611472 
+   98610    20.044644     1.018335    23.799901    6.0476979    4.5207046    1.5269934 0.0017406295 -0.021363796    4.5403277 
+   98620    20.071892    1.0182912    23.578667    6.0678517     4.540924    1.5269277 0.0019394338 -0.022723416     4.561708 
+   98630    20.417135    1.0096444    23.534724      6.03996    4.5259982    1.5139618 0.0018318447 -0.022502973    4.5466693 
+   98640    20.376166    1.0169936    23.460582    6.0561589     4.531177    1.5249819 0.0015883139 -0.021425397    4.5510141 
+   98650    20.182056    1.0137822    23.964377    6.0550291    4.5348628    1.5201664 0.0014476839   -0.0207712    4.5541863 
+   98660    20.338945      1.00298    23.683912    6.0435269    4.5395585    1.5039684 0.0016129453 -0.021868669    4.5598142 
+   98670    20.264237    1.0015593    23.682795    6.0390604    4.5372222    1.5018382 0.0019020447 -0.023284504    4.5586047 
+   98680    20.106486    1.0275008    23.545366    6.0694725     4.528735    1.5407375  0.002067117 -0.024000606    4.5506684 
+   98690    20.297472    1.0034789    23.786761    6.0212965    4.5165799    1.5047166  0.002099984 -0.024052312    4.5385322 
+   98700    20.251693    1.0118441    23.401649    6.0383707    4.5211104    1.5172602 0.0020062796 -0.023865173    4.5429693 
+   98710    20.095895    1.0146235    23.745471    6.0478705    4.5264427    1.5214279 0.0018750378 -0.023458045    4.5480257 
+   98720    20.232969    1.0207115    23.595859     6.088922    4.5583652    1.5305568  0.001844911 -0.023054449    4.5795747 
+   98730    20.124954    1.0279197    23.873737     6.073916    4.5325504    1.5413656 0.0018292164   -0.0224947    4.5532159 
+   98740    20.140444    1.0041816     23.59152    6.0578216    4.5520513    1.5057703 0.0016799063 -0.021792099    4.5721635 
+   98750    20.248845    1.0024637     23.57937     6.053513    4.5503187    1.5031943 0.0015493662 -0.021366524    4.5701359 
+   98760    20.462094   0.99968963     23.53369    6.0676174    4.5685828    1.4990346 0.0014301255 -0.020541014    4.5876937 
+   98770     20.36347     1.022266    23.631427    6.0502149     4.517327    1.5328878 0.0015399673 -0.021011651    4.5367987 
+   98780    20.451734    0.9989099    23.733014    6.0287417    4.5308763    1.4978654 0.0015587325 -0.021062723    4.5503803 
+   98790    20.373269    1.0136921    23.715996    6.0422643     4.522233    1.5200313 0.0015880271 -0.021429705    4.5420747 
+   98800    20.098822    1.0231089    23.839988    6.0275496    4.4933979    1.5341517  0.001608783 -0.021814542    4.5136036 
+   98810    20.157305    1.0102109     23.98285    6.0327385    4.5179272    1.5148113 0.0017542264 -0.022342157    4.5385151 
+   98820    20.371189      1.00577    23.832056    6.0393669    4.5312148    1.5081521 0.0015619324 -0.021317212    4.5509701 
+   98830    20.156667   0.99459534    23.638189    6.0599208    4.5685251    1.4913957 0.0011572686 -0.019227149     4.586595 
+   98840    20.044226    1.0054082    23.625109    6.0615373    4.5539277    1.5076096 0.00096841169 -0.018365982    4.5713253 
+   98850    20.494323     1.025663    23.759808    6.0641797    4.5261981    1.5379817 0.00095850733 -0.018461801    4.5437014 
+   98860    20.169328    1.0009093    23.575907    6.0481391    4.5472756    1.5008635 0.0011355316 -0.019191712    4.5653318 
+   98870    20.263579    1.0115883    23.642447    6.0561945    4.5393179    1.5168767 0.0011084532 -0.018994838    4.5572042 
+   98880     20.31998    1.0088677    23.477137    6.0529771      4.54018    1.5127971 0.0011005671 -0.018992053    4.5580715 
+   98890    20.414769    1.0061948    23.506834    6.0454197    4.5366306    1.5087891 0.0014556424 -0.020489403    4.5556643 
+   98900    20.281852    1.0133435    23.553945    6.0502544    4.5307459    1.5195085 0.0015707859 -0.021100753    4.5502759 
+   98910     20.29678    1.0143172    23.517946    6.0656691    4.5447005    1.5209686 0.0016221932 -0.021169751    4.5642481 
+   98920    20.403482    1.0069889    23.496295     6.030628    4.5206481    1.5099798 0.0017312812  -0.02177024    4.5406871 
+   98930    20.346832   0.99950932    23.680011    6.0245584    4.5257942    1.4987642  0.001869135 -0.022149446    4.5460745 
+   98940    20.247311    1.0146182    23.714133     6.045218     4.523798      1.52142 0.0018755779 -0.022711534    4.5446339 
+   98950    20.159752    1.0152562      23.7559    6.0565763    4.5341996    1.5223767 0.0017660095 -0.022397801    4.5548313 
+   98960    19.994703    1.0045229    23.601937     6.043712    4.5374299    1.5062821 0.0016350118   -0.0217304    4.5575253 
+   98970    20.182401     1.008297     23.86376    6.0355788    4.5236375    1.5119413  0.001443105 -0.020611327    4.5428057 
+   98980    20.203032      1.01847    23.640134    6.0371702    4.5099744    1.5271958 0.0014884104 -0.020586035     4.529072 
+   98990    20.074248    1.0084927    23.867972    6.0413808     4.529146    1.5122348 0.0015492017 -0.020871779    4.5484686 
+   99000    20.255232    1.0035478    23.752527    6.0324741    4.5276541      1.50482 0.0015035483 -0.020909278    4.5470599 
+   99010    20.247589   0.99564552    23.518486     6.027792    4.5348215    1.4929705 0.0015635657 -0.021173048     4.554431 
+   99020    20.345784    1.0168352    23.619587     6.059054    4.5343097    1.5247443 0.0016694736 -0.021779658    4.5544199 
+   99030    19.993087   0.99618071     23.83474     6.036946     4.543173     1.493773 0.0017589271 -0.022362933     4.563777 
+   99040    20.094242   0.98354419    23.607929    6.0007012    4.5258767    1.4748245 0.0018670145 -0.022895279     4.546905 
+   99050    20.063104   0.99089398    23.861853    6.0147831    4.5289376    1.4858455 0.0018744181 -0.022849601    4.5499128 
+   99060    20.129625    1.0044366    23.739895    6.0232797    4.5171271    1.5061527 0.0016830565 -0.021557522    4.5370015 
+   99070    19.754992   0.99790562    24.065963    6.0280032    4.5316437    1.4963595  0.001488885 -0.020611306    4.5507661 
+   99080    20.020661    1.0017655    23.684514    6.0354958    4.5333484    1.5021474 0.0015818016 -0.021086404     4.552853 
+   99090    20.112114     1.008452    23.883842    6.0396418    4.5274679    1.5121738 0.0014714712 -0.020661398    4.5466579 
+   99100    20.343425   0.99050246    23.627172    6.0437123    4.5584538    1.4852584 0.0015289546 -0.021152692    4.5780776 
+   99110    20.162064    1.0098211     23.65904    6.0412957    4.5270689    1.5142267 0.0015984731 -0.021435546     4.546906 
+   99120    20.351192    1.0140679    23.471809    6.0392283    4.5186335    1.5205948 0.0015217096 -0.020946744    4.5380586 
+   99130    20.372812    1.0137113    23.978914    6.0366142    4.5165541    1.5200601 0.0015273747 -0.020736521    4.5357632 
+   99140    20.143251    1.0182532    23.579348    6.0470275    4.5201568    1.5268707 0.0015523637 -0.021116921    4.5397213 
+   99150    20.046336    1.0220261    23.735728    6.0523172     4.519789    1.5325282 0.0016540507 -0.021902353    4.5400373 
+   99160    19.938765    1.0040072    23.832454    6.0527249    4.5472161    1.5055088 0.0016917064  -0.02242572    4.5679501 
+   99170    20.015361    1.0340695     23.73893    6.0819004    4.5313131    1.5505873 0.0018030049 -0.022661943     4.552172 
+   99180    19.939851    1.0359234    23.728829    6.0977781     4.544411    1.5533672 0.0018681397 -0.022846328    4.5653892 
+   99190    20.032742    1.0137895    23.848753    6.0657745    4.5455972    1.5201774 0.0018031991 -0.022412723    4.5662067 
+   99200     20.29224     1.011865     23.85971     6.055591    4.5382995    1.5172916 0.0018178357 -0.022384806    4.5588664 
+   99210    20.049389    1.0100985    23.713179     6.054928    4.5402853    1.5146427 0.0016129801 -0.021348876    4.5600212 
+   99220     19.54265    1.0097165    23.881102    6.0747672    4.5606974    1.5140698   0.00142484 -0.020797306    4.5800698 
+   99230    20.097431    1.0129402    23.676176    6.0231728    4.5042691    1.5189038 0.0014654609 -0.020977098    4.5237807 
+   99240    19.810638   0.98506733    23.544163    6.0407247    4.5636162    1.4771085 0.0015096937  -0.02117992    4.5832864 
+   99250    20.285658    1.0041905    23.620204    6.0449328    4.5391491    1.5057837 0.0015600764 -0.021092904    4.5586819 
+   99260    19.996006    1.0161943     23.63437    6.0677506    4.5439673    1.5237833 0.0016669173 -0.021456412    4.5637568 
+   99270    20.144361    1.0199322    23.906487    6.0510926    4.5217043    1.5293883 0.0016729443 -0.021249788    4.5412811 
+   99280      20.1395    1.0084541    23.956661     6.055549    4.5433721    1.5121769 0.0015318837 -0.020858566    4.5626988 
+   99290     19.93911   0.99878029    23.747523    6.0246751     4.527004     1.497671 0.0013955846 -0.020323544     4.545932 
+   99300    20.198744    1.0182691    23.654057    6.0478422    4.5209477    1.5268945 0.0015098441 -0.020435819    4.5398737 
+   99310    20.209928    1.0098811     23.98734    6.0507097    4.5363929    1.5143168 0.0013543833 -0.020001593    4.5550401 
+   99320    20.303609    1.0204746    24.001664    6.0607844    4.5305828    1.5302016 0.0012846171 -0.019875312    4.5491735 
+   99330    20.355091    1.0387961     23.72752    6.0746679    4.5169931    1.5576748 0.0013299248 -0.020206198    4.5358693 
+   99340    20.135188    1.0001004    23.836914    6.0487452    4.5490947    1.4996505 0.0013318245 -0.020210757    4.5679736 
+   99350    20.251264    1.0298356    24.019278    6.0561978    4.5119594    1.5442385 0.0013476132  -0.01986615    4.5304779 
+   99360    20.357961    1.0135573    23.840802    6.0430335    4.5232043    1.5198291 0.0015261864 -0.020729532    4.5424077 
+   99370     20.22699    1.0014625    23.791801     6.017184    4.5154909     1.501693 0.0015592646 -0.020439583    4.5343713 
+   99380    19.563472   0.98874269    23.456571     6.019999    4.5373793    1.4826197 0.0014259738 -0.019190612     4.555144 
+   99390    20.360146    0.9813492    23.429043    5.9985137    4.5269806    1.4715331 0.0011556135 -0.018200115    4.5440251 
+   99400    20.468939   0.98659003    23.494012     6.000299    4.5209073    1.4793917 0.0011250709   -0.0183311    4.5381133 
+   99410     20.26064   0.99176916    23.825278    5.9893611    4.5022033    1.4871579 0.0013094398 -0.019201922    4.5200957 
+   99420    20.197118   0.97902021    23.380064    6.0102649    4.5422241    1.4680408 0.0010645716 -0.018569676    4.5597292 
+   99430    20.380681   0.97418065      23.2754    5.9920497    4.5312658    1.4607839 0.00098822476 -0.018383886    4.5486615 
+   99440     20.51363    1.0012985    23.779852    6.0164619    4.5150148    1.5014471 0.00086309001 -0.018035706    4.5321875 
+   99450     20.29361   0.99347016    23.436944    6.0285145     4.538806    1.4897085 0.00097679113 -0.018731824    4.5565611 
+   99460    20.181929   0.99084566    23.902618    6.0217819    4.5360088    1.4857731 0.0011181832 -0.019716716    4.5546073 
+   99470    19.966265    1.0029964     23.54713    6.0284214    4.5244283    1.5039931 0.0010376605 -0.019081426    4.5424721 
+   99480    19.930478   0.99955223     23.71016    6.0362696    4.5374411    1.4988286  0.000829009 -0.017849349    4.5544614 
+   99490    20.354776    1.0071265    23.471652    6.0122906    4.5021044    1.5101862 0.00078673699  -0.01759261    4.5189103 
+   99500    20.446614   0.99394614    23.561399    6.0251937    4.5347715    1.4904222 0.00074265701  -0.01773094    4.5517598 
+   99510    20.362799    1.0097906    23.943338     6.053808     4.539627     1.514181 0.00092328026 -0.018466079    4.5571698 
+   99520     20.16453    1.0010798    23.339411    6.0333062     4.532187    1.5011192 0.0011085062 -0.019388048    4.5504666 
+   99530    20.251096    1.0045701    23.645865     6.026504     4.520151    1.5063529 0.0013791596 -0.020302911    4.5390748 
+   99540    20.355161   0.98711987    23.863201    6.0346926    4.5545064    1.4801862 0.0015720205 -0.021649891    4.5745842 
+   99550     20.42674    1.0164817    23.620615    6.0367925    4.5125782    1.5242143 0.0014930953 -0.021454916      4.53254 
+   99560    20.269545   0.99789319    23.781736    6.0459843    4.5496435    1.4963408 0.0013773237 -0.020864374    4.5691305 
+   99570    20.236916    0.9896056    23.554981    6.0332231    4.5493095    1.4839136 0.0013376879 -0.020359845    4.5683317 
+   99580    20.016367    1.0182084    23.765035    6.0554299    4.5286265    1.5268034 0.0014071325 -0.020327328    4.5475467 
+   99590    19.998974     1.040452    23.716758    6.1035164    4.5433587    1.5601577 0.0012320364 -0.019319175    4.5614458 
+   99600    20.130153    1.0321821    23.915594    6.1074912    4.5597341    1.5477571 0.0012163895 -0.019505783    4.5780235 
+   99610    20.416575    1.0569011     23.71925    6.1187766    4.5339534    1.5848232 0.0010340495 -0.018667373    4.5515867 
+   99620    20.185511    1.0397676    23.763968      6.12906    4.5699284    1.5591316 0.0010068483 -0.018704077    4.5876256 
+   99630    20.205808    1.0439791     23.57871    6.1141815    4.5487348    1.5654467 0.0011824516 -0.019154295    4.5667066 
+   99640    20.141651     1.042729    23.827063     6.124416    4.5608438    1.5635721 0.0012206596 -0.018950822     4.578574 
+   99650    20.460211    1.0388108    23.809896    6.0965573    4.5388604    1.5576969 0.0011716689 -0.018294372    4.5559832 
+   99660    20.377082    1.0200422    23.626161    6.0706909    4.5411377    1.5295532 0.0012191227  -0.01865624    4.5585748 
+   99670    20.450838    1.0213696    24.030601     6.069749    4.5382052    1.5315437 0.0012547872 -0.019323333    4.5562738 
+   99680    20.301534    1.0262152    23.837885    6.0669406    4.5281309    1.5388097 0.0013131806 -0.019886125    4.5467038 
+   99690    20.170228    1.0107601    23.793283    6.0410099     4.525375    1.5156348 0.0012671119 -0.019829076     4.543937 
+   99700    20.376455    1.0234147    23.962016    6.0745193     4.539909    1.5346104  0.001357675  -0.02046867      4.55902 
+   99710     19.99299    1.0194102    23.762924    6.0679283    4.5393228    1.5286056  0.001620767 -0.021706942    4.5594089 
+   99720    20.039707    1.0242584    23.508216    6.0648399    4.5289644    1.5358755 0.0018069376   -0.0226592    4.5498167 
+   99730    20.068107    1.0196275    23.725049    6.0314272    4.5024957    1.5289315 0.0021129134 -0.024067829    4.5244506 
+   99740    20.233194   0.99860497     23.58801    6.0570692    4.5596611    1.4974082 0.0022205249 -0.024219076    4.5816596 
+   99750    20.249771    1.0075597    23.683866    6.0409945    4.5301587    1.5108358 0.0022758247 -0.024414142     4.552297 
+   99760    20.652657   0.99557737    23.648319    6.0087709    4.5159027    1.4928683 0.0021689865 -0.023689272    4.5374229 
+   99770    20.160876   0.98846972    23.588866    6.0005469    4.5183365    1.4822103 0.0021146065 -0.023329635    4.5395515 
+   99780    20.301274   0.98976736    23.274513    5.9901978    4.5060416    1.4841561 0.0020621856 -0.023212598     4.527192 
+   99790    20.068179   0.99212451    23.725046    5.9848682    4.4971775    1.4876907  0.002041177  -0.02316187    4.5182982 
+   99800    19.946383   0.97921617    23.616662    5.9826315    4.5142968    1.4683346 0.0020895912 -0.023504725     4.535712 
+   99810    20.265232   0.97618416    23.671381    5.9848048    4.5210167    1.4637881 0.0019748606 -0.023190449    4.5422323 
+   99820    20.236871    1.0110412    23.647985     6.019102    4.5030458    1.5160562 0.0018115845 -0.022360473    4.5235947 
+   99830    19.948172   0.98744121    23.857315    6.0011876    4.5205195    1.4806681 0.0019161526 -0.022869647     4.541473 
+   99840    19.556997    1.0150382    23.734105    6.0388892    4.5168394    1.5220498 0.0019671982 -0.023268952    4.5381412 
+   99850    20.345155     1.019062    23.994818    6.0477917    4.5197082    1.5280835 0.0019513465 -0.023017842    4.5407747 
+   99860    19.998709     1.007597    23.805751    6.0540125    4.5431208    1.5108916 0.0017083496  -0.02191024    4.5633227 
+   99870    20.390976    1.0111698    23.625973    6.0746654    4.5584162    1.5162491  0.001513802 -0.020674917    4.5775774 
+   99880    20.461892    1.0247388    24.081043    6.0649718     4.528376    1.5365958 0.0015224137 -0.020899781    4.5477533 
+   99890    20.180536    1.0137903    24.071303    6.0532695    4.5330909    1.5201785 0.0015874552 -0.021783885    4.5532874 
+   99900     20.06415    1.0191158    23.476603    6.0595115    4.5313474    1.5281641 0.0018114323 -0.022494768    4.5520308 
+   99910    19.827289     1.046029    23.831498     6.087581    4.5190605    1.5685205   0.00195121  -0.02287849    4.5399877 
+   99920    19.375593    1.0223434    23.774564    6.0774507    4.5444468    1.5330039 0.0020650467 -0.023477686    4.5658595 
+   99930    19.806542    1.0203515    23.616566    6.0698598    4.5398427     1.530017 0.0020037891 -0.023109237    4.5609482 
+   99940    20.267806    1.0117269    23.832519    6.0454697    4.5283852    1.5170845 0.0019834899 -0.023178378    4.5495801 
+   99950    20.441342    1.0172583    24.023704    6.0456096    4.5202307    1.5253788  0.001970362 -0.023346696    4.5416071 
+   99960    20.327734     1.010363    23.901296    6.0566059    4.5415665    1.5150394 0.0019546392 -0.023289021    4.5629009 
+   99970    20.270376    1.0025888    23.694412    6.0377852    4.5344033    1.5033818 0.0020423349 -0.023671602    4.5560326 
+   99980    20.235689   0.99306522    23.752102    6.0156487    4.5265474    1.4891013 0.0023670429 -0.025027042    4.5492074 
+   99990    20.044095   0.98917308    23.751054     6.004714     4.521449     1.483265 0.0023071079 -0.024838978    4.5439808 
+  100000    20.292775    1.0022223    23.657115     6.013796    4.5109637    1.5028324 0.0020964133 -0.023559824    4.5324271 
+Loop time of 4950.2 on 16 procs for 100000 steps with 3000 atoms
+
+Performance: 34907.695 tau/day, 20.201 timesteps/s
+99.6% CPU use with 16 MPI tasks x no OpenMP threads
+
+MPI task timing breakdown:
+Section |  min time  |  avg time  |  max time  |%varavg| %total
+---------------------------------------------------------------
+Pair    | 772.18     | 774.6      | 779.49     |   7.2 | 15.65
+Kspace  | 3156.2     | 3191       | 3220.8     |  33.5 | 64.46
+Neigh   | 744.23     | 751.68     | 762.3      |  25.1 | 15.18
+Comm    | 207.75     | 229.28     | 255.27     |  99.7 |  4.63
+Output  | 0.33493    | 0.35069    | 0.49687    |   6.4 |  0.01
+Modify  | 0.70441    | 0.7237     | 0.74761    |   1.3 |  0.01
+Other   |            | 2.585      |            |       |  0.05
+
+Nlocal:    187.5 ave 193 max 184 min
+Histogram: 3 2 2 3 0 2 0 2 1 1
+Nghost:    8250 ave 8298 max 8203 min
+Histogram: 2 1 3 1 1 3 0 1 1 3
+Neighs:    147172 ave 152224 max 142960 min
+Histogram: 2 3 1 1 2 0 3 2 1 1
+
+Total # of neighbors = 2354760
+Ave neighs/atom = 784.92
+Neighbor list builds = 100000
+Dangerous builds not checked
+write_data	data.after_equilibration
+Ewald initialization ...
+  using 12-bit tables for long-range coulomb (../kspace.cpp:321)
+  G vector (1/distance) = 1.0262
+  estimated absolute RMS force accuracy = 1.01103e-05
+  estimated relative force accuracy = 1.01103e-05
+  KSpace vectors: actual max1d max3d = 2787 11 6083
+                  kxmax kymax kzmax  = 11 11 11
+
+compute         RDF_1_1 all rdf 50 1 1 cutoff 3.0
+compute         RDF_1_2 all rdf 50 1 2 cutoff 3.0
+compute         RDF_1_3 all rdf 50 1 3 cutoff 3.0
+compute         RDF_2_2 all rdf 50 2 2 cutoff 3.0
+compute         RDF_2_3 all rdf 50 2 3 cutoff 3.0
+compute         RDF_3_3 all rdf 50 3 3 cutoff 3.0
+
+fix             11 all ave/time 50 1 50 c_RDF_1_1[*] file tmp_1_1.rdf mode vector
+fix             12 all ave/time 50 1 50 c_RDF_1_2[*] file tmp_1_2.rdf mode vector
+fix             13 all ave/time 50 1 50 c_RDF_1_3[*] file tmp_1_3.rdf mode vector
+fix             14 all ave/time 50 1 50 c_RDF_2_2[*] file tmp_2_2.rdf mode vector
+fix             15 all ave/time 50 1 50 c_RDF_2_3[*] file tmp_2_3.rdf mode vector
+fix             16 all ave/time 50 1 50 c_RDF_3_3[*] file tmp_3_3.rdf mode vector
+
+run		10000
+Ewald initialization ...
+  using 12-bit tables for long-range coulomb (../kspace.cpp:321)
+  G vector (1/distance) = 1.0262
+  estimated absolute RMS force accuracy = 1.01103e-05
+  estimated relative force accuracy = 1.01103e-05
+  KSpace vectors: actual max1d max3d = 2787 11 6083
+                  kxmax kymax kzmax  = 11 11 11
+Neighbor list info ...
+  update every 1 steps, delay 0 steps, check no
+  max neighbors/atom: 2000, page size: 100000
+  master list distance cutoff = 5
+  ghost atom cutoff = 5
+  binsize = 2.5, bins = 4 4 4
+  8 neighbor lists, perpetual/occasional/extra = 2 6 0
+  (1) pair dpd, perpetual
+      attributes: half, newton on
+      pair build: half/bin/atomonly/newton
+      stencil: half/bin/3d/newton
+      bin: standard
+  (2) pair coul/slater/long, perpetual, copy from (1)
+      attributes: half, newton on
+      pair build: copy
+      stencil: none
+      bin: none
+  (3) compute rdf, occasional
+      attributes: half, newton on, cut 5
+      pair build: half/bin/atomonly/newton
+      stencil: half/bin/3d/newton
+      bin: standard
+  (4) compute rdf, occasional
+      attributes: half, newton on, cut 5
+      pair build: half/bin/atomonly/newton
+      stencil: half/bin/3d/newton
+      bin: standard
+  (5) compute rdf, occasional
+      attributes: half, newton on, cut 5
+      pair build: half/bin/atomonly/newton
+      stencil: half/bin/3d/newton
+      bin: standard
+  (6) compute rdf, occasional
+      attributes: half, newton on, cut 5
+      pair build: half/bin/atomonly/newton
+      stencil: half/bin/3d/newton
+      bin: standard
+  (7) compute rdf, occasional
+      attributes: half, newton on, cut 5
+      pair build: half/bin/atomonly/newton
+      stencil: half/bin/3d/newton
+      bin: standard
+  (8) compute rdf, occasional
+      attributes: half, newton on, cut 5
+      pair build: half/bin/atomonly/newton
+      stencil: half/bin/3d/newton
+      bin: standard
+Per MPI rank memory allocation (min/avg/max) = 29.15 | 29.16 | 29.18 Mbytes
+Step S/CPU Temp Press TotEng PotEng KinEng E_coul E_long E_vdwl 
+  100000            0    1.0022223    23.472371     6.013796    4.5109637    1.5028324 0.0020964133 -0.023559824    4.5324271 
+  100010    19.569819   0.97216506    23.477876    5.9684308    4.5106693    1.4577615 0.0020390205 -0.023342887    4.5319732 
+  100020     19.37828   0.98276722     23.62578    5.9958728    4.5222134    1.4736594 0.0019703097 -0.022948484    4.5431916 
+  100030    19.709695   0.99959239    23.614486    6.0316046    4.5327158    1.4988888  0.001958929 -0.023013037    4.5537699 
+  100040    19.370216   0.99531442    23.377328    6.0256373    4.5331633     1.492474 0.0020584622 -0.023273665    4.5543785 
+  100050    17.257112   0.99659312     23.63454    6.0267988    4.5324074    1.4943914 0.0020354765 -0.023140725    4.5535126 
+  100060    19.436797    1.0048298    23.741733    6.0130251    4.5062829    1.5067422 0.0017878032 -0.022015344    4.5265104 
+  100070    19.128089   0.98783522    23.517865    6.0281249     4.546866    1.4812589 0.0016514375 -0.021484108    4.5666987 
+  100080    19.030309   0.99275624    23.314959     6.029674     4.541036     1.488638 0.0015899964  -0.02107503     4.560521 
+  100090    19.600643    1.0025629    23.726415    6.0322338    4.5288907    1.5033431 0.0016207513  -0.02099804     4.548268 
+  100100    17.332229    1.0021937    23.631651    6.0218186    4.5190292    1.5027894 0.0015234373 -0.021081195    4.5385869 
+  100110    19.338751    1.0100278    23.767255    6.0367576    4.5222209    1.5145366 0.0013581002 -0.020534498    4.5413973 
+  100120    19.575033    1.0090148    23.585814    6.0598729    4.5468553    1.5130176 0.0013217132 -0.020188438     4.565722 
+  100130    19.256373   0.99235505    23.513225    6.0502233    4.5621869    1.4880364 0.0015378942 -0.021043694    4.5816927 
+  100140    19.724025    1.0106498    23.441536    6.0484393    4.5329699    1.5154693 0.0018816744 -0.022934352    4.5540226 
+  100150    17.586667    1.0133217    23.660575    6.0554521    4.5359761     1.519476 0.0022138849 -0.024796585    4.5585588 
+  100160    19.598999    1.0244952    23.817012    6.0829135     4.546683    1.5362305 0.0023551573 -0.025417268    4.5697451 
+  100170    19.272888    1.0223978    23.772659    6.0782405     4.545155    1.5330855  0.002393806   -0.0256195    4.5683807 
+  100180    19.563293    1.0347264    24.034404    6.0746941    4.5231219    1.5515722 0.0022419268 -0.024530184    4.5454101 
+  100190    19.432643    1.0470759    24.003539    6.1089427    4.5388524    1.5700903 0.0020342798 -0.023460037    4.5602781 
+  100200    17.274152     1.028155    23.740839    6.0664449    4.5247265    1.5417184 0.0021688375 -0.024631611    4.5471893 
+  100210    19.757513     1.019781    24.086753    6.0632097    4.5340481    1.5291616 0.0021322562 -0.024418299    4.5563342 
+  100220    19.592496    1.0054698    23.843857    6.0524226    4.5447206     1.507702 0.0021204011 -0.024120838    4.5667211 
+  100230    19.582222     1.020147     23.87311    6.0844337    4.5547232    1.5297105 0.0021262991 -0.024221728    4.5768186 
+  100240    19.333012    1.0040767    23.775207     6.024738     4.519125    1.5056129 0.0020069807 -0.023918564    4.5410366 
+  100250    17.361174   0.97053471    23.619343    5.9892114    4.5338946    1.4553168 0.0019163935 -0.023374847    4.5553531 
+  100260    19.603516   0.98916771    23.837027    5.9965671    4.5133101     1.483257 0.0019039052 -0.022848823    4.5342551 
+  100270    19.046961   0.99018172    23.913302    6.0218451    4.5370676    1.4847775  0.001602253 -0.021167438    4.5566328 
+  100280    19.699801    1.0343188     23.81986    6.0840388    4.5330777    1.5509611 0.0016332862 -0.021230123    4.5526746 
+  100290    19.698627    1.0230591    23.732763    6.0737726    4.5396954    1.5340772  0.001693914 -0.021471698    4.5594732 
+  100300    17.334993    1.0191783     23.71097    6.0569807    4.5287228    1.5282579 0.0016367914 -0.021346323    4.5484324 
+  100310    19.644981    1.0097805    23.772322    6.0613659    4.5472001    1.5141658 0.0015753316  -0.02099383    4.5666186 
+  100320     19.23431   0.99960913    23.779521    6.0499136    4.5509998    1.4989139  0.001391955 -0.019574187     4.569182 
+  100330    19.066353     1.022172    23.862818    6.0581673    4.5254204    1.5327469 0.0013428616 -0.018842414      4.54292 
+  100340    19.382821     1.017864    24.039807    6.0711517    4.5448646    1.5262871 0.0014022527 -0.018551652     4.562014 
+  100350    17.385617    1.0284472    23.892924     6.075039    4.5328823    1.5421566 0.0014975833 -0.019086228     4.550471 
+  100360    19.662996    1.0487965    23.508855    6.0721379    4.4994675    1.5726704 0.0016069241 -0.019868619    4.5177292 
+  100370    19.662297    1.0323194    23.873416    6.0561063    4.5081434    1.5479629 0.0015289583 -0.020044417    4.5266589 
+  100380    19.610971    1.0069326    23.943231    6.0434702    4.5335747    1.5098955 0.0014353814 -0.019425123    4.5515645 
+  100390    19.617764    1.0053051    23.541406    6.0461238    4.5386687     1.507455 0.0014151562  -0.01909264    4.5563462 
+  100400    17.300073    1.0119592    23.576899    6.0479695    4.5305368    1.5174328 0.0014592067 -0.019789847    4.5488674 
+  100410    19.419914    1.0123352    23.621636    6.0321477    4.5141511    1.5179966 0.0014722683 -0.019516843    4.5321957 
+  100420    19.808358    1.0136736    23.610419    6.0259711    4.5059676    1.5200035 0.0014153941 -0.019649587    4.5242018 
+  100430    19.833026    1.0015804    23.660709    6.0427325    4.5408626    1.5018698 0.0011462677 -0.018638765    4.5583551 
+  100440    19.639464    1.0049226    23.646186    6.0476186    4.5407372    1.5068814 0.00090400492 -0.017528423    4.5573616 
+  100450    17.524164    1.0046358    23.868925    6.0573288    4.5508774    1.5064514 0.00068722227 -0.016410697    4.5666009 
+  100460    19.400101    1.0014656    23.665716    6.0278746    4.5261769    1.5016977 0.00065024497 -0.016262381     4.541789 
+  100470    19.117562    0.9955093    23.779793    6.0405433    4.5477771    1.4927662 0.00079965671 -0.016429225    4.5634067 
+  100480      19.5978    1.0081594    23.681592    6.0591446    4.5474095    1.5117351 0.00099108366 -0.017241166    4.5636596 
+  100490    19.373331    1.0244905    23.665058    6.0898425     4.553619    1.5362234 0.0011912743 -0.018407273     4.570835 
+  100500     17.24742    1.0284464    24.079593    6.0818662    4.5397108    1.5421554 0.0013971141 -0.019477675    4.5577913 
+  100510    19.161022    1.0277754    23.784387    6.0861223    4.5449731    1.5411492  0.001441475 -0.020089269    4.5636209 
+  100520    19.363128    1.0266733     23.65046    6.1039686    4.5644719    1.5394967 0.0016100766  -0.02052705    4.5833889 
+  100530    19.596017    1.0375812    23.773918    6.1017871    4.5459341     1.555853 0.0015009914 -0.020474986    4.5649081 
+  100540    19.632659    1.0375929    24.174234    6.1224016    4.5665309    1.5558706 0.0015271555 -0.020757856    4.5857616 
+  100550    17.376691    1.0141911    23.743063     6.070954    4.5501745    1.5207795 0.0013206738 -0.019781516    4.5686353 
+  100560    19.279893     1.011258    23.487959    6.0600003    4.5436189    1.5163814 0.0011838754 -0.018882354    4.5613173 
+  100570    19.300968    1.0270911    23.633388    6.0934317    4.5533085    1.5401232 0.0012855485 -0.019465861    4.5714888 
+  100580    19.371345    1.0642705    23.662284    6.1024258    4.5065522    1.5958736 0.0014149025 -0.020098273    4.5252356 
+  100590    19.608825    1.0486053    23.752655    6.0958873    4.5235038    1.5723836 0.0017023236 -0.021413594     4.543215 
+  100600    17.186547    1.0313435     23.58002    6.0898055    4.5433059    1.5464996 0.0017727923 -0.021772832    4.5633059 
+  100610    19.548235    1.0204049    23.701464    6.1031366    4.5730394    1.5300972 0.0018465665 -0.022292735    4.5934856 
+  100620    19.328086    1.0255805    23.662931    6.0789168    4.5410588     1.537858 0.0017603025 -0.022041454      4.56134 
+  100630    19.615557    1.0237862    23.943864    6.0905119    4.5553444    1.5351674 0.0018652565 -0.022393436    4.5758726 
+  100640    19.525879    1.0178262    24.016318    6.0665571    4.5403267    1.5262304 0.0020913834  -0.02368099    4.5619163 
+  100650    17.343354    1.0000745    23.603248     6.030207    4.5305953    1.4996117 0.0021324371 -0.023964723    4.5524276 
+  100660    19.236045    1.0089331    23.719747    6.0534682     4.540573    1.5128952 0.0020979924 -0.023663575    4.5621386 
+  100670     19.56755    1.0166709    23.495162    6.0472748    4.5227768     1.524498 0.0019963791 -0.023359287    4.5441397 
+  100680    19.673917   0.99866245    23.571007    6.0336561    4.5361617    1.4974943 0.0019914011 -0.022896087    4.5570664 
+  100690    19.759347    1.0115146    23.678818    6.0525752    4.5358091    1.5167661 0.0019085328 -0.022452444     4.556353 
+  100700    17.163016    1.0082476    23.774595    6.0457639    4.5338966    1.5118673 0.0018098661 -0.021872579    4.5539593 
+  100710    19.243883   0.99292329    23.516014    6.0382328    4.5493443    1.4888885  0.001507846 -0.019630142    4.5674666 
+  100720    19.508929   0.98472848     23.65436    6.0264386    4.5498382    1.4766003 0.0014066357 -0.019283393     4.567715 
+  100730    19.376681    0.9833702     23.71161     5.995873    4.5213094    1.4745636 0.0017037601 -0.020983963    4.5405896 
+  100740    19.731057    1.0056266    23.949773    6.0327345    4.5247975     1.507937 0.0018238882 -0.021793231    4.5447668 
+  100750    17.348376   0.99982237    23.942886    6.0312166    4.5319829    1.4992336 0.0020090953 -0.022445359    4.5524192 
+  100760    19.666003   0.99081722    23.760098    6.0184031    4.5326727    1.4857304 0.0020349871 -0.022550469    4.5531881 
+  100770    19.739473     1.007192    23.586378    6.0319672    4.5216828    1.5102843 0.0017870594 -0.021158777    4.5410545 
+  100780    19.663785    1.0153044    23.614135    6.0555012    4.5330522     1.522449 0.0015219328 -0.019868924    4.5513992 
+  100790    19.646613    1.0118955    23.527789    6.0795024    4.5621651    1.5173373 0.0015742636 -0.020052091     4.580643 
+  100800    17.273434    1.0278101    23.676521    6.0792124    4.5380112    1.5412012 0.0017007304 -0.020995023    4.5573055 
+  100810    19.471995    1.0266055    23.615708    6.0831347    4.5437397    1.5393949 0.0017032739 -0.021268643    4.5633051 
+  100820    19.469259    1.0159297    23.879577    6.0625319    4.5391452    1.5233866 0.0017080865 -0.021612371    4.5590495 
+  100830    19.707231    1.0225846     23.81991    6.0736213    4.5402557    1.5333656 0.0018424441 -0.022088892    4.5605022 
+  100840    19.378522     1.036478    23.662482    6.1099563    4.5557575    1.5541988 0.0018373494  -0.02210266    4.5760228 
+  100850    16.973116    1.0410732    23.729524    6.1127744    4.5516852    1.5610892 0.0018653117  -0.02252562    4.5723455 
+  100860    19.331402    1.0319529    23.890929    6.1039855    4.5565722    1.5474133 0.0019444061  -0.02302212    4.5776499 
+  100870    19.417758    1.0196424    23.939784    6.0815382    4.5525844    1.5289538 0.0019122529 -0.022989358    4.5736615 
+  100880    19.821631    1.0263889    23.517038    6.0716581    4.5325879    1.5390702  0.001945916 -0.023201535    4.5538435 
+  100890    19.481672    1.0244129     23.50143    6.0626948    4.5265877    1.5361071 0.0018223161 -0.022753607    4.5475189 
+  100900    17.236633      1.00041    23.640433    6.0324484    4.5323337    1.5001148 0.0018661467 -0.022972866    4.5534404 
+  100910    19.437795    1.0165835    23.617036    6.0774069      4.55304    1.5243669 0.0019283651 -0.023051788    4.5741634 
+  100920    19.775945    1.0204216    23.675356    6.1011763    4.5710542    1.5301221 0.0016419718 -0.022126152    4.5915384 
+  100930    19.683334    1.0314568    23.572393    6.1039957    4.5573263    1.5466694 0.0015082493 -0.021174542    4.5769926 
+  100940    19.471212    1.0321332    23.749393    6.1017689    4.5540853    1.5476837 0.0013958837 -0.020131778    4.5728212 
+  100950    17.313139    1.0272348    23.611722    6.0771191    4.5367805    1.5403386 0.0015856628 -0.020956963    4.5561518 
+  100960     19.43958    1.0240735    23.615326    6.0785955    4.5429972    1.5355983 0.0017631861 -0.022016081    4.5632501 
+  100970    19.445565    1.0210801     23.78457    6.0578286     4.526719    1.5311096 0.0019959284 -0.022681256    4.5474043 
+  100980    19.649549    1.0148516    23.583107     6.057873    4.5361031    1.5217699 0.0021816073 -0.023335882    4.5572574 
+  100990     19.46881    1.0317427    23.928226    6.0771167    4.5300185    1.5470982 0.0023252025 -0.024002995    4.5516963 
+  101000    17.447126    1.0226768     23.82908    6.0777003    4.5441964    1.5335039 0.0022242927 -0.023464513    4.5654366 
+  101010    19.261433     1.028573    23.778672    6.0808329    4.5384877    1.5423452 0.0019152948 -0.022481571     4.559054 
+  101020    19.769758     1.036128    23.903018      6.08889    4.5352161    1.5536739 0.0017502236 -0.021808245    4.5552741 
+  101030      19.6357    1.0255107     23.65196    6.0833645    4.5456112    1.5377533 0.0016039774 -0.020797382    4.5648046 
+  101040    19.562967    1.0484449    23.914717    6.0679301     4.495787    1.5721431  0.001589606 -0.020752171    4.5149495 
+  101050     17.60348    1.0168368    23.631962    6.0809331    4.5561863    1.5247468 0.0016946685 -0.020997805    4.5754894 
+  101060     19.80351    1.0440445    23.785561    6.0690912    4.5035465    1.5655447 0.0016267567   -0.0207939    4.5227136 
+  101070    19.486207    1.0172468    23.634313    6.0644514    4.5390897    1.5253616 0.0015845053 -0.020356418    4.5578617 
+  101080    19.162933    1.0186447    23.729926    6.0764666    4.5490089    1.5274577 0.0017709721 -0.021200623    4.5684385 
+  101090    19.269166    1.0118463    23.522409    6.0643652    4.5471018    1.5172635 0.0018138104 -0.021236755    4.5665247 
+  101100    17.445366    1.0170644    23.745664    6.0540046    4.5289166     1.525088 0.0016877059 -0.020730966    4.5479598 
+  101110    19.440439    1.0114128    23.489396    6.0270657    4.5104522    1.5166135 0.0015966461 -0.020664878    4.5295204 
+  101120    19.742162   0.99884353    23.514753    6.0254341    4.5276682    1.4977659 0.0015487989 -0.020296337    4.5464157 
+  101130    19.819676   0.99535728    23.717874    6.0153329    4.5227946    1.4925382 0.0015300269 -0.019999515    4.5412641 
+  101140    19.482164   0.99710427    23.822134    6.0189307    4.5237728    1.4951579  0.001535938 -0.019546139     4.541783 
+  101150    17.499126   0.99524028    23.776171    6.0168552    4.5244924    1.4923628 0.0016639508 -0.020273552     4.543102 
+  101160    19.584999   0.98399503    23.782545    6.0138436     4.538343    1.4755005 0.0017232624 -0.020482743    4.5571025 
+  101170    19.527634   0.98558148       23.772    6.0014173    4.5235379    1.4778794 0.0015634923 -0.019757171    4.5417315 
+  101180    19.772552   0.98620152    23.781684    6.0133091    4.5344999    1.4788092  0.001600096 -0.020208987    4.5531088 
+  101190    19.602869    0.9940359    23.440659    6.0196834    4.5291265    1.4905568 0.0015668415 -0.020665845    4.5482256 
+  101200    17.429096   0.99087329    23.745003    6.0119136    4.5260991    1.4858145  0.001551836 -0.021107222    4.5456545 
+  101210    19.416654    1.0025881    23.629908    6.0185806    4.5151997    1.5033809 0.0015929903 -0.021698642    4.5353054 
+  101220    19.597467   0.98818815    23.652485    6.0119257    4.5301376    1.4817881 0.0015359658 -0.020988944    4.5495906 
+  101230    19.364722   0.98851029    23.708237    6.0081254    4.5258542    1.4822712  0.001542709 -0.021019157    4.5453306 
+  101240    19.518162   0.99189111    23.290412     6.030252    4.5429113    1.4873407 0.0017153812 -0.021737218    4.5629331 
+  101250    17.641157    1.0029819    24.149621    6.0245274    4.5205559    1.5039714  0.001727925 -0.022072308    4.5409003 
+  101260    19.720188    1.0173598    23.594271    6.0602588    4.5347278     1.525531 0.0018534691 -0.022120875    4.5549952 
+  101270    19.460336    1.0084076    23.939828    6.0461791    4.5340719    1.5121071 0.0017641394 -0.021606446    4.5539142 
+  101280    19.384813    1.0000657     23.60283    6.0313445    4.5317459    1.4995986 0.0015402311 -0.020607818    4.5508135 
+  101290    19.440014    1.0020632    23.622796    6.0470365    4.5444428    1.5025937 0.0014542101 -0.020141616    4.5631302 
+  101300    17.366066    1.0235551    23.816402    6.0531417    4.5183208    1.5348208 0.0013999943 -0.019682568    4.5366034 
+  101310    19.665465     1.014632    23.951708    6.0743684    4.5529278    1.5214406 0.0012990778 -0.019499504    4.5711282 
+  101320    19.185796    1.0243023    23.708299    6.0661772    4.5302358    1.5359414 0.0015743646 -0.020709671    4.5493711 
+  101330    18.756887    1.0315755     23.58363    6.0820935     4.535246    1.5468475 0.0015076496 -0.020262289    4.5540006 
+  101340    19.060075    1.0199804    23.818836    6.0609205    4.5314599    1.5294606 0.0016732708 -0.021085714    4.5508723 
+  101350    17.265814    1.0117565    23.767315    6.0553737    4.5382449    1.5171289 0.0016257845 -0.021245624    4.5578647 
+  101360    19.594195    1.0195596    23.804573    6.0565544    4.5277248    1.5288296 0.0016333984 -0.020947307    4.5470388 
+  101370    19.313292    1.0184006    23.620686    6.0610178    4.5339261    1.5270917 0.0017722225 -0.021462794    4.5536167 
+  101380    19.657518    1.0164923    23.313994    6.0527335    4.5285033    1.5242303   0.00181483 -0.021691445    4.5483799 
+  101390    19.644804    1.0268773    23.454294    6.0640379    4.5242353    1.5398026 0.0017875662 -0.021227479    4.5436752 
+  101400    17.413522    1.0062752    23.780078    6.0456533    4.5367437    1.5089096 0.0018203351 -0.021386698    4.5563101 
+  101410     19.70003    1.0291415    23.675355    6.0414919    4.4982941    1.5431977 0.0017461537 -0.021619692    4.5181677 
+  101420    19.496723    1.0145901    23.910261    6.0194584    4.4980806    1.5213778 0.0016680108 -0.021375115    4.5177877 
+  101430    19.560147    0.9892732    23.958419    6.0145743    4.5311591    1.4834152 0.0015730969 -0.020910567    4.5504966 
+  101440    19.722955   0.98787506    23.619887    6.0070343    4.5257157    1.4813187 0.0014849489 -0.020112801    4.5443435 
+  101450    17.469076   0.98770242     23.64673    6.0025561    4.5214963    1.4810598 0.0014303999 -0.019631203    4.5396971 
+  101460    19.677069    1.0081527    23.392997    6.0182056    4.5064807     1.511725 0.0012046691 -0.018799973     4.524076 
+  101470     19.73076   0.97955759    23.743083    6.0168672    4.5480206    1.4688466 0.0011995343 -0.019433322    4.5662544 
+  101480    19.499258   0.99311468    23.970745    6.0222243    4.5330489    1.4891755 0.0014478131 -0.020336609    4.5519377 
+  101490    19.505244   0.99873236    23.426263    6.0299553    4.5323561    1.4975992 0.0017500113 -0.022262335    4.5528684 
+  101500    17.089214    1.0083789     23.53193    6.0505337    4.5384695    1.5120642 0.0020501244 -0.023770922    4.5601903 
+  101510    19.325223    1.0081717    23.775338    6.0366732    4.5249197    1.5117535 0.0020744159 -0.023931171    4.5467765 
+  101520    19.866294    1.0036457    23.796767     6.051863    4.5468963    1.5049667 0.0019802304 -0.023570079    4.5684862 
+  101530    19.547894    1.0128576    24.007284    6.0436459    4.5248659    1.5187799 0.0018764947 -0.023099807    4.5460893 
+  101540    19.351822    1.0047327    23.606806    6.0640051    4.5574084    1.5065967 0.0019290044 -0.023180764    4.5786602 
+  101550    17.568929     1.001285    23.755367    6.0401735    4.5387466    1.5014269 0.0018152277 -0.022503883    4.5594352 
+  101560    19.473814    1.0077875    23.737109    6.0391509    4.5279736    1.5111773 0.0016539031  -0.02219789    4.5485176 
+  101570    19.453298    1.0003571    23.680917    6.0354926    4.5354572    1.5000354 0.0016282507 -0.021302927    4.5551318 
+  101580    19.763421    1.0140053    23.837126    6.0484948    4.5279938     1.520501 0.0014327255 -0.020462391    4.5470235 
+  101590    19.477461    1.0059343    23.690294    6.0396494    4.5312508    1.5083986 0.0011972629 -0.019120904    4.5491745 
+  101600    17.323852     1.011791    23.959716    6.0464633    4.5292827    1.5171806 0.0012800449  -0.01924133     4.547244 
+  101610    19.658683     1.008097    23.804233    6.0457764    4.5341349    1.5116415  0.001528751  -0.02033163    4.5529378 
+  101620     19.31306     1.023787     23.75868     6.043206    4.5080374    1.5351686 0.0016272628 -0.020743835     4.527154 
+  101630    19.490492    1.0081984    23.819165    6.0332415     4.521448    1.5117935 0.0016496385  -0.02083356     4.540632 
+  101640    19.634347    1.0174599    23.831236    6.0642143    4.5385332    1.5256811 0.0018241109 -0.021688887     4.558398 
+  101650    17.568267     1.022061    23.614843    6.0687945     4.536214    1.5325805 0.0015723262 -0.020550026    4.5551917 
+  101660    19.552762    1.0038583    23.861322    6.0455396    4.5402541    1.5052855 0.0014526831 -0.019867101    4.5586685 
+  101670    19.075636   0.99514714    23.696026    6.0319254    4.5397023    1.4922231 0.0015202715 -0.020252861    4.5584349 
+  101680    19.144664   0.99678461    23.689986    6.0281008    4.5334223    1.4946785 0.0014669023  -0.02029886    4.5522543 
+  101690    18.921287    1.0060209    23.866715    6.0357564    4.5272281    1.5085283 0.0016528388 -0.021343393    4.5469187 
+  101700    16.986092    1.0048402    23.501537    6.0348863    4.5281284    1.5067579 0.0016803859 -0.021939744    4.5483877 
+  101710    19.477636    1.0055768     23.80877    6.0582654    4.5504029    1.5078624 0.0017387498 -0.022300878     4.570965 
+  101720    19.461472    1.0012824    23.696142    6.0509811    4.5495581     1.501423  0.001864475 -0.022975127    4.5706687 
+  101730    19.383525    1.0115918     23.70588    6.0564787    4.5395967    1.5168819 0.0019917018 -0.023693381    4.5612984 
+  101740    19.195323    1.0141369    23.635965    6.0498148    4.5291165    1.5206983 0.0018332444 -0.022795879    4.5500791 
+  101750    17.070426    1.0154587    23.594755     6.061917    4.5392367    1.5226803 0.0017960615 -0.022699971    4.5601406 
+  101760    19.710084    0.9951873    23.437506    6.0427953    4.5505119    1.4922834 0.0017570267 -0.022548988    4.5713039 
+  101770    19.723731    1.0019304    23.907175    6.0235298    4.5211351    1.5023947 0.0018141997 -0.022582199    4.5419031 
+  101780    19.533805    1.0008888    23.745144    6.0435759    4.5427431    1.5008328 0.0018993137 -0.022776366    4.5636202 
+  101790    19.536085   0.99407829    23.582414    6.0413903    4.5507699    1.4906204 0.0018304393 -0.022185743    4.5711252 
+  101800    17.467842   0.99768842    23.503088    6.0243164    4.5282826    1.4960338  0.001719386 -0.021478538    4.5480417 
+  101810    19.218983    1.0098807    23.843428    6.0014648    4.4871487     1.514316 0.0015944313 -0.020506035    4.5060603 
+  101820    19.631028   0.98207657    23.745218    6.0247467    4.5521229    1.4726238 0.0015358613 -0.020212161    4.5707992 
+  101830    19.758229   0.99160077    23.431596    6.0377496    4.5508442    1.4869054 0.0015915166  -0.02019255    4.5694453 
+  101840     19.64132    1.0152975    23.522052     6.032479    4.5100404    1.5224385  0.001541831 -0.020248772    4.5287474 
+  101850     17.52901   0.97904415    23.376345    6.0001292    4.5320525    1.4680767 0.0014987894 -0.020323065    4.5508768 
+  101860    19.325903   0.99886876    23.607157    6.0153878    4.5175841    1.4978037 0.0015849613 -0.020499218    4.5364984 
+  101870    19.548237   0.99823035    23.494579    6.0455782    4.5487318    1.4968464  0.001632517 -0.020927804    4.5680271 
+  101880    19.682552   0.97713919    23.872674     6.009548    4.5443278    1.4652202 0.0018661948 -0.022170753    4.5646324 
+  101890    19.630885   0.98363929    23.550567    6.0134435    4.5384764    1.4749671 0.0020829849 -0.023092438    4.5594858 
+  101900     17.38232   0.99087803    23.520907    6.0074847    4.5216631    1.4858216 0.0020106358 -0.022575294    4.5422278 
+  101910    19.445842    1.0111868    23.822501    6.0421877     4.525913    1.5162747 0.0018649511 -0.021890736    4.5459388 
+  101920    19.005497    1.0131324    23.666339    6.0562579    4.5370659     1.519192 0.0016648565  -0.02134255    4.5567436 
+  101930    19.260625    1.0204045    23.812011    6.0634049    4.5333084    1.5300965 0.0018081654 -0.021773654    4.5532739 
+  101940    19.348838    1.0263564    23.939884    6.0552091    4.5161877    1.5390214 0.0017403664 -0.021199868    4.5356472 
+  101950    17.250978   0.98576355    23.559875    6.0273882    4.5492357    1.4781524 0.0014464593 -0.020108141    4.5678974 
+  101960    19.721936   0.99813178    23.757529    6.0344219    4.5377233    1.4966986 0.0013368201 -0.019779767    4.5561662 
+  101970    19.497534   0.99954129    23.772618    6.0347969    4.5359847    1.4988122 0.0012097656 -0.019158667    4.5539336 
+  101980    19.473095    1.0119843    23.564595    6.0465001    4.5290297    1.5174704 0.0012275243 -0.019060725    4.5468629 
+  101990    19.470469    1.0142773    23.838144    6.0634599    4.5425511    1.5209088 0.0013098553 -0.020156531    4.5613978 
+  102000    17.547634    1.0237264    23.909395     6.067786    4.5327083    1.5350777 0.0015535427 -0.021291868    4.5524466 
+  102010    19.798396    1.0173921    23.582759    6.0644201    4.5388407    1.5255794 0.0018268136 -0.022522146     4.559536 
+  102020    19.842886    1.0249731    23.722026    6.0564955    4.5195483    1.5369472   0.00187888 -0.022794485    4.5404639 
+  102030    19.614147     1.012187    23.688924    6.0559258    4.5381514    1.5177744 0.0016674293  -0.02178078    4.5582647 
+  102040    19.385563    1.0033564    23.704506    6.0420628      4.53753    1.5045329 0.0015992605 -0.021224675    4.5571554 
+  102050    17.357505    1.0208829    23.823541    6.0590106    4.5281966    1.5308139 0.0015484563 -0.020824613    4.5474728 
+  102060    19.514851    1.0172268    24.062182    6.0577154    4.5323838    1.5253316 0.0016148705 -0.021275025    4.5520439 
+  102070    19.496498    1.0141114    23.549155      6.04839    4.5277299    1.5206601 0.0018511593 -0.021885427    4.5477642 
+  102080    19.680377   0.99302402    23.644846     6.057221    4.5681815    1.4890395 0.0019792038 -0.022393705     4.588596 
+  102090    19.632292    1.0222115    23.879295    6.0544745    4.5216684    1.5328061 0.0019714882 -0.022402561    4.5420994 
+  102100    17.426213     1.000041    23.518428    6.0423203    4.5427589    1.4995614 0.0020262705 -0.022750707    4.5634833 
+  102110    19.549037   0.99354499     23.56906    6.0136484    4.5238276    1.4898207 0.0022625921 -0.024102386    4.5456674 
+  102120    19.357082    1.0042529    24.069088     6.031897    4.5260198    1.5058772 0.0023381732 -0.024380961    4.5480626 
+  102130      19.3866    1.0020825    23.814522    6.0267159    4.5240933    1.5026226 0.0021298562 -0.023284485    4.5452479 
+  102140    19.534279    1.0052866    23.553678    6.0356149    4.5281875    1.5074273 0.0019835197 -0.023059472    4.5492635 
+  102150    16.893888     1.011074    24.058497    6.0489458    4.5328403    1.5161055  0.001956542 -0.023024688    4.5539084 
+  102160    19.310553   0.99958698    23.512488    6.0482154    4.5493347    1.4988807 0.0020455176 -0.023268309    4.5705575 
+  102170    19.178677    1.0122733    23.861329    6.0576057    4.5397019    1.5179038 0.0019581866 -0.022858366     4.560602 
+  102180    19.782527    1.0153346    23.803687    6.0543888    4.5318946    1.5224943 0.0017782556 -0.022102133    4.5522184 
+  102190    19.601432    1.0130493    23.827157    6.0212194     4.502152    1.5190674 0.0014569705 -0.020651171    4.5213462 
+  102200    17.527719   0.98501495    24.193641    6.0066367    4.5296067    1.4770299  0.001311141 -0.020046547    4.5483421 
+  102210    19.409493    1.0004644    23.575085    6.0211036    4.5209072    1.5001964 0.0012420847 -0.019835873    4.5395009 
+  102220    19.458324   0.99367593    23.752696    6.0153902    4.5253732    1.4900171 0.0011191157  -0.01914042    4.5433945 
+  102230    19.301361    1.0038575    23.847557    6.0266541    4.5213697    1.5052844 0.0012301364 -0.019708626    4.5398482 
+  102240    19.044579    1.0057805    23.508062    6.0370146    4.5288468    1.5081678 0.0016958011 -0.022142307    4.5492933 
+  102250    17.088585    1.0147188    23.623567    6.0696764    4.5481056    1.5215708 0.0017654697 -0.022125225    4.5684654 
+  102260    19.365846    1.0401954    23.672885    6.0910419    4.5312688    1.5597731 0.0018546674 -0.022643862     4.552058 
+  102270    19.094081    1.0026103    23.694055    6.0688017    4.5653875    1.5034142 0.0020250416 -0.023627686    4.5869902 
+  102280    19.138811    1.0053609    24.087485    6.0500157     4.542477    1.5075387 0.0019345232 -0.023512762    4.5640552 
+  102290    19.510097    1.0022719    23.741009     6.052703    4.5497962    1.5029067 0.0019890052 -0.023653081    4.5714603 
+  102300    17.563348    1.0144308     23.64427    6.0470075    4.5258685    1.5211389 0.0019968912 -0.023875077    4.5477467 
+  102310    19.580309   0.98162503    23.770089    6.0102562    4.5383094    1.4719467 0.0018934316 -0.023306076    4.5597221 
+  102320    19.667073   0.99891401    24.049678     6.022515    4.5246435    1.4978716 0.0017680651 -0.022803552    4.5456789 
+  102330      19.4471   0.98949898    23.637058    6.0136816    4.5299279    1.4837537 0.0016427698 -0.022020824    4.5503059 
+  102340    19.531094     1.004338    23.475569    6.0373455    4.5313407    1.5060048 0.0016164053 -0.021452333    4.5511766 
+  102350    17.250595    1.0223777    23.840596    6.0630301    4.5299748    1.5330553 0.0016229015 -0.021159731    4.5495116 
+  102360    19.705445    1.0210668      23.8132    6.0532229    4.5221332    1.5310897 0.0015339261 -0.021088045    4.5416873 
+  102370    19.343877     1.004647    23.817056    6.0535417    4.5470735    1.5064682 0.0012422481 -0.020004333    4.5658356 
+  102380    19.456976    1.0093264    23.671517    6.0689224    4.5554374     1.513485 0.0010996066 -0.019515497    4.5738533 
+  102390    19.486242    1.0209354    23.956581    6.0701201    4.5392275    1.5308926 0.0012573319 -0.020311617    4.5582817 
+  102400    17.522957     1.025506    24.050461    6.0713024    4.5335562    1.5377462 0.0014447733 -0.020901233    4.5530127 
+  102410    19.762555    1.0265092    23.899831    6.0895335    4.5502829    1.5392505 0.0014405103 -0.020998374    4.5698408 
+  102420    19.841149    1.0106259    23.701239    6.0597334    4.5442999    1.5154335 0.0015943889   -0.0217701    4.5644756 
+  102430    19.334148     1.006563    23.914708     6.062355    4.5530138    1.5093413 0.0017154995  -0.02234773     4.573646 
+  102440    19.495952    1.0259278     23.88848     6.075496    4.5371173    1.5383788 0.0016407207 -0.022150638    4.5576272 
+  102450    17.666207    1.0388812    23.791695     6.074655    4.5168526    1.5578023 0.0015967317 -0.022089188    4.5373451 
+  102460    19.673559    1.0102698    23.644698    6.0644493    4.5495497    1.5148995 0.0015432418 -0.021832375    4.5698389 
+  102470    19.600927   0.99061417    23.577058    6.0392865    4.5538606    1.4854259 0.0016128611 -0.022144803    4.5743925 
+  102480    19.676335    1.0041419    23.520087    6.0431586    4.5374478    1.5057108 0.0014375464 -0.020800574    4.5568108 
+  102490    19.635016    1.0120281    23.580256    6.0290019    4.5114657    1.5175362 0.0014240211 -0.020239635    4.5302814 
+  102500    17.432552    1.0256258    23.791484      6.06282    4.5248941    1.5379259 0.0015839002 -0.020521487    4.5438317 
+  102510    19.674874    1.0176601    23.663899     6.063499    4.5375176    1.5259814 0.0016197895 -0.020545721    4.5564436 
+  102520    19.579093    1.0031422    23.747621    6.0395543    4.5353426    1.5042117 0.0016213296 -0.020819339    4.5545406 
+  102530    19.606589    1.0230813    23.515793    6.0770648    4.5429544    1.5341104 0.0015322023 -0.020830614    4.5622528 
+  102540    19.641879    1.0366898    23.663188    6.0926002    4.5380838    1.5545163 0.0014082586 -0.020523003    4.5571986 
+  102550    17.341123    1.0440137    24.075814    6.1098989    4.5444003    1.5654985  0.001569443 -0.021068162     4.563899 
+  102560    19.506548    1.0293763    23.499716    6.0957457     4.552196    1.5435497 0.0015804244 -0.020310098    4.5709257 
+  102570    19.016091    1.0181143     23.80778    6.0834899    4.5568275    1.5266624 0.0016097801 -0.020236956    4.5754547 
+  102580    19.249496     1.022202    23.618239    6.0891864    4.5563945    1.5327919 0.0016989916 -0.020983951    4.5756795 
+  102590    19.711675    1.0378314    23.781364    6.1050604    4.5488323    1.5562282 0.0015725138 -0.020625806    4.5678856 
+  102600    17.428948    1.0169789     23.69299    6.0654075    4.5404477    1.5249598 0.0015112874  -0.01994101    4.5588774 
+  102610    19.605184    1.0059275    23.465499    6.0630856    4.5546972    1.5083883 0.0013369945 -0.019101863    4.5724621 
+  102620    19.621076    0.9981734    23.530818    6.0599874    4.5632264     1.496761 0.0014361481 -0.019750937    4.5815412 
+  102630     19.47949    1.0242752     23.88645    6.0534473    4.5175466    1.5359007 0.0015361528 -0.020119136    4.5361296 
+  102640    19.437076    1.0121234    23.870492    6.0317089      4.51403     1.517679 0.0017251605 -0.021080664    4.5333855 
+  102650    17.486804    1.0081432    23.888869    6.0391005    4.5273898    1.5117107 0.0016209004 -0.020436959    4.5462059 
+  102660    19.448855   0.99436224    23.521552    6.0237156    4.5326695    1.4910462  0.001401619 -0.019234928    4.5505028 
+  102670    19.406224    1.0204072    24.008952    6.0590987     4.528998    1.5301007 0.0012731194 -0.018278235    4.5460031 
+  102680      19.6083   0.99079009    23.335699    6.0479209    4.5622311    1.4856897 0.00094780248 -0.016864145    4.5781475 
+  102690    19.409097     1.013675    23.798373    6.0561438    4.5361381    1.5200057 0.0012170687 -0.018062172    4.5529832 
+  102700    17.454558    1.0083561    23.536732    6.0343671    4.5223372    1.5120299 0.0013402961 -0.019104013    4.5401009 
+  102710    19.369109    1.0112068    23.905516    6.0418109    4.5255063    1.5163046 0.0015091835 -0.019775347    4.5437725 
+  102720    19.517985        1.006     23.73037    6.0138564    4.5053593     1.508497  0.001497006 -0.019901779    4.5237641 
+  102730    19.701321    1.0067612    23.596258    6.0250833    4.5154448    1.5096384 0.0014644215 -0.019758365    4.5337388 
+  102740     19.54751   0.99295481    23.780165    6.0245666    4.5356309    1.4889357 0.0015588754 -0.020602186    4.5546742 
+  102750    17.193074    1.0146083    23.913609    6.0323136    4.5109085    1.5214052 0.0015604386 -0.020601697    4.5299497 
+  102760     19.32962    1.0016233    23.617631    6.0537617    4.5518277    1.5019341 0.0014213845 -0.019974011    4.5703803 
+  102770    19.417477    1.0046039    23.817813    6.0498044    4.5434008    1.5064035 0.0013839332 -0.019953237    4.5619701 
+  102780    19.704981    1.0475707    24.025844    6.1115375    4.5407052    1.5708323  0.001422952 -0.020253786    4.5595361 
+  102790    19.714139     1.036365    23.989049    6.1044523     4.550423    1.5540294 0.0016131459 -0.020956966    4.5697668 
+  102800    17.463648    1.0337258    23.710437     6.086385    4.5363131    1.5500719 0.0016492199 -0.021585433    4.5562493 
+  102810    19.362512    1.0103216    23.982067    6.0531357    4.5381585    1.5149772 0.0017245964 -0.022044403    4.5584783 
+  102820    19.473227    0.9960586    23.550458    6.0382749    4.5446851    1.4935899 0.0017746217 -0.022045852    4.5649563 
+  102830    19.611988   0.99726898    23.652888    6.0431813    4.5477764    1.4954048  0.001710683 -0.021664394    4.5677301 
+  102840    19.360803   0.99921454    23.833393    6.0222125    4.5238903    1.4983222 0.0017062915 -0.021452219    4.5436362 
+  102850    17.429243    1.0011252    23.666291    6.0455709    4.5443837    1.5011872 0.0016777981 -0.021231692    4.5639376 
+  102860    19.631275     1.006164    23.579717      6.04064    4.5318971    1.5087429 0.0015439375  -0.02066437    4.5510175 
+  102870    19.842619    1.0128134    23.647399    6.0279913    4.5092776    1.5187137 0.0015317284 -0.020670874    4.5284168 
+  102880    19.807298    1.0092215    23.970998     6.066938    4.5536103    1.5133277 0.0015530718 -0.020752114    4.5728093 
+  102890    19.446871     1.028831    23.841022    6.0623671    4.5196351    1.5427321 0.0015369426 -0.020680553    4.5387787 
+  102900    17.464304   0.99648272    23.405827    6.0515291    4.5573033    1.4942258 0.0014716751 -0.020492095    4.5763237 
+  102910    19.662121    1.0036083     23.92532    6.0496587    4.5447481    1.5049106 0.0016547645  -0.02169782    4.5647912 
+  102920    19.616503    1.0160164    23.701874    6.0510651    4.5275485    1.5235166 0.0018089535 -0.022255225    4.5479948 
+  102930    19.559031    1.0100302    23.802403    6.0532612    4.5387209    1.5145403 0.0017516594 -0.022429401    4.5593986 
+  102940    19.876326     1.027291    23.872114    6.0697054    4.5292826    1.5404228 0.0017457586 -0.022567598    4.5501044 
+  102950    17.306868     1.013925    23.660188    6.0549375     4.534557    1.5203806 0.0015228972 -0.021725966      4.55476 
+  102960     19.42961    1.0167239    23.946102    6.0616454    4.5370679    1.5245775 0.0015324901 -0.021732567     4.557268 
+  102970    19.306952    1.0129732    23.651191    6.0460273     4.527074    1.5189533 0.0016087395 -0.021734509    4.5471998 
+  102980    19.302691     1.006974    23.846629    6.0605894    4.5506318    1.5099576 0.0017767778 -0.022496486    4.5713515 
+  102990     19.61772    1.0142101    23.716824    6.0480307    4.5272227     1.520808 0.0019809959 -0.023336951    4.5485786 
+  103000    17.495468    1.0114885    23.601384    6.0384698    4.5217427    1.5167271 0.0019920155 -0.023396554    4.5431473 
+  103010    19.527173    1.0216949    23.882286    6.0712945    4.5392629    1.5320315 0.0020295159 -0.023698734    4.5609321 
+  103020    19.581142    1.0313436    24.120266    6.0741466    4.5276469    1.5464998  0.001980032 -0.023303578    4.5489704 
+  103030    19.849241    1.0437601    23.854283     6.084913    4.5197948    1.5651182  0.001720513  -0.02172275     4.539797 
+  103040    19.791659    1.0302618    23.810707     6.085105    4.5402275    1.5448775 0.0016458614 -0.020945915    4.5595276 
+  103050    17.577528    1.0314304    23.492071    6.0783911    4.5317611    1.5466299 0.0016810347 -0.021493599    4.5515737 
+  103060    19.580263    1.0316855    23.739825    6.0799484     4.532936    1.5470124 0.0015841882 -0.021602675    4.5529545 
+  103070    19.767075    1.0046858    23.770233    6.0441286    4.5376022    1.5065264 0.0016641904 -0.022106165    4.5580442 
+  103080    19.690321   0.99954886     23.79972    6.0432028    4.5443792    1.4988235 0.0016989924 -0.022059158    4.5647394 
+  103090    19.739405    1.0107951    23.619093    6.0323002     4.516613    1.5156873 0.0016053126 -0.021443477    4.5364511 
+  103100    17.494734    1.0087451    23.555083    6.0470729    4.5344597    1.5126133 0.0014820508 -0.020839996    4.5538176 
+  103110    19.496553    1.0221645     23.77935    6.0648679    4.5321322    1.5327357 0.0017011079 -0.021535006    4.5519661 
+  103120    19.390316    1.0159548    23.801058    6.0464195    4.5229953    1.5234242 0.0016396796 -0.021335243    4.5426909 
+  103130    19.450701   0.99124919    23.849743    6.0143508    4.5279726    1.4863782 0.0016123284 -0.021480234    4.5478405 
+  103140    19.681415    1.0049233    23.528166    6.0287806    4.5218981    1.5068825 0.0016863903 -0.022161397    4.5423731 
+  103150    17.475228    0.9972346    23.832625    6.0223585    4.5270053    1.4953533 0.0016906416 -0.022294065    4.5476087 
+  103160    19.641449   0.98952858    23.779565    6.0195129    4.5357148    1.4837981 0.0017320162 -0.022395399    4.5563782 
+  103170    19.663562   0.98115114    23.460274    5.9942937    4.5230575    1.4712361 0.0019872486 -0.023445871    4.5445162 
+  103180    19.586429   0.98327201    23.653405    5.9795668    4.5051504    1.4744164  0.002039677 -0.023264278     4.526375 
+  103190    19.593011   0.96091941    23.495892    5.9710405    4.5301419    1.4408986 0.0020190518 -0.022723741    4.5508465 
+  103200     17.33339   0.97405803    23.574367    6.0046842    4.5440842       1.4606 0.0020079105 -0.022658672    4.5647349 
+  103210    19.107103   0.98280094    23.795008    5.9945263    4.5208163      1.47371 0.0020562033 -0.022927482    4.5416875 
+  103220     19.06354   0.99676194    23.447437    6.0118209    4.5171764    1.4946445 0.0019555278 -0.022952527    4.5381734 
+  103230    19.650681    0.9954365    23.794454    6.0318987    4.5392416     1.492657 0.0018409696  -0.02243941    4.5598401 
+  103240    19.460732   0.97731178    23.912176    6.0186029    4.5531239     1.465479 0.0018987192 -0.022067863     4.573293 
+  103250    17.088518   0.99933359    23.744506    6.0135915    4.5150908    1.4985007 0.0016870459 -0.021123776    4.5345275 
+  103260    19.038247    0.9901871    23.774822    6.0142627    4.5294771    1.4847856 0.0017207578 -0.021734664     4.549491 
+  103270    19.727328    0.9864441    23.720832    6.0044306    4.5252577    1.4791729 0.0018202661 -0.022060536    4.5454979 
+  103280    19.864023   0.99869912    23.814978    6.0187233     4.521174    1.4975493 0.0020103239 -0.022849999    4.5420137 
+  103290    19.719464    1.0225317     23.74951    6.0424678    4.5091814    1.5332863 0.0021404444  -0.02352548    4.5305665 
+  103300    17.277808   0.98496978    23.516749    5.9982581    4.5212959    1.4769622 0.0019714901 -0.022884743    4.5422091 
+  103310    19.558622    1.0030057    23.854058    6.0366326    4.5326256     1.504007 0.0019234584 -0.022673723    4.5533759 
+  103320    19.445899   0.99070751    23.751813    6.0241582    4.5385923    1.4855659 0.0019109555 -0.022501654     4.559183 
+  103330    19.437269   0.99294771    23.889225    5.9906251       4.5017    1.4889251 0.0017535435 -0.021916605     4.521863 
+  103340    19.716314   0.99106266    23.667272    5.9908751    4.5047766    1.4860985 0.0015251586 -0.021282371    4.5245339 
+  103350    17.538143   0.98325105    23.655635    5.9807502    4.5063652     1.474385 0.0012753583 -0.020635246    4.5257251 
+  103360      19.6508    1.0024921    23.557734     6.010477    4.5072401    1.5032369  0.001493194 -0.021361818    4.5271087 
+  103370    19.554376   0.99881791    23.769433    6.0122761    4.5145486    1.4977275 0.0015300416 -0.021065632    4.5340842 
+  103380    19.381097   0.97689608    23.378123    5.9919358    4.5270801    1.4648557 0.0013103291 -0.020013459    4.5457832 
+  103390    19.532696     0.979331    23.742839     6.006338    4.5378312    1.4685068 0.0013017467 -0.019834717    4.5563642 
+  103400    17.570139   0.99402822    23.613831    6.0071173     4.516572    1.4905453 0.0014828448 -0.020961997    4.5360511 
+  103410    19.604994    1.0061724    23.860535    6.0505176     4.541762    1.5087555 0.0015617314 -0.021232204    4.5614325 
+  103420    19.819135    1.0026418    23.867243    6.0415946    4.5381332    1.5034614  0.001584595 -0.021378075    4.5579267 
+  103430    19.473607    0.9949312     23.75738    6.0371859    4.5452865    1.4918993   0.00155813 -0.021375898    4.5651043 
+  103440    19.380216    1.0089307    23.804818    6.0556946     4.542803    1.5128916 0.0015444469 -0.021036036    4.5622946 
+  103450    17.384183    1.0046629      23.5784    6.0356193    4.5291273     1.506492 0.0017643777 -0.021970047     4.549333 
+  103460    19.532317    1.0073133    23.580997    6.0323287    4.5218623    1.5104663 0.0018100227 -0.022347371    4.5423997 
+  103470    19.686601    1.0201761    23.763205    6.0348769    4.5051229     1.529754 0.0017649043 -0.022386699    4.5257447 
+  103480    19.574668    1.0084016    23.590783    6.0563368    4.5442386    1.5120982 0.0017819926 -0.022356564    4.5648131 
+  103490    19.408264    1.0295229    24.031341    6.0770571    4.5332875    1.5437696 0.0018462302 -0.022519533    4.5539608 
+  103500    17.564925    1.0134164    23.795855    6.0696675    4.5500497    1.5196179 0.0017654201 -0.022288123    4.5705724 
+  103510    19.678262    1.0258575    23.891606    6.0857118    4.5474385    1.5382733 0.0018081382 -0.022514651     4.568145 
+  103520    19.461978    1.0360164    23.906445    6.0901513    4.5366447    1.5535066 0.0019168542  -0.02271756    4.5574454 
+  103530    19.276929    1.0331392    23.626626    6.1015223    4.5523301    1.5491923 0.0020561704 -0.023298582    4.5735725 
+  103540    19.342772    1.0208193    23.877393    6.0880898    4.5573712    1.5307186 0.0020905872 -0.023845434     4.579126 
+  103550    17.410539    1.0193595    23.435173    6.0766524    4.5481227    1.5285296 0.0020790435 -0.023637073    4.5696808 
+  103560    19.562003    1.0301909    23.853622    6.0704328    4.5256615    1.5447712 0.0018823791  -0.02311421    4.5468934 
+  103570    19.730382    1.0098467    23.916386    6.0477562    4.5334911    1.5142651 0.0018103724 -0.022677859    4.5543586 
+  103580    19.544029    1.0338395    23.783027     6.085135    4.5348926    1.5502423 0.0018018798 -0.022407103    4.5554978 
+  103590    19.517699      1.03613    23.873385    6.0815356    4.5278587     1.553677  0.001798945 -0.022328884    4.5483886 
+  103600    17.576535    1.0205422    23.777422    6.0531965    4.5228935     1.530303 0.0016536002 -0.021718005    4.5429579 
+  103610     19.53784    1.0156278    23.665304    6.0922935    4.5693596    1.5229338 0.0013700691  -0.02023364    4.5882232 
+  103620     19.22711    1.0112667    23.735096    6.0601606    4.5437662    1.5163944 0.0012744035 -0.019972389    4.5624642 
+  103630    19.130148    1.0074762    23.703202    6.0474509    4.5367403    1.5107106  0.001301597  -0.02020424     4.555643 
+  103640    19.833471    1.0207401    23.783645    6.0723315    4.5417317    1.5305998 0.0013661158 -0.020799807    4.5611654 
+  103650    17.335463    1.0300509    23.830944    6.0817336    4.5371724    1.5445613  0.001444403 -0.021112347    4.5568403 
+  103660    19.434091     1.030241    23.950842    6.0775569    4.5327106    1.5448464 0.0014703203 -0.021534998    4.5527752 
+  103670    19.523764    1.0271189    23.788702    6.1055689    4.5654041    1.5401648 0.0013965631 -0.021464052    4.5854716 
+  103680    19.524396    1.0128286    24.006602    6.0709184     4.552182    1.5187364 0.0012684509  -0.02069121    4.5716048 
+  103690    19.660281    1.0343284    23.855826    6.0882643    4.5372889    1.5509754 0.0013152618 -0.020493428    4.5564671 
+  103700    17.484564    1.0314939    23.755327    6.0915692    4.5448441    1.5467251 0.0013448809 -0.020471657    4.5639709 
+  103710    19.593737    1.0236782    23.865005    6.0865456    4.5515402    1.5350054 0.0014165107 -0.020745933    4.5708696 
+  103720    19.669964    1.0203722    23.391447    6.1041158    4.5740677    1.5300481 0.0016415595 -0.021423934    4.5938501 
+  103730     19.53245    1.0369614    23.599139    6.0814026    4.5264789    1.5549236 0.0017731116 -0.021880419    4.5465863 
+  103740    19.381874    1.0062055    23.533344    6.0695071     4.560702    1.5088051 0.0018282866  -0.02272609    4.5815998 
+  103750    17.406336    1.0260799      23.7545     6.080572    4.5419652    1.5386068 0.0018478885 -0.022832261    4.5629496 
+  103760    19.339119    1.0297615     23.71233    6.0873279    4.5432006    1.5441274 0.0018882352 -0.022890718    4.5642031 
+  103770    19.610463    1.0069259    24.033206    6.0609338    4.5510484    1.5098854 0.0017187621 -0.021903218    4.5712329 
+  103780    19.780777    1.0169275    23.867667    6.0725788    4.5476961    1.5248827 0.0017167671 -0.021610584    4.5675899 
+  103790    19.561261    1.0124247    23.591991     6.049296    4.5311652    1.5181309 0.0016775525 -0.021609138    4.5510968 
+  103800    17.257525    1.0013604    23.625853    6.0355712    4.5340312    1.5015399 0.0017842124 -0.021977012     4.554224 
+  103810    19.347807    1.0150624    23.580705    6.0448875    4.5228015     1.522086 0.0017766059 -0.021964299    4.5429892 
+  103820    19.349293     1.004185    23.920591    6.0516308    4.5458555    1.5057753 0.0016597828 -0.021513866    4.5657096 
+  103830     19.22095    1.0096815    23.812218    6.0505885    4.5365711    1.5140174 0.0016190631 -0.021683253    4.5566353 
+  103840    19.590335    1.0093616    23.561617    6.0611019    4.5475641    1.5135377 0.0017942019 -0.022597456    4.5683674 
+  103850    17.422656    1.0197539    23.860802    6.0730616    4.5439407     1.529121  0.001835822 -0.022983286    4.5650881 
+  103860    19.714613      1.02338    23.706309     6.088056    4.5534977    1.5345583 0.0016981088 -0.022535956    4.5743356 
+  103870    19.357089     1.014524    23.883481    6.0741817     4.552903    1.5212787 0.0017488571 -0.022726266    4.5738804 
+  103880    19.742065    1.0108646    23.606419    6.0826668    4.5668753    1.5157915 0.0018897587 -0.023116147    4.5881017 
+  103890    19.708331    1.0277625    23.727266    6.0848829     4.543753    1.5411299 0.0020016239 -0.023523268    4.5652747 
+  103900     17.14657    1.0043878    23.729887    6.0583852    4.5523057    1.5060795 0.0019379215  -0.02335337    4.5737211 
+  103910    19.516173   0.99597445     23.86743    6.0308253    4.5373616    1.4934637  0.001805871 -0.022890363    4.5584461 
+  103920    19.567164    1.0075898    23.936819    6.0419027    4.5310219    1.5108809 0.0017726923  -0.02265243    4.5519016 
+  103930    19.754203    1.0047004    23.633201    6.0504637    4.5439154    1.5065482 0.0017488972 -0.022419033    4.5645856 
+  103940    19.614351    1.0111578    23.696755    6.0482808    4.5320497    1.5162312  0.001657544 -0.022354389    4.5527465 
+  103950    17.419718    1.0324732    23.840329    6.0489112    4.5007176    1.5481936 0.0017310929   -0.0226985     4.521685 
+  103960    19.435028    1.0137935    23.635313     6.042902    4.5227186    1.5201834 0.0016524661 -0.022005097    4.5430712 
+  103970    19.609332   0.99838763    23.666417    6.0040331    4.5069508    1.4970822 0.0017137315 -0.022037297    4.5272744 
+  103980     19.46134   0.99006561    23.640804    6.0159018    4.5312984    1.4846034 0.0020140023 -0.023358176    4.5526426 
+  103990    19.395207    1.0090628    23.692012    6.0240652    4.5109756    1.5130896 0.0022084956 -0.024093717    4.5328608 
+  104000    17.294085    1.0177926    23.893879    6.0566815    4.5305014    1.5261801 0.0023711269 -0.025059963    4.5531902 
+  104010    19.432384    1.0193525    23.642782    6.0669906    4.5384715    1.5285191 0.0022665278  -0.02480295     4.561008 
+  104020    19.550241    1.0214761     23.82076    6.0703969    4.5386934    1.5317034 0.0021777036 -0.024295448    4.5608112 
+  104030    19.815881    1.0233908    23.952572    6.0718513    4.5372768    1.5345744 0.0020446328 -0.023651803     4.558884 
+  104040    19.399389    1.0273725    23.694933     6.066425      4.52588     1.540545 0.0018447039 -0.022991159    4.5470265 
+  104050    17.521576     1.012924    23.486051    6.0496211    4.5307416    1.5188795 0.0018961285 -0.023080606    4.5519261 
+  104060    19.541167    1.0146413    23.720095    6.0600862    4.5386316    1.5214546 0.0019906093 -0.023380983    4.5600219 
+  104070    19.525169    1.0101625    23.611096    6.0636251    4.5488864    1.5147387 0.0020156388 -0.023526334    4.5703971 
+  104080    19.697213    1.0010211    23.619607    6.0298713    4.5288403    1.5010311 0.0021653964 -0.024274823    4.5509497 
+  104090    19.306259   0.99768286    23.635191    6.0435939    4.5475684    1.4960254 0.0021514766 -0.024316116    4.5697331 
+  104100    17.558404    1.0065738    23.949968    6.0433928    4.5340354    1.5093574  0.002130458 -0.023377672    4.5552827 
+  104110    19.567304    1.0221315    23.631516    6.0609399    4.5282538    1.5326861 0.0021011641  -0.02315481    4.5493075 
+  104120    19.457597    1.0130445    23.654451    6.0586479    4.5395877    1.5190602 0.0021525926  -0.02357122    4.5610063 
+  104130    19.763855    1.0014455    23.923431    6.0433058    4.5416383    1.5016675 0.0019364239 -0.022948882    4.5626507 
+  104140    19.605218    1.0254619    23.933167    6.0594604    4.5217803    1.5376801 0.0018279724 -0.022562565    4.5425149 
+  104150    17.550675   0.99646957    23.585677    6.0371175    4.5429114    1.4942061 0.0018245566 -0.022676271    4.5637631 
+  104160    19.287226     1.001335    23.941567    6.0285249    4.5270231    1.5015019 0.0019447916 -0.023287453    4.5483657 
+  104170    19.230651    1.0010856    23.698375    6.0118647    4.5107368    1.5011279 0.0019526285 -0.022978573    4.5317627 
+  104180    19.545719    1.0077542    23.480413    6.0391899    4.5280625    1.5111274 0.0019837885 -0.023158108    4.5492368 
+  104190    19.038966    1.0128664     23.50069    6.0460351     4.527242    1.5187932 0.0021160999 -0.023836348    4.5489622 
+  104200    16.763653    1.0163223    23.858066     6.031138    4.5071627    1.5239753 0.0021085077  -0.02359203    4.5286462 
+  104210     19.29493     1.009057    23.640552    6.0442565    4.5311755     1.513081 0.0023682067 -0.024748682     4.553556 
+  104220    19.676686    1.0073121    23.630844    6.0317012    4.5212367    1.5104645 0.0022916033 -0.024365622    4.5433107 
+  104230    19.792853    1.0107117    23.694776    6.0413437    4.5257815    1.5155622 0.0021835994 -0.023858015    4.5474559 
+  104240    19.647306    1.0112301    23.785686    6.0332549    4.5169153    1.5163395 0.0019585601 -0.023133682    4.5380905 
+  104250    17.479443    1.0184295    23.724318    6.0647443    4.5376093     1.527135 0.0018275467 -0.022031258    4.5578131 
+  104260    19.486928   0.99549362    23.968478    6.0428252    4.5500825    1.4927427 0.0016951265 -0.020557557    4.5689449 
+  104270    19.476863   0.98243015    23.949298    6.0178719    4.5447179     1.473154 0.0017380844 -0.020364261     4.563344 
+  104280     19.64578    1.0040723    23.715754    6.0066325     4.501026    1.5056065 0.0016961277 -0.020796123     4.520126 
+  104290    19.564272   0.99640632    23.654166    6.0112641    4.5171528    1.4941113 0.0015547819 -0.020704353    4.5363024 
+  104300    17.461147   0.99388654    23.680029    6.0146852    4.5243523    1.4903329 0.0015272659 -0.020721409    4.5435465 
+  104310    19.491804    1.0006738    23.831794    6.0267448    4.5262344    1.5005104 0.0016023558 -0.021312629    4.5459447 
+  104320    19.389282    1.0014724    23.694148     6.028405    4.5266971    1.5017078 0.0017045997  -0.02154858    4.5465411 
+  104330    19.482328    1.0046238    23.717495    6.0464746    4.5400412    1.5064334 0.0015244992 -0.020575226    4.5590919 
+  104340    19.305241   0.99113733    23.665405    6.0534467    4.5672363    1.4862104  0.001525774 -0.020411966    4.5861225 
+  104350    17.372759    1.0141142    23.948246    6.0583289    4.5376646    1.5206643 0.0014023571 -0.020236389    4.5564986 
+  104360    19.420664    0.9946115    23.569487    6.0470186    4.5555987    1.4914199 0.0014043606 -0.020226419    4.5744208 
+  104370    19.559088    1.0179911    23.605106    6.0610586     4.534581    1.5264776 0.0015018062 -0.020949121    4.5540283 
+  104380    19.714448    1.0270605    23.532727    6.0596884    4.5196113    1.5400772 0.0014902103  -0.02115519    4.5392762 
+  104390    19.440313    1.0319718    23.487754    6.0987479    4.5513061    1.5474417 0.0014987037  -0.02119111    4.5709985 
+  104400    17.330692    1.0119185    23.594708    6.0567061    4.5393343    1.5173719  0.001556743 -0.020709957    4.5584875 
+  104410    19.302246    1.0074655    23.814144    6.0750676    4.5643731    1.5106945 0.0016229204 -0.021039832      4.58379 
+  104420    19.350987    1.0167365     23.45664    6.0559214     4.531325    1.5245963 0.0018748971 -0.022074268    4.5515244 
+  104430    19.626574    1.0000592    23.621376    6.0355057    4.5359169    1.4995888 0.0019069826 -0.022309783    4.5563197 
+  104440     19.62816    1.0057866    23.200457    6.0473285    4.5391514    1.5081771 0.0018892268 -0.022594882    4.5598571 
+  104450    17.019483    1.0223527    23.744698    6.0543884    4.5213705    1.5330178 0.0016703386  -0.02192421    4.5416244 
+  104460    19.298156    1.0009115    23.642991    6.0427163    4.5418495    1.5008669 0.0013679607 -0.020697285    4.5611788 
+  104470    19.680072    1.0115971    23.922621    6.0716959    4.5548061    1.5168898  0.001312075 -0.020045545    4.5735396 
+  104480    19.589244    1.0279121    24.139435    6.0685653    4.5272111    1.5413542 0.0016065239 -0.021197243    4.5468018 
+  104490    19.417663    1.0092459    23.884957    6.0712469    4.5578826    1.5133643 0.0018900679 -0.022674727    4.5786673 
+  104500    17.421795    1.0268771    23.823265    6.0573425    4.5175403    1.5398022 0.0019323612 -0.022571793    4.5381798 
+  104510    19.624065    1.0096731    23.906813    6.0569186    4.5429138    1.5140048 0.0018679011 -0.022124843    4.5631707 
+  104520    19.643278    1.0087333    23.769578    6.0534131    4.5408176    1.5125955  0.001743566 -0.021465316    4.5605394 
+  104530    19.452421    1.0037253    23.808101    6.0282595    4.5231734    1.5050861  0.001733695  -0.02137485    4.5428145 
+  104540    19.480903    1.0017611    23.981223    6.0665255    4.5643847    1.5021407 0.0015823869 -0.020726339    4.5835287 
+  104550    17.468052    1.0128492    23.853647    6.0634964     4.544729    1.5187674 0.0014889158 -0.020178209    4.5634183 
+  104560    19.667736    1.0119973    24.046213    6.0626843    4.5451943    1.5174899  0.001353632 -0.019792873    4.5636336 
+  104570    19.723323    1.0218565    23.639868    6.0592758     4.527002    1.5322738 0.0013653943 -0.020023125    4.5456597 
+  104580    19.325787    1.0176892    23.779266    6.0670767    4.5410518     1.526025 0.0014557967 -0.019739663    4.5593356 
+  104590    19.315168    1.0138811     23.47283    6.0452547    4.5249399    1.5203147 0.0015368754  -0.01989401    4.5432971 
+  104600    17.622339    1.0071333    23.556087    6.0694162    4.5592198    1.5101964 0.0013421859 -0.018639634    4.5765173 
+  104610    19.821168    1.0147141    23.818188    6.0649048     4.543341    1.5215638 0.0012424004 -0.018204953    4.5603036 
+  104620     19.77507    1.0139718    23.574946    6.0715103    4.5510596    1.5204507 0.0012700547 -0.018745666    4.5685352 
+  104630    19.547219    1.0223121    23.821496    6.0643279    4.5313709     1.532957 0.0012588505 -0.018522068    4.5486341 
+  104640    19.659899    1.0210787    24.048409    6.0437012    4.5125936    1.5311076 0.0012584687 -0.018559767    4.5298949 
+  104650    17.236459    1.0037159    23.909973    6.0477255    4.5426536     1.505072 0.0013820605 -0.019007855    4.5602794 
+  104660    19.298832    1.0092854    23.629201    6.0512717    4.5378483    1.5134234 0.0013901947 -0.018929812     4.555388 
+  104670     19.50771    1.0160802    23.750845    6.0606588    4.5370465    1.5236123 0.0013947774 -0.019458202    4.5551099 
+  104680    19.531837    1.0100633    23.643257    6.0576113    4.5430213      1.51459 0.0013563131 -0.019373513    4.5610385 
+  104690    18.661697    1.0138781    23.885426    6.0479534    4.5276431    1.5203103 0.0011046714 -0.018063274    4.5446017 
+  104700    15.771224   0.97995067    23.584883    6.0183892    4.5489532     1.469436 0.00099559256 -0.018145127    4.5661027 
+  104710    19.332128    1.0122007    23.812516     6.027336     4.509541     1.517795 0.0010895151 -0.018434043    4.5268855 
+  104720    19.583345    0.9875154    23.442254    6.0145957    4.5338164    1.4807793 0.0012284287 -0.019309621    4.5518976 
+  104730    19.334879    0.9965441     23.69275    6.0220128     4.527695    1.4943179 0.0012808077 -0.019891887     4.546306 
+  104740    19.606056    1.0068152    23.841767    6.0515728    4.5418534    1.5097194 0.0011941264 -0.019753514    4.5604128 
+  104750     17.32714    1.0298166    23.572976    6.0716453    4.5274353      1.54421 0.0013340092 -0.020356826    4.5464581 
+  104760    19.412813     1.020822    23.506862    6.0917988    4.5610761    1.5307227 0.0012386453  -0.01953107    4.5793686 
+  104770     19.46636    1.0350417    23.878605     6.083284     4.531239     1.552045 0.0010091681 -0.018480419    4.5487103 
+  104780    19.481703    1.0024618    23.798855    6.0669815      4.56379    1.5031915 0.00096147335 -0.017935587    4.5807641 
+  104790    19.387212    1.0176024    23.691768    6.0707067    4.5448119    1.5258948 0.00095123709 -0.017732692    4.5615933 
+  104800    17.192082   0.99797381    23.651288    6.0524306    4.5559688    1.4964617 0.0010161711 -0.017791515    4.5727442 
+  104810    19.039932     1.012767    23.841242    6.0538998    4.5352557    1.5186441 0.0011984481 -0.018885978    4.5529433 
+  104820     19.31594   0.99936365    23.701527    6.0464403    4.5478945    1.4985458 0.0017297925 -0.021342559    4.5675072 
+  104830     19.46893    1.0213737    23.836495    6.0853705    4.5538206    1.5315499 0.0020311842 -0.022175462    4.5739649 
+  104840     19.80114    1.0227079    23.819391    6.0841677    4.5506173    1.5335504 0.0019972789 -0.021814727    4.5704347 
+  104850    17.481759    1.0142794    23.568845    6.0657058    4.5447938     1.520912 0.0021437277 -0.022920044    4.5655701 
+  104860    19.586758    1.0315578    23.663962    6.1036355    4.5568145    1.5468209 0.0021972306 -0.023594395    4.5782117 
+  104870    19.448291    1.0372749    23.648605    6.1019207     4.546527    1.5553937 0.0020331827  -0.02330383    4.5677976 
+  104880    19.687961    1.0321713    23.619758    6.0949113    4.5471704    1.5477409 0.0019588872 -0.023378245    4.5685898 
+  104890    19.623359    1.0157775    23.617681    6.0793812    4.5562229    1.5231583 0.0018750232 -0.022755716    4.5771036 
+  104900    17.265444    1.0169668    23.686901    6.0473704    4.5224286    1.5249418  0.001884114 -0.022489642    4.5430341 
+  104910      19.5242    1.0295916     23.69998    6.0758198    4.5319471    1.5438727 0.0018829986 -0.022215484    4.5522796 
+  104920    19.932216    1.0283105    23.553029    6.0764975    4.5345458    1.5419517 0.0018995365 -0.022465771     4.555112 
+  104930    19.754834    1.0277037    24.069022    6.0710892    4.5300476    1.5410416 0.0018358283 -0.022296796    4.5505086 
+  104940       19.766    1.0219864    23.675344    6.0864442    4.5539756    1.5324686 0.0019010685 -0.022701377    4.5747759 
+  104950    17.356305     1.021669    23.620476    6.0835724    4.5515797    1.5319927 0.0019191502 -0.023065057    4.5727256 
+  104960     19.31222    1.0170203    23.963818    6.0693648    4.5443429     1.525022 0.0019556652 -0.022938447    4.5653257 
+  104970    19.235086    1.0215565    23.852205    6.0848071    4.5529831     1.531824 0.0018705736 -0.022616618    4.5737291 
+  104980    19.659649    1.0206844    23.619736    6.0556075    4.5250913    1.5305162 0.0018188667 -0.022441911    4.5457143 
+  104990    19.440088    1.0212823    23.904029    6.0449821    4.5135693    1.5314128 0.0019135592 -0.022724238      4.53438 
+  105000    17.469715    1.0174279    23.906307    6.0185425    4.4929094    1.5256331 0.0019864981 -0.023181289    4.5141042 
+  105010    19.912843   0.99688185    23.791606    6.0139946    4.5191703    1.4948243 0.0020709273 -0.023555032    4.5406544 
+  105020    19.853577    1.0200277    23.762644    6.0635135    4.5339819    1.5295315 0.0021140502 -0.023894692    4.5557626 
+  105030     19.66024    1.0463517    23.806758    6.1049131    4.5359087    1.5690044  0.002076741 -0.024212283    4.5580443 
+  105040    19.741656    1.0209938    23.761574    6.0600678    4.5290877    1.5309801  0.001998713 -0.023956104     4.551045 
+  105050    17.745309     1.001621    23.768437     6.060012    4.5580812    1.5019308 0.0020550541 -0.023881625    4.5799078 
+  105060    19.610922    1.0278824    23.920918    6.0535433    4.5122337    1.5413096 0.0018372348 -0.022772198    4.5331687 
+  105070    19.492739     1.009987    23.855312    6.0458647    4.5313892    1.5144755 0.0018168049 -0.022699594     4.552272 
+  105080    19.475427    1.0176017    23.800566    6.0575865    4.5316928    1.5258937  0.001919948  -0.02322445    4.5529973 
+  105090    19.292479    1.0295187    23.860255    6.0812224    4.5374591    1.5437633 0.0020330811 -0.023659502    4.5590856 
+  105100    17.416417    1.0178108    23.825614    6.0769981    4.5507908    1.5262073 0.0019796198 -0.023418226    4.5722294 
+  105110    19.557871    1.0007434     23.83759    6.0546571    4.5540424    1.5006147  0.001915759 -0.022793433    4.5749201 
+  105120    19.808984    1.0231498    23.891553    6.0387108    4.5044977    1.5342131 0.0018854123 -0.022243018    4.5248553 
+  105130    19.715457   0.99082427    23.521437    6.0095494    4.5238084     1.485741 0.0019286117 -0.022170039    4.5440498 
+  105140    19.381443   0.99450033    23.736132    6.0094867    4.5182335    1.4912532  0.001772448 -0.021842556    4.5383036 
+  105150     17.13709    1.0066326    23.881914    6.0183698    4.5089242    1.5094456 0.0015953971 -0.021144547    4.5284734 
+  105160    19.666939   0.99230424    23.592848     6.029792    4.5418318    1.4879602 0.0017596826 -0.021867727    4.5619398 
+  105170    19.473685   0.98857113    23.656209    6.0157491    4.5333867    1.4823624 0.0017207235 -0.021806967    4.5534729 
+  105180     19.53061    1.0210608    23.623752     6.040661    4.5095803    1.5310807 0.0016034686  -0.02113873    4.5291156 
+  105190    19.327311    1.0000892    23.322805    6.0506104    4.5509766    1.4996338 0.0015413692 -0.020575757     4.570011 
+  105200    17.610294    1.0123324    23.482905     6.050493    4.5325006    1.5179925 0.0015146268 -0.020438069     4.551424 
+  105210    19.501229    1.0068304    24.025296    6.0443949    4.5346527    1.5097422  0.001517394 -0.020736353    4.5538717 
+  105220    19.571815     0.985966    23.723915    6.0097997    4.5313437     1.478456 0.0015980176 -0.021410828    4.5511565 
+  105230     19.60821   0.99562644    23.724183    6.0206699    4.5277281    1.4929418 0.0017590644 -0.022159522    4.5481285 
+  105240    19.664991    1.0026805    23.433805    6.0273075     4.523788    1.5035195 0.0018460371 -0.022304292    4.5442462 
+  105250    17.454197   0.99146037    23.452848    6.0258355    4.5391407    1.4866948 0.0016683512 -0.021593232    4.5590656 
+  105260    19.515915    0.9907244    23.775617    6.0227733    4.5371821    1.4855912 0.0015039257 -0.021175555    4.5568537 
+  105270    19.587766   0.99716867    23.729276    6.0437686    4.5485142    1.4952544 0.0014394159 -0.020635434    4.5677102 
+  105280    19.341394    1.0047214    23.831074    6.0600837    4.5535039    1.5065798 0.0014385861 -0.020354356    4.5724196 
+  105290    19.453758    1.0313906    23.698652    6.0560276    4.5094575    1.5465701 0.0013611527 -0.020244355    4.5283407 
+  105300     17.43134    1.0021456    23.715849    6.0308018    4.5280844    1.5027173 0.0014340991 -0.020689476    4.5473398 
+  105310    19.736872    1.0226646    24.043614    6.0690747    4.5355891    1.5334856 0.0015170915  -0.02121165    4.5552837 
+  105320    19.759923     1.030494    23.633339    6.0670163    4.5217905    1.5452257  0.001535775 -0.021219777    4.5414746 
+  105330    19.554051    1.0250812       23.458    6.0616602    4.5245509    1.5371093 0.0016889187 -0.021659279    4.5445213 
+  105340    19.534814    1.0036169    23.998414    6.0579423    4.5530188    1.5049235  0.001869069 -0.022299164    4.5734489 
+  105350    17.333011    1.0292007    23.851393    6.0581844     4.514898    1.5432865 0.0016831886 -0.021420979    4.5346358 
+  105360    19.351057    1.0017347    23.942827    6.0392932     4.537192    1.5021012 0.0017103772 -0.021454706    4.5569364 
+  105370    19.403709   0.99761415    23.590947    6.0408283    4.5449058    1.4959224 0.0016404665 -0.021290523    4.5645559 
+  105380    19.538031    1.0224367    23.847743    6.0618968     4.528753    1.5331438 0.0016297924 -0.021065364    4.5481886 
+  105390    19.373062    1.0086746    23.542412    6.0592615    4.5467539    1.5125075 0.0015002937 -0.020330761    4.5655844 
+  105400    17.346343    1.0175727    23.933392    6.0734508    4.5476006    1.5258503  0.001589211  -0.02064575    4.5666571 
+  105410    19.656611    1.0317245    23.678815    6.0832087    4.5361377     1.547071 0.0017591366 -0.021060644    4.5554392 
+  105420      19.6482    1.0075552    23.766286    6.0397437    4.5289146    1.5108291 0.0018860443  -0.02179558    4.5488241 
+  105430    19.656582    1.0179057    23.676869    6.0365445     4.510195    1.5263496 0.0019777233  -0.02254124    4.5307585 
+  105440     19.60343   0.99516416    23.762738    6.0435917    4.5513431    1.4922487 0.0017940941 -0.021563648    4.5711126 
+  105450    17.304332    1.0173557    23.783155    6.0448443    4.5193193    1.5255249 0.0013580076 -0.019762982    4.5377243 
+  105460    19.531241    1.0017245     23.61898    6.0451105    4.5430246    1.5020859 0.0013584384  -0.01971279     4.561379 
+  105470     19.34548    1.0090566    23.914263    6.0404035    4.5273231    1.5130803 0.0015224258 -0.020293542    4.5460942 
+  105480    19.250154    1.0205597    23.574264    6.0516739    4.5213447    1.5303292 0.0017008027 -0.021004228    4.5406481 
+  105490    19.398538    1.0183837    23.775015      6.04811    4.5210437    1.5270663 0.0019603572 -0.022072404    4.5411557 
+  105500    17.551981   0.99821866    23.820837    6.0187015    4.5218726    1.4968289  0.002110651 -0.023245713    4.5430077 
+  105510    19.774669    1.0024932    23.967562    6.0175198    4.5142812    1.5032386 0.0021194988 -0.023179559    4.5353413 
+  105520    19.550577   0.98775664    23.824128    6.0013514    4.5202103    1.4811411 0.0020014763 -0.022693598    4.5409024 
+  105530     19.49556   0.99900863    23.856736    6.0270837    4.5290702    1.4980134 0.0018695724 -0.022264145    4.5494648 
+  105540    19.575867    1.0162922    23.692663    6.0529905    4.5290604    1.5239301  0.001796298 -0.022204394    4.5494685 
+  105550    17.561177    1.0054739    23.837439    6.0448112    4.5371031    1.5077081 0.0016414788 -0.021272893    4.5567345 
+  105560    19.377327    1.0016153    23.756337    6.0280376    4.5261155    1.5019221 0.0014696012 -0.020434801    4.5450807 
+  105570     19.55472    1.0029608    23.474593    6.0362596    4.5323199    1.5039397 0.0012593918 -0.019325474     4.550386 
+  105580    19.728313    1.0067251    23.692807    6.0334072    4.5238229    1.5095843 0.0013467149  -0.01965083     4.542127 
+  105590    19.760035     1.010716    23.573352    6.0411181    4.5255495    1.5155686 0.0015874536 -0.020763663    4.5447257 
+  105600    17.414395   0.99938704    23.288786     6.024419    4.5258381    1.4985809 0.0017207364 -0.021222294    4.5453397 
+  105610    19.642514   0.97758229    23.999186    6.0105948    4.5447101    1.4658846 0.0019967194 -0.022974243    4.5656876 
+  105620    19.628257    0.9953675    23.514956      6.01219    4.5196365    1.4925536 0.0020459794  -0.02309581    4.5406863 
+  105630    19.461821    1.0065416    23.684968    6.0253944    4.5160853    1.5093091 0.0019152328  -0.02241369    4.5365838 
+  105640    19.565259   0.97540659    23.574765    6.0052617    4.5426395    1.4626222 0.0018622317 -0.022099072    4.5628764 
+  105650    17.186934   0.98051994     23.82787    6.0100902    4.5398006    1.4702896 0.0017902189 -0.021758502    4.5597689 
+  105660    19.340715    0.9789612     23.62761    5.9887915    4.5208391    1.4679523 0.0017859299 -0.022386534    4.5414397 
+  105670    19.264508   0.99210019    23.472424    5.9931753    4.5055211    1.4876542  0.001832422 -0.022567028    4.5262557 
+  105680    19.643467    1.0059805    23.724624    6.0186009    4.5101331    1.5084677 0.0018044342 -0.022715172    4.5310439 
+  105690    19.756781   0.99885004    23.777817    6.0315506     4.533775    1.4977756 0.0020844016  -0.02406447    4.5557551 
+  105700    17.658685    1.0150484    23.790137    6.0587932    4.5367281     1.522065 0.0019340854 -0.023440933     4.558235 
+  105710     19.55998    1.0040861    23.661484    6.0381156    4.5324885    1.5056271 0.0016960863 -0.022447109    4.5532395 
+  105720    19.263698    1.0231604    23.675058    6.0506572    4.5164282     1.534229 0.0017977155 -0.022754059    4.5373845 
+  105730    19.646663   0.99211426    23.628259      6.01326    4.5255846    1.4876753 0.0019652267 -0.022955005    4.5465744 
+  105740    19.341845   0.99265046    23.729738     6.023272    4.5347926    1.4884794 0.0019023976 -0.022782792     4.555673 
+  105750    17.499811   0.99280984    23.721191    5.9956753     4.506957    1.4887184 0.0019601285 -0.023096116    4.5280929 
+  105760    19.659399   0.97930278    23.813157    5.9880263    4.5195618    1.4684645 0.0021097386 -0.023653284    4.5411053 
+  105770    19.364287    1.0048881    23.824245    6.0183748    4.5115451    1.5068297  0.002031926 -0.023275094    4.5327882 
+  105780    19.605452    1.0217966    23.737541    6.0566243    4.5244402     1.532184 0.0019677568 -0.022691547     4.545164 
+  105790    19.591524    1.0022783    23.737387    6.0415721    4.5386558    1.5029163 0.0018692173 -0.022228054    4.5590146 
+  105800    17.443984    1.0031604      23.6531    6.0399078    4.5356688     1.504239 0.0019439955  -0.02219989    4.5559247 
+  105810    19.135992    1.0190248    24.109737    6.0618265    4.5337988    1.5280277 0.0019148912  -0.02199572    4.5538797 
+  105820    19.717552     1.021691    23.900309    6.0549571    4.5229315    1.5320256 0.0019033683 -0.021950287    4.5429784 
+  105830    19.595696    1.0243589    23.905336    6.0627244    4.5266982    1.5360262 0.0019085471 -0.022424064    4.5472137 
+  105840    19.529595    1.0046147    23.454938    6.0546711    4.5482513    1.5064198 0.0020757697 -0.023204717    4.5693803 
+  105850    17.490876    1.0216772     23.74454    6.0666656    4.5346606     1.532005 0.0021727324 -0.024115332    4.5566032 
+  105860    19.523063    1.0230557    23.896069    6.0835058    4.5494338     1.534072 0.0021931415 -0.024438213    4.5716789 
+  105870    18.961391    1.0348584    23.866897    6.0725794    4.5208092    1.5517702 0.0022213174  -0.02457425    4.5431621 
+  105880      19.4219   0.99815904    23.898071    6.0430244     4.546285    1.4967395 0.0019175045 -0.022996349    4.5673638 
+  105890    19.608783    1.0160743    23.518474    6.0602005    4.5365971    1.5236034 0.0017747361 -0.022278212    4.5571006 
+  105900    17.466704    1.0109851    23.629301    6.0674288    4.5514566    1.5159722 0.0016616957 -0.021996597    4.5717915 
+  105910     19.25935    1.0149098    23.779829    6.0565659    4.5347086    1.5218572 0.0017196683 -0.022137806    4.5551268 
+  105920    19.123149    1.0034257    23.522578    6.0491869    4.5445501    1.5046368 0.0016109893 -0.021390964    4.5643301 
+  105930    19.071733    1.0187966    24.062962    6.0699065    4.5422211    1.5276854 0.0014869498 -0.020565227    4.5612994 
+  105940    19.178062    1.0124729    23.780851    6.0552824    4.5370793    1.5182031 0.0015392062 -0.020605896     4.556146 
+  105950    17.142271    1.0073103     23.58617      6.07191    4.5614483    1.5104618 0.0015464995 -0.020744384    4.5806462 
+  105960    19.493919    1.0421125    23.925429    6.0795962    4.5169485    1.5626477 0.0016722599 -0.021611428    4.5368877 
+  105970    19.446076    1.0254075    24.028893    6.0723016    4.5347031    1.5375985 0.0019785563 -0.022772451     4.555497 
+  105980    19.666566    1.0090304    23.813721    6.0379013    4.5248602    1.5130411 0.0020834498  -0.02334418    4.5461209 
+  105990    19.739719    1.0138673    23.820634    6.0660483    4.5457542    1.5202941 0.0019243742 -0.022641584    4.5664714 
+  106000    17.372515    1.0068383    23.666524    6.0473782    4.5376242     1.509754 0.0017956737 -0.022651334    4.5584799 
+  106010    19.120764    1.0228099    24.002643    6.0493346    4.5156311    1.5337035 0.0017007736 -0.022402443    4.5363328 
+  106020    19.371542    1.0062576      23.9002    6.0528018    4.5439184    1.5088833 0.0017421089 -0.022134974    4.5643113 
+  106030    19.625141   0.98158054    23.675695    6.0234988    4.5516188      1.47188 0.0018236432 -0.022019012    4.5718141 
+  106040    19.576294   0.99383941      23.8222    6.0363741    4.5461119    1.4902622 0.0017447376 -0.021801834     4.566169 
+  106050     17.65844    1.0160328    23.901844    6.0308731    4.5073319    1.5235413 0.0017258186 -0.021837605    4.5274437 
+  106060    19.616292    1.0270261    24.077746     6.062916    4.5228904    1.5400257 0.0015934388  -0.02113393    4.5424308 
+  106070    19.609889    1.0058887    23.729131     6.050915    4.5425848    1.5083301 0.0015466523 -0.021326061    4.5623642 
+  106080    19.357567    1.0035997    23.603104    6.0461838     4.541286    1.5048978 0.0017679672 -0.022492407    4.5620104 
+  106090    19.402265    1.0227019    23.790593    6.0589581    4.5254166    1.5335415 0.0018264653 -0.022434563    4.5460247 
+  106100    16.964095     1.007168    23.529077    6.0659423    4.5556939    1.5102484 0.0017915224 -0.022056505    4.5759589 
+  106110    18.887285    1.0181427    23.796341    6.0736845    4.5469795     1.526705 0.0017645506 -0.021872975    4.5670879 
+  106120    19.403792     1.030009    23.841423    6.0896984    4.5451999    1.5444985 0.0018935508 -0.022832155    4.5661385 
+  106130    19.628366    1.0267792     23.38927    6.0776462    4.5379908    1.5396555 0.0018434762 -0.022338545    4.5584858 
+  106140    19.624314    1.0238598     23.69011     6.072022    4.5367442    1.5352778 0.0017373964 -0.021985406    4.5569922 
+  106150    17.400929    1.0033276    23.657875     6.042721    4.5382312    1.5044898 0.0015909368 -0.021220188    4.5578604 
+  106160    19.458957   0.99053047    23.530676    6.0253297    4.5400292    1.4853004 0.0016921311 -0.021700941     4.560038 
+  106170    19.456998   0.98541709    23.605606    6.0048196    4.5271867    1.4776329 0.0018245602 -0.022352699    4.5477148 
+  106180    19.363827   0.98266665    23.736298    6.0137968    4.5402882    1.4735086 0.0019728458 -0.022847028    4.5611623 
+  106190    19.808725   0.98154547    23.707479     5.986334    4.5145065    1.4718274 0.0019157053 -0.022891477    4.5354823 
+  106200      17.4597   0.98596868    23.931808    5.9950427    4.5165827      1.47846  0.001656426 -0.021298058    4.5362243 
+  106210    19.364623   0.97479851    23.921416    5.9876058    4.5258955    1.4617104 0.0013770542 -0.020342183    4.5448606 
+  106220    19.343331   0.97988388    23.807491    5.9899748    4.5206389    1.4693359 0.0011169726 -0.019291521    4.5388134 
+  106230    19.498932   0.99624758    23.797059    6.0191559    4.5252826    1.4938733 0.0011791977 -0.019242847    4.5433463 
+  106240    19.477287   0.99841472    24.011909      6.02355    4.5264272    1.4971229 0.0012503978 -0.019574629    4.5447514 
+  106250    17.534508    1.0053882    23.884225     6.046105    4.5385253    1.5075797 0.0013881959 -0.020511334    4.5576484 
+  106260    19.797876    1.0113708    23.801336    6.0308092    4.5142587    1.5165505 0.0015015907 -0.020933683    4.5336908 
+  106270    19.716572    1.0105907    23.807877    6.0390043    4.5236235    1.5153808 0.0015569541 -0.021145644    4.5432122 
+  106280    19.716676    1.0056812    23.592391     6.049772    4.5417531    1.5080189 0.0015244072 -0.021357001    4.5615857 
+  106290    19.400926    1.0231075    23.501219    6.0552521    4.5211023    1.5341497 0.0015252124 -0.021134874     4.540712 
+  106300    17.282148    1.0015095    23.726701     6.060285    4.5585216    1.5017634 0.0016553676 -0.021637832     4.578504 
+  106310    19.250694   0.99116177    23.631405    6.0211657    4.5349186    1.4862471 0.0015381134 -0.021284021    4.5546645 
+  106320    19.571909    1.0002356    23.532192    6.0283477    4.5284945    1.4998532 0.0016588028 -0.021650086    4.5484858 
+  106330    19.557045   0.98804401    23.996676    6.0265842    4.5450122     1.481572 0.0016666109 -0.021911365    4.5652569 
+  106340    19.068177   0.98769813    23.680605    6.0110796    4.5300263    1.4810533 0.0015496523 -0.021223067    4.5496997 
+  106350    17.130064    1.0059656    23.583014     6.040158    4.5317125    1.5084455  0.001414264 -0.020619744     4.550918 
+  106360    19.570317    1.0066313    23.800717    6.0548625    4.5454188    1.5094437 0.0013334265 -0.020054194    4.5641396 
+  106370    19.398988    1.0271501    23.984866    6.0709977    4.5307862    1.5402115 0.0014462502 -0.020213248    4.5495532 
+  106380    19.535098    1.0180631     23.72966    6.0645094    4.5379238    1.5265857 0.0015404848 -0.020621995    4.5570053 
+  106390    19.725121    1.0081426    23.679653    6.0655023    4.5537925    1.5117098 0.0015337433 -0.020882844    4.5731416 
+  106400     17.33229    1.0004502    23.754375    6.0382265    4.5380514     1.500175 0.0017140816 -0.021259547    4.5575969 
+  106410     19.67007    1.0124551    23.608343    6.0516881    4.5335116    1.5181764  0.001782284 -0.021426206    4.5531556 
+  106420    19.722093    1.0139863    23.718959    6.0504309    4.5299585    1.5204724 0.0017205166 -0.021082484    4.5493205 
+  106430    19.591077    1.0041208    24.089714    6.0486968    4.5430177    1.5056791 0.0016627099 -0.020935215    4.5622902 
+  106440    19.961073     1.016408    23.549536    6.0304627    4.5063589    1.5241038 0.0015630332 -0.020387841    4.5251837 
+  106450    17.601061    1.0064439     23.57865    6.0436507    4.5344881    1.5091626 0.0016570907 -0.020805887    4.5536369 
+  106460    19.740535     1.002237    23.684623    6.0507193     4.547865    1.5028543 0.0017592532 -0.021848863    4.5679546 
+  106470    19.708004   0.99511678    23.664551    6.0446919    4.5525142    1.4921776  0.001825324 -0.021999384    4.5726883 
+  106480    19.676307    1.0139349    23.919784    6.0264508    4.5060554    1.5203954 0.0017964927 -0.021676695    4.5259356 
+  106490    19.367898   0.98705459    23.810853    6.0367777    4.5566893    1.4800884 0.0016983766 -0.021377453    4.5763684 
+  106500    17.473765     1.018623    23.696785    6.0442986    4.5168734    1.5274252 0.0017070368 -0.021656518    4.5368228 
+  106510    19.608028    1.0210796    23.823616    6.0540204    4.5229116    1.5311088 0.0016216411 -0.021822915    4.5431128 
+  106520    19.302393    1.0108727    23.540247    6.0419452    4.5261417    1.5158035 0.0016910176 -0.021869401      4.54632 
+  106530    19.620998    1.0275201    23.688014    6.0805067    4.5397403    1.5407663 0.0018811392 -0.022536048    4.5603953 
+  106540    19.816837    1.0298726    23.863234    6.0620828    4.5177888     1.544294 0.0018136365 -0.022265103    4.5382402 
+  106550    17.455205    1.0020499    23.883851    6.0619073    4.5593334    1.5025739 0.0016028021 -0.021446615    4.5791772 
+  106560    19.545017    1.0221529    23.798248    6.0668196    4.5341013    1.5327183 0.0016323822 -0.021484997    4.5539539 
+  106570    19.351211     1.023911    23.728427     6.076906    4.5415514    1.5353546 0.0017361679 -0.022166751     4.561982 
+  106580    19.238578    1.0304039    23.595373    6.0897895    4.5446989    1.5450906 0.0016836101 -0.022358755    4.5653741 
+  106590    19.259828    1.0371072    23.956717    6.1135579    4.5584156    1.5551423 0.0015003328 -0.021524415    4.5784397 
+  106600    17.206942    1.0335587    23.802758    6.0902831    4.5404619    1.5498212 0.0015649475  -0.02154835    4.5604453 
+  106610    19.615138    1.0312258    23.712416     6.085234    4.5389109    1.5463231  0.001639511  -0.02166566     4.558937 
+  106620    19.635607    1.0276695    23.688645    6.0808043     4.539814    1.5409904  0.001813556 -0.022903166    4.5609036 
+  106630    19.536544    1.0129338    23.762247    6.0904296    4.5715354    1.5188942 0.0021014504 -0.023893332    4.5933273 
+  106640    19.704723    1.0218671     23.65236    6.0540054    4.5217157    1.5322897 0.0022429652 -0.024012616    4.5434854 
+  106650    17.524407   0.99765425    23.656754    6.0302535    4.5342709    1.4959826 0.0022552701 -0.024041519    4.5560572 
+  106660    19.682954    1.0165192    23.876322    6.0508603    4.5265898    1.5242705 0.0024214374 -0.024628214    4.5487965 
+  106670    19.349023    1.0231466    24.025319    6.0482167    4.5140085    1.5342083 0.0022836505 -0.023905769    4.5356306 
+  106680    19.451752    1.0241162    23.858162     6.079596    4.5439338    1.5356622 0.0021713931 -0.023683585     4.565446 
+  106690    19.236439    1.0323591    23.794423    6.0929012    4.5448787    1.5480225 0.0019130945  -0.02232621    4.5652918 
+  106700    17.484048    1.0302117    23.649078    6.0625758    4.5177735    1.5448024 0.0018322038 -0.021513267    4.5374545 
+  106710    19.461449     1.013293    23.789173    6.0679859    4.5485531    1.5194328 0.0016844569 -0.020843801    4.5677124 
+  106720     19.50567    1.0276915    24.195117    6.0497313    4.5087079    1.5410235 0.0015514826 -0.020357959    4.5275144 
+  106730     19.45317    1.0323312    23.751294     6.088652    4.5406714    1.5479807 0.0016211892 -0.021212049    4.5602622 
+  106740    19.398354    1.0208645    23.743396    6.0945876    4.5638014    1.5307863 0.0014550672 -0.021022735     4.583369 
+  106750    17.514329    1.0309325    23.714955    6.0776641    4.5317807    1.5458833 0.0013375522 -0.020752412    4.5511956 
+  106760    19.417767     1.028838    23.790964     6.084191    4.5414484    1.5427426 0.0014150369 -0.021477211    4.5615106 
+  106770    19.387045     1.023969    23.486118    6.0831935     4.547752    1.5354415 0.0016279562 -0.022507916    4.5686319 
+  106780    19.499724     1.018814    24.137486    6.0802398    4.5525282    1.5277116 0.0016280189 -0.022149385    4.5730495 
+  106790    19.599396    1.0311897    23.630417    6.1084437    4.5621748     1.546269 0.0015801532 -0.021924394     4.582519 
+  106800    17.347842    1.0086176    23.679045     6.069851     4.557429     1.512422 0.0014683291 -0.021251424    4.5772121 
+  106810     19.71678    1.0235655    23.721726    6.0955283    4.5606918    1.5348364 0.0013860412 -0.020978848    4.5802847 
+  106820    19.520194    1.0480083    23.682053    6.1230096    4.5515212    1.5714884 0.0012248564 -0.020264434    4.5705608 
+  106830    19.375034    1.0475519    23.781627    6.1112275    4.5404234    1.5708041 0.0013106862  -0.02043759    4.5595503 
+  106840    19.714239    1.0392257    24.025022    6.1188929     4.560574    1.5583189 0.0015236284 -0.021256624    4.5803069 
+  106850    17.336292    1.0499276    23.950001    6.1304816    4.5561152    1.5743664 0.0015629467 -0.021310837    4.5758631 
+  106860    19.686616    1.0282755    23.837007    6.0925325    4.5506334    1.5418991 0.0016273665 -0.021932946     4.570939 
+  106870    19.762132    1.0166421    23.362372    6.0731442    4.5486894    1.5244548 0.0016051667 -0.021848401    4.5689326 
+  106880    19.756552    1.0053784    23.754041    6.0596083    4.5520434    1.5075649 0.0016752725  -0.02204557    4.5724137 
+  106890      19.5676    1.0283915    23.676703    6.0715438    4.5294707     1.542073 0.0016479477 -0.021689042    4.5495118 
+  106900    17.234089    1.0077583    23.917354    6.0569956     4.545862    1.5111336 0.0016657676 -0.021368687    4.5655649 
+  106910    19.396453    1.0051297     23.58171    6.0510753    4.5438833     1.507192 0.0019034593 -0.022369771    4.5643496 
+  106920    19.525443    1.0163904    24.053648    6.0383581    4.5142807    1.5240774 0.0020252406 -0.023527034    4.5357825 
+  106930    19.387012     1.000455    23.745624    6.0405369    4.5403547    1.5001822 0.0020906808 -0.023982623    4.5622466 
+  106940    19.247798    1.0217268    24.011146     6.057605    4.5255256    1.5320794 0.0021267182 -0.024360676    4.5477595 
+  106950    17.393826    1.0207833     23.92778    6.0472843    4.5166198    1.5306645 0.0020497815 -0.023299096    4.5378691 
+  106960     19.72573    1.0169192    23.690391    6.0594106    4.5345402    1.5248704 0.0019406875 -0.022637716    4.5552372 
+  106970    19.600119    1.0236721    23.552042    6.0787839    4.5437877    1.5349963 0.0021510958 -0.023396116    4.5650327 
+  106980    19.272463    1.0227345    23.963531    6.0863675    4.5527772    1.5335904 0.0021868555  -0.02359226    4.5741826 
+  106990     19.66487    1.0058974    23.746715    6.0535891    4.5452459    1.5083432  0.002046229 -0.022818936    4.5660186 
+  107000    17.205668    1.0176666    23.757943    6.0518207    4.5258296    1.5259911  0.001916045 -0.022401461     4.546315 
+  107010    19.522217    1.0202342    23.886415    6.0496397    4.5197985    1.5298412 0.0019918053 -0.022647931    4.5404547 
+  107020    19.205838      1.00297    23.425395    6.0159669    4.5120134    1.5039536 0.0018702156 -0.022098546    4.5322417 
+  107030     19.60023    1.0110232     23.81276    6.0459678    4.5299385    1.5160293 0.0018328728 -0.022124262    4.5502299 
+  107040    19.300266    1.0217795    23.746097    6.0542458    4.5220875    1.5321583 0.0017078032  -0.02154795    4.5419276 
+  107050    17.650838    1.0138391    23.942306     6.080087    4.5598353    1.5202517  0.001742189 -0.021827509    4.5799206 
+  107060    19.659168    1.0146145    23.358029     6.053229    4.5318145    1.5214144 0.0017460315 -0.022157988    4.5522265 
+  107070    19.417684    1.0043917    23.657463    6.0588067    4.5527214    1.5060853 0.0017043126 -0.021845288    4.5728624 
+  107080    19.495031   0.99840642     23.66984    6.0317346    4.5346241    1.4971104 0.0017140807 -0.021938999    4.5548491 
+  107090    19.579093   0.98974268     23.91608    6.0283295    4.5442104    1.4841191 0.0016210775  -0.02131282    4.5639021 
+  107100    17.561302   0.98244239    23.666184    5.9995901    4.5264177    1.4731724 0.0015681802  -0.02114999    4.5459995 
+  107110      19.6015   0.99625344    23.856325    6.0149714    4.5210894     1.493882 0.0016285573 -0.021368651    4.5408295 
+  107120     19.60692   0.97918907    23.524451    6.0061236    4.5378296     1.468294 0.0016252507 -0.021336459    4.5575408 
+  107130    19.489863   0.99875516    23.821031    6.0247131    4.5270797    1.4976334  0.001509768 -0.020783218    4.5463531 
+  107140    19.391504    1.0114229    23.842624    6.0348862    4.5182576    1.5166286 0.0015377788 -0.021048378    4.5377682 
+  107150    17.274398    1.0193988    23.596166    6.0613857    4.5327972    1.5285885 0.0017277512 -0.022246491    4.5533159 
+  107160    19.627887    1.0077596    23.611501    6.0488446    4.5377091    1.5111355 0.0017564264  -0.02228714    4.5582399 
+  107170    19.472143    1.0038659     23.76789    6.0332742    4.5279772    1.5052969  0.001704806 -0.021653895    4.5479263 
+  107180    19.407869   0.99136045    23.501198    6.0255665    4.5390215     1.486545 0.0016630042 -0.021554882    4.5589133 
+  107190    19.670988    1.0121883     23.76019    6.0517366    4.5339602    1.5177764 0.0016502531 -0.022022856    4.5543328 
+  107200    17.604472    1.0095213    23.838103    6.0366085    4.5228314    1.5137771 0.0017294948 -0.022226483    4.5433284 
+  107210    19.516535   0.99808503    23.635727     6.007344    4.5107155    1.4966285 0.0016864918 -0.021255407    4.5302844 
+  107220    19.464111   0.97180133    23.852765    5.9817122    4.5244961    1.4572161 0.0015871495 -0.020823373    4.5437323 
+  107230    19.301447   0.98861204     23.56749    6.0144211    4.5319973    1.4824238 0.0016816761 -0.021227963    4.5515436 
+  107240    19.505331   0.97923926    23.593723    6.0008827    4.5325134    1.4683693 0.0017376866 -0.021580407    4.5523561 
+  107250    17.579307   0.97435102    23.701204    5.9988114     4.537772    1.4610393 0.0019822784 -0.022988236     4.558778 
+  107260    19.753361     1.007503    23.787614    6.0300093    4.5192585    1.5107507 0.0021240696   -0.0238368    4.5409713 
+  107270    19.349993    1.0091112    23.760203    6.0401671    4.5270048    1.5131622 0.0020784957  -0.02401641    4.5489428 
+  107280    19.736435    1.0032746    23.805448    6.0377297    4.5333193    1.5044103 0.0020352475  -0.02420997     4.555494 
+  107290    19.509151    1.0078202     23.70493    6.0391469    4.5279206    1.5112263 0.0020073728 -0.024081834     4.549995 
+  107300    17.576921    1.0137446    23.885846    6.0366438    4.5165338      1.52011 0.0018319931 -0.022975987    4.5376778 
+  107310     19.53722    1.0123279    23.649022    6.0405875    4.5226018    1.5179857 0.0020368544 -0.023813815    4.5443787 
+  107320    19.459117     1.016853    23.452994    6.0636841    4.5389131     1.524771 0.0022468552 -0.024568579    4.5612348 
+  107330     19.56931   0.99979496    23.937435     6.047942    4.5487494    1.4991925 0.0022470591 -0.024386719    4.5708891 
+  107340    19.731588    1.0126641    23.728422     6.045331    4.5268412    1.5184898  0.002309687 -0.024507216    4.5490388 
+  107350    17.450927    1.0006193    23.754213    6.0534548    4.5530261    1.5004287 0.0022561735 -0.024038591    4.5748085 
+  107360     19.58975    1.0181604    23.878004    6.0593973    4.5326659    1.5267315 0.0020602246 -0.022815703    4.5534213 
+  107370    19.512821    1.0136835    23.735887     6.050856    4.5308376    1.5200184 0.0022511215  -0.02310716    4.5516937 
+  107380    19.555112     1.008316    23.585372    6.0607305    4.5487607    1.5119698 0.0022038726 -0.023104678    4.5696615 
+  107390    19.319269    1.0281385    23.849779    6.0913598     4.549666    1.5416937 0.0022303804 -0.023181342     4.570617 
+  107400    17.092132     1.031924    23.873533    6.0851338    4.5377637    1.5473701 0.0021566223 -0.022970194    4.5585773 
+  107410    19.586999    1.0386942    23.836549     6.090802      4.53328     1.557522 0.0019481247 -0.022308366    4.5536403 
+  107420    19.684698    1.0231053    23.750271     6.074914    4.5407676    1.5341464 0.0021603352  -0.02308588    4.5616932 
+  107430    19.372914    1.0012456    23.654748    6.0731161    4.5717483    1.5013677 0.0021684869  -0.02349689    4.5930767 
+  107440    19.569391   0.99520244     23.46717    6.0792131     4.586907    1.4923061 0.0021022347 -0.023415876    4.6082207 
+  107450    17.361317    1.0274043    23.725889    6.0880059    4.5474132    1.5405927 0.0020866658 -0.023418358    4.5687449 
+  107460    19.560651    1.0291476    23.583054    6.0718817    4.5286748    1.5432069 0.0021390597 -0.024050567    4.5505863 
+  107470    19.687142    1.0088178    23.770164    6.0690487    4.5563264    1.5127223 0.0022754411 -0.024656978    4.5787079 
+  107480    19.618056     1.006756    23.579968    6.0588902    4.5492597    1.5096306 0.0020392216 -0.023837345    4.5710578 
+  107490     19.61262    1.0200354    23.782105     6.067599     4.538056     1.529543 0.0018219144 -0.022618795    4.5588528 
+  107500    17.455244    1.0098249    23.585577     6.054986    4.5407536    1.5142324  0.001753752 -0.022444332    4.5614442 
+  107510    19.373899    1.0165055    23.804078    6.0565629    4.5323128    1.5242501 0.0017006689 -0.021864308    4.5524765 
+  107520    19.406174    1.0174692    23.785713    6.0410179    4.5153229     1.525695 0.0017837551 -0.022468215    4.5360073 
+  107530    19.094302    1.0187912    23.514066    6.0783634     4.550686    1.5276774   0.00185853  -0.02301096    4.5718384 
+  107540    19.286757    1.0218492    23.653263    6.0618382    4.5295753    1.5322629 0.0018455286 -0.022846426    4.5505762 
+  107550    17.531988    1.0031682    23.688134    6.0543503    4.5500996    1.5042507 0.0017588791 -0.022473297     4.570814 
+  107560    19.894661    1.0135302    23.523236    6.0577809    4.5379924    1.5197885 0.0015951752 -0.021260015    4.5576573 
+  107570    19.783977    1.0087946    23.728542    6.0791143    4.5664268    1.5126874 0.0015755881 -0.020556923    4.5854082 
+  107580    19.600789    1.0084669    23.730026    6.0458916    4.5336954    1.5121961 0.0015865663 -0.020769663    4.5528785 
+  107590    19.664944    1.0091933    23.740033    6.0192649    4.5059796    1.5132853 0.0016677481 -0.020972455    4.5252843 
+  107600    17.152371    1.0248516    23.776954    6.0539659    4.5172009     1.536765 0.0016500273 -0.020851928    4.5364028 
+  107610     19.32722    1.0028403    23.833249     6.062274    4.5585149    1.5037591 0.0015836184 -0.020574542    4.5775058 
+  107620    19.494005    1.0079711     24.05859    6.0663166    4.5548639    1.5114527 0.0015448288 -0.020531425    4.5738505 
+  107630    19.669281    1.0224675    23.773824    6.0726746    4.5394846      1.53319 0.0015130169 -0.020737942    4.5587096 
+  107640     19.68743    1.0381013    24.072297    6.0804047    4.5237719    1.5566329 0.0016994587 -0.021784643     4.543857 
+  107650    17.118304     1.017709    23.820093    6.0802276    4.5541729    1.5260547 0.0017921767 -0.022869585    4.5752503 
+  107660    19.495541    1.0198058    23.857648    6.0473433    4.5181445    1.5291987 0.0019541169  -0.02363569    4.5398261 
+  107670    19.457911     1.009308    23.667177    6.0540318    4.5405746    1.5134573 0.0019968167 -0.023546352    4.5621241 
+  107680    19.593463   0.99410962    23.646649     6.046078    4.5554106    1.4906674 0.0019943417 -0.023623137    4.5770394 
+  107690    19.539325    1.0219116     23.50439    6.0717646    4.5394081    1.5323565 0.0021423664 -0.024024782    4.5612905 
+  107700    17.503913    1.0104322    23.791144    6.0607293    4.5455863     1.515143   0.00214802 -0.024183048    4.5676214 
+  107710    19.391867    1.0169994    23.592067    6.0549058    4.5299152    1.5249906 0.0020057565 -0.023697917    4.5516074 
+  107720    19.354262    1.0272727      23.9007    6.0699877    4.5295923    1.5403954  0.001985938 -0.023589967    4.5511963 
+  107730    19.401147    1.0135885    23.681891    6.0584659      4.53859     1.519876 0.0017436824 -0.022412684     4.559259 
+  107740    18.518729    1.0074765    23.728786     6.020198    4.5094869    1.5107111 0.0016962424 -0.021967983    4.5297586 
+  107750    15.234914   0.99676952    23.802935    6.0138638    4.5192079    1.4946559 0.0015823533 -0.021347754    4.5389733 
+  107760    19.674487    1.0060224      23.3631    6.0360419    4.5275113    1.5085306 0.0015806443 -0.020977687    4.5469084 
+  107770    19.503786    1.0051813    23.882164    6.0232809    4.5160116    1.5072694 0.0016518811 -0.020994795    4.5353545 
+  107780    19.649066   0.98307228    23.488071    6.0117832    4.5376663    1.4741169 0.0017401693 -0.021108166    4.5570343 
+  107790    19.515445   0.99753138    23.879024    6.0105727    4.5147744    1.4957983 0.0017718724 -0.021539667    4.5345422 
+  107800    17.367498   0.99049005    23.705523    6.0187379    4.5334981    1.4852398  0.001818579 -0.021457038    4.5531365 
+  107810    19.504884   0.99920467    23.556789    6.0314854     4.533178    1.4983074 0.0017016087 -0.021304626     4.552781 
+  107820    19.712073    1.0117687    24.039718    6.0380703    4.5209232    1.5171472  0.001676681 -0.021015794    4.5402623 
+  107830    19.593904    1.0173818     23.87365    6.0415181    4.5159542    1.5255639 0.0016861479 -0.021293618    4.5355616 
+  107840    19.459549    1.0202077    23.557381    6.0422097    4.5124083    1.5298014 0.0017014037 -0.021614238    4.5323211 
+  107850    17.379611    1.0073511     23.54394    6.0335599     4.523037    1.5105229 0.0017812365 -0.022316416    4.5435722 
+  107860    19.409335   0.99773499    23.841022    6.0287208    4.5326172    1.4961036 0.0016945199 -0.021566931    4.5524896 
+  107870    19.524815   0.98728663    23.618636    5.9986242    4.5181879    1.4804363 0.0015288872 -0.020802985     4.537462 
+  107880    19.498337     1.010048    23.551902    6.0000732    4.4855063    1.5145669 0.0014632806 -0.020586647    4.5046297 
+  107890    19.545455   0.99916157     24.04027    6.0322842    4.5340414    1.4982428 0.0014771512 -0.020591716     4.553156 
+  107900    17.406545    1.0237007    23.578783    6.0797802     4.544741    1.5350393 0.0018216766 -0.021939339    4.5648586 
+  107910    19.587202    1.0431545    24.022005    6.1023641    4.5381538    1.5642102  0.002133654 -0.023266672    4.5592868 
+  107920    19.592344    1.0248059    23.732522    6.0892997    4.5526032    1.5366965  0.002147065 -0.023733998    4.5741902 
+  107930    19.653942    1.0303212    23.804796    6.0675156     4.522549    1.5449666 0.0020416973 -0.023509315    4.5440166 
+  107940    19.719829     1.028412    23.626578    6.0837212    4.5416173    1.5421039 0.0019915593 -0.023167694    4.5627934 
+  107950    17.131152    1.0318334    23.657801    6.0943627    4.5471285    1.5472343 0.0017876535 -0.022277636    4.5676185 
+  107960     19.19417    1.0303821    23.910139    6.0731496    4.5280915     1.545058 0.0017810416 -0.022270156    4.5485807 
+  107970    19.203852    1.0142688     23.78051    6.0488651    4.5279691     1.520896 0.0017340415 -0.021858064    4.5480931 
+  107980    19.371246   0.99689573    24.002773    6.0482911     4.553446    1.4948452 0.0016933314 -0.021458483    4.5732111 
+  107990    19.456068    1.0114335    23.813247    6.0649364    4.5482918    1.5166446 0.0016648942  -0.02114596    4.5677729 
+  108000    17.315514    1.0248404    24.318919    6.0778243    4.5410761    1.5367481 0.0015750113 -0.020807496    4.5603086 
+  108010    19.559047    1.0100926    23.577413    6.0885288     4.573895    1.5146338  0.001358591 -0.019890351    4.5924268 
+  108020     19.72412    1.0104523     23.74385    6.0635467    4.5483735    1.5151732 0.0012140475 -0.019372909    4.5665323 
+  108030    19.598279    1.0477972    23.864211    6.0842975    4.5131256    1.5711719 0.0012863341 -0.019629311    4.5314686 
+  108040    19.531358    1.0172885    23.830221    6.0674348    4.5420107    1.5254241 0.0013661329 -0.019820858    4.5604654 
+  108050    17.198761    1.0170362     23.59234    6.0682059    4.5431601    1.5250458 0.0013794474 -0.019581594    4.5613622 
+  108060     19.57273     1.028557    23.764273    6.0543565    4.5120353    1.5423212 0.0012376266 -0.018578526    4.5293762 
+  108070    19.545761   0.99787711    23.547371    6.0745845    4.5782677    1.4963167 0.0012889354 -0.018689832    4.5956686 
+  108080    19.786973    1.0266146    23.824567    6.0850375    4.5456288    1.5394086 0.0013745228 -0.018994397    4.5632487 
+  108090    19.598402     1.007902    23.831138    6.0689802    4.5576312     1.511349 0.0012596284 -0.018892943    4.5752645 
+  108100    17.398721    1.0165318    23.641735    6.0497378    4.5254483    1.5242895  0.001183819 -0.018711279    4.5429758 
+  108110    19.804995    0.9930219    23.520433     6.031025    4.5419886    1.4890363 0.0012990913 -0.019314728    4.5600043 
+  108120    19.576121   0.97492086    23.494197     6.009339    4.5474451    1.4618938 0.0013997457 -0.020157735    4.5662031 
+  108130    19.744165   0.98025275    23.663087    5.9883555    4.5184665     1.469889 0.0013384745 -0.019715939     4.536844 
+  108140    19.531685    1.0022024    23.383467    6.0125436     4.509741    1.5028025 0.0013335713 -0.019804331    4.5282118 
+  108150    17.198875   0.99173766    23.676484    6.0389775    4.5518669    1.4871106 0.0013241301 -0.019768586    4.5703113 
+  108160    19.748622   0.99997155    23.520914     6.035659    4.5362017    1.4994573 0.0011567164 -0.019153634    4.5541986 
+  108170    19.884014    1.0237135    23.591258    6.0428379    4.5077795    1.5350584 0.0011522796  -0.01875294    4.5253802 
+  108180    19.379706    1.0112385      23.6592    6.0606611     4.544309    1.5163521 0.0011429077 -0.018537323    4.5617034 
+  108190    19.604939    1.0197322    23.825018    6.0699273    4.5408389    1.5290884 0.0010097322 -0.017979629    4.5578088 
+  108200    17.403581    1.0346737    23.632255    6.0821544    4.5306612    1.5514932 0.0010316837 -0.018207931    4.5478374 
+  108210    19.574027    1.0144202    23.634958    6.0609808    4.5398578     1.521123 0.0011153907 -0.019410117    4.5581525 
+  108220    19.387558    1.0088793    23.527105    6.0460463    4.5332317    1.5128146 0.0010828586   -0.0195809    4.5517298 
+  108230    19.567706    1.0366474    23.668864    6.0880172    4.5335644    1.5544528 0.0012786056 -0.020585234    4.5528711 
+  108240     19.81564    1.0079651    23.609521    6.0643451    4.5529014    1.5114436 0.0016468988 -0.022051248    4.5733058 
+  108250    17.336972    1.0028711    23.642884    6.0501418    4.5463366    1.5038052 0.0017344356 -0.022267247    4.5668694 
+  108260    19.545016    1.0225674    23.760526    6.0623702    4.5290304    1.5333397 0.0017095736 -0.021741927    4.5490628 
+  108270    19.540226    1.0118937    23.678663     6.052955    4.5356203    1.5173346 0.0018205185 -0.022156348    4.5559562 
+  108280    19.555685    1.0100483    23.559672    6.0732807    4.5587133    1.5145674 0.0019195899 -0.022710534    4.5795043 
+  108290     19.47474     1.024267    23.703489    6.0806297    4.5447413    1.5358884 0.0018158405 -0.022470307    4.5653958 
+  108300    17.631036    1.0172676    23.582454    6.0733329    4.5479402    1.5253927 0.0017738602 -0.021867376    4.5680337 
+  108310    19.407132    1.0099008    23.745106     6.050857    4.5365108    1.5143462 0.0018096708 -0.021645999    4.5563471 
+  108320    19.437198    1.0213797    23.771159    6.0610914    4.5295326    1.5315589 0.0018789408 -0.021896789    4.5495504 
+  108330     19.54336    1.0233831    23.709119    6.0735495    4.5389866    1.5345629 0.0019596412 -0.022666849    4.5596938 
+  108340    19.217955    1.0277816    23.743149    6.0845442    4.5433857    1.5411585 0.0019459105 -0.022764754    4.5642046 
+  108350     17.37057    1.0298291    24.220674    6.0941942    4.5499655    1.5442287 0.0018330199 -0.022376592     4.570509 
+  108360    19.382112    1.0101601    23.891488     6.097608    4.5828728    1.5147351 0.0017585259  -0.02190632    4.6030206 
+  108370     19.63657    1.0485224    23.977966    6.1219739    4.5497146    1.5722593 0.0015503483 -0.020828414    4.5689927 
+  108380    19.547335    1.0557591    23.750278    6.1280127    4.5449019    1.5831108 0.0014485448 -0.019975905    4.5634293 
+  108390    19.721012    1.0535974    23.647306    6.1442106    4.5643414    1.5798693 0.0014759345 -0.020374507    4.5832399 
+  108400    17.563236    1.0420981    23.915015    6.1387108    4.5760846    1.5626261 0.0016128946 -0.020950486    4.5954222 
+  108410    19.730751    1.0389328    23.615897    6.1178649    4.5599851    1.5578798  0.001874795 -0.021800255    4.5799106 
+  108420    19.714762     1.039886     23.68239    6.1265768    4.5672678     1.559309 0.0019641735 -0.022029203    4.5873328 
+  108430    19.691704    1.0191871    23.738952    6.0992262    4.5709552    1.5282711 0.0020742552 -0.022999891    4.5918808 
+  108440     19.54553    1.0142757    23.546192    6.0593803    4.5384739    1.5209064 0.0021626193 -0.023686959    4.5599983 
+  108450    17.323562    1.0062185    23.846714    6.0322808    4.5234561    1.5088247 0.0021372906 -0.023176489    4.5444953 
+  108460    19.725834    1.0110765    23.760656    6.0425543    4.5264451    1.5161092 0.0021196728 -0.022944737    4.5472702 
+  108470    19.456229    1.0224152    23.763226    6.0494932    4.5163816    1.5331115 0.0019891122 -0.022435787    4.5368283 
+  108480    19.715905    1.0281835    23.467505    6.0827702     4.541009    1.5417612  0.001828382 -0.021971014    4.5611516 
+  108490    19.721068    1.0299643    23.545067    6.0912888    4.5468574    1.5444314 0.0016670077 -0.021374727    4.5665651 
+  108500    17.140439    1.0254662    23.679825    6.1026747    4.5649882    1.5376865  0.001245723 -0.019454978    4.5831974 
+  108510    19.561837    1.0267299    23.434792    6.0977875     4.558206    1.5395815 0.0012360682 -0.019096079     4.576066 
+  108520    19.322783    1.0480658     23.88716    6.1009917    4.5294171    1.5715746 0.0013460563 -0.019617935     4.547689 
+  108530    19.445687    1.0329062    23.585391    6.0981522    4.5493094    1.5488428 0.0013859577 -0.019878915    4.5678023 
+  108540    19.436974     1.023919    23.793733    6.0886598    4.5532933    1.5353665 0.0014492944 -0.020320772    4.5721647 
+  108550    17.496463    1.0300981    23.862948    6.0672411     4.522609    1.5446321 0.0016078664 -0.020833543    4.5418347 
+  108560    19.647954    1.0277383    24.024247    6.0904715    4.5493779    1.5410936 0.0015481675 -0.020567739    4.5683975 
+  108570    19.558019    1.0163035    23.692217    6.1023087    4.5783616    1.5239471 0.0017558484 -0.021838759    4.5984445 
+  108580     19.52338    1.0352474    23.648489    6.1000397    4.5476862    1.5523535 0.0019284558 -0.022614042    4.5683717 
+  108590    19.353932    1.0179045    23.769495    6.0693887    4.5430409    1.5263478 0.0021423839  -0.02346202    4.5643605 
+  108600    17.155075    1.0202416    23.946547    6.0723552     4.542503    1.5298522 0.0020566439 -0.022856854    4.5633032 
+  108610    19.443471     1.021533    23.681236    6.0462357    4.5144469    1.5317888 0.0018488498 -0.022383639    4.5349817 
+  108620    19.393054    1.0155595    23.744082    6.0642221    4.5413905    1.5228315 0.0017247614 -0.021521484    4.5611873 
+  108630    19.379071    1.0323845    23.861018     6.075604    4.5275435    1.5480605  0.001557635 -0.020896613    4.5468825 
+  108640    19.581948    1.0139707    23.515067    6.0600968    4.5396478     1.520449 0.0014300997 -0.020462436    4.5586801 
+  108650    17.498552    1.0070043    23.478164    6.0544295    4.5444265     1.510003 0.0015312241 -0.020939568    4.5638348 
+  108660    19.596691    1.0154757    23.698864     6.046587    4.5238812    1.5227058 0.0014484607 -0.020399184    4.5428319 
+  108670    19.753349    1.0162596    23.624847    6.0645065    4.5406252    1.5238812 0.0014030493 -0.019829368    4.5590516 
+  108680    19.732657    1.0078147    23.866591    6.0396332     4.528415    1.5112182 0.0013091783 -0.019266782    4.5463726 
+  108690    19.682873    1.0088232    23.751135    6.0486239    4.5358935    1.5127304 0.0014440498 -0.019710307    4.5541597 
+  108700    17.495237    1.0137437    23.983403    6.0446592    4.5245506    1.5201086 0.0012992737 -0.018943421    4.5421947 
+  108710     19.51386   0.99409985    23.739359     6.054332    4.5636793    1.4906527 0.0012745537 -0.018969626    4.5813744 
+  108720    19.636633    1.0386186    23.746612    6.0895163    4.5321076    1.5574087 0.0013765805 -0.019998237    4.5507293 
+  108730    19.720978    1.0191923    23.667792    6.0855284    4.5572495    1.5282788 0.0013971116 -0.020237824    4.5760902 
+  108740    19.762183    1.0088608    23.651389    6.0861749    4.5733881    1.5127867 0.0013160512 -0.020359872     4.592432 
+  108750    17.349858     1.025833     23.52833    6.0534577    4.5152211    1.5382367 0.0012977144 -0.020203351    4.5341267 
+  108760    19.556501    1.0219749    23.634177    6.0672741    4.5348227    1.5324513 0.0012212924 -0.020024883    4.5536263 
+  108770    19.499573    1.0300467    23.917228    6.0567169    4.5121619     1.544555 0.0012109301 -0.019959989     4.530911 
+  108780    19.609645    1.0133548    23.718032    6.0540708    4.5345453    1.5195255 0.0012619293 -0.020168412    4.5534518 
+  108790    19.457771    1.0101094    23.693992    6.0566723    4.5420132     1.514659 0.0014970276 -0.021077886    4.5615941 
+  108800    17.369597    1.0046817    23.950449    6.0380453     4.531525    1.5065203 0.0016459651 -0.021377833    4.5512569 
+  108810    19.617013    1.0094439     23.45902    6.0246036    4.5109426    1.5136611 0.0018608346 -0.022321525    4.5314033 
+  108820    19.693771   0.99117495    23.499757    6.0128907    4.5266238    1.4862668 0.0021911388  -0.02420529     4.548638 
+  108830    19.340082    1.0189418    23.987085    6.0491616    4.5212583    1.5279033 0.0022306165 -0.024556692    4.5435843 
+  108840    19.590152    1.0268491     23.79258     6.058041    4.5182809    1.5397602 0.0022380728 -0.024546174     4.540589 
+  108850    17.578972    1.0126152    24.112745    6.0532051    4.5347886    1.5184165 0.0023332749 -0.024953764    4.5574091 
+  108860    19.729711    1.0139193    23.585569    6.0555177    4.5351457     1.520372 0.0021995493 -0.024313024    4.5572592 
+  108870    19.543025    1.0123805     23.82233    6.0312351    4.5131705    1.5180645 0.0020206607 -0.023300952    4.5344508 
+  108880    19.442389    1.0077543    23.766277    6.0436029    4.5324753    1.5111276 0.0018866977 -0.022260248    4.5528489 
+  108890     19.55859    1.0083484     23.55192    6.0418842    4.5298657    1.5120184 0.0018978888 -0.021917629    4.5498854 
+  108900    17.355396     1.003102    23.553831    6.0435192    4.5393677    1.5041515 0.0019489909 -0.022208533    4.5596273 
+  108910    19.330039    1.0057944    23.571838    6.0394587      4.53127    1.5081887 0.0021549077 -0.022894072    4.5520091 
+  108920     19.38233    1.0035883    23.512976    6.0247267    4.5198461    1.5048806 0.0021267871 -0.022594181    4.5403135 
+  108930    19.013071    1.0119551    23.601139     6.046445    4.5290183    1.5174267 0.0019769044 -0.021997104    4.5490385 
+  108940    19.402898   0.98703288    23.592265    6.0241737    4.5441179    1.4800558 0.0018815994 -0.021383407    4.5636197 
+  108950    17.228279    1.0116266    23.873713    6.0345302    4.5175962     1.516934 0.0018900156 -0.021530683    4.5372369 
+  108960    19.532868    1.0137482    23.666067    6.0439996    4.5238842    1.5201154 0.0019714197 -0.021923592    4.5438364 
+  108970    19.602646    1.0262359    23.627481     6.059935    4.5210942    1.5388407 0.0021946248  -0.02303725    4.5419369 
+  108980    19.331607    1.0210695    23.911731    6.0503162    4.5192226    1.5310937 0.0022355315 -0.023591025    4.5405781 
+  108990    19.512434    1.0164306    23.624151    6.0650671    4.5409294    1.5241377 0.0022044552 -0.023348396    4.5620733 
+  109000    17.464884    1.0076453    23.317095    6.0632055    4.5522413    1.5109642  0.002110393 -0.022980788    4.5731117 
+  109010    19.701381    1.0120232    23.957566    6.0662503    4.5487215    1.5175288 0.0021228069 -0.022859291     4.569458 
+  109020     19.76062    1.0127543    23.554097    6.0591117    4.5404866    1.5186251 0.0021382507 -0.022854384    4.5612028 
+  109030    19.459414    1.0208129    23.902877    6.0619748    4.5312659    1.5307089 0.0019925483 -0.022414509    4.5516879 
+  109040    19.780789   0.99724506    23.623369     6.028937    4.5335681     1.495369 0.0017747071 -0.021807726    4.5536011 
+  109050    17.383174    1.0047037    24.008114    6.0458432    4.5392901    1.5065531 0.0015028882 -0.020825791     4.558613 
+  109060    19.524299   0.99010652    23.542304    6.0295431    4.5448784    1.4846647 0.0014566867 -0.020296054    4.5637178 
+  109070    19.785864    1.0006024    23.536147    6.0252576    4.5248543    1.5004033 0.0014875573 -0.020439743    4.5438065 
+  109080     19.62013    1.0095711    23.661169    6.0246705    4.5108187    1.5138518 0.0015021045 -0.020418379    4.5297349 
+  109090    19.694543    1.0077367     23.65646    6.0464006    4.5352994    1.5111012 0.0014832664 -0.020111181    4.5539273 
+  109100    17.334988    1.0075309    23.410504    6.0562612    4.5454685    1.5107926 0.0013264549 -0.019193242    4.5633353 
+  109110    19.432625    1.0124247     23.41613    6.0798535    4.5617227    1.5181308 0.0013699507 -0.019343586    4.5796963 
+  109120    19.561848     1.026341    23.871217    6.0638173    4.5248189    1.5389984 0.0017271858 -0.021608841    4.5447005 
+  109130    19.253373    1.0273117    23.623925    6.0953083    4.5548544    1.5404539 0.0017878215 -0.022436746    4.5755033 
+  109140    19.175051    1.0231802    23.793673    6.0672277    4.5329689    1.5342587 0.0017510216 -0.022338798    4.5535567 
+  109150    17.568728    1.0424857    23.803212    6.0822224    4.5190151    1.5632073  0.001878025 -0.022504542    4.5396416 
+  109160    19.625397    1.0182323    23.530178    6.0729757    4.5461365    1.5268393 0.0021539632 -0.023658778    4.5676413 
+  109170    19.459592    1.0152538    23.725531    6.0431553    4.5207823     1.522373 0.0021144204 -0.023374996    4.5420429 
+  109180    19.508428    1.0002775    23.587365    6.0272989    4.5273828     1.499916 0.0020958032  -0.02346714    4.5487542 
+  109190    19.378122   0.99859295    23.550684    6.0308501      4.53346    1.4973901 0.0020485706 -0.022990489    4.5544019 
+  109200     17.54326    1.0083843      23.7539    6.0627071    4.5506349    1.5120722  0.001892068  -0.02276095    4.5715037 
+  109210    19.656923    1.0051106    23.843521    6.0516193    4.5444559    1.5071634 0.0018212997 -0.022326028    4.5649606 
+  109220    19.551894    1.0194241    23.614218    6.0726118    4.5439853    1.5286265 0.0019061421 -0.022398104    4.5644773 
+  109230    19.648575    1.0114375      23.7218    6.0572997    4.5406491    1.5166506 0.0017523894 -0.021643295      4.56054 
+  109240    19.675301    1.0098953    23.818406    6.0737535    4.5594155     1.514338 0.0018060938 -0.022281661     4.579891 
+  109250     17.34761    1.0327426    23.627177    6.0966931    4.5480956    1.5485975 0.0018437377 -0.022730795    4.5689826 
+  109260     19.59703    1.0322153     23.86119    6.1012305    4.5534236    1.5478069 0.0016656626  -0.02210372    4.5738617 
+  109270    19.543829    1.0363377    23.792717    6.0973283      4.54334    1.5539883 0.0015527336 -0.021532177    4.5633194 
+  109280    19.799441      1.03363    23.455318    6.0972476    4.5473194    1.5499281 0.0016503791 -0.022269257    4.5679383 
+  109290    19.782561    1.0232651    23.933803    6.1016623    4.5672762    1.5343861 0.0017401707 -0.022689522    4.5882256 
+  109300    17.264384    1.0141626    23.684973    6.0732865    4.5525497    1.5207368 0.0016914649 -0.022464198    4.5733224 
+  109310    19.775557    1.0137244    23.542253    6.0692924    4.5492127    1.5200797  0.001917747 -0.023190324    4.5704853 
+  109320     19.74266    1.0052451    23.833385    6.0484323    4.5410673     1.507365 0.0019988399 -0.023596037    4.5626645 
+  109330    19.804503    1.0143287     23.79748    6.0520297    4.5310438    1.5209859 0.0019122399 -0.023084129    4.5522157 
+  109340     19.79391    1.0238752    23.856976    6.0799375    4.5446366    1.5353009 0.0016839173  -0.02232507    4.5652777 
+  109350    17.536692    1.0345892    23.786877    6.0627093    4.5113428    1.5513665 0.0013761394 -0.020919653    4.5308863 
+  109360    19.692736    1.0088422    23.700429    6.0549803    4.5422214    1.5127589 0.0012873364 -0.020418387    4.5613524 
+  109370    19.473835     1.028856    23.604675    6.0840439    4.5412743    1.5427696 0.0013387151 -0.020306388     4.560242 
+  109380    19.495974    1.0448885    23.363523    6.0941381    4.5273277    1.5668104 0.0012906668 -0.020037907     4.546075 
+  109390    19.680202    1.0173206    23.586101    6.0817117    4.5562394    1.5254723 0.0014257434 -0.020378487    4.5751922 
+  109400    17.445333    1.0362417     23.75722     6.093819    4.5399746    1.5538444 0.0016812449 -0.021207188    4.5595006 
+  109410    19.040206    1.0104955    23.577009    6.0480558    4.5328178     1.515238 0.0017356218 -0.021635171    4.5527174 
+  109420    19.181956    1.0137976    23.962729    6.0512367    4.5310473    1.5201895 0.0018000798  -0.02211504    4.5513622 
+  109430    19.587181    1.0017795    23.702462    6.0418045    4.5396361    1.5021683 0.0017454712 -0.021743865    4.5596345 
+  109440    19.504302   0.99972003    23.952479    6.0594888    4.5604086    1.4990802 0.0015581611 -0.020905891    4.5797564 
+  109450    17.290454    1.0028194    23.950908    6.0151053    4.5113776    1.5037277  0.001585161 -0.020879292    4.5306717 
+  109460    19.271733    1.0073248    23.713776    6.0297217    4.5192381    1.5104835 0.0017282836 -0.021881135     4.539391 
+  109470    19.396197    1.0016148    23.665637    6.0373902    4.5354688    1.5019215 0.0019531133 -0.023079673    4.5565953 
+  109480    19.641451    1.0234069    23.775386    6.0407093    4.5061106    1.5345987 0.0017825512 -0.022769355    4.5270974 
+  109490    19.737967    1.0123566    23.925904    6.0470347    4.5290061    1.5180287   0.00167673 -0.022241628     4.549571 
+  109500    17.560178     0.998362    23.686736    6.0419699    4.5449261    1.4970438 0.0017176394 -0.022204443    4.5654129 
+  109510    19.328696   0.98172678    23.718311    6.0184567    4.5463574    1.4720993  0.001751661 -0.022061119    4.5666669 
+  109520    19.013913   0.99256722    23.708563    6.0286829    4.5403284    1.4883545 0.0017136645 -0.022045643    4.5606603 
+  109530    19.400702    1.0052482    23.662992    6.0103495    4.5029798    1.5073697 0.0016765418 -0.021708201    4.5230115 
+  109540    19.587599    0.9949178    23.658644    6.0178758    4.5259966    1.4918792 0.0014665803 -0.020458911    4.5449889 
+  109550    17.458784   0.99545982    24.006434    5.9920451    4.4993531     1.492692 0.0013800897 -0.020561669    4.5185347 
+  109560    19.521276    1.0045066    23.918562    6.0258228    4.5195652    1.5062576 0.0014499499  -0.02075921    4.5388745 
+  109570    19.793408    1.0180256    23.687822    6.0474269    4.5208975    1.5265293 0.0014356918 -0.020431775    4.5398936 
+  109580    19.719067    1.0089688    23.845968     6.043872    4.5309233    1.5129487 0.0014331319 -0.020837594    4.5503277 
+  109590    19.561411    1.0194691    23.671897    6.0655175    4.5368236    1.5286939 0.0015637555   -0.0212939    4.5565538 
+  109600    17.446102    1.0080593    23.877667    6.0562972    4.5447123    1.5115849  0.001676641  -0.02157176    4.5646075 
+  109610    19.568013    1.0236868    23.708216    6.0707946    4.5357763    1.5350183 0.0016977584   -0.0218993    4.5559779 
+  109620    19.656028    1.0084895    23.742655    6.0499711     4.537741    1.5122301 0.0017462981 -0.022365059    4.5583598 
+  109630    19.621037    1.0143142    23.675243    6.0421556    4.5211914    1.5209642 0.0016644826 -0.021793118    4.5413201 
+  109640    19.262851    1.0052254    23.920615    6.0383251    4.5309895    1.5073355 0.0015170732 -0.021101625    4.5505741 
+  109650    17.158296    1.0155648    23.829396    6.0382813    4.5154419    1.5228394 0.0017331192 -0.021734944    4.5354438 
+  109660    19.711846    1.0090223     24.05423    6.0488129     4.535784    1.5130289 0.0017222802 -0.021555798    4.5556175 
+  109670     19.74784   0.99655896    23.804934    6.0335562     4.539216    1.4943402 0.0017190235 -0.021466221    4.5589632 
+  109680    19.574183   0.99740736    23.599282    5.9984646    4.5028522    1.4956123 0.0018649308 -0.021771424    4.5227587 
+  109690    19.638075   0.97775736    23.725215    5.9827661     4.516619    1.4661472 0.0018200342 -0.021622598    4.5364215 
+  109700    17.332946   0.98981199    23.758932    6.0026189    4.5183958    1.4842231 0.0017795888 -0.021496986    4.5381132 
+  109710    19.573693   0.98966616     23.61776    5.9897084     4.505704    1.4840044 0.0018874145 -0.022024084    4.5258407 
+  109720    19.510379   0.98615591    23.741843    5.9979786    4.5192378    1.4787408 0.0016378566  -0.02128464    4.5388846 
+  109730    19.127755   0.97606903    23.694643    5.9898015     4.526186    1.4636155 0.0013376929 -0.020068606    4.5449169 
+  109740    19.503239    1.0046749     24.06383    6.0009579    4.4944479      1.50651 0.0011737535 -0.018833878     4.512108 
+  109750    17.302852   0.98077948    23.889579    5.9832182    4.5125393    1.4706788 0.0010665859 -0.018210975    4.5296837 
+  109760    19.302984   0.99034123    23.712324     6.001201    4.5161843    1.4850167 0.0012624438 -0.019440837    4.5343627 
+  109770    19.450835    0.9980853    23.734459    5.9987679     4.502139    1.4966289 0.0014177345  -0.02005152    4.5207728 
+  109780    19.521713    1.0029463     23.76402    6.0294826    4.5255647     1.503918 0.0014697234 -0.020014647    4.5441096 
+  109790    19.397151    1.0156657     23.86267    6.0438487    4.5208579    1.5229908 0.0015103783 -0.020328479     4.539676 
+  109800    17.499645    1.0157693    23.770817    6.0519334    4.5287874     1.523146 0.0015037254 -0.020191705    4.5474754 
+  109810    19.756196    1.0250417     23.72677    6.0793014    4.5422514      1.53705  0.001468554  -0.01978624    4.5605691 
+  109820    19.654902    1.0390618    23.965474    6.0785627    4.5204896    1.5580731 0.0013013566 -0.019608795     4.538797 
+  109830    19.649625    1.0206497    23.652616    6.0677503    4.5372861    1.5304642   0.00128314 -0.019596268    4.5555992 
+  109840    19.714351    1.0142587    23.734763    6.0498431    4.5289622    1.5208809 0.0014873563 -0.021111183     4.548586 
+  109850    17.274679      1.00297    23.556066    6.0432362    4.5392827    1.5039535 0.0016429132  -0.02185095    4.5594908 
+  109860    19.661368    1.0097925    23.720189    6.0353582    4.5211744    1.5141838  0.001579574 -0.020965092    4.5405599 
+  109870    19.602927    1.0148735    23.327771     6.031846    4.5100433    1.5218027  0.001410087 -0.020138408    4.5287716 
+  109880    19.503178    1.0165581    23.718826    6.0387698    4.5144409    1.5243289 0.0015696451 -0.020702431    4.5335737 
+  109890    19.792094    1.0039223    23.542534    6.0218956    4.5165141    1.5053815  0.001756241 -0.021501782    4.5362596 
+  109900    17.204613   0.97978181    23.734286    6.0081716    4.5389888    1.4691828 0.0018183453 -0.021933883    4.5591043 
+  109910    19.112287    1.0153103    23.651999    6.0538622    4.5314045    1.5224578 0.0018962317 -0.022797162    4.5523054 
+  109920    19.395097    1.0340971    23.776639    6.0779379    4.5273092    1.5506287 0.0018793498 -0.022933501    4.5483634 
+  109930    19.488394    1.0277157    23.948518    6.0611576     4.520098    1.5410596 0.0018678198 -0.023037619    4.5412678 
+  109940    19.578822     1.020977    23.723486    6.0685162    4.5375611     1.530955 0.0017648225 -0.022320436    4.5581168 
+  109950    17.452493    1.0160453    23.790701       6.0685    4.5449401    1.5235599  0.001449306 -0.020621341    4.5641121 
+  109960    19.674913    1.0075557    23.731245    6.0579629    4.5471331    1.5108297 0.0014293254 -0.020743636    4.5664475 
+  109970    19.715002    1.0224029    23.892133    6.0637008    4.5306076    1.5330932 0.0014657369  -0.02115211     4.550294 
+  109980     19.02083    1.0144547    23.631891    6.0520466    4.5308718    1.5211748 0.0014891567 -0.021133485    4.5505161 
+  109990    19.186055    1.0102697    23.942081    6.0545916    4.5396922    1.5148995 0.0016368168   -0.0217256    4.5597809 
+  110000    17.635277   0.99508236    23.495257    6.0282044    4.5360784     1.492126 0.0016780979 -0.021861709     4.556262 
+Loop time of 525.071 on 16 procs for 10000 steps with 3000 atoms
+
+Performance: 32909.810 tau/day, 19.045 timesteps/s
+99.6% CPU use with 16 MPI tasks x no OpenMP threads
+
+MPI task timing breakdown:
+Section |  min time  |  avg time  |  max time  |%varavg| %total
+---------------------------------------------------------------
+Pair    | 77.195     | 77.454     | 77.948     |   2.2 | 14.75
+Kspace  | 316.71     | 319.8      | 322.73     |   9.7 | 60.91
+Neigh   | 91.009     | 91.602     | 93.194     |   5.6 | 17.45
+Comm    | 21.181     | 23.262     | 25.834     |  30.5 |  4.43
+Output  | 0.046175   | 0.04717    | 0.054478   |   0.9 |  0.01
+Modify  | 12.64      | 12.643     | 12.651     |   0.1 |  2.41
+Other   |            | 0.2675     |            |       |  0.05
+
+Nlocal:    187.5 ave 193 max 176 min
+Histogram: 1 0 1 0 0 3 3 1 4 3
+Nghost:    8250 ave 8306 max 8195 min
+Histogram: 3 1 0 1 2 3 2 1 1 2
+Neighs:    147148 ave 152801 max 137611 min
+Histogram: 1 0 1 0 1 3 2 6 1 1
+
+Total # of neighbors = 2354367
+Ave neighs/atom = 784.789
+Neighbor list builds = 10000
+Dangerous builds not checked
+write_data	data.after_production_run
+Ewald initialization ...
+  using 12-bit tables for long-range coulomb (../kspace.cpp:321)
+  G vector (1/distance) = 1.0262
+  estimated absolute RMS force accuracy = 1.01103e-05
+  estimated relative force accuracy = 1.01103e-05
+  KSpace vectors: actual max1d max3d = 2787 11 6083
+                  kxmax kymax kzmax  = 11 11 11
+
+Total wall time: 1:31:15
diff --git a/examples/USER/misc/slater/tmp_1_1.rdf b/examples/USER/misc/slater/tmp_1_1.rdf
new file mode 100644
index 0000000000..d04eca1fcf
--- /dev/null
+++ b/examples/USER/misc/slater/tmp_1_1.rdf
@@ -0,0 +1,10254 @@
+# Time-averaged data for fix 11
+# TimeStep Number-of-rows
+# Row c_RDF_1_1[1] c_RDF_1_1[2] c_RDF_1_1[3]
+100000 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0.030405 0.00285307
+5 0.27 0.0829907 0.0156919
+6 0.33 0.163803 0.053495
+7 0.39 0.305606 0.151926
+8 0.45 0.477619 0.356633
+9 0.51 0.574157 0.672611
+10 0.57 0.816755 1.23395
+11 0.63 0.883674 1.97575
+12 0.69 0.988258 2.97076
+13 0.75 1.11539 4.29743
+14 0.81 1.14349 5.88374
+15 0.87 1.17401 7.76248
+16 0.93 1.10587 9.78459
+17 0.99 1.07232 12.0064
+18 1.05 0.986657 14.306
+19 1.11 0.983677 16.868
+20 1.17 0.946279 19.6063
+21 1.23 0.944773 22.6277
+22 1.29 0.952425 25.9779
+23 1.35 0.994267 29.8081
+24 1.41 1.00668 34.0385
+25 1.47 0.995995 38.5877
+26 1.53 0.998849 43.53
+27 1.59 1.01633 48.9608
+28 1.65 1.01913 54.8252
+29 1.71 1.02112 61.1362
+30 1.77 1.0107 67.8288
+31 1.83 0.980583 74.7696
+32 1.89 0.998013 82.3046
+33 1.95 0.995854 90.3081
+34 2.01 1.00052 98.8516
+35 2.07 0.997081 107.882
+36 2.13 0.998829 117.459
+37 2.19 0.996359 127.559
+38 2.25 0.994861 138.204
+39 2.31 1.00147 149.499
+40 2.37 1.00842 161.47
+41 2.43 1.01137 174.092
+42 2.49 1.0072 187.29
+43 2.55 0.990044 200.897
+44 2.61 1.00316 215.34
+45 2.67 0.99622 230.35
+46 2.73 0.99258 245.984
+47 2.79 0.999514 262.428
+48 2.85 0.995767 279.522
+49 2.91 0.994066 297.313
+50 2.97 0.998039 315.919
+100050 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0.06081 0.00570613
+5 0.27 0.101433 0.021398
+6 0.33 0.210162 0.0699001
+7 0.39 0.290104 0.163338
+8 0.45 0.407724 0.338088
+9 0.51 0.575453 0.654779
+10 0.57 0.807415 1.2097
+11 0.63 0.924459 1.98573
+12 0.69 1.05414 3.04708
+13 0.75 1.06921 4.31883
+14 0.81 1.13681 5.89586
+15 0.87 1.13434 7.71113
+16 0.93 1.12342 9.76534
+17 0.99 1.06956 11.9815
+18 1.05 1.0194 14.3573
+19 1.11 0.977378 16.903
+20 1.17 0.94825 19.6469
+21 1.23 0.96953 22.7475
+22 1.29 0.957291 26.1148
+23 1.35 0.957977 29.8053
+24 1.41 0.97562 33.9051
+25 1.47 1.00786 38.5086
+26 1.53 1.0098 43.505
+27 1.59 1.01259 48.9158
+28 1.65 1.0319 54.8538
+29 1.71 1.02135 61.1662
+30 1.77 0.996156 67.7625
+31 1.83 1.00376 74.8673
+32 1.89 0.993195 82.3659
+33 1.95 1.00748 90.4629
+34 2.01 0.990919 98.9244
+35 2.07 0.990229 107.892
+36 2.13 0.984473 117.332
+37 2.19 1.00522 127.522
+38 2.25 0.99806 138.201
+39 2.31 0.992615 149.396
+40 2.37 1.01173 161.407
+41 2.43 1.01377 174.058
+42 2.49 1.00622 187.244
+43 2.55 0.995753 200.929
+44 2.61 0.991471 215.203
+45 2.67 0.998492 230.248
+46 2.73 1.00743 246.116
+47 2.79 1.00142 262.591
+48 2.85 0.995226 279.676
+49 2.91 0.993069 297.449
+50 2.97 1.00401 316.167
+100100 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0.0444073 0.0021398
+4 0.21 0.0456075 0.0064194
+5 0.27 0.106044 0.0228245
+6 0.33 0.176165 0.0634807
+7 0.39 0.272388 0.151213
+8 0.45 0.46597 0.350927
+9 0.51 0.624703 0.694722
+10 0.57 0.717126 1.18759
+11 0.63 0.898968 1.94223
+12 0.69 0.984716 2.93367
+13 0.75 1.14357 4.29387
+14 0.81 1.14195 5.87803
+15 0.87 1.17268 7.75464
+16 0.93 1.13981 9.8388
+17 0.99 1.04133 11.9964
+18 1.05 1.00073 14.3288
+19 1.11 0.96971 16.8545
+20 1.17 0.937651 19.5678
+21 1.23 0.939866 22.5735
+22 1.29 0.975338 26.0043
+23 1.35 0.970382 29.7425
+24 1.41 0.997516 33.9344
+25 1.47 1.02145 38.5999
+26 1.53 1.01326 43.6134
+27 1.59 1.01273 49.025
+28 1.65 1.01281 54.8531
+29 1.71 1.02458 61.1854
+30 1.77 1.0038 67.8324
+31 1.83 0.984311 74.7996
+32 1.89 0.993761 82.3024
+33 1.95 0.985027 90.219
+34 2.01 0.999689 98.7553
+35 2.07 1.00559 107.862
+36 2.13 1.00597 117.509
+37 2.19 0.999806 127.643
+38 2.25 1.00693 138.417
+39 2.31 1.00052 149.701
+40 2.37 0.99082 161.464
+41 2.43 1.00782 174.041
+42 2.49 1.00687 187.235
+43 2.55 0.998608 200.959
+44 2.61 0.98939 215.204
+45 2.67 1.00138 230.292
+46 2.73 0.994799 245.961
+47 2.79 0.999731 262.409
+48 2.85 1.00399 279.644
+49 2.91 1.00893 297.701
+50 2.97 0.999876 316.342
+100150 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0.0152025 0.00142653
+5 0.27 0.106044 0.0178317
+6 0.33 0.191618 0.0620542
+7 0.39 0.285675 0.154066
+8 0.45 0.472627 0.356633
+9 0.51 0.619519 0.697575
+10 0.57 0.763827 1.22254
+11 0.63 0.875177 1.9572
+12 0.69 1.07469 3.03923
+13 0.75 1.07701 4.32026
+14 0.81 1.11573 5.86805
+15 0.87 1.16644 7.73466
+16 0.93 1.11484 9.77318
+17 0.99 1.09228 12.0364
+18 1.05 0.996756 14.3595
+19 1.11 0.972997 16.8937
+20 1.17 0.943074 19.6227
+21 1.23 0.929383 22.5949
+22 1.29 0.954452 25.9522
+23 1.35 0.990379 29.7675
+24 1.41 1.00227 33.9793
+25 1.47 1.01489 38.6148
+26 1.53 1.0222 43.6726
+27 1.59 1.01059 49.0728
+28 1.65 1.00909 54.8795
+29 1.71 1.01339 61.1427
+30 1.77 0.997557 67.7482
+31 1.83 1.00436 74.8573
+32 1.89 0.990833 82.3381
+33 1.95 0.990441 90.2981
+34 2.01 0.99451 98.7903
+35 2.07 1.00716 107.912
+36 2.13 0.981126 117.32
+37 2.19 0.998399 127.44
+38 2.25 1.00013 138.141
+39 2.31 1.00545 149.481
+40 2.37 1.01029 161.474
+41 2.43 1.00754 174.049
+42 2.49 0.995874 187.098
+43 2.55 1.00203 200.869
+44 2.61 0.988548 215.102
+45 2.67 0.99996 230.168
+46 2.73 0.996203 245.86
+47 2.79 1.00719 262.43
+48 2.85 1.00325 279.653
+49 2.91 0.993548 297.434
+50 2.97 1.00175 316.11
+100200 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0.0380062 0.00356633
+5 0.27 0.101433 0.0192582
+6 0.33 0.145259 0.0527817
+7 0.39 0.323322 0.156919
+8 0.45 0.470962 0.358773
+9 0.51 0.59619 0.686876
+10 0.57 0.763827 1.21184
+11 0.63 0.897269 1.96505
+12 0.69 1.0173 2.9893
+13 0.75 1.0908 4.28673
+14 0.81 1.11933 5.83951
+15 0.87 1.1388 7.66191
+16 0.93 1.15268 9.76961
+17 0.99 1.07645 12
+18 1.05 1.02858 14.3973
+19 1.11 0.947802 16.8659
+20 1.17 0.953673 19.6255
+21 1.23 0.948787 22.6598
+22 1.29 0.9506 26.0036
+23 1.35 0.986861 29.8053
+24 1.41 0.990557 33.9679
+25 1.47 1.01052 38.5835
+26 1.53 1.00087 43.5357
+27 1.59 1.01166 48.9415
+28 1.65 1.0221 54.8231
+29 1.71 1.0195 61.1241
+30 1.77 1.0009 67.7518
+31 1.83 0.999729 74.8281
+32 1.89 0.990833 82.3088
+33 1.95 1.00145 90.3573
+34 2.01 1.00412 98.9315
+35 2.07 0.991725 107.913
+36 2.13 0.993994 117.444
+37 2.19 1.00128 127.594
+38 2.25 1.00099 138.305
+39 2.31 0.994133 149.516
+40 2.37 1.0065 161.465
+41 2.43 1.01308 174.108
+42 2.49 1.0036 187.26
+43 2.55 0.989577 200.859
+44 2.61 0.999447 215.249
+45 2.67 1.00493 230.39
+46 2.73 0.993486 246.039
+47 2.79 0.997216 262.445
+48 2.85 1.00121 279.633
+49 2.91 0.996337 297.464
+50 2.97 1.00749 316.247
+100250 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0.0296049 0.00142653
+4 0.21 0.0684112 0.00784593
+5 0.27 0.119875 0.0263909
+6 0.33 0.160712 0.0634807
+7 0.39 0.33218 0.170471
+8 0.45 0.462642 0.368759
+9 0.51 0.581933 0.689016
+10 0.57 0.744109 1.20043
+11 0.63 0.914262 1.9679
+12 0.69 1.0173 2.99215
+13 0.75 1.08061 4.27746
+14 0.81 1.15378 5.87803
+15 0.87 1.17178 7.75321
+16 0.93 1.1402 9.83809
+17 0.99 1.03617 11.985
+18 1.05 1.00104 14.3181
+19 1.11 0.963412 16.8274
+20 1.17 0.964272 19.6177
+21 1.23 0.949234 22.6534
+22 1.29 0.978988 26.097
+23 1.35 0.962976 29.8067
+24 1.41 0.996667 33.995
+25 1.47 1.01302 38.622
+26 1.53 0.984145 43.4914
+27 1.59 1.03088 49
+28 1.65 1.00649 54.7917
+29 1.71 1.02389 61.1198
+30 1.77 1.02115 67.8816
+31 1.83 0.998822 74.9515
+32 1.89 0.991116 82.4344
+33 1.95 0.992659 90.4123
+34 2.01 0.997517 98.9301
+35 2.07 0.990465 107.9
+36 2.13 0.999796 117.487
+37 2.19 0.986719 127.489
+38 2.25 1.00866 138.282
+39 2.31 1.01386 149.716
+40 2.37 1.00596 161.658
+41 2.43 0.996906 174.1
+42 2.49 1.00681 187.293
+43 2.55 0.994508 200.961
+44 2.61 0.989786 215.211
+45 2.67 0.99906 230.264
+46 2.73 1.00241 246.053
+47 2.79 1.00003 262.506
+48 2.85 1.00715 279.795
+49 2.91 1.00463 297.775
+50 2.97 0.997695 316.375
+100300 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0.0148024 0.000713267
+4 0.21 0.0380062 0.0042796
+5 0.27 0.0876012 0.0178317
+6 0.33 0.157621 0.0542083
+7 0.39 0.316679 0.156205
+8 0.45 0.447664 0.348074
+9 0.51 0.646736 0.703994
+10 0.57 0.750336 1.21969
+11 0.63 0.876026 1.95506
+12 0.69 1.00668 2.96862
+13 0.75 1.092 4.26748
+14 0.81 1.14144 5.85093
+15 0.87 1.14727 7.68688
+16 0.93 1.14566 9.78174
+17 0.99 1.07541 12.01
+18 1.05 0.99951 14.3395
+19 1.11 0.949993 16.8138
+20 1.17 0.94899 19.5599
+21 1.23 0.941204 22.5699
+22 1.29 0.977974 26.01
+23 1.35 0.983899 29.8003
+24 1.41 1.00991 34.0442
+25 1.47 1.01036 38.6591
+26 1.53 1.00865 43.6498
+27 1.59 1.0202 49.1013
+28 1.65 1.00066 54.8595
+29 1.71 1.00161 61.0499
+30 1.77 1.0037 67.6961
+31 1.83 0.998519 74.7639
+32 1.89 0.998769 82.3046
+33 1.95 0.989908 90.2603
+34 2.01 0.99994 98.7989
+35 2.07 0.997553 107.833
+36 2.13 0.999424 117.417
+37 2.19 1.01536 127.709
+38 2.25 1.00066 138.416
+39 2.31 0.992804 149.613
+40 2.37 0.995807 161.434
+41 2.43 1.00576 173.986
+42 2.49 0.997017 187.051
+43 2.55 1.00473 200.859
+44 2.61 0.998555 215.236
+45 2.67 0.997167 230.26
+46 2.73 0.999418 246.003
+47 2.79 1.00433 262.526
+48 2.85 0.998218 279.662
+49 2.91 1.00319 297.616
+50 2.97 0.993831 316.144
+100350 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0.0148024 0.000713267
+4 0.21 0.0228037 0.00285307
+5 0.27 0.0737695 0.0142653
+6 0.33 0.219434 0.0649073
+7 0.39 0.290104 0.158345
+8 0.45 0.429358 0.342368
+9 0.51 0.615631 0.68117
+10 0.57 0.804302 1.23395
+11 0.63 0.876876 1.97004
+12 0.69 1.01022 2.98716
+13 0.75 1.095 4.28959
+14 0.81 1.14401 5.8766
+15 0.87 1.1388 7.699
+16 0.93 1.14332 9.78959
+17 0.99 1.08884 12.0456
+18 1.05 0.991247 14.3559
+19 1.11 0.949445 16.8288
+20 1.17 0.941595 19.5535
+21 1.23 0.938528 22.5549
+22 1.29 0.975541 25.9864
+23 1.35 0.986861 29.7882
+24 1.41 0.989878 33.9479
+25 1.47 1.01489 38.5835
+26 1.53 1.01672 43.6141
+27 1.59 1.00085 48.9622
+28 1.65 1.00574 54.7496
+29 1.71 1.01685 61.0342
+30 1.77 1.00941 67.7183
+31 1.83 1.00648 74.8424
+32 1.89 0.987148 82.2953
+33 1.95 0.988488 90.2397
+34 2.01 0.994343 98.7304
+35 2.07 1.007 107.85
+36 2.13 0.999945 117.439
+37 2.19 1.00522 127.628
+38 2.25 0.989928 138.22
+39 2.31 0.989579 149.381
+40 2.37 1.00818 161.35
+41 2.43 1.00199 173.854
+42 2.49 1.0079 187.062
+43 2.55 1.00172 200.829
+44 2.61 0.997515 215.19
+45 2.67 0.994042 230.168
+46 2.73 1.00232 245.956
+47 2.79 1.0097 262.567
+48 2.85 1.00133 279.757
+49 2.91 0.992671 297.523
+50 2.97 0.994978 316.072
+100400 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0.0296049 0.00142653
+4 0.21 0.030405 0.0042796
+5 0.27 0.0829907 0.0171184
+6 0.33 0.228706 0.0699001
+7 0.39 0.281246 0.160485
+8 0.45 0.455985 0.35592
+9 0.51 0.584525 0.677603
+10 0.57 0.730617 1.17974
+11 0.63 0.907465 1.94151
+12 0.69 1.03785 2.98645
+13 0.75 1.0956 4.28959
+14 0.81 1.13887 5.86947
+15 0.87 1.1963 7.78388
+16 0.93 1.12889 9.84807
+17 0.99 1.05373 12.0314
+18 1.05 0.987881 14.3338
+19 1.11 0.94123 16.7853
+20 1.17 0.956878 19.5542
+21 1.23 0.950126 22.5927
+22 1.29 0.962766 25.9793
+23 1.35 0.990379 29.7946
+24 1.41 0.998025 33.9886
+25 1.47 1.02098 38.6519
+26 1.53 0.991065 43.5556
+27 1.59 1.01593 48.9843
+28 1.65 1.01392 54.8188
+29 1.71 1.01258 61.077
+30 1.77 1.00704 67.7454
+31 1.83 1.00819 74.8816
+32 1.89 0.988565 82.3452
+33 1.95 0.991239 90.3117
+34 2.01 0.979893 98.679
+35 2.07 1.00244 107.757
+36 2.13 1.00798 117.423
+37 2.19 0.994599 127.505
+38 2.25 1.00733 138.283
+39 2.31 1.00716 149.642
+40 2.37 1.0071 161.598
+41 2.43 1.00479 174.138
+42 2.49 0.989451 187.103
+43 2.55 0.995909 200.79
+44 2.61 0.992957 215.086
+45 2.67 0.995699 230.088
+46 2.73 1.00209 245.873
+47 2.79 1.01239 262.529
+48 2.85 0.999589 279.688
+49 2.91 0.998609 297.561
+50 2.97 1.00607 316.317
+100450 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0.0148024 0.000713267
+4 0.21 0.0228037 0.00285307
+5 0.27 0.115265 0.0206847
+6 0.33 0.188528 0.064194
+7 0.39 0.292319 0.158345
+8 0.45 0.462642 0.356633
+9 0.51 0.609151 0.691869
+10 0.57 0.788734 1.23395
+11 0.63 0.871778 1.96576
+12 0.69 1.02439 2.99715
+13 0.75 1.05722 4.25464
+14 0.81 1.17177 5.88017
+15 0.87 1.13613 7.69829
+16 0.93 1.13981 9.78245
+17 0.99 1.06164 11.9822
+18 1.05 0.989411 14.2882
+19 1.11 0.954648 16.7746
+20 1.17 0.94406 19.5064
+21 1.23 0.967299 22.5999
+22 1.29 0.995615 26.102
+23 1.35 0.996304 29.9401
+24 1.41 0.973583 34.0314
+25 1.47 0.995215 38.577
+26 1.53 1.01197 43.5842
+27 1.59 1.01086 48.9857
+28 1.65 1.0045 54.766
+29 1.71 1.02008 61.0706
+30 1.77 1.001 67.699
+31 1.83 0.995295 74.7439
+32 1.89 0.995084 82.2568
+33 1.95 1.00517 90.3352
+34 2.01 0.998019 98.8573
+35 2.07 0.998735 107.902
+36 2.13 0.998903 117.481
+37 2.19 1.00607 127.679
+38 2.25 0.992794 138.302
+39 2.31 0.992109 149.491
+40 2.37 1.00031 161.366
+41 2.43 0.996906 173.807
+42 2.49 1.00948 187.036
+43 2.55 1.00432 200.838
+44 2.61 1.00113 215.252
+45 2.67 1.00218 230.352
+46 2.73 1.00793 246.228
+47 2.79 0.997303 262.636
+48 2.85 0.997553 279.76
+49 2.91 0.994624 297.561
+50 2.97 0.995131 316.113
+100500 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0.0444073 0.0021398
+4 0.21 0.06081 0.00784593
+5 0.27 0.0783801 0.0199715
+6 0.33 0.194709 0.0649073
+7 0.39 0.307821 0.164051
+8 0.45 0.46597 0.363766
+9 0.51 0.572861 0.67903
+10 0.57 0.754487 1.19757
+11 0.63 0.887072 1.94223
+12 0.69 1.04352 2.99287
+13 0.75 1.12678 4.3331
+14 0.81 1.12498 5.89372
+15 0.87 1.1651 7.7582
+16 0.93 1.148 9.85735
+17 0.99 1.0372 12.0064
+18 1.05 0.994614 14.3245
+19 1.11 0.964233 16.8359
+20 1.17 0.931243 19.5307
+21 1.23 0.9615 22.6056
+22 1.29 0.961752 25.9886
+23 1.35 0.989083 29.7989
+24 1.41 0.982919 33.9294
+25 1.47 1.02239 38.5991
+26 1.53 1.01831 43.6377
+27 1.59 1.02461 49.1127
+28 1.65 1.00797 54.913
+29 1.71 0.996306 61.0706
+30 1.77 1.00639 67.7347
+31 1.83 1.00235 74.8295
+32 1.89 0.989699 82.3017
+33 1.95 0.998517 90.3267
+34 2.01 0.995179 98.8245
+35 2.07 1.01039 107.975
+36 2.13 0.982093 117.392
+37 2.19 0.998821 127.517
+38 2.25 0.998994 138.206
+39 2.31 1.00577 149.549
+40 2.37 0.986074 161.255
+41 2.43 1.01222 173.888
+42 2.49 1.00393 187.044
+43 2.55 1.0025 200.821
+44 2.61 1.00232 215.252
+45 2.67 0.997546 230.282
+46 2.73 1.00073 246.045
+47 2.79 1.00259 262.539
+48 2.85 1.00744 279.834
+49 2.91 0.985418 297.47
+50 2.97 1.00489 316.204
+100550 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0.06081 0.00570613
+5 0.27 0.0968224 0.0206847
+6 0.33 0.20089 0.0670471
+7 0.39 0.327751 0.172611
+8 0.45 0.424365 0.354494
+9 0.51 0.605262 0.687589
+10 0.57 0.756562 1.20756
+11 0.63 0.89387 1.95792
+12 0.69 1.01659 2.98146
+13 0.75 1.12618 4.32097
+14 0.81 1.10236 5.85021
+15 0.87 1.14816 7.68759
+16 0.93 1.11874 9.73324
+17 0.99 1.07541 11.9615
+18 1.05 1.01573 14.3288
+19 1.11 0.97108 16.8581
+20 1.17 0.983006 19.7026
+21 1.23 0.945219 22.7254
+22 1.29 0.943908 26.0456
+23 1.35 0.981492 29.8267
+24 1.41 0.984277 33.9629
+25 1.47 0.996464 38.5143
+26 1.53 0.989767 43.4116
+27 1.59 1.03141 48.923
+28 1.65 1.02458 54.8188
+29 1.71 1.00588 61.0357
+30 1.77 1.00111 67.6648
+31 1.83 0.991869 74.6854
+32 1.89 1.00198 82.2504
+33 1.95 0.999848 90.286
+34 2.01 1.00946 98.9058
+35 2.07 0.998183 107.946
+36 2.13 0.98358 117.377
+37 2.19 0.996499 127.479
+38 2.25 1.00353 138.216
+39 2.31 1.00014 149.496
+40 2.37 1.00164 161.387
+41 2.43 0.999592 173.862
+42 2.49 1.00257 186.999
+43 2.55 1.01584 200.96
+44 2.61 0.99261 215.251
+45 2.67 0.993569 230.221
+46 2.73 1.00503 246.052
+47 2.79 0.993791 262.402
+48 2.85 1.00628 279.676
+49 2.91 1.00511 297.665
+50 2.97 0.993945 316.195
+100600 50
+1 0.03 0 0
+2 0.09 0.080356 0.00142653
+3 0.15 0.0296049 0.00285307
+4 0.21 0.0456075 0.00713267
+5 0.27 0.101433 0.0228245
+6 0.33 0.142168 0.0556348
+7 0.39 0.298962 0.151926
+8 0.45 0.514231 0.372325
+9 0.51 0.620815 0.71398
+10 0.57 0.760714 1.2368
+11 0.63 0.870079 1.96719
+12 0.69 1.00739 2.98146
+13 0.75 1.10639 4.29743
+14 0.81 1.11419 5.84308
+15 0.87 1.14638 7.6776
+16 0.93 1.14566 9.77247
+17 0.99 1.06646 11.9822
+18 1.05 1.01236 14.3417
+19 1.11 0.979295 16.8923
+20 1.17 0.95392 19.6526
+21 1.23 0.933621 22.6384
+22 1.29 0.977163 26.0756
+23 1.35 0.982788 29.8616
+24 1.41 0.985634 34.0036
+25 1.47 0.995527 38.5506
+26 1.53 1.01629 43.5792
+27 1.59 1.01553 49.0057
+28 1.65 1.02297 54.8923
+29 1.71 1.00104 61.0792
+30 1.77 1.00499 67.734
+31 1.83 0.994892 74.776
+32 1.89 1.00075 82.3317
+33 1.95 0.997274 90.3466
+34 2.01 0.989749 98.7981
+35 2.07 0.99267 107.788
+36 2.13 1.00396 117.415
+37 2.19 1.00987 127.652
+38 2.25 0.99846 138.335
+39 2.31 0.996662 149.576
+40 2.37 1.00728 161.534
+41 2.43 0.99462 173.947
+42 2.49 1.00888 187.167
+43 2.55 1.00406 200.966
+44 2.61 0.996623 215.315
+45 2.67 0.993569 230.285
+46 2.73 1.00159 246.061
+47 2.79 1.00186 262.544
+48 2.85 0.994354 279.613
+49 2.91 1.01343 297.751
+50 2.97 0.999034 316.376
+100650 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0.0148024 0.000713267
+4 0.21 0.030405 0.00356633
+5 0.27 0.0691589 0.0142653
+6 0.33 0.160712 0.0513552
+7 0.39 0.325537 0.156205
+8 0.45 0.446 0.347361
+9 0.51 0.644144 0.701854
+10 0.57 0.714012 1.19258
+11 0.63 0.953348 1.99287
+12 0.69 1.02085 3.02068
+13 0.75 1.07221 4.29601
+14 0.81 1.1255 5.85735
+15 0.87 1.13301 7.67047
+16 0.93 1.1363 9.74822
+17 0.99 1.06818 11.9615
+18 1.05 1.02093 14.3409
+19 1.11 0.952731 16.8224
+20 1.17 0.951208 19.5749
+21 1.23 0.938974 22.5777
+22 1.29 0.967835 25.9822
+23 1.35 0.99149 29.8017
+24 1.41 0.980712 33.923
+25 1.47 1.00677 38.5214
+26 1.53 1.02235 43.5799
+27 1.59 1.01206 48.9879
+28 1.65 1.01591 54.8338
+29 1.71 1.01396 61.1006
+30 1.77 1.00811 67.776
+31 1.83 0.999023 74.8474
+32 1.89 0.995367 82.3623
+33 1.95 0.975087 90.199
+34 2.01 1.00186 98.7539
+35 2.07 1.00574 107.862
+36 2.13 0.987597 117.332
+37 2.19 1.0181 127.653
+38 2.25 0.993661 138.285
+39 2.31 1.00741 149.646
+40 2.37 1.00266 161.549
+41 2.43 1.00416 174.081
+42 2.49 1.00197 187.211
+43 2.55 0.994404 200.877
+44 2.61 0.998159 215.248
+45 2.67 0.99035 230.17
+46 2.73 1.00449 245.992
+47 2.79 0.994702 262.357
+48 2.85 1.00732 279.649
+49 2.91 1.00622 297.658
+50 2.97 1.00213 316.34
+100700 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0.0148024 0.000713267
+4 0.21 0.0836137 0.0085592
+5 0.27 0.0876012 0.0221113
+6 0.33 0.160712 0.0592011
+7 0.39 0.316679 0.161198
+8 0.45 0.482612 0.368046
+9 0.51 0.583229 0.689016
+10 0.57 0.761751 1.21255
+11 0.63 0.873477 1.94579
+12 0.69 1.03572 2.98859
+13 0.75 1.0992 4.29601
+14 0.81 1.14247 5.88088
+15 0.87 1.15039 7.72183
+16 0.93 1.10665 9.74536
+17 0.99 1.06991 11.9622
+18 1.05 1.00318 14.3003
+19 1.11 0.987237 16.8716
+20 1.17 0.957617 19.6427
+21 1.23 0.953694 22.6926
+22 1.29 0.944922 26.0164
+23 1.35 1.00056 29.8709
+24 1.41 0.976808 33.9757
+25 1.47 0.988968 38.4929
+26 1.53 1.02191 43.5492
+27 1.59 1.02074 49.0036
+28 1.65 1.01355 54.8359
+29 1.71 1.01362 61.1006
+30 1.77 0.993033 67.6762
+31 1.83 0.997008 74.7332
+32 1.89 1.00567 82.326
+33 1.95 0.990618 90.2874
+34 2.01 1.00888 98.9023
+35 2.07 0.995506 107.918
+36 2.13 0.998755 117.495
+37 2.19 0.99861 127.618
+38 2.25 1.00893 138.413
+39 2.31 0.992678 149.608
+40 2.37 1.01545 161.663
+41 2.43 0.995306 174.085
+42 2.49 1.00317 187.23
+43 2.55 0.994196 200.894
+44 2.61 1.00321 215.337
+45 2.67 1.00039 230.41
+46 2.73 1.00263 246.203
+47 2.79 0.993878 262.554
+48 2.85 1.00744 279.849
+49 2.91 0.995221 297.66
+50 2.97 0.991497 316.145
+100750 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0.0532087 0.00499287
+5 0.27 0.147539 0.0278174
+6 0.33 0.173075 0.0677603
+7 0.39 0.281246 0.158345
+8 0.45 0.46597 0.35806
+9 0.51 0.575453 0.67475
+10 0.57 0.762789 1.199
+11 0.63 0.906615 1.96006
+12 0.69 0.9918 2.95863
+13 0.75 1.08601 4.25036
+14 0.81 1.19028 5.90157
+15 0.87 1.16332 7.7632
+16 0.93 1.14098 9.8495
+17 0.99 1.1002 12.1291
+18 1.05 0.972885 14.3966
+19 1.11 0.953827 16.8809
+20 1.17 0.940116 19.6013
+21 1.23 0.935851 22.5942
+22 1.29 0.975541 26.0257
+23 1.35 0.962791 29.7347
+24 1.41 1.0004 33.9387
+25 1.47 1.01208 38.5613
+26 1.53 1.02119 43.6141
+27 1.59 1.02581 49.0956
+28 1.65 1.00128 54.8573
+29 1.71 1.01385 61.1234
+30 1.77 1.00736 67.7939
+31 1.83 0.994489 74.8331
+32 1.89 0.992155 82.3238
+33 1.95 1.00322 90.3866
+34 2.01 0.998854 98.9158
+35 2.07 0.995899 107.935
+36 2.13 1.00054 117.529
+37 2.19 0.981089 127.474
+38 2.25 1.00753 138.255
+39 2.31 1.00046 149.538
+40 2.37 1.00842 161.509
+41 2.43 1.01017 174.116
+42 2.49 0.993424 187.134
+43 2.55 1.00084 200.889
+44 2.61 0.993799 215.197
+45 2.67 1.00938 230.405
+46 2.73 1.00299 246.204
+47 2.79 0.993314 262.546
+48 2.85 0.987291 279.494
+49 2.91 0.993069 297.267
+50 2.97 1.00707 316.042
+100800 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0.0148024 0.000713267
+4 0.21 0.0532087 0.00570613
+5 0.27 0.0922118 0.0199715
+6 0.33 0.222524 0.0713267
+7 0.39 0.316679 0.173324
+8 0.45 0.449328 0.365906
+9 0.51 0.592302 0.691869
+10 0.57 0.718164 1.18545
+11 0.63 0.921909 1.95934
+12 0.69 1.01376 2.98003
+13 0.75 1.08601 4.27175
+14 0.81 1.15532 5.87447
+15 0.87 1.15841 7.72825
+16 0.93 1.13825 9.80956
+17 0.99 1.07851 12.0442
+18 1.05 0.990941 14.3538
+19 1.11 0.979843 16.9058
+20 1.17 0.911523 19.5435
+21 1.23 0.956371 22.602
+22 1.29 0.957088 25.9686
+23 1.35 0.981121 29.7482
+24 1.41 0.98207 33.8752
+25 1.47 1.02098 38.5385
+26 1.53 1.03359 43.6526
+27 1.59 1.00605 49.0285
+28 1.65 1.01938 54.8944
+29 1.71 1.00185 61.0863
+30 1.77 1.00154 67.7183
+31 1.83 0.997814 74.781
+32 1.89 1.00803 82.3916
+33 1.95 0.985826 90.3146
+34 2.01 1.00169 98.868
+35 2.07 1.00078 107.932
+36 2.13 0.987746 117.403
+37 2.19 0.997766 127.517
+38 2.25 1.00939 138.317
+39 2.31 1.0016 149.613
+40 2.37 1.01125 161.618
+41 2.43 1.00514 174.163
+42 2.49 0.993751 187.185
+43 2.55 0.998089 200.902
+44 2.61 1.00138 215.319
+45 2.67 0.998445 230.362
+46 2.73 0.996293 246.056
+47 2.79 1.00467 262.584
+48 2.85 0.990157 279.582
+49 2.91 0.999844 297.476
+50 2.97 1.00141 316.146
+100850 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0.0296049 0.00142653
+4 0.21 0.030405 0.0042796
+5 0.27 0.110654 0.021398
+6 0.33 0.179256 0.0627675
+7 0.39 0.338824 0.171897
+8 0.45 0.459313 0.368759
+9 0.51 0.628592 0.714693
+10 0.57 0.807415 1.26961
+11 0.63 0.883674 2.01141
+12 0.69 0.957795 2.97575
+13 0.75 1.08061 4.26106
+14 0.81 1.10596 5.79529
+15 0.87 1.15886 7.64979
+16 0.93 1.14293 9.73966
+17 0.99 1.10192 12.0228
+18 1.05 1.01848 14.3966
+19 1.11 0.98176 16.9536
+20 1.17 0.942581 19.6812
+21 1.23 0.945442 22.7047
+22 1.29 0.942286 26.0193
+23 1.35 0.970753 29.7589
+24 1.41 0.986313 33.9037
+25 1.47 1.01146 38.5235
+26 1.53 1.01471 43.5442
+27 1.59 1.02367 49.0143
+28 1.65 1.00512 54.7981
+29 1.71 1.00958 61.0378
+30 1.77 1.01985 67.791
+31 1.83 1.01857 75.0007
+32 1.89 0.982519 82.4187
+33 1.95 0.993813 90.4058
+34 2.01 0.984236 98.8103
+35 2.07 0.995191 107.823
+36 2.13 1.00627 117.472
+37 2.19 0.991785 127.526
+38 2.25 1.00433 138.272
+39 2.31 0.998686 149.535
+40 2.37 1.00686 161.488
+41 2.43 1.00474 174.027
+42 2.49 1.00671 187.219
+43 2.55 1.01911 201.225
+44 2.61 0.997316 215.583
+45 2.67 0.990019 230.5
+46 2.73 0.98932 246.083
+47 2.79 0.994225 262.44
+48 2.85 0.99855 279.582
+49 2.91 0.998649 297.455
+50 2.97 1.01216 316.325
+100900 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0.030405 0.00285307
+5 0.27 0.110654 0.0199715
+6 0.33 0.142168 0.0527817
+7 0.39 0.314464 0.154066
+8 0.45 0.489268 0.363766
+9 0.51 0.598782 0.693295
+10 0.57 0.762789 1.21755
+11 0.63 0.889621 1.96434
+12 0.69 1.03501 3.00642
+13 0.75 1.08481 4.29672
+14 0.81 1.14555 5.88588
+15 0.87 1.13568 7.70328
+16 0.93 1.19442 9.8873
+17 0.99 1.04787 12.0585
+18 1.05 0.983596 14.3509
+19 1.11 0.960673 16.8531
+20 1.17 0.961561 19.6355
+21 1.23 0.928268 22.6041
+22 1.29 0.964185 25.9957
+23 1.35 0.971678 29.7389
+24 1.41 0.99446 33.918
+25 1.47 1.02129 38.5827
+26 1.53 1.01125 43.5863
+27 1.59 1.01486 49.0093
+28 1.65 1.01888 54.8723
+29 1.71 1.02043 61.179
+30 1.77 1.00391 67.8267
+31 1.83 1.00285 74.9251
+32 1.89 0.988849 82.3909
+33 1.95 0.992837 90.3702
+34 2.01 0.981229 98.7489
+35 2.07 1.00543 107.854
+36 2.13 0.99087 117.356
+37 2.19 1.01233 127.618
+38 2.25 1.01059 138.431
+39 2.31 0.997801 149.684
+40 2.37 1.01017 161.676
+41 2.43 1.00079 174.166
+42 2.49 1.00344 187.315
+43 2.55 0.987968 200.893
+44 2.61 0.999546 215.284
+45 2.67 0.995179 230.278
+46 2.73 1.00395 246.092
+47 2.79 0.992794 262.425
+48 2.85 1.00291 279.642
+49 2.91 1.00558 297.639
+50 2.97 0.994634 316.182
+100950 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0.0456075 0.0042796
+5 0.27 0.0691589 0.0149786
+6 0.33 0.176165 0.0556348
+7 0.39 0.318893 0.158345
+8 0.45 0.457649 0.354494
+9 0.51 0.655809 0.715407
+10 0.57 0.719201 1.2097
+11 0.63 0.917661 1.98003
+12 0.69 1.00951 2.99643
+13 0.75 1.07401 4.27389
+14 0.81 1.15635 5.87803
+15 0.87 1.14727 7.71398
+16 0.93 1.10587 9.73609
+17 0.99 1.09366 12.0021
+18 1.05 1.01022 14.3566
+19 1.11 0.957935 16.8516
+20 1.17 0.952441 19.6077
+21 1.23 0.943658 22.6255
+22 1.29 0.990546 26.1098
+23 1.35 0.978714 29.8802
+24 1.41 0.991914 34.0485
+25 1.47 1.00786 38.6519
+26 1.53 1.00404 43.6198
+27 1.59 1.01219 49.0285
+28 1.65 1.01008 54.8409
+29 1.71 1.00427 61.0478
+30 1.77 1.02944 67.8645
+31 1.83 0.993884 74.8994
+32 1.89 0.992061 82.3894
+33 1.95 1.00411 90.4593
+34 2.01 0.992339 98.933
+35 2.07 0.996293 107.956
+36 2.13 0.98663 117.417
+37 2.19 1.00255 127.579
+38 2.25 1.00013 138.28
+39 2.31 1.00356 149.598
+40 2.37 1.01089 161.599
+41 2.43 0.998792 174.064
+42 2.49 0.999139 187.157
+43 2.55 1.00271 200.937
+44 2.61 0.99801 215.306
+45 2.67 1.00332 230.423
+46 2.73 1.00558 246.262
+47 2.79 1.00394 262.779
+48 2.85 0.99452 279.852
+49 2.91 0.989522 297.561
+50 2.97 1.00248 316.25
+101000 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0.0148024 0.000713267
+4 0.21 0.030405 0.00356633
+5 0.27 0.115265 0.021398
+6 0.33 0.163803 0.0592011
+7 0.39 0.307821 0.158345
+8 0.45 0.480947 0.364479
+9 0.51 0.580637 0.684023
+10 0.57 0.760714 1.20685
+11 0.63 0.937204 1.99358
+12 0.69 1.0003 3.00071
+13 0.75 1.05962 4.26106
+14 0.81 1.12396 5.82026
+15 0.87 1.16911 7.69116
+16 0.93 1.17764 9.84451
+17 0.99 1.05958 12.0399
+18 1.05 1.00012 14.3709
+19 1.11 0.948898 16.8424
+20 1.17 0.942581 19.5699
+21 1.23 0.934959 22.5599
+22 1.29 0.990343 26.0435
+23 1.35 0.962976 29.7532
+24 1.41 1.01109 34.0021
+25 1.47 1.01239 38.6262
+26 1.53 1.02134 43.6797
+27 1.59 1.00405 49.0449
+28 1.65 1.00202 54.811
+29 1.71 1.01212 61.0663
+30 1.77 1.01037 67.7568
+31 1.83 0.998721 74.826
+32 1.89 0.984125 82.2561
+33 1.95 1.00926 90.3673
+34 2.01 1.00788 98.9736
+35 2.07 1.00448 108.071
+36 2.13 0.987002 117.535
+37 2.19 0.989744 127.568
+38 2.25 0.983928 138.096
+39 2.31 1.00008 149.374
+40 2.37 1.0077 161.337
+41 2.43 1.01571 174.014
+42 2.49 1.00235 187.148
+43 2.55 1.00068 200.901
+44 2.61 0.996227 215.244
+45 2.67 1.00545 230.393
+46 2.73 0.993486 246.042
+47 2.79 1.00411 262.561
+48 2.85 1.00823 279.869
+49 2.91 0.992432 297.631
+50 2.97 0.999263 316.26
+101050 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0.0760125 0.00713267
+5 0.27 0.119875 0.0256776
+6 0.33 0.194709 0.0706134
+7 0.39 0.307821 0.169757
+8 0.45 0.450992 0.363053
+9 0.51 0.607855 0.697575
+10 0.57 0.760714 1.2204
+11 0.63 0.859882 1.94223
+12 0.69 1.01376 2.96291
+13 0.75 1.11659 4.29101
+14 0.81 1.12498 5.85164
+15 0.87 1.17802 7.7368
+16 0.93 1.16984 9.87589
+17 0.99 1.02068 11.9907
+18 1.05 1.01389 14.3538
+19 1.11 0.966972 16.8723
+20 1.17 0.931489 19.5678
+21 1.23 0.971537 22.6748
+22 1.29 0.942286 25.9893
+23 1.35 0.971864 29.7332
+24 1.41 0.980542 33.8538
+25 1.47 1.01114 38.4722
+26 1.53 1.02134 43.5257
+27 1.59 1.02728 49.015
+28 1.65 1.00401 54.7924
+29 1.71 1.02839 61.1484
+30 1.77 0.99174 67.7154
+31 1.83 1.00255 74.8117
+32 1.89 0.995934 82.331
+33 1.95 0.986536 90.2596
+34 2.01 1.00044 98.8024
+35 2.07 0.996372 107.826
+36 2.13 1.00047 117.419
+37 2.19 0.995584 127.511
+38 2.25 1.00939 138.312
+39 2.31 1.00488 149.645
+40 2.37 1.00656 161.594
+41 2.43 1.00576 174.146
+42 2.49 0.987056 187.081
+43 2.55 0.995183 200.757
+44 2.61 0.993898 215.067
+45 2.67 1.00512 230.211
+46 2.73 0.999055 245.948
+47 2.79 1.0182 262.699
+48 2.85 0.997636 279.825
+49 2.91 0.990798 297.558
+50 2.97 0.997121 316.147
+101100 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0.0380062 0.00356633
+5 0.27 0.101433 0.0192582
+6 0.33 0.210162 0.0677603
+7 0.39 0.31225 0.168331
+8 0.45 0.437679 0.35592
+9 0.51 0.609151 0.691155
+10 0.57 0.770054 1.2204
+11 0.63 0.855634 1.93866
+12 0.69 1.04989 2.99572
+13 0.75 1.0986 4.30243
+14 0.81 1.15069 5.89872
+15 0.87 1.1905 7.80385
+16 0.93 1.10626 9.82668
+17 0.99 1.04787 11.9979
+18 1.05 0.976251 14.2732
+19 1.11 0.956839 16.7653
+20 1.17 0.955645 19.5307
+21 1.23 0.99161 22.7019
+22 1.29 0.96743 26.1049
+23 1.35 0.943906 29.7411
+24 1.41 0.993103 33.9144
+25 1.47 1.00552 38.5071
+26 1.53 1.03345 43.6205
+27 1.59 1.01419 49.0399
+28 1.65 1.0138 54.8738
+29 1.71 1.01673 61.1576
+30 1.77 0.997341 67.7618
+31 1.83 0.98814 74.7561
+32 1.89 1.00387 82.3352
+33 1.95 0.997274 90.3502
+34 2.01 0.995596 98.8516
+35 2.07 1.00685 107.97
+36 2.13 0.998903 117.549
+37 2.19 0.982567 127.509
+38 2.25 1.00419 138.253
+39 2.31 1.00615 149.601
+40 2.37 0.995687 161.421
+41 2.43 1.01171 174.047
+42 2.49 0.997942 187.124
+43 2.55 0.997881 200.838
+44 2.61 0.999447 215.228
+45 2.67 1.00427 230.359
+46 2.73 1.0044 246.18
+47 2.79 0.995048 262.55
+48 2.85 0.992069 279.581
+49 2.91 1.00036 297.484
+50 2.97 1.00286 316.18
+101150 50
+1 0.03 0 0
+2 0.09 0.040178 0.000713267
+3 0.15 0 0.000713267
+4 0.21 0.0380062 0.0042796
+5 0.27 0.0968224 0.0192582
+6 0.33 0.163803 0.0570613
+7 0.39 0.385329 0.18117
+8 0.45 0.409388 0.356633
+9 0.51 0.571565 0.671184
+10 0.57 0.767978 1.199
+11 0.63 0.883674 1.9408
+12 0.69 1.04989 2.99786
+13 0.75 1.07281 4.27389
+14 0.81 1.17177 5.89943
+15 0.87 1.14905 7.73823
+16 0.93 1.12615 9.79743
+17 0.99 1.06233 11.9986
+18 1.05 0.979924 14.2825
+19 1.11 0.968341 16.8046
+20 1.17 0.943814 19.5357
+21 1.23 0.955702 22.592
+22 1.29 0.959116 25.9658
+23 1.35 0.974456 29.7197
+24 1.41 0.984955 33.8588
+25 1.47 1.00068 38.4294
+26 1.53 1.03993 43.5749
+27 1.59 1.01913 49.0207
+28 1.65 1.01603 54.8673
+29 1.71 1.01316 61.1291
+30 1.77 1.0024 67.7668
+31 1.83 1.0095 74.9123
+32 1.89 0.981952 82.326
+33 1.95 0.994789 90.321
+34 2.01 0.993341 98.8031
+35 2.07 0.987 107.742
+36 2.13 0.995036 117.283
+37 2.19 1.00304 127.451
+38 2.25 1.00199 138.172
+39 2.31 1.0231 149.71
+40 2.37 0.996588 161.541
+41 2.43 0.999993 174.021
+42 2.49 0.990539 187.001
+43 2.55 1.00307 200.787
+44 2.61 1.01144 215.349
+45 2.67 0.995841 230.353
+46 2.73 1.00037 246.111
+47 2.79 0.988068 262.366
+48 2.85 1.01014 279.707
+49 2.91 1.0075 297.738
+50 2.97 0.998919 316.361
+101200 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0.0444073 0.0021398
+4 0.21 0.0532087 0.00713267
+5 0.27 0.106044 0.0235378
+6 0.33 0.188528 0.0670471
+7 0.39 0.316679 0.169044
+8 0.45 0.424365 0.350927
+9 0.51 0.587117 0.674037
+10 0.57 0.747222 1.18759
+11 0.63 0.915962 1.95649
+12 0.69 0.987549 2.95078
+13 0.75 1.10699 4.26748
+14 0.81 1.18206 5.90728
+15 0.87 1.17045 7.78031
+16 0.93 1.13942 9.86377
+17 0.99 1.04478 12.0285
+18 1.05 1.00135 14.3623
+19 1.11 0.952458 16.8431
+20 1.17 0.940609 19.5649
+21 1.23 0.947449 22.5949
+22 1.29 0.95425 25.9515
+23 1.35 0.972604 29.6983
+24 1.41 0.997516 33.8902
+25 1.47 1.03035 38.5963
+26 1.53 1.01298 43.6084
+27 1.59 1.0174 49.0449
+28 1.65 1.0133 54.8759
+29 1.71 0.995614 61.0292
+30 1.77 1.01975 67.7817
+31 1.83 1.00376 74.8866
+32 1.89 0.985164 82.3245
+33 1.95 0.994257 90.3153
+34 2.01 0.990167 98.7703
+35 2.07 0.992749 107.761
+36 2.13 1.00515 117.399
+37 2.19 0.997203 127.508
+38 2.25 1.00146 138.223
+39 2.31 1.00413 149.548
+40 2.37 1.00248 161.449
+41 2.43 1.00908 174.042
+42 2.49 1.00066 187.155
+43 2.55 0.993885 200.814
+44 2.61 0.999496 215.204
+45 2.67 0.998682 230.251
+46 2.73 0.994391 245.914
+47 2.79 1.00814 262.5
+48 2.85 1.00233 279.707
+49 2.91 1.00766 297.741
+50 2.97 0.991765 316.23
+101250 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0.0148024 0.000713267
+4 0.21 0.0152025 0.0021398
+5 0.27 0.106044 0.0185449
+6 0.33 0.157621 0.0549215
+7 0.39 0.305606 0.153352
+8 0.45 0.454321 0.348074
+9 0.51 0.600078 0.678317
+10 0.57 0.791848 1.22254
+11 0.63 0.922759 1.99715
+12 0.69 1.00101 3.00499
+13 0.75 1.05482 4.25963
+14 0.81 1.14812 5.85235
+15 0.87 1.19897 7.77104
+16 0.93 1.14137 9.85806
+17 0.99 1.04581 12.025
+18 1.05 1.0041 14.3652
+19 1.11 0.953553 16.8488
+20 1.17 0.921629 19.5157
+21 1.23 0.955255 22.5706
+22 1.29 0.972296 25.9907
+23 1.35 0.978159 29.7589
+24 1.41 0.997685 33.9515
+25 1.47 1.01021 38.5656
+26 1.53 1.01326 43.5792
+27 1.59 1.02287 49.0449
+28 1.65 1.03078 54.9765
+29 1.71 0.988689 61.087
+30 1.77 0.995402 67.6783
+31 1.83 1.00074 74.7618
+32 1.89 0.999997 82.3117
+33 1.95 0.996032 90.3167
+34 2.01 0.99426 98.8067
+35 2.07 1.00574 107.915
+36 2.13 0.996672 117.472
+37 2.19 0.993896 127.547
+38 2.25 0.986795 138.106
+39 2.31 1.00008 149.384
+40 2.37 1.01305 161.411
+41 2.43 1.01308 174.054
+42 2.49 1.00072 187.168
+43 2.55 0.992484 200.807
+44 2.61 1.00509 215.278
+45 2.67 1.00005 230.346
+46 2.73 1.00241 246.136
+47 2.79 0.998474 262.562
+48 2.85 0.993191 279.612
+49 2.91 1.00789 297.65
+50 2.97 0.992071 316.146
+101300 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0.0148024 0.000713267
+4 0.21 0.0456075 0.00499287
+5 0.27 0.0783801 0.0171184
+6 0.33 0.176165 0.0577746
+7 0.39 0.343253 0.168331
+8 0.45 0.42603 0.350927
+9 0.51 0.565084 0.661912
+10 0.57 0.788734 1.20399
+11 0.63 0.883674 1.94579
+12 0.69 0.998884 2.9515
+13 0.75 1.11779 4.28103
+14 0.81 1.17177 5.90656
+15 0.87 1.16332 7.76819
+16 0.93 1.10353 9.78602
+17 0.99 1.08471 12.0335
+18 1.05 1.01298 14.3944
+19 1.11 0.939313 16.8409
+20 1.17 0.952687 19.5977
+21 1.23 0.939197 22.6013
+22 1.29 0.970269 26.0143
+23 1.35 0.987787 29.8195
+24 1.41 0.970698 33.8987
+25 1.47 1.01583 38.5385
+26 1.53 1.01586 43.5649
+27 1.59 1.01313 48.9786
+28 1.65 1.0221 54.8602
+29 1.71 1.01904 61.1583
+30 1.77 0.992709 67.7318
+31 1.83 0.996605 74.786
+32 1.89 1.00226 82.3531
+33 1.95 0.995056 90.3502
+34 2.01 0.997768 98.8702
+35 2.07 1.00078 107.934
+36 2.13 0.997639 117.5
+37 2.19 0.994318 127.579
+38 2.25 0.985061 138.119
+39 2.31 1.01058 149.516
+40 2.37 1.00644 161.464
+41 2.43 1.00022 173.947
+42 2.49 0.99816 187.027
+43 2.55 1.00016 200.772
+44 2.61 1.00118 215.187
+45 2.67 1.00881 230.387
+46 2.73 1.00413 246.203
+47 2.79 0.989759 262.486
+48 2.85 1.00952 279.817
+49 2.91 0.99554 297.634
+50 2.97 0.995399 316.191
+101350 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0.06081 0.00570613
+5 0.27 0.115265 0.0235378
+6 0.33 0.203981 0.0706134
+7 0.39 0.33661 0.17903
+8 0.45 0.487604 0.388017
+9 0.51 0.565084 0.699001
+10 0.57 0.719201 1.1933
+11 0.63 0.890471 1.9408
+12 0.69 1.02368 2.97147
+13 0.75 1.08001 4.25606
+14 0.81 1.13887 5.83595
+15 0.87 1.16956 7.70756
+16 0.93 1.13825 9.78887
+17 0.99 1.09159 12.0506
+18 1.05 1.00349 14.3894
+19 1.11 0.94835 16.8595
+20 1.17 0.954659 19.622
+21 1.23 0.938082 22.622
+22 1.29 0.975744 26.0542
+23 1.35 0.982417 29.8388
+24 1.41 0.976808 33.9437
+25 1.47 1.01567 38.5827
+26 1.53 0.991209 43.4872
+27 1.59 1.00912 48.8795
+28 1.65 1.02235 54.7625
+29 1.71 1.01581 61.0407
+30 1.77 1.01425 67.7568
+31 1.83 1.00688 74.8837
+32 1.89 0.990738 82.3638
+33 1.95 0.993192 90.3459
+34 2.01 0.979809 98.7126
+35 2.07 1.00259 107.792
+36 2.13 0.992953 117.314
+37 2.19 1.00311 127.482
+38 2.25 1.00219 138.205
+39 2.31 1.01317 149.632
+40 2.37 1.00464 161.558
+41 2.43 0.995592 173.984
+42 2.49 1.01345 187.264
+43 2.55 0.999335 200.998
+44 2.61 1.00252 215.432
+45 2.67 0.984243 230.261
+46 2.73 0.993078 245.904
+47 2.79 0.996436 262.297
+48 2.85 0.997719 279.424
+49 2.91 1.00566 297.423
+50 2.97 1.00963 316.245
+101400 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0.0444073 0.0021398
+4 0.21 0.0456075 0.0064194
+5 0.27 0.101433 0.0221113
+6 0.33 0.228706 0.074893
+7 0.39 0.283461 0.166191
+8 0.45 0.460977 0.363766
+9 0.51 0.637664 0.714693
+10 0.57 0.706748 1.20043
+11 0.63 0.902367 1.95792
+12 0.69 1.01022 2.97504
+13 0.75 1.08361 4.26391
+14 0.81 1.14709 5.85521
+15 0.87 1.16599 7.72111
+16 0.93 1.14761 9.81954
+17 0.99 1.07851 12.0542
+18 1.05 1.0093 14.4066
+19 1.11 0.948076 16.8759
+20 1.17 0.950962 19.6277
+21 1.23 0.946334 22.6541
+22 1.29 0.955669 26.0157
+23 1.35 0.96742 29.7425
+24 1.41 0.991745 33.9101
+25 1.47 1.01255 38.535
+26 1.53 1.01716 43.5678
+27 1.59 1.02314 49.035
+28 1.65 1.02867 54.9544
+29 1.71 0.999422 61.1312
+30 1.77 1.00262 67.7703
+31 1.83 0.994589 74.8103
+32 1.89 1.0051 82.3987
+33 1.95 1.00429 90.47
+34 2.01 0.960597 98.6726
+35 2.07 1.00606 107.784
+36 2.13 1.00374 117.409
+37 2.19 0.993474 127.479
+38 2.25 0.996994 138.147
+39 2.31 1.01671 149.613
+40 2.37 1.00145 161.502
+41 2.43 1.00074 173.991
+42 2.49 1.00725 187.19
+43 2.55 0.996791 200.889
+44 2.61 1.00653 215.381
+45 2.67 0.989734 230.293
+46 2.73 1.01047 246.21
+47 2.79 0.993791 262.559
+48 2.85 0.998426 279.699
+49 2.91 0.993229 297.475
+50 2.97 1.00309 316.175
+101450 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0.0444073 0.0021398
+4 0.21 0.06081 0.00784593
+5 0.27 0.115265 0.0256776
+6 0.33 0.188528 0.0691869
+7 0.39 0.279032 0.159058
+8 0.45 0.447664 0.350927
+9 0.51 0.600078 0.68117
+10 0.57 0.795999 1.22825
+11 0.63 0.905765 1.98859
+12 0.69 1.01376 3.00927
+13 0.75 1.05422 4.2632
+14 0.81 1.14401 5.85021
+15 0.87 1.16287 7.71113
+16 0.93 1.15229 9.81812
+17 0.99 1.05441 12.0029
+18 1.05 1.00073 14.3352
+19 1.11 0.966972 16.8538
+20 1.17 0.952194 19.6091
+21 1.23 0.937636 22.6077
+22 1.29 0.948369 25.9437
+23 1.35 1.00464 29.8138
+24 1.41 0.990896 33.9779
+25 1.47 1.0163 38.6198
+26 1.53 1.00058 43.5706
+27 1.59 1.01606 49
+28 1.65 1.02533 54.9001
+29 1.71 1.01569 61.1776
+30 1.77 0.987324 67.7154
+31 1.83 0.998116 74.7803
+32 1.89 0.999713 82.3281
+33 1.95 0.987423 90.2639
+34 2.01 1.00871 98.8773
+35 2.07 0.97558 107.713
+36 2.13 0.99816 117.284
+37 2.19 1.0048 127.469
+38 2.25 1.00866 138.262
+39 2.31 0.996536 149.501
+40 2.37 1.0071 161.456
+41 2.43 1.00136 173.954
+42 2.49 0.997234 187.021
+43 2.55 0.995234 200.699
+44 2.61 1.00827 215.215
+45 2.67 1.00308 230.329
+46 2.73 1.00069 246.091
+47 2.79 0.99843 262.517
+48 2.85 1.0015 279.71
+49 2.91 0.994345 297.506
+50 2.97 1.0003 316.154
+101500 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0.0888146 0.0042796
+4 0.21 0.0228037 0.0064194
+5 0.27 0.0968224 0.021398
+6 0.33 0.173075 0.0613409
+7 0.39 0.296748 0.156919
+8 0.45 0.499253 0.370899
+9 0.51 0.585821 0.693295
+10 0.57 0.776281 1.22682
+11 0.63 0.898118 1.98074
+12 0.69 1.04706 3.03495
+13 0.75 1.0968 4.33951
+14 0.81 1.12704 5.903
+15 0.87 1.14772 7.73966
+16 0.93 1.12537 9.79743
+17 0.99 1.08195 12.0392
+18 1.05 0.995226 14.3588
+19 1.11 0.945611 16.8217
+20 1.17 0.98128 19.6612
+21 1.23 0.943212 22.6776
+22 1.29 0.966213 26.0763
+23 1.35 0.972975 29.8245
+24 1.41 0.984107 33.9601
+25 1.47 1.02567 38.6448
+26 1.53 1.00836 43.6341
+27 1.59 1.01099 49.0364
+28 1.65 1.00797 54.8367
+29 1.71 1.00438 61.0442
+30 1.77 1.00553 67.7026
+31 1.83 1.00789 74.8367
+32 1.89 1.01218 82.4786
+33 1.95 0.998251 90.5014
+34 2.01 1.00002 99.0407
+35 2.07 0.977943 107.897
+36 2.13 0.985589 117.348
+37 2.19 1.00037 127.489
+38 2.25 1.00413 138.233
+39 2.31 1.00172 149.53
+40 2.37 1.00314 161.439
+41 2.43 1.00445 173.974
+42 2.49 1.01808 187.315
+43 2.55 0.994819 200.987
+44 2.61 1.00316 215.43
+45 2.67 0.995037 230.422
+46 2.73 0.989456 246.008
+47 2.79 1.00034 262.465
+48 2.85 0.998717 279.61
+49 2.91 0.992113 297.366
+50 2.97 1.00875 316.172
+101550 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0.0148024 0.000713267
+4 0.21 0.0684112 0.00713267
+5 0.27 0.101433 0.0228245
+6 0.33 0.188528 0.0663338
+7 0.39 0.33218 0.173324
+8 0.45 0.450992 0.366619
+9 0.51 0.574157 0.682596
+10 0.57 0.767978 1.21041
+11 0.63 0.876026 1.94579
+12 0.69 0.990383 2.94294
+13 0.75 1.12858 4.28531
+14 0.81 1.18463 5.92867
+15 0.87 1.17401 7.80742
+16 0.93 1.1086 9.83452
+17 0.99 1.0613 12.0335
+18 1.05 0.974109 14.3039
+19 1.11 0.943421 16.7611
+20 1.17 0.955399 19.5257
+21 1.23 0.966853 22.6177
+22 1.29 0.958102 25.9879
+23 1.35 0.996119 29.8252
+24 1.41 0.979863 33.9429
+25 1.47 1.01052 38.5585
+26 1.53 1.02494 43.6298
+27 1.59 1.01233 49.0392
+28 1.65 1.02173 54.9187
+29 1.71 1.00992 61.1605
+30 1.77 1.01081 67.8538
+31 1.83 0.987233 74.8417
+32 1.89 0.996218 82.3631
+33 1.95 0.988399 90.3067
+34 2.01 0.99593 98.811
+35 2.07 0.992119 107.796
+36 2.13 0.999275 117.378
+37 2.19 0.998258 127.497
+38 2.25 1.00859 138.289
+39 2.31 1.00975 149.677
+40 2.37 1.0023 161.576
+41 2.43 0.989305 173.922
+42 2.49 0.998269 187.004
+43 2.55 0.997362 200.71
+44 2.61 0.996326 215.055
+45 2.67 1.00583 230.21
+46 2.73 0.996293 245.903
+47 2.79 0.995048 262.273
+48 2.85 1.01343 279.67
+49 2.91 0.994544 297.47
+50 2.97 0.994328 316.007
+101600 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0.0152025 0.00142653
+5 0.27 0.0922118 0.0156919
+6 0.33 0.222524 0.0670471
+7 0.39 0.323322 0.171184
+8 0.45 0.392746 0.339515
+9 0.51 0.583229 0.660485
+10 0.57 0.775243 1.1933
+11 0.63 0.904916 1.95292
+12 0.69 1.03218 2.99215
+13 0.75 1.11299 4.31598
+14 0.81 1.12756 5.88017
+15 0.87 1.16465 7.74394
+16 0.93 1.14878 9.84451
+17 0.99 1.03755 11.9943
+18 1.05 1.00685 14.3409
+19 1.11 0.953553 16.8245
+20 1.17 0.946525 19.5635
+21 1.23 0.970868 22.6683
+22 1.29 0.964591 26.0613
+23 1.35 1.00056 29.9158
+24 1.41 0.989029 34.072
+25 1.47 1.01005 38.6854
+26 1.53 0.996254 43.6148
+27 1.59 1.01393 49.0328
+28 1.65 1.02099 54.908
+29 1.71 1.00923 61.1455
+30 1.77 1.01199 67.8466
+31 1.83 0.995295 74.8916
+32 1.89 0.99858 82.4308
+33 1.95 0.984051 90.3395
+34 2.01 1.0022 98.8973
+35 2.07 0.996293 107.92
+36 2.13 1.00999 117.605
+37 2.19 0.989815 127.638
+38 2.25 1.00786 138.422
+39 2.31 0.996156 149.657
+40 2.37 1.0032 161.566
+41 2.43 0.996906 174.008
+42 2.49 1.00741 187.209
+43 2.55 0.999283 200.942
+44 2.61 1.00128 215.358
+45 2.67 1.00375 230.481
+46 2.73 0.997063 246.187
+47 2.79 1.00298 262.688
+48 2.85 0.998841 279.835
+49 2.91 1.00267 297.78
+50 2.97 1.00164 316.453
+101650 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0.0296049 0.00142653
+4 0.21 0.0228037 0.00356633
+5 0.27 0.119875 0.0221113
+6 0.33 0.194709 0.0670471
+7 0.39 0.316679 0.169044
+8 0.45 0.459313 0.365906
+9 0.51 0.601374 0.696862
+10 0.57 0.727504 1.19686
+11 0.63 0.913413 1.96362
+12 0.69 1.00668 2.97718
+13 0.75 1.05542 4.23252
+14 0.81 1.15583 5.83595
+15 0.87 1.16956 7.70756
+16 0.93 1.13045 9.77461
+17 0.99 1.08333 12.0193
+18 1.05 0.983902 14.3124
+19 1.11 0.969984 16.8388
+20 1.17 0.932229 19.5364
+21 1.23 0.944996 22.5585
+22 1.29 0.985882 26.0264
+23 1.35 0.989453 29.8381
+24 1.41 0.989199 33.995
+25 1.47 0.97507 38.4486
+26 1.53 1.02206 43.5057
+27 1.59 1.02247 48.9693
+28 1.65 1.01653 54.8188
+29 1.71 1.01269 61.0777
+30 1.77 1.01134 67.7746
+31 1.83 0.991869 74.7953
+32 1.89 0.986959 82.2468
+33 1.95 1.00775 90.3459
+34 2.01 0.987828 98.781
+35 2.07 0.994088 107.784
+36 2.13 1.00255 117.397
+37 2.19 0.996429 127.498
+38 2.25 1.00699 138.272
+39 2.31 0.992046 149.461
+40 2.37 1.00164 161.352
+41 2.43 1.00525 173.897
+42 2.49 0.994676 186.932
+43 2.55 1.00894 200.797
+44 2.61 1.00688 215.294
+45 2.67 0.991297 230.23
+46 2.73 1.00132 246.002
+47 2.79 1.00103 262.471
+48 2.85 1.00146 279.663
+49 2.91 0.999008 297.542
+50 2.97 1.00229 316.228
+101700 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0.0296049 0.00142653
+4 0.21 0.0532087 0.0064194
+5 0.27 0.0829907 0.0192582
+6 0.33 0.213253 0.0684736
+7 0.39 0.316679 0.170471
+8 0.45 0.401067 0.342368
+9 0.51 0.60267 0.674037
+10 0.57 0.74826 1.1883
+11 0.63 0.92106 1.96148
+12 0.69 0.987549 2.95578
+13 0.75 1.14417 4.31669
+14 0.81 1.12858 5.88231
+15 0.87 1.17134 7.75678
+16 0.93 1.12615 9.81598
+17 0.99 1.04065 11.9722
+18 1.05 1.00318 14.3103
+19 1.11 0.979295 16.8609
+20 1.17 0.942828 19.5892
+21 1.23 0.942542 22.6034
+22 1.29 0.94553 25.9294
+23 1.35 1.00241 29.791
+24 1.41 1.00414 34.0107
+25 1.47 0.994746 38.5542
+26 1.53 1.02047 43.6034
+27 1.59 1.01646 49.035
+28 1.65 1.02049 54.9073
+29 1.71 0.993882 61.0499
+30 1.77 1.00844 67.7275
+31 1.83 0.982094 74.679
+32 1.89 1.01823 82.3666
+33 1.95 0.999227 90.3973
+34 2.01 0.99852 98.9237
+35 2.07 0.993458 107.921
+36 2.13 0.987671 117.392
+37 2.19 1.01402 127.67
+38 2.25 1.00473 138.421
+39 2.31 0.993943 149.631
+40 2.37 0.994365 161.435
+41 2.43 1.00376 173.962
+42 2.49 1.01248 187.23
+43 2.55 1.00141 200.992
+44 2.61 0.9937 215.299
+45 2.67 0.995131 230.292
+46 2.73 1.00992 246.2
+47 2.79 0.992577 262.53
+48 2.85 0.998467 279.67
+49 2.91 1.00335 297.628
+50 2.97 1.00301 316.327
+101750 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0.0380062 0.00356633
+5 0.27 0.0876012 0.0171184
+6 0.33 0.173075 0.0570613
+7 0.39 0.329966 0.163338
+8 0.45 0.462642 0.361626
+9 0.51 0.613039 0.699001
+10 0.57 0.735806 1.20471
+11 0.63 0.895569 1.95649
+12 0.69 1.03785 3.00143
+13 0.75 1.07881 4.28459
+14 0.81 1.16355 5.89872
+15 0.87 1.1544 7.74608
+16 0.93 1.11172 9.77889
+17 0.99 1.07713 12.0107
+18 1.05 0.994001 14.3274
+19 1.11 0.963412 16.8367
+20 1.17 0.948497 19.5813
+21 1.23 0.964177 22.6648
+22 1.29 0.960738 26.0442
+23 1.35 0.986676 29.8452
+24 1.41 1.00855 34.0835
+25 1.47 1.00037 38.6526
+26 1.53 1.01744 43.6869
+27 1.59 0.999111 49.0257
+28 1.65 1.00314 54.7981
+29 1.71 1.01431 61.067
+30 1.77 1.00154 67.699
+31 1.83 1.00074 74.7825
+32 1.89 0.987904 82.2411
+33 1.95 1.00615 90.3274
+34 2.01 0.999355 98.8609
+35 2.07 1.00763 107.986
+36 2.13 0.991539 117.494
+37 2.19 1.00579 127.69
+38 2.25 0.999127 138.38
+39 2.31 0.992994 149.579
+40 2.37 0.9907 161.34
+41 2.43 0.995077 173.759
+42 2.49 1.01547 187.066
+43 2.55 0.994612 200.735
+44 2.61 1.00366 215.185
+45 2.67 1.00162 230.276
+46 2.73 1.00227 246.063
+47 2.79 0.99882 262.496
+48 2.85 1.00399 279.731
+49 2.91 0.99279 297.499
+50 2.97 0.992377 316
+101800 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0.0148024 0.000713267
+4 0.21 0.0380062 0.0042796
+5 0.27 0.0968224 0.0192582
+6 0.33 0.191618 0.0634807
+7 0.39 0.31225 0.164051
+8 0.45 0.462642 0.36234
+9 0.51 0.625999 0.706847
+10 0.57 0.769016 1.23538
+11 0.63 0.89472 1.98645
+12 0.69 1.00739 3.00071
+13 0.75 1.05542 4.25606
+14 0.81 1.14195 5.84023
+15 0.87 1.17802 7.72539
+16 0.93 1.12654 9.78531
+17 0.99 1.05579 11.9729
+18 1.05 0.989717 14.2796
+19 1.11 0.97327 16.8146
+20 1.17 0.962547 19.5999
+21 1.23 0.969084 22.699
+22 1.29 0.945328 26.0243
+23 1.35 0.988342 29.8317
+24 1.41 0.996158 34.0178
+25 1.47 0.997869 38.5756
+26 1.53 1.00937 43.5699
+27 1.59 1.01526 48.995
+28 1.65 1.01256 54.8217
+29 1.71 1.01604 61.1013
+30 1.77 1.00176 67.7347
+31 1.83 1.00779 74.868
+32 1.89 0.985542 82.3088
+33 1.95 1.00429 90.3802
+34 2.01 0.987327 98.811
+35 2.07 1.0048 107.911
+36 2.13 1.00277 117.526
+37 2.19 1.00677 127.732
+38 2.25 0.993927 138.367
+39 2.31 0.988441 149.514
+40 2.37 1.00314 161.423
+41 2.43 1.00445 173.959
+42 2.49 0.995601 187.005
+43 2.55 1.00717 200.847
+44 2.61 1.01079 215.399
+45 2.67 1.00058 230.475
+46 2.73 0.999508 246.219
+47 2.79 0.996609 262.615
+48 2.85 0.9988 279.761
+49 2.91 1.00048 297.667
+50 2.97 0.992912 316.178
+101850 50
+1 0.03 0 0
+2 0.09 0.040178 0.000713267
+3 0.15 0.0148024 0.00142653
+4 0.21 0.0228037 0.00356633
+5 0.27 0.0968224 0.0185449
+6 0.33 0.166893 0.0570613
+7 0.39 0.307821 0.156205
+8 0.45 0.469298 0.357347
+9 0.51 0.572861 0.672611
+10 0.57 0.775243 1.20542
+11 0.63 0.907465 1.96719
+12 0.69 1.02368 2.99786
+13 0.75 1.0986 4.30456
+14 0.81 1.09928 5.82953
+15 0.87 1.15351 7.67546
+16 0.93 1.16282 9.80171
+17 0.99 1.0823 12.0442
+18 1.05 0.996756 14.3673
+19 1.11 0.947528 16.8352
+20 1.17 0.948497 19.5799
+21 1.23 0.951687 22.6234
+22 1.29 0.965605 26.02
+23 1.35 0.985935 29.8181
+24 1.41 1.0004 34.0221
+25 1.47 1.00193 38.5984
+26 1.53 1.00937 43.5927
+27 1.59 1.01299 49.0057
+28 1.65 1.01739 54.8602
+29 1.71 1.02123 61.1719
+30 1.77 1.0024 67.8096
+31 1.83 0.999326 74.883
+32 1.89 0.99499 82.3951
+33 1.95 0.999049 90.4244
+34 2.01 0.990167 98.8795
+35 2.07 0.997475 107.913
+36 2.13 0.990275 117.409
+37 2.19 1.00466 127.593
+38 2.25 0.999994 138.292
+39 2.31 1.00413 149.617
+40 2.37 1.00109 161.501
+41 2.43 1.02074 174.24
+42 2.49 0.987165 187.176
+43 2.55 0.990512 200.789
+44 2.61 0.995236 215.118
+45 2.67 1.00607 230.276
+46 2.73 0.991856 245.899
+47 2.79 1.00142 262.374
+48 2.85 1.0133 279.77
+49 2.91 0.999406 297.656
+50 2.97 1.00412 316.376
+101900 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0.0444073 0.0021398
+4 0.21 0.0456075 0.0064194
+5 0.27 0.0783801 0.0185449
+6 0.33 0.176165 0.0592011
+7 0.39 0.310035 0.159058
+8 0.45 0.417709 0.338088
+9 0.51 0.607855 0.672611
+10 0.57 0.755525 1.19187
+11 0.63 0.934655 1.97646
+12 0.69 1.0003 2.98359
+13 0.75 1.0998 4.29173
+14 0.81 1.16303 5.90514
+15 0.87 1.16822 7.77461
+16 0.93 1.09378 9.77461
+17 0.99 1.05097 11.9522
+18 1.05 1.00073 14.2846
+19 1.11 0.944242 16.7439
+20 1.17 0.965505 19.5378
+21 1.23 0.947449 22.5678
+22 1.29 0.993182 26.0613
+23 1.35 0.984639 29.8545
+24 1.41 0.993272 34.0285
+25 1.47 0.987875 38.5407
+26 1.53 1.01672 43.5713
+27 1.59 1.01032 48.97
+28 1.65 1.01938 54.8359
+29 1.71 0.999076 61.0107
+30 1.77 1.02653 67.8081
+31 1.83 0.991566 74.8267
+32 1.89 0.999997 82.3766
+33 1.95 0.997452 90.393
+34 2.01 0.986157 98.8138
+35 2.07 0.980148 107.69
+36 2.13 1.00917 117.367
+37 2.19 1.00959 127.601
+38 2.25 0.995261 138.25
+39 2.31 1.00767 149.615
+40 2.37 0.998931 161.474
+41 2.43 0.998907 173.94
+42 2.49 1.00725 187.139
+43 2.55 0.997207 200.844
+44 2.61 0.998753 215.223
+45 2.67 1.00805 230.412
+46 2.73 0.991946 246.036
+47 2.79 1.00697 262.603
+48 2.85 0.986709 279.541
+49 2.91 1.00383 297.507
+50 2.97 1.00121 316.173
+101950 50
+1 0.03 0.281246 0.000713267
+2 0.09 0 0.000713267
+3 0.15 0.0444073 0.00285307
+4 0.21 0.06081 0.0085592
+5 0.27 0.0922118 0.0228245
+6 0.33 0.166893 0.0613409
+7 0.39 0.285675 0.153352
+8 0.45 0.444336 0.343795
+9 0.51 0.640256 0.696148
+10 0.57 0.750336 1.21184
+11 0.63 0.930406 1.99287
+12 0.69 1.05131 3.05136
+13 0.75 1.08301 4.33951
+14 0.81 1.15429 5.9408
+15 0.87 1.1027 7.70542
+16 0.93 1.11835 9.75036
+17 0.99 1.09676 12.0228
+18 1.05 0.995226 14.3424
+19 1.11 0.956292 16.8331
+20 1.17 0.942335 19.5599
+21 1.23 0.95704 22.6205
+22 1.29 0.985071 26.0856
+23 1.35 0.977048 29.8495
+24 1.41 0.998364 34.0449
+25 1.47 0.997713 38.602
+26 1.53 1.00822 43.5906
+27 1.59 1.01326 49.005
+28 1.65 1.01244 54.831
+29 1.71 1.00427 61.0378
+30 1.77 1.0135 67.7489
+31 1.83 0.999225 74.8217
+32 1.89 1.01086 82.4536
+33 1.95 0.982631 90.3509
+34 2.01 0.998269 98.8752
+35 2.07 0.990938 107.85
+36 2.13 0.996598 117.406
+37 2.19 0.997836 127.521
+38 2.25 1.00226 138.245
+39 2.31 1.00849 149.618
+40 2.37 0.985173 161.314
+41 2.43 1.00874 173.903
+42 2.49 1.00464 187.068
+43 2.55 1.00707 200.908
+44 2.61 1.00653 215.399
+45 2.67 0.997309 230.426
+46 2.73 1.00866 246.314
+47 2.79 0.992967 262.65
+48 2.85 0.990739 279.658
+49 2.91 1.00471 297.639
+50 2.97 0.996394 316.215
+102000 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0.0148024 0.000713267
+4 0.21 0.0228037 0.00285307
+5 0.27 0.110654 0.0199715
+6 0.33 0.179256 0.0613409
+7 0.39 0.274603 0.149786
+8 0.45 0.449328 0.342368
+9 0.51 0.666177 0.708987
+10 0.57 0.727504 1.20899
+11 0.63 0.89302 1.95863
+12 0.69 1.01872 2.98431
+13 0.75 1.11959 4.31598
+14 0.81 1.15172 5.91369
+15 0.87 1.14549 7.74679
+16 0.93 1.12771 9.80884
+17 0.99 1.06922 12.0243
+18 1.05 0.99798 14.3502
+19 1.11 0.953279 16.8331
+20 1.17 0.959589 19.6098
+21 1.23 0.958378 22.6748
+22 1.29 0.972702 26.0963
+23 1.35 0.966865 29.821
+24 1.41 0.991575 33.9879
+25 1.47 1.00771 38.5906
+26 1.53 1.01326 43.6041
+27 1.59 1.01206 49.0121
+28 1.65 1.02781 54.9265
+29 1.71 1.00658 61.1476
+30 1.77 1.01576 67.8738
+31 1.83 0.986125 74.8538
+32 1.89 1.0102 82.4807
+33 1.95 0.988843 90.428
+34 2.01 0.985573 98.8438
+35 2.07 0.998105 107.883
+36 2.13 0.999424 117.466
+37 2.19 1.00157 127.619
+38 2.25 0.993127 138.245
+39 2.31 1.0028 149.555
+40 2.37 1.02062 161.671
+41 2.43 1.00885 174.262
+42 2.49 1.00072 187.375
+43 2.55 0.996947 201.076
+44 2.61 0.991867 215.357
+45 2.67 0.995463 230.355
+46 2.73 1.00055 246.116
+47 2.79 1.00025 262.571
+48 2.85 1.00192 279.771
+49 2.91 1.00403 297.74
+50 2.97 0.989125 316.18
+102050 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0.0148024 0.000713267
+4 0.21 0.0228037 0.00285307
+5 0.27 0.106044 0.0192582
+6 0.33 0.20089 0.0656205
+7 0.39 0.307821 0.164765
+8 0.45 0.459313 0.361626
+9 0.51 0.609151 0.696862
+10 0.57 0.714012 1.18759
+11 0.63 0.933805 1.97147
+12 0.69 0.963463 2.94151
+13 0.75 1.13218 4.28816
+14 0.81 1.14092 5.8709
+15 0.87 1.1651 7.73538
+16 0.93 1.13786 9.81598
+17 0.99 1.05992 12.0121
+18 1.05 1.02889 14.4101
+19 1.11 0.940956 16.8609
+20 1.17 0.950222 19.6106
+21 1.23 0.947449 22.6405
+22 1.29 0.996426 26.1455
+23 1.35 0.978899 29.9165
+24 1.41 0.997685 34.1091
+25 1.47 1.00646 38.7061
+26 1.53 0.987461 43.592
+27 1.59 0.983627 48.8481
+28 1.65 1.04157 54.8417
+29 1.71 1.01027 61.0856
+30 1.77 0.995725 67.679
+31 1.83 1.01031 74.8302
+32 1.89 0.994328 82.3374
+33 1.95 1.00837 90.4415
+34 2.01 1.00303 99.0064
+35 2.07 0.98952 107.968
+36 2.13 0.989829 117.459
+37 2.19 0.995584 127.551
+38 2.25 1.00593 138.315
+39 2.31 1.00887 149.693
+40 2.37 0.989979 161.445
+41 2.43 1.00799 174.025
+42 2.49 0.997833 187.101
+43 2.55 0.993158 200.75
+44 2.61 1.01129 215.31
+45 2.67 0.999108 230.363
+46 2.73 0.996021 246.052
+47 2.79 0.995352 262.427
+48 2.85 1.00308 279.647
+49 2.91 1.00965 297.717
+50 2.97 0.997465 316.312
+102100 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0.0532087 0.00499287
+5 0.27 0.110654 0.0221113
+6 0.33 0.194709 0.0670471
+7 0.39 0.307821 0.166191
+8 0.45 0.482612 0.373039
+9 0.51 0.561196 0.681883
+10 0.57 0.749298 1.19686
+11 0.63 0.912563 1.96291
+12 0.69 0.991091 2.96077
+13 0.75 1.12438 4.29815
+14 0.81 1.14812 5.89087
+15 0.87 1.14727 7.72682
+16 0.93 1.12732 9.78816
+17 0.99 1.07025 12.0057
+18 1.05 1.01022 14.3602
+19 1.11 0.951636 16.8388
+20 1.17 0.965998 19.6341
+21 1.23 0.944996 22.6562
+22 1.29 0.969052 26.0649
+23 1.35 0.972419 29.811
+24 1.41 1.00583 34.0378
+25 1.47 1.00068 38.6084
+26 1.53 1.00361 43.5742
+27 1.59 1.00405 48.9394
+28 1.65 1.04033 54.9258
+29 1.71 1.00046 61.1091
+30 1.77 1.0121 67.811
+31 1.83 0.998822 74.8809
+32 1.89 0.994706 82.3909
+33 1.95 1.01192 90.5235
+34 2.01 0.975048 98.8495
+35 2.07 0.991253 107.827
+36 2.13 0.99935 117.409
+37 2.19 1.01437 127.692
+38 2.25 1.00106 138.403
+39 2.31 0.994069 149.614
+40 2.37 1.00013 161.487
+41 2.43 1.00759 174.062
+42 2.49 0.993533 187.081
+43 2.55 1.01221 200.992
+44 2.61 0.995533 215.325
+45 2.67 0.999913 230.391
+46 2.73 1.00485 246.219
+47 2.79 1.00849 262.81
+48 2.85 0.994229 279.878
+49 2.91 0.992591 297.643
+50 2.97 1.00087 316.302
+102150 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0.0148024 0.000713267
+4 0.21 0.0532087 0.00570613
+5 0.27 0.106044 0.0221113
+6 0.33 0.188528 0.0656205
+7 0.39 0.301177 0.162625
+8 0.45 0.412716 0.339515
+9 0.51 0.618223 0.679743
+10 0.57 0.725428 1.17832
+11 0.63 0.908314 1.9408
+12 0.69 1.0173 2.96505
+13 0.75 1.0908 4.26248
+14 0.81 1.16817 5.88302
+15 0.87 1.16332 7.74465
+16 0.93 1.12381 9.79957
+17 0.99 1.10399 12.087
+18 1.05 0.976251 14.3623
+19 1.11 0.963138 16.8709
+20 1.17 0.940116 19.5913
+21 1.23 0.962616 22.6698
+22 1.29 0.951208 26.0157
+23 1.35 0.977048 29.7796
+24 1.41 1.00481 34.0021
+25 1.47 1.01458 38.6362
+26 1.53 1.0026 43.597
+27 1.59 1.0194 49.0442
+28 1.65 1.00859 54.8481
+29 1.71 0.993075 60.9857
+30 1.77 1.00822 67.6619
+31 1.83 1.02079 74.8873
+32 1.89 0.997635 82.4194
+33 1.95 0.988577 90.3645
+34 2.01 0.998353 98.8894
+35 2.07 0.999522 107.942
+36 2.13 0.997267 117.504
+37 2.19 0.994529 127.586
+38 2.25 0.99966 138.282
+39 2.31 0.996915 149.525
+40 2.37 1.01245 161.544
+41 2.43 0.997421 173.992
+42 2.49 0.99337 187.009
+43 2.55 1.00499 200.821
+44 2.61 1.00534 215.295
+45 2.67 0.997924 230.331
+46 2.73 0.988641 245.904
+47 2.79 0.999731 262.351
+48 2.85 0.991861 279.378
+49 2.91 1.01308 297.509
+50 2.97 1.00064 316.164
+102200 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0.0148024 0.000713267
+4 0.21 0.030405 0.00356633
+5 0.27 0.0829907 0.0164051
+6 0.33 0.157621 0.0527817
+7 0.39 0.296748 0.148359
+8 0.45 0.449328 0.340942
+9 0.51 0.637664 0.691869
+10 0.57 0.791848 1.23609
+11 0.63 0.876026 1.97147
+12 0.69 0.986132 2.96434
+13 0.75 1.12199 4.29886
+14 0.81 1.13578 5.87447
+15 0.87 1.18204 7.76605
+16 0.93 1.09885 9.77532
+17 0.99 1.06302 11.9779
+18 1.05 1.00073 14.3103
+19 1.11 0.954922 16.7974
+20 1.17 0.931489 19.4929
+21 1.23 0.959939 22.5628
+22 1.29 0.987099 26.035
+23 1.35 0.991305 29.8538
+24 1.41 0.982919 33.9843
+25 1.47 1.00443 38.572
+26 1.53 1.00923 43.5656
+27 1.59 1.01927 49.0121
+28 1.65 1.00921 54.8195
+29 1.71 1.01673 61.1034
+30 1.77 1.00617 67.766
+31 1.83 1.00527 74.8816
+32 1.89 1.00019 82.433
+33 1.95 0.973401 90.2561
+34 2.01 0.99284 98.734
+35 2.07 0.998341 107.775
+36 2.13 1.00515 117.414
+37 2.19 1.00044 127.555
+38 2.25 0.997794 138.231
+39 2.31 0.996599 149.471
+40 2.37 1.00248 161.372
+41 2.43 1.00399 173.902
+42 2.49 1.00714 187.099
+43 2.55 1.00613 200.927
+44 2.61 1.00262 215.362
+45 2.67 0.998445 230.405
+46 2.73 0.996429 246.101
+47 2.79 0.991363 262.41
+48 2.85 1.00632 279.685
+49 2.91 1.00168 297.613
+50 2.97 0.996662 316.193
+102250 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0.0296049 0.00142653
+4 0.21 0.0684112 0.00784593
+5 0.27 0.110654 0.0249643
+6 0.33 0.176165 0.0656205
+7 0.39 0.310035 0.165478
+8 0.45 0.459313 0.36234
+9 0.51 0.571565 0.67689
+10 0.57 0.762789 1.20114
+11 0.63 0.885373 1.94437
+12 0.69 1.04777 2.99929
+13 0.75 1.0926 4.29886
+14 0.81 1.14607 5.88873
+15 0.87 1.17089 7.76248
+16 0.93 1.11289 9.79743
+17 0.99 1.06199 11.9979
+18 1.05 1.00043 14.3295
+19 1.11 0.971353 16.8595
+20 1.17 0.975118 19.6812
+21 1.23 0.939197 22.6847
+22 1.29 0.954858 26.0435
+23 1.35 0.978899 29.8146
+24 1.41 0.995988 34
+25 1.47 1.00802 38.6041
+26 1.53 1.01975 43.6498
+27 1.59 1.02914 49.1491
+28 1.65 1.00822 54.9508
+29 1.71 1.00208 61.1441
+30 1.77 1.00908 67.826
+31 1.83 0.974033 74.7204
+32 1.89 1.00179 82.2839
+33 1.95 0.990529 90.2447
+34 2.01 1.00512 98.8274
+35 2.07 0.998183 107.867
+36 2.13 1.00337 117.489
+37 2.19 1.00501 127.676
+38 2.25 1.00193 138.397
+39 2.31 1.00153 149.692
+40 2.37 1.00314 161.601
+41 2.43 1.00702 174.168
+42 2.49 0.995765 187.217
+43 2.55 1.00561 201.037
+44 2.61 0.986467 215.24
+45 2.67 1.0028 230.349
+46 2.73 0.993622 246
+47 2.79 1.00706 262.568
+48 2.85 0.995434 279.656
+49 2.91 1.00192 297.588
+50 2.97 1.00975 316.412
+102300 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0.0592097 0.00285307
+4 0.21 0.0456075 0.00713267
+5 0.27 0.147539 0.0299572
+6 0.33 0.191618 0.0741797
+7 0.39 0.283461 0.165478
+8 0.45 0.427694 0.348787
+9 0.51 0.593598 0.675464
+10 0.57 0.743071 1.18616
+11 0.63 0.953348 1.98645
+12 0.69 0.994634 2.98787
+13 0.75 1.07581 4.26748
+14 0.81 1.11881 5.81954
+15 0.87 1.16688 7.68688
+16 0.93 1.14449 9.7796
+17 0.99 1.07713 12.0114
+18 1.05 1.01267 14.3716
+19 1.11 0.952458 16.8524
+20 1.17 0.955152 19.6163
+21 1.23 0.962169 22.6933
+22 1.29 0.964794 26.087
+23 1.35 0.977603 29.8531
+24 1.41 0.988859 34.0086
+25 1.47 0.974133 38.4579
+26 1.53 1.01961 43.5029
+27 1.59 1.01219 48.9116
+28 1.65 1.03152 54.8474
+29 1.71 1.00727 61.0728
+30 1.77 1.0038 67.7197
+31 1.83 0.995899 74.7689
+32 1.89 0.987999 82.2282
+33 1.95 0.999493 90.2611
+34 2.01 1.00136 98.8117
+35 2.07 1.00685 107.93
+36 2.13 0.992953 117.451
+37 2.19 1.00354 127.624
+38 2.25 0.995527 138.276
+39 2.31 0.979207 149.32
+40 2.37 1.01107 161.322
+41 2.43 0.996392 173.757
+42 2.49 1.0091 186.981
+43 2.55 1.00831 200.838
+44 2.61 1.0099 215.378
+45 2.67 1.00867 230.576
+46 2.73 0.998421 246.302
+47 2.79 0.99158 262.616
+48 2.85 0.989451 279.601
+49 2.91 0.994424 297.399
+50 2.97 1.00282 316.094
+102350 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0.0228037 0.0021398
+5 0.27 0.119875 0.0206847
+6 0.33 0.20089 0.0670471
+7 0.39 0.303391 0.164765
+8 0.45 0.421037 0.345221
+9 0.51 0.583229 0.666191
+10 0.57 0.762789 1.19044
+11 0.63 0.902367 1.94793
+12 0.69 1.01943 2.97432
+13 0.75 1.0944 4.27603
+14 0.81 1.17177 5.90157
+15 0.87 1.16956 7.77318
+16 0.93 1.11367 9.80956
+17 0.99 1.05338 11.9922
+18 1.05 0.982372 14.2817
+19 1.11 0.977104 16.8267
+20 1.17 0.951208 19.5792
+21 1.23 0.941204 22.5892
+22 1.29 0.975338 26.02
+23 1.35 0.967975 29.7489
+24 1.41 0.999552 33.9494
+25 1.47 1.02582 38.6348
+26 1.53 1.02552 43.709
+27 1.59 1.00739 49.092
+28 1.65 0.993968 54.8117
+29 1.71 1.00035 60.9943
+30 1.77 1.0038 67.6412
+31 1.83 1.00628 74.7639
+32 1.89 1.00122 82.3231
+33 1.95 0.985293 90.2418
+34 2.01 0.995262 98.7404
+35 2.07 1.01086 107.895
+36 2.13 0.997639 117.461
+37 2.19 1.00044 127.603
+38 2.25 1.00406 138.346
+39 2.31 0.992425 149.539
+40 2.37 0.993284 161.33
+41 2.43 1.00576 173.882
+42 2.49 1.00502 187.052
+43 2.55 0.990719 200.668
+44 2.61 1.00851 215.188
+45 2.67 1.00427 230.319
+46 2.73 1.00236 246.108
+47 2.79 1.00238 262.598
+48 2.85 1.00262 279.81
+49 2.91 0.995022 297.618
+50 2.97 0.994098 316.151
+102400 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0.0296049 0.00142653
+4 0.21 0.0456075 0.00570613
+5 0.27 0.0876012 0.0192582
+6 0.33 0.194709 0.064194
+7 0.39 0.294533 0.159058
+8 0.45 0.439343 0.347361
+9 0.51 0.623407 0.690442
+10 0.57 0.7576 1.21113
+11 0.63 0.902367 1.96862
+12 0.69 0.986132 2.96148
+13 0.75 1.07401 4.23894
+14 0.81 1.18051 5.8766
+15 0.87 1.18605 7.77461
+16 0.93 1.09963 9.78531
+17 0.99 1.08643 12.0364
+18 1.05 0.990023 14.3438
+19 1.11 0.970806 16.8723
+20 1.17 0.959343 19.6484
+21 1.23 0.959493 22.7168
+22 1.29 0.961549 26.0991
+23 1.35 0.971493 29.8417
+24 1.41 0.987671 33.9922
+25 1.47 0.993809 38.5314
+26 1.53 1.01298 43.5435
+27 1.59 1.01139 48.9479
+28 1.65 1.01355 54.7803
+29 1.71 1.03601 61.1833
+30 1.77 1.00585 67.8438
+31 1.83 1.00467 74.9551
+32 1.89 0.981385 82.3645
+33 1.95 0.992038 90.3374
+34 2.01 0.995346 98.8367
+35 2.07 0.996057 107.857
+36 2.13 0.98968 117.347
+37 2.19 1.01958 127.683
+38 2.25 0.999327 138.375
+39 2.31 1.00387 149.697
+40 2.37 0.997129 161.534
+41 2.43 1.00805 174.115
+42 2.49 0.994839 187.151
+43 2.55 0.999802 200.892
+44 2.61 0.991916 215.173
+45 2.67 0.999297 230.229
+46 2.73 0.999599 245.974
+47 2.79 1.01005 262.591
+48 2.85 1.00487 279.842
+49 2.91 0.998051 297.704
+50 2.97 0.998919 316.327
+102450 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0.0148024 0.000713267
+4 0.21 0.0532087 0.00570613
+5 0.27 0.101433 0.021398
+6 0.33 0.176165 0.0620542
+7 0.39 0.281246 0.152639
+8 0.45 0.469298 0.35378
+9 0.51 0.622111 0.696148
+10 0.57 0.740995 1.20542
+11 0.63 0.905765 1.96576
+12 0.69 1.03572 3.00856
+13 0.75 1.06682 4.27746
+14 0.81 1.1183 5.82882
+15 0.87 1.1495 7.66833
+16 0.93 1.17101 9.80956
+17 0.99 1.07335 12.0335
+18 1.05 0.986657 14.3331
+19 1.11 0.953827 16.8174
+20 1.17 0.955892 19.5835
+21 1.23 0.965738 22.6719
+22 1.29 0.94695 26.0029
+23 1.35 0.983343 29.791
+24 1.41 0.992933 33.9636
+25 1.47 0.980692 38.4429
+26 1.53 1.02624 43.5207
+27 1.59 1.03128 49.0314
+28 1.65 1.01219 54.8559
+29 1.71 1.00715 61.0806
+30 1.77 1.01037 67.771
+31 1.83 0.984513 74.7397
+32 1.89 1.00897 82.3573
+33 1.95 0.993991 90.3459
+34 2.01 0.985823 98.7639
+35 2.07 0.991016 107.739
+36 2.13 1.01549 117.476
+37 2.19 1.0015 127.628
+38 2.25 0.99806 138.307
+39 2.31 1.00703 149.665
+40 2.37 0.99791 161.511
+41 2.43 0.99502 173.929
+42 2.49 1.00605 187.113
+43 2.55 0.9943 200.777
+44 2.61 0.999744 215.171
+45 2.67 0.994705 230.158
+46 2.73 0.999372 245.9
+47 2.79 1.00112 262.37
+48 2.85 1.01264 279.754
+49 2.91 1.0008 297.665
+50 2.97 1.00213 316.348
+102500 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0.0148024 0.000713267
+4 0.21 0.0456075 0.00499287
+5 0.27 0.0829907 0.0178317
+6 0.33 0.225615 0.0699001
+7 0.39 0.310035 0.169757
+8 0.45 0.429358 0.35378
+9 0.51 0.605262 0.686876
+10 0.57 0.739957 1.19544
+11 0.63 0.896419 1.94793
+12 0.69 0.991091 2.94579
+13 0.75 1.15377 4.31812
+14 0.81 1.11213 5.86091
+15 0.87 1.17535 7.7418
+16 0.93 1.1242 9.79743
+17 0.99 1.06199 11.9979
+18 1.05 1.00777 14.3466
+19 1.11 0.9782 16.8944
+20 1.17 0.963779 19.6833
+21 1.23 0.926484 22.6462
+22 1.29 0.969458 26.0563
+23 1.35 0.993156 29.8823
+24 1.41 0.980542 34.0029
+25 1.47 1.00833 38.6084
+26 1.53 1.00173 43.5649
+27 1.59 1.02114 49.0214
+28 1.65 0.991613 54.7275
+29 1.71 1.02458 61.0599
+30 1.77 0.994433 67.6448
+31 1.83 1.01283 74.8138
+32 1.89 0.998769 82.3545
+33 1.95 1.00872 90.4615
+34 2.01 1.00487 99.0421
+35 2.07 0.981093 107.927
+36 2.13 0.991986 117.439
+37 2.19 1.00783 127.655
+38 2.25 0.986661 138.213
+39 2.31 1.00469 149.544
+40 2.37 1.00812 161.511
+41 2.43 1.00571 174.063
+42 2.49 1.00094 187.179
+43 2.55 0.996532 200.874
+44 2.61 0.99905 215.258
+45 2.67 0.995841 230.262
+46 2.73 0.999508 246.006
+47 2.79 1.00853 262.598
+48 2.85 1.0032 279.82
+49 2.91 0.991834 297.571
+50 2.97 1.00355 316.28
+102550 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0.0148024 0.000713267
+4 0.21 0.0380062 0.0042796
+5 0.27 0.0968224 0.0192582
+6 0.33 0.160712 0.0563481
+7 0.39 0.28789 0.149073
+8 0.45 0.454321 0.343795
+9 0.51 0.60267 0.675464
+10 0.57 0.79081 1.21897
+11 0.63 0.889621 1.96576
+12 0.69 1.04706 3.01997
+13 0.75 1.0992 4.32739
+14 0.81 1.15069 5.92368
+15 0.87 1.16376 7.78602
+16 0.93 1.11523 9.82525
+17 0.99 1.0551 12.0114
+18 1.05 0.976251 14.2867
+19 1.11 0.943147 16.7432
+20 1.17 0.940116 19.4636
+21 1.23 0.961946 22.5399
+22 1.29 0.971283 25.9565
+23 1.35 1.00204 29.8167
+24 1.41 0.998873 34.0143
+25 1.47 1.00552 38.607
+26 1.53 1.01672 43.6377
+27 1.59 1.02768 49.1291
+28 1.65 0.982812 54.7846
+29 1.71 0.996537 60.9437
+30 1.77 1.03063 67.7682
+31 1.83 0.97504 74.6698
+32 1.89 1.0017 82.2325
+33 1.95 0.996121 90.2382
+34 2.01 0.997684 98.7575
+35 2.07 0.998499 107.8
+36 2.13 1.00091 117.398
+37 2.19 1.00874 127.623
+38 2.25 0.992927 138.248
+39 2.31 0.998496 149.509
+40 2.37 1.00001 161.38
+41 2.43 1.00051 173.867
+42 2.49 1.00556 187.044
+43 2.55 0.997259 200.749
+44 2.61 0.993403 215.051
+45 2.67 1.00663 230.218
+46 2.73 1.00064 245.98
+47 2.79 1.00615 262.533
+48 2.85 0.995684 279.626
+49 2.91 1.00188 297.556
+50 2.97 1.00443 316.282
+102600 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0.0148024 0.000713267
+4 0.21 0.0684112 0.00713267
+5 0.27 0.0876012 0.0206847
+6 0.33 0.185437 0.0634807
+7 0.39 0.318893 0.166191
+8 0.45 0.484276 0.373752
+9 0.51 0.556012 0.679743
+10 0.57 0.7576 1.20043
+11 0.63 0.913413 1.96719
+12 0.69 1.02864 3.00285
+13 0.75 1.08001 4.28745
+14 0.81 1.15121 5.88445
+15 0.87 1.1749 7.76462
+16 0.93 1.13084 9.83238
+17 0.99 1.05648 12.0214
+18 1.05 1.01389 14.3845
+19 1.11 0.954375 16.8702
+20 1.17 0.933708 19.572
+21 1.23 0.959493 22.6405
+22 1.29 0.969458 26.0506
+23 1.35 0.987787 29.8559
+24 1.41 0.992424 34.0264
+25 1.47 1.00146 38.6006
+26 1.53 0.992074 43.5093
+27 1.59 1.02901 49.0078
+28 1.65 1.03723 54.9765
+29 1.71 1.00254 61.1726
+30 1.77 0.988293 67.7168
+31 1.83 0.990861 74.7304
+32 1.89 1.00019 82.2817
+33 1.95 1.00508 90.3595
+34 2.01 0.995179 98.8573
+35 2.07 0.997632 107.892
+36 2.13 1.00352 117.515
+37 2.19 1.006 127.713
+38 2.25 1.00166 138.43
+39 2.31 0.999888 149.707
+40 2.37 0.992683 161.491
+41 2.43 0.995478 173.915
+42 2.49 1.00311 187.06
+43 2.55 1.00847 200.919
+44 2.61 0.994344 215.235
+45 2.67 1.00346 230.354
+46 2.73 0.999916 246.105
+47 2.79 0.995655 262.485
+48 2.85 1.00075 279.665
+49 2.91 1.01084 297.756
+50 2.97 0.99999 316.399
+102650 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0.0148024 0.000713267
+4 0.21 0.030405 0.00356633
+5 0.27 0.129097 0.0235378
+6 0.33 0.166893 0.0620542
+7 0.39 0.294533 0.156919
+8 0.45 0.436015 0.343795
+9 0.51 0.603966 0.676177
+10 0.57 0.778356 1.21113
+11 0.63 0.878575 1.94864
+12 0.69 1.02368 2.97932
+13 0.75 1.13158 4.32525
+14 0.81 1.13578 5.90086
+15 0.87 1.14727 7.7368
+16 0.93 1.12186 9.78816
+17 0.99 1.05166 11.9672
+18 1.05 1.00777 14.316
+19 1.11 0.973818 16.8524
+20 1.17 0.9448 19.5863
+21 1.23 0.943881 22.6049
+22 1.29 0.962361 25.99
+23 1.35 0.981306 29.7703
+24 1.41 0.9948 33.9508
+25 1.47 0.998494 38.5114
+26 1.53 1.01355 43.5264
+27 1.59 1.03675 49.0663
+28 1.65 1.00178 54.831
+29 1.71 1.01281 61.0906
+30 1.77 1.01307 67.7989
+31 1.83 0.994791 74.8402
+32 1.89 0.994612 82.3495
+33 1.95 0.988843 90.2967
+34 2.01 0.989833 98.7489
+35 2.07 1.00102 107.815
+36 2.13 1.00113 117.414
+37 2.19 0.993192 127.482
+38 2.25 1.00279 138.212
+39 2.31 1.00463 149.542
+40 2.37 0.999352 161.406
+41 2.43 1.00508 173.949
+42 2.49 0.993424 186.967
+43 2.55 1.00042 200.716
+44 2.61 1.01401 215.315
+45 2.67 0.994184 230.295
+46 2.73 1.0049 246.123
+47 2.79 0.989065 262.395
+48 2.85 1.0047 279.643
+49 2.91 1.0067 297.66
+50 2.97 0.993869 316.188
+102700 50
+1 0.03 0 0
+2 0.09 0.040178 0.000713267
+3 0.15 0.0148024 0.00142653
+4 0.21 0.0760125 0.0085592
+5 0.27 0.110654 0.0256776
+6 0.33 0.173075 0.0656205
+7 0.39 0.298962 0.161912
+8 0.45 0.437679 0.349501
+9 0.51 0.607855 0.684023
+10 0.57 0.74826 1.19829
+11 0.63 0.898118 1.95221
+12 0.69 1.0173 2.97646
+13 0.75 1.08661 4.2689
+14 0.81 1.13424 5.84237
+15 0.87 1.20209 7.76605
+16 0.93 1.11406 9.80314
+17 0.99 1.08781 12.0571
+18 1.05 0.988799 14.3616
+19 1.11 0.972723 16.8951
+20 1.17 0.947511 19.6369
+21 1.23 0.950349 22.6762
+22 1.29 0.951208 26.0221
+23 1.35 0.971123 29.7632
+24 1.41 1.01771 34.0399
+25 1.47 0.99662 38.592
+26 1.53 1.0222 43.6498
+27 1.59 1.02274 49.1148
+28 1.65 1.01182 54.9372
+29 1.71 1.01812 61.2297
+30 1.77 0.989693 67.7832
+31 1.83 1.00497 74.8966
+32 1.89 0.98507 82.3338
+33 1.95 0.992837 90.3131
+34 2.01 0.994677 98.8067
+35 2.07 1.01086 107.961
+36 2.13 0.996002 117.512
+37 2.19 0.995584 127.604
+38 2.25 0.999994 138.304
+39 2.31 0.999508 149.576
+40 2.37 1.01714 161.651
+41 2.43 0.98639 173.961
+42 2.49 1.00387 187.116
+43 2.55 1.00084 200.871
+44 2.61 1.00618 215.357
+45 2.67 0.996125 230.366
+46 2.73 0.99738 246.076
+47 2.79 1.00819 262.663
+48 2.85 1.001 279.847
+49 2.91 0.995779 297.668
+50 2.97 0.987633 316.081
+102750 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0.0296049 0.00142653
+4 0.21 0.0380062 0.00499287
+5 0.27 0.0968224 0.0199715
+6 0.33 0.157621 0.0563481
+7 0.39 0.285675 0.148359
+8 0.45 0.42603 0.330956
+9 0.51 0.574157 0.646933
+10 0.57 0.798075 1.19544
+11 0.63 0.930406 1.97646
+12 0.69 1.02439 3.00785
+13 0.75 1.0992 4.31526
+14 0.81 1.11624 5.86377
+15 0.87 1.15886 7.71826
+16 0.93 1.12108 9.76819
+17 0.99 1.07886 12.0036
+18 1.05 0.9787 14.2846
+19 1.11 1.00312 16.8973
+20 1.17 0.956385 19.6648
+21 1.23 0.913102 22.5849
+22 1.29 0.972905 26.0071
+23 1.35 0.969642 29.7425
+24 1.41 0.99463 33.9223
+25 1.47 1.00427 38.5093
+26 1.53 1.04051 43.6576
+27 1.59 1.01086 49.0592
+28 1.65 1.01578 54.9044
+29 1.71 1.00612 61.1227
+30 1.77 1.00187 67.7568
+31 1.83 0.988846 74.7561
+32 1.89 0.99858 82.2953
+33 1.95 0.983873 90.2026
+34 2.01 1.0037 98.7732
+35 2.07 1.00023 107.832
+36 2.13 1.00061 117.427
+37 2.19 1.0067 127.631
+38 2.25 0.999994 138.331
+39 2.31 1.00899 149.71
+40 2.37 1.00446 161.635
+41 2.43 0.992677 174.024
+42 2.49 0.98809 186.971
+43 2.55 1.00873 200.835
+44 2.61 0.999645 215.227
+45 2.67 0.999818 230.291
+46 2.73 1.00313 246.092
+47 2.79 1.0042 262.613
+48 2.85 1.00333 279.837
+49 2.91 0.996178 297.665
+50 2.97 0.999608 316.301
+102800 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0.0296049 0.00142653
+4 0.21 0.0228037 0.00356633
+5 0.27 0.0783801 0.0156919
+6 0.33 0.213253 0.0649073
+7 0.39 0.296748 0.160485
+8 0.45 0.447664 0.352354
+9 0.51 0.616927 0.691869
+10 0.57 0.755525 1.21113
+11 0.63 0.922759 1.98573
+12 0.69 1.01872 3.01141
+13 0.75 1.06682 4.28031
+14 0.81 1.16252 5.89301
+15 0.87 1.14549 7.72611
+16 0.93 1.14644 9.8224
+17 0.99 1.06337 12.0257
+18 1.05 0.982678 14.316
+19 1.11 0.942873 16.7718
+20 1.17 0.966491 19.5685
+21 1.23 0.970199 22.6712
+22 1.29 0.952425 26.0214
+23 1.35 0.990564 29.8374
+24 1.41 0.974941 33.9344
+25 1.47 1.00646 38.5314
+26 1.53 1.01427 43.5499
+27 1.59 1.00832 48.9379
+28 1.65 1.01901 54.8017
+29 1.71 1.02481 61.1355
+30 1.77 1.00574 67.7953
+31 1.83 0.983102 74.7539
+32 1.89 1.00028 82.306
+33 1.95 1.01343 90.4508
+34 2.01 0.987828 98.8859
+35 2.07 0.992985 107.879
+36 2.13 0.998606 117.454
+37 2.19 1.00339 127.626
+38 2.25 1.00379 138.366
+39 2.31 0.994069 149.577
+40 2.37 0.996588 161.408
+41 2.43 1.00051 173.894
+42 2.49 1.00534 187.068
+43 2.55 1.00427 200.87
+44 2.61 1.01188 215.439
+45 2.67 0.996125 230.447
+46 2.73 0.999644 246.193
+47 2.79 0.997737 262.608
+48 2.85 0.993772 279.668
+49 2.91 0.993109 297.442
+50 2.97 0.992645 315.947
+102850 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0.0148024 0.000713267
+4 0.21 0.0456075 0.00499287
+5 0.27 0.0829907 0.0178317
+6 0.33 0.210162 0.0663338
+7 0.39 0.303391 0.164051
+8 0.45 0.436015 0.350927
+9 0.51 0.624703 0.694722
+10 0.57 0.769016 1.22325
+11 0.63 0.890471 1.97076
+12 0.69 1.05272 3.03067
+13 0.75 1.0992 4.33809
+14 0.81 1.10647 5.87304
+15 0.87 1.15708 7.72468
+16 0.93 1.15814 9.84237
+17 0.99 1.04202 12.0014
+18 1.05 1.00563 14.3452
+19 1.11 0.965329 16.8595
+20 1.17 0.927299 19.5428
+21 1.23 0.959047 22.6098
+22 1.29 0.959927 25.9864
+23 1.35 0.978344 29.7553
+24 1.41 1.01194 34.0078
+25 1.47 1.01364 38.6377
+26 1.53 1.00216 43.5963
+27 1.59 1.02274 49.0613
+28 1.65 1.00599 54.8502
+29 1.71 1.01858 61.1455
+30 1.77 0.996479 67.7439
+31 1.83 1.00305 74.8438
+32 1.89 1.00122 82.403
+33 1.95 0.986447 90.331
+34 2.01 0.996014 98.8359
+35 2.07 0.986133 107.767
+36 2.13 1.01467 117.496
+37 2.19 0.997977 127.613
+38 2.25 1.00673 138.384
+39 2.31 0.990275 149.553
+40 2.37 1.00572 161.492
+41 2.43 1.00474 174.031
+42 2.49 0.988144 186.98
+43 2.55 1.00359 200.772
+44 2.61 1.00113 215.186
+45 2.67 1.01037 230.409
+46 2.73 1.00449 246.232
+47 2.79 0.998257 262.655
+48 2.85 0.991695 279.679
+49 2.91 0.997892 297.539
+50 2.97 1.00125 316.205
+102900 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0.0296049 0.00142653
+4 0.21 0.0532087 0.0064194
+5 0.27 0.119875 0.0249643
+6 0.33 0.166893 0.0634807
+7 0.39 0.305606 0.161912
+8 0.45 0.452656 0.35592
+9 0.51 0.598782 0.685449
+10 0.57 0.785621 1.22539
+11 0.63 0.899818 1.98074
+12 0.69 1.03572 3.02354
+13 0.75 1.08421 4.31312
+14 0.81 1.13938 5.89372
+15 0.87 1.14192 7.72111
+16 0.93 1.12342 9.77532
+17 0.99 1.09194 12.0378
+18 1.05 0.96707 14.2917
+19 1.11 0.92918 16.7118
+20 1.17 0.976597 19.5378
+21 1.23 0.970199 22.6405
+22 1.29 0.940664 25.9494
+23 1.35 0.986491 29.7496
+24 1.41 1.03248 34.0884
+25 1.47 0.991467 38.617
+26 1.53 1.01312 43.6298
+27 1.59 1.00886 49.0207
+28 1.65 1.00264 54.7903
+29 1.71 1.00819 61.0214
+30 1.77 1.0051 67.6769
+31 1.83 1.00114 74.7632
+32 1.89 0.984787 82.1983
+33 1.95 0.992571 90.1755
+34 2.01 1.01088 98.8074
+35 2.07 0.992198 107.793
+36 2.13 1.0021 117.402
+37 2.19 1.00283 127.568
+38 2.25 0.990661 138.168
+39 2.31 1.01393 149.603
+40 2.37 1.01041 161.598
+41 2.43 0.996735 174.037
+42 2.49 0.992063 187.037
+43 2.55 0.990148 200.645
+44 2.61 1.00787 215.155
+45 2.67 1.01255 230.412
+46 2.73 0.997652 246.126
+47 2.79 0.996869 262.526
+48 2.85 0.99801 279.659
+49 2.91 0.997294 297.508
+50 2.97 1.00083 316.166
+102950 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0.0296049 0.00142653
+4 0.21 0.0380062 0.00499287
+5 0.27 0.106044 0.021398
+6 0.33 0.173075 0.0613409
+7 0.39 0.301177 0.158345
+8 0.45 0.411052 0.334522
+9 0.51 0.64544 0.689729
+10 0.57 0.811566 1.2475
+11 0.63 0.861582 1.97076
+12 0.69 1.02793 3.00571
+13 0.75 1.0896 4.30171
+14 0.81 1.13167 5.87161
+15 0.87 1.14281 7.70043
+16 0.93 1.12732 9.76177
+17 0.99 1.07232 11.9836
+18 1.05 1.00716 14.331
+19 1.11 0.966424 16.8481
+20 1.17 0.945046 19.5827
+21 1.23 0.942096 22.5956
+22 1.29 0.959927 25.9722
+23 1.35 0.992045 29.7939
+24 1.41 0.999213 33.9929
+25 1.47 0.995215 38.5385
+26 1.53 1.01067 43.5392
+27 1.59 1.0222 49.0014
+28 1.65 1.00413 54.7796
+29 1.71 1.01708 61.0656
+30 1.77 0.999926 67.6869
+31 1.83 0.996706 74.7418
+32 1.89 1.01247 82.3859
+33 1.95 0.998162 90.408
+34 2.01 0.992339 98.8816
+35 2.07 0.990071 107.848
+36 2.13 0.994961 117.389
+37 2.19 1.00037 127.529
+38 2.25 0.999727 138.226
+39 2.31 0.997295 149.474
+40 2.37 1.01107 161.476
+41 2.43 1.00194 173.981
+42 2.49 0.990158 186.956
+43 2.55 1.00561 200.776
+44 2.61 1.00504 215.246
+45 2.67 1.00076 230.325
+46 2.73 0.999146 246.063
+47 2.79 0.996869 262.463
+48 2.85 1.00096 279.646
+49 2.91 1.00008 297.545
+50 2.97 1.0003 316.193
+103000 50
+1 0.03 0 0
+2 0.09 0.040178 0.000713267
+3 0.15 0.0444073 0.00285307
+4 0.21 0.030405 0.00570613
+5 0.27 0.0783801 0.0178317
+6 0.33 0.169984 0.0570613
+7 0.39 0.325537 0.161912
+8 0.45 0.480947 0.368046
+9 0.51 0.578045 0.686163
+10 0.57 0.811566 1.24394
+11 0.63 0.881125 1.98359
+12 0.69 1.01022 3.00071
+13 0.75 1.06622 4.2689
+14 0.81 1.14504 5.85735
+15 0.87 1.17936 7.74465
+16 0.93 1.10275 9.76106
+17 0.99 1.06922 11.9765
+18 1.05 1.01848 14.3502
+19 1.11 0.979569 16.9016
+20 1.17 0.920151 19.5642
+21 1.23 0.935628 22.5563
+22 1.29 0.970471 25.97
+23 1.35 1.00741 29.8509
+24 1.41 0.981561 33.9757
+25 1.47 1.01676 38.6198
+26 1.53 0.999137 43.5635
+27 1.59 1.0194 49.0107
+28 1.65 1.01901 54.8745
+29 1.71 1.02008 61.179
+30 1.77 0.985169 67.7026
+31 1.83 1.00255 74.7989
+32 1.89 0.99499 82.311
+33 1.95 1.00082 90.3545
+34 2.01 0.997016 98.868
+35 2.07 0.998735 107.913
+36 2.13 1.00285 117.529
+37 2.19 0.977853 127.442
+38 2.25 1.00266 138.17
+39 2.31 1.00735 149.531
+40 2.37 1.00909 161.51
+41 2.43 0.994334 173.919
+42 2.49 1.00094 187.036
+43 2.55 1.00307 200.821
+44 2.61 0.988845 215.058
+45 2.67 1.01572 230.362
+46 2.73 1.00182 246.142
+47 2.79 0.997823 262.558
+48 2.85 1.00607 279.829
+49 2.91 0.997413 297.68
+50 2.97 0.9967 316.261
+103050 50
+1 0.03 0 0
+2 0.09 0.040178 0.000713267
+3 0.15 0.0148024 0.00142653
+4 0.21 0.06081 0.00713267
+5 0.27 0.0553271 0.0156919
+6 0.33 0.154531 0.0513552
+7 0.39 0.323322 0.155492
+8 0.45 0.50591 0.372325
+9 0.51 0.568973 0.685449
+10 0.57 0.764865 1.21113
+11 0.63 0.887922 1.95649
+12 0.69 1.0003 2.96362
+13 0.75 1.13458 4.31312
+14 0.81 1.14144 5.89658
+15 0.87 1.17045 7.76961
+16 0.93 1.1285 9.8331
+17 0.99 1.05441 12.0178
+18 1.05 0.984208 14.3117
+19 1.11 0.964233 16.8231
+20 1.17 0.953673 19.5827
+21 1.23 0.957486 22.6448
+22 1.29 0.962158 26.0292
+23 1.35 0.977048 29.7932
+24 1.41 0.990896 33.9572
+25 1.47 1.00927 38.567
+26 1.53 0.993659 43.4836
+27 1.59 1.04236 49.0535
+28 1.65 1.01801 54.9116
+29 1.71 0.999422 61.0884
+30 1.77 1.0037 67.7347
+31 1.83 0.99862 74.8031
+32 1.89 0.997635 82.3352
+33 1.95 0.993192 90.3174
+34 2.01 0.993174 98.7981
+35 2.07 1.00464 107.897
+36 2.13 0.995407 117.442
+37 2.19 0.991363 127.491
+38 2.25 1.00433 138.237
+39 2.31 1.00318 149.551
+40 2.37 1.00716 161.507
+41 2.43 1.00216 174.014
+42 2.49 0.999303 187.109
+43 2.55 1.00411 200.909
+44 2.61 1.00019 215.309
+45 2.67 0.996551 230.324
+46 2.73 0.996746 246.024
+47 2.79 0.987114 262.264
+48 2.85 1.00399 279.499
+49 2.91 1.00897 297.557
+50 2.97 1.00294 316.255
+103100 50
+1 0.03 0 0
+2 0.09 0.040178 0.000713267
+3 0.15 0.0444073 0.00285307
+4 0.21 0.0760125 0.00998573
+5 0.27 0.119875 0.0285307
+6 0.33 0.194709 0.0734665
+7 0.39 0.301177 0.170471
+8 0.45 0.452656 0.364479
+9 0.51 0.575453 0.68117
+10 0.57 0.776281 1.21469
+11 0.63 0.880275 1.95364
+12 0.69 1.00668 2.96719
+13 0.75 1.1004 4.27603
+14 0.81 1.13167 5.84593
+15 0.87 1.15529 7.69472
+16 0.93 1.14839 9.79458
+17 0.99 1.06577 12.0029
+18 1.05 0.999204 14.3317
+19 1.11 0.948898 16.8031
+20 1.17 0.984978 19.6534
+21 1.23 0.935628 22.6455
+22 1.29 0.946341 25.9743
+23 1.35 0.978344 29.7432
+24 1.41 0.99446 33.9223
+25 1.47 1.02286 38.5942
+26 1.53 1.0049 43.5663
+27 1.59 1.03101 49.0756
+28 1.65 1.00773 54.8745
+29 1.71 1.01604 61.1541
+30 1.77 1.0052 67.8103
+31 1.83 0.986729 74.7946
+32 1.89 0.992439 82.2874
+33 1.95 1.0105 90.4087
+34 2.01 0.984737 98.8174
+35 2.07 0.988496 107.77
+36 2.13 0.994515 117.306
+37 2.19 1.01733 127.618
+38 2.25 1.01713 138.501
+39 2.31 0.997738 149.754
+40 2.37 0.992202 161.533
+41 2.43 1.00811 174.114
+42 2.49 0.994785 187.15
+43 2.55 0.998867 200.877
+44 2.61 1.00192 215.302
+45 2.67 0.997119 230.326
+46 2.73 0.999237 246.066
+47 2.79 1.00147 262.541
+48 2.85 0.990781 279.55
+49 2.91 1.00817 297.593
+50 2.97 1.0029 316.29
+103150 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0.0684112 0.0064194
+5 0.27 0.0783801 0.0185449
+6 0.33 0.179256 0.0599144
+7 0.39 0.35654 0.17475
+8 0.45 0.475955 0.378745
+9 0.51 0.635072 0.728245
+10 0.57 0.730617 1.23039
+11 0.63 0.871778 1.9622
+12 0.69 1.0088 2.97789
+13 0.75 1.08601 4.26961
+14 0.81 1.10956 5.80884
+15 0.87 1.15708 7.66049
+16 0.93 1.17335 9.80599
+17 0.99 1.08953 12.0635
+18 1.05 0.975945 14.3381
+19 1.11 0.982034 16.8959
+20 1.17 0.975364 19.7183
+21 1.23 0.936521 22.7133
+22 1.29 0.967835 26.1177
+23 1.35 0.966679 29.8417
+24 1.41 0.972056 33.9265
+25 1.47 1.01067 38.5428
+26 1.53 1.00231 43.5021
+27 1.59 1.01686 48.9358
+28 1.65 1.03029 54.8645
+29 1.71 1.02493 61.199
+30 1.77 0.991201 67.7625
+31 1.83 1.01464 74.9444
+32 1.89 1.00349 82.5207
+33 1.95 0.981921 90.4123
+34 2.01 0.999355 98.9458
+35 2.07 0.982511 107.844
+36 2.13 0.999201 117.425
+37 2.19 1.01184 127.682
+38 2.25 0.992994 138.307
+39 2.31 0.989895 149.471
+40 2.37 1.0071 161.427
+41 2.43 1.00942 174.024
+42 2.49 1.0036 187.175
+43 2.55 0.999179 200.907
+44 2.61 1.00495 215.376
+45 2.67 1.01014 230.596
+46 2.73 0.99249 246.229
+47 2.79 0.986898 262.465
+48 2.85 1.00549 279.726
+49 2.91 0.998808 297.602
+50 2.97 1.00221 316.286
+103200 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0.0148024 0.000713267
+4 0.21 0.06081 0.0064194
+5 0.27 0.0829907 0.0192582
+6 0.33 0.197799 0.0649073
+7 0.39 0.343253 0.175464
+8 0.45 0.470962 0.377318
+9 0.51 0.546939 0.678317
+10 0.57 0.761751 1.20185
+11 0.63 0.914262 1.96933
+12 0.69 1.03501 3.01141
+13 0.75 1.05422 4.26534
+14 0.81 1.1399 5.84665
+15 0.87 1.13746 7.6669
+16 0.93 1.12381 9.72183
+17 0.99 1.07094 11.9408
+18 1.05 1.05001 14.388
+19 1.11 0.984498 16.9522
+20 1.17 0.932968 19.6519
+21 1.23 0.931168 22.6298
+22 1.29 0.964388 26.0221
+23 1.35 0.979825 29.7967
+24 1.41 0.998873 33.9943
+25 1.47 0.992091 38.5257
+26 1.53 1.01298 43.5378
+27 1.59 1.01379 48.9551
+28 1.65 1.0045 54.7354
+29 1.71 1.02031 61.0414
+30 1.77 1.00133 67.6719
+31 1.83 1.01353 74.8459
+32 1.89 0.999619 82.393
+33 1.95 0.997984 90.4137
+34 2.01 0.984153 98.8174
+35 2.07 0.994324 107.822
+36 2.13 1.01623 117.567
+37 2.19 0.990166 127.604
+38 2.25 1.00339 138.34
+39 2.31 0.996915 149.583
+40 2.37 0.991721 161.357
+41 2.43 1.01211 173.988
+42 2.49 1.00181 187.116
+43 2.55 0.991913 200.748
+44 2.61 1.0153 215.365
+45 2.67 0.991533 230.305
+46 2.73 1.00232 246.093
+47 2.79 1.00086 262.558
+48 2.85 0.997345 279.68
+49 2.91 1.00467 297.66
+50 2.97 1.00225 316.345
+103250 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0.0148024 0.000713267
+4 0.21 0.030405 0.00356633
+5 0.27 0.106044 0.0199715
+6 0.33 0.173075 0.0599144
+7 0.39 0.259101 0.143367
+8 0.45 0.411052 0.319544
+9 0.51 0.63896 0.671184
+10 0.57 0.764865 1.19686
+11 0.63 0.910014 1.96077
+12 0.69 1.03643 3.00428
+13 0.75 1.08721 4.29743
+14 0.81 1.15635 5.90157
+15 0.87 1.16644 7.76819
+16 0.93 1.148 9.86733
+17 0.99 1.04581 12.0342
+18 1.05 0.999816 14.3645
+19 1.11 0.958756 16.8616
+20 1.17 0.954413 19.6234
+21 1.23 0.930722 22.5999
+22 1.29 0.979191 26.0442
+23 1.35 0.97927 29.8167
+24 1.41 0.984955 33.9558
+25 1.47 1.01114 38.5742
+26 1.53 1.00822 43.5628
+27 1.59 1.00699 48.9437
+28 1.65 1.01628 54.7917
+29 1.71 1.01015 61.035
+30 1.77 1.00467 67.6876
+31 1.83 1.00215 74.781
+32 1.89 1.01114 82.4151
+33 1.95 0.993902 90.403
+34 2.01 0.998854 98.9322
+35 2.07 0.987709 107.877
+36 2.13 0.990572 117.376
+37 2.19 1.00522 127.566
+38 2.25 0.995727 138.22
+39 2.31 1.01715 149.691
+40 2.37 0.994846 161.501
+41 2.43 0.996906 173.943
+42 2.49 0.998976 187.034
+43 2.55 1.00058 200.785
+44 2.61 1.0044 215.245
+45 2.67 0.996693 230.262
+46 2.73 0.99335 245.909
+47 2.79 1.0143 262.596
+48 2.85 0.994063 279.661
+49 2.91 0.996377 297.494
+50 2.97 1.00776 316.281
+103300 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0.0760125 0.00713267
+5 0.27 0.0737695 0.0185449
+6 0.33 0.157621 0.0549215
+7 0.39 0.31225 0.155492
+8 0.45 0.424365 0.337375
+9 0.51 0.614335 0.675464
+10 0.57 0.799113 1.22468
+11 0.63 0.856484 1.94365
+12 0.69 1.02297 2.97361
+13 0.75 1.1022 4.28459
+14 0.81 1.1327 5.85592
+15 0.87 1.20655 7.78673
+16 0.93 1.10899 9.81455
+17 0.99 1.08368 12.0599
+18 1.05 0.98482 14.3552
+19 1.11 0.923703 16.7611
+20 1.17 0.951701 19.515
+21 1.23 0.961054 22.5884
+22 1.29 0.976555 26.0235
+23 1.35 0.96742 29.7504
+24 1.41 0.999892 33.9522
+25 1.47 1.02083 38.6148
+26 1.53 1.01672 43.6455
+27 1.59 1.00231 49.0014
+28 1.65 1.00748 54.7989
+29 1.71 1.00311 60.9986
+30 1.77 1.01005 67.6869
+31 1.83 0.998519 74.7546
+32 1.89 1.01011 82.3809
+33 1.95 0.995766 90.3837
+34 2.01 0.995011 98.8802
+35 2.07 0.985346 107.804
+36 2.13 1.00247 117.417
+37 2.19 0.986367 127.415
+38 2.25 1.01513 138.277
+39 2.31 1.00318 149.591
+40 2.37 1.01011 161.582
+41 2.43 1.00234 174.091
+42 2.49 1.00692 187.286
+43 2.55 0.991082 200.907
+44 2.61 0.997663 215.27
+45 2.67 0.995084 230.263
+46 2.73 1.00059 246.024
+47 2.79 0.993618 262.371
+48 2.85 1.00167 279.566
+49 2.91 1.00762 297.6
+50 2.97 0.99406 316.132
+103350 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0.0296049 0.00142653
+4 0.21 0.06081 0.00713267
+5 0.27 0.106044 0.0235378
+6 0.33 0.142168 0.0563481
+7 0.39 0.301177 0.153352
+8 0.45 0.434351 0.339515
+9 0.51 0.633776 0.688302
+10 0.57 0.760714 1.21113
+11 0.63 0.876026 1.9465
+12 0.69 1.04564 2.99929
+13 0.75 1.06622 4.26748
+14 0.81 1.13784 5.84593
+15 0.87 1.18248 7.73823
+16 0.93 1.1203 9.78673
+17 0.99 1.06577 11.995
+18 1.05 1.02154 14.3759
+19 1.11 0.968341 16.898
+20 1.17 0.938637 19.6141
+21 1.23 0.927599 22.5806
+22 1.29 0.972499 26.0014
+23 1.35 0.951497 29.6669
+24 1.41 0.998025 33.8609
+25 1.47 1.00802 38.465
+26 1.53 1.00966 43.4608
+27 1.59 1.03355 48.9836
+28 1.65 1.02347 54.873
+29 1.71 1.00381 61.077
+30 1.77 1.0093 67.7603
+31 1.83 1.0086 74.8994
+32 1.89 0.994517 82.408
+33 1.95 1.00029 90.4472
+34 2.01 0.979308 98.8096
+35 2.07 0.98826 107.76
+36 2.13 0.98901 117.243
+37 2.19 1.01296 127.511
+38 2.25 1.00159 138.228
+39 2.31 1.00115 149.519
+40 2.37 1.00915 161.499
+41 2.43 0.999764 173.976
+42 2.49 1.00828 187.189
+43 2.55 1.00115 200.948
+44 2.61 1.00197 215.374
+45 2.67 0.999913 230.439
+46 2.73 0.987146 245.989
+47 2.79 0.995872 262.372
+48 2.85 0.993731 279.432
+49 2.91 1.00232 297.37
+50 2.97 0.99781 315.972
+103400 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0.0532087 0.00499287
+5 0.27 0.101433 0.0206847
+6 0.33 0.142168 0.053495
+7 0.39 0.272388 0.141227
+8 0.45 0.454321 0.335949
+9 0.51 0.701171 0.721826
+10 0.57 0.692218 1.19757
+11 0.63 0.903216 1.95578
+12 0.69 1.00455 2.96719
+13 0.75 1.08301 4.25535
+14 0.81 1.14144 5.8388
+15 0.87 1.16242 7.699
+16 0.93 1.15073 9.80314
+17 0.99 1.07404 12.0285
+18 1.05 0.98329 14.3203
+19 1.11 0.968341 16.8424
+20 1.17 0.952194 19.5977
+21 1.23 0.944327 22.6177
+22 1.29 0.97331 26.0414
+23 1.35 0.978159 29.8096
+24 1.41 0.988011 33.9615
+25 1.47 1.01801 38.6113
+26 1.53 0.979965 43.4601
+27 1.59 1.00872 48.8502
+28 1.65 1.02967 54.7753
+29 1.71 1.02458 61.1077
+30 1.77 1.0065 67.7725
+31 1.83 1.01484 74.9558
+32 1.89 0.978079 82.3402
+33 1.95 0.997097 90.3538
+34 2.01 1.00938 98.9729
+35 2.07 0.992513 107.961
+36 2.13 0.992358 117.477
+37 2.19 1.00297 127.644
+38 2.25 0.986195 138.196
+39 2.31 0.994575 149.413
+40 2.37 1.00608 161.357
+41 2.43 1.01114 173.976
+42 2.49 1.00622 187.161
+43 2.55 1.00292 200.944
+44 2.61 0.993056 215.242
+45 2.67 0.997262 230.267
+46 2.73 1.00884 246.158
+47 2.79 0.997346 262.566
+48 2.85 0.997429 279.689
+49 2.91 1.00024 297.591
+50 2.97 0.99429 316.127
+103450 50
+1 0.03 0 0
+2 0.09 0.040178 0.000713267
+3 0.15 0.0148024 0.00142653
+4 0.21 0.0836137 0.00927247
+5 0.27 0.101433 0.0249643
+6 0.33 0.185437 0.0677603
+7 0.39 0.31225 0.168331
+8 0.45 0.439343 0.356633
+9 0.51 0.593598 0.68331
+10 0.57 0.763827 1.20827
+11 0.63 0.92021 1.98074
+12 0.69 0.999593 2.98716
+13 0.75 1.06742 4.25678
+14 0.81 1.15069 5.85307
+15 0.87 1.15841 7.70685
+16 0.93 1.17608 9.85735
+17 0.99 1.05648 12.0464
+18 1.05 1.02675 14.4394
+19 1.11 0.962864 16.9472
+20 1.17 0.932968 19.6469
+21 1.23 0.91444 22.5713
+22 1.29 0.967835 25.9757
+23 1.35 0.96705 29.7011
+24 1.41 1.00295 33.9158
+25 1.47 1.00771 38.5185
+26 1.53 1.01788 43.5549
+27 1.59 1.00392 48.9194
+28 1.65 1.0226 54.8039
+29 1.71 1.03127 61.1776
+30 1.77 0.99928 67.7946
+31 1.83 1.01031 74.9458
+32 1.89 0.989416 82.4158
+33 1.95 0.996476 90.4244
+34 2.01 1.00211 98.9815
+35 2.07 0.985976 107.911
+36 2.13 0.99868 117.487
+37 2.19 0.994881 127.572
+38 2.25 0.99706 138.24
+39 2.31 1.00261 149.548
+40 2.37 0.995927 161.371
+41 2.43 1.01268 174.009
+42 2.49 1.014 187.297
+43 2.55 0.994975 200.971
+44 2.61 0.991421 215.245
+45 2.67 1.00526 230.391
+46 2.73 1.00336 246.195
+47 2.79 0.994442 262.556
+48 2.85 1.00395 279.79
+49 2.91 0.99829 297.657
+50 2.97 0.992721 316.164
+103500 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0.0148024 0.000713267
+4 0.21 0.0532087 0.00570613
+5 0.27 0.138318 0.0271041
+6 0.33 0.179256 0.0684736
+7 0.39 0.252457 0.149786
+8 0.45 0.475955 0.35378
+9 0.51 0.636368 0.703994
+10 0.57 0.755525 1.22325
+11 0.63 0.900667 1.97932
+12 0.69 0.993217 2.97932
+13 0.75 1.0914 4.27746
+14 0.81 1.1291 5.84379
+15 0.87 1.15841 7.69757
+16 0.93 1.14605 9.79315
+17 0.99 1.05579 11.9807
+18 1.05 1.01328 14.3424
+19 1.11 0.959578 16.8417
+20 1.17 0.951208 19.5942
+21 1.23 0.926707 22.5578
+22 1.29 0.977568 25.9964
+23 1.35 0.988712 29.8053
+24 1.41 1.0004 34.0093
+25 1.47 0.996152 38.5592
+26 1.53 1.01701 43.5913
+27 1.59 1.01259 49.0021
+28 1.65 0.990249 54.7004
+29 1.71 1.01073 60.9472
+30 1.77 1.01641 67.6776
+31 1.83 0.995496 74.724
+32 1.89 1.00085 82.2803
+33 1.95 1.00784 90.3802
+34 2.01 0.992923 98.8588
+35 2.07 1.00173 107.931
+36 2.13 0.982465 117.352
+37 2.19 0.99277 127.415
+38 2.25 1.00853 138.206
+39 2.31 1.0033 149.521
+40 2.37 1.00242 161.422
+41 2.43 0.99622 173.854
+42 2.49 1.0054 187.029
+43 2.55 0.998037 200.745
+44 2.61 1.00475 215.211
+45 2.67 0.997924 230.247
+46 2.73 1.00757 246.118
+47 2.79 1.00606 262.669
+48 2.85 0.988371 279.636
+49 2.91 1.002 297.569
+50 2.97 0.999608 316.205
+103550 50
+1 0.03 0.281246 0.000713267
+2 0.09 0 0.000713267
+3 0.15 0.0148024 0.00142653
+4 0.21 0.0228037 0.00356633
+5 0.27 0.138318 0.0249643
+6 0.33 0.188528 0.0684736
+7 0.39 0.283461 0.159772
+8 0.45 0.439343 0.348074
+9 0.51 0.635072 0.697575
+10 0.57 0.791848 1.2418
+11 0.63 0.887922 1.98716
+12 0.69 0.997467 2.99144
+13 0.75 1.0938 4.29244
+14 0.81 1.13732 5.87019
+15 0.87 1.15262 7.71469
+16 0.93 1.14917 9.81598
+17 0.99 1.06646 12.0257
+18 1.05 0.977782 14.3046
+19 1.11 0.964781 16.8174
+20 1.17 0.94825 19.5613
+21 1.23 0.955255 22.6163
+22 1.29 0.951411 25.9629
+23 1.35 0.99797 29.8074
+24 1.41 1.01143 34.0578
+25 1.47 1.0063 38.6541
+26 1.53 1.00707 43.6369
+27 1.59 0.999912 48.98
+28 1.65 1.02595 54.8837
+29 1.71 1.006 61.1013
+30 1.77 0.994971 67.6897
+31 1.83 0.999326 74.7632
+32 1.89 0.999713 82.311
+33 1.95 0.989731 90.2653
+34 2.01 0.992756 98.7425
+35 2.07 0.988024 107.69
+36 2.13 1.00865 117.362
+37 2.19 1.00783 127.578
+38 2.25 1.00519 138.334
+39 2.31 1.00773 149.699
+40 2.37 1.00578 161.639
+41 2.43 1.00451 174.175
+42 2.49 0.985586 187.091
+43 2.55 0.999802 200.831
+44 2.61 0.997019 215.185
+45 2.67 1.00512 230.33
+46 2.73 0.99901 246.066
+47 2.79 0.99791 262.483
+48 2.85 0.997138 279.601
+49 2.91 1.00192 297.532
+50 2.97 1.00408 316.251
+103600 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0.0380062 0.00356633
+5 0.27 0.0922118 0.0178317
+6 0.33 0.216343 0.0677603
+7 0.39 0.290104 0.161198
+8 0.45 0.48594 0.369472
+9 0.51 0.580637 0.689016
+10 0.57 0.708823 1.17618
+11 0.63 0.921909 1.95007
+12 0.69 1.00668 2.96362
+13 0.75 1.13758 4.31669
+14 0.81 1.16869 5.93795
+15 0.87 1.15039 7.77889
+16 0.93 1.1164 9.82026
+17 0.99 1.06061 12.0178
+18 1.05 1.00716 14.3652
+19 1.11 0.942051 16.8188
+20 1.17 0.938391 19.5342
+21 1.23 0.957709 22.597
+22 1.29 0.958913 25.97
+23 1.35 0.991305 29.7889
+24 1.41 1.00821 34.0257
+25 1.47 1.00521 38.617
+26 1.53 1.01413 43.6348
+27 1.59 1.0158 49.0628
+28 1.65 1.00078 54.8217
+29 1.71 1.02135 61.1341
+30 1.77 0.995079 67.7233
+31 1.83 0.984412 74.6912
+32 1.89 1.00774 82.2996
+33 1.95 0.991683 90.2696
+34 2.01 1.00311 98.8352
+35 2.07 0.999837 107.89
+36 2.13 0.996374 117.444
+37 2.19 0.997555 127.556
+38 2.25 0.993794 138.19
+39 2.31 1.0119 149.602
+40 2.37 1.01215 161.618
+41 2.43 1.00125 174.113
+42 2.49 0.998541 187.198
+43 2.55 0.980599 200.675
+44 2.61 0.9991 215.059
+45 2.67 1.01336 230.327
+46 2.73 1.00431 246.147
+47 2.79 1.00168 262.626
+48 2.85 0.986709 279.565
+49 2.91 1.00467 297.546
+50 2.97 1.00389 316.261
+103650 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0.0152025 0.00142653
+5 0.27 0.0783801 0.0135521
+6 0.33 0.169984 0.0527817
+7 0.39 0.298962 0.149073
+8 0.45 0.447664 0.340942
+9 0.51 0.646736 0.696862
+10 0.57 0.751373 1.21327
+11 0.63 0.907465 1.97504
+12 0.69 1.03856 3.02068
+13 0.75 1.07821 4.30314
+14 0.81 1.1327 5.87447
+15 0.87 1.14014 7.699
+16 0.93 1.15502 9.81098
+17 0.99 1.07197 12.0321
+18 1.05 1.00073 14.3645
+19 1.11 0.956565 16.8559
+20 1.17 0.952687 19.6127
+21 1.23 0.951241 22.6548
+22 1.29 0.949586 25.995
+23 1.35 0.990009 29.8088
+24 1.41 0.978166 33.9194
+25 1.47 1.02176 38.5863
+26 1.53 1.02206 43.6434
+27 1.59 1.02621 49.127
+28 1.65 0.981696 54.776
+29 1.71 1.00554 60.9907
+30 1.77 1.00283 67.6312
+31 1.83 1.00527 74.7468
+32 1.89 0.994139 82.2525
+33 1.95 1.01733 90.4287
+34 2.01 0.99309 98.9087
+35 2.07 1.00433 108.004
+36 2.13 0.991911 117.516
+37 2.19 0.993192 127.583
+38 2.25 0.994994 138.23
+39 2.31 0.987745 149.369
+40 2.37 1.00981 161.357
+41 2.43 0.998449 173.818
+42 2.49 1.00959 187.048
+43 2.55 0.997103 200.751
+44 2.61 1.00628 215.239
+45 2.67 1.00365 230.361
+46 2.73 1.00177 246.141
+47 2.79 0.995135 262.512
+48 2.85 0.991404 279.531
+49 2.91 1.01276 297.657
+50 2.97 0.990846 316.129
+103700 50
+1 0.03 0 0
+2 0.09 0.040178 0.000713267
+3 0.15 0.0148024 0.00142653
+4 0.21 0.0532087 0.0064194
+5 0.27 0.101433 0.0221113
+6 0.33 0.142168 0.0549215
+7 0.39 0.283461 0.14622
+8 0.45 0.470962 0.348074
+9 0.51 0.609151 0.68331
+10 0.57 0.74826 1.19757
+11 0.63 0.909164 1.96077
+12 0.69 1.03572 3.00357
+13 0.75 1.07281 4.2796
+14 0.81 1.12961 5.84665
+15 0.87 1.16242 7.70685
+16 0.93 1.14527 9.801
+17 0.99 1.06715 12.0121
+18 1.05 0.994308 14.3295
+19 1.11 0.940682 16.7796
+20 1.17 0.969695 19.5856
+21 1.23 0.964623 22.6705
+22 1.29 0.95425 26.0271
+23 1.35 0.978714 29.7974
+24 1.41 0.988011 33.9494
+25 1.47 1.00849 38.5556
+26 1.53 1.00101 43.5086
+27 1.59 1.02327 48.9765
+28 1.65 1.00847 54.7796
+29 1.71 1.02193 61.0956
+30 1.77 1.01091 67.7896
+31 1.83 1.00396 74.8959
+32 1.89 0.988471 82.3588
+33 1.95 0.994346 90.3502
+34 2.01 0.998186 98.8738
+35 2.07 1.00504 107.976
+36 2.13 1.0018 117.582
+37 2.19 0.993122 127.649
+38 2.25 0.985528 138.194
+39 2.31 1.01317 149.621
+40 2.37 0.991421 161.39
+41 2.43 1.01182 174.018
+42 2.49 1.00268 187.157
+43 2.55 1.00115 200.916
+44 2.61 1.00202 215.342
+45 2.67 1.00247 230.447
+46 2.73 1.00911 246.342
+47 2.79 0.992881 262.676
+48 2.85 0.997055 279.792
+49 2.91 1.00447 297.77
+50 2.97 0.993563 316.292
+103750 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0.0148024 0.000713267
+4 0.21 0.0532087 0.00570613
+5 0.27 0.106044 0.0221113
+6 0.33 0.194709 0.0670471
+7 0.39 0.305606 0.165478
+8 0.45 0.467634 0.365906
+9 0.51 0.628592 0.71184
+10 0.57 0.7576 1.23252
+11 0.63 0.880275 1.97147
+12 0.69 1.01589 2.99429
+13 0.75 1.0896 4.2903
+14 0.81 1.11007 5.83024
+15 0.87 1.14192 7.65763
+16 0.93 1.15814 9.77532
+17 0.99 1.06956 11.9914
+18 1.05 0.975639 14.2653
+19 1.11 0.976009 16.8074
+20 1.17 0.961561 19.5899
+21 1.23 0.942766 22.6049
+22 1.29 0.952019 25.9536
+23 1.35 0.976492 29.7154
+24 1.41 1.01754 33.9914
+25 1.47 1.00209 38.5685
+26 1.53 1.02307 43.6305
+27 1.59 0.982559 48.8809
+28 1.65 1.02917 54.8031
+29 1.71 0.996883 60.9643
+30 1.77 1.01339 67.6748
+31 1.83 1.01353 74.8488
+32 1.89 1.00463 82.4337
+33 1.95 0.984406 90.3452
+34 2.01 0.986157 98.766
+35 2.07 0.9933 107.762
+36 2.13 1.00024 117.353
+37 2.19 1.00741 127.565
+38 2.25 1.00659 138.335
+39 2.31 1.00001 149.613
+40 2.37 0.998631 161.469
+41 2.43 0.999192 173.939
+42 2.49 1.00583 187.119
+43 2.55 1.00183 200.887
+44 2.61 0.99806 215.257
+45 2.67 1.00034 230.329
+46 2.73 0.990044 245.924
+47 2.79 1.00303 262.425
+48 2.85 0.998301 279.563
+49 2.91 1.00088 297.476
+50 2.97 0.995744 316.039
+103800 50
+1 0.03 0 0
+2 0.09 0.040178 0.000713267
+3 0.15 0.0148024 0.00142653
+4 0.21 0.0456075 0.00570613
+5 0.27 0.0829907 0.0185449
+6 0.33 0.145259 0.0520685
+7 0.39 0.323322 0.156205
+8 0.45 0.447664 0.348074
+9 0.51 0.671362 0.717546
+10 0.57 0.793924 1.2632
+11 0.63 0.887072 2.00785
+12 0.69 1.02368 3.03852
+13 0.75 1.03803 4.27318
+14 0.81 1.15789 5.87946
+15 0.87 1.13479 7.69544
+16 0.93 1.16126 9.81883
+17 0.99 1.07886 12.0542
+18 1.05 0.960032 14.2917
+19 1.11 0.976557 16.8352
+20 1.17 0.946772 19.5749
+21 1.23 0.961946 22.6512
+22 1.29 0.964794 26.0449
+23 1.35 0.987231 29.8481
+24 1.41 1.00023 34.0514
+25 1.47 1.00911 38.6605
+26 1.53 1.00462 43.6312
+27 1.59 1.01847 49.0735
+28 1.65 0.994463 54.796
+29 1.71 1.00519 61.0086
+30 1.77 1.00941 67.6926
+31 1.83 1.0089 74.8338
+32 1.89 1.00557 82.4258
+33 1.95 0.991417 90.3937
+34 2.01 0.978807 98.7518
+35 2.07 0.993931 107.753
+36 2.13 1.00716 117.411
+37 2.19 1.00994 127.648
+38 2.25 1.00806 138.434
+39 2.31 1.00975 149.822
+40 2.37 0.998931 161.681
+41 2.43 0.988276 174.015
+42 2.49 0.994023 187.041
+43 2.55 0.99731 200.747
+44 2.61 0.991867 215.027
+45 2.67 1.00768 230.21
+46 2.73 1.01029 246.123
+47 2.79 0.995092 262.494
+48 2.85 1.00557 279.757
+49 2.91 0.998091 297.62
+50 2.97 1.00194 316.299
+103850 50
+1 0.03 0.281246 0.000713267
+2 0.09 0 0.000713267
+3 0.15 0 0.000713267
+4 0.21 0.0456075 0.00499287
+5 0.27 0.133707 0.0256776
+6 0.33 0.197799 0.0713267
+7 0.39 0.323322 0.175464
+8 0.45 0.460977 0.373039
+9 0.51 0.562492 0.682596
+10 0.57 0.74826 1.19686
+11 0.63 0.914262 1.96434
+12 0.69 1.0258 2.99715
+13 0.75 1.08721 4.2903
+14 0.81 1.16098 5.90086
+15 0.87 1.1544 7.74822
+16 0.93 1.10353 9.76605
+17 0.99 1.09469 12.0342
+18 1.05 1.00624 14.3795
+19 1.11 0.968067 16.9009
+20 1.17 0.945046 19.6355
+21 1.23 0.934067 22.6227
+22 1.29 0.9506 25.9665
+23 1.35 0.983158 29.7539
+24 1.41 1.01941 34.0378
+25 1.47 0.998182 38.597
+26 1.53 1.0186 43.6369
+27 1.59 1.0146 49.0585
+28 1.65 1.00351 54.8331
+29 1.71 1.01327 61.0956
+30 1.77 0.996587 67.6947
+31 1.83 1.01817 74.9016
+32 1.89 0.996218 82.423
+33 1.95 0.993192 90.4051
+34 2.01 0.990584 98.8638
+35 2.07 0.986291 107.796
+36 2.13 0.992135 117.31
+37 2.19 0.998258 127.429
+38 2.25 0.99966 138.125
+39 2.31 1.01412 149.562
+40 2.37 1.01395 161.599
+41 2.43 0.99182 173.977
+42 2.49 0.999085 187.069
+43 2.55 1.0093 200.94
+44 2.61 0.996078 215.281
+45 2.67 0.995557 230.281
+46 2.73 0.999282 246.021
+47 2.79 0.995872 262.405
+48 2.85 0.997179 279.524
+49 2.91 0.999366 297.409
+50 2.97 1.0073 316.188
+103900 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0.030405 0.00285307
+5 0.27 0.124486 0.0221113
+6 0.33 0.185437 0.0649073
+7 0.39 0.318893 0.167618
+8 0.45 0.444336 0.35806
+9 0.51 0.616927 0.697575
+10 0.57 0.784583 1.2368
+11 0.63 0.876026 1.97218
+12 0.69 0.998884 2.97789
+13 0.75 1.0956 4.28103
+14 0.81 1.14812 5.87375
+15 0.87 1.15128 7.71612
+16 0.93 1.0969 9.72183
+17 0.99 1.05338 11.9044
+18 1.05 1.03103 14.3074
+19 1.11 0.985594 16.8745
+20 1.17 0.956138 19.6412
+21 1.23 0.962616 22.7197
+22 1.29 0.960536 26.0984
+23 1.35 0.963717 29.811
+24 1.41 0.991914 33.9793
+25 1.47 1.00552 38.572
+26 1.53 1.00072 43.5235
+27 1.59 1.00899 48.9151
+28 1.65 1.01826 54.7746
+29 1.71 0.995152 60.9251
+30 1.77 1.0219 67.6919
+31 1.83 1.01303 74.8623
+32 1.89 0.991494 82.3481
+33 1.95 0.982542 90.2447
+34 2.01 1.00078 98.7903
+35 2.07 1.00417 107.884
+36 2.13 1.00552 117.526
+37 2.19 0.989674 127.558
+38 2.25 0.996127 138.217
+39 2.31 1.00868 149.593
+40 2.37 1.00224 161.491
+41 2.43 0.990448 173.852
+42 2.49 1.00257 186.989
+43 2.55 1.01179 200.894
+44 2.61 1.00252 215.328
+45 2.67 0.995463 230.327
+46 2.73 1.00032 246.083
+47 2.79 1.00255 262.577
+48 2.85 1.0032 279.799
+49 2.91 0.984142 297.412
+50 2.97 1.0032 316.115
+103950 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0.0148024 0.000713267
+4 0.21 0.0228037 0.00285307
+5 0.27 0.106044 0.0192582
+6 0.33 0.179256 0.0606277
+7 0.39 0.267959 0.146933
+8 0.45 0.419373 0.326676
+9 0.51 0.60267 0.658345
+10 0.57 0.769016 1.18688
+11 0.63 0.91936 1.95863
+12 0.69 1.03572 3.00143
+13 0.75 1.0908 4.29886
+14 0.81 1.13835 5.87803
+15 0.87 1.18337 7.77175
+16 0.93 1.13006 9.83809
+17 0.99 1.08712 12.0906
+18 1.05 0.989717 14.3973
+19 1.11 0.958756 16.8944
+20 1.17 0.951455 19.6476
+21 1.23 0.945665 22.6719
+22 1.29 0.950802 26.0164
+23 1.35 0.981862 29.7989
+24 1.41 0.989538 33.9572
+25 1.47 1.01224 38.5806
+26 1.53 1.00245 43.5407
+27 1.59 1.02821 49.035
+28 1.65 1.03103 54.9679
+29 1.71 1.00554 61.1826
+30 1.77 1.00639 67.8466
+31 1.83 0.990659 74.8588
+32 1.89 0.997824 82.3923
+33 1.95 0.991594 90.3616
+34 2.01 1.00854 98.9736
+35 2.07 0.979518 107.845
+36 2.13 1.00768 117.507
+37 2.19 0.982426 127.466
+38 2.25 1.00126 138.179
+39 2.31 0.995777 149.409
+40 2.37 1.00608 161.353
+41 2.43 1.01708 174.046
+42 2.49 0.993043 187.059
+43 2.55 1.01049 200.947
+44 2.61 1.00693 215.444
+45 2.67 0.999676 230.506
+46 2.73 0.994165 246.165
+47 2.79 0.992491 262.494
+48 2.85 1.00474 279.742
+49 2.91 0.988925 297.441
+50 2.97 0.997389 316.035
+104000 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0.0296049 0.00142653
+4 0.21 0.0456075 0.00570613
+5 0.27 0.0829907 0.0185449
+6 0.33 0.135987 0.0499287
+7 0.39 0.347682 0.161912
+8 0.45 0.437679 0.349501
+9 0.51 0.63248 0.697575
+10 0.57 0.747222 1.21113
+11 0.63 0.879425 1.94936
+12 0.69 1.03218 2.98859
+13 0.75 1.0932 4.28887
+14 0.81 1.15789 5.89515
+15 0.87 1.13657 7.71398
+16 0.93 1.16009 9.83524
+17 0.99 1.06784 12.0478
+18 1.05 1.009 14.3994
+19 1.11 0.94479 16.8602
+20 1.17 0.957124 19.6298
+21 1.23 0.944996 22.6519
+22 1.29 0.944922 25.9757
+23 1.35 0.970938 29.7161
+24 1.41 0.9948 33.8966
+25 1.47 1.01411 38.5285
+26 1.53 1.02955 43.6227
+27 1.59 1.02114 49.0792
+28 1.65 1.03078 55.0107
+29 1.71 1.00935 61.2489
+30 1.77 0.994971 67.8374
+31 1.83 1.01071 74.9914
+32 1.89 0.989321 82.4608
+33 1.95 0.997807 90.48
+34 2.01 0.98858 98.9215
+35 2.07 0.992355 107.909
+36 2.13 0.983729 117.342
+37 2.19 0.995584 127.434
+38 2.25 1.01099 138.251
+39 2.31 0.999192 149.52
+40 2.37 1.00776 161.484
+41 2.43 1.00599 174.039
+42 2.49 1.00975 187.27
+43 2.55 1.01231 201.183
+44 2.61 0.988944 215.421
+45 2.67 0.98964 230.332
+46 2.73 1.00195 246.114
+47 2.79 1.00225 262.603
+48 2.85 0.993772 279.663
+49 2.91 1.00423 297.636
+50 2.97 0.9923 316.135
+104050 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0.0296049 0.00142653
+4 0.21 0.0456075 0.00570613
+5 0.27 0.0829907 0.0185449
+6 0.33 0.191618 0.0627675
+7 0.39 0.285675 0.154779
+8 0.45 0.459313 0.351641
+9 0.51 0.603966 0.684023
+10 0.57 0.79081 1.22753
+11 0.63 0.924459 2.00357
+12 0.69 1.00739 3.01783
+13 0.75 1.03923 4.25392
+14 0.81 1.17023 5.87732
+15 0.87 1.14415 7.70827
+16 0.93 1.15268 9.81598
+17 0.99 1.06922 12.0314
+18 1.05 0.992471 14.3445
+19 1.11 0.97464 16.883
+20 1.17 0.950469 19.6334
+21 1.23 0.927153 22.5984
+22 1.29 0.979596 26.0442
+23 1.35 0.99223 29.8666
+24 1.41 0.985804 34.0093
+25 1.47 0.98647 38.515
+26 1.53 1.01413 43.5328
+27 1.59 1.0182 48.9736
+28 1.65 1.02818 54.8902
+29 1.71 0.997691 61.0563
+30 1.77 1.00951 67.7411
+31 1.83 1.00285 74.8395
+32 1.89 1.00973 82.4629
+33 1.95 0.983341 90.3659
+34 2.01 0.997935 98.8873
+35 2.07 0.990386 107.857
+36 2.13 0.994515 117.393
+37 2.19 0.996007 127.489
+38 2.25 1.00073 138.197
+39 2.31 1.00134 149.49
+40 2.37 1.00656 161.439
+41 2.43 0.998507 173.901
+42 2.49 1.00241 187.036
+43 2.55 1.00946 200.909
+44 2.61 1.00197 215.335
+45 2.67 1.0011 230.419
+46 2.73 0.999101 246.156
+47 2.79 0.993878 262.507
+48 2.85 0.994977 279.588
+49 2.91 1.01072 297.677
+50 2.97 0.989431 316.123
+104100 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0.030405 0.00285307
+5 0.27 0.115265 0.0206847
+6 0.33 0.163803 0.0584879
+7 0.39 0.292319 0.152639
+8 0.45 0.480947 0.358773
+9 0.51 0.594894 0.686163
+10 0.57 0.759676 1.20827
+11 0.63 0.935504 1.99358
+12 0.69 0.963463 2.96362
+13 0.75 1.13518 4.31384
+14 0.81 1.17332 5.94151
+15 0.87 1.14549 7.77461
+16 0.93 1.11562 9.81455
+17 0.99 1.08609 12.0649
+18 1.05 0.974721 14.3367
+19 1.11 0.956292 16.8274
+20 1.17 0.933215 19.5278
+21 1.23 0.971983 22.6362
+22 1.29 0.959319 26.0107
+23 1.35 0.995933 29.8474
+24 1.41 0.993951 34.0243
+25 1.47 1.00209 38.6013
+26 1.53 1.02307 43.6633
+27 1.59 0.986697 48.9358
+28 1.65 1.03041 54.8652
+29 1.71 0.99042 60.9864
+30 1.77 1.00844 67.6641
+31 1.83 1.01424 74.8431
+32 1.89 0.997635 82.3752
+33 1.95 0.993547 90.3602
+34 2.01 0.993759 98.8459
+35 2.07 0.998499 107.889
+36 2.13 1.00976 117.571
+37 2.19 0.991785 127.625
+38 2.25 1.00039 138.329
+39 2.31 0.993057 149.529
+40 2.37 1.00392 161.447
+41 2.43 1.00279 173.961
+42 2.49 0.994622 186.995
+43 2.55 1.00769 200.844
+44 2.61 1.00321 215.287
+45 2.67 1.00597 230.444
+46 2.73 0.99652 246.141
+47 2.79 1.00094 262.608
+48 2.85 0.996473 279.715
+49 2.91 1.00192 297.646
+50 2.97 0.997274 316.238
+104150 50
+1 0.03 0 0
+2 0.09 0.040178 0.000713267
+3 0.15 0.0444073 0.00285307
+4 0.21 0.0380062 0.0064194
+5 0.27 0.0783801 0.0185449
+6 0.33 0.179256 0.0599144
+7 0.39 0.292319 0.154066
+8 0.45 0.437679 0.341655
+9 0.51 0.627295 0.686876
+10 0.57 0.816755 1.24822
+11 0.63 0.868379 1.97718
+12 0.69 1.00668 2.99073
+13 0.75 1.08061 4.27603
+14 0.81 1.15069 5.87233
+15 0.87 1.14504 7.70471
+16 0.93 1.12771 9.76676
+17 0.99 1.08127 12.0071
+18 1.05 0.983596 14.2996
+19 1.11 0.979021 16.8495
+20 1.17 0.952441 19.6056
+21 1.23 0.964177 22.689
+22 1.29 0.953236 26.0421
+23 1.35 0.970012 29.7789
+24 1.41 0.991405 33.9451
+25 1.47 0.997869 38.5029
+26 1.53 1.01355 43.5178
+27 1.59 1.01927 48.9643
+28 1.65 1.02681 54.873
+29 1.71 1.01558 61.1498
+30 1.77 0.994756 67.7368
+31 1.83 0.993985 74.7725
+32 1.89 1.00765 82.3802
+33 1.95 1.00358 90.4458
+34 2.01 0.979893 98.8131
+35 2.07 0.992434 107.801
+36 2.13 1.0085 117.471
+37 2.19 0.98883 127.495
+38 2.25 0.99766 138.17
+39 2.31 1.00899 149.549
+40 2.37 0.99779 161.394
+41 2.43 1.00542 173.942
+42 2.49 1.00883 187.162
+43 2.55 1.00572 200.984
+44 2.61 1.00351 215.432
+45 2.67 0.997309 230.458
+46 2.73 1.00277 246.253
+47 2.79 0.995309 262.628
+48 2.85 1.00395 279.862
+49 2.91 0.99829 297.729
+50 2.97 0.995629 316.29
+104200 50
+1 0.03 0.281246 0.000713267
+2 0.09 0 0.000713267
+3 0.15 0.0148024 0.00142653
+4 0.21 0.0760125 0.0085592
+5 0.27 0.110654 0.0256776
+6 0.33 0.126715 0.0549215
+7 0.39 0.33661 0.163338
+8 0.45 0.431022 0.348074
+9 0.51 0.625999 0.692582
+10 0.57 0.728542 1.1933
+11 0.63 0.89217 1.94223
+12 0.69 1.01447 2.96362
+13 0.75 1.07161 4.23823
+14 0.81 1.16817 5.85877
+15 0.87 1.13122 7.66904
+16 0.93 1.1636 9.79672
+17 0.99 1.07679 12.0278
+18 1.05 0.997062 14.3516
+19 1.11 0.962864 16.8595
+20 1.17 0.937405 19.572
+21 1.23 0.956594 22.6312
+22 1.29 0.950194 25.9736
+23 1.35 0.986491 29.7739
+24 1.41 0.995649 33.9579
+25 1.47 1.01442 38.5913
+26 1.53 1.01399 43.6084
+27 1.59 1.00792 48.9943
+28 1.65 0.995207 54.7211
+29 1.71 1.0135 60.985
+30 1.77 1.01759 67.7233
+31 1.83 1.00819 74.8595
+32 1.89 0.99943 82.4051
+33 1.95 0.999049 90.4344
+34 2.01 0.999104 98.9658
+35 2.07 0.993458 107.963
+36 2.13 0.987151 117.429
+37 2.19 1.00656 127.632
+38 2.25 0.989328 138.218
+39 2.31 0.999508 149.49
+40 2.37 1.00025 161.364
+41 2.43 0.997649 173.815
+42 2.49 0.993751 186.837
+43 2.55 1.01797 200.827
+44 2.61 0.996276 215.171
+45 2.67 1.00072 230.249
+46 2.73 1.01196 246.189
+47 2.79 0.984773 262.39
+48 2.85 1.00349 279.617
+49 2.91 1.00228 297.555
+50 2.97 0.995361 316.111
+104250 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0.0148024 0.000713267
+4 0.21 0.0380062 0.0042796
+5 0.27 0.142928 0.0263909
+6 0.33 0.207071 0.0741797
+7 0.39 0.303391 0.171897
+8 0.45 0.446 0.363053
+9 0.51 0.58971 0.687589
+10 0.57 0.746184 1.20043
+11 0.63 0.876876 1.93652
+12 0.69 1.00243 2.94579
+13 0.75 1.0992 4.25321
+14 0.81 1.13887 5.8331
+15 0.87 1.17847 7.71897
+16 0.93 1.10275 9.73538
+17 0.99 1.08127 11.9757
+18 1.05 1.03348 14.3845
+19 1.11 0.95191 16.8638
+20 1.17 0.950715 19.6148
+21 1.23 0.953471 22.6641
+22 1.29 0.943705 25.9836
+23 1.35 0.981862 29.766
+24 1.41 0.999892 33.9679
+25 1.47 1.01489 38.6034
+26 1.53 1.01456 43.6234
+27 1.59 1.0186 49.0663
+28 1.65 1.01578 54.9116
+29 1.71 0.993998 61.0549
+30 1.77 0.987539 67.5942
+31 1.83 1.01374 74.7696
+32 1.89 1.00878 82.3859
+33 1.95 0.991062 90.3509
+34 2.01 1.0042 98.9258
+35 2.07 1.00157 107.996
+36 2.13 0.998829 117.574
+37 2.19 0.991292 127.623
+38 2.25 0.994461 138.263
+39 2.31 1.00216 149.566
+40 2.37 1.00212 161.462
+41 2.43 1.00662 174.025
+42 2.49 1.00469 187.19
+43 2.55 1.00769 201.039
+44 2.61 0.992065 215.322
+45 2.67 1.00209 230.421
+46 2.73 0.997199 246.128
+47 2.79 0.994745 262.494
+48 2.85 0.997886 279.624
+49 2.91 0.996497 297.459
+50 2.97 1.00443 316.184
+104300 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0.0148024 0.000713267
+4 0.21 0.06081 0.0064194
+5 0.27 0.0691589 0.0171184
+6 0.33 0.179256 0.0584879
+7 0.39 0.294533 0.153352
+8 0.45 0.409388 0.328816
+9 0.51 0.576749 0.64622
+10 0.57 0.797037 1.19401
+11 0.63 0.932955 1.97718
+12 0.69 0.992508 2.97646
+13 0.75 1.12918 4.31954
+14 0.81 1.1219 5.87589
+15 0.87 1.15173 7.71897
+16 0.93 1.12108 9.7689
+17 0.99 1.08161 12.01
+18 1.05 1.00349 14.3488
+19 1.11 0.958209 16.8445
+20 1.17 0.966491 19.6412
+21 1.23 0.944104 22.6605
+22 1.29 0.941272 25.9715
+23 1.35 1.00704 29.8509
+24 1.41 0.960344 33.8866
+25 1.47 1.01911 38.5414
+26 1.53 1.0209 43.5927
+27 1.59 1.02207 49.0542
+28 1.65 1.00512 54.8381
+29 1.71 1.0165 61.1205
+30 1.77 1.00574 67.7803
+31 1.83 0.983606 74.7425
+32 1.89 1.01445 82.4016
+33 1.95 1.00792 90.5021
+34 2.01 0.991169 98.9658
+35 2.07 0.987551 107.909
+36 2.13 0.984324 117.348
+37 2.19 1.00016 127.486
+38 2.25 1.01639 138.362
+39 2.31 0.994575 149.578
+40 2.37 1.00386 161.496
+41 2.43 0.998049 173.951
+42 2.49 0.998269 187.033
+43 2.55 1.00946 200.906
+44 2.61 0.997118 215.262
+45 2.67 0.999865 230.327
+46 2.73 0.996927 246.03
+47 2.79 0.999124 262.467
+48 2.85 0.996722 279.578
+49 2.91 0.994664 297.379
+50 2.97 1.00864 316.183
+104350 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0.0740121 0.00356633
+4 0.21 0.0380062 0.00713267
+5 0.27 0.0876012 0.0206847
+6 0.33 0.179256 0.0620542
+7 0.39 0.298962 0.158345
+8 0.45 0.447664 0.350214
+9 0.51 0.623407 0.693295
+10 0.57 0.754487 1.21184
+11 0.63 0.86753 1.94009
+12 0.69 1.01164 2.95863
+13 0.75 1.11659 4.28673
+14 0.81 1.14298 5.87233
+15 0.87 1.14861 7.71041
+16 0.93 1.13396 9.78388
+17 0.99 1.08677 12.0357
+18 1.05 1.00747 14.3837
+19 1.11 0.944242 16.8431
+20 1.17 0.947757 19.5856
+21 1.23 0.940535 22.5934
+22 1.29 0.965402 25.9893
+23 1.35 0.970753 29.729
+24 1.41 0.992084 33.898
+25 1.47 1.01989 38.5563
+26 1.53 1.03647 43.6847
+27 1.59 1.00405 49.0499
+28 1.65 1.00797 54.8502
+29 1.71 1.01777 61.1405
+30 1.77 0.986246 67.6712
+31 1.83 1.01484 74.8545
+32 1.89 0.999146 82.398
+33 1.95 0.987423 90.3338
+34 2.01 0.986575 98.7582
+35 2.07 0.994797 107.767
+36 2.13 1.00746 117.428
+37 2.19 0.999666 127.561
+38 2.25 1.01013 138.369
+39 2.31 0.999319 149.64
+40 2.37 1.00794 161.606
+41 2.43 0.992506 173.992
+42 2.49 1.0091 187.215
+43 2.55 0.995183 200.892
+44 2.61 0.999645 215.285
+45 2.67 0.995321 230.281
+46 2.73 1.00372 246.091
+47 2.79 1.00285 262.59
+48 2.85 0.99934 279.745
+49 2.91 0.999207 297.628
+50 2.97 0.997197 316.219
+104400 50
+1 0.03 0 0
+2 0.09 0.040178 0.000713267
+3 0.15 0.0148024 0.00142653
+4 0.21 0.030405 0.0042796
+5 0.27 0.106044 0.0206847
+6 0.33 0.182346 0.0627675
+7 0.39 0.272388 0.150499
+8 0.45 0.417709 0.329529
+9 0.51 0.588414 0.653352
+10 0.57 0.837511 1.22896
+11 0.63 0.94825 2.02496
+12 0.69 0.9918 3.02354
+13 0.75 1.08481 4.31384
+14 0.81 1.13424 5.8873
+15 0.87 1.17223 7.7632
+16 0.93 1.13357 9.83595
+17 0.99 1.02756 11.965
+18 1.05 1.0041 14.3053
+19 1.11 0.963959 16.816
+20 1.17 0.933708 19.5178
+21 1.23 0.957709 22.5806
+22 1.29 0.961347 25.9622
+23 1.35 0.969642 29.6976
+24 1.41 1.01126 33.9472
+25 1.47 1.01583 38.587
+26 1.53 1.01817 43.6248
+27 1.59 1.00312 48.985
+28 1.65 1.01169 54.8067
+29 1.71 1.00831 61.0385
+30 1.77 0.990016 67.5942
+31 1.83 1.00497 74.7076
+32 1.89 1.0102 82.3345
+33 1.95 0.997807 90.3538
+34 2.01 0.997601 98.8723
+35 2.07 1.00149 107.942
+36 2.13 0.999052 117.522
+37 2.19 0.988689 127.544
+38 2.25 1.00366 138.283
+39 2.31 0.985089 149.393
+40 2.37 1.00608 161.337
+41 2.43 1.00531 173.883
+42 2.49 1.01786 187.221
+43 2.55 1.00738 201.066
+44 2.61 0.988102 215.292
+45 2.67 1.00043 230.365
+46 2.73 0.993123 246.009
+47 2.79 0.987505 262.255
+48 2.85 1.00707 279.543
+49 2.91 1.00343 297.501
+50 2.97 1.00596 316.255
+104450 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0.0148024 0.000713267
+4 0.21 0.0456075 0.00499287
+5 0.27 0.106044 0.021398
+6 0.33 0.247249 0.0784593
+7 0.39 0.310035 0.178317
+8 0.45 0.409388 0.35378
+9 0.51 0.606558 0.687589
+10 0.57 0.755525 1.20685
+11 0.63 0.899818 1.9622
+12 0.69 0.998884 2.9679
+13 0.75 1.07161 4.24251
+14 0.81 1.15121 5.83951
+15 0.87 1.1651 7.70399
+16 0.93 1.1402 9.78887
+17 0.99 1.08436 12.0357
+18 1.05 1.01634 14.4044
+19 1.11 0.938491 16.8488
+20 1.17 0.957617 19.6198
+21 1.23 0.940535 22.6277
+22 1.29 0.970877 26.0428
+23 1.35 0.982973 29.8295
+24 1.41 0.98869 33.9843
+25 1.47 1.00115 38.5571
+26 1.53 1.00692 43.5392
+27 1.59 1.0206 48.9929
+28 1.65 1.00797 54.7932
+29 1.71 1.0135 61.0571
+30 1.77 1.02018 67.8124
+31 1.83 0.997008 74.8695
+32 1.89 0.996501 82.393
+33 1.95 0.990796 90.3559
+34 2.01 0.99451 98.8481
+35 2.07 0.989835 107.812
+36 2.13 0.998829 117.39
+37 2.19 1.00987 127.627
+38 2.25 0.985861 138.175
+39 2.31 0.998813 149.44
+40 2.37 1.00728 161.398
+41 2.43 1.00668 173.961
+42 2.49 1.01079 187.207
+43 2.55 0.985114 200.745
+44 2.61 1.01025 215.29
+45 2.67 0.999581 230.351
+46 2.73 0.990271 245.949
+47 2.79 0.997346 262.357
+48 2.85 1.00557 279.62
+49 2.91 0.991236 297.36
+50 2.97 1.00558 316.107
+104500 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0.0148024 0.000713267
+4 0.21 0.030405 0.00356633
+5 0.27 0.0922118 0.0178317
+6 0.33 0.191618 0.0620542
+7 0.39 0.305606 0.160485
+8 0.45 0.42603 0.343081
+9 0.51 0.613039 0.680456
+10 0.57 0.74826 1.19472
+11 0.63 0.876876 1.93081
+12 0.69 1.0088 2.9465
+13 0.75 1.11659 4.27461
+14 0.81 1.19851 5.93723
+15 0.87 1.14905 7.77603
+16 0.93 1.12732 9.83738
+17 0.99 1.03514 11.9822
+18 1.05 1.01573 14.3495
+19 1.11 0.941777 16.8024
+20 1.17 0.937158 19.5143
+21 1.23 0.964846 22.5999
+22 1.29 0.973513 26.0243
+23 1.35 0.978344 29.7932
+24 1.41 1.00363 34.0107
+25 1.47 1.02364 38.6862
+26 1.53 0.989623 43.5827
+27 1.59 1.01006 48.98
+28 1.65 1.01033 54.7939
+29 1.71 0.993536 60.9344
+30 1.77 1.02869 67.7461
+31 1.83 0.993279 74.7767
+32 1.89 0.991778 82.2646
+33 1.95 0.998162 90.2867
+34 2.01 1.00144 98.8381
+35 2.07 0.997475 107.872
+36 2.13 0.993176 117.395
+37 2.19 1.01641 127.698
+38 2.25 0.99786 138.375
+39 2.31 0.995081 149.598
+40 2.37 1.00332 161.509
+41 2.43 0.99462 173.922
+42 2.49 1.0005 187.032
+43 2.55 0.989733 200.634
+44 2.61 1.00713 215.134
+45 2.67 1.00678 230.303
+46 2.73 1.00345 246.109
+47 2.79 1.0022 262.597
+48 2.85 1.0047 279.845
+49 2.91 1.0008 297.756
+50 2.97 1.00363 316.466
+104550 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0.0148024 0.000713267
+4 0.21 0.0760125 0.00784593
+5 0.27 0.133707 0.0285307
+6 0.33 0.213253 0.0777461
+7 0.39 0.283461 0.169044
+8 0.45 0.427694 0.352354
+9 0.51 0.587117 0.675464
+10 0.57 0.698445 1.15549
+11 0.63 0.943152 1.94722
+12 0.69 1.03572 2.99001
+13 0.75 1.11959 4.32168
+14 0.81 1.15635 5.92582
+15 0.87 1.15396 7.77247
+16 0.93 1.13942 9.85592
+17 0.99 1.03548 12.0014
+18 1.05 0.98329 14.2932
+19 1.11 0.971901 16.8245
+20 1.17 0.965998 19.6198
+21 1.23 0.94165 22.6312
+22 1.29 0.937014 25.9272
+23 1.35 0.99223 29.7496
+24 1.41 1.01347 34.0086
+25 1.47 1.00708 38.6084
+26 1.53 1.03172 43.7133
+27 1.59 1.01767 49.1512
+28 1.65 0.997686 54.8923
+29 1.71 1.01639 61.174
+30 1.77 0.994002 67.7561
+31 1.83 0.988039 74.7496
+32 1.89 0.992061 82.2397
+33 1.95 0.994523 90.2325
+34 2.01 1.00044 98.7753
+35 2.07 0.999444 107.827
+36 2.13 0.998532 117.402
+37 2.19 1.00389 127.578
+38 2.25 1.00913 138.375
+39 2.31 1.00653 149.727
+40 2.37 1.00891 161.704
+41 2.43 0.988505 174.041
+42 2.49 0.999085 187.133
+43 2.55 0.993574 200.787
+44 2.61 1.00534 215.262
+45 2.67 1.00034 230.334
+46 2.73 0.992263 245.964
+47 2.79 1.00901 262.563
+48 2.85 0.992526 279.602
+49 2.91 1.01076 297.692
+50 2.97 0.992721 316.199
+104600 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0.0296049 0.00142653
+4 0.21 0.0988162 0.010699
+5 0.27 0.0922118 0.0249643
+6 0.33 0.20089 0.0713267
+7 0.39 0.323322 0.175464
+8 0.45 0.480947 0.381598
+9 0.51 0.567676 0.694009
+10 0.57 0.731655 1.19686
+11 0.63 0.902367 1.95435
+12 0.69 1.02864 2.99001
+13 0.75 1.1046 4.30385
+14 0.81 1.15995 5.91298
+15 0.87 1.13746 7.73324
+16 0.93 1.11055 9.76391
+17 0.99 1.07163 11.9843
+18 1.05 1.01971 14.3609
+19 1.11 0.94835 16.831
+20 1.17 0.941349 19.5549
+21 1.23 0.952133 22.5999
+22 1.29 0.972094 26.0193
+23 1.35 0.990194 29.8338
+24 1.41 1.00023 34.0371
+25 1.47 0.98928 38.5556
+26 1.53 0.996831 43.4879
+27 1.59 1.01686 48.9215
+28 1.65 1.01702 54.7739
+29 1.71 1.00635 60.9936
+30 1.77 1.01048 67.6847
+31 1.83 1.01515 74.8702
+32 1.89 0.990077 82.3452
+33 1.95 1.00659 90.4351
+34 2.01 0.992589 98.9108
+35 2.07 1.00346 107.999
+36 2.13 0.982539 117.42
+37 2.19 0.997344 127.53
+38 2.25 1.00626 138.297
+39 2.31 0.999129 149.565
+40 2.37 1.00716 161.521
+41 2.43 0.998678 173.985
+42 2.49 0.994894 187.022
+43 2.55 1.00172 200.789
+44 2.61 1.00896 215.315
+45 2.67 1.00233 230.417
+46 2.73 0.999146 246.155
+47 2.79 0.998864 262.588
+48 2.85 1.00349 279.815
+49 2.91 0.995341 297.629
+50 2.97 1.00083 316.287
+104650 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0.0456075 0.0042796
+5 0.27 0.0737695 0.0156919
+6 0.33 0.207071 0.0634807
+7 0.39 0.28789 0.156205
+8 0.45 0.42603 0.338802
+9 0.51 0.591006 0.664051
+10 0.57 0.832322 1.23609
+11 0.63 0.915112 2.00428
+12 0.69 0.993217 3.00428
+13 0.75 1.1052 4.31883
+14 0.81 1.11676 5.86805
+15 0.87 1.13836 7.68973
+16 0.93 1.15385 9.79957
+17 0.99 1.07163 12.02
+18 1.05 0.975945 14.2946
+19 1.11 0.943968 16.7532
+20 1.17 0.982759 19.597
+21 1.23 0.941427 22.6077
+22 1.29 0.979799 26.0542
+23 1.35 0.966494 29.7775
+24 1.41 0.98869 33.9322
+25 1.47 1.01239 38.5563
+26 1.53 1.03215 43.6633
+27 1.59 1.023 49.1298
+28 1.65 1.00822 54.9315
+29 1.71 1.00196 61.1241
+30 1.77 1.01673 67.8566
+31 1.83 0.98945 74.8602
+32 1.89 1.005 82.4479
+33 1.95 0.994523 90.4408
+34 2.01 0.993007 98.9201
+35 2.07 0.994088 107.923
+36 2.13 1.0024 117.535
+37 2.19 0.988126 127.551
+38 2.25 0.998127 138.231
+39 2.31 1.00754 149.594
+40 2.37 1.00752 161.555
+41 2.43 1.00576 174.107
+42 2.49 1.00823 187.319
+43 2.55 1.00151 201.083
+44 2.61 0.997515 215.444
+45 2.67 0.997214 230.469
+46 2.73 0.995523 246.15
+47 2.79 1.00541 262.691
+48 2.85 1.00437 279.933
+49 2.91 0.993946 297.722
+50 2.97 0.998422 316.335
+104700 50
+1 0.03 0 0
+2 0.09 0.040178 0.000713267
+3 0.15 0.0444073 0.00285307
+4 0.21 0.0456075 0.00713267
+5 0.27 0.101433 0.0228245
+6 0.33 0.188528 0.0663338
+7 0.39 0.301177 0.163338
+8 0.45 0.442671 0.353067
+9 0.51 0.591006 0.678317
+10 0.57 0.77213 1.20899
+11 0.63 0.949099 2.00571
+12 0.69 0.985424 2.99786
+13 0.75 1.08241 4.28531
+14 0.81 1.1111 5.82668
+15 0.87 1.18516 7.72325
+16 0.93 1.1402 9.80813
+17 0.99 1.06405 12.0128
+18 1.05 0.988493 14.3167
+19 1.11 0.953005 16.7989
+20 1.17 0.947265 19.5399
+21 1.23 0.951464 22.5827
+22 1.29 0.965808 25.98
+23 1.35 0.984824 29.7739
+24 1.41 1.00006 33.9765
+25 1.47 1.00084 38.5478
+26 1.53 1.02782 43.6334
+27 1.59 1.02461 49.1084
+28 1.65 1.01492 54.9486
+29 1.71 0.983611 61.0278
+30 1.77 1.01619 67.7568
+31 1.83 0.986326 74.7382
+32 1.89 1.00614 82.3345
+33 1.95 0.996387 90.3424
+34 2.01 0.994594 98.8352
+35 2.07 0.991883 107.818
+36 2.13 1.00128 117.419
+37 2.19 1.00114 127.568
+38 2.25 1.00586 138.33
+39 2.31 1.0016 149.626
+40 2.37 1.00476 161.554
+41 2.43 1.00188 174.058
+42 2.49 1.00556 187.235
+43 2.55 0.998193 200.953
+44 2.61 1.00371 215.404
+45 2.67 0.990208 230.323
+46 2.73 0.989365 245.907
+47 2.79 1.01057 262.533
+48 2.85 1.00582 279.8
+49 2.91 0.99845 297.669
+50 2.97 1.00428 316.392
+104750 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0.0148024 0.000713267
+4 0.21 0.0152025 0.0021398
+5 0.27 0.0737695 0.0135521
+6 0.33 0.191618 0.0577746
+7 0.39 0.31225 0.158345
+8 0.45 0.455985 0.35378
+9 0.51 0.648033 0.710414
+10 0.57 0.722315 1.20685
+11 0.63 0.890471 1.95435
+12 0.69 1.04918 3.0107
+13 0.75 1.11359 4.33524
+14 0.81 1.12961 5.90228
+15 0.87 1.13167 7.71327
+16 0.93 1.148 9.81241
+17 0.99 1.06096 12.0107
+18 1.05 1.00808 14.3602
+19 1.11 0.97108 16.8894
+20 1.17 0.946772 19.6291
+21 1.23 0.942766 22.6441
+22 1.29 0.95425 26.0007
+23 1.35 0.963347 29.7118
+24 1.41 1.02077 34.0014
+25 1.47 1.02286 38.6733
+26 1.53 1.02436 43.7418
+27 1.59 1.01072 49.1427
+28 1.65 0.995331 54.8702
+29 1.71 1.00427 61.077
+30 1.77 1.00294 67.7183
+31 1.83 1.00184 74.8096
+32 1.89 1.00803 82.4201
+33 1.95 1.00446 90.4929
+34 2.01 0.996014 98.9979
+35 2.07 0.970854 107.79
+36 2.13 0.997341 117.354
+37 2.19 1.00424 127.534
+38 2.25 1.00553 138.292
+39 2.31 0.997611 149.544
+40 2.37 1.01065 161.541
+41 2.43 1.00988 174.145
+42 2.49 1.00061 187.257
+43 2.55 1.01003 201.138
+44 2.61 1.0047 215.603
+45 2.67 0.988078 230.49
+46 2.73 1.00005 246.243
+47 2.79 0.99106 262.547
+48 2.85 0.999174 279.7
+49 2.91 0.999087 297.581
+50 2.97 0.997695 316.18
+104800 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0.0444073 0.0021398
+4 0.21 0.030405 0.00499287
+5 0.27 0.0922118 0.0192582
+6 0.33 0.169984 0.0584879
+7 0.39 0.301177 0.155492
+8 0.45 0.474291 0.358773
+9 0.51 0.628592 0.704708
+10 0.57 0.809491 1.26106
+11 0.63 0.905765 2.0214
+12 0.69 0.979048 3.00713
+13 0.75 1.07881 4.2903
+14 0.81 1.17074 5.91441
+15 0.87 1.12588 7.71612
+16 0.93 1.1363 9.79387
+17 0.99 1.0582 11.9864
+18 1.05 1.01634 14.3552
+19 1.11 0.967246 16.8745
+20 1.17 0.950715 19.6255
+21 1.23 0.94455 22.6462
+22 1.29 0.970066 26.0585
+23 1.35 0.965198 29.7767
+24 1.41 0.999213 33.9757
+25 1.47 1.01708 38.6213
+26 1.53 1.0075 43.6063
+27 1.59 1.0234 49.0749
+28 1.65 0.986407 54.7511
+29 1.71 1.0135 61.015
+30 1.77 1.0233 67.791
+31 1.83 1.02593 75.0528
+32 1.89 0.984031 82.4822
+33 1.95 0.97136 90.2889
+34 2.01 0.999522 98.8238
+35 2.07 0.998656 107.868
+36 2.13 1.00686 117.523
+37 2.19 0.993403 127.593
+38 2.25 1.00599 138.357
+39 2.31 0.992488 149.55
+40 2.37 1.01107 161.553
+41 2.43 0.996106 173.984
+42 2.49 1.01177 187.243
+43 2.55 0.997518 200.951
+44 2.61 0.998406 215.326
+45 2.67 1.00725 230.502
+46 2.73 0.997199 246.21
+47 2.79 0.995655 262.59
+48 2.85 0.997927 279.721
+49 2.91 0.99837 297.589
+50 2.97 0.997351 316.183
+104850 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0.0592097 0.00285307
+4 0.21 0.0380062 0.0064194
+5 0.27 0.0876012 0.0199715
+6 0.33 0.163803 0.0577746
+7 0.39 0.316679 0.159772
+8 0.45 0.417709 0.338802
+9 0.51 0.574157 0.654779
+10 0.57 0.792886 1.19971
+11 0.63 0.923609 1.97504
+12 0.69 1.03714 3.01926
+13 0.75 1.06921 4.29101
+14 0.81 1.15635 5.89515
+15 0.87 1.14994 7.73538
+16 0.93 1.15775 9.85235
+17 0.99 1.03238 11.9914
+18 1.05 1.00257 14.3281
+19 1.11 0.942325 16.7825
+20 1.17 0.942088 19.5086
+21 1.23 0.958601 22.5742
+22 1.29 0.963983 25.965
+23 1.35 0.997415 29.8074
+24 1.41 1.01194 34.0599
+25 1.47 1.00021 38.6284
+26 1.53 1.00836 43.6177
+27 1.59 1.01753 49.0549
+28 1.65 1.01529 54.8973
+29 1.71 1.01339 61.1605
+30 1.77 0.992279 67.7311
+31 1.83 0.993985 74.7668
+32 1.89 1.00321 82.3409
+33 1.95 0.993636 90.3267
+34 2.01 0.991503 98.7932
+35 2.07 0.989914 107.758
+36 2.13 1.00887 117.432
+37 2.19 1.00445 127.614
+38 2.25 1.00359 138.352
+39 2.31 0.994892 149.573
+40 2.37 0.998331 161.424
+41 2.43 1.00902 174.017
+42 2.49 1.0005 187.128
+43 2.55 1.00115 200.887
+44 2.61 1.00455 215.35
+45 2.67 0.994563 230.335
+46 2.73 0.997289 246.044
+47 2.79 1.0048 262.574
+48 2.85 1.00038 279.748
+49 2.91 1.00762 297.781
+50 2.97 0.996777 316.364
+104900 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0.0148024 0.000713267
+4 0.21 0.0380062 0.0042796
+5 0.27 0.0876012 0.0178317
+6 0.33 0.154531 0.053495
+7 0.39 0.305606 0.151926
+8 0.45 0.489268 0.361626
+9 0.51 0.598782 0.691155
+10 0.57 0.752411 1.20827
+11 0.63 0.876876 1.94437
+12 0.69 1.02439 2.97575
+13 0.75 1.11299 4.29957
+14 0.81 1.16098 5.91013
+15 0.87 1.15262 7.75464
+16 0.93 1.12732 9.81598
+17 0.99 1.08505 12.0642
+18 1.05 0.985433 14.3609
+19 1.11 0.945885 16.8245
+20 1.17 0.946525 19.5635
+21 1.23 0.963508 22.6448
+22 1.29 0.947355 25.9772
+23 1.35 0.976122 29.7375
+24 1.41 1.01483 34.0021
+25 1.47 0.995995 38.5514
+26 1.53 1.03546 43.6748
+27 1.59 1.0154 49.1006
+28 1.65 0.996199 54.8331
+29 1.71 1.02146 61.1462
+30 1.77 1.01027 67.8359
+31 1.83 0.992675 74.8623
+32 1.89 0.989888 82.3359
+33 1.95 1.00934 90.4479
+34 2.01 0.992004 98.9187
+35 2.07 0.996687 107.945
+36 2.13 0.989605 117.434
+37 2.19 1.00642 127.636
+38 2.25 1.00326 138.371
+39 2.31 0.987808 149.511
+40 2.37 0.994305 161.315
+41 2.43 1.01417 173.972
+42 2.49 1.00257 187.11
+43 2.55 1.00048 200.859
+44 2.61 1.01277 215.441
+45 2.67 1.00621 230.601
+46 2.73 0.987463 246.155
+47 2.79 0.998343 262.58
+48 2.85 1.00345 279.806
+49 2.91 0.997493 297.658
+50 2.97 0.993907 316.188
+104950 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0.0296049 0.00142653
+4 0.21 0.030405 0.0042796
+5 0.27 0.0645483 0.0142653
+6 0.33 0.194709 0.0592011
+7 0.39 0.290104 0.152639
+8 0.45 0.517559 0.374465
+9 0.51 0.625999 0.718973
+10 0.57 0.80015 1.2689
+11 0.63 0.89217 2.01783
+12 0.69 0.991091 3.01569
+13 0.75 1.10579 4.33096
+14 0.81 1.12087 5.88588
+15 0.87 1.13301 7.699
+16 0.93 1.14566 9.79387
+17 0.99 1.06612 12.0029
+18 1.05 1.02736 14.3973
+19 1.11 0.933288 16.8281
+20 1.17 0.933708 19.53
+21 1.23 0.934736 22.5193
+22 1.29 0.973919 25.9451
+23 1.35 0.996859 29.7853
+24 1.41 1.02026 34.0728
+25 1.47 0.997713 38.6298
+26 1.53 1.0111 43.6327
+27 1.59 1.02194 49.0934
+28 1.65 1.00872 54.898
+29 1.71 1.00577 61.1141
+30 1.77 1.00564 67.7732
+31 1.83 0.985621 74.7496
+32 1.89 0.992817 82.2454
+33 1.95 0.991772 90.2161
+34 2.01 1.0042 98.791
+35 2.07 0.987315 107.733
+36 2.13 0.991242 117.238
+37 2.19 1.01303 127.506
+38 2.25 1.01233 138.338
+39 2.31 0.999508 149.611
+40 2.37 1.00254 161.512
+41 2.43 0.998849 173.978
+42 2.49 1.00186 187.106
+43 2.55 1.01304 201.029
+44 2.61 0.998902 215.41
+45 2.67 0.995131 230.404
+46 2.73 0.988369 245.972
+47 2.79 0.988675 262.238
+48 2.85 0.997138 279.355
+49 2.91 1.00291 297.305
+50 2.97 1.00412 316.024
+105000 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0.0148024 0.000713267
+4 0.21 0.0456075 0.00499287
+5 0.27 0.0737695 0.0164051
+6 0.33 0.176165 0.0570613
+7 0.39 0.314464 0.158345
+8 0.45 0.424365 0.340228
+9 0.51 0.585821 0.662625
+10 0.57 0.776281 1.19615
+11 0.63 0.870079 1.92653
+12 0.69 1.04493 2.9786
+13 0.75 1.12978 4.3224
+14 0.81 1.16252 5.93509
+15 0.87 1.1544 7.78245
+16 0.93 1.12889 9.84665
+17 0.99 1.07128 12.0663
+18 1.05 0.964622 14.3146
+19 1.11 0.929728 16.7361
+20 1.17 0.969942 19.5428
+21 1.23 0.955702 22.5991
+22 1.29 0.956075 25.9622
+23 1.35 0.976863 29.7254
+24 1.41 1.00668 33.9558
+25 1.47 1.01692 38.6006
+26 1.53 1.01283 43.612
+27 1.59 1.01793 49.0514
+28 1.65 1.0055 54.8374
+29 1.71 1.02447 61.169
+30 1.77 0.999495 67.7874
+31 1.83 0.998923 74.8581
+32 1.89 0.990077 82.3331
+33 1.95 0.986447 90.2611
+34 2.01 1.00512 98.8438
+35 2.07 0.995506 107.859
+36 2.13 1.00448 117.491
+37 2.19 1.00332 127.662
+38 2.25 1.00046 138.367
+39 2.31 0.997548 149.617
+40 2.37 0.996288 161.444
+41 2.43 1.00759 174.019
+42 2.49 1.01133 187.272
+43 2.55 1.00722 201.114
+44 2.61 0.996871 215.466
+45 2.67 0.998966 230.518
+46 2.73 0.99344 246.166
+47 2.79 0.994268 262.524
+48 2.85 0.997221 279.643
+49 2.91 0.990877 297.377
+50 2.97 1.01135 316.231
+105050 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0.0148024 0.000713267
+4 0.21 0.030405 0.00356633
+5 0.27 0.106044 0.0199715
+6 0.33 0.179256 0.0613409
+7 0.39 0.314464 0.162625
+8 0.45 0.42603 0.345221
+9 0.51 0.609151 0.680456
+10 0.57 0.776281 1.21398
+11 0.63 0.887072 1.95863
+12 0.69 1.04422 3.00999
+13 0.75 1.12319 4.34593
+14 0.81 1.14915 5.94009
+15 0.87 1.16733 7.80813
+16 0.93 1.07193 9.76819
+17 0.99 1.06956 11.9843
+18 1.05 0.974721 14.2561
+19 1.11 0.957113 16.7489
+20 1.17 0.953673 19.5086
+21 1.23 0.951687 22.5521
+22 1.29 0.980002 25.9993
+23 1.35 0.982602 29.7846
+24 1.41 0.998364 33.98
+25 1.47 1.01036 38.5949
+26 1.53 1.00966 43.5906
+27 1.59 1.02033 49.0428
+28 1.65 1.01144 54.8631
+29 1.71 1.00011 61.0442
+30 1.77 1.00057 67.6698
+31 1.83 1.00658 74.7946
+32 1.89 0.983936 82.2233
+33 1.95 0.997008 90.2361
+34 2.01 1.00169 98.7896
+35 2.07 0.997317 107.822
+36 2.13 0.997713 117.389
+37 2.19 0.999595 127.521
+38 2.25 0.992194 138.138
+39 2.31 1.01279 149.56
+40 2.37 0.991601 161.332
+41 2.43 1.00742 173.904
+42 2.49 1.00017 187.011
+43 2.55 0.998504 200.733
+44 2.61 0.997118 215.089
+45 2.67 0.998208 230.129
+46 2.73 0.997199 245.837
+47 2.79 1.0107 262.464
+48 2.85 1.00229 279.67
+49 2.91 0.99837 297.539
+50 2.97 0.999799 316.178
+105100 50
+1 0.03 0 0
+2 0.09 0.040178 0.000713267
+3 0.15 0 0.000713267
+4 0.21 0.06081 0.0064194
+5 0.27 0.101433 0.0221113
+6 0.33 0.185437 0.0649073
+7 0.39 0.26353 0.149786
+8 0.45 0.421037 0.330243
+9 0.51 0.637664 0.68117
+10 0.57 0.792886 1.22611
+11 0.63 0.89217 1.97504
+12 0.69 1.05414 3.03638
+13 0.75 1.0992 4.34379
+14 0.81 1.12241 5.90086
+15 0.87 1.15084 7.74251
+16 0.93 1.13825 9.82382
+17 0.99 1.06681 12.0342
+18 1.05 0.993083 14.3488
+19 1.11 0.965876 16.8645
+20 1.17 0.919165 19.5243
+21 1.23 0.956371 22.5827
+22 1.29 0.959724 25.9586
+23 1.35 0.99834 29.8046
+24 1.41 1.00481 34.0271
+25 1.47 1.00708 38.627
+26 1.53 1.02062 43.6769
+27 1.59 1.01993 49.127
+28 1.65 1.00488 54.9094
+29 1.71 1.006 61.127
+30 1.77 1.00876 67.8067
+31 1.83 0.992574 74.8324
+32 1.89 1.00047 82.3859
+33 1.95 1.01245 90.5228
+34 2.01 0.986074 98.9429
+35 2.07 0.986606 107.878
+36 2.13 0.983729 117.311
+37 2.19 1.00551 127.504
+38 2.25 1.00793 138.288
+39 2.31 1.00469 149.619
+40 2.37 1.01029 161.613
+41 2.43 1.00668 174.176
+42 2.49 0.992172 187.178
+43 2.55 0.996895 200.878
+44 2.61 1.00039 215.281
+45 2.67 1.00029 230.352
+46 2.73 0.998512 246.081
+47 2.79 0.994962 262.449
+48 2.85 1.00374 279.68
+49 2.91 0.99554 297.498
+50 2.97 0.99693 316.083
+105150 50
+1 0.03 0 0
+2 0.09 0.040178 0.000713267
+3 0.15 0.0296049 0.0021398
+4 0.21 0.0380062 0.00570613
+5 0.27 0.106044 0.0221113
+6 0.33 0.14835 0.0563481
+7 0.39 0.318893 0.159058
+8 0.45 0.436015 0.345934
+9 0.51 0.565084 0.656919
+10 0.57 0.80015 1.20685
+11 0.63 0.911713 1.97218
+12 0.69 1.02368 3.00285
+13 0.75 1.0926 4.30243
+14 0.81 1.14195 5.88659
+15 0.87 1.15663 7.73752
+16 0.93 1.148 9.83666
+17 0.99 1.05201 12.0164
+18 1.05 0.978088 14.296
+19 1.11 0.984772 16.8609
+20 1.17 0.922122 19.5292
+21 1.23 0.949903 22.567
+22 1.29 0.985679 26.0342
+23 1.35 0.948349 29.6876
+24 1.41 1.00838 33.9251
+25 1.47 1.03176 38.6377
+26 1.53 1.0062 43.6163
+27 1.59 1.01273 49.0278
+28 1.65 1.00859 54.8317
+29 1.71 0.993421 60.9715
+30 1.77 1.02039 67.7282
+31 1.83 1.00537 74.8445
+32 1.89 0.989699 82.3167
+33 1.95 0.996919 90.3288
+34 2.01 1.00829 98.9387
+35 2.07 0.985267 107.862
+36 2.13 1.00389 117.488
+37 2.19 0.995725 127.581
+38 2.25 1.00019 138.283
+39 2.31 0.999825 149.559
+40 2.37 0.999052 161.419
+41 2.43 1.00011 173.901
+42 2.49 1.00475 187.067
+43 2.55 1.00795 200.919
+44 2.61 1.00272 215.356
+45 2.67 0.998918 230.407
+46 2.73 1.00236 246.195
+47 2.79 0.999774 262.643
+48 2.85 0.993565 279.7
+49 2.91 1.00622 297.708
+50 2.97 0.993869 316.237
+105200 50
+1 0.03 0 0
+2 0.09 0.040178 0.000713267
+3 0.15 0 0.000713267
+4 0.21 0.06081 0.0064194
+5 0.27 0.0691589 0.0171184
+6 0.33 0.142168 0.0499287
+7 0.39 0.363184 0.166904
+8 0.45 0.46597 0.366619
+9 0.51 0.628592 0.712553
+10 0.57 0.69637 1.19116
+11 0.63 0.928707 1.97076
+12 0.69 1.01234 2.99001
+13 0.75 1.11179 4.31241
+14 0.81 1.15429 5.91369
+15 0.87 1.12409 7.71255
+16 0.93 1.13474 9.78745
+17 0.99 1.07197 12.0086
+18 1.05 0.995838 14.3295
+19 1.11 0.952184 16.8096
+20 1.17 0.963286 19.597
+21 1.23 0.970422 22.7004
+22 1.29 0.979393 26.1455
+23 1.35 0.964272 29.8602
+24 1.41 0.99497 34.0414
+25 1.47 0.991623 38.5706
+26 1.53 1.01471 43.5913
+27 1.59 1.0202 49.0428
+28 1.65 1.00859 54.8466
+29 1.71 1.00981 61.0877
+30 1.77 1.00887 67.7682
+31 1.83 0.981893 74.7183
+32 1.89 1.0051 82.3067
+33 1.95 0.998606 90.3324
+34 2.01 0.999439 98.8666
+35 2.07 0.995112 107.879
+36 2.13 0.993548 117.406
+37 2.19 1.00741 127.618
+38 2.25 1.00099 138.328
+39 2.31 0.999129 149.596
+40 2.37 1.0047 161.524
+41 2.43 0.999821 174.001
+42 2.49 1.00529 187.175
+43 2.55 1.00375 200.969
+44 2.61 0.997019 215.324
+45 2.67 0.987983 230.21
+46 2.73 0.99738 245.92
+47 2.79 1.00281 262.418
+48 2.85 1.00304 279.637
+49 2.91 0.998689 297.511
+50 2.97 1.0107 316.353
+105250 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0.0148024 0.000713267
+4 0.21 0.0456075 0.00499287
+5 0.27 0.110654 0.0221113
+6 0.33 0.135987 0.053495
+7 0.39 0.341039 0.163338
+8 0.45 0.441007 0.352354
+9 0.51 0.588414 0.676177
+10 0.57 0.784583 1.21541
+11 0.63 0.944001 2.00785
+12 0.69 0.971964 2.98645
+13 0.75 1.08541 4.27746
+14 0.81 1.15995 5.88659
+15 0.87 1.14058 7.71184
+16 0.93 1.12147 9.76248
+17 0.99 1.10192 12.0456
+18 1.05 0.988493 14.3495
+19 1.11 0.955744 16.8388
+20 1.17 0.947757 19.5813
+21 1.23 0.964177 22.6648
+22 1.29 0.955669 26.0264
+23 1.35 0.982232 29.8103
+24 1.41 0.985804 33.9529
+25 1.47 1.02223 38.622
+26 1.53 1.00995 43.6191
+27 1.59 1.00552 48.9922
+28 1.65 1.00078 54.7511
+29 1.71 1.02193 61.067
+30 1.77 1.00962 67.7525
+31 1.83 0.995799 74.801
+32 1.89 0.985826 82.2439
+33 1.95 0.997807 90.2632
+34 2.01 0.99142 98.729
+35 2.07 0.997947 107.767
+36 2.13 0.999052 117.347
+37 2.19 1.01247 127.61
+38 2.25 0.999794 138.307
+39 2.31 1.01424 149.746
+40 2.37 0.994545 161.553
+41 2.43 0.991648 173.929
+42 2.49 1.00567 187.107
+43 2.55 0.990356 200.718
+44 2.61 0.999893 215.113
+45 2.67 1.0054 230.262
+46 2.73 1.00734 246.129
+47 2.79 0.996046 262.516
+48 2.85 1.00919 279.84
+49 2.91 0.99845 297.71
+50 2.97 0.992568 316.214
+105300 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0.0296049 0.00142653
+4 0.21 0.0456075 0.00570613
+5 0.27 0.0876012 0.0192582
+6 0.33 0.185437 0.0620542
+7 0.39 0.298962 0.158345
+8 0.45 0.431022 0.343081
+9 0.51 0.629888 0.689729
+10 0.57 0.753449 1.20756
+11 0.63 0.901517 1.96434
+12 0.69 1.0088 2.98003
+13 0.75 1.0974 4.28531
+14 0.81 1.13938 5.86591
+15 0.87 1.18516 7.76248
+16 0.93 1.11796 9.8067
+17 0.99 1.05097 11.9843
+18 1.05 0.989411 14.2903
+19 1.11 0.983677 16.8524
+20 1.17 0.941595 19.577
+21 1.23 0.963508 22.6583
+22 1.29 0.964388 26.0506
+23 1.35 0.98001 29.826
+24 1.41 0.974602 33.9215
+25 1.47 1.0113 38.5407
+26 1.53 1.02854 43.6298
+27 1.59 1.00485 48.9993
+28 1.65 1.0076 54.7974
+29 1.71 1.00819 61.0285
+30 1.77 1.01447 67.7461
+31 1.83 1.00275 74.8438
+32 1.89 1.0017 82.4066
+33 1.95 0.983075 90.3074
+34 2.01 0.99994 98.8459
+35 2.07 1.01527 108.041
+36 2.13 0.982985 117.466
+37 2.19 0.991785 127.52
+38 2.25 1.00313 138.253
+39 2.31 1.00444 149.581
+40 2.37 1.00806 161.549
+41 2.43 1.00371 174.075
+42 2.49 0.997888 187.151
+43 2.55 0.996428 200.845
+44 2.61 1.0044 215.306
+45 2.67 1.00185 230.401
+46 2.73 0.992716 246.038
+47 2.79 1.00524 262.576
+48 2.85 0.993689 279.634
+49 2.91 1.00088 297.547
+50 2.97 0.993295 316.065
+105350 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0.030405 0.00285307
+5 0.27 0.0737695 0.0142653
+6 0.33 0.197799 0.0599144
+7 0.39 0.276817 0.149073
+8 0.45 0.452656 0.343081
+9 0.51 0.603966 0.675464
+10 0.57 0.782508 1.21327
+11 0.63 0.909164 1.97646
+12 0.69 1.00809 2.99144
+13 0.75 1.11659 4.31954
+14 0.81 1.13732 5.89729
+15 0.87 1.16198 7.75678
+16 0.93 1.12069 9.80599
+17 0.99 1.06991 12.0228
+18 1.05 0.995226 14.3424
+19 1.11 0.927537 16.7582
+20 1.17 0.964272 19.5485
+21 1.23 0.955702 22.6049
+22 1.29 0.958913 25.9779
+23 1.35 0.992971 29.8031
+24 1.41 0.998873 34.0007
+25 1.47 1.00287 38.5813
+26 1.53 1.00577 43.5578
+27 1.59 1.02047 49.0107
+28 1.65 1.01058 54.826
+29 1.71 1.02043 61.1327
+30 1.77 0.999819 67.7532
+31 1.83 1.00205 74.8459
+32 1.89 1.00595 82.4408
+33 1.95 0.987512 90.3773
+34 2.01 0.993591 98.8616
+35 2.07 0.992119 107.847
+36 2.13 0.998829 117.424
+37 2.19 1.00551 127.617
+38 2.25 1.00206 138.339
+39 2.31 0.995714 149.568
+40 2.37 0.992202 161.347
+41 2.43 1.01142 173.97
+42 2.49 0.99865 187.056
+43 2.55 1.00535 200.873
+44 2.61 1.00257 215.307
+45 2.67 0.999297 230.364
+46 2.73 0.992716 246.001
+47 2.79 0.996089 262.388
+48 2.85 1.00113 279.574
+49 2.91 1.00885 297.63
+50 2.97 0.996853 316.214
+105400 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0.0444073 0.0021398
+4 0.21 0.06081 0.00784593
+5 0.27 0.0922118 0.0221113
+6 0.33 0.20089 0.0684736
+7 0.39 0.305606 0.166904
+8 0.45 0.460977 0.364479
+9 0.51 0.603966 0.696862
+10 0.57 0.799113 1.24608
+11 0.63 0.904916 2.00571
+12 0.69 1.01943 3.0321
+13 0.75 1.08421 4.32168
+14 0.81 1.10236 5.85093
+15 0.87 1.15975 7.70685
+16 0.93 1.11055 9.73752
+17 0.99 1.09504 12.0064
+18 1.05 1.02858 14.4037
+19 1.11 0.94835 16.8738
+20 1.17 0.934693 19.5785
+21 1.23 0.967745 22.6733
+22 1.29 0.977366 26.1113
+23 1.35 0.972604 29.8581
+24 1.41 0.991745 34.0257
+25 1.47 0.993341 38.5628
+26 1.53 1.03446 43.6812
+27 1.59 1.01566 49.1084
+28 1.65 1.00599 54.8973
+29 1.71 0.988689 61.0078
+30 1.77 1.0009 67.6355
+31 1.83 1.00305 74.7354
+32 1.89 1.00434 82.3181
+33 1.95 1.01139 90.4465
+34 2.01 0.983317 98.8431
+35 2.07 1.00771 107.969
+36 2.13 1.00404 117.597
+37 2.19 0.993825 127.671
+38 2.25 1.00246 138.397
+39 2.31 0.997232 149.644
+40 2.37 0.99809 161.493
+41 2.43 1.00919 174.088
+42 2.49 1.00083 187.203
+43 2.55 0.988695 200.79
+44 2.61 0.991025 215.058
+45 2.67 1.01402 230.337
+46 2.73 1.00281 246.133
+47 2.79 0.996262 262.523
+48 2.85 0.99639 279.628
+49 2.91 1.00825 297.673
+50 2.97 1.00171 316.347
+105450 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0.0148024 0.000713267
+4 0.21 0.0836137 0.0085592
+5 0.27 0.0368847 0.0142653
+6 0.33 0.185437 0.0570613
+7 0.39 0.345468 0.168331
+8 0.45 0.409388 0.343795
+9 0.51 0.614335 0.681883
+10 0.57 0.755525 1.20114
+11 0.63 0.890471 1.94864
+12 0.69 1.01589 2.97147
+13 0.75 1.08421 4.26106
+14 0.81 1.18154 5.90014
+15 0.87 1.15574 7.74964
+16 0.93 1.10704 9.77389
+17 0.99 1.05855 11.9672
+18 1.05 1.01971 14.3438
+19 1.11 0.971901 16.8752
+20 1.17 0.92508 19.5521
+21 1.23 0.949457 22.5884
+22 1.29 0.97108 26.0043
+23 1.35 0.971864 29.7482
+24 1.41 0.985125 33.888
+25 1.47 1.01067 38.5043
+26 1.53 1.02047 43.5535
+27 1.59 1.02474 49.0292
+28 1.65 1.00661 54.8217
+29 1.71 1.01696 61.107
+30 1.77 1.01468 67.826
+31 1.83 1.00205 74.9187
+32 1.89 0.997635 82.4508
+33 1.95 0.986536 90.3795
+34 2.01 0.985489 98.7946
+35 2.07 1.00275 107.876
+36 2.13 1.00002 117.465
+37 2.19 1.00121 127.614
+38 2.25 1.00106 138.325
+39 2.31 0.995208 149.549
+40 2.37 1.00933 161.531
+41 2.43 0.994677 173.945
+42 2.49 0.996799 187.007
+43 2.55 0.999698 200.746
+44 2.61 1.0097 215.283
+45 2.67 0.990776 230.211
+46 2.73 1.00626 246.061
+47 2.79 0.994528 262.423
+48 2.85 1.00246 279.632
+49 2.91 1.00068 297.541
+50 2.97 1.00278 316.236
+105500 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0.0148024 0.000713267
+4 0.21 0.030405 0.00356633
+5 0.27 0.0414953 0.00998573
+6 0.33 0.182346 0.0520685
+7 0.39 0.33661 0.160485
+8 0.45 0.41438 0.338088
+9 0.51 0.606558 0.671897
+10 0.57 0.773167 1.20328
+11 0.63 0.907465 1.96505
+12 0.69 1.05131 3.02354
+13 0.75 1.0962 4.32739
+14 0.81 1.14452 5.91512
+15 0.87 1.17669 7.79815
+16 0.93 1.11055 9.82882
+17 0.99 1.06853 12.0428
+18 1.05 0.972579 14.3096
+19 1.11 0.968341 16.8317
+20 1.17 0.97635 19.6569
+21 1.23 0.940535 22.6648
+22 1.29 0.951614 26.0121
+23 1.35 0.975011 29.7682
+24 1.41 1.00804 34.0043
+25 1.47 1.01567 38.6434
+26 1.53 1.01499 43.6655
+27 1.59 1.0202 49.117
+28 1.65 1.00797 54.9173
+29 1.71 1.00877 61.1519
+30 1.77 1.0079 67.826
+31 1.83 0.998923 74.8966
+32 1.89 0.989321 82.3659
+33 1.95 1.00393 90.4344
+34 2.01 0.983986 98.8367
+35 2.07 1.00362 107.926
+36 2.13 0.994738 117.464
+37 2.19 1.00438 127.646
+38 2.25 1.00446 138.393
+39 2.31 0.997801 149.646
+40 2.37 0.999352 161.51
+41 2.43 1.00319 174.03
+42 2.49 0.997779 187.105
+43 2.55 0.996947 200.806
+44 2.61 1.00881 215.33
+45 2.67 1.00147 230.419
+46 2.73 1.00173 246.198
+47 2.79 0.995222 262.571
+48 2.85 0.992069 279.602
+49 2.91 0.999805 297.496
+50 2.97 1.005 316.232
+105550 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0.0296049 0.00142653
+4 0.21 0.0152025 0.00285307
+5 0.27 0.110654 0.0199715
+6 0.33 0.182346 0.0620542
+7 0.39 0.318893 0.164765
+8 0.45 0.454321 0.359486
+9 0.51 0.576749 0.67689
+10 0.57 0.761751 1.20043
+11 0.63 0.929557 1.98074
+12 0.69 1.01234 3
+13 0.75 1.0908 4.29743
+14 0.81 1.14812 5.89016
+15 0.87 1.14326 7.71969
+16 0.93 1.1047 9.73966
+17 0.99 1.08643 11.9907
+18 1.05 0.971661 14.2553
+19 1.11 0.995179 16.8474
+20 1.17 0.972653 19.6619
+21 1.23 0.942766 22.6769
+22 1.29 0.955263 26.0371
+23 1.35 0.987972 29.8431
+24 1.41 0.99463 34.0228
+25 1.47 1.00333 38.6056
+26 1.53 1.01932 43.6491
+27 1.59 1.0162 49.0792
+28 1.65 0.991984 54.7874
+29 1.71 1.01419 61.0556
+30 1.77 1.00984 67.7425
+31 1.83 1.00376 74.8474
+32 1.89 0.97704 82.224
+33 1.95 0.988843 90.1712
+34 2.01 1.01957 98.8773
+35 2.07 1.00338 107.964
+36 2.13 1.01162 117.665
+37 2.19 0.989604 127.696
+38 2.25 0.995261 138.345
+39 2.31 0.99388 149.554
+40 2.37 1.00866 161.529
+41 2.43 0.99502 173.947
+42 2.49 0.997126 187.013
+43 2.55 1.00338 200.802
+44 2.61 0.996871 215.155
+45 2.67 1.00129 230.241
+46 2.73 0.992852 245.88
+47 2.79 1.00584 262.428
+48 2.85 0.998634 279.571
+49 2.91 1.00375 297.536
+50 2.97 1.00676 316.305
+105600 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0.0148024 0.000713267
+4 0.21 0.0760125 0.00784593
+5 0.27 0.0829907 0.0206847
+6 0.33 0.179256 0.0620542
+7 0.39 0.307821 0.161198
+8 0.45 0.442671 0.350927
+9 0.51 0.625999 0.695435
+10 0.57 0.740995 1.20471
+11 0.63 0.883674 1.9465
+12 0.69 1.0003 2.95364
+13 0.75 1.0926 4.25321
+14 0.81 1.13373 5.82596
+15 0.87 1.17535 7.70685
+16 0.93 1.14683 9.80385
+17 0.99 1.07748 12.0364
+18 1.05 0.970743 14.2989
+19 1.11 0.999012 16.9009
+20 1.17 0.953427 19.6598
+21 1.23 0.960608 22.7318
+22 1.29 0.938028 26.0314
+23 1.35 0.970382 29.7696
+24 1.41 1.00481 33.9922
+25 1.47 1.00349 38.5756
+26 1.53 1.0333 43.6883
+27 1.59 0.985763 48.9558
+28 1.65 0.994587 54.679
+29 1.71 1.00196 60.8716
+30 1.77 1.02362 67.6498
+31 1.83 1.00225 74.7439
+32 1.89 1.00652 82.3431
+33 1.95 1.01103 90.4686
+34 2.01 1.00462 99.0471
+35 2.07 1.0011 108.113
+36 2.13 0.984473 117.553
+37 2.19 0.988056 127.569
+38 2.25 0.992727 138.191
+39 2.31 0.981357 149.259
+40 2.37 1.02086 161.378
+41 2.43 1.00165 173.879
+42 2.49 1.00524 187.051
+43 2.55 1.00136 200.813
+44 2.61 1.00336 215.259
+45 2.67 1.00218 230.359
+46 2.73 1.00707 246.222
+47 2.79 1.00472 262.751
+48 2.85 0.994977 279.832
+49 2.91 0.994265 297.626
+50 2.97 0.993563 316.149
+105650 50
+1 0.03 0 0
+2 0.09 0.080356 0.00142653
+3 0.15 0 0.00142653
+4 0.21 0.0532087 0.0064194
+5 0.27 0.119875 0.0249643
+6 0.33 0.176165 0.0656205
+7 0.39 0.307821 0.164765
+8 0.45 0.427694 0.348074
+9 0.51 0.623407 0.691155
+10 0.57 0.797037 1.23894
+11 0.63 0.887072 1.98359
+12 0.69 0.966296 2.95649
+13 0.75 1.0908 4.25392
+14 0.81 1.15378 5.85449
+15 0.87 1.17357 7.73252
+16 0.93 1.15307 9.84094
+17 0.99 1.06543 12.0485
+18 1.05 0.986963 14.3488
+19 1.11 0.95547 16.8374
+20 1.17 0.972407 19.6512
+21 1.23 0.940089 22.6576
+22 1.29 0.979191 26.102
+23 1.35 0.958162 29.7932
+24 1.41 1.00193 34.0036
+25 1.47 0.996776 38.5563
+26 1.53 1.01182 43.5628
+27 1.59 1.00592 48.9379
+28 1.65 1.01987 54.8067
+29 1.71 1.00496 61.0178
+30 1.77 1.02879 67.8302
+31 1.83 0.996706 74.8852
+32 1.89 0.993856 82.3887
+33 1.95 0.991239 90.3552
+34 2.01 1.00061 98.8994
+35 2.07 0.997081 107.929
+36 2.13 0.998383 117.503
+37 2.19 1.00417 127.682
+38 2.25 0.996261 138.342
+39 2.31 0.99818 149.599
+40 2.37 0.996889 161.434
+41 2.43 1.01479 174.098
+42 2.49 0.989342 187.063
+43 2.55 1.00115 200.822
+44 2.61 0.995236 215.15
+45 2.67 1.0002 230.22
+46 2.73 1.00612 246.068
+47 2.79 1.00285 262.567
+48 2.85 0.994811 279.645
+49 2.91 0.999725 297.537
+50 2.97 1.01101 316.385
+105700 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0.0296049 0.00142653
+4 0.21 0.00760125 0.0021398
+5 0.27 0.0968224 0.0171184
+6 0.33 0.163803 0.0549215
+7 0.39 0.305606 0.153352
+8 0.45 0.477619 0.35806
+9 0.51 0.620815 0.699715
+10 0.57 0.754487 1.21826
+11 0.63 0.884523 1.96077
+12 0.69 0.984007 2.9515
+13 0.75 1.14837 4.3174
+14 0.81 1.12858 5.88302
+15 0.87 1.18293 7.77603
+16 0.93 1.14059 9.86163
+17 0.99 1.05682 12.0514
+18 1.05 0.992777 14.3652
+19 1.11 0.948624 16.8359
+20 1.17 0.94825 19.5799
+21 1.23 0.947895 22.6113
+22 1.29 0.947558 25.9444
+23 1.35 0.995378 29.7789
+24 1.41 1.00193 33.9893
+25 1.47 1.01895 38.6434
+26 1.53 1.01788 43.6797
+27 1.59 0.993905 48.9907
+28 1.65 1.0314 54.9258
+29 1.71 0.987766 61.0307
+30 1.77 1.00025 67.6541
+31 1.83 1.00678 74.7803
+32 1.89 1.00019 82.3317
+33 1.95 0.993369 90.3153
+34 2.01 0.994761 98.8096
+35 2.07 0.997711 107.845
+36 2.13 0.989382 117.332
+37 2.19 1.01071 127.578
+38 2.25 1.01379 138.425
+39 2.31 0.995208 149.649
+40 2.37 0.99767 161.493
+41 2.43 1.00016 173.975
+42 2.49 0.999303 187.07
+43 2.55 0.992276 200.707
+44 2.61 1.00395 215.161
+45 2.67 1.00469 230.299
+46 2.73 0.999237 246.039
+47 2.79 1.00992 262.653
+48 2.85 1.0015 279.846
+49 2.91 0.995939 297.67
+50 2.97 1.00275 316.364
+105750 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0.06081 0.00570613
+5 0.27 0.0829907 0.0185449
+6 0.33 0.191618 0.0627675
+7 0.39 0.281246 0.153352
+8 0.45 0.389418 0.320257
+9 0.51 0.570269 0.634094
+10 0.57 0.830247 1.20471
+11 0.63 0.942302 1.99572
+12 0.69 0.992508 2.99501
+13 0.75 1.08721 4.28816
+14 0.81 1.12241 5.84522
+15 0.87 1.13836 7.6669
+16 0.93 1.16165 9.79101
+17 0.99 1.09331 12.0563
+18 1.05 1.01145 14.4137
+19 1.11 0.953005 16.8959
+20 1.17 0.9448 19.6298
+21 1.23 0.93206 22.6106
+22 1.29 0.962969 25.9979
+23 1.35 0.956311 29.6819
+24 1.41 1.01126 33.9315
+25 1.47 1.01833 38.5827
+26 1.53 0.997263 43.5171
+27 1.59 1.03101 49.0264
+28 1.65 1.02037 54.898
+29 1.71 1.00762 61.1255
+30 1.77 1.0177 67.8645
+31 1.83 0.989249 74.8666
+32 1.89 0.987715 82.3238
+33 1.95 0.993369 90.3074
+34 2.01 1.00428 98.883
+35 2.07 0.985503 107.808
+36 2.13 0.99868 117.384
+37 2.19 1.00016 127.523
+38 2.25 1.00406 138.266
+39 2.31 1.00229 149.57
+40 2.37 1.00121 161.456
+41 2.43 1.01177 174.083
+42 2.49 1.00823 187.295
+43 2.55 0.989162 200.889
+44 2.61 0.996871 215.241
+45 2.67 1.00081 230.32
+46 2.73 0.99335 245.967
+47 2.79 0.99856 262.395
+48 2.85 1.00021 279.566
+49 2.91 1.00036 297.469
+50 2.97 1.00305 316.169
+105800 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0.0456075 0.0042796
+5 0.27 0.101433 0.0199715
+6 0.33 0.14835 0.0542083
+7 0.39 0.303391 0.151926
+8 0.45 0.444336 0.342368
+9 0.51 0.64544 0.697575
+10 0.57 0.78147 1.23466
+11 0.63 0.89387 1.98502
+12 0.69 1.02651 3.01854
+13 0.75 1.0884 4.31312
+14 0.81 1.15275 5.91227
+15 0.87 1.12989 7.7204
+16 0.93 1.14176 9.80813
+17 0.99 1.08712 12.0606
+18 1.05 0.973497 14.3295
+19 1.11 0.963412 16.8388
+20 1.17 0.940856 19.5613
+21 1.23 0.964177 22.6448
+22 1.29 0.951816 25.9929
+23 1.35 0.97964 29.7668
+24 1.41 0.998195 33.9615
+25 1.47 1.01583 38.6013
+26 1.53 1.00779 43.5877
+27 1.59 1.01686 49.0214
+28 1.65 1.00463 54.8024
+29 1.71 1.00358 61.005
+30 1.77 1.00908 67.6869
+31 1.83 1.0089 74.8281
+32 1.89 0.990077 82.3031
+33 1.95 0.992482 90.2796
+34 2.01 0.996766 98.791
+35 2.07 0.994954 107.802
+36 2.13 0.998903 117.38
+37 2.19 0.994881 127.465
+38 2.25 1.00646 138.234
+39 2.31 1.00665 149.587
+40 2.37 0.995927 161.41
+41 2.43 1.00171 173.912
+42 2.49 1.00121 187.031
+43 2.55 0.995909 200.718
+44 2.61 1.00841 215.237
+45 2.67 0.999676 230.299
+46 2.73 0.992897 245.939
+47 2.79 1.00801 262.522
+48 2.85 1.00649 279.8
+49 2.91 0.997812 297.658
+50 2.97 0.997006 316.245
+105850 50
+1 0.03 0 0
+2 0.09 0.040178 0.000713267
+3 0.15 0 0.000713267
+4 0.21 0.0760125 0.00784593
+5 0.27 0.138318 0.0292439
+6 0.33 0.20089 0.0756063
+7 0.39 0.241384 0.153352
+8 0.45 0.39441 0.322397
+9 0.51 0.651921 0.68117
+10 0.57 0.727504 1.18117
+11 0.63 0.927857 1.96006
+12 0.69 1.04777 3.01498
+13 0.75 1.06202 4.27817
+14 0.81 1.16715 5.89729
+15 0.87 1.18248 7.78959
+16 0.93 1.12342 9.84379
+17 0.99 1.04615 12.0114
+18 1.05 1.00226 14.3474
+19 1.11 0.951636 16.826
+20 1.17 0.939623 19.5449
+21 1.23 0.955925 22.602
+22 1.29 0.949991 25.9437
+23 1.35 0.981306 29.724
+24 1.41 1.01703 33.9979
+25 1.47 1.02114 38.6619
+26 1.53 0.999137 43.6056
+27 1.59 1.01193 49.0128
+28 1.65 1.00277 54.7832
+29 1.71 1.01304 61.0442
+30 1.77 1.01608 67.7725
+31 1.83 1.00517 74.8873
+32 1.89 0.993761 82.3902
+33 1.95 0.987246 90.3245
+34 2.01 0.992506 98.7996
+35 2.07 0.978336 107.66
+36 2.13 1.00218 117.27
+37 2.19 0.993403 127.34
+38 2.25 1.01933 138.246
+39 2.31 1.00899 149.626
+40 2.37 1.00272 161.529
+41 2.43 1.00731 174.101
+42 2.49 0.994731 187.136
+43 2.55 1.00245 200.912
+44 2.61 1.00524 215.385
+45 2.67 1.00185 230.48
+46 2.73 0.988958 246.058
+47 2.79 0.988068 262.313
+48 2.85 1.01035 279.658
+49 2.91 0.993627 297.441
+50 2.97 1.00156 316.113
+105900 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0.0148024 0.000713267
+4 0.21 0.06081 0.0064194
+5 0.27 0.110654 0.0235378
+6 0.33 0.197799 0.0691869
+7 0.39 0.272388 0.156919
+8 0.45 0.469298 0.35806
+9 0.51 0.613039 0.695435
+10 0.57 0.787697 1.2368
+11 0.63 0.904066 1.99572
+12 0.69 1.0003 3.00285
+13 0.75 1.08721 4.29601
+14 0.81 1.11676 5.84522
+15 0.87 1.14727 7.68117
+16 0.93 1.13435 9.75535
+17 0.99 1.07989 11.9929
+18 1.05 1.02154 14.3738
+19 1.11 0.983677 16.9358
+20 1.17 0.914974 19.5835
+21 1.23 0.925369 22.5428
+22 1.29 0.970674 25.9572
+23 1.35 0.971493 29.6997
+24 1.41 1.00855 33.9379
+25 1.47 1.01208 38.5606
+26 1.53 1.01485 43.582
+27 1.59 1.02074 49.0364
+28 1.65 1.03091 54.9686
+29 1.71 0.990882 61.0927
+30 1.77 1.01059 67.7846
+31 1.83 0.98945 74.7882
+32 1.89 0.980252 82.189
+33 1.95 0.998073 90.2104
+34 2.01 1.00111 98.7589
+35 2.07 0.996215 107.781
+36 2.13 1.01408 117.505
+37 2.19 0.993896 127.58
+38 2.25 0.994594 138.222
+39 2.31 0.999129 149.49
+40 2.37 1.0175 161.569
+41 2.43 1.00651 174.131
+42 2.49 0.996908 187.194
+43 2.55 0.996532 200.889
+44 2.61 0.995781 215.226
+45 2.67 1.00266 230.333
+46 2.73 1.00499 246.163
+47 2.79 1.00086 262.629
+48 2.85 0.9956 279.72
+49 2.91 0.993946 297.509
+50 2.97 1.00091 316.169
+105950 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0.0148024 0.000713267
+4 0.21 0.0228037 0.00285307
+5 0.27 0.106044 0.0192582
+6 0.33 0.160712 0.0563481
+7 0.39 0.325537 0.161198
+8 0.45 0.449328 0.35378
+9 0.51 0.597486 0.682596
+10 0.57 0.801188 1.23324
+11 0.63 0.902367 1.99073
+12 0.69 1.06477 3.06277
+13 0.75 1.06502 4.32953
+14 0.81 1.10956 5.86876
+15 0.87 1.14504 7.70114
+16 0.93 1.15268 9.80884
+17 0.99 1.0644 12.0143
+18 1.05 0.966764 14.2675
+19 1.11 0.974913 16.8067
+20 1.17 0.950715 19.5578
+21 1.23 0.955255 22.6127
+22 1.29 0.961144 25.9936
+23 1.35 0.997785 29.8374
+24 1.41 0.995309 34.02
+25 1.47 1.0127 38.6455
+26 1.53 1.00202 43.6034
+27 1.59 1.01286 49.0157
+28 1.65 1.00748 54.8131
+29 1.71 1.0217 61.1277
+30 1.77 1.00553 67.786
+31 1.83 0.994287 74.8238
+32 1.89 1.00236 82.3916
+33 1.95 0.988222 90.3338
+34 2.01 1.00788 98.9401
+35 2.07 0.995821 107.959
+36 2.13 1.00738 117.618
+37 2.19 0.991292 127.667
+38 2.25 0.990728 138.267
+39 2.31 1.00893 149.646
+40 2.37 1.01768 161.728
+41 2.43 0.982961 173.995
+42 2.49 1.00578 187.175
+43 2.55 1.00421 200.976
+44 2.61 0.995483 215.308
+45 2.67 0.9939 230.283
+46 2.73 1.00358 246.091
+47 2.79 1.01144 262.731
+48 2.85 0.997553 279.856
+49 2.91 1.00925 297.919
+50 2.97 0.998384 316.531
+106000 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0.0148024 0.000713267
+4 0.21 0.0228037 0.00285307
+5 0.27 0.0876012 0.0164051
+6 0.33 0.145259 0.0499287
+7 0.39 0.318893 0.152639
+8 0.45 0.464306 0.351641
+9 0.51 0.615631 0.690442
+10 0.57 0.749298 1.20542
+11 0.63 0.935504 1.99073
+12 0.69 1.03501 3.03281
+13 0.75 1.07281 4.30884
+14 0.81 1.11059 5.8495
+15 0.87 1.14816 7.68688
+16 0.93 1.12225 9.73894
+17 0.99 1.09159 12.0007
+18 1.05 1.009 14.3524
+19 1.11 0.934931 16.7874
+20 1.17 0.947018 19.5278
+21 1.23 0.978674 22.6576
+22 1.29 0.972905 26.0799
+23 1.35 0.972604 29.8267
+24 1.41 1.02433 34.1312
+25 1.47 0.992872 38.6662
+26 1.53 1.00332 43.6305
+27 1.59 1.01673 49.0635
+28 1.65 1.00785 54.8631
+29 1.71 1.00058 61.0471
+30 1.77 0.994002 67.6291
+31 1.83 1.02391 74.8766
+32 1.89 0.986393 82.3238
+33 1.95 0.998251 90.3466
+34 2.01 0.987911 98.7825
+35 2.07 1.01291 107.956
+36 2.13 1.00099 117.554
+37 2.19 0.997625 127.667
+38 2.25 1.00046 138.372
+39 2.31 1.00526 149.709
+40 2.37 0.995507 161.527
+41 2.43 0.994277 173.936
+42 2.49 1.00992 187.17
+43 2.55 0.993262 200.82
+44 2.61 0.995384 215.151
+45 2.67 1.01189 230.397
+46 2.73 0.996972 246.101
+47 2.79 1.00736 262.674
+48 2.85 0.999257 279.828
+49 2.91 0.996855 297.669
+50 2.97 0.995552 316.229
+106050 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0.0532087 0.00499287
+5 0.27 0.0876012 0.0185449
+6 0.33 0.142168 0.0513552
+7 0.39 0.292319 0.145506
+8 0.45 0.474291 0.348787
+9 0.51 0.592302 0.67475
+10 0.57 0.744109 1.18616
+11 0.63 0.89302 1.93581
+12 0.69 1.02368 2.96648
+13 0.75 1.13938 4.32168
+14 0.81 1.17691 5.95435
+15 0.87 1.1593 7.80956
+16 0.93 1.12186 9.86091
+17 0.99 1.05751 12.0521
+18 1.05 0.992471 14.3652
+19 1.11 0.964781 16.878
+20 1.17 0.9342 19.5813
+21 1.23 0.950795 22.622
+22 1.29 0.96966 26.0328
+23 1.35 0.971864 29.7767
+24 1.41 1.00397 33.9957
+25 1.47 0.999587 38.5613
+26 1.53 1.00966 43.5571
+27 1.59 1.0206 49.0107
+28 1.65 1.02359 54.9009
+29 1.71 1.02423 61.2311
+30 1.77 0.999819 67.8516
+31 1.83 0.977559 74.771
+32 1.89 1.00784 82.3802
+33 1.95 0.990086 90.3374
+34 2.01 1.00412 98.9116
+35 2.07 0.98826 107.862
+36 2.13 1.00463 117.495
+37 2.19 1.00642 127.697
+38 2.25 1.00293 138.428
+39 2.31 0.99603 149.661
+40 2.37 0.997309 161.501
+41 2.43 0.995592 173.926
+42 2.49 0.996146 186.979
+43 2.55 1.00738 200.824
+44 2.61 0.999744 215.218
+45 2.67 1.00086 230.297
+46 2.73 0.999735 246.045
+47 2.79 1.00736 262.618
+48 2.85 0.998841 279.765
+49 2.91 1.0002 297.665
+50 2.97 1.0081 316.459
+106100 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0.06081 0.00570613
+5 0.27 0.106044 0.0221113
+6 0.33 0.194709 0.0670471
+7 0.39 0.296748 0.162625
+8 0.45 0.475955 0.366619
+9 0.51 0.593598 0.693295
+10 0.57 0.779394 1.22896
+11 0.63 0.902367 1.98645
+12 0.69 1.02085 3.01427
+13 0.75 1.06562 4.28174
+14 0.81 1.15223 5.88017
+15 0.87 1.1651 7.74465
+16 0.93 1.13123 9.81312
+17 0.99 1.08815 12.0678
+18 1.05 0.979618 14.3509
+19 1.11 0.930276 16.7739
+20 1.17 0.951948 19.5285
+21 1.23 0.978674 22.6583
+22 1.29 0.959724 26.0342
+23 1.35 0.990934 29.8516
+24 1.41 0.990217 34.0128
+25 1.47 1.00755 38.6148
+26 1.53 1.01427 43.6334
+27 1.59 1.01152 49.0385
+28 1.65 1.03772 55.01
+29 1.71 0.992036 61.1412
+30 1.77 1.00025 67.7646
+31 1.83 0.995396 74.8103
+32 1.89 1.01351 82.4622
+33 1.95 0.990174 90.4201
+34 2.01 1.01046 99.0485
+35 2.07 0.989205 108.007
+36 2.13 0.994961 117.548
+37 2.19 0.995162 127.636
+38 2.25 0.990728 138.236
+39 2.31 1.00615 149.583
+40 2.37 1.00049 161.461
+41 2.43 1.00039 173.946
+42 2.49 1.0103 187.185
+43 2.55 1.00302 200.969
+44 2.61 1.00192 215.394
+45 2.67 1.0108 230.624
+46 2.73 0.99258 246.259
+47 2.79 1.00329 262.765
+48 2.85 0.994853 279.843
+49 2.91 1.0014 297.765
+50 2.97 1.00519 316.505
+106150 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0.0148024 0.000713267
+4 0.21 0.0228037 0.00285307
+5 0.27 0.0968224 0.0178317
+6 0.33 0.163803 0.0556348
+7 0.39 0.303391 0.153352
+8 0.45 0.444336 0.343795
+9 0.51 0.660993 0.707561
+10 0.57 0.752411 1.22468
+11 0.63 0.917661 1.99501
+12 0.69 1.01305 3.01498
+13 0.75 1.07881 4.29815
+14 0.81 1.13321 5.87019
+15 0.87 1.14192 7.69757
+16 0.93 1.14254 9.78673
+17 0.99 1.08195 12.0285
+18 1.05 1.00257 14.3652
+19 1.11 0.934383 16.7989
+20 1.17 0.957124 19.5685
+21 1.23 0.959047 22.6355
+22 1.29 0.955263 25.9957
+23 1.35 0.981492 29.7767
+24 1.41 0.989029 33.933
+25 1.47 1.00537 38.525
+26 1.53 1.01226 43.5335
+27 1.59 1.0214 48.9914
+28 1.65 1.01268 54.8188
+29 1.71 1.01154 61.0706
+30 1.77 1.01479 67.7903
+31 1.83 1.00729 74.9201
+32 1.89 0.988376 82.3823
+33 1.95 1.00118 90.4287
+34 2.01 0.991587 98.8959
+35 2.07 0.98889 107.852
+36 2.13 1.00389 117.478
+37 2.19 0.991292 127.526
+38 2.25 1.00473 138.277
+39 2.31 1.01235 149.694
+40 2.37 0.995687 161.514
+41 2.43 0.996506 173.951
+42 2.49 1.0097 187.182
+43 2.55 0.991186 200.804
+44 2.61 1.00435 215.264
+45 2.67 0.994516 230.248
+46 2.73 1.01042 246.164
+47 2.79 0.993965 262.516
+48 2.85 1.00084 279.698
+49 2.91 1.00403 297.667
+50 2.97 0.996509 316.245
+106200 50
+1 0.03 0 0
+2 0.09 0.040178 0.000713267
+3 0.15 0.0444073 0.00285307
+4 0.21 0.0152025 0.0042796
+5 0.27 0.0876012 0.0178317
+6 0.33 0.154531 0.053495
+7 0.39 0.298962 0.149786
+8 0.45 0.412716 0.326676
+9 0.51 0.627295 0.671897
+10 0.57 0.753449 1.18973
+11 0.63 0.939753 1.9786
+12 0.69 1.00384 2.9893
+13 0.75 1.05122 4.23966
+14 0.81 1.17846 5.87447
+15 0.87 1.19229 7.78245
+16 0.93 1.11016 9.81241
+17 0.99 1.08161 12.0535
+18 1.05 1.02032 14.4315
+19 1.11 0.930002 16.8538
+20 1.17 0.927299 19.5371
+21 1.23 0.953248 22.5856
+22 1.29 0.980407 26.0342
+23 1.35 0.990934 29.8516
+24 1.41 0.992933 34.0243
+25 1.47 1.00552 38.617
+26 1.53 1.02235 43.6755
+27 1.59 1.00432 49.0421
+28 1.65 1.01033 54.8559
+29 1.71 1.00173 61.0471
+30 1.77 1.00833 67.724
+31 1.83 1.01041 74.8759
+32 1.89 1.00444 82.4593
+33 1.95 0.992748 90.4379
+34 2.01 0.990083 98.8923
+35 2.07 0.994954 107.903
+36 2.13 0.983208 117.331
+37 2.19 0.997273 127.44
+38 2.25 1.01693 138.321
+39 2.31 1.004 149.644
+40 2.37 0.996228 161.471
+41 2.43 1.01525 174.141
+42 2.49 1.0097 187.372
+43 2.55 0.988384 200.956
+44 2.61 0.992461 215.245
+45 2.67 1.00749 230.424
+46 2.73 0.991901 246.049
+47 2.79 1.00355 262.558
+48 2.85 1.00345 279.785
+49 2.91 1.01316 297.917
+50 2.97 0.996662 316.498
+106250 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0.0296049 0.00142653
+4 0.21 0.06081 0.00713267
+5 0.27 0.106044 0.0235378
+6 0.33 0.169984 0.0627675
+7 0.39 0.31225 0.163338
+8 0.45 0.42603 0.345934
+9 0.51 0.64544 0.701141
+10 0.57 0.739957 1.2097
+11 0.63 0.929557 1.99001
+12 0.69 1.01589 3.01284
+13 0.75 1.07401 4.2903
+14 0.81 1.11367 5.83524
+15 0.87 1.16733 7.70328
+16 0.93 1.14644 9.79957
+17 0.99 1.0644 12.005
+18 1.05 1.0243 14.3923
+19 1.11 0.946433 16.8573
+20 1.17 0.948497 19.602
+21 1.23 0.938528 22.6034
+22 1.29 0.956277 25.9672
+23 1.35 0.981677 29.7489
+24 1.41 0.99497 33.9301
+25 1.47 1.00708 38.53
+26 1.53 1.03806 43.6662
+27 1.59 1.01913 49.112
+28 1.65 1.00921 54.9194
+29 1.71 0.990074 61.0385
+30 1.77 1.01156 67.7368
+31 1.83 0.995093 74.7803
+32 1.89 0.988471 82.2432
+33 1.95 0.996032 90.2482
+34 2.01 1.00245 98.8081
+35 2.07 1.00118 107.875
+36 2.13 0.992953 117.397
+37 2.19 1.00318 127.566
+38 2.25 0.999794 138.263
+39 2.31 1.00545 149.603
+40 2.37 1.00939 161.586
+41 2.43 1.00245 174.096
+42 2.49 0.988308 187.047
+43 2.55 1.00183 200.815
+44 2.61 1.00019 215.215
+45 2.67 0.997356 230.243
+46 2.73 1.00164 246.02
+47 2.79 1.00173 262.5
+48 2.85 1.0037 279.73
+49 2.91 0.990917 297.465
+50 2.97 1.00967 316.288
+106300 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0.0532087 0.00499287
+5 0.27 0.101433 0.0206847
+6 0.33 0.182346 0.0627675
+7 0.39 0.279032 0.152639
+8 0.45 0.495925 0.365193
+9 0.51 0.636368 0.715407
+10 0.57 0.746184 1.22825
+11 0.63 0.936354 2.01427
+12 0.69 1.0251 3.04636
+13 0.75 1.06322 4.31098
+14 0.81 1.11316 5.85521
+15 0.87 1.15128 7.69757
+16 0.93 1.13435 9.77175
+17 0.99 1.09125 12.0328
+18 1.05 1.00624 14.378
+19 1.11 0.970532 16.9058
+20 1.17 0.954906 19.669
+21 1.23 0.943212 22.6854
+22 1.29 0.959522 26.0606
+23 1.35 0.96705 29.786
+24 1.41 1.00006 33.9886
+25 1.47 1.01723 38.6348
+26 1.53 1.00995 43.632
+27 1.59 1.01513 49.0563
+28 1.65 1.02805 54.9722
+29 1.71 1.00785 61.2011
+30 1.77 1.01274 67.9073
+31 1.83 0.986931 74.893
+32 1.89 0.989888 82.3666
+33 1.95 0.993458 90.3509
+34 2.01 0.997852 98.8716
+35 2.07 0.987945 107.819
+36 2.13 1.01319 117.534
+37 2.19 1.01198 127.792
+38 2.25 0.991261 138.399
+39 2.31 0.994259 149.612
+40 2.37 1.01744 161.69
+41 2.43 0.998964 174.158
+42 2.49 0.993696 187.179
+43 2.55 1.00613 201.006
+44 2.61 0.994592 215.326
+45 2.67 0.998824 230.375
+46 2.73 0.997244 246.083
+47 2.79 1.00138 262.558
+48 2.85 1.00449 279.802
+49 2.91 0.997613 297.656
+50 2.97 1.00397 316.373
+106350 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0.030405 0.00285307
+5 0.27 0.0829907 0.0156919
+6 0.33 0.176165 0.0563481
+7 0.39 0.325537 0.161198
+8 0.45 0.441007 0.350214
+9 0.51 0.622111 0.692582
+10 0.57 0.769016 1.22111
+11 0.63 0.880275 1.96006
+12 0.69 1.02651 2.99358
+13 0.75 1.07941 4.27746
+14 0.81 1.13681 5.85449
+15 0.87 1.16733 7.72254
+16 0.93 1.10509 9.74322
+17 0.99 1.08987 12.0014
+18 1.05 1.01206 14.3602
+19 1.11 0.97327 16.8951
+20 1.17 0.941102 19.6184
+21 1.23 0.945442 22.6419
+22 1.29 0.947558 25.975
+23 1.35 0.97927 29.7475
+24 1.41 0.995479 33.9308
+25 1.47 1.01317 38.5585
+26 1.53 1.02047 43.6077
+27 1.59 1.01072 49.0086
+28 1.65 1.00165 54.7725
+29 1.71 1.01558 61.0492
+30 1.77 1.01996 67.8031
+31 1.83 1.00819 74.9394
+32 1.89 0.987432 82.3944
+33 1.95 0.985648 90.316
+34 2.01 1.00111 98.8645
+35 2.07 0.993931 107.866
+36 2.13 0.994664 117.404
+37 2.19 1.00473 127.588
+38 2.25 1.00433 138.335
+39 2.31 1.00096 149.623
+40 2.37 1.01005 161.614
+41 2.43 1.00445 174.15
+42 2.49 0.986675 187.079
+43 2.55 1.01039 200.965
+44 2.61 0.992016 215.248
+45 2.67 1.0037 230.37
+46 2.73 1.00503 246.201
+47 2.79 0.996176 262.59
+48 2.85 1.01035 279.934
+49 2.91 0.993109 297.708
+50 2.97 1.00141 316.377
+106400 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0.0148024 0.000713267
+4 0.21 0.0380062 0.0042796
+5 0.27 0.138318 0.0256776
+6 0.33 0.179256 0.0670471
+7 0.39 0.301177 0.164051
+8 0.45 0.457649 0.3602
+9 0.51 0.594894 0.687589
+10 0.57 0.773167 1.21897
+11 0.63 0.89387 1.96933
+12 0.69 0.998176 2.97432
+13 0.75 1.07641 4.25464
+14 0.81 1.18463 5.898
+15 0.87 1.16733 7.76605
+16 0.93 1.10392 9.78459
+17 0.99 1.08333 12.0292
+18 1.05 0.972579 14.296
+19 1.11 0.961769 16.801
+20 1.17 0.969942 19.6077
+21 1.23 0.955255 22.6626
+22 1.29 0.928497 25.9287
+23 1.35 0.9976 29.7718
+24 1.41 1.006 33.9993
+25 1.47 1.01005 38.6127
+26 1.53 1.00764 43.5984
+27 1.59 1.01673 49.0314
+28 1.65 1.00153 54.7946
+29 1.71 0.999999 60.975
+30 1.77 0.999711 67.5949
+31 1.83 1.01132 74.7532
+32 1.89 1.00746 82.3595
+33 1.95 0.993636 90.3452
+34 2.01 0.997601 98.8638
+35 2.07 1.00181 107.937
+36 2.13 0.99206 117.449
+37 2.19 1.00248 127.611
+38 2.25 0.995461 138.262
+39 2.31 1.00469 149.593
+40 2.37 0.999172 161.455
+41 2.43 1.00119 173.95
+42 2.49 1.00066 187.063
+43 2.55 1.00774 200.912
+44 2.61 0.996326 215.257
+45 2.67 1.00242 230.36
+46 2.73 0.998331 246.086
+47 2.79 0.996826 262.485
+48 2.85 0.999257 279.639
+49 2.91 1.00786 297.677
+50 2.97 1.00255 316.367
+106450 50
+1 0.03 0 0
+2 0.09 0.040178 0.000713267
+3 0.15 0.0148024 0.00142653
+4 0.21 0.0532087 0.0064194
+5 0.27 0.106044 0.0228245
+6 0.33 0.194709 0.0677603
+7 0.39 0.316679 0.169757
+8 0.45 0.431022 0.354494
+9 0.51 0.575453 0.671184
+10 0.57 0.802226 1.22254
+11 0.63 0.859882 1.94437
+12 0.69 1.03785 2.9893
+13 0.75 1.101 4.29886
+14 0.81 1.12961 5.86591
+15 0.87 1.16064 7.72325
+16 0.93 1.1164 9.76462
+17 0.99 1.1033 12.0506
+18 1.05 0.995532 14.3709
+19 1.11 0.957661 16.8652
+20 1.17 0.943814 19.5963
+21 1.23 0.950126 22.6348
+22 1.29 0.964997 26.0292
+23 1.35 0.970568 29.7682
+24 1.41 0.97545 33.8673
+25 1.47 1.0138 38.4979
+26 1.53 1.02653 43.577
+27 1.59 1.02981 49.0799
+28 1.65 1.00339 54.8538
+29 1.71 1.00669 61.0756
+30 1.77 0.997449 67.6805
+31 1.83 1.00981 74.8281
+32 1.89 0.993006 82.3252
+33 1.95 0.995588 90.3267
+34 2.01 0.985238 98.7397
+35 2.07 1.01102 107.896
+36 2.13 0.984994 117.341
+37 2.19 1.0105 127.584
+38 2.25 1.00153 138.3
+39 2.31 0.987492 149.437
+40 2.37 1.00854 161.41
+41 2.43 1.00679 173.975
+42 2.49 1.00807 187.185
+43 2.55 0.999335 200.919
+44 2.61 1.00831 215.436
+45 2.67 0.992764 230.394
+46 2.73 0.995705 246.078
+47 2.79 0.990583 262.374
+48 2.85 1.0052 279.631
+49 2.91 1.00566 297.629
+50 2.97 0.992415 316.131
+106500 50
+1 0.03 0 0
+2 0.09 0.040178 0.000713267
+3 0.15 0.0148024 0.00142653
+4 0.21 0.0456075 0.00570613
+5 0.27 0.0968224 0.0206847
+6 0.33 0.15144 0.0556348
+7 0.39 0.296748 0.151213
+8 0.45 0.41438 0.328816
+9 0.51 0.615631 0.667618
+10 0.57 0.786659 1.20827
+11 0.63 0.923609 1.98359
+12 0.69 1.01093 3.00143
+13 0.75 1.07941 4.28531
+14 0.81 1.11727 5.83524
+15 0.87 1.17446 7.71469
+16 0.93 1.13474 9.78959
+17 0.99 1.09538 12.0592
+18 1.05 0.973191 14.3274
+19 1.11 0.961221 16.831
+20 1.17 0.982759 19.6748
+21 1.23 0.938974 22.6776
+22 1.29 0.971891 26.0963
+23 1.35 0.969271 29.8302
+24 1.41 1.00566 34.0563
+25 1.47 0.985376 38.5571
+26 1.53 1.01139 43.5613
+27 1.59 1.00272 48.9194
+28 1.65 1.03462 54.873
+29 1.71 1.00531 61.0863
+30 1.77 1.01124 67.7825
+31 1.83 0.999628 74.8581
+32 1.89 0.996123 82.3787
+33 1.95 0.981832 90.2696
+34 2.01 0.996933 98.7825
+35 2.07 1.00204 107.857
+36 2.13 0.991986 117.369
+37 2.19 0.992348 127.429
+38 2.25 1.00419 138.173
+39 2.31 1.00703 149.531
+40 2.37 0.997429 161.372
+41 2.43 1.00868 173.96
+42 2.49 1.00475 187.126
+43 2.55 0.993055 200.774
+44 2.61 1.00078 215.183
+45 2.67 1.00389 230.308
+46 2.73 1.00023 246.063
+47 2.79 0.994918 262.432
+48 2.85 0.994894 279.511
+49 2.91 1.00678 297.529
+50 2.97 0.996126 316.1
+106550 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0.0148024 0.000713267
+4 0.21 0.0380062 0.0042796
+5 0.27 0.0968224 0.0192582
+6 0.33 0.169984 0.0584879
+7 0.39 0.31225 0.159058
+8 0.45 0.524216 0.383738
+9 0.51 0.633776 0.732525
+10 0.57 0.729579 1.23395
+11 0.63 0.881974 1.97432
+12 0.69 1.02864 3.00999
+13 0.75 1.1004 4.31883
+14 0.81 1.11162 5.86091
+15 0.87 1.14504 7.6933
+16 0.93 1.14956 9.79529
+17 0.99 1.08402 12.0414
+18 1.05 0.999204 14.3702
+19 1.11 0.955744 16.8595
+20 1.17 0.942581 19.587
+21 1.23 0.959493 22.6555
+22 1.29 0.970066 26.0678
+23 1.35 0.972975 29.816
+24 1.41 0.986313 33.9608
+25 1.47 1.00599 38.5556
+26 1.53 1.01817 43.5934
+27 1.59 1.03208 49.1084
+28 1.65 1.00884 54.9137
+29 1.71 1.01627 61.1947
+30 1.77 0.995941 67.7896
+31 1.83 0.992977 74.8181
+32 1.89 0.989699 82.2903
+33 1.95 0.995766 90.2932
+34 2.01 0.995847 98.7967
+35 2.07 1.00094 107.862
+36 2.13 0.999796 117.449
+37 2.19 0.982637 127.409
+38 2.25 0.99926 138.101
+39 2.31 1.00918 149.483
+40 2.37 1.0026 161.385
+41 2.43 1.00228 173.894
+42 2.49 1.00964 187.124
+43 2.55 1.00375 200.919
+44 2.61 0.990579 215.18
+45 2.67 1.00294 230.292
+46 2.73 1.00503 246.123
+47 2.79 0.996219 262.512
+48 2.85 0.998467 279.653
+49 2.91 0.999247 297.536
+50 2.97 0.998001 316.142
+106600 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0.0148024 0.000713267
+4 0.21 0.0456075 0.00499287
+5 0.27 0.0922118 0.0192582
+6 0.33 0.182346 0.0613409
+7 0.39 0.334395 0.169044
+8 0.45 0.404395 0.342368
+9 0.51 0.581933 0.662625
+10 0.57 0.792886 1.20756
+11 0.63 0.921909 1.98146
+12 0.69 1.0003 2.98859
+13 0.75 1.11239 4.3117
+14 0.81 1.15738 5.91726
+15 0.87 1.129 7.72397
+16 0.93 1.12889 9.78816
+17 0.99 1.06715 11.9993
+18 1.05 1.00869 14.3502
+19 1.11 0.959578 16.8495
+20 1.17 0.932968 19.5492
+21 1.23 0.940535 22.5571
+22 1.29 0.983246 26.0157
+23 1.35 0.991675 29.8359
+24 1.41 0.98869 33.9907
+25 1.47 1.00943 38.6013
+26 1.53 1.00116 43.5549
+27 1.59 1.01286 48.9672
+28 1.65 1.01417 54.8031
+29 1.71 1.01489 61.0756
+30 1.77 1.00467 67.7282
+31 1.83 0.993179 74.7582
+32 1.89 1.00047 82.3117
+33 1.95 0.995854 90.3153
+34 2.01 1.00086 98.8616
+35 2.07 0.998892 107.908
+36 2.13 0.988415 117.386
+37 2.19 1.00262 127.549
+38 2.25 1.00239 138.275
+39 2.31 1.01614 149.735
+40 2.37 1.00206 161.631
+41 2.43 0.986962 173.948
+42 2.49 1.00387 187.103
+43 2.55 0.988539 200.688
+44 2.61 1.00405 215.144
+45 2.67 1.01482 230.434
+46 2.73 0.99498 246.107
+47 2.79 1.00359 262.618
+48 2.85 0.999922 279.783
+49 2.91 0.995301 297.596
+50 2.97 1.00252 316.286
+106650 50
+1 0.03 0 0
+2 0.09 0.040178 0.000713267
+3 0.15 0.0148024 0.00142653
+4 0.21 0.030405 0.0042796
+5 0.27 0.0922118 0.0185449
+6 0.33 0.182346 0.0606277
+7 0.39 0.296748 0.156205
+8 0.45 0.480947 0.36234
+9 0.51 0.584525 0.684023
+10 0.57 0.773167 1.21541
+11 0.63 0.906615 1.97646
+12 0.69 1.01518 2.99857
+13 0.75 1.0968 4.30314
+14 0.81 1.16355 5.91726
+15 0.87 1.13345 7.7311
+16 0.93 1.10938 9.75963
+17 0.99 1.05201 11.9394
+18 1.05 1.05307 14.3937
+19 1.11 0.945337 16.8559
+20 1.17 0.95318 19.6141
+21 1.23 0.942766 22.6291
+22 1.29 0.950802 25.9736
+23 1.35 0.979455 29.7468
+24 1.41 0.976808 33.8516
+25 1.47 1.02676 38.5414
+26 1.53 1.03907 43.6826
+27 1.59 1.00712 49.0642
+28 1.65 1.02533 54.9643
+29 1.71 0.992498 61.0984
+30 1.77 1.01727 67.8345
+31 1.83 0.997209 74.893
+32 1.89 0.98866 82.3573
+33 1.95 0.976507 90.2054
+34 2.01 0.996933 98.7183
+35 2.07 1.00653 107.834
+36 2.13 0.987076 117.299
+37 2.19 1.00142 127.45
+38 2.25 1.00106 138.161
+39 2.31 1.00937 149.545
+40 2.37 1.00338 161.456
+41 2.43 1.00737 174.029
+42 2.49 1.0159 187.341
+43 2.55 0.997155 201.045
+44 2.61 0.99256 215.335
+45 2.67 0.99461 230.321
+46 2.73 0.99249 245.954
+47 2.79 1.00021 262.409
+48 2.85 1.00009 279.578
+49 2.91 0.996656 297.415
+50 2.97 0.991956 315.908
+106700 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0.0296049 0.00142653
+4 0.21 0.06081 0.00713267
+5 0.27 0.0783801 0.0192582
+6 0.33 0.157621 0.0556348
+7 0.39 0.323322 0.159772
+8 0.45 0.447664 0.351641
+9 0.51 0.607855 0.686163
+10 0.57 0.79081 1.22967
+11 0.63 0.862431 1.95364
+12 0.69 0.971964 2.93224
+13 0.75 1.13278 4.2796
+14 0.81 1.16098 5.89016
+15 0.87 1.15708 7.7418
+16 0.93 1.13942 9.82525
+17 0.99 1.06681 12.0357
+18 1.05 1.01083 14.3916
+19 1.11 0.93274 16.821
+20 1.17 0.950962 19.5728
+21 1.23 0.940312 22.5799
+22 1.29 0.985071 26.0449
+23 1.35 1.01482 29.9544
+24 1.41 0.961872 33.9964
+25 1.47 0.974289 38.4465
+26 1.53 1.02062 43.4964
+27 1.59 1.03395 49.0214
+28 1.65 1.02235 54.9044
+29 1.71 1.00842 61.1369
+30 1.77 0.99314 67.7133
+31 1.83 0.998721 74.7825
+32 1.89 0.998202 82.3188
+33 1.95 1.00003 90.3559
+34 2.01 0.990083 98.8103
+35 2.07 1.01141 107.97
+36 2.13 0.99206 117.483
+37 2.19 0.997484 127.594
+38 2.25 0.987261 138.158
+39 2.31 0.995271 149.382
+40 2.37 1.00362 161.297
+41 2.43 1.0168 173.986
+42 2.49 0.997833 187.062
+43 2.55 1.00042 200.811
+44 2.61 0.999694 215.204
+45 2.67 1.00247 230.308
+46 2.73 1.00807 246.187
+47 2.79 0.995916 262.571
+48 2.85 0.994271 279.64
+49 2.91 0.991953 297.393
+50 2.97 1.0078 316.181
+106750 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0.0148024 0.000713267
+4 0.21 0.091215 0.00927247
+5 0.27 0.0599377 0.0185449
+6 0.33 0.176165 0.0592011
+7 0.39 0.325537 0.164051
+8 0.45 0.407724 0.338802
+9 0.51 0.649329 0.696148
+10 0.57 0.761751 1.21969
+11 0.63 0.890471 1.96719
+12 0.69 1.01234 2.98645
+13 0.75 1.10999 4.3067
+14 0.81 1.13681 5.88374
+15 0.87 1.14816 7.72111
+16 0.93 1.12928 9.78602
+17 0.99 1.05269 11.9672
+18 1.05 1.02154 14.3481
+19 1.11 0.934383 16.7817
+20 1.17 0.976104 19.6063
+21 1.23 0.961946 22.6826
+22 1.29 0.948775 26.02
+23 1.35 0.980751 29.7981
+24 1.41 0.986653 33.9444
+25 1.47 1.00755 38.5464
+26 1.53 1.00836 43.5357
+27 1.59 1.01406 48.9544
+28 1.65 1.00326 54.7275
+29 1.71 1.02377 61.0549
+30 1.77 1.00941 67.7389
+31 1.83 1.01656 74.9344
+32 1.89 0.980724 82.3388
+33 1.95 0.998251 90.3616
+34 2.01 1.00938 98.9807
+35 2.07 0.982747 107.881
+36 2.13 0.988713 117.362
+37 2.19 1.00192 127.518
+38 2.25 0.992994 138.143
+39 2.31 0.993374 149.346
+40 2.37 1.00296 161.252
+41 2.43 1.00428 173.786
+42 2.49 1.0116 187.042
+43 2.55 1.00946 200.915
+44 2.61 1.00623 215.402
+45 2.67 0.999155 230.456
+46 2.73 0.992806 246.095
+47 2.79 1.0009 262.561
+48 2.85 0.987291 279.51
+49 2.91 1.00375 297.474
+50 2.97 1.00309 316.175
+106800 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0.030405 0.00285307
+5 0.27 0.0922118 0.0171184
+6 0.33 0.197799 0.0627675
+7 0.39 0.307821 0.161912
+8 0.45 0.431022 0.346648
+9 0.51 0.64544 0.701854
+10 0.57 0.798075 1.25036
+11 0.63 0.922759 2.02496
+12 0.69 0.968422 3
+13 0.75 1.0908 4.29743
+14 0.81 1.11573 5.84522
+15 0.87 1.18649 7.74394
+16 0.93 1.13162 9.81312
+17 0.99 1.03238 11.9522
+18 1.05 1.00135 14.286
+19 1.11 0.993535 16.8738
+20 1.17 0.976104 19.6983
+21 1.23 0.92983 22.6719
+22 1.29 0.971891 26.0906
+23 1.35 0.964643 29.8067
+24 1.41 0.988859 33.9622
+25 1.47 0.995058 38.5071
+26 1.53 1.01499 43.5292
+27 1.59 1.01967 48.9779
+28 1.65 1.01665 54.8281
+29 1.71 1.01212 61.0835
+30 1.77 1.00854 67.7618
+31 1.83 1.01505 74.9465
+32 1.89 0.991683 82.4337
+33 1.95 0.999404 90.4658
+34 2.01 0.999522 99.0007
+35 2.07 0.988496 107.953
+36 2.13 0.996151 117.505
+37 2.19 0.994248 127.583
+38 2.25 0.998994 138.272
+39 2.31 0.985848 149.391
+40 2.37 1.0163 161.456
+41 2.43 0.995249 173.877
+42 2.49 0.999357 186.972
+43 2.55 1.00894 200.838
+44 2.61 1.0104 215.385
+45 2.67 1.00611 230.544
+46 2.73 0.992671 246.18
+47 2.79 0.99817 262.602
+48 2.85 0.998384 279.741
+49 2.91 1.00483 297.725
+50 2.97 0.994558 316.266
+106850 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0.0296049 0.00142653
+4 0.21 0.0532087 0.0064194
+5 0.27 0.0737695 0.0178317
+6 0.33 0.169984 0.0570613
+7 0.39 0.365398 0.17475
+8 0.45 0.41438 0.352354
+9 0.51 0.619519 0.693295
+10 0.57 0.797037 1.24108
+11 0.63 0.869229 1.97076
+12 0.69 1.01943 2.99715
+13 0.75 1.04523 4.24037
+14 0.81 1.17229 5.86662
+15 0.87 1.17223 7.74251
+16 0.93 1.11367 9.77889
+17 0.99 1.09676 12.0514
+18 1.05 0.979312 14.3338
+19 1.11 0.963412 16.8431
+20 1.17 0.938144 19.5578
+21 1.23 0.937413 22.5556
+22 1.29 0.972702 25.9772
+23 1.35 0.985935 29.7753
+24 1.41 1.00753 34.0093
+25 1.47 1.00708 38.6091
+26 1.53 1.00894 43.6013
+27 1.59 1.02074 49.0556
+28 1.65 1.02248 54.9394
+29 1.71 1.00415 61.1455
+30 1.77 1.00499 67.8003
+31 1.83 0.995698 74.8481
+32 1.89 0.985164 82.286
+33 1.95 0.988044 90.2268
+34 2.01 0.990167 98.6819
+35 2.07 1.00472 107.781
+36 2.13 1.00344 117.403
+37 2.19 0.989322 127.432
+38 2.25 1.01379 138.279
+39 2.31 0.996852 149.521
+40 2.37 1.01281 161.545
+41 2.43 0.996392 173.98
+42 2.49 1.0152 187.283
+43 2.55 0.981273 200.769
+44 2.61 0.998555 215.146
+45 2.67 1.00848 230.34
+46 2.73 1.00259 246.133
+47 2.79 0.998257 262.556
+48 2.85 0.988163 279.519
+49 2.91 1.00176 297.448
+50 2.97 1.00818 316.243
+106900 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0.0296049 0.00142653
+4 0.21 0.030405 0.0042796
+5 0.27 0.0599377 0.0135521
+6 0.33 0.157621 0.0499287
+7 0.39 0.298962 0.14622
+8 0.45 0.421037 0.326676
+9 0.51 0.623407 0.669757
+10 0.57 0.851003 1.25464
+11 0.63 0.913413 2.0214
+12 0.69 1.03785 3.06633
+13 0.75 1.05842 4.32525
+14 0.81 1.1327 5.89658
+15 0.87 1.17178 7.77175
+16 0.93 1.09807 9.7796
+17 0.99 1.03583 11.9258
+18 1.05 1.0041 14.266
+19 1.11 0.986689 16.8359
+20 1.17 0.965258 19.6291
+21 1.23 0.9218 22.577
+22 1.29 0.970066 25.9893
+23 1.35 0.985195 29.7846
+24 1.41 1.00583 34.0114
+25 1.47 1.01192 38.6334
+26 1.53 1.01125 43.6369
+27 1.59 1.01379 49.0542
+28 1.65 1.01839 54.9144
+29 1.71 1.01846 61.209
+30 1.77 0.99551 67.801
+31 1.83 0.978869 74.7297
+32 1.89 0.999524 82.276
+33 1.95 0.993724 90.2625
+34 2.01 0.989666 98.7133
+35 2.07 0.999129 107.762
+36 2.13 1.01155 117.461
+37 2.19 1.00846 127.684
+38 2.25 1.00026 138.387
+39 2.31 0.999129 149.655
+40 2.37 0.996468 161.484
+41 2.43 0.997535 173.934
+42 2.49 1.00589 187.115
+43 2.55 1.00603 200.941
+44 2.61 0.991124 215.21
+45 2.67 0.998445 230.254
+46 2.73 0.999599 245.999
+47 2.79 0.992881 262.334
+48 2.85 1.00046 279.509
+49 2.91 1.0057 297.508
+50 2.97 0.998843 316.129
+106950 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0.0148024 0.000713267
+4 0.21 0.0456075 0.00499287
+5 0.27 0.0691589 0.0156919
+6 0.33 0.173075 0.0556348
+7 0.39 0.334395 0.163338
+8 0.45 0.444336 0.35378
+9 0.51 0.585821 0.676177
+10 0.57 0.734768 1.18117
+11 0.63 0.905765 1.94151
+12 0.69 1.04422 2.99287
+13 0.75 1.10639 4.30884
+14 0.81 1.15738 5.91441
+15 0.87 1.13969 7.73823
+16 0.93 1.12615 9.79743
+17 0.99 1.05407 11.9815
+18 1.05 0.98176 14.2696
+19 1.11 0.964781 16.7825
+20 1.17 0.950222 19.5321
+21 1.23 0.941873 22.5442
+22 1.29 0.989127 26.0235
+23 1.35 0.986861 29.8252
+24 1.41 0.996497 34.0128
+25 1.47 0.974757 38.465
+26 1.53 1.01961 43.51
+27 1.59 1.02634 48.9943
+28 1.65 1.01132 54.8138
+29 1.71 1.00381 61.0178
+30 1.77 1.01037 67.7083
+31 1.83 0.997915 74.7718
+32 1.89 1.00113 82.3302
+33 1.95 0.999582 90.3638
+34 2.01 0.980811 98.7389
+35 2.07 1.00047 107.8
+36 2.13 1.00329 117.42
+37 2.19 1.00748 127.633
+38 2.25 0.987728 138.201
+39 2.31 1.00299 149.513
+40 2.37 1.00686 161.466
+41 2.43 0.994792 173.881
+42 2.49 1.00502 187.051
+43 2.55 0.992536 200.691
+44 2.61 0.996078 215.032
+45 2.67 1.00067 230.109
+46 2.73 1.00698 245.971
+47 2.79 1.00268 262.466
+48 2.85 0.993938 279.529
+49 2.91 1.00578 297.53
+50 2.97 0.997006 316.117
+107000 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0.0296049 0.00142653
+4 0.21 0.06081 0.00713267
+5 0.27 0.0645483 0.0171184
+6 0.33 0.194709 0.0620542
+7 0.39 0.334395 0.169757
+8 0.45 0.399403 0.340942
+9 0.51 0.631184 0.688302
+10 0.57 0.828171 1.25749
+11 0.63 0.831843 1.95578
+12 0.69 1.01659 2.97932
+13 0.75 1.05122 4.22967
+14 0.81 1.15943 5.83809
+15 0.87 1.15708 7.68973
+16 0.93 1.12264 9.74251
+17 0.99 1.11948 12.0621
+18 1.05 1.00441 14.403
+19 1.11 0.960399 16.9044
+20 1.17 0.943567 19.6348
+21 1.23 0.941204 22.6448
+22 1.29 0.963374 26.0335
+23 1.35 0.986305 29.8331
+24 1.41 0.984107 33.9686
+25 1.47 1.0227 38.6398
+26 1.53 1.00894 43.632
+27 1.59 1.01219 49.0407
+28 1.65 1.00934 54.8488
+29 1.71 1.0255 61.1869
+30 1.77 0.996587 67.786
+31 1.83 0.998016 74.8502
+32 1.89 0.993478 82.3509
+33 1.95 0.993636 90.3367
+34 2.01 0.995429 98.8367
+35 2.07 0.996608 107.862
+36 2.13 0.99273 117.382
+37 2.19 0.999314 127.511
+38 2.25 1.00179 138.23
+39 2.31 1.00855 149.605
+40 2.37 1.00133 161.492
+41 2.43 1.00022 173.975
+42 2.49 1.00246 187.111
+43 2.55 1.00587 200.935
+44 2.61 0.989192 215.177
+45 2.67 1.01525 230.474
+46 2.73 0.99344 246.122
+47 2.79 0.996219 262.511
+48 2.85 0.991279 279.529
+49 2.91 0.996178 297.357
+50 2.97 1.01265 316.236
+107050 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0.0148024 0.000713267
+4 0.21 0.0228037 0.00285307
+5 0.27 0.133707 0.0235378
+6 0.33 0.182346 0.0656205
+7 0.39 0.327751 0.171184
+8 0.45 0.46597 0.370899
+9 0.51 0.598782 0.700428
+10 0.57 0.784583 1.23966
+11 0.63 0.856484 1.95863
+12 0.69 1.04847 3.01427
+13 0.75 1.08541 4.30528
+14 0.81 1.13218 5.87589
+15 0.87 1.14816 7.71327
+16 0.93 1.14137 9.80029
+17 0.99 1.07232 12.0221
+18 1.05 0.999204 14.3509
+19 1.11 0.946981 16.8174
+20 1.17 0.93913 19.535
+21 1.23 0.964177 22.6184
+22 1.29 0.974527 26.0464
+23 1.35 0.997229 29.888
+24 1.41 0.985634 34.03
+25 1.47 0.997713 38.587
+26 1.53 1.00418 43.5556
+27 1.59 1.02314 49.0228
+28 1.65 1.01169 54.8445
+29 1.71 0.995614 60.9979
+30 1.77 1.00402 67.6462
+31 1.83 1.00779 74.7796
+32 1.89 0.995745 82.2974
+33 1.95 0.987512 90.234
+34 2.01 1.00019 98.7746
+35 2.07 1.00283 107.857
+36 2.13 0.994738 117.395
+37 2.19 1.01522 127.686
+38 2.25 0.989461 138.273
+39 2.31 1.00647 149.624
+40 2.37 1.0044 161.548
+41 2.43 0.992791 173.938
+42 2.49 0.996799 187
+43 2.55 1.00805 200.854
+44 2.61 0.994542 215.173
+45 2.67 0.999439 230.231
+46 2.73 0.999191 245.97
+47 2.79 1.00558 262.514
+48 2.85 1.00108 279.699
+49 2.91 0.998569 297.571
+50 2.97 1.00523 316.311
+107100 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0.030405 0.00285307
+5 0.27 0.142928 0.0249643
+6 0.33 0.182346 0.0670471
+7 0.39 0.294533 0.161912
+8 0.45 0.437679 0.349501
+9 0.51 0.619519 0.690442
+10 0.57 0.736844 1.19686
+11 0.63 0.918511 1.9679
+12 0.69 1.0173 2.99215
+13 0.75 1.098 4.29815
+14 0.81 1.12036 5.85235
+15 0.87 1.16644 7.71897
+16 0.93 1.15346 9.8281
+17 0.99 1.07782 12.0613
+18 1.05 1.01451 14.4258
+19 1.11 0.926168 16.8381
+20 1.17 0.938391 19.5535
+21 1.23 0.943212 22.5699
+22 1.29 0.971485 25.9872
+23 1.35 0.98612 29.786
+24 1.41 1.00244 33.9986
+25 1.47 1.02364 38.674
+26 1.53 0.999137 43.6177
+27 1.59 1.01379 49.035
+28 1.65 1.03078 54.9665
+29 1.71 0.995844 61.1213
+30 1.77 0.995833 67.7154
+31 1.83 1.0095 74.8609
+32 1.89 0.990927 82.3424
+33 1.95 0.992393 90.3181
+34 2.01 1.00587 98.9073
+35 2.07 1.00315 107.992
+36 2.13 1.00404 117.62
+37 2.19 0.990307 127.658
+38 2.25 0.991128 138.263
+39 2.31 0.997358 149.511
+40 2.37 1.00891 161.489
+41 2.43 1.00719 174.058
+42 2.49 0.997833 187.134
+43 2.55 0.998608 200.858
+44 2.61 0.998605 215.235
+45 2.67 0.998918 230.286
+46 2.73 1.00571 246.128
+47 2.79 1.00155 262.605
+48 2.85 1.00624 279.879
+49 2.91 0.996736 297.718
+50 2.97 1.00175 316.393
+107150 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0.0148024 0.000713267
+4 0.21 0.0380062 0.0042796
+5 0.27 0.0968224 0.0192582
+6 0.33 0.207071 0.0670471
+7 0.39 0.314464 0.168331
+8 0.45 0.406059 0.342368
+9 0.51 0.622111 0.684736
+10 0.57 0.807415 1.23966
+11 0.63 0.847987 1.9515
+12 0.69 1.02439 2.98288
+13 0.75 1.11059 4.30385
+14 0.81 1.13578 5.87946
+15 0.87 1.16465 7.74322
+16 0.93 1.13162 9.81241
+17 0.99 1.04443 11.9765
+18 1.05 1.00318 14.3146
+19 1.11 0.958482 16.811
+20 1.17 0.936912 19.5221
+21 1.23 0.945665 22.5464
+22 1.29 0.981421 25.9986
+23 1.35 0.971864 29.7425
+24 1.41 0.999043 33.9408
+25 1.47 1.03019 38.6462
+26 1.53 1.00692 43.6284
+27 1.59 0.997643 48.9593
+28 1.65 1.00673 54.7525
+29 1.71 1.00138 60.9415
+30 1.77 1.02255 67.7126
+31 1.83 0.989249 74.7147
+32 1.89 1.0033 82.2896
+33 1.95 1.00633 90.3773
+34 2.01 0.996432 98.8859
+35 2.07 0.998341 107.927
+36 2.13 1.00352 117.55
+37 2.19 0.991855 127.604
+38 2.25 0.989128 138.188
+39 2.31 1.015 149.635
+40 2.37 1.00506 161.566
+41 2.43 0.997764 174.019
+42 2.49 0.994731 187.053
+43 2.55 0.993158 200.703
+44 2.61 1.005 215.172
+45 2.67 0.998776 230.22
+46 2.73 0.996157 245.912
+47 2.79 1.0074 262.485
+48 2.85 0.997179 279.603
+49 2.91 0.994743 297.407
+50 2.97 1.00401 316.124
+107200 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0.0148024 0.000713267
+4 0.21 0.06081 0.0064194
+5 0.27 0.115265 0.0242511
+6 0.33 0.20089 0.0706134
+7 0.39 0.254672 0.152639
+8 0.45 0.434351 0.338802
+9 0.51 0.623407 0.681883
+10 0.57 0.804302 1.23466
+11 0.63 0.888772 1.98074
+12 0.69 0.989675 2.97718
+13 0.75 1.0884 4.27175
+14 0.81 1.1327 5.84308
+15 0.87 1.13746 7.66334
+16 0.93 1.14605 9.75892
+17 0.99 1.08849 12.0143
+18 1.05 1.00349 14.3531
+19 1.11 0.972997 16.8873
+20 1.17 0.955892 19.6534
+21 1.23 0.938082 22.6534
+22 1.29 0.976555 26.0884
+23 1.35 0.972234 29.8338
+24 1.41 0.966794 33.8966
+25 1.47 1.0013 38.47
+26 1.53 1.01326 43.4836
+27 1.59 1.03141 48.995
+28 1.65 1.00983 54.806
+29 1.71 1.01246 61.0635
+30 1.77 1.03924 67.9451
+31 1.83 0.975443 74.8495
+32 1.89 0.990833 82.3302
+33 1.95 0.98485 90.2454
+34 2.01 0.989749 98.6969
+35 2.07 0.991725 107.678
+36 2.13 0.998085 117.249
+37 2.19 1.00783 127.465
+38 2.25 1.01219 138.295
+39 2.31 0.996473 149.534
+40 2.37 1.00278 161.438
+41 2.43 1.00668 174.001
+42 2.49 1.00556 187.178
+43 2.55 0.992432 200.817
+44 2.61 1.00118 215.232
+45 2.67 1.00275 230.34
+46 2.73 1.00616 246.189
+47 2.79 1.00389 262.705
+48 2.85 0.987914 279.664
+49 2.91 0.999765 297.557
+50 2.97 0.99934 316.188
+107250 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0.030405 0.00285307
+5 0.27 0.0968224 0.0178317
+6 0.33 0.197799 0.0634807
+7 0.39 0.294533 0.158345
+8 0.45 0.470962 0.3602
+9 0.51 0.598782 0.689729
+10 0.57 0.723353 1.18688
+11 0.63 0.963544 1.99572
+12 0.69 0.996759 2.99929
+13 0.75 1.08601 4.29101
+14 0.81 1.14298 5.8766
+15 0.87 1.14504 7.70899
+16 0.93 1.1324 9.7796
+17 0.99 1.07404 12.005
+18 1.05 1.01206 14.3638
+19 1.11 0.954922 16.8509
+20 1.17 0.929517 19.5407
+21 1.23 0.959939 22.6106
+22 1.29 0.950194 25.9529
+23 1.35 0.996859 29.7932
+24 1.41 1.00329 34.0093
+25 1.47 0.997245 38.5642
+26 1.53 0.990056 43.4629
+27 1.59 1.0174 48.8994
+28 1.65 1.03264 54.8417
+29 1.71 1.00635 61.0613
+30 1.77 1.01555 67.786
+31 1.83 1.00084 74.8702
+32 1.89 0.99036 82.3474
+33 1.95 0.993813 90.3345
+34 2.01 0.976885 98.6762
+35 2.07 1.01331 107.853
+36 2.13 0.98782 117.325
+37 2.19 1.01705 127.635
+38 2.25 1.00253 138.362
+39 2.31 1.00141 149.655
+40 2.37 0.989378 161.401
+41 2.43 0.997478 173.85
+42 2.49 1.00023 186.956
+43 2.55 0.998297 200.676
+44 2.61 1.0044 215.137
+45 2.67 1.00938 230.345
+46 2.73 1.00684 246.205
+47 2.79 0.99778 262.62
+48 2.85 0.99693 279.734
+49 2.91 0.993149 297.509
+50 2.97 1.00493 316.243
+107300 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0.0148024 0.000713267
+4 0.21 0.06081 0.0064194
+5 0.27 0.0691589 0.0171184
+6 0.33 0.166893 0.0556348
+7 0.39 0.31225 0.156205
+8 0.45 0.482612 0.363053
+9 0.51 0.585821 0.685449
+10 0.57 0.765903 1.21184
+11 0.63 0.898118 1.96576
+12 0.69 0.992508 2.96505
+13 0.75 1.13698 4.3174
+14 0.81 1.14966 5.91227
+15 0.87 1.18426 7.80742
+16 0.93 1.1242 9.86305
+17 0.99 1.03479 12.0071
+18 1.05 0.983596 14.2996
+19 1.11 0.966698 16.8174
+20 1.17 0.949729 19.5656
+21 1.23 0.982466 22.7076
+22 1.29 0.95648 26.072
+23 1.35 0.978714 29.8424
+24 1.41 1.00447 34.0635
+25 1.47 0.996776 38.6163
+26 1.53 1.00144 43.5713
+27 1.59 1.00886 48.9622
+28 1.65 1.0014 54.7247
+29 1.71 1.021 61.035
+30 1.77 1.01134 67.7318
+31 1.83 0.997713 74.7939
+32 1.89 0.997351 82.3238
+33 1.95 1.00366 90.3902
+34 2.01 0.990919 98.8516
+35 2.07 1.00945 107.994
+36 2.13 0.994292 117.528
+37 2.19 0.984959 127.512
+38 2.25 0.99806 138.191
+39 2.31 1.0009 149.479
+40 2.37 1.00662 161.429
+41 2.43 1.00514 173.974
+42 2.49 1.00436 187.135
+43 2.55 1.00707 200.975
+44 2.61 1.0042 215.433
+45 2.67 0.997688 230.465
+46 2.73 0.997561 246.178
+47 2.79 0.991884 262.496
+48 2.85 0.995268 279.582
+49 2.91 1.00674 297.6
+50 2.97 1.00389 316.315
+107350 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0.0296049 0.00142653
+4 0.21 0.0760125 0.0085592
+5 0.27 0.0922118 0.0228245
+6 0.33 0.197799 0.0684736
+7 0.39 0.321108 0.171897
+8 0.45 0.472627 0.374465
+9 0.51 0.592302 0.700428
+10 0.57 0.72439 1.19829
+11 0.63 0.932106 1.98074
+12 0.69 1.01022 2.99786
+13 0.75 1.0938 4.29886
+14 0.81 1.17074 5.92297
+15 0.87 1.17223 7.79886
+16 0.93 1.07583 9.76605
+17 0.99 1.07954 12.0029
+18 1.05 1.03532 14.4158
+19 1.11 0.949993 16.8902
+20 1.17 0.940363 19.6113
+21 1.23 0.955702 22.6676
+22 1.29 0.955872 26.03
+23 1.35 0.97964 29.8039
+24 1.41 1.00889 34.0435
+25 1.47 0.989905 38.5649
+26 1.53 1.00317 43.5285
+27 1.59 1.01713 48.9636
+28 1.65 1.02756 54.8766
+29 1.71 1.00692 61.0999
+30 1.77 1.01511 67.8217
+31 1.83 0.99469 74.8623
+32 1.89 0.995273 82.3766
+33 1.95 1.00118 90.423
+34 2.01 0.990083 98.8773
+35 2.07 0.993537 107.875
+36 2.13 0.992878 117.396
+37 2.19 0.997766 127.51
+38 2.25 1.00459 138.259
+39 2.31 1.00413 149.583
+40 2.37 0.998331 161.435
+41 2.43 1.00411 173.966
+42 2.49 1.00442 187.128
+43 2.55 0.997829 200.842
+44 2.61 0.994542 215.16
+45 2.67 1.00105 230.243
+46 2.73 1.00173 246.022
+47 2.79 1.00519 262.559
+48 2.85 0.997678 279.686
+49 2.91 0.99833 297.553
+50 2.97 1.00466 316.283
+107400 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0.0148024 0.000713267
+4 0.21 0.0380062 0.0042796
+5 0.27 0.119875 0.0228245
+6 0.33 0.163803 0.0606277
+7 0.39 0.325537 0.165478
+8 0.45 0.396074 0.335235
+9 0.51 0.63248 0.68331
+10 0.57 0.784583 1.22254
+11 0.63 0.872628 1.95506
+12 0.69 1.02439 2.98645
+13 0.75 1.0956 4.28959
+14 0.81 1.13784 5.86805
+15 0.87 1.19273 7.77675
+16 0.93 1.15151 9.88231
+17 0.99 1.05476 12.0678
+18 1.05 0.973191 14.3359
+19 1.11 0.961769 16.8409
+20 1.17 0.926559 19.5221
+21 1.23 0.964177 22.6056
+22 1.29 0.964794 25.9993
+23 1.35 0.981306 29.7796
+24 1.41 1.01025 34.025
+25 1.47 0.993653 38.5635
+26 1.53 1.03446 43.6819
+27 1.59 1.02234 49.1448
+28 1.65 1.01417 54.9807
+29 1.71 1.00612 61.199
+30 1.77 1.00057 67.8245
+31 1.83 1.00104 74.9101
+32 1.89 0.981385 82.3195
+33 1.95 0.982453 90.2154
+34 2.01 0.999439 98.7496
+35 2.07 1.00031 107.809
+36 2.13 1.01333 117.526
+37 2.19 1.00227 127.685
+38 2.25 1.00726 138.463
+39 2.31 0.987113 149.596
+40 2.37 1.01329 161.625
+41 2.43 0.99622 174.058
+42 2.49 0.9962 187.112
+43 2.55 1.00535 200.929
+44 2.61 0.991817 215.208
+45 2.67 0.990208 230.128
+46 2.73 0.999055 245.864
+47 2.79 0.995309 262.239
+48 2.85 1.00919 279.563
+49 2.91 1.01256 297.685
+50 2.97 1.00106 316.348
+107450 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0.0296049 0.00142653
+4 0.21 0.030405 0.0042796
+5 0.27 0.0737695 0.0156919
+6 0.33 0.197799 0.0613409
+7 0.39 0.296748 0.156919
+8 0.45 0.459313 0.35378
+9 0.51 0.613039 0.691155
+10 0.57 0.769016 1.21969
+11 0.63 0.896419 1.97218
+12 0.69 1.02085 3
+13 0.75 1.08181 4.28673
+14 0.81 1.14452 5.87447
+15 0.87 1.15797 7.72753
+16 0.93 1.13825 9.80884
+17 0.99 1.0551 11.995
+18 1.05 0.986351 14.2939
+19 1.11 0.965876 16.8096
+20 1.17 0.971174 19.6198
+21 1.23 0.977559 22.7461
+22 1.29 0.951816 26.0942
+23 1.35 0.985195 29.8894
+24 1.41 0.972565 33.9765
+25 1.47 0.984596 38.4736
+26 1.53 1.01586 43.5
+27 1.59 1.00926 48.893
+28 1.65 1.02 54.7625
+29 1.71 1.0135 61.0264
+30 1.77 1.01824 67.7689
+31 1.83 0.999426 74.8431
+32 1.89 0.997918 82.3773
+33 1.95 1.00136 90.4251
+34 2.01 0.978305 98.7789
+35 2.07 0.994797 107.788
+36 2.13 1.00664 117.441
+37 2.19 1.00712 127.65
+38 2.25 0.987528 138.216
+39 2.31 0.997485 149.466
+40 2.37 1.00969 161.452
+41 2.43 0.99965 173.928
+42 2.49 1.00099 187.045
+43 2.55 1.00613 200.872
+44 2.61 1.01178 215.439
+45 2.67 1.00682 230.609
+46 2.73 0.992037 246.235
+47 2.79 0.993011 262.572
+48 2.85 0.986335 279.504
+49 2.91 1.00634 297.515
+50 2.97 1.00259 316.206
+107500 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0.0444073 0.0021398
+4 0.21 0.0380062 0.00570613
+5 0.27 0.119875 0.0242511
+6 0.33 0.176165 0.0649073
+7 0.39 0.314464 0.166191
+8 0.45 0.450992 0.359486
+9 0.51 0.597486 0.688302
+10 0.57 0.760714 1.21113
+11 0.63 0.923609 1.98645
+12 0.69 1.01872 3.01213
+13 0.75 1.08661 4.30456
+14 0.81 1.13732 5.88231
+15 0.87 1.129 7.68902
+16 0.93 1.13474 9.76391
+17 0.99 1.10364 12.0506
+18 1.05 0.991859 14.3623
+19 1.11 0.957387 16.8559
+20 1.17 0.930503 19.5485
+21 1.23 0.948564 22.582
+22 1.29 0.957291 25.9494
+23 1.35 1.00093 29.8053
+24 1.41 0.991914 33.9736
+25 1.47 1.00755 38.5756
+26 1.53 0.998849 43.5178
+27 1.59 1.01032 48.9165
+28 1.65 1.01876 54.7789
+29 1.71 1.02377 61.1063
+30 1.77 1.00348 67.7511
+31 1.83 1.00154 74.8402
+32 1.89 0.984692 82.2746
+33 1.95 0.995322 90.2739
+34 2.01 0.986491 98.6976
+35 2.07 1.00228 107.775
+36 2.13 1.00731 117.434
+37 2.19 1.00241 127.595
+38 2.25 0.99886 138.282
+39 2.31 1.00122 149.574
+40 2.37 0.996047 161.399
+41 2.43 0.997535 173.848
+42 2.49 0.994513 186.88
+43 2.55 1.01112 200.776
+44 2.61 0.998109 215.146
+45 2.67 1.0001 230.215
+46 2.73 0.999418 245.957
+47 2.79 1.00745 262.531
+48 2.85 1.00212 279.735
+49 2.91 1.0004 297.639
+50 2.97 0.993754 316.165
+107550 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0.0148024 0.000713267
+4 0.21 0.06081 0.0064194
+5 0.27 0.15676 0.0306705
+6 0.33 0.191618 0.074893
+7 0.39 0.26353 0.159772
+8 0.45 0.489268 0.369472
+9 0.51 0.613039 0.706847
+10 0.57 0.739957 1.21541
+11 0.63 0.903216 1.97361
+12 0.69 1.00526 2.98573
+13 0.75 1.0968 4.2903
+14 0.81 1.17743 5.92368
+15 0.87 1.12677 7.72682
+16 0.93 1.1242 9.78245
+17 0.99 1.06337 11.9857
+18 1.05 0.99645 14.3081
+19 1.11 0.988058 16.8816
+20 1.17 0.959589 19.6583
+21 1.23 0.937636 22.6569
+22 1.29 0.958508 26.0285
+23 1.35 0.969642 29.7639
+24 1.41 0.992424 33.9344
+25 1.47 1.01208 38.5571
+26 1.53 1.00375 43.5235
+27 1.59 1.03462 49.0521
+28 1.65 1.01169 54.8738
+29 1.71 1.00773 61.102
+30 1.77 1.01231 67.8053
+31 1.83 1.00779 74.9387
+32 1.89 0.981291 82.3474
+33 1.95 1.00393 90.4158
+34 2.01 0.990417 98.873
+35 2.07 0.988181 107.822
+36 2.13 0.994069 117.354
+37 2.19 0.998892 127.48
+38 2.25 1.00559 138.24
+39 2.31 1.00216 149.542
+40 2.37 1.005 161.473
+41 2.43 0.996906 173.914
+42 2.49 1.00562 187.092
+43 2.55 0.998764 200.818
+44 2.61 1.00371 215.269
+45 2.67 1.00185 230.364
+46 2.73 1.00082 246.128
+47 2.79 0.981955 262.283
+48 2.85 1.00121 279.471
+49 2.91 0.994982 297.278
+50 2.97 1.00171 315.953
+107600 50
+1 0.03 0 0
+2 0.09 0.040178 0.000713267
+3 0.15 0 0.000713267
+4 0.21 0.0532087 0.00570613
+5 0.27 0.106044 0.0221113
+6 0.33 0.188528 0.0656205
+7 0.39 0.290104 0.159058
+8 0.45 0.436015 0.345934
+9 0.51 0.600078 0.676177
+10 0.57 0.73892 1.18402
+11 0.63 0.89472 1.93509
+12 0.69 1.04706 2.9893
+13 0.75 1.1052 4.30385
+14 0.81 1.13218 5.87447
+15 0.87 1.16688 7.7418
+16 0.93 1.13396 9.81526
+17 0.99 1.06853 12.0292
+18 1.05 0.994614 14.3474
+19 1.11 0.956018 16.8374
+20 1.17 0.947018 19.5777
+21 1.23 0.931837 22.5578
+22 1.29 0.977568 25.9964
+23 1.35 0.968346 29.7268
+24 1.41 1.01126 33.9765
+25 1.47 1.00833 38.582
+26 1.53 1.01716 43.6148
+27 1.59 0.994973 48.9315
+28 1.65 1.03066 54.8623
+29 1.71 1.01512 61.1362
+30 1.77 1.00844 67.8138
+31 1.83 0.982699 74.7696
+32 1.89 0.995462 82.2853
+33 1.95 0.992748 90.2639
+34 2.01 1.00036 98.806
+35 2.07 0.990465 107.776
+36 2.13 1.00902 117.451
+37 2.19 1.00677 127.657
+38 2.25 0.993061 138.282
+39 2.31 1.00324 149.597
+40 2.37 1.0065 161.546
+41 2.43 0.998049 174.001
+42 2.49 1.00322 187.148
+43 2.55 1.00125 200.908
+44 2.61 1.00242 215.34
+45 2.67 0.996409 230.353
+46 2.73 0.99181 245.976
+47 2.79 1.00411 262.495
+48 2.85 0.996431 279.601
+49 2.91 0.995979 297.426
+50 2.97 1.01373 316.325
+107650 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0.0148024 0.000713267
+4 0.21 0.0380062 0.0042796
+5 0.27 0.124486 0.0235378
+6 0.33 0.231796 0.0770328
+7 0.39 0.272388 0.164765
+8 0.45 0.462642 0.363053
+9 0.51 0.59619 0.691155
+10 0.57 0.765903 1.21755
+11 0.63 0.887072 1.9622
+12 0.69 1.02085 2.99001
+13 0.75 1.11299 4.31384
+14 0.81 1.14401 5.90086
+15 0.87 1.15618 7.75107
+16 0.93 1.10782 9.77675
+17 0.99 1.08712 12.0292
+18 1.05 1.00165 14.3638
+19 1.11 0.928906 16.7832
+20 1.17 0.965505 19.577
+21 1.23 0.961054 22.6505
+22 1.29 0.966822 26.0514
+23 1.35 0.96779 29.7796
+24 1.41 1.00787 34.015
+25 1.47 0.986313 38.52
+26 1.53 1.01672 43.5506
+27 1.59 1.01393 48.9686
+28 1.65 1.02148 54.8466
+29 1.71 1.00612 61.0649
+30 1.77 1.00283 67.7054
+31 1.83 1.01132 74.8638
+32 1.89 0.993478 82.3645
+33 1.95 0.986536 90.2932
+34 2.01 0.977888 98.6434
+35 2.07 1.01386 107.825
+36 2.13 1.01036 117.514
+37 2.19 0.992277 127.572
+38 2.25 0.991061 138.176
+39 2.31 0.994133 149.388
+40 2.37 1.00386 161.305
+41 2.43 1.00777 173.882
+42 2.49 0.996255 186.937
+43 2.55 1.02087 200.967
+44 2.61 0.984832 215.146
+45 2.67 1.0073 230.323
+46 2.73 1.00191 246.105
+47 2.79 0.99817 262.526
+48 2.85 0.994479 279.598
+49 2.91 1.00566 297.597
+50 2.97 0.990923 316.071
+107700 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0.0148024 0.000713267
+4 0.21 0.0456075 0.00499287
+5 0.27 0.0968224 0.0199715
+6 0.33 0.210162 0.0684736
+7 0.39 0.248028 0.148359
+8 0.45 0.467634 0.348787
+9 0.51 0.670066 0.717546
+10 0.57 0.758638 1.23894
+11 0.63 0.899818 1.99429
+12 0.69 1.00668 3.00785
+13 0.75 1.07221 4.28317
+14 0.81 1.13475 5.85735
+15 0.87 1.16644 7.72397
+16 0.93 1.13786 9.80456
+17 0.99 1.0675 12.0164
+18 1.05 0.978088 14.296
+19 1.11 0.989154 16.8723
+20 1.17 0.929024 19.5606
+21 1.23 0.960162 22.6312
+22 1.29 0.970066 26.0435
+23 1.35 0.982602 29.8288
+24 1.41 0.981221 33.9522
+25 1.47 1.02004 38.6113
+26 1.53 0.993804 43.5285
+27 1.59 1.0234 48.9971
+28 1.65 1.01268 54.8245
+29 1.71 0.997345 60.9886
+30 1.77 1.02481 67.7746
+31 1.83 1.01767 74.9779
+32 1.89 0.992722 82.4729
+33 1.95 0.987334 90.408
+34 2.01 0.987577 98.8409
+35 2.07 1.00732 107.964
+36 2.13 0.996077 117.515
+37 2.19 0.987704 127.527
+38 2.25 1.00726 138.305
+39 2.31 1.00033 149.586
+40 2.37 1.00206 161.482
+41 2.43 1.00748 174.056
+42 2.49 1.00529 187.229
+43 2.55 0.993885 200.888
+44 2.61 0.999794 215.282
+45 2.67 0.998492 230.327
+46 2.73 1.00186 246.108
+47 2.79 0.998994 262.543
+48 2.85 1.00482 279.792
+49 2.91 0.999406 297.679
+50 2.97 0.992951 316.19
+107750 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0.030405 0.00285307
+5 0.27 0.0922118 0.0171184
+6 0.33 0.203981 0.064194
+7 0.39 0.292319 0.158345
+8 0.45 0.449328 0.350927
+9 0.51 0.623407 0.694009
+10 0.57 0.71505 1.18545
+11 0.63 0.89387 1.93581
+12 0.69 1.03997 2.98288
+13 0.75 1.11719 4.3117
+14 0.81 1.14658 5.90228
+15 0.87 1.14905 7.74108
+16 0.93 1.1402 9.82596
+17 0.99 1.0675 12.0378
+18 1.05 0.985126 14.3338
+19 1.11 0.954648 16.8203
+20 1.17 0.959343 19.5963
+21 1.23 0.937636 22.5949
+22 1.29 0.973919 26.0207
+23 1.35 0.976307 29.7817
+24 1.41 0.983598 33.9151
+25 1.47 1.01895 38.5692
+26 1.53 1.01254 43.5792
+27 1.59 1.01433 48.9993
+28 1.65 0.999917 54.7532
+29 1.71 1.0232 61.077
+30 1.77 1.00456 67.729
+31 1.83 0.987334 74.7175
+32 1.89 1.00888 82.3345
+33 1.95 0.983785 90.2411
+34 2.01 1.00345 98.8096
+35 2.07 0.998341 107.851
+36 2.13 0.997267 117.414
+37 2.19 1.00628 127.614
+38 2.25 1.00166 138.332
+39 2.31 0.983255 149.421
+40 2.37 0.999893 161.291
+41 2.43 1.00971 173.892
+42 2.49 0.998269 186.974
+43 2.55 1.00063 200.725
+44 2.61 1.0104 215.272
+45 2.67 0.994516 230.257
+46 2.73 0.995161 245.932
+47 2.79 1.00181 262.414
+48 2.85 0.992152 279.446
+49 2.91 1.00196 297.378
+50 2.97 1.00485 316.111
+107800 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0.0148024 0.000713267
+4 0.21 0.0228037 0.00285307
+5 0.27 0.119875 0.021398
+6 0.33 0.142168 0.0542083
+7 0.39 0.292319 0.148359
+8 0.45 0.436015 0.335235
+9 0.51 0.667473 0.702568
+10 0.57 0.733731 1.20685
+11 0.63 0.916811 1.97646
+12 0.69 1.00243 2.98573
+13 0.75 1.0884 4.28031
+14 0.81 1.13218 5.85093
+15 0.87 1.17892 7.73752
+16 0.93 1.12615 9.79672
+17 0.99 1.06302 11.9993
+18 1.05 1.00992 14.3531
+19 1.11 0.939313 16.7996
+20 1.17 0.928285 19.4857
+21 1.23 0.972429 22.5956
+22 1.29 0.982435 26.0514
+23 1.35 0.978159 29.8195
+24 1.41 0.977827 33.9287
+25 1.47 1.00989 38.5414
+26 1.53 1.00735 43.5257
+27 1.59 1.02634 49.01
+28 1.65 1.01665 54.8602
+29 1.71 1.00912 61.097
+30 1.77 0.996803 67.6976
+31 1.83 0.996101 74.7482
+32 1.89 0.990171 82.224
+33 1.95 1.00491 90.3003
+34 2.01 1.00019 98.8409
+35 2.07 0.992277 107.827
+36 2.13 0.989308 117.314
+37 2.19 1.00079 127.459
+38 2.25 1.00599 138.223
+39 2.31 1.00539 149.561
+40 2.37 1.00512 161.494
+41 2.43 1.00611 174.05
+42 2.49 1.00137 187.172
+43 2.55 0.999594 200.909
+44 2.61 1.00138 215.327
+45 2.67 0.994752 230.315
+46 2.73 1.00023 246.07
+47 2.79 0.995525 262.448
+48 2.85 1.00295 279.665
+49 2.91 0.990917 297.4
+50 2.97 1.00416 316.121
+107850 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0.0444073 0.0021398
+4 0.21 0.0532087 0.00713267
+5 0.27 0.110654 0.0242511
+6 0.33 0.145259 0.0577746
+7 0.39 0.292319 0.151926
+8 0.45 0.450992 0.345221
+9 0.51 0.654513 0.705421
+10 0.57 0.775243 1.23823
+11 0.63 0.86753 1.96648
+12 0.69 0.993925 2.96719
+13 0.75 1.04823 4.21398
+14 0.81 1.16869 5.83524
+15 0.87 1.15975 7.69116
+16 0.93 1.16633 9.82382
+17 0.99 1.06681 12.0342
+18 1.05 1.01022 14.3887
+19 1.11 0.92918 16.8088
+20 1.17 0.959589 19.5856
+21 1.23 0.961946 22.6619
+22 1.29 0.962766 26.0485
+23 1.35 0.971678 29.7917
+24 1.41 1.00566 34.0178
+25 1.47 1.01911 38.6726
+26 1.53 0.998561 43.6134
+27 1.59 1.02047 49.0663
+28 1.65 1.00611 54.8559
+29 1.71 1.00265 61.0528
+30 1.77 0.998418 67.6641
+31 1.83 1.01283 74.8331
+32 1.89 0.97704 82.2097
+33 1.95 1.00491 90.286
+34 2.01 0.98858 98.7275
+35 2.07 1.00574 107.836
+36 2.13 0.998606 117.412
+37 2.19 1.00853 127.635
+38 2.25 0.989661 138.224
+39 2.31 1.01146 149.631
+40 2.37 0.998571 161.486
+41 2.43 1.00719 174.056
+42 2.49 0.996962 187.12
+43 2.55 0.999905 200.862
+44 2.61 0.995335 215.192
+45 2.67 0.987367 230.068
+46 2.73 1.00105 245.837
+47 2.79 1.00485 262.368
+48 2.85 1.00358 279.596
+49 2.91 1.00714 297.621
+50 2.97 0.999225 316.25
+107900 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0.0148024 0.000713267
+4 0.21 0.06081 0.0064194
+5 0.27 0.124486 0.0256776
+6 0.33 0.169984 0.0649073
+7 0.39 0.290104 0.158345
+8 0.45 0.474291 0.361626
+9 0.51 0.637664 0.712553
+10 0.57 0.71505 1.20399
+11 0.63 0.912563 1.97004
+12 0.69 1.02297 3
+13 0.75 1.06322 4.26462
+14 0.81 1.13938 5.84522
+15 0.87 1.14905 7.68402
+16 0.93 1.11523 9.72325
+17 0.99 1.08368 11.9686
+18 1.05 1.01604 14.3367
+19 1.11 0.96259 16.8438
+20 1.17 0.950222 19.5934
+21 1.23 0.958601 22.6591
+22 1.29 0.964997 26.0535
+23 1.35 0.976492 29.8153
+24 1.41 0.991405 33.9815
+25 1.47 0.997401 38.5371
+26 1.53 1.02105 43.5892
+27 1.59 1.0198 49.0385
+28 1.65 1.01702 54.8909
+29 1.71 1.00496 61.102
+30 1.77 0.988293 67.6462
+31 1.83 1.00769 74.7789
+32 1.89 1.00255 82.3481
+33 1.95 0.98414 90.2575
+34 2.01 1.00136 98.8081
+35 2.07 0.998735 107.853
+36 2.13 1.00552 117.495
+37 2.19 0.991363 127.544
+38 2.25 0.997394 138.216
+39 2.31 1.00179 149.514
+40 2.37 1.00638 161.461
+41 2.43 1.00594 174.016
+42 2.49 1.00915 187.24
+43 2.55 0.99238 200.878
+44 2.61 0.995335 215.208
+45 2.67 0.999913 230.274
+46 2.73 0.999418 246.016
+47 2.79 1.00229 262.506
+48 2.85 0.999423 279.663
+49 2.91 0.990997 297.399
+50 2.97 0.997504 315.995
+107950 50
+1 0.03 0 0
+2 0.09 0.040178 0.000713267
+3 0.15 0.0296049 0.0021398
+4 0.21 0.0760125 0.00927247
+5 0.27 0.0829907 0.0221113
+6 0.33 0.188528 0.0656205
+7 0.39 0.318893 0.168331
+8 0.45 0.494261 0.380171
+9 0.51 0.539163 0.67689
+10 0.57 0.780432 1.21327
+11 0.63 0.899818 1.96862
+12 0.69 1.01376 2.9893
+13 0.75 1.104 4.30243
+14 0.81 1.13887 5.88231
+15 0.87 1.15084 7.72397
+16 0.93 1.12186 9.77532
+17 0.99 1.06405 11.98
+18 1.05 1.00685 14.3267
+19 1.11 0.960947 16.8295
+20 1.17 0.951208 19.582
+21 1.23 0.944327 22.602
+22 1.29 0.961347 25.9836
+23 1.35 0.986491 29.7839
+24 1.41 1.00583 34.0107
+25 1.47 0.991779 38.5407
+26 1.53 1.0271 43.6227
+27 1.59 1.02901 49.1213
+28 1.65 1.02644 55.0278
+29 1.71 0.98765 61.132
+30 1.77 1.0051 67.7874
+31 1.83 0.995698 74.8352
+32 1.89 0.998202 82.3716
+33 1.95 0.997541 90.3887
+34 2.01 0.992088 98.8602
+35 2.07 0.995742 107.878
+36 2.13 0.994961 117.419
+37 2.19 1.00171 127.573
+38 2.25 1.00686 138.346
+39 2.31 1.00223 149.649
+40 2.37 1.01095 161.65
+41 2.43 0.997878 174.104
+42 2.49 0.9876 187.046
+43 2.55 1.00956 200.92
+44 2.61 0.994394 215.237
+45 2.67 1.00195 230.333
+46 2.73 1.00693 246.194
+47 2.79 1.00216 262.681
+48 2.85 0.994562 279.755
+49 2.91 0.993747 297.54
+50 2.97 1.00171 316.215
+108000 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0.0296049 0.00142653
+4 0.21 0.0380062 0.00499287
+5 0.27 0.110654 0.0221113
+6 0.33 0.194709 0.0670471
+7 0.39 0.298962 0.163338
+8 0.45 0.436015 0.350214
+9 0.51 0.593598 0.67689
+10 0.57 0.725428 1.17546
+11 0.63 0.929557 1.95578
+12 0.69 1.01943 2.98217
+13 0.75 1.12438 4.31954
+14 0.81 1.1584 5.92653
+15 0.87 1.15396 7.77318
+16 0.93 1.11211 9.8067
+17 0.99 1.05614 11.995
+18 1.05 0.977476 14.2732
+19 1.11 0.983403 16.8345
+20 1.17 0.947511 19.5763
+21 1.23 0.927599 22.5428
+22 1.29 0.979799 25.9893
+23 1.35 0.988712 29.7981
+24 1.41 1.00719 34.0307
+25 1.47 0.997401 38.5863
+26 1.53 1.01226 43.5949
+27 1.59 1.00685 48.975
+28 1.65 1.02434 54.8695
+29 1.71 1.00069 61.0542
+30 1.77 1.00919 67.7368
+31 1.83 1.01091 74.8923
+32 1.89 0.986487 82.3402
+33 1.95 0.990707 90.3024
+34 2.01 0.987995 98.7389
+35 2.07 1.00346 107.827
+36 2.13 0.994217 117.36
+37 2.19 1.00171 127.514
+38 2.25 0.998327 138.196
+39 2.31 1.00115 149.487
+40 2.37 1.0038 161.404
+41 2.43 1.00525 173.949
+42 2.49 1.00698 187.145
+43 2.55 1.00686 200.982
+44 2.61 1.00291 215.422
+45 2.67 0.994752 230.409
+46 2.73 0.99652 246.106
+47 2.79 1.00099 262.574
+48 2.85 0.999049 279.725
+49 2.91 0.987928 297.406
+50 2.97 1.0011 316.069
+108050 50
+1 0.03 0 0
+2 0.09 0.040178 0.000713267
+3 0.15 0.0148024 0.00142653
+4 0.21 0.0760125 0.0085592
+5 0.27 0.0922118 0.0228245
+6 0.33 0.169984 0.0620542
+7 0.39 0.298962 0.158345
+8 0.45 0.411052 0.334522
+9 0.51 0.631184 0.681883
+10 0.57 0.793924 1.22753
+11 0.63 0.887922 1.9729
+12 0.69 0.976214 2.95578
+13 0.75 1.11419 4.28103
+14 0.81 1.15172 5.87874
+15 0.87 1.18337 7.77247
+16 0.93 1.13864 9.85449
+17 0.99 1.04409 12.0178
+18 1.05 0.969519 14.2775
+19 1.11 0.965876 16.7932
+20 1.17 0.948743 19.5385
+21 1.23 0.973321 22.6512
+22 1.29 0.955263 26.0114
+23 1.35 0.985009 29.806
+24 1.41 0.998704 34.0029
+25 1.47 0.987094 38.5114
+26 1.53 1.01168 43.5171
+27 1.59 1.02314 48.9843
+28 1.65 1.00698 54.7789
+29 1.71 1.02758 61.1298
+30 1.77 1.00973 67.816
+31 1.83 1.00386 74.9215
+32 1.89 0.991683 82.4087
+33 1.95 0.988311 90.3516
+34 2.01 1.00011 98.8916
+35 2.07 1.0063 108.005
+36 2.13 0.988564 117.484
+37 2.19 1.0048 127.67
+38 2.25 0.994661 138.312
+39 2.31 0.998307 149.571
+40 2.37 1.00674 161.523
+41 2.43 0.992448 173.909
+42 2.49 0.995874 186.959
+43 2.55 1.00079 200.713
+44 2.61 1.00906 215.24
+45 2.67 1.00886 230.441
+46 2.73 0.993803 246.095
+47 2.79 0.999211 262.534
+48 2.85 0.998467 279.674
+49 2.91 1.00116 297.592
+50 2.97 0.996088 316.162
+108100 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0.0836137 0.00784593
+5 0.27 0.124486 0.0271041
+6 0.33 0.163803 0.0649073
+7 0.39 0.301177 0.161912
+8 0.45 0.419373 0.341655
+9 0.51 0.593598 0.668331
+10 0.57 0.766941 1.19544
+11 0.63 0.882824 1.93652
+12 0.69 1.03997 2.98359
+13 0.75 1.0902 4.28031
+14 0.81 1.13013 5.84807
+15 0.87 1.17045 7.72111
+16 0.93 1.12225 9.77318
+17 0.99 1.06922 11.9886
+18 1.05 1.00012 14.3195
+19 1.11 0.974092 16.8566
+20 1.17 0.959096 19.632
+21 1.23 0.947895 22.6633
+22 1.29 0.958711 26.0357
+23 1.35 0.982602 29.821
+24 1.41 0.95695 33.8424
+25 1.47 0.99256 38.3759
+26 1.53 1.04455 43.5442
+27 1.59 1.02474 49.02
+28 1.65 1.00859 54.8238
+29 1.71 0.994113 60.9679
+30 1.77 1.01824 67.7104
+31 1.83 1.0094 74.8552
+32 1.89 1.0051 82.4437
+33 1.95 0.979436 90.3153
+34 2.01 1.0133 98.9679
+35 2.07 0.991883 107.951
+36 2.13 0.994589 117.488
+37 2.19 0.993333 127.557
+38 2.25 0.989261 138.142
+39 2.31 1.00741 149.504
+40 2.37 1.00127 161.39
+41 2.43 0.993877 173.794
+42 2.49 1.00986 187.027
+43 2.55 1.00935 200.899
+44 2.61 0.99583 215.236
+45 2.67 1.00948 230.446
+46 2.73 0.999372 246.188
+47 2.79 1.01048 262.812
+48 2.85 0.998717 279.956
+49 2.91 0.977885 297.458
+50 2.97 0.993486 315.979
+108150 50
+1 0.03 0 0
+2 0.09 0.040178 0.000713267
+3 0.15 0 0.000713267
+4 0.21 0.0380062 0.0042796
+5 0.27 0.106044 0.0206847
+6 0.33 0.241068 0.0763195
+7 0.39 0.314464 0.177603
+8 0.45 0.449328 0.370185
+9 0.51 0.580637 0.689729
+10 0.57 0.771092 1.21969
+11 0.63 0.869229 1.94936
+12 0.69 1.06973 3.02639
+13 0.75 1.07581 4.30599
+14 0.81 1.11419 5.85164
+15 0.87 1.14014 7.67618
+16 0.93 1.13942 9.75963
+17 0.99 1.09263 12.0235
+18 1.05 0.986351 14.3224
+19 1.11 0.963138 16.831
+20 1.17 0.960329 19.6098
+21 1.23 0.935851 22.6027
+22 1.29 0.974527 26.0307
+23 1.35 0.982788 29.8167
+24 1.41 0.980542 33.9372
+25 1.47 1.01879 38.5906
+26 1.53 1.00159 43.5464
+27 1.59 1.02487 49.0228
+28 1.65 1.01045 54.8374
+29 1.71 1.01939 61.1377
+30 1.77 0.997233 67.7411
+31 1.83 1.00446 74.8509
+32 1.89 0.984975 82.2874
+33 1.95 0.994257 90.2782
+34 2.01 1.01397 98.9365
+35 2.07 0.988417 107.888
+36 2.13 0.988341 117.365
+37 2.19 1.0079 127.582
+38 2.25 0.984661 138.118
+39 2.31 1.00975 149.506
+40 2.37 0.987095 161.224
+41 2.43 1.01279 173.864
+42 2.49 1.00017 186.97
+43 2.55 1.00873 200.833
+44 2.61 1.00727 215.335
+45 2.67 0.999676 230.397
+46 2.73 1.00046 246.156
+47 2.79 0.993921 262.508
+48 2.85 0.996805 279.62
+49 2.91 0.995859 297.443
+50 2.97 1.00539 316.186
+108200 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0.0532087 0.00499287
+5 0.27 0.0599377 0.0142653
+6 0.33 0.169984 0.053495
+7 0.39 0.378686 0.175464
+8 0.45 0.446 0.366619
+9 0.51 0.624703 0.710414
+10 0.57 0.765903 1.2368
+11 0.63 0.854784 1.95435
+12 0.69 0.99605 2.9572
+13 0.75 1.10699 4.27389
+14 0.81 1.12756 5.83809
+15 0.87 1.17089 7.71184
+16 0.93 1.1402 9.79672
+17 0.99 1.07576 12.0257
+18 1.05 0.970131 14.2867
+19 1.11 0.967793 16.8074
+20 1.17 0.9623 19.592
+21 1.23 0.943212 22.6084
+22 1.29 0.973919 26.0342
+23 1.35 0.976678 29.7967
+24 1.41 0.96323 33.8445
+25 1.47 1.0038 38.4294
+26 1.53 1.02869 43.5193
+27 1.59 1.01887 48.9636
+28 1.65 1.0195 54.8302
+29 1.71 1.00992 61.072
+30 1.77 1.00844 67.7496
+31 1.83 0.995396 74.7953
+32 1.89 0.980346 82.1969
+33 1.95 0.991328 90.1641
+34 2.01 1.00629 98.7568
+35 2.07 0.996687 107.783
+36 2.13 1.00917 117.46
+37 2.19 1.00396 127.637
+38 2.25 0.989728 138.227
+39 2.31 1.01342 149.656
+40 2.37 1.0029 161.562
+41 2.43 0.995706 173.989
+42 2.49 0.99043 186.967
+43 2.55 1.00219 200.74
+44 2.61 1.00604 215.225
+45 2.67 0.996078 230.233
+46 2.73 1.01173 246.169
+47 2.79 0.993271 262.51
+48 2.85 0.994977 279.591
+49 2.91 1.00192 297.522
+50 2.97 1.0094 316.34
+108250 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0.06081 0.00570613
+5 0.27 0.0968224 0.0206847
+6 0.33 0.197799 0.0663338
+7 0.39 0.296748 0.161912
+8 0.45 0.447664 0.35378
+9 0.51 0.622111 0.696148
+10 0.57 0.759676 1.21826
+11 0.63 0.925308 1.99501
+12 0.69 0.99605 2.99786
+13 0.75 1.0932 4.29815
+14 0.81 1.15789 5.90442
+15 0.87 1.12498 7.70471
+16 0.93 1.10431 9.72397
+17 0.99 1.0792 11.9601
+18 1.05 0.994614 14.2782
+19 1.11 0.958209 16.7739
+20 1.17 0.9729 19.5892
+21 1.23 0.973767 22.7033
+22 1.29 0.938636 26.005
+23 1.35 0.980936 29.7839
+24 1.41 0.976808 33.8887
+25 1.47 1.01801 38.5385
+26 1.53 1.01917 43.5813
+27 1.59 1.01032 48.98
+28 1.65 1.00971 54.7903
+29 1.71 1.00958 61.03
+30 1.77 1.00122 67.6598
+31 1.83 0.996504 74.7133
+32 1.89 1.00519 82.3024
+33 1.95 1.005 90.3795
+34 2.01 0.985573 98.7953
+35 2.07 0.996845 107.823
+36 2.13 1.00515 117.461
+37 2.19 0.991503 127.512
+38 2.25 0.994327 138.151
+39 2.31 0.998117 149.408
+40 2.37 1.00842 161.379
+41 2.43 1.00319 173.899
+42 2.49 1.00104 187.017
+43 2.55 1.01158 200.919
+44 2.61 1.00698 215.417
+45 2.67 0.985616 230.267
+46 2.73 1.00345 246.073
+47 2.79 0.993054 262.411
+48 2.85 0.992235 279.444
+49 2.91 1.00036 297.348
+50 2.97 0.996738 315.93
+108300 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0.0148024 0.000713267
+4 0.21 0.0380062 0.0042796
+5 0.27 0.119875 0.0228245
+6 0.33 0.182346 0.0649073
+7 0.39 0.272388 0.152639
+8 0.45 0.427694 0.335949
+9 0.51 0.659697 0.699001
+10 0.57 0.734768 1.20399
+11 0.63 0.906615 1.96505
+12 0.69 1.04918 3.0214
+13 0.75 1.13038 4.36591
+14 0.81 1.10185 5.89444
+15 0.87 1.12766 7.699
+16 0.93 1.13474 9.77389
+17 0.99 1.07025 11.9914
+18 1.05 1.00992 14.3452
+19 1.11 0.966424 16.8623
+20 1.17 0.934447 19.5663
+21 1.23 0.961946 22.6427
+22 1.29 0.966416 26.0421
+23 1.35 0.967235 29.7682
+24 1.41 1.01109 34.0171
+25 1.47 1.00615 38.6127
+26 1.53 1.01038 43.612
+27 1.59 1.01833 49.0535
+28 1.65 0.999422 54.8046
+29 1.71 1.03693 61.2133
+30 1.77 0.986893 67.7482
+31 1.83 0.990256 74.7575
+32 1.89 1.01388 82.4123
+33 1.95 0.997718 90.4308
+34 2.01 1.00278 98.9936
+35 2.07 0.98952 107.955
+36 2.13 0.995184 117.498
+37 2.19 0.987422 127.507
+38 2.25 1.00086 138.216
+39 2.31 1.0009 149.504
+40 2.37 1.00512 161.437
+41 2.43 1.00096 173.929
+42 2.49 1.00295 187.071
+43 2.55 1.00748 200.917
+44 2.61 0.993304 215.218
+45 2.67 0.994847 230.208
+46 2.73 0.999961 245.959
+47 2.79 1.00953 262.567
+48 2.85 0.99855 279.709
+49 2.91 0.998689 297.583
+50 2.97 0.997274 316.175
+108350 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0.0296049 0.00142653
+4 0.21 0.0228037 0.00356633
+5 0.27 0.119875 0.0221113
+6 0.33 0.145259 0.0556348
+7 0.39 0.318893 0.158345
+8 0.45 0.467634 0.358773
+9 0.51 0.637664 0.7097
+10 0.57 0.765903 1.23609
+11 0.63 0.908314 1.99857
+12 0.69 0.951419 2.95649
+13 0.75 1.13998 4.31241
+14 0.81 1.14092 5.89515
+15 0.87 1.13167 7.70613
+16 0.93 1.13396 9.7796
+17 0.99 1.05476 11.965
+18 1.05 1.0142 14.3288
+19 1.11 0.971901 16.8602
+20 1.17 0.93987 19.5799
+21 1.23 0.954809 22.6334
+22 1.29 0.957494 26.0014
+23 1.35 1.00038 29.8552
+24 1.41 0.965267 33.9116
+25 1.47 1.01567 38.5506
+26 1.53 1.00389 43.5178
+27 1.59 1.02087 48.9729
+28 1.65 1.01715 54.826
+29 1.71 1.00773 61.0542
+30 1.77 1.02018 67.8096
+31 1.83 0.994388 74.8481
+32 1.89 0.977796 82.2304
+33 1.95 0.997097 90.2439
+34 2.01 1.00203 98.8003
+35 2.07 1.0033 107.887
+36 2.13 0.997416 117.451
+37 2.19 1.01015 127.69
+38 2.25 0.991728 138.302
+39 2.31 1.00077 149.588
+40 2.37 1.00921 161.569
+41 2.43 0.998392 174.029
+42 2.49 1.00012 187.135
+43 2.55 0.995442 200.815
+44 2.61 1.0049 215.283
+45 2.67 0.993853 230.257
+46 2.73 1.00811 246.137
+47 2.79 1.00424 262.658
+48 2.85 1.00196 279.859
+49 2.91 0.99028 297.582
+50 2.97 0.993104 316.096
+108400 50
+1 0.03 0 0
+2 0.09 0.040178 0.000713267
+3 0.15 0.0296049 0.0021398
+4 0.21 0.030405 0.00499287
+5 0.27 0.0691589 0.0156919
+6 0.33 0.188528 0.0592011
+7 0.39 0.352111 0.172611
+8 0.45 0.439343 0.360913
+9 0.51 0.609151 0.696148
+10 0.57 0.743071 1.20685
+11 0.63 0.909164 1.97004
+12 0.69 1.03926 3.01641
+13 0.75 1.10999 4.33666
+14 0.81 1.16457 5.95221
+15 0.87 1.12498 7.7525
+16 0.93 1.10002 9.76391
+17 0.99 1.04168 11.9223
+18 1.05 1.01848 14.296
+19 1.11 0.987511 16.868
+20 1.17 0.949236 19.6148
+21 1.23 0.944327 22.6348
+22 1.29 0.967227 26.0371
+23 1.35 0.972604 29.7839
+24 1.41 1.01432 34.0464
+25 1.47 1.00427 38.6334
+26 1.53 1.00462 43.6041
+27 1.59 1.01139 49.0086
+28 1.65 1.0371 54.9765
+29 1.71 1.00335 61.1776
+30 1.77 0.985708 67.7047
+31 1.83 0.984412 74.6726
+32 1.89 1.01615 82.3445
+33 1.95 1.00828 90.4479
+34 2.01 0.98858 98.8894
+35 2.07 0.98826 107.84
+36 2.13 0.999722 117.426
+37 2.19 0.997766 127.54
+38 2.25 1.00279 138.27
+39 2.31 1.01418 149.708
+40 2.37 0.998331 161.559
+41 2.43 0.995992 173.989
+42 2.49 0.997507 187.061
+43 2.55 0.994093 200.723
+44 2.61 1.00866 215.245
+45 2.67 0.997735 230.277
+46 2.73 0.999599 246.023
+47 2.79 0.99804 262.442
+48 2.85 0.994603 279.516
+49 2.91 1.00196 297.449
+50 2.97 0.999531 316.083
+108450 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0.0228037 0.0021398
+5 0.27 0.0645483 0.0121255
+6 0.33 0.197799 0.0577746
+7 0.39 0.265744 0.143367
+8 0.45 0.472627 0.345934
+9 0.51 0.60267 0.677603
+10 0.57 0.792886 1.22254
+11 0.63 0.905765 1.98288
+12 0.69 1.00455 2.99429
+13 0.75 1.10759 4.3117
+14 0.81 1.13835 5.89087
+15 0.87 1.13613 7.70899
+16 0.93 1.12069 9.7582
+17 0.99 1.0792 11.9943
+18 1.05 0.985739 14.2917
+19 1.11 0.982855 16.8516
+20 1.17 0.9448 19.5856
+21 1.23 0.952133 22.6305
+22 1.29 0.953641 25.985
+23 1.35 0.977418 29.7504
+24 1.41 0.996837 33.9394
+25 1.47 1.00583 38.5335
+26 1.53 1.02566 43.6084
+27 1.59 1.00886 48.9993
+28 1.65 1.01913 54.8638
+29 1.71 1.0105 61.1091
+30 1.77 1.01134 67.806
+31 1.83 0.996403 74.8588
+32 1.89 0.990833 82.3395
+33 1.95 0.996742 90.3502
+34 2.01 0.993675 98.8352
+35 2.07 1.01472 108.025
+36 2.13 1.00225 117.636
+37 2.19 0.991292 127.684
+38 2.25 0.990128 138.278
+39 2.31 0.993943 149.488
+40 2.37 1.00662 161.438
+41 2.43 1.01657 174.125
+42 2.49 1.00578 187.305
+43 2.55 0.989993 200.91
+44 2.61 1.00296 215.35
+45 2.67 0.989403 230.257
+46 2.73 1.00336 246.062
+47 2.79 0.999948 262.513
+48 2.85 0.996639 279.622
+49 2.91 0.997653 297.477
+50 2.97 0.998269 316.088
+108500 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0.0836137 0.00784593
+5 0.27 0.0507165 0.0156919
+6 0.33 0.194709 0.0606277
+7 0.39 0.28789 0.153352
+8 0.45 0.450992 0.346648
+9 0.51 0.628592 0.692582
+10 0.57 0.830247 1.2632
+11 0.63 0.907465 2.02496
+12 0.69 0.980465 3.01213
+13 0.75 1.04823 4.25892
+14 0.81 1.1836 5.90086
+15 0.87 1.11161 7.67974
+16 0.93 1.14566 9.77461
+17 0.99 1.0496 11.9494
+18 1.05 1.00594 14.2939
+19 1.11 0.988332 16.868
+20 1.17 0.939377 19.5863
+21 1.23 0.971537 22.6933
+22 1.29 0.983449 26.1526
+23 1.35 0.972234 29.898
+24 1.41 0.976129 34
+25 1.47 0.999899 38.567
+26 1.53 1.02148 43.6213
+27 1.59 1.00125 48.9715
+28 1.65 1.01715 54.8245
+29 1.71 1.01408 61.092
+30 1.77 1.0066 67.7575
+31 1.83 1.00285 74.8559
+32 1.89 1.00293 82.428
+33 1.95 1.01121 90.5549
+34 2.01 0.989164 99.0014
+35 2.07 0.99141 107.98
+36 2.13 1.00374 117.605
+37 2.19 0.981441 127.553
+38 2.25 0.997794 138.23
+39 2.31 1.00868 149.606
+40 2.37 1.00704 161.561
+41 2.43 1.00434 174.095
+42 2.49 1.00132 187.216
+43 2.55 1.00598 201.041
+44 2.61 1.00004 215.439
+45 2.67 0.992954 230.4
+46 2.73 1.00336 246.205
+47 2.79 1.00931 262.81
+48 2.85 0.995476 279.899
+49 2.91 0.994863 297.704
+50 2.97 0.996891 316.289
+108550 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0.0148024 0.000713267
+4 0.21 0.0228037 0.00285307
+5 0.27 0.0829907 0.0156919
+6 0.33 0.176165 0.0563481
+7 0.39 0.274603 0.144793
+8 0.45 0.520888 0.368046
+9 0.51 0.579341 0.686876
+10 0.57 0.745147 1.199
+11 0.63 0.896419 1.9515
+12 0.69 1.02651 2.98502
+13 0.75 1.06442 4.25107
+14 0.81 1.17794 5.88516
+15 0.87 1.16956 7.75678
+16 0.93 1.15697 9.87233
+17 0.99 1.0551 12.0585
+18 1.05 0.979006 14.3402
+19 1.11 0.943694 16.7981
+20 1.17 0.949729 19.5464
+21 1.23 0.961054 22.6198
+22 1.29 0.987302 26.0927
+23 1.35 0.956311 29.7767
+24 1.41 0.995649 33.9608
+25 1.47 0.999587 38.5264
+26 1.53 0.995101 43.4501
+27 1.59 1.017 48.8845
+28 1.65 1.01578 54.7297
+29 1.71 1.03139 61.1041
+30 1.77 0.980107 67.5942
+31 1.83 1.01172 74.7553
+32 1.89 1.01058 82.3852
+33 1.95 0.986979 90.3174
+34 2.01 0.98173 98.7004
+35 2.07 1.00007 107.757
+36 2.13 0.995854 117.307
+37 2.19 0.992981 127.372
+38 2.25 1.00573 138.133
+39 2.31 1.01089 149.534
+40 2.37 0.996829 161.368
+41 2.43 1.01045 173.979
+42 2.49 1.01095 187.226
+43 2.55 0.993522 200.88
+44 2.61 0.999199 215.266
+45 2.67 0.996504 230.28
+46 2.73 0.994663 245.948
+47 2.79 1.00897 262.547
+48 2.85 1.00075 279.727
+49 2.91 0.99024 297.449
+50 2.97 1.00493 316.184
+108600 50
+1 0.03 0 0
+2 0.09 0.040178 0.000713267
+3 0.15 0.0296049 0.0021398
+4 0.21 0.030405 0.00499287
+5 0.27 0.106044 0.021398
+6 0.33 0.197799 0.0670471
+7 0.39 0.270173 0.154066
+8 0.45 0.462642 0.352354
+9 0.51 0.571565 0.666904
+10 0.57 0.743071 1.1776
+11 0.63 0.912563 1.94365
+12 0.69 1.02085 2.97147
+13 0.75 1.12139 4.30528
+14 0.81 1.14966 5.90014
+15 0.87 1.12454 7.69971
+16 0.93 1.15931 9.81954
+17 0.99 1.06337 12.0228
+18 1.05 0.989411 14.3288
+19 1.11 0.937122 16.7696
+20 1.17 0.945539 19.5057
+21 1.23 0.982466 22.6476
+22 1.29 0.963983 26.0385
+23 1.35 0.979825 29.8131
+24 1.41 0.978506 33.9251
+25 1.47 1.02785 38.6198
+26 1.53 1.01917 43.6626
+27 1.59 1.01433 49.0827
+28 1.65 1.00438 54.8623
+29 1.71 1.00565 61.0777
+30 1.77 0.998418 67.689
+31 1.83 0.999628 74.7646
+32 1.89 0.999997 82.3146
+33 1.95 0.983607 90.2197
+34 2.01 0.996849 98.7318
+35 2.07 1.00322 107.817
+36 2.13 1.00262 117.432
+37 2.19 1.00656 127.635
+38 2.25 0.994594 138.277
+39 2.31 1.00716 149.636
+40 2.37 1.00254 161.537
+41 2.43 1.00708 174.106
+42 2.49 0.999793 187.207
+43 2.55 0.996688 200.904
+44 2.61 0.997663 215.268
+45 2.67 0.998208 230.308
+46 2.73 0.994437 245.972
+47 2.79 0.996262 262.362
+48 2.85 0.994229 279.43
+49 2.91 1.00164 297.357
+50 2.97 1.01009 316.188
+108650 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0.0148024 0.000713267
+4 0.21 0.06081 0.0064194
+5 0.27 0.106044 0.0228245
+6 0.33 0.15144 0.0577746
+7 0.39 0.281246 0.148359
+8 0.45 0.467634 0.348787
+9 0.51 0.619519 0.689729
+10 0.57 0.773167 1.22111
+11 0.63 0.927008 1.99929
+12 0.69 0.998884 3.00499
+13 0.75 1.06502 4.27175
+14 0.81 1.12344 5.83024
+15 0.87 1.16198 7.68973
+16 0.93 1.14878 9.7903
+17 0.99 1.05923 11.985
+18 1.05 0.987881 14.2874
+19 1.11 0.975187 16.8274
+20 1.17 0.953673 19.587
+21 1.23 0.956371 22.6455
+22 1.29 0.953844 26.0007
+23 1.35 0.985009 29.7953
+24 1.41 1.00244 34.0078
+25 1.47 0.98116 38.4893
+26 1.53 1.01658 43.5193
+27 1.59 1.0218 48.9793
+28 1.65 1.03388 54.9287
+29 1.71 1.00646 61.1491
+30 1.77 0.989909 67.704
+31 1.83 0.993683 74.7375
+32 1.89 0.998391 82.2753
+33 1.95 1.00491 90.3516
+34 2.01 0.998687 98.8795
+35 2.07 0.993852 107.88
+36 2.13 1.00642 117.531
+37 2.19 0.990096 127.567
+38 2.25 0.992794 138.19
+39 2.31 0.990211 149.357
+40 2.37 1.01816 161.444
+41 2.43 1.00931 174.041
+42 2.49 0.998922 187.131
+43 2.55 1.00873 200.994
+44 2.61 0.988003 215.218
+45 2.67 1.00005 230.286
+46 2.73 0.994572 245.952
+47 2.79 0.999991 262.404
+48 2.85 0.998592 279.546
+49 2.91 0.997971 297.407
+50 2.97 1.00454 316.135
+108700 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0.06081 0.00570613
+5 0.27 0.110654 0.0228245
+6 0.33 0.176165 0.0634807
+7 0.39 0.274603 0.151926
+8 0.45 0.429358 0.335949
+9 0.51 0.640256 0.688302
+10 0.57 0.747222 1.20185
+11 0.63 0.921909 1.97575
+12 0.69 1.01872 3.00143
+13 0.75 1.06802 4.27175
+14 0.81 1.16355 5.88588
+15 0.87 1.16153 7.74465
+16 0.93 1.1324 9.81526
+17 0.99 1.04787 11.9864
+18 1.05 1.0194 14.3623
+19 1.11 0.935753 16.7996
+20 1.17 0.964272 19.5899
+21 1.23 0.937859 22.5892
+22 1.29 0.948775 25.9265
+23 1.35 0.97964 29.7004
+24 1.41 1.0133 33.9586
+25 1.47 1.02192 38.6262
+26 1.53 0.99784 43.5635
+27 1.59 1.01206 48.9715
+28 1.65 1.02372 54.8623
+29 1.71 1.01073 61.1091
+30 1.77 0.998634 67.7218
+31 1.83 0.983404 74.6826
+32 1.89 1.01124 82.3174
+33 1.95 1.0026 90.3752
+34 2.01 0.992923 98.8538
+35 2.07 1.00047 107.914
+36 2.13 0.994515 117.451
+37 2.19 0.998118 127.568
+38 2.25 1.00573 138.33
+39 2.31 0.995461 149.556
+40 2.37 1.00722 161.514
+41 2.43 0.988962 173.856
+42 2.49 1.00698 187.051
+43 2.55 1.01558 201.009
+44 2.61 0.994691 215.33
+45 2.67 1.00053 230.404
+46 2.73 0.993939 246.061
+47 2.79 1.00177 262.541
+48 2.85 0.9956 279.633
+49 2.91 0.99845 297.502
+50 2.97 0.993907 316.031
+108750 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0.0296049 0.00142653
+4 0.21 0.0456075 0.00570613
+5 0.27 0.0645483 0.0156919
+6 0.33 0.182346 0.0577746
+7 0.39 0.31225 0.158345
+8 0.45 0.434351 0.344508
+9 0.51 0.603966 0.67689
+10 0.57 0.767978 1.20471
+11 0.63 0.92106 1.97789
+12 0.69 1.03643 3.0214
+13 0.75 1.04943 4.26961
+14 0.81 1.14504 5.85806
+15 0.87 1.1134 7.6398
+16 0.93 1.15424 9.75036
+17 0.99 1.08436 11.9971
+18 1.05 1.01695 14.3673
+19 1.11 0.958209 16.8631
+20 1.17 0.944307 19.5956
+21 1.23 0.958378 22.6605
+22 1.29 0.968646 26.0678
+23 1.35 0.956681 29.7532
+24 1.41 1.0043 33.9736
+25 1.47 1.00818 38.5785
+26 1.53 1.01788 43.6148
+27 1.59 1.00779 49
+28 1.65 1.00822 54.8017
+29 1.71 1.00115 60.9893
+30 1.77 1.01555 67.714
+31 1.83 1.01071 74.868
+32 1.89 0.999902 82.4173
+33 1.95 0.995943 90.4215
+34 2.01 0.987744 98.8559
+35 2.07 0.982432 107.753
+36 2.13 1.00076 117.35
+37 2.19 1.01578 127.646
+38 2.25 0.993727 138.279
+39 2.31 1.00027 149.56
+40 2.37 1.00278 161.464
+41 2.43 1.00085 173.955
+42 2.49 0.999085 187.047
+43 2.55 0.99674 200.745
+44 2.61 1.00232 215.176
+45 2.67 0.995652 230.178
+46 2.73 1.01884 246.226
+47 2.79 0.9983 262.65
+48 2.85 0.990573 279.655
+49 2.91 1.00064 297.563
+50 2.97 1.00439 316.288
+108800 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0.0444073 0.0021398
+4 0.21 0.0532087 0.00713267
+5 0.27 0.0783801 0.0192582
+6 0.33 0.179256 0.0606277
+7 0.39 0.323322 0.164765
+8 0.45 0.469298 0.365906
+9 0.51 0.607855 0.700428
+10 0.57 0.770054 1.22967
+11 0.63 0.906615 1.99073
+12 0.69 0.995342 2.99287
+13 0.75 1.08421 4.28245
+14 0.81 1.15686 5.8873
+15 0.87 1.1446 7.71897
+16 0.93 1.13708 9.79815
+17 0.99 1.04994 11.9736
+18 1.05 1.00379 14.3131
+19 1.11 0.979569 16.8645
+20 1.17 0.967723 19.6648
+21 1.23 0.950349 22.704
+22 1.29 0.955263 26.0642
+23 1.35 0.971493 29.8067
+24 1.41 1.01432 34.0692
+25 1.47 1.00646 38.6662
+26 1.53 0.993804 43.5835
+27 1.59 0.984695 48.8452
+28 1.65 1.02892 54.766
+29 1.71 1.01858 61.0613
+30 1.77 1.00876 67.7411
+31 1.83 0.999326 74.8146
+32 1.89 1.00151 82.3759
+33 1.95 0.994967 90.3723
+34 2.01 0.996432 98.8809
+35 2.07 1.00834 108.013
+36 2.13 0.993102 117.536
+37 2.19 0.9832 127.502
+38 2.25 0.99846 138.185
+39 2.31 1.00134 149.479
+40 2.37 0.996047 161.303
+41 2.43 1.00131 173.8
+42 2.49 1.01536 187.105
+43 2.55 1.00774 200.954
+44 2.61 0.998704 215.333
+45 2.67 0.995037 230.325
+46 2.73 0.996837 246.027
+47 2.79 0.999254 262.466
+48 2.85 1.00117 279.653
+49 2.91 1.00076 297.564
+50 2.97 1.00064 316.219
+108850 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0.0296049 0.00142653
+4 0.21 0.0684112 0.00784593
+5 0.27 0.101433 0.0235378
+6 0.33 0.188528 0.0670471
+7 0.39 0.261315 0.151213
+8 0.45 0.482612 0.35806
+9 0.51 0.620815 0.699715
+10 0.57 0.709861 1.18759
+11 0.63 0.949949 1.98502
+12 0.69 0.998884 2.99073
+13 0.75 1.1022 4.30171
+14 0.81 1.14709 5.89301
+15 0.87 1.16599 7.75892
+16 0.93 1.13279 9.83024
+17 0.99 1.06681 12.0407
+18 1.05 1.01389 14.4037
+19 1.11 0.933288 16.8345
+20 1.17 0.96304 19.6213
+21 1.23 0.945888 22.6462
+22 1.29 0.931133 25.9215
+23 1.35 1.00797 29.8046
+24 1.41 1.00651 34.0342
+25 1.47 0.999587 38.5999
+26 1.53 1.01759 43.6348
+27 1.59 1.01887 49.0792
+28 1.65 0.998802 54.8267
+29 1.71 1.01973 61.1291
+30 1.77 1.001 67.7575
+31 1.83 0.98552 74.7332
+32 1.89 1.00699 82.3359
+33 1.95 0.98556 90.2568
+34 2.01 0.997852 98.7775
+35 2.07 1.00464 107.876
+36 2.13 1.00329 117.496
+37 2.19 0.991996 127.552
+38 2.25 0.999194 138.243
+39 2.31 1.00286 149.553
+40 2.37 1.00374 161.469
+41 2.43 0.989991 173.825
+42 2.49 1.00224 186.958
+43 2.55 1.01143 200.858
+44 2.61 0.998803 215.238
+45 2.67 1.00327 230.354
+46 2.73 0.992218 245.984
+47 2.79 0.999471 262.427
+48 2.85 1.00644 279.704
+49 2.91 0.996098 297.531
+50 2.97 1.00638 316.293
+108900 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0.0456075 0.0042796
+5 0.27 0.165981 0.0299572
+6 0.33 0.169984 0.0691869
+7 0.39 0.301177 0.166191
+8 0.45 0.460977 0.363766
+9 0.51 0.610447 0.699715
+10 0.57 0.740995 1.20899
+11 0.63 0.873477 1.94223
+12 0.69 1.00951 2.95863
+13 0.75 1.1004 4.26748
+14 0.81 1.13835 5.84665
+15 0.87 1.16599 7.71255
+16 0.93 1.15112 9.8174
+17 0.99 1.06096 12.0157
+18 1.05 1.05245 14.4686
+19 1.11 0.940956 16.9194
+20 1.17 0.915221 19.5678
+21 1.23 0.956594 22.627
+22 1.29 0.955061 25.9864
+23 1.35 0.982417 29.771
+24 1.41 0.99446 33.9501
+25 1.47 1.01364 38.5799
+26 1.53 1.03561 43.704
+27 1.59 0.99831 49.0385
+28 1.65 0.995331 54.766
+29 1.71 1.00923 61.0036
+30 1.77 1.01759 67.7418
+31 1.83 0.99076 74.7546
+32 1.89 0.988565 82.2183
+33 1.95 1.01423 90.3695
+34 2.01 0.978723 98.7268
+35 2.07 0.985346 107.65
+36 2.13 0.999127 117.231
+37 2.19 1.01198 127.489
+38 2.25 1.00953 138.291
+39 2.31 1.00817 149.661
+40 2.37 0.996047 161.486
+41 2.43 0.99542 173.909
+42 2.49 0.993043 186.922
+43 2.55 1.00691 200.76
+44 2.61 1.00361 215.209
+45 2.67 1.00441 230.342
+46 2.73 0.999282 246.083
+47 2.79 0.996176 262.471
+48 2.85 1.00416 279.71
+49 2.91 0.995301 297.523
+50 2.97 0.997044 316.111
+108950 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0.0444073 0.0021398
+4 0.21 0.06081 0.00784593
+5 0.27 0.101433 0.0235378
+6 0.33 0.191618 0.0677603
+7 0.39 0.254672 0.149786
+8 0.45 0.437679 0.337375
+9 0.51 0.579341 0.656205
+10 0.57 0.760714 1.17903
+11 0.63 0.924459 1.95506
+12 0.69 1.0336 2.99572
+13 0.75 1.11179 4.31812
+14 0.81 1.15635 5.92225
+15 0.87 1.15039 7.7632
+16 0.93 1.11913 9.80956
+17 0.99 1.07438 12.0357
+18 1.05 1.00777 14.3845
+19 1.11 0.927537 16.8003
+20 1.17 0.934447 19.5043
+21 1.23 0.936074 22.4979
+22 1.29 0.972296 25.918
+23 1.35 0.998155 29.7632
+24 1.41 0.989708 33.9223
+25 1.47 1.02129 38.587
+26 1.53 1.04267 43.7461
+27 1.59 1.03035 49.2518
+28 1.65 0.993596 54.9693
+29 1.71 1.00046 61.1526
+30 1.77 0.992171 67.7225
+31 1.83 0.99862 74.791
+32 1.89 0.984314 82.2225
+33 1.95 0.992216 90.1969
+34 2.01 1.00679 98.7939
+35 2.07 1.01086 107.949
+36 2.13 0.992506 117.466
+37 2.19 1.00135 127.616
+38 2.25 1.00733 138.394
+39 2.31 1.00609 149.741
+40 2.37 0.996468 161.571
+41 2.43 1.00085 174.061
+42 2.49 1.00583 187.242
+43 2.55 0.999335 200.976
+44 2.61 0.999149 215.361
+45 2.67 0.990066 230.278
+46 2.73 1.00521 246.112
+47 2.79 0.995829 262.495
+48 2.85 1.00669 279.777
+49 2.91 1.0063 297.787
+50 2.97 1.0032 316.489
+109000 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0.0296049 0.00142653
+4 0.21 0.0456075 0.00570613
+5 0.27 0.0553271 0.0142653
+6 0.33 0.225615 0.0663338
+7 0.39 0.327751 0.171897
+8 0.45 0.402731 0.344508
+9 0.51 0.60267 0.676177
+10 0.57 0.776281 1.2097
+11 0.63 0.927857 1.98859
+12 0.69 1.02651 3.02211
+13 0.75 1.07521 4.301
+14 0.81 1.15429 5.90228
+15 0.87 1.14549 7.73538
+16 0.93 1.10743 9.76034
+17 0.99 1.07782 11.9936
+18 1.05 0.990635 14.3024
+19 1.11 0.963412 16.8117
+20 1.17 0.949236 19.5585
+21 1.23 0.943435 22.5756
+22 1.29 0.956075 25.9387
+23 1.35 0.998155 29.7839
+24 1.41 0.986992 33.9315
+25 1.47 1.01505 38.5678
+26 1.53 1.03273 43.6776
+27 1.59 1.00779 49.0628
+28 1.65 1.01777 54.9194
+29 1.71 1.00496 61.1305
+30 1.77 0.995725 67.724
+31 1.83 0.990659 74.7361
+32 1.89 1.00822 82.3481
+33 1.95 1.00375 90.4151
+34 2.01 0.995346 98.9144
+35 2.07 0.999759 107.969
+36 2.13 1.00619 117.617
+37 2.19 0.992911 127.682
+38 2.25 1.00079 138.39
+39 2.31 0.995271 149.615
+40 2.37 1.00818 161.583
+41 2.43 0.988391 173.919
+42 2.49 0.992009 186.918
+43 2.55 0.997207 200.623
+44 2.61 1.0103 215.168
+45 2.67 1.00398 230.295
+46 2.73 1.0145 246.275
+47 2.79 0.99843 262.701
+48 2.85 1.00163 279.896
+49 2.91 0.989522 297.606
+50 2.97 1.00271 316.299
+109050 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0.0592097 0.00285307
+4 0.21 0.0532087 0.00784593
+5 0.27 0.106044 0.0242511
+6 0.33 0.160712 0.0613409
+7 0.39 0.301177 0.158345
+8 0.45 0.450992 0.351641
+9 0.51 0.610447 0.687589
+10 0.57 0.784583 1.22682
+11 0.63 0.900667 1.98288
+12 0.69 0.974798 2.96434
+13 0.75 1.07401 4.2418
+14 0.81 1.15378 5.84237
+15 0.87 1.16287 7.70328
+16 0.93 1.16126 9.82668
+17 0.99 1.0644 12.0321
+18 1.05 0.988799 14.3367
+19 1.11 0.952731 16.8181
+20 1.17 0.947018 19.5585
+21 1.23 0.935628 22.5506
+22 1.29 0.97331 25.9743
+23 1.35 0.991675 29.7946
+24 1.41 0.99446 33.9736
+25 1.47 1.00724 38.5742
+26 1.53 1.0098 43.5706
+27 1.59 1.02781 49.0628
+28 1.65 1.02706 54.9729
+29 1.71 1.0015 61.1626
+30 1.77 0.990124 67.719
+31 1.83 0.997512 74.7796
+32 1.89 1.01445 82.4387
+33 1.95 0.986891 90.3702
+34 2.01 0.991002 98.8324
+35 2.07 0.998577 107.876
+36 2.13 1.00731 117.535
+37 2.19 0.991855 127.589
+38 2.25 0.987195 138.152
+39 2.31 1.00185 149.451
+40 2.37 1.01167 161.461
+41 2.43 1.00902 174.053
+42 2.49 1.00589 187.235
+43 2.55 0.99129 200.858
+44 2.61 0.998258 215.23
+45 2.67 1.01146 230.47
+46 2.73 1.00118 246.24
+47 2.79 0.995005 262.61
+48 2.85 0.998467 279.75
+49 2.91 1.01706 297.953
+50 2.97 0.992683 316.459
+109100 50
+1 0.03 0 0
+2 0.09 0.040178 0.000713267
+3 0.15 0.0148024 0.00142653
+4 0.21 0.0532087 0.0064194
+5 0.27 0.0968224 0.021398
+6 0.33 0.207071 0.0691869
+7 0.39 0.310035 0.169044
+8 0.45 0.432686 0.354494
+9 0.51 0.60267 0.686163
+10 0.57 0.732693 1.18973
+11 0.63 0.907465 1.9515
+12 0.69 1.04989 3.00856
+13 0.75 1.12438 4.34593
+14 0.81 1.1075 5.88231
+15 0.87 1.13434 7.69757
+16 0.93 1.14605 9.79315
+17 0.99 1.08884 12.0492
+18 1.05 1.00685 14.3959
+19 1.11 0.968067 16.9173
+20 1.17 0.926313 19.5977
+21 1.23 0.949234 22.6334
+22 1.29 0.964997 26.0278
+23 1.35 0.98001 29.8031
+24 1.41 0.996837 33.9922
+25 1.47 0.99662 38.5442
+26 1.53 1.0199 43.5906
+27 1.59 1.0158 49.0185
+28 1.65 1.00909 54.8252
+29 1.71 1.009 61.0613
+30 1.77 1.01037 67.7518
+31 1.83 1.01142 74.9108
+32 1.89 1.00151 82.4722
+33 1.95 0.978992 90.3402
+34 2.01 0.995763 98.8431
+35 2.07 1.00338 107.93
+36 2.13 1.00047 117.524
+37 2.19 1.01261 127.788
+38 2.25 0.989394 138.374
+39 2.31 0.989706 149.536
+40 2.37 0.994786 161.346
+41 2.43 1.00485 173.887
+42 2.49 1.00556 187.063
+43 2.55 1.00561 200.884
+44 2.61 0.992759 215.177
+45 2.67 1.00261 230.283
+46 2.73 1.01119 246.211
+47 2.79 0.989586 262.491
+48 2.85 1.00142 279.683
+49 2.91 1.00347 297.642
+50 2.97 0.995705 316.205
+109150 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0.0592097 0.00285307
+4 0.21 0.0532087 0.00784593
+5 0.27 0.0691589 0.0185449
+6 0.33 0.166893 0.0570613
+7 0.39 0.334395 0.164765
+8 0.45 0.457649 0.360913
+9 0.51 0.562492 0.670471
+10 0.57 0.734768 1.17546
+11 0.63 0.907465 1.93723
+12 0.69 1.03289 2.97718
+13 0.75 1.07821 4.25963
+14 0.81 1.19491 5.91726
+15 0.87 1.14237 7.74536
+16 0.93 1.14371 9.83666
+17 0.99 1.06715 12.0478
+18 1.05 1.00594 14.3923
+19 1.11 0.952184 16.8723
+20 1.17 0.928285 19.5585
+21 1.23 0.973098 22.6705
+22 1.29 0.944517 25.9929
+23 1.35 0.970568 29.7318
+24 1.41 0.97562 33.8317
+25 1.47 1.0113 38.4508
+26 1.53 1.02681 43.5314
+27 1.59 1.03021 49.0364
+28 1.65 1.00872 54.8409
+29 1.71 1.0247 61.174
+30 1.77 0.998095 67.7832
+31 1.83 0.989853 74.7896
+32 1.89 1.00283 82.3609
+33 1.95 0.990441 90.321
+34 2.01 1.00027 98.8623
+35 2.07 0.982983 107.765
+36 2.13 0.988936 117.248
+37 2.19 0.999877 127.383
+38 2.25 1.00659 138.153
+39 2.31 1.00356 149.471
+40 2.37 1.00254 161.373
+41 2.43 0.999821 173.851
+42 2.49 1.00676 187.044
+43 2.55 1.01132 200.942
+44 2.61 0.994493 215.26
+45 2.67 0.993522 230.23
+46 2.73 0.999689 245.976
+47 2.79 0.995265 262.35
+48 2.85 1.00088 279.532
+49 2.91 1.00407 297.502
+50 2.97 1.0016 316.175
+109200 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0.0228037 0.0021398
+5 0.27 0.0968224 0.0171184
+6 0.33 0.163803 0.0549215
+7 0.39 0.391973 0.18117
+8 0.45 0.42603 0.363766
+9 0.51 0.585821 0.686163
+10 0.57 0.775243 1.21897
+11 0.63 0.928707 1.99857
+12 0.69 1.01022 3.01569
+13 0.75 1.10579 4.33096
+14 0.81 1.14864 5.92439
+15 0.87 1.12454 7.72397
+16 0.93 1.13591 9.801
+17 0.99 1.0551 11.9872
+18 1.05 1.00104 14.3203
+19 1.11 0.943694 16.7782
+20 1.17 0.972653 19.5927
+21 1.23 0.965738 22.6812
+22 1.29 0.943908 26.0014
+23 1.35 0.966309 29.724
+24 1.41 0.99497 33.9051
+25 1.47 1.01005 38.5185
+26 1.53 1.00952 43.5136
+27 1.59 1.0182 48.9544
+28 1.65 1.01603 54.801
+29 1.71 1.00739 61.0271
+30 1.77 1.00197 67.6619
+31 1.83 1.00436 74.771
+32 1.89 1.01351 82.423
+33 1.95 0.982098 90.316
+34 2.01 0.987661 98.7496
+35 2.07 1.00685 107.868
+36 2.13 0.990796 117.369
+37 2.19 1.00769 127.583
+38 2.25 1.00566 138.344
+39 2.31 1.0033 149.659
+40 2.37 0.998931 161.518
+41 2.43 1.00622 174.076
+42 2.49 0.997779 187.15
+43 2.55 0.994664 200.82
+44 2.61 1.0045 215.282
+45 2.67 1.00455 230.418
+46 2.73 1.00227 246.205
+47 2.79 0.988892 262.474
+48 2.85 0.997927 279.606
+49 2.91 1.0071 297.63
+50 2.97 0.995476 316.188
+109250 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0.0296049 0.00142653
+4 0.21 0.0228037 0.00356633
+5 0.27 0.115265 0.021398
+6 0.33 0.169984 0.0606277
+7 0.39 0.314464 0.161912
+8 0.45 0.452656 0.35592
+9 0.51 0.635072 0.705421
+10 0.57 0.758638 1.22682
+11 0.63 0.930406 2.00785
+12 0.69 1.00526 3.01997
+13 0.75 1.06382 4.28531
+14 0.81 1.15995 5.89444
+15 0.87 1.14281 7.72325
+16 0.93 1.11601 9.76391
+17 0.99 1.07094 11.9829
+18 1.05 1.00716 14.3302
+19 1.11 0.971353 16.8602
+20 1.17 0.946772 19.5999
+21 1.23 0.9218 22.5478
+22 1.29 0.988721 26.0257
+23 1.35 0.992971 29.8509
+24 1.41 0.989029 34.0071
+25 1.47 0.997713 38.5642
+26 1.53 1.02725 43.6469
+27 1.59 1.01086 49.0485
+28 1.65 1.01368 54.8816
+29 1.71 1.00762 61.1091
+30 1.77 1.01167 67.8081
+31 1.83 0.985419 74.7832
+32 1.89 0.998202 82.3195
+33 1.95 0.998339 90.3431
+34 2.01 0.988246 98.7817
+35 2.07 0.993537 107.78
+36 2.13 0.991614 117.288
+37 2.19 1.00579 127.484
+38 2.25 1.00326 138.218
+39 2.31 1.00982 149.607
+40 2.37 1.00176 161.499
+41 2.43 1.00822 174.082
+42 2.49 0.990648 187.063
+43 2.55 0.99866 200.788
+44 2.61 0.993799 215.096
+45 2.67 1.00351 230.216
+46 2.73 1.00417 246.034
+47 2.79 0.99882 262.466
+48 2.85 1.00549 279.727
+49 2.91 1.00108 297.643
+50 2.97 0.989431 316.089
+109300 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0.0148024 0.000713267
+4 0.21 0.0380062 0.0042796
+5 0.27 0.0783801 0.0164051
+6 0.33 0.210162 0.0649073
+7 0.39 0.290104 0.158345
+8 0.45 0.450992 0.351641
+9 0.51 0.628592 0.697575
+10 0.57 0.78147 1.23466
+11 0.63 0.92106 2.00785
+12 0.69 0.99605 3.0107
+13 0.75 1.1046 4.32454
+14 0.81 1.14092 5.90728
+15 0.87 1.14994 7.7475
+16 0.93 1.12889 9.8117
+17 0.99 1.08092 12.0514
+18 1.05 1.01848 14.4251
+19 1.11 0.953827 16.9094
+20 1.17 0.949483 19.6569
+21 1.23 0.941873 22.669
+22 1.29 0.959116 26.0428
+23 1.35 0.969086 29.776
+24 1.41 0.986653 33.9223
+25 1.47 0.998338 38.4822
+26 1.53 1.03042 43.5806
+27 1.59 1.01807 49.0207
+28 1.65 1.01281 54.8488
+29 1.71 1.02862 61.2061
+30 1.77 1.00176 67.8395
+31 1.83 1.00225 74.9337
+32 1.89 0.987999 82.393
+33 1.95 0.982897 90.2924
+34 2.01 0.992171 98.7646
+35 2.07 0.995348 107.779
+36 2.13 0.994292 117.313
+37 2.19 0.998821 127.438
+38 2.25 1.00759 138.219
+39 2.31 1.00406 149.543
+40 2.37 1.00422 161.464
+41 2.43 1.01651 174.15
+42 2.49 0.997507 187.222
+43 2.55 1.00177 200.989
+44 2.61 0.99796 215.357
+45 2.67 1.00162 230.449
+46 2.73 0.994935 246.121
+47 2.79 0.990756 262.42
+48 2.85 0.999257 279.574
+49 2.91 0.992711 297.341
+50 2.97 1.00424 316.063
+109350 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0.0532087 0.00499287
+5 0.27 0.0783801 0.0171184
+6 0.33 0.176165 0.0577746
+7 0.39 0.301177 0.154779
+8 0.45 0.442671 0.344508
+9 0.51 0.611743 0.68117
+10 0.57 0.752411 1.19829
+11 0.63 0.886223 1.94223
+12 0.69 1.02793 2.97718
+13 0.75 1.0914 4.27532
+14 0.81 1.16252 5.88802
+15 0.87 1.1437 7.71826
+16 0.93 1.15502 9.83024
+17 0.99 1.06681 12.0407
+18 1.05 0.986045 14.3388
+19 1.11 0.939039 16.7846
+20 1.17 0.943074 19.5136
+21 1.23 0.964623 22.5984
+22 1.29 0.962158 25.9829
+23 1.35 0.977233 29.7475
+24 1.41 1.01687 34.0207
+25 1.47 1.00162 38.5956
+26 1.53 1.00678 43.577
+27 1.59 1.00792 48.9629
+28 1.65 1.02644 54.8695
+29 1.71 1.02181 61.1847
+30 1.77 0.99691 67.786
+31 1.83 0.998721 74.8552
+32 1.89 0.998107 82.3909
+33 1.95 0.984583 90.3039
+34 2.01 0.985238 98.7168
+35 2.07 0.995269 107.73
+36 2.13 1.00932 117.409
+37 2.19 1.00656 127.612
+38 2.25 0.995461 138.263
+39 2.31 1.00583 149.607
+40 2.37 0.999592 161.474
+41 2.43 1.01234 174.108
+42 2.49 0.995819 187.157
+43 2.55 0.997726 200.869
+44 2.61 0.994294 215.184
+45 2.67 1.0064 230.347
+46 2.73 0.988867 245.924
+47 2.79 0.99856 262.352
+48 2.85 1.0003 279.524
+49 2.91 1.00271 297.469
+50 2.97 1.00477 316.201
+109400 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0.0684112 0.0064194
+5 0.27 0.142928 0.0285307
+6 0.33 0.145259 0.0620542
+7 0.39 0.281246 0.152639
+8 0.45 0.469298 0.35378
+9 0.51 0.588414 0.677603
+10 0.57 0.758638 1.199
+11 0.63 0.913413 1.96576
+12 0.69 1.06477 3.0378
+13 0.75 1.05782 4.29601
+14 0.81 1.15481 5.898
+15 0.87 1.17446 7.77746
+16 0.93 1.11289 9.81241
+17 0.99 1.05682 12.0021
+18 1.05 1.01114 14.3588
+19 1.11 0.967246 16.878
+20 1.17 0.9167 19.5307
+21 1.23 0.971314 22.6369
+22 1.29 0.936608 25.9315
+23 1.35 0.993526 29.7589
+24 1.41 0.993951 33.9358
+25 1.47 0.996932 38.4893
+26 1.53 1.02235 43.5478
+27 1.59 1.01246 48.9579
+28 1.65 1.03958 54.9401
+29 1.71 1.00635 61.1598
+30 1.77 1.00477 67.8131
+31 1.83 0.99338 74.8445
+32 1.89 0.998485 82.383
+33 1.95 0.998251 90.4058
+34 2.01 0.989081 98.8516
+35 2.07 0.98125 107.738
+36 2.13 1.00582 117.383
+37 2.19 0.999525 127.515
+38 2.25 1.01533 138.379
+39 2.31 0.997105 149.624
+40 2.37 1.0041 161.544
+41 2.43 0.992448 173.93
+42 2.49 1.00104 187.048
+43 2.55 1.00494 200.859
+44 2.61 1.00762 215.366
+45 2.67 0.990965 230.297
+46 2.73 1.00318 246.098
+47 2.79 0.985684 262.315
+48 2.85 1.00674 279.597
+49 2.91 1.00742 297.627
+50 2.97 1.0037 316.339
+109450 50
+1 0.03 0 0
+2 0.09 0.040178 0.000713267
+3 0.15 0 0.000713267
+4 0.21 0.0760125 0.00784593
+5 0.27 0.106044 0.0242511
+6 0.33 0.160712 0.0613409
+7 0.39 0.294533 0.156205
+8 0.45 0.422701 0.337375
+9 0.51 0.583229 0.658345
+10 0.57 0.774205 1.19044
+11 0.63 0.896419 1.94294
+12 0.69 1.01022 2.96006
+13 0.75 1.11359 4.28459
+14 0.81 1.15018 5.88017
+15 0.87 1.16109 7.73823
+16 0.93 1.13825 9.81954
+17 0.99 1.04856 11.9922
+18 1.05 1.00747 14.3402
+19 1.11 0.963686 16.8502
+20 1.17 0.941842 19.5756
+21 1.23 0.961946 22.6519
+22 1.29 0.938839 25.9544
+23 1.35 0.98001 29.7297
+24 1.41 1.00006 33.9322
+25 1.47 1.02067 38.5942
+26 1.53 1.00735 43.5785
+27 1.59 1.01099 48.9807
+28 1.65 1.0221 54.8623
+29 1.71 1.01535 61.1377
+30 1.77 0.993787 67.7183
+31 1.83 1.00053 74.8003
+32 1.89 1.00387 82.3795
+33 1.95 1.00003 90.4165
+34 2.01 0.997267 98.9322
+35 2.07 0.996136 107.954
+36 2.13 0.985366 117.402
+37 2.19 0.995303 127.491
+38 2.25 1.00259 138.219
+39 2.31 0.999002 149.486
+40 2.37 1.00055 161.364
+41 2.43 1.00142 173.862
+42 2.49 1.00671 187.053
+43 2.55 1.01096 200.947
+44 2.61 0.998159 215.318
+45 2.67 1.00332 230.435
+46 2.73 1.00078 246.199
+47 2.79 0.994138 262.554
+48 2.85 0.998841 279.701
+49 2.91 0.990838 297.434
+50 2.97 0.996164 316.006
+109500 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0.0148024 0.000713267
+4 0.21 0.0456075 0.00499287
+5 0.27 0.110654 0.0221113
+6 0.33 0.182346 0.064194
+7 0.39 0.292319 0.158345
+8 0.45 0.460977 0.35592
+9 0.51 0.637664 0.706847
+10 0.57 0.809491 1.2632
+11 0.63 0.837791 1.96648
+12 0.69 1.00384 2.97718
+13 0.75 1.07761 4.25892
+14 0.81 1.14761 5.85093
+15 0.87 1.13434 7.66619
+16 0.93 1.15151 9.77175
+17 0.99 1.08195 12.0136
+18 1.05 1.01175 14.3716
+19 1.11 0.958482 16.868
+20 1.17 0.929024 19.5563
+21 1.23 0.970422 22.6598
+22 1.29 0.962563 26.0456
+23 1.35 0.995008 29.8787
+24 1.41 1.00091 34.0849
+25 1.47 0.963514 38.4857
+26 1.53 0.99611 43.4144
+27 1.59 1.02688 48.9016
+28 1.65 1.05012 54.9444
+29 1.71 1.0045 61.1526
+30 1.77 1.00154 67.7846
+31 1.83 0.991566 74.8031
+32 1.89 0.993006 82.3003
+33 1.95 0.997363 90.316
+34 2.01 0.996599 98.826
+35 2.07 1.00267 107.907
+36 2.13 1.0056 117.549
+37 2.19 0.991996 127.605
+38 2.25 0.994527 138.246
+39 2.31 1.00691 149.602
+40 2.37 1.00284 161.507
+41 2.43 1.00074 173.996
+42 2.49 1.00491 187.165
+43 2.55 1.00318 200.951
+44 2.61 0.996821 215.303
+45 2.67 0.992859 230.262
+46 2.73 1.00761 246.134
+47 2.79 1.01118 262.77
+48 2.85 1.00308 279.989
+49 2.91 0.991953 297.743
+50 2.97 0.993065 316.256
+109550 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0.0296049 0.00142653
+4 0.21 0.0152025 0.00285307
+5 0.27 0.0553271 0.0114123
+6 0.33 0.145259 0.0449358
+7 0.39 0.290104 0.138374
+8 0.45 0.424365 0.320257
+9 0.51 0.614335 0.658345
+10 0.57 0.779394 1.19401
+11 0.63 0.928707 1.97361
+12 0.69 1.01447 2.99501
+13 0.75 1.0998 4.30314
+14 0.81 1.12447 5.86305
+15 0.87 1.12766 7.66762
+16 0.93 1.15229 9.77461
+17 0.99 1.10949 12.0735
+18 1.05 0.9787 14.3545
+19 1.11 0.976557 16.898
+20 1.17 0.943074 19.627
+21 1.23 0.956371 22.6854
+22 1.29 0.934175 25.9715
+23 1.35 0.974826 29.7268
+24 1.41 0.990726 33.8902
+25 1.47 1.02364 38.5656
+26 1.53 1.01831 43.6041
+27 1.59 1.02567 49.0849
+28 1.65 0.993596 54.8024
+29 1.71 1.02689 61.1491
+30 1.77 0.995725 67.7425
+31 1.83 0.999326 74.816
+32 1.89 0.999808 82.3645
+33 1.95 1.0042 90.4351
+34 2.01 0.984153 98.8388
+35 2.07 0.999207 107.888
+36 2.13 1.00723 117.546
+37 2.19 0.984608 127.527
+38 2.25 1.00019 138.229
+39 2.31 1.01007 149.621
+40 2.37 1.00061 161.499
+41 2.43 0.999192 173.969
+42 2.49 0.997343 187.039
+43 2.55 1.00177 200.806
+44 2.61 1.0048 215.272
+45 2.67 1.01482 230.563
+46 2.73 0.993531 246.213
+47 2.79 1.00303 262.714
+48 2.85 0.991196 279.73
+49 2.91 1.0055 297.725
+50 2.97 0.990311 316.188
+109600 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0.0148024 0.000713267
+4 0.21 0.0380062 0.0042796
+5 0.27 0.0922118 0.0185449
+6 0.33 0.191618 0.0627675
+7 0.39 0.298962 0.159058
+8 0.45 0.460977 0.356633
+9 0.51 0.615631 0.695435
+10 0.57 0.774205 1.22753
+11 0.63 0.907465 1.9893
+12 0.69 1.03856 3.03495
+13 0.75 1.07701 4.31598
+14 0.81 1.13475 5.89016
+15 0.87 1.10537 7.65906
+16 0.93 1.15697 9.77461
+17 0.99 1.05579 11.9622
+18 1.05 1.0093 14.3146
+19 1.11 0.98532 16.8809
+20 1.17 0.937651 19.5942
+21 1.23 0.95414 22.6455
+22 1.29 0.953439 25.9993
+23 1.35 0.985009 29.7939
+24 1.41 0.996837 33.9829
+25 1.47 1.00661 38.5806
+26 1.53 1.0173 43.6141
+27 1.59 1.00125 48.9643
+28 1.65 1.01987 54.8331
+29 1.71 1.01523 61.1077
+30 1.77 1.00779 67.781
+31 1.83 0.991969 74.8024
+32 1.89 0.991116 82.2853
+33 1.95 0.995322 90.2846
+34 2.01 0.992506 98.7596
+35 2.07 0.994009 107.762
+36 2.13 1.0024 117.374
+37 2.19 0.999877 127.509
+38 2.25 0.998394 138.192
+39 2.31 0.998876 149.457
+40 2.37 1.00344 161.369
+41 2.43 0.999421 173.842
+42 2.49 1.01286 187.115
+43 2.55 1.001 200.872
+44 2.61 1.00698 215.369
+45 2.67 1.00124 230.455
+46 2.73 0.993984 246.112
+47 2.79 1.00415 262.632
+48 2.85 0.990905 279.643
+49 2.91 0.985577 297.282
+50 2.97 1.01736 316.248
+109650 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0.0148024 0.000713267
+4 0.21 0.0228037 0.00285307
+5 0.27 0.101433 0.0185449
+6 0.33 0.197799 0.064194
+7 0.39 0.292319 0.158345
+8 0.45 0.432686 0.343795
+9 0.51 0.585821 0.666191
+10 0.57 0.808453 1.22183
+11 0.63 0.86753 1.95007
+12 0.69 1.05839 3.01569
+13 0.75 1.0914 4.31384
+14 0.81 1.12601 5.87589
+15 0.87 1.17758 7.76034
+16 0.93 1.10587 9.78245
+17 0.99 1.06027 11.9793
+18 1.05 1.00961 14.3324
+19 1.11 0.96259 16.8395
+20 1.17 0.983006 19.684
+21 1.23 0.941427 22.6947
+22 1.29 0.96378 26.0849
+23 1.35 0.959273 29.7803
+24 1.41 0.998364 33.9757
+25 1.47 0.999587 38.5414
+26 1.53 1.00216 43.5
+27 1.59 1.03048 49.0064
+28 1.65 1.0221 54.888
+29 1.71 0.998845 61.0613
+30 1.77 1.00413 67.7104
+31 1.83 1.00184 74.8017
+32 1.89 1.00189 82.3659
+33 1.95 0.990441 90.326
+34 2.01 0.986241 98.7475
+35 2.07 0.996451 107.772
+36 2.13 0.992209 117.286
+37 2.19 1.01311 127.556
+38 2.25 1.01379 138.403
+39 2.31 1.00001 149.681
+40 2.37 1.00416 161.602
+41 2.43 0.997021 174.045
+42 2.49 0.992172 187.046
+43 2.55 0.996221 200.738
+44 2.61 1.00708 215.237
+45 2.67 1.01108 230.471
+46 2.73 0.992761 246.108
+47 2.79 1.00242 262.6
+48 2.85 1.00125 279.788
+49 2.91 0.983943 297.398
+50 2.97 1.00975 316.223
+109700 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0.0148024 0.000713267
+4 0.21 0.0228037 0.00285307
+5 0.27 0.106044 0.0192582
+6 0.33 0.176165 0.0599144
+7 0.39 0.323322 0.164051
+8 0.45 0.459313 0.360913
+9 0.51 0.598782 0.690442
+10 0.57 0.767978 1.21826
+11 0.63 0.862431 1.94223
+12 0.69 1.0591 3.00856
+13 0.75 1.03983 4.24536
+14 0.81 1.13373 5.81812
+15 0.87 1.18025 7.70685
+16 0.93 1.11952 9.75392
+17 0.99 1.0551 11.9401
+18 1.05 1.01267 14.3003
+19 1.11 0.972175 16.8324
+20 1.17 0.951208 19.5849
+21 1.23 0.951241 22.627
+22 1.29 0.965808 26.0243
+23 1.35 0.982973 29.811
+24 1.41 0.999892 34.0128
+25 1.47 1.00724 38.6134
+26 1.53 1.00159 43.5692
+27 1.59 1.01059 48.9693
+28 1.65 1.0138 54.8031
+29 1.71 1.01719 61.0899
+30 1.77 0.998203 67.6997
+31 1.83 1.00084 74.7839
+32 1.89 0.991116 82.2668
+33 1.95 0.999848 90.3024
+34 2.01 1.00261 98.8638
+35 2.07 1.00259 107.944
+36 2.13 0.996151 117.496
+37 2.19 0.989744 127.529
+38 2.25 1.00126 138.242
+39 2.31 0.997105 149.487
+40 2.37 0.992623 161.271
+41 2.43 1.00479 173.811
+42 2.49 1.01362 187.093
+43 2.55 1.00333 200.882
+44 2.61 0.998902 215.264
+45 2.67 0.994516 230.248
+46 2.73 1.00046 246.007
+47 2.79 1.00199 262.491
+48 2.85 1.0003 279.663
+49 2.91 1.00164 297.59
+50 2.97 1.00428 316.312
+109750 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0.0152025 0.00142653
+5 0.27 0.115265 0.0192582
+6 0.33 0.182346 0.0613409
+7 0.39 0.294533 0.156205
+8 0.45 0.431022 0.340942
+9 0.51 0.619519 0.681883
+10 0.57 0.769016 1.21041
+11 0.63 0.891321 1.95863
+12 0.69 0.992508 2.95792
+13 0.75 1.11119 4.2796
+14 0.81 1.13887 5.85949
+15 0.87 1.17 7.73181
+16 0.93 1.12459 9.78816
+17 0.99 1.09435 12.0556
+18 1.05 0.982984 14.3466
+19 1.11 0.951636 16.8252
+20 1.17 0.926559 19.5064
+21 1.23 0.982689 22.6491
+22 1.29 0.969458 26.0592
+23 1.35 0.977603 29.8252
+24 1.41 0.986483 33.9708
+25 1.47 1.00693 38.5699
+26 1.53 1.00116 43.5235
+27 1.59 1.02407 48.9957
+28 1.65 1.0138 54.8295
+29 1.71 1.00773 61.0578
+30 1.77 1.01608 67.786
+31 1.83 1.00366 74.8902
+32 1.89 0.989038 82.3573
+33 1.95 0.98556 90.2782
+34 2.01 0.992339 98.7518
+35 2.07 1.00189 107.825
+36 2.13 0.993399 117.351
+37 2.19 1.00586 127.547
+38 2.25 1.00239 138.272
+39 2.31 0.995334 149.498
+40 2.37 0.997129 161.335
+41 2.43 1.00879 173.925
+42 2.49 1.00937 187.152
+43 2.55 0.999231 200.884
+44 2.61 0.998357 215.258
+45 2.67 1.00976 230.472
+46 2.73 0.996248 246.165
+47 2.79 0.996696 262.562
+48 2.85 0.993814 279.623
+49 2.91 0.998131 297.486
+50 2.97 0.998613 316.103
+109800 50
+1 0.03 0 0
+2 0.09 0.040178 0.000713267
+3 0.15 0.0148024 0.00142653
+4 0.21 0.0684112 0.00784593
+5 0.27 0.0645483 0.0178317
+6 0.33 0.182346 0.0599144
+7 0.39 0.321108 0.163338
+8 0.45 0.460977 0.360913
+9 0.51 0.607855 0.695435
+10 0.57 0.752411 1.21255
+11 0.63 0.942302 2.00357
+12 0.69 0.999593 3.00999
+13 0.75 1.04523 4.25321
+14 0.81 1.18051 5.89087
+15 0.87 1.13345 7.70471
+16 0.93 1.1402 9.78959
+17 0.99 1.1033 12.0756
+18 1.05 0.973191 14.3438
+19 1.11 0.946981 16.8103
+20 1.17 0.923601 19.4829
+21 1.23 0.971983 22.5913
+22 1.29 0.985477 26.0578
+23 1.35 0.982788 29.8438
+24 1.41 0.979524 33.9601
+25 1.47 0.99662 38.5121
+26 1.53 1.02235 43.5706
+27 1.59 1.01366 48.9872
+28 1.65 1.00711 54.7825
+29 1.71 1.01304 61.0435
+30 1.77 1.00564 67.7026
+31 1.83 0.992373 74.7268
+32 1.89 0.998485 82.2653
+33 1.95 0.994168 90.2553
+34 2.01 0.982231 98.6427
+35 2.07 1.02118 107.891
+36 2.13 1.00352 117.514
+37 2.19 0.997484 127.625
+38 2.25 1.00026 138.327
+39 2.31 0.992425 149.52
+40 2.37 1.00746 161.48
+41 2.43 0.992563 173.867
+42 2.49 0.99952 186.965
+43 2.55 0.999698 200.704
+44 2.61 1.00336 215.15
+45 2.67 1.00294 230.261
+46 2.73 1.00372 246.071
+47 2.79 0.998777 262.503
+48 2.85 0.990988 279.515
+49 2.91 1.0014 297.437
+50 2.97 1.00714 316.213
+109850 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0.0148024 0.000713267
+4 0.21 0.0380062 0.0042796
+5 0.27 0.110654 0.021398
+6 0.33 0.173075 0.0613409
+7 0.39 0.290104 0.154779
+8 0.45 0.452656 0.348787
+9 0.51 0.594894 0.676177
+10 0.57 0.746184 1.18902
+11 0.63 0.881125 1.92867
+12 0.69 1.02864 2.96434
+13 0.75 1.1028 4.27603
+14 0.81 1.16509 5.8923
+15 0.87 1.16733 7.76034
+16 0.93 1.11835 9.80528
+17 0.99 1.06612 12.0143
+18 1.05 0.986963 14.3146
+19 1.11 0.966972 16.8331
+20 1.17 0.951948 19.5877
+21 1.23 0.96953 22.6883
+22 1.29 0.933364 25.9715
+23 1.35 0.985009 29.766
+24 1.41 0.987671 33.9165
+25 1.47 0.999275 38.4807
+26 1.53 1.02854 43.5699
+27 1.59 1.02394 49.0414
+28 1.65 1.0164 54.8902
+29 1.71 1.003 61.0892
+30 1.77 0.998203 67.699
+31 1.83 1.01787 74.9037
+32 1.89 0.998957 82.4458
+33 1.95 0.983341 90.3488
+34 2.01 1.00863 98.9615
+35 2.07 0.98826 107.912
+36 2.13 1.0027 117.526
+37 2.19 0.986015 127.521
+38 2.25 0.989594 138.11
+39 2.31 1.00216 149.412
+40 2.37 0.999893 161.282
+41 2.43 1.00885 173.873
+42 2.49 1.01993 187.238
+43 2.55 0.991186 200.86
+44 2.61 1.00935 215.392
+45 2.67 1.00361 230.514
+46 2.73 0.997018 246.218
+47 2.79 0.995655 262.598
+48 2.85 1.00865 279.914
+49 2.91 0.996298 297.745
+50 2.97 0.990923 316.218
+109900 50
+1 0.03 0 0
+2 0.09 0.040178 0.000713267
+3 0.15 0 0.000713267
+4 0.21 0.0380062 0.0042796
+5 0.27 0.119875 0.0228245
+6 0.33 0.173075 0.0627675
+7 0.39 0.323322 0.166904
+8 0.45 0.439343 0.355207
+9 0.51 0.620815 0.696862
+10 0.57 0.762789 1.22111
+11 0.63 0.934655 2.00571
+12 0.69 0.977631 2.99001
+13 0.75 1.10999 4.31027
+14 0.81 1.15326 5.91013
+15 0.87 1.11072 7.68759
+16 0.93 1.15892 9.8067
+17 0.99 1.0434 11.9686
+18 1.05 0.991859 14.2803
+19 1.11 0.997369 16.878
+20 1.17 0.930503 19.5706
+21 1.23 0.971983 22.679
+22 1.29 0.971485 26.0963
+23 1.35 0.996119 29.9337
+24 1.41 0.963909 33.9843
+25 1.47 1.00068 38.5549
+26 1.53 0.989767 43.4522
+27 1.59 1.0174 48.8887
+28 1.65 1.02186 54.7689
+29 1.71 1.00773 60.9971
+30 1.77 1.00402 67.6455
+31 1.83 1.00618 74.7675
+32 1.89 1.00359 82.3445
+33 1.95 0.998783 90.3716
+34 2.01 1.01631 99.0499
+35 2.07 0.981959 107.943
+36 2.13 0.990647 117.442
+37 2.19 0.990729 127.485
+38 2.25 1.00286 138.215
+39 2.31 0.995208 149.439
+40 2.37 1.00722 161.397
+41 2.43 0.997535 173.846
+42 2.49 1.00954 187.075
+43 2.55 1.01008 200.956
+44 2.61 0.999447 215.346
+45 2.67 0.995936 230.352
+46 2.73 1.00789 246.228
+47 2.79 0.992057 262.549
+48 2.85 1.00204 279.75
+49 2.91 1.00403 297.72
+50 2.97 0.995093 316.271
+109950 50
+1 0.03 0 0
+2 0.09 0.040178 0.000713267
+3 0.15 0.0444073 0.00285307
+4 0.21 0.0380062 0.0064194
+5 0.27 0.106044 0.0228245
+6 0.33 0.166893 0.0613409
+7 0.39 0.294533 0.156205
+8 0.45 0.41438 0.333809
+9 0.51 0.622111 0.676177
+10 0.57 0.775243 1.20899
+11 0.63 0.966943 2.02068
+12 0.69 0.974089 3.00143
+13 0.75 1.08601 4.29315
+14 0.81 1.1728 5.92011
+15 0.87 1.13301 7.73324
+16 0.93 1.14722 9.83096
+17 0.99 1.0286 11.9622
+18 1.05 1.00104 14.2953
+19 1.11 0.951362 16.7732
+20 1.17 0.970435 19.5813
+21 1.23 0.952802 22.6284
+22 1.29 0.962361 26.0136
+23 1.35 0.981306 29.7939
+24 1.41 0.990047 33.9544
+25 1.47 1.00615 38.5499
+26 1.53 1.01499 43.572
+27 1.59 1.017 49.0064
+28 1.65 1.01913 54.8709
+29 1.71 1.01189 61.1248
+30 1.77 0.983446 67.6369
+31 1.83 1.01847 74.8459
+32 1.89 0.989983 82.3203
+33 1.95 0.987778 90.2589
+34 2.01 1.01882 98.9586
+35 2.07 0.991568 107.939
+36 2.13 0.998011 117.509
+37 2.19 0.999314 127.638
+38 2.25 0.996261 138.298
+39 2.31 0.998749 149.562
+40 2.37 1.0068 161.514
+41 2.43 1.00302 174.032
+42 2.49 1.0116 187.288
+43 2.55 0.989006 200.88
+44 2.61 1.00668 215.374
+45 2.67 0.996315 230.385
+46 2.73 0.998784 246.118
+47 2.79 0.999731 262.565
+48 2.85 1.00379 279.797
+49 2.91 1.00666 297.813
+50 2.97 0.996585 316.392
+110000 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0.0296049 0.00142653
+4 0.21 0.030405 0.0042796
+5 0.27 0.0922118 0.0185449
+6 0.33 0.234887 0.0727532
+7 0.39 0.279032 0.162625
+8 0.45 0.42603 0.345221
+9 0.51 0.653217 0.704708
+10 0.57 0.788734 1.24679
+11 0.63 0.897269 2
+12 0.69 0.992508 2.99929
+13 0.75 1.0902 4.29601
+14 0.81 1.12344 5.85449
+15 0.87 1.13434 7.66976
+16 0.93 1.13981 9.75392
+17 0.99 1.08918 12.0107
+18 1.05 1.00165 14.3452
+19 1.11 0.971901 16.8766
+20 1.17 0.93075 19.5699
+21 1.23 0.944996 22.592
+22 1.29 0.963983 25.9829
+23 1.35 0.991119 29.801
+24 1.41 0.993951 33.9779
+25 1.47 1.00818 38.5827
+26 1.53 0.995101 43.5064
+27 1.59 1.01486 48.9294
+28 1.65 1.03115 54.8631
+29 1.71 1.01004 61.1056
+30 1.77 1.01199 67.8067
+31 1.83 1.01021 74.9572
+32 1.89 0.991966 82.4465
+33 1.95 0.994434 90.4387
+34 2.01 0.99994 98.9772
+35 2.07 0.991647 107.958
+36 2.13 0.994961 117.499
+37 2.19 0.990518 127.539
+38 2.25 1.00039 138.243
+39 2.31 0.994575 149.46
+40 2.37 1.01113 161.464
+41 2.43 1.01828 174.172
+42 2.49 0.998269 187.253
+43 2.55 1.01195 201.16
+44 2.61 0.989935 215.413
+45 2.67 1.00375 230.536
+46 2.73 0.997018 246.241
+47 2.79 0.993097 262.579
+48 2.85 0.99855 279.721
+49 2.91 0.995182 297.532
+50 2.97 0.997044 316.12
diff --git a/examples/USER/misc/slater/tmp_1_2.rdf b/examples/USER/misc/slater/tmp_1_2.rdf
new file mode 100644
index 0000000000..972678cd47
--- /dev/null
+++ b/examples/USER/misc/slater/tmp_1_2.rdf
@@ -0,0 +1,10254 @@
+# Time-averaged data for fix 12
+# TimeStep Number-of-rows
+# Row c_RDF_1_2[1] c_RDF_1_2[2] c_RDF_1_2[3]
+100000 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0.108706 0.000356633
+5 0.27 0.131872 0.0010699
+6 0.33 0.176796 0.00249643
+7 0.39 0.285031 0.00570613
+8 0.45 0.380791 0.0114123
+9 0.51 0.426306 0.0196148
+10 0.57 0.875662 0.0406562
+11 0.63 0.838445 0.0652639
+12 0.69 0.9726 0.0995007
+13 0.75 1.14917 0.14729
+14 0.81 1.15443 0.203281
+15 0.87 1.04537 0.261769
+16 0.93 1.24401 0.341298
+17 0.99 1.00922 0.414408
+18 1.05 0.949725 0.491797
+19 1.11 1.00651 0.583452
+20 1.17 0.920044 0.676534
+21 1.23 0.982402 0.786377
+22 1.29 0.985953 0.907632
+23 1.35 0.974414 1.03887
+24 1.41 1.00977 1.18723
+25 1.47 0.969236 1.34201
+26 1.53 1.06583 1.52639
+27 1.59 0.956372 1.70506
+28 1.65 1.01572 1.90942
+29 1.71 1.04307 2.13481
+30 1.77 0.979724 2.36163
+31 1.83 0.974183 2.60271
+32 1.89 1.00789 2.86876
+33 1.95 0.981094 3.14444
+34 2.01 1.04644 3.45685
+35 2.07 1.02158 3.78031
+36 2.13 1.0159 4.1209
+37 2.19 1.04955 4.49287
+38 2.25 0.986698 4.86198
+39 2.31 0.997613 5.25535
+40 2.37 1.01648 5.67725
+41 2.43 0.988976 6.10877
+42 2.49 1.02907 6.58024
+43 2.55 1.00423 7.06277
+44 2.61 0.990471 7.56134
+45 2.67 0.97083 8.07275
+46 2.73 0.97331 8.60877
+47 2.79 1.0001 9.18402
+48 2.85 1.00775 9.78887
+49 2.91 0.983156 10.4041
+50 2.97 1.03138 11.0763
+100050 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0.131872 0.000713267
+6 0.33 0.0883979 0.00142653
+7 0.39 0.316701 0.00499287
+8 0.45 0.309393 0.0096291
+9 0.51 0.685797 0.0228245
+10 0.57 0.742086 0.0406562
+11 0.63 0.850597 0.0656205
+12 0.69 1.10431 0.104494
+13 0.75 0.934775 0.143367
+14 0.81 1.29413 0.206134
+15 0.87 1.19197 0.272825
+16 0.93 0.987396 0.335949
+17 0.99 1.10276 0.415835
+18 1.05 1.03288 0.5
+19 1.11 0.979091 0.589158
+20 1.17 0.888318 0.67903
+21 1.23 1.02387 0.793509
+22 1.29 0.919256 0.906562
+23 1.35 1.01943 1.04387
+24 1.41 0.934527 1.18117
+25 1.47 0.971469 1.33631
+26 1.53 1.05346 1.51854
+27 1.59 1.04991 1.71469
+28 1.65 0.953677 1.90656
+29 1.71 1.04803 2.13302
+30 1.77 1.01824 2.36876
+31 1.83 1.04336 2.62696
+32 1.89 1.00519 2.8923
+33 1.95 0.976018 3.16655
+34 2.01 0.99149 3.46255
+35 2.07 1.03284 3.78959
+36 2.13 0.963774 4.1127
+37 2.19 0.992193 4.46434
+38 2.25 1.01339 4.84344
+39 2.31 0.979524 5.22967
+40 2.37 0.988986 5.64016
+41 2.43 0.998784 6.07596
+42 2.49 0.989374 6.52924
+43 2.55 0.992352 7.00606
+44 2.61 1.04077 7.52996
+45 2.67 0.994525 8.05385
+46 2.73 1.03612 8.62447
+47 2.79 1.01064 9.20578
+48 2.85 1.01429 9.81455
+49 2.91 0.972897 10.4233
+50 2.97 0.965174 11.0524
+100100 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0.108706 0.000356633
+5 0.27 0.0659362 0.000713267
+6 0.33 0.176796 0.0021398
+7 0.39 0.190021 0.0042796
+8 0.45 0.547387 0.0124822
+9 0.51 0.463376 0.021398
+10 0.57 0.831136 0.0413695
+11 0.63 1.13008 0.0745364
+12 0.69 1.03339 0.110913
+13 0.75 1.18348 0.160128
+14 0.81 1.00736 0.208987
+15 0.87 1.20472 0.276391
+16 0.93 1.16033 0.350571
+17 0.99 1.02891 0.425107
+18 1.05 0.984738 0.50535
+19 1.11 0.986924 0.595221
+20 1.17 0.930619 0.689372
+21 1.23 0.976023 0.798502
+22 1.29 0.962754 0.916904
+23 1.35 0.969118 1.04743
+24 1.41 0.983074 1.19187
+25 1.47 0.962536 1.34558
+26 1.53 1.04727 1.52675
+27 1.59 1.00409 1.71434
+28 1.65 1.05117 1.92582
+29 1.71 1.00181 2.1423
+30 1.77 0.984345 2.37019
+31 1.83 1.03759 2.62696
+32 1.89 0.982221 2.88623
+33 1.95 1.01029 3.17011
+34 2.01 0.987907 3.46505
+35 2.07 0.963008 3.76997
+36 2.13 0.982922 4.0995
+37 2.19 1.01433 4.45899
+38 2.25 0.980025 4.82561
+39 2.31 0.990377 5.21612
+40 2.37 0.991564 5.62767
+41 2.43 0.960369 6.04672
+42 2.49 0.995602 6.50285
+43 2.55 1.05544 7.00999
+44 2.61 1.01881 7.52282
+45 2.67 1.01213 8.05599
+46 2.73 0.983023 8.59736
+47 2.79 0.96848 9.15442
+48 2.85 0.984581 9.74536
+49 2.91 1.04528 10.3994
+50 2.97 1.02317 11.0663
+100150 50
+1 0.03 0 0
+2 0.09 0.574587 0.000356633
+3 0.15 0 0.000356633
+4 0.21 0.108706 0.000713267
+5 0.27 0.131872 0.00142653
+6 0.33 0.265194 0.00356633
+7 0.39 0.221691 0.00606277
+8 0.45 0.547387 0.0142653
+9 0.51 0.518981 0.0242511
+10 0.57 0.786611 0.0431526
+11 0.63 0.911353 0.0699001
+12 0.69 0.871288 0.100571
+13 0.75 0.926199 0.139087
+14 0.81 1.15443 0.195078
+15 0.87 1.04537 0.253566
+16 0.93 1.15475 0.327389
+17 0.99 1.15199 0.410842
+18 1.05 0.905959 0.484665
+19 1.11 0.959509 0.57204
+20 1.17 0.96587 0.669757
+21 1.23 0.956885 0.776748
+22 1.29 0.962754 0.89515
+23 1.35 0.939992 1.02175
+24 1.41 1.02434 1.17225
+25 1.47 0.96477 1.32632
+26 1.53 0.993673 1.49822
+27 1.59 1.03846 1.69223
+28 1.65 1.07776 1.90906
+29 1.71 1.01007 2.12732
+30 1.77 0.968941 2.35164
+31 1.83 1.03327 2.60735
+32 1.89 1.01465 2.87518
+33 1.95 1.00902 3.1587
+34 2.01 1.00702 3.45934
+35 2.07 1.01369 3.78031
+36 2.13 0.973348 4.10663
+37 2.19 1.01534 4.46648
+38 2.25 1.001 4.84094
+39 2.31 0.990377 5.23146
+40 2.37 0.942587 5.62268
+41 2.43 0.988976 6.05421
+42 2.49 1.04075 6.53103
+43 2.55 1.03911 7.03031
+44 2.61 1.04361 7.55563
+45 2.67 0.99791 8.08131
+46 2.73 1.03742 8.65264
+47 2.79 0.97034 9.21077
+48 2.85 1.01845 9.82204
+49 2.91 0.962638 10.4244
+50 2.97 1.00347 11.0785
+100200 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0.397791 0.0032097
+7 0.39 0.316701 0.00677603
+8 0.45 0.380791 0.0124822
+9 0.51 0.574587 0.0235378
+10 0.57 0.905345 0.0452924
+11 0.63 0.923505 0.0723966
+12 0.69 1.01313 0.10806
+13 0.75 0.917623 0.14622
+14 0.81 1.02942 0.196148
+15 0.87 1.1601 0.261056
+16 0.93 1.09897 0.331312
+17 0.99 1.11753 0.412268
+18 1.05 1.01537 0.495007
+19 1.11 1.08483 0.593795
+20 1.17 0.909468 0.685806
+21 1.23 0.899472 0.786377
+22 1.29 1.00335 0.909772
+23 1.35 0.945288 1.03709
+24 1.41 0.927245 1.17332
+25 1.47 1.00274 1.33345
+26 1.53 1.04521 1.51427
+27 1.59 1.08045 1.71612
+28 1.65 0.964313 1.91013
+29 1.71 1.04803 2.13659
+30 1.77 1.01053 2.37054
+31 1.83 1.00733 2.61983
+32 1.89 0.98087 2.87874
+33 1.95 0.953172 3.14658
+34 2.01 1.056 3.46184
+35 2.07 0.935976 3.7582
+36 2.13 1.00739 4.09593
+37 2.19 0.935842 4.4276
+38 2.25 1.0172 4.80813
+39 2.31 0.978619 5.19401
+40 2.37 0.996719 5.6077
+41 2.43 1.00042 6.04422
+42 2.49 1.04542 6.52318
+43 2.55 1.04802 7.02675
+44 2.61 1.03936 7.54993
+45 2.67 0.961352 8.05635
+46 2.73 0.998565 8.60628
+47 2.79 1.0187 9.19223
+48 2.85 0.988741 9.78566
+49 2.91 0.991705 10.4062
+50 2.97 0.995268 11.0549
+100250 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0.0659362 0.000356633
+6 0.33 0.220995 0.0021398
+7 0.39 0.190021 0.0042796
+8 0.45 0.380791 0.00998573
+9 0.51 0.648727 0.0224679
+10 0.57 0.831136 0.0424394
+11 0.63 0.887051 0.0684736
+12 0.69 1.10431 0.107347
+13 0.75 1.16633 0.155849
+14 0.81 1.0809 0.208274
+15 0.87 1.09636 0.269615
+16 0.93 0.987396 0.332739
+17 0.99 1.08799 0.411555
+18 1.05 1.12041 0.502853
+19 1.11 0.975175 0.591655
+20 1.17 0.902418 0.682953
+21 1.23 0.976023 0.792083
+22 1.29 0.980153 0.912625
+23 1.35 1.02472 1.05064
+24 1.41 0.963655 1.19223
+25 1.47 0.967003 1.34665
+26 1.53 0.995734 1.5189
+27 1.59 1.01555 1.70863
+28 1.65 1.0299 1.91583
+29 1.71 0.977057 2.12696
+30 1.77 1.03056 2.36555
+31 1.83 1.03615 2.62197
+32 1.89 0.951146 2.87304
+33 1.95 0.983633 3.14943
+34 2.01 0.973572 3.44009
+35 2.07 0.964134 3.74536
+36 2.13 0.990368 4.07739
+37 2.19 1.03244 4.4433
+38 2.25 0.990512 4.81384
+39 2.31 0.997613 5.2072
+40 2.37 0.974379 5.61163
+41 2.43 0.977533 6.03816
+42 2.49 1.04386 6.51641
+43 2.55 1.00571 6.99964
+44 2.61 0.981261 7.49358
+45 2.67 1.004 8.02247
+46 2.73 1.03159 8.59058
+47 2.79 1.01064 9.1719
+48 2.85 1.00716 9.77639
+49 2.91 0.965488 10.3805
+50 2.97 0.997456 11.0307
+100300 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0.131872 0.000713267
+6 0.33 0.265194 0.00285307
+7 0.39 0.285031 0.00606277
+8 0.45 0.42839 0.0124822
+9 0.51 0.481911 0.0217546
+10 0.57 0.875662 0.042796
+11 0.63 0.996413 0.0720399
+12 0.69 1.14483 0.11234
+13 0.75 1.1749 0.161198
+14 0.81 0.955894 0.207561
+15 0.87 1.05174 0.266405
+16 0.93 1.11012 0.337375
+17 0.99 1.05845 0.414051
+18 1.05 1.12041 0.50535
+19 1.11 0.994757 0.595934
+20 1.17 0.958819 0.692939
+21 1.23 0.947316 0.798859
+22 1.29 0.849659 0.903352
+23 1.35 0.974414 1.03459
+24 1.41 0.946664 1.17368
+25 1.47 1.0742 1.34522
+26 1.53 1.01017 1.51997
+27 1.59 1.07473 1.72076
+28 1.65 0.990902 1.92011
+29 1.71 1.00181 2.13659
+30 1.77 0.973562 2.36198
+31 1.83 1.00733 2.61127
+32 1.89 0.99438 2.87375
+33 1.95 1.02679 3.16227
+34 2.01 0.962821 3.44971
+35 2.07 0.995671 3.76498
+36 2.13 0.958455 4.08631
+37 2.19 1.02339 4.449
+38 2.25 0.985745 4.81776
+39 2.31 1.04193 5.2286
+40 2.37 0.959772 5.62696
+41 2.43 1.02576 6.07454
+42 2.49 0.997937 6.53174
+43 2.55 1.02724 7.02532
+44 2.61 0.970633 7.51391
+45 2.67 0.985047 8.03281
+46 2.73 1.02576 8.59772
+47 2.79 1.05094 9.20221
+48 2.85 0.953089 9.77425
+49 2.91 1.05041 10.4315
+50 2.97 0.998003 11.082
+100350 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0.131872 0.000713267
+6 0.33 0.309393 0.0032097
+7 0.39 0.380042 0.0074893
+8 0.45 0.452189 0.0142653
+9 0.51 0.611657 0.0260342
+10 0.57 0.608511 0.0406562
+11 0.63 0.887051 0.0666904
+12 0.69 0.9726 0.100927
+13 0.75 1.13202 0.148003
+14 0.81 1.17648 0.205064
+15 0.87 1.11548 0.267475
+16 0.93 1.11012 0.338445
+17 0.99 1.00922 0.411555
+18 1.05 1.15105 0.50535
+19 1.11 1.02217 0.598431
+20 1.17 0.98702 0.698288
+21 1.23 0.963264 0.805991
+22 1.29 0.901857 0.916904
+23 1.35 0.926753 1.04173
+24 1.41 1.00492 1.18937
+25 1.47 0.993802 1.34807
+26 1.53 0.997796 1.52068
+27 1.59 1.05564 1.7179
+28 1.65 0.987357 1.91655
+29 1.71 1.04472 2.1423
+30 1.77 1.02902 2.38053
+31 1.83 1.01309 2.63124
+32 1.89 0.966008 2.88623
+33 1.95 1.01917 3.17261
+34 2.01 1.00105 3.47147
+35 2.07 0.94386 3.77033
+36 2.13 1.00313 4.10663
+37 2.19 0.998231 4.46041
+38 2.25 0.982885 4.8281
+39 2.31 0.986759 5.21719
+40 2.37 1.02422 5.6423
+41 2.43 0.995514 6.07668
+42 2.49 1.00416 6.53673
+43 2.55 1.00645 7.02033
+44 2.61 1.03723 7.54244
+45 2.67 0.993171 8.06562
+46 2.73 1.02771 8.6316
+47 2.79 0.999481 9.20649
+48 2.85 0.964973 9.78566
+49 2.91 1.02476 10.4269
+50 2.97 0.954231 11.0489
+100400 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0.131872 0.000713267
+6 0.33 0.220995 0.00249643
+7 0.39 0.348371 0.0064194
+8 0.45 0.309393 0.0110556
+9 0.51 0.741402 0.025321
+10 0.57 0.875662 0.0463623
+11 0.63 0.862748 0.0716833
+12 0.69 0.830763 0.100927
+13 0.75 1.18348 0.150143
+14 0.81 0.904422 0.194009
+15 0.87 1.12186 0.256776
+16 0.93 1.18822 0.332739
+17 0.99 1.16676 0.417261
+18 1.05 1.05914 0.503566
+19 1.11 1.04959 0.599144
+20 1.17 0.923569 0.692582
+21 1.23 0.969643 0.800999
+22 1.29 0.951154 0.917974
+23 1.35 0.955879 1.04672
+24 1.41 0.927245 1.18295
+25 1.47 0.978169 1.33916
+26 1.53 1.00604 1.5132
+27 1.59 0.983097 1.69686
+28 1.65 1.03522 1.90514
+29 1.71 0.993561 2.11983
+30 1.77 1.01053 2.35378
+31 1.83 0.988594 2.59843
+32 1.89 0.963306 2.85271
+33 1.95 1.02552 3.14087
+34 2.01 1.01538 3.44401
+35 2.07 0.984408 3.75571
+36 2.13 1.00632 4.09308
+37 2.19 1.0415 4.4622
+38 2.25 0.980978 4.82917
+39 2.31 1.00666 5.22611
+40 2.37 0.997579 5.64016
+41 2.43 0.99061 6.0724
+42 2.49 1.00494 6.53281
+43 2.55 0.953757 6.99108
+44 2.61 1.0181 7.50357
+45 2.67 0.993171 8.02675
+46 2.73 1.00245 8.57882
+47 2.79 1.0218 9.16655
+48 2.85 1.0137 9.77496
+49 2.91 0.987146 10.3927
+50 2.97 1.01223 11.0524
+100450 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0.132597 0.0010699
+7 0.39 0.411712 0.00570613
+8 0.45 0.380791 0.0114123
+9 0.51 0.759937 0.0260342
+10 0.57 0.667877 0.0420827
+11 0.63 0.862748 0.0674037
+12 0.69 1.11444 0.106633
+13 0.75 1.04626 0.150143
+14 0.81 1.15443 0.206134
+15 0.87 1.09636 0.267475
+16 0.93 1.19938 0.344151
+17 0.99 1.06337 0.421184
+18 1.05 1.06789 0.508203
+19 1.11 0.889015 0.589158
+20 1.17 0.951769 0.685449
+21 1.23 0.960075 0.792796
+22 1.29 0.956954 0.910485
+23 1.35 0.924105 1.03495
+24 1.41 1.00735 1.18295
+25 1.47 1.05633 1.35164
+26 1.53 0.946257 1.51534
+27 1.59 1.07282 1.71576
+28 1.65 1.01749 1.92047
+29 1.71 1.00346 2.1373
+30 1.77 0.973562 2.3627
+31 1.83 0.971301 2.60307
+32 1.89 1.04977 2.88017
+33 1.95 1.02552 3.16833
+34 2.01 1.01658 3.47183
+35 2.07 1.01257 3.79244
+36 2.13 0.977603 4.12019
+37 2.19 0.977099 4.46648
+38 2.25 0.960958 4.82596
+39 2.31 1.04374 5.23752
+40 2.37 1.0139 5.65835
+41 2.43 0.998784 6.09415
+42 2.49 0.961351 6.53459
+43 2.55 1.02278 7.02603
+44 2.61 1.0096 7.53424
+45 2.67 0.998587 8.06027
+46 2.73 0.979138 8.5995
+47 2.79 1.0001 9.17475
+48 2.85 0.981016 9.76355
+49 2.91 0.961498 10.3652
+50 2.97 1.07515 11.066
+100500 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0.0659362 0.000356633
+6 0.33 0.265194 0.00249643
+7 0.39 0.348371 0.0064194
+8 0.45 0.309393 0.0110556
+9 0.51 0.759937 0.0256776
+10 0.57 0.890503 0.0470756
+11 0.63 0.97211 0.0756063
+12 0.69 0.851025 0.105563
+13 0.75 1.09772 0.151213
+14 0.81 1.02942 0.201141
+15 0.87 1.1346 0.264622
+16 0.93 1.10455 0.335235
+17 0.99 1.08306 0.413695
+18 1.05 0.997868 0.495007
+19 1.11 1.01434 0.587375
+20 1.17 0.96587 0.685093
+21 1.23 0.982402 0.794936
+22 1.29 0.956954 0.912625
+23 1.35 0.945288 1.03994
+24 1.41 0.985501 1.18474
+25 1.47 1.0072 1.34558
+26 1.53 0.981303 1.51534
+27 1.59 1.03082 1.70792
+28 1.65 1.04408 1.91797
+29 1.71 1.01172 2.13659
+30 1.77 0.941213 2.35449
+31 1.83 0.987153 2.59879
+32 1.89 1.03897 2.87304
+33 1.95 1.05852 3.17047
+34 2.01 1.02613 3.47682
+35 2.07 1.05311 3.81027
+36 2.13 0.993559 4.14337
+37 2.19 0.994206 4.49572
+38 2.25 0.944752 4.84914
+39 2.31 0.959626 5.22753
+40 2.37 1.03367 5.65656
+41 2.43 0.97835 6.08345
+42 2.49 0.998715 6.54101
+43 2.55 1.02204 7.0321
+44 2.61 1.00181 7.53638
+45 2.67 1.02905 8.07846
+46 2.73 1.02641 8.64372
+47 2.79 1.01374 9.22682
+48 2.85 0.930509 9.78531
+49 2.91 0.972897 10.3941
+50 2.97 1.00512 11.0492
+100550 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0.108706 0.000356633
+5 0.27 0.131872 0.0010699
+6 0.33 0.044199 0.00142653
+7 0.39 0.538392 0.0074893
+8 0.45 0.309393 0.0121255
+9 0.51 0.815542 0.0278174
+10 0.57 0.727244 0.0452924
+11 0.63 0.959959 0.0734665
+12 0.69 1.04352 0.1102
+13 0.75 1.09772 0.155849
+14 0.81 1.13237 0.21077
+15 0.87 1.23022 0.279601
+16 0.93 1.01529 0.344508
+17 0.99 1.03876 0.419757
+18 1.05 0.997868 0.50107
+19 1.11 0.971258 0.589515
+20 1.17 0.948244 0.685449
+21 1.23 0.909041 0.78709
+22 1.29 0.962754 0.905492
+23 1.35 1.01943 1.0428
+24 1.41 1.0122 1.19151
+25 1.47 0.998268 1.35093
+26 1.53 0.93801 1.5132
+27 1.59 1.04227 1.70792
+28 1.65 1.04585 1.91833
+29 1.71 1.04637 2.14444
+30 1.77 0.99975 2.37589
+31 1.83 1.00012 2.6234
+32 1.89 0.991678 2.88516
+33 1.95 0.950634 3.15228
+34 2.01 0.983128 3.44579
+35 2.07 0.992292 3.75999
+36 2.13 1.08079 4.12233
+37 2.19 1.02037 4.48395
+38 2.25 1.001 4.85842
+39 2.31 1.03379 5.26605
+40 2.37 0.989845 5.67689
+41 2.43 0.985706 6.10699
+42 2.49 0.979255 6.55563
+43 2.55 1.01017 7.04101
+44 2.61 1.00889 7.54886
+45 2.67 1.03718 8.09522
+46 2.73 1.00245 8.64729
+47 2.79 1.04102 9.24608
+48 2.85 0.979233 9.83381
+49 2.91 0.951239 10.429
+50 2.97 1.02044 11.0942
+100600 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0.131872 0.000713267
+6 0.33 0.132597 0.00178317
+7 0.39 0.380042 0.00606277
+8 0.45 0.547387 0.0142653
+9 0.51 0.556052 0.0249643
+10 0.57 0.742086 0.042796
+11 0.63 0.959959 0.07097
+12 0.69 0.871288 0.101641
+13 0.75 1.07199 0.14622
+14 0.81 1.0956 0.199358
+15 0.87 1.24934 0.269258
+16 0.93 1.13244 0.341655
+17 0.99 1.08799 0.420471
+18 1.05 0.993491 0.501427
+19 1.11 0.963426 0.589158
+20 1.17 0.902418 0.680456
+21 1.23 1.0143 0.793866
+22 1.29 0.936655 0.909058
+23 1.35 0.945288 1.03638
+24 1.41 0.985501 1.18117
+25 1.47 0.975936 1.33702
+26 1.53 0.948318 1.50107
+27 1.59 1.00028 1.68795
+28 1.65 1.00686 1.89051
+29 1.71 1.03317 2.11377
+30 1.77 1.01978 2.34986
+31 1.83 1.003 2.59807
+32 1.89 1.04707 2.87447
+33 1.95 1.02044 3.1612
+34 2.01 0.981934 3.45435
+35 2.07 1.02045 3.77746
+36 2.13 0.91484 4.08417
+37 2.19 0.933829 4.41512
+38 2.25 1.05724 4.81063
+39 2.31 0.991281 5.2015
+40 2.37 1.0225 5.62589
+41 2.43 0.957917 6.04387
+42 2.49 1.00806 6.50571
+43 2.55 1.05173 7.01106
+44 2.61 1.01102 7.51997
+45 2.67 1.01348 8.05385
+46 2.73 1.02317 8.61733
+47 2.79 0.995761 9.19009
+48 2.85 1.0131 9.79815
+49 2.91 0.972897 10.4069
+50 2.97 0.972287 11.0407
+100650 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0.108706 0.000356633
+5 0.27 0.131872 0.0010699
+6 0.33 0.176796 0.00249643
+7 0.39 0.190021 0.00463623
+8 0.45 0.475989 0.0117689
+9 0.51 0.630192 0.0238944
+10 0.57 0.890503 0.0452924
+11 0.63 0.826294 0.0695435
+12 0.69 0.89155 0.100927
+13 0.75 1.13202 0.148003
+14 0.81 1.17648 0.205064
+15 0.87 1.12186 0.267832
+16 0.93 1.31095 0.351641
+17 0.99 1.0683 0.42903
+18 1.05 0.910335 0.50321
+19 1.11 0.967342 0.591298
+20 1.17 0.888318 0.68117
+21 1.23 1.02068 0.795292
+22 1.29 0.936655 0.910485
+23 1.35 0.926753 1.03531
+24 1.41 1.03648 1.18759
+25 1.47 0.913405 1.33345
+26 1.53 1.04727 1.51462
+27 1.59 1.09 1.71826
+28 1.65 1.02104 1.92368
+29 1.71 1.06618 2.15407
+30 1.77 1.00745 2.3873
+31 1.83 1.07218 2.65264
+32 1.89 0.991678 2.91441
+33 1.95 0.981094 3.19009
+34 2.01 0.941319 3.47111
+35 2.07 0.981029 3.78174
+36 2.13 1.01696 4.12268
+37 2.19 0.982131 4.47076
+38 2.25 1.02388 4.85378
+39 2.31 1.02565 5.2582
+40 2.37 1.01476 5.67939
+41 2.43 0.936666 6.08809
+42 2.49 0.955124 6.52568
+43 2.55 1.01165 7.01177
+44 2.61 1.01952 7.52496
+45 2.67 1.02431 8.06455
+46 2.73 1.01087 8.62126
+47 2.79 1.0342 9.21612
+48 2.85 0.96735 9.79672
+49 2.91 1.00937 10.4283
+50 2.97 1.00129 11.081
+100700 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0.108706 0.000356633
+5 0.27 0 0.000356633
+6 0.33 0.220995 0.0021398
+7 0.39 0.158351 0.00392297
+8 0.45 0.356992 0.00927247
+9 0.51 0.759937 0.0238944
+10 0.57 0.593669 0.0381598
+11 0.63 0.959959 0.0663338
+12 0.69 1.00299 0.101641
+13 0.75 1.20063 0.151569
+14 0.81 1.19854 0.2097
+15 0.87 1.17285 0.275321
+16 0.93 1.09339 0.345221
+17 0.99 0.969835 0.415478
+18 1.05 1.01975 0.498573
+19 1.11 0.951677 0.585235
+20 1.17 0.99407 0.685806
+21 1.23 1.01111 0.798859
+22 1.29 0.893157 0.908702
+23 1.35 0.953231 1.03709
+24 1.41 0.96851 1.17939
+25 1.47 1.04517 1.34629
+26 1.53 0.995734 1.51854
+27 1.59 1.02891 1.71077
+28 1.65 1.02104 1.91619
+29 1.71 1.03482 2.1398
+30 1.77 1.01207 2.37411
+31 1.83 0.98427 2.61769
+32 1.89 0.964657 2.87233
+33 1.95 0.974748 3.14622
+34 2.01 0.944902 3.42832
+35 2.07 1.00018 3.74501
+36 2.13 0.981858 4.07418
+37 2.19 1.00628 4.43081
+38 2.25 1.01339 4.80991
+39 2.31 0.989473 5.20007
+40 2.37 0.978675 5.60628
+41 2.43 1.00042 6.0428
+42 2.49 1.00261 6.50214
+43 2.55 1.01017 6.98752
+44 2.61 0.960006 7.47076
+45 2.67 1.00671 8.00107
+46 2.73 1.03807 8.57275
+47 2.79 0.982121 9.13766
+48 2.85 0.997059 9.73609
+49 2.91 1.02191 10.3755
+50 2.97 1.00402 11.03
+100750 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0.0659362 0.000356633
+6 0.33 0.265194 0.00249643
+7 0.39 0.443382 0.0074893
+8 0.45 0.404591 0.0135521
+9 0.51 0.500446 0.0231812
+10 0.57 0.653036 0.038873
+11 0.63 1.04502 0.0695435
+12 0.69 1.07391 0.107347
+13 0.75 1.01196 0.149429
+14 0.81 1.02207 0.199001
+15 0.87 1.24296 0.268545
+16 0.93 1.04876 0.335592
+17 0.99 1.11753 0.416548
+18 1.05 1.011 0.49893
+19 1.11 0.885098 0.579529
+20 1.17 0.920044 0.672611
+21 1.23 0.928178 0.776391
+22 1.29 1.01495 0.901213
+23 1.35 1.06444 1.04458
+24 1.41 0.910253 1.17832
+25 1.47 1.04963 1.34593
+26 1.53 1.01223 1.52104
+27 1.59 0.998368 1.70756
+28 1.65 1.03876 1.91655
+29 1.71 1.06948 2.14765
+30 1.77 1.00745 2.38088
+31 1.83 1.04336 2.63909
+32 1.89 0.890349 2.87411
+33 1.95 0.934134 3.13659
+34 2.01 1.01419 3.43937
+35 2.07 1.01932 3.76213
+36 2.13 1.05313 4.11519
+37 2.19 0.994206 4.46755
+38 2.25 0.961912 4.82739
+39 2.31 0.987664 5.21683
+40 2.37 0.99586 5.63017
+41 2.43 1.01676 6.07382
+42 2.49 0.970692 6.51854
+43 2.55 1.05618 7.02603
+44 2.61 1.03086 7.54494
+45 2.67 0.997233 8.07026
+46 2.73 1.00504 8.62375
+47 2.79 1.00196 9.20007
+48 2.85 1.00538 9.8035
+49 2.91 0.967198 10.4087
+50 2.97 0.953684 11.0303
+100800 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0.132597 0.0010699
+7 0.39 0.190021 0.0032097
+8 0.45 0.523588 0.0110556
+9 0.51 0.556052 0.0217546
+10 0.57 0.563985 0.0353067
+11 0.63 0.923505 0.0624108
+12 0.69 1.09418 0.100927
+13 0.75 1.09772 0.146576
+14 0.81 1.17648 0.203638
+15 0.87 1.10273 0.265335
+16 0.93 1.08223 0.334522
+17 0.99 1.01906 0.408345
+18 1.05 1.14667 0.501783
+19 1.11 1.00651 0.593438
+20 1.17 0.99407 0.694009
+21 1.23 0.921799 0.797076
+22 1.29 0.959854 0.915121
+23 1.35 0.945288 1.04244
+24 1.41 0.990356 1.18795
+25 1.47 0.949137 1.33951
+26 1.53 1.02666 1.51712
+27 1.59 1.10145 1.7229
+28 1.65 1.0494 1.93402
+29 1.71 0.993561 2.14872
+30 1.77 1.00129 2.38053
+31 1.83 0.979947 2.62304
+32 1.89 0.993029 2.88516
+33 1.95 0.965864 3.15656
+34 2.01 0.966405 3.44508
+35 2.07 0.950618 3.74608
+36 2.13 0.987177 4.07703
+37 2.19 1.06062 4.45292
+38 2.25 0.967632 4.81491
+39 2.31 1.04736 5.22789
+40 2.37 0.987268 5.63766
+41 2.43 1.00859 6.07775
+42 2.49 1.03686 6.55278
+43 2.55 0.984188 7.02568
+44 2.61 0.994014 7.52603
+45 2.67 0.959321 8.03138
+46 2.73 1.00439 8.58452
+47 2.79 0.97716 9.14658
+48 2.85 1.05291 9.77853
+49 2.91 0.963778 10.3816
+50 2.97 1.02153 11.0474
+100850 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0.108706 0.000356633
+5 0.27 0 0.000356633
+6 0.33 0.309393 0.00285307
+7 0.39 0.285031 0.00606277
+8 0.45 0.404591 0.0121255
+9 0.51 0.407771 0.0199715
+10 0.57 0.86082 0.0406562
+11 0.63 0.923505 0.0677603
+12 0.69 0.921944 0.100214
+13 0.75 1.10629 0.14622
+14 0.81 1.13972 0.201498
+15 0.87 1.24296 0.271041
+16 0.93 1.21054 0.348431
+17 0.99 1.14214 0.43117
+18 1.05 0.962855 0.509629
+19 1.11 0.908597 0.592368
+20 1.17 0.930619 0.686519
+21 1.23 0.953695 0.793153
+22 1.29 0.968553 0.912268
+23 1.35 0.900274 1.03352
+24 1.41 1.03648 1.18581
+25 1.47 1.0072 1.34665
+26 1.53 1.01635 1.52247
+27 1.59 1.03655 1.71612
+28 1.65 0.967858 1.91084
+29 1.71 1.01172 2.12946
+30 1.77 0.998209 2.36056
+31 1.83 1.03327 2.61626
+32 1.89 0.922774 2.85984
+33 1.95 1.05979 3.15763
+34 2.01 1.00702 3.45827
+35 2.07 0.994545 3.77318
+36 2.13 0.978666 4.10128
+37 2.19 0.989175 4.45185
+38 2.25 0.946658 4.80599
+39 2.31 1.01751 5.2072
+40 2.37 1.00703 5.62518
+41 2.43 1.04619 6.08167
+42 2.49 0.964465 6.52354
+43 2.55 1.02575 7.01641
+44 2.61 0.97701 7.5082
+45 2.67 0.994525 8.0321
+46 2.73 0.995975 8.5806
+47 2.79 1.0063 9.15942
+48 2.85 1.04816 9.78852
+49 2.91 1.00196 10.4155
+50 2.97 0.993079 11.0628
+100900 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0.108706 0.000356633
+5 0.27 0.0659362 0.000713267
+6 0.33 0.132597 0.00178317
+7 0.39 0.253361 0.00463623
+8 0.45 0.285593 0.00891583
+9 0.51 0.722867 0.0228245
+10 0.57 0.86082 0.0435093
+11 0.63 0.899202 0.0699001
+12 0.69 0.840894 0.0995007
+13 0.75 0.891896 0.136591
+14 0.81 1.0956 0.189729
+15 0.87 1.14735 0.253923
+16 0.93 1.15475 0.327746
+17 0.99 1.05353 0.404066
+18 1.05 1.04601 0.489301
+19 1.11 0.967342 0.577389
+20 1.17 0.941194 0.672611
+21 1.23 0.909041 0.774251
+22 1.29 0.956954 0.89194
+23 1.35 1.03002 1.03067
+24 1.41 1.03162 1.18224
+25 1.47 0.942437 1.33274
+26 1.53 1.0081 1.50713
+27 1.59 1.11481 1.71541
+28 1.65 0.966085 1.90977
+29 1.71 1.04142 2.13481
+30 1.77 0.945834 2.35378
+31 1.83 0.98427 2.59736
+32 1.89 0.99438 2.85984
+33 1.95 0.986171 3.13695
+34 2.01 1.04286 3.44829
+35 2.07 0.94386 3.74715
+36 2.13 0.995687 4.08096
+37 2.19 1.02138 4.44294
+38 2.25 0.989558 4.81312
+39 2.31 0.993995 5.20506
+40 2.37 1.06975 5.64907
+41 2.43 0.970994 6.07275
+42 2.49 0.979255 6.5214
+43 2.55 1.00571 7.00464
+44 2.61 1.04361 7.52996
+45 2.67 1.0013 8.05742
+46 2.73 0.990147 8.60271
+47 2.79 1.0001 9.17796
+48 2.85 0.994683 9.77496
+49 2.91 0.999115 10.4001
+50 2.97 1.01168 11.0596
+100950 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0.0659362 0.000356633
+6 0.33 0.309393 0.00285307
+7 0.39 0.285031 0.00606277
+8 0.45 0.333192 0.0110556
+9 0.51 0.593122 0.0224679
+10 0.57 0.727244 0.0399429
+11 0.63 0.947808 0.0677603
+12 0.69 1.08404 0.10592
+13 0.75 1.00338 0.147646
+14 0.81 1.23531 0.207561
+15 0.87 1.03262 0.265335
+16 0.93 1.16033 0.339515
+17 0.99 1.1126 0.420114
+18 1.05 0.997868 0.501427
+19 1.11 0.924262 0.585592
+20 1.17 1.0399 0.690799
+21 1.23 0.937747 0.795649
+22 1.29 0.910556 0.907632
+23 1.35 1.01678 1.04458
+24 1.41 0.915108 1.17903
+25 1.47 1.0139 1.34094
+26 1.53 0.968934 1.50856
+27 1.59 1.02128 1.69936
+28 1.65 0.985584 1.89765
+29 1.71 0.991911 2.11198
+30 1.77 1.01669 2.34736
+31 1.83 1.01886 2.5995
+32 1.89 1.03626 2.87304
+33 1.95 0.977287 3.14765
+34 2.01 0.917427 3.42154
+35 2.07 1.01482 3.74287
+36 2.13 0.989304 4.07454
+37 2.19 1.07873 4.45685
+38 2.25 1.00576 4.8331
+39 2.31 0.988568 5.2229
+40 2.37 1.0139 5.64372
+41 2.43 0.979985 6.07133
+42 2.49 1.01506 6.53638
+43 2.55 1.00274 7.01819
+44 2.61 1.00252 7.52282
+45 2.67 1.03311 8.06705
+46 2.73 0.975252 8.60414
+47 2.79 1.04908 9.20756
+48 2.85 0.970321 9.78994
+49 2.91 1.01165 10.423
+50 2.97 0.96408 11.0514
+101000 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0.217411 0.000713267
+5 0.27 0.0659362 0.0010699
+6 0.33 0.132597 0.0021398
+7 0.39 0.411712 0.00677603
+8 0.45 0.571187 0.0153352
+9 0.51 0.593122 0.0267475
+10 0.57 0.667877 0.042796
+11 0.63 0.741234 0.0645506
+12 0.69 1.12457 0.104137
+13 0.75 1.04626 0.147646
+14 0.81 1.21325 0.206491
+15 0.87 1.12186 0.269258
+16 0.93 1.10455 0.339872
+17 0.99 1.0486 0.415835
+18 1.05 0.967231 0.49465
+19 1.11 0.975175 0.583452
+20 1.17 1.01875 0.686519
+21 1.23 0.956885 0.793509
+22 1.29 0.980153 0.914051
+23 1.35 1.04061 1.05421
+24 1.41 1.0122 1.20292
+25 1.47 0.962536 1.35663
+26 1.53 1.01223 1.53174
+27 1.59 0.985006 1.71576
+28 1.65 0.953677 1.90763
+29 1.71 1.04637 2.13374
+30 1.77 0.972022 2.35877
+31 1.83 0.981388 2.60164
+32 1.89 0.966008 2.85663
+33 1.95 1.02805 3.14551
+34 2.01 0.99388 3.44223
+35 2.07 1.05987 3.77782
+36 2.13 0.978666 4.10592
+37 2.19 1.00729 4.46291
+38 2.25 1.00195 4.83773
+39 2.31 1.03108 5.24429
+40 2.37 0.995001 5.65728
+41 2.43 0.988158 6.08845
+42 2.49 0.986261 6.5403
+43 2.55 0.979734 7.01106
+44 2.61 0.967799 7.49822
+45 2.67 1.01213 8.03138
+46 2.73 1.00634 8.58559
+47 2.79 1.00692 9.16476
+48 2.85 1.03865 9.78816
+49 2.91 1.0031 10.4158
+50 2.97 0.997456 11.066
+101050 50
+1 0.03 0 0
+2 0.09 0.574587 0.000356633
+3 0.15 0 0.000356633
+4 0.21 0.108706 0.000713267
+5 0.27 0.131872 0.00142653
+6 0.33 0.0883979 0.0021398
+7 0.39 0.190021 0.0042796
+8 0.45 0.404591 0.0103424
+9 0.51 0.648727 0.0228245
+10 0.57 0.771769 0.0413695
+11 0.63 0.923505 0.0684736
+12 0.69 0.871288 0.0991441
+13 0.75 1.28639 0.152639
+14 0.81 1.01472 0.201854
+15 0.87 1.09636 0.263195
+16 0.93 1.13244 0.335592
+17 0.99 1.02399 0.409772
+18 1.05 1.01975 0.492867
+19 1.11 0.975175 0.581669
+20 1.17 1.00465 0.68331
+21 1.23 0.921799 0.786377
+22 1.29 1.03525 0.913695
+23 1.35 0.926753 1.03852
+24 1.41 1.0122 1.18723
+25 1.47 0.942437 1.33773
+26 1.53 0.966872 1.50499
+27 1.59 1.03082 1.69757
+28 1.65 1.05294 1.90942
+29 1.71 1.02987 2.13195
+30 1.77 0.99975 2.36341
+31 1.83 0.994358 2.60949
+32 1.89 0.983572 2.86912
+33 1.95 1.00394 3.15121
+34 2.01 1.01777 3.45506
+35 2.07 0.984408 3.76676
+36 2.13 0.973348 4.09308
+37 2.19 0.999237 4.44722
+38 2.25 0.969538 4.80991
+39 2.31 1.0555 5.22611
+40 2.37 1.00016 5.64123
+41 2.43 1.00369 6.07917
+42 2.49 1.01195 6.5428
+43 2.55 1.00942 7.02782
+44 2.61 1.01102 7.53673
+45 2.67 1.02025 8.07418
+46 2.73 1.02382 8.63802
+47 2.79 1.00134 9.21398
+48 2.85 0.978639 9.80136
+49 2.91 0.993415 10.423
+50 2.97 0.969004 11.0546
+101100 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0.176796 0.00142653
+7 0.39 0.190021 0.00356633
+8 0.45 0.475989 0.010699
+9 0.51 0.759937 0.025321
+10 0.57 0.653036 0.0410128
+11 0.63 0.911353 0.0677603
+12 0.69 1.11444 0.10699
+13 0.75 1.20063 0.156919
+14 0.81 0.992659 0.205064
+15 0.87 1.1856 0.271398
+16 0.93 1.1157 0.342725
+17 0.99 1.08799 0.421541
+18 1.05 0.932218 0.497504
+19 1.11 0.873349 0.577033
+20 1.17 0.997595 0.67796
+21 1.23 1.02068 0.792083
+22 1.29 1.00625 0.915835
+23 1.35 1.02208 1.0535
+24 1.41 0.941809 1.19187
+25 1.47 0.962536 1.34558
+26 1.53 1.02047 1.52211
+27 1.59 1.006 1.71006
+28 1.65 1.02813 1.9169
+29 1.71 1.04968 2.14372
+30 1.77 0.978184 2.37019
+31 1.83 0.987153 2.61448
+32 1.89 1.00924 2.88088
+33 1.95 0.98744 3.15835
+34 2.01 1.02613 3.46469
+35 2.07 1.01144 3.78495
+36 2.13 1.03717 4.13267
+37 2.19 0.960999 4.47325
+38 2.25 0.979072 4.83951
+39 2.31 0.979524 5.22575
+40 2.37 0.991564 5.6373
+41 2.43 0.994697 6.07133
+42 2.49 0.997937 6.52853
+43 2.55 1.03317 7.02496
+44 2.61 0.977718 7.51712
+45 2.67 1.00468 8.04636
+46 2.73 1.0018 8.59807
+47 2.79 0.995761 9.17083
+48 2.85 1.00597 9.77461
+49 2.91 0.997405 10.3987
+50 2.97 0.995268 11.0474
+101150 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0.131872 0.000713267
+6 0.33 0.176796 0.0021398
+7 0.39 0.506722 0.00784593
+8 0.45 0.499788 0.0153352
+9 0.51 0.648727 0.0278174
+10 0.57 0.831136 0.0477889
+11 0.63 0.680477 0.0677603
+12 0.69 1.01313 0.103424
+13 0.75 0.994807 0.144793
+14 0.81 1.0956 0.197932
+15 0.87 1.1346 0.261412
+16 0.93 1.21054 0.338802
+17 0.99 1.09783 0.418331
+18 1.05 1.011 0.500713
+19 1.11 0.983008 0.590228
+20 1.17 0.912993 0.682596
+21 1.23 1.03663 0.798502
+22 1.29 0.951154 0.915478
+23 1.35 1.01943 1.05278
+24 1.41 0.929672 1.18937
+25 1.47 0.962536 1.34308
+26 1.53 0.995734 1.51534
+27 1.59 1.03273 1.70827
+28 1.65 0.978494 1.90514
+29 1.71 1.06123 2.13445
+30 1.77 1.05213 2.37803
+31 1.83 1.06209 2.64087
+32 1.89 1.016 2.90906
+33 1.95 1.01409 3.19401
+34 2.01 0.943708 3.47575
+35 2.07 0.96526 3.78138
+36 2.13 0.965901 4.10521
+37 2.19 0.964017 4.44686
+38 2.25 0.986698 4.81598
+39 2.31 1.0157 5.21648
+40 2.37 1.03968 5.648
+41 2.43 1.02984 6.09736
+42 2.49 1.01351 6.5617
+43 2.55 0.955241 7.02068
+44 2.61 1.00039 7.52425
+45 2.67 0.993171 8.04743
+46 2.73 0.995975 8.59593
+47 2.79 0.96786 9.15264
+48 2.85 1.01251 9.76034
+49 2.91 1.02362 10.4009
+50 2.97 1.03904 11.0781
+101200 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0.329681 0.00178317
+6 0.33 0.220995 0.00356633
+7 0.39 0.253361 0.0064194
+8 0.45 0.42839 0.0128388
+9 0.51 0.648727 0.025321
+10 0.57 0.682719 0.0417261
+11 0.63 0.959959 0.0699001
+12 0.69 1.05365 0.10699
+13 0.75 1.14917 0.154779
+14 0.81 1.17648 0.21184
+15 0.87 1.19197 0.278531
+16 0.93 1.17149 0.353424
+17 0.99 0.925528 0.420471
+18 1.05 0.914712 0.495007
+19 1.11 0.932095 0.579886
+20 1.17 0.96587 0.677603
+21 1.23 0.953695 0.784237
+22 1.29 0.945354 0.900499
+23 1.35 0.947936 1.02817
+24 1.41 0.978219 1.1719
+25 1.47 1.02283 1.33524
+26 1.53 1.0514 1.51712
+27 1.59 0.97737 1.69971
+28 1.65 1.09549 1.92011
+29 1.71 0.940747 2.1234
+30 1.77 1.04134 2.36448
+31 1.83 0.95689 2.60128
+32 1.89 1.01735 2.86983
+33 1.95 1.0344 3.16049
+34 2.01 0.972377 3.45078
+35 2.07 0.979903 3.76106
+36 2.13 0.980794 4.08987
+37 2.19 0.973074 4.43474
+38 2.25 1.03246 4.82097
+39 2.31 0.977715 5.20649
+40 2.37 1.00187 5.62233
+41 2.43 1.02984 6.07168
+42 2.49 1.04853 6.55207
+43 2.55 1.04357 7.0535
+44 2.61 0.952213 7.53281
+45 2.67 1.00603 8.06277
+46 2.73 0.970072 8.597
+47 2.79 0.993901 9.16869
+48 2.85 1.02915 9.78638
+49 2.91 1.02932 10.4305
+50 2.97 0.989249 11.0752
+101250 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0.0659362 0.000356633
+6 0.33 0.176796 0.00178317
+7 0.39 0.506722 0.0074893
+8 0.45 0.452189 0.0142653
+9 0.51 0.648727 0.0267475
+10 0.57 0.593669 0.0410128
+11 0.63 0.716931 0.0620542
+12 0.69 0.952338 0.0955777
+13 0.75 1.07199 0.140157
+14 0.81 1.07354 0.192225
+15 0.87 1.30671 0.265335
+16 0.93 1.18822 0.341298
+17 0.99 1.0683 0.418688
+18 1.05 0.884076 0.490728
+19 1.11 1.12791 0.593438
+20 1.17 0.898893 0.684379
+21 1.23 0.969643 0.792796
+22 1.29 0.936655 0.907989
+23 1.35 1.00619 1.04351
+24 1.41 0.980646 1.18759
+25 1.47 1.0273 1.35164
+26 1.53 0.95038 1.51605
+27 1.59 0.99455 1.70185
+28 1.65 1.01749 1.90656
+29 1.71 1.07773 2.13944
+30 1.77 1.0891 2.39158
+31 1.83 0.987153 2.63588
+32 1.89 0.991678 2.89765
+33 1.95 0.976018 3.1719
+34 2.01 1.03808 3.48181
+35 2.07 0.994545 3.79672
+36 2.13 0.985049 4.12696
+37 2.19 0.985149 4.47611
+38 2.25 0.980978 4.84308
+39 2.31 1.01118 5.2418
+40 2.37 0.961491 5.64087
+41 2.43 0.997149 6.07596
+42 2.49 1.04464 6.55456
+43 2.55 1.02353 7.04636
+44 2.61 0.990471 7.54494
+45 2.67 0.995879 8.06954
+46 2.73 0.97849 8.60842
+47 2.79 0.990801 9.17832
+48 2.85 0.994683 9.77532
+49 2.91 1.04585 10.4297
+50 2.97 0.982683 11.0703
+101300 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0.21169 0.000356633
+4 0.21 0 0.000356633
+5 0.27 0.0659362 0.000713267
+6 0.33 0.309393 0.0032097
+7 0.39 0.285031 0.0064194
+8 0.45 0.499788 0.0139087
+9 0.51 0.537517 0.0242511
+10 0.57 0.638194 0.0395863
+11 0.63 0.887051 0.0656205
+12 0.69 0.881419 0.0966476
+13 0.75 1.1749 0.145506
+14 0.81 1.13237 0.200428
+15 0.87 1.23022 0.269258
+16 0.93 1.0655 0.337375
+17 0.99 1.10276 0.417261
+18 1.05 1.09853 0.506776
+19 1.11 0.955593 0.593795
+20 1.17 0.962344 0.691155
+21 1.23 0.861196 0.787447
+22 1.29 0.916356 0.900143
+23 1.35 1.0512 1.04173
+24 1.41 1.0122 1.19044
+25 1.47 0.946903 1.34165
+26 1.53 0.973057 1.50999
+27 1.59 1.05754 1.70756
+28 1.65 0.982039 1.90514
+29 1.71 1.02822 2.12732
+30 1.77 1.0244 2.36448
+31 1.83 1.00733 2.61377
+32 1.89 1.00519 2.8791
+33 1.95 1.01156 3.16334
+34 2.01 0.985518 3.45756
+35 2.07 0.950618 3.75856
+36 2.13 1.00739 4.09629
+37 2.19 1.02842 4.46077
+38 2.25 1.00386 4.83631
+39 2.31 1.02836 5.2418
+40 2.37 1.01734 5.66405
+41 2.43 0.982437 6.09272
+42 2.49 1.01039 6.55563
+43 2.55 0.980477 7.02675
+44 2.61 0.986929 7.52354
+45 2.67 1.0602 8.08203
+46 2.73 0.95194 8.60628
+47 2.79 1.01436 9.18973
+48 2.85 0.982799 9.7796
+49 2.91 0.995695 10.4026
+50 2.97 1.00676 11.0588
+101350 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0.0659362 0.000356633
+6 0.33 0.220995 0.0021398
+7 0.39 0.570062 0.0085592
+8 0.45 0.499788 0.0160485
+9 0.51 0.518981 0.0260342
+10 0.57 0.816295 0.0456491
+11 0.63 0.753385 0.0677603
+12 0.69 0.72945 0.0934379
+13 0.75 1.25208 0.145506
+14 0.81 1.12501 0.200071
+15 0.87 1.19835 0.267118
+16 0.93 1.12128 0.338802
+17 0.99 0.999373 0.411198
+18 1.05 1.01537 0.493937
+19 1.11 1.01825 0.586662
+20 1.17 0.905943 0.678317
+21 1.23 0.931368 0.782454
+22 1.29 0.971453 0.901926
+23 1.35 1.0512 1.04351
+24 1.41 0.975792 1.18688
+25 1.47 1.06527 1.35699
+26 1.53 0.956565 1.52247
+27 1.59 0.998368 1.70899
+28 1.65 1.06004 1.92225
+29 1.71 1.02162 2.14301
+30 1.77 0.962779 2.36591
+31 1.83 1.07506 2.63195
+32 1.89 1.00789 2.898
+33 1.95 1.01409 3.18295
+34 2.01 0.949681 3.46648
+35 2.07 0.96526 3.77211
+36 2.13 1.01696 4.11305
+37 2.19 0.928798 4.44223
+38 2.25 0.966678 4.80385
+39 2.31 1.03289 5.21113
+40 2.37 1.00531 5.62839
+41 2.43 1.07071 6.09558
+42 2.49 0.999494 6.5535
+43 2.55 1.00274 7.03531
+44 2.61 0.951504 7.51427
+45 2.67 1.00942 8.04601
+46 2.73 0.986909 8.58951
+47 2.79 1.00568 9.16797
+48 2.85 0.987552 9.7607
+49 2.91 1.03274 10.4069
+50 2.97 1.01004 11.0653
+101400 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0.0659362 0.000356633
+6 0.33 0.176796 0.00178317
+7 0.39 0.316701 0.0053495
+8 0.45 0.452189 0.0121255
+9 0.51 0.648727 0.0246077
+10 0.57 0.563985 0.0381598
+11 0.63 0.935656 0.0656205
+12 0.69 1.19549 0.107703
+13 0.75 0.934775 0.146576
+14 0.81 1.03678 0.196862
+15 0.87 1.23659 0.266049
+16 0.93 1.12686 0.338088
+17 0.99 1.0486 0.414051
+18 1.05 1.05039 0.499643
+19 1.11 0.857684 0.577746
+20 1.17 0.955294 0.674394
+21 1.23 0.966454 0.782454
+22 1.29 0.956954 0.900143
+23 1.35 1.06179 1.04315
+24 1.41 0.953946 1.18331
+25 1.47 0.975936 1.33916
+26 1.53 1.01841 1.51534
+27 1.59 0.992641 1.70078
+28 1.65 0.999766 1.90193
+29 1.71 0.996862 2.11733
+30 1.77 1.00591 2.35021
+31 1.83 0.972742 2.59094
+32 1.89 1.10382 2.88231
+33 1.95 1.02805 3.17118
+34 2.01 0.997463 3.46897
+35 2.07 0.970892 3.77639
+36 2.13 0.991432 4.10877
+37 2.19 1.00226 4.46398
+38 2.25 1.01053 4.84201
+39 2.31 0.99309 5.23359
+40 2.37 1.01992 5.65692
+41 2.43 0.985706 6.08702
+42 2.49 1.0283 6.55813
+43 2.55 0.955983 7.01748
+44 2.61 0.984095 7.51284
+45 2.67 1.01145 8.04565
+46 2.73 0.988204 8.58987
+47 2.79 1.00506 9.16797
+48 2.85 1.01548 9.77746
+49 2.91 1.0088 10.4087
+50 2.97 1.02263 11.0752
+101450 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0.263745 0.00142653
+6 0.33 0.132597 0.00249643
+7 0.39 0.253361 0.0053495
+8 0.45 0.190396 0.00820257
+9 0.51 0.593122 0.0196148
+10 0.57 0.816295 0.0392297
+11 0.63 0.887051 0.0652639
+12 0.69 0.962469 0.0991441
+13 0.75 1.19205 0.148716
+14 0.81 1.07354 0.200785
+15 0.87 1.20472 0.268188
+16 0.93 1.04318 0.334879
+17 0.99 1.1126 0.415478
+18 1.05 1.05914 0.501783
+19 1.11 0.99084 0.592011
+20 1.17 0.895368 0.682596
+21 1.23 0.944126 0.78816
+22 1.29 1.02075 0.913695
+23 1.35 0.982358 1.04601
+24 1.41 0.924817 1.18188
+25 1.47 0.996035 1.34094
+26 1.53 1.02253 1.51783
+27 1.59 1.02318 1.70899
+28 1.65 1.0494 1.92011
+29 1.71 1.01832 2.14016
+30 1.77 0.988967 2.36912
+31 1.83 0.998681 2.61626
+32 1.89 1.04437 2.89194
+33 1.95 0.973479 3.16548
+34 2.01 1.02733 3.47218
+35 2.07 1.01257 3.7928
+36 2.13 0.960582 4.11484
+37 2.19 0.964017 4.45649
+38 2.25 0.953332 4.81312
+39 2.31 1.01661 5.21398
+40 2.37 1.04827 5.64907
+41 2.43 1.01922 6.09379
+42 2.49 1.00572 6.55456
+43 2.55 0.976023 7.02354
+44 2.61 0.974176 7.51391
+45 2.67 1.004 8.0428
+46 2.73 0.960358 8.57168
+47 2.79 1.0187 9.15763
+48 2.85 1.02617 9.77354
+49 2.91 0.994555 10.3959
+50 2.97 0.966269 11.0257
+101500 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0.108706 0.000356633
+5 0.27 0.131872 0.0010699
+6 0.33 0.0883979 0.00178317
+7 0.39 0.126681 0.0032097
+8 0.45 0.42839 0.0096291
+9 0.51 0.704332 0.0231812
+10 0.57 0.682719 0.0395863
+11 0.63 0.814142 0.0634807
+12 0.69 0.820631 0.092368
+13 0.75 1.08057 0.137304
+14 0.81 1.11031 0.191155
+15 0.87 1.1856 0.257489
+16 0.93 1.11012 0.328459
+17 0.99 1.04368 0.404066
+18 1.05 0.980361 0.483951
+19 1.11 1.19057 0.592368
+20 1.17 0.930619 0.686519
+21 1.23 0.838869 0.780314
+22 1.29 0.980153 0.900856
+23 1.35 0.947936 1.02853
+24 1.41 0.985501 1.17332
+25 1.47 0.975936 1.32917
+26 1.53 1.09881 1.51926
+27 1.59 1.01555 1.70899
+28 1.65 0.978494 1.90585
+29 1.71 0.947349 2.11056
+30 1.77 1.06753 2.3577
+31 1.83 1.03183 2.61305
+32 1.89 0.970061 2.86912
+33 1.95 0.968402 3.14123
+34 2.01 1.01777 3.44508
+35 2.07 1.00919 3.76462
+36 2.13 0.933988 4.07775
+37 2.19 0.996218 4.43081
+38 2.25 1.02197 4.81312
+39 2.31 0.927065 5.17867
+40 2.37 1.00617 5.59629
+41 2.43 1.08215 6.06847
+42 2.49 1.02362 6.53745
+43 2.55 0.979734 7.0082
+44 2.61 1.01031 7.51676
+45 2.67 1.00197 8.04458
+46 2.73 1.04325 8.61912
+47 2.79 0.97096 9.1776
+48 2.85 0.96319 9.75571
+49 2.91 1.03103 10.4009
+50 2.97 0.981042 11.0403
+101550 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0.131872 0.000713267
+6 0.33 0.265194 0.00285307
+7 0.39 0.348371 0.00677603
+8 0.45 0.380791 0.0124822
+9 0.51 0.593122 0.0238944
+10 0.57 0.771769 0.0424394
+11 0.63 1.11793 0.0752496
+12 0.69 0.89155 0.106633
+13 0.75 1.06341 0.150856
+14 0.81 1.12501 0.205421
+15 0.87 0.975249 0.259986
+16 0.93 1.2719 0.341298
+17 0.99 0.999373 0.413695
+18 1.05 1.0854 0.50214
+19 1.11 0.928178 0.586662
+20 1.17 0.884793 0.676177
+21 1.23 0.956885 0.783167
+22 1.29 0.962754 0.901569
+23 1.35 0.90557 1.02354
+24 1.41 1.02677 1.17439
+25 1.47 1.02953 1.3388
+26 1.53 1.0081 1.5132
+27 1.59 1.04036 1.70756
+28 1.65 1.05649 1.92011
+29 1.71 0.925893 2.12019
+30 1.77 1.04596 2.36234
+31 1.83 0.958331 2.5995
+32 1.89 0.984923 2.85949
+33 1.95 1.02805 3.14836
+34 2.01 1.00463 3.44829
+35 2.07 1.03171 3.77496
+36 2.13 1.00632 4.11234
+37 2.19 0.9932 4.46434
+38 2.25 1.00767 4.8413
+39 2.31 1.03379 5.24893
+40 2.37 0.974379 5.65335
+41 2.43 0.987341 6.08417
+42 2.49 1.03219 6.55706
+43 2.55 1.00868 7.04173
+44 2.61 0.967091 7.52853
+45 2.67 1.02431 8.06812
+46 2.73 1.01929 8.62946
+47 2.79 1.00816 9.20934
+48 2.85 1.00062 9.80991
+49 2.91 0.968908 10.4162
+50 2.97 1.00183 11.0692
+101600 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0.108706 0.000356633
+5 0.27 0.0659362 0.000713267
+6 0.33 0.176796 0.0021398
+7 0.39 0.285031 0.0053495
+8 0.45 0.285593 0.0096291
+9 0.51 0.537517 0.0199715
+10 0.57 0.682719 0.0363766
+11 0.63 0.959959 0.0645506
+12 0.69 1.06378 0.101997
+13 0.75 1.14917 0.149786
+14 0.81 1.0956 0.202924
+15 0.87 1.26209 0.273538
+16 0.93 1.18822 0.349501
+17 0.99 1.01906 0.423324
+18 1.05 0.919089 0.498217
+19 1.11 0.936011 0.583452
+20 1.17 0.962344 0.680813
+21 1.23 0.944126 0.786377
+22 1.29 0.965654 0.905136
+23 1.35 1.01148 1.04137
+24 1.41 1.02919 1.19258
+25 1.47 1.05187 1.36056
+26 1.53 0.913272 1.51854
+27 1.59 1.08045 1.7204
+28 1.65 0.948359 1.9112
+29 1.71 0.995211 2.12625
+30 1.77 0.924268 2.34023
+31 1.83 1.00445 2.5888
+32 1.89 1.02816 2.8602
+33 1.95 1.01536 3.14551
+34 2.01 0.960432 3.43224
+35 2.07 1.04072 3.76177
+36 2.13 1.00526 4.09879
+37 2.19 1.02339 4.46148
+38 2.25 1.02769 4.84593
+39 2.31 0.930683 5.21291
+40 2.37 0.979535 5.61947
+41 2.43 0.954647 6.03602
+42 2.49 1.04153 6.5132
+43 2.55 0.999032 6.99322
+44 2.61 1.03723 7.51534
+45 2.67 0.987755 8.03566
+46 2.73 0.977843 8.57418
+47 2.79 1.0125 9.15656
+48 2.85 0.963784 9.73502
+49 2.91 1.02305 10.3752
+50 2.97 1.02591 11.0439
+101650 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0.108706 0.000356633
+5 0.27 0 0.000356633
+6 0.33 0.309393 0.00285307
+7 0.39 0.411712 0.0074893
+8 0.45 0.571187 0.0160485
+9 0.51 0.611657 0.0278174
+10 0.57 0.786611 0.046719
+11 0.63 0.862748 0.0720399
+12 0.69 1.00299 0.107347
+13 0.75 1.19205 0.156919
+14 0.81 1.11766 0.211127
+15 0.87 1.37045 0.287803
+16 0.93 1.0655 0.35592
+17 0.99 1.01414 0.429387
+18 1.05 0.888452 0.501783
+19 1.11 0.963426 0.589515
+20 1.17 0.891843 0.679743
+21 1.23 0.924989 0.783167
+22 1.29 1.00335 0.906562
+23 1.35 0.955879 1.03531
+24 1.41 1.07531 1.1933
+25 1.47 0.973703 1.34879
+26 1.53 1.04727 1.52996
+27 1.59 1.04036 1.72432
+28 1.65 1.03699 1.93295
+29 1.71 0.977057 2.14408
+30 1.77 0.939673 2.36163
+31 1.83 1.003 2.60984
+32 1.89 0.961955 2.86377
+33 1.95 1.02425 3.15157
+34 2.01 0.96521 3.43973
+35 2.07 1.0441 3.77033
+36 2.13 1.05739 4.12482
+37 2.19 1.00528 4.4811
+38 2.25 1.00862 4.85842
+39 2.31 1.00213 5.25357
+40 2.37 1.00617 5.67118
+41 2.43 0.950561 6.08595
+42 2.49 1.04309 6.56384
+43 2.55 0.934459 7.01284
+44 2.61 0.998265 7.51534
+45 2.67 1.03988 8.06312
+46 2.73 0.985614 8.60592
+47 2.79 1.03172 9.19936
+48 2.85 1.05588 9.8331
+49 2.91 0.982586 10.4479
+50 2.97 1.01825 11.1116
+101700 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0.0659362 0.000356633
+6 0.33 0.265194 0.00249643
+7 0.39 0.253361 0.0053495
+8 0.45 0.499788 0.0128388
+9 0.51 0.500446 0.0224679
+10 0.57 0.905345 0.0442225
+11 0.63 0.97211 0.0727532
+12 0.69 1.08404 0.110913
+13 0.75 1.05484 0.154779
+14 0.81 1.16913 0.211484
+15 0.87 1.01987 0.268545
+16 0.93 1.13244 0.340942
+17 0.99 1.10768 0.421184
+18 1.05 0.984738 0.501427
+19 1.11 0.936011 0.586662
+20 1.17 0.941194 0.681883
+21 1.23 0.902661 0.78281
+22 1.29 0.954054 0.900143
+23 1.35 1.04326 1.04066
+24 1.41 0.934527 1.17796
+25 1.47 1.00274 1.33809
+26 1.53 1.04727 1.51926
+27 1.59 0.998368 1.70578
+28 1.65 1.03699 1.91441
+29 1.71 0.983658 2.12696
+30 1.77 1.02902 2.36519
+31 1.83 1.09812 2.63695
+32 1.89 0.932232 2.88302
+33 1.95 0.907481 3.13802
+34 2.01 0.983128 3.43153
+35 2.07 1.00356 3.74929
+36 2.13 0.983985 4.07917
+37 2.19 1.00125 4.43402
+38 2.25 1.0296 4.81919
+39 2.31 1.00575 5.21576
+40 2.37 1.02765 5.6423
+41 2.43 0.984889 6.07204
+42 2.49 1.01039 6.53495
+43 2.55 0.993094 7.01213
+44 2.61 1.01739 7.52425
+45 2.67 0.996556 8.04922
+46 2.73 1.0018 8.60093
+47 2.79 1.01064 9.18224
+48 2.85 1.01489 9.79137
+49 2.91 1.00253 10.4187
+50 2.97 0.973381 11.0531
+101750 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0.197809 0.0010699
+6 0.33 0.176796 0.00249643
+7 0.39 0.316701 0.00606277
+8 0.45 0.452189 0.0128388
+9 0.51 0.611657 0.0246077
+10 0.57 0.697561 0.0413695
+11 0.63 0.923505 0.0684736
+12 0.69 1.02326 0.104494
+13 0.75 1.04626 0.148003
+14 0.81 1.06619 0.199715
+15 0.87 1.07086 0.259629
+16 0.93 1.14359 0.332739
+17 0.99 1.16183 0.416904
+18 1.05 0.971608 0.496077
+19 1.11 0.959509 0.583452
+20 1.17 0.909468 0.675464
+21 1.23 0.899472 0.776034
+22 1.29 0.968553 0.89515
+23 1.35 1.03532 1.03459
+24 1.41 0.978219 1.17832
+25 1.47 1.05633 1.347
+26 1.53 1.0885 1.53531
+27 1.59 1.006 1.72325
+28 1.65 0.964313 1.91726
+29 1.71 0.982008 2.12946
+30 1.77 1.06445 2.37589
+31 1.83 0.945361 2.60984
+32 1.89 0.979519 2.8684
+33 1.95 0.992517 3.14729
+34 2.01 0.986712 3.44187
+35 2.07 1.03171 3.76854
+36 2.13 1.01271 4.10806
+37 2.19 1.07169 4.48787
+38 2.25 0.973352 4.852
+39 2.31 0.994899 5.24429
+40 2.37 0.976957 5.64979
+41 2.43 1.03556 6.10164
+42 2.49 0.998715 6.5592
+43 2.55 1.02501 7.05171
+44 2.61 1.03652 7.57347
+45 2.67 0.994525 8.09736
+46 2.73 0.970719 8.63195
+47 2.79 0.988941 9.20078
+48 2.85 0.976262 9.78673
+49 2.91 1.03331 10.4333
+50 2.97 1.01168 11.0927
+101800 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0.21169 0.000356633
+4 0.21 0 0.000356633
+5 0.27 0.0659362 0.000713267
+6 0.33 0.220995 0.00249643
+7 0.39 0.316701 0.00606277
+8 0.45 0.452189 0.0128388
+9 0.51 0.667262 0.0256776
+10 0.57 0.697561 0.0424394
+11 0.63 1.02072 0.0723966
+12 0.69 0.962469 0.106277
+13 0.75 1.05484 0.150143
+14 0.81 1.08825 0.202924
+15 0.87 1.15373 0.267475
+16 0.93 1.18264 0.343081
+17 0.99 0.955066 0.412268
+18 1.05 1.13354 0.504636
+19 1.11 0.998673 0.595578
+20 1.17 0.962344 0.692939
+21 1.23 0.91861 0.795649
+22 1.29 0.884457 0.904422
+23 1.35 0.887035 1.02389
+24 1.41 0.949091 1.16334
+25 1.47 1.02953 1.32775
+26 1.53 0.985426 1.49822
+27 1.59 1.02891 1.69044
+28 1.65 1.01749 1.89515
+29 1.71 1.07443 2.12732
+30 1.77 1.03672 2.36733
+31 1.83 0.945361 2.60128
+32 1.89 0.978168 2.85949
+33 1.95 1.01156 3.14372
+34 2.01 1.00702 3.44437
+35 2.07 0.996798 3.75999
+36 2.13 0.965901 4.08381
+37 2.19 1.01031 4.44187
+38 2.25 1.0439 4.83238
+39 2.31 1.00756 5.22967
+40 2.37 0.991564 5.64123
+41 2.43 0.958734 6.05956
+42 2.49 0.988596 6.51248
+43 2.55 0.973054 6.98003
+44 2.61 0.991888 7.47932
+45 2.67 1.03108 8.02247
+46 2.73 1.01475 8.58131
+47 2.79 1.00382 9.1587
+48 2.85 1.01548 9.76819
+49 2.91 0.994555 10.3905
+50 2.97 0.991437 11.0367
+101850 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0.131872 0.000713267
+6 0.33 0.220995 0.00249643
+7 0.39 0.380042 0.00677603
+8 0.45 0.523588 0.014622
+9 0.51 0.537517 0.0249643
+10 0.57 0.742086 0.042796
+11 0.63 0.947808 0.0706134
+12 0.69 0.851025 0.100571
+13 0.75 1.23493 0.151926
+14 0.81 1.03678 0.202211
+15 0.87 1.19197 0.268902
+16 0.93 1.13802 0.341655
+17 0.99 1.03383 0.416548
+18 1.05 0.980361 0.496434
+19 1.11 0.939927 0.582026
+20 1.17 0.920044 0.675107
+21 1.23 0.934558 0.779601
+22 1.29 0.983053 0.900499
+23 1.35 1.00619 1.03602
+24 1.41 1.03648 1.1883
+25 1.47 0.989335 1.34629
+26 1.53 0.919456 1.50535
+27 1.59 1.04036 1.69971
+28 1.65 1.05294 1.91155
+29 1.71 1.01832 2.1316
+30 1.77 0.981265 2.35877
+31 1.83 0.995799 2.60521
+32 1.89 0.924125 2.84914
+33 1.95 0.995056 3.12874
+34 2.01 1.00105 3.4276
+35 2.07 1.02946 3.75357
+36 2.13 0.992495 4.08631
+37 2.19 1.00427 4.44223
+38 2.25 1.00576 4.81847
+39 2.31 0.973192 5.20221
+40 2.37 1.02593 5.62803
+41 2.43 0.989793 6.05991
+42 2.49 0.994045 6.51534
+43 2.55 0.985672 6.98894
+44 2.61 1.0259 7.50535
+45 2.67 1.00536 8.03495
+46 2.73 0.956473 8.5617
+47 2.79 1.03234 9.15549
+48 2.85 1.01013 9.76177
+49 2.91 1.02362 10.4023
+50 2.97 0.962438 11.0296
+101900 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0.176796 0.00142653
+7 0.39 0.475052 0.00677603
+8 0.45 0.452189 0.0135521
+9 0.51 0.537517 0.0238944
+10 0.57 0.801453 0.0431526
+11 0.63 0.911353 0.0699001
+12 0.69 0.840894 0.0995007
+13 0.75 0.951927 0.139087
+14 0.81 1.25737 0.200071
+15 0.87 1.12823 0.263195
+16 0.93 1.31653 0.347361
+17 0.99 0.99445 0.419401
+18 1.05 0.954101 0.497147
+19 1.11 0.94776 0.583452
+20 1.17 0.958819 0.680456
+21 1.23 0.896282 0.78067
+22 1.29 1.02365 0.906562
+23 1.35 0.971766 1.03745
+24 1.41 0.99521 1.18367
+25 1.47 1.0407 1.34986
+26 1.53 0.958626 1.51569
+27 1.59 1.02128 1.70649
+28 1.65 1.03167 1.91405
+29 1.71 0.935796 2.11626
+30 1.77 1.0398 2.35699
+31 1.83 0.966977 2.59629
+32 1.89 1.04302 2.87161
+33 1.95 1.05471 3.16797
+34 2.01 1.01299 3.4704
+35 2.07 0.988913 3.78352
+36 2.13 0.981858 4.1127
+37 2.19 0.968043 4.45578
+38 2.25 1.04199 4.84558
+39 2.31 0.974097 5.22967
+40 2.37 0.986408 5.63909
+41 2.43 1.03148 6.08916
+42 2.49 1.00261 6.5485
+43 2.55 0.977508 7.01819
+44 2.61 0.997556 7.52033
+45 2.67 1.03921 8.06776
+46 2.73 1.02771 8.63374
+47 2.79 0.97344 9.19365
+48 2.85 1.04162 9.81883
+49 2.91 0.997975 10.4433
+50 2.97 1.00566 11.0988
+101950 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0.131872 0.000713267
+6 0.33 0.0883979 0.00142653
+7 0.39 0.285031 0.00463623
+8 0.45 0.356992 0.00998573
+9 0.51 0.722867 0.0238944
+10 0.57 0.742086 0.0417261
+11 0.63 0.899202 0.068117
+12 0.69 1.07391 0.10592
+13 0.75 1.09772 0.151569
+14 0.81 1.28678 0.21398
+15 0.87 1.10911 0.276034
+16 0.93 1.05434 0.343438
+17 0.99 1.06337 0.420471
+18 1.05 1.02413 0.503923
+19 1.11 0.8616 0.582382
+20 1.17 0.927094 0.676177
+21 1.23 0.893093 0.776034
+22 1.29 0.988852 0.897646
+23 1.35 1.03796 1.03745
+24 1.41 0.963655 1.17903
+25 1.47 1.0608 1.34843
+26 1.53 0.999857 1.5214
+27 1.59 1.03273 1.71434
+28 1.65 1.06181 1.92796
+29 1.71 1.07113 2.15942
+30 1.77 0.918106 2.37197
+31 1.83 0.90501 2.59593
+32 1.89 1.0187 2.86484
+33 1.95 0.989979 3.14301
+34 2.01 1.01897 3.44722
+35 2.07 1.03171 3.77389
+36 2.13 0.989304 4.10556
+37 2.19 0.972068 4.45007
+38 2.25 1.00386 4.82561
+39 2.31 0.974097 5.2097
+40 2.37 1.01648 5.6316
+41 2.43 1.01595 6.07489
+42 2.49 1.02207 6.54315
+43 2.55 0.95153 7.00036
+44 2.61 0.975593 7.49144
+45 2.67 0.998587 8.01748
+46 2.73 1.02123 8.57989
+47 2.79 1.02614 9.17011
+48 2.85 0.991117 9.76498
+49 2.91 1.00424 10.3934
+50 2.97 1.02372 11.0606
+102000 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0.131872 0.000713267
+6 0.33 0.0883979 0.00142653
+7 0.39 0.190021 0.00356633
+8 0.45 0.666384 0.0135521
+9 0.51 0.722867 0.0274608
+10 0.57 0.756928 0.0456491
+11 0.63 0.729083 0.0670471
+12 0.69 0.871288 0.0977175
+13 0.75 1.02911 0.140514
+14 0.81 1.08825 0.193295
+15 0.87 1.09636 0.254636
+16 0.93 1.14359 0.327746
+17 0.99 1.14214 0.410485
+18 1.05 1.03288 0.49465
+19 1.11 1.00651 0.586305
+20 1.17 0.934144 0.680813
+21 1.23 0.937747 0.785663
+22 1.29 0.913456 0.898003
+23 1.35 0.987654 1.03103
+24 1.41 0.939382 1.16904
+25 1.47 1.03623 1.33452
+26 1.53 1.05552 1.51712
+27 1.59 1.04227 1.71184
+28 1.65 1.03345 1.91976
+29 1.71 0.968804 2.1291
+30 1.77 0.982805 2.35663
+31 1.83 0.99724 2.60342
+32 1.89 0.995731 2.86626
+33 1.95 0.963326 3.13695
+34 2.01 0.96521 3.42511
+35 2.07 0.994545 3.74001
+36 2.13 1.02654 4.08417
+37 2.19 0.97408 4.42939
+38 2.25 0.979072 4.79565
+39 2.31 1.02565 5.20007
+40 2.37 1.01992 5.6234
+41 2.43 0.970994 6.04708
+42 2.49 0.98159 6.49679
+43 2.55 1.01313 6.98359
+44 2.61 0.965674 7.46969
+45 2.67 1.04936 8.02247
+46 2.73 1.0562 8.60414
+47 2.79 0.951119 9.15121
+48 2.85 1.02142 9.76427
+49 2.91 1.02077 10.403
+50 2.97 1.00019 11.0549
+102050 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0.108706 0.000356633
+5 0.27 0 0.000356633
+6 0.33 0.132597 0.00142653
+7 0.39 0.253361 0.0042796
+8 0.45 0.42839 0.010699
+9 0.51 0.574587 0.0217546
+10 0.57 0.756928 0.0399429
+11 0.63 0.899202 0.0663338
+12 0.69 1.12457 0.10592
+13 0.75 0.951927 0.145506
+14 0.81 1.27943 0.207561
+15 0.87 1.14735 0.271755
+16 0.93 1.1157 0.343081
+17 0.99 0.900912 0.408345
+18 1.05 1.0285 0.492154
+19 1.11 0.943844 0.578103
+20 1.17 0.912993 0.670471
+21 1.23 1.09723 0.793153
+22 1.29 0.922156 0.906562
+23 1.35 0.9294 1.03174
+24 1.41 0.9588 1.17261
+25 1.47 0.982636 1.32953
+26 1.53 1.04315 1.50999
+27 1.59 1.09381 1.71434
+28 1.65 0.937723 1.903
+29 1.71 1.00676 2.12054
+30 1.77 1.02132 2.35699
+31 1.83 0.990035 2.602
+32 1.89 1.02275 2.87197
+33 1.95 1.04963 3.1669
+34 2.01 1.03211 3.47504
+35 2.07 0.91345 3.76427
+36 2.13 1.02441 4.1077
+37 2.19 1.03345 4.47397
+38 2.25 1.00672 4.85057
+39 2.31 1.01932 5.2525
+40 2.37 0.958913 5.6505
+41 2.43 0.949743 6.06491
+42 2.49 1.01351 6.52924
+43 2.55 1.00349 7.01141
+44 2.61 0.996848 7.5132
+45 2.67 1.0101 8.04529
+46 2.73 1.03548 8.61555
+47 2.79 1.04102 9.21434
+48 2.85 0.986958 9.8067
+49 2.91 0.986576 10.424
+50 2.97 1.00402 11.0785
+102100 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0.217411 0.000713267
+5 0.27 0 0.000713267
+6 0.33 0.0883979 0.00142653
+7 0.39 0.190021 0.00356633
+8 0.45 0.237994 0.00713267
+9 0.51 0.611657 0.0189016
+10 0.57 1.00924 0.0431526
+11 0.63 0.826294 0.0674037
+12 0.69 1.12457 0.10699
+13 0.75 1.02053 0.149429
+14 0.81 1.10295 0.202924
+15 0.87 1.08361 0.263552
+16 0.93 1.16033 0.337732
+17 0.99 1.0486 0.413695
+18 1.05 0.984738 0.493937
+19 1.11 0.967342 0.582026
+20 1.17 0.870693 0.670114
+21 1.23 0.972833 0.778887
+22 1.29 1.05265 0.908345
+23 1.35 0.985006 1.04101
+24 1.41 0.978219 1.18474
+25 1.47 0.962536 1.33845
+26 1.53 0.97718 1.50749
+27 1.59 1.07854 1.70899
+28 1.65 0.983812 1.90692
+29 1.71 0.983658 2.11947
+30 1.77 0.939673 2.33702
+31 1.83 0.974183 2.5781
+32 1.89 0.988976 2.83916
+33 1.95 1.01156 3.1234
+34 2.01 1.02494 3.42939
+35 2.07 0.939355 3.72682
+36 2.13 1.01803 4.06812
+37 2.19 1.02037 4.42974
+38 2.25 1.00862 4.80706
+39 2.31 1.0555 5.22325
+40 2.37 0.980394 5.63017
+41 2.43 1.02494 6.07739
+42 2.49 0.913867 6.49608
+43 2.55 0.981219 6.96755
+44 2.61 0.979844 7.46077
+45 2.67 0.994525 7.98466
+46 2.73 1.04519 8.56027
+47 2.79 0.980261 9.12411
+48 2.85 1.0339 9.74465
+49 2.91 0.996835 10.3684
+50 2.97 1.01387 11.0292
+102150 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0.217411 0.000713267
+5 0.27 0 0.000713267
+6 0.33 0.176796 0.0021398
+7 0.39 0.285031 0.0053495
+8 0.45 0.594986 0.0142653
+9 0.51 0.648727 0.0267475
+10 0.57 0.786611 0.0456491
+11 0.63 0.911353 0.0723966
+12 0.69 1.04352 0.10913
+13 0.75 1.19205 0.158702
+14 0.81 1.07354 0.21077
+15 0.87 1.07086 0.270685
+16 0.93 1.0655 0.338802
+17 0.99 1.03383 0.413695
+18 1.05 0.984738 0.493937
+19 1.11 0.998673 0.584879
+20 1.17 0.955294 0.681526
+21 1.23 0.976023 0.790656
+22 1.29 0.916356 0.903352
+23 1.35 1.03002 1.04208
+24 1.41 1.01948 1.19187
+25 1.47 0.978169 1.34807
+26 1.53 0.946257 1.51177
+27 1.59 0.998368 1.69829
+28 1.65 0.985584 1.89658
+29 1.71 1.04472 2.12233
+30 1.77 1.02902 2.36056
+31 1.83 0.98427 2.60414
+32 1.89 1.02816 2.87553
+33 1.95 0.974748 3.14943
+34 2.01 0.959237 3.43581
+35 2.07 0.992292 3.75
+36 2.13 1.07866 4.11163
+37 2.19 0.934835 4.44294
+38 2.25 1.02388 4.82596
+39 2.31 0.99309 5.21755
+40 2.37 0.968364 5.61947
+41 2.43 0.982437 6.04815
+42 2.49 0.997937 6.50535
+43 2.55 1.02649 6.99857
+44 2.61 1.04715 7.52568
+45 2.67 0.951874 8.0271
+46 2.73 1.01411 8.58559
+47 2.79 1.01002 9.16655
+48 2.85 0.988741 9.75999
+49 2.91 1.03103 10.4051
+50 2.97 0.982136 11.0453
+102200 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0.176796 0.00142653
+7 0.39 0.253361 0.0042796
+8 0.45 0.452189 0.0110556
+9 0.51 0.611657 0.0228245
+10 0.57 0.593669 0.0370899
+11 0.63 0.935656 0.0645506
+12 0.69 1.01313 0.100214
+13 0.75 1.12345 0.146933
+14 0.81 1.16913 0.203638
+15 0.87 1.25571 0.273894
+16 0.93 1.13802 0.346648
+17 0.99 0.999373 0.419044
+18 1.05 0.914712 0.493581
+19 1.11 0.865517 0.572397
+20 1.17 0.958819 0.669401
+21 1.23 0.960075 0.776748
+22 1.29 1.01785 0.901926
+23 1.35 1.05915 1.04458
+24 1.41 0.985501 1.18937
+25 1.47 0.94467 1.34023
+26 1.53 0.958626 1.50606
+27 1.59 1.05182 1.70257
+28 1.65 1.07776 1.9194
+29 1.71 1.00841 2.1373
+30 1.77 1.00591 2.37019
+31 1.83 0.94392 2.60378
+32 1.89 0.99438 2.86626
+33 1.95 1.01663 3.15193
+34 2.01 1.05719 3.46755
+35 2.07 0.992292 3.78174
+36 2.13 0.987177 4.1127
+37 2.19 1.03043 4.47789
+38 2.25 0.960005 4.83702
+39 2.31 1.00575 5.23359
+40 2.37 0.970083 5.63623
+41 2.43 1.02085 6.08167
+42 2.49 0.98159 6.53138
+43 2.55 0.978992 7.00178
+44 2.61 0.987637 7.49893
+45 2.67 0.987755 8.01926
+46 2.73 0.998565 8.56919
+47 2.79 1.01064 9.1505
+48 2.85 0.998248 9.74964
+49 2.91 0.994555 10.372
+50 2.97 0.988702 11.0164
+102250 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0.108706 0.000356633
+5 0.27 0.0659362 0.000713267
+6 0.33 0.353592 0.00356633
+7 0.39 0.411712 0.00820257
+8 0.45 0.523588 0.0160485
+9 0.51 0.630192 0.028174
+10 0.57 0.608511 0.042796
+11 0.63 0.850597 0.0677603
+12 0.69 1.12457 0.107347
+13 0.75 0.909048 0.14515
+14 0.81 1.2059 0.203638
+15 0.87 1.12186 0.266405
+16 0.93 1.07107 0.334879
+17 0.99 1.06337 0.411912
+18 1.05 0.892829 0.484665
+19 1.11 0.896847 0.566334
+20 1.17 0.923569 0.659772
+21 1.23 0.953695 0.766405
+22 1.29 0.980153 0.886947
+23 1.35 1.03532 1.02639
+24 1.41 0.978219 1.17011
+25 1.47 0.989335 1.3281
+26 1.53 0.995734 1.50036
+27 1.59 1.02318 1.69151
+28 1.65 1.01749 1.89622
+29 1.71 0.98861 2.10984
+30 1.77 0.96432 2.3331
+31 1.83 1.05488 2.59415
+32 1.89 1.01194 2.86127
+33 1.95 1.03694 3.15264
+34 2.01 1.05958 3.46897
+35 2.07 0.976524 3.77817
+36 2.13 0.947817 4.09593
+37 2.19 1.01936 4.4572
+38 2.25 0.988605 4.82703
+39 2.31 1.02656 5.23181
+40 2.37 0.998438 5.64622
+41 2.43 1.00124 6.0831
+42 2.49 0.935663 6.51177
+43 2.55 0.990125 6.98752
+44 2.61 0.981969 7.48181
+45 2.67 0.992494 8.00464
+46 2.73 1.00763 8.55956
+47 2.79 1.03978 9.15763
+48 2.85 0.988146 9.75071
+49 2.91 1.01792 10.3877
+50 2.97 1.0177 11.051
+102300 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0.131872 0.000713267
+6 0.33 0.0883979 0.00142653
+7 0.39 0.348371 0.0053495
+8 0.45 0.475989 0.0124822
+9 0.51 0.500446 0.0221113
+10 0.57 0.890503 0.0435093
+11 0.63 0.959959 0.0716833
+12 0.69 1.03339 0.10806
+13 0.75 1.08914 0.153352
+14 0.81 0.977953 0.200785
+15 0.87 1.07086 0.260699
+16 0.93 1.15475 0.334522
+17 0.99 1.15691 0.418331
+18 1.05 0.997868 0.499643
+19 1.11 0.955593 0.586662
+20 1.17 0.97997 0.685806
+21 1.23 0.928178 0.789586
+22 1.29 0.991752 0.911555
+23 1.35 0.926753 1.03638
+24 1.41 0.907826 1.16976
+25 1.47 1.01167 1.33131
+26 1.53 1.01223 1.50642
+27 1.59 1.05945 1.70435
+28 1.65 0.999766 1.90549
+29 1.71 1.04472 2.13124
+30 1.77 1.02132 2.36769
+31 1.83 1.05777 2.62946
+32 1.89 0.98087 2.88837
+33 1.95 1.02805 3.17725
+34 2.01 0.979545 3.46969
+35 2.07 1.00581 3.78816
+36 2.13 0.957391 4.10913
+37 2.19 1.00024 4.46362
+38 2.25 0.996232 4.83631
+39 2.31 1.00666 5.23324
+40 2.37 0.97352 5.6373
+41 2.43 1.01513 6.08024
+42 2.49 0.973027 6.52603
+43 2.55 0.970828 6.99251
+44 2.61 1.02519 7.50856
+45 2.67 1.02567 8.04886
+46 2.73 1.01605 8.60842
+47 2.79 0.993281 9.17974
+48 2.85 1.03449 9.80064
+49 2.91 0.997405 10.4248
+50 2.97 0.976664 11.0613
+102350 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0.108706 0.000356633
+5 0.27 0.0659362 0.000713267
+6 0.33 0.220995 0.00249643
+7 0.39 0.411712 0.00713267
+8 0.45 0.452189 0.0139087
+9 0.51 0.630192 0.0260342
+10 0.57 0.771769 0.0445792
+11 0.63 0.899202 0.07097
+12 0.69 1.11444 0.1102
+13 0.75 1.04626 0.153709
+14 0.81 1.07354 0.205777
+15 0.87 1.08998 0.266762
+16 0.93 1.16591 0.341298
+17 0.99 1.14706 0.424394
+18 1.05 1.00662 0.506419
+19 1.11 0.99084 0.596648
+20 1.17 0.891843 0.686876
+21 1.23 0.928178 0.790656
+22 1.29 1.02075 0.916191
+23 1.35 0.950583 1.04422
+24 1.41 0.9588 1.18509
+25 1.47 0.987102 1.34272
+26 1.53 1.02666 1.52033
+27 1.59 0.985006 1.70435
+28 1.65 1.04054 1.91369
+29 1.71 1.04968 2.14051
+30 1.77 1.00899 2.37411
+31 1.83 0.98427 2.61769
+32 1.89 1.02816 2.88909
+33 1.95 1.00521 3.17154
+34 2.01 1.02374 3.47718
+35 2.07 0.906692 3.76427
+36 2.13 0.961646 4.08666
+37 2.19 1.0254 4.45007
+38 2.25 1.06773 4.8495
+39 2.31 1.01027 5.24786
+40 2.37 1.01219 5.66797
+41 2.43 0.987341 6.09879
+42 2.49 0.992488 6.5535
+43 2.55 1.00052 7.03424
+44 2.61 0.952921 7.51391
+45 2.67 1.04395 8.06384
+46 2.73 0.966834 8.59629
+47 2.79 1.02738 9.18723
+48 2.85 1.00657 9.79137
+49 2.91 1.00652 10.4212
+50 2.97 1.00129 11.0738
+102400 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0.220995 0.00178317
+7 0.39 0.285031 0.00499287
+8 0.45 0.475989 0.0121255
+9 0.51 0.797007 0.0274608
+10 0.57 0.563985 0.0410128
+11 0.63 1.03287 0.0713267
+12 0.69 1.07391 0.10913
+13 0.75 1.02911 0.151926
+14 0.81 1.05148 0.202924
+15 0.87 1.19835 0.269971
+16 0.93 1.13802 0.342725
+17 0.99 1.10768 0.422967
+18 1.05 0.879699 0.49465
+19 1.11 0.998673 0.585592
+20 1.17 0.976445 0.684379
+21 1.23 0.889903 0.78388
+22 1.29 0.890257 0.893367
+23 1.35 1.02208 1.03103
+24 1.41 0.987928 1.17618
+25 1.47 1.08983 1.35021
+26 1.53 1.00398 1.52389
+27 1.59 0.988823 1.70863
+28 1.65 0.999766 1.90977
+29 1.71 1.04803 2.13623
+30 1.77 0.982805 2.36377
+31 1.83 0.968418 2.60342
+32 1.89 1.05383 2.8816
+33 1.95 0.945557 3.14729
+34 2.01 0.985518 3.44151
+35 2.07 1.02496 3.76605
+36 2.13 1.0276 4.11056
+37 2.19 0.986156 4.46006
+38 2.25 1.0029 4.83524
+39 2.31 1.00213 5.23039
+40 2.37 1.01219 5.6505
+41 2.43 0.974264 6.07561
+42 2.49 1.02285 6.54422
+43 2.55 1.01017 7.0296
+44 2.61 0.950087 7.50785
+45 2.67 1.01145 8.04066
+46 2.73 1.02253 8.60378
+47 2.79 1.01002 9.18474
+48 2.85 1.02261 9.7985
+49 2.91 0.980876 10.4123
+50 2.97 1.01661 11.0749
+102450 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0.132597 0.0010699
+7 0.39 0.443382 0.00606277
+8 0.45 0.333192 0.0110556
+9 0.51 0.574587 0.0221113
+10 0.57 0.786611 0.0410128
+11 0.63 1.16653 0.0752496
+12 0.69 1.07391 0.113053
+13 0.75 1.09772 0.158702
+14 0.81 0.992659 0.206847
+15 0.87 1.17922 0.272825
+16 0.93 1.16033 0.347004
+17 0.99 0.920605 0.413695
+18 1.05 1.03726 0.498217
+19 1.11 0.924262 0.582382
+20 1.17 0.97292 0.680813
+21 1.23 0.928178 0.784593
+22 1.29 1.03525 0.911912
+23 1.35 1.04326 1.05243
+24 1.41 0.970937 1.19508
+25 1.47 0.987102 1.35271
+26 1.53 1.02666 1.53031
+27 1.59 1.01555 1.72004
+28 1.65 1.04408 1.9301
+29 1.71 1.01997 2.1505
+30 1.77 1.01053 2.38445
+31 1.83 1.00589 2.63338
+32 1.89 0.999785 2.89729
+33 1.95 0.964595 3.16833
+34 2.01 1.01658 3.47183
+35 2.07 0.955124 3.77425
+36 2.13 0.997814 4.10877
+37 2.19 1.00125 4.46362
+38 2.25 1.00672 4.84023
+39 2.31 1.02475 5.24429
+40 2.37 1.00187 5.66013
+41 2.43 0.977533 6.08666
+42 2.49 1.05476 6.5699
+43 2.55 1.0161 7.05813
+44 2.61 1.01669 7.5699
+45 2.67 1.004 8.09879
+46 2.73 0.996622 8.64765
+47 2.79 1.00258 9.22432
+48 2.85 0.978639 9.8117
+49 2.91 0.970047 10.4187
+50 2.97 0.993626 11.0663
+102500 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0.217411 0.000713267
+5 0.27 0.0659362 0.0010699
+6 0.33 0.265194 0.0032097
+7 0.39 0.253361 0.00606277
+8 0.45 0.452189 0.0128388
+9 0.51 0.759937 0.0274608
+10 0.57 0.712403 0.0445792
+11 0.63 0.826294 0.0688302
+12 0.69 0.932075 0.101641
+13 0.75 1.08914 0.146933
+14 0.81 1.13972 0.202211
+15 0.87 1.14098 0.266049
+16 0.93 1.14917 0.339515
+17 0.99 1.16676 0.424037
+18 1.05 1.03726 0.508559
+19 1.11 0.959509 0.595934
+20 1.17 0.990545 0.696148
+21 1.23 0.953695 0.802782
+22 1.29 0.954054 0.920114
+23 1.35 1.00619 1.05563
+24 1.41 0.912681 1.18973
+25 1.47 0.922338 1.33702
+26 1.53 0.989549 1.5082
+27 1.59 1.02509 1.69971
+28 1.65 1.04231 1.90942
+29 1.71 1.03977 2.13409
+30 1.77 1.05367 2.37803
+31 1.83 0.962654 2.61626
+32 1.89 0.983572 2.87589
+33 1.95 0.997594 3.15621
+34 2.01 0.966405 3.44472
+35 2.07 0.988913 3.75785
+36 2.13 0.968029 4.08238
+37 2.19 1.03949 4.45078
+38 2.25 0.995278 4.82311
+39 2.31 1.01389 5.2229
+40 2.37 1.00445 5.6398
+41 2.43 0.99061 6.07204
+42 2.49 1.04153 6.54922
+43 2.55 1.01165 7.03531
+44 2.61 1.00181 7.53959
+45 2.67 1.00603 8.06954
+46 2.73 0.986909 8.61305
+47 2.79 1.00072 9.18866
+48 2.85 0.96735 9.76926
+49 2.91 0.988856 10.388
+50 2.97 0.993079 11.0353
+102550 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0.265194 0.0021398
+7 0.39 0.221691 0.00463623
+8 0.45 0.499788 0.0121255
+9 0.51 0.759937 0.0267475
+10 0.57 0.94987 0.049572
+11 0.63 0.923505 0.0766762
+12 0.69 0.901681 0.108417
+13 0.75 1.07199 0.152996
+14 0.81 1.05884 0.204351
+15 0.87 1.12186 0.267118
+16 0.93 1.18264 0.342725
+17 0.99 1.07322 0.420471
+18 1.05 0.984738 0.500713
+19 1.11 1.00651 0.592368
+20 1.17 0.905943 0.684023
+21 1.23 0.976023 0.793153
+22 1.29 1.01205 0.917618
+23 1.35 0.953231 1.04601
+24 1.41 1.00492 1.19365
+25 1.47 1.0876 1.36733
+26 1.53 0.933887 1.52889
+27 1.59 0.990732 1.71398
+28 1.65 0.904043 1.89586
+29 1.71 1.00511 2.11305
+30 1.77 1.01053 2.347
+31 1.83 1.05921 2.60913
+32 1.89 1.02275 2.8791
+33 1.95 1.01536 3.16441
+34 2.01 1.03449 3.47325
+35 2.07 0.960755 3.77746
+36 2.13 0.987177 4.10842
+37 2.19 1.00024 4.46291
+38 2.25 0.980978 4.82989
+39 2.31 1.00033 5.22432
+40 2.37 1.02593 5.65014
+41 2.43 0.988158 6.08131
+42 2.49 1.02985 6.55314
+43 2.55 1.03837 7.05207
+44 2.61 0.977718 7.54422
+45 2.67 1.04259 8.09344
+46 2.73 0.986261 8.63659
+47 2.79 0.979021 9.19971
+48 2.85 0.991712 9.79494
+49 2.91 0.996265 10.4183
+50 2.97 1.01934 11.0827
+102600 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0.21169 0.000356633
+4 0.21 0 0.000356633
+5 0.27 0.131872 0.0010699
+6 0.33 0.132597 0.0021398
+7 0.39 0.285031 0.0053495
+8 0.45 0.594986 0.0142653
+9 0.51 0.518981 0.0242511
+10 0.57 0.697561 0.0410128
+11 0.63 0.959959 0.0691869
+12 0.69 1.01313 0.10485
+13 0.75 0.951927 0.144437
+14 0.81 1.19119 0.202211
+15 0.87 1.21109 0.269971
+16 0.93 1.24959 0.349857
+17 0.99 0.984604 0.421184
+18 1.05 1.00224 0.502853
+19 1.11 0.959509 0.590228
+20 1.17 0.937669 0.685093
+21 1.23 0.886713 0.784237
+22 1.29 0.968553 0.903352
+23 1.35 0.969118 1.03388
+24 1.41 1.0122 1.1826
+25 1.47 1.0608 1.352
+26 1.53 0.983365 1.52211
+27 1.59 1.02128 1.71291
+28 1.65 1.02458 1.91904
+29 1.71 1.07443 2.15121
+30 1.77 0.968941 2.37553
+31 1.83 0.995799 2.62197
+32 1.89 0.945742 2.87161
+33 1.95 0.984902 3.14836
+34 2.01 1.00344 3.44793
+35 2.07 1.02045 3.77104
+36 2.13 1.02547 4.11484
+37 2.19 1.00125 4.46969
+38 2.25 1.02674 4.85378
+39 2.31 0.995804 5.24643
+40 2.37 1.00875 5.66512
+41 2.43 0.994697 6.09914
+42 2.49 0.984704 6.55029
+43 2.55 0.96489 7.01391
+44 2.61 0.947962 7.49108
+45 2.67 1.05478 8.04672
+46 2.73 1.00116 8.59807
+47 2.79 1.04846 9.20114
+48 2.85 0.962002 9.77853
+49 2.91 1.0202 10.4169
+50 2.97 0.974476 11.0521
+102650 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0.265194 0.0021398
+7 0.39 0.380042 0.0064194
+8 0.45 0.475989 0.0135521
+9 0.51 0.537517 0.0238944
+10 0.57 0.771769 0.0424394
+11 0.63 0.984262 0.0713267
+12 0.69 0.962469 0.105207
+13 0.75 1.08057 0.150143
+14 0.81 1.0956 0.203281
+15 0.87 1.23022 0.272111
+16 0.93 1.13802 0.344864
+17 0.99 1.15199 0.428317
+18 1.05 0.975984 0.507846
+19 1.11 0.892931 0.589158
+20 1.17 0.955294 0.685806
+21 1.23 1.03025 0.800999
+22 1.29 0.980153 0.921541
+23 1.35 0.947936 1.04922
+24 1.41 0.99521 1.19544
+25 1.47 1.08313 1.3684
+26 1.53 1.00192 1.54173
+27 1.59 0.996459 1.72789
+28 1.65 0.98913 1.92689
+29 1.71 1.02657 2.14872
+30 1.77 0.947375 2.36805
+31 1.83 1.00877 2.61769
+32 1.89 0.932232 2.86377
+33 1.95 0.973479 3.1373
+34 2.01 1.05122 3.45114
+35 2.07 1.02383 3.77532
+36 2.13 1.05207 4.12803
+37 2.19 0.955967 4.46683
+38 2.25 0.956192 4.82454
+39 2.31 1.06906 5.24608
+40 2.37 1.03882 5.67725
+41 2.43 0.970994 6.10093
+42 2.49 1.00728 6.56241
+43 2.55 1.08365 7.0831
+44 2.61 0.930958 7.55171
+45 2.67 0.993171 8.07489
+46 2.73 0.997918 8.62447
+47 2.79 0.97778 9.18688
+48 2.85 1.05113 9.81776
+49 2.91 0.999685 10.4433
+50 2.97 1.00566 11.0988
+102700 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0.108706 0.000356633
+5 0.27 0 0.000356633
+6 0.33 0.220995 0.0021398
+7 0.39 0.253361 0.00499287
+8 0.45 0.666384 0.0149786
+9 0.51 0.574587 0.0260342
+10 0.57 0.638194 0.0413695
+11 0.63 0.78984 0.0645506
+12 0.69 0.921944 0.0970043
+13 0.75 1.2092 0.14729
+14 0.81 1.16913 0.203994
+15 0.87 1.21747 0.272111
+16 0.93 1.02087 0.337375
+17 0.99 1.02399 0.411555
+18 1.05 0.962855 0.490014
+19 1.11 0.99084 0.580243
+20 1.17 0.860117 0.667261
+21 1.23 0.963264 0.774964
+22 1.29 1.00625 0.898716
+23 1.35 1.01678 1.03566
+24 1.41 1.00977 1.18402
+25 1.47 0.971469 1.33916
+26 1.53 1.02872 1.51712
+27 1.59 1.05564 1.71434
+28 1.65 0.98913 1.91334
+29 1.71 0.955601 2.11983
+30 1.77 0.975103 2.34558
+31 1.83 1.00733 2.59486
+32 1.89 1.03626 2.8684
+33 1.95 0.993786 3.14765
+34 2.01 0.909065 3.41904
+35 2.07 1.07226 3.75856
+36 2.13 1.03717 4.10628
+37 2.19 1.02238 4.46862
+38 2.25 0.955238 4.82596
+39 2.31 1.01751 5.22718
+40 2.37 0.989845 5.63802
+41 2.43 1.02412 6.08488
+42 2.49 0.986261 6.53673
+43 2.55 0.988641 7.01177
+44 2.61 1.02731 7.52889
+45 2.67 1.03582 8.07454
+46 2.73 0.948054 8.59665
+47 2.79 0.979021 9.15977
+48 2.85 1.00716 9.76427
+49 2.91 1.00481 10.393
+50 2.97 0.99089 11.0389
+102750 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0.21169 0.000356633
+4 0.21 0.108706 0.000713267
+5 0.27 0 0.000713267
+6 0.33 0.220995 0.00249643
+7 0.39 0.253361 0.0053495
+8 0.45 0.523588 0.0131954
+9 0.51 0.481911 0.0224679
+10 0.57 0.86082 0.0431526
+11 0.63 1.06932 0.0745364
+12 0.69 0.992863 0.109486
+13 0.75 1.11487 0.155849
+14 0.81 1.08825 0.208631
+15 0.87 1.07086 0.268545
+16 0.93 1.11012 0.339515
+17 0.99 1.10768 0.419757
+18 1.05 0.997868 0.50107
+19 1.11 0.959509 0.588445
+20 1.17 0.958819 0.685449
+21 1.23 1.0143 0.798859
+22 1.29 0.948254 0.915478
+23 1.35 0.963823 1.04529
+24 1.41 0.973364 1.1883
+25 1.47 0.877672 1.32846
+26 1.53 1.06583 1.51284
+27 1.59 1.03464 1.70613
+28 1.65 1.08131 1.92368
+29 1.71 0.982008 2.13588
+30 1.77 0.987426 2.36448
+31 1.83 0.979947 2.60699
+32 1.89 1.00924 2.8734
+33 1.95 1.03948 3.16548
+34 2.01 1.01897 3.46969
+35 2.07 0.957376 3.77282
+36 2.13 0.990368 4.10485
+37 2.19 0.931816 4.43509
+38 2.25 0.998138 4.80849
+39 2.31 1.00937 5.20649
+40 2.37 1.01304 5.62696
+41 2.43 1.00532 6.06562
+42 2.49 0.99638 6.52211
+43 2.55 1.00868 7.00678
+44 2.61 0.995431 7.50785
+45 2.67 1.02296 8.04672
+46 2.73 0.965539 8.57846
+47 2.79 0.989561 9.14765
+48 2.85 0.992306 9.74322
+49 2.91 1.00082 10.3695
+50 2.97 1.0281 11.0396
+102800 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0.0659362 0.000356633
+6 0.33 0.132597 0.00142653
+7 0.39 0.158351 0.0032097
+8 0.45 0.547387 0.0114123
+9 0.51 0.630192 0.0235378
+10 0.57 0.727244 0.0410128
+11 0.63 0.887051 0.0670471
+12 0.69 1.14483 0.107347
+13 0.75 1.14917 0.155136
+14 0.81 1.05148 0.206134
+15 0.87 1.09636 0.267475
+16 0.93 1.12686 0.339515
+17 0.99 1.15199 0.422967
+18 1.05 1.07665 0.510699
+19 1.11 0.885098 0.591298
+20 1.17 0.948244 0.687233
+21 1.23 1.00154 0.799215
+22 1.29 0.956954 0.916904
+23 1.35 0.958527 1.04601
+24 1.41 1.00735 1.19401
+25 1.47 0.987102 1.35164
+26 1.53 0.964811 1.51854
+27 1.59 1.09572 1.72325
+28 1.65 1.03522 1.93153
+29 1.71 1.02492 2.153
+30 1.77 0.975103 2.37874
+31 1.83 1.02174 2.6316
+32 1.89 0.983572 2.89123
+33 1.95 0.932865 3.15335
+34 2.01 0.973572 3.44401
+35 2.07 1.01144 3.76427
+36 2.13 1.00526 4.10128
+37 2.19 0.951942 4.43866
+38 2.25 1.06773 4.83809
+39 2.31 1.00485 5.23431
+40 2.37 1.01734 5.65656
+41 2.43 1.00369 6.09451
+42 2.49 0.980812 6.54387
+43 2.55 1.01685 7.03245
+44 2.61 0.998265 7.53495
+45 2.67 1.02296 8.07382
+46 2.73 0.984966 8.61626
+47 2.79 1.00506 9.19437
+48 2.85 0.980422 9.78281
+49 2.91 1.02533 10.4244
+50 2.97 0.994173 11.0724
+102850 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0.108706 0.000356633
+5 0.27 0.0659362 0.000713267
+6 0.33 0.132597 0.00178317
+7 0.39 0.285031 0.00499287
+8 0.45 0.356992 0.0103424
+9 0.51 0.759937 0.0249643
+10 0.57 0.756928 0.0431526
+11 0.63 0.862748 0.0684736
+12 0.69 1.01313 0.104137
+13 0.75 1.05484 0.148003
+14 0.81 1.13237 0.202924
+15 0.87 1.07086 0.262839
+16 0.93 1.15475 0.336662
+17 0.99 1.0683 0.414051
+18 1.05 0.997868 0.495364
+19 1.11 0.928178 0.579886
+20 1.17 0.920044 0.672967
+21 1.23 0.963264 0.78067
+22 1.29 0.968553 0.899786
+23 1.35 1.02737 1.03816
+24 1.41 1.0122 1.18688
+25 1.47 1.0273 1.35093
+26 1.53 1.01635 1.52675
+27 1.59 0.964007 1.70685
+28 1.65 0.966085 1.90121
+29 1.71 1.00346 2.11805
+30 1.77 1.01207 2.35235
+31 1.83 0.942479 2.58559
+32 1.89 1.04302 2.86091
+33 1.95 0.991248 3.13944
+34 2.01 1.01299 3.44187
+35 2.07 1.02721 3.76712
+36 2.13 0.980794 4.09593
+37 2.19 0.990181 4.44686
+38 2.25 1.02292 4.82953
+39 2.31 1.01208 5.2286
+40 2.37 1.02593 5.65442
+41 2.43 0.946474 6.0674
+42 2.49 0.973027 6.5132
+43 2.55 0.988641 6.98823
+44 2.61 0.98622 7.48466
+45 2.67 1.01077 8.01712
+46 2.73 1.02123 8.57953
+47 2.79 1.02056 9.16655
+48 2.85 1.00538 9.76997
+49 2.91 0.994555 10.3923
+50 2.97 1.03193 11.0649
+102900 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0.108706 0.000356633
+5 0.27 0 0.000356633
+6 0.33 0.265194 0.00249643
+7 0.39 0.316701 0.00606277
+8 0.45 0.42839 0.0124822
+9 0.51 0.556052 0.0231812
+10 0.57 0.771769 0.0417261
+11 0.63 0.862748 0.0670471
+12 0.69 0.9726 0.101284
+13 0.75 0.934775 0.140157
+14 0.81 1.19119 0.197932
+15 0.87 1.10273 0.259629
+16 0.93 1.21612 0.337375
+17 0.99 1.11753 0.418331
+18 1.05 0.962855 0.49679
+19 1.11 1.0535 0.592725
+20 1.17 0.955294 0.689372
+21 1.23 0.969643 0.797789
+22 1.29 0.910556 0.909772
+23 1.35 1.01148 1.04601
+24 1.41 0.868989 1.17368
+25 1.47 0.991569 1.33203
+26 1.53 1.03078 1.51034
+27 1.59 0.971643 1.69187
+28 1.65 0.999766 1.89301
+29 1.71 1.05958 2.12197
+30 1.77 1.05829 2.36698
+31 1.83 1.08082 2.63445
+32 1.89 0.960604 2.88802
+33 1.95 1.00394 3.17011
+34 2.01 1.04166 3.4811
+35 2.07 0.979903 3.79137
+36 2.13 0.949945 4.10984
+37 2.19 0.970055 4.45364
+38 2.25 1.0172 4.83417
+39 2.31 1.0157 5.23466
+40 2.37 1.01047 5.65407
+41 2.43 0.988158 6.08524
+42 2.49 0.999494 6.54315
+43 2.55 0.990125 7.0189
+44 2.61 1.02731 7.53602
+45 2.67 1.0013 8.06348
+46 2.73 0.95453 8.58916
+47 2.79 1.01808 9.17475
+48 2.85 1.00003 9.77496
+49 2.91 1.01735 10.4116
+50 2.97 0.976117 11.0478
+102950 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0.217411 0.000713267
+5 0.27 0 0.000713267
+6 0.33 0.0883979 0.00142653
+7 0.39 0.221691 0.00392297
+8 0.45 0.547387 0.0121255
+9 0.51 0.500446 0.0217546
+10 0.57 0.816295 0.0413695
+11 0.63 0.996413 0.0706134
+12 0.69 0.982731 0.105207
+13 0.75 1.1749 0.154066
+14 0.81 1.03678 0.204351
+15 0.87 1.24296 0.273894
+16 0.93 1.19938 0.350571
+17 0.99 1.03383 0.425464
+18 1.05 0.975984 0.504993
+19 1.11 0.892931 0.586305
+20 1.17 0.98702 0.686163
+21 1.23 0.931368 0.7903
+22 1.29 0.939555 0.905849
+23 1.35 1.01148 1.04208
+24 1.41 1.01463 1.19116
+25 1.47 1.02283 1.35449
+26 1.53 1.03903 1.53424
+27 1.59 0.9411 1.71006
+28 1.65 1.02281 1.91583
+29 1.71 0.983658 2.12839
+30 1.77 1.00591 2.36127
+31 1.83 0.991476 2.60663
+32 1.89 0.964657 2.86127
+33 1.95 1.05598 3.15799
+34 2.01 1.02613 3.46434
+35 2.07 0.991166 3.77817
+36 2.13 0.951008 4.097
+37 2.19 0.987162 4.44686
+38 2.25 0.990512 4.8174
+39 2.31 1.01208 5.21648
+40 2.37 0.998438 5.63088
+41 2.43 0.97835 6.05777
+42 2.49 1.02752 6.52853
+43 2.55 1.04802 7.0321
+44 2.61 0.990471 7.53067
+45 2.67 0.962029 8.03745
+46 2.73 1.029 8.60414
+47 2.79 0.998861 9.17867
+48 2.85 0.972697 9.76248
+49 2.91 0.998545 10.3873
+50 2.97 1.01496 11.0489
+103000 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0.0659362 0.000356633
+6 0.33 0.044199 0.000713267
+7 0.39 0.190021 0.00285307
+8 0.45 0.618786 0.0121255
+9 0.51 0.685797 0.025321
+10 0.57 0.742086 0.0431526
+11 0.63 0.959959 0.0713267
+12 0.69 0.952338 0.10485
+13 0.75 1.27781 0.157989
+14 0.81 1.14707 0.213623
+15 0.87 1.1856 0.279957
+16 0.93 1.23285 0.358773
+17 0.99 0.974758 0.429387
+18 1.05 0.954101 0.507133
+19 1.11 0.971258 0.595578
+20 1.17 0.898893 0.686519
+21 1.23 1.0143 0.799929
+22 1.29 0.994652 0.922254
+23 1.35 0.974414 1.0535
+24 1.41 0.936954 1.19116
+25 1.47 0.962536 1.34486
+26 1.53 1.01017 1.51961
+27 1.59 1.00791 1.70792
+28 1.65 1.07776 1.92475
+29 1.71 1.01502 2.14408
+30 1.77 0.99975 2.37553
+31 1.83 0.99724 2.62233
+32 1.89 0.99438 2.88481
+33 1.95 0.973479 3.15835
+34 2.01 0.998658 3.45649
+35 2.07 1.00468 3.77461
+36 2.13 1.00739 4.11234
+37 2.19 0.997225 4.46576
+38 2.25 0.981932 4.8331
+39 2.31 1.00304 5.2286
+40 2.37 0.970942 5.6316
+41 2.43 1.01513 6.07454
+42 2.49 0.984704 6.52568
+43 2.55 1.01907 7.01534
+44 2.61 1.01173 7.52461
+45 2.67 0.947812 8.02389
+46 2.73 0.962948 8.55421
+47 2.79 0.996381 9.12732
+48 2.85 0.983393 9.71755
+49 2.91 1.02476 10.3588
+50 2.97 0.98323 10.9996
+103050 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0.0659362 0.000356633
+6 0.33 0.0883979 0.0010699
+7 0.39 0.316701 0.00463623
+8 0.45 0.499788 0.0121255
+9 0.51 0.648727 0.0246077
+10 0.57 0.712403 0.0417261
+11 0.63 0.959959 0.0699001
+12 0.69 1.05365 0.10699
+13 0.75 0.969079 0.14729
+14 0.81 1.18384 0.204708
+15 0.87 1.07724 0.264979
+16 0.93 1.02087 0.330243
+17 0.99 1.12737 0.411912
+18 1.05 1.09853 0.501427
+19 1.11 0.928178 0.585949
+20 1.17 0.98702 0.685806
+21 1.23 0.91223 0.787803
+22 1.29 0.951154 0.904779
+23 1.35 0.992949 1.03852
+24 1.41 0.992783 1.18438
+25 1.47 1.02953 1.34879
+26 1.53 1.06789 1.53352
+27 1.59 1.05945 1.73146
+28 1.65 0.997993 1.93224
+29 1.71 0.958902 2.13944
+30 1.77 0.955077 2.36056
+31 1.83 1.003 2.60877
+32 1.89 0.94304 2.8577
+33 1.95 1.04329 3.15086
+34 2.01 0.983128 3.44437
+35 2.07 1.03509 3.77211
+36 2.13 1.00526 4.10913
+37 2.19 1.00528 4.46541
+38 2.25 1.04866 4.8577
+39 2.31 0.948772 5.23181
+40 2.37 0.960631 5.63053
+41 2.43 0.997149 6.06562
+42 2.49 1.00416 6.52568
+43 2.55 0.996805 7.00464
+44 2.61 0.981969 7.49893
+45 2.67 1.03582 8.04458
+46 2.73 0.97849 8.58345
+47 2.79 1.01436 9.1669
+48 2.85 1.01251 9.77461
+49 2.91 1.01279 10.4083
+50 2.97 0.99089 11.0542
+103100 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0.217411 0.000713267
+5 0.27 0 0.000713267
+6 0.33 0.0883979 0.00142653
+7 0.39 0.316701 0.00499287
+8 0.45 0.42839 0.0114123
+9 0.51 0.537517 0.0217546
+10 0.57 0.756928 0.0399429
+11 0.63 0.959959 0.068117
+12 0.69 0.881419 0.0991441
+13 0.75 1.1406 0.146576
+14 0.81 1.30884 0.210057
+15 0.87 1.04537 0.268545
+16 0.93 1.21612 0.346291
+17 0.99 0.974758 0.416904
+18 1.05 1.05476 0.502853
+19 1.11 0.8616 0.581312
+20 1.17 0.877743 0.670114
+21 1.23 1.05895 0.788516
+22 1.29 0.927955 0.902639
+23 1.35 1.02208 1.0403
+24 1.41 0.987928 1.18545
+25 1.47 0.978169 1.34165
+26 1.53 0.954503 1.50678
+27 1.59 1.00409 1.69437
+28 1.65 1.04408 1.90442
+29 1.71 0.998512 2.12019
+30 1.77 1.05521 2.36448
+31 1.83 0.972742 2.60521
+32 1.89 0.997082 2.8684
+33 1.95 0.974748 3.1423
+34 2.01 0.962821 3.42974
+35 2.07 1.00356 3.7475
+36 2.13 1.00632 4.08488
+37 2.19 1.00528 4.44116
+38 2.25 1.01911 4.8224
+39 2.31 0.981332 5.20934
+40 2.37 0.96235 5.60877
+41 2.43 0.957917 6.02675
+42 2.49 1.01973 6.49394
+43 2.55 1.03243 6.99001
+44 2.61 1.05353 7.52033
+45 2.67 0.993848 8.04387
+46 2.73 1.01022 8.60021
+47 2.79 1.01994 9.18688
+48 2.85 0.951306 9.75785
+49 2.91 0.997405 10.382
+50 2.97 1.00621 11.0378
+103150 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0.0659362 0.000356633
+6 0.33 0.132597 0.00142653
+7 0.39 0.443382 0.0064194
+8 0.45 0.309393 0.0110556
+9 0.51 0.352166 0.0178317
+10 0.57 0.86082 0.0385164
+11 0.63 0.826294 0.0627675
+12 0.69 1.11444 0.101997
+13 0.75 1.1406 0.149429
+14 0.81 1.11766 0.203638
+15 0.87 1.08998 0.264622
+16 0.93 1.08223 0.333809
+17 0.99 1.1766 0.419044
+18 1.05 0.914712 0.493581
+19 1.11 0.998673 0.584522
+20 1.17 0.835442 0.669044
+21 1.23 1.00154 0.781027
+22 1.29 0.951154 0.898003
+23 1.35 0.958527 1.0271
+24 1.41 0.963655 1.16869
+25 1.47 1.0876 1.34237
+26 1.53 1.0246 1.51961
+27 1.59 1.04609 1.71505
+28 1.65 0.997993 1.91583
+29 1.71 0.962203 2.12375
+30 1.77 0.976643 2.34986
+31 1.83 1.03039 2.60485
+32 1.89 0.9552 2.85699
+33 1.95 0.98744 3.13445
+34 2.01 0.983128 3.42796
+35 2.07 1.04748 3.75963
+36 2.13 0.977603 4.08738
+37 2.19 0.978105 4.43402
+38 2.25 0.987652 4.8035
+39 2.31 1.02746 5.20863
+40 2.37 0.959772 5.60699
+41 2.43 0.997966 6.04244
+42 2.49 1.03686 6.51748
+43 2.55 0.99829 6.99715
+44 2.61 1.02235 7.51177
+45 2.67 1.02228 8.05029
+46 2.73 0.988204 8.59451
+47 2.79 0.982741 9.15977
+48 2.85 1.01786 9.77068
+49 2.91 1.02248 10.4105
+50 2.97 0.988702 11.0549
+103200 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0.108706 0.000356633
+5 0.27 0.0659362 0.000713267
+6 0.33 0.176796 0.0021398
+7 0.39 0.285031 0.0053495
+8 0.45 0.42839 0.0117689
+9 0.51 0.722867 0.0256776
+10 0.57 0.727244 0.0431526
+11 0.63 0.935656 0.0706134
+12 0.69 0.9726 0.10485
+13 0.75 1.16633 0.153352
+14 0.81 1.04413 0.203994
+15 0.87 1.14735 0.268188
+16 0.93 1.24959 0.348074
+17 0.99 0.984604 0.419401
+18 1.05 0.932218 0.495364
+19 1.11 1.0535 0.591298
+20 1.17 0.96587 0.689016
+21 1.23 0.867576 0.78602
+22 1.29 0.971453 0.905492
+23 1.35 0.921457 1.0296
+24 1.41 0.992783 1.17546
+25 1.47 1.05187 1.34344
+26 1.53 1.04727 1.52461
+27 1.59 0.962099 1.70435
+28 1.65 1.06713 1.91904
+29 1.71 1.04472 2.14479
+30 1.77 1.01053 2.37874
+31 1.83 0.955448 2.61519
+32 1.89 1.04977 2.8923
+33 1.95 0.982364 3.16833
+34 2.01 1.00463 3.46826
+35 2.07 0.995671 3.78352
+36 2.13 1.01909 4.12518
+37 2.19 1.02339 4.48787
+38 2.25 0.960958 4.84736
+39 2.31 0.985855 5.23609
+40 2.37 0.958054 5.63374
+41 2.43 1.04292 6.0888
+42 2.49 0.987039 6.54101
+43 2.55 0.997548 7.02033
+44 2.61 1.00322 7.52532
+45 2.67 1.00062 8.05243
+46 2.73 0.990794 8.59807
+47 2.79 0.983981 9.16405
+48 2.85 1.03568 9.78566
+49 2.91 0.963208 10.3884
+50 2.97 1.01989 11.0531
+103250 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0.0659362 0.000356633
+6 0.33 0.309393 0.00285307
+7 0.39 0.253361 0.00570613
+8 0.45 0.642585 0.0153352
+9 0.51 0.556052 0.0260342
+10 0.57 0.593669 0.0402996
+11 0.63 1.09362 0.0723966
+12 0.69 1.03339 0.108773
+13 0.75 0.977655 0.149429
+14 0.81 1.06619 0.201141
+15 0.87 1.1856 0.267475
+16 0.93 1.1157 0.338802
+17 0.99 1.07814 0.416904
+18 1.05 1.08102 0.504993
+19 1.11 0.971258 0.593438
+20 1.17 0.941194 0.688659
+21 1.23 0.950506 0.794936
+22 1.29 0.913456 0.907275
+23 1.35 0.977062 1.03887
+24 1.41 1.02677 1.18973
+25 1.47 0.95807 1.34272
+26 1.53 0.993673 1.51462
+27 1.59 0.965916 1.69508
+28 1.65 1.01749 1.89979
+29 1.71 1.03152 2.12268
+30 1.77 1.01361 2.35735
+31 1.83 0.949684 2.59237
+32 1.89 1.02951 2.86412
+33 1.95 0.982364 3.14016
+34 2.01 0.995074 3.43723
+35 2.07 1.03059 3.76355
+36 2.13 1.01696 4.10449
+37 2.19 1.01333 4.46362
+38 2.25 1.02292 4.84629
+39 2.31 0.982237 5.23359
+40 2.37 1.00102 5.64907
+41 2.43 0.979985 6.07668
+42 2.49 1.0532 6.5592
+43 2.55 0.946334 7.01391
+44 2.61 0.991888 7.5132
+45 2.67 0.983693 8.03138
+46 2.73 1.02835 8.59772
+47 2.79 0.97468 9.15835
+48 2.85 0.992306 9.75392
+49 2.91 1.04585 10.4083
+50 2.97 1.00129 11.061
+103300 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0.217411 0.000713267
+5 0.27 0.131872 0.00142653
+6 0.33 0.132597 0.00249643
+7 0.39 0.316701 0.00606277
+8 0.45 0.452189 0.0128388
+9 0.51 0.630192 0.0249643
+10 0.57 0.756928 0.0431526
+11 0.63 1.13008 0.0763195
+12 0.69 0.840894 0.10592
+13 0.75 1.03769 0.149073
+14 0.81 1.0956 0.202211
+15 0.87 1.30033 0.274964
+16 0.93 1.03202 0.340942
+17 0.99 1.09783 0.420471
+18 1.05 1.09415 0.509629
+19 1.11 0.943844 0.595578
+20 1.17 0.951769 0.691869
+21 1.23 1.00473 0.804208
+22 1.29 0.933755 0.919044
+23 1.35 0.934696 1.04494
+24 1.41 1.02434 1.19544
+25 1.47 1.0139 1.35735
+26 1.53 1.03903 1.53709
+27 1.59 1.02318 1.72825
+28 1.65 1.03876 1.93723
+29 1.71 1.01832 2.15728
+30 1.77 0.922728 2.3709
+31 1.83 1.06497 2.63445
+32 1.89 0.993029 2.89658
+33 1.95 0.993786 3.17582
+34 2.01 1.00105 3.47468
+35 2.07 0.970892 3.7821
+36 2.13 0.963774 4.10521
+37 2.19 0.995212 4.45792
+38 2.25 0.979072 4.82418
+39 2.31 0.998517 5.2179
+40 2.37 1.00703 5.63588
+41 2.43 0.984072 6.06526
+42 2.49 1.00183 6.52425
+43 2.55 1.00645 7.00785
+44 2.61 1.00677 7.51462
+45 2.67 1.00062 8.04173
+46 2.73 0.971367 8.57668
+47 2.79 1.01622 9.1612
+48 2.85 1.00122 9.76213
+49 2.91 1.00082 10.3884
+50 2.97 0.978853 11.0264
+103350 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0.0883979 0.000713267
+7 0.39 0.190021 0.00285307
+8 0.45 0.499788 0.0103424
+9 0.51 0.648727 0.0228245
+10 0.57 0.742086 0.0406562
+11 0.63 0.801991 0.064194
+12 0.69 1.04352 0.100927
+13 0.75 1.14917 0.148716
+14 0.81 1.15443 0.204708
+15 0.87 1.17922 0.270685
+16 0.93 1.10455 0.341298
+17 0.99 1.17168 0.426177
+18 1.05 1.04601 0.511412
+19 1.11 0.881182 0.591655
+20 1.17 0.930619 0.685806
+21 1.23 0.99835 0.797432
+22 1.29 0.962754 0.915835
+23 1.35 0.910865 1.03852
+24 1.41 1.03405 1.19044
+25 1.47 0.980402 1.347
+26 1.53 0.999857 1.51997
+27 1.59 1.11099 1.72753
+28 1.65 0.967858 1.92225
+29 1.71 0.978707 2.13374
+30 1.77 0.961239 2.35628
+31 1.83 1.00877 2.60592
+32 1.89 1.01735 2.87447
+33 1.95 0.949364 3.14123
+34 2.01 1.05719 3.45685
+35 2.07 1.0396 3.78602
+36 2.13 0.911649 4.09165
+37 2.19 1.05358 4.46505
+38 2.25 1.02769 4.8495
+39 2.31 0.962339 5.22896
+40 2.37 0.995001 5.64194
+41 2.43 1.00532 6.0806
+42 2.49 1.04386 6.55884
+43 2.55 0.953757 7.01712
+44 2.61 1.02235 7.53174
+45 2.67 1.01145 8.06455
+46 2.73 1.00634 8.61876
+47 2.79 0.980881 9.18295
+48 2.85 1.00241 9.78459
+49 2.91 0.984866 10.4009
+50 2.97 1.00402 11.0553
+103400 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0.190021 0.0021398
+8 0.45 0.547387 0.0103424
+9 0.51 0.556052 0.0210414
+10 0.57 0.682719 0.0374465
+11 0.63 1.05717 0.0684736
+12 0.69 1.08404 0.106633
+13 0.75 1.15775 0.154779
+14 0.81 1.11766 0.208987
+15 0.87 1.17285 0.274608
+16 0.93 1.04318 0.341298
+17 0.99 1.1766 0.426534
+18 1.05 0.993491 0.507489
+19 1.11 1.03392 0.601641
+20 1.17 0.824867 0.685093
+21 1.23 0.893093 0.78495
+22 1.29 1.00625 0.908702
+23 1.35 0.969118 1.03923
+24 1.41 0.997638 1.18581
+25 1.47 0.95137 1.33773
+26 1.53 1.00192 1.51106
+27 1.59 1.07282 1.71148
+28 1.65 1.03699 1.92011
+29 1.71 1.05463 2.148
+30 1.77 1.01824 2.38374
+31 1.83 1.00445 2.63231
+32 1.89 0.930881 2.87803
+33 1.95 0.939211 3.14194
+34 2.01 0.977156 3.43367
+35 2.07 1.04523 3.76462
+36 2.13 0.97122 4.09023
+37 2.19 0.980118 4.43759
+38 2.25 1.02578 4.82133
+39 2.31 1.00123 5.21612
+40 2.37 0.988127 5.62625
+41 2.43 1.04946 6.08417
+42 2.49 0.967579 6.52746
+43 2.55 1.01239 7.01391
+44 2.61 1.03156 7.53317
+45 2.67 0.99114 8.05528
+46 2.73 1.02771 8.62126
+47 2.79 0.981501 9.18581
+48 2.85 0.999436 9.78566
+49 2.91 0.984296 10.4016
+50 2.97 1.00621 11.0574
+103450 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0.21169 0.000356633
+4 0.21 0.108706 0.000713267
+5 0.27 0.0659362 0.0010699
+6 0.33 0.044199 0.00142653
+7 0.39 0.285031 0.00463623
+8 0.45 0.404591 0.010699
+9 0.51 0.537517 0.0210414
+10 0.57 0.727244 0.0385164
+11 0.63 1.08147 0.0702568
+12 0.69 0.840894 0.0998573
+13 0.75 1.1406 0.14729
+14 0.81 1.11031 0.201141
+15 0.87 1.28758 0.273181
+16 0.93 1.08781 0.342725
+17 0.99 1.06337 0.419757
+18 1.05 0.892829 0.492511
+19 1.11 0.865517 0.571327
+20 1.17 0.997595 0.672254
+21 1.23 0.928178 0.776034
+22 1.29 0.974353 0.895863
+23 1.35 1.03532 1.03531
+24 1.41 1.01948 1.18509
+25 1.47 0.982636 1.34201
+26 1.53 1.02666 1.51961
+27 1.59 0.998368 1.70613
+28 1.65 0.974949 1.90228
+29 1.71 1.03482 2.12589
+30 1.77 1.02902 2.36412
+31 1.83 0.969859 2.60414
+32 1.89 1.00384 2.86912
+33 1.95 0.979825 3.14444
+34 2.01 0.984323 3.4383
+35 2.07 0.993419 3.75285
+36 2.13 0.936116 4.06669
+37 2.19 1.00528 4.42297
+38 2.25 1.01339 4.80207
+39 2.31 1.04193 5.21291
+40 2.37 1.02593 5.63873
+41 2.43 0.966908 6.06063
+42 2.49 0.990931 6.51462
+43 2.55 1.05321 7.02068
+44 2.61 1.01598 7.5321
+45 2.67 0.993171 8.05528
+46 2.73 0.933807 8.56954
+47 2.79 1.01932 9.15585
+48 2.85 1.01013 9.76213
+49 2.91 0.987146 10.3798
+50 2.97 1.00129 11.0325
+103500 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0.131872 0.000713267
+6 0.33 0.309393 0.0032097
+7 0.39 0.506722 0.00891583
+8 0.45 0.333192 0.0139087
+9 0.51 0.500446 0.0235378
+10 0.57 0.682719 0.0399429
+11 0.63 1.03287 0.0702568
+12 0.69 0.901681 0.101997
+13 0.75 1.07199 0.146576
+14 0.81 1.19119 0.204351
+15 0.87 1.08998 0.265335
+16 0.93 1.20496 0.342368
+17 0.99 1.19137 0.428673
+18 1.05 0.958478 0.506776
+19 1.11 0.873349 0.586305
+20 1.17 0.891843 0.676534
+21 1.23 0.909041 0.778174
+22 1.29 1.00625 0.901926
+23 1.35 1.02737 1.0403
+24 1.41 0.961228 1.18153
+25 1.47 0.911171 1.32703
+26 1.53 1.09881 1.51712
+27 1.59 1.05373 1.71398
+28 1.65 1.08485 1.93224
+29 1.71 1.05958 2.1612
+30 1.77 0.945834 2.38017
+31 1.83 1.06641 2.64408
+32 1.89 0.960604 2.89765
+33 1.95 0.977287 3.17225
+34 2.01 0.99149 3.46826
+35 2.07 1.01595 3.78994
+36 2.13 0.944626 4.10663
+37 2.19 1.03144 4.47218
+38 2.25 0.983838 4.84023
+39 2.31 1.02113 5.24287
+40 2.37 1.00273 5.65906
+41 2.43 0.984072 6.08845
+42 2.49 1.04231 6.56598
+43 2.55 1.02946 7.06063
+44 2.61 0.994014 7.56098
+45 2.67 0.980985 8.07775
+46 2.73 0.979785 8.61733
+47 2.79 1.01622 9.20185
+48 2.85 0.997654 9.80064
+49 2.91 0.982016 10.4151
+50 2.97 1.02919 11.0859
+103550 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0.0659362 0.000356633
+6 0.33 0.265194 0.00249643
+7 0.39 0.285031 0.00570613
+8 0.45 0.380791 0.0114123
+9 0.51 0.667262 0.0242511
+10 0.57 0.875662 0.0452924
+11 0.63 0.801991 0.0688302
+12 0.69 0.901681 0.100571
+13 0.75 1.19205 0.150143
+14 0.81 1.05884 0.201498
+15 0.87 1.15373 0.266049
+16 0.93 1.05992 0.333809
+17 0.99 1.09783 0.413338
+18 1.05 1.01975 0.496434
+19 1.11 0.932095 0.581312
+20 1.17 0.96587 0.67903
+21 1.23 0.966454 0.78709
+22 1.29 1.05845 0.917261
+23 1.35 1.00089 1.05207
+24 1.41 1.01706 1.2015
+25 1.47 0.93797 1.35128
+26 1.53 0.97718 1.52033
+27 1.59 0.99455 1.70613
+28 1.65 1.0104 1.90942
+29 1.71 0.996862 2.12482
+30 1.77 0.996669 2.35556
+31 1.83 1.03039 2.61056
+32 1.89 1.03761 2.88445
+33 1.95 1.02805 3.17332
+34 2.01 0.967599 3.4622
+35 2.07 0.933723 3.75785
+36 2.13 1.04143 4.10699
+37 2.19 0.996218 4.46006
+38 2.25 0.990512 4.8306
+39 2.31 0.978619 5.21648
+40 2.37 0.988986 5.62696
+41 2.43 1.04129 6.08131
+42 2.49 0.99171 6.53566
+43 2.55 1.00645 7.01926
+44 2.61 1.00322 7.52425
+45 2.67 0.985047 8.04315
+46 2.73 0.995975 8.59165
+47 2.79 1.0342 9.18652
+48 2.85 0.986958 9.77889
+49 2.91 0.963208 10.3816
+50 2.97 0.999645 11.0332
+103600 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0.21169 0.000356633
+4 0.21 0 0.000356633
+5 0.27 0.0659362 0.000713267
+6 0.33 0.132597 0.00178317
+7 0.39 0.158351 0.00356633
+8 0.45 0.333192 0.0085592
+9 0.51 0.500446 0.0181883
+10 0.57 0.905345 0.0399429
+11 0.63 0.887051 0.0659772
+12 0.69 0.851025 0.0959344
+13 0.75 1.29496 0.149786
+14 0.81 1.12501 0.204351
+15 0.87 1.15373 0.268902
+16 0.93 1.09897 0.339158
+17 0.99 1.1126 0.419757
+18 1.05 0.975984 0.499287
+19 1.11 0.912513 0.582382
+20 1.17 0.983495 0.681883
+21 1.23 0.966454 0.789943
+22 1.29 0.930855 0.904422
+23 1.35 1.03796 1.04422
+24 1.41 0.983074 1.18866
+25 1.47 1.05187 1.35663
+26 1.53 1.0349 1.53566
+27 1.59 0.988823 1.7204
+28 1.65 0.980267 1.91762
+29 1.71 0.985309 2.13053
+30 1.77 1.07985 2.38053
+31 1.83 0.946802 2.61484
+32 1.89 1.016 2.88302
+33 1.95 1.05344 3.17903
+34 2.01 0.998658 3.47718
+35 2.07 0.963008 3.7821
+36 2.13 1.0042 4.11876
+37 2.19 0.951942 4.45613
+38 2.25 1.00672 4.83274
+39 2.31 0.996708 5.22575
+40 2.37 1.00875 5.64444
+41 2.43 0.953013 6.06027
+42 2.49 1.00339 6.51997
+43 2.55 1.06657 7.03245
+44 2.61 0.977718 7.52461
+45 2.67 0.99791 8.05029
+46 2.73 1.0018 8.602
+47 2.79 1.02614 9.19223
+48 2.85 0.972697 9.77603
+49 2.91 1.00025 10.4019
+50 2.97 0.953684 11.0235
+103650 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0.108706 0.000356633
+5 0.27 0.0659362 0.000713267
+6 0.33 0.132597 0.00178317
+7 0.39 0.253361 0.00463623
+8 0.45 0.571187 0.0131954
+9 0.51 0.704332 0.0267475
+10 0.57 0.608511 0.0413695
+11 0.63 0.959959 0.0695435
+12 0.69 1.05365 0.106633
+13 0.75 1.20063 0.156562
+14 0.81 1.06619 0.208274
+15 0.87 1.12823 0.271398
+16 0.93 1.05434 0.338802
+17 0.99 1.13722 0.421184
+18 1.05 0.975984 0.500713
+19 1.11 0.979091 0.589872
+20 1.17 0.958819 0.686876
+21 1.23 0.934558 0.791369
+22 1.29 1.01785 0.916548
+23 1.35 0.950583 1.04458
+24 1.41 1.01948 1.19437
+25 1.47 1.0474 1.36163
+26 1.53 0.958626 1.52746
+27 1.59 0.971643 1.70899
+28 1.65 1.05294 1.92083
+29 1.71 1.03317 2.14408
+30 1.77 0.982805 2.37161
+31 1.83 0.978506 2.61377
+32 1.89 1.01194 2.88088
+33 1.95 1.05725 3.17796
+34 2.01 0.964015 3.46576
+35 2.07 0.984408 3.77746
+36 2.13 0.989304 4.10913
+37 2.19 1.0254 4.47254
+38 2.25 1.00862 4.84986
+39 2.31 0.962339 5.22932
+40 2.37 0.997579 5.64337
+41 2.43 0.994697 6.07739
+42 2.49 0.98159 6.5271
+43 2.55 0.996805 7.00606
+44 2.61 0.985512 7.50214
+45 2.67 1.01484 8.03673
+46 2.73 1.02253 8.59986
+47 2.79 1.00134 9.17582
+48 2.85 0.979828 9.76391
+49 2.91 1.02932 10.408
+50 2.97 1.01387 11.0688
+103700 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0.326117 0.0010699
+5 0.27 0.0659362 0.00142653
+6 0.33 0.132597 0.00249643
+7 0.39 0.411712 0.00713267
+8 0.45 0.309393 0.0117689
+9 0.51 0.759937 0.0263909
+10 0.57 0.845978 0.046719
+11 0.63 1.02072 0.0766762
+12 0.69 1.00299 0.111983
+13 0.75 0.960503 0.151926
+14 0.81 1.18384 0.209344
+15 0.87 1.12186 0.272111
+16 0.93 1.07665 0.340942
+17 0.99 1.18152 0.426534
+18 1.05 1.00224 0.508203
+19 1.11 0.8616 0.586662
+20 1.17 0.912993 0.67903
+21 1.23 1.043 0.795649
+22 1.29 1.08745 0.929387
+23 1.35 0.926753 1.05421
+24 1.41 1.01706 1.20364
+25 1.47 1.04293 1.37019
+26 1.53 1.02666 1.54779
+27 1.59 1.00791 1.73609
+28 1.65 0.971403 1.93153
+29 1.71 1.08268 2.16548
+30 1.77 0.956617 2.38695
+31 1.83 0.952566 2.62268
+32 1.89 0.983572 2.88231
+33 1.95 0.973479 3.15585
+34 2.01 1.01897 3.46006
+35 2.07 1.02496 3.78459
+36 2.13 0.982922 4.11412
+37 2.19 0.958986 4.45399
+38 2.25 1.0315 4.83987
+39 2.31 0.989473 5.23003
+40 2.37 0.978675 5.63623
+41 2.43 1.01023 6.07703
+42 2.49 1.03063 6.54922
+43 2.55 0.99829 7.02889
+44 2.61 0.969216 7.51676
+45 2.67 1.01957 8.05385
+46 2.73 0.984966 8.59629
+47 2.79 1.00692 9.17546
+48 2.85 0.96319 9.75357
+49 2.91 1.00082 10.3798
+50 2.97 0.962986 11.0075
+103750 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0.197809 0.0010699
+6 0.33 0.176796 0.00249643
+7 0.39 0.316701 0.00606277
+8 0.45 0.380791 0.0117689
+9 0.51 0.574587 0.0228245
+10 0.57 0.623352 0.0378031
+11 0.63 0.984262 0.0666904
+12 0.69 0.952338 0.100214
+13 0.75 1.27781 0.153352
+14 0.81 1.17648 0.210414
+15 0.87 1.07724 0.270685
+16 0.93 1.07665 0.339515
+17 0.99 1.20122 0.426534
+18 1.05 1.12041 0.517832
+19 1.11 0.939927 0.603424
+20 1.17 0.856592 0.690086
+21 1.23 0.931368 0.794223
+22 1.29 1.02945 0.920827
+23 1.35 0.947936 1.0485
+24 1.41 0.983074 1.19294
+25 1.47 0.933504 1.34201
+26 1.53 1.03284 1.52068
+27 1.59 1.00028 1.70756
+28 1.65 1.03699 1.91619
+29 1.71 1.03977 2.14087
+30 1.77 0.993588 2.3709
+31 1.83 1.03759 2.62767
+32 1.89 1.02545 2.89836
+33 1.95 0.948095 3.16476
+34 2.01 1.02972 3.47218
+35 2.07 0.969766 3.77924
+36 2.13 0.997814 4.11377
+37 2.19 0.980118 4.46113
+38 2.25 1.02102 4.84308
+39 2.31 1.05098 5.25749
+40 2.37 0.998438 5.6719
+41 2.43 0.962004 6.09165
+42 2.49 1.00339 6.55136
+43 2.55 1.01388 7.03852
+44 2.61 1.04077 7.56241
+45 2.67 0.961352 8.06883
+46 2.73 1.01605 8.62839
+47 2.79 1.01684 9.21327
+48 2.85 0.982799 9.80314
+49 2.91 0.989426 10.4223
+50 2.97 0.989249 11.067
+103800 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0.044199 0.000356633
+7 0.39 0.316701 0.00392297
+8 0.45 0.333192 0.00891583
+9 0.51 0.407771 0.0167618
+10 0.57 0.771769 0.0353067
+11 0.63 0.911353 0.0620542
+12 0.69 1.16509 0.103067
+13 0.75 1.04626 0.146576
+14 0.81 1.27207 0.208274
+15 0.87 1.19197 0.274964
+16 0.93 1.04876 0.342011
+17 0.99 1.1126 0.422611
+18 1.05 0.910335 0.49679
+19 1.11 0.939927 0.582382
+20 1.17 0.955294 0.67903
+21 1.23 0.963264 0.786733
+22 1.29 1.08455 0.920114
+23 1.35 0.995597 1.05421
+24 1.41 1.09716 1.21541
+25 1.47 0.978169 1.37161
+26 1.53 0.995734 1.54387
+27 1.59 0.967825 1.72468
+28 1.65 0.976721 1.92118
+29 1.71 0.965504 2.12981
+30 1.77 1.03056 2.3684
+31 1.83 0.981388 2.61127
+32 1.89 1.04437 2.88695
+33 1.95 1.01917 3.17332
+34 2.01 1.00583 3.47361
+35 2.07 1.02946 3.79957
+36 2.13 0.972284 4.12553
+37 2.19 1.00427 4.48146
+38 2.25 0.954285 4.83845
+39 2.31 0.96053 5.21719
+40 2.37 1.00703 5.63516
+41 2.43 1.01595 6.07846
+42 2.49 0.945783 6.51177
+43 2.55 1.01388 6.99893
+44 2.61 1.0266 7.51569
+45 2.67 0.986401 8.03531
+46 2.73 1.00504 8.5888
+47 2.79 0.988941 9.15763
+48 2.85 1.02736 9.77425
+49 2.91 0.976317 10.3852
+50 2.97 1.00074 11.0374
+103850 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0.0659362 0.000356633
+6 0.33 0.265194 0.00249643
+7 0.39 0.411712 0.00713267
+8 0.45 0.594986 0.0160485
+9 0.51 0.722867 0.0299572
+10 0.57 0.831136 0.0499287
+11 0.63 0.729083 0.0713267
+12 0.69 0.9726 0.105563
+13 0.75 1.2092 0.155849
+14 0.81 1.16913 0.212553
+15 0.87 1.01349 0.269258
+16 0.93 1.04318 0.335949
+17 0.99 1.1766 0.421184
+18 1.05 0.967231 0.5
+19 1.11 0.971258 0.588445
+20 1.17 1.05047 0.694722
+21 1.23 0.91861 0.797432
+22 1.29 0.974353 0.917261
+23 1.35 0.985006 1.04993
+24 1.41 0.936954 1.18759
+25 1.47 1.03847 1.35342
+26 1.53 1.0349 1.53245
+27 1.59 0.99455 1.71826
+28 1.65 0.985584 1.91655
+29 1.71 0.998512 2.13231
+30 1.77 0.955077 2.35342
+31 1.83 1.05488 2.61448
+32 1.89 1.06734 2.89622
+33 1.95 1.07248 3.19757
+34 2.01 1.01299 3.5
+35 2.07 1.0396 3.82917
+36 2.13 0.978666 4.15728
+37 2.19 0.942886 4.49144
+38 2.25 0.966678 4.85307
+39 2.31 0.998517 5.24679
+40 2.37 1.02679 5.67297
+41 2.43 1.00042 6.10949
+42 2.49 0.974584 6.55599
+43 2.55 1.00274 7.0378
+44 2.61 1.05707 7.5699
+45 2.67 0.976923 8.08452
+46 2.73 1.03224 8.653
+47 2.79 0.979021 9.21612
+48 2.85 1.01786 9.82703
+49 2.91 0.972327 10.4354
+50 2.97 0.985966 11.0781
+103900 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0.197809 0.0010699
+6 0.33 0.220995 0.00285307
+7 0.39 0.380042 0.00713267
+8 0.45 0.475989 0.0142653
+9 0.51 0.611657 0.0260342
+10 0.57 0.682719 0.0424394
+11 0.63 0.887051 0.0684736
+12 0.69 1.16509 0.109486
+13 0.75 1.02911 0.152282
+14 0.81 1.16178 0.208631
+15 0.87 1.17285 0.274251
+16 0.93 1.22727 0.35271
+17 0.99 0.979681 0.42368
+18 1.05 0.945348 0.500713
+19 1.11 1.10441 0.601284
+20 1.17 0.930619 0.695435
+21 1.23 0.931368 0.799572
+22 1.29 0.84096 0.902996
+23 1.35 0.947936 1.03067
+24 1.41 1.00977 1.17903
+25 1.47 1.08983 1.35307
+26 1.53 0.95038 1.51748
+27 1.59 1.06327 1.71612
+28 1.65 1.06358 1.9301
+29 1.71 1.00676 2.14765
+30 1.77 1.01515 2.38267
+31 1.83 1.05633 2.64408
+32 1.89 1.04032 2.91869
+33 1.95 1.0014 3.20007
+34 2.01 0.983128 3.49358
+35 2.07 0.926965 3.78709
+36 2.13 0.999942 4.12233
+37 2.19 0.981124 4.47004
+38 2.25 0.979072 4.83631
+39 2.31 1.03017 5.24251
+40 2.37 0.989845 5.65335
+41 2.43 0.967725 6.07561
+42 2.49 1.00961 6.53816
+43 2.55 1.02501 7.03067
+44 2.61 0.955755 7.51177
+45 2.67 1.05207 8.06598
+46 2.73 1.02123 8.62839
+47 2.79 0.96724 9.18474
+48 2.85 1.00538 9.78816
+49 2.91 0.991135 10.4083
+50 2.97 1.00457 11.0631
+103950 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0.131872 0.000713267
+6 0.33 0.0883979 0.00142653
+7 0.39 0.190021 0.00356633
+8 0.45 0.571187 0.0121255
+9 0.51 0.722867 0.0260342
+10 0.57 0.756928 0.0442225
+11 0.63 0.899202 0.0706134
+12 0.69 0.962469 0.104494
+13 0.75 1.07199 0.149073
+14 0.81 1.0956 0.202211
+15 0.87 1.33858 0.277104
+16 0.93 1.09897 0.347361
+17 0.99 0.950143 0.416191
+18 1.05 1.00224 0.49786
+19 1.11 0.967342 0.585949
+20 1.17 1.00112 0.687233
+21 1.23 0.902661 0.78816
+22 1.29 1.01205 0.912625
+23 1.35 0.863204 1.02889
+24 1.41 1.02919 1.1801
+25 1.47 1.04517 1.347
+26 1.53 1.02666 1.52461
+27 1.59 0.981188 1.70792
+28 1.65 0.98913 1.90692
+29 1.71 0.983658 2.11947
+30 1.77 1.07215 2.36769
+31 1.83 1.0275 2.62197
+32 1.89 1.00654 2.88766
+33 1.95 1.02679 3.17618
+34 2.01 1.03211 3.48431
+35 2.07 0.993419 3.79886
+36 2.13 0.991432 4.13124
+37 2.19 0.969049 4.47468
+38 2.25 0.997185 4.84772
+39 2.31 0.972288 5.2311
+40 2.37 1.01562 5.65264
+41 2.43 0.979985 6.08024
+42 2.49 1.0641 6.56776
+43 2.55 0.982703 7.03994
+44 2.61 1.02377 7.55528
+45 2.67 0.976246 8.06954
+46 2.73 0.988204 8.61377
+47 2.79 1.01188 9.19579
+48 2.85 1.01726 9.80635
+49 2.91 0.971757 10.4144
+50 2.97 1.0177 11.0777
+104000 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0.329681 0.00178317
+6 0.33 0.309393 0.0042796
+7 0.39 0.221691 0.00677603
+8 0.45 0.475989 0.0139087
+9 0.51 0.426306 0.0221113
+10 0.57 0.94987 0.0449358
+11 0.63 0.984262 0.0738231
+12 0.69 0.830763 0.103067
+13 0.75 0.909048 0.14087
+14 0.81 1.13237 0.195792
+15 0.87 1.23659 0.264979
+16 0.93 1.17149 0.339872
+17 0.99 1.09783 0.419401
+18 1.05 1.01975 0.502496
+19 1.11 1.0535 0.598431
+20 1.17 0.944719 0.694009
+21 1.23 0.905851 0.795292
+22 1.29 0.893157 0.905136
+23 1.35 0.844669 1.0189
+24 1.41 1.01706 1.16833
+25 1.47 0.933504 1.3174
+26 1.53 1.05552 1.5
+27 1.59 1.05373 1.69686
+28 1.65 1.06713 1.91155
+29 1.71 0.991911 2.12589
+30 1.77 1.01669 2.36127
+31 1.83 0.969859 2.60128
+32 1.89 1.00789 2.86733
+33 1.95 0.965864 3.13873
+34 2.01 0.990296 3.43438
+35 2.07 1.01932 3.75713
+36 2.13 0.955264 4.07739
+37 2.19 1.03748 4.44508
+38 2.25 0.989558 4.81526
+39 2.31 1.00937 5.21327
+40 2.37 1.0225 5.63766
+41 2.43 1.02984 6.08702
+42 2.49 0.997937 6.54422
+43 2.55 1.03689 7.04244
+44 2.61 0.966382 7.52889
+45 2.67 1.00874 8.06027
+46 2.73 1.0303 8.62767
+47 2.79 1.0001 9.20292
+48 2.85 0.977451 9.78959
+49 2.91 0.983726 10.4051
+50 2.97 1.00512 11.0603
+104050 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0.108706 0.000356633
+5 0.27 0.0659362 0.000713267
+6 0.33 0.220995 0.00249643
+7 0.39 0.475052 0.00784593
+8 0.45 0.404591 0.0139087
+9 0.51 0.500446 0.0235378
+10 0.57 0.727244 0.0410128
+11 0.63 0.923505 0.068117
+12 0.69 0.901681 0.0998573
+13 0.75 1.03769 0.14301
+14 0.81 1.0956 0.196148
+15 0.87 1.26846 0.267118
+16 0.93 0.992975 0.330599
+17 0.99 1.13229 0.412625
+18 1.05 1.10728 0.502853
+19 1.11 0.889015 0.583809
+20 1.17 0.909468 0.67582
+21 1.23 1.02706 0.790656
+22 1.29 0.997552 0.913338
+23 1.35 0.992949 1.04708
+24 1.41 0.970937 1.18973
+25 1.47 0.946903 1.34094
+26 1.53 0.985426 1.51141
+27 1.59 1.01364 1.70078
+28 1.65 1.00863 1.90371
+29 1.71 1.03152 2.1266
+30 1.77 1.04442 2.3684
+31 1.83 1.01021 2.6184
+32 1.89 1.01194 2.88552
+33 1.95 0.963326 3.15621
+34 2.01 1.00344 3.45578
+35 2.07 1.01144 3.77603
+36 2.13 1.02654 4.12019
+37 2.19 0.948923 4.45649
+38 2.25 0.981932 4.82382
+39 2.31 0.978619 5.2097
+40 2.37 0.981253 5.61698
+41 2.43 1.04864 6.07454
+42 2.49 0.969914 6.5189
+43 2.55 1.02724 7.01248
+44 2.61 0.985512 7.50856
+45 2.67 1.01484 8.04315
+46 2.73 0.972014 8.57846
+47 2.79 1.04536 9.17974
+48 2.85 0.966755 9.75999
+49 2.91 1.05497 10.4201
+50 2.97 0.985966 11.0628
+104100 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0.108706 0.000356633
+5 0.27 0 0.000356633
+6 0.33 0.353592 0.0032097
+7 0.39 0.348371 0.00713267
+8 0.45 0.309393 0.0117689
+9 0.51 0.593122 0.0231812
+10 0.57 0.905345 0.0449358
+11 0.63 0.801991 0.0684736
+12 0.69 0.881419 0.0995007
+13 0.75 1.11487 0.145863
+14 0.81 1.12501 0.200428
+15 0.87 1.14098 0.264265
+16 0.93 1.08223 0.333452
+17 0.99 1.12737 0.415121
+18 1.05 1.04601 0.500357
+19 1.11 0.896847 0.582026
+20 1.17 0.884793 0.671541
+21 1.23 1.03344 0.78709
+22 1.29 0.977253 0.907275
+23 1.35 0.9294 1.03245
+24 1.41 1.06803 1.18937
+25 1.47 1.0206 1.35235
+26 1.53 0.985426 1.52282
+27 1.59 1.00219 1.71006
+28 1.65 1.04585 1.92047
+29 1.71 1.01997 2.14087
+30 1.77 1.05675 2.38552
+31 1.83 0.941037 2.6184
+32 1.89 0.964657 2.87304
+33 1.95 0.945557 3.13873
+34 2.01 0.977156 3.43046
+35 2.07 0.95625 3.73324
+36 2.13 1.06909 4.09165
+37 2.19 1.03043 4.45685
+38 2.25 0.980978 4.82382
+39 2.31 1.01661 5.22468
+40 2.37 1.00187 5.64051
+41 2.43 1.02003 6.08559
+42 2.49 1.00728 6.54708
+43 2.55 1.04876 7.051
+44 2.61 0.961423 7.53495
+45 2.67 0.961352 8.04137
+46 2.73 1.0031 8.59379
+47 2.79 1.03606 9.18973
+48 2.85 1.00241 9.79137
+49 2.91 1.0202 10.4297
+50 2.97 0.97557 11.0656
+104150 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0.131872 0.000713267
+6 0.33 0 0.000713267
+7 0.39 0.221691 0.0032097
+8 0.45 0.42839 0.0096291
+9 0.51 0.704332 0.0231812
+10 0.57 0.682719 0.0395863
+11 0.63 0.984262 0.0684736
+12 0.69 0.992863 0.103424
+13 0.75 0.986231 0.144437
+14 0.81 1.22796 0.203994
+15 0.87 1.14098 0.267832
+16 0.93 0.970661 0.329886
+17 0.99 1.14214 0.412625
+18 1.05 1.0285 0.496434
+19 1.11 0.81852 0.57097
+20 1.17 1.02227 0.674394
+21 1.23 0.953695 0.781027
+22 1.29 0.907656 0.892653
+23 1.35 0.966471 1.02282
+24 1.41 1.08745 1.1826
+25 1.47 1.0608 1.352
+26 1.53 0.991611 1.52354
+27 1.59 1.01364 1.71291
+28 1.65 0.96254 1.90656
+29 1.71 0.953951 2.1127
+30 1.77 0.979724 2.33951
+31 1.83 1.052 2.59986
+32 1.89 1.03356 2.87268
+33 1.95 1.08517 3.1776
+34 2.01 0.948486 3.46077
+35 2.07 0.986661 3.77318
+36 2.13 0.965901 4.097
+37 2.19 0.960999 4.43759
+38 2.25 0.951425 4.79351
+39 2.31 1.04284 5.20471
+40 2.37 1.0225 5.6291
+41 2.43 0.991428 6.0617
+42 2.49 0.99638 6.51819
+43 2.55 1.02278 7.00963
+44 2.61 0.981969 7.50392
+45 2.67 1.0013 8.03138
+46 2.73 1.0167 8.5913
+47 2.79 0.983361 9.15692
+48 2.85 1.00419 9.75963
+49 2.91 0.995125 10.3823
+50 2.97 0.977212 11.0193
+104200 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0.0883979 0.000713267
+7 0.39 0.348371 0.00463623
+8 0.45 0.356992 0.00998573
+9 0.51 0.537517 0.0203281
+10 0.57 0.697561 0.0370899
+11 0.63 0.911353 0.0638374
+12 0.69 1.03339 0.100214
+13 0.75 1.08914 0.145506
+14 0.81 1.18384 0.202924
+15 0.87 1.1601 0.267832
+16 0.93 1.21612 0.345578
+17 0.99 0.94522 0.414051
+18 1.05 1.08102 0.50214
+19 1.11 1.06917 0.599501
+20 1.17 0.976445 0.698288
+21 1.23 0.854817 0.793866
+22 1.29 0.82646 0.895506
+23 1.35 1.04061 1.03566
+24 1.41 0.985501 1.18046
+25 1.47 1.03847 1.34629
+26 1.53 1.01223 1.5214
+27 1.59 1.07663 1.72254
+28 1.65 1.01749 1.92725
+29 1.71 1.03317 2.1505
+30 1.77 0.950456 2.37054
+31 1.83 0.992917 2.61626
+32 1.89 0.990327 2.87767
+33 1.95 1.00521 3.16013
+34 2.01 0.986712 3.45471
+35 2.07 1.01257 3.77532
+36 2.13 0.924414 4.08524
+37 2.19 1.04553 4.45578
+38 2.25 1.0458 4.847
+39 2.31 0.993995 5.23894
+40 2.37 1.0182 5.66155
+41 2.43 0.970177 6.08488
+42 2.49 1.02362 6.55385
+43 2.55 1.00423 7.03638
+44 2.61 0.991888 7.53566
+45 2.67 1.00874 8.06705
+46 2.73 0.977195 8.60521
+47 2.79 1.00196 9.18153
+48 2.85 1.01726 9.79208
+49 2.91 1.04471 10.4458
+50 2.97 0.969004 11.0774
+104250 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0.176796 0.00142653
+7 0.39 0.443382 0.0064194
+8 0.45 0.571187 0.0149786
+9 0.51 0.667262 0.0278174
+10 0.57 0.682719 0.0442225
+11 0.63 0.899202 0.0706134
+12 0.69 0.942206 0.10378
+13 0.75 1.1406 0.151213
+14 0.81 1.0956 0.204351
+15 0.87 1.14735 0.268545
+16 0.93 1.18264 0.344151
+17 0.99 0.891066 0.408702
+18 1.05 1.15105 0.502496
+19 1.11 0.943844 0.588445
+20 1.17 0.874218 0.67689
+21 1.23 0.99835 0.788516
+22 1.29 0.968553 0.907632
+23 1.35 1.06974 1.05171
+24 1.41 1.04133 1.20471
+25 1.47 0.991569 1.36305
+26 1.53 0.95038 1.52746
+27 1.59 0.965916 1.70792
+28 1.65 1.00686 1.91049
+29 1.71 1.01337 2.12946
+30 1.77 1.02594 2.36698
+31 1.83 0.990035 2.61198
+32 1.89 1.00654 2.87767
+33 1.95 0.98871 3.15549
+34 2.01 1.0333 3.46398
+35 2.07 0.993419 3.77853
+36 2.13 0.992495 4.11127
+37 2.19 0.994206 4.46362
+38 2.25 0.985745 4.83238
+39 2.31 1.00485 5.2286
+40 2.37 0.988986 5.63909
+41 2.43 1.02085 6.08452
+42 2.49 0.995602 6.54066
+43 2.55 0.987899 7.01534
+44 2.61 1.00889 7.52318
+45 2.67 0.985724 8.04244
+46 2.73 0.95453 8.56812
+47 2.79 1.0063 9.14693
+48 2.85 1.04757 9.77568
+49 2.91 1.00253 10.403
+50 2.97 0.99472 11.0514
+104300 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0.131872 0.000713267
+6 0.33 0.220995 0.00249643
+7 0.39 0.190021 0.00463623
+8 0.45 0.690184 0.0149786
+9 0.51 0.611657 0.0267475
+10 0.57 0.86082 0.0474322
+11 0.63 0.874899 0.0731098
+12 0.69 0.942206 0.106277
+13 0.75 1.1749 0.155136
+14 0.81 1.14707 0.21077
+15 0.87 1.09636 0.272111
+16 0.93 1.05992 0.339872
+17 0.99 1.13229 0.421897
+18 1.05 0.949725 0.499287
+19 1.11 0.967342 0.587375
+20 1.17 0.948244 0.68331
+21 1.23 0.99835 0.794936
+22 1.29 1.00045 0.917974
+23 1.35 0.916161 1.04137
+24 1.41 1.08988 1.2015
+25 1.47 1.04517 1.3684
+26 1.53 0.935949 1.53031
+27 1.59 1.03464 1.72361
+28 1.65 1.0104 1.92689
+29 1.71 1.00841 2.14479
+30 1.77 1.02132 2.38124
+31 1.83 0.992917 2.62696
+32 1.89 1.01059 2.89372
+33 1.95 0.981094 3.1694
+34 2.01 0.986712 3.46398
+35 2.07 1.00693 3.78281
+36 2.13 1.04462 4.13302
+37 2.19 0.959992 4.47325
+38 2.25 1.01434 4.85271
+39 2.31 1.04374 5.26427
+40 2.37 0.990705 5.67546
+41 2.43 0.982437 6.10414
+42 2.49 1.03841 6.57989
+43 2.55 0.97157 7.04672
+44 2.61 1.02377 7.56205
+45 2.67 0.974215 8.07525
+46 2.73 0.95194 8.5995
+47 2.79 1.00568 9.17796
+48 2.85 1.07252 9.82168
+49 2.91 0.999115 10.4469
+50 2.97 1.01934 11.1113
+104350 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0.0659362 0.000356633
+6 0.33 0.044199 0.000713267
+7 0.39 0.411712 0.0053495
+8 0.45 0.618786 0.014622
+9 0.51 0.741402 0.0288873
+10 0.57 0.667877 0.0449358
+11 0.63 0.923505 0.0720399
+12 0.69 0.911813 0.104137
+13 0.75 0.934775 0.14301
+14 0.81 1.19854 0.201141
+15 0.87 1.15373 0.265692
+16 0.93 1.28864 0.348074
+17 0.99 0.999373 0.420471
+18 1.05 0.967231 0.499287
+19 1.11 0.936011 0.584522
+20 1.17 1.00817 0.686519
+21 1.23 1.09404 0.808845
+22 1.29 0.893157 0.918688
+23 1.35 0.995597 1.05278
+24 1.41 0.978219 1.1965
+25 1.47 0.955837 1.34914
+26 1.53 0.975119 1.51783
+27 1.59 0.97737 1.70043
+28 1.65 0.990902 1.89979
+29 1.71 1.02492 2.12126
+30 1.77 1.07523 2.37019
+31 1.83 1.03471 2.62625
+32 1.89 0.988976 2.8873
+33 1.95 1.0344 3.17796
+34 2.01 0.940124 3.45863
+35 2.07 0.964134 3.76391
+36 2.13 0.990368 4.09593
+37 2.19 0.959992 4.43616
+38 2.25 1.00004 4.81027
+39 2.31 1.0148 5.21041
+40 2.37 1.01133 5.63017
+41 2.43 0.987341 6.06098
+42 2.49 0.976141 6.5082
+43 2.55 1.02353 7
+44 2.61 1.05849 7.53281
+45 2.67 1.00874 8.06419
+46 2.73 0.992089 8.61056
+47 2.79 0.985841 9.1776
+48 2.85 0.987552 9.77033
+49 2.91 1.00025 10.3962
+50 2.97 1.00183 11.0492
+104400 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0.21169 0.000356633
+4 0.21 0.108706 0.000713267
+5 0.27 0 0.000713267
+6 0.33 0.0883979 0.00142653
+7 0.39 0.285031 0.00463623
+8 0.45 0.499788 0.0121255
+9 0.51 0.556052 0.0228245
+10 0.57 0.697561 0.0395863
+11 0.63 0.923505 0.0666904
+12 0.69 0.881419 0.0977175
+13 0.75 1.23493 0.149073
+14 0.81 1.02942 0.199001
+15 0.87 1.31308 0.272468
+16 0.93 1.05992 0.340228
+17 0.99 1.06337 0.417261
+18 1.05 1.05914 0.503566
+19 1.11 1.01434 0.595934
+20 1.17 0.941194 0.691155
+21 1.23 1.03025 0.806348
+22 1.29 1.01495 0.93117
+23 1.35 0.9294 1.05635
+24 1.41 0.936954 1.19401
+25 1.47 1.02283 1.35735
+26 1.53 1.04727 1.53852
+27 1.59 1.05564 1.73573
+28 1.65 0.916452 1.92011
+29 1.71 1.03152 2.14301
+30 1.77 0.962779 2.36591
+31 1.83 0.990035 2.61091
+32 1.89 1.02681 2.88195
+33 1.95 0.963326 3.15264
+34 2.01 1.00821 3.45364
+35 2.07 0.996798 3.76926
+36 2.13 1.0042 4.10592
+37 2.19 0.9932 4.45792
+38 2.25 1.04294 4.84807
+39 2.31 1.03017 5.25428
+40 2.37 0.964068 5.65442
+41 2.43 0.972629 6.07882
+42 2.49 0.990931 6.53281
+43 2.55 0.965632 6.99679
+44 2.61 1.00606 7.50321
+45 2.67 1.03718 8.04957
+46 2.73 1.00828 8.60485
+47 2.79 1.02304 9.1933
+48 2.85 1.01132 9.80029
+49 2.91 0.954659 10.3976
+50 2.97 0.999645 11.0492
+104450 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0.131872 0.000713267
+6 0.33 0.132597 0.00178317
+7 0.39 0.253361 0.00463623
+8 0.45 0.475989 0.0117689
+9 0.51 0.722867 0.0256776
+10 0.57 0.697561 0.0424394
+11 0.63 0.874899 0.068117
+12 0.69 0.921944 0.100571
+13 0.75 1.21778 0.151213
+14 0.81 1.24266 0.211484
+15 0.87 1.1601 0.276391
+16 0.93 1.18822 0.352354
+17 0.99 1.09783 0.431883
+18 1.05 0.857816 0.501783
+19 1.11 0.99084 0.592011
+20 1.17 0.948244 0.687946
+21 1.23 0.873955 0.785663
+22 1.29 0.933755 0.900499
+23 1.35 0.961175 1.02996
+24 1.41 1.06803 1.18688
+25 1.47 1.0072 1.34772
+26 1.53 1.09263 1.53673
+27 1.59 0.943009 1.71291
+28 1.65 1.02813 1.91976
+29 1.71 0.980357 2.1316
+30 1.77 0.990507 2.36091
+31 1.83 0.990035 2.60592
+32 1.89 0.983572 2.86555
+33 1.95 0.969672 3.13802
+34 2.01 1.00463 3.43795
+35 2.07 1.02158 3.76141
+36 2.13 1.02122 4.10378
+37 2.19 1.03446 4.4704
+38 2.25 1.00004 4.84451
+39 2.31 0.972288 5.22789
+40 2.37 0.969224 5.63017
+41 2.43 1.01513 6.07311
+42 2.49 1.02362 6.54208
+43 2.55 1.01017 7.02746
+44 2.61 1.00039 7.53103
+45 2.67 1.02296 8.0699
+46 2.73 0.99468 8.61769
+47 2.79 0.97592 9.17903
+48 2.85 0.986364 9.77104
+49 2.91 1.02647 10.4133
+50 2.97 1.02044 11.0785
+104500 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0.108706 0.000356633
+5 0.27 0.0659362 0.000713267
+6 0.33 0.0883979 0.00142653
+7 0.39 0.348371 0.0053495
+8 0.45 0.547387 0.0135521
+9 0.51 0.574587 0.0246077
+10 0.57 0.771769 0.0431526
+11 0.63 0.838445 0.0677603
+12 0.69 1.01313 0.103424
+13 0.75 1.14917 0.151213
+14 0.81 1.11031 0.205064
+15 0.87 1.19197 0.271755
+16 0.93 1.1157 0.343081
+17 0.99 0.999373 0.415478
+18 1.05 1.05476 0.501427
+19 1.11 0.936011 0.586662
+20 1.17 0.948244 0.682596
+21 1.23 0.953695 0.78923
+22 1.29 0.927955 0.903352
+23 1.35 0.977062 1.03495
+24 1.41 0.944236 1.17368
+25 1.47 1.10547 1.35021
+26 1.53 0.97718 1.51926
+27 1.59 1.04036 1.71362
+28 1.65 1.01217 1.91726
+29 1.71 0.955601 2.12375
+30 1.77 1.06445 2.37019
+31 1.83 0.991476 2.61555
+32 1.89 0.938987 2.86341
+33 1.95 1.01409 3.14836
+34 2.01 1.04764 3.46113
+35 2.07 1.04748 3.7928
+36 2.13 0.998878 4.12767
+37 2.19 0.942886 4.46184
+38 2.25 0.999092 4.83559
+39 2.31 1.0347 5.24358
+40 2.37 0.979535 5.65014
+41 2.43 1.00532 6.0888
+42 2.49 0.99638 6.54529
+43 2.55 0.993837 7.02282
+44 2.61 0.986929 7.51961
+45 2.67 0.945104 8.01748
+46 2.73 0.979138 8.5567
+47 2.79 1.07016 9.17225
+48 2.85 1.01013 9.77853
+49 2.91 0.995125 10.4012
+50 2.97 1.02153 11.067
+104550 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0.21169 0.000356633
+4 0.21 0 0.000356633
+5 0.27 0 0.000356633
+6 0.33 0.220995 0.0021398
+7 0.39 0.221691 0.00463623
+8 0.45 0.261794 0.0085592
+9 0.51 0.500446 0.0181883
+10 0.57 0.94987 0.0410128
+11 0.63 1.10578 0.0734665
+12 0.69 1.03339 0.109843
+13 0.75 1.06341 0.154066
+14 0.81 0.985306 0.201854
+15 0.87 1.21109 0.269615
+16 0.93 1.09339 0.339515
+17 0.99 1.05845 0.416191
+18 1.05 1.03288 0.500357
+19 1.11 0.99084 0.590585
+20 1.17 0.916519 0.68331
+21 1.23 0.966454 0.791369
+22 1.29 0.965654 0.910128
+23 1.35 0.94264 1.03709
+24 1.41 1.00735 1.18509
+25 1.47 0.929037 1.33345
+26 1.53 1.01017 1.5082
+27 1.59 1.05945 1.70613
+28 1.65 0.969631 1.90121
+29 1.71 1.01172 2.11983
+30 1.77 1.05058 2.36305
+31 1.83 0.981388 2.60592
+32 1.89 0.988976 2.86698
+33 1.95 0.984902 3.14372
+34 2.01 1.00105 3.44258
+35 2.07 1.01369 3.76355
+36 2.13 1.04036 4.11234
+37 2.19 0.973074 4.4572
+38 2.25 0.971445 4.82061
+39 2.31 0.980428 5.2072
+40 2.37 1.04312 5.64016
+41 2.43 0.980802 6.06812
+42 2.49 0.978476 6.51641
+43 2.55 1.00052 6.99715
+44 2.61 0.996848 7.49893
+45 2.67 0.962706 8.00606
+46 2.73 1.01152 8.56312
+47 2.79 1.02552 9.153
+48 2.85 0.975074 9.73823
+49 2.91 1.01222 10.3716
+50 2.97 0.978853 11.0096
+104600 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0.131872 0.000713267
+6 0.33 0.176796 0.0021398
+7 0.39 0.285031 0.0053495
+8 0.45 0.452189 0.0121255
+9 0.51 0.834077 0.028174
+10 0.57 0.771769 0.046719
+11 0.63 0.741234 0.0684736
+12 0.69 0.9726 0.10271
+13 0.75 1.18348 0.151926
+14 0.81 1.16913 0.208631
+15 0.87 1.01987 0.265692
+16 0.93 1.1157 0.337019
+17 0.99 1.13722 0.419401
+18 1.05 0.980361 0.499287
+19 1.11 1.00259 0.590585
+20 1.17 0.97292 0.689016
+21 1.23 0.966454 0.797076
+22 1.29 0.956954 0.914765
+23 1.35 0.97971 1.04672
+24 1.41 1.02677 1.19757
+25 1.47 0.924571 1.34522
+26 1.53 1.01429 1.52068
+27 1.59 0.985006 1.70471
+28 1.65 1.04763 1.91548
+29 1.71 0.963853 2.12375
+30 1.77 0.987426 2.35235
+31 1.83 0.994358 2.59843
+32 1.89 0.990327 2.85984
+33 1.95 1.01409 3.14479
+34 2.01 1.0106 3.4465
+35 2.07 0.95625 3.74929
+36 2.13 1.02866 4.09415
+37 2.19 0.965024 4.43616
+38 2.25 1.01625 4.81633
+39 2.31 0.955103 5.19294
+40 2.37 0.988986 5.60342
+41 2.43 0.979168 6.03067
+42 2.49 1.03764 6.50606
+43 2.55 0.962663 6.96862
+44 2.61 1.05282 7.49857
+45 2.67 0.968799 8.00892
+46 2.73 1.00763 8.56384
+47 2.79 0.993901 9.13552
+48 2.85 0.970915 9.71826
+49 2.91 0.979737 10.3313
+50 2.97 1.0467 11.0136
+104650 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0.0659362 0.000356633
+6 0.33 0.265194 0.00249643
+7 0.39 0.221691 0.00499287
+8 0.45 0.475989 0.0121255
+9 0.51 0.852612 0.0285307
+10 0.57 0.697561 0.0452924
+11 0.63 0.753385 0.0674037
+12 0.69 1.02326 0.103424
+13 0.75 1.05484 0.14729
+14 0.81 1.16913 0.203994
+15 0.87 1.14098 0.267832
+16 0.93 1.13802 0.340585
+17 0.99 1.08306 0.419044
+18 1.05 1.03288 0.50321
+19 1.11 0.943844 0.589158
+20 1.17 0.902418 0.680456
+21 1.23 0.99835 0.792083
+22 1.29 0.901857 0.902996
+23 1.35 0.955879 1.03174
+24 1.41 0.970937 1.17439
+25 1.47 1.00497 1.33488
+26 1.53 1.0081 1.50927
+27 1.59 0.973552 1.69116
+28 1.65 1.04054 1.9005
+29 1.71 1.02162 2.12126
+30 1.77 0.988967 2.35021
+31 1.83 0.93095 2.5806
+32 1.89 0.947093 2.8306
+33 1.95 1.06105 3.12874
+34 2.01 1.07392 3.44936
+35 2.07 0.996798 3.76498
+36 2.13 0.98824 4.09629
+37 2.19 0.959992 4.43652
+38 2.25 0.917105 4.7796
+39 2.31 0.958721 5.15763
+40 2.37 1.01476 5.57882
+41 2.43 0.977533 6.00535
+42 2.49 1.01818 6.47183
+43 2.55 1.0406 6.97183
+44 2.61 1.00889 7.47967
+45 2.67 0.968799 7.99001
+46 2.73 0.99727 8.53923
+47 2.79 0.985841 9.10628
+48 2.85 0.979233 9.69401
+49 2.91 1.01621 10.3299
+50 2.97 1.00621 10.9857
+104700 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0.0659362 0.000356633
+6 0.33 0.0883979 0.0010699
+7 0.39 0.316701 0.00463623
+8 0.45 0.261794 0.0085592
+9 0.51 0.778472 0.0235378
+10 0.57 0.816295 0.0431526
+11 0.63 0.923505 0.0702568
+12 0.69 0.942206 0.103424
+13 0.75 1.20063 0.153352
+14 0.81 1.26472 0.214693
+15 0.87 1.07086 0.274608
+16 0.93 1.12128 0.346291
+17 0.99 0.974758 0.416904
+18 1.05 0.997868 0.498217
+19 1.11 0.94776 0.584522
+20 1.17 0.958819 0.681526
+21 1.23 0.854817 0.777104
+22 1.29 0.939555 0.892653
+23 1.35 0.995597 1.02675
+24 1.41 0.987928 1.1719
+25 1.47 1.00943 1.3331
+26 1.53 1.10912 1.52496
+27 1.59 0.962099 1.70471
+28 1.65 0.976721 1.90121
+29 1.71 0.968804 2.11056
+30 1.77 1.02286 2.34736
+31 1.83 0.975624 2.5888
+32 1.89 1.00654 2.85449
+33 1.95 0.931595 3.11626
+34 2.01 1.01658 3.41976
+35 2.07 1.00468 3.73787
+36 2.13 0.986113 4.06847
+37 2.19 0.995212 4.42118
+38 2.25 0.985745 4.78994
+39 2.31 0.967766 5.17154
+40 2.37 1.01219 5.59165
+41 2.43 0.992245 6.02461
+42 2.49 0.998715 6.48217
+43 2.55 1.00274 6.96398
+44 2.61 1.03086 7.48288
+45 2.67 0.988432 8.00357
+46 2.73 0.965539 8.53531
+47 2.79 0.980881 9.0995
+48 2.85 1.00716 9.70399
+49 2.91 0.993415 10.3256
+50 2.97 1.00566 10.9811
+104750 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0.0659362 0.000356633
+6 0.33 0.176796 0.00178317
+7 0.39 0.221691 0.0042796
+8 0.45 0.42839 0.010699
+9 0.51 0.537517 0.0210414
+10 0.57 0.86082 0.0417261
+11 0.63 0.765537 0.064194
+12 0.69 0.911813 0.096291
+13 0.75 1.00338 0.138017
+14 0.81 1.28678 0.200428
+15 0.87 0.949753 0.253566
+16 0.93 1.26074 0.334165
+17 0.99 1.13722 0.416548
+18 1.05 0.888452 0.488944
+19 1.11 0.932095 0.573823
+20 1.17 1.02227 0.677247
+21 1.23 0.931368 0.781384
+22 1.29 0.974353 0.901213
+23 1.35 0.918809 1.02496
+24 1.41 0.927245 1.1612
+25 1.47 0.984869 1.31847
+26 1.53 0.966872 1.48573
+27 1.59 1.03846 1.67974
+28 1.65 1.01749 1.88445
+29 1.71 1.03977 2.10913
+30 1.77 1.07369 2.3577
+31 1.83 0.942479 2.59094
+32 1.89 1.02275 2.86091
+33 1.95 0.946826 3.12696
+34 2.01 0.985518 3.42118
+35 2.07 1.00693 3.74001
+36 2.13 1.01271 4.07953
+37 2.19 1.00729 4.43652
+38 2.25 0.954285 4.79351
+39 2.31 0.949677 5.16797
+40 2.37 0.996719 5.58167
+41 2.43 1.02003 6.02675
+42 2.49 0.992488 6.48146
+43 2.55 1.0072 6.96541
+44 2.61 0.986929 7.4622
+45 2.67 0.980985 7.97896
+46 2.73 0.992737 8.52568
+47 2.79 0.992041 9.09629
+48 2.85 1.01489 9.70542
+49 2.91 0.986006 10.3224
+50 2.97 1.04561 11.0039
+104800 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0.0659362 0.000356633
+6 0.33 0.132597 0.00142653
+7 0.39 0.253361 0.0042796
+8 0.45 0.523588 0.0121255
+9 0.51 0.648727 0.0246077
+10 0.57 0.563985 0.0381598
+11 0.63 0.729083 0.0595578
+12 0.69 1.21575 0.102354
+13 0.75 1.13202 0.149429
+14 0.81 0.955894 0.195792
+15 0.87 1.24934 0.265692
+16 0.93 1.10455 0.336305
+17 0.99 1.09291 0.415478
+18 1.05 1.00662 0.497504
+19 1.11 0.865517 0.57632
+20 1.17 0.902418 0.667618
+21 1.23 0.99835 0.779244
+22 1.29 0.936655 0.894437
+23 1.35 0.953231 1.02282
+24 1.41 0.951518 1.16262
+25 1.47 1.04517 1.32953
+26 1.53 0.942134 1.49251
+27 1.59 1.07091 1.69258
+28 1.65 1.03522 1.90086
+29 1.71 0.978707 2.11234
+30 1.77 1.02902 2.35057
+31 1.83 0.98427 2.59415
+32 1.89 0.957902 2.847
+33 1.95 0.943018 3.11198
+34 2.01 1.04644 3.42439
+35 2.07 1.00919 3.74394
+36 2.13 0.948881 4.06205
+37 2.19 1.00125 4.4169
+38 2.25 1.0172 4.79743
+39 2.31 1.02203 5.20043
+40 2.37 1.00016 5.61555
+41 2.43 0.962821 6.03566
+42 2.49 1.01039 6.49857
+43 2.55 1.00052 6.97932
+44 2.61 0.995431 7.48039
+45 2.67 0.989109 8.00143
+46 2.73 1.03353 8.57061
+47 2.79 1.01994 9.15728
+48 2.85 0.997654 9.75606
+49 2.91 0.978597 10.3684
+50 2.97 1.05928 11.0588
+104850 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0.108706 0.000356633
+5 0.27 0.197809 0.00142653
+6 0.33 0.132597 0.00249643
+7 0.39 0.380042 0.00677603
+8 0.45 0.380791 0.0124822
+9 0.51 0.537517 0.0228245
+10 0.57 0.801453 0.0420827
+11 0.63 0.801991 0.0656205
+12 0.69 1.17523 0.10699
+13 0.75 1.1749 0.155849
+14 0.81 1.10295 0.209344
+15 0.87 1.14098 0.273181
+16 0.93 1.12128 0.344864
+17 0.99 0.959989 0.414408
+18 1.05 0.971608 0.493581
+19 1.11 0.967342 0.581669
+20 1.17 0.895368 0.672254
+21 1.23 0.886713 0.771398
+22 1.29 1.03235 0.898359
+23 1.35 0.955879 1.0271
+24 1.41 0.970937 1.16976
+25 1.47 0.975936 1.32561
+26 1.53 1.0617 1.50927
+27 1.59 0.931556 1.68331
+28 1.65 1.05117 1.89479
+29 1.71 1.02987 2.11733
+30 1.77 1.05675 2.36198
+31 1.83 0.952566 2.59772
+32 1.89 0.990327 2.85913
+33 1.95 0.945557 3.12482
+34 2.01 1.03449 3.43367
+35 2.07 1.01257 3.75428
+36 2.13 1.03079 4.09986
+37 2.19 0.97408 4.44508
+38 2.25 1.03532 4.83238
+39 2.31 1.02475 5.23645
+40 2.37 0.98469 5.64515
+41 2.43 1.02085 6.09058
+42 2.49 1.01506 6.55563
+43 2.55 1.00794 7.03994
+44 2.61 0.998265 7.54244
+45 2.67 0.975569 8.05635
+46 2.73 0.947406 8.5781
+47 2.79 0.982741 9.14337
+48 2.85 1.01548 9.75285
+49 2.91 0.997405 10.377
+50 2.97 0.971193 11.01
+104900 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0.197809 0.0010699
+6 0.33 0.265194 0.0032097
+7 0.39 0.285031 0.0064194
+8 0.45 0.285593 0.010699
+9 0.51 0.667262 0.0235378
+10 0.57 0.831136 0.0435093
+11 0.63 0.826294 0.0677603
+12 0.69 0.820631 0.0966476
+13 0.75 1.00338 0.138374
+14 0.81 1.17648 0.195435
+15 0.87 1.19835 0.262482
+16 0.93 1.16033 0.336662
+17 0.99 1.03383 0.411555
+18 1.05 1.06352 0.498217
+19 1.11 0.877266 0.578103
+20 1.17 0.96587 0.67582
+21 1.23 0.956885 0.78281
+22 1.29 0.919256 0.895863
+23 1.35 1.02472 1.03388
+24 1.41 0.978219 1.1776
+25 1.47 0.984869 1.33488
+26 1.53 1.10087 1.52532
+27 1.59 0.971643 1.70685
+28 1.65 1.02104 1.91227
+29 1.71 1.02162 2.13302
+30 1.77 0.970481 2.3577
+31 1.83 0.965536 2.59665
+32 1.89 1.00249 2.86127
+33 1.95 1.00775 3.14444
+34 2.01 1.02016 3.449
+35 2.07 0.983282 3.76034
+36 2.13 0.98824 4.09165
+37 2.19 0.988168 4.44187
+38 2.25 1.03246 4.8281
+39 2.31 0.992186 5.21933
+40 2.37 1.01906 5.6423
+41 2.43 1.01268 6.08417
+42 2.49 0.983925 6.53495
+43 2.55 0.996063 7.01355
+44 2.61 0.988346 7.51106
+45 2.67 1.03447 8.05599
+46 2.73 0.964891 8.58738
+47 2.79 0.982741 9.15264
+48 2.85 0.982799 9.74251
+49 2.91 1.01222 10.3759
+50 2.97 0.980494 11.015
+104950 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0.108706 0.000356633
+5 0.27 0 0.000356633
+6 0.33 0.0883979 0.0010699
+7 0.39 0.221691 0.00356633
+8 0.45 0.333192 0.0085592
+9 0.51 0.667262 0.021398
+10 0.57 0.816295 0.0410128
+11 0.63 0.887051 0.0670471
+12 0.69 0.911813 0.0991441
+13 0.75 1.06341 0.143367
+14 0.81 1.07354 0.195435
+15 0.87 1.10273 0.257133
+16 0.93 1.16591 0.331669
+17 0.99 1.16183 0.415835
+18 1.05 1.01537 0.498573
+19 1.11 1.00259 0.589872
+20 1.17 0.944719 0.685449
+21 1.23 0.940937 0.790656
+22 1.29 0.965654 0.909415
+23 1.35 0.947936 1.03709
+24 1.41 1.00007 1.18402
+25 1.47 1.06527 1.35414
+26 1.53 0.975119 1.52282
+27 1.59 0.971643 1.70435
+28 1.65 0.987357 1.903
+29 1.71 1.04968 2.12981
+30 1.77 1.08601 2.38124
+31 1.83 1.07074 2.64622
+32 1.89 0.949795 2.89693
+33 1.95 0.949364 3.16369
+34 2.01 1.05719 3.47932
+35 2.07 0.960755 3.78352
+36 2.13 0.976539 4.11091
+37 2.19 0.962005 4.45185
+38 2.25 1.01244 4.8306
+39 2.31 1.01027 5.22896
+40 2.37 0.982972 5.63695
+41 2.43 1.05028 6.09522
+42 2.49 0.997937 6.55243
+43 2.55 0.984188 7.02532
+44 2.61 1.01952 7.53852
+45 2.67 1.00942 8.07026
+46 2.73 0.972662 8.60592
+47 2.79 0.998861 9.18046
+48 2.85 1.00181 9.78174
+49 2.91 1.06523 10.4483
+50 2.97 0.993626 11.0959
+105000 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0.176796 0.00142653
+7 0.39 0.380042 0.00570613
+8 0.45 0.547387 0.0139087
+9 0.51 0.630192 0.0260342
+10 0.57 0.623352 0.0410128
+11 0.63 0.78984 0.064194
+12 0.69 1.15496 0.10485
+13 0.75 0.969079 0.14515
+14 0.81 1.14707 0.200785
+15 0.87 1.20472 0.268188
+16 0.93 1.34442 0.354137
+17 0.99 1.02891 0.428673
+18 1.05 0.967231 0.507489
+19 1.11 0.936011 0.592725
+20 1.17 0.909468 0.684736
+21 1.23 0.966454 0.792796
+22 1.29 0.896057 0.902996
+23 1.35 1.00619 1.03852
+24 1.41 1.04376 1.19187
+25 1.47 0.960303 1.34522
+26 1.53 1.04933 1.52675
+27 1.59 0.988823 1.71148
+28 1.65 0.95545 1.90371
+29 1.71 1.05298 2.13124
+30 1.77 1.00437 2.36377
+31 1.83 1.02606 2.61769
+32 1.89 1.00249 2.88231
+33 1.95 0.978556 3.15728
+34 2.01 0.974767 3.44829
+35 2.07 0.970892 3.75571
+36 2.13 0.980794 4.08452
+37 2.19 1.07471 4.46541
+38 2.25 0.956192 4.82311
+39 2.31 1.02203 5.22611
+40 2.37 0.989845 5.63695
+41 2.43 1.00369 6.07489
+42 2.49 1.01584 6.5403
+43 2.55 1.00645 7.02389
+44 2.61 0.96284 7.50856
+45 2.67 0.980308 8.02496
+46 2.73 0.983023 8.56633
+47 2.79 1.04784 9.16904
+48 2.85 0.986364 9.76106
+49 2.91 1.00139 10.3877
+50 2.97 1.01278 11.0478
+105050 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0.217411 0.000713267
+5 0.27 0.197809 0.00178317
+6 0.33 0.176796 0.0032097
+7 0.39 0.253361 0.00606277
+8 0.45 0.309393 0.010699
+9 0.51 0.741402 0.0249643
+10 0.57 0.549144 0.0381598
+11 0.63 0.923505 0.0652639
+12 0.69 1.10431 0.104137
+13 0.75 1.08057 0.149073
+14 0.81 1.13972 0.204351
+15 0.87 1.28121 0.276034
+16 0.93 1.16591 0.350571
+17 0.99 0.979681 0.421541
+18 1.05 1.0285 0.50535
+19 1.11 0.920346 0.589158
+20 1.17 0.941194 0.684379
+21 1.23 0.969643 0.792796
+22 1.29 0.977253 0.912981
+23 1.35 1.03796 1.05278
+24 1.41 1.02191 1.20292
+25 1.47 0.971469 1.35806
+26 1.53 0.991611 1.5296
+27 1.59 1.03082 1.72218
+28 1.65 0.99622 1.92261
+29 1.71 0.970455 2.13231
+30 1.77 1.01824 2.36805
+31 1.83 1.003 2.61626
+32 1.89 0.947093 2.86626
+33 1.95 1.06486 3.16548
+34 2.01 1.00344 3.46505
+35 2.07 1.05199 3.79815
+36 2.13 0.96271 4.1209
+37 2.19 1.00628 4.47753
+38 2.25 1.0315 4.86341
+39 2.31 0.957817 5.24108
+40 2.37 0.96235 5.64051
+41 2.43 0.961186 6.05991
+42 2.49 1.01584 6.52532
+43 2.55 1.03837 7.02425
+44 2.61 0.998973 7.5271
+45 2.67 1.02567 8.0674
+46 2.73 1.00569 8.62126
+47 2.79 1.01622 9.20578
+48 2.85 0.992306 9.80136
+49 2.91 0.983726 10.4169
+50 2.97 0.993079 11.0642
+105100 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0.108706 0.000356633
+5 0.27 0.131872 0.0010699
+6 0.33 0.176796 0.00249643
+7 0.39 0.348371 0.0064194
+8 0.45 0.42839 0.0128388
+9 0.51 0.648727 0.025321
+10 0.57 0.742086 0.0431526
+11 0.63 0.911353 0.0699001
+12 0.69 1.11444 0.10913
+13 0.75 0.960503 0.149073
+14 0.81 1.27207 0.21077
+15 0.87 1.10273 0.272468
+16 0.93 1.23843 0.351641
+17 0.99 0.99445 0.42368
+18 1.05 0.919089 0.498573
+19 1.11 0.963426 0.586305
+20 1.17 0.895368 0.67689
+21 1.23 0.969643 0.785307
+22 1.29 0.948254 0.901926
+23 1.35 1.00354 1.03709
+24 1.41 0.970937 1.17974
+25 1.47 0.962536 1.33345
+26 1.53 1.04727 1.51462
+27 1.59 1.04418 1.7097
+28 1.65 0.96254 1.90335
+29 1.71 1.01667 2.12304
+30 1.77 0.959698 2.34522
+31 1.83 1.003 2.59344
+32 1.89 1.04167 2.8684
+33 1.95 0.969672 3.14087
+34 2.01 1.02733 3.44757
+35 2.07 1.00018 3.76427
+36 2.13 0.976539 4.09165
+37 2.19 0.951942 4.42903
+38 2.25 0.964772 4.78994
+39 2.31 1.05007 5.20399
+40 2.37 1.03968 5.63552
+41 2.43 0.992245 6.06847
+42 2.49 0.986261 6.52033
+43 2.55 0.99829 7
+44 2.61 0.990471 7.49857
+45 2.67 0.998587 8.02461
+46 2.73 0.99986 8.57525
+47 2.79 0.992661 9.14622
+48 2.85 0.965567 9.72575
+49 2.91 1.01051 10.3581
+50 2.97 1.00512 11.0132
+105150 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0.131872 0.000713267
+6 0.33 0.0883979 0.00142653
+7 0.39 0.158351 0.0032097
+8 0.45 0.404591 0.00927247
+9 0.51 0.593122 0.0206847
+10 0.57 0.816295 0.0402996
+11 0.63 0.826294 0.0645506
+12 0.69 0.942206 0.0977175
+13 0.75 1.08914 0.14301
+14 0.81 1.13237 0.197932
+15 0.87 1.23659 0.267118
+16 0.93 1.18822 0.343081
+17 0.99 1.13722 0.425464
+18 1.05 1.09853 0.514979
+19 1.11 0.892931 0.596291
+20 1.17 0.912993 0.688659
+21 1.23 0.91223 0.790656
+22 1.29 0.919256 0.903709
+23 1.35 0.961175 1.03317
+24 1.41 1.04618 1.18688
+25 1.47 1.04293 1.35342
+26 1.53 0.954503 1.51854
+27 1.59 0.990732 1.70364
+28 1.65 1.05826 1.91655
+29 1.71 1.01007 2.13481
+30 1.77 1.01515 2.36983
+31 1.83 1.02462 2.6234
+32 1.89 1.01059 2.89016
+33 1.95 0.899865 3.14301
+34 2.01 1.01538 3.44615
+35 2.07 1.05875 3.78138
+36 2.13 0.972284 4.10735
+37 2.19 1.00427 4.46327
+38 2.25 0.964772 4.82418
+39 2.31 0.971383 5.2072
+40 2.37 0.980394 5.61412
+41 2.43 1.01431 6.0567
+42 2.49 1.00728 6.51819
+43 2.55 1.01239 7.00464
+44 2.61 1.01385 7.51498
+45 2.67 0.986401 8.03459
+46 2.73 0.994032 8.58203
+47 2.79 1.02242 9.17011
+48 2.85 0.962002 9.7475
+49 2.91 1.02533 10.3891
+50 2.97 1.00019 11.041
+105200 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0.0659362 0.000356633
+6 0.33 0.132597 0.00142653
+7 0.39 0.380042 0.00570613
+8 0.45 0.356992 0.0110556
+9 0.51 0.704332 0.0246077
+10 0.57 0.563985 0.0381598
+11 0.63 0.899202 0.0645506
+12 0.69 1.18536 0.106277
+13 0.75 1.15775 0.154422
+14 0.81 1.16178 0.21077
+15 0.87 1.19835 0.277817
+16 0.93 0.959504 0.339158
+17 0.99 1.07322 0.416904
+18 1.05 0.919089 0.491797
+19 1.11 0.928178 0.57632
+20 1.17 0.909468 0.668331
+21 1.23 0.909041 0.769971
+22 1.29 0.974353 0.8898
+23 1.35 0.982358 1.02211
+24 1.41 0.9588 1.16298
+25 1.47 1.00274 1.32311
+26 1.53 1.04727 1.50428
+27 1.59 1.04227 1.699
+28 1.65 1.00686 1.90157
+29 1.71 1.03152 2.12447
+30 1.77 1.09218 2.37732
+31 1.83 1.00156 2.62518
+32 1.89 0.972763 2.88195
+33 1.95 0.94048 3.14622
+34 2.01 0.956848 3.43188
+35 2.07 1.01031 3.75178
+36 2.13 0.975475 4.07882
+37 2.19 1.03446 4.44544
+38 2.25 1.05248 4.83916
+39 2.31 0.966861 5.2204
+40 2.37 0.982112 5.62803
+41 2.43 1.04864 6.08559
+42 2.49 0.97692 6.53317
+43 2.55 0.986414 7.00713
+44 2.61 0.990471 7.50571
+45 2.67 1.01077 8.03816
+46 2.73 0.953882 8.56348
+47 2.79 0.985221 9.13017
+48 2.85 1.01845 9.74144
+49 2.91 1.05269 10.4001
+50 2.97 1.00949 11.0581
+105250 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0.0659362 0.000356633
+6 0.33 0.0883979 0.0010699
+7 0.39 0.538392 0.00713267
+8 0.45 0.261794 0.0110556
+9 0.51 0.648727 0.0235378
+10 0.57 0.86082 0.0442225
+11 0.63 0.947808 0.0720399
+12 0.69 1.00299 0.107347
+13 0.75 0.986231 0.148359
+14 0.81 1.13972 0.203638
+15 0.87 1.19197 0.270328
+16 0.93 1.08781 0.339872
+17 0.99 0.915682 0.406205
+18 1.05 1.03726 0.490728
+19 1.11 0.853767 0.568474
+20 1.17 0.97997 0.667618
+21 1.23 0.963264 0.775321
+22 1.29 1.01205 0.899786
+23 1.35 1.03532 1.03923
+24 1.41 1.02434 1.18973
+25 1.47 0.982636 1.34665
+26 1.53 0.983365 1.51676
+27 1.59 0.933465 1.69116
+28 1.65 1.04054 1.9005
+29 1.71 1.08433 2.13481
+30 1.77 1.0321 2.37375
+31 1.83 1.01886 2.62589
+32 1.89 0.993029 2.88802
+33 1.95 1.06359 3.18688
+34 2.01 0.956848 3.47254
+35 2.07 1.01369 3.79351
+36 2.13 0.952072 4.1127
+37 2.19 0.984143 4.46148
+38 2.25 0.972398 4.82525
+39 2.31 1.05912 5.24287
+40 2.37 0.992423 5.65478
+41 2.43 0.998784 6.09058
+42 2.49 0.982369 6.54066
+43 2.55 1.0072 7.02461
+44 2.61 0.957881 7.50678
+45 2.67 1.01687 8.04244
+46 2.73 0.979138 8.58167
+47 2.79 1.01188 9.16369
+48 2.85 1.00835 9.7689
+49 2.91 1.02761 10.4119
+50 2.97 1.01551 11.0738
+105300 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0.0659362 0.000356633
+6 0.33 0.132597 0.00142653
+7 0.39 0.316701 0.00499287
+8 0.45 0.380791 0.010699
+9 0.51 0.667262 0.0235378
+10 0.57 0.786611 0.0424394
+11 0.63 0.911353 0.0691869
+12 0.69 1.06378 0.106633
+13 0.75 1.24351 0.158345
+14 0.81 1.11031 0.212197
+15 0.87 1.21109 0.279957
+16 0.93 1.07665 0.348787
+17 0.99 1.02399 0.422967
+18 1.05 0.958478 0.50107
+19 1.11 0.983008 0.590585
+20 1.17 1.02932 0.694722
+21 1.23 0.91223 0.796719
+22 1.29 1.00045 0.919757
+23 1.35 0.971766 1.05064
+24 1.41 0.980646 1.19472
+25 1.47 1.0005 1.35449
+26 1.53 0.917395 1.5132
+27 1.59 1.15299 1.7286
+28 1.65 1.01572 1.93295
+29 1.71 0.985309 2.14586
+30 1.77 1.01053 2.37981
+31 1.83 0.995799 2.62625
+32 1.89 0.960604 2.87981
+33 1.95 0.998863 3.16049
+34 2.01 0.990296 3.45613
+35 2.07 0.982155 3.76712
+36 2.13 1.0393 4.11555
+37 2.19 0.95798 4.45506
+38 2.25 0.957145 4.81312
+39 2.31 1.03741 5.22218
+40 2.37 1.03539 5.65193
+41 2.43 0.959551 6.07061
+42 2.49 1.00261 6.52996
+43 2.55 1.03021 7.02496
+44 2.61 0.985512 7.52104
+45 2.67 0.969476 8.03174
+46 2.73 1.00698 8.58631
+47 2.79 1.01374 9.1694
+48 2.85 1.01607 9.77924
+49 2.91 0.961498 10.3809
+50 2.97 0.995815 11.03
+105350 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0.131872 0.000713267
+6 0.33 0.309393 0.0032097
+7 0.39 0.253361 0.00606277
+8 0.45 0.42839 0.0124822
+9 0.51 0.407771 0.0203281
+10 0.57 0.935028 0.042796
+11 0.63 0.899202 0.0691869
+12 0.69 1.18536 0.110913
+13 0.75 0.874744 0.14729
+14 0.81 1.14707 0.202924
+15 0.87 1.21109 0.270685
+16 0.93 1.09339 0.340585
+17 0.99 0.974758 0.411198
+18 1.05 0.975984 0.490728
+19 1.11 0.99084 0.580956
+20 1.17 0.990545 0.68117
+21 1.23 0.99835 0.792796
+22 1.29 0.881558 0.901213
+23 1.35 0.977062 1.03281
+24 1.41 1.03648 1.18509
+25 1.47 1.0139 1.347
+26 1.53 0.907087 1.50392
+27 1.59 1.1339 1.71576
+28 1.65 1.0689 1.93081
+29 1.71 1.00346 2.14765
+30 1.77 0.961239 2.37019
+31 1.83 0.974183 2.61127
+32 1.89 1.0187 2.88017
+33 1.95 1.04075 3.17261
+34 2.01 0.974767 3.46362
+35 2.07 0.978776 3.77354
+36 2.13 0.973348 4.09986
+37 2.19 0.96603 4.44223
+38 2.25 1.04008 4.83131
+39 2.31 0.990377 5.22183
+40 2.37 1.03367 5.65086
+41 2.43 1.01104 6.09201
+42 2.49 1.00339 6.55171
+43 2.55 1.01536 7.03959
+44 2.61 0.977718 7.53174
+45 2.67 0.991817 8.05421
+46 2.73 1.02188 8.61698
+47 2.79 0.985841 9.18402
+48 2.85 0.976262 9.76997
+49 2.91 1.01108 10.4026
+50 2.97 1.03521 11.0774
+105400 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0.108706 0.000356633
+5 0.27 0.131872 0.0010699
+6 0.33 0.176796 0.00249643
+7 0.39 0.221691 0.00499287
+8 0.45 0.356992 0.0103424
+9 0.51 0.593122 0.0217546
+10 0.57 0.831136 0.0417261
+11 0.63 0.753385 0.0638374
+12 0.69 0.851025 0.0937946
+13 0.75 1.12345 0.140514
+14 0.81 1.21325 0.199358
+15 0.87 1.21747 0.267475
+16 0.93 1.16591 0.342011
+17 0.99 1.13229 0.424037
+18 1.05 1.01537 0.506776
+19 1.11 0.994757 0.597361
+20 1.17 0.867168 0.685093
+21 1.23 0.924989 0.788516
+22 1.29 1.03235 0.915478
+23 1.35 0.932048 1.04101
+24 1.41 0.956373 1.18153
+25 1.47 0.95807 1.33452
+26 1.53 1.0081 1.50892
+27 1.59 1.05373 1.70578
+28 1.65 1.09017 1.92511
+29 1.71 1.01997 2.14551
+30 1.77 0.995129 2.37589
+31 1.83 0.98427 2.61947
+32 1.89 0.970061 2.87553
+33 1.95 1.02679 3.16405
+34 2.01 0.947291 3.44686
+35 2.07 0.982155 3.75785
+36 2.13 0.987177 4.0888
+37 2.19 0.955967 4.4276
+38 2.25 0.986698 4.79672
+39 2.31 1.03198 5.20364
+40 2.37 0.99586 5.61698
+41 2.43 1.0184 6.06134
+42 2.49 1.06332 6.5485
+43 2.55 0.981219 7.01997
+44 2.61 1.01456 7.53067
+45 2.67 1.01822 8.06705
+46 2.73 1.01864 8.62803
+47 2.79 0.983981 9.19401
+48 2.85 0.986364 9.78602
+49 2.91 0.982586 10.4009
+50 2.97 1.01387 11.0617
+105450 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0.0659362 0.000356633
+6 0.33 0.132597 0.00142653
+7 0.39 0.316701 0.00499287
+8 0.45 0.571187 0.0135521
+9 0.51 0.574587 0.0246077
+10 0.57 0.94987 0.0474322
+11 0.63 0.862748 0.0727532
+12 0.69 0.881419 0.10378
+13 0.75 1.00338 0.145506
+14 0.81 1.25001 0.206134
+15 0.87 1.1346 0.269615
+16 0.93 1.13802 0.342368
+17 0.99 1.0486 0.418331
+18 1.05 1.01975 0.501427
+19 1.11 0.943844 0.587375
+20 1.17 0.891843 0.677603
+21 1.23 0.969643 0.78602
+22 1.29 0.945354 0.902282
+23 1.35 1.02737 1.04066
+24 1.41 0.985501 1.18545
+25 1.47 0.971469 1.34058
+26 1.53 1.02666 1.51819
+27 1.59 1.01364 1.70756
+28 1.65 1.04585 1.91797
+29 1.71 1.00016 2.13409
+30 1.77 0.973562 2.35949
+31 1.83 1.02606 2.61341
+32 1.89 1.0187 2.88231
+33 1.95 0.97221 3.15549
+34 2.01 1.02852 3.46255
+35 2.07 0.925839 3.75571
+36 2.13 1.0042 4.09237
+37 2.19 0.955967 4.43117
+38 2.25 1.0315 4.81705
+39 2.31 1.04374 5.2286
+40 2.37 0.972661 5.63231
+41 2.43 0.993062 6.06562
+42 2.49 1.05554 6.54922
+43 2.55 0.999032 7.02924
+44 2.61 0.983386 7.52425
+45 2.67 0.993171 8.04743
+46 2.73 0.95712 8.57454
+47 2.79 1.00444 9.15228
+48 2.85 1.01786 9.7632
+49 2.91 0.974607 10.373
+50 2.97 1.02317 11.0399
+105500 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0.131872 0.000713267
+6 0.33 0.044199 0.0010699
+7 0.39 0.158351 0.00285307
+8 0.45 0.452189 0.0096291
+9 0.51 0.426306 0.0178317
+10 0.57 0.94987 0.0406562
+11 0.63 0.935656 0.068117
+12 0.69 0.962469 0.101997
+13 0.75 1.06341 0.14622
+14 0.81 1.14707 0.201854
+15 0.87 1.03262 0.259629
+16 0.93 1.19938 0.336305
+17 0.99 0.984604 0.407632
+18 1.05 0.958478 0.485735
+19 1.11 0.920346 0.569544
+20 1.17 1.00112 0.670827
+21 1.23 0.928178 0.774608
+22 1.29 0.922156 0.888017
+23 1.35 1.04591 1.02889
+24 1.41 1.01463 1.17796
+25 1.47 0.980402 1.33452
+26 1.53 0.995734 1.50678
+27 1.59 0.983097 1.69044
+28 1.65 1.02636 1.89693
+29 1.71 1.04142 2.12197
+30 1.77 1.0398 2.3627
+31 1.83 1.003 2.61091
+32 1.89 0.924125 2.85485
+33 1.95 1.00394 3.13695
+34 2.01 0.964015 3.42475
+35 2.07 0.939355 3.72218
+36 2.13 1.03505 4.06919
+37 2.19 1.07169 4.449
+38 2.25 0.980978 4.81598
+39 2.31 1.00033 5.21041
+40 2.37 1.04484 5.64408
+41 2.43 1.02576 6.09165
+42 2.49 0.96213 6.53245
+43 2.55 0.973797 7.00036
+44 2.61 0.996848 7.50214
+45 2.67 1.00333 8.03067
+46 2.73 1.05231 8.6102
+47 2.79 0.96166 9.16334
+48 2.85 0.967944 9.74429
+49 2.91 0.982016 10.3588
+50 2.97 1.03466 11.0332
+105550 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0.21169 0.000356633
+4 0.21 0 0.000356633
+5 0.27 0.0659362 0.000713267
+6 0.33 0.220995 0.00249643
+7 0.39 0.348371 0.0064194
+8 0.45 0.523588 0.0142653
+9 0.51 0.556052 0.0249643
+10 0.57 0.801453 0.0442225
+11 0.63 0.814142 0.068117
+12 0.69 0.911813 0.100214
+13 0.75 1.14917 0.148003
+14 0.81 1.2206 0.207204
+15 0.87 1.28758 0.279244
+16 0.93 1.0655 0.347361
+17 0.99 1.0486 0.423324
+18 1.05 0.975984 0.502853
+19 1.11 0.963426 0.590585
+20 1.17 0.962344 0.687946
+21 1.23 0.950506 0.794223
+22 1.29 0.843859 0.898003
+23 1.35 1.02208 1.03566
+24 1.41 0.934527 1.17297
+25 1.47 0.982636 1.32989
+26 1.53 1.00192 1.50321
+27 1.59 1.00219 1.69044
+28 1.65 1.03876 1.89943
+29 1.71 1.09754 2.13659
+30 1.77 0.973562 2.36198
+31 1.83 1.03759 2.61876
+32 1.89 0.979519 2.87732
+33 1.95 1.00267 3.15906
+34 2.01 0.96521 3.44722
+35 2.07 0.991166 3.76106
+36 2.13 0.978666 4.08916
+37 2.19 0.973074 4.43402
+38 2.25 0.987652 4.8035
+39 2.31 1.04012 5.21362
+40 2.37 1.01906 5.63659
+41 2.43 0.992245 6.06954
+42 2.49 0.988596 6.52247
+43 2.55 1.06212 7.03281
+44 2.61 1.0344 7.5535
+45 2.67 0.993848 8.07703
+46 2.73 0.979138 8.61626
+47 2.79 0.983981 9.18224
+48 2.85 0.935263 9.74358
+49 2.91 1.00367 10.3716
+50 2.97 1.03029 11.0432
+105600 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0.108706 0.000356633
+5 0.27 0.0659362 0.000713267
+6 0.33 0.309393 0.0032097
+7 0.39 0.411712 0.00784593
+8 0.45 0.594986 0.0167618
+9 0.51 0.500446 0.0263909
+10 0.57 0.653036 0.0420827
+11 0.63 0.911353 0.0688302
+12 0.69 1.05365 0.10592
+13 0.75 1.04626 0.149429
+14 0.81 1.15443 0.205421
+15 0.87 1.03899 0.263552
+16 0.93 1.07107 0.332026
+17 0.99 1.02891 0.406562
+18 1.05 1.05914 0.492867
+19 1.11 1.04959 0.588445
+20 1.17 0.877743 0.677247
+21 1.23 1.00792 0.789943
+22 1.29 0.945354 0.906205
+23 1.35 0.934696 1.0321
+24 1.41 1.02434 1.1826
+25 1.47 0.993802 1.3413
+26 1.53 1.04109 1.5214
+27 1.59 1.08236 1.72361
+28 1.65 1.03167 1.93117
+29 1.71 1.01172 2.14979
+30 1.77 1.03518 2.38944
+31 1.83 0.992917 2.63516
+32 1.89 0.91737 2.87732
+33 1.95 0.95698 3.14622
+34 2.01 0.996269 3.44365
+35 2.07 0.997924 3.75963
+36 2.13 1.0659 4.11698
+37 2.19 0.955967 4.45578
+38 2.25 1.02102 4.83773
+39 2.31 0.998517 5.23146
+40 2.37 0.986408 5.64087
+41 2.43 1.03229 6.0913
+42 2.49 0.975363 6.53816
+43 2.55 0.984188 7.01106
+44 2.61 1.02519 7.5271
+45 2.67 1.01077 8.05956
+46 2.73 0.957768 8.58702
+47 2.79 1.01436 9.17047
+48 2.85 0.989929 9.76462
+49 2.91 0.961498 10.3663
+50 2.97 0.96408 10.9947
+105650 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0.0659362 0.000356633
+6 0.33 0.309393 0.00285307
+7 0.39 0.285031 0.00606277
+8 0.45 0.499788 0.0135521
+9 0.51 0.537517 0.0238944
+10 0.57 0.400726 0.0335235
+11 0.63 0.97211 0.0620542
+12 0.69 0.982731 0.0966476
+13 0.75 1.1406 0.14408
+14 0.81 1.26472 0.205421
+15 0.87 1.1856 0.271755
+16 0.93 1.09339 0.341655
+17 0.99 1.15199 0.425107
+18 1.05 0.967231 0.503923
+19 1.11 0.912513 0.587019
+20 1.17 0.923569 0.680456
+21 1.23 0.91542 0.78281
+22 1.29 0.968553 0.901926
+23 1.35 0.950583 1.02996
+24 1.41 1.00007 1.17689
+25 1.47 1.05187 1.34486
+26 1.53 1.00604 1.5189
+27 1.59 1.04991 1.71505
+28 1.65 0.985584 1.91334
+29 1.71 1.02492 2.13481
+30 1.77 1.01824 2.37054
+31 1.83 1.00589 2.61947
+32 1.89 0.96871 2.87518
+33 1.95 0.98871 3.153
+34 2.01 0.995074 3.45007
+35 2.07 0.967513 3.75642
+36 2.13 1.03717 4.10414
+37 2.19 0.950936 4.44116
+38 2.25 0.994325 4.81312
+39 2.31 1.04464 5.22504
+40 2.37 0.983831 5.63338
+41 2.43 1.02249 6.07953
+42 2.49 1.01039 6.54244
+43 2.55 1.01388 7.0296
+44 2.61 0.983386 7.52461
+45 2.67 1.0101 8.0567
+46 2.73 1.0167 8.61662
+47 2.79 0.996381 9.18973
+48 2.85 0.9929 9.78566
+49 2.91 0.957509 10.3848
+50 2.97 0.995815 11.0339
+105700 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0.131872 0.000713267
+6 0.33 0.220995 0.00249643
+7 0.39 0.253361 0.0053495
+8 0.45 0.571187 0.0139087
+9 0.51 0.722867 0.0278174
+10 0.57 0.756928 0.0460057
+11 0.63 0.850597 0.07097
+12 0.69 1.10431 0.109843
+13 0.75 1.01196 0.151926
+14 0.81 0.992659 0.200071
+15 0.87 1.08998 0.261056
+16 0.93 0.965082 0.322753
+17 0.99 1.10276 0.402639
+18 1.05 1.04163 0.487518
+19 1.11 1.06133 0.584165
+20 1.17 0.909468 0.676177
+21 1.23 1.03981 0.792439
+22 1.29 1.01205 0.916904
+23 1.35 0.889683 1.03673
+24 1.41 1.06075 1.19258
+25 1.47 1.0072 1.35342
+26 1.53 0.973057 1.52175
+27 1.59 1.01937 1.7122
+28 1.65 1.01572 1.91655
+29 1.71 1.01997 2.13695
+30 1.77 1.01361 2.37161
+31 1.83 0.982829 2.61484
+32 1.89 0.982221 2.87411
+33 1.95 1.00902 3.15763
+34 2.01 0.966405 3.44615
+35 2.07 0.991166 3.75999
+36 2.13 1.05526 4.11377
+37 2.19 1.01735 4.47432
+38 2.25 1.03246 4.86056
+39 2.31 0.971383 5.24358
+40 2.37 0.988127 5.65371
+41 2.43 1.00205 6.09094
+42 2.49 0.969914 6.53531
+43 2.55 0.990125 7.01106
+44 2.61 0.964965 7.49679
+45 2.67 1.00197 8.02461
+46 2.73 1.01087 8.58131
+47 2.79 1.04226 9.18081
+48 2.85 0.988741 9.77425
+49 2.91 1.00937 10.4058
+50 2.97 0.986513 11.0489
+105750 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0.0659362 0.000356633
+6 0.33 0.132597 0.00142653
+7 0.39 0.348371 0.0053495
+8 0.45 0.523588 0.0131954
+9 0.51 0.444841 0.0217546
+10 0.57 0.875662 0.042796
+11 0.63 0.97211 0.0713267
+12 0.69 0.992863 0.106277
+13 0.75 0.994807 0.147646
+14 0.81 1.22796 0.207204
+15 0.87 1.19197 0.273894
+16 0.93 1.00971 0.338445
+17 0.99 1.02891 0.412981
+18 1.05 0.975984 0.492511
+19 1.11 0.967342 0.580599
+20 1.17 0.849542 0.666548
+21 1.23 0.991971 0.777461
+22 1.29 0.962754 0.895863
+23 1.35 0.913513 1.0189
+24 1.41 1.08259 1.17796
+25 1.47 0.940204 1.3281
+26 1.53 1.04521 1.50892
+27 1.59 0.97737 1.69151
+28 1.65 0.987357 1.89016
+29 1.71 1.03977 2.11484
+30 1.77 1.07215 2.36305
+31 1.83 0.998681 2.6102
+32 1.89 0.975466 2.86769
+33 1.95 0.989979 3.14586
+34 2.01 1.04286 3.4572
+35 2.07 0.972018 3.76498
+36 2.13 0.965901 4.0888
+37 2.19 1.03345 4.45506
+38 2.25 0.968585 4.8174
+39 2.31 1.00123 5.2122
+40 2.37 1.03796 5.64301
+41 2.43 0.998784 6.07882
+42 2.49 1.02285 6.54743
+43 2.55 0.973797 7.01534
+44 2.61 1.01385 7.52568
+45 2.67 0.987755 8.04601
+46 2.73 1.02253 8.60913
+47 2.79 1.00506 9.18723
+48 2.85 1.02202 9.80064
+49 2.91 1.00595 10.4301
+50 2.97 0.995815 11.0792
+105800 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0.108706 0.000356633
+5 0.27 0.131872 0.0010699
+6 0.33 0.0883979 0.00178317
+7 0.39 0.443382 0.00677603
+8 0.45 0.356992 0.0121255
+9 0.51 0.759937 0.0267475
+10 0.57 0.504619 0.038873
+11 0.63 0.984262 0.0677603
+12 0.69 0.911813 0.0998573
+13 0.75 1.08914 0.14515
+14 0.81 1.14707 0.200785
+15 0.87 1.28758 0.272825
+16 0.93 1.10455 0.343438
+17 0.99 1.03383 0.418331
+18 1.05 1.011 0.500713
+19 1.11 0.802855 0.573823
+20 1.17 0.976445 0.672611
+21 1.23 0.976023 0.78174
+22 1.29 1.00335 0.905136
+23 1.35 0.990301 1.03852
+24 1.41 0.978219 1.18224
+25 1.47 1.07643 1.35414
+26 1.53 1.08232 1.54137
+27 1.59 1.00409 1.72896
+28 1.65 0.948359 1.91976
+29 1.71 1.02822 2.14194
+30 1.77 0.96432 2.36519
+31 1.83 0.94392 2.59879
+32 1.89 1.05248 2.8766
+33 1.95 0.983633 3.153
+34 2.01 1.05719 3.46862
+35 2.07 1.01144 3.78887
+36 2.13 1.0159 4.12946
+37 2.19 0.929804 4.45899
+38 2.25 0.951425 4.81491
+39 2.31 1.07087 5.23716
+40 2.37 1.02507 5.66262
+41 2.43 1.00124 6.0995
+42 2.49 1.01273 6.56348
+43 2.55 0.958952 7.02425
+44 2.61 0.972759 7.51391
+45 2.67 1.04192 8.06277
+46 2.73 1.03418 8.63231
+47 2.79 0.97716 9.19437
+48 2.85 1.02142 9.80742
+49 2.91 0.973467 10.4165
+50 2.97 1.00183 11.0695
+105850 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0.21169 0.000356633
+4 0.21 0 0.000356633
+5 0.27 0.197809 0.00142653
+6 0.33 0.309393 0.00392297
+7 0.39 0.316701 0.0074893
+8 0.45 0.452189 0.0142653
+9 0.51 0.593122 0.0256776
+10 0.57 0.549144 0.038873
+11 0.63 0.923505 0.0659772
+12 0.69 1.08404 0.104137
+13 0.75 1.03769 0.14729
+14 0.81 1.14707 0.202924
+15 0.87 1.20472 0.270328
+16 0.93 1.08223 0.339515
+17 0.99 1.02891 0.414051
+18 1.05 0.949725 0.491441
+19 1.11 1.05742 0.587732
+20 1.17 0.895368 0.678317
+21 1.23 0.944126 0.78388
+22 1.29 0.974353 0.903709
+23 1.35 0.990301 1.03709
+24 1.41 1.01948 1.18688
+25 1.47 1.00943 1.34807
+26 1.53 1.0349 1.5271
+27 1.59 1.04418 1.72218
+28 1.65 0.957222 1.91476
+29 1.71 0.99026 2.12874
+30 1.77 1.00899 2.36234
+31 1.83 0.981388 2.60521
+32 1.89 0.972763 2.86198
+33 1.95 0.983633 3.13837
+34 2.01 0.962821 3.42582
+35 2.07 1.02946 3.75178
+36 2.13 1.04036 4.10057
+37 2.19 0.969049 4.44401
+38 2.25 1.0458 4.83524
+39 2.31 1.08082 5.26141
+40 2.37 0.977816 5.66726
+41 2.43 1.0045 6.10556
+42 2.49 0.965243 6.54779
+43 2.55 1.01833 7.03709
+44 2.61 0.981261 7.53103
+45 2.67 0.959321 8.03638
+46 2.73 0.991442 8.58238
+47 2.79 1.0001 9.15763
+48 2.85 0.998842 9.75713
+49 2.91 0.979737 10.3702
+50 2.97 1.05819 11.0599
+105900 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0.0659362 0.000356633
+6 0.33 0.0883979 0.0010699
+7 0.39 0.380042 0.0053495
+8 0.45 0.547387 0.0135521
+9 0.51 0.778472 0.0285307
+10 0.57 0.786611 0.0474322
+11 0.63 0.899202 0.0738231
+12 0.69 1.01313 0.109486
+13 0.75 0.849016 0.144793
+14 0.81 1.21325 0.203638
+15 0.87 1.19835 0.270685
+16 0.93 1.14917 0.344151
+17 0.99 1.12245 0.425464
+18 1.05 1.05914 0.511769
+19 1.11 0.932095 0.596648
+20 1.17 0.888318 0.686519
+21 1.23 0.991971 0.797432
+22 1.29 0.985953 0.918688
+23 1.35 0.884387 1.0378
+24 1.41 1.08017 1.1965
+25 1.47 0.933504 1.34558
+26 1.53 0.999857 1.51854
+27 1.59 1.069 1.71826
+28 1.65 1.02104 1.92368
+29 1.71 0.975406 2.13445
+30 1.77 1.00437 2.36698
+31 1.83 0.985711 2.61091
+32 1.89 1.00249 2.87553
+33 1.95 0.959518 3.14515
+34 2.01 0.969988 3.43474
+35 2.07 1.01031 3.75464
+36 2.13 1.06164 4.11056
+37 2.19 0.987162 4.46041
+38 2.25 1.03246 4.84665
+39 2.31 0.962339 5.22611
+40 2.37 1.01133 5.64586
+41 2.43 0.97835 6.07275
+42 2.49 1.03841 6.5485
+43 2.55 0.973797 7.01641
+44 2.61 0.968508 7.50392
+45 2.67 1.00468 8.03317
+46 2.73 1.00245 8.58524
+47 2.79 1.00382 9.16262
+48 2.85 1.03865 9.78602
+49 2.91 1.01507 10.4212
+50 2.97 0.989249 11.066
+105950 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0.0883979 0.000713267
+7 0.39 0.190021 0.00285307
+8 0.45 0.571187 0.0114123
+9 0.51 0.759937 0.0260342
+10 0.57 0.771769 0.0445792
+11 0.63 0.947808 0.0723966
+12 0.69 1.04352 0.10913
+13 0.75 0.986231 0.150143
+14 0.81 1.0809 0.202568
+15 0.87 1.20472 0.269971
+16 0.93 1.03202 0.335949
+17 0.99 1.07814 0.414051
+18 1.05 0.984738 0.494294
+19 1.11 0.916429 0.577746
+20 1.17 1.02227 0.68117
+21 1.23 1.02387 0.795649
+22 1.29 1.03235 0.922611
+23 1.35 0.963823 1.05243
+24 1.41 0.990356 1.19793
+25 1.47 0.929037 1.34629
+26 1.53 0.940072 1.50892
+27 1.59 0.983097 1.69258
+28 1.65 1.03699 1.90121
+29 1.71 1.00181 2.11769
+30 1.77 0.995129 2.34807
+31 1.83 0.982829 2.5913
+32 1.89 1.05518 2.86983
+33 1.95 0.978556 3.14479
+34 2.01 1.00702 3.44544
+35 2.07 0.973145 3.75357
+36 2.13 1.03717 4.10128
+37 2.19 1.02037 4.46291
+38 2.25 0.987652 4.83238
+39 2.31 0.914403 5.19294
+40 2.37 1.02336 5.61769
+41 2.43 0.982437 6.04636
+42 2.49 1.00027 6.50464
+43 2.55 0.977508 6.97432
+44 2.61 1.02944 7.49251
+45 2.67 0.965414 8.00107
+46 2.73 1.00051 8.55207
+47 2.79 0.987081 9.11983
+48 2.85 1.01786 9.73074
+49 2.91 0.986576 10.3481
+50 2.97 1.00457 11.0029
+106000 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0.0659362 0.000356633
+6 0.33 0.265194 0.00249643
+7 0.39 0.348371 0.0064194
+8 0.45 0.261794 0.0103424
+9 0.51 0.593122 0.0217546
+10 0.57 0.875662 0.042796
+11 0.63 0.838445 0.0674037
+12 0.69 1.16509 0.108417
+13 0.75 1.1406 0.155849
+14 0.81 1.10295 0.209344
+15 0.87 1.07724 0.269615
+16 0.93 1.04318 0.336305
+17 0.99 1.16183 0.420471
+18 1.05 0.962855 0.49893
+19 1.11 0.99084 0.589158
+20 1.17 0.853067 0.675464
+21 1.23 0.940937 0.78067
+22 1.29 1.03235 0.907632
+23 1.35 0.90557 1.0296
+24 1.41 1.0122 1.17832
+25 1.47 0.991569 1.33666
+26 1.53 0.962749 1.50321
+27 1.59 0.985006 1.68723
+28 1.65 1.01217 1.89087
+29 1.71 1.02327 2.11198
+30 1.77 1.0244 2.34914
+31 1.83 1.0275 2.60342
+32 1.89 1.016 2.87161
+33 1.95 0.991248 3.15014
+34 2.01 1.00941 3.4515
+35 2.07 1.01482 3.77282
+36 2.13 0.97973 4.10128
+37 2.19 1.0093 4.45899
+38 2.25 0.960005 4.81812
+39 2.31 0.962339 5.19757
+40 2.37 0.991564 5.60913
+41 2.43 1.01922 6.05385
+42 2.49 1.01662 6.51961
+43 2.55 1.0213 7.01034
+44 2.61 1.02519 7.52639
+45 2.67 1.00807 8.05742
+46 2.73 1.00375 8.6102
+47 2.79 1.0001 9.18545
+48 2.85 0.983987 9.77603
+49 2.91 0.995125 10.3987
+50 2.97 0.976664 11.0353
+106050 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0.131872 0.000713267
+6 0.33 0.132597 0.00178317
+7 0.39 0.380042 0.00606277
+8 0.45 0.404591 0.0121255
+9 0.51 0.611657 0.0238944
+10 0.57 0.608511 0.0385164
+11 0.63 0.959959 0.0666904
+12 0.69 1.05365 0.10378
+13 0.75 1.01196 0.145863
+14 0.81 1.19119 0.203638
+15 0.87 1.07086 0.263552
+16 0.93 1.18264 0.339158
+17 0.99 1.19137 0.425464
+18 1.05 0.862193 0.49572
+19 1.11 0.912513 0.578816
+20 1.17 0.951769 0.675107
+21 1.23 0.956885 0.782097
+22 1.29 0.985953 0.903352
+23 1.35 1.02208 1.04101
+24 1.41 0.951518 1.18081
+25 1.47 1.0273 1.34486
+26 1.53 1.01635 1.52068
+27 1.59 0.985006 1.70471
+28 1.65 0.978494 1.90157
+29 1.71 0.998512 2.11733
+30 1.77 1.04442 2.35913
+31 1.83 1.01453 2.6102
+32 1.89 0.959253 2.86341
+33 1.95 1.00648 3.14622
+34 2.01 0.943708 3.42796
+35 2.07 1.01932 3.75071
+36 2.13 1.04675 4.10164
+37 2.19 1.00226 4.45685
+38 2.25 1.01148 4.83524
+39 2.31 0.974097 5.21933
+40 2.37 0.972661 5.62304
+41 2.43 1.02003 6.06812
+42 2.49 0.99638 6.52461
+43 2.55 0.992352 7.00143
+44 2.61 1.01456 7.51213
+45 2.67 1.00942 8.04387
+46 2.73 1.00116 8.59522
+47 2.79 0.996381 9.16833
+48 2.85 1.00657 9.77247
+49 2.91 0.970047 10.3795
+50 2.97 0.976664 11.016
+106100 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0.0659362 0.000356633
+6 0.33 0.132597 0.00142653
+7 0.39 0.348371 0.0053495
+8 0.45 0.404591 0.0114123
+9 0.51 0.759937 0.0260342
+10 0.57 0.653036 0.0417261
+11 0.63 1.09362 0.0738231
+12 0.69 0.982731 0.108417
+13 0.75 0.917623 0.146576
+14 0.81 1.13237 0.201498
+15 0.87 1.06449 0.261056
+16 0.93 1.18264 0.336662
+17 0.99 1.05845 0.413338
+18 1.05 1.011 0.49572
+19 1.11 1.01825 0.588445
+20 1.17 0.937669 0.68331
+21 1.23 0.985591 0.793509
+22 1.29 0.948254 0.910128
+23 1.35 0.950583 1.03816
+24 1.41 0.96851 1.18046
+25 1.47 0.955837 1.3331
+26 1.53 0.979242 1.5025
+27 1.59 1.006 1.69044
+28 1.65 1.03345 1.89836
+29 1.71 1.05793 2.12696
+30 1.77 0.998209 2.35806
+31 1.83 1.01021 2.60806
+32 1.89 1.016 2.87625
+33 1.95 1.00521 3.1587
+34 2.01 0.968794 3.44793
+35 2.07 0.979903 3.7582
+36 2.13 0.987177 4.08916
+37 2.19 0.937854 4.42154
+38 2.25 1.01434 4.801
+39 2.31 0.989473 5.19116
+40 2.37 0.972661 5.59486
+41 2.43 1.03148 6.04494
+42 2.49 1.00027 6.50321
+43 2.55 1.01017 6.98859
+44 2.61 0.99118 7.48752
+45 2.67 0.993171 8.0107
+46 2.73 0.992089 8.55706
+47 2.79 0.984601 9.1234
+48 2.85 0.966755 9.70364
+49 2.91 0.976317 10.3146
+50 2.97 0.978306 10.9522
+106150 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0.265194 0.0021398
+7 0.39 0.348371 0.00606277
+8 0.45 0.404591 0.0121255
+9 0.51 0.463376 0.0210414
+10 0.57 0.771769 0.0395863
+11 0.63 0.911353 0.0663338
+12 0.69 1.16509 0.107347
+13 0.75 1.01196 0.149429
+14 0.81 1.11766 0.203638
+15 0.87 1.22384 0.272111
+16 0.93 1.07665 0.340942
+17 0.99 1.01906 0.414765
+18 1.05 1.02413 0.498217
+19 1.11 0.877266 0.578103
+20 1.17 1.04695 0.684023
+21 1.23 0.91542 0.786377
+22 1.29 0.962754 0.904779
+23 1.35 1.00089 1.03959
+24 1.41 0.961228 1.18081
+25 1.47 1.01837 1.34344
+26 1.53 1.03903 1.52318
+27 1.59 0.990732 1.70827
+28 1.65 1.01395 1.91227
+29 1.71 1.02657 2.13409
+30 1.77 1.04288 2.37553
+31 1.83 0.985711 2.61947
+32 1.89 1.00384 2.88445
+33 1.95 1.01282 3.16904
+34 2.01 1.0118 3.47111
+35 2.07 1.00806 3.7903
+36 2.13 0.938243 4.10485
+37 2.19 0.989175 4.45542
+38 2.25 1.00767 4.83238
+39 2.31 0.964148 5.21255
+40 2.37 1.04398 5.64586
+41 2.43 0.993062 6.07917
+42 2.49 1.00883 6.54137
+43 2.55 0.973797 7.00927
+44 2.61 0.980552 7.50285
+45 2.67 1.0189 8.03959
+46 2.73 1.029 8.60628
+47 2.79 0.998241 9.18046
+48 2.85 0.957248 9.75499
+49 2.91 1.02305 10.3951
+50 2.97 0.977212 11.0321
+106200 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0.131872 0.000713267
+6 0.33 0.220995 0.00249643
+7 0.39 0.475052 0.00784593
+8 0.45 0.475989 0.0149786
+9 0.51 0.667262 0.0278174
+10 0.57 0.994395 0.0517118
+11 0.63 0.984262 0.0805991
+12 0.69 0.759844 0.107347
+13 0.75 1.08057 0.152282
+14 0.81 1.13237 0.207204
+15 0.87 0.994372 0.262839
+16 0.93 1.23285 0.341655
+17 0.99 1.00922 0.414765
+18 1.05 0.949725 0.492154
+19 1.11 0.998673 0.583096
+20 1.17 0.958819 0.6801
+21 1.23 0.893093 0.779957
+22 1.29 1.02075 0.905492
+23 1.35 0.932048 1.03103
+24 1.41 1.01706 1.18046
+25 1.47 1.06527 1.35057
+26 1.53 1.0246 1.52782
+27 1.59 0.986915 1.7122
+28 1.65 1.0689 1.92725
+29 1.71 0.9523 2.13302
+30 1.77 0.979724 2.35984
+31 1.83 1.03039 2.61484
+32 1.89 0.975466 2.87233
+33 1.95 0.978556 3.14729
+34 2.01 1.02733 3.45399
+35 2.07 0.947239 3.75392
+36 2.13 0.993559 4.08702
+37 2.19 1.01534 4.44686
+38 2.25 1.0172 4.82739
+39 2.31 1.0365 5.23609
+40 2.37 0.958054 5.63374
+41 2.43 0.963638 6.05421
+42 2.49 1.01973 6.5214
+43 2.55 1.04505 7.02354
+44 2.61 0.992597 7.52318
+45 2.67 0.958644 8.02817
+46 2.73 0.980433 8.56812
+47 2.79 0.992041 9.13873
+48 2.85 1.00419 9.74144
+49 2.91 0.997405 10.3655
+50 2.97 1.02481 11.0335
+106250 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0.217411 0.000713267
+5 0.27 0.0659362 0.0010699
+6 0.33 0.220995 0.00285307
+7 0.39 0.253361 0.00570613
+8 0.45 0.594986 0.014622
+9 0.51 0.426306 0.0228245
+10 0.57 0.697561 0.0395863
+11 0.63 0.765537 0.0620542
+12 0.69 1.01313 0.0977175
+13 0.75 1.21778 0.148359
+14 0.81 1.19854 0.206491
+15 0.87 1.09636 0.267832
+16 0.93 1.04876 0.334879
+17 0.99 1.15691 0.418688
+18 1.05 1.11166 0.509272
+19 1.11 0.963426 0.597004
+20 1.17 0.909468 0.689016
+21 1.23 0.921799 0.792083
+22 1.29 0.997552 0.914765
+23 1.35 0.939992 1.04137
+24 1.41 1.02677 1.19223
+25 1.47 0.962536 1.34593
+26 1.53 1.01017 1.52068
+27 1.59 1.02318 1.71184
+28 1.65 0.982039 1.90942
+29 1.71 1.00841 2.12732
+30 1.77 1.02286 2.36412
+31 1.83 1.003 2.61234
+32 1.89 1.00519 2.87767
+33 1.95 0.953172 3.14551
+34 2.01 0.997463 3.4433
+35 2.07 1.04523 3.77425
+36 2.13 1.01803 4.11555
+37 2.19 0.959992 4.45578
+38 2.25 1.01339 4.83488
+39 2.31 1.02294 5.23823
+40 2.37 1.00789 5.65656
+41 2.43 0.977533 6.0831
+42 2.49 1.00494 6.54351
+43 2.55 0.996805 7.02247
+44 2.61 0.995431 7.52354
+45 2.67 1.00333 8.05207
+46 2.73 0.983671 8.59379
+47 2.79 0.95546 9.14337
+48 2.85 1.01429 9.75214
+49 2.91 1.00481 10.3809
+50 2.97 1.00895 11.0385
+106300 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0.21169 0.000356633
+4 0.21 0 0.000356633
+5 0.27 0.0659362 0.000713267
+6 0.33 0.220995 0.00249643
+7 0.39 0.0950104 0.00356633
+8 0.45 0.404591 0.0096291
+9 0.51 0.611657 0.021398
+10 0.57 0.801453 0.0406562
+11 0.63 0.923505 0.0677603
+12 0.69 1.02326 0.10378
+13 0.75 1.02053 0.14622
+14 0.81 1.08825 0.199001
+15 0.87 1.31308 0.272468
+16 0.93 1.02087 0.337732
+17 0.99 1.17168 0.422611
+18 1.05 0.989114 0.50321
+19 1.11 0.869433 0.582382
+20 1.17 0.941194 0.677603
+21 1.23 0.854817 0.773181
+22 1.29 0.985953 0.894437
+23 1.35 0.992949 1.02817
+24 1.41 1.00735 1.17618
+25 1.47 1.03177 1.34094
+26 1.53 0.985426 1.51141
+27 1.59 0.981188 1.69472
+28 1.65 0.969631 1.8898
+29 1.71 1.05463 2.11769
+30 1.77 1.05521 2.36198
+31 1.83 0.954007 2.59807
+32 1.89 1.0187 2.86698
+33 1.95 0.97221 3.14016
+34 2.01 0.986712 3.43474
+35 2.07 1.0182 3.75713
+36 2.13 1.01483 4.09736
+37 2.19 0.990181 4.44829
+38 2.25 1.00862 4.82561
+39 2.31 0.969575 5.20792
+40 2.37 0.998438 5.62233
+41 2.43 0.955465 6.03923
+42 2.49 1.00806 6.50107
+43 2.55 1.02278 6.99251
+44 2.61 1.00252 7.49715
+45 2.67 1.00265 8.02532
+46 2.73 1.0154 8.58452
+47 2.79 0.97158 9.14337
+48 2.85 0.969726 9.72539
+49 2.91 0.986576 10.3427
+50 2.97 1.01606 11.005
+106350 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0.217411 0.000713267
+5 0.27 0 0.000713267
+6 0.33 0.309393 0.0032097
+7 0.39 0.158351 0.00499287
+8 0.45 0.42839 0.0114123
+9 0.51 0.648727 0.0238944
+10 0.57 0.831136 0.0438659
+11 0.63 0.97211 0.0723966
+12 0.69 0.952338 0.10592
+13 0.75 1.07199 0.150499
+14 0.81 1.21325 0.209344
+15 0.87 1.05811 0.268545
+16 0.93 0.948347 0.329173
+17 0.99 1.01414 0.402639
+18 1.05 1.15105 0.496434
+19 1.11 1.00651 0.588088
+20 1.17 0.955294 0.684736
+21 1.23 0.886713 0.78388
+22 1.29 0.893157 0.893723
+23 1.35 1.01943 1.03103
+24 1.41 0.987928 1.17618
+25 1.47 1.05857 1.34522
+26 1.53 1.0081 1.51961
+27 1.59 1.09763 1.72468
+28 1.65 1.03345 1.9326
+29 1.71 0.993561 2.14729
+30 1.77 1.03518 2.38695
+31 1.83 1.00733 2.63623
+32 1.89 0.959253 2.88944
+33 1.95 0.984902 3.16619
+34 2.01 0.964015 3.45399
+35 2.07 1.06776 3.79208
+36 2.13 0.977603 4.11983
+37 2.19 0.969049 4.46327
+38 2.25 0.950472 4.81883
+39 2.31 1.01932 5.22076
+40 2.37 1.02593 5.64658
+41 2.43 1.04129 6.10093
+42 2.49 0.956681 6.53923
+43 2.55 0.935201 6.98859
+44 2.61 1.01669 7.50036
+45 2.67 1.01145 8.03317
+46 2.73 0.984966 8.57561
+47 2.79 1.0249 9.16512
+48 2.85 0.987552 9.75785
+49 2.91 0.962638 10.3602
+50 2.97 0.978306 10.9979
+106400 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0.131872 0.000713267
+6 0.33 0.220995 0.00249643
+7 0.39 0.221691 0.00499287
+8 0.45 0.571187 0.0135521
+9 0.51 0.593122 0.0249643
+10 0.57 0.638194 0.0402996
+11 0.63 0.947808 0.068117
+12 0.69 1.01313 0.10378
+13 0.75 1.03769 0.146933
+14 0.81 1.16178 0.203281
+15 0.87 1.19835 0.270328
+16 0.93 1.18822 0.346291
+17 0.99 1.07814 0.424394
+18 1.05 0.975984 0.503923
+19 1.11 0.932095 0.588802
+20 1.17 1.00112 0.690086
+21 1.23 0.928178 0.793866
+22 1.29 0.948254 0.910485
+23 1.35 0.934696 1.03638
+24 1.41 1.02191 1.18652
+25 1.47 1.06527 1.35663
+26 1.53 0.970995 1.52461
+27 1.59 1.04609 1.72004
+28 1.65 0.99622 1.92047
+29 1.71 0.978707 2.13195
+30 1.77 1.06137 2.37767
+31 1.83 0.990035 2.62268
+32 1.89 0.972763 2.87946
+33 1.95 1.03694 3.17083
+34 2.01 0.973572 3.46148
+35 2.07 0.99004 3.77496
+36 2.13 0.995687 4.10877
+37 2.19 0.996218 4.46184
+38 2.25 1.01434 4.8413
+39 2.31 0.965957 5.22218
+40 2.37 0.995001 5.63516
+41 2.43 1.04701 6.09201
+42 2.49 1.01039 6.55492
+43 2.55 1.01685 7.04351
+44 2.61 1.00889 7.55136
+45 2.67 0.9776 8.06633
+46 2.73 0.990147 8.61163
+47 2.79 1.03296 9.20578
+48 2.85 0.979828 9.79387
+49 2.91 0.982586 10.4087
+50 2.97 1.03521 11.0835
+106450 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0.21169 0.000356633
+4 0.21 0 0.000356633
+5 0.27 0 0.000356633
+6 0.33 0.353592 0.0032097
+7 0.39 0.348371 0.00713267
+8 0.45 0.499788 0.014622
+9 0.51 0.667262 0.0274608
+10 0.57 0.489777 0.0392297
+11 0.63 0.947808 0.0670471
+12 0.69 1.06378 0.104494
+13 0.75 1.06341 0.148716
+14 0.81 1.14707 0.204351
+15 0.87 1.10911 0.266405
+16 0.93 1.07665 0.335235
+17 0.99 1.00922 0.408345
+18 1.05 0.993491 0.489301
+19 1.11 1.02217 0.582382
+20 1.17 0.955294 0.67903
+21 1.23 0.947316 0.78495
+22 1.29 0.997552 0.907632
+23 1.35 0.94264 1.03459
+24 1.41 1.0923 1.19508
+25 1.47 0.933504 1.34415
+26 1.53 1.02047 1.52068
+27 1.59 0.981188 1.70399
+28 1.65 1.0884 1.92297
+29 1.71 0.995211 2.13802
+30 1.77 1.00129 2.36983
+31 1.83 0.962654 2.60806
+32 1.89 1.0187 2.87696
+33 1.95 1.00013 3.15799
+34 2.01 1.02972 3.46541
+35 2.07 1.01144 3.78566
+36 2.13 1.02973 4.13088
+37 2.19 1.00729 4.48787
+38 2.25 0.994325 4.85984
+39 2.31 0.99309 5.25143
+40 2.37 0.981253 5.6587
+41 2.43 0.975081 6.08417
+42 2.49 1.02518 6.55385
+43 2.55 1.00571 7.03709
+44 2.61 1.02802 7.55456
+45 2.67 0.967445 8.06419
+46 2.73 1.02771 8.63017
+47 2.79 1.04784 9.23288
+48 2.85 0.994683 9.82989
+49 2.91 1.01222 10.4633
+50 2.97 0.969551 11.0952
+106500 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0.176796 0.00142653
+7 0.39 0.348371 0.0053495
+8 0.45 0.547387 0.0135521
+9 0.51 0.444841 0.0221113
+10 0.57 0.935028 0.0445792
+11 0.63 0.959959 0.0727532
+12 0.69 1.00299 0.10806
+13 0.75 1.12345 0.154779
+14 0.81 1.02942 0.204708
+15 0.87 1.10273 0.266405
+16 0.93 1.16033 0.340585
+17 0.99 1.15691 0.424394
+18 1.05 0.82718 0.491797
+19 1.11 0.865517 0.570613
+20 1.17 0.99407 0.671184
+21 1.23 0.99835 0.78281
+22 1.29 1.01495 0.907632
+23 1.35 0.94264 1.03459
+24 1.41 0.997638 1.18117
+25 1.47 1.06973 1.352
+26 1.53 1.02253 1.52889
+27 1.59 0.981188 1.7122
+28 1.65 0.958995 1.90514
+29 1.71 1.00841 2.12304
+30 1.77 0.993588 2.35307
+31 1.83 1.101 2.62553
+32 1.89 0.990327 2.88695
+33 1.95 0.983633 3.16334
+34 2.01 1.02852 3.4704
+35 2.07 0.994545 3.78531
+36 2.13 1.00207 4.12126
+37 2.19 0.962005 4.4622
+38 2.25 1.02578 4.84593
+39 2.31 0.994899 5.23823
+40 2.37 1.02765 5.66476
+41 2.43 1.02576 6.11234
+42 2.49 0.94734 6.54636
+43 2.55 1.04802 7.04993
+44 2.61 0.991888 7.54922
+45 2.67 0.996556 8.07418
+46 2.73 1.00051 8.62518
+47 2.79 1.00692 9.20435
+48 2.85 0.959625 9.78031
+49 2.91 0.986576 10.3976
+50 2.97 1.01661 11.0603
+106550 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0.132597 0.0010699
+7 0.39 0.253361 0.00392297
+8 0.45 0.547387 0.0121255
+9 0.51 0.630192 0.0242511
+10 0.57 0.771769 0.042796
+11 0.63 0.801991 0.0663338
+12 0.69 1.04352 0.103067
+13 0.75 1.01196 0.14515
+14 0.81 1.0956 0.198288
+15 0.87 1.24296 0.267832
+16 0.93 0.976239 0.330243
+17 0.99 1.21106 0.417974
+18 1.05 0.993491 0.49893
+19 1.11 0.908597 0.581669
+20 1.17 0.884793 0.671184
+21 1.23 0.99835 0.78281
+22 1.29 1.04685 0.911555
+23 1.35 0.916161 1.03495
+24 1.41 1.03648 1.18723
+25 1.47 0.917871 1.33381
+26 1.53 0.997796 1.50642
+27 1.59 1.07473 1.7072
+28 1.65 0.98913 1.90621
+29 1.71 1.08433 2.14051
+30 1.77 0.947375 2.35984
+31 1.83 0.982829 2.60307
+32 1.89 1.04707 2.87946
+33 1.95 1.06232 3.17796
+34 2.01 1.00463 3.47789
+35 2.07 0.902186 3.76355
+36 2.13 1.03398 4.1102
+37 2.19 0.970055 4.45399
+38 2.25 1.03436 4.84094
+39 2.31 0.999422 5.23502
+40 2.37 0.976957 5.64051
+41 2.43 1.03802 6.09344
+42 2.49 1.01895 6.56027
+43 2.55 1.00571 7.04351
+44 2.61 1.01385 7.55385
+45 2.67 0.967445 8.06348
+46 2.73 0.953882 8.5888
+47 2.79 1.00258 9.16548
+48 2.85 1.0232 9.7796
+49 2.91 1.02248 10.4194
+50 2.97 0.999098 11.0706
+106600 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0.21169 0.000356633
+4 0.21 0 0.000356633
+5 0.27 0.131872 0.0010699
+6 0.33 0.0883979 0.00178317
+7 0.39 0.506722 0.0074893
+8 0.45 0.499788 0.0149786
+9 0.51 0.315096 0.0210414
+10 0.57 0.831136 0.0410128
+11 0.63 0.814142 0.0649073
+12 0.69 0.89155 0.096291
+13 0.75 1.15775 0.144437
+14 0.81 1.2059 0.202924
+15 0.87 1.1856 0.269258
+16 0.93 1.13244 0.341655
+17 0.99 1.03383 0.416548
+18 1.05 0.914712 0.491084
+19 1.11 1.06525 0.588088
+20 1.17 1.00817 0.690086
+21 1.23 0.99516 0.801355
+22 1.29 0.968553 0.920471
+23 1.35 0.987654 1.0535
+24 1.41 0.966082 1.19544
+25 1.47 0.929037 1.34379
+26 1.53 1.02872 1.52175
+27 1.59 0.986915 1.70613
+28 1.65 0.980267 1.90335
+29 1.71 1.03482 2.12696
+30 1.77 1.03364 2.36626
+31 1.83 1.06353 2.62946
+32 1.89 1.02275 2.89943
+33 1.95 1.01409 3.18438
+34 2.01 0.964015 3.47218
+35 2.07 1.00919 3.79173
+36 2.13 0.983985 4.12161
+37 2.19 0.971061 4.46576
+38 2.25 0.986698 4.83488
+39 2.31 0.980428 5.22147
+40 2.37 1.00875 5.64016
+41 2.43 0.997966 6.07561
+42 2.49 1.01895 6.54244
+43 2.55 1.00274 7.02425
+44 2.61 0.96284 7.50892
+45 2.67 1.03853 8.05599
+46 2.73 1.02382 8.61983
+47 2.79 1.02056 9.20685
+48 2.85 0.988146 9.79993
+49 2.91 0.990566 10.4198
+50 2.97 0.958061 11.0442
+106650 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0.131872 0.000713267
+6 0.33 0.132597 0.00178317
+7 0.39 0.316701 0.0053495
+8 0.45 0.594986 0.0142653
+9 0.51 0.407771 0.0221113
+10 0.57 0.638194 0.0374465
+11 0.63 1.02072 0.0674037
+12 0.69 1.09418 0.10592
+13 0.75 1.02053 0.148359
+14 0.81 1.21325 0.207204
+15 0.87 1.07086 0.267118
+16 0.93 1.2719 0.348431
+17 0.99 1.09291 0.427603
+18 1.05 0.967231 0.506419
+19 1.11 0.916429 0.589872
+20 1.17 0.96587 0.687589
+21 1.23 0.893093 0.787447
+22 1.29 0.951154 0.904422
+23 1.35 0.985006 1.03709
+24 1.41 1.00492 1.18474
+25 1.47 1.0139 1.34665
+26 1.53 1.08026 1.53352
+27 1.59 1.027 1.72539
+28 1.65 1.08131 1.94294
+29 1.71 0.973756 2.15335
+30 1.77 0.975103 2.3791
+31 1.83 1.00445 2.62767
+32 1.89 1.02005 2.89693
+33 1.95 0.977287 3.17154
+34 2.01 1.00105 3.4704
+35 2.07 0.992292 3.78459
+36 2.13 0.98824 4.11591
+37 2.19 1.00528 4.47218
+38 2.25 1.02483 4.85556
+39 2.31 1.07811 5.28067
+40 2.37 0.989845 5.69151
+41 2.43 0.955465 6.10842
+42 2.49 1.0174 6.57454
+43 2.55 0.999774 7.05492
+44 2.61 1.0096 7.56312
+45 2.67 0.985724 8.08238
+46 2.73 0.968777 8.61591
+47 2.79 0.993901 9.18759
+48 2.85 1.02558 9.80314
+49 2.91 0.988856 10.4219
+50 2.97 0.966816 11.0521
+106700 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0.108706 0.000356633
+5 0.27 0.263745 0.00178317
+6 0.33 0.176796 0.0032097
+7 0.39 0.316701 0.00677603
+8 0.45 0.404591 0.0128388
+9 0.51 0.407771 0.0206847
+10 0.57 0.756928 0.038873
+11 0.63 1.20299 0.0741797
+12 0.69 0.861156 0.104494
+13 0.75 1.00338 0.14622
+14 0.81 1.12501 0.200785
+15 0.87 1.23022 0.269615
+16 0.93 1.14359 0.342725
+17 0.99 1.07322 0.420471
+18 1.05 0.971608 0.499643
+19 1.11 0.936011 0.584879
+20 1.17 0.962344 0.68224
+21 1.23 0.934558 0.786733
+22 1.29 1.02655 0.912981
+23 1.35 0.982358 1.04529
+24 1.41 0.978219 1.18902
+25 1.47 0.978169 1.34522
+26 1.53 1.02253 1.52211
+27 1.59 0.998368 1.70863
+28 1.65 0.96254 1.90228
+29 1.71 1.00181 2.11876
+30 1.77 1.06753 2.36591
+31 1.83 1.00877 2.61555
+32 1.89 1.00519 2.88088
+33 1.95 0.977287 3.15549
+34 2.01 0.935346 3.43474
+35 2.07 0.96526 3.74037
+36 2.13 1.03398 4.08702
+37 2.19 1.06062 4.46291
+38 2.25 1.02197 4.84522
+39 2.31 1.00756 5.24251
+40 2.37 1.03882 5.67368
+41 2.43 1.01676 6.11733
+42 2.49 0.977698 6.56526
+43 2.55 0.982703 7.03745
+44 2.61 0.981969 7.53174
+45 2.67 0.976246 8.04601
+46 2.73 1.01346 8.60414
+47 2.79 1.03048 9.19686
+48 2.85 0.98577 9.78852
+49 2.91 1.01051 10.4208
+50 2.97 1.00019 11.0728
+106750 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0.108706 0.000356633
+5 0.27 0.131872 0.0010699
+6 0.33 0.132597 0.0021398
+7 0.39 0.190021 0.0042796
+8 0.45 0.452189 0.0110556
+9 0.51 0.500446 0.0206847
+10 0.57 0.816295 0.0402996
+11 0.63 0.716931 0.0613409
+12 0.69 1.08404 0.0995007
+13 0.75 1.19205 0.149073
+14 0.81 1.17648 0.206134
+15 0.87 1.16647 0.271398
+16 0.93 1.1938 0.347718
+17 0.99 1.1126 0.428317
+18 1.05 1.04601 0.513552
+19 1.11 0.916429 0.597004
+20 1.17 0.905943 0.688659
+21 1.23 0.905851 0.789943
+22 1.29 1.01205 0.914408
+23 1.35 0.992949 1.04815
+24 1.41 0.985501 1.19294
+25 1.47 1.0206 1.35592
+26 1.53 1.0349 1.53495
+27 1.59 1.02128 1.72575
+28 1.65 1.01572 1.9301
+29 1.71 1.00511 2.14729
+30 1.77 0.992048 2.37696
+31 1.83 1.02318 2.63017
+32 1.89 0.948444 2.88053
+33 1.95 0.986171 3.15763
+34 2.01 0.95207 3.44187
+35 2.07 1.00018 3.75856
+36 2.13 1.00952 4.097
+37 2.19 1.04855 4.46862
+38 2.25 1.01911 4.84986
+39 2.31 1.02927 5.25571
+40 2.37 0.971801 5.65906
+41 2.43 0.984072 6.08845
+42 2.49 0.973806 6.53459
+43 2.55 0.997548 7.01391
+44 2.61 1.0096 7.52211
+45 2.67 1.02364 8.06134
+46 2.73 0.988851 8.60592
+47 2.79 0.998241 9.1801
+48 2.85 0.966161 9.75999
+49 2.91 1.02476 10.4012
+50 2.97 0.998003 11.0517
+106800 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0.21169 0.000356633
+4 0.21 0 0.000356633
+5 0.27 0.0659362 0.000713267
+6 0.33 0.0883979 0.00142653
+7 0.39 0.221691 0.00392297
+8 0.45 0.523588 0.0117689
+9 0.51 0.574587 0.0228245
+10 0.57 0.816295 0.0424394
+11 0.63 0.959959 0.0706134
+12 0.69 1.09418 0.10913
+13 0.75 1.05484 0.152996
+14 0.81 1.11031 0.206847
+15 0.87 1.11548 0.269258
+16 0.93 1.05434 0.336662
+17 0.99 1.26522 0.428317
+18 1.05 1.01537 0.511056
+19 1.11 0.90468 0.593438
+20 1.17 0.983495 0.692939
+21 1.23 0.896282 0.793153
+22 1.29 1.01205 0.917618
+23 1.35 0.90557 1.03959
+24 1.41 0.907826 1.17297
+25 1.47 1.02283 1.33631
+26 1.53 1.06789 1.52104
+27 1.59 0.975461 1.70328
+28 1.65 1.11853 1.92832
+29 1.71 0.947349 2.13302
+30 1.77 0.996669 2.36377
+31 1.83 1.05488 2.62482
+32 1.89 1.03356 2.89765
+33 1.95 0.902404 3.15121
+34 2.01 0.962821 3.43866
+35 2.07 1.01031 3.75856
+36 2.13 0.9542 4.07846
+37 2.19 1.01232 4.43723
+38 2.25 1.03722 4.82525
+39 2.31 1.00575 5.22183
+40 2.37 0.980394 5.62874
+41 2.43 1.05355 6.08845
+42 2.49 1.03141 6.56098
+43 2.55 1.00645 7.04458
+44 2.61 0.984803 7.5403
+45 2.67 1.01145 8.07311
+46 2.73 0.99468 8.6209
+47 2.79 1.0094 9.2015
+48 2.85 0.990523 9.79601
+49 2.91 0.983726 10.4116
+50 2.97 0.996909 11.0613
+106850 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0.197809 0.0010699
+6 0.33 0.0883979 0.00178317
+7 0.39 0.316701 0.0053495
+8 0.45 0.642585 0.0149786
+9 0.51 0.741402 0.0292439
+10 0.57 0.697561 0.0460057
+11 0.63 0.923505 0.0731098
+12 0.69 1.03339 0.109486
+13 0.75 0.917623 0.147646
+14 0.81 1.05148 0.198645
+15 0.87 1.12823 0.261769
+16 0.93 1.24959 0.341655
+17 0.99 1.08306 0.420114
+18 1.05 1.15105 0.513909
+19 1.11 0.939927 0.599501
+20 1.17 0.895368 0.690086
+21 1.23 0.91542 0.792439
+22 1.29 1.06135 0.922967
+23 1.35 0.990301 1.05635
+24 1.41 0.990356 1.20185
+25 1.47 0.980402 1.35842
+26 1.53 1.01017 1.53317
+27 1.59 0.97737 1.71576
+28 1.65 0.987357 1.91441
+29 1.71 1.09424 2.15086
+30 1.77 0.984345 2.37874
+31 1.83 1.02318 2.63195
+32 1.89 1.02951 2.90371
+33 1.95 1.01409 3.18866
+34 2.01 0.967599 3.47753
+35 2.07 0.97765 3.78709
+36 2.13 0.999942 4.12233
+37 2.19 1.01735 4.48288
+38 2.25 1.00195 4.8577
+39 2.31 0.992186 5.24893
+40 2.37 0.963209 5.64872
+41 2.43 0.983254 6.07775
+42 2.49 1.03374 6.55136
+43 2.55 1.03021 7.04636
+44 2.61 0.979135 7.53923
+45 2.67 0.985047 8.05813
+46 2.73 0.981081 8.59843
+47 2.79 1.01684 9.18331
+48 2.85 0.988146 9.77639
+49 2.91 1.00823 10.4073
+50 2.97 1.02208 11.0735
+106900 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0.353592 0.00285307
+7 0.39 0.221691 0.0053495
+8 0.45 0.42839 0.0117689
+9 0.51 0.463376 0.0206847
+10 0.57 0.86082 0.0413695
+11 0.63 0.753385 0.0634807
+12 0.69 1.16509 0.104494
+13 0.75 1.15775 0.152639
+14 0.81 1.08825 0.205421
+15 0.87 1.24296 0.274964
+16 0.93 1.0655 0.343081
+17 0.99 1.10768 0.423324
+18 1.05 1.01975 0.506419
+19 1.11 0.975175 0.595221
+20 1.17 0.912993 0.687589
+21 1.23 0.880334 0.78602
+22 1.29 0.974353 0.905849
+23 1.35 0.990301 1.03923
+24 1.41 1.03162 1.1908
+25 1.47 1.00274 1.35093
+26 1.53 0.968934 1.51854
+27 1.59 1.05945 1.71648
+28 1.65 1.02813 1.92332
+29 1.71 1.00016 2.13944
+30 1.77 0.959698 2.36163
+31 1.83 0.998681 2.60877
+32 1.89 0.971412 2.86519
+33 1.95 0.98871 3.14301
+34 2.01 0.971183 3.43295
+35 2.07 1.05987 3.76854
+36 2.13 1.04249 4.11805
+37 2.19 0.937854 4.45043
+38 2.25 1.05629 4.84558
+39 2.31 1.01842 5.24715
+40 2.37 0.942587 5.63837
+41 2.43 1.01513 6.08131
+42 2.49 1.02518 6.551
+43 2.55 1.03837 7.04993
+44 2.61 0.971342 7.53887
+45 2.67 1.0365 8.08488
+46 2.73 0.960358 8.61377
+47 2.79 0.96476 9.16869
+48 2.85 1.01964 9.78067
+49 2.91 1.01678 10.4169
+50 2.97 1.02646 11.0859
+106950 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0.197809 0.0010699
+6 0.33 0.176796 0.00249643
+7 0.39 0.316701 0.00606277
+8 0.45 0.356992 0.0114123
+9 0.51 0.315096 0.017475
+10 0.57 0.94987 0.0402996
+11 0.63 0.935656 0.0677603
+12 0.69 0.89155 0.0991441
+13 0.75 1.09772 0.144793
+14 0.81 1.24266 0.205064
+15 0.87 1.19835 0.272111
+16 0.93 1.20496 0.349144
+17 0.99 0.969835 0.419401
+18 1.05 1.04163 0.50428
+19 1.11 0.979091 0.593438
+20 1.17 0.941194 0.688659
+21 1.23 1.00473 0.800999
+22 1.29 1.00915 0.925107
+23 1.35 0.884387 1.04422
+24 1.41 0.992783 1.19009
+25 1.47 1.01837 1.35271
+26 1.53 1.08438 1.5403
+27 1.59 1.00219 1.72753
+28 1.65 1.01572 1.93188
+29 1.71 0.978707 2.14337
+30 1.77 1.03672 2.38338
+31 1.83 0.994358 2.62946
+32 1.89 0.975466 2.88695
+33 1.95 0.995056 3.16655
+34 2.01 0.990296 3.4622
+35 2.07 0.991166 3.77603
+36 2.13 0.997814 4.11056
+37 2.19 0.996218 4.46362
+38 2.25 1.04104 4.85307
+39 2.31 1.01661 5.25392
+40 2.37 0.97352 5.65799
+41 2.43 1.03066 6.1077
+42 2.49 1.01428 6.5724
+43 2.55 0.999032 7.05243
+44 2.61 1.00181 7.5567
+45 2.67 0.99114 8.07882
+46 2.73 0.97849 8.61769
+47 2.79 0.979641 9.18117
+48 2.85 1.00716 9.78566
+49 2.91 1.00139 10.4123
+50 2.97 1.01934 11.0767
+107000 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0.0659362 0.000356633
+6 0.33 0.176796 0.00178317
+7 0.39 0.221691 0.0042796
+8 0.45 0.452189 0.0110556
+9 0.51 0.611657 0.0228245
+10 0.57 0.742086 0.0406562
+11 0.63 0.996413 0.0699001
+12 0.69 0.952338 0.103424
+13 0.75 1.05484 0.14729
+14 0.81 1.19854 0.205421
+15 0.87 1.24934 0.275321
+16 0.93 1.03202 0.341298
+17 0.99 1.01414 0.414765
+18 1.05 0.910335 0.488944
+19 1.11 1.03784 0.583452
+20 1.17 0.923569 0.67689
+21 1.23 1.04619 0.793866
+22 1.29 0.901857 0.904779
+23 1.35 0.916161 1.02817
+24 1.41 1.07774 1.18652
+25 1.47 0.989335 1.34451
+26 1.53 0.970995 1.51248
+27 1.59 0.986915 1.69686
+28 1.65 0.990902 1.89622
+29 1.71 1.02657 2.11805
+30 1.77 1.00899 2.35164
+31 1.83 0.964095 2.59023
+32 1.89 1.02816 2.86163
+33 1.95 1.03059 3.15121
+34 2.01 1.05122 3.46505
+35 2.07 0.991166 3.77889
+36 2.13 0.985049 4.10913
+37 2.19 0.984143 4.45792
+38 2.25 1.01816 4.8388
+39 2.31 0.99309 5.23039
+40 2.37 0.990705 5.64158
+41 2.43 0.995514 6.07596
+42 2.49 1.05165 6.55777
+43 2.55 0.970085 7.02389
+44 2.61 1.01669 7.53566
+45 2.67 1.02025 8.07311
+46 2.73 0.990147 8.6184
+47 2.79 1.01498 9.20221
+48 2.85 0.997059 9.80064
+49 2.91 1.00025 10.4265
+50 2.97 1.00238 11.0799
+107050 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0.108706 0.000356633
+5 0.27 0.0659362 0.000713267
+6 0.33 0.220995 0.00249643
+7 0.39 0.348371 0.0064194
+8 0.45 0.547387 0.014622
+9 0.51 0.537517 0.0249643
+10 0.57 0.816295 0.0445792
+11 0.63 0.850597 0.0695435
+12 0.69 0.942206 0.10271
+13 0.75 0.926199 0.141227
+14 0.81 1.25001 0.201854
+15 0.87 1.20472 0.269258
+16 0.93 1.09897 0.339515
+17 0.99 0.915682 0.405849
+18 1.05 1.03726 0.490371
+19 1.11 0.892931 0.571683
+20 1.17 1.04695 0.677603
+21 1.23 0.924989 0.781027
+22 1.29 0.936655 0.89622
+23 1.35 1.04061 1.03638
+24 1.41 0.990356 1.18188
+25 1.47 0.982636 1.3388
+26 1.53 1.04727 1.51997
+27 1.59 1.03273 1.71291
+28 1.65 1.07422 1.92903
+29 1.71 1.00676 2.14658
+30 1.77 1.03056 2.38516
+31 1.83 1.01309 2.63588
+32 1.89 0.967359 2.89123
+33 1.95 0.968402 3.16334
+34 2.01 1.02494 3.46933
+35 2.07 0.986661 3.78174
+36 2.13 0.993559 4.11484
+37 2.19 0.975087 4.46041
+38 2.25 0.988605 4.83024
+39 2.31 0.983141 5.2179
+40 2.37 1.00359 5.63445
+41 2.43 0.998784 6.07026
+42 2.49 1.02129 6.53816
+43 2.55 1.01313 7.02496
+44 2.61 1.02731 7.54208
+45 2.67 1.01822 8.07846
+46 2.73 0.983023 8.61983
+47 2.79 0.982741 9.18509
+48 2.85 1.01548 9.79458
+49 2.91 1.02305 10.4347
+50 2.97 0.990343 11.0802
+107100 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0.108706 0.000356633
+5 0.27 0.0659362 0.000713267
+6 0.33 0.132597 0.00178317
+7 0.39 0.443382 0.00677603
+8 0.45 0.380791 0.0124822
+9 0.51 0.537517 0.0228245
+10 0.57 0.816295 0.0424394
+11 0.63 0.850597 0.0674037
+12 0.69 1.10431 0.106277
+13 0.75 1.12345 0.152996
+14 0.81 1.25737 0.21398
+15 0.87 0.981623 0.268902
+16 0.93 1.23285 0.347718
+17 0.99 0.979681 0.418688
+18 1.05 1.0285 0.502496
+19 1.11 0.892931 0.583809
+20 1.17 0.969395 0.681883
+21 1.23 0.893093 0.78174
+22 1.29 0.977253 0.901926
+23 1.35 0.945288 1.02924
+24 1.41 1.02919 1.18046
+25 1.47 0.980402 1.33702
+26 1.53 1.08026 1.52389
+27 1.59 1.02128 1.71469
+28 1.65 0.976721 1.9112
+29 1.71 1.05958 2.14016
+30 1.77 0.924268 2.35414
+31 1.83 0.998681 2.60128
+32 1.89 0.970061 2.85735
+33 1.95 0.979825 3.13267
+34 2.01 0.935346 3.41191
+35 2.07 0.99905 3.72825
+36 2.13 1.09462 4.09522
+37 2.19 1.00226 4.45043
+38 2.25 0.983838 4.81847
+39 2.31 0.97681 5.20364
+40 2.37 1.00016 5.61876
+41 2.43 0.997149 6.05385
+42 2.49 1.00183 6.51284
+43 2.55 1.02724 7.00642
+44 2.61 0.996139 7.50785
+45 2.67 1.00874 8.03923
+46 2.73 1.01994 8.60093
+47 2.79 0.982741 9.16619
+48 2.85 0.978045 9.75321
+49 2.91 1.02761 10.3962
+50 2.97 0.979947 11.035
+107150 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0.0659362 0.000356633
+6 0.33 0.044199 0.000713267
+7 0.39 0.380042 0.00499287
+8 0.45 0.380791 0.010699
+9 0.51 0.722867 0.0246077
+10 0.57 0.653036 0.0402996
+11 0.63 0.899202 0.0666904
+12 0.69 0.881419 0.0977175
+13 0.75 1.16633 0.14622
+14 0.81 1.11766 0.200428
+15 0.87 1.25571 0.270685
+16 0.93 1.23843 0.349857
+17 0.99 1.06337 0.42689
+18 1.05 1.0854 0.515335
+19 1.11 0.99084 0.605563
+20 1.17 0.863642 0.692939
+21 1.23 0.924989 0.796362
+22 1.29 0.898957 0.906919
+23 1.35 1.02472 1.04494
+24 1.41 0.983074 1.18937
+25 1.47 0.931271 1.33809
+26 1.53 1.0782 1.52461
+27 1.59 1.03655 1.71826
+28 1.65 1.05649 1.93081
+29 1.71 0.991911 2.14515
+30 1.77 1.05367 2.38909
+31 1.83 0.939596 2.62161
+32 1.89 0.993029 2.88374
+33 1.95 0.920173 3.1423
+34 2.01 0.941319 3.42332
+35 2.07 1.07226 3.76284
+36 2.13 1.0276 4.10735
+37 2.19 0.958986 4.44722
+38 2.25 0.991465 4.81812
+39 2.31 1.02836 5.22361
+40 2.37 1.01906 5.64658
+41 2.43 1.03229 6.097
+42 2.49 1.01506 6.56205
+43 2.55 0.989383 7.03745
+44 2.61 1.0181 7.54993
+45 2.67 0.972184 8.06205
+46 2.73 0.989499 8.60699
+47 2.79 1.00382 9.18438
+48 2.85 1.00003 9.78459
+49 2.91 0.967768 10.3902
+50 2.97 0.989796 11.0353
+107200 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0.108706 0.000356633
+5 0.27 0 0.000356633
+6 0.33 0.044199 0.000713267
+7 0.39 0.316701 0.0042796
+8 0.45 0.618786 0.0135521
+9 0.51 0.611657 0.025321
+10 0.57 0.697561 0.0420827
+11 0.63 0.911353 0.0688302
+12 0.69 0.9726 0.103067
+13 0.75 1.01196 0.14515
+14 0.81 1.19119 0.202924
+15 0.87 1.25571 0.273181
+16 0.93 1.1157 0.344508
+17 0.99 0.969835 0.414765
+18 1.05 0.962855 0.493224
+19 1.11 0.994757 0.583809
+20 1.17 0.934144 0.678317
+21 1.23 1.00792 0.791013
+22 1.29 1.04105 0.919044
+23 1.35 0.995597 1.05314
+24 1.41 0.951518 1.19294
+25 1.47 1.07197 1.36412
+26 1.53 1.04109 1.54422
+27 1.59 0.902922 1.71291
+28 1.65 1.01926 1.91797
+29 1.71 1.00016 2.13409
+30 1.77 1.02594 2.37161
+31 1.83 1.04191 2.62946
+32 1.89 1.0241 2.89979
+33 1.95 0.970941 3.17261
+34 2.01 1.0118 3.47468
+35 2.07 0.972018 3.78245
+36 2.13 0.972284 4.10842
+37 2.19 1.03144 4.47397
+38 2.25 0.946658 4.8281
+39 2.31 1.02746 5.23324
+40 2.37 0.97352 5.6373
+41 2.43 0.957099 6.05492
+42 2.49 1.03686 6.52996
+43 2.55 1.02872 7.02425
+44 2.61 0.978427 7.51676
+45 2.67 1.00468 8.04601
+46 2.73 0.993385 8.59308
+47 2.79 1.00072 9.16869
+48 2.85 1.04044 9.79315
+49 2.91 1.01735 10.4297
+50 2.97 0.992532 11.0767
+107250 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0.0659362 0.000356633
+6 0.33 0 0.000356633
+7 0.39 0.316701 0.00392297
+8 0.45 0.475989 0.0110556
+9 0.51 0.630192 0.0231812
+10 0.57 0.756928 0.0413695
+11 0.63 0.97211 0.0699001
+12 0.69 1.15496 0.110556
+13 0.75 1.02911 0.153352
+14 0.81 1.02207 0.202924
+15 0.87 1.12823 0.266049
+16 0.93 1.02087 0.331312
+17 0.99 1.15691 0.415121
+18 1.05 1.05039 0.500713
+19 1.11 1.00259 0.592011
+20 1.17 0.891843 0.68224
+21 1.23 1.02706 0.797076
+22 1.29 0.997552 0.919757
+23 1.35 1.0565 1.06205
+24 1.41 0.944236 1.20078
+25 1.47 1.00943 1.36198
+26 1.53 0.995734 1.53424
+27 1.59 0.975461 1.71648
+28 1.65 1.00331 1.91833
+29 1.71 1.01832 2.13837
+30 1.77 1.05675 2.38302
+31 1.83 0.992917 2.62874
+32 1.89 0.956551 2.88124
+33 1.95 0.944288 3.14658
+34 2.01 1.06555 3.46469
+35 2.07 0.984408 3.77639
+36 2.13 1.02973 4.12161
+37 2.19 1.01031 4.47967
+38 2.25 0.973352 4.84379
+39 2.31 0.970479 5.22646
+40 2.37 0.989845 5.6373
+41 2.43 1.03393 6.08845
+42 2.49 1.02129 6.55635
+43 2.55 0.993094 7.03352
+44 2.61 0.981261 7.52746
+45 2.67 0.985047 8.04636
+46 2.73 1.00828 8.60164
+47 2.79 0.993901 9.17332
+48 2.85 1.03449 9.79422
+49 2.91 1.00082 10.4205
+50 2.97 0.966816 11.0506
+107300 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0.0659362 0.000356633
+6 0.33 0.220995 0.0021398
+7 0.39 0.348371 0.00606277
+8 0.45 0.380791 0.0117689
+9 0.51 0.556052 0.0224679
+10 0.57 0.608511 0.0370899
+11 0.63 0.947808 0.0649073
+12 0.69 1.06378 0.102354
+13 0.75 1.02911 0.14515
+14 0.81 1.14707 0.200785
+15 0.87 1.03899 0.258916
+16 0.93 1.24401 0.338445
+17 0.99 1.06337 0.415478
+18 1.05 0.958478 0.493581
+19 1.11 0.99084 0.583809
+20 1.17 1.03285 0.688302
+21 1.23 0.988781 0.798859
+22 1.29 0.933755 0.913695
+23 1.35 0.977062 1.04529
+24 1.41 0.951518 1.18509
+25 1.47 1.0139 1.347
+26 1.53 0.995734 1.51926
+27 1.59 1.027 1.71113
+28 1.65 1.04408 1.92118
+29 1.71 0.962203 2.1291
+30 1.77 1.01669 2.36448
+31 1.83 1.01597 2.61591
+32 1.89 0.974114 2.87304
+33 1.95 0.963326 3.14372
+34 2.01 1.04883 3.45685
+35 2.07 1.04298 3.78709
+36 2.13 0.973348 4.11341
+37 2.19 1.00628 4.47004
+38 2.25 1.0029 4.84522
+39 2.31 1.00756 5.24251
+40 2.37 0.952039 5.63766
+41 2.43 1.02412 6.08452
+42 2.49 0.985482 6.53602
+43 2.55 0.993837 7.01355
+44 2.61 0.990471 7.51213
+45 2.67 0.956613 8.01605
+46 2.73 0.996622 8.56491
+47 2.79 1.00506 9.14301
+48 2.85 1.044 9.76961
+49 2.91 1.02818 10.413
+50 2.97 0.978853 11.051
+107350 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0.108706 0.000356633
+5 0.27 0.0659362 0.000713267
+6 0.33 0.176796 0.0021398
+7 0.39 0.190021 0.0042796
+8 0.45 0.523588 0.0121255
+9 0.51 0.370701 0.0192582
+10 0.57 0.905345 0.0410128
+11 0.63 0.911353 0.0677603
+12 0.69 1.10431 0.106633
+13 0.75 1.01196 0.148716
+14 0.81 1.12501 0.203281
+15 0.87 1.1601 0.268188
+16 0.93 1.1157 0.339515
+17 0.99 1.14214 0.422254
+18 1.05 0.993491 0.50321
+19 1.11 0.873349 0.582739
+20 1.17 0.905943 0.674394
+21 1.23 1.03344 0.789943
+22 1.29 1.06425 0.920827
+23 1.35 0.982358 1.05314
+24 1.41 0.944236 1.19187
+25 1.47 0.989335 1.34986
+26 1.53 0.966872 1.51712
+27 1.59 1.05182 1.71362
+28 1.65 0.973176 1.90942
+29 1.71 0.917641 2.1077
+30 1.77 1.03672 2.34772
+31 1.83 1.03615 2.60414
+32 1.89 1.00249 2.86876
+33 1.95 0.964595 3.1398
+34 2.01 1.01538 3.44294
+35 2.07 0.983282 3.75428
+36 2.13 1.04675 4.10521
+37 2.19 1.01836 4.46612
+38 2.25 0.987652 4.83559
+39 2.31 0.981332 5.22254
+40 2.37 1.00531 5.6398
+41 2.43 0.970177 6.06312
+42 2.49 0.977698 6.51106
+43 2.55 1.03243 7.00713
+44 2.61 1.0599 7.54066
+45 2.67 1.00942 8.0724
+46 2.73 1.01994 8.63409
+47 2.79 0.97406 9.19437
+48 2.85 0.962596 9.77211
+49 2.91 0.954089 10.3691
+50 2.97 1.00785 11.026
+107400 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0.131872 0.000713267
+6 0.33 0.309393 0.0032097
+7 0.39 0.253361 0.00606277
+8 0.45 0.475989 0.0131954
+9 0.51 0.444841 0.0217546
+10 0.57 0.845978 0.0420827
+11 0.63 0.984262 0.07097
+12 0.69 1.02326 0.10699
+13 0.75 1.08057 0.151926
+14 0.81 1.0809 0.204351
+15 0.87 1.1346 0.267832
+16 0.93 1.09897 0.338088
+17 0.99 1.02891 0.412625
+18 1.05 1.07665 0.500357
+19 1.11 0.896847 0.582026
+20 1.17 1.0681 0.690086
+21 1.23 0.880334 0.788516
+22 1.29 0.910556 0.900499
+23 1.35 0.987654 1.03352
+24 1.41 1.09959 1.19508
+25 1.47 1.09207 1.36947
+26 1.53 0.91121 1.5271
+27 1.59 0.996459 1.71327
+28 1.65 0.900498 1.89444
+29 1.71 1.01832 2.11448
+30 1.77 0.975103 2.34023
+31 1.83 1.01453 2.5913
+32 1.89 0.983572 2.85093
+33 1.95 1.02171 3.13802
+34 2.01 0.996269 3.43545
+35 2.07 1.02383 3.75963
+36 2.13 1.01696 4.10057
+37 2.19 0.969049 4.44401
+38 2.25 1.00576 4.82026
+39 2.31 1.0356 5.2286
+40 2.37 1.00875 5.64729
+41 2.43 1.03311 6.09807
+42 2.49 0.993266 6.55314
+43 2.55 0.994579 7.03103
+44 2.61 0.98622 7.52746
+45 2.67 0.965414 8.03602
+46 2.73 1.00763 8.59094
+47 2.79 1.03296 9.18509
+48 2.85 0.983393 9.77532
+49 2.91 0.999115 10.4005
+50 2.97 1.02317 11.0674
+107450 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0.395617 0.0021398
+6 0.33 0.265194 0.0042796
+7 0.39 0.316701 0.00784593
+8 0.45 0.523588 0.0156919
+9 0.51 0.630192 0.0278174
+10 0.57 0.920187 0.0499287
+11 0.63 0.911353 0.0766762
+12 0.69 0.901681 0.108417
+13 0.75 1.02911 0.151213
+14 0.81 1.08825 0.203994
+15 0.87 1.24296 0.273538
+16 0.93 1.0376 0.339872
+17 0.99 0.979681 0.410842
+18 1.05 1.05914 0.497147
+19 1.11 1.01434 0.589515
+20 1.17 0.930619 0.683666
+21 1.23 0.979212 0.793153
+22 1.29 0.988852 0.914765
+23 1.35 1.02472 1.05278
+24 1.41 0.917535 1.18759
+25 1.47 1.02507 1.35128
+26 1.53 0.962749 1.51783
+27 1.59 1.08809 1.72111
+28 1.65 0.994448 1.92118
+29 1.71 1.03482 2.14479
+30 1.77 0.973562 2.37019
+31 1.83 1.01453 2.62126
+32 1.89 0.995731 2.88409
+33 1.95 1.03313 3.17439
+34 2.01 0.961626 3.46148
+35 2.07 1.09366 3.80777
+36 2.13 1.00845 4.14586
+37 2.19 0.917729 4.47111
+38 2.25 0.954285 4.8281
+39 2.31 0.965052 5.20863
+40 2.37 1.01476 5.62981
+41 2.43 1.00696 6.06919
+42 2.49 0.989374 6.52247
+43 2.55 1.00868 7.00713
+44 2.61 1.00889 7.51498
+45 2.67 1.04395 8.06491
+46 2.73 1.04066 8.63802
+47 2.79 0.9722 9.19722
+48 2.85 0.977451 9.78388
+49 2.91 1.0145 10.4187
+50 2.97 0.98706 11.0621
+107500 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0.0659362 0.000356633
+6 0.33 0.132597 0.00142653
+7 0.39 0.380042 0.00570613
+8 0.45 0.547387 0.0139087
+9 0.51 0.630192 0.0260342
+10 0.57 0.608511 0.0406562
+11 0.63 0.862748 0.0659772
+12 0.69 1.06378 0.103424
+13 0.75 1.1749 0.152282
+14 0.81 1.16913 0.208987
+15 0.87 1.10273 0.270685
+16 0.93 1.1157 0.342011
+17 0.99 0.935374 0.409772
+18 1.05 0.962855 0.488231
+19 1.11 1.06133 0.584879
+20 1.17 1.01875 0.687946
+21 1.23 0.924989 0.791369
+22 1.29 1.01205 0.915835
+23 1.35 0.955879 1.04458
+24 1.41 1.05347 1.19936
+25 1.47 0.922338 1.34665
+26 1.53 1.03078 1.52496
+27 1.59 0.998368 1.71148
+28 1.65 1.05117 1.92297
+29 1.71 0.998512 2.13873
+30 1.77 1.02132 2.37518
+31 1.83 1.08803 2.64444
+32 1.89 0.982221 2.90371
+33 1.95 1.01663 3.18937
+34 2.01 0.962821 3.47682
+35 2.07 0.969766 3.78388
+36 2.13 0.975475 4.11091
+37 2.19 1.00226 4.46612
+38 2.25 0.996232 4.8388
+39 2.31 1.02927 5.24465
+40 2.37 0.965787 5.64551
+41 2.43 0.991428 6.0781
+42 2.49 1.06488 6.56598
+43 2.55 1.00794 7.05029
+44 2.61 0.940877 7.52389
+45 2.67 1.02364 8.06312
+46 2.73 1.01087 8.61983
+47 2.79 0.990801 9.18973
+48 2.85 0.989335 9.78352
+49 2.91 1.01678 10.4198
+50 2.97 0.961344 11.0464
+107550 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0.131872 0.000713267
+6 0.33 0.176796 0.0021398
+7 0.39 0.380042 0.0064194
+8 0.45 0.404591 0.0124822
+9 0.51 0.537517 0.0228245
+10 0.57 0.756928 0.0410128
+11 0.63 0.850597 0.0659772
+12 0.69 1.17523 0.107347
+13 0.75 1.1406 0.154779
+14 0.81 1.0809 0.207204
+15 0.87 1.08361 0.267832
+16 0.93 1.01529 0.332739
+17 0.99 1.05845 0.409415
+18 1.05 1.06352 0.496077
+19 1.11 1.0535 0.592011
+20 1.17 1.0117 0.694365
+21 1.23 0.960075 0.801712
+22 1.29 0.956954 0.919401
+23 1.35 0.950583 1.04743
+24 1.41 0.868989 1.17511
+25 1.47 1.01613 1.33738
+26 1.53 1.09263 1.52639
+27 1.59 0.990732 1.71148
+28 1.65 1.02636 1.91797
+29 1.71 0.968804 2.12732
+30 1.77 1.01053 2.36127
+31 1.83 1.03183 2.61662
+32 1.89 0.976817 2.87447
+33 1.95 0.984902 3.15121
+34 2.01 1.01897 3.45542
+35 2.07 0.981029 3.76605
+36 2.13 1.02015 4.10806
+37 2.19 0.952948 4.44579
+38 2.25 1.01148 4.82418
+39 2.31 1.04374 5.23573
+40 2.37 0.999297 5.6505
+41 2.43 0.984889 6.08024
+42 2.49 1.06955 6.57026
+43 2.55 0.995321 7.0485
+44 2.61 1.00464 7.55421
+45 2.67 1.01551 8.08916
+46 2.73 0.996622 8.63802
+47 2.79 0.97592 9.19936
+48 2.85 0.957842 9.77425
+49 2.91 1.01963 10.4123
+50 2.97 1.00183 11.0653
+107600 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0.131872 0.000713267
+6 0.33 0.265194 0.00285307
+7 0.39 0.253361 0.00570613
+8 0.45 0.523588 0.0135521
+9 0.51 0.630192 0.0256776
+10 0.57 0.653036 0.0413695
+11 0.63 0.874899 0.0670471
+12 0.69 0.962469 0.100927
+13 0.75 1.09772 0.146576
+14 0.81 1.0956 0.199715
+15 0.87 1.08361 0.260342
+16 0.93 1.24959 0.340228
+17 0.99 1.06337 0.417261
+18 1.05 1.01975 0.500357
+19 1.11 0.932095 0.585235
+20 1.17 1.01522 0.687946
+21 1.23 0.950506 0.794223
+22 1.29 0.977253 0.914408
+23 1.35 0.977062 1.04601
+24 1.41 1.02919 1.19722
+25 1.47 0.996035 1.35628
+26 1.53 1.07614 1.54244
+27 1.59 0.914375 1.71327
+28 1.65 1.04054 1.92261
+29 1.71 0.985309 2.13552
+30 1.77 1.00899 2.36912
+31 1.83 1.02606 2.62304
+32 1.89 0.924125 2.86698
+33 1.95 0.967133 3.13873
+34 2.01 1.04525 3.45078
+35 2.07 0.983282 3.76213
+36 2.13 1.04675 4.11305
+37 2.19 0.984143 4.46184
+38 2.25 0.988605 4.83167
+39 2.31 0.998517 5.22539
+40 2.37 1.03195 5.65371
+41 2.43 0.993062 6.08702
+42 2.49 0.926322 6.51141
+43 2.55 0.990868 6.98752
+44 2.61 1.03298 7.50749
+45 2.67 0.99114 8.0296
+46 2.73 0.971367 8.56455
+47 2.79 1.04474 9.16548
+48 2.85 0.988741 9.75892
+49 2.91 0.995695 10.382
+50 2.97 1.01004 11.0403
+107650 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0.108706 0.000356633
+5 0.27 0.0659362 0.000713267
+6 0.33 0.265194 0.00285307
+7 0.39 0.316701 0.0064194
+8 0.45 0.452189 0.0131954
+9 0.51 0.667262 0.0260342
+10 0.57 0.682719 0.0424394
+11 0.63 0.935656 0.0699001
+12 0.69 0.921944 0.102354
+13 0.75 1.18348 0.151569
+14 0.81 1.19854 0.2097
+15 0.87 0.949753 0.262839
+16 0.93 1.23843 0.342011
+17 0.99 1.02399 0.416191
+18 1.05 0.984738 0.496434
+19 1.11 0.943844 0.582382
+20 1.17 0.909468 0.674394
+21 1.23 0.931368 0.778531
+22 1.29 0.919256 0.891583
+23 1.35 1.01413 1.02817
+24 1.41 0.975792 1.17154
+25 1.47 1.10323 1.34772
+26 1.53 1.0782 1.53424
+27 1.59 0.97737 1.71683
+28 1.65 0.980267 1.91405
+29 1.71 1.01667 2.13374
+30 1.77 1.03364 2.37304
+31 1.83 1.0275 2.62732
+32 1.89 0.94304 2.87625
+33 1.95 0.978556 3.15121
+34 2.01 1.02972 3.45863
+35 2.07 1.01707 3.78067
+36 2.13 1.02973 4.12589
+37 2.19 1.02439 4.48894
+38 2.25 0.978118 4.85485
+39 2.31 1.01661 5.25571
+40 2.37 1.02507 5.68117
+41 2.43 1.00205 6.1184
+42 2.49 0.983925 6.56919
+43 2.55 0.99829 7.04886
+44 2.61 0.986929 7.54565
+45 2.67 0.991817 8.06812
+46 2.73 0.988204 8.61234
+47 2.79 0.990801 9.18224
+48 2.85 0.968538 9.76355
+49 2.91 1.01792 10.4005
+50 2.97 1.03466 11.0749
+107700 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0.108706 0.000356633
+5 0.27 0.197809 0.00142653
+6 0.33 0.176796 0.00285307
+7 0.39 0.0950104 0.00392297
+8 0.45 0.594986 0.0128388
+9 0.51 0.593122 0.0242511
+10 0.57 0.801453 0.0435093
+11 0.63 0.97211 0.0720399
+12 0.69 1.01313 0.107703
+13 0.75 0.986231 0.148716
+14 0.81 1.01472 0.197932
+15 0.87 1.21109 0.265692
+16 0.93 1.1938 0.342011
+17 0.99 1.06337 0.419044
+18 1.05 1.04163 0.503923
+19 1.11 0.983008 0.593438
+20 1.17 0.923569 0.686876
+21 1.23 0.976023 0.796006
+22 1.29 0.956954 0.913695
+23 1.35 1.01678 1.05064
+24 1.41 0.878698 1.17974
+25 1.47 1.0005 1.33951
+26 1.53 1.10912 1.53138
+27 1.59 1.03273 1.72432
+28 1.65 0.99622 1.92475
+29 1.71 0.98861 2.13837
+30 1.77 0.998209 2.36947
+31 1.83 0.942479 2.60271
+32 1.89 1.00519 2.86805
+33 1.95 1.09532 3.17582
+34 2.01 1.02255 3.4811
+35 2.07 0.94386 3.77996
+36 2.13 1.03611 4.12732
+37 2.19 0.933829 4.45827
+38 2.25 1.0439 4.84879
+39 2.31 0.938823 5.21897
+40 2.37 0.993282 5.63124
+41 2.43 1.02085 6.07668
+42 2.49 1.01117 6.53994
+43 2.55 1.02724 7.03352
+44 2.61 0.957881 7.51569
+45 2.67 0.987755 8.03602
+46 2.73 1.00439 8.58916
+47 2.79 0.987081 9.15692
+48 2.85 1.01013 9.7632
+49 2.91 1.01963 10.4012
+50 2.97 1.0188 11.0653
+107750 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0.044199 0.000356633
+7 0.39 0.221691 0.00285307
+8 0.45 0.404591 0.00891583
+9 0.51 0.685797 0.0221113
+10 0.57 0.816295 0.0417261
+11 0.63 0.959959 0.0699001
+12 0.69 1.08404 0.10806
+13 0.75 0.951927 0.147646
+14 0.81 1.29413 0.210414
+15 0.87 1.04537 0.268902
+16 0.93 1.09897 0.339158
+17 0.99 1.0486 0.415121
+18 1.05 1.01537 0.49786
+19 1.11 1.02217 0.590942
+20 1.17 1.04695 0.696862
+21 1.23 1.00154 0.808845
+22 1.29 0.968553 0.92796
+23 1.35 0.953231 1.05635
+24 1.41 1.02919 1.20756
+25 1.47 0.998268 1.36698
+26 1.53 1.02253 1.54387
+27 1.59 0.962099 1.72361
+28 1.65 1.0299 1.93081
+29 1.71 1.03977 2.15549
+30 1.77 1.01207 2.3898
+31 1.83 1.01742 2.64158
+32 1.89 0.949795 2.8923
+33 1.95 0.989979 3.17047
+34 2.01 1.0118 3.47254
+35 2.07 1.00243 3.78994
+36 2.13 1.05526 4.14372
+37 2.19 0.96603 4.48609
+38 2.25 0.995278 4.85842
+39 2.31 0.946963 5.23181
+40 2.37 0.999297 5.64658
+41 2.43 1.01431 6.08916
+42 2.49 1.03764 6.56455
+43 2.55 1.01981 7.05456
+44 2.61 1.01243 7.56419
+45 2.67 1.03515 8.10949
+46 2.73 0.977843 8.648
+47 2.79 0.987701 9.21612
+48 2.85 0.979233 9.80385
+49 2.91 0.998545 10.4287
+50 2.97 1.00457 11.0835
+107800 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0.197809 0.0010699
+6 0.33 0.353592 0.00392297
+7 0.39 0.285031 0.00713267
+8 0.45 0.380791 0.0128388
+9 0.51 0.778472 0.0278174
+10 0.57 0.653036 0.0435093
+11 0.63 1.06932 0.074893
+12 0.69 1.04352 0.111626
+13 0.75 0.84044 0.146576
+14 0.81 1.12501 0.201141
+15 0.87 1.28758 0.273181
+16 0.93 1.02087 0.338445
+17 0.99 1.04368 0.414051
+18 1.05 1.15543 0.508203
+19 1.11 0.983008 0.597718
+20 1.17 0.96587 0.695435
+21 1.23 0.99516 0.806705
+22 1.29 0.974353 0.926534
+23 1.35 0.961175 1.05599
+24 1.41 0.949091 1.19544
+25 1.47 1.04293 1.36198
+26 1.53 0.900902 1.51783
+27 1.59 1.03655 1.71148
+28 1.65 0.994448 1.91155
+29 1.71 0.977057 2.12268
+30 1.77 1.0244 2.35984
+31 1.83 0.998681 2.60699
+32 1.89 1.02951 2.87874
+33 1.95 1.0179 3.16476
+34 2.01 0.975961 3.45613
+35 2.07 1.05762 3.79101
+36 2.13 0.983985 4.1209
+37 2.19 1.02641 4.48466
+38 2.25 0.957145 4.84272
+39 2.31 0.974097 5.22682
+40 2.37 0.994142 5.63944
+41 2.43 1.00696 6.07882
+42 2.49 0.953567 6.51569
+43 2.55 1.02946 7.01034
+44 2.61 1.04786 7.5378
+45 2.67 1.05004 8.09094
+46 2.73 0.973957 8.62732
+47 2.79 0.983981 9.1933
+48 2.85 0.990523 9.7878
+49 2.91 0.996265 10.4112
+50 2.97 0.973381 11.0456
+107850 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0.21169 0.000356633
+4 0.21 0.108706 0.000713267
+5 0.27 0.0659362 0.0010699
+6 0.33 0.0883979 0.00178317
+7 0.39 0.348371 0.00570613
+8 0.45 0.594986 0.014622
+9 0.51 0.648727 0.0271041
+10 0.57 0.875662 0.0481455
+11 0.63 0.923505 0.0752496
+12 0.69 0.992863 0.1102
+13 0.75 0.934775 0.149073
+14 0.81 1.15443 0.205064
+15 0.87 1.3322 0.279601
+16 0.93 1.00971 0.344151
+17 0.99 0.974758 0.414765
+18 1.05 0.897205 0.487874
+19 1.11 1.04567 0.583096
+20 1.17 0.97997 0.68224
+21 1.23 0.963264 0.789943
+22 1.29 0.965654 0.908702
+23 1.35 0.947936 1.03638
+24 1.41 0.939382 1.17439
+25 1.47 1.13226 1.35521
+26 1.53 1.02047 1.53174
+27 1.59 1.00409 1.71933
+28 1.65 0.971403 1.91476
+29 1.71 0.957251 2.12161
+30 1.77 1.05983 2.36698
+31 1.83 1.052 2.62732
+32 1.89 1.02951 2.89907
+33 1.95 0.995056 3.17867
+34 2.01 1.0548 3.49358
+35 2.07 0.96526 3.79922
+36 2.13 0.929733 4.11091
+37 2.19 0.951942 4.44829
+38 2.25 1.05438 4.84272
+39 2.31 0.949677 5.21719
+40 2.37 1.05429 5.65478
+41 2.43 1.03556 6.10663
+42 2.49 1.02907 6.5781
+43 2.55 1.00052 7.05884
+44 2.61 1.00464 7.56455
+45 2.67 0.974215 8.07775
+46 2.73 0.983671 8.61947
+47 2.79 1.01312 9.20221
+48 2.85 0.995277 9.79957
+49 2.91 1.01336 10.4337
+50 2.97 0.972287 11.0674
+107900 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0.108706 0.000356633
+5 0.27 0.0659362 0.000713267
+6 0.33 0.220995 0.00249643
+7 0.39 0.316701 0.00606277
+8 0.45 0.380791 0.0117689
+9 0.51 0.815542 0.0274608
+10 0.57 0.712403 0.0445792
+11 0.63 0.838445 0.0691869
+12 0.69 1.03339 0.105563
+13 0.75 1.1749 0.154422
+14 0.81 1.27207 0.21612
+15 0.87 1.08361 0.276748
+16 0.93 1.05992 0.344508
+17 0.99 1.03876 0.419757
+18 1.05 0.932218 0.49572
+19 1.11 0.920346 0.579529
+20 1.17 0.944719 0.675107
+21 1.23 0.902661 0.776034
+22 1.29 0.910556 0.888017
+23 1.35 0.969118 1.01854
+24 1.41 1.04376 1.1719
+25 1.47 0.991569 1.33024
+26 1.53 1.09263 1.51926
+27 1.59 1.03273 1.7122
+28 1.65 1.10081 1.93367
+29 1.71 1.04472 2.15942
+30 1.77 1.01207 2.39372
+31 1.83 0.920862 2.62161
+32 1.89 0.964657 2.87625
+33 1.95 0.992517 3.15514
+34 2.01 1.05122 3.46897
+35 2.07 0.967513 3.77532
+36 2.13 1.04994 4.12732
+37 2.19 0.979112 4.47432
+38 2.25 0.980978 4.8413
+39 2.31 1.01932 5.24322
+40 2.37 1.01304 5.66369
+41 2.43 1.01513 6.10663
+42 2.49 0.98159 6.55635
+43 2.55 1.04357 7.05777
+44 2.61 0.955755 7.53887
+45 2.67 1.00739 8.06954
+46 2.73 0.948702 8.59201
+47 2.79 1.02242 9.1801
+48 2.85 1.0238 9.79458
+49 2.91 1.01165 10.4276
+50 2.97 1.01387 11.0884
+107950 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0.0659362 0.000356633
+6 0.33 0.176796 0.00178317
+7 0.39 0.285031 0.00499287
+8 0.45 0.523588 0.0128388
+9 0.51 0.722867 0.0267475
+10 0.57 0.727244 0.0442225
+11 0.63 0.78984 0.0674037
+12 0.69 1.06378 0.10485
+13 0.75 0.960503 0.144793
+14 0.81 1.17648 0.201854
+15 0.87 1.16647 0.267118
+16 0.93 1.02087 0.332382
+17 0.99 1.04368 0.407989
+18 1.05 1.1423 0.50107
+19 1.11 1.0535 0.597004
+20 1.17 1.00112 0.698288
+21 1.23 0.893093 0.798146
+22 1.29 0.997552 0.920827
+23 1.35 0.947936 1.0485
+24 1.41 0.915108 1.18295
+25 1.47 1.00274 1.34308
+26 1.53 1.0514 1.52496
+27 1.59 0.958281 1.70399
+28 1.65 1.01926 1.90906
+29 1.71 0.975406 2.11983
+30 1.77 0.99975 2.35128
+31 1.83 1.02318 2.60449
+32 1.89 0.987625 2.86519
+33 1.95 0.98871 3.14301
+34 2.01 1.11811 3.47682
+35 2.07 0.957376 3.77996
+36 2.13 0.977603 4.1077
+37 2.19 0.969049 4.45114
+38 2.25 0.996232 4.82382
+39 2.31 1.01118 5.22254
+40 2.37 0.970083 5.62518
+41 2.43 0.999601 6.06134
+42 2.49 0.994045 6.51676
+43 2.55 0.973054 6.98431
+44 2.61 1.00747 7.49144
+45 2.67 1.01213 8.02461
+46 2.73 1.03936 8.597
+47 2.79 0.990801 9.1669
+48 2.85 1.0541 9.79957
+49 2.91 0.980307 10.413
+50 2.97 1.00129 11.0656
+108000 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0.108706 0.000356633
+5 0.27 0 0.000356633
+6 0.33 0.220995 0.0021398
+7 0.39 0.190021 0.0042796
+8 0.45 0.475989 0.0114123
+9 0.51 0.685797 0.0246077
+10 0.57 0.845978 0.0449358
+11 0.63 1.06932 0.0763195
+12 0.69 1.09418 0.114836
+13 0.75 1.16633 0.163338
+14 0.81 1.18384 0.220756
+15 0.87 1.07724 0.281027
+16 0.93 1.0655 0.349144
+17 0.99 1.03876 0.424394
+18 1.05 1.1598 0.518902
+19 1.11 0.951677 0.605563
+20 1.17 0.909468 0.697575
+21 1.23 0.877145 0.795649
+22 1.29 0.901857 0.906562
+23 1.35 0.939992 1.03317
+24 1.41 1.09716 1.19437
+25 1.47 1.06973 1.36519
+26 1.53 0.981303 1.53495
+27 1.59 0.996459 1.72111
+28 1.65 1.0299 1.92832
+29 1.71 0.965504 2.13695
+30 1.77 1.03364 2.37625
+31 1.83 0.987153 2.62054
+32 1.89 1.06193 2.90086
+33 1.95 0.965864 3.17225
+34 2.01 0.989101 3.46755
+35 2.07 0.975397 3.77639
+36 2.13 0.97122 4.102
+37 2.19 1.00628 4.45863
+38 2.25 1.00481 4.83452
+39 2.31 1.01932 5.23645
+40 2.37 1.02679 5.66262
+41 2.43 0.959551 6.08131
+42 2.49 1.01818 6.54779
+43 2.55 0.97157 7.01462
+44 2.61 1.03652 7.53638
+45 2.67 1.02567 8.07668
+46 2.73 1.00116 8.62803
+47 2.79 1.01126 9.2097
+48 2.85 1.01013 9.81598
+49 2.91 0.978027 10.428
+50 2.97 0.986513 11.071
+108050 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0.108706 0.000356633
+5 0.27 0.0659362 0.000713267
+6 0.33 0.220995 0.00249643
+7 0.39 0.411712 0.00713267
+8 0.45 0.690184 0.017475
+9 0.51 0.500446 0.0271041
+10 0.57 0.771769 0.0456491
+11 0.63 0.838445 0.0702568
+12 0.69 0.901681 0.101997
+13 0.75 1.14917 0.149786
+14 0.81 1.18384 0.207204
+15 0.87 0.975249 0.261769
+16 0.93 1.22727 0.340228
+17 0.99 1.09783 0.419757
+18 1.05 1.07665 0.507489
+19 1.11 0.975175 0.596291
+20 1.17 0.958819 0.693295
+21 1.23 0.960075 0.800642
+22 1.29 1.00625 0.924394
+23 1.35 0.963823 1.05421
+24 1.41 0.917535 1.18902
+25 1.47 0.93797 1.3388
+26 1.53 1.01223 1.51391
+27 1.59 1.05182 1.71041
+28 1.65 1.02458 1.91655
+29 1.71 1.06783 2.14729
+30 1.77 0.990507 2.3766
+31 1.83 0.962654 2.61484
+32 1.89 1.02275 2.88481
+33 1.95 0.903673 3.13873
+34 2.01 1.00941 3.44009
+35 2.07 1.01932 3.76284
+36 2.13 1.02866 4.1077
+37 2.19 1.02339 4.4704
+38 2.25 1.02769 4.85485
+39 2.31 0.973192 5.23859
+40 2.37 0.997579 5.65264
+41 2.43 0.985706 6.08274
+42 2.49 0.994823 6.53852
+43 2.55 1.01017 7.02389
+44 2.61 0.97205 7.5132
+45 2.67 1.06967 8.07668
+46 2.73 0.998565 8.6266
+47 2.79 1.01374 9.2097
+48 2.85 1.00062 9.81027
+49 2.91 0.987146 10.428
+50 2.97 0.977759 11.0653
+108100 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0.108706 0.000356633
+5 0.27 0.131872 0.0010699
+6 0.33 0.132597 0.0021398
+7 0.39 0.380042 0.0064194
+8 0.45 0.571187 0.0149786
+9 0.51 0.444841 0.0235378
+10 0.57 0.653036 0.0392297
+11 0.63 0.887051 0.0652639
+12 0.69 1.14483 0.105563
+13 0.75 1.08057 0.150499
+14 0.81 1.06619 0.202211
+15 0.87 1.17285 0.267832
+16 0.93 1.22169 0.345934
+17 0.99 1.11753 0.42689
+18 1.05 1.00224 0.508559
+19 1.11 0.94776 0.594864
+20 1.17 0.97997 0.694009
+21 1.23 0.944126 0.799572
+22 1.29 0.988852 0.921184
+23 1.35 1.01413 1.05777
+24 1.41 1.0122 1.20649
+25 1.47 1.00274 1.36662
+26 1.53 1.02253 1.54351
+27 1.59 1.01746 1.73359
+28 1.65 1.05826 1.9465
+29 1.71 0.945698 2.15086
+30 1.77 0.992048 2.38053
+31 1.83 0.920862 2.60842
+32 1.89 1.03897 2.88267
+33 1.95 0.973479 3.15621
+34 2.01 0.998658 3.45435
+35 2.07 1.0182 3.77675
+36 2.13 1.01058 4.11555
+37 2.19 1.01634 4.47575
+38 2.25 0.972398 4.83951
+39 2.31 1.00304 5.23502
+40 2.37 1.02422 5.66013
+41 2.43 0.986524 6.09058
+42 2.49 0.96213 6.53138
+43 2.55 1.02649 7.02461
+44 2.61 0.967091 7.51141
+45 2.67 1.02634 8.05207
+46 2.73 1.01475 8.61091
+47 2.79 0.995141 9.18331
+48 2.85 1.01013 9.78959
+49 2.91 0.995695 10.4126
+50 2.97 1.01004 11.071
+108150 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0.131872 0.000713267
+6 0.33 0.0883979 0.00142653
+7 0.39 0.190021 0.00356633
+8 0.45 0.452189 0.0103424
+9 0.51 0.518981 0.0203281
+10 0.57 0.623352 0.0353067
+11 0.63 0.97211 0.0638374
+12 0.69 1.12457 0.103424
+13 0.75 1.1749 0.152282
+14 0.81 1.16178 0.208631
+15 0.87 1.08361 0.269258
+16 0.93 1.26632 0.350214
+17 0.99 1.12737 0.431883
+18 1.05 1.02413 0.515335
+19 1.11 0.90468 0.597718
+20 1.17 0.898893 0.688659
+21 1.23 0.940937 0.793866
+22 1.29 0.994652 0.916191
+23 1.35 0.934696 1.04208
+24 1.41 1.06075 1.19793
+25 1.47 0.991569 1.35628
+26 1.53 0.987488 1.5271
+27 1.59 1.04609 1.72254
+28 1.65 1.03699 1.93117
+29 1.71 0.955601 2.13766
+30 1.77 1.00745 2.3709
+31 1.83 0.99724 2.61769
+32 1.89 1.07139 2.9005
+33 1.95 0.98744 3.17796
+34 2.01 0.941319 3.45899
+35 2.07 0.968639 3.76569
+36 2.13 1.01164 4.10485
+37 2.19 1.04452 4.47504
+38 2.25 1.0296 4.8602
+39 2.31 0.977715 5.24572
+40 2.37 1.02078 5.6694
+41 2.43 0.96609 6.09094
+42 2.49 1.01662 6.5567
+43 2.55 1.02575 7.04957
+44 2.61 0.947962 7.52675
+45 2.67 1.01687 8.06241
+46 2.73 1.01734 8.62268
+47 2.79 0.97096 9.18117
+48 2.85 1.003 9.78317
+49 2.91 0.995125 10.4058
+50 2.97 0.977759 11.0432
+108200 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0.108706 0.000356633
+5 0.27 0.197809 0.00142653
+6 0.33 0.132597 0.00249643
+7 0.39 0.253361 0.0053495
+8 0.45 0.380791 0.0110556
+9 0.51 0.685797 0.0242511
+10 0.57 0.667877 0.0402996
+11 0.63 1.03287 0.0706134
+12 0.69 0.992863 0.105563
+13 0.75 1.14917 0.153352
+14 0.81 1.17648 0.210414
+15 0.87 1.1601 0.275321
+16 0.93 1.16033 0.349501
+17 0.99 1.09783 0.42903
+18 1.05 1.02413 0.512482
+19 1.11 0.90468 0.594864
+20 1.17 0.941194 0.690086
+21 1.23 0.972833 0.798859
+22 1.29 0.977253 0.919044
+23 1.35 0.953231 1.04743
+24 1.41 1.07289 1.20506
+25 1.47 1.0072 1.36591
+26 1.53 1.0514 1.54779
+27 1.59 1.01746 1.73787
+28 1.65 1.00686 1.94044
+29 1.71 0.991911 2.15478
+30 1.77 0.978184 2.38124
+31 1.83 0.99724 2.62803
+32 1.89 1.05248 2.90585
+33 1.95 1.02932 3.19508
+34 2.01 0.966405 3.48359
+35 2.07 0.955124 3.78602
+36 2.13 0.991432 4.1184
+37 2.19 0.977099 4.46469
+38 2.25 1.00862 4.84201
+39 2.31 0.95239 5.21755
+40 2.37 0.999297 5.63231
+41 2.43 0.959551 6.051
+42 2.49 1.05788 6.53566
+43 2.55 1.00423 7.01819
+44 2.61 1.04715 7.54529
+45 2.67 1.00197 8.07311
+46 2.73 1.00957 8.6291
+47 2.79 1.01374 9.2122
+48 2.85 0.984581 9.80314
+49 2.91 1.00937 10.4347
+50 2.97 0.958608 11.0596
+108250 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0.0659362 0.000356633
+6 0.33 0.176796 0.00178317
+7 0.39 0.348371 0.00570613
+8 0.45 0.380791 0.0114123
+9 0.51 0.797007 0.0267475
+10 0.57 0.608511 0.0413695
+11 0.63 0.887051 0.0674037
+12 0.69 1.05365 0.104494
+13 0.75 1.08057 0.149429
+14 0.81 1.11031 0.203281
+15 0.87 1.22384 0.271755
+16 0.93 1.11012 0.342725
+17 0.99 1.23075 0.431883
+18 1.05 0.936595 0.508203
+19 1.11 0.928178 0.592725
+20 1.17 0.97997 0.691869
+21 1.23 0.91861 0.794579
+22 1.29 1.04395 0.922967
+23 1.35 0.990301 1.05635
+24 1.41 0.966082 1.19829
+25 1.47 1.0675 1.36876
+26 1.53 0.927703 1.52924
+27 1.59 0.979279 1.7122
+28 1.65 1.00154 1.91369
+29 1.71 1.01667 2.13338
+30 1.77 1.00283 2.36555
+31 1.83 0.988594 2.6102
+32 1.89 1.00924 2.8766
+33 1.95 1.03186 3.16655
+34 2.01 1.01897 3.47076
+35 2.07 1.01031 3.79066
+36 2.13 0.978666 4.11876
+37 2.19 1.00829 4.47611
+38 2.25 0.980978 4.84308
+39 2.31 0.983141 5.23074
+40 2.37 1.05515 5.66869
+41 2.43 0.97835 6.09558
+42 2.49 0.970692 6.5403
+43 2.55 0.999774 7.02068
+44 2.61 1.00252 7.52532
+45 2.67 1.00265 8.0535
+46 2.73 1.03418 8.62304
+47 2.79 1.01498 9.20685
+48 2.85 0.964973 9.78602
+49 2.91 1.04129 10.4376
+50 2.97 0.998003 11.0881
+108300 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0.197809 0.0010699
+6 0.33 0.265194 0.0032097
+7 0.39 0.285031 0.0064194
+8 0.45 0.404591 0.0124822
+9 0.51 0.593122 0.0238944
+10 0.57 0.712403 0.0410128
+11 0.63 0.741234 0.0627675
+12 0.69 1.16509 0.10378
+13 0.75 1.19205 0.153352
+14 0.81 1.10295 0.206847
+15 0.87 1.07086 0.266762
+16 0.93 1.1938 0.343081
+17 0.99 1.09291 0.422254
+18 1.05 0.989114 0.502853
+19 1.11 0.932095 0.587732
+20 1.17 0.920044 0.680813
+21 1.23 1.03981 0.797076
+22 1.29 0.954054 0.914408
+23 1.35 0.955879 1.04315
+24 1.41 0.946664 1.18224
+25 1.47 0.973703 1.33773
+26 1.53 1.01841 1.51391
+27 1.59 1.13008 1.72504
+28 1.65 1.02636 1.93153
+29 1.71 0.986959 2.14479
+30 1.77 1.00591 2.37767
+31 1.83 0.925185 2.60663
+32 1.89 1.01194 2.87375
+33 1.95 0.998863 3.15442
+34 2.01 1.00105 3.45328
+35 2.07 0.985534 3.76534
+36 2.13 1.00845 4.10342
+37 2.19 0.985149 4.45257
+38 2.25 1.00481 4.82846
+39 2.31 1.01299 5.22789
+40 2.37 0.978675 5.63409
+41 2.43 0.985706 6.06419
+42 2.49 1.03141 6.53673
+43 2.55 1.06435 7.04815
+44 2.61 1.02944 7.56633
+45 2.67 0.932917 8.05777
+46 2.73 0.987556 8.60164
+47 2.79 1.00258 9.17832
+48 2.85 1.02142 9.79137
+49 2.91 1.06067 10.4551
+50 2.97 0.993079 11.1024
+108350 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0.0659362 0.000356633
+6 0.33 0.486189 0.0042796
+7 0.39 0.380042 0.0085592
+8 0.45 0.380791 0.0142653
+9 0.51 0.556052 0.0249643
+10 0.57 0.593669 0.0392297
+11 0.63 0.862748 0.0645506
+12 0.69 0.992863 0.0995007
+13 0.75 1.14917 0.14729
+14 0.81 1.19119 0.205064
+15 0.87 1.20472 0.272468
+16 0.93 1.10455 0.343081
+17 0.99 1.12245 0.424394
+18 1.05 0.967231 0.50321
+19 1.11 0.90468 0.585592
+20 1.17 1.00465 0.687233
+21 1.23 0.921799 0.7903
+22 1.29 0.919256 0.903352
+23 1.35 0.985006 1.03602
+24 1.41 1.11172 1.19936
+25 1.47 1.0273 1.36341
+26 1.53 1.02253 1.5403
+27 1.59 0.988823 1.72504
+28 1.65 1.03345 1.93295
+29 1.71 1.03977 2.15763
+30 1.77 0.919647 2.37054
+31 1.83 0.979947 2.61305
+32 1.89 1.02005 2.88231
+33 1.95 1.00013 3.16334
+34 2.01 0.985518 3.45756
+35 2.07 1.04973 3.78994
+36 2.13 0.961646 4.11234
+37 2.19 0.995212 4.46505
+38 2.25 1.00004 4.83916
+39 2.31 0.962339 5.21862
+40 2.37 1.03968 5.65014
+41 2.43 0.960369 6.06919
+42 2.49 1.03219 6.54208
+43 2.55 1.00645 7.02568
+44 2.61 1.00252 7.53031
+45 2.67 0.998587 8.05635
+46 2.73 0.946759 8.57775
+47 2.79 1.00754 9.15728
+48 2.85 0.986364 9.74929
+49 2.91 1.00652 10.3791
+50 2.97 1.03029 11.0506
+108400 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0.131872 0.000713267
+6 0.33 0.220995 0.00249643
+7 0.39 0.475052 0.00784593
+8 0.45 0.356992 0.0131954
+9 0.51 0.500446 0.0228245
+10 0.57 0.801453 0.0420827
+11 0.63 0.996413 0.0713267
+12 0.69 1.10431 0.1102
+13 0.75 1.02911 0.152996
+14 0.81 1.16178 0.209344
+15 0.87 1.05811 0.268545
+16 0.93 1.08781 0.338088
+17 0.99 1.07814 0.416191
+18 1.05 1.01975 0.499287
+19 1.11 0.94776 0.585592
+20 1.17 0.909468 0.677603
+21 1.23 0.883524 0.776391
+22 1.29 1.00625 0.900143
+23 1.35 0.955879 1.02889
+24 1.41 0.990356 1.17439
+25 1.47 1.00274 1.33452
+26 1.53 1.0349 1.51355
+27 1.59 1.01555 1.70328
+28 1.65 1.0299 1.91049
+29 1.71 1.00016 2.1266
+30 1.77 0.987426 2.35521
+31 1.83 1.01453 2.60628
+32 1.89 1.04437 2.88195
+33 1.95 0.959518 3.15157
+34 2.01 1.03091 3.45934
+35 2.07 1.0227 3.78317
+36 2.13 1.03398 4.12981
+37 2.19 0.971061 4.47397
+38 2.25 0.972398 4.83773
+39 2.31 1.00213 5.23288
+40 2.37 0.976098 5.63802
+41 2.43 0.993062 6.07133
+42 2.49 0.993266 6.52639
+43 2.55 0.999032 7.00642
+44 2.61 1.01739 7.51854
+45 2.67 1.00671 8.04886
+46 2.73 1.05944 8.63231
+47 2.79 1.00754 9.21184
+48 2.85 0.986364 9.80385
+49 2.91 1.02191 10.4433
+50 2.97 0.980494 11.0824
+108450 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0.0883979 0.000713267
+7 0.39 0.158351 0.00249643
+8 0.45 0.594986 0.0114123
+9 0.51 0.481911 0.0206847
+10 0.57 0.593669 0.0349501
+11 0.63 0.887051 0.0609843
+12 0.69 1.23601 0.104494
+13 0.75 1.20063 0.154422
+14 0.81 1.11766 0.208631
+15 0.87 1.15373 0.273181
+16 0.93 0.998553 0.337019
+17 0.99 1.04368 0.412625
+18 1.05 1.01975 0.49572
+19 1.11 0.920346 0.579529
+20 1.17 0.923569 0.672967
+21 1.23 1.03981 0.78923
+22 1.29 0.919256 0.902282
+23 1.35 1.07768 1.04743
+24 1.41 0.983074 1.19187
+25 1.47 1.0273 1.35592
+26 1.53 0.981303 1.52568
+27 1.59 0.992641 1.71113
+28 1.65 0.973176 1.90692
+29 1.71 1.10084 2.14479
+30 1.77 0.99975 2.37625
+31 1.83 0.948243 2.61091
+32 1.89 0.999785 2.87482
+33 1.95 0.962056 3.14515
+34 2.01 1.02494 3.45114
+35 2.07 1.00919 3.77068
+36 2.13 0.983985 4.10057
+37 2.19 0.991187 4.45185
+38 2.25 1.04962 4.84451
+39 2.31 1.01208 5.24358
+40 2.37 0.988127 5.65371
+41 2.43 0.992245 6.08666
+42 2.49 0.973806 6.53281
+43 2.55 1.00794 7.01712
+44 2.61 1.02448 7.53281
+45 2.67 1.02093 8.07061
+46 2.73 1.00245 8.62268
+47 2.79 0.97096 9.18117
+48 2.85 0.98161 9.77033
+49 2.91 0.999115 10.3955
+50 2.97 1.0084 11.0528
+108500 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0.0659362 0.000356633
+6 0.33 0.176796 0.00178317
+7 0.39 0.475052 0.00713267
+8 0.45 0.452189 0.0139087
+9 0.51 0.611657 0.0256776
+10 0.57 0.593669 0.0399429
+11 0.63 0.947808 0.0677603
+12 0.69 1.10431 0.106633
+13 0.75 1.15775 0.154779
+14 0.81 1.11031 0.208631
+15 0.87 1.03899 0.266762
+16 0.93 1.31095 0.350571
+17 0.99 0.989527 0.422254
+18 1.05 0.971608 0.501427
+19 1.11 1.03 0.595221
+20 1.17 0.969395 0.693295
+21 1.23 0.877145 0.791369
+22 1.29 0.997552 0.914051
+23 1.35 0.971766 1.04494
+24 1.41 1.01706 1.19437
+25 1.47 1.034 1.35949
+26 1.53 1.01429 1.53495
+27 1.59 0.971643 1.71648
+28 1.65 0.919997 1.90157
+29 1.71 1.05793 2.13017
+30 1.77 0.984345 2.35806
+31 1.83 0.998681 2.60521
+32 1.89 1.00114 2.86947
+33 1.95 0.981094 3.14515
+34 2.01 1.02255 3.45043
+35 2.07 0.993419 3.76498
+36 2.13 0.955264 4.08524
+37 2.19 0.97408 4.43046
+38 2.25 0.999092 4.80421
+39 2.31 1.03741 5.21327
+40 2.37 0.976098 5.6184
+41 2.43 1.02085 6.06384
+42 2.49 1.0065 6.52496
+43 2.55 0.970085 6.99108
+44 2.61 0.988346 7.48859
+45 2.67 1.00807 8.01961
+46 2.73 1.03224 8.58809
+47 2.79 1.00816 9.16797
+48 2.85 0.959625 9.74394
+49 2.91 1.02476 10.3852
+50 2.97 1.02098 11.0506
+108550 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0.0659362 0.000356633
+6 0.33 0.132597 0.00142653
+7 0.39 0.380042 0.00570613
+8 0.45 0.380791 0.0114123
+9 0.51 0.778472 0.0263909
+10 0.57 0.875662 0.0474322
+11 0.63 0.923505 0.0745364
+12 0.69 0.952338 0.10806
+13 0.75 1.09772 0.153709
+14 0.81 1.15443 0.2097
+15 0.87 1.06449 0.269258
+16 0.93 1.1938 0.345578
+17 0.99 0.964912 0.415478
+18 1.05 0.892829 0.488231
+19 1.11 1.07308 0.585949
+20 1.17 0.955294 0.682596
+21 1.23 1.043 0.799215
+22 1.29 0.927955 0.913338
+23 1.35 1.00089 1.04815
+24 1.41 0.944236 1.18688
+25 1.47 1.06303 1.35663
+26 1.53 0.989549 1.52782
+27 1.59 1.03082 1.7204
+28 1.65 1.02458 1.92653
+29 1.71 0.978707 2.13802
+30 1.77 1.08447 2.38909
+31 1.83 0.991476 2.63445
+32 1.89 0.987625 2.89515
+33 1.95 1.02044 3.18188
+34 2.01 1.02494 3.48787
+35 2.07 0.928092 3.78174
+36 2.13 0.96271 4.10449
+37 2.19 1.00829 4.46184
+38 2.25 1.01434 4.8413
+39 2.31 0.99309 5.23288
+40 2.37 1.01906 5.65585
+41 2.43 1.02494 6.10307
+42 2.49 0.980033 6.55207
+43 2.55 1.00274 7.03388
+44 2.61 0.987637 7.53103
+45 2.67 0.99114 8.05314
+46 2.73 0.970719 8.58773
+47 2.79 1.0001 9.16298
+48 2.85 1.01904 9.77461
+49 2.91 1.00025 10.4005
+50 2.97 1.0188 11.0646
+108600 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0.108706 0.000356633
+5 0.27 0.0659362 0.000713267
+6 0.33 0.309393 0.0032097
+7 0.39 0.285031 0.0064194
+8 0.45 0.475989 0.0135521
+9 0.51 0.648727 0.0260342
+10 0.57 0.86082 0.046719
+11 0.63 0.874899 0.0723966
+12 0.69 1.18536 0.114123
+13 0.75 1.02053 0.156562
+14 0.81 0.941188 0.202211
+15 0.87 1.1346 0.265692
+16 0.93 1.08781 0.335235
+17 0.99 1.02891 0.409772
+18 1.05 1.08102 0.49786
+19 1.11 0.889015 0.578816
+20 1.17 0.955294 0.675464
+21 1.23 0.902661 0.776391
+22 1.29 1.01495 0.901213
+23 1.35 1.03532 1.04066
+24 1.41 0.99521 1.18688
+25 1.47 0.996035 1.34593
+26 1.53 1.01429 1.5214
+27 1.59 0.97737 1.70399
+28 1.65 1.02104 1.90942
+29 1.71 1.01337 2.12839
+30 1.77 0.939673 2.34593
+31 1.83 1.00445 2.59451
+32 1.89 1.04977 2.87161
+33 1.95 1.02425 3.15942
+34 2.01 0.975961 3.45078
+35 2.07 0.981029 3.76141
+36 2.13 1.00952 4.09986
+37 2.19 0.986156 4.44936
+38 2.25 0.995278 4.82168
+39 2.31 1.0157 5.22218
+40 2.37 1.03624 5.65228
+41 2.43 0.986524 6.08274
+42 2.49 0.980033 6.53174
+43 2.55 0.982703 7.00392
+44 2.61 1.00252 7.50856
+45 2.67 1.03108 8.05171
+46 2.73 0.972662 8.58738
+47 2.79 1.0187 9.17332
+48 2.85 1.00835 9.77853
+49 2.91 1.00994 10.4105
+50 2.97 1.02646 11.0795
+108650 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0.108706 0.000356633
+5 0.27 0.0659362 0.000713267
+6 0.33 0.309393 0.0032097
+7 0.39 0.316701 0.00677603
+8 0.45 0.523588 0.014622
+9 0.51 0.611657 0.0263909
+10 0.57 0.831136 0.0463623
+11 0.63 0.801991 0.0699001
+12 0.69 1.05365 0.10699
+13 0.75 0.986231 0.148003
+14 0.81 1.14707 0.203638
+15 0.87 1.12186 0.266405
+16 0.93 1.21054 0.343795
+17 0.99 1.05845 0.420471
+18 1.05 1.00662 0.502496
+19 1.11 0.924262 0.586662
+20 1.17 0.863642 0.674037
+21 1.23 0.956885 0.781027
+22 1.29 1.02655 0.907275
+23 1.35 0.982358 1.03959
+24 1.41 1.01463 1.18866
+25 1.47 1.02953 1.35307
+26 1.53 0.999857 1.52603
+27 1.59 1.05373 1.7229
+28 1.65 1.01749 1.9276
+29 1.71 0.940747 2.13088
+30 1.77 1.08601 2.38231
+31 1.83 0.932391 2.61305
+32 1.89 1.00789 2.8791
+33 1.95 1.01917 3.16548
+34 2.01 0.928178 3.44258
+35 2.07 1.0396 3.77175
+36 2.13 1.04568 4.12233
+37 2.19 0.984143 4.47111
+38 2.25 1.00672 4.84772
+39 2.31 1.02656 5.2525
+40 2.37 1.00961 5.67154
+41 2.43 0.998784 6.10735
+42 2.49 0.980812 6.5567
+43 2.55 1.02872 7.051
+44 2.61 1.00322 7.55599
+45 2.67 0.972184 8.06812
+46 2.73 1.02771 8.63409
+47 2.79 0.97406 9.19437
+48 2.85 0.972697 9.77817
+49 2.91 1.04072 10.4294
+50 2.97 0.993079 11.0767
+108700 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0.220995 0.00178317
+7 0.39 0.253361 0.00463623
+8 0.45 0.452189 0.0114123
+9 0.51 0.426306 0.0196148
+10 0.57 0.786611 0.0385164
+11 0.63 0.996413 0.0677603
+12 0.69 0.962469 0.101641
+13 0.75 1.04626 0.14515
+14 0.81 1.2206 0.204351
+15 0.87 1.1346 0.267832
+16 0.93 1.17149 0.342725
+17 0.99 1.06337 0.419757
+18 1.05 1.05476 0.505706
+19 1.11 0.986924 0.595578
+20 1.17 0.951769 0.691869
+21 1.23 0.909041 0.793509
+22 1.29 0.965654 0.912268
+23 1.35 1.00354 1.04743
+24 1.41 1.02677 1.19829
+25 1.47 1.01837 1.36091
+26 1.53 1.0081 1.53531
+27 1.59 1.02891 1.72753
+28 1.65 0.980267 1.92475
+29 1.71 0.932495 2.12625
+30 1.77 0.987426 2.35485
+31 1.83 1.0203 2.60735
+32 1.89 0.979519 2.86591
+33 1.95 1.01917 3.15228
+34 2.01 1.08108 3.47504
+35 2.07 1.03509 3.80278
+36 2.13 0.98824 4.13409
+37 2.19 0.956974 4.47325
+38 2.25 0.969538 4.83595
+39 2.31 1.00937 5.23395
+40 2.37 1.03281 5.66262
+41 2.43 0.99388 6.09629
+42 2.49 0.994823 6.55207
+43 2.55 1.02204 7.04315
+44 2.61 1.02731 7.56027
+45 2.67 0.958644 8.06526
+46 2.73 1.01475 8.62411
+47 2.79 0.980881 9.1883
+48 2.85 0.995871 9.78602
+49 2.91 1.00595 10.4155
+50 2.97 1.01715 11.0785
+108750 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0.132597 0.0010699
+7 0.39 0.475052 0.0064194
+8 0.45 0.356992 0.0117689
+9 0.51 0.630192 0.0238944
+10 0.57 0.682719 0.0402996
+11 0.63 0.947808 0.068117
+12 0.69 0.982731 0.10271
+13 0.75 1.18348 0.151926
+14 0.81 1.11031 0.205777
+15 0.87 1.19197 0.272468
+16 0.93 1.17149 0.347361
+17 0.99 1.15199 0.430813
+18 1.05 0.923465 0.506063
+19 1.11 0.90468 0.588445
+20 1.17 0.934144 0.682953
+21 1.23 0.883524 0.78174
+22 1.29 0.980153 0.902282
+23 1.35 0.971766 1.03317
+24 1.41 1.02191 1.18331
+25 1.47 1.00274 1.34344
+26 1.53 1.00604 1.51748
+27 1.59 0.904831 1.68652
+28 1.65 1.03699 1.89515
+29 1.71 1.03812 2.11947
+30 1.77 1.04134 2.36056
+31 1.83 1.01886 2.6127
+32 1.89 1.01194 2.87981
+33 1.95 0.984902 3.15656
+34 2.01 1.01658 3.46006
+35 2.07 0.975397 3.7689
+36 2.13 0.977603 4.09665
+37 2.19 1.01031 4.45471
+38 2.25 1.01148 4.8331
+39 2.31 1.0365 5.2418
+40 2.37 1.03882 5.67297
+41 2.43 0.99388 6.10663
+42 2.49 0.980812 6.55599
+43 2.55 0.97157 7.02282
+44 2.61 1.00181 7.5271
+45 2.67 1.05884 8.08488
+46 2.73 1.00957 8.64087
+47 2.79 1.03544 9.23645
+48 2.85 1.01964 9.84843
+49 2.91 0.993415 10.47
+50 2.97 0.958061 11.0945
+108800 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0.176796 0.00142653
+7 0.39 0.348371 0.0053495
+8 0.45 0.356992 0.010699
+9 0.51 0.537517 0.0210414
+10 0.57 0.816295 0.0406562
+11 0.63 0.923505 0.0677603
+12 0.69 0.911813 0.0998573
+13 0.75 0.960503 0.1398
+14 0.81 1.16178 0.196148
+15 0.87 1.16647 0.261412
+16 0.93 1.08223 0.330599
+17 0.99 1.12245 0.411912
+18 1.05 1.00224 0.493581
+19 1.11 0.979091 0.582739
+20 1.17 1.00817 0.684736
+21 1.23 0.91542 0.78709
+22 1.29 0.930855 0.901569
+23 1.35 0.992949 1.03531
+24 1.41 0.99521 1.18153
+25 1.47 1.01837 1.34415
+26 1.53 0.942134 1.50713
+27 1.59 0.990732 1.69223
+28 1.65 1.09194 1.91191
+29 1.71 1.01337 2.13088
+30 1.77 0.993588 2.36091
+31 1.83 1.04912 2.62054
+32 1.89 0.987625 2.88124
+33 1.95 1.04455 3.17475
+34 2.01 0.964015 3.46255
+35 2.07 1.01369 3.78352
+36 2.13 0.965901 4.10735
+37 2.19 1.02138 4.46933
+38 2.25 1.01816 4.85021
+39 2.31 0.963243 5.23003
+40 2.37 1.02765 5.65656
+41 2.43 1.04129 6.11091
+42 2.49 1.00883 6.57311
+43 2.55 0.997548 7.05243
+44 2.61 0.971342 7.54137
+45 2.67 1.0013 8.06883
+46 2.73 0.993385 8.61591
+47 2.79 1.02366 9.20471
+48 2.85 0.973886 9.78923
+49 2.91 1.03274 10.4354
+50 2.97 0.989249 11.0802
+108850 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0.0659362 0.000356633
+6 0.33 0.132597 0.00142653
+7 0.39 0.253361 0.0042796
+8 0.45 0.571187 0.0128388
+9 0.51 0.463376 0.0217546
+10 0.57 0.682719 0.0381598
+11 0.63 0.923505 0.0652639
+12 0.69 1.09418 0.10378
+13 0.75 0.994807 0.14515
+14 0.81 1.16913 0.201854
+15 0.87 1.16647 0.267118
+16 0.93 0.89814 0.324536
+17 0.99 1.00922 0.397646
+18 1.05 0.967231 0.476462
+19 1.11 0.920346 0.560271
+20 1.17 1.03285 0.664765
+21 1.23 0.99835 0.776391
+22 1.29 0.962754 0.894793
+23 1.35 1.06709 1.03852
+24 1.41 1.01463 1.18759
+25 1.47 0.991569 1.34593
+26 1.53 1.03284 1.52461
+27 1.59 0.952554 1.70257
+28 1.65 1.04231 1.91227
+29 1.71 0.978707 2.12375
+30 1.77 1.01978 2.35984
+31 1.83 1.01597 2.61127
+32 1.89 1.03086 2.88338
+33 1.95 0.995056 3.16298
+34 2.01 0.909065 3.43438
+35 2.07 1.02496 3.75892
+36 2.13 1.03079 4.10449
+37 2.19 0.9932 4.45649
+38 2.25 1.03246 4.84272
+39 2.31 1.01027 5.24108
+40 2.37 1.0457 5.67511
+41 2.43 0.989793 6.10699
+42 2.49 1.01818 6.57347
+43 2.55 0.976765 7.0428
+44 2.61 1.0096 7.551
+45 2.67 1.02296 8.08987
+46 2.73 0.992737 8.63659
+47 2.79 1.03606 9.23252
+48 2.85 0.954871 9.80563
+49 2.91 1.01564 10.4412
+50 2.97 1.00074 11.0934
+108900 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0.21169 0.000356633
+4 0.21 0 0.000356633
+5 0.27 0.0659362 0.000713267
+6 0.33 0.176796 0.0021398
+7 0.39 0.316701 0.00570613
+8 0.45 0.499788 0.0131954
+9 0.51 0.815542 0.0288873
+10 0.57 0.697561 0.0456491
+11 0.63 0.729083 0.0670471
+12 0.69 1.22588 0.1102
+13 0.75 1.02911 0.152996
+14 0.81 1.19119 0.21077
+15 0.87 0.975249 0.265335
+16 0.93 1.13802 0.338088
+17 0.99 1.00922 0.411198
+18 1.05 1.05914 0.497504
+19 1.11 1.02217 0.590585
+20 1.17 0.955294 0.687233
+21 1.23 1.01749 0.800999
+22 1.29 0.893157 0.910842
+23 1.35 0.974414 1.04208
+24 1.41 0.912681 1.17618
+25 1.47 1.101 1.352
+26 1.53 1.14417 1.54993
+27 1.59 1.00219 1.73716
+28 1.65 0.98913 1.93616
+29 1.71 1.01007 2.15442
+30 1.77 1.00283 2.38659
+31 1.83 1.05633 2.648
+32 1.89 1.00519 2.91334
+33 1.95 0.945557 3.17903
+34 2.01 0.966405 3.46755
+35 2.07 0.997924 3.78352
+36 2.13 1.04143 4.13267
+37 2.19 1.01433 4.49215
+38 2.25 0.978118 4.85806
+39 2.31 1.01299 5.25749
+40 2.37 1.04398 5.6908
+41 2.43 1.01758 6.13481
+42 2.49 0.970692 6.57953
+43 2.55 0.976023 7.0485
+44 2.61 1.02944 7.56669
+45 2.67 0.985047 8.08559
+46 2.73 1.00828 8.64087
+47 2.79 0.97654 9.20257
+48 2.85 0.981016 9.79137
+49 2.91 0.987146 10.4091
+50 2.97 1.00074 11.0613
+108950 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0.0659362 0.000356633
+6 0.33 0.132597 0.00142653
+7 0.39 0.253361 0.0042796
+8 0.45 0.404591 0.0103424
+9 0.51 0.630192 0.0224679
+10 0.57 0.742086 0.0402996
+11 0.63 0.874899 0.0659772
+12 0.69 1.12457 0.105563
+13 0.75 1.2092 0.155849
+14 0.81 1.0809 0.208274
+15 0.87 1.1346 0.271755
+16 0.93 1.04318 0.338445
+17 0.99 1.11753 0.419401
+18 1.05 1.03288 0.503566
+19 1.11 1.00259 0.594864
+20 1.17 0.955294 0.691512
+21 1.23 0.924989 0.794936
+22 1.29 0.925055 0.908702
+23 1.35 0.995597 1.0428
+24 1.41 0.985501 1.18759
+25 1.47 1.04293 1.35414
+26 1.53 0.942134 1.51712
+27 1.59 1.03464 1.71041
+28 1.65 0.95545 1.90264
+29 1.71 1.08433 2.13695
+30 1.77 0.99975 2.3684
+31 1.83 0.964095 2.60699
+32 1.89 1.01059 2.87375
+33 1.95 0.963326 3.14444
+34 2.01 0.979545 3.43688
+35 2.07 1.00356 3.75464
+36 2.13 0.998878 4.08951
+37 2.19 0.990181 4.44044
+38 2.25 1.01816 4.82133
+39 2.31 1.02022 5.22361
+40 2.37 0.991564 5.63516
+41 2.43 0.994697 6.06919
+42 2.49 0.951232 6.50499
+43 2.55 0.970085 6.97111
+44 2.61 1.02235 7.48573
+45 2.67 0.994525 8.00963
+46 2.73 1.05167 8.5888
+47 2.79 0.997621 9.16262
+48 2.85 0.955466 9.73609
+49 2.91 0.994555 10.3584
+50 2.97 1.01223 11.0182
+109000 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0.108706 0.000356633
+5 0.27 0 0.000356633
+6 0.33 0.265194 0.00249643
+7 0.39 0.380042 0.00677603
+8 0.45 0.404591 0.0128388
+9 0.51 0.518981 0.0228245
+10 0.57 0.756928 0.0410128
+11 0.63 0.753385 0.0631241
+12 0.69 1.02326 0.0991441
+13 0.75 1.20063 0.149073
+14 0.81 1.18384 0.206491
+15 0.87 1.1601 0.271398
+16 0.93 1.1157 0.342725
+17 0.99 1.10768 0.422967
+18 1.05 0.919089 0.49786
+19 1.11 1.00259 0.589158
+20 1.17 0.923569 0.682596
+21 1.23 0.956885 0.789586
+22 1.29 0.997552 0.912268
+23 1.35 1.03796 1.05207
+24 1.41 0.997638 1.19864
+25 1.47 1.00274 1.35877
+26 1.53 0.989549 1.52996
+27 1.59 0.971643 1.71148
+28 1.65 0.95545 1.90371
+29 1.71 0.983658 2.11626
+30 1.77 1.04904 2.35913
+31 1.83 0.972742 2.59986
+32 1.89 0.995731 2.8627
+33 1.95 0.951903 3.13017
+34 2.01 1.07272 3.45043
+35 2.07 1.04973 3.78281
+36 2.13 0.968029 4.10735
+37 2.19 1.06263 4.48395
+38 2.25 1.00004 4.85806
+39 2.31 0.939728 5.2286
+40 2.37 1.00961 5.64765
+41 2.43 0.957917 6.06562
+42 2.49 1.01662 6.53138
+43 2.55 0.981219 7.00285
+44 2.61 1.0181 7.51534
+45 2.67 1.00603 8.04529
+46 2.73 0.992089 8.59165
+47 2.79 1.02924 9.18367
+48 2.85 0.991712 9.77889
+49 2.91 0.988856 10.3976
+50 2.97 0.989796 11.0428
+109050 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0.0659362 0.000356633
+6 0.33 0.220995 0.0021398
+7 0.39 0.126681 0.00356633
+8 0.45 0.547387 0.0117689
+9 0.51 0.556052 0.0224679
+10 0.57 0.682719 0.038873
+11 0.63 1.05717 0.0699001
+12 0.69 1.07391 0.107703
+13 0.75 1.02911 0.150499
+14 0.81 1.26472 0.21184
+15 0.87 1.08998 0.272825
+16 0.93 1.04876 0.339872
+17 0.99 1.16183 0.424037
+18 1.05 0.945348 0.50107
+19 1.11 0.912513 0.584165
+20 1.17 0.944719 0.679743
+21 1.23 0.944126 0.785307
+22 1.29 1.00335 0.908702
+23 1.35 0.969118 1.03923
+24 1.41 0.961228 1.18046
+25 1.47 0.996035 1.33951
+26 1.53 1.02872 1.51748
+27 1.59 1.01555 1.7072
+28 1.65 1.02104 1.91262
+29 1.71 1.04307 2.13802
+30 1.77 0.987426 2.36662
+31 1.83 0.995799 2.61305
+32 1.89 0.9552 2.86519
+33 1.95 1.02552 3.15335
+34 2.01 0.983128 3.44686
+35 2.07 0.958503 3.75036
+36 2.13 0.994623 4.08381
+37 2.19 0.995212 4.43652
+38 2.25 1.00958 4.81419
+39 2.31 1.05098 5.2286
+40 2.37 1.00102 5.64408
+41 2.43 0.993062 6.07739
+42 2.49 1.00105 6.53602
+43 2.55 1.00423 7.01854
+44 2.61 1.00889 7.52639
+45 2.67 0.978277 8.04173
+46 2.73 0.976547 8.57953
+47 2.79 0.998241 9.15371
+48 2.85 1.01132 9.7607
+49 2.91 0.992845 10.382
+50 2.97 0.975023 11.0175
+109100 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0.21169 0.000356633
+4 0.21 0 0.000356633
+5 0.27 0.0659362 0.000713267
+6 0.33 0.220995 0.00249643
+7 0.39 0.348371 0.0064194
+8 0.45 0.42839 0.0128388
+9 0.51 0.611657 0.0246077
+10 0.57 0.786611 0.0435093
+11 0.63 0.911353 0.0702568
+12 0.69 0.911813 0.102354
+13 0.75 1.08914 0.147646
+14 0.81 1.08825 0.200428
+15 0.87 1.1601 0.265335
+16 0.93 1.05992 0.333096
+17 0.99 1.15199 0.416548
+18 1.05 0.975984 0.496077
+19 1.11 0.971258 0.584522
+20 1.17 1.02932 0.688659
+21 1.23 0.921799 0.791726
+22 1.29 0.994652 0.914051
+23 1.35 1.00619 1.04957
+24 1.41 1.01948 1.19936
+25 1.47 0.955837 1.352
+26 1.53 0.973057 1.52033
+27 1.59 1.03082 1.71291
+28 1.65 1.06181 1.92653
+29 1.71 0.942398 2.13017
+30 1.77 1.03364 2.36947
+31 1.83 0.99724 2.61626
+32 1.89 0.987625 2.87696
+33 1.95 0.943018 3.14194
+34 2.01 0.999852 3.44044
+35 2.07 0.984408 3.75214
+36 2.13 1.04249 4.10164
+37 2.19 0.988168 4.45185
+38 2.25 1.05248 4.84558
+39 2.31 0.980428 5.23217
+40 2.37 0.988127 5.6423
+41 2.43 1.00287 6.07989
+42 2.49 1.02285 6.5485
+43 2.55 1.00794 7.03281
+44 2.61 1.00747 7.53994
+45 2.67 1.0128 8.07347
+46 2.73 1.00957 8.62946
+47 2.79 0.9753 9.19044
+48 2.85 0.976857 9.77675
+49 2.91 0.984866 10.393
+50 2.97 1.01934 11.0574
+109150 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0.108706 0.000356633
+5 0.27 0 0.000356633
+6 0.33 0.0883979 0.0010699
+7 0.39 0.316701 0.00463623
+8 0.45 0.42839 0.0110556
+9 0.51 0.611657 0.0228245
+10 0.57 0.653036 0.0385164
+11 0.63 0.729083 0.0599144
+12 0.69 0.992863 0.0948645
+13 0.75 1.12345 0.141583
+14 0.81 1.19119 0.199358
+15 0.87 1.15373 0.263909
+16 0.93 1.10455 0.334522
+17 0.99 1.13722 0.416904
+18 1.05 1.011 0.499287
+19 1.11 0.975175 0.588088
+20 1.17 0.909468 0.6801
+21 1.23 1.0143 0.793509
+22 1.29 0.948254 0.910128
+23 1.35 0.958527 1.03923
+24 1.41 0.990356 1.18474
+25 1.47 1.0809 1.35735
+26 1.53 0.997796 1.52996
+27 1.59 0.996459 1.71612
+28 1.65 1.07422 1.93224
+29 1.71 0.985309 2.14515
+30 1.77 1.02594 2.38267
+31 1.83 0.974183 2.62375
+32 1.89 0.964657 2.87839
+33 1.95 0.970941 3.15121
+34 2.01 0.979545 3.44365
+35 2.07 1.04298 3.77389
+36 2.13 0.98824 4.10521
+37 2.19 1.00427 4.46113
+38 2.25 1.0172 4.84165
+39 2.31 1.07449 5.26534
+40 2.37 1.04656 5.69971
+41 2.43 0.963638 6.12019
+42 2.49 0.973806 6.56633
+43 2.55 0.981961 7.03816
+44 2.61 0.991888 7.53745
+45 2.67 1.00062 8.06455
+46 2.73 0.984966 8.60699
+47 2.79 1.00134 9.18295
+48 2.85 0.994088 9.7796
+49 2.91 1.00823 10.4105
+50 2.97 1.00074 11.0628
+109200 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0.21169 0.000356633
+4 0.21 0.108706 0.000713267
+5 0.27 0.131872 0.00142653
+6 0.33 0.0883979 0.0021398
+7 0.39 0.285031 0.0053495
+8 0.45 0.261794 0.00927247
+9 0.51 0.797007 0.0246077
+10 0.57 0.727244 0.0420827
+11 0.63 0.78984 0.0652639
+12 0.69 0.992863 0.100214
+13 0.75 1.1406 0.147646
+14 0.81 1.27207 0.209344
+15 0.87 1.23022 0.278174
+16 0.93 1.01529 0.343081
+17 0.99 1.05353 0.419401
+18 1.05 0.967231 0.498217
+19 1.11 0.916429 0.581669
+20 1.17 0.976445 0.680456
+21 1.23 0.950506 0.786733
+22 1.29 0.942455 0.902639
+23 1.35 1.02472 1.04066
+24 1.41 0.956373 1.18117
+25 1.47 1.00943 1.34237
+26 1.53 1.04315 1.52282
+27 1.59 1.01555 1.71255
+28 1.65 0.992675 1.91227
+29 1.71 1.02987 2.13481
+30 1.77 1.04596 2.37696
+31 1.83 0.978506 2.61912
+32 1.89 0.982221 2.87839
+33 1.95 0.973479 3.15193
+34 2.01 0.966405 3.44044
+35 2.07 0.929218 3.73466
+36 2.13 1.01803 4.07596
+37 2.19 1.00326 4.43153
+38 2.25 0.997185 4.80456
+39 2.31 0.978619 5.19044
+40 2.37 1.01304 5.61091
+41 2.43 1.01922 6.05563
+42 2.49 0.977698 6.50357
+43 2.55 0.992352 6.98039
+44 2.61 0.986929 7.47718
+45 2.67 1.00333 8.00571
+46 2.73 0.981081 8.54601
+47 2.79 1.03296 9.14016
+48 2.85 1.02439 9.75499
+49 2.91 1.00709 10.3852
+50 2.97 1.01989 11.0499
+109250 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0.0659362 0.000356633
+6 0.33 0.176796 0.00178317
+7 0.39 0.190021 0.00392297
+8 0.45 0.333192 0.00891583
+9 0.51 0.759937 0.0235378
+10 0.57 0.667877 0.0395863
+11 0.63 0.874899 0.0652639
+12 0.69 1.18536 0.10699
+13 0.75 1.10629 0.152996
+14 0.81 1.2206 0.212197
+15 0.87 1.15373 0.276748
+16 0.93 1.07107 0.345221
+17 0.99 1.03876 0.420471
+18 1.05 0.932218 0.496434
+19 1.11 0.998673 0.587375
+20 1.17 1.0399 0.692582
+21 1.23 0.934558 0.797076
+22 1.29 0.936655 0.912268
+23 1.35 0.977062 1.04387
+24 1.41 0.96851 1.18616
+25 1.47 0.946903 1.33738
+26 1.53 0.989549 1.50856
+27 1.59 1.04991 1.70471
+28 1.65 0.994448 1.90478
+29 1.71 1.02492 2.12625
+30 1.77 1.03056 2.36484
+31 1.83 1.01165 2.61519
+32 1.89 1.0187 2.88409
+33 1.95 0.959518 3.15371
+34 2.01 0.942513 3.43509
+35 2.07 1.00356 3.75285
+36 2.13 1.02228 4.09558
+37 2.19 0.996218 4.44864
+38 2.25 1.00195 4.82347
+39 2.31 1.05007 5.23752
+40 2.37 0.954617 5.63374
+41 2.43 1.03638 6.08595
+42 2.49 0.986261 6.5378
+43 2.55 0.981961 7.00963
+44 2.61 1.00818 7.51712
+45 2.67 1.00739 8.04779
+46 2.73 0.988204 8.59201
+47 2.79 0.97778 9.15442
+48 2.85 1.04044 9.77889
+49 2.91 0.964348 10.3823
+50 2.97 1.04287 11.0621
+109300 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0.217411 0.000713267
+5 0.27 0.0659362 0.0010699
+6 0.33 0.353592 0.00392297
+7 0.39 0.158351 0.00570613
+8 0.45 0.356992 0.0110556
+9 0.51 0.574587 0.0221113
+10 0.57 0.742086 0.0399429
+11 0.63 1.00856 0.0695435
+12 0.69 1.06378 0.10699
+13 0.75 1.05484 0.150856
+14 0.81 1.07354 0.202924
+15 0.87 1.09636 0.264265
+16 0.93 1.1157 0.335592
+17 0.99 1.0683 0.412981
+18 1.05 0.993491 0.493937
+19 1.11 0.971258 0.582382
+20 1.17 0.944719 0.67796
+21 1.23 0.947316 0.78388
+22 1.29 0.951154 0.900856
+23 1.35 0.992949 1.03459
+24 1.41 1.03648 1.18688
+25 1.47 0.949137 1.33845
+26 1.53 0.962749 1.50499
+27 1.59 1.07663 1.70613
+28 1.65 0.999766 1.90728
+29 1.71 1.00841 2.12518
+30 1.77 1.09064 2.37767
+31 1.83 1.01021 2.62767
+32 1.89 0.986274 2.88802
+33 1.95 0.977287 3.16262
+34 2.01 0.968794 3.45185
+35 2.07 0.991166 3.76569
+36 2.13 0.978666 4.09379
+37 2.19 1.00226 4.449
+38 2.25 1.00004 4.82311
+39 2.31 1.00123 5.2179
+40 2.37 1.00961 5.63695
+41 2.43 1.00042 6.07347
+42 2.49 1.00261 6.53281
+43 2.55 1.01462 7.02033
+44 2.61 0.987637 7.51748
+45 2.67 0.982339 8.03495
+46 2.73 0.966834 8.5674
+47 2.79 0.997001 9.14087
+48 2.85 0.992306 9.73645
+49 2.91 1.02989 10.3809
+50 2.97 1.01661 11.0435
+109350 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0.176796 0.00142653
+7 0.39 0.253361 0.0042796
+8 0.45 0.452189 0.0110556
+9 0.51 0.889683 0.028174
+10 0.57 0.727244 0.0456491
+11 0.63 0.765537 0.068117
+12 0.69 1.02326 0.104137
+13 0.75 1.09772 0.149786
+14 0.81 1.17648 0.206847
+15 0.87 1.14735 0.271041
+16 0.93 1.14917 0.344508
+17 0.99 0.99445 0.416548
+18 1.05 1.17731 0.512482
+19 1.11 0.983008 0.601997
+20 1.17 0.835442 0.686519
+21 1.23 0.963264 0.794223
+22 1.29 0.983053 0.915121
+23 1.35 0.873795 1.03281
+24 1.41 0.944236 1.17154
+25 1.47 0.953603 1.32382
+26 1.53 1.0349 1.50285
+27 1.59 1.03655 1.6965
+28 1.65 1.04408 1.90656
+29 1.71 0.980357 2.1184
+30 1.77 1.07061 2.36626
+31 1.83 0.991476 2.61163
+32 1.89 0.963306 2.86591
+33 1.95 0.995056 3.14551
+34 2.01 1.02972 3.45292
+35 2.07 1.00243 3.77033
+36 2.13 0.997814 4.10485
+37 2.19 0.953955 4.44294
+38 2.25 1.01434 4.8224
+39 2.31 1.05188 5.23716
+40 2.37 0.995001 5.65014
+41 2.43 0.983254 6.07917
+42 2.49 0.963686 6.52068
+43 2.55 1.01981 7.0107
+44 2.61 0.975593 7.50178
+45 2.67 1.02025 8.03923
+46 2.73 1.00116 8.59058
+47 2.79 1.03544 9.18616
+48 2.85 1.00716 9.79066
+49 2.91 0.990566 10.4105
+50 2.97 0.984325 11.0521
+109400 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0.197809 0.0010699
+6 0.33 0.265194 0.0032097
+7 0.39 0.285031 0.0064194
+8 0.45 0.523588 0.0142653
+9 0.51 0.685797 0.0274608
+10 0.57 0.712403 0.0445792
+11 0.63 0.826294 0.0688302
+12 0.69 1.01313 0.104494
+13 0.75 1.16633 0.152996
+14 0.81 1.0809 0.205421
+15 0.87 1.17285 0.271041
+16 0.93 1.21054 0.348431
+17 0.99 0.99445 0.420471
+18 1.05 0.954101 0.498217
+19 1.11 0.955593 0.585235
+20 1.17 1.00817 0.687233
+21 1.23 0.982402 0.797076
+22 1.29 0.974353 0.916904
+23 1.35 0.969118 1.04743
+24 1.41 1.06803 1.20435
+25 1.47 1.0139 1.36626
+26 1.53 0.966872 1.53352
+27 1.59 1.03846 1.72753
+28 1.65 0.973176 1.92332
+29 1.71 0.963853 2.1316
+30 1.77 1.02132 2.36805
+31 1.83 1.02606 2.62197
+32 1.89 0.993029 2.88409
+33 1.95 0.917634 3.14194
+34 2.01 0.931762 3.42011
+35 2.07 1.00919 3.73966
+36 2.13 1.00952 4.0781
+37 2.19 1.03949 4.4465
+38 2.25 0.927592 4.79351
+39 2.31 1.01751 5.19472
+40 2.37 1.00789 5.61305
+41 2.43 1.05681 6.07418
+42 2.49 1.01818 6.54066
+43 2.55 1.02427 7.03281
+44 2.61 1.02235 7.54743
+45 2.67 0.943073 8.04422
+46 2.73 0.999213 8.59451
+47 2.79 0.97096 9.153
+48 2.85 0.991117 9.74786
+49 2.91 1.01108 10.3805
+50 2.97 1.00074 11.0328
+109450 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0.329681 0.00178317
+6 0.33 0.044199 0.0021398
+7 0.39 0.316701 0.00570613
+8 0.45 0.404591 0.0117689
+9 0.51 0.463376 0.0206847
+10 0.57 0.771769 0.0392297
+11 0.63 0.947808 0.0670471
+12 0.69 1.21575 0.109843
+13 0.75 1.19205 0.159415
+14 0.81 1.11031 0.213267
+15 0.87 1.12823 0.276391
+16 0.93 1.05992 0.344151
+17 0.99 1.18152 0.429743
+18 1.05 0.945348 0.506776
+19 1.11 0.951677 0.593438
+20 1.17 0.909468 0.685449
+21 1.23 0.931368 0.789586
+22 1.29 0.985953 0.910842
+23 1.35 0.950583 1.03887
+24 1.41 1.07774 1.19722
+25 1.47 1.0474 1.36448
+26 1.53 0.960688 1.53067
+27 1.59 1.00982 1.71933
+28 1.65 0.939496 1.90835
+29 1.71 0.98861 2.12197
+30 1.77 1.02132 2.35842
+31 1.83 1.01309 2.60913
+32 1.89 1.00519 2.87447
+33 1.95 0.962056 3.14479
+34 2.01 1.02374 3.45043
+35 2.07 1.00693 3.76926
+36 2.13 0.960582 4.0913
+37 2.19 0.968043 4.43438
+38 2.25 1.01339 4.81348
+39 2.31 1.00485 5.2097
+40 2.37 1.02078 5.63338
+41 2.43 0.980802 6.06134
+42 2.49 1.01895 6.52817
+43 2.55 0.941139 6.98039
+44 2.61 0.994722 7.4811
+45 2.67 1.0189 8.01783
+46 2.73 0.996622 8.56669
+47 2.79 1.04412 9.16726
+48 2.85 0.988741 9.7607
+49 2.91 0.981446 10.3748
+50 2.97 1.00676 11.031
+109500 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0.108706 0.000356633
+5 0.27 0 0.000356633
+6 0.33 0.353592 0.0032097
+7 0.39 0.285031 0.0064194
+8 0.45 0.380791 0.0121255
+9 0.51 0.537517 0.0224679
+10 0.57 0.742086 0.0402996
+11 0.63 0.923505 0.0674037
+12 0.69 1.16509 0.108417
+13 0.75 0.977655 0.149073
+14 0.81 1.03678 0.199358
+15 0.87 1.19197 0.266049
+16 0.93 1.08223 0.335235
+17 0.99 0.984604 0.406562
+18 1.05 1.05914 0.492867
+19 1.11 0.986924 0.582739
+20 1.17 1.00817 0.684736
+21 1.23 0.91861 0.787447
+22 1.29 0.985953 0.908702
+23 1.35 0.945288 1.03602
+24 1.41 1.01948 1.18581
+25 1.47 0.996035 1.34486
+26 1.53 0.964811 1.51177
+27 1.59 1.02128 1.70257
+28 1.65 0.994448 1.90264
+29 1.71 0.968804 2.11198
+30 1.77 1.00437 2.34451
+31 1.83 1.04047 2.602
+32 1.89 0.983572 2.86163
+33 1.95 1.00267 3.14337
+34 2.01 1.05361 3.45792
+35 2.07 1.02496 3.78245
+36 2.13 0.942498 4.09843
+37 2.19 0.992193 4.45007
+38 2.25 0.998138 4.82347
+39 2.31 0.962339 5.20292
+40 2.37 1.03195 5.63124
+41 2.43 1.00205 6.06847
+42 2.49 0.985482 6.51997
+43 2.55 0.965632 6.98395
+44 2.61 0.974176 7.47432
+45 2.67 0.9776 7.9893
+46 2.73 1.04325 8.56384
+47 2.79 0.97282 9.1234
+48 2.85 1.02142 9.73645
+49 2.91 1.0088 10.3677
+50 2.97 0.989796 11.0128
+109550 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0.108706 0.000356633
+5 0.27 0.131872 0.0010699
+6 0.33 0.265194 0.0032097
+7 0.39 0.348371 0.00713267
+8 0.45 0.547387 0.0153352
+9 0.51 0.611657 0.0271041
+10 0.57 0.831136 0.0470756
+11 0.63 0.716931 0.068117
+12 0.69 1.03339 0.104494
+13 0.75 1.06341 0.148716
+14 0.81 1.2206 0.207917
+15 0.87 1.19835 0.274964
+16 0.93 1.21612 0.35271
+17 0.99 1.02891 0.427247
+18 1.05 1.00224 0.508916
+19 1.11 0.912513 0.592011
+20 1.17 0.937669 0.686876
+21 1.23 0.937747 0.791726
+22 1.29 1.01205 0.916191
+23 1.35 0.982358 1.0485
+24 1.41 0.973364 1.19151
+25 1.47 0.991569 1.34986
+26 1.53 1.02253 1.52675
+27 1.59 1.00028 1.71362
+28 1.65 0.971403 1.90906
+29 1.71 1.01007 2.12732
+30 1.77 0.981265 2.35449
+31 1.83 1.03039 2.60949
+32 1.89 1.04572 2.88552
+33 1.95 0.983633 3.16191
+34 2.01 0.967599 3.45078
+35 2.07 0.986661 3.7632
+36 2.13 1.01696 4.10414
+37 2.19 1.01735 4.46469
+38 2.25 1.0029 4.83987
+39 2.31 1.01118 5.23859
+40 2.37 1.00187 5.65442
+41 2.43 0.961186 6.07382
+42 2.49 0.993266 6.52889
+43 2.55 0.988641 7.00392
+44 2.61 0.976301 7.49536
+45 2.67 1.01145 8.02817
+46 2.73 1.01022 8.58452
+47 2.79 0.998861 9.15906
+48 2.85 1.02796 9.77603
+49 2.91 1.01621 10.4119
+50 2.97 0.992532 11.0588
+109600 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0.108706 0.000356633
+5 0.27 0 0.000356633
+6 0.33 0.0883979 0.0010699
+7 0.39 0.221691 0.00356633
+8 0.45 0.452189 0.0103424
+9 0.51 0.759937 0.0249643
+10 0.57 0.697561 0.0417261
+11 0.63 0.801991 0.0652639
+12 0.69 1.04352 0.101997
+13 0.75 1.08914 0.14729
+14 0.81 1.2059 0.205777
+15 0.87 1.1601 0.270685
+16 0.93 1.14917 0.344151
+17 0.99 0.959989 0.413695
+18 1.05 0.940972 0.490371
+19 1.11 1.02217 0.583452
+20 1.17 0.920044 0.676534
+21 1.23 0.966454 0.784593
+22 1.29 0.988852 0.906205
+23 1.35 0.926753 1.03103
+24 1.41 0.941809 1.1694
+25 1.47 0.987102 1.32703
+26 1.53 1.09263 1.51605
+27 1.59 1.05564 1.71327
+28 1.65 1.04763 1.92404
+29 1.71 0.995211 2.13909
+30 1.77 1.01053 2.37304
+31 1.83 0.948243 2.6077
+32 1.89 1.02545 2.87839
+33 1.95 1.02425 3.16619
+34 2.01 0.99149 3.4622
+35 2.07 1.0013 3.77924
+36 2.13 1.0159 4.11983
+37 2.19 0.981124 4.46755
+38 2.25 0.986698 4.83666
+39 2.31 1.00937 5.23466
+40 2.37 0.997579 5.64872
+41 2.43 1.0421 6.10342
+42 2.49 0.974584 6.54993
+43 2.55 0.996063 7.02853
+44 2.61 0.963548 7.51355
+45 2.67 1.00333 8.04208
+46 2.73 0.972662 8.57775
+47 2.79 0.999481 9.15264
+48 2.85 0.98577 9.74429
+49 2.91 1.02305 10.3845
+50 2.97 0.99089 11.0303
+109650 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0.0883979 0.000713267
+7 0.39 0.316701 0.0042796
+8 0.45 0.333192 0.00927247
+9 0.51 0.500446 0.0189016
+10 0.57 0.86082 0.0395863
+11 0.63 0.753385 0.0616976
+12 0.69 1.20562 0.104137
+13 0.75 1.02053 0.146576
+14 0.81 1.2059 0.205064
+15 0.87 1.1856 0.271398
+16 0.93 1.00971 0.335949
+17 0.99 1.14706 0.419044
+18 1.05 0.923465 0.494294
+19 1.11 0.90468 0.576676
+20 1.17 0.902418 0.667974
+21 1.23 1.01111 0.781027
+22 1.29 0.945354 0.89729
+23 1.35 0.961175 1.02675
+24 1.41 1.01948 1.17653
+25 1.47 1.00497 1.33702
+26 1.53 0.999857 1.50999
+27 1.59 1.03082 1.70257
+28 1.65 0.999766 1.90371
+29 1.71 0.985309 2.11662
+30 1.77 0.99975 2.34807
+31 1.83 1.052 2.60842
+32 1.89 0.978168 2.86662
+33 1.95 0.98871 3.14444
+34 2.01 0.956848 3.4301
+35 2.07 0.984408 3.7418
+36 2.13 0.974411 4.06847
+37 2.19 0.979112 4.41548
+38 2.25 1.01625 4.79565
+39 2.31 1.01751 5.19686
+40 2.37 0.97352 5.60093
+41 2.43 1.00777 6.04066
+42 2.49 1.01428 6.50535
+43 2.55 1.02353 6.99715
+44 2.61 0.998973 7.5
+45 2.67 1.00603 8.02996
+46 2.73 1.01929 8.5913
+47 2.79 0.979021 9.15442
+48 2.85 0.942988 9.7204
+49 2.91 0.971757 10.3285
+50 2.97 1.00512 10.9836
+109700 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0.108706 0.000356633
+5 0.27 0 0.000356633
+6 0.33 0.176796 0.00178317
+7 0.39 0.190021 0.00392297
+8 0.45 0.309393 0.0085592
+9 0.51 0.593122 0.0199715
+10 0.57 0.86082 0.0406562
+11 0.63 0.838445 0.0652639
+12 0.69 1.04352 0.101997
+13 0.75 1.13202 0.149073
+14 0.81 1.17648 0.206134
+15 0.87 1.24934 0.276034
+16 0.93 1.12128 0.347718
+17 0.99 1.05353 0.424037
+18 1.05 1.00224 0.505706
+19 1.11 0.955593 0.592725
+20 1.17 0.881268 0.681883
+21 1.23 0.982402 0.791726
+22 1.29 0.913456 0.904066
+23 1.35 0.977062 1.03566
+24 1.41 1.03648 1.18795
+25 1.47 0.940204 1.33809
+26 1.53 0.989549 1.50927
+27 1.59 0.988823 1.69401
+28 1.65 1.00508 1.89622
+29 1.71 0.986959 2.10949
+30 1.77 1.0398 2.35021
+31 1.83 1.03471 2.60628
+32 1.89 0.99438 2.86876
+33 1.95 1.01156 3.153
+34 2.01 0.977156 3.44472
+35 2.07 0.937102 3.74144
+36 2.13 0.987177 4.0724
+37 2.19 1.02943 4.43723
+38 2.25 1.03436 4.82418
+39 2.31 1.0347 5.23217
+40 2.37 0.971801 5.63552
+41 2.43 1.00369 6.07347
+42 2.49 1.03919 6.54957
+43 2.55 0.965632 7.01355
+44 2.61 0.973467 7.50357
+45 2.67 0.999941 8.03031
+46 2.73 0.990794 8.57596
+47 2.79 0.96476 9.13088
+48 2.85 1.01429 9.73966
+49 2.91 0.972327 10.3481
+50 2.97 1.04342 11.0282
+109750 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0.197809 0.0010699
+6 0.33 0.176796 0.00249643
+7 0.39 0.475052 0.00784593
+8 0.45 0.475989 0.0149786
+9 0.51 0.500446 0.0246077
+10 0.57 0.905345 0.0463623
+11 0.63 0.887051 0.0723966
+12 0.69 0.89155 0.10378
+13 0.75 0.969079 0.14408
+14 0.81 1.37502 0.21077
+15 0.87 1.21747 0.278887
+16 0.93 1.18264 0.354494
+17 0.99 0.979681 0.425464
+18 1.05 0.835933 0.493581
+19 1.11 0.955593 0.580599
+20 1.17 0.874218 0.669044
+21 1.23 0.940937 0.774251
+22 1.29 1.04395 0.902639
+23 1.35 0.913513 1.02568
+24 1.41 1.01463 1.17475
+25 1.47 0.978169 1.33096
+26 1.53 1.01841 1.50713
+27 1.59 1.04609 1.70257
+28 1.65 1.02636 1.90906
+29 1.71 1.00346 2.12589
+30 1.77 0.979724 2.35271
+31 1.83 1.00012 2.60021
+32 1.89 1.02681 2.87126
+33 1.95 0.978556 3.14622
+34 2.01 0.962821 3.43367
+35 2.07 0.949492 3.73431
+36 2.13 1.02228 4.07703
+37 2.19 0.977099 4.42332
+38 2.25 1.04294 4.81348
+39 2.31 1.00394 5.20934
+40 2.37 1.00102 5.62482
+41 2.43 1.00205 6.06205
+42 2.49 1.02362 6.53103
+43 2.55 0.967117 6.99572
+44 2.61 1.03652 7.51748
+45 2.67 0.958644 8.02247
+46 2.73 0.977843 8.56098
+47 2.79 1.00382 9.13837
+48 2.85 1.01964 9.75036
+49 2.91 1.04357 10.4034
+50 2.97 0.955326 11.026
+109800 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0.21169 0.000356633
+4 0.21 0 0.000356633
+5 0.27 0.0659362 0.000713267
+6 0.33 0.132597 0.00178317
+7 0.39 0.285031 0.00499287
+8 0.45 0.261794 0.00891583
+9 0.51 0.537517 0.0192582
+10 0.57 0.697561 0.03602
+11 0.63 0.826294 0.060271
+12 0.69 1.05365 0.0973609
+13 0.75 1.29496 0.151213
+14 0.81 1.11031 0.205064
+15 0.87 1.1346 0.268545
+16 0.93 1.0655 0.336662
+17 0.99 1.12245 0.417974
+18 1.05 1.00224 0.499643
+19 1.11 0.959509 0.587019
+20 1.17 0.941194 0.68224
+21 1.23 0.99516 0.793509
+22 1.29 0.913456 0.905849
+23 1.35 1.00619 1.04137
+24 1.41 1.02434 1.19187
+25 1.47 0.96477 1.34593
+26 1.53 1.03697 1.52532
+27 1.59 1.03464 1.71862
+28 1.65 1.03876 1.9276
+29 1.71 1.05133 2.15478
+30 1.77 0.918106 2.36733
+31 1.83 0.942479 2.60057
+32 1.89 1.04707 2.87696
+33 1.95 1.0179 3.16298
+34 2.01 1.04405 3.47468
+35 2.07 0.988913 3.7878
+36 2.13 0.977603 4.11555
+37 2.19 1.03949 4.48395
+38 2.25 0.981932 4.85128
+39 2.31 0.983141 5.23894
+40 2.37 1.01133 5.6587
+41 2.43 1.00859 6.09879
+42 2.49 0.994045 6.55421
+43 2.55 1.03763 7.05278
+44 2.61 0.96284 7.53745
+45 2.67 1.00333 8.06598
+46 2.73 0.97331 8.602
+47 2.79 1.0063 9.18081
+48 2.85 0.978639 9.76819
+49 2.91 1.01507 10.4034
+50 2.97 0.976117 11.0396
+109850 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0.131872 0.000713267
+6 0.33 0.265194 0.00285307
+7 0.39 0.348371 0.00677603
+8 0.45 0.404591 0.0128388
+9 0.51 0.778472 0.0278174
+10 0.57 0.86082 0.0485021
+11 0.63 0.874899 0.0741797
+12 0.69 0.9726 0.108417
+13 0.75 1.11487 0.154779
+14 0.81 1.13972 0.210057
+15 0.87 1.10273 0.271755
+16 0.93 1.15475 0.345578
+17 0.99 1.09783 0.425107
+18 1.05 1.00224 0.506776
+19 1.11 0.916429 0.590228
+20 1.17 1.06457 0.697932
+21 1.23 0.883524 0.796719
+22 1.29 0.962754 0.915121
+23 1.35 0.9294 1.0403
+24 1.41 1.02677 1.19116
+25 1.47 0.975936 1.347
+26 1.53 1.07407 1.53281
+27 1.59 1.02128 1.72361
+28 1.65 1.03876 1.9326
+29 1.71 1.00511 2.14979
+30 1.77 0.998209 2.38088
+31 1.83 0.935273 2.61234
+32 1.89 1.016 2.88053
+33 1.95 1.0179 3.16655
+34 2.01 0.961626 3.45364
+35 2.07 0.959629 3.75749
+36 2.13 0.970156 4.08274
+37 2.19 1.0415 4.45185
+38 2.25 0.997185 4.82489
+39 2.31 1.04917 5.23859
+40 2.37 1.0139 5.65942
+41 2.43 1.02657 6.10735
+42 2.49 0.945004 6.5403
+43 2.55 0.961179 7.00214
+44 2.61 1.00393 7.50749
+45 2.67 1.00265 8.03566
+46 2.73 1.0031 8.58809
+47 2.79 0.990181 9.15763
+48 2.85 1.01013 9.76391
+49 2.91 0.993985 10.3859
+50 2.97 0.999645 11.0374
+109900 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0.108706 0.000356633
+5 0.27 0.0659362 0.000713267
+6 0.33 0.132597 0.00178317
+7 0.39 0.285031 0.00499287
+8 0.45 0.547387 0.0131954
+9 0.51 0.500446 0.0228245
+10 0.57 0.771769 0.0413695
+11 0.63 0.984262 0.0702568
+12 0.69 1.10431 0.10913
+13 0.75 0.84044 0.14408
+14 0.81 1.25737 0.205064
+15 0.87 1.24296 0.274608
+16 0.93 1.08781 0.344151
+17 0.99 1.04368 0.419757
+18 1.05 0.897205 0.492867
+19 1.11 0.959509 0.580243
+20 1.17 0.97292 0.678673
+21 1.23 1.11637 0.803495
+22 1.29 0.930855 0.917974
+23 1.35 0.990301 1.05136
+24 1.41 0.949091 1.1908
+25 1.47 1.0072 1.35164
+26 1.53 1.01429 1.5271
+27 1.59 0.992641 1.71255
+28 1.65 1.03167 1.92011
+29 1.71 1.07938 2.15335
+30 1.77 0.959698 2.37553
+31 1.83 1.02462 2.6291
+32 1.89 0.982221 2.88837
+33 1.95 1.03821 3.1801
+34 2.01 0.953264 3.46469
+35 2.07 1.08352 3.80777
+36 2.13 0.927606 4.11876
+37 2.19 1.02238 4.4811
+38 2.25 0.930452 4.82917
+39 2.31 0.98495 5.21755
+40 2.37 0.981253 5.62482
+41 2.43 1.03148 6.07489
+42 2.49 0.993266 6.52996
+43 2.55 0.996063 7.00856
+44 2.61 0.99118 7.50749
+45 2.67 1.03447 8.05243
+46 2.73 1.01475 8.61127
+47 2.79 0.985221 9.17796
+48 2.85 1.01904 9.78959
+49 2.91 1.01906 10.4272
+50 2.97 0.947665 11.0449
+109950 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0.131872 0.000713267
+6 0.33 0.0883979 0.00142653
+7 0.39 0.253361 0.0042796
+8 0.45 0.380791 0.00998573
+9 0.51 0.630192 0.0221113
+10 0.57 0.578827 0.03602
+11 0.63 1.21514 0.0716833
+12 0.69 1.02326 0.107703
+13 0.75 1.01196 0.149786
+14 0.81 1.10295 0.203281
+15 0.87 1.14735 0.267475
+16 0.93 1.08223 0.336662
+17 0.99 1.16183 0.420827
+18 1.05 0.980361 0.500713
+19 1.11 1.04959 0.596291
+20 1.17 0.948244 0.692225
+21 1.23 1.01111 0.805278
+22 1.29 0.971453 0.92475
+23 1.35 0.966471 1.05492
+24 1.41 1.02919 1.20613
+25 1.47 0.920104 1.35307
+26 1.53 1.08438 1.54066
+27 1.59 1.07473 1.74144
+28 1.65 1.02104 1.94686
+29 1.71 0.998512 2.16262
+30 1.77 0.979724 2.38944
+31 1.83 0.929509 2.61947
+32 1.89 1.01465 2.8873
+33 1.95 0.991248 3.16583
+34 2.01 1.03569 3.47504
+35 2.07 1.01031 3.79494
+36 2.13 1.00632 4.13231
+37 2.19 0.947917 4.46826
+38 2.25 1.00386 4.84379
+39 2.31 0.991281 5.23466
+40 2.37 0.99586 5.648
+41 2.43 1.01104 6.08916
+42 2.49 0.995602 6.54529
+43 2.55 0.987157 7.01961
+44 2.61 0.985512 7.51569
+45 2.67 0.978277 8.03103
+46 2.73 1.02771 8.597
+47 2.79 0.989561 9.16619
+48 2.85 0.959031 9.7418
+49 2.91 1.00424 10.3702
+50 2.97 0.999645 11.0218
+110000 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0.0659362 0.000356633
+6 0.33 0.132597 0.00142653
+7 0.39 0.221691 0.00392297
+8 0.45 0.356992 0.00927247
+9 0.51 0.648727 0.0217546
+10 0.57 0.697561 0.0385164
+11 0.63 0.97211 0.0670471
+12 0.69 0.952338 0.100571
+13 0.75 1.05484 0.144437
+14 0.81 1.19854 0.202568
+15 0.87 1.1346 0.266049
+16 0.93 1.24959 0.345934
+17 0.99 1.18152 0.431526
+18 1.05 0.967231 0.510342
+19 1.11 0.881182 0.590585
+20 1.17 1.02932 0.694722
+21 1.23 0.963264 0.802425
+22 1.29 0.939555 0.917974
+23 1.35 0.955879 1.04672
+24 1.41 0.961228 1.18795
+25 1.47 0.969236 1.34272
+26 1.53 1.01223 1.51783
+27 1.59 0.990732 1.70292
+28 1.65 0.958995 1.89586
+29 1.71 0.99026 2.10984
+30 1.77 1.05213 2.35342
+31 1.83 1.04336 2.61163
+32 1.89 0.94304 2.86056
+33 1.95 0.94048 3.12482
+34 2.01 1.02733 3.43153
+35 2.07 1.00693 3.75036
+36 2.13 0.969093 4.07525
+37 2.19 1.01031 4.43331
+38 2.25 1.0153 4.81312
+39 2.31 0.993995 5.20506
+40 2.37 0.993282 5.61733
+41 2.43 0.986524 6.04779
+42 2.49 0.982369 6.49786
+43 2.55 1.02278 6.9893
+44 2.61 0.960006 7.47254
+45 2.67 0.995879 7.99715
+46 2.73 0.99468 8.54494
+47 2.79 0.994521 9.11698
+48 2.85 1.04935 9.74679
+49 2.91 0.988856 10.3655
+50 2.97 1.0467 11.0478
diff --git a/examples/USER/misc/slater/tmp_1_3.rdf b/examples/USER/misc/slater/tmp_1_3.rdf
new file mode 100644
index 0000000000..e5788d78b0
--- /dev/null
+++ b/examples/USER/misc/slater/tmp_1_3.rdf
@@ -0,0 +1,10254 @@
+# Time-averaged data for fix 13
+# TimeStep Number-of-rows
+# Row c_RDF_1_3[1] c_RDF_1_3[2] c_RDF_1_3[3]
+100000 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0.197809 0.0010699
+6 0.33 0.220995 0.00285307
+7 0.39 0.316701 0.0064194
+8 0.45 0.42839 0.0128388
+9 0.51 0.574587 0.0238944
+10 0.57 0.845978 0.0442225
+11 0.63 0.923505 0.0713267
+12 0.69 0.9726 0.105563
+13 0.75 1.01196 0.147646
+14 0.81 1.05884 0.199001
+15 0.87 1.17922 0.264979
+16 0.93 1.17707 0.340228
+17 0.99 1.1126 0.420827
+18 1.05 0.945348 0.49786
+19 1.11 0.994757 0.588445
+20 1.17 0.955294 0.685093
+21 1.23 0.963264 0.792796
+22 1.29 1.00045 0.915835
+23 1.35 0.987654 1.04886
+24 1.41 1.01463 1.19793
+25 1.47 1.0005 1.3577
+26 1.53 0.979242 1.5271
+27 1.59 0.965916 1.70756
+28 1.65 1.01749 1.91227
+29 1.71 1.05958 2.14123
+30 1.77 1.0398 2.38195
+31 1.83 0.987153 2.62625
+32 1.89 0.940338 2.87447
+33 1.95 1.00267 3.15621
+34 2.01 0.983128 3.44971
+35 2.07 0.994545 3.76462
+36 2.13 1.01696 4.10556
+37 2.19 0.985149 4.45471
+38 2.25 1.00862 4.83203
+39 2.31 1.04555 5.24429
+40 2.37 1.0182 5.6669
+41 2.43 1.03229 6.11733
+42 2.49 0.987039 6.56954
+43 2.55 0.967859 7.03459
+44 2.61 0.982678 7.52924
+45 2.67 1.02838 8.07097
+46 2.73 1.0426 8.64515
+47 2.79 0.95608 9.19508
+48 2.85 0.978045 9.7821
+49 2.91 1.05725 10.4437
+50 2.97 1.00019 11.0956
+100050 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0.0659362 0.000356633
+6 0.33 0.309393 0.00285307
+7 0.39 0.411712 0.0074893
+8 0.45 0.380791 0.0131954
+9 0.51 0.648727 0.0256776
+10 0.57 0.623352 0.0406562
+11 0.63 0.996413 0.0699001
+12 0.69 1.03339 0.106277
+13 0.75 1.10629 0.152282
+14 0.81 1.05884 0.203638
+15 0.87 1.02624 0.261056
+16 0.93 1.14917 0.334522
+17 0.99 1.08799 0.413338
+18 1.05 1.00224 0.495007
+19 1.11 0.967342 0.583096
+20 1.17 0.838967 0.667974
+21 1.23 0.99835 0.779601
+22 1.29 1.00335 0.902996
+23 1.35 1.03267 1.04208
+24 1.41 0.970937 1.18474
+25 1.47 0.998268 1.34415
+26 1.53 1.0514 1.52603
+27 1.59 1.03464 1.71933
+28 1.65 0.987357 1.91797
+29 1.71 1.06618 2.14836
+30 1.77 0.987426 2.37696
+31 1.83 0.965536 2.61591
+32 1.89 1.01735 2.88445
+33 1.95 0.967133 3.15621
+34 2.01 0.990296 3.45185
+35 2.07 1.03735 3.78031
+36 2.13 1.00207 4.11626
+37 2.19 0.989175 4.46683
+38 2.25 1.00862 4.84415
+39 2.31 1.03741 5.25321
+40 2.37 1.03281 5.68188
+41 2.43 1.00777 6.12161
+42 2.49 0.966022 6.56419
+43 2.55 1.00794 7.0485
+44 2.61 0.974176 7.53887
+45 2.67 0.986401 8.05849
+46 2.73 0.99727 8.6077
+47 2.79 1.00754 9.18723
+48 2.85 0.987552 9.77996
+49 2.91 1.01963 10.418
+50 2.97 1.01606 11.0802
+100100 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0.131872 0.000713267
+6 0.33 0.176796 0.0021398
+7 0.39 0.380042 0.0064194
+8 0.45 0.380791 0.0121255
+9 0.51 0.537517 0.0224679
+10 0.57 0.727244 0.0399429
+11 0.63 1.05717 0.07097
+12 0.69 0.992863 0.10592
+13 0.75 1.18348 0.155136
+14 0.81 0.933835 0.200428
+15 0.87 1.34495 0.275678
+16 0.93 1.11012 0.346648
+17 0.99 1.05353 0.422967
+18 1.05 0.910335 0.497147
+19 1.11 0.986924 0.587019
+20 1.17 0.874218 0.675464
+21 1.23 1.0749 0.795649
+22 1.29 0.968553 0.914765
+23 1.35 1.05915 1.05742
+24 1.41 1.0122 1.20613
+25 1.47 0.920104 1.35307
+26 1.53 0.995734 1.52532
+27 1.59 0.895286 1.69258
+28 1.65 1.05826 1.90549
+29 1.71 1.01172 2.12411
+30 1.77 1.02748 2.36198
+31 1.83 0.959772 2.5995
+32 1.89 1.03491 2.87268
+33 1.95 1.02044 3.15942
+34 2.01 0.935346 3.43866
+35 2.07 1.00018 3.75535
+36 2.13 1.02228 4.09807
+37 2.19 0.9932 4.45007
+38 2.25 1.02674 4.83417
+39 2.31 0.985855 5.2229
+40 2.37 0.957194 5.62019
+41 2.43 1.02494 6.0674
+42 2.49 0.988596 6.52033
+43 2.55 1.03689 7.01854
+44 2.61 0.983386 7.51355
+45 2.67 0.989786 8.03495
+46 2.73 1.00698 8.58951
+47 2.79 0.993281 9.16084
+48 2.85 0.979828 9.74893
+49 2.91 0.995695 10.372
+50 2.97 0.994173 11.02
+100150 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0.0659362 0.000356633
+6 0.33 0.176796 0.00178317
+7 0.39 0.380042 0.00606277
+8 0.45 0.309393 0.010699
+9 0.51 0.500446 0.0203281
+10 0.57 0.94987 0.0431526
+11 0.63 0.838445 0.0677603
+12 0.69 1.05365 0.10485
+13 0.75 1.01196 0.146933
+14 0.81 1.0809 0.199358
+15 0.87 1.22384 0.267832
+16 0.93 1.14359 0.340942
+17 0.99 0.964912 0.410842
+18 1.05 1.01975 0.493937
+19 1.11 0.939927 0.579529
+20 1.17 0.941194 0.67475
+21 1.23 0.988781 0.785307
+22 1.29 0.991752 0.907275
+23 1.35 0.977062 1.03887
+24 1.41 1.00492 1.18652
+25 1.47 1.06303 1.35628
+26 1.53 0.985426 1.52675
+27 1.59 0.969734 1.70792
+28 1.65 1.03522 1.91619
+29 1.71 0.95065 2.12161
+30 1.77 0.96586 2.34522
+31 1.83 1.01597 2.59665
+32 1.89 1.02275 2.86662
+33 1.95 1.01917 3.153
+34 2.01 0.975961 3.44437
+35 2.07 0.991166 3.7582
+36 2.13 0.992495 4.09094
+37 2.19 0.999237 4.44508
+38 2.25 1.0439 4.83559
+39 2.31 1.01751 5.2368
+40 2.37 1.00789 5.65514
+41 2.43 0.993062 6.08845
+42 2.49 1.00806 6.55029
+43 2.55 0.990868 7.02639
+44 2.61 0.938751 7.49893
+45 2.67 1.02905 8.04101
+46 2.73 1.0018 8.59272
+47 2.79 0.996381 9.16583
+48 2.85 1.0232 9.77996
+49 2.91 1.00367 10.408
+50 2.97 1.00238 11.0613
+100200 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0.108706 0.000356633
+5 0.27 0.263745 0.00178317
+6 0.33 0.220995 0.00356633
+7 0.39 0.285031 0.00677603
+8 0.45 0.285593 0.0110556
+9 0.51 0.648727 0.0235378
+10 0.57 0.712403 0.0406562
+11 0.63 0.947808 0.0684736
+12 0.69 1.02326 0.104494
+13 0.75 1.12345 0.151213
+14 0.81 1.06619 0.202924
+15 0.87 1.10273 0.264622
+16 0.93 1.02645 0.330243
+17 0.99 1.06337 0.407275
+18 1.05 1.03288 0.491441
+19 1.11 1.04959 0.587019
+20 1.17 0.951769 0.68331
+21 1.23 0.931368 0.787447
+22 1.29 0.954054 0.904779
+23 1.35 0.924105 1.02924
+24 1.41 1.00735 1.17725
+25 1.47 0.989335 1.33524
+26 1.53 0.966872 1.5025
+27 1.59 1.07282 1.70292
+28 1.65 0.994448 1.903
+29 1.71 1.04142 2.12803
+30 1.77 0.962779 2.35093
+31 1.83 1.02318 2.60414
+32 1.89 0.884944 2.83773
+33 1.95 0.984902 3.11448
+34 2.01 1.0775 3.43616
+35 2.07 0.950618 3.73716
+36 2.13 0.989304 4.06883
+37 2.19 1.05861 4.44401
+38 2.25 1.00672 4.82061
+39 2.31 1.02113 5.22325
+40 2.37 1.05773 5.66227
+41 2.43 1.05273 6.12161
+42 2.49 0.927101 6.54636
+43 2.55 0.972312 7.01355
+44 2.61 1.03227 7.53317
+45 2.67 0.980308 8.04957
+46 2.73 0.977195 8.58773
+47 2.79 1.00754 9.16726
+48 2.85 1.02677 9.78352
+49 2.91 0.993415 10.4051
+50 2.97 0.977759 11.0424
+100250 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0.21169 0.000356633
+4 0.21 0 0.000356633
+5 0.27 0.0659362 0.000713267
+6 0.33 0.0883979 0.00142653
+7 0.39 0.348371 0.0053495
+8 0.45 0.42839 0.0117689
+9 0.51 0.537517 0.0221113
+10 0.57 0.875662 0.0431526
+11 0.63 0.959959 0.0713267
+12 0.69 0.901681 0.103067
+13 0.75 1.03769 0.14622
+14 0.81 1.0956 0.199358
+15 0.87 1.21109 0.267118
+16 0.93 1.0655 0.335235
+17 0.99 1.02399 0.409415
+18 1.05 1.06789 0.496434
+19 1.11 1.02609 0.589872
+20 1.17 0.941194 0.685093
+21 1.23 0.870765 0.782454
+22 1.29 0.936655 0.897646
+23 1.35 0.992949 1.03138
+24 1.41 0.939382 1.1694
+25 1.47 1.0206 1.33238
+26 1.53 1.0349 1.51141
+27 1.59 1.05945 1.70934
+28 1.65 1.01926 1.91441
+29 1.71 1.01172 2.13302
+30 1.77 0.955077 2.35414
+31 1.83 1.03183 2.60949
+32 1.89 1.02681 2.88053
+33 1.95 0.941749 3.14515
+34 2.01 0.969988 3.43474
+35 2.07 0.963008 3.73966
+36 2.13 1.04568 4.09023
+37 2.19 1.02238 4.45257
+38 2.25 0.986698 4.82168
+39 2.31 0.993995 5.21362
+40 2.37 1.01047 5.63302
+41 2.43 1.03311 6.08381
+42 2.49 0.969914 6.52817
+43 2.55 0.976765 6.9975
+44 2.61 1.02873 7.51534
+45 2.67 0.998587 8.04137
+46 2.73 1.01216 8.59879
+47 2.79 0.991421 9.16904
+48 2.85 0.981016 9.75785
+49 2.91 0.988286 10.3762
+50 2.97 1.04178 11.0553
+100300 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0.108706 0.000356633
+5 0.27 0.197809 0.00142653
+6 0.33 0.265194 0.00356633
+7 0.39 0.316701 0.00713267
+8 0.45 0.333192 0.0121255
+9 0.51 0.685797 0.025321
+10 0.57 0.593669 0.0395863
+11 0.63 0.862748 0.0649073
+12 0.69 1.06378 0.102354
+13 0.75 1.20063 0.152282
+14 0.81 1.24266 0.212553
+15 0.87 1.10273 0.274251
+16 0.93 1.10455 0.344864
+17 0.99 1.10276 0.42475
+18 1.05 0.949725 0.50214
+19 1.11 0.939927 0.587732
+20 1.17 0.824867 0.671184
+21 1.23 0.960075 0.778531
+22 1.29 0.930855 0.89301
+23 1.35 1.00619 1.02853
+24 1.41 0.99521 1.17475
+25 1.47 1.11663 1.35307
+26 1.53 0.979242 1.52247
+27 1.59 1.03273 1.71541
+28 1.65 0.976721 1.91191
+29 1.71 0.991911 2.12625
+30 1.77 0.990507 2.35556
+31 1.83 1.01886 2.6077
+32 1.89 1.00114 2.87197
+33 1.95 0.992517 3.15086
+34 2.01 0.966405 3.43937
+35 2.07 1.02608 3.76427
+36 2.13 0.974411 4.09094
+37 2.19 1.00729 4.44793
+38 2.25 0.978118 4.81384
+39 2.31 1.05278 5.22896
+40 2.37 0.980394 5.63588
+41 2.43 0.975081 6.06134
+42 2.49 1.02207 6.5296
+43 2.55 0.990125 7.00535
+44 2.61 1.00677 7.51213
+45 2.67 1.01687 8.04779
+46 2.73 0.99727 8.597
+47 2.79 0.989561 9.16619
+48 2.85 1.05351 9.7985
+49 2.91 0.984866 10.4148
+50 2.97 1.00676 11.071
+100350 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0.108706 0.000356633
+5 0.27 0.0659362 0.000713267
+6 0.33 0.132597 0.00178317
+7 0.39 0.380042 0.00606277
+8 0.45 0.523588 0.0139087
+9 0.51 0.611657 0.0256776
+10 0.57 0.801453 0.0449358
+11 0.63 0.887051 0.07097
+12 0.69 0.992863 0.10592
+13 0.75 0.960503 0.145863
+14 0.81 1.16913 0.202568
+15 0.87 1.23659 0.271755
+16 0.93 1.18264 0.347361
+17 0.99 1.0486 0.423324
+18 1.05 0.975984 0.502853
+19 1.11 1.00259 0.594151
+20 1.17 0.96587 0.691869
+21 1.23 0.883524 0.790656
+22 1.29 1.00625 0.914408
+23 1.35 1.03267 1.0535
+24 1.41 1.01463 1.20257
+25 1.47 1.12333 1.38195
+26 1.53 0.975119 1.55064
+27 1.59 0.969734 1.73181
+28 1.65 0.994448 1.93188
+29 1.71 1.01667 2.15157
+30 1.77 1.04442 2.39337
+31 1.83 0.94392 2.62696
+32 1.89 1.01465 2.89479
+33 1.95 0.996325 3.17475
+34 2.01 0.996269 3.47218
+35 2.07 1.03059 3.7985
+36 2.13 0.972284 4.12447
+37 2.19 1.02943 4.4893
+38 2.25 1.001 4.86377
+39 2.31 0.990377 5.25428
+40 2.37 1.01476 5.67546
+41 2.43 1.00287 6.11305
+42 2.49 0.994045 6.56847
+43 2.55 0.990868 7.04458
+44 2.61 0.982678 7.53923
+45 2.67 0.999941 8.06598
+46 2.73 0.991442 8.61198
+47 2.79 0.97778 9.17439
+48 2.85 1.01845 9.78566
+49 2.91 1.03103 10.4308
+50 2.97 1.01004 11.0892
+100400 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0.108706 0.000356633
+5 0.27 0.197809 0.00142653
+6 0.33 0.220995 0.0032097
+7 0.39 0.285031 0.0064194
+8 0.45 0.356992 0.0117689
+9 0.51 0.518981 0.0217546
+10 0.57 0.816295 0.0413695
+11 0.63 1.14223 0.074893
+12 0.69 1.02326 0.110913
+13 0.75 1.08914 0.156205
+14 0.81 1.17648 0.213267
+15 0.87 1.15373 0.277817
+16 0.93 1.16591 0.352354
+17 0.99 1.11753 0.43331
+18 1.05 0.945348 0.510342
+19 1.11 0.873349 0.589872
+20 1.17 0.849542 0.67582
+21 1.23 0.972833 0.784593
+22 1.29 1.02075 0.910128
+23 1.35 1.01148 1.04636
+24 1.41 0.987928 1.19151
+25 1.47 1.07197 1.3627
+26 1.53 1.06583 1.54708
+27 1.59 0.996459 1.73324
+28 1.65 1.01217 1.93688
+29 1.71 0.978707 2.14836
+30 1.77 1.01207 2.38267
+31 1.83 0.992917 2.62839
+32 1.89 1.016 2.89658
+33 1.95 1.01029 3.18046
+34 2.01 0.956848 3.46612
+35 2.07 1.04185 3.79601
+36 2.13 0.982922 4.12553
+37 2.19 0.975087 4.47111
+38 2.25 1.03055 4.85663
+39 2.31 1.02836 5.26213
+40 2.37 0.988127 5.67225
+41 2.43 0.976716 6.09843
+42 2.49 0.974584 6.54494
+43 2.55 1.00497 7.02782
+44 2.61 0.998265 7.53031
+45 2.67 1.03785 8.07703
+46 2.73 0.970072 8.61127
+47 2.79 1.01188 9.1933
+48 2.85 0.972697 9.7771
+49 2.91 1.03901 10.4272
+50 2.97 0.99472 11.0756
+100450 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0.131872 0.000713267
+6 0.33 0.220995 0.00249643
+7 0.39 0.285031 0.00570613
+8 0.45 0.547387 0.0139087
+9 0.51 0.704332 0.0274608
+10 0.57 0.816295 0.0470756
+11 0.63 0.826294 0.0713267
+12 0.69 0.952338 0.10485
+13 0.75 1.08057 0.149786
+14 0.81 1.11031 0.203638
+15 0.87 1.22384 0.272111
+16 0.93 1.13802 0.344864
+17 0.99 1.09783 0.424394
+18 1.05 1.09853 0.513909
+19 1.11 0.932095 0.598787
+20 1.17 0.958819 0.695792
+21 1.23 0.91861 0.798502
+22 1.29 0.913456 0.910842
+23 1.35 0.969118 1.04137
+24 1.41 0.990356 1.18688
+25 1.47 1.0407 1.35307
+26 1.53 1.00192 1.52639
+27 1.59 1.02509 1.7179
+28 1.65 1.01749 1.92261
+29 1.71 1.00676 2.14016
+30 1.77 1.00129 2.37197
+31 1.83 1.02606 2.62589
+32 1.89 0.991678 2.88766
+33 1.95 1.05344 3.18367
+34 2.01 0.941319 3.46469
+35 2.07 1.01144 3.78495
+36 2.13 0.991432 4.11733
+37 2.19 1.02641 4.4811
+38 2.25 1.02864 4.86591
+39 2.31 0.956912 5.24322
+40 2.37 1.00445 5.66013
+41 2.43 1.03229 6.11056
+42 2.49 0.962908 6.55171
+43 2.55 0.999774 7.0321
+44 2.61 0.982678 7.52675
+45 2.67 0.991817 8.04922
+46 2.73 0.991442 8.59522
+47 2.79 1.0559 9.20257
+48 2.85 0.968538 9.78388
+49 2.91 0.983726 10.3994
+50 2.97 1.0177 11.0628
+100500 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0.21169 0.000356633
+4 0.21 0 0.000356633
+5 0.27 0 0.000356633
+6 0.33 0.176796 0.00178317
+7 0.39 0.126681 0.0032097
+8 0.45 0.499788 0.010699
+9 0.51 0.667262 0.0235378
+10 0.57 0.845978 0.0438659
+11 0.63 0.923505 0.07097
+12 0.69 0.89155 0.102354
+13 0.75 1.12345 0.149073
+14 0.81 1.19119 0.206847
+15 0.87 1.10911 0.268902
+16 0.93 1.22169 0.347004
+17 0.99 1.0486 0.422967
+18 1.05 1.01975 0.506063
+19 1.11 0.967342 0.594151
+20 1.17 0.962344 0.691512
+21 1.23 0.991971 0.802425
+22 1.29 0.901857 0.913338
+23 1.35 0.94264 1.0403
+24 1.41 1.05104 1.19472
+25 1.47 0.96477 1.34879
+26 1.53 1.03903 1.52853
+27 1.59 1.05182 1.72504
+28 1.65 1.02104 1.93046
+29 1.71 0.993561 2.14515
+30 1.77 1.00745 2.37839
+31 1.83 1.003 2.6266
+32 1.89 0.978168 2.88481
+33 1.95 1.00775 3.16797
+34 2.01 0.959237 3.45435
+35 2.07 0.981029 3.76498
+36 2.13 1.05526 4.11876
+37 2.19 0.969049 4.4622
+38 2.25 1.01434 4.84165
+39 2.31 1.04284 5.25285
+40 2.37 0.989845 5.66369
+41 2.43 0.993062 6.097
+42 2.49 0.995602 6.55314
+43 2.55 0.960437 7.01462
+44 2.61 1.00181 7.5189
+45 2.67 0.978277 8.03424
+46 2.73 1.029 8.60093
+47 2.79 1.00506 9.17903
+48 2.85 1.02202 9.79244
+49 2.91 0.993985 10.4144
+50 2.97 0.97174 11.0478
+100550 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0.217411 0.000713267
+5 0.27 0.197809 0.00178317
+6 0.33 0.132597 0.00285307
+7 0.39 0.348371 0.00677603
+8 0.45 0.452189 0.0135521
+9 0.51 0.648727 0.0260342
+10 0.57 0.845978 0.0463623
+11 0.63 1.00856 0.0759629
+12 0.69 0.992863 0.110913
+13 0.75 1.15775 0.159058
+14 0.81 1.13972 0.214337
+15 0.87 1.04537 0.272825
+16 0.93 0.998553 0.336662
+17 0.99 1.00922 0.409772
+18 1.05 1.09415 0.49893
+19 1.11 0.943844 0.584879
+20 1.17 0.97997 0.684023
+21 1.23 0.960075 0.791369
+22 1.29 0.968553 0.910485
+23 1.35 1.00619 1.04601
+24 1.41 1.08259 1.20506
+25 1.47 0.987102 1.3627
+26 1.53 0.993673 1.53459
+27 1.59 1.07091 1.73466
+28 1.65 0.967858 1.92939
+29 1.71 1.01007 2.14765
+30 1.77 0.99975 2.3791
+31 1.83 1.00733 2.62839
+32 1.89 1.00519 2.89372
+33 1.95 1.01917 3.1801
+34 2.01 0.968794 3.46933
+35 2.07 0.992292 3.78352
+36 2.13 0.999942 4.11876
+37 2.19 1.01634 4.47896
+38 2.25 1.0029 4.85414
+39 2.31 1.03198 5.26106
+40 2.37 1.0225 5.68545
+41 2.43 0.951378 6.10057
+42 2.49 0.948118 6.53495
+43 2.55 0.972312 7.00214
+44 2.61 0.987637 7.49929
+45 2.67 0.966091 8.0082
+46 2.73 1.04972 8.58631
+47 2.79 0.951119 9.13338
+48 2.85 1.03865 9.75678
+49 2.91 1.02077 10.3955
+50 2.97 1.01113 11.0546
+100600 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0.0659362 0.000356633
+6 0.33 0.265194 0.00249643
+7 0.39 0.348371 0.0064194
+8 0.45 0.499788 0.0139087
+9 0.51 0.630192 0.0260342
+10 0.57 0.831136 0.0460057
+11 0.63 0.911353 0.0727532
+12 0.69 0.932075 0.105563
+13 0.75 1.16633 0.154066
+14 0.81 0.977953 0.201498
+15 0.87 1.22384 0.269971
+16 0.93 1.21054 0.347361
+17 0.99 1.05353 0.42368
+18 1.05 1.02413 0.507133
+19 1.11 0.892931 0.588445
+20 1.17 0.905943 0.6801
+21 1.23 0.924989 0.783524
+22 1.29 0.945354 0.899786
+23 1.35 0.982358 1.0321
+24 1.41 0.997638 1.17867
+25 1.47 1.04963 1.34629
+26 1.53 1.02872 1.52425
+27 1.59 0.956372 1.70292
+28 1.65 1.05472 1.91512
+29 1.71 0.982008 2.12732
+30 1.77 1.04442 2.36912
+31 1.83 1.01597 2.62054
+32 1.89 1.0214 2.89016
+33 1.95 0.950634 3.15728
+34 2.01 0.97835 3.44936
+35 2.07 1.00806 3.76854
+36 2.13 0.973348 4.09486
+37 2.19 1.00829 4.45221
+38 2.25 1.01339 4.83131
+39 2.31 1.00123 5.22611
+40 2.37 1.00617 5.64372
+41 2.43 0.958734 6.06205
+42 2.49 1.04309 6.53994
+43 2.55 1.02353 7.03174
+44 2.61 0.967799 7.5189
+45 2.67 1.02905 8.06098
+46 2.73 1.02188 8.62375
+47 2.79 1.02738 9.21469
+48 2.85 0.970915 9.79743
+49 2.91 0.94782 10.3905
+50 2.97 0.985966 11.0332
+100650 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0.108706 0.000356633
+5 0.27 0 0.000356633
+6 0.33 0.220995 0.0021398
+7 0.39 0.285031 0.0053495
+8 0.45 0.452189 0.0121255
+9 0.51 0.593122 0.0235378
+10 0.57 0.845978 0.0438659
+11 0.63 0.935656 0.0713267
+12 0.69 0.932075 0.104137
+13 0.75 1.07199 0.148716
+14 0.81 1.16178 0.205064
+15 0.87 1.1346 0.268545
+16 0.93 1.12686 0.340585
+17 0.99 1.13229 0.422611
+18 1.05 0.927842 0.498217
+19 1.11 0.994757 0.588802
+20 1.17 0.944719 0.684379
+21 1.23 1.00473 0.796719
+22 1.29 0.913456 0.909058
+23 1.35 1.02472 1.04708
+24 1.41 0.944236 1.18581
+25 1.47 0.967003 1.34023
+26 1.53 1.09881 1.53031
+27 1.59 0.96019 1.7097
+28 1.65 1.02458 1.91583
+29 1.71 1.05793 2.14444
+30 1.77 1.00437 2.37696
+31 1.83 0.992917 2.62268
+32 1.89 0.999785 2.88659
+33 1.95 0.906211 3.14123
+34 2.01 0.995074 3.4383
+35 2.07 1.03509 3.76605
+36 2.13 0.989304 4.09772
+37 2.19 1.02741 4.46184
+38 2.25 1.01053 4.83987
+39 2.31 0.975001 5.22432
+40 2.37 0.997579 5.63837
+41 2.43 0.999601 6.07454
+42 2.49 1.0244 6.54387
+43 2.55 1.00052 7.02461
+44 2.61 1.01385 7.53495
+45 2.67 0.939011 8.0296
+46 2.73 0.988204 8.57382
+47 2.79 1.01126 9.15549
+48 2.85 0.986958 9.74786
+49 2.91 1.02305 10.388
+50 2.97 0.989796 11.0332
+100700 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0.131872 0.000713267
+6 0.33 0.176796 0.0021398
+7 0.39 0.316701 0.00570613
+8 0.45 0.523588 0.0135521
+9 0.51 0.593122 0.0249643
+10 0.57 0.845978 0.0452924
+11 0.63 0.923505 0.0723966
+12 0.69 0.800369 0.100571
+13 0.75 1.04626 0.14408
+14 0.81 1.27943 0.206134
+15 0.87 1.17285 0.271755
+16 0.93 1.11012 0.342725
+17 0.99 1.03876 0.417974
+18 1.05 0.927842 0.493581
+19 1.11 1.10833 0.594508
+20 1.17 0.97292 0.692939
+21 1.23 0.893093 0.792796
+22 1.29 0.977253 0.912981
+23 1.35 0.982358 1.04529
+24 1.41 1.03162 1.19686
+25 1.47 0.998268 1.35628
+26 1.53 0.93801 1.51854
+27 1.59 1.01746 1.70863
+28 1.65 0.99622 1.90906
+29 1.71 1.04803 2.13552
+30 1.77 1.00129 2.36733
+31 1.83 0.952566 2.60307
+32 1.89 1.00654 2.86876
+33 1.95 0.992517 3.14765
+34 2.01 1.03449 3.45649
+35 2.07 0.99004 3.76997
+36 2.13 1.04994 4.12197
+37 2.19 0.96603 4.46434
+38 2.25 0.981932 4.83167
+39 2.31 0.993995 5.22361
+40 2.37 1.04226 5.65621
+41 2.43 0.985706 6.08631
+42 2.49 0.987817 6.53887
+43 2.55 1.01981 7.02889
+44 2.61 0.991888 7.52817
+45 2.67 0.980985 8.04494
+46 2.73 0.989499 8.58987
+47 2.79 1.01064 9.17118
+48 2.85 1.0131 9.77924
+49 2.91 1.03217 10.4251
+50 2.97 0.972287 11.0588
+100750 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0.197809 0.0010699
+6 0.33 0.132597 0.0021398
+7 0.39 0.380042 0.0064194
+8 0.45 0.475989 0.0135521
+9 0.51 0.574587 0.0246077
+10 0.57 0.875662 0.0456491
+11 0.63 0.911353 0.0723966
+12 0.69 0.861156 0.10271
+13 0.75 1.21778 0.153352
+14 0.81 1.27207 0.21505
+15 0.87 1.05811 0.274251
+16 0.93 1.14917 0.347718
+17 0.99 1.03876 0.422967
+18 1.05 0.940972 0.499643
+19 1.11 0.955593 0.586662
+20 1.17 0.955294 0.68331
+21 1.23 0.931368 0.787447
+22 1.29 0.971453 0.906919
+23 1.35 0.937344 1.03317
+24 1.41 0.951518 1.17297
+25 1.47 0.982636 1.32989
+26 1.53 1.01429 1.50535
+27 1.59 1.006 1.6933
+28 1.65 1.11853 1.91833
+29 1.71 1.03647 2.1423
+30 1.77 1.0321 2.38124
+31 1.83 1.00877 2.63088
+32 1.89 0.913317 2.87197
+33 1.95 0.98871 3.14979
+34 2.01 0.989101 3.44508
+35 2.07 1.0013 3.76213
+36 2.13 0.966965 4.08631
+37 2.19 0.987162 4.43616
+38 2.25 0.996232 4.80884
+39 2.31 1.03017 5.21505
+40 2.37 0.987268 5.62482
+41 2.43 1.04292 6.07989
+42 2.49 1.01506 6.54494
+43 2.55 0.993094 7.02211
+44 2.61 1.02023 7.53566
+45 2.67 0.98437 8.05421
+46 2.73 0.981728 8.59486
+47 2.79 0.993281 9.16619
+48 2.85 1.03271 9.78602
+49 2.91 1.01963 10.424
+50 2.97 1.00457 11.0788
+100800 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0.0659362 0.000356633
+6 0.33 0.0883979 0.0010699
+7 0.39 0.475052 0.0064194
+8 0.45 0.452189 0.0131954
+9 0.51 0.630192 0.025321
+10 0.57 0.994395 0.0492154
+11 0.63 0.911353 0.0759629
+12 0.69 0.962469 0.109843
+13 0.75 1.06341 0.154066
+14 0.81 1.11766 0.208274
+15 0.87 1.23659 0.277461
+16 0.93 1.16033 0.351641
+17 0.99 1.0486 0.427603
+18 1.05 0.954101 0.50535
+19 1.11 0.943844 0.591298
+20 1.17 0.930619 0.685449
+21 1.23 0.937747 0.7903
+22 1.29 1.04975 0.919401
+23 1.35 0.894978 1.03994
+24 1.41 0.944236 1.17867
+25 1.47 0.962536 1.33238
+26 1.53 1.0782 1.5189
+27 1.59 1.03464 1.7122
+28 1.65 1.0299 1.9194
+29 1.71 1.00346 2.13623
+30 1.77 0.973562 2.36163
+31 1.83 0.941037 2.59451
+32 1.89 1.05112 2.87197
+33 1.95 1.00648 3.15478
+34 2.01 0.968794 3.44401
+35 2.07 0.99905 3.76034
+36 2.13 0.982922 4.08987
+37 2.19 1.02138 4.45185
+38 2.25 1.01244 4.8306
+39 2.31 1.0148 5.23074
+40 2.37 0.970083 5.63338
+41 2.43 1.01431 6.07596
+42 2.49 1.02907 6.54743
+43 2.55 1.002 7.02889
+44 2.61 0.994722 7.5296
+45 2.67 0.976246 8.04387
+46 2.73 1.03159 8.61198
+47 2.79 1.00258 9.18866
+48 2.85 0.989929 9.78281
+49 2.91 1.04186 10.4347
+50 2.97 0.980494 11.0738
+100850 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0.108706 0.000356633
+5 0.27 0.0659362 0.000713267
+6 0.33 0.176796 0.0021398
+7 0.39 0.285031 0.0053495
+8 0.45 0.380791 0.0110556
+9 0.51 0.593122 0.0224679
+10 0.57 0.682719 0.038873
+11 0.63 0.996413 0.068117
+12 0.69 1.08404 0.106277
+13 0.75 1.07199 0.150856
+14 0.81 1.14707 0.206491
+15 0.87 1.01349 0.263195
+16 0.93 1.09897 0.333452
+17 0.99 1.05845 0.410128
+18 1.05 0.962855 0.488588
+19 1.11 0.975175 0.577389
+20 1.17 0.955294 0.674037
+21 1.23 1.04619 0.791013
+22 1.29 0.983053 0.911912
+23 1.35 0.932048 1.03745
+24 1.41 0.985501 1.18224
+25 1.47 1.0206 1.34522
+26 1.53 0.966872 1.51248
+27 1.59 0.96019 1.69187
+28 1.65 1.07067 1.90728
+29 1.71 1.05793 2.13588
+30 1.77 0.958158 2.3577
+31 1.83 0.965536 2.59665
+32 1.89 1.06599 2.87803
+33 1.95 1.0014 3.15942
+34 2.01 0.95207 3.44365
+35 2.07 0.969766 3.75071
+36 2.13 1.01696 4.09165
+37 2.19 0.939867 4.42475
+38 2.25 1.02292 4.80742
+39 2.31 1.00213 5.20257
+40 2.37 1.02593 5.62839
+41 2.43 0.998784 6.06419
+42 2.49 1.00572 6.52496
+43 2.55 1.002 7.00642
+44 2.61 0.999682 7.50963
+45 2.67 1.00197 8.03745
+46 2.73 1.03418 8.60699
+47 2.79 0.988941 9.17582
+48 2.85 0.983987 9.76641
+49 2.91 1.0259 10.4083
+50 2.97 0.959703 11.0339
+100900 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0.217411 0.000713267
+5 0.27 0.0659362 0.0010699
+6 0.33 0.044199 0.00142653
+7 0.39 0.380042 0.00570613
+8 0.45 0.594986 0.014622
+9 0.51 0.574587 0.0256776
+10 0.57 0.756928 0.0438659
+11 0.63 0.97211 0.0723966
+12 0.69 0.952338 0.10592
+13 0.75 1.08914 0.151213
+14 0.81 1.10295 0.204708
+15 0.87 1.05811 0.263909
+16 0.93 1.15475 0.337732
+17 0.99 1.0683 0.415121
+18 1.05 0.958478 0.493224
+19 1.11 0.986924 0.583096
+20 1.17 0.916519 0.67582
+21 1.23 0.91223 0.777817
+22 1.29 1.00915 0.901926
+23 1.35 0.94264 1.02889
+24 1.41 1.00977 1.17725
+25 1.47 1.0876 1.35093
+26 1.53 0.997796 1.52354
+27 1.59 1.00982 1.7122
+28 1.65 0.99622 1.91262
+29 1.71 1.02987 2.13516
+30 1.77 0.942753 2.35342
+31 1.83 1.01165 2.60378
+32 1.89 0.990327 2.86519
+33 1.95 0.917634 3.12304
+34 2.01 0.974767 3.41405
+35 2.07 1.05086 3.74679
+36 2.13 0.97973 4.07525
+37 2.19 1.06666 4.45328
+38 2.25 0.980978 4.82026
+39 2.31 0.963243 5.20007
+40 2.37 1.01219 5.62019
+41 2.43 0.984889 6.04993
+42 2.49 1.04698 6.5296
+43 2.55 1.03466 7.02675
+44 2.61 1.02944 7.54494
+45 2.67 1.02431 8.08452
+46 2.73 0.990147 8.62981
+47 2.79 0.95794 9.18081
+48 2.85 1.03271 9.80064
+49 2.91 0.981446 10.4148
+50 2.97 1.03083 11.0867
+100950 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0.108706 0.000356633
+5 0.27 0.0659362 0.000713267
+6 0.33 0.220995 0.00249643
+7 0.39 0.190021 0.00463623
+8 0.45 0.499788 0.0121255
+9 0.51 0.815542 0.0278174
+10 0.57 0.742086 0.0456491
+11 0.63 0.911353 0.0723966
+12 0.69 0.851025 0.102354
+13 0.75 1.12345 0.149073
+14 0.81 0.985306 0.196862
+15 0.87 1.37682 0.273894
+16 0.93 1.12128 0.345578
+17 0.99 1.02399 0.419757
+18 1.05 0.940972 0.496434
+19 1.11 0.979091 0.585592
+20 1.17 0.842492 0.670827
+21 1.23 0.950506 0.777104
+22 1.29 0.968553 0.89622
+23 1.35 0.958527 1.02532
+24 1.41 1.00492 1.17297
+25 1.47 1.03623 1.33845
+26 1.53 1.02666 1.51605
+27 1.59 1.00982 1.70471
+28 1.65 1.01926 1.90977
+29 1.71 0.977057 2.1209
+30 1.77 0.988967 2.34986
+31 1.83 1.05633 2.61127
+32 1.89 0.922774 2.85485
+33 1.95 1.06613 3.15442
+34 2.01 0.962821 3.44187
+35 2.07 1.00806 3.76106
+36 2.13 0.942498 4.07703
+37 2.19 0.998231 4.43081
+38 2.25 1.0172 4.81134
+39 2.31 1.00666 5.20827
+40 2.37 0.981253 5.61555
+41 2.43 1.05109 6.07418
+42 2.49 1.02752 6.54494
+43 2.55 0.986414 7.0189
+44 2.61 0.986929 7.51569
+45 2.67 1.01822 8.05207
+46 2.73 0.97849 8.59094
+47 2.79 1.00072 9.16655
+48 2.85 0.978639 9.75392
+49 2.91 0.971187 10.3616
+50 2.97 1.01387 11.0225
+101000 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0.0659362 0.000356633
+6 0.33 0.309393 0.00285307
+7 0.39 0.285031 0.00606277
+8 0.45 0.475989 0.0131954
+9 0.51 0.685797 0.0263909
+10 0.57 0.801453 0.0456491
+11 0.63 0.814142 0.0695435
+12 0.69 1.06378 0.10699
+13 0.75 1.18348 0.156205
+14 0.81 1.03678 0.206491
+15 0.87 1.1601 0.271398
+16 0.93 1.19938 0.348074
+17 0.99 0.925528 0.415121
+18 1.05 0.945348 0.492154
+19 1.11 0.94776 0.578459
+20 1.17 0.983495 0.67796
+21 1.23 1.00154 0.789943
+22 1.29 1.14255 0.930456
+23 1.35 0.89233 1.05064
+24 1.41 0.946664 1.18973
+25 1.47 1.00943 1.35093
+26 1.53 1.0246 1.52817
+27 1.59 1.006 1.71612
+28 1.65 0.960768 1.90942
+29 1.71 1.00181 2.12589
+30 1.77 0.96432 2.34914
+31 1.83 0.987153 2.59344
+32 1.89 1.00789 2.85949
+33 1.95 1.0014 3.14087
+34 2.01 1.01658 3.44437
+35 2.07 1.03735 3.77282
+36 2.13 1.03611 4.12019
+37 2.19 1.05156 4.49287
+38 2.25 1.001 4.86733
+39 2.31 0.970479 5.25
+40 2.37 1.01133 5.66976
+41 2.43 0.968542 6.09237
+42 2.49 0.997937 6.54957
+43 2.55 1.00794 7.03388
+44 2.61 1.00039 7.53745
+45 2.67 1.01551 8.0724
+46 2.73 0.953882 8.59772
+47 2.79 0.97096 9.15621
+48 2.85 1.02023 9.76854
+49 2.91 0.962068 10.3705
+50 2.97 0.999098 11.0218
+101050 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0.0659362 0.000356633
+6 0.33 0.309393 0.00285307
+7 0.39 0.380042 0.00713267
+8 0.45 0.499788 0.014622
+9 0.51 0.611657 0.0263909
+10 0.57 0.771769 0.0449358
+11 0.63 1.13008 0.0781027
+12 0.69 0.830763 0.107347
+13 0.75 1.03769 0.150499
+14 0.81 1.11766 0.204708
+15 0.87 1.08361 0.265335
+16 0.93 1.12686 0.337375
+17 0.99 1.01414 0.410842
+18 1.05 1.01537 0.493581
+19 1.11 0.943844 0.579529
+20 1.17 1.00112 0.680813
+21 1.23 1.00473 0.793153
+22 1.29 1.02945 0.919757
+23 1.35 1.02737 1.05813
+24 1.41 0.983074 1.20257
+25 1.47 0.969236 1.35735
+26 1.53 1.00398 1.53103
+27 1.59 0.937283 1.70613
+28 1.65 1.01572 1.91049
+29 1.71 1.01007 2.12874
+30 1.77 1.00129 2.36056
+31 1.83 1.03327 2.61626
+32 1.89 1.01059 2.88302
+33 1.95 0.965864 3.15442
+34 2.01 1.01777 3.45827
+35 2.07 0.99004 3.77175
+36 2.13 1.00952 4.1102
+37 2.19 1.03546 4.47718
+38 2.25 1.0172 4.8577
+39 2.31 0.956008 5.23466
+40 2.37 0.970083 5.6373
+41 2.43 1.02494 6.08452
+42 2.49 1.00261 6.54387
+43 2.55 1.05767 7.05207
+44 2.61 0.989054 7.54993
+45 2.67 0.968799 8.06027
+46 2.73 0.986261 8.60342
+47 2.79 1.028 9.19472
+48 2.85 0.995871 9.79244
+49 2.91 0.973467 10.4016
+50 2.97 0.998003 11.0521
+101100 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0.0659362 0.000356633
+6 0.33 0.176796 0.00178317
+7 0.39 0.253361 0.00463623
+8 0.45 0.571187 0.0131954
+9 0.51 0.500446 0.0228245
+10 0.57 0.563985 0.0363766
+11 0.63 0.741234 0.0581312
+12 0.69 1.02326 0.0941512
+13 0.75 0.994807 0.135521
+14 0.81 1.19854 0.193652
+15 0.87 1.26846 0.264622
+16 0.93 1.19938 0.341298
+17 0.99 1.07814 0.419401
+18 1.05 0.945348 0.496434
+19 1.11 0.998673 0.587375
+20 1.17 0.955294 0.684023
+21 1.23 0.966454 0.792083
+22 1.29 0.927955 0.906205
+23 1.35 0.977062 1.0378
+24 1.41 0.939382 1.17582
+25 1.47 1.0742 1.34736
+26 1.53 0.929764 1.5082
+27 1.59 1.03655 1.70185
+28 1.65 1.0884 1.92083
+29 1.71 0.963853 2.1291
+30 1.77 0.948915 2.34879
+31 1.83 0.968418 2.58845
+32 1.89 1.02681 2.85949
+33 1.95 0.963326 3.13017
+34 2.01 1.07033 3.44971
+35 2.07 0.97765 3.75927
+36 2.13 1.00739 4.097
+37 2.19 1.00024 4.4515
+38 2.25 0.968585 4.81384
+39 2.31 1.02022 5.21612
+40 2.37 1.02164 5.64016
+41 2.43 1.00777 6.07989
+42 2.49 1.01273 6.54387
+43 2.55 1.01165 7.02996
+44 2.61 0.994722 7.53067
+45 2.67 1.00536 8.06027
+46 2.73 1.01605 8.61983
+47 2.79 1.0032 9.19686
+48 2.85 1.01786 9.80777
+49 2.91 0.966058 10.4123
+50 2.97 0.982683 11.0528
+101150 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0.044199 0.000356633
+7 0.39 0.285031 0.00356633
+8 0.45 0.547387 0.0117689
+9 0.51 0.537517 0.0221113
+10 0.57 0.756928 0.0402996
+11 0.63 0.887051 0.0663338
+12 0.69 1.00299 0.101641
+13 0.75 1.26066 0.154066
+14 0.81 1.22796 0.213623
+15 0.87 1.15373 0.278174
+16 0.93 1.05992 0.345934
+17 0.99 1.13229 0.42796
+18 1.05 0.989114 0.508559
+19 1.11 0.932095 0.593438
+20 1.17 0.867168 0.68117
+21 1.23 0.966454 0.78923
+22 1.29 1.00335 0.912625
+23 1.35 0.937344 1.03887
+24 1.41 1.07046 1.19615
+25 1.47 1.03177 1.36091
+26 1.53 1.02666 1.53852
+27 1.59 1.02128 1.72932
+28 1.65 1.02813 1.93616
+29 1.71 0.924243 2.13588
+30 1.77 1.10296 2.39123
+31 1.83 1.02318 2.64444
+32 1.89 0.878189 2.87625
+33 1.95 1.04582 3.17011
+34 2.01 0.979545 3.46255
+35 2.07 1.02721 3.7878
+36 2.13 1.03824 4.13588
+37 2.19 0.984143 4.48466
+38 2.25 1.01911 4.86591
+39 2.31 1.04103 5.27639
+40 2.37 0.937432 5.66548
+41 2.43 1.00532 6.10414
+42 2.49 0.997937 6.56134
+43 2.55 1.02575 7.05421
+44 2.61 0.989054 7.55207
+45 2.67 0.990463 8.07382
+46 2.73 0.990794 8.61947
+47 2.79 0.997621 9.1933
+48 2.85 1.00597 9.79708
+49 2.91 1.02305 10.4372
+50 2.97 0.989249 11.082
+101200 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0.131872 0.000713267
+6 0.33 0.265194 0.00285307
+7 0.39 0.190021 0.00499287
+8 0.45 0.547387 0.0131954
+9 0.51 0.667262 0.0260342
+10 0.57 0.623352 0.0410128
+11 0.63 0.874899 0.0666904
+12 0.69 0.901681 0.0984308
+13 0.75 1.04626 0.14194
+14 0.81 1.11766 0.196148
+15 0.87 1.08361 0.256776
+16 0.93 1.26632 0.337732
+17 0.99 0.99445 0.409772
+18 1.05 1.09853 0.499287
+19 1.11 0.975175 0.588088
+20 1.17 0.98702 0.687946
+21 1.23 0.91542 0.7903
+22 1.29 0.869958 0.89729
+23 1.35 0.9294 1.02247
+24 1.41 1.07046 1.17974
+25 1.47 0.924571 1.32739
+26 1.53 1.03903 1.50713
+27 1.59 0.988823 1.69187
+28 1.65 0.98913 1.89087
+29 1.71 1.02822 2.11305
+30 1.77 0.967401 2.33702
+31 1.83 1.02606 2.59094
+32 1.89 1.03626 2.86448
+33 1.95 1.01156 3.14872
+34 2.01 1.00702 3.44936
+35 2.07 1.01932 3.77211
+36 2.13 0.980794 4.10093
+37 2.19 1.00628 4.45756
+38 2.25 0.984792 4.82596
+39 2.31 1.03198 5.23288
+40 2.37 1.04312 5.66583
+41 2.43 1.00287 6.10342
+42 2.49 0.956681 6.54173
+43 2.55 1.02798 7.03566
+44 2.61 0.99118 7.53459
+45 2.67 0.993171 8.05777
+46 2.73 1.02447 8.62197
+47 2.79 0.949879 9.16833
+48 2.85 0.98161 9.75749
+49 2.91 1.02191 10.3969
+50 2.97 1.01223 11.0567
+101250 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0.217411 0.000713267
+5 0.27 0.0659362 0.0010699
+6 0.33 0.0883979 0.00178317
+7 0.39 0.380042 0.00606277
+8 0.45 0.499788 0.0135521
+9 0.51 0.630192 0.0256776
+10 0.57 0.831136 0.0456491
+11 0.63 0.850597 0.0706134
+12 0.69 0.840894 0.100214
+13 0.75 1.16633 0.148716
+14 0.81 1.2206 0.207917
+15 0.87 1.16647 0.273181
+16 0.93 1.15475 0.347004
+17 0.99 1.05845 0.42368
+18 1.05 1.02413 0.507133
+19 1.11 0.986924 0.597004
+20 1.17 1.00465 0.698645
+21 1.23 0.8293 0.791369
+22 1.29 0.945354 0.907632
+23 1.35 0.998245 1.04208
+24 1.41 0.99521 1.1883
+25 1.47 0.906705 1.3331
+26 1.53 0.999857 1.50606
+27 1.59 1.13581 1.71826
+28 1.65 0.994448 1.91833
+29 1.71 1.04803 2.14479
+30 1.77 0.988967 2.37375
+31 1.83 1.0203 2.62625
+32 1.89 0.987625 2.88695
+33 1.95 0.951903 3.15442
+34 2.01 1.00702 3.45506
+35 2.07 1.0013 3.77211
+36 2.13 0.978666 4.10021
+37 2.19 1.01031 4.45827
+38 2.25 0.985745 4.82703
+39 2.31 0.99309 5.21862
+40 2.37 1.00531 5.63588
+41 2.43 0.99388 6.06954
+42 2.49 1.03374 6.54315
+43 2.55 1.01165 7.02924
+44 2.61 0.979135 7.52211
+45 2.67 1.02296 8.06098
+46 2.73 1.03742 8.63231
+47 2.79 0.97406 9.19258
+48 2.85 1.00597 9.79636
+49 2.91 1.01393 10.4308
+50 2.97 0.956967 11.0546
+101300 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0.0659362 0.000356633
+6 0.33 0.220995 0.0021398
+7 0.39 0.348371 0.00606277
+8 0.45 0.594986 0.0149786
+9 0.51 0.556052 0.0256776
+10 0.57 0.653036 0.0413695
+11 0.63 0.874899 0.0670471
+12 0.69 1.06378 0.104494
+13 0.75 1.34642 0.160485
+14 0.81 1.05148 0.211484
+15 0.87 1.09636 0.272825
+16 0.93 1.12686 0.344864
+17 0.99 0.999373 0.417261
+18 1.05 0.984738 0.497504
+19 1.11 0.994757 0.588088
+20 1.17 1.03285 0.692582
+21 1.23 0.867576 0.789586
+22 1.29 1.02655 0.915835
+23 1.35 0.950583 1.04387
+24 1.41 1.00977 1.19223
+25 1.47 1.00497 1.35271
+26 1.53 1.01223 1.52782
+27 1.59 1.08427 1.73039
+28 1.65 0.997993 1.93117
+29 1.71 0.927544 2.1316
+30 1.77 1.03056 2.37019
+31 1.83 1.03759 2.62696
+32 1.89 0.951146 2.87803
+33 1.95 1.01663 3.16369
+34 2.01 0.997463 3.46148
+35 2.07 1.03509 3.78923
+36 2.13 0.998878 4.12411
+37 2.19 0.987162 4.47397
+38 2.25 0.975258 4.8388
+39 2.31 1.06545 5.25892
+40 2.37 0.982112 5.66655
+41 2.43 0.959551 6.08524
+42 2.49 1.04231 6.56277
+43 2.55 1.01091 7.0485
+44 2.61 1.01456 7.5592
+45 2.67 1.01551 8.09415
+46 2.73 0.988851 8.63873
+47 2.79 0.97778 9.20114
+48 2.85 1.01904 9.81277
+49 2.91 1.01564 10.4483
+50 2.97 0.96408 11.0767
+101350 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0.0659362 0.000356633
+6 0.33 0.265194 0.00249643
+7 0.39 0.190021 0.00463623
+8 0.45 0.380791 0.0103424
+9 0.51 0.537517 0.0206847
+10 0.57 0.742086 0.0385164
+11 0.63 0.935656 0.0659772
+12 0.69 1.14483 0.106277
+13 0.75 1.16633 0.154779
+14 0.81 1.13237 0.2097
+15 0.87 0.968875 0.263909
+16 0.93 1.18264 0.339515
+17 0.99 1.08306 0.417974
+18 1.05 0.945348 0.495007
+19 1.11 0.986924 0.584879
+20 1.17 1.05752 0.691869
+21 1.23 0.960075 0.799215
+22 1.29 0.910556 0.911198
+23 1.35 0.947936 1.03887
+24 1.41 1.04618 1.19258
+25 1.47 1.0206 1.35556
+26 1.53 1.0246 1.53281
+27 1.59 0.910558 1.70292
+28 1.65 1.05117 1.91441
+29 1.71 1.06288 2.14408
+30 1.77 1.01515 2.3791
+31 1.83 1.052 2.63944
+32 1.89 0.995731 2.90228
+33 1.95 0.998863 3.18295
+34 2.01 0.958043 3.46897
+35 2.07 1.02608 3.79387
+36 2.13 0.940371 4.10913
+37 2.19 1.03244 4.47504
+38 2.25 1.01053 4.85307
+39 2.31 0.979524 5.2393
+40 2.37 0.953757 5.63516
+41 2.43 1.0045 6.07347
+42 2.49 1.01818 6.53994
+43 2.55 0.999774 7.02033
+44 2.61 1.00181 7.52461
+45 2.67 1.00333 8.05314
+46 2.73 1.01475 8.61198
+47 2.79 0.984601 9.17832
+48 2.85 0.9929 9.77425
+49 2.91 0.998545 10.3991
+50 2.97 0.999645 11.0506
+101400 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0.108706 0.000356633
+5 0.27 0.131872 0.0010699
+6 0.33 0 0.0010699
+7 0.39 0.348371 0.00499287
+8 0.45 0.499788 0.0124822
+9 0.51 0.611657 0.0242511
+10 0.57 0.697561 0.0410128
+11 0.63 1.06932 0.0723966
+12 0.69 0.921944 0.10485
+13 0.75 1.03769 0.148003
+14 0.81 1.08825 0.200785
+15 0.87 1.19197 0.267475
+16 0.93 1.12686 0.339515
+17 0.99 1.03383 0.414408
+18 1.05 1.0285 0.498217
+19 1.11 0.932095 0.583096
+20 1.17 0.98702 0.682953
+21 1.23 0.91223 0.78495
+22 1.29 0.954054 0.902282
+23 1.35 0.955879 1.03103
+24 1.41 1.08017 1.18973
+25 1.47 1.01613 1.352
+26 1.53 1.04727 1.53317
+27 1.59 0.99455 1.71897
+28 1.65 0.992675 1.91869
+29 1.71 0.996862 2.13409
+30 1.77 1.02286 2.3709
+31 1.83 0.949684 2.60592
+32 1.89 0.960604 2.85949
+33 1.95 1.05471 3.15585
+34 2.01 0.95207 3.44009
+35 2.07 1.01707 3.76213
+36 2.13 0.986113 4.09272
+37 2.19 1.04553 4.46327
+38 2.25 1.03055 4.84879
+39 2.31 0.943345 5.22076
+40 2.37 1.01133 5.64051
+41 2.43 0.977533 6.06705
+42 2.49 1.00883 6.52924
+43 2.55 0.940397 6.9811
+44 2.61 1.03227 7.50071
+45 2.67 0.973538 8.01355
+46 2.73 1.00569 8.5674
+47 2.79 1.01126 9.14907
+48 2.85 0.990523 9.74358
+49 2.91 0.985436 10.3602
+50 2.97 1.02646 11.0292
+101450 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0.131872 0.000713267
+6 0.33 0.132597 0.00178317
+7 0.39 0.253361 0.00463623
+8 0.45 0.380791 0.0103424
+9 0.51 0.537517 0.0206847
+10 0.57 0.667877 0.0367332
+11 0.63 0.826294 0.0609843
+12 0.69 1.21575 0.10378
+13 0.75 1.05484 0.147646
+14 0.81 1.13972 0.202924
+15 0.87 1.1346 0.266405
+16 0.93 1.0376 0.332739
+17 0.99 1.09291 0.411912
+18 1.05 0.980361 0.491797
+19 1.11 0.889015 0.572753
+20 1.17 0.863642 0.660128
+21 1.23 1.03344 0.775678
+22 1.29 0.910556 0.88766
+23 1.35 0.971766 1.01854
+24 1.41 1.07289 1.17618
+25 1.47 1.01613 1.33845
+26 1.53 1.03078 1.51676
+27 1.59 0.954463 1.69508
+28 1.65 1.00331 1.89693
+29 1.71 1.01337 2.11591
+30 1.77 1.04442 2.3577
+31 1.83 1.00733 2.60699
+32 1.89 1.0214 2.8766
+33 1.95 1.00902 3.16013
+34 2.01 1.01419 3.46291
+35 2.07 0.960755 3.76712
+36 2.13 1.0042 4.10378
+37 2.19 1.03345 4.47004
+38 2.25 1.03913 4.85877
+39 2.31 1.01027 5.25713
+40 2.37 0.97352 5.6612
+41 2.43 0.956282 6.07846
+42 2.49 1.00339 6.53816
+43 2.55 1.01536 7.02603
+44 2.61 0.99118 7.52496
+45 2.67 0.997233 8.05029
+46 2.73 1.01734 8.61056
+47 2.79 1.0094 9.19116
+48 2.85 1.0137 9.79957
+49 2.91 0.974037 10.4091
+50 2.97 0.999098 11.0603
+101500 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0.176796 0.00142653
+7 0.39 0.316701 0.00499287
+8 0.45 0.356992 0.0103424
+9 0.51 0.611657 0.0221113
+10 0.57 0.682719 0.0385164
+11 0.63 0.826294 0.0627675
+12 0.69 1.12457 0.102354
+13 0.75 1.02053 0.144793
+14 0.81 1.16178 0.201141
+15 0.87 1.19835 0.268188
+16 0.93 1.08223 0.337375
+17 0.99 0.999373 0.409772
+18 1.05 1.0854 0.498217
+19 1.11 0.869433 0.577389
+20 1.17 0.990545 0.677603
+21 1.23 0.931368 0.78174
+22 1.29 1.02945 0.908345
+23 1.35 0.963823 1.03816
+24 1.41 0.970937 1.18081
+25 1.47 1.02953 1.34522
+26 1.53 0.968934 1.51284
+27 1.59 1.03082 1.70542
+28 1.65 1.00508 1.90763
+29 1.71 0.940747 2.11091
+30 1.77 1.05367 2.35485
+31 1.83 1.03039 2.60984
+32 1.89 0.961955 2.86377
+33 1.95 1.04075 3.15621
+34 2.01 1.00463 3.45613
+35 2.07 0.992292 3.77033
+36 2.13 0.947817 4.08809
+37 2.19 0.955967 4.42689
+38 2.25 1.0153 4.8067
+39 2.31 1.02836 5.2122
+40 2.37 1.01476 5.63338
+41 2.43 0.975081 6.05884
+42 2.49 0.994045 6.51427
+43 2.55 1.01685 7.00285
+44 2.61 1.0181 7.51534
+45 2.67 0.969476 8.02603
+46 2.73 0.959063 8.55421
+47 2.79 1.0001 9.12946
+48 2.85 0.975074 9.71469
+49 2.91 1.04642 10.3695
+50 2.97 0.987607 11.0132
+101550 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0.131872 0.000713267
+6 0.33 0.044199 0.0010699
+7 0.39 0.348371 0.00499287
+8 0.45 0.452189 0.0117689
+9 0.51 0.648727 0.0242511
+10 0.57 0.712403 0.0413695
+11 0.63 0.923505 0.0684736
+12 0.69 0.932075 0.101284
+13 0.75 0.960503 0.141227
+14 0.81 1.28678 0.203638
+15 0.87 1.1346 0.267118
+16 0.93 1.27748 0.348787
+17 0.99 1.0043 0.421541
+18 1.05 1.06352 0.508203
+19 1.11 1.02609 0.601641
+20 1.17 0.941194 0.696862
+21 1.23 0.858007 0.792796
+22 1.29 0.962754 0.911198
+23 1.35 0.94264 1.03816
+24 1.41 0.936954 1.17582
+25 1.47 1.0474 1.34308
+26 1.53 0.985426 1.51355
+27 1.59 1.06709 1.71291
+28 1.65 1.07067 1.92832
+29 1.71 0.978707 2.1398
+30 1.77 1.03826 2.38017
+31 1.83 0.928068 2.60984
+32 1.89 0.978168 2.86805
+33 1.95 0.976018 3.1423
+34 2.01 0.985518 3.43652
+35 2.07 1.00919 3.75606
+36 2.13 0.977603 4.08381
+37 2.19 0.986156 4.43331
+38 2.25 1.04008 4.8224
+39 2.31 0.999422 5.21648
+40 2.37 1.01562 5.63802
+41 2.43 1.02003 6.0831
+42 2.49 1.03608 6.55777
+43 2.55 1.01388 7.04494
+44 2.61 0.979844 7.53816
+45 2.67 0.968122 8.04815
+46 2.73 1.00698 8.60271
+47 2.79 1.00568 9.18117
+48 2.85 1.0238 9.79565
+49 2.91 0.972897 10.4044
+50 2.97 0.989796 11.0496
+101600 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0.108706 0.000356633
+5 0.27 0.263745 0.00178317
+6 0.33 0.220995 0.00356633
+7 0.39 0.285031 0.00677603
+8 0.45 0.618786 0.0160485
+9 0.51 0.556052 0.0267475
+10 0.57 0.845978 0.0470756
+11 0.63 0.874899 0.0727532
+12 0.69 1.04352 0.109486
+13 0.75 1.07199 0.154066
+14 0.81 1.02207 0.203638
+15 0.87 1.07086 0.263552
+16 0.93 1.07665 0.332382
+17 0.99 1.0683 0.409772
+18 1.05 1.03288 0.493937
+19 1.11 1.01434 0.586305
+20 1.17 0.895368 0.67689
+21 1.23 0.972833 0.785663
+22 1.29 1.02945 0.912268
+23 1.35 0.950583 1.0403
+24 1.41 0.932099 1.17725
+25 1.47 1.01167 1.3388
+26 1.53 0.966872 1.50606
+27 1.59 1.03655 1.69971
+28 1.65 1.00686 1.90228
+29 1.71 0.9523 2.10806
+30 1.77 0.988967 2.33702
+31 1.83 0.991476 2.58238
+32 1.89 1.0214 2.852
+33 1.95 1.00902 3.13552
+34 2.01 1.03211 3.44365
+35 2.07 1.03622 3.77175
+36 2.13 0.986113 4.10235
+37 2.19 0.906659 4.42368
+38 2.25 0.952378 4.77996
+39 2.31 1.01118 5.17867
+40 2.37 1.0182 5.60128
+41 2.43 1.00205 6.03852
+42 2.49 1.02907 6.50999
+43 2.55 0.989383 6.98538
+44 2.61 0.999682 7.48859
+45 2.67 0.99114 8.0107
+46 2.73 1.00957 8.56669
+47 2.79 1.0435 9.1669
+48 2.85 0.975668 9.7525
+49 2.91 0.989426 10.3716
+50 2.97 1.01332 11.0321
+101650 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0.131872 0.000713267
+6 0.33 0.044199 0.0010699
+7 0.39 0.348371 0.00499287
+8 0.45 0.475989 0.0121255
+9 0.51 0.667262 0.0249643
+10 0.57 0.742086 0.042796
+11 0.63 0.777688 0.0656205
+12 0.69 1.17523 0.10699
+13 0.75 1.07199 0.151569
+14 0.81 1.12501 0.206134
+15 0.87 1.24296 0.275678
+16 0.93 1.17707 0.350927
+17 0.99 1.15199 0.434379
+18 1.05 0.984738 0.514622
+19 1.11 0.939927 0.600214
+20 1.17 0.888318 0.690086
+21 1.23 0.947316 0.796006
+22 1.29 0.971453 0.915478
+23 1.35 1.01413 1.05207
+24 1.41 0.978219 1.19579
+25 1.47 0.971469 1.35093
+26 1.53 1.08026 1.5378
+27 1.59 1.05945 1.73573
+28 1.65 1.04763 1.9465
+29 1.71 1.02987 2.16904
+30 1.77 0.953537 2.3898
+31 1.83 0.951125 2.62518
+32 1.89 1.04572 2.90121
+33 1.95 1.02044 3.18795
+34 2.01 0.998658 3.48609
+35 2.07 1.00581 3.80456
+36 2.13 0.996751 4.13873
+37 2.19 0.95798 4.47825
+38 2.25 1.01816 4.85913
+39 2.31 0.992186 5.25036
+40 2.37 1.03539 5.6801
+41 2.43 1.00532 6.11876
+42 2.49 0.950453 6.55421
+43 2.55 0.97825 7.02425
+44 2.61 1.05565 7.55563
+45 2.67 1.004 8.08452
+46 2.73 0.988204 8.62874
+47 2.79 0.985221 9.19544
+48 2.85 0.972103 9.77889
+49 2.91 1.01108 10.4116
+50 2.97 1.01113 11.0706
+101700 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0.108706 0.000356633
+5 0.27 0.0659362 0.000713267
+6 0.33 0.265194 0.00285307
+7 0.39 0.158351 0.00463623
+8 0.45 0.333192 0.0096291
+9 0.51 0.611657 0.021398
+10 0.57 0.771769 0.0399429
+11 0.63 0.729083 0.0613409
+12 0.69 1.07391 0.0991441
+13 0.75 1.08057 0.14408
+14 0.81 1.08825 0.196862
+15 0.87 1.21109 0.264622
+16 0.93 1.09339 0.334522
+17 0.99 1.26522 0.426177
+18 1.05 1.06789 0.513195
+19 1.11 0.869433 0.592368
+20 1.17 0.923569 0.685806
+21 1.23 0.838869 0.779601
+22 1.29 0.962754 0.898003
+23 1.35 0.937344 1.02425
+24 1.41 0.987928 1.1694
+25 1.47 1.01613 1.33167
+26 1.53 1.09057 1.52033
+27 1.59 1.03655 1.71398
+28 1.65 0.987357 1.91262
+29 1.71 0.934145 2.11448
+30 1.77 1.05521 2.35877
+31 1.83 1.0448 2.61733
+32 1.89 1.00114 2.8816
+33 1.95 0.995056 3.1612
+34 2.01 0.938929 3.44151
+35 2.07 1.00468 3.75963
+36 2.13 0.969093 4.08452
+37 2.19 1.00024 4.43902
+38 2.25 0.993372 4.81063
+39 2.31 0.995804 5.20328
+40 2.37 1.00531 5.62054
+41 2.43 1.00532 6.0592
+42 2.49 0.987817 6.51177
+43 2.55 1.04431 7.01355
+44 2.61 0.97701 7.50535
+45 2.67 0.994525 8.02924
+46 2.73 0.995327 8.57739
+47 2.79 1.03172 9.17083
+48 2.85 1.03093 9.78959
+49 2.91 0.993985 10.4116
+50 2.97 0.946024 11.0282
+101750 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0.0659362 0.000356633
+6 0.33 0.265194 0.00249643
+7 0.39 0.443382 0.0074893
+8 0.45 0.475989 0.014622
+9 0.51 0.593122 0.0260342
+10 0.57 0.756928 0.0442225
+11 0.63 0.814142 0.068117
+12 0.69 1.01313 0.10378
+13 0.75 1.16633 0.152282
+14 0.81 1.28678 0.214693
+15 0.87 0.93063 0.266762
+16 0.93 1.14359 0.339872
+17 0.99 1.10276 0.419757
+18 1.05 0.997868 0.50107
+19 1.11 1.00651 0.592725
+20 1.17 0.814291 0.675107
+21 1.23 1.02387 0.789586
+22 1.29 0.942455 0.905492
+23 1.35 0.926753 1.03031
+24 1.41 1.03648 1.1826
+25 1.47 1.00274 1.34272
+26 1.53 0.966872 1.50999
+27 1.59 1.06709 1.70934
+28 1.65 1.03699 1.91797
+29 1.71 0.978707 2.12946
+30 1.77 0.927349 2.34415
+31 1.83 1.05488 2.60521
+32 1.89 1.00924 2.87161
+33 1.95 1.01536 3.15692
+34 2.01 1.00821 3.45792
+35 2.07 0.944987 3.75713
+36 2.13 0.9542 4.07703
+37 2.19 1.02943 4.44187
+38 2.25 1.03341 4.82846
+39 2.31 1.02022 5.23074
+40 2.37 0.992423 5.64265
+41 2.43 0.96936 6.06562
+42 2.49 1.05865 6.55064
+43 2.55 1.0161 7.03887
+44 2.61 1.00322 7.54387
+45 2.67 1.02431 8.08345
+46 2.73 1.02771 8.64943
+47 2.79 0.995141 9.22183
+48 2.85 0.999436 9.82168
+49 2.91 0.997405 10.4458
+50 2.97 0.992532 11.0927
+101800 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0.217411 0.000713267
+5 0.27 0.131872 0.00142653
+6 0.33 0.132597 0.00249643
+7 0.39 0.221691 0.00499287
+8 0.45 0.404591 0.0110556
+9 0.51 0.648727 0.0235378
+10 0.57 0.653036 0.0392297
+11 0.63 0.911353 0.0659772
+12 0.69 0.871288 0.0966476
+13 0.75 1.11487 0.14301
+14 0.81 1.13972 0.198288
+15 0.87 1.23022 0.267118
+16 0.93 1.12686 0.339158
+17 0.99 0.989527 0.410842
+18 1.05 1.06789 0.49786
+19 1.11 1.02217 0.590942
+20 1.17 1.00112 0.692225
+21 1.23 0.947316 0.798146
+22 1.29 1.02655 0.924394
+23 1.35 1.00354 1.05956
+24 1.41 0.893262 1.1908
+25 1.47 0.989335 1.34879
+26 1.53 1.01223 1.52389
+27 1.59 1.01555 1.71362
+28 1.65 1.0494 1.92475
+29 1.71 0.960552 2.13231
+30 1.77 1.00591 2.36519
+31 1.83 0.985711 2.60913
+32 1.89 0.99438 2.87161
+33 1.95 0.968402 3.14372
+34 2.01 1.06436 3.46148
+35 2.07 1.00356 3.77924
+36 2.13 0.989304 4.11091
+37 2.19 1.03446 4.47753
+38 2.25 1.03055 4.86305
+39 2.31 0.985855 5.25178
+40 2.37 0.972661 5.65549
+41 2.43 0.989793 6.08738
+42 2.49 1.00728 6.54886
+43 2.55 0.995321 7.0271
+44 2.61 0.958589 7.50963
+45 2.67 0.995879 8.03424
+46 2.73 1.02512 8.59879
+47 2.79 0.993901 9.17047
+48 2.85 1.03331 9.79066
+49 2.91 1.04414 10.444
+50 2.97 0.993079 11.0913
+101850 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0.0659362 0.000356633
+6 0.33 0.265194 0.00249643
+7 0.39 0.253361 0.0053495
+8 0.45 0.547387 0.0135521
+9 0.51 0.593122 0.0249643
+10 0.57 0.86082 0.0456491
+11 0.63 0.874899 0.0713267
+12 0.69 0.901681 0.103067
+13 0.75 1.22636 0.154066
+14 0.81 1.15443 0.210057
+15 0.87 1.09636 0.271398
+16 0.93 1.13244 0.343795
+17 0.99 1.17168 0.428673
+18 1.05 1.04163 0.513552
+19 1.11 0.857684 0.591655
+20 1.17 0.944719 0.687233
+21 1.23 1.03663 0.803138
+22 1.29 0.852559 0.907989
+23 1.35 0.945288 1.03531
+24 1.41 0.929672 1.1719
+25 1.47 1.03177 1.33666
+26 1.53 1.12149 1.53067
+27 1.59 1.05373 1.72753
+28 1.65 1.0104 1.93081
+29 1.71 1.06948 2.16191
+30 1.77 0.950456 2.38195
+31 1.83 1.01165 2.63231
+32 1.89 0.938987 2.88017
+33 1.95 1.03567 3.17118
+34 2.01 1.00224 3.4704
+35 2.07 0.952871 3.77211
+36 2.13 0.969093 4.097
+37 2.19 1.03244 4.46291
+38 2.25 0.991465 4.83381
+39 2.31 1.00937 5.23181
+40 2.37 1.00531 5.64907
+41 2.43 1.02494 6.09629
+42 2.49 1.00494 6.5567
+43 2.55 1.00052 7.03745
+44 2.61 1.02235 7.55207
+45 2.67 0.980308 8.06847
+46 2.73 0.959063 8.59665
+47 2.79 1.02242 9.18474
+48 2.85 0.957842 9.75963
+49 2.91 1.00367 10.3877
+50 2.97 0.999098 11.0389
+101900 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0.108706 0.000356633
+5 0.27 0.0659362 0.000713267
+6 0.33 0.309393 0.0032097
+7 0.39 0.253361 0.00606277
+8 0.45 0.380791 0.0117689
+9 0.51 0.667262 0.0246077
+10 0.57 0.831136 0.0445792
+11 0.63 0.874899 0.0702568
+12 0.69 0.921944 0.10271
+13 0.75 1.08057 0.147646
+14 0.81 1.15443 0.203638
+15 0.87 1.30671 0.276748
+16 0.93 1.21054 0.354137
+17 0.99 1.07322 0.431883
+18 1.05 1.01537 0.514622
+19 1.11 0.849851 0.592011
+20 1.17 0.934144 0.686519
+21 1.23 1.03663 0.802425
+22 1.29 0.913456 0.914765
+23 1.35 0.966471 1.04494
+24 1.41 0.936954 1.1826
+25 1.47 1.0273 1.34665
+26 1.53 1.01635 1.52247
+27 1.59 1.02128 1.71327
+28 1.65 1.05472 1.92546
+29 1.71 1.10249 2.16369
+30 1.77 0.941213 2.3816
+31 1.83 0.988594 2.62625
+32 1.89 0.987625 2.88695
+33 1.95 0.967133 3.1587
+34 2.01 1.0118 3.46077
+35 2.07 0.975397 3.76961
+36 2.13 0.994623 4.10307
+37 2.19 1.03244 4.46897
+38 2.25 1.02578 4.85271
+39 2.31 1.02384 5.25642
+40 2.37 0.970083 5.65906
+41 2.43 0.996332 6.09379
+42 2.49 0.988596 6.54672
+43 2.55 0.983445 7.01926
+44 2.61 1.01102 7.52817
+45 2.67 0.98437 8.04672
+46 2.73 1.00828 8.602
+47 2.79 1.04226 9.2015
+48 2.85 1.00062 9.80207
+49 2.91 0.963208 10.4048
+50 2.97 0.9794 11.0432
+101950 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0.131872 0.000713267
+6 0.33 0.132597 0.00178317
+7 0.39 0.0950104 0.00285307
+8 0.45 0.475989 0.00998573
+9 0.51 0.630192 0.0221113
+10 0.57 0.697561 0.038873
+11 0.63 1.02072 0.0688302
+12 0.69 1.11444 0.10806
+13 0.75 1.13202 0.155136
+14 0.81 0.985306 0.202924
+15 0.87 1.24296 0.272468
+16 0.93 1.02087 0.337732
+17 0.99 1.1766 0.422967
+18 1.05 0.945348 0.5
+19 1.11 0.951677 0.586662
+20 1.17 0.98702 0.686519
+21 1.23 0.991971 0.797432
+22 1.29 1.02075 0.922967
+23 1.35 0.94264 1.04993
+24 1.41 1.00977 1.19829
+25 1.47 1.034 1.36341
+26 1.53 0.989549 1.53459
+27 1.59 1.11863 1.74358
+28 1.65 0.987357 1.94223
+29 1.71 0.917641 2.14051
+30 1.77 1.03364 2.37981
+31 1.83 0.942479 2.61305
+32 1.89 1.03356 2.88588
+33 1.95 1.00775 3.16904
+34 2.01 1.02374 3.47468
+35 2.07 1.03622 3.80278
+36 2.13 0.985049 4.13302
+37 2.19 0.998231 4.4868
+38 2.25 0.975258 4.85164
+39 2.31 0.994899 5.24394
+40 2.37 0.997579 5.65799
+41 2.43 0.97835 6.08488
+42 2.49 1.00494 6.54529
+43 2.55 1.01388 7.03245
+44 2.61 1.00535 7.53852
+45 2.67 0.964737 8.04672
+46 2.73 0.987556 8.59058
+47 2.79 0.987081 9.15835
+48 2.85 1.03984 9.78245
+49 2.91 0.993985 10.4044
+50 2.97 1.02974 11.0756
+102000 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0.108706 0.000356633
+5 0.27 0.0659362 0.000713267
+6 0.33 0.132597 0.00178317
+7 0.39 0.348371 0.00570613
+8 0.45 0.42839 0.0121255
+9 0.51 0.667262 0.0249643
+10 0.57 0.742086 0.042796
+11 0.63 0.97211 0.0713267
+12 0.69 1.14483 0.111626
+13 0.75 1.07199 0.156205
+14 0.81 1.17648 0.213267
+15 0.87 1.01349 0.269971
+16 0.93 1.09339 0.339872
+17 0.99 1.01414 0.413338
+18 1.05 1.03288 0.497504
+19 1.11 1.02609 0.590942
+20 1.17 0.96587 0.688659
+21 1.23 0.928178 0.792439
+22 1.29 0.983053 0.913338
+23 1.35 0.992949 1.04708
+24 1.41 0.992783 1.19294
+25 1.47 1.0273 1.35699
+26 1.53 0.993673 1.52889
+27 1.59 0.97737 1.71148
+28 1.65 1.03345 1.9194
+29 1.71 1.04637 2.14551
+30 1.77 0.970481 2.37019
+31 1.83 1.03327 2.62589
+32 1.89 1.05383 2.90407
+33 1.95 0.968402 3.17618
+34 2.01 0.997463 3.47397
+35 2.07 0.987787 3.78673
+36 2.13 0.949945 4.10521
+37 2.19 1.06163 4.48146
+38 2.25 0.980978 4.84843
+39 2.31 0.988568 5.23823
+40 2.37 1.01304 5.6587
+41 2.43 1.00369 6.09665
+42 2.49 0.968357 6.5403
+43 2.55 0.975281 7.00892
+44 2.61 1.04786 7.53638
+45 2.67 0.995879 8.06098
+46 2.73 0.983023 8.60235
+47 2.79 1.02056 9.18937
+48 2.85 0.989335 9.78317
+49 2.91 1.01393 10.4176
+50 2.97 1.00512 11.0728
+102050 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0.263745 0.00142653
+6 0.33 0.220995 0.0032097
+7 0.39 0.316701 0.00677603
+8 0.45 0.642585 0.0164051
+9 0.51 0.518981 0.0263909
+10 0.57 0.816295 0.0460057
+11 0.63 0.850597 0.07097
+12 0.69 0.9726 0.105207
+13 0.75 1.06341 0.149429
+14 0.81 1.22796 0.208987
+15 0.87 1.08361 0.269615
+16 0.93 1.18822 0.345578
+17 0.99 1.0486 0.421541
+18 1.05 0.958478 0.499643
+19 1.11 1.00259 0.590942
+20 1.17 0.916519 0.683666
+21 1.23 0.899472 0.784237
+22 1.29 0.904756 0.895506
+23 1.35 1.06179 1.03852
+24 1.41 1.00007 1.18545
+25 1.47 1.08537 1.35877
+26 1.53 0.92358 1.51854
+27 1.59 1.04991 1.71469
+28 1.65 1.00863 1.91762
+29 1.71 1.05463 2.14551
+30 1.77 1.00591 2.37839
+31 1.83 1.00589 2.62732
+32 1.89 0.988976 2.88837
+33 1.95 0.989979 3.16655
+34 2.01 0.947291 3.44936
+35 2.07 0.994545 3.76427
+36 2.13 0.970156 4.08951
+37 2.19 1.03848 4.45756
+38 2.25 1.0153 4.83738
+39 2.31 0.980428 5.22397
+40 2.37 1.02336 5.64872
+41 2.43 0.972629 6.07311
+42 2.49 1.08123 6.56847
+43 2.55 0.999032 7.0485
+44 2.61 0.979135 7.54137
+45 2.67 1.01077 8.07382
+46 2.73 0.97849 8.6127
+47 2.79 0.97468 9.17332
+48 2.85 0.988146 9.76641
+49 2.91 0.981446 10.3805
+50 2.97 1.04561 11.0621
+102100 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0.263745 0.00142653
+6 0.33 0.132597 0.00249643
+7 0.39 0.443382 0.0074893
+8 0.45 0.475989 0.014622
+9 0.51 0.704332 0.028174
+10 0.57 0.86082 0.0488588
+11 0.63 0.923505 0.0759629
+12 0.69 1.05365 0.113053
+13 0.75 1.03769 0.156205
+14 0.81 1.01472 0.205421
+15 0.87 1.17922 0.271398
+16 0.93 1.22727 0.349857
+17 0.99 1.12245 0.43117
+18 1.05 0.954101 0.508916
+19 1.11 0.939927 0.594508
+20 1.17 0.821342 0.677603
+21 1.23 0.91223 0.779601
+22 1.29 0.980153 0.900143
+23 1.35 0.939992 1.02675
+24 1.41 0.932099 1.16369
+25 1.47 1.05187 1.33167
+26 1.53 1.06789 1.51641
+27 1.59 1.069 1.71612
+28 1.65 0.967858 1.91084
+29 1.71 0.9523 2.11662
+30 1.77 1.03518 2.35628
+31 1.83 1.00589 2.60521
+32 1.89 0.988976 2.86626
+33 1.95 0.959518 3.13588
+34 2.01 1.00941 3.43723
+35 2.07 1.00018 3.75392
+36 2.13 0.983985 4.08381
+37 2.19 1.01232 4.44258
+38 2.25 1.00004 4.81669
+39 2.31 0.993995 5.20863
+40 2.37 1.01047 5.62803
+41 2.43 1.02984 6.07739
+42 2.49 0.973027 6.52318
+43 2.55 1.03243 7.01926
+44 2.61 1.01243 7.52889
+45 2.67 0.9776 8.04387
+46 2.73 1.0018 8.59558
+47 2.79 1.0125 9.17796
+48 2.85 0.993494 9.77425
+49 2.91 0.984866 10.3905
+50 2.97 1.00676 11.0467
+102150 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0.21169 0.000356633
+4 0.21 0.108706 0.000713267
+5 0.27 0.131872 0.00142653
+6 0.33 0.0883979 0.0021398
+7 0.39 0.158351 0.00392297
+8 0.45 0.380791 0.0096291
+9 0.51 0.759937 0.0242511
+10 0.57 0.994395 0.0481455
+11 0.63 0.97211 0.0766762
+12 0.69 0.790238 0.104494
+13 0.75 1.20063 0.154422
+14 0.81 1.16913 0.211127
+15 0.87 1.01987 0.268188
+16 0.93 1.09339 0.338088
+17 0.99 1.06337 0.415121
+18 1.05 0.919089 0.490014
+19 1.11 0.845935 0.567047
+20 1.17 1.06105 0.674394
+21 1.23 1.00154 0.786377
+22 1.29 0.980153 0.906919
+23 1.35 0.969118 1.03745
+24 1.41 0.953946 1.1776
+25 1.47 1.05857 1.34665
+26 1.53 1.02253 1.52354
+27 1.59 0.956372 1.70221
+28 1.65 1.08131 1.91976
+29 1.71 0.940747 2.12304
+30 1.77 1.01978 2.35913
+31 1.83 0.987153 2.60342
+32 1.89 0.997082 2.86662
+33 1.95 1.04582 3.16049
+34 2.01 0.97835 3.45257
+35 2.07 1.00581 3.77104
+36 2.13 1.01377 4.11091
+37 2.19 0.990181 4.46184
+38 2.25 0.999092 4.83559
+39 2.31 1.0157 5.23609
+40 2.37 0.971801 5.63944
+41 2.43 0.999601 6.07561
+42 2.49 0.958237 6.51462
+43 2.55 1.0547 7.0214
+44 2.61 1.02235 7.53602
+45 2.67 0.974215 8.04922
+46 2.73 0.99727 8.59843
+47 2.79 1.01002 9.17939
+48 2.85 1.00716 9.78388
+49 2.91 0.996835 10.4076
+50 2.97 1.00019 11.0596
+102200 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0.108706 0.000356633
+5 0.27 0 0.000356633
+6 0.33 0.265194 0.00249643
+7 0.39 0.380042 0.00677603
+8 0.45 0.380791 0.0124822
+9 0.51 0.797007 0.0278174
+10 0.57 0.786611 0.046719
+11 0.63 0.935656 0.0741797
+12 0.69 0.9726 0.108417
+13 0.75 1.08914 0.153709
+14 0.81 1.13972 0.208987
+15 0.87 1.10911 0.271041
+16 0.93 1.07107 0.339515
+17 0.99 1.12737 0.421184
+18 1.05 0.962855 0.499643
+19 1.11 0.971258 0.588088
+20 1.17 0.983495 0.687589
+21 1.23 0.940937 0.792796
+22 1.29 0.959854 0.910842
+23 1.35 0.947936 1.03852
+24 1.41 1.07289 1.19615
+25 1.47 1.0139 1.35806
+26 1.53 1.01429 1.53352
+27 1.59 1.00982 1.72218
+28 1.65 1.00331 1.92404
+29 1.71 1.07278 2.15585
+30 1.77 0.979724 2.38267
+31 1.83 0.948243 2.61733
+32 1.89 0.982221 2.8766
+33 1.95 1.03821 3.16833
+34 2.01 0.980739 3.46113
+35 2.07 1.02833 3.78673
+36 2.13 0.978666 4.11484
+37 2.19 0.987162 4.46469
+38 2.25 0.986698 4.83381
+39 2.31 1.02203 5.2368
+40 2.37 0.919388 5.6184
+41 2.43 0.979168 6.04565
+42 2.49 1.07033 6.53602
+43 2.55 1.02501 7.02853
+44 2.61 1.02873 7.54636
+45 2.67 1.05275 8.10093
+46 2.73 1.00051 8.65193
+47 2.79 0.97096 9.21041
+48 2.85 0.966755 9.79066
+49 2.91 0.999115 10.4158
+50 2.97 0.973381 11.0503
+102250 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0.197809 0.0010699
+6 0.33 0.265194 0.0032097
+7 0.39 0.190021 0.0053495
+8 0.45 0.380791 0.0110556
+9 0.51 0.611657 0.0228245
+10 0.57 0.831136 0.042796
+11 0.63 0.935656 0.0702568
+12 0.69 0.861156 0.100571
+13 0.75 1.14917 0.148359
+14 0.81 1.18384 0.205777
+15 0.87 1.07086 0.265692
+16 0.93 1.05434 0.333096
+17 0.99 1.0486 0.409058
+18 1.05 1.05039 0.49465
+19 1.11 0.932095 0.579529
+20 1.17 0.944719 0.675107
+21 1.23 0.931368 0.779244
+22 1.29 0.945354 0.895506
+23 1.35 1.01678 1.03245
+24 1.41 0.953946 1.17261
+25 1.47 1.02953 1.33702
+26 1.53 0.989549 1.5082
+27 1.59 0.996459 1.69437
+28 1.65 0.994448 1.89444
+29 1.71 1.03317 2.11769
+30 1.77 1.0475 2.3602
+31 1.83 0.977065 2.602
+32 1.89 0.993029 2.86412
+33 1.95 0.993786 3.14337
+34 2.01 1.0333 3.45185
+35 2.07 0.995671 3.76712
+36 2.13 1.04568 4.11769
+37 2.19 0.978105 4.46434
+38 2.25 0.990512 4.83488
+39 2.31 0.965957 5.21576
+40 2.37 1.02078 5.63944
+41 2.43 0.988158 6.07061
+42 2.49 1.02674 6.54101
+43 2.55 1.01017 7.02639
+44 2.61 0.985512 7.52247
+45 2.67 1.04192 8.07133
+46 2.73 0.990794 8.61698
+47 2.79 0.943679 9.15977
+48 2.85 1.00538 9.7632
+49 2.91 0.959788 10.3638
+50 2.97 1.02427 11.0314
+102300 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0.197809 0.0010699
+6 0.33 0.132597 0.0021398
+7 0.39 0.411712 0.00677603
+8 0.45 0.333192 0.0117689
+9 0.51 0.611657 0.0235378
+10 0.57 0.638194 0.038873
+11 0.63 0.959959 0.0670471
+12 0.69 1.15496 0.107703
+13 0.75 0.917623 0.145863
+14 0.81 1.15443 0.201854
+15 0.87 1.23659 0.271041
+16 0.93 1.08781 0.340585
+17 0.99 1.08306 0.419044
+18 1.05 1.01537 0.501783
+19 1.11 0.924262 0.585949
+20 1.17 1.04342 0.691512
+21 1.23 0.899472 0.792083
+22 1.29 0.991752 0.914051
+23 1.35 0.958527 1.04315
+24 1.41 0.941809 1.18153
+25 1.47 1.0273 1.34558
+26 1.53 0.987488 1.51641
+27 1.59 1.05945 1.71434
+28 1.65 1.05826 1.92725
+29 1.71 0.948999 2.13231
+30 1.77 1.02748 2.37019
+31 1.83 1.00012 2.61769
+32 1.89 1.0768 2.90193
+33 1.95 0.965864 3.17332
+34 2.01 1.0106 3.47504
+35 2.07 1.00018 3.79173
+36 2.13 1.03717 4.13944
+37 2.19 0.985149 4.48859
+38 2.25 0.986698 4.8577
+39 2.31 0.967766 5.2393
+40 2.37 1.02593 5.66512
+41 2.43 0.97835 6.09201
+42 2.49 1.01273 6.55599
+43 2.55 1.01907 7.04565
+44 2.61 0.992597 7.54529
+45 2.67 1.02905 8.08738
+46 2.73 0.977195 8.62553
+47 2.79 0.998861 9.20007
+48 2.85 1.01132 9.80706
+49 2.91 0.996835 10.4308
+50 2.97 0.969004 11.0624
+102350 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0.197809 0.0010699
+6 0.33 0.0883979 0.00178317
+7 0.39 0.348371 0.00570613
+8 0.45 0.594986 0.014622
+9 0.51 0.537517 0.0249643
+10 0.57 0.801453 0.0442225
+11 0.63 1.09362 0.0763195
+12 0.69 0.942206 0.109486
+13 0.75 1.08057 0.154422
+14 0.81 1.15443 0.210414
+15 0.87 1.1601 0.275321
+16 0.93 1.09897 0.345578
+17 0.99 1.03383 0.420471
+18 1.05 1.00224 0.50214
+19 1.11 0.955593 0.589158
+20 1.17 0.912993 0.681526
+21 1.23 1.02387 0.796006
+22 1.29 0.959854 0.914051
+23 1.35 0.987654 1.04708
+24 1.41 1.03162 1.19864
+25 1.47 1.02507 1.36234
+26 1.53 1.01841 1.53852
+27 1.59 0.937283 1.71362
+28 1.65 0.997993 1.91441
+29 1.71 1.10084 2.15228
+30 1.77 0.951996 2.37268
+31 1.83 1.08082 2.64016
+32 1.89 0.979519 2.89872
+33 1.95 0.995056 3.17832
+34 2.01 1.03449 3.48716
+35 2.07 0.975397 3.79601
+36 2.13 0.980794 4.12482
+37 2.19 0.972068 4.46933
+38 2.25 1.01053 4.84736
+39 2.31 0.959626 5.22575
+40 2.37 1.0371 5.65621
+41 2.43 0.982437 6.08488
+42 2.49 1.01195 6.5485
+43 2.55 0.974539 7.01676
+44 2.61 1.01881 7.5296
+45 2.67 1.06629 8.0913
+46 2.73 0.970072 8.62553
+47 2.79 1.01436 9.20899
+48 2.85 1.00954 9.81491
+49 2.91 1.00082 10.4412
+50 2.97 0.9794 11.0795
+102400 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0.217411 0.000713267
+5 0.27 0.0659362 0.0010699
+6 0.33 0.0883979 0.00178317
+7 0.39 0.538392 0.00784593
+8 0.45 0.452189 0.014622
+9 0.51 0.574587 0.0256776
+10 0.57 0.534302 0.0385164
+11 0.63 0.899202 0.0649073
+12 0.69 1.12457 0.104494
+13 0.75 1.16633 0.152996
+14 0.81 1.12501 0.207561
+15 0.87 1.17922 0.273538
+16 0.93 1.13244 0.345934
+17 0.99 1.02399 0.420114
+18 1.05 1.00662 0.50214
+19 1.11 0.986924 0.592011
+20 1.17 0.923569 0.685449
+21 1.23 0.966454 0.793509
+22 1.29 0.878658 0.901569
+23 1.35 1.03796 1.04137
+24 1.41 0.929672 1.17796
+25 1.47 1.04293 1.34451
+26 1.53 1.02666 1.52211
+27 1.59 0.985006 1.70613
+28 1.65 1.05117 1.91762
+29 1.71 0.993561 2.13231
+30 1.77 1.01515 2.36733
+31 1.83 0.972742 2.60806
+32 1.89 1.00384 2.87304
+33 1.95 1.02171 3.16013
+34 2.01 1.05122 3.47397
+35 2.07 0.967513 3.78031
+36 2.13 1.0276 4.12482
+37 2.19 0.96603 4.46719
+38 2.25 0.969538 4.82989
+39 2.31 1.03922 5.23966
+40 2.37 1.01734 5.66191
+41 2.43 0.975898 6.08773
+42 2.49 0.972249 6.53317
+43 2.55 1.0354 7.03067
+44 2.61 1.0181 7.54315
+45 2.67 0.97083 8.05456
+46 2.73 1.00763 8.60949
+47 2.79 0.990801 9.17939
+48 2.85 0.978639 9.76676
+49 2.91 0.975747 10.3773
+50 2.97 1.02098 11.0428
+102450 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0.131872 0.000713267
+6 0.33 0.044199 0.0010699
+7 0.39 0.221691 0.00356633
+8 0.45 0.404591 0.0096291
+9 0.51 0.518981 0.0196148
+10 0.57 0.801453 0.038873
+11 0.63 0.911353 0.0656205
+12 0.69 0.942206 0.0987874
+13 0.75 1.12345 0.145506
+14 0.81 1.11766 0.199715
+15 0.87 1.24296 0.269258
+16 0.93 1.37231 0.35699
+17 0.99 0.974758 0.427603
+18 1.05 0.949725 0.504993
+19 1.11 0.998673 0.595934
+20 1.17 0.941194 0.691155
+21 1.23 0.902661 0.792083
+22 1.29 0.916356 0.904779
+23 1.35 1.00354 1.03994
+24 1.41 0.997638 1.18652
+25 1.47 0.975936 1.34237
+26 1.53 1.03903 1.52211
+27 1.59 0.985006 1.70613
+28 1.65 1.02636 1.91262
+29 1.71 0.986959 2.12589
+30 1.77 1.05829 2.3709
+31 1.83 0.998681 2.61805
+32 1.89 1.04032 2.89265
+33 1.95 1.06994 3.1933
+34 2.01 0.984323 3.48716
+35 2.07 0.974271 3.79565
+36 2.13 0.956327 4.11626
+37 2.19 0.984143 4.46505
+38 2.25 0.962865 4.82525
+39 2.31 1.00033 5.21969
+40 2.37 1.05773 5.6587
+41 2.43 1.01758 6.10271
+42 2.49 0.968357 6.54636
+43 2.55 1.00868 7.03103
+44 2.61 1.02235 7.54565
+45 2.67 1.01145 8.07846
+46 2.73 1.00504 8.63195
+47 2.79 0.999481 9.20685
+48 2.85 1.00954 9.81277
+49 2.91 1.01108 10.4454
+50 2.97 0.97557 11.0813
+102500 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0.353592 0.00285307
+7 0.39 0.253361 0.00570613
+8 0.45 0.237994 0.00927247
+9 0.51 0.722867 0.0231812
+10 0.57 0.771769 0.0417261
+11 0.63 0.984262 0.0706134
+12 0.69 1.06378 0.10806
+13 0.75 1.05484 0.151926
+14 0.81 1.27943 0.21398
+15 0.87 1.02624 0.271398
+16 0.93 1.16033 0.345578
+17 0.99 1.02399 0.419757
+18 1.05 0.967231 0.498573
+19 1.11 1.01434 0.590942
+20 1.17 0.881268 0.6801
+21 1.23 0.976023 0.78923
+22 1.29 0.930855 0.903709
+23 1.35 0.966471 1.03388
+24 1.41 0.941809 1.17225
+25 1.47 0.996035 1.33131
+26 1.53 1.10087 1.52175
+27 1.59 1.06136 1.72004
+28 1.65 1.07067 1.93545
+29 1.71 0.993561 2.15014
+30 1.77 1.02902 2.38837
+31 1.83 0.94392 2.62197
+32 1.89 0.98087 2.88088
+33 1.95 1.02044 3.16762
+34 2.01 0.925789 3.44401
+35 2.07 0.997924 3.75999
+36 2.13 1.02441 4.10342
+37 2.19 0.992193 4.45506
+38 2.25 1.01911 4.83631
+39 2.31 1.00394 5.23217
+40 2.37 0.977816 5.63802
+41 2.43 1.05681 6.09914
+42 2.49 0.99638 6.55563
+43 2.55 0.961921 7.01783
+44 2.61 1.01173 7.5271
+45 2.67 1.03447 8.07204
+46 2.73 0.977843 8.61056
+47 2.79 1.0125 9.19294
+48 2.85 1.00241 9.79458
+49 2.91 0.993985 10.4165
+50 2.97 0.962438 11.0439
+102550 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0.131872 0.000713267
+6 0.33 0.044199 0.0010699
+7 0.39 0.221691 0.00356633
+8 0.45 0.523588 0.0114123
+9 0.51 0.797007 0.0267475
+10 0.57 0.697561 0.0435093
+11 0.63 1.13008 0.0766762
+12 0.69 0.942206 0.109843
+13 0.75 0.88332 0.146576
+14 0.81 1.21325 0.205421
+15 0.87 1.22384 0.273894
+16 0.93 1.17707 0.349144
+17 0.99 1.03383 0.424037
+18 1.05 0.958478 0.50214
+19 1.11 0.986924 0.592011
+20 1.17 0.909468 0.684023
+21 1.23 0.944126 0.789586
+22 1.29 1.02655 0.915835
+23 1.35 0.995597 1.04993
+24 1.41 1.0122 1.19864
+25 1.47 1.03177 1.36341
+26 1.53 1.12974 1.55884
+27 1.59 1.04991 1.75499
+28 1.65 1.04231 1.96469
+29 1.71 1.01007 2.18295
+30 1.77 0.924268 2.39693
+31 1.83 0.955448 2.63338
+32 1.89 1.00384 2.89836
+33 1.95 1.01536 3.18367
+34 2.01 0.95207 3.4679
+35 2.07 1.0396 3.79708
+36 2.13 1.02122 4.13944
+37 2.19 1.04049 4.5082
+38 2.25 0.976212 4.8734
+39 2.31 0.97681 5.25856
+40 2.37 1.04054 5.69044
+41 2.43 1.01513 6.13338
+42 2.49 0.990153 6.58702
+43 2.55 0.973797 7.05492
+44 2.61 1.03227 7.57454
+45 2.67 0.976246 8.0888
+46 2.73 0.95971 8.61733
+47 2.79 1.01684 9.20221
+48 2.85 1.01667 9.81241
+49 2.91 1.02134 10.4515
+50 2.97 0.980494 11.0906
+102600 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0.217411 0.000713267
+5 0.27 0.0659362 0.0010699
+6 0.33 0.0883979 0.00178317
+7 0.39 0.253361 0.00463623
+8 0.45 0.42839 0.0110556
+9 0.51 0.648727 0.0235378
+10 0.57 0.667877 0.0395863
+11 0.63 0.935656 0.0670471
+12 0.69 1.17523 0.108417
+13 0.75 1.01196 0.150499
+14 0.81 1.22796 0.210057
+15 0.87 1.09636 0.271398
+16 0.93 1.16033 0.345578
+17 0.99 1.05353 0.421897
+18 1.05 0.919089 0.49679
+19 1.11 1.01434 0.589158
+20 1.17 0.874218 0.677603
+21 1.23 0.969643 0.78602
+22 1.29 0.936655 0.901213
+23 1.35 0.985006 1.03388
+24 1.41 0.905399 1.1669
+25 1.47 1.034 1.33203
+26 1.53 1.0617 1.51569
+27 1.59 1.04227 1.71041
+28 1.65 1.05472 1.92261
+29 1.71 0.982008 2.13481
+30 1.77 0.988967 2.36377
+31 1.83 0.979947 2.60628
+32 1.89 1.00114 2.87054
+33 1.95 0.94048 3.13481
+34 2.01 1.05002 3.44829
+35 2.07 0.946113 3.74786
+36 2.13 0.983985 4.07775
+37 2.19 0.998231 4.43153
+38 2.25 0.975258 4.79636
+39 2.31 1.04193 5.2072
+40 2.37 1.0225 5.6316
+41 2.43 1.01922 6.07632
+42 2.49 0.968357 6.51997
+43 2.55 1.00794 7.00428
+44 2.61 1.00252 7.50892
+45 2.67 0.987755 8.02924
+46 2.73 0.966834 8.5617
+47 2.79 1.028 9.153
+48 2.85 1.02855 9.77033
+49 2.91 1.03559 10.4183
+50 2.97 0.972287 11.0521
+102650 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0.263745 0.00142653
+6 0.33 0.0883979 0.0021398
+7 0.39 0.253361 0.00499287
+8 0.45 0.380791 0.010699
+9 0.51 0.556052 0.021398
+10 0.57 0.816295 0.0410128
+11 0.63 0.887051 0.0670471
+12 0.69 1.10431 0.10592
+13 0.75 0.900472 0.143367
+14 0.81 1.2059 0.201854
+15 0.87 1.21109 0.269615
+16 0.93 1.17149 0.344508
+17 0.99 1.25045 0.435093
+18 1.05 0.962855 0.513552
+19 1.11 0.853767 0.591298
+20 1.17 0.905943 0.682953
+21 1.23 1.02387 0.797432
+22 1.29 0.927955 0.911555
+23 1.35 0.94264 1.03852
+24 1.41 0.973364 1.18153
+25 1.47 1.034 1.34665
+26 1.53 1.01223 1.52175
+27 1.59 1.09191 1.72575
+28 1.65 0.939496 1.91476
+29 1.71 1.01172 2.13338
+30 1.77 1.02132 2.36983
+31 1.83 0.99724 2.61662
+32 1.89 1.01465 2.88445
+33 1.95 0.98744 3.16191
+34 2.01 1.01897 3.46612
+35 2.07 1.01595 3.7878
+36 2.13 0.975475 4.11484
+37 2.19 0.948923 4.45114
+38 2.25 0.982885 4.81883
+39 2.31 1.04645 5.23146
+40 2.37 1.00359 5.648
+41 2.43 1.02167 6.09379
+42 2.49 1.06566 6.58203
+43 2.55 1.01017 7.0674
+44 2.61 1.00464 7.57311
+45 2.67 0.965414 8.08167
+46 2.73 0.975252 8.61876
+47 2.79 0.999481 9.19365
+48 2.85 1.00716 9.79815
+49 2.91 0.998545 10.423
+50 2.97 1.00566 11.0785
+102700 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0.108706 0.000356633
+5 0.27 0.263745 0.00178317
+6 0.33 0.176796 0.0032097
+7 0.39 0.253361 0.00606277
+8 0.45 0.547387 0.0142653
+9 0.51 0.704332 0.0278174
+10 0.57 0.608511 0.0424394
+11 0.63 0.826294 0.0666904
+12 0.69 0.780106 0.0941512
+13 0.75 1.1406 0.141583
+14 0.81 1.24266 0.201854
+15 0.87 1.22384 0.270328
+16 0.93 1.08781 0.339872
+17 0.99 1.09783 0.419401
+18 1.05 0.940972 0.496077
+19 1.11 0.936011 0.581312
+20 1.17 0.944719 0.67689
+21 1.23 0.845248 0.771398
+22 1.29 1.00625 0.89515
+23 1.35 1.02472 1.03317
+24 1.41 0.973364 1.17618
+25 1.47 1.00497 1.33666
+26 1.53 1.04109 1.51676
+27 1.59 1.03846 1.71077
+28 1.65 0.946587 1.90121
+29 1.71 1.04142 2.12625
+30 1.77 0.993588 2.35628
+31 1.83 1.01597 2.6077
+32 1.89 0.960604 2.86127
+33 1.95 1.07248 3.16262
+34 2.01 0.953264 3.44722
+35 2.07 0.984408 3.75892
+36 2.13 0.97973 4.08738
+37 2.19 1.01232 4.44615
+38 2.25 0.980978 4.81312
+39 2.31 1.03922 5.2229
+40 2.37 1.00016 5.63802
+41 2.43 0.987341 6.06883
+42 2.49 0.960573 6.50892
+43 2.55 1.02649 7.00214
+44 2.61 1.03794 7.52461
+45 2.67 0.987755 8.04494
+46 2.73 0.986909 8.58845
+47 2.79 1.01002 9.1694
+48 2.85 0.984581 9.76034
+49 2.91 1.03616 10.4087
+50 2.97 0.972834 11.0428
+102750 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0.132597 0.0010699
+7 0.39 0.221691 0.00356633
+8 0.45 0.571187 0.0121255
+9 0.51 0.537517 0.0224679
+10 0.57 0.801453 0.0417261
+11 0.63 0.911353 0.0684736
+12 0.69 1.09418 0.10699
+13 0.75 1.02911 0.149786
+14 0.81 1.05884 0.201141
+15 0.87 1.26209 0.271755
+16 0.93 1.14359 0.344864
+17 0.99 0.99445 0.416904
+18 1.05 1.03288 0.50107
+19 1.11 1.08483 0.599857
+20 1.17 0.927094 0.693652
+21 1.23 0.921799 0.796719
+22 1.29 0.861259 0.902639
+23 1.35 1.05915 1.04529
+24 1.41 1.0389 1.19793
+25 1.47 0.96477 1.352
+26 1.53 0.995734 1.52425
+27 1.59 1.01555 1.71398
+28 1.65 1.04763 1.92475
+29 1.71 1.01172 2.14337
+30 1.77 1.01053 2.37732
+31 1.83 0.994358 2.6234
+32 1.89 0.964657 2.87803
+33 1.95 0.998863 3.1587
+34 2.01 1.03449 3.46755
+35 2.07 1.01482 3.78887
+36 2.13 0.97122 4.11448
+37 2.19 0.998231 4.46826
+38 2.25 1.02006 4.84986
+39 2.31 0.964148 5.23003
+40 2.37 0.988986 5.64051
+41 2.43 1.04701 6.09736
+42 2.49 1.00027 6.55563
+43 2.55 0.961921 7.01783
+44 2.61 1.0344 7.53852
+45 2.67 1.0101 8.07061
+46 2.73 0.986261 8.61377
+47 2.79 0.9784 9.17653
+48 2.85 1.00954 9.78245
+49 2.91 0.970047 10.3894
+50 2.97 1.03576 11.0646
+102800 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0.108706 0.000356633
+5 0.27 0.0659362 0.000713267
+6 0.33 0.353592 0.00356633
+7 0.39 0.190021 0.00570613
+8 0.45 0.42839 0.0121255
+9 0.51 0.556052 0.0228245
+10 0.57 0.831136 0.042796
+11 0.63 0.78984 0.0659772
+12 0.69 1.01313 0.101641
+13 0.75 1.02911 0.144437
+14 0.81 1.10295 0.197932
+15 0.87 1.17285 0.263552
+16 0.93 1.04876 0.330599
+17 0.99 1.07814 0.408702
+18 1.05 0.984738 0.488944
+19 1.11 1.09658 0.588802
+20 1.17 1.07162 0.697218
+21 1.23 0.947316 0.803138
+22 1.29 0.939555 0.918688
+23 1.35 0.987654 1.05171
+24 1.41 0.912681 1.18581
+25 1.47 1.0742 1.35735
+26 1.53 1.0349 1.53638
+27 1.59 0.943009 1.71255
+28 1.65 0.994448 1.91262
+29 1.71 1.04142 2.13766
+30 1.77 1.00129 2.36947
+31 1.83 0.990035 2.61448
+32 1.89 1.02951 2.88623
+33 1.95 0.967133 3.15799
+34 2.01 0.989101 3.45328
+35 2.07 0.97765 3.76284
+36 2.13 0.932924 4.07561
+37 2.19 0.989175 4.42618
+38 2.25 1.02483 4.80956
+39 2.31 0.982237 5.19686
+40 2.37 1.02422 5.62197
+41 2.43 1.03883 6.07525
+42 2.49 1.02596 6.54529
+43 2.55 0.994579 7.02318
+44 2.61 0.985512 7.51926
+45 2.67 0.93698 8.01284
+46 2.73 1.06786 8.60093
+47 2.79 0.966 9.15656
+48 2.85 1.003 9.75856
+49 2.91 1.01564 10.3941
+50 2.97 0.984872 11.036
+102850 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0.197809 0.0010699
+6 0.33 0.176796 0.00249643
+7 0.39 0.285031 0.00570613
+8 0.45 0.380791 0.0114123
+9 0.51 0.648727 0.0238944
+10 0.57 0.786611 0.042796
+11 0.63 0.814142 0.0666904
+12 0.69 1.00299 0.101997
+13 0.75 0.926199 0.140514
+14 0.81 1.13237 0.195435
+15 0.87 1.14735 0.259629
+16 0.93 1.30537 0.343081
+17 0.99 1.02399 0.417261
+18 1.05 1.15543 0.511412
+19 1.11 0.967342 0.599501
+20 1.17 0.877743 0.688302
+21 1.23 0.924989 0.791726
+22 1.29 0.997552 0.914408
+23 1.35 0.953231 1.0428
+24 1.41 1.03162 1.19437
+25 1.47 0.989335 1.35235
+26 1.53 0.997796 1.52496
+27 1.59 0.99455 1.71077
+28 1.65 0.971403 1.90621
+29 1.71 1.05958 2.13516
+30 1.77 0.998209 2.36626
+31 1.83 1.00012 2.61377
+32 1.89 1.00384 2.87874
+33 1.95 0.979825 3.15407
+34 2.01 0.954459 3.43902
+35 2.07 0.982155 3.75
+36 2.13 0.968029 4.07454
+37 2.19 1.03949 4.44294
+38 2.25 1.01339 4.82204
+39 2.31 1.02203 5.22504
+40 2.37 0.972661 5.62874
+41 2.43 0.976716 6.05492
+42 2.49 1.02129 6.52282
+43 2.55 1.03689 7.02104
+44 2.61 0.960715 7.50464
+45 2.67 1.05004 8.05777
+46 2.73 0.986909 8.60128
+47 2.79 1.01498 9.18509
+48 2.85 0.976857 9.7714
+49 2.91 0.983156 10.3866
+50 2.97 0.991437 11.0328
+102900 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0.131872 0.000713267
+6 0.33 0.0883979 0.00142653
+7 0.39 0.221691 0.00392297
+8 0.45 0.475989 0.0110556
+9 0.51 0.518981 0.0210414
+10 0.57 0.905345 0.042796
+11 0.63 1.03287 0.0731098
+12 0.69 0.982731 0.107703
+13 0.75 1.22636 0.158702
+14 0.81 1.17648 0.215763
+15 0.87 1.05811 0.274964
+16 0.93 0.959504 0.336305
+17 0.99 1.09783 0.415835
+18 1.05 1.0285 0.499643
+19 1.11 1.07308 0.597361
+20 1.17 0.96587 0.695078
+21 1.23 0.91223 0.797076
+22 1.29 0.933755 0.911912
+23 1.35 0.97971 1.04387
+24 1.41 0.980646 1.18795
+25 1.47 1.02953 1.35235
+26 1.53 1.0246 1.5296
+27 1.59 1.06327 1.72825
+28 1.65 0.985584 1.92653
+29 1.71 1.01667 2.14622
+30 1.77 0.911944 2.35735
+31 1.83 0.99724 2.60414
+32 1.89 0.990327 2.86555
+33 1.95 1.01663 3.15121
+34 2.01 0.997463 3.449
+35 2.07 1.00243 3.76641
+36 2.13 0.98824 4.09772
+37 2.19 0.959992 4.43795
+38 2.25 0.998138 4.81134
+39 2.31 1.02294 5.21469
+40 2.37 1.07921 5.66262
+41 2.43 0.988158 6.09379
+42 2.49 0.955902 6.53174
+43 2.55 0.996063 7.01034
+44 2.61 1.02377 7.52568
+45 2.67 0.973538 8.03852
+46 2.73 1.03094 8.60628
+47 2.79 1.01064 9.18759
+48 2.85 1.04341 9.81384
+49 2.91 0.978027 10.4258
+50 2.97 0.983777 11.067
+102950 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0.21169 0.000356633
+4 0.21 0.108706 0.000713267
+5 0.27 0.131872 0.00142653
+6 0.33 0.265194 0.00356633
+7 0.39 0.380042 0.00784593
+8 0.45 0.380791 0.0135521
+9 0.51 0.574587 0.0246077
+10 0.57 0.667877 0.0406562
+11 0.63 0.850597 0.0656205
+12 0.69 0.911813 0.0977175
+13 0.75 0.943351 0.136947
+14 0.81 1.05884 0.188302
+15 0.87 1.31945 0.262126
+16 0.93 1.12128 0.333809
+17 0.99 1.08799 0.412625
+18 1.05 1.05914 0.49893
+19 1.11 0.916429 0.582382
+20 1.17 0.983495 0.681883
+21 1.23 0.91861 0.784593
+22 1.29 1.03235 0.911555
+23 1.35 0.89233 1.03174
+24 1.41 0.890835 1.16262
+25 1.47 1.08983 1.33666
+26 1.53 1.1318 1.53245
+27 1.59 0.97737 1.71505
+28 1.65 1.01572 1.9194
+29 1.71 0.927544 2.11983
+30 1.77 0.995129 2.35021
+31 1.83 1.03039 2.60521
+32 1.89 0.976817 2.86305
+33 1.95 1.01156 3.14729
+34 2.01 0.969988 3.43688
+35 2.07 1.04185 3.76676
+36 2.13 0.990368 4.09879
+37 2.19 1.03043 4.46398
+38 2.25 1.00386 4.83951
+39 2.31 0.963243 5.21933
+40 2.37 1.0139 5.64016
+41 2.43 1.05028 6.09843
+42 2.49 0.936442 6.52746
+43 2.55 1.02946 7.02211
+44 2.61 1.0181 7.53459
+45 2.67 0.97083 8.04601
+46 2.73 0.995327 8.59415
+47 2.79 0.997001 9.16762
+48 2.85 1.00538 9.77104
+49 2.91 1.01906 10.4087
+50 2.97 0.977212 11.0456
+103000 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0.217411 0.000713267
+5 0.27 0.0659362 0.0010699
+6 0.33 0.132597 0.0021398
+7 0.39 0.221691 0.00463623
+8 0.45 0.356992 0.00998573
+9 0.51 0.574587 0.0210414
+10 0.57 0.712403 0.0381598
+11 0.63 0.947808 0.0659772
+12 0.69 1.11444 0.105207
+13 0.75 0.780409 0.13766
+14 0.81 1.24266 0.197932
+15 0.87 1.24296 0.267475
+16 0.93 1.18264 0.343081
+17 0.99 1.10768 0.423324
+18 1.05 0.989114 0.503923
+19 1.11 1.01434 0.596291
+20 1.17 0.969395 0.694365
+21 1.23 0.909041 0.796006
+22 1.29 0.965654 0.914765
+23 1.35 1.00089 1.04957
+24 1.41 0.946664 1.18866
+25 1.47 0.982636 1.34558
+26 1.53 1.01635 1.5214
+27 1.59 1.03464 1.71469
+28 1.65 0.983812 1.91262
+29 1.71 1.02987 2.13516
+30 1.77 0.942753 2.35342
+31 1.83 1.0448 2.61198
+32 1.89 0.99438 2.87447
+33 1.95 0.979825 3.14979
+34 2.01 1.01897 3.45399
+35 2.07 0.99905 3.77033
+36 2.13 0.974411 4.097
+37 2.19 1.0727 4.47718
+38 2.25 0.968585 4.83951
+39 2.31 0.975001 5.22397
+40 2.37 1.03195 5.65228
+41 2.43 1.02085 6.09772
+42 2.49 1.02596 6.56776
+43 2.55 0.959694 7.02889
+44 2.61 1.06274 7.56384
+45 2.67 0.931563 8.05456
+46 2.73 0.995975 8.60307
+47 2.79 1.00878 9.18331
+48 2.85 0.976857 9.76961
+49 2.91 1.00652 10.3994
+50 2.97 1.00347 11.0535
+103050 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0.0659362 0.000356633
+6 0.33 0.220995 0.0021398
+7 0.39 0.348371 0.00606277
+8 0.45 0.452189 0.0128388
+9 0.51 0.500446 0.0224679
+10 0.57 0.697561 0.0392297
+11 0.63 0.826294 0.0634807
+12 0.69 0.982731 0.0980742
+13 0.75 1.2092 0.148359
+14 0.81 1.22796 0.207917
+15 0.87 1.00075 0.263909
+16 0.93 1.12128 0.335592
+17 0.99 1.07322 0.413338
+18 1.05 0.932218 0.489301
+19 1.11 1.00651 0.580956
+20 1.17 1.07162 0.689372
+21 1.23 0.960075 0.796719
+22 1.29 0.884457 0.905492
+23 1.35 0.913513 1.02853
+24 1.41 0.990356 1.17404
+25 1.47 1.02283 1.33738
+26 1.53 0.991611 1.50892
+27 1.59 1.02128 1.69971
+28 1.65 0.969631 1.89479
+29 1.71 1.04307 2.12019
+30 1.77 0.944294 2.3388
+31 1.83 0.995799 2.58524
+32 1.89 1.07544 2.86912
+33 1.95 1.03821 3.16084
+34 2.01 0.949681 3.44437
+35 2.07 0.960755 3.74857
+36 2.13 0.992495 4.08131
+37 2.19 1.05358 4.45471
+38 2.25 0.995278 4.82703
+39 2.31 1.00485 5.22325
+40 2.37 0.981253 5.63053
+41 2.43 1.02657 6.07846
+42 2.49 0.987817 6.53103
+43 2.55 0.988641 7.00606
+44 2.61 0.971342 7.49501
+45 2.67 1.01213 8.02817
+46 2.73 1.00698 8.58274
+47 2.79 1.04164 9.18188
+48 2.85 0.935857 9.74358
+49 2.91 1.01906 10.3812
+50 2.97 0.99472 11.0296
+103100 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0.0659362 0.000356633
+6 0.33 0.265194 0.00249643
+7 0.39 0.380042 0.00677603
+8 0.45 0.594986 0.0156919
+9 0.51 0.759937 0.0303138
+10 0.57 0.638194 0.0456491
+11 0.63 0.862748 0.07097
+12 0.69 0.921944 0.103424
+13 0.75 1.08914 0.148716
+14 0.81 1.07354 0.200785
+15 0.87 1.12186 0.263552
+16 0.93 1.17707 0.338802
+17 0.99 1.0683 0.416191
+18 1.05 1.12479 0.507846
+19 1.11 0.959509 0.595221
+20 1.17 0.937669 0.690086
+21 1.23 0.886713 0.78923
+22 1.29 0.968553 0.908345
+23 1.35 0.955879 1.03709
+24 1.41 0.966082 1.17903
+25 1.47 0.940204 1.32917
+26 1.53 1.08026 1.51605
+27 1.59 0.937283 1.69116
+28 1.65 1.03522 1.89943
+29 1.71 1.02987 2.12197
+30 1.77 1.01361 2.35663
+31 1.83 0.935273 2.58809
+32 1.89 1.0795 2.87304
+33 1.95 0.931595 3.13481
+34 2.01 1.01777 3.43866
+35 2.07 1.01257 3.75927
+36 2.13 0.976539 4.08666
+37 2.19 0.980118 4.43402
+38 2.25 0.980978 4.801
+39 2.31 1.02384 5.20471
+40 2.37 0.983831 5.61305
+41 2.43 1.00777 6.05278
+42 2.49 1.01973 6.51997
+43 2.55 0.996805 6.99893
+44 2.61 1.00677 7.50571
+45 2.67 1.01416 8.03994
+46 2.73 0.991442 8.58595
+47 2.79 0.979021 9.14907
+48 2.85 0.998248 9.74822
+49 2.91 1.00595 10.3777
+50 2.97 1.00019 11.0296
+103150 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0.108706 0.000356633
+5 0.27 0 0.000356633
+6 0.33 0.265194 0.00249643
+7 0.39 0.285031 0.00570613
+8 0.45 0.309393 0.0103424
+9 0.51 0.685797 0.0235378
+10 0.57 0.742086 0.0413695
+11 0.63 0.850597 0.0663338
+12 0.69 0.962469 0.100214
+13 0.75 1.05484 0.14408
+14 0.81 1.22796 0.203638
+15 0.87 1.21747 0.271755
+16 0.93 1.22169 0.349857
+17 0.99 0.989527 0.421541
+18 1.05 0.940972 0.498217
+19 1.11 0.932095 0.583096
+20 1.17 0.920044 0.676177
+21 1.23 1.06852 0.795649
+22 1.29 0.965654 0.914408
+23 1.35 0.974414 1.04565
+24 1.41 0.997638 1.19223
+25 1.47 0.913405 1.33809
+26 1.53 0.979242 1.50749
+27 1.59 0.998368 1.69401
+28 1.65 1.01926 1.89907
+29 1.71 1.03317 2.12233
+30 1.77 1.04442 2.36412
+31 1.83 0.949684 2.59914
+32 1.89 1.01059 2.86591
+33 1.95 1.02425 3.15371
+34 2.01 1.03569 3.46291
+35 2.07 0.983282 3.77425
+36 2.13 0.995687 4.10806
+37 2.19 0.990181 4.45899
+38 2.25 0.960958 4.81847
+39 2.31 0.98495 5.20685
+40 2.37 0.983831 5.61519
+41 2.43 1.0184 6.05956
+42 2.49 1.02051 6.5271
+43 2.55 0.967859 6.99215
+44 2.61 0.993305 7.49215
+45 2.67 1.02296 8.03103
+46 2.73 0.990794 8.57668
+47 2.79 0.990801 9.14658
+48 2.85 1.003 9.74857
+49 2.91 1.04186 10.4005
+50 2.97 0.996909 11.0503
+103200 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0.0659362 0.000356633
+6 0.33 0.353592 0.0032097
+7 0.39 0.253361 0.00606277
+8 0.45 0.42839 0.0124822
+9 0.51 0.611657 0.0242511
+10 0.57 0.667877 0.0402996
+11 0.63 0.862748 0.0656205
+12 0.69 1.07391 0.103424
+13 0.75 1.14917 0.151213
+14 0.81 1.11031 0.205064
+15 0.87 1.1346 0.268545
+16 0.93 1.03202 0.334522
+17 0.99 1.18645 0.420471
+18 1.05 1.0285 0.50428
+19 1.11 0.853767 0.582026
+20 1.17 0.930619 0.676177
+21 1.23 0.899472 0.776748
+22 1.29 0.988852 0.898359
+23 1.35 0.879091 1.01676
+24 1.41 0.961228 1.15799
+25 1.47 1.03177 1.32275
+26 1.53 1.04521 1.50357
+27 1.59 1.027 1.69544
+28 1.65 1.06004 1.9087
+29 1.71 1.01502 2.12803
+30 1.77 1.00899 2.36163
+31 1.83 0.952566 2.59736
+32 1.89 1.00249 2.86198
+33 1.95 0.973479 3.13552
+34 2.01 1.0118 3.43759
+35 2.07 0.97765 3.74715
+36 2.13 0.982922 4.07668
+37 2.19 0.989175 4.42725
+38 2.25 1.01911 4.80849
+39 2.31 0.965957 5.18937
+40 2.37 1.02078 5.61305
+41 2.43 0.988158 6.04422
+42 2.49 0.989374 6.4975
+43 2.55 1.02278 6.98894
+44 2.61 1.01102 7.49786
+45 2.67 0.999264 8.02425
+46 2.73 0.962948 8.55456
+47 2.79 0.994521 9.1266
+48 2.85 0.997654 9.72539
+49 2.91 1.043 10.378
+50 2.97 1.02208 11.0442
+103250 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0.263745 0.00142653
+6 0.33 0.132597 0.00249643
+7 0.39 0.380042 0.00677603
+8 0.45 0.452189 0.0135521
+9 0.51 0.463376 0.0224679
+10 0.57 0.875662 0.0435093
+11 0.63 0.862748 0.0688302
+12 0.69 0.921944 0.101284
+13 0.75 1.1406 0.148716
+14 0.81 1.03678 0.199001
+15 0.87 1.20472 0.266405
+16 0.93 0.992975 0.329886
+17 0.99 1.05353 0.406205
+18 1.05 0.997868 0.487518
+19 1.11 0.943844 0.573466
+20 1.17 0.941194 0.668688
+21 1.23 0.953695 0.775321
+22 1.29 0.962754 0.893723
+23 1.35 0.945288 1.02104
+24 1.41 1.04861 1.17511
+25 1.47 0.989335 1.3331
+26 1.53 1.0514 1.51498
+27 1.59 1.03082 1.70756
+28 1.65 1.03522 1.91583
+29 1.71 1.04968 2.14265
+30 1.77 0.988967 2.37161
+31 1.83 1.00156 2.61947
+32 1.89 0.960604 2.87304
+33 1.95 0.95698 3.14194
+34 2.01 0.962821 3.42939
+35 2.07 0.99004 3.74287
+36 2.13 1.03292 4.08916
+37 2.19 1.0566 4.46362
+38 2.25 1.02388 4.84665
+39 2.31 1.0356 5.25499
+40 2.37 0.980394 5.66191
+41 2.43 0.988158 6.09308
+42 2.49 0.983147 6.54351
+43 2.55 0.961179 7.00535
+44 2.61 1.02944 7.52354
+45 2.67 0.989786 8.04494
+46 2.73 0.985614 8.58773
+47 2.79 1.00568 9.16619
+48 2.85 0.970321 9.74857
+49 2.91 1.00937 10.3802
+50 2.97 1.01278 11.0403
+103300 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0.044199 0.000356633
+7 0.39 0.380042 0.00463623
+8 0.45 0.475989 0.0117689
+9 0.51 0.648727 0.0242511
+10 0.57 0.756928 0.0424394
+11 0.63 0.996413 0.0716833
+12 0.69 1.00299 0.10699
+13 0.75 1.08057 0.151926
+14 0.81 1.00736 0.200785
+15 0.87 1.1601 0.265692
+16 0.93 1.21054 0.343081
+17 0.99 1.07814 0.421184
+18 1.05 1.00224 0.502853
+19 1.11 1.01434 0.595221
+20 1.17 0.99407 0.695792
+21 1.23 0.889903 0.795292
+22 1.29 0.925055 0.909058
+23 1.35 0.998245 1.04351
+24 1.41 0.975792 1.18688
+25 1.47 1.00943 1.34807
+26 1.53 1.09263 1.53709
+27 1.59 0.925829 1.71006
+28 1.65 1.09549 1.93046
+29 1.71 1.00181 2.14693
+30 1.77 1.00437 2.37946
+31 1.83 0.942479 2.6127
+32 1.89 0.960604 2.86626
+33 1.95 1.04582 3.16013
+34 2.01 0.958043 3.44615
+35 2.07 0.991166 3.75999
+36 2.13 1.00739 4.09772
+37 2.19 0.932823 4.42832
+38 2.25 0.946658 4.78245
+39 2.31 1.03379 5.19009
+40 2.37 0.991564 5.60164
+41 2.43 1.03475 6.05314
+42 2.49 1.00572 6.51391
+43 2.55 1.02427 7.00606
+44 2.61 0.974176 7.49643
+45 2.67 0.995202 8.02068
+46 2.73 0.961006 8.54993
+47 2.79 1.05218 9.15514
+48 2.85 0.970321 9.73752
+49 2.91 1.01792 10.3745
+50 2.97 1.02536 11.0428
+103350 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0.197809 0.0010699
+6 0.33 0.397791 0.0042796
+7 0.39 0.221691 0.00677603
+8 0.45 0.356992 0.0121255
+9 0.51 0.630192 0.0242511
+10 0.57 0.712403 0.0413695
+11 0.63 0.984262 0.0702568
+12 0.69 0.932075 0.103067
+13 0.75 1.13202 0.150143
+14 0.81 1.0809 0.202568
+15 0.87 1.14735 0.266762
+16 0.93 1.29979 0.349857
+17 0.99 1.09291 0.42903
+18 1.05 0.993491 0.509986
+19 1.11 0.936011 0.595221
+20 1.17 0.849542 0.68117
+21 1.23 0.988781 0.791726
+22 1.29 1.03525 0.919044
+23 1.35 0.894978 1.03959
+24 1.41 1.02191 1.18973
+25 1.47 0.989335 1.34772
+26 1.53 1.04315 1.52817
+27 1.59 1.00219 1.71541
+28 1.65 0.992675 1.91512
+29 1.71 1.03482 2.13873
+30 1.77 0.984345 2.36662
+31 1.83 1.01597 2.61805
+32 1.89 0.960604 2.87161
+33 1.95 0.934134 3.13409
+34 2.01 1.02255 3.43937
+35 2.07 1.00356 3.75713
+36 2.13 0.981858 4.08631
+37 2.19 1.0254 4.44971
+38 2.25 1.02483 4.8331
+39 2.31 0.978619 5.21897
+40 2.37 1.01047 5.63837
+41 2.43 0.993062 6.07168
+42 2.49 0.992488 6.52639
+43 2.55 1.00274 7.0082
+44 2.61 1.0096 7.51641
+45 2.67 0.999264 8.0428
+46 2.73 1.00439 8.59593
+47 2.79 1.0218 9.18367
+48 2.85 1.02083 9.79636
+49 2.91 0.985436 10.413
+50 2.97 1.00183 11.066
+103400 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0.131872 0.000713267
+6 0.33 0.265194 0.00285307
+7 0.39 0.380042 0.00713267
+8 0.45 0.475989 0.0142653
+9 0.51 0.556052 0.0249643
+10 0.57 1.00924 0.0492154
+11 0.63 0.959959 0.0773894
+12 0.69 0.932075 0.1102
+13 0.75 1.08057 0.155136
+14 0.81 1.05148 0.206134
+15 0.87 1.08998 0.267118
+16 0.93 1.17149 0.342011
+17 0.99 1.10768 0.422254
+18 1.05 0.975984 0.501783
+19 1.11 0.998673 0.592725
+20 1.17 1.01875 0.695792
+21 1.23 1.08447 0.817047
+22 1.29 0.945354 0.93331
+23 1.35 0.924105 1.05777
+24 1.41 0.953946 1.19793
+25 1.47 0.993802 1.35663
+26 1.53 0.987488 1.52746
+27 1.59 1.006 1.71541
+28 1.65 0.983812 1.91334
+29 1.71 1.02492 2.13481
+30 1.77 1.02132 2.37126
+31 1.83 1.04047 2.62874
+32 1.89 0.956551 2.88124
+33 1.95 0.998863 3.16191
+34 2.01 0.99388 3.45863
+35 2.07 0.948366 3.75892
+36 2.13 0.998878 4.09379
+37 2.19 1.03144 4.45934
+38 2.25 0.927592 4.80635
+39 2.31 1.0347 5.21434
+40 2.37 0.986408 5.62375
+41 2.43 1.02657 6.07168
+42 2.49 0.992488 6.52639
+43 2.55 0.97825 6.99643
+44 2.61 1.01739 7.50856
+45 2.67 1.02296 8.04743
+46 2.73 1.02317 8.61091
+47 2.79 0.990181 9.18046
+48 2.85 0.963784 9.75892
+49 2.91 0.989426 10.378
+50 2.97 1.04123 11.0567
+103450 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0.190021 0.0021398
+8 0.45 0.475989 0.00927247
+9 0.51 0.630192 0.021398
+10 0.57 0.94987 0.0442225
+11 0.63 0.838445 0.0688302
+12 0.69 1.09418 0.107347
+13 0.75 1.02911 0.150143
+14 0.81 1.11031 0.203994
+15 0.87 1.02624 0.261412
+16 0.93 1.28306 0.343438
+17 0.99 1.0486 0.419401
+18 1.05 0.997868 0.500713
+19 1.11 1.04959 0.596291
+20 1.17 0.969395 0.694365
+21 1.23 1.00473 0.806705
+22 1.29 0.896057 0.916904
+23 1.35 1.00619 1.05243
+24 1.41 1.02677 1.20328
+25 1.47 1.05187 1.37126
+26 1.53 0.940072 1.53388
+27 1.59 0.965916 1.71434
+28 1.65 0.973176 1.91013
+29 1.71 0.991911 2.12447
+30 1.77 1.01361 2.35913
+31 1.83 1.03183 2.61448
+32 1.89 0.99438 2.87696
+33 1.95 1.02932 3.16619
+34 2.01 1.01299 3.46862
+35 2.07 1.00919 3.78816
+36 2.13 0.973348 4.11448
+37 2.19 0.945904 4.44971
+38 2.25 0.995278 4.82204
+39 2.31 0.989473 5.2122
+40 2.37 1.02593 5.63802
+41 2.43 1.00369 6.07596
+42 2.49 1.02207 6.54422
+43 2.55 1.00868 7.02889
+44 2.61 0.989054 7.52675
+45 2.67 1.01619 8.06205
+46 2.73 1.01022 8.6184
+47 2.79 0.97406 9.17867
+48 2.85 1.01191 9.78602
+49 2.91 1.00538 10.4151
+50 2.97 0.989249 11.0599
+103500 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0.131872 0.000713267
+6 0.33 0.132597 0.00178317
+7 0.39 0.348371 0.00570613
+8 0.45 0.618786 0.0149786
+9 0.51 0.556052 0.0256776
+10 0.57 0.771769 0.0442225
+11 0.63 0.874899 0.0699001
+12 0.69 0.861156 0.100214
+13 0.75 1.15775 0.148359
+14 0.81 1.25001 0.208987
+15 0.87 1.09636 0.270328
+16 0.93 1.09339 0.340228
+17 0.99 1.15199 0.42368
+18 1.05 1.10728 0.513909
+19 1.11 0.928178 0.598431
+20 1.17 0.856592 0.685093
+21 1.23 0.969643 0.793509
+22 1.29 0.933755 0.908345
+23 1.35 0.94264 1.03531
+24 1.41 1.03405 1.18723
+25 1.47 1.0474 1.35449
+26 1.53 1.03903 1.53424
+27 1.59 1.04036 1.7286
+28 1.65 1.00331 1.93046
+29 1.71 1.04307 2.15585
+30 1.77 0.935051 2.37233
+31 1.83 1.00012 2.61983
+32 1.89 0.960604 2.8734
+33 1.95 0.976018 3.14765
+34 2.01 1.03808 3.45756
+35 2.07 0.996798 3.77318
+36 2.13 1.01483 4.11341
+37 2.19 0.951942 4.45078
+38 2.25 0.997185 4.82382
+39 2.31 1.04917 5.23752
+40 2.37 1.02851 5.66441
+41 2.43 0.97835 6.0913
+42 2.49 0.99638 6.54779
+43 2.55 1.00645 7.03138
+44 2.61 0.992597 7.53103
+45 2.67 1.0189 8.06776
+46 2.73 1.02382 8.6316
+47 2.79 0.985841 9.19864
+48 2.85 0.987552 9.79137
+49 2.91 0.995695 10.4144
+50 2.97 0.992532 11.0613
+103550 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0.21169 0.000356633
+4 0.21 0 0.000356633
+5 0.27 0.197809 0.00142653
+6 0.33 0.132597 0.00249643
+7 0.39 0.285031 0.00570613
+8 0.45 0.42839 0.0121255
+9 0.51 0.611657 0.0238944
+10 0.57 0.742086 0.0417261
+11 0.63 1.03287 0.0720399
+12 0.69 1.11444 0.11127
+13 0.75 1.04626 0.154779
+14 0.81 1.05148 0.205777
+15 0.87 1.04537 0.264265
+16 0.93 0.998553 0.328103
+17 0.99 1.14706 0.411198
+18 1.05 1.07227 0.498573
+19 1.11 0.955593 0.585592
+20 1.17 0.941194 0.680813
+21 1.23 1.01749 0.794579
+22 1.29 0.985953 0.915835
+23 1.35 0.992949 1.04957
+24 1.41 0.973364 1.19258
+25 1.47 1.05633 1.36127
+26 1.53 1.05346 1.54351
+27 1.59 0.969734 1.72468
+28 1.65 1.04763 1.93545
+29 1.71 0.975406 2.14622
+30 1.77 0.99975 2.37767
+31 1.83 0.969859 2.61769
+32 1.89 1.02816 2.88909
+33 1.95 0.989979 3.16726
+34 2.01 1.02255 3.47254
+35 2.07 0.985534 3.78459
+36 2.13 0.972284 4.11056
+37 2.19 0.985149 4.4597
+38 2.25 1.01339 4.8388
+39 2.31 1.00666 5.23573
+40 2.37 0.922825 5.61876
+41 2.43 1.01595 6.06205
+42 2.49 1.02674 6.53245
+43 2.55 0.962663 6.99501
+44 2.61 1.0011 7.49893
+45 2.67 0.98437 8.01748
+46 2.73 0.970072 8.55171
+47 2.79 1.01746 9.13695
+48 2.85 1.02142 9.75
+49 2.91 1.00595 10.3795
+50 2.97 1.03302 11.0528
+103600 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0.197809 0.0010699
+6 0.33 0.0883979 0.00178317
+7 0.39 0.475052 0.00713267
+8 0.45 0.475989 0.0142653
+9 0.51 0.722867 0.028174
+10 0.57 0.756928 0.0463623
+11 0.63 0.70478 0.0670471
+12 0.69 1.08404 0.105207
+13 0.75 1.10629 0.151213
+14 0.81 1.06619 0.202924
+15 0.87 1.1856 0.269258
+16 0.93 1.24401 0.348787
+17 0.99 1.05353 0.425107
+18 1.05 1.04163 0.509986
+19 1.11 0.936011 0.595221
+20 1.17 0.955294 0.691869
+21 1.23 0.956885 0.798859
+22 1.29 0.933755 0.913695
+23 1.35 1.00619 1.04922
+24 1.41 1.04376 1.20257
+25 1.47 1.0139 1.36448
+26 1.53 1.01223 1.53959
+27 1.59 1.04609 1.73502
+28 1.65 0.997993 1.93581
+29 1.71 0.963853 2.14408
+30 1.77 1.01207 2.37839
+31 1.83 0.987153 2.62268
+32 1.89 1.00924 2.88909
+33 1.95 0.95571 3.15763
+34 2.01 1.01777 3.46148
+35 2.07 1.0396 3.79066
+36 2.13 0.975475 4.11769
+37 2.19 0.988168 4.4679
+38 2.25 0.973352 4.83203
+39 2.31 1.01389 5.23181
+40 2.37 1.0646 5.67368
+41 2.43 0.997149 6.10877
+42 2.49 0.959794 6.5485
+43 2.55 0.941881 7.00107
+44 2.61 0.974176 7.49144
+45 2.67 1.01484 8.02603
+46 2.73 0.996622 8.57489
+47 2.79 1.02986 9.16726
+48 2.85 0.985175 9.75856
+49 2.91 1.02077 10.3973
+50 2.97 1.0177 11.0606
+103650 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0.0659362 0.000356633
+6 0.33 0.265194 0.00249643
+7 0.39 0.411712 0.00713267
+8 0.45 0.523588 0.0149786
+9 0.51 0.481911 0.0242511
+10 0.57 0.771769 0.042796
+11 0.63 0.984262 0.0716833
+12 0.69 1.18536 0.113409
+13 0.75 0.977655 0.154066
+14 0.81 1.14707 0.2097
+15 0.87 1.07724 0.269971
+16 0.93 1.09339 0.339872
+17 0.99 1.0043 0.412625
+18 1.05 1.06789 0.499643
+19 1.11 0.928178 0.584165
+20 1.17 0.941194 0.679387
+21 1.23 1.0143 0.792796
+22 1.29 0.849659 0.89729
+23 1.35 0.963823 1.0271
+24 1.41 0.946664 1.16619
+25 1.47 1.11886 1.34486
+26 1.53 1.01635 1.52068
+27 1.59 0.969734 1.70185
+28 1.65 1.02104 1.90728
+29 1.71 1.04803 2.13374
+30 1.77 0.978184 2.3602
+31 1.83 0.981388 2.60307
+32 1.89 1.01194 2.87019
+33 1.95 0.98744 3.14765
+34 2.01 0.987907 3.44258
+35 2.07 0.994545 3.75749
+36 2.13 1.03185 4.10342
+37 2.19 0.992193 4.45506
+38 2.25 1.02102 4.83702
+39 2.31 1.0157 5.23752
+40 2.37 1.00789 5.65585
+41 2.43 0.979985 6.08345
+42 2.49 0.934106 6.51141
+43 2.55 1.01759 7.00036
+44 2.61 1.02802 7.51783
+45 2.67 1.01348 8.05171
+46 2.73 1.04519 8.62732
+47 2.79 1.00444 9.20506
+48 2.85 0.98577 9.79672
+49 2.91 0.991705 10.4173
+50 2.97 1.01496 11.0788
+103700 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0.108706 0.000356633
+5 0.27 0.0659362 0.000713267
+6 0.33 0.044199 0.0010699
+7 0.39 0.348371 0.00499287
+8 0.45 0.523588 0.0128388
+9 0.51 0.722867 0.0267475
+10 0.57 0.623352 0.0417261
+11 0.63 1.00856 0.0713267
+12 0.69 0.982731 0.10592
+13 0.75 1.24351 0.157632
+14 0.81 0.977953 0.205064
+15 0.87 1.08998 0.266049
+16 0.93 1.08781 0.335592
+17 0.99 1.15199 0.419044
+18 1.05 1.05476 0.504993
+19 1.11 0.826353 0.580243
+20 1.17 1.00112 0.681526
+21 1.23 0.991971 0.792439
+22 1.29 0.962754 0.910842
+23 1.35 0.992949 1.04458
+24 1.41 1.03405 1.1965
+25 1.47 0.991569 1.35485
+26 1.53 1.03903 1.53459
+27 1.59 1.07282 1.73502
+28 1.65 0.969631 1.9301
+29 1.71 0.962203 2.13802
+30 1.77 0.936592 2.35485
+31 1.83 1.00733 2.60414
+32 1.89 0.993029 2.86626
+33 1.95 1.02171 3.15335
+34 2.01 1.00583 3.45364
+35 2.07 0.973145 3.76177
+36 2.13 0.980794 4.09058
+37 2.19 0.960999 4.43117
+38 2.25 1.01816 4.81205
+39 2.31 1.00937 5.21006
+40 2.37 1.00445 5.62696
+41 2.43 0.997149 6.06205
+42 2.49 0.987039 6.51427
+43 2.55 1.00274 6.99608
+44 2.61 0.971342 7.48502
+45 2.67 1.004 8.01391
+46 2.73 0.972014 8.54922
+47 2.79 1.01746 9.13445
+48 2.85 1.003 9.73645
+49 2.91 0.980307 10.3499
+50 2.97 1.00074 11.0021
+103750 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0.108706 0.000356633
+5 0.27 0 0.000356633
+6 0.33 0.044199 0.000713267
+7 0.39 0.221691 0.0032097
+8 0.45 0.404591 0.00927247
+9 0.51 0.518981 0.0192582
+10 0.57 0.771769 0.0378031
+11 0.63 1.16653 0.0720399
+12 0.69 1.09418 0.110556
+13 0.75 1.04626 0.154066
+14 0.81 1.06619 0.205777
+15 0.87 1.1856 0.272111
+16 0.93 1.25516 0.352354
+17 0.99 1.03876 0.427603
+18 1.05 1.00224 0.509272
+19 1.11 0.869433 0.588445
+20 1.17 0.96587 0.686163
+21 1.23 1.05257 0.803852
+22 1.29 0.933755 0.918688
+23 1.35 1.00089 1.0535
+24 1.41 0.961228 1.19472
+25 1.47 0.998268 1.35414
+26 1.53 1.01223 1.52924
+27 1.59 1.00219 1.71648
+28 1.65 1.00154 1.91797
+29 1.71 1.03152 2.14087
+30 1.77 1.05058 2.38409
+31 1.83 1.03759 2.64087
+32 1.89 1.0214 2.91049
+33 1.95 0.974748 3.18438
+34 2.01 0.980739 3.47718
+35 2.07 0.992292 3.79137
+36 2.13 1.01803 4.13267
+37 2.19 0.983137 4.4811
+38 2.25 1.0029 4.85628
+39 2.31 0.996708 5.24929
+40 2.37 1.02422 5.67439
+41 2.43 0.984072 6.10378
+42 2.49 0.99171 6.55813
+43 2.55 1.01536 7.04601
+44 2.61 1.01669 7.55777
+45 2.67 1.02364 8.097
+46 2.73 0.993385 8.64408
+47 2.79 0.998241 9.21826
+48 2.85 0.986958 9.81063
+49 2.91 1.0088 10.4419
+50 2.97 1.02536 11.1102
+103800 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0.21169 0.000356633
+4 0.21 0 0.000356633
+5 0.27 0.131872 0.0010699
+6 0.33 0.176796 0.00249643
+7 0.39 0.380042 0.00677603
+8 0.45 0.42839 0.0131954
+9 0.51 0.593122 0.0246077
+10 0.57 0.756928 0.042796
+11 0.63 0.78984 0.0659772
+12 0.69 0.982731 0.100571
+13 0.75 1.19205 0.150143
+14 0.81 1.19119 0.207917
+15 0.87 1.07724 0.268188
+16 0.93 1.22727 0.346648
+17 0.99 1.08306 0.425107
+18 1.05 0.914712 0.499643
+19 1.11 0.889015 0.580599
+20 1.17 0.927094 0.674394
+21 1.23 1.00473 0.786733
+22 1.29 0.939555 0.902282
+23 1.35 0.966471 1.03245
+24 1.41 1.02434 1.18295
+25 1.47 0.955837 1.33559
+26 1.53 1.07201 1.52104
+27 1.59 1.01364 1.71041
+28 1.65 1.02458 1.91655
+29 1.71 0.927544 2.11698
+30 1.77 1.00129 2.34879
+31 1.83 1.07506 2.61484
+32 1.89 0.987625 2.87553
+33 1.95 1.05598 3.17225
+34 2.01 1.04405 3.48395
+35 2.07 0.972018 3.79173
+36 2.13 0.982922 4.12126
+37 2.19 0.972068 4.46576
+38 2.25 1.0172 4.84629
+39 2.31 0.998517 5.24001
+40 2.37 1.03453 5.6694
+41 2.43 0.975898 6.09522
+42 2.49 0.995602 6.55136
+43 2.55 1.00794 7.03566
+44 2.61 0.984095 7.53103
+45 2.67 0.987755 8.05136
+46 2.73 1.02058 8.61341
+47 2.79 1.02676 9.20399
+48 2.85 0.977451 9.79066
+49 2.91 1.01792 10.4276
+50 2.97 0.985966 11.0703
+103850 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0.132597 0.0010699
+7 0.39 0.221691 0.00356633
+8 0.45 0.261794 0.0074893
+9 0.51 0.667262 0.0203281
+10 0.57 0.712403 0.0374465
+11 0.63 0.911353 0.064194
+12 0.69 0.962469 0.0980742
+13 0.75 1.1749 0.146933
+14 0.81 1.06619 0.198645
+15 0.87 1.06449 0.258203
+16 0.93 1.17707 0.333452
+17 0.99 0.955066 0.402639
+18 1.05 1.14667 0.496077
+19 1.11 1.02609 0.589515
+20 1.17 1.01875 0.692582
+21 1.23 0.940937 0.797789
+22 1.29 0.922156 0.911198
+23 1.35 0.995597 1.04529
+24 1.41 0.927245 1.18153
+25 1.47 0.95137 1.33345
+26 1.53 0.997796 1.50606
+27 1.59 1.048 1.70185
+28 1.65 1.09549 1.92225
+29 1.71 1.02162 2.14301
+30 1.77 0.998209 2.37411
+31 1.83 0.958331 2.61127
+32 1.89 1.02005 2.88053
+33 1.95 1.03059 3.17011
+34 2.01 1.00105 3.46897
+35 2.07 1.02383 3.79315
+36 2.13 0.982922 4.12268
+37 2.19 1.00729 4.47967
+38 2.25 0.961912 4.83951
+39 2.31 0.964148 5.21969
+40 2.37 1.02078 5.64337
+41 2.43 1.00777 6.0831
+42 2.49 1.02051 6.55064
+43 2.55 0.97157 7.01748
+44 2.61 1.04432 7.54315
+45 2.67 1.04395 8.09308
+46 2.73 0.973957 8.62946
+47 2.79 1.00134 9.20542
+48 2.85 0.979828 9.79351
+49 2.91 1.01564 10.429
+50 2.97 1.01278 11.0892
+103900 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0.21169 0.000356633
+4 0.21 0 0.000356633
+5 0.27 0.131872 0.0010699
+6 0.33 0.132597 0.0021398
+7 0.39 0.411712 0.00677603
+8 0.45 0.475989 0.0139087
+9 0.51 0.630192 0.0260342
+10 0.57 0.623352 0.0410128
+11 0.63 0.887051 0.0670471
+12 0.69 1.19549 0.10913
+13 0.75 1.08914 0.154422
+14 0.81 1.22796 0.21398
+15 0.87 1.08998 0.274964
+16 0.93 1.26632 0.35592
+17 0.99 0.955066 0.425107
+18 1.05 0.892829 0.49786
+19 1.11 1.04959 0.593438
+20 1.17 0.951769 0.689729
+21 1.23 0.99516 0.800999
+22 1.29 0.872858 0.908345
+23 1.35 0.97971 1.0403
+24 1.41 1.04618 1.19401
+25 1.47 1.03177 1.35877
+26 1.53 0.95038 1.52318
+27 1.59 1.03082 1.71576
+28 1.65 1.00154 1.91726
+29 1.71 1.02822 2.13944
+30 1.77 0.972022 2.36448
+31 1.83 0.995799 2.61091
+32 1.89 1.02681 2.88195
+33 1.95 0.960787 3.15193
+34 2.01 1.02016 3.45649
+35 2.07 1.02608 3.78138
+36 2.13 0.994623 4.11484
+37 2.19 0.972068 4.45934
+38 2.25 0.970492 4.8224
+39 2.31 1.01027 5.22076
+40 2.37 1.00187 5.63659
+41 2.43 1.00941 6.07703
+42 2.49 1.02207 6.54529
+43 2.55 0.990868 7.0214
+44 2.61 1.02094 7.53531
+45 2.67 1.03718 8.08167
+46 2.73 0.999213 8.63195
+47 2.79 0.97096 9.19044
+48 2.85 1.00478 9.79351
+49 2.91 0.997975 10.418
+50 2.97 1.00621 11.0738
+103950 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0.197809 0.0010699
+6 0.33 0.176796 0.00249643
+7 0.39 0.253361 0.0053495
+8 0.45 0.404591 0.0114123
+9 0.51 0.518981 0.021398
+10 0.57 0.742086 0.0392297
+11 0.63 1.04502 0.0699001
+12 0.69 1.10431 0.108773
+13 0.75 1.10629 0.154779
+14 0.81 1.08825 0.207561
+15 0.87 1.17285 0.273181
+16 0.93 1.16033 0.347361
+17 0.99 1.0683 0.42475
+18 1.05 0.980361 0.504636
+19 1.11 0.99084 0.594864
+20 1.17 0.884793 0.684379
+21 1.23 0.899472 0.78495
+22 1.29 0.936655 0.900143
+23 1.35 1.04061 1.0403
+24 1.41 1.05832 1.19579
+25 1.47 1.00943 1.35699
+26 1.53 0.970995 1.52496
+27 1.59 0.956372 1.70364
+28 1.65 1.0104 1.90692
+29 1.71 0.98861 2.12054
+30 1.77 1.00899 2.35414
+31 1.83 1.02606 2.60806
+32 1.89 0.979519 2.86662
+33 1.95 0.979825 3.14194
+34 2.01 0.961626 3.42903
+35 2.07 0.986661 3.74144
+36 2.13 1.0276 4.08595
+37 2.19 1.04251 4.45542
+38 2.25 1.00576 4.83167
+39 2.31 1.00213 5.22682
+40 2.37 0.986408 5.63623
+41 2.43 1.01431 6.07882
+42 2.49 0.990931 6.53281
+43 2.55 1.00497 7.01569
+44 2.61 0.981261 7.50963
+45 2.67 1.04124 8.05813
+46 2.73 1.01799 8.61876
+47 2.79 0.946159 9.16298
+48 2.85 1.00241 9.76462
+49 2.91 1.01507 10.3998
+50 2.97 0.972834 11.0339
+104000 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0.108706 0.000356633
+5 0.27 0.131872 0.0010699
+6 0.33 0.353592 0.00392297
+7 0.39 0.253361 0.00677603
+8 0.45 0.475989 0.0139087
+9 0.51 0.593122 0.025321
+10 0.57 0.712403 0.0424394
+11 0.63 0.826294 0.0666904
+12 0.69 1.07391 0.104494
+13 0.75 1.09772 0.150143
+14 0.81 1.10295 0.203638
+15 0.87 1.12186 0.266405
+16 0.93 1.17149 0.341298
+17 0.99 1.14214 0.424037
+18 1.05 0.901582 0.497504
+19 1.11 0.979091 0.586662
+20 1.17 0.948244 0.682596
+21 1.23 0.940937 0.787803
+22 1.29 1.04395 0.916191
+23 1.35 0.913513 1.03923
+24 1.41 0.946664 1.17832
+25 1.47 0.933504 1.32739
+26 1.53 0.999857 1.50036
+27 1.59 1.027 1.69223
+28 1.65 0.976721 1.88873
+29 1.71 1.03647 2.1127
+30 1.77 1.01824 2.34843
+31 1.83 1.07362 2.61412
+32 1.89 0.99438 2.8766
+33 1.95 0.95698 3.14551
+34 2.01 0.964015 3.43331
+35 2.07 0.948366 3.73359
+36 2.13 1.01271 4.07311
+37 2.19 1.03144 4.43866
+38 2.25 0.998138 4.81205
+39 2.31 1.03289 5.21933
+40 2.37 0.968364 5.62126
+41 2.43 1.02167 6.06705
+42 2.49 1.03452 6.54101
+43 2.55 1.01388 7.02817
+44 2.61 0.955755 7.50927
+45 2.67 0.994525 8.03317
+46 2.73 0.968129 8.56633
+47 2.79 1.00692 9.14551
+48 2.85 1.0339 9.76605
+49 2.91 0.986006 10.383
+50 2.97 0.997456 11.0332
+104050 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0.131872 0.000713267
+6 0.33 0.220995 0.00249643
+7 0.39 0.316701 0.00606277
+8 0.45 0.404591 0.0121255
+9 0.51 0.556052 0.0228245
+10 0.57 0.771769 0.0413695
+11 0.63 0.97211 0.0699001
+12 0.69 0.8105 0.0984308
+13 0.75 1.08057 0.143367
+14 0.81 1.38237 0.210414
+15 0.87 1.10911 0.272468
+16 0.93 1.07665 0.341298
+17 0.99 1.02891 0.415835
+18 1.05 1.06789 0.502853
+19 1.11 0.943844 0.588802
+20 1.17 0.983495 0.688302
+21 1.23 0.905851 0.789586
+22 1.29 0.948254 0.906205
+23 1.35 0.926753 1.03103
+24 1.41 0.912681 1.16512
+25 1.47 0.962536 1.31883
+26 1.53 1.03284 1.4975
+27 1.59 1.07091 1.69757
+28 1.65 1.0494 1.9087
+29 1.71 1.00346 2.12553
+30 1.77 1.02748 2.36341
+31 1.83 0.988594 2.60806
+32 1.89 0.979519 2.86662
+33 1.95 1.00394 3.14872
+34 2.01 0.995074 3.44579
+35 2.07 1.02045 3.7689
+36 2.13 0.999942 4.10414
+37 2.19 0.984143 4.45292
+38 2.25 0.968585 4.81526
+39 2.31 0.98495 5.20364
+40 2.37 1.04398 5.63695
+41 2.43 1.03883 6.09023
+42 2.49 0.965243 6.53245
+43 2.55 0.980477 7.00357
+44 2.61 1.0096 7.51177
+45 2.67 0.959321 8.01712
+46 2.73 1.03548 8.58738
+47 2.79 0.982741 9.15264
+48 2.85 1.06064 9.78923
+49 2.91 1.00424 10.4176
+50 2.97 0.982683 11.0581
+104100 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0.131872 0.000713267
+6 0.33 0.132597 0.00178317
+7 0.39 0.285031 0.00499287
+8 0.45 0.309393 0.0096291
+9 0.51 0.778472 0.0246077
+10 0.57 0.667877 0.0406562
+11 0.63 0.753385 0.0627675
+12 0.69 0.962469 0.0966476
+13 0.75 1.04626 0.140157
+14 0.81 1.00736 0.189016
+15 0.87 1.30671 0.262126
+16 0.93 1.05434 0.329529
+17 0.99 1.0683 0.406919
+18 1.05 1.0285 0.490728
+19 1.11 1.08483 0.589515
+20 1.17 0.912993 0.681883
+21 1.23 0.867576 0.778887
+22 1.29 0.933755 0.893723
+23 1.35 0.985006 1.02639
+24 1.41 1.09716 1.18759
+25 1.47 1.00274 1.34772
+26 1.53 0.991611 1.51926
+27 1.59 0.996459 1.70542
+28 1.65 0.98913 1.90442
+29 1.71 0.995211 2.11947
+30 1.77 1.01361 2.35414
+31 1.83 0.99724 2.60093
+32 1.89 1.0768 2.88516
+33 1.95 1.00013 3.16619
+34 2.01 1.06914 3.48538
+35 2.07 0.951745 3.78673
+36 2.13 0.995687 4.12054
+37 2.19 0.97408 4.46576
+38 2.25 0.976212 4.83096
+39 2.31 1.00937 5.22896
+40 2.37 1.00016 5.64408
+41 2.43 0.977533 6.07061
+42 2.49 0.973806 6.51676
+43 2.55 1.01165 7.00285
+44 2.61 1.02094 7.51676
+45 2.67 1.01957 8.05385
+46 2.73 0.986261 8.597
+47 2.79 0.992661 9.16797
+48 2.85 0.9929 9.76391
+49 2.91 0.957509 10.3631
+50 2.97 1.02974 11.0342
+104150 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0.108706 0.000356633
+5 0.27 0.329681 0.0021398
+6 0.33 0.220995 0.00392297
+7 0.39 0.253361 0.00677603
+8 0.45 0.571187 0.0153352
+9 0.51 0.574587 0.0263909
+10 0.57 0.816295 0.0460057
+11 0.63 0.801991 0.0695435
+12 0.69 1.11444 0.108773
+13 0.75 1.08057 0.153709
+14 0.81 1.19854 0.21184
+15 0.87 1.23022 0.28067
+16 0.93 1.09897 0.350927
+17 0.99 1.08306 0.429387
+18 1.05 0.897205 0.502496
+19 1.11 0.979091 0.591655
+20 1.17 0.821342 0.67475
+21 1.23 1.0143 0.78816
+22 1.29 0.988852 0.909772
+23 1.35 1.05385 1.05171
+24 1.41 1.04618 1.20542
+25 1.47 1.02953 1.36983
+26 1.53 0.970995 1.5378
+27 1.59 0.952554 1.71576
+28 1.65 1.03876 1.92475
+29 1.71 0.948999 2.12981
+30 1.77 0.99975 2.36127
+31 1.83 1.03039 2.61626
+32 1.89 1.04707 2.89265
+33 1.95 0.981094 3.16833
+34 2.01 1.04883 3.48146
+35 2.07 0.958503 3.78495
+36 2.13 0.968029 4.10949
+37 2.19 0.989175 4.46006
+38 2.25 1.00004 4.83417
+39 2.31 0.974097 5.21826
+40 2.37 0.982972 5.62625
+41 2.43 0.991428 6.05884
+42 2.49 1.03297 6.5321
+43 2.55 0.983445 7.00464
+44 2.61 1.00889 7.51248
+45 2.67 0.98437 8.03103
+46 2.73 0.990794 8.57668
+47 2.79 1.00878 9.15692
+48 2.85 1.02736 9.77354
+49 2.91 0.969478 10.3802
+50 2.97 1.01113 11.0392
+104200 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0.131872 0.000713267
+6 0.33 0.132597 0.00178317
+7 0.39 0.380042 0.00606277
+8 0.45 0.452189 0.0128388
+9 0.51 0.685797 0.0260342
+10 0.57 0.682719 0.0424394
+11 0.63 0.959959 0.0706134
+12 0.69 1.04352 0.107347
+13 0.75 1.08057 0.152282
+14 0.81 1.13237 0.207204
+15 0.87 1.1601 0.272111
+16 0.93 1.08781 0.341655
+17 0.99 1.12737 0.423324
+18 1.05 0.997868 0.504636
+19 1.11 0.967342 0.592725
+20 1.17 0.941194 0.687946
+21 1.23 0.921799 0.791013
+22 1.29 0.959854 0.909058
+23 1.35 0.971766 1.03994
+24 1.41 0.944236 1.17867
+25 1.47 0.982636 1.33559
+26 1.53 1.01429 1.51106
+27 1.59 1.01364 1.70043
+28 1.65 1.08485 1.91869
+29 1.71 1.01832 2.13873
+30 1.77 1.02748 2.3766
+31 1.83 0.994358 2.62268
+32 1.89 0.99438 2.88516
+33 1.95 0.977287 3.15977
+34 2.01 0.97835 3.45185
+35 2.07 1.00243 3.76926
+36 2.13 0.995687 4.10307
+37 2.19 1.01634 4.46327
+38 2.25 0.981932 4.8306
+39 2.31 1.00213 5.22575
+40 2.37 0.987268 5.63552
+41 2.43 1.04782 6.09272
+42 2.49 1.02907 6.56419
+43 2.55 1.0072 7.04815
+44 2.61 1.00181 7.55243
+45 2.67 1.0013 8.07989
+46 2.73 0.976547 8.61769
+47 2.79 0.983981 9.18367
+48 2.85 1.03806 9.8067
+49 2.91 0.991705 10.4272
+50 2.97 0.996362 11.0767
+104250 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0.108706 0.000356633
+5 0.27 0 0.000356633
+6 0.33 0.220995 0.0021398
+7 0.39 0.158351 0.00392297
+8 0.45 0.452189 0.010699
+9 0.51 0.685797 0.0238944
+10 0.57 0.756928 0.0420827
+11 0.63 0.814142 0.0659772
+12 0.69 1.05365 0.103067
+13 0.75 1.15775 0.151213
+14 0.81 1.18384 0.208631
+15 0.87 1.09636 0.269971
+16 0.93 1.16591 0.344508
+17 0.99 0.935374 0.412268
+18 1.05 1.011 0.49465
+19 1.11 0.892931 0.575963
+20 1.17 0.846017 0.661555
+21 1.23 0.944126 0.767118
+22 1.29 0.930855 0.881598
+23 1.35 1.02208 1.01926
+24 1.41 0.985501 1.16405
+25 1.47 1.0273 1.3281
+26 1.53 1.07614 1.51427
+27 1.59 0.971643 1.69579
+28 1.65 1.03345 1.90371
+29 1.71 0.957251 2.11056
+30 1.77 1.00591 2.34344
+31 1.83 0.98427 2.58702
+32 1.89 1.02545 2.8577
+33 1.95 1.0014 3.13909
+34 2.01 0.996269 3.43652
+35 2.07 0.948366 3.7368
+36 2.13 0.982922 4.06633
+37 2.19 0.972068 4.41084
+38 2.25 1.0601 4.80742
+39 2.31 0.998517 5.20114
+40 2.37 1.0139 5.62197
+41 2.43 1.00287 6.05956
+42 2.49 1.00961 6.52211
+43 2.55 1.01462 7.00963
+44 2.61 1.01243 7.51926
+45 2.67 1.06493 8.08024
+46 2.73 0.972014 8.61555
+47 2.79 0.985841 9.1826
+48 2.85 1.00657 9.78673
+49 2.91 0.94155 10.3759
+50 2.97 1.03138 11.0481
+104300 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0.131872 0.000713267
+6 0.33 0.220995 0.00249643
+7 0.39 0.380042 0.00677603
+8 0.45 0.571187 0.0153352
+9 0.51 0.611657 0.0271041
+10 0.57 0.905345 0.0488588
+11 0.63 0.887051 0.074893
+12 0.69 1.04352 0.111626
+13 0.75 1.07199 0.156205
+14 0.81 1.04413 0.206847
+15 0.87 1.11548 0.269258
+16 0.93 1.04876 0.336305
+17 0.99 1.13229 0.418331
+18 1.05 1.05914 0.504636
+19 1.11 1.02609 0.598074
+20 1.17 0.941194 0.693295
+21 1.23 0.864386 0.789943
+22 1.29 0.962754 0.908345
+23 1.35 0.947936 1.03602
+24 1.41 0.990356 1.18153
+25 1.47 0.975936 1.33738
+26 1.53 1.03903 1.51712
+27 1.59 0.975461 1.69936
+28 1.65 0.978494 1.89622
+29 1.71 1.02162 2.11698
+30 1.77 1.01978 2.35307
+31 1.83 1.02462 2.60663
+32 1.89 0.999785 2.87054
+33 1.95 1.00267 3.15228
+34 2.01 0.985518 3.4465
+35 2.07 1.01707 3.76854
+36 2.13 0.955264 4.0888
+37 2.19 0.972068 4.43331
+38 2.25 1.04771 4.82525
+39 2.31 0.978619 5.21113
+40 2.37 0.988127 5.62126
+41 2.43 0.996332 6.05599
+42 2.49 0.966022 6.49857
+43 2.55 0.996805 6.97753
+44 2.61 1.05069 7.50642
+45 2.67 0.997233 8.03174
+46 2.73 1.01281 8.58951
+47 2.79 1.03234 9.18331
+48 2.85 1.00835 9.78852
+49 2.91 1.01279 10.4223
+50 2.97 0.994173 11.0703
+104350 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0.263745 0.00142653
+6 0.33 0.176796 0.00285307
+7 0.39 0.253361 0.00570613
+8 0.45 0.547387 0.0139087
+9 0.51 0.574587 0.0249643
+10 0.57 0.845978 0.0452924
+11 0.63 0.801991 0.0688302
+12 0.69 1.03339 0.105207
+13 0.75 1.1749 0.154066
+14 0.81 1.16913 0.21077
+15 0.87 1.1346 0.274251
+16 0.93 1.13802 0.347004
+17 0.99 1.0043 0.419757
+18 1.05 1.03288 0.503923
+19 1.11 0.90468 0.586305
+20 1.17 0.874218 0.67475
+21 1.23 0.988781 0.785307
+22 1.29 1.06715 0.916548
+23 1.35 1.03532 1.05599
+24 1.41 0.997638 1.20257
+25 1.47 0.973703 1.35806
+26 1.53 0.962749 1.52461
+27 1.59 1.01173 1.71362
+28 1.65 1.00508 1.91583
+29 1.71 1.02327 2.13695
+30 1.77 0.961239 2.35949
+31 1.83 0.962654 2.59772
+32 1.89 1.00384 2.8627
+33 1.95 1.01663 3.14836
+34 2.01 0.999852 3.44686
+35 2.07 1.03509 3.77461
+36 2.13 1.02547 4.1184
+37 2.19 0.985149 4.46755
+38 2.25 1.00386 4.84308
+39 2.31 1.00756 5.24037
+40 2.37 1.0414 5.67261
+41 2.43 0.97835 6.0995
+42 2.49 1.05165 6.58131
+43 2.55 1.02278 7.07275
+44 2.61 0.979135 7.56562
+45 2.67 0.93224 8.0567
+46 2.73 0.984966 8.59914
+47 2.79 1.00692 9.17832
+48 2.85 1.02142 9.79137
+49 2.91 1.03673 10.4401
+50 2.97 1.00019 11.092
+104400 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0.21169 0.000356633
+4 0.21 0.108706 0.000713267
+5 0.27 0.0659362 0.0010699
+6 0.33 0.309393 0.00356633
+7 0.39 0.285031 0.00677603
+8 0.45 0.523588 0.014622
+9 0.51 0.648727 0.0271041
+10 0.57 0.638194 0.0424394
+11 0.63 0.765537 0.0649073
+12 0.69 1.09418 0.103424
+13 0.75 0.969079 0.143723
+14 0.81 1.13237 0.198645
+15 0.87 1.20472 0.266049
+16 0.93 1.13244 0.338445
+17 0.99 1.16676 0.422967
+18 1.05 0.945348 0.5
+19 1.11 0.998673 0.590942
+20 1.17 0.97292 0.689372
+21 1.23 0.944126 0.794936
+22 1.29 0.965654 0.913695
+23 1.35 0.947936 1.04137
+24 1.41 1.03162 1.19294
+25 1.47 1.01167 1.35449
+26 1.53 1.05758 1.53745
+27 1.59 0.874288 1.70078
+28 1.65 0.971403 1.89622
+29 1.71 1.03317 2.11947
+30 1.77 1.0244 2.35663
+31 1.83 1.02318 2.60984
+32 1.89 0.990327 2.87126
+33 1.95 1.04582 3.16512
+34 2.01 1.07272 3.48538
+35 2.07 0.993419 3.79993
+36 2.13 0.951008 4.11876
+37 2.19 0.986156 4.46826
+38 2.25 1.00958 4.84593
+39 2.31 0.93611 5.21505
+40 2.37 0.975238 5.61983
+41 2.43 1.01023 6.06063
+42 2.49 1.0244 6.52996
+43 2.55 0.98493 7.00321
+44 2.61 0.99118 7.50214
+45 2.67 1.04327 8.05171
+46 2.73 1.02641 8.61698
+47 2.79 1.00444 9.19472
+48 2.85 0.987552 9.78745
+49 2.91 1.01393 10.4219
+50 2.97 0.998003 11.0724
+104450 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0.108706 0.000356633
+5 0.27 0 0.000356633
+6 0.33 0.132597 0.00142653
+7 0.39 0.221691 0.00392297
+8 0.45 0.618786 0.0131954
+9 0.51 0.518981 0.0231812
+10 0.57 0.816295 0.042796
+11 0.63 0.850597 0.0677603
+12 0.69 1.03339 0.104137
+13 0.75 1.02053 0.146576
+14 0.81 1.12501 0.201141
+15 0.87 1.1856 0.267475
+16 0.93 1.04876 0.334522
+17 0.99 1.18645 0.420471
+18 1.05 0.945348 0.497504
+19 1.11 0.955593 0.584522
+20 1.17 0.860117 0.671541
+21 1.23 1.09723 0.794223
+22 1.29 0.930855 0.908702
+23 1.35 0.987654 1.04173
+24 1.41 0.980646 1.18581
+25 1.47 0.946903 1.33702
+26 1.53 1.01841 1.5132
+27 1.59 1.05564 1.71041
+28 1.65 1.02636 1.9169
+29 1.71 0.980357 2.12874
+30 1.77 1.00437 2.36127
+31 1.83 0.99724 2.60806
+32 1.89 0.999785 2.87197
+33 1.95 1.00394 3.15407
+34 2.01 1.01419 3.45685
+35 2.07 0.970892 3.76427
+36 2.13 1.01164 4.10342
+37 2.19 1.01735 4.46398
+38 2.25 1.09347 4.87304
+39 2.31 0.963243 5.25285
+40 2.37 0.98469 5.66155
+41 2.43 1.01922 6.10628
+42 2.49 1.01351 6.57061
+43 2.55 0.996063 7.04922
+44 2.61 0.960006 7.53245
+45 2.67 0.995202 8.0567
+46 2.73 1.01605 8.61626
+47 2.79 1.00196 9.19258
+48 2.85 1.00657 9.79672
+49 2.91 0.988286 10.4151
+50 2.97 0.999645 11.0667
+104500 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0.217411 0.000713267
+5 0.27 0.329681 0.00249643
+6 0.33 0.132597 0.00356633
+7 0.39 0.348371 0.0074893
+8 0.45 0.452189 0.0142653
+9 0.51 0.500446 0.0238944
+10 0.57 0.608511 0.0385164
+11 0.63 0.923505 0.0656205
+12 0.69 1.03339 0.101997
+13 0.75 1.18348 0.151213
+14 0.81 1.15443 0.207204
+15 0.87 1.1601 0.272111
+16 0.93 1.10455 0.342725
+17 0.99 0.959989 0.412268
+18 1.05 1.01537 0.495007
+19 1.11 0.869433 0.57418
+20 1.17 0.97997 0.673324
+21 1.23 1.03981 0.789586
+22 1.29 0.948254 0.906205
+23 1.35 1.11475 1.05635
+24 1.41 0.983074 1.20078
+25 1.47 0.920104 1.34772
+26 1.53 0.954503 1.51284
+27 1.59 1.03082 1.70542
+28 1.65 1.0104 1.9087
+29 1.71 1.00181 2.12518
+30 1.77 1.04596 2.36733
+31 1.83 1.03903 2.62447
+32 1.89 0.966008 2.87946
+33 1.95 0.969672 3.15193
+34 2.01 1.00583 3.45221
+35 2.07 1.02833 3.77782
+36 2.13 0.975475 4.10485
+37 2.19 0.979112 4.45185
+38 2.25 1.00958 4.82953
+39 2.31 0.992186 5.22076
+40 2.37 1.0457 5.65478
+41 2.43 1.04129 6.10913
+42 2.49 0.9668 6.55207
+43 2.55 0.942623 7.00499
+44 2.61 1.04573 7.53138
+45 2.67 0.992494 8.05421
+46 2.73 0.949997 8.57739
+47 2.79 1.00382 9.15478
+48 2.85 0.996465 9.75285
+49 2.91 0.998545 10.3777
+50 2.97 1.00785 11.0346
+104550 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0.131872 0.000713267
+6 0.33 0.220995 0.00249643
+7 0.39 0.380042 0.00677603
+8 0.45 0.309393 0.0114123
+9 0.51 0.722867 0.025321
+10 0.57 0.771769 0.0438659
+11 0.63 0.862748 0.0691869
+12 0.69 1.08404 0.107347
+13 0.75 1.11487 0.153709
+14 0.81 1.08825 0.206491
+15 0.87 1.10273 0.268188
+16 0.93 1.07665 0.337019
+17 0.99 1.1126 0.417618
+18 1.05 0.962855 0.496077
+19 1.11 1.01042 0.588088
+20 1.17 0.916519 0.680813
+21 1.23 0.924989 0.784237
+22 1.29 0.962754 0.902639
+23 1.35 1.02472 1.04066
+24 1.41 0.919963 1.17582
+25 1.47 1.05633 1.34451
+26 1.53 0.973057 1.51284
+27 1.59 1.027 1.70471
+28 1.65 0.98913 1.90371
+29 1.71 0.978707 2.11519
+30 1.77 1.05829 2.3602
+31 1.83 0.992917 2.60592
+32 1.89 1.0133 2.8734
+33 1.95 0.97221 3.14658
+34 2.01 1.00702 3.44722
+35 2.07 1.00806 3.76641
+36 2.13 0.986113 4.097
+37 2.19 1.01836 4.45792
+38 2.25 1.02102 4.83987
+39 2.31 0.993995 5.23181
+40 2.37 1.00187 5.64765
+41 2.43 0.996332 6.08238
+42 2.49 0.982369 6.53245
+43 2.55 1.00349 7.01462
+44 2.61 0.982678 7.50927
+45 2.67 0.993848 8.03281
+46 2.73 0.948702 8.55528
+47 2.79 1.03544 9.15086
+48 2.85 1.02202 9.76427
+49 2.91 0.988856 10.383
+50 2.97 1.01059 11.0417
+104600 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0.21169 0.000356633
+4 0.21 0.108706 0.000713267
+5 0.27 0 0.000713267
+6 0.33 0.0883979 0.00142653
+7 0.39 0.285031 0.00463623
+8 0.45 0.452189 0.0114123
+9 0.51 0.759937 0.0260342
+10 0.57 0.727244 0.0435093
+11 0.63 0.850597 0.0684736
+12 0.69 1.02326 0.104494
+13 0.75 1.08057 0.149429
+14 0.81 1.00736 0.198288
+15 0.87 1.12186 0.261056
+16 0.93 1.20496 0.338088
+17 0.99 1.01414 0.411555
+18 1.05 1.00224 0.493224
+19 1.11 1.06525 0.590228
+20 1.17 0.951769 0.686519
+21 1.23 1.00473 0.798859
+22 1.29 1.03815 0.926534
+23 1.35 0.887035 1.04601
+24 1.41 1.00977 1.19437
+25 1.47 1.01613 1.35663
+26 1.53 0.956565 1.52211
+27 1.59 0.979279 1.70506
+28 1.65 0.951904 1.89658
+29 1.71 1.00841 2.11448
+30 1.77 0.968941 2.3388
+31 1.83 1.07794 2.60556
+32 1.89 0.967359 2.86091
+33 1.95 1.01536 3.14622
+34 2.01 0.938929 3.42653
+35 2.07 1.02045 3.74964
+36 2.13 0.981858 4.07882
+37 2.19 1.03043 4.44401
+38 2.25 0.960005 4.80314
+39 2.31 1.06092 5.22147
+40 2.37 0.946883 5.61448
+41 2.43 1.00287 6.05207
+42 2.49 0.997159 6.50892
+43 2.55 0.985672 6.98252
+44 2.61 1.00535 7.48859
+45 2.67 0.995202 8.01284
+46 2.73 1.05879 8.59593
+47 2.79 1.01746 9.18117
+48 2.85 0.972103 9.76462
+49 2.91 0.986576 10.382
+50 2.97 0.98706 11.0253
+104650 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0.0659362 0.000356633
+6 0.33 0.0883979 0.0010699
+7 0.39 0.380042 0.0053495
+8 0.45 0.452189 0.0121255
+9 0.51 0.759937 0.0267475
+10 0.57 0.667877 0.042796
+11 0.63 0.850597 0.0677603
+12 0.69 1.00299 0.103067
+13 0.75 1.16633 0.151569
+14 0.81 1.11031 0.205421
+15 0.87 1.30671 0.278531
+16 0.93 1.04318 0.345221
+17 0.99 1.10768 0.425464
+18 1.05 0.914712 0.5
+19 1.11 0.998673 0.590942
+20 1.17 0.895368 0.681526
+21 1.23 0.883524 0.780314
+22 1.29 0.956954 0.898003
+23 1.35 0.945288 1.02532
+24 1.41 1.04861 1.17939
+25 1.47 1.01167 1.34094
+26 1.53 1.02047 1.51748
+27 1.59 0.975461 1.69971
+28 1.65 1.07244 1.91548
+29 1.71 1.03647 2.13944
+30 1.77 0.968941 2.36377
+31 1.83 0.988594 2.60842
+32 1.89 0.967359 2.86377
+33 1.95 0.968402 3.13588
+34 2.01 0.953264 3.42047
+35 2.07 1.01482 3.7418
+36 2.13 1.00739 4.07953
+37 2.19 0.959992 4.41976
+38 2.25 0.998138 4.79315
+39 2.31 0.998517 5.18688
+40 2.37 0.969224 5.58916
+41 2.43 0.952195 6.00464
+42 2.49 1.00961 6.46719
+43 2.55 1.03466 6.96434
+44 2.61 1.02519 7.48039
+45 2.67 0.967445 7.99001
+46 2.73 1.02188 8.55278
+47 2.79 0.988321 9.12126
+48 2.85 1.00775 9.72611
+49 2.91 1.02305 10.3663
+50 2.97 0.975023 11.0018
+104700 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0.108706 0.000356633
+5 0.27 0.131872 0.0010699
+6 0.33 0.176796 0.00249643
+7 0.39 0.316701 0.00606277
+8 0.45 0.356992 0.0114123
+9 0.51 0.481911 0.0206847
+10 0.57 0.816295 0.0402996
+11 0.63 0.826294 0.0645506
+12 0.69 1.06378 0.101997
+13 0.75 1.19205 0.151569
+14 0.81 1.11766 0.205777
+15 0.87 1.15373 0.270328
+16 0.93 1.07107 0.338802
+17 0.99 1.0486 0.414765
+18 1.05 1.00662 0.49679
+19 1.11 1.04959 0.592368
+20 1.17 0.934144 0.686876
+21 1.23 1.04619 0.803852
+22 1.29 0.898957 0.914408
+23 1.35 1.05915 1.05706
+24 1.41 0.949091 1.1965
+25 1.47 1.0139 1.35842
+26 1.53 0.946257 1.52211
+27 1.59 0.962099 1.70185
+28 1.65 1.00508 1.90407
+29 1.71 1.09919 2.14158
+30 1.77 1.0398 2.38231
+31 1.83 0.961213 2.62019
+32 1.89 1.02005 2.88944
+33 1.95 0.965864 3.16084
+34 2.01 0.96521 3.449
+35 2.07 0.975397 3.75785
+36 2.13 0.964837 4.08131
+37 2.19 1.01131 4.43973
+38 2.25 1.03913 4.82846
+39 2.31 0.956912 5.20578
+40 2.37 1.01304 5.62625
+41 2.43 1.02494 6.07347
+42 2.49 0.99638 6.52996
+43 2.55 0.970085 6.99608
+44 2.61 1.00322 7.50107
+45 2.67 1.03244 8.04494
+46 2.73 0.95712 8.57204
+47 2.79 1.0404 9.17047
+48 2.85 0.98577 9.76213
+49 2.91 0.975747 10.3727
+50 2.97 0.993626 11.0203
+104750 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0.108706 0.000356633
+5 0.27 0.131872 0.0010699
+6 0.33 0.176796 0.00249643
+7 0.39 0.316701 0.00606277
+8 0.45 0.356992 0.0114123
+9 0.51 0.481911 0.0206847
+10 0.57 0.94987 0.0435093
+11 0.63 0.838445 0.068117
+12 0.69 1.10431 0.10699
+13 0.75 1.00338 0.148716
+14 0.81 1.04413 0.199358
+15 0.87 1.1601 0.264265
+16 0.93 1.18264 0.339872
+17 0.99 1.08306 0.418331
+18 1.05 1.06789 0.50535
+19 1.11 1.07308 0.603067
+20 1.17 0.895368 0.693652
+21 1.23 0.861196 0.789943
+22 1.29 0.916356 0.902639
+23 1.35 0.924105 1.0271
+24 1.41 0.985501 1.1719
+25 1.47 1.11663 1.35021
+26 1.53 0.983365 1.52033
+27 1.59 0.965916 1.70078
+28 1.65 1.07953 1.91797
+29 1.71 0.973756 2.12839
+30 1.77 0.973562 2.35378
+31 1.83 0.987153 2.59807
+32 1.89 0.975466 2.85556
+33 1.95 1.04455 3.14907
+34 2.01 1.02255 3.45435
+35 2.07 0.969766 3.76141
+36 2.13 0.977603 4.08916
+37 2.19 0.941879 4.42297
+38 2.25 1.02578 4.8067
+39 2.31 1.04826 5.22004
+40 2.37 0.994142 5.63267
+41 2.43 0.975898 6.05849
+42 2.49 0.931771 6.48538
+43 2.55 1.01313 6.97218
+44 2.61 1.06061 7.50606
+45 2.67 1.03853 8.05314
+46 2.73 1.02641 8.6184
+47 2.79 0.96352 9.17261
+48 2.85 0.982204 9.76213
+49 2.91 0.979737 10.3752
+50 2.97 0.984872 11.0171
+104800 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0.263745 0.00142653
+6 0.33 0.309393 0.00392297
+7 0.39 0.348371 0.00784593
+8 0.45 0.404591 0.0139087
+9 0.51 0.444841 0.0224679
+10 0.57 0.727244 0.0399429
+11 0.63 0.78984 0.0631241
+12 0.69 0.932075 0.0959344
+13 0.75 0.960503 0.135877
+14 0.81 1.31619 0.199715
+15 0.87 1.12823 0.262839
+16 0.93 1.12128 0.334522
+17 0.99 0.964912 0.404422
+18 1.05 1.10291 0.494294
+19 1.11 1.00651 0.585949
+20 1.17 0.958819 0.682953
+21 1.23 1.00792 0.795649
+22 1.29 0.965654 0.914408
+23 1.35 0.953231 1.0428
+24 1.41 1.00977 1.19116
+25 1.47 0.946903 1.34237
+26 1.53 1.04521 1.52318
+27 1.59 0.975461 1.70542
+28 1.65 0.905816 1.88766
+29 1.71 1.08103 2.12126
+30 1.77 1.02132 2.3577
+31 1.83 1.0203 2.6102
+32 1.89 0.928178 2.85521
+33 1.95 0.974748 3.1291
+34 2.01 1.00941 3.43046
+35 2.07 1.08465 3.77389
+36 2.13 0.993559 4.10699
+37 2.19 0.953955 4.44508
+38 2.25 1.00576 4.82133
+39 2.31 0.947868 5.19508
+40 2.37 1.0457 5.6291
+41 2.43 0.975898 6.05492
+42 2.49 1.00183 6.51391
+43 2.55 1.00868 6.99857
+44 2.61 1.00747 7.50571
+45 2.67 0.996556 8.03067
+46 2.73 0.99468 8.57846
+47 2.79 0.985841 9.14551
+48 2.85 1.03509 9.76676
+49 2.91 1.0487 10.423
+50 2.97 0.970646 11.0556
+104850 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0.0659362 0.000356633
+6 0.33 0.353592 0.0032097
+7 0.39 0.411712 0.00784593
+8 0.45 0.475989 0.0149786
+9 0.51 0.574587 0.0260342
+10 0.57 0.727244 0.0435093
+11 0.63 1.03287 0.0738231
+12 0.69 0.921944 0.106277
+13 0.75 1.05484 0.150143
+14 0.81 1.08825 0.202924
+15 0.87 1.09636 0.264265
+16 0.93 1.19938 0.340942
+17 0.99 1.10276 0.420827
+18 1.05 0.962855 0.499287
+19 1.11 1.03 0.593081
+20 1.17 1.03637 0.697932
+21 1.23 0.924989 0.801355
+22 1.29 0.855459 0.906562
+23 1.35 1.01678 1.04351
+24 1.41 0.941809 1.18188
+25 1.47 1.03177 1.34665
+26 1.53 1.0885 1.53495
+27 1.59 0.965916 1.71541
+28 1.65 0.994448 1.91548
+29 1.71 1.01667 2.13516
+30 1.77 0.96586 2.35877
+31 1.83 1.003 2.60699
+32 1.89 1.00114 2.87126
+33 1.95 0.948095 3.13766
+34 2.01 1.01897 3.44187
+35 2.07 0.957376 3.74501
+36 2.13 0.992495 4.07775
+37 2.19 0.994206 4.4301
+38 2.25 1.01625 4.81027
+39 2.31 0.962339 5.18973
+40 2.37 0.985549 5.59879
+41 2.43 0.98162 6.0271
+42 2.49 1.0244 6.49643
+43 2.55 1.02872 6.99073
+44 2.61 0.987637 7.48787
+45 2.67 1.0189 8.02461
+46 2.73 0.995975 8.57311
+47 2.79 0.96786 9.12981
+48 2.85 0.98577 9.72147
+49 2.91 1.0316 10.367
+50 2.97 1.01004 11.0253
+104900 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0.132597 0.0010699
+7 0.39 0.190021 0.0032097
+8 0.45 0.523588 0.0110556
+9 0.51 0.759937 0.0256776
+10 0.57 0.712403 0.042796
+11 0.63 1.02072 0.0727532
+12 0.69 1.08404 0.110913
+13 0.75 0.986231 0.151926
+14 0.81 1.06619 0.203638
+15 0.87 1.07086 0.263552
+16 0.93 1.08223 0.332739
+17 0.99 1.16183 0.416904
+18 1.05 0.989114 0.497504
+19 1.11 0.892931 0.578816
+20 1.17 0.895368 0.669401
+21 1.23 0.947316 0.775321
+22 1.29 1.00045 0.898359
+23 1.35 1.02472 1.03638
+24 1.41 0.975792 1.17974
+25 1.47 1.00943 1.34094
+26 1.53 1.08438 1.52853
+27 1.59 1.02318 1.71969
+28 1.65 1.00331 1.92154
+29 1.71 0.991911 2.13588
+30 1.77 0.981265 2.36305
+31 1.83 0.988594 2.6077
+32 1.89 0.991678 2.86947
+33 1.95 0.930326 3.13088
+34 2.01 1.04525 3.44294
+35 2.07 0.99905 3.75927
+36 2.13 1.02866 4.10414
+37 2.19 0.985149 4.45328
+38 2.25 0.966678 4.81491
+39 2.31 1.00575 5.21148
+40 2.37 1.00273 5.62767
+41 2.43 1.01922 6.0724
+42 2.49 0.994045 6.52782
+43 2.55 0.956725 6.98752
+44 2.61 0.971342 7.47646
+45 2.67 1.06155 8.03566
+46 2.73 1.029 8.60235
+47 2.79 1.04226 9.20185
+48 2.85 0.954871 9.77496
+49 2.91 0.993985 10.3969
+50 2.97 0.989249 11.0417
+104950 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0.108706 0.000356633
+5 0.27 0.0659362 0.000713267
+6 0.33 0.220995 0.00249643
+7 0.39 0.221691 0.00499287
+8 0.45 0.309393 0.0096291
+9 0.51 0.574587 0.0206847
+10 0.57 0.801453 0.0399429
+11 0.63 0.862748 0.0652639
+12 0.69 1.11444 0.104494
+13 0.75 0.917623 0.142653
+14 0.81 1.13237 0.197575
+15 0.87 1.11548 0.259986
+16 0.93 1.08223 0.329173
+17 0.99 1.13229 0.411198
+18 1.05 1.00662 0.493224
+19 1.11 0.951677 0.579886
+20 1.17 0.927094 0.67368
+21 1.23 0.931368 0.777817
+22 1.29 0.965654 0.896576
+23 1.35 1.00354 1.03174
+24 1.41 1.06075 1.18759
+25 1.47 1.0072 1.34843
+26 1.53 0.964811 1.51534
+27 1.59 1.01173 1.70435
+28 1.65 0.976721 1.90086
+29 1.71 1.01502 2.12019
+30 1.77 1.07369 2.36876
+31 1.83 0.99724 2.61555
+32 1.89 0.987625 2.87625
+33 1.95 0.991248 3.15478
+34 2.01 1.04047 3.46541
+35 2.07 1.00919 3.78495
+36 2.13 0.938243 4.0995
+37 2.19 1.01534 4.45934
+38 2.25 1.01148 4.83773
+39 2.31 1.00304 5.23324
+40 2.37 0.983831 5.64158
+41 2.43 0.973446 6.06633
+42 2.49 0.980033 6.51534
+43 2.55 1.0213 7.00606
+44 2.61 1.02873 7.52389
+45 2.67 1.01416 8.05813
+46 2.73 1.02641 8.6234
+47 2.79 0.9722 9.1826
+48 2.85 0.986958 9.77496
+49 2.91 1.01108 10.4076
+50 2.97 1.00402 11.0621
+105000 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0.0659362 0.000356633
+6 0.33 0.132597 0.00142653
+7 0.39 0.190021 0.00356633
+8 0.45 0.42839 0.00998573
+9 0.51 0.741402 0.0242511
+10 0.57 0.593669 0.0385164
+11 0.63 0.874899 0.064194
+12 0.69 0.952338 0.0977175
+13 0.75 1.15775 0.145863
+14 0.81 1.13972 0.201141
+15 0.87 1.12186 0.263909
+16 0.93 1.07665 0.332739
+17 0.99 1.11753 0.413695
+18 1.05 0.993491 0.49465
+19 1.11 0.939927 0.580243
+20 1.17 0.912993 0.672611
+21 1.23 0.937747 0.777461
+22 1.29 0.985953 0.898716
+23 1.35 1.03267 1.0378
+24 1.41 0.915108 1.17225
+25 1.47 1.07867 1.34451
+26 1.53 1.10087 1.53495
+27 1.59 0.935374 1.7097
+28 1.65 1.0299 1.9169
+29 1.71 1.01172 2.13552
+30 1.77 0.927349 2.35021
+31 1.83 0.932391 2.58096
+32 1.89 1.03626 2.85449
+33 1.95 1.04329 3.14765
+34 2.01 0.979545 3.44009
+35 2.07 0.955124 3.74251
+36 2.13 1.00207 4.07846
+37 2.19 0.994206 4.43081
+38 2.25 1.02102 4.81277
+39 2.31 1.05369 5.22825
+40 2.37 0.960631 5.62696
+41 2.43 1.04537 6.0831
+42 2.49 0.993266 6.53816
+43 2.55 0.996805 7.01712
+44 2.61 1.00039 7.52068
+45 2.67 0.985724 8.03994
+46 2.73 0.988204 8.58417
+47 2.79 0.949879 9.13053
+48 2.85 0.997654 9.72932
+49 2.91 1.02077 10.368
+50 2.97 0.99089 11.0139
+105050 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0.131872 0.000713267
+6 0.33 0.220995 0.00249643
+7 0.39 0.285031 0.00570613
+8 0.45 0.594986 0.014622
+9 0.51 0.667262 0.0274608
+10 0.57 0.712403 0.0445792
+11 0.63 0.826294 0.0688302
+12 0.69 1.03339 0.105207
+13 0.75 1.01196 0.14729
+14 0.81 1.21325 0.206134
+15 0.87 1.17922 0.272111
+16 0.93 1.18822 0.348074
+17 0.99 1.14214 0.430813
+18 1.05 0.936595 0.507133
+19 1.11 0.920346 0.590942
+20 1.17 0.895368 0.681526
+21 1.23 0.979212 0.791013
+22 1.29 0.948254 0.907632
+23 1.35 0.916161 1.03103
+24 1.41 1.08745 1.1908
+25 1.47 0.982636 1.34772
+26 1.53 0.995734 1.51997
+27 1.59 1.00028 1.70685
+28 1.65 0.99622 1.90728
+29 1.71 1.06123 2.13659
+30 1.77 1.00437 2.36912
+31 1.83 0.972742 2.60984
+32 1.89 1.03761 2.88374
+33 1.95 0.94048 3.148
+34 2.01 1.02613 3.45435
+35 2.07 0.994545 3.76926
+36 2.13 1.00845 4.10735
+37 2.19 1.03043 4.47254
+38 2.25 0.997185 4.84558
+39 2.31 0.956008 5.22254
+40 2.37 1.0689 5.66619
+41 2.43 0.970177 6.08951
+42 2.49 0.999494 6.54743
+43 2.55 1.00942 7.03245
+44 2.61 0.991888 7.53174
+45 2.67 0.990463 8.0535
+46 2.73 1.01152 8.61056
+47 2.79 1.00382 9.18795
+48 2.85 1.04519 9.81526
+49 2.91 0.94668 10.4076
+50 2.97 1.01278 11.0678
+105100 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0.0659362 0.000356633
+6 0.33 0.176796 0.00178317
+7 0.39 0.475052 0.00713267
+8 0.45 0.523588 0.0149786
+9 0.51 0.426306 0.0231812
+10 0.57 0.638194 0.0385164
+11 0.63 0.984262 0.0674037
+12 0.69 0.921944 0.0998573
+13 0.75 1.23493 0.151213
+14 0.81 1.19854 0.209344
+15 0.87 1.1346 0.272825
+16 0.93 1.08781 0.342368
+17 0.99 1.02891 0.416904
+18 1.05 1.03288 0.50107
+19 1.11 1.02609 0.594508
+20 1.17 0.884793 0.684023
+21 1.23 0.864386 0.78067
+22 1.29 0.913456 0.89301
+23 1.35 1.01413 1.0296
+24 1.41 1.02919 1.18081
+25 1.47 1.0273 1.34486
+26 1.53 1.0081 1.51926
+27 1.59 1.06327 1.7179
+28 1.65 0.985584 1.91619
+29 1.71 0.972105 2.12625
+30 1.77 0.972022 2.35128
+31 1.83 0.971301 2.59165
+32 1.89 1.05518 2.87019
+33 1.95 1.00394 3.15228
+34 2.01 0.999852 3.45078
+35 2.07 0.95625 3.75357
+36 2.13 0.996751 4.08773
+37 2.19 1.01433 4.44722
+38 2.25 1.02483 4.8306
+39 2.31 1.01751 5.23181
+40 2.37 1.00359 5.64836
+41 2.43 0.979168 6.07561
+42 2.49 1.01195 6.53923
+43 2.55 0.937428 6.98966
+44 2.61 1.04503 7.51569
+45 2.67 1.00671 8.04601
+46 2.73 1.01346 8.60414
+47 2.79 0.980261 9.16797
+48 2.85 1.00835 9.77318
+49 2.91 1.01678 10.4094
+50 2.97 0.967363 11.0399
+105150 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0.0659362 0.000356633
+6 0.33 0.220995 0.0021398
+7 0.39 0.348371 0.00606277
+8 0.45 0.309393 0.010699
+9 0.51 0.500446 0.0203281
+10 0.57 0.831136 0.0402996
+11 0.63 0.959959 0.0684736
+12 0.69 1.21575 0.11127
+13 0.75 1.09772 0.156919
+14 0.81 1.21325 0.215763
+15 0.87 1.10273 0.277461
+16 0.93 1.01529 0.342368
+17 0.99 1.16676 0.42689
+18 1.05 1.01537 0.509629
+19 1.11 0.943844 0.595578
+20 1.17 0.923569 0.689016
+21 1.23 0.979212 0.798502
+22 1.29 0.922156 0.911912
+23 1.35 0.966471 1.04208
+24 1.41 0.963655 1.18367
+25 1.47 1.03623 1.34914
+26 1.53 1.01017 1.52389
+27 1.59 1.01173 1.71291
+28 1.65 1.02281 1.91869
+29 1.71 0.967154 2.12767
+30 1.77 1.03672 2.36769
+31 1.83 0.998681 2.61484
+32 1.89 1.00249 2.87946
+33 1.95 0.974748 3.15335
+34 2.01 1.01419 3.45613
+35 2.07 0.986661 3.76854
+36 2.13 0.990368 4.10057
+37 2.19 1.02641 4.46434
+38 2.25 0.974305 4.82882
+39 2.31 1.02294 5.23217
+40 2.37 0.988986 5.64265
+41 2.43 1.02412 6.08951
+42 2.49 1.0065 6.55064
+43 2.55 0.969343 7.01641
+44 2.61 0.999682 7.51961
+45 2.67 1.03785 8.06633
+46 2.73 0.988204 8.61056
+47 2.79 1.0094 9.19116
+48 2.85 0.989335 9.78495
+49 2.91 0.971187 10.3927
+50 2.97 1.01387 11.0535
+105200 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0.108706 0.000356633
+5 0.27 0.0659362 0.000713267
+6 0.33 0.0883979 0.00142653
+7 0.39 0.380042 0.00570613
+8 0.45 0.475989 0.0128388
+9 0.51 0.630192 0.0249643
+10 0.57 0.489777 0.0367332
+11 0.63 0.911353 0.0634807
+12 0.69 1.04352 0.100214
+13 0.75 1.21778 0.150856
+14 0.81 0.985306 0.198645
+15 0.87 1.07724 0.258916
+16 0.93 1.0655 0.327033
+17 0.99 1.14214 0.409772
+18 1.05 1.06789 0.49679
+19 1.11 0.951677 0.583452
+20 1.17 0.916519 0.676177
+21 1.23 0.966454 0.784237
+22 1.29 0.980153 0.904779
+23 1.35 0.966471 1.03495
+24 1.41 1.05589 1.19009
+25 1.47 0.991569 1.34843
+26 1.53 0.973057 1.51676
+27 1.59 1.11863 1.72575
+28 1.65 0.990902 1.92511
+29 1.71 1.03812 2.14943
+30 1.77 0.973562 2.37482
+31 1.83 0.985711 2.61876
+32 1.89 0.995731 2.8816
+33 1.95 1.03821 3.17332
+34 2.01 0.975961 3.46469
+35 2.07 0.929218 3.75892
+36 2.13 0.982922 4.08845
+37 2.19 1.09584 4.47682
+38 2.25 1.02388 4.85984
+39 2.31 0.966861 5.24108
+40 2.37 0.933136 5.62839
+41 2.43 1.0184 6.07275
+42 2.49 0.973806 6.5189
+43 2.55 0.987899 6.99358
+44 2.61 1.0259 7.50999
+45 2.67 0.978954 8.02568
+46 2.73 1.04843 8.60307
+47 2.79 1.0311 9.19615
+48 2.85 0.970915 9.77889
+49 2.91 1.01165 10.4119
+50 2.97 0.973929 11.0467
+105250 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0.0659362 0.000356633
+6 0.33 0.309393 0.00285307
+7 0.39 0.348371 0.00677603
+8 0.45 0.666384 0.0167618
+9 0.51 0.537517 0.0271041
+10 0.57 0.786611 0.0460057
+11 0.63 0.777688 0.0688302
+12 0.69 0.911813 0.100927
+13 0.75 1.09772 0.146576
+14 0.81 1.02942 0.196505
+15 0.87 1.17922 0.262482
+16 0.93 1.21612 0.340228
+17 0.99 1.08799 0.419044
+18 1.05 1.05039 0.504636
+19 1.11 0.928178 0.589158
+20 1.17 1.0258 0.692939
+21 1.23 0.822921 0.78495
+22 1.29 0.959854 0.902996
+23 1.35 0.963823 1.03281
+24 1.41 0.983074 1.17725
+25 1.47 1.0675 1.34772
+26 1.53 1.06377 1.53174
+27 1.59 1.02509 1.72325
+28 1.65 0.985584 1.92154
+29 1.71 1.03152 2.14444
+30 1.77 0.992048 2.37411
+31 1.83 1.04047 2.6316
+32 1.89 1.03356 2.90442
+33 1.95 0.954441 3.17261
+34 2.01 0.972377 3.46291
+35 2.07 1.03847 3.79173
+36 2.13 0.982922 4.12126
+37 2.19 0.965024 4.46327
+38 2.25 1.02388 4.84629
+39 2.31 1.02565 5.25071
+40 2.37 0.988986 5.6612
+41 2.43 0.997149 6.09629
+42 2.49 1.00728 6.55777
+43 2.55 0.953757 7.01605
+44 2.61 0.985512 7.51213
+45 2.67 1.01145 8.04494
+46 2.73 0.99986 8.59558
+47 2.79 0.97468 9.15621
+48 2.85 1.02974 9.77425
+49 2.91 1.01108 10.4069
+50 2.97 1.01496 11.0685
+105300 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0.0659362 0.000356633
+6 0.33 0.397791 0.00356633
+7 0.39 0.285031 0.00677603
+8 0.45 0.452189 0.0135521
+9 0.51 0.389236 0.0210414
+10 0.57 0.653036 0.0367332
+11 0.63 0.996413 0.0659772
+12 0.69 1.12457 0.105563
+13 0.75 0.900472 0.14301
+14 0.81 1.05884 0.194365
+15 0.87 1.22384 0.262839
+16 0.93 1.13244 0.335235
+17 0.99 1.13229 0.417261
+18 1.05 0.989114 0.49786
+19 1.11 0.916429 0.581312
+20 1.17 0.962344 0.678673
+21 1.23 1.043 0.795292
+22 1.29 0.933755 0.910128
+23 1.35 0.934696 1.03602
+24 1.41 0.980646 1.1801
+25 1.47 1.0876 1.35378
+26 1.53 0.991611 1.52532
+27 1.59 0.944918 1.70185
+28 1.65 1.07599 1.91833
+29 1.71 1.00676 2.13588
+30 1.77 0.953537 2.35663
+31 1.83 1.03183 2.61198
+32 1.89 0.993029 2.87411
+33 1.95 1.0179 3.16013
+34 2.01 1.03449 3.46897
+35 2.07 1.02158 3.79244
+36 2.13 0.977603 4.12019
+37 2.19 0.996218 4.47325
+38 2.25 1.0458 4.86448
+39 2.31 0.97681 5.24964
+40 2.37 1.00961 5.66869
+41 2.43 1.00287 6.10628
+42 2.49 0.99638 6.56277
+43 2.55 0.989383 7.03816
+44 2.61 0.969216 7.52603
+45 2.67 1.03041 8.06883
+46 2.73 1.02447 8.63302
+47 2.79 0.982741 9.19829
+48 2.85 1.01013 9.80456
+49 2.91 1.00766 10.4351
+50 2.97 1.00512 11.0902
+105350 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0.0659362 0.000356633
+6 0.33 0.176796 0.00178317
+7 0.39 0.253361 0.00463623
+8 0.45 0.404591 0.010699
+9 0.51 0.500446 0.0203281
+10 0.57 0.712403 0.0374465
+11 0.63 0.887051 0.0634807
+12 0.69 0.9726 0.0977175
+13 0.75 0.960503 0.13766
+14 0.81 1.29413 0.200428
+15 0.87 1.23022 0.269258
+16 0.93 1.21054 0.346648
+17 0.99 1.08306 0.425107
+18 1.05 1.011 0.507489
+19 1.11 1.02609 0.600927
+20 1.17 0.895368 0.691512
+21 1.23 0.944126 0.797076
+22 1.29 0.948254 0.913695
+23 1.35 0.9294 1.03887
+24 1.41 0.961228 1.1801
+25 1.47 0.975936 1.33595
+26 1.53 1.07201 1.5214
+27 1.59 1.04991 1.71755
+28 1.65 1.02458 1.92368
+29 1.71 0.940747 2.12696
+30 1.77 1.04442 2.36876
+31 1.83 0.981388 2.61163
+32 1.89 1.00384 2.8766
+33 1.95 1.0014 3.15799
+34 2.01 1.02733 3.46469
+35 2.07 0.97765 3.77425
+36 2.13 0.904203 4.07739
+37 2.19 1.01836 4.4383
+38 2.25 0.995278 4.81063
+39 2.31 1.02565 5.21505
+40 2.37 1.00531 5.63231
+41 2.43 0.975081 6.05777
+42 2.49 1.03141 6.53031
+43 2.55 0.996805 7.00927
+44 2.61 0.989054 7.50713
+45 2.67 1.00807 8.03816
+46 2.73 0.99986 8.5888
+47 2.79 1.0187 9.17475
+48 2.85 1.01013 9.78103
+49 2.91 1.01051 10.4133
+50 2.97 0.98706 11.0567
+105400 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0.044199 0.000356633
+7 0.39 0.253361 0.0032097
+8 0.45 0.547387 0.0114123
+9 0.51 0.500446 0.0210414
+10 0.57 0.786611 0.0399429
+11 0.63 0.887051 0.0659772
+12 0.69 1.01313 0.101641
+13 0.75 1.03769 0.144793
+14 0.81 1.17648 0.201854
+15 0.87 1.19197 0.268545
+16 0.93 1.04318 0.335235
+17 0.99 1.09291 0.414408
+18 1.05 0.975984 0.493937
+19 1.11 1.01042 0.585949
+20 1.17 0.905943 0.677603
+21 1.23 0.979212 0.78709
+22 1.29 0.948254 0.903709
+23 1.35 0.963823 1.03352
+24 1.41 0.978219 1.17725
+25 1.47 0.917871 1.32382
+26 1.53 1.03078 1.50214
+27 1.59 1.09763 1.7072
+28 1.65 1.04763 1.91797
+29 1.71 1.01832 2.13802
+30 1.77 1.0321 2.37696
+31 1.83 0.969859 2.61698
+32 1.89 0.972763 2.87375
+33 1.95 1.02932 3.16298
+34 2.01 1.01299 3.46541
+35 2.07 0.96526 3.77104
+36 2.13 0.992495 4.10378
+37 2.19 0.978105 4.45043
+38 2.25 1.05057 4.84344
+39 2.31 0.991281 5.23431
+40 2.37 0.963209 5.63409
+41 2.43 0.997966 6.06954
+42 2.49 1.03141 6.54208
+43 2.55 1.05767 7.05029
+44 2.61 0.95363 7.53031
+45 2.67 0.986401 8.04993
+46 2.73 1.01346 8.60806
+47 2.79 0.9784 9.17083
+48 2.85 0.995871 9.76854
+49 2.91 1.00595 10.398
+50 2.97 1.0467 11.0802
+105450 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0.108706 0.000356633
+5 0.27 0.0659362 0.000713267
+6 0.33 0.132597 0.00178317
+7 0.39 0.316701 0.0053495
+8 0.45 0.499788 0.0128388
+9 0.51 0.741402 0.0271041
+10 0.57 0.742086 0.0449358
+11 0.63 0.887051 0.07097
+12 0.69 0.89155 0.102354
+13 0.75 1.13202 0.149429
+14 0.81 1.32355 0.213623
+15 0.87 1.12186 0.276391
+16 0.93 1.17149 0.351284
+17 0.99 1.13229 0.43331
+18 1.05 0.954101 0.511056
+19 1.11 0.943844 0.597004
+20 1.17 0.920044 0.690086
+21 1.23 0.928178 0.793866
+22 1.29 0.922156 0.907275
+23 1.35 0.89233 1.02746
+24 1.41 1.04376 1.18081
+25 1.47 1.01167 1.34237
+26 1.53 1.08026 1.52924
+27 1.59 1.03273 1.72218
+28 1.65 0.96254 1.91583
+29 1.71 1.03317 2.13909
+30 1.77 0.984345 2.36698
+31 1.83 0.981388 2.60984
+32 1.89 0.971412 2.86626
+33 1.95 1.04455 3.15977
+34 2.01 0.95207 3.44401
+35 2.07 0.988913 3.75713
+36 2.13 0.997814 4.09165
+37 2.19 1.02842 4.45613
+38 2.25 1.0029 4.83131
+39 2.31 1.01751 5.23252
+40 2.37 0.988986 5.64301
+41 2.43 1.02984 6.09237
+42 2.49 0.980033 6.54137
+43 2.55 1.00349 7.02354
+44 2.61 0.973467 7.51355
+45 2.67 0.953905 8.01605
+46 2.73 1.01605 8.57561
+47 2.79 1.05714 9.18367
+48 2.85 0.993494 9.77996
+49 2.91 1.03331 10.4265
+50 2.97 0.98323 11.0674
+105500 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0.42338 0.000713267
+4 0.21 0 0.000713267
+5 0.27 0.131872 0.00142653
+6 0.33 0.353592 0.0042796
+7 0.39 0.316701 0.00784593
+8 0.45 0.285593 0.0121255
+9 0.51 0.574587 0.0231812
+10 0.57 0.786611 0.0420827
+11 0.63 0.947808 0.0699001
+12 0.69 0.962469 0.10378
+13 0.75 0.960503 0.143723
+14 0.81 1.22796 0.203281
+15 0.87 0.93063 0.25535
+16 0.93 1.15475 0.329173
+17 0.99 1.12245 0.410485
+18 1.05 1.02413 0.493937
+19 1.11 0.967342 0.582026
+20 1.17 1.01522 0.684736
+21 1.23 0.905851 0.78602
+22 1.29 0.881558 0.894437
+23 1.35 0.966471 1.02461
+24 1.41 0.978219 1.16833
+25 1.47 0.998268 1.32775
+26 1.53 1.04521 1.50856
+27 1.59 0.979279 1.69151
+28 1.65 1.01217 1.89515
+29 1.71 1.02162 2.11591
+30 1.77 1.00437 2.34843
+31 1.83 1.05344 2.60913
+32 1.89 0.953849 2.86091
+33 1.95 1.01029 3.14479
+34 2.01 0.96521 3.43295
+35 2.07 1.04185 3.76284
+36 2.13 1.01803 4.10414
+37 2.19 0.971061 4.44829
+38 2.25 1.04199 4.83809
+39 2.31 0.966861 5.21933
+40 2.37 0.965787 5.62019
+41 2.43 1.00696 6.05956
+42 2.49 1.0244 6.52889
+43 2.55 0.956725 6.98859
+44 2.61 1.05211 7.51819
+45 2.67 0.958644 8.02318
+46 2.73 0.956473 8.54993
+47 2.79 1.03606 9.14586
+48 2.85 1.03687 9.76819
+49 2.91 1.00481 10.3969
+50 2.97 0.978853 11.035
+105550 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0.263745 0.00142653
+6 0.33 0.265194 0.00356633
+7 0.39 0.221691 0.00606277
+8 0.45 0.309393 0.010699
+9 0.51 0.518981 0.0206847
+10 0.57 0.801453 0.0399429
+11 0.63 0.838445 0.0645506
+12 0.69 1.04352 0.101284
+13 0.75 1.25208 0.153352
+14 0.81 1.0809 0.205777
+15 0.87 1.20472 0.273181
+16 0.93 1.03202 0.339158
+17 0.99 1.03876 0.414408
+18 1.05 1.03288 0.498573
+19 1.11 1.01434 0.590942
+20 1.17 0.990545 0.691155
+21 1.23 0.902661 0.792083
+22 1.29 0.956954 0.909772
+23 1.35 0.926753 1.03459
+24 1.41 0.949091 1.17404
+25 1.47 1.0541 1.34237
+26 1.53 1.07407 1.52817
+27 1.59 1.02509 1.71969
+28 1.65 0.911134 1.903
+29 1.71 1.01172 2.12161
+30 1.77 1.08756 2.3734
+31 1.83 0.935273 2.60485
+32 1.89 1.03491 2.87803
+33 1.95 1.05217 3.17368
+34 2.01 0.938929 3.45399
+35 2.07 0.981029 3.76462
+36 2.13 0.993559 4.09772
+37 2.19 0.925779 4.42582
+38 2.25 1.01434 4.80528
+39 2.31 1.03831 5.21469
+40 2.37 1.01304 5.63516
+41 2.43 1.02984 6.08452
+42 2.49 0.997159 6.54137
+43 2.55 0.99161 7.01783
+44 2.61 0.997556 7.51997
+45 2.67 0.987078 8.03994
+46 2.73 0.998565 8.58987
+47 2.79 1.028 9.18117
+48 2.85 0.988741 9.77461
+49 2.91 0.980307 10.388
+50 2.97 0.997456 11.0382
+105600 50
+1 0.03 0 0
+2 0.09 0.574587 0.000356633
+3 0.15 0 0.000356633
+4 0.21 0 0.000356633
+5 0.27 0.197809 0.00142653
+6 0.33 0.220995 0.0032097
+7 0.39 0.348371 0.00713267
+8 0.45 0.523588 0.0149786
+9 0.51 0.648727 0.0274608
+10 0.57 0.771769 0.0460057
+11 0.63 0.935656 0.0734665
+12 0.69 0.962469 0.107347
+13 0.75 0.943351 0.146576
+14 0.81 1.3309 0.211127
+15 0.87 1.19197 0.277817
+16 0.93 1.08781 0.347361
+17 0.99 1.09291 0.426534
+18 1.05 0.949725 0.503923
+19 1.11 0.936011 0.589158
+20 1.17 0.874218 0.677603
+21 1.23 0.91861 0.780314
+22 1.29 0.965654 0.899073
+23 1.35 1.02737 1.03745
+24 1.41 1.00977 1.18581
+25 1.47 1.0206 1.34879
+26 1.53 0.966872 1.51605
+27 1.59 1.02318 1.7072
+28 1.65 1.00686 1.90977
+29 1.71 0.977057 2.1209
+30 1.77 0.96432 2.34415
+31 1.83 1.02894 2.59879
+32 1.89 0.970061 2.85485
+33 1.95 0.991248 3.13338
+34 2.01 1.01897 3.43759
+35 2.07 0.970892 3.74501
+36 2.13 0.963774 4.06812
+37 2.19 1.02842 4.4326
+38 2.25 1.00672 4.8092
+39 2.31 0.990377 5.19971
+40 2.37 1.01304 5.62019
+41 2.43 1.05355 6.07989
+42 2.49 0.994045 6.53531
+43 2.55 0.973797 7.00321
+44 2.61 0.983386 7.49822
+45 2.67 0.968122 8.0082
+46 2.73 1.01994 8.5699
+47 2.79 1.0063 9.14872
+48 2.85 1.00062 9.74929
+49 2.91 0.989996 10.3688
+50 2.97 0.990343 11.0143
+105650 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0.21169 0.000356633
+4 0.21 0 0.000356633
+5 0.27 0.0659362 0.000713267
+6 0.33 0.176796 0.0021398
+7 0.39 0.316701 0.00570613
+8 0.45 0.618786 0.0149786
+9 0.51 0.518981 0.0249643
+10 0.57 0.816295 0.0445792
+11 0.63 0.935656 0.0720399
+12 0.69 0.911813 0.104137
+13 0.75 0.926199 0.142653
+14 0.81 1.15443 0.198645
+15 0.87 1.04537 0.257133
+16 0.93 1.12686 0.329173
+17 0.99 1.04368 0.404779
+18 1.05 0.989114 0.485378
+19 1.11 1.09267 0.584879
+20 1.17 0.874218 0.673324
+21 1.23 0.953695 0.779957
+22 1.29 0.968553 0.899073
+23 1.35 0.971766 1.02996
+24 1.41 0.966082 1.1719
+25 1.47 1.05187 1.33987
+26 1.53 1.05552 1.52247
+27 1.59 0.954463 1.70078
+28 1.65 1.06181 1.91441
+29 1.71 1.02987 2.13695
+30 1.77 0.996669 2.36769
+31 1.83 0.981388 2.61056
+32 1.89 0.993029 2.87268
+33 1.95 1.01663 3.15835
+34 2.01 1.01299 3.46077
+35 2.07 0.932597 3.75606
+36 2.13 1.04675 4.10699
+37 2.19 0.991187 4.45827
+38 2.25 0.968585 4.82061
+39 2.31 0.993995 5.21255
+40 2.37 1.02937 5.6398
+41 2.43 0.976716 6.06598
+42 2.49 1.01195 6.5296
+43 2.55 0.978992 7
+44 2.61 1.01243 7.50963
+45 2.67 1.00739 8.0403
+46 2.73 0.987556 8.58417
+47 2.79 1.01498 9.16797
+48 2.85 1.03509 9.78923
+49 2.91 0.974037 10.3987
+50 2.97 1.00895 11.0563
+105700 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0.353592 0.00285307
+7 0.39 0.443382 0.00784593
+8 0.45 0.404591 0.0139087
+9 0.51 0.593122 0.025321
+10 0.57 0.875662 0.0463623
+11 0.63 0.899202 0.0727532
+12 0.69 0.851025 0.10271
+13 0.75 1.11487 0.149073
+14 0.81 1.01472 0.198288
+15 0.87 1.05174 0.257133
+16 0.93 1.14359 0.330243
+17 0.99 1.04368 0.405849
+18 1.05 1.08978 0.49465
+19 1.11 1.00651 0.586305
+20 1.17 0.99407 0.686876
+21 1.23 0.886713 0.78602
+22 1.29 0.922156 0.899429
+23 1.35 0.955879 1.02817
+24 1.41 0.919963 1.16334
+25 1.47 1.00943 1.32454
+26 1.53 1.05552 1.50713
+27 1.59 1.10336 1.71327
+28 1.65 1.01572 1.91762
+29 1.71 0.996862 2.13302
+30 1.77 0.96586 2.35663
+31 1.83 1.0448 2.61519
+32 1.89 1.0822 2.90086
+33 1.95 0.991248 3.17939
+34 2.01 0.937735 3.45934
+35 2.07 0.987787 3.77211
+36 2.13 1.01164 4.11127
+37 2.19 1.00226 4.46648
+38 2.25 0.979072 4.83274
+39 2.31 0.993995 5.22468
+40 2.37 0.992423 5.63659
+41 2.43 1.02412 6.08345
+42 2.49 0.994045 6.53887
+43 2.55 1.03763 7.03745
+44 2.61 0.992597 7.53709
+45 2.67 0.929532 8.02675
+46 2.73 1.0167 8.58666
+47 2.79 0.986461 9.15407
+48 2.85 0.97448 9.73894
+49 2.91 0.998545 10.3638
+50 2.97 0.989796 11.0089
+105750 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0.176796 0.00142653
+7 0.39 0.348371 0.0053495
+8 0.45 0.452189 0.0121255
+9 0.51 0.648727 0.0246077
+10 0.57 0.816295 0.0442225
+11 0.63 0.765537 0.0666904
+12 0.69 1.00299 0.101997
+13 0.75 1.05484 0.145863
+14 0.81 1.24266 0.206134
+15 0.87 1.31308 0.279601
+16 0.93 1.08223 0.348787
+17 0.99 1.0486 0.42475
+18 1.05 1.09415 0.513909
+19 1.11 0.889015 0.594864
+20 1.17 0.828392 0.678673
+21 1.23 0.848438 0.773538
+22 1.29 0.983053 0.894437
+23 1.35 1.00884 1.03031
+24 1.41 1.0122 1.17903
+25 1.47 0.973703 1.33452
+26 1.53 1.08026 1.5214
+27 1.59 0.998368 1.70792
+28 1.65 0.997993 1.9087
+29 1.71 0.980357 2.12054
+30 1.77 0.927349 2.33524
+31 1.83 1.01165 2.58559
+32 1.89 1.00654 2.85128
+33 1.95 1.00394 3.13338
+34 2.01 1.05002 3.44686
+35 2.07 0.952871 3.74857
+36 2.13 0.999942 4.08381
+37 2.19 0.997225 4.43723
+38 2.25 1.03532 4.82454
+39 2.31 0.975001 5.20899
+40 2.37 1.00961 5.62803
+41 2.43 1.0045 6.06633
+42 2.49 0.986261 6.51819
+43 2.55 1.01091 7.00392
+44 2.61 1.02235 7.51854
+45 2.67 1.03379 8.06312
+46 2.73 0.962301 8.59308
+47 2.79 0.982121 9.15799
+48 2.85 1.01429 9.76676
+49 2.91 0.94839 10.3602
+50 2.97 0.992532 11.0071
+105800 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0.131872 0.000713267
+6 0.33 0.132597 0.00178317
+7 0.39 0.506722 0.0074893
+8 0.45 0.214195 0.010699
+9 0.51 0.556052 0.021398
+10 0.57 0.816295 0.0410128
+11 0.63 1.00856 0.0706134
+12 0.69 0.911813 0.10271
+13 0.75 1.15775 0.150856
+14 0.81 1.12501 0.205421
+15 0.87 1.12823 0.268545
+16 0.93 1.0376 0.334879
+17 0.99 1.20614 0.422254
+18 1.05 1.01975 0.50535
+19 1.11 0.90468 0.587732
+20 1.17 0.898893 0.678673
+21 1.23 0.988781 0.78923
+22 1.29 0.948254 0.905849
+23 1.35 0.987654 1.03887
+24 1.41 1.02434 1.18937
+25 1.47 1.04963 1.35699
+26 1.53 1.02872 1.53495
+27 1.59 1.05945 1.73288
+28 1.65 0.935951 1.92118
+29 1.71 0.977057 2.13231
+30 1.77 1.04288 2.37375
+31 1.83 0.987153 2.61805
+32 1.89 0.99438 2.88053
+33 1.95 1.02425 3.16833
+34 2.01 1.01538 3.47147
+35 2.07 1.01031 3.79137
+36 2.13 0.991432 4.12375
+37 2.19 0.996218 4.47682
+38 2.25 0.950472 4.83238
+39 2.31 1.04826 5.24572
+40 2.37 1.00359 5.66227
+41 2.43 1.04537 6.1184
+42 2.49 0.953567 6.55528
+43 2.55 0.960437 7.01676
+44 2.61 1.04219 7.54137
+45 2.67 0.989109 8.06241
+46 2.73 0.981081 8.60271
+47 2.79 1.01498 9.18652
+48 2.85 1.01845 9.79779
+49 2.91 0.981446 10.4119
+50 2.97 1.01606 11.0742
+105850 50
+1 0.03 0 0
+2 0.09 0.574587 0.000356633
+3 0.15 0 0.000356633
+4 0.21 0 0.000356633
+5 0.27 0 0.000356633
+6 0.33 0.176796 0.00178317
+7 0.39 0.221691 0.0042796
+8 0.45 0.475989 0.0114123
+9 0.51 0.667262 0.0242511
+10 0.57 0.964712 0.0474322
+11 0.63 0.814142 0.0713267
+12 0.69 1.01313 0.10699
+13 0.75 0.994807 0.148359
+14 0.81 1.14707 0.203994
+15 0.87 1.14735 0.268188
+16 0.93 1.17707 0.343438
+17 0.99 1.01906 0.417261
+18 1.05 1.01975 0.500357
+19 1.11 0.979091 0.589515
+20 1.17 0.891843 0.679743
+21 1.23 0.972833 0.788516
+22 1.29 1.04395 0.916904
+23 1.35 0.985006 1.04957
+24 1.41 0.970937 1.19223
+25 1.47 0.991569 1.35057
+26 1.53 0.975119 1.51926
+27 1.59 1.02509 1.71077
+28 1.65 1.06713 1.92546
+29 1.71 0.972105 2.13552
+30 1.77 1.02286 2.37233
+31 1.83 1.04336 2.63053
+32 1.89 0.971412 2.88695
+33 1.95 1.00902 3.17047
+34 2.01 0.950875 3.45435
+35 2.07 0.993419 3.7689
+36 2.13 0.975475 4.09593
+37 2.19 1.00427 4.45185
+38 2.25 1.02769 4.83631
+39 2.31 0.998517 5.23003
+40 2.37 0.965787 5.63088
+41 2.43 1.06335 6.09486
+42 2.49 1.02752 6.56562
+43 2.55 0.996805 7.04458
+44 2.61 0.979135 7.53745
+45 2.67 0.978277 8.05278
+46 2.73 0.992089 8.59914
+47 2.79 1.02118 9.18652
+48 2.85 0.988146 9.7796
+49 2.91 0.990566 10.3994
+50 2.97 0.980494 11.0385
+105900 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0.0659362 0.000356633
+6 0.33 0.176796 0.00178317
+7 0.39 0.316701 0.0053495
+8 0.45 0.452189 0.0121255
+9 0.51 0.463376 0.0210414
+10 0.57 0.756928 0.0392297
+11 0.63 0.78984 0.0624108
+12 0.69 1.08404 0.100571
+13 0.75 1.12345 0.14729
+14 0.81 1.11031 0.201141
+15 0.87 1.12186 0.263909
+16 0.93 1.14359 0.337019
+17 0.99 1.07814 0.415121
+18 1.05 0.958478 0.493224
+19 1.11 1.02609 0.586662
+20 1.17 0.930619 0.680813
+21 1.23 0.928178 0.784593
+22 1.29 0.954054 0.901926
+23 1.35 0.939992 1.02853
+24 1.41 1.04376 1.18188
+25 1.47 0.946903 1.3331
+26 1.53 1.0885 1.5214
+27 1.59 0.981188 1.70471
+28 1.65 1.07599 1.92118
+29 1.71 1.02327 2.1423
+30 1.77 0.916566 2.35449
+31 1.83 0.995799 2.60093
+32 1.89 1.0214 2.87054
+33 1.95 1.00521 3.153
+34 2.01 0.981934 3.44615
+35 2.07 1.05311 3.7796
+36 2.13 0.952072 4.09879
+37 2.19 0.998231 4.45257
+38 2.25 0.985745 4.82133
+39 2.31 1.01118 5.22004
+40 2.37 0.998438 5.63445
+41 2.43 0.992245 6.0674
+42 2.49 0.983925 6.51819
+43 2.55 1.01388 7.00535
+44 2.61 0.993305 7.50535
+45 2.67 1.04259 8.05456
+46 2.73 0.987556 8.59843
+47 2.79 1.01932 9.18474
+48 2.85 1.0137 9.79315
+49 2.91 1.00766 10.4237
+50 2.97 0.98323 11.0646
+105950 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0.329681 0.00178317
+6 0.33 0.176796 0.0032097
+7 0.39 0.316701 0.00677603
+8 0.45 0.594986 0.0156919
+9 0.51 0.389236 0.0231812
+10 0.57 0.697561 0.0399429
+11 0.63 0.97211 0.0684736
+12 0.69 0.911813 0.100571
+13 0.75 1.23493 0.151926
+14 0.81 1.01472 0.201141
+15 0.87 1.1856 0.267475
+16 0.93 1.14359 0.340585
+17 0.99 1.04368 0.416191
+18 1.05 1.0854 0.504636
+19 1.11 0.845935 0.581669
+20 1.17 1.01875 0.684736
+21 1.23 1.043 0.801355
+22 1.29 0.985953 0.922611
+23 1.35 0.992949 1.05635
+24 1.41 0.970937 1.199
+25 1.47 0.973703 1.35449
+26 1.53 0.973057 1.52282
+27 1.59 1.01364 1.7122
+28 1.65 0.953677 1.90407
+29 1.71 0.977057 2.11519
+30 1.77 1.01361 2.34986
+31 1.83 1.00012 2.59736
+32 1.89 1.03761 2.87126
+33 1.95 0.989979 3.14943
+34 2.01 0.97835 3.44151
+35 2.07 0.972018 3.74929
+36 2.13 1.0276 4.09379
+37 2.19 1.05458 4.46755
+38 2.25 0.936172 4.81776
+39 2.31 1.04284 5.22896
+40 2.37 0.965787 5.62981
+41 2.43 0.962821 6.04993
+42 2.49 0.959794 6.48966
+43 2.55 1.03021 6.98466
+44 2.61 1.07124 7.52389
+45 2.67 1.01213 8.05706
+46 2.73 0.955177 8.5831
+47 2.79 1.00878 9.16334
+48 2.85 1.00894 9.7689
+49 2.91 1.00595 10.3984
+50 2.97 1.02044 11.0635
+106000 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0.0659362 0.000356633
+6 0.33 0.220995 0.0021398
+7 0.39 0.316701 0.00570613
+8 0.45 0.380791 0.0114123
+9 0.51 0.556052 0.0221113
+10 0.57 0.86082 0.042796
+11 0.63 0.826294 0.0670471
+12 0.69 1.04352 0.10378
+13 0.75 0.994807 0.14515
+14 0.81 1.16913 0.201854
+15 0.87 1.17285 0.267475
+16 0.93 1.14917 0.340942
+17 0.99 1.0683 0.418331
+18 1.05 0.971608 0.497504
+19 1.11 1.09658 0.597361
+20 1.17 0.912993 0.689729
+21 1.23 0.909041 0.791369
+22 1.29 0.968553 0.910485
+23 1.35 0.953231 1.03887
+24 1.41 0.978219 1.1826
+25 1.47 1.0809 1.35521
+26 1.53 0.97718 1.52425
+27 1.59 1.01937 1.71469
+28 1.65 0.99622 1.91512
+29 1.71 1.06783 2.14586
+30 1.77 0.970481 2.37054
+31 1.83 0.992917 2.61626
+32 1.89 0.971412 2.87268
+33 1.95 0.974748 3.14658
+34 2.01 1.03211 3.45471
+35 2.07 0.911197 3.74322
+36 2.13 1.00207 4.07917
+37 2.19 0.995212 4.43188
+38 2.25 0.988605 4.80171
+39 2.31 1.04826 5.21505
+40 2.37 1.05944 5.65478
+41 2.43 1.05109 6.11341
+42 2.49 1.00183 6.5724
+43 2.55 0.99829 7.05207
+44 2.61 0.952213 7.53138
+45 2.67 0.934948 8.02389
+46 2.73 1.01152 8.58096
+47 2.79 0.9722 9.14016
+48 2.85 1.00241 9.7418
+49 2.91 1.02077 10.3805
+50 2.97 0.985419 11.0228
+106050 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0.131872 0.000713267
+6 0.33 0.132597 0.00178317
+7 0.39 0.285031 0.00499287
+8 0.45 0.333192 0.00998573
+9 0.51 0.648727 0.0224679
+10 0.57 0.742086 0.0402996
+11 0.63 0.899202 0.0666904
+12 0.69 1.06378 0.104137
+13 0.75 1.07199 0.148716
+14 0.81 1.00736 0.197575
+15 0.87 1.1346 0.261056
+16 0.93 1.0655 0.329173
+17 0.99 1.08799 0.407989
+18 1.05 1.03726 0.492511
+19 1.11 0.943844 0.578459
+20 1.17 0.99407 0.67903
+21 1.23 0.940937 0.784237
+22 1.29 0.959854 0.902282
+23 1.35 0.89233 1.02247
+24 1.41 1.02191 1.17261
+25 1.47 1.01167 1.33417
+26 1.53 1.09881 1.52425
+27 1.59 0.950645 1.70185
+28 1.65 1.00686 1.90442
+29 1.71 0.958902 2.11163
+30 1.77 1.01361 2.34629
+31 1.83 0.954007 2.58238
+32 1.89 0.956551 2.83488
+33 1.95 1.05471 3.13124
+34 2.01 0.992685 3.4276
+35 2.07 0.984408 3.7393
+36 2.13 1.02547 4.0831
+37 2.19 1.00326 4.43866
+38 2.25 0.993372 4.81027
+39 2.31 1.00304 5.20578
+40 2.37 1.00789 5.62411
+41 2.43 1.04129 6.07846
+42 2.49 0.995602 6.53459
+43 2.55 1.0213 7.02532
+44 2.61 0.959298 7.5082
+45 2.67 0.974215 8.0214
+46 2.73 0.99986 8.57204
+47 2.79 1.01064 9.15335
+48 2.85 1.00122 9.75428
+49 2.91 1.0202 10.3927
+50 2.97 0.996362 11.0421
+106100 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0.197809 0.0010699
+6 0.33 0.220995 0.00285307
+7 0.39 0.221691 0.0053495
+8 0.45 0.547387 0.0135521
+9 0.51 0.648727 0.0260342
+10 0.57 0.86082 0.046719
+11 0.63 0.874899 0.0723966
+12 0.69 0.952338 0.10592
+13 0.75 0.866168 0.14194
+14 0.81 1.08825 0.194722
+15 0.87 1.03899 0.252853
+16 0.93 1.21612 0.330599
+17 0.99 1.12737 0.412268
+18 1.05 1.12917 0.50428
+19 1.11 0.939927 0.589872
+20 1.17 0.944719 0.685449
+21 1.23 1.0143 0.798859
+22 1.29 0.939555 0.914408
+23 1.35 0.913513 1.03745
+24 1.41 0.895689 1.16904
+25 1.47 1.00497 1.32953
+26 1.53 0.93801 1.4918
+27 1.59 0.956372 1.67047
+28 1.65 1.06181 1.88409
+29 1.71 0.935796 2.08631
+30 1.77 0.96586 2.30991
+31 1.83 1.06065 2.5724
+32 1.89 0.990327 2.83381
+33 1.95 0.992517 3.1127
+34 2.01 1.05002 3.42618
+35 2.07 1.02833 3.75178
+36 2.13 1.02228 4.09451
+37 2.19 0.956974 4.43367
+38 2.25 0.981932 4.801
+39 2.31 0.995804 5.19365
+40 2.37 1.01047 5.61305
+41 2.43 0.967725 6.03531
+42 2.49 1.02207 6.50357
+43 2.55 0.973797 6.97147
+44 2.61 0.969925 7.4597
+45 2.67 1.0541 8.01498
+46 2.73 0.988204 8.5592
+47 2.79 0.95608 9.10913
+48 2.85 0.998248 9.70827
+49 2.91 1.0088 10.3395
+50 2.97 1.01168 10.9989
+106150 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0.220995 0.00178317
+7 0.39 0.411712 0.0064194
+8 0.45 0.452189 0.0131954
+9 0.51 0.759937 0.0278174
+10 0.57 0.742086 0.0456491
+11 0.63 0.765537 0.068117
+12 0.69 0.952338 0.101641
+13 0.75 1.1749 0.150499
+14 0.81 1.06619 0.202211
+15 0.87 1.10273 0.263909
+16 0.93 1.09897 0.334165
+17 0.99 1.15691 0.417974
+18 1.05 1.05039 0.503566
+19 1.11 0.924262 0.587732
+20 1.17 0.990545 0.687946
+21 1.23 0.91542 0.7903
+22 1.29 1.04975 0.919401
+23 1.35 0.969118 1.04993
+24 1.41 0.970937 1.19258
+25 1.47 0.991569 1.35093
+26 1.53 1.04521 1.53174
+27 1.59 1.00982 1.7204
+28 1.65 0.964313 1.91441
+29 1.71 0.995211 2.12946
+30 1.77 0.988967 2.35842
+31 1.83 1.00877 2.60806
+32 1.89 1.03626 2.8816
+33 1.95 1.03948 3.17368
+34 2.01 0.901898 3.44294
+35 2.07 0.914576 3.73252
+36 2.13 1.03611 4.07989
+37 2.19 1.07672 4.46148
+38 2.25 0.958098 4.8199
+39 2.31 1.01299 5.21933
+40 2.37 0.98469 5.62803
+41 2.43 1.02003 6.07311
+42 2.49 0.995602 6.52924
+43 2.55 0.99161 7.00571
+44 2.61 1.0096 7.51391
+45 2.67 0.989786 8.03531
+46 2.73 0.982376 8.57632
+47 2.79 1.01436 9.15977
+48 2.85 1.00062 9.76034
+49 2.91 1.00367 10.3884
+50 2.97 1.00129 11.041
+106200 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0.197809 0.0010699
+6 0.33 0.309393 0.00356633
+7 0.39 0.316701 0.00713267
+8 0.45 0.380791 0.0128388
+9 0.51 0.556052 0.0235378
+10 0.57 0.786611 0.0424394
+11 0.63 0.814142 0.0663338
+12 0.69 0.952338 0.0998573
+13 0.75 1.11487 0.14622
+14 0.81 1.06619 0.197932
+15 0.87 1.05174 0.256776
+16 0.93 1.09897 0.327033
+17 0.99 0.999373 0.399429
+18 1.05 0.989114 0.480029
+19 1.11 0.94776 0.566334
+20 1.17 1.02932 0.670471
+21 1.23 0.931368 0.774608
+22 1.29 0.974353 0.894437
+23 1.35 1.00089 1.02924
+24 1.41 1.1093 1.19223
+25 1.47 0.984869 1.3495
+26 1.53 0.946257 1.5132
+27 1.59 0.990732 1.69829
+28 1.65 0.973176 1.89408
+29 1.71 1.00181 2.11056
+30 1.77 1.00591 2.34344
+31 1.83 0.974183 2.58452
+32 1.89 1.04842 2.86127
+33 1.95 0.97221 3.13445
+34 2.01 1.09542 3.46148
+35 2.07 0.988913 3.77461
+36 2.13 1.02547 4.1184
+37 2.19 0.951942 4.45578
+38 2.25 1.001 4.83024
+39 2.31 1.01661 5.2311
+40 2.37 0.97352 5.63516
+41 2.43 0.972629 6.05956
+42 2.49 0.96213 6.50036
+43 2.55 1.02501 6.99287
+44 2.61 0.991888 7.49215
+45 2.67 0.986401 8.01177
+46 2.73 1.03224 8.58024
+47 2.79 1.00878 9.16049
+48 2.85 0.996465 9.75856
+49 2.91 0.988856 10.3773
+50 2.97 0.991437 11.0235
+106250 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0.108706 0.000356633
+5 0.27 0.131872 0.0010699
+6 0.33 0.265194 0.0032097
+7 0.39 0.253361 0.00606277
+8 0.45 0.333192 0.0110556
+9 0.51 0.611657 0.0228245
+10 0.57 0.756928 0.0410128
+11 0.63 0.899202 0.0674037
+12 0.69 1.02326 0.103424
+13 0.75 0.934775 0.142297
+14 0.81 1.30884 0.205777
+15 0.87 1.1346 0.269258
+16 0.93 1.08223 0.338445
+17 0.99 1.0043 0.411198
+18 1.05 0.980361 0.491084
+19 1.11 0.939927 0.576676
+20 1.17 0.976445 0.675464
+21 1.23 0.976023 0.784593
+22 1.29 0.974353 0.904422
+23 1.35 1.00089 1.03923
+24 1.41 0.990356 1.18474
+25 1.47 0.969236 1.33951
+26 1.53 1.0514 1.5214
+27 1.59 1.05373 1.71826
+28 1.65 1.04585 1.92867
+29 1.71 1.03647 2.15264
+30 1.77 1.00899 2.38623
+31 1.83 0.938155 2.6184
+32 1.89 0.961955 2.87233
+33 1.95 1.0014 3.15371
+34 2.01 1.01419 3.45649
+35 2.07 1.01707 3.77853
+36 2.13 0.951008 4.09736
+37 2.19 1.00628 4.45399
+38 2.25 0.989558 4.82418
+39 2.31 1.01389 5.22397
+40 2.37 0.968364 5.62589
+41 2.43 0.997149 6.06098
+42 2.49 1.01039 6.52389
+43 2.55 1.02204 7.01498
+44 2.61 1.02448 7.53067
+45 2.67 1.01077 8.06312
+46 2.73 0.999213 8.61341
+47 2.79 0.97406 9.17368
+48 2.85 1.00657 9.77782
+49 2.91 0.963778 10.3809
+50 2.97 0.998003 11.0314
+106300 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0.108706 0.000356633
+5 0.27 0.0659362 0.000713267
+6 0.33 0.0883979 0.00142653
+7 0.39 0.221691 0.00392297
+8 0.45 0.571187 0.0124822
+9 0.51 0.611657 0.0242511
+10 0.57 0.771769 0.042796
+11 0.63 0.814142 0.0666904
+12 0.69 0.901681 0.0984308
+13 0.75 1.26066 0.150856
+14 0.81 1.06619 0.202568
+15 0.87 1.20472 0.269971
+16 0.93 1.17149 0.344864
+17 0.99 1.1766 0.4301
+18 1.05 1.05914 0.516405
+19 1.11 0.90468 0.598787
+20 1.17 0.831917 0.682953
+21 1.23 1.02387 0.797432
+22 1.29 0.962754 0.915835
+23 1.35 0.945288 1.04315
+24 1.41 0.902971 1.17582
+25 1.47 0.953603 1.3281
+26 1.53 1.04521 1.50892
+27 1.59 0.992641 1.69437
+28 1.65 1.0494 1.90549
+29 1.71 1.05463 2.13338
+30 1.77 0.988967 2.36234
+31 1.83 0.899246 2.58488
+32 1.89 0.970061 2.84094
+33 1.95 1.0344 3.1316
+34 2.01 1.0775 3.45328
+35 2.07 0.988913 3.76641
+36 2.13 0.947817 4.08417
+37 2.19 0.982131 4.43224
+38 2.25 0.949518 4.78745
+39 2.31 1.04012 5.19757
+40 2.37 0.998438 5.61198
+41 2.43 1.01104 6.05314
+42 2.49 0.975363 6.5
+43 2.55 0.992352 6.97682
+44 2.61 1.00322 7.48181
+45 2.67 1.02093 8.01961
+46 2.73 0.967481 8.55243
+47 2.79 1.01746 9.13766
+48 2.85 1.00419 9.74037
+49 2.91 0.982016 10.3549
+50 2.97 1.01332 11.0153
+106350 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0.0659362 0.000356633
+6 0.33 0.220995 0.0021398
+7 0.39 0.348371 0.00606277
+8 0.45 0.642585 0.0156919
+9 0.51 0.722867 0.0296006
+10 0.57 0.727244 0.0470756
+11 0.63 0.923505 0.0741797
+12 0.69 0.992863 0.10913
+13 0.75 1.04626 0.152639
+14 0.81 1.0956 0.205777
+15 0.87 1.12823 0.268902
+16 0.93 1.20496 0.345934
+17 0.99 1.07322 0.42368
+18 1.05 0.962855 0.50214
+19 1.11 0.849851 0.579529
+20 1.17 0.916519 0.672254
+21 1.23 1.0749 0.792439
+22 1.29 1.02365 0.918331
+23 1.35 1.00619 1.05385
+24 1.41 1.00007 1.20078
+25 1.47 0.962536 1.35449
+26 1.53 1.04109 1.53459
+27 1.59 1.05754 1.73217
+28 1.65 1.01395 1.93616
+29 1.71 0.99026 2.15014
+30 1.77 1.01053 2.38409
+31 1.83 0.938155 2.61626
+32 1.89 0.993029 2.87839
+33 1.95 1.0509 3.17368
+34 2.01 0.986712 3.46826
+35 2.07 1.00018 3.78495
+36 2.13 0.97122 4.11056
+37 2.19 0.990181 4.46148
+38 2.25 1.02292 4.84415
+39 2.31 0.97681 5.22932
+40 2.37 0.95032 5.62375
+41 2.43 1.02412 6.07061
+42 2.49 1.03919 6.54672
+43 2.55 0.967117 7.01141
+44 2.61 1.01243 7.52104
+45 2.67 0.957967 8.02568
+46 2.73 1.00828 8.58096
+47 2.79 0.997621 9.15478
+48 2.85 1.04459 9.78174
+49 2.91 1.0088 10.413
+50 2.97 0.971193 11.046
+106400 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0.176796 0.00142653
+7 0.39 0.316701 0.00499287
+8 0.45 0.452189 0.0117689
+9 0.51 0.630192 0.0238944
+10 0.57 0.682719 0.0402996
+11 0.63 1.02072 0.0702568
+12 0.69 0.982731 0.10485
+13 0.75 1.16633 0.153352
+14 0.81 0.992659 0.201498
+15 0.87 1.24934 0.271398
+16 0.93 1.13802 0.344151
+17 0.99 1.07814 0.422254
+18 1.05 1.0854 0.510699
+19 1.11 0.881182 0.590942
+20 1.17 0.920044 0.684023
+21 1.23 0.99835 0.795649
+22 1.29 0.855459 0.900856
+23 1.35 0.998245 1.03531
+24 1.41 1.02191 1.18545
+25 1.47 0.996035 1.34451
+26 1.53 0.985426 1.51498
+27 1.59 0.99455 1.70078
+28 1.65 1.00863 1.90371
+29 1.71 1.01667 2.1234
+30 1.77 1.05829 2.3684
+31 1.83 1.07938 2.63552
+32 1.89 1.00519 2.90086
+33 1.95 0.964595 3.1719
+34 2.01 1.00463 3.47183
+35 2.07 0.944987 3.77104
+36 2.13 0.986113 4.10164
+37 2.19 1.03144 4.46719
+38 2.25 0.995278 4.83951
+39 2.31 0.992186 5.23074
+40 2.37 0.996719 5.64444
+41 2.43 1.01023 6.08524
+42 2.49 1.01895 6.55207
+43 2.55 1.03021 7.04708
+44 2.61 0.979844 7.5403
+45 2.67 0.997233 8.06562
+46 2.73 0.998565 8.61555
+47 2.79 0.993901 9.18723
+48 2.85 1.00003 9.78745
+49 2.91 0.989426 10.4066
+50 2.97 1.02317 11.0735
+106450 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0.0659362 0.000356633
+6 0.33 0.0883979 0.0010699
+7 0.39 0.411712 0.00570613
+8 0.45 0.333192 0.010699
+9 0.51 0.556052 0.021398
+10 0.57 0.771769 0.0399429
+11 0.63 0.887051 0.0659772
+12 0.69 0.911813 0.0980742
+13 0.75 1.30354 0.152282
+14 0.81 1.0956 0.205421
+15 0.87 1.15373 0.269971
+16 0.93 1.21612 0.347718
+17 0.99 1.08799 0.426534
+18 1.05 1.011 0.508916
+19 1.11 0.873349 0.588445
+20 1.17 0.842492 0.67368
+21 1.23 0.988781 0.784237
+22 1.29 0.872858 0.891583
+23 1.35 1.05915 1.03424
+24 1.41 0.980646 1.17832
+25 1.47 1.00497 1.3388
+26 1.53 1.04933 1.52033
+27 1.59 1.14345 1.73395
+28 1.65 1.0104 1.93723
+29 1.71 0.983658 2.14979
+30 1.77 1.01053 2.38374
+31 1.83 1.01453 2.63481
+32 1.89 1.0241 2.90514
+33 1.95 1.04075 3.19757
+34 2.01 0.935346 3.47682
+35 2.07 0.978776 3.78673
+36 2.13 1.03611 4.13409
+37 2.19 0.983137 4.48252
+38 2.25 0.980025 4.84914
+39 2.31 0.937014 5.21862
+40 2.37 1.00875 5.6373
+41 2.43 1.04782 6.09451
+42 2.49 1.01973 6.5617
+43 2.55 1.01907 7.05136
+44 2.61 0.978427 7.54387
+45 2.67 0.987078 8.06384
+46 2.73 1.00569 8.61769
+47 2.79 0.996381 9.1908
+48 2.85 1.04638 9.81883
+49 2.91 1.00766 10.4494
+50 2.97 0.97557 11.0852
+106500 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0.132597 0.0010699
+7 0.39 0.221691 0.00356633
+8 0.45 0.499788 0.0110556
+9 0.51 0.685797 0.0242511
+10 0.57 0.786611 0.0431526
+11 0.63 1.02072 0.0731098
+12 0.69 1.23601 0.116619
+13 0.75 0.891896 0.153709
+14 0.81 1.00001 0.202211
+15 0.87 1.10911 0.264265
+16 0.93 1.04876 0.331312
+17 0.99 1.20122 0.418331
+18 1.05 1.0285 0.50214
+19 1.11 0.955593 0.589158
+20 1.17 0.912993 0.681526
+21 1.23 0.909041 0.783167
+22 1.29 0.939555 0.898716
+23 1.35 0.990301 1.0321
+24 1.41 0.951518 1.1719
+25 1.47 1.00497 1.33238
+26 1.53 1.03078 1.5107
+27 1.59 1.04418 1.70578
+28 1.65 1.07422 1.9219
+29 1.71 1.07773 2.15478
+30 1.77 1.02132 2.39123
+31 1.83 0.912215 2.61698
+32 1.89 0.934934 2.86377
+33 1.95 1.00013 3.14479
+34 2.01 1.02972 3.45221
+35 2.07 1.00356 3.76997
+36 2.13 0.993559 4.10307
+37 2.19 1.05358 4.47646
+38 2.25 0.946658 4.8306
+39 2.31 1.04736 5.24358
+40 2.37 1.01562 5.66512
+41 2.43 0.979985 6.09272
+42 2.49 0.995602 6.54886
+43 2.55 0.96489 7.01248
+44 2.61 0.979844 7.50571
+45 2.67 1.004 8.03459
+46 2.73 1.04778 8.61163
+47 2.79 0.998241 9.18581
+48 2.85 1.0232 9.79993
+49 2.91 1.00538 10.429
+50 2.97 1.00457 11.0838
+106550 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0.108706 0.000356633
+5 0.27 0.131872 0.0010699
+6 0.33 0.265194 0.0032097
+7 0.39 0.190021 0.0053495
+8 0.45 0.42839 0.0117689
+9 0.51 0.685797 0.0249643
+10 0.57 0.697561 0.0417261
+11 0.63 0.899202 0.068117
+12 0.69 0.942206 0.101284
+13 0.75 1.10629 0.14729
+14 0.81 1.23531 0.207204
+15 0.87 1.12186 0.269971
+16 0.93 1.07665 0.338802
+17 0.99 0.999373 0.411198
+18 1.05 1.04163 0.496077
+19 1.11 0.963426 0.583809
+20 1.17 0.916519 0.676534
+21 1.23 0.924989 0.779957
+22 1.29 0.954054 0.89729
+23 1.35 0.971766 1.02817
+24 1.41 1.03405 1.1801
+25 1.47 1.01613 1.34237
+26 1.53 1.02047 1.5189
+27 1.59 1.10145 1.72468
+28 1.65 1.0299 1.93188
+29 1.71 1.03977 2.15656
+30 1.77 0.93043 2.37197
+31 1.83 0.975624 2.61341
+32 1.89 0.960604 2.86698
+33 1.95 1.01282 3.15157
+34 2.01 1.03449 3.46041
+35 2.07 0.992292 3.77461
+36 2.13 0.972284 4.10057
+37 2.19 0.979112 4.44757
+38 2.25 1.03532 4.83488
+39 2.31 1.04464 5.24679
+40 2.37 0.982112 5.65442
+41 2.43 1.01023 6.09522
+42 2.49 0.990931 6.54922
+43 2.55 1.01759 7.03816
+44 2.61 1.02519 7.55421
+45 2.67 0.973538 8.06705
+46 2.73 0.987556 8.61091
+47 2.79 1.0094 9.19151
+48 2.85 0.997654 9.7903
+49 2.91 1.00652 10.4201
+50 2.97 0.96025 11.046
+106600 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0.131872 0.000713267
+6 0.33 0.176796 0.0021398
+7 0.39 0.221691 0.00463623
+8 0.45 0.452189 0.0114123
+9 0.51 0.759937 0.0260342
+10 0.57 0.816295 0.0456491
+11 0.63 0.996413 0.074893
+12 0.69 0.871288 0.105563
+13 0.75 1.25208 0.157632
+14 0.81 1.05884 0.208987
+15 0.87 1.21747 0.277104
+16 0.93 1.22727 0.355563
+17 0.99 0.984604 0.42689
+18 1.05 0.905959 0.500713
+19 1.11 0.936011 0.585949
+20 1.17 0.856592 0.672611
+21 1.23 1.01749 0.786377
+22 1.29 0.901857 0.89729
+23 1.35 1.0565 1.03959
+24 1.41 0.975792 1.18295
+25 1.47 0.978169 1.33916
+26 1.53 1.0349 1.51819
+27 1.59 1.03273 1.71113
+28 1.65 1.06181 1.92475
+29 1.71 0.955601 2.13124
+30 1.77 1.0398 2.37197
+31 1.83 0.995799 2.6184
+32 1.89 1.02005 2.88766
+33 1.95 0.950634 3.15478
+34 2.01 1.03688 3.46434
+35 2.07 1.00806 3.78352
+36 2.13 0.986113 4.11412
+37 2.19 1.02943 4.47896
+38 2.25 0.964772 4.83987
+39 2.31 0.982237 5.22718
+40 2.37 1.01304 5.64765
+41 2.43 1.02739 6.09593
+42 2.49 0.983147 6.54636
+43 2.55 0.996805 7.02532
+44 2.61 1.04361 7.55064
+45 2.67 0.936302 8.04387
+46 2.73 0.996622 8.59272
+47 2.79 1.00878 9.17297
+48 2.85 1.00657 9.7771
+49 2.91 0.981446 10.3912
+50 2.97 0.993079 11.0385
+106650 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0.131872 0.000713267
+6 0.33 0.132597 0.00178317
+7 0.39 0.190021 0.00392297
+8 0.45 0.404591 0.00998573
+9 0.51 0.667262 0.0228245
+10 0.57 0.623352 0.0378031
+11 0.63 0.899202 0.064194
+12 0.69 1.20562 0.106633
+13 0.75 1.10629 0.152639
+14 0.81 1.13972 0.207917
+15 0.87 1.1601 0.272825
+16 0.93 1.15475 0.346648
+17 0.99 1.02891 0.421184
+18 1.05 1.04163 0.506063
+19 1.11 0.916429 0.589515
+20 1.17 0.877743 0.678317
+21 1.23 0.963264 0.78602
+22 1.29 0.980153 0.906562
+23 1.35 0.974414 1.0378
+24 1.41 0.949091 1.17725
+25 1.47 1.0206 1.34023
+26 1.53 1.00192 1.51355
+27 1.59 1.01746 1.70364
+28 1.65 1.02813 1.91049
+29 1.71 1.01502 2.12981
+30 1.77 0.99975 2.36127
+31 1.83 0.98427 2.60485
+32 1.89 1.04167 2.87981
+33 1.95 0.98871 3.15763
+34 2.01 1.00105 3.45649
+35 2.07 1.02946 3.78245
+36 2.13 0.997814 4.11698
+37 2.19 0.998231 4.47076
+38 2.25 0.977165 4.83631
+39 2.31 1.04555 5.24857
+40 2.37 0.982972 5.65656
+41 2.43 0.998784 6.09237
+42 2.49 0.936442 6.5214
+43 2.55 1.05767 7.0296
+44 2.61 0.973467 7.51961
+45 2.67 1.00942 8.05136
+46 2.73 1.02576 8.61626
+47 2.79 1.01994 9.20292
+48 2.85 1.02261 9.81669
+49 2.91 0.978027 10.4287
+50 2.97 0.980494 11.0678
+106700 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0.0659362 0.000356633
+6 0.33 0.0883979 0.0010699
+7 0.39 0.285031 0.0042796
+8 0.45 0.261794 0.00820257
+9 0.51 0.797007 0.0235378
+10 0.57 0.935028 0.0460057
+11 0.63 0.826294 0.0702568
+12 0.69 0.962469 0.104137
+13 0.75 1.00338 0.145863
+14 0.81 1.19119 0.203638
+15 0.87 1.16647 0.268902
+16 0.93 1.04876 0.335949
+17 0.99 1.02399 0.410128
+18 1.05 1.04163 0.495007
+19 1.11 0.955593 0.582026
+20 1.17 0.99407 0.682596
+21 1.23 0.889903 0.782097
+22 1.29 0.965654 0.900856
+23 1.35 1.04326 1.04137
+24 1.41 1.01463 1.19044
+25 1.47 1.0005 1.35021
+26 1.53 1.01635 1.52603
+27 1.59 0.975461 1.70827
+28 1.65 1.03522 1.91655
+29 1.71 1.01502 2.13588
+30 1.77 1.00745 2.36912
+31 1.83 0.948243 2.60378
+32 1.89 0.995731 2.86662
+33 1.95 1.01917 3.153
+34 2.01 0.96521 3.44116
+35 2.07 0.975397 3.75
+36 2.13 1.05207 4.10271
+37 2.19 1.02741 4.46683
+38 2.25 1.02674 4.85093
+39 2.31 1.01842 5.2525
+40 2.37 0.965787 5.65335
+41 2.43 1.01023 6.09415
+42 2.49 1.01117 6.55742
+43 2.55 0.921841 7.00036
+44 2.61 1.03936 7.52354
+45 2.67 1.01416 8.05777
+46 2.73 1.02058 8.61983
+47 2.79 1.01746 9.20506
+48 2.85 1.02617 9.82097
+49 2.91 0.969478 10.4276
+50 2.97 0.999098 11.0788
+106750 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0.108706 0.000356633
+5 0.27 0 0.000356633
+6 0.33 0.220995 0.0021398
+7 0.39 0.253361 0.00499287
+8 0.45 0.452189 0.0117689
+9 0.51 0.722867 0.0256776
+10 0.57 0.608511 0.0402996
+11 0.63 0.911353 0.0670471
+12 0.69 1.06378 0.104494
+13 0.75 1.07199 0.149073
+14 0.81 1.13237 0.203994
+15 0.87 1.17285 0.269615
+16 0.93 1.17149 0.344508
+17 0.99 1.1126 0.425107
+18 1.05 1.0285 0.508916
+19 1.11 0.924262 0.593081
+20 1.17 0.920044 0.686163
+21 1.23 0.889903 0.785663
+22 1.29 0.951154 0.902639
+23 1.35 1.00884 1.03852
+24 1.41 1.00007 1.18545
+25 1.47 1.00274 1.34558
+26 1.53 1.04315 1.52603
+27 1.59 1.03273 1.71897
+28 1.65 1.07776 1.93581
+29 1.71 1.02822 2.15799
+30 1.77 0.955077 2.3791
+31 1.83 0.958331 2.61626
+32 1.89 1.02951 2.88802
+33 1.95 1.01282 3.17261
+34 2.01 0.987907 3.46755
+35 2.07 1.00581 3.78602
+36 2.13 0.975475 4.11305
+37 2.19 1.00226 4.46826
+38 2.25 0.997185 4.8413
+39 2.31 0.994899 5.23359
+40 2.37 0.992423 5.64551
+41 2.43 0.984889 6.07525
+42 2.49 1.01818 6.54173
+43 2.55 1.04134 7.04208
+44 2.61 1.00181 7.54636
+45 2.67 0.976923 8.06098
+46 2.73 1.01022 8.61733
+47 2.79 0.999481 9.19223
+48 2.85 1.00062 9.7928
+49 2.91 1.01222 10.4262
+50 2.97 0.9794 11.0646
+106800 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0.0659362 0.000356633
+6 0.33 0.0883979 0.0010699
+7 0.39 0.506722 0.00677603
+8 0.45 0.380791 0.0124822
+9 0.51 0.500446 0.0221113
+10 0.57 0.845978 0.0424394
+11 0.63 1.15438 0.0763195
+12 0.69 1.06378 0.113766
+13 0.75 1.00338 0.155492
+14 0.81 1.0809 0.207917
+15 0.87 1.19835 0.274964
+16 0.93 0.992975 0.338445
+17 0.99 1.0683 0.415835
+18 1.05 1.00224 0.497504
+19 1.11 1.04175 0.592368
+20 1.17 0.944719 0.687946
+21 1.23 1.04619 0.804922
+22 1.29 0.948254 0.921541
+23 1.35 1.01413 1.05813
+24 1.41 0.898117 1.19009
+25 1.47 1.034 1.35521
+26 1.53 1.02666 1.53281
+27 1.59 0.996459 1.71897
+28 1.65 0.98913 1.91797
+29 1.71 0.995211 2.13302
+30 1.77 0.985886 2.36127
+31 1.83 1.01309 2.61198
+32 1.89 1.0822 2.89765
+33 1.95 0.998863 3.17832
+34 2.01 0.934151 3.4572
+35 2.07 0.967513 3.76355
+36 2.13 1.0393 4.11198
+37 2.19 0.995212 4.46469
+38 2.25 0.947612 4.81919
+39 2.31 1.02384 5.2229
+40 2.37 1.01476 5.64408
+41 2.43 1.00777 6.08381
+42 2.49 1.02362 6.55278
+43 2.55 1.01388 7.03994
+44 2.61 0.955047 7.52068
+45 2.67 0.979631 8.03673
+46 2.73 1.00051 8.58773
+47 2.79 1.01932 9.17404
+48 2.85 1.00181 9.77532
+49 2.91 1.02875 10.419
+50 2.97 0.99089 11.0649
+106850 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0.108706 0.000356633
+5 0.27 0.197809 0.00142653
+6 0.33 0.486189 0.0053495
+7 0.39 0.316701 0.00891583
+8 0.45 0.523588 0.0167618
+9 0.51 0.537517 0.0271041
+10 0.57 0.608511 0.0417261
+11 0.63 0.850597 0.0666904
+12 0.69 1.1347 0.106633
+13 0.75 1.1406 0.154066
+14 0.81 1.14707 0.2097
+15 0.87 1.03262 0.267475
+16 0.93 1.25516 0.347718
+17 0.99 1.08306 0.426177
+18 1.05 0.975984 0.505706
+19 1.11 0.967342 0.593795
+20 1.17 0.955294 0.690442
+21 1.23 0.991971 0.801355
+22 1.29 0.913456 0.913695
+23 1.35 0.94264 1.04066
+24 1.41 0.99521 1.18688
+25 1.47 1.10323 1.36305
+26 1.53 0.981303 1.53281
+27 1.59 1.00409 1.7204
+28 1.65 0.927088 1.90692
+29 1.71 1.06783 2.13766
+30 1.77 0.96432 2.36091
+31 1.83 1.05344 2.62161
+32 1.89 0.978168 2.87981
+33 1.95 1.06994 3.18046
+34 2.01 1.03211 3.48859
+35 2.07 0.983282 3.79993
+36 2.13 0.992495 4.13267
+37 2.19 0.954961 4.47111
+38 2.25 0.955238 4.82846
+39 2.31 1.02927 5.23431
+40 2.37 1.03023 5.66191
+41 2.43 0.949743 6.07632
+42 2.49 1.03297 6.54957
+43 2.55 0.974539 7.01783
+44 2.61 1.00322 7.52282
+45 2.67 1.05072 8.07632
+46 2.73 0.948702 8.59879
+47 2.79 0.992041 9.1694
+48 2.85 1.03271 9.78923
+49 2.91 1.0145 10.424
+50 2.97 0.993079 11.0713
+106900 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0.131872 0.000713267
+6 0.33 0.176796 0.0021398
+7 0.39 0.411712 0.00677603
+8 0.45 0.333192 0.0117689
+9 0.51 0.741402 0.0260342
+10 0.57 0.608511 0.0406562
+11 0.63 0.887051 0.0666904
+12 0.69 0.9726 0.100927
+13 0.75 1.03769 0.14408
+14 0.81 1.11031 0.197932
+15 0.87 1.14735 0.262126
+16 0.93 1.24401 0.341655
+17 0.99 1.1766 0.42689
+18 1.05 0.892829 0.499643
+19 1.11 0.963426 0.587375
+20 1.17 0.944719 0.682953
+21 1.23 0.940937 0.78816
+22 1.29 0.983053 0.909058
+23 1.35 0.953231 1.03745
+24 1.41 0.953946 1.1776
+25 1.47 1.05187 1.34558
+26 1.53 1.03697 1.52496
+27 1.59 1.02509 1.71648
+28 1.65 1.01217 1.92011
+29 1.71 0.986959 2.13338
+30 1.77 0.933511 2.3495
+31 1.83 1.03327 2.60521
+32 1.89 1.00519 2.87054
+33 1.95 1.01917 3.15692
+34 2.01 1.07033 3.47646
+35 2.07 0.972018 3.78424
+36 2.13 0.972284 4.1102
+37 2.19 0.995212 4.46291
+38 2.25 1.00862 4.84023
+39 2.31 1.01299 5.23966
+40 2.37 0.943446 5.63124
+41 2.43 1.01268 6.07311
+42 2.49 0.955902 6.51106
+43 2.55 1.0161 6.99929
+44 2.61 1.01385 7.50963
+45 2.67 0.967445 8.01926
+46 2.73 1.02058 8.58131
+47 2.79 1.03048 9.17404
+48 2.85 1.02439 9.78887
+49 2.91 1.01906 10.4265
+50 2.97 1.0073 11.0831
+106950 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0.0659362 0.000356633
+6 0.33 0.176796 0.00178317
+7 0.39 0.316701 0.0053495
+8 0.45 0.380791 0.0110556
+9 0.51 0.685797 0.0242511
+10 0.57 0.742086 0.0420827
+11 0.63 1.02072 0.0720399
+12 0.69 0.911813 0.104137
+13 0.75 1.12345 0.150856
+14 0.81 1.05884 0.202211
+15 0.87 1.27484 0.273538
+16 0.93 1.00413 0.337732
+17 0.99 1.01906 0.411555
+18 1.05 1.06352 0.498217
+19 1.11 0.920346 0.582026
+20 1.17 0.969395 0.6801
+21 1.23 0.979212 0.789586
+22 1.29 0.971453 0.909058
+23 1.35 1.06179 1.05207
+24 1.41 1.02434 1.20257
+25 1.47 0.96477 1.35663
+26 1.53 1.02253 1.53352
+27 1.59 1.05945 1.73146
+28 1.65 1.01749 1.93616
+29 1.71 0.924243 2.13588
+30 1.77 0.973562 2.36127
+31 1.83 1.0275 2.61555
+32 1.89 0.976817 2.8734
+33 1.95 0.958249 3.14265
+34 2.01 1.00105 3.44151
+35 2.07 1.04636 3.77282
+36 2.13 1.01164 4.11198
+37 2.19 1.00326 4.46755
+38 2.25 0.976212 4.83274
+39 2.31 0.989473 5.2229
+40 2.37 1.0414 5.65514
+41 2.43 1.03965 6.10877
+42 2.49 1.00183 6.56776
+43 2.55 0.975281 7.03638
+44 2.61 0.988346 7.53388
+45 2.67 1.03244 8.07775
+46 2.73 0.97331 8.61377
+47 2.79 0.981501 9.17832
+48 2.85 1.01013 9.78459
+49 2.91 1.00595 10.4141
+50 2.97 0.975023 11.0496
+107000 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0.108706 0.000356633
+5 0.27 0.0659362 0.000713267
+6 0.33 0.220995 0.00249643
+7 0.39 0.411712 0.00713267
+8 0.45 0.333192 0.0121255
+9 0.51 0.667262 0.0249643
+10 0.57 0.697561 0.0417261
+11 0.63 0.753385 0.0638374
+12 0.69 0.992863 0.0987874
+13 0.75 1.23493 0.150143
+14 0.81 1.19854 0.208274
+15 0.87 1.11548 0.270685
+16 0.93 1.05992 0.338445
+17 0.99 0.925528 0.405492
+18 1.05 1.05914 0.491797
+19 1.11 0.94776 0.578103
+20 1.17 0.944719 0.67368
+21 1.23 0.902661 0.774608
+22 1.29 0.916356 0.887304
+23 1.35 1.04855 1.02853
+24 1.41 0.990356 1.17404
+25 1.47 1.07643 1.34593
+26 1.53 1.05346 1.52817
+27 1.59 0.920102 1.70007
+28 1.65 1.01395 1.90407
+29 1.71 0.953951 2.1102
+30 1.77 0.990507 2.33951
+31 1.83 1.01021 2.58951
+32 1.89 1.06058 2.86947
+33 1.95 0.959518 3.13909
+34 2.01 1.01658 3.44258
+35 2.07 0.961882 3.74715
+36 2.13 1.01803 4.08845
+37 2.19 1.01936 4.44971
+38 2.25 1.02006 4.83131
+39 2.31 0.992186 5.22254
+40 2.37 1.0646 5.66441
+41 2.43 1.00777 6.10414
+42 2.49 0.94734 6.53816
+43 2.55 1.00274 7.01997
+44 2.61 0.960006 7.50321
+45 2.67 0.975569 8.01712
+46 2.73 1.06073 8.60128
+47 2.79 1.0063 9.1801
+48 2.85 1.04994 9.81027
+49 2.91 0.961498 10.4119
+50 2.97 1.01168 11.0713
+107050 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0.108706 0.000356633
+5 0.27 0.0659362 0.000713267
+6 0.33 0.132597 0.00178317
+7 0.39 0.316701 0.0053495
+8 0.45 0.380791 0.0110556
+9 0.51 0.593122 0.0224679
+10 0.57 0.727244 0.0399429
+11 0.63 0.777688 0.0627675
+12 0.69 0.932075 0.0955777
+13 0.75 1.02911 0.138374
+14 0.81 1.30149 0.201498
+15 0.87 1.12823 0.264622
+16 0.93 1.16591 0.339158
+17 0.99 1.08799 0.417974
+18 1.05 1.00662 0.5
+19 1.11 0.967342 0.588088
+20 1.17 0.955294 0.684736
+21 1.23 0.854817 0.780314
+22 1.29 0.939555 0.895863
+23 1.35 1.06444 1.03923
+24 1.41 0.961228 1.18046
+25 1.47 1.06973 1.35128
+26 1.53 0.973057 1.51961
+27 1.59 1.05373 1.71648
+28 1.65 0.990902 1.91583
+29 1.71 1.02162 2.13659
+30 1.77 0.978184 2.36305
+31 1.83 1.02894 2.61769
+32 1.89 0.972763 2.87447
+33 1.95 0.965864 3.14586
+34 2.01 0.987907 3.4408
+35 2.07 1.03735 3.76926
+36 2.13 1.03611 4.11662
+37 2.19 0.988168 4.46683
+38 2.25 0.977165 4.83238
+39 2.31 1.02113 5.23502
+40 2.37 1.01476 5.65621
+41 2.43 1.04047 6.1102
+42 2.49 1.03841 6.58595
+43 2.55 0.986414 7.05991
+44 2.61 0.970633 7.5485
+45 2.67 0.99791 8.07418
+46 2.73 0.968129 8.60735
+47 2.79 0.988941 9.17618
+48 2.85 0.977451 9.76284
+49 2.91 1.02647 10.4051
+50 2.97 1.03795 11.0817
+107100 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0.220995 0.00178317
+7 0.39 0.316701 0.0053495
+8 0.45 0.475989 0.0124822
+9 0.51 0.556052 0.0231812
+10 0.57 0.727244 0.0406562
+11 0.63 0.984262 0.0695435
+12 0.69 0.952338 0.103067
+13 0.75 1.16633 0.151569
+14 0.81 1.16178 0.207917
+15 0.87 1.12823 0.271041
+16 0.93 1.09897 0.341298
+17 0.99 1.01906 0.415121
+18 1.05 1.00662 0.497147
+19 1.11 0.959509 0.584522
+20 1.17 0.828392 0.668331
+21 1.23 1.03025 0.783524
+22 1.29 1.00335 0.906919
+23 1.35 1.00884 1.0428
+24 1.41 0.949091 1.18224
+25 1.47 1.00274 1.34237
+26 1.53 1.09881 1.53245
+27 1.59 1.06327 1.7311
+28 1.65 0.932405 1.91869
+29 1.71 0.960552 2.12625
+30 1.77 0.958158 2.34807
+31 1.83 0.985711 2.59201
+32 1.89 1.00924 2.85842
+33 1.95 0.970941 3.13124
+34 2.01 1.01777 3.43509
+35 2.07 1.03735 3.76355
+36 2.13 0.994623 4.097
+37 2.19 1.0415 4.46612
+38 2.25 1.00386 4.84165
+39 2.31 1.04374 5.25321
+40 2.37 0.952039 5.64836
+41 2.43 0.992245 6.08131
+42 2.49 0.999494 6.53923
+43 2.55 1.04802 7.0428
+44 2.61 0.979135 7.53566
+45 2.67 0.990463 8.05742
+46 2.73 0.997918 8.60699
+47 2.79 1.00506 9.18509
+48 2.85 0.983393 9.77532
+49 2.91 1.00937 10.4069
+50 2.97 1.00238 11.0603
+107150 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0.176796 0.00142653
+7 0.39 0.380042 0.00570613
+8 0.45 0.404591 0.0117689
+9 0.51 0.611657 0.0235378
+10 0.57 0.667877 0.0395863
+11 0.63 0.996413 0.0688302
+12 0.69 1.04352 0.105563
+13 0.75 1.20063 0.155492
+14 0.81 1.2206 0.214693
+15 0.87 1.1601 0.279601
+16 0.93 1.0655 0.347718
+17 0.99 1.07322 0.425464
+18 1.05 0.884076 0.497504
+19 1.11 1.01825 0.590228
+20 1.17 0.860117 0.677247
+21 1.23 1.02706 0.792083
+22 1.29 1.04395 0.920471
+23 1.35 1.02472 1.05849
+24 1.41 0.932099 1.19544
+25 1.47 1.0072 1.35628
+26 1.53 1.01017 1.53103
+27 1.59 1.03082 1.72361
+28 1.65 1.00508 1.92582
+29 1.71 0.985309 2.13873
+30 1.77 1.03364 2.37803
+31 1.83 0.929509 2.60806
+32 1.89 1.02951 2.87981
+33 1.95 1.01536 3.16512
+34 2.01 0.960432 3.45185
+35 2.07 1.00806 3.77104
+36 2.13 1.04249 4.12054
+37 2.19 0.990181 4.47147
+38 2.25 0.963818 4.83203
+39 2.31 0.987664 5.22147
+40 2.37 1.04054 5.65335
+41 2.43 1.03638 6.10556
+42 2.49 1.00261 6.56491
+43 2.55 1.00645 7.0485
+44 2.61 1.01952 7.5617
+45 2.67 1.00536 8.0913
+46 2.73 1.0154 8.6505
+47 2.79 0.9753 9.21148
+48 2.85 1.02023 9.82382
+49 2.91 0.975177 10.434
+50 2.97 1.00238 11.0874
+107200 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0.108706 0.000356633
+5 0.27 0.0659362 0.000713267
+6 0.33 0.132597 0.00178317
+7 0.39 0.443382 0.00677603
+8 0.45 0.380791 0.0124822
+9 0.51 0.518981 0.0224679
+10 0.57 0.786611 0.0413695
+11 0.63 0.874899 0.0670471
+12 0.69 1.08404 0.105207
+13 0.75 1.10629 0.151213
+14 0.81 1.2059 0.2097
+15 0.87 1.11548 0.272111
+16 0.93 1.07665 0.340942
+17 0.99 1.1126 0.421541
+18 1.05 1.03726 0.506063
+19 1.11 0.896847 0.587732
+20 1.17 0.842492 0.672967
+21 1.23 0.982402 0.78281
+22 1.29 0.971453 0.902282
+23 1.35 1.00619 1.0378
+24 1.41 0.944236 1.17653
+25 1.47 0.987102 1.33417
+26 1.53 1.00604 1.5082
+27 1.59 1.05754 1.70578
+28 1.65 1.03699 1.91441
+29 1.71 1.00676 2.13195
+30 1.77 1.00437 2.36448
+31 1.83 1.00156 2.61234
+32 1.89 0.972763 2.86912
+33 1.95 1.00902 3.15264
+34 2.01 1.00583 3.45292
+35 2.07 1.05199 3.78602
+36 2.13 1.02441 4.12946
+37 2.19 0.996218 4.48252
+38 2.25 0.962865 4.84272
+39 2.31 1.00033 5.23716
+40 2.37 0.966646 5.63837
+41 2.43 1.01513 6.08131
+42 2.49 1.02674 6.55171
+43 2.55 0.995321 7.02996
+44 2.61 0.965674 7.51605
+45 2.67 0.993848 8.03959
+46 2.73 1.01605 8.59914
+47 2.79 1.01622 9.18367
+48 2.85 1.03152 9.80278
+49 2.91 0.996265 10.4262
+50 2.97 1.01223 11.0859
+107250 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0.108706 0.000356633
+5 0.27 0.263745 0.00178317
+6 0.33 0.176796 0.0032097
+7 0.39 0.285031 0.0064194
+8 0.45 0.523588 0.0142653
+9 0.51 0.611657 0.0260342
+10 0.57 0.756928 0.0442225
+11 0.63 0.862748 0.0695435
+12 0.69 1.06378 0.10699
+13 0.75 1.01196 0.149073
+14 0.81 1.06619 0.200785
+15 0.87 1.17922 0.266762
+16 0.93 1.07665 0.335592
+17 0.99 1.03383 0.410485
+18 1.05 1.06789 0.497504
+19 1.11 1.04175 0.592368
+20 1.17 1.07162 0.700785
+21 1.23 0.979212 0.810271
+22 1.29 0.904756 0.921541
+23 1.35 0.966471 1.05171
+24 1.41 0.861707 1.17832
+25 1.47 0.975936 1.33417
+26 1.53 0.935949 1.49608
+27 1.59 1.11481 1.70435
+28 1.65 1.04763 1.91512
+29 1.71 1.05793 2.14372
+30 1.77 1.04442 2.38552
+31 1.83 0.990035 2.63053
+32 1.89 0.979519 2.88909
+33 1.95 1.03821 3.18081
+34 2.01 0.981934 3.47397
+35 2.07 0.978776 3.78388
+36 2.13 0.936116 4.09772
+37 2.19 0.972068 4.44223
+38 2.25 0.999092 4.81598
+39 2.31 1.00033 5.21041
+40 2.37 1.02078 5.63409
+41 2.43 1.02494 6.08131
+42 2.49 1.04698 6.56098
+43 2.55 0.986414 7.03495
+44 2.61 0.973467 7.52496
+45 2.67 1.02161 8.06312
+46 2.73 0.986261 8.60628
+47 2.79 1.0218 9.19401
+48 2.85 1.02083 9.8067
+49 2.91 1.0487 10.4629
+50 2.97 0.991985 11.1095
+107300 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0.108706 0.000356633
+5 0.27 0 0.000356633
+6 0.33 0.176796 0.00178317
+7 0.39 0.221691 0.0042796
+8 0.45 0.571187 0.0128388
+9 0.51 0.593122 0.0242511
+10 0.57 0.727244 0.0417261
+11 0.63 0.97211 0.0702568
+12 0.69 1.01313 0.10592
+13 0.75 0.969079 0.14622
+14 0.81 1.17648 0.203281
+15 0.87 1.28121 0.274964
+16 0.93 1.05992 0.342725
+17 0.99 1.16676 0.427247
+18 1.05 0.945348 0.50428
+19 1.11 0.802855 0.577389
+20 1.17 0.962344 0.67475
+21 1.23 0.928178 0.778531
+22 1.29 1.02655 0.904779
+23 1.35 0.939992 1.03138
+24 1.41 0.966082 1.17332
+25 1.47 0.891072 1.31562
+26 1.53 1.09057 1.50428
+27 1.59 1.006 1.69223
+28 1.65 1.10258 1.91405
+29 1.71 0.993561 2.12874
+30 1.77 1.05521 2.37304
+31 1.83 0.955448 2.60949
+32 1.89 0.982221 2.86876
+33 1.95 0.998863 3.14943
+34 2.01 0.995074 3.4465
+35 2.07 0.973145 3.75464
+36 2.13 1.01377 4.09451
+37 2.19 0.996218 4.44757
+38 2.25 1.00386 4.82311
+39 2.31 1.04645 5.23573
+40 2.37 0.986408 5.64515
+41 2.43 1.00124 6.08203
+42 2.49 0.974584 6.52853
+43 2.55 1.03169 7.02425
+44 2.61 0.996848 7.52603
+45 2.67 1.03718 8.0724
+46 2.73 0.964891 8.60378
+47 2.79 0.998241 9.17796
+48 2.85 0.979828 9.76605
+49 2.91 0.996835 10.3898
+50 2.97 1.01004 11.0481
+107350 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0.0883979 0.000713267
+7 0.39 0.348371 0.00463623
+8 0.45 0.285593 0.00891583
+9 0.51 0.722867 0.0228245
+10 0.57 0.742086 0.0406562
+11 0.63 0.899202 0.0670471
+12 0.69 0.942206 0.100214
+13 0.75 1.1406 0.147646
+14 0.81 1.2059 0.206134
+15 0.87 1.09636 0.267475
+16 0.93 1.05434 0.334879
+17 0.99 1.12737 0.416548
+18 1.05 0.905959 0.490371
+19 1.11 0.967342 0.578459
+20 1.17 0.969395 0.676534
+21 1.23 0.985591 0.786733
+22 1.29 1.00915 0.910842
+23 1.35 0.921457 1.03495
+24 1.41 0.924817 1.17083
+25 1.47 1.06303 1.34058
+26 1.53 1.05552 1.52318
+27 1.59 1.03464 1.71648
+28 1.65 1.02458 1.92261
+29 1.71 0.985309 2.13552
+30 1.77 1.03364 2.37482
+31 1.83 0.974183 2.61591
+32 1.89 0.993029 2.87803
+33 1.95 0.997594 3.15835
+34 2.01 1.00821 3.45934
+35 2.07 0.948366 3.75963
+36 2.13 1.01803 4.10093
+37 2.19 1.02641 4.46469
+38 2.25 0.991465 4.83559
+39 2.31 1.00756 5.23288
+40 2.37 1.00016 5.648
+41 2.43 0.970177 6.07133
+42 2.49 1.00961 6.53388
+43 2.55 1.02649 7.0271
+44 2.61 0.970633 7.51569
+45 2.67 1.0128 8.04922
+46 2.73 1.01734 8.60949
+47 2.79 0.95546 9.15906
+48 2.85 1.01073 9.76569
+49 2.91 1.02134 10.4048
+50 2.97 1.01715 11.0678
+107400 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0.131872 0.000713267
+6 0.33 0.265194 0.00285307
+7 0.39 0.221691 0.0053495
+8 0.45 0.618786 0.014622
+9 0.51 0.463376 0.0235378
+10 0.57 0.771769 0.0420827
+11 0.63 0.826294 0.0663338
+12 0.69 1.12457 0.10592
+13 0.75 1.18348 0.155136
+14 0.81 1.05884 0.206491
+15 0.87 1.14735 0.270685
+16 0.93 1.09339 0.340585
+17 0.99 1.06337 0.417618
+18 1.05 1.03288 0.501783
+19 1.11 0.90468 0.584165
+20 1.17 0.983495 0.683666
+21 1.23 0.937747 0.788516
+22 1.29 0.948254 0.905136
+23 1.35 1.04591 1.04601
+24 1.41 0.876271 1.17475
+25 1.47 1.0675 1.34522
+26 1.53 1.03903 1.52496
+27 1.59 0.969734 1.70613
+28 1.65 1.00686 1.9087
+29 1.71 0.965504 2.11733
+30 1.77 0.981265 2.34451
+31 1.83 1.05921 2.60663
+32 1.89 1.0241 2.87696
+33 1.95 0.996325 3.15692
+34 2.01 1.00583 3.4572
+35 2.07 1.04298 3.78745
+36 2.13 0.964837 4.11091
+37 2.19 0.9932 4.46291
+38 2.25 1.04294 4.85307
+39 2.31 1.04645 5.26569
+40 2.37 1.02937 5.69294
+41 2.43 1.00777 6.13267
+42 2.49 0.94734 6.56669
+43 2.55 0.975281 7.03531
+44 2.61 0.970633 7.52389
+45 2.67 0.986401 8.04351
+46 2.73 0.984966 8.58595
+47 2.79 1.01126 9.16762
+48 2.85 1.04341 9.79387
+49 2.91 1.00538 10.423
+50 2.97 1.02919 11.0938
+107450 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0.131872 0.000713267
+6 0.33 0.132597 0.00178317
+7 0.39 0.348371 0.00570613
+8 0.45 0.380791 0.0114123
+9 0.51 0.593122 0.0228245
+10 0.57 1.12797 0.0499287
+11 0.63 0.935656 0.0773894
+12 0.69 0.962469 0.11127
+13 0.75 1.06341 0.155492
+14 0.81 0.882363 0.198288
+15 0.87 1.21747 0.266405
+16 0.93 1.20496 0.343438
+17 0.99 0.959989 0.412981
+18 1.05 1.13792 0.505706
+19 1.11 0.975175 0.594508
+20 1.17 0.898893 0.685449
+21 1.23 0.924989 0.788873
+22 1.29 0.971453 0.908345
+23 1.35 0.992949 1.04208
+24 1.41 0.941809 1.18046
+25 1.47 0.96477 1.33452
+26 1.53 1.0081 1.50892
+27 1.59 1.09381 1.71327
+28 1.65 1.06535 1.9276
+29 1.71 1.06123 2.15692
+30 1.77 1.01669 2.3923
+31 1.83 0.974183 2.63338
+32 1.89 0.963306 2.88766
+33 1.95 1.0179 3.17368
+34 2.01 1.04047 3.48431
+35 2.07 0.960755 3.78852
+36 2.13 1.0159 4.1291
+37 2.19 0.987162 4.47896
+38 2.25 0.955238 4.83631
+39 2.31 1.01661 5.23716
+40 2.37 1.00016 5.65228
+41 2.43 1.03556 6.10414
+42 2.49 0.936442 6.53317
+43 2.55 1.02204 7.02425
+44 2.61 0.952921 7.50392
+45 2.67 1.00671 8.03424
+46 2.73 0.997918 8.58381
+47 2.79 0.988941 9.15264
+48 2.85 1.03687 9.77496
+49 2.91 1.04186 10.4269
+50 2.97 0.986513 11.0699
+107500 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0.108706 0.000356633
+5 0.27 0 0.000356633
+6 0.33 0.132597 0.00142653
+7 0.39 0.221691 0.00392297
+8 0.45 0.452189 0.010699
+9 0.51 0.500446 0.0203281
+10 0.57 0.697561 0.0370899
+11 0.63 1.03287 0.0674037
+12 0.69 1.03339 0.10378
+13 0.75 1.12345 0.150499
+14 0.81 1.22796 0.210057
+15 0.87 1.28121 0.28174
+16 0.93 1.10455 0.352354
+17 0.99 0.925528 0.419401
+18 1.05 0.923465 0.49465
+19 1.11 0.877266 0.574536
+20 1.17 1.00465 0.676177
+21 1.23 1.04619 0.793153
+22 1.29 0.904756 0.904422
+23 1.35 1.00089 1.03923
+24 1.41 1.05589 1.19437
+25 1.47 1.034 1.35949
+26 1.53 1.0081 1.53388
+27 1.59 0.981188 1.71719
+28 1.65 0.980267 1.91441
+29 1.71 0.995211 2.12946
+30 1.77 1.01053 2.36341
+31 1.83 1.00156 2.61127
+32 1.89 0.948444 2.86163
+33 1.95 1.06486 3.16084
+34 2.01 1.01658 3.46434
+35 2.07 1.06325 3.801
+36 2.13 0.998878 4.13588
+37 2.19 1.00528 4.49215
+38 2.25 0.953332 4.84879
+39 2.31 1.00756 5.24608
+40 2.37 0.982972 5.65407
+41 2.43 1.00532 6.09272
+42 2.49 1.0065 6.55385
+43 2.55 0.976765 7.02318
+44 2.61 0.977718 7.51534
+45 2.67 1.02567 8.05563
+46 2.73 0.998565 8.60556
+47 2.79 1.028 9.19686
+48 2.85 1.02261 9.81063
+49 2.91 1.00025 10.4365
+50 2.97 0.986513 11.0795
+107550 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0.0659362 0.000356633
+6 0.33 0.176796 0.00178317
+7 0.39 0.348371 0.00570613
+8 0.45 0.475989 0.0128388
+9 0.51 0.463376 0.0217546
+10 0.57 0.593669 0.03602
+11 0.63 0.935656 0.0634807
+12 0.69 1.08404 0.101641
+13 0.75 1.1406 0.149073
+14 0.81 1.06619 0.200785
+15 0.87 1.22384 0.269258
+16 0.93 1.15475 0.343081
+17 0.99 1.0683 0.420471
+18 1.05 0.984738 0.500713
+19 1.11 0.943844 0.586662
+20 1.17 0.948244 0.682596
+21 1.23 0.940937 0.787803
+22 1.29 0.948254 0.904422
+23 1.35 0.950583 1.03245
+24 1.41 1.03405 1.18438
+25 1.47 1.05187 1.35235
+26 1.53 0.987488 1.52318
+27 1.59 1.04991 1.71933
+28 1.65 0.973176 1.91512
+29 1.71 0.973756 2.12553
+30 1.77 0.968941 2.34986
+31 1.83 0.979947 2.59237
+32 1.89 0.976817 2.85021
+33 1.95 1.03186 3.14016
+34 2.01 1.06436 3.45792
+35 2.07 0.984408 3.76961
+36 2.13 1.06483 4.1266
+37 2.19 1.01232 4.48538
+38 2.25 1.04676 4.87696
+39 2.31 0.974097 5.26106
+40 2.37 1.00703 5.67903
+41 2.43 0.964456 6.09986
+42 2.49 0.982369 6.54993
+43 2.55 0.962663 7.01248
+44 2.61 0.998265 7.51498
+45 2.67 0.99114 8.03709
+46 2.73 1.06721 8.62482
+47 2.79 1.06396 9.2368
+48 2.85 0.995277 9.83417
+49 2.91 0.997405 10.4583
+50 2.97 0.994173 11.1063
+107600 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0.21169 0.000356633
+4 0.21 0 0.000356633
+5 0.27 0.131872 0.0010699
+6 0.33 0.220995 0.00285307
+7 0.39 0.285031 0.00606277
+8 0.45 0.523588 0.0139087
+9 0.51 0.556052 0.0246077
+10 0.57 0.86082 0.0452924
+11 0.63 0.753385 0.0674037
+12 0.69 1.07391 0.105207
+13 0.75 1.15775 0.153352
+14 0.81 1.2059 0.21184
+15 0.87 1.1346 0.275321
+16 0.93 1.14359 0.348431
+17 0.99 1.03383 0.423324
+18 1.05 1.04601 0.508559
+19 1.11 0.889015 0.589515
+20 1.17 0.983495 0.689016
+21 1.23 0.905851 0.7903
+22 1.29 0.948254 0.906919
+23 1.35 0.977062 1.03852
+24 1.41 1.00977 1.18688
+25 1.47 1.01837 1.3495
+26 1.53 1.01017 1.52425
+27 1.59 1.01555 1.71398
+28 1.65 1.03167 1.92154
+29 1.71 0.962203 2.12946
+30 1.77 1.03056 2.36805
+31 1.83 1.00733 2.61733
+32 1.89 1.00519 2.88267
+33 1.95 1.00648 3.16548
+34 2.01 0.975961 3.45685
+35 2.07 0.992292 3.77104
+36 2.13 1.05207 4.12375
+37 2.19 0.969049 4.46719
+38 2.25 1.0153 4.847
+39 2.31 0.999422 5.24108
+40 2.37 0.981253 5.64836
+41 2.43 0.982437 6.07703
+42 2.49 1.02285 6.54565
+43 2.55 1.00349 7.02782
+44 2.61 0.966382 7.51427
+45 2.67 1.00874 8.04565
+46 2.73 1.03807 8.61733
+47 2.79 1.00196 9.19365
+48 2.85 1.00894 9.79922
+49 2.91 0.975177 10.4094
+50 2.97 0.990343 11.0549
+107650 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0.108706 0.000356633
+5 0.27 0.0659362 0.000713267
+6 0.33 0.265194 0.00285307
+7 0.39 0.221691 0.0053495
+8 0.45 0.452189 0.0121255
+9 0.51 0.537517 0.0224679
+10 0.57 0.890503 0.0438659
+11 0.63 0.947808 0.0716833
+12 0.69 0.901681 0.103424
+13 0.75 1.08914 0.148716
+14 0.81 1.11766 0.202924
+15 0.87 1.03262 0.260699
+16 0.93 1.18822 0.336662
+17 0.99 1.18645 0.422611
+18 1.05 0.940972 0.499287
+19 1.11 1.01434 0.591655
+20 1.17 1.00817 0.693652
+21 1.23 0.944126 0.799215
+22 1.29 0.864158 0.905492
+23 1.35 1.04591 1.04636
+24 1.41 1.00249 1.19365
+25 1.47 0.982636 1.35057
+26 1.53 1.07614 1.53673
+27 1.59 1.06136 1.73502
+28 1.65 0.980267 1.93224
+29 1.71 0.91434 2.12981
+30 1.77 1.04904 2.37268
+31 1.83 1.04047 2.63017
+32 1.89 1.00114 2.89444
+33 1.95 1.02298 3.18188
+34 2.01 0.967599 3.47076
+35 2.07 1.0013 3.7878
+36 2.13 0.994623 4.12126
+37 2.19 0.970055 4.46505
+38 2.25 1.03055 4.85057
+39 2.31 1.02475 5.25464
+40 2.37 1.03539 5.68438
+41 2.43 1.00532 6.12304
+42 2.49 1.00183 6.58203
+43 2.55 1.01462 7.06954
+44 2.61 0.994014 7.5699
+45 2.67 0.965414 8.07846
+46 2.73 0.964244 8.60949
+47 2.79 1.02056 9.1965
+48 2.85 1.00597 9.80029
+49 2.91 0.988286 10.4187
+50 2.97 0.988702 11.0631
+107700 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0.131872 0.000713267
+6 0.33 0.220995 0.00249643
+7 0.39 0.221691 0.00499287
+8 0.45 0.499788 0.0124822
+9 0.51 0.778472 0.0274608
+10 0.57 0.638194 0.042796
+11 0.63 0.935656 0.0702568
+12 0.69 0.921944 0.10271
+13 0.75 1.10629 0.148716
+14 0.81 1.00736 0.197575
+15 0.87 1.1601 0.262482
+16 0.93 1.08223 0.331669
+17 0.99 1.24552 0.421897
+18 1.05 1.03726 0.506419
+19 1.11 0.877266 0.586305
+20 1.17 0.969395 0.684379
+21 1.23 0.972833 0.793153
+22 1.29 0.974353 0.912981
+23 1.35 1.04591 1.05385
+24 1.41 0.934527 1.19116
+25 1.47 0.982636 1.34807
+26 1.53 0.960688 1.51427
+27 1.59 1.04609 1.7097
+28 1.65 1.08662 1.92832
+29 1.71 0.998512 2.14408
+30 1.77 1.0398 2.38481
+31 1.83 0.987153 2.6291
+32 1.89 0.961955 2.88302
+33 1.95 0.977287 3.15763
+34 2.01 0.956848 3.4433
+35 2.07 1.0182 3.76569
+36 2.13 0.956327 4.08631
+37 2.19 0.978105 4.43295
+38 2.25 1.00767 4.80991
+39 2.31 1.02746 5.21505
+40 2.37 0.986408 5.62447
+41 2.43 0.985706 6.05456
+42 2.49 1.00728 6.51605
+43 2.55 1.02204 7.00713
+44 2.61 0.983386 7.50214
+45 2.67 1.02634 8.0428
+46 2.73 1.01734 8.60307
+47 2.79 0.95732 9.15371
+48 2.85 0.997654 9.7525
+49 2.91 1.02248 10.3923
+50 2.97 0.984325 11.0339
+107750 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0.21169 0.000356633
+4 0.21 0 0.000356633
+5 0.27 0.131872 0.0010699
+6 0.33 0.132597 0.0021398
+7 0.39 0.348371 0.00606277
+8 0.45 0.452189 0.0128388
+9 0.51 0.556052 0.0235378
+10 0.57 0.816295 0.0431526
+11 0.63 0.97211 0.0716833
+12 0.69 1.08404 0.109843
+13 0.75 0.969079 0.150143
+14 0.81 1.29413 0.21291
+15 0.87 1.14735 0.277104
+16 0.93 1.17707 0.352354
+17 0.99 0.891066 0.416904
+18 1.05 1.12041 0.508203
+19 1.11 0.939927 0.593795
+20 1.17 0.905943 0.685449
+21 1.23 0.864386 0.782097
+22 1.29 1.01785 0.907275
+23 1.35 0.97971 1.03923
+24 1.41 1.07289 1.19686
+25 1.47 0.942437 1.34736
+26 1.53 0.987488 1.51819
+27 1.59 1.00791 1.70649
+28 1.65 1.01572 1.91084
+29 1.71 0.978707 2.12233
+30 1.77 1.00283 2.35449
+31 1.83 0.988594 2.59914
+32 1.89 1.02545 2.86983
+33 1.95 1.06486 3.16904
+34 2.01 0.997463 3.46683
+35 2.07 1.00468 3.78495
+36 2.13 0.985049 4.11519
+37 2.19 0.986156 4.46469
+38 2.25 0.981932 4.83203
+39 2.31 1.01932 5.23395
+40 2.37 1.01476 5.65514
+41 2.43 1.01922 6.09986
+42 2.49 0.989374 6.55314
+43 2.55 1.00571 7.03638
+44 2.61 0.958589 7.5189
+45 2.67 1.0365 8.06491
+46 2.73 0.975252 8.602
+47 2.79 0.980261 9.16583
+48 2.85 1.00181 9.76712
+49 2.91 1.07663 10.4408
+50 2.97 1.00129 11.0934
+107800 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0.0659362 0.000356633
+6 0.33 0.220995 0.0021398
+7 0.39 0.285031 0.0053495
+8 0.45 0.475989 0.0124822
+9 0.51 0.574587 0.0235378
+10 0.57 0.831136 0.0435093
+11 0.63 1.03287 0.0738231
+12 0.69 1.05365 0.110913
+13 0.75 1.13202 0.157989
+14 0.81 0.985306 0.205777
+15 0.87 1.09636 0.267118
+16 0.93 1.04876 0.334165
+17 0.99 1.10768 0.414408
+18 1.05 1.04601 0.499643
+19 1.11 0.920346 0.583452
+20 1.17 0.951769 0.679743
+21 1.23 1.04619 0.796719
+22 1.29 0.994652 0.919044
+23 1.35 1.01943 1.05635
+24 1.41 0.975792 1.19971
+25 1.47 1.0608 1.36912
+26 1.53 0.987488 1.53994
+27 1.59 0.950645 1.71755
+28 1.65 0.969631 1.91262
+29 1.71 1.05298 2.14016
+30 1.77 1.02902 2.37839
+31 1.83 0.987153 2.62268
+32 1.89 1.00114 2.88695
+33 1.95 0.995056 3.16655
+34 2.01 1.03211 3.47468
+35 2.07 1.04861 3.8067
+36 2.13 0.948881 4.12482
+37 2.19 0.970055 4.46862
+38 2.25 1.00958 4.84629
+39 2.31 1.00123 5.24108
+40 2.37 0.958913 5.63909
+41 2.43 0.986524 6.06954
+42 2.49 0.984704 6.52068
+43 2.55 1.03392 7.01748
+44 2.61 1.0096 7.52568
+45 2.67 1.0101 8.05777
+46 2.73 0.995975 8.60628
+47 2.79 1.00134 9.18224
+48 2.85 1.03271 9.80207
+49 2.91 0.967768 10.4076
+50 2.97 1.00347 11.0617
+107850 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0.108706 0.000356633
+5 0.27 0.0659362 0.000713267
+6 0.33 0.220995 0.00249643
+7 0.39 0.126681 0.00392297
+8 0.45 0.452189 0.010699
+9 0.51 0.648727 0.0231812
+10 0.57 0.667877 0.0392297
+11 0.63 0.984262 0.068117
+12 0.69 0.982731 0.10271
+13 0.75 1.13202 0.149786
+14 0.81 1.12501 0.204351
+15 0.87 1.20472 0.271755
+16 0.93 1.09339 0.341655
+17 0.99 1.02399 0.415835
+18 1.05 1.04601 0.50107
+19 1.11 0.979091 0.590228
+20 1.17 0.97997 0.689372
+21 1.23 0.972833 0.798146
+22 1.29 0.968553 0.917261
+23 1.35 0.879091 1.03566
+24 1.41 1.00977 1.18402
+25 1.47 1.06303 1.35378
+26 1.53 1.01841 1.52996
+27 1.59 0.973552 1.71184
+28 1.65 1.04054 1.92118
+29 1.71 0.98861 2.13481
+30 1.77 0.975103 2.36056
+31 1.83 1.09379 2.63124
+32 1.89 0.997082 2.89444
+33 1.95 0.962056 3.16476
+34 2.01 0.967599 3.45364
+35 2.07 1.0869 3.79779
+36 2.13 0.999942 4.13302
+37 2.19 1.02641 4.49679
+38 2.25 0.933312 4.84593
+39 2.31 1.00575 5.24251
+40 2.37 0.970942 5.64551
+41 2.43 1.03883 6.09879
+42 2.49 1.00572 6.55956
+43 2.55 0.987157 7.03388
+44 2.61 1.01314 7.54387
+45 2.67 0.955936 8.04743
+46 2.73 1.01022 8.60378
+47 2.79 1.02118 9.19116
+48 2.85 0.982204 9.78067
+49 2.91 0.987716 10.3987
+50 2.97 0.986513 11.0417
+107900 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0.21169 0.000356633
+4 0.21 0 0.000356633
+5 0.27 0.0659362 0.000713267
+6 0.33 0.220995 0.00249643
+7 0.39 0.158351 0.0042796
+8 0.45 0.618786 0.0135521
+9 0.51 0.574587 0.0246077
+10 0.57 0.756928 0.042796
+11 0.63 0.911353 0.0695435
+12 0.69 0.9726 0.10378
+13 0.75 1.04626 0.14729
+14 0.81 1.18384 0.204708
+15 0.87 1.10273 0.266405
+16 0.93 1.21612 0.344151
+17 0.99 1.05845 0.420827
+18 1.05 1.05039 0.506419
+19 1.11 1.03 0.600214
+20 1.17 0.909468 0.692225
+21 1.23 0.972833 0.800999
+22 1.29 0.945354 0.917261
+23 1.35 0.961175 1.04672
+24 1.41 0.980646 1.1908
+25 1.47 0.993802 1.3495
+26 1.53 1.04109 1.5296
+27 1.59 1.06518 1.7286
+28 1.65 1.02104 1.93402
+29 1.71 0.996862 2.14943
+30 1.77 1.01053 2.38338
+31 1.83 0.965536 2.62233
+32 1.89 1.00924 2.88873
+33 1.95 1.03059 3.17832
+34 2.01 0.944902 3.46041
+35 2.07 0.993419 3.77496
+36 2.13 0.97973 4.10342
+37 2.19 1.0254 4.46683
+38 2.25 0.958098 4.82525
+39 2.31 0.975001 5.2097
+40 2.37 1.0182 5.63231
+41 2.43 1.02249 6.07846
+42 2.49 1.0283 6.54957
+43 2.55 1.05321 7.05563
+44 2.61 0.983386 7.55064
+45 2.67 0.976246 8.06491
+46 2.73 0.972662 8.60057
+47 2.79 1.02614 9.1908
+48 2.85 0.969132 9.77247
+49 2.91 0.975747 10.383
+50 2.97 0.980494 11.0221
+107950 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0.197809 0.0010699
+6 0.33 0.0883979 0.00178317
+7 0.39 0.380042 0.00606277
+8 0.45 0.42839 0.0124822
+9 0.51 0.500446 0.0221113
+10 0.57 0.771769 0.0406562
+11 0.63 0.959959 0.0688302
+12 0.69 1.08404 0.10699
+13 0.75 1.10629 0.152996
+14 0.81 1.30149 0.21612
+15 0.87 1.12186 0.278887
+16 0.93 1.1157 0.350214
+17 0.99 0.925528 0.417261
+18 1.05 0.932218 0.493224
+19 1.11 0.99084 0.583452
+20 1.17 1.0399 0.688659
+21 1.23 0.991971 0.799572
+22 1.29 0.933755 0.914408
+23 1.35 0.916161 1.0378
+24 1.41 1.04376 1.19116
+25 1.47 1.02507 1.35485
+26 1.53 1.05346 1.53709
+27 1.59 1.00791 1.72539
+28 1.65 1.06535 1.93973
+29 1.71 1.01007 2.15799
+30 1.77 1.02286 2.39479
+31 1.83 0.985711 2.63873
+32 1.89 0.963306 2.89301
+33 1.95 1.0014 3.17439
+34 2.01 0.972377 3.46469
+35 2.07 1.03284 3.79173
+36 2.13 1.01483 4.13195
+37 2.19 1.02641 4.49572
+38 2.25 0.926638 4.84237
+39 2.31 0.96053 5.22111
+40 2.37 1.01734 5.64337
+41 2.43 1.01758 6.08738
+42 2.49 1.0065 6.5485
+43 2.55 1.01239 7.03495
+44 2.61 1.03086 7.55385
+45 2.67 1.02838 8.09558
+46 2.73 0.987556 8.63944
+47 2.79 1.03792 9.23645
+48 2.85 1.0036 9.8388
+49 2.91 1.01336 10.4729
+50 2.97 0.976664 11.1095
+108000 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0.108706 0.000356633
+5 0.27 0.0659362 0.000713267
+6 0.33 0.176796 0.0021398
+7 0.39 0.285031 0.0053495
+8 0.45 0.475989 0.0124822
+9 0.51 0.389236 0.0199715
+10 0.57 0.890503 0.0413695
+11 0.63 0.838445 0.0659772
+12 0.69 1.08404 0.104137
+13 0.75 1.1749 0.152996
+14 0.81 1.01472 0.202211
+15 0.87 1.05174 0.261056
+16 0.93 1.07665 0.329886
+17 0.99 1.16676 0.414408
+18 1.05 0.927842 0.490014
+19 1.11 0.986924 0.579886
+20 1.17 0.944719 0.675464
+21 1.23 1.06533 0.794579
+22 1.29 0.954054 0.911912
+23 1.35 1.05385 1.05385
+24 1.41 0.895689 1.18545
+25 1.47 1.01167 1.347
+26 1.53 1.03284 1.52568
+27 1.59 1.00219 1.71291
+28 1.65 0.946587 1.90335
+29 1.71 0.983658 2.11591
+30 1.77 1.01361 2.35057
+31 1.83 1.04191 2.60842
+32 1.89 1.0133 2.87589
+33 1.95 1.02171 3.16298
+34 2.01 1.03688 3.47254
+35 2.07 1.01144 3.7928
+36 2.13 0.966965 4.11698
+37 2.19 0.963011 4.45827
+38 2.25 0.984792 4.82668
+39 2.31 0.997613 5.22004
+40 2.37 1.02937 5.64729
+41 2.43 0.993062 6.0806
+42 2.49 1.02985 6.55243
+43 2.55 1.01685 7.04101
+44 2.61 1.00747 7.54815
+45 2.67 0.989109 8.06919
+46 2.73 0.976547 8.60699
+47 2.79 1.00816 9.18688
+48 2.85 0.965567 9.76641
+49 2.91 1.00652 10.3962
+50 2.97 1.00129 11.0489
+108050 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0.131872 0.000713267
+6 0.33 0.353592 0.00356633
+7 0.39 0.285031 0.00677603
+8 0.45 0.475989 0.0139087
+9 0.51 0.518981 0.0238944
+10 0.57 0.742086 0.0417261
+11 0.63 0.996413 0.07097
+12 0.69 0.901681 0.10271
+13 0.75 1.23493 0.154066
+14 0.81 1.02942 0.203994
+15 0.87 1.15373 0.268545
+16 0.93 1.21054 0.345934
+17 0.99 1.01906 0.419757
+18 1.05 1.06352 0.506419
+19 1.11 1.03784 0.600927
+20 1.17 0.920044 0.694009
+21 1.23 0.99835 0.805635
+22 1.29 0.965654 0.924394
+23 1.35 0.969118 1.05492
+24 1.41 1.02191 1.20506
+25 1.47 0.978169 1.36127
+26 1.53 0.921518 1.52068
+27 1.59 1.05754 1.71826
+28 1.65 1.08662 1.93688
+29 1.71 1.00016 2.153
+30 1.77 0.911944 2.36412
+31 1.83 1.02174 2.61698
+32 1.89 0.995731 2.87981
+33 1.95 0.95698 3.14872
+34 2.01 0.997463 3.4465
+35 2.07 1.02158 3.76997
+36 2.13 1.03185 4.11591
+37 2.19 0.995212 4.46862
+38 2.25 1.03722 4.85663
+39 2.31 1.00123 5.25143
+40 2.37 1.00961 5.67047
+41 2.43 0.993062 6.10378
+42 2.49 0.97692 6.55136
+43 2.55 0.987157 7.02568
+44 2.61 1.02023 7.53923
+45 2.67 0.993848 8.06277
+46 2.73 0.997918 8.61234
+47 2.79 1.02428 9.2015
+48 2.85 1.04935 9.83131
+49 2.91 1.00709 10.4615
+50 2.97 0.982136 11.1016
+108100 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0.0659362 0.000356633
+6 0.33 0.132597 0.00142653
+7 0.39 0.380042 0.00570613
+8 0.45 0.404591 0.0117689
+9 0.51 0.537517 0.0221113
+10 0.57 1.00924 0.0463623
+11 0.63 1.06932 0.0777461
+12 0.69 1.01313 0.113409
+13 0.75 1.18348 0.162625
+14 0.81 1.02207 0.212197
+15 0.87 1.19835 0.279244
+16 0.93 0.959504 0.340585
+17 0.99 1.07814 0.418688
+18 1.05 1.00224 0.500357
+19 1.11 1.01042 0.592368
+20 1.17 0.958819 0.689372
+21 1.23 0.953695 0.796006
+22 1.29 0.971453 0.915478
+23 1.35 0.998245 1.04993
+24 1.41 1.05832 1.20542
+25 1.47 1.02283 1.36876
+26 1.53 0.973057 1.53709
+27 1.59 0.986915 1.72147
+28 1.65 1.03167 1.92903
+29 1.71 0.98861 2.14265
+30 1.77 1.03826 2.38302
+31 1.83 1.0203 2.63552
+32 1.89 0.987625 2.89622
+33 1.95 0.98871 3.17404
+34 2.01 0.960432 3.46077
+35 2.07 1.03735 3.78923
+36 2.13 0.989304 4.1209
+37 2.19 0.985149 4.47004
+38 2.25 0.973352 4.83417
+39 2.31 1.02836 5.23966
+40 2.37 0.953757 5.63552
+41 2.43 1.02739 6.08381
+42 2.49 0.997159 6.54066
+43 2.55 1.02427 7.03281
+44 2.61 0.983386 7.52782
+45 2.67 1.04462 8.0781
+46 2.73 0.989499 8.62304
+47 2.79 0.97778 9.18545
+48 2.85 0.958437 9.7607
+49 2.91 0.997975 10.3852
+50 2.97 1.01223 11.0449
+108150 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0.217411 0.000713267
+5 0.27 0.0659362 0.0010699
+6 0.33 0.176796 0.00249643
+7 0.39 0.253361 0.0053495
+8 0.45 0.452189 0.0121255
+9 0.51 0.759937 0.0267475
+10 0.57 0.890503 0.0481455
+11 0.63 1.02072 0.0781027
+12 0.69 0.901681 0.109843
+13 0.75 0.986231 0.150856
+14 0.81 1.2206 0.210057
+15 0.87 1.22384 0.278531
+16 0.93 1.09897 0.348787
+17 0.99 1.12737 0.430456
+18 1.05 0.954101 0.508203
+19 1.11 0.979091 0.597361
+20 1.17 0.905943 0.689016
+21 1.23 0.91861 0.791726
+22 1.29 1.01205 0.916191
+23 1.35 0.998245 1.05064
+24 1.41 1.04861 1.20471
+25 1.47 0.962536 1.35842
+26 1.53 0.954503 1.52354
+27 1.59 1.05373 1.7204
+28 1.65 0.982039 1.91797
+29 1.71 1.01667 2.13766
+30 1.77 0.998209 2.36876
+31 1.83 1.003 2.61698
+32 1.89 1.05248 2.89479
+33 1.95 1.01917 3.18117
+34 2.01 1.03927 3.49144
+35 2.07 0.975397 3.80029
+36 2.13 0.974411 4.12696
+37 2.19 1.01131 4.48538
+38 2.25 0.974305 4.84986
+39 2.31 1.02475 5.25392
+40 2.37 1.00961 5.67297
+41 2.43 1.00369 6.11091
+42 2.49 0.982369 6.56098
+43 2.55 1.01165 7.04708
+44 2.61 0.965674 7.53317
+45 2.67 1.01551 8.06812
+46 2.73 0.984318 8.6102
+47 2.79 0.998861 9.18474
+48 2.85 1.00657 9.78887
+49 2.91 1.01678 10.4251
+50 2.97 0.99855 11.076
+108200 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0.131872 0.000713267
+6 0.33 0.132597 0.00178317
+7 0.39 0.253361 0.00463623
+8 0.45 0.356992 0.00998573
+9 0.51 0.500446 0.0196148
+10 0.57 0.875662 0.0406562
+11 0.63 0.984262 0.0695435
+12 0.69 1.08404 0.107703
+13 0.75 1.10629 0.153709
+14 0.81 1.12501 0.208274
+15 0.87 1.10911 0.270328
+16 0.93 1.25516 0.350571
+17 0.99 1.10276 0.430456
+18 1.05 1.07665 0.518188
+19 1.11 1.00651 0.609843
+20 1.17 0.958819 0.706847
+21 1.23 0.960075 0.814194
+22 1.29 0.898957 0.92475
+23 1.35 1.04326 1.06526
+24 1.41 0.992783 1.21113
+25 1.47 1.0139 1.37304
+26 1.53 0.946257 1.53673
+27 1.59 0.962099 1.71648
+28 1.65 1.05294 1.92832
+29 1.71 1.13385 2.17332
+30 1.77 0.992048 2.403
+31 1.83 0.90501 2.62696
+32 1.89 0.999785 2.89087
+33 1.95 0.995056 3.17047
+34 2.01 1.03091 3.47825
+35 2.07 0.972018 3.78602
+36 2.13 1.02547 4.12981
+37 2.19 0.971061 4.47397
+38 2.25 0.994325 4.84593
+39 2.31 1.0754 5.26997
+40 2.37 0.972661 5.67368
+41 2.43 1.03802 6.1266
+42 2.49 0.955902 6.56455
+43 2.55 0.973054 7.0321
+44 2.61 0.988346 7.5296
+45 2.67 1.0013 8.05706
+46 2.73 0.974605 8.59379
+47 2.79 0.985841 9.16084
+48 2.85 1.02202 9.77425
+49 2.91 1.0088 10.4055
+50 2.97 1.05162 11.0909
+108250 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0.21169 0.000356633
+4 0.21 0 0.000356633
+5 0.27 0.0659362 0.000713267
+6 0.33 0.353592 0.00356633
+7 0.39 0.285031 0.00677603
+8 0.45 0.404591 0.0128388
+9 0.51 0.574587 0.0238944
+10 0.57 0.712403 0.0410128
+11 0.63 0.923505 0.068117
+12 0.69 1.07391 0.10592
+13 0.75 1.11487 0.152282
+14 0.81 1.18384 0.2097
+15 0.87 1.03262 0.267475
+16 0.93 1.07665 0.336305
+17 0.99 1.08306 0.414765
+18 1.05 1.03288 0.49893
+19 1.11 0.963426 0.586662
+20 1.17 0.958819 0.683666
+21 1.23 0.991971 0.794579
+22 1.29 0.936655 0.909772
+23 1.35 0.982358 1.04208
+24 1.41 1.04376 1.19544
+25 1.47 0.991569 1.35378
+26 1.53 1.09881 1.54387
+27 1.59 0.956372 1.72254
+28 1.65 0.98913 1.92154
+29 1.71 1.00841 2.13944
+30 1.77 0.979724 2.36626
+31 1.83 1.05056 2.62625
+32 1.89 0.952497 2.87767
+33 1.95 1.03186 3.16762
+34 2.01 1.02016 3.47218
+35 2.07 0.985534 3.78424
+36 2.13 0.946753 4.10164
+37 2.19 1.02138 4.46362
+38 2.25 1.02388 4.84665
+39 2.31 1.00394 5.24251
+40 2.37 1.02765 5.66904
+41 2.43 0.989793 6.10093
+42 2.49 1.00416 6.56098
+43 2.55 1.00423 7.04351
+44 2.61 0.967799 7.53067
+45 2.67 1.00739 8.06134
+46 2.73 0.945464 8.58203
+47 2.79 1.03606 9.17796
+48 2.85 1.0339 9.7985
+49 2.91 1.00709 10.4287
+50 2.97 1.02646 11.0977
+108300 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0.21169 0.000356633
+4 0.21 0 0.000356633
+5 0.27 0.197809 0.00142653
+6 0.33 0.353592 0.0042796
+7 0.39 0.316701 0.00784593
+8 0.45 0.475989 0.0149786
+9 0.51 0.574587 0.0260342
+10 0.57 0.578827 0.0399429
+11 0.63 0.826294 0.064194
+12 0.69 1.28667 0.109486
+13 0.75 1.08914 0.154779
+14 0.81 1.00736 0.203638
+15 0.87 1.17922 0.269615
+16 0.93 1.04318 0.336305
+17 0.99 1.02399 0.410485
+18 1.05 1.05039 0.496077
+19 1.11 0.896847 0.577746
+20 1.17 0.98702 0.677603
+21 1.23 1.043 0.794223
+22 1.29 0.84096 0.897646
+23 1.35 0.963823 1.02746
+24 1.41 1.0122 1.17618
+25 1.47 0.987102 1.33381
+26 1.53 1.0514 1.51569
+27 1.59 0.99455 1.7015
+28 1.65 0.985584 1.89979
+29 1.71 0.955601 2.10628
+30 1.77 1.03056 2.34486
+31 1.83 1.01309 2.59558
+32 1.89 1.00654 2.86127
+33 1.95 0.978556 3.13623
+34 2.01 1.02135 3.44116
+35 2.07 1.02158 3.76462
+36 2.13 0.997814 4.09914
+37 2.19 0.983137 4.44757
+38 2.25 1.0029 4.82275
+39 2.31 1.00304 5.21826
+40 2.37 0.989845 5.6291
+41 2.43 1.00859 6.06919
+42 2.49 1.00806 6.53103
+43 2.55 0.993837 7.00856
+44 2.61 0.984803 7.50428
+45 2.67 1.04598 8.05528
+46 2.73 1.01929 8.61662
+47 2.79 0.96414 9.17118
+48 2.85 1.0232 9.78531
+49 2.91 1.01393 10.4198
+50 2.97 0.984872 11.0617
+108350 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0.108706 0.000356633
+5 0.27 0.131872 0.0010699
+6 0.33 0.309393 0.00356633
+7 0.39 0.348371 0.0074893
+8 0.45 0.42839 0.0139087
+9 0.51 0.481911 0.0231812
+10 0.57 0.742086 0.0410128
+11 0.63 0.801991 0.0645506
+12 0.69 1.01313 0.100214
+13 0.75 1.15775 0.148359
+14 0.81 1.11031 0.202211
+15 0.87 1.22384 0.270685
+16 0.93 1.1157 0.342011
+17 0.99 0.999373 0.414408
+18 1.05 1.0285 0.498217
+19 1.11 0.916429 0.581669
+20 1.17 0.958819 0.678673
+21 1.23 0.988781 0.78923
+22 1.29 1.05555 0.919044
+23 1.35 1.02472 1.05706
+24 1.41 0.888407 1.18759
+25 1.47 1.01613 1.34986
+26 1.53 1.05346 1.5321
+27 1.59 0.931556 1.70613
+28 1.65 1.01217 1.90977
+29 1.71 0.985309 2.12268
+30 1.77 1.01669 2.35806
+31 1.83 0.991476 2.60342
+32 1.89 1.04167 2.87839
+33 1.95 0.991248 3.15692
+34 2.01 0.969988 3.4465
+35 2.07 1.00018 3.7632
+36 2.13 1.04675 4.11412
+37 2.19 1.00528 4.4704
+38 2.25 0.960958 4.82989
+39 2.31 1.0148 5.23003
+40 2.37 1.02422 5.65514
+41 2.43 1.00696 6.09451
+42 2.49 0.969914 6.53887
+43 2.55 1.01165 7.02496
+44 2.61 1.00606 7.53138
+45 2.67 0.974892 8.04494
+46 2.73 1.00763 8.59986
+47 2.79 1.03296 9.19401
+48 2.85 1.00775 9.79886
+49 2.91 0.984296 10.4148
+50 2.97 0.958608 11.0396
+108400 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0.108706 0.000356633
+5 0.27 0 0.000356633
+6 0.33 0.309393 0.00285307
+7 0.39 0.316701 0.0064194
+8 0.45 0.499788 0.0139087
+9 0.51 0.611657 0.0256776
+10 0.57 0.563985 0.0392297
+11 0.63 0.984262 0.068117
+12 0.69 1.15496 0.108773
+13 0.75 1.02911 0.151569
+14 0.81 1.16913 0.208274
+15 0.87 1.08998 0.269258
+16 0.93 1.09339 0.339158
+17 0.99 0.999373 0.411555
+18 1.05 1.00662 0.493581
+19 1.11 0.857684 0.571683
+20 1.17 1.00817 0.67368
+21 1.23 0.963264 0.781384
+22 1.29 0.997552 0.904066
+23 1.35 0.961175 1.03352
+24 1.41 0.990356 1.17903
+25 1.47 1.0675 1.3495
+26 1.53 1.02253 1.52639
+27 1.59 1.03082 1.71897
+28 1.65 0.918224 1.90371
+29 1.71 1.00181 2.12019
+30 1.77 1.04288 2.36163
+31 1.83 0.972742 2.60235
+32 1.89 0.944391 2.85164
+33 1.95 1.00902 3.13516
+34 2.01 1.04047 3.44579
+35 2.07 1.00468 3.76391
+36 2.13 0.998878 4.09879
+37 2.19 1.06666 4.47682
+38 2.25 0.962865 4.83702
+39 2.31 1.0148 5.23716
+40 2.37 1.00016 5.65228
+41 2.43 0.962821 6.0724
+42 2.49 0.983925 6.52318
+43 2.55 0.980477 6.99429
+44 2.61 1.05707 7.52639
+45 2.67 1.0365 8.0724
+46 2.73 1.00763 8.62732
+47 2.79 0.95918 9.17903
+48 2.85 0.985175 9.77033
+49 2.91 0.992275 10.3912
+50 2.97 1.01496 11.0528
+108450 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0.0659362 0.000356633
+6 0.33 0.176796 0.00178317
+7 0.39 0.221691 0.0042796
+8 0.45 0.499788 0.0117689
+9 0.51 0.759937 0.0263909
+10 0.57 0.682719 0.042796
+11 0.63 0.753385 0.0649073
+12 0.69 1.08404 0.103067
+13 0.75 1.20063 0.152996
+14 0.81 1.30884 0.216476
+15 0.87 1.14735 0.28067
+16 0.93 1.13802 0.353424
+17 0.99 1.02891 0.42796
+18 1.05 0.945348 0.504993
+19 1.11 0.916429 0.588445
+20 1.17 0.983495 0.687946
+21 1.23 1.00473 0.800285
+22 1.29 1.02075 0.92582
+23 1.35 0.987654 1.05884
+24 1.41 1.03162 1.21041
+25 1.47 0.973703 1.36591
+26 1.53 1.02666 1.54351
+27 1.59 0.933465 1.7179
+28 1.65 0.983812 1.91583
+29 1.71 1.00511 2.13302
+30 1.77 1.01669 2.3684
+31 1.83 1.03759 2.62518
+32 1.89 0.930881 2.8709
+33 1.95 0.974748 3.14479
+34 2.01 1.02016 3.44936
+35 2.07 0.995671 3.76462
+36 2.13 0.987177 4.09558
+37 2.19 0.999237 4.44971
+38 2.25 1.0153 4.82953
+39 2.31 1.00666 5.22646
+40 2.37 0.972661 5.63017
+41 2.43 0.970177 6.0535
+42 2.49 1.03686 6.52853
+43 2.55 0.976023 6.9975
+44 2.61 1.0259 7.51391
+45 2.67 1.0128 8.04743
+46 2.73 0.97331 8.58345
+47 2.79 0.989561 9.15264
+48 2.85 0.979828 9.74073
+49 2.91 0.999115 10.3659
+50 2.97 1.04725 11.0485
+108500 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0.131872 0.000713267
+6 0.33 0.397791 0.00392297
+7 0.39 0.443382 0.00891583
+8 0.45 0.452189 0.0156919
+9 0.51 0.537517 0.0260342
+10 0.57 0.727244 0.0435093
+11 0.63 0.874899 0.0691869
+12 0.69 0.921944 0.101641
+13 0.75 1.06341 0.145863
+14 0.81 1.2206 0.205064
+15 0.87 1.21109 0.272825
+16 0.93 1.16591 0.347361
+17 0.99 1.03383 0.422254
+18 1.05 1.01537 0.504993
+19 1.11 0.892931 0.586305
+20 1.17 0.902418 0.677603
+21 1.23 1.01111 0.790656
+22 1.29 0.869958 0.897646
+23 1.35 1.00354 1.03281
+24 1.41 1.0122 1.18153
+25 1.47 1.0675 1.352
+26 1.53 0.973057 1.52033
+27 1.59 0.985006 1.70435
+28 1.65 0.976721 1.90086
+29 1.71 0.968804 2.1102
+30 1.77 1.05058 2.35342
+31 1.83 1.00445 2.602
+32 1.89 1.0214 2.87161
+33 1.95 0.989979 3.14979
+34 2.01 1.00224 3.449
+35 2.07 1.0182 3.7714
+36 2.13 0.977603 4.09914
+37 2.19 0.987162 4.449
+38 2.25 0.998138 4.8224
+39 2.31 0.990377 5.21291
+40 2.37 0.970942 5.61591
+41 2.43 1.02984 6.06526
+42 2.49 0.956681 6.50357
+43 2.55 1.03392 7.00036
+44 2.61 1.01739 7.51248
+45 2.67 0.995202 8.03673
+46 2.73 0.968129 8.5699
+47 2.79 1.0001 9.14515
+48 2.85 1.0232 9.75927
+49 2.91 0.94212 10.3488
+50 2.97 1.00183 11.0018
+108550 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0.21169 0.000356633
+4 0.21 0 0.000356633
+5 0.27 0.197809 0.00142653
+6 0.33 0.220995 0.0032097
+7 0.39 0.158351 0.00499287
+8 0.45 0.404591 0.0110556
+9 0.51 0.759937 0.0256776
+10 0.57 0.638194 0.0410128
+11 0.63 0.874899 0.0666904
+12 0.69 0.952338 0.100214
+13 0.75 1.14917 0.148003
+14 0.81 1.25001 0.208631
+15 0.87 1.05174 0.267475
+16 0.93 1.07665 0.336305
+17 0.99 1.09291 0.415478
+18 1.05 0.945348 0.492511
+19 1.11 1.03392 0.586662
+20 1.17 1.04342 0.692225
+21 1.23 1.00792 0.804922
+22 1.29 0.994652 0.927247
+23 1.35 0.934696 1.05314
+24 1.41 0.939382 1.19116
+25 1.47 1.02283 1.35449
+26 1.53 0.966872 1.52175
+27 1.59 0.985006 1.70578
+28 1.65 1.0884 1.92475
+29 1.71 0.993561 2.13944
+30 1.77 1.0244 2.3766
+31 1.83 1.0203 2.6291
+32 1.89 1.03897 2.90335
+33 1.95 0.997594 3.18367
+34 2.01 1.02016 3.48823
+35 2.07 0.961882 3.7928
+36 2.13 1.00952 4.13124
+37 2.19 0.981124 4.47896
+38 2.25 1.01434 4.85842
+39 2.31 1.00575 5.25499
+40 2.37 0.978675 5.6612
+41 2.43 0.997149 6.09629
+42 2.49 0.995602 6.55243
+43 2.55 1.01239 7.03887
+44 2.61 0.972759 7.52853
+45 2.67 0.991817 8.051
+46 2.73 1.00957 8.60699
+47 2.79 0.985841 9.17404
+48 2.85 0.995871 9.77175
+49 2.91 0.997975 10.3962
+50 2.97 0.991985 11.0428
+108600 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0.131872 0.000713267
+6 0.33 0.309393 0.0032097
+7 0.39 0.253361 0.00606277
+8 0.45 0.571187 0.014622
+9 0.51 0.593122 0.0260342
+10 0.57 0.964712 0.0492154
+11 0.63 0.862748 0.0745364
+12 0.69 1.09418 0.113053
+13 0.75 1.1406 0.160485
+14 0.81 1.07354 0.212553
+15 0.87 1.06449 0.272111
+16 0.93 1.07665 0.340942
+17 0.99 1.0683 0.418331
+18 1.05 1.05039 0.503923
+19 1.11 0.857684 0.582026
+20 1.17 1.05752 0.689016
+21 1.23 0.937747 0.793866
+22 1.29 0.954054 0.911198
+23 1.35 0.971766 1.04208
+24 1.41 1.00735 1.19009
+25 1.47 0.929037 1.33845
+26 1.53 1.02253 1.51534
+27 1.59 1.01555 1.70506
+28 1.65 1.03699 1.91369
+29 1.71 1.09094 2.14943
+30 1.77 1.05521 2.39372
+31 1.83 0.920862 2.62161
+32 1.89 1.04842 2.89836
+33 1.95 0.996325 3.17832
+34 2.01 0.972377 3.46862
+35 2.07 0.950618 3.76961
+36 2.13 0.998878 4.10449
+37 2.19 1.02943 4.46933
+38 2.25 1.03532 4.85663
+39 2.31 1.02927 5.26248
+40 2.37 0.997579 5.67653
+41 2.43 0.973446 6.10128
+42 2.49 1.00961 6.56384
+43 2.55 0.946334 7.01854
+44 2.61 1.02519 7.53459
+45 2.67 1.03108 8.07775
+46 2.73 0.999213 8.62803
+47 2.79 1.0032 9.20506
+48 2.85 1.02023 9.8174
+49 2.91 1.01849 10.4547
+50 2.97 0.974476 11.0899
+108650 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0.131872 0.000713267
+6 0.33 0.220995 0.00249643
+7 0.39 0.285031 0.00570613
+8 0.45 0.547387 0.0139087
+9 0.51 0.537517 0.0242511
+10 0.57 0.801453 0.0435093
+11 0.63 0.899202 0.0699001
+12 0.69 1.16509 0.110913
+13 0.75 0.900472 0.148359
+14 0.81 1.12501 0.202924
+15 0.87 1.22384 0.271398
+16 0.93 1.15475 0.345221
+17 0.99 1.05845 0.421897
+18 1.05 1.05914 0.508203
+19 1.11 1.03392 0.602354
+20 1.17 0.909468 0.694365
+21 1.23 0.899472 0.794936
+22 1.29 1.08455 0.928317
+23 1.35 1.01148 1.06455
+24 1.41 0.866561 1.19187
+25 1.47 1.04963 1.35949
+26 1.53 1.06789 1.54422
+27 1.59 1.00028 1.7311
+28 1.65 0.992675 1.93081
+29 1.71 1.00181 2.14729
+30 1.77 1.03518 2.38695
+31 1.83 1.00877 2.63659
+32 1.89 0.951146 2.88766
+33 1.95 1.03186 3.1776
+34 2.01 0.974767 3.46862
+35 2.07 1.05199 3.80171
+36 2.13 0.969093 4.1266
+37 2.19 0.971061 4.47076
+38 2.25 0.980025 4.83738
+39 2.31 1.00213 5.23252
+40 2.37 1.00531 5.64979
+41 2.43 1.02249 6.09593
+42 2.49 0.980033 6.54494
+43 2.55 1.02427 7.03709
+44 2.61 0.979135 7.52996
+45 2.67 1.04665 8.08131
+46 2.73 0.990794 8.62696
+47 2.79 0.990801 9.19686
+48 2.85 0.959625 9.77282
+49 2.91 1.02191 10.4123
+50 2.97 1.00074 11.0646
+108700 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0.197809 0.0010699
+6 0.33 0.265194 0.0032097
+7 0.39 0.190021 0.0053495
+8 0.45 0.499788 0.0128388
+9 0.51 0.556052 0.0235378
+10 0.57 0.935028 0.0460057
+11 0.63 0.911353 0.0727532
+12 0.69 0.932075 0.105563
+13 0.75 1.00338 0.14729
+14 0.81 1.19854 0.205421
+15 0.87 1.26846 0.276391
+16 0.93 1.14359 0.349501
+17 0.99 1.0486 0.425464
+18 1.05 1.03288 0.509629
+19 1.11 0.983008 0.599144
+20 1.17 0.905943 0.690799
+21 1.23 0.960075 0.798146
+22 1.29 0.901857 0.909058
+23 1.35 0.969118 1.03959
+24 1.41 1.02191 1.18973
+25 1.47 1.0206 1.35271
+26 1.53 1.06377 1.53673
+27 1.59 0.990732 1.72183
+28 1.65 1.03167 1.92939
+29 1.71 1.05133 2.15656
+30 1.77 0.996669 2.3873
+31 1.83 1.02318 2.64051
+32 1.89 0.986274 2.90086
+33 1.95 0.934134 3.16334
+34 2.01 0.980739 3.45613
+35 2.07 1.04861 3.78816
+36 2.13 0.991432 4.12054
+37 2.19 1.00024 4.47504
+38 2.25 0.999092 4.84879
+39 2.31 1.01118 5.2475
+40 2.37 1.00703 5.66548
+41 2.43 0.935031 6.07347
+42 2.49 1.01273 6.53745
+43 2.55 1.04357 7.03887
+44 2.61 0.998265 7.54137
+45 2.67 0.993848 8.06491
+46 2.73 1.03871 8.63695
+47 2.79 1.02986 9.22932
+48 2.85 0.960813 9.80599
+49 2.91 0.960928 10.4073
+50 2.97 0.991437 11.0535
+108750 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0.0659362 0.000356633
+6 0.33 0.0883979 0.0010699
+7 0.39 0.285031 0.0042796
+8 0.45 0.547387 0.0124822
+9 0.51 0.778472 0.0274608
+10 0.57 0.623352 0.0424394
+11 0.63 0.887051 0.0684736
+12 0.69 0.982731 0.103067
+13 0.75 1.13202 0.150143
+14 0.81 1.19119 0.207917
+15 0.87 1.17922 0.273894
+16 0.93 1.09339 0.343795
+17 0.99 1.07814 0.421897
+18 1.05 1.01537 0.504636
+19 1.11 1.01042 0.596648
+20 1.17 0.856592 0.68331
+21 1.23 1.00792 0.796006
+22 1.29 0.954054 0.913338
+23 1.35 0.947936 1.04101
+24 1.41 1.00492 1.18866
+25 1.47 1.00274 1.34879
+26 1.53 1.09881 1.53887
+27 1.59 0.933465 1.71327
+28 1.65 0.974949 1.90942
+29 1.71 1.02987 2.13195
+30 1.77 1.02748 2.36983
+31 1.83 1.04191 2.62767
+32 1.89 0.98087 2.88659
+33 1.95 1.00775 3.16976
+34 2.01 1.00941 3.47111
+35 2.07 1.00693 3.78994
+36 2.13 0.978666 4.11805
+37 2.19 0.990181 4.46897
+38 2.25 1.02483 4.85235
+39 2.31 0.98495 5.24073
+40 2.37 0.983831 5.64907
+41 2.43 0.989793 6.08096
+42 2.49 1.04386 6.5592
+43 2.55 1.02501 7.05171
+44 2.61 1.01881 7.56455
+45 2.67 0.99791 8.09023
+46 2.73 0.955825 8.61662
+47 2.79 1.02552 9.20649
+48 2.85 1.03449 9.82739
+49 2.91 0.979737 10.4404
+50 2.97 0.998003 11.0909
+108800 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0.131872 0.000713267
+6 0.33 0 0.000713267
+7 0.39 0.126681 0.0021398
+8 0.45 0.404591 0.00820257
+9 0.51 0.797007 0.0235378
+10 0.57 0.875662 0.0445792
+11 0.63 0.838445 0.0691869
+12 0.69 0.942206 0.102354
+13 0.75 0.986231 0.143367
+14 0.81 1.05884 0.194722
+15 0.87 1.11548 0.257133
+16 0.93 1.17707 0.332382
+17 0.99 1.0683 0.409772
+18 1.05 1.10728 0.5
+19 1.11 0.916429 0.583452
+20 1.17 0.96587 0.68117
+21 1.23 0.889903 0.78067
+22 1.29 0.930855 0.89515
+23 1.35 1.04326 1.03566
+24 1.41 1.02191 1.18581
+25 1.47 1.0005 1.34558
+26 1.53 0.902964 1.50178
+27 1.59 1.069 1.7015
+28 1.65 1.02636 1.90799
+29 1.71 1.00676 2.12553
+30 1.77 1.00437 2.35806
+31 1.83 0.964095 2.59665
+32 1.89 0.982221 2.85592
+33 1.95 1.03821 3.14765
+34 2.01 1.01897 3.45185
+35 2.07 0.973145 3.75999
+36 2.13 1.06058 4.11555
+37 2.19 0.97408 4.46077
+38 2.25 1.01911 4.84201
+39 2.31 1.00756 5.2393
+40 2.37 0.983831 5.64765
+41 2.43 0.988976 6.07917
+42 2.49 1.01351 6.54351
+43 2.55 1.02353 7.03531
+44 2.61 0.951504 7.51427
+45 2.67 0.989786 8.03566
+46 2.73 1.02576 8.60057
+47 2.79 0.97344 9.16049
+48 2.85 1.0137 9.7689
+49 2.91 1.04015 10.4198
+50 2.97 0.970099 11.0521
+108850 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0.131872 0.000713267
+6 0.33 0.220995 0.00249643
+7 0.39 0.190021 0.00463623
+8 0.45 0.642585 0.0142653
+9 0.51 0.815542 0.0299572
+10 0.57 0.742086 0.0477889
+11 0.63 0.801991 0.0713267
+12 0.69 0.840894 0.100927
+13 0.75 1.05484 0.144793
+14 0.81 1.08825 0.197575
+15 0.87 1.08361 0.258203
+16 0.93 1.17149 0.333096
+17 0.99 1.09291 0.412268
+18 1.05 1.01537 0.495007
+19 1.11 0.979091 0.584165
+20 1.17 0.923569 0.677603
+21 1.23 1.02706 0.792439
+22 1.29 1.06715 0.92368
+23 1.35 0.966471 1.05385
+24 1.41 0.990356 1.19936
+25 1.47 1.00497 1.35984
+26 1.53 0.917395 1.51854
+27 1.59 1.00409 1.70613
+28 1.65 1.04585 1.91655
+29 1.71 1.03152 2.13944
+30 1.77 1.00129 2.37126
+31 1.83 1.04336 2.62946
+32 1.89 0.995731 2.8923
+33 1.95 0.98744 3.16976
+34 2.01 0.944902 3.45185
+35 2.07 1.00693 3.77068
+36 2.13 1.01271 4.1102
+37 2.19 1.03144 4.47575
+38 2.25 0.985745 4.84451
+39 2.31 1.02475 5.24857
+40 2.37 0.98469 5.65728
+41 2.43 1.02085 6.10271
+42 2.49 1.00961 6.56526
+43 2.55 0.963405 7.02817
+44 2.61 0.998973 7.53103
+45 2.67 0.994525 8.05492
+46 2.73 0.990147 8.60021
+47 2.79 1.03172 9.19365
+48 2.85 1.03865 9.81705
+49 2.91 0.982016 10.4315
+50 2.97 0.985419 11.0738
+108900 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0.0659362 0.000356633
+6 0.33 0.220995 0.0021398
+7 0.39 0.253361 0.00499287
+8 0.45 0.594986 0.0139087
+9 0.51 0.481911 0.0231812
+10 0.57 0.94987 0.0460057
+11 0.63 0.923505 0.0731098
+12 0.69 0.932075 0.10592
+13 0.75 1.13202 0.152996
+14 0.81 1.02942 0.202924
+15 0.87 1.14735 0.267118
+16 0.93 1.14359 0.340228
+17 0.99 1.15199 0.42368
+18 1.05 1.05476 0.509629
+19 1.11 0.943844 0.595578
+20 1.17 0.912993 0.687946
+21 1.23 1.0143 0.801355
+22 1.29 0.898957 0.911912
+23 1.35 0.908218 1.03424
+24 1.41 0.946664 1.17332
+25 1.47 1.0675 1.34379
+26 1.53 1.02253 1.52068
+27 1.59 1.04036 1.71505
+28 1.65 1.05472 1.92725
+29 1.71 0.985309 2.14016
+30 1.77 0.981265 2.36733
+31 1.83 1.003 2.61555
+32 1.89 1.02545 2.88623
+33 1.95 0.998863 3.1669
+34 2.01 0.983128 3.46041
+35 2.07 0.97765 3.76997
+36 2.13 0.983985 4.09986
+37 2.19 0.999237 4.45399
+38 2.25 1.05057 4.847
+39 2.31 1.01932 5.24893
+40 2.37 0.987268 5.6587
+41 2.43 1.03148 6.10877
+42 2.49 0.967579 6.55207
+43 2.55 0.992352 7.02889
+44 2.61 0.984803 7.52461
+45 2.67 0.987755 8.04494
+46 2.73 1.00698 8.5995
+47 2.79 1.00754 9.17903
+48 2.85 1.01489 9.78816
+49 2.91 1.00652 10.418
+50 2.97 1.01168 11.0774
+108950 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0.131872 0.000713267
+6 0.33 0.176796 0.0021398
+7 0.39 0.316701 0.00570613
+8 0.45 0.523588 0.0135521
+9 0.51 0.630192 0.0256776
+10 0.57 0.727244 0.0431526
+11 0.63 0.984262 0.0720399
+12 0.69 0.820631 0.100927
+13 0.75 1.26924 0.153709
+14 0.81 1.12501 0.208274
+15 0.87 1.07086 0.268188
+16 0.93 1.14359 0.341298
+17 0.99 1.05845 0.417974
+18 1.05 1.09415 0.507133
+19 1.11 0.912513 0.590228
+20 1.17 0.990545 0.690442
+21 1.23 0.902661 0.791369
+22 1.29 0.904756 0.902639
+23 1.35 0.998245 1.03709
+24 1.41 1.06803 1.19401
+25 1.47 0.95137 1.34593
+26 1.53 1.01429 1.5214
+27 1.59 0.973552 1.70328
+28 1.65 1.06181 1.9169
+29 1.71 1.05793 2.14551
+30 1.77 0.975103 2.37126
+31 1.83 0.992917 2.61698
+32 1.89 0.983572 2.8766
+33 1.95 0.964595 3.14765
+34 2.01 1.02972 3.45506
+35 2.07 0.969766 3.76213
+36 2.13 1.01696 4.10307
+37 2.19 0.976093 4.449
+38 2.25 1.0296 4.83417
+39 2.31 0.946963 5.20756
+40 2.37 1.02937 5.63481
+41 2.43 0.988976 6.06633
+42 2.49 1.01351 6.53067
+43 2.55 0.99161 7.00713
+44 2.61 1.00039 7.5107
+45 2.67 0.983693 8.02889
+46 2.73 1.01281 8.58666
+47 2.79 1.0063 9.16548
+48 2.85 0.96319 9.74358
+49 2.91 0.983726 10.3591
+50 2.97 1.0188 11.0232
+109000 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0.197809 0.0010699
+6 0.33 0.309393 0.00356633
+7 0.39 0.253361 0.0064194
+8 0.45 0.380791 0.0121255
+9 0.51 0.574587 0.0231812
+10 0.57 0.905345 0.0449358
+11 0.63 1.02072 0.074893
+12 0.69 0.921944 0.107347
+13 0.75 1.15775 0.155492
+14 0.81 1.13237 0.210414
+15 0.87 1.17285 0.276034
+16 0.93 1.09897 0.346291
+17 0.99 1.13722 0.428673
+18 1.05 1.01975 0.511769
+19 1.11 0.912513 0.594864
+20 1.17 0.976445 0.693652
+21 1.23 0.909041 0.795292
+22 1.29 0.930855 0.909772
+23 1.35 0.982358 1.04208
+24 1.41 0.973364 1.18509
+25 1.47 1.02953 1.3495
+26 1.53 0.983365 1.51961
+27 1.59 1.03846 1.71362
+28 1.65 0.971403 1.90906
+29 1.71 1.01007 2.12732
+30 1.77 0.975103 2.35307
+31 1.83 1.01021 2.60307
+32 1.89 0.951146 2.85414
+33 1.95 0.936672 3.11733
+34 2.01 1.0118 3.4194
+35 2.07 1.02158 3.74287
+36 2.13 1.00632 4.08024
+37 2.19 1.03949 4.44864
+38 2.25 0.977165 4.81419
+39 2.31 1.02113 5.21683
+40 2.37 0.959772 5.61519
+41 2.43 0.998784 6.051
+42 2.49 0.983147 6.50143
+43 2.55 1.03911 7.00071
+44 2.61 1.06061 7.53459
+45 2.67 1.00942 8.06633
+46 2.73 0.965539 8.59807
+47 2.79 0.949879 9.14444
+48 2.85 1.0131 9.7525
+49 2.91 1.0145 10.3873
+50 2.97 1.01825 11.051
+109050 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0.131872 0.000713267
+6 0.33 0.265194 0.00285307
+7 0.39 0.190021 0.00499287
+8 0.45 0.475989 0.0121255
+9 0.51 0.630192 0.0242511
+10 0.57 0.994395 0.0481455
+11 0.63 0.911353 0.074893
+12 0.69 0.871288 0.105563
+13 0.75 1.26924 0.158345
+14 0.81 1.16178 0.214693
+15 0.87 1.19197 0.281384
+16 0.93 1.04876 0.348431
+17 0.99 1.03383 0.423324
+18 1.05 1.02413 0.506776
+19 1.11 0.955593 0.593795
+20 1.17 0.98702 0.693652
+21 1.23 0.979212 0.803138
+22 1.29 0.913456 0.915478
+23 1.35 1.03796 1.05528
+24 1.41 0.936954 1.19294
+25 1.47 0.911171 1.33845
+26 1.53 0.925641 1.49857
+27 1.59 1.01173 1.68759
+28 1.65 1.03345 1.89551
+29 1.71 1.11899 2.1373
+30 1.77 0.93043 2.35271
+31 1.83 1.0203 2.60521
+32 1.89 0.988976 2.86626
+33 1.95 0.970941 3.13909
+34 2.01 0.964015 3.42689
+35 2.07 1.04072 3.75642
+36 2.13 0.992495 4.08916
+37 2.19 1.01031 4.44722
+38 2.25 1.08394 4.85271
+39 2.31 0.983141 5.24037
+40 2.37 0.982972 5.64836
+41 2.43 1.02902 6.09736
+42 2.49 0.969135 6.54137
+43 2.55 0.992352 7.01819
+44 2.61 0.983386 7.5132
+45 2.67 0.976923 8.02782
+46 2.73 1.00116 8.57917
+47 2.79 0.994521 9.15121
+48 2.85 0.992306 9.74679
+49 2.91 1.0145 10.3816
+50 2.97 0.988155 11.0257
+109100 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0.108706 0.000356633
+5 0.27 0.131872 0.0010699
+6 0.33 0.220995 0.00285307
+7 0.39 0.190021 0.00499287
+8 0.45 0.452189 0.0117689
+9 0.51 0.741402 0.0260342
+10 0.57 0.653036 0.0417261
+11 0.63 1.09362 0.0738231
+12 0.69 0.881419 0.10485
+13 0.75 1.1406 0.152282
+14 0.81 1.11031 0.206134
+15 0.87 1.26846 0.277104
+16 0.93 1.00971 0.341655
+17 0.99 1.00922 0.414765
+18 1.05 1.00224 0.496434
+19 1.11 1.07308 0.594151
+20 1.17 0.863642 0.681526
+21 1.23 0.99835 0.793153
+22 1.29 0.942455 0.909058
+23 1.35 1.04326 1.04957
+24 1.41 1.00007 1.1965
+25 1.47 1.02283 1.35984
+26 1.53 0.989549 1.53103
+27 1.59 0.962099 1.71077
+28 1.65 1.02458 1.9169
+29 1.71 1.02822 2.13909
+30 1.77 1.00437 2.37161
+31 1.83 0.990035 2.61662
+32 1.89 0.9552 2.86876
+33 1.95 0.992517 3.14765
+34 2.01 1.05241 3.46184
+35 2.07 0.959629 3.76569
+36 2.13 1.00845 4.10378
+37 2.19 1.03144 4.46933
+38 2.25 0.999092 4.84308
+39 2.31 0.972288 5.22646
+40 2.37 1.0414 5.6587
+41 2.43 1.04782 6.11591
+42 2.49 0.987039 6.56812
+43 2.55 0.981219 7.03959
+44 2.61 0.988346 7.53709
+45 2.67 1.00671 8.0674
+46 2.73 0.990794 8.61305
+47 2.79 1.03234 9.20685
+48 2.85 1.02796 9.82382
+49 2.91 0.982016 10.4383
+50 2.97 1.027 11.1077
+109150 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0.0659362 0.000356633
+6 0.33 0.309393 0.00285307
+7 0.39 0.253361 0.00570613
+8 0.45 0.452189 0.0124822
+9 0.51 0.537517 0.0228245
+10 0.57 0.86082 0.0435093
+11 0.63 0.899202 0.0699001
+12 0.69 1.06378 0.107347
+13 0.75 1.2092 0.157632
+14 0.81 1.23531 0.217546
+15 0.87 1.08998 0.278531
+16 0.93 0.942768 0.338802
+17 0.99 1.07322 0.416548
+18 1.05 0.962855 0.495007
+19 1.11 0.99084 0.585235
+20 1.17 0.941194 0.680456
+21 1.23 1.00792 0.793153
+22 1.29 0.959854 0.911198
+23 1.35 1.00619 1.04672
+24 1.41 1.02677 1.19757
+25 1.47 1.1412 1.37981
+26 1.53 0.968934 1.54743
+27 1.59 0.935374 1.72218
+28 1.65 0.92886 1.90906
+29 1.71 1.03812 2.13338
+30 1.77 0.985886 2.36163
+31 1.83 1.01597 2.61305
+32 1.89 0.987625 2.87375
+33 1.95 1.04455 3.16726
+34 2.01 1.00224 3.46648
+35 2.07 0.991166 3.78031
+36 2.13 1.02654 4.12447
+37 2.19 1.0093 4.48217
+38 2.25 0.973352 4.84629
+39 2.31 1.01751 5.2475
+40 2.37 0.990705 5.6587
+41 2.43 1.00614 6.09772
+42 2.49 1.01117 6.56098
+43 2.55 0.96489 7.02461
+44 2.61 1.01102 7.53352
+45 2.67 1.01551 8.06847
+46 2.73 1.01994 8.63017
+47 2.79 1.02862 9.22183
+48 2.85 0.979828 9.80991
+49 2.91 0.981446 10.424
+50 2.97 1.0177 11.0874
+109200 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0.108706 0.000356633
+5 0.27 0 0.000356633
+6 0.33 0.265194 0.00249643
+7 0.39 0.380042 0.00677603
+8 0.45 0.356992 0.0121255
+9 0.51 0.574587 0.0231812
+10 0.57 0.742086 0.0410128
+11 0.63 0.826294 0.0652639
+12 0.69 0.840894 0.0948645
+13 0.75 1.21778 0.145506
+14 0.81 1.08825 0.198288
+15 0.87 1.19835 0.265335
+16 0.93 1.21054 0.342725
+17 0.99 1.03383 0.417618
+18 1.05 0.936595 0.493937
+19 1.11 1.01825 0.586662
+20 1.17 0.902418 0.67796
+21 1.23 0.966454 0.78602
+22 1.29 0.968553 0.905136
+23 1.35 1.06444 1.0485
+24 1.41 0.978219 1.19223
+25 1.47 1.06527 1.36234
+26 1.53 1.03903 1.54208
+27 1.59 0.990732 1.72718
+28 1.65 0.982039 1.92475
+29 1.71 0.998512 2.14051
+30 1.77 1.00745 2.37375
+31 1.83 0.948243 2.60842
+32 1.89 1.07274 2.89158
+33 1.95 1.03313 3.18188
+34 2.01 0.968794 3.47111
+35 2.07 0.983282 3.78245
+36 2.13 0.935052 4.09593
+37 2.19 1.02842 4.46041
+38 2.25 1.02388 4.84344
+39 2.31 1.00575 5.24001
+40 2.37 1.01047 5.65942
+41 2.43 0.982437 6.08809
+42 2.49 1.0283 6.5592
+43 2.55 0.981961 7.03103
+44 2.61 0.972759 7.52068
+45 2.67 1.00671 8.051
+46 2.73 1.00634 8.60521
+47 2.79 0.953599 9.15371
+48 2.85 1.02499 9.7689
+49 2.91 1.01336 10.403
+50 2.97 0.993079 11.0503
+109250 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0.132597 0.0010699
+7 0.39 0.221691 0.00356633
+8 0.45 0.42839 0.00998573
+9 0.51 0.963823 0.0285307
+10 0.57 0.593669 0.042796
+11 0.63 0.777688 0.0656205
+12 0.69 1.09418 0.104137
+13 0.75 1.09772 0.149786
+14 0.81 1.15443 0.205777
+15 0.87 1.24934 0.275678
+16 0.93 0.992975 0.339158
+17 0.99 1.1766 0.424394
+18 1.05 0.927842 0.5
+19 1.11 1.04175 0.594864
+20 1.17 0.874218 0.68331
+21 1.23 0.877145 0.781384
+22 1.29 1.02655 0.907632
+23 1.35 1.01678 1.04458
+24 1.41 0.992783 1.19044
+25 1.47 1.05633 1.35913
+26 1.53 0.964811 1.52603
+27 1.59 0.946827 1.70292
+28 1.65 1.06181 1.91655
+29 1.71 1.00016 2.13267
+30 1.77 1.05058 2.37589
+31 1.83 1.00445 2.62447
+32 1.89 1.01465 2.8923
+33 1.95 0.941749 3.15692
+34 2.01 1.02016 3.46148
+35 2.07 1.00806 3.78067
+36 2.13 0.998878 4.11555
+37 2.19 0.997225 4.46897
+38 2.25 1.02006 4.85057
+39 2.31 0.973192 5.23431
+40 2.37 1.04054 5.66619
+41 2.43 0.977533 6.09272
+42 2.49 0.99171 6.54708
+43 2.55 1.00571 7.03031
+44 2.61 0.986929 7.5271
+45 2.67 0.978277 8.04244
+46 2.73 1.03353 8.61163
+47 2.79 0.986461 9.17903
+48 2.85 0.967944 9.75999
+49 2.91 1.00538 10.3891
+50 2.97 1.01168 11.0485
+109300 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0.108706 0.000356633
+5 0.27 0.0659362 0.000713267
+6 0.33 0.044199 0.0010699
+7 0.39 0.190021 0.0032097
+8 0.45 0.452189 0.00998573
+9 0.51 0.759937 0.0246077
+10 0.57 0.801453 0.0438659
+11 0.63 0.814142 0.0677603
+12 0.69 0.921944 0.100214
+13 0.75 1.13202 0.14729
+14 0.81 1.23531 0.207204
+15 0.87 0.949753 0.260342
+16 0.93 1.07107 0.328816
+17 0.99 1.06337 0.405849
+18 1.05 1.06789 0.492867
+19 1.11 0.924262 0.577033
+20 1.17 0.955294 0.67368
+21 1.23 0.944126 0.779244
+22 1.29 0.962754 0.897646
+23 1.35 0.990301 1.03103
+24 1.41 1.08988 1.19116
+25 1.47 1.0005 1.35093
+26 1.53 0.993673 1.52282
+27 1.59 1.02318 1.71398
+28 1.65 1.05826 1.92689
+29 1.71 0.957251 2.13374
+30 1.77 0.953537 2.35449
+31 1.83 1.00012 2.602
+32 1.89 1.0187 2.8709
+33 1.95 0.95698 3.1398
+34 2.01 1.01299 3.44223
+35 2.07 1.03847 3.77104
+36 2.13 1.05632 4.12518
+37 2.19 1.03546 4.49215
+38 2.25 0.980025 4.85877
+39 2.31 0.953294 5.23466
+40 2.37 0.955476 5.63124
+41 2.43 1.01595 6.07454
+42 2.49 1.0244 6.54387
+43 2.55 1.00349 7.02603
+44 2.61 1.01739 7.53816
+45 2.67 1.01416 8.0724
+46 2.73 1.03418 8.64194
+47 2.79 0.951119 9.18902
+48 2.85 0.999436 9.78887
+49 2.91 1.00253 10.4162
+50 2.97 0.971193 11.0492
+109350 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0.0659362 0.000356633
+6 0.33 0.0883979 0.0010699
+7 0.39 0.285031 0.0042796
+8 0.45 0.42839 0.010699
+9 0.51 0.759937 0.025321
+10 0.57 0.756928 0.0435093
+11 0.63 0.814142 0.0674037
+12 0.69 0.952338 0.100927
+13 0.75 1.25208 0.152996
+14 0.81 1.18384 0.210414
+15 0.87 1.08998 0.271398
+16 0.93 1.21054 0.348787
+17 0.99 0.999373 0.421184
+18 1.05 0.997868 0.502496
+19 1.11 0.955593 0.589515
+20 1.17 0.888318 0.679387
+21 1.23 0.960075 0.786733
+22 1.29 1.01785 0.911912
+23 1.35 0.977062 1.04351
+24 1.41 1.04133 1.1965
+25 1.47 1.02953 1.36091
+26 1.53 1.01017 1.53566
+27 1.59 0.988823 1.7204
+28 1.65 0.990902 1.91976
+29 1.71 1.04472 2.14551
+30 1.77 1.01515 2.38053
+31 1.83 0.93095 2.61091
+32 1.89 0.964657 2.86555
+33 1.95 1.01663 3.15121
+34 2.01 0.972377 3.44151
+35 2.07 0.979903 3.75178
+36 2.13 1.03824 4.09986
+37 2.19 1.0254 4.46327
+38 2.25 0.987652 4.83274
+39 2.31 0.990377 5.22325
+40 2.37 1.0139 5.64408
+41 2.43 0.988158 6.07525
+42 2.49 0.973027 6.52104
+43 2.55 1.03021 7.01605
+44 2.61 0.994722 7.51676
+45 2.67 1.03515 8.06205
+46 2.73 0.99727 8.61127
+47 2.79 0.97096 9.16976
+48 2.85 1.00062 9.77033
+49 2.91 0.999115 10.3955
+50 2.97 0.985966 11.0382
+109400 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0.108706 0.000356633
+5 0.27 0.131872 0.0010699
+6 0.33 0.044199 0.00142653
+7 0.39 0.221691 0.00392297
+8 0.45 0.452189 0.010699
+9 0.51 0.500446 0.0203281
+10 0.57 0.831136 0.0402996
+11 0.63 0.97211 0.0688302
+12 0.69 0.8105 0.0973609
+13 0.75 1.01196 0.139444
+14 0.81 1.25737 0.200428
+15 0.87 1.1601 0.265335
+16 0.93 1.17149 0.340228
+17 0.99 0.935374 0.407989
+18 1.05 0.975984 0.487518
+19 1.11 0.939927 0.57311
+20 1.17 1.11745 0.686163
+21 1.23 0.928178 0.789943
+22 1.29 1.00335 0.913338
+23 1.35 0.958527 1.04244
+24 1.41 1.0122 1.19116
+25 1.47 0.987102 1.34879
+26 1.53 1.0514 1.53067
+27 1.59 1.02509 1.72218
+28 1.65 0.946587 1.91262
+29 1.71 0.991911 2.12696
+30 1.77 1.0475 2.36947
+31 1.83 0.988594 2.61412
+32 1.89 0.979519 2.87268
+33 1.95 0.982364 3.14872
+34 2.01 1.02374 3.45435
+35 2.07 1.03059 3.78067
+36 2.13 0.97122 4.10628
+37 2.19 0.999237 4.46041
+38 2.25 0.984792 4.82882
+39 2.31 0.991281 5.21969
+40 2.37 1.00102 5.63516
+41 2.43 0.98162 6.06348
+42 2.49 1.05165 6.54529
+43 2.55 0.996063 7.02389
+44 2.61 0.974176 7.51427
+45 2.67 0.989786 8.03566
+46 2.73 1.01799 8.59629
+47 2.79 1.00196 9.17261
+48 2.85 0.995871 9.77033
+49 2.91 1.03217 10.4162
+50 2.97 0.990343 11.0617
+109450 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0.0659362 0.000356633
+6 0.33 0.0883979 0.0010699
+7 0.39 0.411712 0.00570613
+8 0.45 0.285593 0.00998573
+9 0.51 0.537517 0.0203281
+10 0.57 0.831136 0.0402996
+11 0.63 1.16653 0.0745364
+12 0.69 0.932075 0.107347
+13 0.75 1.07199 0.151926
+14 0.81 1.25001 0.212553
+15 0.87 1.03899 0.270685
+16 0.93 1.21612 0.348431
+17 0.99 1.0486 0.424394
+18 1.05 1.02413 0.507846
+19 1.11 0.822437 0.582739
+20 1.17 0.934144 0.677247
+21 1.23 0.960075 0.784593
+22 1.29 0.910556 0.896576
+23 1.35 1.06179 1.03959
+24 1.41 1.11172 1.20292
+25 1.47 1.0407 1.36912
+26 1.53 0.917395 1.52782
+27 1.59 0.967825 1.70863
+28 1.65 1.06535 1.92297
+29 1.71 0.955601 2.12946
+30 1.77 0.973562 2.35485
+31 1.83 0.995799 2.60128
+32 1.89 1.03086 2.8734
+33 1.95 0.991248 3.15193
+34 2.01 1.02016 3.45649
+35 2.07 1.04298 3.78673
+36 2.13 1.02334 4.12981
+37 2.19 0.981124 4.47753
+38 2.25 0.916152 4.82026
+39 2.31 0.990377 5.21077
+40 2.37 1.05257 5.64765
+41 2.43 0.980802 6.07561
+42 2.49 1.00183 6.53459
+43 2.55 0.987899 7.00927
+44 2.61 1.00181 7.51355
+45 2.67 1.05275 8.06812
+46 2.73 0.992089 8.61448
+47 2.79 1.0311 9.20756
+48 2.85 1.00419 9.81027
+49 2.91 0.960928 10.4116
+50 2.97 0.984872 11.0535
+109500 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0.131872 0.000713267
+6 0.33 0.353592 0.00356633
+7 0.39 0.348371 0.0074893
+8 0.45 0.356992 0.0128388
+9 0.51 0.834077 0.0288873
+10 0.57 0.578827 0.042796
+11 0.63 1.10578 0.0752496
+12 0.69 0.982731 0.109843
+13 0.75 1.1406 0.157275
+14 0.81 1.11766 0.211484
+15 0.87 1.10911 0.273538
+16 0.93 1.1157 0.344864
+17 0.99 0.984604 0.416191
+18 1.05 0.840309 0.484665
+19 1.11 0.877266 0.564551
+20 1.17 1.12802 0.678673
+21 1.23 0.928178 0.782454
+22 1.29 0.988852 0.904066
+23 1.35 0.918809 1.02782
+24 1.41 0.983074 1.17225
+25 1.47 1.05633 1.34094
+26 1.53 1.02666 1.51854
+27 1.59 1.01555 1.70827
+28 1.65 1.05826 1.92118
+29 1.71 1.00511 2.13837
+30 1.77 1.01207 2.37268
+31 1.83 0.964095 2.61127
+32 1.89 1.01735 2.87981
+33 1.95 0.969672 3.15228
+34 2.01 1.02374 3.45792
+35 2.07 1.01482 3.77924
+36 2.13 0.970156 4.10449
+37 2.19 1.00528 4.46077
+38 2.25 1.0153 4.84058
+39 2.31 0.961434 5.21969
+40 2.37 1.00187 5.63552
+41 2.43 1.05191 6.09451
+42 2.49 0.940334 6.52532
+43 2.55 1.00645 7.00892
+44 2.61 0.996848 7.5107
+45 2.67 1.00333 8.03923
+46 2.73 1.01864 8.60021
+47 2.79 0.96848 9.15728
+48 2.85 1.03093 9.77603
+49 2.91 0.982586 10.3909
+50 2.97 1.04342 11.071
+109550 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0.21169 0.000356633
+4 0.21 0 0.000356633
+5 0.27 0 0.000356633
+6 0.33 0.132597 0.00142653
+7 0.39 0.253361 0.0042796
+8 0.45 0.594986 0.0131954
+9 0.51 0.648727 0.0256776
+10 0.57 0.756928 0.0438659
+11 0.63 1.10578 0.0763195
+12 0.69 0.851025 0.106277
+13 0.75 1.02053 0.148716
+14 0.81 1.10295 0.202211
+15 0.87 1.21109 0.269971
+16 0.93 1.12128 0.341655
+17 0.99 1.07322 0.419401
+18 1.05 1.04163 0.50428
+19 1.11 0.908597 0.587019
+20 1.17 0.96587 0.684736
+21 1.23 0.956885 0.791726
+22 1.29 0.951154 0.908702
+23 1.35 0.921457 1.03281
+24 1.41 1.05104 1.18723
+25 1.47 0.987102 1.34486
+26 1.53 1.0782 1.53138
+27 1.59 0.990732 1.71648
+28 1.65 0.909361 1.89943
+29 1.71 1.00181 2.11591
+30 1.77 1.0398 2.35663
+31 1.83 1.04624 2.61555
+32 1.89 1.00654 2.88124
+33 1.95 1.01663 3.1669
+34 2.01 0.934151 3.44579
+35 2.07 1.0013 3.76284
+36 2.13 0.981858 4.09201
+37 2.19 0.979112 4.43902
+38 2.25 0.996232 4.8117
+39 2.31 0.981332 5.19864
+40 2.37 1.04054 5.63053
+41 2.43 0.997149 6.06562
+42 2.49 1.01351 6.52996
+43 2.55 1.05099 7.03495
+44 2.61 0.927415 7.50178
+45 2.67 0.999941 8.02853
+46 2.73 0.99986 8.57917
+47 2.79 0.980261 9.14301
+48 2.85 0.983393 9.73324
+49 2.91 0.997405 10.3573
+50 2.97 1.06366 11.0506
+109600 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0.0659362 0.000356633
+6 0.33 0.176796 0.00178317
+7 0.39 0.190021 0.00392297
+8 0.45 0.523588 0.0117689
+9 0.51 0.741402 0.0260342
+10 0.57 0.831136 0.0460057
+11 0.63 0.935656 0.0734665
+12 0.69 0.881419 0.104494
+13 0.75 1.03769 0.147646
+14 0.81 1.14707 0.203281
+15 0.87 1.12186 0.266049
+16 0.93 1.18264 0.341655
+17 0.99 0.99445 0.413695
+18 1.05 0.936595 0.490014
+19 1.11 0.959509 0.577389
+20 1.17 1.0258 0.68117
+21 1.23 0.950506 0.787447
+22 1.29 1.04685 0.916191
+23 1.35 1.0565 1.05849
+24 1.41 0.919963 1.19365
+25 1.47 0.987102 1.35128
+26 1.53 0.973057 1.51961
+27 1.59 1.04991 1.71576
+28 1.65 1.00686 1.91833
+29 1.71 1.09094 2.15407
+30 1.77 1.04134 2.39515
+31 1.83 1.01886 2.64729
+32 1.89 0.966008 2.90228
+33 1.95 0.993786 3.18153
+34 2.01 1.02733 3.48823
+35 2.07 0.995671 3.8035
+36 2.13 0.981858 4.13267
+37 2.19 0.97408 4.47789
+38 2.25 0.988605 4.84772
+39 2.31 1.06454 5.26748
+40 2.37 0.921106 5.64979
+41 2.43 1.01758 6.09379
+42 2.49 1.03608 6.56847
+43 2.55 0.986414 7.04244
+44 2.61 1.01456 7.55314
+45 2.67 0.989109 8.07418
+46 2.73 0.95971 8.60271
+47 2.79 0.990181 9.17225
+48 2.85 1.02023 9.78459
+49 2.91 0.989426 10.4037
+50 2.97 1.00293 11.0574
+109650 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0.131872 0.000713267
+6 0.33 0.265194 0.00285307
+7 0.39 0.158351 0.00463623
+8 0.45 0.309393 0.00927247
+9 0.51 0.556052 0.0199715
+10 0.57 0.875662 0.0410128
+11 0.63 1.13008 0.0741797
+12 0.69 1.02326 0.1102
+13 0.75 1.1406 0.157632
+14 0.81 1.11031 0.211484
+15 0.87 1.11548 0.273894
+16 0.93 1.0376 0.340228
+17 0.99 0.979681 0.411198
+18 1.05 1.07665 0.49893
+19 1.11 0.889015 0.579886
+20 1.17 0.923569 0.673324
+21 1.23 0.976023 0.782454
+22 1.29 0.983053 0.903352
+23 1.35 1.06444 1.04672
+24 1.41 0.997638 1.1933
+25 1.47 0.978169 1.3495
+26 1.53 1.02253 1.52639
+27 1.59 1.02891 1.71862
+28 1.65 1.00686 1.92118
+29 1.71 1.01172 2.1398
+30 1.77 1.06753 2.38695
+31 1.83 0.98427 2.63053
+32 1.89 0.972763 2.8873
+33 1.95 0.965864 3.1587
+34 2.01 0.99149 3.45471
+35 2.07 1.00018 3.7714
+36 2.13 1.05207 4.12411
+37 2.19 0.9932 4.47611
+38 2.25 1.02292 4.85877
+39 2.31 1.02022 5.26106
+40 2.37 1.00703 5.67903
+41 2.43 1.00042 6.11555
+42 2.49 0.974584 6.56205
+43 2.55 0.993094 7.03923
+44 2.61 0.981261 7.53317
+45 2.67 0.959998 8.03887
+46 2.73 0.998565 8.5888
+47 2.79 1.00444 9.16655
+48 2.85 1.02974 9.78459
+49 2.91 1.00196 10.4116
+50 2.97 1.01387 11.0724
+109700 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0.0659362 0.000356633
+6 0.33 0.220995 0.0021398
+7 0.39 0.253361 0.00499287
+8 0.45 0.499788 0.0124822
+9 0.51 0.704332 0.0260342
+10 0.57 0.831136 0.0460057
+11 0.63 0.887051 0.0720399
+12 0.69 1.06378 0.109486
+13 0.75 1.13202 0.156562
+14 0.81 1.19119 0.214337
+15 0.87 1.1601 0.279244
+16 0.93 1.05434 0.346648
+17 0.99 1.0043 0.419401
+18 1.05 0.984738 0.499643
+19 1.11 0.983008 0.589158
+20 1.17 0.96587 0.686876
+21 1.23 0.867576 0.78388
+22 1.29 0.985953 0.905136
+23 1.35 0.924105 1.0296
+24 1.41 1.05347 1.18438
+25 1.47 1.05857 1.35342
+26 1.53 0.989549 1.52461
+27 1.59 1.01937 1.71505
+28 1.65 1.04763 1.92582
+29 1.71 1.00676 2.14337
+30 1.77 0.975103 2.36912
+31 1.83 1.03183 2.62447
+32 1.89 1.00519 2.8898
+33 1.95 0.978556 3.16476
+34 2.01 0.987907 3.4597
+35 2.07 1.00018 3.77639
+36 2.13 0.976539 4.10378
+37 2.19 1.03345 4.47004
+38 2.25 1.03055 4.85556
+39 2.31 0.975906 5.24037
+40 2.37 1.02507 5.66583
+41 2.43 1.00859 6.10592
+42 2.49 1.00416 6.56598
+43 2.55 0.961921 7.02817
+44 2.61 0.991888 7.52746
+45 2.67 1.00468 8.0567
+46 2.73 1.00957 8.6127
+47 2.79 0.980261 9.17653
+48 2.85 0.967944 9.75749
+49 2.91 1.00481 10.3862
+50 2.97 1.0073 11.0428
+109750 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0.108706 0.000356633
+5 0.27 0 0.000356633
+6 0.33 0.132597 0.00142653
+7 0.39 0.316701 0.00499287
+8 0.45 0.285593 0.00927247
+9 0.51 0.667262 0.0221113
+10 0.57 0.845978 0.0424394
+11 0.63 1.09362 0.0745364
+12 0.69 0.9726 0.108773
+13 0.75 0.934775 0.147646
+14 0.81 0.9706 0.194722
+15 0.87 1.10911 0.256776
+16 0.93 1.29979 0.339872
+17 0.99 0.964912 0.409772
+18 1.05 1.09853 0.499287
+19 1.11 0.936011 0.584522
+20 1.17 0.902418 0.67582
+21 1.23 0.976023 0.78495
+22 1.29 0.988852 0.906562
+23 1.35 0.926753 1.03138
+24 1.41 1.06803 1.1883
+25 1.47 0.993802 1.347
+26 1.53 1.06995 1.5321
+27 1.59 0.965916 1.71255
+28 1.65 1.05649 1.92511
+29 1.71 0.991911 2.13944
+30 1.77 0.993588 2.36947
+31 1.83 1.00589 2.6184
+32 1.89 0.929529 2.86377
+33 1.95 1.04963 3.1587
+34 2.01 1.01658 3.4622
+35 2.07 0.960755 3.76641
+36 2.13 0.981858 4.09558
+37 2.19 1.03446 4.4622
+38 2.25 1.01339 4.8413
+39 2.31 1.0157 5.2418
+40 2.37 1.02078 5.66548
+41 2.43 0.970177 6.0888
+42 2.49 0.999494 6.54672
+43 2.55 0.982703 7.0189
+44 2.61 1.01669 7.53067
+45 2.67 0.945104 8.02853
+46 2.73 1.0154 8.58773
+47 2.79 0.988321 9.15621
+48 2.85 1.03033 9.77461
+49 2.91 0.972897 10.3834
+50 2.97 0.967363 11.0139
+109800 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0.309393 0.00249643
+7 0.39 0.411712 0.00713267
+8 0.45 0.333192 0.0121255
+9 0.51 0.518981 0.0221113
+10 0.57 0.756928 0.0402996
+11 0.63 0.97211 0.0688302
+12 0.69 1.03339 0.105207
+13 0.75 1.05484 0.149073
+14 0.81 1.14707 0.204708
+15 0.87 1.1346 0.268188
+16 0.93 1.04318 0.334879
+17 0.99 1.12737 0.416548
+18 1.05 1.00662 0.498573
+19 1.11 1.03 0.592368
+20 1.17 0.842492 0.677603
+21 1.23 0.969643 0.78602
+22 1.29 0.927955 0.900143
+23 1.35 1.00884 1.03602
+24 1.41 0.961228 1.17725
+25 1.47 1.0541 1.34558
+26 1.53 1.04109 1.52568
+27 1.59 0.952554 1.70364
+28 1.65 1.07067 1.91904
+29 1.71 0.965504 2.12767
+30 1.77 1.0244 2.36484
+31 1.83 1.03759 2.62161
+32 1.89 1.02275 2.89158
+33 1.95 1.00267 3.17332
+34 2.01 0.942513 3.45471
+35 2.07 0.983282 3.76605
+36 2.13 1.01696 4.10699
+37 2.19 1.0415 4.47611
+38 2.25 1.00004 4.85021
+39 2.31 1.02113 5.25285
+40 2.37 0.989845 5.66369
+41 2.43 0.985706 6.09379
+42 2.49 0.953567 6.53067
+43 2.55 0.982703 7.00285
+44 2.61 1.00393 7.5082
+45 2.67 0.99791 8.03388
+46 2.73 1.01605 8.59344
+47 2.79 1.02552 9.18331
+48 2.85 0.994088 9.77996
+49 2.91 1.05383 10.4394
+50 2.97 1.01332 11.0999
+109850 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0.197809 0.0010699
+6 0.33 0.309393 0.00356633
+7 0.39 0.316701 0.00713267
+8 0.45 0.618786 0.0164051
+9 0.51 0.704332 0.0299572
+10 0.57 0.86082 0.0506419
+11 0.63 0.911353 0.0773894
+12 0.69 0.982731 0.111983
+13 0.75 1.02053 0.154422
+14 0.81 1.23531 0.214337
+15 0.87 1.09636 0.275678
+16 0.93 1.07107 0.344151
+17 0.99 0.969835 0.414408
+18 1.05 1.07665 0.50214
+19 1.11 1.04567 0.597361
+20 1.17 1.00465 0.699001
+21 1.23 0.976023 0.808131
+22 1.29 0.875758 0.915835
+23 1.35 0.945288 1.04315
+24 1.41 0.953946 1.18331
+25 1.47 0.975936 1.33916
+26 1.53 1.05964 1.52247
+27 1.59 1.01937 1.71291
+28 1.65 1.05117 1.92439
+29 1.71 1.02492 2.14586
+30 1.77 1.03056 2.38445
+31 1.83 0.974183 2.62553
+32 1.89 0.98087 2.88445
+33 1.95 1.0014 3.16583
+34 2.01 0.941319 3.44686
+35 2.07 0.986661 3.75927
+36 2.13 1.02228 4.102
+37 2.19 0.987162 4.45185
+38 2.25 1.03055 4.83738
+39 2.31 0.995804 5.23003
+40 2.37 1.02164 5.65407
+41 2.43 1.00696 6.09344
+42 2.49 0.972249 6.53887
+43 2.55 0.995321 7.01712
+44 2.61 0.994014 7.51748
+45 2.67 0.993848 8.04101
+46 2.73 0.99727 8.59023
+47 2.79 1.00134 9.16619
+48 2.85 1.02202 9.7796
+49 2.91 1.00424 10.408
+50 2.97 1.02974 11.0792
+109900 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0.0659362 0.000356633
+6 0.33 0.132597 0.00142653
+7 0.39 0.221691 0.00392297
+8 0.45 0.356992 0.00927247
+9 0.51 0.518981 0.0192582
+10 0.57 0.86082 0.0399429
+11 0.63 0.899202 0.0663338
+12 0.69 0.921944 0.0987874
+13 0.75 1.19205 0.148359
+14 0.81 1.2059 0.206847
+15 0.87 1.24296 0.276391
+16 0.93 1.0655 0.344508
+17 0.99 1.0683 0.421897
+18 1.05 0.989114 0.502496
+19 1.11 0.951677 0.589158
+20 1.17 0.98702 0.689016
+21 1.23 1.00154 0.800999
+22 1.29 0.968553 0.920114
+23 1.35 1.0512 1.0617
+24 1.41 0.919963 1.19686
+25 1.47 0.962536 1.35057
+26 1.53 1.04315 1.53103
+27 1.59 1.07282 1.73146
+28 1.65 0.974949 1.9276
+29 1.71 1.03317 2.15086
+30 1.77 0.935051 2.36733
+31 1.83 1.07362 2.63302
+32 1.89 0.96871 2.88873
+33 1.95 0.950634 3.15585
+34 2.01 1.0118 3.45792
+35 2.07 1.00919 3.77746
+36 2.13 1.03079 4.12304
+37 2.19 0.96603 4.46541
+38 2.25 0.990512 4.83595
+39 2.31 0.995804 5.2286
+40 2.37 1.01047 5.648
+41 2.43 1.00042 6.08452
+42 2.49 1.01428 6.54922
+43 2.55 1.00423 7.03174
+44 2.61 0.938751 7.50428
+45 2.67 0.997233 8.0296
+46 2.73 0.984966 8.57204
+47 2.79 1.00506 9.15014
+48 2.85 1.02023 9.76248
+49 2.91 1.02305 10.4026
+50 2.97 0.996362 11.0521
+109950 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0.0659362 0.000356633
+6 0.33 0.265194 0.00249643
+7 0.39 0.285031 0.00570613
+8 0.45 0.404591 0.0117689
+9 0.51 0.741402 0.0260342
+10 0.57 0.727244 0.0435093
+11 0.63 0.959959 0.0716833
+12 0.69 1.06378 0.10913
+13 0.75 1.01196 0.151213
+14 0.81 1.2206 0.210414
+15 0.87 1.12186 0.273181
+16 0.93 0.998553 0.337019
+17 0.99 1.07322 0.414765
+18 1.05 1.05914 0.50107
+19 1.11 0.979091 0.590228
+20 1.17 0.905943 0.681883
+21 1.23 0.988781 0.792439
+22 1.29 0.994652 0.914765
+23 1.35 0.913513 1.0378
+24 1.41 1.02191 1.18795
+25 1.47 1.0474 1.35521
+26 1.53 1.01429 1.53067
+27 1.59 1.00409 1.71826
+28 1.65 0.994448 1.91833
+29 1.71 0.998512 2.13409
+30 1.77 0.992048 2.36377
+31 1.83 0.982829 2.60699
+32 1.89 0.971412 2.86341
+33 1.95 1.03694 3.15478
+34 2.01 1.02613 3.46113
+35 2.07 1.02946 3.78709
+36 2.13 0.986113 4.11769
+37 2.19 0.947917 4.45364
+38 2.25 0.961912 4.81348
+39 2.31 0.99309 5.20506
+40 2.37 1.01906 5.62803
+41 2.43 1.01023 6.06883
+42 2.49 1.01584 6.53424
+43 2.55 1.01017 7.01961
+44 2.61 0.984803 7.51534
+45 2.67 0.999941 8.04208
+46 2.73 1.01734 8.60235
+47 2.79 0.983361 9.16797
+48 2.85 1.0036 9.77033
+49 2.91 0.998545 10.3951
+50 2.97 0.991985 11.0417
+110000 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0.131872 0.000713267
+6 0.33 0.309393 0.0032097
+7 0.39 0.221691 0.00570613
+8 0.45 0.452189 0.0124822
+9 0.51 0.556052 0.0231812
+10 0.57 0.831136 0.0431526
+11 0.63 0.984262 0.0720399
+12 0.69 0.932075 0.10485
+13 0.75 0.977655 0.145506
+14 0.81 1.04413 0.196148
+15 0.87 1.24934 0.266049
+16 0.93 1.21054 0.343438
+17 0.99 1.15691 0.427247
+18 1.05 0.888452 0.499643
+19 1.11 1.03 0.593438
+20 1.17 0.955294 0.690086
+21 1.23 0.950506 0.796362
+22 1.29 0.904756 0.907632
+23 1.35 0.963823 1.03745
+24 1.41 0.9588 1.17832
+25 1.47 1.02507 1.34201
+26 1.53 0.993673 1.51391
+27 1.59 1.06518 1.71291
+28 1.65 1.01572 1.91726
+29 1.71 1.00511 2.13445
+30 1.77 1.00283 2.36662
+31 1.83 1.02462 2.62019
+32 1.89 0.947093 2.87019
+33 1.95 0.95698 3.13909
+34 2.01 1.01897 3.4433
+35 2.07 0.94386 3.74215
+36 2.13 1.02015 4.08417
+37 2.19 1.00729 4.44116
+38 2.25 1.02578 4.82489
+39 2.31 0.975906 5.2097
+40 2.37 1.00961 5.62874
+41 2.43 1.01922 6.07347
+42 2.49 1.01506 6.53852
+43 2.55 0.989383 7.01391
+44 2.61 0.975593 7.50499
+45 2.67 0.955936 8.00856
+46 2.73 0.988204 8.55278
+47 2.79 1.00692 9.13195
+48 2.85 0.988741 9.72539
+49 2.91 1.00253 10.3527
+50 2.97 1.02919 11.0235
diff --git a/examples/USER/misc/slater/tmp_2_2.rdf b/examples/USER/misc/slater/tmp_2_2.rdf
new file mode 100644
index 0000000000..fe93e70d05
--- /dev/null
+++ b/examples/USER/misc/slater/tmp_2_2.rdf
@@ -0,0 +1,10254 @@
+# Time-averaged data for fix 14
+# TimeStep Number-of-rows
+# Row c_RDF_2_2[1] c_RDF_2_2[2] c_RDF_2_2[3]
+100000 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 2.55534 0.0204082
+7 0.39 0 0.0204082
+8 0.45 0 0.0204082
+9 0.51 0 0.0204082
+10 0.57 0.858066 0.0408163
+11 0.63 2.10758 0.102041
+12 0.69 0 0.102041
+13 0.75 0.495812 0.122449
+14 0.81 0.425111 0.142857
+15 0.87 1.10556 0.204082
+16 0.93 1.29007 0.285714
+17 0.99 1.70773 0.408163
+18 1.05 0.506063 0.44898
+19 1.11 0.452845 0.489796
+20 1.17 0.2038 0.510204
+21 1.23 0.553218 0.571429
+22 1.29 1.50888 0.755102
+23 1.35 0.612339 0.836735
+24 1.41 0.561342 0.918367
+25 1.47 0.903804 1.06122
+26 1.53 0.715128 1.18367
+27 1.59 0.993271 1.36735
+28 1.65 1.33229 1.63265
+29 1.71 1.04961 1.85714
+30 1.77 0.17812 1.89796
+31 1.83 0.66653 2.06122
+32 1.89 0.546775 2.20408
+33 1.95 1.10067 2.5102
+34 2.01 0.690632 2.71429
+35 2.07 1.23724 3.10204
+36 2.13 0.738014 3.34694
+37 2.19 0.930841 3.67347
+38 2.25 1.15744 4.10204
+39 2.31 0.993519 4.4898
+40 2.37 0.397412 4.65306
+41 2.43 1.18134 5.16327
+42 2.49 0.900081 5.57143
+43 2.55 0.986958 6.04082
+44 2.61 0.983065 6.53061
+45 2.67 1.0568 7.08163
+46 2.73 0.786226 7.5102
+47 2.79 1.07539 8.12245
+48 2.85 1.44283 8.97959
+49 2.91 1.38395 9.83673
+50 2.97 1.0439 10.5102
+100050 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 0 0
+9 0.51 0 0
+10 0.57 0 0
+11 0.63 0.702525 0.0204082
+12 0.69 0 0.0204082
+13 0.75 1.48744 0.0816327
+14 0.81 0.425111 0.102041
+15 0.87 1.47408 0.183673
+16 0.93 0.645037 0.22449
+17 0.99 0.569243 0.265306
+18 1.05 0.759094 0.326531
+19 1.11 1.35853 0.44898
+20 1.17 1.2228 0.571429
+21 1.23 1.10644 0.693878
+22 1.29 0.838269 0.795918
+23 1.35 0.459254 0.857143
+24 1.41 0.701677 0.959184
+25 1.47 0.903804 1.10204
+26 1.53 1.19188 1.30612
+27 1.59 0.772544 1.44898
+28 1.65 1.74223 1.79592
+29 1.71 0.667932 1.93878
+30 1.77 1.24684 2.22449
+31 1.83 0.66653 2.38776
+32 1.89 0.546775 2.53061
+33 1.95 0.660405 2.71429
+34 2.01 1.17407 3.06122
+35 2.07 1.04189 3.38776
+36 2.13 0.984018 3.71429
+37 2.19 1.0472 4.08163
+38 2.25 0.826745 4.38776
+39 2.31 1.62101 5.02041
+40 2.37 0.894177 5.38776
+41 2.43 1.08684 5.85714
+42 2.49 1.26011 6.42857
+43 2.55 0.986958 6.89796
+44 2.61 0.819221 7.30612
+45 2.67 1.0568 7.85714
+46 2.73 1.0483 8.42857
+47 2.79 0.932007 8.95918
+48 2.85 0.687061 9.36735
+49 2.91 0.889679 9.91837
+50 2.97 0.948997 10.5306
+100100 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 0 0
+9 0.51 0 0
+10 0.57 0.858066 0.0204082
+11 0.63 0.702525 0.0408163
+12 0.69 1.17146 0.0816327
+13 0.75 1.48744 0.142857
+14 0.81 0 0.142857
+15 0.87 1.8426 0.244898
+16 0.93 1.61259 0.346939
+17 0.99 0 0.346939
+18 1.05 0.506063 0.387755
+19 1.11 0.679267 0.44898
+20 1.17 1.2228 0.571429
+21 1.23 1.65965 0.755102
+22 1.29 1.50888 0.938776
+23 1.35 0.918509 1.06122
+24 1.41 2.10503 1.36735
+25 1.47 0.903804 1.5102
+26 1.53 0.715128 1.63265
+27 1.59 0.882908 1.79592
+28 1.65 0.614903 1.91837
+29 1.71 1.04961 2.14286
+30 1.77 1.06872 2.38776
+31 1.83 0.583214 2.53061
+32 1.89 0.859219 2.7551
+33 1.95 0.660405 2.93878
+34 2.01 0.897822 3.20408
+35 2.07 0.976768 3.5102
+36 2.13 0.738014 3.7551
+37 2.19 1.10537 4.14286
+38 2.25 1.04721 4.53061
+39 2.31 0.784357 4.83673
+40 2.37 1.04321 5.26531
+41 2.43 0.803314 5.61224
+42 2.49 0.990089 6.06122
+43 2.55 0.944046 6.5102
+44 2.61 1.22883 7.12245
+45 2.67 1.25251 7.77551
+46 2.73 0.861105 8.2449
+47 2.79 1.18293 8.91837
+48 2.85 1.23671 9.65306
+49 2.91 0.856728 10.1837
+50 2.97 1.0439 10.8571
+100150 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 0 0
+9 0.51 1.07159 0.0204082
+10 0.57 0.858066 0.0408163
+11 0.63 0 0.0408163
+12 0.69 0 0.0408163
+13 0.75 1.98325 0.122449
+14 0.81 0.425111 0.142857
+15 0.87 0.737039 0.183673
+16 0.93 0.967555 0.244898
+17 0.99 1.13849 0.326531
+18 1.05 1.51819 0.44898
+19 1.11 1.35853 0.571429
+20 1.17 1.4266 0.714286
+21 1.23 1.10644 0.836735
+22 1.29 1.17358 0.979592
+23 1.35 1.07159 1.12245
+24 1.41 0.561342 1.20408
+25 1.47 0.903804 1.34694
+26 1.53 1.07269 1.53061
+27 1.59 1.10363 1.73469
+28 1.65 0.512419 1.83673
+29 1.71 0.477094 1.93878
+30 1.77 1.3359 2.2449
+31 1.83 0.833163 2.44898
+32 1.89 0.702997 2.63265
+33 1.95 1.17405 2.95918
+34 2.01 0.690632 3.16327
+35 2.07 1.23724 3.55102
+36 2.13 0.55351 3.73469
+37 2.19 0.930841 4.06122
+38 2.25 0.826745 4.36735
+39 2.31 1.15039 4.81633
+40 2.37 0.844501 5.16327
+41 2.43 1.03958 5.61224
+42 2.49 0.900081 6.02041
+43 2.55 0.600757 6.30612
+44 2.61 0.737299 6.67347
+45 2.67 0.743676 7.06122
+46 2.73 1.01086 7.61224
+47 2.79 1.43386 8.42857
+48 2.85 0.961885 9
+49 2.91 1.21919 9.7551
+50 2.97 1.1388 10.4898
+100200 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 0 0
+9 0.51 1.07159 0.0204082
+10 0.57 0.858066 0.0408163
+11 0.63 0 0.0408163
+12 0.69 0 0.0408163
+13 0.75 0.991624 0.0816327
+14 0.81 0.850222 0.122449
+15 0.87 0.737039 0.163265
+16 0.93 2.58015 0.326531
+17 0.99 0.284622 0.346939
+18 1.05 0.506063 0.387755
+19 1.11 0.452845 0.428571
+20 1.17 0.2038 0.44898
+21 1.23 0.368812 0.489796
+22 1.29 1.00592 0.612245
+23 1.35 0.459254 0.673469
+24 1.41 1.26302 0.857143
+25 1.47 0.774689 0.979592
+26 1.53 1.31107 1.20408
+27 1.59 1.10363 1.40816
+28 1.65 1.02484 1.61224
+29 1.71 0.667932 1.7551
+30 1.77 0.80154 1.93878
+31 1.83 1.33306 2.26531
+32 1.89 1.09355 2.55102
+33 1.95 0.953918 2.81633
+34 2.01 0.690632 3.02041
+35 2.07 1.62795 3.53061
+36 2.13 0.799515 3.79592
+37 2.19 0.639953 4.02041
+38 2.25 1.04721 4.40816
+39 2.31 0.679776 4.67347
+40 2.37 0.99353 5.08163
+41 2.43 0.945075 5.4898
+42 2.49 1.03509 5.95918
+43 2.55 0.986958 6.42857
+44 2.61 1.02403 6.93878
+45 2.67 1.0568 7.4898
+46 2.73 0.973423 8.02041
+47 2.79 0.967854 8.57143
+48 2.85 0.893179 9.10204
+49 2.91 0.626071 9.4898
+50 2.97 0.727564 9.95918
+100250 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 0 0
+9 0.51 0 0
+10 0.57 0 0
+11 0.63 1.40505 0.0408163
+12 0.69 0.585732 0.0612245
+13 0.75 0.495812 0.0816327
+14 0.81 0.425111 0.102041
+15 0.87 0 0.102041
+16 0.93 0.645037 0.142857
+17 0.99 0.853865 0.204082
+18 1.05 0.253031 0.22449
+19 1.11 1.35853 0.346939
+20 1.17 0.8152 0.428571
+21 1.23 0.368812 0.469388
+22 1.29 0.670615 0.55102
+23 1.35 1.22468 0.714286
+24 1.41 0.842013 0.836735
+25 1.47 1.16203 1.02041
+26 1.53 1.43026 1.26531
+27 1.59 0.33109 1.32653
+28 1.65 0.922354 1.5102
+29 1.71 1.24045 1.77551
+30 1.77 0.979661 2
+31 1.83 0.999796 2.2449
+32 1.89 0.937329 2.4898
+33 1.95 0.807161 2.71429
+34 2.01 1.38126 3.12245
+35 2.07 1.107 3.46939
+36 2.13 1.16852 3.85714
+37 2.19 0.872664 4.16327
+38 2.25 0.881861 4.4898
+39 2.31 0.993519 4.87755
+40 2.37 0.645795 5.14286
+41 2.43 0.897822 5.53061
+42 2.49 1.21511 6.08163
+43 2.55 0.72949 6.42857
+44 2.61 1.10595 6.97959
+45 2.67 1.40907 7.71429
+46 2.73 0.861105 8.18367
+47 2.79 1.14709 8.83673
+48 2.85 0.927532 9.38776
+49 2.91 1.08739 10.0612
+50 2.97 0.854097 10.6122
+100300 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 0 0
+9 0.51 0 0
+10 0.57 0.858066 0.0204082
+11 0.63 0 0.0204082
+12 0.69 0.585732 0.0408163
+13 0.75 0 0.0408163
+14 0.81 1.27533 0.102041
+15 0.87 1.8426 0.204082
+16 0.93 0.967555 0.265306
+17 0.99 0.853865 0.326531
+18 1.05 0.253031 0.346939
+19 1.11 0.452845 0.387755
+20 1.17 1.4266 0.530612
+21 1.23 0.553218 0.591837
+22 1.29 0.502961 0.653061
+23 1.35 0.612339 0.734694
+24 1.41 0.701677 0.836735
+25 1.47 1.54938 1.08163
+26 1.53 0.953504 1.2449
+27 1.59 1.76582 1.57143
+28 1.65 1.43477 1.85714
+29 1.71 1.33586 2.14286
+30 1.77 0.71248 2.30612
+31 1.83 0.583214 2.44898
+32 1.89 1.09355 2.73469
+33 1.95 0.366891 2.83673
+34 2.01 0.966885 3.12245
+35 2.07 0.976768 3.42857
+36 2.13 1.29152 3.85714
+37 2.19 1.27991 4.30612
+38 2.25 1.21256 4.7551
+39 2.31 1.0981 5.18367
+40 2.37 0.99353 5.59184
+41 2.43 1.2286 6.12245
+42 2.49 0.495044 6.34694
+43 2.55 0.944046 6.79592
+44 2.61 0.942104 7.26531
+45 2.67 0.821958 7.69388
+46 2.73 0.973423 8.22449
+47 2.79 0.716929 8.63265
+48 2.85 1.06494 9.26531
+49 2.91 1.02148 9.89796
+50 2.97 1.2337 10.6939
+100350 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 1.37595 0.0204082
+9 0.51 1.07159 0.0408163
+10 0.57 0.858066 0.0612245
+11 0.63 2.10758 0.122449
+12 0.69 0 0.122449
+13 0.75 1.48744 0.183673
+14 0.81 0.850222 0.22449
+15 0.87 0.368519 0.244898
+16 0.93 0.645037 0.285714
+17 0.99 1.42311 0.387755
+18 1.05 1.01213 0.469388
+19 1.11 0.90569 0.55102
+20 1.17 0.6114 0.612245
+21 1.23 0.553218 0.673469
+22 1.29 0.335308 0.714286
+23 1.35 0.612339 0.795918
+24 1.41 1.26302 0.979592
+25 1.47 0.903804 1.12245
+26 1.53 0.715128 1.2449
+27 1.59 1.10363 1.44898
+28 1.65 0.512419 1.55102
+29 1.71 0.763351 1.71429
+30 1.77 1.15778 1.97959
+31 1.83 1.24974 2.28571
+32 1.89 1.17166 2.59184
+33 1.95 0.733783 2.79592
+34 2.01 0.828758 3.04082
+35 2.07 1.43259 3.4898
+36 2.13 1.10702 3.85714
+37 2.19 0.872664 4.16327
+38 2.25 0.716512 4.42857
+39 2.31 0.836648 4.7551
+40 2.37 0.943854 5.14286
+41 2.43 0.850568 5.5102
+42 2.49 0.900081 5.91837
+43 2.55 0.72949 6.26531
+44 2.61 1.22883 6.87755
+45 2.67 1.25251 7.53061
+46 2.73 1.31038 8.2449
+47 2.79 0.788621 8.69388
+48 2.85 1.06494 9.32653
+49 2.91 1.12034 10.0204
+50 2.97 0.98063 10.6531
+100400 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 0 0
+9 0.51 0 0
+10 0.57 0 0
+11 0.63 0 0
+12 0.69 0.585732 0.0204082
+13 0.75 0.495812 0.0408163
+14 0.81 1.70044 0.122449
+15 0.87 1.10556 0.183673
+16 0.93 0.967555 0.244898
+17 0.99 1.13849 0.326531
+18 1.05 0.506063 0.367347
+19 1.11 0.452845 0.408163
+20 1.17 0.4076 0.44898
+21 1.23 0.553218 0.510204
+22 1.29 1.17358 0.653061
+23 1.35 1.37776 0.836735
+24 1.41 1.12268 1
+25 1.47 1.03292 1.16327
+26 1.53 1.07269 1.34694
+27 1.59 1.214 1.57143
+28 1.65 1.22981 1.81633
+29 1.71 0.381676 1.89796
+30 1.77 1.42496 2.22449
+31 1.83 1.16643 2.5102
+32 1.89 1.56222 2.91837
+33 1.95 1.10067 3.22449
+34 2.01 0.828758 3.46939
+35 2.07 0.846532 3.73469
+36 2.13 0.676513 3.95918
+37 2.19 0.930841 4.28571
+38 2.25 1.04721 4.67347
+39 2.31 0.888938 5.02041
+40 2.37 0.596118 5.26531
+41 2.43 0.992329 5.69388
+42 2.49 0.900081 6.10204
+43 2.55 0.815313 6.4898
+44 2.61 1.22883 7.10204
+45 2.67 0.93938 7.59184
+46 2.73 0.786226 8.02041
+47 2.79 1.0037 8.59184
+48 2.85 0.893179 9.12245
+49 2.91 1.02148 9.7551
+50 2.97 1.01226 10.4082
+100450 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 2.55534 0.0204082
+7 0.39 0 0.0204082
+8 0.45 0 0.0204082
+9 0.51 1.07159 0.0408163
+10 0.57 1.71613 0.0816327
+11 0.63 0.702525 0.102041
+12 0.69 0.585732 0.122449
+13 0.75 0 0.122449
+14 0.81 0.425111 0.142857
+15 0.87 0.737039 0.183673
+16 0.93 1.93511 0.306122
+17 0.99 0.853865 0.367347
+18 1.05 1.01213 0.44898
+19 1.11 0.452845 0.489796
+20 1.17 0.6114 0.55102
+21 1.23 0.553218 0.612245
+22 1.29 1.00592 0.734694
+23 1.35 0.765424 0.836735
+24 1.41 1.26302 1.02041
+25 1.47 0.774689 1.14286
+26 1.53 1.19188 1.34694
+27 1.59 1.32436 1.59184
+28 1.65 0.819871 1.7551
+29 1.71 0.477094 1.85714
+30 1.77 1.24684 2.14286
+31 1.83 0.833163 2.34694
+32 1.89 1.09355 2.63265
+33 1.95 1.10067 2.93878
+34 2.01 0.759695 3.16327
+35 2.07 0.520943 3.32653
+36 2.13 0.861016 3.61224
+37 2.19 1.16355 4.02041
+38 2.25 0.936978 4.36735
+39 2.31 1.6733 5.02041
+40 2.37 0.794824 5.34694
+41 2.43 0.803314 5.69388
+42 2.49 1.0801 6.18367
+43 2.55 1.20151 6.7551
+44 2.61 0.737299 7.12245
+45 2.67 0.861099 7.57143
+46 2.73 1.31038 8.28571
+47 2.79 1.03955 8.87755
+48 2.85 0.927532 9.42857
+49 2.91 0.889679 9.97959
+50 2.97 0.917363 10.5714
+100500 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 0 0
+9 0.51 1.07159 0.0204082
+10 0.57 0 0.0204082
+11 0.63 0.702525 0.0408163
+12 0.69 1.17146 0.0816327
+13 0.75 1.48744 0.142857
+14 0.81 0.425111 0.163265
+15 0.87 2.21112 0.285714
+16 0.93 1.29007 0.367347
+17 0.99 0.284622 0.387755
+18 1.05 0.506063 0.428571
+19 1.11 0.226422 0.44898
+20 1.17 1.019 0.55102
+21 1.23 0.368812 0.591837
+22 1.29 1.34123 0.755102
+23 1.35 1.53085 0.959184
+24 1.41 0.701677 1.06122
+25 1.47 0.645574 1.16327
+26 1.53 1.78782 1.46939
+27 1.59 0.441454 1.55102
+28 1.65 0.409935 1.63265
+29 1.71 0.381676 1.71429
+30 1.77 0.979661 1.93878
+31 1.83 0.499898 2.06122
+32 1.89 1.01544 2.32653
+33 1.95 1.61432 2.77551
+34 2.01 0.690632 2.97959
+35 2.07 0.91165 3.26531
+36 2.13 0.676513 3.4898
+37 2.19 0.872664 3.79592
+38 2.25 1.32279 4.28571
+39 2.31 0.732067 4.57143
+40 2.37 0.745148 4.87755
+41 2.43 0.897822 5.26531
+42 2.49 1.03509 5.73469
+43 2.55 0.557846 6
+44 2.61 1.06499 6.53061
+45 2.67 1.48735 7.30612
+46 2.73 1.16062 7.93878
+47 2.79 1.25463 8.65306
+48 2.85 0.996238 9.2449
+49 2.91 1.15329 9.95918
+50 2.97 1.2337 10.7551
+100550 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 0 0
+9 0.51 0 0
+10 0.57 0 0
+11 0.63 0 0
+12 0.69 1.17146 0.0408163
+13 0.75 0 0.0408163
+14 0.81 1.27533 0.102041
+15 0.87 2.21112 0.22449
+16 0.93 0.645037 0.265306
+17 0.99 1.42311 0.367347
+18 1.05 0.759094 0.428571
+19 1.11 1.13211 0.530612
+20 1.17 0.4076 0.571429
+21 1.23 0.922029 0.673469
+22 1.29 0.670615 0.755102
+23 1.35 0.612339 0.836735
+24 1.41 0.561342 0.918367
+25 1.47 1.42026 1.14286
+26 1.53 0.59594 1.2449
+27 1.59 0.993271 1.42857
+28 1.65 0.922354 1.61224
+29 1.71 1.14503 1.85714
+30 1.77 1.24684 2.14286
+31 1.83 0.66653 2.30612
+32 1.89 0.859219 2.53061
+33 1.95 0.880539 2.77551
+34 2.01 1.24314 3.14286
+35 2.07 1.49771 3.61224
+36 2.13 1.29152 4.04082
+37 2.19 0.698131 4.28571
+38 2.25 0.936978 4.63265
+39 2.31 0.888938 4.97959
+40 2.37 0.894177 5.34694
+41 2.43 0.661553 5.63265
+42 2.49 0.630056 5.91837
+43 2.55 0.815313 6.30612
+44 2.61 1.18787 6.89796
+45 2.67 1.13508 7.4898
+46 2.73 0.748787 7.89796
+47 2.79 0.681082 8.28571
+48 2.85 0.893179 8.81633
+49 2.91 0.823777 9.32653
+50 2.97 1.10716 10.0408
+100600 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 2.55534 0.0204082
+7 0.39 0 0.0204082
+8 0.45 1.37595 0.0408163
+9 0.51 0 0.0408163
+10 0.57 0 0.0408163
+11 0.63 0 0.0408163
+12 0.69 0 0.0408163
+13 0.75 0.495812 0.0612245
+14 0.81 0.850222 0.102041
+15 0.87 0.737039 0.142857
+16 0.93 2.58015 0.306122
+17 0.99 1.13849 0.387755
+18 1.05 1.01213 0.469388
+19 1.11 0.679267 0.530612
+20 1.17 0.6114 0.591837
+21 1.23 0.737623 0.673469
+22 1.29 0.838269 0.77551
+23 1.35 0.459254 0.836735
+24 1.41 0.842013 0.959184
+25 1.47 0.387344 1.02041
+26 1.53 0.238376 1.06122
+27 1.59 1.76582 1.38776
+28 1.65 1.22981 1.63265
+29 1.71 1.43128 1.93878
+30 1.77 0.80154 2.12245
+31 1.83 0.416582 2.22449
+32 1.89 0.859219 2.44898
+33 1.95 1.46757 2.85714
+34 2.01 1.51939 3.30612
+35 2.07 0.846532 3.57143
+36 2.13 0.861016 3.85714
+37 2.19 1.10537 4.2449
+38 2.25 0.992094 4.61224
+39 2.31 0.784357 4.91837
+40 2.37 0.99353 5.32653
+41 2.43 0.75606 5.65306
+42 2.49 0.945085 6.08163
+43 2.55 0.772402 6.44898
+44 2.61 0.901143 6.89796
+45 2.67 1.0568 7.44898
+46 2.73 1.4227 8.22449
+47 2.79 1.0037 8.79592
+48 2.85 1.06494 9.42857
+49 2.91 0.92263 10
+50 2.97 1.10716 10.7143
+100650 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 0 0
+9 0.51 1.07159 0.0204082
+10 0.57 0.858066 0.0408163
+11 0.63 0.702525 0.0612245
+12 0.69 1.17146 0.102041
+13 0.75 2.47906 0.204082
+14 0.81 1.70044 0.285714
+15 0.87 0.368519 0.306122
+16 0.93 0.322518 0.326531
+17 0.99 0 0.326531
+18 1.05 1.77122 0.469388
+19 1.11 0.679267 0.530612
+20 1.17 0.4076 0.571429
+21 1.23 0.553218 0.632653
+22 1.29 1.00592 0.755102
+23 1.35 0.612339 0.836735
+24 1.41 1.54369 1.06122
+25 1.47 1.03292 1.22449
+26 1.53 0.953504 1.38776
+27 1.59 0.33109 1.44898
+28 1.65 1.22981 1.69388
+29 1.71 0.286257 1.7551
+30 1.77 0.17812 1.79592
+31 1.83 0.916479 2.02041
+32 1.89 0.702997 2.20408
+33 1.95 1.24743 2.55102
+34 2.01 1.03595 2.85714
+35 2.07 1.36747 3.28571
+36 2.13 1.10702 3.65306
+37 2.19 0.989019 4
+38 2.25 1.32279 4.4898
+39 2.31 1.04581 4.89796
+40 2.37 1.24191 5.40816
+41 2.43 1.18134 5.91837
+42 2.49 0.990089 6.36735
+43 2.55 0.944046 6.81633
+44 2.61 0.737299 7.18367
+45 2.67 1.13508 7.77551
+46 2.73 0.973423 8.30612
+47 2.79 1.07539 8.91837
+48 2.85 1.37412 9.73469
+49 2.91 0.823777 10.2449
+50 2.97 1.0439 10.9184
+100700 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 0 0
+9 0.51 0 0
+10 0.57 0 0
+11 0.63 0.702525 0.0204082
+12 0.69 1.7572 0.0816327
+13 0.75 0.495812 0.102041
+14 0.81 0.425111 0.122449
+15 0.87 0.368519 0.142857
+16 0.93 0.322518 0.163265
+17 0.99 0.569243 0.204082
+18 1.05 0.253031 0.22449
+19 1.11 0.90569 0.306122
+20 1.17 0.8152 0.387755
+21 1.23 0.368812 0.428571
+22 1.29 1.00592 0.55102
+23 1.35 1.37776 0.734694
+24 1.41 0.842013 0.857143
+25 1.47 1.42026 1.08163
+26 1.53 1.43026 1.32653
+27 1.59 0.993271 1.5102
+28 1.65 0.717387 1.65306
+29 1.71 1.24045 1.91837
+30 1.77 0.4453 2.02041
+31 1.83 1.41638 2.36735
+32 1.89 0.937329 2.61224
+33 1.95 1.17405 2.93878
+34 2.01 1.51939 3.38776
+35 2.07 1.107 3.73469
+36 2.13 0.922517 4.04082
+37 2.19 1.22173 4.46939
+38 2.25 0.826745 4.77551
+39 2.31 0.993519 5.16327
+40 2.37 0.943854 5.55102
+41 2.43 1.08684 6.02041
+42 2.49 0.945085 6.44898
+43 2.55 1.07278 6.95918
+44 2.61 0.77826 7.34694
+45 2.67 0.93938 7.83673
+46 2.73 0.898544 8.32653
+47 2.79 1.21878 9.02041
+48 2.85 1.06494 9.65306
+49 2.91 0.856728 10.1837
+50 2.97 1.3286 11.0408
+100750 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 0 0
+9 0.51 0 0
+10 0.57 1.71613 0.0408163
+11 0.63 0.702525 0.0612245
+12 0.69 0.585732 0.0816327
+13 0.75 1.48744 0.142857
+14 0.81 0.425111 0.163265
+15 0.87 0 0.163265
+16 0.93 0.967555 0.22449
+17 0.99 0.569243 0.265306
+18 1.05 0.253031 0.285714
+19 1.11 0.452845 0.326531
+20 1.17 1.019 0.428571
+21 1.23 1.10644 0.55102
+22 1.29 0.838269 0.653061
+23 1.35 1.53085 0.857143
+24 1.41 0.421006 0.918367
+25 1.47 1.29115 1.12245
+26 1.53 0.476752 1.20408
+27 1.59 0.882908 1.36735
+28 1.65 1.02484 1.57143
+29 1.71 0.954189 1.77551
+30 1.77 1.15778 2.04082
+31 1.83 1.24974 2.34694
+32 1.89 1.01544 2.61224
+33 1.95 1.10067 2.91837
+34 2.01 1.10501 3.2449
+35 2.07 0.976768 3.55102
+36 2.13 1.16852 3.93878
+37 2.19 0.814486 4.22449
+38 2.25 0.826745 4.53061
+39 2.31 0.993519 4.91837
+40 2.37 0.695471 5.20408
+41 2.43 1.37036 5.79592
+42 2.49 0.765068 6.14286
+43 2.55 1.24442 6.73469
+44 2.61 1.14691 7.30612
+45 2.67 1.33079 8
+46 2.73 1.08574 8.59184
+47 2.79 0.860314 9.08163
+48 2.85 0.927532 9.63265
+49 2.91 0.626071 10.0204
+50 2.97 0.822464 10.551
+100800 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 0 0
+9 0.51 1.07159 0.0204082
+10 0.57 0 0.0204082
+11 0.63 2.10758 0.0816327
+12 0.69 1.17146 0.122449
+13 0.75 1.98325 0.204082
+14 0.81 0.425111 0.22449
+15 0.87 1.47408 0.306122
+16 0.93 0.322518 0.326531
+17 0.99 0.284622 0.346939
+18 1.05 1.01213 0.428571
+19 1.11 0.452845 0.469388
+20 1.17 1.019 0.571429
+21 1.23 0.737623 0.653061
+22 1.29 0.670615 0.734694
+23 1.35 0.153085 0.755102
+24 1.41 0.842013 0.877551
+25 1.47 0.516459 0.959184
+26 1.53 0.59594 1.06122
+27 1.59 0.551817 1.16327
+28 1.65 0.922354 1.34694
+29 1.71 1.04961 1.57143
+30 1.77 1.15778 1.83673
+31 1.83 1.33306 2.16327
+32 1.89 1.40599 2.53061
+33 1.95 0.660405 2.71429
+34 2.01 0.897822 2.97959
+35 2.07 1.17212 3.34694
+36 2.13 1.04552 3.69388
+37 2.19 1.22173 4.12245
+38 2.25 1.10233 4.53061
+39 2.31 1.20268 5
+40 2.37 1.04321 5.42857
+41 2.43 0.661553 5.71429
+42 2.49 1.03509 6.18367
+43 2.55 1.07278 6.69388
+44 2.61 1.06499 7.22449
+45 2.67 0.861099 7.67347
+46 2.73 1.19806 8.32653
+47 2.79 0.967854 8.87755
+48 2.85 1.168 9.57143
+49 2.91 1.02148 10.2041
+50 2.97 0.854097 10.7551
+100850 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 0 0
+9 0.51 0 0
+10 0.57 0.858066 0.0204082
+11 0.63 0 0.0204082
+12 0.69 0 0.0204082
+13 0.75 1.98325 0.102041
+14 0.81 0.850222 0.142857
+15 0.87 0.368519 0.163265
+16 0.93 0.322518 0.183673
+17 0.99 0.284622 0.204082
+18 1.05 0.253031 0.22449
+19 1.11 0.452845 0.265306
+20 1.17 0.6114 0.326531
+21 1.23 1.65965 0.510204
+22 1.29 0.670615 0.591837
+23 1.35 0.918509 0.714286
+24 1.41 1.12268 0.877551
+25 1.47 0.774689 1
+26 1.53 0.59594 1.10204
+27 1.59 1.10363 1.30612
+28 1.65 1.22981 1.55102
+29 1.71 0.85877 1.73469
+30 1.77 1.06872 1.97959
+31 1.83 1.08311 2.2449
+32 1.89 0.859219 2.46939
+33 1.95 1.10067 2.77551
+34 2.01 1.45033 3.20408
+35 2.07 1.107 3.55102
+36 2.13 1.59903 4.08163
+37 2.19 0.639953 4.30612
+38 2.25 0.661396 4.55102
+39 2.31 0.784357 4.85714
+40 2.37 1.39094 5.42857
+41 2.43 0.850568 5.79592
+42 2.49 0.630056 6.08163
+43 2.55 0.72949 6.42857
+44 2.61 1.26979 7.06122
+45 2.67 1.13508 7.65306
+46 2.73 0.935984 8.16327
+47 2.79 0.752775 8.59184
+48 2.85 0.893179 9.12245
+49 2.91 1.02148 9.7551
+50 2.97 1.0439 10.4286
+100900 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 0 0
+9 0.51 1.07159 0.0204082
+10 0.57 0 0.0204082
+11 0.63 0.702525 0.0408163
+12 0.69 2.92866 0.142857
+13 0.75 0.495812 0.163265
+14 0.81 0.850222 0.204082
+15 0.87 1.8426 0.306122
+16 0.93 1.93511 0.428571
+17 0.99 0.853865 0.489796
+18 1.05 1.77122 0.632653
+19 1.11 0.452845 0.673469
+20 1.17 0.6114 0.734694
+21 1.23 1.47525 0.897959
+22 1.29 0.670615 0.979592
+23 1.35 1.07159 1.12245
+24 1.41 0.701677 1.22449
+25 1.47 0.903804 1.36735
+26 1.53 0.834316 1.5102
+27 1.59 1.214 1.73469
+28 1.65 1.12732 1.95918
+29 1.71 1.24045 2.22449
+30 1.77 0.53436 2.34694
+31 1.83 0.749847 2.53061
+32 1.89 1.09355 2.81633
+33 1.95 0.953918 3.08163
+34 2.01 0.897822 3.34694
+35 2.07 0.520943 3.5102
+36 2.13 0.492009 3.67347
+37 2.19 1.0472 4.04082
+38 2.25 0.551163 4.2449
+39 2.31 0.679776 4.5102
+40 2.37 0.894177 4.87755
+41 2.43 1.13409 5.36735
+42 2.49 0.855076 5.7551
+43 2.55 1.07278 6.26531
+44 2.61 1.06499 6.79592
+45 2.67 1.17423 7.40816
+46 2.73 1.46013 8.20408
+47 2.79 1.07539 8.81633
+48 2.85 0.824473 9.30612
+49 2.91 0.955581 9.89796
+50 2.97 1.01226 10.551
+100950 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 1.37595 0.0204082
+9 0.51 1.07159 0.0408163
+10 0.57 1.71613 0.0816327
+11 0.63 2.10758 0.142857
+12 0.69 0.585732 0.163265
+13 0.75 0.495812 0.183673
+14 0.81 0.425111 0.204082
+15 0.87 0.368519 0.22449
+16 0.93 0.645037 0.265306
+17 0.99 2.27697 0.428571
+18 1.05 1.01213 0.510204
+19 1.11 0.452845 0.55102
+20 1.17 1.6304 0.714286
+21 1.23 0.922029 0.816327
+22 1.29 0.335308 0.857143
+23 1.35 1.83702 1.10204
+24 1.41 1.12268 1.26531
+25 1.47 0.774689 1.38776
+26 1.53 1.07269 1.57143
+27 1.59 0.993271 1.7551
+28 1.65 1.12732 1.97959
+29 1.71 0.763351 2.14286
+30 1.77 0.71248 2.30612
+31 1.83 0.999796 2.55102
+32 1.89 0.624886 2.71429
+33 1.95 0.953918 2.97959
+34 2.01 0.759695 3.20408
+35 2.07 0.520943 3.36735
+36 2.13 0.799515 3.63265
+37 2.19 0.930841 3.95918
+38 2.25 1.04721 4.34694
+39 2.31 0.836648 4.67347
+40 2.37 0.844501 5.02041
+41 2.43 0.708807 5.32653
+42 2.49 0.990089 5.77551
+43 2.55 0.815313 6.16327
+44 2.61 0.819221 6.57143
+45 2.67 0.978521 7.08163
+46 2.73 1.01086 7.63265
+47 2.79 1.07539 8.2449
+48 2.85 0.755767 8.69388
+49 2.91 0.988533 9.30612
+50 2.97 1.01226 9.95918
+101000 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 0 0
+9 0.51 0 0
+10 0.57 0.858066 0.0204082
+11 0.63 0.702525 0.0408163
+12 0.69 1.17146 0.0816327
+13 0.75 0.495812 0.102041
+14 0.81 0.850222 0.142857
+15 0.87 1.10556 0.204082
+16 0.93 0.967555 0.265306
+17 0.99 0.569243 0.306122
+18 1.05 0.253031 0.326531
+19 1.11 0.90569 0.408163
+20 1.17 0.6114 0.469388
+21 1.23 1.10644 0.591837
+22 1.29 0.335308 0.632653
+23 1.35 1.07159 0.77551
+24 1.41 0.421006 0.836735
+25 1.47 1.29115 1.04082
+26 1.53 0.715128 1.16327
+27 1.59 0.993271 1.34694
+28 1.65 1.02484 1.55102
+29 1.71 0.763351 1.71429
+30 1.77 0.979661 1.93878
+31 1.83 0.833163 2.14286
+32 1.89 0.937329 2.38776
+33 1.95 0.807161 2.61224
+34 2.01 1.51939 3.06122
+35 2.07 0.781414 3.30612
+36 2.13 0.922517 3.61224
+37 2.19 0.930841 3.93878
+38 2.25 0.936978 4.28571
+39 2.31 1.20268 4.7551
+40 2.37 0.844501 5.10204
+41 2.43 1.46487 5.73469
+42 2.49 1.1701 6.26531
+43 2.55 0.772402 6.63265
+44 2.61 0.655377 6.95918
+45 2.67 1.25251 7.61224
+46 2.73 0.973423 8.14286
+47 2.79 1.18293 8.81633
+48 2.85 0.858826 9.32653
+49 2.91 1.05443 9.97959
+50 2.97 1.01226 10.6327
+101050 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 2.55534 0.0204082
+7 0.39 0 0.0204082
+8 0.45 0 0.0204082
+9 0.51 0 0.0204082
+10 0.57 0.858066 0.0408163
+11 0.63 1.40505 0.0816327
+12 0.69 0.585732 0.102041
+13 0.75 0.495812 0.122449
+14 0.81 0.425111 0.142857
+15 0.87 1.47408 0.22449
+16 0.93 2.25763 0.367347
+17 0.99 0.284622 0.387755
+18 1.05 0.253031 0.408163
+19 1.11 1.13211 0.510204
+20 1.17 0.6114 0.571429
+21 1.23 1.47525 0.734694
+22 1.29 1.34123 0.897959
+23 1.35 0.612339 0.979592
+24 1.41 1.40335 1.18367
+25 1.47 0.903804 1.32653
+26 1.53 1.19188 1.53061
+27 1.59 0.993271 1.71429
+28 1.65 0.922354 1.89796
+29 1.71 1.04961 2.12245
+30 1.77 1.24684 2.40816
+31 1.83 0.749847 2.59184
+32 1.89 0.624886 2.7551
+33 1.95 0.953918 3.02041
+34 2.01 1.03595 3.32653
+35 2.07 0.846532 3.59184
+36 2.13 0.861016 3.87755
+37 2.19 0.989019 4.22449
+38 2.25 0.881861 4.55102
+39 2.31 0.575195 4.77551
+40 2.37 0.745148 5.08163
+41 2.43 1.18134 5.59184
+42 2.49 1.0801 6.08163
+43 2.55 0.858224 6.4898
+44 2.61 1.14691 7.06122
+45 2.67 0.861099 7.5102
+46 2.73 0.673908 7.87755
+47 2.79 0.824468 8.34694
+48 2.85 0.961885 8.91837
+49 2.91 1.02148 9.55102
+50 2.97 0.569398 9.91837
+101100 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 0 0
+9 0.51 0 0
+10 0.57 3.43226 0.0816327
+11 0.63 0.702525 0.102041
+12 0.69 1.17146 0.142857
+13 0.75 1.48744 0.204082
+14 0.81 0.425111 0.22449
+15 0.87 0.368519 0.244898
+16 0.93 0.322518 0.265306
+17 0.99 1.13849 0.346939
+18 1.05 0.253031 0.367347
+19 1.11 0.679267 0.428571
+20 1.17 0.8152 0.510204
+21 1.23 0.553218 0.571429
+22 1.29 1.34123 0.734694
+23 1.35 1.07159 0.877551
+24 1.41 0.280671 0.918367
+25 1.47 1.03292 1.08163
+26 1.53 0.834316 1.22449
+27 1.59 1.10363 1.42857
+28 1.65 1.22981 1.67347
+29 1.71 0.667932 1.81633
+30 1.77 1.06872 2.06122
+31 1.83 0.66653 2.22449
+32 1.89 1.01544 2.4898
+33 1.95 1.32081 2.85714
+34 2.01 1.03595 3.16327
+35 2.07 0.976768 3.46939
+36 2.13 0.738014 3.71429
+37 2.19 1.0472 4.08163
+38 2.25 1.10233 4.4898
+39 2.31 0.627486 4.73469
+40 2.37 1.04321 5.16327
+41 2.43 0.803314 5.5102
+42 2.49 0.810072 5.87755
+43 2.55 1.20151 6.44898
+44 2.61 1.10595 7
+45 2.67 1.0568 7.55102
+46 2.73 0.898544 8.04082
+47 2.79 1.03955 8.63265
+48 2.85 0.858826 9.14286
+49 2.91 1.05443 9.79592
+50 2.97 0.98063 10.4286
+101150 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 1.83099 0.0204082
+8 0.45 1.37595 0.0408163
+9 0.51 1.07159 0.0612245
+10 0.57 0 0.0612245
+11 0.63 2.10758 0.122449
+12 0.69 1.17146 0.163265
+13 0.75 0.991624 0.204082
+14 0.81 0.425111 0.22449
+15 0.87 0.737039 0.265306
+16 0.93 1.93511 0.387755
+17 0.99 1.13849 0.469388
+18 1.05 0 0.469388
+19 1.11 0.90569 0.55102
+20 1.17 0.8152 0.632653
+21 1.23 0.737623 0.714286
+22 1.29 0.335308 0.755102
+23 1.35 0.153085 0.77551
+24 1.41 1.26302 0.959184
+25 1.47 0.387344 1.02041
+26 1.53 0.59594 1.12245
+27 1.59 0.33109 1.18367
+28 1.65 1.43477 1.46939
+29 1.71 1.04961 1.69388
+30 1.77 0.35624 1.77551
+31 1.83 0.916479 2
+32 1.89 0.859219 2.22449
+33 1.95 1.39419 2.61224
+34 2.01 0.966885 2.89796
+35 2.07 1.36747 3.32653
+36 2.13 0.799515 3.59184
+37 2.19 0.930841 3.91837
+38 2.25 1.04721 4.30612
+39 2.31 1.20268 4.77551
+40 2.37 1.14256 5.2449
+41 2.43 0.897822 5.63265
+42 2.49 0.720064 5.95918
+43 2.55 1.07278 6.46939
+44 2.61 1.10595 7.02041
+45 2.67 0.782817 7.42857
+46 2.73 0.711348 7.81633
+47 2.79 1.11124 8.44898
+48 2.85 0.927532 9
+49 2.91 0.955581 9.59184
+50 2.97 1.0439 10.2653
+101200 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 1.83099 0.0204082
+8 0.45 0 0.0204082
+9 0.51 2.14319 0.0612245
+10 0.57 0 0.0612245
+11 0.63 0.702525 0.0816327
+12 0.69 0.585732 0.102041
+13 0.75 0.495812 0.122449
+14 0.81 1.70044 0.204082
+15 0.87 0 0.204082
+16 0.93 0.645037 0.244898
+17 0.99 0.853865 0.306122
+18 1.05 1.01213 0.387755
+19 1.11 0.679267 0.44898
+20 1.17 0.6114 0.510204
+21 1.23 1.84406 0.714286
+22 1.29 1.00592 0.836735
+23 1.35 1.22468 1
+24 1.41 0.982348 1.14286
+25 1.47 1.16203 1.32653
+26 1.53 1.66863 1.61224
+27 1.59 0.551817 1.71429
+28 1.65 0.512419 1.81633
+29 1.71 1.04961 2.04082
+30 1.77 0.979661 2.26531
+31 1.83 0.749847 2.44898
+32 1.89 0.859219 2.67347
+33 1.95 0.953918 2.93878
+34 2.01 1.24314 3.30612
+35 2.07 1.23724 3.69388
+36 2.13 0.799515 3.95918
+37 2.19 0.930841 4.28571
+38 2.25 0.826745 4.59184
+39 2.31 0.888938 4.93878
+40 2.37 1.09288 5.38776
+41 2.43 0.897822 5.77551
+42 2.49 1.03509 6.2449
+43 2.55 0.944046 6.69388
+44 2.61 0.737299 7.06122
+45 2.67 0.861099 7.5102
+46 2.73 0.636469 7.85714
+47 2.79 1.03955 8.44898
+48 2.85 0.824473 8.93878
+49 2.91 0.889679 9.4898
+50 2.97 0.88573 10.0612
+101250 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 1.37595 0.0204082
+9 0.51 0 0.0204082
+10 0.57 0.858066 0.0408163
+11 0.63 0.702525 0.0612245
+12 0.69 2.34293 0.142857
+13 0.75 0 0.142857
+14 0.81 0.425111 0.163265
+15 0.87 0.368519 0.183673
+16 0.93 1.29007 0.265306
+17 0.99 0.853865 0.326531
+18 1.05 0.506063 0.367347
+19 1.11 0.226422 0.387755
+20 1.17 0.8152 0.469388
+21 1.23 1.29084 0.612245
+22 1.29 0.335308 0.653061
+23 1.35 1.07159 0.795918
+24 1.41 0.701677 0.897959
+25 1.47 0.774689 1.02041
+26 1.53 0.238376 1.06122
+27 1.59 0.882908 1.22449
+28 1.65 0.922354 1.40816
+29 1.71 0.954189 1.61224
+30 1.77 0.979661 1.83673
+31 1.83 0.916479 2.06122
+32 1.89 0.546775 2.20408
+33 1.95 1.24743 2.55102
+34 2.01 1.3122 2.93878
+35 2.07 1.23724 3.32653
+36 2.13 0.615011 3.53061
+37 2.19 1.10537 3.91837
+38 2.25 0.771629 4.20408
+39 2.31 0.836648 4.53061
+40 2.37 1.24191 5.04082
+41 2.43 0.897822 5.42857
+42 2.49 1.1701 5.95918
+43 2.55 1.24442 6.55102
+44 2.61 0.77826 6.93878
+45 2.67 0.782817 7.34694
+46 2.73 0.973423 7.87755
+47 2.79 0.752775 8.30612
+48 2.85 0.858826 8.81633
+49 2.91 0.955581 9.40816
+50 2.97 1.0439 10.0816
+101300 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 1.37595 0.0204082
+9 0.51 2.14319 0.0612245
+10 0.57 0 0.0612245
+11 0.63 1.40505 0.102041
+12 0.69 2.34293 0.183673
+13 0.75 0.495812 0.204082
+14 0.81 0.850222 0.244898
+15 0.87 0.368519 0.265306
+16 0.93 0.645037 0.306122
+17 0.99 0.853865 0.367347
+18 1.05 1.01213 0.44898
+19 1.11 0.452845 0.489796
+20 1.17 1.2228 0.612245
+21 1.23 1.47525 0.77551
+22 1.29 1.34123 0.938776
+23 1.35 0.612339 1.02041
+24 1.41 0.701677 1.12245
+25 1.47 0.25823 1.16327
+26 1.53 0.715128 1.28571
+27 1.59 1.10363 1.4898
+28 1.65 0.614903 1.61224
+29 1.71 0.85877 1.79592
+30 1.77 1.15778 2.06122
+31 1.83 0.833163 2.26531
+32 1.89 0.624886 2.42857
+33 1.95 0.953918 2.69388
+34 2.01 0.621569 2.87755
+35 2.07 1.30236 3.28571
+36 2.13 0.676513 3.5102
+37 2.19 1.22173 3.93878
+38 2.25 0.661396 4.18367
+39 2.31 0.888938 4.53061
+40 2.37 1.29159 5.06122
+41 2.43 0.661553 5.34694
+42 2.49 0.855076 5.73469
+43 2.55 0.986958 6.20408
+44 2.61 1.06499 6.73469
+45 2.67 0.93938 7.22449
+46 2.73 1.08574 7.81633
+47 2.79 0.932007 8.34694
+48 2.85 0.961885 8.91837
+49 2.91 1.05443 9.57143
+50 2.97 0.790831 10.0816
+101350 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 2.55534 0.0204082
+7 0.39 0 0.0204082
+8 0.45 0 0.0204082
+9 0.51 0 0.0204082
+10 0.57 0.858066 0.0408163
+11 0.63 1.40505 0.0816327
+12 0.69 1.17146 0.122449
+13 0.75 1.48744 0.183673
+14 0.81 1.27533 0.244898
+15 0.87 1.10556 0.306122
+16 0.93 0.645037 0.346939
+17 0.99 0.853865 0.408163
+18 1.05 0.759094 0.469388
+19 1.11 1.13211 0.571429
+20 1.17 0.8152 0.653061
+21 1.23 1.29084 0.795918
+22 1.29 0.502961 0.857143
+23 1.35 0.459254 0.918367
+24 1.41 0.982348 1.06122
+25 1.47 0.903804 1.20408
+26 1.53 0.59594 1.30612
+27 1.59 0.441454 1.38776
+28 1.65 0.614903 1.5102
+29 1.71 1.24045 1.77551
+30 1.77 1.06872 2.02041
+31 1.83 1.49969 2.38776
+32 1.89 0.859219 2.61224
+33 1.95 0.880539 2.85714
+34 2.01 0.966885 3.14286
+35 2.07 1.107 3.4898
+36 2.13 0.984018 3.81633
+37 2.19 0.639953 4.04082
+38 2.25 1.10233 4.44898
+39 2.31 1.15039 4.89796
+40 2.37 0.844501 5.2449
+41 2.43 0.708807 5.55102
+42 2.49 0.945085 5.97959
+43 2.55 0.815313 6.36735
+44 2.61 1.26979 7
+45 2.67 1.09594 7.57143
+46 2.73 1.19806 8.22449
+47 2.79 0.932007 8.7551
+48 2.85 0.755767 9.20408
+49 2.91 1.05443 9.85714
+50 2.97 0.948997 10.4694
+101400 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 0 0
+9 0.51 1.07159 0.0204082
+10 0.57 0.858066 0.0408163
+11 0.63 0.702525 0.0612245
+12 0.69 1.17146 0.102041
+13 0.75 1.48744 0.163265
+14 0.81 1.27533 0.22449
+15 0.87 0 0.22449
+16 0.93 1.61259 0.326531
+17 0.99 1.42311 0.428571
+18 1.05 1.51819 0.55102
+19 1.11 0.679267 0.612245
+20 1.17 0.4076 0.653061
+21 1.23 0.922029 0.755102
+22 1.29 1.17358 0.897959
+23 1.35 0.30617 0.938776
+24 1.41 0.561342 1.02041
+25 1.47 1.03292 1.18367
+26 1.53 0.476752 1.26531
+27 1.59 0.772544 1.40816
+28 1.65 1.12732 1.63265
+29 1.71 0.954189 1.83673
+30 1.77 0.890601 2.04082
+31 1.83 0.833163 2.2449
+32 1.89 0.624886 2.40816
+33 1.95 0.660405 2.59184
+34 2.01 0.897822 2.85714
+35 2.07 0.976768 3.16327
+36 2.13 0.922517 3.46939
+37 2.19 0.872664 3.77551
+38 2.25 1.21256 4.22449
+39 2.31 0.679776 4.4898
+40 2.37 1.14256 4.95918
+41 2.43 1.70114 5.69388
+42 2.49 1.30512 6.28571
+43 2.55 0.858224 6.69388
+44 2.61 1.22883 7.30612
+45 2.67 0.861099 7.7551
+46 2.73 0.823666 8.20408
+47 2.79 0.932007 8.73469
+48 2.85 1.168 9.42857
+49 2.91 0.988533 10.0408
+50 2.97 0.790831 10.551
+101450 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 2.55534 0.0204082
+7 0.39 1.83099 0.0408163
+8 0.45 0 0.0408163
+9 0.51 1.07159 0.0612245
+10 0.57 0 0.0612245
+11 0.63 0 0.0612245
+12 0.69 2.34293 0.142857
+13 0.75 0 0.142857
+14 0.81 0 0.142857
+15 0.87 1.10556 0.204082
+16 0.93 0.967555 0.265306
+17 0.99 1.42311 0.367347
+18 1.05 0.759094 0.428571
+19 1.11 0.226422 0.44898
+20 1.17 1.6304 0.612245
+21 1.23 1.47525 0.77551
+22 1.29 1.00592 0.897959
+23 1.35 0.918509 1.02041
+24 1.41 1.54369 1.2449
+25 1.47 0.903804 1.38776
+26 1.53 0.476752 1.46939
+27 1.59 0.33109 1.53061
+28 1.65 0.922354 1.71429
+29 1.71 0.954189 1.91837
+30 1.77 1.06872 2.16327
+31 1.83 0.999796 2.40816
+32 1.89 1.09355 2.69388
+33 1.95 0.660405 2.87755
+34 2.01 0.759695 3.10204
+35 2.07 0.846532 3.36735
+36 2.13 1.29152 3.79592
+37 2.19 1.16355 4.20408
+38 2.25 0.992094 4.57143
+39 2.31 0.993519 4.95918
+40 2.37 0.99353 5.36735
+41 2.43 1.08684 5.83673
+42 2.49 1.1701 6.36735
+43 2.55 1.24442 6.95918
+44 2.61 1.26979 7.59184
+45 2.67 1.21337 8.22449
+46 2.73 0.898544 8.71429
+47 2.79 0.609389 9.06122
+48 2.85 0.721414 9.4898
+49 2.91 0.856728 10.0204
+50 2.97 1.0439 10.6939
+101500 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 2.55534 0.0204082
+7 0.39 0 0.0204082
+8 0.45 0 0.0204082
+9 0.51 0 0.0204082
+10 0.57 2.5742 0.0816327
+11 0.63 0 0.0816327
+12 0.69 0.585732 0.102041
+13 0.75 0 0.102041
+14 0.81 0.425111 0.122449
+15 0.87 1.10556 0.183673
+16 0.93 0.967555 0.244898
+17 0.99 0.853865 0.306122
+18 1.05 1.51819 0.428571
+19 1.11 0.226422 0.44898
+20 1.17 1.4266 0.591837
+21 1.23 0.553218 0.653061
+22 1.29 0.670615 0.734694
+23 1.35 0.765424 0.836735
+24 1.41 0.701677 0.938776
+25 1.47 1.03292 1.10204
+26 1.53 1.19188 1.30612
+27 1.59 1.10363 1.5102
+28 1.65 0.614903 1.63265
+29 1.71 1.5267 1.95918
+30 1.77 0.80154 2.14286
+31 1.83 0.833163 2.34694
+32 1.89 0.781108 2.55102
+33 1.95 0.733783 2.7551
+34 2.01 0.897822 3.02041
+35 2.07 0.586061 3.20408
+36 2.13 1.29152 3.63265
+37 2.19 0.872664 3.93878
+38 2.25 1.26768 4.40816
+39 2.31 1.30726 4.91837
+40 2.37 0.894177 5.28571
+41 2.43 0.897822 5.67347
+42 2.49 0.990089 6.12245
+43 2.55 1.02987 6.61224
+44 2.61 0.942104 7.08163
+45 2.67 0.861099 7.53061
+46 2.73 0.898544 8.02041
+47 2.79 1.07539 8.63265
+48 2.85 0.549649 8.95918
+49 2.91 1.38395 9.81633
+50 2.97 0.948997 10.4286
+101550 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 2.55534 0.0204082
+7 0.39 0 0.0204082
+8 0.45 0 0.0204082
+9 0.51 0 0.0204082
+10 0.57 0 0.0204082
+11 0.63 0.702525 0.0408163
+12 0.69 0 0.0408163
+13 0.75 0 0.0408163
+14 0.81 1.27533 0.102041
+15 0.87 1.10556 0.163265
+16 0.93 1.93511 0.285714
+17 0.99 1.42311 0.387755
+18 1.05 1.01213 0.469388
+19 1.11 0.90569 0.55102
+20 1.17 0.2038 0.571429
+21 1.23 0.184406 0.591837
+22 1.29 0.670615 0.673469
+23 1.35 1.22468 0.836735
+24 1.41 1.12268 1
+25 1.47 0.903804 1.14286
+26 1.53 1.07269 1.32653
+27 1.59 0.993271 1.5102
+28 1.65 1.02484 1.71429
+29 1.71 1.5267 2.04082
+30 1.77 0.53436 2.16327
+31 1.83 0.833163 2.36735
+32 1.89 0.546775 2.5102
+33 1.95 1.0273 2.79592
+34 2.01 0.966885 3.08163
+35 2.07 0.651178 3.28571
+36 2.13 0.738014 3.53061
+37 2.19 0.989019 3.87755
+38 2.25 1.37791 4.38776
+39 2.31 1.25497 4.87755
+40 2.37 1.14256 5.34694
+41 2.43 0.75606 5.67347
+42 2.49 0.990089 6.12245
+43 2.55 1.37316 6.77551
+44 2.61 0.901143 7.22449
+45 2.67 1.01766 7.7551
+46 2.73 0.973423 8.28571
+47 2.79 1.0037 8.85714
+48 2.85 1.30542 9.63265
+49 2.91 0.955581 10.2245
+50 2.97 1.01226 10.8776
+101600 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 1.83099 0.0204082
+8 0.45 1.37595 0.0408163
+9 0.51 1.07159 0.0612245
+10 0.57 1.71613 0.102041
+11 0.63 1.40505 0.142857
+12 0.69 1.17146 0.183673
+13 0.75 0.991624 0.22449
+14 0.81 1.27533 0.285714
+15 0.87 1.8426 0.387755
+16 0.93 0.322518 0.408163
+17 0.99 0.853865 0.469388
+18 1.05 0.759094 0.530612
+19 1.11 0.90569 0.612245
+20 1.17 0 0.612245
+21 1.23 0.737623 0.693878
+22 1.29 0.838269 0.795918
+23 1.35 0.918509 0.918367
+24 1.41 0.701677 1.02041
+25 1.47 0.903804 1.16327
+26 1.53 1.19188 1.36735
+27 1.59 0.441454 1.44898
+28 1.65 0.819871 1.61224
+29 1.71 0.85877 1.79592
+30 1.77 0.979661 2.02041
+31 1.83 0.833163 2.22449
+32 1.89 1.17166 2.53061
+33 1.95 1.10067 2.83673
+34 2.01 0.966885 3.12245
+35 2.07 0.846532 3.38776
+36 2.13 0.738014 3.63265
+37 2.19 0.698131 3.87755
+38 2.25 0.936978 4.22449
+39 2.31 0.993519 4.61224
+40 2.37 0.99353 5.02041
+41 2.43 0.850568 5.38776
+42 2.49 1.30512 5.97959
+43 2.55 0.815313 6.36735
+44 2.61 1.10595 6.91837
+45 2.67 1.13508 7.5102
+46 2.73 1.0483 8.08163
+47 2.79 0.788621 8.53061
+48 2.85 1.0993 9.18367
+49 2.91 0.856728 9.71429
+50 2.97 0.822464 10.2449
+101650 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 0 0
+9 0.51 0 0
+10 0.57 0 0
+11 0.63 0 0
+12 0.69 1.17146 0.0408163
+13 0.75 0 0.0408163
+14 0.81 1.27533 0.102041
+15 0.87 0.737039 0.142857
+16 0.93 0.967555 0.204082
+17 0.99 1.42311 0.306122
+18 1.05 0.759094 0.367347
+19 1.11 0.90569 0.44898
+20 1.17 1.2228 0.571429
+21 1.23 0.553218 0.632653
+22 1.29 1.00592 0.755102
+23 1.35 0.765424 0.857143
+24 1.41 0.561342 0.938776
+25 1.47 0.645574 1.04082
+26 1.53 0.953504 1.20408
+27 1.59 0.882908 1.36735
+28 1.65 0.717387 1.5102
+29 1.71 1.24045 1.77551
+30 1.77 0.890601 1.97959
+31 1.83 0.999796 2.22449
+32 1.89 0.702997 2.40816
+33 1.95 0.807161 2.63265
+34 2.01 0.828758 2.87755
+35 2.07 0.716296 3.10204
+36 2.13 1.35303 3.55102
+37 2.19 1.22173 3.97959
+38 2.25 1.04721 4.36735
+39 2.31 1.0981 4.79592
+40 2.37 0.844501 5.14286
+41 2.43 1.37036 5.73469
+42 2.49 0.810072 6.10204
+43 2.55 0.600757 6.38776
+44 2.61 0.532493 6.65306
+45 2.67 1.17423 7.26531
+46 2.73 0.973423 7.79592
+47 2.79 0.860314 8.28571
+48 2.85 1.06494 8.91837
+49 2.91 1.28509 9.71429
+50 2.97 1.01226 10.3673
+101700 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 0 0
+9 0.51 2.14319 0.0408163
+10 0.57 0.858066 0.0612245
+11 0.63 0.702525 0.0816327
+12 0.69 0 0.0816327
+13 0.75 0.991624 0.122449
+14 0.81 0.850222 0.163265
+15 0.87 1.47408 0.244898
+16 0.93 0.967555 0.306122
+17 0.99 0.853865 0.367347
+18 1.05 0.506063 0.408163
+19 1.11 0.90569 0.489796
+20 1.17 0.4076 0.530612
+21 1.23 0.737623 0.612245
+22 1.29 1.00592 0.734694
+23 1.35 0.612339 0.816327
+24 1.41 1.40335 1.02041
+25 1.47 1.42026 1.2449
+26 1.53 0.238376 1.28571
+27 1.59 1.214 1.5102
+28 1.65 0.717387 1.65306
+29 1.71 0.763351 1.81633
+30 1.77 0.71248 1.97959
+31 1.83 1.24974 2.28571
+32 1.89 1.24977 2.61224
+33 1.95 0.880539 2.85714
+34 2.01 0.690632 3.06122
+35 2.07 0.91165 3.34694
+36 2.13 0.922517 3.65306
+37 2.19 1.0472 4.02041
+38 2.25 1.10233 4.42857
+39 2.31 1.15039 4.87755
+40 2.37 0.794824 5.20408
+41 2.43 0.661553 5.4898
+42 2.49 1.30512 6.08163
+43 2.55 0.858224 6.4898
+44 2.61 0.983065 6.97959
+45 2.67 1.25251 7.63265
+46 2.73 1.01086 8.18367
+47 2.79 1.14709 8.83673
+48 2.85 1.03059 9.44898
+49 2.91 1.18624 10.1837
+50 2.97 0.917363 10.7755
+101750 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 0 0
+9 0.51 0 0
+10 0.57 0 0
+11 0.63 0.702525 0.0204082
+12 0.69 0.585732 0.0408163
+13 0.75 0 0.0408163
+14 0.81 0 0.0408163
+15 0.87 0.737039 0.0816327
+16 0.93 1.29007 0.163265
+17 0.99 0 0.163265
+18 1.05 1.26516 0.265306
+19 1.11 1.58496 0.408163
+20 1.17 1.8342 0.591837
+21 1.23 0.368812 0.632653
+22 1.29 0.670615 0.714286
+23 1.35 1.37776 0.897959
+24 1.41 0.421006 0.959184
+25 1.47 1.16203 1.14286
+26 1.53 1.54944 1.40816
+27 1.59 0.882908 1.57143
+28 1.65 0.819871 1.73469
+29 1.71 0.85877 1.91837
+30 1.77 0.80154 2.10204
+31 1.83 0.749847 2.28571
+32 1.89 0.702997 2.46939
+33 1.95 0.660405 2.65306
+34 2.01 0.897822 2.91837
+35 2.07 1.04189 3.2449
+36 2.13 0.799515 3.5102
+37 2.19 1.45444 4.02041
+38 2.25 0.936978 4.36735
+39 2.31 1.15039 4.81633
+40 2.37 1.4903 5.42857
+41 2.43 1.03958 5.87755
+42 2.49 0.855076 6.26531
+43 2.55 1.11569 6.79592
+44 2.61 0.696338 7.14286
+45 2.67 0.978521 7.65306
+46 2.73 0.486712 7.91837
+47 2.79 0.896161 8.42857
+48 2.85 0.961885 9
+49 2.91 0.823777 9.5102
+50 2.97 0.917363 10.102
+101800 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 0 0
+9 0.51 0 0
+10 0.57 0.858066 0.0204082
+11 0.63 0 0.0204082
+12 0.69 0.585732 0.0408163
+13 0.75 0.495812 0.0612245
+14 0.81 0.850222 0.102041
+15 0.87 0.737039 0.142857
+16 0.93 0.322518 0.163265
+17 0.99 1.42311 0.265306
+18 1.05 1.01213 0.346939
+19 1.11 0.452845 0.387755
+20 1.17 0.4076 0.428571
+21 1.23 1.29084 0.571429
+22 1.29 0.838269 0.673469
+23 1.35 1.22468 0.836735
+24 1.41 1.12268 1
+25 1.47 0.903804 1.14286
+26 1.53 1.19188 1.34694
+27 1.59 1.10363 1.55102
+28 1.65 1.22981 1.79592
+29 1.71 0.954189 2
+30 1.77 1.42496 2.32653
+31 1.83 1.08311 2.59184
+32 1.89 0.624886 2.7551
+33 1.95 1.24743 3.10204
+34 2.01 0.759695 3.32653
+35 2.07 0.846532 3.59184
+36 2.13 0.984018 3.91837
+37 2.19 1.10537 4.30612
+38 2.25 0.771629 4.59184
+39 2.31 0.732067 4.87755
+40 2.37 1.04321 5.30612
+41 2.43 0.850568 5.67347
+42 2.49 1.1701 6.20408
+43 2.55 0.901135 6.63265
+44 2.61 1.10595 7.18367
+45 2.67 1.01766 7.71429
+46 2.73 1.12318 8.32653
+47 2.79 0.788621 8.77551
+48 2.85 1.06494 9.40816
+49 2.91 0.955581 10
+50 2.97 1.26533 10.8163
+101850 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 0 0
+9 0.51 1.07159 0.0204082
+10 0.57 0.858066 0.0408163
+11 0.63 0.702525 0.0612245
+12 0.69 0 0.0612245
+13 0.75 1.48744 0.122449
+14 0.81 0 0.122449
+15 0.87 1.8426 0.22449
+16 0.93 1.93511 0.346939
+17 0.99 1.13849 0.428571
+18 1.05 1.01213 0.510204
+19 1.11 2.26422 0.714286
+20 1.17 0.2038 0.734694
+21 1.23 0.922029 0.836735
+22 1.29 1.00592 0.959184
+23 1.35 0.765424 1.06122
+24 1.41 0.842013 1.18367
+25 1.47 0.645574 1.28571
+26 1.53 1.31107 1.5102
+27 1.59 0.882908 1.67347
+28 1.65 0.819871 1.83673
+29 1.71 1.14503 2.08163
+30 1.77 1.06872 2.32653
+31 1.83 0.749847 2.5102
+32 1.89 1.17166 2.81633
+33 1.95 0.953918 3.08163
+34 2.01 1.17407 3.42857
+35 2.07 1.107 3.77551
+36 2.13 0.738014 4.02041
+37 2.19 1.22173 4.44898
+38 2.25 0.992094 4.81633
+39 2.31 1.25497 5.30612
+40 2.37 1.19224 5.79592
+41 2.43 1.18134 6.30612
+42 2.49 0.765068 6.65306
+43 2.55 0.986958 7.12245
+44 2.61 0.942104 7.59184
+45 2.67 0.978521 8.10204
+46 2.73 1.01086 8.65306
+47 2.79 1.36216 9.42857
+48 2.85 0.824473 9.91837
+49 2.91 0.856728 10.449
+50 2.97 0.759197 10.9388
+101900 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 0 0
+9 0.51 1.07159 0.0204082
+10 0.57 2.5742 0.0816327
+11 0.63 0.702525 0.102041
+12 0.69 0.585732 0.122449
+13 0.75 0 0.122449
+14 0.81 1.27533 0.183673
+15 0.87 0.368519 0.204082
+16 0.93 0.645037 0.244898
+17 0.99 1.42311 0.346939
+18 1.05 1.01213 0.428571
+19 1.11 1.13211 0.530612
+20 1.17 0.2038 0.55102
+21 1.23 1.47525 0.714286
+22 1.29 0.670615 0.795918
+23 1.35 1.68393 1.02041
+24 1.41 1.12268 1.18367
+25 1.47 1.03292 1.34694
+26 1.53 1.31107 1.57143
+27 1.59 0.882908 1.73469
+28 1.65 0.307451 1.79592
+29 1.71 0.85877 1.97959
+30 1.77 1.06872 2.22449
+31 1.83 0.499898 2.34694
+32 1.89 0.859219 2.57143
+33 1.95 1.24743 2.91837
+34 2.01 0.966885 3.20408
+35 2.07 0.846532 3.46939
+36 2.13 0.676513 3.69388
+37 2.19 0.814486 3.97959
+38 2.25 1.04721 4.36735
+39 2.31 1.41184 4.91837
+40 2.37 0.844501 5.26531
+41 2.43 0.425284 5.44898
+42 2.49 0.765068 5.79592
+43 2.55 0.901135 6.22449
+44 2.61 0.942104 6.69388
+45 2.67 0.861099 7.14286
+46 2.73 0.935984 7.65306
+47 2.79 1.14709 8.30612
+48 2.85 1.23671 9.04082
+49 2.91 1.05443 9.69388
+50 2.97 1.0439 10.3673
+101950 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 0 0
+9 0.51 0 0
+10 0.57 0 0
+11 0.63 0.702525 0.0204082
+12 0.69 1.17146 0.0612245
+13 0.75 2.47906 0.163265
+14 0.81 1.70044 0.244898
+15 0.87 0 0.244898
+16 0.93 0.645037 0.285714
+17 0.99 1.13849 0.367347
+18 1.05 0.506063 0.408163
+19 1.11 1.35853 0.530612
+20 1.17 1.019 0.632653
+21 1.23 1.47525 0.795918
+22 1.29 0.838269 0.897959
+23 1.35 0.918509 1.02041
+24 1.41 1.26302 1.20408
+25 1.47 0.387344 1.26531
+26 1.53 0.953504 1.42857
+27 1.59 1.43472 1.69388
+28 1.65 0.409935 1.77551
+29 1.71 0.954189 1.97959
+30 1.77 1.3359 2.28571
+31 1.83 0.999796 2.53061
+32 1.89 0.937329 2.77551
+33 1.95 0.587026 2.93878
+34 2.01 1.3122 3.32653
+35 2.07 1.107 3.67347
+36 2.13 1.16852 4.06122
+37 2.19 1.22173 4.4898
+38 2.25 1.26768 4.95918
+39 2.31 0.888938 5.30612
+40 2.37 0.894177 5.67347
+41 2.43 1.03958 6.12245
+42 2.49 0.990089 6.57143
+43 2.55 1.24442 7.16327
+44 2.61 0.737299 7.53061
+45 2.67 1.33079 8.22449
+46 2.73 0.861105 8.69388
+47 2.79 0.788621 9.14286
+48 2.85 1.06494 9.77551
+49 2.91 1.15329 10.4898
+50 2.97 1.0439 11.1633
+102000 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 0 0
+9 0.51 0 0
+10 0.57 1.71613 0.0408163
+11 0.63 0.702525 0.0612245
+12 0.69 0 0.0612245
+13 0.75 0.991624 0.102041
+14 0.81 0.850222 0.142857
+15 0.87 1.47408 0.22449
+16 0.93 0.967555 0.285714
+17 0.99 0.853865 0.346939
+18 1.05 1.51819 0.469388
+19 1.11 0.452845 0.510204
+20 1.17 1.019 0.612245
+21 1.23 1.29084 0.755102
+22 1.29 1.17358 0.897959
+23 1.35 1.22468 1.06122
+24 1.41 0.701677 1.16327
+25 1.47 0.516459 1.2449
+26 1.53 1.19188 1.44898
+27 1.59 0.772544 1.59184
+28 1.65 1.33229 1.85714
+29 1.71 0.667932 2
+30 1.77 0.979661 2.22449
+31 1.83 1.08311 2.4898
+32 1.89 1.17166 2.79592
+33 1.95 0.733783 3
+34 2.01 0.897822 3.26531
+35 2.07 0.781414 3.5102
+36 2.13 0.922517 3.81633
+37 2.19 0.930841 4.14286
+38 2.25 1.21256 4.59184
+39 2.31 0.993519 4.97959
+40 2.37 1.14256 5.44898
+41 2.43 1.41761 6.06122
+42 2.49 0.810072 6.42857
+43 2.55 0.772402 6.79592
+44 2.61 0.614416 7.10204
+45 2.67 0.93938 7.59184
+46 2.73 1.0483 8.16327
+47 2.79 1.03955 8.7551
+48 2.85 0.961885 9.32653
+49 2.91 0.988533 9.93878
+50 2.97 1.10716 10.6531
+102050 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 0 0
+9 0.51 0 0
+10 0.57 0 0
+11 0.63 0.702525 0.0204082
+12 0.69 1.17146 0.0612245
+13 0.75 1.48744 0.122449
+14 0.81 0.850222 0.163265
+15 0.87 0.737039 0.204082
+16 0.93 0.967555 0.265306
+17 0.99 0.284622 0.285714
+18 1.05 1.51819 0.408163
+19 1.11 1.13211 0.510204
+20 1.17 0.8152 0.591837
+21 1.23 1.10644 0.714286
+22 1.29 1.34123 0.877551
+23 1.35 1.07159 1.02041
+24 1.41 1.26302 1.20408
+25 1.47 1.16203 1.38776
+26 1.53 1.31107 1.61224
+27 1.59 0.662181 1.73469
+28 1.65 0.819871 1.89796
+29 1.71 1.14503 2.14286
+30 1.77 0.80154 2.32653
+31 1.83 0.999796 2.57143
+32 1.89 1.09355 2.85714
+33 1.95 0.953918 3.12245
+34 2.01 0.828758 3.36735
+35 2.07 1.23724 3.7551
+36 2.13 0.861016 4.04082
+37 2.19 1.33808 4.5102
+38 2.25 1.32279 5
+39 2.31 1.25497 5.4898
+40 2.37 1.09288 5.93878
+41 2.43 0.945075 6.34694
+42 2.49 0.855076 6.73469
+43 2.55 0.858224 7.14286
+44 2.61 1.06499 7.67347
+45 2.67 0.861099 8.12245
+46 2.73 0.973423 8.65306
+47 2.79 0.932007 9.18367
+48 2.85 0.79012 9.65306
+49 2.91 1.18624 10.3878
+50 2.97 1.1388 11.1224
+102100 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 1.83099 0.0204082
+8 0.45 0 0.0204082
+9 0.51 0 0.0204082
+10 0.57 0 0.0204082
+11 0.63 0.702525 0.0408163
+12 0.69 0.585732 0.0612245
+13 0.75 0.495812 0.0816327
+14 0.81 0.425111 0.102041
+15 0.87 1.8426 0.204082
+16 0.93 1.61259 0.306122
+17 0.99 1.70773 0.428571
+18 1.05 0.506063 0.469388
+19 1.11 1.58496 0.612245
+20 1.17 1.6304 0.77551
+21 1.23 0.184406 0.795918
+22 1.29 0.502961 0.857143
+23 1.35 0.918509 0.979592
+24 1.41 0.701677 1.08163
+25 1.47 0.903804 1.22449
+26 1.53 0.834316 1.36735
+27 1.59 0.772544 1.5102
+28 1.65 0.614903 1.63265
+29 1.71 0.763351 1.79592
+30 1.77 1.3359 2.10204
+31 1.83 1.41638 2.44898
+32 1.89 1.01544 2.71429
+33 1.95 0.733783 2.91837
+34 2.01 1.17407 3.26531
+35 2.07 0.91165 3.55102
+36 2.13 0.984018 3.87755
+37 2.19 0.814486 4.16327
+38 2.25 0.661396 4.40816
+39 2.31 0.941229 4.77551
+40 2.37 0.99353 5.18367
+41 2.43 0.945075 5.59184
+42 2.49 1.0801 6.08163
+43 2.55 0.986958 6.55102
+44 2.61 1.10595 7.10204
+45 2.67 1.21337 7.73469
+46 2.73 1.01086 8.28571
+47 2.79 1.0037 8.85714
+48 2.85 1.13365 9.53061
+49 2.91 0.889679 10.0816
+50 2.97 0.917363 10.6735
+102150 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 1.83099 0.0204082
+8 0.45 0 0.0204082
+9 0.51 0 0.0204082
+10 0.57 0 0.0204082
+11 0.63 0 0.0204082
+12 0.69 0 0.0204082
+13 0.75 0.991624 0.0612245
+14 0.81 1.27533 0.122449
+15 0.87 0.737039 0.163265
+16 0.93 1.29007 0.244898
+17 0.99 1.42311 0.346939
+18 1.05 1.01213 0.428571
+19 1.11 0.452845 0.469388
+20 1.17 0.8152 0.55102
+21 1.23 0.922029 0.653061
+22 1.29 1.17358 0.795918
+23 1.35 0.918509 0.918367
+24 1.41 1.26302 1.10204
+25 1.47 0.645574 1.20408
+26 1.53 0.715128 1.32653
+27 1.59 1.43472 1.59184
+28 1.65 1.12732 1.81633
+29 1.71 1.33586 2.10204
+30 1.77 0.979661 2.32653
+31 1.83 1.08311 2.59184
+32 1.89 1.09355 2.87755
+33 1.95 0.953918 3.14286
+34 2.01 0.621569 3.32653
+35 2.07 1.30236 3.73469
+36 2.13 0.738014 3.97959
+37 2.19 1.16355 4.38776
+38 2.25 1.04721 4.77551
+39 2.31 0.888938 5.12245
+40 2.37 1.04321 5.55102
+41 2.43 1.60663 6.2449
+42 2.49 0.855076 6.63265
+43 2.55 0.944046 7.08163
+44 2.61 1.26979 7.71429
+45 2.67 0.665394 8.06122
+46 2.73 1.01086 8.61224
+47 2.79 1.29047 9.34694
+48 2.85 0.961885 9.91837
+49 2.91 0.823777 10.4286
+50 2.97 0.854097 10.9796
+102200 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 0 0
+9 0.51 1.07159 0.0204082
+10 0.57 0 0.0204082
+11 0.63 2.10758 0.0816327
+12 0.69 0.585732 0.102041
+13 0.75 1.48744 0.163265
+14 0.81 0.850222 0.204082
+15 0.87 0.737039 0.244898
+16 0.93 0.322518 0.265306
+17 0.99 1.99235 0.408163
+18 1.05 1.77122 0.55102
+19 1.11 0.90569 0.632653
+20 1.17 1.019 0.734694
+21 1.23 0.553218 0.795918
+22 1.29 1.50888 0.979592
+23 1.35 1.07159 1.12245
+24 1.41 0.421006 1.18367
+25 1.47 1.42026 1.40816
+26 1.53 0.59594 1.5102
+27 1.59 0.33109 1.57143
+28 1.65 0.717387 1.71429
+29 1.71 1.81296 2.10204
+30 1.77 0.71248 2.26531
+31 1.83 1.08311 2.53061
+32 1.89 1.71844 2.97959
+33 1.95 0.880539 3.22449
+34 2.01 1.03595 3.53061
+35 2.07 0.976768 3.83673
+36 2.13 0.738014 4.08163
+37 2.19 0.872664 4.38776
+38 2.25 1.04721 4.77551
+39 2.31 0.522905 4.97959
+40 2.37 1.44062 5.57143
+41 2.43 1.13409 6.06122
+42 2.49 0.900081 6.46939
+43 2.55 0.944046 6.91837
+44 2.61 1.26979 7.55102
+45 2.67 1.17423 8.16327
+46 2.73 1.08574 8.7551
+47 2.79 1.32632 9.5102
+48 2.85 0.961885 10.0816
+49 2.91 1.05443 10.7347
+50 2.97 0.917363 11.3265
+102250 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 1.83099 0.0204082
+8 0.45 2.7519 0.0612245
+9 0.51 0 0.0612245
+10 0.57 0 0.0612245
+11 0.63 1.40505 0.102041
+12 0.69 0.585732 0.122449
+13 0.75 2.47906 0.22449
+14 0.81 1.27533 0.285714
+15 0.87 2.21112 0.408163
+16 0.93 1.93511 0.530612
+17 0.99 1.13849 0.612245
+18 1.05 1.51819 0.734694
+19 1.11 0.226422 0.755102
+20 1.17 1.019 0.857143
+21 1.23 0.368812 0.897959
+22 1.29 0.335308 0.938776
+23 1.35 1.37776 1.12245
+24 1.41 1.12268 1.28571
+25 1.47 0.903804 1.42857
+26 1.53 0.715128 1.55102
+27 1.59 1.214 1.77551
+28 1.65 1.43477 2.06122
+29 1.71 0.85877 2.2449
+30 1.77 0.62342 2.38776
+31 1.83 0.749847 2.57143
+32 1.89 0.702997 2.7551
+33 1.95 1.32081 3.12245
+34 2.01 0.759695 3.34694
+35 2.07 1.04189 3.67347
+36 2.13 0.861016 3.95918
+37 2.19 1.16355 4.36735
+38 2.25 0.936978 4.71429
+39 2.31 0.575195 4.93878
+40 2.37 1.34127 5.4898
+41 2.43 0.945075 5.89796
+42 2.49 0.855076 6.28571
+43 2.55 1.07278 6.79592
+44 2.61 0.860182 7.22449
+45 2.67 1.0568 7.77551
+46 2.73 1.08574 8.36735
+47 2.79 0.967854 8.91837
+48 2.85 0.996238 9.5102
+49 2.91 1.02148 10.1429
+50 2.97 0.822464 10.6735
+102300 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 0 0
+9 0.51 0 0
+10 0.57 0 0
+11 0.63 0 0
+12 0.69 1.17146 0.0408163
+13 0.75 0.495812 0.0612245
+14 0.81 0.425111 0.0816327
+15 0.87 1.47408 0.163265
+16 0.93 1.61259 0.265306
+17 0.99 0.569243 0.306122
+18 1.05 1.51819 0.428571
+19 1.11 1.13211 0.530612
+20 1.17 1.6304 0.693878
+21 1.23 0.737623 0.77551
+22 1.29 0.838269 0.877551
+23 1.35 0.918509 1
+24 1.41 1.26302 1.18367
+25 1.47 1.29115 1.38776
+26 1.53 0.715128 1.5102
+27 1.59 0.33109 1.57143
+28 1.65 1.33229 1.83673
+29 1.71 0.763351 2
+30 1.77 0.979661 2.22449
+31 1.83 0.916479 2.44898
+32 1.89 0.781108 2.65306
+33 1.95 0.880539 2.89796
+34 2.01 1.03595 3.20408
+35 2.07 0.91165 3.4898
+36 2.13 0.922517 3.79592
+37 2.19 0.989019 4.14286
+38 2.25 0.826745 4.44898
+39 2.31 0.941229 4.81633
+40 2.37 1.24191 5.32653
+41 2.43 0.897822 5.71429
+42 2.49 1.53014 6.40816
+43 2.55 0.72949 6.7551
+44 2.61 0.77826 7.14286
+45 2.67 1.33079 7.83673
+46 2.73 0.59903 8.16327
+47 2.79 1.25463 8.87755
+48 2.85 0.961885 9.44898
+49 2.91 0.59312 9.81633
+50 2.97 1.10716 10.5306
+102350 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 0 0
+9 0.51 0 0
+10 0.57 0 0
+11 0.63 0 0
+12 0.69 2.34293 0.0816327
+13 0.75 0.991624 0.122449
+14 0.81 0.425111 0.142857
+15 0.87 0.737039 0.183673
+16 0.93 0.967555 0.244898
+17 0.99 0.569243 0.285714
+18 1.05 0.759094 0.346939
+19 1.11 1.81138 0.510204
+20 1.17 0.4076 0.55102
+21 1.23 0.737623 0.632653
+22 1.29 1.34123 0.795918
+23 1.35 0.459254 0.857143
+24 1.41 0.561342 0.938776
+25 1.47 0.903804 1.08163
+26 1.53 1.54944 1.34694
+27 1.59 0.772544 1.4898
+28 1.65 1.22981 1.73469
+29 1.71 0.954189 1.93878
+30 1.77 0.979661 2.16327
+31 1.83 0.66653 2.32653
+32 1.89 0.546775 2.46939
+33 1.95 1.32081 2.83673
+34 2.01 1.03595 3.14286
+35 2.07 0.976768 3.44898
+36 2.13 0.861016 3.73469
+37 2.19 0.930841 4.06122
+38 2.25 0.936978 4.40816
+39 2.31 0.993519 4.79592
+40 2.37 0.794824 5.12245
+41 2.43 0.945075 5.53061
+42 2.49 0.585052 5.79592
+43 2.55 0.772402 6.16327
+44 2.61 0.901143 6.61224
+45 2.67 1.29165 7.28571
+46 2.73 0.786226 7.71429
+47 2.79 1.21878 8.40816
+48 2.85 0.824473 8.89796
+49 2.91 1.12034 9.59184
+50 2.97 0.98063 10.2245
+102400 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 2.55534 0.0204082
+7 0.39 0 0.0204082
+8 0.45 0 0.0204082
+9 0.51 0 0.0204082
+10 0.57 0 0.0204082
+11 0.63 0 0.0204082
+12 0.69 0.585732 0.0408163
+13 0.75 0 0.0408163
+14 0.81 0 0.0408163
+15 0.87 1.10556 0.102041
+16 0.93 0.645037 0.142857
+17 0.99 1.42311 0.244898
+18 1.05 0.759094 0.306122
+19 1.11 1.13211 0.408163
+20 1.17 1.2228 0.530612
+21 1.23 2.02846 0.755102
+22 1.29 1.34123 0.918367
+23 1.35 1.22468 1.08163
+24 1.41 1.40335 1.28571
+25 1.47 0.25823 1.32653
+26 1.53 1.31107 1.55102
+27 1.59 0.662181 1.67347
+28 1.65 0.717387 1.81633
+29 1.71 0.477094 1.91837
+30 1.77 0.62342 2.06122
+31 1.83 0.999796 2.30612
+32 1.89 1.17166 2.61224
+33 1.95 0.660405 2.79592
+34 2.01 0.276253 2.87755
+35 2.07 0.586061 3.06122
+36 2.13 0.922517 3.36735
+37 2.19 0.814486 3.65306
+38 2.25 1.15744 4.08163
+39 2.31 0.784357 4.38776
+40 2.37 0.99353 4.79592
+41 2.43 0.945075 5.20408
+42 2.49 1.21511 5.7551
+43 2.55 0.686579 6.08163
+44 2.61 0.532493 6.34694
+45 2.67 1.25251 7
+46 2.73 1.2355 7.67347
+47 2.79 1.29047 8.40816
+48 2.85 0.996238 9
+49 2.91 1.05443 9.65306
+50 2.97 1.20206 10.4286
+102450 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 1.37595 0.0204082
+9 0.51 1.07159 0.0408163
+10 0.57 0 0.0408163
+11 0.63 0 0.0408163
+12 0.69 0 0.0408163
+13 0.75 0.495812 0.0612245
+14 0.81 0.850222 0.102041
+15 0.87 0.737039 0.142857
+16 0.93 0.322518 0.163265
+17 0.99 1.42311 0.265306
+18 1.05 1.51819 0.387755
+19 1.11 1.35853 0.510204
+20 1.17 0.4076 0.55102
+21 1.23 0.922029 0.653061
+22 1.29 1.17358 0.795918
+23 1.35 0.918509 0.918367
+24 1.41 0.561342 1
+25 1.47 1.03292 1.16327
+26 1.53 0.476752 1.2449
+27 1.59 0.882908 1.40816
+28 1.65 0.922354 1.59184
+29 1.71 1.04961 1.81633
+30 1.77 1.06872 2.06122
+31 1.83 1.41638 2.40816
+32 1.89 0.781108 2.61224
+33 1.95 1.0273 2.89796
+34 2.01 0.828758 3.14286
+35 2.07 1.23724 3.53061
+36 2.13 0.799515 3.79592
+37 2.19 0.523598 3.97959
+38 2.25 1.26768 4.44898
+39 2.31 0.941229 4.81633
+40 2.37 0.546442 5.04082
+41 2.43 1.13409 5.53061
+42 2.49 1.03509 6
+43 2.55 0.858224 6.40816
+44 2.61 0.737299 6.77551
+45 2.67 0.782817 7.18367
+46 2.73 1.08574 7.77551
+47 2.79 0.466004 8.04082
+48 2.85 1.30542 8.81633
+49 2.91 1.25214 9.59184
+50 2.97 1.10716 10.3061
+102500 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 1.83099 0.0204082
+8 0.45 0 0.0204082
+9 0.51 0 0.0204082
+10 0.57 0.858066 0.0408163
+11 0.63 0.702525 0.0612245
+12 0.69 0 0.0612245
+13 0.75 0.495812 0.0816327
+14 0.81 0.850222 0.122449
+15 0.87 0.737039 0.163265
+16 0.93 0 0.163265
+17 0.99 0.853865 0.22449
+18 1.05 1.01213 0.306122
+19 1.11 0.452845 0.346939
+20 1.17 0.2038 0.367347
+21 1.23 1.10644 0.489796
+22 1.29 1.84419 0.714286
+23 1.35 0.918509 0.836735
+24 1.41 0.701677 0.938776
+25 1.47 0.903804 1.08163
+26 1.53 1.43026 1.32653
+27 1.59 1.32436 1.57143
+28 1.65 0.409935 1.65306
+29 1.71 0.85877 1.83673
+30 1.77 1.51402 2.18367
+31 1.83 1.49969 2.55102
+32 1.89 1.64033 2.97959
+33 1.95 0.880539 3.22449
+34 2.01 0.897822 3.4898
+35 2.07 0.716296 3.71429
+36 2.13 0.492009 3.87755
+37 2.19 0.581776 4.08163
+38 2.25 0.936978 4.42857
+39 2.31 0.993519 4.81633
+40 2.37 0.745148 5.12245
+41 2.43 0.803314 5.46939
+42 2.49 0.810072 5.83673
+43 2.55 1.33025 6.46939
+44 2.61 1.10595 7.02041
+45 2.67 0.861099 7.46939
+46 2.73 0.861105 7.93878
+47 2.79 0.860314 8.42857
+48 2.85 0.996238 9.02041
+49 2.91 1.15329 9.73469
+50 2.97 0.948997 10.3469
+102550 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 0 0
+9 0.51 0 0
+10 0.57 0 0
+11 0.63 0.702525 0.0204082
+12 0.69 0.585732 0.0408163
+13 0.75 1.48744 0.102041
+14 0.81 0.425111 0.122449
+15 0.87 0.368519 0.142857
+16 0.93 0.322518 0.163265
+17 0.99 1.13849 0.244898
+18 1.05 1.01213 0.326531
+19 1.11 0.679267 0.387755
+20 1.17 1.019 0.489796
+21 1.23 1.65965 0.673469
+22 1.29 1.00592 0.795918
+23 1.35 0.30617 0.836735
+24 1.41 0.982348 0.979592
+25 1.47 1.29115 1.18367
+26 1.53 1.07269 1.36735
+27 1.59 1.214 1.59184
+28 1.65 0.819871 1.7551
+29 1.71 1.14503 2
+30 1.77 1.3359 2.30612
+31 1.83 1.08311 2.57143
+32 1.89 0.702997 2.7551
+33 1.95 0.880539 3
+34 2.01 1.03595 3.30612
+35 2.07 1.36747 3.73469
+36 2.13 0.922517 4.04082
+37 2.19 0.756309 4.30612
+38 2.25 0.992094 4.67347
+39 2.31 0.522905 4.87755
+40 2.37 0.99353 5.28571
+41 2.43 0.37803 5.44898
+42 2.49 1.03509 5.91837
+43 2.55 0.72949 6.26531
+44 2.61 0.901143 6.71429
+45 2.67 1.25251 7.36735
+46 2.73 0.823666 7.81633
+47 2.79 1.32632 8.57143
+48 2.85 1.168 9.26531
+49 2.91 0.790826 9.7551
+50 2.97 0.759197 10.2449
+102600 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 1.83099 0.0204082
+8 0.45 1.37595 0.0408163
+9 0.51 1.07159 0.0612245
+10 0.57 1.71613 0.102041
+11 0.63 0 0.102041
+12 0.69 0.585732 0.122449
+13 0.75 0.991624 0.163265
+14 0.81 0.850222 0.204082
+15 0.87 0.737039 0.244898
+16 0.93 0 0.244898
+17 0.99 0.569243 0.285714
+18 1.05 1.01213 0.367347
+19 1.11 0.452845 0.408163
+20 1.17 0.2038 0.428571
+21 1.23 0.737623 0.510204
+22 1.29 0.167654 0.530612
+23 1.35 1.07159 0.673469
+24 1.41 0.561342 0.755102
+25 1.47 1.29115 0.959184
+26 1.53 1.07269 1.14286
+27 1.59 0.772544 1.28571
+28 1.65 1.94719 1.67347
+29 1.71 0.85877 1.85714
+30 1.77 1.15778 2.12245
+31 1.83 1.08311 2.38776
+32 1.89 1.24977 2.71429
+33 1.95 1.46757 3.12245
+34 2.01 1.03595 3.42857
+35 2.07 1.17212 3.79592
+36 2.13 0.922517 4.10204
+37 2.19 0.523598 4.28571
+38 2.25 0.826745 4.59184
+39 2.31 0.993519 4.97959
+40 2.37 1.39094 5.55102
+41 2.43 0.614299 5.81633
+42 2.49 0.720064 6.14286
+43 2.55 0.772402 6.5102
+44 2.61 1.22883 7.12245
+45 2.67 0.861099 7.57143
+46 2.73 0.786226 8
+47 2.79 0.645236 8.36735
+48 2.85 0.858826 8.87755
+49 2.91 1.18624 9.61224
+50 2.97 0.822464 10.1429
+102650 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 1.37595 0.0204082
+9 0.51 0 0.0204082
+10 0.57 0.858066 0.0408163
+11 0.63 0 0.0408163
+12 0.69 1.17146 0.0816327
+13 0.75 0 0.0816327
+14 0.81 2.12556 0.183673
+15 0.87 0.368519 0.204082
+16 0.93 0.645037 0.244898
+17 0.99 0 0.244898
+18 1.05 1.26516 0.346939
+19 1.11 1.13211 0.44898
+20 1.17 0.2038 0.469388
+21 1.23 0.553218 0.530612
+22 1.29 0.838269 0.632653
+23 1.35 0.765424 0.734694
+24 1.41 1.40335 0.938776
+25 1.47 1.03292 1.10204
+26 1.53 1.07269 1.28571
+27 1.59 0.882908 1.44898
+28 1.65 1.22981 1.69388
+29 1.71 0.954189 1.89796
+30 1.77 0.890601 2.10204
+31 1.83 1.16643 2.38776
+32 1.89 0.859219 2.61224
+33 1.95 0.587026 2.77551
+34 2.01 1.17407 3.12245
+35 2.07 0.716296 3.34694
+36 2.13 0.799515 3.61224
+37 2.19 1.10537 4
+38 2.25 0.771629 4.28571
+39 2.31 0.993519 4.67347
+40 2.37 1.04321 5.10204
+41 2.43 0.472538 5.30612
+42 2.49 1.03509 5.77551
+43 2.55 1.37316 6.42857
+44 2.61 0.860182 6.85714
+45 2.67 1.0568 7.40816
+46 2.73 0.973423 7.93878
+47 2.79 0.681082 8.32653
+48 2.85 1.20236 9.04082
+49 2.91 1.15329 9.7551
+50 2.97 0.822464 10.2857
+102700 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 0 0
+9 0.51 1.07159 0.0204082
+10 0.57 0 0.0204082
+11 0.63 0 0.0204082
+12 0.69 1.17146 0.0612245
+13 0.75 0.991624 0.102041
+14 0.81 0.850222 0.142857
+15 0.87 1.47408 0.22449
+16 0.93 1.61259 0.326531
+17 0.99 1.13849 0.408163
+18 1.05 0.253031 0.428571
+19 1.11 1.13211 0.530612
+20 1.17 1.019 0.632653
+21 1.23 0.737623 0.714286
+22 1.29 1.34123 0.877551
+23 1.35 0.459254 0.938776
+24 1.41 0.280671 0.979592
+25 1.47 1.03292 1.14286
+26 1.53 1.07269 1.32653
+27 1.59 1.32436 1.57143
+28 1.65 0.409935 1.65306
+29 1.71 1.04961 1.87755
+30 1.77 1.06872 2.12245
+31 1.83 1.08311 2.38776
+32 1.89 1.32788 2.73469
+33 1.95 0.953918 3
+34 2.01 0.897822 3.26531
+35 2.07 0.976768 3.57143
+36 2.13 0.676513 3.79592
+37 2.19 0.930841 4.12245
+38 2.25 0.881861 4.44898
+39 2.31 1.0981 4.87755
+40 2.37 0.745148 5.18367
+41 2.43 0.945075 5.59184
+42 2.49 0.945085 6.02041
+43 2.55 1.20151 6.59184
+44 2.61 0.942104 7.06122
+45 2.67 1.01766 7.59184
+46 2.73 1.0483 8.16327
+47 2.79 1.07539 8.77551
+48 2.85 1.0993 9.42857
+49 2.91 1.25214 10.2041
+50 2.97 1.07553 10.898
+102750 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 1.37595 0.0204082
+9 0.51 2.14319 0.0612245
+10 0.57 0 0.0612245
+11 0.63 0.702525 0.0816327
+12 0.69 0 0.0816327
+13 0.75 0.495812 0.102041
+14 0.81 1.70044 0.183673
+15 0.87 1.10556 0.244898
+16 0.93 0.322518 0.265306
+17 0.99 1.70773 0.387755
+18 1.05 0.506063 0.428571
+19 1.11 1.13211 0.530612
+20 1.17 1.4266 0.673469
+21 1.23 0.737623 0.755102
+22 1.29 0.502961 0.816327
+23 1.35 0.459254 0.877551
+24 1.41 0.701677 0.979592
+25 1.47 0.645574 1.08163
+26 1.53 1.07269 1.26531
+27 1.59 0.441454 1.34694
+28 1.65 1.02484 1.55102
+29 1.71 1.04961 1.77551
+30 1.77 0.80154 1.95918
+31 1.83 0.66653 2.12245
+32 1.89 1.4841 2.5102
+33 1.95 0.880539 2.7551
+34 2.01 1.10501 3.08163
+35 2.07 1.17212 3.44898
+36 2.13 1.29152 3.87755
+37 2.19 0.989019 4.22449
+38 2.25 1.37791 4.73469
+39 2.31 1.0981 5.16327
+40 2.37 0.844501 5.5102
+41 2.43 1.2286 6.04082
+42 2.49 0.720064 6.36735
+43 2.55 1.02987 6.85714
+44 2.61 0.942104 7.32653
+45 2.67 0.821958 7.7551
+46 2.73 0.898544 8.2449
+47 2.79 1.25463 8.95918
+48 2.85 0.996238 9.55102
+49 2.91 0.988533 10.1633
+50 2.97 0.98063 10.7959
+102800 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 0 0
+9 0.51 1.07159 0.0204082
+10 0.57 0.858066 0.0408163
+11 0.63 0.702525 0.0612245
+12 0.69 0.585732 0.0816327
+13 0.75 0.495812 0.102041
+14 0.81 2.12556 0.204082
+15 0.87 0.368519 0.22449
+16 0.93 1.29007 0.306122
+17 0.99 0.853865 0.367347
+18 1.05 1.01213 0.44898
+19 1.11 0.679267 0.510204
+20 1.17 0.6114 0.571429
+21 1.23 0.737623 0.653061
+22 1.29 0.502961 0.714286
+23 1.35 0.612339 0.795918
+24 1.41 0.842013 0.918367
+25 1.47 1.16203 1.10204
+26 1.53 1.07269 1.28571
+27 1.59 0.662181 1.40816
+28 1.65 1.12732 1.63265
+29 1.71 0.763351 1.79592
+30 1.77 0.890601 2
+31 1.83 1.49969 2.36735
+32 1.89 0.468665 2.4898
+33 1.95 0.733783 2.69388
+34 2.01 1.24314 3.06122
+35 2.07 0.976768 3.36735
+36 2.13 0.922517 3.67347
+37 2.19 1.16355 4.08163
+38 2.25 0.60628 4.30612
+39 2.31 0.888938 4.65306
+40 2.37 1.29159 5.18367
+41 2.43 1.41761 5.79592
+42 2.49 0.945085 6.22449
+43 2.55 0.986958 6.69388
+44 2.61 1.18787 7.28571
+45 2.67 1.17423 7.89796
+46 2.73 0.823666 8.34694
+47 2.79 0.681082 8.73469
+48 2.85 0.927532 9.28571
+49 2.91 0.889679 9.83673
+50 2.97 1.0439 10.5102
+102850 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 0 0
+9 0.51 0 0
+10 0.57 1.71613 0.0408163
+11 0.63 0 0.0408163
+12 0.69 1.17146 0.0816327
+13 0.75 0 0.0816327
+14 0.81 1.27533 0.142857
+15 0.87 0.737039 0.183673
+16 0.93 0.322518 0.204082
+17 0.99 0.853865 0.265306
+18 1.05 0 0.265306
+19 1.11 0.90569 0.346939
+20 1.17 1.4266 0.489796
+21 1.23 1.10644 0.612245
+22 1.29 0.670615 0.693878
+23 1.35 0.612339 0.77551
+24 1.41 0.982348 0.918367
+25 1.47 1.29115 1.12245
+26 1.53 1.07269 1.30612
+27 1.59 0.662181 1.42857
+28 1.65 0.922354 1.61224
+29 1.71 0.954189 1.81633
+30 1.77 0.979661 2.04082
+31 1.83 1.16643 2.32653
+32 1.89 1.24977 2.65306
+33 1.95 0.807161 2.87755
+34 2.01 1.17407 3.22449
+35 2.07 0.716296 3.44898
+36 2.13 1.35303 3.89796
+37 2.19 1.0472 4.26531
+38 2.25 1.04721 4.65306
+39 2.31 0.941229 5.02041
+40 2.37 1.09288 5.46939
+41 2.43 0.945075 5.87755
+42 2.49 0.900081 6.28571
+43 2.55 0.944046 6.73469
+44 2.61 0.77826 7.12245
+45 2.67 1.01766 7.65306
+46 2.73 0.823666 8.10204
+47 2.79 0.824468 8.57143
+48 2.85 0.79012 9.04082
+49 2.91 1.21919 9.79592
+50 2.97 0.917363 10.3878
+102900 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 1.83099 0.0204082
+8 0.45 0 0.0204082
+9 0.51 0 0.0204082
+10 0.57 1.71613 0.0612245
+11 0.63 0 0.0612245
+12 0.69 1.17146 0.102041
+13 0.75 0.991624 0.142857
+14 0.81 1.27533 0.204082
+15 0.87 0.737039 0.244898
+16 0.93 0.967555 0.306122
+17 0.99 0.569243 0.346939
+18 1.05 0.759094 0.408163
+19 1.11 0.90569 0.489796
+20 1.17 0.8152 0.571429
+21 1.23 0.922029 0.673469
+22 1.29 0.670615 0.755102
+23 1.35 1.07159 0.897959
+24 1.41 0.701677 1
+25 1.47 1.42026 1.22449
+26 1.53 0.715128 1.34694
+27 1.59 0.993271 1.53061
+28 1.65 0.819871 1.69388
+29 1.71 1.14503 1.93878
+30 1.77 0.71248 2.10204
+31 1.83 1.66633 2.5102
+32 1.89 0.859219 2.73469
+33 1.95 0.953918 3
+34 2.01 1.10501 3.32653
+35 2.07 1.107 3.67347
+36 2.13 0.676513 3.89796
+37 2.19 0.872664 4.20408
+38 2.25 1.15744 4.63265
+39 2.31 1.04581 5.04082
+40 2.37 1.14256 5.5102
+41 2.43 0.708807 5.81633
+42 2.49 0.855076 6.20408
+43 2.55 0.986958 6.67347
+44 2.61 1.06499 7.20408
+45 2.67 0.861099 7.65306
+46 2.73 1.16062 8.28571
+47 2.79 1.14709 8.93878
+48 2.85 1.06494 9.57143
+49 2.91 0.955581 10.1633
+50 2.97 0.790831 10.6735
+102950 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 0 0
+9 0.51 0 0
+10 0.57 2.5742 0.0612245
+11 0.63 0 0.0612245
+12 0.69 0.585732 0.0816327
+13 0.75 0.991624 0.122449
+14 0.81 0.850222 0.163265
+15 0.87 1.10556 0.22449
+16 0.93 0.967555 0.285714
+17 0.99 0.569243 0.326531
+18 1.05 0.759094 0.387755
+19 1.11 1.13211 0.489796
+20 1.17 0.8152 0.571429
+21 1.23 1.29084 0.714286
+22 1.29 0.670615 0.795918
+23 1.35 0.612339 0.877551
+24 1.41 0.701677 0.979592
+25 1.47 0.645574 1.08163
+26 1.53 1.19188 1.28571
+27 1.59 1.10363 1.4898
+28 1.65 1.33229 1.7551
+29 1.71 0.667932 1.89796
+30 1.77 1.06872 2.14286
+31 1.83 0.749847 2.32653
+32 1.89 1.17166 2.63265
+33 1.95 0.807161 2.85714
+34 2.01 0.897822 3.12245
+35 2.07 0.846532 3.38776
+36 2.13 0.799515 3.65306
+37 2.19 1.27991 4.10204
+38 2.25 0.771629 4.38776
+39 2.31 1.30726 4.89796
+40 2.37 1.29159 5.42857
+41 2.43 0.614299 5.69388
+42 2.49 1.1701 6.22449
+43 2.55 1.02987 6.71429
+44 2.61 1.14691 7.28571
+45 2.67 0.821958 7.71429
+46 2.73 1.38526 8.46939
+47 2.79 0.967854 9.02041
+48 2.85 1.168 9.71429
+49 2.91 0.823777 10.2245
+50 2.97 0.790831 10.7347
+103000 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 0 0
+9 0.51 0 0
+10 0.57 0 0
+11 0.63 0.702525 0.0204082
+12 0.69 0 0.0204082
+13 0.75 0.495812 0.0408163
+14 0.81 0 0.0408163
+15 0.87 1.10556 0.102041
+16 0.93 1.29007 0.183673
+17 0.99 0.569243 0.22449
+18 1.05 1.26516 0.326531
+19 1.11 1.35853 0.44898
+20 1.17 0.6114 0.510204
+21 1.23 0.553218 0.571429
+22 1.29 0.502961 0.632653
+23 1.35 0.765424 0.734694
+24 1.41 0.982348 0.877551
+25 1.47 0.645574 0.979592
+26 1.53 0.834316 1.12245
+27 1.59 1.10363 1.32653
+28 1.65 0.204968 1.36735
+29 1.71 0.85877 1.55102
+30 1.77 1.06872 1.79592
+31 1.83 1.41638 2.14286
+32 1.89 1.09355 2.42857
+33 1.95 1.10067 2.73469
+34 2.01 0.759695 2.95918
+35 2.07 1.107 3.30612
+36 2.13 0.861016 3.59184
+37 2.19 1.10537 3.97959
+38 2.25 1.43302 4.5102
+39 2.31 0.993519 4.89796
+40 2.37 0.894177 5.26531
+41 2.43 1.03958 5.71429
+42 2.49 1.1251 6.22449
+43 2.55 1.07278 6.73469
+44 2.61 1.14691 7.30612
+45 2.67 1.09594 7.87755
+46 2.73 1.38526 8.63265
+47 2.79 1.03955 9.22449
+48 2.85 1.13365 9.89796
+49 2.91 1.02148 10.5306
+50 2.97 1.0439 11.2041
+103050 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 0 0
+9 0.51 0 0
+10 0.57 0.858066 0.0204082
+11 0.63 0.702525 0.0408163
+12 0.69 1.7572 0.102041
+13 0.75 0.991624 0.142857
+14 0.81 1.27533 0.204082
+15 0.87 0.368519 0.22449
+16 0.93 0 0.22449
+17 0.99 0.569243 0.265306
+18 1.05 0.759094 0.326531
+19 1.11 1.13211 0.428571
+20 1.17 0.4076 0.469388
+21 1.23 0.184406 0.489796
+22 1.29 0.670615 0.571429
+23 1.35 1.22468 0.734694
+24 1.41 0.982348 0.877551
+25 1.47 0.387344 0.938776
+26 1.53 0.59594 1.04082
+27 1.59 1.43472 1.30612
+28 1.65 1.12732 1.53061
+29 1.71 0.954189 1.73469
+30 1.77 0.890601 1.93878
+31 1.83 0.749847 2.12245
+32 1.89 0.859219 2.34694
+33 1.95 1.0273 2.63265
+34 2.01 0.966885 2.91837
+35 2.07 1.17212 3.28571
+36 2.13 1.04552 3.63265
+37 2.19 1.39626 4.12245
+38 2.25 1.15744 4.55102
+39 2.31 1.25497 5.04082
+40 2.37 1.04321 5.46939
+41 2.43 0.614299 5.73469
+42 2.49 0.990089 6.18367
+43 2.55 0.901135 6.61224
+44 2.61 0.901143 7.06122
+45 2.67 1.17423 7.67347
+46 2.73 0.823666 8.12245
+47 2.79 1.4697 8.95918
+48 2.85 1.13365 9.63265
+49 2.91 0.790826 10.1224
+50 2.97 1.10716 10.8367
+103100 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 0 0
+9 0.51 0 0
+10 0.57 1.71613 0.0408163
+11 0.63 0.702525 0.0612245
+12 0.69 1.17146 0.102041
+13 0.75 1.48744 0.163265
+14 0.81 0 0.163265
+15 0.87 1.10556 0.22449
+16 0.93 0.967555 0.285714
+17 0.99 0.853865 0.346939
+18 1.05 1.51819 0.469388
+19 1.11 0.679267 0.530612
+20 1.17 0.4076 0.571429
+21 1.23 0.553218 0.632653
+22 1.29 1.17358 0.77551
+23 1.35 1.9901 1.04082
+24 1.41 0.561342 1.12245
+25 1.47 1.03292 1.28571
+26 1.53 0.953504 1.44898
+27 1.59 1.32436 1.69388
+28 1.65 0.614903 1.81633
+29 1.71 0.763351 1.97959
+30 1.77 0.979661 2.20408
+31 1.83 0.749847 2.38776
+32 1.89 0.937329 2.63265
+33 1.95 1.17405 2.95918
+34 2.01 0.759695 3.18367
+35 2.07 0.976768 3.4898
+36 2.13 1.35303 3.93878
+37 2.19 1.16355 4.34694
+38 2.25 1.10233 4.7551
+39 2.31 1.41184 5.30612
+40 2.37 0.596118 5.55102
+41 2.43 0.945075 5.95918
+42 2.49 1.0801 6.44898
+43 2.55 0.815313 6.83673
+44 2.61 0.901143 7.28571
+45 2.67 0.782817 7.69388
+46 2.73 0.59903 8.02041
+47 2.79 1.32632 8.77551
+48 2.85 0.755767 9.22449
+49 2.91 1.35099 10.0612
+50 2.97 0.790831 10.5714
+103150 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 0 0
+9 0.51 0 0
+10 0.57 0 0
+11 0.63 0 0
+12 0.69 1.17146 0.0408163
+13 0.75 0.495812 0.0612245
+14 0.81 0.425111 0.0816327
+15 0.87 1.47408 0.163265
+16 0.93 1.29007 0.244898
+17 0.99 0.569243 0.285714
+18 1.05 1.01213 0.367347
+19 1.11 0 0.367347
+20 1.17 1.2228 0.489796
+21 1.23 0.737623 0.571429
+22 1.29 1.17358 0.714286
+23 1.35 0.765424 0.816327
+24 1.41 0.701677 0.918367
+25 1.47 1.80761 1.20408
+26 1.53 0.834316 1.34694
+27 1.59 0.772544 1.4898
+28 1.65 1.33229 1.7551
+29 1.71 1.5267 2.08163
+30 1.77 0.62342 2.22449
+31 1.83 0.499898 2.34694
+32 1.89 0.937329 2.59184
+33 1.95 0.587026 2.7551
+34 2.01 0.828758 3
+35 2.07 1.56283 3.4898
+36 2.13 1.41453 3.95918
+37 2.19 0.698131 4.20408
+38 2.25 1.21256 4.65306
+39 2.31 0.679776 4.91837
+40 2.37 1.44062 5.5102
+41 2.43 0.850568 5.87755
+42 2.49 0.585052 6.14286
+43 2.55 0.986958 6.61224
+44 2.61 0.696338 6.95918
+45 2.67 1.13508 7.55102
+46 2.73 1.2355 8.22449
+47 2.79 1.11124 8.85714
+48 2.85 0.996238 9.44898
+49 2.91 0.856728 9.97959
+50 2.97 1.20206 10.7551
+103200 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 1.37595 0.0204082
+9 0.51 0 0.0204082
+10 0.57 1.71613 0.0612245
+11 0.63 0.702525 0.0816327
+12 0.69 0 0.0816327
+13 0.75 0 0.0816327
+14 0.81 0.850222 0.122449
+15 0.87 0 0.122449
+16 0.93 0.967555 0.183673
+17 0.99 0.853865 0.244898
+18 1.05 0.253031 0.265306
+19 1.11 0.90569 0.346939
+20 1.17 1.2228 0.469388
+21 1.23 1.65965 0.653061
+22 1.29 0.335308 0.693878
+23 1.35 0.918509 0.816327
+24 1.41 0.280671 0.857143
+25 1.47 0.774689 0.979592
+26 1.53 0.476752 1.06122
+27 1.59 0.662181 1.18367
+28 1.65 1.53726 1.4898
+29 1.71 1.04961 1.71429
+30 1.77 1.15778 1.97959
+31 1.83 0.66653 2.14286
+32 1.89 0.937329 2.38776
+33 1.95 0.660405 2.57143
+34 2.01 1.03595 2.87755
+35 2.07 0.976768 3.18367
+36 2.13 0.984018 3.5102
+37 2.19 1.10537 3.89796
+38 2.25 0.992094 4.26531
+39 2.31 1.0981 4.69388
+40 2.37 0.99353 5.10204
+41 2.43 1.27585 5.65306
+42 2.49 0.67506 5.95918
+43 2.55 1.11569 6.4898
+44 2.61 0.901143 6.93878
+45 2.67 1.01766 7.46939
+46 2.73 1.12318 8.08163
+47 2.79 0.967854 8.63265
+48 2.85 1.20236 9.34694
+49 2.91 1.15329 10.0612
+50 2.97 1.26533 10.8776
+103250 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 0 0
+9 0.51 0 0
+10 0.57 2.5742 0.0612245
+11 0.63 0.702525 0.0816327
+12 0.69 0 0.0816327
+13 0.75 0.495812 0.102041
+14 0.81 0.850222 0.142857
+15 0.87 1.10556 0.204082
+16 0.93 0.967555 0.265306
+17 0.99 0 0.265306
+18 1.05 0.506063 0.306122
+19 1.11 0.679267 0.367347
+20 1.17 1.2228 0.489796
+21 1.23 1.10644 0.612245
+22 1.29 1.17358 0.755102
+23 1.35 1.22468 0.918367
+24 1.41 1.26302 1.10204
+25 1.47 1.54938 1.34694
+26 1.53 0.953504 1.5102
+27 1.59 1.10363 1.71429
+28 1.65 0.819871 1.87755
+29 1.71 0.763351 2.04082
+30 1.77 0.71248 2.20408
+31 1.83 0.749847 2.38776
+32 1.89 0.390554 2.4898
+33 1.95 0.880539 2.73469
+34 2.01 0.897822 3
+35 2.07 0.976768 3.30612
+36 2.13 1.10702 3.67347
+37 2.19 0.989019 4.02041
+38 2.25 1.04721 4.40816
+39 2.31 1.0981 4.83673
+40 2.37 0.943854 5.22449
+41 2.43 0.897822 5.61224
+42 2.49 0.540048 5.85714
+43 2.55 0.815313 6.2449
+44 2.61 1.02403 6.7551
+45 2.67 1.01766 7.28571
+46 2.73 1.01086 7.83673
+47 2.79 1.39801 8.63265
+48 2.85 0.996238 9.22449
+49 2.91 1.08739 9.89796
+50 2.97 1.10716 10.6122
+103300 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 1.37595 0.0204082
+9 0.51 1.07159 0.0408163
+10 0.57 0.858066 0.0612245
+11 0.63 0 0.0612245
+12 0.69 0.585732 0.0816327
+13 0.75 0.991624 0.122449
+14 0.81 0 0.122449
+15 0.87 0 0.122449
+16 0.93 0 0.122449
+17 0.99 0.284622 0.142857
+18 1.05 1.01213 0.22449
+19 1.11 1.35853 0.346939
+20 1.17 0.6114 0.408163
+21 1.23 0.368812 0.44898
+22 1.29 0.335308 0.489796
+23 1.35 1.07159 0.632653
+24 1.41 0.701677 0.734694
+25 1.47 1.29115 0.938776
+26 1.53 1.31107 1.16327
+27 1.59 0.993271 1.34694
+28 1.65 0.819871 1.5102
+29 1.71 0.85877 1.69388
+30 1.77 0.62342 1.83673
+31 1.83 0.583214 1.97959
+32 1.89 1.24977 2.30612
+33 1.95 1.0273 2.59184
+34 2.01 0.552506 2.7551
+35 2.07 1.36747 3.18367
+36 2.13 0.738014 3.42857
+37 2.19 1.10537 3.81633
+38 2.25 1.26768 4.28571
+39 2.31 1.20268 4.7551
+40 2.37 1.4903 5.36735
+41 2.43 0.992329 5.79592
+42 2.49 1.03509 6.26531
+43 2.55 1.24442 6.85714
+44 2.61 1.06499 7.38776
+45 2.67 1.21337 8.02041
+46 2.73 1.0483 8.59184
+47 2.79 0.824468 9.06122
+48 2.85 1.06494 9.69388
+49 2.91 0.691973 10.1224
+50 2.97 1.17043 10.8776
+103350 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 1.37595 0.0204082
+9 0.51 0 0.0204082
+10 0.57 0 0.0204082
+11 0.63 0 0.0204082
+12 0.69 1.7572 0.0816327
+13 0.75 0.495812 0.102041
+14 0.81 0.425111 0.122449
+15 0.87 1.10556 0.183673
+16 0.93 0.967555 0.244898
+17 0.99 0.853865 0.306122
+18 1.05 1.26516 0.408163
+19 1.11 1.35853 0.530612
+20 1.17 1.4266 0.673469
+21 1.23 1.84406 0.877551
+22 1.29 1.17358 1.02041
+23 1.35 0.765424 1.12245
+24 1.41 0.842013 1.2449
+25 1.47 0.516459 1.32653
+26 1.53 1.07269 1.5102
+27 1.59 0.662181 1.63265
+28 1.65 1.02484 1.83673
+29 1.71 1.43128 2.14286
+30 1.77 1.06872 2.38776
+31 1.83 0.749847 2.57143
+32 1.89 1.09355 2.85714
+33 1.95 0.807161 3.08163
+34 2.01 1.03595 3.38776
+35 2.07 0.520943 3.55102
+36 2.13 0.430508 3.69388
+37 2.19 1.0472 4.06122
+38 2.25 1.21256 4.5102
+39 2.31 0.888938 4.85714
+40 2.37 1.24191 5.36735
+41 2.43 0.945075 5.77551
+42 2.49 1.26011 6.34694
+43 2.55 0.944046 6.79592
+44 2.61 0.942104 7.26531
+45 2.67 0.821958 7.69388
+46 2.73 0.786226 8.12245
+47 2.79 1.0037 8.69388
+48 2.85 0.584002 9.04082
+49 2.91 0.955581 9.63265
+50 2.97 0.948997 10.2449
+103400 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 0 0
+9 0.51 0 0
+10 0.57 0 0
+11 0.63 0.702525 0.0204082
+12 0.69 0 0.0204082
+13 0.75 0.991624 0.0612245
+14 0.81 2.55067 0.183673
+15 0.87 0.737039 0.22449
+16 0.93 0.967555 0.285714
+17 0.99 0.853865 0.346939
+18 1.05 1.77122 0.489796
+19 1.11 1.13211 0.591837
+20 1.17 0.4076 0.632653
+21 1.23 0.553218 0.693878
+22 1.29 0.502961 0.755102
+23 1.35 0.918509 0.877551
+24 1.41 1.82436 1.14286
+25 1.47 1.03292 1.30612
+26 1.53 0.953504 1.46939
+27 1.59 0.772544 1.61224
+28 1.65 1.12732 1.83673
+29 1.71 0.954189 2.04082
+30 1.77 1.60308 2.40816
+31 1.83 0.833163 2.61224
+32 1.89 0.468665 2.73469
+33 1.95 0.880539 2.97959
+34 2.01 1.10501 3.30612
+35 2.07 1.23724 3.69388
+36 2.13 1.23002 4.10204
+37 2.19 0.698131 4.34694
+38 2.25 0.771629 4.63265
+39 2.31 0.888938 4.97959
+40 2.37 1.09288 5.42857
+41 2.43 1.27585 5.97959
+42 2.49 0.765068 6.32653
+43 2.55 0.72949 6.67347
+44 2.61 0.696338 7.02041
+45 2.67 0.821958 7.44898
+46 2.73 1.12318 8.06122
+47 2.79 0.860314 8.55102
+48 2.85 0.858826 9.06122
+49 2.91 1.12034 9.7551
+50 2.97 0.854097 10.3061
+103450 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 0 0
+9 0.51 1.07159 0.0204082
+10 0.57 1.71613 0.0612245
+11 0.63 1.40505 0.102041
+12 0.69 1.7572 0.163265
+13 0.75 0.495812 0.183673
+14 0.81 1.70044 0.265306
+15 0.87 0.737039 0.306122
+16 0.93 0.322518 0.326531
+17 0.99 1.13849 0.408163
+18 1.05 0.253031 0.428571
+19 1.11 0.679267 0.489796
+20 1.17 0.4076 0.530612
+21 1.23 0.922029 0.632653
+22 1.29 1.17358 0.77551
+23 1.35 1.07159 0.918367
+24 1.41 0.280671 0.959184
+25 1.47 1.03292 1.12245
+26 1.53 0.834316 1.26531
+27 1.59 1.32436 1.5102
+28 1.65 0.409935 1.59184
+29 1.71 0.667932 1.73469
+30 1.77 0.979661 1.95918
+31 1.83 1.33306 2.28571
+32 1.89 1.17166 2.59184
+33 1.95 1.24743 2.93878
+34 2.01 1.17407 3.28571
+35 2.07 1.107 3.63265
+36 2.13 0.922517 3.93878
+37 2.19 0.581776 4.14286
+38 2.25 0.60628 4.36735
+39 2.31 0.836648 4.69388
+40 2.37 1.24191 5.20408
+41 2.43 1.03958 5.65306
+42 2.49 0.765068 6
+43 2.55 1.24442 6.59184
+44 2.61 0.983065 7.08163
+45 2.67 1.01766 7.61224
+46 2.73 0.786226 8.04082
+47 2.79 0.824468 8.5102
+48 2.85 1.13365 9.18367
+49 2.91 0.955581 9.77551
+50 2.97 1.07553 10.4694
+103500 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 1.37595 0.0204082
+9 0.51 0 0.0204082
+10 0.57 0 0.0204082
+11 0.63 0 0.0204082
+12 0.69 0 0.0204082
+13 0.75 0.991624 0.0612245
+14 0.81 1.70044 0.142857
+15 0.87 2.57964 0.285714
+16 0.93 0.967555 0.346939
+17 0.99 0.569243 0.387755
+18 1.05 1.26516 0.489796
+19 1.11 0.90569 0.571429
+20 1.17 1.4266 0.714286
+21 1.23 0.553218 0.77551
+22 1.29 0.670615 0.857143
+23 1.35 0.30617 0.897959
+24 1.41 1.12268 1.06122
+25 1.47 1.29115 1.26531
+26 1.53 0.59594 1.36735
+27 1.59 1.214 1.59184
+28 1.65 0.717387 1.73469
+29 1.71 0.572513 1.85714
+30 1.77 1.3359 2.16327
+31 1.83 0.833163 2.36735
+32 1.89 1.09355 2.65306
+33 1.95 1.10067 2.95918
+34 2.01 0.621569 3.14286
+35 2.07 1.56283 3.63265
+36 2.13 0.922517 3.93878
+37 2.19 0.989019 4.28571
+38 2.25 0.826745 4.59184
+39 2.31 0.522905 4.79592
+40 2.37 0.99353 5.20408
+41 2.43 1.03958 5.65306
+42 2.49 0.945085 6.08163
+43 2.55 1.07278 6.59184
+44 2.61 0.655377 6.91837
+45 2.67 0.861099 7.36735
+46 2.73 1.31038 8.08163
+47 2.79 1.32632 8.83673
+48 2.85 1.23671 9.57143
+49 2.91 0.724924 10.0204
+50 2.97 0.98063 10.6531
+103550 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 2.55534 0.0204082
+7 0.39 0 0.0204082
+8 0.45 0 0.0204082
+9 0.51 0 0.0204082
+10 0.57 1.71613 0.0612245
+11 0.63 1.40505 0.102041
+12 0.69 0 0.102041
+13 0.75 0.495812 0.122449
+14 0.81 1.27533 0.183673
+15 0.87 0.737039 0.22449
+16 0.93 0.967555 0.285714
+17 0.99 1.13849 0.367347
+18 1.05 1.26516 0.469388
+19 1.11 0.226422 0.489796
+20 1.17 0.8152 0.571429
+21 1.23 0.737623 0.653061
+22 1.29 0.335308 0.693878
+23 1.35 1.22468 0.857143
+24 1.41 0.982348 1
+25 1.47 0.774689 1.12245
+26 1.53 1.19188 1.32653
+27 1.59 1.10363 1.53061
+28 1.65 0.512419 1.63265
+29 1.71 0.954189 1.83673
+30 1.77 0.53436 1.95918
+31 1.83 1.08311 2.22449
+32 1.89 0.859219 2.44898
+33 1.95 0.44027 2.57143
+34 2.01 0.552506 2.73469
+35 2.07 1.04189 3.06122
+36 2.13 0.922517 3.36735
+37 2.19 0.465421 3.53061
+38 2.25 1.37791 4.04082
+39 2.31 1.15039 4.4898
+40 2.37 0.745148 4.79592
+41 2.43 1.27585 5.34694
+42 2.49 1.39512 5.97959
+43 2.55 0.944046 6.42857
+44 2.61 0.942104 6.89796
+45 2.67 0.93938 7.38776
+46 2.73 1.27294 8.08163
+47 2.79 0.860314 8.57143
+48 2.85 1.03059 9.18367
+49 2.91 0.955581 9.77551
+50 2.97 0.917363 10.3673
+103600 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 1.83099 0.0204082
+8 0.45 0 0.0204082
+9 0.51 1.07159 0.0408163
+10 0.57 0 0.0408163
+11 0.63 0 0.0408163
+12 0.69 1.17146 0.0816327
+13 0.75 0.495812 0.102041
+14 0.81 2.12556 0.204082
+15 0.87 1.10556 0.265306
+16 0.93 0.322518 0.285714
+17 0.99 0.284622 0.306122
+18 1.05 0.759094 0.367347
+19 1.11 1.13211 0.469388
+20 1.17 0.8152 0.55102
+21 1.23 0.922029 0.653061
+22 1.29 0.838269 0.755102
+23 1.35 1.37776 0.938776
+24 1.41 1.26302 1.12245
+25 1.47 0.516459 1.20408
+26 1.53 0.715128 1.32653
+27 1.59 1.43472 1.59184
+28 1.65 1.12732 1.81633
+29 1.71 0.763351 1.97959
+30 1.77 0.890601 2.18367
+31 1.83 1.08311 2.44898
+32 1.89 1.01544 2.71429
+33 1.95 0.587026 2.87755
+34 2.01 1.10501 3.20408
+35 2.07 0.781414 3.44898
+36 2.13 0.861016 3.73469
+37 2.19 1.16355 4.14286
+38 2.25 0.826745 4.44898
+39 2.31 1.04581 4.85714
+40 2.37 0.99353 5.26531
+41 2.43 1.08684 5.73469
+42 2.49 1.21511 6.28571
+43 2.55 0.986958 6.7551
+44 2.61 1.22883 7.36735
+45 2.67 0.861099 7.81633
+46 2.73 0.823666 8.26531
+47 2.79 1.29047 9
+48 2.85 0.687061 9.40816
+49 2.91 1.31804 10.2245
+50 2.97 0.854097 10.7755
+103650 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 0 0
+9 0.51 0 0
+10 0.57 0.858066 0.0204082
+11 0.63 0.702525 0.0408163
+12 0.69 0.585732 0.0612245
+13 0.75 0.991624 0.102041
+14 0.81 0 0.102041
+15 0.87 0 0.102041
+16 0.93 1.29007 0.183673
+17 0.99 0.853865 0.244898
+18 1.05 0.506063 0.285714
+19 1.11 0.226422 0.306122
+20 1.17 0.8152 0.387755
+21 1.23 0.737623 0.469388
+22 1.29 0.335308 0.510204
+23 1.35 1.68393 0.734694
+24 1.41 1.82436 1
+25 1.47 0.516459 1.08163
+26 1.53 0.834316 1.22449
+27 1.59 0.993271 1.40816
+28 1.65 0.614903 1.53061
+29 1.71 1.43128 1.83673
+30 1.77 1.42496 2.16327
+31 1.83 1.08311 2.42857
+32 1.89 0.937329 2.67347
+33 1.95 1.10067 2.97959
+34 2.01 1.10501 3.30612
+35 2.07 1.04189 3.63265
+36 2.13 1.29152 4.06122
+37 2.19 0.814486 4.34694
+38 2.25 0.992094 4.71429
+39 2.31 0.627486 4.95918
+40 2.37 0.844501 5.30612
+41 2.43 1.03958 5.7551
+42 2.49 1.1251 6.26531
+43 2.55 0.901135 6.69388
+44 2.61 0.860182 7.12245
+45 2.67 0.743676 7.5102
+46 2.73 1.01086 8.06122
+47 2.79 0.788621 8.5102
+48 2.85 0.858826 9.02041
+49 2.91 1.15329 9.73469
+50 2.97 0.790831 10.2449
+103700 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 0 0
+9 0.51 1.07159 0.0204082
+10 0.57 0 0.0204082
+11 0.63 0.702525 0.0408163
+12 0.69 1.17146 0.0816327
+13 0.75 0 0.0816327
+14 0.81 0 0.0816327
+15 0.87 1.47408 0.163265
+16 0.93 0.645037 0.204082
+17 0.99 1.42311 0.306122
+18 1.05 0 0.306122
+19 1.11 0.90569 0.387755
+20 1.17 1.019 0.489796
+21 1.23 0.553218 0.55102
+22 1.29 0.335308 0.591837
+23 1.35 0.612339 0.673469
+24 1.41 0.842013 0.795918
+25 1.47 1.03292 0.959184
+26 1.53 0.834316 1.10204
+27 1.59 1.54509 1.38776
+28 1.65 1.02484 1.59184
+29 1.71 0.85877 1.77551
+30 1.77 0.80154 1.95918
+31 1.83 0.916479 2.18367
+32 1.89 0.937329 2.42857
+33 1.95 0.880539 2.67347
+34 2.01 0.828758 2.91837
+35 2.07 0.781414 3.16327
+36 2.13 1.53753 3.67347
+37 2.19 1.22173 4.10204
+38 2.25 0.716512 4.36735
+39 2.31 0.888938 4.71429
+40 2.37 0.645795 4.97959
+41 2.43 1.08684 5.44898
+42 2.49 0.945085 5.87755
+43 2.55 1.11569 6.40816
+44 2.61 1.22883 7.02041
+45 2.67 1.21337 7.65306
+46 2.73 0.748787 8.06122
+47 2.79 1.03955 8.65306
+48 2.85 0.618355 9.02041
+49 2.91 0.889679 9.57143
+50 2.97 0.822464 10.102
+103750 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 1.37595 0.0204082
+9 0.51 0 0.0204082
+10 0.57 0 0.0204082
+11 0.63 0 0.0204082
+12 0.69 0 0.0204082
+13 0.75 0.495812 0.0408163
+14 0.81 1.27533 0.102041
+15 0.87 0.368519 0.122449
+16 0.93 1.29007 0.204082
+17 0.99 1.13849 0.285714
+18 1.05 0.759094 0.346939
+19 1.11 0 0.346939
+20 1.17 0.6114 0.408163
+21 1.23 0.553218 0.469388
+22 1.29 0.502961 0.530612
+23 1.35 1.22468 0.693878
+24 1.41 0.982348 0.836735
+25 1.47 0.645574 0.938776
+26 1.53 0.834316 1.08163
+27 1.59 0.882908 1.2449
+28 1.65 1.43477 1.53061
+29 1.71 1.33586 1.81633
+30 1.77 0.80154 2
+31 1.83 0.583214 2.14286
+32 1.89 1.17166 2.44898
+33 1.95 0.733783 2.65306
+34 2.01 0.897822 2.91837
+35 2.07 0.91165 3.20408
+36 2.13 1.23002 3.61224
+37 2.19 0.872664 3.91837
+38 2.25 1.15744 4.34694
+39 2.31 0.836648 4.67347
+40 2.37 1.09288 5.12245
+41 2.43 0.897822 5.5102
+42 2.49 0.67506 5.81633
+43 2.55 1.02987 6.30612
+44 2.61 0.819221 6.71429
+45 2.67 0.743676 7.10204
+46 2.73 0.861105 7.57143
+47 2.79 0.788621 8.02041
+48 2.85 1.03059 8.63265
+49 2.91 1.15329 9.34694
+50 2.97 0.98063 9.97959
+103800 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 0 0
+9 0.51 0 0
+10 0.57 0 0
+11 0.63 1.40505 0.0408163
+12 0.69 0.585732 0.0612245
+13 0.75 0.495812 0.0816327
+14 0.81 1.70044 0.163265
+15 0.87 0.368519 0.183673
+16 0.93 0.322518 0.204082
+17 0.99 0.569243 0.244898
+18 1.05 0 0.244898
+19 1.11 0.90569 0.326531
+20 1.17 0.6114 0.387755
+21 1.23 0.553218 0.44898
+22 1.29 0.502961 0.510204
+23 1.35 0.612339 0.591837
+24 1.41 0.701677 0.693878
+25 1.47 0.25823 0.734694
+26 1.53 1.19188 0.938776
+27 1.59 1.214 1.16327
+28 1.65 0.512419 1.26531
+29 1.71 1.71754 1.63265
+30 1.77 1.3359 1.93878
+31 1.83 0.999796 2.18367
+32 1.89 1.09355 2.46939
+33 1.95 0.733783 2.67347
+34 2.01 1.10501 3
+35 2.07 0.716296 3.22449
+36 2.13 1.10702 3.59184
+37 2.19 0.756309 3.85714
+38 2.25 1.48814 4.40816
+39 2.31 1.20268 4.87755
+40 2.37 1.04321 5.30612
+41 2.43 0.992329 5.73469
+42 2.49 0.945085 6.16327
+43 2.55 0.815313 6.55102
+44 2.61 1.18787 7.14286
+45 2.67 0.93938 7.63265
+46 2.73 1.01086 8.18367
+47 2.79 0.896161 8.69388
+48 2.85 0.824473 9.18367
+49 2.91 1.18624 9.91837
+50 2.97 0.790831 10.4286
+103850 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 2.7519 0.0408163
+9 0.51 0 0.0408163
+10 0.57 0.858066 0.0612245
+11 0.63 0 0.0612245
+12 0.69 0 0.0612245
+13 0.75 0.495812 0.0816327
+14 0.81 0.425111 0.102041
+15 0.87 0.737039 0.142857
+16 0.93 0.322518 0.163265
+17 0.99 0.853865 0.22449
+18 1.05 0.506063 0.265306
+19 1.11 0.90569 0.346939
+20 1.17 1.6304 0.510204
+21 1.23 0.737623 0.591837
+22 1.29 0.670615 0.673469
+23 1.35 0.765424 0.77551
+24 1.41 0.421006 0.836735
+25 1.47 1.03292 1
+26 1.53 1.31107 1.22449
+27 1.59 0.772544 1.36735
+28 1.65 0.717387 1.5102
+29 1.71 0.763351 1.67347
+30 1.77 1.06872 1.91837
+31 1.83 0.999796 2.16327
+32 1.89 0.702997 2.34694
+33 1.95 0.587026 2.5102
+34 2.01 0.897822 2.77551
+35 2.07 1.17212 3.14286
+36 2.13 0.799515 3.40816
+37 2.19 0.872664 3.71429
+38 2.25 1.26768 4.18367
+39 2.31 1.15039 4.63265
+40 2.37 1.29159 5.16327
+41 2.43 0.519791 5.38776
+42 2.49 0.855076 5.77551
+43 2.55 0.901135 6.20408
+44 2.61 0.983065 6.69388
+45 2.67 0.547972 6.97959
+46 2.73 0.898544 7.46939
+47 2.79 1.4697 8.30612
+48 2.85 0.996238 8.89796
+49 2.91 0.59312 9.26531
+50 2.97 1.07553 9.95918
+103900 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 0 0
+9 0.51 0 0
+10 0.57 0 0
+11 0.63 0.702525 0.0204082
+12 0.69 0.585732 0.0408163
+13 0.75 0.495812 0.0612245
+14 0.81 0.850222 0.102041
+15 0.87 0.368519 0.122449
+16 0.93 0.967555 0.183673
+17 0.99 1.13849 0.265306
+18 1.05 1.01213 0.346939
+19 1.11 0.226422 0.367347
+20 1.17 1.019 0.469388
+21 1.23 0.553218 0.530612
+22 1.29 0.502961 0.591837
+23 1.35 0.612339 0.673469
+24 1.41 0.982348 0.816327
+25 1.47 0.387344 0.877551
+26 1.53 1.07269 1.06122
+27 1.59 1.43472 1.32653
+28 1.65 0.614903 1.44898
+29 1.71 0.763351 1.61224
+30 1.77 0.62342 1.7551
+31 1.83 0.999796 2
+32 1.89 0.781108 2.20408
+33 1.95 0.44027 2.32653
+34 2.01 0.690632 2.53061
+35 2.07 0.976768 2.83673
+36 2.13 0.922517 3.14286
+37 2.19 0.814486 3.42857
+38 2.25 0.936978 3.77551
+39 2.31 0.836648 4.10204
+40 2.37 1.19224 4.59184
+41 2.43 0.803314 4.93878
+42 2.49 1.44013 5.59184
+43 2.55 1.07278 6.10204
+44 2.61 1.02403 6.61224
+45 2.67 1.09594 7.18367
+46 2.73 0.898544 7.67347
+47 2.79 0.860314 8.16327
+48 2.85 1.30542 8.93878
+49 2.91 0.757875 9.40816
+50 2.97 1.07553 10.102
+103950 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 0 0
+9 0.51 0 0
+10 0.57 0 0
+11 0.63 2.10758 0.0612245
+12 0.69 0 0.0612245
+13 0.75 0.991624 0.102041
+14 0.81 1.27533 0.163265
+15 0.87 0.737039 0.204082
+16 0.93 1.29007 0.285714
+17 0.99 0.569243 0.326531
+18 1.05 0.506063 0.367347
+19 1.11 0.90569 0.44898
+20 1.17 1.4266 0.591837
+21 1.23 0.553218 0.653061
+22 1.29 0.335308 0.693878
+23 1.35 0.918509 0.816327
+24 1.41 0.982348 0.959184
+25 1.47 0.903804 1.10204
+26 1.53 0.834316 1.2449
+27 1.59 0.551817 1.34694
+28 1.65 0.512419 1.44898
+29 1.71 0.381676 1.53061
+30 1.77 0.80154 1.71429
+31 1.83 0.999796 1.95918
+32 1.89 0.937329 2.20408
+33 1.95 0.953918 2.46939
+34 2.01 1.03595 2.77551
+35 2.07 0.846532 3.04082
+36 2.13 0.492009 3.20408
+37 2.19 1.0472 3.57143
+38 2.25 1.04721 3.95918
+39 2.31 0.993519 4.34694
+40 2.37 1.19224 4.83673
+41 2.43 0.803314 5.18367
+42 2.49 1.1251 5.69388
+43 2.55 0.858224 6.10204
+44 2.61 0.696338 6.44898
+45 2.67 1.21337 7.08163
+46 2.73 0.973423 7.61224
+47 2.79 1.14709 8.26531
+48 2.85 0.755767 8.71429
+49 2.91 1.21919 9.46939
+50 2.97 0.759197 9.95918
+104000 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 0 0
+9 0.51 1.07159 0.0204082
+10 0.57 0 0.0204082
+11 0.63 0 0.0204082
+12 0.69 0 0.0204082
+13 0.75 0 0.0204082
+14 0.81 0.425111 0.0408163
+15 0.87 1.10556 0.102041
+16 0.93 0.322518 0.122449
+17 0.99 0.569243 0.163265
+18 1.05 0.253031 0.183673
+19 1.11 0.452845 0.22449
+20 1.17 1.2228 0.346939
+21 1.23 1.47525 0.510204
+22 1.29 0.838269 0.612245
+23 1.35 1.22468 0.77551
+24 1.41 1.26302 0.959184
+25 1.47 1.29115 1.16327
+26 1.53 0.834316 1.30612
+27 1.59 0.993271 1.4898
+28 1.65 0.922354 1.67347
+29 1.71 1.43128 1.97959
+30 1.77 1.24684 2.26531
+31 1.83 0.249949 2.32653
+32 1.89 1.17166 2.63265
+33 1.95 0.880539 2.87755
+34 2.01 0.759695 3.10204
+35 2.07 0.781414 3.34694
+36 2.13 0.492009 3.5102
+37 2.19 1.0472 3.87755
+38 2.25 0.992094 4.2449
+39 2.31 0.888938 4.59184
+40 2.37 1.19224 5.08163
+41 2.43 0.803314 5.42857
+42 2.49 1.0801 5.91837
+43 2.55 1.20151 6.4898
+44 2.61 1.31075 7.14286
+45 2.67 0.821958 7.57143
+46 2.73 0.973423 8.10204
+47 2.79 0.788621 8.55102
+48 2.85 0.996238 9.14286
+49 2.91 0.626071 9.53061
+50 2.97 0.854097 10.0816
+104050 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 0 0
+9 0.51 0 0
+10 0.57 0 0
+11 0.63 1.40505 0.0408163
+12 0.69 0.585732 0.0612245
+13 0.75 0.991624 0.102041
+14 0.81 1.27533 0.163265
+15 0.87 0.737039 0.204082
+16 0.93 0.967555 0.265306
+17 0.99 1.42311 0.367347
+18 1.05 0.506063 0.408163
+19 1.11 0.90569 0.489796
+20 1.17 1.2228 0.612245
+21 1.23 1.10644 0.734694
+22 1.29 0.838269 0.836735
+23 1.35 1.07159 0.979592
+24 1.41 0.701677 1.08163
+25 1.47 0.645574 1.18367
+26 1.53 0.715128 1.30612
+27 1.59 0.993271 1.4898
+28 1.65 0.922354 1.67347
+29 1.71 0.477094 1.77551
+30 1.77 0.71248 1.93878
+31 1.83 0.749847 2.12245
+32 1.89 0.937329 2.36735
+33 1.95 1.32081 2.73469
+34 2.01 0.828758 2.97959
+35 2.07 0.976768 3.28571
+36 2.13 1.23002 3.69388
+37 2.19 0.930841 4.02041
+38 2.25 1.32279 4.5102
+39 2.31 0.941229 4.87755
+40 2.37 1.14256 5.34694
+41 2.43 1.08684 5.81633
+42 2.49 0.900081 6.22449
+43 2.55 0.772402 6.59184
+44 2.61 0.737299 6.95918
+45 2.67 1.09594 7.53061
+46 2.73 0.935984 8.04082
+47 2.79 1.14709 8.69388
+48 2.85 1.13365 9.36735
+49 2.91 0.823777 9.87755
+50 2.97 1.01226 10.5306
+104100 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 1.83099 0.0204082
+8 0.45 0 0.0204082
+9 0.51 2.14319 0.0612245
+10 0.57 0.858066 0.0816327
+11 0.63 0.702525 0.102041
+12 0.69 0.585732 0.122449
+13 0.75 0.495812 0.142857
+14 0.81 1.27533 0.204082
+15 0.87 1.10556 0.265306
+16 0.93 1.29007 0.346939
+17 0.99 0.284622 0.367347
+18 1.05 0.759094 0.428571
+19 1.11 0.452845 0.469388
+20 1.17 1.019 0.571429
+21 1.23 0.737623 0.653061
+22 1.29 1.17358 0.795918
+23 1.35 0.612339 0.877551
+24 1.41 0.842013 1
+25 1.47 0.645574 1.10204
+26 1.53 1.19188 1.30612
+27 1.59 0.551817 1.40816
+28 1.65 0.819871 1.57143
+29 1.71 1.43128 1.87755
+30 1.77 0.80154 2.06122
+31 1.83 1.16643 2.34694
+32 1.89 0.702997 2.53061
+33 1.95 1.0273 2.81633
+34 2.01 0.759695 3.04082
+35 2.07 1.23724 3.42857
+36 2.13 1.23002 3.83673
+37 2.19 0.698131 4.08163
+38 2.25 0.881861 4.40816
+39 2.31 0.888938 4.7551
+40 2.37 1.09288 5.20408
+41 2.43 0.803314 5.55102
+42 2.49 0.945085 5.97959
+43 2.55 1.24442 6.57143
+44 2.61 0.77826 6.95918
+45 2.67 0.861099 7.40816
+46 2.73 0.56159 7.71429
+47 2.79 1.14709 8.36735
+48 2.85 0.927532 8.91837
+49 2.91 1.35099 9.7551
+50 2.97 1.10716 10.4694
+104150 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 1.37595 0.0204082
+9 0.51 0 0.0204082
+10 0.57 0 0.0204082
+11 0.63 0.702525 0.0408163
+12 0.69 1.17146 0.0816327
+13 0.75 1.98325 0.163265
+14 0.81 0.425111 0.183673
+15 0.87 1.8426 0.285714
+16 0.93 1.29007 0.367347
+17 0.99 1.13849 0.44898
+18 1.05 1.26516 0.55102
+19 1.11 0.452845 0.591837
+20 1.17 0.8152 0.673469
+21 1.23 0.737623 0.755102
+22 1.29 1.00592 0.877551
+23 1.35 1.07159 1.02041
+24 1.41 0.701677 1.12245
+25 1.47 1.16203 1.30612
+26 1.53 0.834316 1.44898
+27 1.59 1.10363 1.65306
+28 1.65 0.819871 1.81633
+29 1.71 0.667932 1.95918
+30 1.77 0.62342 2.10204
+31 1.83 0.749847 2.28571
+32 1.89 1.09355 2.57143
+33 1.95 0.660405 2.7551
+34 2.01 0.828758 3
+35 2.07 1.36747 3.42857
+36 2.13 0.738014 3.67347
+37 2.19 1.10537 4.06122
+38 2.25 0.661396 4.30612
+39 2.31 0.888938 4.65306
+40 2.37 0.943854 5.04082
+41 2.43 1.27585 5.59184
+42 2.49 0.945085 6.02041
+43 2.55 1.41607 6.69388
+44 2.61 0.901143 7.14286
+45 2.67 0.861099 7.59184
+46 2.73 0.786226 8.02041
+47 2.79 1.32632 8.77551
+48 2.85 0.755767 9.22449
+49 2.91 1.18624 9.95918
+50 2.97 0.88573 10.5306
+104200 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 1.37595 0.0204082
+9 0.51 1.07159 0.0408163
+10 0.57 0 0.0408163
+11 0.63 2.10758 0.102041
+12 0.69 0 0.102041
+13 0.75 1.48744 0.163265
+14 0.81 0.850222 0.204082
+15 0.87 1.10556 0.265306
+16 0.93 0.967555 0.326531
+17 0.99 1.70773 0.44898
+18 1.05 0 0.44898
+19 1.11 0.679267 0.510204
+20 1.17 0.4076 0.55102
+21 1.23 1.29084 0.693878
+22 1.29 1.50888 0.877551
+23 1.35 0.765424 0.979592
+24 1.41 1.12268 1.14286
+25 1.47 0.645574 1.2449
+26 1.53 0.357564 1.30612
+27 1.59 0.33109 1.36735
+28 1.65 0.512419 1.46939
+29 1.71 1.04961 1.69388
+30 1.77 0.80154 1.87755
+31 1.83 1.08311 2.14286
+32 1.89 1.01544 2.40816
+33 1.95 0.880539 2.65306
+34 2.01 0.966885 2.93878
+35 2.07 1.17212 3.30612
+36 2.13 1.16852 3.69388
+37 2.19 1.0472 4.06122
+38 2.25 0.881861 4.38776
+39 2.31 1.0981 4.81633
+40 2.37 1.04321 5.2449
+41 2.43 0.708807 5.55102
+42 2.49 1.21511 6.10204
+43 2.55 1.20151 6.67347
+44 2.61 1.06499 7.20408
+45 2.67 1.0568 7.7551
+46 2.73 0.711348 8.14286
+47 2.79 0.716929 8.55102
+48 2.85 0.927532 9.10204
+49 2.91 1.05443 9.7551
+50 2.97 1.2337 10.551
+104250 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 0 0
+9 0.51 0 0
+10 0.57 0 0
+11 0.63 0 0
+12 0.69 0.585732 0.0204082
+13 0.75 1.98325 0.102041
+14 0.81 0 0.102041
+15 0.87 0.737039 0.142857
+16 0.93 0.967555 0.204082
+17 0.99 1.13849 0.285714
+18 1.05 1.26516 0.387755
+19 1.11 0.90569 0.469388
+20 1.17 0.6114 0.530612
+21 1.23 0.922029 0.632653
+22 1.29 0.335308 0.673469
+23 1.35 0.459254 0.734694
+24 1.41 0.842013 0.857143
+25 1.47 0.516459 0.938776
+26 1.53 0.119188 0.959184
+27 1.59 0.551817 1.06122
+28 1.65 1.22981 1.30612
+29 1.71 1.14503 1.55102
+30 1.77 0.890601 1.7551
+31 1.83 1.16643 2.04082
+32 1.89 0.937329 2.28571
+33 1.95 1.24743 2.63265
+34 2.01 0.966885 2.91837
+35 2.07 0.91165 3.20408
+36 2.13 1.35303 3.65306
+37 2.19 0.639953 3.87755
+38 2.25 1.10233 4.28571
+39 2.31 0.575195 4.5102
+40 2.37 1.34127 5.06122
+41 2.43 1.08684 5.53061
+42 2.49 1.03509 6
+43 2.55 0.944046 6.44898
+44 2.61 1.31075 7.10204
+45 2.67 0.743676 7.4898
+46 2.73 1.27294 8.18367
+47 2.79 0.932007 8.71429
+48 2.85 0.996238 9.30612
+49 2.91 0.988533 9.91837
+50 2.97 0.790831 10.4286
+104300 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 0 0
+9 0.51 0 0
+10 0.57 0.858066 0.0204082
+11 0.63 0 0.0204082
+12 0.69 1.17146 0.0612245
+13 0.75 0.495812 0.0816327
+14 0.81 0.850222 0.122449
+15 0.87 1.10556 0.183673
+16 0.93 0.967555 0.244898
+17 0.99 0.853865 0.306122
+18 1.05 0.253031 0.326531
+19 1.11 0.90569 0.408163
+20 1.17 0.6114 0.469388
+21 1.23 0.368812 0.510204
+22 1.29 1.00592 0.632653
+23 1.35 0.765424 0.734694
+24 1.41 0.842013 0.857143
+25 1.47 0.25823 0.897959
+26 1.53 1.19188 1.10204
+27 1.59 0.33109 1.16327
+28 1.65 1.02484 1.36735
+29 1.71 1.14503 1.61224
+30 1.77 0.890601 1.81633
+31 1.83 1.74964 2.2449
+32 1.89 1.79655 2.71429
+33 1.95 1.17405 3.04082
+34 2.01 0.690632 3.2449
+35 2.07 0.91165 3.53061
+36 2.13 0.922517 3.83673
+37 2.19 0.349066 3.95918
+38 2.25 0.716512 4.22449
+39 2.31 0.888938 4.57143
+40 2.37 0.943854 4.95918
+41 2.43 1.18134 5.46939
+42 2.49 0.765068 5.81633
+43 2.55 1.11569 6.34694
+44 2.61 1.18787 6.93878
+45 2.67 0.861099 7.38776
+46 2.73 1.08574 7.97959
+47 2.79 0.824468 8.44898
+48 2.85 0.996238 9.04082
+49 2.91 0.823777 9.55102
+50 2.97 1.1388 10.2857
+104350 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 0 0
+9 0.51 0 0
+10 0.57 0 0
+11 0.63 0 0
+12 0.69 0.585732 0.0204082
+13 0.75 1.48744 0.0816327
+14 0.81 2.12556 0.183673
+15 0.87 1.10556 0.244898
+16 0.93 0.645037 0.285714
+17 0.99 0.569243 0.326531
+18 1.05 0.759094 0.387755
+19 1.11 0.679267 0.44898
+20 1.17 0.2038 0.469388
+21 1.23 0.922029 0.571429
+22 1.29 0.502961 0.632653
+23 1.35 0.612339 0.714286
+24 1.41 1.12268 0.877551
+25 1.47 1.03292 1.04082
+26 1.53 1.31107 1.26531
+27 1.59 1.43472 1.53061
+28 1.65 0.819871 1.69388
+29 1.71 0.763351 1.85714
+30 1.77 0.80154 2.04082
+31 1.83 1.49969 2.40816
+32 1.89 0.937329 2.65306
+33 1.95 1.32081 3.02041
+34 2.01 0.690632 3.22449
+35 2.07 0.781414 3.46939
+36 2.13 0.922517 3.77551
+37 2.19 1.10537 4.16327
+38 2.25 0.936978 4.5102
+39 2.31 0.732067 4.79592
+40 2.37 1.14256 5.26531
+41 2.43 0.850568 5.63265
+42 2.49 0.630056 5.91837
+43 2.55 0.772402 6.28571
+44 2.61 0.819221 6.69388
+45 2.67 1.29165 7.36735
+46 2.73 1.01086 7.91837
+47 2.79 0.860314 8.40816
+48 2.85 1.13365 9.08163
+49 2.91 0.823777 9.59184
+50 2.97 1.1388 10.3265
+104400 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 1.83099 0.0204082
+8 0.45 0 0.0204082
+9 0.51 1.07159 0.0408163
+10 0.57 0.858066 0.0612245
+11 0.63 2.8101 0.142857
+12 0.69 1.7572 0.204082
+13 0.75 0 0.204082
+14 0.81 0.425111 0.22449
+15 0.87 0 0.22449
+16 0.93 0.967555 0.285714
+17 0.99 1.99235 0.428571
+18 1.05 0 0.428571
+19 1.11 0.90569 0.510204
+20 1.17 1.2228 0.632653
+21 1.23 0.553218 0.693878
+22 1.29 1.00592 0.816327
+23 1.35 0.918509 0.938776
+24 1.41 1.40335 1.14286
+25 1.47 1.03292 1.30612
+26 1.53 0.834316 1.44898
+27 1.59 0.882908 1.61224
+28 1.65 0.717387 1.7551
+29 1.71 0.572513 1.87755
+30 1.77 1.3359 2.18367
+31 1.83 0.749847 2.36735
+32 1.89 0.859219 2.59184
+33 1.95 1.10067 2.89796
+34 2.01 1.03595 3.20408
+35 2.07 1.23724 3.59184
+36 2.13 1.04552 3.93878
+37 2.19 0.872664 4.2449
+38 2.25 0.771629 4.53061
+39 2.31 1.56871 5.14286
+40 2.37 0.943854 5.53061
+41 2.43 0.708807 5.83673
+42 2.49 0.810072 6.20408
+43 2.55 1.20151 6.77551
+44 2.61 1.18787 7.36735
+45 2.67 1.40907 8.10204
+46 2.73 1.12318 8.71429
+47 2.79 0.967854 9.26531
+48 2.85 0.824473 9.7551
+49 2.91 0.790826 10.2449
+50 2.97 0.790831 10.7551
+104450 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 0 0
+9 0.51 0 0
+10 0.57 0 0
+11 0.63 1.40505 0.0408163
+12 0.69 0 0.0408163
+13 0.75 0.495812 0.0612245
+14 0.81 0.850222 0.102041
+15 0.87 1.47408 0.183673
+16 0.93 0.645037 0.22449
+17 0.99 0.853865 0.285714
+18 1.05 0.253031 0.306122
+19 1.11 0.90569 0.387755
+20 1.17 0.6114 0.44898
+21 1.23 0.922029 0.55102
+22 1.29 1.00592 0.673469
+23 1.35 0.459254 0.734694
+24 1.41 0.842013 0.857143
+25 1.47 0.645574 0.959184
+26 1.53 1.43026 1.20408
+27 1.59 1.43472 1.46939
+28 1.65 1.53726 1.77551
+29 1.71 0.667932 1.91837
+30 1.77 0.979661 2.14286
+31 1.83 0.833163 2.34694
+32 1.89 1.17166 2.65306
+33 1.95 1.0273 2.93878
+34 2.01 1.03595 3.2449
+35 2.07 0.846532 3.5102
+36 2.13 1.10702 3.87755
+37 2.19 0.698131 4.12245
+38 2.25 0.771629 4.40816
+39 2.31 0.575195 4.63265
+40 2.37 0.99353 5.04082
+41 2.43 1.2286 5.57143
+42 2.49 0.765068 5.91837
+43 2.55 1.02987 6.40816
+44 2.61 1.14691 6.97959
+45 2.67 0.978521 7.4898
+46 2.73 1.01086 8.04082
+47 2.79 0.860314 8.53061
+48 2.85 0.721414 8.95918
+49 2.91 0.955581 9.55102
+50 2.97 1.10716 10.2653
+104500 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 1.37595 0.0204082
+9 0.51 0 0.0204082
+10 0.57 1.71613 0.0612245
+11 0.63 0 0.0612245
+12 0.69 1.17146 0.102041
+13 0.75 0 0.102041
+14 0.81 0 0.102041
+15 0.87 1.47408 0.183673
+16 0.93 2.25763 0.326531
+17 0.99 1.13849 0.408163
+18 1.05 0.759094 0.469388
+19 1.11 0.90569 0.55102
+20 1.17 0.2038 0.571429
+21 1.23 0.553218 0.632653
+22 1.29 0.670615 0.714286
+23 1.35 0.765424 0.816327
+24 1.41 0.701677 0.918367
+25 1.47 0.903804 1.06122
+26 1.53 0.953504 1.22449
+27 1.59 1.10363 1.42857
+28 1.65 0.922354 1.61224
+29 1.71 0.763351 1.77551
+30 1.77 1.06872 2.02041
+31 1.83 1.16643 2.30612
+32 1.89 0.859219 2.53061
+33 1.95 0.587026 2.69388
+34 2.01 0.828758 2.93878
+35 2.07 1.04189 3.26531
+36 2.13 1.10702 3.63265
+37 2.19 1.0472 4
+38 2.25 0.992094 4.36735
+39 2.31 1.0981 4.79592
+40 2.37 0.894177 5.16327
+41 2.43 0.850568 5.53061
+42 2.49 1.21511 6.08163
+43 2.55 1.1586 6.63265
+44 2.61 0.737299 7
+45 2.67 1.13508 7.59184
+46 2.73 0.786226 8.02041
+47 2.79 1.18293 8.69388
+48 2.85 0.961885 9.26531
+49 2.91 1.08739 9.93878
+50 2.97 0.98063 10.5714
+104550 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 0 0
+9 0.51 1.07159 0.0204082
+10 0.57 0 0.0204082
+11 0.63 2.10758 0.0816327
+12 0.69 0.585732 0.102041
+13 0.75 0.495812 0.122449
+14 0.81 0.425111 0.142857
+15 0.87 0.368519 0.163265
+16 0.93 1.29007 0.244898
+17 0.99 0.569243 0.285714
+18 1.05 1.01213 0.367347
+19 1.11 1.13211 0.469388
+20 1.17 0.8152 0.55102
+21 1.23 0.922029 0.653061
+22 1.29 0.502961 0.714286
+23 1.35 1.07159 0.857143
+24 1.41 1.12268 1.02041
+25 1.47 1.16203 1.20408
+26 1.53 1.07269 1.38776
+27 1.59 0.551817 1.4898
+28 1.65 1.53726 1.79592
+29 1.71 0.477094 1.89796
+30 1.77 1.3359 2.20408
+31 1.83 0.999796 2.44898
+32 1.89 1.4841 2.83673
+33 1.95 0.587026 3
+34 2.01 1.10501 3.32653
+35 2.07 0.846532 3.59184
+36 2.13 1.35303 4.04082
+37 2.19 0.930841 4.36735
+38 2.25 1.15744 4.79592
+39 2.31 1.04581 5.20408
+40 2.37 1.39094 5.77551
+41 2.43 0.850568 6.14286
+42 2.49 0.855076 6.53061
+43 2.55 0.986958 7
+44 2.61 1.06499 7.53061
+45 2.67 1.29165 8.20408
+46 2.73 1.12318 8.81633
+47 2.79 1.07539 9.42857
+48 2.85 0.893179 9.95918
+49 2.91 1.15329 10.6735
+50 2.97 0.88573 11.2449
+104600 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 0 0
+9 0.51 2.14319 0.0408163
+10 0.57 0 0.0408163
+11 0.63 0.702525 0.0612245
+12 0.69 1.7572 0.122449
+13 0.75 0.991624 0.163265
+14 0.81 0.425111 0.183673
+15 0.87 0.368519 0.204082
+16 0.93 1.61259 0.306122
+17 0.99 1.42311 0.408163
+18 1.05 2.02425 0.571429
+19 1.11 0.452845 0.612245
+20 1.17 0.4076 0.653061
+21 1.23 0.184406 0.673469
+22 1.29 1.67654 0.877551
+23 1.35 0.765424 0.979592
+24 1.41 1.12268 1.14286
+25 1.47 0.903804 1.28571
+26 1.53 0.953504 1.44898
+27 1.59 0.882908 1.61224
+28 1.65 0.307451 1.67347
+29 1.71 1.24045 1.93878
+30 1.77 0.71248 2.10204
+31 1.83 1.58301 2.4898
+32 1.89 1.79655 2.95918
+33 1.95 1.10067 3.26531
+34 2.01 1.17407 3.61224
+35 2.07 1.04189 3.93878
+36 2.13 1.29152 4.36735
+37 2.19 0.756309 4.63265
+38 2.25 0.771629 4.91837
+39 2.31 0.941229 5.28571
+40 2.37 1.19224 5.77551
+41 2.43 1.03958 6.22449
+42 2.49 1.39512 6.85714
+43 2.55 0.858224 7.26531
+44 2.61 1.31075 7.91837
+45 2.67 0.978521 8.42857
+46 2.73 0.973423 8.95918
+47 2.79 1.0037 9.53061
+48 2.85 1.20236 10.2449
+49 2.91 0.988533 10.8571
+50 2.97 1.20206 11.6327
+104650 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 0 0
+9 0.51 0 0
+10 0.57 0 0
+11 0.63 0.702525 0.0204082
+12 0.69 1.17146 0.0612245
+13 0.75 1.98325 0.142857
+14 0.81 0.850222 0.183673
+15 0.87 1.10556 0.244898
+16 0.93 0 0.244898
+17 0.99 1.13849 0.326531
+18 1.05 1.51819 0.44898
+19 1.11 1.35853 0.571429
+20 1.17 1.4266 0.714286
+21 1.23 0.737623 0.795918
+22 1.29 1.67654 1
+23 1.35 0.918509 1.12245
+24 1.41 1.40335 1.32653
+25 1.47 0.387344 1.38776
+26 1.53 0.953504 1.55102
+27 1.59 1.43472 1.81633
+28 1.65 1.12732 2.04082
+29 1.71 1.24045 2.30612
+30 1.77 1.51402 2.65306
+31 1.83 1.24974 2.95918
+32 1.89 1.40599 3.32653
+33 1.95 0.880539 3.57143
+34 2.01 0.345316 3.67347
+35 2.07 1.107 4.02041
+36 2.13 1.10702 4.38776
+37 2.19 1.16355 4.79592
+38 2.25 1.26768 5.26531
+39 2.31 1.20268 5.73469
+40 2.37 1.09288 6.18367
+41 2.43 1.13409 6.67347
+42 2.49 1.53014 7.36735
+43 2.55 1.11569 7.89796
+44 2.61 1.31075 8.55102
+45 2.67 0.90024 9.02041
+46 2.73 1.08574 9.61224
+47 2.79 0.860314 10.102
+48 2.85 0.893179 10.6327
+49 2.91 0.988533 11.2449
+50 2.97 1.55003 12.2449
+104700 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 0 0
+9 0.51 0 0
+10 0.57 0 0
+11 0.63 0 0
+12 0.69 1.17146 0.0408163
+13 0.75 0.991624 0.0816327
+14 0.81 1.27533 0.142857
+15 0.87 1.10556 0.204082
+16 0.93 0.645037 0.244898
+17 0.99 1.99235 0.387755
+18 1.05 0.759094 0.44898
+19 1.11 1.35853 0.571429
+20 1.17 1.6304 0.734694
+21 1.23 1.10644 0.857143
+22 1.29 0.838269 0.959184
+23 1.35 2.14319 1.2449
+24 1.41 1.26302 1.42857
+25 1.47 1.67849 1.69388
+26 1.53 1.90701 2.02041
+27 1.59 0.882908 2.18367
+28 1.65 1.12732 2.40816
+29 1.71 0.572513 2.53061
+30 1.77 0.71248 2.69388
+31 1.83 1.08311 2.95918
+32 1.89 1.09355 3.2449
+33 1.95 1.17405 3.57143
+34 2.01 1.45033 4
+35 2.07 1.17212 4.36735
+36 2.13 1.23002 4.77551
+37 2.19 1.22173 5.20408
+38 2.25 0.551163 5.40816
+39 2.31 1.25497 5.89796
+40 2.37 1.04321 6.32653
+41 2.43 0.850568 6.69388
+42 2.49 0.945085 7.12245
+43 2.55 0.986958 7.59184
+44 2.61 1.31075 8.2449
+45 2.67 1.13508 8.83673
+46 2.73 1.4227 9.61224
+47 2.79 0.967854 10.1633
+48 2.85 1.0993 10.8163
+49 2.91 1.25214 11.5918
+50 2.97 1.20206 12.3673
+104750 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 1.37595 0.0204082
+9 0.51 0 0.0204082
+10 0.57 1.71613 0.0612245
+11 0.63 0 0.0612245
+12 0.69 0.585732 0.0816327
+13 0.75 0.495812 0.102041
+14 0.81 2.55067 0.22449
+15 0.87 0.737039 0.265306
+16 0.93 1.61259 0.367347
+17 0.99 0.853865 0.428571
+18 1.05 1.26516 0.530612
+19 1.11 1.58496 0.673469
+20 1.17 0.8152 0.755102
+21 1.23 0.737623 0.836735
+22 1.29 0.670615 0.918367
+23 1.35 1.53085 1.12245
+24 1.41 0.701677 1.22449
+25 1.47 1.29115 1.42857
+26 1.53 0.834316 1.57143
+27 1.59 1.76582 1.89796
+28 1.65 1.12732 2.12245
+29 1.71 0.572513 2.2449
+30 1.77 0.80154 2.42857
+31 1.83 0.916479 2.65306
+32 1.89 0.859219 2.87755
+33 1.95 0.807161 3.10204
+34 2.01 1.79564 3.63265
+35 2.07 1.23724 4.02041
+36 2.13 0.369007 4.14286
+37 2.19 0.989019 4.4898
+38 2.25 1.10233 4.89796
+39 2.31 1.20268 5.36735
+40 2.37 1.58965 6.02041
+41 2.43 1.18134 6.53061
+42 2.49 1.21511 7.08163
+43 2.55 0.944046 7.53061
+44 2.61 0.983065 8.02041
+45 2.67 1.01766 8.55102
+46 2.73 0.898544 9.04082
+47 2.79 0.824468 9.5102
+48 2.85 1.61459 10.4694
+49 2.91 1.31804 11.2857
+50 2.97 1.17043 12.0408
+104800 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 1.37595 0.0204082
+9 0.51 1.07159 0.0408163
+10 0.57 0.858066 0.0612245
+11 0.63 0.702525 0.0816327
+12 0.69 1.17146 0.122449
+13 0.75 0.495812 0.142857
+14 0.81 1.70044 0.22449
+15 0.87 0.737039 0.265306
+16 0.93 1.93511 0.387755
+17 0.99 1.99235 0.530612
+18 1.05 1.01213 0.612245
+19 1.11 0.679267 0.673469
+20 1.17 1.2228 0.795918
+21 1.23 1.10644 0.918367
+22 1.29 1.17358 1.06122
+23 1.35 0.918509 1.18367
+24 1.41 0.561342 1.26531
+25 1.47 1.16203 1.44898
+26 1.53 1.43026 1.69388
+27 1.59 1.54509 1.97959
+28 1.65 0.922354 2.16327
+29 1.71 0.85877 2.34694
+30 1.77 1.06872 2.59184
+31 1.83 1.24974 2.89796
+32 1.89 1.01544 3.16327
+33 1.95 1.10067 3.46939
+34 2.01 0.966885 3.7551
+35 2.07 1.43259 4.20408
+36 2.13 1.41453 4.67347
+37 2.19 0.639953 4.89796
+38 2.25 1.26768 5.36735
+39 2.31 0.784357 5.67347
+40 2.37 1.24191 6.18367
+41 2.43 1.13409 6.67347
+42 2.49 1.0801 7.16327
+43 2.55 0.600757 7.44898
+44 2.61 0.77826 7.83673
+45 2.67 1.21337 8.46939
+46 2.73 0.935984 8.97959
+47 2.79 1.25463 9.69388
+48 2.85 0.755767 10.1429
+49 2.91 1.15329 10.8571
+50 2.97 1.01226 11.5102
+104850 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 1.37595 0.0204082
+9 0.51 1.07159 0.0408163
+10 0.57 0.858066 0.0612245
+11 0.63 1.40505 0.102041
+12 0.69 0 0.102041
+13 0.75 1.98325 0.183673
+14 0.81 0.850222 0.22449
+15 0.87 1.10556 0.285714
+16 0.93 1.29007 0.367347
+17 0.99 0.569243 0.408163
+18 1.05 0.759094 0.469388
+19 1.11 0.679267 0.530612
+20 1.17 0.6114 0.591837
+21 1.23 0.922029 0.693878
+22 1.29 0.838269 0.795918
+23 1.35 1.22468 0.959184
+24 1.41 1.54369 1.18367
+25 1.47 1.42026 1.40816
+26 1.53 0.834316 1.55102
+27 1.59 0.662181 1.67347
+28 1.65 0.717387 1.81633
+29 1.71 0.954189 2.02041
+30 1.77 0.979661 2.2449
+31 1.83 0.749847 2.42857
+32 1.89 0.937329 2.67347
+33 1.95 0.880539 2.91837
+34 2.01 1.17407 3.26531
+35 2.07 1.43259 3.71429
+36 2.13 0.984018 4.04082
+37 2.19 1.27991 4.4898
+38 2.25 1.15744 4.91837
+39 2.31 1.25497 5.40816
+40 2.37 0.745148 5.71429
+41 2.43 0.75606 6.04082
+42 2.49 0.810072 6.40816
+43 2.55 1.07278 6.91837
+44 2.61 1.14691 7.4898
+45 2.67 1.13508 8.08163
+46 2.73 0.861105 8.55102
+47 2.79 1.03955 9.14286
+48 2.85 0.927532 9.69388
+49 2.91 0.988533 10.3061
+50 2.97 0.88573 10.8776
+104900 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 0 0
+9 0.51 0 0
+10 0.57 0 0
+11 0.63 0 0
+12 0.69 1.17146 0.0408163
+13 0.75 1.48744 0.102041
+14 0.81 1.27533 0.163265
+15 0.87 1.10556 0.22449
+16 0.93 1.93511 0.346939
+17 0.99 1.13849 0.428571
+18 1.05 0.759094 0.489796
+19 1.11 1.35853 0.612245
+20 1.17 0.2038 0.632653
+21 1.23 1.10644 0.755102
+22 1.29 0.335308 0.795918
+23 1.35 0.459254 0.857143
+24 1.41 1.40335 1.06122
+25 1.47 0.645574 1.16327
+26 1.53 1.43026 1.40816
+27 1.59 0.993271 1.59184
+28 1.65 1.02484 1.79592
+29 1.71 1.43128 2.10204
+30 1.77 0.890601 2.30612
+31 1.83 0.833163 2.5102
+32 1.89 0.781108 2.71429
+33 1.95 0.880539 2.95918
+34 2.01 1.03595 3.26531
+35 2.07 1.04189 3.59184
+36 2.13 0.922517 3.89796
+37 2.19 1.27991 4.34694
+38 2.25 0.936978 4.69388
+39 2.31 1.0981 5.12245
+40 2.37 1.04321 5.55102
+41 2.43 0.897822 5.93878
+42 2.49 0.720064 6.26531
+43 2.55 0.686579 6.59184
+44 2.61 0.983065 7.08163
+45 2.67 1.17423 7.69388
+46 2.73 1.08574 8.28571
+47 2.79 0.860314 8.77551
+48 2.85 0.927532 9.32653
+49 2.91 0.955581 9.91837
+50 2.97 0.88573 10.4898
+104950 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 0 0
+9 0.51 1.07159 0.0204082
+10 0.57 0.858066 0.0408163
+11 0.63 0.702525 0.0612245
+12 0.69 1.17146 0.102041
+13 0.75 0.495812 0.122449
+14 0.81 0.425111 0.142857
+15 0.87 1.10556 0.204082
+16 0.93 0.322518 0.22449
+17 0.99 0.853865 0.285714
+18 1.05 0.759094 0.346939
+19 1.11 1.13211 0.44898
+20 1.17 0 0.44898
+21 1.23 1.10644 0.571429
+22 1.29 1.17358 0.714286
+23 1.35 1.22468 0.877551
+24 1.41 0.421006 0.938776
+25 1.47 0.774689 1.06122
+26 1.53 1.07269 1.2449
+27 1.59 0.551817 1.34694
+28 1.65 0.819871 1.5102
+29 1.71 1.5267 1.83673
+30 1.77 0.4453 1.93878
+31 1.83 0.916479 2.16327
+32 1.89 0.702997 2.34694
+33 1.95 0.880539 2.59184
+34 2.01 0.690632 2.79592
+35 2.07 1.23724 3.18367
+36 2.13 1.23002 3.59184
+37 2.19 0.698131 3.83673
+38 2.25 0.992094 4.20408
+39 2.31 1.25497 4.69388
+40 2.37 0.844501 5.04082
+41 2.43 0.850568 5.40816
+42 2.49 1.0801 5.89796
+43 2.55 0.858224 6.30612
+44 2.61 1.26979 6.93878
+45 2.67 1.13508 7.53061
+46 2.73 1.0483 8.10204
+47 2.79 0.967854 8.65306
+48 2.85 1.06494 9.28571
+49 2.91 0.955581 9.87755
+50 2.97 0.790831 10.3878
+105000 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 0 0
+9 0.51 1.07159 0.0204082
+10 0.57 0 0.0204082
+11 0.63 0.702525 0.0408163
+12 0.69 0.585732 0.0612245
+13 0.75 0 0.0612245
+14 0.81 0.850222 0.102041
+15 0.87 1.10556 0.163265
+16 0.93 1.61259 0.265306
+17 0.99 0.853865 0.326531
+18 1.05 0.253031 0.346939
+19 1.11 0.90569 0.428571
+20 1.17 0.6114 0.489796
+21 1.23 0.737623 0.571429
+22 1.29 0.502961 0.632653
+23 1.35 1.07159 0.77551
+24 1.41 1.54369 1
+25 1.47 0.774689 1.12245
+26 1.53 0.834316 1.26531
+27 1.59 0.772544 1.40816
+28 1.65 0.307451 1.46939
+29 1.71 1.90838 1.87755
+30 1.77 0.80154 2.06122
+31 1.83 0.749847 2.2449
+32 1.89 0.859219 2.46939
+33 1.95 0.587026 2.63265
+34 2.01 1.72658 3.14286
+35 2.07 0.586061 3.32653
+36 2.13 0.738014 3.57143
+37 2.19 0.989019 3.91837
+38 2.25 1.04721 4.30612
+39 2.31 1.04581 4.71429
+40 2.37 0.645795 4.97959
+41 2.43 0.992329 5.40816
+42 2.49 0.540048 5.65306
+43 2.55 1.07278 6.16327
+44 2.61 1.26979 6.79592
+45 2.67 1.09594 7.36735
+46 2.73 0.861105 7.83673
+47 2.79 1.21878 8.53061
+48 2.85 1.03059 9.14286
+49 2.91 1.31804 9.95918
+50 2.97 1.01226 10.6122
+105050 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 0 0
+9 0.51 0 0
+10 0.57 0 0
+11 0.63 0 0
+12 0.69 0.585732 0.0204082
+13 0.75 0 0.0204082
+14 0.81 1.70044 0.102041
+15 0.87 2.21112 0.22449
+16 0.93 0.322518 0.244898
+17 0.99 0.284622 0.265306
+18 1.05 1.01213 0.346939
+19 1.11 0.679267 0.408163
+20 1.17 1.4266 0.55102
+21 1.23 0.184406 0.571429
+22 1.29 1.17358 0.714286
+23 1.35 0.765424 0.816327
+24 1.41 0.842013 0.938776
+25 1.47 0.516459 1.02041
+26 1.53 0.834316 1.16327
+27 1.59 1.214 1.38776
+28 1.65 1.74223 1.73469
+29 1.71 0.572513 1.85714
+30 1.77 1.15778 2.12245
+31 1.83 0.499898 2.2449
+32 1.89 1.17166 2.55102
+33 1.95 0.807161 2.77551
+34 2.01 1.10501 3.10204
+35 2.07 1.04189 3.42857
+36 2.13 0.799515 3.69388
+37 2.19 0.872664 4
+38 2.25 0.826745 4.30612
+39 2.31 1.15039 4.7551
+40 2.37 1.39094 5.32653
+41 2.43 0.75606 5.65306
+42 2.49 0.720064 5.97959
+43 2.55 1.5448 6.71429
+44 2.61 0.942104 7.18367
+45 2.67 0.90024 7.65306
+46 2.73 0.973423 8.18367
+47 2.79 0.967854 8.73469
+48 2.85 0.893179 9.26531
+49 2.91 1.15329 9.97959
+50 2.97 0.759197 10.4694
+105100 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 0 0
+9 0.51 0 0
+10 0.57 0 0
+11 0.63 1.40505 0.0408163
+12 0.69 0 0.0408163
+13 0.75 0.991624 0.0816327
+14 0.81 0.425111 0.102041
+15 0.87 1.47408 0.183673
+16 0.93 0.645037 0.22449
+17 0.99 0.853865 0.285714
+18 1.05 1.01213 0.367347
+19 1.11 1.13211 0.469388
+20 1.17 1.2228 0.591837
+21 1.23 0.553218 0.653061
+22 1.29 1.17358 0.795918
+23 1.35 0.612339 0.877551
+24 1.41 0.421006 0.938776
+25 1.47 1.29115 1.14286
+26 1.53 0.834316 1.28571
+27 1.59 1.54509 1.57143
+28 1.65 0.614903 1.69388
+29 1.71 1.14503 1.93878
+30 1.77 0.71248 2.10204
+31 1.83 1.08311 2.36735
+32 1.89 1.40599 2.73469
+33 1.95 0.513648 2.87755
+34 2.01 0.897822 3.14286
+35 2.07 1.62795 3.65306
+36 2.13 1.10702 4.02041
+37 2.19 1.22173 4.44898
+38 2.25 1.26768 4.91837
+39 2.31 0.888938 5.26531
+40 2.37 0.844501 5.61224
+41 2.43 1.2286 6.14286
+42 2.49 1.0801 6.63265
+43 2.55 1.20151 7.20408
+44 2.61 0.737299 7.57143
+45 2.67 0.93938 8.06122
+46 2.73 0.935984 8.57143
+47 2.79 1.07539 9.18367
+48 2.85 0.824473 9.67347
+49 2.91 0.757875 10.1429
+50 2.97 1.10716 10.8571
+105150 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 2.55534 0.0204082
+7 0.39 0 0.0204082
+8 0.45 0 0.0204082
+9 0.51 0 0.0204082
+10 0.57 0.858066 0.0408163
+11 0.63 0.702525 0.0612245
+12 0.69 0.585732 0.0816327
+13 0.75 0 0.0816327
+14 0.81 0.850222 0.122449
+15 0.87 0.368519 0.142857
+16 0.93 1.29007 0.22449
+17 0.99 1.13849 0.306122
+18 1.05 0.506063 0.346939
+19 1.11 1.35853 0.469388
+20 1.17 0 0.469388
+21 1.23 0.553218 0.530612
+22 1.29 1.67654 0.734694
+23 1.35 1.22468 0.897959
+24 1.41 1.12268 1.06122
+25 1.47 0.903804 1.20408
+26 1.53 0.834316 1.34694
+27 1.59 0.993271 1.53061
+28 1.65 1.53726 1.83673
+29 1.71 0.667932 1.97959
+30 1.77 1.06872 2.22449
+31 1.83 0.749847 2.40816
+32 1.89 1.40599 2.77551
+33 1.95 1.0273 3.06122
+34 2.01 0.828758 3.30612
+35 2.07 0.781414 3.55102
+36 2.13 1.16852 3.93878
+37 2.19 0.872664 4.2449
+38 2.25 0.881861 4.57143
+39 2.31 0.941229 4.93878
+40 2.37 1.39094 5.5102
+41 2.43 0.945075 5.91837
+42 2.49 0.855076 6.30612
+43 2.55 1.11569 6.83673
+44 2.61 1.26979 7.46939
+45 2.67 1.01766 8
+46 2.73 1.16062 8.63265
+47 2.79 1.07539 9.2449
+48 2.85 0.824473 9.73469
+49 2.91 1.08739 10.4082
+50 2.97 0.948997 11.0204
+105200 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 0 0
+9 0.51 1.07159 0.0204082
+10 0.57 0.858066 0.0408163
+11 0.63 0.702525 0.0612245
+12 0.69 2.92866 0.163265
+13 0.75 1.98325 0.244898
+14 0.81 0.425111 0.265306
+15 0.87 0.737039 0.306122
+16 0.93 0.322518 0.326531
+17 0.99 1.42311 0.428571
+18 1.05 1.01213 0.510204
+19 1.11 0.452845 0.55102
+20 1.17 0.2038 0.571429
+21 1.23 1.10644 0.693878
+22 1.29 0.502961 0.755102
+23 1.35 1.37776 0.938776
+24 1.41 0.701677 1.04082
+25 1.47 0.645574 1.14286
+26 1.53 1.07269 1.32653
+27 1.59 0.993271 1.5102
+28 1.65 0.717387 1.65306
+29 1.71 0.85877 1.83673
+30 1.77 1.24684 2.12245
+31 1.83 0.916479 2.34694
+32 1.89 1.32788 2.69388
+33 1.95 1.0273 2.97959
+34 2.01 0.828758 3.22449
+35 2.07 1.30236 3.63265
+36 2.13 1.29152 4.06122
+37 2.19 0.756309 4.32653
+38 2.25 0.936978 4.67347
+39 2.31 0.836648 5
+40 2.37 1.04321 5.42857
+41 2.43 0.897822 5.81633
+42 2.49 1.1251 6.32653
+43 2.55 0.815313 6.71429
+44 2.61 0.737299 7.08163
+45 2.67 1.29165 7.7551
+46 2.73 1.19806 8.40816
+47 2.79 1.14709 9.06122
+48 2.85 0.893179 9.59184
+49 2.91 0.92263 10.1633
+50 2.97 0.98063 10.7959
+105250 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 0 0
+9 0.51 1.07159 0.0204082
+10 0.57 0 0.0204082
+11 0.63 2.10758 0.0816327
+12 0.69 1.7572 0.142857
+13 0.75 0 0.142857
+14 0.81 1.27533 0.204082
+15 0.87 1.47408 0.285714
+16 0.93 0.645037 0.326531
+17 0.99 1.13849 0.408163
+18 1.05 0.759094 0.469388
+19 1.11 0.679267 0.530612
+20 1.17 0.8152 0.612245
+21 1.23 0.922029 0.714286
+22 1.29 1.17358 0.857143
+23 1.35 0.612339 0.938776
+24 1.41 0.140335 0.959184
+25 1.47 0.516459 1.04082
+26 1.53 1.07269 1.22449
+27 1.59 1.214 1.44898
+28 1.65 0.614903 1.57143
+29 1.71 0.667932 1.71429
+30 1.77 0.62342 1.85714
+31 1.83 0.999796 2.10204
+32 1.89 0.781108 2.30612
+33 1.95 1.46757 2.71429
+34 2.01 0.690632 2.91837
+35 2.07 0.91165 3.20408
+36 2.13 1.29152 3.63265
+37 2.19 0.814486 3.91837
+38 2.25 1.37791 4.42857
+39 2.31 1.30726 4.93878
+40 2.37 1.04321 5.36735
+41 2.43 0.945075 5.77551
+42 2.49 0.855076 6.16327
+43 2.55 1.07278 6.67347
+44 2.61 1.06499 7.20408
+45 2.67 1.29165 7.87755
+46 2.73 1.27294 8.57143
+47 2.79 0.824468 9.04082
+48 2.85 0.927532 9.59184
+49 2.91 0.955581 10.1837
+50 2.97 0.917363 10.7755
+105300 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 0 0
+9 0.51 0 0
+10 0.57 0 0
+11 0.63 0.702525 0.0204082
+12 0.69 1.17146 0.0612245
+13 0.75 0.495812 0.0816327
+14 0.81 1.27533 0.142857
+15 0.87 1.8426 0.244898
+16 0.93 0.645037 0.285714
+17 0.99 0.284622 0.306122
+18 1.05 1.01213 0.387755
+19 1.11 0.226422 0.408163
+20 1.17 1.6304 0.571429
+21 1.23 0.922029 0.673469
+22 1.29 0.335308 0.714286
+23 1.35 0.765424 0.816327
+24 1.41 0.280671 0.857143
+25 1.47 0.387344 0.918367
+26 1.53 0.715128 1.04082
+27 1.59 0.772544 1.18367
+28 1.65 1.02484 1.38776
+29 1.71 0.85877 1.57143
+30 1.77 1.51402 1.91837
+31 1.83 1.16643 2.20408
+32 1.89 0.937329 2.44898
+33 1.95 0.880539 2.69388
+34 2.01 0.828758 2.93878
+35 2.07 1.17212 3.30612
+36 2.13 0.922517 3.61224
+37 2.19 1.16355 4.02041
+38 2.25 1.32279 4.5102
+39 2.31 0.732067 4.79592
+40 2.37 0.943854 5.18367
+41 2.43 1.32311 5.7551
+42 2.49 0.855076 6.14286
+43 2.55 1.11569 6.67347
+44 2.61 0.860182 7.10204
+45 2.67 0.978521 7.61224
+46 2.73 1.12318 8.22449
+47 2.79 0.967854 8.77551
+48 2.85 0.79012 9.2449
+49 2.91 0.988533 9.85714
+50 2.97 0.88573 10.4286
+105350 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 1.83099 0.0204082
+8 0.45 0 0.0204082
+9 0.51 0 0.0204082
+10 0.57 0 0.0204082
+11 0.63 1.40505 0.0612245
+12 0.69 0.585732 0.0816327
+13 0.75 0.991624 0.122449
+14 0.81 0.425111 0.142857
+15 0.87 0.368519 0.163265
+16 0.93 1.29007 0.244898
+17 0.99 1.13849 0.326531
+18 1.05 0.759094 0.387755
+19 1.11 0.90569 0.469388
+20 1.17 0 0.469388
+21 1.23 1.47525 0.632653
+22 1.29 0.838269 0.734694
+23 1.35 0.765424 0.836735
+24 1.41 0.421006 0.897959
+25 1.47 1.16203 1.08163
+26 1.53 1.43026 1.32653
+27 1.59 0.33109 1.38776
+28 1.65 0.512419 1.4898
+29 1.71 0.667932 1.63265
+30 1.77 0.890601 1.83673
+31 1.83 0.916479 2.06122
+32 1.89 1.01544 2.32653
+33 1.95 0.880539 2.57143
+34 2.01 1.10501 2.89796
+35 2.07 1.107 3.2449
+36 2.13 0.861016 3.53061
+37 2.19 0.581776 3.73469
+38 2.25 1.10233 4.14286
+39 2.31 0.784357 4.44898
+40 2.37 0.794824 4.77551
+41 2.43 1.13409 5.26531
+42 2.49 1.48513 5.93878
+43 2.55 1.02987 6.42857
+44 2.61 0.737299 6.79592
+45 2.67 1.01766 7.32653
+46 2.73 1.16062 7.95918
+47 2.79 1.0037 8.53061
+48 2.85 0.858826 9.04082
+49 2.91 0.988533 9.65306
+50 2.97 1.0439 10.3265
+105400 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 0 0
+9 0.51 0 0
+10 0.57 0 0
+11 0.63 0.702525 0.0204082
+12 0.69 1.7572 0.0816327
+13 0.75 0 0.0816327
+14 0.81 1.27533 0.142857
+15 0.87 1.10556 0.204082
+16 0.93 0.322518 0.22449
+17 0.99 0.853865 0.285714
+18 1.05 0.253031 0.306122
+19 1.11 1.35853 0.428571
+20 1.17 0.2038 0.44898
+21 1.23 0.922029 0.55102
+22 1.29 0.670615 0.632653
+23 1.35 0.459254 0.693878
+24 1.41 0.982348 0.836735
+25 1.47 0.645574 0.938776
+26 1.53 0.59594 1.04082
+27 1.59 0.772544 1.18367
+28 1.65 0.922354 1.36735
+29 1.71 1.04961 1.59184
+30 1.77 1.7812 2
+31 1.83 0.916479 2.22449
+32 1.89 1.09355 2.5102
+33 1.95 1.46757 2.91837
+34 2.01 1.03595 3.22449
+35 2.07 0.91165 3.5102
+36 2.13 0.861016 3.79592
+37 2.19 0.930841 4.12245
+38 2.25 1.32279 4.61224
+39 2.31 1.04581 5.02041
+40 2.37 1.04321 5.44898
+41 2.43 0.567045 5.69388
+42 2.49 1.53014 6.38776
+43 2.55 1.11569 6.91837
+44 2.61 0.655377 7.2449
+45 2.67 0.978521 7.7551
+46 2.73 0.973423 8.28571
+47 2.79 1.25463 9
+48 2.85 0.858826 9.5102
+49 2.91 1.05443 10.1633
+50 2.97 0.854097 10.7143
+105450 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 0 0
+9 0.51 0 0
+10 0.57 0 0
+11 0.63 2.10758 0.0612245
+12 0.69 0.585732 0.0816327
+13 0.75 0 0.0816327
+14 0.81 1.70044 0.163265
+15 0.87 2.21112 0.285714
+16 0.93 0.967555 0.346939
+17 0.99 1.13849 0.428571
+18 1.05 0 0.428571
+19 1.11 1.35853 0.55102
+20 1.17 0.8152 0.632653
+21 1.23 0.553218 0.693878
+22 1.29 0.670615 0.77551
+23 1.35 1.07159 0.918367
+24 1.41 0.701677 1.02041
+25 1.47 1.29115 1.22449
+26 1.53 1.43026 1.46939
+27 1.59 1.10363 1.67347
+28 1.65 0.922354 1.85714
+29 1.71 0.85877 2.04082
+30 1.77 1.06872 2.28571
+31 1.83 0.999796 2.53061
+32 1.89 0.859219 2.7551
+33 1.95 0.660405 2.93878
+34 2.01 0.690632 3.14286
+35 2.07 0.846532 3.40816
+36 2.13 0.984018 3.73469
+37 2.19 0.523598 3.91837
+38 2.25 1.37791 4.42857
+39 2.31 0.993519 4.81633
+40 2.37 1.24191 5.32653
+41 2.43 1.08684 5.79592
+42 2.49 0.900081 6.20408
+43 2.55 0.815313 6.59184
+44 2.61 1.31075 7.2449
+45 2.67 0.782817 7.65306
+46 2.73 0.823666 8.10204
+47 2.79 1.11124 8.73469
+48 2.85 1.06494 9.36735
+49 2.91 1.15329 10.0816
+50 2.97 0.822464 10.6122
+105500 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 1.83099 0.0204082
+8 0.45 0 0.0204082
+9 0.51 0 0.0204082
+10 0.57 0 0.0204082
+11 0.63 1.40505 0.0612245
+12 0.69 0.585732 0.0816327
+13 0.75 0 0.0816327
+14 0.81 1.70044 0.163265
+15 0.87 1.10556 0.22449
+16 0.93 1.29007 0.306122
+17 0.99 1.13849 0.387755
+18 1.05 1.01213 0.469388
+19 1.11 0.90569 0.55102
+20 1.17 0.4076 0.591837
+21 1.23 0.922029 0.693878
+22 1.29 1.17358 0.836735
+23 1.35 0.612339 0.918367
+24 1.41 1.12268 1.08163
+25 1.47 1.16203 1.26531
+26 1.53 0.715128 1.38776
+27 1.59 0.772544 1.53061
+28 1.65 0.819871 1.69388
+29 1.71 1.14503 1.93878
+30 1.77 1.06872 2.18367
+31 1.83 0.999796 2.42857
+32 1.89 1.24977 2.7551
+33 1.95 1.61432 3.20408
+34 2.01 0.828758 3.44898
+35 2.07 0.716296 3.67347
+36 2.13 0.861016 3.95918
+37 2.19 0.756309 4.22449
+38 2.25 1.21256 4.67347
+39 2.31 0.836648 5
+40 2.37 0.745148 5.30612
+41 2.43 1.08684 5.77551
+42 2.49 1.03509 6.2449
+43 2.55 0.643668 6.55102
+44 2.61 0.942104 7.02041
+45 2.67 0.743676 7.40816
+46 2.73 0.861105 7.87755
+47 2.79 1.18293 8.55102
+48 2.85 1.13365 9.22449
+49 2.91 1.35099 10.0612
+50 2.97 1.07553 10.7551
+105550 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 0 0
+9 0.51 0 0
+10 0.57 0 0
+11 0.63 0.702525 0.0204082
+12 0.69 1.7572 0.0816327
+13 0.75 0 0.0816327
+14 0.81 1.27533 0.142857
+15 0.87 0.737039 0.183673
+16 0.93 0.322518 0.204082
+17 0.99 1.42311 0.306122
+18 1.05 1.51819 0.428571
+19 1.11 0.226422 0.44898
+20 1.17 1.2228 0.571429
+21 1.23 0.922029 0.673469
+22 1.29 0.670615 0.755102
+23 1.35 0.765424 0.857143
+24 1.41 0.842013 0.979592
+25 1.47 1.16203 1.16327
+26 1.53 0.834316 1.30612
+27 1.59 0.882908 1.46939
+28 1.65 1.12732 1.69388
+29 1.71 0.667932 1.83673
+30 1.77 0.71248 2
+31 1.83 1.41638 2.34694
+32 1.89 1.01544 2.61224
+33 1.95 0.660405 2.79592
+34 2.01 0.552506 2.95918
+35 2.07 1.30236 3.36735
+36 2.13 0.922517 3.67347
+37 2.19 1.22173 4.10204
+38 2.25 0.716512 4.36735
+39 2.31 1.0981 4.79592
+40 2.37 0.844501 5.14286
+41 2.43 0.850568 5.5102
+42 2.49 1.0801 6
+43 2.55 0.858224 6.40816
+44 2.61 0.819221 6.81633
+45 2.67 0.978521 7.32653
+46 2.73 1.08574 7.91837
+47 2.79 1.50555 8.77551
+48 2.85 1.47718 9.65306
+49 2.91 1.15329 10.3673
+50 2.97 1.10716 11.0816
+105600 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 1.37595 0.0204082
+9 0.51 0 0.0204082
+10 0.57 0 0.0204082
+11 0.63 2.10758 0.0816327
+12 0.69 0.585732 0.102041
+13 0.75 0.991624 0.142857
+14 0.81 1.27533 0.204082
+15 0.87 1.47408 0.285714
+16 0.93 1.29007 0.367347
+17 0.99 1.13849 0.44898
+18 1.05 0.253031 0.469388
+19 1.11 1.35853 0.591837
+20 1.17 0.8152 0.673469
+21 1.23 0.184406 0.693878
+22 1.29 0.502961 0.755102
+23 1.35 0.459254 0.816327
+24 1.41 1.26302 1
+25 1.47 0.516459 1.08163
+26 1.53 0.59594 1.18367
+27 1.59 0.772544 1.32653
+28 1.65 0.717387 1.46939
+29 1.71 0.763351 1.63265
+30 1.77 1.06872 1.87755
+31 1.83 0.583214 2.02041
+32 1.89 1.09355 2.30612
+33 1.95 0.953918 2.57143
+34 2.01 0.966885 2.85714
+35 2.07 0.846532 3.12245
+36 2.13 0.738014 3.36735
+37 2.19 0.989019 3.71429
+38 2.25 1.10233 4.12245
+39 2.31 0.993519 4.5102
+40 2.37 1.29159 5.04082
+41 2.43 1.03958 5.4898
+42 2.49 1.39512 6.12245
+43 2.55 1.11569 6.65306
+44 2.61 1.06499 7.18367
+45 2.67 1.29165 7.85714
+46 2.73 0.898544 8.34694
+47 2.79 1.07539 8.95918
+48 2.85 0.893179 9.4898
+49 2.91 0.856728 10.0204
+50 2.97 1.1388 10.7551
+105650 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 1.83099 0.0204082
+8 0.45 0 0.0204082
+9 0.51 0 0.0204082
+10 0.57 0 0.0204082
+11 0.63 2.10758 0.0816327
+12 0.69 0.585732 0.102041
+13 0.75 0 0.102041
+14 0.81 1.27533 0.163265
+15 0.87 1.10556 0.22449
+16 0.93 0 0.22449
+17 0.99 0.569243 0.265306
+18 1.05 1.26516 0.367347
+19 1.11 0.452845 0.408163
+20 1.17 1.2228 0.530612
+21 1.23 1.29084 0.673469
+22 1.29 0.335308 0.714286
+23 1.35 0.765424 0.816327
+24 1.41 0.982348 0.959184
+25 1.47 0.774689 1.08163
+26 1.53 0.59594 1.18367
+27 1.59 0.993271 1.36735
+28 1.65 1.12732 1.59184
+29 1.71 1.14503 1.83673
+30 1.77 0.71248 2
+31 1.83 0.999796 2.2449
+32 1.89 1.17166 2.55102
+33 1.95 0.880539 2.79592
+34 2.01 1.17407 3.14286
+35 2.07 0.716296 3.36735
+36 2.13 0.492009 3.53061
+37 2.19 1.16355 3.93878
+38 2.25 1.10233 4.34694
+39 2.31 0.993519 4.73469
+40 2.37 1.19224 5.22449
+41 2.43 1.18134 5.73469
+42 2.49 0.900081 6.14286
+43 2.55 0.901135 6.57143
+44 2.61 0.819221 6.97959
+45 2.67 1.40907 7.71429
+46 2.73 1.01086 8.26531
+47 2.79 0.896161 8.77551
+48 2.85 0.893179 9.30612
+49 2.91 0.988533 9.91837
+50 2.97 0.759197 10.4082
+105700 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 1.37595 0.0204082
+9 0.51 1.07159 0.0408163
+10 0.57 0 0.0408163
+11 0.63 0.702525 0.0612245
+12 0.69 1.17146 0.102041
+13 0.75 0.991624 0.142857
+14 0.81 0.425111 0.163265
+15 0.87 2.21112 0.285714
+16 0.93 0.645037 0.326531
+17 0.99 1.13849 0.408163
+18 1.05 1.51819 0.530612
+19 1.11 0.452845 0.571429
+20 1.17 0.6114 0.632653
+21 1.23 0.553218 0.693878
+22 1.29 1.00592 0.816327
+23 1.35 0.612339 0.897959
+24 1.41 0.842013 1.02041
+25 1.47 1.29115 1.22449
+26 1.53 1.43026 1.46939
+27 1.59 0.662181 1.59184
+28 1.65 0.819871 1.7551
+29 1.71 1.04961 1.97959
+30 1.77 0.979661 2.20408
+31 1.83 0.916479 2.42857
+32 1.89 0.781108 2.63265
+33 1.95 0.880539 2.87755
+34 2.01 0.897822 3.14286
+35 2.07 0.976768 3.44898
+36 2.13 0.861016 3.73469
+37 2.19 0.930841 4.06122
+38 2.25 1.15744 4.4898
+39 2.31 0.941229 4.85714
+40 2.37 0.745148 5.16327
+41 2.43 1.32311 5.73469
+42 2.49 1.26011 6.30612
+43 2.55 0.901135 6.73469
+44 2.61 0.942104 7.20408
+45 2.67 0.93938 7.69388
+46 2.73 0.935984 8.20408
+47 2.79 1.07539 8.81633
+48 2.85 1.168 9.5102
+49 2.91 1.12034 10.2041
+50 2.97 0.854097 10.7551
+105750 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 0 0
+9 0.51 1.07159 0.0204082
+10 0.57 0.858066 0.0408163
+11 0.63 0 0.0408163
+12 0.69 0.585732 0.0612245
+13 0.75 0.495812 0.0816327
+14 0.81 2.12556 0.183673
+15 0.87 0.368519 0.204082
+16 0.93 1.29007 0.285714
+17 0.99 1.42311 0.387755
+18 1.05 1.01213 0.469388
+19 1.11 0.452845 0.510204
+20 1.17 0.4076 0.55102
+21 1.23 0.922029 0.653061
+22 1.29 1.17358 0.795918
+23 1.35 0.918509 0.918367
+24 1.41 0.982348 1.06122
+25 1.47 1.16203 1.2449
+26 1.53 0.953504 1.40816
+27 1.59 0.772544 1.55102
+28 1.65 1.43477 1.83673
+29 1.71 0.954189 2.04082
+30 1.77 1.15778 2.30612
+31 1.83 0.916479 2.53061
+32 1.89 1.17166 2.83673
+33 1.95 0.880539 3.08163
+34 2.01 0.966885 3.36735
+35 2.07 0.781414 3.61224
+36 2.13 0.615011 3.81633
+37 2.19 0.989019 4.16327
+38 2.25 0.826745 4.46939
+39 2.31 0.993519 4.85714
+40 2.37 1.09288 5.30612
+41 2.43 0.614299 5.57143
+42 2.49 0.765068 5.91837
+43 2.55 0.944046 6.36735
+44 2.61 1.02403 6.87755
+45 2.67 0.978521 7.38776
+46 2.73 0.973423 7.91837
+47 2.79 0.932007 8.44898
+48 2.85 1.0993 9.10204
+49 2.91 1.05443 9.7551
+50 2.97 0.822464 10.2857
+105800 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 1.83099 0.0204082
+8 0.45 0 0.0204082
+9 0.51 0 0.0204082
+10 0.57 0 0.0204082
+11 0.63 0.702525 0.0408163
+12 0.69 0.585732 0.0612245
+13 0.75 0.495812 0.0816327
+14 0.81 0 0.0816327
+15 0.87 1.47408 0.163265
+16 0.93 0.322518 0.183673
+17 0.99 1.13849 0.265306
+18 1.05 0.759094 0.326531
+19 1.11 0.90569 0.408163
+20 1.17 0.4076 0.44898
+21 1.23 0.922029 0.55102
+22 1.29 0.335308 0.591837
+23 1.35 1.07159 0.734694
+24 1.41 1.82436 1
+25 1.47 0.903804 1.14286
+26 1.53 0.953504 1.30612
+27 1.59 0.441454 1.38776
+28 1.65 1.02484 1.59184
+29 1.71 0.954189 1.79592
+30 1.77 0.979661 2.02041
+31 1.83 1.16643 2.30612
+32 1.89 0.937329 2.55102
+33 1.95 1.0273 2.83673
+34 2.01 1.10501 3.16327
+35 2.07 1.107 3.5102
+36 2.13 1.41453 3.97959
+37 2.19 1.0472 4.34694
+38 2.25 0.661396 4.59184
+39 2.31 0.836648 4.91837
+40 2.37 1.09288 5.36735
+41 2.43 0.945075 5.77551
+42 2.49 0.900081 6.18367
+43 2.55 0.772402 6.55102
+44 2.61 0.901143 7
+45 2.67 1.01766 7.53061
+46 2.73 0.935984 8.04082
+47 2.79 0.860314 8.53061
+48 2.85 0.824473 9.02041
+49 2.91 1.21919 9.77551
+50 2.97 0.759197 10.2653
+105850 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 0 0
+9 0.51 0 0
+10 0.57 0.858066 0.0204082
+11 0.63 0 0.0204082
+12 0.69 1.17146 0.0612245
+13 0.75 0.495812 0.0816327
+14 0.81 0.425111 0.102041
+15 0.87 0.737039 0.142857
+16 0.93 0.967555 0.204082
+17 0.99 0.853865 0.265306
+18 1.05 1.01213 0.346939
+19 1.11 1.81138 0.510204
+20 1.17 1.6304 0.673469
+21 1.23 0.737623 0.755102
+22 1.29 0.670615 0.836735
+23 1.35 1.22468 1
+24 1.41 0.842013 1.12245
+25 1.47 0.774689 1.2449
+26 1.53 0.834316 1.38776
+27 1.59 0.993271 1.57143
+28 1.65 1.12732 1.79592
+29 1.71 1.24045 2.06122
+30 1.77 0.80154 2.2449
+31 1.83 0.999796 2.4898
+32 1.89 0.546775 2.63265
+33 1.95 0.807161 2.85714
+34 2.01 0.897822 3.12245
+35 2.07 0.716296 3.34694
+36 2.13 1.35303 3.79592
+37 2.19 1.22173 4.22449
+38 2.25 1.04721 4.61224
+39 2.31 0.993519 5
+40 2.37 1.14256 5.46939
+41 2.43 0.945075 5.87755
+42 2.49 0.765068 6.22449
+43 2.55 0.944046 6.67347
+44 2.61 0.860182 7.10204
+45 2.67 0.821958 7.53061
+46 2.73 1.2355 8.20408
+47 2.79 0.788621 8.65306
+48 2.85 0.824473 9.14286
+49 2.91 0.823777 9.65306
+50 2.97 1.01226 10.3061
+105900 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 1.83099 0.0204082
+8 0.45 0 0.0204082
+9 0.51 0 0.0204082
+10 0.57 0 0.0204082
+11 0.63 0 0.0204082
+12 0.69 1.17146 0.0612245
+13 0.75 0.991624 0.102041
+14 0.81 0.425111 0.122449
+15 0.87 2.21112 0.244898
+16 0.93 1.29007 0.326531
+17 0.99 0.284622 0.346939
+18 1.05 1.01213 0.428571
+19 1.11 0.679267 0.489796
+20 1.17 1.2228 0.612245
+21 1.23 0.553218 0.673469
+22 1.29 0.167654 0.693878
+23 1.35 0.765424 0.795918
+24 1.41 0.701677 0.897959
+25 1.47 1.80761 1.18367
+26 1.53 1.07269 1.36735
+27 1.59 1.54509 1.65306
+28 1.65 0.717387 1.79592
+29 1.71 0.572513 1.91837
+30 1.77 0.62342 2.06122
+31 1.83 1.24974 2.36735
+32 1.89 0.546775 2.5102
+33 1.95 1.0273 2.79592
+34 2.01 0.828758 3.04082
+35 2.07 0.91165 3.32653
+36 2.13 0.738014 3.57143
+37 2.19 1.16355 3.97959
+38 2.25 1.37791 4.4898
+39 2.31 0.941229 4.85714
+40 2.37 1.04321 5.28571
+41 2.43 0.897822 5.67347
+42 2.49 1.03509 6.14286
+43 2.55 0.72949 6.4898
+44 2.61 1.18787 7.08163
+45 2.67 1.13508 7.67347
+46 2.73 1.19806 8.32653
+47 2.79 0.967854 8.87755
+48 2.85 0.824473 9.36735
+49 2.91 0.494266 9.67347
+50 2.97 0.727564 10.1429
+105950 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 2.55534 0.0204082
+7 0.39 0 0.0204082
+8 0.45 0 0.0204082
+9 0.51 1.07159 0.0408163
+10 0.57 0 0.0408163
+11 0.63 0.702525 0.0612245
+12 0.69 1.7572 0.122449
+13 0.75 0.991624 0.163265
+14 0.81 0.850222 0.204082
+15 0.87 1.47408 0.285714
+16 0.93 0.967555 0.346939
+17 0.99 0.853865 0.408163
+18 1.05 0.759094 0.469388
+19 1.11 0.90569 0.55102
+20 1.17 0.8152 0.632653
+21 1.23 0.368812 0.673469
+22 1.29 0.670615 0.755102
+23 1.35 0.765424 0.857143
+24 1.41 1.12268 1.02041
+25 1.47 1.42026 1.2449
+26 1.53 0.357564 1.30612
+27 1.59 0.662181 1.42857
+28 1.65 0.819871 1.59184
+29 1.71 1.43128 1.89796
+30 1.77 1.06872 2.14286
+31 1.83 0.66653 2.30612
+32 1.89 1.24977 2.63265
+33 1.95 1.32081 3
+34 2.01 1.03595 3.30612
+35 2.07 1.04189 3.63265
+36 2.13 1.04552 3.97959
+37 2.19 0.756309 4.2449
+38 2.25 1.10233 4.65306
+39 2.31 1.0981 5.08163
+40 2.37 0.894177 5.44898
+41 2.43 0.897822 5.83673
+42 2.49 1.1251 6.34694
+43 2.55 0.858224 6.7551
+44 2.61 1.14691 7.32653
+45 2.67 1.17423 7.93878
+46 2.73 1.19806 8.59184
+47 2.79 0.716929 9
+48 2.85 0.927532 9.55102
+49 2.91 1.18624 10.2857
+50 2.97 0.917363 10.8776
+106000 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 1.37595 0.0204082
+9 0.51 0 0.0204082
+10 0.57 0.858066 0.0408163
+11 0.63 0.702525 0.0612245
+12 0.69 0 0.0612245
+13 0.75 0.991624 0.102041
+14 0.81 0.425111 0.122449
+15 0.87 1.10556 0.183673
+16 0.93 1.29007 0.265306
+17 0.99 1.13849 0.346939
+18 1.05 1.26516 0.44898
+19 1.11 1.35853 0.571429
+20 1.17 1.4266 0.714286
+21 1.23 1.65965 0.897959
+22 1.29 1.17358 1.04082
+23 1.35 0.30617 1.08163
+24 1.41 0.561342 1.16327
+25 1.47 1.16203 1.34694
+26 1.53 0.953504 1.5102
+27 1.59 0.993271 1.69388
+28 1.65 1.33229 1.95918
+29 1.71 0.572513 2.08163
+30 1.77 1.42496 2.40816
+31 1.83 0.66653 2.57143
+32 1.89 0.781108 2.77551
+33 1.95 1.10067 3.08163
+34 2.01 0.414379 3.20408
+35 2.07 1.17212 3.57143
+36 2.13 0.738014 3.81633
+37 2.19 0.756309 4.08163
+38 2.25 0.936978 4.42857
+39 2.31 1.35955 4.95918
+40 2.37 0.99353 5.36735
+41 2.43 0.803314 5.71429
+42 2.49 1.1251 6.22449
+43 2.55 1.1586 6.77551
+44 2.61 1.06499 7.30612
+45 2.67 1.33079 8
+46 2.73 1.12318 8.61224
+47 2.79 0.932007 9.14286
+48 2.85 0.893179 9.67347
+49 2.91 1.12034 10.3673
+50 2.97 0.632664 10.7755
+106050 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 0 0
+9 0.51 0 0
+10 0.57 2.5742 0.0612245
+11 0.63 0.702525 0.0816327
+12 0.69 0.585732 0.102041
+13 0.75 0.991624 0.142857
+14 0.81 0.850222 0.183673
+15 0.87 1.10556 0.244898
+16 0.93 0.322518 0.265306
+17 0.99 0.569243 0.306122
+18 1.05 0.759094 0.367347
+19 1.11 0.679267 0.428571
+20 1.17 0.8152 0.510204
+21 1.23 1.10644 0.632653
+22 1.29 1.17358 0.77551
+23 1.35 0.918509 0.897959
+24 1.41 0.842013 1.02041
+25 1.47 0.387344 1.08163
+26 1.53 1.19188 1.28571
+27 1.59 1.32436 1.53061
+28 1.65 1.33229 1.79592
+29 1.71 0.85877 1.97959
+30 1.77 0.979661 2.20408
+31 1.83 1.08311 2.46939
+32 1.89 0.937329 2.71429
+33 1.95 1.6877 3.18367
+34 2.01 0.345316 3.28571
+35 2.07 1.107 3.63265
+36 2.13 0.861016 3.91837
+37 2.19 0.756309 4.18367
+38 2.25 0.716512 4.44898
+39 2.31 1.0981 4.87755
+40 2.37 0.99353 5.28571
+41 2.43 1.08684 5.7551
+42 2.49 0.990089 6.20408
+43 2.55 1.33025 6.83673
+44 2.61 0.942104 7.30612
+45 2.67 1.29165 7.97959
+46 2.73 1.16062 8.61224
+47 2.79 0.896161 9.12245
+48 2.85 0.996238 9.71429
+49 2.91 0.757875 10.1837
+50 2.97 0.854097 10.7347
+106100 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 0 0
+9 0.51 0 0
+10 0.57 0 0
+11 0.63 0 0
+12 0.69 1.17146 0.0408163
+13 0.75 0.991624 0.0816327
+14 0.81 1.70044 0.163265
+15 0.87 0.737039 0.204082
+16 0.93 1.29007 0.285714
+17 0.99 0.284622 0.306122
+18 1.05 0.506063 0.346939
+19 1.11 0.452845 0.387755
+20 1.17 1.8342 0.571429
+21 1.23 0.922029 0.673469
+22 1.29 0.838269 0.77551
+23 1.35 1.22468 0.938776
+24 1.41 0.701677 1.04082
+25 1.47 1.16203 1.22449
+26 1.53 0.834316 1.36735
+27 1.59 0.993271 1.55102
+28 1.65 1.53726 1.85714
+29 1.71 0.477094 1.95918
+30 1.77 0.979661 2.18367
+31 1.83 0.499898 2.30612
+32 1.89 0.937329 2.55102
+33 1.95 1.61432 3
+34 2.01 0.759695 3.22449
+35 2.07 0.91165 3.5102
+36 2.13 0.861016 3.79592
+37 2.19 1.10537 4.18367
+38 2.25 0.881861 4.5102
+39 2.31 1.0981 4.93878
+40 2.37 0.99353 5.34694
+41 2.43 0.897822 5.73469
+42 2.49 1.0801 6.22449
+43 2.55 1.24442 6.81633
+44 2.61 1.18787 7.40816
+45 2.67 0.821958 7.83673
+46 2.73 1.12318 8.44898
+47 2.79 0.788621 8.89796
+48 2.85 1.33977 9.69388
+49 2.91 1.25214 10.4694
+50 2.97 1.1388 11.2041
+106150 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 0 0
+9 0.51 0 0
+10 0.57 0.858066 0.0204082
+11 0.63 1.40505 0.0612245
+12 0.69 0.585732 0.0816327
+13 0.75 0.991624 0.122449
+14 0.81 1.27533 0.183673
+15 0.87 0.737039 0.22449
+16 0.93 0.967555 0.285714
+17 0.99 0.853865 0.346939
+18 1.05 1.51819 0.469388
+19 1.11 1.13211 0.571429
+20 1.17 0.4076 0.612245
+21 1.23 1.84406 0.816327
+22 1.29 0.167654 0.836735
+23 1.35 0.612339 0.918367
+24 1.41 0.982348 1.06122
+25 1.47 1.03292 1.22449
+26 1.53 0.59594 1.32653
+27 1.59 1.214 1.55102
+28 1.65 1.22981 1.79592
+29 1.71 1.43128 2.10204
+30 1.77 0.62342 2.2449
+31 1.83 0.66653 2.40816
+32 1.89 0.937329 2.65306
+33 1.95 0.807161 2.87755
+34 2.01 0.621569 3.06122
+35 2.07 0.716296 3.28571
+36 2.13 0.799515 3.55102
+37 2.19 0.698131 3.79592
+38 2.25 0.826745 4.10204
+39 2.31 1.04581 4.5102
+40 2.37 1.24191 5.02041
+41 2.43 1.2286 5.55102
+42 2.49 1.0801 6.04082
+43 2.55 1.24442 6.63265
+44 2.61 1.18787 7.22449
+45 2.67 1.48735 8
+46 2.73 0.898544 8.4898
+47 2.79 1.11124 9.12245
+48 2.85 1.03059 9.73469
+49 2.91 0.659022 10.1429
+50 2.97 0.948997 10.7551
+106200 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 0 0
+9 0.51 0 0
+10 0.57 0.858066 0.0204082
+11 0.63 0.702525 0.0408163
+12 0.69 1.17146 0.0816327
+13 0.75 0.495812 0.102041
+14 0.81 0.425111 0.122449
+15 0.87 2.21112 0.244898
+16 0.93 0.967555 0.306122
+17 0.99 1.42311 0.408163
+18 1.05 0.253031 0.428571
+19 1.11 0.452845 0.469388
+20 1.17 1.019 0.571429
+21 1.23 0.368812 0.612245
+22 1.29 1.00592 0.734694
+23 1.35 1.07159 0.877551
+24 1.41 0.842013 1
+25 1.47 1.42026 1.22449
+26 1.53 0.715128 1.34694
+27 1.59 0.882908 1.5102
+28 1.65 0.614903 1.63265
+29 1.71 0.954189 1.83673
+30 1.77 0.80154 2.02041
+31 1.83 0.749847 2.20408
+32 1.89 1.32788 2.55102
+33 1.95 0.587026 2.71429
+34 2.01 1.10501 3.04082
+35 2.07 0.781414 3.28571
+36 2.13 0.922517 3.59184
+37 2.19 1.10537 3.97959
+38 2.25 1.04721 4.36735
+39 2.31 0.732067 4.65306
+40 2.37 1.14256 5.12245
+41 2.43 0.897822 5.5102
+42 2.49 1.1701 6.04082
+43 2.55 1.07278 6.55102
+44 2.61 0.860182 6.97959
+45 2.67 1.13508 7.57143
+46 2.73 1.12318 8.18367
+47 2.79 1.21878 8.87755
+48 2.85 1.06494 9.5102
+49 2.91 0.92263 10.0816
+50 2.97 0.948997 10.6939
+106250 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 1.37595 0.0204082
+9 0.51 0 0.0204082
+10 0.57 0 0.0204082
+11 0.63 1.40505 0.0612245
+12 0.69 0 0.0612245
+13 0.75 0.991624 0.102041
+14 0.81 0.425111 0.122449
+15 0.87 1.47408 0.204082
+16 0.93 1.29007 0.285714
+17 0.99 0.569243 0.326531
+18 1.05 0.506063 0.367347
+19 1.11 0.90569 0.44898
+20 1.17 0.2038 0.469388
+21 1.23 1.65965 0.653061
+22 1.29 1.17358 0.795918
+23 1.35 0.918509 0.918367
+24 1.41 0.842013 1.04082
+25 1.47 1.29115 1.2449
+26 1.53 1.54944 1.5102
+27 1.59 0.662181 1.63265
+28 1.65 1.22981 1.87755
+29 1.71 1.90838 2.28571
+30 1.77 0.890601 2.4898
+31 1.83 0.833163 2.69388
+32 1.89 0.702997 2.87755
+33 1.95 1.24743 3.22449
+34 2.01 1.03595 3.53061
+35 2.07 0.846532 3.79592
+36 2.13 0.615011 4
+37 2.19 0.814486 4.28571
+38 2.25 1.10233 4.69388
+39 2.31 1.30726 5.20408
+40 2.37 0.943854 5.59184
+41 2.43 1.41761 6.20408
+42 2.49 0.765068 6.55102
+43 2.55 0.72949 6.89796
+44 2.61 1.10595 7.44898
+45 2.67 1.13508 8.04082
+46 2.73 0.786226 8.46939
+47 2.79 0.967854 9.02041
+48 2.85 1.06494 9.65306
+49 2.91 1.02148 10.2857
+50 2.97 1.10716 11
+106300 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 0 0
+9 0.51 1.07159 0.0204082
+10 0.57 2.5742 0.0816327
+11 0.63 0.702525 0.102041
+12 0.69 0.585732 0.122449
+13 0.75 1.48744 0.183673
+14 0.81 1.27533 0.244898
+15 0.87 1.10556 0.306122
+16 0.93 0.967555 0.367347
+17 0.99 1.13849 0.44898
+18 1.05 0.506063 0.489796
+19 1.11 0.90569 0.571429
+20 1.17 0.8152 0.653061
+21 1.23 1.65965 0.836735
+22 1.29 0.670615 0.918367
+23 1.35 1.07159 1.06122
+24 1.41 1.82436 1.32653
+25 1.47 0.645574 1.42857
+26 1.53 0.476752 1.5102
+27 1.59 0.772544 1.65306
+28 1.65 1.02484 1.85714
+29 1.71 1.33586 2.14286
+30 1.77 0.80154 2.32653
+31 1.83 0.999796 2.57143
+32 1.89 0.702997 2.7551
+33 1.95 1.0273 3.04082
+34 2.01 1.17407 3.38776
+35 2.07 1.17212 3.7551
+36 2.13 0.676513 3.97959
+37 2.19 0.407243 4.12245
+38 2.25 1.15744 4.55102
+39 2.31 0.993519 4.93878
+40 2.37 1.14256 5.40816
+41 2.43 1.13409 5.89796
+42 2.49 1.1701 6.42857
+43 2.55 1.24442 7.02041
+44 2.61 0.860182 7.44898
+45 2.67 1.01766 7.97959
+46 2.73 1.27294 8.67347
+47 2.79 0.824468 9.14286
+48 2.85 0.927532 9.69388
+49 2.91 0.626071 10.0816
+50 2.97 0.948997 10.6939
+106350 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 0 0
+9 0.51 0 0
+10 0.57 1.71613 0.0408163
+11 0.63 0 0.0408163
+12 0.69 1.7572 0.102041
+13 0.75 0.495812 0.122449
+14 0.81 0.425111 0.142857
+15 0.87 1.47408 0.22449
+16 0.93 1.61259 0.326531
+17 0.99 1.13849 0.408163
+18 1.05 1.01213 0.489796
+19 1.11 0.90569 0.571429
+20 1.17 0.2038 0.591837
+21 1.23 1.29084 0.734694
+22 1.29 1.00592 0.857143
+23 1.35 0.765424 0.959184
+24 1.41 0.421006 1.02041
+25 1.47 0.903804 1.16327
+26 1.53 0.834316 1.30612
+27 1.59 0.772544 1.44898
+28 1.65 0.819871 1.61224
+29 1.71 0.667932 1.7551
+30 1.77 1.15778 2.02041
+31 1.83 0.749847 2.20408
+32 1.89 0.937329 2.44898
+33 1.95 0.807161 2.67347
+34 2.01 0.759695 2.89796
+35 2.07 1.23724 3.28571
+36 2.13 0.738014 3.53061
+37 2.19 0.989019 3.87755
+38 2.25 1.21256 4.32653
+39 2.31 1.30726 4.83673
+40 2.37 0.943854 5.22449
+41 2.43 1.2286 5.7551
+42 2.49 0.945085 6.18367
+43 2.55 1.24442 6.77551
+44 2.61 0.77826 7.16327
+45 2.67 1.01766 7.69388
+46 2.73 1.4227 8.46939
+47 2.79 0.932007 9
+48 2.85 0.79012 9.46939
+49 2.91 1.21919 10.2245
+50 2.97 1.1388 10.9592
+106400 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 0 0
+9 0.51 0 0
+10 0.57 0.858066 0.0204082
+11 0.63 0.702525 0.0408163
+12 0.69 1.17146 0.0816327
+13 0.75 0 0.0816327
+14 0.81 0.425111 0.102041
+15 0.87 0.737039 0.142857
+16 0.93 0.322518 0.163265
+17 0.99 0.853865 0.22449
+18 1.05 1.01213 0.306122
+19 1.11 0.90569 0.387755
+20 1.17 0.2038 0.408163
+21 1.23 1.10644 0.530612
+22 1.29 1.00592 0.653061
+23 1.35 0.765424 0.755102
+24 1.41 0.561342 0.836735
+25 1.47 0.903804 0.979592
+26 1.53 1.19188 1.18367
+27 1.59 0.993271 1.36735
+28 1.65 0.819871 1.53061
+29 1.71 1.14503 1.77551
+30 1.77 0.71248 1.93878
+31 1.83 1.16643 2.22449
+32 1.89 0.781108 2.42857
+33 1.95 1.17405 2.7551
+34 2.01 0.828758 3
+35 2.07 1.04189 3.32653
+36 2.13 0.799515 3.59184
+37 2.19 1.22173 4.02041
+38 2.25 1.21256 4.46939
+39 2.31 0.888938 4.81633
+40 2.37 0.894177 5.18367
+41 2.43 0.850568 5.55102
+42 2.49 1.1251 6.06122
+43 2.55 0.901135 6.4898
+44 2.61 0.983065 6.97959
+45 2.67 0.665394 7.32653
+46 2.73 0.898544 7.81633
+47 2.79 0.860314 8.30612
+48 2.85 1.0993 8.95918
+49 2.91 0.823777 9.46939
+50 2.97 1.0439 10.1429
+106450 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 0 0
+9 0.51 1.07159 0.0204082
+10 0.57 0.858066 0.0408163
+11 0.63 0.702525 0.0612245
+12 0.69 0.585732 0.0816327
+13 0.75 1.48744 0.142857
+14 0.81 1.27533 0.204082
+15 0.87 1.10556 0.265306
+16 0.93 0.322518 0.285714
+17 0.99 0.853865 0.346939
+18 1.05 0.506063 0.387755
+19 1.11 0.679267 0.44898
+20 1.17 1.019 0.55102
+21 1.23 1.10644 0.673469
+22 1.29 1.34123 0.836735
+23 1.35 1.22468 1
+24 1.41 0.842013 1.12245
+25 1.47 0.645574 1.22449
+26 1.53 0.715128 1.34694
+27 1.59 0.662181 1.46939
+28 1.65 0.922354 1.65306
+29 1.71 0.763351 1.81633
+30 1.77 0.53436 1.93878
+31 1.83 0.749847 2.12245
+32 1.89 0.859219 2.34694
+33 1.95 1.61432 2.79592
+34 2.01 0.828758 3.04082
+35 2.07 0.586061 3.22449
+36 2.13 0.799515 3.4898
+37 2.19 0.930841 3.81633
+38 2.25 0.992094 4.18367
+39 2.31 0.679776 4.44898
+40 2.37 0.745148 4.7551
+41 2.43 0.850568 5.12245
+42 2.49 0.990089 5.57143
+43 2.55 0.858224 5.97959
+44 2.61 0.983065 6.46939
+45 2.67 1.09594 7.04082
+46 2.73 0.823666 7.4898
+47 2.79 0.896161 8
+48 2.85 1.168 8.69388
+49 2.91 1.02148 9.32653
+50 2.97 1.07553 10.0204
+106500 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 0 0
+9 0.51 1.07159 0.0204082
+10 0.57 0 0.0204082
+11 0.63 0.702525 0.0408163
+12 0.69 1.17146 0.0816327
+13 0.75 0 0.0816327
+14 0.81 0.850222 0.122449
+15 0.87 0.737039 0.163265
+16 0.93 1.61259 0.265306
+17 0.99 1.13849 0.346939
+18 1.05 1.01213 0.428571
+19 1.11 1.35853 0.55102
+20 1.17 1.019 0.653061
+21 1.23 0.368812 0.693878
+22 1.29 1.17358 0.836735
+23 1.35 1.22468 1
+24 1.41 0.982348 1.14286
+25 1.47 0.774689 1.26531
+26 1.53 1.07269 1.44898
+27 1.59 1.32436 1.69388
+28 1.65 1.22981 1.93878
+29 1.71 0.477094 2.04082
+30 1.77 0.53436 2.16327
+31 1.83 0.833163 2.36735
+32 1.89 0.859219 2.59184
+33 1.95 0.587026 2.7551
+34 2.01 0.690632 2.95918
+35 2.07 1.04189 3.28571
+36 2.13 0.922517 3.59184
+37 2.19 0.523598 3.77551
+38 2.25 1.04721 4.16327
+39 2.31 0.679776 4.42857
+40 2.37 1.24191 4.93878
+41 2.43 0.992329 5.36735
+42 2.49 0.945085 5.79592
+43 2.55 1.07278 6.30612
+44 2.61 0.696338 6.65306
+45 2.67 1.09594 7.22449
+46 2.73 1.2355 7.89796
+47 2.79 1.14709 8.55102
+48 2.85 0.79012 9.02041
+49 2.91 1.05443 9.67347
+50 2.97 1.3286 10.5306
+106550 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 0 0
+9 0.51 0 0
+10 0.57 0.858066 0.0204082
+11 0.63 0.702525 0.0408163
+12 0.69 1.17146 0.0816327
+13 0.75 1.98325 0.163265
+14 0.81 0 0.163265
+15 0.87 1.47408 0.244898
+16 0.93 0.645037 0.285714
+17 0.99 1.13849 0.367347
+18 1.05 1.26516 0.469388
+19 1.11 0.90569 0.55102
+20 1.17 0.8152 0.632653
+21 1.23 1.10644 0.755102
+22 1.29 1.00592 0.877551
+23 1.35 0.459254 0.938776
+24 1.41 0.701677 1.04082
+25 1.47 0.387344 1.10204
+26 1.53 1.54944 1.36735
+27 1.59 0.551817 1.46939
+28 1.65 0.614903 1.59184
+29 1.71 1.24045 1.85714
+30 1.77 0.890601 2.06122
+31 1.83 1.24974 2.36735
+32 1.89 0.859219 2.59184
+33 1.95 0.44027 2.71429
+34 2.01 1.3122 3.10204
+35 2.07 0.716296 3.32653
+36 2.13 0.799515 3.59184
+37 2.19 1.39626 4.08163
+38 2.25 0.771629 4.36735
+39 2.31 0.888938 4.71429
+40 2.37 0.943854 5.10204
+41 2.43 0.803314 5.44898
+42 2.49 1.30512 6.04082
+43 2.55 1.11569 6.57143
+44 2.61 0.655377 6.89796
+45 2.67 1.09594 7.46939
+46 2.73 1.19806 8.12245
+47 2.79 0.967854 8.67347
+48 2.85 1.20236 9.38776
+49 2.91 0.823777 9.89796
+50 2.97 0.822464 10.4286
+106600 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 0 0
+9 0.51 0 0
+10 0.57 0 0
+11 0.63 1.40505 0.0408163
+12 0.69 0 0.0408163
+13 0.75 0.991624 0.0816327
+14 0.81 0.850222 0.122449
+15 0.87 1.8426 0.22449
+16 0.93 1.29007 0.306122
+17 0.99 0.284622 0.326531
+18 1.05 1.01213 0.408163
+19 1.11 0 0.408163
+20 1.17 1.019 0.510204
+21 1.23 0.368812 0.55102
+22 1.29 0.670615 0.632653
+23 1.35 0.30617 0.673469
+24 1.41 0.701677 0.77551
+25 1.47 0.903804 0.918367
+26 1.53 0.715128 1.04082
+27 1.59 0.993271 1.22449
+28 1.65 0.512419 1.32653
+29 1.71 1.14503 1.57143
+30 1.77 0.80154 1.7551
+31 1.83 0.916479 1.97959
+32 1.89 1.01544 2.2449
+33 1.95 0.807161 2.46939
+34 2.01 0.966885 2.7551
+35 2.07 1.43259 3.20408
+36 2.13 1.04552 3.55102
+37 2.19 1.22173 3.97959
+38 2.25 1.04721 4.36735
+39 2.31 0.836648 4.69388
+40 2.37 0.745148 5
+41 2.43 1.13409 5.4898
+42 2.49 0.720064 5.81633
+43 2.55 1.1586 6.36735
+44 2.61 1.18787 6.95918
+45 2.67 1.0568 7.5102
+46 2.73 0.861105 7.97959
+47 2.79 0.752775 8.40816
+48 2.85 1.0993 9.06122
+49 2.91 0.823777 9.57143
+50 2.97 0.917363 10.1633
+106650 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 0 0
+9 0.51 0 0
+10 0.57 2.5742 0.0612245
+11 0.63 0.702525 0.0816327
+12 0.69 0 0.0816327
+13 0.75 0 0.0816327
+14 0.81 1.70044 0.163265
+15 0.87 0.737039 0.204082
+16 0.93 0.322518 0.22449
+17 0.99 0.284622 0.244898
+18 1.05 1.51819 0.367347
+19 1.11 0.452845 0.408163
+20 1.17 0.6114 0.469388
+21 1.23 0.368812 0.510204
+22 1.29 0.335308 0.55102
+23 1.35 0.918509 0.673469
+24 1.41 0.561342 0.755102
+25 1.47 0.387344 0.816327
+26 1.53 0.715128 0.938776
+27 1.59 0.772544 1.08163
+28 1.65 1.43477 1.36735
+29 1.71 1.04961 1.59184
+30 1.77 0.979661 1.81633
+31 1.83 1.24974 2.12245
+32 1.89 1.09355 2.40816
+33 1.95 1.39419 2.79592
+34 2.01 0.690632 3
+35 2.07 1.107 3.34694
+36 2.13 0.922517 3.65306
+37 2.19 0.989019 4
+38 2.25 0.716512 4.26531
+39 2.31 0.627486 4.5102
+40 2.37 0.596118 4.7551
+41 2.43 0.992329 5.18367
+42 2.49 0.765068 5.53061
+43 2.55 0.686579 5.85714
+44 2.61 1.31075 6.5102
+45 2.67 1.33079 7.20408
+46 2.73 1.38526 7.95918
+47 2.79 1.07539 8.57143
+48 2.85 1.03059 9.18367
+49 2.91 0.889679 9.73469
+50 2.97 0.790831 10.2449
+106700 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 0 0
+9 0.51 0 0
+10 0.57 0.858066 0.0204082
+11 0.63 2.8101 0.102041
+12 0.69 0.585732 0.122449
+13 0.75 0 0.122449
+14 0.81 0.425111 0.142857
+15 0.87 0.368519 0.163265
+16 0.93 0.322518 0.183673
+17 0.99 1.13849 0.265306
+18 1.05 1.01213 0.346939
+19 1.11 0.679267 0.408163
+20 1.17 0.8152 0.489796
+21 1.23 0.368812 0.530612
+22 1.29 0.838269 0.632653
+23 1.35 1.07159 0.77551
+24 1.41 0.842013 0.897959
+25 1.47 0.774689 1.02041
+26 1.53 0.59594 1.12245
+27 1.59 1.54509 1.40816
+28 1.65 1.02484 1.61224
+29 1.71 1.43128 1.91837
+30 1.77 1.15778 2.18367
+31 1.83 1.83296 2.63265
+32 1.89 1.09355 2.91837
+33 1.95 0.733783 3.12245
+34 2.01 0.552506 3.28571
+35 2.07 0.651178 3.4898
+36 2.13 1.16852 3.87755
+37 2.19 1.68715 4.46939
+38 2.25 0.771629 4.7551
+39 2.31 0.679776 5.02041
+40 2.37 0.99353 5.42857
+41 2.43 1.13409 5.91837
+42 2.49 1.1701 6.44898
+43 2.55 0.686579 6.77551
+44 2.61 0.942104 7.2449
+45 2.67 0.861099 7.69388
+46 2.73 0.748787 8.10204
+47 2.79 0.967854 8.65306
+48 2.85 1.20236 9.36735
+49 2.91 1.08739 10.0408
+50 2.97 0.727564 10.5102
+106750 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 5.11068 0.0408163
+7 0.39 0 0.0408163
+8 0.45 0 0.0408163
+9 0.51 0 0.0408163
+10 0.57 0.858066 0.0612245
+11 0.63 0.702525 0.0816327
+12 0.69 0.585732 0.102041
+13 0.75 0.495812 0.122449
+14 0.81 0.850222 0.163265
+15 0.87 1.10556 0.22449
+16 0.93 0.322518 0.244898
+17 0.99 0.853865 0.306122
+18 1.05 1.77122 0.44898
+19 1.11 0.90569 0.530612
+20 1.17 0.6114 0.591837
+21 1.23 0.553218 0.653061
+22 1.29 0.502961 0.714286
+23 1.35 0.612339 0.795918
+24 1.41 0.982348 0.938776
+25 1.47 0.903804 1.08163
+26 1.53 0.476752 1.16327
+27 1.59 1.10363 1.36735
+28 1.65 0.512419 1.46939
+29 1.71 0.954189 1.67347
+30 1.77 0.71248 1.83673
+31 1.83 1.33306 2.16327
+32 1.89 0.781108 2.36735
+33 1.95 0.733783 2.57143
+34 2.01 0.690632 2.77551
+35 2.07 0.846532 3.04082
+36 2.13 1.23002 3.44898
+37 2.19 1.33808 3.91837
+38 2.25 0.771629 4.20408
+39 2.31 0.679776 4.46939
+40 2.37 1.04321 4.89796
+41 2.43 1.08684 5.36735
+42 2.49 0.900081 5.77551
+43 2.55 0.944046 6.22449
+44 2.61 1.02403 6.73469
+45 2.67 0.821958 7.16327
+46 2.73 0.786226 7.59184
+47 2.79 1.07539 8.20408
+48 2.85 1.06494 8.83673
+49 2.91 1.05443 9.4898
+50 2.97 0.822464 10.0204
+106800 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 2.7519 0.0408163
+9 0.51 0 0.0408163
+10 0.57 0 0.0408163
+11 0.63 0 0.0408163
+12 0.69 1.17146 0.0816327
+13 0.75 0 0.0816327
+14 0.81 0.850222 0.122449
+15 0.87 2.21112 0.244898
+16 0.93 1.61259 0.346939
+17 0.99 1.13849 0.428571
+18 1.05 0 0.428571
+19 1.11 0.452845 0.469388
+20 1.17 1.4266 0.612245
+21 1.23 0.368812 0.653061
+22 1.29 1.17358 0.795918
+23 1.35 0.612339 0.877551
+24 1.41 0.842013 1
+25 1.47 1.16203 1.18367
+26 1.53 1.31107 1.40816
+27 1.59 1.54509 1.69388
+28 1.65 0.819871 1.85714
+29 1.71 0.572513 1.97959
+30 1.77 0.890601 2.18367
+31 1.83 0.833163 2.38776
+32 1.89 0.468665 2.5102
+33 1.95 1.32081 2.87755
+34 2.01 0.552506 3.04082
+35 2.07 0.520943 3.20408
+36 2.13 1.35303 3.65306
+37 2.19 0.581776 3.85714
+38 2.25 0.936978 4.20408
+39 2.31 0.627486 4.44898
+40 2.37 0.894177 4.81633
+41 2.43 0.992329 5.2449
+42 2.49 0.900081 5.65306
+43 2.55 0.600757 5.93878
+44 2.61 0.983065 6.42857
+45 2.67 0.821958 6.85714
+46 2.73 0.636469 7.20408
+47 2.79 0.788621 7.65306
+48 2.85 0.858826 8.16327
+49 2.91 1.12034 8.85714
+50 2.97 1.2337 9.65306
+106850 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 0 0
+9 0.51 1.07159 0.0204082
+10 0.57 0 0.0204082
+11 0.63 1.40505 0.0612245
+12 0.69 1.17146 0.102041
+13 0.75 0.495812 0.122449
+14 0.81 1.27533 0.183673
+15 0.87 1.10556 0.244898
+16 0.93 1.93511 0.367347
+17 0.99 1.13849 0.44898
+18 1.05 1.26516 0.55102
+19 1.11 0.452845 0.591837
+20 1.17 0.4076 0.632653
+21 1.23 0.737623 0.714286
+22 1.29 0.502961 0.77551
+23 1.35 0.765424 0.877551
+24 1.41 1.12268 1.04082
+25 1.47 1.03292 1.20408
+26 1.53 1.07269 1.38776
+27 1.59 0.551817 1.4898
+28 1.65 1.53726 1.79592
+29 1.71 0.667932 1.93878
+30 1.77 0.80154 2.12245
+31 1.83 0.749847 2.30612
+32 1.89 0.624886 2.46939
+33 1.95 1.76108 2.95918
+34 2.01 0.690632 3.16327
+35 2.07 0.716296 3.38776
+36 2.13 0.799515 3.65306
+37 2.19 0.756309 3.91837
+38 2.25 1.21256 4.36735
+39 2.31 0.732067 4.65306
+40 2.37 1.14256 5.12245
+41 2.43 1.03958 5.57143
+42 2.49 0.990089 6.02041
+43 2.55 1.11569 6.55102
+44 2.61 0.983065 7.04082
+45 2.67 0.93938 7.53061
+46 2.73 0.861105 8
+47 2.79 1.03955 8.59184
+48 2.85 0.721414 9.02041
+49 2.91 1.12034 9.71429
+50 2.97 0.88573 10.2857
+106900 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 3.81206 0.0204082
+6 0.33 0 0.0204082
+7 0.39 0 0.0204082
+8 0.45 0 0.0204082
+9 0.51 0 0.0204082
+10 0.57 0 0.0204082
+11 0.63 1.40505 0.0612245
+12 0.69 1.17146 0.102041
+13 0.75 1.48744 0.163265
+14 0.81 0 0.163265
+15 0.87 1.10556 0.22449
+16 0.93 1.29007 0.306122
+17 0.99 0.284622 0.326531
+18 1.05 0.759094 0.387755
+19 1.11 1.35853 0.510204
+20 1.17 1.019 0.612245
+21 1.23 0.184406 0.632653
+22 1.29 1.34123 0.795918
+23 1.35 0.918509 0.918367
+24 1.41 0.701677 1.02041
+25 1.47 0.774689 1.14286
+26 1.53 1.07269 1.32653
+27 1.59 0.882908 1.4898
+28 1.65 1.02484 1.69388
+29 1.71 1.62212 2.04082
+30 1.77 1.06872 2.28571
+31 1.83 1.16643 2.57143
+32 1.89 1.24977 2.89796
+33 1.95 0.953918 3.16327
+34 2.01 1.10501 3.4898
+35 2.07 0.716296 3.71429
+36 2.13 0.984018 4.04082
+37 2.19 0.116355 4.08163
+38 2.25 0.716512 4.34694
+39 2.31 0.888938 4.69388
+40 2.37 0.99353 5.10204
+41 2.43 0.945075 5.5102
+42 2.49 0.855076 5.89796
+43 2.55 1.24442 6.4898
+44 2.61 1.06499 7.02041
+45 2.67 0.978521 7.53061
+46 2.73 0.748787 7.93878
+47 2.79 0.860314 8.42857
+48 2.85 0.858826 8.93878
+49 2.91 0.955581 9.53061
+50 2.97 0.917363 10.1224
+106950 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 0 0
+9 0.51 1.07159 0.0204082
+10 0.57 0.858066 0.0408163
+11 0.63 1.40505 0.0816327
+12 0.69 0 0.0816327
+13 0.75 0 0.0816327
+14 0.81 0 0.0816327
+15 0.87 0.368519 0.102041
+16 0.93 0.967555 0.163265
+17 0.99 0.853865 0.22449
+18 1.05 0.253031 0.244898
+19 1.11 0.226422 0.265306
+20 1.17 1.2228 0.387755
+21 1.23 0.922029 0.489796
+22 1.29 1.34123 0.653061
+23 1.35 0.918509 0.77551
+24 1.41 1.26302 0.959184
+25 1.47 0.516459 1.04082
+26 1.53 0.476752 1.12245
+27 1.59 0.662181 1.2449
+28 1.65 1.02484 1.44898
+29 1.71 1.33586 1.73469
+30 1.77 1.15778 2
+31 1.83 1.08311 2.26531
+32 1.89 1.09355 2.55102
+33 1.95 1.32081 2.91837
+34 2.01 1.03595 3.22449
+35 2.07 0.846532 3.4898
+36 2.13 0.799515 3.7551
+37 2.19 1.16355 4.16327
+38 2.25 0.60628 4.38776
+39 2.31 0.888938 4.73469
+40 2.37 0.943854 5.12245
+41 2.43 0.897822 5.5102
+42 2.49 0.900081 5.91837
+43 2.55 0.944046 6.36735
+44 2.61 1.31075 7.02041
+45 2.67 0.587113 7.32653
+46 2.73 0.486712 7.59184
+47 2.79 1.07539 8.20408
+48 2.85 0.961885 8.77551
+49 2.91 0.757875 9.2449
+50 2.97 1.0439 9.91837
+107000 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 0 0
+9 0.51 0 0
+10 0.57 0.858066 0.0204082
+11 0.63 0.702525 0.0408163
+12 0.69 1.17146 0.0816327
+13 0.75 0.991624 0.122449
+14 0.81 0.425111 0.142857
+15 0.87 0.368519 0.163265
+16 0.93 1.93511 0.285714
+17 0.99 0.284622 0.306122
+18 1.05 1.01213 0.387755
+19 1.11 0.679267 0.44898
+20 1.17 1.019 0.55102
+21 1.23 0.922029 0.653061
+22 1.29 1.00592 0.77551
+23 1.35 0.918509 0.897959
+24 1.41 1.54369 1.12245
+25 1.47 0.645574 1.22449
+26 1.53 1.07269 1.40816
+27 1.59 1.10363 1.61224
+28 1.65 0.614903 1.73469
+29 1.71 0.954189 1.93878
+30 1.77 0.979661 2.16327
+31 1.83 0.999796 2.40816
+32 1.89 0.859219 2.63265
+33 1.95 1.0273 2.91837
+34 2.01 0.690632 3.12245
+35 2.07 0.651178 3.32653
+36 2.13 1.16852 3.71429
+37 2.19 0.989019 4.06122
+38 2.25 0.826745 4.36735
+39 2.31 0.836648 4.69388
+40 2.37 0.894177 5.06122
+41 2.43 0.850568 5.42857
+42 2.49 0.855076 5.81633
+43 2.55 0.858224 6.22449
+44 2.61 0.819221 6.63265
+45 2.67 0.782817 7.04082
+46 2.73 1.0483 7.61224
+47 2.79 1.11124 8.2449
+48 2.85 1.168 8.93878
+49 2.91 0.691973 9.36735
+50 2.97 1.10716 10.0816
+107050 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 0 0
+9 0.51 1.07159 0.0204082
+10 0.57 0.858066 0.0408163
+11 0.63 1.40505 0.0816327
+12 0.69 1.17146 0.122449
+13 0.75 0.495812 0.142857
+14 0.81 1.70044 0.22449
+15 0.87 1.47408 0.306122
+16 0.93 1.93511 0.428571
+17 0.99 0.853865 0.489796
+18 1.05 1.51819 0.612245
+19 1.11 0.452845 0.653061
+20 1.17 0.6114 0.714286
+21 1.23 0.737623 0.795918
+22 1.29 0.838269 0.897959
+23 1.35 0.30617 0.938776
+24 1.41 0.561342 1.02041
+25 1.47 0.774689 1.14286
+26 1.53 0.953504 1.30612
+27 1.59 1.10363 1.5102
+28 1.65 0.512419 1.61224
+29 1.71 0.763351 1.77551
+30 1.77 0.979661 2
+31 1.83 0.749847 2.18367
+32 1.89 0.546775 2.32653
+33 1.95 1.10067 2.63265
+34 2.01 0.897822 2.89796
+35 2.07 1.30236 3.30612
+36 2.13 1.35303 3.7551
+37 2.19 1.0472 4.12245
+38 2.25 1.43302 4.65306
+39 2.31 0.575195 4.87755
+40 2.37 0.894177 5.2449
+41 2.43 0.708807 5.55102
+42 2.49 0.585052 5.81633
+43 2.55 1.20151 6.38776
+44 2.61 1.06499 6.91837
+45 2.67 1.01766 7.44898
+46 2.73 1.01086 8
+47 2.79 0.932007 8.53061
+48 2.85 0.893179 9.06122
+49 2.91 0.988533 9.67347
+50 2.97 0.98063 10.3061
+107100 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 0 0
+9 0.51 1.07159 0.0204082
+10 0.57 0.858066 0.0408163
+11 0.63 0.702525 0.0612245
+12 0.69 1.17146 0.102041
+13 0.75 1.48744 0.163265
+14 0.81 1.27533 0.22449
+15 0.87 0.368519 0.244898
+16 0.93 1.29007 0.326531
+17 0.99 0.853865 0.387755
+18 1.05 0.759094 0.44898
+19 1.11 1.13211 0.55102
+20 1.17 0.6114 0.612245
+21 1.23 0.553218 0.673469
+22 1.29 0.670615 0.755102
+23 1.35 0.918509 0.877551
+24 1.41 0.421006 0.938776
+25 1.47 1.42026 1.16327
+26 1.53 0.357564 1.22449
+27 1.59 0.772544 1.36735
+28 1.65 0.819871 1.53061
+29 1.71 1.43128 1.83673
+30 1.77 1.24684 2.12245
+31 1.83 1.58301 2.5102
+32 1.89 0.781108 2.71429
+33 1.95 1.0273 3
+34 2.01 1.10501 3.32653
+35 2.07 0.781414 3.57143
+36 2.13 0.984018 3.89796
+37 2.19 0.756309 4.16327
+38 2.25 0.716512 4.42857
+39 2.31 0.993519 4.81633
+40 2.37 0.943854 5.20408
+41 2.43 0.897822 5.59184
+42 2.49 1.1701 6.12245
+43 2.55 0.643668 6.42857
+44 2.61 0.901143 6.87755
+45 2.67 1.09594 7.44898
+46 2.73 1.2355 8.12245
+47 2.79 1.11124 8.7551
+48 2.85 1.03059 9.36735
+49 2.91 0.889679 9.91837
+50 2.97 0.948997 10.5306
+107150 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 0 0
+9 0.51 0 0
+10 0.57 0.858066 0.0204082
+11 0.63 0 0.0204082
+12 0.69 0.585732 0.0408163
+13 0.75 0.495812 0.0612245
+14 0.81 1.27533 0.122449
+15 0.87 0 0.122449
+16 0.93 0.645037 0.163265
+17 0.99 1.42311 0.265306
+18 1.05 0.253031 0.285714
+19 1.11 0.90569 0.367347
+20 1.17 1.019 0.469388
+21 1.23 0.737623 0.55102
+22 1.29 0.670615 0.632653
+23 1.35 1.37776 0.816327
+24 1.41 0.842013 0.938776
+25 1.47 0.387344 1
+26 1.53 1.43026 1.2449
+27 1.59 0.993271 1.42857
+28 1.65 0.614903 1.55102
+29 1.71 1.33586 1.83673
+30 1.77 1.15778 2.10204
+31 1.83 0.999796 2.34694
+32 1.89 0.702997 2.53061
+33 1.95 1.10067 2.83673
+34 2.01 0.690632 3.04082
+35 2.07 1.30236 3.44898
+36 2.13 0.738014 3.69388
+37 2.19 0.698131 3.93878
+38 2.25 1.54326 4.5102
+39 2.31 0.784357 4.81633
+40 2.37 0.894177 5.18367
+41 2.43 1.41761 5.79592
+42 2.49 0.855076 6.18367
+43 2.55 0.772402 6.55102
+44 2.61 0.819221 6.95918
+45 2.67 0.978521 7.46939
+46 2.73 1.34782 8.20408
+47 2.79 1.03955 8.79592
+48 2.85 0.755767 9.2449
+49 2.91 0.691973 9.67347
+50 2.97 1.07553 10.3673
+107200 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 1.37595 0.0204082
+9 0.51 0 0.0204082
+10 0.57 0.858066 0.0408163
+11 0.63 0 0.0408163
+12 0.69 0.585732 0.0612245
+13 0.75 1.98325 0.142857
+14 0.81 0.850222 0.183673
+15 0.87 0.737039 0.22449
+16 0.93 0.967555 0.285714
+17 0.99 0.569243 0.326531
+18 1.05 0.253031 0.346939
+19 1.11 0.679267 0.408163
+20 1.17 0.4076 0.44898
+21 1.23 0.553218 0.510204
+22 1.29 0.670615 0.591837
+23 1.35 0.765424 0.693878
+24 1.41 1.54369 0.918367
+25 1.47 1.16203 1.10204
+26 1.53 0.834316 1.2449
+27 1.59 0.662181 1.36735
+28 1.65 0.717387 1.5102
+29 1.71 0.477094 1.61224
+30 1.77 1.42496 1.93878
+31 1.83 1.24974 2.2449
+32 1.89 1.01544 2.5102
+33 1.95 0.953918 2.77551
+34 2.01 1.03595 3.08163
+35 2.07 1.04189 3.40816
+36 2.13 1.04552 3.7551
+37 2.19 1.0472 4.12245
+38 2.25 0.936978 4.46939
+39 2.31 1.0981 4.89796
+40 2.37 1.53997 5.53061
+41 2.43 1.08684 6
+42 2.49 1.03509 6.46939
+43 2.55 0.686579 6.79592
+44 2.61 1.14691 7.36735
+45 2.67 0.626254 7.69388
+46 2.73 0.823666 8.14286
+47 2.79 0.788621 8.59184
+48 2.85 0.618355 8.95918
+49 2.91 1.4169 9.83673
+50 2.97 1.26533 10.6531
+107250 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 1.83099 0.0204082
+8 0.45 1.37595 0.0408163
+9 0.51 1.07159 0.0612245
+10 0.57 0.858066 0.0816327
+11 0.63 0 0.0816327
+12 0.69 1.17146 0.122449
+13 0.75 0 0.122449
+14 0.81 0.850222 0.163265
+15 0.87 0.737039 0.204082
+16 0.93 0.967555 0.265306
+17 0.99 0.569243 0.306122
+18 1.05 0.759094 0.367347
+19 1.11 1.13211 0.469388
+20 1.17 0 0.469388
+21 1.23 1.10644 0.591837
+22 1.29 0.502961 0.653061
+23 1.35 0.459254 0.714286
+24 1.41 0.421006 0.77551
+25 1.47 0.774689 0.897959
+26 1.53 0.834316 1.04082
+27 1.59 0.882908 1.20408
+28 1.65 1.12732 1.42857
+29 1.71 0.667932 1.57143
+30 1.77 0.80154 1.7551
+31 1.83 0.833163 1.95918
+32 1.89 1.4841 2.34694
+33 1.95 1.46757 2.7551
+34 2.01 0.897822 3.02041
+35 2.07 0.586061 3.20408
+36 2.13 0.861016 3.4898
+37 2.19 1.0472 3.85714
+38 2.25 1.37791 4.36735
+39 2.31 1.0981 4.79592
+40 2.37 0.894177 5.16327
+41 2.43 1.13409 5.65306
+42 2.49 0.720064 5.97959
+43 2.55 0.815313 6.36735
+44 2.61 1.02403 6.87755
+45 2.67 0.93938 7.36735
+46 2.73 1.01086 7.91837
+47 2.79 0.896161 8.42857
+48 2.85 1.168 9.12245
+49 2.91 1.4169 10
+50 2.97 1.1388 10.7347
+107300 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 1.37595 0.0204082
+9 0.51 0 0.0204082
+10 0.57 0 0.0204082
+11 0.63 0.702525 0.0408163
+12 0.69 1.17146 0.0816327
+13 0.75 1.98325 0.163265
+14 0.81 0.425111 0.183673
+15 0.87 0.368519 0.204082
+16 0.93 0.645037 0.244898
+17 0.99 0.853865 0.306122
+18 1.05 0.253031 0.326531
+19 1.11 0.679267 0.387755
+20 1.17 1.2228 0.510204
+21 1.23 1.10644 0.632653
+22 1.29 1.17358 0.77551
+23 1.35 0.765424 0.877551
+24 1.41 0.561342 0.959184
+25 1.47 0.774689 1.08163
+26 1.53 0.834316 1.22449
+27 1.59 0.551817 1.32653
+28 1.65 0.819871 1.4898
+29 1.71 0.381676 1.57143
+30 1.77 0.890601 1.77551
+31 1.83 1.08311 2.04082
+32 1.89 0.624886 2.20408
+33 1.95 1.24743 2.55102
+34 2.01 0.897822 2.81633
+35 2.07 1.30236 3.22449
+36 2.13 1.16852 3.61224
+37 2.19 0.872664 3.91837
+38 2.25 1.04721 4.30612
+39 2.31 0.784357 4.61224
+40 2.37 0.894177 4.97959
+41 2.43 0.850568 5.34694
+42 2.49 0.900081 5.7551
+43 2.55 1.02987 6.2449
+44 2.61 1.14691 6.81633
+45 2.67 1.17423 7.42857
+46 2.73 1.4227 8.20408
+47 2.79 1.11124 8.83673
+48 2.85 1.0993 9.4898
+49 2.91 1.02148 10.1224
+50 2.97 1.3286 10.9796
+107350 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 0 0
+9 0.51 0 0
+10 0.57 0.858066 0.0204082
+11 0.63 1.40505 0.0612245
+12 0.69 0.585732 0.0816327
+13 0.75 0 0.0816327
+14 0.81 0.425111 0.102041
+15 0.87 0 0.102041
+16 0.93 0.645037 0.142857
+17 0.99 0.853865 0.204082
+18 1.05 0.759094 0.265306
+19 1.11 0.679267 0.326531
+20 1.17 1.2228 0.44898
+21 1.23 0.368812 0.489796
+22 1.29 1.00592 0.612245
+23 1.35 0.459254 0.673469
+24 1.41 0.842013 0.795918
+25 1.47 0.903804 0.938776
+26 1.53 0.953504 1.10204
+27 1.59 1.32436 1.34694
+28 1.65 0.717387 1.4898
+29 1.71 1.04961 1.71429
+30 1.77 1.06872 1.95918
+31 1.83 1.08311 2.22449
+32 1.89 0.859219 2.44898
+33 1.95 1.32081 2.81633
+34 2.01 1.10501 3.14286
+35 2.07 1.107 3.4898
+36 2.13 0.861016 3.77551
+37 2.19 1.22173 4.20408
+38 2.25 0.771629 4.4898
+39 2.31 1.51642 5.08163
+40 2.37 0.695471 5.36735
+41 2.43 0.945075 5.77551
+42 2.49 1.1701 6.30612
+43 2.55 0.944046 6.7551
+44 2.61 0.942104 7.22449
+45 2.67 1.25251 7.87755
+46 2.73 0.973423 8.40816
+47 2.79 0.716929 8.81633
+48 2.85 1.37412 9.63265
+49 2.91 1.05443 10.2857
+50 2.97 1.07553 10.9796
+107400 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 0 0
+9 0.51 0 0
+10 0.57 0 0
+11 0.63 0 0
+12 0.69 0 0
+13 0.75 0.991624 0.0408163
+14 0.81 0 0.0408163
+15 0.87 0 0.0408163
+16 0.93 1.61259 0.142857
+17 0.99 0.284622 0.163265
+18 1.05 0.759094 0.22449
+19 1.11 0.226422 0.244898
+20 1.17 1.4266 0.387755
+21 1.23 0.737623 0.469388
+22 1.29 1.34123 0.632653
+23 1.35 1.07159 0.77551
+24 1.41 0.982348 0.918367
+25 1.47 0.516459 1
+26 1.53 1.31107 1.22449
+27 1.59 0.882908 1.38776
+28 1.65 1.02484 1.59184
+29 1.71 1.33586 1.87755
+30 1.77 0.890601 2.08163
+31 1.83 1.08311 2.34694
+32 1.89 0.937329 2.59184
+33 1.95 1.10067 2.89796
+34 2.01 0.759695 3.12245
+35 2.07 0.716296 3.34694
+36 2.13 1.10702 3.71429
+37 2.19 0.989019 4.06122
+38 2.25 0.992094 4.42857
+39 2.31 1.04581 4.83673
+40 2.37 1.44062 5.42857
+41 2.43 1.03958 5.87755
+42 2.49 1.0801 6.36735
+43 2.55 0.986958 6.83673
+44 2.61 1.10595 7.38776
+45 2.67 0.978521 7.89796
+46 2.73 0.823666 8.34694
+47 2.79 0.716929 8.7551
+48 2.85 0.79012 9.22449
+49 2.91 1.12034 9.91837
+50 2.97 1.36023 10.7959
+107450 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 0 0
+9 0.51 0 0
+10 0.57 0.858066 0.0204082
+11 0.63 0.702525 0.0408163
+12 0.69 1.17146 0.0816327
+13 0.75 0.495812 0.102041
+14 0.81 0.850222 0.142857
+15 0.87 0 0.142857
+16 0.93 0.645037 0.183673
+17 0.99 1.70773 0.306122
+18 1.05 0.253031 0.326531
+19 1.11 0 0.326531
+20 1.17 1.4266 0.469388
+21 1.23 0.737623 0.55102
+22 1.29 1.00592 0.673469
+23 1.35 0.765424 0.77551
+24 1.41 1.26302 0.959184
+25 1.47 0.516459 1.04082
+26 1.53 0.357564 1.10204
+27 1.59 0.772544 1.2449
+28 1.65 1.22981 1.4898
+29 1.71 0.954189 1.69388
+30 1.77 1.06872 1.93878
+31 1.83 0.499898 2.06122
+32 1.89 0.468665 2.18367
+33 1.95 1.0273 2.46939
+34 2.01 1.51939 2.91837
+35 2.07 0.781414 3.16327
+36 2.13 1.35303 3.61224
+37 2.19 0.872664 3.91837
+38 2.25 0.771629 4.20408
+39 2.31 0.836648 4.53061
+40 2.37 0.844501 4.87755
+41 2.43 0.992329 5.30612
+42 2.49 1.03509 5.77551
+43 2.55 0.944046 6.22449
+44 2.61 0.983065 6.71429
+45 2.67 1.0568 7.26531
+46 2.73 1.08574 7.85714
+47 2.79 1.4697 8.69388
+48 2.85 1.20236 9.40816
+49 2.91 1.05443 10.0612
+50 2.97 0.822464 10.5918
+107500 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 0 0
+9 0.51 2.14319 0.0408163
+10 0.57 0.858066 0.0612245
+11 0.63 0.702525 0.0816327
+12 0.69 0 0.0816327
+13 0.75 0.495812 0.102041
+14 0.81 1.27533 0.163265
+15 0.87 0.737039 0.204082
+16 0.93 1.61259 0.306122
+17 0.99 0.569243 0.346939
+18 1.05 0 0.346939
+19 1.11 0.679267 0.408163
+20 1.17 0.6114 0.469388
+21 1.23 0.553218 0.530612
+22 1.29 1.67654 0.734694
+23 1.35 0.459254 0.795918
+24 1.41 0.842013 0.918367
+25 1.47 0.645574 1.02041
+26 1.53 1.07269 1.20408
+27 1.59 0.882908 1.36735
+28 1.65 1.02484 1.57143
+29 1.71 0.381676 1.65306
+30 1.77 1.15778 1.91837
+31 1.83 1.16643 2.20408
+32 1.89 0.781108 2.40816
+33 1.95 0.953918 2.67347
+34 2.01 0.552506 2.83673
+35 2.07 0.91165 3.12245
+36 2.13 1.16852 3.5102
+37 2.19 0.989019 3.85714
+38 2.25 0.826745 4.16327
+39 2.31 1.04581 4.57143
+40 2.37 1.29159 5.10204
+41 2.43 1.08684 5.57143
+42 2.49 1.26011 6.14286
+43 2.55 0.901135 6.57143
+44 2.61 1.14691 7.14286
+45 2.67 0.704535 7.5102
+46 2.73 1.27294 8.20408
+47 2.79 1.03955 8.79592
+48 2.85 1.23671 9.53061
+49 2.91 1.05443 10.1837
+50 2.97 1.2337 10.9796
+107550 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 1.37595 0.0204082
+9 0.51 1.07159 0.0408163
+10 0.57 0.858066 0.0612245
+11 0.63 1.40505 0.102041
+12 0.69 0.585732 0.122449
+13 0.75 0.495812 0.142857
+14 0.81 0.850222 0.183673
+15 0.87 1.47408 0.265306
+16 0.93 1.29007 0.346939
+17 0.99 0.853865 0.408163
+18 1.05 0.759094 0.469388
+19 1.11 0.452845 0.510204
+20 1.17 0.4076 0.55102
+21 1.23 0.737623 0.632653
+22 1.29 1.34123 0.795918
+23 1.35 1.22468 0.959184
+24 1.41 0.842013 1.08163
+25 1.47 1.29115 1.28571
+26 1.53 0.834316 1.42857
+27 1.59 1.214 1.65306
+28 1.65 0.614903 1.77551
+29 1.71 0.667932 1.91837
+30 1.77 0.53436 2.04082
+31 1.83 1.16643 2.32653
+32 1.89 0.859219 2.55102
+33 1.95 0.880539 2.79592
+34 2.01 1.03595 3.10204
+35 2.07 0.846532 3.36735
+36 2.13 0.676513 3.59184
+37 2.19 1.33808 4.06122
+38 2.25 1.21256 4.5102
+39 2.31 1.04581 4.91837
+40 2.37 0.943854 5.30612
+41 2.43 0.897822 5.69388
+42 2.49 0.67506 6
+43 2.55 0.772402 6.36735
+44 2.61 0.901143 6.81633
+45 2.67 1.01766 7.34694
+46 2.73 1.19806 8
+47 2.79 1.0037 8.57143
+48 2.85 1.03059 9.18367
+49 2.91 0.790826 9.67347
+50 2.97 1.17043 10.4286
+107600 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 0 0
+9 0.51 0 0
+10 0.57 0 0
+11 0.63 0.702525 0.0204082
+12 0.69 1.7572 0.0816327
+13 0.75 0.991624 0.122449
+14 0.81 0 0.122449
+15 0.87 1.8426 0.22449
+16 0.93 0.645037 0.265306
+17 0.99 0.569243 0.306122
+18 1.05 0.506063 0.346939
+19 1.11 0.226422 0.367347
+20 1.17 0.4076 0.408163
+21 1.23 0.922029 0.510204
+22 1.29 1.00592 0.632653
+23 1.35 0.765424 0.734694
+24 1.41 1.12268 0.897959
+25 1.47 1.16203 1.08163
+26 1.53 0.953504 1.2449
+27 1.59 0.441454 1.32653
+28 1.65 0.819871 1.4898
+29 1.71 0.667932 1.63265
+30 1.77 0.71248 1.79592
+31 1.83 0.66653 1.95918
+32 1.89 1.71844 2.40816
+33 1.95 1.32081 2.77551
+34 2.01 1.17407 3.12245
+35 2.07 0.976768 3.42857
+36 2.13 1.04552 3.77551
+37 2.19 0.698131 4.02041
+38 2.25 1.10233 4.42857
+39 2.31 0.941229 4.79592
+40 2.37 0.844501 5.14286
+41 2.43 0.75606 5.46939
+42 2.49 1.53014 6.16327
+43 2.55 1.24442 6.7551
+44 2.61 1.06499 7.28571
+45 2.67 1.13508 7.87755
+46 2.73 1.12318 8.4898
+47 2.79 0.609389 8.83673
+48 2.85 0.824473 9.32653
+49 2.91 0.988533 9.93878
+50 2.97 1.01226 10.5918
+107650 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 1.37595 0.0204082
+9 0.51 0 0.0204082
+10 0.57 0 0.0204082
+11 0.63 1.40505 0.0612245
+12 0.69 1.17146 0.102041
+13 0.75 1.48744 0.163265
+14 0.81 1.27533 0.22449
+15 0.87 0.737039 0.265306
+16 0.93 0.967555 0.326531
+17 0.99 0.853865 0.387755
+18 1.05 1.01213 0.469388
+19 1.11 1.58496 0.612245
+20 1.17 1.019 0.714286
+21 1.23 0.922029 0.816327
+22 1.29 0.838269 0.918367
+23 1.35 0.612339 1
+24 1.41 0.982348 1.14286
+25 1.47 0.387344 1.20408
+26 1.53 0.834316 1.34694
+27 1.59 1.10363 1.55102
+28 1.65 0.717387 1.69388
+29 1.71 1.04961 1.91837
+30 1.77 0.53436 2.04082
+31 1.83 0.833163 2.2449
+32 1.89 0.624886 2.40816
+33 1.95 0.44027 2.53061
+34 2.01 1.45033 2.95918
+35 2.07 0.781414 3.20408
+36 2.13 0.984018 3.53061
+37 2.19 1.22173 3.95918
+38 2.25 0.771629 4.2449
+39 2.31 0.888938 4.59184
+40 2.37 1.24191 5.10204
+41 2.43 0.850568 5.46939
+42 2.49 1.0801 5.95918
+43 2.55 1.11569 6.4898
+44 2.61 1.06499 7.02041
+45 2.67 0.978521 7.53061
+46 2.73 0.673908 7.89796
+47 2.79 0.645236 8.26531
+48 2.85 0.996238 8.85714
+49 2.91 1.18624 9.59184
+50 2.97 1.17043 10.3469
+107700 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 0 0
+9 0.51 0 0
+10 0.57 0.858066 0.0204082
+11 0.63 0 0.0204082
+12 0.69 0 0.0204082
+13 0.75 0.495812 0.0408163
+14 0.81 2.97578 0.183673
+15 0.87 1.10556 0.244898
+16 0.93 0.322518 0.265306
+17 0.99 0.569243 0.306122
+18 1.05 0.759094 0.367347
+19 1.11 0.679267 0.428571
+20 1.17 1.2228 0.55102
+21 1.23 0.737623 0.632653
+22 1.29 0.502961 0.693878
+23 1.35 1.22468 0.857143
+24 1.41 0.561342 0.938776
+25 1.47 1.03292 1.10204
+26 1.53 0.476752 1.18367
+27 1.59 0.662181 1.30612
+28 1.65 1.12732 1.53061
+29 1.71 0.381676 1.61224
+30 1.77 0.979661 1.83673
+31 1.83 0.583214 1.97959
+32 1.89 1.56222 2.38776
+33 1.95 1.0273 2.67347
+34 2.01 0.759695 2.89796
+35 2.07 1.04189 3.22449
+36 2.13 0.799515 3.4898
+37 2.19 0.872664 3.79592
+38 2.25 1.04721 4.18367
+39 2.31 0.993519 4.57143
+40 2.37 1.19224 5.06122
+41 2.43 0.897822 5.44898
+42 2.49 1.1251 5.95918
+43 2.55 1.1586 6.5102
+44 2.61 0.983065 7
+45 2.67 1.13508 7.59184
+46 2.73 1.01086 8.14286
+47 2.79 1.0037 8.71429
+48 2.85 0.755767 9.16327
+49 2.91 0.790826 9.65306
+50 2.97 0.88573 10.2245
+107750 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 1.37595 0.0204082
+9 0.51 0 0.0204082
+10 0.57 0 0.0204082
+11 0.63 1.40505 0.0612245
+12 0.69 0 0.0612245
+13 0.75 0 0.0612245
+14 0.81 0.425111 0.0816327
+15 0.87 0.368519 0.102041
+16 0.93 1.29007 0.183673
+17 0.99 0.853865 0.244898
+18 1.05 0.506063 0.285714
+19 1.11 1.13211 0.387755
+20 1.17 0.8152 0.469388
+21 1.23 0.553218 0.530612
+22 1.29 0.502961 0.591837
+23 1.35 0.612339 0.673469
+24 1.41 0.421006 0.734694
+25 1.47 0.903804 0.877551
+26 1.53 0.715128 1
+27 1.59 0.993271 1.18367
+28 1.65 0.614903 1.30612
+29 1.71 1.24045 1.57143
+30 1.77 0.979661 1.79592
+31 1.83 0.749847 1.97959
+32 1.89 1.24977 2.30612
+33 1.95 1.17405 2.63265
+34 2.01 1.24314 3
+35 2.07 1.17212 3.36735
+36 2.13 1.53753 3.87755
+37 2.19 0.814486 4.16327
+38 2.25 0.716512 4.42857
+39 2.31 0.993519 4.81633
+40 2.37 0.99353 5.22449
+41 2.43 0.75606 5.55102
+42 2.49 0.810072 5.91837
+43 2.55 0.600757 6.20408
+44 2.61 1.10595 6.7551
+45 2.67 1.09594 7.32653
+46 2.73 0.898544 7.81633
+47 2.79 0.860314 8.30612
+48 2.85 0.927532 8.85714
+49 2.91 1.28509 9.65306
+50 2.97 0.822464 10.1837
+107800 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 0 0
+9 0.51 0 0
+10 0.57 0 0
+11 0.63 0 0
+12 0.69 0 0
+13 0.75 0.495812 0.0204082
+14 0.81 0.850222 0.0612245
+15 0.87 0.737039 0.102041
+16 0.93 1.61259 0.204082
+17 0.99 0.284622 0.22449
+18 1.05 0.506063 0.265306
+19 1.11 0.452845 0.306122
+20 1.17 1.019 0.408163
+21 1.23 0.737623 0.489796
+22 1.29 0.838269 0.591837
+23 1.35 0.612339 0.673469
+24 1.41 0.701677 0.77551
+25 1.47 0.903804 0.918367
+26 1.53 0.834316 1.06122
+27 1.59 1.214 1.28571
+28 1.65 0.922354 1.46939
+29 1.71 0.190838 1.5102
+30 1.77 0.80154 1.69388
+31 1.83 1.33306 2.02041
+32 1.89 0.937329 2.26531
+33 1.95 1.10067 2.57143
+34 2.01 1.38126 2.97959
+35 2.07 1.04189 3.30612
+36 2.13 0.861016 3.59184
+37 2.19 0.814486 3.87755
+38 2.25 0.716512 4.14286
+39 2.31 0.784357 4.44898
+40 2.37 0.99353 4.85714
+41 2.43 0.850568 5.22449
+42 2.49 0.810072 5.59184
+43 2.55 1.07278 6.10204
+44 2.61 0.901143 6.55102
+45 2.67 1.0568 7.10204
+46 2.73 1.12318 7.71429
+47 2.79 1.25463 8.42857
+48 2.85 0.961885 9
+49 2.91 1.18624 9.73469
+50 2.97 1.10716 10.449
+107850 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 0 0
+9 0.51 1.07159 0.0204082
+10 0.57 0 0.0204082
+11 0.63 0.702525 0.0408163
+12 0.69 0.585732 0.0612245
+13 0.75 0 0.0612245
+14 0.81 0.850222 0.102041
+15 0.87 1.47408 0.183673
+16 0.93 0.322518 0.204082
+17 0.99 0.853865 0.265306
+18 1.05 0.759094 0.326531
+19 1.11 0.90569 0.408163
+20 1.17 0.8152 0.489796
+21 1.23 0.368812 0.530612
+22 1.29 0.670615 0.612245
+23 1.35 0.765424 0.714286
+24 1.41 1.12268 0.877551
+25 1.47 0.903804 1.02041
+26 1.53 1.07269 1.20408
+27 1.59 1.10363 1.40816
+28 1.65 0.819871 1.57143
+29 1.71 0.954189 1.77551
+30 1.77 1.15778 2.04082
+31 1.83 0.499898 2.16327
+32 1.89 0.546775 2.30612
+33 1.95 1.32081 2.67347
+34 2.01 0.897822 2.93878
+35 2.07 0.846532 3.20408
+36 2.13 1.35303 3.65306
+37 2.19 0.814486 3.93878
+38 2.25 1.10233 4.34694
+39 2.31 1.35955 4.87755
+40 2.37 1.24191 5.38776
+41 2.43 0.567045 5.63265
+42 2.49 0.855076 6.02041
+43 2.55 1.07278 6.53061
+44 2.61 1.02403 7.04082
+45 2.67 1.01766 7.57143
+46 2.73 0.823666 8.02041
+47 2.79 0.716929 8.42857
+48 2.85 1.168 9.12245
+49 2.91 1.15329 9.83673
+50 2.97 1.20206 10.6122
+107900 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 0 0
+9 0.51 0 0
+10 0.57 0 0
+11 0.63 0.702525 0.0204082
+12 0.69 0 0.0204082
+13 0.75 0.495812 0.0408163
+14 0.81 1.27533 0.102041
+15 0.87 1.10556 0.163265
+16 0.93 1.61259 0.265306
+17 0.99 0.569243 0.306122
+18 1.05 1.01213 0.387755
+19 1.11 1.13211 0.489796
+20 1.17 0.8152 0.571429
+21 1.23 0.553218 0.632653
+22 1.29 0.838269 0.734694
+23 1.35 1.22468 0.897959
+24 1.41 1.26302 1.08163
+25 1.47 1.03292 1.2449
+26 1.53 0.476752 1.32653
+27 1.59 0.662181 1.44898
+28 1.65 1.02484 1.65306
+29 1.71 0.572513 1.77551
+30 1.77 0.979661 2
+31 1.83 1.16643 2.28571
+32 1.89 1.24977 2.61224
+33 1.95 1.17405 2.93878
+34 2.01 1.10501 3.26531
+35 2.07 0.91165 3.55102
+36 2.13 0.922517 3.85714
+37 2.19 0.698131 4.10204
+38 2.25 1.10233 4.5102
+39 2.31 0.784357 4.81633
+40 2.37 1.14256 5.28571
+41 2.43 0.945075 5.69388
+42 2.49 0.990089 6.14286
+43 2.55 1.1586 6.69388
+44 2.61 0.983065 7.18367
+45 2.67 0.90024 7.65306
+46 2.73 0.786226 8.08163
+47 2.79 0.860314 8.57143
+48 2.85 1.20236 9.28571
+49 2.91 0.988533 9.89796
+50 2.97 0.695931 10.3469
+107950 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 0 0
+9 0.51 0 0
+10 0.57 0.858066 0.0204082
+11 0.63 1.40505 0.0612245
+12 0.69 1.17146 0.102041
+13 0.75 1.98325 0.183673
+14 0.81 0.425111 0.204082
+15 0.87 0.368519 0.22449
+16 0.93 1.61259 0.326531
+17 0.99 0.853865 0.387755
+18 1.05 0.759094 0.44898
+19 1.11 0.679267 0.510204
+20 1.17 0.8152 0.591837
+21 1.23 0.737623 0.673469
+22 1.29 0.670615 0.755102
+23 1.35 0.30617 0.795918
+24 1.41 2.10503 1.10204
+25 1.47 0.645574 1.20408
+26 1.53 1.19188 1.40816
+27 1.59 0.993271 1.59184
+28 1.65 0.614903 1.71429
+29 1.71 1.04961 1.93878
+30 1.77 0.979661 2.16327
+31 1.83 0.833163 2.36735
+32 1.89 1.40599 2.73469
+33 1.95 0.880539 2.97959
+34 2.01 0.759695 3.20408
+35 2.07 0.716296 3.42857
+36 2.13 1.04552 3.77551
+37 2.19 0.756309 4.04082
+38 2.25 1.15744 4.46939
+39 2.31 0.784357 4.77551
+40 2.37 0.943854 5.16327
+41 2.43 0.945075 5.57143
+42 2.49 0.720064 5.89796
+43 2.55 1.37316 6.55102
+44 2.61 1.10595 7.10204
+45 2.67 1.33079 7.79592
+46 2.73 0.898544 8.28571
+47 2.79 0.860314 8.77551
+48 2.85 0.858826 9.28571
+49 2.91 0.988533 9.89796
+50 2.97 1.0439 10.5714
+108000 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 0 0
+9 0.51 0 0
+10 0.57 0 0
+11 0.63 0 0
+12 0.69 0.585732 0.0204082
+13 0.75 1.48744 0.0816327
+14 0.81 0.425111 0.102041
+15 0.87 0.368519 0.122449
+16 0.93 0 0.122449
+17 0.99 0.569243 0.163265
+18 1.05 0.253031 0.183673
+19 1.11 1.35853 0.306122
+20 1.17 1.6304 0.469388
+21 1.23 0.368812 0.510204
+22 1.29 1.67654 0.714286
+23 1.35 0.459254 0.77551
+24 1.41 0.561342 0.857143
+25 1.47 1.16203 1.04082
+26 1.53 1.07269 1.22449
+27 1.59 0.993271 1.40816
+28 1.65 1.22981 1.65306
+29 1.71 0.85877 1.83673
+30 1.77 0.71248 2
+31 1.83 1.08311 2.26531
+32 1.89 0.859219 2.4898
+33 1.95 0.807161 2.71429
+34 2.01 1.17407 3.06122
+35 2.07 1.17212 3.42857
+36 2.13 0.615011 3.63265
+37 2.19 1.0472 4
+38 2.25 1.26768 4.46939
+39 2.31 0.470614 4.65306
+40 2.37 1.09288 5.10204
+41 2.43 1.03958 5.55102
+42 2.49 1.21511 6.10204
+43 2.55 1.1586 6.65306
+44 2.61 1.06499 7.18367
+45 2.67 0.93938 7.67347
+46 2.73 0.973423 8.20408
+47 2.79 0.896161 8.71429
+48 2.85 0.721414 9.14286
+49 2.91 1.21919 9.89796
+50 2.97 1.07553 10.5918
+108050 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 0 0
+9 0.51 0 0
+10 0.57 0 0
+11 0.63 0.702525 0.0204082
+12 0.69 0 0.0204082
+13 0.75 0.495812 0.0408163
+14 0.81 0.850222 0.0816327
+15 0.87 1.10556 0.142857
+16 0.93 0.645037 0.183673
+17 0.99 1.13849 0.265306
+18 1.05 1.26516 0.367347
+19 1.11 2.0378 0.55102
+20 1.17 0.2038 0.571429
+21 1.23 0.737623 0.653061
+22 1.29 0.838269 0.755102
+23 1.35 0.459254 0.816327
+24 1.41 0.982348 0.959184
+25 1.47 0.516459 1.04082
+26 1.53 1.07269 1.22449
+27 1.59 1.214 1.44898
+28 1.65 0.512419 1.55102
+29 1.71 1.04961 1.77551
+30 1.77 1.15778 2.04082
+31 1.83 1.16643 2.32653
+32 1.89 0.859219 2.55102
+33 1.95 1.32081 2.91837
+34 2.01 1.24314 3.28571
+35 2.07 0.976768 3.59184
+36 2.13 0.799515 3.85714
+37 2.19 1.10537 4.2449
+38 2.25 0.826745 4.55102
+39 2.31 0.888938 4.89796
+40 2.37 0.745148 5.20408
+41 2.43 0.992329 5.63265
+42 2.49 0.900081 6.04082
+43 2.55 1.07278 6.55102
+44 2.61 0.860182 6.97959
+45 2.67 1.25251 7.63265
+46 2.73 0.935984 8.14286
+47 2.79 0.824468 8.61224
+48 2.85 0.893179 9.14286
+49 2.91 0.889679 9.69388
+50 2.97 1.20206 10.4694
+108100 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 1.37595 0.0204082
+9 0.51 0 0.0204082
+10 0.57 0.858066 0.0408163
+11 0.63 2.8101 0.122449
+12 0.69 0 0.122449
+13 0.75 0.991624 0.163265
+14 0.81 0.850222 0.204082
+15 0.87 1.8426 0.306122
+16 0.93 0.322518 0.326531
+17 0.99 0.853865 0.387755
+18 1.05 0 0.387755
+19 1.11 1.35853 0.510204
+20 1.17 0.4076 0.55102
+21 1.23 1.47525 0.714286
+22 1.29 0.502961 0.77551
+23 1.35 0.459254 0.836735
+24 1.41 0.140335 0.857143
+25 1.47 0.516459 0.938776
+26 1.53 0.476752 1.02041
+27 1.59 1.214 1.2449
+28 1.65 0.614903 1.36735
+29 1.71 1.33586 1.65306
+30 1.77 0.80154 1.83673
+31 1.83 0.833163 2.04082
+32 1.89 0.546775 2.18367
+33 1.95 0.733783 2.38776
+34 2.01 0.966885 2.67347
+35 2.07 0.846532 2.93878
+36 2.13 1.10702 3.30612
+37 2.19 1.45444 3.81633
+38 2.25 0.881861 4.14286
+39 2.31 0.888938 4.4898
+40 2.37 0.943854 4.87755
+41 2.43 1.37036 5.46939
+42 2.49 1.03509 5.93878
+43 2.55 1.1586 6.4898
+44 2.61 1.31075 7.14286
+45 2.67 1.33079 7.83673
+46 2.73 0.748787 8.2449
+47 2.79 1.03955 8.83673
+48 2.85 0.858826 9.34694
+49 2.91 0.757875 9.81633
+50 2.97 1.01226 10.4694
+108150 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 0 0
+9 0.51 0 0
+10 0.57 1.71613 0.0408163
+11 0.63 1.40505 0.0816327
+12 0.69 0 0.0816327
+13 0.75 1.48744 0.142857
+14 0.81 0.850222 0.183673
+15 0.87 0 0.183673
+16 0.93 0.645037 0.22449
+17 0.99 0.853865 0.285714
+18 1.05 1.26516 0.387755
+19 1.11 0.679267 0.44898
+20 1.17 0.6114 0.510204
+21 1.23 0.553218 0.571429
+22 1.29 1.67654 0.77551
+23 1.35 1.07159 0.918367
+24 1.41 0.842013 1.04082
+25 1.47 0.387344 1.10204
+26 1.53 1.19188 1.30612
+27 1.59 0.882908 1.46939
+28 1.65 0.717387 1.61224
+29 1.71 0.763351 1.77551
+30 1.77 1.42496 2.10204
+31 1.83 0.66653 2.26531
+32 1.89 1.01544 2.53061
+33 1.95 1.39419 2.91837
+34 2.01 0.828758 3.16327
+35 2.07 0.846532 3.42857
+36 2.13 1.04552 3.77551
+37 2.19 1.0472 4.14286
+38 2.25 1.15744 4.57143
+39 2.31 0.732067 4.85714
+40 2.37 0.695471 5.14286
+41 2.43 1.13409 5.63265
+42 2.49 0.67506 5.93878
+43 2.55 1.20151 6.5102
+44 2.61 1.22883 7.12245
+45 2.67 0.90024 7.59184
+46 2.73 0.786226 8.02041
+47 2.79 1.43386 8.83673
+48 2.85 1.13365 9.5102
+49 2.91 0.889679 10.0612
+50 2.97 0.98063 10.6939
+108200 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 1.37595 0.0204082
+9 0.51 1.07159 0.0408163
+10 0.57 0 0.0408163
+11 0.63 0.702525 0.0612245
+12 0.69 2.92866 0.163265
+13 0.75 0.495812 0.183673
+14 0.81 0.425111 0.204082
+15 0.87 1.47408 0.285714
+16 0.93 0.967555 0.346939
+17 0.99 1.13849 0.428571
+18 1.05 0.506063 0.469388
+19 1.11 0.452845 0.510204
+20 1.17 1.4266 0.653061
+21 1.23 0.368812 0.693878
+22 1.29 0.502961 0.755102
+23 1.35 0.612339 0.836735
+24 1.41 0.561342 0.918367
+25 1.47 1.03292 1.08163
+26 1.53 0.953504 1.2449
+27 1.59 0.993271 1.42857
+28 1.65 0.717387 1.57143
+29 1.71 0.85877 1.7551
+30 1.77 0.62342 1.89796
+31 1.83 0.833163 2.10204
+32 1.89 0.937329 2.34694
+33 1.95 0.880539 2.59184
+34 2.01 1.03595 2.89796
+35 2.07 1.36747 3.32653
+36 2.13 1.16852 3.71429
+37 2.19 0.872664 4.02041
+38 2.25 0.992094 4.38776
+39 2.31 0.993519 4.77551
+40 2.37 1.39094 5.34694
+41 2.43 0.992329 5.77551
+42 2.49 0.810072 6.14286
+43 2.55 1.07278 6.65306
+44 2.61 0.77826 7.04082
+45 2.67 1.01766 7.57143
+46 2.73 1.01086 8.12245
+47 2.79 0.932007 8.65306
+48 2.85 1.03059 9.26531
+49 2.91 0.856728 9.79592
+50 2.97 0.727564 10.2653
+108250 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 1.83099 0.0204082
+8 0.45 0 0.0204082
+9 0.51 0 0.0204082
+10 0.57 0 0.0204082
+11 0.63 1.40505 0.0612245
+12 0.69 0.585732 0.0816327
+13 0.75 0.991624 0.122449
+14 0.81 1.27533 0.183673
+15 0.87 1.10556 0.244898
+16 0.93 0.322518 0.265306
+17 0.99 0.569243 0.306122
+18 1.05 1.26516 0.408163
+19 1.11 0.90569 0.489796
+20 1.17 1.019 0.591837
+21 1.23 0.737623 0.673469
+22 1.29 0.838269 0.77551
+23 1.35 1.53085 0.979592
+24 1.41 0.701677 1.08163
+25 1.47 1.03292 1.2449
+26 1.53 1.31107 1.46939
+27 1.59 0.110363 1.4898
+28 1.65 0.819871 1.65306
+29 1.71 0.190838 1.69388
+30 1.77 0.979661 1.91837
+31 1.83 1.41638 2.26531
+32 1.89 0.937329 2.5102
+33 1.95 0.953918 2.77551
+34 2.01 0.966885 3.06122
+35 2.07 0.781414 3.30612
+36 2.13 0.738014 3.55102
+37 2.19 1.27991 4
+38 2.25 1.21256 4.44898
+39 2.31 0.732067 4.73469
+40 2.37 0.546442 4.95918
+41 2.43 1.46487 5.59184
+42 2.49 1.21511 6.14286
+43 2.55 1.02987 6.63265
+44 2.61 0.819221 7.04082
+45 2.67 0.93938 7.53061
+46 2.73 0.524151 7.81633
+47 2.79 1.0037 8.38776
+48 2.85 1.03059 9
+49 2.91 0.790826 9.4898
+50 2.97 0.759197 9.97959
+108300 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 1.83099 0.0204082
+8 0.45 1.37595 0.0408163
+9 0.51 0 0.0408163
+10 0.57 0.858066 0.0612245
+11 0.63 1.40505 0.102041
+12 0.69 0 0.102041
+13 0.75 0 0.102041
+14 0.81 0.850222 0.142857
+15 0.87 0.737039 0.183673
+16 0.93 1.61259 0.285714
+17 0.99 1.70773 0.408163
+18 1.05 1.51819 0.530612
+19 1.11 0.226422 0.55102
+20 1.17 0.4076 0.591837
+21 1.23 0.553218 0.653061
+22 1.29 1.17358 0.795918
+23 1.35 0.765424 0.897959
+24 1.41 0.842013 1.02041
+25 1.47 0.387344 1.08163
+26 1.53 0.715128 1.20408
+27 1.59 0.772544 1.34694
+28 1.65 1.02484 1.55102
+29 1.71 1.24045 1.81633
+30 1.77 1.06872 2.06122
+31 1.83 1.24974 2.36735
+32 1.89 0.859219 2.59184
+33 1.95 1.10067 2.89796
+34 2.01 1.17407 3.2449
+35 2.07 0.91165 3.53061
+36 2.13 0.676513 3.7551
+37 2.19 0.698131 4
+38 2.25 0.826745 4.30612
+39 2.31 0.941229 4.67347
+40 2.37 1.24191 5.18367
+41 2.43 0.992329 5.61224
+42 2.49 0.810072 5.97959
+43 2.55 1.33025 6.61224
+44 2.61 0.614416 6.91837
+45 2.67 1.29165 7.59184
+46 2.73 0.935984 8.10204
+47 2.79 0.50185 8.38776
+48 2.85 1.0993 9.04082
+49 2.91 0.92263 9.61224
+50 2.97 0.948997 10.2245
+108350 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 0 0
+9 0.51 1.07159 0.0204082
+10 0.57 0.858066 0.0408163
+11 0.63 0.702525 0.0612245
+12 0.69 0.585732 0.0816327
+13 0.75 0.991624 0.122449
+14 0.81 0.425111 0.142857
+15 0.87 0.368519 0.163265
+16 0.93 1.61259 0.265306
+17 0.99 0.853865 0.326531
+18 1.05 1.51819 0.44898
+19 1.11 0.452845 0.489796
+20 1.17 0.6114 0.55102
+21 1.23 0.184406 0.571429
+22 1.29 0.838269 0.673469
+23 1.35 0.459254 0.734694
+24 1.41 1.12268 0.897959
+25 1.47 0.645574 1
+26 1.53 1.19188 1.20408
+27 1.59 0.662181 1.32653
+28 1.65 0.819871 1.4898
+29 1.71 1.04961 1.71429
+30 1.77 1.15778 1.97959
+31 1.83 0.416582 2.08163
+32 1.89 1.01544 2.34694
+33 1.95 0.587026 2.5102
+34 2.01 0.828758 2.7551
+35 2.07 1.04189 3.08163
+36 2.13 0.492009 3.2449
+37 2.19 0.930841 3.57143
+38 2.25 1.32279 4.06122
+39 2.31 1.04581 4.46939
+40 2.37 1.14256 4.93878
+41 2.43 1.03958 5.38776
+42 2.49 1.21511 5.93878
+43 2.55 1.45898 6.63265
+44 2.61 1.35171 7.30612
+45 2.67 0.93938 7.79592
+46 2.73 1.01086 8.34694
+47 2.79 1.07539 8.95918
+48 2.85 0.652708 9.34694
+49 2.91 0.823777 9.85714
+50 2.97 1.01226 10.5102
+108400 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 1.37595 0.0204082
+9 0.51 1.07159 0.0408163
+10 0.57 0 0.0408163
+11 0.63 1.40505 0.0816327
+12 0.69 0.585732 0.102041
+13 0.75 0.495812 0.122449
+14 0.81 0.425111 0.142857
+15 0.87 0.737039 0.183673
+16 0.93 0.967555 0.244898
+17 0.99 0.569243 0.285714
+18 1.05 1.01213 0.367347
+19 1.11 0.90569 0.44898
+20 1.17 0.8152 0.530612
+21 1.23 1.10644 0.653061
+22 1.29 0.502961 0.714286
+23 1.35 1.53085 0.918367
+24 1.41 0.842013 1.04082
+25 1.47 0.774689 1.16327
+26 1.53 1.07269 1.34694
+27 1.59 0.993271 1.53061
+28 1.65 1.63974 1.85714
+29 1.71 0.667932 2
+30 1.77 0.62342 2.14286
+31 1.83 1.41638 2.4898
+32 1.89 0.859219 2.71429
+33 1.95 0.880539 2.95918
+34 2.01 0.483442 3.10204
+35 2.07 0.651178 3.30612
+36 2.13 0.984018 3.63265
+37 2.19 0.872664 3.93878
+38 2.25 1.15744 4.36735
+39 2.31 0.888938 4.71429
+40 2.37 1.14256 5.18367
+41 2.43 1.51212 5.83673
+42 2.49 1.30512 6.42857
+43 2.55 0.72949 6.77551
+44 2.61 0.532493 7.04082
+45 2.67 1.25251 7.69388
+46 2.73 0.673908 8.06122
+47 2.79 0.932007 8.59184
+48 2.85 0.961885 9.16327
+49 2.91 0.823777 9.67347
+50 2.97 1.10716 10.3878
+108450 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 7.62412 0.0408163
+6 0.33 0 0.0408163
+7 0.39 0 0.0408163
+8 0.45 0 0.0408163
+9 0.51 0 0.0408163
+10 0.57 0.858066 0.0612245
+11 0.63 0.702525 0.0816327
+12 0.69 0.585732 0.102041
+13 0.75 0 0.102041
+14 0.81 1.27533 0.163265
+15 0.87 0 0.163265
+16 0.93 0.967555 0.22449
+17 0.99 0.853865 0.285714
+18 1.05 0 0.285714
+19 1.11 0.226422 0.306122
+20 1.17 0.2038 0.326531
+21 1.23 1.29084 0.469388
+22 1.29 0.670615 0.55102
+23 1.35 1.37776 0.734694
+24 1.41 0.701677 0.836735
+25 1.47 1.54938 1.08163
+26 1.53 0.476752 1.16327
+27 1.59 0.662181 1.28571
+28 1.65 0.614903 1.40816
+29 1.71 0.85877 1.59184
+30 1.77 0.80154 1.77551
+31 1.83 0.833163 1.97959
+32 1.89 1.17166 2.28571
+33 1.95 1.24743 2.63265
+34 2.01 0.897822 2.89796
+35 2.07 0.520943 3.06122
+36 2.13 1.29152 3.4898
+37 2.19 0.930841 3.81633
+38 2.25 1.10233 4.22449
+39 2.31 0.888938 4.57143
+40 2.37 1.24191 5.08163
+41 2.43 1.32311 5.65306
+42 2.49 1.53014 6.34694
+43 2.55 1.02987 6.83673
+44 2.61 0.737299 7.20408
+45 2.67 1.21337 7.83673
+46 2.73 0.823666 8.28571
+47 2.79 0.967854 8.83673
+48 2.85 0.961885 9.40816
+49 2.91 1.18624 10.1429
+50 2.97 1.1388 10.8776
+108500 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 0 0
+9 0.51 0 0
+10 0.57 0 0
+11 0.63 0.702525 0.0204082
+12 0.69 0.585732 0.0408163
+13 0.75 0.991624 0.0816327
+14 0.81 0.850222 0.122449
+15 0.87 0.368519 0.142857
+16 0.93 0.645037 0.183673
+17 0.99 1.13849 0.265306
+18 1.05 0.506063 0.306122
+19 1.11 0.679267 0.367347
+20 1.17 0.6114 0.428571
+21 1.23 1.29084 0.571429
+22 1.29 0.502961 0.632653
+23 1.35 0.765424 0.734694
+24 1.41 1.12268 0.897959
+25 1.47 1.16203 1.08163
+26 1.53 0.953504 1.2449
+27 1.59 0.772544 1.38776
+28 1.65 1.12732 1.61224
+29 1.71 0.667932 1.7551
+30 1.77 1.42496 2.08163
+31 1.83 0.833163 2.28571
+32 1.89 0.859219 2.5102
+33 1.95 0.953918 2.77551
+34 2.01 1.24314 3.14286
+35 2.07 1.107 3.4898
+36 2.13 1.10702 3.85714
+37 2.19 1.10537 4.2449
+38 2.25 0.881861 4.57143
+39 2.31 1.25497 5.06122
+40 2.37 1.04321 5.4898
+41 2.43 0.897822 5.87755
+42 2.49 0.810072 6.2449
+43 2.55 0.944046 6.69388
+44 2.61 0.983065 7.18367
+45 2.67 0.93938 7.67347
+46 2.73 1.12318 8.28571
+47 2.79 0.681082 8.67347
+48 2.85 0.755767 9.12245
+49 2.91 1.4169 10
+50 2.97 1.26533 10.8163
+108550 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 0 0
+9 0.51 0 0
+10 0.57 0.858066 0.0204082
+11 0.63 0 0.0204082
+12 0.69 1.17146 0.0612245
+13 0.75 1.48744 0.122449
+14 0.81 1.70044 0.204082
+15 0.87 1.8426 0.306122
+16 0.93 0.967555 0.367347
+17 0.99 1.13849 0.44898
+18 1.05 0.253031 0.469388
+19 1.11 0.226422 0.489796
+20 1.17 0.6114 0.55102
+21 1.23 1.10644 0.673469
+22 1.29 1.00592 0.795918
+23 1.35 1.07159 0.938776
+24 1.41 0.842013 1.06122
+25 1.47 0.903804 1.20408
+26 1.53 0.59594 1.30612
+27 1.59 0.772544 1.44898
+28 1.65 0.819871 1.61224
+29 1.71 0.477094 1.71429
+30 1.77 1.60308 2.08163
+31 1.83 0.916479 2.30612
+32 1.89 0.546775 2.44898
+33 1.95 1.24743 2.79592
+34 2.01 0.966885 3.08163
+35 2.07 1.23724 3.46939
+36 2.13 1.16852 3.85714
+37 2.19 1.16355 4.26531
+38 2.25 1.15744 4.69388
+39 2.31 1.04581 5.10204
+40 2.37 0.794824 5.42857
+41 2.43 1.13409 5.91837
+42 2.49 0.495044 6.14286
+43 2.55 1.1586 6.69388
+44 2.61 1.43364 7.40816
+45 2.67 0.821958 7.83673
+46 2.73 1.08574 8.42857
+47 2.79 0.752775 8.85714
+48 2.85 1.03059 9.46939
+49 2.91 1.15329 10.1837
+50 2.97 1.20206 10.9592
+108600 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 0 0
+9 0.51 0 0
+10 0.57 1.71613 0.0408163
+11 0.63 0.702525 0.0612245
+12 0.69 0.585732 0.0816327
+13 0.75 0.495812 0.102041
+14 0.81 0.425111 0.122449
+15 0.87 0.368519 0.142857
+16 0.93 1.61259 0.244898
+17 0.99 0.284622 0.265306
+18 1.05 0.506063 0.306122
+19 1.11 1.35853 0.428571
+20 1.17 1.8342 0.612245
+21 1.23 1.84406 0.816327
+22 1.29 1.00592 0.938776
+23 1.35 0.918509 1.06122
+24 1.41 0.561342 1.14286
+25 1.47 1.03292 1.30612
+26 1.53 1.07269 1.4898
+27 1.59 0.993271 1.67347
+28 1.65 1.22981 1.91837
+29 1.71 0.763351 2.08163
+30 1.77 1.3359 2.38776
+31 1.83 0.999796 2.63265
+32 1.89 0.859219 2.85714
+33 1.95 0.953918 3.12245
+34 2.01 0.966885 3.40816
+35 2.07 1.17212 3.77551
+36 2.13 0.492009 3.93878
+37 2.19 1.16355 4.34694
+38 2.25 0.716512 4.61224
+39 2.31 0.679776 4.87755
+40 2.37 0.99353 5.28571
+41 2.43 1.13409 5.77551
+42 2.49 1.0801 6.26531
+43 2.55 1.02987 6.7551
+44 2.61 0.819221 7.16327
+45 2.67 0.665394 7.5102
+46 2.73 1.01086 8.06122
+47 2.79 0.824468 8.53061
+48 2.85 1.13365 9.20408
+49 2.91 1.02148 9.83673
+50 2.97 1.0439 10.5102
+108650 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 0 0
+9 0.51 0 0
+10 0.57 0 0
+11 0.63 0.702525 0.0204082
+12 0.69 0 0.0204082
+13 0.75 1.48744 0.0816327
+14 0.81 0.850222 0.122449
+15 0.87 1.10556 0.183673
+16 0.93 0.322518 0.204082
+17 0.99 0.853865 0.265306
+18 1.05 1.77122 0.408163
+19 1.11 0.679267 0.469388
+20 1.17 0.6114 0.530612
+21 1.23 0.553218 0.591837
+22 1.29 1.50888 0.77551
+23 1.35 0.30617 0.816327
+24 1.41 1.12268 0.979592
+25 1.47 1.16203 1.16327
+26 1.53 1.07269 1.34694
+27 1.59 0.551817 1.44898
+28 1.65 0.717387 1.59184
+29 1.71 1.33586 1.87755
+30 1.77 0.62342 2.02041
+31 1.83 0.66653 2.18367
+32 1.89 0.624886 2.34694
+33 1.95 0.807161 2.57143
+34 2.01 0.828758 2.81633
+35 2.07 0.716296 3.04082
+36 2.13 0.984018 3.36735
+37 2.19 0.756309 3.63265
+38 2.25 0.771629 3.91837
+39 2.31 1.25497 4.40816
+40 2.37 0.794824 4.73469
+41 2.43 1.13409 5.22449
+42 2.49 0.900081 5.63265
+43 2.55 1.02987 6.12245
+44 2.61 1.22883 6.73469
+45 2.67 0.978521 7.2449
+46 2.73 1.08574 7.83673
+47 2.79 1.14709 8.4898
+48 2.85 0.961885 9.06122
+49 2.91 1.08739 9.73469
+50 2.97 0.854097 10.2857
+108700 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 1.37595 0.0204082
+9 0.51 1.07159 0.0408163
+10 0.57 0 0.0408163
+11 0.63 0 0.0408163
+12 0.69 0.585732 0.0612245
+13 0.75 0.991624 0.102041
+14 0.81 0.850222 0.142857
+15 0.87 1.10556 0.204082
+16 0.93 0.322518 0.22449
+17 0.99 0.853865 0.285714
+18 1.05 1.26516 0.387755
+19 1.11 0.90569 0.469388
+20 1.17 0.2038 0.489796
+21 1.23 0.922029 0.591837
+22 1.29 0.335308 0.632653
+23 1.35 0.153085 0.653061
+24 1.41 0.842013 0.77551
+25 1.47 0.387344 0.836735
+26 1.53 1.66863 1.12245
+27 1.59 1.214 1.34694
+28 1.65 0.922354 1.53061
+29 1.71 1.5267 1.85714
+30 1.77 0.890601 2.06122
+31 1.83 0.333265 2.14286
+32 1.89 1.17166 2.44898
+33 1.95 0.733783 2.65306
+34 2.01 1.3122 3.04082
+35 2.07 1.107 3.38776
+36 2.13 0.922517 3.69388
+37 2.19 0.872664 4
+38 2.25 1.04721 4.38776
+39 2.31 1.25497 4.87755
+40 2.37 0.695471 5.16327
+41 2.43 0.803314 5.5102
+42 2.49 1.1251 6.02041
+43 2.55 0.901135 6.44898
+44 2.61 1.4746 7.18367
+45 2.67 1.25251 7.83673
+46 2.73 0.935984 8.34694
+47 2.79 0.645236 8.71429
+48 2.85 1.13365 9.38776
+49 2.91 1.08739 10.0612
+50 2.97 0.790831 10.5714
+108750 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 0 0
+9 0.51 1.07159 0.0204082
+10 0.57 0 0.0204082
+11 0.63 0.702525 0.0408163
+12 0.69 0.585732 0.0612245
+13 0.75 0.495812 0.0816327
+14 0.81 0.850222 0.122449
+15 0.87 1.47408 0.204082
+16 0.93 0.322518 0.22449
+17 0.99 0.284622 0.244898
+18 1.05 2.02425 0.408163
+19 1.11 0.90569 0.489796
+20 1.17 0.4076 0.530612
+21 1.23 0.737623 0.612245
+22 1.29 1.17358 0.755102
+23 1.35 0.612339 0.836735
+24 1.41 1.40335 1.04082
+25 1.47 1.03292 1.20408
+26 1.53 0.953504 1.36735
+27 1.59 1.10363 1.57143
+28 1.65 1.43477 1.85714
+29 1.71 1.14503 2.10204
+30 1.77 0.80154 2.28571
+31 1.83 0.833163 2.4898
+32 1.89 1.09355 2.77551
+33 1.95 0.953918 3.04082
+34 2.01 0.966885 3.32653
+35 2.07 0.846532 3.59184
+36 2.13 1.23002 4
+37 2.19 0.698131 4.2449
+38 2.25 1.43302 4.77551
+39 2.31 0.679776 5.04082
+40 2.37 0.99353 5.44898
+41 2.43 0.567045 5.69388
+42 2.49 0.765068 6.04082
+43 2.55 0.772402 6.40816
+44 2.61 1.02403 6.91837
+45 2.67 0.978521 7.42857
+46 2.73 1.0483 8
+47 2.79 0.609389 8.34694
+48 2.85 0.927532 8.89796
+49 2.91 1.05443 9.55102
+50 2.97 0.727564 10.0204
+108800 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 0 0
+9 0.51 0 0
+10 0.57 1.71613 0.0408163
+11 0.63 0 0.0408163
+12 0.69 1.7572 0.102041
+13 0.75 1.98325 0.183673
+14 0.81 0.850222 0.22449
+15 0.87 1.10556 0.285714
+16 0.93 0 0.285714
+17 0.99 0.569243 0.326531
+18 1.05 1.26516 0.428571
+19 1.11 0.90569 0.510204
+20 1.17 0.4076 0.55102
+21 1.23 0.553218 0.612245
+22 1.29 1.17358 0.755102
+23 1.35 0.30617 0.795918
+24 1.41 1.26302 0.979592
+25 1.47 1.16203 1.16327
+26 1.53 1.19188 1.36735
+27 1.59 0.772544 1.5102
+28 1.65 0.307451 1.57143
+29 1.71 1.33586 1.85714
+30 1.77 0.53436 1.97959
+31 1.83 1.49969 2.34694
+32 1.89 0.390554 2.44898
+33 1.95 0.880539 2.69388
+34 2.01 0.966885 2.97959
+35 2.07 0.846532 3.2449
+36 2.13 1.47603 3.73469
+37 2.19 1.22173 4.16327
+38 2.25 0.551163 4.36735
+39 2.31 0.522905 4.57143
+40 2.37 0.496765 4.77551
+41 2.43 0.897822 5.16327
+42 2.49 1.0801 5.65306
+43 2.55 0.858224 6.06122
+44 2.61 1.14691 6.63265
+45 2.67 1.21337 7.26531
+46 2.73 0.861105 7.73469
+47 2.79 0.824468 8.20408
+48 2.85 0.961885 8.77551
+49 2.91 1.15329 9.4898
+50 2.97 1.01226 10.1429
+108850 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 1.37595 0.0204082
+9 0.51 2.14319 0.0612245
+10 0.57 0 0.0612245
+11 0.63 0.702525 0.0816327
+12 0.69 0.585732 0.102041
+13 0.75 0 0.102041
+14 0.81 2.12556 0.204082
+15 0.87 1.47408 0.285714
+16 0.93 0.967555 0.346939
+17 0.99 1.42311 0.44898
+18 1.05 1.01213 0.530612
+19 1.11 0.90569 0.612245
+20 1.17 1.4266 0.755102
+21 1.23 0.553218 0.816327
+22 1.29 0.838269 0.918367
+23 1.35 1.07159 1.06122
+24 1.41 0.421006 1.12245
+25 1.47 0.387344 1.18367
+26 1.53 0.715128 1.30612
+27 1.59 0.551817 1.40816
+28 1.65 0.512419 1.5102
+29 1.71 1.04961 1.73469
+30 1.77 0.71248 1.89796
+31 1.83 1.16643 2.18367
+32 1.89 0.859219 2.40816
+33 1.95 0.660405 2.59184
+34 2.01 0.966885 2.87755
+35 2.07 1.107 3.22449
+36 2.13 0.492009 3.38776
+37 2.19 1.16355 3.79592
+38 2.25 0.826745 4.10204
+39 2.31 0.993519 4.4898
+40 2.37 0.844501 4.83673
+41 2.43 1.08684 5.30612
+42 2.49 0.630056 5.59184
+43 2.55 0.686579 5.91837
+44 2.61 1.14691 6.4898
+45 2.67 1.0568 7.04082
+46 2.73 0.861105 7.5102
+47 2.79 1.14709 8.16327
+48 2.85 1.0993 8.81633
+49 2.91 1.02148 9.44898
+50 2.97 1.1388 10.1837
+108900 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 0 0
+9 0.51 0 0
+10 0.57 0 0
+11 0.63 0 0
+12 0.69 1.17146 0.0408163
+13 0.75 0.991624 0.0816327
+14 0.81 0.850222 0.122449
+15 0.87 2.57964 0.265306
+16 0.93 0.645037 0.306122
+17 0.99 0.569243 0.346939
+18 1.05 0.759094 0.408163
+19 1.11 0.226422 0.428571
+20 1.17 0.4076 0.469388
+21 1.23 0.184406 0.489796
+22 1.29 1.50888 0.673469
+23 1.35 0.765424 0.77551
+24 1.41 0.421006 0.836735
+25 1.47 0.903804 0.979592
+26 1.53 0.59594 1.08163
+27 1.59 0.441454 1.16327
+28 1.65 1.02484 1.36735
+29 1.71 0.763351 1.53061
+30 1.77 0.80154 1.71429
+31 1.83 0.749847 1.89796
+32 1.89 0.859219 2.12245
+33 1.95 0.660405 2.30612
+34 2.01 0.828758 2.55102
+35 2.07 0.91165 2.83673
+36 2.13 1.29152 3.26531
+37 2.19 0.814486 3.55102
+38 2.25 0.936978 3.89796
+39 2.31 0.993519 4.28571
+40 2.37 1.09288 4.73469
+41 2.43 0.850568 5.10204
+42 2.49 1.26011 5.67347
+43 2.55 0.901135 6.10204
+44 2.61 0.819221 6.5102
+45 2.67 1.25251 7.16327
+46 2.73 1.19806 7.81633
+47 2.79 1.32632 8.57143
+48 2.85 1.0993 9.22449
+49 2.91 0.889679 9.77551
+50 2.97 1.17043 10.5306
+108950 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 1.37595 0.0204082
+9 0.51 0 0.0204082
+10 0.57 0 0.0204082
+11 0.63 2.10758 0.0816327
+12 0.69 0 0.0816327
+13 0.75 0.495812 0.102041
+14 0.81 0.425111 0.122449
+15 0.87 2.57964 0.265306
+16 0.93 0.322518 0.285714
+17 0.99 0.284622 0.306122
+18 1.05 0 0.306122
+19 1.11 0.679267 0.367347
+20 1.17 0.6114 0.428571
+21 1.23 1.10644 0.55102
+22 1.29 0.670615 0.632653
+23 1.35 0.765424 0.734694
+24 1.41 0.842013 0.857143
+25 1.47 0.645574 0.959184
+26 1.53 0.953504 1.12245
+27 1.59 0.772544 1.26531
+28 1.65 0.717387 1.40816
+29 1.71 1.33586 1.69388
+30 1.77 0.979661 1.91837
+31 1.83 1.74964 2.34694
+32 1.89 1.09355 2.63265
+33 1.95 1.10067 2.93878
+34 2.01 0.759695 3.16327
+35 2.07 1.56283 3.65306
+36 2.13 0.676513 3.87755
+37 2.19 0.756309 4.14286
+38 2.25 0.936978 4.4898
+39 2.31 1.15039 4.93878
+40 2.37 1.04321 5.36735
+41 2.43 0.945075 5.77551
+42 2.49 1.0801 6.26531
+43 2.55 1.33025 6.89796
+44 2.61 0.983065 7.38776
+45 2.67 1.01766 7.91837
+46 2.73 1.2355 8.59184
+47 2.79 0.609389 8.93878
+48 2.85 0.961885 9.5102
+49 2.91 0.626071 9.89796
+50 2.97 1.10716 10.6122
+109000 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 0 0
+9 0.51 0 0
+10 0.57 0 0
+11 0.63 0 0
+12 0.69 1.17146 0.0408163
+13 0.75 1.48744 0.102041
+14 0.81 0.850222 0.142857
+15 0.87 1.47408 0.22449
+16 0.93 0.645037 0.265306
+17 0.99 0.853865 0.326531
+18 1.05 1.01213 0.408163
+19 1.11 0.679267 0.469388
+20 1.17 0.4076 0.510204
+21 1.23 0.737623 0.591837
+22 1.29 0 0.591837
+23 1.35 0.459254 0.653061
+24 1.41 0.842013 0.77551
+25 1.47 0.774689 0.897959
+26 1.53 1.31107 1.12245
+27 1.59 1.214 1.34694
+28 1.65 1.43477 1.63265
+29 1.71 0.85877 1.81633
+30 1.77 1.06872 2.06122
+31 1.83 0.916479 2.28571
+32 1.89 0.937329 2.53061
+33 1.95 0.880539 2.77551
+34 2.01 0.966885 3.06122
+35 2.07 1.107 3.40816
+36 2.13 1.23002 3.81633
+37 2.19 1.16355 4.22449
+38 2.25 0.60628 4.44898
+39 2.31 1.04581 4.85714
+40 2.37 0.99353 5.26531
+41 2.43 1.2286 5.79592
+42 2.49 0.765068 6.14286
+43 2.55 0.901135 6.57143
+44 2.61 1.18787 7.16327
+45 2.67 0.861099 7.61224
+46 2.73 1.08574 8.20408
+47 2.79 1.0037 8.77551
+48 2.85 1.03059 9.38776
+49 2.91 1.12034 10.0816
+50 2.97 1.36023 10.9592
+109050 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 1.37595 0.0204082
+9 0.51 0 0.0204082
+10 0.57 0 0.0204082
+11 0.63 0.702525 0.0408163
+12 0.69 2.34293 0.122449
+13 0.75 0.495812 0.142857
+14 0.81 1.70044 0.22449
+15 0.87 0.368519 0.244898
+16 0.93 1.93511 0.367347
+17 0.99 0.569243 0.408163
+18 1.05 1.51819 0.530612
+19 1.11 0.90569 0.612245
+20 1.17 0.8152 0.693878
+21 1.23 0.553218 0.755102
+22 1.29 0.838269 0.857143
+23 1.35 0.918509 0.979592
+24 1.41 0.982348 1.12245
+25 1.47 0.645574 1.22449
+26 1.53 0.715128 1.34694
+27 1.59 1.10363 1.55102
+28 1.65 1.63974 1.87755
+29 1.71 0.954189 2.08163
+30 1.77 0.71248 2.2449
+31 1.83 0.333265 2.32653
+32 1.89 1.17166 2.63265
+33 1.95 0.587026 2.79592
+34 2.01 0.966885 3.08163
+35 2.07 0.781414 3.32653
+36 2.13 0.984018 3.65306
+37 2.19 0.872664 3.95918
+38 2.25 0.881861 4.28571
+39 2.31 0.679776 4.55102
+40 2.37 1.24191 5.06122
+41 2.43 0.945075 5.46939
+42 2.49 0.990089 5.91837
+43 2.55 1.28734 6.53061
+44 2.61 0.983065 7.02041
+45 2.67 0.861099 7.46939
+46 2.73 1.12318 8.08163
+47 2.79 1.0037 8.65306
+48 2.85 1.23671 9.38776
+49 2.91 1.15329 10.102
+50 2.97 1.2337 10.898
+109100 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 1.37595 0.0204082
+9 0.51 0 0.0204082
+10 0.57 0 0.0204082
+11 0.63 0 0.0204082
+12 0.69 0 0.0204082
+13 0.75 0.991624 0.0612245
+14 0.81 1.70044 0.142857
+15 0.87 0.737039 0.183673
+16 0.93 0 0.183673
+17 0.99 0.284622 0.204082
+18 1.05 0.506063 0.244898
+19 1.11 0.452845 0.285714
+20 1.17 1.019 0.387755
+21 1.23 0.368812 0.428571
+22 1.29 1.00592 0.55102
+23 1.35 0.765424 0.653061
+24 1.41 1.40335 0.857143
+25 1.47 1.03292 1.02041
+26 1.53 0.953504 1.18367
+27 1.59 0.993271 1.36735
+28 1.65 1.43477 1.65306
+29 1.71 0.954189 1.85714
+30 1.77 1.06872 2.10204
+31 1.83 1.08311 2.36735
+32 1.89 1.17166 2.67347
+33 1.95 0.953918 2.93878
+34 2.01 1.03595 3.2449
+35 2.07 1.17212 3.61224
+36 2.13 0.984018 3.93878
+37 2.19 1.16355 4.34694
+38 2.25 0.881861 4.67347
+39 2.31 0.941229 5.04082
+40 2.37 1.09288 5.4898
+41 2.43 0.472538 5.69388
+42 2.49 0.810072 6.06122
+43 2.55 0.858224 6.46939
+44 2.61 0.901143 6.91837
+45 2.67 1.09594 7.4898
+46 2.73 1.19806 8.14286
+47 2.79 1.14709 8.79592
+48 2.85 1.20236 9.5102
+49 2.91 1.25214 10.2857
+50 2.97 0.854097 10.8367
+109150 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 1.83099 0.0204082
+8 0.45 0 0.0204082
+9 0.51 2.14319 0.0612245
+10 0.57 1.71613 0.102041
+11 0.63 1.40505 0.142857
+12 0.69 0 0.142857
+13 0.75 1.98325 0.22449
+14 0.81 0.425111 0.244898
+15 0.87 1.10556 0.306122
+16 0.93 1.29007 0.387755
+17 0.99 1.13849 0.469388
+18 1.05 0 0.469388
+19 1.11 0.679267 0.530612
+20 1.17 1.019 0.632653
+21 1.23 1.10644 0.755102
+22 1.29 0.335308 0.795918
+23 1.35 1.07159 0.938776
+24 1.41 0.701677 1.04082
+25 1.47 0.774689 1.16327
+26 1.53 0.953504 1.32653
+27 1.59 0.993271 1.5102
+28 1.65 1.12732 1.73469
+29 1.71 0.667932 1.87755
+30 1.77 1.24684 2.16327
+31 1.83 1.41638 2.5102
+32 1.89 0.468665 2.63265
+33 1.95 0.953918 2.89796
+34 2.01 0.897822 3.16327
+35 2.07 0.91165 3.44898
+36 2.13 0.984018 3.77551
+37 2.19 0.989019 4.12245
+38 2.25 0.496047 4.30612
+39 2.31 0.993519 4.69388
+40 2.37 0.546442 4.91837
+41 2.43 1.13409 5.40816
+42 2.49 1.03509 5.87755
+43 2.55 1.11569 6.40816
+44 2.61 1.14691 6.97959
+45 2.67 0.821958 7.40816
+46 2.73 1.08574 8
+47 2.79 0.967854 8.55102
+48 2.85 1.0993 9.20408
+49 2.91 1.28509 10
+50 2.97 1.07553 10.6939
+109200 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 0 0
+9 0.51 0 0
+10 0.57 0 0
+11 0.63 1.40505 0.0408163
+12 0.69 0.585732 0.0612245
+13 0.75 0.495812 0.0816327
+14 0.81 0.850222 0.122449
+15 0.87 0.368519 0.142857
+16 0.93 0.645037 0.183673
+17 0.99 0.569243 0.22449
+18 1.05 0.506063 0.265306
+19 1.11 0.452845 0.306122
+20 1.17 1.6304 0.469388
+21 1.23 0.553218 0.530612
+22 1.29 0.670615 0.612245
+23 1.35 1.83702 0.857143
+24 1.41 0.982348 1
+25 1.47 0.903804 1.14286
+26 1.53 0.834316 1.28571
+27 1.59 1.54509 1.57143
+28 1.65 1.22981 1.81633
+29 1.71 0.85877 2
+30 1.77 1.3359 2.30612
+31 1.83 1.16643 2.59184
+32 1.89 1.01544 2.85714
+33 1.95 1.24743 3.20408
+34 2.01 0.966885 3.4898
+35 2.07 1.04189 3.81633
+36 2.13 0.861016 4.10204
+37 2.19 1.27991 4.55102
+38 2.25 0.936978 4.89796
+39 2.31 1.0981 5.32653
+40 2.37 0.745148 5.63265
+41 2.43 0.75606 5.95918
+42 2.49 1.1251 6.46939
+43 2.55 0.72949 6.81633
+44 2.61 0.901143 7.26531
+45 2.67 0.821958 7.69388
+46 2.73 0.861105 8.16327
+47 2.79 0.645236 8.53061
+48 2.85 1.06494 9.16327
+49 2.91 1.31804 9.97959
+50 2.97 1.20206 10.7551
+109250 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 0 0
+9 0.51 0 0
+10 0.57 0 0
+11 0.63 0.702525 0.0204082
+12 0.69 0.585732 0.0408163
+13 0.75 0.991624 0.0816327
+14 0.81 0 0.0816327
+15 0.87 1.8426 0.183673
+16 0.93 1.29007 0.265306
+17 0.99 1.13849 0.346939
+18 1.05 1.01213 0.428571
+19 1.11 1.13211 0.530612
+20 1.17 1.019 0.632653
+21 1.23 0.737623 0.714286
+22 1.29 0.838269 0.816327
+23 1.35 0.459254 0.877551
+24 1.41 1.68403 1.12245
+25 1.47 1.03292 1.28571
+26 1.53 1.07269 1.46939
+27 1.59 0.441454 1.55102
+28 1.65 1.22981 1.79592
+29 1.71 1.14503 2.04082
+30 1.77 0.979661 2.26531
+31 1.83 1.24974 2.57143
+32 1.89 0.859219 2.79592
+33 1.95 0.660405 2.97959
+34 2.01 1.24314 3.34694
+35 2.07 1.107 3.69388
+36 2.13 1.04552 4.04082
+37 2.19 0.698131 4.28571
+38 2.25 1.04721 4.67347
+39 2.31 0.941229 5.04082
+40 2.37 0.695471 5.32653
+41 2.43 0.992329 5.7551
+42 2.49 1.03509 6.22449
+43 2.55 0.858224 6.63265
+44 2.61 0.983065 7.12245
+45 2.67 0.704535 7.4898
+46 2.73 1.16062 8.12245
+47 2.79 1.14709 8.77551
+48 2.85 1.0993 9.42857
+49 2.91 0.92263 10
+50 2.97 0.790831 10.5102
+109300 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 0 0
+9 0.51 0 0
+10 0.57 0.858066 0.0204082
+11 0.63 0.702525 0.0408163
+12 0.69 0.585732 0.0612245
+13 0.75 0.991624 0.102041
+14 0.81 0.850222 0.142857
+15 0.87 0.737039 0.183673
+16 0.93 0.645037 0.22449
+17 0.99 2.56159 0.408163
+18 1.05 1.01213 0.489796
+19 1.11 0.679267 0.55102
+20 1.17 1.019 0.653061
+21 1.23 1.10644 0.77551
+22 1.29 1.34123 0.938776
+23 1.35 0.765424 1.04082
+24 1.41 0.701677 1.14286
+25 1.47 0.387344 1.20408
+26 1.53 0.953504 1.36735
+27 1.59 1.32436 1.61224
+28 1.65 1.02484 1.81633
+29 1.71 0.572513 1.93878
+30 1.77 1.06872 2.18367
+31 1.83 0.583214 2.32653
+32 1.89 0.859219 2.55102
+33 1.95 0.880539 2.79592
+34 2.01 1.38126 3.20408
+35 2.07 1.17212 3.57143
+36 2.13 1.29152 4
+37 2.19 0.756309 4.26531
+38 2.25 0.440931 4.42857
+39 2.31 1.15039 4.87755
+40 2.37 1.04321 5.30612
+41 2.43 0.992329 5.73469
+42 2.49 0.765068 6.08163
+43 2.55 1.11569 6.61224
+44 2.61 0.901143 7.06122
+45 2.67 0.704535 7.42857
+46 2.73 0.898544 7.91837
+47 2.79 1.0037 8.4898
+48 2.85 1.13365 9.16327
+49 2.91 1.18624 9.89796
+50 2.97 0.664298 10.3265
+109350 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 1.37595 0.0204082
+9 0.51 2.14319 0.0612245
+10 0.57 0 0.0612245
+11 0.63 0.702525 0.0816327
+12 0.69 0.585732 0.102041
+13 0.75 0.495812 0.122449
+14 0.81 0.850222 0.163265
+15 0.87 0.368519 0.183673
+16 0.93 1.61259 0.285714
+17 0.99 0.569243 0.326531
+18 1.05 0.759094 0.387755
+19 1.11 0.679267 0.44898
+20 1.17 1.8342 0.632653
+21 1.23 0.553218 0.693878
+22 1.29 1.17358 0.836735
+23 1.35 1.83702 1.08163
+24 1.41 0.701677 1.18367
+25 1.47 0.774689 1.30612
+26 1.53 1.31107 1.53061
+27 1.59 1.214 1.7551
+28 1.65 1.12732 1.97959
+29 1.71 1.62212 2.32653
+30 1.77 0.979661 2.55102
+31 1.83 0.583214 2.69388
+32 1.89 0.781108 2.89796
+33 1.95 1.17405 3.22449
+34 2.01 0.828758 3.46939
+35 2.07 0.781414 3.71429
+36 2.13 0.922517 4.02041
+37 2.19 0.814486 4.30612
+38 2.25 0.60628 4.53061
+39 2.31 0.732067 4.81633
+40 2.37 1.24191 5.32653
+41 2.43 1.37036 5.91837
+42 2.49 1.0801 6.40816
+43 2.55 1.1586 6.95918
+44 2.61 0.819221 7.36735
+45 2.67 1.09594 7.93878
+46 2.73 1.08574 8.53061
+47 2.79 0.860314 9.02041
+48 2.85 0.996238 9.61224
+49 2.91 1.02148 10.2449
+50 2.97 0.727564 10.7143
+109400 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 1.37595 0.0204082
+9 0.51 1.07159 0.0408163
+10 0.57 0 0.0408163
+11 0.63 0.702525 0.0612245
+12 0.69 0.585732 0.0816327
+13 0.75 0.991624 0.122449
+14 0.81 0.850222 0.163265
+15 0.87 1.10556 0.22449
+16 0.93 1.29007 0.306122
+17 0.99 0.853865 0.367347
+18 1.05 0.506063 0.408163
+19 1.11 0.452845 0.44898
+20 1.17 1.2228 0.571429
+21 1.23 0.368812 0.612245
+22 1.29 0.838269 0.714286
+23 1.35 0.612339 0.795918
+24 1.41 0.561342 0.877551
+25 1.47 1.16203 1.06122
+26 1.53 0.953504 1.22449
+27 1.59 1.43472 1.4898
+28 1.65 1.02484 1.69388
+29 1.71 1.33586 1.97959
+30 1.77 0.890601 2.18367
+31 1.83 1.58301 2.57143
+32 1.89 0.546775 2.71429
+33 1.95 1.39419 3.10204
+34 2.01 1.03595 3.40816
+35 2.07 0.651178 3.61224
+36 2.13 1.16852 4
+37 2.19 1.27991 4.44898
+38 2.25 0.936978 4.79592
+39 2.31 0.888938 5.14286
+40 2.37 1.24191 5.65306
+41 2.43 1.18134 6.16327
+42 2.49 1.1251 6.67347
+43 2.55 0.986958 7.14286
+44 2.61 0.901143 7.59184
+45 2.67 0.861099 8.04082
+46 2.73 0.59903 8.36735
+47 2.79 0.716929 8.77551
+48 2.85 0.687061 9.18367
+49 2.91 0.724924 9.63265
+50 2.97 1.07553 10.3265
+109450 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 0 0
+9 0.51 0 0
+10 0.57 0 0
+11 0.63 0 0
+12 0.69 0.585732 0.0204082
+13 0.75 1.48744 0.0816327
+14 0.81 1.70044 0.163265
+15 0.87 0.368519 0.183673
+16 0.93 0.322518 0.204082
+17 0.99 0.284622 0.22449
+18 1.05 0.253031 0.244898
+19 1.11 0.452845 0.285714
+20 1.17 1.019 0.387755
+21 1.23 0.553218 0.44898
+22 1.29 1.17358 0.591837
+23 1.35 1.83702 0.836735
+24 1.41 1.12268 1
+25 1.47 0.903804 1.14286
+26 1.53 0.953504 1.30612
+27 1.59 1.76582 1.63265
+28 1.65 0.717387 1.77551
+29 1.71 1.14503 2.02041
+30 1.77 1.15778 2.28571
+31 1.83 0.499898 2.40816
+32 1.89 1.01544 2.67347
+33 1.95 0.880539 2.91837
+34 2.01 0.828758 3.16327
+35 2.07 1.04189 3.4898
+36 2.13 1.10702 3.85714
+37 2.19 1.22173 4.28571
+38 2.25 0.992094 4.65306
+39 2.31 1.41184 5.20408
+40 2.37 0.943854 5.59184
+41 2.43 1.37036 6.18367
+42 2.49 1.26011 6.7551
+43 2.55 0.944046 7.20408
+44 2.61 0.737299 7.57143
+45 2.67 1.0568 8.12245
+46 2.73 1.2355 8.79592
+47 2.79 1.03955 9.38776
+48 2.85 1.20236 10.102
+49 2.91 1.02148 10.7347
+50 2.97 0.88573 11.3061
+109500 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 0 0
+9 0.51 0 0
+10 0.57 0.858066 0.0204082
+11 0.63 0.702525 0.0408163
+12 0.69 0 0.0408163
+13 0.75 0.495812 0.0612245
+14 0.81 1.70044 0.142857
+15 0.87 1.8426 0.244898
+16 0.93 0.645037 0.285714
+17 0.99 0.284622 0.306122
+18 1.05 1.77122 0.44898
+19 1.11 0.452845 0.489796
+20 1.17 0.4076 0.530612
+21 1.23 0.737623 0.612245
+22 1.29 1.50888 0.795918
+23 1.35 0.765424 0.897959
+24 1.41 0.280671 0.938776
+25 1.47 0.903804 1.08163
+26 1.53 0.834316 1.22449
+27 1.59 0.993271 1.40816
+28 1.65 1.22981 1.65306
+29 1.71 1.14503 1.89796
+30 1.77 1.24684 2.18367
+31 1.83 1.33306 2.5102
+32 1.89 0.702997 2.69388
+33 1.95 0.807161 2.91837
+34 2.01 0.828758 3.16327
+35 2.07 0.976768 3.46939
+36 2.13 0.615011 3.67347
+37 2.19 1.16355 4.08163
+38 2.25 0.992094 4.44898
+39 2.31 1.25497 4.93878
+40 2.37 1.14256 5.40816
+41 2.43 0.850568 5.77551
+42 2.49 1.30512 6.36735
+43 2.55 1.11569 6.89796
+44 2.61 1.22883 7.5102
+45 2.67 1.29165 8.18367
+46 2.73 1.01086 8.73469
+47 2.79 0.788621 9.18367
+48 2.85 0.893179 9.71429
+49 2.91 0.955581 10.3061
+50 2.97 1.01226 10.9592
+109550 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 0 0
+9 0.51 1.07159 0.0204082
+10 0.57 0 0.0204082
+11 0.63 0 0.0204082
+12 0.69 1.7572 0.0816327
+13 0.75 0 0.0816327
+14 0.81 1.70044 0.163265
+15 0.87 0.737039 0.204082
+16 0.93 1.61259 0.306122
+17 0.99 0.569243 0.346939
+18 1.05 0.759094 0.408163
+19 1.11 0.226422 0.428571
+20 1.17 1.2228 0.55102
+21 1.23 0.737623 0.632653
+22 1.29 1.17358 0.77551
+23 1.35 0.612339 0.857143
+24 1.41 0.561342 0.938776
+25 1.47 1.42026 1.16327
+26 1.53 0.834316 1.30612
+27 1.59 1.10363 1.5102
+28 1.65 0.819871 1.67347
+29 1.71 0.85877 1.85714
+30 1.77 0.62342 2
+31 1.83 0.749847 2.18367
+32 1.89 0.781108 2.38776
+33 1.95 1.10067 2.69388
+34 2.01 0.966885 2.97959
+35 2.07 1.04189 3.30612
+36 2.13 1.35303 3.7551
+37 2.19 0.814486 4.04082
+38 2.25 0.826745 4.34694
+39 2.31 1.20268 4.81633
+40 2.37 0.99353 5.22449
+41 2.43 1.08684 5.69388
+42 2.49 0.67506 6
+43 2.55 1.02987 6.4898
+44 2.61 0.983065 6.97959
+45 2.67 1.29165 7.65306
+46 2.73 0.935984 8.16327
+47 2.79 1.03955 8.7551
+48 2.85 1.03059 9.36735
+49 2.91 0.757875 9.83673
+50 2.97 0.98063 10.4694
+109600 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 1.37595 0.0204082
+9 0.51 1.07159 0.0408163
+10 0.57 1.71613 0.0816327
+11 0.63 0 0.0816327
+12 0.69 0 0.0816327
+13 0.75 0 0.0816327
+14 0.81 1.27533 0.142857
+15 0.87 0.737039 0.183673
+16 0.93 0.645037 0.22449
+17 0.99 1.42311 0.326531
+18 1.05 0.759094 0.387755
+19 1.11 1.13211 0.489796
+20 1.17 0.8152 0.571429
+21 1.23 1.29084 0.714286
+22 1.29 0.502961 0.77551
+23 1.35 0.459254 0.836735
+24 1.41 0.701677 0.938776
+25 1.47 0.645574 1.04082
+26 1.53 0.715128 1.16327
+27 1.59 1.43472 1.42857
+28 1.65 0.819871 1.59184
+29 1.71 1.14503 1.83673
+30 1.77 1.15778 2.10204
+31 1.83 0.66653 2.26531
+32 1.89 0.937329 2.5102
+33 1.95 0.953918 2.77551
+34 2.01 0.966885 3.06122
+35 2.07 0.846532 3.32653
+36 2.13 1.29152 3.7551
+37 2.19 0.814486 4.04082
+38 2.25 0.771629 4.32653
+39 2.31 0.888938 4.67347
+40 2.37 1.04321 5.10204
+41 2.43 1.37036 5.69388
+42 2.49 0.855076 6.08163
+43 2.55 1.11569 6.61224
+44 2.61 1.02403 7.12245
+45 2.67 1.21337 7.7551
+46 2.73 1.0483 8.32653
+47 2.79 1.03955 8.91837
+48 2.85 1.03059 9.53061
+49 2.91 1.12034 10.2245
+50 2.97 0.88573 10.7959
+109650 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 1.83099 0.0204082
+8 0.45 0 0.0204082
+9 0.51 1.07159 0.0408163
+10 0.57 0 0.0408163
+11 0.63 0 0.0408163
+12 0.69 1.17146 0.0816327
+13 0.75 0 0.0816327
+14 0.81 1.27533 0.142857
+15 0.87 1.10556 0.204082
+16 0.93 1.93511 0.326531
+17 0.99 0.853865 0.387755
+18 1.05 0.759094 0.44898
+19 1.11 0.679267 0.510204
+20 1.17 0.2038 0.530612
+21 1.23 0.737623 0.612245
+22 1.29 1.17358 0.755102
+23 1.35 1.07159 0.897959
+24 1.41 0.421006 0.959184
+25 1.47 0.774689 1.08163
+26 1.53 1.43026 1.32653
+27 1.59 1.214 1.55102
+28 1.65 1.43477 1.83673
+29 1.71 0.763351 2
+30 1.77 0.979661 2.22449
+31 1.83 1.08311 2.4898
+32 1.89 1.24977 2.81633
+33 1.95 1.46757 3.22449
+34 2.01 1.3122 3.61224
+35 2.07 0.586061 3.79592
+36 2.13 1.23002 4.20408
+37 2.19 0.698131 4.44898
+38 2.25 1.54326 5.02041
+39 2.31 1.0981 5.44898
+40 2.37 0.794824 5.77551
+41 2.43 1.08684 6.2449
+42 2.49 0.585052 6.5102
+43 2.55 0.72949 6.85714
+44 2.61 1.10595 7.40816
+45 2.67 1.25251 8.06122
+46 2.73 1.01086 8.61224
+47 2.79 0.932007 9.14286
+48 2.85 0.893179 9.67347
+49 2.91 0.955581 10.2653
+50 2.97 1.26533 11.0816
+109700 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 0 0
+9 0.51 0 0
+10 0.57 0 0
+11 0.63 0 0
+12 0.69 1.17146 0.0408163
+13 0.75 0.495812 0.0612245
+14 0.81 1.70044 0.142857
+15 0.87 3.31668 0.326531
+16 0.93 0.322518 0.346939
+17 0.99 0.853865 0.408163
+18 1.05 0.759094 0.469388
+19 1.11 0.679267 0.530612
+20 1.17 0.8152 0.612245
+21 1.23 0.184406 0.632653
+22 1.29 2.01185 0.877551
+23 1.35 1.07159 1.02041
+24 1.41 1.82436 1.28571
+25 1.47 0.774689 1.40816
+26 1.53 1.19188 1.61224
+27 1.59 1.32436 1.85714
+28 1.65 0.819871 2.02041
+29 1.71 1.24045 2.28571
+30 1.77 1.15778 2.55102
+31 1.83 1.24974 2.85714
+32 1.89 0.702997 3.04082
+33 1.95 1.32081 3.40816
+34 2.01 1.10501 3.73469
+35 2.07 0.846532 4
+36 2.13 1.16852 4.38776
+37 2.19 0.930841 4.71429
+38 2.25 1.04721 5.10204
+39 2.31 0.679776 5.36735
+40 2.37 1.29159 5.89796
+41 2.43 0.945075 6.30612
+42 2.49 0.990089 6.7551
+43 2.55 1.11569 7.28571
+44 2.61 0.983065 7.77551
+45 2.67 1.21337 8.40816
+46 2.73 0.823666 8.85714
+47 2.79 1.32632 9.61224
+48 2.85 1.23671 10.3469
+49 2.91 0.724924 10.7959
+50 2.97 0.790831 11.3061
+109750 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 1.37595 0.0204082
+9 0.51 0 0.0204082
+10 0.57 0 0.0204082
+11 0.63 0.702525 0.0408163
+12 0.69 1.17146 0.0816327
+13 0.75 1.98325 0.163265
+14 0.81 0.850222 0.204082
+15 0.87 1.8426 0.306122
+16 0.93 0.967555 0.367347
+17 0.99 1.13849 0.44898
+18 1.05 0.506063 0.489796
+19 1.11 1.58496 0.632653
+20 1.17 1.2228 0.755102
+21 1.23 1.29084 0.897959
+22 1.29 1.50888 1.08163
+23 1.35 1.22468 1.2449
+24 1.41 1.40335 1.44898
+25 1.47 1.03292 1.61224
+26 1.53 0.834316 1.7551
+27 1.59 0.882908 1.91837
+28 1.65 0.819871 2.08163
+29 1.71 0.954189 2.28571
+30 1.77 0.80154 2.46939
+31 1.83 0.583214 2.61224
+32 1.89 0.859219 2.83673
+33 1.95 0.953918 3.10204
+34 2.01 1.03595 3.40816
+35 2.07 0.91165 3.69388
+36 2.13 0.738014 3.93878
+37 2.19 0.989019 4.28571
+38 2.25 1.10233 4.69388
+39 2.31 1.56871 5.30612
+40 2.37 0.645795 5.57143
+41 2.43 1.13409 6.06122
+42 2.49 1.21511 6.61224
+43 2.55 0.858224 7.02041
+44 2.61 1.26979 7.65306
+45 2.67 1.0568 8.20408
+46 2.73 0.56159 8.5102
+47 2.79 1.32632 9.26531
+48 2.85 1.168 9.95918
+49 2.91 0.955581 10.551
+50 2.97 0.98063 11.1837
+109800 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 0 0
+9 0.51 2.14319 0.0408163
+10 0.57 0.858066 0.0612245
+11 0.63 0.702525 0.0816327
+12 0.69 0.585732 0.102041
+13 0.75 1.48744 0.163265
+14 0.81 0 0.163265
+15 0.87 1.8426 0.265306
+16 0.93 0 0.265306
+17 0.99 1.42311 0.367347
+18 1.05 0.253031 0.387755
+19 1.11 1.81138 0.55102
+20 1.17 0.6114 0.612245
+21 1.23 0.553218 0.673469
+22 1.29 0.838269 0.77551
+23 1.35 1.07159 0.918367
+24 1.41 0.982348 1.06122
+25 1.47 1.16203 1.2449
+26 1.53 1.19188 1.44898
+27 1.59 0.662181 1.57143
+28 1.65 0.717387 1.71429
+29 1.71 0.572513 1.83673
+30 1.77 0.62342 1.97959
+31 1.83 0.916479 2.20408
+32 1.89 0.859219 2.42857
+33 1.95 1.10067 2.73469
+34 2.01 0.690632 2.93878
+35 2.07 0.716296 3.16327
+36 2.13 1.72203 3.73469
+37 2.19 0.814486 4.02041
+38 2.25 0.936978 4.36735
+39 2.31 1.15039 4.81633
+40 2.37 0.645795 5.08163
+41 2.43 1.13409 5.57143
+42 2.49 1.26011 6.14286
+43 2.55 0.72949 6.4898
+44 2.61 0.983065 6.97959
+45 2.67 1.13508 7.57143
+46 2.73 1.0483 8.14286
+47 2.79 1.18293 8.81633
+48 2.85 1.20236 9.53061
+49 2.91 0.757875 10
+50 2.97 0.822464 10.5306
+109850 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 0 0
+9 0.51 1.07159 0.0204082
+10 0.57 1.71613 0.0612245
+11 0.63 0 0.0612245
+12 0.69 0 0.0612245
+13 0.75 1.98325 0.142857
+14 0.81 0.850222 0.183673
+15 0.87 1.10556 0.244898
+16 0.93 0.322518 0.265306
+17 0.99 0 0.265306
+18 1.05 0.506063 0.306122
+19 1.11 0.452845 0.346939
+20 1.17 1.2228 0.469388
+21 1.23 0.737623 0.55102
+22 1.29 0.670615 0.632653
+23 1.35 0.30617 0.673469
+24 1.41 1.12268 0.836735
+25 1.47 0.903804 0.979592
+26 1.53 0.953504 1.14286
+27 1.59 0.772544 1.28571
+28 1.65 0.717387 1.42857
+29 1.71 0.763351 1.59184
+30 1.77 1.42496 1.91837
+31 1.83 0.66653 2.08163
+32 1.89 0.702997 2.26531
+33 1.95 0.953918 2.53061
+34 2.01 1.10501 2.85714
+35 2.07 0.716296 3.08163
+36 2.13 0.55351 3.26531
+37 2.19 1.0472 3.63265
+38 2.25 0.992094 4
+39 2.31 0.941229 4.36735
+40 2.37 1.14256 4.83673
+41 2.43 0.992329 5.26531
+42 2.49 0.765068 5.61224
+43 2.55 1.07278 6.12245
+44 2.61 0.942104 6.59184
+45 2.67 0.782817 7
+46 2.73 1.16062 7.63265
+47 2.79 1.32632 8.38776
+48 2.85 1.168 9.08163
+49 2.91 1.21919 9.83673
+50 2.97 1.07553 10.5306
+109900 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 0 0
+9 0.51 0 0
+10 0.57 0 0
+11 0.63 0.702525 0.0204082
+12 0.69 0.585732 0.0408163
+13 0.75 0.991624 0.0816327
+14 0.81 1.27533 0.142857
+15 0.87 0.737039 0.183673
+16 0.93 0.645037 0.22449
+17 0.99 0.569243 0.265306
+18 1.05 0.506063 0.306122
+19 1.11 0.452845 0.346939
+20 1.17 0.4076 0.387755
+21 1.23 0.368812 0.428571
+22 1.29 0.838269 0.530612
+23 1.35 1.22468 0.693878
+24 1.41 0.561342 0.77551
+25 1.47 0.645574 0.877551
+26 1.53 0.834316 1.02041
+27 1.59 1.43472 1.28571
+28 1.65 0.717387 1.42857
+29 1.71 0.954189 1.63265
+30 1.77 0.71248 1.79592
+31 1.83 0.999796 2.04082
+32 1.89 0.781108 2.2449
+33 1.95 1.6877 2.71429
+34 2.01 1.17407 3.06122
+35 2.07 1.56283 3.55102
+36 2.13 0.799515 3.81633
+37 2.19 0.756309 4.08163
+38 2.25 0.936978 4.42857
+39 2.31 0.941229 4.79592
+40 2.37 1.14256 5.26531
+41 2.43 1.03958 5.71429
+42 2.49 1.0801 6.20408
+43 2.55 0.901135 6.63265
+44 2.61 0.819221 7.04082
+45 2.67 0.861099 7.4898
+46 2.73 0.823666 7.93878
+47 2.79 1.07539 8.55102
+48 2.85 1.58024 9.4898
+49 2.91 0.889679 10.0408
+50 2.97 1.2337 10.8367
+109950 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 1.37595 0.0204082
+9 0.51 0 0.0204082
+10 0.57 0 0.0204082
+11 0.63 0.702525 0.0408163
+12 0.69 0 0.0408163
+13 0.75 2.97487 0.163265
+14 0.81 0.425111 0.183673
+15 0.87 1.10556 0.244898
+16 0.93 0.322518 0.265306
+17 0.99 0.284622 0.285714
+18 1.05 0.253031 0.306122
+19 1.11 0.679267 0.367347
+20 1.17 0.6114 0.428571
+21 1.23 1.10644 0.55102
+22 1.29 1.00592 0.673469
+23 1.35 0.765424 0.77551
+24 1.41 0.701677 0.877551
+25 1.47 0.645574 0.979592
+26 1.53 0.357564 1.04082
+27 1.59 0.993271 1.22449
+28 1.65 0.819871 1.38776
+29 1.71 0.667932 1.53061
+30 1.77 0.62342 1.67347
+31 1.83 1.16643 1.95918
+32 1.89 1.24977 2.28571
+33 1.95 0.807161 2.5102
+34 2.01 1.03595 2.81633
+35 2.07 1.107 3.16327
+36 2.13 1.10702 3.53061
+37 2.19 0.814486 3.81633
+38 2.25 1.43302 4.34694
+39 2.31 1.25497 4.83673
+40 2.37 1.09288 5.28571
+41 2.43 1.41761 5.89796
+42 2.49 1.21511 6.44898
+43 2.55 0.901135 6.87755
+44 2.61 1.02403 7.38776
+45 2.67 0.821958 7.81633
+46 2.73 1.12318 8.42857
+47 2.79 1.43386 9.2449
+48 2.85 0.893179 9.77551
+49 2.91 0.889679 10.3265
+50 2.97 1.0439 11
+110000 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 0 0
+9 0.51 0 0
+10 0.57 0 0
+11 0.63 0 0
+12 0.69 1.17146 0.0408163
+13 0.75 0 0.0408163
+14 0.81 1.27533 0.102041
+15 0.87 1.47408 0.183673
+16 0.93 1.29007 0.265306
+17 0.99 1.13849 0.346939
+18 1.05 1.01213 0.428571
+19 1.11 0.226422 0.44898
+20 1.17 0.8152 0.530612
+21 1.23 0.922029 0.632653
+22 1.29 0.167654 0.653061
+23 1.35 0.30617 0.693878
+24 1.41 0.982348 0.836735
+25 1.47 0.774689 0.959184
+26 1.53 0.59594 1.06122
+27 1.59 1.65545 1.36735
+28 1.65 1.12732 1.59184
+29 1.71 1.43128 1.89796
+30 1.77 1.15778 2.16327
+31 1.83 0.583214 2.30612
+32 1.89 1.01544 2.57143
+33 1.95 1.32081 2.93878
+34 2.01 0.759695 3.16327
+35 2.07 1.17212 3.53061
+36 2.13 0.738014 3.77551
+37 2.19 1.22173 4.20408
+38 2.25 0.936978 4.55102
+39 2.31 0.836648 4.87755
+40 2.37 1.39094 5.44898
+41 2.43 0.708807 5.7551
+42 2.49 0.945085 6.18367
+43 2.55 0.986958 6.65306
+44 2.61 1.18787 7.2449
+45 2.67 0.90024 7.71429
+46 2.73 0.935984 8.22449
+47 2.79 1.03955 8.81633
+48 2.85 0.927532 9.36735
+49 2.91 0.856728 9.89796
+50 2.97 1.01226 10.551
diff --git a/examples/USER/misc/slater/tmp_2_3.rdf b/examples/USER/misc/slater/tmp_2_3.rdf
new file mode 100644
index 0000000000..07a003415c
--- /dev/null
+++ b/examples/USER/misc/slater/tmp_2_3.rdf
@@ -0,0 +1,10254 @@
+# Time-averaged data for fix 15
+# TimeStep Number-of-rows
+# Row c_RDF_2_3[1] c_RDF_2_3[2] c_RDF_2_3[3]
+100000 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 0.680956 0.0102041
+9 0.51 0.530329 0.0204082
+10 0.57 1.69862 0.0612245
+11 0.63 1.04303 0.0918367
+12 0.69 2.02914 0.163265
+13 0.75 1.22688 0.214286
+14 0.81 1.89348 0.306122
+15 0.87 2.18855 0.428571
+16 0.93 1.59614 0.530612
+17 0.99 1.40859 0.632653
+18 1.05 0.876573 0.704082
+19 1.11 0.896448 0.785714
+20 1.17 1.21032 0.908163
+21 1.23 0.821359 1
+22 1.29 1.24457 1.15306
+23 1.35 0.909136 1.27551
+24 1.41 1.04178 1.42857
+25 1.47 1.15018 1.61224
+26 1.53 1.29769 1.83673
+27 1.59 1.03775 2.03061
+28 1.65 0.912943 2.21429
+29 1.71 1.18057 2.46939
+30 1.77 1.01374 2.70408
+31 1.83 1.27823 3.02041
+32 1.89 1.00508 3.28571
+33 1.95 0.581036 3.44898
+34 2.01 0.854481 3.70408
+35 2.07 0.999027 4.02041
+36 2.13 0.85223 4.30612
+37 2.19 0.806175 4.59184
+38 2.25 0.845586 4.90816
+39 2.31 1.0869 5.33673
+40 2.37 0.934223 5.72449
+41 2.43 0.935432 6.13265
+42 2.49 1.11362 6.64286
+43 2.55 1.12554 7.18367
+44 2.61 0.831133 7.60204
+45 2.67 0.774829 8.0102
+46 2.73 1.09319 8.61224
+47 2.79 0.957978 9.16327
+48 2.85 1.07108 9.80612
+49 2.91 1.1089 10.5
+50 2.97 0.923658 11.102
+100050 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 1.36191 0.0204082
+9 0.51 0 0.0204082
+10 0.57 1.69862 0.0612245
+11 0.63 1.39071 0.102041
+12 0.69 0.869633 0.132653
+13 0.75 1.22688 0.183673
+14 0.81 1.68309 0.265306
+15 0.87 1.8238 0.367347
+16 0.93 1.1173 0.438776
+17 0.99 1.97202 0.581633
+18 1.05 1.75315 0.72449
+19 1.11 0.336168 0.755102
+20 1.17 1.81548 0.938776
+21 1.23 1.46019 1.10204
+22 1.29 1.1616 1.2449
+23 1.35 0.984898 1.37755
+24 1.41 1.25013 1.56122
+25 1.47 1.40577 1.78571
+26 1.53 0.825803 1.92857
+27 1.59 1.14699 2.14286
+28 1.65 1.01438 2.34694
+29 1.71 0.850007 2.53061
+30 1.77 0.793362 2.71429
+31 1.83 1.11329 2.9898
+32 1.89 0.579853 3.14286
+33 1.95 1.01681 3.42857
+34 2.01 1.02538 3.73469
+35 2.07 0.67676 3.94898
+36 2.13 1.1566 4.33673
+37 2.19 1.00772 4.69388
+38 2.25 1.25474 5.16327
+39 2.31 1.24217 5.65306
+40 2.37 1.00798 6.07143
+41 2.43 1.16929 6.58163
+42 2.49 1.18044 7.12245
+43 2.55 0.870703 7.54082
+44 2.61 0.993305 8.04082
+45 2.67 0.968536 8.55102
+46 2.73 1.14878 9.18367
+47 2.79 0.851536 9.67347
+48 2.85 0.884065 10.2041
+49 2.91 0.913216 10.7755
+50 2.97 1.06455 11.4694
+100100 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 1.88658 0.0102041
+6 0.33 0 0.0102041
+7 0.39 0 0.0102041
+8 0.45 0.680956 0.0204082
+9 0.51 0.530329 0.0306122
+10 0.57 0 0.0306122
+11 0.63 0 0.0306122
+12 0.69 0.869633 0.0612245
+13 0.75 2.20839 0.153061
+14 0.81 1.89348 0.244898
+15 0.87 1.27666 0.316327
+16 0.93 0.798069 0.367347
+17 0.99 2.3946 0.540816
+18 1.05 0.876573 0.612245
+19 1.11 1.0085 0.704082
+20 1.17 0.806882 0.785714
+21 1.23 1.09515 0.908163
+22 1.29 0.746744 1
+23 1.35 1.3637 1.18367
+24 1.41 1.31958 1.37755
+25 1.47 0.95848 1.53061
+26 1.53 1.06175 1.71429
+27 1.59 0.928517 1.88776
+28 1.65 1.0651 2.10204
+29 1.71 1.32223 2.38776
+30 1.77 0.925588 2.60204
+31 1.83 0.907127 2.82653
+32 1.89 0.927765 3.07143
+33 1.95 1.41628 3.46939
+34 2.01 1.19627 3.82653
+35 2.07 1.28907 4.23469
+36 2.13 0.973977 4.56122
+37 2.19 0.978927 4.90816
+38 2.25 1.09108 5.31633
+39 2.31 1.11277 5.7551
+40 2.37 0.983392 6.16327
+41 2.43 1.28622 6.72449
+42 2.49 1.02453 7.19388
+43 2.55 0.95565 7.65306
+44 2.61 1.23656 8.27551
+45 2.67 0.949166 8.77551
+46 2.73 1.05613 9.35714
+47 2.79 0.993458 9.92857
+48 2.85 1.13908 10.6122
+49 2.91 0.994753 11.2347
+50 2.97 0.986279 11.8776
+100150 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 1.81231 0.0204082
+8 0.45 0.680956 0.0306122
+9 0.51 0.530329 0.0408163
+10 0.57 1.69862 0.0816327
+11 0.63 2.08607 0.142857
+12 0.69 1.15951 0.183673
+13 0.75 1.71763 0.255102
+14 0.81 1.89348 0.346939
+15 0.87 2.37093 0.479592
+16 0.93 1.1173 0.55102
+17 0.99 1.6903 0.673469
+18 1.05 2.37927 0.867347
+19 1.11 1.56878 1.0102
+20 1.17 1.21032 1.13265
+21 1.23 0.912621 1.23469
+22 1.29 0.912687 1.34694
+23 1.35 0.833375 1.45918
+24 1.41 1.04178 1.61224
+25 1.47 1.15018 1.79592
+26 1.53 1.00276 1.96939
+27 1.59 1.14699 2.18367
+28 1.65 0.963662 2.37755
+29 1.71 1.18057 2.63265
+30 1.77 1.19004 2.90816
+31 1.83 1.15453 3.19388
+32 1.89 0.773137 3.39796
+33 1.95 0.83524 3.63265
+34 2.01 0.683585 3.83673
+35 2.07 1.41797 4.28571
+36 2.13 0.913104 4.59184
+37 2.19 0.921343 4.91837
+38 2.25 1.20019 5.36735
+39 2.31 0.905746 5.72449
+40 2.37 1.03256 6.15306
+41 2.43 1.05236 6.61224
+42 2.49 0.979986 7.06122
+43 2.55 0.998123 7.54082
+44 2.61 1.21629 8.15306
+45 2.67 1.04602 8.70408
+46 2.73 0.982019 9.2449
+47 2.79 1.08216 9.86735
+48 2.85 1.12208 10.5408
+49 2.91 0.799064 11.0408
+50 2.97 1.17414 11.8061
+100200 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 2.04287 0.0306122
+9 0.51 2.12132 0.0714286
+10 0.57 2.54793 0.132653
+11 0.63 2.43375 0.204082
+12 0.69 1.15951 0.244898
+13 0.75 0.736129 0.27551
+14 0.81 1.89348 0.367347
+15 0.87 1.09428 0.428571
+16 0.93 0.798069 0.479592
+17 0.99 1.54944 0.591837
+18 1.05 1.87837 0.744898
+19 1.11 1.23262 0.857143
+20 1.17 1.61376 1.02041
+21 1.23 0.821359 1.11224
+22 1.29 0.829715 1.21429
+23 1.35 1.51523 1.41837
+24 1.41 1.52794 1.64286
+25 1.47 1.02238 1.80612
+26 1.53 1.53363 2.07143
+27 1.59 0.546186 2.17347
+28 1.65 0.963662 2.36735
+29 1.71 1.70001 2.73469
+30 1.77 1.14597 3
+31 1.83 0.742195 3.18367
+32 1.89 1.19836 3.5
+33 1.95 0.944184 3.76531
+34 2.01 1.16209 4.11224
+35 2.07 1.16016 4.47959
+36 2.13 0.882667 4.77551
+37 2.19 0.777383 5.05102
+38 2.25 1.00925 5.42857
+39 2.31 0.853989 5.76531
+40 2.37 1.00798 6.18367
+41 2.43 0.72496 6.5
+42 2.49 1.02453 6.96939
+43 2.55 1.14678 7.52041
+44 2.61 0.871676 7.95918
+45 2.67 0.891053 8.42857
+46 2.73 0.778204 8.85714
+47 2.79 1.02894 9.44898
+48 2.85 1.13908 10.1327
+49 2.91 1.17413 10.8673
+50 2.97 1.00193 11.5204
+100250 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0.906153 0.0102041
+8 0.45 0.680956 0.0204082
+9 0.51 1.59099 0.0510204
+10 0.57 0.424655 0.0612245
+11 0.63 1.04303 0.0918367
+12 0.69 2.02914 0.163265
+13 0.75 1.71763 0.234694
+14 0.81 2.31425 0.346939
+15 0.87 2.18855 0.469388
+16 0.93 2.07498 0.602041
+17 0.99 0.98601 0.673469
+18 1.05 0.876573 0.744898
+19 1.11 0.896448 0.826531
+20 1.17 0.806882 0.908163
+21 1.23 0.912621 1.0102
+22 1.29 1.24457 1.16327
+23 1.35 1.06066 1.30612
+24 1.41 0.902872 1.43878
+25 1.47 1.02238 1.60204
+26 1.53 1.17972 1.80612
+27 1.59 0.81928 1.95918
+28 1.65 1.47085 2.2551
+29 1.71 1.36946 2.55102
+30 1.77 1.14597 2.81633
+31 1.83 0.989594 3.06122
+32 1.89 0.966422 3.31633
+33 1.95 1.37996 3.70408
+34 2.01 0.88866 3.96939
+35 2.07 0.934574 4.26531
+36 2.13 0.94354 4.58163
+37 2.19 0.806175 4.86735
+38 2.25 0.954694 5.22449
+39 2.31 1.0869 5.65306
+40 2.37 1.35216 6.21429
+41 2.43 0.958818 6.63265
+42 2.49 1.11362 7.14286
+43 2.55 0.806993 7.53061
+44 2.61 0.810861 7.93878
+45 2.67 1.04602 8.4898
+46 2.73 0.907904 8.9898
+47 2.79 0.940237 9.53061
+48 2.85 0.935069 10.0918
+49 2.91 1.05998 10.7551
+50 2.97 1.08021 11.4592
+100300 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 0.680956 0.0102041
+9 0.51 1.06066 0.0306122
+10 0.57 1.27396 0.0612245
+11 0.63 2.43375 0.132653
+12 0.69 1.44939 0.183673
+13 0.75 0.981505 0.22449
+14 0.81 1.89348 0.316327
+15 0.87 1.8238 0.418367
+16 0.93 1.1173 0.489796
+17 0.99 1.54944 0.602041
+18 1.05 1.12702 0.693878
+19 1.11 0.672336 0.755102
+20 1.17 1.10946 0.867347
+21 1.23 1.00388 0.979592
+22 1.29 1.57646 1.17347
+23 1.35 0.909136 1.29592
+24 1.41 1.31958 1.4898
+25 1.47 1.15018 1.67347
+26 1.53 0.943774 1.83673
+27 1.59 1.42008 2.10204
+28 1.65 1.0651 2.31633
+29 1.71 0.566671 2.43878
+30 1.77 1.14597 2.70408
+31 1.83 1.19576 3
+32 1.89 1.23702 3.32653
+33 1.95 1.16207 3.65306
+34 2.01 1.36717 4.06122
+35 2.07 0.934574 4.35714
+36 2.13 0.94354 4.67347
+37 2.19 0.950135 5.0102
+38 2.25 0.927417 5.35714
+39 2.31 1.00926 5.7551
+40 2.37 1.10632 6.21429
+41 2.43 0.982203 6.64286
+42 2.49 1.00226 7.10204
+43 2.55 0.998123 7.58163
+44 2.61 1.05412 8.11224
+45 2.67 0.949166 8.61224
+46 2.73 1.05613 9.19388
+47 2.79 0.993458 9.76531
+48 2.85 0.969072 10.3469
+49 2.91 0.962138 10.949
+50 2.97 0.892347 11.5306
+100350 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 0.680956 0.0102041
+9 0.51 1.06066 0.0306122
+10 0.57 0 0.0306122
+11 0.63 1.39071 0.0714286
+12 0.69 1.44939 0.122449
+13 0.75 2.20839 0.214286
+14 0.81 1.26232 0.27551
+15 0.87 1.27666 0.346939
+16 0.93 1.43652 0.438776
+17 0.99 1.26773 0.530612
+18 1.05 1.37747 0.642857
+19 1.11 0.56028 0.693878
+20 1.17 0.806882 0.77551
+21 1.23 1.46019 0.938776
+22 1.29 0.912687 1.05102
+23 1.35 0.757614 1.15306
+24 1.41 0.972324 1.29592
+25 1.47 0.95848 1.44898
+26 1.53 1.2387 1.66327
+27 1.59 1.25623 1.89796
+28 1.65 1.01438 2.10204
+29 1.71 1.13334 2.34694
+30 1.77 1.19004 2.62245
+31 1.83 0.907127 2.84694
+32 1.89 1.00508 3.11224
+33 1.95 0.798925 3.33673
+34 2.01 0.957019 3.62245
+35 2.07 0.870121 3.89796
+36 2.13 1.06529 4.2551
+37 2.19 0.921343 4.58163
+38 2.25 0.872863 4.90816
+39 2.31 0.905746 5.26531
+40 2.37 0.909638 5.64286
+41 2.43 1.23945 6.18367
+42 2.49 1.00226 6.64286
+43 2.55 0.934413 7.09184
+44 2.61 0.912219 7.55102
+45 2.67 1.04602 8.10204
+46 2.73 0.944962 8.62245
+47 2.79 0.975718 9.18367
+48 2.85 1.19009 9.89796
+49 2.91 0.994753 10.5204
+50 2.97 0.954968 11.1429
+100400 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 1.26463 0.0102041
+7 0.39 1.81231 0.0306122
+8 0.45 0.680956 0.0408163
+9 0.51 0 0.0408163
+10 0.57 0.84931 0.0612245
+11 0.63 0.347678 0.0714286
+12 0.69 0.869633 0.102041
+13 0.75 1.96301 0.183673
+14 0.81 1.26232 0.244898
+15 0.87 1.8238 0.346939
+16 0.93 1.59614 0.44898
+17 0.99 0.845152 0.510204
+18 1.05 0.876573 0.581633
+19 1.11 0.56028 0.632653
+20 1.17 0.806882 0.714286
+21 1.23 1.18641 0.846939
+22 1.29 0.746744 0.938776
+23 1.35 1.06066 1.08163
+24 1.41 1.11123 1.2449
+25 1.47 1.15018 1.42857
+26 1.53 1.29769 1.65306
+27 1.59 0.983136 1.83673
+28 1.65 1.21726 2.08163
+29 1.71 0.89723 2.27551
+30 1.77 0.837437 2.46939
+31 1.83 1.03083 2.72449
+32 1.89 1.54627 3.13265
+33 1.95 0.980499 3.40816
+34 2.01 0.957019 3.69388
+35 2.07 0.870121 3.96939
+36 2.13 1.09572 4.33673
+37 2.19 1.32443 4.80612
+38 2.25 1.0638 5.20408
+39 2.31 0.750475 5.5
+40 2.37 1.08173 5.94898
+41 2.43 1.07575 6.41837
+42 2.49 0.979986 6.86735
+43 2.55 1.08307 7.38776
+44 2.61 1.03385 7.90816
+45 2.67 0.968536 8.41837
+46 2.73 0.870847 8.89796
+47 2.79 0.957978 9.44898
+48 2.85 0.850063 9.95918
+49 2.91 1.07629 10.6327
+50 2.97 0.986279 11.2755
+100450 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 0.680956 0.0102041
+9 0.51 0.530329 0.0204082
+10 0.57 0.424655 0.0306122
+11 0.63 0.347678 0.0408163
+12 0.69 0.869633 0.0714286
+13 0.75 0.981505 0.112245
+14 0.81 1.05193 0.163265
+15 0.87 1.09428 0.22449
+16 0.93 0.957682 0.285714
+17 0.99 1.12687 0.367347
+18 1.05 0.751348 0.428571
+19 1.11 1.0085 0.520408
+20 1.17 0.806882 0.602041
+21 1.23 1.00388 0.714286
+22 1.29 1.41052 0.887755
+23 1.35 0.833375 1
+24 1.41 1.18068 1.17347
+25 1.47 1.15018 1.35714
+26 1.53 1.29769 1.58163
+27 1.59 0.983136 1.76531
+28 1.65 0.963662 1.95918
+29 1.71 0.850007 2.14286
+30 1.77 0.969664 2.36735
+31 1.83 1.36069 2.70408
+32 1.89 0.773137 2.90816
+33 1.95 0.689981 3.10204
+34 2.01 1.02538 3.40816
+35 2.07 0.77344 3.65306
+36 2.13 1.00441 3.9898
+37 2.19 1.32443 4.45918
+38 2.25 1.25474 4.92857
+39 2.31 1.03514 5.33673
+40 2.37 1.22924 5.84694
+41 2.43 0.88866 6.23469
+42 2.49 1.02453 6.70408
+43 2.55 1.2742 7.31633
+44 2.61 1.05412 7.84694
+45 2.67 1.33658 8.55102
+46 2.73 1.14878 9.18367
+47 2.79 0.904757 9.70408
+48 2.85 0.918068 10.2551
+49 2.91 1.1089 10.949
+50 2.97 1.1898 11.7245
+100500 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 0.680956 0.0102041
+9 0.51 0.530329 0.0204082
+10 0.57 0.424655 0.0306122
+11 0.63 1.39071 0.0714286
+12 0.69 0.579756 0.0918367
+13 0.75 0.736129 0.122449
+14 0.81 1.47271 0.193878
+15 0.87 1.09428 0.255102
+16 0.93 1.43652 0.346939
+17 0.99 1.40859 0.44898
+18 1.05 0.751348 0.510204
+19 1.11 1.0085 0.602041
+20 1.17 0.403441 0.642857
+21 1.23 1.73398 0.836735
+22 1.29 1.32754 1
+23 1.35 1.51523 1.20408
+24 1.41 0.833421 1.32653
+25 1.47 1.02238 1.4898
+26 1.53 0.825803 1.63265
+27 1.59 1.03775 1.82653
+28 1.65 1.11582 2.05102
+29 1.71 0.991675 2.26531
+30 1.77 1.32227 2.57143
+31 1.83 1.11329 2.84694
+32 1.89 1.31433 3.19388
+33 1.95 0.907869 3.44898
+34 2.01 1.23045 3.81633
+35 2.07 0.870121 4.09184
+36 2.13 1.27835 4.52041
+37 2.19 1.32443 4.9898
+38 2.25 0.927417 5.33673
+39 2.31 0.957503 5.71429
+40 2.37 0.811299 6.05102
+41 2.43 0.935432 6.45918
+42 2.49 1.02453 6.92857
+43 2.55 0.934413 7.37755
+44 2.61 0.912219 7.83673
+45 2.67 1.08476 8.40816
+46 2.73 0.870847 8.88776
+47 2.79 1.02894 9.47959
+48 2.85 1.12208 10.1531
+49 2.91 1.01106 10.7857
+50 2.97 1.08021 11.4898
+100550 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0.906153 0.0102041
+8 0.45 0 0.0102041
+9 0.51 0 0.0102041
+10 0.57 0.424655 0.0204082
+11 0.63 0.347678 0.0306122
+12 0.69 1.73927 0.0918367
+13 0.75 0.736129 0.122449
+14 0.81 2.31425 0.234694
+15 0.87 1.64142 0.326531
+16 0.93 1.1173 0.397959
+17 0.99 1.12687 0.479592
+18 1.05 0.626123 0.530612
+19 1.11 0.896448 0.612245
+20 1.17 1.21032 0.734694
+21 1.23 1.09515 0.857143
+22 1.29 1.49349 1.04082
+23 1.35 1.13642 1.19388
+24 1.41 0.763969 1.30612
+25 1.47 1.15018 1.4898
+26 1.53 1.17972 1.69388
+27 1.59 0.928517 1.86735
+28 1.65 1.36941 2.14286
+29 1.71 0.89723 2.33673
+30 1.77 1.41042 2.66327
+31 1.83 0.989594 2.90816
+32 1.89 1.04374 3.18367
+33 1.95 1.2347 3.53061
+34 2.01 0.922839 3.80612
+35 2.07 0.966801 4.11224
+36 2.13 1.09572 4.47959
+37 2.19 1.09409 4.86735
+38 2.25 0.681924 5.12245
+39 2.31 0.698718 5.39796
+40 2.37 1.08173 5.84694
+41 2.43 1.16929 6.35714
+42 2.49 1.15816 6.88776
+43 2.55 0.743283 7.2449
+44 2.61 0.770318 7.63265
+45 2.67 1.35595 8.34694
+46 2.73 1.40818 9.12245
+47 2.79 0.922497 9.65306
+48 2.85 1.15609 10.3469
+49 2.91 1.0926 11.0306
+50 2.97 0.829726 11.5714
+100600 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 0.680956 0.0102041
+9 0.51 1.59099 0.0408163
+10 0.57 0.424655 0.0510204
+11 0.63 1.04303 0.0816327
+12 0.69 0.579756 0.102041
+13 0.75 0.736129 0.132653
+14 0.81 1.68309 0.214286
+15 0.87 1.27666 0.285714
+16 0.93 1.1173 0.357143
+17 0.99 1.26773 0.44898
+18 1.05 2.0036 0.612245
+19 1.11 1.34467 0.734694
+20 1.17 1.91634 0.928571
+21 1.23 1.18641 1.06122
+22 1.29 0.829715 1.16327
+23 1.35 0.833375 1.27551
+24 1.41 1.45849 1.4898
+25 1.47 1.34187 1.70408
+26 1.53 1.35668 1.93878
+27 1.59 1.03775 2.13265
+28 1.65 1.21726 2.37755
+29 1.71 1.0389 2.60204
+30 1.77 1.01374 2.83673
+31 1.83 0.783428 3.03061
+32 1.89 1.15971 3.33673
+33 1.95 1.05313 3.63265
+34 2.01 0.88866 3.89796
+35 2.07 1.22461 4.28571
+36 2.13 0.973977 4.61224
+37 2.19 0.806175 4.89796
+38 2.25 1.09108 5.30612
+39 2.31 0.931624 5.67347
+40 2.37 1.10632 6.13265
+41 2.43 1.26283 6.68367
+42 2.49 0.957713 7.12245
+43 2.55 0.95565 7.58163
+44 2.61 0.932491 8.05102
+45 2.67 0.987907 8.57143
+46 2.73 1.16731 9.21429
+47 2.79 0.887016 9.72449
+48 2.85 0.884065 10.2551
+49 2.91 0.815371 10.7653
+50 2.97 0.845382 11.3163
+100650 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 0.680956 0.0102041
+9 0.51 1.59099 0.0408163
+10 0.57 1.27396 0.0714286
+11 0.63 1.39071 0.112245
+12 0.69 1.44939 0.163265
+13 0.75 1.47226 0.22449
+14 0.81 0.63116 0.255102
+15 0.87 2.55331 0.397959
+16 0.93 1.27691 0.479592
+17 0.99 1.40859 0.581633
+18 1.05 1.25225 0.683673
+19 1.11 1.23262 0.795918
+20 1.17 1.5129 0.94898
+21 1.23 1.00388 1.06122
+22 1.29 1.41052 1.23469
+23 1.35 1.66675 1.45918
+24 1.41 1.04178 1.61224
+25 1.47 1.02238 1.77551
+26 1.53 1.17972 1.97959
+27 1.59 0.655424 2.10204
+28 1.65 1.16654 2.33673
+29 1.71 1.32223 2.62245
+30 1.77 0.969664 2.84694
+31 1.83 0.989594 3.09184
+32 1.89 1.04374 3.36735
+33 1.95 0.980499 3.64286
+34 2.01 0.88866 3.90816
+35 2.07 1.28907 4.31633
+36 2.13 1.00441 4.65306
+37 2.19 1.18047 5.07143
+38 2.25 1.14563 5.5
+39 2.31 1.26804 6
+40 2.37 0.860468 6.35714
+41 2.43 0.912046 6.7551
+42 2.49 0.935441 7.18367
+43 2.55 1.16802 7.7449
+44 2.61 0.932491 8.21429
+45 2.67 0.987907 8.73469
+46 2.73 1.20436 9.39796
+47 2.79 0.940237 9.93878
+48 2.85 1.07108 10.5816
+49 2.91 1.07629 11.2551
+50 2.97 0.892347 11.8367
+100700 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 1.88658 0.0102041
+6 0.33 1.26463 0.0204082
+7 0.39 0 0.0204082
+8 0.45 0.680956 0.0306122
+9 0.51 0 0.0306122
+10 0.57 1.27396 0.0612245
+11 0.63 1.04303 0.0918367
+12 0.69 2.02914 0.163265
+13 0.75 1.22688 0.214286
+14 0.81 1.26232 0.27551
+15 0.87 1.45904 0.357143
+16 0.93 1.1173 0.428571
+17 0.99 1.12687 0.510204
+18 1.05 1.12702 0.602041
+19 1.11 1.45673 0.734694
+20 1.17 1.0086 0.836735
+21 1.23 1.09515 0.959184
+22 1.29 0.829715 1.06122
+23 1.35 1.28794 1.23469
+24 1.41 1.94465 1.52041
+25 1.47 0.894581 1.66327
+26 1.53 1.12073 1.85714
+27 1.59 0.928517 2.03061
+28 1.65 1.21726 2.27551
+29 1.71 1.27501 2.55102
+30 1.77 0.528908 2.67347
+31 1.83 1.19576 2.96939
+32 1.89 0.850451 3.19388
+33 1.95 1.08944 3.5
+34 2.01 0.957019 3.78571
+35 2.07 0.966801 4.09184
+36 2.13 1.12616 4.46939
+37 2.19 1.03651 4.83673
+38 2.25 1.00925 5.21429
+39 2.31 1.06102 5.63265
+40 2.37 0.958808 6.03061
+41 2.43 1.12252 6.52041
+42 2.49 1.13589 7.04082
+43 2.55 1.08307 7.56122
+44 2.61 1.05412 8.09184
+45 2.67 1.04602 8.64286
+46 2.73 0.83379 9.10204
+47 2.79 1.08216 9.72449
+48 2.85 0.969072 10.3061
+49 2.91 1.02737 10.949
+50 2.97 1.01759 11.6122
+100750 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 1.26463 0.0102041
+7 0.39 0 0.0102041
+8 0.45 0 0.0102041
+9 0.51 1.06066 0.0306122
+10 0.57 1.27396 0.0612245
+11 0.63 0.695356 0.0816327
+12 0.69 2.31902 0.163265
+13 0.75 1.71763 0.234694
+14 0.81 1.26232 0.295918
+15 0.87 1.8238 0.397959
+16 0.93 1.1173 0.469388
+17 0.99 1.97202 0.612245
+18 1.05 1.37747 0.72449
+19 1.11 1.34467 0.846939
+20 1.17 1.41204 0.989796
+21 1.23 1.55146 1.16327
+22 1.29 1.41052 1.33673
+23 1.35 0.757614 1.43878
+24 1.41 1.04178 1.59184
+25 1.47 0.95848 1.7449
+26 1.53 0.825803 1.88776
+27 1.59 0.928517 2.06122
+28 1.65 0.963662 2.2551
+29 1.71 0.850007 2.43878
+30 1.77 1.23412 2.72449
+31 1.83 1.19576 3.02041
+32 1.89 1.04374 3.29592
+33 1.95 0.798925 3.52041
+34 2.01 0.820302 3.76531
+35 2.07 1.19239 4.14286
+36 2.13 1.27835 4.57143
+37 2.19 0.978927 4.91837
+38 2.25 0.709201 5.18367
+39 2.31 1.03514 5.59184
+40 2.37 0.934223 5.97959
+41 2.43 1.26283 6.53061
+42 2.49 0.957713 6.96939
+43 2.55 0.913177 7.40816
+44 2.61 0.891947 7.85714
+45 2.67 0.968536 8.36735
+46 2.73 0.852318 8.83673
+47 2.79 1.02894 9.42857
+48 2.85 0.884065 9.95918
+49 2.91 0.929523 10.5408
+50 2.97 1.14283 11.2857
+100800 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0.906153 0.0102041
+8 0.45 0 0.0102041
+9 0.51 1.06066 0.0306122
+10 0.57 1.27396 0.0612245
+11 0.63 0.347678 0.0714286
+12 0.69 1.15951 0.112245
+13 0.75 1.22688 0.163265
+14 0.81 1.89348 0.255102
+15 0.87 1.8238 0.357143
+16 0.93 1.27691 0.438776
+17 0.99 0.98601 0.510204
+18 1.05 1.0018 0.591837
+19 1.11 2.01701 0.77551
+20 1.17 1.31118 0.908163
+21 1.23 1.27767 1.05102
+22 1.29 0.995658 1.17347
+23 1.35 0.909136 1.29592
+24 1.41 1.04178 1.44898
+25 1.47 1.34187 1.66327
+26 1.53 0.825803 1.80612
+27 1.59 1.36547 2.06122
+28 1.65 0.710067 2.20408
+29 1.71 0.991675 2.41837
+30 1.77 1.05782 2.66327
+31 1.83 0.659729 2.82653
+32 1.89 0.811794 3.04082
+33 1.95 1.37996 3.42857
+34 2.01 0.991198 3.72449
+35 2.07 0.870121 4
+36 2.13 1.21747 4.40816
+37 2.19 1.03651 4.77551
+38 2.25 1.0638 5.17347
+39 2.31 0.879867 5.52041
+40 2.37 1.00798 5.93878
+41 2.43 0.982203 6.36735
+42 2.49 0.757262 6.71429
+43 2.55 1.06183 7.22449
+44 2.61 1.09466 7.77551
+45 2.67 0.968536 8.28571
+46 2.73 0.926433 8.79592
+47 2.79 1.1886 9.47959
+48 2.85 0.867064 10
+49 2.91 0.847986 10.5306
+50 2.97 0.923658 11.1327
+100850 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0.906153 0.0102041
+8 0.45 2.04287 0.0408163
+9 0.51 0 0.0408163
+10 0.57 2.12327 0.0918367
+11 0.63 1.39071 0.132653
+12 0.69 0.869633 0.163265
+13 0.75 1.22688 0.214286
+14 0.81 1.89348 0.306122
+15 0.87 1.64142 0.397959
+16 0.93 0.798069 0.44898
+17 0.99 1.83116 0.581633
+18 1.05 1.12702 0.673469
+19 1.11 1.45673 0.806122
+20 1.17 1.41204 0.94898
+21 1.23 1.27767 1.09184
+22 1.29 0.995658 1.21429
+23 1.35 1.06066 1.35714
+24 1.41 1.04178 1.5102
+25 1.47 1.02238 1.67347
+26 1.53 1.12073 1.86735
+27 1.59 0.928517 2.04082
+28 1.65 0.912943 2.22449
+29 1.71 0.944452 2.42857
+30 1.77 1.27819 2.72449
+31 1.83 1.23699 3.03061
+32 1.89 1.04374 3.30612
+33 1.95 0.907869 3.56122
+34 2.01 1.40135 3.97959
+35 2.07 1.41797 4.42857
+36 2.13 1.00441 4.76531
+37 2.19 1.00772 5.12245
+38 2.25 1.14563 5.55102
+39 2.31 1.0869 5.97959
+40 2.37 1.1309 6.44898
+41 2.43 1.02897 6.89796
+42 2.49 0.957713 7.33673
+43 2.55 0.70081 7.67347
+44 2.61 0.952762 8.15306
+45 2.67 1.00728 8.68367
+46 2.73 0.907904 9.18367
+47 2.79 0.638652 9.55102
+48 2.85 0.799059 10.0306
+49 2.91 0.994753 10.6531
+50 2.97 0.829726 11.1939
+100900 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 0.680956 0.0102041
+9 0.51 1.06066 0.0306122
+10 0.57 1.69862 0.0714286
+11 0.63 2.43375 0.142857
+12 0.69 1.15951 0.183673
+13 0.75 0.736129 0.214286
+14 0.81 2.31425 0.326531
+15 0.87 1.09428 0.387755
+16 0.93 1.43652 0.479592
+17 0.99 2.53546 0.663265
+18 1.05 1.37747 0.77551
+19 1.11 1.34467 0.897959
+20 1.17 0.706021 0.969388
+21 1.23 1.27767 1.11224
+22 1.29 0.746744 1.20408
+23 1.35 0.984898 1.33673
+24 1.41 1.11123 1.5
+25 1.47 1.91696 1.80612
+26 1.53 1.59262 2.08163
+27 1.59 1.09237 2.28571
+28 1.65 1.21726 2.53061
+29 1.71 0.944452 2.73469
+30 1.77 1.49857 3.08163
+31 1.83 0.948361 3.31633
+32 1.89 1.23702 3.64286
+33 1.95 1.2347 3.9898
+34 2.01 1.05956 4.30612
+35 2.07 1.32129 4.72449
+36 2.13 1.12616 5.10204
+37 2.19 1.00772 5.45918
+38 2.25 0.600093 5.68367
+39 2.31 1.13865 6.13265
+40 2.37 0.934223 6.52041
+41 2.43 0.88866 6.90816
+42 2.49 1.02453 7.37755
+43 2.55 0.95565 7.83673
+44 2.61 0.871676 8.27551
+45 2.67 0.600493 8.59184
+46 2.73 0.982019 9.13265
+47 2.79 0.975718 9.69388
+48 2.85 0.714053 10.1224
+49 2.91 0.994753 10.7449
+50 2.97 0.939313 11.3571
+100950 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0.906153 0.0102041
+8 0.45 0 0.0102041
+9 0.51 0.530329 0.0204082
+10 0.57 0.84931 0.0408163
+11 0.63 2.08607 0.102041
+12 0.69 2.31902 0.183673
+13 0.75 1.47226 0.244898
+14 0.81 1.47271 0.316327
+15 0.87 2.91807 0.479592
+16 0.93 0.798069 0.530612
+17 0.99 1.12687 0.612245
+18 1.05 1.0018 0.693878
+19 1.11 1.12056 0.795918
+20 1.17 0.806882 0.877551
+21 1.23 1.18641 1.0102
+22 1.29 0.912687 1.12245
+23 1.35 0.833375 1.23469
+24 1.41 0.972324 1.37755
+25 1.47 0.95848 1.53061
+26 1.53 1.59262 1.80612
+27 1.59 0.928517 1.97959
+28 1.65 1.11582 2.20408
+29 1.71 1.55835 2.54082
+30 1.77 0.969664 2.76531
+31 1.83 1.15453 3.05102
+32 1.89 1.27568 3.38776
+33 1.95 0.871554 3.63265
+34 2.01 1.09374 3.95918
+35 2.07 1.38575 4.39796
+36 2.13 0.973977 4.72449
+37 2.19 0.950135 5.06122
+38 2.25 0.791032 5.35714
+39 2.31 0.724597 5.64286
+40 2.37 1.1309 6.11224
+41 2.43 0.912046 6.5102
+42 2.49 1.06908 7
+43 2.55 0.95565 7.45918
+44 2.61 1.01358 7.96939
+45 2.67 1.18161 8.59184
+46 2.73 0.889376 9.08163
+47 2.79 0.957978 9.63265
+48 2.85 0.850063 10.1429
+49 2.91 1.07629 10.8163
+50 2.97 1.0489 11.5
+101000 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 2.04287 0.0306122
+9 0.51 0.530329 0.0408163
+10 0.57 0.424655 0.0510204
+11 0.63 1.39071 0.0918367
+12 0.69 1.15951 0.132653
+13 0.75 1.96301 0.214286
+14 0.81 0.841547 0.255102
+15 0.87 1.8238 0.357143
+16 0.93 1.75575 0.469388
+17 0.99 1.12687 0.55102
+18 1.05 0.500899 0.591837
+19 1.11 1.7929 0.755102
+20 1.17 1.31118 0.887755
+21 1.23 0.821359 0.979592
+22 1.29 1.1616 1.12245
+23 1.35 1.51523 1.32653
+24 1.41 0.972324 1.46939
+25 1.47 1.40577 1.69388
+26 1.53 1.41566 1.93878
+27 1.59 1.20161 2.16327
+28 1.65 0.963662 2.35714
+29 1.71 1.08612 2.59184
+30 1.77 1.01374 2.82653
+31 1.83 0.989594 3.07143
+32 1.89 1.39165 3.43878
+33 1.95 1.12576 3.7551
+34 2.01 0.957019 4.04082
+35 2.07 1.25684 4.43878
+36 2.13 0.791356 4.70408
+37 2.19 0.950135 5.04082
+38 2.25 1.03652 5.42857
+39 2.31 0.776354 5.73469
+40 2.37 0.860468 6.09184
+41 2.43 0.865274 6.46939
+42 2.49 0.779534 6.82653
+43 2.55 0.89194 7.2551
+44 2.61 0.912219 7.71429
+45 2.67 1.02665 8.2551
+46 2.73 0.982019 8.79592
+47 2.79 1.22408 9.5
+48 2.85 1.00307 10.102
+49 2.91 1.15783 10.8265
+50 2.97 1.14283 11.5714
+101050 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 1.36191 0.0204082
+9 0.51 1.59099 0.0510204
+10 0.57 0.84931 0.0714286
+11 0.63 1.04303 0.102041
+12 0.69 1.15951 0.142857
+13 0.75 1.47226 0.204082
+14 0.81 2.10387 0.306122
+15 0.87 1.27666 0.377551
+16 0.93 1.43652 0.469388
+17 0.99 1.6903 0.591837
+18 1.05 1.0018 0.673469
+19 1.11 1.34467 0.795918
+20 1.17 1.21032 0.918367
+21 1.23 1.36893 1.07143
+22 1.29 1.57646 1.26531
+23 1.35 0.833375 1.37755
+24 1.41 1.18068 1.55102
+25 1.47 1.34187 1.76531
+26 1.53 0.766817 1.89796
+27 1.59 1.14699 2.11224
+28 1.65 1.01438 2.31633
+29 1.71 0.566671 2.43878
+30 1.77 0.837437 2.63265
+31 1.83 0.824661 2.83673
+32 1.89 1.12105 3.13265
+33 1.95 0.653666 3.31633
+34 2.01 1.33299 3.71429
+35 2.07 0.708987 3.93878
+36 2.13 0.973977 4.26531
+37 2.19 1.18047 4.68367
+38 2.25 0.872863 5.0102
+39 2.31 1.06102 5.42857
+40 2.37 1.18007 5.91837
+41 2.43 1.00559 6.35714
+42 2.49 1.13589 6.87755
+43 2.55 0.976887 7.34694
+44 2.61 0.993305 7.84694
+45 2.67 0.832941 8.28571
+46 2.73 0.907904 8.78571
+47 2.79 1.08216 9.40816
+48 2.85 1.08808 10.0612
+49 2.91 1.07629 10.7347
+50 2.97 0.939313 11.3469
+101100 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 3.11031 0.0102041
+5 0.27 0 0.0102041
+6 0.33 0 0.0102041
+7 0.39 0 0.0102041
+8 0.45 0 0.0102041
+9 0.51 1.06066 0.0306122
+10 0.57 1.27396 0.0612245
+11 0.63 0.695356 0.0816327
+12 0.69 1.73927 0.142857
+13 0.75 1.22688 0.193878
+14 0.81 0.841547 0.234694
+15 0.87 2.00617 0.346939
+16 0.93 0.798069 0.397959
+17 0.99 1.97202 0.540816
+18 1.05 1.37747 0.653061
+19 1.11 1.23262 0.765306
+20 1.17 0.907742 0.857143
+21 1.23 1.00388 0.969388
+22 1.29 0.912687 1.08163
+23 1.35 1.59099 1.29592
+24 1.41 0.763969 1.40816
+25 1.47 1.15018 1.59184
+26 1.53 1.17972 1.79592
+27 1.59 0.983136 1.97959
+28 1.65 1.0651 2.19388
+29 1.71 1.0389 2.41837
+30 1.77 1.27819 2.71429
+31 1.83 0.948361 2.94898
+32 1.89 0.811794 3.16327
+33 1.95 1.05313 3.45918
+34 2.01 1.33299 3.85714
+35 2.07 1.38575 4.29592
+36 2.13 0.973977 4.62245
+37 2.19 0.978927 4.96939
+38 2.25 0.845586 5.28571
+39 2.31 1.00926 5.68367
+40 2.37 1.08173 6.13265
+41 2.43 0.818503 6.4898
+42 2.49 1.09135 6.9898
+43 2.55 0.89194 7.41837
+44 2.61 1.13521 7.9898
+45 2.67 0.736088 8.37755
+46 2.73 0.870847 8.85714
+47 2.79 1.04668 9.45918
+48 2.85 0.850063 9.96939
+49 2.91 0.864293 10.5102
+50 2.97 1.0489 11.1939
+101150 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 1.26463 0.0102041
+7 0.39 0 0.0102041
+8 0.45 0 0.0102041
+9 0.51 0 0.0102041
+10 0.57 0.84931 0.0306122
+11 0.63 2.08607 0.0918367
+12 0.69 2.02914 0.163265
+13 0.75 0.981505 0.204082
+14 0.81 2.10387 0.306122
+15 0.87 1.27666 0.377551
+16 0.93 1.27691 0.459184
+17 0.99 1.54944 0.571429
+18 1.05 0.751348 0.632653
+19 1.11 1.23262 0.744898
+20 1.17 0.605161 0.806122
+21 1.23 1.46019 0.969388
+22 1.29 1.1616 1.11224
+23 1.35 1.3637 1.29592
+24 1.41 1.18068 1.46939
+25 1.47 0.702885 1.58163
+26 1.53 1.00276 1.7551
+27 1.59 0.655424 1.87755
+28 1.65 0.710067 2.02041
+29 1.71 1.22779 2.28571
+30 1.77 1.41042 2.61224
+31 1.83 0.907127 2.83673
+32 1.89 0.889108 3.07143
+33 1.95 0.944184 3.33673
+34 2.01 0.957019 3.62245
+35 2.07 0.966801 3.92857
+36 2.13 1.06529 4.28571
+37 2.19 1.26685 4.73469
+38 2.25 0.681924 4.9898
+39 2.31 0.957503 5.36735
+40 2.37 0.983392 5.77551
+41 2.43 0.935432 6.18367
+42 2.49 1.11362 6.69388
+43 2.55 0.785757 7.07143
+44 2.61 1.09466 7.62245
+45 2.67 0.949166 8.12245
+46 2.73 0.870847 8.60204
+47 2.79 1.06442 9.21429
+48 2.85 1.02008 9.82653
+49 2.91 1.12521 10.5306
+50 2.97 1.00193 11.1837
+101200 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0.906153 0.0102041
+8 0.45 0.680956 0.0204082
+9 0.51 0 0.0204082
+10 0.57 0.84931 0.0408163
+11 0.63 1.39071 0.0816327
+12 0.69 1.44939 0.132653
+13 0.75 2.94452 0.255102
+14 0.81 1.68309 0.336735
+15 0.87 1.64142 0.428571
+16 0.93 1.1173 0.5
+17 0.99 1.26773 0.591837
+18 1.05 0.876573 0.663265
+19 1.11 1.45673 0.795918
+20 1.17 1.61376 0.959184
+21 1.23 1.36893 1.11224
+22 1.29 1.57646 1.30612
+23 1.35 0.833375 1.41837
+24 1.41 0.902872 1.55102
+25 1.47 1.21407 1.7449
+26 1.53 0.589859 1.84694
+27 1.59 1.03775 2.04082
+28 1.65 1.01438 2.2449
+29 1.71 1.13334 2.4898
+30 1.77 1.14597 2.7551
+31 1.83 1.27823 3.07143
+32 1.89 1.12105 3.36735
+33 1.95 1.12576 3.68367
+34 2.01 0.88866 3.94898
+35 2.07 0.77344 4.19388
+36 2.13 1.09572 4.56122
+37 2.19 0.633423 4.78571
+38 2.25 1.0638 5.18367
+39 2.31 0.983381 5.57143
+40 2.37 0.786714 5.89796
+41 2.43 1.09913 6.37755
+42 2.49 1.20271 6.92857
+43 2.55 0.913177 7.36735
+44 2.61 1.01358 7.87755
+45 2.67 1.08476 8.44898
+46 2.73 0.815261 8.89796
+47 2.79 0.940237 9.43878
+48 2.85 1.3941 10.2755
+49 2.91 0.766449 10.7551
+50 2.97 1.11152 11.4796
+101250 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 0 0
+9 0.51 1.06066 0.0204082
+10 0.57 0.424655 0.0306122
+11 0.63 2.08607 0.0918367
+12 0.69 2.31902 0.173469
+13 0.75 0.981505 0.214286
+14 0.81 1.68309 0.295918
+15 0.87 0.911898 0.346939
+16 0.93 1.27691 0.428571
+17 0.99 0.98601 0.5
+18 1.05 0.500899 0.540816
+19 1.11 0.224112 0.561224
+20 1.17 2.11806 0.77551
+21 1.23 0.912621 0.877551
+22 1.29 1.07863 1.0102
+23 1.35 1.43947 1.20408
+24 1.41 1.11123 1.36735
+25 1.47 1.27797 1.57143
+26 1.53 1.35668 1.80612
+27 1.59 0.764661 1.94898
+28 1.65 1.16654 2.18367
+29 1.71 1.18057 2.43878
+30 1.77 0.969664 2.66327
+31 1.83 0.742195 2.84694
+32 1.89 1.19836 3.16327
+33 1.95 1.08944 3.46939
+34 2.01 0.854481 3.72449
+35 2.07 1.09571 4.07143
+36 2.13 0.973977 4.39796
+37 2.19 1.12289 4.79592
+38 2.25 1.33657 5.29592
+39 2.31 0.595204 5.53061
+40 2.37 1.10632 5.9898
+41 2.43 0.88866 6.37755
+42 2.49 0.846351 6.76531
+43 2.55 0.976887 7.23469
+44 2.61 1.23656 7.85714
+45 2.67 1.00728 8.38776
+46 2.73 0.944962 8.90816
+47 2.79 1.15312 9.57143
+48 2.85 0.867064 10.0918
+49 2.91 1.01106 10.7245
+50 2.97 0.986279 11.3673
+101300 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 0.680956 0.0102041
+9 0.51 0 0.0102041
+10 0.57 1.27396 0.0408163
+11 0.63 2.08607 0.102041
+12 0.69 1.73927 0.163265
+13 0.75 1.47226 0.22449
+14 0.81 1.47271 0.295918
+15 0.87 1.45904 0.377551
+16 0.93 1.27691 0.459184
+17 0.99 1.40859 0.561224
+18 1.05 0.125225 0.571429
+19 1.11 1.23262 0.683673
+20 1.17 1.10946 0.795918
+21 1.23 0.912621 0.897959
+22 1.29 1.41052 1.07143
+23 1.35 0.378807 1.12245
+24 1.41 1.25013 1.30612
+25 1.47 0.830683 1.43878
+26 1.53 1.17972 1.64286
+27 1.59 1.36547 1.89796
+28 1.65 1.16654 2.13265
+29 1.71 0.850007 2.31633
+30 1.77 1.36634 2.63265
+31 1.83 0.824661 2.83673
+32 1.89 1.19836 3.15306
+33 1.95 0.980499 3.42857
+34 2.01 0.88866 3.69388
+35 2.07 0.934574 3.9898
+36 2.13 0.821793 4.26531
+37 2.19 0.921343 4.59184
+38 2.25 0.709201 4.85714
+39 2.31 0.853989 5.19388
+40 2.37 0.885053 5.56122
+41 2.43 0.958818 5.97959
+42 2.49 1.0468 6.45918
+43 2.55 0.998123 6.93878
+44 2.61 1.03385 7.45918
+45 2.67 1.39469 8.19388
+46 2.73 1.01908 8.7551
+47 2.79 1.17086 9.42857
+48 2.85 1.03708 10.051
+49 2.91 0.766449 10.5306
+50 2.97 1.00193 11.1837
+101350 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0.906153 0.0102041
+8 0.45 2.04287 0.0408163
+9 0.51 1.59099 0.0714286
+10 0.57 2.12327 0.122449
+11 0.63 1.39071 0.163265
+12 0.69 1.73927 0.22449
+13 0.75 1.47226 0.285714
+14 0.81 0.63116 0.316327
+15 0.87 0.729518 0.357143
+16 0.93 0.957682 0.418367
+17 0.99 1.40859 0.520408
+18 1.05 0.876573 0.591837
+19 1.11 1.7929 0.755102
+20 1.17 1.31118 0.887755
+21 1.23 0.912621 0.989796
+22 1.29 1.24457 1.14286
+23 1.35 0.757614 1.2449
+24 1.41 1.38903 1.44898
+25 1.47 0.575088 1.54082
+26 1.53 0.648845 1.65306
+27 1.59 0.655424 1.77551
+28 1.65 0.557909 1.88776
+29 1.71 1.27501 2.16327
+30 1.77 0.881513 2.36735
+31 1.83 1.07206 2.63265
+32 1.89 1.35299 2.9898
+33 1.95 1.2347 3.33673
+34 2.01 0.820302 3.58163
+35 2.07 0.870121 3.85714
+36 2.13 0.821793 4.13265
+37 2.19 1.12289 4.53061
+38 2.25 1.14563 4.95918
+39 2.31 1.44919 5.53061
+40 2.37 1.1309 6
+41 2.43 1.09913 6.47959
+42 2.49 1.06908 6.96939
+43 2.55 0.76452 7.33673
+44 2.61 1.56091 8.12245
+45 2.67 0.736088 8.5102
+46 2.73 1.07466 9.10204
+47 2.79 1.02894 9.69388
+48 2.85 0.969072 10.2755
+49 2.91 0.913216 10.8469
+50 2.97 1.14283 11.5918
+101400 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 1.81231 0.0204082
+8 0.45 0 0.0204082
+9 0.51 1.06066 0.0408163
+10 0.57 0.424655 0.0510204
+11 0.63 1.39071 0.0918367
+12 0.69 2.02914 0.163265
+13 0.75 0.490753 0.183673
+14 0.81 1.26232 0.244898
+15 0.87 0.911898 0.295918
+16 0.93 1.43652 0.387755
+17 0.99 0.98601 0.459184
+18 1.05 1.75315 0.602041
+19 1.11 1.23262 0.714286
+20 1.17 1.21032 0.836735
+21 1.23 1.18641 0.969388
+22 1.29 1.07863 1.10204
+23 1.35 1.06066 1.2449
+24 1.41 1.8752 1.52041
+25 1.47 0.95848 1.67347
+26 1.53 0.943774 1.83673
+27 1.59 1.4747 2.11224
+28 1.65 1.36941 2.38776
+29 1.71 0.661116 2.53061
+30 1.77 1.14597 2.79592
+31 1.83 0.700962 2.96939
+32 1.89 1.19836 3.28571
+33 1.95 0.944184 3.55102
+34 2.01 1.29881 3.93878
+35 2.07 1.03125 4.26531
+36 2.13 1.21747 4.67347
+37 2.19 0.950135 5.0102
+38 2.25 1.20019 5.45918
+39 2.31 0.983381 5.84694
+40 2.37 0.983392 6.2551
+41 2.43 0.88866 6.64286
+42 2.49 1.02453 7.11224
+43 2.55 0.70081 7.44898
+44 2.61 1.15548 8.03061
+45 2.67 0.987907 8.55102
+46 2.73 0.926433 9.06122
+47 2.79 0.869276 9.56122
+48 2.85 0.833061 10.0612
+49 2.91 0.799064 10.5612
+50 2.97 0.767106 11.0612
+101450 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0.906153 0.0102041
+8 0.45 1.36191 0.0306122
+9 0.51 0.530329 0.0408163
+10 0.57 0.84931 0.0612245
+11 0.63 1.04303 0.0918367
+12 0.69 0.579756 0.112245
+13 0.75 1.47226 0.173469
+14 0.81 1.26232 0.234694
+15 0.87 1.27666 0.306122
+16 0.93 1.91536 0.428571
+17 0.99 1.54944 0.540816
+18 1.05 1.25225 0.642857
+19 1.11 1.45673 0.77551
+20 1.17 1.41204 0.918367
+21 1.23 1.00388 1.03061
+22 1.29 1.65943 1.23469
+23 1.35 0.984898 1.36735
+24 1.41 0.694517 1.46939
+25 1.47 1.21407 1.66327
+26 1.53 0.707831 1.78571
+27 1.59 1.09237 1.9898
+28 1.65 0.710067 2.13265
+29 1.71 1.27501 2.40816
+30 1.77 0.837437 2.60204
+31 1.83 1.31946 2.92857
+32 1.89 1.12105 3.22449
+33 1.95 0.871554 3.46939
+34 2.01 1.05956 3.78571
+35 2.07 0.870121 4.06122
+36 2.13 1.30878 4.5
+37 2.19 1.03651 4.86735
+38 2.25 0.927417 5.21429
+39 2.31 1.06102 5.63265
+40 2.37 0.909638 6.0102
+41 2.43 0.935432 6.41837
+42 2.49 1.02453 6.88776
+43 2.55 0.934413 7.33673
+44 2.61 1.31765 8
+45 2.67 0.929795 8.4898
+46 2.73 1.09319 9.09184
+47 2.79 0.993458 9.66327
+48 2.85 1.17309 10.3673
+49 2.91 0.929523 10.949
+50 2.97 1.03324 11.6224
+101500 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 1.88658 0.0102041
+6 0.33 0 0.0102041
+7 0.39 0 0.0102041
+8 0.45 0 0.0102041
+9 0.51 0.530329 0.0204082
+10 0.57 2.97258 0.0918367
+11 0.63 1.04303 0.122449
+12 0.69 1.44939 0.173469
+13 0.75 1.47226 0.234694
+14 0.81 1.89348 0.326531
+15 0.87 1.8238 0.428571
+16 0.93 1.27691 0.510204
+17 0.99 1.40859 0.612245
+18 1.05 0.876573 0.683673
+19 1.11 1.0085 0.77551
+20 1.17 1.41204 0.918367
+21 1.23 1.36893 1.07143
+22 1.29 0.580801 1.14286
+23 1.35 0.909136 1.26531
+24 1.41 1.18068 1.43878
+25 1.47 1.46967 1.67347
+26 1.53 1.2387 1.88776
+27 1.59 1.14699 2.10204
+28 1.65 0.963662 2.29592
+29 1.71 1.0389 2.52041
+30 1.77 0.969664 2.7449
+31 1.83 1.27823 3.06122
+32 1.89 0.966422 3.31633
+33 1.95 1.08944 3.62245
+34 2.01 1.05956 3.93878
+35 2.07 0.999027 4.2551
+36 2.13 1.12616 4.63265
+37 2.19 1.12289 5.03061
+38 2.25 0.954694 5.38776
+39 2.31 1.24217 5.87755
+40 2.37 1.20466 6.37755
+41 2.43 0.982203 6.80612
+42 2.49 1.22498 7.36735
+43 2.55 0.95565 7.82653
+44 2.61 0.993305 8.32653
+45 2.67 0.891053 8.79592
+46 2.73 1.07466 9.38776
+47 2.79 0.833795 9.86735
+48 2.85 1.12208 10.5408
+49 2.91 1.1089 11.2347
+50 2.97 0.954968 11.8571
+101550 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 0.680956 0.0102041
+9 0.51 0 0.0102041
+10 0.57 1.27396 0.0408163
+11 0.63 0.695356 0.0612245
+12 0.69 2.02914 0.132653
+13 0.75 2.20839 0.22449
+14 0.81 1.05193 0.27551
+15 0.87 1.09428 0.336735
+16 0.93 0.638455 0.377551
+17 0.99 1.54944 0.489796
+18 1.05 2.0036 0.653061
+19 1.11 0.896448 0.734694
+20 1.17 1.21032 0.857143
+21 1.23 1.46019 1.02041
+22 1.29 1.07863 1.15306
+23 1.35 0.909136 1.27551
+24 1.41 1.25013 1.45918
+25 1.47 1.15018 1.64286
+26 1.53 0.766817 1.77551
+27 1.59 1.42008 2.04082
+28 1.65 1.31869 2.30612
+29 1.71 1.18057 2.56122
+30 1.77 1.01374 2.79592
+31 1.83 0.783428 2.9898
+32 1.89 1.23702 3.31633
+33 1.95 1.34365 3.69388
+34 2.01 0.786122 3.92857
+35 2.07 1.06348 4.26531
+36 2.13 1.27835 4.69388
+37 2.19 1.18047 5.11224
+38 2.25 0.954694 5.46939
+39 2.31 0.905746 5.82653
+40 2.37 1.00798 6.2449
+41 2.43 1.05236 6.70408
+42 2.49 1.09135 7.20408
+43 2.55 1.16802 7.76531
+44 2.61 1.03385 8.28571
+45 2.67 1.06539 8.84694
+46 2.73 1.0376 9.41837
+47 2.79 1.02894 10.0102
+48 2.85 1.10508 10.6735
+49 2.91 1.12521 11.3776
+50 2.97 0.782761 11.8878
+101600 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 0 0
+9 0.51 0 0
+10 0.57 0 0
+11 0.63 0.695356 0.0204082
+12 0.69 2.02914 0.0918367
+13 0.75 1.22688 0.142857
+14 0.81 1.05193 0.193878
+15 0.87 1.45904 0.27551
+16 0.93 1.27691 0.357143
+17 0.99 1.26773 0.44898
+18 1.05 1.0018 0.530612
+19 1.11 1.23262 0.642857
+20 1.17 1.31118 0.77551
+21 1.23 1.09515 0.897959
+22 1.29 1.07863 1.03061
+23 1.35 0.984898 1.16327
+24 1.41 0.833421 1.28571
+25 1.47 1.53357 1.53061
+26 1.53 0.884789 1.68367
+27 1.59 0.983136 1.86735
+28 1.65 1.01438 2.07143
+29 1.71 1.32223 2.35714
+30 1.77 1.49857 2.70408
+31 1.83 1.40192 3.05102
+32 1.89 1.00508 3.31633
+33 1.95 0.871554 3.56122
+34 2.01 1.02538 3.86735
+35 2.07 0.837894 4.13265
+36 2.13 0.913104 4.43878
+37 2.19 0.950135 4.77551
+38 2.25 0.927417 5.12245
+39 2.31 1.19041 5.59184
+40 2.37 1.25383 6.11224
+41 2.43 1.12252 6.60204
+42 2.49 0.734989 6.93878
+43 2.55 1.18925 7.5102
+44 2.61 0.932491 7.97959
+45 2.67 0.716717 8.35714
+46 2.73 1.20436 9.02041
+47 2.79 0.957978 9.57143
+48 2.85 0.935069 10.1327
+49 2.91 1.14152 10.8469
+50 2.97 0.954968 11.4694
+101650 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 1.88658 0.0102041
+6 0.33 0 0.0102041
+7 0.39 0 0.0102041
+8 0.45 0.680956 0.0204082
+9 0.51 0.530329 0.0306122
+10 0.57 0.84931 0.0510204
+11 0.63 1.04303 0.0816327
+12 0.69 1.73927 0.142857
+13 0.75 1.47226 0.204082
+14 0.81 0.63116 0.234694
+15 0.87 1.27666 0.306122
+16 0.93 0.798069 0.357143
+17 0.99 1.12687 0.438776
+18 1.05 1.25225 0.540816
+19 1.11 0.896448 0.622449
+20 1.17 1.31118 0.755102
+21 1.23 1.55146 0.928571
+22 1.29 0.912687 1.04082
+23 1.35 0.833375 1.15306
+24 1.41 0.972324 1.29592
+25 1.47 1.08628 1.46939
+26 1.53 0.884789 1.62245
+27 1.59 1.31085 1.86735
+28 1.65 0.912943 2.05102
+29 1.71 1.4639 2.36735
+30 1.77 0.793362 2.55102
+31 1.83 1.60809 2.94898
+32 1.89 0.927765 3.19388
+33 1.95 0.871554 3.43878
+34 2.01 0.820302 3.68367
+35 2.07 1.09571 4.03061
+36 2.13 1.30878 4.46939
+37 2.19 1.12289 4.86735
+38 2.25 0.763755 5.15306
+39 2.31 1.13865 5.60204
+40 2.37 0.934223 5.9898
+41 2.43 1.12252 6.47959
+42 2.49 0.824079 6.85714
+43 2.55 1.12554 7.39796
+44 2.61 0.973034 7.88776
+45 2.67 0.832941 8.32653
+46 2.73 1.00055 8.87755
+47 2.79 0.922497 9.40816
+48 2.85 1.24109 10.1531
+49 2.91 1.02737 10.7959
+50 2.97 1.00193 11.449
+101700 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 1.26463 0.0102041
+7 0.39 0 0.0102041
+8 0.45 1.36191 0.0306122
+9 0.51 1.06066 0.0510204
+10 0.57 1.27396 0.0816327
+11 0.63 1.04303 0.112245
+12 0.69 1.73927 0.173469
+13 0.75 1.47226 0.234694
+14 0.81 0.841547 0.27551
+15 0.87 2.37093 0.408163
+16 0.93 1.43652 0.5
+17 0.99 0.845152 0.561224
+18 1.05 0.876573 0.632653
+19 1.11 0.56028 0.683673
+20 1.17 1.21032 0.806122
+21 1.23 0.821359 0.897959
+22 1.29 1.49349 1.08163
+23 1.35 1.51523 1.28571
+24 1.41 1.11123 1.44898
+25 1.47 1.15018 1.63265
+26 1.53 1.17972 1.83673
+27 1.59 0.928517 2.0102
+28 1.65 1.11582 2.23469
+29 1.71 1.22779 2.5
+30 1.77 1.14597 2.76531
+31 1.83 0.742195 2.94898
+32 1.89 1.31433 3.29592
+33 1.95 0.83524 3.53061
+34 2.01 1.09374 3.85714
+35 2.07 1.22461 4.2449
+36 2.13 1.12616 4.62245
+37 2.19 1.03651 4.9898
+38 2.25 0.791032 5.28571
+39 2.31 1.03514 5.69388
+40 2.37 1.35216 6.2551
+41 2.43 1.23945 6.79592
+42 2.49 0.734989 7.13265
+43 2.55 0.976887 7.60204
+44 2.61 0.912219 8.06122
+45 2.67 0.949166 8.56122
+46 2.73 1.01908 9.12245
+47 2.79 1.0112 9.70408
+48 2.85 0.884065 10.2347
+49 2.91 1.04368 10.8878
+50 2.97 0.876692 11.4592
+101750 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 2.71846 0.0306122
+8 0.45 0 0.0306122
+9 0.51 0 0.0306122
+10 0.57 2.97258 0.102041
+11 0.63 0.695356 0.122449
+12 0.69 0.579756 0.142857
+13 0.75 1.47226 0.204082
+14 0.81 1.26232 0.265306
+15 0.87 2.00617 0.377551
+16 0.93 1.75575 0.489796
+17 0.99 1.40859 0.591837
+18 1.05 0.751348 0.653061
+19 1.11 2.12906 0.846939
+20 1.17 1.0086 0.94898
+21 1.23 1.00388 1.06122
+22 1.29 1.7424 1.27551
+23 1.35 0.833375 1.38776
+24 1.41 1.45849 1.60204
+25 1.47 1.15018 1.78571
+26 1.53 0.648845 1.89796
+27 1.59 0.928517 2.07143
+28 1.65 1.0651 2.28571
+29 1.71 0.944452 2.4898
+30 1.77 1.10189 2.7449
+31 1.83 0.824661 2.94898
+32 1.89 1.04374 3.22449
+33 1.95 1.05313 3.52041
+34 2.01 0.820302 3.76531
+35 2.07 1.12793 4.12245
+36 2.13 0.85223 4.40816
+37 2.19 0.950135 4.7449
+38 2.25 0.872863 5.07143
+39 2.31 1.00926 5.46939
+40 2.37 0.811299 5.80612
+41 2.43 1.00559 6.2449
+42 2.49 0.779534 6.60204
+43 2.55 1.23173 7.19388
+44 2.61 1.03385 7.71429
+45 2.67 1.14287 8.31633
+46 2.73 1.01908 8.87755
+47 2.79 1.0999 9.5102
+48 2.85 1.19009 10.2245
+49 2.91 0.913216 10.7959
+50 2.97 0.923658 11.398
+101800 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0.906153 0.0102041
+8 0.45 0.680956 0.0204082
+9 0.51 0.530329 0.0306122
+10 0.57 0.424655 0.0408163
+11 0.63 0.347678 0.0510204
+12 0.69 1.73927 0.112245
+13 0.75 2.20839 0.204082
+14 0.81 1.05193 0.255102
+15 0.87 1.64142 0.346939
+16 0.93 1.27691 0.428571
+17 0.99 2.25374 0.591837
+18 1.05 1.0018 0.673469
+19 1.11 1.12056 0.77551
+20 1.17 1.31118 0.908163
+21 1.23 1.09515 1.03061
+22 1.29 0.829715 1.13265
+23 1.35 1.13642 1.28571
+24 1.41 1.11123 1.44898
+25 1.47 0.95848 1.60204
+26 1.53 1.12073 1.79592
+27 1.59 1.58394 2.09184
+28 1.65 0.862224 2.26531
+29 1.71 1.0389 2.4898
+30 1.77 0.925588 2.70408
+31 1.83 1.19576 3
+32 1.89 0.811794 3.21429
+33 1.95 0.980499 3.4898
+34 2.01 0.717764 3.70408
+35 2.07 0.999027 4.02041
+36 2.13 1.18703 4.41837
+37 2.19 0.892551 4.73469
+38 2.25 1.0638 5.13265
+39 2.31 0.983381 5.52041
+40 2.37 1.00798 5.93878
+41 2.43 1.23945 6.47959
+42 2.49 0.779534 6.83673
+43 2.55 0.934413 7.28571
+44 2.61 1.27711 7.92857
+45 2.67 1.23973 8.58163
+46 2.73 0.907904 9.08163
+47 2.79 0.851536 9.57143
+48 2.85 1.07108 10.2143
+49 2.91 0.994753 10.8367
+50 2.97 1.00193 11.4898
+101850 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 1.88658 0.0102041
+6 0.33 0 0.0102041
+7 0.39 0 0.0102041
+8 0.45 1.36191 0.0306122
+9 0.51 1.59099 0.0612245
+10 0.57 0.84931 0.0816327
+11 0.63 0.695356 0.102041
+12 0.69 1.73927 0.163265
+13 0.75 0.490753 0.183673
+14 0.81 1.47271 0.255102
+15 0.87 1.64142 0.346939
+16 0.93 1.27691 0.428571
+17 0.99 1.97202 0.571429
+18 1.05 1.12702 0.663265
+19 1.11 1.34467 0.785714
+20 1.17 0.806882 0.867347
+21 1.23 1.27767 1.0102
+22 1.29 0.995658 1.13265
+23 1.35 0.681852 1.22449
+24 1.41 0.972324 1.36735
+25 1.47 1.21407 1.56122
+26 1.53 1.41566 1.80612
+27 1.59 1.09237 2.0102
+28 1.65 1.21726 2.2551
+29 1.71 1.0389 2.47959
+30 1.77 0.881513 2.68367
+31 1.83 1.03083 2.93878
+32 1.89 1.31433 3.28571
+33 1.95 1.12576 3.60204
+34 2.01 1.05956 3.91837
+35 2.07 1.25684 4.31633
+36 2.13 1.1566 4.70408
+37 2.19 0.806175 4.9898
+38 2.25 0.845586 5.30612
+39 2.31 1.11277 5.7449
+40 2.37 1.1309 6.21429
+41 2.43 0.88866 6.60204
+42 2.49 0.979986 7.05102
+43 2.55 1.21049 7.63265
+44 2.61 0.932491 8.10204
+45 2.67 0.929795 8.59184
+46 2.73 0.907904 9.09184
+47 2.79 0.833795 9.57143
+48 2.85 1.15609 10.2653
+49 2.91 1.04368 10.9184
+50 2.97 0.892347 11.5
+101900 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 1.88658 0.0102041
+6 0.33 1.26463 0.0204082
+7 0.39 0.906153 0.0306122
+8 0.45 0 0.0306122
+9 0.51 0.530329 0.0408163
+10 0.57 1.27396 0.0714286
+11 0.63 1.39071 0.112245
+12 0.69 0.579756 0.132653
+13 0.75 1.71763 0.204082
+14 0.81 1.26232 0.265306
+15 0.87 1.27666 0.336735
+16 0.93 1.43652 0.428571
+17 0.99 1.12687 0.510204
+18 1.05 1.37747 0.622449
+19 1.11 0.784392 0.693878
+20 1.17 1.31118 0.826531
+21 1.23 1.46019 0.989796
+22 1.29 1.49349 1.17347
+23 1.35 1.9698 1.43878
+24 1.41 1.18068 1.61224
+25 1.47 1.21407 1.80612
+26 1.53 1.12073 2
+27 1.59 1.20161 2.22449
+28 1.65 1.16654 2.45918
+29 1.71 0.755562 2.62245
+30 1.77 1.10189 2.87755
+31 1.83 0.659729 3.04082
+32 1.89 1.31433 3.38776
+33 1.95 0.76261 3.60204
+34 2.01 0.922839 3.87755
+35 2.07 1.12793 4.23469
+36 2.13 0.973977 4.56122
+37 2.19 0.604631 4.77551
+38 2.25 1.09108 5.18367
+39 2.31 1.11277 5.62245
+40 2.37 0.958808 6.02041
+41 2.43 0.912046 6.41837
+42 2.49 0.979986 6.86735
+43 2.55 1.16802 7.42857
+44 2.61 1.11493 7.9898
+45 2.67 1.04602 8.54082
+46 2.73 0.926433 9.05102
+47 2.79 0.887016 9.56122
+48 2.85 0.867064 10.0816
+49 2.91 0.929523 10.6633
+50 2.97 0.970623 11.2959
+101950 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 1.26463 0.0102041
+7 0.39 0.906153 0.0204082
+8 0.45 0.680956 0.0306122
+9 0.51 0.530329 0.0408163
+10 0.57 0.84931 0.0612245
+11 0.63 0.347678 0.0714286
+12 0.69 0.289878 0.0816327
+13 0.75 1.47226 0.142857
+14 0.81 1.47271 0.214286
+15 0.87 2.18855 0.336735
+16 0.93 1.1173 0.408163
+17 0.99 0.98601 0.479592
+18 1.05 1.25225 0.581633
+19 1.11 0.672336 0.642857
+20 1.17 1.21032 0.765306
+21 1.23 0.912621 0.867347
+22 1.29 1.1616 1.0102
+23 1.35 1.13642 1.16327
+24 1.41 1.59739 1.39796
+25 1.47 1.15018 1.58163
+26 1.53 0.884789 1.73469
+27 1.59 0.710042 1.86735
+28 1.65 1.11582 2.09184
+29 1.71 0.944452 2.29592
+30 1.77 1.19004 2.57143
+31 1.83 1.19576 2.86735
+32 1.89 1.19836 3.18367
+33 1.95 0.83524 3.41837
+34 2.01 0.957019 3.70408
+35 2.07 1.41797 4.15306
+36 2.13 1.30878 4.59184
+37 2.19 1.12289 4.9898
+38 2.25 0.818309 5.29592
+39 2.31 0.802232 5.61224
+40 2.37 0.835884 5.95918
+41 2.43 1.00559 6.39796
+42 2.49 1.02453 6.86735
+43 2.55 1.06183 7.37755
+44 2.61 0.973034 7.86735
+45 2.67 0.987907 8.38776
+46 2.73 1.11172 9
+47 2.79 0.762834 9.43878
+48 2.85 1.24109 10.1837
+49 2.91 0.913216 10.7551
+50 2.97 0.939313 11.3673
+102000 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 1.26463 0.0102041
+7 0.39 0 0.0102041
+8 0.45 0 0.0102041
+9 0.51 1.06066 0.0306122
+10 0.57 1.27396 0.0612245
+11 0.63 1.39071 0.102041
+12 0.69 2.31902 0.183673
+13 0.75 1.96301 0.265306
+14 0.81 1.47271 0.336735
+15 0.87 1.09428 0.397959
+16 0.93 1.59614 0.5
+17 0.99 1.26773 0.591837
+18 1.05 1.0018 0.673469
+19 1.11 0.672336 0.734694
+20 1.17 0.907742 0.826531
+21 1.23 0.821359 0.918367
+22 1.29 0.580801 0.989796
+23 1.35 0.984898 1.12245
+24 1.41 1.25013 1.30612
+25 1.47 0.95848 1.45918
+26 1.53 1.47465 1.71429
+27 1.59 0.928517 1.88776
+28 1.65 0.912943 2.07143
+29 1.71 0.89723 2.26531
+30 1.77 1.05782 2.5102
+31 1.83 0.865894 2.72449
+32 1.89 1.12105 3.02041
+33 1.95 1.41628 3.41837
+34 2.01 0.786122 3.65306
+35 2.07 0.999027 3.96939
+36 2.13 1.09572 4.33673
+37 2.19 1.12289 4.73469
+38 2.25 0.954694 5.09184
+39 2.31 1.03514 5.5
+40 2.37 1.25383 6.02041
+41 2.43 0.958818 6.43878
+42 2.49 1.13589 6.95918
+43 2.55 1.23173 7.55102
+44 2.61 0.952762 8.03061
+45 2.67 0.7942 8.44898
+46 2.73 1.05613 9.03061
+47 2.79 0.887016 9.54082
+48 2.85 1.12208 10.2143
+49 2.91 0.978445 10.8265
+50 2.97 1.00193 11.4796
+102050 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 0 0
+9 0.51 0.530329 0.0102041
+10 0.57 0.84931 0.0306122
+11 0.63 1.04303 0.0612245
+12 0.69 1.73927 0.122449
+13 0.75 2.20839 0.214286
+14 0.81 1.47271 0.285714
+15 0.87 1.27666 0.357143
+16 0.93 0.957682 0.418367
+17 0.99 1.12687 0.5
+18 1.05 1.0018 0.581633
+19 1.11 1.68084 0.734694
+20 1.17 1.31118 0.867347
+21 1.23 1.00388 0.979592
+22 1.29 0.995658 1.10204
+23 1.35 1.59099 1.31633
+24 1.41 1.25013 1.5
+25 1.47 1.27797 1.70408
+26 1.53 1.06175 1.88776
+27 1.59 1.09237 2.09184
+28 1.65 0.963662 2.28571
+29 1.71 1.08612 2.52041
+30 1.77 0.925588 2.73469
+31 1.83 0.577263 2.87755
+32 1.89 0.966422 3.13265
+33 1.95 0.980499 3.40816
+34 2.01 0.88866 3.67347
+35 2.07 1.22461 4.06122
+36 2.13 1.1566 4.44898
+37 2.19 1.15168 4.85714
+38 2.25 1.11836 5.27551
+39 2.31 1.0869 5.70408
+40 2.37 1.18007 6.19388
+41 2.43 1.16929 6.70408
+42 2.49 0.890896 7.11224
+43 2.55 0.998123 7.59184
+44 2.61 1.11493 8.15306
+45 2.67 1.1235 8.7449
+46 2.73 0.944962 9.26531
+47 2.79 1.02894 9.85714
+48 2.85 1.00307 10.4592
+49 2.91 1.04368 11.1122
+50 2.97 1.06455 11.8061
+102100 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 2.04287 0.0306122
+9 0.51 0.530329 0.0408163
+10 0.57 0 0.0408163
+11 0.63 0.347678 0.0510204
+12 0.69 1.15951 0.0918367
+13 0.75 2.45376 0.193878
+14 0.81 0.841547 0.234694
+15 0.87 1.09428 0.295918
+16 0.93 1.1173 0.367347
+17 0.99 2.11288 0.520408
+18 1.05 2.0036 0.683673
+19 1.11 1.12056 0.785714
+20 1.17 1.5129 0.938776
+21 1.23 0.912621 1.04082
+22 1.29 1.49349 1.22449
+23 1.35 0.833375 1.33673
+24 1.41 1.25013 1.52041
+25 1.47 1.15018 1.70408
+26 1.53 1.35668 1.93878
+27 1.59 1.4747 2.21429
+28 1.65 1.36941 2.4898
+29 1.71 0.708339 2.64286
+30 1.77 0.881513 2.84694
+31 1.83 1.36069 3.18367
+32 1.89 1.27568 3.52041
+33 1.95 1.12576 3.83673
+34 2.01 0.854481 4.09184
+35 2.07 1.03125 4.41837
+36 2.13 1.09572 4.78571
+37 2.19 0.892551 5.10204
+38 2.25 1.11836 5.52041
+39 2.31 0.853989 5.85714
+40 2.37 0.958808 6.2551
+41 2.43 1.05236 6.71429
+42 2.49 0.935441 7.14286
+43 2.55 0.976887 7.61224
+44 2.61 1.07439 8.15306
+45 2.67 1.06539 8.71429
+46 2.73 0.870847 9.19388
+47 2.79 0.922497 9.72449
+48 2.85 0.986073 10.3163
+49 2.91 1.07629 10.9898
+50 2.97 0.970623 11.6224
+102150 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0.906153 0.0102041
+8 0.45 0.680956 0.0204082
+9 0.51 1.06066 0.0408163
+10 0.57 2.54793 0.102041
+11 0.63 1.39071 0.142857
+12 0.69 0.869633 0.173469
+13 0.75 2.20839 0.265306
+14 0.81 1.89348 0.357143
+15 0.87 2.55331 0.5
+16 0.93 1.43652 0.591837
+17 0.99 1.26773 0.683673
+18 1.05 1.62792 0.816327
+19 1.11 0.896448 0.897959
+20 1.17 1.61376 1.06122
+21 1.23 0.730097 1.14286
+22 1.29 1.24457 1.29592
+23 1.35 0.833375 1.40816
+24 1.41 0.833421 1.53061
+25 1.47 1.53357 1.77551
+26 1.53 1.06175 1.95918
+27 1.59 0.928517 2.13265
+28 1.65 1.31869 2.39796
+29 1.71 0.850007 2.58163
+30 1.77 1.05782 2.82653
+31 1.83 0.948361 3.06122
+32 1.89 1.04374 3.33673
+33 1.95 0.83524 3.57143
+34 2.01 0.922839 3.84694
+35 2.07 1.06348 4.18367
+36 2.13 0.94354 4.5
+37 2.19 1.15168 4.90816
+38 2.25 1.39112 5.42857
+39 2.31 1.00926 5.82653
+40 2.37 1.08173 6.27551
+41 2.43 1.16929 6.78571
+42 2.49 0.890896 7.19388
+43 2.55 1.21049 7.77551
+44 2.61 1.25684 8.40816
+45 2.67 0.7942 8.82653
+46 2.73 0.889376 9.31633
+47 2.79 0.922497 9.84694
+48 2.85 1.02008 10.4592
+49 2.91 1.17413 11.1939
+50 2.97 0.829726 11.7347
+102200 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0.906153 0.0102041
+8 0.45 0 0.0102041
+9 0.51 1.06066 0.0306122
+10 0.57 0.424655 0.0408163
+11 0.63 1.39071 0.0816327
+12 0.69 0.869633 0.112245
+13 0.75 2.45376 0.214286
+14 0.81 2.52464 0.336735
+15 0.87 2.55331 0.479592
+16 0.93 0.798069 0.530612
+17 0.99 0.98601 0.602041
+18 1.05 0.751348 0.663265
+19 1.11 0.672336 0.72449
+20 1.17 1.41204 0.867347
+21 1.23 1.46019 1.03061
+22 1.29 0.829715 1.13265
+23 1.35 1.59099 1.34694
+24 1.41 0.833421 1.46939
+25 1.47 0.95848 1.62245
+26 1.53 0.589859 1.72449
+27 1.59 0.983136 1.90816
+28 1.65 1.16654 2.14286
+29 1.71 0.944452 2.34694
+30 1.77 0.925588 2.56122
+31 1.83 1.27823 2.87755
+32 1.89 0.966422 3.13265
+33 1.95 1.08944 3.43878
+34 2.01 1.29881 3.82653
+35 2.07 1.09571 4.17347
+36 2.13 0.913104 4.47959
+37 2.19 1.00772 4.83673
+38 2.25 1.03652 5.22449
+39 2.31 0.905746 5.58163
+40 2.37 1.10632 6.04082
+41 2.43 1.00559 6.47959
+42 2.49 1.20271 7.03061
+43 2.55 1.08307 7.55102
+44 2.61 1.09466 8.10204
+45 2.67 1.06539 8.66327
+46 2.73 1.07466 9.2551
+47 2.79 0.922497 9.78571
+48 2.85 1.10508 10.449
+49 2.91 1.07629 11.1224
+50 2.97 0.970623 11.7551
+102250 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0.906153 0.0102041
+8 0.45 0.680956 0.0204082
+9 0.51 0.530329 0.0306122
+10 0.57 0.424655 0.0408163
+11 0.63 1.73839 0.0918367
+12 0.69 2.02914 0.163265
+13 0.75 2.45376 0.265306
+14 0.81 1.89348 0.357143
+15 0.87 1.45904 0.438776
+16 0.93 1.43652 0.530612
+17 0.99 1.40859 0.632653
+18 1.05 1.75315 0.77551
+19 1.11 0.784392 0.846939
+20 1.17 1.61376 1.0102
+21 1.23 1.36893 1.16327
+22 1.29 1.32754 1.32653
+23 1.35 1.28794 1.5
+24 1.41 1.18068 1.67347
+25 1.47 1.40577 1.89796
+26 1.53 1.12073 2.09184
+27 1.59 0.928517 2.26531
+28 1.65 0.557909 2.37755
+29 1.71 1.13334 2.62245
+30 1.77 0.661135 2.77551
+31 1.83 0.948361 3.0102
+32 1.89 0.850451 3.23469
+33 1.95 1.08944 3.54082
+34 2.01 1.19627 3.89796
+35 2.07 0.966801 4.20408
+36 2.13 1.03485 4.55102
+37 2.19 1.09409 4.93878
+38 2.25 0.845586 5.2551
+39 2.31 1.00926 5.65306
+40 2.37 1.25383 6.17347
+41 2.43 1.19268 6.69388
+42 2.49 0.935441 7.12245
+43 2.55 1.16802 7.68367
+44 2.61 0.932491 8.15306
+45 2.67 0.968536 8.66327
+46 2.73 1.14878 9.29592
+47 2.79 0.887016 9.80612
+48 2.85 1.03708 10.4286
+49 2.91 1.07629 11.102
+50 2.97 0.970623 11.7347
+102300 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0.906153 0.0102041
+8 0.45 2.72382 0.0510204
+9 0.51 1.06066 0.0714286
+10 0.57 0.84931 0.0918367
+11 0.63 1.39071 0.132653
+12 0.69 1.44939 0.183673
+13 0.75 1.47226 0.244898
+14 0.81 2.52464 0.367347
+15 0.87 1.8238 0.469388
+16 0.93 1.91536 0.591837
+17 0.99 1.12687 0.673469
+18 1.05 1.0018 0.755102
+19 1.11 1.12056 0.857143
+20 1.17 1.61376 1.02041
+21 1.23 1.18641 1.15306
+22 1.29 1.07863 1.28571
+23 1.35 0.909136 1.40816
+24 1.41 0.763969 1.52041
+25 1.47 0.95848 1.67347
+26 1.53 1.06175 1.85714
+27 1.59 1.42008 2.12245
+28 1.65 0.811505 2.28571
+29 1.71 1.08612 2.52041
+30 1.77 0.925588 2.73469
+31 1.83 1.11329 3.0102
+32 1.89 0.889108 3.2449
+33 1.95 0.907869 3.5
+34 2.01 1.02538 3.80612
+35 2.07 1.03125 4.13265
+36 2.13 1.12616 4.5102
+37 2.19 0.748591 4.77551
+38 2.25 0.981971 5.14286
+39 2.31 1.0869 5.57143
+40 2.37 1.37675 6.14286
+41 2.43 1.3096 6.71429
+42 2.49 0.846351 7.10204
+43 2.55 0.870703 7.52041
+44 2.61 0.831133 7.93878
+45 2.67 1.31721 8.63265
+46 2.73 0.96349 9.16327
+47 2.79 1.02894 9.7551
+48 2.85 1.03708 10.3776
+49 2.91 0.994753 11
+50 2.97 1.12718 11.7347
+102350 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 0 0
+9 0.51 0.530329 0.0102041
+10 0.57 0.84931 0.0306122
+11 0.63 0 0.0306122
+12 0.69 1.44939 0.0816327
+13 0.75 0.736129 0.112245
+14 0.81 1.05193 0.163265
+15 0.87 1.8238 0.265306
+16 0.93 1.91536 0.387755
+17 0.99 1.12687 0.469388
+18 1.05 1.75315 0.612245
+19 1.11 1.23262 0.72449
+20 1.17 0.504301 0.77551
+21 1.23 0.821359 0.867347
+22 1.29 1.49349 1.05102
+23 1.35 1.13642 1.20408
+24 1.41 1.25013 1.38776
+25 1.47 1.27797 1.59184
+26 1.53 1.12073 1.78571
+27 1.59 1.03775 1.97959
+28 1.65 0.963662 2.17347
+29 1.71 1.41668 2.47959
+30 1.77 0.793362 2.66327
+31 1.83 1.31946 2.9898
+32 1.89 0.927765 3.23469
+33 1.95 1.01681 3.52041
+34 2.01 0.922839 3.79592
+35 2.07 0.902347 4.08163
+36 2.13 0.973977 4.40816
+37 2.19 0.863759 4.71429
+38 2.25 0.90014 5.05102
+39 2.31 0.983381 5.43878
+40 2.37 0.885053 5.80612
+41 2.43 0.912046 6.20408
+42 2.49 1.15816 6.73469
+43 2.55 1.08307 7.2551
+44 2.61 1.09466 7.80612
+45 2.67 0.891053 8.27551
+46 2.73 1.14878 8.90816
+47 2.79 1.13538 9.56122
+48 2.85 0.95207 10.1327
+49 2.91 0.896908 10.6939
+50 2.97 0.876692 11.2653
+102400 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 0.680956 0.0102041
+9 0.51 2.12132 0.0510204
+10 0.57 0.424655 0.0612245
+11 0.63 1.04303 0.0918367
+12 0.69 1.15951 0.132653
+13 0.75 1.96301 0.214286
+14 0.81 1.47271 0.285714
+15 0.87 2.18855 0.408163
+16 0.93 1.59614 0.510204
+17 0.99 1.12687 0.591837
+18 1.05 0.751348 0.653061
+19 1.11 1.12056 0.755102
+20 1.17 0.504301 0.806122
+21 1.23 0.730097 0.887755
+22 1.29 0.663772 0.969388
+23 1.35 1.3637 1.15306
+24 1.41 0.625065 1.2449
+25 1.47 1.21407 1.43878
+26 1.53 0.825803 1.58163
+27 1.59 0.983136 1.76531
+28 1.65 1.11582 1.9898
+29 1.71 0.89723 2.18367
+30 1.77 0.925588 2.39796
+31 1.83 1.36069 2.73469
+32 1.89 1.08239 3.02041
+33 1.95 1.01681 3.30612
+34 2.01 0.991198 3.60204
+35 2.07 1.03125 3.92857
+36 2.13 1.1566 4.31633
+37 2.19 1.23805 4.7551
+38 2.25 0.736478 5.03061
+39 2.31 1.3198 5.55102
+40 2.37 0.860468 5.90816
+41 2.43 1.12252 6.39796
+42 2.49 1.15816 6.92857
+43 2.55 0.976887 7.39796
+44 2.61 1.13521 7.96939
+45 2.67 0.891053 8.43878
+46 2.73 0.889376 8.92857
+47 2.79 0.887016 9.43878
+48 2.85 0.901066 9.97959
+49 2.91 1.02737 10.6224
+50 2.97 1.0489 11.3061
+102450 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 1.88658 0.0102041
+6 0.33 0 0.0102041
+7 0.39 0 0.0102041
+8 0.45 0.680956 0.0204082
+9 0.51 1.06066 0.0408163
+10 0.57 1.27396 0.0714286
+11 0.63 0.695356 0.0918367
+12 0.69 2.31902 0.173469
+13 0.75 0.490753 0.193878
+14 0.81 1.47271 0.265306
+15 0.87 2.00617 0.377551
+16 0.93 1.1173 0.44898
+17 0.99 1.97202 0.591837
+18 1.05 0.876573 0.663265
+19 1.11 0.896448 0.744898
+20 1.17 1.0086 0.846939
+21 1.23 1.00388 0.959184
+22 1.29 0.746744 1.05102
+23 1.35 0.909136 1.17347
+24 1.41 1.18068 1.34694
+25 1.47 1.08628 1.52041
+26 1.53 1.41566 1.76531
+27 1.59 0.928517 1.93878
+28 1.65 1.01438 2.14286
+29 1.71 0.850007 2.32653
+30 1.77 0.661135 2.47959
+31 1.83 0.618496 2.63265
+32 1.89 0.966422 2.88776
+33 1.95 1.19839 3.22449
+34 2.01 0.922839 3.5
+35 2.07 1.12793 3.85714
+36 2.13 1.24791 4.27551
+37 2.19 0.921343 4.60204
+38 2.25 1.11836 5.02041
+39 2.31 1.3198 5.54082
+40 2.37 1.00798 5.95918
+41 2.43 1.02897 6.40816
+42 2.49 1.13589 6.92857
+43 2.55 0.870703 7.34694
+44 2.61 0.932491 7.81633
+45 2.67 1.06539 8.37755
+46 2.73 1.07466 8.96939
+47 2.79 1.0999 9.60204
+48 2.85 0.95207 10.1735
+49 2.91 1.15783 10.898
+50 2.97 0.986279 11.5408
+102500 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0.906153 0.0102041
+8 0.45 0 0.0102041
+9 0.51 0.530329 0.0204082
+10 0.57 0.424655 0.0306122
+11 0.63 0.695356 0.0510204
+12 0.69 1.15951 0.0918367
+13 0.75 0.981505 0.132653
+14 0.81 2.10387 0.234694
+15 0.87 1.09428 0.295918
+16 0.93 1.43652 0.387755
+17 0.99 1.12687 0.469388
+18 1.05 1.37747 0.581633
+19 1.11 1.56878 0.72449
+20 1.17 1.0086 0.826531
+21 1.23 0.821359 0.918367
+22 1.29 1.24457 1.07143
+23 1.35 1.3637 1.2551
+24 1.41 0.972324 1.39796
+25 1.47 0.95848 1.55102
+26 1.53 1.00276 1.72449
+27 1.59 1.09237 1.92857
+28 1.65 0.963662 2.12245
+29 1.71 0.991675 2.33673
+30 1.77 1.01374 2.57143
+31 1.83 1.11329 2.84694
+32 1.89 0.773137 3.05102
+33 1.95 0.83524 3.28571
+34 2.01 0.820302 3.53061
+35 2.07 1.16016 3.89796
+36 2.13 1.03485 4.2449
+37 2.19 1.29564 4.70408
+38 2.25 0.981971 5.07143
+39 2.31 0.905746 5.42857
+40 2.37 1.18007 5.91837
+41 2.43 0.958818 6.33673
+42 2.49 1.0468 6.81633
+43 2.55 1.23173 7.40816
+44 2.61 0.851404 7.83673
+45 2.67 0.813571 8.26531
+46 2.73 0.926433 8.77551
+47 2.79 1.06442 9.38776
+48 2.85 1.02008 10
+49 2.91 0.782756 10.4898
+50 2.97 1.09587 11.2041
+102550 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 0.680956 0.0102041
+9 0.51 0.530329 0.0204082
+10 0.57 0.424655 0.0306122
+11 0.63 1.04303 0.0612245
+12 0.69 2.02914 0.132653
+13 0.75 1.22688 0.183673
+14 0.81 1.68309 0.265306
+15 0.87 1.27666 0.336735
+16 0.93 1.1173 0.408163
+17 0.99 0.845152 0.469388
+18 1.05 0.626123 0.520408
+19 1.11 1.0085 0.612245
+20 1.17 1.21032 0.734694
+21 1.23 1.18641 0.867347
+22 1.29 1.49349 1.05102
+23 1.35 0.454568 1.11224
+24 1.41 0.694517 1.21429
+25 1.47 1.66137 1.47959
+26 1.53 1.06175 1.66327
+27 1.59 1.58394 1.95918
+28 1.65 1.57229 2.27551
+29 1.71 0.802784 2.44898
+30 1.77 1.14597 2.71429
+31 1.83 1.15453 3
+32 1.89 0.927765 3.2449
+33 1.95 1.01681 3.53061
+34 2.01 0.820302 3.77551
+35 2.07 0.805667 4.03061
+36 2.13 1.18703 4.42857
+37 2.19 1.32443 4.89796
+38 2.25 0.954694 5.2551
+39 2.31 1.03514 5.66327
+40 2.37 1.05715 6.10204
+41 2.43 1.09913 6.58163
+42 2.49 1.06908 7.07143
+43 2.55 0.934413 7.52041
+44 2.61 0.831133 7.93878
+45 2.67 1.10413 8.52041
+46 2.73 1.01908 9.08163
+47 2.79 1.04668 9.68367
+48 2.85 0.867064 10.2041
+49 2.91 0.831679 10.7245
+50 2.97 0.798416 11.2449
+102600 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 0.680956 0.0102041
+9 0.51 0 0.0102041
+10 0.57 0 0.0102041
+11 0.63 1.04303 0.0408163
+12 0.69 0.579756 0.0612245
+13 0.75 1.22688 0.112245
+14 0.81 1.89348 0.204082
+15 0.87 1.45904 0.285714
+16 0.93 1.91536 0.408163
+17 0.99 1.40859 0.510204
+18 1.05 0.500899 0.55102
+19 1.11 1.34467 0.673469
+20 1.17 0.907742 0.765306
+21 1.23 1.27767 0.908163
+22 1.29 0.746744 1
+23 1.35 1.06066 1.14286
+24 1.41 1.18068 1.31633
+25 1.47 1.21407 1.5102
+26 1.53 1.29769 1.73469
+27 1.59 1.4747 2.0102
+28 1.65 1.36941 2.28571
+29 1.71 1.13334 2.53061
+30 1.77 0.881513 2.73469
+31 1.83 0.742195 2.91837
+32 1.89 0.927765 3.16327
+33 1.95 0.980499 3.43878
+34 2.01 0.991198 3.73469
+35 2.07 0.966801 4.04082
+36 2.13 0.973977 4.36735
+37 2.19 0.921343 4.69388
+38 2.25 0.818309 5
+39 2.31 0.931624 5.36735
+40 2.37 1.32758 5.91837
+41 2.43 0.88866 6.30612
+42 2.49 1.22498 6.86735
+43 2.55 0.998123 7.34694
+44 2.61 1.13521 7.91837
+45 2.67 0.910424 8.39796
+46 2.73 0.96349 8.92857
+47 2.79 0.869276 9.42857
+48 2.85 1.08808 10.0816
+49 2.91 0.929523 10.6633
+50 2.97 1.14283 11.4082
+102650 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 0 0
+9 0.51 3.18198 0.0612245
+10 0.57 0.84931 0.0816327
+11 0.63 0.695356 0.102041
+12 0.69 1.73927 0.163265
+13 0.75 1.96301 0.244898
+14 0.81 0.841547 0.285714
+15 0.87 0.911898 0.336735
+16 0.93 1.27691 0.418367
+17 0.99 1.6903 0.540816
+18 1.05 1.37747 0.653061
+19 1.11 0.896448 0.734694
+20 1.17 0.907742 0.826531
+21 1.23 1.00388 0.938776
+22 1.29 1.07863 1.07143
+23 1.35 0.530329 1.14286
+24 1.41 1.25013 1.32653
+25 1.47 1.02238 1.4898
+26 1.53 1.29769 1.71429
+27 1.59 1.20161 1.93878
+28 1.65 0.912943 2.12245
+29 1.71 1.32223 2.40816
+30 1.77 1.01374 2.64286
+31 1.83 0.948361 2.87755
+32 1.89 1.19836 3.19388
+33 1.95 0.944184 3.45918
+34 2.01 0.820302 3.70408
+35 2.07 1.09571 4.05102
+36 2.13 0.791356 4.31633
+37 2.19 1.0653 4.69388
+38 2.25 0.90014 5.03061
+39 2.31 0.957503 5.40816
+40 2.37 1.10632 5.86735
+41 2.43 0.841889 6.23469
+42 2.49 0.890896 6.64286
+43 2.55 1.42286 7.32653
+44 2.61 0.770318 7.71429
+45 2.67 1.10413 8.29592
+46 2.73 0.870847 8.77551
+47 2.79 1.06442 9.38776
+48 2.85 0.867064 9.90816
+49 2.91 0.945831 10.5
+50 2.97 1.15849 11.2551
+102700 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 0 0
+9 0.51 2.12132 0.0408163
+10 0.57 0.424655 0.0510204
+11 0.63 2.08607 0.112245
+12 0.69 2.31902 0.193878
+13 0.75 0.981505 0.234694
+14 0.81 1.47271 0.306122
+15 0.87 1.64142 0.397959
+16 0.93 0.638455 0.438776
+17 0.99 1.54944 0.55102
+18 1.05 1.37747 0.663265
+19 1.11 1.12056 0.765306
+20 1.17 0.706021 0.836735
+21 1.23 1.27767 0.979592
+22 1.29 0.995658 1.10204
+23 1.35 1.21218 1.26531
+24 1.41 0.763969 1.37755
+25 1.47 1.08628 1.55102
+26 1.53 1.41566 1.79592
+27 1.59 1.58394 2.09184
+28 1.65 0.963662 2.28571
+29 1.71 1.0389 2.5102
+30 1.77 0.749286 2.68367
+31 1.83 0.948361 2.91837
+32 1.89 1.04374 3.19388
+33 1.95 0.726295 3.39796
+34 2.01 0.957019 3.68367
+35 2.07 1.12793 4.04082
+36 2.13 0.94354 4.35714
+37 2.19 1.09409 4.7449
+38 2.25 1.09108 5.15306
+39 2.31 0.983381 5.54082
+40 2.37 1.20466 6.04082
+41 2.43 1.00559 6.47959
+42 2.49 0.935441 6.90816
+43 2.55 1.06183 7.41837
+44 2.61 0.871676 7.85714
+45 2.67 0.600493 8.17347
+46 2.73 1.35259 8.91837
+47 2.79 1.04668 9.52041
+48 2.85 1.25809 10.2755
+49 2.91 1.07629 10.949
+50 2.97 0.923658 11.551
+102750 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 0.680956 0.0102041
+9 0.51 2.12132 0.0510204
+10 0.57 1.27396 0.0816327
+11 0.63 2.43375 0.153061
+12 0.69 0.869633 0.183673
+13 0.75 1.22688 0.234694
+14 0.81 1.26232 0.295918
+15 0.87 0.547139 0.326531
+16 0.93 1.27691 0.408163
+17 0.99 1.12687 0.489796
+18 1.05 1.5027 0.612245
+19 1.11 1.12056 0.714286
+20 1.17 1.31118 0.846939
+21 1.23 1.18641 0.979592
+22 1.29 1.1616 1.12245
+23 1.35 0.833375 1.23469
+24 1.41 1.11123 1.39796
+25 1.47 1.08628 1.57143
+26 1.53 0.825803 1.71429
+27 1.59 1.14699 1.92857
+28 1.65 1.11582 2.15306
+29 1.71 0.850007 2.33673
+30 1.77 1.58672 2.70408
+31 1.83 0.824661 2.90816
+32 1.89 1.04374 3.18367
+33 1.95 1.12576 3.5
+34 2.01 1.19627 3.85714
+35 2.07 1.28907 4.26531
+36 2.13 1.09572 4.63265
+37 2.19 0.834967 4.92857
+38 2.25 0.681924 5.18367
+39 2.31 1.11277 5.62245
+40 2.37 1.08173 6.07143
+41 2.43 1.02897 6.52041
+42 2.49 1.15816 7.05102
+43 2.55 0.95565 7.5102
+44 2.61 0.973034 8
+45 2.67 0.891053 8.46939
+46 2.73 1.0376 9.04082
+47 2.79 1.06442 9.65306
+48 2.85 1.00307 10.2551
+49 2.91 0.847986 10.7857
+50 2.97 1.20545 11.5714
+102800 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 2.52926 0.0204082
+7 0.39 1.81231 0.0408163
+8 0.45 0 0.0408163
+9 0.51 0.530329 0.0510204
+10 0.57 1.27396 0.0816327
+11 0.63 1.73839 0.132653
+12 0.69 0.869633 0.163265
+13 0.75 2.20839 0.255102
+14 0.81 1.26232 0.316327
+15 0.87 1.45904 0.397959
+16 0.93 0.957682 0.459184
+17 0.99 0.845152 0.520408
+18 1.05 1.25225 0.622449
+19 1.11 1.0085 0.714286
+20 1.17 1.5129 0.867347
+21 1.23 0.638835 0.938776
+22 1.29 1.57646 1.13265
+23 1.35 1.13642 1.28571
+24 1.41 0.555614 1.36735
+25 1.47 0.766784 1.4898
+26 1.53 1.00276 1.66327
+27 1.59 1.31085 1.90816
+28 1.65 1.0651 2.12245
+29 1.71 1.41668 2.42857
+30 1.77 1.71895 2.82653
+31 1.83 1.15453 3.11224
+32 1.89 0.966422 3.36735
+33 1.95 1.2347 3.71429
+34 2.01 1.02538 4.02041
+35 2.07 0.902347 4.30612
+36 2.13 1.09572 4.67347
+37 2.19 1.15168 5.08163
+38 2.25 1.17291 5.52041
+39 2.31 0.879867 5.86735
+40 2.37 0.934223 6.2551
+41 2.43 0.771731 6.59184
+42 2.49 0.890896 7
+43 2.55 1.0406 7.5
+44 2.61 0.912219 7.95918
+45 2.67 0.832941 8.39796
+46 2.73 1.25995 9.09184
+47 2.79 1.17086 9.76531
+48 2.85 0.68005 10.1735
+49 2.91 1.05998 10.8367
+50 2.97 1.06455 11.5306
+102850 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 1.26463 0.0102041
+7 0.39 0.906153 0.0204082
+8 0.45 1.36191 0.0408163
+9 0.51 2.12132 0.0816327
+10 0.57 0.84931 0.102041
+11 0.63 0.695356 0.122449
+12 0.69 0.289878 0.132653
+13 0.75 1.71763 0.204082
+14 0.81 1.68309 0.285714
+15 0.87 1.09428 0.346939
+16 0.93 2.07498 0.479592
+17 0.99 1.97202 0.622449
+18 1.05 0.876573 0.693878
+19 1.11 1.45673 0.826531
+20 1.17 0.907742 0.918367
+21 1.23 1.09515 1.04082
+22 1.29 1.57646 1.23469
+23 1.35 0.909136 1.35714
+24 1.41 0.972324 1.5
+25 1.47 1.40577 1.72449
+26 1.53 0.766817 1.85714
+27 1.59 0.491568 1.94898
+28 1.65 1.0651 2.16327
+29 1.71 1.0389 2.38776
+30 1.77 0.793362 2.57143
+31 1.83 1.11329 2.84694
+32 1.89 0.927765 3.09184
+33 1.95 0.980499 3.36735
+34 2.01 1.26463 3.7449
+35 2.07 1.16016 4.11224
+36 2.13 0.882667 4.40816
+37 2.19 1.03651 4.77551
+38 2.25 0.872863 5.10204
+39 2.31 1.03514 5.5102
+40 2.37 0.983392 5.91837
+41 2.43 0.865274 6.29592
+42 2.49 0.957713 6.73469
+43 2.55 1.18925 7.30612
+44 2.61 0.871676 7.7449
+45 2.67 1.39469 8.47959
+46 2.73 0.83379 8.93878
+47 2.79 1.04668 9.54082
+48 2.85 1.13908 10.2245
+49 2.91 0.896908 10.7857
+50 2.97 0.908003 11.3776
+102900 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 1.26463 0.0102041
+7 0.39 0.906153 0.0204082
+8 0.45 1.36191 0.0408163
+9 0.51 1.06066 0.0612245
+10 0.57 0.424655 0.0714286
+11 0.63 0.695356 0.0918367
+12 0.69 0.869633 0.122449
+13 0.75 0.490753 0.142857
+14 0.81 1.47271 0.214286
+15 0.87 1.45904 0.295918
+16 0.93 1.75575 0.408163
+17 0.99 1.54944 0.520408
+18 1.05 1.62792 0.653061
+19 1.11 1.45673 0.785714
+20 1.17 1.81548 0.969388
+21 1.23 0.821359 1.06122
+22 1.29 1.41052 1.23469
+23 1.35 0.606091 1.31633
+24 1.41 1.11123 1.47959
+25 1.47 0.95848 1.63265
+26 1.53 1.41566 1.87755
+27 1.59 1.09237 2.08163
+28 1.65 1.0651 2.29592
+29 1.71 1.0389 2.52041
+30 1.77 1.23412 2.80612
+31 1.83 1.07206 3.07143
+32 1.89 0.889108 3.30612
+33 1.95 1.05313 3.60204
+34 2.01 1.05956 3.91837
+35 2.07 1.03125 4.2449
+36 2.13 1.00441 4.58163
+37 2.19 0.834967 4.87755
+38 2.25 0.818309 5.18367
+39 2.31 1.0869 5.61224
+40 2.37 1.1309 6.08163
+41 2.43 1.16929 6.59184
+42 2.49 1.13589 7.11224
+43 2.55 0.934413 7.56122
+44 2.61 0.952762 8.04082
+45 2.67 1.08476 8.61224
+46 2.73 0.982019 9.15306
+47 2.79 1.0112 9.73469
+48 2.85 1.00307 10.3367
+49 2.91 1.0926 11.0204
+50 2.97 1.06455 11.7143
+102950 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 0 0
+9 0.51 0.530329 0.0102041
+10 0.57 2.12327 0.0612245
+11 0.63 2.43375 0.132653
+12 0.69 1.15951 0.173469
+13 0.75 1.22688 0.22449
+14 0.81 1.47271 0.295918
+15 0.87 1.8238 0.397959
+16 0.93 1.43652 0.489796
+17 0.99 1.40859 0.591837
+18 1.05 1.37747 0.704082
+19 1.11 0.896448 0.785714
+20 1.17 0.907742 0.877551
+21 1.23 0.547573 0.938776
+22 1.29 1.24457 1.09184
+23 1.35 0.984898 1.22449
+24 1.41 1.38903 1.42857
+25 1.47 0.638987 1.53061
+26 1.53 1.17972 1.73469
+27 1.59 1.03775 1.92857
+28 1.65 1.31869 2.19388
+29 1.71 1.08612 2.42857
+30 1.77 1.10189 2.68367
+31 1.83 1.19576 2.97959
+32 1.89 1.35299 3.33673
+33 1.95 1.19839 3.67347
+34 2.01 0.786122 3.90816
+35 2.07 1.19239 4.28571
+36 2.13 1.21747 4.69388
+37 2.19 1.12289 5.09184
+38 2.25 1.09108 5.5
+39 2.31 0.905746 5.85714
+40 2.37 1.00798 6.27551
+41 2.43 1.09913 6.7551
+42 2.49 0.779534 7.11224
+43 2.55 0.913177 7.55102
+44 2.61 1.15548 8.13265
+45 2.67 0.852312 8.58163
+46 2.73 1.0376 9.15306
+47 2.79 1.08216 9.77551
+48 2.85 1.12208 10.449
+49 2.91 1.01106 11.0816
+50 2.97 1.06455 11.7755
+103000 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 0.680956 0.0102041
+9 0.51 0.530329 0.0204082
+10 0.57 0 0.0204082
+11 0.63 0 0.0204082
+12 0.69 0.869633 0.0510204
+13 0.75 1.71763 0.122449
+14 0.81 2.73503 0.255102
+15 0.87 1.27666 0.326531
+16 0.93 2.07498 0.459184
+17 0.99 0.845152 0.520408
+18 1.05 0.876573 0.591837
+19 1.11 1.45673 0.72449
+20 1.17 1.0086 0.826531
+21 1.23 1.64272 1.0102
+22 1.29 1.49349 1.19388
+23 1.35 0.833375 1.30612
+24 1.41 1.18068 1.47959
+25 1.47 0.95848 1.63265
+26 1.53 1.53363 1.89796
+27 1.59 1.25623 2.13265
+28 1.65 0.912943 2.31633
+29 1.71 1.18057 2.57143
+30 1.77 0.969664 2.79592
+31 1.83 0.989594 3.04082
+32 1.89 1.00508 3.30612
+33 1.95 1.01681 3.59184
+34 2.01 0.991198 3.88776
+35 2.07 1.12793 4.2449
+36 2.13 1.06529 4.60204
+37 2.19 1.29564 5.06122
+38 2.25 0.62737 5.29592
+39 2.31 1.34568 5.82653
+40 2.37 0.958808 6.22449
+41 2.43 0.912046 6.62245
+42 2.49 1.09135 7.12245
+43 2.55 0.95565 7.58163
+44 2.61 1.07439 8.12245
+45 2.67 0.968536 8.63265
+46 2.73 1.11172 9.2449
+47 2.79 1.0999 9.87755
+48 2.85 1.25809 10.6327
+49 2.91 1.04368 11.2857
+50 2.97 0.829726 11.8265
+103050 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 2.71846 0.0306122
+8 0.45 0.680956 0.0408163
+9 0.51 0.530329 0.0510204
+10 0.57 1.69862 0.0918367
+11 0.63 1.73839 0.142857
+12 0.69 2.02914 0.214286
+13 0.75 1.22688 0.265306
+14 0.81 1.68309 0.346939
+15 0.87 0.911898 0.397959
+16 0.93 1.59614 0.5
+17 0.99 1.83116 0.632653
+18 1.05 0.500899 0.673469
+19 1.11 0.784392 0.744898
+20 1.17 1.71462 0.918367
+21 1.23 1.55146 1.09184
+22 1.29 0.746744 1.18367
+23 1.35 1.06066 1.32653
+24 1.41 1.11123 1.4898
+25 1.47 1.08628 1.66327
+26 1.53 1.35668 1.89796
+27 1.59 0.983136 2.08163
+28 1.65 1.11582 2.30612
+29 1.71 1.27501 2.58163
+30 1.77 0.749286 2.7551
+31 1.83 1.07206 3.02041
+32 1.89 1.08239 3.30612
+33 1.95 0.907869 3.56122
+34 2.01 0.991198 3.85714
+35 2.07 0.934574 4.15306
+36 2.13 1.30878 4.59184
+37 2.19 0.662215 4.82653
+38 2.25 0.981971 5.19388
+39 2.31 1.13865 5.64286
+40 2.37 1.18007 6.13265
+41 2.43 0.935432 6.54082
+42 2.49 1.20271 7.09184
+43 2.55 1.06183 7.60204
+44 2.61 1.35819 8.28571
+45 2.67 0.968536 8.79592
+46 2.73 1.29701 9.5102
+47 2.79 0.887016 10.0204
+48 2.85 1.24109 10.7653
+49 2.91 0.913216 11.3367
+50 2.97 0.72014 11.8061
+103100 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 1.26463 0.0102041
+7 0.39 0.906153 0.0204082
+8 0.45 0.680956 0.0306122
+9 0.51 1.06066 0.0510204
+10 0.57 1.27396 0.0816327
+11 0.63 0.695356 0.102041
+12 0.69 1.73927 0.163265
+13 0.75 1.96301 0.244898
+14 0.81 0.841547 0.285714
+15 0.87 1.27666 0.357143
+16 0.93 1.43652 0.44898
+17 0.99 1.12687 0.530612
+18 1.05 1.62792 0.663265
+19 1.11 1.12056 0.765306
+20 1.17 1.0086 0.867347
+21 1.23 0.821359 0.959184
+22 1.29 1.49349 1.14286
+23 1.35 1.21218 1.30612
+24 1.41 1.25013 1.4898
+25 1.47 1.08628 1.66327
+26 1.53 0.707831 1.78571
+27 1.59 0.983136 1.96939
+28 1.65 1.36941 2.2449
+29 1.71 1.0389 2.46939
+30 1.77 1.05782 2.71429
+31 1.83 1.19576 3.0102
+32 1.89 1.27568 3.34694
+33 1.95 1.2347 3.69388
+34 2.01 1.02538 4
+35 2.07 1.32129 4.41837
+36 2.13 0.85223 4.70408
+37 2.19 1.09409 5.09184
+38 2.25 0.981971 5.45918
+39 2.31 0.853989 5.79592
+40 2.37 0.885053 6.16327
+41 2.43 1.26283 6.71429
+42 2.49 1.18044 7.2551
+43 2.55 1.14678 7.80612
+44 2.61 0.851404 8.23469
+45 2.67 0.949166 8.73469
+46 2.73 1.11172 9.34694
+47 2.79 1.02894 9.93878
+48 2.85 1.12208 10.6122
+49 2.91 1.0926 11.2959
+50 2.97 0.970623 11.9286
+103150 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 1.81231 0.0204082
+8 0.45 0 0.0204082
+9 0.51 0.530329 0.0306122
+10 0.57 2.12327 0.0816327
+11 0.63 0 0.0816327
+12 0.69 2.6089 0.173469
+13 0.75 1.96301 0.255102
+14 0.81 2.31425 0.367347
+15 0.87 0.911898 0.418367
+16 0.93 1.91536 0.540816
+17 0.99 1.54944 0.653061
+18 1.05 0.876573 0.72449
+19 1.11 1.45673 0.857143
+20 1.17 0.806882 0.938776
+21 1.23 0.821359 1.03061
+22 1.29 0.497829 1.09184
+23 1.35 0.909136 1.21429
+24 1.41 1.11123 1.37755
+25 1.47 1.15018 1.56122
+26 1.53 1.00276 1.73469
+27 1.59 0.928517 1.90816
+28 1.65 1.31869 2.17347
+29 1.71 1.22779 2.43878
+30 1.77 1.23412 2.72449
+31 1.83 1.03083 2.97959
+32 1.89 1.46896 3.36735
+33 1.95 1.16207 3.69388
+34 2.01 0.751943 3.91837
+35 2.07 1.57911 4.41837
+36 2.13 1.00441 4.7551
+37 2.19 1.15168 5.16327
+38 2.25 0.927417 5.5102
+39 2.31 0.828111 5.83673
+40 2.37 0.811299 6.17347
+41 2.43 1.26283 6.72449
+42 2.49 0.868624 7.12245
+43 2.55 1.12554 7.66327
+44 2.61 0.973034 8.15306
+45 2.67 1.27847 8.82653
+46 2.73 1.09319 9.42857
+47 2.79 0.904757 9.94898
+48 2.85 0.95207 10.5204
+49 2.91 1.19044 11.2653
+50 2.97 0.876692 11.8367
+103200 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 1.36191 0.0204082
+9 0.51 1.59099 0.0510204
+10 0.57 2.12327 0.102041
+11 0.63 2.08607 0.163265
+12 0.69 0.579756 0.183673
+13 0.75 2.20839 0.27551
+14 0.81 1.47271 0.346939
+15 0.87 1.27666 0.418367
+16 0.93 1.43652 0.510204
+17 0.99 1.6903 0.632653
+18 1.05 1.0018 0.714286
+19 1.11 1.12056 0.816327
+20 1.17 0.907742 0.908163
+21 1.23 1.18641 1.04082
+22 1.29 1.82537 1.26531
+23 1.35 1.3637 1.44898
+24 1.41 1.31958 1.64286
+25 1.47 1.21407 1.83673
+26 1.53 1.2387 2.05102
+27 1.59 0.983136 2.23469
+28 1.65 0.912943 2.41837
+29 1.71 1.08612 2.65306
+30 1.77 1.10189 2.90816
+31 1.83 0.700962 3.08163
+32 1.89 1.04374 3.35714
+33 1.95 1.19839 3.69388
+34 2.01 0.786122 3.92857
+35 2.07 1.19239 4.30612
+36 2.13 0.973977 4.63265
+37 2.19 1.12289 5.03061
+38 2.25 1.28202 5.5102
+39 2.31 0.828111 5.83673
+40 2.37 1.15549 6.31633
+41 2.43 1.21606 6.84694
+42 2.49 0.935441 7.27551
+43 2.55 0.998123 7.7551
+44 2.61 1.01358 8.26531
+45 2.67 0.910424 8.7449
+46 2.73 0.83379 9.20408
+47 2.79 1.04668 9.80612
+48 2.85 1.17309 10.5102
+49 2.91 0.962138 11.1122
+50 2.97 1.03324 11.7857
+103250 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 0 0
+9 0.51 0.530329 0.0102041
+10 0.57 1.69862 0.0510204
+11 0.63 2.08607 0.112245
+12 0.69 1.73927 0.173469
+13 0.75 1.96301 0.255102
+14 0.81 1.47271 0.326531
+15 0.87 1.27666 0.397959
+16 0.93 2.23459 0.540816
+17 0.99 1.97202 0.683673
+18 1.05 1.0018 0.765306
+19 1.11 1.23262 0.877551
+20 1.17 0.907742 0.969388
+21 1.23 0.730097 1.05102
+22 1.29 0.995658 1.17347
+23 1.35 0.984898 1.30612
+24 1.41 1.45849 1.52041
+25 1.47 0.95848 1.67347
+26 1.53 1.35668 1.90816
+27 1.59 0.873898 2.07143
+28 1.65 1.42013 2.35714
+29 1.71 0.89723 2.55102
+30 1.77 1.14597 2.81633
+31 1.83 0.948361 3.05102
+32 1.89 1.23702 3.37755
+33 1.95 1.12576 3.69388
+34 2.01 0.957019 3.97959
+35 2.07 0.934574 4.27551
+36 2.13 0.791356 4.54082
+37 2.19 1.12289 4.93878
+38 2.25 1.03652 5.32653
+39 2.31 0.905746 5.68367
+40 2.37 1.03256 6.11224
+41 2.43 1.02897 6.56122
+42 2.49 0.779534 6.91837
+43 2.55 0.849467 7.32653
+44 2.61 1.17575 7.91837
+45 2.67 0.910424 8.39796
+46 2.73 1.14878 9.03061
+47 2.79 1.06442 9.64286
+48 2.85 0.901066 10.1837
+49 2.91 1.04368 10.8367
+50 2.97 1.11152 11.5612
+103300 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 1.26463 0.0102041
+7 0.39 0 0.0102041
+8 0.45 0 0.0102041
+9 0.51 1.59099 0.0408163
+10 0.57 1.69862 0.0816327
+11 0.63 1.04303 0.112245
+12 0.69 0 0.112245
+13 0.75 1.47226 0.173469
+14 0.81 1.05193 0.22449
+15 0.87 1.45904 0.306122
+16 0.93 0.957682 0.367347
+17 0.99 1.40859 0.469388
+18 1.05 1.37747 0.581633
+19 1.11 1.23262 0.693878
+20 1.17 1.41204 0.836735
+21 1.23 1.64272 1.02041
+22 1.29 0.912687 1.13265
+23 1.35 1.13642 1.28571
+24 1.41 1.45849 1.5
+25 1.47 1.02238 1.66327
+26 1.53 0.825803 1.80612
+27 1.59 1.42008 2.07143
+28 1.65 1.0651 2.28571
+29 1.71 0.755562 2.44898
+30 1.77 1.10189 2.70408
+31 1.83 1.03083 2.95918
+32 1.89 1.35299 3.31633
+33 1.95 1.2347 3.66327
+34 2.01 0.957019 3.94898
+35 2.07 0.966801 4.2551
+36 2.13 0.94354 4.57143
+37 2.19 0.950135 4.90816
+38 2.25 1.28202 5.38776
+39 2.31 1.03514 5.79592
+40 2.37 1.10632 6.2551
+41 2.43 1.16929 6.76531
+42 2.49 1.06908 7.2551
+43 2.55 0.998123 7.73469
+44 2.61 0.79059 8.13265
+45 2.67 1.06539 8.69388
+46 2.73 0.907904 9.19388
+47 2.79 1.17086 9.86735
+48 2.85 1.15609 10.5612
+49 2.91 1.05998 11.2245
+50 2.97 0.798416 11.7449
+103350 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 3.77316 0.0204082
+6 0.33 1.26463 0.0306122
+7 0.39 0 0.0306122
+8 0.45 0.680956 0.0408163
+9 0.51 1.06066 0.0612245
+10 0.57 0.424655 0.0714286
+11 0.63 1.39071 0.112245
+12 0.69 0.869633 0.142857
+13 0.75 1.22688 0.193878
+14 0.81 2.31425 0.306122
+15 0.87 1.09428 0.367347
+16 0.93 1.1173 0.438776
+17 0.99 0.98601 0.510204
+18 1.05 0.751348 0.571429
+19 1.11 0.56028 0.622449
+20 1.17 1.0086 0.72449
+21 1.23 0.821359 0.816327
+22 1.29 1.24457 0.969388
+23 1.35 1.28794 1.14286
+24 1.41 1.11123 1.30612
+25 1.47 1.15018 1.4898
+26 1.53 1.35668 1.72449
+27 1.59 1.25623 1.95918
+28 1.65 1.01438 2.16327
+29 1.71 1.22779 2.42857
+30 1.77 1.27819 2.72449
+31 1.83 1.19576 3.02041
+32 1.89 1.04374 3.29592
+33 1.95 1.30733 3.66327
+34 2.01 1.29881 4.05102
+35 2.07 1.03125 4.37755
+36 2.13 0.913104 4.68367
+37 2.19 0.834967 4.97959
+38 2.25 0.872863 5.30612
+39 2.31 1.0869 5.73469
+40 2.37 0.934223 6.12245
+41 2.43 0.818503 6.47959
+42 2.49 0.890896 6.88776
+43 2.55 0.82823 7.28571
+44 2.61 1.09466 7.83673
+45 2.67 1.1235 8.42857
+46 2.73 0.926433 8.93878
+47 2.79 1.08216 9.56122
+48 2.85 0.901066 10.102
+49 2.91 1.05998 10.7653
+50 2.97 1.28373 11.602
+103400 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0.906153 0.0102041
+8 0.45 1.36191 0.0306122
+9 0.51 0.530329 0.0408163
+10 0.57 0.84931 0.0612245
+11 0.63 1.39071 0.102041
+12 0.69 0.289878 0.112245
+13 0.75 0.981505 0.153061
+14 0.81 0.841547 0.193878
+15 0.87 1.45904 0.27551
+16 0.93 1.1173 0.346939
+17 0.99 1.54944 0.459184
+18 1.05 2.0036 0.622449
+19 1.11 0.784392 0.693878
+20 1.17 1.21032 0.816327
+21 1.23 0.638835 0.887755
+22 1.29 0.995658 1.0102
+23 1.35 0.757614 1.11224
+24 1.41 1.45849 1.32653
+25 1.47 1.34187 1.54082
+26 1.53 1.06175 1.72449
+27 1.59 1.03775 1.91837
+28 1.65 1.36941 2.19388
+29 1.71 1.22779 2.45918
+30 1.77 0.793362 2.64286
+31 1.83 0.948361 2.87755
+32 1.89 1.35299 3.23469
+33 1.95 1.05313 3.53061
+34 2.01 1.16209 3.87755
+35 2.07 0.999027 4.19388
+36 2.13 0.85223 4.47959
+37 2.19 1.18047 4.89796
+38 2.25 1.20019 5.34694
+39 2.31 0.879867 5.69388
+40 2.37 1.05715 6.13265
+41 2.43 1.33299 6.71429
+42 2.49 0.957713 7.15306
+43 2.55 0.95565 7.61224
+44 2.61 1.19602 8.21429
+45 2.67 1.08476 8.78571
+46 2.73 0.944962 9.30612
+47 2.79 0.940237 9.84694
+48 2.85 0.935069 10.4082
+49 2.91 0.880601 10.9592
+50 2.97 1.14283 11.7041
+103450 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 1.36191 0.0204082
+9 0.51 1.06066 0.0408163
+10 0.57 1.27396 0.0714286
+11 0.63 1.39071 0.112245
+12 0.69 0.579756 0.132653
+13 0.75 1.47226 0.193878
+14 0.81 0.63116 0.22449
+15 0.87 1.09428 0.285714
+16 0.93 1.1173 0.357143
+17 0.99 0.563434 0.397959
+18 1.05 1.37747 0.510204
+19 1.11 1.45673 0.642857
+20 1.17 1.61376 0.806122
+21 1.23 0.730097 0.887755
+22 1.29 1.49349 1.07143
+23 1.35 1.13642 1.22449
+24 1.41 1.38903 1.42857
+25 1.47 0.95848 1.58163
+26 1.53 1.12073 1.77551
+27 1.59 1.14699 1.9898
+28 1.65 1.0651 2.20408
+29 1.71 1.51112 2.53061
+30 1.77 0.969664 2.7551
+31 1.83 1.23699 3.06122
+32 1.89 1.19836 3.37755
+33 1.95 1.16207 3.70408
+34 2.01 0.717764 3.91837
+35 2.07 0.741214 4.15306
+36 2.13 1.12616 4.53061
+37 2.19 0.748591 4.79592
+38 2.25 0.736478 5.07143
+39 2.31 1.00926 5.46939
+40 2.37 1.00798 5.88776
+41 2.43 0.841889 6.2551
+42 2.49 1.0468 6.73469
+43 2.55 1.14678 7.28571
+44 2.61 1.19602 7.88776
+45 2.67 1.04602 8.43878
+46 2.73 1.01908 9
+47 2.79 1.02894 9.59184
+48 2.85 1.08808 10.2449
+49 2.91 1.05998 10.9082
+50 2.97 1.14283 11.6531
+103500 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 1.26463 0.0102041
+7 0.39 0 0.0102041
+8 0.45 0 0.0102041
+9 0.51 1.06066 0.0306122
+10 0.57 0 0.0306122
+11 0.63 1.04303 0.0612245
+12 0.69 2.6089 0.153061
+13 0.75 0.736129 0.183673
+14 0.81 1.68309 0.265306
+15 0.87 2.00617 0.377551
+16 0.93 1.75575 0.489796
+17 0.99 1.26773 0.581633
+18 1.05 0.876573 0.653061
+19 1.11 1.12056 0.755102
+20 1.17 0.706021 0.826531
+21 1.23 0.821359 0.918367
+22 1.29 0.912687 1.03061
+23 1.35 1.43947 1.22449
+24 1.41 1.31958 1.41837
+25 1.47 1.08628 1.59184
+26 1.53 1.2387 1.80612
+27 1.59 0.81928 1.95918
+28 1.65 1.16654 2.19388
+29 1.71 1.60557 2.54082
+30 1.77 0.881513 2.7449
+31 1.83 1.23699 3.05102
+32 1.89 1.27568 3.38776
+33 1.95 0.544721 3.54082
+34 2.01 0.820302 3.78571
+35 2.07 0.966801 4.09184
+36 2.13 1.09572 4.45918
+37 2.19 1.03651 4.82653
+38 2.25 0.981971 5.19388
+39 2.31 0.853989 5.53061
+40 2.37 1.00798 5.94898
+41 2.43 1.33299 6.53061
+42 2.49 1.18044 7.07143
+43 2.55 1.12554 7.61224
+44 2.61 1.01358 8.12245
+45 2.67 0.813571 8.55102
+46 2.73 1.13025 9.17347
+47 2.79 0.762834 9.61224
+48 2.85 0.765056 10.0714
+49 2.91 1.07629 10.7449
+50 2.97 1.06455 11.4388
+103550 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 0 0
+9 0.51 0.530329 0.0102041
+10 0.57 2.12327 0.0612245
+11 0.63 0.347678 0.0714286
+12 0.69 0.869633 0.102041
+13 0.75 1.47226 0.163265
+14 0.81 1.68309 0.244898
+15 0.87 1.45904 0.326531
+16 0.93 2.55382 0.489796
+17 0.99 0.845152 0.55102
+18 1.05 1.5027 0.673469
+19 1.11 0.784392 0.744898
+20 1.17 1.0086 0.846939
+21 1.23 0.912621 0.94898
+22 1.29 0.829715 1.05102
+23 1.35 1.28794 1.22449
+24 1.41 0.902872 1.35714
+25 1.47 1.08628 1.53061
+26 1.53 0.884789 1.68367
+27 1.59 0.928517 1.85714
+28 1.65 0.811505 2.02041
+29 1.71 1.13334 2.26531
+30 1.77 1.4545 2.60204
+31 1.83 0.865894 2.81633
+32 1.89 1.04374 3.09184
+33 1.95 0.944184 3.35714
+34 2.01 1.26463 3.73469
+35 2.07 1.25684 4.13265
+36 2.13 1.27835 4.56122
+37 2.19 0.921343 4.88776
+38 2.25 1.0638 5.28571
+39 2.31 1.00926 5.68367
+40 2.37 1.18007 6.17347
+41 2.43 0.841889 6.54082
+42 2.49 1.0468 7.02041
+43 2.55 0.95565 7.47959
+44 2.61 1.11493 8.04082
+45 2.67 0.658605 8.38776
+46 2.73 1.31553 9.11224
+47 2.79 1.04668 9.71429
+48 2.85 0.901066 10.2551
+49 2.91 1.02737 10.898
+50 2.97 0.876692 11.4694
+103600 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 1.36191 0.0204082
+9 0.51 0.530329 0.0306122
+10 0.57 1.69862 0.0714286
+11 0.63 0.347678 0.0816327
+12 0.69 1.44939 0.132653
+13 0.75 1.22688 0.183673
+14 0.81 1.89348 0.27551
+15 0.87 2.18855 0.397959
+16 0.93 1.75575 0.510204
+17 0.99 0.422576 0.540816
+18 1.05 0.751348 0.602041
+19 1.11 1.23262 0.714286
+20 1.17 0.706021 0.785714
+21 1.23 1.36893 0.938776
+22 1.29 0.663772 1.02041
+23 1.35 1.06066 1.16327
+24 1.41 1.04178 1.31633
+25 1.47 1.08628 1.4898
+26 1.53 1.41566 1.73469
+27 1.59 0.983136 1.91837
+28 1.65 0.912943 2.10204
+29 1.71 1.18057 2.35714
+30 1.77 0.969664 2.58163
+31 1.83 0.783428 2.77551
+32 1.89 1.19836 3.09184
+33 1.95 0.944184 3.35714
+34 2.01 1.40135 3.77551
+35 2.07 1.09571 4.12245
+36 2.13 0.913104 4.42857
+37 2.19 1.09409 4.81633
+38 2.25 1.20019 5.26531
+39 2.31 0.983381 5.65306
+40 2.37 1.1309 6.12245
+41 2.43 0.982203 6.55102
+42 2.49 1.13589 7.07143
+43 2.55 0.82823 7.46939
+44 2.61 1.09466 8.02041
+45 2.67 0.929795 8.5102
+46 2.73 1.09319 9.11224
+47 2.79 0.887016 9.62245
+48 2.85 1.00307 10.2245
+49 2.91 0.994753 10.8469
+50 2.97 0.876692 11.4184
+103650 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0.906153 0.0102041
+8 0.45 0 0.0102041
+9 0.51 0 0.0102041
+10 0.57 0.84931 0.0306122
+11 0.63 1.04303 0.0612245
+12 0.69 1.44939 0.112245
+13 0.75 1.71763 0.183673
+14 0.81 1.26232 0.244898
+15 0.87 2.55331 0.387755
+16 0.93 1.27691 0.469388
+17 0.99 0.98601 0.540816
+18 1.05 1.12702 0.632653
+19 1.11 1.34467 0.755102
+20 1.17 1.21032 0.877551
+21 1.23 1.55146 1.05102
+22 1.29 0.912687 1.16327
+23 1.35 1.43947 1.35714
+24 1.41 1.18068 1.53061
+25 1.47 0.766784 1.65306
+26 1.53 1.00276 1.82653
+27 1.59 0.983136 2.0102
+28 1.65 1.11582 2.23469
+29 1.71 1.18057 2.4898
+30 1.77 1.01374 2.72449
+31 1.83 0.907127 2.94898
+32 1.89 0.889108 3.18367
+33 1.95 1.2347 3.53061
+34 2.01 0.854481 3.78571
+35 2.07 0.870121 4.06122
+36 2.13 1.21747 4.46939
+37 2.19 1.09409 4.85714
+38 2.25 1.17291 5.29592
+39 2.31 1.26804 5.79592
+40 2.37 1.05715 6.23469
+41 2.43 0.958818 6.65306
+42 2.49 0.846351 7.04082
+43 2.55 1.12554 7.58163
+44 2.61 0.932491 8.05102
+45 2.67 1.02665 8.59184
+46 2.73 0.815261 9.04082
+47 2.79 1.13538 9.69388
+48 2.85 0.833061 10.1939
+49 2.91 1.14152 10.9082
+50 2.97 1.00193 11.5612
+103700 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 1.81231 0.0204082
+8 0.45 0.680956 0.0306122
+9 0.51 0 0.0306122
+10 0.57 0 0.0306122
+11 0.63 1.04303 0.0612245
+12 0.69 0.869633 0.0918367
+13 0.75 1.71763 0.163265
+14 0.81 1.47271 0.234694
+15 0.87 1.27666 0.306122
+16 0.93 1.27691 0.387755
+17 0.99 0.704293 0.438776
+18 1.05 1.25225 0.540816
+19 1.11 1.0085 0.632653
+20 1.17 1.0086 0.734694
+21 1.23 0.730097 0.816327
+22 1.29 0.912687 0.928571
+23 1.35 1.13642 1.08163
+24 1.41 0.972324 1.22449
+25 1.47 1.34187 1.43878
+26 1.53 1.29769 1.66327
+27 1.59 1.36547 1.91837
+28 1.65 0.811505 2.08163
+29 1.71 0.708339 2.23469
+30 1.77 1.10189 2.4898
+31 1.83 1.11329 2.76531
+32 1.89 1.15971 3.07143
+33 1.95 0.689981 3.26531
+34 2.01 1.53807 3.72449
+35 2.07 1.03125 4.05102
+36 2.13 0.973977 4.37755
+37 2.19 1.09409 4.76531
+38 2.25 1.17291 5.20408
+39 2.31 1.21629 5.68367
+40 2.37 0.958808 6.08163
+41 2.43 1.35638 6.67347
+42 2.49 0.935441 7.10204
+43 2.55 0.89194 7.53061
+44 2.61 1.13521 8.10204
+45 2.67 0.987907 8.62245
+46 2.73 0.889376 9.11224
+47 2.79 1.29504 9.85714
+48 2.85 1.17309 10.5612
+49 2.91 0.962138 11.1633
+50 2.97 0.892347 11.7449
+103750 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0.906153 0.0102041
+8 0.45 0.680956 0.0204082
+9 0.51 0 0.0204082
+10 0.57 2.12327 0.0714286
+11 0.63 0.695356 0.0918367
+12 0.69 1.15951 0.132653
+13 0.75 1.47226 0.193878
+14 0.81 1.47271 0.265306
+15 0.87 2.37093 0.397959
+16 0.93 0.957682 0.459184
+17 0.99 1.26773 0.55102
+18 1.05 1.12702 0.642857
+19 1.11 0.672336 0.704082
+20 1.17 1.31118 0.836735
+21 1.23 1.9165 1.05102
+22 1.29 0.912687 1.16327
+23 1.35 1.59099 1.37755
+24 1.41 0.833421 1.5
+25 1.47 0.894581 1.64286
+26 1.53 0.943774 1.80612
+27 1.59 1.25623 2.04082
+28 1.65 0.963662 2.23469
+29 1.71 0.944452 2.43878
+30 1.77 0.881513 2.64286
+31 1.83 0.783428 2.83673
+32 1.89 1.04374 3.11224
+33 1.95 1.12576 3.42857
+34 2.01 0.957019 3.71429
+35 2.07 1.03125 4.04082
+36 2.13 1.00441 4.37755
+37 2.19 1.18047 4.79592
+38 2.25 1.0638 5.19388
+39 2.31 1.00926 5.59184
+40 2.37 1.00798 6.0102
+41 2.43 1.1459 6.5102
+42 2.49 1.00226 6.96939
+43 2.55 1.14678 7.52041
+44 2.61 0.851404 7.94898
+45 2.67 1.02665 8.4898
+46 2.73 0.68556 8.86735
+47 2.79 0.869276 9.36735
+48 2.85 1.05408 10
+49 2.91 0.815371 10.5102
+50 2.97 1.23676 11.3163
+103800 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 0.680956 0.0102041
+9 0.51 0.530329 0.0204082
+10 0.57 0.84931 0.0408163
+11 0.63 1.39071 0.0816327
+12 0.69 0.869633 0.112245
+13 0.75 1.96301 0.193878
+14 0.81 1.68309 0.27551
+15 0.87 1.45904 0.357143
+16 0.93 1.1173 0.428571
+17 0.99 1.12687 0.510204
+18 1.05 1.25225 0.612245
+19 1.11 1.23262 0.72449
+20 1.17 0.907742 0.816327
+21 1.23 1.18641 0.94898
+22 1.29 0.580801 1.02041
+23 1.35 1.66675 1.2449
+24 1.41 1.38903 1.44898
+25 1.47 0.894581 1.59184
+26 1.53 1.29769 1.81633
+27 1.59 0.764661 1.95918
+28 1.65 1.16654 2.19388
+29 1.71 1.08612 2.42857
+30 1.77 0.837437 2.62245
+31 1.83 0.618496 2.77551
+32 1.89 0.927765 3.02041
+33 1.95 1.41628 3.41837
+34 2.01 1.02538 3.72449
+35 2.07 0.870121 4
+36 2.13 1.24791 4.41837
+37 2.19 0.806175 4.70408
+38 2.25 0.872863 5.03061
+39 2.31 1.19041 5.5
+40 2.37 1.05715 5.93878
+41 2.43 1.07575 6.40816
+42 2.49 0.801806 6.77551
+43 2.55 0.82823 7.17347
+44 2.61 1.09466 7.72449
+45 2.67 0.832941 8.16327
+46 2.73 0.870847 8.64286
+47 2.79 1.13538 9.29592
+48 2.85 0.95207 9.86735
+49 2.91 0.994753 10.4898
+50 2.97 0.970623 11.1224
+103850 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 2.72382 0.0408163
+9 0.51 0 0.0408163
+10 0.57 1.27396 0.0714286
+11 0.63 0.347678 0.0816327
+12 0.69 2.31902 0.163265
+13 0.75 1.47226 0.22449
+14 0.81 2.10387 0.326531
+15 0.87 0.729518 0.367347
+16 0.93 1.75575 0.479592
+17 0.99 1.83116 0.612245
+18 1.05 0.876573 0.683673
+19 1.11 1.12056 0.785714
+20 1.17 1.5129 0.938776
+21 1.23 0.730097 1.02041
+22 1.29 0.829715 1.12245
+23 1.35 1.06066 1.26531
+24 1.41 1.04178 1.41837
+25 1.47 1.08628 1.59184
+26 1.53 1.12073 1.78571
+27 1.59 0.81928 1.93878
+28 1.65 1.26798 2.19388
+29 1.71 0.944452 2.39796
+30 1.77 0.793362 2.58163
+31 1.83 1.03083 2.83673
+32 1.89 0.773137 3.04082
+33 1.95 0.980499 3.31633
+34 2.01 1.02538 3.62245
+35 2.07 0.870121 3.89796
+36 2.13 1.40009 4.36735
+37 2.19 0.921343 4.69388
+38 2.25 0.927417 5.04082
+39 2.31 1.13865 5.4898
+40 2.37 0.885053 5.85714
+41 2.43 1.09913 6.33673
+42 2.49 0.690444 6.65306
+43 2.55 0.998123 7.13265
+44 2.61 0.952762 7.61224
+45 2.67 1.20099 8.2449
+46 2.73 1.09319 8.84694
+47 2.79 1.43697 9.67347
+48 2.85 0.81606 10.1633
+49 2.91 1.1089 10.8571
+50 2.97 1.08021 11.5612
+103900 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 0 0
+9 0.51 0 0
+10 0.57 1.69862 0.0408163
+11 0.63 1.39071 0.0816327
+12 0.69 0.869633 0.112245
+13 0.75 0.981505 0.153061
+14 0.81 0.841547 0.193878
+15 0.87 1.45904 0.27551
+16 0.93 2.07498 0.408163
+17 0.99 0.563434 0.44898
+18 1.05 1.25225 0.55102
+19 1.11 1.23262 0.663265
+20 1.17 0.907742 0.755102
+21 1.23 0.912621 0.857143
+22 1.29 1.57646 1.05102
+23 1.35 1.21218 1.21429
+24 1.41 0.763969 1.32653
+25 1.47 0.830683 1.45918
+26 1.53 1.06175 1.64286
+27 1.59 0.81928 1.79592
+28 1.65 1.42013 2.08163
+29 1.71 0.991675 2.29592
+30 1.77 1.4545 2.63265
+31 1.83 0.989594 2.87755
+32 1.89 0.927765 3.12245
+33 1.95 1.01681 3.40816
+34 2.01 1.12791 3.7449
+35 2.07 1.32129 4.16327
+36 2.13 0.85223 4.44898
+37 2.19 1.09409 4.83673
+38 2.25 0.927417 5.18367
+39 2.31 0.983381 5.57143
+40 2.37 1.00798 5.9898
+41 2.43 1.07575 6.45918
+42 2.49 0.957713 6.89796
+43 2.55 1.06183 7.40816
+44 2.61 1.01358 7.91837
+45 2.67 0.871683 8.37755
+46 2.73 0.759675 8.79592
+47 2.79 1.0112 9.37755
+48 2.85 0.765056 9.83673
+49 2.91 1.0926 10.5204
+50 2.97 1.29938 11.3673
+103950 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 1.88658 0.0102041
+6 0.33 0 0.0102041
+7 0.39 0 0.0102041
+8 0.45 0.680956 0.0204082
+9 0.51 0.530329 0.0306122
+10 0.57 0.84931 0.0510204
+11 0.63 0 0.0510204
+12 0.69 0.579756 0.0714286
+13 0.75 2.20839 0.163265
+14 0.81 1.26232 0.22449
+15 0.87 1.64142 0.316327
+16 0.93 1.1173 0.387755
+17 0.99 0.845152 0.44898
+18 1.05 1.62792 0.581633
+19 1.11 1.0085 0.673469
+20 1.17 0.706021 0.744898
+21 1.23 0.638835 0.816327
+22 1.29 1.32754 0.979592
+23 1.35 1.28794 1.15306
+24 1.41 0.833421 1.27551
+25 1.47 1.34187 1.4898
+26 1.53 1.59262 1.76531
+27 1.59 1.03775 1.95918
+28 1.65 1.0651 2.17347
+29 1.71 0.850007 2.35714
+30 1.77 0.925588 2.57143
+31 1.83 1.27823 2.88776
+32 1.89 1.50762 3.28571
+33 1.95 1.16207 3.61224
+34 2.01 0.683585 3.81633
+35 2.07 0.870121 4.09184
+36 2.13 0.85223 4.37755
+37 2.19 1.26685 4.82653
+38 2.25 0.954694 5.18367
+39 2.31 1.06102 5.60204
+40 2.37 0.860468 5.95918
+41 2.43 1.19268 6.47959
+42 2.49 1.11362 6.9898
+43 2.55 0.998123 7.46939
+44 2.61 1.19602 8.07143
+45 2.67 1.00728 8.60204
+46 2.73 0.926433 9.11224
+47 2.79 0.940237 9.65306
+48 2.85 1.00307 10.2551
+49 2.91 0.994753 10.8776
+50 2.97 0.814071 11.4082
+104000 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 3.11031 0.0102041
+5 0.27 0 0.0102041
+6 0.33 0 0.0102041
+7 0.39 0.906153 0.0204082
+8 0.45 0.680956 0.0306122
+9 0.51 0.530329 0.0408163
+10 0.57 0.424655 0.0510204
+11 0.63 1.39071 0.0918367
+12 0.69 1.73927 0.153061
+13 0.75 1.96301 0.234694
+14 0.81 2.73503 0.367347
+15 0.87 1.64142 0.459184
+16 0.93 1.59614 0.561224
+17 0.99 2.11288 0.714286
+18 1.05 1.25225 0.816327
+19 1.11 1.68084 0.969388
+20 1.17 1.0086 1.07143
+21 1.23 1.00388 1.18367
+22 1.29 1.32754 1.34694
+23 1.35 0.530329 1.41837
+24 1.41 1.04178 1.57143
+25 1.47 1.02238 1.73469
+26 1.53 1.29769 1.95918
+27 1.59 1.25623 2.19388
+28 1.65 1.21726 2.43878
+29 1.71 1.0389 2.66327
+30 1.77 1.10189 2.91837
+31 1.83 0.989594 3.16327
+32 1.89 0.889108 3.39796
+33 1.95 1.01681 3.68367
+34 2.01 1.09374 4.0102
+35 2.07 0.966801 4.31633
+36 2.13 1.40009 4.78571
+37 2.19 0.950135 5.12245
+38 2.25 1.11836 5.54082
+39 2.31 0.776354 5.84694
+40 2.37 1.15549 6.32653
+41 2.43 0.958818 6.7449
+42 2.49 0.846351 7.13265
+43 2.55 0.976887 7.60204
+44 2.61 0.891947 8.05102
+45 2.67 0.910424 8.53061
+46 2.73 0.852318 9
+47 2.79 0.922497 9.53061
+48 2.85 1.00307 10.1327
+49 2.91 0.63599 10.5306
+50 2.97 1.1898 11.3061
+104050 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 2.04287 0.0306122
+9 0.51 0 0.0306122
+10 0.57 0.84931 0.0510204
+11 0.63 1.39071 0.0918367
+12 0.69 1.44939 0.142857
+13 0.75 0.736129 0.173469
+14 0.81 1.89348 0.265306
+15 0.87 2.37093 0.397959
+16 0.93 1.59614 0.5
+17 0.99 1.12687 0.581633
+18 1.05 1.87837 0.734694
+19 1.11 1.0085 0.826531
+20 1.17 1.10946 0.938776
+21 1.23 1.09515 1.06122
+22 1.29 0.746744 1.15306
+23 1.35 1.13642 1.30612
+24 1.41 1.66684 1.55102
+25 1.47 1.21407 1.7449
+26 1.53 1.65161 2.03061
+27 1.59 1.14699 2.2449
+28 1.65 0.912943 2.42857
+29 1.71 1.08612 2.66327
+30 1.77 0.925588 2.87755
+31 1.83 1.11329 3.15306
+32 1.89 1.04374 3.42857
+33 1.95 0.798925 3.65306
+34 2.01 1.23045 4.02041
+35 2.07 0.902347 4.30612
+36 2.13 0.913104 4.61224
+37 2.19 0.806175 4.89796
+38 2.25 1.09108 5.30612
+39 2.31 1.03514 5.71429
+40 2.37 1.05715 6.15306
+41 2.43 1.00559 6.59184
+42 2.49 1.09135 7.09184
+43 2.55 0.998123 7.57143
+44 2.61 1.15548 8.15306
+45 2.67 1.04602 8.70408
+46 2.73 0.944962 9.22449
+47 2.79 0.993458 9.79592
+48 2.85 0.969072 10.3776
+49 2.91 0.750142 10.8469
+50 2.97 0.908003 11.4388
+104100 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 1.26463 0.0102041
+7 0.39 0.906153 0.0204082
+8 0.45 0.680956 0.0306122
+9 0.51 1.06066 0.0510204
+10 0.57 0.424655 0.0612245
+11 0.63 2.08607 0.122449
+12 0.69 2.02914 0.193878
+13 0.75 0.981505 0.234694
+14 0.81 2.31425 0.346939
+15 0.87 1.8238 0.44898
+16 0.93 1.59614 0.55102
+17 0.99 1.6903 0.673469
+18 1.05 1.25225 0.77551
+19 1.11 1.23262 0.887755
+20 1.17 0.907742 0.979592
+21 1.23 0.821359 1.07143
+22 1.29 1.1616 1.21429
+23 1.35 1.13642 1.36735
+24 1.41 1.45849 1.58163
+25 1.47 0.638987 1.68367
+26 1.53 1.2387 1.89796
+27 1.59 1.14699 2.11224
+28 1.65 1.16654 2.34694
+29 1.71 1.08612 2.58163
+30 1.77 1.01374 2.81633
+31 1.83 1.07206 3.08163
+32 1.89 1.23702 3.40816
+33 1.95 0.944184 3.67347
+34 2.01 1.02538 3.97959
+35 2.07 0.741214 4.21429
+36 2.13 0.700046 4.44898
+37 2.19 1.12289 4.84694
+38 2.25 1.03652 5.23469
+39 2.31 0.750475 5.53061
+40 2.37 0.934223 5.91837
+41 2.43 0.912046 6.31633
+42 2.49 1.33634 6.92857
+43 2.55 1.01936 7.41837
+44 2.61 1.07439 7.95918
+45 2.67 1.10413 8.54082
+46 2.73 1.0376 9.11224
+47 2.79 0.904757 9.63265
+48 2.85 0.969072 10.2143
+49 2.91 1.0926 10.898
+50 2.97 0.970623 11.5306
+104150 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 1.26463 0.0102041
+7 0.39 0 0.0102041
+8 0.45 1.36191 0.0306122
+9 0.51 0.530329 0.0408163
+10 0.57 0.424655 0.0510204
+11 0.63 1.73839 0.102041
+12 0.69 0.579756 0.122449
+13 0.75 2.45376 0.22449
+14 0.81 1.26232 0.285714
+15 0.87 2.55331 0.428571
+16 0.93 1.43652 0.520408
+17 0.99 0.704293 0.571429
+18 1.05 1.75315 0.714286
+19 1.11 1.34467 0.836735
+20 1.17 0.706021 0.908163
+21 1.23 1.00388 1.02041
+22 1.29 0.746744 1.11224
+23 1.35 0.833375 1.22449
+24 1.41 1.38903 1.42857
+25 1.47 1.40577 1.65306
+26 1.53 0.943774 1.81633
+27 1.59 0.928517 1.9898
+28 1.65 1.21726 2.23469
+29 1.71 1.32223 2.52041
+30 1.77 0.793362 2.70408
+31 1.83 0.907127 2.92857
+32 1.89 0.850451 3.15306
+33 1.95 1.05313 3.44898
+34 2.01 1.16209 3.79592
+35 2.07 1.12793 4.15306
+36 2.13 1.06529 4.5102
+37 2.19 0.921343 4.83673
+38 2.25 1.20019 5.28571
+39 2.31 1.13865 5.73469
+40 2.37 1.00798 6.15306
+41 2.43 0.935432 6.56122
+42 2.49 1.00226 7.02041
+43 2.55 0.998123 7.5
+44 2.61 1.11493 8.06122
+45 2.67 1.16224 8.67347
+46 2.73 1.0376 9.2449
+47 2.79 1.08216 9.86735
+48 2.85 1.15609 10.5612
+49 2.91 0.880601 11.1122
+50 2.97 0.939313 11.7245
+104200 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 1.88658 0.0102041
+6 0.33 0 0.0102041
+7 0.39 0 0.0102041
+8 0.45 0.680956 0.0204082
+9 0.51 1.06066 0.0408163
+10 0.57 0.84931 0.0612245
+11 0.63 0.695356 0.0816327
+12 0.69 1.73927 0.142857
+13 0.75 1.96301 0.22449
+14 0.81 0.841547 0.265306
+15 0.87 2.18855 0.387755
+16 0.93 1.59614 0.489796
+17 0.99 1.26773 0.581633
+18 1.05 1.25225 0.683673
+19 1.11 0.448224 0.72449
+20 1.17 1.41204 0.867347
+21 1.23 1.64272 1.05102
+22 1.29 1.41052 1.22449
+23 1.35 1.3637 1.40816
+24 1.41 1.04178 1.56122
+25 1.47 0.830683 1.69388
+26 1.53 0.943774 1.85714
+27 1.59 1.42008 2.12245
+28 1.65 0.608628 2.2449
+29 1.71 1.36946 2.54082
+30 1.77 0.969664 2.76531
+31 1.83 1.15453 3.05102
+32 1.89 0.850451 3.27551
+33 1.95 0.944184 3.54082
+34 2.01 0.991198 3.83673
+35 2.07 1.03125 4.16327
+36 2.13 1.27835 4.59184
+37 2.19 1.09409 4.97959
+38 2.25 0.927417 5.32653
+39 2.31 1.21629 5.80612
+40 2.37 0.885053 6.17347
+41 2.43 0.982203 6.60204
+42 2.49 0.935441 7.03061
+43 2.55 0.95565 7.4898
+44 2.61 0.952762 7.96939
+45 2.67 0.987907 8.4898
+46 2.73 0.870847 8.96939
+47 2.79 1.06442 9.58163
+48 2.85 1.05408 10.2143
+49 2.91 0.815371 10.7245
+50 2.97 0.923658 11.3265
+104250 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 1.36191 0.0204082
+9 0.51 2.12132 0.0612245
+10 0.57 2.12327 0.112245
+11 0.63 1.04303 0.142857
+12 0.69 1.73927 0.204082
+13 0.75 1.71763 0.27551
+14 0.81 1.05193 0.326531
+15 0.87 1.27666 0.397959
+16 0.93 2.55382 0.561224
+17 0.99 1.12687 0.642857
+18 1.05 0.876573 0.714286
+19 1.11 1.68084 0.867347
+20 1.17 1.5129 1.02041
+21 1.23 1.27767 1.16327
+22 1.29 1.07863 1.29592
+23 1.35 0.909136 1.41837
+24 1.41 1.38903 1.62245
+25 1.47 1.40577 1.84694
+26 1.53 0.884789 2
+27 1.59 1.14699 2.21429
+28 1.65 1.42013 2.5
+29 1.71 0.802784 2.67347
+30 1.77 0.837437 2.86735
+31 1.83 0.742195 3.05102
+32 1.89 1.00508 3.31633
+33 1.95 0.871554 3.56122
+34 2.01 1.05956 3.87755
+35 2.07 1.22461 4.26531
+36 2.13 1.03485 4.61224
+37 2.19 0.806175 4.89796
+38 2.25 0.981971 5.26531
+39 2.31 0.905746 5.62245
+40 2.37 1.00798 6.04082
+41 2.43 0.818503 6.39796
+42 2.49 0.979986 6.84694
+43 2.55 1.01936 7.33673
+44 2.61 1.03385 7.85714
+45 2.67 0.871683 8.31633
+46 2.73 0.96349 8.84694
+47 2.79 0.993458 9.41837
+48 2.85 0.850063 9.92857
+49 2.91 0.994753 10.551
+50 2.97 0.939313 11.1633
+104300 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0.906153 0.0102041
+8 0.45 0 0.0102041
+9 0.51 0.530329 0.0204082
+10 0.57 0.424655 0.0306122
+11 0.63 1.04303 0.0612245
+12 0.69 2.02914 0.132653
+13 0.75 1.22688 0.183673
+14 0.81 2.52464 0.306122
+15 0.87 2.55331 0.44898
+16 0.93 1.43652 0.540816
+17 0.99 0.98601 0.612245
+18 1.05 1.0018 0.693878
+19 1.11 0.784392 0.765306
+20 1.17 1.0086 0.867347
+21 1.23 1.36893 1.02041
+22 1.29 0.995658 1.14286
+23 1.35 1.43947 1.33673
+24 1.41 1.11123 1.5
+25 1.47 0.830683 1.63265
+26 1.53 0.648845 1.7449
+27 1.59 0.983136 1.92857
+28 1.65 0.963662 2.12245
+29 1.71 0.661116 2.26531
+30 1.77 1.05782 2.5102
+31 1.83 0.783428 2.70408
+32 1.89 1.15971 3.0102
+33 1.95 1.30733 3.37755
+34 2.01 1.23045 3.7449
+35 2.07 1.03125 4.07143
+36 2.13 1.21747 4.47959
+37 2.19 0.978927 4.82653
+38 2.25 0.927417 5.17347
+39 2.31 1.00926 5.57143
+40 2.37 0.835884 5.91837
+41 2.43 1.02897 6.36735
+42 2.49 1.0468 6.84694
+43 2.55 0.934413 7.29592
+44 2.61 0.851404 7.72449
+45 2.67 1.23973 8.37755
+46 2.73 0.907904 8.87755
+47 2.79 0.887016 9.38776
+48 2.85 0.935069 9.94898
+49 2.91 0.994753 10.5714
+50 2.97 0.861037 11.1327
+104350 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 0.680956 0.0102041
+9 0.51 1.59099 0.0408163
+10 0.57 0.424655 0.0510204
+11 0.63 2.08607 0.112245
+12 0.69 1.44939 0.163265
+13 0.75 1.96301 0.244898
+14 0.81 1.89348 0.336735
+15 0.87 1.09428 0.397959
+16 0.93 1.1173 0.469388
+17 0.99 1.40859 0.571429
+18 1.05 0.876573 0.642857
+19 1.11 1.0085 0.734694
+20 1.17 1.0086 0.836735
+21 1.23 1.00388 0.94898
+22 1.29 1.1616 1.09184
+23 1.35 1.13642 1.2449
+24 1.41 0.555614 1.32653
+25 1.47 1.34187 1.54082
+26 1.53 1.2387 1.7551
+27 1.59 1.20161 1.97959
+28 1.65 1.11582 2.20408
+29 1.71 1.27501 2.47959
+30 1.77 0.881513 2.68367
+31 1.83 0.824661 2.88776
+32 1.89 1.15971 3.19388
+33 1.95 0.653666 3.37755
+34 2.01 1.19627 3.73469
+35 2.07 0.644534 3.93878
+36 2.13 1.36966 4.39796
+37 2.19 0.604631 4.61224
+38 2.25 1.14563 5.04082
+39 2.31 1.11277 5.47959
+40 2.37 0.885053 5.84694
+41 2.43 1.16929 6.35714
+42 2.49 1.00226 6.81633
+43 2.55 0.913177 7.2551
+44 2.61 0.993305 7.7551
+45 2.67 0.929795 8.2449
+46 2.73 1.11172 8.85714
+47 2.79 1.04668 9.45918
+48 2.85 0.969072 10.0408
+49 2.91 0.929523 10.6224
+50 2.97 0.908003 11.2143
+104400 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0.906153 0.0102041
+8 0.45 1.36191 0.0306122
+9 0.51 1.06066 0.0510204
+10 0.57 0.424655 0.0612245
+11 0.63 0.695356 0.0816327
+12 0.69 1.44939 0.132653
+13 0.75 1.47226 0.193878
+14 0.81 2.31425 0.306122
+15 0.87 0.364759 0.326531
+16 0.93 1.43652 0.418367
+17 0.99 0.845152 0.479592
+18 1.05 1.37747 0.591837
+19 1.11 1.45673 0.72449
+20 1.17 1.31118 0.857143
+21 1.23 1.09515 0.979592
+22 1.29 1.1616 1.12245
+23 1.35 1.3637 1.30612
+24 1.41 1.11123 1.46939
+25 1.47 0.894581 1.61224
+26 1.53 0.825803 1.7551
+27 1.59 1.20161 1.97959
+28 1.65 1.21726 2.22449
+29 1.71 1.55835 2.56122
+30 1.77 1.14597 2.82653
+31 1.83 1.07206 3.09184
+32 1.89 0.889108 3.32653
+33 1.95 0.980499 3.60204
+34 2.01 1.12791 3.93878
+35 2.07 1.28907 4.34694
+36 2.13 1.03485 4.69388
+37 2.19 1.32443 5.16327
+38 2.25 1.17291 5.60204
+39 2.31 0.931624 5.96939
+40 2.37 0.860468 6.32653
+41 2.43 0.841889 6.69388
+42 2.49 0.890896 7.10204
+43 2.55 1.0406 7.60204
+44 2.61 0.709504 7.95918
+45 2.67 0.7942 8.37755
+46 2.73 1.01908 8.93878
+47 2.79 1.0999 9.57143
+48 2.85 0.731054 10.0102
+49 2.91 1.05998 10.6735
+50 2.97 1.12718 11.4082
+104450 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 1.26463 0.0102041
+7 0.39 0 0.0102041
+8 0.45 0 0.0102041
+9 0.51 2.12132 0.0510204
+10 0.57 0.84931 0.0714286
+11 0.63 1.04303 0.102041
+12 0.69 1.44939 0.153061
+13 0.75 1.22688 0.204082
+14 0.81 1.05193 0.255102
+15 0.87 1.27666 0.326531
+16 0.93 1.27691 0.408163
+17 0.99 1.54944 0.520408
+18 1.05 1.37747 0.632653
+19 1.11 0.784392 0.704082
+20 1.17 1.10946 0.816327
+21 1.23 0.912621 0.918367
+22 1.29 1.24457 1.07143
+23 1.35 0.984898 1.20408
+24 1.41 1.11123 1.36735
+25 1.47 0.702885 1.47959
+26 1.53 1.29769 1.70408
+27 1.59 1.14699 1.91837
+28 1.65 1.36941 2.19388
+29 1.71 1.18057 2.44898
+30 1.77 1.01374 2.68367
+31 1.83 1.48439 3.05102
+32 1.89 1.31433 3.39796
+33 1.95 0.907869 3.65306
+34 2.01 1.33299 4.05102
+35 2.07 1.12793 4.40816
+36 2.13 1.24791 4.82653
+37 2.19 0.777383 5.10204
+38 2.25 0.981971 5.46939
+39 2.31 0.905746 5.82653
+40 2.37 0.934223 6.21429
+41 2.43 0.912046 6.61224
+42 2.49 1.33634 7.22449
+43 2.55 0.785757 7.60204
+44 2.61 0.810861 8.0102
+45 2.67 0.987907 8.53061
+46 2.73 0.815261 8.97959
+47 2.79 0.940237 9.52041
+48 2.85 1.03708 10.1429
+49 2.91 1.15783 10.8673
+50 2.97 1.11152 11.5918
+104500 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 1.26463 0.0102041
+7 0.39 0 0.0102041
+8 0.45 0.680956 0.0204082
+9 0.51 1.06066 0.0408163
+10 0.57 0.84931 0.0612245
+11 0.63 1.39071 0.102041
+12 0.69 1.44939 0.153061
+13 0.75 1.96301 0.234694
+14 0.81 0.63116 0.265306
+15 0.87 1.09428 0.326531
+16 0.93 2.23459 0.469388
+17 0.99 1.40859 0.571429
+18 1.05 1.25225 0.673469
+19 1.11 1.45673 0.806122
+20 1.17 1.10946 0.918367
+21 1.23 0.821359 1.0102
+22 1.29 1.32754 1.17347
+23 1.35 1.21218 1.33673
+24 1.41 1.45849 1.55102
+25 1.47 0.702885 1.66327
+26 1.53 1.12073 1.85714
+27 1.59 0.710042 1.9898
+28 1.65 1.0651 2.20408
+29 1.71 1.27501 2.47959
+30 1.77 0.837437 2.67347
+31 1.83 0.948361 2.90816
+32 1.89 0.966422 3.16327
+33 1.95 0.689981 3.35714
+34 2.01 1.16209 3.70408
+35 2.07 1.12793 4.06122
+36 2.13 1.21747 4.46939
+37 2.19 1.03651 4.83673
+38 2.25 1.20019 5.28571
+39 2.31 0.983381 5.67347
+40 2.37 1.10632 6.13265
+41 2.43 1.02897 6.58163
+42 2.49 1.02453 7.05102
+43 2.55 0.934413 7.5
+44 2.61 1.09466 8.05102
+45 2.67 0.7942 8.46939
+46 2.73 1.20436 9.13265
+47 2.79 0.869276 9.63265
+48 2.85 1.03708 10.2551
+49 2.91 0.945831 10.8469
+50 2.97 1.12718 11.5816
+104550 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 0 0
+9 0.51 1.06066 0.0204082
+10 0.57 0.424655 0.0306122
+11 0.63 0.695356 0.0510204
+12 0.69 1.15951 0.0918367
+13 0.75 0.981505 0.132653
+14 0.81 1.05193 0.183673
+15 0.87 1.27666 0.255102
+16 0.93 1.75575 0.367347
+17 0.99 1.26773 0.459184
+18 1.05 1.62792 0.591837
+19 1.11 1.56878 0.734694
+20 1.17 1.10946 0.846939
+21 1.23 1.00388 0.959184
+22 1.29 0.912687 1.07143
+23 1.35 1.13642 1.22449
+24 1.41 1.66684 1.46939
+25 1.47 1.02238 1.63265
+26 1.53 1.47465 1.88776
+27 1.59 1.4747 2.16327
+28 1.65 0.811505 2.32653
+29 1.71 1.36946 2.62245
+30 1.77 0.837437 2.81633
+31 1.83 0.948361 3.05102
+32 1.89 1.19836 3.36735
+33 1.95 0.871554 3.61224
+34 2.01 1.33299 4.0102
+35 2.07 1.16016 4.37755
+36 2.13 1.00441 4.71429
+37 2.19 0.921343 5.04082
+38 2.25 1.0638 5.43878
+39 2.31 1.13865 5.88776
+40 2.37 0.934223 6.27551
+41 2.43 1.23945 6.81633
+42 2.49 1.24725 7.38776
+43 2.55 1.14678 7.93878
+44 2.61 0.973034 8.42857
+45 2.67 0.949166 8.92857
+46 2.73 0.815261 9.37755
+47 2.79 1.13538 10.0306
+48 2.85 0.969072 10.6122
+49 2.91 0.994753 11.2347
+50 2.97 1.06455 11.9286
+104600 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 0 0
+9 0.51 0.530329 0.0102041
+10 0.57 1.27396 0.0408163
+11 0.63 1.73839 0.0918367
+12 0.69 0.869633 0.122449
+13 0.75 1.22688 0.173469
+14 0.81 1.47271 0.244898
+15 0.87 1.45904 0.326531
+16 0.93 1.59614 0.428571
+17 0.99 1.12687 0.510204
+18 1.05 1.0018 0.591837
+19 1.11 1.7929 0.755102
+20 1.17 0.706021 0.826531
+21 1.23 1.55146 1
+22 1.29 0.912687 1.11224
+23 1.35 0.984898 1.2449
+24 1.41 1.11123 1.40816
+25 1.47 1.08628 1.58163
+26 1.53 1.2387 1.79592
+27 1.59 1.14699 2.0102
+28 1.65 1.8766 2.38776
+29 1.71 0.89723 2.58163
+30 1.77 1.01374 2.81633
+31 1.83 1.07206 3.08163
+32 1.89 1.31433 3.42857
+33 1.95 1.45259 3.83673
+34 2.01 0.922839 4.11224
+35 2.07 1.09571 4.45918
+36 2.13 0.85223 4.7449
+37 2.19 1.12289 5.14286
+38 2.25 1.17291 5.58163
+39 2.31 1.03514 5.9898
+40 2.37 1.08173 6.43878
+41 2.43 1.1459 6.93878
+42 2.49 1.31407 7.54082
+43 2.55 1.08307 8.06122
+44 2.61 1.05412 8.59184
+45 2.67 0.891053 9.06122
+46 2.73 1.25995 9.7551
+47 2.79 0.745094 10.1837
+48 2.85 0.969072 10.7653
+49 2.91 1.01106 11.398
+50 2.97 0.782761 11.9082
+104650 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 1.36191 0.0204082
+9 0.51 0.530329 0.0306122
+10 0.57 0.84931 0.0510204
+11 0.63 0.695356 0.0714286
+12 0.69 1.44939 0.122449
+13 0.75 2.20839 0.214286
+14 0.81 1.26232 0.27551
+15 0.87 2.18855 0.397959
+16 0.93 0.798069 0.44898
+17 0.99 0.98601 0.520408
+18 1.05 1.25225 0.622449
+19 1.11 1.12056 0.72449
+20 1.17 1.31118 0.857143
+21 1.23 1.09515 0.979592
+22 1.29 0.912687 1.09184
+23 1.35 1.74251 1.32653
+24 1.41 1.73629 1.58163
+25 1.47 1.53357 1.82653
+26 1.53 0.589859 1.92857
+27 1.59 0.983136 2.11224
+28 1.65 1.11582 2.33673
+29 1.71 1.18057 2.59184
+30 1.77 1.01374 2.82653
+31 1.83 1.48439 3.19388
+32 1.89 0.889108 3.42857
+33 1.95 0.980499 3.70408
+34 2.01 1.46971 4.14286
+35 2.07 1.12793 4.5
+36 2.13 1.00441 4.83673
+37 2.19 1.23805 5.27551
+38 2.25 1.47296 5.82653
+39 2.31 1.47507 6.40816
+40 2.37 1.25383 6.92857
+41 2.43 0.912046 7.32653
+42 2.49 0.846351 7.71429
+43 2.55 1.01936 8.20408
+44 2.61 0.851404 8.63265
+45 2.67 1.00728 9.16327
+46 2.73 1.09319 9.76531
+47 2.79 1.04668 10.3673
+48 2.85 1.19009 11.0816
+49 2.91 0.717527 11.5306
+50 2.97 1.0489 12.2143
+104700 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0.906153 0.0102041
+8 0.45 2.04287 0.0408163
+9 0.51 1.06066 0.0612245
+10 0.57 1.27396 0.0918367
+11 0.63 3.47678 0.193878
+12 0.69 1.15951 0.234694
+13 0.75 1.47226 0.295918
+14 0.81 0.63116 0.326531
+15 0.87 0.729518 0.367347
+16 0.93 0.798069 0.418367
+17 0.99 0.98601 0.489796
+18 1.05 1.5027 0.612245
+19 1.11 1.34467 0.734694
+20 1.17 1.31118 0.867347
+21 1.23 1.27767 1.0102
+22 1.29 1.24457 1.16327
+23 1.35 0.833375 1.27551
+24 1.41 0.833421 1.39796
+25 1.47 1.46967 1.63265
+26 1.53 1.29769 1.85714
+27 1.59 1.36547 2.11224
+28 1.65 0.862224 2.28571
+29 1.71 1.08612 2.52041
+30 1.77 1.10189 2.77551
+31 1.83 0.948361 3.0102
+32 1.89 1.31433 3.35714
+33 1.95 0.907869 3.61224
+34 2.01 1.40135 4.03061
+35 2.07 1.35352 4.45918
+36 2.13 0.730483 4.70408
+37 2.19 1.35322 5.18367
+38 2.25 1.11836 5.60204
+39 2.31 1.24217 6.09184
+40 2.37 0.958808 6.4898
+41 2.43 1.09913 6.96939
+42 2.49 1.0468 7.44898
+43 2.55 1.25296 8.05102
+44 2.61 1.09466 8.60204
+45 2.67 1.29784 9.28571
+46 2.73 1.33406 10.0204
+47 2.79 1.08216 10.6429
+48 2.85 0.969072 11.2245
+49 2.91 1.04368 11.8776
+50 2.97 1.12718 12.6122
+104750 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 1.36191 0.0204082
+9 0.51 0.530329 0.0306122
+10 0.57 1.69862 0.0714286
+11 0.63 0.695356 0.0918367
+12 0.69 1.73927 0.153061
+13 0.75 1.47226 0.214286
+14 0.81 2.52464 0.336735
+15 0.87 1.45904 0.418367
+16 0.93 0.798069 0.469388
+17 0.99 1.54944 0.581633
+18 1.05 1.25225 0.683673
+19 1.11 0.672336 0.744898
+20 1.17 1.31118 0.877551
+21 1.23 0.547573 0.938776
+22 1.29 1.07863 1.07143
+23 1.35 1.43947 1.26531
+24 1.41 0.972324 1.40816
+25 1.47 1.27797 1.61224
+26 1.53 1.29769 1.83673
+27 1.59 0.983136 2.02041
+28 1.65 1.77517 2.37755
+29 1.71 1.18057 2.63265
+30 1.77 0.881513 2.83673
+31 1.83 0.783428 3.03061
+32 1.89 1.12105 3.32653
+33 1.95 1.16207 3.65306
+34 2.01 1.02538 3.95918
+35 2.07 1.19239 4.33673
+36 2.13 1.21747 4.7449
+37 2.19 0.921343 5.07143
+38 2.25 1.22746 5.53061
+39 2.31 1.06102 5.94898
+40 2.37 0.934223 6.33673
+41 2.43 1.37976 6.93878
+42 2.49 1.09135 7.43878
+43 2.55 1.42286 8.12245
+44 2.61 0.993305 8.62245
+45 2.67 0.774829 9.03061
+46 2.73 0.982019 9.57143
+47 2.79 1.13538 10.2245
+48 2.85 1.15609 10.9184
+49 2.91 0.962138 11.5204
+50 2.97 0.845382 12.0714
+104800 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 0 0
+9 0.51 1.06066 0.0204082
+10 0.57 0.424655 0.0306122
+11 0.63 2.08607 0.0918367
+12 0.69 1.44939 0.142857
+13 0.75 1.22688 0.193878
+14 0.81 0.841547 0.234694
+15 0.87 1.64142 0.326531
+16 0.93 1.59614 0.428571
+17 0.99 2.11288 0.581633
+18 1.05 0.876573 0.653061
+19 1.11 1.0085 0.744898
+20 1.17 0.907742 0.836735
+21 1.23 1.18641 0.969388
+22 1.29 1.32754 1.13265
+23 1.35 1.51523 1.33673
+24 1.41 1.31958 1.53061
+25 1.47 0.894581 1.67347
+26 1.53 0.943774 1.83673
+27 1.59 1.25623 2.07143
+28 1.65 1.47085 2.36735
+29 1.71 1.0389 2.59184
+30 1.77 1.27819 2.88776
+31 1.83 1.36069 3.22449
+32 1.89 1.35299 3.58163
+33 1.95 0.944184 3.84694
+34 2.01 1.05956 4.16327
+35 2.07 0.999027 4.47959
+36 2.13 1.00441 4.81633
+37 2.19 1.03651 5.18367
+38 2.25 1.00925 5.56122
+39 2.31 0.828111 5.88776
+40 2.37 1.00798 6.30612
+41 2.43 1.00559 6.7449
+42 2.49 1.13589 7.26531
+43 2.55 1.2742 7.87755
+44 2.61 1.07439 8.41837
+45 2.67 0.929795 8.90816
+46 2.73 0.83379 9.36735
+47 2.79 0.993458 9.93878
+48 2.85 0.901066 10.4796
+49 2.91 1.05998 11.1429
+50 2.97 1.03324 11.8163
+104850 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 0 0
+9 0.51 1.59099 0.0306122
+10 0.57 0.424655 0.0408163
+11 0.63 2.08607 0.102041
+12 0.69 2.02914 0.173469
+13 0.75 1.22688 0.22449
+14 0.81 2.31425 0.336735
+15 0.87 0.547139 0.367347
+16 0.93 1.75575 0.479592
+17 0.99 0.98601 0.55102
+18 1.05 1.12702 0.642857
+19 1.11 2.12906 0.836735
+20 1.17 1.91634 1.03061
+21 1.23 1.27767 1.17347
+22 1.29 1.1616 1.31633
+23 1.35 1.59099 1.53061
+24 1.41 0.972324 1.67347
+25 1.47 0.95848 1.82653
+26 1.53 1.2387 2.04082
+27 1.59 1.20161 2.26531
+28 1.65 1.42013 2.55102
+29 1.71 1.13334 2.79592
+30 1.77 1.49857 3.14286
+31 1.83 1.44316 3.5
+32 1.89 0.811794 3.71429
+33 1.95 0.798925 3.93878
+34 2.01 1.19627 4.29592
+35 2.07 1.25684 4.69388
+36 2.13 1.03485 5.04082
+37 2.19 0.719799 5.29592
+38 2.25 0.927417 5.64286
+39 2.31 0.931624 6.0102
+40 2.37 1.10632 6.46939
+41 2.43 0.748345 6.79592
+42 2.49 0.801806 7.16327
+43 2.55 0.998123 7.64286
+44 2.61 0.993305 8.14286
+45 2.67 0.949166 8.64286
+46 2.73 1.07466 9.23469
+47 2.79 1.0999 9.86735
+48 2.85 1.13908 10.551
+49 2.91 1.05998 11.2143
+50 2.97 1.06455 11.9082
+104900 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0.906153 0.0102041
+8 0.45 0.680956 0.0204082
+9 0.51 0 0.0204082
+10 0.57 1.69862 0.0612245
+11 0.63 2.78143 0.142857
+12 0.69 1.15951 0.183673
+13 0.75 1.47226 0.244898
+14 0.81 1.89348 0.336735
+15 0.87 1.64142 0.428571
+16 0.93 1.43652 0.520408
+17 0.99 1.54944 0.632653
+18 1.05 1.75315 0.77551
+19 1.11 1.34467 0.897959
+20 1.17 1.21032 1.02041
+21 1.23 1.18641 1.15306
+22 1.29 0.746744 1.2449
+23 1.35 1.43947 1.43878
+24 1.41 1.18068 1.61224
+25 1.47 0.830683 1.7449
+26 1.53 1.29769 1.96939
+27 1.59 0.983136 2.15306
+28 1.65 1.21726 2.39796
+29 1.71 0.944452 2.60204
+30 1.77 1.14597 2.86735
+31 1.83 1.07206 3.13265
+32 1.89 0.850451 3.35714
+33 1.95 0.798925 3.58163
+34 2.01 1.16209 3.92857
+35 2.07 0.77344 4.17347
+36 2.13 1.09572 4.54082
+37 2.19 1.0653 4.91837
+38 2.25 0.872863 5.2449
+39 2.31 1.06102 5.66327
+40 2.37 0.983392 6.07143
+41 2.43 0.795117 6.41837
+42 2.49 0.935441 6.84694
+43 2.55 1.14678 7.39796
+44 2.61 1.05412 7.92857
+45 2.67 1.33658 8.63265
+46 2.73 0.926433 9.14286
+47 2.79 0.975718 9.70408
+48 2.85 0.935069 10.2653
+49 2.91 0.929523 10.8469
+50 2.97 1.03324 11.5204
+104950 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 1.26463 0.0102041
+7 0.39 0.906153 0.0204082
+8 0.45 0.680956 0.0306122
+9 0.51 0.530329 0.0408163
+10 0.57 1.69862 0.0816327
+11 0.63 3.1291 0.173469
+12 0.69 2.02914 0.244898
+13 0.75 1.71763 0.316327
+14 0.81 1.47271 0.387755
+15 0.87 1.27666 0.459184
+16 0.93 1.1173 0.530612
+17 0.99 1.6903 0.653061
+18 1.05 1.37747 0.765306
+19 1.11 1.56878 0.908163
+20 1.17 0.806882 0.989796
+21 1.23 1.09515 1.11224
+22 1.29 0.580801 1.18367
+23 1.35 0.757614 1.28571
+24 1.41 0.833421 1.40816
+25 1.47 0.894581 1.55102
+26 1.53 1.47465 1.80612
+27 1.59 0.873898 1.96939
+28 1.65 0.760786 2.12245
+29 1.71 1.08612 2.35714
+30 1.77 0.749286 2.53061
+31 1.83 1.07206 2.79592
+32 1.89 1.23702 3.12245
+33 1.95 1.16207 3.44898
+34 2.01 1.12791 3.78571
+35 2.07 1.16016 4.15306
+36 2.13 0.76092 4.40816
+37 2.19 0.978927 4.7551
+38 2.25 1.33657 5.2551
+39 2.31 1.19041 5.72449
+40 2.37 1.08173 6.17347
+41 2.43 0.982203 6.60204
+42 2.49 1.0468 7.08163
+43 2.55 1.10431 7.61224
+44 2.61 0.912219 8.07143
+45 2.67 0.871683 8.53061
+46 2.73 1.09319 9.13265
+47 2.79 0.993458 9.70408
+48 2.85 0.884065 10.2347
+49 2.91 0.978445 10.8469
+50 2.97 1.22111 11.6429
+105000 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0.906153 0.0102041
+8 0.45 0 0.0102041
+9 0.51 1.06066 0.0306122
+10 0.57 2.12327 0.0816327
+11 0.63 0.695356 0.102041
+12 0.69 0.579756 0.122449
+13 0.75 0.981505 0.163265
+14 0.81 1.26232 0.22449
+15 0.87 1.45904 0.306122
+16 0.93 1.91536 0.428571
+17 0.99 1.40859 0.530612
+18 1.05 1.62792 0.663265
+19 1.11 1.34467 0.785714
+20 1.17 1.21032 0.908163
+21 1.23 1.73398 1.10204
+22 1.29 1.82537 1.32653
+23 1.35 1.13642 1.47959
+24 1.41 1.04178 1.63265
+25 1.47 0.575088 1.72449
+26 1.53 1.06175 1.90816
+27 1.59 1.09237 2.11224
+28 1.65 1.01438 2.31633
+29 1.71 0.708339 2.46939
+30 1.77 1.23412 2.7551
+31 1.83 1.11329 3.03061
+32 1.89 1.12105 3.32653
+33 1.95 1.45259 3.73469
+34 2.01 0.854481 3.9898
+35 2.07 0.902347 4.27551
+36 2.13 0.94354 4.59184
+37 2.19 1.00772 4.94898
+38 2.25 0.62737 5.18367
+39 2.31 0.957503 5.56122
+40 2.37 0.983392 5.96939
+41 2.43 0.912046 6.36735
+42 2.49 1.0468 6.84694
+43 2.55 0.95565 7.30612
+44 2.61 1.09466 7.85714
+45 2.67 1.00728 8.38776
+46 2.73 1.00055 8.93878
+47 2.79 0.975718 9.5
+48 2.85 1.15609 10.1939
+49 2.91 1.07629 10.8673
+50 2.97 1.09587 11.5816
+105050 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 2.04287 0.0306122
+9 0.51 0 0.0306122
+10 0.57 0.424655 0.0408163
+11 0.63 1.39071 0.0816327
+12 0.69 1.44939 0.132653
+13 0.75 1.22688 0.183673
+14 0.81 1.89348 0.27551
+15 0.87 0.547139 0.306122
+16 0.93 1.91536 0.428571
+17 0.99 0.845152 0.489796
+18 1.05 1.12702 0.581633
+19 1.11 2.01701 0.765306
+20 1.17 1.5129 0.918367
+21 1.23 1.18641 1.05102
+22 1.29 1.07863 1.18367
+23 1.35 1.43947 1.37755
+24 1.41 1.45849 1.59184
+25 1.47 1.02238 1.7551
+26 1.53 0.884789 1.90816
+27 1.59 1.36547 2.16327
+28 1.65 1.11582 2.38776
+29 1.71 1.0389 2.61224
+30 1.77 1.32227 2.91837
+31 1.83 1.36069 3.2551
+32 1.89 1.00508 3.52041
+33 1.95 0.907869 3.77551
+34 2.01 1.23045 4.14286
+35 2.07 0.966801 4.44898
+36 2.13 0.913104 4.7551
+37 2.19 1.09409 5.14286
+38 2.25 0.872863 5.46939
+39 2.31 1.06102 5.88776
+40 2.37 1.1309 6.35714
+41 2.43 0.678188 6.65306
+42 2.49 1.18044 7.19388
+43 2.55 1.0406 7.69388
+44 2.61 0.912219 8.15306
+45 2.67 0.987907 8.67347
+46 2.73 1.20436 9.33673
+47 2.79 1.1886 10.0204
+48 2.85 0.81606 10.5102
+49 2.91 0.766449 10.9898
+50 2.97 1.0489 11.6735
+105100 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 0.680956 0.0102041
+9 0.51 0 0.0102041
+10 0.57 0.84931 0.0306122
+11 0.63 1.73839 0.0816327
+12 0.69 1.15951 0.122449
+13 0.75 1.22688 0.173469
+14 0.81 2.10387 0.27551
+15 0.87 2.18855 0.397959
+16 0.93 1.27691 0.479592
+17 0.99 1.40859 0.581633
+18 1.05 1.0018 0.663265
+19 1.11 1.12056 0.765306
+20 1.17 1.61376 0.928571
+21 1.23 0.638835 1
+22 1.29 1.24457 1.15306
+23 1.35 1.21218 1.31633
+24 1.41 0.833421 1.43878
+25 1.47 1.40577 1.66327
+26 1.53 1.00276 1.83673
+27 1.59 1.20161 2.06122
+28 1.65 1.21726 2.30612
+29 1.71 1.41668 2.61224
+30 1.77 0.969664 2.83673
+31 1.83 1.15453 3.12245
+32 1.89 1.23702 3.44898
+33 1.95 0.76261 3.66327
+34 2.01 1.16209 4.0102
+35 2.07 1.06348 4.34694
+36 2.13 0.913104 4.65306
+37 2.19 1.09409 5.04082
+38 2.25 0.981971 5.40816
+39 2.31 1.06102 5.82653
+40 2.37 0.958808 6.22449
+41 2.43 1.28622 6.78571
+42 2.49 0.979986 7.23469
+43 2.55 1.10431 7.76531
+44 2.61 1.07439 8.30612
+45 2.67 1.00728 8.83673
+46 2.73 0.889376 9.32653
+47 2.79 1.04668 9.92857
+48 2.85 0.782058 10.398
+49 2.91 0.978445 11.0102
+50 2.97 1.01759 11.6735
+105150 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 1.88658 0.0102041
+6 0.33 0 0.0102041
+7 0.39 0 0.0102041
+8 0.45 0 0.0102041
+9 0.51 0.530329 0.0204082
+10 0.57 1.27396 0.0510204
+11 0.63 1.73839 0.102041
+12 0.69 0.289878 0.112245
+13 0.75 1.96301 0.193878
+14 0.81 0.841547 0.234694
+15 0.87 1.09428 0.295918
+16 0.93 1.43652 0.387755
+17 0.99 1.40859 0.489796
+18 1.05 1.5027 0.612245
+19 1.11 1.0085 0.704082
+20 1.17 1.21032 0.826531
+21 1.23 1.46019 0.989796
+22 1.29 0.995658 1.11224
+23 1.35 0.909136 1.23469
+24 1.41 1.04178 1.38776
+25 1.47 1.02238 1.55102
+26 1.53 0.766817 1.68367
+27 1.59 0.873898 1.84694
+28 1.65 0.862224 2.02041
+29 1.71 1.0389 2.2449
+30 1.77 1.19004 2.52041
+31 1.83 1.11329 2.79592
+32 1.89 1.15971 3.10204
+33 1.95 0.980499 3.37755
+34 2.01 1.33299 3.77551
+35 2.07 0.870121 4.05102
+36 2.13 1.1566 4.43878
+37 2.19 1.15168 4.84694
+38 2.25 0.845586 5.16327
+39 2.31 1.11277 5.60204
+40 2.37 1.03256 6.03061
+41 2.43 1.02897 6.47959
+42 2.49 0.913168 6.89796
+43 2.55 1.14678 7.44898
+44 2.61 1.25684 8.08163
+45 2.67 0.968536 8.59184
+46 2.73 1.18583 9.2449
+47 2.79 0.922497 9.77551
+48 2.85 0.986073 10.3673
+49 2.91 1.14152 11.0816
+50 2.97 0.970623 11.7143
+105200 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 0 0
+9 0.51 1.59099 0.0306122
+10 0.57 0.84931 0.0510204
+11 0.63 1.04303 0.0816327
+12 0.69 2.31902 0.163265
+13 0.75 0.981505 0.204082
+14 0.81 1.05193 0.255102
+15 0.87 2.00617 0.367347
+16 0.93 1.59614 0.469388
+17 0.99 0.98601 0.540816
+18 1.05 1.62792 0.673469
+19 1.11 0.672336 0.734694
+20 1.17 1.0086 0.836735
+21 1.23 0.821359 0.928571
+22 1.29 0.912687 1.04082
+23 1.35 1.43947 1.23469
+24 1.41 1.11123 1.39796
+25 1.47 1.46967 1.63265
+26 1.53 0.648845 1.7449
+27 1.59 1.03775 1.93878
+28 1.65 1.36941 2.21429
+29 1.71 1.13334 2.45918
+30 1.77 0.70521 2.62245
+31 1.83 0.989594 2.86735
+32 1.89 0.966422 3.12245
+33 1.95 1.45259 3.53061
+34 2.01 0.922839 3.80612
+35 2.07 1.22461 4.19388
+36 2.13 0.791356 4.45918
+37 2.19 1.09409 4.84694
+38 2.25 1.22746 5.30612
+39 2.31 0.828111 5.63265
+40 2.37 0.983392 6.04082
+41 2.43 0.958818 6.45918
+42 2.49 0.779534 6.81633
+43 2.55 0.95565 7.27551
+44 2.61 1.07439 7.81633
+45 2.67 1.02665 8.35714
+46 2.73 1.24142 9.04082
+47 2.79 1.06442 9.65306
+48 2.85 0.765056 10.1122
+49 2.91 1.05998 10.7755
+50 2.97 0.892347 11.3571
+105250 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0.906153 0.0102041
+8 0.45 0.680956 0.0204082
+9 0.51 0.530329 0.0306122
+10 0.57 1.27396 0.0612245
+11 0.63 1.73839 0.112245
+12 0.69 1.44939 0.163265
+13 0.75 1.71763 0.234694
+14 0.81 1.26232 0.295918
+15 0.87 2.18855 0.418367
+16 0.93 1.1173 0.489796
+17 0.99 0.98601 0.561224
+18 1.05 1.37747 0.673469
+19 1.11 0.56028 0.72449
+20 1.17 1.0086 0.826531
+21 1.23 1.36893 0.979592
+22 1.29 0.995658 1.10204
+23 1.35 1.74251 1.33673
+24 1.41 0.833421 1.45918
+25 1.47 1.46967 1.69388
+26 1.53 1.17972 1.89796
+27 1.59 0.983136 2.08163
+28 1.65 1.01438 2.28571
+29 1.71 1.08612 2.52041
+30 1.77 1.23412 2.80612
+31 1.83 0.783428 3
+32 1.89 0.850451 3.22449
+33 1.95 1.30733 3.59184
+34 2.01 0.683585 3.79592
+35 2.07 1.28907 4.20408
+36 2.13 1.00441 4.54082
+37 2.19 1.0653 4.91837
+38 2.25 0.763755 5.20408
+39 2.31 1.13865 5.65306
+40 2.37 0.934223 6.04082
+41 2.43 1.00559 6.47959
+42 2.49 1.31407 7.08163
+43 2.55 1.14678 7.63265
+44 2.61 0.973034 8.12245
+45 2.67 0.929795 8.61224
+46 2.73 0.83379 9.07143
+47 2.79 0.816055 9.54082
+48 2.85 0.867064 10.0612
+49 2.91 0.994753 10.6837
+50 2.97 1.25242 11.5
+105300 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 1.26463 0.0102041
+7 0.39 0 0.0102041
+8 0.45 0.680956 0.0204082
+9 0.51 3.18198 0.0816327
+10 0.57 0.424655 0.0918367
+11 0.63 1.04303 0.122449
+12 0.69 0.869633 0.153061
+13 0.75 1.22688 0.204082
+14 0.81 1.26232 0.265306
+15 0.87 1.45904 0.346939
+16 0.93 1.27691 0.428571
+17 0.99 0.845152 0.489796
+18 1.05 1.62792 0.622449
+19 1.11 1.12056 0.72449
+20 1.17 1.10946 0.836735
+21 1.23 0.45631 0.887755
+22 1.29 1.32754 1.05102
+23 1.35 1.3637 1.23469
+24 1.41 0.694517 1.33673
+25 1.47 1.27797 1.54082
+26 1.53 1.00276 1.71429
+27 1.59 1.25623 1.94898
+28 1.65 1.0651 2.16327
+29 1.71 1.13334 2.40816
+30 1.77 0.837437 2.60204
+31 1.83 0.824661 2.80612
+32 1.89 0.966422 3.06122
+33 1.95 1.30733 3.42857
+34 2.01 0.820302 3.67347
+35 2.07 1.19239 4.05102
+36 2.13 1.21747 4.45918
+37 2.19 1.12289 4.85714
+38 2.25 1.09108 5.26531
+39 2.31 0.853989 5.60204
+40 2.37 1.08173 6.05102
+41 2.43 0.771731 6.38776
+42 2.49 0.913168 6.80612
+43 2.55 0.976887 7.27551
+44 2.61 1.01358 7.78571
+45 2.67 1.10413 8.36735
+46 2.73 1.13025 8.9898
+47 2.79 1.04668 9.59184
+48 2.85 0.884065 10.1224
+49 2.91 1.05998 10.7857
+50 2.97 1.11152 11.5102
+105350 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 1.88658 0.0102041
+6 0.33 0 0.0102041
+7 0.39 0.906153 0.0204082
+8 0.45 0.680956 0.0306122
+9 0.51 1.59099 0.0612245
+10 0.57 0.424655 0.0714286
+11 0.63 0 0.0714286
+12 0.69 0.869633 0.102041
+13 0.75 2.20839 0.193878
+14 0.81 1.89348 0.285714
+15 0.87 0.911898 0.336735
+16 0.93 0.798069 0.387755
+17 0.99 1.26773 0.479592
+18 1.05 1.25225 0.581633
+19 1.11 1.56878 0.72449
+20 1.17 1.5129 0.877551
+21 1.23 1.00388 0.989796
+22 1.29 0.995658 1.11224
+23 1.35 0.833375 1.22449
+24 1.41 1.18068 1.39796
+25 1.47 1.27797 1.60204
+26 1.53 0.884789 1.7551
+27 1.59 1.09237 1.95918
+28 1.65 0.760786 2.11224
+29 1.71 0.944452 2.31633
+30 1.77 1.32227 2.62245
+31 1.83 0.700962 2.79592
+32 1.89 1.58493 3.21429
+33 1.95 1.16207 3.54082
+34 2.01 1.36717 3.94898
+35 2.07 0.934574 4.2449
+36 2.13 0.973977 4.57143
+37 2.19 1.20926 5
+38 2.25 0.981971 5.36735
+39 2.31 0.957503 5.7449
+40 2.37 1.20466 6.2449
+41 2.43 0.865274 6.62245
+42 2.49 0.913168 7.04082
+43 2.55 1.01936 7.53061
+44 2.61 0.993305 8.03061
+45 2.67 1.00728 8.56122
+46 2.73 0.759675 8.97959
+47 2.79 0.833795 9.45918
+48 2.85 1.00307 10.0612
+49 2.91 1.19044 10.8061
+50 2.97 0.986279 11.449
+105400 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 0 0
+9 0.51 1.06066 0.0204082
+10 0.57 2.12327 0.0714286
+11 0.63 0.695356 0.0918367
+12 0.69 3.18866 0.204082
+13 0.75 0.981505 0.244898
+14 0.81 0.841547 0.285714
+15 0.87 1.27666 0.357143
+16 0.93 0.638455 0.397959
+17 0.99 1.26773 0.489796
+18 1.05 1.62792 0.622449
+19 1.11 1.34467 0.744898
+20 1.17 0.605161 0.806122
+21 1.23 0.912621 0.908163
+22 1.29 0.829715 1.0102
+23 1.35 1.59099 1.22449
+24 1.41 0.833421 1.34694
+25 1.47 1.02238 1.5102
+26 1.53 1.29769 1.73469
+27 1.59 1.20161 1.95918
+28 1.65 1.21726 2.20408
+29 1.71 1.13334 2.44898
+30 1.77 1.14597 2.71429
+31 1.83 1.56686 3.10204
+32 1.89 0.966422 3.35714
+33 1.95 0.798925 3.58163
+34 2.01 1.29881 3.96939
+35 2.07 0.805667 4.22449
+36 2.13 1.00441 4.56122
+37 2.19 0.921343 4.88776
+38 2.25 0.954694 5.2449
+39 2.31 0.983381 5.63265
+40 2.37 0.885053 6
+41 2.43 0.865274 6.37755
+42 2.49 0.935441 6.80612
+43 2.55 1.06183 7.31633
+44 2.61 0.871676 7.7551
+45 2.67 1.00728 8.28571
+46 2.73 0.759675 8.70408
+47 2.79 1.06442 9.31633
+48 2.85 1.17309 10.0204
+49 2.91 1.02737 10.6633
+50 2.97 1.03324 11.3367
+105450 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 1.26463 0.0102041
+7 0.39 0.906153 0.0204082
+8 0.45 0.680956 0.0306122
+9 0.51 0.530329 0.0408163
+10 0.57 0.84931 0.0612245
+11 0.63 0.347678 0.0714286
+12 0.69 0.869633 0.102041
+13 0.75 1.96301 0.183673
+14 0.81 1.47271 0.255102
+15 0.87 0.729518 0.295918
+16 0.93 1.1173 0.367347
+17 0.99 1.54944 0.479592
+18 1.05 1.5027 0.602041
+19 1.11 0.784392 0.673469
+20 1.17 1.21032 0.795918
+21 1.23 1.55146 0.969388
+22 1.29 0.995658 1.09184
+23 1.35 0.454568 1.15306
+24 1.41 0.902872 1.28571
+25 1.47 1.40577 1.5102
+26 1.53 1.06175 1.69388
+27 1.59 1.25623 1.92857
+28 1.65 1.21726 2.17347
+29 1.71 0.850007 2.35714
+30 1.77 1.54265 2.71429
+31 1.83 1.07206 2.97959
+32 1.89 1.4303 3.35714
+33 1.95 0.689981 3.55102
+34 2.01 1.16209 3.89796
+35 2.07 1.38575 4.33673
+36 2.13 0.973977 4.66327
+37 2.19 0.806175 4.94898
+38 2.25 1.22746 5.40816
+39 2.31 1.42332 5.96939
+40 2.37 1.00798 6.38776
+41 2.43 0.865274 6.76531
+42 2.49 0.979986 7.21429
+43 2.55 0.95565 7.67347
+44 2.61 0.932491 8.14286
+45 2.67 1.00728 8.67347
+46 2.73 1.13025 9.29592
+47 2.79 0.904757 9.81633
+48 2.85 0.901066 10.3571
+49 2.91 1.01106 10.9898
+50 2.97 1.1898 11.7653
+105500 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 2.52926 0.0204082
+7 0.39 0.906153 0.0306122
+8 0.45 0.680956 0.0408163
+9 0.51 1.59099 0.0714286
+10 0.57 2.12327 0.122449
+11 0.63 1.39071 0.163265
+12 0.69 1.15951 0.204082
+13 0.75 1.71763 0.27551
+14 0.81 1.26232 0.336735
+15 0.87 1.8238 0.438776
+16 0.93 1.43652 0.530612
+17 0.99 1.97202 0.673469
+18 1.05 1.12702 0.765306
+19 1.11 1.34467 0.887755
+20 1.17 1.41204 1.03061
+21 1.23 1.09515 1.15306
+22 1.29 1.65943 1.35714
+23 1.35 1.21218 1.52041
+24 1.41 0.833421 1.64286
+25 1.47 1.08628 1.81633
+26 1.53 1.17972 2.02041
+27 1.59 1.31085 2.26531
+28 1.65 1.0651 2.47959
+29 1.71 0.850007 2.66327
+30 1.77 0.749286 2.83673
+31 1.83 0.989594 3.08163
+32 1.89 0.850451 3.30612
+33 1.95 0.907869 3.56122
+34 2.01 1.26463 3.93878
+35 2.07 1.16016 4.30612
+36 2.13 1.1566 4.69388
+37 2.19 0.892551 5.0102
+38 2.25 1.0638 5.40816
+39 2.31 0.67284 5.67347
+40 2.37 1.15549 6.15306
+41 2.43 0.88866 6.54082
+42 2.49 1.31407 7.14286
+43 2.55 0.934413 7.59184
+44 2.61 1.11493 8.15306
+45 2.67 1.33658 8.85714
+46 2.73 0.907904 9.35714
+47 2.79 1.0112 9.93878
+48 2.85 0.935069 10.5
+49 2.91 1.1089 11.1939
+50 2.97 1.0489 11.8776
+105550 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 1.88658 0.0102041
+6 0.33 0 0.0102041
+7 0.39 0 0.0102041
+8 0.45 0 0.0102041
+9 0.51 1.06066 0.0306122
+10 0.57 0.84931 0.0510204
+11 0.63 2.08607 0.112245
+12 0.69 0 0.112245
+13 0.75 0.981505 0.153061
+14 0.81 1.26232 0.214286
+15 0.87 1.64142 0.306122
+16 0.93 1.27691 0.387755
+17 0.99 0.98601 0.459184
+18 1.05 1.75315 0.602041
+19 1.11 1.12056 0.704082
+20 1.17 1.21032 0.826531
+21 1.23 1.18641 0.959184
+22 1.29 1.07863 1.09184
+23 1.35 0.606091 1.17347
+24 1.41 1.38903 1.37755
+25 1.47 1.34187 1.59184
+26 1.53 1.47465 1.84694
+27 1.59 1.03775 2.04082
+28 1.65 1.31869 2.30612
+29 1.71 1.32223 2.59184
+30 1.77 0.793362 2.77551
+31 1.83 1.11329 3.05102
+32 1.89 1.23702 3.37755
+33 1.95 1.30733 3.7449
+34 2.01 0.991198 4.04082
+35 2.07 1.12793 4.39796
+36 2.13 1.27835 4.82653
+37 2.19 0.806175 5.11224
+38 2.25 0.954694 5.46939
+39 2.31 0.983381 5.85714
+40 2.37 1.1309 6.32653
+41 2.43 1.1459 6.82653
+42 2.49 1.33634 7.43878
+43 2.55 1.08307 7.95918
+44 2.61 0.912219 8.41837
+45 2.67 0.891053 8.88776
+46 2.73 1.11172 9.5
+47 2.79 0.922497 10.0306
+48 2.85 0.765056 10.4898
+49 2.91 0.896908 11.051
+50 2.97 1.12718 11.7857
+105600 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0.906153 0.0102041
+8 0.45 2.04287 0.0408163
+9 0.51 0.530329 0.0510204
+10 0.57 0 0.0510204
+11 0.63 1.73839 0.102041
+12 0.69 1.44939 0.153061
+13 0.75 1.22688 0.204082
+14 0.81 1.26232 0.265306
+15 0.87 0.911898 0.316327
+16 0.93 1.59614 0.418367
+17 0.99 1.6903 0.540816
+18 1.05 1.0018 0.622449
+19 1.11 1.90495 0.795918
+20 1.17 0.706021 0.867347
+21 1.23 1.27767 1.0102
+22 1.29 0.746744 1.10204
+23 1.35 1.59099 1.31633
+24 1.41 0.902872 1.44898
+25 1.47 1.40577 1.67347
+26 1.53 1.2387 1.88776
+27 1.59 1.25623 2.12245
+28 1.65 1.11582 2.34694
+29 1.71 1.08612 2.58163
+30 1.77 1.01374 2.81633
+31 1.83 0.948361 3.05102
+32 1.89 1.04374 3.32653
+33 1.95 0.980499 3.60204
+34 2.01 0.991198 3.89796
+35 2.07 1.41797 4.34694
+36 2.13 0.85223 4.63265
+37 2.19 1.32443 5.10204
+38 2.25 0.981971 5.46939
+39 2.31 0.802232 5.78571
+40 2.37 0.786714 6.11224
+41 2.43 1.12252 6.60204
+42 2.49 0.868624 7
+43 2.55 1.14678 7.55102
+44 2.61 1.11493 8.11224
+45 2.67 0.832941 8.55102
+46 2.73 1.13025 9.17347
+47 2.79 0.993458 9.7449
+48 2.85 1.10508 10.4082
+49 2.91 1.0926 11.0918
+50 2.97 0.923658 11.6939
+105650 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 1.88658 0.0102041
+6 0.33 0 0.0102041
+7 0.39 0.906153 0.0204082
+8 0.45 0 0.0204082
+9 0.51 2.12132 0.0612245
+10 0.57 1.27396 0.0918367
+11 0.63 1.39071 0.132653
+12 0.69 1.44939 0.183673
+13 0.75 2.20839 0.27551
+14 0.81 1.26232 0.336735
+15 0.87 0.911898 0.387755
+16 0.93 1.43652 0.479592
+17 0.99 2.11288 0.632653
+18 1.05 2.0036 0.795918
+19 1.11 1.23262 0.908163
+20 1.17 0.605161 0.969388
+21 1.23 1.00388 1.08163
+22 1.29 0.580801 1.15306
+23 1.35 1.43947 1.34694
+24 1.41 1.11123 1.5102
+25 1.47 1.15018 1.69388
+26 1.53 1.35668 1.92857
+27 1.59 0.600805 2.04082
+28 1.65 1.11582 2.26531
+29 1.71 0.755562 2.42857
+30 1.77 1.01374 2.66327
+31 1.83 0.907127 2.88776
+32 1.89 1.04374 3.16327
+33 1.95 0.76261 3.37755
+34 2.01 1.02538 3.68367
+35 2.07 0.999027 4
+36 2.13 1.03485 4.34694
+37 2.19 0.834967 4.64286
+38 2.25 1.25474 5.11224
+39 2.31 1.00926 5.5102
+40 2.37 1.18007 6
+41 2.43 1.09913 6.47959
+42 2.49 0.890896 6.88776
+43 2.55 0.998123 7.36735
+44 2.61 1.09466 7.91837
+45 2.67 1.10413 8.5
+46 2.73 0.926433 9.0102
+47 2.79 1.11764 9.65306
+48 2.85 1.19009 10.3673
+49 2.91 1.14152 11.0816
+50 2.97 1.00193 11.7347
+105700 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 2.04287 0.0306122
+9 0.51 1.06066 0.0510204
+10 0.57 0.424655 0.0612245
+11 0.63 2.43375 0.132653
+12 0.69 0.289878 0.142857
+13 0.75 0.981505 0.183673
+14 0.81 1.26232 0.244898
+15 0.87 2.73569 0.397959
+16 0.93 1.75575 0.510204
+17 0.99 1.54944 0.622449
+18 1.05 1.25225 0.72449
+19 1.11 0.672336 0.785714
+20 1.17 2.11806 1
+21 1.23 1.00388 1.11224
+22 1.29 0.663772 1.19388
+23 1.35 0.909136 1.31633
+24 1.41 0.972324 1.45918
+25 1.47 1.72526 1.73469
+26 1.53 1.2387 1.94898
+27 1.59 1.25623 2.18367
+28 1.65 0.963662 2.37755
+29 1.71 1.18057 2.63265
+30 1.77 1.10189 2.88776
+31 1.83 0.907127 3.11224
+32 1.89 1.15971 3.41837
+33 1.95 0.726295 3.62245
+34 2.01 0.854481 3.87755
+35 2.07 1.12793 4.23469
+36 2.13 0.913104 4.54082
+37 2.19 1.46839 5.06122
+38 2.25 1.33657 5.56122
+39 2.31 0.724597 5.84694
+40 2.37 1.05715 6.28571
+41 2.43 0.935432 6.69388
+42 2.49 0.957713 7.13265
+43 2.55 1.06183 7.64286
+44 2.61 0.810861 8.05102
+45 2.67 1.02665 8.59184
+46 2.73 0.944962 9.11224
+47 2.79 1.02894 9.70408
+48 2.85 1.13908 10.3878
+49 2.91 0.799064 10.8878
+50 2.97 1.23676 11.6939
+105750 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 1.26463 0.0102041
+7 0.39 0.906153 0.0204082
+8 0.45 1.36191 0.0408163
+9 0.51 1.06066 0.0612245
+10 0.57 0 0.0612245
+11 0.63 1.39071 0.102041
+12 0.69 1.73927 0.163265
+13 0.75 1.22688 0.214286
+14 0.81 1.47271 0.285714
+15 0.87 1.64142 0.377551
+16 0.93 2.23459 0.520408
+17 0.99 1.12687 0.602041
+18 1.05 1.62792 0.734694
+19 1.11 1.0085 0.826531
+20 1.17 1.61376 0.989796
+21 1.23 1.55146 1.16327
+22 1.29 0.746744 1.2551
+23 1.35 1.28794 1.42857
+24 1.41 1.04178 1.58163
+25 1.47 0.894581 1.72449
+26 1.53 0.825803 1.86735
+27 1.59 0.983136 2.05102
+28 1.65 1.31869 2.31633
+29 1.71 0.944452 2.52041
+30 1.77 0.925588 2.73469
+31 1.83 0.824661 2.93878
+32 1.89 0.773137 3.14286
+33 1.95 1.16207 3.46939
+34 2.01 0.991198 3.76531
+35 2.07 0.934574 4.06122
+36 2.13 1.21747 4.46939
+37 2.19 1.4396 4.97959
+38 2.25 1.52751 5.55102
+39 2.31 0.957503 5.92857
+40 2.37 1.00798 6.34694
+41 2.43 1.16929 6.85714
+42 2.49 0.913168 7.27551
+43 2.55 1.06183 7.78571
+44 2.61 0.973034 8.27551
+45 2.67 0.929795 8.76531
+46 2.73 0.96349 9.29592
+47 2.79 0.674132 9.68367
+48 2.85 0.969072 10.2653
+49 2.91 1.14152 10.9796
+50 2.97 0.954968 11.602
+105800 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 1.36191 0.0204082
+9 0.51 0 0.0204082
+10 0.57 2.12327 0.0714286
+11 0.63 2.08607 0.132653
+12 0.69 1.44939 0.183673
+13 0.75 1.22688 0.234694
+14 0.81 1.68309 0.316327
+15 0.87 1.09428 0.377551
+16 0.93 1.27691 0.459184
+17 0.99 1.83116 0.591837
+18 1.05 1.12702 0.683673
+19 1.11 1.12056 0.785714
+20 1.17 0.907742 0.877551
+21 1.23 1.64272 1.06122
+22 1.29 1.32754 1.22449
+23 1.35 0.984898 1.35714
+24 1.41 0.972324 1.5
+25 1.47 1.27797 1.70408
+26 1.53 1.12073 1.89796
+27 1.59 0.873898 2.06122
+28 1.65 0.659347 2.19388
+29 1.71 0.802784 2.36735
+30 1.77 0.881513 2.57143
+31 1.83 1.23699 2.87755
+32 1.89 0.695824 3.06122
+33 1.95 1.2347 3.40816
+34 2.01 0.854481 3.66327
+35 2.07 0.77344 3.90816
+36 2.13 1.00441 4.2449
+37 2.19 1.03651 4.61224
+38 2.25 0.709201 4.87755
+39 2.31 1.0869 5.30612
+40 2.37 1.10632 5.76531
+41 2.43 0.958818 6.18367
+42 2.49 0.979986 6.63265
+43 2.55 0.998123 7.11224
+44 2.61 1.11493 7.67347
+45 2.67 0.987907 8.19388
+46 2.73 0.944962 8.71429
+47 2.79 1.06442 9.32653
+48 2.85 1.13908 10.0102
+49 2.91 1.30459 10.8265
+50 2.97 1.17414 11.5918
+105850 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 1.26463 0.0102041
+7 0.39 0.906153 0.0204082
+8 0.45 1.36191 0.0408163
+9 0.51 0 0.0408163
+10 0.57 1.27396 0.0714286
+11 0.63 2.78143 0.153061
+12 0.69 1.15951 0.193878
+13 0.75 0.736129 0.22449
+14 0.81 2.31425 0.336735
+15 0.87 1.45904 0.418367
+16 0.93 1.27691 0.5
+17 0.99 1.12687 0.581633
+18 1.05 1.5027 0.704082
+19 1.11 1.12056 0.806122
+20 1.17 1.21032 0.928571
+21 1.23 0.821359 1.02041
+22 1.29 1.49349 1.20408
+23 1.35 1.28794 1.37755
+24 1.41 1.25013 1.56122
+25 1.47 1.59747 1.81633
+26 1.53 1.35668 2.05102
+27 1.59 1.03775 2.2449
+28 1.65 1.0651 2.45918
+29 1.71 1.32223 2.7449
+30 1.77 1.14597 3.0102
+31 1.83 0.865894 3.22449
+32 1.89 0.850451 3.44898
+33 1.95 0.871554 3.69388
+34 2.01 0.649406 3.88776
+35 2.07 1.19239 4.26531
+36 2.13 0.85223 4.55102
+37 2.19 1.23805 4.9898
+38 2.25 0.90014 5.32653
+39 2.31 0.983381 5.71429
+40 2.37 0.811299 6.05102
+41 2.43 0.841889 6.41837
+42 2.49 0.757262 6.76531
+43 2.55 1.10431 7.29592
+44 2.61 1.17575 7.88776
+45 2.67 1.08476 8.45918
+46 2.73 0.741146 8.86735
+47 2.79 0.922497 9.39796
+48 2.85 0.935069 9.95918
+49 2.91 0.929523 10.5408
+50 2.97 1.00193 11.1939
+105900 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0.906153 0.0102041
+8 0.45 2.04287 0.0408163
+9 0.51 0.530329 0.0510204
+10 0.57 0.424655 0.0612245
+11 0.63 1.04303 0.0918367
+12 0.69 1.44939 0.142857
+13 0.75 0.736129 0.173469
+14 0.81 0.841547 0.214286
+15 0.87 1.27666 0.285714
+16 0.93 1.59614 0.387755
+17 0.99 1.97202 0.530612
+18 1.05 1.12702 0.622449
+19 1.11 1.23262 0.734694
+20 1.17 1.31118 0.867347
+21 1.23 0.730097 0.94898
+22 1.29 1.65943 1.15306
+23 1.35 1.21218 1.31633
+24 1.41 1.52794 1.54082
+25 1.47 1.21407 1.73469
+26 1.53 1.17972 1.93878
+27 1.59 1.20161 2.16327
+28 1.65 1.31869 2.42857
+29 1.71 1.36946 2.72449
+30 1.77 0.617059 2.86735
+31 1.83 1.36069 3.20408
+32 1.89 1.35299 3.56122
+33 1.95 0.871554 3.80612
+34 2.01 1.19627 4.16327
+35 2.07 1.03125 4.4898
+36 2.13 0.76092 4.7449
+37 2.19 1.00772 5.10204
+38 2.25 0.872863 5.42857
+39 2.31 0.828111 5.7551
+40 2.37 0.786714 6.08163
+41 2.43 0.958818 6.5
+42 2.49 0.712717 6.82653
+43 2.55 0.743283 7.18367
+44 2.61 1.27711 7.82653
+45 2.67 1.14287 8.42857
+46 2.73 1.01908 8.9898
+47 2.79 1.22408 9.69388
+48 2.85 1.05408 10.3265
+49 2.91 0.799064 10.8265
+50 2.97 0.829726 11.3673
+105950 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 1.26463 0.0102041
+7 0.39 0 0.0102041
+8 0.45 0 0.0102041
+9 0.51 0.530329 0.0204082
+10 0.57 1.27396 0.0510204
+11 0.63 0.347678 0.0612245
+12 0.69 2.02914 0.132653
+13 0.75 0.245376 0.142857
+14 0.81 2.31425 0.255102
+15 0.87 1.45904 0.336735
+16 0.93 1.91536 0.459184
+17 0.99 1.54944 0.571429
+18 1.05 1.0018 0.653061
+19 1.11 0.896448 0.734694
+20 1.17 0.907742 0.826531
+21 1.23 1.27767 0.969388
+22 1.29 1.41052 1.14286
+23 1.35 0.984898 1.27551
+24 1.41 1.11123 1.43878
+25 1.47 1.15018 1.62245
+26 1.53 1.41566 1.86735
+27 1.59 1.25623 2.10204
+28 1.65 1.01438 2.30612
+29 1.71 1.32223 2.59184
+30 1.77 1.01374 2.82653
+31 1.83 0.700962 3
+32 1.89 1.23702 3.32653
+33 1.95 0.83524 3.56122
+34 2.01 1.19627 3.91837
+35 2.07 1.54688 4.40816
+36 2.13 0.973977 4.73469
+37 2.19 1.12289 5.13265
+38 2.25 0.954694 5.4898
+39 2.31 1.26804 5.9898
+40 2.37 0.811299 6.32653
+41 2.43 1.09913 6.80612
+42 2.49 1.09135 7.30612
+43 2.55 1.21049 7.88776
+44 2.61 1.03385 8.40816
+45 2.67 1.06539 8.96939
+46 2.73 1.16731 9.61224
+47 2.79 0.869276 10.1122
+48 2.85 1.13908 10.7959
+49 2.91 0.864293 11.3367
+50 2.97 0.782761 11.8469
+106000 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 1.88658 0.0102041
+6 0.33 1.26463 0.0204082
+7 0.39 0.906153 0.0306122
+8 0.45 1.36191 0.0510204
+9 0.51 1.06066 0.0714286
+10 0.57 2.12327 0.122449
+11 0.63 1.73839 0.173469
+12 0.69 0.869633 0.204082
+13 0.75 0.981505 0.244898
+14 0.81 1.05193 0.295918
+15 0.87 1.8238 0.397959
+16 0.93 1.43652 0.489796
+17 0.99 0.845152 0.55102
+18 1.05 1.62792 0.683673
+19 1.11 1.23262 0.795918
+20 1.17 1.61376 0.959184
+21 1.23 0.547573 1.02041
+22 1.29 1.41052 1.19388
+23 1.35 1.21218 1.35714
+24 1.41 1.45849 1.57143
+25 1.47 1.15018 1.7551
+26 1.53 1.17972 1.95918
+27 1.59 1.09237 2.16327
+28 1.65 1.82589 2.53061
+29 1.71 1.08612 2.76531
+30 1.77 1.05782 3.0102
+31 1.83 1.07206 3.27551
+32 1.89 0.811794 3.4898
+33 1.95 0.76261 3.70408
+34 2.01 1.36717 4.11224
+35 2.07 0.999027 4.42857
+36 2.13 1.12616 4.80612
+37 2.19 0.921343 5.13265
+38 2.25 0.954694 5.4898
+39 2.31 1.06102 5.90816
+40 2.37 1.27841 6.43878
+41 2.43 0.912046 6.83673
+42 2.49 0.913168 7.2551
+43 2.55 1.12554 7.79592
+44 2.61 0.993305 8.29592
+45 2.67 0.910424 8.77551
+46 2.73 0.944962 9.29592
+47 2.79 0.780574 9.7449
+48 2.85 1.02008 10.3571
+49 2.91 0.896908 10.9184
+50 2.97 1.12718 11.6531
+106050 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 1.36191 0.0204082
+9 0.51 0 0.0204082
+10 0.57 2.54793 0.0816327
+11 0.63 1.73839 0.132653
+12 0.69 2.02914 0.204082
+13 0.75 1.22688 0.255102
+14 0.81 1.68309 0.336735
+15 0.87 1.09428 0.397959
+16 0.93 0.957682 0.459184
+17 0.99 1.26773 0.55102
+18 1.05 1.62792 0.683673
+19 1.11 1.34467 0.806122
+20 1.17 1.21032 0.928571
+21 1.23 1.27767 1.07143
+22 1.29 1.32754 1.23469
+23 1.35 1.43947 1.42857
+24 1.41 1.38903 1.63265
+25 1.47 1.34187 1.84694
+26 1.53 1.06175 2.03061
+27 1.59 0.983136 2.21429
+28 1.65 1.26798 2.46939
+29 1.71 1.18057 2.72449
+30 1.77 0.925588 2.93878
+31 1.83 1.11329 3.21429
+32 1.89 1.12105 3.5102
+33 1.95 0.83524 3.7449
+34 2.01 0.854481 4
+35 2.07 1.16016 4.36735
+36 2.13 0.94354 4.68367
+37 2.19 0.863759 4.9898
+38 2.25 1.11836 5.40816
+39 2.31 0.776354 5.71429
+40 2.37 1.27841 6.2449
+41 2.43 0.818503 6.60204
+42 2.49 1.26953 7.18367
+43 2.55 0.95565 7.64286
+44 2.61 1.15548 8.22449
+45 2.67 0.871683 8.68367
+46 2.73 0.944962 9.20408
+47 2.79 0.869276 9.70408
+48 2.85 0.867064 10.2245
+49 2.91 1.17413 10.9592
+50 2.97 1.09587 11.6735
+106100 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0.906153 0.0102041
+8 0.45 1.36191 0.0306122
+9 0.51 1.59099 0.0612245
+10 0.57 0.424655 0.0714286
+11 0.63 0 0.0714286
+12 0.69 1.73927 0.132653
+13 0.75 1.96301 0.214286
+14 0.81 1.26232 0.27551
+15 0.87 1.45904 0.357143
+16 0.93 1.91536 0.479592
+17 0.99 1.54944 0.591837
+18 1.05 1.87837 0.744898
+19 1.11 0.896448 0.826531
+20 1.17 1.61376 0.989796
+21 1.23 1.09515 1.11224
+22 1.29 1.1616 1.2551
+23 1.35 1.28794 1.42857
+24 1.41 0.972324 1.57143
+25 1.47 1.08628 1.7449
+26 1.53 1.35668 1.97959
+27 1.59 1.36547 2.23469
+28 1.65 1.16654 2.46939
+29 1.71 0.944452 2.67347
+30 1.77 1.14597 2.93878
+31 1.83 1.48439 3.30612
+32 1.89 1.00508 3.57143
+33 1.95 0.798925 3.79592
+34 2.01 1.05956 4.11224
+35 2.07 1.16016 4.47959
+36 2.13 1.12616 4.85714
+37 2.19 0.892551 5.17347
+38 2.25 1.22746 5.63265
+39 2.31 0.931624 6
+40 2.37 1.05715 6.43878
+41 2.43 0.818503 6.79592
+42 2.49 1.11362 7.30612
+43 2.55 1.01936 7.79592
+44 2.61 1.23656 8.41837
+45 2.67 0.968536 8.92857
+46 2.73 1.01908 9.4898
+47 2.79 0.887016 10
+48 2.85 1.15609 10.6939
+49 2.91 1.01106 11.3265
+50 2.97 1.00193 11.9796
+106150 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 1.81231 0.0204082
+8 0.45 0 0.0204082
+9 0.51 0 0.0204082
+10 0.57 2.12327 0.0714286
+11 0.63 1.73839 0.122449
+12 0.69 0.869633 0.153061
+13 0.75 1.22688 0.204082
+14 0.81 1.68309 0.285714
+15 0.87 2.37093 0.418367
+16 0.93 1.1173 0.489796
+17 0.99 1.54944 0.602041
+18 1.05 1.12702 0.693878
+19 1.11 1.12056 0.795918
+20 1.17 1.21032 0.918367
+21 1.23 1.09515 1.04082
+22 1.29 1.1616 1.18367
+23 1.35 1.06066 1.32653
+24 1.41 1.11123 1.4898
+25 1.47 0.830683 1.62245
+26 1.53 0.707831 1.7449
+27 1.59 0.710042 1.87755
+28 1.65 1.36941 2.15306
+29 1.71 1.13334 2.39796
+30 1.77 1.14597 2.66327
+31 1.83 1.27823 2.97959
+32 1.89 1.31433 3.32653
+33 1.95 1.12576 3.64286
+34 2.01 0.786122 3.87755
+35 2.07 0.934574 4.17347
+36 2.13 1.46097 4.66327
+37 2.19 1.15168 5.07143
+38 2.25 1.14563 5.5
+39 2.31 1.21629 5.97959
+40 2.37 1.10632 6.43878
+41 2.43 0.912046 6.83673
+42 2.49 1.20271 7.38776
+43 2.55 0.934413 7.83673
+44 2.61 1.13521 8.40816
+45 2.67 0.968536 8.91837
+46 2.73 1.07466 9.5102
+47 2.79 0.887016 10.0204
+48 2.85 0.867064 10.5408
+49 2.91 1.07629 11.2143
+50 2.97 0.939313 11.8265
+106200 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 1.81231 0.0204082
+8 0.45 0.680956 0.0306122
+9 0.51 0 0.0306122
+10 0.57 2.12327 0.0816327
+11 0.63 1.39071 0.122449
+12 0.69 1.73927 0.183673
+13 0.75 1.96301 0.265306
+14 0.81 1.05193 0.316327
+15 0.87 1.64142 0.408163
+16 0.93 2.07498 0.540816
+17 0.99 1.97202 0.683673
+18 1.05 1.62792 0.816327
+19 1.11 0.672336 0.877551
+20 1.17 0.806882 0.959184
+21 1.23 1.36893 1.11224
+22 1.29 0.912687 1.22449
+23 1.35 0.984898 1.35714
+24 1.41 1.18068 1.53061
+25 1.47 1.15018 1.71429
+26 1.53 0.825803 1.85714
+27 1.59 0.764661 2
+28 1.65 0.912943 2.18367
+29 1.71 1.27501 2.45918
+30 1.77 1.01374 2.69388
+31 1.83 0.948361 2.92857
+32 1.89 1.27568 3.26531
+33 1.95 1.08944 3.57143
+34 2.01 1.09374 3.89796
+35 2.07 1.06348 4.23469
+36 2.13 0.85223 4.52041
+37 2.19 0.892551 4.83673
+38 2.25 0.927417 5.18367
+39 2.31 1.06102 5.60204
+40 2.37 1.08173 6.05102
+41 2.43 0.771731 6.38776
+42 2.49 1.22498 6.94898
+43 2.55 0.998123 7.42857
+44 2.61 1.07439 7.96939
+45 2.67 1.00728 8.5
+46 2.73 0.870847 8.97959
+47 2.79 1.13538 9.63265
+48 2.85 1.20709 10.3571
+49 2.91 1.12521 11.0612
+50 2.97 0.939313 11.6735
+106250 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 1.88658 0.0102041
+6 0.33 0 0.0102041
+7 0.39 0.906153 0.0204082
+8 0.45 0.680956 0.0306122
+9 0.51 1.59099 0.0612245
+10 0.57 2.97258 0.132653
+11 0.63 1.39071 0.173469
+12 0.69 0.579756 0.193878
+13 0.75 2.20839 0.285714
+14 0.81 1.68309 0.367347
+15 0.87 0.911898 0.418367
+16 0.93 1.59614 0.520408
+17 0.99 1.40859 0.622449
+18 1.05 0.876573 0.693878
+19 1.11 1.23262 0.806122
+20 1.17 0.20172 0.826531
+21 1.23 1.46019 0.989796
+22 1.29 0.995658 1.11224
+23 1.35 1.59099 1.32653
+24 1.41 0.972324 1.46939
+25 1.47 0.702885 1.58163
+26 1.53 0.589859 1.68367
+27 1.59 0.928517 1.85714
+28 1.65 1.26798 2.11224
+29 1.71 0.944452 2.31633
+30 1.77 1.23412 2.60204
+31 1.83 1.23699 2.90816
+32 1.89 1.50762 3.30612
+33 1.95 1.12576 3.62245
+34 2.01 0.922839 3.89796
+35 2.07 0.870121 4.17347
+36 2.13 1.00441 4.5102
+37 2.19 1.4396 5.02041
+38 2.25 1.20019 5.46939
+39 2.31 1.0869 5.89796
+40 2.37 0.909638 6.27551
+41 2.43 0.958818 6.69388
+42 2.49 1.09135 7.19388
+43 2.55 1.25296 7.79592
+44 2.61 1.37846 8.4898
+45 2.67 0.910424 8.96939
+46 2.73 1.25995 9.66327
+47 2.79 0.904757 10.1837
+48 2.85 1.17309 10.8878
+49 2.91 1.05998 11.551
+50 2.97 0.908003 12.1429
+106300 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0.906153 0.0102041
+8 0.45 0 0.0102041
+9 0.51 0.530329 0.0204082
+10 0.57 1.27396 0.0510204
+11 0.63 0.695356 0.0714286
+12 0.69 2.02914 0.142857
+13 0.75 0.981505 0.183673
+14 0.81 2.10387 0.285714
+15 0.87 0.729518 0.326531
+16 0.93 0.957682 0.387755
+17 0.99 1.26773 0.479592
+18 1.05 1.25225 0.581633
+19 1.11 1.45673 0.714286
+20 1.17 1.21032 0.836735
+21 1.23 1.46019 1
+22 1.29 1.24457 1.15306
+23 1.35 1.43947 1.34694
+24 1.41 1.31958 1.54082
+25 1.47 1.15018 1.72449
+26 1.53 1.06175 1.90816
+27 1.59 0.81928 2.06122
+28 1.65 1.01438 2.26531
+29 1.71 0.89723 2.45918
+30 1.77 1.41042 2.78571
+31 1.83 1.23699 3.09184
+32 1.89 0.966422 3.34694
+33 1.95 0.980499 3.62245
+34 2.01 0.751943 3.84694
+35 2.07 1.19239 4.22449
+36 2.13 0.730483 4.46939
+37 2.19 1.12289 4.86735
+38 2.25 1.09108 5.27551
+39 2.31 1.0869 5.70408
+40 2.37 1.27841 6.23469
+41 2.43 0.912046 6.63265
+42 2.49 1.06908 7.12245
+43 2.55 1.2742 7.73469
+44 2.61 1.09466 8.28571
+45 2.67 0.968536 8.79592
+46 2.73 1.05613 9.37755
+47 2.79 0.940237 9.91837
+48 2.85 0.81606 10.4082
+49 2.91 1.02737 11.051
+50 2.97 1.00193 11.7041
+106350 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0.906153 0.0102041
+8 0.45 0 0.0102041
+9 0.51 0.530329 0.0204082
+10 0.57 1.27396 0.0510204
+11 0.63 0.695356 0.0714286
+12 0.69 1.44939 0.122449
+13 0.75 0.981505 0.163265
+14 0.81 0.63116 0.193878
+15 0.87 1.45904 0.27551
+16 0.93 2.23459 0.418367
+17 0.99 1.6903 0.540816
+18 1.05 1.12702 0.632653
+19 1.11 1.34467 0.755102
+20 1.17 0.907742 0.846939
+21 1.23 0.547573 0.908163
+22 1.29 0.829715 1.0102
+23 1.35 0.909136 1.13265
+24 1.41 0.694517 1.23469
+25 1.47 1.15018 1.41837
+26 1.53 1.2387 1.63265
+27 1.59 0.928517 1.80612
+28 1.65 1.01438 2.0102
+29 1.71 1.22779 2.27551
+30 1.77 0.925588 2.4898
+31 1.83 1.07206 2.7551
+32 1.89 1.27568 3.09184
+33 1.95 0.907869 3.34694
+34 2.01 0.854481 3.60204
+35 2.07 1.32129 4.02041
+36 2.13 1.09572 4.38776
+37 2.19 0.921343 4.71429
+38 2.25 1.11836 5.13265
+39 2.31 0.957503 5.5102
+40 2.37 1.1309 5.97959
+41 2.43 1.00559 6.41837
+42 2.49 1.42543 7.07143
+43 2.55 1.14678 7.62245
+44 2.61 1.13521 8.19388
+45 2.67 1.04602 8.7449
+46 2.73 1.07466 9.33673
+47 2.79 1.0112 9.91837
+48 2.85 1.02008 10.5306
+49 2.91 1.19044 11.2755
+50 2.97 1.11152 12
+106400 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 0.680956 0.0102041
+9 0.51 0.530329 0.0204082
+10 0.57 2.12327 0.0714286
+11 0.63 0.347678 0.0816327
+12 0.69 1.15951 0.122449
+13 0.75 1.96301 0.204082
+14 0.81 1.68309 0.285714
+15 0.87 1.45904 0.367347
+16 0.93 1.27691 0.44898
+17 0.99 1.6903 0.571429
+18 1.05 0.751348 0.632653
+19 1.11 1.45673 0.765306
+20 1.17 1.31118 0.897959
+21 1.23 0.730097 0.979592
+22 1.29 0.663772 1.06122
+23 1.35 0.681852 1.15306
+24 1.41 1.8752 1.42857
+25 1.47 1.59747 1.68367
+26 1.53 0.884789 1.83673
+27 1.59 0.81928 1.9898
+28 1.65 0.710067 2.13265
+29 1.71 0.991675 2.34694
+30 1.77 1.19004 2.62245
+31 1.83 0.742195 2.80612
+32 1.89 1.12105 3.10204
+33 1.95 1.01681 3.38776
+34 2.01 1.12791 3.72449
+35 2.07 0.999027 4.04082
+36 2.13 1.00441 4.37755
+37 2.19 1.0653 4.7551
+38 2.25 0.90014 5.09184
+39 2.31 0.983381 5.47959
+40 2.37 0.909638 5.85714
+41 2.43 1.02897 6.30612
+42 2.49 1.20271 6.85714
+43 2.55 1.08307 7.37755
+44 2.61 0.891947 7.82653
+45 2.67 1.20099 8.45918
+46 2.73 0.870847 8.93878
+47 2.79 1.02894 9.53061
+48 2.85 1.02008 10.1429
+49 2.91 0.880601 10.6939
+50 2.97 0.861037 11.2551
+106450 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0.906153 0.0102041
+8 0.45 0 0.0102041
+9 0.51 0 0.0102041
+10 0.57 2.12327 0.0612245
+11 0.63 1.04303 0.0918367
+12 0.69 1.44939 0.142857
+13 0.75 2.20839 0.234694
+14 0.81 2.10387 0.336735
+15 0.87 1.27666 0.408163
+16 0.93 1.43652 0.5
+17 0.99 1.6903 0.622449
+18 1.05 1.37747 0.734694
+19 1.11 1.12056 0.836735
+20 1.17 1.0086 0.938776
+21 1.23 0.730097 1.02041
+22 1.29 0.746744 1.11224
+23 1.35 1.13642 1.26531
+24 1.41 1.59739 1.5
+25 1.47 0.894581 1.64286
+26 1.53 1.00276 1.81633
+27 1.59 1.09237 2.02041
+28 1.65 1.16654 2.2551
+29 1.71 1.36946 2.55102
+30 1.77 0.837437 2.7449
+31 1.83 0.824661 2.94898
+32 1.89 0.927765 3.19388
+33 1.95 0.653666 3.37755
+34 2.01 1.12791 3.71429
+35 2.07 0.934574 4.0102
+36 2.13 1.12616 4.38776
+37 2.19 0.748591 4.65306
+38 2.25 0.736478 4.92857
+39 2.31 0.931624 5.29592
+40 2.37 1.05715 5.73469
+41 2.43 0.958818 6.15306
+42 2.49 0.913168 6.57143
+43 2.55 1.14678 7.12245
+44 2.61 1.09466 7.67347
+45 2.67 0.716717 8.05102
+46 2.73 1.00055 8.60204
+47 2.79 1.22408 9.30612
+48 2.85 1.03708 9.92857
+49 2.91 0.962138 10.5306
+50 2.97 0.986279 11.1735
+106500 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 1.26463 0.0102041
+7 0.39 0.906153 0.0204082
+8 0.45 0 0.0204082
+9 0.51 0 0.0204082
+10 0.57 0.424655 0.0306122
+11 0.63 1.73839 0.0816327
+12 0.69 1.15951 0.122449
+13 0.75 1.71763 0.193878
+14 0.81 0.841547 0.234694
+15 0.87 1.45904 0.316327
+16 0.93 1.27691 0.397959
+17 0.99 0.98601 0.469388
+18 1.05 1.12702 0.561224
+19 1.11 2.12906 0.755102
+20 1.17 1.5129 0.908163
+21 1.23 1.36893 1.06122
+22 1.29 1.07863 1.19388
+23 1.35 0.454568 1.2551
+24 1.41 1.04178 1.40816
+25 1.47 0.766784 1.53061
+26 1.53 1.17972 1.73469
+27 1.59 0.764661 1.87755
+28 1.65 1.11582 2.10204
+29 1.71 1.08612 2.33673
+30 1.77 1.14597 2.60204
+31 1.83 1.23699 2.90816
+32 1.89 0.811794 3.12245
+33 1.95 0.944184 3.38776
+34 2.01 1.16209 3.73469
+35 2.07 1.03125 4.06122
+36 2.13 1.03485 4.40816
+37 2.19 0.834967 4.70408
+38 2.25 1.25474 5.17347
+39 2.31 0.931624 5.54082
+40 2.37 1.22924 6.05102
+41 2.43 0.818503 6.40816
+42 2.49 0.957713 6.84694
+43 2.55 0.934413 7.29592
+44 2.61 0.810861 7.70408
+45 2.67 0.968536 8.21429
+46 2.73 1.00055 8.76531
+47 2.79 0.798315 9.22449
+48 2.85 1.00307 9.82653
+49 2.91 0.962138 10.4286
+50 2.97 1.01759 11.0918
+106550 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 6.05692 0.0102041
+4 0.21 0 0.0102041
+5 0.27 1.88658 0.0204082
+6 0.33 0 0.0204082
+7 0.39 0 0.0204082
+8 0.45 1.36191 0.0408163
+9 0.51 0.530329 0.0510204
+10 0.57 0.84931 0.0714286
+11 0.63 0.695356 0.0918367
+12 0.69 0.289878 0.102041
+13 0.75 1.22688 0.153061
+14 0.81 0.841547 0.193878
+15 0.87 2.00617 0.306122
+16 0.93 0.957682 0.367347
+17 0.99 1.97202 0.510204
+18 1.05 1.5027 0.632653
+19 1.11 1.23262 0.744898
+20 1.17 1.0086 0.846939
+21 1.23 1.09515 0.969388
+22 1.29 1.49349 1.15306
+23 1.35 1.28794 1.32653
+24 1.41 0.902872 1.45918
+25 1.47 1.15018 1.64286
+26 1.53 1.06175 1.82653
+27 1.59 0.928517 2
+28 1.65 0.912943 2.18367
+29 1.71 0.755562 2.34694
+30 1.77 1.19004 2.62245
+31 1.83 1.23699 2.92857
+32 1.89 0.773137 3.13265
+33 1.95 1.16207 3.45918
+34 2.01 1.12791 3.79592
+35 2.07 1.03125 4.12245
+36 2.13 1.00441 4.45918
+37 2.19 1.26685 4.90816
+38 2.25 0.791032 5.20408
+39 2.31 0.983381 5.59184
+40 2.37 1.10632 6.05102
+41 2.43 0.982203 6.47959
+42 2.49 0.979986 6.92857
+43 2.55 0.849467 7.33673
+44 2.61 0.993305 7.83673
+45 2.67 1.04602 8.38776
+46 2.73 0.907904 8.88776
+47 2.79 0.940237 9.42857
+48 2.85 1.00307 10.0306
+49 2.91 0.815371 10.5408
+50 2.97 1.12718 11.2755
+106600 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0.906153 0.0102041
+8 0.45 0 0.0102041
+9 0.51 0 0.0102041
+10 0.57 1.27396 0.0408163
+11 0.63 2.08607 0.102041
+12 0.69 0.579756 0.122449
+13 0.75 0.736129 0.153061
+14 0.81 2.10387 0.255102
+15 0.87 2.37093 0.387755
+16 0.93 1.1173 0.459184
+17 0.99 1.12687 0.540816
+18 1.05 1.0018 0.622449
+19 1.11 1.23262 0.734694
+20 1.17 1.0086 0.836735
+21 1.23 0.912621 0.938776
+22 1.29 0.912687 1.05102
+23 1.35 1.74251 1.28571
+24 1.41 0.763969 1.39796
+25 1.47 1.08628 1.57143
+26 1.53 1.12073 1.76531
+27 1.59 1.14699 1.97959
+28 1.65 0.710067 2.12245
+29 1.71 1.22779 2.38776
+30 1.77 0.969664 2.61224
+31 1.83 0.865894 2.82653
+32 1.89 1.35299 3.18367
+33 1.95 1.08944 3.4898
+34 2.01 1.23045 3.85714
+35 2.07 0.870121 4.13265
+36 2.13 1.24791 4.55102
+37 2.19 1.03651 4.91837
+38 2.25 1.11836 5.33673
+39 2.31 1.0869 5.76531
+40 2.37 1.05715 6.20408
+41 2.43 1.00559 6.64286
+42 2.49 0.957713 7.08163
+43 2.55 1.08307 7.60204
+44 2.61 0.770318 7.9898
+45 2.67 1.04602 8.54082
+46 2.73 1.09319 9.14286
+47 2.79 0.957978 9.69388
+48 2.85 1.08808 10.3469
+49 2.91 0.782756 10.8367
+50 2.97 1.11152 11.5612
+106650 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 1.81231 0.0204082
+8 0.45 2.72382 0.0612245
+9 0.51 0.530329 0.0714286
+10 0.57 1.27396 0.102041
+11 0.63 0.695356 0.122449
+12 0.69 1.73927 0.183673
+13 0.75 1.47226 0.244898
+14 0.81 1.89348 0.336735
+15 0.87 1.64142 0.428571
+16 0.93 2.07498 0.561224
+17 0.99 1.6903 0.683673
+18 1.05 0.876573 0.755102
+19 1.11 1.12056 0.857143
+20 1.17 1.0086 0.959184
+21 1.23 1.27767 1.10204
+22 1.29 0.829715 1.20408
+23 1.35 1.21218 1.36735
+24 1.41 0.902872 1.5
+25 1.47 0.894581 1.64286
+26 1.53 1.29769 1.86735
+27 1.59 1.20161 2.09184
+28 1.65 1.21726 2.33673
+29 1.71 1.22779 2.60204
+30 1.77 0.70521 2.76531
+31 1.83 0.824661 2.96939
+32 1.89 1.15971 3.27551
+33 1.95 1.01681 3.56122
+34 2.01 0.786122 3.79592
+35 2.07 0.77344 4.04082
+36 2.13 0.94354 4.35714
+37 2.19 0.921343 4.68367
+38 2.25 1.20019 5.13265
+39 2.31 1.03514 5.54082
+40 2.37 0.934223 5.92857
+41 2.43 0.958818 6.34694
+42 2.49 0.913168 6.76531
+43 2.55 1.21049 7.34694
+44 2.61 1.15548 7.92857
+45 2.67 0.910424 8.40816
+46 2.73 0.926433 8.91837
+47 2.79 0.904757 9.43878
+48 2.85 0.935069 10
+49 2.91 0.994753 10.6224
+50 2.97 0.986279 11.2653
+106700 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 0 0
+9 0.51 0 0
+10 0.57 0.84931 0.0204082
+11 0.63 2.78143 0.102041
+12 0.69 0.869633 0.132653
+13 0.75 1.96301 0.214286
+14 0.81 2.73503 0.346939
+15 0.87 0.911898 0.397959
+16 0.93 2.23459 0.540816
+17 0.99 1.40859 0.642857
+18 1.05 1.12702 0.734694
+19 1.11 0.784392 0.806122
+20 1.17 1.21032 0.928571
+21 1.23 0.638835 1
+22 1.29 0.663772 1.08163
+23 1.35 1.43947 1.27551
+24 1.41 1.04178 1.42857
+25 1.47 1.15018 1.61224
+26 1.53 1.35668 1.84694
+27 1.59 1.31085 2.09184
+28 1.65 1.31869 2.35714
+29 1.71 1.27501 2.63265
+30 1.77 1.27819 2.92857
+31 1.83 0.783428 3.12245
+32 1.89 0.657167 3.29592
+33 1.95 0.980499 3.57143
+34 2.01 1.05956 3.88776
+35 2.07 1.06348 4.22449
+36 2.13 0.973977 4.55102
+37 2.19 0.921343 4.87755
+38 2.25 0.818309 5.18367
+39 2.31 0.905746 5.54082
+40 2.37 0.983392 5.94898
+41 2.43 0.841889 6.31633
+42 2.49 1.15816 6.84694
+43 2.55 0.82823 7.2449
+44 2.61 0.993305 7.7449
+45 2.67 0.871683 8.20408
+46 2.73 1.07466 8.79592
+47 2.79 0.940237 9.33673
+48 2.85 0.918068 9.88776
+49 2.91 1.02737 10.5306
+50 2.97 0.970623 11.1633
+106750 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 0 0
+9 0.51 2.12132 0.0408163
+10 0.57 1.69862 0.0816327
+11 0.63 0.695356 0.102041
+12 0.69 1.15951 0.142857
+13 0.75 0.981505 0.183673
+14 0.81 1.05193 0.234694
+15 0.87 2.00617 0.346939
+16 0.93 1.27691 0.428571
+17 0.99 0.422576 0.459184
+18 1.05 0.876573 0.530612
+19 1.11 0.56028 0.581633
+20 1.17 0.806882 0.663265
+21 1.23 0.638835 0.734694
+22 1.29 0.829715 0.836735
+23 1.35 1.21218 1
+24 1.41 0.625065 1.09184
+25 1.47 1.40577 1.31633
+26 1.53 0.943774 1.47959
+27 1.59 0.928517 1.65306
+28 1.65 1.21726 1.89796
+29 1.71 1.4639 2.21429
+30 1.77 1.05782 2.45918
+31 1.83 1.07206 2.72449
+32 1.89 1.31433 3.07143
+33 1.95 0.980499 3.34694
+34 2.01 1.26463 3.72449
+35 2.07 1.22461 4.11224
+36 2.13 1.00441 4.44898
+37 2.19 1.0653 4.82653
+38 2.25 1.22746 5.28571
+39 2.31 1.16453 5.7449
+40 2.37 1.00798 6.16327
+41 2.43 0.841889 6.53061
+42 2.49 0.734989 6.86735
+43 2.55 1.14678 7.41837
+44 2.61 0.952762 7.89796
+45 2.67 0.968536 8.40816
+46 2.73 0.982019 8.94898
+47 2.79 1.08216 9.57143
+48 2.85 0.969072 10.1531
+49 2.91 0.929523 10.7347
+50 2.97 0.892347 11.3163
+106800 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 0.680956 0.0102041
+9 0.51 0 0.0102041
+10 0.57 0.424655 0.0204082
+11 0.63 1.39071 0.0612245
+12 0.69 0.869633 0.0918367
+13 0.75 0.981505 0.132653
+14 0.81 1.47271 0.204082
+15 0.87 0.911898 0.255102
+16 0.93 1.27691 0.336735
+17 0.99 1.26773 0.428571
+18 1.05 0.751348 0.489796
+19 1.11 1.23262 0.602041
+20 1.17 1.0086 0.704082
+21 1.23 1.00388 0.816327
+22 1.29 1.07863 0.94898
+23 1.35 1.13642 1.10204
+24 1.41 0.902872 1.23469
+25 1.47 1.46967 1.46939
+26 1.53 1.17972 1.67347
+27 1.59 0.873898 1.83673
+28 1.65 1.16654 2.07143
+29 1.71 0.944452 2.27551
+30 1.77 1.4545 2.61224
+31 1.83 1.27823 2.92857
+32 1.89 0.773137 3.13265
+33 1.95 0.944184 3.39796
+34 2.01 0.991198 3.69388
+35 2.07 1.32129 4.11224
+36 2.13 0.76092 4.36735
+37 2.19 1.20926 4.79592
+38 2.25 1.11836 5.21429
+39 2.31 0.931624 5.58163
+40 2.37 1.18007 6.07143
+41 2.43 0.912046 6.46939
+42 2.49 0.913168 6.88776
+43 2.55 1.06183 7.39796
+44 2.61 1.07439 7.93878
+45 2.67 0.871683 8.39796
+46 2.73 0.667032 8.76531
+47 2.79 0.922497 9.29592
+48 2.85 1.27509 10.0612
+49 2.91 0.831679 10.5816
+50 2.97 0.861037 11.1429
+106850 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 0 0
+9 0.51 0.530329 0.0102041
+10 0.57 1.27396 0.0408163
+11 0.63 0 0.0408163
+12 0.69 0.579756 0.0612245
+13 0.75 1.47226 0.122449
+14 0.81 0.63116 0.153061
+15 0.87 1.09428 0.214286
+16 0.93 1.75575 0.326531
+17 0.99 2.11288 0.479592
+18 1.05 1.0018 0.561224
+19 1.11 2.35318 0.77551
+20 1.17 1.0086 0.877551
+21 1.23 1.18641 1.0102
+22 1.29 1.07863 1.14286
+23 1.35 1.21218 1.30612
+24 1.41 0.972324 1.44898
+25 1.47 1.27797 1.65306
+26 1.53 0.825803 1.79592
+27 1.59 1.09237 2
+28 1.65 1.01438 2.20408
+29 1.71 1.22779 2.46939
+30 1.77 0.617059 2.61224
+31 1.83 0.824661 2.81633
+32 1.89 0.889108 3.05102
+33 1.95 0.544721 3.20408
+34 2.01 1.16209 3.55102
+35 2.07 1.4502 4.0102
+36 2.13 0.973977 4.33673
+37 2.19 1.20926 4.76531
+38 2.25 1.11836 5.18367
+39 2.31 0.67284 5.44898
+40 2.37 1.10632 5.90816
+41 2.43 1.1459 6.40816
+42 2.49 0.935441 6.83673
+43 2.55 0.870703 7.2551
+44 2.61 0.871676 7.69388
+45 2.67 0.949166 8.19388
+46 2.73 1.00055 8.7449
+47 2.79 1.11764 9.38776
+48 2.85 0.95207 9.95918
+49 2.91 1.25567 10.7449
+50 2.97 0.829726 11.2857
+106900 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0.906153 0.0102041
+8 0.45 0.680956 0.0204082
+9 0.51 0.530329 0.0306122
+10 0.57 0.84931 0.0510204
+11 0.63 1.39071 0.0918367
+12 0.69 1.73927 0.153061
+13 0.75 1.47226 0.214286
+14 0.81 0.841547 0.255102
+15 0.87 2.18855 0.377551
+16 0.93 2.07498 0.510204
+17 0.99 0.704293 0.561224
+18 1.05 0.626123 0.612245
+19 1.11 1.34467 0.734694
+20 1.17 1.10946 0.846939
+21 1.23 0.730097 0.928571
+22 1.29 1.32754 1.09184
+23 1.35 1.06066 1.23469
+24 1.41 0.902872 1.36735
+25 1.47 1.08628 1.54082
+26 1.53 1.06175 1.72449
+27 1.59 1.42008 1.9898
+28 1.65 1.0651 2.20408
+29 1.71 1.08612 2.43878
+30 1.77 1.05782 2.68367
+31 1.83 1.11329 2.95918
+32 1.89 1.19836 3.27551
+33 1.95 0.980499 3.55102
+34 2.01 0.991198 3.84694
+35 2.07 0.999027 4.16327
+36 2.13 0.94354 4.47959
+37 2.19 0.950135 4.81633
+38 2.25 0.954694 5.17347
+39 2.31 1.19041 5.64286
+40 2.37 0.983392 6.05102
+41 2.43 1.07575 6.52041
+42 2.49 1.15816 7.05102
+43 2.55 0.913177 7.4898
+44 2.61 0.973034 7.97959
+45 2.67 0.891053 8.44898
+46 2.73 1.07466 9.04082
+47 2.79 0.833795 9.52041
+48 2.85 0.799059 10
+49 2.91 0.896908 10.5612
+50 2.97 0.829726 11.102
+106950 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 3.11031 0.0102041
+5 0.27 0 0.0102041
+6 0.33 0 0.0102041
+7 0.39 1.81231 0.0306122
+8 0.45 1.36191 0.0510204
+9 0.51 2.12132 0.0918367
+10 0.57 0.84931 0.112245
+11 0.63 0.347678 0.122449
+12 0.69 1.15951 0.163265
+13 0.75 0.736129 0.193878
+14 0.81 1.47271 0.265306
+15 0.87 1.45904 0.346939
+16 0.93 1.43652 0.438776
+17 0.99 0.98601 0.510204
+18 1.05 1.87837 0.663265
+19 1.11 1.56878 0.806122
+20 1.17 1.41204 0.94898
+21 1.23 1.55146 1.12245
+22 1.29 0.912687 1.23469
+23 1.35 1.21218 1.39796
+24 1.41 0.972324 1.54082
+25 1.47 0.830683 1.67347
+26 1.53 1.12073 1.86735
+27 1.59 0.764661 2.0102
+28 1.65 1.21726 2.2551
+29 1.71 0.661116 2.39796
+30 1.77 1.27819 2.69388
+31 1.83 1.03083 2.94898
+32 1.89 0.73448 3.14286
+33 1.95 1.01681 3.42857
+34 2.01 1.02538 3.73469
+35 2.07 1.09571 4.08163
+36 2.13 1.03485 4.42857
+37 2.19 0.978927 4.77551
+38 2.25 0.872863 5.10204
+39 2.31 0.67284 5.36735
+40 2.37 1.25383 5.88776
+41 2.43 0.818503 6.2449
+42 2.49 0.868624 6.64286
+43 2.55 1.10431 7.17347
+44 2.61 1.35819 7.85714
+45 2.67 0.987907 8.37755
+46 2.73 0.870847 8.85714
+47 2.79 1.0112 9.43878
+48 2.85 0.95207 10.0102
+49 2.91 1.17413 10.7449
+50 2.97 0.939313 11.3571
+107000 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0.906153 0.0102041
+8 0.45 1.36191 0.0306122
+9 0.51 1.59099 0.0612245
+10 0.57 1.27396 0.0918367
+11 0.63 1.39071 0.132653
+12 0.69 1.44939 0.183673
+13 0.75 1.96301 0.265306
+14 0.81 1.68309 0.346939
+15 0.87 0.729518 0.387755
+16 0.93 1.1173 0.459184
+17 0.99 1.26773 0.55102
+18 1.05 2.12882 0.72449
+19 1.11 1.23262 0.836735
+20 1.17 0.806882 0.918367
+21 1.23 1.55146 1.09184
+22 1.29 1.41052 1.26531
+23 1.35 1.06066 1.40816
+24 1.41 0.763969 1.52041
+25 1.47 0.894581 1.66327
+26 1.53 1.41566 1.90816
+27 1.59 1.14699 2.12245
+28 1.65 1.26798 2.37755
+29 1.71 0.802784 2.55102
+30 1.77 1.36634 2.86735
+31 1.83 1.48439 3.23469
+32 1.89 1.27568 3.57143
+33 1.95 1.01681 3.85714
+34 2.01 1.05956 4.17347
+35 2.07 0.966801 4.47959
+36 2.13 0.76092 4.73469
+37 2.19 0.719799 4.9898
+38 2.25 0.709201 5.2551
+39 2.31 0.931624 5.62245
+40 2.37 0.958808 6.02041
+41 2.43 1.02897 6.46939
+42 2.49 0.868624 6.86735
+43 2.55 0.849467 7.27551
+44 2.61 0.912219 7.73469
+45 2.67 0.871683 8.19388
+46 2.73 1.05613 8.77551
+47 2.79 0.780574 9.22449
+48 2.85 0.850063 9.73469
+49 2.91 0.929523 10.3163
+50 2.97 1.17414 11.0816
+107050 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 0 0
+9 0.51 3.18198 0.0612245
+10 0.57 2.12327 0.112245
+11 0.63 1.73839 0.163265
+12 0.69 0.579756 0.183673
+13 0.75 2.20839 0.27551
+14 0.81 1.89348 0.367347
+15 0.87 2.00617 0.479592
+16 0.93 1.43652 0.571429
+17 0.99 1.40859 0.673469
+18 1.05 1.25225 0.77551
+19 1.11 1.12056 0.877551
+20 1.17 0.907742 0.969388
+21 1.23 1.73398 1.16327
+22 1.29 0.912687 1.27551
+23 1.35 0.757614 1.37755
+24 1.41 0.763969 1.4898
+25 1.47 0.638987 1.59184
+26 1.53 0.471887 1.67347
+27 1.59 1.4747 1.94898
+28 1.65 1.26798 2.20408
+29 1.71 1.08612 2.43878
+30 1.77 0.881513 2.64286
+31 1.83 0.948361 2.87755
+32 1.89 1.08239 3.16327
+33 1.95 0.907869 3.41837
+34 2.01 1.29881 3.80612
+35 2.07 0.934574 4.10204
+36 2.13 1.24791 4.52041
+37 2.19 1.0653 4.89796
+38 2.25 1.11836 5.31633
+39 2.31 0.828111 5.64286
+40 2.37 1.15549 6.12245
+41 2.43 0.841889 6.4898
+42 2.49 0.757262 6.83673
+43 2.55 0.785757 7.21429
+44 2.61 0.750047 7.59184
+45 2.67 1.31721 8.28571
+46 2.73 1.0376 8.85714
+47 2.79 1.04668 9.45918
+48 2.85 1.05408 10.0918
+49 2.91 0.864293 10.6327
+50 2.97 1.12718 11.3673
+107100 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 1.36191 0.0204082
+9 0.51 0 0.0204082
+10 0.57 0.424655 0.0306122
+11 0.63 0.347678 0.0408163
+12 0.69 0.579756 0.0612245
+13 0.75 0.981505 0.102041
+14 0.81 0.841547 0.142857
+15 0.87 1.64142 0.234694
+16 0.93 1.27691 0.316327
+17 0.99 1.26773 0.408163
+18 1.05 0.751348 0.469388
+19 1.11 1.68084 0.622449
+20 1.17 0.706021 0.693878
+21 1.23 1.36893 0.846939
+22 1.29 1.41052 1.02041
+23 1.35 1.3637 1.20408
+24 1.41 0.902872 1.33673
+25 1.47 1.40577 1.56122
+26 1.53 1.71059 1.85714
+27 1.59 1.20161 2.08163
+28 1.65 0.760786 2.23469
+29 1.71 0.802784 2.40816
+30 1.77 1.27819 2.70408
+31 1.83 1.11329 2.97959
+32 1.89 1.39165 3.34694
+33 1.95 0.76261 3.56122
+34 2.01 1.23045 3.92857
+35 2.07 0.870121 4.20408
+36 2.13 1.09572 4.57143
+37 2.19 0.806175 4.85714
+38 2.25 1.22746 5.31633
+39 2.31 1.03514 5.72449
+40 2.37 0.983392 6.13265
+41 2.43 0.841889 6.5
+42 2.49 1.18044 7.04082
+43 2.55 1.12554 7.58163
+44 2.61 1.09466 8.13265
+45 2.67 0.697346 8.5
+46 2.73 0.982019 9.04082
+47 2.79 1.17086 9.71429
+48 2.85 0.731054 10.1531
+49 2.91 1.01106 10.7857
+50 2.97 0.923658 11.3878
+107150 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 1.81231 0.0204082
+8 0.45 2.04287 0.0510204
+9 0.51 0 0.0510204
+10 0.57 1.69862 0.0918367
+11 0.63 1.04303 0.122449
+12 0.69 0.869633 0.153061
+13 0.75 1.96301 0.234694
+14 0.81 0.210387 0.244898
+15 0.87 1.27666 0.316327
+16 0.93 3.03266 0.510204
+17 0.99 1.12687 0.591837
+18 1.05 0.751348 0.653061
+19 1.11 1.45673 0.785714
+20 1.17 0.907742 0.877551
+21 1.23 0.912621 0.979592
+22 1.29 1.1616 1.12245
+23 1.35 0.984898 1.2551
+24 1.41 0.972324 1.39796
+25 1.47 0.830683 1.53061
+26 1.53 1.06175 1.71429
+27 1.59 1.25623 1.94898
+28 1.65 1.11582 2.17347
+29 1.71 0.802784 2.34694
+30 1.77 1.32227 2.65306
+31 1.83 1.11329 2.92857
+32 1.89 1.00508 3.19388
+33 1.95 0.871554 3.43878
+34 2.01 1.19627 3.79592
+35 2.07 1.12793 4.15306
+36 2.13 0.76092 4.40816
+37 2.19 1.15168 4.81633
+38 2.25 1.09108 5.22449
+39 2.31 0.879867 5.57143
+40 2.37 0.860468 5.92857
+41 2.43 1.07575 6.39796
+42 2.49 1.0468 6.87755
+43 2.55 0.998123 7.35714
+44 2.61 1.07439 7.89796
+45 2.67 1.06539 8.45918
+46 2.73 1.01908 9.02041
+47 2.79 0.833795 9.5
+48 2.85 0.81606 9.9898
+49 2.91 1.1089 10.6837
+50 2.97 0.845382 11.2347
+107200 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 1.26463 0.0102041
+7 0.39 0 0.0102041
+8 0.45 2.04287 0.0408163
+9 0.51 1.06066 0.0612245
+10 0.57 1.27396 0.0918367
+11 0.63 0 0.0918367
+12 0.69 1.15951 0.132653
+13 0.75 1.22688 0.183673
+14 0.81 1.47271 0.255102
+15 0.87 0.364759 0.27551
+16 0.93 2.23459 0.418367
+17 0.99 1.83116 0.55102
+18 1.05 1.37747 0.663265
+19 1.11 1.34467 0.785714
+20 1.17 1.21032 0.908163
+21 1.23 0.821359 1
+22 1.29 0.829715 1.10204
+23 1.35 0.833375 1.21429
+24 1.41 1.45849 1.42857
+25 1.47 1.34187 1.64286
+26 1.53 0.766817 1.77551
+27 1.59 0.983136 1.95918
+28 1.65 1.31869 2.22449
+29 1.71 1.18057 2.47959
+30 1.77 0.925588 2.69388
+31 1.83 1.36069 3.03061
+32 1.89 0.695824 3.21429
+33 1.95 0.83524 3.44898
+34 2.01 1.09374 3.77551
+35 2.07 1.06348 4.11224
+36 2.13 1.06529 4.46939
+37 2.19 1.12289 4.86735
+38 2.25 0.954694 5.22449
+39 2.31 1.11277 5.66327
+40 2.37 0.909638 6.04082
+41 2.43 1.00559 6.47959
+42 2.49 0.979986 6.92857
+43 2.55 1.06183 7.43878
+44 2.61 0.831133 7.85714
+45 2.67 1.06539 8.41837
+46 2.73 1.00055 8.96939
+47 2.79 1.02894 9.56122
+48 2.85 0.901066 10.102
+49 2.91 1.27198 10.898
+50 2.97 1.1898 11.6735
+107250 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 1.26463 0.0102041
+7 0.39 0 0.0102041
+8 0.45 0 0.0102041
+9 0.51 0 0.0102041
+10 0.57 0.84931 0.0306122
+11 0.63 2.78143 0.112245
+12 0.69 0.579756 0.132653
+13 0.75 1.22688 0.183673
+14 0.81 1.05193 0.234694
+15 0.87 1.27666 0.306122
+16 0.93 1.1173 0.377551
+17 0.99 1.6903 0.5
+18 1.05 2.12882 0.673469
+19 1.11 0.672336 0.734694
+20 1.17 1.0086 0.836735
+21 1.23 1.64272 1.02041
+22 1.29 1.1616 1.16327
+23 1.35 0.303045 1.20408
+24 1.41 0.902872 1.33673
+25 1.47 1.91696 1.64286
+26 1.53 0.825803 1.78571
+27 1.59 1.20161 2.0102
+28 1.65 1.01438 2.21429
+29 1.71 0.89723 2.40816
+30 1.77 1.23412 2.69388
+31 1.83 1.44316 3.05102
+32 1.89 1.08239 3.33673
+33 1.95 0.76261 3.55102
+34 2.01 1.43553 3.97959
+35 2.07 1.28907 4.38776
+36 2.13 0.821793 4.66327
+37 2.19 1.32443 5.13265
+38 2.25 1.33657 5.63265
+39 2.31 1.03514 6.04082
+40 2.37 0.934223 6.42857
+41 2.43 0.912046 6.82653
+42 2.49 0.935441 7.2551
+43 2.55 0.89194 7.68367
+44 2.61 0.993305 8.18367
+45 2.67 0.949166 8.68367
+46 2.73 0.870847 9.16327
+47 2.79 0.957978 9.71429
+48 2.85 1.10508 10.3776
+49 2.91 0.750142 10.8469
+50 2.97 0.923658 11.449
+107300 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 0 0
+9 0.51 1.06066 0.0204082
+10 0.57 0.424655 0.0306122
+11 0.63 1.39071 0.0714286
+12 0.69 0.869633 0.102041
+13 0.75 1.22688 0.153061
+14 0.81 1.89348 0.244898
+15 0.87 1.27666 0.316327
+16 0.93 1.75575 0.428571
+17 0.99 1.26773 0.520408
+18 1.05 0.751348 0.581633
+19 1.11 1.68084 0.734694
+20 1.17 1.21032 0.857143
+21 1.23 1.27767 1
+22 1.29 1.07863 1.13265
+23 1.35 0.833375 1.2449
+24 1.41 1.25013 1.42857
+25 1.47 1.53357 1.67347
+26 1.53 1.35668 1.90816
+27 1.59 1.20161 2.13265
+28 1.65 1.36941 2.40816
+29 1.71 0.755562 2.57143
+30 1.77 0.925588 2.78571
+31 1.83 1.19576 3.08163
+32 1.89 0.966422 3.33673
+33 1.95 1.08944 3.64286
+34 2.01 0.957019 3.92857
+35 2.07 1.09571 4.27551
+36 2.13 0.94354 4.59184
+37 2.19 1.23805 5.03061
+38 2.25 1.03652 5.41837
+39 2.31 1.0869 5.84694
+40 2.37 0.958808 6.2449
+41 2.43 1.05236 6.70408
+42 2.49 0.868624 7.10204
+43 2.55 1.0406 7.60204
+44 2.61 1.15548 8.18367
+45 2.67 0.910424 8.66327
+46 2.73 1.01908 9.22449
+47 2.79 0.833795 9.70408
+48 2.85 1.05408 10.3367
+49 2.91 0.766449 10.8163
+50 2.97 0.814071 11.3469
+107350 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 1.81231 0.0204082
+8 0.45 2.04287 0.0510204
+9 0.51 0.530329 0.0612245
+10 0.57 0.84931 0.0816327
+11 0.63 2.43375 0.153061
+12 0.69 1.44939 0.204082
+13 0.75 0.736129 0.234694
+14 0.81 2.10387 0.336735
+15 0.87 1.09428 0.397959
+16 0.93 1.43652 0.489796
+17 0.99 1.83116 0.622449
+18 1.05 1.12702 0.714286
+19 1.11 1.0085 0.806122
+20 1.17 1.41204 0.94898
+21 1.23 1.00388 1.06122
+22 1.29 1.57646 1.2551
+23 1.35 1.13642 1.40816
+24 1.41 1.11123 1.57143
+25 1.47 0.638987 1.67347
+26 1.53 1.35668 1.90816
+27 1.59 1.31085 2.15306
+28 1.65 0.912943 2.33673
+29 1.71 1.13334 2.58163
+30 1.77 1.76303 2.9898
+31 1.83 1.03083 3.2449
+32 1.89 0.657167 3.41837
+33 1.95 1.19839 3.7551
+34 2.01 0.854481 4.0102
+35 2.07 0.999027 4.32653
+36 2.13 0.85223 4.61224
+37 2.19 0.575839 4.81633
+38 2.25 1.11836 5.23469
+39 2.31 0.983381 5.62245
+40 2.37 1.10632 6.08163
+41 2.43 1.02897 6.53061
+42 2.49 1.2918 7.12245
+43 2.55 0.976887 7.59184
+44 2.61 1.17575 8.18367
+45 2.67 0.832941 8.62245
+46 2.73 0.83379 9.08163
+47 2.79 1.11764 9.72449
+48 2.85 0.95207 10.2959
+49 2.91 1.05998 10.9592
+50 2.97 0.876692 11.5306
+107400 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0.906153 0.0102041
+8 0.45 0 0.0102041
+9 0.51 0 0.0102041
+10 0.57 1.27396 0.0408163
+11 0.63 1.04303 0.0714286
+12 0.69 2.89878 0.173469
+13 0.75 1.96301 0.255102
+14 0.81 1.89348 0.346939
+15 0.87 0.364759 0.367347
+16 0.93 1.59614 0.469388
+17 0.99 1.40859 0.571429
+18 1.05 1.25225 0.673469
+19 1.11 1.56878 0.816327
+20 1.17 0.706021 0.887755
+21 1.23 1.18641 1.02041
+22 1.29 1.41052 1.19388
+23 1.35 1.21218 1.35714
+24 1.41 1.11123 1.52041
+25 1.47 0.830683 1.65306
+26 1.53 1.2387 1.86735
+27 1.59 0.873898 2.03061
+28 1.65 1.47085 2.32653
+29 1.71 0.944452 2.53061
+30 1.77 0.837437 2.72449
+31 1.83 0.989594 2.96939
+32 1.89 1.08239 3.2551
+33 1.95 0.871554 3.5
+34 2.01 0.957019 3.78571
+35 2.07 0.934574 4.08163
+36 2.13 1.24791 4.5
+37 2.19 0.950135 4.83673
+38 2.25 1.09108 5.2449
+39 2.31 0.698718 5.52041
+40 2.37 0.885053 5.88776
+41 2.43 0.818503 6.2449
+42 2.49 1.15816 6.77551
+43 2.55 0.998123 7.2551
+44 2.61 1.03385 7.77551
+45 2.67 1.04602 8.32653
+46 2.73 0.907904 8.82653
+47 2.79 1.24182 9.54082
+48 2.85 1.12208 10.2143
+49 2.91 1.01106 10.8469
+50 2.97 0.767106 11.3469
+107450 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 0 0
+9 0.51 0.530329 0.0102041
+10 0.57 1.27396 0.0408163
+11 0.63 1.04303 0.0714286
+12 0.69 1.73927 0.132653
+13 0.75 1.71763 0.204082
+14 0.81 1.05193 0.255102
+15 0.87 0.911898 0.306122
+16 0.93 1.59614 0.408163
+17 0.99 1.83116 0.540816
+18 1.05 1.25225 0.642857
+19 1.11 1.12056 0.744898
+20 1.17 1.31118 0.877551
+21 1.23 1.18641 1.0102
+22 1.29 0.912687 1.12245
+23 1.35 1.28794 1.29592
+24 1.41 1.59739 1.53061
+25 1.47 0.95848 1.68367
+26 1.53 0.825803 1.82653
+27 1.59 0.983136 2.0102
+28 1.65 1.01438 2.21429
+29 1.71 0.991675 2.42857
+30 1.77 0.70521 2.59184
+31 1.83 0.989594 2.83673
+32 1.89 0.966422 3.09184
+33 1.95 0.798925 3.31633
+34 2.01 1.05956 3.63265
+35 2.07 0.902347 3.91837
+36 2.13 0.85223 4.20408
+37 2.19 1.18047 4.62245
+38 2.25 0.954694 4.97959
+39 2.31 0.776354 5.28571
+40 2.37 1.1309 5.7551
+41 2.43 0.958818 6.17347
+42 2.49 1.24725 6.7449
+43 2.55 1.25296 7.34694
+44 2.61 1.07439 7.88776
+45 2.67 0.968536 8.39796
+46 2.73 0.982019 8.93878
+47 2.79 1.04668 9.54082
+48 2.85 1.07108 10.1837
+49 2.91 0.896908 10.7449
+50 2.97 0.954968 11.3673
+107500 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0.906153 0.0102041
+8 0.45 0.680956 0.0204082
+9 0.51 0.530329 0.0306122
+10 0.57 0.84931 0.0510204
+11 0.63 1.04303 0.0816327
+12 0.69 0.869633 0.112245
+13 0.75 1.71763 0.183673
+14 0.81 1.68309 0.265306
+15 0.87 1.8238 0.367347
+16 0.93 1.43652 0.459184
+17 0.99 2.11288 0.612245
+18 1.05 0.751348 0.673469
+19 1.11 0.896448 0.755102
+20 1.17 0.806882 0.836735
+21 1.23 1.00388 0.94898
+22 1.29 0.746744 1.04082
+23 1.35 1.13642 1.19388
+24 1.41 0.833421 1.31633
+25 1.47 1.08628 1.4898
+26 1.53 0.825803 1.63265
+27 1.59 0.983136 1.81633
+28 1.65 1.47085 2.11224
+29 1.71 1.13334 2.35714
+30 1.77 1.05782 2.60204
+31 1.83 1.15453 2.88776
+32 1.89 0.811794 3.10204
+33 1.95 1.27102 3.45918
+34 2.01 1.12791 3.79592
+35 2.07 1.48243 4.26531
+36 2.13 1.09572 4.63265
+37 2.19 0.806175 4.91837
+38 2.25 1.20019 5.36735
+39 2.31 0.828111 5.69388
+40 2.37 0.958808 6.09184
+41 2.43 0.795117 6.43878
+42 2.49 1.00226 6.89796
+43 2.55 1.23173 7.4898
+44 2.61 1.01358 8
+45 2.67 1.06539 8.56122
+46 2.73 0.926433 9.07143
+47 2.79 1.15312 9.73469
+48 2.85 0.969072 10.3163
+49 2.91 1.1089 11.0102
+50 2.97 1.09587 11.7245
+107550 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0.906153 0.0102041
+8 0.45 1.36191 0.0306122
+9 0.51 2.12132 0.0714286
+10 0.57 0.84931 0.0918367
+11 0.63 1.04303 0.122449
+12 0.69 1.15951 0.163265
+13 0.75 0.981505 0.204082
+14 0.81 1.05193 0.255102
+15 0.87 2.00617 0.367347
+16 0.93 1.43652 0.459184
+17 0.99 0.704293 0.510204
+18 1.05 1.37747 0.622449
+19 1.11 1.12056 0.72449
+20 1.17 1.5129 0.877551
+21 1.23 1.00388 0.989796
+22 1.29 0.829715 1.09184
+23 1.35 0.984898 1.22449
+24 1.41 1.25013 1.40816
+25 1.47 0.95848 1.56122
+26 1.53 1.47465 1.81633
+27 1.59 1.20161 2.04082
+28 1.65 1.11582 2.26531
+29 1.71 0.944452 2.46939
+30 1.77 1.10189 2.72449
+31 1.83 1.07206 2.9898
+32 1.89 1.39165 3.35714
+33 1.95 0.944184 3.62245
+34 2.01 1.29881 4.0102
+35 2.07 0.805667 4.26531
+36 2.13 0.94354 4.58163
+37 2.19 0.892551 4.89796
+38 2.25 0.845586 5.21429
+39 2.31 1.13865 5.66327
+40 2.37 1.05715 6.10204
+41 2.43 1.02897 6.55102
+42 2.49 0.935441 6.97959
+43 2.55 0.95565 7.43878
+44 2.61 0.851404 7.86735
+45 2.67 1.06539 8.42857
+46 2.73 1.01908 8.9898
+47 2.79 1.20634 9.68367
+48 2.85 1.03708 10.3061
+49 2.91 1.02737 10.949
+50 2.97 1.23676 11.7551
+107600 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 0.680956 0.0102041
+9 0.51 0 0.0102041
+10 0.57 2.12327 0.0612245
+11 0.63 0.695356 0.0816327
+12 0.69 2.02914 0.153061
+13 0.75 0.736129 0.183673
+14 0.81 1.26232 0.244898
+15 0.87 0.911898 0.295918
+16 0.93 0.957682 0.357143
+17 0.99 1.40859 0.459184
+18 1.05 0.751348 0.520408
+19 1.11 0.896448 0.602041
+20 1.17 1.0086 0.704082
+21 1.23 1.46019 0.867347
+22 1.29 0.746744 0.959184
+23 1.35 1.06066 1.10204
+24 1.41 1.04178 1.2551
+25 1.47 1.27797 1.45918
+26 1.53 1.12073 1.65306
+27 1.59 1.09237 1.85714
+28 1.65 0.811505 2.02041
+29 1.71 0.944452 2.22449
+30 1.77 1.67487 2.61224
+31 1.83 1.23699 2.91837
+32 1.89 1.23702 3.2449
+33 1.95 1.01681 3.53061
+34 2.01 0.88866 3.79592
+35 2.07 1.16016 4.16327
+36 2.13 0.700046 4.39796
+37 2.19 0.892551 4.71429
+38 2.25 1.09108 5.12245
+39 2.31 0.983381 5.5102
+40 2.37 0.983392 5.91837
+41 2.43 1.1459 6.41837
+42 2.49 0.846351 6.80612
+43 2.55 0.913177 7.2449
+44 2.61 1.21629 7.85714
+45 2.67 0.968536 8.36735
+46 2.73 0.704089 8.7551
+47 2.79 1.02894 9.34694
+48 2.85 0.81606 9.83673
+49 2.91 1.12521 10.5408
+50 2.97 0.892347 11.1224
+107650 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 0 0
+9 0.51 1.59099 0.0306122
+10 0.57 1.27396 0.0612245
+11 0.63 1.73839 0.112245
+12 0.69 1.44939 0.163265
+13 0.75 1.22688 0.214286
+14 0.81 1.68309 0.295918
+15 0.87 1.45904 0.377551
+16 0.93 1.27691 0.459184
+17 0.99 1.40859 0.561224
+18 1.05 1.25225 0.663265
+19 1.11 0.672336 0.72449
+20 1.17 0.706021 0.795918
+21 1.23 0.821359 0.887755
+22 1.29 1.07863 1.02041
+23 1.35 0.833375 1.13265
+24 1.41 1.73629 1.38776
+25 1.47 1.08628 1.56122
+26 1.53 1.65161 1.84694
+27 1.59 1.20161 2.07143
+28 1.65 0.912943 2.2551
+29 1.71 0.991675 2.46939
+30 1.77 1.05782 2.71429
+31 1.83 1.27823 3.03061
+32 1.89 0.502539 3.16327
+33 1.95 0.689981 3.35714
+34 2.01 1.46971 3.79592
+35 2.07 0.870121 4.07143
+36 2.13 0.821793 4.34694
+37 2.19 1.0653 4.72449
+38 2.25 1.09108 5.13265
+39 2.31 0.828111 5.45918
+40 2.37 1.08173 5.90816
+41 2.43 0.958818 6.32653
+42 2.49 1.09135 6.82653
+43 2.55 1.06183 7.33673
+44 2.61 0.871676 7.77551
+45 2.67 1.02665 8.31633
+46 2.73 1.13025 8.93878
+47 2.79 1.24182 9.65306
+48 2.85 0.867064 10.1735
+49 2.91 1.12521 10.8776
+50 2.97 1.09587 11.5918
+107700 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 0 0
+9 0.51 0.530329 0.0102041
+10 0.57 0.84931 0.0306122
+11 0.63 3.47678 0.132653
+12 0.69 0.579756 0.153061
+13 0.75 1.22688 0.204082
+14 0.81 1.89348 0.295918
+15 0.87 0.729518 0.336735
+16 0.93 0.798069 0.387755
+17 0.99 1.6903 0.510204
+18 1.05 1.62792 0.642857
+19 1.11 1.23262 0.755102
+20 1.17 0.907742 0.846939
+21 1.23 1.36893 1
+22 1.29 0.829715 1.10204
+23 1.35 1.06066 1.2449
+24 1.41 1.04178 1.39796
+25 1.47 1.15018 1.58163
+26 1.53 1.12073 1.77551
+27 1.59 1.31085 2.02041
+28 1.65 1.11582 2.2449
+29 1.71 0.755562 2.40816
+30 1.77 1.19004 2.68367
+31 1.83 1.15453 2.96939
+32 1.89 1.23702 3.29592
+33 1.95 1.2347 3.64286
+34 2.01 0.786122 3.87755
+35 2.07 1.09571 4.22449
+36 2.13 1.27835 4.65306
+37 2.19 1.03651 5.02041
+38 2.25 0.90014 5.35714
+39 2.31 1.19041 5.82653
+40 2.37 0.885053 6.19388
+41 2.43 1.23945 6.73469
+42 2.49 0.979986 7.18367
+43 2.55 1.08307 7.70408
+44 2.61 0.973034 8.19388
+45 2.67 0.910424 8.67347
+46 2.73 0.83379 9.13265
+47 2.79 1.02894 9.72449
+48 2.85 0.697051 10.1429
+49 2.91 1.1089 10.8367
+50 2.97 1.00193 11.4898
+107750 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 1.81231 0.0204082
+8 0.45 0.680956 0.0306122
+9 0.51 1.06066 0.0510204
+10 0.57 0.424655 0.0612245
+11 0.63 2.78143 0.142857
+12 0.69 1.15951 0.183673
+13 0.75 1.22688 0.234694
+14 0.81 0.841547 0.27551
+15 0.87 0.911898 0.326531
+16 0.93 0.798069 0.377551
+17 0.99 1.40859 0.479592
+18 1.05 0.876573 0.55102
+19 1.11 1.0085 0.642857
+20 1.17 1.41204 0.785714
+21 1.23 1.09515 0.908163
+22 1.29 1.07863 1.04082
+23 1.35 0.606091 1.12245
+24 1.41 0.763969 1.23469
+25 1.47 0.95848 1.38776
+26 1.53 1.17972 1.59184
+27 1.59 1.42008 1.85714
+28 1.65 1.62301 2.18367
+29 1.71 0.802784 2.35714
+30 1.77 1.14597 2.62245
+31 1.83 1.36069 2.95918
+32 1.89 1.12105 3.2551
+33 1.95 1.01681 3.54082
+34 2.01 1.02538 3.84694
+35 2.07 0.837894 4.11224
+36 2.13 1.21747 4.52041
+37 2.19 1.00772 4.87755
+38 2.25 1.0638 5.27551
+39 2.31 1.0869 5.70408
+40 2.37 1.10632 6.16327
+41 2.43 0.88866 6.55102
+42 2.49 0.757262 6.89796
+43 2.55 1.18925 7.46939
+44 2.61 1.29738 8.12245
+45 2.67 0.677975 8.47959
+46 2.73 1.11172 9.09184
+47 2.79 0.745094 9.52041
+48 2.85 1.03708 10.1429
+49 2.91 0.880601 10.6939
+50 2.97 0.954968 11.3163
+107800 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0.906153 0.0102041
+8 0.45 0 0.0102041
+9 0.51 0.530329 0.0204082
+10 0.57 2.54793 0.0816327
+11 0.63 0.347678 0.0918367
+12 0.69 0.289878 0.102041
+13 0.75 2.69914 0.214286
+14 0.81 1.05193 0.265306
+15 0.87 1.45904 0.346939
+16 0.93 0.957682 0.408163
+17 0.99 0.98601 0.479592
+18 1.05 1.62792 0.612245
+19 1.11 0.56028 0.663265
+20 1.17 1.31118 0.795918
+21 1.23 1.09515 0.918367
+22 1.29 1.07863 1.05102
+23 1.35 1.13642 1.20408
+24 1.41 1.31958 1.39796
+25 1.47 0.638987 1.5
+26 1.53 1.06175 1.68367
+27 1.59 0.928517 1.85714
+28 1.65 1.31869 2.12245
+29 1.71 1.22779 2.38776
+30 1.77 0.70521 2.55102
+31 1.83 0.783428 2.7449
+32 1.89 1.12105 3.04082
+33 1.95 1.19839 3.37755
+34 2.01 0.922839 3.65306
+35 2.07 0.966801 3.95918
+36 2.13 0.882667 4.2551
+37 2.19 1.12289 4.65306
+38 2.25 0.954694 5.0102
+39 2.31 1.0869 5.43878
+40 2.37 0.835884 5.78571
+41 2.43 0.958818 6.20408
+42 2.49 0.824079 6.58163
+43 2.55 1.12554 7.12245
+44 2.61 1.15548 7.70408
+45 2.67 0.968536 8.21429
+46 2.73 1.00055 8.76531
+47 2.79 1.02894 9.35714
+48 2.85 0.95207 9.92857
+49 2.91 1.07629 10.602
+50 2.97 1.0489 11.2857
+107850 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 1.26463 0.0102041
+7 0.39 0 0.0102041
+8 0.45 2.04287 0.0408163
+9 0.51 0 0.0408163
+10 0.57 0.424655 0.0510204
+11 0.63 1.73839 0.102041
+12 0.69 1.73927 0.163265
+13 0.75 0.981505 0.204082
+14 0.81 1.47271 0.27551
+15 0.87 1.09428 0.336735
+16 0.93 1.1173 0.408163
+17 0.99 1.54944 0.520408
+18 1.05 1.25225 0.622449
+19 1.11 0.896448 0.704082
+20 1.17 0.907742 0.795918
+21 1.23 1.00388 0.908163
+22 1.29 1.7424 1.12245
+23 1.35 0.833375 1.23469
+24 1.41 1.25013 1.41837
+25 1.47 0.894581 1.56122
+26 1.53 0.943774 1.72449
+27 1.59 1.09237 1.92857
+28 1.65 1.26798 2.18367
+29 1.71 1.13334 2.42857
+30 1.77 0.881513 2.63265
+31 1.83 0.989594 2.87755
+32 1.89 0.966422 3.13265
+33 1.95 1.12576 3.44898
+34 2.01 0.683585 3.65306
+35 2.07 1.32129 4.07143
+36 2.13 1.06529 4.42857
+37 2.19 0.978927 4.77551
+38 2.25 0.927417 5.12245
+39 2.31 1.06102 5.54082
+40 2.37 0.885053 5.90816
+41 2.43 0.935432 6.31633
+42 2.49 0.957713 6.7551
+43 2.55 1.2742 7.36735
+44 2.61 0.973034 7.85714
+45 2.67 1.02665 8.39796
+46 2.73 1.05613 8.97959
+47 2.79 0.887016 9.4898
+48 2.85 0.884065 10.0204
+49 2.91 0.994753 10.6429
+50 2.97 1.01759 11.3061
+107900 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 0.680956 0.0102041
+9 0.51 1.06066 0.0306122
+10 0.57 0.84931 0.0510204
+11 0.63 1.73839 0.102041
+12 0.69 1.15951 0.142857
+13 0.75 1.47226 0.204082
+14 0.81 0.63116 0.234694
+15 0.87 1.8238 0.336735
+16 0.93 1.43652 0.428571
+17 0.99 1.83116 0.561224
+18 1.05 1.12702 0.653061
+19 1.11 1.12056 0.755102
+20 1.17 1.31118 0.887755
+21 1.23 1.46019 1.05102
+22 1.29 0.912687 1.16327
+23 1.35 1.06066 1.30612
+24 1.41 1.11123 1.46939
+25 1.47 0.766784 1.59184
+26 1.53 1.12073 1.78571
+27 1.59 1.4747 2.06122
+28 1.65 0.862224 2.23469
+29 1.71 0.944452 2.43878
+30 1.77 1.05782 2.68367
+31 1.83 1.19576 2.97959
+32 1.89 1.04374 3.2551
+33 1.95 0.798925 3.47959
+34 2.01 1.02538 3.78571
+35 2.07 0.999027 4.10204
+36 2.13 1.30878 4.54082
+37 2.19 0.863759 4.84694
+38 2.25 0.872863 5.17347
+39 2.31 1.13865 5.62245
+40 2.37 1.27841 6.15306
+41 2.43 0.958818 6.57143
+42 2.49 0.913168 6.9898
+43 2.55 0.82823 7.38776
+44 2.61 1.05412 7.91837
+45 2.67 0.929795 8.40816
+46 2.73 1.13025 9.03061
+47 2.79 0.993458 9.60204
+48 2.85 0.969072 10.1837
+49 2.91 0.799064 10.6837
+50 2.97 1.09587 11.398
+107950 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 1.81231 0.0204082
+8 0.45 0.680956 0.0306122
+9 0.51 0.530329 0.0408163
+10 0.57 2.12327 0.0918367
+11 0.63 0.695356 0.112245
+12 0.69 2.6089 0.204082
+13 0.75 1.22688 0.255102
+14 0.81 1.26232 0.316327
+15 0.87 0.547139 0.346939
+16 0.93 1.75575 0.459184
+17 0.99 1.12687 0.540816
+18 1.05 1.25225 0.642857
+19 1.11 0.672336 0.704082
+20 1.17 1.31118 0.836735
+21 1.23 1.36893 0.989796
+22 1.29 0.829715 1.09184
+23 1.35 1.13642 1.2449
+24 1.41 1.11123 1.40816
+25 1.47 1.02238 1.57143
+26 1.53 0.943774 1.73469
+27 1.59 0.873898 1.89796
+28 1.65 1.26798 2.15306
+29 1.71 1.36946 2.44898
+30 1.77 1.05782 2.69388
+31 1.83 1.03083 2.94898
+32 1.89 0.966422 3.20408
+33 1.95 1.16207 3.53061
+34 2.01 1.23045 3.89796
+35 2.07 0.999027 4.21429
+36 2.13 0.76092 4.46939
+37 2.19 1.00772 4.82653
+38 2.25 0.981971 5.19388
+39 2.31 0.724597 5.47959
+40 2.37 1.00798 5.89796
+41 2.43 1.21606 6.42857
+42 2.49 1.11362 6.93878
+43 2.55 0.806993 7.32653
+44 2.61 0.750047 7.70408
+45 2.67 0.832941 8.14286
+46 2.73 0.870847 8.62245
+47 2.79 1.0112 9.20408
+48 2.85 1.20709 9.92857
+49 2.91 1.17413 10.6633
+50 2.97 0.861037 11.2245
+108000 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 0.680956 0.0102041
+9 0.51 0.530329 0.0204082
+10 0.57 0.84931 0.0408163
+11 0.63 0.695356 0.0612245
+12 0.69 0.869633 0.0918367
+13 0.75 1.96301 0.173469
+14 0.81 1.26232 0.234694
+15 0.87 2.00617 0.346939
+16 0.93 2.07498 0.479592
+17 0.99 0.98601 0.55102
+18 1.05 0.626123 0.602041
+19 1.11 1.45673 0.734694
+20 1.17 0.706021 0.806122
+21 1.23 0.912621 0.908163
+22 1.29 0.497829 0.969388
+23 1.35 1.13642 1.12245
+24 1.41 1.66684 1.36735
+25 1.47 1.02238 1.53061
+26 1.53 1.65161 1.81633
+27 1.59 1.20161 2.04082
+28 1.65 1.11582 2.26531
+29 1.71 1.08612 2.5
+30 1.77 0.837437 2.69388
+31 1.83 1.03083 2.94898
+32 1.89 1.23702 3.27551
+33 1.95 1.01681 3.56122
+34 2.01 0.854481 3.81633
+35 2.07 0.805667 4.07143
+36 2.13 1.21747 4.47959
+37 2.19 0.921343 4.80612
+38 2.25 0.90014 5.14286
+39 2.31 0.879867 5.4898
+40 2.37 1.00798 5.90816
+41 2.43 1.05236 6.36735
+42 2.49 0.979986 6.81633
+43 2.55 0.913177 7.2551
+44 2.61 1.11493 7.81633
+45 2.67 0.910424 8.29592
+46 2.73 0.96349 8.82653
+47 2.79 0.745094 9.2551
+48 2.85 1.20709 9.97959
+49 2.91 1.0926 10.6633
+50 2.97 0.939313 11.2755
+108050 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 0.680956 0.0102041
+9 0.51 0.530329 0.0204082
+10 0.57 1.27396 0.0510204
+11 0.63 1.39071 0.0918367
+12 0.69 2.31902 0.173469
+13 0.75 1.47226 0.234694
+14 0.81 1.47271 0.306122
+15 0.87 0.729518 0.346939
+16 0.93 2.23459 0.489796
+17 0.99 0.704293 0.540816
+18 1.05 0.751348 0.602041
+19 1.11 0.336168 0.632653
+20 1.17 1.21032 0.755102
+21 1.23 0.912621 0.857143
+22 1.29 0.912687 0.969388
+23 1.35 1.13642 1.12245
+24 1.41 1.11123 1.28571
+25 1.47 1.21407 1.47959
+26 1.53 0.884789 1.63265
+27 1.59 1.31085 1.87755
+28 1.65 0.862224 2.05102
+29 1.71 1.18057 2.30612
+30 1.77 1.14597 2.57143
+31 1.83 1.19576 2.86735
+32 1.89 1.27568 3.20408
+33 1.95 0.907869 3.45918
+34 2.01 1.05956 3.77551
+35 2.07 0.999027 4.09184
+36 2.13 0.85223 4.37755
+37 2.19 0.892551 4.69388
+38 2.25 0.845586 5.0102
+39 2.31 1.26804 5.5102
+40 2.37 1.00798 5.92857
+41 2.43 0.982203 6.35714
+42 2.49 0.846351 6.7449
+43 2.55 1.08307 7.26531
+44 2.61 0.932491 7.73469
+45 2.67 1.02665 8.27551
+46 2.73 0.778204 8.70408
+47 2.79 1.02894 9.29592
+48 2.85 1.05408 9.92857
+49 2.91 1.04368 10.5816
+50 2.97 1.00193 11.2347
+108100 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 1.26463 0.0102041
+7 0.39 0.906153 0.0204082
+8 0.45 1.36191 0.0408163
+9 0.51 1.06066 0.0612245
+10 0.57 0 0.0612245
+11 0.63 1.39071 0.102041
+12 0.69 0.869633 0.132653
+13 0.75 0.981505 0.173469
+14 0.81 0.841547 0.214286
+15 0.87 0.547139 0.244898
+16 0.93 1.1173 0.316327
+17 0.99 1.40859 0.418367
+18 1.05 1.12702 0.510204
+19 1.11 0.56028 0.561224
+20 1.17 1.0086 0.663265
+21 1.23 1.18641 0.795918
+22 1.29 0.663772 0.877551
+23 1.35 0.909136 1
+24 1.41 1.45849 1.21429
+25 1.47 1.02238 1.37755
+26 1.53 0.943774 1.54082
+27 1.59 1.09237 1.7449
+28 1.65 0.862224 1.91837
+29 1.71 1.32223 2.20408
+30 1.77 1.36634 2.52041
+31 1.83 0.577263 2.66327
+32 1.89 1.19836 2.97959
+33 1.95 1.05313 3.27551
+34 2.01 1.19627 3.63265
+35 2.07 0.966801 3.93878
+36 2.13 1.36966 4.39796
+37 2.19 0.892551 4.71429
+38 2.25 0.791032 5.0102
+39 2.31 0.828111 5.33673
+40 2.37 1.10632 5.79592
+41 2.43 0.72496 6.11224
+42 2.49 1.26953 6.69388
+43 2.55 1.16802 7.2551
+44 2.61 0.871676 7.69388
+45 2.67 0.987907 8.21429
+46 2.73 0.796732 8.65306
+47 2.79 1.02894 9.2449
+48 2.85 1.08808 9.89796
+49 2.91 1.15783 10.6224
+50 2.97 0.876692 11.1939
+108150 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 0 0
+9 0.51 1.06066 0.0204082
+10 0.57 0.84931 0.0408163
+11 0.63 0.347678 0.0510204
+12 0.69 0.869633 0.0816327
+13 0.75 1.22688 0.132653
+14 0.81 0.420773 0.153061
+15 0.87 1.45904 0.234694
+16 0.93 1.43652 0.326531
+17 0.99 0.98601 0.397959
+18 1.05 0.751348 0.459184
+19 1.11 0.56028 0.510204
+20 1.17 1.41204 0.653061
+21 1.23 1.46019 0.816327
+22 1.29 0.995658 0.938776
+23 1.35 0.833375 1.05102
+24 1.41 0.694517 1.15306
+25 1.47 1.15018 1.33673
+26 1.53 1.35668 1.57143
+27 1.59 1.20161 1.79592
+28 1.65 1.16654 2.03061
+29 1.71 1.18057 2.28571
+30 1.77 0.793362 2.46939
+31 1.83 0.907127 2.69388
+32 1.89 1.12105 2.9898
+33 1.95 1.08944 3.29592
+34 2.01 0.957019 3.58163
+35 2.07 0.902347 3.86735
+36 2.13 0.76092 4.12245
+37 2.19 0.950135 4.45918
+38 2.25 1.03652 4.84694
+39 2.31 0.776354 5.15306
+40 2.37 1.05715 5.59184
+41 2.43 0.88866 5.97959
+42 2.49 1.15816 6.5102
+43 2.55 0.998123 6.9898
+44 2.61 1.09466 7.54082
+45 2.67 1.18161 8.16327
+46 2.73 0.982019 8.70408
+47 2.79 1.04668 9.30612
+48 2.85 1.10508 9.96939
+49 2.91 1.04368 10.6224
+50 2.97 0.861037 11.1837
+108200 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 0 0
+9 0.51 1.59099 0.0306122
+10 0.57 0.424655 0.0408163
+11 0.63 1.39071 0.0816327
+12 0.69 0.869633 0.112245
+13 0.75 0.490753 0.132653
+14 0.81 0.841547 0.173469
+15 0.87 1.09428 0.234694
+16 0.93 1.43652 0.326531
+17 0.99 0.140859 0.336735
+18 1.05 1.87837 0.489796
+19 1.11 1.34467 0.612245
+20 1.17 1.41204 0.755102
+21 1.23 1.27767 0.897959
+22 1.29 0.414858 0.94898
+23 1.35 1.06066 1.09184
+24 1.41 0.763969 1.20408
+25 1.47 0.575088 1.29592
+26 1.53 0.943774 1.45918
+27 1.59 1.25623 1.69388
+28 1.65 1.26798 1.94898
+29 1.71 0.802784 2.12245
+30 1.77 1.10189 2.37755
+31 1.83 1.03083 2.63265
+32 1.89 1.19836 2.94898
+33 1.95 0.944184 3.21429
+34 2.01 1.05956 3.53061
+35 2.07 0.966801 3.83673
+36 2.13 1.24791 4.2551
+37 2.19 1.20926 4.68367
+38 2.25 1.0638 5.08163
+39 2.31 0.957503 5.45918
+40 2.37 1.05715 5.89796
+41 2.43 0.678188 6.19388
+42 2.49 0.979986 6.64286
+43 2.55 0.95565 7.10204
+44 2.61 1.01358 7.61224
+45 2.67 1.00728 8.14286
+46 2.73 1.13025 8.76531
+47 2.79 1.04668 9.36735
+48 2.85 1.12208 10.0408
+49 2.91 0.945831 10.6327
+50 2.97 1.01759 11.2959
+108250 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 0 0
+9 0.51 0 0
+10 0.57 0.84931 0.0204082
+11 0.63 1.73839 0.0714286
+12 0.69 0.869633 0.102041
+13 0.75 1.71763 0.173469
+14 0.81 1.26232 0.234694
+15 0.87 1.27666 0.306122
+16 0.93 1.59614 0.408163
+17 0.99 0.845152 0.469388
+18 1.05 1.0018 0.55102
+19 1.11 1.56878 0.693878
+20 1.17 0.403441 0.734694
+21 1.23 1.55146 0.908163
+22 1.29 1.1616 1.05102
+23 1.35 0.909136 1.17347
+24 1.41 1.18068 1.34694
+25 1.47 0.95848 1.5
+26 1.53 1.47465 1.7551
+27 1.59 0.81928 1.90816
+28 1.65 1.31869 2.17347
+29 1.71 1.08612 2.40816
+30 1.77 1.19004 2.68367
+31 1.83 0.989594 2.92857
+32 1.89 1.08239 3.21429
+33 1.95 1.34365 3.59184
+34 2.01 1.02538 3.89796
+35 2.07 1.22461 4.28571
+36 2.13 1.06529 4.64286
+37 2.19 0.834967 4.93878
+38 2.25 0.981971 5.30612
+39 2.31 0.698718 5.58163
+40 2.37 1.1309 6.05102
+41 2.43 0.935432 6.45918
+42 2.49 0.801806 6.82653
+43 2.55 0.998123 7.30612
+44 2.61 0.973034 7.79592
+45 2.67 1.06539 8.35714
+46 2.73 1.24142 9.04082
+47 2.79 1.31278 9.79592
+48 2.85 0.969072 10.3776
+49 2.91 0.945831 10.9694
+50 2.97 0.923658 11.5714
+108300 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 0.680956 0.0102041
+9 0.51 0.530329 0.0204082
+10 0.57 2.97258 0.0918367
+11 0.63 0.347678 0.102041
+12 0.69 1.44939 0.153061
+13 0.75 2.20839 0.244898
+14 0.81 0.841547 0.285714
+15 0.87 2.18855 0.408163
+16 0.93 0.957682 0.469388
+17 0.99 0.98601 0.540816
+18 1.05 1.37747 0.653061
+19 1.11 1.12056 0.755102
+20 1.17 1.61376 0.918367
+21 1.23 1.46019 1.08163
+22 1.29 0.746744 1.17347
+23 1.35 1.06066 1.31633
+24 1.41 1.31958 1.5102
+25 1.47 1.21407 1.70408
+26 1.53 1.47465 1.95918
+27 1.59 1.09237 2.16327
+28 1.65 1.0651 2.37755
+29 1.71 0.944452 2.58163
+30 1.77 1.27819 2.87755
+31 1.83 0.989594 3.12245
+32 1.89 0.502539 3.2551
+33 1.95 0.907869 3.5102
+34 2.01 0.88866 3.77551
+35 2.07 1.16016 4.14286
+36 2.13 1.09572 4.5102
+37 2.19 0.892551 4.82653
+38 2.25 1.03652 5.21429
+39 2.31 1.3198 5.73469
+40 2.37 1.22924 6.2449
+41 2.43 0.982203 6.67347
+42 2.49 0.957713 7.11224
+43 2.55 1.14678 7.66327
+44 2.61 0.79059 8.06122
+45 2.67 0.813571 8.4898
+46 2.73 0.852318 8.95918
+47 2.79 0.727353 9.37755
+48 2.85 1.17309 10.0816
+49 2.91 0.978445 10.6939
+50 2.97 0.68883 11.1429
+108350 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 0 0
+9 0.51 1.06066 0.0204082
+10 0.57 2.12327 0.0714286
+11 0.63 1.04303 0.102041
+12 0.69 0.869633 0.132653
+13 0.75 2.20839 0.22449
+14 0.81 2.10387 0.326531
+15 0.87 1.27666 0.397959
+16 0.93 1.75575 0.510204
+17 0.99 1.12687 0.591837
+18 1.05 1.0018 0.673469
+19 1.11 1.34467 0.795918
+20 1.17 1.0086 0.897959
+21 1.23 0.638835 0.969388
+22 1.29 1.32754 1.13265
+23 1.35 0.984898 1.26531
+24 1.41 1.25013 1.44898
+25 1.47 1.21407 1.64286
+26 1.53 1.06175 1.82653
+27 1.59 0.655424 1.94898
+28 1.65 0.963662 2.14286
+29 1.71 1.22779 2.40816
+30 1.77 1.36634 2.72449
+31 1.83 1.07206 2.9898
+32 1.89 1.12105 3.28571
+33 1.95 0.871554 3.53061
+34 2.01 0.991198 3.82653
+35 2.07 0.999027 4.14286
+36 2.13 1.03485 4.4898
+37 2.19 0.892551 4.80612
+38 2.25 0.981971 5.17347
+39 2.31 1.16453 5.63265
+40 2.37 1.1309 6.10204
+41 2.43 0.748345 6.42857
+42 2.49 0.868624 6.82653
+43 2.55 0.82823 7.22449
+44 2.61 0.648689 7.55102
+45 2.67 0.987907 8.07143
+46 2.73 1.20436 8.73469
+47 2.79 1.06442 9.34694
+48 2.85 1.05408 9.97959
+49 2.91 1.04368 10.6327
+50 2.97 1.12718 11.3673
+108400 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 1.88658 0.0102041
+6 0.33 2.52926 0.0306122
+7 0.39 0 0.0306122
+8 0.45 0 0.0306122
+9 0.51 0.530329 0.0408163
+10 0.57 2.12327 0.0918367
+11 0.63 1.39071 0.132653
+12 0.69 1.15951 0.173469
+13 0.75 1.22688 0.22449
+14 0.81 1.05193 0.27551
+15 0.87 0.911898 0.326531
+16 0.93 1.1173 0.397959
+17 0.99 1.83116 0.530612
+18 1.05 1.0018 0.612245
+19 1.11 1.0085 0.704082
+20 1.17 0.907742 0.795918
+21 1.23 1.00388 0.908163
+22 1.29 1.82537 1.13265
+23 1.35 1.28794 1.30612
+24 1.41 0.833421 1.42857
+25 1.47 0.894581 1.57143
+26 1.53 1.2387 1.78571
+27 1.59 1.36547 2.04082
+28 1.65 0.862224 2.21429
+29 1.71 1.36946 2.5102
+30 1.77 1.23412 2.79592
+31 1.83 1.40192 3.14286
+32 1.89 0.889108 3.37755
+33 1.95 1.2347 3.72449
+34 2.01 1.02538 4.03061
+35 2.07 0.934574 4.32653
+36 2.13 0.94354 4.64286
+37 2.19 1.23805 5.08163
+38 2.25 0.872863 5.40816
+39 2.31 0.750475 5.70408
+40 2.37 1.03256 6.13265
+41 2.43 0.912046 6.53061
+42 2.49 0.779534 6.88776
+43 2.55 1.12554 7.42857
+44 2.61 0.79059 7.82653
+45 2.67 1.02665 8.36735
+46 2.73 0.852318 8.83673
+47 2.79 0.940237 9.37755
+48 2.85 1.3601 10.1939
+49 2.91 1.05998 10.8571
+50 2.97 0.986279 11.5
+108450 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 0.680956 0.0102041
+9 0.51 1.06066 0.0306122
+10 0.57 0.424655 0.0408163
+11 0.63 1.04303 0.0714286
+12 0.69 1.73927 0.132653
+13 0.75 2.69914 0.244898
+14 0.81 0.841547 0.285714
+15 0.87 0.911898 0.336735
+16 0.93 1.59614 0.438776
+17 0.99 1.83116 0.571429
+18 1.05 1.62792 0.704082
+19 1.11 0.784392 0.77551
+20 1.17 1.91634 0.969388
+21 1.23 0.547573 1.03061
+22 1.29 1.24457 1.18367
+23 1.35 0.984898 1.31633
+24 1.41 0.972324 1.45918
+25 1.47 0.830683 1.59184
+26 1.53 1.29769 1.81633
+27 1.59 1.20161 2.04082
+28 1.65 0.811505 2.20408
+29 1.71 1.0389 2.42857
+30 1.77 1.14597 2.69388
+31 1.83 1.19576 2.9898
+32 1.89 0.889108 3.22449
+33 1.95 0.871554 3.46939
+34 2.01 0.751943 3.69388
+35 2.07 1.32129 4.11224
+36 2.13 0.882667 4.40816
+37 2.19 1.09409 4.79592
+38 2.25 1.28202 5.27551
+39 2.31 1.00926 5.67347
+40 2.37 1.05715 6.11224
+41 2.43 1.05236 6.57143
+42 2.49 1.2918 7.16327
+43 2.55 0.89194 7.59184
+44 2.61 0.79059 7.9898
+45 2.67 0.813571 8.41837
+46 2.73 1.18583 9.07143
+47 2.79 1.06442 9.68367
+48 2.85 1.00307 10.2857
+49 2.91 1.27198 11.0816
+50 2.97 1.11152 11.8061
+108500 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 1.36191 0.0204082
+9 0.51 0.530329 0.0306122
+10 0.57 0.84931 0.0510204
+11 0.63 1.04303 0.0816327
+12 0.69 0.579756 0.102041
+13 0.75 2.94452 0.22449
+14 0.81 1.05193 0.27551
+15 0.87 0.547139 0.306122
+16 0.93 0.638455 0.346939
+17 0.99 0.704293 0.397959
+18 1.05 1.12702 0.489796
+19 1.11 0.672336 0.55102
+20 1.17 0.605161 0.612245
+21 1.23 1.09515 0.734694
+22 1.29 1.32754 0.897959
+23 1.35 1.74251 1.13265
+24 1.41 1.31958 1.32653
+25 1.47 0.894581 1.46939
+26 1.53 1.06175 1.65306
+27 1.59 1.36547 1.90816
+28 1.65 1.21726 2.15306
+29 1.71 0.944452 2.35714
+30 1.77 1.10189 2.61224
+31 1.83 1.31946 2.93878
+32 1.89 0.966422 3.19388
+33 1.95 1.30733 3.56122
+34 2.01 1.09374 3.88776
+35 2.07 1.12793 4.2449
+36 2.13 1.03485 4.59184
+37 2.19 1.12289 4.9898
+38 2.25 1.11836 5.40816
+39 2.31 0.853989 5.7449
+40 2.37 1.4505 6.34694
+41 2.43 1.02897 6.79592
+42 2.49 0.913168 7.21429
+43 2.55 1.06183 7.72449
+44 2.61 1.07439 8.26531
+45 2.67 0.949166 8.76531
+46 2.73 1.09319 9.36735
+47 2.79 1.04668 9.96939
+48 2.85 0.81606 10.4592
+49 2.91 0.994753 11.0816
+50 2.97 1.22111 11.8776
+108550 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 1.88658 0.0102041
+6 0.33 0 0.0102041
+7 0.39 0 0.0102041
+8 0.45 1.36191 0.0306122
+9 0.51 1.06066 0.0510204
+10 0.57 2.12327 0.102041
+11 0.63 0.695356 0.122449
+12 0.69 1.15951 0.163265
+13 0.75 1.22688 0.214286
+14 0.81 1.47271 0.285714
+15 0.87 1.45904 0.367347
+16 0.93 1.59614 0.469388
+17 0.99 1.12687 0.55102
+18 1.05 1.12702 0.642857
+19 1.11 1.34467 0.765306
+20 1.17 0.907742 0.857143
+21 1.23 1.18641 0.989796
+22 1.29 0.663772 1.07143
+23 1.35 1.3637 1.2551
+24 1.41 0.972324 1.39796
+25 1.47 1.08628 1.57143
+26 1.53 1.00276 1.7449
+27 1.59 1.09237 1.94898
+28 1.65 1.26798 2.20408
+29 1.71 1.08612 2.43878
+30 1.77 0.881513 2.64286
+31 1.83 1.36069 2.97959
+32 1.89 1.00508 3.2449
+33 1.95 0.581036 3.40816
+34 2.01 0.957019 3.69388
+35 2.07 0.999027 4.0102
+36 2.13 1.09572 4.37755
+37 2.19 0.921343 4.70408
+38 2.25 0.954694 5.06122
+39 2.31 1.06102 5.47959
+40 2.37 1.05715 5.91837
+41 2.43 1.16929 6.42857
+42 2.49 1.0468 6.90816
+43 2.55 0.976887 7.37755
+44 2.61 1.09466 7.92857
+45 2.67 0.891053 8.39796
+46 2.73 1.35259 9.14286
+47 2.79 1.13538 9.79592
+48 2.85 0.935069 10.3571
+49 2.91 1.0926 11.0408
+50 2.97 1.1898 11.8163
+108600 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 0 0
+9 0.51 1.06066 0.0204082
+10 0.57 0 0.0204082
+11 0.63 1.04303 0.0510204
+12 0.69 2.89878 0.153061
+13 0.75 0.981505 0.193878
+14 0.81 1.89348 0.285714
+15 0.87 1.45904 0.367347
+16 0.93 2.39421 0.520408
+17 0.99 1.83116 0.653061
+18 1.05 1.37747 0.765306
+19 1.11 1.7929 0.928571
+20 1.17 1.10946 1.04082
+21 1.23 0.912621 1.14286
+22 1.29 0.746744 1.23469
+23 1.35 1.06066 1.37755
+24 1.41 1.59739 1.61224
+25 1.47 1.15018 1.79592
+26 1.53 1.35668 2.03061
+27 1.59 0.873898 2.19388
+28 1.65 1.36941 2.46939
+29 1.71 0.755562 2.63265
+30 1.77 0.837437 2.82653
+31 1.83 0.948361 3.06122
+32 1.89 1.19836 3.37755
+33 1.95 0.907869 3.63265
+34 2.01 0.854481 3.88776
+35 2.07 0.999027 4.20408
+36 2.13 0.730483 4.44898
+37 2.19 1.15168 4.85714
+38 2.25 0.872863 5.18367
+39 2.31 0.802232 5.5
+40 2.37 0.934223 5.88776
+41 2.43 1.09913 6.36735
+42 2.49 1.06908 6.85714
+43 2.55 0.934413 7.30612
+44 2.61 1.11493 7.86735
+45 2.67 0.852312 8.31633
+46 2.73 1.0376 8.88776
+47 2.79 0.993458 9.45918
+48 2.85 0.986073 10.051
+49 2.91 0.994753 10.6735
+50 2.97 0.845382 11.2245
+108650 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 0.680956 0.0102041
+9 0.51 1.59099 0.0408163
+10 0.57 2.12327 0.0918367
+11 0.63 2.08607 0.153061
+12 0.69 1.44939 0.204082
+13 0.75 0.981505 0.244898
+14 0.81 1.47271 0.316327
+15 0.87 1.45904 0.397959
+16 0.93 0.957682 0.459184
+17 0.99 0.845152 0.520408
+18 1.05 1.0018 0.602041
+19 1.11 1.12056 0.704082
+20 1.17 0.504301 0.755102
+21 1.23 1.27767 0.897959
+22 1.29 0.995658 1.02041
+23 1.35 0.757614 1.12245
+24 1.41 1.11123 1.28571
+25 1.47 1.59747 1.54082
+26 1.53 1.00276 1.71429
+27 1.59 0.928517 1.88776
+28 1.65 1.21726 2.13265
+29 1.71 0.991675 2.34694
+30 1.77 0.661135 2.5
+31 1.83 1.23699 2.80612
+32 1.89 0.811794 3.02041
+33 1.95 1.01681 3.30612
+34 2.01 0.683585 3.5102
+35 2.07 0.902347 3.79592
+36 2.13 1.06529 4.15306
+37 2.19 1.0653 4.53061
+38 2.25 1.22746 4.9898
+39 2.31 1.0869 5.41837
+40 2.37 1.05715 5.85714
+41 2.43 1.16929 6.36735
+42 2.49 1.11362 6.87755
+43 2.55 0.82823 7.27551
+44 2.61 0.952762 7.7551
+45 2.67 1.00728 8.28571
+46 2.73 1.14878 8.91837
+47 2.79 1.11764 9.56122
+48 2.85 0.850063 10.0714
+49 2.91 1.01106 10.7041
+50 2.97 0.908003 11.2959
+108700 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 1.26463 0.0102041
+7 0.39 0.906153 0.0204082
+8 0.45 1.36191 0.0408163
+9 0.51 0.530329 0.0510204
+10 0.57 1.27396 0.0816327
+11 0.63 1.04303 0.112245
+12 0.69 1.15951 0.153061
+13 0.75 1.22688 0.204082
+14 0.81 1.26232 0.265306
+15 0.87 1.45904 0.346939
+16 0.93 1.91536 0.469388
+17 0.99 0.98601 0.540816
+18 1.05 0.626123 0.591837
+19 1.11 1.34467 0.714286
+20 1.17 0.605161 0.77551
+21 1.23 1.27767 0.918367
+22 1.29 0.580801 0.989796
+23 1.35 0.606091 1.07143
+24 1.41 0.972324 1.21429
+25 1.47 1.08628 1.38776
+26 1.53 0.884789 1.54082
+27 1.59 0.983136 1.72449
+28 1.65 1.52157 2.03061
+29 1.71 0.850007 2.21429
+30 1.77 1.41042 2.54082
+31 1.83 0.700962 2.71429
+32 1.89 1.08239 3
+33 1.95 0.871554 3.2449
+34 2.01 1.05956 3.56122
+35 2.07 0.77344 3.80612
+36 2.13 1.00441 4.14286
+37 2.19 0.834967 4.43878
+38 2.25 1.00925 4.81633
+39 2.31 0.802232 5.13265
+40 2.37 0.712959 5.42857
+41 2.43 0.982203 5.85714
+42 2.49 0.734989 6.19388
+43 2.55 1.01936 6.68367
+44 2.61 1.05412 7.21429
+45 2.67 1.39469 7.94898
+46 2.73 1.11172 8.56122
+47 2.79 1.0112 9.14286
+48 2.85 0.850063 9.65306
+49 2.91 0.815371 10.1633
+50 2.97 1.03324 10.8367
+108750 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 1.36191 0.0204082
+9 0.51 1.59099 0.0510204
+10 0.57 0.84931 0.0714286
+11 0.63 0.347678 0.0816327
+12 0.69 1.15951 0.122449
+13 0.75 0.981505 0.163265
+14 0.81 1.26232 0.22449
+15 0.87 1.27666 0.295918
+16 0.93 0.798069 0.346939
+17 0.99 1.6903 0.469388
+18 1.05 1.12702 0.561224
+19 1.11 1.23262 0.673469
+20 1.17 1.21032 0.795918
+21 1.23 1.64272 0.979592
+22 1.29 1.41052 1.15306
+23 1.35 1.21218 1.31633
+24 1.41 0.972324 1.45918
+25 1.47 0.830683 1.59184
+26 1.53 1.06175 1.77551
+27 1.59 1.14699 1.9898
+28 1.65 0.760786 2.14286
+29 1.71 0.991675 2.35714
+30 1.77 0.925588 2.57143
+31 1.83 0.865894 2.78571
+32 1.89 0.966422 3.04082
+33 1.95 0.944184 3.30612
+34 2.01 1.16209 3.65306
+35 2.07 0.902347 3.93878
+36 2.13 0.913104 4.2449
+37 2.19 1.03651 4.61224
+38 2.25 1.03652 5
+39 2.31 1.11277 5.43878
+40 2.37 0.737544 5.7449
+41 2.43 0.935432 6.15306
+42 2.49 1.09135 6.65306
+43 2.55 1.12554 7.19388
+44 2.61 0.810861 7.60204
+45 2.67 0.987907 8.12245
+46 2.73 0.982019 8.66327
+47 2.79 1.2773 9.39796
+48 2.85 0.833061 9.89796
+49 2.91 1.12521 10.602
+50 2.97 1.12718 11.3367
+108800 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0.906153 0.0102041
+8 0.45 0.680956 0.0204082
+9 0.51 0 0.0204082
+10 0.57 0.84931 0.0408163
+11 0.63 1.04303 0.0714286
+12 0.69 1.44939 0.122449
+13 0.75 1.47226 0.183673
+14 0.81 2.31425 0.295918
+15 0.87 1.09428 0.357143
+16 0.93 1.27691 0.438776
+17 0.99 2.67631 0.632653
+18 1.05 0.876573 0.704082
+19 1.11 2.01701 0.887755
+20 1.17 1.5129 1.04082
+21 1.23 0.730097 1.12245
+22 1.29 0.829715 1.22449
+23 1.35 0.984898 1.35714
+24 1.41 0.625065 1.44898
+25 1.47 1.02238 1.61224
+26 1.53 0.707831 1.73469
+27 1.59 1.42008 2
+28 1.65 1.0651 2.21429
+29 1.71 1.13334 2.45918
+30 1.77 0.70521 2.62245
+31 1.83 0.824661 2.82653
+32 1.89 0.927765 3.07143
+33 1.95 1.08944 3.37755
+34 2.01 0.88866 3.64286
+35 2.07 0.966801 3.94898
+36 2.13 0.94354 4.26531
+37 2.19 1.23805 4.70408
+38 2.25 1.00925 5.08163
+39 2.31 1.00926 5.47959
+40 2.37 0.786714 5.80612
+41 2.43 0.654802 6.09184
+42 2.49 0.957713 6.53061
+43 2.55 1.08307 7.05102
+44 2.61 1.09466 7.60204
+45 2.67 0.891053 8.07143
+46 2.73 1.0376 8.64286
+47 2.79 0.993458 9.21429
+48 2.85 1.15609 9.90816
+49 2.91 0.913216 10.4796
+50 2.97 1.08021 11.1837
+108850 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 0.680956 0.0102041
+9 0.51 2.12132 0.0510204
+10 0.57 0.84931 0.0714286
+11 0.63 1.39071 0.112245
+12 0.69 2.02914 0.183673
+13 0.75 1.47226 0.244898
+14 0.81 1.89348 0.336735
+15 0.87 1.09428 0.397959
+16 0.93 1.59614 0.5
+17 0.99 0.845152 0.561224
+18 1.05 0.876573 0.632653
+19 1.11 1.0085 0.72449
+20 1.17 1.91634 0.918367
+21 1.23 1.18641 1.05102
+22 1.29 1.65943 1.2551
+23 1.35 1.21218 1.41837
+24 1.41 1.11123 1.58163
+25 1.47 1.02238 1.7449
+26 1.53 1.65161 2.03061
+27 1.59 0.928517 2.20408
+28 1.65 1.42013 2.4898
+29 1.71 1.18057 2.7449
+30 1.77 0.969664 2.96939
+31 1.83 1.03083 3.22449
+32 1.89 0.889108 3.45918
+33 1.95 0.798925 3.68367
+34 2.01 0.991198 3.97959
+35 2.07 1.22461 4.36735
+36 2.13 0.669609 4.59184
+37 2.19 0.978927 4.93878
+38 2.25 1.03652 5.32653
+39 2.31 0.828111 5.65306
+40 2.37 1.05715 6.09184
+41 2.43 0.935432 6.5
+42 2.49 0.801806 6.86735
+43 2.55 0.89194 7.29592
+44 2.61 0.912219 7.7551
+45 2.67 1.10413 8.33673
+46 2.73 0.796732 8.77551
+47 2.79 1.2773 9.5102
+48 2.85 1.05408 10.1429
+49 2.91 0.913216 10.7143
+50 2.97 0.829726 11.2551
+108900 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0.906153 0.0102041
+8 0.45 0 0.0102041
+9 0.51 0.530329 0.0204082
+10 0.57 0.84931 0.0408163
+11 0.63 2.08607 0.102041
+12 0.69 1.73927 0.163265
+13 0.75 1.22688 0.214286
+14 0.81 0.63116 0.244898
+15 0.87 1.64142 0.336735
+16 0.93 2.23459 0.479592
+17 0.99 0.845152 0.540816
+18 1.05 1.25225 0.642857
+19 1.11 0.112056 0.653061
+20 1.17 1.21032 0.77551
+21 1.23 1.36893 0.928571
+22 1.29 1.32754 1.09184
+23 1.35 1.51523 1.29592
+24 1.41 0.833421 1.41837
+25 1.47 1.21407 1.61224
+26 1.53 1.12073 1.80612
+27 1.59 1.20161 2.03061
+28 1.65 1.36941 2.30612
+29 1.71 0.944452 2.5102
+30 1.77 1.10189 2.76531
+31 1.83 0.618496 2.91837
+32 1.89 1.08239 3.20408
+33 1.95 0.944184 3.46939
+34 2.01 1.12791 3.80612
+35 2.07 0.966801 4.11224
+36 2.13 0.973977 4.43878
+37 2.19 1.32443 4.90816
+38 2.25 0.736478 5.18367
+39 2.31 0.828111 5.5102
+40 2.37 1.00798 5.92857
+41 2.43 1.07575 6.39796
+42 2.49 0.957713 6.83673
+43 2.55 1.23173 7.42857
+44 2.61 1.03385 7.94898
+45 2.67 1.02665 8.4898
+46 2.73 1.13025 9.11224
+47 2.79 1.04668 9.71429
+48 2.85 0.765056 10.1735
+49 2.91 1.22306 10.9388
+50 2.97 0.923658 11.5408
+108950 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 0.680956 0.0102041
+9 0.51 0 0.0102041
+10 0.57 1.69862 0.0510204
+11 0.63 0.695356 0.0714286
+12 0.69 1.44939 0.122449
+13 0.75 1.22688 0.173469
+14 0.81 0.841547 0.214286
+15 0.87 1.8238 0.316327
+16 0.93 1.27691 0.397959
+17 0.99 1.26773 0.489796
+18 1.05 1.75315 0.632653
+19 1.11 1.34467 0.755102
+20 1.17 0.706021 0.826531
+21 1.23 1.64272 1.0102
+22 1.29 1.7424 1.22449
+23 1.35 1.21218 1.38776
+24 1.41 0.902872 1.52041
+25 1.47 1.02238 1.68367
+26 1.53 0.589859 1.78571
+27 1.59 1.03775 1.97959
+28 1.65 1.31869 2.2449
+29 1.71 0.991675 2.45918
+30 1.77 0.925588 2.67347
+31 1.83 0.907127 2.89796
+32 1.89 1.04374 3.17347
+33 1.95 1.12576 3.4898
+34 2.01 1.26463 3.86735
+35 2.07 0.966801 4.17347
+36 2.13 0.821793 4.44898
+37 2.19 1.0653 4.82653
+38 2.25 0.791032 5.12245
+39 2.31 0.931624 5.4898
+40 2.37 1.18007 5.97959
+41 2.43 1.16929 6.4898
+42 2.49 0.913168 6.90816
+43 2.55 1.01936 7.39796
+44 2.61 0.973034 7.88776
+45 2.67 1.08476 8.45918
+46 2.73 1.16731 9.10204
+47 2.79 1.0999 9.73469
+48 2.85 0.935069 10.2959
+49 2.91 1.04368 10.949
+50 2.97 0.939313 11.5612
+109000 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 1.36191 0.0204082
+9 0.51 0 0.0204082
+10 0.57 1.69862 0.0612245
+11 0.63 1.04303 0.0918367
+12 0.69 0.869633 0.122449
+13 0.75 0.981505 0.163265
+14 0.81 1.26232 0.22449
+15 0.87 1.27666 0.295918
+16 0.93 1.91536 0.418367
+17 0.99 1.83116 0.55102
+18 1.05 1.5027 0.673469
+19 1.11 0.784392 0.744898
+20 1.17 1.41204 0.887755
+21 1.23 0.638835 0.959184
+22 1.29 1.57646 1.15306
+23 1.35 1.59099 1.36735
+24 1.41 1.18068 1.54082
+25 1.47 1.02238 1.70408
+26 1.53 1.17972 1.90816
+27 1.59 1.14699 2.12245
+28 1.65 1.0651 2.33673
+29 1.71 1.13334 2.58163
+30 1.77 1.58672 2.94898
+31 1.83 0.989594 3.19388
+32 1.89 0.73448 3.38776
+33 1.95 0.907869 3.64286
+34 2.01 0.683585 3.84694
+35 2.07 1.28907 4.2551
+36 2.13 1.21747 4.66327
+37 2.19 0.748591 4.92857
+38 2.25 0.818309 5.23469
+39 2.31 1.06102 5.65306
+40 2.37 1.15549 6.13265
+41 2.43 1.00559 6.57143
+42 2.49 1.00226 7.03061
+43 2.55 1.23173 7.62245
+44 2.61 0.952762 8.10204
+45 2.67 1.22036 8.7449
+46 2.73 1.00055 9.29592
+47 2.79 0.975718 9.85714
+48 2.85 1.07108 10.5
+49 2.91 0.978445 11.1122
+50 2.97 0.876692 11.6837
+109050 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 2.52926 0.0204082
+7 0.39 0 0.0204082
+8 0.45 0.680956 0.0306122
+9 0.51 0 0.0306122
+10 0.57 1.27396 0.0612245
+11 0.63 1.39071 0.102041
+12 0.69 0.289878 0.112245
+13 0.75 0.981505 0.153061
+14 0.81 1.68309 0.234694
+15 0.87 0.729518 0.27551
+16 0.93 1.59614 0.377551
+17 0.99 1.12687 0.459184
+18 1.05 0.751348 0.520408
+19 1.11 1.0085 0.612245
+20 1.17 1.5129 0.765306
+21 1.23 1.46019 0.928571
+22 1.29 0.746744 1.02041
+23 1.35 1.3637 1.20408
+24 1.41 1.11123 1.36735
+25 1.47 1.02238 1.53061
+26 1.53 1.00276 1.70408
+27 1.59 1.20161 1.92857
+28 1.65 1.47085 2.22449
+29 1.71 1.0389 2.44898
+30 1.77 1.05782 2.69388
+31 1.83 1.19576 2.9898
+32 1.89 0.927765 3.23469
+33 1.95 0.907869 3.4898
+34 2.01 0.88866 3.7551
+35 2.07 1.32129 4.17347
+36 2.13 0.913104 4.47959
+37 2.19 1.00772 4.83673
+38 2.25 1.33657 5.33673
+39 2.31 1.0869 5.76531
+40 2.37 0.983392 6.17347
+41 2.43 1.12252 6.66327
+42 2.49 0.890896 7.07143
+43 2.55 1.14678 7.62245
+44 2.61 0.932491 8.09184
+45 2.67 0.910424 8.57143
+46 2.73 1.05613 9.15306
+47 2.79 1.17086 9.82653
+48 2.85 1.24109 10.5714
+49 2.91 0.864293 11.1122
+50 2.97 1.09587 11.8265
+109100 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 0 0
+9 0.51 1.59099 0.0306122
+10 0.57 0 0.0306122
+11 0.63 1.04303 0.0612245
+12 0.69 1.44939 0.112245
+13 0.75 1.22688 0.163265
+14 0.81 1.47271 0.234694
+15 0.87 0.729518 0.27551
+16 0.93 1.27691 0.357143
+17 0.99 0.563434 0.397959
+18 1.05 1.62792 0.530612
+19 1.11 0.784392 0.602041
+20 1.17 0.706021 0.673469
+21 1.23 1.27767 0.816327
+22 1.29 0.912687 0.928571
+23 1.35 1.28794 1.10204
+24 1.41 1.18068 1.27551
+25 1.47 1.02238 1.43878
+26 1.53 1.06175 1.62245
+27 1.59 1.36547 1.87755
+28 1.65 1.01438 2.08163
+29 1.71 1.13334 2.32653
+30 1.77 1.10189 2.58163
+31 1.83 0.989594 2.82653
+32 1.89 0.811794 3.04082
+33 1.95 0.871554 3.28571
+34 2.01 1.33299 3.68367
+35 2.07 1.22461 4.07143
+36 2.13 0.973977 4.39796
+37 2.19 1.00772 4.7551
+38 2.25 1.0638 5.15306
+39 2.31 1.00926 5.55102
+40 2.37 0.909638 5.92857
+41 2.43 1.09913 6.40816
+42 2.49 1.26953 6.9898
+43 2.55 0.998123 7.46939
+44 2.61 0.871676 7.90816
+45 2.67 0.871683 8.36735
+46 2.73 1.22289 9.04082
+47 2.79 0.851536 9.53061
+48 2.85 1.08808 10.1837
+49 2.91 0.864293 10.7245
+50 2.97 1.22111 11.5204
+109150 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 1.81231 0.0204082
+8 0.45 0.680956 0.0306122
+9 0.51 0 0.0306122
+10 0.57 1.69862 0.0714286
+11 0.63 1.04303 0.102041
+12 0.69 1.44939 0.153061
+13 0.75 1.71763 0.22449
+14 0.81 1.47271 0.295918
+15 0.87 1.8238 0.397959
+16 0.93 1.43652 0.489796
+17 0.99 1.54944 0.602041
+18 1.05 1.12702 0.693878
+19 1.11 1.12056 0.795918
+20 1.17 0.605161 0.857143
+21 1.23 1.00388 0.969388
+22 1.29 0.995658 1.09184
+23 1.35 1.06066 1.23469
+24 1.41 0.763969 1.34694
+25 1.47 1.21407 1.54082
+26 1.53 1.00276 1.71429
+27 1.59 1.31085 1.95918
+28 1.65 1.01438 2.16327
+29 1.71 1.08612 2.39796
+30 1.77 1.19004 2.67347
+31 1.83 1.44316 3.03061
+32 1.89 1.15971 3.33673
+33 1.95 0.871554 3.58163
+34 2.01 1.09374 3.90816
+35 2.07 1.06348 4.2449
+36 2.13 0.973977 4.57143
+37 2.19 0.834967 4.86735
+38 2.25 1.14563 5.29592
+39 2.31 0.879867 5.64286
+40 2.37 0.762129 5.95918
+41 2.43 1.21606 6.4898
+42 2.49 1.20271 7.04082
+43 2.55 1.18925 7.61224
+44 2.61 0.871676 8.05102
+45 2.67 1.04602 8.60204
+46 2.73 1.11172 9.21429
+47 2.79 1.22408 9.91837
+48 2.85 0.918068 10.4694
+49 2.91 1.23936 11.2449
+50 2.97 0.908003 11.8367
+109200 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0.906153 0.0102041
+8 0.45 1.36191 0.0306122
+9 0.51 0 0.0306122
+10 0.57 1.27396 0.0612245
+11 0.63 1.73839 0.112245
+12 0.69 1.44939 0.163265
+13 0.75 1.47226 0.22449
+14 0.81 1.47271 0.295918
+15 0.87 2.18855 0.418367
+16 0.93 0.957682 0.479592
+17 0.99 1.6903 0.602041
+18 1.05 1.5027 0.72449
+19 1.11 1.12056 0.826531
+20 1.17 0.706021 0.897959
+21 1.23 0.730097 0.979592
+22 1.29 1.32754 1.14286
+23 1.35 0.606091 1.22449
+24 1.41 1.38903 1.42857
+25 1.47 0.830683 1.56122
+26 1.53 0.884789 1.71429
+27 1.59 1.25623 1.94898
+28 1.65 1.21726 2.19388
+29 1.71 1.08612 2.42857
+30 1.77 1.01374 2.66327
+31 1.83 1.03083 2.91837
+32 1.89 1.39165 3.28571
+33 1.95 1.12576 3.60204
+34 2.01 0.957019 3.88776
+35 2.07 1.12793 4.2449
+36 2.13 1.12616 4.62245
+37 2.19 1.00772 4.97959
+38 2.25 1.30929 5.46939
+39 2.31 0.853989 5.80612
+40 2.37 1.00798 6.22449
+41 2.43 0.748345 6.55102
+42 2.49 1.0468 7.03061
+43 2.55 0.934413 7.47959
+44 2.61 1.19602 8.08163
+45 2.67 1.41406 8.82653
+46 2.73 1.01908 9.38776
+47 2.79 1.15312 10.051
+48 2.85 0.867064 10.5714
+49 2.91 1.0926 11.2551
+50 2.97 1.0489 11.9388
+109250 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 1.26463 0.0102041
+7 0.39 0 0.0102041
+8 0.45 0.680956 0.0204082
+9 0.51 1.06066 0.0408163
+10 0.57 0.84931 0.0612245
+11 0.63 1.04303 0.0918367
+12 0.69 1.15951 0.132653
+13 0.75 2.20839 0.22449
+14 0.81 1.47271 0.295918
+15 0.87 0.911898 0.346939
+16 0.93 1.27691 0.428571
+17 0.99 1.40859 0.530612
+18 1.05 1.75315 0.673469
+19 1.11 0.896448 0.755102
+20 1.17 1.61376 0.918367
+21 1.23 1.36893 1.07143
+22 1.29 1.1616 1.21429
+23 1.35 0.681852 1.30612
+24 1.41 1.04178 1.45918
+25 1.47 1.34187 1.67347
+26 1.53 0.884789 1.82653
+27 1.59 1.03775 2.02041
+28 1.65 0.659347 2.15306
+29 1.71 1.18057 2.40816
+30 1.77 0.969664 2.63265
+31 1.83 1.11329 2.90816
+32 1.89 1.31433 3.2551
+33 1.95 0.944184 3.52041
+34 2.01 1.29881 3.90816
+35 2.07 1.09571 4.2551
+36 2.13 0.913104 4.56122
+37 2.19 1.23805 5
+38 2.25 0.845586 5.31633
+39 2.31 1.21629 5.79592
+40 2.37 1.00798 6.21429
+41 2.43 1.12252 6.70408
+42 2.49 1.02453 7.17347
+43 2.55 1.12554 7.71429
+44 2.61 0.831133 8.13265
+45 2.67 1.18161 8.7551
+46 2.73 1.09319 9.35714
+47 2.79 0.745094 9.78571
+48 2.85 1.15609 10.4796
+49 2.91 0.929523 11.0612
+50 2.97 1.06455 11.7551
+109300 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 1.81231 0.0204082
+8 0.45 0 0.0204082
+9 0.51 2.65165 0.0714286
+10 0.57 2.12327 0.122449
+11 0.63 0.347678 0.132653
+12 0.69 0.579756 0.153061
+13 0.75 1.71763 0.22449
+14 0.81 0.210387 0.234694
+15 0.87 1.45904 0.316327
+16 0.93 1.43652 0.408163
+17 0.99 1.26773 0.5
+18 1.05 1.37747 0.612245
+19 1.11 1.45673 0.744898
+20 1.17 1.71462 0.918367
+21 1.23 1.36893 1.07143
+22 1.29 0.663772 1.15306
+23 1.35 1.51523 1.35714
+24 1.41 0.763969 1.46939
+25 1.47 1.15018 1.65306
+26 1.53 1.35668 1.88776
+27 1.59 1.31085 2.13265
+28 1.65 1.0651 2.34694
+29 1.71 0.944452 2.55102
+30 1.77 0.70521 2.71429
+31 1.83 0.948361 2.94898
+32 1.89 0.850451 3.17347
+33 1.95 1.2347 3.52041
+34 2.01 0.957019 3.80612
+35 2.07 1.09571 4.15306
+36 2.13 0.913104 4.45918
+37 2.19 1.00772 4.81633
+38 2.25 0.954694 5.17347
+39 2.31 1.19041 5.64286
+40 2.37 1.22924 6.15306
+41 2.43 1.07575 6.62245
+42 2.49 0.979986 7.07143
+43 2.55 1.14678 7.62245
+44 2.61 0.973034 8.11224
+45 2.67 1.27847 8.78571
+46 2.73 1.00055 9.33673
+47 2.79 0.993458 9.90816
+48 2.85 0.986073 10.5
+49 2.91 1.07629 11.1735
+50 2.97 1.1898 11.949
+109350 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 0.680956 0.0102041
+9 0.51 1.06066 0.0306122
+10 0.57 1.27396 0.0612245
+11 0.63 0.347678 0.0714286
+12 0.69 1.44939 0.122449
+13 0.75 1.22688 0.173469
+14 0.81 1.89348 0.265306
+15 0.87 1.8238 0.367347
+16 0.93 1.59614 0.469388
+17 0.99 1.26773 0.561224
+18 1.05 0.876573 0.632653
+19 1.11 1.12056 0.734694
+20 1.17 1.31118 0.867347
+21 1.23 1.09515 0.989796
+22 1.29 0.663772 1.07143
+23 1.35 1.51523 1.27551
+24 1.41 0.902872 1.40816
+25 1.47 1.27797 1.61224
+26 1.53 1.12073 1.80612
+27 1.59 0.873898 1.96939
+28 1.65 1.26798 2.22449
+29 1.71 1.70001 2.59184
+30 1.77 1.05782 2.83673
+31 1.83 0.824661 3.04082
+32 1.89 0.811794 3.2551
+33 1.95 1.16207 3.58163
+34 2.01 0.88866 3.84694
+35 2.07 1.09571 4.19388
+36 2.13 0.85223 4.47959
+37 2.19 1.0653 4.85714
+38 2.25 0.90014 5.19388
+39 2.31 0.905746 5.55102
+40 2.37 1.00798 5.96939
+41 2.43 0.912046 6.36735
+42 2.49 0.913168 6.78571
+43 2.55 1.01936 7.27551
+44 2.61 0.770318 7.66327
+45 2.67 0.968536 8.17347
+46 2.73 1.09319 8.77551
+47 2.79 1.31278 9.53061
+48 2.85 1.2921 10.3061
+49 2.91 1.07629 10.9796
+50 2.97 0.782761 11.4898
+109400 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0.906153 0.0102041
+8 0.45 1.36191 0.0306122
+9 0.51 1.06066 0.0510204
+10 0.57 0 0.0510204
+11 0.63 1.73839 0.102041
+12 0.69 0.869633 0.132653
+13 0.75 2.69914 0.244898
+14 0.81 1.68309 0.326531
+15 0.87 2.18855 0.44898
+16 0.93 1.1173 0.520408
+17 0.99 1.26773 0.612245
+18 1.05 0.876573 0.683673
+19 1.11 1.34467 0.806122
+20 1.17 1.31118 0.938776
+21 1.23 0.912621 1.04082
+22 1.29 1.57646 1.23469
+23 1.35 0.909136 1.35714
+24 1.41 0.763969 1.46939
+25 1.47 0.95848 1.62245
+26 1.53 1.17972 1.82653
+27 1.59 1.03775 2.02041
+28 1.65 1.21726 2.26531
+29 1.71 1.27501 2.54082
+30 1.77 1.36634 2.85714
+31 1.83 0.989594 3.10204
+32 1.89 1.00508 3.36735
+33 1.95 0.944184 3.63265
+34 2.01 0.88866 3.89796
+35 2.07 0.805667 4.15306
+36 2.13 0.94354 4.46939
+37 2.19 0.662215 4.70408
+38 2.25 0.845586 5.02041
+39 2.31 1.3198 5.54082
+40 2.37 1.1309 6.0102
+41 2.43 1.07575 6.47959
+42 2.49 1.09135 6.97959
+43 2.55 1.01936 7.46939
+44 2.61 1.11493 8.03061
+45 2.67 0.929795 8.52041
+46 2.73 0.926433 9.03061
+47 2.79 0.798315 9.4898
+48 2.85 0.95207 10.0612
+49 2.91 1.05998 10.7245
+50 2.97 1.15849 11.4796
+109450 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 1.81231 0.0204082
+8 0.45 0.680956 0.0306122
+9 0.51 1.06066 0.0510204
+10 0.57 0.84931 0.0714286
+11 0.63 1.04303 0.102041
+12 0.69 1.73927 0.163265
+13 0.75 1.47226 0.22449
+14 0.81 2.10387 0.326531
+15 0.87 1.8238 0.428571
+16 0.93 1.43652 0.520408
+17 0.99 1.26773 0.612245
+18 1.05 0.751348 0.673469
+19 1.11 0.224112 0.693878
+20 1.17 1.10946 0.806122
+21 1.23 1.09515 0.928571
+22 1.29 1.49349 1.11224
+23 1.35 0.984898 1.2449
+24 1.41 1.38903 1.44898
+25 1.47 1.08628 1.62245
+26 1.53 0.648845 1.73469
+27 1.59 1.4747 2.0102
+28 1.65 0.760786 2.16327
+29 1.71 1.18057 2.41837
+30 1.77 0.969664 2.64286
+31 1.83 0.989594 2.88776
+32 1.89 1.23702 3.21429
+33 1.95 1.16207 3.54082
+34 2.01 0.820302 3.78571
+35 2.07 1.06348 4.12245
+36 2.13 1.03485 4.46939
+37 2.19 1.15168 4.87755
+38 2.25 1.0638 5.27551
+39 2.31 0.879867 5.62245
+40 2.37 1.15549 6.10204
+41 2.43 0.958818 6.52041
+42 2.49 0.935441 6.94898
+43 2.55 1.16802 7.5102
+44 2.61 0.973034 8
+45 2.67 1.06539 8.56122
+46 2.73 1.05613 9.14286
+47 2.79 0.869276 9.64286
+48 2.85 1.12208 10.3163
+49 2.91 0.962138 10.9184
+50 2.97 1.01759 11.5816
+109500 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 0.680956 0.0102041
+9 0.51 1.06066 0.0306122
+10 0.57 0.424655 0.0408163
+11 0.63 1.04303 0.0714286
+12 0.69 0.869633 0.102041
+13 0.75 0.736129 0.132653
+14 0.81 1.89348 0.22449
+15 0.87 1.8238 0.326531
+16 0.93 1.43652 0.418367
+17 0.99 1.6903 0.540816
+18 1.05 1.25225 0.642857
+19 1.11 1.0085 0.734694
+20 1.17 0.907742 0.826531
+21 1.23 1.36893 0.979592
+22 1.29 1.82537 1.20408
+23 1.35 0.530329 1.27551
+24 1.41 0.833421 1.39796
+25 1.47 1.02238 1.56122
+26 1.53 1.2387 1.77551
+27 1.59 1.20161 2
+28 1.65 1.52157 2.30612
+29 1.71 1.22779 2.57143
+30 1.77 1.01374 2.80612
+31 1.83 0.907127 3.03061
+32 1.89 1.12105 3.32653
+33 1.95 0.980499 3.60204
+34 2.01 1.23045 3.96939
+35 2.07 1.16016 4.33673
+36 2.13 0.821793 4.61224
+37 2.19 1.00772 4.96939
+38 2.25 0.927417 5.31633
+39 2.31 1.0869 5.7449
+40 2.37 1.1309 6.21429
+41 2.43 1.3096 6.78571
+42 2.49 1.00226 7.2449
+43 2.55 1.01936 7.73469
+44 2.61 0.912219 8.19388
+45 2.67 1.06539 8.7551
+46 2.73 1.07466 9.34694
+47 2.79 1.13538 10
+48 2.85 1.08808 10.6531
+49 2.91 0.880601 11.2041
+50 2.97 0.876692 11.7755
+109550 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 2.52926 0.0204082
+7 0.39 0 0.0204082
+8 0.45 0 0.0204082
+9 0.51 0.530329 0.0306122
+10 0.57 0.84931 0.0510204
+11 0.63 1.39071 0.0918367
+12 0.69 1.44939 0.142857
+13 0.75 0.736129 0.173469
+14 0.81 1.26232 0.234694
+15 0.87 1.45904 0.316327
+16 0.93 1.27691 0.397959
+17 0.99 0.845152 0.459184
+18 1.05 1.25225 0.561224
+19 1.11 1.0085 0.653061
+20 1.17 0.806882 0.734694
+21 1.23 1.27767 0.877551
+22 1.29 1.49349 1.06122
+23 1.35 0.984898 1.19388
+24 1.41 0.694517 1.29592
+25 1.47 1.27797 1.5
+26 1.53 1.47465 1.7551
+27 1.59 1.14699 1.96939
+28 1.65 1.31869 2.23469
+29 1.71 0.944452 2.43878
+30 1.77 1.32227 2.7449
+31 1.83 1.27823 3.06122
+32 1.89 1.35299 3.41837
+33 1.95 0.980499 3.69388
+34 2.01 0.991198 3.9898
+35 2.07 1.22461 4.37755
+36 2.13 0.85223 4.66327
+37 2.19 1.0653 5.04082
+38 2.25 0.954694 5.39796
+39 2.31 0.983381 5.78571
+40 2.37 1.00798 6.20408
+41 2.43 0.912046 6.60204
+42 2.49 0.757262 6.94898
+43 2.55 0.998123 7.42857
+44 2.61 1.07439 7.96939
+45 2.67 0.891053 8.43878
+46 2.73 0.944962 8.95918
+47 2.79 1.11764 9.60204
+48 2.85 0.782058 10.0714
+49 2.91 1.07629 10.7449
+50 2.97 1.09587 11.4592
+109600 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 0.680956 0.0102041
+9 0.51 1.59099 0.0408163
+10 0.57 1.69862 0.0816327
+11 0.63 1.39071 0.122449
+12 0.69 0.579756 0.142857
+13 0.75 0.736129 0.173469
+14 0.81 1.05193 0.22449
+15 0.87 1.8238 0.326531
+16 0.93 1.91536 0.44898
+17 0.99 1.40859 0.55102
+18 1.05 1.0018 0.632653
+19 1.11 0.784392 0.704082
+20 1.17 0.806882 0.785714
+21 1.23 1.27767 0.928571
+22 1.29 1.49349 1.11224
+23 1.35 1.28794 1.28571
+24 1.41 0.555614 1.36735
+25 1.47 1.15018 1.55102
+26 1.53 1.41566 1.79592
+27 1.59 0.710042 1.92857
+28 1.65 1.0651 2.14286
+29 1.71 0.850007 2.32653
+30 1.77 0.925588 2.54082
+31 1.83 1.03083 2.79592
+32 1.89 0.927765 3.04082
+33 1.95 0.980499 3.31633
+34 2.01 1.57224 3.78571
+35 2.07 1.12793 4.14286
+36 2.13 1.06529 4.5
+37 2.19 1.23805 4.93878
+38 2.25 0.90014 5.27551
+39 2.31 1.3198 5.79592
+40 2.37 1.05715 6.23469
+41 2.43 1.00559 6.67347
+42 2.49 1.13589 7.19388
+43 2.55 1.16802 7.7551
+44 2.61 0.770318 8.14286
+45 2.67 1.00728 8.67347
+46 2.73 1.13025 9.29592
+47 2.79 1.15312 9.95918
+48 2.85 0.867064 10.4796
+49 2.91 1.20675 11.2347
+50 2.97 1.09587 11.949
+109650 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0.906153 0.0102041
+8 0.45 0.680956 0.0204082
+9 0.51 0 0.0204082
+10 0.57 2.54793 0.0816327
+11 0.63 0 0.0816327
+12 0.69 1.44939 0.132653
+13 0.75 1.96301 0.214286
+14 0.81 1.89348 0.306122
+15 0.87 2.00617 0.418367
+16 0.93 1.27691 0.5
+17 0.99 1.97202 0.642857
+18 1.05 1.37747 0.755102
+19 1.11 1.34467 0.877551
+20 1.17 1.21032 1
+21 1.23 0.730097 1.08163
+22 1.29 1.1616 1.22449
+23 1.35 1.43947 1.41837
+24 1.41 0.625065 1.5102
+25 1.47 1.08628 1.68367
+26 1.53 1.12073 1.87755
+27 1.59 1.09237 2.08163
+28 1.65 0.862224 2.2551
+29 1.71 0.755562 2.41837
+30 1.77 0.925588 2.63265
+31 1.83 1.07206 2.89796
+32 1.89 0.811794 3.11224
+33 1.95 0.798925 3.33673
+34 2.01 0.922839 3.61224
+35 2.07 0.837894 3.87755
+36 2.13 1.06529 4.23469
+37 2.19 1.15168 4.64286
+38 2.25 1.11836 5.06122
+39 2.31 1.0869 5.4898
+40 2.37 1.47509 6.10204
+41 2.43 1.09913 6.58163
+42 2.49 1.20271 7.13265
+43 2.55 1.10431 7.66327
+44 2.61 1.17575 8.2551
+45 2.67 1.22036 8.89796
+46 2.73 0.926433 9.40816
+47 2.79 1.20634 10.102
+48 2.85 1.15609 10.7959
+49 2.91 0.782756 11.2857
+50 2.97 0.829726 11.8265
+109700 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 0 0
+9 0.51 3.18198 0.0612245
+10 0.57 1.27396 0.0918367
+11 0.63 0.695356 0.112245
+12 0.69 0.869633 0.142857
+13 0.75 1.96301 0.22449
+14 0.81 2.10387 0.326531
+15 0.87 1.09428 0.387755
+16 0.93 1.75575 0.5
+17 0.99 1.40859 0.602041
+18 1.05 1.62792 0.734694
+19 1.11 1.56878 0.877551
+20 1.17 1.0086 0.979592
+21 1.23 0.912621 1.08163
+22 1.29 0.829715 1.18367
+23 1.35 1.59099 1.39796
+24 1.41 1.25013 1.58163
+25 1.47 1.34187 1.79592
+26 1.53 0.707831 1.91837
+27 1.59 1.25623 2.15306
+28 1.65 1.01438 2.35714
+29 1.71 1.08612 2.59184
+30 1.77 0.837437 2.78571
+31 1.83 1.03083 3.04082
+32 1.89 1.08239 3.32653
+33 1.95 0.798925 3.55102
+34 2.01 0.922839 3.82653
+35 2.07 0.870121 4.10204
+36 2.13 0.94354 4.41837
+37 2.19 0.978927 4.76531
+38 2.25 0.927417 5.11224
+39 2.31 1.21629 5.59184
+40 2.37 1.37675 6.16327
+41 2.43 1.09913 6.64286
+42 2.49 1.60361 7.37755
+43 2.55 1.01936 7.86735
+44 2.61 0.932491 8.33673
+45 2.67 1.06539 8.89796
+46 2.73 1.05613 9.47959
+47 2.79 1.08216 10.102
+48 2.85 0.697051 10.5204
+49 2.91 0.913216 11.0918
+50 2.97 0.970623 11.7245
+109750 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 0.680956 0.0102041
+9 0.51 0 0.0102041
+10 0.57 1.27396 0.0408163
+11 0.63 2.43375 0.112245
+12 0.69 1.15951 0.153061
+13 0.75 0.981505 0.193878
+14 0.81 0.841547 0.234694
+15 0.87 2.00617 0.346939
+16 0.93 0.957682 0.408163
+17 0.99 1.83116 0.540816
+18 1.05 1.12702 0.632653
+19 1.11 1.0085 0.72449
+20 1.17 0.907742 0.816327
+21 1.23 0.45631 0.867347
+22 1.29 1.57646 1.06122
+23 1.35 1.43947 1.2551
+24 1.41 1.59739 1.4898
+25 1.47 0.702885 1.60204
+26 1.53 0.943774 1.76531
+27 1.59 0.655424 1.88776
+28 1.65 1.11582 2.11224
+29 1.71 0.755562 2.27551
+30 1.77 1.27819 2.57143
+31 1.83 1.19576 2.86735
+32 1.89 1.04374 3.14286
+33 1.95 1.16207 3.46939
+34 2.01 0.922839 3.7449
+35 2.07 1.03125 4.07143
+36 2.13 1.00441 4.40816
+37 2.19 1.41081 4.90816
+38 2.25 0.981971 5.27551
+39 2.31 1.16453 5.73469
+40 2.37 0.934223 6.12245
+41 2.43 1.00559 6.56122
+42 2.49 1.20271 7.11224
+43 2.55 1.31667 7.7449
+44 2.61 0.973034 8.23469
+45 2.67 1.02665 8.77551
+46 2.73 0.982019 9.31633
+47 2.79 1.11764 9.95918
+48 2.85 1.07108 10.602
+49 2.91 0.913216 11.1735
+50 2.97 0.970623 11.8061
+109800 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 1.26463 0.0102041
+7 0.39 0.906153 0.0204082
+8 0.45 2.04287 0.0510204
+9 0.51 0.530329 0.0612245
+10 0.57 1.27396 0.0918367
+11 0.63 0.347678 0.102041
+12 0.69 0.579756 0.122449
+13 0.75 1.47226 0.183673
+14 0.81 2.52464 0.306122
+15 0.87 1.27666 0.377551
+16 0.93 1.75575 0.489796
+17 0.99 1.26773 0.581633
+18 1.05 1.12702 0.673469
+19 1.11 1.34467 0.795918
+20 1.17 0.806882 0.877551
+21 1.23 1.18641 1.0102
+22 1.29 0.912687 1.12245
+23 1.35 1.28794 1.29592
+24 1.41 0.833421 1.41837
+25 1.47 1.21407 1.61224
+26 1.53 0.884789 1.76531
+27 1.59 1.20161 1.9898
+28 1.65 1.0651 2.20408
+29 1.71 0.991675 2.41837
+30 1.77 0.440756 2.52041
+31 1.83 1.23699 2.82653
+32 1.89 0.850451 3.05102
+33 1.95 0.907869 3.30612
+34 2.01 1.19627 3.66327
+35 2.07 1.32129 4.08163
+36 2.13 1.18703 4.47959
+37 2.19 0.921343 4.80612
+38 2.25 0.927417 5.15306
+39 2.31 1.06102 5.57143
+40 2.37 0.811299 5.90816
+41 2.43 0.935432 6.31633
+42 2.49 1.00226 6.77551
+43 2.55 0.913177 7.21429
+44 2.61 1.21629 7.82653
+45 2.67 1.10413 8.40816
+46 2.73 1.16731 9.05102
+47 2.79 1.0112 9.63265
+48 2.85 0.81606 10.1224
+49 2.91 0.962138 10.7245
+50 2.97 1.25242 11.5408
+109850 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0.906153 0.0102041
+8 0.45 0 0.0102041
+9 0.51 1.06066 0.0306122
+10 0.57 0 0.0306122
+11 0.63 0.695356 0.0510204
+12 0.69 1.15951 0.0918367
+13 0.75 0.736129 0.122449
+14 0.81 0.420773 0.142857
+15 0.87 0.911898 0.193878
+16 0.93 1.1173 0.265306
+17 0.99 1.54944 0.377551
+18 1.05 0.250449 0.397959
+19 1.11 1.0085 0.489796
+20 1.17 1.31118 0.622449
+21 1.23 0.547573 0.683673
+22 1.29 1.32754 0.846939
+23 1.35 1.13642 1
+24 1.41 1.66684 1.2449
+25 1.47 1.34187 1.45918
+26 1.53 1.2387 1.67347
+27 1.59 1.20161 1.89796
+28 1.65 1.57229 2.21429
+29 1.71 0.755562 2.37755
+30 1.77 1.14597 2.64286
+31 1.83 1.07206 2.90816
+32 1.89 0.850451 3.13265
+33 1.95 0.980499 3.40816
+34 2.01 1.19627 3.76531
+35 2.07 1.38575 4.20408
+36 2.13 0.730483 4.44898
+37 2.19 1.4396 4.95918
+38 2.25 0.872863 5.28571
+39 2.31 1.06102 5.70408
+40 2.37 1.35216 6.26531
+41 2.43 0.935432 6.67347
+42 2.49 0.935441 7.10204
+43 2.55 0.870703 7.52041
+44 2.61 1.13521 8.09184
+45 2.67 0.871683 8.55102
+46 2.73 1.11172 9.16327
+47 2.79 0.869276 9.66327
+48 2.85 0.884065 10.1939
+49 2.91 1.07629 10.8673
+50 2.97 1.06455 11.5612
+109900 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 0.680956 0.0102041
+9 0.51 0 0.0102041
+10 0.57 1.27396 0.0408163
+11 0.63 0.695356 0.0612245
+12 0.69 1.44939 0.112245
+13 0.75 1.22688 0.163265
+14 0.81 0.841547 0.204082
+15 0.87 3.28283 0.387755
+16 0.93 0.638455 0.428571
+17 0.99 0.98601 0.5
+18 1.05 0.500899 0.540816
+19 1.11 0.672336 0.602041
+20 1.17 1.31118 0.734694
+21 1.23 1.00388 0.846939
+22 1.29 1.24457 1
+23 1.35 1.59099 1.21429
+24 1.41 0.972324 1.35714
+25 1.47 0.830683 1.4898
+26 1.53 0.766817 1.62245
+27 1.59 0.873898 1.78571
+28 1.65 1.52157 2.09184
+29 1.71 1.60557 2.43878
+30 1.77 1.01374 2.67347
+31 1.83 0.948361 2.90816
+32 1.89 0.73448 3.10204
+33 1.95 1.16207 3.42857
+34 2.01 1.16209 3.77551
+35 2.07 0.966801 4.08163
+36 2.13 0.94354 4.39796
+37 2.19 1.00772 4.7551
+38 2.25 1.30929 5.2449
+39 2.31 1.24217 5.73469
+40 2.37 0.958808 6.13265
+41 2.43 1.02897 6.58163
+42 2.49 0.846351 6.96939
+43 2.55 1.0406 7.46939
+44 2.61 1.07439 8.0102
+45 2.67 1.23973 8.66327
+46 2.73 0.926433 9.17347
+47 2.79 1.20634 9.86735
+48 2.85 1.03708 10.4898
+49 2.91 0.978445 11.102
+50 2.97 1.01759 11.7653
+109950 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 1.26463 0.0102041
+7 0.39 0 0.0102041
+8 0.45 0.680956 0.0204082
+9 0.51 0.530329 0.0306122
+10 0.57 0 0.0306122
+11 0.63 2.08607 0.0918367
+12 0.69 0.289878 0.102041
+13 0.75 0.736129 0.132653
+14 0.81 0.63116 0.163265
+15 0.87 1.64142 0.255102
+16 0.93 1.59614 0.357143
+17 0.99 1.83116 0.489796
+18 1.05 0.876573 0.561224
+19 1.11 1.23262 0.673469
+20 1.17 1.0086 0.77551
+21 1.23 1.18641 0.908163
+22 1.29 1.32754 1.07143
+23 1.35 1.43947 1.26531
+24 1.41 0.625065 1.35714
+25 1.47 1.08628 1.53061
+26 1.53 1.17972 1.73469
+27 1.59 0.710042 1.86735
+28 1.65 0.963662 2.06122
+29 1.71 0.991675 2.27551
+30 1.77 0.837437 2.46939
+31 1.83 1.07206 2.73469
+32 1.89 1.27568 3.07143
+33 1.95 0.907869 3.32653
+34 2.01 1.16209 3.67347
+35 2.07 0.805667 3.92857
+36 2.13 1.27835 4.35714
+37 2.19 1.52597 4.89796
+38 2.25 1.28202 5.37755
+39 2.31 1.00926 5.77551
+40 2.37 0.885053 6.14286
+41 2.43 1.3096 6.71429
+42 2.49 1.35862 7.33673
+43 2.55 1.01936 7.82653
+44 2.61 0.810861 8.23469
+45 2.67 1.04602 8.78571
+46 2.73 1.09319 9.38776
+47 2.79 0.887016 9.89796
+48 2.85 1.03708 10.5204
+49 2.91 0.880601 11.0714
+50 2.97 0.861037 11.6327
+110000 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 1.36191 0.0204082
+9 0.51 0.530329 0.0306122
+10 0.57 1.69862 0.0714286
+11 0.63 0.695356 0.0918367
+12 0.69 1.15951 0.132653
+13 0.75 0.736129 0.163265
+14 0.81 1.89348 0.255102
+15 0.87 1.09428 0.316327
+16 0.93 1.1173 0.387755
+17 0.99 1.6903 0.510204
+18 1.05 1.37747 0.622449
+19 1.11 0.896448 0.704082
+20 1.17 1.10946 0.816327
+21 1.23 1.18641 0.94898
+22 1.29 0.746744 1.04082
+23 1.35 1.28794 1.21429
+24 1.41 1.18068 1.38776
+25 1.47 1.72526 1.66327
+26 1.53 0.825803 1.80612
+27 1.59 1.14699 2.02041
+28 1.65 1.36941 2.29592
+29 1.71 1.22779 2.56122
+30 1.77 0.925588 2.77551
+31 1.83 1.15453 3.06122
+32 1.89 0.966422 3.31633
+33 1.95 1.01681 3.60204
+34 2.01 1.16209 3.94898
+35 2.07 1.03125 4.27551
+36 2.13 0.882667 4.57143
+37 2.19 0.777383 4.84694
+38 2.25 1.20019 5.29592
+39 2.31 0.983381 5.68367
+40 2.37 1.00798 6.10204
+41 2.43 1.19268 6.62245
+42 2.49 1.02453 7.09184
+43 2.55 1.14678 7.64286
+44 2.61 1.13521 8.21429
+45 2.67 1.06539 8.77551
+46 2.73 1.05613 9.35714
+47 2.79 0.887016 9.86735
+48 2.85 0.986073 10.4592
+49 2.91 1.0926 11.1429
+50 2.97 1.20545 11.9286
diff --git a/examples/USER/misc/slater/tmp_3_3.rdf b/examples/USER/misc/slater/tmp_3_3.rdf
new file mode 100644
index 0000000000..e17bb1e594
--- /dev/null
+++ b/examples/USER/misc/slater/tmp_3_3.rdf
@@ -0,0 +1,10254 @@
+# Time-averaged data for fix 16
+# TimeStep Number-of-rows
+# Row c_RDF_3_3[1] c_RDF_3_3[2] c_RDF_3_3[3]
+100000 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 0 0
+9 0.51 0 0
+10 0.57 0 0
+11 0.63 0 0
+12 0.69 1.17146 0.0408163
+13 0.75 0.991624 0.0816327
+14 0.81 0 0.0816327
+15 0.87 0.737039 0.122449
+16 0.93 0.645037 0.163265
+17 0.99 0.569243 0.204082
+18 1.05 1.01213 0.285714
+19 1.11 0.452845 0.326531
+20 1.17 0.6114 0.387755
+21 1.23 0.922029 0.489796
+22 1.29 1.84419 0.714286
+23 1.35 0.765424 0.816327
+24 1.41 0.421006 0.877551
+25 1.47 0.25823 0.918367
+26 1.53 0.715128 1.04082
+27 1.59 1.214 1.26531
+28 1.65 0.922354 1.44898
+29 1.71 1.14503 1.69388
+30 1.77 0.71248 1.85714
+31 1.83 0.583214 2
+32 1.89 1.24977 2.32653
+33 1.95 0.880539 2.57143
+34 2.01 1.24314 2.93878
+35 2.07 0.846532 3.20408
+36 2.13 0.922517 3.5102
+37 2.19 0.639953 3.73469
+38 2.25 1.26768 4.20408
+39 2.31 0.732067 4.4898
+40 2.37 0.695471 4.77551
+41 2.43 0.661553 5.06122
+42 2.49 1.30512 5.65306
+43 2.55 0.72949 6
+44 2.61 0.860182 6.42857
+45 2.67 1.40907 7.16327
+46 2.73 1.08574 7.7551
+47 2.79 1.29047 8.4898
+48 2.85 1.0993 9.14286
+49 2.91 1.12034 9.83673
+50 2.97 1.10716 10.551
+100050 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 0 0
+9 0.51 0 0
+10 0.57 0.858066 0.0204082
+11 0.63 0.702525 0.0408163
+12 0.69 1.7572 0.102041
+13 0.75 0 0.102041
+14 0.81 1.27533 0.163265
+15 0.87 1.10556 0.22449
+16 0.93 0.645037 0.265306
+17 0.99 0.284622 0.285714
+18 1.05 1.01213 0.367347
+19 1.11 0 0.367347
+20 1.17 0.8152 0.44898
+21 1.23 0.922029 0.55102
+22 1.29 1.00592 0.673469
+23 1.35 0.612339 0.755102
+24 1.41 0.701677 0.857143
+25 1.47 0.645574 0.959184
+26 1.53 0.953504 1.12245
+27 1.59 0.993271 1.30612
+28 1.65 0.819871 1.46939
+29 1.71 0.763351 1.63265
+30 1.77 0.71248 1.79592
+31 1.83 1.33306 2.12245
+32 1.89 1.09355 2.40816
+33 1.95 1.17405 2.73469
+34 2.01 0.345316 2.83673
+35 2.07 0.781414 3.08163
+36 2.13 0.676513 3.30612
+37 2.19 1.27991 3.7551
+38 2.25 0.771629 4.04082
+39 2.31 1.0981 4.46939
+40 2.37 1.39094 5.04082
+41 2.43 0.850568 5.40816
+42 2.49 1.03509 5.87755
+43 2.55 1.28734 6.4898
+44 2.61 0.655377 6.81633
+45 2.67 0.978521 7.32653
+46 2.73 1.34782 8.06122
+47 2.79 1.14709 8.71429
+48 2.85 0.858826 9.22449
+49 2.91 0.988533 9.83673
+50 2.97 0.98063 10.4694
+100100 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 0 0
+9 0.51 0 0
+10 0.57 0 0
+11 0.63 0 0
+12 0.69 0.585732 0.0204082
+13 0.75 0 0.0204082
+14 0.81 0.850222 0.0612245
+15 0.87 0.737039 0.102041
+16 0.93 0 0.102041
+17 0.99 0.853865 0.163265
+18 1.05 1.51819 0.285714
+19 1.11 0.679267 0.346939
+20 1.17 0.4076 0.387755
+21 1.23 0.922029 0.489796
+22 1.29 0.838269 0.591837
+23 1.35 0.918509 0.714286
+24 1.41 0.701677 0.816327
+25 1.47 1.16203 1
+26 1.53 1.19188 1.20408
+27 1.59 0.551817 1.30612
+28 1.65 0.614903 1.42857
+29 1.71 0.572513 1.55102
+30 1.77 1.24684 1.83673
+31 1.83 1.41638 2.18367
+32 1.89 0.937329 2.42857
+33 1.95 0.953918 2.69388
+34 2.01 0.759695 2.91837
+35 2.07 0.976768 3.22449
+36 2.13 0.799515 3.4898
+37 2.19 0.930841 3.81633
+38 2.25 1.15744 4.2449
+39 2.31 1.0981 4.67347
+40 2.37 1.24191 5.18367
+41 2.43 1.27585 5.73469
+42 2.49 0.900081 6.14286
+43 2.55 1.20151 6.71429
+44 2.61 1.43364 7.42857
+45 2.67 1.13508 8.02041
+46 2.73 0.861105 8.4898
+47 2.79 0.824468 8.95918
+48 2.85 0.652708 9.34694
+49 2.91 0.757875 9.81633
+50 2.97 1.3286 10.6735
+100150 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 0 0
+9 0.51 0 0
+10 0.57 0 0
+11 0.63 0 0
+12 0.69 0 0
+13 0.75 1.98325 0.0816327
+14 0.81 0.850222 0.122449
+15 0.87 1.47408 0.204082
+16 0.93 0.645037 0.244898
+17 0.99 0 0.244898
+18 1.05 1.26516 0.346939
+19 1.11 0.226422 0.367347
+20 1.17 1.019 0.469388
+21 1.23 1.29084 0.612245
+22 1.29 0.838269 0.714286
+23 1.35 0.612339 0.795918
+24 1.41 0.561342 0.877551
+25 1.47 1.03292 1.04082
+26 1.53 1.07269 1.22449
+27 1.59 0.882908 1.38776
+28 1.65 0.819871 1.55102
+29 1.71 0.763351 1.71429
+30 1.77 1.42496 2.04082
+31 1.83 0.999796 2.28571
+32 1.89 0.781108 2.4898
+33 1.95 0.880539 2.73469
+34 2.01 1.17407 3.08163
+35 2.07 1.30236 3.4898
+36 2.13 0.861016 3.77551
+37 2.19 0.814486 4.06122
+38 2.25 0.826745 4.36735
+39 2.31 1.35955 4.89796
+40 2.37 0.894177 5.26531
+41 2.43 1.2286 5.79592
+42 2.49 0.990089 6.2449
+43 2.55 0.901135 6.67347
+44 2.61 1.02403 7.18367
+45 2.67 1.0568 7.73469
+46 2.73 1.08574 8.32653
+47 2.79 0.752775 8.7551
+48 2.85 1.03059 9.36735
+49 2.91 0.790826 9.85714
+50 2.97 0.854097 10.4082
+100200 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 0 0
+9 0.51 1.07159 0.0204082
+10 0.57 1.71613 0.0612245
+11 0.63 0.702525 0.0816327
+12 0.69 0.585732 0.102041
+13 0.75 0 0.102041
+14 0.81 0 0.102041
+15 0.87 1.47408 0.183673
+16 0.93 0.645037 0.22449
+17 0.99 1.99235 0.367347
+18 1.05 1.26516 0.469388
+19 1.11 0.679267 0.530612
+20 1.17 0.8152 0.612245
+21 1.23 0.922029 0.714286
+22 1.29 1.34123 0.877551
+23 1.35 0.918509 1
+24 1.41 0.842013 1.12245
+25 1.47 1.42026 1.34694
+26 1.53 1.07269 1.53061
+27 1.59 1.10363 1.73469
+28 1.65 1.22981 1.97959
+29 1.71 0.763351 2.14286
+30 1.77 0.4453 2.2449
+31 1.83 0.916479 2.46939
+32 1.89 1.09355 2.7551
+33 1.95 0.953918 3.02041
+34 2.01 0.690632 3.22449
+35 2.07 0.976768 3.53061
+36 2.13 0.984018 3.85714
+37 2.19 1.27991 4.30612
+38 2.25 0.716512 4.57143
+39 2.31 0.679776 4.83673
+40 2.37 0.695471 5.12245
+41 2.43 1.27585 5.67347
+42 2.49 0.990089 6.12245
+43 2.55 0.772402 6.4898
+44 2.61 1.02403 7
+45 2.67 1.0568 7.55102
+46 2.73 1.16062 8.18367
+47 2.79 1.21878 8.87755
+48 2.85 0.79012 9.34694
+49 2.91 1.02148 9.97959
+50 2.97 0.98063 10.6122
+100250 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 0 0
+9 0.51 0 0
+10 0.57 0 0
+11 0.63 0.702525 0.0204082
+12 0.69 0 0.0204082
+13 0.75 0.495812 0.0408163
+14 0.81 0.850222 0.0816327
+15 0.87 1.8426 0.183673
+16 0.93 1.61259 0.285714
+17 0.99 0 0.285714
+18 1.05 0.759094 0.346939
+19 1.11 0.452845 0.387755
+20 1.17 0.8152 0.469388
+21 1.23 2.39728 0.734694
+22 1.29 1.00592 0.857143
+23 1.35 1.22468 1.02041
+24 1.41 1.54369 1.2449
+25 1.47 0.129115 1.26531
+26 1.53 0.834316 1.40816
+27 1.59 0.882908 1.57143
+28 1.65 1.22981 1.81633
+29 1.71 1.14503 2.06122
+30 1.77 0.979661 2.28571
+31 1.83 0.833163 2.4898
+32 1.89 1.01544 2.7551
+33 1.95 1.10067 3.06122
+34 2.01 0.690632 3.26531
+35 2.07 1.107 3.61224
+36 2.13 0.615011 3.81633
+37 2.19 1.10537 4.20408
+38 2.25 1.37791 4.71429
+39 2.31 0.522905 4.91837
+40 2.37 0.794824 5.2449
+41 2.43 1.13409 5.73469
+42 2.49 0.720064 6.06122
+43 2.55 0.772402 6.42857
+44 2.61 0.942104 6.89796
+45 2.67 1.40907 7.63265
+46 2.73 0.823666 8.08163
+47 2.79 1.32632 8.83673
+48 2.85 1.13365 9.5102
+49 2.91 0.889679 10.0612
+50 2.97 1.01226 10.7143
+100300 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 0 0
+9 0.51 0 0
+10 0.57 0 0
+11 0.63 0.702525 0.0204082
+12 0.69 0.585732 0.0408163
+13 0.75 0.495812 0.0612245
+14 0.81 2.55067 0.183673
+15 0.87 1.47408 0.265306
+16 0.93 1.29007 0.346939
+17 0.99 0.853865 0.408163
+18 1.05 1.77122 0.55102
+19 1.11 0.90569 0.632653
+20 1.17 1.019 0.734694
+21 1.23 0.368812 0.77551
+22 1.29 1.00592 0.897959
+23 1.35 1.37776 1.08163
+24 1.41 0.982348 1.22449
+25 1.47 0.387344 1.28571
+26 1.53 0.715128 1.40816
+27 1.59 0.882908 1.57143
+28 1.65 0.819871 1.73469
+29 1.71 0.85877 1.91837
+30 1.77 1.3359 2.22449
+31 1.83 0.749847 2.40816
+32 1.89 0.546775 2.55102
+33 1.95 0.953918 2.81633
+34 2.01 0.897822 3.08163
+35 2.07 1.23724 3.46939
+36 2.13 0.676513 3.69388
+37 2.19 1.16355 4.10204
+38 2.25 1.10233 4.5102
+39 2.31 1.20268 4.97959
+40 2.37 0.794824 5.30612
+41 2.43 1.18134 5.81633
+42 2.49 0.630056 6.10204
+43 2.55 1.07278 6.61224
+44 2.61 1.10595 7.16327
+45 2.67 1.21337 7.79592
+46 2.73 1.16062 8.42857
+47 2.79 0.967854 8.97959
+48 2.85 1.03059 9.59184
+49 2.91 1.31804 10.4082
+50 2.97 0.917363 11
+100350 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 1.37595 0.0204082
+9 0.51 0 0.0204082
+10 0.57 0 0.0204082
+11 0.63 0.702525 0.0408163
+12 0.69 0 0.0408163
+13 0.75 0.495812 0.0612245
+14 0.81 0 0.0612245
+15 0.87 1.10556 0.122449
+16 0.93 1.93511 0.244898
+17 0.99 1.13849 0.326531
+18 1.05 0 0.326531
+19 1.11 0.452845 0.367347
+20 1.17 0 0.367347
+21 1.23 0.737623 0.44898
+22 1.29 1.00592 0.571429
+23 1.35 1.37776 0.755102
+24 1.41 0.421006 0.816327
+25 1.47 0.774689 0.938776
+26 1.53 0.59594 1.04082
+27 1.59 0.662181 1.16327
+28 1.65 1.33229 1.42857
+29 1.71 1.04961 1.65306
+30 1.77 1.06872 1.89796
+31 1.83 1.16643 2.18367
+32 1.89 0.859219 2.40816
+33 1.95 0.807161 2.63265
+34 2.01 0.759695 2.85714
+35 2.07 1.04189 3.18367
+36 2.13 0.922517 3.4898
+37 2.19 0.989019 3.83673
+38 2.25 1.26768 4.30612
+39 2.31 1.04581 4.71429
+40 2.37 0.894177 5.08163
+41 2.43 1.08684 5.55102
+42 2.49 0.945085 5.97959
+43 2.55 1.33025 6.61224
+44 2.61 1.06499 7.14286
+45 2.67 0.93938 7.63265
+46 2.73 1.0483 8.20408
+47 2.79 1.03955 8.79592
+48 2.85 1.03059 9.40816
+49 2.91 0.988533 10.0204
+50 2.97 1.29696 10.8571
+100400 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 0 0
+9 0.51 0 0
+10 0.57 0 0
+11 0.63 0.702525 0.0204082
+12 0.69 0 0.0204082
+13 0.75 0 0.0204082
+14 0.81 0.850222 0.0612245
+15 0.87 1.10556 0.122449
+16 0.93 0.322518 0.142857
+17 0.99 1.42311 0.244898
+18 1.05 0.506063 0.285714
+19 1.11 0 0.285714
+20 1.17 0.4076 0.326531
+21 1.23 1.10644 0.44898
+22 1.29 1.34123 0.612245
+23 1.35 0.918509 0.734694
+24 1.41 0.561342 0.816327
+25 1.47 1.03292 0.979592
+26 1.53 1.07269 1.16327
+27 1.59 0.882908 1.32653
+28 1.65 0.922354 1.5102
+29 1.71 0.763351 1.67347
+30 1.77 0.890601 1.87755
+31 1.83 0.416582 1.97959
+32 1.89 1.09355 2.26531
+33 1.95 0.953918 2.53061
+34 2.01 0.828758 2.77551
+35 2.07 1.04189 3.10204
+36 2.13 1.35303 3.55102
+37 2.19 0.756309 3.81633
+38 2.25 1.10233 4.22449
+39 2.31 1.0981 4.65306
+40 2.37 1.09288 5.10204
+41 2.43 0.614299 5.36735
+42 2.49 0.810072 5.73469
+43 2.55 1.1586 6.28571
+44 2.61 0.942104 6.7551
+45 2.67 1.09594 7.32653
+46 2.73 1.12318 7.93878
+47 2.79 0.896161 8.44898
+48 2.85 1.13365 9.12245
+49 2.91 1.12034 9.81633
+50 2.97 1.2337 10.6122
+100450 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 3.81206 0.0204082
+6 0.33 0 0.0204082
+7 0.39 1.83099 0.0408163
+8 0.45 0 0.0408163
+9 0.51 0 0.0408163
+10 0.57 0.858066 0.0612245
+11 0.63 0.702525 0.0816327
+12 0.69 1.17146 0.122449
+13 0.75 0.495812 0.142857
+14 0.81 1.27533 0.204082
+15 0.87 1.10556 0.265306
+16 0.93 1.61259 0.367347
+17 0.99 0.569243 0.408163
+18 1.05 1.01213 0.489796
+19 1.11 0.679267 0.55102
+20 1.17 0.6114 0.612245
+21 1.23 0.737623 0.693878
+22 1.29 1.34123 0.857143
+23 1.35 0.30617 0.897959
+24 1.41 0.561342 0.979592
+25 1.47 0.774689 1.10204
+26 1.53 1.19188 1.30612
+27 1.59 1.214 1.53061
+28 1.65 1.22981 1.77551
+29 1.71 0.572513 1.89796
+30 1.77 0.71248 2.06122
+31 1.83 1.41638 2.40816
+32 1.89 1.32788 2.7551
+33 1.95 0.807161 2.97959
+34 2.01 0.552506 3.14286
+35 2.07 0.91165 3.42857
+36 2.13 0.922517 3.73469
+37 2.19 0.930841 4.06122
+38 2.25 0.992094 4.42857
+39 2.31 1.0981 4.85714
+40 2.37 0.943854 5.2449
+41 2.43 0.850568 5.61224
+42 2.49 0.855076 6
+43 2.55 1.02987 6.4898
+44 2.61 1.06499 7.02041
+45 2.67 1.13508 7.61224
+46 2.73 0.786226 8.04082
+47 2.79 1.14709 8.69388
+48 2.85 0.996238 9.28571
+49 2.91 0.955581 9.87755
+50 2.97 1.07553 10.5714
+100500 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 1.83099 0.0204082
+8 0.45 0 0.0204082
+9 0.51 1.07159 0.0408163
+10 0.57 0 0.0408163
+11 0.63 0 0.0408163
+12 0.69 1.17146 0.0816327
+13 0.75 0.495812 0.102041
+14 0.81 0.850222 0.142857
+15 0.87 0 0.142857
+16 0.93 0.967555 0.204082
+17 0.99 1.42311 0.306122
+18 1.05 0.506063 0.346939
+19 1.11 0.90569 0.428571
+20 1.17 0 0.428571
+21 1.23 0.553218 0.489796
+22 1.29 1.00592 0.612245
+23 1.35 1.22468 0.77551
+24 1.41 1.40335 0.979592
+25 1.47 0.25823 1.02041
+26 1.53 1.43026 1.26531
+27 1.59 1.214 1.4898
+28 1.65 0.819871 1.65306
+29 1.71 1.14503 1.89796
+30 1.77 0.890601 2.10204
+31 1.83 0.583214 2.2449
+32 1.89 1.24977 2.57143
+33 1.95 1.54094 3
+34 2.01 0.552506 3.16327
+35 2.07 0.976768 3.46939
+36 2.13 0.861016 3.7551
+37 2.19 0.581776 3.95918
+38 2.25 1.26768 4.42857
+39 2.31 0.784357 4.73469
+40 2.37 0.943854 5.12245
+41 2.43 1.32311 5.69388
+42 2.49 0.855076 6.08163
+43 2.55 1.28734 6.69388
+44 2.61 0.819221 7.10204
+45 2.67 0.665394 7.44898
+46 2.73 1.31038 8.16327
+47 2.79 1.03955 8.7551
+48 2.85 0.79012 9.22449
+49 2.91 1.02148 9.85714
+50 2.97 0.948997 10.4694
+100550 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 0 0
+9 0.51 0 0
+10 0.57 0 0
+11 0.63 0 0
+12 0.69 0.585732 0.0204082
+13 0.75 1.98325 0.102041
+14 0.81 0.425111 0.122449
+15 0.87 0.737039 0.163265
+16 0.93 1.61259 0.265306
+17 0.99 1.13849 0.346939
+18 1.05 0.506063 0.387755
+19 1.11 1.13211 0.489796
+20 1.17 1.4266 0.632653
+21 1.23 0.737623 0.714286
+22 1.29 1.67654 0.918367
+23 1.35 0.612339 1
+24 1.41 0.982348 1.14286
+25 1.47 1.03292 1.30612
+26 1.53 0.357564 1.36735
+27 1.59 0.662181 1.4898
+28 1.65 0.922354 1.67347
+29 1.71 0.85877 1.85714
+30 1.77 0.80154 2.04082
+31 1.83 1.08311 2.30612
+32 1.89 0.546775 2.44898
+33 1.95 1.17405 2.77551
+34 2.01 0.897822 3.04082
+35 2.07 1.04189 3.36735
+36 2.13 1.04552 3.71429
+37 2.19 1.33808 4.18367
+38 2.25 1.10233 4.59184
+39 2.31 0.575195 4.81633
+40 2.37 0.695471 5.10204
+41 2.43 1.32311 5.67347
+42 2.49 0.900081 6.08163
+43 2.55 0.901135 6.5102
+44 2.61 0.901143 6.95918
+45 2.67 1.09594 7.53061
+46 2.73 0.898544 8.02041
+47 2.79 1.21878 8.71429
+48 2.85 1.0993 9.36735
+49 2.91 1.12034 10.0612
+50 2.97 0.759197 10.551
+100600 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 0 0
+9 0.51 0 0
+10 0.57 1.71613 0.0408163
+11 0.63 0 0.0408163
+12 0.69 1.17146 0.0816327
+13 0.75 0 0.0816327
+14 0.81 0.425111 0.102041
+15 0.87 1.10556 0.163265
+16 0.93 2.25763 0.306122
+17 0.99 1.13849 0.387755
+18 1.05 0.506063 0.428571
+19 1.11 0.452845 0.469388
+20 1.17 1.019 0.571429
+21 1.23 1.29084 0.714286
+22 1.29 1.00592 0.836735
+23 1.35 0.918509 0.959184
+24 1.41 0.982348 1.10204
+25 1.47 0.516459 1.18367
+26 1.53 0.834316 1.32653
+27 1.59 1.214 1.55102
+28 1.65 0.614903 1.67347
+29 1.71 1.14503 1.91837
+30 1.77 0.62342 2.06122
+31 1.83 0.999796 2.30612
+32 1.89 0.624886 2.46939
+33 1.95 0.953918 2.73469
+34 2.01 1.24314 3.10204
+35 2.07 1.04189 3.42857
+36 2.13 0.738014 3.67347
+37 2.19 0.756309 3.93878
+38 2.25 0.771629 4.22449
+39 2.31 0.888938 4.57143
+40 2.37 1.04321 5
+41 2.43 1.32311 5.57143
+42 2.49 0.900081 5.97959
+43 2.55 1.02987 6.46939
+44 2.61 1.22883 7.08163
+45 2.67 1.09594 7.65306
+46 2.73 0.935984 8.16327
+47 2.79 1.14709 8.81633
+48 2.85 0.652708 9.20408
+49 2.91 1.08739 9.87755
+50 2.97 1.20206 10.6531
+100650 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 0 0
+9 0.51 1.07159 0.0204082
+10 0.57 0 0.0204082
+11 0.63 0 0.0204082
+12 0.69 0.585732 0.0408163
+13 0.75 1.48744 0.102041
+14 0.81 0 0.102041
+15 0.87 1.47408 0.183673
+16 0.93 1.29007 0.265306
+17 0.99 0.853865 0.326531
+18 1.05 1.01213 0.408163
+19 1.11 1.35853 0.530612
+20 1.17 1.019 0.632653
+21 1.23 0.737623 0.714286
+22 1.29 1.50888 0.897959
+23 1.35 0.30617 0.938776
+24 1.41 0.561342 1.02041
+25 1.47 1.03292 1.18367
+26 1.53 0.59594 1.28571
+27 1.59 0.772544 1.42857
+28 1.65 0.819871 1.59184
+29 1.71 0.763351 1.7551
+30 1.77 0.890601 1.95918
+31 1.83 1.08311 2.22449
+32 1.89 1.09355 2.5102
+33 1.95 0.733783 2.71429
+34 2.01 1.24314 3.08163
+35 2.07 0.976768 3.38776
+36 2.13 0.55351 3.57143
+37 2.19 0.581776 3.77551
+38 2.25 0.936978 4.12245
+39 2.31 0.679776 4.38776
+40 2.37 1.39094 4.95918
+41 2.43 1.46487 5.59184
+42 2.49 0.855076 5.97959
+43 2.55 1.20151 6.55102
+44 2.61 0.983065 7.04082
+45 2.67 0.93938 7.53061
+46 2.73 0.823666 7.97959
+47 2.79 0.788621 8.42857
+48 2.85 1.23671 9.16327
+49 2.91 1.21919 9.91837
+50 2.97 1.07553 10.6122
+100700 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 0 0
+9 0.51 1.07159 0.0204082
+10 0.57 0 0.0204082
+11 0.63 0 0.0204082
+12 0.69 0.585732 0.0408163
+13 0.75 0.991624 0.0816327
+14 0.81 0.425111 0.102041
+15 0.87 1.10556 0.163265
+16 0.93 0.322518 0.183673
+17 0.99 1.13849 0.265306
+18 1.05 0.506063 0.306122
+19 1.11 0.452845 0.346939
+20 1.17 1.019 0.44898
+21 1.23 0.922029 0.55102
+22 1.29 1.00592 0.673469
+23 1.35 0.30617 0.714286
+24 1.41 1.40335 0.918367
+25 1.47 1.03292 1.08163
+26 1.53 1.19188 1.28571
+27 1.59 0.882908 1.44898
+28 1.65 0.819871 1.61224
+29 1.71 0.572513 1.73469
+30 1.77 1.15778 2
+31 1.83 0.583214 2.14286
+32 1.89 1.4841 2.53061
+33 1.95 1.32081 2.89796
+34 2.01 0.897822 3.16327
+35 2.07 0.976768 3.46939
+36 2.13 0.799515 3.73469
+37 2.19 0.581776 3.93878
+38 2.25 1.26768 4.40816
+39 2.31 0.679776 4.67347
+40 2.37 0.894177 5.04082
+41 2.43 1.08684 5.5102
+42 2.49 1.26011 6.08163
+43 2.55 0.944046 6.53061
+44 2.61 1.06499 7.06122
+45 2.67 0.90024 7.53061
+46 2.73 1.0483 8.10204
+47 2.79 0.967854 8.65306
+48 2.85 0.961885 9.22449
+49 2.91 1.18624 9.95918
+50 2.97 1.07553 10.6531
+100750 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 2.55534 0.0204082
+7 0.39 0 0.0204082
+8 0.45 0 0.0204082
+9 0.51 0 0.0204082
+10 0.57 0 0.0204082
+11 0.63 1.40505 0.0612245
+12 0.69 2.34293 0.142857
+13 0.75 0 0.142857
+14 0.81 0.425111 0.163265
+15 0.87 0.368519 0.183673
+16 0.93 0 0.183673
+17 0.99 0.284622 0.204082
+18 1.05 0.759094 0.265306
+19 1.11 1.58496 0.408163
+20 1.17 0.8152 0.489796
+21 1.23 1.84406 0.693878
+22 1.29 0.502961 0.755102
+23 1.35 0.918509 0.877551
+24 1.41 0.421006 0.938776
+25 1.47 0.903804 1.08163
+26 1.53 1.07269 1.26531
+27 1.59 0.551817 1.36735
+28 1.65 1.53726 1.67347
+29 1.71 0.667932 1.81633
+30 1.77 1.06872 2.06122
+31 1.83 0.749847 2.2449
+32 1.89 0.546775 2.38776
+33 1.95 1.0273 2.67347
+34 2.01 1.17407 3.02041
+35 2.07 0.91165 3.30612
+36 2.13 1.29152 3.73469
+37 2.19 1.16355 4.14286
+38 2.25 1.10233 4.55102
+39 2.31 1.0981 4.97959
+40 2.37 0.794824 5.30612
+41 2.43 1.13409 5.79592
+42 2.49 0.67506 6.10204
+43 2.55 1.02987 6.59184
+44 2.61 1.18787 7.18367
+45 2.67 0.704535 7.55102
+46 2.73 0.786226 7.97959
+47 2.79 1.0037 8.55102
+48 2.85 1.20236 9.26531
+49 2.91 0.856728 9.79592
+50 2.97 1.0439 10.4694
+100800 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 0 0
+9 0.51 1.07159 0.0204082
+10 0.57 0.858066 0.0408163
+11 0.63 0.702525 0.0612245
+12 0.69 0 0.0612245
+13 0.75 0.991624 0.102041
+14 0.81 0 0.102041
+15 0.87 0.737039 0.142857
+16 0.93 1.29007 0.22449
+17 0.99 1.13849 0.306122
+18 1.05 0.506063 0.346939
+19 1.11 0.679267 0.408163
+20 1.17 0.6114 0.469388
+21 1.23 1.29084 0.612245
+22 1.29 0.335308 0.653061
+23 1.35 0.765424 0.755102
+24 1.41 0.982348 0.897959
+25 1.47 1.29115 1.10204
+26 1.53 1.19188 1.30612
+27 1.59 1.214 1.53061
+28 1.65 1.33229 1.79592
+29 1.71 0.572513 1.91837
+30 1.77 0.80154 2.10204
+31 1.83 0.66653 2.26531
+32 1.89 0.702997 2.44898
+33 1.95 1.46757 2.85714
+34 2.01 0.690632 3.06122
+35 2.07 1.107 3.40816
+36 2.13 1.10702 3.77551
+37 2.19 0.872664 4.08163
+38 2.25 0.771629 4.36735
+39 2.31 1.35955 4.89796
+40 2.37 0.844501 5.2449
+41 2.43 1.13409 5.73469
+42 2.49 0.900081 6.14286
+43 2.55 0.986958 6.61224
+44 2.61 1.06499 7.14286
+45 2.67 0.93938 7.63265
+46 2.73 0.935984 8.14286
+47 2.79 0.932007 8.67347
+48 2.85 0.858826 9.18367
+49 2.91 0.92263 9.7551
+50 2.97 0.88573 10.3265
+100850 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 0 0
+9 0.51 0 0
+10 0.57 2.5742 0.0612245
+11 0.63 0 0.0612245
+12 0.69 0.585732 0.0816327
+13 0.75 1.48744 0.142857
+14 0.81 1.27533 0.204082
+15 0.87 2.21112 0.326531
+16 0.93 1.61259 0.428571
+17 0.99 1.42311 0.530612
+18 1.05 0.253031 0.55102
+19 1.11 0 0.55102
+20 1.17 0.2038 0.571429
+21 1.23 1.65965 0.755102
+22 1.29 0.838269 0.857143
+23 1.35 0.612339 0.938776
+24 1.41 0.842013 1.06122
+25 1.47 0.516459 1.14286
+26 1.53 0.834316 1.28571
+27 1.59 1.10363 1.4898
+28 1.65 1.33229 1.7551
+29 1.71 1.24045 2.02041
+30 1.77 1.42496 2.34694
+31 1.83 1.16643 2.63265
+32 1.89 0.624886 2.79592
+33 1.95 0.733783 3
+34 2.01 1.03595 3.30612
+35 2.07 0.91165 3.59184
+36 2.13 0.861016 3.87755
+37 2.19 1.33808 4.34694
+38 2.25 0.992094 4.71429
+39 2.31 0.941229 5.08163
+40 2.37 0.596118 5.32653
+41 2.43 1.2286 5.85714
+42 2.49 0.990089 6.30612
+43 2.55 0.944046 6.7551
+44 2.61 1.26979 7.38776
+45 2.67 1.09594 7.95918
+46 2.73 0.823666 8.40816
+47 2.79 1.0037 8.97959
+48 2.85 1.30542 9.7551
+49 2.91 0.823777 10.2653
+50 2.97 0.98063 10.898
+100900 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 0 0
+9 0.51 0 0
+10 0.57 0.858066 0.0204082
+11 0.63 0.702525 0.0408163
+12 0.69 1.17146 0.0816327
+13 0.75 0.495812 0.102041
+14 0.81 3.40089 0.265306
+15 0.87 0.737039 0.306122
+16 0.93 0.645037 0.346939
+17 0.99 0.284622 0.367347
+18 1.05 0.253031 0.387755
+19 1.11 0.679267 0.44898
+20 1.17 0.8152 0.530612
+21 1.23 1.29084 0.673469
+22 1.29 0.335308 0.714286
+23 1.35 1.83702 0.959184
+24 1.41 1.12268 1.12245
+25 1.47 0.387344 1.18367
+26 1.53 1.19188 1.38776
+27 1.59 1.214 1.61224
+28 1.65 0.717387 1.7551
+29 1.71 1.33586 2.04082
+30 1.77 1.60308 2.40816
+31 1.83 1.24974 2.71429
+32 1.89 0.859219 2.93878
+33 1.95 1.0273 3.22449
+34 2.01 0.897822 3.4898
+35 2.07 0.455825 3.63265
+36 2.13 1.35303 4.08163
+37 2.19 0.872664 4.38776
+38 2.25 0.881861 4.71429
+39 2.31 1.41184 5.26531
+40 2.37 0.943854 5.65306
+41 2.43 1.03958 6.10204
+42 2.49 0.810072 6.46939
+43 2.55 0.986958 6.93878
+44 2.61 0.983065 7.42857
+45 2.67 0.978521 7.93878
+46 2.73 0.786226 8.36735
+47 2.79 1.03955 8.95918
+48 2.85 0.652708 9.34694
+49 2.91 0.626071 9.73469
+50 2.97 1.01226 10.3878
+100950 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 0 0
+9 0.51 0 0
+10 0.57 0 0
+11 0.63 2.10758 0.0612245
+12 0.69 0 0.0612245
+13 0.75 1.98325 0.142857
+14 0.81 0.850222 0.183673
+15 0.87 1.10556 0.244898
+16 0.93 0.967555 0.306122
+17 0.99 0.853865 0.367347
+18 1.05 1.01213 0.44898
+19 1.11 1.58496 0.591837
+20 1.17 1.019 0.693878
+21 1.23 1.29084 0.836735
+22 1.29 1.17358 0.979592
+23 1.35 0.459254 1.04082
+24 1.41 0.701677 1.14286
+25 1.47 0.25823 1.18367
+26 1.53 1.54944 1.44898
+27 1.59 0.551817 1.55102
+28 1.65 1.12732 1.77551
+29 1.71 0.667932 1.91837
+30 1.77 0.890601 2.12245
+31 1.83 0.749847 2.30612
+32 1.89 0.781108 2.5102
+33 1.95 1.32081 2.87755
+34 2.01 0.621569 3.06122
+35 2.07 0.520943 3.22449
+36 2.13 0.984018 3.55102
+37 2.19 0.872664 3.85714
+38 2.25 0.826745 4.16327
+39 2.31 1.20268 4.63265
+40 2.37 1.04321 5.06122
+41 2.43 0.803314 5.40816
+42 2.49 0.630056 5.69388
+43 2.55 0.944046 6.14286
+44 2.61 1.06499 6.67347
+45 2.67 0.861099 7.12245
+46 2.73 0.861105 7.59184
+47 2.79 1.07539 8.20408
+48 2.85 1.27106 8.95918
+49 2.91 0.757875 9.42857
+50 2.97 0.88573 10
+101000 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 1.37595 0.0204082
+9 0.51 0 0.0204082
+10 0.57 1.71613 0.0612245
+11 0.63 1.40505 0.102041
+12 0.69 0.585732 0.122449
+13 0.75 0.495812 0.142857
+14 0.81 0.425111 0.163265
+15 0.87 0.737039 0.204082
+16 0.93 0.967555 0.265306
+17 0.99 1.13849 0.346939
+18 1.05 0.506063 0.387755
+19 1.11 0.226422 0.408163
+20 1.17 0.2038 0.428571
+21 1.23 1.65965 0.612245
+22 1.29 0.335308 0.653061
+23 1.35 1.22468 0.816327
+24 1.41 0.561342 0.897959
+25 1.47 0.645574 1
+26 1.53 0.59594 1.10204
+27 1.59 0.551817 1.20408
+28 1.65 1.12732 1.42857
+29 1.71 0.763351 1.59184
+30 1.77 0.80154 1.77551
+31 1.83 0.583214 1.91837
+32 1.89 1.01544 2.18367
+33 1.95 0.660405 2.36735
+34 2.01 0.828758 2.61224
+35 2.07 1.36747 3.04082
+36 2.13 0.922517 3.34694
+37 2.19 0.930841 3.67347
+38 2.25 1.15744 4.10204
+39 2.31 0.993519 4.4898
+40 2.37 1.4903 5.10204
+41 2.43 1.18134 5.61224
+42 2.49 1.1701 6.14286
+43 2.55 0.986958 6.61224
+44 2.61 1.26979 7.2449
+45 2.67 0.978521 7.7551
+46 2.73 1.01086 8.30612
+47 2.79 1.32632 9.06122
+48 2.85 1.23671 9.79592
+49 2.91 0.955581 10.3878
+50 2.97 1.20206 11.1633
+101050 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 1.37595 0.0204082
+9 0.51 0 0.0204082
+10 0.57 0 0.0204082
+11 0.63 0.702525 0.0408163
+12 0.69 1.17146 0.0816327
+13 0.75 1.48744 0.142857
+14 0.81 0.425111 0.163265
+15 0.87 0 0.163265
+16 0.93 0.645037 0.204082
+17 0.99 1.13849 0.285714
+18 1.05 0.759094 0.346939
+19 1.11 0.90569 0.428571
+20 1.17 0.6114 0.489796
+21 1.23 0.922029 0.591837
+22 1.29 1.00592 0.714286
+23 1.35 0.918509 0.836735
+24 1.41 0.561342 0.918367
+25 1.47 0.903804 1.06122
+26 1.53 0.357564 1.12245
+27 1.59 1.214 1.34694
+28 1.65 0.307451 1.40816
+29 1.71 1.33586 1.69388
+30 1.77 0.80154 1.87755
+31 1.83 1.24974 2.18367
+32 1.89 0.859219 2.40816
+33 1.95 0.660405 2.59184
+34 2.01 0.897822 2.85714
+35 2.07 1.107 3.20408
+36 2.13 1.29152 3.63265
+37 2.19 0.930841 3.95918
+38 2.25 0.60628 4.18367
+39 2.31 0.993519 4.57143
+40 2.37 0.894177 4.93878
+41 2.43 1.2286 5.46939
+42 2.49 0.900081 5.87755
+43 2.55 1.24442 6.46939
+44 2.61 0.983065 6.95918
+45 2.67 0.93938 7.44898
+46 2.73 1.27294 8.14286
+47 2.79 1.07539 8.7551
+48 2.85 0.893179 9.28571
+49 2.91 0.955581 9.87755
+50 2.97 1.10716 10.5918
+101100 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 0 0
+9 0.51 0 0
+10 0.57 0 0
+11 0.63 1.40505 0.0408163
+12 0.69 0.585732 0.0612245
+13 0.75 2.47906 0.163265
+14 0.81 1.27533 0.22449
+15 0.87 0.368519 0.244898
+16 0.93 1.29007 0.326531
+17 0.99 0.853865 0.387755
+18 1.05 1.01213 0.469388
+19 1.11 0.226422 0.489796
+20 1.17 0.4076 0.530612
+21 1.23 0.737623 0.612245
+22 1.29 0.670615 0.693878
+23 1.35 0.765424 0.795918
+24 1.41 0.982348 0.938776
+25 1.47 0.774689 1.06122
+26 1.53 0.953504 1.22449
+27 1.59 1.32436 1.46939
+28 1.65 0.922354 1.65306
+29 1.71 0.954189 1.85714
+30 1.77 1.3359 2.16327
+31 1.83 0.916479 2.38776
+32 1.89 0.859219 2.61224
+33 1.95 0.953918 2.87755
+34 2.01 1.03595 3.18367
+35 2.07 1.107 3.53061
+36 2.13 0.738014 3.77551
+37 2.19 0.756309 4.04082
+38 2.25 0.936978 4.38776
+39 2.31 0.941229 4.7551
+40 2.37 0.894177 5.12245
+41 2.43 0.897822 5.5102
+42 2.49 0.765068 5.85714
+43 2.55 0.901135 6.28571
+44 2.61 1.10595 6.83673
+45 2.67 0.93938 7.32653
+46 2.73 1.27294 8.02041
+47 2.79 0.681082 8.40816
+48 2.85 0.893179 8.93878
+49 2.91 0.856728 9.46939
+50 2.97 1.2337 10.2653
+101150 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 0 0
+9 0.51 0 0
+10 0.57 0 0
+11 0.63 0 0
+12 0.69 0.585732 0.0204082
+13 0.75 0 0.0204082
+14 0.81 0.425111 0.0408163
+15 0.87 0.737039 0.0816327
+16 0.93 1.61259 0.183673
+17 0.99 1.13849 0.265306
+18 1.05 1.51819 0.387755
+19 1.11 0.90569 0.469388
+20 1.17 0.4076 0.510204
+21 1.23 0.922029 0.612245
+22 1.29 0.670615 0.693878
+23 1.35 0.765424 0.795918
+24 1.41 0.701677 0.897959
+25 1.47 1.03292 1.06122
+26 1.53 0.59594 1.16327
+27 1.59 1.10363 1.36735
+28 1.65 0.819871 1.53061
+29 1.71 1.33586 1.81633
+30 1.77 0.80154 2
+31 1.83 1.41638 2.34694
+32 1.89 0.859219 2.57143
+33 1.95 0.513648 2.71429
+34 2.01 0.759695 2.93878
+35 2.07 0.651178 3.14286
+36 2.13 1.66053 3.69388
+37 2.19 0.872664 4
+38 2.25 1.21256 4.44898
+39 2.31 1.0981 4.87755
+40 2.37 0.794824 5.20408
+41 2.43 0.567045 5.44898
+42 2.49 0.990089 5.89796
+43 2.55 0.986958 6.36735
+44 2.61 0.819221 6.77551
+45 2.67 0.861099 7.22449
+46 2.73 0.786226 7.65306
+47 2.79 0.967854 8.20408
+48 2.85 0.927532 8.7551
+49 2.91 0.856728 9.28571
+50 2.97 0.917363 9.87755
+101200 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 0 0
+9 0.51 0 0
+10 0.57 0 0
+11 0.63 0.702525 0.0204082
+12 0.69 1.17146 0.0612245
+13 0.75 0.495812 0.0816327
+14 0.81 0.850222 0.122449
+15 0.87 0.737039 0.163265
+16 0.93 1.93511 0.285714
+17 0.99 1.42311 0.387755
+18 1.05 0.759094 0.44898
+19 1.11 1.35853 0.571429
+20 1.17 1.4266 0.714286
+21 1.23 0.737623 0.795918
+22 1.29 1.34123 0.959184
+23 1.35 0.612339 1.04082
+24 1.41 0.701677 1.14286
+25 1.47 1.42026 1.36735
+26 1.53 1.43026 1.61224
+27 1.59 0.551817 1.71429
+28 1.65 1.02484 1.91837
+29 1.71 0.954189 2.12245
+30 1.77 0.890601 2.32653
+31 1.83 1.16643 2.61224
+32 1.89 1.17166 2.91837
+33 1.95 0.513648 3.06122
+34 2.01 0.759695 3.28571
+35 2.07 0.846532 3.55102
+36 2.13 0.676513 3.77551
+37 2.19 0.523598 3.95918
+38 2.25 0.716512 4.22449
+39 2.31 0.941229 4.59184
+40 2.37 0.943854 4.97959
+41 2.43 1.08684 5.44898
+42 2.49 0.585052 5.71429
+43 2.55 1.24442 6.30612
+44 2.61 0.942104 6.77551
+45 2.67 1.0568 7.32653
+46 2.73 1.19806 7.97959
+47 2.79 0.932007 8.5102
+48 2.85 0.824473 9
+49 2.91 0.988533 9.61224
+50 2.97 0.822464 10.1429
+101250 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 0 0
+9 0.51 0 0
+10 0.57 0 0
+11 0.63 0.702525 0.0204082
+12 0.69 1.7572 0.0816327
+13 0.75 0.495812 0.102041
+14 0.81 1.27533 0.163265
+15 0.87 0.737039 0.204082
+16 0.93 0.645037 0.244898
+17 0.99 1.42311 0.346939
+18 1.05 0.506063 0.387755
+19 1.11 1.35853 0.510204
+20 1.17 0.8152 0.591837
+21 1.23 0.184406 0.612245
+22 1.29 0.502961 0.673469
+23 1.35 1.07159 0.816327
+24 1.41 0.982348 0.959184
+25 1.47 0.516459 1.04082
+26 1.53 1.43026 1.28571
+27 1.59 0.882908 1.44898
+28 1.65 1.12732 1.67347
+29 1.71 1.14503 1.91837
+30 1.77 0.71248 2.08163
+31 1.83 1.08311 2.34694
+32 1.89 1.01544 2.61224
+33 1.95 1.24743 2.95918
+34 2.01 0.621569 3.14286
+35 2.07 1.17212 3.5102
+36 2.13 0.922517 3.81633
+37 2.19 0.523598 4
+38 2.25 0.60628 4.22449
+39 2.31 0.575195 4.44898
+40 2.37 1.09288 4.89796
+41 2.43 0.850568 5.26531
+42 2.49 0.900081 5.67347
+43 2.55 1.11569 6.20408
+44 2.61 1.06499 6.73469
+45 2.67 0.93938 7.22449
+46 2.73 1.01086 7.77551
+47 2.79 1.14709 8.42857
+48 2.85 1.168 9.12245
+49 2.91 1.31804 9.93878
+50 2.97 0.917363 10.5306
+101300 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 0 0
+9 0.51 0 0
+10 0.57 0.858066 0.0204082
+11 0.63 1.40505 0.0612245
+12 0.69 0.585732 0.0816327
+13 0.75 1.48744 0.142857
+14 0.81 0 0.142857
+15 0.87 1.10556 0.204082
+16 0.93 1.61259 0.306122
+17 0.99 0.569243 0.346939
+18 1.05 0 0.346939
+19 1.11 1.58496 0.489796
+20 1.17 0.6114 0.55102
+21 1.23 0.737623 0.632653
+22 1.29 0.670615 0.714286
+23 1.35 0.765424 0.816327
+24 1.41 1.40335 1.02041
+25 1.47 1.03292 1.18367
+26 1.53 0.357564 1.2449
+27 1.59 0.772544 1.38776
+28 1.65 0.819871 1.55102
+29 1.71 1.14503 1.79592
+30 1.77 0.53436 1.91837
+31 1.83 1.24974 2.22449
+32 1.89 0.937329 2.46939
+33 1.95 0.880539 2.71429
+34 2.01 0.966885 3
+35 2.07 1.04189 3.32653
+36 2.13 0.984018 3.65306
+37 2.19 0.523598 3.83673
+38 2.25 0.992094 4.20408
+39 2.31 0.941229 4.57143
+40 2.37 0.99353 4.97959
+41 2.43 0.614299 5.2449
+42 2.49 1.0801 5.73469
+43 2.55 0.901135 6.16327
+44 2.61 0.983065 6.65306
+45 2.67 1.29165 7.32653
+46 2.73 1.0483 7.89796
+47 2.79 0.681082 8.28571
+48 2.85 0.996238 8.87755
+49 2.91 0.889679 9.42857
+50 2.97 1.2337 10.2245
+101350 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 0 0
+9 0.51 0 0
+10 0.57 0 0
+11 0.63 0.702525 0.0204082
+12 0.69 0.585732 0.0408163
+13 0.75 0.991624 0.0816327
+14 0.81 1.27533 0.142857
+15 0.87 1.47408 0.22449
+16 0.93 0.322518 0.244898
+17 0.99 0 0.244898
+18 1.05 0.506063 0.285714
+19 1.11 0.226422 0.306122
+20 1.17 0.6114 0.367347
+21 1.23 0.368812 0.408163
+22 1.29 1.17358 0.55102
+23 1.35 0.918509 0.673469
+24 1.41 0.561342 0.755102
+25 1.47 0.903804 0.897959
+26 1.53 0.715128 1.02041
+27 1.59 0.772544 1.16327
+28 1.65 1.12732 1.38776
+29 1.71 1.14503 1.63265
+30 1.77 0.53436 1.7551
+31 1.83 1.16643 2.04082
+32 1.89 0.937329 2.28571
+33 1.95 1.17405 2.61224
+34 2.01 0.621569 2.79592
+35 2.07 1.17212 3.16327
+36 2.13 0.922517 3.46939
+37 2.19 1.16355 3.87755
+38 2.25 0.771629 4.16327
+39 2.31 0.888938 4.5102
+40 2.37 0.99353 4.91837
+41 2.43 1.08684 5.38776
+42 2.49 1.30512 5.97959
+43 2.55 0.72949 6.32653
+44 2.61 1.02403 6.83673
+45 2.67 0.782817 7.2449
+46 2.73 1.01086 7.79592
+47 2.79 1.07539 8.40816
+48 2.85 0.961885 8.97959
+49 2.91 1.21919 9.73469
+50 2.97 1.10716 10.449
+101400 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 0 0
+9 0.51 2.14319 0.0408163
+10 0.57 1.71613 0.0816327
+11 0.63 0.702525 0.102041
+12 0.69 0.585732 0.122449
+13 0.75 0 0.122449
+14 0.81 0.850222 0.163265
+15 0.87 0.368519 0.183673
+16 0.93 1.29007 0.265306
+17 0.99 1.13849 0.346939
+18 1.05 1.01213 0.428571
+19 1.11 0.679267 0.489796
+20 1.17 0.8152 0.571429
+21 1.23 0.368812 0.612245
+22 1.29 0.838269 0.714286
+23 1.35 0 0.714286
+24 1.41 0.701677 0.816327
+25 1.47 0.903804 0.959184
+26 1.53 1.07269 1.14286
+27 1.59 0.662181 1.26531
+28 1.65 0.922354 1.44898
+29 1.71 1.24045 1.71429
+30 1.77 0.71248 1.87755
+31 1.83 1.24974 2.18367
+32 1.89 1.01544 2.44898
+33 1.95 0.733783 2.65306
+34 2.01 0.828758 2.89796
+35 2.07 0.976768 3.20408
+36 2.13 0.799515 3.46939
+37 2.19 0.989019 3.81633
+38 2.25 1.15744 4.2449
+39 2.31 1.41184 4.79592
+40 2.37 0.943854 5.18367
+41 2.43 1.03958 5.63265
+42 2.49 1.21511 6.18367
+43 2.55 0.901135 6.61224
+44 2.61 1.43364 7.32653
+45 2.67 1.0568 7.87755
+46 2.73 1.12318 8.4898
+47 2.79 1.21878 9.18367
+48 2.85 0.961885 9.7551
+49 2.91 0.889679 10.3061
+50 2.97 0.759197 10.7959
+101450 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 1.37595 0.0204082
+9 0.51 1.07159 0.0408163
+10 0.57 1.71613 0.0816327
+11 0.63 0.702525 0.102041
+12 0.69 0 0.102041
+13 0.75 1.98325 0.183673
+14 0.81 0.425111 0.204082
+15 0.87 0.368519 0.22449
+16 0.93 0.322518 0.244898
+17 0.99 1.13849 0.326531
+18 1.05 0.759094 0.387755
+19 1.11 0 0.387755
+20 1.17 2.2418 0.612245
+21 1.23 0.553218 0.673469
+22 1.29 0.502961 0.734694
+23 1.35 1.37776 0.918367
+24 1.41 0.982348 1.06122
+25 1.47 1.03292 1.22449
+26 1.53 0.834316 1.36735
+27 1.59 1.32436 1.61224
+28 1.65 1.02484 1.81633
+29 1.71 1.04961 2.04082
+30 1.77 1.24684 2.32653
+31 1.83 0.916479 2.55102
+32 1.89 0.468665 2.67347
+33 1.95 0.880539 2.91837
+34 2.01 0.414379 3.04082
+35 2.07 1.17212 3.40816
+36 2.13 0.676513 3.63265
+37 2.19 0.930841 3.95918
+38 2.25 0.992094 4.32653
+39 2.31 0.888938 4.67347
+40 2.37 0.99353 5.08163
+41 2.43 0.850568 5.44898
+42 2.49 0.990089 5.89796
+43 2.55 0.986958 6.36735
+44 2.61 1.51556 7.12245
+45 2.67 1.0568 7.67347
+46 2.73 1.16062 8.30612
+47 2.79 0.752775 8.73469
+48 2.85 0.927532 9.28571
+49 2.91 1.08739 9.95918
+50 2.97 1.1388 10.6939
+101500 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 0 0
+9 0.51 1.07159 0.0204082
+10 0.57 0 0.0204082
+11 0.63 0.702525 0.0408163
+12 0.69 0 0.0408163
+13 0.75 0.495812 0.0612245
+14 0.81 0.850222 0.102041
+15 0.87 0.737039 0.142857
+16 0.93 0.645037 0.183673
+17 0.99 1.70773 0.306122
+18 1.05 0 0.306122
+19 1.11 0.90569 0.387755
+20 1.17 1.019 0.489796
+21 1.23 0.553218 0.55102
+22 1.29 0.502961 0.612245
+23 1.35 1.07159 0.755102
+24 1.41 0.982348 0.897959
+25 1.47 1.16203 1.08163
+26 1.53 1.43026 1.32653
+27 1.59 1.214 1.55102
+28 1.65 1.12732 1.77551
+29 1.71 1.33586 2.06122
+30 1.77 0.80154 2.2449
+31 1.83 0.499898 2.36735
+32 1.89 1.09355 2.65306
+33 1.95 0.953918 2.91837
+34 2.01 0.966885 3.20408
+35 2.07 0.455825 3.34694
+36 2.13 1.16852 3.73469
+37 2.19 0.872664 4.04082
+38 2.25 0.826745 4.34694
+39 2.31 1.04581 4.7551
+40 2.37 0.99353 5.16327
+41 2.43 0.75606 5.4898
+42 2.49 1.80016 6.30612
+43 2.55 0.815313 6.69388
+44 2.61 0.860182 7.12245
+45 2.67 0.90024 7.59184
+46 2.73 0.898544 8.08163
+47 2.79 0.932007 8.61224
+48 2.85 0.961885 9.18367
+49 2.91 1.15329 9.89796
+50 2.97 1.3286 10.7551
+101550 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 2.7519 0.0408163
+9 0.51 0 0.0408163
+10 0.57 0.858066 0.0612245
+11 0.63 0.702525 0.0816327
+12 0.69 0 0.0816327
+13 0.75 1.98325 0.163265
+14 0.81 1.27533 0.22449
+15 0.87 0 0.22449
+16 0.93 1.61259 0.326531
+17 0.99 0.569243 0.367347
+18 1.05 0.759094 0.428571
+19 1.11 0.452845 0.469388
+20 1.17 1.019 0.571429
+21 1.23 0.922029 0.673469
+22 1.29 0.670615 0.755102
+23 1.35 0.918509 0.877551
+24 1.41 0.421006 0.938776
+25 1.47 1.03292 1.10204
+26 1.53 0.834316 1.2449
+27 1.59 1.10363 1.44898
+28 1.65 1.53726 1.7551
+29 1.71 0.667932 1.89796
+30 1.77 0.71248 2.06122
+31 1.83 0.749847 2.2449
+32 1.89 1.4841 2.63265
+33 1.95 1.17405 2.95918
+34 2.01 0.621569 3.14286
+35 2.07 0.846532 3.40816
+36 2.13 0.615011 3.61224
+37 2.19 1.51262 4.14286
+38 2.25 0.936978 4.4898
+39 2.31 0.784357 4.79592
+40 2.37 1.09288 5.2449
+41 2.43 1.03958 5.69388
+42 2.49 1.03509 6.16327
+43 2.55 1.28734 6.77551
+44 2.61 1.06499 7.30612
+45 2.67 1.01766 7.83673
+46 2.73 1.12318 8.44898
+47 2.79 0.681082 8.83673
+48 2.85 0.721414 9.26531
+49 2.91 0.955581 9.85714
+50 2.97 1.0439 10.5306
+101600 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 1.37595 0.0204082
+9 0.51 0 0.0204082
+10 0.57 1.71613 0.0612245
+11 0.63 0 0.0612245
+12 0.69 0.585732 0.0816327
+13 0.75 0.991624 0.122449
+14 0.81 1.27533 0.183673
+15 0.87 0.737039 0.22449
+16 0.93 0.322518 0.244898
+17 0.99 1.13849 0.326531
+18 1.05 2.02425 0.489796
+19 1.11 1.13211 0.591837
+20 1.17 0.6114 0.653061
+21 1.23 0.184406 0.673469
+22 1.29 1.17358 0.816327
+23 1.35 0.918509 0.938776
+24 1.41 0.842013 1.06122
+25 1.47 0.903804 1.20408
+26 1.53 1.19188 1.40816
+27 1.59 0.662181 1.53061
+28 1.65 0.717387 1.67347
+29 1.71 0.667932 1.81633
+30 1.77 1.3359 2.12245
+31 1.83 0.499898 2.2449
+32 1.89 1.17166 2.55102
+33 1.95 0.953918 2.81633
+34 2.01 0.966885 3.10204
+35 2.07 0.91165 3.38776
+36 2.13 0.799515 3.65306
+37 2.19 1.22173 4.08163
+38 2.25 0.992094 4.44898
+39 2.31 0.888938 4.79592
+40 2.37 1.04321 5.22449
+41 2.43 0.945075 5.63265
+42 2.49 1.26011 6.20408
+43 2.55 1.07278 6.71429
+44 2.61 0.901143 7.16327
+45 2.67 1.13508 7.7551
+46 2.73 0.673908 8.12245
+47 2.79 1.14709 8.77551
+48 2.85 0.893179 9.30612
+49 2.91 1.02148 9.93878
+50 2.97 1.17043 10.6939
+101650 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 1.37595 0.0204082
+9 0.51 0 0.0204082
+10 0.57 0.858066 0.0408163
+11 0.63 0.702525 0.0612245
+12 0.69 0.585732 0.0816327
+13 0.75 1.98325 0.163265
+14 0.81 0.850222 0.204082
+15 0.87 0.368519 0.22449
+16 0.93 0.967555 0.285714
+17 0.99 0.284622 0.306122
+18 1.05 0.759094 0.367347
+19 1.11 0.679267 0.428571
+20 1.17 1.2228 0.55102
+21 1.23 0.737623 0.632653
+22 1.29 0.335308 0.673469
+23 1.35 1.07159 0.816327
+24 1.41 0.701677 0.918367
+25 1.47 0.774689 1.04082
+26 1.53 0.834316 1.18367
+27 1.59 0.882908 1.34694
+28 1.65 0.922354 1.53061
+29 1.71 0.667932 1.67347
+30 1.77 0.62342 1.81633
+31 1.83 0.916479 2.04082
+32 1.89 0.546775 2.18367
+33 1.95 1.17405 2.5102
+34 2.01 0.897822 2.77551
+35 2.07 1.36747 3.20408
+36 2.13 1.10702 3.57143
+37 2.19 1.33808 4.04082
+38 2.25 0.881861 4.36735
+39 2.31 1.15039 4.81633
+40 2.37 0.794824 5.14286
+41 2.43 0.897822 5.53061
+42 2.49 1.71015 6.30612
+43 2.55 0.686579 6.63265
+44 2.61 1.26979 7.26531
+45 2.67 1.17423 7.87755
+46 2.73 0.973423 8.40816
+47 2.79 1.0037 8.97959
+48 2.85 1.0993 9.63265
+49 2.91 1.08739 10.3061
+50 2.97 1.01226 10.9592
+101700 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 1.37595 0.0204082
+9 0.51 1.07159 0.0408163
+10 0.57 0 0.0408163
+11 0.63 1.40505 0.0816327
+12 0.69 0 0.0816327
+13 0.75 0.991624 0.122449
+14 0.81 2.55067 0.244898
+15 0.87 0.737039 0.285714
+16 0.93 0.967555 0.346939
+17 0.99 1.13849 0.428571
+18 1.05 0.759094 0.489796
+19 1.11 0.90569 0.571429
+20 1.17 0.4076 0.612245
+21 1.23 0.737623 0.693878
+22 1.29 1.00592 0.816327
+23 1.35 0.918509 0.938776
+24 1.41 1.54369 1.16327
+25 1.47 0.903804 1.30612
+26 1.53 0.834316 1.44898
+27 1.59 0.551817 1.55102
+28 1.65 0.717387 1.69388
+29 1.71 0.667932 1.83673
+30 1.77 0.4453 1.93878
+31 1.83 0.999796 2.18367
+32 1.89 1.01544 2.44898
+33 1.95 0.880539 2.69388
+34 2.01 0.690632 2.89796
+35 2.07 0.716296 3.12245
+36 2.13 1.10702 3.4898
+37 2.19 0.930841 3.81633
+38 2.25 0.826745 4.12245
+39 2.31 1.0981 4.55102
+40 2.37 1.14256 5.02041
+41 2.43 0.992329 5.44898
+42 2.49 0.855076 5.83673
+43 2.55 1.37316 6.4898
+44 2.61 1.63844 7.30612
+45 2.67 0.821958 7.73469
+46 2.73 1.12318 8.34694
+47 2.79 0.716929 8.7551
+48 2.85 1.0993 9.40816
+49 2.91 0.659022 9.81633
+50 2.97 1.10716 10.5306
+101750 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 0 0
+9 0.51 0 0
+10 0.57 0 0
+11 0.63 0.702525 0.0204082
+12 0.69 0.585732 0.0408163
+13 0.75 0.991624 0.0816327
+14 0.81 0 0.0816327
+15 0.87 0.368519 0.102041
+16 0.93 0.322518 0.122449
+17 0.99 1.42311 0.22449
+18 1.05 0.759094 0.285714
+19 1.11 0.90569 0.367347
+20 1.17 1.019 0.469388
+21 1.23 2.02846 0.693878
+22 1.29 0.502961 0.755102
+23 1.35 1.07159 0.897959
+24 1.41 1.54369 1.12245
+25 1.47 1.29115 1.32653
+26 1.53 1.19188 1.53061
+27 1.59 1.43472 1.79592
+28 1.65 0.922354 1.97959
+29 1.71 1.14503 2.22449
+30 1.77 0.71248 2.38776
+31 1.83 0.916479 2.61224
+32 1.89 0.859219 2.83673
+33 1.95 0.587026 3
+34 2.01 0.552506 3.16327
+35 2.07 1.04189 3.4898
+36 2.13 0.799515 3.7551
+37 2.19 0.872664 4.06122
+38 2.25 1.15744 4.4898
+39 2.31 0.888938 4.83673
+40 2.37 1.29159 5.36735
+41 2.43 0.803314 5.71429
+42 2.49 0.855076 6.10204
+43 2.55 1.02987 6.59184
+44 2.61 1.02403 7.10204
+45 2.67 0.626254 7.42857
+46 2.73 0.748787 7.83673
+47 2.79 1.07539 8.44898
+48 2.85 0.721414 8.87755
+49 2.91 0.823777 9.38776
+50 2.97 0.917363 9.97959
+101800 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 1.83099 0.0204082
+8 0.45 0 0.0204082
+9 0.51 0 0.0204082
+10 0.57 0 0.0204082
+11 0.63 0 0.0204082
+12 0.69 0 0.0204082
+13 0.75 0.495812 0.0408163
+14 0.81 1.70044 0.122449
+15 0.87 0.368519 0.142857
+16 0.93 0.967555 0.204082
+17 0.99 1.13849 0.285714
+18 1.05 1.01213 0.367347
+19 1.11 1.13211 0.469388
+20 1.17 0.8152 0.55102
+21 1.23 0.922029 0.653061
+22 1.29 1.00592 0.77551
+23 1.35 0.612339 0.857143
+24 1.41 0.701677 0.959184
+25 1.47 0.645574 1.06122
+26 1.53 1.07269 1.2449
+27 1.59 0.882908 1.40816
+28 1.65 0.819871 1.57143
+29 1.71 0.954189 1.77551
+30 1.77 0.890601 1.97959
+31 1.83 0.999796 2.22449
+32 1.89 0.781108 2.42857
+33 1.95 1.0273 2.71429
+34 2.01 0.966885 3
+35 2.07 1.107 3.34694
+36 2.13 1.04552 3.69388
+37 2.19 0.930841 4.02041
+38 2.25 1.15744 4.44898
+39 2.31 0.784357 4.7551
+40 2.37 0.894177 5.12245
+41 2.43 1.08684 5.59184
+42 2.49 0.990089 6.04082
+43 2.55 0.557846 6.30612
+44 2.61 1.14691 6.87755
+45 2.67 0.861099 7.32653
+46 2.73 1.19806 7.97959
+47 2.79 1.03955 8.57143
+48 2.85 1.0993 9.22449
+49 2.91 1.35099 10.0612
+50 2.97 0.790831 10.5714
+101850 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 0 0
+9 0.51 0 0
+10 0.57 0 0
+11 0.63 0 0
+12 0.69 0 0
+13 0.75 1.48744 0.0612245
+14 0.81 0.425111 0.0816327
+15 0.87 0.368519 0.102041
+16 0.93 0.322518 0.122449
+17 0.99 1.42311 0.22449
+18 1.05 0 0.22449
+19 1.11 1.58496 0.367347
+20 1.17 1.4266 0.510204
+21 1.23 1.10644 0.632653
+22 1.29 1.00592 0.755102
+23 1.35 0.459254 0.816327
+24 1.41 1.12268 0.979592
+25 1.47 0.903804 1.12245
+26 1.53 0.834316 1.26531
+27 1.59 0.772544 1.40816
+28 1.65 1.02484 1.61224
+29 1.71 1.04961 1.83673
+30 1.77 0.890601 2.04082
+31 1.83 0.583214 2.18367
+32 1.89 0.468665 2.30612
+33 1.95 0.807161 2.53061
+34 2.01 1.45033 2.95918
+35 2.07 1.107 3.30612
+36 2.13 1.04552 3.65306
+37 2.19 0.814486 3.93878
+38 2.25 1.21256 4.38776
+39 2.31 0.836648 4.71429
+40 2.37 0.695471 5
+41 2.43 0.945075 5.40816
+42 2.49 1.1251 5.91837
+43 2.55 1.11569 6.44898
+44 2.61 1.31075 7.10204
+45 2.67 0.782817 7.5102
+46 2.73 1.16062 8.14286
+47 2.79 0.967854 8.69388
+48 2.85 0.927532 9.2449
+49 2.91 1.02148 9.87755
+50 2.97 1.07553 10.5714
+101900 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 0 0
+9 0.51 0 0
+10 0.57 0 0
+11 0.63 0.702525 0.0204082
+12 0.69 0 0.0204082
+13 0.75 0.495812 0.0408163
+14 0.81 0.850222 0.0816327
+15 0.87 1.10556 0.142857
+16 0.93 1.61259 0.244898
+17 0.99 0.853865 0.306122
+18 1.05 0 0.306122
+19 1.11 0.679267 0.367347
+20 1.17 0.4076 0.408163
+21 1.23 0.737623 0.489796
+22 1.29 0.838269 0.591837
+23 1.35 0.765424 0.693878
+24 1.41 0.561342 0.77551
+25 1.47 1.16203 0.959184
+26 1.53 1.07269 1.14286
+27 1.59 0.772544 1.28571
+28 1.65 0.512419 1.38776
+29 1.71 0.572513 1.5102
+30 1.77 1.06872 1.7551
+31 1.83 1.08311 2.02041
+32 1.89 1.40599 2.38776
+33 1.95 0.953918 2.65306
+34 2.01 1.10501 2.97959
+35 2.07 1.04189 3.30612
+36 2.13 0.861016 3.59184
+37 2.19 1.22173 4.02041
+38 2.25 1.04721 4.40816
+39 2.31 1.25497 4.89796
+40 2.37 0.844501 5.2449
+41 2.43 0.708807 5.55102
+42 2.49 0.765068 5.89796
+43 2.55 1.02987 6.38776
+44 2.61 0.983065 6.87755
+45 2.67 1.29165 7.55102
+46 2.73 1.01086 8.10204
+47 2.79 1.07539 8.71429
+48 2.85 0.961885 9.28571
+49 2.91 1.35099 10.1224
+50 2.97 0.88573 10.6939
+101950 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 0 0
+9 0.51 0 0
+10 0.57 0.858066 0.0204082
+11 0.63 0 0.0204082
+12 0.69 0 0.0204082
+13 0.75 1.48744 0.0816327
+14 0.81 0.850222 0.122449
+15 0.87 0.368519 0.142857
+16 0.93 0.645037 0.183673
+17 0.99 0.569243 0.22449
+18 1.05 0.506063 0.265306
+19 1.11 1.58496 0.408163
+20 1.17 0.8152 0.489796
+21 1.23 0.553218 0.55102
+22 1.29 0.670615 0.632653
+23 1.35 0.612339 0.714286
+24 1.41 0.561342 0.795918
+25 1.47 0.516459 0.877551
+26 1.53 0.715128 1
+27 1.59 0.772544 1.14286
+28 1.65 1.12732 1.36735
+29 1.71 0.667932 1.5102
+30 1.77 0.4453 1.61224
+31 1.83 0.416582 1.71429
+32 1.89 1.09355 2
+33 1.95 0.953918 2.26531
+34 2.01 0.897822 2.53061
+35 2.07 0.91165 2.81633
+36 2.13 1.41453 3.28571
+37 2.19 0.756309 3.55102
+38 2.25 1.10233 3.95918
+39 2.31 1.30726 4.46939
+40 2.37 1.19224 4.95918
+41 2.43 1.2286 5.4898
+42 2.49 1.21511 6.04082
+43 2.55 0.815313 6.42857
+44 2.61 0.901143 6.87755
+45 2.67 1.17423 7.4898
+46 2.73 1.16062 8.12245
+47 2.79 1.21878 8.81633
+48 2.85 1.13365 9.4898
+49 2.91 0.92263 10.0612
+50 2.97 1.0439 10.7347
+102000 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 1.83099 0.0204082
+8 0.45 0 0.0204082
+9 0.51 0 0.0204082
+10 0.57 0 0.0204082
+11 0.63 0 0.0204082
+12 0.69 0.585732 0.0408163
+13 0.75 0 0.0408163
+14 0.81 0.425111 0.0612245
+15 0.87 0.368519 0.0816327
+16 0.93 0.322518 0.102041
+17 0.99 0.853865 0.163265
+18 1.05 0.759094 0.22449
+19 1.11 0.90569 0.306122
+20 1.17 0.8152 0.387755
+21 1.23 0.922029 0.489796
+22 1.29 0.502961 0.55102
+23 1.35 0.612339 0.632653
+24 1.41 0.701677 0.734694
+25 1.47 0.903804 0.877551
+26 1.53 0.715128 1
+27 1.59 0.662181 1.12245
+28 1.65 0.922354 1.30612
+29 1.71 1.33586 1.59184
+30 1.77 1.3359 1.89796
+31 1.83 0.66653 2.06122
+32 1.89 0.624886 2.22449
+33 1.95 1.24743 2.57143
+34 2.01 0.897822 2.83673
+35 2.07 0.91165 3.12245
+36 2.13 1.04552 3.46939
+37 2.19 0.814486 3.7551
+38 2.25 0.936978 4.10204
+39 2.31 1.41184 4.65306
+40 2.37 0.894177 5.02041
+41 2.43 1.18134 5.53061
+42 2.49 1.57514 6.2449
+43 2.55 0.858224 6.65306
+44 2.61 0.614416 6.95918
+45 2.67 1.13508 7.55102
+46 2.73 1.46013 8.34694
+47 2.79 0.752775 8.77551
+48 2.85 0.893179 9.30612
+49 2.91 1.05443 9.95918
+50 2.97 1.01226 10.6122
+102050 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 0 0
+9 0.51 1.07159 0.0204082
+10 0.57 0 0.0204082
+11 0.63 0 0.0204082
+12 0.69 0.585732 0.0408163
+13 0.75 2.47906 0.142857
+14 0.81 0.425111 0.163265
+15 0.87 1.10556 0.22449
+16 0.93 1.29007 0.306122
+17 0.99 0.569243 0.346939
+18 1.05 0.506063 0.387755
+19 1.11 0.90569 0.469388
+20 1.17 1.2228 0.591837
+21 1.23 0.553218 0.653061
+22 1.29 0.167654 0.673469
+23 1.35 0.30617 0.714286
+24 1.41 0.982348 0.857143
+25 1.47 0.774689 0.979592
+26 1.53 0.59594 1.08163
+27 1.59 0.993271 1.26531
+28 1.65 1.02484 1.46939
+29 1.71 0.763351 1.63265
+30 1.77 1.3359 1.93878
+31 1.83 1.16643 2.22449
+32 1.89 1.17166 2.53061
+33 1.95 0.660405 2.71429
+34 2.01 1.03595 3.02041
+35 2.07 1.30236 3.42857
+36 2.13 0.922517 3.73469
+37 2.19 0.872664 4.04082
+38 2.25 0.60628 4.26531
+39 2.31 0.627486 4.5102
+40 2.37 0.894177 4.87755
+41 2.43 0.945075 5.28571
+42 2.49 0.990089 5.73469
+43 2.55 1.07278 6.2449
+44 2.61 0.942104 6.71429
+45 2.67 1.44821 7.46939
+46 2.73 0.898544 7.95918
+47 2.79 0.967854 8.5102
+48 2.85 1.0993 9.16327
+49 2.91 0.757875 9.63265
+50 2.97 0.88573 10.2041
+102100 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 0 0
+9 0.51 0 0
+10 0.57 0 0
+11 0.63 0 0
+12 0.69 1.17146 0.0408163
+13 0.75 0.495812 0.0612245
+14 0.81 0.850222 0.102041
+15 0.87 1.47408 0.183673
+16 0.93 1.93511 0.306122
+17 0.99 1.13849 0.387755
+18 1.05 0.759094 0.44898
+19 1.11 0.452845 0.489796
+20 1.17 0.2038 0.510204
+21 1.23 0.737623 0.591837
+22 1.29 0.670615 0.673469
+23 1.35 1.07159 0.816327
+24 1.41 0.561342 0.897959
+25 1.47 1.03292 1.06122
+26 1.53 0.476752 1.14286
+27 1.59 0.993271 1.32653
+28 1.65 1.02484 1.53061
+29 1.71 0.954189 1.73469
+30 1.77 1.51402 2.08163
+31 1.83 1.08311 2.34694
+32 1.89 1.32788 2.69388
+33 1.95 0.587026 2.85714
+34 2.01 0.828758 3.10204
+35 2.07 0.91165 3.38776
+36 2.13 1.04552 3.73469
+37 2.19 0.639953 3.95918
+38 2.25 0.496047 4.14286
+39 2.31 0.941229 4.5102
+40 2.37 0.844501 4.85714
+41 2.43 0.992329 5.28571
+42 2.49 1.03509 5.7551
+43 2.55 1.02987 6.2449
+44 2.61 1.14691 6.81633
+45 2.67 0.821958 7.2449
+46 2.73 0.748787 7.65306
+47 2.79 1.25463 8.36735
+48 2.85 1.37412 9.18367
+49 2.91 0.659022 9.59184
+50 2.97 1.1388 10.3265
+102150 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 1.37595 0.0204082
+9 0.51 1.07159 0.0408163
+10 0.57 0 0.0408163
+11 0.63 0 0.0408163
+12 0.69 0.585732 0.0612245
+13 0.75 1.48744 0.122449
+14 0.81 0.850222 0.163265
+15 0.87 1.47408 0.244898
+16 0.93 1.29007 0.326531
+17 0.99 2.27697 0.489796
+18 1.05 0 0.489796
+19 1.11 0 0.489796
+20 1.17 0.8152 0.571429
+21 1.23 0.737623 0.653061
+22 1.29 0.502961 0.714286
+23 1.35 0.918509 0.836735
+24 1.41 0.701677 0.938776
+25 1.47 0.774689 1.06122
+26 1.53 0.715128 1.18367
+27 1.59 1.65545 1.4898
+28 1.65 0.614903 1.61224
+29 1.71 0.763351 1.77551
+30 1.77 0.979661 2
+31 1.83 1.16643 2.28571
+32 1.89 0.937329 2.53061
+33 1.95 1.54094 2.95918
+34 2.01 0.828758 3.20408
+35 2.07 1.17212 3.57143
+36 2.13 0.861016 3.85714
+37 2.19 1.22173 4.28571
+38 2.25 0.661396 4.53061
+39 2.31 0.888938 4.87755
+40 2.37 0.894177 5.2449
+41 2.43 0.708807 5.55102
+42 2.49 1.0801 6.04082
+43 2.55 0.72949 6.38776
+44 2.61 0.696338 6.73469
+45 2.67 1.21337 7.36735
+46 2.73 1.12318 7.97959
+47 2.79 1.29047 8.71429
+48 2.85 1.13365 9.38776
+49 2.91 1.02148 10.0204
+50 2.97 0.917363 10.6122
+102200 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 1.83099 0.0204082
+8 0.45 0 0.0204082
+9 0.51 0 0.0204082
+10 0.57 0 0.0204082
+11 0.63 0 0.0204082
+12 0.69 0.585732 0.0408163
+13 0.75 1.98325 0.122449
+14 0.81 0.850222 0.163265
+15 0.87 0.368519 0.183673
+16 0.93 1.29007 0.265306
+17 0.99 0.284622 0.285714
+18 1.05 1.01213 0.367347
+19 1.11 0.90569 0.44898
+20 1.17 0.8152 0.530612
+21 1.23 0.922029 0.632653
+22 1.29 1.34123 0.795918
+23 1.35 1.07159 0.938776
+24 1.41 1.12268 1.10204
+25 1.47 0.25823 1.14286
+26 1.53 0.238376 1.18367
+27 1.59 0.882908 1.34694
+28 1.65 1.02484 1.55102
+29 1.71 1.14503 1.79592
+30 1.77 1.15778 2.06122
+31 1.83 1.08311 2.32653
+32 1.89 1.01544 2.59184
+33 1.95 0.953918 2.85714
+34 2.01 1.17407 3.20408
+35 2.07 1.17212 3.57143
+36 2.13 0.738014 3.81633
+37 2.19 0.814486 4.10204
+38 2.25 0.771629 4.38776
+39 2.31 1.0981 4.81633
+40 2.37 1.4903 5.42857
+41 2.43 0.850568 5.79592
+42 2.49 1.03509 6.26531
+43 2.55 0.772402 6.63265
+44 2.61 1.10595 7.18367
+45 2.67 0.93938 7.67347
+46 2.73 1.01086 8.22449
+47 2.79 0.716929 8.63265
+48 2.85 0.549649 8.95918
+49 2.91 0.889679 9.5102
+50 2.97 1.2337 10.3061
+102250 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 0 0
+9 0.51 2.14319 0.0408163
+10 0.57 0.858066 0.0612245
+11 0.63 0.702525 0.0816327
+12 0.69 0 0.0816327
+13 0.75 0 0.0816327
+14 0.81 0.850222 0.122449
+15 0.87 1.10556 0.183673
+16 0.93 0.967555 0.244898
+17 0.99 0.569243 0.285714
+18 1.05 1.26516 0.387755
+19 1.11 0.90569 0.469388
+20 1.17 0.8152 0.55102
+21 1.23 1.29084 0.693878
+22 1.29 0.502961 0.755102
+23 1.35 0.612339 0.836735
+24 1.41 1.26302 1.02041
+25 1.47 1.16203 1.20408
+26 1.53 0.476752 1.28571
+27 1.59 0.551817 1.38776
+28 1.65 1.22981 1.63265
+29 1.71 0.381676 1.71429
+30 1.77 0.71248 1.87755
+31 1.83 1.16643 2.16327
+32 1.89 1.32788 2.5102
+33 1.95 1.32081 2.87755
+34 2.01 1.24314 3.2449
+35 2.07 0.781414 3.4898
+36 2.13 1.16852 3.87755
+37 2.19 0.639953 4.10204
+38 2.25 0.881861 4.42857
+39 2.31 1.15039 4.87755
+40 2.37 0.596118 5.12245
+41 2.43 0.992329 5.55102
+42 2.49 1.03509 6.02041
+43 2.55 0.72949 6.36735
+44 2.61 0.737299 6.73469
+45 2.67 1.17423 7.34694
+46 2.73 0.748787 7.7551
+47 2.79 1.14709 8.40816
+48 2.85 0.961885 8.97959
+49 2.91 1.12034 9.67347
+50 2.97 0.948997 10.2857
+102300 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 0 0
+9 0.51 1.07159 0.0204082
+10 0.57 0 0.0204082
+11 0.63 0 0.0204082
+12 0.69 1.17146 0.0612245
+13 0.75 0.495812 0.0816327
+14 0.81 0.850222 0.122449
+15 0.87 0.368519 0.142857
+16 0.93 1.29007 0.22449
+17 0.99 0 0.22449
+18 1.05 1.01213 0.306122
+19 1.11 0.679267 0.367347
+20 1.17 1.2228 0.489796
+21 1.23 1.29084 0.632653
+22 1.29 1.00592 0.755102
+23 1.35 0.765424 0.857143
+24 1.41 0.561342 0.938776
+25 1.47 1.42026 1.16327
+26 1.53 1.19188 1.36735
+27 1.59 0.772544 1.5102
+28 1.65 1.02484 1.71429
+29 1.71 0.381676 1.79592
+30 1.77 0.890601 2
+31 1.83 0.416582 2.10204
+32 1.89 0.624886 2.26531
+33 1.95 0.880539 2.5102
+34 2.01 0.828758 2.7551
+35 2.07 1.107 3.10204
+36 2.13 0.615011 3.30612
+37 2.19 0.930841 3.63265
+38 2.25 0.716512 3.89796
+39 2.31 1.25497 4.38776
+40 2.37 1.14256 4.85714
+41 2.43 0.75606 5.18367
+42 2.49 1.03509 5.65306
+43 2.55 1.24442 6.2449
+44 2.61 1.10595 6.79592
+45 2.67 0.90024 7.26531
+46 2.73 1.31038 7.97959
+47 2.79 1.29047 8.71429
+48 2.85 0.687061 9.12245
+49 2.91 1.35099 9.95918
+50 2.97 0.88573 10.5306
+102350 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 1.37595 0.0204082
+9 0.51 0 0.0204082
+10 0.57 0.858066 0.0408163
+11 0.63 0 0.0408163
+12 0.69 1.17146 0.0816327
+13 0.75 0 0.0816327
+14 0.81 0.425111 0.102041
+15 0.87 0.737039 0.142857
+16 0.93 0.967555 0.204082
+17 0.99 0.853865 0.265306
+18 1.05 0.759094 0.326531
+19 1.11 1.13211 0.428571
+20 1.17 0.8152 0.510204
+21 1.23 0.922029 0.612245
+22 1.29 1.34123 0.77551
+23 1.35 0.612339 0.857143
+24 1.41 0.982348 1
+25 1.47 0.774689 1.12245
+26 1.53 0.715128 1.2449
+27 1.59 0.772544 1.38776
+28 1.65 0.409935 1.46939
+29 1.71 0.954189 1.67347
+30 1.77 0.80154 1.85714
+31 1.83 1.24974 2.16327
+32 1.89 0.624886 2.32653
+33 1.95 0.953918 2.59184
+34 2.01 1.10501 2.91837
+35 2.07 1.04189 3.2449
+36 2.13 0.799515 3.5102
+37 2.19 1.22173 3.93878
+38 2.25 0.716512 4.20408
+39 2.31 1.25497 4.69388
+40 2.37 1.09288 5.14286
+41 2.43 0.897822 5.53061
+42 2.49 1.03509 6
+43 2.55 1.02987 6.4898
+44 2.61 0.77826 6.87755
+45 2.67 0.821958 7.30612
+46 2.73 0.823666 7.7551
+47 2.79 0.967854 8.30612
+48 2.85 1.0993 8.95918
+49 2.91 0.889679 9.5102
+50 2.97 1.07553 10.2041
+102400 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 1.37595 0.0204082
+9 0.51 2.14319 0.0612245
+10 0.57 0 0.0612245
+11 0.63 0.702525 0.0816327
+12 0.69 0.585732 0.102041
+13 0.75 0.495812 0.122449
+14 0.81 0.425111 0.142857
+15 0.87 0.368519 0.163265
+16 0.93 0.645037 0.204082
+17 0.99 1.70773 0.326531
+18 1.05 0.759094 0.387755
+19 1.11 0.452845 0.428571
+20 1.17 1.2228 0.55102
+21 1.23 0.737623 0.632653
+22 1.29 1.00592 0.755102
+23 1.35 0.612339 0.836735
+24 1.41 0.982348 0.979592
+25 1.47 1.29115 1.18367
+26 1.53 0.357564 1.2449
+27 1.59 0.220727 1.28571
+28 1.65 1.22981 1.53061
+29 1.71 0.763351 1.69388
+30 1.77 0.71248 1.85714
+31 1.83 0.999796 2.10204
+32 1.89 0.859219 2.32653
+33 1.95 0.807161 2.55102
+34 2.01 1.24314 2.91837
+35 2.07 1.04189 3.2449
+36 2.13 0.922517 3.55102
+37 2.19 0.814486 3.83673
+38 2.25 0.771629 4.12245
+39 2.31 0.522905 4.32653
+40 2.37 0.943854 4.71429
+41 2.43 1.37036 5.30612
+42 2.49 1.1701 5.83673
+43 2.55 1.11569 6.36735
+44 2.61 1.06499 6.89796
+45 2.67 1.0568 7.44898
+46 2.73 0.973423 7.97959
+47 2.79 1.07539 8.59184
+48 2.85 0.79012 9.06122
+49 2.91 0.988533 9.67347
+50 2.97 1.20206 10.449
+102450 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 0 0
+9 0.51 1.07159 0.0204082
+10 0.57 0.858066 0.0408163
+11 0.63 0.702525 0.0612245
+12 0.69 0 0.0612245
+13 0.75 0.495812 0.0816327
+14 0.81 0.850222 0.122449
+15 0.87 0.368519 0.142857
+16 0.93 0.967555 0.204082
+17 0.99 1.42311 0.306122
+18 1.05 0.759094 0.367347
+19 1.11 0.679267 0.428571
+20 1.17 0.6114 0.489796
+21 1.23 0.922029 0.591837
+22 1.29 0.670615 0.673469
+23 1.35 1.07159 0.816327
+24 1.41 1.40335 1.02041
+25 1.47 0.516459 1.10204
+26 1.53 1.31107 1.32653
+27 1.59 0.220727 1.36735
+28 1.65 0.614903 1.4898
+29 1.71 0.667932 1.63265
+30 1.77 0.71248 1.79592
+31 1.83 1.16643 2.08163
+32 1.89 0.702997 2.26531
+33 1.95 1.39419 2.65306
+34 2.01 1.03595 2.95918
+35 2.07 1.04189 3.28571
+36 2.13 0.861016 3.57143
+37 2.19 0.989019 3.91837
+38 2.25 0.936978 4.26531
+39 2.31 0.784357 4.57143
+40 2.37 1.19224 5.06122
+41 2.43 0.850568 5.42857
+42 2.49 0.945085 5.85714
+43 2.55 1.02987 6.34694
+44 2.61 0.77826 6.73469
+45 2.67 1.09594 7.30612
+46 2.73 1.12318 7.91837
+47 2.79 1.03955 8.5102
+48 2.85 1.168 9.20408
+49 2.91 0.955581 9.79592
+50 2.97 0.948997 10.4082
+102500 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 0 0
+9 0.51 0 0
+10 0.57 0 0
+11 0.63 0 0
+12 0.69 0 0
+13 0.75 0.495812 0.0204082
+14 0.81 0.850222 0.0612245
+15 0.87 0.737039 0.102041
+16 0.93 0.967555 0.163265
+17 0.99 1.42311 0.265306
+18 1.05 1.26516 0.367347
+19 1.11 0.679267 0.428571
+20 1.17 0.2038 0.44898
+21 1.23 0.553218 0.510204
+22 1.29 0.670615 0.591837
+23 1.35 0.612339 0.673469
+24 1.41 1.54369 0.897959
+25 1.47 0.774689 1.02041
+26 1.53 0.59594 1.12245
+27 1.59 0.882908 1.28571
+28 1.65 1.12732 1.5102
+29 1.71 1.43128 1.81633
+30 1.77 1.24684 2.10204
+31 1.83 0.583214 2.2449
+32 1.89 0.937329 2.4898
+33 1.95 0.660405 2.67347
+34 2.01 0.759695 2.89796
+35 2.07 0.651178 3.10204
+36 2.13 0.861016 3.38776
+37 2.19 1.0472 3.7551
+38 2.25 1.10233 4.16327
+39 2.31 1.46413 4.73469
+40 2.37 0.844501 5.08163
+41 2.43 0.661553 5.36735
+42 2.49 1.0801 5.85714
+43 2.55 0.772402 6.22449
+44 2.61 1.06499 6.7551
+45 2.67 1.01766 7.28571
+46 2.73 1.34782 8.02041
+47 2.79 0.896161 8.53061
+48 2.85 1.03059 9.14286
+49 2.91 0.823777 9.65306
+50 2.97 0.822464 10.1837
+102550 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 0 0
+9 0.51 0 0
+10 0.57 0 0
+11 0.63 0 0
+12 0.69 0.585732 0.0204082
+13 0.75 0.991624 0.0612245
+14 0.81 1.27533 0.122449
+15 0.87 1.47408 0.204082
+16 0.93 0.967555 0.265306
+17 0.99 0.569243 0.306122
+18 1.05 0.759094 0.367347
+19 1.11 0.90569 0.44898
+20 1.17 1.019 0.55102
+21 1.23 0.922029 0.653061
+22 1.29 1.00592 0.77551
+23 1.35 0.765424 0.877551
+24 1.41 0.701677 0.979592
+25 1.47 0.774689 1.10204
+26 1.53 0.953504 1.26531
+27 1.59 0.441454 1.34694
+28 1.65 1.02484 1.55102
+29 1.71 0.381676 1.63265
+30 1.77 0.62342 1.77551
+31 1.83 0.749847 1.95918
+32 1.89 1.17166 2.26531
+33 1.95 0.880539 2.5102
+34 2.01 1.45033 2.93878
+35 2.07 0.520943 3.10204
+36 2.13 1.04552 3.44898
+37 2.19 1.10537 3.83673
+38 2.25 0.881861 4.16327
+39 2.31 0.627486 4.40816
+40 2.37 1.29159 4.93878
+41 2.43 0.992329 5.36735
+42 2.49 0.720064 5.69388
+43 2.55 0.986958 6.16327
+44 2.61 0.901143 6.61224
+45 2.67 0.978521 7.12245
+46 2.73 1.34782 7.85714
+47 2.79 1.11124 8.4898
+48 2.85 0.961885 9.06122
+49 2.91 0.92263 9.63265
+50 2.97 1.10716 10.3469
+102600 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 0 0
+9 0.51 0 0
+10 0.57 1.71613 0.0408163
+11 0.63 0.702525 0.0612245
+12 0.69 0.585732 0.0816327
+13 0.75 0 0.0816327
+14 0.81 0.850222 0.122449
+15 0.87 0.737039 0.163265
+16 0.93 0.645037 0.204082
+17 0.99 1.13849 0.285714
+18 1.05 1.26516 0.387755
+19 1.11 1.13211 0.489796
+20 1.17 0.2038 0.510204
+21 1.23 1.29084 0.653061
+22 1.29 0.670615 0.734694
+23 1.35 1.07159 0.877551
+24 1.41 1.12268 1.04082
+25 1.47 0.25823 1.08163
+26 1.53 0.476752 1.16327
+27 1.59 0.882908 1.32653
+28 1.65 1.12732 1.55102
+29 1.71 0.763351 1.71429
+30 1.77 1.60308 2.08163
+31 1.83 0.583214 2.22449
+32 1.89 1.01544 2.4898
+33 1.95 0.880539 2.73469
+34 2.01 0.897822 3
+35 2.07 0.846532 3.26531
+36 2.13 0.799515 3.53061
+37 2.19 1.10537 3.91837
+38 2.25 1.43302 4.44898
+39 2.31 0.993519 4.83673
+40 2.37 0.794824 5.16327
+41 2.43 1.46487 5.79592
+42 2.49 1.35012 6.40816
+43 2.55 0.944046 6.85714
+44 2.61 1.35171 7.53061
+45 2.67 1.21337 8.16327
+46 2.73 0.748787 8.57143
+47 2.79 0.573543 8.89796
+48 2.85 0.927532 9.44898
+49 2.91 0.955581 10.0408
+50 2.97 1.07553 10.7347
+102650 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 1.37595 0.0204082
+9 0.51 1.07159 0.0408163
+10 0.57 1.71613 0.0816327
+11 0.63 1.40505 0.122449
+12 0.69 0 0.122449
+13 0.75 0.495812 0.142857
+14 0.81 0.850222 0.183673
+15 0.87 0.368519 0.204082
+16 0.93 1.29007 0.285714
+17 0.99 1.13849 0.367347
+18 1.05 0.759094 0.428571
+19 1.11 0.226422 0.44898
+20 1.17 1.019 0.55102
+21 1.23 1.10644 0.673469
+22 1.29 0.502961 0.734694
+23 1.35 0 0.734694
+24 1.41 0.701677 0.836735
+25 1.47 1.03292 1
+26 1.53 0.476752 1.08163
+27 1.59 0.772544 1.22449
+28 1.65 0.819871 1.38776
+29 1.71 1.81296 1.77551
+30 1.77 0.80154 1.95918
+31 1.83 0.999796 2.20408
+32 1.89 1.24977 2.53061
+33 1.95 0.880539 2.77551
+34 2.01 0.690632 2.97959
+35 2.07 0.976768 3.28571
+36 2.13 1.10702 3.65306
+37 2.19 1.10537 4.04082
+38 2.25 0.771629 4.32653
+39 2.31 0.784357 4.63265
+40 2.37 1.39094 5.20408
+41 2.43 1.03958 5.65306
+42 2.49 1.03509 6.12245
+43 2.55 1.1586 6.67347
+44 2.61 1.22883 7.28571
+45 2.67 0.665394 7.63265
+46 2.73 1.16062 8.26531
+47 2.79 1.21878 8.95918
+48 2.85 0.618355 9.32653
+49 2.91 0.856728 9.85714
+50 2.97 1.1388 10.5918
+102700 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 0 0
+9 0.51 1.07159 0.0204082
+10 0.57 0 0.0204082
+11 0.63 0.702525 0.0408163
+12 0.69 0 0.0408163
+13 0.75 2.97487 0.163265
+14 0.81 0.425111 0.183673
+15 0.87 1.10556 0.244898
+16 0.93 0.967555 0.306122
+17 0.99 0.853865 0.367347
+18 1.05 0.506063 0.408163
+19 1.11 1.13211 0.510204
+20 1.17 1.019 0.612245
+21 1.23 1.29084 0.755102
+22 1.29 0.502961 0.816327
+23 1.35 0.765424 0.918367
+24 1.41 1.82436 1.18367
+25 1.47 0.516459 1.26531
+26 1.53 1.07269 1.44898
+27 1.59 0.993271 1.63265
+28 1.65 1.43477 1.91837
+29 1.71 0.954189 2.12245
+30 1.77 0.62342 2.26531
+31 1.83 0.833163 2.46939
+32 1.89 0.702997 2.65306
+33 1.95 1.39419 3.04082
+34 2.01 0.897822 3.30612
+35 2.07 1.17212 3.67347
+36 2.13 0.861016 3.95918
+37 2.19 0.814486 4.2449
+38 2.25 0.716512 4.5102
+39 2.31 1.20268 4.97959
+40 2.37 0.894177 5.34694
+41 2.43 0.803314 5.69388
+42 2.49 0.67506 6
+43 2.55 0.686579 6.32653
+44 2.61 0.77826 6.71429
+45 2.67 0.93938 7.20408
+46 2.73 1.34782 7.93878
+47 2.79 0.932007 8.46939
+48 2.85 0.996238 9.06122
+49 2.91 0.92263 9.63265
+50 2.97 1.2337 10.4286
+102750 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 0 0
+9 0.51 1.07159 0.0204082
+10 0.57 1.71613 0.0612245
+11 0.63 0.702525 0.0816327
+12 0.69 0 0.0816327
+13 0.75 0.495812 0.102041
+14 0.81 0.425111 0.122449
+15 0.87 1.10556 0.183673
+16 0.93 1.61259 0.285714
+17 0.99 0.569243 0.326531
+18 1.05 1.01213 0.408163
+19 1.11 0.226422 0.428571
+20 1.17 0.2038 0.44898
+21 1.23 1.84406 0.653061
+22 1.29 0.838269 0.755102
+23 1.35 0.765424 0.857143
+24 1.41 0.982348 1
+25 1.47 0.903804 1.14286
+26 1.53 1.07269 1.32653
+27 1.59 0.882908 1.4898
+28 1.65 0.717387 1.63265
+29 1.71 0.667932 1.77551
+30 1.77 0.890601 1.97959
+31 1.83 1.08311 2.2449
+32 1.89 0.781108 2.44898
+33 1.95 1.10067 2.7551
+34 2.01 0.621569 2.93878
+35 2.07 1.107 3.28571
+36 2.13 1.29152 3.71429
+37 2.19 1.0472 4.08163
+38 2.25 0.881861 4.40816
+39 2.31 1.15039 4.85714
+40 2.37 1.24191 5.36735
+41 2.43 0.945075 5.77551
+42 2.49 1.21511 6.32653
+43 2.55 0.858224 6.73469
+44 2.61 0.942104 7.20408
+45 2.67 0.665394 7.55102
+46 2.73 0.898544 8.04082
+47 2.79 1.14709 8.69388
+48 2.85 1.20236 9.40816
+49 2.91 1.18624 10.1429
+50 2.97 0.822464 10.6735
+102800 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 0 0
+9 0.51 0 0
+10 0.57 0 0
+11 0.63 0.702525 0.0204082
+12 0.69 1.17146 0.0612245
+13 0.75 0.991624 0.102041
+14 0.81 0.850222 0.142857
+15 0.87 0 0.142857
+16 0.93 0.967555 0.204082
+17 0.99 0.569243 0.244898
+18 1.05 1.51819 0.367347
+19 1.11 0.679267 0.428571
+20 1.17 1.019 0.530612
+21 1.23 1.10644 0.653061
+22 1.29 1.00592 0.77551
+23 1.35 0.30617 0.816327
+24 1.41 2.10503 1.12245
+25 1.47 0.387344 1.18367
+26 1.53 0.834316 1.32653
+27 1.59 1.10363 1.53061
+28 1.65 1.02484 1.73469
+29 1.71 1.24045 2
+30 1.77 1.24684 2.28571
+31 1.83 1.08311 2.55102
+32 1.89 0.624886 2.71429
+33 1.95 0.587026 2.87755
+34 2.01 0.690632 3.08163
+35 2.07 1.107 3.42857
+36 2.13 1.16852 3.81633
+37 2.19 0.581776 4.02041
+38 2.25 1.10233 4.42857
+39 2.31 1.20268 4.89796
+40 2.37 1.09288 5.34694
+41 2.43 0.897822 5.73469
+42 2.49 1.57514 6.44898
+43 2.55 0.986958 6.91837
+44 2.61 1.14691 7.4898
+45 2.67 1.01766 8.02041
+46 2.73 1.0483 8.59184
+47 2.79 1.0037 9.16327
+48 2.85 0.961885 9.73469
+49 2.91 0.955581 10.3265
+50 2.97 0.759197 10.8163
+102850 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 1.83099 0.0204082
+8 0.45 0 0.0204082
+9 0.51 0 0.0204082
+10 0.57 1.71613 0.0612245
+11 0.63 0 0.0612245
+12 0.69 1.17146 0.102041
+13 0.75 0.991624 0.142857
+14 0.81 0.425111 0.163265
+15 0.87 0.368519 0.183673
+16 0.93 1.29007 0.265306
+17 0.99 1.42311 0.367347
+18 1.05 0.759094 0.428571
+19 1.11 0.452845 0.469388
+20 1.17 1.019 0.571429
+21 1.23 0.922029 0.673469
+22 1.29 0.502961 0.734694
+23 1.35 0.153085 0.755102
+24 1.41 1.40335 0.959184
+25 1.47 1.03292 1.12245
+26 1.53 1.31107 1.34694
+27 1.59 0.551817 1.44898
+28 1.65 0.614903 1.57143
+29 1.71 1.24045 1.83673
+30 1.77 1.06872 2.08163
+31 1.83 1.16643 2.36735
+32 1.89 1.17166 2.67347
+33 1.95 0.660405 2.85714
+34 2.01 1.24314 3.22449
+35 2.07 0.586061 3.40816
+36 2.13 1.72203 3.97959
+37 2.19 0.581776 4.18367
+38 2.25 1.04721 4.57143
+39 2.31 0.941229 4.93878
+40 2.37 1.09288 5.38776
+41 2.43 1.46487 6.02041
+42 2.49 0.765068 6.36735
+43 2.55 0.944046 6.81633
+44 2.61 1.02403 7.32653
+45 2.67 0.821958 7.7551
+46 2.73 0.711348 8.14286
+47 2.79 1.11124 8.77551
+48 2.85 0.515296 9.08163
+49 2.91 0.955581 9.67347
+50 2.97 0.88573 10.2449
+102900 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 1.83099 0.0204082
+8 0.45 0 0.0204082
+9 0.51 1.07159 0.0408163
+10 0.57 1.71613 0.0816327
+11 0.63 0.702525 0.102041
+12 0.69 1.7572 0.163265
+13 0.75 0 0.163265
+14 0.81 0.425111 0.183673
+15 0.87 1.10556 0.244898
+16 0.93 1.61259 0.346939
+17 0.99 0.284622 0.367347
+18 1.05 0.506063 0.408163
+19 1.11 0.90569 0.489796
+20 1.17 1.4266 0.632653
+21 1.23 0.922029 0.734694
+22 1.29 1.34123 0.897959
+23 1.35 0.918509 1.02041
+24 1.41 1.12268 1.18367
+25 1.47 0.903804 1.32653
+26 1.53 1.43026 1.57143
+27 1.59 0.882908 1.73469
+28 1.65 0.922354 1.91837
+29 1.71 1.5267 2.2449
+30 1.77 1.15778 2.5102
+31 1.83 0.66653 2.67347
+32 1.89 0.859219 2.89796
+33 1.95 1.10067 3.20408
+34 2.01 0.690632 3.40816
+35 2.07 0.716296 3.63265
+36 2.13 0.799515 3.89796
+37 2.19 0.698131 4.14286
+38 2.25 1.10233 4.55102
+39 2.31 0.784357 4.85714
+40 2.37 1.09288 5.30612
+41 2.43 0.75606 5.63265
+42 2.49 0.810072 6
+43 2.55 0.643668 6.30612
+44 2.61 1.02403 6.81633
+45 2.67 1.09594 7.38776
+46 2.73 0.861105 7.85714
+47 2.79 0.824468 8.32653
+48 2.85 1.06494 8.95918
+49 2.91 1.18624 9.69388
+50 2.97 1.01226 10.3469
+102950 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 0 0
+9 0.51 1.07159 0.0204082
+10 0.57 1.71613 0.0612245
+11 0.63 1.40505 0.102041
+12 0.69 0.585732 0.122449
+13 0.75 0.495812 0.142857
+14 0.81 0.850222 0.183673
+15 0.87 2.21112 0.306122
+16 0.93 0.967555 0.367347
+17 0.99 1.13849 0.44898
+18 1.05 1.01213 0.530612
+19 1.11 1.81138 0.693878
+20 1.17 0.4076 0.734694
+21 1.23 1.47525 0.897959
+22 1.29 0.838269 1
+23 1.35 0.918509 1.12245
+24 1.41 0.982348 1.26531
+25 1.47 0.774689 1.38776
+26 1.53 0.476752 1.46939
+27 1.59 0.220727 1.5102
+28 1.65 1.94719 1.89796
+29 1.71 0.667932 2.04082
+30 1.77 1.15778 2.30612
+31 1.83 0.916479 2.53061
+32 1.89 0.702997 2.71429
+33 1.95 0.513648 2.85714
+34 2.01 1.10501 3.18367
+35 2.07 0.586061 3.36735
+36 2.13 0.676513 3.59184
+37 2.19 0.639953 3.81633
+38 2.25 1.10233 4.22449
+39 2.31 0.836648 4.55102
+40 2.37 1.04321 4.97959
+41 2.43 1.08684 5.44898
+42 2.49 1.26011 6.02041
+43 2.55 0.986958 6.4898
+44 2.61 0.819221 6.89796
+45 2.67 1.01766 7.42857
+46 2.73 0.898544 7.91837
+47 2.79 0.788621 8.36735
+48 2.85 0.996238 8.95918
+49 2.91 1.15329 9.67347
+50 2.97 0.664298 10.102
+103000 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 0 0
+9 0.51 0 0
+10 0.57 0 0
+11 0.63 0.702525 0.0204082
+12 0.69 0.585732 0.0408163
+13 0.75 0.991624 0.0816327
+14 0.81 0.425111 0.102041
+15 0.87 1.10556 0.163265
+16 0.93 0.322518 0.183673
+17 0.99 1.42311 0.285714
+18 1.05 0.759094 0.346939
+19 1.11 0.452845 0.387755
+20 1.17 0.6114 0.44898
+21 1.23 1.10644 0.571429
+22 1.29 0.838269 0.673469
+23 1.35 0.918509 0.795918
+24 1.41 1.68403 1.04082
+25 1.47 0.903804 1.18367
+26 1.53 0.834316 1.32653
+27 1.59 0.882908 1.4898
+28 1.65 1.43477 1.77551
+29 1.71 0.85877 1.95918
+30 1.77 0.80154 2.14286
+31 1.83 1.08311 2.40816
+32 1.89 0.937329 2.65306
+33 1.95 1.24743 3
+34 2.01 1.10501 3.32653
+35 2.07 1.04189 3.65306
+36 2.13 0.799515 3.91837
+37 2.19 0.698131 4.16327
+38 2.25 0.716512 4.42857
+39 2.31 0.993519 4.81633
+40 2.37 1.09288 5.26531
+41 2.43 0.897822 5.65306
+42 2.49 0.855076 6.04082
+43 2.55 1.07278 6.55102
+44 2.61 1.26979 7.18367
+45 2.67 0.782817 7.59184
+46 2.73 0.711348 7.97959
+47 2.79 1.07539 8.59184
+48 2.85 1.168 9.28571
+49 2.91 1.08739 9.95918
+50 2.97 1.0439 10.6327
+103050 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 0 0
+9 0.51 0 0
+10 0.57 0.858066 0.0204082
+11 0.63 1.40505 0.0612245
+12 0.69 1.7572 0.122449
+13 0.75 0.991624 0.163265
+14 0.81 1.70044 0.244898
+15 0.87 0 0.244898
+16 0.93 0.322518 0.265306
+17 0.99 1.13849 0.346939
+18 1.05 1.26516 0.44898
+19 1.11 1.81138 0.612245
+20 1.17 1.6304 0.77551
+21 1.23 0.184406 0.795918
+22 1.29 1.00592 0.918367
+23 1.35 0.612339 1
+24 1.41 0.280671 1.04082
+25 1.47 1.80761 1.32653
+26 1.53 1.07269 1.5102
+27 1.59 1.10363 1.71429
+28 1.65 1.53726 2.02041
+29 1.71 1.14503 2.26531
+30 1.77 1.3359 2.57143
+31 1.83 0.999796 2.81633
+32 1.89 0.702997 3
+33 1.95 0.807161 3.22449
+34 2.01 1.10501 3.55102
+35 2.07 1.23724 3.93878
+36 2.13 0.984018 4.26531
+37 2.19 0.756309 4.53061
+38 2.25 0.60628 4.7551
+39 2.31 1.0981 5.18367
+40 2.37 0.943854 5.57143
+41 2.43 0.992329 6
+42 2.49 0.945085 6.42857
+43 2.55 0.686579 6.7551
+44 2.61 1.10595 7.30612
+45 2.67 0.861099 7.7551
+46 2.73 1.08574 8.34694
+47 2.79 1.03955 8.93878
+48 2.85 0.79012 9.40816
+49 2.91 1.25214 10.1837
+50 2.97 1.01226 10.8367
+103100 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 0 0
+9 0.51 0 0
+10 0.57 0 0
+11 0.63 1.40505 0.0408163
+12 0.69 1.17146 0.0816327
+13 0.75 0.495812 0.102041
+14 0.81 1.70044 0.183673
+15 0.87 1.10556 0.244898
+16 0.93 1.93511 0.367347
+17 0.99 0.569243 0.408163
+18 1.05 0.506063 0.44898
+19 1.11 1.13211 0.55102
+20 1.17 0.6114 0.612245
+21 1.23 0.922029 0.714286
+22 1.29 1.17358 0.857143
+23 1.35 1.22468 1.02041
+24 1.41 0.701677 1.12245
+25 1.47 0.774689 1.2449
+26 1.53 1.19188 1.44898
+27 1.59 1.214 1.67347
+28 1.65 0.922354 1.85714
+29 1.71 0.85877 2.04082
+30 1.77 0.80154 2.22449
+31 1.83 0.833163 2.42857
+32 1.89 1.24977 2.7551
+33 1.95 1.61432 3.20408
+34 2.01 0.552506 3.36735
+35 2.07 0.846532 3.63265
+36 2.13 0.799515 3.89796
+37 2.19 1.0472 4.26531
+38 2.25 0.881861 4.59184
+39 2.31 1.04581 5
+40 2.37 0.894177 5.36735
+41 2.43 0.992329 5.79592
+42 2.49 1.0801 6.28571
+43 2.55 0.472023 6.5102
+44 2.61 1.35171 7.18367
+45 2.67 1.33079 7.87755
+46 2.73 0.973423 8.40816
+47 2.79 0.609389 8.7551
+48 2.85 1.03059 9.36735
+49 2.91 1.02148 10
+50 2.97 1.0439 10.6735
+103150 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 1.83099 0.0204082
+8 0.45 0 0.0204082
+9 0.51 1.07159 0.0408163
+10 0.57 0 0.0408163
+11 0.63 0.702525 0.0612245
+12 0.69 0 0.0612245
+13 0.75 2.47906 0.163265
+14 0.81 1.27533 0.22449
+15 0.87 1.47408 0.306122
+16 0.93 0.322518 0.326531
+17 0.99 0.284622 0.346939
+18 1.05 1.26516 0.44898
+19 1.11 1.35853 0.571429
+20 1.17 1.2228 0.693878
+21 1.23 1.65965 0.877551
+22 1.29 0.502961 0.938776
+23 1.35 0.30617 0.979592
+24 1.41 0.421006 1.04082
+25 1.47 1.03292 1.20408
+26 1.53 0.953504 1.36735
+27 1.59 1.10363 1.57143
+28 1.65 1.12732 1.79592
+29 1.71 1.14503 2.04082
+30 1.77 0.890601 2.2449
+31 1.83 0.249949 2.30612
+32 1.89 0.859219 2.53061
+33 1.95 1.24743 2.87755
+34 2.01 1.10501 3.20408
+35 2.07 0.976768 3.5102
+36 2.13 0.922517 3.81633
+37 2.19 1.0472 4.18367
+38 2.25 0.826745 4.4898
+39 2.31 1.15039 4.93878
+40 2.37 0.844501 5.28571
+41 2.43 1.2286 5.81633
+42 2.49 0.990089 6.26531
+43 2.55 0.944046 6.71429
+44 2.61 1.06499 7.2449
+45 2.67 1.0568 7.79592
+46 2.73 1.12318 8.40816
+47 2.79 1.11124 9.04082
+48 2.85 1.37412 9.85714
+49 2.91 0.659022 10.2653
+50 2.97 0.822464 10.7959
+103200 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 0 0
+9 0.51 0 0
+10 0.57 0.858066 0.0204082
+11 0.63 0.702525 0.0408163
+12 0.69 0 0.0408163
+13 0.75 1.48744 0.102041
+14 0.81 2.12556 0.204082
+15 0.87 2.21112 0.326531
+16 0.93 0.967555 0.387755
+17 0.99 0.853865 0.44898
+18 1.05 0.253031 0.469388
+19 1.11 0.452845 0.510204
+20 1.17 0.6114 0.571429
+21 1.23 1.47525 0.734694
+22 1.29 0.838269 0.836735
+23 1.35 1.07159 0.979592
+24 1.41 1.40335 1.18367
+25 1.47 0.903804 1.32653
+26 1.53 1.66863 1.61224
+27 1.59 0.662181 1.73469
+28 1.65 0.922354 1.91837
+29 1.71 0.85877 2.10204
+30 1.77 0.890601 2.30612
+31 1.83 0.999796 2.55102
+32 1.89 1.01544 2.81633
+33 1.95 1.17405 3.14286
+34 2.01 1.03595 3.44898
+35 2.07 1.75818 4
+36 2.13 0.922517 4.30612
+37 2.19 1.0472 4.67347
+38 2.25 1.32279 5.16327
+39 2.31 0.784357 5.46939
+40 2.37 1.14256 5.93878
+41 2.43 0.945075 6.34694
+42 2.49 0.630056 6.63265
+43 2.55 1.11569 7.16327
+44 2.61 0.983065 7.65306
+45 2.67 0.782817 8.06122
+46 2.73 0.898544 8.55102
+47 2.79 1.11124 9.18367
+48 2.85 1.06494 9.81633
+49 2.91 1.02148 10.449
+50 2.97 0.854097 11
+103250 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 0 0
+9 0.51 0 0
+10 0.57 0.858066 0.0204082
+11 0.63 0.702525 0.0408163
+12 0.69 1.17146 0.0816327
+13 0.75 1.48744 0.142857
+14 0.81 1.27533 0.204082
+15 0.87 0.368519 0.22449
+16 0.93 0.322518 0.244898
+17 0.99 0.853865 0.306122
+18 1.05 1.51819 0.428571
+19 1.11 1.58496 0.571429
+20 1.17 1.2228 0.693878
+21 1.23 0.922029 0.795918
+22 1.29 1.50888 0.979592
+23 1.35 1.07159 1.12245
+24 1.41 0.561342 1.20408
+25 1.47 1.03292 1.36735
+26 1.53 0.953504 1.53061
+27 1.59 0.662181 1.65306
+28 1.65 0.922354 1.83673
+29 1.71 0.667932 1.97959
+30 1.77 0.890601 2.18367
+31 1.83 0.583214 2.32653
+32 1.89 0.937329 2.57143
+33 1.95 1.24743 2.91837
+34 2.01 1.03595 3.22449
+35 2.07 1.36747 3.65306
+36 2.13 0.861016 3.93878
+37 2.19 0.872664 4.2449
+38 2.25 0.992094 4.61224
+39 2.31 1.0981 5.04082
+40 2.37 0.695471 5.32653
+41 2.43 1.51212 5.97959
+42 2.49 0.855076 6.36735
+43 2.55 1.11569 6.89796
+44 2.61 1.02403 7.40816
+45 2.67 1.33079 8.10204
+46 2.73 1.12318 8.71429
+47 2.79 1.0037 9.28571
+48 2.85 0.961885 9.85714
+49 2.91 1.02148 10.4898
+50 2.97 0.917363 11.0816
+103300 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 0 0
+9 0.51 1.07159 0.0204082
+10 0.57 0 0.0204082
+11 0.63 1.40505 0.0612245
+12 0.69 0.585732 0.0816327
+13 0.75 0.495812 0.102041
+14 0.81 0 0.102041
+15 0.87 0 0.102041
+16 0.93 0.967555 0.163265
+17 0.99 0.853865 0.22449
+18 1.05 1.26516 0.326531
+19 1.11 0.452845 0.367347
+20 1.17 0.4076 0.408163
+21 1.23 1.29084 0.55102
+22 1.29 0.335308 0.591837
+23 1.35 1.68393 0.816327
+24 1.41 1.12268 0.979592
+25 1.47 1.03292 1.14286
+26 1.53 1.31107 1.36735
+27 1.59 0.993271 1.55102
+28 1.65 0.717387 1.69388
+29 1.71 0.954189 1.89796
+30 1.77 0.71248 2.06122
+31 1.83 1.08311 2.32653
+32 1.89 1.24977 2.65306
+33 1.95 1.24743 3
+34 2.01 1.58845 3.46939
+35 2.07 0.976768 3.77551
+36 2.13 0.861016 4.06122
+37 2.19 0.756309 4.32653
+38 2.25 1.37791 4.83673
+39 2.31 0.941229 5.20408
+40 2.37 1.14256 5.67347
+41 2.43 0.897822 6.06122
+42 2.49 0.540048 6.30612
+43 2.55 1.37316 6.95918
+44 2.61 1.26979 7.59184
+45 2.67 0.743676 7.97959
+46 2.73 1.01086 8.53061
+47 2.79 1.25463 9.2449
+48 2.85 1.0993 9.89796
+49 2.91 1.12034 10.5918
+50 2.97 0.98063 11.2245
+103350 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 0 0
+9 0.51 0 0
+10 0.57 0 0
+11 0.63 0 0
+12 0.69 0 0
+13 0.75 0.495812 0.0204082
+14 0.81 1.27533 0.0816327
+15 0.87 0.737039 0.122449
+16 0.93 1.29007 0.204082
+17 0.99 1.13849 0.285714
+18 1.05 0.759094 0.346939
+19 1.11 1.35853 0.469388
+20 1.17 1.019 0.571429
+21 1.23 0.737623 0.653061
+22 1.29 0.167654 0.673469
+23 1.35 1.22468 0.836735
+24 1.41 1.12268 1
+25 1.47 0.516459 1.08163
+26 1.53 1.31107 1.30612
+27 1.59 1.214 1.53061
+28 1.65 0.819871 1.69388
+29 1.71 0.763351 1.85714
+30 1.77 0.890601 2.06122
+31 1.83 1.33306 2.38776
+32 1.89 0.937329 2.63265
+33 1.95 0.807161 2.85714
+34 2.01 1.17407 3.20408
+35 2.07 0.976768 3.5102
+36 2.13 1.23002 3.91837
+37 2.19 0.872664 4.22449
+38 2.25 1.10233 4.63265
+39 2.31 0.522905 4.83673
+40 2.37 0.745148 5.14286
+41 2.43 1.03958 5.59184
+42 2.49 1.03509 6.06122
+43 2.55 0.600757 6.34694
+44 2.61 1.4746 7.08163
+45 2.67 1.09594 7.65306
+46 2.73 1.19806 8.30612
+47 2.79 0.860314 8.79592
+48 2.85 1.06494 9.42857
+49 2.91 1.28509 10.2245
+50 2.97 0.98063 10.8571
+103400 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 0 0
+9 0.51 0 0
+10 0.57 0 0
+11 0.63 0 0
+12 0.69 2.34293 0.0816327
+13 0.75 0.495812 0.102041
+14 0.81 0.425111 0.122449
+15 0.87 0.737039 0.163265
+16 0.93 0.967555 0.22449
+17 0.99 1.13849 0.306122
+18 1.05 1.01213 0.387755
+19 1.11 0.452845 0.428571
+20 1.17 0.4076 0.469388
+21 1.23 0.368812 0.510204
+22 1.29 0.167654 0.530612
+23 1.35 0.765424 0.632653
+24 1.41 0.842013 0.755102
+25 1.47 0.903804 0.897959
+26 1.53 0.59594 1
+27 1.59 1.32436 1.2449
+28 1.65 1.12732 1.46939
+29 1.71 0.85877 1.65306
+30 1.77 0.62342 1.79592
+31 1.83 1.41638 2.14286
+32 1.89 1.79655 2.61224
+33 1.95 1.10067 2.91837
+34 2.01 0.759695 3.14286
+35 2.07 1.107 3.4898
+36 2.13 0.984018 3.81633
+37 2.19 1.22173 4.2449
+38 2.25 1.21256 4.69388
+39 2.31 1.0981 5.12245
+40 2.37 0.894177 5.4898
+41 2.43 1.03958 5.93878
+42 2.49 1.0801 6.42857
+43 2.55 0.901135 6.85714
+44 2.61 0.737299 7.22449
+45 2.67 1.0568 7.77551
+46 2.73 0.636469 8.12245
+47 2.79 0.896161 8.63265
+48 2.85 1.03059 9.2449
+49 2.91 0.92263 9.81633
+50 2.97 0.98063 10.449
+103450 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 1.37595 0.0204082
+9 0.51 1.07159 0.0408163
+10 0.57 0 0.0408163
+11 0.63 0.702525 0.0612245
+12 0.69 1.7572 0.122449
+13 0.75 0.495812 0.142857
+14 0.81 1.70044 0.22449
+15 0.87 0.368519 0.244898
+16 0.93 1.61259 0.346939
+17 0.99 0.284622 0.367347
+18 1.05 0.759094 0.428571
+19 1.11 0.90569 0.510204
+20 1.17 0.2038 0.530612
+21 1.23 0.922029 0.632653
+22 1.29 0.670615 0.714286
+23 1.35 0.459254 0.77551
+24 1.41 0.561342 0.857143
+25 1.47 1.16203 1.04082
+26 1.53 0.357564 1.10204
+27 1.59 0.772544 1.2449
+28 1.65 1.12732 1.46939
+29 1.71 0.286257 1.53061
+30 1.77 0.35624 1.61224
+31 1.83 0.999796 1.85714
+32 1.89 1.01544 2.12245
+33 1.95 0.807161 2.34694
+34 2.01 1.24314 2.71429
+35 2.07 1.107 3.06122
+36 2.13 0.861016 3.34694
+37 2.19 0.930841 3.67347
+38 2.25 1.32279 4.16327
+39 2.31 1.20268 4.63265
+40 2.37 0.546442 4.85714
+41 2.43 0.75606 5.18367
+42 2.49 0.990089 5.63265
+43 2.55 1.1586 6.18367
+44 2.61 1.39268 6.87755
+45 2.67 0.861099 7.32653
+46 2.73 0.748787 7.73469
+47 2.79 1.18293 8.40816
+48 2.85 1.40848 9.2449
+49 2.91 1.02148 9.87755
+50 2.97 1.20206 10.6531
+103500 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 0 0
+9 0.51 0 0
+10 0.57 0 0
+11 0.63 1.40505 0.0408163
+12 0.69 0.585732 0.0612245
+13 0.75 0.991624 0.102041
+14 0.81 0.850222 0.142857
+15 0.87 0.368519 0.163265
+16 0.93 0.322518 0.183673
+17 0.99 0.284622 0.204082
+18 1.05 0.506063 0.244898
+19 1.11 1.13211 0.346939
+20 1.17 0.8152 0.428571
+21 1.23 0.737623 0.510204
+22 1.29 0.838269 0.612245
+23 1.35 0.612339 0.693878
+24 1.41 0.280671 0.734694
+25 1.47 1.54938 0.979592
+26 1.53 0.953504 1.14286
+27 1.59 1.10363 1.34694
+28 1.65 1.33229 1.61224
+29 1.71 1.04961 1.83673
+30 1.77 1.24684 2.12245
+31 1.83 0.583214 2.26531
+32 1.89 0.546775 2.40816
+33 1.95 0.733783 2.61224
+34 2.01 0.897822 2.87755
+35 2.07 1.17212 3.2449
+36 2.13 0.738014 3.4898
+37 2.19 0.989019 3.83673
+38 2.25 0.826745 4.14286
+39 2.31 0.679776 4.40816
+40 2.37 0.99353 4.81633
+41 2.43 0.708807 5.12245
+42 2.49 1.35012 5.73469
+43 2.55 0.858224 6.14286
+44 2.61 0.819221 6.55102
+45 2.67 1.25251 7.20408
+46 2.73 1.0483 7.77551
+47 2.79 0.645236 8.14286
+48 2.85 1.23671 8.87755
+49 2.91 1.05443 9.53061
+50 2.97 1.29696 10.3673
+103550 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 0 0
+9 0.51 0 0
+10 0.57 0.858066 0.0204082
+11 0.63 0 0.0204082
+12 0.69 0 0.0204082
+13 0.75 0 0.0204082
+14 0.81 0.425111 0.0408163
+15 0.87 0.737039 0.0816327
+16 0.93 0.645037 0.122449
+17 0.99 0.569243 0.163265
+18 1.05 0.759094 0.22449
+19 1.11 0.679267 0.285714
+20 1.17 0.8152 0.367347
+21 1.23 0.553218 0.428571
+22 1.29 0.335308 0.469388
+23 1.35 0.30617 0.510204
+24 1.41 0.842013 0.632653
+25 1.47 0.516459 0.714286
+26 1.53 0.834316 0.857143
+27 1.59 1.54509 1.14286
+28 1.65 0.717387 1.28571
+29 1.71 0.763351 1.44898
+30 1.77 0.890601 1.65306
+31 1.83 0.66653 1.81633
+32 1.89 0.859219 2.04082
+33 1.95 1.24743 2.38776
+34 2.01 1.3122 2.77551
+35 2.07 1.62795 3.28571
+36 2.13 1.10702 3.65306
+37 2.19 0.930841 3.97959
+38 2.25 1.10233 4.38776
+39 2.31 0.836648 4.71429
+40 2.37 0.496765 4.91837
+41 2.43 1.37036 5.5102
+42 2.49 0.765068 5.85714
+43 2.55 0.944046 6.30612
+44 2.61 1.10595 6.85714
+45 2.67 1.21337 7.4898
+46 2.73 1.08574 8.08163
+47 2.79 1.11124 8.71429
+48 2.85 0.961885 9.28571
+49 2.91 1.08739 9.95918
+50 2.97 0.854097 10.5102
+103600 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 1.83099 0.0204082
+8 0.45 0 0.0204082
+9 0.51 0 0.0204082
+10 0.57 0 0.0204082
+11 0.63 0 0.0204082
+12 0.69 0 0.0204082
+13 0.75 0 0.0204082
+14 0.81 1.27533 0.0816327
+15 0.87 0.737039 0.122449
+16 0.93 0.322518 0.142857
+17 0.99 1.13849 0.22449
+18 1.05 0.253031 0.244898
+19 1.11 0.452845 0.285714
+20 1.17 0.4076 0.326531
+21 1.23 0.553218 0.387755
+22 1.29 1.00592 0.510204
+23 1.35 1.53085 0.714286
+24 1.41 1.54369 0.938776
+25 1.47 0.516459 1.02041
+26 1.53 0.834316 1.16327
+27 1.59 0.551817 1.26531
+28 1.65 0.922354 1.44898
+29 1.71 0.954189 1.65306
+30 1.77 0.979661 1.87755
+31 1.83 0.749847 2.06122
+32 1.89 1.09355 2.34694
+33 1.95 1.17405 2.67347
+34 2.01 1.10501 3
+35 2.07 1.107 3.34694
+36 2.13 0.799515 3.61224
+37 2.19 0.639953 3.83673
+38 2.25 0.881861 4.16327
+39 2.31 0.836648 4.4898
+40 2.37 0.943854 4.87755
+41 2.43 0.897822 5.26531
+42 2.49 1.03509 5.73469
+43 2.55 1.28734 6.34694
+44 2.61 1.14691 6.91837
+45 2.67 1.25251 7.57143
+46 2.73 0.711348 7.95918
+47 2.79 0.824468 8.42857
+48 2.85 1.13365 9.10204
+49 2.91 0.955581 9.69388
+50 2.97 1.1388 10.4286
+103650 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 1.83099 0.0204082
+8 0.45 0 0.0204082
+9 0.51 0 0.0204082
+10 0.57 0 0.0204082
+11 0.63 2.10758 0.0816327
+12 0.69 0 0.0816327
+13 0.75 0.495812 0.102041
+14 0.81 1.70044 0.183673
+15 0.87 1.47408 0.265306
+16 0.93 0.322518 0.285714
+17 0.99 1.42311 0.387755
+18 1.05 1.01213 0.469388
+19 1.11 0.90569 0.55102
+20 1.17 2.2418 0.77551
+21 1.23 0.553218 0.836735
+22 1.29 1.17358 0.979592
+23 1.35 1.22468 1.14286
+24 1.41 0.842013 1.26531
+25 1.47 1.29115 1.46939
+26 1.53 0.715128 1.59184
+27 1.59 1.76582 1.91837
+28 1.65 0.614903 2.04082
+29 1.71 0.763351 2.20408
+30 1.77 0.80154 2.38776
+31 1.83 0.999796 2.63265
+32 1.89 1.09355 2.91837
+33 1.95 0.953918 3.18367
+34 2.01 0.966885 3.46939
+35 2.07 1.17212 3.83673
+36 2.13 0.799515 4.10204
+37 2.19 0.639953 4.32653
+38 2.25 0.771629 4.61224
+39 2.31 0.679776 4.87755
+40 2.37 1.09288 5.32653
+41 2.43 1.18134 5.83673
+42 2.49 1.03509 6.30612
+43 2.55 0.72949 6.65306
+44 2.61 1.26979 7.28571
+45 2.67 1.13508 7.87755
+46 2.73 0.898544 8.36735
+47 2.79 0.896161 8.87755
+48 2.85 0.961885 9.44898
+49 2.91 0.988533 10.0612
+50 2.97 1.0439 10.7347
+103700 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 1.37595 0.0204082
+9 0.51 0 0.0204082
+10 0.57 1.71613 0.0612245
+11 0.63 0.702525 0.0816327
+12 0.69 1.17146 0.122449
+13 0.75 0.991624 0.163265
+14 0.81 0.850222 0.204082
+15 0.87 1.8426 0.306122
+16 0.93 1.29007 0.387755
+17 0.99 0.284622 0.408163
+18 1.05 0.253031 0.428571
+19 1.11 0.679267 0.489796
+20 1.17 0.4076 0.530612
+21 1.23 1.10644 0.653061
+22 1.29 0.670615 0.734694
+23 1.35 1.22468 0.897959
+24 1.41 0.982348 1.04082
+25 1.47 0.903804 1.18367
+26 1.53 0.59594 1.28571
+27 1.59 1.214 1.5102
+28 1.65 0.819871 1.67347
+29 1.71 1.24045 1.93878
+30 1.77 1.3359 2.2449
+31 1.83 0.999796 2.4898
+32 1.89 1.17166 2.79592
+33 1.95 1.10067 3.10204
+34 2.01 0.483442 3.2449
+35 2.07 0.846532 3.5102
+36 2.13 1.29152 3.93878
+37 2.19 0.756309 4.20408
+38 2.25 0.992094 4.57143
+39 2.31 1.20268 5.04082
+40 2.37 0.596118 5.28571
+41 2.43 1.13409 5.77551
+42 2.49 1.03509 6.2449
+43 2.55 1.24442 6.83673
+44 2.61 0.77826 7.22449
+45 2.67 0.978521 7.73469
+46 2.73 1.19806 8.38776
+47 2.79 0.896161 8.89796
+48 2.85 1.20236 9.61224
+49 2.91 0.988533 10.2245
+50 2.97 0.917363 10.8163
+103750 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 0 0
+9 0.51 0 0
+10 0.57 0 0
+11 0.63 0 0
+12 0.69 1.7572 0.0612245
+13 0.75 0.991624 0.102041
+14 0.81 1.70044 0.183673
+15 0.87 1.47408 0.265306
+16 0.93 1.61259 0.367347
+17 0.99 1.13849 0.44898
+18 1.05 0.506063 0.489796
+19 1.11 0.452845 0.530612
+20 1.17 0.8152 0.612245
+21 1.23 0.737623 0.693878
+22 1.29 0.838269 0.795918
+23 1.35 0.459254 0.857143
+24 1.41 1.40335 1.06122
+25 1.47 0.645574 1.16327
+26 1.53 0.953504 1.32653
+27 1.59 1.54509 1.61224
+28 1.65 0.922354 1.79592
+29 1.71 0.667932 1.93878
+30 1.77 0.71248 2.10204
+31 1.83 1.16643 2.38776
+32 1.89 0.624886 2.55102
+33 1.95 0.953918 2.81633
+34 2.01 0.552506 2.97959
+35 2.07 0.781414 3.22449
+36 2.13 1.10702 3.59184
+37 2.19 1.0472 3.95918
+38 2.25 1.15744 4.38776
+39 2.31 0.993519 4.77551
+40 2.37 0.943854 5.16327
+41 2.43 0.945075 5.57143
+42 2.49 1.0801 6.06122
+43 2.55 0.858224 6.46939
+44 2.61 0.860182 6.89796
+45 2.67 1.01766 7.42857
+46 2.73 1.19806 8.08163
+47 2.79 0.896161 8.59184
+48 2.85 1.20236 9.30612
+49 2.91 0.790826 9.79592
+50 2.97 1.17043 10.551
+103800 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 0 0
+9 0.51 0 0
+10 0.57 0 0
+11 0.63 0.702525 0.0204082
+12 0.69 1.17146 0.0612245
+13 0.75 0.495812 0.0816327
+14 0.81 0.425111 0.102041
+15 0.87 0.737039 0.142857
+16 0.93 2.25763 0.285714
+17 0.99 0.853865 0.346939
+18 1.05 0.759094 0.408163
+19 1.11 0.679267 0.469388
+20 1.17 1.019 0.571429
+21 1.23 1.84406 0.77551
+22 1.29 0.502961 0.836735
+23 1.35 0.765424 0.938776
+24 1.41 1.12268 1.10204
+25 1.47 0.903804 1.2449
+26 1.53 0.834316 1.38776
+27 1.59 0.772544 1.53061
+28 1.65 1.12732 1.7551
+29 1.71 0.763351 1.91837
+30 1.77 0.80154 2.10204
+31 1.83 0.833163 2.30612
+32 1.89 0.624886 2.46939
+33 1.95 0.660405 2.65306
+34 2.01 0.828758 2.89796
+35 2.07 0.716296 3.12245
+36 2.13 0.799515 3.38776
+37 2.19 0.581776 3.59184
+38 2.25 1.10233 4
+39 2.31 1.04581 4.40816
+40 2.37 0.844501 4.7551
+41 2.43 1.32311 5.32653
+42 2.49 0.945085 5.7551
+43 2.55 1.28734 6.36735
+44 2.61 0.819221 6.77551
+45 2.67 1.09594 7.34694
+46 2.73 0.935984 7.85714
+47 2.79 0.824468 8.32653
+48 2.85 1.0993 8.97959
+49 2.91 0.856728 9.5102
+50 2.97 1.10716 10.2245
+103850 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 0 0
+9 0.51 0 0
+10 0.57 0.858066 0.0204082
+11 0.63 0 0.0204082
+12 0.69 1.17146 0.0612245
+13 0.75 0.495812 0.0816327
+14 0.81 1.70044 0.163265
+15 0.87 1.47408 0.244898
+16 0.93 0.322518 0.265306
+17 0.99 0.284622 0.285714
+18 1.05 2.27728 0.469388
+19 1.11 1.13211 0.571429
+20 1.17 0.2038 0.591837
+21 1.23 1.10644 0.714286
+22 1.29 0.502961 0.77551
+23 1.35 0.459254 0.836735
+24 1.41 0.982348 0.979592
+25 1.47 0.903804 1.12245
+26 1.53 1.07269 1.30612
+27 1.59 0.441454 1.38776
+28 1.65 1.33229 1.65306
+29 1.71 1.33586 1.93878
+30 1.77 1.06872 2.18367
+31 1.83 0.583214 2.32653
+32 1.89 0.781108 2.53061
+33 1.95 0.587026 2.69388
+34 2.01 1.10501 3.02041
+35 2.07 0.716296 3.2449
+36 2.13 0.738014 3.4898
+37 2.19 0.872664 3.79592
+38 2.25 1.59837 4.38776
+39 2.31 0.418324 4.55102
+40 2.37 1.4903 5.16327
+41 2.43 0.992329 5.59184
+42 2.49 0.810072 5.95918
+43 2.55 1.11569 6.4898
+44 2.61 0.614416 6.79592
+45 2.67 0.978521 7.30612
+46 2.73 0.861105 7.77551
+47 2.79 1.03955 8.36735
+48 2.85 1.06494 9
+49 2.91 1.02148 9.63265
+50 2.97 1.2337 10.4286
+103900 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 0 0
+9 0.51 0 0
+10 0.57 0.858066 0.0204082
+11 0.63 1.40505 0.0612245
+12 0.69 0.585732 0.0816327
+13 0.75 0.991624 0.122449
+14 0.81 0 0.122449
+15 0.87 0 0.122449
+16 0.93 0.645037 0.163265
+17 0.99 1.70773 0.285714
+18 1.05 1.01213 0.367347
+19 1.11 0.679267 0.428571
+20 1.17 0.8152 0.510204
+21 1.23 0.922029 0.612245
+22 1.29 0.838269 0.714286
+23 1.35 0.459254 0.77551
+24 1.41 0.701677 0.877551
+25 1.47 1.03292 1.04082
+26 1.53 0.715128 1.16327
+27 1.59 1.76582 1.4898
+28 1.65 0.307451 1.55102
+29 1.71 0.85877 1.73469
+30 1.77 0.35624 1.81633
+31 1.83 0.916479 2.04082
+32 1.89 1.09355 2.32653
+33 1.95 0.660405 2.5102
+34 2.01 1.03595 2.81633
+35 2.07 1.04189 3.14286
+36 2.13 0.984018 3.46939
+37 2.19 0.930841 3.79592
+38 2.25 1.04721 4.18367
+39 2.31 0.888938 4.53061
+40 2.37 0.943854 4.91837
+41 2.43 0.897822 5.30612
+42 2.49 0.900081 5.71429
+43 2.55 1.28734 6.32653
+44 2.61 0.983065 6.81633
+45 2.67 0.978521 7.32653
+46 2.73 0.935984 7.83673
+47 2.79 0.860314 8.32653
+48 2.85 0.996238 8.91837
+49 2.91 1.25214 9.69388
+50 2.97 1.51839 10.6735
+103950 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 0 0
+9 0.51 0 0
+10 0.57 0 0
+11 0.63 0.702525 0.0204082
+12 0.69 0.585732 0.0408163
+13 0.75 0 0.0408163
+14 0.81 0.425111 0.0612245
+15 0.87 0.737039 0.102041
+16 0.93 0.645037 0.142857
+17 0.99 1.13849 0.22449
+18 1.05 1.01213 0.306122
+19 1.11 0.679267 0.367347
+20 1.17 1.019 0.469388
+21 1.23 1.29084 0.612245
+22 1.29 0.167654 0.632653
+23 1.35 1.53085 0.836735
+24 1.41 0.701677 0.938776
+25 1.47 1.29115 1.14286
+26 1.53 0.715128 1.26531
+27 1.59 0.993271 1.44898
+28 1.65 0.819871 1.61224
+29 1.71 0.85877 1.79592
+30 1.77 1.24684 2.08163
+31 1.83 1.33306 2.40816
+32 1.89 0.781108 2.61224
+33 1.95 1.32081 2.97959
+34 2.01 1.03595 3.28571
+35 2.07 1.17212 3.65306
+36 2.13 0.799515 3.91837
+37 2.19 0.581776 4.12245
+38 2.25 0.936978 4.46939
+39 2.31 0.836648 4.79592
+40 2.37 0.794824 5.12245
+41 2.43 1.13409 5.61224
+42 2.49 0.945085 6.04082
+43 2.55 1.07278 6.55102
+44 2.61 0.819221 6.95918
+45 2.67 1.01766 7.4898
+46 2.73 0.823666 7.93878
+47 2.79 1.07539 8.55102
+48 2.85 1.13365 9.22449
+49 2.91 1.35099 10.0612
+50 2.97 0.98063 10.6939
+104000 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 0 0
+9 0.51 0 0
+10 0.57 0.858066 0.0204082
+11 0.63 0 0.0204082
+12 0.69 0.585732 0.0408163
+13 0.75 0.991624 0.0816327
+14 0.81 1.27533 0.142857
+15 0.87 1.10556 0.204082
+16 0.93 0.645037 0.244898
+17 0.99 0.853865 0.306122
+18 1.05 1.26516 0.408163
+19 1.11 1.35853 0.530612
+20 1.17 0.2038 0.55102
+21 1.23 0.184406 0.571429
+22 1.29 0.838269 0.673469
+23 1.35 1.22468 0.836735
+24 1.41 0.842013 0.959184
+25 1.47 0.774689 1.08163
+26 1.53 0.953504 1.2449
+27 1.59 1.214 1.46939
+28 1.65 1.22981 1.71429
+29 1.71 0.763351 1.87755
+30 1.77 1.15778 2.14286
+31 1.83 1.58301 2.53061
+32 1.89 0.937329 2.77551
+33 1.95 1.32081 3.14286
+34 2.01 0.552506 3.30612
+35 2.07 1.04189 3.63265
+36 2.13 0.615011 3.83673
+37 2.19 1.0472 4.20408
+38 2.25 0.936978 4.55102
+39 2.31 1.25497 5.04082
+40 2.37 0.844501 5.38776
+41 2.43 0.992329 5.81633
+42 2.49 0.810072 6.18367
+43 2.55 0.901135 6.61224
+44 2.61 1.14691 7.18367
+45 2.67 0.782817 7.59184
+46 2.73 1.19806 8.2449
+47 2.79 0.896161 8.7551
+48 2.85 0.618355 9.12245
+49 2.91 1.12034 9.81633
+50 2.97 0.948997 10.4286
+104050 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 1.37595 0.0204082
+9 0.51 1.07159 0.0408163
+10 0.57 1.71613 0.0816327
+11 0.63 0 0.0816327
+12 0.69 0 0.0816327
+13 0.75 1.48744 0.142857
+14 0.81 0.425111 0.163265
+15 0.87 1.8426 0.265306
+16 0.93 1.29007 0.346939
+17 0.99 0.284622 0.367347
+18 1.05 1.51819 0.489796
+19 1.11 0.679267 0.55102
+20 1.17 0.8152 0.632653
+21 1.23 0.553218 0.693878
+22 1.29 1.50888 0.877551
+23 1.35 1.07159 1.02041
+24 1.41 0.421006 1.08163
+25 1.47 1.03292 1.2449
+26 1.53 0.715128 1.36735
+27 1.59 1.10363 1.57143
+28 1.65 1.33229 1.83673
+29 1.71 0.667932 1.97959
+30 1.77 0.979661 2.20408
+31 1.83 0.749847 2.38776
+32 1.89 0.859219 2.61224
+33 1.95 0.880539 2.85714
+34 2.01 0.966885 3.14286
+35 2.07 1.04189 3.46939
+36 2.13 1.10702 3.83673
+37 2.19 0.872664 4.14286
+38 2.25 0.992094 4.5102
+39 2.31 1.0981 4.93878
+40 2.37 0.894177 5.30612
+41 2.43 0.75606 5.63265
+42 2.49 1.39512 6.26531
+43 2.55 0.986958 6.73469
+44 2.61 1.06499 7.26531
+45 2.67 0.704535 7.63265
+46 2.73 0.823666 8.08163
+47 2.79 1.21878 8.77551
+48 2.85 1.06494 9.40816
+49 2.91 0.757875 9.87755
+50 2.97 0.917363 10.4694
+104100 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 1.83099 0.0204082
+8 0.45 0 0.0204082
+9 0.51 2.14319 0.0612245
+10 0.57 2.5742 0.122449
+11 0.63 0.702525 0.142857
+12 0.69 0 0.142857
+13 0.75 0.991624 0.183673
+14 0.81 0.425111 0.204082
+15 0.87 1.10556 0.265306
+16 0.93 1.29007 0.346939
+17 0.99 1.13849 0.428571
+18 1.05 0 0.428571
+19 1.11 0.226422 0.44898
+20 1.17 0.6114 0.510204
+21 1.23 0.184406 0.530612
+22 1.29 1.00592 0.653061
+23 1.35 0.918509 0.77551
+24 1.41 1.40335 0.979592
+25 1.47 0.645574 1.08163
+26 1.53 1.31107 1.30612
+27 1.59 0.993271 1.4898
+28 1.65 0.512419 1.59184
+29 1.71 0.667932 1.73469
+30 1.77 0.71248 1.89796
+31 1.83 0.66653 2.06122
+32 1.89 0.702997 2.2449
+33 1.95 1.10067 2.55102
+34 2.01 0.966885 2.83673
+35 2.07 0.976768 3.14286
+36 2.13 0.984018 3.46939
+37 2.19 0.872664 3.77551
+38 2.25 1.10233 4.18367
+39 2.31 0.941229 4.55102
+40 2.37 1.09288 5
+41 2.43 0.992329 5.42857
+42 2.49 0.945085 5.85714
+43 2.55 1.24442 6.44898
+44 2.61 0.77826 6.83673
+45 2.67 1.36993 7.55102
+46 2.73 1.19806 8.20408
+47 2.79 1.03955 8.79592
+48 2.85 0.927532 9.34694
+49 2.91 0.757875 9.81633
+50 2.97 1.07553 10.5102
+104150 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 0 0
+9 0.51 0 0
+10 0.57 0 0
+11 0.63 0 0
+12 0.69 0 0
+13 0.75 0.495812 0.0204082
+14 0.81 0.850222 0.0612245
+15 0.87 0.368519 0.0816327
+16 0.93 0 0.0816327
+17 0.99 0.284622 0.102041
+18 1.05 1.01213 0.183673
+19 1.11 0.452845 0.22449
+20 1.17 1.4266 0.367347
+21 1.23 1.10644 0.489796
+22 1.29 0.670615 0.571429
+23 1.35 0.918509 0.693878
+24 1.41 1.40335 0.897959
+25 1.47 1.03292 1.06122
+26 1.53 1.90701 1.38776
+27 1.59 0.33109 1.44898
+28 1.65 0.614903 1.57143
+29 1.71 1.33586 1.85714
+30 1.77 0.71248 2.02041
+31 1.83 1.16643 2.30612
+32 1.89 0.781108 2.5102
+33 1.95 0.44027 2.63265
+34 2.01 1.24314 3
+35 2.07 0.716296 3.22449
+36 2.13 1.16852 3.61224
+37 2.19 0.989019 3.95918
+38 2.25 0.992094 4.32653
+39 2.31 0.941229 4.69388
+40 2.37 1.24191 5.20408
+41 2.43 1.18134 5.71429
+42 2.49 0.945085 6.14286
+43 2.55 0.944046 6.59184
+44 2.61 1.02403 7.10204
+45 2.67 0.978521 7.61224
+46 2.73 1.12318 8.22449
+47 2.79 0.967854 8.77551
+48 2.85 0.996238 9.36735
+49 2.91 1.18624 10.102
+50 2.97 1.0439 10.7755
+104200 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 0 0
+9 0.51 1.07159 0.0204082
+10 0.57 2.5742 0.0816327
+11 0.63 0 0.0816327
+12 0.69 1.17146 0.122449
+13 0.75 0.991624 0.163265
+14 0.81 0.425111 0.183673
+15 0.87 0.368519 0.204082
+16 0.93 0 0.204082
+17 0.99 0.284622 0.22449
+18 1.05 0.759094 0.285714
+19 1.11 0.679267 0.346939
+20 1.17 0.8152 0.428571
+21 1.23 1.29084 0.571429
+22 1.29 0.502961 0.632653
+23 1.35 0.612339 0.714286
+24 1.41 1.12268 0.877551
+25 1.47 0.516459 0.959184
+26 1.53 0.834316 1.10204
+27 1.59 0.882908 1.26531
+28 1.65 0.819871 1.42857
+29 1.71 0.954189 1.63265
+30 1.77 1.06872 1.87755
+31 1.83 1.08311 2.14286
+32 1.89 0.859219 2.36735
+33 1.95 0.660405 2.55102
+34 2.01 1.10501 2.87755
+35 2.07 0.976768 3.18367
+36 2.13 0.984018 3.5102
+37 2.19 0.989019 3.85714
+38 2.25 0.992094 4.22449
+39 2.31 0.836648 4.55102
+40 2.37 1.14256 5.02041
+41 2.43 1.32311 5.59184
+42 2.49 0.945085 6.02041
+43 2.55 1.20151 6.59184
+44 2.61 0.819221 7
+45 2.67 0.978521 7.5102
+46 2.73 0.56159 7.81633
+47 2.79 0.860314 8.30612
+48 2.85 0.79012 8.77551
+49 2.91 0.955581 9.36735
+50 2.97 1.17043 10.1224
+104250 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 0 0
+9 0.51 1.07159 0.0204082
+10 0.57 0 0.0204082
+11 0.63 0.702525 0.0408163
+12 0.69 1.7572 0.102041
+13 0.75 1.48744 0.163265
+14 0.81 1.70044 0.244898
+15 0.87 2.21112 0.367347
+16 0.93 0.967555 0.428571
+17 0.99 0.284622 0.44898
+18 1.05 1.01213 0.530612
+19 1.11 0.90569 0.612245
+20 1.17 1.6304 0.77551
+21 1.23 1.29084 0.918367
+22 1.29 1.17358 1.06122
+23 1.35 0.612339 1.14286
+24 1.41 1.40335 1.34694
+25 1.47 1.67849 1.61224
+26 1.53 1.07269 1.79592
+27 1.59 0.551817 1.89796
+28 1.65 0.922354 2.08163
+29 1.71 0.667932 2.22449
+30 1.77 0.80154 2.40816
+31 1.83 1.16643 2.69388
+32 1.89 0.937329 2.93878
+33 1.95 1.46757 3.34694
+34 2.01 0.828758 3.59184
+35 2.07 0.846532 3.85714
+36 2.13 1.16852 4.2449
+37 2.19 0.698131 4.4898
+38 2.25 1.10233 4.89796
+39 2.31 0.313743 5.02041
+40 2.37 0.695471 5.30612
+41 2.43 0.945075 5.71429
+42 2.49 1.03509 6.18367
+43 2.55 0.858224 6.59184
+44 2.61 0.860182 7.02041
+45 2.67 0.821958 7.44898
+46 2.73 0.973423 7.97959
+47 2.79 0.896161 8.4898
+48 2.85 0.996238 9.08163
+49 2.91 0.823777 9.59184
+50 2.97 1.17043 10.3469
+104300 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 0 0
+9 0.51 0 0
+10 0.57 0 0
+11 0.63 2.10758 0.0612245
+12 0.69 0.585732 0.0816327
+13 0.75 0.495812 0.102041
+14 0.81 1.27533 0.163265
+15 0.87 1.47408 0.244898
+16 0.93 0.322518 0.265306
+17 0.99 0.284622 0.285714
+18 1.05 1.51819 0.408163
+19 1.11 0.226422 0.428571
+20 1.17 1.019 0.530612
+21 1.23 0.737623 0.612245
+22 1.29 1.00592 0.734694
+23 1.35 0.459254 0.795918
+24 1.41 1.68403 1.04082
+25 1.47 1.42026 1.26531
+26 1.53 1.90701 1.59184
+27 1.59 0.882908 1.7551
+28 1.65 1.12732 1.97959
+29 1.71 0.763351 2.14286
+30 1.77 0.979661 2.36735
+31 1.83 0.999796 2.61224
+32 1.89 0.937329 2.85714
+33 1.95 0.807161 3.08163
+34 2.01 1.3122 3.46939
+35 2.07 1.107 3.81633
+36 2.13 0.984018 4.14286
+37 2.19 0.814486 4.42857
+38 2.25 0.661396 4.67347
+39 2.31 1.15039 5.12245
+40 2.37 1.04321 5.55102
+41 2.43 0.850568 5.91837
+42 2.49 0.945085 6.34694
+43 2.55 0.600757 6.63265
+44 2.61 0.901143 7.08163
+45 2.67 0.93938 7.57143
+46 2.73 0.823666 8.02041
+47 2.79 1.0037 8.59184
+48 2.85 1.54589 9.5102
+49 2.91 0.626071 9.89796
+50 2.97 0.822464 10.4286
+104350 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 0 0
+9 0.51 0 0
+10 0.57 1.71613 0.0408163
+11 0.63 0 0.0408163
+12 0.69 1.17146 0.0816327
+13 0.75 0.495812 0.102041
+14 0.81 1.70044 0.183673
+15 0.87 0.737039 0.22449
+16 0.93 0.967555 0.285714
+17 0.99 1.13849 0.367347
+18 1.05 0.253031 0.387755
+19 1.11 0.679267 0.44898
+20 1.17 1.2228 0.571429
+21 1.23 0.184406 0.591837
+22 1.29 1.00592 0.714286
+23 1.35 0.612339 0.795918
+24 1.41 1.12268 0.959184
+25 1.47 1.42026 1.18367
+26 1.53 1.19188 1.38776
+27 1.59 1.43472 1.65306
+28 1.65 0.922354 1.83673
+29 1.71 0.763351 2
+30 1.77 1.15778 2.26531
+31 1.83 1.08311 2.53061
+32 1.89 1.24977 2.85714
+33 1.95 1.54094 3.28571
+34 2.01 1.03595 3.59184
+35 2.07 1.107 3.93878
+36 2.13 0.738014 4.18367
+37 2.19 0.756309 4.44898
+38 2.25 0.716512 4.71429
+39 2.31 0.679776 4.97959
+40 2.37 0.844501 5.32653
+41 2.43 1.08684 5.79592
+42 2.49 0.540048 6.04082
+43 2.55 0.72949 6.38776
+44 2.61 0.696338 6.73469
+45 2.67 1.01766 7.26531
+46 2.73 1.01086 7.81633
+47 2.79 1.25463 8.53061
+48 2.85 0.824473 9.02041
+49 2.91 0.889679 9.57143
+50 2.97 1.20206 10.3469
+104400 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 0 0
+9 0.51 0 0
+10 0.57 1.71613 0.0408163
+11 0.63 0.702525 0.0612245
+12 0.69 0.585732 0.0816327
+13 0.75 0.495812 0.102041
+14 0.81 1.27533 0.163265
+15 0.87 1.10556 0.22449
+16 0.93 1.29007 0.306122
+17 0.99 0.284622 0.326531
+18 1.05 0.253031 0.346939
+19 1.11 0.679267 0.408163
+20 1.17 1.019 0.510204
+21 1.23 1.84406 0.714286
+22 1.29 0.670615 0.795918
+23 1.35 1.22468 0.959184
+24 1.41 0.982348 1.10204
+25 1.47 0.903804 1.2449
+26 1.53 0.953504 1.40816
+27 1.59 0.551817 1.5102
+28 1.65 1.22981 1.7551
+29 1.71 0.572513 1.87755
+30 1.77 0.71248 2.04082
+31 1.83 1.08311 2.30612
+32 1.89 0.781108 2.5102
+33 1.95 1.10067 2.81633
+34 2.01 1.17407 3.16327
+35 2.07 0.91165 3.44898
+36 2.13 0.922517 3.7551
+37 2.19 0.756309 4.02041
+38 2.25 0.826745 4.32653
+39 2.31 0.888938 4.67347
+40 2.37 1.14256 5.14286
+41 2.43 0.945075 5.55102
+42 2.49 1.1701 6.08163
+43 2.55 1.11569 6.61224
+44 2.61 0.860182 7.04082
+45 2.67 0.90024 7.5102
+46 2.73 0.786226 7.93878
+47 2.79 0.932007 8.46939
+48 2.85 1.13365 9.14286
+49 2.91 0.955581 9.73469
+50 2.97 0.948997 10.3469
+104450 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 0 0
+9 0.51 0 0
+10 0.57 0.858066 0.0204082
+11 0.63 0 0.0204082
+12 0.69 0.585732 0.0408163
+13 0.75 0.991624 0.0816327
+14 0.81 0.850222 0.122449
+15 0.87 0.737039 0.163265
+16 0.93 2.25763 0.306122
+17 0.99 1.42311 0.408163
+18 1.05 1.01213 0.489796
+19 1.11 0.90569 0.571429
+20 1.17 1.019 0.673469
+21 1.23 0.737623 0.755102
+22 1.29 1.50888 0.938776
+23 1.35 0.459254 1
+24 1.41 0.842013 1.12245
+25 1.47 1.03292 1.28571
+26 1.53 1.19188 1.4898
+27 1.59 0.662181 1.61224
+28 1.65 0.409935 1.69388
+29 1.71 0.763351 1.85714
+30 1.77 0.80154 2.04082
+31 1.83 1.24974 2.34694
+32 1.89 0.781108 2.55102
+33 1.95 0.880539 2.79592
+34 2.01 0.828758 3.04082
+35 2.07 1.17212 3.40816
+36 2.13 1.10702 3.77551
+37 2.19 0.930841 4.10204
+38 2.25 0.936978 4.44898
+39 2.31 0.732067 4.73469
+40 2.37 1.24191 5.2449
+41 2.43 0.992329 5.67347
+42 2.49 0.810072 6.04082
+43 2.55 0.986958 6.5102
+44 2.61 0.655377 6.83673
+45 2.67 0.743676 7.22449
+46 2.73 1.2355 7.89796
+47 2.79 0.716929 8.30612
+48 2.85 1.13365 8.97959
+49 2.91 0.92263 9.55102
+50 2.97 1.1388 10.2857
+104500 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 2.55534 0.0204082
+7 0.39 0 0.0204082
+8 0.45 0 0.0204082
+9 0.51 1.07159 0.0408163
+10 0.57 0 0.0408163
+11 0.63 0.702525 0.0612245
+12 0.69 0.585732 0.0816327
+13 0.75 0 0.0816327
+14 0.81 0.425111 0.102041
+15 0.87 0.737039 0.142857
+16 0.93 0.967555 0.204082
+17 0.99 0.284622 0.22449
+18 1.05 1.26516 0.326531
+19 1.11 0.90569 0.408163
+20 1.17 0.8152 0.489796
+21 1.23 0.553218 0.55102
+22 1.29 1.17358 0.693878
+23 1.35 0.765424 0.795918
+24 1.41 0.561342 0.877551
+25 1.47 1.03292 1.04082
+26 1.53 0.834316 1.18367
+27 1.59 0.993271 1.36735
+28 1.65 0.922354 1.55102
+29 1.71 1.14503 1.79592
+30 1.77 0.979661 2.02041
+31 1.83 1.08311 2.28571
+32 1.89 0.937329 2.53061
+33 1.95 0.807161 2.7551
+34 2.01 0.897822 3.02041
+35 2.07 0.846532 3.28571
+36 2.13 1.23002 3.69388
+37 2.19 0.639953 3.91837
+38 2.25 1.10233 4.32653
+39 2.31 0.679776 4.59184
+40 2.37 0.844501 4.93878
+41 2.43 1.51212 5.59184
+42 2.49 0.945085 6.02041
+43 2.55 1.02987 6.5102
+44 2.61 0.901143 6.95918
+45 2.67 0.93938 7.44898
+46 2.73 1.0483 8.02041
+47 2.79 1.07539 8.63265
+48 2.85 0.996238 9.22449
+49 2.91 0.889679 9.77551
+50 2.97 0.948997 10.3878
+104550 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 2.55534 0.0204082
+7 0.39 0 0.0204082
+8 0.45 0 0.0204082
+9 0.51 0 0.0204082
+10 0.57 0 0.0204082
+11 0.63 0.702525 0.0408163
+12 0.69 2.34293 0.122449
+13 0.75 1.48744 0.183673
+14 0.81 0.850222 0.22449
+15 0.87 1.10556 0.285714
+16 0.93 0.645037 0.326531
+17 0.99 0.569243 0.367347
+18 1.05 0.759094 0.428571
+19 1.11 0.226422 0.44898
+20 1.17 1.2228 0.571429
+21 1.23 1.10644 0.693878
+22 1.29 1.34123 0.857143
+23 1.35 0.918509 0.979592
+24 1.41 0.701677 1.08163
+25 1.47 1.29115 1.28571
+26 1.53 0.476752 1.36735
+27 1.59 1.43472 1.63265
+28 1.65 1.12732 1.85714
+29 1.71 1.04961 2.08163
+30 1.77 1.24684 2.36735
+31 1.83 0.416582 2.46939
+32 1.89 1.17166 2.77551
+33 1.95 0.880539 3.02041
+34 2.01 0.690632 3.22449
+35 2.07 0.651178 3.42857
+36 2.13 1.23002 3.83673
+37 2.19 1.27991 4.28571
+38 2.25 0.826745 4.59184
+39 2.31 0.784357 4.89796
+40 2.37 0.794824 5.22449
+41 2.43 1.03958 5.67347
+42 2.49 1.1251 6.18367
+43 2.55 0.815313 6.57143
+44 2.61 1.22883 7.18367
+45 2.67 0.978521 7.69388
+46 2.73 1.31038 8.40816
+47 2.79 1.0037 8.97959
+48 2.85 1.0993 9.63265
+49 2.91 0.988533 10.2449
+50 2.97 1.20206 11.0204
+104600 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 0 0
+9 0.51 0 0
+10 0.57 0.858066 0.0204082
+11 0.63 1.40505 0.0612245
+12 0.69 0 0.0612245
+13 0.75 1.48744 0.122449
+14 0.81 2.12556 0.22449
+15 0.87 0.368519 0.244898
+16 0.93 1.93511 0.367347
+17 0.99 0.284622 0.387755
+18 1.05 1.01213 0.469388
+19 1.11 0.90569 0.55102
+20 1.17 0.2038 0.571429
+21 1.23 0.922029 0.673469
+22 1.29 0.838269 0.77551
+23 1.35 1.22468 0.938776
+24 1.41 0.701677 1.04082
+25 1.47 1.16203 1.22449
+26 1.53 0.834316 1.36735
+27 1.59 0.882908 1.53061
+28 1.65 0.819871 1.69388
+29 1.71 1.43128 2
+30 1.77 0.80154 2.18367
+31 1.83 1.16643 2.46939
+32 1.89 1.17166 2.77551
+33 1.95 1.24743 3.12245
+34 2.01 1.03595 3.42857
+35 2.07 0.91165 3.71429
+36 2.13 1.29152 4.14286
+37 2.19 0.930841 4.46939
+38 2.25 0.936978 4.81633
+39 2.31 0.993519 5.20408
+40 2.37 1.09288 5.65306
+41 2.43 0.992329 6.08163
+42 2.49 0.945085 6.5102
+43 2.55 0.944046 6.95918
+44 2.61 0.901143 7.40816
+45 2.67 1.13508 8
+46 2.73 1.0483 8.57143
+47 2.79 1.07539 9.18367
+48 2.85 1.13365 9.85714
+49 2.91 0.955581 10.449
+50 2.97 0.790831 10.9592
+104650 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 0 0
+9 0.51 0 0
+10 0.57 0.858066 0.0204082
+11 0.63 0 0.0204082
+12 0.69 1.17146 0.0612245
+13 0.75 0.991624 0.102041
+14 0.81 0 0.102041
+15 0.87 0.737039 0.142857
+16 0.93 0.645037 0.183673
+17 0.99 1.13849 0.265306
+18 1.05 1.26516 0.367347
+19 1.11 0.90569 0.44898
+20 1.17 0.8152 0.530612
+21 1.23 1.10644 0.653061
+22 1.29 0.502961 0.714286
+23 1.35 0.765424 0.816327
+24 1.41 0.842013 0.938776
+25 1.47 1.29115 1.14286
+26 1.53 0.953504 1.30612
+27 1.59 0.772544 1.44898
+28 1.65 1.43477 1.73469
+29 1.71 1.24045 2
+30 1.77 0.979661 2.22449
+31 1.83 1.58301 2.61224
+32 1.89 1.32788 2.95918
+33 1.95 0.880539 3.20408
+34 2.01 0.759695 3.42857
+35 2.07 0.846532 3.69388
+36 2.13 0.984018 4.02041
+37 2.19 1.33808 4.4898
+38 2.25 1.04721 4.87755
+39 2.31 1.04581 5.28571
+40 2.37 1.44062 5.87755
+41 2.43 1.13409 6.36735
+42 2.49 0.630056 6.65306
+43 2.55 0.772402 7.02041
+44 2.61 0.942104 7.4898
+45 2.67 1.0568 8.04082
+46 2.73 0.935984 8.55102
+47 2.79 0.932007 9.08163
+48 2.85 0.927532 9.63265
+49 2.91 1.08739 10.3061
+50 2.97 0.948997 10.9184
+104700 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 2.55534 0.0204082
+7 0.39 0 0.0204082
+8 0.45 1.37595 0.0408163
+9 0.51 0 0.0408163
+10 0.57 1.71613 0.0816327
+11 0.63 0 0.0816327
+12 0.69 1.17146 0.122449
+13 0.75 0.495812 0.142857
+14 0.81 0.850222 0.183673
+15 0.87 1.47408 0.265306
+16 0.93 0.322518 0.285714
+17 0.99 1.42311 0.387755
+18 1.05 1.26516 0.489796
+19 1.11 0.452845 0.530612
+20 1.17 0.8152 0.612245
+21 1.23 0.922029 0.714286
+22 1.29 0.502961 0.77551
+23 1.35 1.22468 0.938776
+24 1.41 0.701677 1.04082
+25 1.47 1.29115 1.2449
+26 1.53 0.953504 1.40816
+27 1.59 0.882908 1.57143
+28 1.65 0.922354 1.7551
+29 1.71 0.667932 1.89796
+30 1.77 1.42496 2.22449
+31 1.83 0.749847 2.40816
+32 1.89 0.781108 2.61224
+33 1.95 1.17405 2.93878
+34 2.01 1.17407 3.28571
+35 2.07 1.17212 3.65306
+36 2.13 0.861016 3.93878
+37 2.19 1.22173 4.36735
+38 2.25 0.936978 4.71429
+39 2.31 0.679776 4.97959
+40 2.37 1.09288 5.42857
+41 2.43 1.2286 5.95918
+42 2.49 1.30512 6.55102
+43 2.55 1.50189 7.26531
+44 2.61 0.696338 7.61224
+45 2.67 0.90024 8.08163
+46 2.73 0.898544 8.57143
+47 2.79 1.0037 9.14286
+48 2.85 1.40848 9.97959
+49 2.91 1.08739 10.6531
+50 2.97 0.98063 11.2857
+104750 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 0 0
+9 0.51 0 0
+10 0.57 0.858066 0.0204082
+11 0.63 2.10758 0.0816327
+12 0.69 1.17146 0.122449
+13 0.75 0.991624 0.163265
+14 0.81 1.27533 0.22449
+15 0.87 0.737039 0.265306
+16 0.93 0.967555 0.326531
+17 0.99 1.70773 0.44898
+18 1.05 0.506063 0.489796
+19 1.11 0.679267 0.55102
+20 1.17 0.8152 0.632653
+21 1.23 0.737623 0.714286
+22 1.29 1.50888 0.897959
+23 1.35 0.612339 0.979592
+24 1.41 0.561342 1.06122
+25 1.47 0.645574 1.16327
+26 1.53 1.31107 1.38776
+27 1.59 0.441454 1.46939
+28 1.65 0.717387 1.61224
+29 1.71 1.04961 1.83673
+30 1.77 1.3359 2.14286
+31 1.83 0.66653 2.30612
+32 1.89 0.781108 2.5102
+33 1.95 0.880539 2.7551
+34 2.01 1.03595 3.06122
+35 2.07 1.107 3.40816
+36 2.13 0.861016 3.69388
+37 2.19 1.10537 4.08163
+38 2.25 0.661396 4.32653
+39 2.31 1.20268 4.79592
+40 2.37 0.596118 5.04082
+41 2.43 1.03958 5.4898
+42 2.49 1.26011 6.06122
+43 2.55 1.24442 6.65306
+44 2.61 1.06499 7.18367
+45 2.67 0.861099 7.63265
+46 2.73 1.01086 8.18367
+47 2.79 1.0037 8.7551
+48 2.85 0.858826 9.26531
+49 2.91 1.18624 10
+50 2.97 1.1388 10.7347
+104800 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 0 0
+9 0.51 4.28637 0.0816327
+10 0.57 0 0.0816327
+11 0.63 0.702525 0.102041
+12 0.69 1.17146 0.142857
+13 0.75 2.97487 0.265306
+14 0.81 0.425111 0.285714
+15 0.87 0.368519 0.306122
+16 0.93 1.29007 0.387755
+17 0.99 0.853865 0.44898
+18 1.05 0.506063 0.489796
+19 1.11 1.35853 0.612245
+20 1.17 0.6114 0.673469
+21 1.23 0.737623 0.755102
+22 1.29 0.335308 0.795918
+23 1.35 1.22468 0.959184
+24 1.41 0.701677 1.06122
+25 1.47 0.903804 1.20408
+26 1.53 1.31107 1.42857
+27 1.59 0.993271 1.61224
+28 1.65 1.22981 1.85714
+29 1.71 0.85877 2.04082
+30 1.77 1.15778 2.30612
+31 1.83 1.08311 2.57143
+32 1.89 1.24977 2.89796
+33 1.95 0.880539 3.14286
+34 2.01 0.966885 3.42857
+35 2.07 0.91165 3.71429
+36 2.13 1.35303 4.16327
+37 2.19 0.872664 4.46939
+38 2.25 0.992094 4.83673
+39 2.31 1.15039 5.28571
+40 2.37 0.99353 5.69388
+41 2.43 1.13409 6.18367
+42 2.49 0.855076 6.57143
+43 2.55 1.02987 7.06122
+44 2.61 0.942104 7.53061
+45 2.67 0.90024 8
+46 2.73 0.973423 8.53061
+47 2.79 0.967854 9.08163
+48 2.85 0.44659 9.34694
+49 2.91 0.856728 9.87755
+50 2.97 0.695931 10.3265
+104850 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 1.37595 0.0204082
+9 0.51 1.07159 0.0408163
+10 0.57 0 0.0408163
+11 0.63 0 0.0408163
+12 0.69 0 0.0408163
+13 0.75 0.495812 0.0612245
+14 0.81 0.425111 0.0816327
+15 0.87 1.10556 0.142857
+16 0.93 1.61259 0.244898
+17 0.99 1.42311 0.346939
+18 1.05 0.506063 0.387755
+19 1.11 0.452845 0.428571
+20 1.17 0.6114 0.489796
+21 1.23 0.737623 0.571429
+22 1.29 0.502961 0.632653
+23 1.35 0.918509 0.755102
+24 1.41 1.40335 0.959184
+25 1.47 1.16203 1.14286
+26 1.53 1.54944 1.40816
+27 1.59 0.441454 1.4898
+28 1.65 1.12732 1.71429
+29 1.71 0.572513 1.83673
+30 1.77 0.71248 2
+31 1.83 1.58301 2.38776
+32 1.89 1.24977 2.71429
+33 1.95 1.17405 3.04082
+34 2.01 1.17407 3.38776
+35 2.07 1.30236 3.79592
+36 2.13 1.53753 4.30612
+37 2.19 0.872664 4.61224
+38 2.25 1.04721 5
+39 2.31 0.941229 5.36735
+40 2.37 0.447089 5.55102
+41 2.43 1.2286 6.08163
+42 2.49 0.990089 6.53061
+43 2.55 0.772402 6.89796
+44 2.61 0.983065 7.38776
+45 2.67 1.17423 8
+46 2.73 0.898544 8.4898
+47 2.79 0.932007 9.02041
+48 2.85 0.755767 9.46939
+49 2.91 0.823777 9.97959
+50 2.97 0.98063 10.6122
+104900 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 0 0
+9 0.51 0 0
+10 0.57 1.71613 0.0408163
+11 0.63 0.702525 0.0612245
+12 0.69 0.585732 0.0816327
+13 0.75 2.47906 0.183673
+14 0.81 1.27533 0.244898
+15 0.87 0.737039 0.285714
+16 0.93 0 0.285714
+17 0.99 0.853865 0.346939
+18 1.05 0.759094 0.408163
+19 1.11 1.13211 0.510204
+20 1.17 0.8152 0.591837
+21 1.23 1.10644 0.714286
+22 1.29 0.502961 0.77551
+23 1.35 1.22468 0.938776
+24 1.41 0.421006 1
+25 1.47 1.54938 1.2449
+26 1.53 0.476752 1.32653
+27 1.59 0.551817 1.42857
+28 1.65 1.12732 1.65306
+29 1.71 0.954189 1.85714
+30 1.77 0.53436 1.97959
+31 1.83 0.583214 2.12245
+32 1.89 1.09355 2.40816
+33 1.95 1.17405 2.73469
+34 2.01 0.759695 2.95918
+35 2.07 1.49771 3.42857
+36 2.13 1.04552 3.77551
+37 2.19 0.872664 4.08163
+38 2.25 0.771629 4.36735
+39 2.31 1.15039 4.81633
+40 2.37 1.19224 5.30612
+41 2.43 0.945075 5.71429
+42 2.49 0.945085 6.14286
+43 2.55 1.02987 6.63265
+44 2.61 0.983065 7.12245
+45 2.67 0.978521 7.63265
+46 2.73 0.898544 8.12245
+47 2.79 0.860314 8.61224
+48 2.85 1.03059 9.22449
+49 2.91 0.988533 9.83673
+50 2.97 1.26533 10.6531
+104950 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 0 0
+9 0.51 0 0
+10 0.57 0.858066 0.0204082
+11 0.63 2.10758 0.0816327
+12 0.69 0.585732 0.102041
+13 0.75 0 0.102041
+14 0.81 1.27533 0.163265
+15 0.87 2.21112 0.285714
+16 0.93 0.645037 0.326531
+17 0.99 0.853865 0.387755
+18 1.05 0.253031 0.408163
+19 1.11 0.679267 0.469388
+20 1.17 1.019 0.571429
+21 1.23 0.553218 0.632653
+22 1.29 1.00592 0.755102
+23 1.35 1.07159 0.897959
+24 1.41 0.561342 0.979592
+25 1.47 0.645574 1.08163
+26 1.53 0.834316 1.22449
+27 1.59 0.882908 1.38776
+28 1.65 1.12732 1.61224
+29 1.71 1.33586 1.89796
+30 1.77 1.24684 2.18367
+31 1.83 0.916479 2.40816
+32 1.89 1.32788 2.7551
+33 1.95 1.0273 3.04082
+34 2.01 1.10501 3.36735
+35 2.07 1.107 3.71429
+36 2.13 0.676513 3.93878
+37 2.19 0.581776 4.14286
+38 2.25 1.15744 4.57143
+39 2.31 0.836648 4.89796
+40 2.37 0.844501 5.2449
+41 2.43 0.661553 5.53061
+42 2.49 0.945085 5.95918
+43 2.55 0.858224 6.36735
+44 2.61 1.14691 6.93878
+45 2.67 1.0568 7.4898
+46 2.73 0.673908 7.85714
+47 2.79 0.860314 8.34694
+48 2.85 1.168 9.04082
+49 2.91 0.823777 9.55102
+50 2.97 0.948997 10.1633
+105000 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 0 0
+9 0.51 0 0
+10 0.57 0 0
+11 0.63 1.40505 0.0408163
+12 0.69 1.7572 0.102041
+13 0.75 1.48744 0.163265
+14 0.81 1.70044 0.244898
+15 0.87 0.368519 0.265306
+16 0.93 0.322518 0.285714
+17 0.99 0.569243 0.326531
+18 1.05 0.759094 0.387755
+19 1.11 1.58496 0.530612
+20 1.17 0.6114 0.591837
+21 1.23 1.29084 0.734694
+22 1.29 1.17358 0.877551
+23 1.35 0.765424 0.979592
+24 1.41 0.842013 1.10204
+25 1.47 0.645574 1.20408
+26 1.53 0.238376 1.2449
+27 1.59 0.772544 1.38776
+28 1.65 1.02484 1.59184
+29 1.71 1.04961 1.81633
+30 1.77 1.3359 2.12245
+31 1.83 1.16643 2.40816
+32 1.89 0.702997 2.59184
+33 1.95 1.24743 2.93878
+34 2.01 0.621569 3.12245
+35 2.07 0.455825 3.26531
+36 2.13 1.04552 3.61224
+37 2.19 0.989019 3.95918
+38 2.25 0.60628 4.18367
+39 2.31 0.784357 4.4898
+40 2.37 1.04321 4.91837
+41 2.43 1.37036 5.5102
+42 2.49 1.21511 6.06122
+43 2.55 1.02987 6.55102
+44 2.61 0.696338 6.89796
+45 2.67 1.0568 7.44898
+46 2.73 1.2355 8.12245
+47 2.79 1.0037 8.69388
+48 2.85 1.13365 9.36735
+49 2.91 1.08739 10.0408
+50 2.97 1.20206 10.8163
+105050 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 0 0
+9 0.51 0 0
+10 0.57 0.858066 0.0204082
+11 0.63 1.40505 0.0612245
+12 0.69 2.34293 0.142857
+13 0.75 0.495812 0.163265
+14 0.81 0.850222 0.204082
+15 0.87 0.737039 0.244898
+16 0.93 0.645037 0.285714
+17 0.99 1.13849 0.367347
+18 1.05 1.01213 0.44898
+19 1.11 0.679267 0.510204
+20 1.17 1.4266 0.653061
+21 1.23 0.184406 0.673469
+22 1.29 1.00592 0.795918
+23 1.35 0.765424 0.897959
+24 1.41 1.40335 1.10204
+25 1.47 1.03292 1.26531
+26 1.53 1.19188 1.46939
+27 1.59 0.772544 1.61224
+28 1.65 1.02484 1.81633
+29 1.71 0.763351 1.97959
+30 1.77 1.15778 2.2449
+31 1.83 0.833163 2.44898
+32 1.89 0.781108 2.65306
+33 1.95 0.953918 2.91837
+34 2.01 0.276253 3
+35 2.07 0.976768 3.30612
+36 2.13 1.04552 3.65306
+37 2.19 0.872664 3.95918
+38 2.25 0.881861 4.28571
+39 2.31 0.888938 4.63265
+40 2.37 0.844501 4.97959
+41 2.43 1.13409 5.46939
+42 2.49 0.945085 5.89796
+43 2.55 1.41607 6.57143
+44 2.61 0.901143 7.02041
+45 2.67 0.93938 7.5102
+46 2.73 1.16062 8.14286
+47 2.79 1.03955 8.73469
+48 2.85 0.996238 9.32653
+49 2.91 0.955581 9.91837
+50 2.97 0.790831 10.4286
+105100 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 0 0
+9 0.51 1.07159 0.0204082
+10 0.57 1.71613 0.0612245
+11 0.63 0 0.0612245
+12 0.69 1.17146 0.102041
+13 0.75 0.991624 0.142857
+14 0.81 0.850222 0.183673
+15 0.87 0.737039 0.22449
+16 0.93 0.645037 0.265306
+17 0.99 0.569243 0.306122
+18 1.05 0.253031 0.326531
+19 1.11 1.13211 0.428571
+20 1.17 0.4076 0.469388
+21 1.23 0.368812 0.510204
+22 1.29 1.50888 0.693878
+23 1.35 0.765424 0.795918
+24 1.41 1.12268 0.959184
+25 1.47 1.03292 1.12245
+26 1.53 0.953504 1.28571
+27 1.59 0.882908 1.44898
+28 1.65 0.922354 1.63265
+29 1.71 0.667932 1.77551
+30 1.77 0.4453 1.87755
+31 1.83 0.916479 2.10204
+32 1.89 1.17166 2.40816
+33 1.95 1.10067 2.71429
+34 2.01 1.10501 3.04082
+35 2.07 0.91165 3.32653
+36 2.13 0.738014 3.57143
+37 2.19 0.698131 3.81633
+38 2.25 0.771629 4.10204
+39 2.31 0.993519 4.4898
+40 2.37 0.844501 4.83673
+41 2.43 0.945075 5.2449
+42 2.49 1.1251 5.7551
+43 2.55 1.41607 6.42857
+44 2.61 0.901143 6.87755
+45 2.67 1.09594 7.44898
+46 2.73 0.898544 7.93878
+47 2.79 1.11124 8.57143
+48 2.85 0.858826 9.08163
+49 2.91 0.691973 9.5102
+50 2.97 1.26533 10.3265
+105150 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 1.37595 0.0204082
+9 0.51 0 0.0204082
+10 0.57 0 0.0204082
+11 0.63 0 0.0204082
+12 0.69 0.585732 0.0408163
+13 0.75 0.495812 0.0612245
+14 0.81 0.425111 0.0816327
+15 0.87 1.47408 0.163265
+16 0.93 0 0.163265
+17 0.99 1.42311 0.265306
+18 1.05 0.506063 0.306122
+19 1.11 0.452845 0.346939
+20 1.17 0.6114 0.408163
+21 1.23 1.10644 0.530612
+22 1.29 0.167654 0.55102
+23 1.35 1.07159 0.693878
+24 1.41 1.12268 0.857143
+25 1.47 0.774689 0.979592
+26 1.53 1.78782 1.28571
+27 1.59 0.551817 1.38776
+28 1.65 0.614903 1.5102
+29 1.71 0.763351 1.67347
+30 1.77 0.80154 1.85714
+31 1.83 0.833163 2.06122
+32 1.89 1.32788 2.40816
+33 1.95 0.880539 2.65306
+34 2.01 0.897822 2.91837
+35 2.07 0.976768 3.22449
+36 2.13 0.922517 3.53061
+37 2.19 1.10537 3.91837
+38 2.25 0.496047 4.10204
+39 2.31 1.25497 4.59184
+40 2.37 1.53997 5.22449
+41 2.43 0.897822 5.61224
+42 2.49 0.855076 6
+43 2.55 0.944046 6.44898
+44 2.61 0.860182 6.87755
+45 2.67 1.0568 7.42857
+46 2.73 1.01086 7.97959
+47 2.79 0.860314 8.46939
+48 2.85 0.961885 9.04082
+49 2.91 0.659022 9.44898
+50 2.97 1.07553 10.1429
+105200 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 0 0
+9 0.51 0 0
+10 0.57 0 0
+11 0.63 0 0
+12 0.69 0.585732 0.0204082
+13 0.75 2.97487 0.142857
+14 0.81 2.12556 0.244898
+15 0.87 0.737039 0.285714
+16 0.93 1.29007 0.367347
+17 0.99 0.569243 0.408163
+18 1.05 0.759094 0.469388
+19 1.11 0.452845 0.510204
+20 1.17 0.8152 0.591837
+21 1.23 0.553218 0.653061
+22 1.29 1.67654 0.857143
+23 1.35 0.765424 0.959184
+24 1.41 0.280671 1
+25 1.47 0.25823 1.04082
+26 1.53 0.715128 1.16327
+27 1.59 0.772544 1.30612
+28 1.65 0.819871 1.46939
+29 1.71 1.43128 1.77551
+30 1.77 0.71248 1.93878
+31 1.83 0.916479 2.16327
+32 1.89 0.702997 2.34694
+33 1.95 0.733783 2.55102
+34 2.01 1.10501 2.87755
+35 2.07 0.976768 3.18367
+36 2.13 0.984018 3.5102
+37 2.19 0.814486 3.79592
+38 2.25 0.881861 4.12245
+39 2.31 0.888938 4.46939
+40 2.37 1.14256 4.93878
+41 2.43 1.13409 5.42857
+42 2.49 1.0801 5.91837
+43 2.55 0.901135 6.34694
+44 2.61 0.983065 6.83673
+45 2.67 0.93938 7.32653
+46 2.73 0.786226 7.7551
+47 2.79 1.14709 8.40816
+48 2.85 1.168 9.10204
+49 2.91 1.35099 9.93878
+50 2.97 0.695931 10.3878
+105250 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 1.37595 0.0204082
+9 0.51 0 0.0204082
+10 0.57 1.71613 0.0612245
+11 0.63 0 0.0612245
+12 0.69 0.585732 0.0816327
+13 0.75 1.48744 0.142857
+14 0.81 1.70044 0.22449
+15 0.87 0.737039 0.265306
+16 0.93 1.29007 0.346939
+17 0.99 1.70773 0.469388
+18 1.05 0.506063 0.510204
+19 1.11 0.226422 0.530612
+20 1.17 0.8152 0.612245
+21 1.23 1.10644 0.734694
+22 1.29 1.50888 0.918367
+23 1.35 0.30617 0.959184
+24 1.41 0.561342 1.04082
+25 1.47 0.516459 1.12245
+26 1.53 1.66863 1.40816
+27 1.59 0.551817 1.5102
+28 1.65 1.12732 1.73469
+29 1.71 1.14503 1.97959
+30 1.77 1.06872 2.22449
+31 1.83 0.66653 2.38776
+32 1.89 0.781108 2.59184
+33 1.95 0.953918 2.85714
+34 2.01 0.621569 3.04082
+35 2.07 0.91165 3.32653
+36 2.13 1.10702 3.69388
+37 2.19 0.465421 3.85714
+38 2.25 1.54326 4.42857
+39 2.31 1.04581 4.83673
+40 2.37 1.04321 5.26531
+41 2.43 0.992329 5.69388
+42 2.49 1.1701 6.22449
+43 2.55 0.986958 6.69388
+44 2.61 0.942104 7.16327
+45 2.67 1.17423 7.77551
+46 2.73 0.973423 8.30612
+47 2.79 1.07539 8.91837
+48 2.85 0.755767 9.36735
+49 2.91 0.988533 9.97959
+50 2.97 0.854097 10.5306
+105300 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 2.7519 0.0408163
+9 0.51 2.14319 0.0816327
+10 0.57 0.858066 0.102041
+11 0.63 0 0.102041
+12 0.69 1.17146 0.142857
+13 0.75 0.991624 0.183673
+14 0.81 0.425111 0.204082
+15 0.87 2.21112 0.326531
+16 0.93 1.29007 0.408163
+17 0.99 1.13849 0.489796
+18 1.05 1.26516 0.591837
+19 1.11 0.452845 0.632653
+20 1.17 0.6114 0.693878
+21 1.23 1.10644 0.816327
+22 1.29 1.50888 1
+23 1.35 0.459254 1.06122
+24 1.41 0.982348 1.20408
+25 1.47 1.29115 1.40816
+26 1.53 0.953504 1.57143
+27 1.59 0.882908 1.73469
+28 1.65 0.717387 1.87755
+29 1.71 0.954189 2.08163
+30 1.77 0.62342 2.22449
+31 1.83 1.08311 2.4898
+32 1.89 0.702997 2.67347
+33 1.95 0.513648 2.81633
+34 2.01 0.276253 2.89796
+35 2.07 0.846532 3.16327
+36 2.13 0.922517 3.46939
+37 2.19 0.872664 3.77551
+38 2.25 0.881861 4.10204
+39 2.31 0.732067 4.38776
+40 2.37 1.29159 4.91837
+41 2.43 0.75606 5.2449
+42 2.49 1.39512 5.87755
+43 2.55 0.944046 6.32653
+44 2.61 0.819221 6.73469
+45 2.67 0.861099 7.18367
+46 2.73 0.898544 7.67347
+47 2.79 0.896161 8.18367
+48 2.85 1.0993 8.83673
+49 2.91 1.02148 9.46939
+50 2.97 0.790831 9.97959
+105350 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 0 0
+9 0.51 1.07159 0.0204082
+10 0.57 0.858066 0.0408163
+11 0.63 0 0.0408163
+12 0.69 0.585732 0.0612245
+13 0.75 0.991624 0.102041
+14 0.81 0 0.102041
+15 0.87 1.47408 0.183673
+16 0.93 0.967555 0.244898
+17 0.99 0.569243 0.285714
+18 1.05 0.759094 0.346939
+19 1.11 1.81138 0.510204
+20 1.17 0.4076 0.55102
+21 1.23 0.184406 0.571429
+22 1.29 1.67654 0.77551
+23 1.35 1.37776 0.959184
+24 1.41 0.280671 1
+25 1.47 1.42026 1.22449
+26 1.53 0.953504 1.38776
+27 1.59 0.772544 1.53061
+28 1.65 1.74223 1.87755
+29 1.71 0.85877 2.06122
+30 1.77 0.979661 2.28571
+31 1.83 0.999796 2.53061
+32 1.89 0.937329 2.77551
+33 1.95 0.807161 3
+34 2.01 1.10501 3.32653
+35 2.07 0.520943 3.4898
+36 2.13 1.16852 3.87755
+37 2.19 0.989019 4.22449
+38 2.25 0.716512 4.4898
+39 2.31 0.993519 4.87755
+40 2.37 1.09288 5.32653
+41 2.43 1.32311 5.89796
+42 2.49 0.855076 6.28571
+43 2.55 0.944046 6.73469
+44 2.61 1.26979 7.36735
+45 2.67 0.704535 7.73469
+46 2.73 0.861105 8.20408
+47 2.79 0.645236 8.57143
+48 2.85 0.927532 9.12245
+49 2.91 0.955581 9.71429
+50 2.97 0.854097 10.2653
+105400 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 1.83099 0.0204082
+8 0.45 1.37595 0.0408163
+9 0.51 0 0.0408163
+10 0.57 0 0.0408163
+11 0.63 0 0.0408163
+12 0.69 1.7572 0.102041
+13 0.75 0.495812 0.122449
+14 0.81 1.70044 0.204082
+15 0.87 0.737039 0.244898
+16 0.93 1.61259 0.346939
+17 0.99 1.13849 0.428571
+18 1.05 0.506063 0.469388
+19 1.11 0.226422 0.489796
+20 1.17 0.8152 0.571429
+21 1.23 1.29084 0.714286
+22 1.29 1.00592 0.836735
+23 1.35 1.07159 0.979592
+24 1.41 0.982348 1.12245
+25 1.47 0.903804 1.26531
+26 1.53 0.834316 1.40816
+27 1.59 0.662181 1.53061
+28 1.65 0.922354 1.71429
+29 1.71 1.43128 2.02041
+30 1.77 0.62342 2.16327
+31 1.83 1.08311 2.42857
+32 1.89 0.546775 2.57143
+33 1.95 0.733783 2.77551
+34 2.01 0.759695 3
+35 2.07 1.04189 3.32653
+36 2.13 0.799515 3.59184
+37 2.19 0.989019 3.93878
+38 2.25 1.65349 4.55102
+39 2.31 0.993519 4.93878
+40 2.37 0.844501 5.28571
+41 2.43 0.897822 5.67347
+42 2.49 1.1251 6.18367
+43 2.55 0.901135 6.61224
+44 2.61 0.983065 7.10204
+45 2.67 0.978521 7.61224
+46 2.73 0.673908 7.97959
+47 2.79 0.824468 8.44898
+48 2.85 1.03059 9.06122
+49 2.91 1.21919 9.81633
+50 2.97 0.727564 10.2857
+105450 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 0 0
+9 0.51 0 0
+10 0.57 0.858066 0.0204082
+11 0.63 0.702525 0.0408163
+12 0.69 0.585732 0.0612245
+13 0.75 1.48744 0.122449
+14 0.81 0.850222 0.163265
+15 0.87 0.737039 0.204082
+16 0.93 0.645037 0.244898
+17 0.99 0.853865 0.306122
+18 1.05 1.26516 0.408163
+19 1.11 0 0.408163
+20 1.17 0.8152 0.489796
+21 1.23 0.737623 0.571429
+22 1.29 1.50888 0.755102
+23 1.35 0.765424 0.857143
+24 1.41 0.701677 0.959184
+25 1.47 0.774689 1.08163
+26 1.53 1.07269 1.26531
+27 1.59 1.214 1.4898
+28 1.65 1.33229 1.7551
+29 1.71 0.667932 1.89796
+30 1.77 1.06872 2.14286
+31 1.83 1.49969 2.5102
+32 1.89 0.781108 2.71429
+33 1.95 0.880539 2.95918
+34 2.01 1.17407 3.30612
+35 2.07 0.976768 3.61224
+36 2.13 0.984018 3.93878
+37 2.19 1.10537 4.32653
+38 2.25 1.21256 4.77551
+39 2.31 0.836648 5.10204
+40 2.37 0.695471 5.38776
+41 2.43 1.08684 5.85714
+42 2.49 0.945085 6.28571
+43 2.55 1.02987 6.77551
+44 2.61 1.35171 7.44898
+45 2.67 0.93938 7.93878
+46 2.73 1.01086 8.4898
+47 2.79 1.14709 9.14286
+48 2.85 0.687061 9.55102
+49 2.91 1.08739 10.2245
+50 2.97 1.07553 10.9184
+105500 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 0 0
+9 0.51 0 0
+10 0.57 1.71613 0.0408163
+11 0.63 0.702525 0.0612245
+12 0.69 0.585732 0.0816327
+13 0.75 0.991624 0.122449
+14 0.81 1.27533 0.183673
+15 0.87 1.47408 0.265306
+16 0.93 0 0.265306
+17 0.99 0.569243 0.306122
+18 1.05 0.759094 0.367347
+19 1.11 0.452845 0.408163
+20 1.17 0.6114 0.469388
+21 1.23 0.368812 0.510204
+22 1.29 1.00592 0.632653
+23 1.35 1.37776 0.816327
+24 1.41 0.701677 0.918367
+25 1.47 1.03292 1.08163
+26 1.53 1.54944 1.34694
+27 1.59 0.993271 1.53061
+28 1.65 0.614903 1.65306
+29 1.71 1.04961 1.87755
+30 1.77 1.3359 2.18367
+31 1.83 0.999796 2.42857
+32 1.89 0.859219 2.65306
+33 1.95 0.807161 2.87755
+34 2.01 0.897822 3.14286
+35 2.07 1.30236 3.55102
+36 2.13 0.984018 3.87755
+37 2.19 0.872664 4.18367
+38 2.25 1.15744 4.61224
+39 2.31 0.679776 4.87755
+40 2.37 0.943854 5.26531
+41 2.43 0.75606 5.59184
+42 2.49 0.810072 5.95918
+43 2.55 1.07278 6.46939
+44 2.61 1.10595 7.02041
+45 2.67 0.861099 7.46939
+46 2.73 1.0483 8.04082
+47 2.79 1.29047 8.77551
+48 2.85 1.13365 9.44898
+49 2.91 1.08739 10.1224
+50 2.97 0.948997 10.7347
+105550 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 0 0
+9 0.51 0 0
+10 0.57 0 0
+11 0.63 0.702525 0.0204082
+12 0.69 0.585732 0.0408163
+13 0.75 1.48744 0.102041
+14 0.81 0.425111 0.122449
+15 0.87 0.737039 0.163265
+16 0.93 1.29007 0.244898
+17 0.99 1.42311 0.346939
+18 1.05 0.506063 0.387755
+19 1.11 0.90569 0.469388
+20 1.17 0.8152 0.55102
+21 1.23 1.84406 0.755102
+22 1.29 1.34123 0.918367
+23 1.35 0.612339 1
+24 1.41 0.701677 1.10204
+25 1.47 0.516459 1.18367
+26 1.53 1.19188 1.38776
+27 1.59 1.10363 1.59184
+28 1.65 0.922354 1.77551
+29 1.71 0.954189 1.97959
+30 1.77 1.15778 2.2449
+31 1.83 0.916479 2.46939
+32 1.89 1.24977 2.79592
+33 1.95 1.39419 3.18367
+34 2.01 0.966885 3.46939
+35 2.07 0.91165 3.7551
+36 2.13 0.861016 4.04082
+37 2.19 1.33808 4.5102
+38 2.25 0.716512 4.77551
+39 2.31 1.0981 5.20408
+40 2.37 0.943854 5.59184
+41 2.43 1.03958 6.04082
+42 2.49 0.585052 6.30612
+43 2.55 1.24442 6.89796
+44 2.61 0.77826 7.28571
+45 2.67 0.782817 7.69388
+46 2.73 1.19806 8.34694
+47 2.79 1.11124 8.97959
+48 2.85 0.687061 9.38776
+49 2.91 0.955581 9.97959
+50 2.97 0.98063 10.6122
+105600 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 1.37595 0.0204082
+9 0.51 0 0.0204082
+10 0.57 0 0.0204082
+11 0.63 0 0.0204082
+12 0.69 1.17146 0.0612245
+13 0.75 0 0.0612245
+14 0.81 0 0.0612245
+15 0.87 0.737039 0.102041
+16 0.93 0.967555 0.163265
+17 0.99 1.13849 0.244898
+18 1.05 0.759094 0.306122
+19 1.11 1.13211 0.408163
+20 1.17 1.019 0.510204
+21 1.23 0.737623 0.591837
+22 1.29 1.34123 0.755102
+23 1.35 1.07159 0.897959
+24 1.41 1.54369 1.12245
+25 1.47 1.42026 1.34694
+26 1.53 1.19188 1.55102
+27 1.59 1.54509 1.83673
+28 1.65 0.307451 1.89796
+29 1.71 1.04961 2.12245
+30 1.77 0.80154 2.30612
+31 1.83 1.16643 2.59184
+32 1.89 0.702997 2.77551
+33 1.95 0.733783 2.97959
+34 2.01 0.966885 3.26531
+35 2.07 0.651178 3.46939
+36 2.13 1.35303 3.91837
+37 2.19 1.16355 4.32653
+38 2.25 1.26768 4.79592
+39 2.31 0.836648 5.12245
+40 2.37 0.99353 5.53061
+41 2.43 1.08684 6
+42 2.49 0.945085 6.42857
+43 2.55 1.02987 6.91837
+44 2.61 0.737299 7.28571
+45 2.67 1.52649 8.08163
+46 2.73 1.4227 8.85714
+47 2.79 1.14709 9.5102
+48 2.85 1.0993 10.1633
+49 2.91 0.92263 10.7347
+50 2.97 0.948997 11.3469
+105650 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 6.28475 0.0204082
+5 0.27 0 0.0204082
+6 0.33 0 0.0204082
+7 0.39 1.83099 0.0408163
+8 0.45 0 0.0408163
+9 0.51 0 0.0408163
+10 0.57 0 0.0408163
+11 0.63 0.702525 0.0612245
+12 0.69 1.17146 0.102041
+13 0.75 0.495812 0.122449
+14 0.81 1.70044 0.204082
+15 0.87 0 0.204082
+16 0.93 0.967555 0.265306
+17 0.99 1.70773 0.387755
+18 1.05 1.26516 0.489796
+19 1.11 1.58496 0.632653
+20 1.17 0.6114 0.693878
+21 1.23 0.922029 0.795918
+22 1.29 0.838269 0.897959
+23 1.35 1.07159 1.04082
+24 1.41 0.140335 1.06122
+25 1.47 0.516459 1.14286
+26 1.53 0.834316 1.28571
+27 1.59 0.662181 1.40816
+28 1.65 0.819871 1.57143
+29 1.71 0.763351 1.73469
+30 1.77 0.979661 1.95918
+31 1.83 0.833163 2.16327
+32 1.89 1.09355 2.44898
+33 1.95 0.733783 2.65306
+34 2.01 1.51939 3.10204
+35 2.07 1.107 3.44898
+36 2.13 1.10702 3.81633
+37 2.19 1.10537 4.20408
+38 2.25 0.992094 4.57143
+39 2.31 0.941229 4.93878
+40 2.37 0.844501 5.28571
+41 2.43 1.18134 5.79592
+42 2.49 1.03509 6.26531
+43 2.55 1.5448 7
+44 2.61 1.10595 7.55102
+45 2.67 1.01766 8.08163
+46 2.73 0.898544 8.57143
+47 2.79 0.681082 8.95918
+48 2.85 1.06494 9.59184
+49 2.91 1.05443 10.2449
+50 2.97 0.854097 10.7959
+105700 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 1.83099 0.0204082
+8 0.45 1.37595 0.0408163
+9 0.51 0 0.0408163
+10 0.57 0.858066 0.0612245
+11 0.63 0.702525 0.0816327
+12 0.69 1.7572 0.142857
+13 0.75 0 0.142857
+14 0.81 0.850222 0.183673
+15 0.87 1.8426 0.285714
+16 0.93 0.967555 0.346939
+17 0.99 1.13849 0.428571
+18 1.05 0.759094 0.489796
+19 1.11 0.452845 0.530612
+20 1.17 1.019 0.632653
+21 1.23 1.10644 0.755102
+22 1.29 0.502961 0.816327
+23 1.35 0.918509 0.938776
+24 1.41 0.701677 1.04082
+25 1.47 0.387344 1.10204
+26 1.53 0.59594 1.20408
+27 1.59 0.220727 1.2449
+28 1.65 1.12732 1.46939
+29 1.71 1.04961 1.69388
+30 1.77 0.80154 1.87755
+31 1.83 0.916479 2.10204
+32 1.89 0.702997 2.28571
+33 1.95 1.24743 2.63265
+34 2.01 0.690632 2.83673
+35 2.07 1.107 3.18367
+36 2.13 1.10702 3.55102
+37 2.19 0.523598 3.73469
+38 2.25 1.10233 4.14286
+39 2.31 1.0981 4.57143
+40 2.37 1.09288 5.02041
+41 2.43 1.03958 5.46939
+42 2.49 1.1251 5.97959
+43 2.55 0.815313 6.36735
+44 2.61 1.55652 7.14286
+45 2.67 1.21337 7.77551
+46 2.73 1.19806 8.42857
+47 2.79 0.860314 8.91837
+48 2.85 1.30542 9.69388
+49 2.91 1.08739 10.3673
+50 2.97 0.98063 11
+105750 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 0 0
+9 0.51 1.07159 0.0204082
+10 0.57 0 0.0204082
+11 0.63 0 0.0204082
+12 0.69 0.585732 0.0408163
+13 0.75 0 0.0408163
+14 0.81 0.425111 0.0612245
+15 0.87 0.368519 0.0816327
+16 0.93 1.61259 0.183673
+17 0.99 0 0.183673
+18 1.05 0.759094 0.244898
+19 1.11 0.679267 0.306122
+20 1.17 0.6114 0.367347
+21 1.23 1.29084 0.510204
+22 1.29 1.00592 0.632653
+23 1.35 1.22468 0.795918
+24 1.41 0.561342 0.877551
+25 1.47 0.903804 1.02041
+26 1.53 0.834316 1.16327
+27 1.59 1.65545 1.46939
+28 1.65 1.22981 1.71429
+29 1.71 0.667932 1.85714
+30 1.77 0.979661 2.08163
+31 1.83 1.16643 2.36735
+32 1.89 0.859219 2.59184
+33 1.95 1.0273 2.87755
+34 2.01 1.10501 3.20408
+35 2.07 0.455825 3.34694
+36 2.13 1.53753 3.85714
+37 2.19 1.10537 4.2449
+38 2.25 1.10233 4.65306
+39 2.31 0.836648 4.97959
+40 2.37 0.844501 5.32653
+41 2.43 1.08684 5.79592
+42 2.49 0.945085 6.22449
+43 2.55 0.772402 6.59184
+44 2.61 1.14691 7.16327
+45 2.67 0.821958 7.59184
+46 2.73 1.01086 8.14286
+47 2.79 1.07539 8.7551
+48 2.85 0.755767 9.20408
+49 2.91 0.988533 9.81633
+50 2.97 1.36023 10.6939
+105800 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 0 0
+9 0.51 1.07159 0.0204082
+10 0.57 0 0.0204082
+11 0.63 0.702525 0.0408163
+12 0.69 0.585732 0.0612245
+13 0.75 0.991624 0.102041
+14 0.81 0.425111 0.122449
+15 0.87 0.737039 0.163265
+16 0.93 0 0.163265
+17 0.99 0.853865 0.22449
+18 1.05 1.01213 0.306122
+19 1.11 0.452845 0.346939
+20 1.17 0.8152 0.428571
+21 1.23 1.29084 0.571429
+22 1.29 0.167654 0.591837
+23 1.35 0.459254 0.653061
+24 1.41 1.40335 0.857143
+25 1.47 1.03292 1.02041
+26 1.53 0.715128 1.14286
+27 1.59 0.551817 1.2449
+28 1.65 0.922354 1.42857
+29 1.71 0.572513 1.55102
+30 1.77 1.06872 1.79592
+31 1.83 1.24974 2.10204
+32 1.89 1.17166 2.40816
+33 1.95 1.10067 2.71429
+34 2.01 0.690632 2.91837
+35 2.07 1.04189 3.2449
+36 2.13 0.861016 3.53061
+37 2.19 1.16355 3.93878
+38 2.25 0.771629 4.22449
+39 2.31 0.575195 4.44898
+40 2.37 1.24191 4.95918
+41 2.43 0.945075 5.36735
+42 2.49 1.30512 5.95918
+43 2.55 1.37316 6.61224
+44 2.61 1.06499 7.14286
+45 2.67 0.90024 7.61224
+46 2.73 0.935984 8.12245
+47 2.79 0.896161 8.63265
+48 2.85 1.30542 9.40816
+49 2.91 0.988533 10.0204
+50 2.97 0.854097 10.5714
+105850 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 0 0
+9 0.51 0 0
+10 0.57 0.858066 0.0204082
+11 0.63 0 0.0204082
+12 0.69 0.585732 0.0408163
+13 0.75 0 0.0408163
+14 0.81 1.27533 0.102041
+15 0.87 1.8426 0.204082
+16 0.93 0 0.204082
+17 0.99 0.569243 0.244898
+18 1.05 0.253031 0.265306
+19 1.11 0.90569 0.346939
+20 1.17 1.4266 0.489796
+21 1.23 1.10644 0.612245
+22 1.29 0.167654 0.632653
+23 1.35 0.612339 0.714286
+24 1.41 0.982348 0.857143
+25 1.47 0.516459 0.938776
+26 1.53 0.834316 1.08163
+27 1.59 0.772544 1.22449
+28 1.65 1.02484 1.42857
+29 1.71 1.04961 1.65306
+30 1.77 0.71248 1.81633
+31 1.83 0.916479 2.04082
+32 1.89 1.32788 2.38776
+33 1.95 0.953918 2.65306
+34 2.01 0.828758 2.89796
+35 2.07 1.17212 3.26531
+36 2.13 0.922517 3.57143
+37 2.19 0.930841 3.89796
+38 2.25 0.936978 4.2449
+39 2.31 0.836648 4.57143
+40 2.37 1.14256 5.04082
+41 2.43 1.13409 5.53061
+42 2.49 1.03509 6
+43 2.55 1.11569 6.53061
+44 2.61 0.737299 6.89796
+45 2.67 1.17423 7.5102
+46 2.73 0.59903 7.83673
+47 2.79 1.21878 8.53061
+48 2.85 1.03059 9.14286
+49 2.91 0.889679 9.69388
+50 2.97 1.0439 10.3673
+105900 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 1.37595 0.0204082
+9 0.51 0 0.0204082
+10 0.57 0 0.0204082
+11 0.63 1.40505 0.0612245
+12 0.69 1.7572 0.122449
+13 0.75 1.98325 0.204082
+14 0.81 0 0.204082
+15 0.87 1.47408 0.285714
+16 0.93 0 0.285714
+17 0.99 1.13849 0.367347
+18 1.05 1.26516 0.469388
+19 1.11 1.58496 0.612245
+20 1.17 1.4266 0.755102
+21 1.23 0.553218 0.816327
+22 1.29 1.84419 1.04082
+23 1.35 0.153085 1.06122
+24 1.41 0.842013 1.18367
+25 1.47 0.516459 1.26531
+26 1.53 0.953504 1.42857
+27 1.59 0.993271 1.61224
+28 1.65 0.922354 1.79592
+29 1.71 0.954189 2
+30 1.77 1.24684 2.28571
+31 1.83 0.66653 2.44898
+32 1.89 0.781108 2.65306
+33 1.95 1.0273 2.93878
+34 2.01 0.966885 3.22449
+35 2.07 1.49771 3.69388
+36 2.13 1.10702 4.06122
+37 2.19 0.930841 4.38776
+38 2.25 0.881861 4.71429
+39 2.31 1.04581 5.12245
+40 2.37 0.645795 5.38776
+41 2.43 1.27585 5.93878
+42 2.49 0.990089 6.38776
+43 2.55 0.686579 6.71429
+44 2.61 1.02403 7.22449
+45 2.67 1.0568 7.77551
+46 2.73 0.973423 8.30612
+47 2.79 0.537696 8.61224
+48 2.85 0.858826 9.12245
+49 2.91 0.856728 9.65306
+50 2.97 0.98063 10.2857
+105950 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 3.66198 0.0408163
+8 0.45 0 0.0408163
+9 0.51 1.07159 0.0612245
+10 0.57 0 0.0612245
+11 0.63 1.40505 0.102041
+12 0.69 0.585732 0.122449
+13 0.75 0.991624 0.163265
+14 0.81 1.27533 0.22449
+15 0.87 0.368519 0.244898
+16 0.93 1.29007 0.326531
+17 0.99 0.853865 0.387755
+18 1.05 1.26516 0.489796
+19 1.11 0.452845 0.530612
+20 1.17 1.019 0.632653
+21 1.23 1.29084 0.77551
+22 1.29 0.670615 0.857143
+23 1.35 1.22468 1.02041
+24 1.41 0.842013 1.14286
+25 1.47 1.54938 1.38776
+26 1.53 0.834316 1.53061
+27 1.59 0.882908 1.69388
+28 1.65 1.02484 1.89796
+29 1.71 0.477094 2
+30 1.77 1.3359 2.30612
+31 1.83 0.916479 2.53061
+32 1.89 0.859219 2.7551
+33 1.95 1.10067 3.06122
+34 2.01 0.759695 3.28571
+35 2.07 0.91165 3.57143
+36 2.13 1.16852 3.95918
+37 2.19 0.465421 4.12245
+38 2.25 1.15744 4.55102
+39 2.31 0.888938 4.89796
+40 2.37 0.645795 5.16327
+41 2.43 0.945075 5.57143
+42 2.49 1.0801 6.06122
+43 2.55 1.1586 6.61224
+44 2.61 1.18787 7.20408
+45 2.67 1.0568 7.7551
+46 2.73 1.0483 8.32653
+47 2.79 1.07539 8.93878
+48 2.85 1.06494 9.57143
+49 2.91 0.889679 10.1224
+50 2.97 0.948997 10.7347
+106000 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 1.37595 0.0204082
+9 0.51 1.07159 0.0408163
+10 0.57 0 0.0408163
+11 0.63 1.40505 0.0816327
+12 0.69 0.585732 0.102041
+13 0.75 0.495812 0.122449
+14 0.81 0.850222 0.163265
+15 0.87 2.57964 0.306122
+16 0.93 0.322518 0.326531
+17 0.99 1.13849 0.408163
+18 1.05 1.26516 0.510204
+19 1.11 0.90569 0.591837
+20 1.17 0.6114 0.653061
+21 1.23 0.368812 0.693878
+22 1.29 1.34123 0.857143
+23 1.35 1.07159 1
+24 1.41 0.842013 1.12245
+25 1.47 0.387344 1.18367
+26 1.53 0.834316 1.32653
+27 1.59 0.772544 1.46939
+28 1.65 0.614903 1.59184
+29 1.71 0.763351 1.7551
+30 1.77 1.06872 2
+31 1.83 0.583214 2.14286
+32 1.89 1.09355 2.42857
+33 1.95 1.39419 2.81633
+34 2.01 1.38126 3.22449
+35 2.07 1.36747 3.65306
+36 2.13 0.615011 3.85714
+37 2.19 0.814486 4.14286
+38 2.25 1.32279 4.63265
+39 2.31 0.784357 4.93878
+40 2.37 0.794824 5.26531
+41 2.43 0.803314 5.61224
+42 2.49 0.945085 6.04082
+43 2.55 0.986958 6.5102
+44 2.61 1.22883 7.12245
+45 2.67 0.93938 7.61224
+46 2.73 1.16062 8.2449
+47 2.79 1.18293 8.91837
+48 2.85 1.23671 9.65306
+49 2.91 0.790826 10.1429
+50 2.97 1.01226 10.7959
+106050 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 1.83099 0.0204082
+8 0.45 1.37595 0.0408163
+9 0.51 0 0.0408163
+10 0.57 0 0.0408163
+11 0.63 0 0.0408163
+12 0.69 1.17146 0.0816327
+13 0.75 0.991624 0.122449
+14 0.81 0.425111 0.142857
+15 0.87 1.8426 0.244898
+16 0.93 0.967555 0.306122
+17 0.99 1.42311 0.408163
+18 1.05 1.26516 0.510204
+19 1.11 1.13211 0.612245
+20 1.17 0.6114 0.673469
+21 1.23 0.922029 0.77551
+22 1.29 0.670615 0.857143
+23 1.35 0.918509 0.979592
+24 1.41 1.12268 1.14286
+25 1.47 1.42026 1.36735
+26 1.53 0.953504 1.53061
+27 1.59 0.772544 1.67347
+28 1.65 0.922354 1.85714
+29 1.71 1.24045 2.12245
+30 1.77 1.51402 2.46939
+31 1.83 1.08311 2.73469
+32 1.89 1.09355 3.02041
+33 1.95 1.0273 3.30612
+34 2.01 0.897822 3.57143
+35 2.07 0.781414 3.81633
+36 2.13 0.984018 4.14286
+37 2.19 0.930841 4.46939
+38 2.25 0.936978 4.81633
+39 2.31 0.575195 5.04082
+40 2.37 0.645795 5.30612
+41 2.43 1.2286 5.83673
+42 2.49 1.03509 6.30612
+43 2.55 1.02987 6.79592
+44 2.61 0.942104 7.26531
+45 2.67 0.93938 7.7551
+46 2.73 1.01086 8.30612
+47 2.79 0.932007 8.83673
+48 2.85 0.927532 9.38776
+49 2.91 1.25214 10.1633
+50 2.97 1.1388 10.898
+106100 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 0 0
+9 0.51 0 0
+10 0.57 0.858066 0.0204082
+11 0.63 0.702525 0.0408163
+12 0.69 1.17146 0.0816327
+13 0.75 1.48744 0.142857
+14 0.81 1.27533 0.204082
+15 0.87 1.8426 0.306122
+16 0.93 0.322518 0.326531
+17 0.99 1.13849 0.408163
+18 1.05 0.506063 0.44898
+19 1.11 1.35853 0.571429
+20 1.17 0.4076 0.612245
+21 1.23 0.184406 0.632653
+22 1.29 1.34123 0.795918
+23 1.35 0.918509 0.918367
+24 1.41 0.701677 1.02041
+25 1.47 0.774689 1.14286
+26 1.53 1.90701 1.46939
+27 1.59 1.76582 1.79592
+28 1.65 1.43477 2.08163
+29 1.71 0.667932 2.22449
+30 1.77 0.979661 2.44898
+31 1.83 1.58301 2.83673
+32 1.89 1.17166 3.14286
+33 1.95 0.587026 3.30612
+34 2.01 0.759695 3.53061
+35 2.07 1.30236 3.93878
+36 2.13 0.922517 4.2449
+37 2.19 1.51262 4.77551
+38 2.25 0.992094 5.14286
+39 2.31 0.941229 5.5102
+40 2.37 1.19224 6
+41 2.43 0.75606 6.32653
+42 2.49 0.945085 6.7551
+43 2.55 1.1586 7.30612
+44 2.61 0.737299 7.67347
+45 2.67 1.17423 8.28571
+46 2.73 0.898544 8.77551
+47 2.79 0.824468 9.2449
+48 2.85 0.996238 9.83673
+49 2.91 1.08739 10.5102
+50 2.97 1.07553 11.2041
+106150 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 0 0
+9 0.51 1.07159 0.0204082
+10 0.57 0.858066 0.0408163
+11 0.63 0 0.0408163
+12 0.69 1.7572 0.102041
+13 0.75 1.48744 0.163265
+14 0.81 1.27533 0.22449
+15 0.87 0.737039 0.265306
+16 0.93 0.645037 0.306122
+17 0.99 1.13849 0.387755
+18 1.05 0.506063 0.428571
+19 1.11 0.452845 0.469388
+20 1.17 0.4076 0.510204
+21 1.23 1.65965 0.693878
+22 1.29 1.17358 0.836735
+23 1.35 0.918509 0.959184
+24 1.41 0.421006 1.02041
+25 1.47 1.16203 1.20408
+26 1.53 0.953504 1.36735
+27 1.59 1.10363 1.57143
+28 1.65 0.717387 1.71429
+29 1.71 0.85877 1.89796
+30 1.77 1.42496 2.22449
+31 1.83 1.16643 2.5102
+32 1.89 1.01544 2.77551
+33 1.95 0.807161 3
+34 2.01 1.45033 3.42857
+35 2.07 1.17212 3.79592
+36 2.13 0.984018 4.12245
+37 2.19 1.0472 4.4898
+38 2.25 0.60628 4.71429
+39 2.31 0.522905 4.91837
+40 2.37 1.39094 5.4898
+41 2.43 0.945075 5.89796
+42 2.49 1.21511 6.44898
+43 2.55 1.02987 6.93878
+44 2.61 1.39268 7.63265
+45 2.67 0.782817 8.04082
+46 2.73 1.27294 8.73469
+47 2.79 0.824468 9.20408
+48 2.85 0.755767 9.65306
+49 2.91 0.659022 10.0612
+50 2.97 1.01226 10.7143
+106200 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 0 0
+9 0.51 1.07159 0.0204082
+10 0.57 0.858066 0.0408163
+11 0.63 1.40505 0.0816327
+12 0.69 0.585732 0.102041
+13 0.75 0.991624 0.142857
+14 0.81 0.850222 0.183673
+15 0.87 2.21112 0.306122
+16 0.93 0.967555 0.367347
+17 0.99 0.853865 0.428571
+18 1.05 0.506063 0.469388
+19 1.11 2.0378 0.653061
+20 1.17 0.4076 0.693878
+21 1.23 0.922029 0.795918
+22 1.29 1.17358 0.938776
+23 1.35 0.918509 1.06122
+24 1.41 0.421006 1.12245
+25 1.47 1.03292 1.28571
+26 1.53 0.953504 1.44898
+27 1.59 1.10363 1.65306
+28 1.65 1.02484 1.85714
+29 1.71 0.667932 2
+30 1.77 0.71248 2.16327
+31 1.83 0.583214 2.30612
+32 1.89 1.24977 2.63265
+33 1.95 1.0273 2.91837
+34 2.01 0.966885 3.20408
+35 2.07 1.36747 3.63265
+36 2.13 1.35303 4.08163
+37 2.19 0.872664 4.38776
+38 2.25 0.992094 4.7551
+39 2.31 0.836648 5.08163
+40 2.37 0.943854 5.46939
+41 2.43 0.75606 5.79592
+42 2.49 1.1701 6.32653
+43 2.55 0.858224 6.73469
+44 2.61 0.614416 7.04082
+45 2.67 1.0568 7.59184
+46 2.73 1.34782 8.32653
+47 2.79 0.896161 8.83673
+48 2.85 0.893179 9.36735
+49 2.91 1.38395 10.2245
+50 2.97 0.790831 10.7347
+106250 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 2.55534 0.0204082
+7 0.39 0 0.0204082
+8 0.45 1.37595 0.0408163
+9 0.51 0 0.0408163
+10 0.57 1.71613 0.0816327
+11 0.63 0.702525 0.102041
+12 0.69 1.17146 0.142857
+13 0.75 0.991624 0.183673
+14 0.81 0.425111 0.204082
+15 0.87 1.8426 0.306122
+16 0.93 1.93511 0.428571
+17 0.99 0 0.428571
+18 1.05 0.759094 0.489796
+19 1.11 1.35853 0.612245
+20 1.17 0.8152 0.693878
+21 1.23 0.922029 0.795918
+22 1.29 1.34123 0.959184
+23 1.35 0.153085 0.979592
+24 1.41 0.701677 1.08163
+25 1.47 0.903804 1.22449
+26 1.53 0.59594 1.32653
+27 1.59 1.214 1.55102
+28 1.65 1.02484 1.7551
+29 1.71 0.667932 1.89796
+30 1.77 0.890601 2.10204
+31 1.83 0.916479 2.32653
+32 1.89 1.56222 2.73469
+33 1.95 0.807161 2.95918
+34 2.01 1.10501 3.28571
+35 2.07 1.04189 3.61224
+36 2.13 0.799515 3.87755
+37 2.19 1.0472 4.2449
+38 2.25 0.992094 4.61224
+39 2.31 0.679776 4.87755
+40 2.37 1.04321 5.30612
+41 2.43 1.18134 5.81633
+42 2.49 1.1251 6.32653
+43 2.55 0.986958 6.79592
+44 2.61 0.819221 7.20408
+45 2.67 0.665394 7.55102
+46 2.73 1.0483 8.12245
+47 2.79 0.932007 8.65306
+48 2.85 0.961885 9.22449
+49 2.91 0.823777 9.73469
+50 2.97 1.36023 10.6122
+106300 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 1.37595 0.0204082
+9 0.51 1.07159 0.0408163
+10 0.57 0.858066 0.0612245
+11 0.63 0.702525 0.0816327
+12 0.69 0 0.0816327
+13 0.75 0 0.0816327
+14 0.81 0 0.0816327
+15 0.87 0.368519 0.102041
+16 0.93 0.967555 0.163265
+17 0.99 0 0.163265
+18 1.05 1.01213 0.244898
+19 1.11 0.452845 0.285714
+20 1.17 1.019 0.387755
+21 1.23 0.368812 0.428571
+22 1.29 0.670615 0.510204
+23 1.35 1.07159 0.653061
+24 1.41 0.982348 0.795918
+25 1.47 1.29115 1
+26 1.53 1.31107 1.22449
+27 1.59 0.882908 1.38776
+28 1.65 1.02484 1.59184
+29 1.71 0.954189 1.79592
+30 1.77 0.979661 2.02041
+31 1.83 0.999796 2.26531
+32 1.89 1.17166 2.57143
+33 1.95 0.953918 2.83673
+34 2.01 0.828758 3.08163
+35 2.07 0.976768 3.38776
+36 2.13 1.10702 3.7551
+37 2.19 0.814486 4.04082
+38 2.25 1.04721 4.42857
+39 2.31 0.993519 4.81633
+40 2.37 1.09288 5.26531
+41 2.43 1.27585 5.81633
+42 2.49 1.0801 6.30612
+43 2.55 0.858224 6.71429
+44 2.61 1.31075 7.36735
+45 2.67 1.0568 7.91837
+46 2.73 1.01086 8.46939
+47 2.79 0.752775 8.89796
+48 2.85 0.893179 9.42857
+49 2.91 1.02148 10.0612
+50 2.97 0.948997 10.6735
+106350 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 0 0
+9 0.51 0 0
+10 0.57 0.858066 0.0204082
+11 0.63 0 0.0204082
+12 0.69 1.17146 0.0612245
+13 0.75 0.495812 0.0816327
+14 0.81 2.12556 0.183673
+15 0.87 1.10556 0.244898
+16 0.93 0.322518 0.265306
+17 0.99 0.853865 0.326531
+18 1.05 1.01213 0.408163
+19 1.11 0.226422 0.428571
+20 1.17 0.2038 0.44898
+21 1.23 0.737623 0.530612
+22 1.29 1.00592 0.653061
+23 1.35 1.37776 0.836735
+24 1.41 0.982348 0.979592
+25 1.47 0.903804 1.12245
+26 1.53 0.476752 1.20408
+27 1.59 0.551817 1.30612
+28 1.65 0.512419 1.40816
+29 1.71 0.85877 1.59184
+30 1.77 1.3359 1.89796
+31 1.83 0.999796 2.14286
+32 1.89 1.24977 2.46939
+33 1.95 0.953918 2.73469
+34 2.01 0.966885 3.02041
+35 2.07 1.30236 3.42857
+36 2.13 0.984018 3.7551
+37 2.19 0.989019 4.10204
+38 2.25 0.936978 4.44898
+39 2.31 1.30726 4.95918
+40 2.37 1.14256 5.42857
+41 2.43 0.708807 5.73469
+42 2.49 1.1251 6.2449
+43 2.55 0.815313 6.63265
+44 2.61 1.18787 7.22449
+45 2.67 1.09594 7.79592
+46 2.73 0.861105 8.26531
+47 2.79 0.932007 8.79592
+48 2.85 0.755767 9.2449
+49 2.91 1.02148 9.87755
+50 2.97 1.07553 10.5714
+106400 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 0 0
+9 0.51 0 0
+10 0.57 1.71613 0.0408163
+11 0.63 0.702525 0.0612245
+12 0.69 0.585732 0.0816327
+13 0.75 0.495812 0.102041
+14 0.81 0 0.102041
+15 0.87 0.737039 0.142857
+16 0.93 0.645037 0.183673
+17 0.99 1.70773 0.306122
+18 1.05 0.759094 0.367347
+19 1.11 2.0378 0.55102
+20 1.17 1.2228 0.673469
+21 1.23 0.368812 0.714286
+22 1.29 1.17358 0.857143
+23 1.35 0.612339 0.938776
+24 1.41 0.842013 1.06122
+25 1.47 0.774689 1.18367
+26 1.53 0.834316 1.32653
+27 1.59 0.993271 1.5102
+28 1.65 1.12732 1.73469
+29 1.71 0.763351 1.89796
+30 1.77 0.890601 2.10204
+31 1.83 0.916479 2.32653
+32 1.89 0.781108 2.53061
+33 1.95 0.807161 2.7551
+34 2.01 0.621569 2.93878
+35 2.07 0.781414 3.18367
+36 2.13 1.53753 3.69388
+37 2.19 0.814486 3.97959
+38 2.25 1.10233 4.38776
+39 2.31 0.993519 4.77551
+40 2.37 0.695471 5.06122
+41 2.43 0.75606 5.38776
+42 2.49 1.03509 5.85714
+43 2.55 0.858224 6.26531
+44 2.61 1.02403 6.77551
+45 2.67 0.704535 7.14286
+46 2.73 1.12318 7.7551
+47 2.79 0.896161 8.26531
+48 2.85 1.13365 8.93878
+49 2.91 1.08739 9.61224
+50 2.97 0.98063 10.2449
+106450 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 0 0
+9 0.51 2.14319 0.0408163
+10 0.57 0 0.0408163
+11 0.63 1.40505 0.0816327
+12 0.69 0 0.0816327
+13 0.75 0 0.0816327
+14 0.81 2.97578 0.22449
+15 0.87 0.737039 0.265306
+16 0.93 1.29007 0.346939
+17 0.99 1.70773 0.469388
+18 1.05 1.26516 0.571429
+19 1.11 0.226422 0.591837
+20 1.17 0.4076 0.632653
+21 1.23 1.47525 0.795918
+22 1.29 1.00592 0.918367
+23 1.35 0.30617 0.959184
+24 1.41 0.982348 1.10204
+25 1.47 1.16203 1.28571
+26 1.53 1.07269 1.46939
+27 1.59 0.551817 1.57143
+28 1.65 1.02484 1.77551
+29 1.71 0.667932 1.91837
+30 1.77 0.80154 2.10204
+31 1.83 0.583214 2.2449
+32 1.89 1.09355 2.53061
+33 1.95 0.807161 2.7551
+34 2.01 1.10501 3.08163
+35 2.07 0.586061 3.26531
+36 2.13 0.984018 3.59184
+37 2.19 0.872664 3.89796
+38 2.25 0.826745 4.20408
+39 2.31 0.627486 4.44898
+40 2.37 0.496765 4.65306
+41 2.43 1.41761 5.26531
+42 2.49 1.0801 5.7551
+43 2.55 0.901135 6.18367
+44 2.61 0.901143 6.63265
+45 2.67 0.861099 7.08163
+46 2.73 1.27294 7.77551
+47 2.79 0.860314 8.26531
+48 2.85 1.168 8.95918
+49 2.91 0.757875 9.42857
+50 2.97 0.98063 10.0612
+106500 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 2.55534 0.0204082
+7 0.39 0 0.0204082
+8 0.45 0 0.0204082
+9 0.51 0 0.0204082
+10 0.57 0 0.0204082
+11 0.63 0 0.0204082
+12 0.69 0.585732 0.0408163
+13 0.75 0.991624 0.0816327
+14 0.81 0.850222 0.122449
+15 0.87 0.368519 0.142857
+16 0.93 0.645037 0.183673
+17 0.99 0.569243 0.22449
+18 1.05 0.253031 0.244898
+19 1.11 0.90569 0.326531
+20 1.17 1.2228 0.44898
+21 1.23 0.553218 0.510204
+22 1.29 0.335308 0.55102
+23 1.35 0.918509 0.673469
+24 1.41 0.701677 0.77551
+25 1.47 0.645574 0.877551
+26 1.53 1.43026 1.12245
+27 1.59 0.882908 1.28571
+28 1.65 0.922354 1.46939
+29 1.71 0.667932 1.61224
+30 1.77 0.80154 1.79592
+31 1.83 0.583214 1.93878
+32 1.89 1.09355 2.22449
+33 1.95 1.24743 2.57143
+34 2.01 0.897822 2.83673
+35 2.07 1.107 3.18367
+36 2.13 1.23002 3.59184
+37 2.19 1.10537 3.97959
+38 2.25 0.661396 4.22449
+39 2.31 1.04581 4.63265
+40 2.37 0.844501 4.97959
+41 2.43 1.18134 5.4898
+42 2.49 0.810072 5.85714
+43 2.55 0.986958 6.32653
+44 2.61 1.06499 6.85714
+45 2.67 1.01766 7.38776
+46 2.73 1.08574 7.97959
+47 2.79 0.932007 8.5102
+48 2.85 0.996238 9.10204
+49 2.91 1.12034 9.79592
+50 2.97 1.0439 10.4694
+106550 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 1.37595 0.0204082
+9 0.51 0 0.0204082
+10 0.57 0.858066 0.0408163
+11 0.63 2.10758 0.102041
+12 0.69 1.17146 0.142857
+13 0.75 0.495812 0.163265
+14 0.81 0.425111 0.183673
+15 0.87 0.368519 0.204082
+16 0.93 0.645037 0.244898
+17 0.99 1.13849 0.326531
+18 1.05 0.759094 0.387755
+19 1.11 1.35853 0.510204
+20 1.17 0.8152 0.591837
+21 1.23 1.10644 0.714286
+22 1.29 1.00592 0.836735
+23 1.35 1.07159 0.979592
+24 1.41 0.701677 1.08163
+25 1.47 0.25823 1.12245
+26 1.53 1.66863 1.40816
+27 1.59 0.551817 1.5102
+28 1.65 0.922354 1.69388
+29 1.71 0.954189 1.89796
+30 1.77 0.62342 2.04082
+31 1.83 0.583214 2.18367
+32 1.89 0.624886 2.34694
+33 1.95 1.10067 2.65306
+34 2.01 0.759695 2.87755
+35 2.07 0.390707 3
+36 2.13 0.922517 3.30612
+37 2.19 0.930841 3.63265
+38 2.25 0.826745 3.93878
+39 2.31 0.888938 4.28571
+40 2.37 0.943854 4.67347
+41 2.43 0.945075 5.08163
+42 2.49 0.900081 5.4898
+43 2.55 0.944046 5.93878
+44 2.61 1.55652 6.71429
+45 2.67 1.01766 7.2449
+46 2.73 0.973423 7.77551
+47 2.79 0.932007 8.30612
+48 2.85 1.33977 9.10204
+49 2.91 0.889679 9.65306
+50 2.97 1.1388 10.3878
+106600 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 0 0
+9 0.51 1.07159 0.0204082
+10 0.57 0.858066 0.0408163
+11 0.63 0.702525 0.0612245
+12 0.69 2.34293 0.142857
+13 0.75 0 0.142857
+14 0.81 0.425111 0.163265
+15 0.87 1.47408 0.244898
+16 0.93 1.61259 0.346939
+17 0.99 1.70773 0.469388
+18 1.05 1.51819 0.591837
+19 1.11 0.679267 0.653061
+20 1.17 1.2228 0.77551
+21 1.23 1.29084 0.918367
+22 1.29 0.838269 1.02041
+23 1.35 0.459254 1.08163
+24 1.41 1.40335 1.28571
+25 1.47 1.42026 1.5102
+26 1.53 0.715128 1.63265
+27 1.59 0.772544 1.77551
+28 1.65 1.02484 1.97959
+29 1.71 0.85877 2.16327
+30 1.77 0.71248 2.32653
+31 1.83 0.583214 2.46939
+32 1.89 0.624886 2.63265
+33 1.95 0.660405 2.81633
+34 2.01 0.690632 3.02041
+35 2.07 1.04189 3.34694
+36 2.13 1.10702 3.71429
+37 2.19 0.814486 4
+38 2.25 1.26768 4.46939
+39 2.31 1.0981 4.89796
+40 2.37 0.99353 5.30612
+41 2.43 0.897822 5.69388
+42 2.49 0.67506 6
+43 2.55 0.815313 6.38776
+44 2.61 0.983065 6.87755
+45 2.67 1.21337 7.5102
+46 2.73 1.01086 8.06122
+47 2.79 1.07539 8.67347
+48 2.85 1.13365 9.34694
+49 2.91 0.988533 9.95918
+50 2.97 1.07553 10.6531
+106650 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 2.55534 0.0204082
+7 0.39 0 0.0204082
+8 0.45 1.37595 0.0408163
+9 0.51 0 0.0408163
+10 0.57 0 0.0408163
+11 0.63 0 0.0408163
+12 0.69 0 0.0408163
+13 0.75 0.991624 0.0816327
+14 0.81 1.27533 0.142857
+15 0.87 0 0.142857
+16 0.93 0.322518 0.163265
+17 0.99 1.13849 0.244898
+18 1.05 0.506063 0.285714
+19 1.11 0.452845 0.326531
+20 1.17 1.019 0.428571
+21 1.23 0.922029 0.530612
+22 1.29 0.838269 0.632653
+23 1.35 1.37776 0.816327
+24 1.41 0.982348 0.959184
+25 1.47 0.645574 1.06122
+26 1.53 0.834316 1.20408
+27 1.59 1.10363 1.40816
+28 1.65 0.922354 1.59184
+29 1.71 1.71754 1.95918
+30 1.77 0.979661 2.18367
+31 1.83 0.833163 2.38776
+32 1.89 1.01544 2.65306
+33 1.95 0.807161 2.87755
+34 2.01 0.621569 3.06122
+35 2.07 0.91165 3.34694
+36 2.13 0.861016 3.63265
+37 2.19 0.872664 3.93878
+38 2.25 1.26768 4.40816
+39 2.31 1.15039 4.85714
+40 2.37 1.14256 5.32653
+41 2.43 0.897822 5.71429
+42 2.49 1.0801 6.20408
+43 2.55 0.815313 6.59184
+44 2.61 1.02403 7.10204
+45 2.67 0.782817 7.5102
+46 2.73 1.08574 8.10204
+47 2.79 0.896161 8.61224
+48 2.85 0.927532 9.16327
+49 2.91 1.05443 9.81633
+50 2.97 0.759197 10.3061
+106700 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 0 0
+9 0.51 0 0
+10 0.57 0.858066 0.0204082
+11 0.63 0.702525 0.0408163
+12 0.69 0 0.0408163
+13 0.75 0.495812 0.0612245
+14 0.81 0.850222 0.102041
+15 0.87 2.57964 0.244898
+16 0.93 0.967555 0.306122
+17 0.99 1.13849 0.387755
+18 1.05 0.759094 0.44898
+19 1.11 0.679267 0.510204
+20 1.17 1.2228 0.632653
+21 1.23 0.368812 0.673469
+22 1.29 0.335308 0.714286
+23 1.35 0.30617 0.755102
+24 1.41 0.280671 0.795918
+25 1.47 0.903804 0.938776
+26 1.53 0.357564 1
+27 1.59 1.98654 1.36735
+28 1.65 0.819871 1.53061
+29 1.71 1.43128 1.83673
+30 1.77 0.890601 2.04082
+31 1.83 1.33306 2.36735
+32 1.89 0.781108 2.57143
+33 1.95 1.0273 2.85714
+34 2.01 0.897822 3.12245
+35 2.07 1.04189 3.44898
+36 2.13 0.738014 3.69388
+37 2.19 1.33808 4.16327
+38 2.25 0.826745 4.46939
+39 2.31 1.51642 5.06122
+40 2.37 0.844501 5.40816
+41 2.43 0.992329 5.83673
+42 2.49 0.945085 6.26531
+43 2.55 0.815313 6.65306
+44 2.61 0.77826 7.04082
+45 2.67 1.21337 7.67347
+46 2.73 1.12318 8.28571
+47 2.79 0.932007 8.81633
+48 2.85 0.927532 9.36735
+49 2.91 1.25214 10.1429
+50 2.97 0.98063 10.7755
+106750 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 0 0
+9 0.51 1.07159 0.0204082
+10 0.57 0.858066 0.0408163
+11 0.63 0.702525 0.0612245
+12 0.69 0.585732 0.0816327
+13 0.75 0 0.0816327
+14 0.81 0.850222 0.122449
+15 0.87 1.47408 0.204082
+16 0.93 1.61259 0.306122
+17 0.99 0.284622 0.326531
+18 1.05 1.01213 0.408163
+19 1.11 1.13211 0.510204
+20 1.17 0.4076 0.55102
+21 1.23 1.10644 0.673469
+22 1.29 0.838269 0.77551
+23 1.35 0.459254 0.836735
+24 1.41 1.40335 1.04082
+25 1.47 1.03292 1.20408
+26 1.53 0.476752 1.28571
+27 1.59 0.551817 1.38776
+28 1.65 1.02484 1.59184
+29 1.71 1.14503 1.83673
+30 1.77 1.06872 2.08163
+31 1.83 0.499898 2.20408
+32 1.89 1.17166 2.5102
+33 1.95 0.513648 2.65306
+34 2.01 0.897822 2.91837
+35 2.07 0.91165 3.20408
+36 2.13 1.10702 3.57143
+37 2.19 0.639953 3.79592
+38 2.25 0.771629 4.08163
+39 2.31 1.25497 4.57143
+40 2.37 1.04321 5
+41 2.43 0.75606 5.32653
+42 2.49 1.03509 5.79592
+43 2.55 0.686579 6.12245
+44 2.61 1.14691 6.69388
+45 2.67 0.821958 7.12245
+46 2.73 1.08574 7.71429
+47 2.79 1.36216 8.4898
+48 2.85 0.893179 9.02041
+49 2.91 0.691973 9.44898
+50 2.97 1.20206 10.2245
+106800 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 1.37595 0.0204082
+9 0.51 0 0.0204082
+10 0.57 0.858066 0.0408163
+11 0.63 0.702525 0.0612245
+12 0.69 0 0.0612245
+13 0.75 0.991624 0.102041
+14 0.81 0.425111 0.122449
+15 0.87 1.8426 0.22449
+16 0.93 0.645037 0.265306
+17 0.99 0.569243 0.306122
+18 1.05 1.01213 0.387755
+19 1.11 0.679267 0.44898
+20 1.17 0.4076 0.489796
+21 1.23 0.737623 0.571429
+22 1.29 0.502961 0.632653
+23 1.35 0.918509 0.755102
+24 1.41 1.26302 0.938776
+25 1.47 0.516459 1.02041
+26 1.53 0.238376 1.06122
+27 1.59 1.43472 1.32653
+28 1.65 1.02484 1.53061
+29 1.71 0.85877 1.71429
+30 1.77 0.53436 1.83673
+31 1.83 1.24974 2.14286
+32 1.89 0.390554 2.2449
+33 1.95 1.10067 2.55102
+34 2.01 0.966885 2.83673
+35 2.07 0.781414 3.08163
+36 2.13 0.738014 3.32653
+37 2.19 0.930841 3.65306
+38 2.25 0.716512 3.91837
+39 2.31 1.30726 4.42857
+40 2.37 1.14256 4.89796
+41 2.43 1.03958 5.34694
+42 2.49 0.810072 5.71429
+43 2.55 1.24442 6.30612
+44 2.61 0.860182 6.73469
+45 2.67 1.0568 7.28571
+46 2.73 1.12318 7.89796
+47 2.79 1.0037 8.46939
+48 2.85 0.858826 8.97959
+49 2.91 1.05443 9.63265
+50 2.97 1.26533 10.449
+106850 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 0 0
+9 0.51 0 0
+10 0.57 0 0
+11 0.63 0 0
+12 0.69 0.585732 0.0204082
+13 0.75 0.991624 0.0612245
+14 0.81 0.425111 0.0816327
+15 0.87 1.47408 0.163265
+16 0.93 1.61259 0.265306
+17 0.99 0.284622 0.285714
+18 1.05 0.506063 0.326531
+19 1.11 0.452845 0.367347
+20 1.17 0.4076 0.408163
+21 1.23 0.368812 0.44898
+22 1.29 1.34123 0.612245
+23 1.35 0.765424 0.714286
+24 1.41 0.701677 0.816327
+25 1.47 1.29115 1.02041
+26 1.53 1.43026 1.26531
+27 1.59 1.214 1.4898
+28 1.65 0.717387 1.63265
+29 1.71 0.667932 1.77551
+30 1.77 1.15778 2.04082
+31 1.83 0.749847 2.22449
+32 1.89 0.937329 2.46939
+33 1.95 0.44027 2.59184
+34 2.01 0.552506 2.7551
+35 2.07 1.30236 3.16327
+36 2.13 0.984018 3.4898
+37 2.19 0.872664 3.79592
+38 2.25 1.10233 4.20408
+39 2.31 0.941229 4.57143
+40 2.37 1.53997 5.20408
+41 2.43 0.897822 5.59184
+42 2.49 0.765068 5.93878
+43 2.55 1.20151 6.5102
+44 2.61 1.26979 7.14286
+45 2.67 0.978521 7.65306
+46 2.73 1.0483 8.22449
+47 2.79 0.609389 8.57143
+48 2.85 0.996238 9.16327
+49 2.91 0.790826 9.65306
+50 2.97 1.20206 10.4286
+106900 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 0 0
+9 0.51 0 0
+10 0.57 0 0
+11 0.63 2.8101 0.0816327
+12 0.69 1.17146 0.122449
+13 0.75 0 0.122449
+14 0.81 0.850222 0.163265
+15 0.87 0.737039 0.204082
+16 0.93 0.322518 0.22449
+17 0.99 0.853865 0.285714
+18 1.05 0.506063 0.326531
+19 1.11 0 0.326531
+20 1.17 0.8152 0.408163
+21 1.23 1.65965 0.591837
+22 1.29 0.838269 0.693878
+23 1.35 1.07159 0.836735
+24 1.41 0.842013 0.959184
+25 1.47 0.387344 1.02041
+26 1.53 1.43026 1.26531
+27 1.59 1.214 1.4898
+28 1.65 0.717387 1.63265
+29 1.71 0.381676 1.71429
+30 1.77 0.979661 1.93878
+31 1.83 0.583214 2.08163
+32 1.89 0.546775 2.22449
+33 1.95 1.24743 2.57143
+34 2.01 0.828758 2.81633
+35 2.07 0.91165 3.10204
+36 2.13 1.47603 3.59184
+37 2.19 0.930841 3.91837
+38 2.25 0.716512 4.18367
+39 2.31 1.20268 4.65306
+40 2.37 0.99353 5.06122
+41 2.43 0.992329 5.4898
+42 2.49 1.30512 6.08163
+43 2.55 1.24442 6.67347
+44 2.61 1.06499 7.20408
+45 2.67 0.93938 7.69388
+46 2.73 0.823666 8.14286
+47 2.79 0.716929 8.55102
+48 2.85 0.893179 9.08163
+49 2.91 1.08739 9.7551
+50 2.97 0.854097 10.3061
+106950 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 0 0
+9 0.51 1.07159 0.0204082
+10 0.57 0.858066 0.0408163
+11 0.63 0.702525 0.0612245
+12 0.69 0.585732 0.0816327
+13 0.75 0 0.0816327
+14 0.81 1.27533 0.142857
+15 0.87 0.737039 0.183673
+16 0.93 0.645037 0.22449
+17 0.99 0.853865 0.285714
+18 1.05 1.01213 0.367347
+19 1.11 0.452845 0.408163
+20 1.17 0.2038 0.428571
+21 1.23 1.10644 0.55102
+22 1.29 0.167654 0.571429
+23 1.35 1.07159 0.714286
+24 1.41 0.701677 0.816327
+25 1.47 1.03292 0.979592
+26 1.53 1.54944 1.2449
+27 1.59 0.993271 1.42857
+28 1.65 0.922354 1.61224
+29 1.71 1.24045 1.87755
+30 1.77 0.71248 2.04082
+31 1.83 0.333265 2.12245
+32 1.89 0.702997 2.30612
+33 1.95 1.10067 2.61224
+34 2.01 1.24314 2.97959
+35 2.07 1.30236 3.38776
+36 2.13 1.04552 3.73469
+37 2.19 1.16355 4.14286
+38 2.25 0.826745 4.44898
+39 2.31 1.20268 4.91837
+40 2.37 0.99353 5.32653
+41 2.43 1.13409 5.81633
+42 2.49 0.720064 6.14286
+43 2.55 0.643668 6.44898
+44 2.61 0.77826 6.83673
+45 2.67 0.90024 7.30612
+46 2.73 1.08574 7.89796
+47 2.79 0.824468 8.36735
+48 2.85 0.79012 8.83673
+49 2.91 0.955581 9.42857
+50 2.97 1.0439 10.102
+107000 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 1.37595 0.0204082
+9 0.51 0 0.0204082
+10 0.57 0 0.0204082
+11 0.63 2.10758 0.0816327
+12 0.69 1.7572 0.142857
+13 0.75 0.991624 0.183673
+14 0.81 0 0.183673
+15 0.87 1.10556 0.244898
+16 0.93 0.322518 0.265306
+17 0.99 0.284622 0.285714
+18 1.05 0.759094 0.346939
+19 1.11 0.90569 0.428571
+20 1.17 1.6304 0.591837
+21 1.23 0.553218 0.653061
+22 1.29 0.670615 0.734694
+23 1.35 1.22468 0.897959
+24 1.41 1.26302 1.08163
+25 1.47 0.774689 1.20408
+26 1.53 0.59594 1.30612
+27 1.59 1.76582 1.63265
+28 1.65 0.819871 1.79592
+29 1.71 1.14503 2.04082
+30 1.77 0.890601 2.2449
+31 1.83 0.66653 2.40816
+32 1.89 1.09355 2.69388
+33 1.95 0.807161 2.91837
+34 2.01 0.759695 3.14286
+35 2.07 0.91165 3.42857
+36 2.13 1.23002 3.83673
+37 2.19 0.639953 4.06122
+38 2.25 0.826745 4.36735
+39 2.31 0.732067 4.65306
+40 2.37 0.99353 5.06122
+41 2.43 1.41761 5.67347
+42 2.49 0.945085 6.10204
+43 2.55 0.901135 6.53061
+44 2.61 1.14691 7.10204
+45 2.67 0.861099 7.55102
+46 2.73 0.786226 7.97959
+47 2.79 1.11124 8.61224
+48 2.85 1.13365 9.28571
+49 2.91 0.856728 9.81633
+50 2.97 0.822464 10.3469
+107050 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 1.37595 0.0204082
+9 0.51 0 0.0204082
+10 0.57 0 0.0204082
+11 0.63 0 0.0204082
+12 0.69 1.17146 0.0612245
+13 0.75 0.991624 0.102041
+14 0.81 0 0.102041
+15 0.87 2.21112 0.22449
+16 0.93 0.645037 0.265306
+17 0.99 0.569243 0.306122
+18 1.05 1.01213 0.387755
+19 1.11 0.679267 0.44898
+20 1.17 1.019 0.55102
+21 1.23 0.922029 0.653061
+22 1.29 0.838269 0.755102
+23 1.35 1.22468 0.918367
+24 1.41 1.12268 1.08163
+25 1.47 0.645574 1.18367
+26 1.53 0.834316 1.32653
+27 1.59 1.32436 1.57143
+28 1.65 1.02484 1.77551
+29 1.71 0.954189 1.97959
+30 1.77 1.06872 2.22449
+31 1.83 0.499898 2.34694
+32 1.89 0.390554 2.44898
+33 1.95 1.17405 2.77551
+34 2.01 1.03595 3.08163
+35 2.07 0.976768 3.38776
+36 2.13 0.922517 3.69388
+37 2.19 0.930841 4.02041
+38 2.25 1.37791 4.53061
+39 2.31 0.836648 4.85714
+40 2.37 0.546442 5.08163
+41 2.43 1.13409 5.57143
+42 2.49 0.765068 5.91837
+43 2.55 1.20151 6.4898
+44 2.61 1.26979 7.12245
+45 2.67 0.626254 7.44898
+46 2.73 0.935984 7.95918
+47 2.79 0.716929 8.36735
+48 2.85 0.755767 8.81633
+49 2.91 1.02148 9.44898
+50 2.97 0.88573 10.0204
+107100 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 0 0
+9 0.51 0 0
+10 0.57 0 0
+11 0.63 2.10758 0.0612245
+12 0.69 0.585732 0.0816327
+13 0.75 1.48744 0.142857
+14 0.81 1.27533 0.204082
+15 0.87 1.47408 0.285714
+16 0.93 0.645037 0.326531
+17 0.99 0.853865 0.387755
+18 1.05 0.506063 0.428571
+19 1.11 0.679267 0.489796
+20 1.17 0.4076 0.530612
+21 1.23 0.922029 0.632653
+22 1.29 1.00592 0.755102
+23 1.35 0.459254 0.816327
+24 1.41 1.12268 0.979592
+25 1.47 1.03292 1.14286
+26 1.53 0.59594 1.2449
+27 1.59 1.32436 1.4898
+28 1.65 0.512419 1.59184
+29 1.71 0.667932 1.73469
+30 1.77 1.15778 2
+31 1.83 0.416582 2.10204
+32 1.89 0.624886 2.26531
+33 1.95 0.807161 2.4898
+34 2.01 1.3122 2.87755
+35 2.07 0.781414 3.12245
+36 2.13 0.676513 3.34694
+37 2.19 0.698131 3.59184
+38 2.25 1.04721 3.97959
+39 2.31 0.941229 4.34694
+40 2.37 1.44062 4.93878
+41 2.43 0.945075 5.34694
+42 2.49 0.990089 5.79592
+43 2.55 0.901135 6.22449
+44 2.61 1.06499 6.7551
+45 2.67 0.978521 7.26531
+46 2.73 0.973423 7.79592
+47 2.79 0.716929 8.20408
+48 2.85 1.03059 8.81633
+49 2.91 1.15329 9.53061
+50 2.97 0.98063 10.1633
+107150 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 0 0
+9 0.51 0 0
+10 0.57 0.858066 0.0204082
+11 0.63 0.702525 0.0408163
+12 0.69 0.585732 0.0612245
+13 0.75 0 0.0612245
+14 0.81 0.850222 0.102041
+15 0.87 1.10556 0.163265
+16 0.93 1.61259 0.265306
+17 0.99 0 0.265306
+18 1.05 0.759094 0.326531
+19 1.11 0.452845 0.367347
+20 1.17 0.2038 0.387755
+21 1.23 0.922029 0.489796
+22 1.29 1.34123 0.653061
+23 1.35 1.83702 0.897959
+24 1.41 1.40335 1.10204
+25 1.47 1.03292 1.26531
+26 1.53 0.834316 1.40816
+27 1.59 0.772544 1.55102
+28 1.65 0.819871 1.71429
+29 1.71 0.85877 1.89796
+30 1.77 0.890601 2.10204
+31 1.83 0.66653 2.26531
+32 1.89 1.32788 2.61224
+33 1.95 1.17405 2.93878
+34 2.01 0.345316 3.04082
+35 2.07 1.17212 3.40816
+36 2.13 0.861016 3.69388
+37 2.19 0.930841 4.02041
+38 2.25 0.936978 4.36735
+39 2.31 0.732067 4.65306
+40 2.37 0.844501 5
+41 2.43 0.708807 5.30612
+42 2.49 1.1251 5.81633
+43 2.55 1.07278 6.32653
+44 2.61 0.942104 6.79592
+45 2.67 0.821958 7.22449
+46 2.73 1.16062 7.85714
+47 2.79 1.0037 8.42857
+48 2.85 1.20236 9.14286
+49 2.91 0.856728 9.67347
+50 2.97 1.20206 10.449
+107200 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 0 0
+9 0.51 0 0
+10 0.57 1.71613 0.0408163
+11 0.63 1.40505 0.0816327
+12 0.69 1.17146 0.122449
+13 0.75 0.991624 0.163265
+14 0.81 0.850222 0.204082
+15 0.87 0.368519 0.22449
+16 0.93 0.967555 0.285714
+17 0.99 0 0.285714
+18 1.05 1.01213 0.367347
+19 1.11 1.58496 0.510204
+20 1.17 0.8152 0.591837
+21 1.23 0.737623 0.673469
+22 1.29 1.17358 0.816327
+23 1.35 0.918509 0.938776
+24 1.41 1.82436 1.20408
+25 1.47 0.903804 1.34694
+26 1.53 0.953504 1.5102
+27 1.59 0.551817 1.61224
+28 1.65 0.512419 1.71429
+29 1.71 0.954189 1.91837
+30 1.77 0.62342 2.06122
+31 1.83 0.916479 2.28571
+32 1.89 1.17166 2.59184
+33 1.95 0.953918 2.85714
+34 2.01 0.690632 3.06122
+35 2.07 1.17212 3.42857
+36 2.13 0.615011 3.63265
+37 2.19 0.698131 3.87755
+38 2.25 0.936978 4.22449
+39 2.31 0.941229 4.59184
+40 2.37 0.546442 4.81633
+41 2.43 0.803314 5.16327
+42 2.49 1.1251 5.67347
+43 2.55 0.815313 6.06122
+44 2.61 0.983065 6.55102
+45 2.67 1.29165 7.22449
+46 2.73 1.0483 7.79592
+47 2.79 1.14709 8.44898
+48 2.85 0.79012 8.91837
+49 2.91 1.12034 9.61224
+50 2.97 1.01226 10.2653
+107250 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 1.37595 0.0204082
+9 0.51 0 0.0204082
+10 0.57 0 0.0204082
+11 0.63 0.702525 0.0408163
+12 0.69 0.585732 0.0612245
+13 0.75 1.48744 0.122449
+14 0.81 1.70044 0.204082
+15 0.87 0 0.204082
+16 0.93 1.29007 0.285714
+17 0.99 0.569243 0.326531
+18 1.05 0.506063 0.367347
+19 1.11 0.452845 0.408163
+20 1.17 0.8152 0.489796
+21 1.23 1.10644 0.612245
+22 1.29 0.502961 0.673469
+23 1.35 0.918509 0.795918
+24 1.41 1.12268 0.959184
+25 1.47 1.29115 1.16327
+26 1.53 1.07269 1.34694
+27 1.59 1.32436 1.59184
+28 1.65 0.819871 1.7551
+29 1.71 1.04961 1.97959
+30 1.77 0.53436 2.10204
+31 1.83 0.749847 2.28571
+32 1.89 0.937329 2.53061
+33 1.95 1.10067 2.83673
+34 2.01 0.966885 3.12245
+35 2.07 1.107 3.46939
+36 2.13 1.23002 3.87755
+37 2.19 1.27991 4.32653
+38 2.25 0.881861 4.65306
+39 2.31 0.784357 4.95918
+40 2.37 0.745148 5.26531
+41 2.43 0.850568 5.63265
+42 2.49 1.03509 6.10204
+43 2.55 0.72949 6.44898
+44 2.61 1.22883 7.06122
+45 2.67 0.978521 7.57143
+46 2.73 0.973423 8.10204
+47 2.79 0.824468 8.57143
+48 2.85 0.927532 9.12245
+49 2.91 0.790826 9.61224
+50 2.97 0.822464 10.1429
+107300 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 1.83099 0.0204082
+8 0.45 0 0.0204082
+9 0.51 0 0.0204082
+10 0.57 0.858066 0.0408163
+11 0.63 0.702525 0.0612245
+12 0.69 1.17146 0.102041
+13 0.75 1.98325 0.183673
+14 0.81 0.850222 0.22449
+15 0.87 0.368519 0.244898
+16 0.93 0.645037 0.285714
+17 0.99 1.70773 0.408163
+18 1.05 1.51819 0.530612
+19 1.11 0.90569 0.612245
+20 1.17 0.4076 0.653061
+21 1.23 0.553218 0.714286
+22 1.29 1.17358 0.857143
+23 1.35 0.765424 0.959184
+24 1.41 0.421006 1.02041
+25 1.47 2.06584 1.34694
+26 1.53 1.54944 1.61224
+27 1.59 1.32436 1.85714
+28 1.65 0.512419 1.95918
+29 1.71 0.954189 2.16327
+30 1.77 0.71248 2.32653
+31 1.83 0.583214 2.46939
+32 1.89 1.01544 2.73469
+33 1.95 0.807161 2.95918
+34 2.01 0.552506 3.12245
+35 2.07 0.781414 3.36735
+36 2.13 0.676513 3.59184
+37 2.19 0.756309 3.85714
+38 2.25 0.60628 4.08163
+39 2.31 1.20268 4.55102
+40 2.37 1.14256 5.02041
+41 2.43 1.2286 5.55102
+42 2.49 0.810072 5.91837
+43 2.55 0.944046 6.36735
+44 2.61 0.942104 6.83673
+45 2.67 1.17423 7.44898
+46 2.73 1.0483 8.02041
+47 2.79 0.896161 8.53061
+48 2.85 0.961885 9.10204
+49 2.91 0.889679 9.65306
+50 2.97 0.854097 10.2041
+107350 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 0 0
+9 0.51 0 0
+10 0.57 0.858066 0.0204082
+11 0.63 1.40505 0.0612245
+12 0.69 0 0.0612245
+13 0.75 1.48744 0.122449
+14 0.81 1.27533 0.183673
+15 0.87 0 0.183673
+16 0.93 1.61259 0.285714
+17 0.99 0.569243 0.326531
+18 1.05 0.759094 0.387755
+19 1.11 0.679267 0.44898
+20 1.17 1.019 0.55102
+21 1.23 0.553218 0.612245
+22 1.29 0.838269 0.714286
+23 1.35 0.612339 0.795918
+24 1.41 0.561342 0.877551
+25 1.47 1.03292 1.04082
+26 1.53 1.19188 1.2449
+27 1.59 0.993271 1.42857
+28 1.65 0.922354 1.61224
+29 1.71 0.667932 1.7551
+30 1.77 1.60308 2.12245
+31 1.83 0.999796 2.36735
+32 1.89 0.781108 2.57143
+33 1.95 0.733783 2.77551
+34 2.01 1.03595 3.08163
+35 2.07 0.651178 3.28571
+36 2.13 1.29152 3.71429
+37 2.19 1.0472 4.08163
+38 2.25 0.992094 4.44898
+39 2.31 0.679776 4.71429
+40 2.37 1.04321 5.14286
+41 2.43 0.850568 5.5102
+42 2.49 0.990089 5.95918
+43 2.55 0.901135 6.38776
+44 2.61 1.35171 7.06122
+45 2.67 1.01766 7.59184
+46 2.73 0.973423 8.12245
+47 2.79 0.967854 8.67347
+48 2.85 1.20236 9.38776
+49 2.91 0.757875 9.85714
+50 2.97 0.98063 10.4898
+107400 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 1.37595 0.0204082
+9 0.51 0 0.0204082
+10 0.57 0 0.0204082
+11 0.63 1.40505 0.0612245
+12 0.69 1.17146 0.102041
+13 0.75 0 0.102041
+14 0.81 0.425111 0.122449
+15 0.87 1.10556 0.183673
+16 0.93 0.645037 0.22449
+17 0.99 1.13849 0.306122
+18 1.05 0.506063 0.346939
+19 1.11 0.226422 0.367347
+20 1.17 0.4076 0.408163
+21 1.23 0.737623 0.489796
+22 1.29 0.670615 0.571429
+23 1.35 1.22468 0.734694
+24 1.41 0.140335 0.755102
+25 1.47 0.903804 0.897959
+26 1.53 0.476752 0.979592
+27 1.59 1.54509 1.26531
+28 1.65 1.02484 1.46939
+29 1.71 1.04961 1.69388
+30 1.77 0.979661 1.91837
+31 1.83 0.66653 2.08163
+32 1.89 0.702997 2.26531
+33 1.95 1.0273 2.55102
+34 2.01 1.03595 2.85714
+35 2.07 0.846532 3.12245
+36 2.13 1.23002 3.53061
+37 2.19 0.407243 3.67347
+38 2.25 1.15744 4.10204
+39 2.31 1.04581 4.5102
+40 2.37 1.34127 5.06122
+41 2.43 1.03958 5.5102
+42 2.49 0.810072 5.87755
+43 2.55 1.28734 6.4898
+44 2.61 1.22883 7.10204
+45 2.67 0.978521 7.61224
+46 2.73 0.935984 8.12245
+47 2.79 0.609389 8.46939
+48 2.85 1.13365 9.14286
+49 2.91 1.12034 9.83673
+50 2.97 1.17043 10.5918
+107450 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 0 0
+9 0.51 0 0
+10 0.57 0.858066 0.0204082
+11 0.63 0.702525 0.0408163
+12 0.69 0 0.0408163
+13 0.75 0.495812 0.0612245
+14 0.81 1.70044 0.142857
+15 0.87 1.47408 0.22449
+16 0.93 0.322518 0.244898
+17 0.99 0.569243 0.285714
+18 1.05 0.506063 0.326531
+19 1.11 0.90569 0.408163
+20 1.17 1.2228 0.530612
+21 1.23 0.737623 0.612245
+22 1.29 0.670615 0.693878
+23 1.35 0.153085 0.714286
+24 1.41 1.12268 0.877551
+25 1.47 0.645574 0.979592
+26 1.53 0.715128 1.10204
+27 1.59 0.882908 1.26531
+28 1.65 0.717387 1.40816
+29 1.71 1.24045 1.67347
+30 1.77 0.71248 1.83673
+31 1.83 0.66653 2
+32 1.89 0.702997 2.18367
+33 1.95 0.660405 2.36735
+34 2.01 0.966885 2.65306
+35 2.07 0.716296 2.87755
+36 2.13 0.984018 3.20408
+37 2.19 0.581776 3.40816
+38 2.25 1.26768 3.87755
+39 2.31 0.993519 4.26531
+40 2.37 0.745148 4.57143
+41 2.43 1.08684 5.04082
+42 2.49 1.35012 5.65306
+43 2.55 1.02987 6.14286
+44 2.61 0.942104 6.61224
+45 2.67 1.0568 7.16327
+46 2.73 1.16062 7.79592
+47 2.79 1.18293 8.46939
+48 2.85 0.961885 9.04082
+49 2.91 0.790826 9.53061
+50 2.97 1.1388 10.2653
+107500 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 0 0
+9 0.51 1.07159 0.0204082
+10 0.57 0 0.0204082
+11 0.63 0 0.0204082
+12 0.69 0.585732 0.0408163
+13 0.75 0.495812 0.0612245
+14 0.81 0.850222 0.102041
+15 0.87 0.737039 0.142857
+16 0.93 1.61259 0.244898
+17 0.99 0.853865 0.306122
+18 1.05 0.759094 0.367347
+19 1.11 0.226422 0.387755
+20 1.17 1.2228 0.510204
+21 1.23 0.737623 0.591837
+22 1.29 1.34123 0.755102
+23 1.35 0.765424 0.857143
+24 1.41 1.82436 1.12245
+25 1.47 0.645574 1.22449
+26 1.53 1.19188 1.42857
+27 1.59 0.662181 1.55102
+28 1.65 0.409935 1.63265
+29 1.71 0.85877 1.81633
+30 1.77 0.890601 2.02041
+31 1.83 0.749847 2.20408
+32 1.89 0.781108 2.40816
+33 1.95 0.807161 2.63265
+34 2.01 1.17407 2.97959
+35 2.07 1.23724 3.36735
+36 2.13 0.799515 3.63265
+37 2.19 0.989019 3.97959
+38 2.25 0.496047 4.16327
+39 2.31 0.679776 4.42857
+40 2.37 0.894177 4.79592
+41 2.43 0.897822 5.18367
+42 2.49 1.21511 5.73469
+43 2.55 1.37316 6.38776
+44 2.61 0.942104 6.85714
+45 2.67 0.978521 7.36735
+46 2.73 1.01086 7.91837
+47 2.79 1.07539 8.53061
+48 2.85 0.687061 8.93878
+49 2.91 1.12034 9.63265
+50 2.97 1.26533 10.449
+107550 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 3.81206 0.0204082
+6 0.33 0 0.0204082
+7 0.39 0 0.0204082
+8 0.45 0 0.0204082
+9 0.51 0 0.0204082
+10 0.57 0 0.0204082
+11 0.63 0 0.0204082
+12 0.69 0.585732 0.0408163
+13 0.75 0 0.0408163
+14 0.81 1.27533 0.102041
+15 0.87 0 0.102041
+16 0.93 0.645037 0.142857
+17 0.99 2.27697 0.306122
+18 1.05 1.26516 0.408163
+19 1.11 1.13211 0.510204
+20 1.17 0.8152 0.591837
+21 1.23 0.368812 0.632653
+22 1.29 0.838269 0.734694
+23 1.35 0.459254 0.795918
+24 1.41 0.842013 0.918367
+25 1.47 1.03292 1.08163
+26 1.53 1.19188 1.28571
+27 1.59 0.772544 1.42857
+28 1.65 1.22981 1.67347
+29 1.71 1.04961 1.89796
+30 1.77 1.60308 2.26531
+31 1.83 0.66653 2.42857
+32 1.89 1.01544 2.69388
+33 1.95 0.807161 2.91837
+34 2.01 0.759695 3.14286
+35 2.07 0.846532 3.40816
+36 2.13 0.738014 3.65306
+37 2.19 0.639953 3.87755
+38 2.25 0.716512 4.14286
+39 2.31 0.732067 4.42857
+40 2.37 0.943854 4.81633
+41 2.43 1.2286 5.34694
+42 2.49 0.900081 5.7551
+43 2.55 0.514934 6
+44 2.61 0.942104 6.46939
+45 2.67 0.90024 6.93878
+46 2.73 1.01086 7.4898
+47 2.79 0.967854 8.04082
+48 2.85 0.824473 8.53061
+49 2.91 1.18624 9.26531
+50 2.97 1.39186 10.1633
+107600 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 0 0
+9 0.51 0 0
+10 0.57 0.858066 0.0204082
+11 0.63 0 0.0204082
+12 0.69 0 0.0204082
+13 0.75 0.495812 0.0408163
+14 0.81 1.27533 0.102041
+15 0.87 0.737039 0.142857
+16 0.93 0.967555 0.204082
+17 0.99 0.569243 0.244898
+18 1.05 1.01213 0.326531
+19 1.11 0.90569 0.408163
+20 1.17 0.6114 0.469388
+21 1.23 0.553218 0.530612
+22 1.29 0.502961 0.591837
+23 1.35 1.53085 0.795918
+24 1.41 0.421006 0.857143
+25 1.47 1.54938 1.10204
+26 1.53 0.715128 1.22449
+27 1.59 0.993271 1.40816
+28 1.65 0.614903 1.53061
+29 1.71 0.954189 1.73469
+30 1.77 0.80154 1.91837
+31 1.83 0.66653 2.08163
+32 1.89 0.702997 2.26531
+33 1.95 0.733783 2.46939
+34 2.01 1.03595 2.77551
+35 2.07 0.651178 2.97959
+36 2.13 0.922517 3.28571
+37 2.19 0.872664 3.59184
+38 2.25 0.826745 3.89796
+39 2.31 0.941229 4.26531
+40 2.37 1.39094 4.83673
+41 2.43 0.803314 5.18367
+42 2.49 1.03509 5.65306
+43 2.55 1.11569 6.18367
+44 2.61 0.819221 6.59184
+45 2.67 1.29165 7.26531
+46 2.73 1.08574 7.85714
+47 2.79 1.39801 8.65306
+48 2.85 0.961885 9.22449
+49 2.91 0.790826 9.71429
+50 2.97 0.854097 10.2653
+107650 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 0 0
+9 0.51 0 0
+10 0.57 0 0
+11 0.63 0.702525 0.0204082
+12 0.69 0 0.0204082
+13 0.75 0.495812 0.0408163
+14 0.81 0.850222 0.0816327
+15 0.87 1.10556 0.142857
+16 0.93 0.967555 0.204082
+17 0.99 0.569243 0.244898
+18 1.05 0.759094 0.306122
+19 1.11 1.58496 0.44898
+20 1.17 0.6114 0.510204
+21 1.23 0.737623 0.591837
+22 1.29 0.670615 0.673469
+23 1.35 0.612339 0.755102
+24 1.41 0.421006 0.816327
+25 1.47 1.54938 1.06122
+26 1.53 0.476752 1.14286
+27 1.59 0.882908 1.30612
+28 1.65 0.819871 1.46939
+29 1.71 1.33586 1.7551
+30 1.77 1.24684 2.04082
+31 1.83 0.416582 2.14286
+32 1.89 0.234332 2.20408
+33 1.95 0.953918 2.46939
+34 2.01 0.966885 2.7551
+35 2.07 0.91165 3.04082
+36 2.13 0.984018 3.36735
+37 2.19 0.989019 3.71429
+38 2.25 0.936978 4.06122
+39 2.31 0.941229 4.42857
+40 2.37 0.596118 4.67347
+41 2.43 1.32311 5.2449
+42 2.49 0.585052 5.5102
+43 2.55 1.24442 6.10204
+44 2.61 0.983065 6.59184
+45 2.67 0.861099 7.04082
+46 2.73 0.861105 7.5102
+47 2.79 1.07539 8.12245
+48 2.85 0.961885 8.69388
+49 2.91 0.988533 9.30612
+50 2.97 1.10716 10.0204
+107700 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 0 0
+9 0.51 1.07159 0.0204082
+10 0.57 0.858066 0.0408163
+11 0.63 0 0.0408163
+12 0.69 0.585732 0.0612245
+13 0.75 0.495812 0.0816327
+14 0.81 0 0.0816327
+15 0.87 1.47408 0.163265
+16 0.93 0.645037 0.204082
+17 0.99 0.284622 0.22449
+18 1.05 1.01213 0.306122
+19 1.11 0.452845 0.346939
+20 1.17 0.2038 0.367347
+21 1.23 0.553218 0.428571
+22 1.29 1.17358 0.571429
+23 1.35 1.22468 0.734694
+24 1.41 0.421006 0.795918
+25 1.47 0.774689 0.918367
+26 1.53 0.834316 1.06122
+27 1.59 0.662181 1.18367
+28 1.65 0.819871 1.34694
+29 1.71 1.04961 1.57143
+30 1.77 0.890601 1.77551
+31 1.83 1.58301 2.16327
+32 1.89 1.01544 2.42857
+33 1.95 1.17405 2.7551
+34 2.01 0.897822 3.02041
+35 2.07 1.17212 3.38776
+36 2.13 0.738014 3.63265
+37 2.19 1.33808 4.10204
+38 2.25 1.15744 4.53061
+39 2.31 1.04581 4.93878
+40 2.37 0.844501 5.28571
+41 2.43 0.850568 5.65306
+42 2.49 1.0801 6.14286
+43 2.55 1.33025 6.77551
+44 2.61 0.983065 7.26531
+45 2.67 0.782817 7.67347
+46 2.73 0.748787 8.08163
+47 2.79 0.860314 8.57143
+48 2.85 1.13365 9.2449
+49 2.91 0.823777 9.7551
+50 2.97 1.01226 10.4082
+107750 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 0 0
+9 0.51 0 0
+10 0.57 0 0
+11 0.63 1.40505 0.0408163
+12 0.69 0 0.0408163
+13 0.75 0.991624 0.0816327
+14 0.81 0.850222 0.122449
+15 0.87 1.10556 0.183673
+16 0.93 0.967555 0.244898
+17 0.99 1.13849 0.326531
+18 1.05 0.253031 0.346939
+19 1.11 0.679267 0.408163
+20 1.17 1.8342 0.591837
+21 1.23 0.737623 0.673469
+22 1.29 1.50888 0.857143
+23 1.35 1.37776 1.04082
+24 1.41 0.280671 1.08163
+25 1.47 1.16203 1.26531
+26 1.53 1.19188 1.46939
+27 1.59 0.551817 1.57143
+28 1.65 1.33229 1.83673
+29 1.71 0.763351 2
+30 1.77 0.979661 2.22449
+31 1.83 0.916479 2.44898
+32 1.89 1.17166 2.7551
+33 1.95 1.0273 3.04082
+34 2.01 1.24314 3.40816
+35 2.07 0.520943 3.57143
+36 2.13 1.23002 3.97959
+37 2.19 0.872664 4.28571
+38 2.25 0.551163 4.4898
+39 2.31 0.784357 4.79592
+40 2.37 0.745148 5.10204
+41 2.43 1.2286 5.63265
+42 2.49 0.990089 6.08163
+43 2.55 0.858224 6.4898
+44 2.61 1.18787 7.08163
+45 2.67 0.93938 7.57143
+46 2.73 0.935984 8.08163
+47 2.79 0.716929 8.4898
+48 2.85 0.824473 8.97959
+49 2.91 1.08739 9.65306
+50 2.97 1.1388 10.3878
+107800 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 0 0
+9 0.51 1.07159 0.0204082
+10 0.57 0 0.0204082
+11 0.63 0 0.0204082
+12 0.69 0.585732 0.0408163
+13 0.75 0.991624 0.0816327
+14 0.81 0.850222 0.122449
+15 0.87 1.10556 0.183673
+16 0.93 0.322518 0.204082
+17 0.99 0.853865 0.265306
+18 1.05 0.506063 0.306122
+19 1.11 0.226422 0.326531
+20 1.17 0.8152 0.408163
+21 1.23 0.368812 0.44898
+22 1.29 0.502961 0.510204
+23 1.35 1.22468 0.673469
+24 1.41 1.40335 0.877551
+25 1.47 0.645574 0.979592
+26 1.53 1.07269 1.16327
+27 1.59 0.441454 1.2449
+28 1.65 1.12732 1.46939
+29 1.71 1.04961 1.69388
+30 1.77 1.06872 1.93878
+31 1.83 1.16643 2.22449
+32 1.89 1.17166 2.53061
+33 1.95 1.10067 2.83673
+34 2.01 1.03595 3.14286
+35 2.07 1.04189 3.46939
+36 2.13 1.10702 3.83673
+37 2.19 1.22173 4.26531
+38 2.25 0.496047 4.44898
+39 2.31 1.04581 4.85714
+40 2.37 0.844501 5.20408
+41 2.43 1.18134 5.71429
+42 2.49 1.0801 6.20408
+43 2.55 1.02987 6.69388
+44 2.61 1.02403 7.20408
+45 2.67 1.09594 7.77551
+46 2.73 0.823666 8.22449
+47 2.79 0.716929 8.63265
+48 2.85 0.961885 9.20408
+49 2.91 0.889679 9.7551
+50 2.97 0.88573 10.3265
+107850 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 0 0
+9 0.51 0 0
+10 0.57 0 0
+11 0.63 0.702525 0.0204082
+12 0.69 0.585732 0.0408163
+13 0.75 0.991624 0.0816327
+14 0.81 0 0.0816327
+15 0.87 1.47408 0.163265
+16 0.93 1.29007 0.244898
+17 0.99 0.284622 0.265306
+18 1.05 1.01213 0.346939
+19 1.11 0.679267 0.408163
+20 1.17 0.8152 0.489796
+21 1.23 0.922029 0.591837
+22 1.29 1.34123 0.755102
+23 1.35 1.22468 0.918367
+24 1.41 0.140335 0.938776
+25 1.47 1.16203 1.12245
+26 1.53 0.953504 1.28571
+27 1.59 0.551817 1.38776
+28 1.65 0.614903 1.5102
+29 1.71 0.381676 1.59184
+30 1.77 0.80154 1.77551
+31 1.83 1.16643 2.06122
+32 1.89 1.09355 2.34694
+33 1.95 0.880539 2.59184
+34 2.01 0.828758 2.83673
+35 2.07 0.976768 3.14286
+36 2.13 1.04552 3.4898
+37 2.19 0.930841 3.81633
+38 2.25 1.26768 4.28571
+39 2.31 0.836648 4.61224
+40 2.37 1.34127 5.16327
+41 2.43 0.897822 5.55102
+42 2.49 1.26011 6.12245
+43 2.55 0.901135 6.55102
+44 2.61 1.31075 7.20408
+45 2.67 0.861099 7.65306
+46 2.73 1.0483 8.22449
+47 2.79 0.752775 8.65306
+48 2.85 0.584002 9
+49 2.91 0.988533 9.61224
+50 2.97 0.822464 10.1429
+107900 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 0 0
+9 0.51 1.07159 0.0204082
+10 0.57 0 0.0204082
+11 0.63 0 0.0204082
+12 0.69 0 0.0204082
+13 0.75 0.991624 0.0612245
+14 0.81 0.425111 0.0816327
+15 0.87 0.737039 0.122449
+16 0.93 0.967555 0.183673
+17 0.99 1.42311 0.285714
+18 1.05 0.506063 0.326531
+19 1.11 0.679267 0.387755
+20 1.17 0 0.387755
+21 1.23 0.922029 0.489796
+22 1.29 1.00592 0.612245
+23 1.35 0.612339 0.693878
+24 1.41 0.701677 0.795918
+25 1.47 0.774689 0.918367
+26 1.53 0.59594 1.02041
+27 1.59 1.214 1.2449
+28 1.65 0.922354 1.42857
+29 1.71 0.85877 1.61224
+30 1.77 1.06872 1.85714
+31 1.83 1.49969 2.22449
+32 1.89 0.937329 2.46939
+33 1.95 1.54094 2.89796
+34 2.01 1.45033 3.32653
+35 2.07 0.781414 3.57143
+36 2.13 1.16852 3.95918
+37 2.19 1.0472 4.32653
+38 2.25 0.771629 4.61224
+39 2.31 1.20268 5.08163
+40 2.37 1.29159 5.61224
+41 2.43 0.614299 5.87755
+42 2.49 0.810072 6.2449
+43 2.55 1.28734 6.85714
+44 2.61 1.06499 7.38776
+45 2.67 0.704535 7.7551
+46 2.73 0.898544 8.2449
+47 2.79 1.14709 8.89796
+48 2.85 0.687061 9.30612
+49 2.91 0.988533 9.91837
+50 2.97 0.822464 10.449
+107950 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 0 0
+9 0.51 0 0
+10 0.57 0 0
+11 0.63 0 0
+12 0.69 1.17146 0.0408163
+13 0.75 0.495812 0.0612245
+14 0.81 2.12556 0.163265
+15 0.87 0.368519 0.183673
+16 0.93 0.967555 0.244898
+17 0.99 0.853865 0.306122
+18 1.05 0.253031 0.326531
+19 1.11 0.90569 0.408163
+20 1.17 0.4076 0.44898
+21 1.23 0.553218 0.510204
+22 1.29 0.502961 0.571429
+23 1.35 0.918509 0.693878
+24 1.41 0.701677 0.795918
+25 1.47 0.645574 0.897959
+26 1.53 0.953504 1.06122
+27 1.59 0.882908 1.22449
+28 1.65 0.717387 1.36735
+29 1.71 1.33586 1.65306
+30 1.77 0.71248 1.81633
+31 1.83 0.916479 2.04082
+32 1.89 1.24977 2.36735
+33 1.95 0.807161 2.59184
+34 2.01 0.690632 2.79592
+35 2.07 0.91165 3.08163
+36 2.13 1.29152 3.5102
+37 2.19 1.27991 3.95918
+38 2.25 0.661396 4.20408
+39 2.31 0.732067 4.4898
+40 2.37 0.943854 4.87755
+41 2.43 0.803314 5.22449
+42 2.49 1.03509 5.69388
+43 2.55 0.944046 6.14286
+44 2.61 0.860182 6.57143
+45 2.67 1.17423 7.18367
+46 2.73 0.636469 7.53061
+47 2.79 0.716929 7.93878
+48 2.85 1.0993 8.59184
+49 2.91 0.659022 9
+50 2.97 1.3286 9.85714
+108000 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 0 0
+9 0.51 1.07159 0.0204082
+10 0.57 2.5742 0.0816327
+11 0.63 0.702525 0.102041
+12 0.69 1.17146 0.142857
+13 0.75 2.97487 0.265306
+14 0.81 2.55067 0.387755
+15 0.87 1.10556 0.44898
+16 0.93 1.29007 0.530612
+17 0.99 0.569243 0.571429
+18 1.05 0.759094 0.632653
+19 1.11 0.226422 0.653061
+20 1.17 0.4076 0.693878
+21 1.23 0.553218 0.755102
+22 1.29 1.17358 0.897959
+23 1.35 0.765424 1
+24 1.41 0.982348 1.14286
+25 1.47 1.29115 1.34694
+26 1.53 0.59594 1.44898
+27 1.59 0.772544 1.59184
+28 1.65 0.512419 1.69388
+29 1.71 0.381676 1.77551
+30 1.77 0.890601 1.97959
+31 1.83 0.916479 2.20408
+32 1.89 0.702997 2.38776
+33 1.95 0.953918 2.65306
+34 2.01 0.690632 2.85714
+35 2.07 0.846532 3.12245
+36 2.13 0.615011 3.32653
+37 2.19 0.930841 3.65306
+38 2.25 0.936978 4
+39 2.31 1.30726 4.5102
+40 2.37 0.99353 4.91837
+41 2.43 0.803314 5.26531
+42 2.49 0.990089 5.71429
+43 2.55 1.11569 6.2449
+44 2.61 1.10595 6.79592
+45 2.67 0.782817 7.20408
+46 2.73 1.27294 7.89796
+47 2.79 0.860314 8.38776
+48 2.85 0.961885 8.95918
+49 2.91 1.02148 9.59184
+50 2.97 0.88573 10.1633
+108050 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 1.83099 0.0204082
+8 0.45 0 0.0204082
+9 0.51 0 0.0204082
+10 0.57 0.858066 0.0408163
+11 0.63 0 0.0408163
+12 0.69 0.585732 0.0612245
+13 0.75 0.495812 0.0816327
+14 0.81 2.12556 0.183673
+15 0.87 0 0.183673
+16 0.93 0.322518 0.204082
+17 0.99 0.853865 0.265306
+18 1.05 1.77122 0.408163
+19 1.11 1.35853 0.530612
+20 1.17 0.4076 0.571429
+21 1.23 0 0.571429
+22 1.29 0.335308 0.612245
+23 1.35 0.918509 0.734694
+24 1.41 0.561342 0.816327
+25 1.47 1.16203 1
+26 1.53 1.19188 1.20408
+27 1.59 0.993271 1.38776
+28 1.65 0.614903 1.5102
+29 1.71 1.5267 1.83673
+30 1.77 1.24684 2.12245
+31 1.83 1.08311 2.38776
+32 1.89 1.09355 2.67347
+33 1.95 1.32081 3.04082
+34 2.01 0.759695 3.26531
+35 2.07 1.04189 3.59184
+36 2.13 0.799515 3.85714
+37 2.19 0.814486 4.14286
+38 2.25 0.826745 4.44898
+39 2.31 0.888938 4.79592
+40 2.37 0.894177 5.16327
+41 2.43 0.945075 5.57143
+42 2.49 0.855076 5.95918
+43 2.55 1.11569 6.4898
+44 2.61 0.77826 6.87755
+45 2.67 1.09594 7.44898
+46 2.73 0.823666 7.89796
+47 2.79 1.14709 8.55102
+48 2.85 1.03059 9.16327
+49 2.91 1.15329 9.87755
+50 2.97 1.20206 10.6531
+108100 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 0 0
+9 0.51 0 0
+10 0.57 1.71613 0.0408163
+11 0.63 0 0.0408163
+12 0.69 0 0.0408163
+13 0.75 1.48744 0.102041
+14 0.81 1.27533 0.163265
+15 0.87 1.10556 0.22449
+16 0.93 0.645037 0.265306
+17 0.99 0.853865 0.326531
+18 1.05 1.26516 0.428571
+19 1.11 0.452845 0.469388
+20 1.17 1.019 0.571429
+21 1.23 1.29084 0.714286
+22 1.29 0.335308 0.755102
+23 1.35 0.765424 0.857143
+24 1.41 0.701677 0.959184
+25 1.47 0.516459 1.04082
+26 1.53 1.07269 1.22449
+27 1.59 0.551817 1.32653
+28 1.65 0.819871 1.4898
+29 1.71 0.954189 1.69388
+30 1.77 0.979661 1.91837
+31 1.83 1.16643 2.20408
+32 1.89 1.32788 2.55102
+33 1.95 1.10067 2.85714
+34 2.01 0.828758 3.10204
+35 2.07 0.976768 3.40816
+36 2.13 0.922517 3.71429
+37 2.19 0.814486 4
+38 2.25 0.771629 4.28571
+39 2.31 0.888938 4.63265
+40 2.37 1.19224 5.12245
+41 2.43 0.803314 5.46939
+42 2.49 0.900081 5.87755
+43 2.55 0.901135 6.30612
+44 2.61 0.77826 6.69388
+45 2.67 0.90024 7.16327
+46 2.73 1.2355 7.83673
+47 2.79 1.14709 8.4898
+48 2.85 1.03059 9.10204
+49 2.91 1.12034 9.79592
+50 2.97 1.1388 10.5306
+108150 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 0 0
+9 0.51 0 0
+10 0.57 0 0
+11 0.63 0.702525 0.0204082
+12 0.69 0.585732 0.0408163
+13 0.75 0.495812 0.0612245
+14 0.81 1.27533 0.122449
+15 0.87 0.737039 0.163265
+16 0.93 0.645037 0.204082
+17 0.99 0.569243 0.244898
+18 1.05 0.759094 0.306122
+19 1.11 0.679267 0.367347
+20 1.17 0.8152 0.44898
+21 1.23 0.368812 0.489796
+22 1.29 0.670615 0.571429
+23 1.35 0.918509 0.693878
+24 1.41 0.561342 0.77551
+25 1.47 0.903804 0.918367
+26 1.53 0.715128 1.04082
+27 1.59 0.882908 1.20408
+28 1.65 0.512419 1.30612
+29 1.71 0.85877 1.4898
+30 1.77 0.62342 1.63265
+31 1.83 0.999796 1.87755
+32 1.89 0.468665 2
+33 1.95 0.733783 2.20408
+34 2.01 0.759695 2.42857
+35 2.07 1.17212 2.79592
+36 2.13 1.29152 3.22449
+37 2.19 0.930841 3.55102
+38 2.25 1.15744 3.97959
+39 2.31 1.0981 4.40816
+40 2.37 1.4903 5.02041
+41 2.43 0.614299 5.28571
+42 2.49 0.810072 5.65306
+43 2.55 0.901135 6.08163
+44 2.61 1.22883 6.69388
+45 2.67 0.704535 7.06122
+46 2.73 0.711348 7.44898
+47 2.79 0.896161 7.95918
+48 2.85 1.33977 8.7551
+49 2.91 1.12034 9.44898
+50 2.97 1.01226 10.102
+108200 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 0 0
+9 0.51 0 0
+10 0.57 0.858066 0.0204082
+11 0.63 0 0.0204082
+12 0.69 1.17146 0.0612245
+13 0.75 0.495812 0.0816327
+14 0.81 0.850222 0.122449
+15 0.87 0 0.122449
+16 0.93 0.967555 0.183673
+17 0.99 1.13849 0.265306
+18 1.05 1.77122 0.408163
+19 1.11 0.452845 0.44898
+20 1.17 0.6114 0.510204
+21 1.23 0.368812 0.55102
+22 1.29 0.335308 0.591837
+23 1.35 1.9901 0.857143
+24 1.41 0.561342 0.938776
+25 1.47 0.516459 1.02041
+26 1.53 0.715128 1.14286
+27 1.59 1.32436 1.38776
+28 1.65 1.33229 1.65306
+29 1.71 0.763351 1.81633
+30 1.77 1.42496 2.14286
+31 1.83 0.749847 2.32653
+32 1.89 0.937329 2.57143
+33 1.95 0.953918 2.83673
+34 2.01 0.690632 3.04082
+35 2.07 1.04189 3.36735
+36 2.13 0.799515 3.63265
+37 2.19 0.756309 3.89796
+38 2.25 0.771629 4.18367
+39 2.31 1.20268 4.65306
+40 2.37 1.24191 5.16327
+41 2.43 0.850568 5.53061
+42 2.49 1.0801 6.02041
+43 2.55 0.944046 6.46939
+44 2.61 1.31075 7.12245
+45 2.67 1.13508 7.71429
+46 2.73 1.01086 8.26531
+47 2.79 0.824468 8.73469
+48 2.85 0.79012 9.20408
+49 2.91 1.25214 9.97959
+50 2.97 0.854097 10.5306
+108250 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 1.37595 0.0204082
+9 0.51 0 0.0204082
+10 0.57 1.71613 0.0612245
+11 0.63 0 0.0612245
+12 0.69 1.17146 0.102041
+13 0.75 0.991624 0.142857
+14 0.81 0.425111 0.163265
+15 0.87 1.10556 0.22449
+16 0.93 0.322518 0.244898
+17 0.99 0.569243 0.285714
+18 1.05 0.506063 0.326531
+19 1.11 0.679267 0.387755
+20 1.17 1.019 0.489796
+21 1.23 0.368812 0.530612
+22 1.29 0.838269 0.632653
+23 1.35 0.765424 0.734694
+24 1.41 0.701677 0.836735
+25 1.47 0.516459 0.918367
+26 1.53 0.834316 1.06122
+27 1.59 0.882908 1.22449
+28 1.65 1.43477 1.5102
+29 1.71 1.24045 1.77551
+30 1.77 0.80154 1.95918
+31 1.83 0.999796 2.20408
+32 1.89 0.937329 2.44898
+33 1.95 0.44027 2.57143
+34 2.01 0.621569 2.7551
+35 2.07 0.976768 3.06122
+36 2.13 1.10702 3.42857
+37 2.19 0.930841 3.7551
+38 2.25 0.881861 4.08163
+39 2.31 1.30726 4.59184
+40 2.37 1.04321 5.02041
+41 2.43 0.661553 5.30612
+42 2.49 1.30512 5.89796
+43 2.55 1.07278 6.40816
+44 2.61 1.18787 7
+45 2.67 1.25251 7.65306
+46 2.73 0.973423 8.18367
+47 2.79 0.896161 8.69388
+48 2.85 0.755767 9.14286
+49 2.91 1.12034 9.83673
+50 2.97 1.26533 10.6531
+108300 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 0 0
+9 0.51 1.07159 0.0204082
+10 0.57 0 0.0204082
+11 0.63 0.702525 0.0408163
+12 0.69 2.34293 0.122449
+13 0.75 1.48744 0.183673
+14 0.81 1.70044 0.265306
+15 0.87 1.10556 0.326531
+16 0.93 0.967555 0.387755
+17 0.99 1.70773 0.510204
+18 1.05 0.253031 0.530612
+19 1.11 0.679267 0.591837
+20 1.17 0.8152 0.673469
+21 1.23 0 0.673469
+22 1.29 0.502961 0.734694
+23 1.35 0.765424 0.836735
+24 1.41 0.842013 0.959184
+25 1.47 1.03292 1.12245
+26 1.53 0.476752 1.20408
+27 1.59 1.32436 1.44898
+28 1.65 0.922354 1.63265
+29 1.71 1.04961 1.85714
+30 1.77 1.15778 2.12245
+31 1.83 0.749847 2.30612
+32 1.89 1.17166 2.61224
+33 1.95 1.10067 2.91837
+34 2.01 1.10501 3.2449
+35 2.07 0.520943 3.40816
+36 2.13 1.16852 3.79592
+37 2.19 0.581776 4
+38 2.25 0.992094 4.36735
+39 2.31 1.04581 4.77551
+40 2.37 0.745148 5.08163
+41 2.43 1.41761 5.69388
+42 2.49 1.03509 6.16327
+43 2.55 0.901135 6.59184
+44 2.61 0.860182 7.02041
+45 2.67 1.09594 7.59184
+46 2.73 1.27294 8.28571
+47 2.79 1.07539 8.89796
+48 2.85 1.03059 9.5102
+49 2.91 0.790826 10
+50 2.97 1.2337 10.7959
+108350 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 0 0
+9 0.51 2.14319 0.0408163
+10 0.57 0 0.0408163
+11 0.63 0 0.0408163
+12 0.69 0 0.0408163
+13 0.75 0.991624 0.0816327
+14 0.81 0.850222 0.122449
+15 0.87 1.10556 0.183673
+16 0.93 0.967555 0.244898
+17 0.99 0.853865 0.306122
+18 1.05 1.26516 0.408163
+19 1.11 0.452845 0.44898
+20 1.17 1.019 0.55102
+21 1.23 1.65965 0.734694
+22 1.29 0.502961 0.795918
+23 1.35 0.459254 0.857143
+24 1.41 0.561342 0.938776
+25 1.47 0.645574 1.04082
+26 1.53 1.31107 1.26531
+27 1.59 1.214 1.4898
+28 1.65 1.43477 1.77551
+29 1.71 1.04961 2
+30 1.77 0.890601 2.20408
+31 1.83 0.749847 2.38776
+32 1.89 1.17166 2.69388
+33 1.95 1.24743 3.04082
+34 2.01 0.828758 3.28571
+35 2.07 0.455825 3.42857
+36 2.13 0.861016 3.71429
+37 2.19 0.698131 3.95918
+38 2.25 0.881861 4.28571
+39 2.31 0.627486 4.53061
+40 2.37 1.39094 5.10204
+41 2.43 1.32311 5.67347
+42 2.49 1.39512 6.30612
+43 2.55 0.772402 6.67347
+44 2.61 0.901143 7.12245
+45 2.67 1.17423 7.73469
+46 2.73 0.898544 8.22449
+47 2.79 0.752775 8.65306
+48 2.85 1.23671 9.38776
+49 2.91 1.12034 10.0816
+50 2.97 0.88573 10.6531
+108400 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 0 0
+9 0.51 0 0
+10 0.57 0 0
+11 0.63 0.702525 0.0204082
+12 0.69 0 0.0204082
+13 0.75 1.48744 0.0816327
+14 0.81 0.850222 0.122449
+15 0.87 2.94816 0.285714
+16 0.93 1.61259 0.387755
+17 0.99 0.853865 0.44898
+18 1.05 0.506063 0.489796
+19 1.11 0.452845 0.530612
+20 1.17 1.2228 0.653061
+21 1.23 0.922029 0.755102
+22 1.29 0.502961 0.816327
+23 1.35 0.918509 0.938776
+24 1.41 0.842013 1.06122
+25 1.47 0.645574 1.16327
+26 1.53 1.31107 1.38776
+27 1.59 1.10363 1.59184
+28 1.65 0.614903 1.71429
+29 1.71 0.477094 1.81633
+30 1.77 0.979661 2.04082
+31 1.83 0.583214 2.18367
+32 1.89 0.781108 2.38776
+33 1.95 1.46757 2.79592
+34 2.01 1.10501 3.12245
+35 2.07 0.976768 3.42857
+36 2.13 0.922517 3.73469
+37 2.19 0.639953 3.95918
+38 2.25 1.15744 4.38776
+39 2.31 0.941229 4.7551
+40 2.37 1.09288 5.20408
+41 2.43 0.897822 5.59184
+42 2.49 0.990089 6.04082
+43 2.55 1.24442 6.63265
+44 2.61 1.18787 7.22449
+45 2.67 1.0568 7.77551
+46 2.73 0.748787 8.18367
+47 2.79 1.03955 8.77551
+48 2.85 1.168 9.46939
+49 2.91 0.92263 10.0408
+50 2.97 0.948997 10.6531
+108450 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 0 0
+9 0.51 0 0
+10 0.57 1.71613 0.0408163
+11 0.63 0 0.0408163
+12 0.69 0 0.0408163
+13 0.75 0.495812 0.0612245
+14 0.81 0 0.0612245
+15 0.87 0.737039 0.102041
+16 0.93 0.322518 0.122449
+17 0.99 0 0.122449
+18 1.05 1.26516 0.22449
+19 1.11 1.58496 0.367347
+20 1.17 0.8152 0.44898
+21 1.23 0.553218 0.510204
+22 1.29 0.335308 0.55102
+23 1.35 0.765424 0.653061
+24 1.41 0.561342 0.734694
+25 1.47 0.645574 0.836735
+26 1.53 1.07269 1.02041
+27 1.59 0.772544 1.16327
+28 1.65 1.94719 1.55102
+29 1.71 1.14503 1.79592
+30 1.77 0.890601 2
+31 1.83 1.33306 2.32653
+32 1.89 1.17166 2.63265
+33 1.95 0.807161 2.85714
+34 2.01 0.966885 3.14286
+35 2.07 1.23724 3.53061
+36 2.13 1.35303 3.97959
+37 2.19 0.639953 4.20408
+38 2.25 1.21256 4.65306
+39 2.31 1.04581 5.06122
+40 2.37 1.09288 5.5102
+41 2.43 1.18134 6.02041
+42 2.49 1.39512 6.65306
+43 2.55 0.944046 7.10204
+44 2.61 1.14691 7.67347
+45 2.67 0.90024 8.14286
+46 2.73 1.08574 8.73469
+47 2.79 1.11124 9.36735
+48 2.85 1.03059 9.97959
+49 2.91 0.889679 10.5306
+50 2.97 1.20206 11.3061
+108500 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 0 0
+9 0.51 1.07159 0.0204082
+10 0.57 0.858066 0.0408163
+11 0.63 1.40505 0.0816327
+12 0.69 1.17146 0.122449
+13 0.75 0.495812 0.142857
+14 0.81 0.850222 0.183673
+15 0.87 1.47408 0.265306
+16 0.93 0.645037 0.306122
+17 0.99 1.99235 0.44898
+18 1.05 0 0.44898
+19 1.11 1.35853 0.571429
+20 1.17 0.6114 0.632653
+21 1.23 1.84406 0.836735
+22 1.29 0.670615 0.918367
+23 1.35 1.22468 1.08163
+24 1.41 0.842013 1.20408
+25 1.47 0.774689 1.32653
+26 1.53 0.476752 1.40816
+27 1.59 1.10363 1.61224
+28 1.65 1.02484 1.81633
+29 1.71 1.14503 2.06122
+30 1.77 0.979661 2.28571
+31 1.83 0.999796 2.53061
+32 1.89 0.546775 2.67347
+33 1.95 0.807161 2.89796
+34 2.01 1.24314 3.26531
+35 2.07 1.17212 3.63265
+36 2.13 0.922517 3.93878
+37 2.19 1.0472 4.30612
+38 2.25 1.04721 4.69388
+39 2.31 0.888938 5.04082
+40 2.37 0.745148 5.34694
+41 2.43 1.2286 5.87755
+42 2.49 0.720064 6.20408
+43 2.55 1.07278 6.71429
+44 2.61 0.860182 7.14286
+45 2.67 1.21337 7.77551
+46 2.73 1.08574 8.36735
+47 2.79 0.716929 8.77551
+48 2.85 1.168 9.46939
+49 2.91 1.12034 10.1633
+50 2.97 0.88573 10.7347
+108550 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 0 0
+9 0.51 0 0
+10 0.57 0.858066 0.0204082
+11 0.63 0.702525 0.0408163
+12 0.69 0.585732 0.0612245
+13 0.75 1.98325 0.142857
+14 0.81 0 0.142857
+15 0.87 0.737039 0.183673
+16 0.93 0.322518 0.204082
+17 0.99 1.13849 0.285714
+18 1.05 0.759094 0.346939
+19 1.11 1.13211 0.44898
+20 1.17 0.4076 0.489796
+21 1.23 0.922029 0.591837
+22 1.29 0.670615 0.673469
+23 1.35 1.07159 0.816327
+24 1.41 0.421006 0.877551
+25 1.47 1.03292 1.04082
+26 1.53 0.59594 1.14286
+27 1.59 0.882908 1.30612
+28 1.65 1.22981 1.55102
+29 1.71 0.381676 1.63265
+30 1.77 1.51402 1.97959
+31 1.83 0.833163 2.18367
+32 1.89 1.40599 2.55102
+33 1.95 0.807161 2.77551
+34 2.01 0.759695 3
+35 2.07 0.91165 3.28571
+36 2.13 0.984018 3.61224
+37 2.19 1.10537 4
+38 2.25 0.936978 4.34694
+39 2.31 1.20268 4.81633
+40 2.37 1.34127 5.36735
+41 2.43 0.850568 5.73469
+42 2.49 1.35012 6.34694
+43 2.55 0.772402 6.71429
+44 2.61 0.983065 7.20408
+45 2.67 1.29165 7.87755
+46 2.73 1.2355 8.55102
+47 2.79 0.824468 9.02041
+48 2.85 0.79012 9.4898
+49 2.91 0.92263 10.0612
+50 2.97 0.88573 10.6327
+108600 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 1.37595 0.0204082
+9 0.51 0 0.0204082
+10 0.57 0 0.0204082
+11 0.63 0.702525 0.0408163
+12 0.69 0 0.0408163
+13 0.75 0.991624 0.0816327
+14 0.81 1.27533 0.142857
+15 0.87 1.47408 0.22449
+16 0.93 0.645037 0.265306
+17 0.99 0.569243 0.306122
+18 1.05 1.26516 0.408163
+19 1.11 0.679267 0.469388
+20 1.17 0.6114 0.530612
+21 1.23 0.553218 0.591837
+22 1.29 0.838269 0.693878
+23 1.35 0.765424 0.795918
+24 1.41 0.561342 0.877551
+25 1.47 0.387344 0.938776
+26 1.53 0.476752 1.02041
+27 1.59 0.882908 1.18367
+28 1.65 0.409935 1.26531
+29 1.71 0.477094 1.36735
+30 1.77 1.06872 1.61224
+31 1.83 1.74964 2.04082
+32 1.89 0.937329 2.28571
+33 1.95 1.32081 2.65306
+34 2.01 0.828758 2.89796
+35 2.07 0.976768 3.20408
+36 2.13 1.16852 3.59184
+37 2.19 1.0472 3.95918
+38 2.25 1.32279 4.44898
+39 2.31 0.888938 4.79592
+40 2.37 0.794824 5.12245
+41 2.43 0.708807 5.42857
+42 2.49 0.765068 5.77551
+43 2.55 0.986958 6.2449
+44 2.61 1.22883 6.85714
+45 2.67 1.01766 7.38776
+46 2.73 0.898544 7.87755
+47 2.79 0.967854 8.42857
+48 2.85 0.893179 8.95918
+49 2.91 1.44985 9.85714
+50 2.97 0.601031 10.2449
+108650 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 0 0
+9 0.51 1.07159 0.0204082
+10 0.57 0.858066 0.0408163
+11 0.63 0 0.0408163
+12 0.69 0.585732 0.0612245
+13 0.75 0.991624 0.102041
+14 0.81 0.850222 0.142857
+15 0.87 0.737039 0.183673
+16 0.93 0.645037 0.22449
+17 0.99 0.569243 0.265306
+18 1.05 1.77122 0.408163
+19 1.11 0.452845 0.44898
+20 1.17 0.8152 0.530612
+21 1.23 0.553218 0.591837
+22 1.29 0.670615 0.673469
+23 1.35 0.612339 0.755102
+24 1.41 1.40335 0.959184
+25 1.47 0.516459 1.04082
+26 1.53 0.834316 1.18367
+27 1.59 0.662181 1.30612
+28 1.65 1.33229 1.57143
+29 1.71 0.763351 1.73469
+30 1.77 0.890601 1.93878
+31 1.83 1.58301 2.32653
+32 1.89 1.09355 2.61224
+33 1.95 1.32081 2.97959
+34 2.01 0.690632 3.18367
+35 2.07 0.91165 3.46939
+36 2.13 0.676513 3.69388
+37 2.19 0.872664 4
+38 2.25 1.21256 4.44898
+39 2.31 1.15039 4.89796
+40 2.37 0.844501 5.2449
+41 2.43 0.708807 5.55102
+42 2.49 1.1701 6.08163
+43 2.55 1.02987 6.57143
+44 2.61 0.901143 7.02041
+45 2.67 0.978521 7.53061
+46 2.73 1.08574 8.12245
+47 2.79 0.967854 8.67347
+48 2.85 0.893179 9.20408
+49 2.91 1.02148 9.83673
+50 2.97 0.822464 10.3673
+108700 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 0 0
+9 0.51 0 0
+10 0.57 0.858066 0.0204082
+11 0.63 0 0.0204082
+12 0.69 0 0.0204082
+13 0.75 0.495812 0.0408163
+14 0.81 2.12556 0.142857
+15 0.87 0.368519 0.163265
+16 0.93 0.645037 0.204082
+17 0.99 0.853865 0.265306
+18 1.05 0.253031 0.285714
+19 1.11 0.679267 0.346939
+20 1.17 1.6304 0.510204
+21 1.23 1.10644 0.632653
+22 1.29 1.00592 0.755102
+23 1.35 0.918509 0.877551
+24 1.41 0.982348 1.02041
+25 1.47 0.25823 1.06122
+26 1.53 0.715128 1.18367
+27 1.59 0.551817 1.28571
+28 1.65 1.43477 1.57143
+29 1.71 0.667932 1.71429
+30 1.77 0.979661 1.93878
+31 1.83 0.66653 2.10204
+32 1.89 0.390554 2.20408
+33 1.95 0.807161 2.42857
+34 2.01 1.38126 2.83673
+35 2.07 1.23724 3.22449
+36 2.13 1.16852 3.61224
+37 2.19 1.0472 3.97959
+38 2.25 1.10233 4.38776
+39 2.31 1.0981 4.81633
+40 2.37 1.09288 5.26531
+41 2.43 0.708807 5.57143
+42 2.49 0.765068 5.91837
+43 2.55 0.772402 6.28571
+44 2.61 0.983065 6.77551
+45 2.67 0.93938 7.26531
+46 2.73 0.861105 7.73469
+47 2.79 1.0037 8.30612
+48 2.85 0.893179 8.83673
+49 2.91 1.21919 9.59184
+50 2.97 1.20206 10.3673
+108750 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 0 0
+9 0.51 1.07159 0.0204082
+10 0.57 0 0.0204082
+11 0.63 0 0.0204082
+12 0.69 0 0.0204082
+13 0.75 0.495812 0.0408163
+14 0.81 1.70044 0.122449
+15 0.87 0.737039 0.163265
+16 0.93 1.61259 0.265306
+17 0.99 1.13849 0.346939
+18 1.05 0.759094 0.408163
+19 1.11 0.90569 0.489796
+20 1.17 0.6114 0.55102
+21 1.23 0.922029 0.653061
+22 1.29 0.838269 0.755102
+23 1.35 1.22468 0.918367
+24 1.41 0.842013 1.04082
+25 1.47 1.16203 1.22449
+26 1.53 1.07269 1.40816
+27 1.59 0.441454 1.4898
+28 1.65 1.02484 1.69388
+29 1.71 0.381676 1.77551
+30 1.77 0.890601 1.97959
+31 1.83 1.24974 2.28571
+32 1.89 1.01544 2.55102
+33 1.95 0.880539 2.79592
+34 2.01 0.759695 3.02041
+35 2.07 1.04189 3.34694
+36 2.13 0.676513 3.57143
+37 2.19 0.872664 3.87755
+38 2.25 1.04721 4.26531
+39 2.31 0.941229 4.63265
+40 2.37 0.695471 4.91837
+41 2.43 0.945075 5.32653
+42 2.49 0.855076 5.71429
+43 2.55 1.37316 6.36735
+44 2.61 1.14691 6.93878
+45 2.67 1.09594 7.5102
+46 2.73 0.748787 7.91837
+47 2.79 1.0037 8.4898
+48 2.85 1.20236 9.20408
+49 2.91 1.12034 9.89796
+50 2.97 0.917363 10.4898
+108800 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 0 0
+9 0.51 1.07159 0.0204082
+10 0.57 0 0.0204082
+11 0.63 0 0.0204082
+12 0.69 1.7572 0.0816327
+13 0.75 1.98325 0.163265
+14 0.81 1.27533 0.22449
+15 0.87 0.368519 0.244898
+16 0.93 1.61259 0.346939
+17 0.99 0.284622 0.367347
+18 1.05 0.253031 0.387755
+19 1.11 0.226422 0.408163
+20 1.17 1.019 0.510204
+21 1.23 0.737623 0.591837
+22 1.29 1.00592 0.714286
+23 1.35 0.612339 0.795918
+24 1.41 0.421006 0.857143
+25 1.47 0.774689 0.979592
+26 1.53 1.07269 1.16327
+27 1.59 1.65545 1.46939
+28 1.65 1.33229 1.73469
+29 1.71 1.14503 1.97959
+30 1.77 0.890601 2.18367
+31 1.83 1.16643 2.46939
+32 1.89 1.17166 2.77551
+33 1.95 0.953918 3.04082
+34 2.01 0.897822 3.30612
+35 2.07 0.781414 3.55102
+36 2.13 0.922517 3.85714
+37 2.19 0.756309 4.12245
+38 2.25 1.04721 4.5102
+39 2.31 0.888938 4.85714
+40 2.37 1.14256 5.32653
+41 2.43 1.13409 5.81633
+42 2.49 0.900081 6.22449
+43 2.55 0.858224 6.63265
+44 2.61 0.819221 7.04082
+45 2.67 0.861099 7.4898
+46 2.73 1.08574 8.08163
+47 2.79 0.932007 8.61224
+48 2.85 0.996238 9.20408
+49 2.91 0.955581 9.79592
+50 2.97 1.10716 10.5102
+108850 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 1.83099 0.0204082
+8 0.45 0 0.0204082
+9 0.51 0 0.0204082
+10 0.57 1.71613 0.0612245
+11 0.63 1.40505 0.102041
+12 0.69 0 0.102041
+13 0.75 0.495812 0.122449
+14 0.81 1.70044 0.204082
+15 0.87 0.737039 0.244898
+16 0.93 0.967555 0.306122
+17 0.99 0.853865 0.367347
+18 1.05 1.01213 0.44898
+19 1.11 0.226422 0.469388
+20 1.17 0.4076 0.510204
+21 1.23 0.368812 0.55102
+22 1.29 0.670615 0.632653
+23 1.35 0.765424 0.734694
+24 1.41 0.561342 0.816327
+25 1.47 1.03292 0.979592
+26 1.53 0.59594 1.08163
+27 1.59 1.10363 1.28571
+28 1.65 0.614903 1.40816
+29 1.71 0.954189 1.61224
+30 1.77 1.42496 1.93878
+31 1.83 0.833163 2.14286
+32 1.89 0.468665 2.26531
+33 1.95 0.807161 2.4898
+34 2.01 1.03595 2.79592
+35 2.07 0.716296 3.02041
+36 2.13 0.615011 3.22449
+37 2.19 0.930841 3.55102
+38 2.25 1.21256 4
+39 2.31 1.25497 4.4898
+40 2.37 0.894177 4.85714
+41 2.43 0.803314 5.20408
+42 2.49 1.0801 5.69388
+43 2.55 1.11569 6.22449
+44 2.61 0.819221 6.63265
+45 2.67 1.13508 7.22449
+46 2.73 1.0483 7.79592
+47 2.79 0.932007 8.32653
+48 2.85 0.893179 8.85714
+49 2.91 1.05443 9.5102
+50 2.97 1.26533 10.3265
+108900 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 0 0
+9 0.51 1.07159 0.0204082
+10 0.57 0 0.0204082
+11 0.63 0 0.0204082
+12 0.69 0.585732 0.0408163
+13 0.75 0.495812 0.0612245
+14 0.81 1.27533 0.122449
+15 0.87 0.737039 0.163265
+16 0.93 0.645037 0.204082
+17 0.99 0.569243 0.244898
+18 1.05 0.506063 0.285714
+19 1.11 0.226422 0.306122
+20 1.17 1.4266 0.44898
+21 1.23 1.10644 0.571429
+22 1.29 1.50888 0.755102
+23 1.35 0.918509 0.877551
+24 1.41 0.701677 0.979592
+25 1.47 0.903804 1.12245
+26 1.53 0.715128 1.2449
+27 1.59 0.662181 1.36735
+28 1.65 1.84471 1.73469
+29 1.71 0.85877 1.91837
+30 1.77 1.51402 2.26531
+31 1.83 1.16643 2.55102
+32 1.89 0.859219 2.77551
+33 1.95 0.953918 3.04082
+34 2.01 0.828758 3.28571
+35 2.07 0.455825 3.42857
+36 2.13 0.984018 3.7551
+37 2.19 1.0472 4.12245
+38 2.25 1.37791 4.63265
+39 2.31 0.888938 4.97959
+40 2.37 1.14256 5.44898
+41 2.43 1.03958 5.89796
+42 2.49 0.540048 6.14286
+43 2.55 1.33025 6.77551
+44 2.61 0.942104 7.2449
+45 2.67 0.978521 7.7551
+46 2.73 1.16062 8.38776
+47 2.79 0.896161 8.89796
+48 2.85 1.168 9.59184
+49 2.91 1.08739 10.2653
+50 2.97 0.822464 10.7959
+108950 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 0 0
+9 0.51 0 0
+10 0.57 0 0
+11 0.63 0.702525 0.0204082
+12 0.69 0 0.0204082
+13 0.75 0 0.0204082
+14 0.81 0.425111 0.0408163
+15 0.87 1.10556 0.102041
+16 0.93 0.645037 0.142857
+17 0.99 2.56159 0.326531
+18 1.05 0.506063 0.367347
+19 1.11 0.679267 0.428571
+20 1.17 0.4076 0.469388
+21 1.23 0.553218 0.530612
+22 1.29 0.502961 0.591837
+23 1.35 0.612339 0.673469
+24 1.41 1.68403 0.918367
+25 1.47 1.16203 1.10204
+26 1.53 1.43026 1.34694
+27 1.59 0.551817 1.44898
+28 1.65 1.12732 1.67347
+29 1.71 0.667932 1.81633
+30 1.77 1.06872 2.06122
+31 1.83 0.499898 2.18367
+32 1.89 1.09355 2.46939
+33 1.95 1.0273 2.7551
+34 2.01 1.3122 3.14286
+35 2.07 0.846532 3.40816
+36 2.13 0.861016 3.69388
+37 2.19 0.930841 4.02041
+38 2.25 1.04721 4.40816
+39 2.31 0.888938 4.7551
+40 2.37 0.99353 5.16327
+41 2.43 1.13409 5.65306
+42 2.49 0.990089 6.10204
+43 2.55 0.986958 6.57143
+44 2.61 0.77826 6.95918
+45 2.67 0.821958 7.38776
+46 2.73 0.973423 7.91837
+47 2.79 1.0037 8.4898
+48 2.85 0.893179 9.02041
+49 2.91 0.889679 9.57143
+50 2.97 0.822464 10.102
+109000 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 0 0
+9 0.51 1.07159 0.0204082
+10 0.57 0 0.0204082
+11 0.63 0.702525 0.0408163
+12 0.69 2.34293 0.122449
+13 0.75 0 0.122449
+14 0.81 0.425111 0.142857
+15 0.87 0 0.142857
+16 0.93 0.967555 0.204082
+17 0.99 0.853865 0.265306
+18 1.05 0.506063 0.306122
+19 1.11 0.90569 0.387755
+20 1.17 0.4076 0.428571
+21 1.23 0.368812 0.469388
+22 1.29 0.335308 0.510204
+23 1.35 1.07159 0.653061
+24 1.41 0.982348 0.795918
+25 1.47 1.29115 1
+26 1.53 1.31107 1.22449
+27 1.59 0.662181 1.34694
+28 1.65 0.922354 1.53061
+29 1.71 1.33586 1.81633
+30 1.77 0.979661 2.04082
+31 1.83 0.749847 2.22449
+32 1.89 0.937329 2.46939
+33 1.95 0.733783 2.67347
+34 2.01 1.17407 3.02041
+35 2.07 1.62795 3.53061
+36 2.13 0.984018 3.85714
+37 2.19 1.0472 4.22449
+38 2.25 1.32279 4.71429
+39 2.31 0.575195 4.93878
+40 2.37 0.794824 5.26531
+41 2.43 1.08684 5.73469
+42 2.49 0.945085 6.16327
+43 2.55 0.772402 6.53061
+44 2.61 0.860182 6.95918
+45 2.67 0.978521 7.46939
+46 2.73 1.34782 8.20408
+47 2.79 1.21878 8.89796
+48 2.85 0.755767 9.34694
+49 2.91 1.08739 10.0204
+50 2.97 0.948997 10.6327
+109050 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 1.83099 0.0204082
+8 0.45 0 0.0204082
+9 0.51 1.07159 0.0408163
+10 0.57 0 0.0408163
+11 0.63 0 0.0408163
+12 0.69 0.585732 0.0612245
+13 0.75 0.495812 0.0816327
+14 0.81 0.425111 0.102041
+15 0.87 0.737039 0.142857
+16 0.93 0.322518 0.163265
+17 0.99 0.853865 0.22449
+18 1.05 0 0.22449
+19 1.11 1.13211 0.326531
+20 1.17 0.6114 0.387755
+21 1.23 0.922029 0.489796
+22 1.29 1.67654 0.693878
+23 1.35 0.918509 0.816327
+24 1.41 1.26302 1
+25 1.47 0.774689 1.12245
+26 1.53 1.07269 1.30612
+27 1.59 0.993271 1.4898
+28 1.65 0.717387 1.63265
+29 1.71 0.85877 1.81633
+30 1.77 0.979661 2.04082
+31 1.83 0.916479 2.26531
+32 1.89 1.24977 2.59184
+33 1.95 1.17405 2.91837
+34 2.01 0.897822 3.18367
+35 2.07 0.91165 3.46939
+36 2.13 1.16852 3.85714
+37 2.19 0.465421 4.02041
+38 2.25 0.881861 4.34694
+39 2.31 1.15039 4.79592
+40 2.37 1.14256 5.26531
+41 2.43 0.614299 5.53061
+42 2.49 0.990089 5.97959
+43 2.55 1.07278 6.4898
+44 2.61 0.983065 6.97959
+45 2.67 0.626254 7.30612
+46 2.73 0.823666 7.7551
+47 2.79 1.0037 8.32653
+48 2.85 0.927532 8.87755
+49 2.91 0.757875 9.34694
+50 2.97 0.88573 9.91837
+109100 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 0 0
+9 0.51 0 0
+10 0.57 0.858066 0.0204082
+11 0.63 3.51263 0.122449
+12 0.69 0 0.122449
+13 0.75 0.495812 0.142857
+14 0.81 0.850222 0.183673
+15 0.87 0.737039 0.22449
+16 0.93 1.29007 0.306122
+17 0.99 0.853865 0.367347
+18 1.05 0.506063 0.408163
+19 1.11 0.679267 0.469388
+20 1.17 0.2038 0.489796
+21 1.23 0.922029 0.591837
+22 1.29 1.17358 0.734694
+23 1.35 1.07159 0.877551
+24 1.41 0.701677 0.979592
+25 1.47 0.516459 1.06122
+26 1.53 0.59594 1.16327
+27 1.59 1.10363 1.36735
+28 1.65 1.22981 1.61224
+29 1.71 1.33586 1.89796
+30 1.77 0.80154 2.08163
+31 1.83 1.08311 2.34694
+32 1.89 0.937329 2.59184
+33 1.95 1.10067 2.89796
+34 2.01 1.58845 3.36735
+35 2.07 0.91165 3.65306
+36 2.13 0.55351 3.83673
+37 2.19 1.0472 4.20408
+38 2.25 0.771629 4.4898
+39 2.31 0.575195 4.71429
+40 2.37 0.645795 4.97959
+41 2.43 1.03958 5.42857
+42 2.49 1.03509 5.89796
+43 2.55 0.643668 6.20408
+44 2.61 1.02403 6.71429
+45 2.67 1.09594 7.28571
+46 2.73 0.935984 7.79592
+47 2.79 1.03955 8.38776
+48 2.85 0.996238 8.97959
+49 2.91 0.724924 9.42857
+50 2.97 1.0439 10.102
+109150 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 1.83099 0.0204082
+8 0.45 0 0.0204082
+9 0.51 0 0.0204082
+10 0.57 0 0.0204082
+11 0.63 0.702525 0.0408163
+12 0.69 0 0.0408163
+13 0.75 0.495812 0.0612245
+14 0.81 1.70044 0.142857
+15 0.87 0.368519 0.163265
+16 0.93 0.967555 0.22449
+17 0.99 0.284622 0.244898
+18 1.05 1.51819 0.367347
+19 1.11 0.679267 0.428571
+20 1.17 0.8152 0.510204
+21 1.23 0.922029 0.612245
+22 1.29 0.670615 0.693878
+23 1.35 0.612339 0.77551
+24 1.41 0.701677 0.877551
+25 1.47 0.645574 0.979592
+26 1.53 0.715128 1.10204
+27 1.59 0.662181 1.22449
+28 1.65 0.922354 1.40816
+29 1.71 1.24045 1.67347
+30 1.77 0.53436 1.79592
+31 1.83 1.41638 2.14286
+32 1.89 0.937329 2.38776
+33 1.95 0.807161 2.61224
+34 2.01 1.38126 3.02041
+35 2.07 0.390707 3.14286
+36 2.13 0.984018 3.46939
+37 2.19 1.0472 3.83673
+38 2.25 1.04721 4.22449
+39 2.31 0.888938 4.57143
+40 2.37 0.794824 4.89796
+41 2.43 1.27585 5.44898
+42 2.49 0.585052 5.71429
+43 2.55 0.944046 6.16327
+44 2.61 0.901143 6.61224
+45 2.67 1.13508 7.20408
+46 2.73 0.935984 7.71429
+47 2.79 1.11124 8.34694
+48 2.85 0.927532 8.89796
+49 2.91 1.02148 9.53061
+50 2.97 0.822464 10.0612
+109200 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 0 0
+9 0.51 1.07159 0.0204082
+10 0.57 0 0.0204082
+11 0.63 0.702525 0.0408163
+12 0.69 1.17146 0.0816327
+13 0.75 1.98325 0.163265
+14 0.81 0 0.163265
+15 0.87 0.368519 0.183673
+16 0.93 0.967555 0.244898
+17 0.99 0.284622 0.265306
+18 1.05 0.506063 0.306122
+19 1.11 0.679267 0.367347
+20 1.17 0.4076 0.408163
+21 1.23 1.10644 0.530612
+22 1.29 0.670615 0.612245
+23 1.35 0.918509 0.734694
+24 1.41 1.40335 0.938776
+25 1.47 0.774689 1.06122
+26 1.53 0.357564 1.12245
+27 1.59 0.662181 1.2449
+28 1.65 1.22981 1.4898
+29 1.71 1.62212 1.83673
+30 1.77 0.71248 2
+31 1.83 0.916479 2.22449
+32 1.89 0.702997 2.40816
+33 1.95 1.10067 2.71429
+34 2.01 1.24314 3.08163
+35 2.07 0.651178 3.28571
+36 2.13 1.04552 3.63265
+37 2.19 1.10537 4.02041
+38 2.25 0.826745 4.32653
+39 2.31 0.941229 4.69388
+40 2.37 0.745148 5
+41 2.43 0.992329 5.42857
+42 2.49 0.765068 5.77551
+43 2.55 1.07278 6.28571
+44 2.61 0.77826 6.67347
+45 2.67 1.13508 7.26531
+46 2.73 1.08574 7.85714
+47 2.79 1.03955 8.44898
+48 2.85 0.996238 9.04082
+49 2.91 1.18624 9.77551
+50 2.97 0.790831 10.2857
+109250 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 0 0
+9 0.51 1.07159 0.0204082
+10 0.57 0 0.0204082
+11 0.63 0.702525 0.0408163
+12 0.69 2.34293 0.122449
+13 0.75 0.991624 0.163265
+14 0.81 0.425111 0.183673
+15 0.87 0.737039 0.22449
+16 0.93 0.645037 0.265306
+17 0.99 0.569243 0.306122
+18 1.05 0.506063 0.346939
+19 1.11 0.452845 0.387755
+20 1.17 1.2228 0.510204
+21 1.23 0 0.510204
+22 1.29 1.00592 0.632653
+23 1.35 1.22468 0.795918
+24 1.41 0.701677 0.897959
+25 1.47 0.774689 1.02041
+26 1.53 0.953504 1.18367
+27 1.59 0.772544 1.32653
+28 1.65 0.717387 1.46939
+29 1.71 1.33586 1.7551
+30 1.77 0.80154 1.93878
+31 1.83 0.66653 2.10204
+32 1.89 1.17166 2.40816
+33 1.95 0.587026 2.57143
+34 2.01 0.897822 2.83673
+35 2.07 1.107 3.18367
+36 2.13 0.861016 3.46939
+37 2.19 1.10537 3.85714
+38 2.25 0.992094 4.22449
+39 2.31 1.04581 4.63265
+40 2.37 0.943854 5.02041
+41 2.43 1.18134 5.53061
+42 2.49 1.0801 6.02041
+43 2.55 1.02987 6.5102
+44 2.61 1.06499 7.04082
+45 2.67 1.01766 7.57143
+46 2.73 0.59903 7.89796
+47 2.79 0.967854 8.44898
+48 2.85 0.721414 8.87755
+49 2.91 1.31804 9.69388
+50 2.97 1.07553 10.3878
+109300 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 0 0
+9 0.51 0 0
+10 0.57 0.858066 0.0204082
+11 0.63 0.702525 0.0408163
+12 0.69 0.585732 0.0612245
+13 0.75 2.47906 0.163265
+14 0.81 1.27533 0.22449
+15 0.87 1.8426 0.326531
+16 0.93 0.322518 0.346939
+17 0.99 0.853865 0.408163
+18 1.05 2.02425 0.571429
+19 1.11 0.452845 0.612245
+20 1.17 0.4076 0.653061
+21 1.23 0.184406 0.673469
+22 1.29 1.00592 0.795918
+23 1.35 0.459254 0.857143
+24 1.41 0.701677 0.959184
+25 1.47 1.42026 1.18367
+26 1.53 0.238376 1.22449
+27 1.59 0.882908 1.38776
+28 1.65 0.409935 1.46939
+29 1.71 0.954189 1.67347
+30 1.77 1.06872 1.91837
+31 1.83 0.916479 2.14286
+32 1.89 1.24977 2.46939
+33 1.95 0.807161 2.69388
+34 2.01 1.17407 3.04082
+35 2.07 1.23724 3.42857
+36 2.13 0.861016 3.71429
+37 2.19 1.16355 4.12245
+38 2.25 0.936978 4.46939
+39 2.31 0.627486 4.71429
+40 2.37 0.844501 5.06122
+41 2.43 0.897822 5.44898
+42 2.49 0.810072 5.81633
+43 2.55 1.24442 6.40816
+44 2.61 0.983065 6.89796
+45 2.67 1.13508 7.4898
+46 2.73 1.0483 8.06122
+47 2.79 0.896161 8.57143
+48 2.85 1.20236 9.28571
+49 2.91 1.38395 10.1429
+50 2.97 0.506132 10.4694
+109350 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 0 0
+9 0.51 0 0
+10 0.57 0.858066 0.0204082
+11 0.63 0 0.0204082
+12 0.69 0.585732 0.0408163
+13 0.75 0.495812 0.0612245
+14 0.81 0.850222 0.102041
+15 0.87 0.737039 0.142857
+16 0.93 2.25763 0.285714
+17 0.99 1.13849 0.367347
+18 1.05 0.253031 0.387755
+19 1.11 0.90569 0.469388
+20 1.17 0.4076 0.510204
+21 1.23 0.368812 0.55102
+22 1.29 1.00592 0.673469
+23 1.35 0.765424 0.77551
+24 1.41 1.54369 1
+25 1.47 0.516459 1.08163
+26 1.53 1.19188 1.28571
+27 1.59 0.662181 1.40816
+28 1.65 0.819871 1.57143
+29 1.71 1.43128 1.87755
+30 1.77 0.979661 2.10204
+31 1.83 1.33306 2.42857
+32 1.89 1.01544 2.69388
+33 1.95 0.807161 2.91837
+34 2.01 0.897822 3.18367
+35 2.07 0.716296 3.40816
+36 2.13 0.615011 3.61224
+37 2.19 1.45444 4.12245
+38 2.25 1.15744 4.55102
+39 2.31 1.25497 5.04082
+40 2.37 1.24191 5.55102
+41 2.43 0.992329 5.97959
+42 2.49 0.810072 6.34694
+43 2.55 1.1586 6.89796
+44 2.61 0.942104 7.36735
+45 2.67 1.21337 8
+46 2.73 0.898544 8.4898
+47 2.79 0.752775 8.91837
+48 2.85 0.961885 9.4898
+49 2.91 0.988533 10.102
+50 2.97 0.601031 10.4898
+109400 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 0 0
+9 0.51 2.14319 0.0408163
+10 0.57 0 0.0408163
+11 0.63 0.702525 0.0612245
+12 0.69 0 0.0612245
+13 0.75 0.495812 0.0816327
+14 0.81 1.70044 0.163265
+15 0.87 0.737039 0.204082
+16 0.93 1.61259 0.306122
+17 0.99 0.284622 0.326531
+18 1.05 0 0.326531
+19 1.11 0.226422 0.346939
+20 1.17 1.4266 0.489796
+21 1.23 0.737623 0.571429
+22 1.29 1.17358 0.714286
+23 1.35 0.459254 0.77551
+24 1.41 1.40335 0.979592
+25 1.47 0.903804 1.12245
+26 1.53 0.715128 1.2449
+27 1.59 1.214 1.46939
+28 1.65 1.43477 1.7551
+29 1.71 1.43128 2.06122
+30 1.77 0.4453 2.16327
+31 1.83 0.999796 2.40816
+32 1.89 1.01544 2.67347
+33 1.95 0.807161 2.89796
+34 2.01 1.58845 3.36735
+35 2.07 0.781414 3.61224
+36 2.13 1.10702 3.97959
+37 2.19 0.814486 4.26531
+38 2.25 1.10233 4.67347
+39 2.31 1.04581 5.08163
+40 2.37 0.943854 5.46939
+41 2.43 0.850568 5.83673
+42 2.49 1.30512 6.42857
+43 2.55 1.37316 7.08163
+44 2.61 0.655377 7.40816
+45 2.67 0.93938 7.89796
+46 2.73 0.711348 8.28571
+47 2.79 1.14709 8.93878
+48 2.85 0.927532 9.4898
+49 2.91 1.05443 10.1429
+50 2.97 0.822464 10.6735
+109450 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 0 0
+9 0.51 0 0
+10 0.57 0.858066 0.0204082
+11 0.63 0 0.0204082
+12 0.69 1.17146 0.0612245
+13 0.75 0 0.0612245
+14 0.81 0.425111 0.0816327
+15 0.87 1.10556 0.142857
+16 0.93 1.93511 0.265306
+17 0.99 0.569243 0.306122
+18 1.05 1.01213 0.387755
+19 1.11 0.679267 0.44898
+20 1.17 0.4076 0.489796
+21 1.23 1.10644 0.612245
+22 1.29 1.17358 0.755102
+23 1.35 0.918509 0.877551
+24 1.41 0.982348 1.02041
+25 1.47 1.03292 1.18367
+26 1.53 1.19188 1.38776
+27 1.59 0.441454 1.46939
+28 1.65 1.12732 1.69388
+29 1.71 1.14503 1.93878
+30 1.77 0.71248 2.10204
+31 1.83 1.41638 2.44898
+32 1.89 0.859219 2.67347
+33 1.95 0.660405 2.85714
+34 2.01 0.759695 3.08163
+35 2.07 0.976768 3.38776
+36 2.13 0.799515 3.65306
+37 2.19 0.814486 3.93878
+38 2.25 0.716512 4.20408
+39 2.31 1.0981 4.63265
+40 2.37 1.29159 5.16327
+41 2.43 1.08684 5.63265
+42 2.49 1.21511 6.18367
+43 2.55 0.858224 6.59184
+44 2.61 0.737299 6.95918
+45 2.67 1.09594 7.53061
+46 2.73 1.0483 8.10204
+47 2.79 1.11124 8.73469
+48 2.85 0.961885 9.30612
+49 2.91 1.02148 9.93878
+50 2.97 1.26533 10.7551
+109500 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 0 0
+9 0.51 0 0
+10 0.57 0 0
+11 0.63 2.10758 0.0612245
+12 0.69 0 0.0612245
+13 0.75 1.48744 0.122449
+14 0.81 0.850222 0.163265
+15 0.87 2.21112 0.285714
+16 0.93 0.967555 0.346939
+17 0.99 0.853865 0.408163
+18 1.05 1.01213 0.489796
+19 1.11 0.452845 0.530612
+20 1.17 1.019 0.632653
+21 1.23 1.47525 0.795918
+22 1.29 0.502961 0.857143
+23 1.35 0.612339 0.938776
+24 1.41 0.982348 1.08163
+25 1.47 0.645574 1.18367
+26 1.53 0.834316 1.32653
+27 1.59 0.882908 1.4898
+28 1.65 0.819871 1.65306
+29 1.71 0.85877 1.83673
+30 1.77 1.06872 2.08163
+31 1.83 0.499898 2.20408
+32 1.89 1.01544 2.46939
+33 1.95 0.953918 2.73469
+34 2.01 1.03595 3.04082
+35 2.07 0.91165 3.32653
+36 2.13 1.04552 3.67347
+37 2.19 1.33808 4.14286
+38 2.25 0.771629 4.42857
+39 2.31 1.04581 4.83673
+40 2.37 0.695471 5.12245
+41 2.43 0.992329 5.55102
+42 2.49 0.900081 5.95918
+43 2.55 1.07278 6.46939
+44 2.61 0.983065 6.95918
+45 2.67 1.01766 7.4898
+46 2.73 0.973423 8.02041
+47 2.79 0.824468 8.4898
+48 2.85 0.996238 9.08163
+49 2.91 0.92263 9.65306
+50 2.97 0.664298 10.0816
+109550 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 1.37595 0.0204082
+9 0.51 0 0.0204082
+10 0.57 0 0.0204082
+11 0.63 1.40505 0.0612245
+12 0.69 0.585732 0.0816327
+13 0.75 0.495812 0.102041
+14 0.81 1.27533 0.163265
+15 0.87 0.737039 0.204082
+16 0.93 1.29007 0.285714
+17 0.99 1.99235 0.428571
+18 1.05 0.253031 0.44898
+19 1.11 1.13211 0.55102
+20 1.17 0.6114 0.612245
+21 1.23 1.29084 0.755102
+22 1.29 1.17358 0.897959
+23 1.35 0.612339 0.979592
+24 1.41 1.12268 1.14286
+25 1.47 1.16203 1.32653
+26 1.53 0.715128 1.44898
+27 1.59 0.993271 1.63265
+28 1.65 1.22981 1.87755
+29 1.71 0.954189 2.08163
+30 1.77 1.06872 2.32653
+31 1.83 0.66653 2.4898
+32 1.89 1.09355 2.77551
+33 1.95 0.293513 2.85714
+34 2.01 0.966885 3.14286
+35 2.07 1.04189 3.46939
+36 2.13 1.04552 3.81633
+37 2.19 1.62897 4.38776
+38 2.25 1.04721 4.77551
+39 2.31 0.732067 5.06122
+40 2.37 0.894177 5.42857
+41 2.43 1.13409 5.91837
+42 2.49 0.810072 6.28571
+43 2.55 1.20151 6.85714
+44 2.61 1.06499 7.38776
+45 2.67 0.93938 7.87755
+46 2.73 1.12318 8.4898
+47 2.79 1.18293 9.16327
+48 2.85 0.858826 9.67347
+49 2.91 0.988533 10.2857
+50 2.97 0.822464 10.8163
+109600 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 0 0
+9 0.51 0 0
+10 0.57 0.858066 0.0204082
+11 0.63 0.702525 0.0408163
+12 0.69 2.34293 0.122449
+13 0.75 0.495812 0.142857
+14 0.81 1.70044 0.22449
+15 0.87 1.47408 0.306122
+16 0.93 0.322518 0.326531
+17 0.99 0.853865 0.387755
+18 1.05 1.01213 0.469388
+19 1.11 0.452845 0.510204
+20 1.17 0.2038 0.530612
+21 1.23 0.368812 0.571429
+22 1.29 0.670615 0.653061
+23 1.35 1.07159 0.795918
+24 1.41 0.701677 0.897959
+25 1.47 1.54938 1.14286
+26 1.53 0.357564 1.20408
+27 1.59 0.993271 1.38776
+28 1.65 1.02484 1.59184
+29 1.71 0.667932 1.73469
+30 1.77 1.06872 1.97959
+31 1.83 0.999796 2.22449
+32 1.89 0.859219 2.44898
+33 1.95 0.953918 2.71429
+34 2.01 0.828758 2.95918
+35 2.07 1.04189 3.28571
+36 2.13 0.984018 3.61224
+37 2.19 1.16355 4.02041
+38 2.25 0.881861 4.34694
+39 2.31 0.732067 4.63265
+40 2.37 0.645795 4.89796
+41 2.43 1.37036 5.4898
+42 2.49 1.0801 5.97959
+43 2.55 1.28734 6.59184
+44 2.61 0.942104 7.06122
+45 2.67 1.09594 7.63265
+46 2.73 1.19806 8.28571
+47 2.79 0.932007 8.81633
+48 2.85 0.893179 9.34694
+49 2.91 1.12034 10.0408
+50 2.97 1.3286 10.898
+109650 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 1.37595 0.0204082
+9 0.51 0 0.0204082
+10 0.57 0 0.0204082
+11 0.63 0 0.0204082
+12 0.69 0.585732 0.0408163
+13 0.75 1.48744 0.102041
+14 0.81 0.425111 0.122449
+15 0.87 0.737039 0.163265
+16 0.93 0.645037 0.204082
+17 0.99 0.569243 0.244898
+18 1.05 1.01213 0.326531
+19 1.11 1.35853 0.44898
+20 1.17 1.4266 0.591837
+21 1.23 0.737623 0.673469
+22 1.29 1.00592 0.795918
+23 1.35 0.612339 0.877551
+24 1.41 0.701677 0.979592
+25 1.47 0.774689 1.10204
+26 1.53 1.31107 1.32653
+27 1.59 0.662181 1.44898
+28 1.65 0.922354 1.63265
+29 1.71 0.477094 1.73469
+30 1.77 1.24684 2.02041
+31 1.83 0.999796 2.26531
+32 1.89 0.702997 2.44898
+33 1.95 0.807161 2.67347
+34 2.01 0.759695 2.89796
+35 2.07 1.17212 3.26531
+36 2.13 0.861016 3.55102
+37 2.19 1.0472 3.91837
+38 2.25 0.992094 4.28571
+39 2.31 0.993519 4.67347
+40 2.37 0.844501 5.02041
+41 2.43 0.803314 5.36735
+42 2.49 1.1701 5.89796
+43 2.55 0.686579 6.22449
+44 2.61 0.737299 6.59184
+45 2.67 1.01766 7.12245
+46 2.73 1.31038 7.83673
+47 2.79 0.967854 8.38776
+48 2.85 0.961885 8.95918
+49 2.91 0.823777 9.46939
+50 2.97 1.2337 10.2653
+109700 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 0 0
+9 0.51 0 0
+10 0.57 0.858066 0.0204082
+11 0.63 0.702525 0.0408163
+12 0.69 0 0.0408163
+13 0.75 0.991624 0.0816327
+14 0.81 0.850222 0.122449
+15 0.87 1.10556 0.183673
+16 0.93 0.322518 0.204082
+17 0.99 0.853865 0.265306
+18 1.05 1.26516 0.367347
+19 1.11 0.90569 0.44898
+20 1.17 0.6114 0.510204
+21 1.23 0.737623 0.591837
+22 1.29 0.670615 0.673469
+23 1.35 0.459254 0.734694
+24 1.41 0.842013 0.857143
+25 1.47 0.516459 0.938776
+26 1.53 0.59594 1.04082
+27 1.59 0.551817 1.14286
+28 1.65 1.22981 1.38776
+29 1.71 1.33586 1.67347
+30 1.77 1.15778 1.93878
+31 1.83 0.749847 2.12245
+32 1.89 0.781108 2.32653
+33 1.95 1.39419 2.71429
+34 2.01 0.828758 2.95918
+35 2.07 0.781414 3.20408
+36 2.13 1.04552 3.55102
+37 2.19 0.930841 3.87755
+38 2.25 0.60628 4.10204
+39 2.31 0.993519 4.4898
+40 2.37 0.695471 4.77551
+41 2.43 0.850568 5.14286
+42 2.49 1.1251 5.65306
+43 2.55 0.944046 6.10204
+44 2.61 0.983065 6.59184
+45 2.67 1.33079 7.28571
+46 2.73 1.27294 7.97959
+47 2.79 0.967854 8.53061
+48 2.85 0.996238 9.12245
+49 2.91 0.955581 9.71429
+50 2.97 0.98063 10.3469
+109750 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 1.37595 0.0204082
+9 0.51 0 0.0204082
+10 0.57 0.858066 0.0408163
+11 0.63 1.40505 0.0816327
+12 0.69 1.17146 0.122449
+13 0.75 0.991624 0.163265
+14 0.81 0.850222 0.204082
+15 0.87 0 0.204082
+16 0.93 0.645037 0.244898
+17 0.99 0.284622 0.265306
+18 1.05 0.759094 0.326531
+19 1.11 1.13211 0.428571
+20 1.17 0.8152 0.510204
+21 1.23 0.922029 0.612245
+22 1.29 0.502961 0.673469
+23 1.35 1.07159 0.816327
+24 1.41 0.421006 0.877551
+25 1.47 1.16203 1.06122
+26 1.53 0.59594 1.16327
+27 1.59 1.10363 1.36735
+28 1.65 0.819871 1.53061
+29 1.71 1.90838 1.93878
+30 1.77 1.15778 2.20408
+31 1.83 0.916479 2.42857
+32 1.89 0.702997 2.61224
+33 1.95 0.807161 2.83673
+34 2.01 1.03595 3.14286
+35 2.07 1.62795 3.65306
+36 2.13 1.04552 4
+37 2.19 0.639953 4.22449
+38 2.25 0.826745 4.53061
+39 2.31 1.0981 4.95918
+40 2.37 0.844501 5.30612
+41 2.43 0.897822 5.69388
+42 2.49 0.900081 6.10204
+43 2.55 1.02987 6.59184
+44 2.61 0.737299 6.95918
+45 2.67 0.93938 7.44898
+46 2.73 0.823666 7.89796
+47 2.79 1.36216 8.67347
+48 2.85 0.927532 9.22449
+49 2.91 1.02148 9.85714
+50 2.97 1.20206 10.6327
+109800 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 1.83099 0.0204082
+8 0.45 0 0.0204082
+9 0.51 0 0.0204082
+10 0.57 0.858066 0.0408163
+11 0.63 0.702525 0.0612245
+12 0.69 1.7572 0.122449
+13 0.75 0.991624 0.163265
+14 0.81 0.850222 0.204082
+15 0.87 1.10556 0.265306
+16 0.93 1.29007 0.346939
+17 0.99 1.13849 0.428571
+18 1.05 0.759094 0.489796
+19 1.11 0.452845 0.530612
+20 1.17 0.6114 0.591837
+21 1.23 1.29084 0.734694
+22 1.29 0.670615 0.816327
+23 1.35 1.22468 0.979592
+24 1.41 0.701677 1.08163
+25 1.47 1.03292 1.2449
+26 1.53 1.07269 1.42857
+27 1.59 0.882908 1.59184
+28 1.65 1.02484 1.79592
+29 1.71 0.190838 1.83673
+30 1.77 0.62342 1.97959
+31 1.83 0.499898 2.10204
+32 1.89 1.32788 2.44898
+33 1.95 1.0273 2.73469
+34 2.01 0.966885 3.02041
+35 2.07 1.107 3.36735
+36 2.13 0.676513 3.59184
+37 2.19 1.39626 4.08163
+38 2.25 0.771629 4.36735
+39 2.31 0.575195 4.59184
+40 2.37 0.844501 4.93878
+41 2.43 0.945075 5.34694
+42 2.49 1.35012 5.95918
+43 2.55 1.07278 6.46939
+44 2.61 1.02403 6.97959
+45 2.67 1.21337 7.61224
+46 2.73 0.973423 8.14286
+47 2.79 0.896161 8.65306
+48 2.85 0.961885 9.22449
+49 2.91 0.889679 9.77551
+50 2.97 0.759197 10.2653
+109850 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 0 0
+9 0.51 0 0
+10 0.57 0 0
+11 0.63 0.702525 0.0204082
+12 0.69 0.585732 0.0408163
+13 0.75 0.991624 0.0816327
+14 0.81 1.27533 0.142857
+15 0.87 0.737039 0.183673
+16 0.93 0.322518 0.204082
+17 0.99 1.13849 0.285714
+18 1.05 1.26516 0.387755
+19 1.11 0.90569 0.469388
+20 1.17 0.4076 0.510204
+21 1.23 1.84406 0.714286
+22 1.29 0.335308 0.755102
+23 1.35 0.765424 0.857143
+24 1.41 0.140335 0.877551
+25 1.47 0.903804 1.02041
+26 1.53 0.59594 1.12245
+27 1.59 1.32436 1.36735
+28 1.65 0.512419 1.46939
+29 1.71 0.477094 1.57143
+30 1.77 1.15778 1.83673
+31 1.83 1.08311 2.10204
+32 1.89 0.781108 2.30612
+33 1.95 0.880539 2.55102
+34 2.01 0.759695 2.77551
+35 2.07 1.17212 3.14286
+36 2.13 1.29152 3.57143
+37 2.19 0.756309 3.83673
+38 2.25 1.10233 4.2449
+39 2.31 1.15039 4.69388
+40 2.37 0.99353 5.10204
+41 2.43 1.2286 5.63265
+42 2.49 1.0801 6.12245
+43 2.55 1.07278 6.63265
+44 2.61 1.18787 7.22449
+45 2.67 0.508831 7.4898
+46 2.73 0.711348 7.87755
+47 2.79 0.967854 8.42857
+48 2.85 1.168 9.12245
+49 2.91 1.15329 9.83673
+50 2.97 1.0439 10.5102
+109900 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 1.37595 0.0204082
+9 0.51 0 0.0204082
+10 0.57 0 0.0204082
+11 0.63 1.40505 0.0612245
+12 0.69 0 0.0612245
+13 0.75 0.991624 0.102041
+14 0.81 0.425111 0.122449
+15 0.87 0.368519 0.142857
+16 0.93 0.322518 0.163265
+17 0.99 0.284622 0.183673
+18 1.05 1.51819 0.306122
+19 1.11 1.35853 0.428571
+20 1.17 1.019 0.530612
+21 1.23 0.368812 0.571429
+22 1.29 0.838269 0.673469
+23 1.35 0.612339 0.755102
+24 1.41 1.26302 0.938776
+25 1.47 1.03292 1.10204
+26 1.53 1.07269 1.28571
+27 1.59 0.993271 1.46939
+28 1.65 0.922354 1.65306
+29 1.71 0.381676 1.73469
+30 1.77 0.62342 1.87755
+31 1.83 0.916479 2.10204
+32 1.89 1.24977 2.42857
+33 1.95 0.807161 2.65306
+34 2.01 0.897822 2.91837
+35 2.07 1.30236 3.32653
+36 2.13 0.55351 3.5102
+37 2.19 0.989019 3.85714
+38 2.25 1.10233 4.26531
+39 2.31 0.836648 4.59184
+40 2.37 1.24191 5.10204
+41 2.43 1.2286 5.63265
+42 2.49 0.67506 5.93878
+43 2.55 0.944046 6.38776
+44 2.61 0.942104 6.85714
+45 2.67 1.01766 7.38776
+46 2.73 1.01086 7.93878
+47 2.79 1.07539 8.55102
+48 2.85 0.961885 9.12245
+49 2.91 1.28509 9.91837
+50 2.97 0.948997 10.5306
+109950 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 1.83099 0.0204082
+8 0.45 1.37595 0.0408163
+9 0.51 1.07159 0.0612245
+10 0.57 0 0.0612245
+11 0.63 0 0.0612245
+12 0.69 0.585732 0.0816327
+13 0.75 0.991624 0.122449
+14 0.81 0.850222 0.163265
+15 0.87 0.737039 0.204082
+16 0.93 0.645037 0.244898
+17 0.99 1.42311 0.346939
+18 1.05 1.26516 0.44898
+19 1.11 0.452845 0.489796
+20 1.17 1.6304 0.653061
+21 1.23 0.184406 0.673469
+22 1.29 0.838269 0.77551
+23 1.35 1.07159 0.918367
+24 1.41 1.54369 1.14286
+25 1.47 0.774689 1.26531
+26 1.53 0.59594 1.36735
+27 1.59 1.54509 1.65306
+28 1.65 1.33229 1.91837
+29 1.71 0.85877 2.10204
+30 1.77 0.890601 2.30612
+31 1.83 1.16643 2.59184
+32 1.89 0.937329 2.83673
+33 1.95 0.660405 3.02041
+34 2.01 0.828758 3.26531
+35 2.07 0.781414 3.5102
+36 2.13 1.35303 3.95918
+37 2.19 0.930841 4.28571
+38 2.25 0.716512 4.55102
+39 2.31 1.20268 5.02041
+40 2.37 1.24191 5.53061
+41 2.43 0.803314 5.87755
+42 2.49 0.990089 6.32653
+43 2.55 0.557846 6.59184
+44 2.61 0.983065 7.08163
+45 2.67 0.665394 7.42857
+46 2.73 0.823666 7.87755
+47 2.79 0.896161 8.38776
+48 2.85 0.996238 8.97959
+49 2.91 0.790826 9.46939
+50 2.97 1.17043 10.2245
+110000 50
+1 0.03 0 0
+2 0.09 0 0
+3 0.15 0 0
+4 0.21 0 0
+5 0.27 0 0
+6 0.33 0 0
+7 0.39 0 0
+8 0.45 0 0
+9 0.51 2.14319 0.0408163
+10 0.57 0.858066 0.0612245
+11 0.63 0 0.0612245
+12 0.69 1.17146 0.102041
+13 0.75 0.495812 0.122449
+14 0.81 1.27533 0.183673
+15 0.87 1.10556 0.244898
+16 0.93 0.645037 0.285714
+17 0.99 1.42311 0.387755
+18 1.05 0.759094 0.44898
+19 1.11 0.90569 0.530612
+20 1.17 0.4076 0.571429
+21 1.23 0.368812 0.612245
+22 1.29 0.670615 0.693878
+23 1.35 1.07159 0.836735
+24 1.41 0.561342 0.918367
+25 1.47 1.67849 1.18367
+26 1.53 0.834316 1.32653
+27 1.59 0.772544 1.46939
+28 1.65 1.43477 1.7551
+29 1.71 0.667932 1.89796
+30 1.77 0.80154 2.08163
+31 1.83 1.41638 2.42857
+32 1.89 0.937329 2.67347
+33 1.95 1.0273 2.95918
+34 2.01 1.03595 3.26531
+35 2.07 1.17212 3.63265
+36 2.13 0.676513 3.85714
+37 2.19 1.10537 4.2449
+38 2.25 0.992094 4.61224
+39 2.31 1.0981 5.04082
+40 2.37 0.645795 5.30612
+41 2.43 1.18134 5.81633
+42 2.49 1.1701 6.34694
+43 2.55 1.02987 6.83673
+44 2.61 1.18787 7.42857
+45 2.67 1.17423 8.04082
+46 2.73 0.748787 8.44898
+47 2.79 1.11124 9.08163
+48 2.85 0.893179 9.61224
+49 2.91 0.823777 10.1224
+50 2.97 1.1388 10.8571
diff --git a/examples/USER/misc/ti/in.ti_spring b/examples/USER/misc/ti/in.ti_spring
index 2e853bc5c3..383d4b688c 100644
--- a/examples/USER/misc/ti/in.ti_spring
+++ b/examples/USER/misc/ti/in.ti_spring
@@ -2,7 +2,7 @@
 #
 # Description: nonequilibrium thermodynamic integration. Further details in:
 # R. Freitas, M. Asta, and M. de Koning, Computational Materials Science, (2016)
-# http://dx.doi.org/10.1016/j.commatsci.2015.10.050
+# https://doi.org/10.1016/j.commatsci.2015.10.050
 
 
 #--------------------------- System setup -------------------------------------#
diff --git a/examples/USER/plumed/log.27Nov18.peptide-plumed.g++.1 b/examples/USER/plumed/log.4Feb20.peptide-plumed.g++.1
similarity index 82%
rename from examples/USER/plumed/log.27Nov18.peptide-plumed.g++.1
rename to examples/USER/plumed/log.4Feb20.peptide-plumed.g++.1
index eb67b96fce..fb77bee0cc 100644
--- a/examples/USER/plumed/log.27Nov18.peptide-plumed.g++.1
+++ b/examples/USER/plumed/log.4Feb20.peptide-plumed.g++.1
@@ -1,5 +1,4 @@
-LAMMPS (27 Nov 2018)
-  using 1 OpenMP thread(s) per MPI task
+LAMMPS (4 Feb 2020)
 # Solvated 5-mer peptide
 
 units		real
@@ -39,6 +38,8 @@ read_data	data.peptide
   7 = max # of 1-3 neighbors
   14 = max # of 1-4 neighbors
   18 = max # of special neighbors
+  special bonds CPU = 0.000809431 secs
+  read_data CPU = 0.0102327 secs
 
 neighbor	2.0 bin
 neigh_modify	delay 5
@@ -66,6 +67,7 @@ fix		4 all shake 0.0001 10 100 b 4 6 8 10 12 14 18 a 31
   6 = # of size 3 clusters
   3 = # of size 4 clusters
   640 = # of frozen angles
+  find clusters CPU = 0.000631809 secs
 
 #dump		1 colvar custom 1 dump.colvar.lammpstrj id xu yu zu fx fy fz
 #dump_modify 1 sort id
@@ -77,13 +79,13 @@ variable        pe equal pe
 
 run		101
 PPPM initialization ...
-  using 12-bit tables for long-range coulomb (src/kspace.cpp:321)
+  using 12-bit tables for long-range coulomb (src/kspace.cpp:332)
   G vector (1/distance) = 0.268725
   grid = 15 15 15
   stencil order = 5
   estimated absolute RMS force accuracy = 0.0228209
   estimated relative force accuracy = 6.87243e-05
-  using double precision FFTs
+  using double precision FFTW3
   3d grid and FFT values/proc = 10648 3375
 Neighbor list info ...
   update every 1 steps, delay 5 steps, check yes
@@ -106,7 +108,7 @@ SHAKE stats (type/ave/delta) on step 0
   14 0.96 0
   18 0.957206 4.37979e-05
   31 104.519 0.00396029
-Per MPI rank memory allocation (min/avg/max) = 18.74 | 18.74 | 18.74 Mbytes
+Per MPI rank memory allocation (min/avg/max) = 19.07 | 19.07 | 19.07 Mbytes
 Step Temp TotEng PotEng KinEng E_pair E_bond f_2 
        0    282.10052    -5237.458   -6372.3766    1134.9186    -6442.768    16.557152            0 
       10     276.9783   -5234.3057   -6348.6171    1114.3114   -6421.6171    17.024361   0.47785504 
@@ -129,22 +131,22 @@ SHAKE stats (type/ave/delta) on step 100
   31 104.52 0.000760401
      100    270.40648   -5234.9604   -6322.8327    1087.8723     -6417.73    19.666404 0.0094784372 
      101    270.99811   -5235.8295    -6326.082    1090.2525   -6418.8974    17.285816  0.086681332 
-Loop time of 2.73445 on 1 procs for 101 steps with 2004 atoms
+Loop time of 2.69839 on 1 procs for 101 steps with 2004 atoms
 
-Performance: 6.383 ns/day, 3.760 hours/ns, 36.936 timesteps/s
-99.7% CPU use with 1 MPI tasks x 1 OpenMP threads
+Performance: 6.468 ns/day, 3.711 hours/ns, 37.430 timesteps/s
+99.7% CPU use with 1 MPI tasks x no OpenMP threads
 
 MPI task timing breakdown:
 Section |  min time  |  avg time  |  max time  |%varavg| %total
 ---------------------------------------------------------------
-Pair    | 2.2617     | 2.2617     | 2.2617     |   0.0 | 82.71
-Bond    | 0.0044148  | 0.0044148  | 0.0044148  |   0.0 |  0.16
-Kspace  | 0.17883    | 0.17883    | 0.17883    |   0.0 |  6.54
-Neigh   | 0.23945    | 0.23945    | 0.23945    |   0.0 |  8.76
-Comm    | 0.011672   | 0.011672   | 0.011672   |   0.0 |  0.43
-Output  | 0.00028348 | 0.00028348 | 0.00028348 |   0.0 |  0.01
-Modify  | 0.0365     | 0.0365     | 0.0365     |   0.0 |  1.33
-Other   |            | 0.001611   |            |       |  0.06
+Pair    | 2.2853     | 2.2853     | 2.2853     |   0.0 | 84.69
+Bond    | 0.0065637  | 0.0065637  | 0.0065637  |   0.0 |  0.24
+Kspace  | 0.14949    | 0.14949    | 0.14949    |   0.0 |  5.54
+Neigh   | 0.1938     | 0.1938     | 0.1938     |   0.0 |  7.18
+Comm    | 0.0096588  | 0.0096588  | 0.0096588  |   0.0 |  0.36
+Output  | 0.00039172 | 0.00039172 | 0.00039172 |   0.0 |  0.01
+Modify  | 0.050643   | 0.050643   | 0.050643   |   0.0 |  1.88
+Other   |            | 0.00258    |            |       |  0.10
 
 Nlocal:    2004 ave 2004 max 2004 min
 Histogram: 1 0 0 0 0 0 0 0 0 0
diff --git a/examples/USER/plumed/log.27Nov18.peptide-plumed.g++.4 b/examples/USER/plumed/log.4Feb20.peptide-plumed.g++.4
similarity index 82%
rename from examples/USER/plumed/log.27Nov18.peptide-plumed.g++.4
rename to examples/USER/plumed/log.4Feb20.peptide-plumed.g++.4
index 72b851c2ff..1bbbed6cd8 100644
--- a/examples/USER/plumed/log.27Nov18.peptide-plumed.g++.4
+++ b/examples/USER/plumed/log.4Feb20.peptide-plumed.g++.4
@@ -1,5 +1,4 @@
-LAMMPS (27 Nov 2018)
-  using 1 OpenMP thread(s) per MPI task
+LAMMPS (4 Feb 2020)
 # Solvated 5-mer peptide
 
 units		real
@@ -39,6 +38,8 @@ read_data	data.peptide
   7 = max # of 1-3 neighbors
   14 = max # of 1-4 neighbors
   18 = max # of special neighbors
+  special bonds CPU = 0.00095129 secs
+  read_data CPU = 0.0199838 secs
 
 neighbor	2.0 bin
 neigh_modify	delay 5
@@ -66,6 +67,7 @@ fix		4 all shake 0.0001 10 100 b 4 6 8 10 12 14 18 a 31
   6 = # of size 3 clusters
   3 = # of size 4 clusters
   640 = # of frozen angles
+  find clusters CPU = 0.000829935 secs
 
 #dump		1 colvar custom 1 dump.colvar.lammpstrj id xu yu zu fx fy fz
 #dump_modify 1 sort id
@@ -77,13 +79,13 @@ variable        pe equal pe
 
 run		101
 PPPM initialization ...
-  using 12-bit tables for long-range coulomb (src/kspace.cpp:321)
+  using 12-bit tables for long-range coulomb (src/kspace.cpp:332)
   G vector (1/distance) = 0.268725
   grid = 15 15 15
   stencil order = 5
   estimated absolute RMS force accuracy = 0.0228209
   estimated relative force accuracy = 6.87243e-05
-  using double precision FFTs
+  using double precision FFTW3
   3d grid and FFT values/proc = 4312 960
 Neighbor list info ...
   update every 1 steps, delay 5 steps, check yes
@@ -106,7 +108,7 @@ SHAKE stats (type/ave/delta) on step 0
   14 0.96 0
   18 0.957206 4.37979e-05
   31 104.519 0.00396029
-Per MPI rank memory allocation (min/avg/max) = 15.66 | 15.87 | 16.06 Mbytes
+Per MPI rank memory allocation (min/avg/max) = 16.02 | 16.23 | 16.42 Mbytes
 Step Temp TotEng PotEng KinEng E_pair E_bond f_2 
        0    282.10052    -5237.458   -6372.3766    1134.9186    -6442.768    16.557152            0 
       10     276.9783   -5234.3057   -6348.6171    1114.3114   -6421.6171    17.024361   0.47785504 
@@ -129,22 +131,22 @@ SHAKE stats (type/ave/delta) on step 100
   31 104.52 0.000760401
      100    270.40648   -5234.9604   -6322.8327    1087.8723     -6417.73    19.666404 0.0094784372 
      101    270.99811   -5235.8295    -6326.082    1090.2525   -6418.8974    17.285816  0.086681332 
-Loop time of 0.812799 on 4 procs for 101 steps with 2004 atoms
+Loop time of 0.873215 on 4 procs for 101 steps with 2004 atoms
 
-Performance: 21.472 ns/day, 1.118 hours/ns, 124.262 timesteps/s
-97.5% CPU use with 4 MPI tasks x 1 OpenMP threads
+Performance: 19.987 ns/day, 1.201 hours/ns, 115.664 timesteps/s
+92.5% CPU use with 4 MPI tasks x no OpenMP threads
 
 MPI task timing breakdown:
 Section |  min time  |  avg time  |  max time  |%varavg| %total
 ---------------------------------------------------------------
-Pair    | 0.57957    | 0.59988    | 0.62504    |   2.6 | 73.80
-Bond    | 0.00080013 | 0.0017412  | 0.0028315  |   2.1 |  0.21
-Kspace  | 0.075724   | 0.10008    | 0.12023    |   6.4 | 12.31
-Neigh   | 0.067733   | 0.067947   | 0.068168   |   0.1 |  8.36
-Comm    | 0.01375    | 0.014175   | 0.014681   |   0.3 |  1.74
-Output  | 0.00025511 | 0.00051183 | 0.001277   |   0.0 |  0.06
-Modify  | 0.026406   | 0.026436   | 0.026462   |   0.0 |  3.25
-Other   |            | 0.002027   |            |       |  0.25
+Pair    | 0.58191    | 0.61681    | 0.66371    |   3.8 | 70.64
+Bond    | 0.00099587 | 0.0023546  | 0.0041356  |   2.8 |  0.27
+Kspace  | 0.096162   | 0.14486    | 0.18119    |   8.1 | 16.59
+Neigh   | 0.059843   | 0.059864   | 0.059876   |   0.0 |  6.86
+Comm    | 0.013623   | 0.01368    | 0.013723   |   0.0 |  1.57
+Output  | 0.00031137 | 0.0010193  | 0.0024326  |   2.6 |  0.12
+Modify  | 0.031552   | 0.031697   | 0.032087   |   0.1 |  3.63
+Other   |            | 0.002938   |            |       |  0.34
 
 Nlocal:    501 ave 512 max 492 min
 Histogram: 1 0 0 1 0 1 0 0 0 1
diff --git a/examples/USER/plumed/reference/p.log b/examples/USER/plumed/reference/p.log
index 79d0bbd84c..13a63bdbf1 100644
--- a/examples/USER/plumed/reference/p.log
+++ b/examples/USER/plumed/reference/p.log
@@ -1,12 +1,12 @@
 PLUMED: PLUMED is starting
-PLUMED: Version: 2.4.2 (git: Unknown) compiled on Jul 11 2018 at 19:09:03
-PLUMED: Please cite this paper when using PLUMED [1]
+PLUMED: Version: 2.6.0 (git: Unknown) compiled on Feb 13 2020 at 15:49:44
+PLUMED: Please cite these papers when using PLUMED [1][2]
 PLUMED: For further information see the PLUMED web page at http://www.plumed.org
-PLUMED: Root: /Users/gareth/MD_code/lammps-permanent/lammps/lib/plumed/plumed2-2.4.2/
-PLUMED: For installed feature, see /Users/gareth/MD_code/lammps-permanent/lammps/lib/plumed/plumed2-2.4.2//src/config/config.txt
+PLUMED: Root: /home/akohlmey/compile/lammps/build-gcc/plumed_build-prefix/lib/plumed
+PLUMED: For installed feature, see /home/akohlmey/compile/lammps/build-gcc/plumed_build-prefix/lib/plumed/src/config/config.txt
 PLUMED: Molecular dynamics engine: LAMMPS
 PLUMED: Precision of reals: 8
-PLUMED: Running over 1 node
+PLUMED: Running over 4 nodes
 PLUMED: Number of threads: 1
 PLUMED: Cache line size: 512
 PLUMED: Number of atoms: 2004
@@ -14,13 +14,13 @@ PLUMED: File suffix:
 PLUMED: FILE: plumed.dat
 PLUMED: Action UNITS
 PLUMED:   with label @0
-PLUMED:   length: A
-PLUMED:   energy: kcal/mol
+PLUMED:   length: A = 0.1 nm
+PLUMED:   energy: kcal/mol = 4.184 kj/mol
 PLUMED:   time: ps
 PLUMED:   charge: e
 PLUMED:   mass: amu
 PLUMED:   using physical units
-PLUMED:   inside PLUMED, Boltzmann constant is 0.001987
+PLUMED:   inside PLUMED, Boltzmann constant is 0.0019872
 PLUMED: Action DISTANCE
 PLUMED:   with label dd
 PLUMED:   between atoms 45 48
@@ -44,14 +44,15 @@ PLUMED: Timestep: 0.002000
 PLUMED: KbT has not been set by the MD engine
 PLUMED: It should be set by hand where needed
 PLUMED: Relevant bibliography:
-PLUMED:   [1] Tribello, Bonomi, Branduardi, Camilloni, and Bussi, Comput. Phys. Commun. 185, 604 (2014)
+PLUMED:   [1] The PLUMED consortium, Nat. Methods 16, 670 (2019)
+PLUMED:   [2] Tribello, Bonomi, Branduardi, Camilloni, and Bussi, Comput. Phys. Commun. 185, 604 (2014)
 PLUMED: Please read and cite where appropriate!
 PLUMED: Finished setup
-PLUMED:                                               Cycles        Total      Average      Minumum      Maximum
-PLUMED:                                                    1     0.020354     0.020354     0.020354     0.020354
-PLUMED: 1 Prepare dependencies                           102     0.000256     0.000003     0.000001     0.000006
-PLUMED: 2 Sharing data                                   102     0.010002     0.000098     0.000078     0.000546
-PLUMED: 3 Waiting for data                               102     0.001398     0.000014     0.000011     0.000072
-PLUMED: 4 Calculating (forward loop)                     102     0.001797     0.000018     0.000013     0.000058
-PLUMED: 5 Applying (backward loop)                       102     0.002666     0.000026     0.000022     0.000062
-PLUMED: 6 Update                                         102     0.001126     0.000011     0.000007     0.000055
+PLUMED:                                               Cycles        Total      Average      Minimum      Maximum
+PLUMED:                                                    1     0.010018     0.010018     0.010018     0.010018
+PLUMED: 1 Prepare dependencies                           102     0.000241     0.000002     0.000001     0.000003
+PLUMED: 2 Sharing data                                   102     0.002132     0.000021     0.000006     0.000151
+PLUMED: 3 Waiting for data                               102     0.001640     0.000016     0.000008     0.000067
+PLUMED: 4 Calculating (forward loop)                     102     0.000825     0.000008     0.000005     0.000013
+PLUMED: 5 Applying (backward loop)                       102     0.000522     0.000005     0.000002     0.000015
+PLUMED: 6 Update                                         102     0.001755     0.000017     0.000011     0.000067
diff --git a/examples/USER/qtb/methane_qbmsst/methane_qtb.mod b/examples/USER/qtb/methane_qbmsst/methane_qtb.mod
index 181fb99d00..65bfc5d7f7 100644
--- a/examples/USER/qtb/methane_qbmsst/methane_qtb.mod
+++ b/examples/USER/qtb/methane_qbmsst/methane_qtb.mod
@@ -48,7 +48,7 @@ neigh_modify		every 10 delay 0 check no
 
 
 ## This part equilibrates liquid methane to a temperature of ${temperature}(unit temperatureture) with quantum nuclear effects
-#Initilization
+#Initialization
 velocity		all create ${temperature} 93 dist gaussian sum no mom yes rot yes loop all
 
 #Setup output
diff --git a/examples/USER/qtb/methane_qtb/methane_qtb.in b/examples/USER/qtb/methane_qtb/methane_qtb.in
index f0ea94a221..e31f0695b9 100644
--- a/examples/USER/qtb/methane_qtb/methane_qtb.in
+++ b/examples/USER/qtb/methane_qtb/methane_qtb.in
@@ -54,7 +54,7 @@ neigh_modify		every 10 delay 0 check no
 
 
 ## This part equilibrates liquid methane to a temperature of ${temperature}(unit temperatureture) with quantum nuclear effects
-#Initilization
+#Initialization
 velocity		all create ${temperature} 93 dist gaussian sum no mom yes rot yes loop all
 
 #Setup output
diff --git a/examples/USER/quip/in.molecular b/examples/USER/quip/in.molecular
index 4253399d7c..08921ef865 100644
--- a/examples/USER/quip/in.molecular
+++ b/examples/USER/quip/in.molecular
@@ -17,7 +17,7 @@ pair_style hybrid/overlay lj/cut 8.0 quip
 special_bonds lj/coul 0.999999999 0.999999999 0.999999999
 
 # Intermolecular: OPLS (JACS 118 (45), p. 11225 (1996))
-# Coulomb interactions ommitted for simplicity
+# Coulomb interactions omitted for simplicity
 pair_coeff 1 1 lj/cut 0.0028619844 3.5 # CT
 pair_coeff 2 2 lj/cut 0.0013009018 2.5 # HC
 pair_coeff 1 2 lj/cut 0.0019295487 2.95
diff --git a/examples/USER/quip/log.24Jul17.molecular.g++.1 b/examples/USER/quip/log.24Jul17.molecular.g++.1
index 28fc63579b..ca1b83c268 100644
--- a/examples/USER/quip/log.24Jul17.molecular.g++.1
+++ b/examples/USER/quip/log.24Jul17.molecular.g++.1
@@ -39,7 +39,7 @@ special_bonds lj/coul 0.999999999 0.999999999 0.999999999
   4 = max # of special neighbors
 
 # Intermolecular: OPLS (JACS 118 (45), p. 11225 (1996))
-# Coulomb interactions ommitted for simplicity
+# Coulomb interactions omitted for simplicity
 pair_coeff 1 1 lj/cut 0.0028619844 3.5 # CT
 pair_coeff 2 2 lj/cut 0.0013009018 2.5 # HC
 pair_coeff 1 2 lj/cut 0.0019295487 2.95
diff --git a/examples/USER/quip/log.24Jul17.molecular.g++.4 b/examples/USER/quip/log.24Jul17.molecular.g++.4
index a8be8e77bb..2226e45bfb 100644
--- a/examples/USER/quip/log.24Jul17.molecular.g++.4
+++ b/examples/USER/quip/log.24Jul17.molecular.g++.4
@@ -39,7 +39,7 @@ special_bonds lj/coul 0.999999999 0.999999999 0.999999999
   4 = max # of special neighbors
 
 # Intermolecular: OPLS (JACS 118 (45), p. 11225 (1996))
-# Coulomb interactions ommitted for simplicity
+# Coulomb interactions omitted for simplicity
 pair_coeff 1 1 lj/cut 0.0028619844 3.5 # CT
 pair_coeff 2 2 lj/cut 0.0013009018 2.5 # HC
 pair_coeff 1 2 lj/cut 0.0019295487 2.95
diff --git a/examples/USER/misc/bond_react/nylon,6-6_melt/in.large_nylon_melt b/examples/USER/reaction/nylon,6-6_melt/in.large_nylon_melt
similarity index 100%
rename from examples/USER/misc/bond_react/nylon,6-6_melt/in.large_nylon_melt
rename to examples/USER/reaction/nylon,6-6_melt/in.large_nylon_melt
diff --git a/examples/USER/misc/bond_react/nylon,6-6_melt/log.20Apr18.large_nylon_melt.g++.1 b/examples/USER/reaction/nylon,6-6_melt/log.20Apr18.large_nylon_melt.g++.1
similarity index 100%
rename from examples/USER/misc/bond_react/nylon,6-6_melt/log.20Apr18.large_nylon_melt.g++.1
rename to examples/USER/reaction/nylon,6-6_melt/log.20Apr18.large_nylon_melt.g++.1
diff --git a/examples/USER/misc/bond_react/nylon,6-6_melt/log.20Apr18.large_nylon_melt.g++.4 b/examples/USER/reaction/nylon,6-6_melt/log.20Apr18.large_nylon_melt.g++.4
similarity index 100%
rename from examples/USER/misc/bond_react/nylon,6-6_melt/log.20Apr18.large_nylon_melt.g++.4
rename to examples/USER/reaction/nylon,6-6_melt/log.20Apr18.large_nylon_melt.g++.4
diff --git a/examples/USER/misc/bond_react/nylon,6-6_melt/rxn1_stp1_map b/examples/USER/reaction/nylon,6-6_melt/rxn1_stp1_map
similarity index 100%
rename from examples/USER/misc/bond_react/nylon,6-6_melt/rxn1_stp1_map
rename to examples/USER/reaction/nylon,6-6_melt/rxn1_stp1_map
diff --git a/examples/USER/misc/bond_react/nylon,6-6_melt/rxn1_stp1_reacted.data_template b/examples/USER/reaction/nylon,6-6_melt/rxn1_stp1_reacted.data_template
similarity index 100%
rename from examples/USER/misc/bond_react/nylon,6-6_melt/rxn1_stp1_reacted.data_template
rename to examples/USER/reaction/nylon,6-6_melt/rxn1_stp1_reacted.data_template
diff --git a/examples/USER/misc/bond_react/nylon,6-6_melt/rxn1_stp1_unreacted.data_template b/examples/USER/reaction/nylon,6-6_melt/rxn1_stp1_unreacted.data_template
similarity index 100%
rename from examples/USER/misc/bond_react/nylon,6-6_melt/rxn1_stp1_unreacted.data_template
rename to examples/USER/reaction/nylon,6-6_melt/rxn1_stp1_unreacted.data_template
diff --git a/examples/USER/misc/bond_react/nylon,6-6_melt/rxn1_stp2_map b/examples/USER/reaction/nylon,6-6_melt/rxn1_stp2_map
similarity index 100%
rename from examples/USER/misc/bond_react/nylon,6-6_melt/rxn1_stp2_map
rename to examples/USER/reaction/nylon,6-6_melt/rxn1_stp2_map
diff --git a/examples/USER/misc/bond_react/nylon,6-6_melt/rxn1_stp2_reacted.data_template b/examples/USER/reaction/nylon,6-6_melt/rxn1_stp2_reacted.data_template
similarity index 100%
rename from examples/USER/misc/bond_react/nylon,6-6_melt/rxn1_stp2_reacted.data_template
rename to examples/USER/reaction/nylon,6-6_melt/rxn1_stp2_reacted.data_template
diff --git a/examples/USER/misc/bond_react/nylon,6-6_melt/rxn1_stp2_unreacted.data_template b/examples/USER/reaction/nylon,6-6_melt/rxn1_stp2_unreacted.data_template
similarity index 100%
rename from examples/USER/misc/bond_react/nylon,6-6_melt/rxn1_stp2_unreacted.data_template
rename to examples/USER/reaction/nylon,6-6_melt/rxn1_stp2_unreacted.data_template
diff --git a/examples/USER/reaction/tiny_epoxy/in.tiny_epoxy.stabilized b/examples/USER/reaction/tiny_epoxy/in.tiny_epoxy.stabilized
new file mode 100644
index 0000000000..0e6e97cd46
--- /dev/null
+++ b/examples/USER/reaction/tiny_epoxy/in.tiny_epoxy.stabilized
@@ -0,0 +1,49 @@
+# two molecules DGEBA (diepoxy) and one DETA (linker)
+# two crosslinking reactions
+
+units real
+
+boundary p p p
+
+atom_style full
+
+pair_style lj/class2 8
+
+angle_style class2 
+
+bond_style class2 
+
+dihedral_style class2
+
+improper_style class2
+
+read_data tiny_epoxy.data
+
+velocity all create 300.0 4928459 dist gaussian
+
+molecule mol1 rxn1_stp1_pre.data_template
+molecule mol2 rxn1_stp1_post.data_template
+molecule mol3 rxn1_stp2_post.data_template
+molecule mol4 rxn2_stp1_pre.data_template
+molecule mol5 rxn2_stp1_post.data_template
+molecule mol6 rxn2_stp2_post.data_template
+
+thermo 50
+
+# dump 1 all xyz 1 test_vis.xyz
+
+fix rxns all bond/react stabilization yes statted_grp .03 &
+  react rxn1_stp1 all 1 0.0 5 mol1 mol2 rxn1_stp1.map &
+  react rxn1_stp2 all 1 0.0 5 mol2 mol3 rxn1_stp2.map &
+  react rxn2_stp1 all 1 0.0 5 mol4 mol5 rxn2_stp1.map &
+  react rxn2_stp2 all 1 0.0 5 mol5 mol6 rxn2_stp2.map
+
+
+fix 1 statted_grp_REACT nvt temp 300 300 100
+
+thermo_style custom step temp f_rxns[1] f_rxns[2] f_rxns[3] f_rxns[4]
+
+run 2000
+
+# write_restart restart_longrun
+# write_data restart_longrun.data nofix
diff --git a/examples/USER/reaction/tiny_epoxy/log.20Nov19.tiny_epoxy.stabilized.g++.1 b/examples/USER/reaction/tiny_epoxy/log.20Nov19.tiny_epoxy.stabilized.g++.1
new file mode 100644
index 0000000000..6ca0361513
--- /dev/null
+++ b/examples/USER/reaction/tiny_epoxy/log.20Nov19.tiny_epoxy.stabilized.g++.1
@@ -0,0 +1,172 @@
+LAMMPS (20 Nov 2019)
+
+WARNING-WARNING-WARNING-WARNING-WARNING
+This LAMMPS executable was compiled using C++98 compatibility.
+Please report the compiler info below at https://github.com/lammps/lammps/issues/1659
+GNU C++ 4.8.5
+WARNING-WARNING-WARNING-WARNING-WARNING
+
+Reading data file ...
+  orthogonal box = (10 -10 -15) to (30 20 10)
+  1 by 1 by 1 MPI processor grid
+  reading atoms ...
+  118 atoms
+  scanning bonds ...
+  4 = max bonds/atom
+  scanning angles ...
+  6 = max angles/atom
+  scanning dihedrals ...
+  18 = max dihedrals/atom
+  scanning impropers ...
+  4 = max impropers/atom
+  reading bonds ...
+  123 bonds
+  reading angles ...
+  221 angles
+  reading dihedrals ...
+  302 dihedrals
+  reading impropers ...
+  115 impropers
+Finding 1-2 1-3 1-4 neighbors ...
+  special bond factors lj:   0          0          0         
+  special bond factors coul: 0          0          0         
+  4 = max # of 1-2 neighbors
+  10 = max # of 1-3 neighbors
+  19 = max # of 1-4 neighbors
+  22 = max # of special neighbors
+  special bonds CPU = 0.000286808 secs
+  read_data CPU = 0.00724107 secs
+Read molecule mol1:
+  31 atoms with max type 10
+  30 bonds with max type 15
+  53 angles with max type 29
+  66 dihedrals with max type 39
+  31 impropers with max type 5
+Read molecule mol2:
+  31 atoms with max type 10
+  30 bonds with max type 17
+  55 angles with max type 36
+  75 dihedrals with max type 51
+  34 impropers with max type 5
+Read molecule mol3:
+  31 atoms with max type 11
+  30 bonds with max type 18
+  53 angles with max type 37
+  72 dihedrals with max type 53
+  31 impropers with max type 5
+Read molecule mol4:
+  42 atoms with max type 11
+  41 bonds with max type 18
+  73 angles with max type 41
+  96 dihedrals with max type 54
+  43 impropers with max type 5
+Read molecule mol5:
+  42 atoms with max type 11
+  41 bonds with max type 18
+  75 angles with max type 37
+  108 dihedrals with max type 53
+  46 impropers with max type 5
+Read molecule mol6:
+  42 atoms with max type 11
+  41 bonds with max type 19
+  73 angles with max type 50
+  102 dihedrals with max type 66
+  43 impropers with max type 22
+dynamic group bond_react_MASTER_group defined
+dynamic group statted_grp_REACT defined
+Neighbor list info ...
+  update every 1 steps, delay 10 steps, check yes
+  max neighbors/atom: 2000, page size: 100000
+  master list distance cutoff = 10
+  ghost atom cutoff = 10
+  binsize = 5, bins = 4 6 5
+  2 neighbor lists, perpetual/occasional/extra = 1 1 0
+  (1) pair lj/class2, perpetual
+      attributes: half, newton on
+      pair build: half/bin/newton
+      stencil: half/bin/3d/newton
+      bin: standard
+  (2) fix bond/react, occasional, copy from (1)
+      attributes: half, newton on
+      pair build: copy
+      stencil: none
+      bin: none
+Setting up Verlet run ...
+  Unit style    : real
+  Current step  : 0
+  Time step     : 1
+Per MPI rank memory allocation (min/avg/max) = 17.28 | 17.28 | 17.28 Mbytes
+Step Temp f_rxns[1] f_rxns[2] f_rxns[3] f_rxns[4] 
+       0          300            0            0            0            0 
+      50    391.52956            1            0            0            0 
+     100    475.26826            1            1            0            0 
+     150    605.26215            1            1            1            0 
+     200     545.7485            1            1            1            0 
+     250    461.64929            1            1            1            1 
+     300    452.10611            1            1            1            1 
+     350    379.61671            1            1            1            1 
+     400    331.22444            1            1            1            1 
+     450    275.63969            1            1            1            1 
+     500    316.63407            1            1            1            1 
+     550    261.39841            1            1            1            1 
+     600    313.70928            1            1            1            1 
+     650    294.24011            1            1            1            1 
+     700    285.81736            1            1            1            1 
+     750    340.37496            1            1            1            1 
+     800     333.2496            1            1            1            1 
+     850    307.40826            1            1            1            1 
+     900    304.68718            1            1            1            1 
+     950     328.0289            1            1            1            1 
+    1000    290.22808            1            1            1            1 
+    1050    272.78518            1            1            1            1 
+    1100    291.30546            1            1            1            1 
+    1150    320.33992            1            1            1            1 
+    1200    330.57057            1            1            1            1 
+    1250    300.51008            1            1            1            1 
+    1300     293.6209            1            1            1            1 
+    1350    324.36604            1            1            1            1 
+    1400    331.15408            1            1            1            1 
+    1450    302.23396            1            1            1            1 
+    1500    297.55562            1            1            1            1 
+    1550     277.3187            1            1            1            1 
+    1600    289.66052            1            1            1            1 
+    1650    281.85404            1            1            1            1 
+    1700     293.4999            1            1            1            1 
+    1750    306.21866            1            1            1            1 
+    1800    283.22696            1            1            1            1 
+    1850    295.10473            1            1            1            1 
+    1900     317.3843            1            1            1            1 
+    1950    305.14825            1            1            1            1 
+    2000    289.00911            1            1            1            1 
+Loop time of 1.87066 on 1 procs for 2000 steps with 118 atoms
+
+Performance: 92.374 ns/day, 0.260 hours/ns, 1069.141 timesteps/s
+98.4% CPU use with 1 MPI tasks x no OpenMP threads
+
+MPI task timing breakdown:
+Section |  min time  |  avg time  |  max time  |%varavg| %total
+---------------------------------------------------------------
+Pair    | 0.12832    | 0.12832    | 0.12832    |   0.0 |  6.86
+Bond    | 0.77458    | 0.77458    | 0.77458    |   0.0 | 41.41
+Neigh   | 0.45068    | 0.45068    | 0.45068    |   0.0 | 24.09
+Comm    | 0.029785   | 0.029785   | 0.029785   |   0.0 |  1.59
+Output  | 0.31635    | 0.31635    | 0.31635    |   0.0 | 16.91
+Modify  | 0.16657    | 0.16657    | 0.16657    |   0.0 |  8.90
+Other   |            | 0.004368   |            |       |  0.23
+
+Nlocal:    118 ave 118 max 118 min
+Histogram: 1 0 0 0 0 0 0 0 0 0
+Nghost:    332 ave 332 max 332 min
+Histogram: 1 0 0 0 0 0 0 0 0 0
+Neighs:    4338 ave 4338 max 4338 min
+Histogram: 1 0 0 0 0 0 0 0 0 0
+
+Total # of neighbors = 4338
+Ave neighs/atom = 36.7627
+Ave special neighs/atom = 10.5763
+Neighbor list builds = 2000
+Dangerous builds = 0
+
+Please see the log.cite file for references relevant to this simulation
+
+Total wall time: 0:00:02
diff --git a/examples/USER/reaction/tiny_epoxy/log.20Nov19.tiny_epoxy.stabilized.g++.4 b/examples/USER/reaction/tiny_epoxy/log.20Nov19.tiny_epoxy.stabilized.g++.4
new file mode 100644
index 0000000000..4673ba3980
--- /dev/null
+++ b/examples/USER/reaction/tiny_epoxy/log.20Nov19.tiny_epoxy.stabilized.g++.4
@@ -0,0 +1,172 @@
+LAMMPS (20 Nov 2019)
+
+WARNING-WARNING-WARNING-WARNING-WARNING
+This LAMMPS executable was compiled using C++98 compatibility.
+Please report the compiler info below at https://github.com/lammps/lammps/issues/1659
+GNU C++ 4.8.5
+WARNING-WARNING-WARNING-WARNING-WARNING
+
+Reading data file ...
+  orthogonal box = (10 -10 -15) to (30 20 10)
+  1 by 2 by 2 MPI processor grid
+  reading atoms ...
+  118 atoms
+  scanning bonds ...
+  4 = max bonds/atom
+  scanning angles ...
+  6 = max angles/atom
+  scanning dihedrals ...
+  18 = max dihedrals/atom
+  scanning impropers ...
+  4 = max impropers/atom
+  reading bonds ...
+  123 bonds
+  reading angles ...
+  221 angles
+  reading dihedrals ...
+  302 dihedrals
+  reading impropers ...
+  115 impropers
+Finding 1-2 1-3 1-4 neighbors ...
+  special bond factors lj:   0          0          0         
+  special bond factors coul: 0          0          0         
+  4 = max # of 1-2 neighbors
+  10 = max # of 1-3 neighbors
+  19 = max # of 1-4 neighbors
+  22 = max # of special neighbors
+  special bonds CPU = 0.000239905 secs
+  read_data CPU = 0.0080783 secs
+Read molecule mol1:
+  31 atoms with max type 10
+  30 bonds with max type 15
+  53 angles with max type 29
+  66 dihedrals with max type 39
+  31 impropers with max type 5
+Read molecule mol2:
+  31 atoms with max type 10
+  30 bonds with max type 17
+  55 angles with max type 36
+  75 dihedrals with max type 51
+  34 impropers with max type 5
+Read molecule mol3:
+  31 atoms with max type 11
+  30 bonds with max type 18
+  53 angles with max type 37
+  72 dihedrals with max type 53
+  31 impropers with max type 5
+Read molecule mol4:
+  42 atoms with max type 11
+  41 bonds with max type 18
+  73 angles with max type 41
+  96 dihedrals with max type 54
+  43 impropers with max type 5
+Read molecule mol5:
+  42 atoms with max type 11
+  41 bonds with max type 18
+  75 angles with max type 37
+  108 dihedrals with max type 53
+  46 impropers with max type 5
+Read molecule mol6:
+  42 atoms with max type 11
+  41 bonds with max type 19
+  73 angles with max type 50
+  102 dihedrals with max type 66
+  43 impropers with max type 22
+dynamic group bond_react_MASTER_group defined
+dynamic group statted_grp_REACT defined
+Neighbor list info ...
+  update every 1 steps, delay 10 steps, check yes
+  max neighbors/atom: 2000, page size: 100000
+  master list distance cutoff = 10
+  ghost atom cutoff = 10
+  binsize = 5, bins = 4 6 5
+  2 neighbor lists, perpetual/occasional/extra = 1 1 0
+  (1) pair lj/class2, perpetual
+      attributes: half, newton on
+      pair build: half/bin/newton
+      stencil: half/bin/3d/newton
+      bin: standard
+  (2) fix bond/react, occasional, copy from (1)
+      attributes: half, newton on
+      pair build: copy
+      stencil: none
+      bin: none
+Setting up Verlet run ...
+  Unit style    : real
+  Current step  : 0
+  Time step     : 1
+Per MPI rank memory allocation (min/avg/max) = 16.26 | 16.45 | 16.63 Mbytes
+Step Temp f_rxns[1] f_rxns[2] f_rxns[3] f_rxns[4] 
+       0          300            0            0            0            0 
+      50    391.52956            1            0            0            0 
+     100    475.26826            1            1            0            0 
+     150    605.26215            1            1            1            0 
+     200     545.7485            1            1            1            0 
+     250    461.64929            1            1            1            1 
+     300    452.10611            1            1            1            1 
+     350    379.61671            1            1            1            1 
+     400    331.22444            1            1            1            1 
+     450    275.63969            1            1            1            1 
+     500    316.63407            1            1            1            1 
+     550    261.39841            1            1            1            1 
+     600    313.70928            1            1            1            1 
+     650    294.24011            1            1            1            1 
+     700    285.81736            1            1            1            1 
+     750    340.37496            1            1            1            1 
+     800     333.2496            1            1            1            1 
+     850    307.40826            1            1            1            1 
+     900    304.68718            1            1            1            1 
+     950     328.0289            1            1            1            1 
+    1000    290.22808            1            1            1            1 
+    1050    272.78518            1            1            1            1 
+    1100    291.30546            1            1            1            1 
+    1150    320.33992            1            1            1            1 
+    1200    330.57057            1            1            1            1 
+    1250    300.51008            1            1            1            1 
+    1300     293.6209            1            1            1            1 
+    1350    324.36604            1            1            1            1 
+    1400    331.15408            1            1            1            1 
+    1450    302.23396            1            1            1            1 
+    1500    297.55562            1            1            1            1 
+    1550     277.3187            1            1            1            1 
+    1600    289.66052            1            1            1            1 
+    1650    281.85404            1            1            1            1 
+    1700     293.4999            1            1            1            1 
+    1750    306.21866            1            1            1            1 
+    1800    283.22695            1            1            1            1 
+    1850    295.10472            1            1            1            1 
+    1900    317.38431            1            1            1            1 
+    1950    305.14824            1            1            1            1 
+    2000    289.00909            1            1            1            1 
+Loop time of 0.689125 on 4 procs for 2000 steps with 118 atoms
+
+Performance: 250.753 ns/day, 0.096 hours/ns, 2902.231 timesteps/s
+100.0% CPU use with 4 MPI tasks x no OpenMP threads
+
+MPI task timing breakdown:
+Section |  min time  |  avg time  |  max time  |%varavg| %total
+---------------------------------------------------------------
+Pair    | 0.02002    | 0.030617   | 0.053133   |   7.7 |  4.44
+Bond    | 0.10356    | 0.18908    | 0.22691    |  11.6 | 27.44
+Neigh   | 0.16721    | 0.17002    | 0.17247    |   0.5 | 24.67
+Comm    | 0.057286   | 0.12002    | 0.21612    |  17.0 | 17.42
+Output  | 0.00028991 | 0.00034121 | 0.00049323 |   0.0 |  0.05
+Modify  | 0.17626    | 0.17675    | 0.17721    |   0.1 | 25.65
+Other   |            | 0.002287   |            |       |  0.33
+
+Nlocal:    29.5 ave 41 max 18 min
+Histogram: 1 0 0 1 0 0 1 0 0 1
+Nghost:    306 ave 349 max 269 min
+Histogram: 1 1 0 0 0 0 1 0 0 1
+Neighs:    1084.5 ave 2154 max 397 min
+Histogram: 1 0 1 1 0 0 0 0 0 1
+
+Total # of neighbors = 4338
+Ave neighs/atom = 36.7627
+Ave special neighs/atom = 10.5763
+Neighbor list builds = 2000
+Dangerous builds = 0
+
+Please see the log.cite file for references relevant to this simulation
+
+Total wall time: 0:00:01
diff --git a/examples/USER/reaction/tiny_epoxy/rxn1_stp1.map b/examples/USER/reaction/tiny_epoxy/rxn1_stp1.map
new file mode 100644
index 0000000000..fb8720be63
--- /dev/null
+++ b/examples/USER/reaction/tiny_epoxy/rxn1_stp1.map
@@ -0,0 +1,47 @@
+this is a map file
+
+1 edgeIDs
+31 equivalences
+
+BondingIDs
+
+15
+1
+
+EdgeIDs
+
+5
+
+Equivalences
+
+1	1
+2	2
+3	3
+4	4
+5	5
+6	6
+7	7
+8	8
+9	9
+10	10
+11	11
+12	12
+13	13
+14	14
+15	15
+16	16
+17	17
+18	18
+19	19
+20	20
+21  21
+22  22
+23  23
+24  24
+25  25
+26  26
+27  27
+28  28
+29  29
+30	30
+31  31
diff --git a/examples/USER/reaction/tiny_epoxy/rxn1_stp1_post.data_template b/examples/USER/reaction/tiny_epoxy/rxn1_stp1_post.data_template
new file mode 100644
index 0000000000..e510883432
--- /dev/null
+++ b/examples/USER/reaction/tiny_epoxy/rxn1_stp1_post.data_template
@@ -0,0 +1,315 @@
+rxn1_stp1_post
+
+31 atoms           
+30 bonds           
+55 angles           
+75 dihedrals           
+34 impropers           
+
+Types
+
+1 1
+2 6
+3 1
+4 7
+5 4
+6 7
+7 8
+8 8
+9 8
+10 8
+11 8
+12 9
+13 1
+14 1
+15 9
+16 9
+17 1
+18 1
+19 10
+20 8
+21 8
+22 8
+23 8
+24 10
+25 10
+26 10
+27 10
+28 8
+29 8
+30 8
+31 8
+
+Charges
+
+1 0.000000
+2 0.000000
+3 0.000000
+4 0.100000
+5 0.000000
+6 0.000000
+7 0.000000
+8 0.000000
+9 0.000000
+10 0.000000
+11 0.000000
+12 0.000000
+13 0.000000
+14 0.000000
+15 -0.025000
+16 -0.025000
+17 0.000000
+18 0.000000
+19 0.000000
+20 0.000000
+21 0.000000
+22 0.000000
+23 0.000000
+24 0.000000
+25 0.000000
+26 0.000000
+27 0.000000
+28 0.000000
+29 0.000000
+30 0.000000
+31 0.000000
+
+Coords
+
+1 22.582573 10.988183 -5.014054
+2 23.904713 10.750493 -4.202215
+3 23.989172 9.487042 -3.323374
+4 24.067001 11.723383 -4.037435
+5 24.627851 7.325302 -3.319944
+6 24.554632 8.418972 -4.080365
+7 22.667763 11.445703 -5.999605
+8 21.787441 10.247643 -4.916974
+9 24.964962 10.712683 -4.449374
+10 24.616703 9.689913 -2.456034
+11 22.989313 9.208153 -2.991455
+12 18.808882 13.758042 -3.958724
+13 19.293213 12.549683 -3.196594
+14 20.810543 12.417832 -3.417504
+15 21.090193 12.251203 -4.891234
+16 17.657042 16.437199 -3.985224
+17 19.126713 16.210239 -4.245154
+18 19.589151 14.957593 -3.479565
+19 19.000433 13.609432 -5.041715
+20 18.761223 11.614392 -3.573184
+21 19.082903 12.688992 -2.085145
+22 21.202852 11.511562 -2.848624
+23 21.328482 13.360252 -3.038924
+24 19.949852 12.199403 -5.680355
+25 21.477343 13.247442 -5.445915
+26 17.080341 15.555528 -4.334374
+27 17.319832 17.341927 -4.532204
+28 19.720472 17.115158 -3.887564
+29 19.298622 16.058659 -5.361685
+30 19.410772 15.105113 -2.363724
+31 20.700163 14.782252 -3.666344
+
+Bonds
+
+1 1 1 8
+2 16 1 2
+3 1 1 7
+4 13 1 15
+5 16 3 2
+6 12 2 9
+7 17 2 4
+8 3 3 6
+9 1 3 10
+10 1 3 11
+11 8 6 5
+12 13 13 12
+13 13 18 12
+14 14 12 19
+15 15 13 14
+16 1 13 20
+17 1 13 21
+18 13 14 15
+19 1 14 22
+20 1 14 23
+21 14 15 24
+22 14 15 25
+23 13 17 16
+24 14 16 26
+25 14 16 27
+26 15 17 18
+27 1 17 28
+28 1 17 29
+29 1 18 30
+30 1 18 31
+
+Angles
+
+1 30 2 1 8
+2 2 8 1 7
+3 26 8 1 15
+4 30 2 1 7
+5 31 2 1 15
+6 26 7 1 15
+7 32 1 2 3
+8 33 1 2 9
+9 34 1 2 4
+10 33 3 2 9
+11 34 3 2 4
+12 35 4 2 9
+13 36 2 3 6
+14 30 2 3 10
+15 30 2 3 11
+16 3 6 3 10
+17 3 6 3 11
+18 2 10 3 11
+19 22 3 6 5
+20 23 13 12 18
+21 24 13 12 19
+22 24 18 12 19
+23 25 14 13 12
+24 26 20 13 12
+25 26 21 13 12
+26 27 14 13 20
+27 27 14 13 21
+28 2 20 13 21
+29 25 13 14 15
+30 27 13 14 22
+31 27 13 14 23
+32 26 22 14 15
+33 26 23 14 15
+34 2 22 14 23
+35 23 1 15 14
+36 24 1 15 24
+37 24 1 15 25
+38 24 14 15 24
+39 24 14 15 25
+40 28 24 15 25
+41 24 17 16 26
+42 24 17 16 27
+43 28 26 16 27
+44 25 18 17 16
+45 26 28 17 16
+46 26 29 17 16
+47 27 18 17 28
+48 27 18 17 29
+49 2 28 17 29
+50 25 17 18 12
+51 26 30 18 12
+52 26 31 18 12
+53 27 17 18 30
+54 27 17 18 31
+55 2 30 18 31
+
+Dihedrals
+
+1 40 8 1 2 3
+2 41 8 1 2 9
+3 42 8 1 2 4
+4 40 7 1 2 3
+5 41 7 1 2 9
+6 42 7 1 2 4
+7 43 15 1 2 3
+8 44 15 1 2 9
+9 45 15 1 2 4
+10 28 8 1 15 14
+11 30 8 1 15 24
+12 30 8 1 15 25
+13 46 2 1 15 14
+14 47 2 1 15 24
+15 47 2 1 15 25
+16 28 7 1 15 14
+17 30 7 1 15 24
+18 30 7 1 15 25
+19 48 6 3 2 1
+20 40 10 3 2 1
+21 40 11 3 2 1
+22 49 6 3 2 9
+23 41 10 3 2 9
+24 41 11 3 2 9
+25 50 6 3 2 4
+26 42 10 3 2 4
+27 42 11 3 2 4
+28 51 2 3 6 5
+29 7 10 3 6 5
+30 7 11 3 6 5
+31 27 14 13 12 18
+32 28 20 13 12 18
+33 28 21 13 12 18
+34 29 14 13 12 19
+35 30 20 13 12 19
+36 30 21 13 12 19
+37 27 17 18 12 13
+38 28 30 18 12 13
+39 28 31 18 12 13
+40 29 17 18 12 19
+41 30 30 18 12 19
+42 30 31 18 12 19
+43 31 12 13 14 15
+44 32 22 14 13 12
+45 32 23 14 13 12
+46 32 20 13 14 15
+47 33 20 13 14 22
+48 33 20 13 14 23
+49 32 21 13 14 15
+50 33 21 13 14 22
+51 33 21 13 14 23
+52 27 13 14 15 1
+53 29 13 14 15 24
+54 29 13 14 15 25
+55 28 22 14 15 1
+56 30 22 14 15 24
+57 30 22 14 15 25
+58 28 23 14 15 1
+59 30 23 14 15 24
+60 30 23 14 15 25
+61 29 18 17 16 26
+62 30 28 17 16 26
+63 30 29 17 16 26
+64 29 18 17 16 27
+65 30 28 17 16 27
+66 30 29 17 16 27
+67 31 16 17 18 12
+68 32 30 18 17 16
+69 32 31 18 17 16
+70 32 28 17 18 12
+71 33 28 17 18 30
+72 33 28 17 18 31
+73 32 29 17 18 12
+74 33 29 17 18 30
+75 33 29 17 18 31
+
+Impropers
+
+1 4 13 12 18 19
+2 5 17 16 26 27
+3 1 2 1 8 7
+4 1 2 1 8 15
+5 1 8 1 7 15
+6 1 2 1 7 15
+7 1 1 2 3 9
+8 1 1 2 3 4
+9 1 1 2 4 9
+10 1 3 2 4 9
+11 1 2 3 6 10
+12 1 2 3 6 11
+13 1 2 3 10 11
+14 1 6 3 10 11
+15 1 14 13 20 12
+16 1 14 13 21 12
+17 1 20 13 21 12
+18 1 14 13 20 21
+19 1 13 14 22 15
+20 1 13 14 23 15
+21 1 13 14 22 23
+22 1 22 14 23 15
+23 1 1 15 14 24
+24 1 1 15 14 25
+25 1 1 15 24 25
+26 1 14 15 24 25
+27 1 18 17 28 16
+28 1 18 17 29 16
+29 1 28 17 29 16
+30 1 18 17 28 29
+31 1 17 18 30 12
+32 1 17 18 31 12
+33 1 30 18 31 12
+34 1 17 18 30 31
diff --git a/examples/USER/reaction/tiny_epoxy/rxn1_stp1_pre.data_template b/examples/USER/reaction/tiny_epoxy/rxn1_stp1_pre.data_template
new file mode 100644
index 0000000000..dd767a4cba
--- /dev/null
+++ b/examples/USER/reaction/tiny_epoxy/rxn1_stp1_pre.data_template
@@ -0,0 +1,301 @@
+rxn1_stp1_pre
+
+31 atoms           
+30 bonds           
+53 angles           
+66 dihedrals           
+31 impropers           
+
+Types
+
+1 2
+2 2
+3 1
+4 3
+5 4
+6 7
+7 8
+8 8
+9 8
+10 8
+11 8
+12 9
+13 1
+14 1
+15 9
+16 9
+17 1
+18 1
+19 10
+20 8
+21 8
+22 8
+23 8
+24 10
+25 10
+26 10
+27 10
+28 8
+29 8
+30 8
+31 8
+
+Charges
+
+1 0.000000
+2 0.000000
+3 0.000000
+4 0.100000
+5 0.000000
+6 0.000000
+7 0.000000
+8 0.000000
+9 0.000000
+10 0.000000
+11 0.000000
+12 0.000000
+13 0.000000
+14 0.000000
+15 -0.025000
+16 -0.025000
+17 0.000000
+18 0.000000
+19 0.000000
+20 0.000000
+21 0.000000
+22 0.000000
+23 0.000000
+24 0.000000
+25 0.000000
+26 0.000000
+27 0.000000
+28 0.000000
+29 0.000000
+30 0.000000
+31 0.000000
+
+Coords
+
+1 19.846882 9.569666 -1.229588
+2 21.168802 9.331466 -0.418038
+3 21.253012 8.067936 0.460722
+4 20.170443 10.460656 0.020692
+5 21.891691 5.906196 0.464152
+6 21.818472 6.999866 -0.296268
+7 19.932211 10.027435 -2.215008
+8 19.051722 8.829116 -1.132808
+9 22.229073 9.293536 -0.665088
+10 21.880442 8.270676 1.328162
+11 20.253073 7.789126 0.792482
+12 16.072590 12.338870 -0.174330
+13 16.557261 11.130320 0.587290
+14 18.074570 10.998810 0.366080
+15 18.353970 10.832370 -1.107720
+16 14.920720 15.017820 -0.200530
+17 16.390430 14.791100 -0.460440
+18 16.852980 13.538320 0.304870
+19 16.263750 12.190560 -1.257430
+20 16.025360 10.195070 0.210470
+21 16.347120 11.269210 1.698830
+22 18.467180 10.092570 0.934800
+23 18.592390 11.941300 0.744640
+24 17.843861 9.919930 -1.479780
+25 19.448191 10.736480 -1.267520
+26 14.344120 14.136250 -0.550130
+27 14.583470 15.922760 -0.747140
+28 16.984060 15.696010 -0.102600
+29 16.562420 14.639820 -1.577000
+30 16.674820 13.685670 1.420760
+31 17.963949 13.362980 0.117850
+
+Bonds
+
+1 6 1 8
+2 4 1 4
+3 5 1 2
+4 6 1 7
+5 4 2 4
+6 2 2 3
+7 6 2 9
+8 3 3 6
+9 1 3 10
+10 1 3 11
+11 8 5 6
+12 13 13 12
+13 13 18 12
+14 14 12 19
+15 15 13 14
+16 1 13 20
+17 1 13 21
+18 13 14 15
+19 1 14 22
+20 1 14 23
+21 14 15 24
+22 14 15 25
+23 13 17 16
+24 14 16 26
+25 14 16 27
+26 15 17 18
+27 1 17 28
+28 1 17 29
+29 1 18 30
+30 1 18 31
+
+Angles
+
+1 9 4 1 8
+2 10 2 1 8
+3 11 8 1 7
+4 8 2 1 4
+5 9 4 1 7
+6 10 2 1 7
+7 8 1 2 4
+8 29 1 2 3
+9 10 1 2 9
+10 5 3 2 4
+11 9 4 2 9
+12 7 3 2 9
+13 4 2 3 6
+14 1 2 3 10
+15 1 2 3 11
+16 3 6 3 10
+17 3 6 3 11
+18 2 10 3 11
+19 12 1 4 2
+20 22 3 6 5
+21 23 13 12 18
+22 24 13 12 19
+23 24 18 12 19
+24 25 14 13 12
+25 26 20 13 12
+26 26 21 13 12
+27 27 14 13 20
+28 27 14 13 21
+29 2 20 13 21
+30 25 13 14 15
+31 27 13 14 22
+32 27 13 14 23
+33 26 22 14 15
+34 26 23 14 15
+35 2 22 14 23
+36 24 14 15 24
+37 24 14 15 25
+38 28 24 15 25
+39 24 17 16 26
+40 24 17 16 27
+41 28 26 16 27
+42 25 18 17 16
+43 26 28 17 16
+44 26 29 17 16
+45 27 18 17 28
+46 27 18 17 29
+47 2 28 17 29
+48 25 17 18 12
+49 26 30 18 12
+50 26 31 18 12
+51 27 17 18 30
+52 27 17 18 31
+53 2 30 18 31
+
+Dihedrals
+
+1 10 8 1 4 2
+2 10 7 1 4 2
+3 13 4 2 1 8
+4 12 3 2 1 8
+5 14 8 1 2 9
+6 11 3 2 1 4
+7 13 4 1 2 9
+8 13 4 2 1 7
+9 12 3 2 1 7
+10 14 7 1 2 9
+11 9 3 2 4 1
+12 10 9 2 4 1
+13 34 1 2 3 6
+14 35 1 2 3 10
+15 35 1 2 3 11
+16 36 4 2 3 6
+17 37 4 2 3 10
+18 37 4 2 3 11
+19 38 9 2 3 6
+20 39 9 2 3 10
+21 39 9 2 3 11
+22 8 2 3 6 5
+23 7 10 3 6 5
+24 7 11 3 6 5
+25 27 14 13 12 18
+26 28 20 13 12 18
+27 28 21 13 12 18
+28 29 14 13 12 19
+29 30 20 13 12 19
+30 30 21 13 12 19
+31 27 17 18 12 13
+32 28 30 18 12 13
+33 28 31 18 12 13
+34 29 17 18 12 19
+35 30 30 18 12 19
+36 30 31 18 12 19
+37 31 12 13 14 15
+38 32 22 14 13 12
+39 32 23 14 13 12
+40 32 20 13 14 15
+41 33 20 13 14 22
+42 33 20 13 14 23
+43 32 21 13 14 15
+44 33 21 13 14 22
+45 33 21 13 14 23
+46 29 13 14 15 24
+47 29 13 14 15 25
+48 30 22 14 15 24
+49 30 22 14 15 25
+50 30 23 14 15 24
+51 30 23 14 15 25
+52 29 18 17 16 26
+53 30 28 17 16 26
+54 30 29 17 16 26
+55 29 18 17 16 27
+56 30 28 17 16 27
+57 30 29 17 16 27
+58 31 16 17 18 12
+59 32 30 18 17 16
+60 32 31 18 17 16
+61 32 28 17 18 12
+62 33 28 17 18 30
+63 33 28 17 18 31
+64 32 29 17 18 12
+65 33 29 17 18 30
+66 33 29 17 18 31
+
+Impropers
+
+1 4 13 12 18 19
+2 5 14 15 24 25
+3 5 17 16 26 27
+4 1 2 1 4 8
+5 1 4 1 8 7
+6 1 2 1 8 7
+7 1 2 1 4 7
+8 1 1 2 3 4
+9 1 1 2 4 9
+10 1 1 2 3 9
+11 1 3 2 4 9
+12 1 2 3 6 10
+13 1 2 3 6 11
+14 1 2 3 10 11
+15 1 6 3 10 11
+16 1 14 13 20 12
+17 1 14 13 21 12
+18 1 20 13 21 12
+19 1 14 13 20 21
+20 1 13 14 22 15
+21 1 13 14 23 15
+22 1 13 14 22 23
+23 1 22 14 23 15
+24 1 18 17 28 16
+25 1 18 17 29 16
+26 1 28 17 29 16
+27 1 18 17 28 29
+28 1 17 18 30 12
+29 1 17 18 31 12
+30 1 30 18 31 12
+31 1 17 18 30 31
diff --git a/examples/USER/reaction/tiny_epoxy/rxn1_stp2.map b/examples/USER/reaction/tiny_epoxy/rxn1_stp2.map
new file mode 100644
index 0000000000..9e39e57310
--- /dev/null
+++ b/examples/USER/reaction/tiny_epoxy/rxn1_stp2.map
@@ -0,0 +1,47 @@
+this is a map file
+
+1 edgeIDs
+31 equivalences
+
+BondingIDs
+
+4
+25
+
+EdgeIDs
+
+5
+
+Equivalences
+
+1	1
+2	2
+3	3
+4	4
+5	5
+6	6
+7	7
+8	8
+9	9
+10	10
+11	11
+12	12
+13	13
+14	14
+15	15
+16	16
+17	17
+18	18
+19	19
+20	20
+21  21
+22  22
+23  23
+24  24
+25  25
+26  26
+27  27
+28  28
+29  29
+30	30
+31  31
diff --git a/examples/USER/reaction/tiny_epoxy/rxn1_stp2_post.data_template b/examples/USER/reaction/tiny_epoxy/rxn1_stp2_post.data_template
new file mode 100644
index 0000000000..cbb66a3151
--- /dev/null
+++ b/examples/USER/reaction/tiny_epoxy/rxn1_stp2_post.data_template
@@ -0,0 +1,307 @@
+rxn1_stp2_post
+
+31 atoms           
+30 bonds           
+53 angles           
+72 dihedrals           
+31 impropers           
+
+Types
+
+1 1
+2 6
+3 1
+4 7
+5 4
+6 7
+7 8
+8 8
+9 8
+10 8
+11 8
+12 9
+13 1
+14 1
+15 9
+16 9
+17 1
+18 1
+19 10
+20 8
+21 8
+22 8
+23 8
+24 10
+25 11
+26 10
+27 10
+28 8
+29 8
+30 8
+31 8
+
+Charges
+
+1 0.000000
+2 0.000000
+3 0.000000
+4 0.100000
+5 0.000000
+6 0.000000
+7 0.000000
+8 0.000000
+9 0.000000
+10 0.000000
+11 0.000000
+12 0.000000
+13 0.000000
+14 0.000000
+15 -0.025000
+16 -0.025000
+17 0.000000
+18 0.000000
+19 0.000000
+20 0.000000
+21 0.000000
+22 0.000000
+23 0.000000
+24 0.000000
+25 0.000000
+26 0.000000
+27 0.000000
+28 0.000000
+29 0.000000
+30 0.000000
+31 0.000000
+
+Coords
+
+1 19.846411 9.569080 -1.229960
+2 21.168550 9.331390 -0.418120
+3 21.253010 8.067940 0.460720
+4 21.330839 10.304280 -0.253340
+5 21.891689 5.906200 0.464150
+6 21.818470 6.999870 -0.296270
+7 19.931601 10.026600 -2.215510
+8 19.051279 8.828540 -1.132880
+9 22.228800 9.293580 -0.665280
+10 21.880541 8.270810 1.328060
+11 20.253151 7.789050 0.792640
+12 16.072720 12.338940 -0.174630
+13 16.557051 11.130580 0.587500
+14 18.074381 10.998730 0.366590
+15 18.354031 10.832100 -1.107140
+16 14.920880 15.018100 -0.201130
+17 16.390551 14.791140 -0.461060
+18 16.852989 13.538490 0.304530
+19 16.264271 12.190330 -1.257620
+20 16.025061 10.195290 0.210910
+21 16.346741 11.269890 1.698950
+22 18.466690 10.092460 0.935470
+23 18.592319 11.941150 0.745170
+24 17.213690 10.780300 -1.896260
+25 20.881861 11.302060 -0.773030
+26 14.344180 14.136430 -0.550280
+27 14.583670 15.922830 -0.748110
+28 16.984310 15.696060 -0.103470
+29 16.562460 14.639560 -1.577590
+30 16.674610 13.686010 1.420370
+31 17.964001 13.363150 0.117750
+
+Bonds
+
+1 1 1 8
+2 16 1 2
+3 1 1 7
+4 13 1 15
+5 16 3 2
+6 12 2 9
+7 17 2 4
+8 3 3 6
+9 1 3 10
+10 1 3 11
+11 18 4 25
+12 8 6 5
+13 13 13 12
+14 13 18 12
+15 14 12 19
+16 15 13 14
+17 1 13 20
+18 1 13 21
+19 13 14 15
+20 1 14 22
+21 1 14 23
+22 14 15 24
+23 13 17 16
+24 14 16 26
+25 14 16 27
+26 15 17 18
+27 1 17 28
+28 1 17 29
+29 1 18 30
+30 1 18 31
+
+Angles
+
+1 30 2 1 8
+2 2 8 1 7
+3 26 8 1 15
+4 30 2 1 7
+5 31 2 1 15
+6 26 7 1 15
+7 32 1 2 3
+8 33 1 2 9
+9 34 1 2 4
+10 33 3 2 9
+11 34 3 2 4
+12 35 4 2 9
+13 36 2 3 6
+14 30 2 3 10
+15 30 2 3 11
+16 3 6 3 10
+17 3 6 3 11
+18 2 10 3 11
+19 37 2 4 25
+20 22 3 6 5
+21 23 13 12 18
+22 24 13 12 19
+23 24 18 12 19
+24 25 14 13 12
+25 26 20 13 12
+26 26 21 13 12
+27 27 14 13 20
+28 27 14 13 21
+29 2 20 13 21
+30 25 13 14 15
+31 27 13 14 22
+32 27 13 14 23
+33 26 22 14 15
+34 26 23 14 15
+35 2 22 14 23
+36 23 1 15 14
+37 24 1 15 24
+38 24 14 15 24
+39 24 17 16 26
+40 24 17 16 27
+41 28 26 16 27
+42 25 18 17 16
+43 26 28 17 16
+44 26 29 17 16
+45 27 18 17 28
+46 27 18 17 29
+47 2 28 17 29
+48 25 17 18 12
+49 26 30 18 12
+50 26 31 18 12
+51 27 17 18 30
+52 27 17 18 31
+53 2 30 18 31
+
+Dihedrals
+
+1 40 8 1 2 3
+2 41 8 1 2 9
+3 42 8 1 2 4
+4 40 7 1 2 3
+5 41 7 1 2 9
+6 42 7 1 2 4
+7 43 15 1 2 3
+8 44 15 1 2 9
+9 45 15 1 2 4
+10 28 8 1 15 14
+11 30 8 1 15 24
+12 46 2 1 15 14
+13 47 2 1 15 24
+14 28 7 1 15 14
+15 30 7 1 15 24
+16 48 6 3 2 1
+17 40 10 3 2 1
+18 40 11 3 2 1
+19 49 6 3 2 9
+20 41 10 3 2 9
+21 41 11 3 2 9
+22 50 6 3 2 4
+23 42 10 3 2 4
+24 42 11 3 2 4
+25 52 1 2 4 25
+26 52 3 2 4 25
+27 53 9 2 4 25
+28 51 2 3 6 5
+29 7 10 3 6 5
+30 7 11 3 6 5
+31 27 14 13 12 18
+32 28 20 13 12 18
+33 28 21 13 12 18
+34 29 14 13 12 19
+35 30 20 13 12 19
+36 30 21 13 12 19
+37 27 17 18 12 13
+38 28 30 18 12 13
+39 28 31 18 12 13
+40 29 17 18 12 19
+41 30 30 18 12 19
+42 30 31 18 12 19
+43 31 12 13 14 15
+44 32 22 14 13 12
+45 32 23 14 13 12
+46 32 20 13 14 15
+47 33 20 13 14 22
+48 33 20 13 14 23
+49 32 21 13 14 15
+50 33 21 13 14 22
+51 33 21 13 14 23
+52 27 13 14 15 1
+53 29 13 14 15 24
+54 28 22 14 15 1
+55 30 22 14 15 24
+56 28 23 14 15 1
+57 30 23 14 15 24
+58 29 18 17 16 26
+59 30 28 17 16 26
+60 30 29 17 16 26
+61 29 18 17 16 27
+62 30 28 17 16 27
+63 30 29 17 16 27
+64 31 16 17 18 12
+65 32 30 18 17 16
+66 32 31 18 17 16
+67 32 28 17 18 12
+68 33 28 17 18 30
+69 33 28 17 18 31
+70 32 29 17 18 12
+71 33 29 17 18 30
+72 33 29 17 18 31
+
+Impropers
+
+1 4 13 12 18 19
+2 4 1 15 14 24
+3 5 17 16 26 27
+4 1 2 1 8 7
+5 1 2 1 8 15
+6 1 8 1 7 15
+7 1 2 1 7 15
+8 1 1 2 3 9
+9 1 1 2 3 4
+10 1 1 2 4 9
+11 1 3 2 4 9
+12 1 2 3 6 10
+13 1 2 3 6 11
+14 1 2 3 10 11
+15 1 6 3 10 11
+16 1 14 13 20 12
+17 1 14 13 21 12
+18 1 20 13 21 12
+19 1 14 13 20 21
+20 1 13 14 22 15
+21 1 13 14 23 15
+22 1 13 14 22 23
+23 1 22 14 23 15
+24 1 18 17 28 16
+25 1 18 17 29 16
+26 1 28 17 29 16
+27 1 18 17 28 29
+28 1 17 18 30 12
+29 1 17 18 31 12
+30 1 30 18 31 12
+31 1 17 18 30 31
diff --git a/examples/USER/reaction/tiny_epoxy/rxn2_stp1.map b/examples/USER/reaction/tiny_epoxy/rxn2_stp1.map
new file mode 100644
index 0000000000..cbe2a44f36
--- /dev/null
+++ b/examples/USER/reaction/tiny_epoxy/rxn2_stp1.map
@@ -0,0 +1,59 @@
+this is a map file
+
+2 edgeIDs
+42 equivalences
+
+BondingIDs
+
+15
+32
+
+EdgeIDs
+
+5
+36
+
+Equivalences
+
+1	1
+2	2
+3	3
+4	4
+5	5
+6	6
+7	7
+8	8
+9	9
+10	10
+11	11
+12	12
+13	13
+14	14
+15	15
+16	16
+17	17
+18	18
+19	19
+20	20
+21  21
+22  22
+23  23
+24  24
+25  25
+26  26
+27  27
+28  28
+29  29
+30	30
+31  31
+32  32
+33  33
+34  34
+35  35
+36  36
+37  37
+38  38
+39  39
+40 40
+41 41
+42 42
diff --git a/examples/USER/reaction/tiny_epoxy/rxn2_stp1_post.data_template b/examples/USER/reaction/tiny_epoxy/rxn2_stp1_post.data_template
new file mode 100644
index 0000000000..0600abdc0c
--- /dev/null
+++ b/examples/USER/reaction/tiny_epoxy/rxn2_stp1_post.data_template
@@ -0,0 +1,424 @@
+rxn2_stp1_post
+
+42 atoms           
+41 bonds           
+75 angles           
+108 dihedrals           
+46 impropers           
+
+Types
+
+1 1
+2 6
+3 1
+4 7
+5 4
+6 7
+7 8
+8 8
+9 8
+10 8
+11 8
+12 9
+13 1
+14 1
+15 9
+16 9
+17 1
+18 1
+19 10
+20 8
+21 8
+22 8
+23 8
+24 10
+25 11
+26 10
+27 10
+28 8
+29 8
+30 8
+31 8
+32 1
+33 6
+34 1
+35 7
+36 4
+37 7
+38 8
+39 8
+40 8
+41 8
+42 8
+
+Charges
+
+1 0.000000
+2 0.000000
+3 0.000000
+4 0.100000
+5 0.000000
+6 0.000000
+7 0.000000
+8 0.000000
+9 0.000000
+10 0.000000
+11 0.000000
+12 0.000000
+13 0.000000
+14 0.000000
+15 -0.025000
+16 -0.025000
+17 0.000000
+18 0.000000
+19 0.000000
+20 0.000000
+21 0.000000
+22 0.000000
+23 0.000000
+24 0.000000
+25 0.000000
+26 0.000000
+27 0.000000
+28 0.000000
+29 0.000000
+30 0.000000
+31 0.000000
+32 0.000000
+33 0.000000
+34 0.000000
+35 0.100000
+36 0.000000
+37 0.000000
+38 0.000000
+39 0.000000
+40 0.000000
+41 0.000000
+42 0.000000
+
+Coords
+
+1 19.846411 9.569080 -1.229960
+2 21.168550 9.331390 -0.418120
+3 21.253010 8.067940 0.460720
+4 21.330839 10.304280 -0.253340
+5 21.891689 5.906200 0.464150
+6 21.818470 6.999870 -0.296270
+7 19.931601 10.026600 -2.215510
+8 19.051279 8.828540 -1.132880
+9 22.228800 9.293580 -0.665280
+10 21.880541 8.270810 1.328060
+11 20.253151 7.789050 0.792640
+12 16.072720 12.338940 -0.174630
+13 16.557051 11.130580 0.587500
+14 18.074381 10.998730 0.366590
+15 18.354031 10.832100 -1.107140
+16 14.920880 15.018100 -0.201130
+17 16.390551 14.791140 -0.461060
+18 16.852989 13.538490 0.304530
+19 16.264271 12.190330 -1.257620
+20 16.025061 10.195290 0.210910
+21 16.346741 11.269890 1.698950
+22 18.466690 10.092460 0.935470
+23 18.592319 11.941150 0.745170
+24 17.213690 10.780300 -1.896260
+25 20.881861 11.302060 -0.773030
+26 14.344180 14.136430 -0.550280
+27 14.583670 15.922830 -0.748110
+28 16.984310 15.696060 -0.103470
+29 16.562460 14.639560 -1.577590
+30 16.674610 13.686010 1.420370
+31 17.964001 13.363150 0.117750
+32 18.680189 9.134390 -4.183100
+33 18.099751 8.263650 -5.343000
+34 19.081829 7.609610 -6.334180
+35 17.971729 9.827680 -5.367080
+36 20.263880 5.733600 -6.736780
+37 19.414030 6.299980 -5.878960
+38 18.194740 9.091640 -3.210950
+39 19.788940 9.208560 -4.119640
+40 17.399309 7.432220 -5.407800
+41 18.616249 7.545570 -7.316910
+42 19.987049 8.212500 -6.399400
+
+Bonds
+
+1 1 1 8
+2 16 1 2
+3 1 1 7
+4 13 1 15
+5 16 3 2
+6 12 2 9
+7 17 2 4
+8 3 3 6
+9 1 3 10
+10 1 3 11
+11 18 4 25
+12 8 6 5
+13 13 13 12
+14 13 18 12
+15 14 12 19
+16 15 13 14
+17 1 13 20
+18 1 13 21
+19 13 14 15
+20 1 14 22
+21 1 14 23
+22 14 15 24
+23 13 32 15
+24 13 17 16
+25 14 16 26
+26 14 16 27
+27 15 17 18
+28 1 17 28
+29 1 17 29
+30 1 18 30
+31 1 18 31
+32 1 32 39
+33 16 32 33
+34 1 32 38
+35 17 33 35
+36 16 34 33
+37 12 33 40
+38 3 34 37
+39 1 34 41
+40 1 34 42
+41 8 37 36
+
+Angles
+
+1 30 2 1 8
+2 2 8 1 7
+3 26 8 1 15
+4 30 2 1 7
+5 31 2 1 15
+6 26 7 1 15
+7 32 1 2 3
+8 33 1 2 9
+9 34 1 2 4
+10 33 3 2 9
+11 34 3 2 4
+12 35 4 2 9
+13 36 2 3 6
+14 30 2 3 10
+15 30 2 3 11
+16 3 6 3 10
+17 3 6 3 11
+18 2 10 3 11
+19 37 2 4 25
+20 22 3 6 5
+21 23 13 12 18
+22 24 13 12 19
+23 24 18 12 19
+24 25 14 13 12
+25 26 20 13 12
+26 26 21 13 12
+27 27 14 13 20
+28 27 14 13 21
+29 2 20 13 21
+30 25 13 14 15
+31 27 13 14 22
+32 27 13 14 23
+33 26 22 14 15
+34 26 23 14 15
+35 2 22 14 23
+36 23 1 15 14
+37 24 1 15 24
+38 23 1 15 32
+39 24 14 15 24
+40 23 14 15 32
+41 24 32 15 24
+42 24 17 16 26
+43 24 17 16 27
+44 28 26 16 27
+45 25 18 17 16
+46 26 28 17 16
+47 26 29 17 16
+48 27 18 17 28
+49 27 18 17 29
+50 2 28 17 29
+51 25 17 18 12
+52 26 30 18 12
+53 26 31 18 12
+54 27 17 18 30
+55 27 17 18 31
+56 2 30 18 31
+57 26 39 32 15
+58 31 33 32 15
+59 26 38 32 15
+60 30 33 32 39
+61 2 39 32 38
+62 30 33 32 38
+63 34 32 33 35
+64 32 32 33 34
+65 33 32 33 40
+66 34 34 33 35
+67 35 35 33 40
+68 33 34 33 40
+69 36 33 34 37
+70 30 33 34 41
+71 30 33 34 42
+72 3 37 34 41
+73 3 37 34 42
+74 2 41 34 42
+75 22 34 37 36
+
+Dihedrals
+
+1 40 8 1 2 3
+2 41 8 1 2 9
+3 42 8 1 2 4
+4 40 7 1 2 3
+5 41 7 1 2 9
+6 42 7 1 2 4
+7 43 15 1 2 3
+8 44 15 1 2 9
+9 45 15 1 2 4
+10 28 8 1 15 14
+11 30 8 1 15 24
+12 28 8 1 15 32
+13 46 2 1 15 14
+14 47 2 1 15 24
+15 46 2 1 15 32
+16 28 7 1 15 14
+17 30 7 1 15 24
+18 28 7 1 15 32
+19 48 6 3 2 1
+20 40 10 3 2 1
+21 40 11 3 2 1
+22 49 6 3 2 9
+23 41 10 3 2 9
+24 41 11 3 2 9
+25 50 6 3 2 4
+26 42 10 3 2 4
+27 42 11 3 2 4
+28 52 1 2 4 25
+29 52 3 2 4 25
+30 53 9 2 4 25
+31 51 2 3 6 5
+32 7 10 3 6 5
+33 7 11 3 6 5
+34 27 14 13 12 18
+35 28 20 13 12 18
+36 28 21 13 12 18
+37 29 14 13 12 19
+38 30 20 13 12 19
+39 30 21 13 12 19
+40 27 17 18 12 13
+41 28 30 18 12 13
+42 28 31 18 12 13
+43 29 17 18 12 19
+44 30 30 18 12 19
+45 30 31 18 12 19
+46 31 12 13 14 15
+47 32 22 14 13 12
+48 32 23 14 13 12
+49 32 20 13 14 15
+50 33 20 13 14 22
+51 33 20 13 14 23
+52 32 21 13 14 15
+53 33 21 13 14 22
+54 33 21 13 14 23
+55 27 13 14 15 1
+56 29 13 14 15 24
+57 27 13 14 15 32
+58 28 22 14 15 1
+59 30 22 14 15 24
+60 28 22 14 15 32
+61 28 23 14 15 1
+62 30 23 14 15 24
+63 28 23 14 15 32
+64 28 39 32 15 1
+65 46 33 32 15 1
+66 28 38 32 15 1
+67 28 39 32 15 14
+68 46 33 32 15 14
+69 28 38 32 15 14
+70 30 39 32 15 24
+71 47 33 32 15 24
+72 30 38 32 15 24
+73 29 18 17 16 26
+74 30 28 17 16 26
+75 30 29 17 16 26
+76 29 18 17 16 27
+77 30 28 17 16 27
+78 30 29 17 16 27
+79 31 16 17 18 12
+80 32 30 18 17 16
+81 32 31 18 17 16
+82 32 28 17 18 12
+83 33 28 17 18 30
+84 33 28 17 18 31
+85 32 29 17 18 12
+86 33 29 17 18 30
+87 33 29 17 18 31
+88 45 15 32 33 35
+89 43 15 32 33 34
+90 44 15 32 33 40
+91 42 39 32 33 35
+92 40 39 32 33 34
+93 41 39 32 33 40
+94 42 38 32 33 35
+95 40 38 32 33 34
+96 41 38 32 33 40
+97 48 37 34 33 32
+98 40 41 34 33 32
+99 40 42 34 33 32
+100 50 37 34 33 35
+101 42 41 34 33 35
+102 42 42 34 33 35
+103 49 37 34 33 40
+104 41 41 34 33 40
+105 41 42 34 33 40
+106 51 33 34 37 36
+107 7 41 34 37 36
+108 7 42 34 37 36
+
+Impropers
+
+1 4 13 12 18 19
+2 5 17 16 26 27
+3 1 2 1 8 7
+4 1 2 1 8 15
+5 1 8 1 7 15
+6 1 2 1 7 15
+7 1 1 2 3 9
+8 1 1 2 3 4
+9 1 1 2 4 9
+10 1 3 2 4 9
+11 1 2 3 6 10
+12 1 2 3 6 11
+13 1 2 3 10 11
+14 1 6 3 10 11
+15 1 14 13 20 12
+16 1 14 13 21 12
+17 1 20 13 21 12
+18 1 14 13 20 21
+19 1 13 14 22 15
+20 1 13 14 23 15
+21 1 13 14 22 23
+22 1 22 14 23 15
+23 1 1 15 14 24
+24 1 1 15 14 32
+25 1 1 15 32 24
+26 1 14 15 32 24
+27 1 18 17 28 16
+28 1 18 17 29 16
+29 1 28 17 29 16
+30 1 18 17 28 29
+31 1 17 18 30 12
+32 1 17 18 31 12
+33 1 30 18 31 12
+34 1 17 18 30 31
+35 1 33 32 39 15
+36 1 39 32 38 15
+37 1 33 32 38 15
+38 1 33 32 39 38
+39 1 32 33 34 35
+40 1 32 33 35 40
+41 1 32 33 34 40
+42 1 34 33 35 40
+43 1 33 34 37 41
+44 1 33 34 37 42
+45 1 33 34 41 42
+46 1 37 34 41 42
diff --git a/examples/USER/reaction/tiny_epoxy/rxn2_stp1_pre.data_template b/examples/USER/reaction/tiny_epoxy/rxn2_stp1_pre.data_template
new file mode 100644
index 0000000000..9ee4ffb2de
--- /dev/null
+++ b/examples/USER/reaction/tiny_epoxy/rxn2_stp1_pre.data_template
@@ -0,0 +1,407 @@
+rxn2_stp1_pre
+
+42 atoms           
+41 bonds           
+73 angles           
+96 dihedrals           
+43 impropers           
+
+Types
+
+1 1
+2 6
+3 1
+4 7
+5 4
+6 7
+7 8
+8 8
+9 8
+10 8
+11 8
+12 9
+13 1
+14 1
+15 9
+16 9
+17 1
+18 1
+19 10
+20 8
+21 8
+22 8
+23 8
+24 10
+25 11
+26 10
+27 10
+28 8
+29 8
+30 8
+31 8
+32 2
+33 2
+34 1
+35 3
+36 4
+37 7
+38 8
+39 8
+40 8
+41 8
+42 8
+
+Charges
+
+1 0.000000
+2 0.000000
+3 0.000000
+4 0.100000
+5 0.000000
+6 0.000000
+7 0.000000
+8 0.000000
+9 0.000000
+10 0.000000
+11 0.000000
+12 0.000000
+13 0.000000
+14 0.000000
+15 -0.025000
+16 -0.025000
+17 0.000000
+18 0.000000
+19 0.000000
+20 0.000000
+21 0.000000
+22 0.000000
+23 0.000000
+24 0.000000
+25 0.000000
+26 0.000000
+27 0.000000
+28 0.000000
+29 0.000000
+30 0.000000
+31 0.000000
+32 0.000000
+33 0.000000
+34 0.000000
+35 0.100000
+36 0.000000
+37 0.000000
+38 0.000000
+39 0.000000
+40 0.000000
+41 0.000000
+42 0.000000
+
+Coords
+
+1 19.846411 9.569080 -1.229960
+2 21.168550 9.331390 -0.418120
+3 21.253010 8.067940 0.460720
+4 21.330839 10.304280 -0.253340
+5 21.891689 5.906200 0.464150
+6 21.818470 6.999870 -0.296270
+7 19.931601 10.026600 -2.215510
+8 19.051279 8.828540 -1.132880
+9 22.228800 9.293580 -0.665280
+10 21.880541 8.270810 1.328060
+11 20.253151 7.789050 0.792640
+12 16.072720 12.338940 -0.174630
+13 16.557051 11.130580 0.587500
+14 18.074381 10.998730 0.366590
+15 18.354031 10.832100 -1.107140
+16 14.920880 15.018100 -0.201130
+17 16.390551 14.791140 -0.461060
+18 16.852989 13.538490 0.304530
+19 16.264271 12.190330 -1.257620
+20 16.025061 10.195290 0.210910
+21 16.346741 11.269890 1.698950
+22 18.466690 10.092460 0.935470
+23 18.592319 11.941150 0.745170
+24 17.213690 10.780300 -1.896260
+25 20.881861 11.302060 -0.773030
+26 14.344180 14.136430 -0.550280
+27 14.583670 15.922830 -0.748110
+28 16.984310 15.696060 -0.103470
+29 16.562460 14.639560 -1.577590
+30 16.674610 13.686010 1.420370
+31 17.964001 13.363150 0.117750
+32 18.703360 9.118830 -4.174240
+33 18.099751 8.263650 -5.343000
+34 19.081829 7.609610 -6.334180
+35 17.971729 9.827680 -5.367080
+36 20.263880 5.733600 -6.736780
+37 19.414030 6.299980 -5.878960
+38 18.194740 9.091640 -3.210950
+39 19.788940 9.208560 -4.119640
+40 17.399309 7.432220 -5.407800
+41 18.616249 7.545570 -7.316910
+42 19.987049 8.212500 -6.399400
+
+Bonds
+
+1 1 1 8
+2 16 1 2
+3 1 1 7
+4 13 1 15
+5 16 3 2
+6 12 2 9
+7 17 2 4
+8 3 3 6
+9 1 3 10
+10 1 3 11
+11 18 4 25
+12 8 6 5
+13 13 13 12
+14 13 18 12
+15 14 12 19
+16 15 13 14
+17 1 13 20
+18 1 13 21
+19 13 14 15
+20 1 14 22
+21 1 14 23
+22 14 15 24
+23 13 17 16
+24 14 16 26
+25 14 16 27
+26 15 17 18
+27 1 17 28
+28 1 17 29
+29 1 18 30
+30 1 18 31
+31 6 39 32
+32 4 32 35
+33 5 32 33
+34 6 38 32
+35 4 33 35
+36 2 34 33
+37 6 40 33
+38 3 34 37
+39 1 34 41
+40 1 34 42
+41 8 37 36
+
+Angles
+
+1 30 2 1 8
+2 2 8 1 7
+3 26 8 1 15
+4 30 2 1 7
+5 31 2 1 15
+6 26 7 1 15
+7 32 1 2 3
+8 33 1 2 9
+9 34 1 2 4
+10 33 3 2 9
+11 34 3 2 4
+12 35 4 2 9
+13 36 2 3 6
+14 30 2 3 10
+15 30 2 3 11
+16 3 6 3 10
+17 3 6 3 11
+18 2 10 3 11
+19 37 2 4 25
+20 22 3 6 5
+21 23 13 12 18
+22 24 13 12 19
+23 24 18 12 19
+24 25 14 13 12
+25 26 20 13 12
+26 26 21 13 12
+27 27 14 13 20
+28 27 14 13 21
+29 2 20 13 21
+30 25 13 14 15
+31 27 13 14 22
+32 27 13 14 23
+33 26 22 14 15
+34 26 23 14 15
+35 2 22 14 23
+36 23 1 15 14
+37 24 1 15 24
+38 24 14 15 24
+39 24 17 16 26
+40 24 17 16 27
+41 28 26 16 27
+42 25 18 17 16
+43 26 28 17 16
+44 26 29 17 16
+45 27 18 17 28
+46 27 18 17 29
+47 2 28 17 29
+48 25 17 18 12
+49 26 30 18 12
+50 26 31 18 12
+51 27 17 18 30
+52 27 17 18 31
+53 2 30 18 31
+54 38 39 32 35
+55 39 39 32 33
+56 11 39 32 38
+57 8 33 32 35
+58 38 38 32 35
+59 39 38 32 33
+60 8 32 33 35
+61 6 34 33 32
+62 39 40 33 32
+63 5 34 33 35
+64 38 40 33 35
+65 7 34 33 40
+66 40 37 34 33
+67 41 41 34 33
+68 41 42 34 33
+69 3 37 34 41
+70 3 37 34 42
+71 2 41 34 42
+72 12 32 35 33
+73 22 34 37 36
+
+Dihedrals
+
+1 40 8 1 2 3
+2 41 8 1 2 9
+3 42 8 1 2 4
+4 40 7 1 2 3
+5 41 7 1 2 9
+6 42 7 1 2 4
+7 43 15 1 2 3
+8 44 15 1 2 9
+9 45 15 1 2 4
+10 28 8 1 15 14
+11 30 8 1 15 24
+12 46 2 1 15 14
+13 47 2 1 15 24
+14 28 7 1 15 14
+15 30 7 1 15 24
+16 48 6 3 2 1
+17 40 10 3 2 1
+18 40 11 3 2 1
+19 49 6 3 2 9
+20 41 10 3 2 9
+21 41 11 3 2 9
+22 50 6 3 2 4
+23 42 10 3 2 4
+24 42 11 3 2 4
+25 52 1 2 4 25
+26 52 3 2 4 25
+27 53 9 2 4 25
+28 51 2 3 6 5
+29 7 10 3 6 5
+30 7 11 3 6 5
+31 27 14 13 12 18
+32 28 20 13 12 18
+33 28 21 13 12 18
+34 29 14 13 12 19
+35 30 20 13 12 19
+36 30 21 13 12 19
+37 27 17 18 12 13
+38 28 30 18 12 13
+39 28 31 18 12 13
+40 29 17 18 12 19
+41 30 30 18 12 19
+42 30 31 18 12 19
+43 31 12 13 14 15
+44 32 22 14 13 12
+45 32 23 14 13 12
+46 32 20 13 14 15
+47 33 20 13 14 22
+48 33 20 13 14 23
+49 32 21 13 14 15
+50 33 21 13 14 22
+51 33 21 13 14 23
+52 27 13 14 15 1
+53 29 13 14 15 24
+54 28 22 14 15 1
+55 30 22 14 15 24
+56 28 23 14 15 1
+57 30 23 14 15 24
+58 29 18 17 16 26
+59 30 28 17 16 26
+60 30 29 17 16 26
+61 29 18 17 16 27
+62 30 28 17 16 27
+63 30 29 17 16 27
+64 31 16 17 18 12
+65 32 30 18 17 16
+66 32 31 18 17 16
+67 32 28 17 18 12
+68 33 28 17 18 30
+69 33 28 17 18 31
+70 32 29 17 18 12
+71 33 29 17 18 30
+72 33 29 17 18 31
+73 10 39 32 35 33
+74 10 38 32 35 33
+75 54 39 32 33 35
+76 12 34 33 32 39
+77 14 39 32 33 40
+78 11 34 33 32 35
+79 54 40 33 32 35
+80 54 38 32 33 35
+81 12 34 33 32 38
+82 14 38 32 33 40
+83 9 34 33 35 32
+84 10 40 33 35 32
+85 5 37 34 33 32
+86 2 41 34 33 32
+87 2 42 34 33 32
+88 4 37 34 33 35
+89 1 41 34 33 35
+90 1 42 34 33 35
+91 6 37 34 33 40
+92 3 41 34 33 40
+93 3 42 34 33 40
+94 8 33 34 37 36
+95 7 41 34 37 36
+96 7 42 34 37 36
+
+Impropers
+
+1 4 13 12 18 19
+2 4 1 15 14 24
+3 5 17 16 26 27
+4 1 2 1 8 7
+5 1 2 1 8 15
+6 1 8 1 7 15
+7 1 2 1 7 15
+8 1 1 2 3 9
+9 1 1 2 3 4
+10 1 1 2 4 9
+11 1 3 2 4 9
+12 1 2 3 6 10
+13 1 2 3 6 11
+14 1 2 3 10 11
+15 1 6 3 10 11
+16 1 14 13 20 12
+17 1 14 13 21 12
+18 1 20 13 21 12
+19 1 14 13 20 21
+20 1 13 14 22 15
+21 1 13 14 23 15
+22 1 13 14 22 23
+23 1 22 14 23 15
+24 1 18 17 28 16
+25 1 18 17 29 16
+26 1 28 17 29 16
+27 1 18 17 28 29
+28 1 17 18 30 12
+29 1 17 18 31 12
+30 1 30 18 31 12
+31 1 17 18 30 31
+32 1 39 32 33 35
+33 1 39 32 38 35
+34 1 39 32 38 33
+35 1 38 32 33 35
+36 1 34 33 32 35
+37 1 40 33 32 35
+38 1 34 33 40 32
+39 1 34 33 40 35
+40 1 37 34 41 33
+41 1 37 34 42 33
+42 1 41 34 42 33
+43 1 37 34 41 42
diff --git a/examples/USER/reaction/tiny_epoxy/rxn2_stp2.map b/examples/USER/reaction/tiny_epoxy/rxn2_stp2.map
new file mode 100644
index 0000000000..f90915a54f
--- /dev/null
+++ b/examples/USER/reaction/tiny_epoxy/rxn2_stp2.map
@@ -0,0 +1,59 @@
+this is a map file
+
+2 edgeIDs
+42 equivalences
+
+BondingIDs
+
+35
+24
+
+EdgeIDs
+
+5
+36
+
+Equivalences
+
+1	1
+2	2
+3	3
+4	4
+5	5
+6	6
+7	7
+8	8
+9	9
+10	10
+11	11
+12	12
+13	13
+14	14
+15	15
+16	16
+17	17
+18	18
+19	19
+20	20
+21  21
+22  22
+23  23
+24  24
+25  25
+26  26
+27  27
+28  28
+29  29
+30	30
+31  31
+32  32
+33  33
+34  34
+35  35
+36  36
+37  37
+38  38
+39  39
+40 40
+41 41
+42 42
diff --git a/examples/USER/reaction/tiny_epoxy/rxn2_stp2_post.data_template b/examples/USER/reaction/tiny_epoxy/rxn2_stp2_post.data_template
new file mode 100644
index 0000000000..2b37ecff03
--- /dev/null
+++ b/examples/USER/reaction/tiny_epoxy/rxn2_stp2_post.data_template
@@ -0,0 +1,413 @@
+rxn2_stp2_post
+
+42 atoms           
+41 bonds           
+73 angles           
+102 dihedrals           
+43 impropers           
+
+Types
+
+1 1
+2 2
+3 1
+4 7
+5 4
+6 7
+7 8
+8 8
+9 8
+10 8
+11 8
+12 9
+13 1
+14 1
+15 9
+16 9
+17 1
+18 1
+19 10
+20 8
+21 8
+22 8
+23 8
+24 11
+25 11
+26 10
+27 10
+28 8
+29 8
+30 8
+31 8
+32 1
+33 6
+34 1
+35 7
+36 4
+37 7
+38 8
+39 8
+40 8
+41 8
+42 8
+
+Charges
+
+1 0.000000
+2 0.000000
+3 0.000000
+4 0.100000
+5 0.000000
+6 0.000000
+7 0.000000
+8 0.000000
+9 0.000000
+10 0.000000
+11 0.000000
+12 0.000000
+13 0.000000
+14 0.000000
+15 -0.025000
+16 -0.025000
+17 0.000000
+18 0.000000
+19 0.000000
+20 0.000000
+21 0.000000
+22 0.000000
+23 0.000000
+24 0.000000
+25 0.000000
+26 0.000000
+27 0.000000
+28 0.000000
+29 0.000000
+30 0.000000
+31 0.000000
+32 0.000000
+33 0.000000
+34 0.000000
+35 0.100000
+36 0.000000
+37 0.000000
+38 0.000000
+39 0.000000
+40 0.000000
+41 0.000000
+42 0.000000
+
+Coords
+
+1 19.846411 9.569080 -1.229960
+2 21.168550 9.331390 -0.418120
+3 21.253010 8.067940 0.460720
+4 21.330839 10.304280 -0.253340
+5 21.891689 5.906200 0.464150
+6 21.818470 6.999870 -0.296270
+7 19.931601 10.026600 -2.215510
+8 19.051279 8.828540 -1.132880
+9 22.228800 9.293580 -0.665280
+10 21.880541 8.270810 1.328060
+11 20.253151 7.789050 0.792640
+12 16.072720 12.338940 -0.174630
+13 16.557051 11.130580 0.587500
+14 18.074381 10.998730 0.366590
+15 18.354031 10.832100 -1.107140
+16 14.920880 15.018100 -0.201130
+17 16.390551 14.791140 -0.461060
+18 16.852989 13.538490 0.304530
+19 16.264271 12.190330 -1.257620
+20 16.025061 10.195290 0.210910
+21 16.346741 11.269890 1.698950
+22 18.466690 10.092460 0.935470
+23 18.592319 11.941150 0.745170
+24 16.017490 9.805710 -4.329880
+25 20.881861 11.302060 -0.773030
+26 14.344180 14.136430 -0.550280
+27 14.583670 15.922830 -0.748110
+28 16.984310 15.696060 -0.103470
+29 16.562460 14.639560 -1.577590
+30 16.674610 13.686010 1.420370
+31 17.964001 13.363150 0.117750
+32 18.680189 9.134390 -4.183100
+33 18.099751 8.263650 -5.343000
+34 19.081829 7.609610 -6.334180
+35 17.971729 9.827680 -5.367080
+36 20.263880 5.733600 -6.736780
+37 19.414030 6.299980 -5.878960
+38 18.194740 9.091640 -3.210950
+39 19.788940 9.208560 -4.119640
+40 17.399309 7.432220 -5.407800
+41 18.616249 7.545570 -7.316910
+42 19.987049 8.212500 -6.399400
+
+Bonds
+
+1 1 1 8
+2 2 1 2
+3 1 1 7
+4 13 1 15
+5 2 3 2
+6 6 2 9
+7 19 2 4
+8 3 3 6
+9 1 3 10
+10 1 3 11
+11 18 4 25
+12 8 6 5
+13 13 13 12
+14 13 18 12
+15 14 12 19
+16 15 13 14
+17 1 13 20
+18 1 13 21
+19 13 14 15
+20 1 14 22
+21 1 14 23
+22 13 32 15
+23 13 17 16
+24 14 16 26
+25 14 16 27
+26 15 17 18
+27 1 17 28
+28 1 17 29
+29 1 18 30
+30 1 18 31
+31 18 35 24
+32 1 32 39
+33 16 32 33
+34 1 32 38
+35 17 35 33
+36 16 34 33
+37 12 40 33
+38 3 34 37
+39 1 34 41
+40 1 34 42
+41 8 37 36
+
+Angles
+
+1 1 2 1 8
+2 2 8 1 7
+3 26 8 1 15
+4 1 2 1 7
+5 42 2 1 15
+6 26 7 1 15
+7 43 1 2 3
+8 7 1 2 9
+9 44 1 2 4
+10 7 3 2 9
+11 44 3 2 4
+12 45 4 2 9
+13 4 2 3 6
+14 1 2 3 10
+15 1 2 3 11
+16 3 6 3 10
+17 3 6 3 11
+18 2 10 3 11
+19 46 2 4 25
+20 22 3 6 5
+21 23 13 12 18
+22 24 13 12 19
+23 24 18 12 19
+24 25 14 13 12
+25 26 20 13 12
+26 26 21 13 12
+27 27 14 13 20
+28 27 14 13 21
+29 2 20 13 21
+30 25 13 14 15
+31 27 13 14 22
+32 27 13 14 23
+33 26 22 14 15
+34 26 23 14 15
+35 2 22 14 23
+36 23 1 15 14
+37 23 1 15 32
+38 23 14 15 32
+39 24 17 16 26
+40 24 17 16 27
+41 28 26 16 27
+42 25 18 17 16
+43 26 28 17 16
+44 26 29 17 16
+45 27 18 17 28
+46 27 18 17 29
+47 2 28 17 29
+48 25 17 18 12
+49 26 30 18 12
+50 26 31 18 12
+51 27 17 18 30
+52 27 17 18 31
+53 2 30 18 31
+54 26 39 32 15
+55 47 15 32 33
+56 26 38 32 15
+57 48 39 32 33
+58 2 39 32 38
+59 48 38 32 33
+60 34 32 33 35
+61 32 32 33 34
+62 33 32 33 40
+63 34 34 33 35
+64 35 35 33 40
+65 33 34 33 40
+66 49 37 34 33
+67 48 41 34 33
+68 48 42 34 33
+69 3 37 34 41
+70 3 37 34 42
+71 2 41 34 42
+72 50 24 35 33
+73 22 34 37 36
+
+Dihedrals
+
+1 55 8 1 2 3
+2 3 8 1 2 9
+3 56 8 1 2 4
+4 55 7 1 2 3
+5 3 7 1 2 9
+6 56 7 1 2 4
+7 57 15 1 2 3
+8 58 15 1 2 9
+9 59 15 1 2 4
+10 28 8 1 15 14
+11 28 8 1 15 32
+12 60 2 1 15 14
+13 60 2 1 15 32
+14 28 7 1 15 14
+15 28 7 1 15 32
+16 61 6 3 2 1
+17 55 10 3 2 1
+18 55 11 3 2 1
+19 6 6 3 2 9
+20 3 10 3 2 9
+21 3 11 3 2 9
+22 62 6 3 2 4
+23 56 10 3 2 4
+24 56 11 3 2 4
+25 63 1 2 4 25
+26 63 3 2 4 25
+27 64 9 2 4 25
+28 8 2 3 6 5
+29 7 10 3 6 5
+30 7 11 3 6 5
+31 27 14 13 12 18
+32 28 20 13 12 18
+33 28 21 13 12 18
+34 29 14 13 12 19
+35 30 20 13 12 19
+36 30 21 13 12 19
+37 27 17 18 12 13
+38 28 30 18 12 13
+39 28 31 18 12 13
+40 29 17 18 12 19
+41 30 30 18 12 19
+42 30 31 18 12 19
+43 31 12 13 14 15
+44 32 22 14 13 12
+45 32 23 14 13 12
+46 32 20 13 14 15
+47 33 20 13 14 22
+48 33 20 13 14 23
+49 32 21 13 14 15
+50 33 21 13 14 22
+51 33 21 13 14 23
+52 27 13 14 15 1
+53 27 13 14 15 32
+54 28 22 14 15 1
+55 28 22 14 15 32
+56 28 23 14 15 1
+57 28 23 14 15 32
+58 28 39 32 15 1
+59 46 33 32 15 1
+60 28 38 32 15 1
+61 28 39 32 15 14
+62 46 33 32 15 14
+63 28 38 32 15 14
+64 29 18 17 16 26
+65 30 28 17 16 26
+66 30 29 17 16 26
+67 29 18 17 16 27
+68 30 28 17 16 27
+69 30 29 17 16 27
+70 31 16 17 18 12
+71 32 30 18 17 16
+72 32 31 18 17 16
+73 32 28 17 18 12
+74 33 28 17 18 30
+75 33 28 17 18 31
+76 32 29 17 18 12
+77 33 29 17 18 30
+78 33 29 17 18 31
+79 45 15 32 33 35
+80 43 15 32 33 34
+81 44 15 32 33 40
+82 42 39 32 33 35
+83 40 39 32 33 34
+84 41 39 32 33 40
+85 42 38 32 33 35
+86 40 38 32 33 34
+87 41 38 32 33 40
+88 65 24 35 33 32
+89 65 24 35 33 34
+90 66 24 35 33 40
+91 48 37 34 33 32
+92 40 41 34 33 32
+93 40 42 34 33 32
+94 50 37 34 33 35
+95 42 41 34 33 35
+96 42 42 34 33 35
+97 49 37 34 33 40
+98 41 41 34 33 40
+99 41 42 34 33 40
+100 51 33 34 37 36
+101 7 41 34 37 36
+102 7 42 34 37 36
+
+Impropers
+
+1 4 13 12 18 19
+2 22 1 15 14 32
+3 5 17 16 26 27
+4 1 2 1 8 7
+5 1 2 1 8 15
+6 1 8 1 7 15
+7 1 2 1 7 15
+8 1 1 2 3 9
+9 1 1 2 3 4
+10 1 1 2 4 9
+11 1 3 2 4 9
+12 1 2 3 6 10
+13 1 2 3 6 11
+14 1 2 3 10 11
+15 1 6 3 10 11
+16 1 14 13 20 12
+17 1 14 13 21 12
+18 1 20 13 21 12
+19 1 14 13 20 21
+20 1 13 14 22 15
+21 1 13 14 23 15
+22 1 13 14 22 23
+23 1 22 14 23 15
+24 1 18 17 28 16
+25 1 18 17 29 16
+26 1 28 17 29 16
+27 1 18 17 28 29
+28 1 17 18 30 12
+29 1 17 18 31 12
+30 1 30 18 31 12
+31 1 17 18 30 31
+32 1 39 32 15 33
+33 1 39 32 38 15
+34 1 38 32 15 33
+35 1 39 32 38 33
+36 1 32 33 34 35
+37 1 32 33 35 40
+38 1 32 33 34 40
+39 1 34 33 35 40
+40 1 37 34 41 33
+41 1 37 34 42 33
+42 1 41 34 42 33
+43 1 37 34 41 42
diff --git a/examples/USER/reaction/tiny_epoxy/tiny_epoxy.data b/examples/USER/reaction/tiny_epoxy/tiny_epoxy.data
new file mode 100644
index 0000000000..d98006b107
--- /dev/null
+++ b/examples/USER/reaction/tiny_epoxy/tiny_epoxy.data
@@ -0,0 +1,1582 @@
+# two molecules DGEBA (diepoxy) and one DETA (linker)
+
+118 atoms           
+123 bonds           
+221 angles           
+302 dihedrals           
+115 impropers           
+11 atom types          
+19 bond types          
+50 angle types          
+66 dihedral types          
+22 improper types          
+10 30 xlo xhi
+-10 20 ylo yhi
+-15 10 zlo zhi
+
+Masses            
+
+1 12.011150 # c2         
+2 12.011150 # c3m         
+3 15.999400 # o3e         
+4 12.011150 # cp         
+5 12.011150 # c         
+6 12.011150 # c3         
+7 15.999400 # oc         
+8 1.007970 # hc         
+9 14.006700 # na         
+10 1.007970 # hn         
+11 1.007970 # ho         
+
+Pair Coeffs # lj/class2/coul/long         
+
+1 0.0540000000 4.0100000000 # c2        
+2 0.0540000000 4.0100000000 # c3m        
+3 0.2400000000 3.5350000000 # o3e        
+4 0.0640000000 4.0100000000 # cp        
+5 0.0540000000 4.0100000000 # c        
+6 0.0540000000 4.0100000000 # c3        
+7 0.2400000000 3.5350000000 # oc        
+8 0.0200000000 2.7000000000 # hc        
+9 0.0650000000 4.0700000000 # na        
+10 0.0130000000 1.0980000000 # hn        
+11 0.0130000000 1.0980000000 # ho        
+
+Bond Coeffs # class2         
+
+1 1.1010 345.0000 -691.8900 844.6000 # c2-hc      
+2 1.5300 299.6700 -501.7700 679.8100 # c2-c3m      
+3 1.4200 400.3954 -835.1951 1313.0142 # c2-oc      
+4 1.4200 400.3954 -835.1951 1313.0142 # c3m-o3e      
+5 1.5300 299.6700 -501.7700 679.8100 # c3m-c3m      
+6 1.1010 345.0000 -691.8900 844.6000 # c3m-hc      
+7 1.4170 470.8361 -627.6179 1327.6345 # cp-cp      
+8 1.3768 428.8798 -738.2351 1114.9655 # cp-oc      
+9 1.0982 372.8251 -803.4526 894.3173 # cp-hc      
+10 1.5010 321.9021 -521.8208 572.1628 # cp-c      
+11 1.5300 299.6700 -501.7700 679.8100 # c-c3      
+12 1.1010 345.0000 -691.8900 844.6000 # c3-hc      
+13 1.4570 365.8052 -699.6368 998.4842 # c2-na      
+14 1.0060 466.7400 -1073.6018 1251.1056 # na-hn      
+15 1.5300 299.6700 -501.7700 679.8100 # c2-c2      
+16 1.5300 299.6700 -501.7700 679.8100 # c2-c3      
+17 1.4200 400.3954 -835.1951 1313.0142 # c3-oc      
+18 0.9650 532.5062 -1282.9050 2004.7658 # oc-ho      
+19 1.4200 400.3954 -835.1951 1313.0142 # c3m-oc      
+
+Angle Coeffs # class2         
+
+1 110.7700 41.4530 -10.6040 5.1290 # c3m-c2-hc      
+2 107.6600 39.6410 -12.9210 -2.4318 # hc-c2-hc      
+3 108.7280 58.5446 -10.8088 -12.4006 # oc-c2-hc      
+4 111.2700 54.5381 -8.3642 -13.0838 # c3m-c2-oc      
+5 111.2700 54.5381 -8.3642 -13.0838 # c2-c3m-o3e      
+6 112.6700 39.5160 -7.4430 -9.5583 # c2-c3m-c3m      
+7 110.7700 41.4530 -10.6040 5.1290 # c2-c3m-hc      
+8 111.2700 54.5381 -8.3642 -13.0838 # c3m-c3m-o3e      
+9 108.7280 58.5446 -10.8088 -12.4006 # o3e-c3m-hc      
+10 110.7700 41.4530 -10.6040 5.1290 # c3m-c3m-hc      
+11 107.6600 39.6410 -12.9210 -2.4318 # hc-c3m-hc      
+12 104.5000 35.7454 -10.0067 -6.2729 # c3m-o3e-c3m      
+13 118.9000 61.0226 -34.9931 0.0000 # cp-cp-cp      
+14 123.4200 73.6781 -21.6787 0.0000 # cp-cp-oc      
+15 117.9400 35.1558 -12.4682 0.0000 # cp-cp-hc      
+16 120.0500 44.7148 -22.7352 0.0000 # cp-cp-c      
+17 108.4000 43.9594 -8.3924 -9.3379 # cp-c-c3      
+18 111.0000 44.3234 -9.4454 0.0000 # cp-c-cp      
+19 112.6700 39.5160 -7.4430 -9.5583 # c3-c-c3      
+20 110.7700 41.4530 -10.6040 5.1290 # c-c3-hc      
+21 107.6600 39.6410 -12.9210 -2.4318 # hc-c3-hc      
+22 102.9695 38.9739 -6.2595 -8.1710 # c2-oc-cp      
+23 112.4436 47.2337 -10.6612 -10.2062 # c2-na-c2      
+24 110.9538 50.8652 -4.4522 -10.0298 # c2-na-hn      
+25 111.9100 60.7147 -13.3366 -13.0785 # c2-c2-na      
+26 110.6204 51.3137 -6.7198 -2.6003 # hc-c2-na      
+27 110.7700 41.4530 -10.6040 5.1290 # c2-c2-hc      
+28 107.0671 45.2520 -7.5558 -9.5120 # hn-na-hn      
+29 112.6700 39.5160 -7.4430 -9.5583 # c3m-c3m-c2      
+30 110.7700 41.4530 -10.6040 5.1290 # c3-c2-hc      
+31 111.9100 60.7147 -13.3366 -13.0785 # c3-c2-na      
+32 112.6700 39.5160 -7.4430 -9.5583 # c2-c3-c2      
+33 110.7700 41.4530 -10.6040 5.1290 # c2-c3-hc      
+34 111.2700 54.5381 -8.3642 -13.0838 # c2-c3-oc      
+35 108.7280 58.5446 -10.8088 -12.4006 # oc-c3-hc      
+36 111.2700 54.5381 -8.3642 -13.0838 # c3-c2-oc      
+37 105.8000 52.7061 -12.1090 -9.8681 # c3-oc-ho      
+38 108.7280 58.5446 -10.8088 -12.4006 # hc-c3m-o3e      
+39 110.7700 41.4530 -10.6040 5.1290 # hc-c3m-c3m      
+40 111.2700 54.5381 -8.3642 -13.0838 # oc-c2-c3m      
+41 110.7700 41.4530 -10.6040 5.1290 # hc-c2-c3m      
+42 111.9100 60.7147 -13.3366 -13.0785 # c3m-c2-na      
+43 112.6700 39.5160 -7.4430 -9.5583 # c2-c3m-c2      
+44 111.2700 54.5381 -8.3642 -13.0838 # c2-c3m-oc      
+45 108.7280 58.5446 -10.8088 -12.4006 # oc-c3m-hc      
+46 105.8000 52.7061 -12.1090 -9.8681 # c3m-oc-ho      
+47 111.9100 60.7147 -13.3366 -13.0785 # na-c2-c3      
+48 110.7700 41.4530 -10.6040 5.1290 # hc-c2-c3      
+49 111.2700 54.5381 -8.3642 -13.0838 # oc-c2-c3      
+50 105.8000 52.7061 -12.1090 -9.8681 # ho-oc-c3      
+
+Dihedral Coeffs # class2         
+
+1 -0.1435 0.0000 0.2530 0.0000 -0.0905 0.0000# hc-c2-c3m-o3e     
+2 0.0000 0.0000 0.0316 0.0000 -0.1681 0.0000# hc-c2-c3m-c3m     
+3 -0.1432 0.0000 0.0617 0.0000 -0.1083 0.0000# hc-c2-c3m-hc     
+4 -0.1820 0.0000 -0.1084 0.0000 -0.7047 0.0000# oc-c2-c3m-o3e     
+5 0.7137 0.0000 0.2660 0.0000 -0.2545 0.0000# oc-c2-c3m-c3m     
+6 -0.1435 0.0000 0.2530 0.0000 -0.0905 0.0000# oc-c2-c3m-hc     
+7 0.9513 0.0000 0.1155 0.0000 0.0720 0.0000# hc-c2-oc-cp     
+8 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000# c3m-c2-oc-cp     
+9 -0.5203 0.0000 -0.3028 0.0000 -0.3450 0.0000# c2-c3m-o3e-c3m     
+10 0.5302 0.0000 0.0000 0.0000 -0.3966 0.0000# hc-c3m-o3e-c3m     
+11 0.7137 0.0000 0.2660 0.0000 -0.2545 0.0000# c2-c3m-c3m-o3e     
+12 0.0000 0.0000 0.0316 0.0000 -0.1681 0.0000# c2-c3m-c3m-hc     
+13 -0.1435 0.0000 0.2530 0.0000 -0.0905 0.0000# o3e-c3m-c3m-hc     
+14 -0.1432 0.0000 0.0617 0.0000 -0.1083 0.0000# hc-c3m-c3m-hc     
+15 8.3667 0.0000 1.1932 0.0000 0.0000 0.0000# cp-cp-cp-cp     
+16 0.0000 0.0000 3.9661 0.0000 0.0000 0.0000# cp-cp-cp-hc     
+17 0.0000 0.0000 4.8498 0.0000 0.0000 0.0000# cp-cp-cp-oc     
+18 0.0000 0.0000 1.7234 0.0000 0.0000 0.0000# oc-cp-cp-hc     
+19 0.0000 0.0000 1.5000 0.0000 0.0000 0.0000# cp-cp-oc-c2     
+20 0.0000 0.0000 1.8769 0.0000 0.0000 0.0000# hc-cp-cp-hc     
+21 0.0000 0.0000 4.4072 0.0000 0.0000 0.0000# cp-cp-cp-c     
+22 0.0000 0.0000 1.5590 0.0000 0.0000 0.0000# c-cp-cp-hc     
+23 -0.2802 0.0000 -0.0678 0.0000 -0.0122 0.0000# cp-cp-c-c3     
+24 -0.2802 0.0000 -0.0678 0.0000 -0.0122 0.0000# cp-cp-c-cp     
+25 -0.0228 0.0000 0.0280 0.0000 -0.1863 0.0000# cp-c-c3-hc     
+26 0.0000 0.0000 0.0316 0.0000 -0.1681 0.0000# c3-c-c3-hc     
+27 -0.1406 0.0000 0.4168 0.0000 0.0150 0.0000# c2-c2-na-c2     
+28 0.1904 0.0000 -0.1342 0.0000 -0.2460 0.0000# hc-c2-na-c2     
+29 -1.1506 0.0000 -0.6344 0.0000 -0.1845 0.0000# c2-c2-na-hn     
+30 -0.5187 0.0000 -0.4837 0.0000 -0.1692 0.0000# hc-c2-na-hn     
+31 0.3805 0.0000 0.3547 0.0000 -0.1102 0.0000# na-c2-c2-na     
+32 -0.2428 0.0000 0.4065 0.0000 -0.3079 0.0000# hc-c2-c2-na     
+33 -0.1432 0.0000 0.0617 0.0000 -0.1083 0.0000# hc-c2-c2-hc     
+34 0.7137 0.0000 0.2660 0.0000 -0.2545 0.0000# c3m-c3m-c2-oc     
+35 0.0000 0.0000 0.0316 0.0000 -0.1681 0.0000# c3m-c3m-c2-hc     
+36 -0.1820 0.0000 -0.1084 0.0000 -0.7047 0.0000# o3e-c3m-c2-oc     
+37 -0.1435 0.0000 0.2530 0.0000 -0.0905 0.0000# o3e-c3m-c2-hc     
+38 -0.1435 0.0000 0.2530 0.0000 -0.0905 0.0000# hc-c3m-c2-oc     
+39 -0.1432 0.0000 0.0617 0.0000 -0.1083 0.0000# hc-c3m-c2-hc     
+40 0.0000 0.0000 0.0316 0.0000 -0.1681 0.0000# hc-c2-c3-c2     
+41 -0.1432 0.0000 0.0617 0.0000 -0.1083 0.0000# hc-c2-c3-hc     
+42 -0.1435 0.0000 0.2530 0.0000 -0.0905 0.0000# hc-c2-c3-oc     
+43 0.1764 0.0000 0.1766 0.0000 -0.5206 0.0000# na-c2-c3-c2     
+44 -0.2428 0.0000 0.4065 0.0000 -0.3079 0.0000# na-c2-c3-hc     
+45 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000# na-c2-c3-oc     
+46 -0.1406 0.0000 0.4168 0.0000 0.0150 0.0000# c3-c2-na-c2     
+47 -1.1506 0.0000 -0.6344 0.0000 -0.1845 0.0000# c3-c2-na-hn     
+48 0.7137 0.0000 0.2660 0.0000 -0.2545 0.0000# oc-c2-c3-c2     
+49 -0.1435 0.0000 0.2530 0.0000 -0.0905 0.0000# oc-c2-c3-hc     
+50 -0.1820 0.0000 -0.1084 0.0000 -0.7047 0.0000# oc-c2-c3-oc     
+51 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000# c3-c2-oc-cp     
+52 -0.6732 0.0000 -0.4778 0.0000 -0.1670 0.0000# c2-c3-oc-ho     
+53 0.1863 0.0000 -0.4338 0.0000 -0.2121 0.0000# hc-c3-oc-ho     
+54 -0.1435 0.0000 0.2530 0.0000 -0.0905 0.0000# hc-c3m-c3m-o3e     
+55 0.0000 0.0000 0.0316 0.0000 -0.1681 0.0000# hc-c2-c3m-c2     
+56 -0.1435 0.0000 0.2530 0.0000 -0.0905 0.0000# hc-c2-c3m-oc     
+57 0.1764 0.0000 0.1766 0.0000 -0.5206 0.0000# na-c2-c3m-c2     
+58 -0.2428 0.0000 0.4065 0.0000 -0.3079 0.0000# na-c2-c3m-hc     
+59 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000# na-c2-c3m-oc     
+60 -0.1406 0.0000 0.4168 0.0000 0.0150 0.0000# c3m-c2-na-c2     
+61 0.7137 0.0000 0.2660 0.0000 -0.2545 0.0000# oc-c2-c3m-c2     
+62 -0.1820 0.0000 -0.1084 0.0000 -0.7047 0.0000# oc-c2-c3m-oc     
+63 -0.6732 0.0000 -0.4778 0.0000 -0.1670 0.0000# c2-c3m-oc-ho     
+64 0.1863 0.0000 -0.4338 0.0000 -0.2121 0.0000# hc-c3m-oc-ho     
+65 -0.6732 0.0000 -0.4778 0.0000 -0.1670 0.0000# ho-oc-c3-c2     
+66 0.1863 0.0000 -0.4338 0.0000 -0.2121 0.0000# ho-oc-c3-hc     
+
+Improper Coeffs # class2         
+
+1 13.0421 0.0000 # cp-cp-cp-oc        
+2 4.8912 0.0000 # cp-cp-cp-hc        
+3 7.8153 0.0000 # cp-cp-cp-c        
+4 0.0000 0.0000 # c2-na-c2-hn        
+5 0.0000 0.0000 # c2-na-hn-hn        
+6 0.0000 0.0000          
+7 0.0000 0.0000          
+8 0.0000 0.0000          
+9 0.0000 0.0000          
+10 0.0000 0.0000          
+11 0.0000 0.0000          
+12 0.0000 0.0000          
+13 0.0000 0.0000          
+14 0.0000 0.0000          
+15 0.0000 0.0000          
+16 0.0000 0.0000          
+17 0.0000 0.0000          
+18 0.0000 0.0000          
+19 0.0000 0.0000          
+20 0.0000 0.0000          
+21 0.0000 0.0000          
+22 0.0000 0.0000 # c2-na-c2-c2        
+
+BondBond Coeffs           
+
+1 3.3872 1.5300 1.1010         
+2 5.3316 1.1010 1.1010         
+3 23.1979 1.4200 1.1010         
+4 11.4318 1.5300 1.4200         
+5 11.4318 1.5300 1.4200         
+6 0.0000 1.5300 1.5300         
+7 3.3872 1.5300 1.1010         
+8 11.4318 1.5300 1.4200         
+9 23.1979 1.4200 1.1010         
+10 3.3872 1.5300 1.1010         
+11 5.3316 1.1010 1.1010         
+12 -7.1131 1.4200 1.4200         
+13 68.2856 1.4170 1.4170         
+14 48.4754 1.4170 1.3768         
+15 1.0795 1.4170 1.0982         
+16 12.0676 1.4170 1.5010         
+17 0.0000 1.5010 1.5300         
+18 0.0000 1.5010 1.5010         
+19 0.0000 1.5300 1.5300         
+20 3.3872 1.5300 1.1010         
+21 5.3316 1.1010 1.1010         
+22 0.0000 1.4200 1.3768         
+23 -2.1113 1.4570 1.4570         
+24 -6.4168 1.4570 1.0060         
+25 4.6217 1.5300 1.4570         
+26 12.4260 1.1010 1.4570         
+27 3.3872 1.5300 1.1010         
+28 -1.8749 1.0060 1.0060         
+29 0.0000 1.5300 1.5300         
+30 3.3872 1.5300 1.1010         
+31 4.6217 1.5300 1.4570         
+32 0.0000 1.5300 1.5300         
+33 3.3872 1.5300 1.1010         
+34 11.4318 1.5300 1.4200         
+35 23.1979 1.4200 1.1010         
+36 11.4318 1.5300 1.4200         
+37 -9.6879 1.4200 0.9650         
+38 23.1979 1.1010 1.4200         
+39 3.3872 1.1010 1.5300         
+40 11.4318 1.4200 1.5300         
+41 3.3872 1.1010 1.5300         
+42 4.6217 1.5300 1.4570         
+43 0.0000 1.5300 1.5300         
+44 11.4318 1.5300 1.4200         
+45 23.1979 1.4200 1.1010         
+46 -9.6879 1.4200 0.9650         
+47 4.6217 1.4570 1.5300         
+48 3.3872 1.1010 1.5300         
+49 11.4318 1.4200 1.5300         
+50 -9.6879 0.9650 1.4200         
+
+BondAngle Coeffs           
+
+1 20.7540 11.4210 1.5300 1.1010        
+2 18.1030 18.1030 1.1010 1.1010        
+3 55.3270 4.6189 1.4200 1.1010        
+4 2.6868 20.4033 1.5300 1.4200        
+5 2.6868 20.4033 1.5300 1.4200        
+6 8.0160 8.0160 1.5300 1.5300        
+7 20.7540 11.4210 1.5300 1.1010        
+8 2.6868 20.4033 1.5300 1.4200        
+9 55.3270 4.6189 1.4200 1.1010        
+10 20.7540 11.4210 1.5300 1.1010        
+11 18.1030 18.1030 1.1010 1.1010        
+12 -2.8112 -2.8112 1.4200 1.4200        
+13 28.8708 28.8708 1.4170 1.4170        
+14 58.4790 107.6806 1.4170 1.3768        
+15 20.0033 24.2183 1.4170 1.0982        
+16 31.0771 47.0579 1.4170 1.5010        
+17 0.0000 0.0000 1.5010 1.5300        
+18 0.0000 0.0000 1.5010 1.5010        
+19 8.0160 8.0160 1.5300 1.5300        
+20 20.7540 11.4210 1.5300 1.1010        
+21 18.1030 18.1030 1.1010 1.1010        
+22 0.0000 0.0000 1.4200 1.3768        
+23 -7.2229 -7.2229 1.4570 1.4570        
+24 31.8096 20.5799 1.4570 1.0060        
+25 6.0876 16.5702 1.5300 1.4570        
+26 13.4582 42.4332 1.1010 1.4570        
+27 20.7540 11.4210 1.5300 1.1010        
+28 28.0322 28.0322 1.0060 1.0060        
+29 8.0160 8.0160 1.5300 1.5300        
+30 20.7540 11.4210 1.5300 1.1010        
+31 6.0876 16.5702 1.5300 1.4570        
+32 8.0160 8.0160 1.5300 1.5300        
+33 20.7540 11.4210 1.5300 1.1010        
+34 2.6868 20.4033 1.5300 1.4200        
+35 55.3270 4.6189 1.4200 1.1010        
+36 2.6868 20.4033 1.5300 1.4200        
+37 28.5800 18.9277 1.4200 0.9650        
+38 4.6189 55.3270 1.1010 1.4200        
+39 11.4210 20.7540 1.1010 1.5300        
+40 20.4033 2.6868 1.4200 1.5300        
+41 11.4210 20.7540 1.1010 1.5300        
+42 6.0876 16.5702 1.5300 1.4570        
+43 8.0160 8.0160 1.5300 1.5300        
+44 2.6868 20.4033 1.5300 1.4200        
+45 55.3270 4.6189 1.4200 1.1010        
+46 28.5800 18.9277 1.4200 0.9650        
+47 16.5702 6.0876 1.4570 1.5300        
+48 11.4210 20.7540 1.1010 1.5300        
+49 20.4033 2.6868 1.4200 1.5300        
+50 18.9277 28.5800 0.9650 1.4200        
+
+AngleAngle Coeffs           
+
+1 0.0000 0.0000 0.0000 118.9000 123.4200 123.4200      
+2 0.0000 0.0000 0.0000 118.9000 117.9400 117.9400      
+3 0.0000 0.0000 0.0000 118.9000 120.0500 120.0500      
+4 0.0000 0.0000 0.0000 112.4436 110.9538 110.9538      
+5 0.0000 0.0000 0.0000 110.9538 107.0671 110.9538      
+6 0.2738 -0.4825 0.2738 110.7700 107.6600 110.7700      
+7 0.1689 2.5926 3.9177 111.2700 108.7280 110.7700      
+8 2.4259 2.1283 2.4259 108.7280 107.6600 108.7280      
+9 -0.8330 -0.8330 -3.5744 112.6700 111.2700 111.2700      
+10 0.1689 2.5926 3.9177 111.2700 108.7280 110.7700      
+11 -1.3199 -1.3199 0.1184 112.6700 110.7700 110.7700      
+12 0.1689 2.5926 3.9177 111.2700 108.7280 110.7700      
+13 0.2738 -0.4825 0.2738 110.7700 107.6600 110.7700      
+14 2.4259 2.1283 2.4259 108.7280 107.6600 108.7280      
+15 0.0000 0.0000 0.0000 108.4000 112.6700 108.4000      
+16 0.0000 0.0000 0.0000 111.0000 108.4000 108.4000      
+17 0.2738 -0.4825 0.2738 110.7700 107.6600 110.7700      
+18 -0.3157 -0.3157 -0.3157 107.6600 107.6600 107.6600      
+19 2.4286 0.5381 -2.5301 110.7700 110.6204 111.9100      
+20 2.4321 2.4321 -3.5496 107.6600 110.6204 110.6204      
+21 0.2738 -0.4825 0.2738 110.7700 107.6600 110.7700      
+22 0.0000 0.0000 0.0000 112.4436 112.4436 112.4436      
+
+AngleAngleTorsion Coeffs           
+
+1 -20.2006 110.7700 111.2700         
+2 -16.1640 110.7700 112.6700         
+3 -12.5640 110.7700 110.7700         
+4 -14.0484 111.2700 111.2700         
+5 -29.0420 111.2700 112.6700         
+6 -20.2006 111.2700 110.7700         
+7 0.0000 108.7280 102.9695         
+8 0.0000 111.2700 102.9695         
+9 -19.0059 111.2700 104.5000         
+10 -16.4438 108.7280 104.5000         
+11 -29.0420 112.6700 111.2700         
+12 -16.1640 112.6700 110.7700         
+13 -20.2006 111.2700 110.7700         
+14 -12.5640 110.7700 110.7700         
+15 0.0000 118.9000 118.9000         
+16 -4.8141 118.9000 117.9400         
+17 -21.0247 118.9000 123.4200         
+18 4.2296 123.4200 117.9400         
+19 0.0000 123.4200 102.9695         
+20 0.3598 117.9400 117.9400         
+21 -14.4097 118.9000 120.0500         
+22 4.4444 120.0500 117.9400         
+23 0.0000 120.0500 108.4000         
+24 0.0000 120.0500 111.0000         
+25 0.0000 108.4000 110.7700         
+26 -16.1640 112.6700 110.7700         
+27 -24.3818 111.9100 112.4436         
+28 -12.5567 110.6204 112.4436         
+29 -7.5499 111.9100 110.9538         
+30 -10.4258 110.6204 110.9538         
+31 -11.2307 111.9100 111.9100         
+32 -15.7572 110.7700 111.9100         
+33 -12.5640 110.7700 110.7700         
+34 -29.0420 112.6700 111.2700         
+35 -16.1640 112.6700 110.7700         
+36 -14.0484 111.2700 111.2700         
+37 -20.2006 111.2700 110.7700         
+38 -20.2006 110.7700 111.2700         
+39 -12.5640 110.7700 110.7700         
+40 -16.1640 110.7700 112.6700         
+41 -12.5640 110.7700 110.7700         
+42 -20.2006 110.7700 111.2700         
+43 -27.3953 111.9100 112.6700         
+44 -15.7572 111.9100 110.7700         
+45 0.0000 111.9100 111.2700         
+46 -24.3818 111.9100 112.4436         
+47 -7.5499 111.9100 110.9538         
+48 -29.0420 111.2700 112.6700         
+49 -20.2006 111.2700 110.7700         
+50 -14.0484 111.2700 111.2700         
+51 0.0000 111.2700 102.9695         
+52 -12.1038 111.2700 105.8000         
+53 -10.5093 108.7280 105.8000         
+54 -20.2006 110.7700 111.2700         
+55 -16.1640 110.7700 112.6700         
+56 -20.2006 110.7700 111.2700         
+57 -27.3953 111.9100 112.6700         
+58 -15.7572 111.9100 110.7700         
+59 0.0000 111.9100 111.2700         
+60 -24.3818 111.9100 112.4436         
+61 -29.0420 111.2700 112.6700         
+62 -14.0484 111.2700 111.2700         
+63 -12.1038 111.2700 105.8000         
+64 -10.5093 108.7280 105.8000         
+65 -12.1038 105.8000 111.2700         
+66 -10.5093 105.8000 108.7280         
+
+EndBondTorsion Coeffs           
+
+1 0.9681 0.9551 0.0436 0.5903 0.6669 0.8584 1.1010 1.4200    
+2 0.0814 0.0591 0.2219 0.2486 0.2422 -0.0925 1.1010 1.5300    
+3 0.2130 0.3120 0.0777 0.2130 0.3120 0.0777 1.1010 1.1010    
+4 1.0165 0.7553 -0.4609 1.0165 0.7553 -0.4609 1.4200 1.4200    
+5 1.1538 0.8409 -0.9138 -0.3190 0.4411 -0.7174 1.4200 1.5300    
+6 0.5903 0.6669 0.8584 0.9681 0.9551 0.0436 1.4200 1.1010    
+7 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 1.1010 1.3768    
+8 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 1.5300 1.3768    
+9 -0.2456 1.0517 -0.7795 0.4741 1.2635 0.5576 1.5300 1.4200    
+10 -0.6054 1.3339 0.9648 -0.1620 0.1564 -1.1408 1.1010 1.4200    
+11 -0.3190 0.4411 -0.7174 1.1538 0.8409 -0.9138 1.5300 1.4200    
+12 0.2486 0.2422 -0.0925 0.0814 0.0591 0.2219 1.5300 1.1010    
+13 0.5903 0.6669 0.8584 0.9681 0.9551 0.0436 1.4200 1.1010    
+14 0.2130 0.3120 0.0777 0.2130 0.3120 0.0777 1.1010 1.1010    
+15 -0.1185 6.3204 0.0000 -0.1185 6.3204 0.0000 1.4170 1.4170    
+16 0.0000 -6.8958 0.0000 0.0000 -0.4669 0.0000 1.4170 1.0982    
+17 0.0000 0.2655 0.0000 0.0000 4.8905 0.0000 1.4170 1.3768    
+18 0.0000 4.2641 0.0000 0.0000 -1.5867 0.0000 1.3768 1.0982    
+19 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 1.4170 1.4200    
+20 0.0000 -0.6890 0.0000 0.0000 -0.6890 0.0000 1.0982 1.0982    
+21 0.0000 -0.6918 0.0000 0.0000 0.2421 0.0000 1.4170 1.5010    
+22 0.0000 -1.7970 0.0000 0.0000 -0.4879 0.0000 1.5010 1.0982    
+23 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 1.4170 1.5300    
+24 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 1.4170 1.5010    
+25 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 1.5010 1.1010    
+26 0.2486 0.2422 -0.0925 0.0814 0.0591 0.2219 1.5300 1.1010    
+27 0.0997 -0.0046 -0.2657 -0.0128 -0.0495 -0.1079 1.5300 1.4570    
+28 -0.5892 0.7140 0.3505 0.0628 0.0873 -0.0882 1.1010 1.4570    
+29 -0.9466 0.9356 -0.5542 0.0570 0.0625 0.4112 1.5300 1.0060    
+30 -1.1685 0.9266 -0.0993 0.0850 0.3061 0.2104 1.1010 1.0060    
+31 0.0286 0.0566 -0.0493 0.0286 0.0566 -0.0493 1.4570 1.4570    
+32 0.1960 0.7056 0.1120 0.1022 0.2090 0.6433 1.1010 1.4570    
+33 0.2130 0.3120 0.0777 0.2130 0.3120 0.0777 1.1010 1.1010    
+34 -0.3190 0.4411 -0.7174 1.1538 0.8409 -0.9138 1.5300 1.4200    
+35 0.2486 0.2422 -0.0925 0.0814 0.0591 0.2219 1.5300 1.1010    
+36 1.0165 0.7553 -0.4609 1.0165 0.7553 -0.4609 1.4200 1.4200    
+37 0.5903 0.6669 0.8584 0.9681 0.9551 0.0436 1.4200 1.1010    
+38 0.9681 0.9551 0.0436 0.5903 0.6669 0.8584 1.1010 1.4200    
+39 0.2130 0.3120 0.0777 0.2130 0.3120 0.0777 1.1010 1.1010    
+40 0.0814 0.0591 0.2219 0.2486 0.2422 -0.0925 1.1010 1.5300    
+41 0.2130 0.3120 0.0777 0.2130 0.3120 0.0777 1.1010 1.1010    
+42 0.9681 0.9551 0.0436 0.5903 0.6669 0.8584 1.1010 1.4200    
+43 0.0579 -0.0043 -0.1906 0.1032 0.5896 -0.4836 1.4570 1.5300    
+44 0.1022 0.2090 0.6433 0.1960 0.7056 0.1120 1.4570 1.1010    
+45 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 1.4570 1.4200    
+46 0.0997 -0.0046 -0.2657 -0.0128 -0.0495 -0.1079 1.5300 1.4570    
+47 -0.9466 0.9356 -0.5542 0.0570 0.0625 0.4112 1.5300 1.0060    
+48 1.1538 0.8409 -0.9138 -0.3190 0.4411 -0.7174 1.4200 1.5300    
+49 0.5903 0.6669 0.8584 0.9681 0.9551 0.0436 1.4200 1.1010    
+50 1.0165 0.7553 -0.4609 1.0165 0.7553 -0.4609 1.4200 1.4200    
+51 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 1.5300 1.3768    
+52 -0.5800 0.9004 0.0000 0.0000 0.5343 0.9025 1.5300 0.9650    
+53 -1.7554 1.3145 0.2263 0.2493 0.6803 0.0000 1.1010 0.9650    
+54 0.9681 0.9551 0.0436 0.5903 0.6669 0.8584 1.1010 1.4200    
+55 0.0814 0.0591 0.2219 0.2486 0.2422 -0.0925 1.1010 1.5300    
+56 0.9681 0.9551 0.0436 0.5903 0.6669 0.8584 1.1010 1.4200    
+57 0.0579 -0.0043 -0.1906 0.1032 0.5896 -0.4836 1.4570 1.5300    
+58 0.1022 0.2090 0.6433 0.1960 0.7056 0.1120 1.4570 1.1010    
+59 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 1.4570 1.4200    
+60 0.0997 -0.0046 -0.2657 -0.0128 -0.0495 -0.1079 1.5300 1.4570    
+61 1.1538 0.8409 -0.9138 -0.3190 0.4411 -0.7174 1.4200 1.5300    
+62 1.0165 0.7553 -0.4609 1.0165 0.7553 -0.4609 1.4200 1.4200    
+63 -0.5800 0.9004 0.0000 0.0000 0.5343 0.9025 1.5300 0.9650    
+64 -1.7554 1.3145 0.2263 0.2493 0.6803 0.0000 1.1010 0.9650    
+65 0.0000 0.5343 0.9025 -0.5800 0.9004 0.0000 0.9650 1.5300    
+66 0.2493 0.6803 0.0000 -1.7554 1.3145 0.2263 0.9650 1.1010    
+
+MiddleBondTorsion Coeffs           
+
+1 -16.7975 -1.2296 -0.2750 1.5300        
+2 -14.8790 -3.6581 -0.3138 1.5300        
+3 -14.2610 -0.5322 -0.4864 1.5300        
+4 -17.2585 -3.6157 -0.8364 1.5300        
+5 -21.8842 -7.6764 -0.6868 1.5300        
+6 -16.7975 -1.2296 -0.2750 1.5300        
+7 0.0000 0.0000 0.0000 1.4200        
+8 0.0000 0.0000 0.0000 1.4200        
+9 -5.9288 -2.7007 -0.3175 1.4200        
+10 -6.8007 -4.6546 -1.4101 1.4200        
+11 -21.8842 -7.6764 -0.6868 1.5300        
+12 -14.8790 -3.6581 -0.3138 1.5300        
+13 -16.7975 -1.2296 -0.2750 1.5300        
+14 -14.2610 -0.5322 -0.4864 1.5300        
+15 27.5989 -2.3120 0.0000 1.4170        
+16 0.0000 -1.1521 0.0000 1.4170        
+17 0.0000 4.8255 0.0000 1.4170        
+18 0.0000 5.5432 0.0000 1.4170        
+19 0.0000 0.0000 0.0000 1.3768        
+20 0.0000 4.8228 0.0000 1.4170        
+21 0.0000 9.1792 0.0000 1.4170        
+22 0.0000 3.9421 0.0000 1.4170        
+23 0.0000 0.0000 0.0000 1.5010        
+24 0.0000 0.0000 0.0000 1.5010        
+25 0.0000 0.0000 0.0000 1.5300        
+26 -14.8790 -3.6581 -0.3138 1.5300        
+27 -8.0036 -7.7321 -3.0640 1.4570        
+28 -6.4529 -6.8122 -1.1632 1.4570        
+29 -2.2208 0.5479 -0.3527 1.4570        
+30 -3.4611 1.6996 -0.6007 1.4570        
+31 -3.3497 1.0143 -3.0062 1.5300        
+32 -10.4959 -0.7647 -0.0545 1.5300        
+33 -14.2610 -0.5322 -0.4864 1.5300        
+34 -21.8842 -7.6764 -0.6868 1.5300        
+35 -14.8790 -3.6581 -0.3138 1.5300        
+36 -17.2585 -3.6157 -0.8364 1.5300        
+37 -16.7975 -1.2296 -0.2750 1.5300        
+38 -16.7975 -1.2296 -0.2750 1.5300        
+39 -14.2610 -0.5322 -0.4864 1.5300        
+40 -14.8790 -3.6581 -0.3138 1.5300        
+41 -14.2610 -0.5322 -0.4864 1.5300        
+42 -16.7975 -1.2296 -0.2750 1.5300        
+43 -15.4174 -7.3055 -1.0749 1.5300        
+44 -10.4959 -0.7647 -0.0545 1.5300        
+45 0.0000 0.0000 0.0000 1.5300        
+46 -8.0036 -7.7321 -3.0640 1.4570        
+47 -2.2208 0.5479 -0.3527 1.4570        
+48 -21.8842 -7.6764 -0.6868 1.5300        
+49 -16.7975 -1.2296 -0.2750 1.5300        
+50 -17.2585 -3.6157 -0.8364 1.5300        
+51 0.0000 0.0000 0.0000 1.4200        
+52 1.2472 0.0000 0.7485 1.4200        
+53 0.0000 0.9241 -0.5889 1.4200        
+54 -16.7975 -1.2296 -0.2750 1.5300        
+55 -14.8790 -3.6581 -0.3138 1.5300        
+56 -16.7975 -1.2296 -0.2750 1.5300        
+57 -15.4174 -7.3055 -1.0749 1.5300        
+58 -10.4959 -0.7647 -0.0545 1.5300        
+59 0.0000 0.0000 0.0000 1.5300        
+60 -8.0036 -7.7321 -3.0640 1.4570        
+61 -21.8842 -7.6764 -0.6868 1.5300        
+62 -17.2585 -3.6157 -0.8364 1.5300        
+63 1.2472 0.0000 0.7485 1.4200        
+64 0.0000 0.9241 -0.5889 1.4200        
+65 1.2472 0.0000 0.7485 1.4200        
+66 0.0000 0.9241 -0.5889 1.4200        
+
+BondBond13 Coeffs           
+
+1 0.0000 1.1010 1.4200         
+2 0.0000 1.1010 1.5300         
+3 0.0000 1.1010 1.1010         
+4 0.0000 1.4200 1.4200         
+5 0.0000 1.4200 1.5300         
+6 0.0000 1.4200 1.1010         
+7 0.0000 1.1010 1.3768         
+8 0.0000 1.5300 1.3768         
+9 0.0000 1.5300 1.4200         
+10 0.0000 1.1010 1.4200         
+11 0.0000 1.5300 1.4200         
+12 0.0000 1.5300 1.1010         
+13 0.0000 1.4200 1.1010         
+14 0.0000 1.1010 1.1010         
+15 53.0000 1.4170 1.4170         
+16 -6.2741 1.4170 1.0982         
+17 -2.2436 1.4170 1.3768         
+18 2.0517 1.3768 1.0982         
+19 0.0000 1.4170 1.4200         
+20 -1.7077 1.0982 1.0982         
+21 2.5085 1.4170 1.5010         
+22 0.8743 1.5010 1.0982         
+23 0.0000 1.4170 1.5300         
+24 0.0000 1.4170 1.5010         
+25 0.0000 1.5010 1.1010         
+26 0.0000 1.5300 1.1010         
+27 0.0000 1.5300 1.4570         
+28 0.0000 1.1010 1.4570         
+29 0.0000 1.5300 1.0060         
+30 0.0000 1.1010 1.0060         
+31 0.0000 1.4570 1.4570         
+32 0.0000 1.1010 1.4570         
+33 0.0000 1.1010 1.1010         
+34 0.0000 1.5300 1.4200         
+35 0.0000 1.5300 1.1010         
+36 0.0000 1.4200 1.4200         
+37 0.0000 1.4200 1.1010         
+38 0.0000 1.1010 1.4200         
+39 0.0000 1.1010 1.1010         
+40 0.0000 1.1010 1.5300         
+41 0.0000 1.1010 1.1010         
+42 0.0000 1.1010 1.4200         
+43 0.0000 1.4570 1.5300         
+44 0.0000 1.4570 1.1010         
+45 0.0000 1.4570 1.4200         
+46 0.0000 1.5300 1.4570         
+47 0.0000 1.5300 1.0060         
+48 0.0000 1.4200 1.5300         
+49 0.0000 1.4200 1.1010         
+50 0.0000 1.4200 1.4200         
+51 0.0000 1.5300 1.3768         
+52 0.0000 1.5300 0.9650         
+53 0.0000 1.1010 0.9650         
+54 0.0000 1.1010 1.4200         
+55 0.0000 1.1010 1.5300         
+56 0.0000 1.1010 1.4200         
+57 0.0000 1.4570 1.5300         
+58 0.0000 1.4570 1.1010         
+59 0.0000 1.4570 1.4200         
+60 0.0000 1.5300 1.4570         
+61 0.0000 1.4200 1.5300         
+62 0.0000 1.4200 1.4200         
+63 0.0000 1.5300 0.9650         
+64 0.0000 1.1010 0.9650         
+65 0.0000 0.9650 1.5300         
+66 0.0000 0.9650 1.1010         
+
+AngleTorsion Coeffs           
+
+1 2.3668 2.4920 -1.0122 -0.1892 0.4918 0.7273 110.7700 111.2700    
+2 0.3113 0.4516 -0.1988 -0.2454 0.0000 -0.1136 110.7700 112.6700    
+3 -0.8085 0.5569 -0.2466 -0.8085 0.5569 -0.2466 110.7700 110.7700    
+4 0.5511 0.9737 -0.6673 0.5511 0.9737 -0.6673 111.2700 111.2700    
+5 0.9672 -0.7566 -1.2331 0.5623 -0.3041 -0.4015 111.2700 112.6700    
+6 -0.1892 0.4918 0.7273 2.3668 2.4920 -1.0122 111.2700 110.7700    
+7 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 108.7280 102.9695    
+8 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 111.2700 102.9695    
+9 -2.7466 1.4877 -0.8955 0.5676 0.9450 0.0703 111.2700 104.5000    
+10 -1.8234 1.6393 0.5144 -0.7777 0.4340 -0.6653 108.7280 104.5000    
+11 0.5623 -0.3041 -0.4015 0.9672 -0.7566 -1.2331 112.6700 111.2700    
+12 -0.2454 0.0000 -0.1136 0.3113 0.4516 -0.1988 112.6700 110.7700    
+13 -0.1892 0.4918 0.7273 2.3668 2.4920 -1.0122 111.2700 110.7700    
+14 -0.8085 0.5569 -0.2466 -0.8085 0.5569 -0.2466 110.7700 110.7700    
+15 1.9767 1.0239 0.0000 1.9767 1.0239 0.0000 118.9000 118.9000    
+16 0.0000 2.5014 0.0000 0.0000 2.7147 0.0000 118.9000 117.9400    
+17 0.0000 10.0155 0.0000 0.0000 1.7404 0.0000 118.9000 123.4200    
+18 0.0000 2.5706 0.0000 0.0000 1.8729 0.0000 123.4200 117.9400    
+19 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 123.4200 102.9695    
+20 0.0000 2.4501 0.0000 0.0000 2.4501 0.0000 117.9400 117.9400    
+21 0.0000 3.8987 0.0000 0.0000 -4.4683 0.0000 118.9000 120.0500    
+22 0.0000 -0.1242 0.0000 0.0000 3.4601 0.0000 120.0500 117.9400    
+23 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 120.0500 108.4000    
+24 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 120.0500 111.0000    
+25 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 108.4000 110.7700    
+26 -0.2454 0.0000 -0.1136 0.3113 0.4516 -0.1988 112.6700 110.7700    
+27 -2.7883 1.5193 1.4796 1.2031 1.3645 -0.7071 111.9100 112.4436    
+28 -2.6321 0.9353 -0.8398 -1.3582 0.1465 -0.5729 110.6204 112.4436    
+29 -3.3430 4.4558 -0.0346 0.2873 -0.8072 -0.0960 111.9100 110.9538    
+30 -3.9582 2.0063 0.3213 -0.4294 -0.4442 -0.6141 110.6204 110.9538    
+31 1.3673 0.4528 -2.7700 1.3673 0.4528 -2.7700 111.9100 111.9100    
+32 0.5111 1.6328 -1.0155 -1.1075 0.2820 0.8318 110.7700 111.9100    
+33 -0.8085 0.5569 -0.2466 -0.8085 0.5569 -0.2466 110.7700 110.7700    
+34 0.5623 -0.3041 -0.4015 0.9672 -0.7566 -1.2331 112.6700 111.2700    
+35 -0.2454 0.0000 -0.1136 0.3113 0.4516 -0.1988 112.6700 110.7700    
+36 0.5511 0.9737 -0.6673 0.5511 0.9737 -0.6673 111.2700 111.2700    
+37 -0.1892 0.4918 0.7273 2.3668 2.4920 -1.0122 111.2700 110.7700    
+38 2.3668 2.4920 -1.0122 -0.1892 0.4918 0.7273 110.7700 111.2700    
+39 -0.8085 0.5569 -0.2466 -0.8085 0.5569 -0.2466 110.7700 110.7700    
+40 0.3113 0.4516 -0.1988 -0.2454 0.0000 -0.1136 110.7700 112.6700    
+41 -0.8085 0.5569 -0.2466 -0.8085 0.5569 -0.2466 110.7700 110.7700    
+42 2.3668 2.4920 -1.0122 -0.1892 0.4918 0.7273 110.7700 111.2700    
+43 2.0125 0.9440 -2.7612 -1.9225 -1.3450 0.2210 111.9100 112.6700    
+44 -1.1075 0.2820 0.8318 0.5111 1.6328 -1.0155 111.9100 110.7700    
+45 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 111.9100 111.2700    
+46 -2.7883 1.5193 1.4796 1.2031 1.3645 -0.7071 111.9100 112.4436    
+47 -3.3430 4.4558 -0.0346 0.2873 -0.8072 -0.0960 111.9100 110.9538    
+48 0.9672 -0.7566 -1.2331 0.5623 -0.3041 -0.4015 111.2700 112.6700    
+49 -0.1892 0.4918 0.7273 2.3668 2.4920 -1.0122 111.2700 110.7700    
+50 0.5511 0.9737 -0.6673 0.5511 0.9737 -0.6673 111.2700 111.2700    
+51 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 111.2700 102.9695    
+52 -3.5903 2.5225 0.4888 0.8726 -0.3577 0.3888 111.2700 105.8000    
+53 -3.4060 1.6396 0.0737 0.0000 -0.2810 -0.5944 108.7280 105.8000    
+54 2.3668 2.4920 -1.0122 -0.1892 0.4918 0.7273 110.7700 111.2700    
+55 0.3113 0.4516 -0.1988 -0.2454 0.0000 -0.1136 110.7700 112.6700    
+56 2.3668 2.4920 -1.0122 -0.1892 0.4918 0.7273 110.7700 111.2700    
+57 2.0125 0.9440 -2.7612 -1.9225 -1.3450 0.2210 111.9100 112.6700    
+58 -1.1075 0.2820 0.8318 0.5111 1.6328 -1.0155 111.9100 110.7700    
+59 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 111.9100 111.2700    
+60 -2.7883 1.5193 1.4796 1.2031 1.3645 -0.7071 111.9100 112.4436    
+61 0.9672 -0.7566 -1.2331 0.5623 -0.3041 -0.4015 111.2700 112.6700    
+62 0.5511 0.9737 -0.6673 0.5511 0.9737 -0.6673 111.2700 111.2700    
+63 -3.5903 2.5225 0.4888 0.8726 -0.3577 0.3888 111.2700 105.8000    
+64 -3.4060 1.6396 0.0737 0.0000 -0.2810 -0.5944 108.7280 105.8000    
+65 0.8726 -0.3577 0.3888 -3.5903 2.5225 0.4888 105.8000 111.2700    
+66 0.0000 -0.2810 -0.5944 -3.4060 1.6396 0.0737 105.8000 108.7280    
+
+Atoms # full          
+
+1 1 1 0.000000 25.246496201 -1.871744037 -8.651348114 0 0 0 # c2 
+2 1 2 0.000000 25.610639572 -3.288228035 -8.165973663 0 0 0 # c3m 
+3 1 2 0.000000 24.731319427 -4.483242989 -8.675741196 0 0 0 # c3m 
+4 1 2 0.000000 18.703355789 9.118826866 -4.174236774 0 0 0 # c3m 
+5 1 2 0.000000 18.099748611 8.263649940 -5.343001842 0 0 0 # c3m 
+6 1 1 0.000000 19.081827164 7.609607220 -6.334177017 0 0 0 # c2 
+7 1 3 0.100000 26.190139771 -4.295329094 -9.220970154 0 0 0 # o3e 
+8 1 3 0.100000 17.971729279 9.827675819 -5.367077827 0 0 0 # o3e 
+9 1 4 0.000000 20.263877869 5.733595848 -6.736782074 0 0 0 # cp 
+10 1 4 0.000000 19.777191162 4.983679771 -7.809411049 0 0 0 # cp 
+11 1 4 0.000000 20.667026520 4.390971184 -8.707633972 0 0 0 # cp 
+12 1 4 0.000000 22.043539047 4.548151016 -8.533248901 0 0 0 # cp 
+13 1 4 0.000000 22.530214310 5.298062801 -7.460619926 0 0 0 # cp 
+14 1 4 0.000000 21.640394211 5.890783787 -6.562390804 0 0 0 # cp 
+15 1 5 0.000000 23.005182266 3.906831026 -9.503917694 0 0 0 # c 
+16 1 6 0.000000 24.286390305 4.758069992 -9.590908051 0 0 0 # c3 
+17 1 6 0.000000 22.342786789 3.812531948 -10.891778946 0 0 0 # c3 
+18 1 4 0.000000 23.361906052 2.519830942 -9.029184341 0 0 0 # cp 
+19 1 4 0.000000 24.458705902 2.330889940 -8.185920715 0 0 0 # cp 
+20 1 4 0.000000 24.788816452 1.047963977 -7.745534897 0 0 0 # cp 
+21 1 4 0.000000 24.022008896 -0.046867002 -8.149927139 0 0 0 # cp 
+22 1 4 0.000000 22.925630569 0.140873000 -8.992565155 0 0 0 # cp 
+23 1 4 0.000000 22.595729828 1.424777985 -9.432847977 0 0 0 # cp 
+24 1 7 0.000000 19.414030075 6.299984932 -5.878956795 0 0 0 # oc 
+25 1 7 0.000000 24.338140488 -1.273216963 -7.729548931 0 0 0 # oc 
+26 1 8 0.000000 26.150024414 -1.266484976 -8.715751648 0 0 0 # hc 
+27 1 8 0.000000 24.778566360 -1.933199048 -9.633987427 0 0 0 # hc 
+28 1 8 0.000000 25.929294586 -2.927781105 -7.187973022 0 0 0 # hc 
+29 1 8 0.000000 24.549385071 -5.308847904 -7.987242222 0 0 0 # hc 
+30 1 8 0.000000 23.904827118 -4.254271030 -9.348136902 0 0 0 # hc 
+31 1 8 0.000000 18.194736481 9.091637611 -3.210949898 0 0 0 # hc 
+32 1 8 0.000000 19.788938522 9.208558083 -4.119643211 0 0 0 # hc 
+33 1 8 0.000000 17.399309158 7.432216167 -5.407801151 0 0 0 # hc 
+34 1 8 0.000000 18.616250992 7.545570850 -7.316913128 0 0 0 # hc 
+35 1 8 0.000000 19.987047195 8.212498665 -6.399401188 0 0 0 # hc 
+36 1 8 0.000000 18.713207245 4.862418175 -7.944396973 0 0 0 # hc 
+37 1 8 0.000000 20.290582657 3.811013937 -9.537291527 0 0 0 # hc 
+38 1 8 0.000000 23.594188690 5.419342995 -7.325634956 0 0 0 # hc 
+39 1 8 0.000000 22.016828537 6.470753193 -5.732734203 0 0 0 # hc 
+40 1 8 0.000000 24.982324600 4.297049999 -10.290958405 0 0 0 # hc 
+41 1 8 0.000000 24.034254074 5.760886192 -9.936174393 0 0 0 # hc 
+42 1 8 0.000000 24.749143600 4.819462776 -8.606439590 0 0 0 # hc 
+43 1 8 0.000000 23.034755707 3.349560976 -11.594371796 0 0 0 # hc 
+44 1 8 0.000000 21.438467026 3.207982063 -10.822364807 0 0 0 # hc 
+45 1 8 0.000000 22.084871292 4.811752796 -11.239845276 0 0 0 # hc 
+46 1 8 0.000000 25.050769806 3.177418947 -7.873311996 0 0 0 # hc 
+47 1 8 0.000000 25.636974335 0.901705027 -7.093626022 0 0 0 # hc 
+48 1 8 0.000000 22.333581924 -0.705653012 -9.305183411 0 0 0 # hc 
+49 1 8 0.000000 21.747369766 1.570054054 -10.084861755 0 0 0 # hc 
+50 1 1 0.000000 25.222612381 -4.200571060 0.463562995 0 0 0 # c2 
+51 1 2 0.000000 25.832977295 -5.360119820 -0.347983003 0 0 0 # c3m 
+52 1 2 0.000000 27.389345169 -5.551681042 -0.290704012 0 0 0 # c3m 
+53 1 2 0.000000 20.635538101 8.396902084 -1.535487056 0 0 0 # c3m 
+54 1 2 0.000000 21.957460403 8.158697128 -0.723941982 0 0 0 # c3m 
+55 1 1 0.000000 22.041673660 6.895174980 0.154822007 0 0 0 # c2 
+56 1 3 0.100000 26.447082520 -6.565405846 0.448491007 0 0 0 # o3e 
+57 1 3 0.100000 20.959102631 9.287891388 -0.285212994 0 0 0 # o3e 
+58 1 4 0.000000 22.680345535 4.733430862 0.158248007 0 0 0 # cp 
+59 1 4 0.000000 23.824728012 4.488029957 0.920358002 0 0 0 # cp 
+60 1 4 0.000000 23.901163101 3.343113899 1.716701984 0 0 0 # cp 
+61 1 4 0.000000 22.833225250 2.443607092 1.750934958 0 0 0 # cp 
+62 1 4 0.000000 21.688846588 2.689002037 0.988831997 0 0 0 # cp 
+63 1 4 0.000000 21.612403870 3.833913088 0.192488998 0 0 0 # cp 
+64 1 5 0.000000 22.916360855 1.205785036 2.611289978 0 0 0 # c 
+65 1 6 0.000000 21.501018524 0.810333014 3.075165987 0 0 0 # c3 
+66 1 6 0.000000 23.808341980 1.493147969 3.834667921 0 0 0 # c3 
+67 1 4 0.000000 23.514062881 0.070205003 1.817157984 0 0 0 # cp 
+68 1 4 0.000000 22.684833527 -0.782863975 1.085504055 0 0 0 # cp 
+69 1 4 0.000000 23.237234116 -1.833225965 0.349765003 0 0 0 # cp 
+70 1 4 0.000000 24.619955063 -2.031138897 0.346872985 0 0 0 # cp 
+71 1 4 0.000000 25.449554443 -1.179108977 1.077638030 0 0 0 # cp 
+72 1 4 0.000000 24.896312714 -0.128257006 1.813575983 0 0 0 # cp 
+73 1 7 0.000000 22.607131958 5.827101231 -0.602173984 0 0 0 # oc 
+74 1 7 0.000000 25.147769928 -3.035661936 -0.355791986 0 0 0 # oc 
+75 1 8 0.000000 24.221906662 -4.476489067 0.794990003 0 0 0 # hc 
+76 1 8 0.000000 25.849754333 -3.994390965 1.331357956 0 0 0 # hc 
+77 1 8 0.000000 25.097463608 -5.257826805 -1.146129966 0 0 0 # hc 
+78 1 8 0.000000 27.892013550 -5.893630028 -1.196079969 0 0 0 # hc 
+79 1 8 0.000000 27.964216232 -4.855231762 0.319745004 0 0 0 # hc 
+80 1 8 0.000000 20.720872879 8.854673386 -2.520912886 0 0 0 # hc 
+81 1 8 0.000000 19.840383530 7.656352043 -1.438712001 0 0 0 # hc 
+82 1 8 0.000000 23.017726898 8.120765686 -0.970986009 0 0 0 # hc 
+83 1 8 0.000000 22.669095993 7.097908974 1.022259951 0 0 0 # hc 
+84 1 8 0.000000 21.041725159 6.616360188 0.486577004 0 0 0 # hc 
+85 1 8 0.000000 24.650087357 5.183434963 0.894133985 0 0 0 # hc 
+86 1 8 0.000000 24.786277771 3.153367996 2.306194067 0 0 0 # hc 
+87 1 8 0.000000 20.863473892 1.993592978 1.015051961 0 0 0 # hc 
+88 1 8 0.000000 20.727291107 4.023673058 -0.397009999 0 0 0 # hc 
+89 1 8 0.000000 21.558345795 -0.083162002 3.696341038 0 0 0 # hc 
+90 1 8 0.000000 21.065618515 1.626867056 3.651936054 0 0 0 # hc 
+91 1 8 0.000000 20.876825333 0.608124971 2.205033064 0 0 0 # hc 
+92 1 8 0.000000 23.870355606 0.601037025 4.457283974 0 0 0 # hc 
+93 1 8 0.000000 24.807676315 1.770614982 3.498578072 0 0 0 # hc 
+94 1 8 0.000000 23.380037308 2.311306953 4.412462234 0 0 0 # hc 
+95 1 8 0.000000 21.616291046 -0.629218996 1.087699056 0 0 0 # hc 
+96 1 8 0.000000 22.596149445 -2.493021011 -0.215893999 0 0 0 # hc 
+97 1 8 0.000000 26.518102646 -1.332759023 1.075448036 0 0 0 # hc 
+98 1 8 0.000000 25.538236618 0.531040013 2.379035950 0 0 0 # hc 
+99 1 9 0.000000 16.072591782 12.338866234 -0.174325004 0 0 0 # na 
+100 1 1 0.000000 16.557256699 11.130316734 0.587288976 0 0 0 # c2 
+101 1 1 0.000000 18.074571609 10.998808861 0.366084993 0 0 0 # c2 
+102 1 9 -0.025000 18.353967667 10.832372665 -1.107717037 0 0 0 # na 
+103 1 9 -0.025000 14.920715332 15.017822266 -0.200534001 0 0 0 # na 
+104 1 1 0.000000 16.390434265 14.791102409 -0.460442007 0 0 0 # c2 
+105 1 1 0.000000 16.852983475 13.538317680 0.304865986 0 0 0 # c2 
+106 1 10 0.000000 16.263746262 12.190562248 -1.257431984 0 0 0 # hn 
+107 1 8 0.000000 16.025363922 10.195071220 0.210473999 0 0 0 # hc 
+108 1 8 0.000000 16.347120285 11.269214630 1.698830962 0 0 0 # hc 
+109 1 8 0.000000 18.467184067 10.092565536 0.934801996 0 0 0 # hc 
+110 1 8 0.000000 18.592388153 11.941304207 0.744638979 0 0 0 # hc 
+111 1 10 0.000000 17.843862534 9.919928551 -1.479779005 0 0 0 # hn 
+112 1 10 0.000000 19.448190689 10.736482620 -1.267521024 0 0 0 # hn 
+113 1 10 0.000000 14.344121933 14.136246681 -0.550131977 0 0 0 # hn 
+114 1 10 0.000000 14.583471298 15.922760963 -0.747138977 0 0 0 # hn 
+115 1 8 0.000000 16.984062195 15.696007729 -0.102596000 0 0 0 # hc 
+116 1 8 0.000000 16.562423706 14.639820099 -1.577000022 0 0 0 # hc 
+117 1 8 0.000000 16.674821854 13.685671806 1.420761943 0 0 0 # hc 
+118 1 8 0.000000 17.963953018 13.362975121 0.117853999 0 0 0 # hc 
+
+Bonds            
+
+1 1 1 26         
+2 2 1 2         
+3 1 1 27         
+4 3 1 25         
+5 4 2 7         
+6 5 2 3         
+7 6 2 28         
+8 4 3 7         
+9 6 3 29         
+10 6 3 30         
+11 6 4 32         
+12 4 4 8         
+13 5 4 5         
+14 6 4 31         
+15 4 5 8         
+16 2 6 5         
+17 6 5 33         
+18 3 6 24         
+19 1 6 34         
+20 1 6 35         
+21 7 9 14         
+22 7 9 10         
+23 8 9 24         
+24 7 10 11         
+25 9 10 36         
+26 7 11 12         
+27 9 11 37         
+28 7 12 13         
+29 10 12 15         
+30 7 13 14         
+31 9 13 38         
+32 9 14 39         
+33 11 15 16         
+34 11 15 17         
+35 10 18 15         
+36 12 16 40         
+37 12 16 41         
+38 12 16 42         
+39 12 17 43         
+40 12 17 44         
+41 12 17 45         
+42 7 18 23         
+43 7 18 19         
+44 7 19 20         
+45 9 19 46         
+46 7 20 21         
+47 9 20 47         
+48 7 21 22         
+49 8 21 25         
+50 7 22 23         
+51 9 22 48         
+52 9 23 49         
+53 1 50 75         
+54 2 50 51         
+55 1 50 76         
+56 3 50 74         
+57 4 51 56         
+58 5 51 52         
+59 6 51 77         
+60 4 52 56         
+61 6 52 78         
+62 6 52 79         
+63 6 53 81         
+64 4 53 57         
+65 5 53 54         
+66 6 53 80         
+67 4 54 57         
+68 2 55 54         
+69 6 54 82         
+70 3 55 73         
+71 1 55 83         
+72 1 55 84         
+73 7 58 63         
+74 7 58 59         
+75 8 58 73         
+76 7 59 60         
+77 9 59 85         
+78 7 60 61         
+79 9 60 86         
+80 7 61 62         
+81 10 61 64         
+82 7 62 63         
+83 9 62 87         
+84 9 63 88         
+85 11 64 65         
+86 11 64 66         
+87 10 67 64         
+88 12 65 89         
+89 12 65 90         
+90 12 65 91         
+91 12 66 92         
+92 12 66 93         
+93 12 66 94         
+94 7 67 72         
+95 7 67 68         
+96 7 68 69         
+97 9 68 95         
+98 7 69 70         
+99 9 69 96         
+100 7 70 71         
+101 8 70 74         
+102 7 71 72         
+103 9 71 97         
+104 9 72 98         
+105 13 100 99         
+106 13 105 99         
+107 14 99 106         
+108 15 100 101         
+109 1 100 107         
+110 1 100 108         
+111 13 101 102         
+112 1 101 109         
+113 1 101 110         
+114 14 102 111         
+115 14 102 112         
+116 13 104 103         
+117 14 103 113         
+118 14 103 114         
+119 15 104 105         
+120 1 104 115         
+121 1 104 116         
+122 1 105 117         
+123 1 105 118         
+
+Angles            
+
+1 1 2 1 26        
+2 2 26 1 27        
+3 3 25 1 26        
+4 1 2 1 27        
+5 4 2 1 25        
+6 3 25 1 27        
+7 5 1 2 7        
+8 6 1 2 3        
+9 7 1 2 28        
+10 8 3 2 7        
+11 9 7 2 28        
+12 10 3 2 28        
+13 8 2 3 7        
+14 10 2 3 29        
+15 10 2 3 30        
+16 9 7 3 29        
+17 9 7 3 30        
+18 11 29 3 30        
+19 9 8 4 32        
+20 10 5 4 32        
+21 11 32 4 31        
+22 8 5 4 8        
+23 9 8 4 31        
+24 10 5 4 31        
+25 8 4 5 8        
+26 6 6 5 4        
+27 10 4 5 33        
+28 5 6 5 8        
+29 9 8 5 33        
+30 7 6 5 33        
+31 4 5 6 24        
+32 1 5 6 34        
+33 1 5 6 35        
+34 3 24 6 34        
+35 3 24 6 35        
+36 2 34 6 35        
+37 12 2 7 3        
+38 12 4 8 5        
+39 13 14 9 10        
+40 14 14 9 24        
+41 14 10 9 24        
+42 13 9 10 11        
+43 15 9 10 36        
+44 15 11 10 36        
+45 13 10 11 12        
+46 15 10 11 37        
+47 15 12 11 37        
+48 13 11 12 13        
+49 16 11 12 15        
+50 16 13 12 15        
+51 13 12 13 14        
+52 15 12 13 38        
+53 15 14 13 38        
+54 13 9 14 13        
+55 15 9 14 39        
+56 15 13 14 39        
+57 17 12 15 16        
+58 17 12 15 17        
+59 18 12 15 18        
+60 19 16 15 17        
+61 17 18 15 16        
+62 17 18 15 17        
+63 20 15 16 40        
+64 20 15 16 41        
+65 20 15 16 42        
+66 21 40 16 41        
+67 21 40 16 42        
+68 21 41 16 42        
+69 20 15 17 43        
+70 20 15 17 44        
+71 20 15 17 45        
+72 21 43 17 44        
+73 21 43 17 45        
+74 21 44 17 45        
+75 16 23 18 15        
+76 16 19 18 15        
+77 13 23 18 19        
+78 13 18 19 20        
+79 15 18 19 46        
+80 15 20 19 46        
+81 13 19 20 21        
+82 15 19 20 47        
+83 15 21 20 47        
+84 13 20 21 22        
+85 14 20 21 25        
+86 14 22 21 25        
+87 13 21 22 23        
+88 15 21 22 48        
+89 15 23 22 48        
+90 13 18 23 22        
+91 15 18 23 49        
+92 15 22 23 49        
+93 22 6 24 9        
+94 22 1 25 21        
+95 1 51 50 75        
+96 2 75 50 76        
+97 3 74 50 75        
+98 1 51 50 76        
+99 4 51 50 74        
+100 3 74 50 76        
+101 5 50 51 56        
+102 6 50 51 52        
+103 7 50 51 77        
+104 8 52 51 56        
+105 9 56 51 77        
+106 10 52 51 77        
+107 8 51 52 56        
+108 10 51 52 78        
+109 10 51 52 79        
+110 9 56 52 78        
+111 9 56 52 79        
+112 11 78 52 79        
+113 9 57 53 81        
+114 10 54 53 81        
+115 11 81 53 80        
+116 8 54 53 57        
+117 9 57 53 80        
+118 10 54 53 80        
+119 8 53 54 57        
+120 6 55 54 53        
+121 10 53 54 82        
+122 5 55 54 57        
+123 9 57 54 82        
+124 7 55 54 82        
+125 4 54 55 73        
+126 1 54 55 83        
+127 1 54 55 84        
+128 3 73 55 83        
+129 3 73 55 84        
+130 2 83 55 84        
+131 12 51 56 52        
+132 12 53 57 54        
+133 13 63 58 59        
+134 14 63 58 73        
+135 14 59 58 73        
+136 13 58 59 60        
+137 15 58 59 85        
+138 15 60 59 85        
+139 13 59 60 61        
+140 15 59 60 86        
+141 15 61 60 86        
+142 13 60 61 62        
+143 16 60 61 64        
+144 16 62 61 64        
+145 13 61 62 63        
+146 15 61 62 87        
+147 15 63 62 87        
+148 13 58 63 62        
+149 15 58 63 88        
+150 15 62 63 88        
+151 17 61 64 65        
+152 17 61 64 66        
+153 18 61 64 67        
+154 19 65 64 66        
+155 17 67 64 65        
+156 17 67 64 66        
+157 20 64 65 89        
+158 20 64 65 90        
+159 20 64 65 91        
+160 21 89 65 90        
+161 21 89 65 91        
+162 21 90 65 91        
+163 20 64 66 92        
+164 20 64 66 93        
+165 20 64 66 94        
+166 21 92 66 93        
+167 21 92 66 94        
+168 21 93 66 94        
+169 16 72 67 64        
+170 16 68 67 64        
+171 13 72 67 68        
+172 13 67 68 69        
+173 15 67 68 95        
+174 15 69 68 95        
+175 13 68 69 70        
+176 15 68 69 96        
+177 15 70 69 96        
+178 13 69 70 71        
+179 14 69 70 74        
+180 14 71 70 74        
+181 13 70 71 72        
+182 15 70 71 97        
+183 15 72 71 97        
+184 13 67 72 71        
+185 15 67 72 98        
+186 15 71 72 98        
+187 22 55 73 58        
+188 22 50 74 70        
+189 23 100 99 105        
+190 24 100 99 106        
+191 24 105 99 106        
+192 25 101 100 99        
+193 26 107 100 99        
+194 26 108 100 99        
+195 27 101 100 107        
+196 27 101 100 108        
+197 2 107 100 108        
+198 25 100 101 102        
+199 27 100 101 109        
+200 27 100 101 110        
+201 26 109 101 102        
+202 26 110 101 102        
+203 2 109 101 110        
+204 24 101 102 111        
+205 24 101 102 112        
+206 28 111 102 112        
+207 24 104 103 113        
+208 24 104 103 114        
+209 28 113 103 114        
+210 25 105 104 103        
+211 26 115 104 103        
+212 26 116 104 103        
+213 27 105 104 115        
+214 27 105 104 116        
+215 2 115 104 116        
+216 25 104 105 99        
+217 26 117 105 99        
+218 26 118 105 99        
+219 27 104 105 117        
+220 27 104 105 118        
+221 2 117 105 118        
+
+Dihedrals            
+
+1 1 26 1 2 7       
+2 2 26 1 2 3       
+3 3 26 1 2 28       
+4 1 27 1 2 7       
+5 2 27 1 2 3       
+6 3 27 1 2 28       
+7 4 25 1 2 7       
+8 5 25 1 2 3       
+9 6 25 1 2 28       
+10 7 26 1 25 21       
+11 8 2 1 25 21       
+12 7 27 1 25 21       
+13 9 1 2 7 3       
+14 10 28 2 7 3       
+15 11 1 2 3 7       
+16 12 1 2 3 29       
+17 12 1 2 3 30       
+18 13 7 2 3 29       
+19 13 7 2 3 30       
+20 13 7 3 2 28       
+21 14 28 2 3 29       
+22 14 28 2 3 30       
+23 10 29 3 7 2       
+24 10 30 3 7 2       
+25 10 32 4 8 5       
+26 10 31 4 8 5       
+27 13 8 5 4 32       
+28 12 6 5 4 32       
+29 14 32 4 5 33       
+30 11 6 5 4 8       
+31 13 8 4 5 33       
+32 13 8 5 4 31       
+33 12 6 5 4 31       
+34 14 31 4 5 33       
+35 9 6 5 8 4       
+36 10 33 5 8 4       
+37 5 24 6 5 4       
+38 2 34 6 5 4       
+39 2 35 6 5 4       
+40 4 24 6 5 8       
+41 1 34 6 5 8       
+42 1 35 6 5 8       
+43 6 24 6 5 33       
+44 3 34 6 5 33       
+45 3 35 6 5 33       
+46 8 5 6 24 9       
+47 7 34 6 24 9       
+48 7 35 6 24 9       
+49 15 10 9 14 13       
+50 16 10 9 14 39       
+51 17 13 14 9 24       
+52 18 24 9 14 39       
+53 15 14 9 10 11       
+54 16 14 9 10 36       
+55 17 11 10 9 24       
+56 18 24 9 10 36       
+57 19 14 9 24 6       
+58 19 10 9 24 6       
+59 15 9 10 11 12       
+60 16 9 10 11 37       
+61 16 12 11 10 36       
+62 20 36 10 11 37       
+63 15 10 11 12 13       
+64 21 10 11 12 15       
+65 16 13 12 11 37       
+66 22 15 12 11 37       
+67 15 11 12 13 14       
+68 16 11 12 13 38       
+69 21 14 13 12 15       
+70 22 15 12 13 38       
+71 23 11 12 15 16       
+72 23 11 12 15 17       
+73 24 11 12 15 18       
+74 23 13 12 15 16       
+75 23 13 12 15 17       
+76 24 13 12 15 18       
+77 15 12 13 14 9       
+78 16 12 13 14 39       
+79 16 9 14 13 38       
+80 20 38 13 14 39       
+81 25 12 15 16 40       
+82 25 12 15 16 41       
+83 25 12 15 16 42       
+84 26 17 15 16 40       
+85 26 17 15 16 41       
+86 26 17 15 16 42       
+87 25 18 15 16 40       
+88 25 18 15 16 41       
+89 25 18 15 16 42       
+90 25 12 15 17 43       
+91 25 12 15 17 44       
+92 25 12 15 17 45       
+93 26 16 15 17 43       
+94 26 16 15 17 44       
+95 26 16 15 17 45       
+96 25 18 15 17 43       
+97 25 18 15 17 44       
+98 25 18 15 17 45       
+99 24 23 18 15 12       
+100 24 19 18 15 12       
+101 23 23 18 15 16       
+102 23 19 18 15 16       
+103 23 23 18 15 17       
+104 23 19 18 15 17       
+105 21 22 23 18 15       
+106 22 15 18 23 49       
+107 15 19 18 23 22       
+108 16 19 18 23 49       
+109 21 20 19 18 15       
+110 22 15 18 19 46       
+111 15 23 18 19 20       
+112 16 23 18 19 46       
+113 15 18 19 20 21       
+114 16 18 19 20 47       
+115 16 21 20 19 46       
+116 20 46 19 20 47       
+117 15 19 20 21 22       
+118 17 19 20 21 25       
+119 16 22 21 20 47       
+120 18 25 21 20 47       
+121 15 20 21 22 23       
+122 16 20 21 22 48       
+123 17 23 22 21 25       
+124 18 25 21 22 48       
+125 19 20 21 25 1       
+126 19 22 21 25 1       
+127 15 21 22 23 18       
+128 16 21 22 23 49       
+129 16 18 23 22 48       
+130 20 48 22 23 49       
+131 1 75 50 51 56       
+132 2 75 50 51 52       
+133 3 75 50 51 77       
+134 1 76 50 51 56       
+135 2 76 50 51 52       
+136 3 76 50 51 77       
+137 4 74 50 51 56       
+138 5 74 50 51 52       
+139 6 74 50 51 77       
+140 7 75 50 74 70       
+141 8 51 50 74 70       
+142 7 76 50 74 70       
+143 9 50 51 56 52       
+144 10 77 51 56 52       
+145 11 50 51 52 56       
+146 12 50 51 52 78       
+147 12 50 51 52 79       
+148 13 56 51 52 78       
+149 13 56 51 52 79       
+150 13 56 52 51 77       
+151 14 77 51 52 78       
+152 14 77 51 52 79       
+153 10 78 52 56 51       
+154 10 79 52 56 51       
+155 10 81 53 57 54       
+156 10 80 53 57 54       
+157 13 57 54 53 81       
+158 12 55 54 53 81       
+159 14 81 53 54 82       
+160 11 55 54 53 57       
+161 13 57 53 54 82       
+162 13 57 54 53 80       
+163 12 55 54 53 80       
+164 14 80 53 54 82       
+165 9 55 54 57 53       
+166 10 82 54 57 53       
+167 5 73 55 54 53       
+168 2 83 55 54 53       
+169 2 84 55 54 53       
+170 4 73 55 54 57       
+171 1 83 55 54 57       
+172 1 84 55 54 57       
+173 6 73 55 54 82       
+174 3 83 55 54 82       
+175 3 84 55 54 82       
+176 8 54 55 73 58       
+177 7 83 55 73 58       
+178 7 84 55 73 58       
+179 15 59 58 63 62       
+180 16 59 58 63 88       
+181 17 62 63 58 73       
+182 18 73 58 63 88       
+183 15 63 58 59 60       
+184 16 63 58 59 85       
+185 17 60 59 58 73       
+186 18 73 58 59 85       
+187 19 63 58 73 55       
+188 19 59 58 73 55       
+189 15 58 59 60 61       
+190 16 58 59 60 86       
+191 16 61 60 59 85       
+192 20 85 59 60 86       
+193 15 59 60 61 62       
+194 21 59 60 61 64       
+195 16 62 61 60 86       
+196 22 64 61 60 86       
+197 15 60 61 62 63       
+198 16 60 61 62 87       
+199 21 63 62 61 64       
+200 22 64 61 62 87       
+201 23 60 61 64 65       
+202 23 60 61 64 66       
+203 24 60 61 64 67       
+204 23 62 61 64 65       
+205 23 62 61 64 66       
+206 24 62 61 64 67       
+207 15 61 62 63 58       
+208 16 61 62 63 88       
+209 16 58 63 62 87       
+210 20 87 62 63 88       
+211 25 61 64 65 89       
+212 25 61 64 65 90       
+213 25 61 64 65 91       
+214 26 66 64 65 89       
+215 26 66 64 65 90       
+216 26 66 64 65 91       
+217 25 67 64 65 89       
+218 25 67 64 65 90       
+219 25 67 64 65 91       
+220 25 61 64 66 92       
+221 25 61 64 66 93       
+222 25 61 64 66 94       
+223 26 65 64 66 92       
+224 26 65 64 66 93       
+225 26 65 64 66 94       
+226 25 67 64 66 92       
+227 25 67 64 66 93       
+228 25 67 64 66 94       
+229 24 72 67 64 61       
+230 24 68 67 64 61       
+231 23 72 67 64 65       
+232 23 68 67 64 65       
+233 23 72 67 64 66       
+234 23 68 67 64 66       
+235 21 71 72 67 64       
+236 22 64 67 72 98       
+237 15 68 67 72 71       
+238 16 68 67 72 98       
+239 21 69 68 67 64       
+240 22 64 67 68 95       
+241 15 72 67 68 69       
+242 16 72 67 68 95       
+243 15 67 68 69 70       
+244 16 67 68 69 96       
+245 16 70 69 68 95       
+246 20 95 68 69 96       
+247 15 68 69 70 71       
+248 17 68 69 70 74       
+249 16 71 70 69 96       
+250 18 74 70 69 96       
+251 15 69 70 71 72       
+252 16 69 70 71 97       
+253 17 72 71 70 74       
+254 18 74 70 71 97       
+255 19 69 70 74 50       
+256 19 71 70 74 50       
+257 15 70 71 72 67       
+258 16 70 71 72 98       
+259 16 67 72 71 97       
+260 20 97 71 72 98       
+261 27 101 100 99 105       
+262 28 107 100 99 105       
+263 28 108 100 99 105       
+264 29 101 100 99 106       
+265 30 107 100 99 106       
+266 30 108 100 99 106       
+267 27 104 105 99 100       
+268 28 117 105 99 100       
+269 28 118 105 99 100       
+270 29 104 105 99 106       
+271 30 117 105 99 106       
+272 30 118 105 99 106       
+273 31 99 100 101 102       
+274 32 109 101 100 99       
+275 32 110 101 100 99       
+276 32 107 100 101 102       
+277 33 107 100 101 109       
+278 33 107 100 101 110       
+279 32 108 100 101 102       
+280 33 108 100 101 109       
+281 33 108 100 101 110       
+282 29 100 101 102 111       
+283 29 100 101 102 112       
+284 30 109 101 102 111       
+285 30 109 101 102 112       
+286 30 110 101 102 111       
+287 30 110 101 102 112       
+288 29 105 104 103 113       
+289 30 115 104 103 113       
+290 30 116 104 103 113       
+291 29 105 104 103 114       
+292 30 115 104 103 114       
+293 30 116 104 103 114       
+294 31 103 104 105 99       
+295 32 117 105 104 103       
+296 32 118 105 104 103       
+297 32 115 104 105 99       
+298 33 115 104 105 117       
+299 33 115 104 105 118       
+300 32 116 104 105 99       
+301 33 116 104 105 117       
+302 33 116 104 105 118       
+
+Impropers            
+
+1 1 14 9 10 24       
+2 2 9 10 11 36       
+3 2 10 11 12 37       
+4 3 11 12 13 15       
+5 2 12 13 14 38       
+6 2 9 14 13 39       
+7 3 23 18 19 15       
+8 2 18 19 20 46       
+9 2 19 20 21 47       
+10 1 20 21 22 25       
+11 2 21 22 23 48       
+12 2 18 23 22 49       
+13 1 63 58 59 73       
+14 2 58 59 60 85       
+15 2 59 60 61 86       
+16 3 60 61 62 64       
+17 2 61 62 63 87       
+18 2 58 63 62 88       
+19 3 72 67 68 64       
+20 2 67 68 69 95       
+21 2 68 69 70 96       
+22 1 69 70 71 74       
+23 2 70 71 72 97       
+24 2 67 72 71 98       
+25 4 100 99 105 106       
+26 5 101 102 111 112       
+27 5 104 103 113 114       
+28 6 2 1 26 27       
+29 7 2 1 25 26       
+30 8 25 1 27 26       
+31 7 2 1 25 27       
+32 9 1 2 3 7       
+33 10 1 2 7 28       
+34 11 1 2 3 28       
+35 12 3 2 7 28       
+36 12 2 3 7 29       
+37 12 2 3 7 30       
+38 13 2 3 29 30       
+39 14 7 3 29 30       
+40 12 5 4 8 32       
+41 14 8 4 32 31       
+42 13 5 4 32 31       
+43 12 5 4 8 31       
+44 9 6 5 4 8       
+45 12 4 5 8 33       
+46 11 6 5 4 33       
+47 10 6 5 8 33       
+48 7 5 6 24 34       
+49 7 5 6 24 35       
+50 6 5 6 34 35       
+51 8 24 6 34 35       
+52 15 12 15 16 17       
+53 16 12 15 18 16       
+54 16 12 15 18 17       
+55 15 18 15 17 16       
+56 17 15 16 40 41       
+57 17 15 16 40 42       
+58 17 15 16 41 42       
+59 18 40 16 41 42       
+60 17 15 17 43 44       
+61 17 15 17 43 45       
+62 17 15 17 44 45       
+63 18 43 17 44 45       
+64 6 51 50 75 76       
+65 7 51 50 74 75       
+66 8 74 50 76 75       
+67 7 51 50 74 76       
+68 9 50 51 52 56       
+69 10 50 51 56 77       
+70 11 50 51 52 77       
+71 12 52 51 56 77       
+72 12 51 52 56 78       
+73 12 51 52 56 79       
+74 13 51 52 78 79       
+75 14 56 52 78 79       
+76 12 54 53 57 81       
+77 14 57 53 81 80       
+78 13 54 53 81 80       
+79 12 54 53 57 80       
+80 9 55 54 53 57       
+81 12 53 54 57 82       
+82 11 55 54 53 82       
+83 10 55 54 57 82       
+84 7 54 55 73 83       
+85 7 54 55 73 84       
+86 6 54 55 83 84       
+87 8 73 55 83 84       
+88 15 61 64 65 66       
+89 16 61 64 67 65       
+90 16 61 64 67 66       
+91 15 67 64 66 65       
+92 17 64 65 89 90       
+93 17 64 65 89 91       
+94 17 64 65 90 91       
+95 18 89 65 90 91       
+96 17 64 66 92 93       
+97 17 64 66 92 94       
+98 17 64 66 93 94       
+99 18 92 66 93 94       
+100 19 101 100 107 99       
+101 19 101 100 108 99       
+102 20 107 100 108 99       
+103 21 101 100 107 108       
+104 19 100 101 109 102       
+105 19 100 101 110 102       
+106 21 100 101 109 110       
+107 20 109 101 110 102       
+108 19 105 104 115 103       
+109 19 105 104 116 103       
+110 20 115 104 116 103       
+111 21 105 104 115 116       
+112 19 104 105 117 99       
+113 19 104 105 118 99       
+114 20 117 105 118 99       
+115 21 104 105 117 118       
diff --git a/examples/USER/misc/bond_react/tiny_nylon/in.tiny_nylon.stabilized b/examples/USER/reaction/tiny_nylon/in.tiny_nylon.stabilized
similarity index 100%
rename from examples/USER/misc/bond_react/tiny_nylon/in.tiny_nylon.stabilized
rename to examples/USER/reaction/tiny_nylon/in.tiny_nylon.stabilized
diff --git a/examples/USER/misc/bond_react/tiny_nylon/in.tiny_nylon.unstabilized b/examples/USER/reaction/tiny_nylon/in.tiny_nylon.unstabilized
similarity index 100%
rename from examples/USER/misc/bond_react/tiny_nylon/in.tiny_nylon.unstabilized
rename to examples/USER/reaction/tiny_nylon/in.tiny_nylon.unstabilized
diff --git a/examples/USER/misc/bond_react/tiny_nylon/log.5Jun19.tiny_nylon.stabilized.g++.1 b/examples/USER/reaction/tiny_nylon/log.5Jun19.tiny_nylon.stabilized.g++.1
similarity index 100%
rename from examples/USER/misc/bond_react/tiny_nylon/log.5Jun19.tiny_nylon.stabilized.g++.1
rename to examples/USER/reaction/tiny_nylon/log.5Jun19.tiny_nylon.stabilized.g++.1
diff --git a/examples/USER/misc/bond_react/tiny_nylon/log.5Jun19.tiny_nylon.stabilized.g++.4 b/examples/USER/reaction/tiny_nylon/log.5Jun19.tiny_nylon.stabilized.g++.4
similarity index 100%
rename from examples/USER/misc/bond_react/tiny_nylon/log.5Jun19.tiny_nylon.stabilized.g++.4
rename to examples/USER/reaction/tiny_nylon/log.5Jun19.tiny_nylon.stabilized.g++.4
diff --git a/examples/USER/misc/bond_react/tiny_nylon/log.5Jun19.tiny_nylon.unstabilized.g++.1 b/examples/USER/reaction/tiny_nylon/log.5Jun19.tiny_nylon.unstabilized.g++.1
similarity index 100%
rename from examples/USER/misc/bond_react/tiny_nylon/log.5Jun19.tiny_nylon.unstabilized.g++.1
rename to examples/USER/reaction/tiny_nylon/log.5Jun19.tiny_nylon.unstabilized.g++.1
diff --git a/examples/USER/misc/bond_react/tiny_nylon/log.5Jun19.tiny_nylon.unstabilized.g++.4 b/examples/USER/reaction/tiny_nylon/log.5Jun19.tiny_nylon.unstabilized.g++.4
similarity index 100%
rename from examples/USER/misc/bond_react/tiny_nylon/log.5Jun19.tiny_nylon.unstabilized.g++.4
rename to examples/USER/reaction/tiny_nylon/log.5Jun19.tiny_nylon.unstabilized.g++.4
diff --git a/examples/USER/misc/bond_react/tiny_nylon/rxn1_stp1_map b/examples/USER/reaction/tiny_nylon/rxn1_stp1_map
similarity index 100%
rename from examples/USER/misc/bond_react/tiny_nylon/rxn1_stp1_map
rename to examples/USER/reaction/tiny_nylon/rxn1_stp1_map
diff --git a/examples/USER/misc/bond_react/tiny_nylon/rxn1_stp1_reacted.data_template b/examples/USER/reaction/tiny_nylon/rxn1_stp1_reacted.data_template
similarity index 100%
rename from examples/USER/misc/bond_react/tiny_nylon/rxn1_stp1_reacted.data_template
rename to examples/USER/reaction/tiny_nylon/rxn1_stp1_reacted.data_template
diff --git a/examples/USER/misc/bond_react/tiny_nylon/rxn1_stp1_unreacted.data_template b/examples/USER/reaction/tiny_nylon/rxn1_stp1_unreacted.data_template
similarity index 100%
rename from examples/USER/misc/bond_react/tiny_nylon/rxn1_stp1_unreacted.data_template
rename to examples/USER/reaction/tiny_nylon/rxn1_stp1_unreacted.data_template
diff --git a/examples/USER/misc/bond_react/tiny_nylon/rxn1_stp2_map b/examples/USER/reaction/tiny_nylon/rxn1_stp2_map
similarity index 100%
rename from examples/USER/misc/bond_react/tiny_nylon/rxn1_stp2_map
rename to examples/USER/reaction/tiny_nylon/rxn1_stp2_map
diff --git a/examples/USER/misc/bond_react/tiny_nylon/rxn1_stp2_reacted.data_template b/examples/USER/reaction/tiny_nylon/rxn1_stp2_reacted.data_template
similarity index 100%
rename from examples/USER/misc/bond_react/tiny_nylon/rxn1_stp2_reacted.data_template
rename to examples/USER/reaction/tiny_nylon/rxn1_stp2_reacted.data_template
diff --git a/examples/USER/misc/bond_react/tiny_nylon/rxn1_stp2_unreacted.data_template b/examples/USER/reaction/tiny_nylon/rxn1_stp2_unreacted.data_template
similarity index 100%
rename from examples/USER/misc/bond_react/tiny_nylon/rxn1_stp2_unreacted.data_template
rename to examples/USER/reaction/tiny_nylon/rxn1_stp2_unreacted.data_template
diff --git a/examples/USER/misc/bond_react/tiny_nylon/tiny_nylon.data b/examples/USER/reaction/tiny_nylon/tiny_nylon.data
similarity index 100%
rename from examples/USER/misc/bond_react/tiny_nylon/tiny_nylon.data
rename to examples/USER/reaction/tiny_nylon/tiny_nylon.data
diff --git a/examples/USER/reaction/tiny_polystyrene/2styrene_map b/examples/USER/reaction/tiny_polystyrene/2styrene_map
new file mode 100644
index 0000000000..be2a789671
--- /dev/null
+++ b/examples/USER/reaction/tiny_polystyrene/2styrene_map
@@ -0,0 +1,44 @@
+this is a map file
+
+0 edgeIDs
+32 equivalences
+
+BondingIDs
+
+4
+30
+
+Equivalences
+
+1 1
+2 2
+3 3
+4 4
+5 5
+6 6
+7 7
+8 8
+9 9
+10 10
+11 11
+12 12
+13 13
+14 14
+15 15
+16 16
+17 17
+18 18
+19 19
+20 20
+21 21
+22 22
+23 23
+24 24
+25 25
+26 26
+27 27
+28 28
+29 29
+30 30
+31 31
+32 32
diff --git a/examples/USER/reaction/tiny_polystyrene/2styrene_reacted.data_template b/examples/USER/reaction/tiny_polystyrene/2styrene_reacted.data_template
new file mode 100644
index 0000000000..c4fa646e9f
--- /dev/null
+++ b/examples/USER/reaction/tiny_polystyrene/2styrene_reacted.data_template
@@ -0,0 +1,312 @@
+2styrene_reacted
+
+32 atoms           
+33 bonds           
+54 angles           
+79 dihedrals           
+22 impropers           
+
+Types
+
+1 1
+2 2
+3 1
+4 5
+5 1
+6 2
+7 1
+8 2
+9 1
+10 2
+11 1
+12 2
+13 2
+14 6
+15 2
+16 2
+17 1
+18 2
+19 1
+20 5
+21 1
+22 2
+23 1
+24 2
+25 1
+26 2
+27 1
+28 2
+29 2
+30 6
+31 2
+32 2
+
+Charges
+
+1 -0.129000
+2 0.123700
+3 0.026600
+4 -0.018200
+5 -0.129000
+6 0.123700
+7 -0.173400
+8 0.140300
+9 -0.113400
+10 0.128800
+11 -0.173400
+12 0.140300
+13 0.051600
+14 -0.069600
+15 0.035400
+16 0.035400
+17 -0.129000
+18 0.123700
+19 0.026600
+20 -0.018200
+21 -0.129000
+22 0.123700
+23 -0.173400
+24 0.140300
+25 -0.113400
+26 0.128800
+27 -0.173400
+28 0.140300
+29 0.051600
+30 -0.069600
+31 0.035400
+32 0.035400
+
+Coords
+
+1 13.465810 0.682530 -1.658940
+2 14.397820 1.221530 -1.658940
+3 12.235820 1.392530 -1.658940
+4 12.235820 2.892530 -1.658940
+5 11.005820 0.682530 -1.658940
+6 10.073820 1.221530 -1.658940
+7 11.005820 -0.737470 -1.658940
+8 10.073820 -1.276460 -1.658940
+9 12.235820 -1.447460 -1.658940
+10 12.235820 -2.524470 -1.658940
+11 13.465810 -0.737470 -1.658940
+12 14.397820 -1.276460 -1.658940
+13 13.101820 3.297530 -1.301940
+14 10.957820 3.441530 -2.220940
+15 11.007810 4.183540 -2.319940
+16 10.314820 2.618530 -2.514940
+17 18.663521 0.855480 -1.372130
+18 19.595510 1.394480 -1.372130
+19 17.433510 1.565480 -1.372130
+20 17.433510 3.065480 -1.372130
+21 16.203510 0.855480 -1.372130
+22 15.271510 1.394480 -1.372130
+23 16.203510 -0.564520 -1.372130
+24 15.271510 -1.103520 -1.372130
+25 17.433510 -1.274520 -1.372130
+26 17.433510 -2.351520 -1.372130
+27 18.663521 -0.564520 -1.372130
+28 19.595510 -1.103520 -1.372130
+29 18.299509 3.470480 -1.015130
+30 16.155510 3.614480 -1.934130
+31 16.205509 4.356480 -2.033130
+32 15.512510 2.791480 -2.228130
+
+Bonds
+
+1 1 1 2
+2 2 1 3
+3 2 1 11
+4 7 3 4
+5 2 3 5
+6 8 13 4
+7 9 4 14
+8 9 4 30
+9 1 5 6
+10 2 5 7
+11 1 7 8
+12 2 7 9
+13 1 9 10
+14 2 9 11
+15 1 11 12
+16 10 15 14
+17 10 16 14
+18 1 17 18
+19 2 17 19
+20 2 17 27
+21 7 19 20
+22 2 19 21
+23 8 29 20
+24 9 20 30
+25 1 21 22
+26 2 21 23
+27 1 23 24
+28 2 23 25
+29 1 25 26
+30 2 25 27
+31 1 27 28
+32 10 31 30
+33 10 32 30
+
+Angles
+
+1 1 3 1 2
+2 1 11 1 2
+3 2 3 1 11
+4 9 1 3 4
+5 2 1 3 5
+6 9 5 3 4
+7 10 3 4 13
+8 11 3 4 14
+9 11 3 4 30
+10 12 13 4 14
+11 12 13 4 30
+12 13 14 4 30
+13 1 3 5 6
+14 2 3 5 7
+15 1 7 5 6
+16 1 5 7 8
+17 2 5 7 9
+18 1 9 7 8
+19 1 7 9 10
+20 2 7 9 11
+21 1 11 9 10
+22 2 1 11 9
+23 1 1 11 12
+24 1 9 11 12
+25 14 15 14 4
+26 14 16 14 4
+27 15 15 14 16
+28 1 19 17 18
+29 1 27 17 18
+30 2 19 17 27
+31 9 17 19 20
+32 2 17 19 21
+33 9 21 19 20
+34 10 19 20 29
+35 11 19 20 30
+36 12 29 20 30
+37 1 19 21 22
+38 2 19 21 23
+39 1 23 21 22
+40 1 21 23 24
+41 2 21 23 25
+42 1 25 23 24
+43 1 23 25 26
+44 2 23 25 27
+45 1 27 25 26
+46 2 17 27 25
+47 1 17 27 28
+48 1 25 27 28
+49 16 4 30 20
+50 14 31 30 4
+51 14 32 30 4
+52 14 31 30 20
+53 14 32 30 20
+54 15 31 30 32
+
+Dihedrals
+
+1 10 2 1 3 4
+2 2 5 3 1 2
+3 11 11 1 3 4
+4 4 11 1 3 5
+5 2 9 11 1 2
+6 5 2 1 11 12
+7 4 3 1 11 9
+8 2 3 1 11 12
+9 12 1 3 4 13
+10 13 1 3 4 14
+11 13 1 3 4 30
+12 12 5 3 4 13
+13 13 5 3 4 14
+14 13 5 3 4 30
+15 2 1 3 5 6
+16 4 1 3 5 7
+17 10 6 5 3 4
+18 11 7 5 3 4
+19 14 3 4 14 15
+20 14 3 4 14 16
+21 15 13 4 14 15
+22 15 13 4 14 16
+23 16 30 4 14 15
+24 16 30 4 14 16
+25 17 3 4 30 20
+26 14 3 4 30 31
+27 14 3 4 30 32
+28 18 13 4 30 20
+29 15 13 4 30 31
+30 15 13 4 30 32
+31 19 14 4 30 20
+32 16 14 4 30 31
+33 16 14 4 30 32
+34 2 3 5 7 8
+35 4 3 5 7 9
+36 5 6 5 7 8
+37 2 9 7 5 6
+38 2 5 7 9 10
+39 4 5 7 9 11
+40 5 8 7 9 10
+41 2 11 9 7 8
+42 4 7 9 11 1
+43 2 7 9 11 12
+44 2 1 11 9 10
+45 5 10 9 11 12
+46 10 18 17 19 20
+47 2 21 19 17 18
+48 11 27 17 19 20
+49 4 27 17 19 21
+50 2 25 27 17 18
+51 5 18 17 27 28
+52 4 19 17 27 25
+53 2 19 17 27 28
+54 12 17 19 20 29
+55 13 17 19 20 30
+56 12 21 19 20 29
+57 13 21 19 20 30
+58 2 17 19 21 22
+59 4 17 19 21 23
+60 10 22 21 19 20
+61 11 23 21 19 20
+62 17 19 20 30 4
+63 14 19 20 30 31
+64 14 19 20 30 32
+65 18 29 20 30 4
+66 15 29 20 30 31
+67 15 29 20 30 32
+68 2 19 21 23 24
+69 4 19 21 23 25
+70 5 22 21 23 24
+71 2 25 23 21 22
+72 2 21 23 25 26
+73 4 21 23 25 27
+74 5 24 23 25 26
+75 2 27 25 23 24
+76 4 23 25 27 17
+77 2 23 25 27 28
+78 2 17 27 25 26
+79 5 26 25 27 28
+
+Impropers
+
+1 1 3 1 11 2
+2 5 1 3 5 4
+3 1 3 5 7 6
+4 1 5 7 9 8
+5 1 7 9 11 10
+6 1 1 11 9 12
+7 6 15 14 16 4
+8 1 19 17 27 18
+9 5 17 19 21 20
+10 7 19 20 29 30
+11 1 19 21 23 22
+12 1 21 23 25 24
+13 1 23 25 27 26
+14 1 17 27 25 28
+15 1 3 4 13 14
+16 1 3 4 13 30
+17 1 3 4 14 30
+18 1 13 4 14 30
+19 1 31 30 20 4
+20 1 32 30 20 4
+21 1 31 30 32 4
+22 1 31 30 32 20
diff --git a/examples/USER/reaction/tiny_polystyrene/2styrene_unreacted.data_template b/examples/USER/reaction/tiny_polystyrene/2styrene_unreacted.data_template
new file mode 100644
index 0000000000..fc0a893191
--- /dev/null
+++ b/examples/USER/reaction/tiny_polystyrene/2styrene_unreacted.data_template
@@ -0,0 +1,284 @@
+2styrene_unreacted
+
+32 atoms           
+32 bonds           
+48 angles           
+64 dihedrals           
+16 impropers           
+
+Types
+
+1 1
+2 2
+3 1
+4 3
+5 1
+6 2
+7 1
+8 2
+9 1
+10 2
+11 1
+12 2
+13 2
+14 4
+15 2
+16 2
+17 1
+18 2
+19 1
+20 3
+21 1
+22 2
+23 1
+24 2
+25 1
+26 2
+27 1
+28 2
+29 2
+30 4
+31 2
+32 2
+
+Charges
+
+1 -0.129000
+2 0.123700
+3 0.026600
+4 -0.018200
+5 -0.129000
+6 0.123700
+7 -0.173400
+8 0.140300
+9 -0.113400
+10 0.128800
+11 -0.173400
+12 0.140300
+13 0.051600
+14 -0.069600
+15 0.035400
+16 0.035400
+17 -0.129000
+18 0.123700
+19 0.026600
+20 -0.018200
+21 -0.129000
+22 0.123700
+23 -0.173400
+24 0.140300
+25 -0.113400
+26 0.128800
+27 -0.173400
+28 0.140300
+29 0.051600
+30 -0.069600
+31 0.035400
+32 0.035400
+
+Coords
+
+1 13.465815 0.682534 -1.658941
+2 14.397816 1.221534 -1.658941
+3 12.235815 1.392534 -1.658941
+4 12.235815 2.892534 -1.658941
+5 11.005816 0.682534 -1.658941
+6 10.073815 1.221534 -1.658941
+7 11.005816 -0.737466 -1.658941
+8 10.073815 -1.276465 -1.658941
+9 12.235815 -1.447465 -1.658941
+10 12.235815 -2.524465 -1.658941
+11 13.465815 -0.737466 -1.658941
+12 14.397816 -1.276465 -1.658941
+13 13.101815 3.297535 -1.301941
+14 10.957815 3.441535 -2.220941
+15 11.007814 4.183536 -2.319941
+16 10.314816 2.618534 -2.514940
+17 18.663515 0.855482 -1.372128
+18 19.595514 1.394482 -1.372128
+19 17.433512 1.565481 -1.372128
+20 17.433512 3.065482 -1.372128
+21 16.203512 0.855482 -1.372128
+22 15.271511 1.394482 -1.372128
+23 16.203512 -0.564518 -1.372128
+24 15.271511 -1.103518 -1.372128
+25 17.433512 -1.274518 -1.372128
+26 17.433512 -2.351518 -1.372128
+27 18.663515 -0.564518 -1.372128
+28 19.595514 -1.103518 -1.372128
+29 18.299513 3.470482 -1.015128
+30 16.155512 3.614482 -1.934128
+31 16.205513 4.356482 -2.033128
+32 15.512512 2.791482 -2.228127
+
+Bonds
+
+1 1 1 2
+2 2 1 3
+3 2 1 11
+4 3 3 4
+5 2 3 5
+6 4 13 4
+7 5 4 14
+8 1 5 6
+9 2 5 7
+10 1 7 8
+11 2 7 9
+12 1 9 10
+13 2 9 11
+14 1 11 12
+15 6 15 14
+16 6 16 14
+17 1 17 18
+18 2 17 19
+19 2 17 27
+20 3 19 20
+21 2 19 21
+22 4 29 20
+23 5 20 30
+24 1 21 22
+25 2 21 23
+26 1 23 24
+27 2 23 25
+28 1 25 26
+29 2 25 27
+30 1 27 28
+31 6 31 30
+32 6 32 30
+
+Angles
+
+1 1 3 1 2
+2 1 11 1 2
+3 2 3 1 11
+4 3 1 3 4
+5 2 1 3 5
+6 3 5 3 4
+7 4 3 4 13
+8 5 3 4 14
+9 6 13 4 14
+10 1 3 5 6
+11 2 3 5 7
+12 1 7 5 6
+13 1 5 7 8
+14 2 5 7 9
+15 1 9 7 8
+16 1 7 9 10
+17 2 7 9 11
+18 1 11 9 10
+19 2 1 11 9
+20 1 1 11 12
+21 1 9 11 12
+22 7 15 14 4
+23 7 16 14 4
+24 8 15 14 16
+25 1 19 17 18
+26 1 27 17 18
+27 2 19 17 27
+28 3 17 19 20
+29 2 17 19 21
+30 3 21 19 20
+31 4 19 20 29
+32 5 19 20 30
+33 6 29 20 30
+34 1 19 21 22
+35 2 19 21 23
+36 1 23 21 22
+37 1 21 23 24
+38 2 21 23 25
+39 1 25 23 24
+40 1 23 25 26
+41 2 23 25 27
+42 1 27 25 26
+43 2 17 27 25
+44 1 17 27 28
+45 1 25 27 28
+46 7 31 30 20
+47 7 32 30 20
+48 8 31 30 32
+
+Dihedrals
+
+1 1 2 1 3 4
+2 2 5 3 1 2
+3 3 11 1 3 4
+4 4 11 1 3 5
+5 2 9 11 1 2
+6 5 2 1 11 12
+7 4 3 1 11 9
+8 2 3 1 11 12
+9 6 1 3 4 13
+10 7 1 3 4 14
+11 6 5 3 4 13
+12 7 5 3 4 14
+13 2 1 3 5 6
+14 4 1 3 5 7
+15 1 6 5 3 4
+16 3 7 5 3 4
+17 8 3 4 14 15
+18 8 3 4 14 16
+19 9 13 4 14 15
+20 9 13 4 14 16
+21 2 3 5 7 8
+22 4 3 5 7 9
+23 5 6 5 7 8
+24 2 9 7 5 6
+25 2 5 7 9 10
+26 4 5 7 9 11
+27 5 8 7 9 10
+28 2 11 9 7 8
+29 4 7 9 11 1
+30 2 7 9 11 12
+31 2 1 11 9 10
+32 5 10 9 11 12
+33 1 18 17 19 20
+34 2 21 19 17 18
+35 3 27 17 19 20
+36 4 27 17 19 21
+37 2 25 27 17 18
+38 5 18 17 27 28
+39 4 19 17 27 25
+40 2 19 17 27 28
+41 6 17 19 20 29
+42 7 17 19 20 30
+43 6 21 19 20 29
+44 7 21 19 20 30
+45 2 17 19 21 22
+46 4 17 19 21 23
+47 1 22 21 19 20
+48 3 23 21 19 20
+49 8 19 20 30 31
+50 8 19 20 30 32
+51 9 29 20 30 31
+52 9 29 20 30 32
+53 2 19 21 23 24
+54 4 19 21 23 25
+55 5 22 21 23 24
+56 2 25 23 21 22
+57 2 21 23 25 26
+58 4 21 23 25 27
+59 5 24 23 25 26
+60 2 27 25 23 24
+61 4 23 25 27 17
+62 2 23 25 27 28
+63 2 17 27 25 26
+64 5 26 25 27 28
+
+Impropers
+
+1 1 3 1 11 2
+2 2 1 3 5 4
+3 3 3 4 13 14
+4 1 3 5 7 6
+5 1 5 7 9 8
+6 1 7 9 11 10
+7 1 1 11 9 12
+8 4 15 14 16 4
+9 1 19 17 27 18
+10 2 17 19 21 20
+11 3 19 20 29 30
+12 1 19 21 23 22
+13 1 21 23 25 24
+14 1 23 25 27 26
+15 1 17 27 25 28
+16 4 31 30 32 20
diff --git a/examples/USER/reaction/tiny_polystyrene/chain_chain_map b/examples/USER/reaction/tiny_polystyrene/chain_chain_map
new file mode 100644
index 0000000000..5a0fde6742
--- /dev/null
+++ b/examples/USER/reaction/tiny_polystyrene/chain_chain_map
@@ -0,0 +1,67 @@
+this is a map file
+
+2 edgeIDs
+50 equivalences
+
+EdgeIDs
+
+17
+34
+
+BondingIDs
+
+14
+38
+
+Equivalences
+
+1 1
+2 2
+3 3
+4 4
+5 5
+6 6
+7 7
+8 8
+9 9
+10 10
+11 11
+12 12
+13 13
+14 14
+15 15
+16 16
+17 17
+18 18
+19 19
+20 20
+21 21
+22 22
+23 23
+24 24
+25 25
+26 26
+27 27
+28 28
+29 29
+30 30
+31 31
+32 32
+33 33
+34 34
+35 35
+36 36
+37 37
+38 38
+39 39
+40 40
+41 41
+42 42
+43 43
+44 44
+45 45
+46 46
+47 47
+48 48
+49 49
+50 50
diff --git a/examples/USER/reaction/tiny_polystyrene/chain_chain_reacted.data_template b/examples/USER/reaction/tiny_polystyrene/chain_chain_reacted.data_template
new file mode 100644
index 0000000000..e01d42b7fb
--- /dev/null
+++ b/examples/USER/reaction/tiny_polystyrene/chain_chain_reacted.data_template
@@ -0,0 +1,497 @@
+chain_chain_reacted
+
+50 atoms           
+52 bonds           
+90 angles           
+135 dihedrals           
+42 impropers           
+
+Types
+
+1 1
+2 2
+3 1
+4 5
+5 1
+6 2
+7 1
+8 2
+9 1
+10 2
+11 1
+12 2
+13 2
+14 6
+15 2
+16 2
+17 5
+18 6
+19 2
+20 2
+21 1
+22 2
+23 1
+24 5
+25 1
+26 2
+27 1
+28 2
+29 1
+30 2
+31 1
+32 2
+33 2
+34 6
+35 1
+36 2
+37 1
+38 5
+39 1
+40 2
+41 1
+42 2
+43 1
+44 2
+45 1
+46 2
+47 2
+48 6
+49 2
+50 2
+
+Charges
+
+1 -0.129000
+2 0.123700
+3 0.026600
+4 -0.018200
+5 -0.129000
+6 0.123700
+7 -0.173400
+8 0.140300
+9 -0.113400
+10 0.128800
+11 -0.173400
+12 0.140300
+13 0.051600
+14 -0.069600
+15 0.035400
+16 0.035400
+17 -0.018200
+18 -0.069600
+19 0.035400
+20 0.035400
+21 -0.129000
+22 0.123700
+23 0.026600
+24 -0.018200
+25 -0.129000
+26 0.123700
+27 -0.173400
+28 0.140300
+29 -0.113400
+30 0.128800
+31 -0.173400
+32 0.140300
+33 0.051600
+34 -0.069600
+35 -0.129000
+36 0.123700
+37 0.026600
+38 -0.018200
+39 -0.129000
+40 0.123700
+41 -0.173400
+42 0.140300
+43 -0.113400
+44 0.128800
+45 -0.173400
+46 0.140300
+47 0.051600
+48 -0.069600
+49 0.035400
+50 0.035400
+
+Coords
+
+1 24.391510 0.871570 -1.658940
+2 25.323530 1.410570 -1.658940
+3 23.161520 1.581570 -1.658940
+4 23.161520 3.081570 -1.658940
+5 21.931530 0.871570 -1.658940
+6 20.999531 1.410570 -1.658940
+7 21.931530 -0.548430 -1.658940
+8 20.999531 -1.087420 -1.658940
+9 23.161520 -1.258420 -1.658940
+10 23.161520 -2.335430 -1.658940
+11 24.391510 -0.548430 -1.658940
+12 25.323530 -1.087420 -1.658940
+13 24.027519 3.486570 -1.301940
+14 21.883520 3.630570 -2.220940
+15 21.933510 4.372580 -2.319940
+16 21.240520 2.807570 -2.514940
+17 28.359209 3.254520 -1.372130
+18 27.081209 3.803520 -1.934130
+19 27.131210 4.545520 -2.033130
+20 26.438219 2.980520 -2.228130
+21 13.465810 0.682530 -1.658940
+22 14.397820 1.221530 -1.658940
+23 12.235820 1.392530 -1.658940
+24 12.235820 2.892530 -1.658940
+25 11.005820 0.682530 -1.658940
+26 10.073820 1.221530 -1.658940
+27 11.005820 -0.737470 -1.658940
+28 10.073820 -1.276460 -1.658940
+29 12.235820 -1.447460 -1.658940
+30 12.235820 -2.524470 -1.658940
+31 13.465810 -0.737470 -1.658940
+32 14.397820 -1.276460 -1.658940
+33 13.101820 3.297530 -1.301940
+34 10.957820 3.441530 -2.220940
+35 18.663521 0.855480 -1.372130
+36 19.595510 1.394480 -1.372130
+37 17.433510 1.565480 -1.372130
+38 17.433510 3.065480 -1.372130
+39 16.203510 0.855480 -1.372130
+40 15.271510 1.394480 -1.372130
+41 16.203510 -0.564520 -1.372130
+42 15.271510 -1.103520 -1.372130
+43 17.433510 -1.274520 -1.372130
+44 17.433510 -2.351520 -1.372130
+45 18.663521 -0.564520 -1.372130
+46 19.595510 -1.103520 -1.372130
+47 18.299509 3.470480 -1.015130
+48 16.155510 3.614480 -1.934130
+49 16.205509 4.356480 -2.033130
+50 15.512510 2.791480 -2.228130
+
+Bonds
+
+1 1 1 2
+2 2 1 3
+3 2 1 11
+4 7 3 4
+5 2 3 5
+6 8 13 4
+7 9 4 14
+8 9 4 18
+9 1 5 6
+10 2 5 7
+11 1 7 8
+12 2 7 9
+13 1 9 10
+14 2 9 11
+15 1 11 12
+16 10 15 14
+17 10 16 14
+18 9 38 14
+19 9 17 18
+20 10 19 18
+21 10 20 18
+22 1 21 22
+23 2 21 23
+24 2 21 31
+25 7 23 24
+26 2 23 25
+27 8 33 24
+28 9 24 34
+29 9 24 48
+30 1 25 26
+31 2 25 27
+32 1 27 28
+33 2 27 29
+34 1 29 30
+35 2 29 31
+36 1 31 32
+37 1 35 36
+38 2 35 37
+39 2 35 45
+40 7 37 38
+41 2 37 39
+42 8 47 38
+43 9 38 48
+44 1 39 40
+45 2 39 41
+46 1 41 42
+47 2 41 43
+48 1 43 44
+49 2 43 45
+50 1 45 46
+51 10 49 48
+52 10 50 48
+
+Angles
+
+1 1 3 1 2
+2 1 11 1 2
+3 2 3 1 11
+4 9 1 3 4
+5 2 1 3 5
+6 9 5 3 4
+7 10 3 4 13
+8 11 3 4 14
+9 11 3 4 18
+10 12 13 4 14
+11 12 13 4 18
+12 13 14 4 18
+13 1 3 5 6
+14 2 3 5 7
+15 1 7 5 6
+16 1 5 7 8
+17 2 5 7 9
+18 1 9 7 8
+19 1 7 9 10
+20 2 7 9 11
+21 1 11 9 10
+22 2 1 11 9
+23 1 1 11 12
+24 1 9 11 12
+25 14 15 14 4
+26 14 16 14 4
+27 16 4 14 38
+28 15 15 14 16
+29 14 15 14 38
+30 14 16 14 38
+31 16 4 18 17
+32 14 19 18 4
+33 14 20 18 4
+34 14 19 18 17
+35 14 20 18 17
+36 15 19 18 20
+37 1 23 21 22
+38 1 31 21 22
+39 2 23 21 31
+40 9 21 23 24
+41 2 21 23 25
+42 9 25 23 24
+43 10 23 24 33
+44 11 23 24 34
+45 11 23 24 48
+46 12 33 24 34
+47 12 33 24 48
+48 13 34 24 48
+49 1 23 25 26
+50 2 23 25 27
+51 1 27 25 26
+52 1 25 27 28
+53 2 25 27 29
+54 1 29 27 28
+55 1 27 29 30
+56 2 27 29 31
+57 1 31 29 30
+58 2 21 31 29
+59 1 21 31 32
+60 1 29 31 32
+61 1 37 35 36
+62 1 45 35 36
+63 2 37 35 45
+64 9 35 37 38
+65 2 35 37 39
+66 9 39 37 38
+67 11 37 38 14
+68 12 47 38 14
+69 13 14 38 48
+70 10 37 38 47
+71 11 37 38 48
+72 12 47 38 48
+73 1 37 39 40
+74 2 37 39 41
+75 1 41 39 40
+76 1 39 41 42
+77 2 39 41 43
+78 1 43 41 42
+79 1 41 43 44
+80 2 41 43 45
+81 1 45 43 44
+82 2 35 45 43
+83 1 35 45 46
+84 1 43 45 46
+85 16 24 48 38
+86 14 49 48 24
+87 14 50 48 24
+88 14 49 48 38
+89 14 50 48 38
+90 15 49 48 50
+
+Dihedrals
+
+1 10 2 1 3 4
+2 2 5 3 1 2
+3 11 11 1 3 4
+4 4 11 1 3 5
+5 2 9 11 1 2
+6 5 2 1 11 12
+7 4 3 1 11 9
+8 2 3 1 11 12
+9 12 1 3 4 13
+10 13 1 3 4 14
+11 13 1 3 4 18
+12 12 5 3 4 13
+13 13 5 3 4 14
+14 13 5 3 4 18
+15 2 1 3 5 6
+16 4 1 3 5 7
+17 10 6 5 3 4
+18 11 7 5 3 4
+19 14 3 4 14 15
+20 14 3 4 14 16
+21 17 3 4 14 38
+22 15 13 4 14 15
+23 15 13 4 14 16
+24 18 13 4 14 38
+25 16 18 4 14 15
+26 16 18 4 14 16
+27 19 18 4 14 38
+28 17 3 4 18 17
+29 14 3 4 18 19
+30 14 3 4 18 20
+31 18 13 4 18 17
+32 15 13 4 18 19
+33 15 13 4 18 20
+34 19 14 4 18 17
+35 16 14 4 18 19
+36 16 14 4 18 20
+37 2 3 5 7 8
+38 4 3 5 7 9
+39 5 6 5 7 8
+40 2 9 7 5 6
+41 2 5 7 9 10
+42 4 5 7 9 11
+43 5 8 7 9 10
+44 2 11 9 7 8
+45 4 7 9 11 1
+46 2 7 9 11 12
+47 2 1 11 9 10
+48 5 10 9 11 12
+49 17 37 38 14 4
+50 18 47 38 14 4
+51 19 48 38 14 4
+52 14 37 38 14 15
+53 15 47 38 14 15
+54 16 48 38 14 15
+55 14 37 38 14 16
+56 15 47 38 14 16
+57 16 48 38 14 16
+58 10 22 21 23 24
+59 2 25 23 21 22
+60 11 31 21 23 24
+61 4 31 21 23 25
+62 2 29 31 21 22
+63 5 22 21 31 32
+64 4 23 21 31 29
+65 2 23 21 31 32
+66 12 21 23 24 33
+67 13 21 23 24 34
+68 13 21 23 24 48
+69 12 25 23 24 33
+70 13 25 23 24 34
+71 13 25 23 24 48
+72 2 21 23 25 26
+73 4 21 23 25 27
+74 10 26 25 23 24
+75 11 27 25 23 24
+76 17 23 24 48 38
+77 14 23 24 48 49
+78 14 23 24 48 50
+79 18 33 24 48 38
+80 15 33 24 48 49
+81 15 33 24 48 50
+82 19 34 24 48 38
+83 16 34 24 48 49
+84 16 34 24 48 50
+85 2 23 25 27 28
+86 4 23 25 27 29
+87 5 26 25 27 28
+88 2 29 27 25 26
+89 2 25 27 29 30
+90 4 25 27 29 31
+91 5 28 27 29 30
+92 2 31 29 27 28
+93 4 27 29 31 21
+94 2 27 29 31 32
+95 2 21 31 29 30
+96 5 30 29 31 32
+97 10 36 35 37 38
+98 2 39 37 35 36
+99 11 45 35 37 38
+100 4 45 35 37 39
+101 2 43 45 35 36
+102 5 36 35 45 46
+103 4 37 35 45 43
+104 2 37 35 45 46
+105 13 35 37 38 14
+106 12 35 37 38 47
+107 13 35 37 38 48
+108 13 39 37 38 14
+109 12 39 37 38 47
+110 13 39 37 38 48
+111 2 35 37 39 40
+112 4 35 37 39 41
+113 10 40 39 37 38
+114 11 41 39 37 38
+115 19 14 38 48 24
+116 16 14 38 48 49
+117 16 14 38 48 50
+118 17 37 38 48 24
+119 14 37 38 48 49
+120 14 37 38 48 50
+121 18 47 38 48 24
+122 15 47 38 48 49
+123 15 47 38 48 50
+124 2 37 39 41 42
+125 4 37 39 41 43
+126 5 40 39 41 42
+127 2 43 41 39 40
+128 2 39 41 43 44
+129 4 39 41 43 45
+130 5 42 41 43 44
+131 2 45 43 41 42
+132 4 41 43 45 35
+133 2 41 43 45 46
+134 2 35 45 43 44
+135 5 44 43 45 46
+
+Impropers
+
+1 1 3 1 11 2
+2 5 1 3 5 4
+3 1 3 5 7 6
+4 1 5 7 9 8
+5 1 7 9 11 10
+6 1 1 11 9 12
+7 1 23 21 31 22
+8 5 21 23 25 24
+9 1 23 25 27 26
+10 1 25 27 29 28
+11 1 27 29 31 30
+12 1 21 31 29 32
+13 1 37 35 45 36
+14 5 35 37 39 38
+15 1 37 39 41 40
+16 1 39 41 43 42
+17 1 41 43 45 44
+18 1 35 45 43 46
+19 1 3 4 13 14
+20 1 3 4 13 18
+21 1 3 4 14 18
+22 1 13 4 14 18
+23 1 15 14 16 4
+24 1 15 14 4 38
+25 1 16 14 4 38
+26 1 15 14 16 38
+27 1 19 18 17 4
+28 1 20 18 17 4
+29 1 19 18 20 4
+30 1 19 18 20 17
+31 1 23 24 33 34
+32 1 23 24 33 48
+33 1 23 24 34 48
+34 1 33 24 34 48
+35 1 37 38 47 14
+36 1 37 38 14 48
+37 1 47 38 14 48
+38 1 37 38 47 48
+39 1 49 48 38 24
+40 1 50 48 38 24
+41 1 49 48 50 24
+42 1 49 48 50 38
diff --git a/examples/USER/reaction/tiny_polystyrene/chain_chain_unreacted.data_template b/examples/USER/reaction/tiny_polystyrene/chain_chain_unreacted.data_template
new file mode 100644
index 0000000000..d8e0d977df
--- /dev/null
+++ b/examples/USER/reaction/tiny_polystyrene/chain_chain_unreacted.data_template
@@ -0,0 +1,467 @@
+chain_chain_unreacted
+
+50 atoms           
+51 bonds           
+84 angles           
+118 dihedrals           
+36 impropers           
+
+Types
+
+1 1
+2 2
+3 1
+4 5
+5 1
+6 2
+7 1
+8 2
+9 1
+10 2
+11 1
+12 2
+13 2
+14 6
+15 2
+16 2
+17 5
+18 6
+19 2
+20 2
+21 1
+22 2
+23 1
+24 5
+25 1
+26 2
+27 1
+28 2
+29 1
+30 2
+31 1
+32 2
+33 2
+34 6
+35 1
+36 2
+37 1
+38 5
+39 1
+40 2
+41 1
+42 2
+43 1
+44 2
+45 1
+46 2
+47 2
+48 6
+49 2
+50 2
+
+Charges
+
+1 -0.129000
+2 0.123700
+3 0.026600
+4 -0.018200
+5 -0.129000
+6 0.123700
+7 -0.173400
+8 0.140300
+9 -0.113400
+10 0.128800
+11 -0.173400
+12 0.140300
+13 0.051600
+14 -0.069600
+15 0.035400
+16 0.035400
+17 -0.018200
+18 -0.069600
+19 0.035400
+20 0.035400
+21 -0.129000
+22 0.123700
+23 0.026600
+24 -0.018200
+25 -0.129000
+26 0.123700
+27 -0.173400
+28 0.140300
+29 -0.113400
+30 0.128800
+31 -0.173400
+32 0.140300
+33 0.051600
+34 -0.069600
+35 -0.129000
+36 0.123700
+37 0.026600
+38 -0.018200
+39 -0.129000
+40 0.123700
+41 -0.173400
+42 0.140300
+43 -0.113400
+44 0.128800
+45 -0.173400
+46 0.140300
+47 0.051600
+48 -0.069600
+49 0.035400
+50 0.035400
+
+Coords
+
+1 24.391510 0.871570 -1.658940
+2 25.323530 1.410570 -1.658940
+3 23.161520 1.581570 -1.658940
+4 23.161520 3.081570 -1.658940
+5 21.931530 0.871570 -1.658940
+6 20.999531 1.410570 -1.658940
+7 21.931530 -0.548430 -1.658940
+8 20.999531 -1.087420 -1.658940
+9 23.161520 -1.258420 -1.658940
+10 23.161520 -2.335430 -1.658940
+11 24.391510 -0.548430 -1.658940
+12 25.323530 -1.087420 -1.658940
+13 24.027519 3.486570 -1.301940
+14 21.883520 3.630570 -2.220940
+15 21.933510 4.372580 -2.319940
+16 21.240520 2.807570 -2.514940
+17 28.359209 3.254520 -1.372130
+18 27.081209 3.803520 -1.934130
+19 27.131210 4.545520 -2.033130
+20 26.438219 2.980520 -2.228130
+21 13.465810 0.682530 -1.658940
+22 14.397820 1.221530 -1.658940
+23 12.235820 1.392530 -1.658940
+24 12.235820 2.892530 -1.658940
+25 11.005820 0.682530 -1.658940
+26 10.073820 1.221530 -1.658940
+27 11.005820 -0.737470 -1.658940
+28 10.073820 -1.276460 -1.658940
+29 12.235820 -1.447460 -1.658940
+30 12.235820 -2.524470 -1.658940
+31 13.465810 -0.737470 -1.658940
+32 14.397820 -1.276460 -1.658940
+33 13.101820 3.297530 -1.301940
+34 10.957820 3.441530 -2.220940
+35 18.663521 0.855480 -1.372130
+36 19.595510 1.394480 -1.372130
+37 17.433510 1.565480 -1.372130
+38 17.433510 3.065480 -1.372130
+39 16.203510 0.855480 -1.372130
+40 15.271510 1.394480 -1.372130
+41 16.203510 -0.564520 -1.372130
+42 15.271510 -1.103520 -1.372130
+43 17.433510 -1.274520 -1.372130
+44 17.433510 -2.351520 -1.372130
+45 18.663521 -0.564520 -1.372130
+46 19.595510 -1.103520 -1.372130
+47 18.299509 3.470480 -1.015130
+48 16.155510 3.614480 -1.934130
+49 16.205509 4.356480 -2.033130
+50 15.512510 2.791480 -2.228130
+
+Bonds
+
+1 1 1 2
+2 2 1 3
+3 2 1 11
+4 7 3 4
+5 2 3 5
+6 8 13 4
+7 9 4 14
+8 9 4 18
+9 1 5 6
+10 2 5 7
+11 1 7 8
+12 2 7 9
+13 1 9 10
+14 2 9 11
+15 1 11 12
+16 10 15 14
+17 10 16 14
+18 9 17 18
+19 10 19 18
+20 10 20 18
+21 1 21 22
+22 2 21 23
+23 2 21 31
+24 7 23 24
+25 2 23 25
+26 8 33 24
+27 9 24 34
+28 9 24 48
+29 1 25 26
+30 2 25 27
+31 1 27 28
+32 2 27 29
+33 1 29 30
+34 2 29 31
+35 1 31 32
+36 1 35 36
+37 2 35 37
+38 2 35 45
+39 7 37 38
+40 2 37 39
+41 8 47 38
+42 9 38 48
+43 1 39 40
+44 2 39 41
+45 1 41 42
+46 2 41 43
+47 1 43 44
+48 2 43 45
+49 1 45 46
+50 10 49 48
+51 10 50 48
+
+Angles
+
+1 1 3 1 2
+2 1 11 1 2
+3 2 3 1 11
+4 9 1 3 4
+5 2 1 3 5
+6 9 5 3 4
+7 10 3 4 13
+8 11 3 4 14
+9 11 3 4 18
+10 12 13 4 14
+11 12 13 4 18
+12 13 14 4 18
+13 1 3 5 6
+14 2 3 5 7
+15 1 7 5 6
+16 1 5 7 8
+17 2 5 7 9
+18 1 9 7 8
+19 1 7 9 10
+20 2 7 9 11
+21 1 11 9 10
+22 2 1 11 9
+23 1 1 11 12
+24 1 9 11 12
+25 14 15 14 4
+26 14 16 14 4
+27 15 15 14 16
+28 16 4 18 17
+29 14 19 18 4
+30 14 20 18 4
+31 14 19 18 17
+32 14 20 18 17
+33 15 19 18 20
+34 1 23 21 22
+35 1 31 21 22
+36 2 23 21 31
+37 9 21 23 24
+38 2 21 23 25
+39 9 25 23 24
+40 10 23 24 33
+41 11 23 24 34
+42 11 23 24 48
+43 12 33 24 34
+44 12 33 24 48
+45 13 34 24 48
+46 1 23 25 26
+47 2 23 25 27
+48 1 27 25 26
+49 1 25 27 28
+50 2 25 27 29
+51 1 29 27 28
+52 1 27 29 30
+53 2 27 29 31
+54 1 31 29 30
+55 2 21 31 29
+56 1 21 31 32
+57 1 29 31 32
+58 1 37 35 36
+59 1 45 35 36
+60 2 37 35 45
+61 9 35 37 38
+62 2 35 37 39
+63 9 39 37 38
+64 10 37 38 47
+65 11 37 38 48
+66 12 47 38 48
+67 1 37 39 40
+68 2 37 39 41
+69 1 41 39 40
+70 1 39 41 42
+71 2 39 41 43
+72 1 43 41 42
+73 1 41 43 44
+74 2 41 43 45
+75 1 45 43 44
+76 2 35 45 43
+77 1 35 45 46
+78 1 43 45 46
+79 16 24 48 38
+80 14 49 48 24
+81 14 50 48 24
+82 14 49 48 38
+83 14 50 48 38
+84 15 49 48 50
+
+Dihedrals
+
+1 10 2 1 3 4
+2 2 5 3 1 2
+3 11 11 1 3 4
+4 4 11 1 3 5
+5 2 9 11 1 2
+6 5 2 1 11 12
+7 4 3 1 11 9
+8 2 3 1 11 12
+9 12 1 3 4 13
+10 13 1 3 4 14
+11 13 1 3 4 18
+12 12 5 3 4 13
+13 13 5 3 4 14
+14 13 5 3 4 18
+15 2 1 3 5 6
+16 4 1 3 5 7
+17 10 6 5 3 4
+18 11 7 5 3 4
+19 14 3 4 14 15
+20 14 3 4 14 16
+21 15 13 4 14 15
+22 15 13 4 14 16
+23 16 18 4 14 15
+24 16 18 4 14 16
+25 17 3 4 18 17
+26 14 3 4 18 19
+27 14 3 4 18 20
+28 18 13 4 18 17
+29 15 13 4 18 19
+30 15 13 4 18 20
+31 19 14 4 18 17
+32 16 14 4 18 19
+33 16 14 4 18 20
+34 2 3 5 7 8
+35 4 3 5 7 9
+36 5 6 5 7 8
+37 2 9 7 5 6
+38 2 5 7 9 10
+39 4 5 7 9 11
+40 5 8 7 9 10
+41 2 11 9 7 8
+42 4 7 9 11 1
+43 2 7 9 11 12
+44 2 1 11 9 10
+45 5 10 9 11 12
+46 10 22 21 23 24
+47 2 25 23 21 22
+48 11 31 21 23 24
+49 4 31 21 23 25
+50 2 29 31 21 22
+51 5 22 21 31 32
+52 4 23 21 31 29
+53 2 23 21 31 32
+54 12 21 23 24 33
+55 13 21 23 24 34
+56 13 21 23 24 48
+57 12 25 23 24 33
+58 13 25 23 24 34
+59 13 25 23 24 48
+60 2 21 23 25 26
+61 4 21 23 25 27
+62 10 26 25 23 24
+63 11 27 25 23 24
+64 17 23 24 48 38
+65 14 23 24 48 49
+66 14 23 24 48 50
+67 18 33 24 48 38
+68 15 33 24 48 49
+69 15 33 24 48 50
+70 19 34 24 48 38
+71 16 34 24 48 49
+72 16 34 24 48 50
+73 2 23 25 27 28
+74 4 23 25 27 29
+75 5 26 25 27 28
+76 2 29 27 25 26
+77 2 25 27 29 30
+78 4 25 27 29 31
+79 5 28 27 29 30
+80 2 31 29 27 28
+81 4 27 29 31 21
+82 2 27 29 31 32
+83 2 21 31 29 30
+84 5 30 29 31 32
+85 10 36 35 37 38
+86 2 39 37 35 36
+87 11 45 35 37 38
+88 4 45 35 37 39
+89 2 43 45 35 36
+90 5 36 35 45 46
+91 4 37 35 45 43
+92 2 37 35 45 46
+93 12 35 37 38 47
+94 13 35 37 38 48
+95 12 39 37 38 47
+96 13 39 37 38 48
+97 2 35 37 39 40
+98 4 35 37 39 41
+99 10 40 39 37 38
+100 11 41 39 37 38
+101 17 37 38 48 24
+102 14 37 38 48 49
+103 14 37 38 48 50
+104 18 47 38 48 24
+105 15 47 38 48 49
+106 15 47 38 48 50
+107 2 37 39 41 42
+108 4 37 39 41 43
+109 5 40 39 41 42
+110 2 43 41 39 40
+111 2 39 41 43 44
+112 4 39 41 43 45
+113 5 42 41 43 44
+114 2 45 43 41 42
+115 4 41 43 45 35
+116 2 41 43 45 46
+117 2 35 45 43 44
+118 5 44 43 45 46
+
+Impropers
+
+1 1 3 1 11 2
+2 5 1 3 5 4
+3 1 3 5 7 6
+4 1 5 7 9 8
+5 1 7 9 11 10
+6 1 1 11 9 12
+7 6 15 14 16 4
+8 1 23 21 31 22
+9 5 21 23 25 24
+10 1 23 25 27 26
+11 1 25 27 29 28
+12 1 27 29 31 30
+13 1 21 31 29 32
+14 1 37 35 45 36
+15 5 35 37 39 38
+16 7 37 38 47 48
+17 1 37 39 41 40
+18 1 39 41 43 42
+19 1 41 43 45 44
+20 1 35 45 43 46
+21 1 3 4 13 14
+22 1 3 4 13 18
+23 1 3 4 14 18
+24 1 13 4 14 18
+25 1 19 18 17 4
+26 1 20 18 17 4
+27 1 19 18 20 4
+28 1 19 18 20 17
+29 1 23 24 33 34
+30 1 23 24 33 48
+31 1 23 24 34 48
+32 1 33 24 34 48
+33 1 49 48 38 24
+34 1 50 48 38 24
+35 1 49 48 50 24
+36 1 49 48 50 38
diff --git a/examples/USER/reaction/tiny_polystyrene/chain_plus_styrene_map b/examples/USER/reaction/tiny_polystyrene/chain_plus_styrene_map
new file mode 100644
index 0000000000..56808b0962
--- /dev/null
+++ b/examples/USER/reaction/tiny_polystyrene/chain_plus_styrene_map
@@ -0,0 +1,62 @@
+this is a map file
+
+1 edgeIDs
+46 equivalences
+
+EdgeIDs
+
+30
+
+BondingIDs
+
+14
+34
+
+Equivalences
+
+1 1
+2 2
+3 3
+4 4
+5 5
+6 6
+7 7
+8 8
+9 9
+10 10
+11 11
+12 12
+13 13
+14 14
+15 15
+16 16
+17 17
+18 18
+19 19
+20 20
+21 21
+22 22
+23 23
+24 24
+25 25
+26 26
+27 27
+28 28
+29 29
+30 30
+31 31
+32 32
+33 33
+34 34
+35 35
+36 36
+37 37
+38 38
+39 39
+40 40
+41 41
+42 42
+43 43
+44 44
+45 45
+46 46
diff --git a/examples/USER/reaction/tiny_polystyrene/chain_plus_styrene_reacted.data_template b/examples/USER/reaction/tiny_polystyrene/chain_plus_styrene_reacted.data_template
new file mode 100644
index 0000000000..352d88737d
--- /dev/null
+++ b/examples/USER/reaction/tiny_polystyrene/chain_plus_styrene_reacted.data_template
@@ -0,0 +1,451 @@
+chain_plus_styrene_reacted
+
+46 atoms           
+48 bonds           
+81 angles           
+121 dihedrals           
+35 impropers           
+
+Types
+
+1 1
+2 2
+3 1
+4 5
+5 1
+6 2
+7 1
+8 2
+9 1
+10 2
+11 1
+12 2
+13 2
+14 6
+15 2
+16 2
+17 1
+18 2
+19 1
+20 5
+21 1
+22 2
+23 1
+24 2
+25 1
+26 2
+27 1
+28 2
+29 2
+30 6
+31 1
+32 2
+33 1
+34 5
+35 1
+36 2
+37 1
+38 2
+39 1
+40 2
+41 1
+42 2
+43 2
+44 6
+45 2
+46 2
+
+Charges
+
+1 -0.129000
+2 0.123700
+3 0.026600
+4 -0.018200
+5 -0.129000
+6 0.123700
+7 -0.173400
+8 0.140300
+9 -0.113400
+10 0.128800
+11 -0.173400
+12 0.140300
+13 0.051600
+14 -0.069600
+15 0.035400
+16 0.035400
+17 -0.129000
+18 0.123700
+19 0.026600
+20 -0.018200
+21 -0.129000
+22 0.123700
+23 -0.173400
+24 0.140300
+25 -0.113400
+26 0.128800
+27 -0.173400
+28 0.140300
+29 0.051600
+30 -0.069600
+31 -0.129000
+32 0.123700
+33 0.026600
+34 -0.018200
+35 -0.129000
+36 0.123700
+37 -0.173400
+38 0.140300
+39 -0.113400
+40 0.128800
+41 -0.173400
+42 0.140300
+43 0.051600
+44 -0.069600
+45 0.035400
+46 0.035400
+
+Coords
+
+1 24.130699 1.043900 -1.309300
+2 25.062700 1.582900 -1.309300
+3 22.900700 1.753900 -1.309300
+4 22.900700 3.253900 -1.309300
+5 21.670700 1.043900 -1.309300
+6 20.738701 1.582900 -1.309300
+7 21.670700 -0.376100 -1.309300
+8 20.738701 -0.915100 -1.309300
+9 22.900700 -1.086100 -1.309300
+10 22.900700 -2.163100 -1.309300
+11 24.130699 -0.376100 -1.309300
+12 25.062700 -0.915100 -1.309300
+13 23.766701 3.658900 -0.952300
+14 21.622700 3.802900 -1.871300
+15 21.672701 4.544900 -1.970300
+16 20.979700 2.979900 -2.165300
+17 13.465800 0.682500 -1.658900
+18 14.397800 1.221500 -1.658900
+19 12.235800 1.392500 -1.658900
+20 12.235800 2.892500 -1.658900
+21 11.005800 0.682500 -1.658900
+22 10.073800 1.221500 -1.658900
+23 11.005800 -0.737500 -1.658900
+24 10.073800 -1.276500 -1.658900
+25 12.235800 -1.447500 -1.658900
+26 12.235800 -2.524500 -1.658900
+27 13.465800 -0.737500 -1.658900
+28 14.397800 -1.276500 -1.658900
+29 13.101800 3.297500 -1.301900
+30 10.957800 3.441500 -2.220900
+31 18.663500 0.855500 -1.372100
+32 19.595501 1.394500 -1.372100
+33 17.433500 1.565500 -1.372100
+34 17.433500 3.065500 -1.372100
+35 16.203501 0.855500 -1.372100
+36 15.271500 1.394500 -1.372100
+37 16.203501 -0.564500 -1.372100
+38 15.271500 -1.103500 -1.372100
+39 17.433500 -1.274500 -1.372100
+40 17.433500 -2.351500 -1.372100
+41 18.663500 -0.564500 -1.372100
+42 19.595501 -1.103500 -1.372100
+43 18.299500 3.470500 -1.015100
+44 16.155500 3.614500 -1.934100
+45 16.205500 4.356500 -2.033100
+46 15.512500 2.791500 -2.228100
+
+Bonds
+
+1 1 1 2
+2 2 1 3
+3 2 1 11
+4 11 3 4
+5 2 3 5
+6 12 13 4
+7 13 4 14
+8 1 5 6
+9 2 5 7
+10 1 7 8
+11 2 7 9
+12 1 9 10
+13 2 9 11
+14 1 11 12
+15 10 15 14
+16 10 16 14
+17 9 14 34
+18 1 17 18
+19 2 17 19
+20 2 17 27
+21 7 19 20
+22 2 19 21
+23 8 29 20
+24 9 30 20
+25 9 44 20
+26 1 21 22
+27 2 21 23
+28 1 23 24
+29 2 23 25
+30 1 25 26
+31 2 25 27
+32 1 27 28
+33 1 31 32
+34 2 31 33
+35 2 31 41
+36 7 33 34
+37 2 33 35
+38 8 43 34
+39 9 44 34
+40 1 35 36
+41 2 35 37
+42 1 37 38
+43 2 37 39
+44 1 39 40
+45 2 39 41
+46 1 41 42
+47 10 45 44
+48 10 46 44
+
+Angles
+
+1 1 3 1 2
+2 1 11 1 2
+3 2 3 1 11
+4 17 1 3 4
+5 2 1 3 5
+6 17 5 3 4
+7 18 3 4 13
+8 19 3 4 14
+9 20 13 4 14
+10 1 3 5 6
+11 2 3 5 7
+12 1 7 5 6
+13 1 5 7 8
+14 2 5 7 9
+15 1 9 7 8
+16 1 7 9 10
+17 2 7 9 11
+18 1 11 9 10
+19 2 1 11 9
+20 1 1 11 12
+21 1 9 11 12
+22 21 15 14 4
+23 21 16 14 4
+24 22 4 14 34
+25 15 15 14 16
+26 14 15 14 34
+27 14 16 14 34
+28 1 19 17 18
+29 1 27 17 18
+30 2 19 17 27
+31 9 17 19 20
+32 2 17 19 21
+33 9 21 19 20
+34 10 19 20 29
+35 11 19 20 30
+36 11 19 20 44
+37 12 29 20 30
+38 12 29 20 44
+39 13 30 20 44
+40 1 19 21 22
+41 2 19 21 23
+42 1 23 21 22
+43 1 21 23 24
+44 2 21 23 25
+45 1 25 23 24
+46 1 23 25 26
+47 2 23 25 27
+48 1 27 25 26
+49 2 17 27 25
+50 1 17 27 28
+51 1 25 27 28
+52 1 33 31 32
+53 1 41 31 32
+54 2 33 31 41
+55 9 31 33 34
+56 2 31 33 35
+57 9 35 33 34
+58 11 33 34 14
+59 12 43 34 14
+60 13 14 34 44
+61 10 33 34 43
+62 11 33 34 44
+63 12 43 34 44
+64 1 33 35 36
+65 2 33 35 37
+66 1 37 35 36
+67 1 35 37 38
+68 2 35 37 39
+69 1 39 37 38
+70 1 37 39 40
+71 2 37 39 41
+72 1 41 39 40
+73 2 31 41 39
+74 1 31 41 42
+75 1 39 41 42
+76 16 20 44 34
+77 14 45 44 20
+78 14 46 44 20
+79 14 45 44 34
+80 14 46 44 34
+81 15 45 44 46
+
+Dihedrals
+
+1 20 2 1 3 4
+2 2 5 3 1 2
+3 21 11 1 3 4
+4 4 11 1 3 5
+5 2 9 11 1 2
+6 5 2 1 11 12
+7 4 3 1 11 9
+8 2 3 1 11 12
+9 22 1 3 4 13
+10 23 1 3 4 14
+11 22 5 3 4 13
+12 23 5 3 4 14
+13 2 1 3 5 6
+14 4 1 3 5 7
+15 20 6 5 3 4
+16 21 7 5 3 4
+17 24 3 4 14 15
+18 24 3 4 14 16
+19 25 3 4 14 34
+20 26 13 4 14 15
+21 26 13 4 14 16
+22 27 13 4 14 34
+23 2 3 5 7 8
+24 4 3 5 7 9
+25 5 6 5 7 8
+26 2 9 7 5 6
+27 2 5 7 9 10
+28 4 5 7 9 11
+29 5 8 7 9 10
+30 2 11 9 7 8
+31 4 7 9 11 1
+32 2 7 9 11 12
+33 2 1 11 9 10
+34 5 10 9 11 12
+35 28 4 14 34 33
+36 29 4 14 34 43
+37 30 4 14 34 44
+38 31 15 14 34 33
+39 32 15 14 34 43
+40 33 15 14 34 44
+41 31 16 14 34 33
+42 32 16 14 34 43
+43 33 16 14 34 44
+44 10 18 17 19 20
+45 2 21 19 17 18
+46 11 27 17 19 20
+47 4 27 17 19 21
+48 2 25 27 17 18
+49 5 18 17 27 28
+50 4 19 17 27 25
+51 2 19 17 27 28
+52 12 17 19 20 29
+53 13 17 19 20 30
+54 13 17 19 20 44
+55 12 21 19 20 29
+56 13 21 19 20 30
+57 13 21 19 20 44
+58 2 17 19 21 22
+59 4 17 19 21 23
+60 10 22 21 19 20
+61 11 23 21 19 20
+62 34 34 44 20 19
+63 31 45 44 20 19
+64 31 46 44 20 19
+65 35 34 44 20 29
+66 32 45 44 20 29
+67 32 46 44 20 29
+68 36 34 44 20 30
+69 33 45 44 20 30
+70 33 46 44 20 30
+71 2 19 21 23 24
+72 4 19 21 23 25
+73 5 22 21 23 24
+74 2 25 23 21 22
+75 2 21 23 25 26
+76 4 21 23 25 27
+77 5 24 23 25 26
+78 2 27 25 23 24
+79 4 23 25 27 17
+80 2 23 25 27 28
+81 2 17 27 25 26
+82 5 26 25 27 28
+83 10 32 31 33 34
+84 2 35 33 31 32
+85 11 41 31 33 34
+86 4 41 31 33 35
+87 2 39 41 31 32
+88 5 32 31 41 42
+89 4 33 31 41 39
+90 2 33 31 41 42
+91 13 31 33 34 14
+92 12 31 33 34 43
+93 13 31 33 34 44
+94 13 35 33 34 14
+95 12 35 33 34 43
+96 13 35 33 34 44
+97 2 31 33 35 36
+98 4 31 33 35 37
+99 10 36 35 33 34
+100 11 37 35 33 34
+101 36 20 44 34 14
+102 33 45 44 34 14
+103 33 46 44 34 14
+104 34 20 44 34 33
+105 31 45 44 34 33
+106 31 46 44 34 33
+107 35 20 44 34 43
+108 32 45 44 34 43
+109 32 46 44 34 43
+110 2 33 35 37 38
+111 4 33 35 37 39
+112 5 36 35 37 38
+113 2 39 37 35 36
+114 2 35 37 39 40
+115 4 35 37 39 41
+116 5 38 37 39 40
+117 2 41 39 37 38
+118 4 37 39 41 31
+119 2 37 39 41 42
+120 2 31 41 39 40
+121 5 40 39 41 42
+
+Impropers
+
+1 1 3 1 11 2
+2 8 1 3 5 4
+3 9 3 4 13 14
+4 1 3 5 7 6
+5 1 5 7 9 8
+6 1 7 9 11 10
+7 1 1 11 9 12
+8 1 19 17 27 18
+9 5 17 19 21 20
+10 1 19 21 23 22
+11 1 21 23 25 24
+12 1 23 25 27 26
+13 1 17 27 25 28
+14 1 33 31 41 32
+15 5 31 33 35 34
+16 1 33 35 37 36
+17 1 35 37 39 38
+18 1 37 39 41 40
+19 1 31 41 39 42
+20 1 15 14 16 4
+21 1 15 14 4 34
+22 1 16 14 4 34
+23 1 15 14 16 34
+24 1 19 20 29 30
+25 1 19 20 29 44
+26 1 19 20 30 44
+27 1 29 20 30 44
+28 1 33 34 43 14
+29 1 33 34 14 44
+30 1 43 34 14 44
+31 1 33 34 43 44
+32 1 45 44 34 20
+33 1 46 44 34 20
+34 1 45 44 46 20
+35 1 45 44 46 34
diff --git a/examples/USER/reaction/tiny_polystyrene/chain_plus_styrene_unreacted.data_template b/examples/USER/reaction/tiny_polystyrene/chain_plus_styrene_unreacted.data_template
new file mode 100644
index 0000000000..f76aad50e6
--- /dev/null
+++ b/examples/USER/reaction/tiny_polystyrene/chain_plus_styrene_unreacted.data_template
@@ -0,0 +1,422 @@
+chain_plus_styrene_unreacted
+
+46 atoms           
+47 bonds           
+75 angles           
+105 dihedrals           
+29 impropers           
+
+Types
+
+1 1
+2 2
+3 1
+4 3
+5 1
+6 2
+7 1
+8 2
+9 1
+10 2
+11 1
+12 2
+13 2
+14 4
+15 2
+16 2
+17 1
+18 2
+19 1
+20 5
+21 1
+22 2
+23 1
+24 2
+25 1
+26 2
+27 1
+28 2
+29 2
+30 6
+31 1
+32 2
+33 1
+34 5
+35 1
+36 2
+37 1
+38 2
+39 1
+40 2
+41 1
+42 2
+43 2
+44 6
+45 2
+46 2
+
+Charges
+
+1 -0.129000
+2 0.123700
+3 0.026600
+4 -0.018200
+5 -0.129000
+6 0.123700
+7 -0.173400
+8 0.140300
+9 -0.113400
+10 0.128800
+11 -0.173400
+12 0.140300
+13 0.051600
+14 -0.069600
+15 0.035400
+16 0.035400
+17 -0.129000
+18 0.123700
+19 0.026600
+20 -0.018200
+21 -0.129000
+22 0.123700
+23 -0.173400
+24 0.140300
+25 -0.113400
+26 0.128800
+27 -0.173400
+28 0.140300
+29 0.051600
+30 -0.069600
+31 -0.129000
+32 0.123700
+33 0.026600
+34 -0.018200
+35 -0.129000
+36 0.123700
+37 -0.173400
+38 0.140300
+39 -0.113400
+40 0.128800
+41 -0.173400
+42 0.140300
+43 0.051600
+44 -0.069600
+45 0.035400
+46 0.035400
+
+Coords
+
+1 24.130699 1.043900 -1.309300
+2 25.062700 1.582900 -1.309300
+3 22.900700 1.753900 -1.309300
+4 22.900700 3.253900 -1.309300
+5 21.670700 1.043900 -1.309300
+6 20.738701 1.582900 -1.309300
+7 21.670700 -0.376100 -1.309300
+8 20.738701 -0.915100 -1.309300
+9 22.900700 -1.086100 -1.309300
+10 22.900700 -2.163100 -1.309300
+11 24.130699 -0.376100 -1.309300
+12 25.062700 -0.915100 -1.309300
+13 23.766701 3.658900 -0.952300
+14 21.622700 3.802900 -1.871300
+15 21.672701 4.544900 -1.970300
+16 20.979700 2.979900 -2.165300
+17 13.465800 0.682500 -1.658900
+18 14.397800 1.221500 -1.658900
+19 12.235800 1.392500 -1.658900
+20 12.235800 2.892500 -1.658900
+21 11.005800 0.682500 -1.658900
+22 10.073800 1.221500 -1.658900
+23 11.005800 -0.737500 -1.658900
+24 10.073800 -1.276500 -1.658900
+25 12.235800 -1.447500 -1.658900
+26 12.235800 -2.524500 -1.658900
+27 13.465800 -0.737500 -1.658900
+28 14.397800 -1.276500 -1.658900
+29 13.101800 3.297500 -1.301900
+30 10.957800 3.441500 -2.220900
+31 18.663500 0.855500 -1.372100
+32 19.595501 1.394500 -1.372100
+33 17.433500 1.565500 -1.372100
+34 17.433500 3.065500 -1.372100
+35 16.203501 0.855500 -1.372100
+36 15.271500 1.394500 -1.372100
+37 16.203501 -0.564500 -1.372100
+38 15.271500 -1.103500 -1.372100
+39 17.433500 -1.274500 -1.372100
+40 17.433500 -2.351500 -1.372100
+41 18.663500 -0.564500 -1.372100
+42 19.595501 -1.103500 -1.372100
+43 18.299500 3.470500 -1.015100
+44 16.155500 3.614500 -1.934100
+45 16.205500 4.356500 -2.033100
+46 15.512500 2.791500 -2.228100
+
+Bonds
+
+1 1 1 2
+2 2 1 3
+3 2 1 11
+4 3 3 4
+5 2 3 5
+6 4 13 4
+7 5 4 14
+8 1 5 6
+9 2 5 7
+10 1 7 8
+11 2 7 9
+12 1 9 10
+13 2 9 11
+14 1 11 12
+15 6 15 14
+16 6 16 14
+17 1 17 18
+18 2 17 19
+19 2 17 27
+20 7 19 20
+21 2 19 21
+22 8 29 20
+23 9 20 30
+24 9 20 44
+25 1 21 22
+26 2 21 23
+27 1 23 24
+28 2 23 25
+29 1 25 26
+30 2 25 27
+31 1 27 28
+32 1 31 32
+33 2 31 33
+34 2 31 41
+35 7 33 34
+36 2 33 35
+37 8 43 34
+38 9 34 44
+39 1 35 36
+40 2 35 37
+41 1 37 38
+42 2 37 39
+43 1 39 40
+44 2 39 41
+45 1 41 42
+46 10 45 44
+47 10 46 44
+
+Angles
+
+1 1 3 1 2
+2 1 11 1 2
+3 2 3 1 11
+4 3 1 3 4
+5 2 1 3 5
+6 3 5 3 4
+7 4 3 4 13
+8 5 3 4 14
+9 6 13 4 14
+10 1 3 5 6
+11 2 3 5 7
+12 1 7 5 6
+13 1 5 7 8
+14 2 5 7 9
+15 1 9 7 8
+16 1 7 9 10
+17 2 7 9 11
+18 1 11 9 10
+19 2 1 11 9
+20 1 1 11 12
+21 1 9 11 12
+22 7 15 14 4
+23 7 16 14 4
+24 8 15 14 16
+25 1 19 17 18
+26 1 27 17 18
+27 2 19 17 27
+28 9 17 19 20
+29 2 17 19 21
+30 9 21 19 20
+31 10 19 20 29
+32 11 19 20 30
+33 11 19 20 44
+34 12 29 20 30
+35 12 29 20 44
+36 13 30 20 44
+37 1 19 21 22
+38 2 19 21 23
+39 1 23 21 22
+40 1 21 23 24
+41 2 21 23 25
+42 1 25 23 24
+43 1 23 25 26
+44 2 23 25 27
+45 1 27 25 26
+46 2 17 27 25
+47 1 17 27 28
+48 1 25 27 28
+49 1 33 31 32
+50 1 41 31 32
+51 2 33 31 41
+52 9 31 33 34
+53 2 31 33 35
+54 9 35 33 34
+55 10 33 34 43
+56 11 33 34 44
+57 12 43 34 44
+58 1 33 35 36
+59 2 33 35 37
+60 1 37 35 36
+61 1 35 37 38
+62 2 35 37 39
+63 1 39 37 38
+64 1 37 39 40
+65 2 37 39 41
+66 1 41 39 40
+67 2 31 41 39
+68 1 31 41 42
+69 1 39 41 42
+70 16 20 44 34
+71 14 45 44 20
+72 14 46 44 20
+73 14 45 44 34
+74 14 46 44 34
+75 15 45 44 46
+
+Dihedrals
+
+1 1 2 1 3 4
+2 2 5 3 1 2
+3 3 11 1 3 4
+4 4 11 1 3 5
+5 2 9 11 1 2
+6 5 2 1 11 12
+7 4 3 1 11 9
+8 2 3 1 11 12
+9 6 1 3 4 13
+10 7 1 3 4 14
+11 6 5 3 4 13
+12 7 5 3 4 14
+13 2 1 3 5 6
+14 4 1 3 5 7
+15 1 6 5 3 4
+16 3 7 5 3 4
+17 8 3 4 14 15
+18 8 3 4 14 16
+19 9 13 4 14 15
+20 9 13 4 14 16
+21 2 3 5 7 8
+22 4 3 5 7 9
+23 5 6 5 7 8
+24 2 9 7 5 6
+25 2 5 7 9 10
+26 4 5 7 9 11
+27 5 8 7 9 10
+28 2 11 9 7 8
+29 4 7 9 11 1
+30 2 7 9 11 12
+31 2 1 11 9 10
+32 5 10 9 11 12
+33 10 18 17 19 20
+34 2 21 19 17 18
+35 11 27 17 19 20
+36 4 27 17 19 21
+37 2 25 27 17 18
+38 5 18 17 27 28
+39 4 19 17 27 25
+40 2 19 17 27 28
+41 12 17 19 20 29
+42 13 17 19 20 30
+43 13 17 19 20 44
+44 12 21 19 20 29
+45 13 21 19 20 30
+46 13 21 19 20 44
+47 2 17 19 21 22
+48 4 17 19 21 23
+49 10 22 21 19 20
+50 11 23 21 19 20
+51 17 19 20 44 34
+52 14 19 20 44 45
+53 14 19 20 44 46
+54 18 29 20 44 34
+55 15 29 20 44 45
+56 15 29 20 44 46
+57 19 30 20 44 34
+58 16 30 20 44 45
+59 16 30 20 44 46
+60 2 19 21 23 24
+61 4 19 21 23 25
+62 5 22 21 23 24
+63 2 25 23 21 22
+64 2 21 23 25 26
+65 4 21 23 25 27
+66 5 24 23 25 26
+67 2 27 25 23 24
+68 4 23 25 27 17
+69 2 23 25 27 28
+70 2 17 27 25 26
+71 5 26 25 27 28
+72 10 32 31 33 34
+73 2 35 33 31 32
+74 11 41 31 33 34
+75 4 41 31 33 35
+76 2 39 41 31 32
+77 5 32 31 41 42
+78 4 33 31 41 39
+79 2 33 31 41 42
+80 12 31 33 34 43
+81 13 31 33 34 44
+82 12 35 33 34 43
+83 13 35 33 34 44
+84 2 31 33 35 36
+85 4 31 33 35 37
+86 10 36 35 33 34
+87 11 37 35 33 34
+88 17 33 34 44 20
+89 14 33 34 44 45
+90 14 33 34 44 46
+91 18 43 34 44 20
+92 15 43 34 44 45
+93 15 43 34 44 46
+94 2 33 35 37 38
+95 4 33 35 37 39
+96 5 36 35 37 38
+97 2 39 37 35 36
+98 2 35 37 39 40
+99 4 35 37 39 41
+100 5 38 37 39 40
+101 2 41 39 37 38
+102 4 37 39 41 31
+103 2 37 39 41 42
+104 2 31 41 39 40
+105 5 40 39 41 42
+
+Impropers
+
+1 1 3 1 11 2
+2 2 1 3 5 4
+3 3 3 4 13 14
+4 1 3 5 7 6
+5 1 5 7 9 8
+6 1 7 9 11 10
+7 1 1 11 9 12
+8 4 15 14 16 4
+9 1 19 17 27 18
+10 5 17 19 21 20
+11 1 19 21 23 22
+12 1 21 23 25 24
+13 1 23 25 27 26
+14 1 17 27 25 28
+15 1 33 31 41 32
+16 5 31 33 35 34
+17 7 33 34 43 44
+18 1 33 35 37 36
+19 1 35 37 39 38
+20 1 37 39 41 40
+21 1 31 41 39 42
+22 1 19 20 29 30
+23 1 19 20 29 44
+24 1 19 20 30 44
+25 1 29 20 30 44
+26 1 45 44 34 20
+27 1 46 44 34 20
+28 1 45 44 46 20
+29 1 45 44 46 34
diff --git a/examples/USER/reaction/tiny_polystyrene/in.tiny_polystyrene.stabilized b/examples/USER/reaction/tiny_polystyrene/in.tiny_polystyrene.stabilized
new file mode 100644
index 0000000000..a711f3eaa9
--- /dev/null
+++ b/examples/USER/reaction/tiny_polystyrene/in.tiny_polystyrene.stabilized
@@ -0,0 +1,56 @@
+# 20 styrene molecules
+# three reactions defined  
+
+units real
+
+boundary p p p
+
+atom_style full
+
+kspace_style pppm 1.0e-4
+
+pair_style lj/class2/coul/long 8.5
+
+angle_style class2 
+
+bond_style class2 
+
+dihedral_style class2
+
+improper_style class2
+
+variable T equal 530
+
+read_data tiny_polystyrene.data  &
+  extra/bond/per/atom 5 &
+  extra/angle/per/atom 15 &
+  extra/dihedral/per/atom 15 &
+  extra/improper/per/atom 25 &
+  extra/special/per/atom 25
+
+molecule mol1 2styrene_unreacted.data_template
+molecule mol2 2styrene_reacted.data_template
+molecule mol3 chain_plus_styrene_unreacted.data_template
+molecule mol4 chain_plus_styrene_reacted.data_template
+molecule mol5 chain_chain_unreacted.data_template
+molecule mol6 chain_chain_reacted.data_template
+
+thermo 100
+
+# dump 1 all xyz 5 test_vis.xyz
+
+fix rxn1 all bond/react stabilization yes statted_grp .03 &
+ react rxn1 all 1 0 3.0 mol1 mol2 2styrene_map stabilize_steps 100 &
+ react rxn2 all 1 0 3.0 mol3 mol4 chain_plus_styrene_map stabilize_steps 100 &
+ react rxn3 all 1 0 5.0 mol5 mol6 chain_chain_map stabilize_steps 100
+
+fix 1 statted_grp_REACT nvt temp $T $T 100
+
+fix 4 bond_react_MASTER_group temp/rescale 1 $T $T 1 1
+
+thermo_style custom step temp press density f_rxn1[1] f_rxn1[2] f_rxn1[3]
+
+run 10000
+
+# write_restart restart_longrun nofix
+# write_data restart_longrun.data 
diff --git a/examples/USER/reaction/tiny_polystyrene/log.20Nov19.tiny_polystyrene.stabilized.g++.1 b/examples/USER/reaction/tiny_polystyrene/log.20Nov19.tiny_polystyrene.stabilized.g++.1
new file mode 100644
index 0000000000..274c72ece9
--- /dev/null
+++ b/examples/USER/reaction/tiny_polystyrene/log.20Nov19.tiny_polystyrene.stabilized.g++.1
@@ -0,0 +1,245 @@
+LAMMPS (20 Nov 2019)
+
+WARNING-WARNING-WARNING-WARNING-WARNING
+This LAMMPS executable was compiled using C++98 compatibility.
+Please report the compiler info below at https://github.com/lammps/lammps/issues/1659
+GNU C++ 4.8.5
+WARNING-WARNING-WARNING-WARNING-WARNING
+
+Reading data file ...
+  orthogonal box = (1.74267 1.74267 1.74267) to (18.2573 18.2573 18.2573)
+  1 by 1 by 1 MPI processor grid
+  reading atoms ...
+  320 atoms
+  reading velocities ...
+  320 velocities
+  scanning bonds ...
+  8 = max bonds/atom
+  scanning angles ...
+  18 = max angles/atom
+  scanning dihedrals ...
+  22 = max dihedrals/atom
+  scanning impropers ...
+  26 = max impropers/atom
+  reading bonds ...
+  320 bonds
+  reading angles ...
+  480 angles
+  reading dihedrals ...
+  640 dihedrals
+  reading impropers ...
+  160 impropers
+Finding 1-2 1-3 1-4 neighbors ...
+  special bond factors lj:   0          0          0         
+  special bond factors coul: 0          0          0         
+  3 = max # of 1-2 neighbors
+  6 = max # of 1-3 neighbors
+  12 = max # of 1-4 neighbors
+  39 = max # of special neighbors
+  special bonds CPU = 0.000929056 secs
+  read_data CPU = 0.00930568 secs
+Read molecule mol1:
+  32 atoms with max type 4
+  32 bonds with max type 6
+  48 angles with max type 8
+  64 dihedrals with max type 9
+  16 impropers with max type 4
+Read molecule mol2:
+  32 atoms with max type 6
+  33 bonds with max type 10
+  54 angles with max type 16
+  79 dihedrals with max type 19
+  22 impropers with max type 7
+Read molecule mol3:
+  46 atoms with max type 6
+  47 bonds with max type 10
+  75 angles with max type 16
+  105 dihedrals with max type 19
+  29 impropers with max type 7
+Read molecule mol4:
+  46 atoms with max type 6
+  48 bonds with max type 13
+  81 angles with max type 22
+  121 dihedrals with max type 36
+  35 impropers with max type 9
+Read molecule mol5:
+  50 atoms with max type 6
+  51 bonds with max type 10
+  84 angles with max type 16
+  118 dihedrals with max type 19
+  36 impropers with max type 7
+Read molecule mol6:
+  50 atoms with max type 6
+  52 bonds with max type 10
+  90 angles with max type 16
+  135 dihedrals with max type 19
+  42 impropers with max type 5
+dynamic group bond_react_MASTER_group defined
+dynamic group statted_grp_REACT defined
+PPPM initialization ...
+WARNING: System is not charge neutral, net charge = -0.004 (../kspace.cpp:304)
+  using 12-bit tables for long-range coulomb (../kspace.cpp:323)
+  G vector (1/distance) = 0.255611
+  grid = 6 6 6
+  stencil order = 5
+  estimated absolute RMS force accuracy = 0.00974692
+  estimated relative force accuracy = 2.93525e-05
+  using double precision FFTs
+  3d grid and FFT values/proc = 1331 216
+Neighbor list info ...
+  update every 1 steps, delay 10 steps, check yes
+  max neighbors/atom: 2000, page size: 100000
+  master list distance cutoff = 10.5
+  ghost atom cutoff = 10.5
+  binsize = 5.25, bins = 4 4 4
+  2 neighbor lists, perpetual/occasional/extra = 1 1 0
+  (1) pair lj/class2/coul/long, perpetual
+      attributes: half, newton on
+      pair build: half/bin/newton
+      stencil: half/bin/3d/newton
+      bin: standard
+  (2) fix bond/react, occasional, copy from (1)
+      attributes: half, newton on
+      pair build: copy
+      stencil: none
+      bin: none
+Setting up Verlet run ...
+  Unit style    : real
+  Current step  : 0
+  Time step     : 1
+Per MPI rank memory allocation (min/avg/max) = 31.14 | 31.14 | 31.14 Mbytes
+Step Temp Press Density f_rxn1[1] f_rxn1[2] f_rxn1[3] 
+       0    320.13638    -376.0844   0.76796752            0            0            0 
+     100    520.00782    3952.7008   0.76796752            8            0            0 
+     200     499.9174    2360.8219   0.76796752            8            3            1 
+     300    583.93895    2453.7374   0.76796752            8            3            2 
+     400    560.65536   -2243.3464   0.76796752            8            3            3 
+     500    556.27995    3598.7044   0.76796752            8            3            3 
+     600     570.8397   -3340.1826   0.76796752            8            4            4 
+     700    456.89894   -1087.8081   0.76796752            8            4            4 
+     800    572.91817   -776.19188   0.76796752            8            4            4 
+     900    530.13621   -246734.46   0.76796752            8            4            5 
+    1000    542.34698    1044.0793   0.76796752            8            4            5 
+    1100    562.86339    1207.1715   0.76796752            8            4            5 
+    1200     520.1559    2725.6523   0.76796752            8            4            5 
+    1300    534.01667     951.0972   0.76796752            8            4            5 
+    1400    478.68681    1184.9224   0.76796752            8            4            5 
+    1500    509.05445    2020.5224   0.76796752            8            4            5 
+    1600     549.5382    810.17577   0.76796752            8            4            5 
+    1700    549.46882   -6349.7751   0.76796752            8            4            5 
+    1800    496.77334    3953.1043   0.76796752            8            4            5 
+    1900    522.28719   -2271.7599   0.76796752            8            4            6 
+    2000    569.95975    5633.4352   0.76796752            8            4            6 
+    2100     590.8418    2355.8447   0.76796752            8            4            6 
+    2200    537.64787    6459.6743   0.76796752            8            4            6 
+    2300    548.38487   -1566.3528   0.76796752            8            4            6 
+    2400    533.50353     6755.664   0.76796752            8            4            6 
+    2500    512.57053    325.30968   0.76796752            8            4            6 
+    2600     498.4597   -2468.1165   0.76796752            8            4            6 
+    2700    559.03937    2428.3446   0.76796752            8            4            6 
+    2800    585.85721   -2896.3607   0.76796752            8            4            6 
+    2900    523.18635     1391.254   0.76796752            8            4            6 
+    3000    524.62076    375.02973   0.76796752            8            4            6 
+    3100    534.65688   -1522.7879   0.76796752            8            4            6 
+    3200    499.42665    3725.5476   0.76796752            8            4            6 
+    3300    514.36972    1725.8329   0.76796752            8            4            6 
+    3400    482.52662    4648.5013   0.76796752            8            4            6 
+    3500    495.36836     967.3482   0.76796752            8            4            6 
+    3600    583.28736    745.21794   0.76796752            8            4            6 
+    3700    531.99717   -804.39572   0.76796752            8            4            6 
+    3800    555.08359    -2381.363   0.76796752            8            4            6 
+    3900     520.1818   -547.34169   0.76796752            8            4            6 
+    4000    444.38804   -2488.7881   0.76796752            8            4            6 
+    4100    518.65622   -3135.9573   0.76796752            8            4            6 
+    4200    484.15227   -1040.2447   0.76796752            8            4            6 
+    4300    514.58006    550.14626   0.76796752            8            4            6 
+    4400    579.81405   -849.81454   0.76796752            8            4            6 
+    4500     522.8698     5222.654   0.76796752            8            4            6 
+    4600    490.78275    3251.2892   0.76796752            8            4            6 
+    4700    492.64299    3785.3482   0.76796752            8            4            6 
+    4800    500.11059    4441.8978   0.76796752            8            4            6 
+    4900    536.80009    965.33724   0.76796752            8            4            6 
+    5000    516.98575   -3794.4213   0.76796752            8            4            6 
+    5100    516.76648   -3593.9106   0.76796752            8            4            6 
+    5200     521.6379   -6532.7773   0.76796752            8            4            6 
+    5300    535.64798     2931.412   0.76796752            8            4            6 
+    5400    559.83266    7628.1659   0.76796752            8            4            6 
+    5500    538.91756    2841.6746   0.76796752            8            4            6 
+    5600    539.13999    10445.173   0.76796752            8            4            6 
+    5700    501.56603   -2106.3309   0.76796752            8            4            6 
+    5800    496.72952   -4831.0565   0.76796752            8            4            6 
+    5900    536.12979   -3916.8197   0.76796752            8            4            6 
+    6000    553.10092    3142.6871   0.76796752            8            4            6 
+    6100    558.09546     3154.584   0.76796752            8            4            6 
+    6200    523.48472    9807.0034   0.76796752            8            4            6 
+    6300    551.80343   -3608.2078   0.76796752            8            4            6 
+    6400    484.28359    2255.4675   0.76796752            8            4            6 
+    6500    560.68443   -4826.4868   0.76796752            8            4            6 
+    6600    604.50797    402.32183   0.76796752            8            4            6 
+    6700    538.84714   -7670.3312   0.76796752            8            4            6 
+    6800    528.82853   -380.32058   0.76796752            8            4            6 
+    6900    579.30919    4438.4574   0.76796752            8            4            6 
+    7000     540.3406    3738.0524   0.76796752            8            4            6 
+    7100    519.53645   -1825.5563   0.76796752            8            4            6 
+    7200      474.136    1657.3863   0.76796752            8            4            6 
+    7300    485.55159   -221.84939   0.76796752            8            4            6 
+    7400    527.38494    1037.1777   0.76796752            8            4            6 
+    7500    517.14767   -2313.5823   0.76796752            8            4            6 
+    7600    517.95967   -4763.4709   0.76796752            8            4            6 
+    7700    513.63507    4819.0253   0.76796752            8            4            6 
+    7800    503.56828    1295.1212   0.76796752            8            4            6 
+    7900    520.87804    1506.9417   0.76796752            8            4            6 
+    8000    509.46453   -5800.0971   0.76796752            8            4            6 
+    8100    566.67059    6065.4607   0.76796752            8            4            6 
+    8200    592.53068    1097.2277   0.76796752            8            4            6 
+    8300    529.55235   -580.81757   0.76796752            8            4            6 
+    8400    518.22587    560.45589   0.76796752            8            4            6 
+    8500    521.94561    5325.9459   0.76796752            8            4            6 
+    8600    510.54416   -1929.1967   0.76796752            8            4            6 
+    8700    562.71252   -629.90392   0.76796752            8            4            6 
+    8800    540.23123   -3484.3893   0.76796752            8            4            6 
+    8900    513.82411    -5227.152   0.76796752            8            4            6 
+    9000     534.3307    -3299.088   0.76796752            8            4            6 
+    9100    509.24467   -5676.2775   0.76796752            8            4            6 
+    9200     506.3216   -7043.8493   0.76796752            8            4            7 
+    9300    480.37682    2380.4696   0.76796752            8            4            7 
+    9400    546.15532    1831.0103   0.76796752            8            4            7 
+    9500    567.18341    3839.9843   0.76796752            8            4            7 
+    9600    536.14883    4258.5304   0.76796752            8            4            7 
+    9700    496.04153    3321.3561   0.76796752            8            4            7 
+    9800    531.78927    3124.9156   0.76796752            8            4            7 
+    9900    530.91395    38.987859   0.76796752            8            4            7 
+   10000    551.22761    1027.5706   0.76796752            8            4            7 
+Loop time of 57.7096 on 1 procs for 10000 steps with 320 atoms
+
+Performance: 14.972 ns/day, 1.603 hours/ns, 173.281 timesteps/s
+99.9% CPU use with 1 MPI tasks x no OpenMP threads
+
+MPI task timing breakdown:
+Section |  min time  |  avg time  |  max time  |%varavg| %total
+---------------------------------------------------------------
+Pair    | 11.621     | 11.621     | 11.621     |   0.0 | 20.14
+Bond    | 11.151     | 11.151     | 11.151     |   0.0 | 19.32
+Kspace  | 2.2403     | 2.2403     | 2.2403     |   0.0 |  3.88
+Neigh   | 25.467     | 25.467     | 25.467     |   0.0 | 44.13
+Comm    | 0.90467    | 0.90467    | 0.90467    |   0.0 |  1.57
+Output  | 0.0017984  | 0.0017984  | 0.0017984  |   0.0 |  0.00
+Modify  | 6.2622     | 6.2622     | 6.2622     |   0.0 | 10.85
+Other   |            | 0.06192    |            |       |  0.11
+
+Nlocal:    320 ave 320 max 320 min
+Histogram: 1 0 0 0 0 0 0 0 0 0
+Nghost:    3240 ave 3240 max 3240 min
+Histogram: 1 0 0 0 0 0 0 0 0 0
+Neighs:    54336 ave 54336 max 54336 min
+Histogram: 1 0 0 0 0 0 0 0 0 0
+
+Total # of neighbors = 54336
+Ave neighs/atom = 169.8
+Ave special neighs/atom = 11.3063
+Neighbor list builds = 10000
+Dangerous builds = 0
+
+Please see the log.cite file for references relevant to this simulation
+
+Total wall time: 0:00:58
diff --git a/examples/USER/reaction/tiny_polystyrene/log.20Nov19.tiny_polystyrene.stabilized.g++.4 b/examples/USER/reaction/tiny_polystyrene/log.20Nov19.tiny_polystyrene.stabilized.g++.4
new file mode 100644
index 0000000000..29aae1cd0b
--- /dev/null
+++ b/examples/USER/reaction/tiny_polystyrene/log.20Nov19.tiny_polystyrene.stabilized.g++.4
@@ -0,0 +1,255 @@
+LAMMPS (20 Nov 2019)
+
+WARNING-WARNING-WARNING-WARNING-WARNING
+This LAMMPS executable was compiled using C++98 compatibility.
+Please report the compiler info below at https://github.com/lammps/lammps/issues/1659
+GNU C++ 4.8.5
+WARNING-WARNING-WARNING-WARNING-WARNING
+
+Reading data file ...
+  orthogonal box = (1.74267 1.74267 1.74267) to (18.2573 18.2573 18.2573)
+  1 by 2 by 2 MPI processor grid
+  reading atoms ...
+  320 atoms
+  reading velocities ...
+  320 velocities
+  scanning bonds ...
+  8 = max bonds/atom
+  scanning angles ...
+  18 = max angles/atom
+  scanning dihedrals ...
+  22 = max dihedrals/atom
+  scanning impropers ...
+  26 = max impropers/atom
+  reading bonds ...
+  320 bonds
+  reading angles ...
+  480 angles
+  reading dihedrals ...
+  640 dihedrals
+  reading impropers ...
+  160 impropers
+Finding 1-2 1-3 1-4 neighbors ...
+  special bond factors lj:   0          0          0         
+  special bond factors coul: 0          0          0         
+  3 = max # of 1-2 neighbors
+  6 = max # of 1-3 neighbors
+  12 = max # of 1-4 neighbors
+  39 = max # of special neighbors
+  special bonds CPU = 0.000751222 secs
+  read_data CPU = 0.0268223 secs
+Read molecule mol1:
+  32 atoms with max type 4
+  32 bonds with max type 6
+  48 angles with max type 8
+  64 dihedrals with max type 9
+  16 impropers with max type 4
+Read molecule mol2:
+  32 atoms with max type 6
+  33 bonds with max type 10
+  54 angles with max type 16
+  79 dihedrals with max type 19
+  22 impropers with max type 7
+Read molecule mol3:
+  46 atoms with max type 6
+  47 bonds with max type 10
+  75 angles with max type 16
+  105 dihedrals with max type 19
+  29 impropers with max type 7
+Read molecule mol4:
+  46 atoms with max type 6
+  48 bonds with max type 13
+  81 angles with max type 22
+  121 dihedrals with max type 36
+  35 impropers with max type 9
+Read molecule mol5:
+  50 atoms with max type 6
+  51 bonds with max type 10
+  84 angles with max type 16
+  118 dihedrals with max type 19
+  36 impropers with max type 7
+Read molecule mol6:
+  50 atoms with max type 6
+  52 bonds with max type 10
+  90 angles with max type 16
+  135 dihedrals with max type 19
+  42 impropers with max type 5
+dynamic group bond_react_MASTER_group defined
+dynamic group statted_grp_REACT defined
+PPPM initialization ...
+WARNING: System is not charge neutral, net charge = -0.004 (../kspace.cpp:304)
+  using 12-bit tables for long-range coulomb (../kspace.cpp:323)
+  G vector (1/distance) = 0.255611
+  grid = 6 6 6
+  stencil order = 5
+  estimated absolute RMS force accuracy = 0.00974692
+  estimated relative force accuracy = 2.93525e-05
+  using double precision FFTs
+  3d grid and FFT values/proc = 704 72
+Neighbor list info ...
+  update every 1 steps, delay 10 steps, check yes
+  max neighbors/atom: 2000, page size: 100000
+  master list distance cutoff = 10.5
+  ghost atom cutoff = 10.5
+  binsize = 5.25, bins = 4 4 4
+  2 neighbor lists, perpetual/occasional/extra = 1 1 0
+  (1) pair lj/class2/coul/long, perpetual
+      attributes: half, newton on
+      pair build: half/bin/newton
+      stencil: half/bin/3d/newton
+      bin: standard
+  (2) fix bond/react, occasional, copy from (1)
+      attributes: half, newton on
+      pair build: copy
+      stencil: none
+      bin: none
+Setting up Verlet run ...
+  Unit style    : real
+  Current step  : 0
+  Time step     : 1
+Per MPI rank memory allocation (min/avg/max) = 30.66 | 30.68 | 30.69 Mbytes
+Step Temp Press Density f_rxn1[1] f_rxn1[2] f_rxn1[3] 
+       0    320.13638    -376.0844   0.76796752            0            0            0 
+     100    522.71544    6623.0579   0.76796752            8            0            0 
+     200    500.86716   -9439.5519   0.76796752            8            3            2 
+     300    594.60588    6714.1323   0.76796752            8            3            3 
+     400    598.68768    683.70457   0.76796752            8            3            3 
+     500     563.1011    3576.6857   0.76796752            8            3            4 
+     600    510.29713   -196148.37   0.76796752            8            3            5 
+     700    494.14346   -118517.45   0.76796752            8            3            6 
+     800    565.62849    7678.1235   0.76796752            8            3            6 
+     900    515.74468    554.84571   0.76796752            8            3            6 
+    1000    500.64636    450.15932   0.76796752            8            3            6 
+    1100    463.34973    6023.8346   0.76796752            8            3            6 
+    1200    529.88483     2748.185   0.76796752            8            3            6 
+    1300    546.84049    1353.4891   0.76796752            8            3            6 
+    1400    552.27356    1446.5807   0.76796752            8            3            6 
+    1500    557.70874   -2745.1523   0.76796752            8            3            6 
+    1600     572.0005    629.36722   0.76796752            8            3            6 
+    1700    503.96569    5937.0231   0.76796752            8            3            6 
+    1800    491.34262   -1175.8104   0.76796752            8            3            6 
+    1900    538.24798   -81.197397   0.76796752            8            3            6 
+    2000    523.89324    2857.2466   0.76796752            8            3            6 
+    2100     515.1424    2288.2405   0.76796752            8            3            6 
+    2200    546.80854    3807.1038   0.76796752            8            3            6 
+    2300    500.31231   -135.33933   0.76796752            8            4            6 
+    2400    497.16354     5516.857   0.76796752            8            4            6 
+    2500    545.34187    3485.5645   0.76796752            8            4            6 
+    2600    522.70122    3114.1284   0.76796752            8            4            6 
+    2700    531.76604    6633.5518   0.76796752            8            4            6 
+    2800    521.97643   -279.83682   0.76796752            8            4            6 
+    2900    497.29575    7052.9409   0.76796752            8            4            6 
+    3000     524.5942    2284.8918   0.76796752            8            4            6 
+    3100    567.61329   -3667.4557   0.76796752            8            4            6 
+    3200    506.82452   -2934.4936   0.76796752            8            4            6 
+    3300     510.8521    313.36263   0.76796752            8            4            6 
+    3400    516.70206    3671.1899   0.76796752            8            4            6 
+    3500    535.12788    2645.2564   0.76796752            8            4            6 
+    3600    580.14214    2604.3079   0.76796752            8            4            6 
+    3700    529.77869    2684.0812   0.76796752            8            4            6 
+    3800    502.93191    2838.6698   0.76796752            8            4            6 
+    3900    585.91492    5308.0828   0.76796752            8            4            6 
+    4000    548.89917    5262.5775   0.76796752            8            4            6 
+    4100     550.7662   -1066.6807   0.76796752            8            4            6 
+    4200    519.19198    2777.5276   0.76796752            8            4            6 
+    4300    521.46332   -3429.7171   0.76796752            8            4            6 
+    4400    532.64173    2301.3135   0.76796752            8            4            6 
+    4500    528.96107    1369.0991   0.76796752            8            4            6 
+    4600    564.66443    9687.2531   0.76796752            8            4            6 
+    4700    558.49446    2322.6085   0.76796752            8            4            6 
+    4800    497.78614   -442.45053   0.76796752            8            4            6 
+    4900    511.09435   -10251.159   0.76796752            8            4            6 
+    5000     525.6642   -1202.0584   0.76796752            8            4            6 
+    5100    521.76974    1821.7811   0.76796752            8            4            6 
+    5200     555.9859    7256.9632   0.76796752            8            4            6 
+    5300    551.51971   -122893.16   0.76796752            8            4            7 
+    5400    524.34705    2905.1033   0.76796752            8            4            7 
+    5500    567.09396    2896.4824   0.76796752            8            4            7 
+    5600    487.57746    1417.1715   0.76796752            8            4            7 
+    5700    547.37304    3900.8734   0.76796752            8            4            7 
+    5800    536.17647   -4048.7522   0.76796752            8            4            7 
+    5900    536.85051    4497.9847   0.76796752            8            4            7 
+    6000    548.58212   -4880.4979   0.76796752            8            4            7 
+    6100    500.94692    6004.2105   0.76796752            8            4            7 
+    6200    486.82494     402.5875   0.76796752            8            4            7 
+    6300    478.09381     6600.767   0.76796752            8            4            7 
+    6400    559.90398    2868.0805   0.76796752            8            4            7 
+    6500    526.01866   -3398.4788   0.76796752            8            4            7 
+    6600    539.68471   -1202.0012   0.76796752            8            4            7 
+    6700    507.51217   -378.71164   0.76796752            8            4            7 
+    6800    526.15958   -4536.9888   0.76796752            8            4            7 
+    6900    511.37134   -2522.3553   0.76796752            8            4            7 
+    7000    538.86918   -2028.0323   0.76796752            8            4            7 
+    7100    523.25566    2911.9962   0.76796752            8            4            7 
+    7200    513.28464   -1000.4758   0.76796752            8            4            7 
+    7300    510.19826    5181.7976   0.76796752            8            4            7 
+    7400    493.46528   -1166.3996   0.76796752            8            4            7 
+    7500    491.51305    5669.2213   0.76796752            8            4            7 
+    7600    506.72032    -2840.301   0.76796752            8            4            7 
+    7700     513.4319    2802.1719   0.76796752            8            4            7 
+    7800     543.7658   -7477.3623   0.76796752            8            4            7 
+    7900    527.35619   -3182.3155   0.76796752            8            4            7 
+    8000    533.50993    613.16561   0.76796752            8            4            7 
+    8100    512.44958   -5037.3414   0.76796752            8            4            7 
+    8200    494.88981    1799.3513   0.76796752            8            4            7 
+    8300    554.81474   -2436.0507   0.76796752            8            4            7 
+    8400    523.22917    364.30593   0.76796752            8            4            7 
+    8500    515.12395    525.24581   0.76796752            8            4            7 
+    8600     511.6321   -1679.8669   0.76796752            8            4            7 
+    8700     531.6327   -1168.1215   0.76796752            8            4            7 
+    8800    548.14438   -5222.7573   0.76796752            8            4            7 
+    8900    517.72579    2073.9695   0.76796752            8            4            7 
+    9000    543.11894   -5307.0759   0.76796752            8            4            7 
+    9100    521.13747   -5546.8552   0.76796752            8            4            7 
+    9200    509.66142    -1584.019   0.76796752            8            4            7 
+    9300    488.73821   -277.85847   0.76796752            8            4            7 
+    9400    513.67282    989.60653   0.76796752            8            4            7 
+    9500    509.98833   -1754.8786   0.76796752            8            4            7 
+    9600    558.72497    5616.6969   0.76796752            8            4            7 
+    9700    533.74988    811.48871   0.76796752            8            4            7 
+    9800    510.94641   -3136.5876   0.76796752            8            4            7 
+    9900    517.80127   -1962.0837   0.76796752            8            4            7 
+   10000    477.50428   -3768.1653   0.76796752            8            4            7 
+Loop time of 20.9963 on 4 procs for 10000 steps with 320 atoms
+
+Performance: 41.150 ns/day, 0.583 hours/ns, 476.276 timesteps/s
+100.0% CPU use with 4 MPI tasks x no OpenMP threads
+
+MPI task timing breakdown:
+Section |  min time  |  avg time  |  max time  |%varavg| %total
+---------------------------------------------------------------
+Pair    | 2.4968     | 3.0329     | 3.3607     |  18.6 | 14.45
+Bond    | 2.3164     | 2.8835     | 3.456      |  26.0 | 13.73
+Kspace  | 1.3332     | 2.2082     | 3.285      |  48.0 | 10.52
+Neigh   | 7.4831     | 7.4922     | 7.5012     |   0.3 | 35.68
+Comm    | 1.2809     | 1.3121     | 1.3297     |   1.6 |  6.25
+Output  | 0.0012138  | 0.0013506  | 0.0017552  |   0.6 |  0.01
+Modify  | 4.0269     | 4.0301     | 4.0335     |   0.1 | 19.19
+Other   |            | 0.03583    |            |       |  0.17
+
+Nlocal:    80 ave 94 max 66 min
+Histogram: 2 0 0 0 0 0 0 0 0 2
+Nghost:    2243.75 ave 2260 max 2221 min
+Histogram: 1 0 0 1 0 0 0 0 0 2
+Neighs:    13658.5 ave 17096 max 9421 min
+Histogram: 1 0 0 0 0 1 1 0 0 1
+
+Total # of neighbors = 54634
+Ave neighs/atom = 170.731
+Ave special neighs/atom = 11.3063
+Neighbor list builds = 10000
+Dangerous builds = 0
+System init for write_data ...
+PPPM initialization ...
+  using 12-bit tables for long-range coulomb (../kspace.cpp:323)
+  G vector (1/distance) = 0.255611
+  grid = 6 6 6
+  stencil order = 5
+  estimated absolute RMS force accuracy = 0.00974692
+  estimated relative force accuracy = 2.93525e-05
+  using double precision FFTs
+  3d grid and FFT values/proc = 704 72
+
+Please see the log.cite file for references relevant to this simulation
+
+Total wall time: 0:00:21
diff --git a/examples/USER/reaction/tiny_polystyrene/tiny_polystyrene.data b/examples/USER/reaction/tiny_polystyrene/tiny_polystyrene.data
new file mode 100644
index 0000000000..5f0ed4cfa6
--- /dev/null
+++ b/examples/USER/reaction/tiny_polystyrene/tiny_polystyrene.data
@@ -0,0 +1,2643 @@
+LAMMPS data file via write_data, version 20 Nov 2019, timestep = 25000
+
+320 atoms
+7 atom types
+320 bonds
+13 bond types
+480 angles
+22 angle types
+640 dihedrals
+36 dihedral types
+160 impropers
+9 improper types
+
+1.7426663385337786e+00 1.8257333661465619e+01 xlo xhi
+1.7426663385337786e+00 1.8257333661465619e+01 ylo yhi
+1.7426663385337786e+00 1.8257333661465619e+01 zlo zhi
+
+Masses
+
+1 12.0112
+2 1.00797
+3 12.0112
+4 12.0112
+5 12.0112
+6 12.0112
+7 12.0112
+
+Pair Coeffs # lj/class2/coul/long
+
+1 0.064 4.01
+2 0.02 2.7
+3 0.064 4.01
+4 0.064 3.9
+5 0.054 4.01
+6 0.054 4.01
+7 0.054 4.01
+
+Bond Coeffs # class2
+
+1 1.0982 372.825 -803.453 894.317
+2 1.417 470.836 -627.618 1327.63
+3 1.501 321.902 -521.821 572.163
+4 1.0883 365.768 -725.54 781.662
+5 1.34 543.99 -1238.2 1644.03
+6 1.0883 365.768 -725.54 781.662
+7 1.501 321.902 -521.821 572.163
+8 1.101 345 -691.89 844.6
+9 1.53 299.67 -501.77 679.81
+10 1.101 345 -691.89 844.6
+11 1.501 321.902 -521.821 572.163
+12 1.101 345 -691.89 844.6
+13 1.53 299.67 -501.77 679.81
+
+Angle Coeffs # class2
+
+1 117.94 35.1558 -12.4682 0
+2 118.9 61.0226 -34.9931 0
+3 120.05 44.7148 -22.7352 0
+4 111 44.3234 -9.4454 0
+5 108.4 43.9594 -8.3924 -9.3379
+6 124.88 35.2766 -17.774 -1.6215
+7 124.88 35.2766 -17.774 -1.6215
+8 115.49 29.6363 -12.4853 -6.2218
+9 120.05 44.7148 -22.7352 0
+10 111 44.3234 -9.4454 0
+11 108.4 43.9594 -8.3924 -9.3379
+12 110.77 41.453 -10.604 5.129
+13 112.67 39.516 -7.443 -9.5583
+14 110.77 41.453 -10.604 5.129
+15 107.66 39.641 -12.921 -2.4318
+16 112.67 39.516 -7.443 -9.5583
+17 120.05 44.7148 -22.7352 0
+18 111 44.3234 -9.4454 0
+19 108.4 43.9594 -8.3924 -9.3379
+20 110.77 41.453 -10.604 5.129
+21 110.77 41.453 -10.604 5.129
+22 112.67 39.516 -7.443 -9.5583
+
+BondBond Coeffs
+
+1 1.0795 1.417 1.0982
+2 68.2856 1.417 1.417
+3 12.0676 1.417 1.501
+4 2.9168 1.501 1.0883
+5 0 1.501 1.34
+6 10.1047 1.0883 1.34
+7 10.1047 1.0883 1.34
+8 4.8506 1.0883 1.0883
+9 12.0676 1.417 1.501
+10 2.9168 1.501 1.101
+11 0 1.501 1.53
+12 3.3872 1.101 1.53
+13 0 1.53 1.53
+14 3.3872 1.101 1.53
+15 5.3316 1.101 1.101
+16 0 1.53 1.53
+17 12.0676 1.417 1.501
+18 2.9168 1.501 1.101
+19 0 1.501 1.53
+20 3.3872 1.101 1.53
+21 3.3872 1.101 1.53
+22 0 1.53 1.53
+
+BondAngle Coeffs
+
+1 20.0033 24.2183 1.417 1.0982
+2 28.8708 28.8708 1.417 1.417
+3 31.0771 47.0579 1.417 1.501
+4 26.4608 11.7717 1.501 1.0883
+5 0 0 1.501 1.34
+6 19.0592 23.3588 1.0883 1.34
+7 19.0592 23.3588 1.0883 1.34
+8 17.9795 17.9795 1.0883 1.0883
+9 31.0771 47.0579 1.417 1.501
+10 26.4608 11.7717 1.501 1.101
+11 0 0 1.501 1.53
+12 11.421 20.754 1.101 1.53
+13 8.016 8.016 1.53 1.53
+14 11.421 20.754 1.101 1.53
+15 18.103 18.103 1.101 1.101
+16 8.016 8.016 1.53 1.53
+17 31.0771 47.0579 1.417 1.501
+18 26.4608 11.7717 1.501 1.101
+19 0 0 1.501 1.53
+20 11.421 20.754 1.101 1.53
+21 11.421 20.754 1.101 1.53
+22 8.016 8.016 1.53 1.53
+
+Dihedral Coeffs # class2
+
+1 0 0 1.559 0 0 0
+2 0 0 3.9661 0 0 0
+3 0 0 4.4072 0 0 0
+4 8.3667 0 1.1932 0 0 0
+5 0 0 1.8769 0 0 0
+6 0 0 0 0 0 0
+7 0 0 0 0 0 0
+8 0 0 0 0 0 0
+9 0 0 4.8974 0 0 0
+10 0 0 1.559 0 0 0
+11 0 0 4.4072 0 0 0
+12 -0.2801 0 -0.0678 0 -0.0122 0
+13 -0.2802 0 -0.0678 0 -0.0122 0
+14 -0.0228 0 0.028 0 -0.1863 0
+15 -0.1432 0 0.0617 0 -0.1083 0
+16 0 0 0.0316 0 -0.1681 0
+17 0 0 0 0 0 0
+18 0 0 0.0316 0 -0.1681 0
+19 0 0 0.0514 0 -0.143 0
+20 0 0 1.559 0 0 0
+21 0 0 4.4072 0 0 0
+22 -0.2801 0 -0.0678 0 -0.0122 0
+23 -0.2802 0 -0.0678 0 -0.0122 0
+24 -0.0228 0 0.028 0 -0.1863 0
+25 0 0 0 0 0 0
+26 -0.1432 0 0.0617 0 -0.1083 0
+27 0 0 0.0316 0 -0.1681 0
+28 0 0 0 0 0 0
+29 0 0 0.0316 0 -0.1681 0
+30 0 0 0.0514 0 -0.143 0
+31 -0.0228 0 0.028 0 -0.1863 0
+32 -0.1432 0 0.0617 0 -0.1083 0
+33 0 0 0.0316 0 -0.1681 0
+34 0 0 0 0 0 0
+35 0 0 0.0316 0 -0.1681 0
+36 0 0 0.0514 0 -0.143 0
+
+AngleAngleTorsion Coeffs
+
+1 4.4444 117.94 120.05
+2 -4.8141 118.9 117.94
+3 -14.4097 118.9 120.05
+4 0 118.9 118.9
+5 0.3598 117.94 117.94
+6 0 120.05 111
+7 0 120.05 108.4
+8 0 108.4 124.88
+9 -7.0058 124.88 124.88
+10 4.4444 117.94 120.05
+11 -14.4097 118.9 120.05
+12 -5.8888 120.05 111
+13 0 120.05 108.4
+14 0 108.4 110.77
+15 -12.564 110.77 110.77
+16 -16.164 112.67 110.77
+17 0 108.4 112.67
+18 -16.164 110.77 112.67
+19 -22.045 112.67 112.67
+20 4.4444 117.94 120.05
+21 -14.4097 118.9 120.05
+22 -5.8888 120.05 111
+23 0 120.05 108.4
+24 0 108.4 110.77
+25 0 108.4 112.67
+26 -12.564 110.77 110.77
+27 -16.164 110.77 112.67
+28 0 112.67 108.4
+29 -16.164 112.67 110.77
+30 -22.045 112.67 112.67
+31 0 110.77 108.4
+32 -12.564 110.77 110.77
+33 -16.164 110.77 112.67
+34 0 112.67 108.4
+35 -16.164 112.67 110.77
+36 -22.045 112.67 112.67
+
+EndBondTorsion Coeffs
+
+1 0 -0.4879 0 0 -1.797 0 1.0982 1.501
+2 0 -6.8958 0 0 -0.4669 0 1.417 1.0982
+3 0 -0.6918 0 0 0.2421 0 1.417 1.501
+4 -0.1185 6.3204 0 -0.1185 6.3204 0 1.417 1.417
+5 0 -0.689 0 0 -0.689 0 1.0982 1.0982
+6 0 0 0 0 0 0 1.417 1.0883
+7 0 0 0 0 0 0 1.417 1.34
+8 0 0 0 0 0 0 1.501 1.0883
+9 0.7129 0.5161 0 0.7129 0.5161 0 1.0883 1.0883
+10 0 -0.4879 0 0 -1.797 0 1.0982 1.501
+11 0 -0.6918 0 0 0.2421 0 1.417 1.501
+12 -0.5835 1.122 0.3978 1.3997 0.7756 0 1.417 1.101
+13 0 0 0 0 0 0 1.417 1.53
+14 0 0 0 0 0 0 1.501 1.101
+15 0.213 0.312 0.0777 0.213 0.312 0.0777 1.101 1.101
+16 0.2486 0.2422 -0.0925 0.0814 0.0591 0.2219 1.53 1.101
+17 0 0 0 0 0 0 1.501 1.53
+18 0.0814 0.0591 0.2219 0.2486 0.2422 -0.0925 1.101 1.53
+19 -0.0732 0 0 -0.0732 0 0 1.53 1.53
+20 0 -0.4879 0 0 -1.797 0 1.0982 1.501
+21 0 -0.6918 0 0 0.2421 0 1.417 1.501
+22 -0.5835 1.122 0.3978 1.3997 0.7756 0 1.417 1.101
+23 0 0 0 0 0 0 1.417 1.53
+24 0 0 0 0 0 0 1.501 1.101
+25 0 0 0 0 0 0 1.501 1.53
+26 0.213 0.312 0.0777 0.213 0.312 0.0777 1.101 1.101
+27 0.0814 0.0591 0.2219 0.2486 0.2422 -0.0925 1.101 1.53
+28 0 0 0 0 0 0 1.53 1.501
+29 0.2486 0.2422 -0.0925 0.0814 0.0591 0.2219 1.53 1.101
+30 -0.0732 0 0 -0.0732 0 0 1.53 1.53
+31 0 0 0 0 0 0 1.101 1.501
+32 0.213 0.312 0.0777 0.213 0.312 0.0777 1.101 1.101
+33 0.0814 0.0591 0.2219 0.2486 0.2422 -0.0925 1.101 1.53
+34 0 0 0 0 0 0 1.53 1.501
+35 0.2486 0.2422 -0.0925 0.0814 0.0591 0.2219 1.53 1.101
+36 -0.0732 0 0 -0.0732 0 0 1.53 1.53
+
+MiddleBondTorsion Coeffs
+
+1 0 3.9421 0 1.417
+2 0 -1.1521 0 1.417
+3 0 9.1792 0 1.417
+4 27.5989 -2.312 0 1.417
+5 0 4.8228 0 1.417
+6 0 0 0 1.501
+7 0 0 0 1.501
+8 0 0 0 1.34
+9 0.8558 6.3911 0 1.34
+10 0 3.9421 0 1.417
+11 0 9.1792 0 1.417
+12 -5.5679 1.4083 0.301 1.501
+13 0 0 0 1.501
+14 0 0 0 1.53
+15 -14.261 -0.5322 -0.4864 1.53
+16 -14.879 -3.6581 -0.3138 1.53
+17 0 0 0 1.53
+18 -14.879 -3.6581 -0.3138 1.53
+19 -17.787 -7.1877 0 1.53
+20 0 3.9421 0 1.417
+21 0 9.1792 0 1.417
+22 -5.5679 1.4083 0.301 1.501
+23 0 0 0 1.501
+24 0 0 0 1.53
+25 0 0 0 1.53
+26 -14.261 -0.5322 -0.4864 1.53
+27 -14.879 -3.6581 -0.3138 1.53
+28 0 0 0 1.53
+29 -14.879 -3.6581 -0.3138 1.53
+30 -17.787 -7.1877 0 1.53
+31 0 0 0 1.53
+32 -14.261 -0.5322 -0.4864 1.53
+33 -14.879 -3.6581 -0.3138 1.53
+34 0 0 0 1.53
+35 -14.879 -3.6581 -0.3138 1.53
+36 -17.787 -7.1877 0 1.53
+
+BondBond13 Coeffs
+
+1 0.8743 1.0982 1.501
+2 -6.2741 1.417 1.0982
+3 2.5085 1.417 1.501
+4 53 1.417 1.417
+5 -1.7077 1.0982 1.0982
+6 0 1.417 1.0883
+7 0 1.417 1.34
+8 0 1.501 1.0883
+9 0 1.0883 1.0883
+10 0.8743 1.0982 1.501
+11 2.5085 1.417 1.501
+12 -3.4826 1.417 1.101
+13 0 1.417 1.53
+14 0 1.501 1.101
+15 0 1.101 1.101
+16 0 1.53 1.101
+17 0 1.501 1.53
+18 0 1.101 1.53
+19 0 1.53 1.53
+20 0.8743 1.0982 1.501
+21 2.5085 1.417 1.501
+22 -3.4826 1.417 1.101
+23 0 1.417 1.53
+24 0 1.501 1.101
+25 0 1.501 1.53
+26 0 1.101 1.101
+27 0 1.101 1.53
+28 0 1.53 1.501
+29 0 1.53 1.101
+30 0 1.53 1.53
+31 0 1.101 1.501
+32 0 1.101 1.101
+33 0 1.101 1.53
+34 0 1.53 1.501
+35 0 1.53 1.101
+36 0 1.53 1.53
+
+AngleTorsion Coeffs
+
+1 0 3.4601 0 0 -0.1242 0 117.94 120.05
+2 0 2.5014 0 0 2.7147 0 118.9 117.94
+3 0 3.8987 0 0 -4.4683 0 118.9 120.05
+4 1.9767 1.0239 0 1.9767 1.0239 0 118.9 118.9
+5 0 2.4501 0 0 2.4501 0 117.94 117.94
+6 0 0 0 0 0 0 120.05 111
+7 0 0 0 0 0 0 120.05 108.4
+8 0 0 0 0 0 0 108.4 124.88
+9 -1.8911 3.254 0 -1.8911 3.254 0 124.88 124.88
+10 0 3.4601 0 0 -0.1242 0 117.94 120.05
+11 0 3.8987 0 0 -4.4683 0 118.9 120.05
+12 0.2251 0.6548 0.1237 4.6266 0.1632 0.0461 120.05 111
+13 0 0 0 0 0 0 120.05 108.4
+14 0 0 0 0 0 0 108.4 110.77
+15 -0.8085 0.5569 -0.2466 -0.8085 0.5569 -0.2466 110.77 110.77
+16 -0.2454 0 -0.1136 0.3113 0.4516 -0.1988 112.67 110.77
+17 0 0 0 0 0 0 108.4 112.67
+18 0.3113 0.4516 -0.1988 -0.2454 0 -0.1136 110.77 112.67
+19 0.3886 -0.3139 0.1389 0.3886 -0.3139 0.1389 112.67 112.67
+20 0 3.4601 0 0 -0.1242 0 117.94 120.05
+21 0 3.8987 0 0 -4.4683 0 118.9 120.05
+22 0.2251 0.6548 0.1237 4.6266 0.1632 0.0461 120.05 111
+23 0 0 0 0 0 0 120.05 108.4
+24 0 0 0 0 0 0 108.4 110.77
+25 0 0 0 0 0 0 108.4 112.67
+26 -0.8085 0.5569 -0.2466 -0.8085 0.5569 -0.2466 110.77 110.77
+27 0.3113 0.4516 -0.1988 -0.2454 0 -0.1136 110.77 112.67
+28 0 0 0 0 0 0 112.67 108.4
+29 -0.2454 0 -0.1136 0.3113 0.4516 -0.1988 112.67 110.77
+30 0.3886 -0.3139 0.1389 0.3886 -0.3139 0.1389 112.67 112.67
+31 0 0 0 0 0 0 110.77 108.4
+32 -0.8085 0.5569 -0.2466 -0.8085 0.5569 -0.2466 110.77 110.77
+33 0.3113 0.4516 -0.1988 -0.2454 0 -0.1136 110.77 112.67
+34 0 0 0 0 0 0 112.67 108.4
+35 -0.2454 0 -0.1136 0.3113 0.4516 -0.1988 112.67 110.77
+36 0.3886 -0.3139 0.1389 0.3886 -0.3139 0.1389 112.67 112.67
+
+Improper Coeffs # class2
+
+1 4.8912 0
+2 7.8153 0
+3 0 0
+4 2.8561 0
+5 7.8153 0
+6 0 0
+7 0 0
+8 7.8153 0
+9 0 0
+
+AngleAngle Coeffs
+
+1 0 0 0 118.9 117.94 117.94
+2 0 0 0 118.9 120.05 120.05
+3 0 0 0 111 124.88 108.4
+4 0 0 0 115.49 124.88 124.88
+5 0 0 0 118.9 120.05 120.05
+6 0 0 0 107.66 110.77 110.77
+7 0 0 0 111 110.77 108.4
+8 0 0 0 118.9 120.05 120.05
+9 0 0 0 111 110.77 108.4
+
+Atoms # full
+
+40602 2538 2 1.2880000000000000e-01 3.3609401967585955e+00 4.4067042595247594e+00 1.7652703015153694e+01 0 1 -1
+111366 6961 2 1.2370000000000000e-01 2.5287450867535228e+00 3.4595752969959102e+00 5.5197750474116489e+00 0 0 0
+111365 6961 1 -1.2900000000000000e-01 2.2477552210789034e+00 4.1940380679220048e+00 6.2531010916436118e+00 0 0 0
+111364 6961 3 -1.8200000000000001e-02 4.6534606713809783e+00 4.0872493335204627e+00 6.6406706800933657e+00 0 0 0
+111373 6961 2 5.1600000000000000e-02 4.7065862756318362e+00 3.1388066541018711e+00 7.1483388517476536e+00 0 0 0
+107224 6702 2 1.4030000000000001e-01 4.3747823735813256e+00 6.6777036283374303e+00 1.8126826734147052e+01 1 0 -1
+107223 6702 1 -1.7340000000000000e-01 3.3819489105921479e+00 7.1051571061898393e+00 1.9476793708830493e+00 1 0 0
+40599 2538 1 -1.7340000000000000e-01 1.7897991574638404e+01 3.7109360216682128e+00 1.7502909648810935e+01 -1 1 -1
+40600 2538 2 1.4030000000000001e-01 1.7761669662555619e+01 4.2961185209612616e+00 1.6631333893439564e+01 -1 1 -1
+41356 2585 2 1.4030000000000001e-01 5.9156631480771527e+00 1.0478394367195754e+01 8.3875585503933614e+00 0 1 1
+107222 6702 2 1.2370000000000000e-01 3.6715671896819093e+00 6.6024431064152225e+00 4.0510480747089339e+00 1 0 0
+40597 2538 1 -1.2900000000000000e-01 1.6955889539378134e+01 2.7829267678458436e+00 1.7962156465993502e+01 -1 1 -1
+40598 2538 2 1.2370000000000000e-01 1.5942867471528109e+01 2.6001610609395129e+00 1.7514042185813334e+01 -1 1 -1
+111367 6961 1 -1.7340000000000000e-01 1.7495745294265745e+01 4.6877369518904199e+00 6.4410612543144401e+00 -1 0 0
+111368 6961 2 1.4030000000000001e-01 1.6684286240405104e+01 4.1990863000633958e+00 5.8354395711206708e+00 -1 0 0
+188723 11796 1 2.6599999999999999e-02 1.2794445780805036e+01 4.8153878517226305e+00 2.8366538199234208e+00 0 2 0
+188726 11796 2 1.2370000000000000e-01 1.1307621657711582e+01 6.0648965933332004e+00 3.8852435658831435e+00 0 2 0
+188736 11796 2 3.5400000000000001e-02 1.0942691320187310e+01 2.8660493976532067e+00 3.6592390992421064e+00 0 2 0
+41360 2585 2 3.5400000000000001e-02 8.5172276274172862e+00 6.6772583543717241e+00 4.6258553568569134e+00 0 1 1
+111375 6961 2 3.5400000000000001e-02 5.1160863341697551e+00 3.1557498302500560e+00 4.8281676316055648e+00 0 0 0
+41346 2585 2 1.2370000000000000e-01 5.2803967127973479e+00 8.3738447196883783e+00 7.1113512659172891e+00 0 1 1
+41359 2585 2 3.5400000000000001e-02 7.0805979681390792e+00 5.5480506789621362e+00 4.1107885168230087e+00 0 1 1
+188725 11796 1 -1.2900000000000000e-01 1.2408079703909788e+01 5.7336269491919198e+00 3.7349335138244366e+00 0 2 0
+188729 11796 1 -1.1340000000000000e-01 1.4703709315154203e+01 6.4426943408965585e+00 4.1248777022829106e+00 0 2 0
+188727 11796 1 -1.7340000000000000e-01 1.3333557950108901e+01 6.5153791380185462e+00 4.4423297264254140e+00 0 2 0
+20158 1260 4 -6.9599999999999995e-02 1.3854962450513005e+01 1.7558158358296474e+01 6.0985091703687049e+00 -1 0 0
+20160 1260 2 3.5400000000000001e-02 1.2918711114031632e+01 1.7814458238382855e+01 5.7425825995785100e+00 -1 0 0
+20148 1260 3 -1.8200000000000001e-02 1.4873275896132416e+01 1.9084526466056861e+00 6.2828310713786459e+00 -1 1 0
+188728 11796 2 1.4030000000000001e-01 1.2869094657766244e+01 7.2098256594356229e+00 5.1535483885770113e+00 0 2 0
+20157 1260 2 5.1600000000000000e-02 1.5744980877568938e+01 1.8128011607429414e+01 6.7646315462574487e+00 -1 0 0
+188730 11796 2 1.2880000000000000e-01 1.5413809605693494e+01 7.1215792753373064e+00 4.6045554272301157e+00 0 2 0
+41355 2585 1 -1.7340000000000000e-01 6.6267551131373832e+00 1.0027638223239382e+01 7.7182869694089700e+00 0 1 1
+108389 6775 1 -1.2900000000000000e-01 7.0133566713184710e+00 1.1863505693448808e+01 3.0100421026579314e+00 0 0 1
+41327 2583 2 3.5400000000000001e-02 1.8025151826355874e+01 1.5680601368303122e+01 5.4799644916431216e+00 -1 0 1
+41326 2583 4 -6.9599999999999995e-02 2.5704711045235697e+00 1.5575122040069637e+01 5.4065270673139985e+00 0 0 1
+41328 2583 2 3.5400000000000001e-02 2.9997429592273956e+00 1.4685386861680085e+01 4.9759285267091098e+00 0 0 1
+108390 6775 2 1.2370000000000000e-01 6.9836751439323628e+00 1.0846526933351964e+01 3.4784800869303512e+00 0 0 1
+108391 6775 1 -1.7340000000000000e-01 6.8087445208925681e+00 1.3003486840032258e+01 3.7761607679871307e+00 0 0 1
+41353 2585 1 -1.1340000000000000e-01 7.8573883366696089e+00 1.0627162455737775e+01 7.3859043657940493e+00 0 1 1
+41351 2585 1 -1.7340000000000000e-01 8.6981014387032438e+00 1.0201900398046481e+01 6.3533593539380941e+00 0 1 1
+107221 6702 1 -1.2900000000000000e-01 3.1758840802872599e+00 7.1678179098614141e+00 3.2854613341877181e+00 1 0 0
+107219 6702 1 2.6599999999999999e-02 2.0748866096178964e+00 7.9461425898687992e+00 3.7753484383081610e+00 1 0 0
+107232 6702 2 3.5400000000000001e-02 1.7648721744994319e+01 1.0103122840036239e+01 4.7798275704340671e+00 0 0 0
+108392 6775 2 1.4030000000000001e-01 6.3995996961287833e+00 1.2731343992705472e+01 4.7487947462305771e+00 0 0 1
+41354 2585 2 1.2880000000000000e-01 8.1692015925027768e+00 1.1493632013886158e+01 7.9544056830537269e+00 0 1 1
+69384 4337 2 1.4030000000000001e-01 1.2507275934560081e+01 9.2207766533505673e+00 7.3246588169625140e+00 0 1 1
+41345 2585 1 -1.2900000000000000e-01 6.3195931272585391e+00 8.8692855685170500e+00 6.9676292860762716e+00 0 1 1
+41347 2585 1 2.6599999999999999e-02 7.0702614826346544e+00 8.4743337141795241e+00 5.8547594819621187e+00 0 1 1
+41357 2585 2 5.1600000000000000e-02 5.5016574767426301e+00 7.4706228475946332e+00 4.6418688283853040e+00 0 1 1
+41358 2585 4 -6.9599999999999995e-02 7.4737228534116324e+00 6.4899475004190332e+00 4.5180419190464987e+00 0 1 1
+41348 2585 3 -1.8200000000000001e-02 6.6062265756796981e+00 7.5175310927852941e+00 4.7713364455934872e+00 0 1 1
+41349 2585 1 -1.2900000000000000e-01 8.2441070780215853e+00 9.1470326477281088e+00 5.5160478380515663e+00 0 1 1
+41350 2585 2 1.2370000000000000e-01 8.8604728777063109e+00 8.8987664442336971e+00 4.6534059979647555e+00 0 1 1
+69382 4337 2 1.2370000000000000e-01 1.2037994406712755e+01 1.1438693923544918e+01 6.6961121531796941e+00 0 1 1
+108400 6775 2 3.5400000000000001e-02 9.4434155310323717e+00 1.0779831061177935e+01 1.7308995238384654e+01 0 0 0
+107220 6702 3 -1.8200000000000001e-02 1.8511457716678090e+00 8.2067707732304527e+00 5.1884876711911101e+00 1 0 0
+107229 6702 2 5.1600000000000000e-02 2.3229493400774794e+00 7.4350000572163024e+00 5.7660915302438154e+00 1 0 0
+65551 4097 2 3.5400000000000001e-02 1.8064251645249804e+01 1.2963289176981608e+01 5.4842508762037534e+00 0 0 0
+107230 6702 4 -6.9599999999999995e-02 1.8228240499767143e+00 9.5598483570416146e+00 5.3379848839478363e+00 1 0 0
+107231 6702 2 3.5400000000000001e-02 2.5955528839673567e+00 1.0106560918497969e+01 5.9757939945393543e+00 1 0 0
+148088 9256 2 1.4030000000000001e-01 1.1762030797439378e+01 1.1693785579271282e+01 4.4638937261529295e+00 0 0 1
+148090 9256 2 1.2880000000000000e-01 1.4099636105822544e+01 1.2327433192859456e+01 4.0225129791140546e+00 0 0 1
+148087 9256 1 -1.7340000000000000e-01 1.1979028403125646e+01 1.2633659013855903e+01 3.9376689709327510e+00 0 0 1
+148089 9256 1 -1.1340000000000000e-01 1.3280445370302795e+01 1.3014281950759539e+01 3.7240436336308522e+00 0 0 1
+40604 2538 2 1.4030000000000001e-01 4.0250594599637042e+00 2.7167655841048841e+00 2.9671010133230107e+00 0 1 0
+40603 2538 1 -1.7340000000000000e-01 2.9715213077297893e+00 2.8387700187263976e+00 2.6496011286331638e+00 0 1 0
+40601 2538 1 -1.1340000000000000e-01 2.6436717484652190e+00 3.7161784029911313e+00 1.8118381074995945e+01 0 1 -1
+41314 2583 2 1.2370000000000000e-01 6.1655197061189391e+00 1.6429093178302054e+01 5.2634660717283719e+00 0 0 1
+40594 2538 2 1.2370000000000000e-01 2.3106168557244260e+00 1.7574548555023910e+01 3.6114577101537471e+00 0 0 0
+40593 2538 1 -1.2900000000000000e-01 2.0192147877585960e+00 1.8971927062618956e+00 2.9622660579545812e+00 0 1 0
+40595 2538 1 2.6599999999999999e-02 1.7291779626197169e+01 1.8599578675608062e+00 2.3904540665275351e+00 -1 1 0
+41316 2583 3 -1.8200000000000001e-02 3.4212771996318807e+00 1.6520636908143409e+01 5.7386914040715045e+00 0 0 1
+108393 6775 1 -1.1340000000000000e-01 6.6499881779146026e+00 1.4259117018515532e+01 3.0584002634074370e+00 0 0 1
+108394 6775 2 1.2880000000000000e-01 6.1964048810474663e+00 1.5224374946621646e+01 3.4935080873808033e+00 0 0 1
+41313 2583 1 -1.2900000000000000e-01 5.8827015465618375e+00 1.5865587321912503e+01 6.1431437364315027e+00 0 0 1
+108395 6775 1 -1.7340000000000000e-01 7.1097892289262878e+00 1.4350613194723607e+01 1.7470717630973838e+00 0 0 1
+108396 6775 2 1.4030000000000001e-01 6.9903337205295530e+00 1.5224750453488815e+01 1.7644673266894884e+01 0 0 0
+148096 9256 2 3.5400000000000001e-02 1.0752335098968890e+01 1.7218144880618222e+01 3.5500932917187793e+00 0 0 1
+148095 9256 2 3.5400000000000001e-02 1.0359671951490158e+01 1.7522361890554926e+01 1.8218190609141388e+01 0 0 0
+148094 9256 4 -6.9599999999999995e-02 1.0424710670624640e+01 1.6814346694132169e+01 2.5033401382466907e+00 0 0 1
+40608 2538 2 3.5400000000000001e-02 1.6659811918729936e+01 1.5824060712051581e+01 1.7856371334575492e+01 -1 0 -1
+40607 2538 2 3.5400000000000001e-02 1.7068652155067138e+01 1.5312925579361091e+01 3.0807371681198257e+00 -1 0 0
+40605 2538 2 5.1600000000000000e-02 1.6526035362495449e+01 1.7247373568378688e+01 3.9930857730966038e+00 -1 0 0
+40606 2538 4 -6.9599999999999995e-02 1.6690607482896461e+01 1.6080613680347298e+01 2.3857659847545456e+00 -1 0 0
+40596 2538 3 -1.8200000000000001e-02 1.6426787646343708e+01 1.7312070439154404e+01 2.8996717936988108e+00 -1 0 0
+148093 9256 2 5.1600000000000000e-02 9.7084895751228579e+00 1.5206903985177071e+01 1.7929781969852563e+01 0 0 0
+148084 9256 3 -1.8200000000000001e-02 1.0037261004726227e+01 1.5553915685523059e+01 2.3820334888623931e+00 0 0 1
+148086 9256 2 1.2370000000000000e-01 9.8538164885967223e+00 1.3122374408103786e+01 3.7386171094020604e+00 0 0 1
+148085 9256 1 -1.2900000000000000e-01 1.0915815138831038e+01 1.3468093486840369e+01 3.5699140224340207e+00 0 0 1
+148083 9256 1 2.6599999999999999e-02 1.1127532644580404e+01 1.4687297959113698e+01 2.8927936993164374e+00 0 0 1
+20159 1260 2 3.5400000000000001e-02 1.3926944139015212e+01 1.6557995485351512e+01 6.3887938420848460e+00 -1 0 0
+148081 9256 1 -1.2900000000000000e-01 1.2492118565628704e+01 1.4979897838545488e+01 2.6436586008146001e+00 0 0 1
+148091 9256 1 -1.7340000000000000e-01 1.3530995074380009e+01 1.4213674981946097e+01 3.1123918617731032e+00 0 0 1
+148092 9256 2 1.4030000000000001e-01 1.4623143267492075e+01 1.4535351487479833e+01 2.9973381899213969e+00 0 0 1
+148082 9256 2 1.2370000000000000e-01 1.2782518572888232e+01 1.5903925404629245e+01 2.1259561679744268e+00 0 0 1
+111363 6961 1 2.6599999999999999e-02 3.3251830344800792e+00 4.7485757568569973e+00 6.9113558564667130e+00 0 0 0
+111369 6961 1 -1.1340000000000000e-01 1.7274039940012614e+01 5.7584093577092439e+00 7.2910114349614759e+00 -1 0 0
+111371 6961 1 -1.7340000000000000e-01 1.8312835551908693e+00 6.2232465111479911e+00 8.1114550764182880e+00 0 0 0
+111372 6961 2 1.4030000000000001e-01 1.8184339590637627e+01 7.0555999825672302e+00 8.7298916963317161e+00 -1 0 0
+111362 6961 2 1.2370000000000000e-01 3.9289971116618676e+00 6.1185293409164041e+00 8.4690798450222537e+00 0 0 0
+111361 6961 1 -1.2900000000000000e-01 3.1341751882158055e+00 5.7178553096834150e+00 7.8335342183333747e+00 0 0 0
+43056 2691 2 3.5400000000000001e-02 7.3303403250812371e+00 4.9319934647318124e+00 1.0162980877015160e+01 0 1 0
+195807 12238 2 3.5400000000000001e-02 3.1236778954925324e+00 2.4452125090877095e+00 1.1400842410014139e+01 2 2 1
+195808 12238 2 3.5400000000000001e-02 2.0398723702262984e+00 2.7431930858712024e+00 9.8739778618202809e+00 2 2 1
+195806 12238 4 -6.9599999999999995e-02 2.7616033282961303e+00 2.1041460428116832e+00 1.0438344594844656e+01 2 2 1
+43041 2691 1 -1.2900000000000000e-01 6.3733220978070637e+00 4.4203611180779721e+00 1.3517632502395033e+01 0 1 0
+43042 2691 2 1.2370000000000000e-01 5.6489085759325306e+00 4.6150266566474185e+00 1.2719368891868069e+01 0 1 0
+43043 2691 1 2.6599999999999999e-02 7.7212675306349068e+00 4.4431128372749367e+00 1.3317902516492849e+01 0 1 0
+43055 2691 2 3.5400000000000001e-02 7.5569470416398614e+00 3.2145118903989083e+00 1.1016915970754408e+01 0 1 0
+43044 2691 3 -1.8200000000000001e-02 8.3614898082720455e+00 4.8362903846004572e+00 1.1991757246671359e+01 0 1 0
+43054 2691 4 -6.9599999999999995e-02 7.6774180518032056e+00 4.2978431680872893e+00 1.1030363927900430e+01 0 1 0
+150156 9385 2 1.4030000000000001e-01 6.9383382514086422e+00 1.7437119221893461e+01 9.1021782978174173e+00 1 1 -1
+150155 9385 1 -1.7340000000000000e-01 8.0221029992533950e+00 1.7834769921916759e+01 9.1631290455798435e+00 1 1 -1
+111374 6961 4 -6.9599999999999995e-02 4.7656438943583348e+00 4.0654137347449968e+00 5.3046612893154670e+00 0 0 0
+111376 6961 2 3.5400000000000001e-02 4.7963400068324304e+00 4.9709930653728112e+00 4.7188309040401490e+00 0 0 0
+150154 9385 2 1.2880000000000000e-01 8.1369513264721434e+00 2.0263974595218754e+00 7.1494567261751296e+00 1 2 -1
+150153 9385 1 -1.1340000000000000e-01 8.6608899042584291e+00 1.8888977494944439e+00 8.0784138030671233e+00 1 2 -1
+150151 9385 1 -1.7340000000000000e-01 1.0018867708590742e+01 2.2567570866800981e+00 8.0675401866229777e+00 1 2 -1
+43046 2691 2 1.2370000000000000e-01 9.6303640603892067e+00 4.2459259032489243e+00 1.4177008871757124e+01 0 1 0
+43053 2691 2 5.1600000000000000e-02 8.6562690567036107e+00 5.8993116724868262e+00 1.2016505189049507e+01 0 1 0
+20146 1260 2 1.2370000000000000e-01 1.2925937029105093e+01 3.6154428198559656e+00 5.6919997433898892e+00 -1 1 0
+111370 6961 2 1.2880000000000000e-01 1.6276841578468378e+01 6.1680557812999490e+00 7.4004318736634556e+00 -1 0 0
+20155 1260 1 -1.7340000000000000e-01 1.2881099375913237e+01 4.8772017009451076e+00 7.4144207441793428e+00 -1 1 0
+20145 1260 1 -1.2900000000000000e-01 1.3325636094702979e+01 3.8506374415214806e+00 6.6335193494241205e+00 -1 1 0
+20149 1260 1 -1.2900000000000000e-01 1.4803237282058465e+01 3.1721920915819846e+00 8.3854646584058017e+00 -1 1 0
+20153 1260 1 -1.1340000000000000e-01 1.3361990235494616e+01 5.0962782885434859e+00 8.6895105180563945e+00 -1 1 0
+20154 1260 2 1.2880000000000000e-01 1.3027697793413543e+01 5.9629979486703641e+00 9.2441017743763290e+00 -1 1 0
+20151 1260 1 -1.7340000000000000e-01 1.4380189422775935e+01 4.2223572958105908e+00 9.1399321348841838e+00 -1 1 0
+20147 1260 1 2.6599999999999999e-02 1.4304259480768936e+01 3.0225224973374898e+00 7.0840404864415598e+00 -1 1 0
+20152 1260 2 1.4030000000000001e-01 1.5000038710755923e+01 4.4820227233013270e+00 9.9846869651675494e+00 -1 1 0
+20150 1260 2 1.2370000000000000e-01 1.5639941935305668e+01 2.5539512931406918e+00 8.7033169971457358e+00 -1 1 0
+20156 1260 2 1.4030000000000001e-01 1.2081029146239729e+01 5.5619230729709805e+00 7.0240622755420876e+00 -1 1 0
+150152 9385 2 1.4030000000000001e-01 1.0398677710841509e+01 2.6132174552595142e+00 7.1458602364708215e+00 1 2 -1
+107926 6746 2 1.2370000000000000e-01 5.0564645669299786e+00 9.8206736952581757e+00 1.2050756067767006e+01 1 0 0
+65549 4097 2 5.1600000000000000e-02 2.0092237695336150e+00 1.3647733560513613e+01 7.8060964087143585e+00 1 0 0
+41318 2583 2 1.2370000000000000e-01 3.2889581470504385e+00 1.5395406831499587e+01 8.1227148731915086e+00 0 0 1
+41320 2583 2 1.4030000000000001e-01 4.9623722046803023e+00 1.4094953957382288e+01 9.5590806118604554e+00 0 0 1
+107925 6746 1 -1.2900000000000000e-01 6.0634867066543432e+00 9.5484282841539585e+00 1.2296230810664806e+01 1 0 0
+107928 6746 2 1.4030000000000001e-01 6.6741988665111220e+00 9.2499811531291734e+00 1.0308875349648671e+01 1 0 0
+107927 6746 1 -1.7340000000000000e-01 6.9187781699197348e+00 9.1217664477662801e+00 1.1322711921884700e+01 1 0 0
+41352 2585 2 1.4030000000000001e-01 9.6017776350949440e+00 1.0818988642106115e+01 5.9796717383331348e+00 0 1 1
+107931 6746 1 -1.7340000000000000e-01 8.8159008450723420e+00 9.2215476294842276e+00 1.2939060135330434e+01 1 0 0
+107930 6746 2 1.2880000000000000e-01 9.1151905965455686e+00 8.8340925395314045e+00 1.0892578555618352e+01 1 0 0
+107929 6746 1 -1.1340000000000000e-01 8.3352274204594607e+00 8.9222475622725810e+00 1.1632822526543650e+01 1 0 0
+69386 4337 2 1.2880000000000000e-01 1.2475432366972534e+01 8.4535388534671192e+00 9.8010997231828423e+00 0 1 1
+69385 4337 1 -1.1340000000000000e-01 1.2183961606338126e+01 9.5133083783428809e+00 9.5150186186307018e+00 0 1 1
+69388 4337 2 1.4030000000000001e-01 1.1821311669543274e+01 1.0271543753950064e+01 1.1515153882968731e+01 0 1 1
+69387 4337 1 -1.7340000000000000e-01 1.1871110594374576e+01 1.0483008707917794e+01 1.0444919114342293e+01 0 1 1
+69379 4337 1 2.6599999999999999e-02 1.1857971549146844e+01 1.2184042292015063e+01 8.6614659076276297e+00 0 1 1
+69378 4337 2 1.2370000000000000e-01 1.1317141396250484e+01 1.2573319300708581e+01 1.0672328887070607e+01 0 1 1
+69377 4337 1 -1.2900000000000000e-01 1.1722235923015901e+01 1.1839046459537844e+01 1.0007231464783189e+01 0 1 1
+69383 4337 1 -1.7340000000000000e-01 1.2261182546118910e+01 9.8671789721187935e+00 8.1443688661455607e+00 0 1 1
+69381 4337 1 -1.2900000000000000e-01 1.2014141664603619e+01 1.1182218859954364e+01 7.7458662139445638e+00 0 1 1
+107932 6746 2 1.4030000000000001e-01 9.8995913535996376e+00 9.2237698067897202e+00 1.3177685392622811e+01 1 0 0
+65550 4097 4 -6.9599999999999995e-02 1.7458318049986850e+01 1.2626772124497204e+01 6.3525170639926802e+00 0 0 0
+65552 4097 2 3.5400000000000001e-02 1.6665164338293771e+01 1.1937651629402151e+01 6.0235296511383511e+00 0 0 0
+65540 4097 3 -1.8200000000000001e-02 1.7646955427571115e+01 1.3029929723406916e+01 7.5909570929344019e+00 0 0 0
+69389 4337 2 5.1600000000000000e-02 1.2265189992326546e+01 1.4290742881741917e+01 8.4069171939395204e+00 0 1 1
+69380 4337 3 -1.8200000000000001e-02 1.1555358586339914e+01 1.3518810236412984e+01 8.2012594227094588e+00 0 1 1
+65542 4097 2 1.2370000000000000e-01 1.5690440868314797e+01 1.1580697705070271e+01 8.7879736220365245e+00 0 0 0
+65539 4097 1 2.6599999999999999e-02 1.7811281801694086e+01 1.1774589953178271e+01 8.4290535902248998e+00 0 0 0
+65543 4097 1 -1.7340000000000000e-01 1.6690991873171978e+01 1.0038282867815722e+01 9.7296121527578130e+00 0 0 0
+65541 4097 1 -1.2900000000000000e-01 1.6665595158679011e+01 1.1138183814109587e+01 8.9474424737658609e+00 0 0 0
+65544 4097 2 1.4030000000000001e-01 1.5750449560114141e+01 9.7712770926962200e+00 1.0179218454081040e+01 0 0 0
+65545 4097 1 -1.1340000000000000e-01 1.7917505972636960e+01 9.5217739132725718e+00 1.0138662254181785e+01 0 0 0
+65547 4097 1 -1.7340000000000000e-01 2.4985890098324282e+00 1.0025642898562477e+01 9.4176492999025960e+00 1 0 0
+65537 4097 1 -1.2900000000000000e-01 2.5037460872226416e+00 1.1160633791856982e+01 8.6253692316834503e+00 1 0 0
+65538 4097 2 1.2370000000000000e-01 3.4886865157086326e+00 1.1651865642923802e+01 8.2660122736916346e+00 1 0 0
+41340 2584 2 1.4030000000000001e-01 1.6345251447958152e+01 1.0581077581118659e+01 1.2940303448103140e+01 -1 0 -1
+101772 6361 2 1.4030000000000001e-01 1.2061325019095884e+01 8.2414580626526899e+00 1.2746827572696125e+01 0 0 0
+41325 2583 2 5.1600000000000000e-02 3.2807546908780347e+00 1.7513301250682424e+01 6.1969284929278405e+00 0 0 1
+41319 2583 1 -1.7340000000000000e-01 5.1667966032079615e+00 1.4504958612304554e+01 8.4899418683521528e+00 0 0 1
+41317 2583 1 -1.2900000000000000e-01 4.2709331569515046e+00 1.5171166486203983e+01 7.7097533336229027e+00 0 0 1
+41315 2583 1 2.6599999999999999e-02 4.5302208176436256e+00 1.5822738162287587e+01 6.5065100708848096e+00 0 0 1
+195805 12238 2 5.1600000000000000e-02 3.4789342586146521e+00 1.6756199991066900e+01 1.0774146846249749e+01 2 1 1
+195796 12238 3 -1.8200000000000001e-02 2.9396670397560705e+00 1.7364763999896855e+01 1.0037973077323782e+01 2 1 1
+195794 12238 2 1.2370000000000000e-01 1.8172149588585661e+01 1.5879196184308281e+01 1.1942665785926817e+01 1 1 1
+195795 12238 1 2.6599999999999999e-02 1.8189960246829628e+01 1.6557402820682235e+01 9.8951910057012231e+00 1 1 1
+150146 9385 2 1.2370000000000000e-01 8.3229454006835439e+00 1.7106284894415296e+01 1.1175280806134634e+01 1 1 -1
+41321 2583 1 -1.1340000000000000e-01 6.4886610422833844e+00 1.4417282047103134e+01 8.0372824966757364e+00 0 0 1
+41324 2583 2 1.4030000000000001e-01 7.8692334894297309e+00 1.5217531732265087e+01 6.5759412635528571e+00 0 0 1
+41323 2583 1 -1.7340000000000000e-01 6.8035306315514008e+00 1.5119554474942500e+01 6.8678298859343405e+00 0 0 1
+41322 2583 2 1.2880000000000000e-01 7.2031050513797865e+00 1.3866464011687089e+01 8.6968935609528657e+00 0 0 1
+69392 4337 2 3.5400000000000001e-02 9.8208712510125142e+00 1.2837136804877213e+01 7.2879452773642148e+00 0 1 1
+69390 4337 4 -6.9599999999999995e-02 1.0594300370390499e+01 1.3660921113381333e+01 7.2955800346017856e+00 0 1 1
+150145 9385 1 -1.2900000000000000e-01 8.7817019328088897e+00 1.7596288757726505e+01 1.0343829436148329e+01 1 1 -1
+150148 9385 3 -1.8200000000000001e-02 1.0884985120753306e+01 1.7878920372459348e+01 1.1622690956049924e+01 1 1 -1
+150147 9385 1 2.6599999999999999e-02 1.0108201636057926e+01 1.7931699486130150e+01 1.0276792278149461e+01 1 1 -1
+150158 9385 4 -6.9599999999999995e-02 1.1231503999641122e+01 2.5211948038212908e+00 1.2157003840952251e+01 1 2 -1
+150157 9385 2 5.1600000000000000e-02 1.1450691871401704e+01 1.6961509499627816e+01 1.1846193381515082e+01 1 1 -1
+150149 9385 1 -1.2900000000000000e-01 1.0685137286262131e+01 2.1085945763903835e+00 9.2228119301870422e+00 1 2 -1
+150150 9385 2 1.2370000000000000e-01 1.1778864770299412e+01 2.2382910653089674e+00 9.2517160457463650e+00 1 2 -1
+69391 4337 2 3.5400000000000001e-02 1.0456151079379346e+01 1.4488060316916382e+01 6.5466258733581748e+00 0 1 1
+195793 12238 1 -1.2900000000000000e-01 1.7686648268709941e+01 1.5878855746393022e+01 1.0990461704653441e+01 1 1 1
+195803 12238 1 -1.7340000000000000e-01 1.6473035640090831e+01 1.5137365973601687e+01 1.0856129998973106e+01 1 1 1
+195802 12238 2 1.2880000000000000e-01 1.4746861929711587e+01 1.4655317568086621e+01 9.6616665472576706e+00 1 1 1
+195801 12238 1 -1.1340000000000000e-01 1.5796051233623190e+01 1.5136832380446570e+01 9.6813454294041570e+00 1 1 1
+195800 12238 2 1.4030000000000001e-01 1.5800095499624135e+01 1.5655928659699169e+01 7.5461924170663712e+00 1 1 1
+195797 12238 1 -1.2900000000000000e-01 1.7513784072987086e+01 1.6544830312871746e+01 8.6950467616507989e+00 1 1 1
+195799 12238 1 -1.7340000000000000e-01 1.6338499065166612e+01 1.5829599854108311e+01 8.5770220966138417e+00 1 1 1
+195798 12238 2 1.2370000000000000e-01 1.7934224097607796e+01 1.7144884480762489e+01 7.8707368838248923e+00 1 1 1
+195804 12238 2 1.4030000000000001e-01 1.6175858894436228e+01 1.4595879081941767e+01 1.1818036137280366e+01 1 1 1
+107226 6702 2 1.2880000000000000e-01 2.6931705146437825e+00 7.4528536578048046e+00 1.6401480417559661e+01 1 0 -1
+107225 6702 1 -1.1340000000000000e-01 2.5412082692488589e+00 7.6946064706658266e+00 1.7479029549052996e+01 1 0 -1
+43050 2691 2 1.2880000000000000e-01 6.3901733561307177e+00 3.8729885166252385e+00 1.6857663943247552e+01 0 1 0
+43049 2691 1 -1.1340000000000000e-01 6.8639644760880891e+00 3.9977844737634753e+00 1.5864759086802867e+01 0 1 0
+43051 2691 1 -1.7340000000000000e-01 5.8836925448396897e+00 4.2197213883127613e+00 1.4819642488545631e+01 0 1 0
+43052 2691 2 1.4030000000000001e-01 4.8445169787238385e+00 4.2666621101197810e+00 1.4993271083516717e+01 0 1 0
+160474 10030 2 1.2880000000000000e-01 4.9714511327777986e+00 1.5116752517331660e+01 1.2597642370797514e+01 1 0 0
+43048 2691 2 1.4030000000000001e-01 8.8893103329068470e+00 3.8888260173570122e+00 1.6459057949661215e+01 0 1 0
+188724 11796 3 -1.8200000000000001e-02 1.1688421678176432e+01 4.0960510248164450e+00 2.0909014529829917e+00 0 2 0
+188733 11796 2 5.1600000000000000e-02 1.1375250276290704e+01 4.8331916161112147e+00 1.7811967196437259e+01 0 2 -1
+188734 11796 4 -6.9599999999999995e-02 1.0736515393208268e+01 3.6250109566200721e+00 2.9002084374308392e+00 0 2 0
+188735 11796 2 3.5400000000000001e-02 9.7000686220121803e+00 3.9030555037638384e+00 2.8330595968939667e+00 0 2 0
+43047 2691 1 -1.7340000000000000e-01 8.2155679119992957e+00 3.9284586980885070e+00 1.5659681814868401e+01 0 1 0
+43045 2691 1 -1.2900000000000000e-01 8.5871632440144943e+00 4.1176139134649334e+00 1.4359425816463261e+01 0 1 0
+3053 191 2 5.1600000000000000e-02 1.4131209452224061e+01 3.7205834284925237e+00 1.2807104549015305e+01 -1 1 -1
+188722 11796 2 1.2370000000000000e-01 1.4402813832794054e+01 4.0507183151628627e+00 1.8177214408032896e+01 0 2 -1
+188721 11796 1 -1.2900000000000000e-01 1.4132746768243644e+01 4.7192568251348419e+00 2.5172268148938008e+00 0 2 0
+3055 191 2 3.5400000000000001e-02 1.2647552554478004e+01 4.1066728934311065e+00 1.4626327349760397e+01 -1 1 -1
+3048 191 2 1.4030000000000001e-01 2.1361911246942613e+00 2.0256462695747413e+00 1.3661683245937004e+01 0 1 -1
+188731 11796 1 -1.7340000000000000e-01 1.5082344798334990e+01 5.4339100483828533e+00 3.2040607534203400e+00 0 2 0
+3054 191 4 -6.9599999999999995e-02 1.3634640729991750e+01 3.8573291703607966e+00 1.4918577504339625e+01 -1 1 -1
+3056 191 2 3.5400000000000001e-02 1.3956384462179996e+01 3.9073965418023482e+00 1.5995687294821206e+01 -1 1 -1
+3046 191 2 1.2370000000000000e-01 1.7193526563745138e+01 3.7459889826236981e+00 1.3527506035297845e+01 -1 1 -1
+188732 11796 2 1.4030000000000001e-01 1.6083180459711862e+01 5.2111335470887523e+00 3.0021790482301487e+00 0 2 0
+3044 191 3 -1.8200000000000001e-02 1.4462398230952495e+01 3.7530010030969558e+00 1.3864072205754665e+01 -1 1 -1
+3047 191 1 -1.7340000000000000e-01 1.7647518143872116e+01 1.7688415837286873e+00 1.4069869500933256e+01 -1 1 -1
+3043 191 1 2.6599999999999999e-02 1.5358225536986536e+01 2.5383885112449232e+00 1.4011133084383125e+01 -1 1 -1
+3045 191 1 -1.2900000000000000e-01 1.6698963155322488e+01 2.7814029062226857e+00 1.3817663440342963e+01 -1 1 -1
+101766 6361 2 1.2370000000000000e-01 1.4486305311740852e+01 7.0492572322308868e+00 1.6861792785180214e+01 0 0 0
+101765 6361 1 -1.2900000000000000e-01 1.3952052360271175e+01 7.3593350772883674e+00 1.5958103513676853e+01 0 0 0
+101768 6361 2 1.4030000000000001e-01 1.5598211775798697e+01 6.8332180667355438e+00 1.4649592564383175e+01 0 0 0
+101770 6361 2 1.2880000000000000e-01 1.4413755542349351e+01 7.4347516650250540e+00 1.2552816796988212e+01 0 0 0
+101769 6361 1 -1.1340000000000000e-01 1.3891333488399404e+01 7.5059992680422489e+00 1.3502034253911555e+01 0 0 0
+101767 6361 1 -1.7340000000000000e-01 1.4605101636425838e+01 7.2573358819526579e+00 1.4741222690138107e+01 0 0 0
+107227 6702 1 -1.7340000000000000e-01 1.7883548418980652e+01 8.3514720862484815e+00 1.7898023886448911e+01 0 0 -1
+108387 6775 1 2.6599999999999999e-02 7.3105046605336623e+00 1.2002646672640418e+01 1.8180285553843476e+01 0 0 0
+108397 6775 2 5.1600000000000000e-02 6.4647144372088396e+00 1.0136771332249360e+01 1.7453949180576807e+01 0 0 0
+107217 6702 1 -1.2900000000000000e-01 1.7732828280737948e+01 8.5361463551748038e+00 2.8569355745343277e+00 0 0 0
+107935 6746 2 3.5400000000000001e-02 5.0561509861045302e+00 8.1734324546280099e+00 1.4745872444105991e+01 1 0 0
+107933 6746 2 5.1600000000000000e-02 5.1594105258377665e+00 1.1267260390577270e+01 1.4472801471667175e+01 1 0 0
+107934 6746 4 -6.9599999999999995e-02 4.6169720890872554e+00 9.1871032170689944e+00 1.4737566205819322e+01 1 0 0
+107924 6746 3 -1.8200000000000001e-02 5.4432003856112612e+00 1.0237922103124522e+01 1.4609929127699449e+01 1 0 0
+107923 6746 1 2.6599999999999999e-02 6.4820549290353195e+00 9.7078183298517988e+00 1.3613217549850990e+01 1 0 0
+107228 6702 2 1.4030000000000001e-01 1.7115417491762386e+01 8.7327362751247577e+00 1.7217705089608554e+01 0 0 -1
+107936 6746 2 3.5400000000000001e-02 3.5781383029214346e+00 8.9944694941570749e+00 1.4713627566978687e+01 1 0 0
+160479 10030 2 3.5400000000000001e-02 3.7326685747508552e+00 1.3427274929042056e+01 2.2216548785191739e+00 1 0 1
+107921 6746 1 -1.2900000000000000e-01 7.8562865065307435e+00 9.5957645375673035e+00 1.3851562295909520e+01 1 0 0
+107922 6746 2 1.2370000000000000e-01 8.0995841612996955e+00 9.7313098352338123e+00 1.4939733899172261e+01 1 0 0
+107218 6702 2 1.2370000000000000e-01 1.6835368082721224e+01 9.1131625105569878e+00 3.2255257646648907e+00 0 0 0
+108388 6775 3 -1.8200000000000001e-02 7.3532485484630739e+00 1.0786635947908049e+01 1.7355440619577308e+01 0 0 0
+108399 6775 2 3.5400000000000001e-02 8.6525462867452845e+00 9.1449007932328534e+00 1.7647695780957935e+01 0 0 0
+108398 6775 4 -6.9599999999999995e-02 8.5213713271356717e+00 1.0232558032132358e+01 1.7537403599029407e+01 0 0 0
+101776 6361 2 3.5400000000000001e-02 1.2049684967504803e+01 1.0165869848570868e+01 1.7105430507983492e+01 0 0 0
+101775 6361 2 3.5400000000000001e-02 1.2887489730527209e+01 9.4926640670100220e+00 2.0987313930387570e+00 0 0 1
+101774 6361 4 -6.9599999999999995e-02 1.2305590434143607e+01 9.2071744394622499e+00 1.7710749947057952e+01 0 0 0
+101764 6361 3 -1.8200000000000001e-02 1.1946469391161191e+01 7.9345918432054798e+00 1.7422016804743411e+01 0 0 0
+101773 6361 2 5.1600000000000000e-02 1.2259930148470499e+01 7.1324492364701051e+00 1.8139842490217099e+01 0 0 0
+101763 6361 1 2.6599999999999999e-02 1.2664387194381472e+01 7.8161236053804517e+00 1.6068998595047127e+01 0 0 0
+101762 6361 2 1.2370000000000000e-01 1.0978083818181998e+01 8.5416591738498990e+00 1.5007646020399198e+01 0 0 0
+179272 11205 2 1.4030000000000001e-01 8.8017355529519605e+00 1.2300324251887471e+01 1.1173326770491549e+01 1 0 -1
+179270 11205 2 1.2370000000000000e-01 1.0393817075879586e+01 1.1825769406851849e+01 1.2934369573096140e+01 1 0 -1
+179271 11205 1 -1.7340000000000000e-01 8.9139923428024765e+00 1.3024335850892795e+01 1.2003930331336008e+01 1 0 -1
+65546 4097 2 1.2880000000000000e-01 1.7899483895246036e+01 8.6480490306837368e+00 1.0836166866910942e+01 0 0 0
+65548 4097 2 1.4030000000000001e-01 3.4494286730252339e+00 9.6066332589219989e+00 9.6739630854217005e+00 1 0 0
+101761 6361 1 -1.2900000000000000e-01 1.2004770701672360e+01 8.1530844525238351e+00 1.4874154146718642e+01 0 0 0
+101771 6361 1 -1.7340000000000000e-01 1.2589725462806230e+01 7.9052944284843694e+00 1.3651903735235269e+01 0 0 0
+41339 2584 1 -1.7340000000000000e-01 1.6589792086060861e+01 1.1434284215631770e+01 1.3616315654462921e+01 -1 0 -1
+41329 2584 1 -1.2900000000000000e-01 1.5924934127057425e+01 1.1453825570103859e+01 1.4834566892269521e+01 -1 0 -1
+41343 2584 2 3.5400000000000001e-02 1.5346036789775042e+01 1.0577438179777253e+01 1.7744257789483889e+01 -1 0 -1
+41342 2584 4 -6.9599999999999995e-02 1.5535759072649746e+01 1.1618009272633429e+01 1.8028456966425424e+01 -1 0 -1
+41344 2584 2 3.5400000000000001e-02 1.5605571674399014e+01 1.1845541378829052e+01 2.5753776309133376e+00 -1 0 0
+41330 2584 2 1.2370000000000000e-01 1.5155432327680716e+01 1.0728855828798077e+01 1.5116346047300009e+01 -1 0 -1
+41341 2584 2 5.1600000000000000e-02 1.5255845286212361e+01 1.3595578835369178e+01 1.7401974454512626e+01 -1 0 -1
+41331 2584 1 2.6599999999999999e-02 1.6218407517059681e+01 1.2433872672159525e+01 1.5835322031560247e+01 -1 0 -1
+41332 2584 3 -1.8200000000000001e-02 1.5342508920013911e+01 1.2566890327026831e+01 1.7065300433834039e+01 -1 0 -1
+179276 11205 2 1.4030000000000001e-01 7.7409900700875669e+00 1.6039772300823500e+01 1.2996164460662758e+01 1 0 -1
+108385 6775 1 -1.2900000000000000e-01 7.4233967221649939e+00 1.3208845277918304e+01 1.7576420059242437e+01 0 0 0
+160480 10030 2 3.5400000000000001e-02 2.5198362929249960e+00 1.3397217172244797e+01 1.7309546401633696e+01 1 0 0
+108386 6775 2 1.2370000000000000e-01 7.6418580353016772e+00 1.3201805789851932e+01 1.6463737231152205e+01 0 0 0
+160478 10030 4 -6.9599999999999995e-02 3.1803970397480916e+00 1.3965101712621689e+01 1.7930232961704462e+01 1 0 0
+160468 10030 3 -1.8200000000000001e-02 3.2747731245789664e+00 1.5232476684383739e+01 1.7659189220495477e+01 1 0 0
+160470 10030 2 1.2370000000000000e-01 4.5355816453608124e+00 1.3114455934447417e+01 1.6215718014273392e+01 1 0 0
+160472 10030 2 1.4030000000000001e-01 5.6139592118976136e+00 1.3131308544224675e+01 1.4080126826092714e+01 1 0 0
+160471 10030 1 -1.7340000000000000e-01 5.1811370917832766e+00 1.4080044327837159e+01 1.4456427972211051e+01 1 0 0
+160469 10030 1 -1.2900000000000000e-01 4.5804091192069301e+00 1.4037606684058916e+01 1.5713383640096469e+01 1 0 0
+160473 10030 1 -1.1340000000000000e-01 5.0037064822006068e+00 1.5195504770002120e+01 1.3654947051935174e+01 1 0 0
+160476 10030 2 1.4030000000000001e-01 4.3104997064483790e+00 1.7284794062856477e+01 1.3634720726802625e+01 1 0 0
+160475 10030 1 -1.7340000000000000e-01 4.4078150650840886e+00 1.6318615075841972e+01 1.4219645992621857e+01 1 0 0
+160465 10030 1 -1.2900000000000000e-01 4.0610468192223443e+00 1.6308730622530351e+01 1.5558870664605191e+01 1 0 0
+160466 10030 2 1.2370000000000000e-01 3.5686154938002295e+00 1.7222651804330930e+01 1.5900437427118566e+01 1 0 0
+160467 10030 1 2.6599999999999999e-02 3.9318617624607755e+00 1.5132619387648699e+01 1.6267790553153716e+01 1 0 0
+150159 9385 2 3.5400000000000001e-02 1.0651976528402525e+01 3.4357906631307165e+00 1.2089534483238621e+01 1 2 -1
+150160 9385 2 3.5400000000000001e-02 1.2104884307909124e+01 2.5931369889877622e+00 1.2799396410924045e+01 1 2 -1
+179274 11205 2 1.2880000000000000e-01 7.5635170359697375e+00 1.4547808023605786e+01 1.1108629291415742e+01 1 0 -1
+179278 11205 4 -6.9599999999999995e-02 1.1635322751866651e+01 1.2257154805758839e+01 1.5137151672689530e+01 1 0 -1
+179268 11205 3 -1.8200000000000001e-02 1.0997175481765529e+01 1.3405153367619416e+01 1.5130082764970151e+01 1 0 -1
+179266 11205 2 1.2370000000000000e-01 9.1942088684810823e+00 1.5422706022769127e+01 1.5035703786272791e+01 1 0 -1
+179280 11205 2 3.5400000000000001e-02 1.2290942256734050e+01 1.1826014649487290e+01 1.4392219038469303e+01 1 0 -1
+179267 11205 1 2.6599999999999999e-02 9.9496209304151666e+00 1.3629886003062269e+01 1.4124589952682891e+01 1 0 -1
+179275 11205 1 -1.7340000000000000e-01 8.2701895659697797e+00 1.5076504555751216e+01 1.3052072167601100e+01 1 0 -1
+179265 11205 1 -1.2900000000000000e-01 9.0564106265983355e+00 1.4783784316041231e+01 1.4154656487210538e+01 1 0 -1
+179269 11205 1 -1.2900000000000000e-01 9.8768793826486316e+00 1.2787181450430296e+01 1.3014283720178977e+01 1 0 -1
+179273 11205 1 -1.1340000000000000e-01 8.2674216650716907e+00 1.4253273160133595e+01 1.1948939368483259e+01 1 0 -1
+179277 11205 2 5.1600000000000000e-02 1.0610727421449907e+01 1.3739814257364230e+01 1.6100755441988152e+01 1 0 -1
+160477 10030 2 5.1600000000000000e-02 3.9412304815930104e+00 1.5838691529735270e+01 1.7734323116652897e+00 1 0 1
+3050 191 2 1.2880000000000000e-01 1.7898982762827522e+01 1.6150504000168105e+01 1.4416156164361380e+01 -1 0 -1
+3042 191 2 1.2370000000000000e-01 1.3942092690198225e+01 1.7683486329176745e+01 1.4820833614746432e+01 -1 0 -1
+3041 191 1 -1.2900000000000000e-01 1.4940290038031597e+01 1.7837094196722056e+01 1.4454329160863994e+01 -1 0 -1
+3049 191 1 -1.1340000000000000e-01 1.7196155424954874e+01 1.7017060638418130e+01 1.4373120643853616e+01 -1 0 -1
+3051 191 1 -1.7340000000000000e-01 1.5845051399300770e+01 1.6778167679823589e+01 1.4620076052624285e+01 -1 0 -1
+3052 191 2 1.4030000000000001e-01 1.5497654156270627e+01 1.5778851829853114e+01 1.4800370085812935e+01 -1 0 -1
+179279 11205 2 3.5400000000000001e-02 1.1619265961576444e+01 1.1687845995171676e+01 1.6085200175077574e+01 1 0 -1
+41338 2584 2 1.2880000000000000e-01 1.7568651246853193e+00 1.2192292914855560e+01 1.2474233482244635e+01 0 0 -1
+41336 2584 2 1.4030000000000001e-01 2.2324306685334516e+00 1.3971093942058394e+01 1.4193890180808504e+01 0 0 -1
+41337 2584 1 -1.1340000000000000e-01 1.7657386738972786e+01 1.2343250231643829e+01 1.3351358148640003e+01 -1 0 -1
+41335 2584 1 -1.7340000000000000e-01 1.7912104075252799e+01 1.3296238336433840e+01 1.4340140648841116e+01 -1 0 -1
+41333 2584 1 -1.2900000000000000e-01 1.7246150468532957e+01 1.3385489918572183e+01 1.5568140261294454e+01 -1 0 -1
+41334 2584 2 1.2370000000000000e-01 1.7455716623269652e+01 1.4043517017613519e+01 1.6398684799357447e+01 -1 0 -1
+
+Velocities
+
+40602 -6.3985937286226606e-03 -1.1283920651758051e-02 1.9394773557760127e-02
+111366 7.1417889228307350e-03 2.3686345533524764e-03 1.5065506389023443e-02
+111365 4.2982514673758189e-03 -3.3283192982106525e-03 6.5036881647937477e-03
+111364 1.4447480828875161e-03 3.8092269892626334e-03 3.0609420633918654e-04
+111373 2.2700374864640424e-02 2.2290576591487434e-03 -6.7977785798176921e-03
+107224 1.7187267010873336e-02 -1.1555287862823971e-02 -1.0717215799613468e-02
+107223 -6.3226613301485979e-04 1.4795913931442428e-03 -6.5605731669071115e-03
+40599 -2.5724488567018611e-03 5.3740131515095432e-03 -1.1508458865342254e-04
+40600 3.0894309265885834e-03 7.0869892184123118e-03 -1.9531624930404824e-02
+41356 1.7160195689052138e-02 3.3571060089956223e-03 2.0463824167599072e-02
+107222 -1.2352364881033985e-02 -5.6793207223280774e-03 -1.1101201909159270e-02
+40597 5.5215942197628732e-03 3.2107591811954972e-04 3.0815583031388511e-03
+40598 2.4529408589842389e-02 1.5523133298995082e-02 -1.7101075554038388e-02
+111367 8.5756582830476269e-04 5.3997389483404334e-03 -6.4875926078625870e-03
+111368 1.3769852735293254e-02 -2.1680927934792451e-02 -1.8995998166840975e-02
+188723 3.3328235104561783e-04 8.5236950748101713e-04 4.2020891134151670e-03
+188726 -9.8003887498915986e-03 -2.1495045220230168e-02 8.3413373308345595e-04
+188736 -1.1100104140321627e-02 3.0529586466152923e-03 1.4662924054520724e-02
+41360 2.3048551361378499e-03 1.3548917365876484e-02 -1.0649868672622506e-02
+111375 -2.4422125149829027e-02 2.5695162102282055e-02 3.3922349033143284e-02
+41346 4.6625666522050130e-03 8.5743244035343079e-03 -4.9179988094868107e-03
+41359 -1.2726148133992348e-02 -1.2000997718029122e-02 1.6708496998307527e-03
+188725 1.1437177939645920e-03 -4.6323573846128430e-04 -2.5634649694155787e-03
+188729 -3.3988449745788792e-03 5.3757300898929299e-04 -2.2590775366986299e-03
+188727 3.1711558095981144e-03 7.3348712723420714e-03 7.4298368874665018e-03
+20158 -5.0109592460971424e-03 3.6872279392635809e-03 -5.5038251558829285e-03
+20160 -1.1821234057304992e-02 -2.5798190857128922e-03 -1.7953380281471747e-02
+20148 -1.0790472476793170e-03 -4.7025193507702606e-03 5.9217761171112299e-04
+188728 7.5473765845357884e-03 -1.5388969664485809e-02 9.8152795837572054e-03
+20157 -1.1944120436498213e-02 -1.9061416156011441e-02 -2.4914799662105972e-02
+188730 -1.4290269695998326e-02 2.9968229390958515e-02 7.7682551251084097e-03
+41355 -2.5991049762131772e-03 7.4297395598412874e-03 -1.6861102450866203e-03
+108389 -2.0384096805913287e-03 6.0388461522491261e-03 -1.8156856992433881e-03
+41327 -1.8190165050566413e-02 1.2902744096957476e-02 -6.8012225052866936e-03
+41326 2.4564138723369069e-03 8.0442641486566449e-03 3.3082730180927712e-03
+41328 -7.9543703561699274e-03 1.4610678983649835e-02 -5.8658854142750068e-04
+108390 -1.4636133796141480e-02 -1.1902813702312741e-02 -1.2565958306297892e-02
+108391 6.8277912089155703e-03 -6.6616757590615980e-03 1.3194254171091536e-02
+41353 6.1344487178109988e-04 2.3782327128607731e-03 -5.9839334739494598e-03
+41351 -5.5148848659499717e-03 3.3175240477984454e-03 -2.3477985375082062e-03
+107221 -6.1719557341304710e-05 6.6392922109710087e-03 -1.2604337429895050e-03
+107219 -2.5442440180131719e-03 6.8009639830674841e-04 3.7895831012066165e-03
+107232 9.9471624926068185e-04 2.9343026454605268e-03 1.4564418253620532e-02
+108392 -1.2205773323818782e-02 -1.2367095129675064e-02 -2.3620384811178449e-02
+41354 1.2633903485313827e-02 2.8894382064193129e-03 -7.5485661956211066e-03
+69384 3.7045438016150749e-03 1.4715210123816483e-02 -1.2504143987109963e-03
+41345 -1.2050690902703552e-03 -7.4223700967044797e-03 7.9557125889578358e-03
+41347 -5.2630112301396935e-03 1.0024695076983729e-03 4.0678108158525451e-03
+41357 -2.4235372130303228e-02 2.7194778844038932e-02 2.5954476578362314e-02
+41358 1.1547802455943292e-03 3.2054286419790192e-03 -5.7816107018840678e-03
+41348 2.8215799895673598e-03 -7.2301887887184424e-03 -5.9561539318358590e-03
+41349 1.8508257020319503e-03 -8.5310062398337300e-03 6.3502572698804077e-03
+41350 5.0424082461614922e-03 9.8759747315334129e-03 -3.7148985725838621e-02
+69382 1.0209488485216548e-02 8.7948629085824424e-03 6.0461055609758911e-03
+108400 3.2185453787997705e-02 4.4465668237807292e-04 3.2221034555599638e-02
+107220 -4.0146593456830170e-04 4.3976084131760714e-03 -1.4675205968496619e-03
+107229 -1.0433617007031043e-02 -1.3650333859161087e-02 -1.4213050498992373e-02
+65551 -4.9864380278714232e-03 -1.4856355031384712e-02 5.2803332223931424e-04
+107230 -1.0046475666219534e-03 -4.3746998646380488e-03 -5.0828115157881323e-03
+107231 1.3064987533431858e-02 -1.2616440589792253e-02 1.5496724125123052e-02
+148088 -5.7788264907382165e-03 -2.6933832447928175e-02 6.2446472207853465e-03
+148090 4.7648648958641283e-03 -3.1957718696620278e-02 -6.8971058281332674e-03
+148087 4.1315835848582082e-03 6.3290740064834297e-03 1.2949415393118048e-03
+148089 -7.1554872977898868e-03 -5.1666910859972581e-03 -2.0484014887854340e-03
+40604 -3.1744414925873135e-03 1.0568434359276006e-02 -2.1819988456264736e-02
+40603 2.8248689961349748e-03 1.2658982899592434e-03 -9.5764006115084746e-03
+40601 -4.7840031125935203e-04 9.4450791561692653e-03 -4.5528435199967349e-03
+41314 1.9149519323665907e-02 -6.0539194052006877e-03 5.2839448608981284e-03
+40594 1.8001534383656499e-02 2.9721693538009245e-03 2.3761970191448985e-02
+40593 -1.0908632903323596e-03 1.0495712304397933e-03 -1.2043838978949969e-03
+40595 2.7037492749230224e-03 4.4950383230027363e-03 2.8523867304455135e-04
+41316 1.0657791699052992e-03 -6.5096741060257099e-03 4.6172120682064308e-03
+108393 6.4195678479741008e-03 6.1890863167554807e-04 -3.4458122416580831e-04
+108394 1.7640001229085639e-03 -2.7098331768220227e-02 4.6754689677561925e-02
+41313 -2.1194538663887627e-03 8.9933456540167741e-04 -6.3884135988039525e-03
+108395 -6.7159387862448430e-03 -5.5000640306663339e-03 -4.9701797361138859e-03
+108396 -9.3569802272948782e-03 -1.1015116885264041e-02 -8.9017892105562844e-03
+148096 -4.2819336553939994e-03 -1.0050196677360956e-03 -2.1765415720189883e-02
+148095 4.9372342704395670e-03 1.0772605578946723e-02 -1.1721352868997137e-02
+148094 7.1248826100540322e-04 -3.2781016402931187e-03 2.8577594939631964e-04
+40608 -1.2370534160282482e-03 -8.2498460545062293e-03 2.5338864890924385e-02
+40607 1.3877315839298684e-02 1.3217823230226708e-02 2.8654612266083093e-02
+40605 8.2533235910335293e-03 -1.4363497942103563e-02 -5.8333651379382651e-03
+40606 -3.6177440555578344e-03 6.4037161614175055e-03 -7.2599838950661412e-03
+40596 -2.4546392581697943e-03 -4.9076179625028755e-03 5.9137087618071201e-03
+148093 1.7447620781739517e-02 2.2068002127499306e-02 -1.5040662930237567e-02
+148084 5.0933294765535949e-03 1.0234031055708500e-03 7.5015891928184334e-03
+148086 4.8420055786770281e-03 1.6812726112808648e-02 -1.3819560009771241e-04
+148085 -8.8289871556675153e-03 5.2193033688785698e-03 4.7266480208508202e-03
+148083 -7.1461232997133148e-03 -4.1887647415794725e-03 -7.8404449131831862e-04
+20159 -7.4629924575313053e-03 5.1113651021916437e-04 -3.2772971405742720e-03
+148081 4.1407665746122004e-03 -1.7828488447790513e-03 -7.5664489213328147e-03
+148091 6.8153129958091630e-03 -1.6847748121324249e-03 -7.3048091201541277e-03
+148092 9.7131175647673530e-03 -7.5600099887703272e-03 2.0349319254081608e-02
+148082 4.4908740015736160e-03 -5.8588195363773170e-03 1.7442587106140391e-02
+111363 -7.2666723745643045e-04 6.4453310449022526e-04 -9.2142146514411166e-04
+111369 2.3214338205662967e-03 -1.9300494656438171e-04 5.2064352844595631e-05
+111371 9.2498196774835114e-03 -7.6929365735117954e-03 -1.5145794805183515e-03
+111372 -2.3916823221637332e-03 -1.8730462875375706e-02 1.1809691836554021e-03
+111362 -6.7382249992153909e-04 5.2995704976425322e-03 -3.3360124539462105e-02
+111361 -8.6055288981815720e-03 -5.4071424783112623e-03 -1.2653640098973984e-02
+43056 3.2222153132921145e-03 1.9837761268420732e-02 9.2018302104190340e-03
+195807 -3.1382834937265937e-02 6.9332535127632029e-03 1.3160308515046322e-02
+195808 -3.2683081868087938e-02 -1.6396793809679167e-02 2.5209625669480457e-04
+195806 -9.8938695448897631e-03 1.3705293166065644e-03 7.8003187155232159e-03
+43041 8.9415567805161723e-03 8.7913160341705917e-04 5.6333712078787410e-03
+43042 1.0613219478942223e-02 2.3186041832578441e-02 -1.0115460586963982e-02
+43043 2.0978361718671187e-03 6.0263535813099497e-03 -1.3700435982461076e-03
+43055 -3.4386257188604344e-02 -1.5039464899947758e-03 8.7479446119385353e-04
+43044 -4.3121573494832970e-03 -8.0623094479985637e-03 8.0995104097343895e-03
+43054 2.4806635642581174e-03 1.3435133813313386e-02 4.9496913185229094e-03
+150156 1.0204657798397571e-02 7.8520007773605592e-03 -1.9929390618242882e-02
+150155 -1.6742680788560771e-03 4.2949845657895766e-03 -4.0950556847738689e-03
+111374 2.8056883266325912e-04 -6.1512930242348853e-05 3.1968810263665582e-03
+111376 2.7185148974756327e-02 2.4258034996224734e-03 -4.4755557435753827e-03
+150154 -9.8043514557737150e-03 9.4303679048280270e-03 -7.7080592127516511e-03
+150153 -4.8187204163573456e-03 2.3740896109405102e-03 4.8634437258542442e-03
+150151 -6.3991780492525102e-03 1.1588777932327687e-02 -3.0347131918465452e-03
+43046 -8.8311146243204004e-04 3.0986511119250699e-03 -1.2407892016880967e-02
+43053 9.5611734483879354e-03 -3.1426599490962055e-02 5.8803835591003236e-03
+20146 -1.7681237741758948e-02 -1.2212042848023569e-02 -1.1833442613132347e-02
+111370 -1.0710837326206812e-02 2.6089672819193891e-03 -5.4317254687181677e-03
+20155 -2.7215865188963246e-03 1.4560172171770279e-03 -4.2670739431862311e-03
+20145 -7.4364708932625513e-03 6.7007663084826818e-04 -7.7802544634573857e-03
+20149 3.1175637372676617e-03 -4.0109309363089663e-03 -1.0041320465318460e-02
+20153 -1.4993060554304328e-03 -1.4897146798975238e-03 1.0061799265953016e-03
+20154 -4.5667092906773635e-02 -3.9442205782248569e-03 8.3317673247143066e-04
+20151 -2.4277432789537640e-04 -1.4230354846986382e-03 -1.3830486874839140e-03
+20147 1.7882378095336886e-03 -1.5801307395524379e-03 5.2438073877780360e-05
+20152 -4.0777615249197371e-03 3.1119760731858820e-02 -1.5759361074254526e-02
+20150 9.0304079532301865e-03 1.0875943342613147e-02 -1.0895971464493320e-02
+20156 -5.6282725264859799e-03 -1.1672424195060220e-02 -7.2540747831290687e-03
+150152 5.9014548429507903e-03 -2.5097412250563358e-03 2.4514394229295321e-02
+107926 -2.5360130619403527e-02 1.7027498464666991e-02 1.4089021440180751e-02
+65549 2.2437863237016947e-02 1.5376768642133005e-02 -3.0023558944022315e-03
+41318 1.8042221289882098e-02 -2.7690176363431174e-03 1.7781355400005368e-02
+41320 9.9006239878205310e-03 -2.5462778699343425e-02 -2.9213483015257335e-02
+107925 2.9075289343929583e-03 4.6134671356644531e-04 1.1769542406121603e-02
+107928 -1.0263708016336921e-02 2.3707724952912439e-02 1.1482359218154482e-03
+107927 3.4365248976792003e-03 -6.2525848992054855e-03 -5.9247937754846221e-03
+41352 -1.2800226678188423e-03 -2.8048563798401534e-03 2.0152855354049065e-02
+107931 -4.3356949892896972e-03 6.5928579486349784e-03 -1.8621873901022122e-03
+107930 2.3237710511205181e-03 -1.2538253427723276e-02 -4.7839319344868776e-03
+107929 -8.0478126756462266e-04 -2.7560021303245719e-03 7.5571229201517529e-03
+69386 1.0473405390103647e-02 -6.6814121040076752e-03 9.5814420685443498e-03
+69385 4.9440082509376836e-03 -2.5126914407222916e-03 -3.5949598322722104e-03
+69388 1.8208857117612783e-03 -1.1322803427677355e-05 -1.4333219921259978e-02
+69387 3.1850369745748921e-04 6.5069660914624204e-03 -2.6386771913439965e-03
+69379 2.6314325531485937e-03 1.5715621609313378e-03 1.1821470965878366e-03
+69378 3.7026928777500151e-03 -2.7614897646064784e-02 1.8259771516738618e-02
+69377 2.6687771533153914e-03 -5.7218381841054600e-03 -7.5893780564083237e-04
+69383 -3.3691968886554952e-03 7.1360246962528422e-03 -9.8211852411923817e-04
+69381 4.7565972492020952e-03 9.0419073906814387e-03 -2.2763053585622473e-03
+107932 3.8414353147230764e-03 -8.0733742293150335e-03 1.8586066754227297e-02
+65550 8.3801343387129440e-03 -3.6416927830206571e-04 -1.8048768464312942e-03
+65552 1.5638442308199697e-02 -2.0834570456500827e-02 1.0981929724627556e-02
+65540 -1.0857776192705190e-02 -3.0700087407187775e-03 2.8788388836712897e-03
+69389 -6.1755692750579995e-03 -4.4194428240845861e-03 -1.1011904673336976e-02
+69380 5.2112328945180079e-03 -2.0458437106421236e-03 -3.9919201383127826e-03
+65542 1.0161363284650162e-02 -1.7453919007551381e-02 1.5366623626875970e-03
+65539 -3.2306768646671322e-03 9.2182272960381984e-04 2.6015855213855988e-03
+65543 5.1858203386749152e-03 2.7852728941709375e-03 3.5441667809768297e-03
+65541 1.7878919381596906e-03 4.1390806335909131e-03 1.9778464485735573e-03
+65544 2.4551706016464687e-02 9.1023838230138918e-03 2.6294443083941983e-02
+65545 -8.2129497046984305e-03 7.4780642489738185e-03 -3.1716849956166665e-03
+65547 -6.8346051031379187e-04 1.4269967526595148e-03 -5.1908655600957226e-03
+65537 -8.6233453210128629e-04 6.5238125861394160e-03 -3.7603748025841180e-03
+65538 -2.0035485175081927e-02 6.1098481347540918e-03 1.7638834216090409e-02
+41340 -4.6576371710238193e-03 -1.1654104516993939e-02 -1.3773539799737619e-02
+101772 1.0911313320299220e-02 6.3510120728270860e-03 4.9522483493955431e-03
+41325 -2.6734468427113651e-02 9.1841923890378010e-03 -1.5328834252099265e-02
+41319 -9.1885019050582458e-04 -2.3029331976552095e-03 -2.7045144890137820e-03
+41317 -7.7654576230394307e-04 -5.5073614356975220e-03 -1.9202412214231046e-04
+41315 -1.7385686807141081e-03 1.5446300205458365e-03 1.9952832947580691e-03
+195805 -7.6598832481870769e-03 -5.1231059839508437e-03 -1.9890091940218860e-02
+195796 -1.1732064842694759e-03 -5.7497907053340896e-04 7.3157052031676490e-03
+195794 -8.6088113370853675e-03 -6.5484403401288764e-03 -1.2799674075156021e-02
+195795 -1.4996948131837684e-03 -2.7153802298280631e-03 -3.3985451066914211e-03
+150146 8.5964742262872283e-03 -1.1565212543638292e-02 6.2814871480959935e-03
+41321 6.9280720042544843e-03 -4.3686337166906584e-03 7.3581863700124467e-04
+41324 -2.8389899116042323e-03 1.3909468247823161e-02 4.3114594454619071e-03
+41323 -9.0125774083012790e-03 -5.0493438449767574e-03 -2.1434692510532635e-03
+41322 -1.5812355932370424e-02 1.0710941844899499e-02 6.2428080224479106e-03
+69392 -2.2546399596842053e-02 -1.8075810155354460e-02 5.0186567866324847e-03
+69390 1.1749781995426265e-03 -1.2749343383937184e-02 -2.5956074184824659e-03
+150145 2.9746343212151099e-03 2.9112464133544827e-03 -1.0105992832620007e-03
+150148 -2.7954531733395370e-03 -2.3070997870378741e-03 5.5980707473674289e-04
+150147 2.9436340567068199e-03 6.6274995352233522e-04 -1.7502135011225556e-03
+150158 -1.0014277667394864e-04 1.3345167443974380e-02 -1.2140518537356060e-02
+150157 -9.1176651172342471e-03 1.9161783922648184e-03 -1.7139066698174422e-02
+150149 8.4287523879888852e-03 -4.7408530887962617e-03 -7.0065798885690644e-04
+150150 5.9355600264354323e-03 -1.1442321105025752e-02 2.3098532485127263e-02
+69391 -9.2567222081355507e-03 2.5762644773261217e-02 1.4488482901383315e-03
+195793 -3.1158880581649206e-03 -7.0200266776289924e-03 7.8927832477760987e-03
+195803 3.9818115630686178e-03 -6.1024578419483135e-03 -4.8112538337763359e-03
+195802 -3.0570223177208761e-04 -2.9386036278753597e-02 7.0349341449799417e-03
+195801 5.2394953658191001e-03 9.1732533954368249e-03 3.1141270890654572e-04
+195800 1.7461569943837544e-03 4.0749677240683416e-02 1.0013003501743011e-02
+195797 1.7271750759534229e-03 2.3563819438706256e-03 7.5571688880444535e-03
+195799 1.6429099368351701e-03 4.5996046044822895e-04 -5.0654846345272089e-03
+195798 1.1001462298366805e-02 8.3858904779092313e-03 -3.3785909017681262e-03
+195804 -1.7296703116988605e-03 -1.7697327664914005e-02 8.5202162561649492e-03
+107226 -1.7331359261464195e-02 -3.0656969501809961e-03 -2.0157585732793516e-02
+107225 -3.5089078950579526e-03 7.9908038122458825e-05 -2.0549368746707371e-03
+43050 1.3308282236893442e-02 -1.9700033358625919e-02 1.0063042575124281e-02
+43049 -7.6186047983919196e-03 -2.8674634899580310e-03 4.5672905010358013e-03
+43051 1.6816862530873065e-03 -6.3271333424715836e-03 3.1966940544481534e-03
+43052 1.1101246737904471e-02 -2.7500007475214173e-02 1.2946853284945686e-02
+160474 1.0191231333280013e-02 1.6542569362786894e-02 -4.8086367671814206e-03
+43048 4.1304191245269536e-03 -9.6664493035188166e-03 1.7935667373089936e-02
+188724 -5.1975814552116884e-04 1.4631396054558342e-02 4.7299610442206614e-03
+188733 -2.7873452889993384e-02 1.2473853177297456e-02 1.4566554091484172e-02
+188734 -2.3911430844619536e-03 4.1678601894228583e-03 1.0523340557520730e-02
+188735 -7.0801718316105614e-03 4.4860133083137023e-03 -1.3973977234744157e-02
+43047 -1.4795679520736254e-03 -3.3265508294681905e-03 -8.3734303841242422e-03
+43045 -4.0265248091229796e-03 8.0349934652097204e-03 -1.7599504163315438e-03
+3053 1.7224357096979497e-02 3.5458829635939999e-02 3.6002747086972837e-03
+188722 -9.8212554448490110e-03 -9.0722203116146601e-03 1.3272184510909137e-02
+188721 1.9412771888515235e-03 -4.4699900251273508e-03 3.8658118576122263e-03
+3055 -1.0481165616355119e-02 -2.2885224468318546e-02 3.4105973508173040e-03
+3048 -3.8544097846844529e-03 -1.3138759658280713e-02 -3.9042582782915585e-03
+188731 2.8494075759158554e-03 1.1866122837661180e-02 9.1245321002059903e-04
+3054 -2.1216653303811474e-03 2.3713097765709016e-03 7.5315521509730461e-03
+3056 2.3069793629581111e-02 -1.4968995116384637e-02 1.0648281155553595e-02
+3046 -2.0460770227470892e-02 3.0144778758524836e-04 2.1317712207427685e-02
+188732 -1.8281144438483871e-03 -1.1261657685967043e-02 1.1561377925901985e-02
+3044 -5.9884526016642653e-03 3.3295170562367797e-03 -5.7072534228267519e-04
+3047 -4.5626331700614377e-04 3.0971491279442806e-03 -2.4029872771577656e-03
+3043 -4.4454572400557365e-03 -7.6632255493806955e-03 5.5714893931939251e-03
+3045 6.1822444895057284e-03 6.6714925326779974e-03 1.5853041589859675e-03
+101766 -2.1458444025968314e-02 -2.5444654112521999e-03 5.8443943342134635e-03
+101765 -5.0238024773627083e-03 5.6425955495419578e-04 1.5607573277286874e-03
+101768 1.3464094865409271e-02 2.4281015477592219e-02 5.3310699991396355e-03
+101770 -4.4451927612641729e-03 -2.7815717596421690e-02 -1.6333131847475500e-02
+101769 9.5556056066472259e-04 1.0579336291235283e-03 3.2876877431821908e-03
+101767 -1.3195206140247649e-03 2.8620575981464927e-03 6.9494145796683664e-03
+107227 -7.9393117929594109e-03 -2.6951728063767852e-03 -3.5504552957331117e-03
+108387 6.5062699201118646e-03 4.8334061939892101e-04 4.8677336839467985e-03
+108397 -7.8045605958057653e-03 1.2779059039902910e-02 1.0199245897299205e-02
+107217 1.0055130403876900e-02 -1.0465065338913601e-02 6.4885472073673246e-03
+107935 1.1211029199945733e-02 1.3279344243719089e-02 -8.1421545624445653e-03
+107933 -2.5074645215093297e-03 -3.3608116180463853e-02 -8.7759598361912446e-03
+107934 4.3630785569980599e-03 -7.3262449730214516e-03 -4.9702928323268390e-04
+107924 1.5858335103752397e-03 -6.4236616011150325e-03 -6.3145478319536832e-03
+107923 -1.1691114243010869e-02 -2.6132526052943480e-03 5.8259792906919282e-03
+107228 2.5723102304711070e-03 1.8969683778003933e-02 -4.1866716393140447e-03
+107936 -5.4678218513997355e-04 5.5669869175223568e-04 -4.3101055117239481e-02
+160479 3.4501662683352828e-02 2.9913518177340927e-04 -4.3250681509590140e-02
+107921 6.2983034191229420e-03 3.4484229430888137e-03 2.3049203849430143e-03
+107922 -3.3769140568511904e-03 1.8794033081416542e-02 -1.6496813943305891e-02
+107218 -3.0889032207105705e-03 2.3663544289661396e-04 -1.8121891586601914e-03
+108388 6.6752875665062488e-04 7.1838180565699144e-03 -3.3892317399802948e-03
+108399 1.3381268534931896e-02 -2.9088903387031562e-02 1.5490840830516450e-02
+108398 5.3504427431495241e-03 -8.4373535441966123e-04 1.7407361182703821e-03
+101776 -4.4229912609814771e-02 -1.2601183038357919e-02 1.0454766560285456e-03
+101775 -6.7661508494878475e-03 -2.0128944968707908e-02 1.3392250819698175e-03
+101774 8.8460616756493686e-03 -4.1840236079397560e-04 -4.5869622510927481e-03
+101764 -2.4616713101414359e-03 -1.8370176375787708e-03 2.4221242856289236e-03
+101773 1.9068324416344356e-02 -2.2416525675832060e-02 2.3631320938171878e-02
+101763 -4.6841884146008334e-03 -5.1533769491571239e-03 3.0773962394947921e-03
+101762 -4.6244612567492736e-03 -4.8907730218283561e-03 -2.4065994260735329e-03
+179272 -5.5640577174611121e-03 -8.0026913196123862e-03 9.1238863542354894e-03
+179270 -3.4663284666564950e-03 3.7327894844247110e-04 -1.8090164399996302e-02
+179271 -9.2512252325061984e-03 5.0292798915460612e-03 2.2087977951300956e-03
+65546 2.1022467060548392e-02 2.6012539191398815e-02 -4.0199199904540503e-02
+65548 -9.6925158665221688e-03 -7.6373757136848621e-03 -1.4022141632720348e-02
+101761 -2.4320225549836435e-03 1.7250815303594810e-03 9.0081186862997703e-04
+101771 -1.9996688975715249e-03 -5.6054082987894022e-03 4.5581765470880699e-03
+41339 3.1266677423361358e-03 5.9205052600478040e-03 -4.3339978463310851e-03
+41329 -9.8874045639901049e-04 -4.4750448363508602e-03 -3.4869981536843303e-03
+41343 -2.4016025797634774e-02 1.3175639791008605e-02 -4.6023020275273420e-02
+41342 -1.6716684647333912e-03 1.2459605567751943e-03 1.6068248832533532e-03
+41344 2.0325206636661194e-03 -3.0576895440245786e-03 1.1529498097307186e-02
+41330 2.5654903283602731e-02 2.3132228675317019e-02 1.1575874948668132e-02
+41341 -1.6553222660923881e-02 -1.1798485936730465e-02 -7.1873185555086112e-03
+41331 3.5346668585989967e-03 -2.0027759583546895e-03 -3.2889000031485196e-03
+41332 -2.5959229467918217e-03 -6.0602511790796782e-03 -9.3197710616591545e-03
+179276 1.1081427178681628e-02 1.6827323566739161e-02 -1.0299144743739620e-02
+108385 3.6564384223645233e-03 -4.9013600239771631e-04 1.3295156103955909e-03
+160480 -1.3803088794372316e-02 1.2219159767395200e-02 -1.3669800258940099e-03
+108386 4.1801973472378271e-03 -1.4647913911541162e-02 -1.6678122787186375e-02
+160478 3.8996210243085277e-03 6.7271423575770151e-03 -3.6784375058656509e-04
+160468 7.7419765741400326e-03 4.9138244434877576e-03 1.4031431499399972e-03
+160470 -6.2985622565362442e-03 7.4451997711637531e-03 2.8430316550356185e-02
+160472 -5.8383103703068037e-03 6.1929502851055824e-03 2.6819505985616384e-02
+160471 6.4540703717117969e-03 -8.0301907905106495e-03 3.8441043125357851e-03
+160469 -3.2190187970246821e-03 1.1026423392606606e-03 -6.4552121634166284e-03
+160473 -8.9124820567448894e-03 1.8453491165932152e-03 -5.5339629598225243e-03
+160476 4.3077321271397942e-03 -1.0514055910875600e-02 1.1874230774763071e-02
+160475 2.0892466118949786e-03 -4.5629240557269512e-03 2.9807140626559279e-03
+160465 -3.3040123862153868e-03 -6.4718982960261595e-03 1.5540054129147744e-03
+160466 -1.0482164269847657e-02 -4.2613706143882239e-03 -2.0407827062661702e-02
+160467 -2.0886745076283074e-03 7.3566125280433870e-03 -8.1361111572777461e-03
+150159 -9.3474335633482227e-03 6.8552724395616188e-03 3.0172635792791409e-02
+150160 -1.2395823331379360e-02 -1.8814096766422796e-02 -2.2588032834368797e-02
+179274 2.7142693103844345e-02 2.0981214151002650e-03 1.7741159681900803e-02
+179278 -4.7312726933158031e-03 -5.3735482175190251e-03 5.0258788007287686e-04
+179268 1.0476052676472475e-03 3.8663965130026762e-03 -5.2311881655905329e-03
+179266 1.5328249586214907e-03 -2.4374978186068715e-02 -1.2316372207153982e-02
+179280 2.0962579240811956e-02 -1.7552180709176319e-02 3.1310438513877256e-02
+179267 -2.9815916434868302e-03 3.3669678375885131e-03 -4.5604241127206076e-03
+179275 -3.4616159250607549e-03 -4.9052370217731742e-03 -5.9504393252170652e-03
+179265 -3.2638688398942024e-03 -2.8294419416218710e-03 9.7598020577956447e-03
+179269 -6.3820035949712006e-03 7.6268830685192008e-03 3.5859597533587175e-03
+179273 5.2814394103648347e-03 -2.6248694818828103e-03 -4.5226597201537379e-03
+179277 -1.2041210428484460e-03 -2.8617212529418956e-02 -6.1633779650706868e-03
+160477 1.0644756920882860e-02 1.1349322679914857e-03 8.4219222047503886e-03
+3050 -9.1677754946678826e-03 4.2780587837938129e-04 7.7954711472101390e-03
+3042 -9.5136449774802789e-03 -7.8088403318419732e-03 1.6481979622031205e-03
+3041 -4.2224554129104853e-03 -1.0046580459806016e-03 -1.2299765014357915e-02
+3049 3.3392704605801570e-03 3.2803849005614411e-04 -3.7962761566625422e-03
+3051 -1.4534919223640852e-03 1.6840179829874765e-03 -5.2689712045377035e-03
+3052 1.3121899362414865e-02 -6.1819078882882419e-03 -3.8070979101547178e-03
+179279 2.1031999741751132e-02 5.5208009434861991e-03 -4.0676368831269122e-03
+41338 1.4140591805763124e-02 -5.2322347712404904e-03 -1.2597608959408814e-02
+41336 2.9970177174658653e-02 -1.2564552612506892e-02 1.8546500897758786e-03
+41337 -1.0927245121297971e-03 -5.5983348471985855e-03 -2.6702824643818425e-04
+41335 3.8391554220007697e-03 4.9415840280308326e-03 3.8850792189150537e-04
+41333 -7.9995524811572705e-04 1.2714683204333441e-03 2.6878865364424981e-03
+41334 -8.1923367811546216e-04 3.8003884561477940e-03 -1.3493487265120480e-02
+
+Bonds
+
+1 1 111365 111366
+2 2 111365 111367
+3 5 111364 111374
+4 4 111373 111364
+5 1 107223 107224
+6 2 107223 107225
+7 1 40599 40600
+8 2 40599 40601
+9 1 40597 40598
+10 2 40597 40599
+11 1 111367 111368
+12 2 111367 111369
+13 3 188723 188724
+14 2 188723 188725
+15 6 188736 188734
+16 6 41360 41358
+17 6 111375 111374
+18 6 41359 41358
+19 1 188725 188726
+20 2 188725 188727
+21 1 188729 188730
+22 2 188729 188731
+23 1 188727 188728
+24 2 188727 188729
+25 6 20160 20158
+26 5 20148 20158
+27 4 20157 20148
+28 1 41355 41356
+29 1 108389 108390
+30 2 108389 108391
+31 6 41327 41326
+32 6 41328 41326
+33 1 108391 108392
+34 2 108391 108393
+35 1 41353 41354
+36 2 41353 41355
+37 1 41351 41352
+38 2 41351 41353
+39 1 107221 107222
+40 2 107221 107223
+41 3 107219 107220
+42 2 107219 107221
+43 6 107232 107230
+44 1 41345 41346
+45 2 41345 41347
+46 2 41345 41355
+47 3 41347 41348
+48 2 41347 41349
+49 4 41357 41348
+50 5 41348 41358
+51 1 41349 41350
+52 2 41349 41351
+53 6 108400 108398
+54 5 107220 107230
+55 4 107229 107220
+56 6 65551 65550
+57 6 107231 107230
+58 1 148087 148088
+59 2 148087 148089
+60 1 148089 148090
+61 2 148089 148091
+62 1 40603 40604
+63 1 40601 40602
+64 2 40601 40603
+65 1 40593 40594
+66 2 40593 40595
+67 2 40593 40603
+68 3 40595 40596
+69 2 40595 40597
+70 5 41316 41326
+71 1 108393 108394
+72 2 108393 108395
+73 1 41313 41314
+74 2 41313 41315
+75 2 41313 41323
+76 1 108395 108396
+77 6 148096 148094
+78 6 148095 148094
+79 6 40608 40606
+80 6 40607 40606
+81 4 40605 40596
+82 5 40596 40606
+83 4 148093 148084
+84 5 148084 148094
+85 1 148085 148086
+86 2 148085 148087
+87 3 148083 148084
+88 2 148083 148085
+89 6 20159 20158
+90 1 148081 148082
+91 2 148081 148083
+92 2 148081 148091
+93 1 148091 148092
+94 3 111363 111364
+95 2 111363 111365
+96 1 111369 111370
+97 2 111369 111371
+98 1 111371 111372
+99 1 111361 111362
+100 2 111361 111363
+101 2 111361 111371
+102 6 43056 43054
+103 6 195807 195806
+104 6 195808 195806
+105 1 43041 43042
+106 2 43041 43043
+107 2 43041 43051
+108 3 43043 43044
+109 2 43043 43045
+110 6 43055 43054
+111 5 43044 43054
+112 1 150155 150156
+113 6 111376 111374
+114 1 150153 150154
+115 2 150153 150155
+116 1 150151 150152
+117 2 150151 150153
+118 4 43053 43044
+119 1 20155 20156
+120 1 20145 20146
+121 2 20145 20147
+122 2 20145 20155
+123 1 20149 20150
+124 2 20149 20151
+125 1 20153 20154
+126 2 20153 20155
+127 1 20151 20152
+128 2 20151 20153
+129 3 20147 20148
+130 2 20147 20149
+131 4 65549 65540
+132 1 107925 107926
+133 2 107925 107927
+134 1 107927 107928
+135 2 107927 107929
+136 1 107931 107932
+137 1 107929 107930
+138 2 107929 107931
+139 1 69385 69386
+140 2 69385 69387
+141 1 69387 69388
+142 3 69379 69380
+143 2 69379 69381
+144 1 69377 69378
+145 2 69377 69379
+146 2 69377 69387
+147 1 69383 69384
+148 2 69383 69385
+149 1 69381 69382
+150 2 69381 69383
+151 6 65552 65550
+152 5 65540 65550
+153 4 69389 69380
+154 5 69380 69390
+155 3 65539 65540
+156 2 65539 65541
+157 1 65543 65544
+158 2 65543 65545
+159 1 65541 65542
+160 2 65541 65543
+161 1 65545 65546
+162 2 65545 65547
+163 1 65547 65548
+164 1 65537 65538
+165 2 65537 65539
+166 2 65537 65547
+167 4 41325 41316
+168 1 41319 41320
+169 2 41319 41321
+170 1 41317 41318
+171 2 41317 41319
+172 3 41315 41316
+173 2 41315 41317
+174 4 195805 195796
+175 5 195796 195806
+176 3 195795 195796
+177 2 195795 195797
+178 1 41321 41322
+179 2 41321 41323
+180 1 41323 41324
+181 6 69392 69390
+182 1 150145 150146
+183 2 150145 150147
+184 2 150145 150155
+185 5 150148 150158
+186 3 150147 150148
+187 2 150147 150149
+188 4 150157 150148
+189 1 150149 150150
+190 2 150149 150151
+191 6 69391 69390
+192 1 195793 195794
+193 2 195793 195795
+194 2 195793 195803
+195 1 195803 195804
+196 1 195801 195802
+197 2 195801 195803
+198 1 195797 195798
+199 2 195797 195799
+200 1 195799 195800
+201 2 195799 195801
+202 1 107225 107226
+203 2 107225 107227
+204 1 43049 43050
+205 2 43049 43051
+206 1 43051 43052
+207 5 188724 188734
+208 4 188733 188724
+209 6 188735 188734
+210 1 43047 43048
+211 2 43047 43049
+212 1 43045 43046
+213 2 43045 43047
+214 4 3053 3044
+215 1 188721 188722
+216 2 188721 188723
+217 2 188721 188731
+218 6 3055 3054
+219 1 188731 188732
+220 6 3056 3054
+221 5 3044 3054
+222 1 3047 3048
+223 2 3047 3049
+224 3 3043 3044
+225 2 3043 3045
+226 1 3045 3046
+227 2 3045 3047
+228 1 101765 101766
+229 2 101765 101767
+230 1 101769 101770
+231 2 101769 101771
+232 1 101767 101768
+233 2 101767 101769
+234 1 107227 107228
+235 3 108387 108388
+236 2 108387 108389
+237 4 108397 108388
+238 1 107217 107218
+239 2 107217 107219
+240 2 107217 107227
+241 6 107935 107934
+242 4 107933 107924
+243 5 107924 107934
+244 3 107923 107924
+245 2 107923 107925
+246 6 107936 107934
+247 6 160479 160478
+248 1 107921 107922
+249 2 107921 107923
+250 2 107921 107931
+251 5 108388 108398
+252 6 108399 108398
+253 6 101776 101774
+254 6 101775 101774
+255 5 101764 101774
+256 4 101773 101764
+257 3 101763 101764
+258 2 101763 101765
+259 1 179271 179272
+260 2 179271 179273
+261 1 101761 101762
+262 2 101761 101763
+263 2 101761 101771
+264 1 101771 101772
+265 1 41339 41340
+266 1 41329 41330
+267 2 41329 41331
+268 2 41329 41339
+269 6 41343 41342
+270 6 41344 41342
+271 4 41341 41332
+272 3 41331 41332
+273 2 41331 41333
+274 5 41332 41342
+275 1 108385 108386
+276 2 108385 108387
+277 2 108385 108395
+278 6 160480 160478
+279 5 160468 160478
+280 1 160471 160472
+281 2 160471 160473
+282 1 160469 160470
+283 2 160469 160471
+284 1 160473 160474
+285 2 160473 160475
+286 1 160475 160476
+287 1 160465 160466
+288 2 160465 160467
+289 2 160465 160475
+290 3 160467 160468
+291 2 160467 160469
+292 6 150159 150158
+293 6 150160 150158
+294 5 179268 179278
+295 6 179280 179278
+296 3 179267 179268
+297 2 179267 179269
+298 1 179275 179276
+299 1 179265 179266
+300 2 179265 179267
+301 2 179265 179275
+302 1 179269 179270
+303 2 179269 179271
+304 1 179273 179274
+305 2 179273 179275
+306 4 179277 179268
+307 4 160477 160468
+308 1 3041 3042
+309 2 3041 3043
+310 2 3041 3051
+311 1 3049 3050
+312 2 3049 3051
+313 1 3051 3052
+314 6 179279 179278
+315 1 41337 41338
+316 2 41337 41339
+317 1 41335 41336
+318 2 41335 41337
+319 1 41333 41334
+320 2 41333 41335
+
+Angles
+
+1 1 111363 111365 111366
+2 2 111363 111365 111367
+3 1 111367 111365 111366
+4 4 111363 111364 111373
+5 5 111363 111364 111374
+6 6 111373 111364 111374
+7 1 107221 107223 107224
+8 2 107221 107223 107225
+9 1 107225 107223 107224
+10 1 40597 40599 40600
+11 2 40597 40599 40601
+12 1 40601 40599 40600
+13 1 40595 40597 40598
+14 2 40595 40597 40599
+15 1 40599 40597 40598
+16 1 111365 111367 111368
+17 2 111365 111367 111369
+18 1 111369 111367 111368
+19 3 188721 188723 188724
+20 2 188721 188723 188725
+21 3 188725 188723 188724
+22 1 188723 188725 188726
+23 2 188723 188725 188727
+24 1 188727 188725 188726
+25 1 188727 188729 188730
+26 2 188727 188729 188731
+27 1 188731 188729 188730
+28 1 188725 188727 188728
+29 2 188725 188727 188729
+30 1 188729 188727 188728
+31 7 20159 20158 20148
+32 7 20160 20158 20148
+33 8 20159 20158 20160
+34 4 20147 20148 20157
+35 5 20147 20148 20158
+36 6 20157 20148 20158
+37 2 41345 41355 41353
+38 1 41345 41355 41356
+39 1 41353 41355 41356
+40 1 108387 108389 108390
+41 2 108387 108389 108391
+42 1 108391 108389 108390
+43 7 41327 41326 41316
+44 7 41328 41326 41316
+45 8 41327 41326 41328
+46 1 108389 108391 108392
+47 2 108389 108391 108393
+48 1 108393 108391 108392
+49 1 41351 41353 41354
+50 2 41351 41353 41355
+51 1 41355 41353 41354
+52 1 41349 41351 41352
+53 2 41349 41351 41353
+54 1 41353 41351 41352
+55 1 107219 107221 107222
+56 2 107219 107221 107223
+57 1 107223 107221 107222
+58 3 107217 107219 107220
+59 2 107217 107219 107221
+60 3 107221 107219 107220
+61 1 41347 41345 41346
+62 1 41355 41345 41346
+63 2 41347 41345 41355
+64 3 41345 41347 41348
+65 2 41345 41347 41349
+66 3 41349 41347 41348
+67 7 41359 41358 41348
+68 7 41360 41358 41348
+69 8 41359 41358 41360
+70 4 41347 41348 41357
+71 5 41347 41348 41358
+72 6 41357 41348 41358
+73 1 41347 41349 41350
+74 2 41347 41349 41351
+75 1 41351 41349 41350
+76 4 107219 107220 107229
+77 5 107219 107220 107230
+78 6 107229 107220 107230
+79 7 107231 107230 107220
+80 7 107232 107230 107220
+81 8 107231 107230 107232
+82 1 148085 148087 148088
+83 2 148085 148087 148089
+84 1 148089 148087 148088
+85 1 148087 148089 148090
+86 2 148087 148089 148091
+87 1 148091 148089 148090
+88 2 40593 40603 40601
+89 1 40593 40603 40604
+90 1 40601 40603 40604
+91 1 40599 40601 40602
+92 2 40599 40601 40603
+93 1 40603 40601 40602
+94 1 40595 40593 40594
+95 1 40603 40593 40594
+96 2 40595 40593 40603
+97 3 40593 40595 40596
+98 2 40593 40595 40597
+99 3 40597 40595 40596
+100 4 41315 41316 41325
+101 5 41315 41316 41326
+102 6 41325 41316 41326
+103 1 108391 108393 108394
+104 2 108391 108393 108395
+105 1 108395 108393 108394
+106 1 41315 41313 41314
+107 1 41323 41313 41314
+108 2 41315 41313 41323
+109 2 108385 108395 108393
+110 1 108385 108395 108396
+111 1 108393 108395 108396
+112 7 148095 148094 148084
+113 7 148096 148094 148084
+114 8 148095 148094 148096
+115 7 40607 40606 40596
+116 7 40608 40606 40596
+117 8 40607 40606 40608
+118 4 40595 40596 40605
+119 5 40595 40596 40606
+120 6 40605 40596 40606
+121 4 148083 148084 148093
+122 5 148083 148084 148094
+123 6 148093 148084 148094
+124 1 148083 148085 148086
+125 2 148083 148085 148087
+126 1 148087 148085 148086
+127 3 148081 148083 148084
+128 2 148081 148083 148085
+129 3 148085 148083 148084
+130 1 148083 148081 148082
+131 1 148091 148081 148082
+132 2 148083 148081 148091
+133 2 148081 148091 148089
+134 1 148081 148091 148092
+135 1 148089 148091 148092
+136 3 111361 111363 111364
+137 2 111361 111363 111365
+138 3 111365 111363 111364
+139 1 111367 111369 111370
+140 2 111367 111369 111371
+141 1 111371 111369 111370
+142 2 111361 111371 111369
+143 1 111361 111371 111372
+144 1 111369 111371 111372
+145 1 111363 111361 111362
+146 1 111371 111361 111362
+147 2 111363 111361 111371
+148 7 195807 195806 195796
+149 7 195808 195806 195796
+150 8 195807 195806 195808
+151 1 43043 43041 43042
+152 1 43051 43041 43042
+153 2 43043 43041 43051
+154 3 43041 43043 43044
+155 2 43041 43043 43045
+156 3 43045 43043 43044
+157 4 43043 43044 43053
+158 5 43043 43044 43054
+159 6 43053 43044 43054
+160 7 43055 43054 43044
+161 7 43056 43054 43044
+162 8 43055 43054 43056
+163 2 150145 150155 150153
+164 1 150145 150155 150156
+165 1 150153 150155 150156
+166 7 111375 111374 111364
+167 7 111376 111374 111364
+168 8 111375 111374 111376
+169 1 150151 150153 150154
+170 2 150151 150153 150155
+171 1 150155 150153 150154
+172 1 150149 150151 150152
+173 2 150149 150151 150153
+174 1 150153 150151 150152
+175 2 20145 20155 20153
+176 1 20145 20155 20156
+177 1 20153 20155 20156
+178 1 20147 20145 20146
+179 1 20155 20145 20146
+180 2 20147 20145 20155
+181 1 20147 20149 20150
+182 2 20147 20149 20151
+183 1 20151 20149 20150
+184 1 20151 20153 20154
+185 2 20151 20153 20155
+186 1 20155 20153 20154
+187 1 20149 20151 20152
+188 2 20149 20151 20153
+189 1 20153 20151 20152
+190 3 20145 20147 20148
+191 2 20145 20147 20149
+192 3 20149 20147 20148
+193 1 107923 107925 107926
+194 2 107923 107925 107927
+195 1 107927 107925 107926
+196 1 107925 107927 107928
+197 2 107925 107927 107929
+198 1 107929 107927 107928
+199 2 107921 107931 107929
+200 1 107921 107931 107932
+201 1 107929 107931 107932
+202 1 107927 107929 107930
+203 2 107927 107929 107931
+204 1 107931 107929 107930
+205 1 69383 69385 69386
+206 2 69383 69385 69387
+207 1 69387 69385 69386
+208 2 69377 69387 69385
+209 1 69377 69387 69388
+210 1 69385 69387 69388
+211 3 69377 69379 69380
+212 2 69377 69379 69381
+213 3 69381 69379 69380
+214 1 69379 69377 69378
+215 1 69387 69377 69378
+216 2 69379 69377 69387
+217 1 69381 69383 69384
+218 2 69381 69383 69385
+219 1 69385 69383 69384
+220 1 69379 69381 69382
+221 2 69379 69381 69383
+222 1 69383 69381 69382
+223 7 65551 65550 65540
+224 7 65552 65550 65540
+225 8 65551 65550 65552
+226 4 65539 65540 65549
+227 5 65539 65540 65550
+228 6 65549 65540 65550
+229 4 69379 69380 69389
+230 5 69379 69380 69390
+231 6 69389 69380 69390
+232 3 65537 65539 65540
+233 2 65537 65539 65541
+234 3 65541 65539 65540
+235 1 65541 65543 65544
+236 2 65541 65543 65545
+237 1 65545 65543 65544
+238 1 65539 65541 65542
+239 2 65539 65541 65543
+240 1 65543 65541 65542
+241 1 65543 65545 65546
+242 2 65543 65545 65547
+243 1 65547 65545 65546
+244 2 65537 65547 65545
+245 1 65537 65547 65548
+246 1 65545 65547 65548
+247 1 65539 65537 65538
+248 1 65547 65537 65538
+249 2 65539 65537 65547
+250 1 41317 41319 41320
+251 2 41317 41319 41321
+252 1 41321 41319 41320
+253 1 41315 41317 41318
+254 2 41315 41317 41319
+255 1 41319 41317 41318
+256 3 41313 41315 41316
+257 2 41313 41315 41317
+258 3 41317 41315 41316
+259 4 195795 195796 195805
+260 5 195795 195796 195806
+261 6 195805 195796 195806
+262 3 195793 195795 195796
+263 2 195793 195795 195797
+264 3 195797 195795 195796
+265 1 41319 41321 41322
+266 2 41319 41321 41323
+267 1 41323 41321 41322
+268 2 41313 41323 41321
+269 1 41313 41323 41324
+270 1 41321 41323 41324
+271 7 69391 69390 69380
+272 7 69392 69390 69380
+273 8 69391 69390 69392
+274 1 150147 150145 150146
+275 1 150155 150145 150146
+276 2 150147 150145 150155
+277 4 150147 150148 150157
+278 5 150147 150148 150158
+279 6 150157 150148 150158
+280 3 150145 150147 150148
+281 2 150145 150147 150149
+282 3 150149 150147 150148
+283 7 150159 150158 150148
+284 7 150160 150158 150148
+285 8 150159 150158 150160
+286 1 150147 150149 150150
+287 2 150147 150149 150151
+288 1 150151 150149 150150
+289 1 195795 195793 195794
+290 1 195803 195793 195794
+291 2 195795 195793 195803
+292 2 195793 195803 195801
+293 1 195793 195803 195804
+294 1 195801 195803 195804
+295 1 195799 195801 195802
+296 2 195799 195801 195803
+297 1 195803 195801 195802
+298 1 195795 195797 195798
+299 2 195795 195797 195799
+300 1 195799 195797 195798
+301 1 195797 195799 195800
+302 2 195797 195799 195801
+303 1 195801 195799 195800
+304 1 107223 107225 107226
+305 2 107223 107225 107227
+306 1 107227 107225 107226
+307 1 43047 43049 43050
+308 2 43047 43049 43051
+309 1 43051 43049 43050
+310 2 43041 43051 43049
+311 1 43041 43051 43052
+312 1 43049 43051 43052
+313 4 188723 188724 188733
+314 5 188723 188724 188734
+315 6 188733 188724 188734
+316 7 188735 188734 188724
+317 7 188736 188734 188724
+318 8 188735 188734 188736
+319 1 43045 43047 43048
+320 2 43045 43047 43049
+321 1 43049 43047 43048
+322 1 43043 43045 43046
+323 2 43043 43045 43047
+324 1 43047 43045 43046
+325 1 188723 188721 188722
+326 1 188731 188721 188722
+327 2 188723 188721 188731
+328 2 188721 188731 188729
+329 1 188721 188731 188732
+330 1 188729 188731 188732
+331 7 3055 3054 3044
+332 7 3056 3054 3044
+333 8 3055 3054 3056
+334 4 3043 3044 3053
+335 5 3043 3044 3054
+336 6 3053 3044 3054
+337 1 3045 3047 3048
+338 2 3045 3047 3049
+339 1 3049 3047 3048
+340 3 3041 3043 3044
+341 2 3041 3043 3045
+342 3 3045 3043 3044
+343 1 3043 3045 3046
+344 2 3043 3045 3047
+345 1 3047 3045 3046
+346 1 101763 101765 101766
+347 2 101763 101765 101767
+348 1 101767 101765 101766
+349 1 101767 101769 101770
+350 2 101767 101769 101771
+351 1 101771 101769 101770
+352 1 101765 101767 101768
+353 2 101765 101767 101769
+354 1 101769 101767 101768
+355 2 107217 107227 107225
+356 1 107217 107227 107228
+357 1 107225 107227 107228
+358 3 108385 108387 108388
+359 2 108385 108387 108389
+360 3 108389 108387 108388
+361 1 107219 107217 107218
+362 1 107227 107217 107218
+363 2 107219 107217 107227
+364 7 107935 107934 107924
+365 7 107936 107934 107924
+366 8 107935 107934 107936
+367 4 107923 107924 107933
+368 5 107923 107924 107934
+369 6 107933 107924 107934
+370 3 107921 107923 107924
+371 2 107921 107923 107925
+372 3 107925 107923 107924
+373 1 107923 107921 107922
+374 1 107931 107921 107922
+375 2 107923 107921 107931
+376 4 108387 108388 108397
+377 5 108387 108388 108398
+378 6 108397 108388 108398
+379 7 108399 108398 108388
+380 7 108400 108398 108388
+381 8 108399 108398 108400
+382 7 101775 101774 101764
+383 7 101776 101774 101764
+384 8 101775 101774 101776
+385 4 101763 101764 101773
+386 5 101763 101764 101774
+387 6 101773 101764 101774
+388 3 101761 101763 101764
+389 2 101761 101763 101765
+390 3 101765 101763 101764
+391 1 179269 179271 179272
+392 2 179269 179271 179273
+393 1 179273 179271 179272
+394 1 101763 101761 101762
+395 1 101771 101761 101762
+396 2 101763 101761 101771
+397 2 101761 101771 101769
+398 1 101761 101771 101772
+399 1 101769 101771 101772
+400 2 41329 41339 41337
+401 1 41329 41339 41340
+402 1 41337 41339 41340
+403 1 41331 41329 41330
+404 1 41339 41329 41330
+405 2 41331 41329 41339
+406 7 41343 41342 41332
+407 7 41344 41342 41332
+408 8 41343 41342 41344
+409 3 41329 41331 41332
+410 2 41329 41331 41333
+411 3 41333 41331 41332
+412 4 41331 41332 41341
+413 5 41331 41332 41342
+414 6 41341 41332 41342
+415 1 108387 108385 108386
+416 1 108395 108385 108386
+417 2 108387 108385 108395
+418 7 160479 160478 160468
+419 7 160480 160478 160468
+420 8 160479 160478 160480
+421 4 160467 160468 160477
+422 5 160467 160468 160478
+423 6 160477 160468 160478
+424 1 160469 160471 160472
+425 2 160469 160471 160473
+426 1 160473 160471 160472
+427 1 160467 160469 160470
+428 2 160467 160469 160471
+429 1 160471 160469 160470
+430 1 160471 160473 160474
+431 2 160471 160473 160475
+432 1 160475 160473 160474
+433 2 160465 160475 160473
+434 1 160465 160475 160476
+435 1 160473 160475 160476
+436 1 160467 160465 160466
+437 1 160475 160465 160466
+438 2 160467 160465 160475
+439 3 160465 160467 160468
+440 2 160465 160467 160469
+441 3 160469 160467 160468
+442 7 179279 179278 179268
+443 7 179280 179278 179268
+444 8 179279 179278 179280
+445 4 179267 179268 179277
+446 5 179267 179268 179278
+447 6 179277 179268 179278
+448 3 179265 179267 179268
+449 2 179265 179267 179269
+450 3 179269 179267 179268
+451 2 179265 179275 179273
+452 1 179265 179275 179276
+453 1 179273 179275 179276
+454 1 179267 179265 179266
+455 1 179275 179265 179266
+456 2 179267 179265 179275
+457 1 179267 179269 179270
+458 2 179267 179269 179271
+459 1 179271 179269 179270
+460 1 179271 179273 179274
+461 2 179271 179273 179275
+462 1 179275 179273 179274
+463 1 3043 3041 3042
+464 1 3051 3041 3042
+465 2 3043 3041 3051
+466 1 3047 3049 3050
+467 2 3047 3049 3051
+468 1 3051 3049 3050
+469 2 3041 3051 3049
+470 1 3041 3051 3052
+471 1 3049 3051 3052
+472 1 41335 41337 41338
+473 2 41335 41337 41339
+474 1 41339 41337 41338
+475 1 41333 41335 41336
+476 2 41333 41335 41337
+477 1 41337 41335 41336
+478 1 41331 41333 41334
+479 2 41331 41333 41335
+480 1 41335 41333 41334
+
+Dihedrals
+
+1 1 111366 111365 111363 111364
+2 3 111367 111365 111363 111364
+3 2 111363 111365 111367 111368
+4 4 111363 111365 111367 111369
+5 5 111366 111365 111367 111368
+6 8 111363 111364 111374 111375
+7 8 111363 111364 111374 111376
+8 9 111373 111364 111374 111375
+9 9 111373 111364 111374 111376
+10 2 107225 107223 107221 107222
+11 2 107221 107223 107225 107226
+12 4 107221 107223 107225 107227
+13 5 107224 107223 107225 107226
+14 2 40601 40599 40597 40598
+15 2 40597 40599 40601 40602
+16 4 40597 40599 40601 40603
+17 5 40600 40599 40601 40602
+18 1 40598 40597 40595 40596
+19 3 40599 40597 40595 40596
+20 2 40595 40597 40599 40600
+21 4 40595 40597 40599 40601
+22 5 40598 40597 40599 40600
+23 2 111369 111367 111365 111366
+24 2 111365 111367 111369 111370
+25 4 111365 111367 111369 111371
+26 5 111368 111367 111369 111370
+27 2 188725 188723 188721 188722
+28 6 188721 188723 188724 188733
+29 7 188721 188723 188724 188734
+30 6 188725 188723 188724 188733
+31 7 188725 188723 188724 188734
+32 2 188721 188723 188725 188726
+33 4 188721 188723 188725 188727
+34 1 188726 188725 188723 188724
+35 3 188727 188725 188723 188724
+36 2 188723 188725 188727 188728
+37 4 188723 188725 188727 188729
+38 5 188726 188725 188727 188728
+39 2 188731 188729 188727 188728
+40 4 188727 188729 188731 188721
+41 2 188727 188729 188731 188732
+42 5 188730 188729 188731 188732
+43 2 188729 188727 188725 188726
+44 2 188725 188727 188729 188730
+45 4 188725 188727 188729 188731
+46 5 188728 188727 188729 188730
+47 8 20147 20148 20158 20159
+48 8 20147 20148 20158 20160
+49 9 20157 20148 20158 20159
+50 9 20157 20148 20158 20160
+51 2 41353 41355 41345 41346
+52 2 41345 41355 41353 41354
+53 1 108390 108389 108387 108388
+54 3 108391 108389 108387 108388
+55 2 108387 108389 108391 108392
+56 4 108387 108389 108391 108393
+57 5 108390 108389 108391 108392
+58 2 108393 108391 108389 108390
+59 2 108389 108391 108393 108394
+60 4 108389 108391 108393 108395
+61 5 108392 108391 108393 108394
+62 2 41355 41353 41351 41352
+63 4 41351 41353 41355 41345
+64 2 41351 41353 41355 41356
+65 5 41354 41353 41355 41356
+66 2 41353 41351 41349 41350
+67 2 41349 41351 41353 41354
+68 4 41349 41351 41353 41355
+69 5 41352 41351 41353 41354
+70 1 107222 107221 107219 107220
+71 3 107223 107221 107219 107220
+72 2 107219 107221 107223 107224
+73 4 107219 107221 107223 107225
+74 5 107222 107221 107223 107224
+75 2 107221 107219 107217 107218
+76 6 107217 107219 107220 107229
+77 7 107217 107219 107220 107230
+78 6 107221 107219 107220 107229
+79 7 107221 107219 107220 107230
+80 2 107217 107219 107221 107222
+81 4 107217 107219 107221 107223
+82 1 41346 41345 41347 41348
+83 3 41355 41345 41347 41348
+84 4 41355 41345 41347 41349
+85 5 41346 41345 41355 41356
+86 4 41347 41345 41355 41353
+87 2 41347 41345 41355 41356
+88 2 41349 41347 41345 41346
+89 6 41345 41347 41348 41357
+90 7 41345 41347 41348 41358
+91 6 41349 41347 41348 41357
+92 7 41349 41347 41348 41358
+93 2 41345 41347 41349 41350
+94 4 41345 41347 41349 41351
+95 8 41347 41348 41358 41359
+96 8 41347 41348 41358 41360
+97 9 41357 41348 41358 41359
+98 9 41357 41348 41358 41360
+99 1 41350 41349 41347 41348
+100 3 41351 41349 41347 41348
+101 2 41347 41349 41351 41352
+102 4 41347 41349 41351 41353
+103 5 41350 41349 41351 41352
+104 8 107219 107220 107230 107231
+105 8 107219 107220 107230 107232
+106 9 107229 107220 107230 107231
+107 9 107229 107220 107230 107232
+108 2 148089 148087 148085 148086
+109 2 148085 148087 148089 148090
+110 4 148085 148087 148089 148091
+111 5 148088 148087 148089 148090
+112 2 148091 148089 148087 148088
+113 4 148087 148089 148091 148081
+114 2 148087 148089 148091 148092
+115 5 148090 148089 148091 148092
+116 2 40601 40603 40593 40594
+117 2 40593 40603 40601 40602
+118 2 40603 40601 40599 40600
+119 4 40599 40601 40603 40593
+120 2 40599 40601 40603 40604
+121 5 40602 40601 40603 40604
+122 1 40594 40593 40595 40596
+123 3 40603 40593 40595 40596
+124 4 40603 40593 40595 40597
+125 5 40594 40593 40603 40604
+126 4 40595 40593 40603 40601
+127 2 40595 40593 40603 40604
+128 2 40597 40595 40593 40594
+129 6 40593 40595 40596 40605
+130 7 40593 40595 40596 40606
+131 6 40597 40595 40596 40605
+132 7 40597 40595 40596 40606
+133 2 40593 40595 40597 40598
+134 4 40593 40595 40597 40599
+135 8 41315 41316 41326 41327
+136 8 41315 41316 41326 41328
+137 9 41325 41316 41326 41327
+138 9 41325 41316 41326 41328
+139 2 108395 108393 108391 108392
+140 4 108391 108393 108395 108385
+141 2 108391 108393 108395 108396
+142 5 108394 108393 108395 108396
+143 1 41314 41313 41315 41316
+144 3 41323 41313 41315 41316
+145 4 41323 41313 41315 41317
+146 5 41314 41313 41323 41324
+147 4 41315 41313 41323 41321
+148 2 41315 41313 41323 41324
+149 2 108393 108395 108385 108386
+150 2 108385 108395 108393 108394
+151 8 40595 40596 40606 40607
+152 8 40595 40596 40606 40608
+153 9 40605 40596 40606 40607
+154 9 40605 40596 40606 40608
+155 8 148083 148084 148094 148095
+156 8 148083 148084 148094 148096
+157 9 148093 148084 148094 148095
+158 9 148093 148084 148094 148096
+159 1 148086 148085 148083 148084
+160 3 148087 148085 148083 148084
+161 2 148083 148085 148087 148088
+162 4 148083 148085 148087 148089
+163 5 148086 148085 148087 148088
+164 2 148085 148083 148081 148082
+165 6 148081 148083 148084 148093
+166 7 148081 148083 148084 148094
+167 6 148085 148083 148084 148093
+168 7 148085 148083 148084 148094
+169 2 148081 148083 148085 148086
+170 4 148081 148083 148085 148087
+171 1 148082 148081 148083 148084
+172 3 148091 148081 148083 148084
+173 4 148091 148081 148083 148085
+174 5 148082 148081 148091 148092
+175 4 148083 148081 148091 148089
+176 2 148083 148081 148091 148092
+177 2 148089 148091 148081 148082
+178 2 148081 148091 148089 148090
+179 2 111365 111363 111361 111362
+180 6 111361 111363 111364 111373
+181 7 111361 111363 111364 111374
+182 6 111365 111363 111364 111373
+183 7 111365 111363 111364 111374
+184 2 111361 111363 111365 111366
+185 4 111361 111363 111365 111367
+186 2 111371 111369 111367 111368
+187 4 111367 111369 111371 111361
+188 2 111367 111369 111371 111372
+189 5 111370 111369 111371 111372
+190 2 111369 111371 111361 111362
+191 2 111361 111371 111369 111370
+192 1 111362 111361 111363 111364
+193 3 111371 111361 111363 111364
+194 4 111371 111361 111363 111365
+195 5 111362 111361 111371 111372
+196 4 111363 111361 111371 111369
+197 2 111363 111361 111371 111372
+198 1 43042 43041 43043 43044
+199 3 43051 43041 43043 43044
+200 4 43051 43041 43043 43045
+201 5 43042 43041 43051 43052
+202 4 43043 43041 43051 43049
+203 2 43043 43041 43051 43052
+204 2 43045 43043 43041 43042
+205 6 43041 43043 43044 43053
+206 7 43041 43043 43044 43054
+207 6 43045 43043 43044 43053
+208 7 43045 43043 43044 43054
+209 2 43041 43043 43045 43046
+210 4 43041 43043 43045 43047
+211 8 43043 43044 43054 43055
+212 8 43043 43044 43054 43056
+213 9 43053 43044 43054 43055
+214 9 43053 43044 43054 43056
+215 2 150153 150155 150145 150146
+216 2 150145 150155 150153 150154
+217 2 150155 150153 150151 150152
+218 4 150151 150153 150155 150145
+219 2 150151 150153 150155 150156
+220 5 150154 150153 150155 150156
+221 2 150153 150151 150149 150150
+222 2 150149 150151 150153 150154
+223 4 150149 150151 150153 150155
+224 5 150152 150151 150153 150154
+225 2 20153 20155 20145 20146
+226 2 20145 20155 20153 20154
+227 1 20146 20145 20147 20148
+228 3 20155 20145 20147 20148
+229 4 20155 20145 20147 20149
+230 5 20146 20145 20155 20156
+231 4 20147 20145 20155 20153
+232 2 20147 20145 20155 20156
+233 1 20150 20149 20147 20148
+234 3 20151 20149 20147 20148
+235 2 20147 20149 20151 20152
+236 4 20147 20149 20151 20153
+237 5 20150 20149 20151 20152
+238 2 20155 20153 20151 20152
+239 4 20151 20153 20155 20145
+240 2 20151 20153 20155 20156
+241 5 20154 20153 20155 20156
+242 2 20153 20151 20149 20150
+243 2 20149 20151 20153 20154
+244 4 20149 20151 20153 20155
+245 5 20152 20151 20153 20154
+246 2 20149 20147 20145 20146
+247 6 20145 20147 20148 20157
+248 7 20145 20147 20148 20158
+249 6 20149 20147 20148 20157
+250 7 20149 20147 20148 20158
+251 2 20145 20147 20149 20150
+252 4 20145 20147 20149 20151
+253 1 107926 107925 107923 107924
+254 3 107927 107925 107923 107924
+255 2 107923 107925 107927 107928
+256 4 107923 107925 107927 107929
+257 5 107926 107925 107927 107928
+258 2 107929 107927 107925 107926
+259 2 107925 107927 107929 107930
+260 4 107925 107927 107929 107931
+261 5 107928 107927 107929 107930
+262 2 107929 107931 107921 107922
+263 2 107921 107931 107929 107930
+264 2 107931 107929 107927 107928
+265 4 107927 107929 107931 107921
+266 2 107927 107929 107931 107932
+267 5 107930 107929 107931 107932
+268 2 69387 69385 69383 69384
+269 4 69383 69385 69387 69377
+270 2 69383 69385 69387 69388
+271 5 69386 69385 69387 69388
+272 2 69385 69387 69377 69378
+273 2 69377 69387 69385 69386
+274 2 69381 69379 69377 69378
+275 6 69377 69379 69380 69389
+276 7 69377 69379 69380 69390
+277 6 69381 69379 69380 69389
+278 7 69381 69379 69380 69390
+279 2 69377 69379 69381 69382
+280 4 69377 69379 69381 69383
+281 1 69378 69377 69379 69380
+282 3 69387 69377 69379 69380
+283 4 69387 69377 69379 69381
+284 5 69378 69377 69387 69388
+285 4 69379 69377 69387 69385
+286 2 69379 69377 69387 69388
+287 2 69385 69383 69381 69382
+288 2 69381 69383 69385 69386
+289 4 69381 69383 69385 69387
+290 5 69384 69383 69385 69386
+291 1 69382 69381 69379 69380
+292 3 69383 69381 69379 69380
+293 2 69379 69381 69383 69384
+294 4 69379 69381 69383 69385
+295 5 69382 69381 69383 69384
+296 8 65539 65540 65550 65551
+297 8 65539 65540 65550 65552
+298 9 65549 65540 65550 65551
+299 9 65549 65540 65550 65552
+300 8 69379 69380 69390 69391
+301 8 69379 69380 69390 69392
+302 9 69389 69380 69390 69391
+303 9 69389 69380 69390 69392
+304 2 65541 65539 65537 65538
+305 6 65537 65539 65540 65549
+306 7 65537 65539 65540 65550
+307 6 65541 65539 65540 65549
+308 7 65541 65539 65540 65550
+309 2 65537 65539 65541 65542
+310 4 65537 65539 65541 65543
+311 2 65545 65543 65541 65542
+312 2 65541 65543 65545 65546
+313 4 65541 65543 65545 65547
+314 5 65544 65543 65545 65546
+315 1 65542 65541 65539 65540
+316 3 65543 65541 65539 65540
+317 2 65539 65541 65543 65544
+318 4 65539 65541 65543 65545
+319 5 65542 65541 65543 65544
+320 2 65547 65545 65543 65544
+321 4 65543 65545 65547 65537
+322 2 65543 65545 65547 65548
+323 5 65546 65545 65547 65548
+324 2 65545 65547 65537 65538
+325 2 65537 65547 65545 65546
+326 1 65538 65537 65539 65540
+327 3 65547 65537 65539 65540
+328 4 65547 65537 65539 65541
+329 5 65538 65537 65547 65548
+330 4 65539 65537 65547 65545
+331 2 65539 65537 65547 65548
+332 2 41321 41319 41317 41318
+333 2 41317 41319 41321 41322
+334 4 41317 41319 41321 41323
+335 5 41320 41319 41321 41322
+336 1 41318 41317 41315 41316
+337 3 41319 41317 41315 41316
+338 2 41315 41317 41319 41320
+339 4 41315 41317 41319 41321
+340 5 41318 41317 41319 41320
+341 2 41317 41315 41313 41314
+342 6 41313 41315 41316 41325
+343 7 41313 41315 41316 41326
+344 6 41317 41315 41316 41325
+345 7 41317 41315 41316 41326
+346 2 41313 41315 41317 41318
+347 4 41313 41315 41317 41319
+348 8 195795 195796 195806 195807
+349 8 195795 195796 195806 195808
+350 9 195805 195796 195806 195807
+351 9 195805 195796 195806 195808
+352 2 195797 195795 195793 195794
+353 6 195793 195795 195796 195805
+354 7 195793 195795 195796 195806
+355 6 195797 195795 195796 195805
+356 7 195797 195795 195796 195806
+357 2 195793 195795 195797 195798
+358 4 195793 195795 195797 195799
+359 2 41323 41321 41319 41320
+360 4 41319 41321 41323 41313
+361 2 41319 41321 41323 41324
+362 5 41322 41321 41323 41324
+363 2 41321 41323 41313 41314
+364 2 41313 41323 41321 41322
+365 1 150146 150145 150147 150148
+366 3 150155 150145 150147 150148
+367 4 150155 150145 150147 150149
+368 5 150146 150145 150155 150156
+369 4 150147 150145 150155 150153
+370 2 150147 150145 150155 150156
+371 8 150147 150148 150158 150159
+372 8 150147 150148 150158 150160
+373 9 150157 150148 150158 150159
+374 9 150157 150148 150158 150160
+375 2 150149 150147 150145 150146
+376 6 150145 150147 150148 150157
+377 7 150145 150147 150148 150158
+378 6 150149 150147 150148 150157
+379 7 150149 150147 150148 150158
+380 2 150145 150147 150149 150150
+381 4 150145 150147 150149 150151
+382 1 150150 150149 150147 150148
+383 3 150151 150149 150147 150148
+384 2 150147 150149 150151 150152
+385 4 150147 150149 150151 150153
+386 5 150150 150149 150151 150152
+387 1 195794 195793 195795 195796
+388 3 195803 195793 195795 195796
+389 4 195803 195793 195795 195797
+390 5 195794 195793 195803 195804
+391 4 195795 195793 195803 195801
+392 2 195795 195793 195803 195804
+393 2 195801 195803 195793 195794
+394 2 195793 195803 195801 195802
+395 2 195803 195801 195799 195800
+396 4 195799 195801 195803 195793
+397 2 195799 195801 195803 195804
+398 5 195802 195801 195803 195804
+399 1 195798 195797 195795 195796
+400 3 195799 195797 195795 195796
+401 2 195795 195797 195799 195800
+402 4 195795 195797 195799 195801
+403 5 195798 195797 195799 195800
+404 2 195801 195799 195797 195798
+405 2 195797 195799 195801 195802
+406 4 195797 195799 195801 195803
+407 5 195800 195799 195801 195802
+408 2 107227 107225 107223 107224
+409 4 107223 107225 107227 107217
+410 2 107223 107225 107227 107228
+411 5 107226 107225 107227 107228
+412 2 43051 43049 43047 43048
+413 4 43047 43049 43051 43041
+414 2 43047 43049 43051 43052
+415 5 43050 43049 43051 43052
+416 2 43049 43051 43041 43042
+417 2 43041 43051 43049 43050
+418 8 188723 188724 188734 188735
+419 8 188723 188724 188734 188736
+420 9 188733 188724 188734 188735
+421 9 188733 188724 188734 188736
+422 2 43049 43047 43045 43046
+423 2 43045 43047 43049 43050
+424 4 43045 43047 43049 43051
+425 5 43048 43047 43049 43050
+426 1 43046 43045 43043 43044
+427 3 43047 43045 43043 43044
+428 2 43043 43045 43047 43048
+429 4 43043 43045 43047 43049
+430 5 43046 43045 43047 43048
+431 1 188722 188721 188723 188724
+432 3 188731 188721 188723 188724
+433 4 188731 188721 188723 188725
+434 5 188722 188721 188731 188732
+435 4 188723 188721 188731 188729
+436 2 188723 188721 188731 188732
+437 2 188729 188731 188721 188722
+438 2 188721 188731 188729 188730
+439 8 3043 3044 3054 3055
+440 8 3043 3044 3054 3056
+441 9 3053 3044 3054 3055
+442 9 3053 3044 3054 3056
+443 2 3049 3047 3045 3046
+444 2 3045 3047 3049 3050
+445 4 3045 3047 3049 3051
+446 5 3048 3047 3049 3050
+447 2 3045 3043 3041 3042
+448 6 3041 3043 3044 3053
+449 7 3041 3043 3044 3054
+450 6 3045 3043 3044 3053
+451 7 3045 3043 3044 3054
+452 2 3041 3043 3045 3046
+453 4 3041 3043 3045 3047
+454 1 3046 3045 3043 3044
+455 3 3047 3045 3043 3044
+456 2 3043 3045 3047 3048
+457 4 3043 3045 3047 3049
+458 5 3046 3045 3047 3048
+459 1 101766 101765 101763 101764
+460 3 101767 101765 101763 101764
+461 2 101763 101765 101767 101768
+462 4 101763 101765 101767 101769
+463 5 101766 101765 101767 101768
+464 2 101771 101769 101767 101768
+465 4 101767 101769 101771 101761
+466 2 101767 101769 101771 101772
+467 5 101770 101769 101771 101772
+468 2 101769 101767 101765 101766
+469 2 101765 101767 101769 101770
+470 4 101765 101767 101769 101771
+471 5 101768 101767 101769 101770
+472 2 107225 107227 107217 107218
+473 2 107217 107227 107225 107226
+474 2 108389 108387 108385 108386
+475 6 108385 108387 108388 108397
+476 7 108385 108387 108388 108398
+477 6 108389 108387 108388 108397
+478 7 108389 108387 108388 108398
+479 2 108385 108387 108389 108390
+480 4 108385 108387 108389 108391
+481 1 107218 107217 107219 107220
+482 3 107227 107217 107219 107220
+483 4 107227 107217 107219 107221
+484 5 107218 107217 107227 107228
+485 4 107219 107217 107227 107225
+486 2 107219 107217 107227 107228
+487 8 107923 107924 107934 107935
+488 8 107923 107924 107934 107936
+489 9 107933 107924 107934 107935
+490 9 107933 107924 107934 107936
+491 2 107925 107923 107921 107922
+492 6 107921 107923 107924 107933
+493 7 107921 107923 107924 107934
+494 6 107925 107923 107924 107933
+495 7 107925 107923 107924 107934
+496 2 107921 107923 107925 107926
+497 4 107921 107923 107925 107927
+498 1 107922 107921 107923 107924
+499 3 107931 107921 107923 107924
+500 4 107931 107921 107923 107925
+501 5 107922 107921 107931 107932
+502 4 107923 107921 107931 107929
+503 2 107923 107921 107931 107932
+504 8 108387 108388 108398 108399
+505 8 108387 108388 108398 108400
+506 9 108397 108388 108398 108399
+507 9 108397 108388 108398 108400
+508 8 101763 101764 101774 101775
+509 8 101763 101764 101774 101776
+510 9 101773 101764 101774 101775
+511 9 101773 101764 101774 101776
+512 2 101765 101763 101761 101762
+513 6 101761 101763 101764 101773
+514 7 101761 101763 101764 101774
+515 6 101765 101763 101764 101773
+516 7 101765 101763 101764 101774
+517 2 101761 101763 101765 101766
+518 4 101761 101763 101765 101767
+519 2 179273 179271 179269 179270
+520 2 179269 179271 179273 179274
+521 4 179269 179271 179273 179275
+522 5 179272 179271 179273 179274
+523 1 101762 101761 101763 101764
+524 3 101771 101761 101763 101764
+525 4 101771 101761 101763 101765
+526 5 101762 101761 101771 101772
+527 4 101763 101761 101771 101769
+528 2 101763 101761 101771 101772
+529 2 101769 101771 101761 101762
+530 2 101761 101771 101769 101770
+531 2 41337 41339 41329 41330
+532 2 41329 41339 41337 41338
+533 1 41330 41329 41331 41332
+534 3 41339 41329 41331 41332
+535 4 41339 41329 41331 41333
+536 5 41330 41329 41339 41340
+537 4 41331 41329 41339 41337
+538 2 41331 41329 41339 41340
+539 2 41333 41331 41329 41330
+540 6 41329 41331 41332 41341
+541 7 41329 41331 41332 41342
+542 6 41333 41331 41332 41341
+543 7 41333 41331 41332 41342
+544 2 41329 41331 41333 41334
+545 4 41329 41331 41333 41335
+546 8 41331 41332 41342 41343
+547 8 41331 41332 41342 41344
+548 9 41341 41332 41342 41343
+549 9 41341 41332 41342 41344
+550 1 108386 108385 108387 108388
+551 3 108395 108385 108387 108388
+552 4 108395 108385 108387 108389
+553 5 108386 108385 108395 108396
+554 4 108387 108385 108395 108393
+555 2 108387 108385 108395 108396
+556 8 160467 160468 160478 160479
+557 8 160467 160468 160478 160480
+558 9 160477 160468 160478 160479
+559 9 160477 160468 160478 160480
+560 2 160473 160471 160469 160470
+561 2 160469 160471 160473 160474
+562 4 160469 160471 160473 160475
+563 5 160472 160471 160473 160474
+564 1 160470 160469 160467 160468
+565 3 160471 160469 160467 160468
+566 2 160467 160469 160471 160472
+567 4 160467 160469 160471 160473
+568 5 160470 160469 160471 160472
+569 2 160475 160473 160471 160472
+570 4 160471 160473 160475 160465
+571 2 160471 160473 160475 160476
+572 5 160474 160473 160475 160476
+573 2 160473 160475 160465 160466
+574 2 160465 160475 160473 160474
+575 1 160466 160465 160467 160468
+576 3 160475 160465 160467 160468
+577 4 160475 160465 160467 160469
+578 5 160466 160465 160475 160476
+579 4 160467 160465 160475 160473
+580 2 160467 160465 160475 160476
+581 2 160469 160467 160465 160466
+582 6 160465 160467 160468 160477
+583 7 160465 160467 160468 160478
+584 6 160469 160467 160468 160477
+585 7 160469 160467 160468 160478
+586 2 160465 160467 160469 160470
+587 4 160465 160467 160469 160471
+588 8 179267 179268 179278 179279
+589 8 179267 179268 179278 179280
+590 9 179277 179268 179278 179279
+591 9 179277 179268 179278 179280
+592 2 179269 179267 179265 179266
+593 6 179265 179267 179268 179277
+594 7 179265 179267 179268 179278
+595 6 179269 179267 179268 179277
+596 7 179269 179267 179268 179278
+597 2 179265 179267 179269 179270
+598 4 179265 179267 179269 179271
+599 2 179273 179275 179265 179266
+600 2 179265 179275 179273 179274
+601 1 179266 179265 179267 179268
+602 3 179275 179265 179267 179268
+603 4 179275 179265 179267 179269
+604 5 179266 179265 179275 179276
+605 4 179267 179265 179275 179273
+606 2 179267 179265 179275 179276
+607 1 179270 179269 179267 179268
+608 3 179271 179269 179267 179268
+609 2 179267 179269 179271 179272
+610 4 179267 179269 179271 179273
+611 5 179270 179269 179271 179272
+612 2 179275 179273 179271 179272
+613 4 179271 179273 179275 179265
+614 2 179271 179273 179275 179276
+615 5 179274 179273 179275 179276
+616 1 3042 3041 3043 3044
+617 3 3051 3041 3043 3044
+618 4 3051 3041 3043 3045
+619 5 3042 3041 3051 3052
+620 4 3043 3041 3051 3049
+621 2 3043 3041 3051 3052
+622 2 3051 3049 3047 3048
+623 4 3047 3049 3051 3041
+624 2 3047 3049 3051 3052
+625 5 3050 3049 3051 3052
+626 2 3049 3051 3041 3042
+627 2 3041 3051 3049 3050
+628 2 41339 41337 41335 41336
+629 4 41335 41337 41339 41329
+630 2 41335 41337 41339 41340
+631 5 41338 41337 41339 41340
+632 2 41337 41335 41333 41334
+633 2 41333 41335 41337 41338
+634 4 41333 41335 41337 41339
+635 5 41336 41335 41337 41338
+636 1 41334 41333 41331 41332
+637 3 41335 41333 41331 41332
+638 2 41331 41333 41335 41336
+639 4 41331 41333 41335 41337
+640 5 41334 41333 41335 41336
+
+Impropers
+
+1 1 111363 111365 111367 111366
+2 3 111363 111364 111373 111374
+3 1 107221 107223 107225 107224
+4 1 40597 40599 40601 40600
+5 1 40595 40597 40599 40598
+6 1 111365 111367 111369 111368
+7 2 188721 188723 188725 188724
+8 1 188723 188725 188727 188726
+9 1 188727 188729 188731 188730
+10 1 188725 188727 188729 188728
+11 4 20159 20158 20160 20148
+12 3 20147 20148 20157 20158
+13 1 41345 41355 41353 41356
+14 1 108387 108389 108391 108390
+15 4 41327 41326 41328 41316
+16 1 108389 108391 108393 108392
+17 1 41351 41353 41355 41354
+18 1 41349 41351 41353 41352
+19 1 107219 107221 107223 107222
+20 2 107217 107219 107221 107220
+21 1 41347 41345 41355 41346
+22 2 41345 41347 41349 41348
+23 4 41359 41358 41360 41348
+24 3 41347 41348 41357 41358
+25 1 41347 41349 41351 41350
+26 3 107219 107220 107229 107230
+27 4 107231 107230 107232 107220
+28 1 148085 148087 148089 148088
+29 1 148087 148089 148091 148090
+30 1 40593 40603 40601 40604
+31 1 40599 40601 40603 40602
+32 1 40595 40593 40603 40594
+33 2 40593 40595 40597 40596
+34 3 41315 41316 41325 41326
+35 1 108391 108393 108395 108394
+36 1 41315 41313 41323 41314
+37 1 108385 108395 108393 108396
+38 4 148095 148094 148096 148084
+39 4 40607 40606 40608 40596
+40 3 40595 40596 40605 40606
+41 3 148083 148084 148093 148094
+42 1 148083 148085 148087 148086
+43 2 148081 148083 148085 148084
+44 1 148083 148081 148091 148082
+45 1 148081 148091 148089 148092
+46 2 111361 111363 111365 111364
+47 1 111367 111369 111371 111370
+48 1 111361 111371 111369 111372
+49 1 111363 111361 111371 111362
+50 4 195807 195806 195808 195796
+51 1 43043 43041 43051 43042
+52 2 43041 43043 43045 43044
+53 3 43043 43044 43053 43054
+54 4 43055 43054 43056 43044
+55 1 150145 150155 150153 150156
+56 4 111375 111374 111376 111364
+57 1 150151 150153 150155 150154
+58 1 150149 150151 150153 150152
+59 1 20145 20155 20153 20156
+60 1 20147 20145 20155 20146
+61 1 20147 20149 20151 20150
+62 1 20151 20153 20155 20154
+63 1 20149 20151 20153 20152
+64 2 20145 20147 20149 20148
+65 1 107923 107925 107927 107926
+66 1 107925 107927 107929 107928
+67 1 107921 107931 107929 107932
+68 1 107927 107929 107931 107930
+69 1 69383 69385 69387 69386
+70 1 69377 69387 69385 69388
+71 2 69377 69379 69381 69380
+72 1 69379 69377 69387 69378
+73 1 69381 69383 69385 69384
+74 1 69379 69381 69383 69382
+75 4 65551 65550 65552 65540
+76 3 65539 65540 65549 65550
+77 3 69379 69380 69389 69390
+78 2 65537 65539 65541 65540
+79 1 65541 65543 65545 65544
+80 1 65539 65541 65543 65542
+81 1 65543 65545 65547 65546
+82 1 65537 65547 65545 65548
+83 1 65539 65537 65547 65538
+84 1 41317 41319 41321 41320
+85 1 41315 41317 41319 41318
+86 2 41313 41315 41317 41316
+87 3 195795 195796 195805 195806
+88 2 195793 195795 195797 195796
+89 1 41319 41321 41323 41322
+90 1 41313 41323 41321 41324
+91 4 69391 69390 69392 69380
+92 1 150147 150145 150155 150146
+93 3 150147 150148 150157 150158
+94 2 150145 150147 150149 150148
+95 4 150159 150158 150160 150148
+96 1 150147 150149 150151 150150
+97 1 195795 195793 195803 195794
+98 1 195793 195803 195801 195804
+99 1 195799 195801 195803 195802
+100 1 195795 195797 195799 195798
+101 1 195797 195799 195801 195800
+102 1 107223 107225 107227 107226
+103 1 43047 43049 43051 43050
+104 1 43041 43051 43049 43052
+105 3 188723 188724 188733 188734
+106 4 188735 188734 188736 188724
+107 1 43045 43047 43049 43048
+108 1 43043 43045 43047 43046
+109 1 188723 188721 188731 188722
+110 1 188721 188731 188729 188732
+111 4 3055 3054 3056 3044
+112 3 3043 3044 3053 3054
+113 1 3045 3047 3049 3048
+114 2 3041 3043 3045 3044
+115 1 3043 3045 3047 3046
+116 1 101763 101765 101767 101766
+117 1 101767 101769 101771 101770
+118 1 101765 101767 101769 101768
+119 1 107217 107227 107225 107228
+120 2 108385 108387 108389 108388
+121 1 107219 107217 107227 107218
+122 4 107935 107934 107936 107924
+123 3 107923 107924 107933 107934
+124 2 107921 107923 107925 107924
+125 1 107923 107921 107931 107922
+126 3 108387 108388 108397 108398
+127 4 108399 108398 108400 108388
+128 4 101775 101774 101776 101764
+129 3 101763 101764 101773 101774
+130 2 101761 101763 101765 101764
+131 1 179269 179271 179273 179272
+132 1 101763 101761 101771 101762
+133 1 101761 101771 101769 101772
+134 1 41329 41339 41337 41340
+135 1 41331 41329 41339 41330
+136 4 41343 41342 41344 41332
+137 2 41329 41331 41333 41332
+138 3 41331 41332 41341 41342
+139 1 108387 108385 108395 108386
+140 4 160479 160478 160480 160468
+141 3 160467 160468 160477 160478
+142 1 160469 160471 160473 160472
+143 1 160467 160469 160471 160470
+144 1 160471 160473 160475 160474
+145 1 160465 160475 160473 160476
+146 1 160467 160465 160475 160466
+147 2 160465 160467 160469 160468
+148 4 179279 179278 179280 179268
+149 3 179267 179268 179277 179278
+150 2 179265 179267 179269 179268
+151 1 179265 179275 179273 179276
+152 1 179267 179265 179275 179266
+153 1 179267 179269 179271 179270
+154 1 179271 179273 179275 179274
+155 1 3043 3041 3051 3042
+156 1 3047 3049 3051 3050
+157 1 3041 3051 3049 3052
+158 1 41335 41337 41339 41338
+159 1 41333 41335 41337 41336
+160 1 41331 41333 41335 41334
diff --git a/examples/USER/smd/aluminum_strip_pull/aluminum_strip_pull.lmp b/examples/USER/smd/aluminum_strip_pull/aluminum_strip_pull.lmp
index b75bab10e9..50b20a0787 100644
--- a/examples/USER/smd/aluminum_strip_pull/aluminum_strip_pull.lmp
+++ b/examples/USER/smd/aluminum_strip_pull/aluminum_strip_pull.lmp
@@ -2,7 +2,7 @@
 #
 # TLSPH example:  elongate a 2d strip of aluminum py pulling its ends apart  
 #
-# unit sytem: GPa / mm / ms
+# unit system: GPa / mm / ms
 #
 ####################################################################################################
 
@@ -18,7 +18,7 @@ variable        q2 equal 0.0  # standard artificial viscosity quadratic coeffici
 variable        hg equal 10.0 # hourglass control coefficient
 variable        cp equal 1.0 # heat capacity of material -- not used here
 
-variable        JC_A equal 0.3241 # Johnson Cook arameters
+variable        JC_A equal 0.3241 # Johnson Cook parameters
 variable        JC_B equal 0.1138
 variable        JC_N equal 0.42
 variable        JC_C equal 0 #0.002
diff --git a/examples/USER/smd/fluid_structure_interaction/fluid_structure_interaction.lmp b/examples/USER/smd/fluid_structure_interaction/fluid_structure_interaction.lmp
index 0f7d726e21..e4f3ea603a 100644
--- a/examples/USER/smd/fluid_structure_interaction/fluid_structure_interaction.lmp
+++ b/examples/USER/smd/fluid_structure_interaction/fluid_structure_interaction.lmp
@@ -4,7 +4,7 @@
 #
 # A column of water is placed in a container and allowed to collapse unter the
 # influence of gravity. Several solid objects are also placed in the container.
-# The water flow pushes the solid objects around until the sytem comes to halt due to
+# The water flow pushes the solid objects around until the system comes to halt due to
 # viscous damping. The solid objects have a lower mass density than water and finally float on
 # the water surface.
 #
@@ -12,7 +12,7 @@
 # Total Lagrangian formalism. Contact forces between container, solid bodies, and water prevent
 # mutual penetration of these physical entities.
 #
-# unit sytem: GPa / mm / ms
+# unit system: GPa / mm / ms
 #
 ####################################################################################################
 
diff --git a/examples/USER/smd/funnel_flow/funnel_flow.lmp b/examples/USER/smd/funnel_flow/funnel_flow.lmp
index 7cc1e13f4f..b1fde2c2db 100644
--- a/examples/USER/smd/funnel_flow/funnel_flow.lmp
+++ b/examples/USER/smd/funnel_flow/funnel_flow.lmp
@@ -5,7 +5,7 @@
 # The boundary dump file (see below) can be converted into VTK format using the conversion
 # tool dump2vtk_tris from the tools/smd directory.
 #
-# unit sytem: GPa / mm / ms
+# unit system: GPa / mm / ms
 #
 ####################################################################################################
 
diff --git a/examples/USER/smd/rubber_rings_3d/rubber_rings_3d.lmp b/examples/USER/smd/rubber_rings_3d/rubber_rings_3d.lmp
index 956abd6c4a..11b988e818 100644
--- a/examples/USER/smd/rubber_rings_3d/rubber_rings_3d.lmp
+++ b/examples/USER/smd/rubber_rings_3d/rubber_rings_3d.lmp
@@ -3,7 +3,7 @@
 #
 # TLSPH example: Two rubber rings impact each other.  
 #
-# unit sytem: GPa / mm / ms
+# unit system: GPa / mm / ms
 #
 ####################################################################################################
 
diff --git a/examples/USER/smd/rubber_strip_pull/rubber_strip_pull.lmp b/examples/USER/smd/rubber_strip_pull/rubber_strip_pull.lmp
index 4e53daf993..0e8be3b9da 100644
--- a/examples/USER/smd/rubber_strip_pull/rubber_strip_pull.lmp
+++ b/examples/USER/smd/rubber_strip_pull/rubber_strip_pull.lmp
@@ -2,7 +2,7 @@
 #
 # TLSPH example:  elongate a 2d strip of a linear elastic material py pulling its ends apart  
 #
-# unit sytem: GPa / mm / ms
+# unit system: GPa / mm / ms
 #
 ####################################################################################################
 
diff --git a/examples/USER/tally/in.pe b/examples/USER/tally/in.pe
index c6228cebd0..a7a3360c44 100644
--- a/examples/USER/tally/in.pe
+++ b/examples/USER/tally/in.pe
@@ -37,7 +37,7 @@ group		hyd type 2
 compute		epa oxy group/group hyd pair yes kspace no boundary no
 # tally pairwise energy between all oygen and all hydrogen
 compute		c1 oxy pe/tally hyd
-# tally pairwise energy beween all atoms to compare with globals
+# tally pairwise energy between all atoms to compare with globals
 compute		c2 all pe/tally all
 # collect per atom energies
 compute		c3 all pe/atom pair
diff --git a/examples/USER/tally/log.12Jun17.pe.1 b/examples/USER/tally/log.12Jun17.pe.1
index 8b0f753414..ecdaee86d5 100644
--- a/examples/USER/tally/log.12Jun17.pe.1
+++ b/examples/USER/tally/log.12Jun17.pe.1
@@ -89,7 +89,7 @@ group		hyd type 2
 compute		epa oxy group/group hyd pair yes kspace no boundary no
 # tally pairwise energy between all oygen and all hydrogen
 compute		c1 oxy pe/tally hyd
-# tally pairwise energy beween all atoms to compare with globals
+# tally pairwise energy between all atoms to compare with globals
 compute		c2 all pe/tally all
 # collect per atom energies
 compute		c3 all pe/atom pair
diff --git a/examples/USER/tally/log.12Jun17.pe.4 b/examples/USER/tally/log.12Jun17.pe.4
index f684fabe01..242cad77f3 100644
--- a/examples/USER/tally/log.12Jun17.pe.4
+++ b/examples/USER/tally/log.12Jun17.pe.4
@@ -89,7 +89,7 @@ group		hyd type 2
 compute		epa oxy group/group hyd pair yes kspace no boundary no
 # tally pairwise energy between all oygen and all hydrogen
 compute		c1 oxy pe/tally hyd
-# tally pairwise energy beween all atoms to compare with globals
+# tally pairwise energy between all atoms to compare with globals
 compute		c2 all pe/tally all
 # collect per atom energies
 compute		c3 all pe/atom pair
diff --git a/examples/fire/README b/examples/fire/README
new file mode 100644
index 0000000000..da63b1a631
--- /dev/null
+++ b/examples/fire/README
@@ -0,0 +1,23 @@
+These examples are similar to those in the "min" and "neb" folders.
+Each example can be run with the following minimization style:
+- quickmin:                             qm
+- fire:  	                        fire
+- fire with optimized options:          fire_mod
+- fire with min_modify options to
+  reproduce fire/old:                   fire_mod_old
+- fire/old (previous implementation):   fire_old
+
+Run the NEB examples as:
+
+mpirun -np 4 lmp_g++ -partition 4x1 -in in.neb.sivac.qm
+mpirun -np 4 lmp_g++ -partition 4x1 -in in.neb.sivac.fire
+mpirun -np 4 lmp_g++ -partition 4x1 -in in.neb.sivac.fire_mod
+mpirun -np 4 lmp_g++ -partition 4x1 -in in.neb.sivac.fire_mod_old
+mpirun -np 4 lmp_g++ -partition 4x1 -in in.neb.sivac.fire_old
+
+mpirun -np 8 lmp_g++ -partition 8x1 -in in.neb.sivac.qm
+mpirun -np 8 lmp_g++ -partition 8x1 -in in.neb.sivac.fire
+mpirun -np 8 lmp_g++ -partition 8x1 -in in.neb.sivac.fire_mod
+mpirun -np 8 lmp_g++ -partition 8x1 -in in.neb.sivac.fire_mod_old
+mpirun -np 8 lmp_g++ -partition 8x1 -in in.neb.sivac.fire_old
+
diff --git a/examples/fire/Si.sw b/examples/fire/Si.sw
new file mode 100644
index 0000000000..db4be100ef
--- /dev/null
+++ b/examples/fire/Si.sw
@@ -0,0 +1,18 @@
+# DATE: 2007-06-11 CONTRIBUTOR: Aidan Thompson, athomps@sandia.gov CITATION: Stillinger and Weber,  Phys Rev B, 31, 5262, (1985)
+# Stillinger-Weber parameters for various elements and mixtures
+# multiple entries can be added to this file, LAMMPS reads the ones it needs
+# these entries are in LAMMPS "metal" units:
+#   epsilon = eV; sigma = Angstroms
+#   other quantities are unitless
+
+# format of a single entry (one or more lines):
+#   element 1, element 2, element 3, 
+#   epsilon, sigma, a, lambda, gamma, costheta0, A, B, p, q, tol
+
+# Here are the original parameters in metal units, for Silicon from:
+#
+# Stillinger and Weber,  Phys. Rev. B, v. 31, p. 5262, (1985)
+#
+
+Si Si Si 2.1683  2.0951  1.80  21.0  1.20  -0.333333333333
+         7.049556277  0.6022245584  4.0  0.0 0.0
diff --git a/examples/fire/final.sivac b/examples/fire/final.sivac
new file mode 100644
index 0000000000..a0e2a2ed60
--- /dev/null
+++ b/examples/fire/final.sivac
@@ -0,0 +1,8 @@
+7
+174  6.86775 9.49992 9.62069 
+175  9.46441 6.90709 9.62317 
+301  6.87004 6.90631 12.2171 
+304  8.44266 8.48312 11.1965 
+306  10.5121 8.48457 13.2624 
+331  8.44223 10.5435 13.2633 
+337  10.5124 10.5437 11.1959 
diff --git a/examples/fire/in.cg b/examples/fire/in.cg
new file mode 100644
index 0000000000..308c7ac4ab
--- /dev/null
+++ b/examples/fire/in.cg
@@ -0,0 +1,45 @@
+# 2d Lennard-Jones melt and subsequent energy minimization
+
+units		lj
+dimension	2
+atom_style	atomic
+
+lattice		sq2 0.8442
+region		box block 0 20 0 20 -0.1 0.1
+create_box	1 box
+create_atoms	1 box
+mass		1 1.0
+
+velocity	all create 5.0 87287 loop geom
+
+pair_style	lj/cut 2.5
+pair_coeff	1 1 1.0 1.0 2.5
+pair_modify	shift yes
+
+neighbor	0.3 bin
+neigh_modify	delay 0 every 1 check yes
+
+fix		1 all nve
+fix		2 all enforce2d
+
+#dump		1 all atom 100 dump.min
+
+#dump		2 all image 50 image.*.jpg type type &
+#		zoom 1.6 adiam 1.5
+#dump_modify	2 pad 4
+
+#dump		3 all movie 50 movie.mpg type type &
+#		zoom 1.6 adiam 1.5
+#dump_modify	3 pad 4
+
+thermo		100
+
+run		1000
+
+neigh_modify	delay 0 every 1 check yes
+
+#dump_modify	1 every 25
+
+thermo		50
+min_style	cg
+minimize	0.0 1.0e-6 10000 10000
diff --git a/examples/fire/in.fire b/examples/fire/in.fire
new file mode 100644
index 0000000000..3a062487f3
--- /dev/null
+++ b/examples/fire/in.fire
@@ -0,0 +1,45 @@
+# 2d Lennard-Jones melt and subsequent energy minimization
+
+units		lj
+dimension	2
+atom_style	atomic
+
+lattice		sq2 0.8442
+region		box block 0 20 0 20 -0.1 0.1
+create_box	1 box
+create_atoms	1 box
+mass		1 1.0
+
+velocity	all create 5.0 87287 loop geom
+
+pair_style	lj/cut 2.5
+pair_coeff	1 1 1.0 1.0 2.5
+pair_modify	shift yes
+
+neighbor	0.3 bin
+neigh_modify	delay 0 every 1 check yes
+
+fix		1 all nve
+fix		2 all enforce2d
+
+#dump		1 all atom 100 dump.min
+
+#dump		2 all image 50 image.*.jpg type type &
+#		zoom 1.6 adiam 1.5
+#dump_modify	2 pad 4
+
+#dump		3 all movie 50 movie.mpg type type &
+#		zoom 1.6 adiam 1.5
+#dump_modify	3 pad 4
+
+thermo		100
+
+run		1000
+
+neigh_modify	delay 0 every 1 check yes
+
+#dump_modify	1 every 25
+
+thermo		50
+min_style	fire
+minimize	0.0 1.0e-6 10000 10000
diff --git a/examples/fire/in.fire_mod b/examples/fire/in.fire_mod
new file mode 100644
index 0000000000..8cf0d9f48d
--- /dev/null
+++ b/examples/fire/in.fire_mod
@@ -0,0 +1,46 @@
+# 2d Lennard-Jones melt and subsequent energy minimization
+
+units		lj
+dimension	2
+atom_style	atomic
+
+lattice		sq2 0.8442
+region		box block 0 20 0 20 -0.1 0.1
+create_box	1 box
+create_atoms	1 box
+mass		1 1.0
+
+velocity	all create 5.0 87287 loop geom
+
+pair_style	lj/cut 2.5
+pair_coeff	1 1 1.0 1.0 2.5
+pair_modify	shift yes
+
+neighbor	0.3 bin
+neigh_modify	delay 0 every 1 check yes
+
+fix		1 all nve
+fix		2 all enforce2d
+
+#dump		1 all atom 100 dump.min
+
+#dump		2 all image 50 image.*.jpg type type &
+#		zoom 1.6 adiam 1.5
+#dump_modify	2 pad 4
+
+#dump		3 all movie 50 movie.mpg type type &
+#		zoom 1.6 adiam 1.5
+#dump_modify	3 pad 4
+
+thermo		100
+
+run		1000
+
+neigh_modify	delay 0 every 1 check yes
+
+#dump_modify	1 every 25
+
+thermo		50
+min_style	fire
+min_modify	alpha0 0.10 integrator verlet
+minimize	0.0 1.0e-6 10000 10000
diff --git a/examples/fire/in.fire_mod_old b/examples/fire/in.fire_mod_old
new file mode 100644
index 0000000000..b954085052
--- /dev/null
+++ b/examples/fire/in.fire_mod_old
@@ -0,0 +1,48 @@
+# 2d Lennard-Jones melt and subsequent energy minimization
+
+units		lj
+dimension	2
+atom_style	atomic
+
+lattice		sq2 0.8442
+region		box block 0 20 0 20 -0.1 0.1
+create_box	1 box
+create_atoms	1 box
+mass		1 1.0
+
+velocity	all create 5.0 87287 loop geom
+
+pair_style	lj/cut 2.5
+pair_coeff	1 1 1.0 1.0 2.5
+pair_modify	shift yes
+
+neighbor	0.3 bin
+neigh_modify	delay 0 every 1 check yes
+
+fix		1 all nve
+fix		2 all enforce2d
+
+#dump		1 all atom 100 dump.min
+
+#dump		2 all image 50 image.*.jpg type type &
+#		zoom 1.6 adiam 1.5
+#dump_modify	2 pad 4
+
+#dump		3 all movie 50 movie.mpg type type &
+#		zoom 1.6 adiam 1.5
+#dump_modify	3 pad 4
+
+thermo		100
+
+run		1000
+
+neigh_modify	delay 0 every 1 check yes
+
+#dump_modify	1 every 25
+
+thermo		50
+min_style	fire
+min_modify      integrator eulerexplicit tmax 10.0 tmin 0.0 delaystep 5 &
+                dtgrow 1.1 dtshrink 0.5 alpha0 0.1 alphashrink 0.99 &
+                vdfmax 100000 halfstepback no initialdelay no
+minimize	0.0 1.0e-6 10000 10000
diff --git a/examples/fire/in.fire_old b/examples/fire/in.fire_old
new file mode 100644
index 0000000000..c25912cdee
--- /dev/null
+++ b/examples/fire/in.fire_old
@@ -0,0 +1,45 @@
+# 2d Lennard-Jones melt and subsequent energy minimization
+
+units		lj
+dimension	2
+atom_style	atomic
+
+lattice		sq2 0.8442
+region		box block 0 20 0 20 -0.1 0.1
+create_box	1 box
+create_atoms	1 box
+mass		1 1.0
+
+velocity	all create 5.0 87287 loop geom
+
+pair_style	lj/cut 2.5
+pair_coeff	1 1 1.0 1.0 2.5
+pair_modify	shift yes
+
+neighbor	0.3 bin
+neigh_modify	delay 0 every 1 check yes
+
+fix		1 all nve
+fix		2 all enforce2d
+
+#dump		1 all atom 100 dump.min
+
+#dump		2 all image 50 image.*.jpg type type &
+#		zoom 1.6 adiam 1.5
+#dump_modify	2 pad 4
+
+#dump		3 all movie 50 movie.mpg type type &
+#		zoom 1.6 adiam 1.5
+#dump_modify	3 pad 4
+
+thermo		100
+
+run		1000
+
+neigh_modify	delay 0 every 1 check yes
+
+#dump_modify	1 every 25
+
+thermo		50
+min_style	fire/old
+minimize	0.0 1.0e-6 10000 10000
diff --git a/examples/fire/in.neb.sivac.fire b/examples/fire/in.neb.sivac.fire
new file mode 100644
index 0000000000..36645f5c0f
--- /dev/null
+++ b/examples/fire/in.neb.sivac.fire
@@ -0,0 +1,78 @@
+# NEB simulation of vacancy hopping in silicon crystal
+
+units           metal
+
+atom_style      atomic
+atom_modify     map array
+boundary        p p p
+atom_modify	sort 0 0.0
+
+# coordination number cutoff
+
+variable r equal 2.835
+
+# diamond unit cell
+
+variable a equal 5.431
+lattice         custom $a               &
+                a1 1.0 0.0 0.0          &
+                a2 0.0 1.0 0.0          &
+                a3 0.0 0.0 1.0          &
+                basis 0.0 0.0 0.0       &
+                basis 0.0 0.5 0.5       &
+                basis 0.5 0.0 0.5       &
+                basis 0.5 0.5 0.0       &
+                basis 0.25 0.25 0.25    &
+                basis 0.25 0.75 0.75    &
+                basis 0.75 0.25 0.75    &
+                basis 0.75 0.75 0.25
+
+region          myreg block     0 4 &
+                                0 4 &
+                                0 4
+
+#create_box      1 myreg
+#create_atoms    1 region myreg
+#mass            1       28.06
+#write_data      initial.sivac
+
+read_data       initial.sivac
+
+# make a vacancy
+
+group Si type 1
+
+group del id 300
+delete_atoms group del compress no
+group vacneigh id 174 175 301 304 306 331 337
+ 
+# choose potential
+
+pair_style      sw
+pair_coeff * * Si.sw Si
+
+# set up neb run
+
+variable	u uloop 20
+
+# only output atoms near vacancy
+
+#dump events vacneigh custom 1000 dump.neb.sivac.$u id type x y z
+
+# initial minimization to relax vacancy
+
+displace_atoms all random 0.1 0.1 0.1 123456
+minimize	1.0e-6 1.0e-4 1000 10000
+
+reset_timestep	0
+
+fix		1 all neb 1.0 
+
+thermo		100
+
+# run NEB for 2000 steps or to force tolerance
+
+timestep        0.01
+min_style	fire
+
+neb		0.0 0.01 100 100 10 final final.sivac
diff --git a/examples/fire/in.neb.sivac.fire_mod b/examples/fire/in.neb.sivac.fire_mod
new file mode 100644
index 0000000000..461bf642f1
--- /dev/null
+++ b/examples/fire/in.neb.sivac.fire_mod
@@ -0,0 +1,78 @@
+# NEB simulation of vacancy hopping in silicon crystal
+
+units           metal
+
+atom_style      atomic
+atom_modify     map array
+boundary        p p p
+atom_modify	sort 0 0.0
+
+# coordination number cutoff
+
+variable r equal 2.835
+
+# diamond unit cell
+
+variable a equal 5.431
+lattice         custom $a               &
+                a1 1.0 0.0 0.0          &
+                a2 0.0 1.0 0.0          &
+                a3 0.0 0.0 1.0          &
+                basis 0.0 0.0 0.0       &
+                basis 0.0 0.5 0.5       &
+                basis 0.5 0.0 0.5       &
+                basis 0.5 0.5 0.0       &
+                basis 0.25 0.25 0.25    &
+                basis 0.25 0.75 0.75    &
+                basis 0.75 0.25 0.75    &
+                basis 0.75 0.75 0.25
+
+region          myreg block     0 4 &
+                                0 4 &
+                                0 4
+
+#create_box      1 myreg
+#create_atoms    1 region myreg
+#mass            1       28.06
+#write_data      initial.sivac
+
+read_data       initial.sivac
+
+# make a vacancy
+
+group Si type 1
+
+group del id 300
+delete_atoms group del compress no
+group vacneigh id 174 175 301 304 306 331 337
+ 
+# choose potential
+
+pair_style      sw
+pair_coeff * * Si.sw Si
+
+# set up neb run
+
+variable	u uloop 20
+
+# only output atoms near vacancy
+
+#dump events vacneigh custom 1000 dump.neb.sivac.$u id type x y z
+
+# initial minimization to relax vacancy
+
+displace_atoms all random 0.1 0.1 0.1 123456
+minimize	1.0e-6 1.0e-4 1000 10000
+
+reset_timestep	0
+
+fix		1 all neb 1.0 
+
+thermo		100
+
+# run NEB for 2000 steps or to force tolerance
+
+timestep        0.01
+min_style	fire
+min_modify	integrator verlet
+neb		0.0 0.01 100 100 10 final final.sivac
diff --git a/examples/fire/in.neb.sivac.fire_mod_old b/examples/fire/in.neb.sivac.fire_mod_old
new file mode 100644
index 0000000000..fba0424b74
--- /dev/null
+++ b/examples/fire/in.neb.sivac.fire_mod_old
@@ -0,0 +1,80 @@
+# NEB simulation of vacancy hopping in silicon crystal
+
+units           metal
+
+atom_style      atomic
+atom_modify     map array
+boundary        p p p
+atom_modify	sort 0 0.0
+
+# coordination number cutoff
+
+variable r equal 2.835
+
+# diamond unit cell
+
+variable a equal 5.431
+lattice         custom $a               &
+                a1 1.0 0.0 0.0          &
+                a2 0.0 1.0 0.0          &
+                a3 0.0 0.0 1.0          &
+                basis 0.0 0.0 0.0       &
+                basis 0.0 0.5 0.5       &
+                basis 0.5 0.0 0.5       &
+                basis 0.5 0.5 0.0       &
+                basis 0.25 0.25 0.25    &
+                basis 0.25 0.75 0.75    &
+                basis 0.75 0.25 0.75    &
+                basis 0.75 0.75 0.25
+
+region          myreg block     0 4 &
+                                0 4 &
+                                0 4
+
+#create_box      1 myreg
+#create_atoms    1 region myreg
+#mass            1       28.06
+#write_data      initial.sivac
+
+read_data       initial.sivac
+
+# make a vacancy
+
+group Si type 1
+
+group del id 300
+delete_atoms group del compress no
+group vacneigh id 174 175 301 304 306 331 337
+ 
+# choose potential
+
+pair_style      sw
+pair_coeff * * Si.sw Si
+
+# set up neb run
+
+variable	u uloop 20
+
+# only output atoms near vacancy
+
+#dump events vacneigh custom 1000 dump.neb.sivac.$u id type x y z
+
+# initial minimization to relax vacancy
+
+displace_atoms all random 0.1 0.1 0.1 123456
+minimize	1.0e-6 1.0e-4 1000 10000
+
+reset_timestep	0
+
+fix		1 all neb 1.0 
+
+thermo		100
+
+# run NEB for 2000 steps or to force tolerance
+
+timestep        0.01
+min_style	fire
+min_modify 	integrator eulerexplicit tmax 10.0 tmin 0.0 delaystep 5 &
+		dtgrow 1.1 dtshrink 0.5 alpha0 0.1 alphashrink 0.99 &
+		vdfmax 100000 halfstepback no initialdelay no
+neb		0.0 0.01 100 100 10 final final.sivac
diff --git a/examples/fire/in.neb.sivac.fire_old b/examples/fire/in.neb.sivac.fire_old
new file mode 100644
index 0000000000..64dc0fdc90
--- /dev/null
+++ b/examples/fire/in.neb.sivac.fire_old
@@ -0,0 +1,78 @@
+# NEB simulation of vacancy hopping in silicon crystal
+
+units           metal
+
+atom_style      atomic
+atom_modify     map array
+boundary        p p p
+atom_modify	sort 0 0.0
+
+# coordination number cutoff
+
+variable r equal 2.835
+
+# diamond unit cell
+
+variable a equal 5.431
+lattice         custom $a               &
+                a1 1.0 0.0 0.0          &
+                a2 0.0 1.0 0.0          &
+                a3 0.0 0.0 1.0          &
+                basis 0.0 0.0 0.0       &
+                basis 0.0 0.5 0.5       &
+                basis 0.5 0.0 0.5       &
+                basis 0.5 0.5 0.0       &
+                basis 0.25 0.25 0.25    &
+                basis 0.25 0.75 0.75    &
+                basis 0.75 0.25 0.75    &
+                basis 0.75 0.75 0.25
+
+region          myreg block     0 4 &
+                                0 4 &
+                                0 4
+
+#create_box      1 myreg
+#create_atoms    1 region myreg
+#mass            1       28.06
+#write_data      initial.sivac
+
+read_data       initial.sivac
+
+# make a vacancy
+
+group Si type 1
+
+group del id 300
+delete_atoms group del compress no
+group vacneigh id 174 175 301 304 306 331 337
+ 
+# choose potential
+
+pair_style      sw
+pair_coeff * * Si.sw Si
+
+# set up neb run
+
+variable	u uloop 20
+
+# only output atoms near vacancy
+
+#dump events vacneigh custom 1000 dump.neb.sivac.$u id type x y z
+
+# initial minimization to relax vacancy
+
+displace_atoms all random 0.1 0.1 0.1 123456
+minimize	1.0e-6 1.0e-4 1000 10000
+
+reset_timestep	0
+
+fix		1 all neb 1.0 
+
+thermo		100
+
+# run NEB for 2000 steps or to force tolerance
+
+timestep        0.01
+min_style	fire/old
+
+neb		0.0 0.01 100 100 10 final final.sivac
diff --git a/examples/fire/in.neb.sivac.qm b/examples/fire/in.neb.sivac.qm
new file mode 100644
index 0000000000..941d063b90
--- /dev/null
+++ b/examples/fire/in.neb.sivac.qm
@@ -0,0 +1,78 @@
+# NEB simulation of vacancy hopping in silicon crystal
+
+units           metal
+
+atom_style      atomic
+atom_modify     map array
+boundary        p p p
+atom_modify	sort 0 0.0
+
+# coordination number cutoff
+
+variable r equal 2.835
+
+# diamond unit cell
+
+variable a equal 5.431
+lattice         custom $a               &
+                a1 1.0 0.0 0.0          &
+                a2 0.0 1.0 0.0          &
+                a3 0.0 0.0 1.0          &
+                basis 0.0 0.0 0.0       &
+                basis 0.0 0.5 0.5       &
+                basis 0.5 0.0 0.5       &
+                basis 0.5 0.5 0.0       &
+                basis 0.25 0.25 0.25    &
+                basis 0.25 0.75 0.75    &
+                basis 0.75 0.25 0.75    &
+                basis 0.75 0.75 0.25
+
+region          myreg block     0 4 &
+                                0 4 &
+                                0 4
+
+#create_box      1 myreg
+#create_atoms    1 region myreg
+#mass            1       28.06
+#write_data      initial.sivac
+
+read_data       initial.sivac
+
+# make a vacancy
+
+group Si type 1
+
+group del id 300
+delete_atoms group del compress no
+group vacneigh id 174 175 301 304 306 331 337
+ 
+# choose potential
+
+pair_style      sw
+pair_coeff * * Si.sw Si
+
+# set up neb run
+
+variable	u uloop 20
+
+# only output atoms near vacancy
+
+#dump events vacneigh custom 1000 dump.neb.sivac.$u id type x y z
+
+# initial minimization to relax vacancy
+
+displace_atoms all random 0.1 0.1 0.1 123456
+minimize	1.0e-6 1.0e-4 1000 10000
+
+reset_timestep	0
+
+fix		1 all neb 1.0 
+
+thermo		100
+
+# run NEB for 2000 steps or to force tolerance
+
+timestep        0.01
+min_style	quickmin
+
+neb		0.0 0.01 100 100 10 final final.sivac
diff --git a/examples/fire/initial.sivac b/examples/fire/initial.sivac
new file mode 100644
index 0000000000..5664b6c39a
--- /dev/null
+++ b/examples/fire/initial.sivac
@@ -0,0 +1,1042 @@
+LAMMPS data file via write_data, version 27 Sep 2016, timestep = 0
+
+512 atoms
+1 atom types
+
+0.0000000000000000e+00 2.1724000000000000e+01 xlo xhi
+0.0000000000000000e+00 2.1724000000000000e+01 ylo yhi
+0.0000000000000000e+00 2.1724000000000000e+01 zlo zhi
+
+Masses
+
+1 28.06
+
+Atoms # atomic
+
+1 1 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00 0 0 0
+2 1 0.0000000000000000e+00 2.7155000000000000e+00 2.7155000000000000e+00 0 0 0
+3 1 2.7155000000000000e+00 0.0000000000000000e+00 2.7155000000000000e+00 0 0 0
+4 1 2.7155000000000000e+00 2.7155000000000000e+00 0.0000000000000000e+00 0 0 0
+5 1 1.3577500000000000e+00 1.3577500000000000e+00 1.3577500000000000e+00 0 0 0
+6 1 1.3577500000000000e+00 4.0732499999999998e+00 4.0732499999999998e+00 0 0 0
+7 1 4.0732499999999998e+00 1.3577500000000000e+00 4.0732499999999998e+00 0 0 0
+8 1 4.0732499999999998e+00 4.0732499999999998e+00 1.3577500000000000e+00 0 0 0
+9 1 5.4310000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00 0 0 0
+10 1 5.4310000000000000e+00 2.7155000000000000e+00 2.7155000000000000e+00 0 0 0
+11 1 8.1464999999999996e+00 0.0000000000000000e+00 2.7155000000000000e+00 0 0 0
+12 1 8.1464999999999996e+00 2.7155000000000000e+00 0.0000000000000000e+00 0 0 0
+13 1 6.7887500000000003e+00 1.3577500000000000e+00 1.3577500000000000e+00 0 0 0
+14 1 6.7887500000000003e+00 4.0732499999999998e+00 4.0732499999999998e+00 0 0 0
+15 1 9.5042500000000008e+00 1.3577500000000000e+00 4.0732499999999998e+00 0 0 0
+16 1 9.5042500000000008e+00 4.0732499999999998e+00 1.3577500000000000e+00 0 0 0
+17 1 1.0862000000000000e+01 0.0000000000000000e+00 0.0000000000000000e+00 0 0 0
+18 1 1.0862000000000000e+01 2.7155000000000000e+00 2.7155000000000000e+00 0 0 0
+19 1 1.3577500000000001e+01 0.0000000000000000e+00 2.7155000000000000e+00 0 0 0
+20 1 1.3577500000000001e+01 2.7155000000000000e+00 0.0000000000000000e+00 0 0 0
+21 1 1.2219749999999999e+01 1.3577500000000000e+00 1.3577500000000000e+00 0 0 0
+22 1 1.2219749999999999e+01 4.0732499999999998e+00 4.0732499999999998e+00 0 0 0
+23 1 1.4935250000000000e+01 1.3577500000000000e+00 4.0732499999999998e+00 0 0 0
+24 1 1.4935250000000000e+01 4.0732499999999998e+00 1.3577500000000000e+00 0 0 0
+25 1 1.6292999999999999e+01 0.0000000000000000e+00 0.0000000000000000e+00 0 0 0
+26 1 1.6292999999999999e+01 2.7155000000000000e+00 2.7155000000000000e+00 0 0 0
+27 1 1.9008500000000002e+01 0.0000000000000000e+00 2.7155000000000000e+00 0 0 0
+28 1 1.9008500000000002e+01 2.7155000000000000e+00 0.0000000000000000e+00 0 0 0
+29 1 1.7650749999999999e+01 1.3577500000000000e+00 1.3577500000000000e+00 0 0 0
+30 1 1.7650749999999999e+01 4.0732499999999998e+00 4.0732499999999998e+00 0 0 0
+31 1 2.0366250000000001e+01 1.3577500000000000e+00 4.0732499999999998e+00 0 0 0
+32 1 2.0366250000000001e+01 4.0732499999999998e+00 1.3577500000000000e+00 0 0 0
+33 1 0.0000000000000000e+00 5.4310000000000000e+00 0.0000000000000000e+00 0 0 0
+34 1 0.0000000000000000e+00 8.1464999999999996e+00 2.7155000000000000e+00 0 0 0
+35 1 2.7155000000000000e+00 5.4310000000000000e+00 2.7155000000000000e+00 0 0 0
+36 1 2.7155000000000000e+00 8.1464999999999996e+00 0.0000000000000000e+00 0 0 0
+37 1 1.3577500000000000e+00 6.7887500000000003e+00 1.3577500000000000e+00 0 0 0
+38 1 1.3577500000000000e+00 9.5042500000000008e+00 4.0732499999999998e+00 0 0 0
+39 1 4.0732499999999998e+00 6.7887500000000003e+00 4.0732499999999998e+00 0 0 0
+40 1 4.0732499999999998e+00 9.5042500000000008e+00 1.3577500000000000e+00 0 0 0
+41 1 5.4310000000000000e+00 5.4310000000000000e+00 0.0000000000000000e+00 0 0 0
+42 1 5.4310000000000000e+00 8.1464999999999996e+00 2.7155000000000000e+00 0 0 0
+43 1 8.1464999999999996e+00 5.4310000000000000e+00 2.7155000000000000e+00 0 0 0
+44 1 8.1464999999999996e+00 8.1464999999999996e+00 0.0000000000000000e+00 0 0 0
+45 1 6.7887500000000003e+00 6.7887500000000003e+00 1.3577500000000000e+00 0 0 0
+46 1 6.7887500000000003e+00 9.5042500000000008e+00 4.0732499999999998e+00 0 0 0
+47 1 9.5042500000000008e+00 6.7887500000000003e+00 4.0732499999999998e+00 0 0 0
+48 1 9.5042500000000008e+00 9.5042500000000008e+00 1.3577500000000000e+00 0 0 0
+49 1 1.0862000000000000e+01 5.4310000000000000e+00 0.0000000000000000e+00 0 0 0
+50 1 1.0862000000000000e+01 8.1464999999999996e+00 2.7155000000000000e+00 0 0 0
+51 1 1.3577500000000001e+01 5.4310000000000000e+00 2.7155000000000000e+00 0 0 0
+52 1 1.3577500000000001e+01 8.1464999999999996e+00 0.0000000000000000e+00 0 0 0
+53 1 1.2219749999999999e+01 6.7887500000000003e+00 1.3577500000000000e+00 0 0 0
+54 1 1.2219749999999999e+01 9.5042500000000008e+00 4.0732499999999998e+00 0 0 0
+55 1 1.4935250000000000e+01 6.7887500000000003e+00 4.0732499999999998e+00 0 0 0
+56 1 1.4935250000000000e+01 9.5042500000000008e+00 1.3577500000000000e+00 0 0 0
+57 1 1.6292999999999999e+01 5.4310000000000000e+00 0.0000000000000000e+00 0 0 0
+58 1 1.6292999999999999e+01 8.1464999999999996e+00 2.7155000000000000e+00 0 0 0
+59 1 1.9008500000000002e+01 5.4310000000000000e+00 2.7155000000000000e+00 0 0 0
+60 1 1.9008500000000002e+01 8.1464999999999996e+00 0.0000000000000000e+00 0 0 0
+61 1 1.7650749999999999e+01 6.7887500000000003e+00 1.3577500000000000e+00 0 0 0
+62 1 1.7650749999999999e+01 9.5042500000000008e+00 4.0732499999999998e+00 0 0 0
+63 1 2.0366250000000001e+01 6.7887500000000003e+00 4.0732499999999998e+00 0 0 0
+64 1 2.0366250000000001e+01 9.5042500000000008e+00 1.3577500000000000e+00 0 0 0
+65 1 0.0000000000000000e+00 1.0862000000000000e+01 0.0000000000000000e+00 0 0 0
+66 1 0.0000000000000000e+00 1.3577500000000001e+01 2.7155000000000000e+00 0 0 0
+67 1 2.7155000000000000e+00 1.0862000000000000e+01 2.7155000000000000e+00 0 0 0
+68 1 2.7155000000000000e+00 1.3577500000000001e+01 0.0000000000000000e+00 0 0 0
+69 1 1.3577500000000000e+00 1.2219749999999999e+01 1.3577500000000000e+00 0 0 0
+70 1 1.3577500000000000e+00 1.4935250000000000e+01 4.0732499999999998e+00 0 0 0
+71 1 4.0732499999999998e+00 1.2219749999999999e+01 4.0732499999999998e+00 0 0 0
+72 1 4.0732499999999998e+00 1.4935250000000000e+01 1.3577500000000000e+00 0 0 0
+73 1 5.4310000000000000e+00 1.0862000000000000e+01 0.0000000000000000e+00 0 0 0
+74 1 5.4310000000000000e+00 1.3577500000000001e+01 2.7155000000000000e+00 0 0 0
+75 1 8.1464999999999996e+00 1.0862000000000000e+01 2.7155000000000000e+00 0 0 0
+76 1 8.1464999999999996e+00 1.3577500000000001e+01 0.0000000000000000e+00 0 0 0
+77 1 6.7887500000000003e+00 1.2219749999999999e+01 1.3577500000000000e+00 0 0 0
+78 1 6.7887500000000003e+00 1.4935250000000000e+01 4.0732499999999998e+00 0 0 0
+79 1 9.5042500000000008e+00 1.2219749999999999e+01 4.0732499999999998e+00 0 0 0
+80 1 9.5042500000000008e+00 1.4935250000000000e+01 1.3577500000000000e+00 0 0 0
+81 1 1.0862000000000000e+01 1.0862000000000000e+01 0.0000000000000000e+00 0 0 0
+82 1 1.0862000000000000e+01 1.3577500000000001e+01 2.7155000000000000e+00 0 0 0
+83 1 1.3577500000000001e+01 1.0862000000000000e+01 2.7155000000000000e+00 0 0 0
+84 1 1.3577500000000001e+01 1.3577500000000001e+01 0.0000000000000000e+00 0 0 0
+85 1 1.2219749999999999e+01 1.2219749999999999e+01 1.3577500000000000e+00 0 0 0
+86 1 1.2219749999999999e+01 1.4935250000000000e+01 4.0732499999999998e+00 0 0 0
+87 1 1.4935250000000000e+01 1.2219749999999999e+01 4.0732499999999998e+00 0 0 0
+88 1 1.4935250000000000e+01 1.4935250000000000e+01 1.3577500000000000e+00 0 0 0
+89 1 1.6292999999999999e+01 1.0862000000000000e+01 0.0000000000000000e+00 0 0 0
+90 1 1.6292999999999999e+01 1.3577500000000001e+01 2.7155000000000000e+00 0 0 0
+91 1 1.9008500000000002e+01 1.0862000000000000e+01 2.7155000000000000e+00 0 0 0
+92 1 1.9008500000000002e+01 1.3577500000000001e+01 0.0000000000000000e+00 0 0 0
+93 1 1.7650749999999999e+01 1.2219749999999999e+01 1.3577500000000000e+00 0 0 0
+94 1 1.7650749999999999e+01 1.4935250000000000e+01 4.0732499999999998e+00 0 0 0
+95 1 2.0366250000000001e+01 1.2219749999999999e+01 4.0732499999999998e+00 0 0 0
+96 1 2.0366250000000001e+01 1.4935250000000000e+01 1.3577500000000000e+00 0 0 0
+97 1 0.0000000000000000e+00 1.6292999999999999e+01 0.0000000000000000e+00 0 0 0
+98 1 0.0000000000000000e+00 1.9008500000000002e+01 2.7155000000000000e+00 0 0 0
+99 1 2.7155000000000000e+00 1.6292999999999999e+01 2.7155000000000000e+00 0 0 0
+100 1 2.7155000000000000e+00 1.9008500000000002e+01 0.0000000000000000e+00 0 0 0
+101 1 1.3577500000000000e+00 1.7650749999999999e+01 1.3577500000000000e+00 0 0 0
+102 1 1.3577500000000000e+00 2.0366250000000001e+01 4.0732499999999998e+00 0 0 0
+103 1 4.0732499999999998e+00 1.7650749999999999e+01 4.0732499999999998e+00 0 0 0
+104 1 4.0732499999999998e+00 2.0366250000000001e+01 1.3577500000000000e+00 0 0 0
+105 1 5.4310000000000000e+00 1.6292999999999999e+01 0.0000000000000000e+00 0 0 0
+106 1 5.4310000000000000e+00 1.9008500000000002e+01 2.7155000000000000e+00 0 0 0
+107 1 8.1464999999999996e+00 1.6292999999999999e+01 2.7155000000000000e+00 0 0 0
+108 1 8.1464999999999996e+00 1.9008500000000002e+01 0.0000000000000000e+00 0 0 0
+109 1 6.7887500000000003e+00 1.7650749999999999e+01 1.3577500000000000e+00 0 0 0
+110 1 6.7887500000000003e+00 2.0366250000000001e+01 4.0732499999999998e+00 0 0 0
+111 1 9.5042500000000008e+00 1.7650749999999999e+01 4.0732499999999998e+00 0 0 0
+112 1 9.5042500000000008e+00 2.0366250000000001e+01 1.3577500000000000e+00 0 0 0
+113 1 1.0862000000000000e+01 1.6292999999999999e+01 0.0000000000000000e+00 0 0 0
+114 1 1.0862000000000000e+01 1.9008500000000002e+01 2.7155000000000000e+00 0 0 0
+115 1 1.3577500000000001e+01 1.6292999999999999e+01 2.7155000000000000e+00 0 0 0
+116 1 1.3577500000000001e+01 1.9008500000000002e+01 0.0000000000000000e+00 0 0 0
+117 1 1.2219749999999999e+01 1.7650749999999999e+01 1.3577500000000000e+00 0 0 0
+118 1 1.2219749999999999e+01 2.0366250000000001e+01 4.0732499999999998e+00 0 0 0
+119 1 1.4935250000000000e+01 1.7650749999999999e+01 4.0732499999999998e+00 0 0 0
+120 1 1.4935250000000000e+01 2.0366250000000001e+01 1.3577500000000000e+00 0 0 0
+121 1 1.6292999999999999e+01 1.6292999999999999e+01 0.0000000000000000e+00 0 0 0
+122 1 1.6292999999999999e+01 1.9008500000000002e+01 2.7155000000000000e+00 0 0 0
+123 1 1.9008500000000002e+01 1.6292999999999999e+01 2.7155000000000000e+00 0 0 0
+124 1 1.9008500000000002e+01 1.9008500000000002e+01 0.0000000000000000e+00 0 0 0
+125 1 1.7650749999999999e+01 1.7650749999999999e+01 1.3577500000000000e+00 0 0 0
+126 1 1.7650749999999999e+01 2.0366250000000001e+01 4.0732499999999998e+00 0 0 0
+127 1 2.0366250000000001e+01 1.7650749999999999e+01 4.0732499999999998e+00 0 0 0
+128 1 2.0366250000000001e+01 2.0366250000000001e+01 1.3577500000000000e+00 0 0 0
+129 1 0.0000000000000000e+00 0.0000000000000000e+00 5.4310000000000000e+00 0 0 0
+130 1 0.0000000000000000e+00 2.7155000000000000e+00 8.1464999999999996e+00 0 0 0
+131 1 2.7155000000000000e+00 0.0000000000000000e+00 8.1464999999999996e+00 0 0 0
+132 1 2.7155000000000000e+00 2.7155000000000000e+00 5.4310000000000000e+00 0 0 0
+133 1 1.3577500000000000e+00 1.3577500000000000e+00 6.7887500000000003e+00 0 0 0
+134 1 1.3577500000000000e+00 4.0732499999999998e+00 9.5042500000000008e+00 0 0 0
+135 1 4.0732499999999998e+00 1.3577500000000000e+00 9.5042500000000008e+00 0 0 0
+136 1 4.0732499999999998e+00 4.0732499999999998e+00 6.7887500000000003e+00 0 0 0
+137 1 5.4310000000000000e+00 0.0000000000000000e+00 5.4310000000000000e+00 0 0 0
+138 1 5.4310000000000000e+00 2.7155000000000000e+00 8.1464999999999996e+00 0 0 0
+139 1 8.1464999999999996e+00 0.0000000000000000e+00 8.1464999999999996e+00 0 0 0
+140 1 8.1464999999999996e+00 2.7155000000000000e+00 5.4310000000000000e+00 0 0 0
+141 1 6.7887500000000003e+00 1.3577500000000000e+00 6.7887500000000003e+00 0 0 0
+142 1 6.7887500000000003e+00 4.0732499999999998e+00 9.5042500000000008e+00 0 0 0
+143 1 9.5042500000000008e+00 1.3577500000000000e+00 9.5042500000000008e+00 0 0 0
+144 1 9.5042500000000008e+00 4.0732499999999998e+00 6.7887500000000003e+00 0 0 0
+145 1 1.0862000000000000e+01 0.0000000000000000e+00 5.4310000000000000e+00 0 0 0
+146 1 1.0862000000000000e+01 2.7155000000000000e+00 8.1464999999999996e+00 0 0 0
+147 1 1.3577500000000001e+01 0.0000000000000000e+00 8.1464999999999996e+00 0 0 0
+148 1 1.3577500000000001e+01 2.7155000000000000e+00 5.4310000000000000e+00 0 0 0
+149 1 1.2219749999999999e+01 1.3577500000000000e+00 6.7887500000000003e+00 0 0 0
+150 1 1.2219749999999999e+01 4.0732499999999998e+00 9.5042500000000008e+00 0 0 0
+151 1 1.4935250000000000e+01 1.3577500000000000e+00 9.5042500000000008e+00 0 0 0
+152 1 1.4935250000000000e+01 4.0732499999999998e+00 6.7887500000000003e+00 0 0 0
+153 1 1.6292999999999999e+01 0.0000000000000000e+00 5.4310000000000000e+00 0 0 0
+154 1 1.6292999999999999e+01 2.7155000000000000e+00 8.1464999999999996e+00 0 0 0
+155 1 1.9008500000000002e+01 0.0000000000000000e+00 8.1464999999999996e+00 0 0 0
+156 1 1.9008500000000002e+01 2.7155000000000000e+00 5.4310000000000000e+00 0 0 0
+157 1 1.7650749999999999e+01 1.3577500000000000e+00 6.7887500000000003e+00 0 0 0
+158 1 1.7650749999999999e+01 4.0732499999999998e+00 9.5042500000000008e+00 0 0 0
+159 1 2.0366250000000001e+01 1.3577500000000000e+00 9.5042500000000008e+00 0 0 0
+160 1 2.0366250000000001e+01 4.0732499999999998e+00 6.7887500000000003e+00 0 0 0
+161 1 0.0000000000000000e+00 5.4310000000000000e+00 5.4310000000000000e+00 0 0 0
+162 1 0.0000000000000000e+00 8.1464999999999996e+00 8.1464999999999996e+00 0 0 0
+163 1 2.7155000000000000e+00 5.4310000000000000e+00 8.1464999999999996e+00 0 0 0
+164 1 2.7155000000000000e+00 8.1464999999999996e+00 5.4310000000000000e+00 0 0 0
+165 1 1.3577500000000000e+00 6.7887500000000003e+00 6.7887500000000003e+00 0 0 0
+166 1 1.3577500000000000e+00 9.5042500000000008e+00 9.5042500000000008e+00 0 0 0
+167 1 4.0732499999999998e+00 6.7887500000000003e+00 9.5042500000000008e+00 0 0 0
+168 1 4.0732499999999998e+00 9.5042500000000008e+00 6.7887500000000003e+00 0 0 0
+169 1 5.4310000000000000e+00 5.4310000000000000e+00 5.4310000000000000e+00 0 0 0
+170 1 5.4310000000000000e+00 8.1464999999999996e+00 8.1464999999999996e+00 0 0 0
+171 1 8.1464999999999996e+00 5.4310000000000000e+00 8.1464999999999996e+00 0 0 0
+172 1 8.1464999999999996e+00 8.1464999999999996e+00 5.4310000000000000e+00 0 0 0
+173 1 6.7887500000000003e+00 6.7887500000000003e+00 6.7887500000000003e+00 0 0 0
+174 1 6.7887500000000003e+00 9.5042500000000008e+00 9.5042500000000008e+00 0 0 0
+175 1 9.5042500000000008e+00 6.7887500000000003e+00 9.5042500000000008e+00 0 0 0
+176 1 9.5042500000000008e+00 9.5042500000000008e+00 6.7887500000000003e+00 0 0 0
+177 1 1.0862000000000000e+01 5.4310000000000000e+00 5.4310000000000000e+00 0 0 0
+178 1 1.0862000000000000e+01 8.1464999999999996e+00 8.1464999999999996e+00 0 0 0
+179 1 1.3577500000000001e+01 5.4310000000000000e+00 8.1464999999999996e+00 0 0 0
+180 1 1.3577500000000001e+01 8.1464999999999996e+00 5.4310000000000000e+00 0 0 0
+181 1 1.2219749999999999e+01 6.7887500000000003e+00 6.7887500000000003e+00 0 0 0
+182 1 1.2219749999999999e+01 9.5042500000000008e+00 9.5042500000000008e+00 0 0 0
+183 1 1.4935250000000000e+01 6.7887500000000003e+00 9.5042500000000008e+00 0 0 0
+184 1 1.4935250000000000e+01 9.5042500000000008e+00 6.7887500000000003e+00 0 0 0
+185 1 1.6292999999999999e+01 5.4310000000000000e+00 5.4310000000000000e+00 0 0 0
+186 1 1.6292999999999999e+01 8.1464999999999996e+00 8.1464999999999996e+00 0 0 0
+187 1 1.9008500000000002e+01 5.4310000000000000e+00 8.1464999999999996e+00 0 0 0
+188 1 1.9008500000000002e+01 8.1464999999999996e+00 5.4310000000000000e+00 0 0 0
+189 1 1.7650749999999999e+01 6.7887500000000003e+00 6.7887500000000003e+00 0 0 0
+190 1 1.7650749999999999e+01 9.5042500000000008e+00 9.5042500000000008e+00 0 0 0
+191 1 2.0366250000000001e+01 6.7887500000000003e+00 9.5042500000000008e+00 0 0 0
+192 1 2.0366250000000001e+01 9.5042500000000008e+00 6.7887500000000003e+00 0 0 0
+193 1 0.0000000000000000e+00 1.0862000000000000e+01 5.4310000000000000e+00 0 0 0
+194 1 0.0000000000000000e+00 1.3577500000000001e+01 8.1464999999999996e+00 0 0 0
+195 1 2.7155000000000000e+00 1.0862000000000000e+01 8.1464999999999996e+00 0 0 0
+196 1 2.7155000000000000e+00 1.3577500000000001e+01 5.4310000000000000e+00 0 0 0
+197 1 1.3577500000000000e+00 1.2219749999999999e+01 6.7887500000000003e+00 0 0 0
+198 1 1.3577500000000000e+00 1.4935250000000000e+01 9.5042500000000008e+00 0 0 0
+199 1 4.0732499999999998e+00 1.2219749999999999e+01 9.5042500000000008e+00 0 0 0
+200 1 4.0732499999999998e+00 1.4935250000000000e+01 6.7887500000000003e+00 0 0 0
+201 1 5.4310000000000000e+00 1.0862000000000000e+01 5.4310000000000000e+00 0 0 0
+202 1 5.4310000000000000e+00 1.3577500000000001e+01 8.1464999999999996e+00 0 0 0
+203 1 8.1464999999999996e+00 1.0862000000000000e+01 8.1464999999999996e+00 0 0 0
+204 1 8.1464999999999996e+00 1.3577500000000001e+01 5.4310000000000000e+00 0 0 0
+205 1 6.7887500000000003e+00 1.2219749999999999e+01 6.7887500000000003e+00 0 0 0
+206 1 6.7887500000000003e+00 1.4935250000000000e+01 9.5042500000000008e+00 0 0 0
+207 1 9.5042500000000008e+00 1.2219749999999999e+01 9.5042500000000008e+00 0 0 0
+208 1 9.5042500000000008e+00 1.4935250000000000e+01 6.7887500000000003e+00 0 0 0
+209 1 1.0862000000000000e+01 1.0862000000000000e+01 5.4310000000000000e+00 0 0 0
+210 1 1.0862000000000000e+01 1.3577500000000001e+01 8.1464999999999996e+00 0 0 0
+211 1 1.3577500000000001e+01 1.0862000000000000e+01 8.1464999999999996e+00 0 0 0
+212 1 1.3577500000000001e+01 1.3577500000000001e+01 5.4310000000000000e+00 0 0 0
+213 1 1.2219749999999999e+01 1.2219749999999999e+01 6.7887500000000003e+00 0 0 0
+214 1 1.2219749999999999e+01 1.4935250000000000e+01 9.5042500000000008e+00 0 0 0
+215 1 1.4935250000000000e+01 1.2219749999999999e+01 9.5042500000000008e+00 0 0 0
+216 1 1.4935250000000000e+01 1.4935250000000000e+01 6.7887500000000003e+00 0 0 0
+217 1 1.6292999999999999e+01 1.0862000000000000e+01 5.4310000000000000e+00 0 0 0
+218 1 1.6292999999999999e+01 1.3577500000000001e+01 8.1464999999999996e+00 0 0 0
+219 1 1.9008500000000002e+01 1.0862000000000000e+01 8.1464999999999996e+00 0 0 0
+220 1 1.9008500000000002e+01 1.3577500000000001e+01 5.4310000000000000e+00 0 0 0
+221 1 1.7650749999999999e+01 1.2219749999999999e+01 6.7887500000000003e+00 0 0 0
+222 1 1.7650749999999999e+01 1.4935250000000000e+01 9.5042500000000008e+00 0 0 0
+223 1 2.0366250000000001e+01 1.2219749999999999e+01 9.5042500000000008e+00 0 0 0
+224 1 2.0366250000000001e+01 1.4935250000000000e+01 6.7887500000000003e+00 0 0 0
+225 1 0.0000000000000000e+00 1.6292999999999999e+01 5.4310000000000000e+00 0 0 0
+226 1 0.0000000000000000e+00 1.9008500000000002e+01 8.1464999999999996e+00 0 0 0
+227 1 2.7155000000000000e+00 1.6292999999999999e+01 8.1464999999999996e+00 0 0 0
+228 1 2.7155000000000000e+00 1.9008500000000002e+01 5.4310000000000000e+00 0 0 0
+229 1 1.3577500000000000e+00 1.7650749999999999e+01 6.7887500000000003e+00 0 0 0
+230 1 1.3577500000000000e+00 2.0366250000000001e+01 9.5042500000000008e+00 0 0 0
+231 1 4.0732499999999998e+00 1.7650749999999999e+01 9.5042500000000008e+00 0 0 0
+232 1 4.0732499999999998e+00 2.0366250000000001e+01 6.7887500000000003e+00 0 0 0
+233 1 5.4310000000000000e+00 1.6292999999999999e+01 5.4310000000000000e+00 0 0 0
+234 1 5.4310000000000000e+00 1.9008500000000002e+01 8.1464999999999996e+00 0 0 0
+235 1 8.1464999999999996e+00 1.6292999999999999e+01 8.1464999999999996e+00 0 0 0
+236 1 8.1464999999999996e+00 1.9008500000000002e+01 5.4310000000000000e+00 0 0 0
+237 1 6.7887500000000003e+00 1.7650749999999999e+01 6.7887500000000003e+00 0 0 0
+238 1 6.7887500000000003e+00 2.0366250000000001e+01 9.5042500000000008e+00 0 0 0
+239 1 9.5042500000000008e+00 1.7650749999999999e+01 9.5042500000000008e+00 0 0 0
+240 1 9.5042500000000008e+00 2.0366250000000001e+01 6.7887500000000003e+00 0 0 0
+241 1 1.0862000000000000e+01 1.6292999999999999e+01 5.4310000000000000e+00 0 0 0
+242 1 1.0862000000000000e+01 1.9008500000000002e+01 8.1464999999999996e+00 0 0 0
+243 1 1.3577500000000001e+01 1.6292999999999999e+01 8.1464999999999996e+00 0 0 0
+244 1 1.3577500000000001e+01 1.9008500000000002e+01 5.4310000000000000e+00 0 0 0
+245 1 1.2219749999999999e+01 1.7650749999999999e+01 6.7887500000000003e+00 0 0 0
+246 1 1.2219749999999999e+01 2.0366250000000001e+01 9.5042500000000008e+00 0 0 0
+247 1 1.4935250000000000e+01 1.7650749999999999e+01 9.5042500000000008e+00 0 0 0
+248 1 1.4935250000000000e+01 2.0366250000000001e+01 6.7887500000000003e+00 0 0 0
+249 1 1.6292999999999999e+01 1.6292999999999999e+01 5.4310000000000000e+00 0 0 0
+250 1 1.6292999999999999e+01 1.9008500000000002e+01 8.1464999999999996e+00 0 0 0
+251 1 1.9008500000000002e+01 1.6292999999999999e+01 8.1464999999999996e+00 0 0 0
+252 1 1.9008500000000002e+01 1.9008500000000002e+01 5.4310000000000000e+00 0 0 0
+253 1 1.7650749999999999e+01 1.7650749999999999e+01 6.7887500000000003e+00 0 0 0
+254 1 1.7650749999999999e+01 2.0366250000000001e+01 9.5042500000000008e+00 0 0 0
+255 1 2.0366250000000001e+01 1.7650749999999999e+01 9.5042500000000008e+00 0 0 0
+256 1 2.0366250000000001e+01 2.0366250000000001e+01 6.7887500000000003e+00 0 0 0
+257 1 0.0000000000000000e+00 0.0000000000000000e+00 1.0862000000000000e+01 0 0 0
+258 1 0.0000000000000000e+00 2.7155000000000000e+00 1.3577500000000001e+01 0 0 0
+259 1 2.7155000000000000e+00 0.0000000000000000e+00 1.3577500000000001e+01 0 0 0
+260 1 2.7155000000000000e+00 2.7155000000000000e+00 1.0862000000000000e+01 0 0 0
+261 1 1.3577500000000000e+00 1.3577500000000000e+00 1.2219749999999999e+01 0 0 0
+262 1 1.3577500000000000e+00 4.0732499999999998e+00 1.4935250000000000e+01 0 0 0
+263 1 4.0732499999999998e+00 1.3577500000000000e+00 1.4935250000000000e+01 0 0 0
+264 1 4.0732499999999998e+00 4.0732499999999998e+00 1.2219749999999999e+01 0 0 0
+265 1 5.4310000000000000e+00 0.0000000000000000e+00 1.0862000000000000e+01 0 0 0
+266 1 5.4310000000000000e+00 2.7155000000000000e+00 1.3577500000000001e+01 0 0 0
+267 1 8.1464999999999996e+00 0.0000000000000000e+00 1.3577500000000001e+01 0 0 0
+268 1 8.1464999999999996e+00 2.7155000000000000e+00 1.0862000000000000e+01 0 0 0
+269 1 6.7887500000000003e+00 1.3577500000000000e+00 1.2219749999999999e+01 0 0 0
+270 1 6.7887500000000003e+00 4.0732499999999998e+00 1.4935250000000000e+01 0 0 0
+271 1 9.5042500000000008e+00 1.3577500000000000e+00 1.4935250000000000e+01 0 0 0
+272 1 9.5042500000000008e+00 4.0732499999999998e+00 1.2219749999999999e+01 0 0 0
+273 1 1.0862000000000000e+01 0.0000000000000000e+00 1.0862000000000000e+01 0 0 0
+274 1 1.0862000000000000e+01 2.7155000000000000e+00 1.3577500000000001e+01 0 0 0
+275 1 1.3577500000000001e+01 0.0000000000000000e+00 1.3577500000000001e+01 0 0 0
+276 1 1.3577500000000001e+01 2.7155000000000000e+00 1.0862000000000000e+01 0 0 0
+277 1 1.2219749999999999e+01 1.3577500000000000e+00 1.2219749999999999e+01 0 0 0
+278 1 1.2219749999999999e+01 4.0732499999999998e+00 1.4935250000000000e+01 0 0 0
+279 1 1.4935250000000000e+01 1.3577500000000000e+00 1.4935250000000000e+01 0 0 0
+280 1 1.4935250000000000e+01 4.0732499999999998e+00 1.2219749999999999e+01 0 0 0
+281 1 1.6292999999999999e+01 0.0000000000000000e+00 1.0862000000000000e+01 0 0 0
+282 1 1.6292999999999999e+01 2.7155000000000000e+00 1.3577500000000001e+01 0 0 0
+283 1 1.9008500000000002e+01 0.0000000000000000e+00 1.3577500000000001e+01 0 0 0
+284 1 1.9008500000000002e+01 2.7155000000000000e+00 1.0862000000000000e+01 0 0 0
+285 1 1.7650749999999999e+01 1.3577500000000000e+00 1.2219749999999999e+01 0 0 0
+286 1 1.7650749999999999e+01 4.0732499999999998e+00 1.4935250000000000e+01 0 0 0
+287 1 2.0366250000000001e+01 1.3577500000000000e+00 1.4935250000000000e+01 0 0 0
+288 1 2.0366250000000001e+01 4.0732499999999998e+00 1.2219749999999999e+01 0 0 0
+289 1 0.0000000000000000e+00 5.4310000000000000e+00 1.0862000000000000e+01 0 0 0
+290 1 0.0000000000000000e+00 8.1464999999999996e+00 1.3577500000000001e+01 0 0 0
+291 1 2.7155000000000000e+00 5.4310000000000000e+00 1.3577500000000001e+01 0 0 0
+292 1 2.7155000000000000e+00 8.1464999999999996e+00 1.0862000000000000e+01 0 0 0
+293 1 1.3577500000000000e+00 6.7887500000000003e+00 1.2219749999999999e+01 0 0 0
+294 1 1.3577500000000000e+00 9.5042500000000008e+00 1.4935250000000000e+01 0 0 0
+295 1 4.0732499999999998e+00 6.7887500000000003e+00 1.4935250000000000e+01 0 0 0
+296 1 4.0732499999999998e+00 9.5042500000000008e+00 1.2219749999999999e+01 0 0 0
+297 1 5.4310000000000000e+00 5.4310000000000000e+00 1.0862000000000000e+01 0 0 0
+298 1 5.4310000000000000e+00 8.1464999999999996e+00 1.3577500000000001e+01 0 0 0
+299 1 8.1464999999999996e+00 5.4310000000000000e+00 1.3577500000000001e+01 0 0 0
+300 1 8.1464999999999996e+00 8.1464999999999996e+00 1.0862000000000000e+01 0 0 0
+301 1 6.7887500000000003e+00 6.7887500000000003e+00 1.2219749999999999e+01 0 0 0
+302 1 6.7887500000000003e+00 9.5042500000000008e+00 1.4935250000000000e+01 0 0 0
+303 1 9.5042500000000008e+00 6.7887500000000003e+00 1.4935250000000000e+01 0 0 0
+304 1 9.5042500000000008e+00 9.5042500000000008e+00 1.2219749999999999e+01 0 0 0
+305 1 1.0862000000000000e+01 5.4310000000000000e+00 1.0862000000000000e+01 0 0 0
+306 1 1.0862000000000000e+01 8.1464999999999996e+00 1.3577500000000001e+01 0 0 0
+307 1 1.3577500000000001e+01 5.4310000000000000e+00 1.3577500000000001e+01 0 0 0
+308 1 1.3577500000000001e+01 8.1464999999999996e+00 1.0862000000000000e+01 0 0 0
+309 1 1.2219749999999999e+01 6.7887500000000003e+00 1.2219749999999999e+01 0 0 0
+310 1 1.2219749999999999e+01 9.5042500000000008e+00 1.4935250000000000e+01 0 0 0
+311 1 1.4935250000000000e+01 6.7887500000000003e+00 1.4935250000000000e+01 0 0 0
+312 1 1.4935250000000000e+01 9.5042500000000008e+00 1.2219749999999999e+01 0 0 0
+313 1 1.6292999999999999e+01 5.4310000000000000e+00 1.0862000000000000e+01 0 0 0
+314 1 1.6292999999999999e+01 8.1464999999999996e+00 1.3577500000000001e+01 0 0 0
+315 1 1.9008500000000002e+01 5.4310000000000000e+00 1.3577500000000001e+01 0 0 0
+316 1 1.9008500000000002e+01 8.1464999999999996e+00 1.0862000000000000e+01 0 0 0
+317 1 1.7650749999999999e+01 6.7887500000000003e+00 1.2219749999999999e+01 0 0 0
+318 1 1.7650749999999999e+01 9.5042500000000008e+00 1.4935250000000000e+01 0 0 0
+319 1 2.0366250000000001e+01 6.7887500000000003e+00 1.4935250000000000e+01 0 0 0
+320 1 2.0366250000000001e+01 9.5042500000000008e+00 1.2219749999999999e+01 0 0 0
+321 1 0.0000000000000000e+00 1.0862000000000000e+01 1.0862000000000000e+01 0 0 0
+322 1 0.0000000000000000e+00 1.3577500000000001e+01 1.3577500000000001e+01 0 0 0
+323 1 2.7155000000000000e+00 1.0862000000000000e+01 1.3577500000000001e+01 0 0 0
+324 1 2.7155000000000000e+00 1.3577500000000001e+01 1.0862000000000000e+01 0 0 0
+325 1 1.3577500000000000e+00 1.2219749999999999e+01 1.2219749999999999e+01 0 0 0
+326 1 1.3577500000000000e+00 1.4935250000000000e+01 1.4935250000000000e+01 0 0 0
+327 1 4.0732499999999998e+00 1.2219749999999999e+01 1.4935250000000000e+01 0 0 0
+328 1 4.0732499999999998e+00 1.4935250000000000e+01 1.2219749999999999e+01 0 0 0
+329 1 5.4310000000000000e+00 1.0862000000000000e+01 1.0862000000000000e+01 0 0 0
+330 1 5.4310000000000000e+00 1.3577500000000001e+01 1.3577500000000001e+01 0 0 0
+331 1 8.1464999999999996e+00 1.0862000000000000e+01 1.3577500000000001e+01 0 0 0
+332 1 8.1464999999999996e+00 1.3577500000000001e+01 1.0862000000000000e+01 0 0 0
+333 1 6.7887500000000003e+00 1.2219749999999999e+01 1.2219749999999999e+01 0 0 0
+334 1 6.7887500000000003e+00 1.4935250000000000e+01 1.4935250000000000e+01 0 0 0
+335 1 9.5042500000000008e+00 1.2219749999999999e+01 1.4935250000000000e+01 0 0 0
+336 1 9.5042500000000008e+00 1.4935250000000000e+01 1.2219749999999999e+01 0 0 0
+337 1 1.0862000000000000e+01 1.0862000000000000e+01 1.0862000000000000e+01 0 0 0
+338 1 1.0862000000000000e+01 1.3577500000000001e+01 1.3577500000000001e+01 0 0 0
+339 1 1.3577500000000001e+01 1.0862000000000000e+01 1.3577500000000001e+01 0 0 0
+340 1 1.3577500000000001e+01 1.3577500000000001e+01 1.0862000000000000e+01 0 0 0
+341 1 1.2219749999999999e+01 1.2219749999999999e+01 1.2219749999999999e+01 0 0 0
+342 1 1.2219749999999999e+01 1.4935250000000000e+01 1.4935250000000000e+01 0 0 0
+343 1 1.4935250000000000e+01 1.2219749999999999e+01 1.4935250000000000e+01 0 0 0
+344 1 1.4935250000000000e+01 1.4935250000000000e+01 1.2219749999999999e+01 0 0 0
+345 1 1.6292999999999999e+01 1.0862000000000000e+01 1.0862000000000000e+01 0 0 0
+346 1 1.6292999999999999e+01 1.3577500000000001e+01 1.3577500000000001e+01 0 0 0
+347 1 1.9008500000000002e+01 1.0862000000000000e+01 1.3577500000000001e+01 0 0 0
+348 1 1.9008500000000002e+01 1.3577500000000001e+01 1.0862000000000000e+01 0 0 0
+349 1 1.7650749999999999e+01 1.2219749999999999e+01 1.2219749999999999e+01 0 0 0
+350 1 1.7650749999999999e+01 1.4935250000000000e+01 1.4935250000000000e+01 0 0 0
+351 1 2.0366250000000001e+01 1.2219749999999999e+01 1.4935250000000000e+01 0 0 0
+352 1 2.0366250000000001e+01 1.4935250000000000e+01 1.2219749999999999e+01 0 0 0
+353 1 0.0000000000000000e+00 1.6292999999999999e+01 1.0862000000000000e+01 0 0 0
+354 1 0.0000000000000000e+00 1.9008500000000002e+01 1.3577500000000001e+01 0 0 0
+355 1 2.7155000000000000e+00 1.6292999999999999e+01 1.3577500000000001e+01 0 0 0
+356 1 2.7155000000000000e+00 1.9008500000000002e+01 1.0862000000000000e+01 0 0 0
+357 1 1.3577500000000000e+00 1.7650749999999999e+01 1.2219749999999999e+01 0 0 0
+358 1 1.3577500000000000e+00 2.0366250000000001e+01 1.4935250000000000e+01 0 0 0
+359 1 4.0732499999999998e+00 1.7650749999999999e+01 1.4935250000000000e+01 0 0 0
+360 1 4.0732499999999998e+00 2.0366250000000001e+01 1.2219749999999999e+01 0 0 0
+361 1 5.4310000000000000e+00 1.6292999999999999e+01 1.0862000000000000e+01 0 0 0
+362 1 5.4310000000000000e+00 1.9008500000000002e+01 1.3577500000000001e+01 0 0 0
+363 1 8.1464999999999996e+00 1.6292999999999999e+01 1.3577500000000001e+01 0 0 0
+364 1 8.1464999999999996e+00 1.9008500000000002e+01 1.0862000000000000e+01 0 0 0
+365 1 6.7887500000000003e+00 1.7650749999999999e+01 1.2219749999999999e+01 0 0 0
+366 1 6.7887500000000003e+00 2.0366250000000001e+01 1.4935250000000000e+01 0 0 0
+367 1 9.5042500000000008e+00 1.7650749999999999e+01 1.4935250000000000e+01 0 0 0
+368 1 9.5042500000000008e+00 2.0366250000000001e+01 1.2219749999999999e+01 0 0 0
+369 1 1.0862000000000000e+01 1.6292999999999999e+01 1.0862000000000000e+01 0 0 0
+370 1 1.0862000000000000e+01 1.9008500000000002e+01 1.3577500000000001e+01 0 0 0
+371 1 1.3577500000000001e+01 1.6292999999999999e+01 1.3577500000000001e+01 0 0 0
+372 1 1.3577500000000001e+01 1.9008500000000002e+01 1.0862000000000000e+01 0 0 0
+373 1 1.2219749999999999e+01 1.7650749999999999e+01 1.2219749999999999e+01 0 0 0
+374 1 1.2219749999999999e+01 2.0366250000000001e+01 1.4935250000000000e+01 0 0 0
+375 1 1.4935250000000000e+01 1.7650749999999999e+01 1.4935250000000000e+01 0 0 0
+376 1 1.4935250000000000e+01 2.0366250000000001e+01 1.2219749999999999e+01 0 0 0
+377 1 1.6292999999999999e+01 1.6292999999999999e+01 1.0862000000000000e+01 0 0 0
+378 1 1.6292999999999999e+01 1.9008500000000002e+01 1.3577500000000001e+01 0 0 0
+379 1 1.9008500000000002e+01 1.6292999999999999e+01 1.3577500000000001e+01 0 0 0
+380 1 1.9008500000000002e+01 1.9008500000000002e+01 1.0862000000000000e+01 0 0 0
+381 1 1.7650749999999999e+01 1.7650749999999999e+01 1.2219749999999999e+01 0 0 0
+382 1 1.7650749999999999e+01 2.0366250000000001e+01 1.4935250000000000e+01 0 0 0
+383 1 2.0366250000000001e+01 1.7650749999999999e+01 1.4935250000000000e+01 0 0 0
+384 1 2.0366250000000001e+01 2.0366250000000001e+01 1.2219749999999999e+01 0 0 0
+385 1 0.0000000000000000e+00 0.0000000000000000e+00 1.6292999999999999e+01 0 0 0
+386 1 0.0000000000000000e+00 2.7155000000000000e+00 1.9008500000000002e+01 0 0 0
+387 1 2.7155000000000000e+00 0.0000000000000000e+00 1.9008500000000002e+01 0 0 0
+388 1 2.7155000000000000e+00 2.7155000000000000e+00 1.6292999999999999e+01 0 0 0
+389 1 1.3577500000000000e+00 1.3577500000000000e+00 1.7650749999999999e+01 0 0 0
+390 1 1.3577500000000000e+00 4.0732499999999998e+00 2.0366250000000001e+01 0 0 0
+391 1 4.0732499999999998e+00 1.3577500000000000e+00 2.0366250000000001e+01 0 0 0
+392 1 4.0732499999999998e+00 4.0732499999999998e+00 1.7650749999999999e+01 0 0 0
+393 1 5.4310000000000000e+00 0.0000000000000000e+00 1.6292999999999999e+01 0 0 0
+394 1 5.4310000000000000e+00 2.7155000000000000e+00 1.9008500000000002e+01 0 0 0
+395 1 8.1464999999999996e+00 0.0000000000000000e+00 1.9008500000000002e+01 0 0 0
+396 1 8.1464999999999996e+00 2.7155000000000000e+00 1.6292999999999999e+01 0 0 0
+397 1 6.7887500000000003e+00 1.3577500000000000e+00 1.7650749999999999e+01 0 0 0
+398 1 6.7887500000000003e+00 4.0732499999999998e+00 2.0366250000000001e+01 0 0 0
+399 1 9.5042500000000008e+00 1.3577500000000000e+00 2.0366250000000001e+01 0 0 0
+400 1 9.5042500000000008e+00 4.0732499999999998e+00 1.7650749999999999e+01 0 0 0
+401 1 1.0862000000000000e+01 0.0000000000000000e+00 1.6292999999999999e+01 0 0 0
+402 1 1.0862000000000000e+01 2.7155000000000000e+00 1.9008500000000002e+01 0 0 0
+403 1 1.3577500000000001e+01 0.0000000000000000e+00 1.9008500000000002e+01 0 0 0
+404 1 1.3577500000000001e+01 2.7155000000000000e+00 1.6292999999999999e+01 0 0 0
+405 1 1.2219749999999999e+01 1.3577500000000000e+00 1.7650749999999999e+01 0 0 0
+406 1 1.2219749999999999e+01 4.0732499999999998e+00 2.0366250000000001e+01 0 0 0
+407 1 1.4935250000000000e+01 1.3577500000000000e+00 2.0366250000000001e+01 0 0 0
+408 1 1.4935250000000000e+01 4.0732499999999998e+00 1.7650749999999999e+01 0 0 0
+409 1 1.6292999999999999e+01 0.0000000000000000e+00 1.6292999999999999e+01 0 0 0
+410 1 1.6292999999999999e+01 2.7155000000000000e+00 1.9008500000000002e+01 0 0 0
+411 1 1.9008500000000002e+01 0.0000000000000000e+00 1.9008500000000002e+01 0 0 0
+412 1 1.9008500000000002e+01 2.7155000000000000e+00 1.6292999999999999e+01 0 0 0
+413 1 1.7650749999999999e+01 1.3577500000000000e+00 1.7650749999999999e+01 0 0 0
+414 1 1.7650749999999999e+01 4.0732499999999998e+00 2.0366250000000001e+01 0 0 0
+415 1 2.0366250000000001e+01 1.3577500000000000e+00 2.0366250000000001e+01 0 0 0
+416 1 2.0366250000000001e+01 4.0732499999999998e+00 1.7650749999999999e+01 0 0 0
+417 1 0.0000000000000000e+00 5.4310000000000000e+00 1.6292999999999999e+01 0 0 0
+418 1 0.0000000000000000e+00 8.1464999999999996e+00 1.9008500000000002e+01 0 0 0
+419 1 2.7155000000000000e+00 5.4310000000000000e+00 1.9008500000000002e+01 0 0 0
+420 1 2.7155000000000000e+00 8.1464999999999996e+00 1.6292999999999999e+01 0 0 0
+421 1 1.3577500000000000e+00 6.7887500000000003e+00 1.7650749999999999e+01 0 0 0
+422 1 1.3577500000000000e+00 9.5042500000000008e+00 2.0366250000000001e+01 0 0 0
+423 1 4.0732499999999998e+00 6.7887500000000003e+00 2.0366250000000001e+01 0 0 0
+424 1 4.0732499999999998e+00 9.5042500000000008e+00 1.7650749999999999e+01 0 0 0
+425 1 5.4310000000000000e+00 5.4310000000000000e+00 1.6292999999999999e+01 0 0 0
+426 1 5.4310000000000000e+00 8.1464999999999996e+00 1.9008500000000002e+01 0 0 0
+427 1 8.1464999999999996e+00 5.4310000000000000e+00 1.9008500000000002e+01 0 0 0
+428 1 8.1464999999999996e+00 8.1464999999999996e+00 1.6292999999999999e+01 0 0 0
+429 1 6.7887500000000003e+00 6.7887500000000003e+00 1.7650749999999999e+01 0 0 0
+430 1 6.7887500000000003e+00 9.5042500000000008e+00 2.0366250000000001e+01 0 0 0
+431 1 9.5042500000000008e+00 6.7887500000000003e+00 2.0366250000000001e+01 0 0 0
+432 1 9.5042500000000008e+00 9.5042500000000008e+00 1.7650749999999999e+01 0 0 0
+433 1 1.0862000000000000e+01 5.4310000000000000e+00 1.6292999999999999e+01 0 0 0
+434 1 1.0862000000000000e+01 8.1464999999999996e+00 1.9008500000000002e+01 0 0 0
+435 1 1.3577500000000001e+01 5.4310000000000000e+00 1.9008500000000002e+01 0 0 0
+436 1 1.3577500000000001e+01 8.1464999999999996e+00 1.6292999999999999e+01 0 0 0
+437 1 1.2219749999999999e+01 6.7887500000000003e+00 1.7650749999999999e+01 0 0 0
+438 1 1.2219749999999999e+01 9.5042500000000008e+00 2.0366250000000001e+01 0 0 0
+439 1 1.4935250000000000e+01 6.7887500000000003e+00 2.0366250000000001e+01 0 0 0
+440 1 1.4935250000000000e+01 9.5042500000000008e+00 1.7650749999999999e+01 0 0 0
+441 1 1.6292999999999999e+01 5.4310000000000000e+00 1.6292999999999999e+01 0 0 0
+442 1 1.6292999999999999e+01 8.1464999999999996e+00 1.9008500000000002e+01 0 0 0
+443 1 1.9008500000000002e+01 5.4310000000000000e+00 1.9008500000000002e+01 0 0 0
+444 1 1.9008500000000002e+01 8.1464999999999996e+00 1.6292999999999999e+01 0 0 0
+445 1 1.7650749999999999e+01 6.7887500000000003e+00 1.7650749999999999e+01 0 0 0
+446 1 1.7650749999999999e+01 9.5042500000000008e+00 2.0366250000000001e+01 0 0 0
+447 1 2.0366250000000001e+01 6.7887500000000003e+00 2.0366250000000001e+01 0 0 0
+448 1 2.0366250000000001e+01 9.5042500000000008e+00 1.7650749999999999e+01 0 0 0
+449 1 0.0000000000000000e+00 1.0862000000000000e+01 1.6292999999999999e+01 0 0 0
+450 1 0.0000000000000000e+00 1.3577500000000001e+01 1.9008500000000002e+01 0 0 0
+451 1 2.7155000000000000e+00 1.0862000000000000e+01 1.9008500000000002e+01 0 0 0
+452 1 2.7155000000000000e+00 1.3577500000000001e+01 1.6292999999999999e+01 0 0 0
+453 1 1.3577500000000000e+00 1.2219749999999999e+01 1.7650749999999999e+01 0 0 0
+454 1 1.3577500000000000e+00 1.4935250000000000e+01 2.0366250000000001e+01 0 0 0
+455 1 4.0732499999999998e+00 1.2219749999999999e+01 2.0366250000000001e+01 0 0 0
+456 1 4.0732499999999998e+00 1.4935250000000000e+01 1.7650749999999999e+01 0 0 0
+457 1 5.4310000000000000e+00 1.0862000000000000e+01 1.6292999999999999e+01 0 0 0
+458 1 5.4310000000000000e+00 1.3577500000000001e+01 1.9008500000000002e+01 0 0 0
+459 1 8.1464999999999996e+00 1.0862000000000000e+01 1.9008500000000002e+01 0 0 0
+460 1 8.1464999999999996e+00 1.3577500000000001e+01 1.6292999999999999e+01 0 0 0
+461 1 6.7887500000000003e+00 1.2219749999999999e+01 1.7650749999999999e+01 0 0 0
+462 1 6.7887500000000003e+00 1.4935250000000000e+01 2.0366250000000001e+01 0 0 0
+463 1 9.5042500000000008e+00 1.2219749999999999e+01 2.0366250000000001e+01 0 0 0
+464 1 9.5042500000000008e+00 1.4935250000000000e+01 1.7650749999999999e+01 0 0 0
+465 1 1.0862000000000000e+01 1.0862000000000000e+01 1.6292999999999999e+01 0 0 0
+466 1 1.0862000000000000e+01 1.3577500000000001e+01 1.9008500000000002e+01 0 0 0
+467 1 1.3577500000000001e+01 1.0862000000000000e+01 1.9008500000000002e+01 0 0 0
+468 1 1.3577500000000001e+01 1.3577500000000001e+01 1.6292999999999999e+01 0 0 0
+469 1 1.2219749999999999e+01 1.2219749999999999e+01 1.7650749999999999e+01 0 0 0
+470 1 1.2219749999999999e+01 1.4935250000000000e+01 2.0366250000000001e+01 0 0 0
+471 1 1.4935250000000000e+01 1.2219749999999999e+01 2.0366250000000001e+01 0 0 0
+472 1 1.4935250000000000e+01 1.4935250000000000e+01 1.7650749999999999e+01 0 0 0
+473 1 1.6292999999999999e+01 1.0862000000000000e+01 1.6292999999999999e+01 0 0 0
+474 1 1.6292999999999999e+01 1.3577500000000001e+01 1.9008500000000002e+01 0 0 0
+475 1 1.9008500000000002e+01 1.0862000000000000e+01 1.9008500000000002e+01 0 0 0
+476 1 1.9008500000000002e+01 1.3577500000000001e+01 1.6292999999999999e+01 0 0 0
+477 1 1.7650749999999999e+01 1.2219749999999999e+01 1.7650749999999999e+01 0 0 0
+478 1 1.7650749999999999e+01 1.4935250000000000e+01 2.0366250000000001e+01 0 0 0
+479 1 2.0366250000000001e+01 1.2219749999999999e+01 2.0366250000000001e+01 0 0 0
+480 1 2.0366250000000001e+01 1.4935250000000000e+01 1.7650749999999999e+01 0 0 0
+481 1 0.0000000000000000e+00 1.6292999999999999e+01 1.6292999999999999e+01 0 0 0
+482 1 0.0000000000000000e+00 1.9008500000000002e+01 1.9008500000000002e+01 0 0 0
+483 1 2.7155000000000000e+00 1.6292999999999999e+01 1.9008500000000002e+01 0 0 0
+484 1 2.7155000000000000e+00 1.9008500000000002e+01 1.6292999999999999e+01 0 0 0
+485 1 1.3577500000000000e+00 1.7650749999999999e+01 1.7650749999999999e+01 0 0 0
+486 1 1.3577500000000000e+00 2.0366250000000001e+01 2.0366250000000001e+01 0 0 0
+487 1 4.0732499999999998e+00 1.7650749999999999e+01 2.0366250000000001e+01 0 0 0
+488 1 4.0732499999999998e+00 2.0366250000000001e+01 1.7650749999999999e+01 0 0 0
+489 1 5.4310000000000000e+00 1.6292999999999999e+01 1.6292999999999999e+01 0 0 0
+490 1 5.4310000000000000e+00 1.9008500000000002e+01 1.9008500000000002e+01 0 0 0
+491 1 8.1464999999999996e+00 1.6292999999999999e+01 1.9008500000000002e+01 0 0 0
+492 1 8.1464999999999996e+00 1.9008500000000002e+01 1.6292999999999999e+01 0 0 0
+493 1 6.7887500000000003e+00 1.7650749999999999e+01 1.7650749999999999e+01 0 0 0
+494 1 6.7887500000000003e+00 2.0366250000000001e+01 2.0366250000000001e+01 0 0 0
+495 1 9.5042500000000008e+00 1.7650749999999999e+01 2.0366250000000001e+01 0 0 0
+496 1 9.5042500000000008e+00 2.0366250000000001e+01 1.7650749999999999e+01 0 0 0
+497 1 1.0862000000000000e+01 1.6292999999999999e+01 1.6292999999999999e+01 0 0 0
+498 1 1.0862000000000000e+01 1.9008500000000002e+01 1.9008500000000002e+01 0 0 0
+499 1 1.3577500000000001e+01 1.6292999999999999e+01 1.9008500000000002e+01 0 0 0
+500 1 1.3577500000000001e+01 1.9008500000000002e+01 1.6292999999999999e+01 0 0 0
+501 1 1.2219749999999999e+01 1.7650749999999999e+01 1.7650749999999999e+01 0 0 0
+502 1 1.2219749999999999e+01 2.0366250000000001e+01 2.0366250000000001e+01 0 0 0
+503 1 1.4935250000000000e+01 1.7650749999999999e+01 2.0366250000000001e+01 0 0 0
+504 1 1.4935250000000000e+01 2.0366250000000001e+01 1.7650749999999999e+01 0 0 0
+505 1 1.6292999999999999e+01 1.6292999999999999e+01 1.6292999999999999e+01 0 0 0
+506 1 1.6292999999999999e+01 1.9008500000000002e+01 1.9008500000000002e+01 0 0 0
+507 1 1.9008500000000002e+01 1.6292999999999999e+01 1.9008500000000002e+01 0 0 0
+508 1 1.9008500000000002e+01 1.9008500000000002e+01 1.6292999999999999e+01 0 0 0
+509 1 1.7650749999999999e+01 1.7650749999999999e+01 1.7650749999999999e+01 0 0 0
+510 1 1.7650749999999999e+01 2.0366250000000001e+01 2.0366250000000001e+01 0 0 0
+511 1 2.0366250000000001e+01 1.7650749999999999e+01 2.0366250000000001e+01 0 0 0
+512 1 2.0366250000000001e+01 2.0366250000000001e+01 1.7650749999999999e+01 0 0 0
+
+Velocities
+
+1 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+2 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+3 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+4 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+5 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+6 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+7 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+8 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+9 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+10 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+11 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+12 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+13 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+14 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+15 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+16 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+17 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+18 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+19 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+20 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+21 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+22 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+23 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+24 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+25 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+26 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+27 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+28 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+29 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+30 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+31 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+32 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+33 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+34 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+35 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+36 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+37 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+38 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+39 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+40 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+41 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+42 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+43 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+44 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+45 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+46 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+47 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+48 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+49 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+50 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+51 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+52 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+53 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+54 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+55 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+56 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+57 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+58 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+59 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+60 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+61 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+62 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+63 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+64 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+65 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+66 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+67 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+68 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+69 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+70 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+71 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+72 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+73 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+74 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+75 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+76 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+77 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+78 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+79 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+80 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+81 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+82 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+83 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+84 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+85 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+86 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+87 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+88 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+89 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+90 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+91 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+92 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+93 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+94 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+95 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+96 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+97 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+98 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+99 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+100 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+101 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+102 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+103 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+104 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+105 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+106 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+107 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+108 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+109 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+110 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+111 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+112 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+113 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+114 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+115 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+116 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+117 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+118 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+119 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+120 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+121 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+122 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+123 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+124 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+125 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+126 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+127 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+128 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+129 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+130 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+131 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+132 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+133 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+134 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+135 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+136 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+137 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+138 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+139 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+140 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+141 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+142 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+143 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+144 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+145 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+146 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+147 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+148 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+149 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+150 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+151 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+152 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+153 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+154 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+155 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+156 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+157 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+158 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+159 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+160 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+161 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+162 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+163 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+164 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+165 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+166 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+167 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+168 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+169 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+170 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+171 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+172 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+173 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+174 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+175 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+176 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+177 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+178 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+179 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+180 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+181 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+182 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+183 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+184 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+185 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+186 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+187 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+188 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+189 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+190 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+191 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+192 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+193 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+194 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+195 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+196 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+197 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+198 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+199 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+200 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+201 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+202 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+203 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+204 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+205 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+206 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+207 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+208 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+209 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+210 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+211 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+212 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+213 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+214 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+215 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+216 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+217 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+218 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+219 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+220 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+221 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+222 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+223 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+224 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+225 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+226 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+227 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+228 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+229 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+230 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+231 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+232 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+233 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+234 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+235 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+236 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+237 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+238 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+239 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+240 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+241 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+242 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+243 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+244 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+245 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+246 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+247 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+248 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+249 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+250 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+251 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+252 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+253 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+254 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+255 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+256 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+257 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+258 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+259 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+260 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+261 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+262 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+263 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+264 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+265 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+266 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+267 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+268 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+269 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+270 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+271 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+272 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+273 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+274 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+275 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+276 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+277 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+278 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+279 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+280 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+281 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+282 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+283 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+284 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+285 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+286 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+287 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+288 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+289 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+290 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+291 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+292 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+293 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+294 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+295 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+296 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+297 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+298 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+299 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+300 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+301 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+302 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+303 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+304 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+305 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+306 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+307 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+308 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+309 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+310 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+311 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+312 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+313 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+314 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+315 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+316 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+317 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+318 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+319 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+320 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+321 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+322 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+323 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+324 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+325 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+326 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+327 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+328 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+329 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+330 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+331 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+332 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+333 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+334 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+335 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+336 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+337 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+338 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+339 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+340 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+341 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+342 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+343 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+344 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+345 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+346 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+347 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+348 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+349 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+350 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+351 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+352 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+353 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+354 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+355 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+356 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+357 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+358 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+359 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+360 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+361 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+362 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+363 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+364 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+365 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+366 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+367 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+368 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+369 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+370 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+371 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+372 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+373 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+374 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+375 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+376 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+377 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+378 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+379 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+380 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+381 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+382 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+383 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+384 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+385 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+386 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+387 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+388 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+389 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+390 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+391 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+392 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+393 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+394 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+395 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+396 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+397 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+398 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+399 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+400 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+401 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+402 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+403 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+404 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+405 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+406 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+407 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+408 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+409 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+410 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+411 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+412 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+413 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+414 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+415 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+416 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+417 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+418 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+419 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+420 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+421 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+422 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+423 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+424 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+425 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+426 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+427 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+428 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+429 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+430 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+431 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+432 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+433 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+434 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+435 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+436 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+437 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+438 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+439 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+440 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+441 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+442 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+443 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+444 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+445 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+446 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+447 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+448 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+449 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+450 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+451 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+452 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+453 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+454 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+455 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+456 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+457 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+458 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+459 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+460 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+461 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+462 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+463 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+464 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+465 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+466 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+467 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+468 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+469 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+470 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+471 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+472 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+473 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+474 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+475 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+476 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+477 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+478 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+479 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+480 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+481 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+482 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+483 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+484 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+485 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+486 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+487 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+488 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+489 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+490 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+491 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+492 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+493 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+494 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+495 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+496 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+497 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+498 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+499 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+500 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+501 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+502 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+503 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+504 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+505 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+506 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+507 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+508 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+509 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+510 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+511 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
+512 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00
diff --git a/examples/fire/log.09Janv20.cg.g++.1 b/examples/fire/log.09Janv20.cg.g++.1
new file mode 100644
index 0000000000..ca0e986116
--- /dev/null
+++ b/examples/fire/log.09Janv20.cg.g++.1
@@ -0,0 +1,155 @@
+LAMMPS (09 Jan 2020)
+# 2d Lennard-Jones melt and subsequent energy minimization
+
+units		lj
+dimension	2
+atom_style	atomic
+
+lattice		sq2 0.8442
+Lattice spacing in x,y,z = 1.53919 1.53919 1.53919
+region		box block 0 20 0 20 -0.1 0.1
+create_box	1 box
+Created orthogonal box = (0 0 -0.153919) to (30.7838 30.7838 0.153919)
+  1 by 1 by 1 MPI processor grid
+create_atoms	1 box
+Created 800 atoms
+  create_atoms CPU = 0.000325 secs
+mass		1 1.0
+
+velocity	all create 5.0 87287 loop geom
+
+pair_style	lj/cut 2.5
+pair_coeff	1 1 1.0 1.0 2.5
+pair_modify	shift yes
+
+neighbor	0.3 bin
+neigh_modify	delay 0 every 1 check yes
+
+fix		1 all nve
+fix		2 all enforce2d
+
+#dump		1 all atom 100 dump.min
+
+#dump		2 all image 50 image.*.jpg type type #		zoom 1.6 adiam 1.5
+#dump_modify	2 pad 4
+
+#dump		3 all movie 50 movie.mpg type type #		zoom 1.6 adiam 1.5
+#dump_modify	3 pad 4
+
+thermo		100
+
+run		1000
+Neighbor list info ...
+  update every 1 steps, delay 0 steps, check yes
+  max neighbors/atom: 2000, page size: 100000
+  master list distance cutoff = 2.8
+  ghost atom cutoff = 2.8
+  binsize = 1.4, bins = 22 22 1
+  1 neighbor lists, perpetual/occasional/extra = 1 0 0
+  (1) pair lj/cut, perpetual
+      attributes: half, newton on
+      pair build: half/bin/atomonly/newton
+      stencil: half/bin/2d/newton
+      bin: standard
+Per MPI rank memory allocation (min/avg/max) = 3.057 | 3.057 | 3.057 Mbytes
+Step Temp E_pair E_mol TotEng Press 
+       0            5    -2.461717            0     2.532033    5.0190509 
+     100    3.2788864  -0.74311698            0    2.5316708    15.912832 
+     200    3.3041082  -0.77000277            0    2.5299752    15.602653 
+     300    3.3840228  -0.84859211            0    2.5312006    15.188203 
+     400    3.3916063  -0.85694601            0    2.5304208    15.383853 
+     500    3.3136052  -0.77935263            0    2.5301106    15.833296 
+     600    3.3888915  -0.85213743            0     2.532518    15.162759 
+     700    3.2123675  -0.67642318            0    2.5319289    16.310565 
+     800    3.3016275  -0.76569171            0    2.5318087    15.639335 
+     900    3.4639203  -0.92788002            0    2.5317104    14.765912 
+    1000    3.3256788  -0.79078181            0    2.5307399    15.599298 
+Loop time of 0.149596 on 1 procs for 1000 steps with 800 atoms
+
+Performance: 2887777.748 tau/day, 6684.671 timesteps/s
+98.6% CPU use with 1 MPI tasks x no OpenMP threads
+
+MPI task timing breakdown:
+Section |  min time  |  avg time  |  max time  |%varavg| %total
+---------------------------------------------------------------
+Pair    | 0.092428   | 0.092428   | 0.092428   |   0.0 | 61.79
+Neigh   | 0.040435   | 0.040435   | 0.040435   |   0.0 | 27.03
+Comm    | 0.003456   | 0.003456   | 0.003456   |   0.0 |  2.31
+Output  | 0.000191   | 0.000191   | 0.000191   |   0.0 |  0.13
+Modify  | 0.009599   | 0.009599   | 0.009599   |   0.0 |  6.42
+Other   |            | 0.003487   |            |       |  2.33
+
+Nlocal:    800 ave 800 max 800 min
+Histogram: 1 0 0 0 0 0 0 0 0 0
+Nghost:    317 ave 317 max 317 min
+Histogram: 1 0 0 0 0 0 0 0 0 0
+Neighs:    7743 ave 7743 max 7743 min
+Histogram: 1 0 0 0 0 0 0 0 0 0
+
+Total # of neighbors = 7743
+Ave neighs/atom = 9.67875
+Neighbor list builds = 203
+Dangerous builds = 0
+
+neigh_modify	delay 0 every 1 check yes
+
+#dump_modify	1 every 25
+
+thermo		50
+min_style	cg
+minimize	0.0 1.0e-6 10000 10000
+Per MPI rank memory allocation (min/avg/max) = 4.183 | 4.183 | 4.183 Mbytes
+Step Temp E_pair E_mol TotEng Press 
+    1000    3.3256788  -0.79078181            0    2.5307399    15.599298 
+    1050    3.3256788   -2.8361415            0   0.48538014    1.6090001 
+    1100    3.3256788   -2.8661626            0   0.45535906    1.6175322 
+    1150    3.3256788   -2.8783275            0   0.44319421    1.6293715 
+    1200    3.3256788   -2.8838202            0   0.43770144    1.6393211 
+    1250    3.3256788   -2.8956657            0   0.42585599     1.604841 
+    1300    3.3256788   -2.9039122            0   0.41760945    1.6594733 
+    1350    3.3256788   -2.9100776            0    0.4114441    1.7004165 
+    1400    3.3256788   -2.9131297            0   0.40839199    1.7078217 
+    1450    3.3256788   -2.9167506            0   0.40477104    1.7780477 
+    1500    3.3256788    -2.916974            0    0.4045477    1.7981449 
+    1550    3.3256788   -2.9169794            0   0.40454227    1.8023577 
+    1600    3.3256788   -2.9169795            0   0.40454213    1.8030228 
+    1650    3.3256788   -2.9169795            0   0.40454213    1.8030432 
+    1700    3.3256788   -2.9169795            0   0.40454213    1.8030396 
+    1750    3.3256788   -2.9169795            0   0.40454213    1.8030394 
+    1800    3.3256788   -2.9169795            0   0.40454213    1.8030395 
+    1803    3.3256788   -2.9169795            0   0.40454213    1.8030395 
+Loop time of 0.293121 on 1 procs for 803 steps with 800 atoms
+
+98.8% CPU use with 1 MPI tasks x no OpenMP threads
+
+Minimization stats:
+  Stopping criterion = force tolerance
+  Energy initial, next-to-last, final = 
+       -0.790781812776     -2.91697954354     -2.91697954354
+  Force two-norm initial, final = 1905.47 9.82516e-07
+  Force max component initial, final = 343.392 3.01878e-07
+  Final line search alpha, max atom move = 1 3.01878e-07
+  Iterations, force evaluations = 803 1596
+
+MPI task timing breakdown:
+Section |  min time  |  avg time  |  max time  |%varavg| %total
+---------------------------------------------------------------
+Pair    | 0.24243    | 0.24243    | 0.24243    |   0.0 | 82.71
+Neigh   | 0.016566   | 0.016566   | 0.016566   |   0.0 |  5.65
+Comm    | 0.00342    | 0.00342    | 0.00342    |   0.0 |  1.17
+Output  | 0.000318   | 0.000318   | 0.000318   |   0.0 |  0.11
+Modify  | 0.005032   | 0.005032   | 0.005032   |   0.0 |  1.72
+Other   |            | 0.02536    |            |       |  8.65
+
+Nlocal:    800 ave 800 max 800 min
+Histogram: 1 0 0 0 0 0 0 0 0 0
+Nghost:    329 ave 329 max 329 min
+Histogram: 1 0 0 0 0 0 0 0 0 0
+Neighs:    6957 ave 6957 max 6957 min
+Histogram: 1 0 0 0 0 0 0 0 0 0
+
+Total # of neighbors = 6957
+Ave neighs/atom = 8.69625
+Neighbor list builds = 85
+Dangerous builds = 0
+Total wall time: 0:00:00
diff --git a/examples/fire/log.09Janv20.fire.g++.1 b/examples/fire/log.09Janv20.fire.g++.1
new file mode 100644
index 0000000000..d3ed3e7492
--- /dev/null
+++ b/examples/fire/log.09Janv20.fire.g++.1
@@ -0,0 +1,172 @@
+LAMMPS (09 Jan 2020)
+# 2d Lennard-Jones melt and subsequent energy minimization
+
+units		lj
+dimension	2
+atom_style	atomic
+
+lattice		sq2 0.8442
+Lattice spacing in x,y,z = 1.53919 1.53919 1.53919
+region		box block 0 20 0 20 -0.1 0.1
+create_box	1 box
+Created orthogonal box = (0 0 -0.153919) to (30.7838 30.7838 0.153919)
+  1 by 1 by 1 MPI processor grid
+create_atoms	1 box
+Created 800 atoms
+  create_atoms CPU = 0.00032 secs
+mass		1 1.0
+
+velocity	all create 5.0 87287 loop geom
+
+pair_style	lj/cut 2.5
+pair_coeff	1 1 1.0 1.0 2.5
+pair_modify	shift yes
+
+neighbor	0.3 bin
+neigh_modify	delay 0 every 1 check yes
+
+fix		1 all nve
+fix		2 all enforce2d
+
+#dump		1 all atom 100 dump.min
+
+#dump		2 all image 50 image.*.jpg type type #		zoom 1.6 adiam 1.5
+#dump_modify	2 pad 4
+
+#dump		3 all movie 50 movie.mpg type type #		zoom 1.6 adiam 1.5
+#dump_modify	3 pad 4
+
+thermo		100
+
+run		1000
+Neighbor list info ...
+  update every 1 steps, delay 0 steps, check yes
+  max neighbors/atom: 2000, page size: 100000
+  master list distance cutoff = 2.8
+  ghost atom cutoff = 2.8
+  binsize = 1.4, bins = 22 22 1
+  1 neighbor lists, perpetual/occasional/extra = 1 0 0
+  (1) pair lj/cut, perpetual
+      attributes: half, newton on
+      pair build: half/bin/atomonly/newton
+      stencil: half/bin/2d/newton
+      bin: standard
+Per MPI rank memory allocation (min/avg/max) = 3.057 | 3.057 | 3.057 Mbytes
+Step Temp E_pair E_mol TotEng Press 
+       0            5    -2.461717            0     2.532033    5.0190509 
+     100    3.2788864  -0.74311698            0    2.5316708    15.912832 
+     200    3.3041082  -0.77000277            0    2.5299752    15.602653 
+     300    3.3840228  -0.84859211            0    2.5312006    15.188203 
+     400    3.3916063  -0.85694601            0    2.5304208    15.383853 
+     500    3.3136052  -0.77935263            0    2.5301106    15.833296 
+     600    3.3888915  -0.85213743            0     2.532518    15.162759 
+     700    3.2123675  -0.67642318            0    2.5319289    16.310565 
+     800    3.3016275  -0.76569171            0    2.5318087    15.639335 
+     900    3.4639203  -0.92788002            0    2.5317104    14.765912 
+    1000    3.3256788  -0.79078181            0    2.5307399    15.599298 
+Loop time of 0.148541 on 1 procs for 1000 steps with 800 atoms
+
+Performance: 2908287.947 tau/day, 6732.148 timesteps/s
+99.2% CPU use with 1 MPI tasks x no OpenMP threads
+
+MPI task timing breakdown:
+Section |  min time  |  avg time  |  max time  |%varavg| %total
+---------------------------------------------------------------
+Pair    | 0.090497   | 0.090497   | 0.090497   |   0.0 | 60.92
+Neigh   | 0.041085   | 0.041085   | 0.041085   |   0.0 | 27.66
+Comm    | 0.003431   | 0.003431   | 0.003431   |   0.0 |  2.31
+Output  | 0.000188   | 0.000188   | 0.000188   |   0.0 |  0.13
+Modify  | 0.009931   | 0.009931   | 0.009931   |   0.0 |  6.69
+Other   |            | 0.003409   |            |       |  2.29
+
+Nlocal:    800 ave 800 max 800 min
+Histogram: 1 0 0 0 0 0 0 0 0 0
+Nghost:    317 ave 317 max 317 min
+Histogram: 1 0 0 0 0 0 0 0 0 0
+Neighs:    7743 ave 7743 max 7743 min
+Histogram: 1 0 0 0 0 0 0 0 0 0
+
+Total # of neighbors = 7743
+Ave neighs/atom = 9.67875
+Neighbor list builds = 203
+Dangerous builds = 0
+
+neigh_modify	delay 0 every 1 check yes
+
+#dump_modify	1 every 25
+
+thermo		50
+min_style	fire
+minimize	0.0 1.0e-6 10000 10000
+  Parameters for fire: 
+    dmax delaystep dtgrow dtshrink alpha0 alphashrink tmax tmin    integrator halfstepback relaxbox relaxbox_mod relaxbox_rate ptol 
+     0.1        20    1.1      0.5   0.25        0.99   10 0.02 eulerimplicit          yes 
+Per MPI rank memory allocation (min/avg/max) = 3.058 | 3.058 | 3.058 Mbytes
+Step Temp E_pair E_mol TotEng Press 
+    1000            0  -0.79078181            0  -0.79078181     12.79527 
+    1050  0.026844171   -2.7795211            0   -2.7527105  -0.87603277 
+    1100 0.0034822073   -2.8529023            0   -2.8494245   -1.2124257 
+    1150 0.00086547466    -2.868953            0   -2.8680886   -1.2359795 
+    1200 0.00097619081   -2.8772187            0   -2.8762437    -1.286455 
+    1250 0.0010932112   -2.8815244            0   -2.8804326   -1.3030012 
+    1300 0.00011570361   -2.8827401            0   -2.8826246   -1.3040874 
+    1350 0.00013328904   -2.8829838            0   -2.8828506   -1.2996017 
+    1400 0.00018991693   -2.8844011            0   -2.8842114   -1.2697602 
+    1450 0.0017139171   -2.8880702            0   -2.8863584   -1.2367621 
+    1500 0.00015838581    -2.891362            0   -2.8912038   -1.1688764 
+    1550 3.671122e-05   -2.8920253            0   -2.8919886   -1.1669644 
+    1600 8.5025973e-05   -2.8924697            0   -2.8923848   -1.1565595 
+    1650 0.00031059668   -2.8932768            0   -2.8929666   -1.1412709 
+    1700 8.5903751e-05   -2.8936767            0   -2.8935909   -1.1287456 
+    1750 5.1139269e-08   -2.8937466            0   -2.8937466   -1.1280269 
+    1800 1.1671203e-07    -2.893751            0   -2.8937509   -1.1269919 
+    1850 1.6442171e-07   -2.8937533            0   -2.8937532   -1.1269835 
+    1900 2.7880101e-06   -2.8937574            0   -2.8937546    -1.128914 
+    1950 9.7931277e-05   -2.8948559            0    -2.894758   -1.1298435 
+    2000 8.8954569e-06   -2.8948879            0    -2.894879   -1.1291332 
+    2050 1.3956548e-06   -2.8949028            0   -2.8949014   -1.1286287 
+    2100 4.250297e-07   -2.8949058            0   -2.8949054   -1.1286873 
+    2150 7.8744547e-08   -2.8949064            0   -2.8949063    -1.128789 
+    2200 6.1147167e-10   -2.8949064            0   -2.8949064   -1.1288611 
+    2250 3.0004658e-10   -2.8949064            0   -2.8949064   -1.1288707 
+    2300 1.2118076e-10   -2.8949064            0   -2.8949064   -1.1288784 
+    2350 9.1550426e-12   -2.8949064            0   -2.8949064    -1.128882 
+    2400 2.7467472e-14   -2.8949064            0   -2.8949064   -1.1288819 
+    2450 1.8628857e-14   -2.8949064            0   -2.8949064   -1.1288818 
+    2500 6.6730826e-15   -2.8949064            0   -2.8949064   -1.1288818 
+    2532 1.4818811e-15   -2.8949064            0   -2.8949064   -1.1288817 
+Loop time of 0.281178 on 1 procs for 1532 steps with 800 atoms
+
+98.4% CPU use with 1 MPI tasks x no OpenMP threads
+
+Minimization stats:
+  Stopping criterion = force tolerance
+  Energy initial, next-to-last, final = 
+       -0.790781812776     -2.89490640353     -2.89490640353
+  Force two-norm initial, final = 1905.47 9.86158e-07
+  Force max component initial, final = 343.392 6.07974e-07
+  Final line search alpha, max atom move = 0 0
+  Iterations, force evaluations = 1532 1532
+
+MPI task timing breakdown:
+Section |  min time  |  avg time  |  max time  |%varavg| %total
+---------------------------------------------------------------
+Pair    | 0.23639    | 0.23639    | 0.23639    |   0.0 | 84.07
+Neigh   | 0.011136   | 0.011136   | 0.011136   |   0.0 |  3.96
+Comm    | 0.003118   | 0.003118   | 0.003118   |   0.0 |  1.11
+Output  | 0.000591   | 0.000591   | 0.000591   |   0.0 |  0.21
+Modify  | 0.004883   | 0.004883   | 0.004883   |   0.0 |  1.74
+Other   |            | 0.02506    |            |       |  8.91
+
+Nlocal:    800 ave 800 max 800 min
+Histogram: 1 0 0 0 0 0 0 0 0 0
+Nghost:    327 ave 327 max 327 min
+Histogram: 1 0 0 0 0 0 0 0 0 0
+Neighs:    7012 ave 7012 max 7012 min
+Histogram: 1 0 0 0 0 0 0 0 0 0
+
+Total # of neighbors = 7012
+Ave neighs/atom = 8.765
+Neighbor list builds = 55
+Dangerous builds = 0
+Total wall time: 0:00:00
diff --git a/examples/fire/log.09Janv20.fire_mod.g++.1 b/examples/fire/log.09Janv20.fire_mod.g++.1
new file mode 100644
index 0000000000..69a23648ab
--- /dev/null
+++ b/examples/fire/log.09Janv20.fire_mod.g++.1
@@ -0,0 +1,161 @@
+LAMMPS (09 Jan 2020)
+# 2d Lennard-Jones melt and subsequent energy minimization
+
+units		lj
+dimension	2
+atom_style	atomic
+
+lattice		sq2 0.8442
+Lattice spacing in x,y,z = 1.53919 1.53919 1.53919
+region		box block 0 20 0 20 -0.1 0.1
+create_box	1 box
+Created orthogonal box = (0 0 -0.153919) to (30.7838 30.7838 0.153919)
+  1 by 1 by 1 MPI processor grid
+create_atoms	1 box
+Created 800 atoms
+  create_atoms CPU = 0.000379 secs
+mass		1 1.0
+
+velocity	all create 5.0 87287 loop geom
+
+pair_style	lj/cut 2.5
+pair_coeff	1 1 1.0 1.0 2.5
+pair_modify	shift yes
+
+neighbor	0.3 bin
+neigh_modify	delay 0 every 1 check yes
+
+fix		1 all nve
+fix		2 all enforce2d
+
+#dump		1 all atom 100 dump.min
+
+#dump		2 all image 50 image.*.jpg type type #		zoom 1.6 adiam 1.5
+#dump_modify	2 pad 4
+
+#dump		3 all movie 50 movie.mpg type type #		zoom 1.6 adiam 1.5
+#dump_modify	3 pad 4
+
+thermo		100
+
+run		1000
+Neighbor list info ...
+  update every 1 steps, delay 0 steps, check yes
+  max neighbors/atom: 2000, page size: 100000
+  master list distance cutoff = 2.8
+  ghost atom cutoff = 2.8
+  binsize = 1.4, bins = 22 22 1
+  1 neighbor lists, perpetual/occasional/extra = 1 0 0
+  (1) pair lj/cut, perpetual
+      attributes: half, newton on
+      pair build: half/bin/atomonly/newton
+      stencil: half/bin/2d/newton
+      bin: standard
+Per MPI rank memory allocation (min/avg/max) = 3.057 | 3.057 | 3.057 Mbytes
+Step Temp E_pair E_mol TotEng Press 
+       0            5    -2.461717            0     2.532033    5.0190509 
+     100    3.2788864  -0.74311698            0    2.5316708    15.912832 
+     200    3.3041082  -0.77000277            0    2.5299752    15.602653 
+     300    3.3840228  -0.84859211            0    2.5312006    15.188203 
+     400    3.3916063  -0.85694601            0    2.5304208    15.383853 
+     500    3.3136052  -0.77935263            0    2.5301106    15.833296 
+     600    3.3888915  -0.85213743            0     2.532518    15.162759 
+     700    3.2123675  -0.67642318            0    2.5319289    16.310565 
+     800    3.3016275  -0.76569171            0    2.5318087    15.639335 
+     900    3.4639203  -0.92788002            0    2.5317104    14.765912 
+    1000    3.3256788  -0.79078181            0    2.5307399    15.599298 
+Loop time of 0.15409 on 1 procs for 1000 steps with 800 atoms
+
+Performance: 2803556.363 tau/day, 6489.714 timesteps/s
+97.5% CPU use with 1 MPI tasks x no OpenMP threads
+
+MPI task timing breakdown:
+Section |  min time  |  avg time  |  max time  |%varavg| %total
+---------------------------------------------------------------
+Pair    | 0.094416   | 0.094416   | 0.094416   |   0.0 | 61.27
+Neigh   | 0.041223   | 0.041223   | 0.041223   |   0.0 | 26.75
+Comm    | 0.003956   | 0.003956   | 0.003956   |   0.0 |  2.57
+Output  | 0.000253   | 0.000253   | 0.000253   |   0.0 |  0.16
+Modify  | 0.010146   | 0.010146   | 0.010146   |   0.0 |  6.58
+Other   |            | 0.004096   |            |       |  2.66
+
+Nlocal:    800 ave 800 max 800 min
+Histogram: 1 0 0 0 0 0 0 0 0 0
+Nghost:    317 ave 317 max 317 min
+Histogram: 1 0 0 0 0 0 0 0 0 0
+Neighs:    7743 ave 7743 max 7743 min
+Histogram: 1 0 0 0 0 0 0 0 0 0
+
+Total # of neighbors = 7743
+Ave neighs/atom = 9.67875
+Neighbor list builds = 203
+Dangerous builds = 0
+
+neigh_modify	delay 0 every 1 check yes
+
+#dump_modify	1 every 25
+
+thermo		50
+min_style	fire
+min_modify	alpha0 0.10 integrator verlet
+minimize	0.0 1.0e-6 10000 10000
+  Parameters for fire: 
+    dmax delaystep dtgrow dtshrink alpha0 alphashrink tmax tmin    integrator halfstepback relaxbox relaxbox_mod relaxbox_rate ptol 
+     0.1        20    1.1      0.5    0.1        0.99   10 0.02        verlet          yes 
+Per MPI rank memory allocation (min/avg/max) = 3.058 | 3.058 | 3.058 Mbytes
+Step Temp E_pair E_mol TotEng Press 
+    1000            0  -0.79078181            0  -0.79078181     12.79527 
+    1050  0.078268931   -2.7183168            0   -2.6401457  -0.41989487 
+    1100  0.004111801   -2.8430419            0   -2.8389353   -1.3043522 
+    1150  0.005000915   -2.8768555            0   -2.8718608   -1.2706615 
+    1200   0.00221302   -2.8879134            0   -2.8857032   -1.2778479 
+    1250 0.00043036592   -2.8939906            0   -2.8935608    -1.268974 
+    1300 0.0014677683   -2.8992098            0   -2.8977439   -1.2905094 
+    1350 0.00093281043   -2.9019313            0   -2.9009996   -1.2653586 
+    1400 0.0005425017   -2.9060403            0   -2.9054984   -1.2368252 
+    1450 6.0662419e-05   -2.9065294            0   -2.9064688   -1.2376477 
+    1500 3.8768552e-05   -2.9066587            0   -2.9066199   -1.2235528 
+    1550 4.8205498e-06   -2.9066767            0   -2.9066719   -1.2267388 
+    1600 3.7010898e-07   -2.9066803            0     -2.90668   -1.2280952 
+    1650 9.3344403e-09   -2.9066807            0   -2.9066806     -1.22862 
+    1700 3.595307e-09   -2.9066807            0   -2.9066807   -1.2285492 
+    1750 2.7152688e-11   -2.9066807            0   -2.9066807   -1.2285418 
+    1800 2.9643465e-12   -2.9066807            0   -2.9066807   -1.2285402 
+    1850 8.8599324e-15   -2.9066807            0   -2.9066807   -1.2285389 
+    1900 8.1537037e-15   -2.9066807            0   -2.9066807   -1.2285389 
+    1919 1.8744314e-15   -2.9066807            0   -2.9066807   -1.2285389 
+Loop time of 0.172896 on 1 procs for 919 steps with 800 atoms
+
+98.8% CPU use with 1 MPI tasks x no OpenMP threads
+
+Minimization stats:
+  Stopping criterion = force tolerance
+  Energy initial, next-to-last, final = 
+       -0.790781812776     -2.90668068533     -2.90668068533
+  Force two-norm initial, final = 1905.47 9.38529e-07
+  Force max component initial, final = 343.392 2.3828e-07
+  Final line search alpha, max atom move = 0 0
+  Iterations, force evaluations = 919 919
+
+MPI task timing breakdown:
+Section |  min time  |  avg time  |  max time  |%varavg| %total
+---------------------------------------------------------------
+Pair    | 0.14136    | 0.14136    | 0.14136    |   0.0 | 81.76
+Neigh   | 0.009759   | 0.009759   | 0.009759   |   0.0 |  5.64
+Comm    | 0.001941   | 0.001941   | 0.001941   |   0.0 |  1.12
+Output  | 0.000313   | 0.000313   | 0.000313   |   0.0 |  0.18
+Modify  | 0.002814   | 0.002814   | 0.002814   |   0.0 |  1.63
+Other   |            | 0.01671    |            |       |  9.66
+
+Nlocal:    800 ave 800 max 800 min
+Histogram: 1 0 0 0 0 0 0 0 0 0
+Nghost:    320 ave 320 max 320 min
+Histogram: 1 0 0 0 0 0 0 0 0 0
+Neighs:    7003 ave 7003 max 7003 min
+Histogram: 1 0 0 0 0 0 0 0 0 0
+
+Total # of neighbors = 7003
+Ave neighs/atom = 8.75375
+Neighbor list builds = 51
+Dangerous builds = 0
+Total wall time: 0:00:00
diff --git a/examples/fire/log.09Janv20.fire_mod_old.g++.1 b/examples/fire/log.09Janv20.fire_mod_old.g++.1
new file mode 100644
index 0000000000..3cd1fbd386
--- /dev/null
+++ b/examples/fire/log.09Janv20.fire_mod_old.g++.1
@@ -0,0 +1,342 @@
+LAMMPS (09 Jan 2020)
+# 2d Lennard-Jones melt and subsequent energy minimization
+
+units		lj
+dimension	2
+atom_style	atomic
+
+lattice		sq2 0.8442
+Lattice spacing in x,y,z = 1.53919 1.53919 1.53919
+region		box block 0 20 0 20 -0.1 0.1
+create_box	1 box
+Created orthogonal box = (0 0 -0.153919) to (30.7838 30.7838 0.153919)
+  1 by 1 by 1 MPI processor grid
+create_atoms	1 box
+Created 800 atoms
+  create_atoms CPU = 0.000356 secs
+mass		1 1.0
+
+velocity	all create 5.0 87287 loop geom
+
+pair_style	lj/cut 2.5
+pair_coeff	1 1 1.0 1.0 2.5
+pair_modify	shift yes
+
+neighbor	0.3 bin
+neigh_modify	delay 0 every 1 check yes
+
+fix		1 all nve
+fix		2 all enforce2d
+
+#dump		1 all atom 100 dump.min
+
+#dump		2 all image 50 image.*.jpg type type #		zoom 1.6 adiam 1.5
+#dump_modify	2 pad 4
+
+#dump		3 all movie 50 movie.mpg type type #		zoom 1.6 adiam 1.5
+#dump_modify	3 pad 4
+
+thermo		100
+
+run		1000
+Neighbor list info ...
+  update every 1 steps, delay 0 steps, check yes
+  max neighbors/atom: 2000, page size: 100000
+  master list distance cutoff = 2.8
+  ghost atom cutoff = 2.8
+  binsize = 1.4, bins = 22 22 1
+  1 neighbor lists, perpetual/occasional/extra = 1 0 0
+  (1) pair lj/cut, perpetual
+      attributes: half, newton on
+      pair build: half/bin/atomonly/newton
+      stencil: half/bin/2d/newton
+      bin: standard
+Per MPI rank memory allocation (min/avg/max) = 3.057 | 3.057 | 3.057 Mbytes
+Step Temp E_pair E_mol TotEng Press 
+       0            5    -2.461717            0     2.532033    5.0190509 
+     100    3.2788864  -0.74311698            0    2.5316708    15.912832 
+     200    3.3041082  -0.77000277            0    2.5299752    15.602653 
+     300    3.3840228  -0.84859211            0    2.5312006    15.188203 
+     400    3.3916063  -0.85694601            0    2.5304208    15.383853 
+     500    3.3136052  -0.77935263            0    2.5301106    15.833296 
+     600    3.3888915  -0.85213743            0     2.532518    15.162759 
+     700    3.2123675  -0.67642318            0    2.5319289    16.310565 
+     800    3.3016275  -0.76569171            0    2.5318087    15.639335 
+     900    3.4639203  -0.92788002            0    2.5317104    14.765912 
+    1000    3.3256788  -0.79078181            0    2.5307399    15.599298 
+Loop time of 0.149746 on 1 procs for 1000 steps with 800 atoms
+
+Performance: 2884885.072 tau/day, 6677.975 timesteps/s
+98.3% CPU use with 1 MPI tasks x no OpenMP threads
+
+MPI task timing breakdown:
+Section |  min time  |  avg time  |  max time  |%varavg| %total
+---------------------------------------------------------------
+Pair    | 0.091667   | 0.091667   | 0.091667   |   0.0 | 61.21
+Neigh   | 0.041479   | 0.041479   | 0.041479   |   0.0 | 27.70
+Comm    | 0.003516   | 0.003516   | 0.003516   |   0.0 |  2.35
+Output  | 0.0002     | 0.0002     | 0.0002     |   0.0 |  0.13
+Modify  | 0.009484   | 0.009484   | 0.009484   |   0.0 |  6.33
+Other   |            | 0.0034     |            |       |  2.27
+
+Nlocal:    800 ave 800 max 800 min
+Histogram: 1 0 0 0 0 0 0 0 0 0
+Nghost:    317 ave 317 max 317 min
+Histogram: 1 0 0 0 0 0 0 0 0 0
+Neighs:    7743 ave 7743 max 7743 min
+Histogram: 1 0 0 0 0 0 0 0 0 0
+
+Total # of neighbors = 7743
+Ave neighs/atom = 9.67875
+Neighbor list builds = 203
+Dangerous builds = 0
+
+neigh_modify	delay 0 every 1 check yes
+
+#dump_modify	1 every 25
+
+thermo		50
+min_style	fire
+min_modify      integrator eulerexplicit tmax 10.0 tmin 0.0 delaystep 5                 dtgrow 1.1 dtshrink 0.5 alpha0 0.1 alphashrink 0.99                 vdfmax 100000 halfstepback no initialdelay no
+minimize	0.0 1.0e-6 10000 10000
+  Parameters for fire: 
+    dmax delaystep dtgrow dtshrink alpha0 alphashrink tmax tmin    integrator halfstepback relaxbox relaxbox_mod relaxbox_rate ptol 
+     0.1         5    1.1      0.5    0.1        0.99   10    0 eulerexplicit           no 
+Per MPI rank memory allocation (min/avg/max) = 3.058 | 3.058 | 3.058 Mbytes
+Step Temp E_pair E_mol TotEng Press 
+    1000            0  -0.79078181            0  -0.79078181     12.79527 
+    1050   0.13353902   -2.5912638            0   -2.4578917    0.5692337 
+    1100 0.0089379263   -2.6989463            0   -2.6900196  -0.32199212 
+    1150 0.0046843921    -2.759845            0   -2.7551664   -0.7652834 
+    1200  0.002846537    -2.789411            0   -2.7865681  -0.96589949 
+    1250 0.0010217747   -2.8074831            0   -2.8064626   -1.0829009 
+    1300 0.0053781523   -2.8242492            0   -2.8188778   -1.1318106 
+    1350 0.00023994777   -2.8341342            0   -2.8338945    -1.163692 
+    1400 0.0017009757    -2.840995            0   -2.8392962     -1.16188 
+    1450 0.00056400841   -2.8453557            0   -2.8447924   -1.1520067 
+    1500 0.00077934345   -2.8479194            0    -2.847141    -1.154398 
+    1550 0.00036611219   -2.8514157            0   -2.8510501    -1.172244 
+    1600 8.9292311e-06   -2.8527434            0   -2.8527345   -1.1747761 
+    1650 1.5128835e-06   -2.8542463            0   -2.8542448   -1.1844146 
+    1700 3.204798e-06    -2.855907            0   -2.8559038   -1.1947962 
+    1750 0.00074224769   -2.8571164            0   -2.8563751   -1.1985933 
+    1800 0.00019536702   -2.8588894            0   -2.8586943   -1.2088321 
+    1850 9.7569763e-05   -2.8594962            0   -2.8593988   -1.2118745 
+    1900 5.7320544e-05   -2.8602172            0     -2.86016   -1.2102157 
+    1950 4.5526736e-05   -2.8607722            0   -2.8607267   -1.2106069 
+    2000 2.723482e-05   -2.8615425            0   -2.8615153   -1.2116304 
+    2050 0.00058266182    -2.862351            0   -2.8617691   -1.2144959 
+    2100 6.500145e-05   -2.8634861            0   -2.8634212   -1.2196925 
+    2150 7.018255e-05   -2.8659666            0   -2.8658965   -1.2281308 
+    2200 2.7358137e-05   -2.8670193            0    -2.866992   -1.2249437 
+    2250 4.0619564e-05   -2.8677954            0   -2.8677549   -1.2264181 
+    2300 0.00037079927    -2.869037            0   -2.8686666   -1.2228396 
+    2350 1.7039984e-05   -2.8697054            0   -2.8696884   -1.2193694 
+    2400 1.1706376e-05   -2.8704557            0    -2.870444   -1.2151924 
+    2450 1.569166e-05   -2.8710048            0   -2.8709891   -1.2116495 
+    2500 1.0764974e-05   -2.8713737            0   -2.8713629   -1.2095378 
+    2550 0.00020637438   -2.8718339            0   -2.8716277   -1.2073921 
+    2600 1.3281629e-05   -2.8721042            0   -2.8720909   -1.2072822 
+    2650 1.6997328e-05   -2.8725439            0   -2.8725269   -1.2078205 
+    2700 0.00024308504   -2.8734078            0    -2.873165   -1.2083205 
+    2750 1.9325652e-05   -2.8742725            0   -2.8742532   -1.2086037 
+    2800 0.00041115503   -2.8753309            0   -2.8749202   -1.2099241 
+    2850 0.00016124812   -2.8763004            0   -2.8761394   -1.2100234 
+    2900 0.00010261801   -2.8769077            0   -2.8768052   -1.2095838 
+    2950 8.5284152e-05   -2.8773786            0   -2.8772935     -1.20663 
+    3000 3.6509277e-07   -2.8779105            0   -2.8779102   -1.2054539 
+    3050 0.00043346474   -2.8786802            0   -2.8782473   -1.2002574 
+    3100 5.5020715e-05   -2.8790024            0   -2.8789474   -1.1951741 
+    3150 2.1984131e-05   -2.8794335            0   -2.8794115   -1.1862473 
+    3200 1.6745891e-05   -2.8795341            0   -2.8795174   -1.1857447 
+    3250 6.7600713e-06   -2.8797504            0   -2.8797436   -1.1851768 
+    3300 2.5404023e-05   -2.8799202            0   -2.8798949   -1.1853619 
+    3350 1.4307979e-07   -2.8800767            0   -2.8800766   -1.1855388 
+    3400 2.3771289e-05   -2.8802876            0   -2.8802639   -1.1853283 
+    3450 1.5926609e-05   -2.8811779            0    -2.881162   -1.1832155 
+    3500 0.00023918123   -2.8816592            0   -2.8814203   -1.1795992 
+    3550 2.1477822e-05   -2.8818075            0    -2.881786   -1.1764183 
+    3600 2.4171891e-06   -2.8818685            0   -2.8818661   -1.1752634 
+    3650 5.1078051e-06   -2.8820201            0    -2.882015   -1.1735854 
+    3700 2.8288283e-06   -2.8820776            0   -2.8820748   -1.1736177 
+    3750 2.8261894e-05   -2.8821692            0    -2.882141   -1.1739042 
+    3800 2.1722286e-05   -2.8823134            0   -2.8822917    -1.174473 
+    3850 2.269858e-05   -2.8824364            0   -2.8824137    -1.174537 
+    3900 1.6463034e-06   -2.8825758            0   -2.8825741   -1.1738041 
+    3950 1.8888587e-05   -2.8827475            0   -2.8827287   -1.1730456 
+    4000 7.7137595e-07   -2.8829271            0   -2.8829263   -1.1737585 
+    4050 8.0218395e-06   -2.8831189            0   -2.8831108   -1.1748314 
+    4100 2.1775628e-07   -2.8831738            0   -2.8831736   -1.1751807 
+    4150 7.0972401e-06   -2.8832308            0   -2.8832237   -1.1756641 
+    4200 4.1552084e-07   -2.8833365            0   -2.8833361   -1.1766505 
+    4250 6.955018e-06   -2.8833891            0   -2.8833822   -1.1770815 
+    4300 0.00016095054   -2.8835126            0   -2.8833519   -1.1780786 
+    4350 6.2109296e-08   -2.8836037            0   -2.8836036   -1.1788493 
+    4400 4.9552761e-05   -2.8838275            0    -2.883778   -1.1796751 
+    4450 4.1572651e-06   -2.8840252            0    -2.884021   -1.1797244 
+    4500 4.5094019e-05   -2.8841528            0   -2.8841078   -1.1793634 
+    4550 1.5486277e-06   -2.8843566            0    -2.884355   -1.1786658 
+    4600 3.124141e-06   -2.8845241            0    -2.884521   -1.1782676 
+    4650 2.6550727e-06   -2.8847548            0   -2.8847521   -1.1761931 
+    4700 4.1414628e-05   -2.8849662            0   -2.8849249   -1.1718684 
+    4750 2.380964e-06   -2.8851283            0   -2.8851259   -1.1692959 
+    4800 8.590119e-06   -2.8852449            0   -2.8852364   -1.1685065 
+    4850 2.2696517e-05   -2.8854127            0     -2.88539    -1.168484 
+    4900 2.5100677e-05   -2.8855573            0   -2.8855322   -1.1680468 
+    4950 1.0901958e-05   -2.8857056            0   -2.8856947   -1.1667983 
+    5000 1.7660672e-05   -2.8858561            0   -2.8858385   -1.1659289 
+    5050 2.2115169e-05    -2.886002            0   -2.8859799   -1.1652871 
+    5100 6.6278908e-05   -2.8861968            0   -2.8861306   -1.1648902 
+    5150 6.0993884e-07   -2.8862934            0   -2.8862928   -1.1650736 
+    5200 0.00020333351   -2.8864792            0   -2.8862761   -1.1684121 
+    5250 0.00018260896   -2.8869006            0   -2.8867182   -1.1738451 
+    5300 5.9589204e-06   -2.8870944            0   -2.8870884   -1.1742236 
+    5350 3.9611705e-06   -2.8871855            0   -2.8871815   -1.1739438 
+    5400 1.6390307e-05   -2.8872444            0   -2.8872281   -1.1738633 
+    5450 1.0471949e-06   -2.8872779            0   -2.8872769    -1.173992 
+    5500 3.189532e-07   -2.8873146            0   -2.8873143   -1.1745333 
+    5550 8.5416909e-08   -2.8873521            0   -2.8873521   -1.1754741 
+    5600 2.8826987e-06   -2.8873622            0   -2.8873594   -1.1757461 
+    5650 1.4702624e-06   -2.8873706            0   -2.8873692   -1.1760765 
+    5700 1.569283e-07    -2.887379            0   -2.8873788      -1.1765 
+    5750 9.0040106e-07   -2.8873905            0   -2.8873896   -1.1767106 
+    5800 1.076564e-06   -2.8873972            0   -2.8873961   -1.1770001 
+    5850 1.1722255e-05   -2.8874127            0    -2.887401   -1.1774243 
+    5900 6.6748066e-06   -2.8874365            0   -2.8874298   -1.1778224 
+    5950 4.0946269e-07    -2.887452            0   -2.8874516   -1.1780297 
+    6000 6.4175894e-06   -2.8875862            0   -2.8875798   -1.1784951 
+    6050  2.32222e-06   -2.8878816            0   -2.8878793   -1.1754314 
+    6100 4.8037437e-08   -2.8879173            0   -2.8879173   -1.1743701 
+    6150 1.2097382e-06   -2.8879311            0   -2.8879299   -1.1736632 
+    6200 5.6948854e-06   -2.8879415            0   -2.8879358   -1.1733347 
+    6250 1.6901358e-06   -2.8879479            0   -2.8879462    -1.173324 
+    6300 9.6454886e-08   -2.8879494            0   -2.8879493   -1.1732735 
+    6350 4.8509801e-08   -2.8879504            0   -2.8879504   -1.1732669 
+    6400 4.4545703e-07   -2.8879518            0   -2.8879514   -1.1732436 
+    6450 1.2032088e-07   -2.8879532            0    -2.887953   -1.1732129 
+    6500 1.2605568e-08   -2.8879538            0   -2.8879538   -1.1731965 
+    6550 4.1040039e-10   -2.8879551            0   -2.8879551   -1.1731405 
+    6600 7.9776654e-08   -2.8879555            0   -2.8879554   -1.1731158 
+    6650 5.1675071e-08   -2.8879559            0   -2.8879559   -1.1730858 
+    6700 2.1758232e-08   -2.8879563            0   -2.8879562    -1.173055 
+    6750 2.2209691e-08   -2.8879565            0   -2.8879565   -1.1730317 
+    6800 1.8884076e-08   -2.8879568            0   -2.8879568   -1.1729911 
+    6850 7.0472036e-09   -2.8879572            0   -2.8879572   -1.1729351 
+    6900 6.4326889e-09   -2.8879573            0   -2.8879573    -1.172905 
+    6950 7.5488985e-09   -2.8879575            0   -2.8879575   -1.1728674 
+    7000 4.8486872e-09   -2.8879576            0   -2.8879576   -1.1728448 
+    7050 6.4279746e-09   -2.8879578            0   -2.8879577   -1.1727942 
+    7100 1.2729822e-09   -2.8879578            0   -2.8879578   -1.1727679 
+    7150 1.7002943e-09   -2.8879579            0   -2.8879579   -1.1727462 
+    7200 1.2498153e-10    -2.887958            0    -2.887958   -1.1726894 
+    7250 5.1498355e-08   -2.8879581            0   -2.8879581   -1.1726362 
+    7300 5.292335e-09   -2.8879582            0   -2.8879581   -1.1726177 
+    7350 2.8343246e-09   -2.8879582            0   -2.8879582   -1.1725957 
+    7400 1.7979847e-09   -2.8879582            0   -2.8879582   -1.1725747 
+    7450 1.4994133e-09   -2.8879582            0   -2.8879582   -1.1725599 
+    7500 1.2793921e-09   -2.8879583            0   -2.8879583   -1.1725352 
+    7550 5.737782e-10   -2.8879583            0   -2.8879583   -1.1725028 
+    7600 5.5986883e-10   -2.8879583            0   -2.8879583   -1.1724865 
+    7650 8.3377699e-10   -2.8879583            0   -2.8879583   -1.1724667 
+    7700 1.676793e-09   -2.8879583            0   -2.8879583   -1.1724537 
+    7750 3.7057732e-09   -2.8879583            0   -2.8879583   -1.1724393 
+    7800 1.2469658e-10   -2.8879584            0   -2.8879584   -1.1724136 
+    7850 4.2407869e-12   -2.8879584            0   -2.8879584    -1.172387 
+    7900 1.9275374e-11   -2.8879584            0   -2.8879584   -1.1723671 
+    7950 7.4412023e-10   -2.8879584            0   -2.8879584   -1.1723587 
+    8000 2.342806e-10   -2.8879584            0   -2.8879584   -1.1723487 
+    8050 1.4026755e-10   -2.8879584            0   -2.8879584   -1.1723382 
+    8100 1.6705221e-10   -2.8879584            0   -2.8879584   -1.1723318 
+    8150 1.1816748e-10   -2.8879584            0   -2.8879584    -1.172313 
+    8200 1.139758e-10   -2.8879584            0   -2.8879584   -1.1723053 
+    8250 6.2680955e-11   -2.8879584            0   -2.8879584    -1.172298 
+    8300 6.669349e-11   -2.8879584            0   -2.8879584    -1.172292 
+    8350 6.1206666e-10   -2.8879584            0   -2.8879584   -1.1722845 
+    8400 8.0987905e-10   -2.8879584            0   -2.8879584   -1.1722751 
+    8450 2.8169842e-12   -2.8879584            0   -2.8879584   -1.1722629 
+    8500 1.1976624e-09   -2.8879584            0   -2.8879584   -1.1722508 
+    8550 1.2769688e-10   -2.8879584            0   -2.8879584   -1.1722467 
+    8600 6.9923774e-11   -2.8879584            0   -2.8879584   -1.1722418 
+    8650 4.5160888e-11   -2.8879584            0   -2.8879584   -1.1722372 
+    8700 3.8279812e-11   -2.8879584            0   -2.8879584   -1.1722341 
+    8750 3.3467288e-11   -2.8879584            0   -2.8879584   -1.1722288 
+    8800 1.5440356e-11   -2.8879584            0   -2.8879584   -1.1722219 
+    8850 1.534376e-11   -2.8879584            0   -2.8879584   -1.1722185 
+    8900 2.3131183e-11   -2.8879584            0   -2.8879584   -1.1722144 
+    8950 4.6772726e-11   -2.8879584            0   -2.8879584   -1.1722117 
+    9000 1.0577837e-10   -2.8879584            0   -2.8879584   -1.1722087 
+    9050 3.6207287e-12   -2.8879584            0   -2.8879584   -1.1722035 
+    9100 1.2802863e-13   -2.8879584            0   -2.8879584   -1.1721981 
+    9150 5.8887842e-13   -2.8879584            0   -2.8879584   -1.1721941 
+    9200 2.300678e-11   -2.8879584            0   -2.8879584   -1.1721924 
+    9250 7.3278771e-12   -2.8879584            0   -2.8879584   -1.1721904 
+    9300 4.4157433e-12   -2.8879584            0   -2.8879584   -1.1721883 
+    9350 5.3075512e-12   -2.8879584            0   -2.8879584    -1.172187 
+    9400 3.8604199e-12   -2.8879584            0   -2.8879584   -1.1721833 
+    9450 3.7145253e-12   -2.8879584            0   -2.8879584   -1.1721818 
+    9500 2.0563961e-12   -2.8879584            0   -2.8879584   -1.1721804 
+    9550 2.1953054e-12   -2.8879584            0   -2.8879584   -1.1721792 
+    9600 2.0292485e-11   -2.8879584            0   -2.8879584   -1.1721777 
+    9650 2.7040181e-11   -2.8879584            0   -2.8879584   -1.1721759 
+    9700 9.5405566e-14   -2.8879584            0   -2.8879584   -1.1721735 
+    9750 4.0766333e-11   -2.8879584            0   -2.8879584   -1.1721712 
+    9800 4.3804922e-12   -2.8879584            0   -2.8879584   -1.1721704 
+    9850 2.4094174e-12   -2.8879584            0   -2.8879584   -1.1721695 
+    9900 1.5618924e-12   -2.8879584            0   -2.8879584   -1.1721686 
+    9950 1.3276948e-12   -2.8879584            0   -2.8879584    -1.172168 
+   10000 1.1661354e-12   -2.8879584            0   -2.8879584    -1.172167 
+   10050 5.4130138e-13   -2.8879584            0   -2.8879584   -1.1721656 
+   10100 5.3930245e-13   -2.8879584            0   -2.8879584    -1.172165 
+   10150 8.1475776e-13   -2.8879584            0   -2.8879584   -1.1721642 
+   10200 1.6498249e-12   -2.8879584            0   -2.8879584   -1.1721637 
+   10250 3.7458971e-12   -2.8879584            0   -2.8879584   -1.1721631 
+   10300 1.285673e-13   -2.8879584            0   -2.8879584   -1.1721621 
+   10350 4.5812377e-15   -2.8879584            0   -2.8879584   -1.1721611 
+   10400 2.1117455e-14   -2.8879584            0   -2.8879584   -1.1721603 
+   10450 8.2667409e-13   -2.8879584            0   -2.8879584     -1.17216 
+   10500 2.6385234e-13   -2.8879584            0   -2.8879584   -1.1721596 
+   10550 1.5919509e-13   -2.8879584            0   -2.8879584   -1.1721592 
+   10600 1.9165062e-13   -2.8879584            0   -2.8879584    -1.172159 
+   10650 1.3972041e-13   -2.8879584            0   -2.8879584   -1.1721583 
+   10700 1.3469994e-13   -2.8879584            0   -2.8879584    -1.172158 
+   10750 7.4707625e-14   -2.8879584            0   -2.8879584   -1.1721577 
+   10800 7.9795578e-14   -2.8879584            0   -2.8879584   -1.1721575 
+   10850 7.3860559e-13   -2.8879584            0   -2.8879584   -1.1721572 
+   10900 9.8555453e-13   -2.8879584            0   -2.8879584   -1.1721569 
+   10950 3.487218e-15   -2.8879584            0   -2.8879584   -1.1721564 
+   11000 1.4915771e-12   -2.8879584            0   -2.8879584    -1.172156 
+Loop time of 1.75996 on 1 procs for 10000 steps with 800 atoms
+
+98.4% CPU use with 1 MPI tasks x no OpenMP threads
+
+Minimization stats:
+  Stopping criterion = max iterations
+  Energy initial, next-to-last, final = 
+       -0.790781812776     -2.88795843023     -2.88795843023
+  Force two-norm initial, final = 1905.47 9.60915e-05
+  Force max component initial, final = 343.392 3.71774e-05
+  Final line search alpha, max atom move = 0 0
+  Iterations, force evaluations = 10000 10000
+
+MPI task timing breakdown:
+Section |  min time  |  avg time  |  max time  |%varavg| %total
+---------------------------------------------------------------
+Pair    | 1.5377     | 1.5377     | 1.5377     |   0.0 | 87.37
+Neigh   | 0.012664   | 0.012664   | 0.012664   |   0.0 |  0.72
+Comm    | 0.015656   | 0.015656   | 0.015656   |   0.0 |  0.89
+Output  | 0.004186   | 0.004186   | 0.004186   |   0.0 |  0.24
+Modify  | 0.02968    | 0.02968    | 0.02968    |   0.0 |  1.69
+Other   |            | 0.16       |            |       |  9.09
+
+Nlocal:    800 ave 800 max 800 min
+Histogram: 1 0 0 0 0 0 0 0 0 0
+Nghost:    311 ave 311 max 311 min
+Histogram: 1 0 0 0 0 0 0 0 0 0
+Neighs:    7009 ave 7009 max 7009 min
+Histogram: 1 0 0 0 0 0 0 0 0 0
+
+Total # of neighbors = 7009
+Ave neighs/atom = 8.76125
+Neighbor list builds = 66
+Dangerous builds = 0
+Total wall time: 0:00:01
diff --git a/examples/fire/log.09Janv20.fire_old.g++.1 b/examples/fire/log.09Janv20.fire_old.g++.1
new file mode 100644
index 0000000000..863558645b
--- /dev/null
+++ b/examples/fire/log.09Janv20.fire_old.g++.1
@@ -0,0 +1,338 @@
+LAMMPS (09 Jan 2020)
+# 2d Lennard-Jones melt and subsequent energy minimization
+
+units		lj
+dimension	2
+atom_style	atomic
+
+lattice		sq2 0.8442
+Lattice spacing in x,y,z = 1.53919 1.53919 1.53919
+region		box block 0 20 0 20 -0.1 0.1
+create_box	1 box
+Created orthogonal box = (0 0 -0.153919) to (30.7838 30.7838 0.153919)
+  1 by 1 by 1 MPI processor grid
+create_atoms	1 box
+Created 800 atoms
+  create_atoms CPU = 0.000345 secs
+mass		1 1.0
+
+velocity	all create 5.0 87287 loop geom
+
+pair_style	lj/cut 2.5
+pair_coeff	1 1 1.0 1.0 2.5
+pair_modify	shift yes
+
+neighbor	0.3 bin
+neigh_modify	delay 0 every 1 check yes
+
+fix		1 all nve
+fix		2 all enforce2d
+
+#dump		1 all atom 100 dump.min
+
+#dump		2 all image 50 image.*.jpg type type #		zoom 1.6 adiam 1.5
+#dump_modify	2 pad 4
+
+#dump		3 all movie 50 movie.mpg type type #		zoom 1.6 adiam 1.5
+#dump_modify	3 pad 4
+
+thermo		100
+
+run		1000
+Neighbor list info ...
+  update every 1 steps, delay 0 steps, check yes
+  max neighbors/atom: 2000, page size: 100000
+  master list distance cutoff = 2.8
+  ghost atom cutoff = 2.8
+  binsize = 1.4, bins = 22 22 1
+  1 neighbor lists, perpetual/occasional/extra = 1 0 0
+  (1) pair lj/cut, perpetual
+      attributes: half, newton on
+      pair build: half/bin/atomonly/newton
+      stencil: half/bin/2d/newton
+      bin: standard
+Per MPI rank memory allocation (min/avg/max) = 3.057 | 3.057 | 3.057 Mbytes
+Step Temp E_pair E_mol TotEng Press 
+       0            5    -2.461717            0     2.532033    5.0190509 
+     100    3.2788864  -0.74311698            0    2.5316708    15.912832 
+     200    3.3041082  -0.77000277            0    2.5299752    15.602653 
+     300    3.3840228  -0.84859211            0    2.5312006    15.188203 
+     400    3.3916063  -0.85694601            0    2.5304208    15.383853 
+     500    3.3136052  -0.77935263            0    2.5301106    15.833296 
+     600    3.3888915  -0.85213743            0     2.532518    15.162759 
+     700    3.2123675  -0.67642318            0    2.5319289    16.310565 
+     800    3.3016275  -0.76569171            0    2.5318087    15.639335 
+     900    3.4639203  -0.92788002            0    2.5317104    14.765912 
+    1000    3.3256788  -0.79078181            0    2.5307399    15.599298 
+Loop time of 0.14894 on 1 procs for 1000 steps with 800 atoms
+
+Performance: 2900496.844 tau/day, 6714.113 timesteps/s
+99.0% CPU use with 1 MPI tasks x no OpenMP threads
+
+MPI task timing breakdown:
+Section |  min time  |  avg time  |  max time  |%varavg| %total
+---------------------------------------------------------------
+Pair    | 0.091005   | 0.091005   | 0.091005   |   0.0 | 61.10
+Neigh   | 0.040404   | 0.040404   | 0.040404   |   0.0 | 27.13
+Comm    | 0.003588   | 0.003588   | 0.003588   |   0.0 |  2.41
+Output  | 0.000226   | 0.000226   | 0.000226   |   0.0 |  0.15
+Modify  | 0.010077   | 0.010077   | 0.010077   |   0.0 |  6.77
+Other   |            | 0.00364    |            |       |  2.44
+
+Nlocal:    800 ave 800 max 800 min
+Histogram: 1 0 0 0 0 0 0 0 0 0
+Nghost:    317 ave 317 max 317 min
+Histogram: 1 0 0 0 0 0 0 0 0 0
+Neighs:    7743 ave 7743 max 7743 min
+Histogram: 1 0 0 0 0 0 0 0 0 0
+
+Total # of neighbors = 7743
+Ave neighs/atom = 9.67875
+Neighbor list builds = 203
+Dangerous builds = 0
+
+neigh_modify	delay 0 every 1 check yes
+
+#dump_modify	1 every 25
+
+thermo		50
+min_style	fire/old
+minimize	0.0 1.0e-6 10000 10000
+Per MPI rank memory allocation (min/avg/max) = 3.058 | 3.058 | 3.058 Mbytes
+Step Temp E_pair E_mol TotEng Press 
+    1000            0  -0.79078181            0  -0.79078181     12.79527 
+    1050   0.15078629   -2.5003801            0   -2.3497823    1.2721061 
+    1100 0.00074837835   -2.7050909            0   -2.7043434  -0.37905868 
+    1150 0.0063037865   -2.7509932            0   -2.7446973  -0.71482554 
+    1200 0.00034408524   -2.7960993            0   -2.7957557   -1.0263545 
+    1250 0.00085176575   -2.8126463            0   -2.8117956   -1.1021125 
+    1300 0.00033628622   -2.8280448            0   -2.8277089   -1.1471915 
+    1350 0.00026177536   -2.8357089            0   -2.8354474   -1.1676514 
+    1400 0.0011622998   -2.8431054            0   -2.8419446   -1.1596473 
+    1450 0.0010839093   -2.8457268            0   -2.8446442   -1.1518499 
+    1500 0.00024665053   -2.8480136            0   -2.8477672   -1.1520869 
+    1550 7.831216e-05    -2.849584            0   -2.8495057   -1.1506084 
+    1600 3.2759808e-05   -2.8511231            0   -2.8510904   -1.1497061 
+    1650 3.9272607e-05   -2.8526234            0   -2.8525841   -1.1511215 
+    1700 5.5569128e-05   -2.8538287            0   -2.8537732   -1.1497192 
+    1750 7.4734101e-05   -2.8558245            0   -2.8557498   -1.1480928 
+    1800 5.8181251e-05   -2.8575248            0   -2.8574667   -1.1518976 
+    1850 2.7589109e-05   -2.8585475            0     -2.85852   -1.1511439 
+    1900 0.00024942163   -2.8595367            0   -2.8592876   -1.1467285 
+    1950 0.00015592998   -2.8607519            0   -2.8605962   -1.1436241 
+    2000 0.00028229354   -2.8619889            0    -2.861707   -1.1439985 
+    2050 0.00024971806   -2.8634866            0   -2.8632372   -1.1509204 
+    2100 0.00021986576   -2.8646023            0   -2.8643827   -1.1564575 
+    2150 0.00011079739   -2.8664318            0   -2.8663211   -1.1525135 
+    2200 4.968224e-05   -2.8676285            0   -2.8675789   -1.1577511 
+    2250 0.00072993169   -2.8690151            0    -2.868286   -1.1626387 
+    2300 0.00036359157   -2.8707132            0     -2.87035   -1.1659444 
+    2350 9.6832406e-06    -2.871387            0   -2.8713773   -1.1678889 
+    2400 9.1595369e-05   -2.8719934            0   -2.8719019    -1.168413 
+    2450 0.00026776536   -2.8727209            0   -2.8724535   -1.1717116 
+    2500 3.7718609e-05   -2.8731223            0   -2.8730846    -1.172836 
+    2550 9.6791591e-05   -2.8738124            0   -2.8737157   -1.1743997 
+    2600 7.2536654e-05   -2.8742543            0   -2.8741818   -1.1746239 
+    2650 1.8893154e-06   -2.8749235            0   -2.8749216   -1.1766016 
+    2700 2.8723983e-07   -2.8753101            0   -2.8753099   -1.1802186 
+    2750 5.7708673e-05   -2.8758588            0   -2.8758012   -1.1854027 
+    2800 4.5723463e-07   -2.8762504            0     -2.87625    -1.188637 
+    2850 0.00040742553   -2.8770574            0   -2.8766505   -1.1889095 
+    2900 0.00019261386   -2.8775383            0   -2.8773459   -1.1935269 
+    2950 9.2541507e-06   -2.8779083            0   -2.8778991   -1.1971015 
+    3000 4.0734432e-05   -2.8780621            0   -2.8780214   -1.1981841 
+    3050 2.6984859e-05   -2.8783255            0   -2.8782986   -1.2005265 
+    3100 0.00037203153   -2.8787959            0   -2.8784243   -1.2041583 
+    3150 3.7451961e-05   -2.8793384            0    -2.879301   -1.2063399 
+    3200 0.00028165903   -2.8799668            0   -2.8796855   -1.2040089 
+    3250 9.6738762e-06    -2.880449            0   -2.8804394   -1.1972021 
+    3300 2.9461217e-06   -2.8806905            0   -2.8806875   -1.1939943 
+    3350 3.5642952e-05    -2.880824            0   -2.8807884    -1.193625 
+    3400 6.0881141e-07   -2.8810003            0   -2.8809997   -1.1933965 
+    3450 2.3583108e-05   -2.8811075            0   -2.8810839   -1.1928363 
+    3500 1.8866811e-05   -2.8813124            0   -2.8812936   -1.1887048 
+    3550 4.4326159e-06   -2.8815176            0   -2.8815132   -1.1868378 
+    3600 3.7260058e-05   -2.8818335            0   -2.8817963    -1.184903 
+    3650 4.5577822e-05   -2.8821473            0   -2.8821018   -1.1851718 
+    3700 3.8004179e-05   -2.8824225            0   -2.8823846   -1.1835832 
+    3750 4.4633061e-05   -2.8826141            0   -2.8825695   -1.1832413 
+    3800 0.00021888149   -2.8832209            0   -2.8830023   -1.1831072 
+    3850 6.0865074e-05   -2.8840206            0   -2.8839598   -1.1854745 
+    3900 8.5323757e-05   -2.8850341            0   -2.8849489   -1.1854657 
+    3950 6.8711987e-07   -2.8858208            0   -2.8858201   -1.1860154 
+    4000 0.00013494811   -2.8863852            0   -2.8862504   -1.1781078 
+    4050 1.8129952e-05    -2.886732            0   -2.8867139    -1.177396 
+    4100 3.8263774e-05   -2.8879089            0   -2.8878707   -1.1752856 
+    4150 3.658559e-05   -2.8890262            0   -2.8889897   -1.1734493 
+    4200 0.00012015214   -2.8893467            0   -2.8892267   -1.1760827 
+    4250 0.00018767456    -2.889917            0   -2.8897296   -1.1786237 
+    4300 0.00012637647   -2.8915235            0   -2.8913973   -1.1816011 
+    4350 8.2492648e-06   -2.8922133            0   -2.8922051   -1.1808514 
+    4400 5.1940315e-05    -2.892508            0   -2.8924562    -1.180161 
+    4450 2.4116793e-05   -2.8928525            0   -2.8928284    -1.175724 
+    4500 1.7213569e-06   -2.8929309            0   -2.8929292   -1.1774283 
+    4550 5.9338191e-06   -2.8929979            0    -2.892992   -1.1770692 
+    4600 3.5756493e-06   -2.8930523            0   -2.8930487   -1.1768106 
+    4650 6.4365391e-08   -2.8931003            0   -2.8931002   -1.1764066 
+    4700 1.9109163e-05   -2.8931378            0   -2.8931187   -1.1761873 
+    4750 1.6360653e-06   -2.8931854            0   -2.8931837   -1.1758258 
+    4800 2.588147e-06   -2.8932194            0   -2.8932168   -1.1755478 
+    4850 2.2695812e-06    -2.893236            0   -2.8932337   -1.1755321 
+    4900 8.6290019e-07    -2.893252            0   -2.8932511   -1.1755463 
+    4950 5.9986079e-06   -2.8932768            0   -2.8932708   -1.1757398 
+    5000 2.7886685e-06   -2.8932946            0   -2.8932919   -1.1759759 
+    5050 3.4895687e-07   -2.8933085            0   -2.8933082    -1.176161 
+    5100 3.0956189e-07    -2.893326            0   -2.8933257    -1.176581 
+    5150 3.6248707e-07    -2.893338            0   -2.8933377   -1.1769306 
+    5200 7.8502109e-07    -2.893349            0   -2.8933482   -1.1771957 
+    5250 2.0163751e-06    -2.893358            0    -2.893356   -1.1774764 
+    5300 1.5694813e-06   -2.8933681            0   -2.8933665   -1.1778313 
+    5350 1.6087226e-07   -2.8933778            0   -2.8933776   -1.1781241 
+    5400 1.3237298e-06   -2.8933861            0   -2.8933848   -1.1784213 
+    5450 4.6902744e-07   -2.8933924            0   -2.8933919   -1.1786315 
+    5500 3.4438648e-08   -2.8933991            0    -2.893399   -1.1788989 
+    5550 2.7042583e-06   -2.8934069            0   -2.8934042   -1.1794234 
+    5600 1.6439602e-06   -2.8934192            0   -2.8934176   -1.1800027 
+    5650 3.0743987e-08   -2.8934232            0   -2.8934232   -1.1801474 
+    5700 3.9527406e-07   -2.8934289            0   -2.8934285   -1.1803286 
+    5750 1.225525e-08   -2.8934371            0   -2.8934371   -1.1807575 
+    5800 4.9916581e-06   -2.8934455            0   -2.8934405    -1.181139 
+    5850 1.9695167e-07   -2.8934483            0   -2.8934481   -1.1813037 
+    5900 9.7192688e-09   -2.8934527            0   -2.8934527   -1.1814006 
+    5950 1.6382372e-07   -2.8934559            0   -2.8934557    -1.181466 
+    6000 1.6672305e-07   -2.8934582            0    -2.893458   -1.1815167 
+    6050 2.1385354e-06   -2.8934621            0     -2.89346   -1.1817115 
+    6100 2.1134327e-07   -2.8934647            0   -2.8934644   -1.1817726 
+    6150 1.0776963e-07   -2.8934666            0   -2.8934665   -1.1818243 
+    6200 1.1340092e-07   -2.8934698            0   -2.8934697   -1.1817959 
+    6250 4.8193492e-08   -2.8934719            0   -2.8934718   -1.1818113 
+    6300 2.7200421e-07   -2.8934757            0   -2.8934755   -1.1818626 
+    6350 5.2129576e-07   -2.8934777            0   -2.8934772   -1.1818984 
+    6400 4.274711e-07   -2.8934796            0   -2.8934792    -1.181939 
+    6450 3.9574056e-07   -2.8934809            0   -2.8934805   -1.1819686 
+    6500 1.4771033e-08   -2.8934829            0   -2.8934829   -1.1820179 
+    6550 1.9994259e-09   -2.8934848            0   -2.8934848    -1.182073 
+    6600 2.1220811e-09   -2.8934858            0   -2.8934858   -1.1821061 
+    6650 9.8083547e-08   -2.8934867            0   -2.8934866   -1.1821395 
+    6700 4.8492273e-07   -2.8934877            0   -2.8934872    -1.182221 
+    6750 8.9996832e-08   -2.8934884            0   -2.8934883   -1.1823243 
+    6800 6.4333635e-08   -2.8934896            0   -2.8934895   -1.1824575 
+    6850 7.1095413e-08   -2.8934904            0   -2.8934903   -1.1825552 
+    6900 5.2266462e-08   -2.8934909            0   -2.8934909   -1.1825847 
+    6950 3.2973112e-08   -2.8934918            0   -2.8934918   -1.1826705 
+    7000 3.8926793e-08   -2.8934924            0   -2.8934924   -1.1827266 
+    7050 6.0657306e-08    -2.893493            0   -2.8934929   -1.1827998 
+    7100 2.1552835e-08   -2.8934937            0   -2.8934937   -1.1828681 
+    7150 2.3988432e-08    -2.893494            0    -2.893494   -1.1829117 
+    7200 5.0100549e-07   -2.8934949            0   -2.8934944   -1.1831237 
+    7250 5.1293833e-07   -2.8934961            0   -2.8934956   -1.1832769 
+    7300 4.9193885e-08   -2.8934978            0   -2.8934978   -1.1834501 
+    7350 1.7704457e-07   -2.8935041            0   -2.8935039   -1.1838658 
+    7400 1.0705432e-05   -2.8935219            0   -2.8935112   -1.1843004 
+    7450 7.1746118e-05   -2.8936326            0    -2.893561   -1.1849502 
+    7500 3.1813929e-06   -2.8938743            0   -2.8938711   -1.1832931 
+    7550 6.3043396e-07   -2.8939295            0   -2.8939289   -1.1820798 
+    7600 5.2150405e-07   -2.8939502            0   -2.8939497   -1.1820883 
+    7650 4.7517449e-07   -2.8939658            0   -2.8939653   -1.1819437 
+    7700 4.4885882e-07   -2.8939757            0   -2.8939752   -1.1817119 
+    7750 4.6725067e-07   -2.8939842            0   -2.8939837   -1.1813933 
+    7800 4.582757e-07   -2.8939901            0   -2.8939896   -1.1809685 
+    7850 5.6014095e-07   -2.8939959            0   -2.8939954   -1.1803629 
+    7900 4.9239111e-07   -2.8940002            0   -2.8939997   -1.1799761 
+    7950 5.8652837e-07   -2.8940042            0   -2.8940036    -1.179493 
+    8000 5.2119991e-07    -2.894007            0   -2.8940065   -1.1792154 
+    8050 5.6171299e-07   -2.8940096            0   -2.8940091   -1.1789381 
+    8100 5.1588922e-07   -2.8940115            0    -2.894011   -1.1788465 
+    8150 5.8224721e-07   -2.8940133            0   -2.8940127   -1.1786473 
+    8200 4.734318e-07   -2.8940145            0    -2.894014   -1.1784863 
+    8250 6.5262092e-07   -2.8940158            0   -2.8940151   -1.1783061 
+    8300 6.1708016e-07   -2.8940165            0   -2.8940159   -1.1781777 
+    8350 6.8388448e-08   -2.8940173            0   -2.8940172   -1.1779926 
+    8400 8.4463536e-08   -2.8940181            0    -2.894018    -1.177889 
+    8450 3.9363627e-07   -2.8940188            0   -2.8940184   -1.1777552 
+    8500 3.0541987e-10   -2.8940193            0   -2.8940193   -1.1776655 
+    8550 2.9629605e-09   -2.8940199            0   -2.8940199   -1.1774346 
+    8600 2.6219397e-09   -2.8940203            0   -2.8940203   -1.1772429 
+    8650 7.2863159e-09   -2.8940208            0   -2.8940208   -1.1771118 
+    8700 5.3112415e-09   -2.8940212            0   -2.8940211   -1.1770375 
+    8750 1.0799289e-08   -2.8940216            0   -2.8940216   -1.1769494 
+    8800 1.0335141e-08    -2.894022            0    -2.894022   -1.1768857 
+    8850 7.8517969e-07   -2.8940229            0   -2.8940221    -1.176868 
+    8900 1.200945e-06   -2.8940245            0   -2.8940233   -1.1767465 
+    8950 2.0266151e-08   -2.8940265            0   -2.8940264   -1.1766326 
+    9000 8.393891e-08   -2.8940288            0   -2.8940288   -1.1764556 
+    9050 4.3322427e-08    -2.894035            0    -2.894035   -1.1757866 
+    9100 5.558366e-08   -2.8940416            0   -2.8940416   -1.1748494 
+    9150 5.6153929e-08   -2.8940464            0   -2.8940464   -1.1741107 
+    9200 3.3093925e-08   -2.8940495            0   -2.8940494   -1.1734613 
+    9250 2.5678554e-08   -2.8940507            0   -2.8940507   -1.1732185 
+    9300 1.960171e-08   -2.8940512            0   -2.8940512   -1.1731441 
+    9350 6.8264475e-10   -2.8940516            0   -2.8940516   -1.1730971 
+    9400 3.9755331e-09   -2.8940518            0   -2.8940518   -1.1730732 
+    9450 6.6819447e-09    -2.894052            0    -2.894052   -1.1730593 
+    9500 2.8570816e-08   -2.8940521            0   -2.8940521   -1.1730524 
+    9550 8.7433449e-10   -2.8940522            0   -2.8940522   -1.1730474 
+    9600 1.2024295e-09   -2.8940523            0   -2.8940523   -1.1731417 
+    9650 4.3992465e-09   -2.8940524            0   -2.8940524   -1.1731584 
+    9700 6.9801912e-09   -2.8940524            0   -2.8940524   -1.1731609 
+    9750 2.0127261e-09   -2.8940525            0   -2.8940525   -1.1731647 
+    9800 1.9820186e-09   -2.8940525            0   -2.8940525   -1.1731771 
+    9850 2.0267793e-09   -2.8940525            0   -2.8940525   -1.1731899 
+    9900 2.5623826e-09   -2.8940526            0   -2.8940526   -1.1732135 
+    9950 2.7321573e-09   -2.8940526            0   -2.8940526   -1.1732373 
+   10000 3.7027158e-09   -2.8940526            0   -2.8940526   -1.1732798 
+   10050 6.7838458e-09   -2.8940527            0   -2.8940527   -1.1733257 
+   10100 1.6635632e-08   -2.8940528            0   -2.8940527   -1.1734128 
+   10150 4.5898574e-08   -2.8940529            0   -2.8940529    -1.173554 
+   10200 1.8171023e-07   -2.8940534            0   -2.8940532    -1.173811 
+   10250 1.4919312e-06   -2.8940568            0   -2.8940553   -1.1744943 
+   10300 1.1909136e-05   -2.8940907            0   -2.8940789   -1.1762331 
+   10350 1.807619e-05   -2.8949091            0    -2.894891   -1.1819669 
+   10400 2.8045001e-05   -2.8954967            0   -2.8954687   -1.1834846 
+   10450 1.1453554e-05   -2.8956053            0   -2.8955939   -1.1848261 
+   10500 3.3687864e-06   -2.8956525            0   -2.8956491   -1.1850246 
+   10550 1.9367666e-06   -2.8956863            0   -2.8956844   -1.1846614 
+   10600 1.2782114e-07   -2.8956995            0   -2.8956994   -1.1843742 
+   10650 6.6195319e-07   -2.8957052            0   -2.8957045   -1.1841825 
+   10700 4.7437869e-07   -2.8957078            0   -2.8957074   -1.1840626 
+   10750 1.7270059e-07   -2.8957124            0   -2.8957122   -1.1840153 
+   10800 1.1015125e-07   -2.8957137            0   -2.8957136   -1.1839328 
+   10850 7.0349976e-08   -2.8957147            0   -2.8957146   -1.1838699 
+   10900 6.837958e-08   -2.8957152            0   -2.8957151   -1.1838349 
+   10950 6.4194728e-08   -2.8957156            0   -2.8957156   -1.1838001 
+   11000 4.9879507e-08   -2.8957159            0   -2.8957158   -1.1837799 
+Loop time of 1.74349 on 1 procs for 10000 steps with 800 atoms
+
+98.3% CPU use with 1 MPI tasks x no OpenMP threads
+
+Minimization stats:
+  Stopping criterion = max iterations
+  Energy initial, next-to-last, final = 
+       -0.790781812776     -2.89571584656     -2.89571585284
+  Force two-norm initial, final = 1905.47 0.0695855
+  Force max component initial, final = 343.392 0.0295536
+  Final line search alpha, max atom move = 0 0
+  Iterations, force evaluations = 10000 10000
+
+MPI task timing breakdown:
+Section |  min time  |  avg time  |  max time  |%varavg| %total
+---------------------------------------------------------------
+Pair    | 1.5154     | 1.5154     | 1.5154     |   0.0 | 86.92
+Neigh   | 0.014633   | 0.014633   | 0.014633   |   0.0 |  0.84
+Comm    | 0.017629   | 0.017629   | 0.017629   |   0.0 |  1.01
+Output  | 0.00418    | 0.00418    | 0.00418    |   0.0 |  0.24
+Modify  | 0.030156   | 0.030156   | 0.030156   |   0.0 |  1.73
+Other   |            | 0.1615     |            |       |  9.26
+
+Nlocal:    800 ave 800 max 800 min
+Histogram: 1 0 0 0 0 0 0 0 0 0
+Nghost:    318 ave 318 max 318 min
+Histogram: 1 0 0 0 0 0 0 0 0 0
+Neighs:    7003 ave 7003 max 7003 min
+Histogram: 1 0 0 0 0 0 0 0 0 0
+
+Total # of neighbors = 7003
+Ave neighs/atom = 8.75375
+Neighbor list builds = 74
+Dangerous builds = 0
+Total wall time: 0:00:01
diff --git a/examples/fire/log.09Janv20.neb.fire.g++.4 b/examples/fire/log.09Janv20.neb.fire.g++.4
new file mode 100644
index 0000000000..9ceea45f8b
--- /dev/null
+++ b/examples/fire/log.09Janv20.neb.fire.g++.4
@@ -0,0 +1,15 @@
+LAMMPS (09 Jan 2020)
+Running on 4 partitions of processors
+Step MaxReplicaForce MaxAtomForce GradV0 GradV1 GradVc EBF EBR RDT RD1 PE1 RD2 PE2 ... RDN PEN
+0    7.5525391    1.6345605   0.16683659    7.5525391    7.5525391    1.5383951            0    1.6207355            0   -2213.3343   0.33333333   -2212.7428   0.66666667   -2212.2247            1   -2211.7959 
+10   0.82975832     0.151496  0.051405637   0.82975832   0.82890942   0.44110237   0.38602248    1.6383945            0    -2213.336   0.34232243   -2212.9441   0.67673819   -2212.8949            1   -2213.2809 
+20    0.1352153  0.017969594  0.028869242    0.1352153   0.71343115   0.41634032   0.41253973    1.7292177            0   -2213.3368   0.32696596   -2212.9588    0.6532446   -2212.9204            1    -2213.333 
+30  0.040631856 0.0047789392 0.0035943777  0.040631856   0.77848301   0.38922096   0.38909328    1.7666107            0   -2213.3374   0.33479277   -2212.9482   0.66840762   -2212.9544            1   -2213.3373 
+40  0.010021333 0.00094141903 0.0026779237  0.010021333   0.78047283   0.38807503   0.38804134     1.765797            0   -2213.3374   0.33414241   -2212.9493   0.66764466   -2212.9529            1   -2213.3374 
+41 0.0085585955 0.00080485818 0.0024573847 0.0085585955   0.78063064   0.38800164   0.38797632    1.7656661            0   -2213.3374   0.33413244   -2212.9494   0.66759535   -2212.9527            1   -2213.3374 
+Climbing replica = 2
+Step MaxReplicaForce MaxAtomForce GradV0 GradV1 GradVc EBF EBR RDT RD1 PE1 RD2 PE2 ... RDN PEN
+41   0.78063064   0.31131254 0.0024573847 0.0085585955   0.78063064   0.38800164   0.38797632    1.7656661            0   -2213.3374   0.33413244   -2212.9494   0.66759535   -2212.9527            1   -2213.3374 
+51  0.077404428  0.031367667 0.0011842934 0.0024342976  0.019465249   0.51014525   0.51014291     1.761094            0   -2213.3374   0.49613471   -2212.8272   0.72707246   -2213.0479            1   -2213.3374 
+61  0.012232045 0.0032274471 0.00078574104 0.0014332303  0.008388584   0.51009811   0.51009738    1.7611503            0   -2213.3374   0.49457348   -2212.8273   0.74541597   -2213.0782            1   -2213.3374 
+62 0.0089103916 0.0024842796 0.00072806474 0.0014932704 0.0083939608   0.51009995   0.51009934    1.7610284            0   -2213.3374   0.49503069   -2212.8273   0.74593364    -2213.079            1   -2213.3374 
diff --git a/examples/fire/log.09Janv20.neb.fire.g++.8 b/examples/fire/log.09Janv20.neb.fire.g++.8
new file mode 100644
index 0000000000..a0f0f75321
--- /dev/null
+++ b/examples/fire/log.09Janv20.neb.fire.g++.8
@@ -0,0 +1,14 @@
+LAMMPS (09 Jan 2020)
+Running on 8 partitions of processors
+Step MaxReplicaForce MaxAtomForce GradV0 GradV1 GradVc EBF EBR RDT RD1 PE1 RD2 PE2 ... RDN PEN
+0    7.5525391    1.6345605   0.16683659    7.5525391    7.5525391    1.5383951            0    1.6207355            0   -2213.3343   0.14285714   -2213.1848   0.28571429   -2212.8577   0.42857143   -2212.5353   0.57142857   -2212.3131   0.71428571    -2212.192   0.85714286   -2212.0797            1   -2211.7959 
+10   0.83279099   0.15218551  0.051457912   0.83279099   0.51294565   0.51146911   0.45623003    1.6449446            0    -2213.336   0.14840724   -2213.2346   0.29535615   -2213.0138    0.4417452   -2212.8419   0.58719049   -2212.8245   0.73204589   -2212.9629    0.8720532   -2213.1643            1   -2213.2807 
+20   0.13499135  0.025513623  0.028873652   0.13499135   0.31173673   0.49652505   0.49272333     1.751414            0   -2213.3368   0.14539729    -2213.243   0.28705892    -2213.024   0.42611693    -2212.854   0.56353342   -2212.8403   0.69946058   -2212.9846   0.83838557    -2213.203            1    -2213.333 
+30  0.045307583 0.0061820354 0.0037366106  0.042519391   0.32123848   0.49279844   0.49266844    1.8063132            0   -2213.3374   0.14088843   -2213.2542   0.28088573   -2213.0379   0.41966614    -2212.859   0.55987626   -2212.8446    0.7049047   -2213.0136   0.85267772   -2213.2453            1   -2213.3373 
+40   0.01020258 0.0024688055 0.0028587701   0.01020258   0.32691899   0.49208236   0.49204824    1.8050507            0   -2213.3374   0.14078995   -2213.2543    0.2808158    -2213.038   0.42032863   -2212.8585   0.56121469   -2212.8453   0.70535554   -2213.0139   0.85229608   -2213.2444            1   -2213.3373 
+41  0.008663273 0.0023142496 0.0026407777  0.008633887   0.32859141   0.49188737   0.49186145    1.8049682            0   -2213.3374   0.14071905   -2213.2544   0.28075314   -2213.0381   0.42045231   -2212.8585   0.56155466   -2212.8455   0.70564189   -2213.0143   0.85237894   -2213.2445            1   -2213.3374 
+Climbing replica = 5
+Step MaxReplicaForce MaxAtomForce GradV0 GradV1 GradVc EBF EBR RDT RD1 PE1 RD2 PE2 ... RDN PEN
+41   0.32859141   0.13237876 0.0026407777  0.008633887   0.32859141   0.49188737   0.49186145    1.8049682            0   -2213.3374   0.14071905   -2213.2544   0.28075314   -2213.0381   0.42045231   -2212.8585   0.56155466   -2212.8455   0.70564189   -2213.0143   0.85237894   -2213.2445            1   -2213.3374 
+51  0.040958022  0.016469867 0.0005521899 0.0016920665  0.040958022   0.50982635   0.50982533    1.8022601            0   -2213.3374   0.13880123   -2213.2577   0.26695723   -2213.0629   0.37347534   -2212.9058    0.4947259   -2212.8276   0.66038346   -2212.9436    0.8406605   -2213.2262            1   -2213.3374 
+60 0.0086936374 0.0031014459 0.00019536798 0.0014152883 0.0028728935   0.51009384    0.5100937    1.8047724            0   -2213.3374   0.12947154   -2213.2696   0.25490265   -2213.0841   0.37918482   -2212.8998     0.502053   -2212.8273   0.66626732   -2212.9516   0.83109228   -2213.2129            1   -2213.3374 
diff --git a/examples/fire/log.09Janv20.neb.fire_mod.g++.4 b/examples/fire/log.09Janv20.neb.fire_mod.g++.4
new file mode 100644
index 0000000000..dfd4caab24
--- /dev/null
+++ b/examples/fire/log.09Janv20.neb.fire_mod.g++.4
@@ -0,0 +1,13 @@
+LAMMPS (09 Jan 2020)
+Running on 4 partitions of processors
+Step MaxReplicaForce MaxAtomForce GradV0 GradV1 GradVc EBF EBR RDT RD1 PE1 RD2 PE2 ... RDN PEN
+0    7.5525391    1.6345605   0.16683659    7.5525391    7.5525391    1.5383951            0    1.6207355            0   -2213.3343   0.33333333   -2212.7428   0.66666667   -2212.2247            1   -2211.7959 
+10   0.48320283  0.070875032  0.038616783   0.48320283   0.73566671   0.43244307   0.41490356    1.6995075            0   -2213.3364   0.32902356   -2212.9569   0.65268687    -2212.904            1   -2213.3189 
+20   0.04588662 0.0059014273  0.013607587   0.04588662    0.7620294   0.39621211   0.39588855     1.754979            0   -2213.3372   0.32672928   -2212.9586   0.66103382    -2212.941            1   -2213.3369 
+30  0.012046386 0.0023677314 0.0024864261  0.012046386   0.77394417     0.390621   0.39059583    1.7683216            0   -2213.3374   0.33656712   -2212.9468   0.66993108    -2212.956            1   -2213.3374 
+32 0.0082265111  0.002338617 0.0024204614 0.0082265111   0.77424743   0.39048139   0.39045939    1.7683165            0   -2213.3374   0.33645819   -2212.9469   0.66981988   -2212.9558            1   -2213.3374 
+Climbing replica = 2
+Step MaxReplicaForce MaxAtomForce GradV0 GradV1 GradVc EBF EBR RDT RD1 PE1 RD2 PE2 ... RDN PEN
+32   0.77424743   0.30840645 0.0024204614 0.0082265111   0.77424743   0.39048139   0.39045939    1.7683165            0   -2213.3374   0.33645819   -2212.9469   0.66981988   -2212.9558            1   -2213.3374 
+42   0.10894394  0.044043242 0.0013210541 0.0029131753  0.021916453    0.5102364   0.51023223    1.7634332            0   -2213.3374   0.49598665   -2212.8272   0.71765441   -2213.0326            1   -2213.3374 
+50 0.0068513242 0.0010095684 0.00065625863  0.001215472 0.0066965947   0.51011571   0.51011496    1.7619971            0   -2213.3374   0.49559669   -2212.8273   0.74807431   -2213.0827            1   -2213.3374 
diff --git a/examples/fire/log.09Janv20.neb.fire_mod.g++.8 b/examples/fire/log.09Janv20.neb.fire_mod.g++.8
new file mode 100644
index 0000000000..2048909e00
--- /dev/null
+++ b/examples/fire/log.09Janv20.neb.fire_mod.g++.8
@@ -0,0 +1,14 @@
+LAMMPS (09 Jan 2020)
+Running on 8 partitions of processors
+Step MaxReplicaForce MaxAtomForce GradV0 GradV1 GradVc EBF EBR RDT RD1 PE1 RD2 PE2 ... RDN PEN
+0    7.5525391    1.6345605   0.16683659    7.5525391    7.5525391    1.5383951            0    1.6207355            0   -2213.3343   0.14285714   -2213.1848   0.28571429   -2212.8577   0.42857143   -2212.5353   0.57142857   -2212.3131   0.71428571    -2212.192   0.85714286   -2212.0797            1   -2211.7959 
+10   0.48475755  0.071114508  0.038599753   0.48475755   0.37640584   0.50318641   0.48560785    1.7145875            0   -2213.3364    0.1447689   -2213.2412   0.28627124   -2213.0244   0.42632938   -2212.8531   0.56539552   -2212.8332    0.7032047   -2212.9696   0.83935165    -2213.178            1   -2213.3188 
+20  0.046926614  0.006867162  0.013743996  0.046926614   0.28004989   0.49743548   0.49710086    1.7876287            0   -2213.3372     0.142513   -2213.2504   0.28233628    -2213.034   0.41881659   -2212.8597   0.55388168   -2212.8398   0.69295642   -2212.9888   0.84301311   -2213.2259            1   -2213.3369 
+30  0.012933981 0.0025468388 0.0021659256  0.012933981   0.33105878   0.49161235   0.49157812    1.8094495            0   -2213.3374   0.13877456   -2213.2574    0.2776974   -2213.0439   0.41817927   -2212.8603    0.5617581   -2212.8458   0.70750491   -2213.0183   0.85397925   -2213.2476            1   -2213.3374 
+32 0.0094719828  0.002190111 0.0020531136 0.0094719828   0.33155635   0.49154859   0.49152008    1.8093908            0   -2213.3374   0.13875933   -2213.2574    0.2777511   -2213.0437   0.41830977   -2212.8602   0.56184682   -2212.8458   0.70752982   -2213.0184    0.8539532   -2213.2475            1   -2213.3374 
+Climbing replica = 5
+Step MaxReplicaForce MaxAtomForce GradV0 GradV1 GradVc EBF EBR RDT RD1 PE1 RD2 PE2 ... RDN PEN
+32   0.33155635   0.13350858 0.0020531136 0.0094719828   0.33155635   0.49154859   0.49152008    1.8093908            0   -2213.3374   0.13875933   -2213.2574    0.2777511   -2213.0437   0.41830977   -2212.8602   0.56184682   -2212.8458   0.70752982   -2213.0184    0.8539532   -2213.2475            1   -2213.3374 
+42  0.054183917  0.021868092 0.00037963557 0.0016877522  0.054183917   0.50961909   0.50961819    1.8035718            0   -2213.3374   0.13834505   -2213.2584   0.26708756   -2213.0628   0.37311054   -2212.9062   0.49221559   -2212.8278     0.660749   -2212.9444   0.84197285   -2213.2284            1   -2213.3374 
+52  0.022191714 0.0081097792 0.00012251534 0.00045278336  0.018020069   0.51004165   0.51004156     1.806295            0   -2213.3374   0.11858703   -2213.2817    0.2484601   -2213.0953   0.37835084   -2212.9009   0.49927321   -2212.8273   0.66777338   -2212.9539   0.83280212   -2213.2156            1   -2213.3374 
+61 0.0083637188 0.0032627544 8.8875493e-05 0.00028087968 0.0034720486   0.51009259   0.51009255    1.8057964            0   -2213.3374   0.12337729   -2213.2765   0.24928935   -2213.0938   0.37439488   -2212.9054   0.50189879   -2212.8273   0.66754201   -2212.9535   0.83596085     -2213.22            1   -2213.3374 
diff --git a/examples/fire/log.09Janv20.neb.fire_mod_old.g++.4 b/examples/fire/log.09Janv20.neb.fire_mod_old.g++.4
new file mode 100644
index 0000000000..0aeef8a531
--- /dev/null
+++ b/examples/fire/log.09Janv20.neb.fire_mod_old.g++.4
@@ -0,0 +1,23 @@
+LAMMPS (09 Jan 2020)
+Running on 4 partitions of processors
+Step MaxReplicaForce MaxAtomForce GradV0 GradV1 GradVc EBF EBR RDT RD1 PE1 RD2 PE2 ... RDN PEN
+0    7.5525391    1.6345605   0.16683659    7.5525391    7.5525391    1.5383951            0    1.6207355            0   -2213.3343   0.33333333   -2212.7428   0.66666667   -2212.2247            1   -2211.7959 
+10    1.3693388   0.28041646  0.070738081    1.3693388    1.0855833   0.49695052   0.30796931    1.5832462            0   -2213.3353   0.35022053     -2212.92   0.69816488   -2212.8384            1   -2213.1464 
+20    1.1002508   0.21873472  0.049142357    1.1002508   0.96650653   0.44246122   0.38196494    1.6785075            0   -2213.3362   0.34083391   -2212.9409   0.66986112   -2212.8937            1   -2213.2757 
+30   0.51368685  0.060842471  0.039205784   0.51368685   0.75179947   0.42112286   0.40449278    1.7009906            0   -2213.3364   0.33411939   -2212.9506   0.66142227   -2212.9153            1   -2213.3198 
+40   0.35823734  0.045892314  0.033965264   0.35823734   0.73284549   0.41639462    0.4075633    1.7148522            0   -2213.3366   0.33138373   -2212.9538   0.65884796   -2212.9202            1   -2213.3278 
+50   0.41165748  0.076994838  0.021380826   0.41165748   0.78427738   0.40229169   0.39779205    1.7632679            0   -2213.3371   0.32419234   -2212.9593   0.65452671   -2212.9348            1   -2213.3326 
+60  0.076915443  0.010958664  0.016926588  0.076915443   0.75408409   0.39957497   0.39862604    1.7606518            0   -2213.3372   0.32519215   -2212.9591   0.65667393   -2212.9376            1   -2213.3362 
+70   0.10481382  0.015447066  0.014548011   0.10481382   0.76748189   0.39515902    0.3946702    1.7555947            0   -2213.3372   0.32808712   -2212.9568   0.66188046   -2212.9421            1   -2213.3367 
+80  0.080915257  0.008490983  0.012981317  0.080915257   0.76868863   0.39409972   0.39377313    1.7563219            0   -2213.3373   0.32892342   -2212.9557    0.6623966   -2212.9432            1   -2213.3369 
+90   0.03261844 0.0036037258  0.010975647   0.03261844   0.77019393   0.39275317   0.39258035    1.7570762            0   -2213.3373   0.33001491   -2212.9544   0.66324116   -2212.9445            1   -2213.3371 
+100  0.053370763 0.0072724044  0.009243639  0.053370763   0.77457554   0.39117385     0.391031    1.7582617            0   -2213.3373   0.33114311   -2212.9531   0.66427428   -2212.9461            1   -2213.3372 
+Climbing replica = 3
+Step MaxReplicaForce MaxAtomForce GradV0 GradV1 GradVc EBF EBR RDT RD1 PE1 RD2 PE2 ... RDN PEN
+100   0.77457554   0.30675535  0.009243639  0.053370763   0.77457554   0.39117385     0.391031    1.7582617            0   -2213.3373   0.33114311   -2212.9531   0.66427428   -2212.9461            1   -2213.3372 
+110   0.25585774   0.10268695 0.0070464547    0.0681587   0.14797757   0.50920581   0.50909423    1.7558262            0   -2213.3374   0.31405087   -2212.9805   0.48492192   -2212.8281            1   -2213.3372 
+120   0.11790673  0.046047759 0.0056305403  0.032412928  0.073256467   0.51011765   0.51007105    1.7564765            0   -2213.3374   0.28119336   -2213.0335   0.49788361   -2212.8272            1   -2213.3373 
+130  0.070383648  0.012735737 0.0040321557  0.011560639  0.070383648   0.51017901   0.51016087    1.7586689            0   -2213.3374   0.25054735   -2213.0848   0.50803649   -2212.8272            1   -2213.3374 
+140  0.031165303 0.0054585981 0.0037609991 0.0081879563  0.031165303   0.51010628   0.51009071    1.7588792            0   -2213.3374    0.2509652    -2213.084   0.50725262   -2212.8273            1   -2213.3374 
+150  0.032102393 0.0051272026 0.0029882352 0.0078487546  0.032102393   0.51012806   0.51011832    1.7587138            0   -2213.3374   0.25247871    -2213.081   0.50452467   -2212.8273            1   -2213.3374 
+153 0.0098882985 0.0021249062 0.0028642357 0.0047391334 0.0068711217   0.51010879   0.51009999    1.7588126            0   -2213.3374   0.25247357   -2213.0811   0.50451804   -2212.8273            1   -2213.3374 
diff --git a/examples/fire/log.09Janv20.neb.fire_mod_old.g++.8 b/examples/fire/log.09Janv20.neb.fire_mod_old.g++.8
new file mode 100644
index 0000000000..86d8665e06
--- /dev/null
+++ b/examples/fire/log.09Janv20.neb.fire_mod_old.g++.8
@@ -0,0 +1,25 @@
+LAMMPS (09 Jan 2020)
+Running on 8 partitions of processors
+Step MaxReplicaForce MaxAtomForce GradV0 GradV1 GradVc EBF EBR RDT RD1 PE1 RD2 PE2 ... RDN PEN
+0    7.5525391    1.6345605   0.16683659    7.5525391    7.5525391    1.5383951            0    1.6207355            0   -2213.3343   0.14285714   -2213.1848   0.28571429   -2212.8577   0.42857143   -2212.5353   0.57142857   -2212.3131   0.71428571    -2212.192   0.85714286   -2212.0797            1   -2211.7959 
+10    1.3733952   0.28091862  0.070816258    1.3733952    0.8486803   0.56001239    0.3703372     1.585382            0   -2213.3353    0.1507806   -2213.2252   0.30063588    -2212.994   0.45029991   -2212.8095   0.59994263   -2212.7753    0.7496139   -2212.8912   0.89858029   -2213.0683            1   -2213.1457 
+20     1.092582   0.20848565  0.049208846     1.092582   0.67749217   0.51312948   0.45351955    1.6893895            0   -2213.3362   0.14936576   -2213.2335   0.29517709   -2213.0109   0.44023761   -2212.8383   0.58433586    -2212.823   0.72824623   -2212.9685   0.86563155   -2213.1656            1   -2213.2765 
+30   0.51394672  0.065440154  0.039324493   0.51394672    0.3958278   0.49724388   0.48072013    1.7159739            0   -2213.3364   0.14741033   -2213.2378   0.29093102   -2213.0178   0.43329455   -2212.8488   0.57560149   -2212.8391   0.71699492   -2212.9908   0.85518626   -2213.2019            1   -2213.3199 
+40    0.3585576  0.049551349  0.034062896    0.3585576   0.35880033   0.49523368   0.48643307    1.7331908            0   -2213.3366    0.1468741   -2213.2401   0.28995894   -2213.0199   0.43116537   -2212.8509   0.57200904   -2212.8414   0.71172557   -2212.9933   0.85019682   -2213.2079            1   -2213.3278 
+50   0.44071315  0.082631584  0.022058757   0.44071315   0.37223078   0.49368273   0.48892253     1.798835            0   -2213.3371   0.14570064   -2213.2457   0.28667681   -2213.0242   0.42410363   -2212.8534   0.55976055   -2212.8434   0.69487743   -2212.9955   0.83779975   -2213.2217            1   -2213.3324 
+60  0.077895494  0.011715318   0.01696469  0.077895494   0.32663094   0.49291962   0.49197362    1.7955425            0   -2213.3372    0.1454209   -2213.2463    0.2868202   -2213.0251   0.42463425    -2212.854   0.56068056   -2212.8442   0.69668441   -2212.9982   0.84064029   -2213.2268            1   -2213.3362 
+70   0.11340967  0.020267586  0.014639143   0.11200288   0.32902721   0.49268033   0.49216997    1.7893615            0   -2213.3372   0.14432947   -2213.2481   0.28644798   -2213.0271   0.42527709   -2212.8546   0.56239953   -2212.8445   0.70115891   -2213.0022   0.84751195   -2213.2328            1   -2213.3367 
+80  0.059890228 0.0072324994  0.013525373  0.058536736   0.32663552   0.49254358   0.49222746    1.7897234            0   -2213.3372   0.14416888   -2213.2483   0.28619681   -2213.0275   0.42510701   -2212.8548    0.5624421   -2212.8447   0.70158835   -2213.0031   0.84785092   -2213.2336            1   -2213.3369 
+90  0.046425179 0.0085878339  0.012661487  0.044701202   0.32705463   0.49239983   0.49214608    1.7902988            0   -2213.3373   0.14397996   -2213.2486   0.28591514   -2213.0281   0.42492825   -2212.8549   0.56254967   -2212.8449   0.70215415   -2213.0043   0.84829939   -2213.2344            1    -2213.337 
+100   0.10492073  0.011902365 0.0086596336  0.098577447   0.33783582   0.49131393   0.49111204    1.7952617            0   -2213.3373   0.14284709   -2213.2507   0.28418505   -2213.0317   0.42398447   -2212.8559    0.5637284    -2212.846   0.70592525   -2213.0117   0.85128864   -2213.2397            1   -2213.3371 
+Climbing replica = 5
+Step MaxReplicaForce MaxAtomForce GradV0 GradV1 GradVc EBF EBR RDT RD1 PE1 RD2 PE2 ... RDN PEN
+100   0.33783582   0.13401694 0.0086596336  0.098577447   0.33783582   0.49131393   0.49111204    1.7952617            0   -2213.3373   0.14284709   -2213.2507   0.28418505   -2213.0317   0.42398447   -2212.8559    0.5637284    -2212.846   0.70592525   -2213.0117   0.85128864   -2213.2397            1   -2213.3371 
+110   0.18587506  0.036451754  0.010634469   0.17023192  0.096871396   0.51011217   0.50966159    1.7980162            0   -2213.3374   0.14250254   -2213.2514   0.28367135   -2213.0327   0.42003349   -2212.8588   0.50682002   -2212.8272   0.70273624   -2213.0073   0.85172992    -2213.241            1   -2213.3369 
+120   0.10027564  0.032272806 0.0066799491  0.069972769   0.04600783   0.51006637   0.50996326    1.7980446            0   -2213.3374   0.14245419   -2213.2516   0.28333857   -2213.0334   0.41656844   -2212.8616   0.50571617   -2212.8273   0.69946889   -2213.0023   0.85165952   -2213.2413            1   -2213.3373 
+130  0.061140793  0.022612825 0.0051287229  0.035432028  0.023420936   0.51012054   0.51007667      1.79856            0   -2213.3374   0.14224093    -2213.252   0.28182793   -2213.0361   0.40850953   -2212.8685   0.50337537   -2212.8272   0.69184303   -2212.9904   0.85074583   -2213.2402            1   -2213.3373 
+140  0.034227221  0.013436677 0.0033777969  0.012466833  0.012341194   0.51010526    0.5100916    1.7997532            0   -2213.3374   0.14115179    -2213.254   0.27552835   -2213.0474   0.39134491   -2212.8853   0.50005108   -2212.8273   0.67579228   -2212.9658   0.84597693   -2213.2336            1   -2213.3374 
+150  0.031519482  0.012310467  0.003215866 0.0067823368 0.0094298698   0.51010745   0.51009621     1.799913            0   -2213.3374    0.1407836   -2213.2545   0.27442232   -2213.0493   0.39094764   -2212.8858   0.50040612   -2212.8273   0.67547004   -2212.9653   0.84498145   -2213.2322            1   -2213.3374 
+160   0.02145751  0.006224623 0.0025005459  0.015465641  0.009264856   0.51010724   0.51009839    1.8012956            0   -2213.3374   0.13767881   -2213.2589   0.26720429   -2213.0621   0.38791572   -2212.8894   0.50222367   -2212.8273   0.67294161   -2212.9614   0.83875897   -2213.2236            1   -2213.3374 
+170  0.066130312 0.0055647193 0.0038237308  0.038908839  0.020979589   0.51009997   0.51007791    1.8039701            0   -2213.3374   0.13100945   -2213.2676   0.25738978   -2213.0796    0.3821429   -2212.8962   0.50312597   -2212.8273   0.66833145   -2212.9546   0.83201742   -2213.2142            1   -2213.3374 
+175  0.008829511 0.0032927835 0.00089755332 0.0014591785 0.0043357949   0.51009467   0.51009389    1.8039465            0   -2213.3374   0.13086052   -2213.2678    0.2573384   -2213.0797   0.38201967   -2212.8964   0.50305513   -2212.8273   0.66828977   -2212.9546   0.83216025   -2213.2144            1   -2213.3374 
diff --git a/examples/fire/log.09Janv20.neb.fire_old.g++.4 b/examples/fire/log.09Janv20.neb.fire_old.g++.4
new file mode 100644
index 0000000000..0aeef8a531
--- /dev/null
+++ b/examples/fire/log.09Janv20.neb.fire_old.g++.4
@@ -0,0 +1,23 @@
+LAMMPS (09 Jan 2020)
+Running on 4 partitions of processors
+Step MaxReplicaForce MaxAtomForce GradV0 GradV1 GradVc EBF EBR RDT RD1 PE1 RD2 PE2 ... RDN PEN
+0    7.5525391    1.6345605   0.16683659    7.5525391    7.5525391    1.5383951            0    1.6207355            0   -2213.3343   0.33333333   -2212.7428   0.66666667   -2212.2247            1   -2211.7959 
+10    1.3693388   0.28041646  0.070738081    1.3693388    1.0855833   0.49695052   0.30796931    1.5832462            0   -2213.3353   0.35022053     -2212.92   0.69816488   -2212.8384            1   -2213.1464 
+20    1.1002508   0.21873472  0.049142357    1.1002508   0.96650653   0.44246122   0.38196494    1.6785075            0   -2213.3362   0.34083391   -2212.9409   0.66986112   -2212.8937            1   -2213.2757 
+30   0.51368685  0.060842471  0.039205784   0.51368685   0.75179947   0.42112286   0.40449278    1.7009906            0   -2213.3364   0.33411939   -2212.9506   0.66142227   -2212.9153            1   -2213.3198 
+40   0.35823734  0.045892314  0.033965264   0.35823734   0.73284549   0.41639462    0.4075633    1.7148522            0   -2213.3366   0.33138373   -2212.9538   0.65884796   -2212.9202            1   -2213.3278 
+50   0.41165748  0.076994838  0.021380826   0.41165748   0.78427738   0.40229169   0.39779205    1.7632679            0   -2213.3371   0.32419234   -2212.9593   0.65452671   -2212.9348            1   -2213.3326 
+60  0.076915443  0.010958664  0.016926588  0.076915443   0.75408409   0.39957497   0.39862604    1.7606518            0   -2213.3372   0.32519215   -2212.9591   0.65667393   -2212.9376            1   -2213.3362 
+70   0.10481382  0.015447066  0.014548011   0.10481382   0.76748189   0.39515902    0.3946702    1.7555947            0   -2213.3372   0.32808712   -2212.9568   0.66188046   -2212.9421            1   -2213.3367 
+80  0.080915257  0.008490983  0.012981317  0.080915257   0.76868863   0.39409972   0.39377313    1.7563219            0   -2213.3373   0.32892342   -2212.9557    0.6623966   -2212.9432            1   -2213.3369 
+90   0.03261844 0.0036037258  0.010975647   0.03261844   0.77019393   0.39275317   0.39258035    1.7570762            0   -2213.3373   0.33001491   -2212.9544   0.66324116   -2212.9445            1   -2213.3371 
+100  0.053370763 0.0072724044  0.009243639  0.053370763   0.77457554   0.39117385     0.391031    1.7582617            0   -2213.3373   0.33114311   -2212.9531   0.66427428   -2212.9461            1   -2213.3372 
+Climbing replica = 3
+Step MaxReplicaForce MaxAtomForce GradV0 GradV1 GradVc EBF EBR RDT RD1 PE1 RD2 PE2 ... RDN PEN
+100   0.77457554   0.30675535  0.009243639  0.053370763   0.77457554   0.39117385     0.391031    1.7582617            0   -2213.3373   0.33114311   -2212.9531   0.66427428   -2212.9461            1   -2213.3372 
+110   0.25585774   0.10268695 0.0070464547    0.0681587   0.14797757   0.50920581   0.50909423    1.7558262            0   -2213.3374   0.31405087   -2212.9805   0.48492192   -2212.8281            1   -2213.3372 
+120   0.11790673  0.046047759 0.0056305403  0.032412928  0.073256467   0.51011765   0.51007105    1.7564765            0   -2213.3374   0.28119336   -2213.0335   0.49788361   -2212.8272            1   -2213.3373 
+130  0.070383648  0.012735737 0.0040321557  0.011560639  0.070383648   0.51017901   0.51016087    1.7586689            0   -2213.3374   0.25054735   -2213.0848   0.50803649   -2212.8272            1   -2213.3374 
+140  0.031165303 0.0054585981 0.0037609991 0.0081879563  0.031165303   0.51010628   0.51009071    1.7588792            0   -2213.3374    0.2509652    -2213.084   0.50725262   -2212.8273            1   -2213.3374 
+150  0.032102393 0.0051272026 0.0029882352 0.0078487546  0.032102393   0.51012806   0.51011832    1.7587138            0   -2213.3374   0.25247871    -2213.081   0.50452467   -2212.8273            1   -2213.3374 
+153 0.0098882985 0.0021249062 0.0028642357 0.0047391334 0.0068711217   0.51010879   0.51009999    1.7588126            0   -2213.3374   0.25247357   -2213.0811   0.50451804   -2212.8273            1   -2213.3374 
diff --git a/examples/fire/log.09Janv20.neb.fire_old.g++.8 b/examples/fire/log.09Janv20.neb.fire_old.g++.8
new file mode 100644
index 0000000000..86d8665e06
--- /dev/null
+++ b/examples/fire/log.09Janv20.neb.fire_old.g++.8
@@ -0,0 +1,25 @@
+LAMMPS (09 Jan 2020)
+Running on 8 partitions of processors
+Step MaxReplicaForce MaxAtomForce GradV0 GradV1 GradVc EBF EBR RDT RD1 PE1 RD2 PE2 ... RDN PEN
+0    7.5525391    1.6345605   0.16683659    7.5525391    7.5525391    1.5383951            0    1.6207355            0   -2213.3343   0.14285714   -2213.1848   0.28571429   -2212.8577   0.42857143   -2212.5353   0.57142857   -2212.3131   0.71428571    -2212.192   0.85714286   -2212.0797            1   -2211.7959 
+10    1.3733952   0.28091862  0.070816258    1.3733952    0.8486803   0.56001239    0.3703372     1.585382            0   -2213.3353    0.1507806   -2213.2252   0.30063588    -2212.994   0.45029991   -2212.8095   0.59994263   -2212.7753    0.7496139   -2212.8912   0.89858029   -2213.0683            1   -2213.1457 
+20     1.092582   0.20848565  0.049208846     1.092582   0.67749217   0.51312948   0.45351955    1.6893895            0   -2213.3362   0.14936576   -2213.2335   0.29517709   -2213.0109   0.44023761   -2212.8383   0.58433586    -2212.823   0.72824623   -2212.9685   0.86563155   -2213.1656            1   -2213.2765 
+30   0.51394672  0.065440154  0.039324493   0.51394672    0.3958278   0.49724388   0.48072013    1.7159739            0   -2213.3364   0.14741033   -2213.2378   0.29093102   -2213.0178   0.43329455   -2212.8488   0.57560149   -2212.8391   0.71699492   -2212.9908   0.85518626   -2213.2019            1   -2213.3199 
+40    0.3585576  0.049551349  0.034062896    0.3585576   0.35880033   0.49523368   0.48643307    1.7331908            0   -2213.3366    0.1468741   -2213.2401   0.28995894   -2213.0199   0.43116537   -2212.8509   0.57200904   -2212.8414   0.71172557   -2212.9933   0.85019682   -2213.2079            1   -2213.3278 
+50   0.44071315  0.082631584  0.022058757   0.44071315   0.37223078   0.49368273   0.48892253     1.798835            0   -2213.3371   0.14570064   -2213.2457   0.28667681   -2213.0242   0.42410363   -2212.8534   0.55976055   -2212.8434   0.69487743   -2212.9955   0.83779975   -2213.2217            1   -2213.3324 
+60  0.077895494  0.011715318   0.01696469  0.077895494   0.32663094   0.49291962   0.49197362    1.7955425            0   -2213.3372    0.1454209   -2213.2463    0.2868202   -2213.0251   0.42463425    -2212.854   0.56068056   -2212.8442   0.69668441   -2212.9982   0.84064029   -2213.2268            1   -2213.3362 
+70   0.11340967  0.020267586  0.014639143   0.11200288   0.32902721   0.49268033   0.49216997    1.7893615            0   -2213.3372   0.14432947   -2213.2481   0.28644798   -2213.0271   0.42527709   -2212.8546   0.56239953   -2212.8445   0.70115891   -2213.0022   0.84751195   -2213.2328            1   -2213.3367 
+80  0.059890228 0.0072324994  0.013525373  0.058536736   0.32663552   0.49254358   0.49222746    1.7897234            0   -2213.3372   0.14416888   -2213.2483   0.28619681   -2213.0275   0.42510701   -2212.8548    0.5624421   -2212.8447   0.70158835   -2213.0031   0.84785092   -2213.2336            1   -2213.3369 
+90  0.046425179 0.0085878339  0.012661487  0.044701202   0.32705463   0.49239983   0.49214608    1.7902988            0   -2213.3373   0.14397996   -2213.2486   0.28591514   -2213.0281   0.42492825   -2212.8549   0.56254967   -2212.8449   0.70215415   -2213.0043   0.84829939   -2213.2344            1    -2213.337 
+100   0.10492073  0.011902365 0.0086596336  0.098577447   0.33783582   0.49131393   0.49111204    1.7952617            0   -2213.3373   0.14284709   -2213.2507   0.28418505   -2213.0317   0.42398447   -2212.8559    0.5637284    -2212.846   0.70592525   -2213.0117   0.85128864   -2213.2397            1   -2213.3371 
+Climbing replica = 5
+Step MaxReplicaForce MaxAtomForce GradV0 GradV1 GradVc EBF EBR RDT RD1 PE1 RD2 PE2 ... RDN PEN
+100   0.33783582   0.13401694 0.0086596336  0.098577447   0.33783582   0.49131393   0.49111204    1.7952617            0   -2213.3373   0.14284709   -2213.2507   0.28418505   -2213.0317   0.42398447   -2212.8559    0.5637284    -2212.846   0.70592525   -2213.0117   0.85128864   -2213.2397            1   -2213.3371 
+110   0.18587506  0.036451754  0.010634469   0.17023192  0.096871396   0.51011217   0.50966159    1.7980162            0   -2213.3374   0.14250254   -2213.2514   0.28367135   -2213.0327   0.42003349   -2212.8588   0.50682002   -2212.8272   0.70273624   -2213.0073   0.85172992    -2213.241            1   -2213.3369 
+120   0.10027564  0.032272806 0.0066799491  0.069972769   0.04600783   0.51006637   0.50996326    1.7980446            0   -2213.3374   0.14245419   -2213.2516   0.28333857   -2213.0334   0.41656844   -2212.8616   0.50571617   -2212.8273   0.69946889   -2213.0023   0.85165952   -2213.2413            1   -2213.3373 
+130  0.061140793  0.022612825 0.0051287229  0.035432028  0.023420936   0.51012054   0.51007667      1.79856            0   -2213.3374   0.14224093    -2213.252   0.28182793   -2213.0361   0.40850953   -2212.8685   0.50337537   -2212.8272   0.69184303   -2212.9904   0.85074583   -2213.2402            1   -2213.3373 
+140  0.034227221  0.013436677 0.0033777969  0.012466833  0.012341194   0.51010526    0.5100916    1.7997532            0   -2213.3374   0.14115179    -2213.254   0.27552835   -2213.0474   0.39134491   -2212.8853   0.50005108   -2212.8273   0.67579228   -2212.9658   0.84597693   -2213.2336            1   -2213.3374 
+150  0.031519482  0.012310467  0.003215866 0.0067823368 0.0094298698   0.51010745   0.51009621     1.799913            0   -2213.3374    0.1407836   -2213.2545   0.27442232   -2213.0493   0.39094764   -2212.8858   0.50040612   -2212.8273   0.67547004   -2212.9653   0.84498145   -2213.2322            1   -2213.3374 
+160   0.02145751  0.006224623 0.0025005459  0.015465641  0.009264856   0.51010724   0.51009839    1.8012956            0   -2213.3374   0.13767881   -2213.2589   0.26720429   -2213.0621   0.38791572   -2212.8894   0.50222367   -2212.8273   0.67294161   -2212.9614   0.83875897   -2213.2236            1   -2213.3374 
+170  0.066130312 0.0055647193 0.0038237308  0.038908839  0.020979589   0.51009997   0.51007791    1.8039701            0   -2213.3374   0.13100945   -2213.2676   0.25738978   -2213.0796    0.3821429   -2212.8962   0.50312597   -2212.8273   0.66833145   -2212.9546   0.83201742   -2213.2142            1   -2213.3374 
+175  0.008829511 0.0032927835 0.00089755332 0.0014591785 0.0043357949   0.51009467   0.51009389    1.8039465            0   -2213.3374   0.13086052   -2213.2678    0.2573384   -2213.0797   0.38201967   -2212.8964   0.50305513   -2212.8273   0.66828977   -2212.9546   0.83216025   -2213.2144            1   -2213.3374 
diff --git a/examples/fire/log.09Janv20.neb.qm.g++.4 b/examples/fire/log.09Janv20.neb.qm.g++.4
new file mode 100644
index 0000000000..049d72b082
--- /dev/null
+++ b/examples/fire/log.09Janv20.neb.qm.g++.4
@@ -0,0 +1,18 @@
+LAMMPS (09 Jan 2020)
+Running on 4 partitions of processors
+Step MaxReplicaForce MaxAtomForce GradV0 GradV1 GradVc EBF EBR RDT RD1 PE1 RD2 PE2 ... RDN PEN
+0    7.5525391    1.6345605   0.16683659    7.5525391    7.5525391    1.5383951            0    1.6207355            0   -2213.3343   0.33333333   -2212.7428   0.66666667   -2212.2247            1   -2211.7959 
+10   0.24005275  0.036502104  0.036483049   0.24005275   0.68351722   0.42916118   0.41794425    1.6989349            0   -2213.3365   0.32909183   -2212.9587   0.65386736   -2212.9073            1   -2213.3253 
+20   0.07940898  0.016398055  0.024706844   0.07940898   0.71637784   0.41387872   0.41157886    1.7343662            0   -2213.3369   0.32478734   -2212.9621   0.65348766    -2212.923            1   -2213.3346 
+30  0.094973707 0.0083631681  0.015145947  0.035267404    0.7535772   0.40072717   0.40024605    1.7504612            0   -2213.3372   0.32705584   -2212.9584   0.65894506   -2212.9365            1   -2213.3367 
+40  0.027727472 0.0044528145  0.011618173  0.022562656   0.76133752   0.39614635   0.39591731    1.7547519            0   -2213.3373   0.32873163   -2212.9562   0.66124255   -2212.9411            1    -2213.337 
+50   0.01942935 0.0030110281 0.0087135562  0.015391975   0.76952681   0.39274846    0.3926388    1.7578616            0   -2213.3373   0.33022595   -2212.9543   0.66307279   -2212.9446            1   -2213.3372 
+60  0.019000226 0.0016228054 0.0053426183 0.0086165952   0.77759608    0.3893686   0.38933362    1.7610433            0   -2213.3374   0.33187548   -2212.9523   0.66497618    -2212.948            1   -2213.3373 
+63 0.0097473558 0.0012728697  0.004778276 0.0076133796    0.7786505   0.38888835   0.38886103    1.7615288            0   -2213.3374   0.33212079    -2212.952   0.66525353   -2212.9485            1   -2213.3373 
+Climbing replica = 3
+Step MaxReplicaForce MaxAtomForce GradV0 GradV1 GradVc EBF EBR RDT RD1 PE1 RD2 PE2 ... RDN PEN
+63    0.7786505   0.31085887  0.004778276 0.0076133796    0.7786505   0.38888835   0.38886103    1.7615288            0   -2213.3374   0.33212079    -2212.952   0.66525353   -2212.9485            1   -2213.3373 
+73  0.098492019  0.033618082 0.0027887232 0.0042741347  0.036396293   0.51024836   0.51023981    1.7607191            0   -2213.3374   0.27571995   -2213.0417   0.50430689   -2212.8271            1   -2213.3374 
+83  0.032231558  0.012626629 0.0020833883 0.0031571731  0.010051365   0.51014599   0.51014135    1.7602543            0   -2213.3374   0.26039027   -2213.0673    0.5035489   -2212.8272            1   -2213.3374 
+93  0.010620711 0.0034681655 0.0014722232 0.0022089665 0.0056709673    0.5101128   0.51011054    1.7601229            0   -2213.3374   0.25434046   -2213.0777   0.50383318   -2212.8273            1   -2213.3374 
+94 0.0096723674 0.0031191785 0.0014334811  0.002149467 0.0054516532   0.51011153   0.51010939    1.7601211            0   -2213.3374   0.25413802    -2213.078   0.50385902   -2212.8273            1   -2213.3374 
diff --git a/examples/fire/log.09Janv20.neb.qm.g++.8 b/examples/fire/log.09Janv20.neb.qm.g++.8
new file mode 100644
index 0000000000..2b28a066a4
--- /dev/null
+++ b/examples/fire/log.09Janv20.neb.qm.g++.8
@@ -0,0 +1,21 @@
+LAMMPS (09 Jan 2020)
+Running on 8 partitions of processors
+Step MaxReplicaForce MaxAtomForce GradV0 GradV1 GradVc EBF EBR RDT RD1 PE1 RD2 PE2 ... RDN PEN
+0    7.5525391    1.6345605   0.16683659    7.5525391    7.5525391    1.5383951            0    1.6207355            0   -2213.3343   0.14285714   -2213.1848   0.28571429   -2212.8577   0.42857143   -2212.5353   0.57142857   -2212.3131   0.71428571    -2212.192   0.85714286   -2212.0797            1   -2211.7959 
+10   0.45237221  0.062369106  0.043713415   0.45237221   0.33984237   0.50434364   0.47974444     1.681593            0   -2213.3362     0.145972   -2213.2393   0.28963267   -2213.0224   0.43234899   -2212.8512   0.57436617   -2212.8319   0.71564291   -2212.9699   0.85294239   -2213.1766            1   -2213.3116 
+20   0.17466055  0.019608542  0.027733064   0.16054263   0.29142661   0.49877454   0.49547267    1.7524163            0   -2213.3369   0.14387205   -2213.2456   0.28439667   -2213.0291   0.42233932   -2212.8573    0.5588361   -2212.8381   0.69513708   -2212.9781   0.83702043   -2213.2011            1   -2213.3336 
+30  0.045422642  0.010354266   0.01818213  0.045422642   0.28112975   0.49759387   0.49675173    1.7746784            0   -2213.3371   0.14290957   -2213.2488   0.28281709   -2213.0326   0.41989281    -2212.859   0.55582211   -2212.8395   0.69368801   -2212.9853   0.83973606   -2213.2161            1   -2213.3363 
+40  0.038021578 0.0077863453  0.013142053  0.027303941   0.28657705   0.49667648   0.49635337    1.7848045            0   -2213.3372    0.1420496   -2213.2509   0.28169834   -2213.0351   0.41895631   -2212.8598   0.55576002   -2212.8406   0.69554601   -2212.9918   0.84293215   -2213.2247            1   -2213.3369 
+50  0.023478387 0.0050438726 0.0094370881  0.017117841    0.2948129    0.4956627   0.49552819    1.7913648            0   -2213.3373   0.14130551   -2213.2524   0.28080367   -2213.0371   0.41862494   -2212.8601   0.55666336   -2212.8417   0.69796419   -2212.9977   0.84561062   -2213.2308            1   -2213.3372 
+60  0.015568349 0.0036585595 0.0065356733  0.010880239   0.30476692   0.49454143   0.49448589    1.7961707            0   -2213.3374   0.14069048   -2213.2537   0.28018046   -2213.0385   0.41875119     -2212.86   0.55806463   -2212.8428   0.70047903   -2213.0032   0.84789117   -2213.2356            1   -2213.3373 
+70  0.011117037  0.002930771 0.0046665969 0.0074340459   0.31343722    0.4935777   0.49355166    1.7991441            0   -2213.3374   0.14033265   -2213.2544   0.27992696   -2213.0392   0.41915513   -2212.8596   0.55940642   -2212.8438   0.70245129   -2213.0073    0.8494878   -2213.2387            1   -2213.3373 
+77 0.0095031741 0.0025470028 0.0037787977 0.0059130847   0.31843202    0.4930196   0.49300314    1.8005357            0   -2213.3374   0.14019726   -2213.2547   0.27989276   -2213.0394   0.41949004   -2212.8594   0.56021118   -2212.8444    0.7035183   -2213.0094   0.85030235   -2213.2402            1   -2213.3374 
+Climbing replica = 5
+Step MaxReplicaForce MaxAtomForce GradV0 GradV1 GradVc EBF EBR RDT RD1 PE1 RD2 PE2 ... RDN PEN
+77   0.31843202   0.12858086 0.0037787977 0.0059130847   0.31843202    0.4930196   0.49300314    1.8005357            0   -2213.3374   0.14019726   -2213.2547   0.27989276   -2213.0394   0.41949004   -2212.8594   0.56021118   -2212.8444    0.7035183   -2213.0094   0.85030235   -2213.2402            1   -2213.3374 
+87  0.068485358  0.020416571 0.0025906821 0.0039654836  0.024981085   0.51001438   0.51000702    1.8017658            0   -2213.3374   0.13988537   -2213.2554    0.2781578   -2213.0427   0.40602784   -2212.8709   0.50551349   -2212.8274   0.69111931     -2212.99    0.8499171   -2213.2398            1   -2213.3374 
+97  0.031476072    0.0123593 0.0020332076 0.0030835531 0.0070061038   0.51009654   0.51009211    1.8020357            0   -2213.3374   0.13898543   -2213.2569   0.27381812   -2213.0504   0.39685543   -2212.8798   0.50256086   -2212.8273   0.68246582   -2212.9764   0.84621512   -2213.2346            1   -2213.3374 
+107  0.028460125 0.0067640875 0.0014194664 0.0021303377 0.0026454458   0.51009858   0.51009648       1.8028            0   -2213.3374      0.13646   -2213.2604   0.26764336   -2213.0614   0.38930317   -2212.8879   0.50193579   -2212.8273   0.67546861   -2212.9656    0.8411568   -2213.2275            1   -2213.3374 
+117  0.014824889 0.0055517464 0.0010985753 0.0016392459 0.0019892141   0.51009713   0.51009589    1.8033322            0   -2213.3374   0.13447899    -2213.263   0.26412103   -2213.0676   0.38617147   -2212.8914    0.5020058   -2212.8273   0.67278941   -2212.9615   0.83870093    -2213.224            1   -2213.3374 
+127  0.011626205   0.00404434 0.00078110388 0.0011582058 0.0014475679   0.51009594   0.51009533    1.8039369            0   -2213.3374   0.13219331    -2213.266   0.26054642    -2213.074   0.38339139   -2212.8946   0.50214085   -2212.8273   0.67071709   -2212.9584   0.83665693   -2213.2211            1   -2213.3374 
+132 0.0089531814 0.0035807918 0.00069218572 0.0010244011 0.0012955882   0.51009566   0.51009518    1.8041186            0   -2213.3374   0.13150535   -2213.2669    0.2595308   -2213.0758   0.38264847   -2212.8955   0.50218195   -2212.8273   0.67024326   -2212.9576   0.83617539   -2213.2204            1   -2213.3374 
diff --git a/examples/hugoniostat/in.hugoniostat b/examples/hugoniostat/in.hugoniostat
index 01c2a246fc..571f92b59e 100644
--- a/examples/hugoniostat/in.hugoniostat
+++ b/examples/hugoniostat/in.hugoniostat
@@ -67,7 +67,7 @@ fix myhug all nphug temp 1.0 1.0 10.0 z 40.0 40.0 70.0 drag 0.0 tchain 1 pchain
 
 fix_modify myhug e0 -6334.0 p0 0.0 v0 680.73519
 
-# Add fix energy to ouput etotal
+# Add fix energy to output etotal
  
 fix_modify myhug energy yes 
 
@@ -115,7 +115,7 @@ fix myhug all nphug temp 1.0 1.0 1.0 z 40.0 40.0 70.0 drag 200.0 tchain 1 pchain
 
 fix_modify myhug e0 -6334.0 p0 0.0 v0 680.73519
 
-# Add fix energy to ouput etotal
+# Add fix energy to output etotal
  
 fix_modify myhug energy yes 
 
@@ -153,7 +153,7 @@ fix myhug all nphug temp 1.0 1.0 1.0 z 40.0 40.0 70.0
 
 fix_modify myhug e0 -6334.0 p0 0.0 v0 680.73519
 
-# Add fix energy to ouput etotal
+# Add fix energy to output etotal
  
 fix_modify myhug energy yes 
 
diff --git a/examples/hugoniostat/log.27Nov18.hugoniostat.g++.1 b/examples/hugoniostat/log.27Nov18.hugoniostat.g++.1
index 2473641dea..c1381629eb 100644
--- a/examples/hugoniostat/log.27Nov18.hugoniostat.g++.1
+++ b/examples/hugoniostat/log.27Nov18.hugoniostat.g++.1
@@ -129,7 +129,7 @@ fix myhug all nphug temp 1.0 1.0 10.0 z 40.0 40.0 70.0 drag 0.0 tchain 1 pchain
 
 fix_modify myhug e0 -6334.0 p0 0.0 v0 680.73519
 
-# Add fix energy to ouput etotal
+# Add fix energy to output etotal
 
 fix_modify myhug energy yes
 
@@ -232,7 +232,7 @@ fix myhug all nphug temp 1.0 1.0 1.0 z 40.0 40.0 70.0 drag 200.0 tchain 1 pchain
 
 fix_modify myhug e0 -6334.0 p0 0.0 v0 680.73519
 
-# Add fix energy to ouput etotal
+# Add fix energy to output etotal
 
 fix_modify myhug energy yes
 
@@ -327,7 +327,7 @@ fix myhug all nphug temp 1.0 1.0 1.0 z 40.0 40.0 70.0
 
 fix_modify myhug e0 -6334.0 p0 0.0 v0 680.73519
 
-# Add fix energy to ouput etotal
+# Add fix energy to output etotal
 
 fix_modify myhug energy yes
 
diff --git a/examples/hugoniostat/log.27Nov18.hugoniostat.g++.4 b/examples/hugoniostat/log.27Nov18.hugoniostat.g++.4
index 30f1335ea9..dd0766e81a 100644
--- a/examples/hugoniostat/log.27Nov18.hugoniostat.g++.4
+++ b/examples/hugoniostat/log.27Nov18.hugoniostat.g++.4
@@ -129,7 +129,7 @@ fix myhug all nphug temp 1.0 1.0 10.0 z 40.0 40.0 70.0 drag 0.0 tchain 1 pchain
 
 fix_modify myhug e0 -6334.0 p0 0.0 v0 680.73519
 
-# Add fix energy to ouput etotal
+# Add fix energy to output etotal
 
 fix_modify myhug energy yes
 
@@ -232,7 +232,7 @@ fix myhug all nphug temp 1.0 1.0 1.0 z 40.0 40.0 70.0 drag 200.0 tchain 1 pchain
 
 fix_modify myhug e0 -6334.0 p0 0.0 v0 680.73519
 
-# Add fix energy to ouput etotal
+# Add fix energy to output etotal
 
 fix_modify myhug energy yes
 
@@ -327,7 +327,7 @@ fix myhug all nphug temp 1.0 1.0 1.0 z 40.0 40.0 70.0
 
 fix_modify myhug e0 -6334.0 p0 0.0 v0 680.73519
 
-# Add fix energy to ouput etotal
+# Add fix energy to output etotal
 
 fix_modify myhug energy yes
 
diff --git a/examples/kim/in.kim-pm-property b/examples/kim/in.kim-pm-property
new file mode 100644
index 0000000000..fea1527820
--- /dev/null
+++ b/examples/kim/in.kim-pm-property
@@ -0,0 +1,91 @@
+# kim-property example
+#
+# For detailed information of this example please refer to:
+# https://openkim.org/doc/evaluation/tutorial-lammps/
+#
+# Description:
+#
+# This example is designed to calculate the cohesive energy corresponding to 
+# the equilibrium FCC lattice constant for 
+# `LJ_Shifted_Bernardes_1958MedCutoff_Ar__MO_126566794224_004`  model for 
+# argon.  The material properties computed in LAMMPS are represented as a 
+# standard KIM property instance format. (See 
+# https://openkim.org/doc/schema/properties-framework/ and 
+# https://lammps.sandia.gov/doc/kim_commands.html for further details).
+# Then the created property instance is written to a file named results.edn 
+# using the `kim_property dump` commands.  
+#
+# Requirement:
+# 
+# This example requires LAMMPS built with the Python 3.6 or later package 
+# installed. See the `https://lammps.sandia.gov/doc/python.html` doc page for 
+# more info on building LAMMPS with the version of Python on your system.
+# After successfully building LAMMPS with Python, you need to install the 
+# kim-property Python package, See the 
+# `https://lammps.sandia.gov/doc/Build_extras.html#kim` doc page for 
+# further details.
+#
+# This example requires that the KIM Portable Model (PM)
+# `LJ_Shifted_Bernardes_1958MedCutoff_Ar__MO_126566794224_004`
+# is installed.  This can be done with the command 
+# `kim-api-collections-management install user LJ_Shifted_Bernardes_1958MedCutoff_Ar__MO_126566794224_004`
+# If this command does not work, you may need to setup your PATH to find the utility.
+# If you installed the kim-api using the LAMMPS CMake build, you can do the following
+# (where the current working directory is assumed to be the LAMMPS build directory)
+#   source ./kim_build-prefix/bin/kim-api-activate
+# If you installed the kim-api using the LAMMPS Make build, you can do the following
+# (where the current working directory is assumed to be the LAMMPS src directory)
+#   source ../lib/kim/installed-kim-api-X.Y.Z/bin/kim-api-activate
+# (where you should relplace X.Y.Z with the appropriate kim-api version number).
+#
+# Or, see https://openkim.org/doc/obtaining-models for alternative options.
+#
+
+# Initialize interatomic potential (KIM model) and units
+atom_style atomic
+
+# Set the OpenKIM model that will be used
+kim_init LJ_Shifted_Bernardes_1958MedCutoff_Ar__MO_126566794224_004 metal
+
+# the equilibrium lattice constant for the fcc structure
+variable lattice_constant equal 5.248509056866169
+
+# Periodic boundary conditions along all three dimensions
+boundary p p p
+
+# Create an FCC lattice with the lattice spacing
+# using a single conventional (orthogonal) unit cell
+lattice fcc ${lattice_constant}
+region box block 0 1 0 1 0 1 units lattice
+create_box 1 box
+create_atoms 1 box
+mass 1 39.948
+
+# Specify the KIM interactions
+kim_interactions Ar
+
+# Compute energy
+run 0
+
+# Get cohesive energy
+variable natoms       equal "count(all)"
+variable ecohesive    equal "-pe/v_natoms"
+
+# Create a property instance
+kim_property create 1 cohesive-potential-energy-cubic-crystal
+
+# Set all the key-value pairs for this property instance
+kim_property modify 1 key short-name source-value 1 fcc                          &
+                      key species source-value 1 Ar                              &
+                      key a source-value ${lattice_constant}                     &
+                            source-unit angstrom                                 &
+                      key basis-atom-coordinates source-value 1 1:3 0.0 0.0 0.0  &
+                                                 source-value 2 1:3 0.0 0.5 0.5  &
+                                                 source-value 3 1:3 0.5 0.0 0.5  &
+                                                 source-value 4 1:3 0.5 0.5 0.0  &
+                      key space-group source-value Fm-3m                         &
+                      key cohesive-potential-energy source-value ${ecohesive}    &
+                                                    source-unit eV
+
+# Dump the results in a file
+kim_property dump "results.edn"
diff --git a/examples/numdiff/README.md b/examples/numdiff/README.md
new file mode 100644
index 0000000000..d88f66d65c
--- /dev/null
+++ b/examples/numdiff/README.md
@@ -0,0 +1,13 @@
+# LAMMPS FIX NUMDIFF EXAMPLE
+
+## Numerical Difference Fix
+
+This directory contains the ingredients to run an NVE simulation using the numerical difference fix and calculate error in forces.
+
+Example:
+```
+NP=4 #number of processors
+mpirun -np $NP lmp_mpi -in.numdiff
+```
+
+## Required LAMMPS packages: MOLECULE package
diff --git a/examples/numdiff/in.numdiff b/examples/numdiff/in.numdiff
new file mode 100644
index 0000000000..6c4f99a3be
--- /dev/null
+++ b/examples/numdiff/in.numdiff
@@ -0,0 +1,33 @@
+# Numerical difference calculation of error in forces
+
+units   	metal
+atom_style      atomic
+
+atom_modify map yes
+lattice fcc 5.358000
+region box block 0 6 0 6 0 6
+create_box 1 box
+create_atoms 1 box
+mass 1 39.903
+
+velocity all create 10 2357 mom yes dist gaussian
+
+pair_style lj/cubic
+pair_coeff * * 0.0102701 3.42
+
+neighbor 1 bin
+
+timestep 0.001
+
+fix numdiff all numdiff 200 0.0001
+fix nve all nve
+
+variable errx atom fx-f_numdiff[1]
+variable erry atom fy-f_numdiff[2]
+variable errz atom fz-f_numdiff[3]
+
+write_dump all custom tmp.error f_numdiff[1] f_numdiff[2] f_numdiff[3]
+
+dump forces all custom 200 force_error.dump v_errx v_erry v_errz
+thermo 200
+run 2000
diff --git a/examples/reax/HNS/README.txt b/examples/reax/HNS/README.txt
index 465d64d171..95ffbb0ebb 100644
--- a/examples/reax/HNS/README.txt
+++ b/examples/reax/HNS/README.txt
@@ -17,7 +17,7 @@ Questions: Mitchell Wood, mitwood@sandia.gov
   The type of simulation is set by the 'fix' commands, dynamic charges are controlled with 'fix qeq' and the integration style is given as 'fix nve' here.
   More information about each of the individual commands can be found online at lammps.sandia.gov in the user manual section.
 
-  *There are four free varaibles in this file, three of which control the size of the simulation and the last will dictate how many MD time steps are taken.
+  *There are four free variables in this file, three of which control the size of the simulation and the last will dictate how many MD time steps are taken.
   *The size of the system is controlled by the 'replicate' command given the values of $x, $y and $z.
   *The number of timesteps taken is controlled by the 'run' command given the value of $t
 
diff --git a/lib/Install.py b/lib/Install.py
index d5c41f9ad0..284ef6888b 100644
--- a/lib/Install.py
+++ b/lib/Install.py
@@ -45,8 +45,11 @@ if not args.machine and not args.extramake:
   sys.exit(HELP)
 
 machine = args.machine
-extraflag = not args.extramake
-suffix = args.extramake
+extraflag = args.extramake
+if extraflag:
+    suffix = args.extramake
+else:
+    suffix = 'empty'
 
 # set lib from working dir
 
diff --git a/lib/atc/ATC_Coupling.cpp b/lib/atc/ATC_Coupling.cpp
index 9468064f8d..db72b0cb0c 100644
--- a/lib/atc/ATC_Coupling.cpp
+++ b/lib/atc/ATC_Coupling.cpp
@@ -625,7 +625,7 @@ namespace ATC {
       /*! \page man_consistent_fe_initialization fix_modify AtC consistent_fe_initialization
       \section syntax
        fix_modify AtC consistent_fe_initialization <on | off>
-        - <on|off> = switch to activiate/deactiviate the intial setting of FE intrinsic field to match the projected MD field
+        - <on|off> = switch to activiate/deactiviate the initial setting of FE intrinsic field to match the projected MD field
       \section examples
        <TT> fix_modify atc consistent_fe_initialization on </TT>
       \section description
diff --git a/lib/atc/ATC_Coupling.h b/lib/atc/ATC_Coupling.h
index 3816a82798..9f406febbe 100644
--- a/lib/atc/ATC_Coupling.h
+++ b/lib/atc/ATC_Coupling.h
@@ -227,7 +227,7 @@ namespace ATC {
 
     void set_mass_mat_time_filter(FieldName thisField,TimeFilterManager::FilterIntegrationType filterIntegrationType);
 
-    /** return referece to ExtrinsicModelManager */
+    /** return reference to ExtrinsicModelManager */
     ExtrinsicModelManager & extrinsic_model_manager() 
       { return extrinsicModelManager_; }
     /** access to time integrator */
diff --git a/lib/atc/ATC_CouplingEnergy.cpp b/lib/atc/ATC_CouplingEnergy.cpp
index 0338054902..c3b07c242d 100644
--- a/lib/atc/ATC_CouplingEnergy.cpp
+++ b/lib/atc/ATC_CouplingEnergy.cpp
@@ -364,7 +364,7 @@ namespace ATC {
         (_tiIt_->second)->post_process();
       }
 
-      // auxilliary data
+      // auxiliary data
       for (_tiIt_ = timeIntegrators_.begin(); _tiIt_ != timeIntegrators_.end(); ++_tiIt_) {
         (_tiIt_->second)->output(outputData);
       }
diff --git a/lib/atc/ATC_CouplingMass.cpp b/lib/atc/ATC_CouplingMass.cpp
index 801752d569..d36643e590 100644
--- a/lib/atc/ATC_CouplingMass.cpp
+++ b/lib/atc/ATC_CouplingMass.cpp
@@ -221,7 +221,7 @@ namespace ATC {
         (_tiIt_->second)->post_process();
       }
 
-      // auxilliary data
+      // auxiliary data
       for (_tiIt_ = timeIntegrators_.begin(); _tiIt_ != timeIntegrators_.end(); ++_tiIt_) {
         (_tiIt_->second)->output(outputData);
       }
diff --git a/lib/atc/ATC_CouplingMomentum.cpp b/lib/atc/ATC_CouplingMomentum.cpp
index f59aa525cb..6757245119 100644
--- a/lib/atc/ATC_CouplingMomentum.cpp
+++ b/lib/atc/ATC_CouplingMomentum.cpp
@@ -325,7 +325,7 @@ namespace ATC {
         (_tiIt_->second)->post_process();
       }
 
-      // auxilliary data
+      // auxiliary data
       for (_tiIt_ = timeIntegrators_.begin(); _tiIt_ != timeIntegrators_.end(); ++_tiIt_) {
         (_tiIt_->second)->output(outputData);
       }
diff --git a/lib/atc/ATC_CouplingMomentumEnergy.cpp b/lib/atc/ATC_CouplingMomentumEnergy.cpp
index bf0edc71fb..1fc2931977 100644
--- a/lib/atc/ATC_CouplingMomentumEnergy.cpp
+++ b/lib/atc/ATC_CouplingMomentumEnergy.cpp
@@ -446,7 +446,7 @@ namespace ATC {
         (_tiIt_->second)->post_process();
       }
 
-      // auxilliary data
+      // auxiliary data
       
       for (_tiIt_ = timeIntegrators_.begin(); _tiIt_ != timeIntegrators_.end(); ++_tiIt_) {
         (_tiIt_->second)->output(outputData);
diff --git a/lib/atc/ATC_Method.cpp b/lib/atc/ATC_Method.cpp
index 5d61a7bed8..f2173e9575 100644
--- a/lib/atc/ATC_Method.cpp
+++ b/lib/atc/ATC_Method.cpp
@@ -693,12 +693,12 @@ pecified
       /*! \page man_boundary fix_modify AtC boundary 
         \section syntax
         fix_modify AtC boundary type <atom-type-id>
-        - <atom-type-id> = type id for atoms that represent a ficticious
+        - <atom-type-id> = type id for atoms that represent a fictitious
         boundary internal to the FE mesh
         \section examples
         <TT> fix_modify AtC boundary type ghost_atoms </TT>
         \section description
-        Command to define the atoms that represent the ficticious 
+        Command to define the atoms that represent the fictitious
         boundary internal to the FE mesh. For fully overlapped MD/FE 
         domains with periodic boundary conditions no boundary atoms should
         be defined.
diff --git a/lib/atc/ATC_Transfer.cpp b/lib/atc/ATC_Transfer.cpp
index c876f46634..833e1d1f27 100644
--- a/lib/atc/ATC_Transfer.cpp
+++ b/lib/atc/ATC_Transfer.cpp
@@ -148,7 +148,7 @@ namespace ATC {
     }
 
     if (!initialized_ || ATC::LammpsInterface::instance()->atoms_sorted() || resetKernelFunction_) {
-      // initialize kernel funciton matrix N_Ia
+      // initialize kernel function matrix N_Ia
       if (! kernelOnTheFly_) {
         try{
           if (!moleculeIds_.empty()) compute_kernel_matrix_molecule(); //KKM add
@@ -654,7 +654,7 @@ namespace ATC {
         <TT> fix_modify AtC gradients add temperature velocity stress </TT> \n
         <TT> fix_modify AtC gradients delete velocity </TT> \n
         \section description
-        Requests calculation and ouput of gradients of the fields from the 
+        Requests calculation and output of gradients of the fields from the
         transfer class. These gradients will be with regard to spatial or material
         coordinate for eulerian or lagrangian analysis, respectively, as specified by 
         atom_element_map (see \ref man_atom_element_map )
@@ -698,7 +698,7 @@ namespace ATC {
         <TT> fix_modify AtC rates add temperature velocity stress </TT> \n
         <TT> fix_modify AtC rates delete stress </TT> \n
         \section description
-        Requests calculation and ouput of rates (time derivatives) of the fields from the 
+        Requests calculation and output of rates (time derivatives) of the fields from the
         transfer class. For eulerian analysis (see \ref man_atom_element_map ), these rates
         are the partial time derivatives of the nodal fields, not the full (material) time
         derivatives. \n
@@ -865,7 +865,7 @@ namespace ATC {
   }
 
   //-------------------------------------------------------------------
-  // called at the begining of second half timestep
+  // called at the beginning of second half timestep
   // REFACTOR move this to post_neighbor
   void ATC_Transfer::pre_final_integrate()
   {
diff --git a/lib/atc/AtomToMoleculeTransfer.h b/lib/atc/AtomToMoleculeTransfer.h
index c6523137a7..c628ee356f 100644
--- a/lib/atc/AtomToMoleculeTransfer.h
+++ b/lib/atc/AtomToMoleculeTransfer.h
@@ -217,7 +217,7 @@ namespace ATC {
     /** reference to shape function matrix */
     SPAR_MAN * shapeFunction_;
 
-    /** persistant workspace */
+    /** persistent workspace */
     
     
     mutable DENS_MAT _workspace_;
diff --git a/lib/atc/AtomicRegulator.h b/lib/atc/AtomicRegulator.h
index 8fb7de1006..b9fccb902c 100644
--- a/lib/atc/AtomicRegulator.h
+++ b/lib/atc/AtomicRegulator.h
@@ -585,7 +585,7 @@ namespace ATC {
         
   protected:
 
-    /** lumped version of the matrix governing lamda */
+    /** lumped version of the matrix governing lambda */
     DIAG_MAT lumpedMatrix_;
 
     /** set of regulated nodes */
diff --git a/lib/atc/CbPotential.h b/lib/atc/CbPotential.h
index e218ae2254..1d5386fcd5 100644
--- a/lib/atc/CbPotential.h
+++ b/lib/atc/CbPotential.h
@@ -7,7 +7,7 @@ namespace ATC
     enum Interaction{PAIRWISE=1, EAM=2, THREE_BDY=4, ANGLE_BND=8};
     //! Booleans that enable types of terms the potential uses.
     struct Interactions {
-      //! Enables up to 3 interaction types.  (order independant)
+      //! Enables up to 3 interaction types.  (order independent)
       Interactions(int a=0, int b=0, int c=0);
       bool pairwise;      //!< Pairwise interaction terms exist.
       bool embedding;     //!< Embedding interaction terms (EAM) exist.
diff --git a/lib/atc/ChargeRegulator.cpp b/lib/atc/ChargeRegulator.cpp
index cbfda69480..bae78a7613 100644
--- a/lib/atc/ChargeRegulator.cpp
+++ b/lib/atc/ChargeRegulator.cpp
@@ -214,7 +214,7 @@ namespace ATC {
     qV2e_ = lammpsInterface_->qv2e();
     qqrd2e_ = lammpsInterface_->qqrd2e();
 
-    // note derived method set intialized to true
+    // note derived method set initialized to true
   }
 
   
@@ -327,7 +327,7 @@ namespace ATC {
 
 
 //
-    if (nInfluenceNodes_ < nControlNodes_) throw ATC_Error(" least square not implmented ");
+    if (nInfluenceNodes_ < nControlNodes_) throw ATC_Error(" least square not implemented ");
     if (nInfluenceNodes_ > nControlNodes_) throw ATC_Error(" solve not possible ");
     DENS_MAT G(nInfluenceNodes_,nControlNodes_); 
     DENS_VEC G_I;
diff --git a/lib/atc/ConcentrationRegulator.cpp b/lib/atc/ConcentrationRegulator.cpp
index 8055433f5d..4255b919b9 100644
--- a/lib/atc/ConcentrationRegulator.cpp
+++ b/lib/atc/ConcentrationRegulator.cpp
@@ -263,7 +263,7 @@ const double kMinScale_ = 10000.;
       volumes_(i) += volumes_(i-1);
     } 
 
-    // record orginal energetic properties
+    // record original energetic properties
     int ntypes = lammpsInterface_->ntypes();
     epsilon0_.reset(ntypes);
     p_ = lammpsInterface_->potential();
diff --git a/lib/atc/DiagonalMatrix.h b/lib/atc/DiagonalMatrix.h
index 6c2fe23144..ca3001f225 100644
--- a/lib/atc/DiagonalMatrix.h
+++ b/lib/atc/DiagonalMatrix.h
@@ -472,7 +472,7 @@ inline DiagonalMatrix<double> inv(const DiagonalMatrix<double>& A)
   return A.inv();
 }
 //-----------------------------------------------------------------------------
-// general diagonalmatrix assigment 
+// general diagonalmatrix assignment
 //-----------------------------------------------------------------------------
 template<typename T>
 void DiagonalMatrix<T>::_set_equal(const Matrix<T> &r)
diff --git a/lib/atc/ElasticTimeIntegrator.cpp b/lib/atc/ElasticTimeIntegrator.cpp
index 9793f6a58e..5e11f1584c 100644
--- a/lib/atc/ElasticTimeIntegrator.cpp
+++ b/lib/atc/ElasticTimeIntegrator.cpp
@@ -91,7 +91,7 @@ namespace ATC {
             atc_->set_mass_mat_time_filter(MOMENTUM,TimeFilterManager::EXPLICIT_IMPLICIT);
             break;
           default:
-            throw ATC_Error("Uknown time integration type in ThermalTimeIntegrator::Initialize()");
+            throw ATC_Error("Unknown time integration type in ThermalTimeIntegrator::Initialize()");
         }
       }
 
@@ -102,7 +102,7 @@ namespace ATC {
             break;
           }
         default:
-          throw ATC_Error("Uknown time integration type in MomentumTimeIntegrator::Initialize()");
+          throw ATC_Error("Unknown time integration type in MomentumTimeIntegrator::Initialize()");
         }
       }
       else {
@@ -120,7 +120,7 @@ namespace ATC {
             break;
           }
         default:
-          throw ATC_Error("Uknown time integration type in MomentumTimeIntegrator::Initialize()");
+          throw ATC_Error("Unknown time integration type in MomentumTimeIntegrator::Initialize()");
         }
       }   
     }
diff --git a/lib/atc/ElectronHeatFlux.h b/lib/atc/ElectronHeatFlux.h
index 41c89d6c6d..d0bc2a44f2 100644
--- a/lib/atc/ElectronHeatFlux.h
+++ b/lib/atc/ElectronHeatFlux.h
@@ -126,7 +126,7 @@ namespace ATC {
   /**
    *  @class  ElectronHeatFluxThermopower
    *  @brief  Class for an electron heat flux proportional to the temperature gradient but with a condu
-ctivity proportional to the ratio of the electron and phonon temperatures with the thermopower from teh electric current included
+ctivity proportional to the ratio of the electron and phonon temperatures with the thermopower from the electric current included
    */  
   
   class ElectronHeatFluxThermopower : public ElectronHeatFlux
diff --git a/lib/atc/ExtrinsicModelElectrostatic.cpp b/lib/atc/ExtrinsicModelElectrostatic.cpp
index b10e77a306..ef3aa52dee 100644
--- a/lib/atc/ExtrinsicModelElectrostatic.cpp
+++ b/lib/atc/ExtrinsicModelElectrostatic.cpp
@@ -144,7 +144,7 @@ namespace ATC {
       }
     }
 
-    /** switch to account for short range interaces */
+    /** switch to account for short range interfaces */
     else if (strcmp(arg[argIndx],"short_range")==0) {
       argIndx++;
       if (strcmp(arg[argIndx],"on")==0) {
diff --git a/lib/atc/ExtrinsicModelElectrostatic.h b/lib/atc/ExtrinsicModelElectrostatic.h
index c4a0af464d..86cba31471 100644
--- a/lib/atc/ExtrinsicModelElectrostatic.h
+++ b/lib/atc/ExtrinsicModelElectrostatic.h
@@ -92,7 +92,7 @@ namespace ATC {
     /** rhs mask for Poisson solver */
     Array2D<bool> rhsMask_;
   
-    /** estimate instrinsic charge density */
+    /** estimate intrinsic charge density */
     void add_electrostatic_forces(MATRIX & nodalPotential);
 
     /** correct short range FE electric field */
diff --git a/lib/atc/FE_Element.cpp b/lib/atc/FE_Element.cpp
index 9eec08c483..0d2fc036c7 100644
--- a/lib/atc/FE_Element.cpp
+++ b/lib/atc/FE_Element.cpp
@@ -408,7 +408,7 @@ static const double localCoordinatesTolerance = 1.e-09;
       throw ATC_Error("Unrecognized interpolation order specified " 
                       "for element class: \n"                       
                       "  element only knows how to construct lin "  
-                        "and quad elments.");
+                        "and quad elements.");
     }
 
     localCoords_.resize(nSD_,numNodes_);
@@ -637,7 +637,7 @@ static const double localCoordinatesTolerance = 1.e-09;
       throw ATC_Error("Unrecognized interpolation order specified " 
                       "for element class: \n"                       
                       "  element only knows how to construct lin "  
-                        "and quad elments.");
+                        "and quad elements.");
     }
     
     localCoords_.resize(nSD_+1, numNodes_);
diff --git a/lib/atc/FE_Engine.cpp b/lib/atc/FE_Engine.cpp
index bef135a5f2..5e01709b19 100644
--- a/lib/atc/FE_Engine.cpp
+++ b/lib/atc/FE_Engine.cpp
@@ -349,7 +349,7 @@ namespace ATC{
         else throw ATC_Error("not enough element partitions");
       }
     }
-    // each segment of the piecewise funcion is length-normalized separately
+    // each segment of the piecewise function is length-normalized separately
     else if (strcmp(arg[argIdx],"position-number-density")==0) { 
       argIdx++;
       double *y = new double[nx];
diff --git a/lib/atc/FE_Engine.h b/lib/atc/FE_Engine.h
index 18dae0e6b4..eb59f04eef 100644
--- a/lib/atc/FE_Engine.h
+++ b/lib/atc/FE_Engine.h
@@ -510,7 +510,7 @@ namespace ATC {
     /** finite element mesh */
     FE_Mesh *feMesh_;
 
-    /** auxillary kernel function */
+    /** auxiliary kernel function */
     KernelFunction *kernelFunction_;
  
     /** initialized flag */ 
diff --git a/lib/atc/FE_Interpolate.cpp b/lib/atc/FE_Interpolate.cpp
index 19753a8007..5e5bd5ecf1 100644
--- a/lib/atc/FE_Interpolate.cpp
+++ b/lib/atc/FE_Interpolate.cpp
@@ -564,7 +564,7 @@ namespace ATC {
     
     N = 1.0;
     dNdr = 1.0;
-    // mapping returns the 1d nodes in each dimension that sould be multiplied
+    // mapping returns the 1d nodes in each dimension that should be multiplied
     // to achieve the shape functions in 3d
     vector<int> mapping(nSD_);
     for (int inode=0; inode<numEltNodes; ++inode) {
@@ -890,7 +890,7 @@ namespace ATC {
    *
    * Note: degenerating quads/hexes can yield simplices
    *       as well, but this class is for computing these
-   *       shape fucntions _natively_, in their own
+   *       shape functions _natively_, in their own
    *       triangular/tetrahedral coordinate systems.
    *
    *********************************************************/
diff --git a/lib/atc/FieldEulerIntegrator.h b/lib/atc/FieldEulerIntegrator.h
index c7b79f85d9..fc3863311c 100644
--- a/lib/atc/FieldEulerIntegrator.h
+++ b/lib/atc/FieldEulerIntegrator.h
@@ -158,7 +158,7 @@ class FieldImplicitDirectEulerIntegrator : public FieldEulerIntegrator {
   /** Destructor */
   virtual ~FieldImplicitDirectEulerIntegrator();
 
-  /** initalize - init the matrices and inverses */
+  /** initialize - init the matrices and inverses */
   void initialize(const double dt, const double time,
     FIELDS & fields);
 
diff --git a/lib/atc/FundamentalAtomicQuantity.h b/lib/atc/FundamentalAtomicQuantity.h
index 6561b8112d..5fb525cd6f 100644
--- a/lib/atc/FundamentalAtomicQuantity.h
+++ b/lib/atc/FundamentalAtomicQuantity.h
@@ -167,7 +167,7 @@ namespace ATC {
     // destructor
     virtual ~ComputedAtomQuantity() {};
 
-    /** resets compute, must be this way to accomodate atom sorting between runs */
+    /** resets compute, must be this way to accommodate atom sorting between runs */
     virtual void post_exchange() {this->needReset_ = true;};
 
     /** specialized reset to account for forcing lammps to perform the compute */
diff --git a/lib/atc/GhostManager.cpp b/lib/atc/GhostManager.cpp
index 3c9e54b4f5..77594ec406 100644
--- a/lib/atc/GhostManager.cpp
+++ b/lib/atc/GhostManager.cpp
@@ -523,7 +523,7 @@ namespace ATC {
   {
      compute_distances();
      int nlayers = find_layers();
-     if (nlayers > ((int)gamma_.size())) throw ATC_Error("GhostModifierDampedHarmonicLayers::initialize not enough damping factors specfied " + to_string(gamma_.size()));
+     if (nlayers > ((int)gamma_.size())) throw ATC_Error("GhostModifierDampedHarmonicLayers::initialize not enough damping factors specified " + to_string(gamma_.size()));
   }
 
   //--------------------------------------------------------
diff --git a/lib/atc/InterscaleOperators.cpp b/lib/atc/InterscaleOperators.cpp
index 0e218bdef4..f1e5607b6e 100644
--- a/lib/atc/InterscaleOperators.cpp
+++ b/lib/atc/InterscaleOperators.cpp
@@ -157,7 +157,7 @@ namespace ATC{
     bool isTemporary = (quantity->memory_type()==TEMPORARY);
     
     for (it = (quantity->dependentQuantities_).begin(); it != (quantity->dependentQuantities_).end(); it++) {
-      // make sure that if quantity isn't persistent, none of it's depedencies are
+      // make sure that if quantity isn't persistent, none of it's dependencies are
       if ((*it)->memory_type()==PERSISTENT && isTemporary) {
         throw ATC_Error("InterscaleManager::dfs_visit - a persistent quantity has a temporary dependency");
       }
diff --git a/lib/atc/InterscaleOperators.h b/lib/atc/InterscaleOperators.h
index 0ddca1dc67..3a4d81212e 100644
--- a/lib/atc/InterscaleOperators.h
+++ b/lib/atc/InterscaleOperators.h
@@ -245,19 +245,19 @@ namespace ATC {
     /** container for molecule sets */
     std::map<std::string, SmallMoleculeSet * > smallMoleculeSets_;
 
-    /** container for atomic quantities which must be transfered when atoms cross processors */
+    /** container for atomic quantities which must be transferred when atoms cross processors */
     std::set<PerAtomQuantity<double> *> exchangeList_;
 
-    /** container for atomic quantities which must be transfered to ghost atoms on other processors */
+    /** container for atomic quantities which must be transferred to ghost atoms on other processors */
     std::vector<PerAtomQuantity<double> *> commList_;
 
-    /** container for integer atomic quantities which must be transfered to ghost atoms on other processors */
+    /** container for integer atomic quantities which must be transferred to ghost atoms on other processors */
     std::vector<PerAtomQuantity<int> *> commIntList_;
 
-    /** container for atomic diagonal matrices which must be transfered to ghost atoms on other processors */
+    /** container for atomic diagonal matrices which must be transferred to ghost atoms on other processors */
     std::vector<PerAtomDiagonalMatrix<double> *> commDmList_;
 
-    /** container for atomic sparse matrices which must be transfered to ghost atoms on other processors */
+    /** container for atomic sparse matrices which must be transferred to ghost atoms on other processors */
     std::vector<PerAtomSparseMatrix<double> *> commSmList_;
 
     /** prefix for labeling associated lammps arrays */
@@ -329,7 +329,7 @@ namespace ATC {
         (it->second)->set_memory_type(TEMPORARY);
     }
 
-    /** helper function to perform intialization for dfs of a list */
+    /** helper function to perform initialization for dfs of a list */
     template <typename data>
     void dfs_prepare_loop(std::map<std::string,data * > & list)
     {
diff --git a/lib/atc/KinetoThermostat.h b/lib/atc/KinetoThermostat.h
index 6f7d113734..bc40f19ed1 100644
--- a/lib/atc/KinetoThermostat.h
+++ b/lib/atc/KinetoThermostat.h
@@ -607,7 +607,7 @@ namespace ATC {
 /*     /\** change in restricted atomic FE energy over a timestep *\/ */
 /*     DENS_MAT deltaNodalAtomicEnergy_; */
 
-/*     /\** intial restricted atomic FE energy used to compute change *\/ */
+/*     /\** initial restricted atomic FE energy used to compute change *\/ */
 /*     DENS_MAT initialNodalAtomicEnergy_; */
 
 /*     /\** filtered nodal atomic energy *\/ */
diff --git a/lib/atc/Kinetostat.cpp b/lib/atc/Kinetostat.cpp
index 8093d5925a..7f95398dcb 100644
--- a/lib/atc/Kinetostat.cpp
+++ b/lib/atc/Kinetostat.cpp
@@ -2233,7 +2233,7 @@ namespace ATC {
   //  initialize_delta_nodal_atomic_momentum:
   //    initializes storage for the variable tracking
   //    the change in the nodal atomic momentum
-  //    that has occured over the past timestep
+  //    that has occurred over the past timestep
   //--------------------------------------------------------
   void KinetostatFixed::initialize_delta_nodal_atomic_momentum(double dt)
   {
@@ -2248,7 +2248,7 @@ namespace ATC {
   //--------------------------------------------------------
   //  compute_delta_nodal_atomic_momentum:
   //    computes the change in the nodal atomic momentum
-  //    that has occured over the past timestep
+  //    that has occurred over the past timestep
   //--------------------------------------------------------
   void KinetostatFixed::compute_delta_nodal_atomic_momentum(double dt)
   {
diff --git a/lib/atc/Kinetostat.h b/lib/atc/Kinetostat.h
index 691b929e9f..e3e1c17e52 100644
--- a/lib/atc/Kinetostat.h
+++ b/lib/atc/Kinetostat.h
@@ -806,7 +806,7 @@ namespace ATC {
     /** change in restricted atomic FE momentum over a timestep */
     DENS_MAT deltaNodalAtomicMomentum_;
 
-    /** intial restricted atomic FE momentum used to compute change */
+    /** initial restricted atomic FE momentum used to compute change */
     DENS_MAT initialNodalAtomicMomentum_;
 
     /** filtered nodal atomic momentum */
diff --git a/lib/atc/LammpsInterface.cpp b/lib/atc/LammpsInterface.cpp
index 9c2223f555..9964a1c4bb 100644
--- a/lib/atc/LammpsInterface.cpp
+++ b/lib/atc/LammpsInterface.cpp
@@ -631,7 +631,7 @@ LammpsInterface::LatticeType LammpsInterface::lattice_style() const
     throw ATC_Error("Lattice has not been defined");
 }
 
-//* retuns the number of basis vectors 
+//* returns the number of basis vectors
 int LammpsInterface::n_basis() const
 {
   return lammps_->domain->lattice->nbasis;
diff --git a/lib/atc/Material.h b/lib/atc/Material.h
index 18cccd8792..5a835d446b 100644
--- a/lib/atc/Material.h
+++ b/lib/atc/Material.h
@@ -83,7 +83,7 @@ namespace ATC
 
     /** each of these is a field function computed at a set of points */
     /** if there is only one function it is in the base class 
-     ** otherwise, a subsidary class is setup */
+     ** otherwise, a subsidiary class is setup */
     /* -----------------------------------------------------------------*/
     /** densities */
     /* -----------------------------------------------------------------*/
diff --git a/lib/atc/Matrix.cpp b/lib/atc/Matrix.cpp
index 0741099872..1b77796b8b 100644
--- a/lib/atc/Matrix.cpp
+++ b/lib/atc/Matrix.cpp
@@ -81,7 +81,7 @@ DenseMatrix<double> inv(const MATRIX& A)
   GCK(A,A,info<0,"DenseMatrix::inv() dgetri error: Argument had bad value.");
   GCHK(info>0,"DenseMatrix::inv() dgetri error: Matrix not invertible.");
   
-  // Work size query succeded
+  // Work size query succeeded
   lwork = (int)work_dummy[0];  
   double *work = new double[lwork];    // Allocate vector of appropriate size
 
@@ -287,7 +287,7 @@ double det(const MATRIX& A)
 double max_eigenvalue(const Matrix<double>& A)
 {
 
-  GCK(A,A,!A.is_size(3,3), "max_eigenvalue only implimented for 3x3");
+  GCK(A,A,!A.is_size(3,3), "max_eigenvalue only implemented for 3x3");
   const double c0 = det(A);
   const double c1 = A(1,0)*A(0,1) + A(2,0)*A(0,2) + A(1,2)*A(2,1) 
                   - A(0,0)*A(1,1) - A(0,0)*A(2,2) - A(1,1)*A(2,2);
diff --git a/lib/atc/Matrix.h b/lib/atc/Matrix.h
index 6745ea96db..c93576518c 100644
--- a/lib/atc/Matrix.h
+++ b/lib/atc/Matrix.h
@@ -150,7 +150,7 @@ protected:
 
 //* Matrix operations 
 //@{
-//* Sets C as b*C + a*A[tranpose?]*B[transpose?] 
+//* Sets C as b*C + a*A[transpose?]*B[transpose?]
 template<typename T>
 void MultAB(const Matrix<T> &A, const Matrix<T> &B, DenseMatrix<T> &C, 
             bool At=0, bool Bt=0, T a=1, T b=0);
@@ -622,7 +622,7 @@ Matrix<T>& Matrix<T>::operator+=(const T v)
   return *this;
 }
 //-----------------------------------------------------------------------------
-// substracts a constant to this matrix 
+// subtracts a constant to this matrix
 //-----------------------------------------------------------------------------
 template<typename T>
 Matrix<T>& Matrix<T>::operator-=(const T v)       
diff --git a/lib/atc/PhysicsModel.cpp b/lib/atc/PhysicsModel.cpp
index 77cc41e972..f5c342c5a0 100644
--- a/lib/atc/PhysicsModel.cpp
+++ b/lib/atc/PhysicsModel.cpp
@@ -95,7 +95,7 @@ void PhysicsModel::parse_material_file(string fileName)
         }
       }
       else {
-        throw ATC_Error("units need to be specfied in material file"); 
+        throw ATC_Error("units need to be specified in material file");
       }
     }
   }
diff --git a/lib/atc/SparseMatrix.h b/lib/atc/SparseMatrix.h
index 35393187cd..700d2f3af6 100644
--- a/lib/atc/SparseMatrix.h
+++ b/lib/atc/SparseMatrix.h
@@ -38,9 +38,9 @@ class SparseMatrix : public Matrix<T>
   friend SparseMatrix<T> operator*<T>(const SparseMatrix<T> &A, const DiagonalMatrix<T>& D);
   //* SparseMatrix-SparseMatrix multiplication (S * S)
   friend SparseMatrix<T> operator*<T>(const SparseMatrix<T> &A, const SparseMatrix<T> &B);
-  //* computes the product of a SparseMatrix tranpose with a SparseVector (M'*v).
+  //* computes the product of a SparseMatrix transpose with a SparseVector (M'*v).
   friend SparseVector<T> operator*<T>(const SparseMatrix<T> &M, const SparseVector<T> &v);
-  //* computes the product of a SparseMatrix tranpose with a SparseVector (M'*v).
+  //* computes the product of a SparseMatrix transpose with a SparseVector (M'*v).
   friend SparseVector<T> operator*<T>(const SparseVector<T> &v, const SparseMatrix<T> &M);
 
   template<typename U>
diff --git a/lib/atc/SparseVector-inl.h b/lib/atc/SparseVector-inl.h
index 760eb66f58..7f2c844bd6 100644
--- a/lib/atc/SparseVector-inl.h
+++ b/lib/atc/SparseVector-inl.h
@@ -55,7 +55,7 @@ T dot(const SparseVector<T> &a, const SparseVector<T> &b)
   } 
   return v;
 }
-// Computes the product of a SparseMatrix tranpose with a SparseVector (M'*v).
+// Computes the product of a SparseMatrix transpose with a SparseVector (M'*v).
 template<class T>
 SparseVector<T> operator*(const SparseMatrix<T> &M, const SparseVector<T> &v)
 {
@@ -73,7 +73,7 @@ SparseVector<T> operator*(const SparseMatrix<T> &M, const SparseVector<T> &v)
   return y; 
 }
 
-// computes the product of a SparseMatrix tranpose with a SparseVector (M'*v).
+// computes the product of a SparseMatrix transpose with a SparseVector (M'*v).
 template<class T>
 SparseVector<T> operator*(const SparseVector<T> &v, const SparseMatrix<T> &M)
 {
diff --git a/lib/atc/SparseVector.h b/lib/atc/SparseVector.h
index 4219bb2627..5cb16af527 100644
--- a/lib/atc/SparseVector.h
+++ b/lib/atc/SparseVector.h
@@ -30,9 +30,9 @@ class SparseVector : public Vector<T> {
   // for use with gcc
   friend T dot<T>(const SparseVector<T> &a, const SparseVector<T> &b);
 #endif
-  //* computes the product of a SparseMatrix tranpose with a SparseVector (M'*v).
+  //* computes the product of a SparseMatrix transpose with a SparseVector (M'*v).
   friend SparseVector<T> operator*<T>(const SparseMatrix<T> &M, const SparseVector<T> &v);
-  //* computes the product of a SparseMatrix tranpose with a SparseVector (M'*v).
+  //* computes the product of a SparseMatrix transpose with a SparseVector (M'*v).
   friend SparseVector<T> operator*<T>(const SparseVector<T> &v, const SparseMatrix<T> &M);
 public:
   //* Constructor - sets length of vector (NOT # of nonzeros).
@@ -71,9 +71,9 @@ public:
   void reset (INDEX nRows, INDEX nCols=1, bool zero=0);
   //* zeros out all elements while preserving sparcity pattern
   void zero();
-  //* TODO impliment copy (or maybe not necessary)
+  //* TODO implement copy (or maybe not necessary)
   void copy(const T* ptr, INDEX nRows, INDEX nCols=1);
-  //* Writes a restart file (TODO impliment this if needed/wanted).
+  //* Writes a restart file (TODO implement this if needed/wanted).
   void write_restart(FILE *F) const;
   //* Adds SparseVector x, scaled by s to this one.  Can be different sparcity.
   void add_scaled(SparseVector<T>& x, const T& s);
diff --git a/lib/atc/Stress.cpp b/lib/atc/Stress.cpp
index 906b15986e..72656c21ed 100644
--- a/lib/atc/Stress.cpp
+++ b/lib/atc/Stress.cpp
@@ -328,7 +328,7 @@ StressCauchyBorn::StressCauchyBorn(fstream &fileId, CbData &cb)
           if (line.size() && line[0]=="pair_coeff") break;
         }
         if (line[0] != "pair_coeff" || line.size() != 3) {
-          throw(ATC_Error("lj/cut needs 2 coefficents"));
+          throw(ATC_Error("lj/cut needs 2 coefficients"));
         }
         delete potential_;
         potential_ = new CbLjCut(str2dbl(line[1]), str2dbl(line[2]), rc);
@@ -341,7 +341,7 @@ StressCauchyBorn::StressCauchyBorn(fstream &fileId, CbData &cb)
           if (line.size() && line[0]=="pair_coeff") break;
         }
         if (line[0] != "pair_coeff" || line.size() != 3) {
-          throw(ATC_Error("lj/smooth/linear needs 2 coefficents"));
+          throw(ATC_Error("lj/smooth/linear needs 2 coefficients"));
         }
         delete potential_;
         potential_ = new CbLjSmoothLinear(str2dbl(line[1]), str2dbl(line[2]), rc);
diff --git a/lib/atc/ThermalTimeIntegrator.cpp b/lib/atc/ThermalTimeIntegrator.cpp
index f68f46b01f..e74d46a20c 100644
--- a/lib/atc/ThermalTimeIntegrator.cpp
+++ b/lib/atc/ThermalTimeIntegrator.cpp
@@ -87,7 +87,7 @@ namespace ATC {
             break;
           }
           default:
-            throw ATC_Error("Uknown time integration type in ThermalTimeIntegrator::Initialize()");
+            throw ATC_Error("Unknown time integration type in ThermalTimeIntegrator::Initialize()");
         }
       }
       
@@ -102,7 +102,7 @@ namespace ATC {
             break;
           }
         default:
-          throw ATC_Error("Uknown time integration type in ThermalTimeIntegrator::Initialize()");
+          throw ATC_Error("Unknown time integration type in ThermalTimeIntegrator::Initialize()");
         }
       }
       else {
@@ -116,7 +116,7 @@ namespace ATC {
             break;
           }
         default:
-          throw ATC_Error("Uknown time integration type in ThermalTimeIntegrator::Initialize()");
+          throw ATC_Error("Unknown time integration type in ThermalTimeIntegrator::Initialize()");
         }
       }
     }
diff --git a/lib/atc/ThermalTimeIntegrator.h b/lib/atc/ThermalTimeIntegrator.h
index f0ce73b9b4..8f5175d8a2 100644
--- a/lib/atc/ThermalTimeIntegrator.h
+++ b/lib/atc/ThermalTimeIntegrator.h
@@ -273,7 +273,7 @@ namespace ATC {
     /** change in FE temperature due to atomic motions */
     DENS_MAN atomicTemperatureDelta_;
 
-    /** fractional step auxilliary storage for restricted atomic energy */
+    /** fractional step auxiliary storage for restricted atomic energy */
     DENS_MAN * nodalAtomicEnergy_;
 
     /** power associated with thermostat for post-processing */
diff --git a/lib/atc/Thermostat.cpp b/lib/atc/Thermostat.cpp
index 0ede724371..a602105854 100644
--- a/lib/atc/Thermostat.cpp
+++ b/lib/atc/Thermostat.cpp
@@ -1460,7 +1460,7 @@ namespace ATC {
   //  initialize_delta_nodal_atomic_energy:
   //    initializes storage for the variable tracking
   //    the change in the nodal atomic energy
-  //    that has occured over the past timestep
+  //    that has occurred over the past timestep
   //--------------------------------------------------------
   void ThermostatIntegratorFixed::initialize_delta_nodal_atomic_energy(double dt)
   {
@@ -1475,7 +1475,7 @@ namespace ATC {
   //--------------------------------------------------------
   //  compute_delta_nodal_atomic_energy:
   //    computes the change in the nodal atomic energy
-  //    that has occured over the past timestep
+  //    that has occurred over the past timestep
   //--------------------------------------------------------
   void ThermostatIntegratorFixed::compute_delta_nodal_atomic_energy(double dt)
   {
@@ -1778,7 +1778,7 @@ namespace ATC {
   //  initialize_delta_nodal_atomic_energy:
   //    initializes storage for the variable tracking
   //    the change in the nodal atomic energy
-  //    that has occured over the past timestep
+  //    that has occurred over the past timestep
   //--------------------------------------------------------
   
   
@@ -1795,7 +1795,7 @@ namespace ATC {
   //--------------------------------------------------------
   //  compute_delta_nodal_atomic_energy:
   //    computes the change in the nodal atomic energy
-  //    that has occured over the past timestep
+  //    that has occurred over the past timestep
   //--------------------------------------------------------
   void ThermostatIntegratorFixedFiltered::compute_delta_nodal_atomic_energy(double dt)
   {
diff --git a/lib/atc/Thermostat.h b/lib/atc/Thermostat.h
index 95d2d1162d..3764d0b835 100644
--- a/lib/atc/Thermostat.h
+++ b/lib/atc/Thermostat.h
@@ -581,7 +581,7 @@ namespace ATC {
     /** change in restricted atomic FE energy over a timestep */
     DENS_MAT deltaNodalAtomicEnergy_;
 
-    /** intial restricted atomic FE energy used to compute change */
+    /** initial restricted atomic FE energy used to compute change */
     DENS_MAT initialNodalAtomicEnergy_;
 
     /** filtered nodal atomic energy */
diff --git a/lib/atc/TimeIntegrator.h b/lib/atc/TimeIntegrator.h
index ceeb7610fb..ccb9b9f426 100644
--- a/lib/atc/TimeIntegrator.h
+++ b/lib/atc/TimeIntegrator.h
@@ -362,7 +362,7 @@ namespace ATC {
   inline void explicit_1(MATRIX & f,
                          const MATRIX & dot_f,
                          double dt)
-  // 1rst order explict ODE update
+  // 1rst order explicit ODE update
   {
     f = f + dt*dot_f;
   };
@@ -371,7 +371,7 @@ namespace ATC {
                          const MATRIX & dot_f,
                          const MATRIX & ddot_f,
                          double dt)
-  // 2nd order explict ODE update
+  // 2nd order explicit ODE update
   {
     f = f + dt*dot_f + .5*dt*dt*ddot_f;
   };
diff --git a/lib/atc/TransferOperator.h b/lib/atc/TransferOperator.h
index 0ab92805be..5f776d04ca 100644
--- a/lib/atc/TransferOperator.h
+++ b/lib/atc/TransferOperator.h
@@ -466,7 +466,7 @@ namespace ATC {
     /** reference to shape function matrix */
     SPAR_MAN * shapeFunction_;
 
-    /** persistant workspace */
+    /** persistent workspace */
     
     
     mutable DENS_MAT _workspace_;
@@ -510,7 +510,7 @@ namespace ATC {
     /** reference to shape function matrix */
     SPAR_MAN * shapeFunction_;
 
-    /** persistant workspace */
+    /** persistent workspace */
     
     
     mutable DENS_MAT _workspace_;
@@ -560,7 +560,7 @@ namespace ATC {
     DIAG_MAN * weights_;
     DENS_MAT * reference_;
 
-    /** persistant workspace */
+    /** persistent workspace */
     
     
     mutable DENS_MAT _workspace_;
@@ -887,7 +887,7 @@ namespace ATC {
     /** pointer to the mesh being used */
     const FE_Mesh * feMesh_;
 
-    /** persistant workspace */
+    /** persistent workspace */
     
     
     mutable DENS_MAT _workspace_;
diff --git a/lib/awpmd/ivutils/include/logexc.h b/lib/awpmd/ivutils/include/logexc.h
index 4c8364671a..80942f60bf 100644
--- a/lib/awpmd/ivutils/include/logexc.h
+++ b/lib/awpmd/ivutils/include/logexc.h
@@ -42,7 +42,7 @@ enum vbLEVELS{
 /// by default all exceptions have vblFATAL level
 template<class exc_t>
 struct log_exception_traits{
-  /// exeption level according to the vbLEVELS
+  /// exception level according to the vbLEVELS
   static int level(const exc_t & /* signal */){ return vblFATAL; } 
   /// the string name of exception category
   static string name(const exc_t & /* signal */){ return typeid(exc_t).name();}
@@ -59,7 +59,7 @@ struct log_exception_traits{
 /// integer exceptions have the level equal to their value
 template<>
 struct log_exception_traits<int>{
-  /// exeption level according to the vbLEVELS
+  /// exception level according to the vbLEVELS
   static int level(const int &signal){ return signal; } 
   /// the string name of exception category
   static string name(const int &signal){ 
@@ -294,7 +294,7 @@ const char *fmt(const char *format,...);
 /// this may be used to inherit exceptions
 /// where level and name are defined whithin a class
 struct log_exception {
-   /// exeption level according to the vbLEVELS
+   /// exception level according to the vbLEVELS
   static int level(const log_exception &signal){ return vblFATAL; } 
   /// the string name of exception category
   static string name(const log_exception &signal){ return "undefined exception";}
diff --git a/lib/awpmd/ivutils/include/wavepacket.h b/lib/awpmd/ivutils/include/wavepacket.h
index c4f3837022..337a056e79 100644
--- a/lib/awpmd/ivutils/include/wavepacket.h
+++ b/lib/awpmd/ivutils/include/wavepacket.h
@@ -168,13 +168,13 @@ public:
     return imag(b) - real(b)*(imag(a)/real(a));
   }
 
-  ///\en Transforms derivatives of a function whith respect to WP parameters
+  ///\en Transforms derivatives of a function with respect to WP parameters
   ///    from internal into physical representation, i. e.:\n
   ///    from df/d{are,aim,b0re,b0im,b1re,b1im,b2re,b2im} (8 values accessed by input iterator d_it in the given order)\n
   ///    to   df/d{x0,x1,x2}, df/d{p0,p1,p2}, df/dw, df/dpw 
   ///    The supplied inputs (val) are modified by op: val=op(val,phys_der).
   ///    Use operation=eq_second for the supplied inputs to be replaced by new physical derivative values.
-  ///    The inpput and output locations may coinside, an internal buffer is used for transformation.
+  ///    The input and output locations may coinside, an internal buffer is used for transformation.
   template<template<class A> class operation, class d_it, class dfdx_it, class dfdp_it, class dfdw_it, class dfdpw_it>
   void int2phys_der(d_it dfdi_,dfdx_it dfdx, dfdp_it dfdp,  dfdw_it dfdw, dfdpw_it dfdpw, double h_p=h_plank) const {
     operation<double> op;
diff --git a/lib/awpmd/systems/interact/TCP/wpmd.cpp b/lib/awpmd/systems/interact/TCP/wpmd.cpp
index ad5d8e26bc..1e53f3141c 100644
--- a/lib/awpmd/systems/interact/TCP/wpmd.cpp
+++ b/lib/awpmd/systems/interact/TCP/wpmd.cpp
@@ -217,7 +217,7 @@ int  AWPMD::interaction_hartree(int flag, Vector_3P fi, Vector_3P fe_x,
    
   // 0. resizing the arrays if needed
   enum APPROX tmp=HARTREE;
-  swap(tmp,approx); // do not neeed large matrices
+  swap(tmp,approx); // do not need large matrices
   resize(flag);
   swap(tmp,approx);
   //1. clearing forces
diff --git a/lib/awpmd/systems/interact/TCP/wpmd.h b/lib/awpmd/systems/interact/TCP/wpmd.h
index bcb99e2092..e5a7c27697 100644
--- a/lib/awpmd/systems/interact/TCP/wpmd.h
+++ b/lib/awpmd/systems/interact/TCP/wpmd.h
@@ -201,7 +201,7 @@ inline pair<double,double> operator*(const pair<double,double> &right, double le
   return make_pair(right.first*left,right.second*left);
 }
 
-// Auxilary class to handle the normalizing term derivatives
+// Auxiliary class to handle the normalizing term derivatives
 class NormDeriv
 {
 public:
@@ -235,7 +235,7 @@ inline NormDeriv conj(const NormDeriv& src){
   return dst;
 }
 
-///\en Auxilary class to handle derivatives of overlaps
+///\en Auxiliary class to handle derivatives of overlaps
 class OverlapDeriv{
 public:
   WavePacket w1, w2, w12;
@@ -496,7 +496,7 @@ public:
   }
 
 protected:
-  //e translates wp2 to the nearest image postion relative to wp1
+  //e translates wp2 to the nearest image position relative to wp1
   //e gets the translation vector
   Vector_3 move_to_image(const WavePacket &wp1, WavePacket &wp2) const {
     Vector_3 r1=wp1.get_r();
@@ -646,7 +646,7 @@ public:
                     Vector_3P fe_p, double *fe_w, double *fe_pw, Vector_2P fe_c=NULL);
 
 
-  ///\en Creates wave packet acording to the given physical parameters.
+  ///\en Creates wave packet according to the given physical parameters.
   ///    The function may change its arguments by applying existing constraints!
   ///    Default mass (-1) is the electron mass AWPMD::me.
   WavePacket create_wp(Vector_3 &x, Vector_3 &v, double &w, double &pw, double mass=-1);
diff --git a/lib/awpmd/systems/interact/TCP/wpmd_split.cpp b/lib/awpmd/systems/interact/TCP/wpmd_split.cpp
index 691dbac91b..732707d717 100644
--- a/lib/awpmd/systems/interact/TCP/wpmd_split.cpp
+++ b/lib/awpmd/systems/interact/TCP/wpmd_split.cpp
@@ -351,7 +351,7 @@ int  AWPMD_split::interaction_hartree(int flag, Vector_3P fi, Vector_3P fe_x,
   
   // resize arrays if needed
   enum APPROX tmp=HARTREE;
-  swap(tmp,approx); // do not neeed large matrices
+  swap(tmp,approx); // do not need large matrices
   resize(flag);
   swap(tmp,approx);
 
diff --git a/lib/colvars/Makefile.common b/lib/colvars/Makefile.common
index c555c534d8..0482cff74a 100644
--- a/lib/colvars/Makefile.common
+++ b/lib/colvars/Makefile.common
@@ -31,6 +31,7 @@ COLVARS_SRCS = \
         colvarbias_meta.cpp \
         colvarbias_restraint.cpp \
         colvarcomp_angles.cpp \
+        colvarcomp_apath.cpp \
         colvarcomp_coordnums.cpp \
         colvarcomp.cpp \
         colvarcomp_distances.cpp \
@@ -41,8 +42,10 @@ COLVARS_SRCS = \
         colvardeps.cpp \
         colvargrid.cpp \
         colvarmodule.cpp \
+        colvarparams.cpp \
         colvarparse.cpp \
         colvarproxy.cpp \
+        colvarproxy_replicas.cpp \
         colvarscript.cpp \
         colvartypes.cpp \
         colvarvalue.cpp
diff --git a/lib/colvars/Makefile.deps b/lib/colvars/Makefile.deps
index a0d8515bc1..2c0dabea6a 100644
--- a/lib/colvars/Makefile.deps
+++ b/lib/colvars/Makefile.deps
@@ -1,235 +1,102 @@
 
 $(COLVARS_OBJ_DIR)colvaratoms.o: colvaratoms.cpp colvarmodule.h \
  colvars_version.h colvarproxy.h colvartypes.h colvarvalue.h \
- colvarparse.h colvaratoms.h colvardeps.h
+ colvarparse.h colvarparams.h colvaratoms.h colvardeps.h
 $(COLVARS_OBJ_DIR)colvarbias_abf.o: colvarbias_abf.cpp colvarmodule.h \
  colvars_version.h colvarproxy.h colvartypes.h colvarvalue.h colvar.h \
- colvarparse.h colvardeps.h lepton/include/Lepton.h \
- lepton/include/lepton/CompiledExpression.h \
- lepton/include/lepton/ExpressionTreeNode.h \
- lepton/include/lepton/windowsIncludes.h \
- lepton/include/lepton/CustomFunction.h \
- lepton/include/lepton/ExpressionProgram.h \
- lepton/include/lepton/ExpressionTreeNode.h \
- lepton/include/lepton/Operation.h lepton/include/lepton/CustomFunction.h \
- lepton/include/lepton/Exception.h \
- lepton/include/lepton/ParsedExpression.h lepton/include/lepton/Parser.h \
- colvarbias_abf.h colvarbias.h colvargrid.h colvar_UIestimator.h
+ colvarparse.h colvarparams.h colvardeps.h colvarbias_abf.h colvarbias.h \
+ colvargrid.h colvar_UIestimator.h
 $(COLVARS_OBJ_DIR)colvarbias_alb.o: colvarbias_alb.cpp colvarmodule.h \
  colvars_version.h colvarbias.h colvar.h colvarvalue.h colvartypes.h \
- colvarparse.h colvardeps.h lepton/include/Lepton.h \
- lepton/include/lepton/CompiledExpression.h \
- lepton/include/lepton/ExpressionTreeNode.h \
- lepton/include/lepton/windowsIncludes.h \
- lepton/include/lepton/CustomFunction.h \
- lepton/include/lepton/ExpressionProgram.h \
- lepton/include/lepton/ExpressionTreeNode.h \
- lepton/include/lepton/Operation.h lepton/include/lepton/CustomFunction.h \
- lepton/include/lepton/Exception.h \
- lepton/include/lepton/ParsedExpression.h lepton/include/lepton/Parser.h \
- colvarbias_alb.h
+ colvarparse.h colvarparams.h colvardeps.h colvarbias_alb.h
 $(COLVARS_OBJ_DIR)colvarbias.o: colvarbias.cpp colvarmodule.h \
  colvars_version.h colvarproxy.h colvartypes.h colvarvalue.h colvarbias.h \
- colvar.h colvarparse.h colvardeps.h lepton/include/Lepton.h \
- lepton/include/lepton/CompiledExpression.h \
- lepton/include/lepton/ExpressionTreeNode.h \
- lepton/include/lepton/windowsIncludes.h \
- lepton/include/lepton/CustomFunction.h \
- lepton/include/lepton/ExpressionProgram.h \
- lepton/include/lepton/ExpressionTreeNode.h \
- lepton/include/lepton/Operation.h lepton/include/lepton/CustomFunction.h \
- lepton/include/lepton/Exception.h \
- lepton/include/lepton/ParsedExpression.h lepton/include/lepton/Parser.h \
- colvargrid.h
+ colvar.h colvarparse.h colvarparams.h colvardeps.h colvargrid.h
 $(COLVARS_OBJ_DIR)colvarbias_histogram.o: colvarbias_histogram.cpp \
  colvarmodule.h colvars_version.h colvarproxy.h colvartypes.h \
- colvarvalue.h colvar.h colvarparse.h colvardeps.h \
- lepton/include/Lepton.h lepton/include/lepton/CompiledExpression.h \
- lepton/include/lepton/ExpressionTreeNode.h \
- lepton/include/lepton/windowsIncludes.h \
- lepton/include/lepton/CustomFunction.h \
- lepton/include/lepton/ExpressionProgram.h \
- lepton/include/lepton/ExpressionTreeNode.h \
- lepton/include/lepton/Operation.h lepton/include/lepton/CustomFunction.h \
- lepton/include/lepton/Exception.h \
- lepton/include/lepton/ParsedExpression.h lepton/include/lepton/Parser.h \
+ colvarvalue.h colvar.h colvarparse.h colvarparams.h colvardeps.h \
  colvarbias_histogram.h colvarbias.h colvargrid.h
 $(COLVARS_OBJ_DIR)colvarbias_meta.o: colvarbias_meta.cpp colvarmodule.h \
  colvars_version.h colvarproxy.h colvartypes.h colvarvalue.h colvar.h \
- colvarparse.h colvardeps.h lepton/include/Lepton.h \
- lepton/include/lepton/CompiledExpression.h \
- lepton/include/lepton/ExpressionTreeNode.h \
- lepton/include/lepton/windowsIncludes.h \
- lepton/include/lepton/CustomFunction.h \
- lepton/include/lepton/ExpressionProgram.h \
- lepton/include/lepton/ExpressionTreeNode.h \
- lepton/include/lepton/Operation.h lepton/include/lepton/CustomFunction.h \
- lepton/include/lepton/Exception.h \
- lepton/include/lepton/ParsedExpression.h lepton/include/lepton/Parser.h \
- colvarbias_meta.h colvarbias.h colvargrid.h
+ colvarparse.h colvarparams.h colvardeps.h colvarbias_meta.h colvarbias.h \
+ colvargrid.h
 $(COLVARS_OBJ_DIR)colvarbias_restraint.o: colvarbias_restraint.cpp \
  colvarmodule.h colvars_version.h colvarproxy.h colvartypes.h \
  colvarvalue.h colvarbias_restraint.h colvarbias.h colvar.h colvarparse.h \
- colvardeps.h lepton/include/Lepton.h \
- lepton/include/lepton/CompiledExpression.h \
- lepton/include/lepton/ExpressionTreeNode.h \
- lepton/include/lepton/windowsIncludes.h \
- lepton/include/lepton/CustomFunction.h \
- lepton/include/lepton/ExpressionProgram.h \
- lepton/include/lepton/ExpressionTreeNode.h \
- lepton/include/lepton/Operation.h lepton/include/lepton/CustomFunction.h \
- lepton/include/lepton/Exception.h \
- lepton/include/lepton/ParsedExpression.h lepton/include/lepton/Parser.h
+ colvarparams.h colvardeps.h
 $(COLVARS_OBJ_DIR)colvarcomp_angles.o: colvarcomp_angles.cpp \
  colvarmodule.h colvars_version.h colvar.h colvarvalue.h colvartypes.h \
- colvarparse.h colvardeps.h lepton/include/Lepton.h \
- lepton/include/lepton/CompiledExpression.h \
- lepton/include/lepton/ExpressionTreeNode.h \
- lepton/include/lepton/windowsIncludes.h \
- lepton/include/lepton/CustomFunction.h \
- lepton/include/lepton/ExpressionProgram.h \
- lepton/include/lepton/ExpressionTreeNode.h \
- lepton/include/lepton/Operation.h lepton/include/lepton/CustomFunction.h \
- lepton/include/lepton/Exception.h \
- lepton/include/lepton/ParsedExpression.h lepton/include/lepton/Parser.h \
- colvarcomp.h colvaratoms.h colvarproxy.h
+ colvarparse.h colvarparams.h colvardeps.h colvarcomp.h colvaratoms.h \
+ colvarproxy.h colvar_arithmeticpath.h colvar_geometricpath.h
+$(COLVARS_OBJ_DIR)colvarcomp_apath.o: colvarcomp_apath.cpp colvarmodule.h \
+ colvars_version.h colvarvalue.h colvartypes.h colvarparse.h \
+ colvarparams.h colvar.h colvardeps.h colvarcomp.h colvaratoms.h \
+ colvarproxy.h colvar_arithmeticpath.h colvar_geometricpath.h
 $(COLVARS_OBJ_DIR)colvarcomp_coordnums.o: colvarcomp_coordnums.cpp \
  colvarmodule.h colvars_version.h colvarparse.h colvarvalue.h \
- colvartypes.h colvaratoms.h colvarproxy.h colvardeps.h colvar.h \
- lepton/include/Lepton.h lepton/include/lepton/CompiledExpression.h \
- lepton/include/lepton/ExpressionTreeNode.h \
- lepton/include/lepton/windowsIncludes.h \
- lepton/include/lepton/CustomFunction.h \
- lepton/include/lepton/ExpressionProgram.h \
- lepton/include/lepton/ExpressionTreeNode.h \
- lepton/include/lepton/Operation.h lepton/include/lepton/CustomFunction.h \
- lepton/include/lepton/Exception.h \
- lepton/include/lepton/ParsedExpression.h lepton/include/lepton/Parser.h \
- colvarcomp.h
+ colvartypes.h colvarparams.h colvaratoms.h colvarproxy.h colvardeps.h \
+ colvar.h colvarcomp.h colvar_arithmeticpath.h colvar_geometricpath.h
 $(COLVARS_OBJ_DIR)colvarcomp.o: colvarcomp.cpp colvarmodule.h \
  colvars_version.h colvarvalue.h colvartypes.h colvar.h colvarparse.h \
- colvardeps.h lepton/include/Lepton.h \
- lepton/include/lepton/CompiledExpression.h \
- lepton/include/lepton/ExpressionTreeNode.h \
- lepton/include/lepton/windowsIncludes.h \
- lepton/include/lepton/CustomFunction.h \
- lepton/include/lepton/ExpressionProgram.h \
- lepton/include/lepton/ExpressionTreeNode.h \
- lepton/include/lepton/Operation.h lepton/include/lepton/CustomFunction.h \
- lepton/include/lepton/Exception.h \
- lepton/include/lepton/ParsedExpression.h lepton/include/lepton/Parser.h \
- colvarcomp.h colvaratoms.h colvarproxy.h
+ colvarparams.h colvardeps.h colvarcomp.h colvaratoms.h colvarproxy.h \
+ colvar_arithmeticpath.h colvar_geometricpath.h
 $(COLVARS_OBJ_DIR)colvarcomp_distances.o: colvarcomp_distances.cpp \
  colvarmodule.h colvars_version.h colvarvalue.h colvartypes.h \
- colvarparse.h colvar.h colvardeps.h lepton/include/Lepton.h \
- lepton/include/lepton/CompiledExpression.h \
- lepton/include/lepton/ExpressionTreeNode.h \
- lepton/include/lepton/windowsIncludes.h \
- lepton/include/lepton/CustomFunction.h \
- lepton/include/lepton/ExpressionProgram.h \
- lepton/include/lepton/ExpressionTreeNode.h \
- lepton/include/lepton/Operation.h lepton/include/lepton/CustomFunction.h \
- lepton/include/lepton/Exception.h \
- lepton/include/lepton/ParsedExpression.h lepton/include/lepton/Parser.h \
- colvarcomp.h colvaratoms.h colvarproxy.h
+ colvarparse.h colvarparams.h colvar.h colvardeps.h colvarcomp.h \
+ colvaratoms.h colvarproxy.h colvar_arithmeticpath.h \
+ colvar_geometricpath.h
+$(COLVARS_OBJ_DIR)colvarcomp_gpath.o: colvarcomp_gpath.cpp colvarmodule.h \
+ colvars_version.h colvarvalue.h colvartypes.h colvarparse.h \
+ colvarparams.h colvar.h colvardeps.h colvarcomp.h colvaratoms.h \
+ colvarproxy.h colvar_arithmeticpath.h colvar_geometricpath.h
 $(COLVARS_OBJ_DIR)colvarcomp_protein.o: colvarcomp_protein.cpp \
  colvarmodule.h colvars_version.h colvarvalue.h colvartypes.h \
- colvarparse.h colvar.h colvardeps.h lepton/include/Lepton.h \
- lepton/include/lepton/CompiledExpression.h \
- lepton/include/lepton/ExpressionTreeNode.h \
- lepton/include/lepton/windowsIncludes.h \
- lepton/include/lepton/CustomFunction.h \
- lepton/include/lepton/ExpressionProgram.h \
- lepton/include/lepton/ExpressionTreeNode.h \
- lepton/include/lepton/Operation.h lepton/include/lepton/CustomFunction.h \
- lepton/include/lepton/Exception.h \
- lepton/include/lepton/ParsedExpression.h lepton/include/lepton/Parser.h \
- colvarcomp.h colvaratoms.h colvarproxy.h
+ colvarparse.h colvarparams.h colvar.h colvardeps.h colvarcomp.h \
+ colvaratoms.h colvarproxy.h colvar_arithmeticpath.h \
+ colvar_geometricpath.h
 $(COLVARS_OBJ_DIR)colvarcomp_rotations.o: colvarcomp_rotations.cpp \
  colvarmodule.h colvars_version.h colvarvalue.h colvartypes.h \
- colvarparse.h colvar.h colvardeps.h lepton/include/Lepton.h \
- lepton/include/lepton/CompiledExpression.h \
- lepton/include/lepton/ExpressionTreeNode.h \
- lepton/include/lepton/windowsIncludes.h \
- lepton/include/lepton/CustomFunction.h \
- lepton/include/lepton/ExpressionProgram.h \
- lepton/include/lepton/ExpressionTreeNode.h \
- lepton/include/lepton/Operation.h lepton/include/lepton/CustomFunction.h \
- lepton/include/lepton/Exception.h \
- lepton/include/lepton/ParsedExpression.h lepton/include/lepton/Parser.h \
- colvarcomp.h colvaratoms.h colvarproxy.h
+ colvarparse.h colvarparams.h colvar.h colvardeps.h colvarcomp.h \
+ colvaratoms.h colvarproxy.h colvar_arithmeticpath.h \
+ colvar_geometricpath.h
 $(COLVARS_OBJ_DIR)colvar.o: colvar.cpp colvarmodule.h colvars_version.h \
- colvarvalue.h colvartypes.h colvarparse.h colvar.h colvardeps.h \
- lepton/include/Lepton.h lepton/include/lepton/CompiledExpression.h \
- lepton/include/lepton/ExpressionTreeNode.h \
- lepton/include/lepton/windowsIncludes.h \
- lepton/include/lepton/CustomFunction.h \
- lepton/include/lepton/ExpressionProgram.h \
- lepton/include/lepton/ExpressionTreeNode.h \
- lepton/include/lepton/Operation.h lepton/include/lepton/CustomFunction.h \
- lepton/include/lepton/Exception.h \
- lepton/include/lepton/ParsedExpression.h lepton/include/lepton/Parser.h \
- colvarcomp.h colvaratoms.h colvarproxy.h colvarscript.h colvarbias.h
+ colvarvalue.h colvartypes.h colvarparse.h colvarparams.h colvar.h \
+ colvardeps.h colvarcomp.h colvaratoms.h colvarproxy.h \
+ colvar_arithmeticpath.h colvar_geometricpath.h colvarscript.h \
+ colvarbias.h
 $(COLVARS_OBJ_DIR)colvardeps.o: colvardeps.cpp colvarmodule.h \
  colvars_version.h colvarproxy.h colvartypes.h colvarvalue.h colvardeps.h \
- colvarparse.h
+ colvarparse.h colvarparams.h
 $(COLVARS_OBJ_DIR)colvargrid.o: colvargrid.cpp colvarmodule.h \
- colvars_version.h colvarvalue.h colvartypes.h colvarparse.h colvar.h \
- colvardeps.h lepton/include/Lepton.h \
- lepton/include/lepton/CompiledExpression.h \
- lepton/include/lepton/ExpressionTreeNode.h \
- lepton/include/lepton/windowsIncludes.h \
- lepton/include/lepton/CustomFunction.h \
- lepton/include/lepton/ExpressionProgram.h \
- lepton/include/lepton/ExpressionTreeNode.h \
- lepton/include/lepton/Operation.h lepton/include/lepton/CustomFunction.h \
- lepton/include/lepton/Exception.h \
- lepton/include/lepton/ParsedExpression.h lepton/include/lepton/Parser.h \
- colvarcomp.h colvaratoms.h colvarproxy.h colvargrid.h
+ colvars_version.h colvarvalue.h colvartypes.h colvarparse.h \
+ colvarparams.h colvar.h colvardeps.h colvarcomp.h colvaratoms.h \
+ colvarproxy.h colvar_arithmeticpath.h colvar_geometricpath.h \
+ colvargrid.h
 $(COLVARS_OBJ_DIR)colvarmodule.o: colvarmodule.cpp colvarmodule.h \
  colvars_version.h colvarparse.h colvarvalue.h colvartypes.h \
- colvarproxy.h colvar.h colvardeps.h lepton/include/Lepton.h \
- lepton/include/lepton/CompiledExpression.h \
- lepton/include/lepton/ExpressionTreeNode.h \
- lepton/include/lepton/windowsIncludes.h \
- lepton/include/lepton/CustomFunction.h \
- lepton/include/lepton/ExpressionProgram.h \
- lepton/include/lepton/ExpressionTreeNode.h \
- lepton/include/lepton/Operation.h lepton/include/lepton/CustomFunction.h \
- lepton/include/lepton/Exception.h \
- lepton/include/lepton/ParsedExpression.h lepton/include/lepton/Parser.h \
- colvarbias.h colvarbias_abf.h colvargrid.h colvar_UIestimator.h \
- colvarbias_alb.h colvarbias_histogram.h colvarbias_meta.h \
- colvarbias_restraint.h colvarscript.h colvaratoms.h colvarcomp.h
+ colvarparams.h colvarproxy.h colvar.h colvardeps.h colvarbias.h \
+ colvarbias_abf.h colvargrid.h colvar_UIestimator.h colvarbias_alb.h \
+ colvarbias_histogram.h colvarbias_meta.h colvarbias_restraint.h \
+ colvarscript.h colvaratoms.h colvarcomp.h colvar_arithmeticpath.h \
+ colvar_geometricpath.h
+$(COLVARS_OBJ_DIR)colvarparams.o: colvarparams.cpp colvarmodule.h \
+ colvars_version.h colvarvalue.h colvartypes.h colvarparams.h
 $(COLVARS_OBJ_DIR)colvarparse.o: colvarparse.cpp colvarmodule.h \
- colvars_version.h colvarvalue.h colvartypes.h colvarparse.h
+ colvars_version.h colvarvalue.h colvartypes.h colvarparse.h \
+ colvarparams.h
 $(COLVARS_OBJ_DIR)colvarproxy.o: colvarproxy.cpp colvarmodule.h \
  colvars_version.h colvarproxy.h colvartypes.h colvarvalue.h \
- colvarscript.h colvarbias.h colvar.h colvarparse.h colvardeps.h \
- lepton/include/Lepton.h lepton/include/lepton/CompiledExpression.h \
- lepton/include/lepton/ExpressionTreeNode.h \
- lepton/include/lepton/windowsIncludes.h \
- lepton/include/lepton/CustomFunction.h \
- lepton/include/lepton/ExpressionProgram.h \
- lepton/include/lepton/ExpressionTreeNode.h \
- lepton/include/lepton/Operation.h lepton/include/lepton/CustomFunction.h \
- lepton/include/lepton/Exception.h \
- lepton/include/lepton/ParsedExpression.h lepton/include/lepton/Parser.h \
- colvaratoms.h
+ colvarscript.h colvarbias.h colvar.h colvarparse.h colvarparams.h \
+ colvardeps.h colvaratoms.h
+$(COLVARS_OBJ_DIR)colvarproxy_replicas.o: colvarproxy_replicas.cpp \
+ colvarmodule.h colvars_version.h colvarproxy.h colvartypes.h \
+ colvarvalue.h
 $(COLVARS_OBJ_DIR)colvarscript.o: colvarscript.cpp colvarscript.h \
  colvarmodule.h colvars_version.h colvarvalue.h colvartypes.h \
- colvarbias.h colvar.h colvarparse.h colvardeps.h lepton/include/Lepton.h \
- lepton/include/lepton/CompiledExpression.h \
- lepton/include/lepton/ExpressionTreeNode.h \
- lepton/include/lepton/windowsIncludes.h \
- lepton/include/lepton/CustomFunction.h \
- lepton/include/lepton/ExpressionProgram.h \
- lepton/include/lepton/ExpressionTreeNode.h \
- lepton/include/lepton/Operation.h lepton/include/lepton/CustomFunction.h \
- lepton/include/lepton/Exception.h \
- lepton/include/lepton/ParsedExpression.h lepton/include/lepton/Parser.h \
+ colvarbias.h colvar.h colvarparse.h colvarparams.h colvardeps.h \
  colvarproxy.h
 $(COLVARS_OBJ_DIR)colvartypes.o: colvartypes.cpp colvarmodule.h \
- colvars_version.h colvartypes.h colvarparse.h colvarvalue.h
+ colvars_version.h colvartypes.h colvarparse.h colvarvalue.h \
+ colvarparams.h
 $(COLVARS_OBJ_DIR)colvarvalue.o: colvarvalue.cpp colvarmodule.h \
  colvars_version.h colvarvalue.h colvartypes.h
diff --git a/lib/colvars/README b/lib/colvars/README
index 6be1b8dd58..cd6e59511a 100644
--- a/lib/colvars/README
+++ b/lib/colvars/README
@@ -27,7 +27,7 @@ Also available is a Doxygen-based developer documentation:
 The reference article is:
   G. Fiorin, M. L. Klein, and J. Hénin,
   Molecular Physics 111, 3345 (2013).
-  http://dx.doi.org/10.1080/00268976.2013.813594
+  https://doi.org/10.1080/00268976.2013.813594
 
 
 ## Requirements
diff --git a/lib/colvars/colvar.cpp b/lib/colvars/colvar.cpp
index e3676084ac..1002dc35d8 100644
--- a/lib/colvars/colvar.cpp
+++ b/lib/colvars/colvar.cpp
@@ -2,7 +2,7 @@
 
 // This file is part of the Collective Variables module (Colvars).
 // The original version of Colvars and its updates are located at:
-// https://github.com/colvars/colvars
+// https://github.com/Colvars/colvars
 // Please update all Colvars source files before making any changes.
 // If you wish to distribute your changes, please submit them to the
 // Colvars repository at GitHub.
@@ -29,6 +29,12 @@ colvar::colvar()
   kinetic_energy = 0.0;
   potential_energy = 0.0;
 
+#ifdef LEPTON
+  dev_null = 0.0;
+#endif
+
+  expand_boundaries = false;
+
   description = "uninitialized colvar";
   init_dependencies();
 }
@@ -194,23 +200,32 @@ int colvar::init(std::string const &conf)
   {
     bool homogeneous = is_enabled(f_cv_linear);
     for (i = 0; i < cvcs.size(); i++) {
-      if ((cvm::fabs(cvcs[i]->sup_coeff) - 1.0) > 1.0e-10) {
+      if (cvm::fabs(cvm::fabs(cvcs[i]->sup_coeff) - 1.0) > 1.0e-10) {
         homogeneous = false;
       }
     }
     set_enabled(f_cv_homogeneous, homogeneous);
   }
 
+  // A single-component variable almost concides with its CVC object
+  if ((cvcs.size() == 1) && is_enabled(f_cv_homogeneous)) {
+    if ( !is_enabled(f_cv_scripted) && !is_enabled(f_cv_custom_function) &&
+         (cvm::fabs(cvcs[0]->sup_coeff - 1.0) < 1.0e-10) &&
+         (cvcs[0]->sup_np == 1) ) {
+      enable(f_cv_single_cvc);
+    }
+  }
+
   // Colvar is deemed periodic if:
   // - it is homogeneous
   // - all cvcs are periodic
   // - all cvcs have the same period
-  if (is_enabled(f_cv_homogeneous) && cvcs[0]->b_periodic) { // TODO make this a CVC feature
+  if (is_enabled(f_cv_homogeneous) && cvcs[0]->is_enabled(f_cvc_periodic)) {
     bool b_periodic = true;
     period = cvcs[0]->period;
     wrap_center = cvcs[0]->wrap_center;
     for (i = 1; i < cvcs.size(); i++) {
-      if (!cvcs[i]->b_periodic || cvcs[i]->period != period) {
+      if (!cvcs[i]->is_enabled(f_cvc_periodic) || cvcs[i]->period != period) {
         b_periodic = false;
         period = 0.0;
         cvm::log("Warning: although one component is periodic, this colvar will "
@@ -237,7 +252,7 @@ int colvar::init(std::string const &conf)
     // components may have different types only for scripted functions
     if (!(is_enabled(f_cv_scripted) || is_enabled(f_cv_custom_function)) && (colvarvalue::check_types(cvcs[i]->value(),
                                                                 cvcs[0]->value())) ) {
-      cvm::error("ERROR: you are definining this collective variable "
+      cvm::error("ERROR: you are defining this collective variable "
                  "by using components of different types. "
                  "You must use the same type in order to "
                  "sum them together.\n", INPUT_ERROR);
@@ -296,13 +311,13 @@ int colvar::init(std::string const &conf)
 #ifdef LEPTON
 int colvar::init_custom_function(std::string const &conf)
 {
-  std::string expr;
+  std::string expr, expr_in; // expr_in is a buffer to remember expr after unsuccessful parsing
   std::vector<Lepton::ParsedExpression> pexprs;
   Lepton::ParsedExpression pexpr;
   size_t pos = 0; // current position in config string
   double *ref;
 
-  if (!key_lookup(conf, "customFunction", &expr, &pos)) {
+  if (!key_lookup(conf, "customFunction", &expr_in, &pos)) {
     return COLVARS_OK;
   }
 
@@ -310,6 +325,7 @@ int colvar::init_custom_function(std::string const &conf)
   cvm::log("This colvar uses a custom function.\n");
 
   do {
+    expr = expr_in;
     if (cvm::debug())
       cvm::log("Parsing expression \"" + expr + "\".\n");
     try {
@@ -337,8 +353,7 @@ int colvar::init_custom_function(std::string const &conf)
             // To keep the same workflow, we use a pointer to a double here
             // that will receive CVC values - even though none was allocated by Lepton
             ref = &dev_null;
-            if (cvm::debug())
-              cvm::log("Variable " + vn + " is absent from expression \"" + expr + "\".\n");
+            cvm::log("Warning: Variable " + vn + " is absent from expression \"" + expr + "\".\n");
           }
           value_eval_var_refs.push_back(ref);
         }
@@ -348,7 +363,7 @@ int colvar::init_custom_function(std::string const &conf)
       cvm::error("Error compiling expression \"" + expr + "\".\n", INPUT_ERROR);
       return INPUT_ERROR;
     }
-  } while (key_lookup(conf, "customFunction", &expr, &pos));
+  } while (key_lookup(conf, "customFunction", &expr_in, &pos));
 
 
   // Now define derivative with respect to each scalar sub-component
@@ -373,8 +388,7 @@ int colvar::init_custom_function(std::string const &conf)
             catch (...) { // Variable is absent from derivative
               // To keep the same workflow, we use a pointer to a double here
               // that will receive CVC values - even though none was allocated by Lepton
-              if (cvm::debug())
-                cvm::log("Variable " + vvn + " is absent from derivative of \"" + expr + "\" wrt " + vn + ".\n");
+              cvm::log("Warning: Variable " + vvn + " is absent from derivative of \"" + expr + "\" wrt " + vn + ".\n");
               ref = &dev_null;
             }
             grad_eval_var_refs.push_back(ref);
@@ -439,6 +453,21 @@ int colvar::init_custom_function(std::string const &conf)
 
 int colvar::init_custom_function(std::string const &conf)
 {
+
+  std::string expr;
+  size_t pos = 0;
+  if (key_lookup(conf, "customFunction", &expr, &pos)) {
+    std::string msg("Error: customFunction requires the Lepton library.");
+#if (__cplusplus < 201103L)
+    // NOTE: this is not ideal; testing for the Lepton library's version would
+    // be more accurate, but also less portable
+    msg +=
+      std::string("  Note also that recent versions of Lepton require C++11: "
+                  "please see https://colvars.github.io/README-c++11.html.");
+#endif
+    return cvm::error(msg, COLVARS_NOT_IMPLEMENTED);
+  }
+
   return COLVARS_OK;
 }
 
@@ -447,9 +476,23 @@ int colvar::init_custom_function(std::string const &conf)
 
 int colvar::init_grid_parameters(std::string const &conf)
 {
+  int error_code = COLVARS_OK;
+
   colvarmodule *cv = cvm::main();
 
-  get_keyval(conf, "width", width, 1.0);
+  cvm::real default_width = width;
+
+  if (!key_already_set("width")) {
+    // The first time, check if the CVC has a width to provide
+    default_width = 1.0;
+    if (is_enabled(f_cv_single_cvc) && cvcs[0]->is_enabled(f_cvc_width)) {
+      cvm::real const cvc_width = cvcs[0]->get_param("width");
+      default_width = cvc_width;
+    }
+  }
+
+  get_keyval(conf, "width", width, default_width);
+
   if (width <= 0.0) {
     cvm::error("Error: \"width\" must be positive.\n", INPUT_ERROR);
     return INPUT_ERROR;
@@ -460,23 +503,46 @@ int colvar::init_grid_parameters(std::string const &conf)
 
   if (is_enabled(f_cv_scalar)) {
 
+    if (is_enabled(f_cv_single_cvc)) {
+      // Get the default boundaries from the component
+      if (cvcs[0]->is_enabled(f_cvc_lower_boundary)) {
+        enable(f_cv_lower_boundary);
+        enable(f_cv_hard_lower_boundary);
+        lower_boundary =
+          *(reinterpret_cast<colvarvalue const *>(cvcs[0]->get_param_ptr("lowerBoundary")));
+      }
+      if (cvcs[0]->is_enabled(f_cvc_upper_boundary)) {
+        enable(f_cv_upper_boundary);
+        enable(f_cv_hard_upper_boundary);
+        upper_boundary =
+          *(reinterpret_cast<colvarvalue const *>(cvcs[0]->get_param_ptr("upperBoundary")));
+      }
+    }
+
     if (get_keyval(conf, "lowerBoundary", lower_boundary, lower_boundary)) {
       enable(f_cv_lower_boundary);
+      // Because this is the user's choice, we cannot assume it is a true
+      // physical boundary
+      disable(f_cv_hard_lower_boundary);
     }
 
     if (get_keyval(conf, "upperBoundary", upper_boundary, upper_boundary)) {
       enable(f_cv_upper_boundary);
+      disable(f_cv_hard_upper_boundary);
     }
 
+    // Parse legacy wall options and set up a harmonicWalls bias if needed
+    cvm::real lower_wall_k = 0.0, upper_wall_k = 0.0;
+    cvm::real lower_wall = 0.0, upper_wall = 0.0;
     std::string lw_conf, uw_conf;
+
     if (get_keyval(conf, "lowerWallConstant", lower_wall_k, 0.0,
                    parse_silent)) {
       cvm::log("Reading legacy options lowerWall and lowerWallConstant: "
-               "consider using a harmonicWalls restraint\n(caution: force constant would then be scaled by width^2).\n");
-      lower_wall.type(value());
-      if (!get_keyval(conf, "lowerWall", lower_wall, lower_boundary)) {
-        cvm::log("Warning: lowerWall will need to be "
-                 "defined explicitly in the next release.\n");
+               "consider using a harmonicWalls restraint (caution: force constant would then be scaled by width^2).\n");
+      if (!get_keyval(conf, "lowerWall", lower_wall)) {
+        error_code != cvm::error("Error: the value of lowerWall must be set "
+                                 "explicitly.\n", INPUT_ERROR);
       }
       lw_conf = std::string("\n\
     lowerWallConstant "+cvm::to_str(lower_wall_k*width*width)+"\n\
@@ -486,11 +552,10 @@ int colvar::init_grid_parameters(std::string const &conf)
     if (get_keyval(conf, "upperWallConstant", upper_wall_k, 0.0,
                    parse_silent)) {
       cvm::log("Reading legacy options upperWall and upperWallConstant: "
-               "consider using a harmonicWalls restraint\n(caution: force constant would then be scaled by width^2).\n");
-      upper_wall.type(value());
-      if (!get_keyval(conf, "upperWall", upper_wall, upper_boundary)) {
-        cvm::log("Warning: upperWall will need to be "
-                 "defined explicitly in the next release.\n");
+               "consider using a harmonicWalls restraint (caution: force constant would then be scaled by width^2).\n");
+      if (!get_keyval(conf, "upperWall", upper_wall)) {
+        error_code != cvm::error("Error: the value of upperWall must be set "
+                                 "explicitly.\n", INPUT_ERROR);
       }
       uw_conf = std::string("\n\
     upperWallConstant "+cvm::to_str(upper_wall_k*width*width)+"\n\
@@ -499,12 +564,11 @@ int colvar::init_grid_parameters(std::string const &conf)
 
     if (lw_conf.size() && uw_conf.size()) {
       if (lower_wall >= upper_wall) {
-        cvm::error("Error: the upper wall, "+
-                   cvm::to_str(upper_wall)+
-                   ", is not higher than the lower wall, "+
-                   cvm::to_str(lower_wall)+".\n",
-                   INPUT_ERROR);
-        return INPUT_ERROR;
+        error_code |= cvm::error("Error: the upper wall, "+
+                                 cvm::to_str(upper_wall)+
+                                 ", is not higher than the lower wall, "+
+                                 cvm::to_str(lower_wall)+".\n",
+                                 INPUT_ERROR);
       }
     }
 
@@ -516,42 +580,40 @@ harmonicWalls {\n\
     colvars "+this->name+"\n"+lw_conf+uw_conf+"\
     timeStepFactor "+cvm::to_str(time_step_factor)+"\n"+
                              "}\n");
-      cv->append_new_config(walls_conf);
+      error_code |= cv->append_new_config(walls_conf);
     }
   }
 
-  if (is_enabled(f_cv_lower_boundary)) {
-    get_keyval(conf, "hardLowerBoundary", hard_lower_boundary, false);
-  }
-  if (is_enabled(f_cv_upper_boundary)) {
-    get_keyval(conf, "hardUpperBoundary", hard_upper_boundary, false);
-  }
+  get_keyval_feature(this, conf, "hardLowerBoundary", f_cv_hard_lower_boundary,
+                     is_enabled(f_cv_hard_lower_boundary));
+
+  get_keyval_feature(this, conf, "hardUpperBoundary", f_cv_hard_upper_boundary,
+                     is_enabled(f_cv_hard_upper_boundary));
 
   // consistency checks for boundaries and walls
   if (is_enabled(f_cv_lower_boundary) && is_enabled(f_cv_upper_boundary)) {
     if (lower_boundary >= upper_boundary) {
-      cvm::error("Error: the upper boundary, "+
-                        cvm::to_str(upper_boundary)+
-                        ", is not higher than the lower boundary, "+
-                        cvm::to_str(lower_boundary)+".\n",
-                INPUT_ERROR);
-      return INPUT_ERROR;
+      error_code |= cvm::error("Error: the upper boundary, "+
+                               cvm::to_str(upper_boundary)+
+                               ", is not higher than the lower boundary, "+
+                               cvm::to_str(lower_boundary)+".\n",
+                               INPUT_ERROR);
     }
   }
 
-  get_keyval(conf, "expandBoundaries", expand_boundaries, false);
+  get_keyval(conf, "expandBoundaries", expand_boundaries, expand_boundaries);
   if (expand_boundaries && periodic_boundaries()) {
-    cvm::error("Error: trying to expand boundaries that already "
-               "cover a whole period of a periodic colvar.\n",
-               INPUT_ERROR);
-    return INPUT_ERROR;
+    error_code |= cvm::error("Error: trying to expand boundaries that already "
+                             "cover a whole period of a periodic colvar.\n",
+                             INPUT_ERROR);
   }
-  if (expand_boundaries && hard_lower_boundary && hard_upper_boundary) {
-    cvm::error("Error: inconsistent configuration "
-               "(trying to expand boundaries with both "
-               "hardLowerBoundary and hardUpperBoundary enabled).\n",
-               INPUT_ERROR);
-    return INPUT_ERROR;
+
+  if (expand_boundaries && is_enabled(f_cv_hard_lower_boundary) &&
+      is_enabled(f_cv_hard_upper_boundary)) {
+    error_code |= cvm::error("Error: inconsistent configuration "
+                             "(trying to expand boundaries, but both "
+                             "hardLowerBoundary and hardUpperBoundary "
+                             "are enabled).\n", INPUT_ERROR);
   }
 
   return COLVARS_OK;
@@ -568,7 +630,8 @@ int colvar::init_extended_Lagrangian(std::string const &conf)
     cvm::log("Enabling the extended Lagrangian term for colvar \""+
              this->name+"\".\n");
 
-    x_ext.type(value());
+    // Mark x_ext as uninitialized so we can initialize it to the colvar value when updating
+    x_ext.type(colvarvalue::type_notset);
     v_ext.type(value());
     fr.type(value());
 
@@ -646,7 +709,7 @@ int colvar::init_output_flags(std::string const &conf)
     bool temp;
     if (get_keyval(conf, "outputSystemForce", temp, false, colvarparse::parse_silent)) {
       cvm::error("Option outputSystemForce is deprecated: only outputTotalForce is supported instead.\n"
-                 "The two are NOT identical: see http://colvars.github.io/totalforce.html.\n", INPUT_ERROR);
+                 "The two are NOT identical: see https://colvars.github.io/totalforce.html.\n", INPUT_ERROR);
       return INPUT_ERROR;
     }
   }
@@ -664,7 +727,7 @@ int colvar::init_output_flags(std::string const &conf)
 // read the configuration and set up corresponding instances, for
 // each type of component implemented
 template<typename def_class_name> int colvar::init_components_type(std::string const &conf,
-                                                                   char const *def_desc,
+                                                                   char const * /* def_desc */,
                                                                    char const *def_config_key)
 {
   size_t def_count = 0;
@@ -744,6 +807,7 @@ template<typename def_class_name> int colvar::init_components_type(std::string c
 int colvar::init_components(std::string const &conf)
 {
   int error_code = COLVARS_OK;
+  size_t i = 0, j = 0;
 
   error_code |= init_components_type<distance>(conf, "distance", "distance");
   error_code |= init_components_type<distance_vec>(conf, "distance vector", "distanceVec");
@@ -793,9 +857,11 @@ int colvar::init_components(std::string const &conf)
   error_code |= init_components_type<eigenvector>(conf, "eigenvector", "eigenvector");
   error_code |= init_components_type<gspath>(conf, "geometrical path collective variables (s)", "gspath");
   error_code |= init_components_type<gzpath>(conf, "geometrical path collective variables (z)", "gzpath");
-  error_code |= init_components_type<linearCombination>(conf, "linear combination of other collective variables", "subColvar");
+  error_code |= init_components_type<linearCombination>(conf, "linear combination of other collective variables", "linearCombination");
   error_code |= init_components_type<gspathCV>(conf, "geometrical path collective variables (s) for other CVs", "gspathCV");
   error_code |= init_components_type<gzpathCV>(conf, "geometrical path collective variables (z) for other CVs", "gzpathCV");
+  error_code |= init_components_type<aspathCV>(conf, "arithmetic path collective variables (s) for other CVs", "aspathCV");
+  error_code |= init_components_type<azpathCV>(conf, "arithmetic path collective variables (s) for other CVs", "azpathCV");
 
   if (!cvcs.size() || (error_code != COLVARS_OK)) {
     cvm::error("Error: no valid components were provided "
@@ -804,15 +870,26 @@ int colvar::init_components(std::string const &conf)
     return INPUT_ERROR;
   }
 
+  // Check for uniqueness of CVC names (esp. if user-provided)
+  for (i = 0; i < cvcs.size(); i++) {
+    for (j = i+1; j < cvcs.size(); j++) {
+      if (cvcs[i]->name == cvcs[j]->name) {
+        cvm::error("Components " + cvm::to_str(i) + " and " + cvm::to_str(j) +\
+          " cannot have the same name \"" +  cvcs[i]->name+ "\".\n", INPUT_ERROR);
+        return INPUT_ERROR;
+      }
+    }
+  }
+
   n_active_cvcs = cvcs.size();
 
-  cvm::log("All components initialized.\n");
-
   // Store list of children cvcs for dependency checking purposes
-  for (size_t i = 0; i < cvcs.size(); i++) {
+  for (i = 0; i < cvcs.size(); i++) {
     add_child(cvcs[i]);
   }
 
+  cvm::log("All components initialized.\n");
+
   return COLVARS_OK;
 }
 
@@ -921,7 +998,7 @@ int colvar::parse_analysis(std::string const &conf)
         return cvm::error("Error: collective variable \""+acf_colvar_name+
                           "\" is not defined at this time.\n", INPUT_ERROR);
       }
-      cv2->enable(f_cv_fdiff_velocity);
+      cv2->enable(f_cv_fdiff_velocity); // Manual dependency to object of same type
     } else if (acf_type_str == to_lower_cppstr(std::string("coordinate_p2"))) {
       acf_type = acf_p2coor;
     } else {
@@ -998,6 +1075,8 @@ int colvar::init_dependencies() {
     init_feature(f_cv_Langevin, "Langevin dynamics", f_type_user);
     require_feature_self(f_cv_Langevin, f_cv_extended_Lagrangian);
 
+    init_feature(f_cv_single_cvc, "single component", f_type_static);
+
     init_feature(f_cv_linear, "linear", f_type_static);
 
     init_feature(f_cv_scalar, "scalar", f_type_static);
@@ -1023,6 +1102,12 @@ int colvar::init_dependencies() {
     init_feature(f_cv_upper_boundary, "upper boundary", f_type_user);
     require_feature_self(f_cv_upper_boundary, f_cv_scalar);
 
+    init_feature(f_cv_hard_lower_boundary, "hard lower boundary", f_type_user);
+    require_feature_self(f_cv_hard_lower_boundary, f_cv_lower_boundary);
+
+    init_feature(f_cv_hard_upper_boundary, "hard upper boundary", f_type_user);
+    require_feature_self(f_cv_hard_upper_boundary, f_cv_upper_boundary);
+
     init_feature(f_cv_grid, "grid", f_type_dynamic);
     require_feature_self(f_cv_grid, f_cv_lower_boundary);
     require_feature_self(f_cv_grid, f_cv_upper_boundary);
@@ -1227,7 +1312,7 @@ int colvar::collect_cvc_data()
 }
 
 
-int colvar::check_cvc_range(int first_cvc, size_t num_cvcs)
+int colvar::check_cvc_range(int first_cvc, size_t /* num_cvcs */)
 {
   if ((first_cvc < 0) || (first_cvc >= ((int) cvcs.size()))) {
     cvm::error("Error: trying to address a component outside the "
@@ -1512,7 +1597,7 @@ int colvar::calc_colvar_properties()
 
     // initialize the restraint center in the first step to the value
     // just calculated from the cvcs
-    if (cvm::step_relative() == 0 && !after_restart) {
+    if ((cvm::step_relative() == 0 && !after_restart) || x_ext.type() == colvarvalue::type_notset) {
       x_ext = x;
       v_ext.reset(); // (already 0; added for clarity)
     }
@@ -1859,6 +1944,59 @@ int colvar::update_cvc_config(std::vector<std::string> const &confs)
 }
 
 
+int colvar::cvc_param_exists(std::string const &param_name)
+{
+  if (is_enabled(f_cv_single_cvc)) {
+    return cvcs[0]->param_exists(param_name);
+  }
+  return cvm::error("Error: calling colvar::cvc_param_exists() for a variable "
+                    "with more than one component.\n", COLVARS_NOT_IMPLEMENTED);
+}
+
+
+cvm::real colvar::get_cvc_param(std::string const &param_name)
+{
+  if (is_enabled(f_cv_single_cvc)) {
+    return cvcs[0]->get_param(param_name);
+  }
+  cvm::error("Error: calling colvar::get_cvc_param() for a variable "
+             "with more than one component.\n", COLVARS_NOT_IMPLEMENTED);
+  return 0.0;
+}
+
+
+void const *colvar::get_cvc_param_ptr(std::string const &param_name)
+{
+  if (is_enabled(f_cv_single_cvc)) {
+    return cvcs[0]->get_param_ptr(param_name);
+  }
+  cvm::error("Error: calling colvar::get_cvc_param() for a variable "
+             "with more than one component.\n", COLVARS_NOT_IMPLEMENTED);
+  return NULL;
+}
+
+
+colvarvalue const *colvar::get_cvc_param_grad(std::string const &param_name)
+{
+  if (is_enabled(f_cv_single_cvc)) {
+    return cvcs[0]->get_param_grad(param_name);
+  }
+  cvm::error("Error: calling colvar::get_cvc_param_grad() for a variable "
+             "with more than one component.\n", COLVARS_NOT_IMPLEMENTED);
+  return NULL;
+}
+
+
+int colvar::set_cvc_param(std::string const &param_name, void const *new_value)
+{
+  if (is_enabled(f_cv_single_cvc)) {
+    return cvcs[0]->set_param(param_name, new_value);
+  }
+  return cvm::error("Error: calling colvar::set_cvc_param() for a variable "
+                    "with more than one component.\n", COLVARS_NOT_IMPLEMENTED);
+}
+
+
 // ******************** METRIC FUNCTIONS ********************
 // Use the metrics defined by \link colvar::cvc \endlink objects
 
@@ -1942,12 +2080,12 @@ void colvar::wrap(colvarvalue &x_unwrapped) const
 
 // ******************** INPUT FUNCTIONS ********************
 
-std::istream & colvar::read_restart(std::istream &is)
+std::istream & colvar::read_state(std::istream &is)
 {
   size_t const start_pos = is.tellg();
 
   std::string conf;
-  if ( !(is >> colvarparse::read_block("colvar", conf)) ) {
+  if ( !(is >> colvarparse::read_block("colvar", &conf)) ) {
     // this is not a colvar block
     is.clear();
     is.seekg(start_pos, std::ios::beg);
@@ -1957,15 +2095,24 @@ std::istream & colvar::read_restart(std::istream &is)
 
   {
     std::string check_name = "";
-    if ( (get_keyval(conf, "name", check_name,
-                     std::string(""), colvarparse::parse_silent)) &&
-         (check_name != name) )  {
-      cvm::error("Error: the state file does not match the "
-                 "configuration file, at colvar \""+name+"\".\n");
-    }
+    get_keyval(conf, "name", check_name,
+               std::string(""), colvarparse::parse_silent);
     if (check_name.size() == 0) {
       cvm::error("Error: Collective variable in the "
-                 "restart file without any identifier.\n");
+                 "restart file without any identifier.\n", INPUT_ERROR);
+      is.clear();
+      is.seekg(start_pos, std::ios::beg);
+      is.setstate(std::ios::failbit);
+      return is;
+    }
+
+    if (check_name != name)  {
+      if (cvm::debug()) {
+        cvm::log("Ignoring state of colvar \""+check_name+
+                 "\": this colvar is named \""+name+"\".\n");
+      }
+      is.seekg(start_pos, std::ios::beg);
+      return is;
     }
   }
 
@@ -2064,7 +2211,7 @@ std::istream & colvar::read_traj(std::istream &is)
 
 // ******************** OUTPUT FUNCTIONS ********************
 
-std::ostream & colvar::write_restart(std::ostream &os) {
+std::ostream & colvar::write_state(std::ostream &os) {
 
   os << "colvar {\n"
      << "  name " << name << "\n"
diff --git a/lib/colvars/colvar.h b/lib/colvars/colvar.h
index e2ab0f3c1d..e6fafbdec3 100644
--- a/lib/colvars/colvar.h
+++ b/lib/colvars/colvar.h
@@ -2,7 +2,7 @@
 
 // This file is part of the Collective Variables module (Colvars).
 // The original version of Colvars and its updates are located at:
-// https://github.com/colvars/colvars
+// https://github.com/Colvars/colvars
 // Please update all Colvars source files before making any changes.
 // If you wish to distribute your changes, please submit them to the
 // Colvars repository at GitHub.
@@ -217,11 +217,11 @@ public:
   /// should equal the system force plus \link f \endlink
   colvarvalue ft;
 
-
   /// Period, if this variable is periodic
   cvm::real period;
-  cvm::real wrap_center;
 
+  /// Center of wrapping, if this variable is periodic
+  cvm::real wrap_center;
 
   /// \brief Expand the boundaries of multiples of width, to keep the
   /// value always within range
@@ -229,21 +229,9 @@ public:
 
   /// \brief Location of the lower boundary
   colvarvalue lower_boundary;
-  /// \brief Location of the lower wall
-  colvarvalue lower_wall;
-  /// \brief Force constant for the lower boundary potential (|x-xb|^2)
-  cvm::real   lower_wall_k;
-  /// \brief Whether this colvar has a hard lower boundary
-  bool        hard_lower_boundary;
 
   /// \brief Location of the upper boundary
   colvarvalue upper_boundary;
-  /// \brief Location of the upper wall
-  colvarvalue upper_wall;
-  /// \brief Force constant for the upper boundary potential (|x-xb|^2)
-  cvm::real   upper_wall_k;
-  /// \brief Whether this colvar has a hard upper boundary
-  bool        hard_upper_boundary;
 
   /// \brief Is the interval defined by the two boundaries periodic?
   bool periodic_boundaries() const;
@@ -356,7 +344,7 @@ public:
   /// colvar::update()) to the external degrees of freedom
   void communicate_forces();
 
-  /// \brief Enables and disables individual CVCs based on flags
+  /// \brief Enables and disables individual CVCs based on the given array
   int set_cvc_flags(std::vector<bool> const &flags);
 
   /// \brief Updates the flags in the CVC objects, and their number
@@ -365,7 +353,23 @@ public:
   /// \brief Modify the configuration of CVCs (currently, only base class data)
   int update_cvc_config(std::vector<std::string> const &confs);
 
+  /// Whether this named parameter exists (in the first and only component)
+  int cvc_param_exists(std::string const &param_name);
+
+  /// Get the value of the named parameter (from the first and only component)
+  cvm::real get_cvc_param(std::string const &param_name);
+
+  /// Get a pointer to the named parameter (from the first and only component)
+  void const *get_cvc_param_ptr(std::string const &param_name);
+
+  /// Pointer to the derivative of the variable with respect to param_name
+  colvarvalue const *get_cvc_param_grad(std::string const &param_name);
+
+  /// Set the named parameter in the first and only component to the given value
+  int set_cvc_param(std::string const &param_name, void const *new_value);
+
 protected:
+
   /// \brief Number of CVC objects with an active flag
   size_t n_active_cvcs;
 
@@ -380,11 +384,24 @@ protected:
 
 public:
 
-  /// \brief Return the number of CVC objects defined
-  inline size_t num_cvcs() const { return cvcs.size(); }
+  /// \brief Number of dimensions of the value of this colvar
+  inline size_t num_dimensions() const
+  {
+    return value().size();
+  }
 
-  /// \brief Return the number of CVC objects with an active flag (as set by update_cvc_flags)
-  inline size_t num_active_cvcs() const { return n_active_cvcs; }
+  /// \brief Number of CVC objects defined
+  inline size_t num_cvcs() const
+  {
+    return cvcs.size();
+  }
+
+  /// \brief number of CVC objects with an active flag (as set by
+  /// update_cvc_flags)
+  inline size_t num_active_cvcs() const
+  {
+    return n_active_cvcs;
+  }
 
   /// \brief Use the internal metrics (as from \link colvar::cvc
   /// \endlink objects) to calculate square distances and gradients
@@ -413,32 +430,30 @@ public:
   /// Handles correctly symmetries and periodic boundary conditions
   void wrap(colvarvalue &x_unwrapped) const;
 
-
   /// Read the analysis tasks
   int parse_analysis(std::string const &conf);
 
   /// Perform analysis tasks
   int analyze();
 
-
   /// Read the value from a collective variable trajectory file
   std::istream & read_traj(std::istream &is);
+
   /// Output formatted values to the trajectory file
   std::ostream & write_traj(std::ostream &os);
   /// Write a label to the trajectory file (comment line)
   std::ostream & write_traj_label(std::ostream &os);
 
-
   /// Read the collective variable from a restart file
-  std::istream & read_restart(std::istream &is);
+  std::istream & read_state(std::istream &is);
   /// Write the collective variable to a restart file
-  std::ostream & write_restart(std::ostream &os);
+  std::ostream & write_state(std::ostream &os);
 
   /// Write output files (if defined, e.g. in analysis mode)
   int write_output_files();
 
-
 protected:
+
   /// Previous value (to calculate velocities during analysis)
   colvarvalue            x_old;
 
@@ -530,11 +545,12 @@ protected:
   /// Calculate the running average and its standard deviation
   int calc_runave();
 
-  /// If extended Lagrangian active: colvar energies (kinetic and harmonic potential)
+  /// If extended Lagrangian active: colvar kinetic energy
   cvm::real kinetic_energy;
+  /// If extended Lagrangian active: colvar harmonic potential
   cvm::real potential_energy;
-public:
 
+public:
 
   // collective variable component base class
   class cvc;
@@ -577,6 +593,8 @@ public:
   class CVBasedPath;
   class gspathCV;
   class gzpathCV;
+  class aspathCV;
+  class azpathCV;
 
   // non-scalar components
   class distance_vec;
@@ -596,7 +614,6 @@ protected:
   /// in all cvcs (called when enabling f_cv_collect_gradients)
   void build_atom_list(void);
 
-private:
   /// Name of scripted function to be used
   std::string scripted_function;
 
@@ -620,6 +637,7 @@ private:
 #endif
 
 public:
+
   /// \brief Sorted array of (zero-based) IDs for all atoms involved
   std::vector<int> atom_ids;
 
@@ -628,34 +646,35 @@ public:
   /// For scalar variables only!
   std::vector<cvm::rvector> atomic_gradients;
 
-  inline size_t n_components() const {
-    return cvcs.size();
-  }
-
   /// \brief Get vector of vectors of atom IDs for all atom groups
   virtual std::vector<std::vector<int> > get_atom_lists();
 };
 
+
 inline cvm::real const & colvar::force_constant() const
 {
   return ext_force_k;
 }
 
+
 inline colvarvalue const & colvar::value() const
 {
   return x_reported;
 }
 
+
 inline colvarvalue const & colvar::actual_value() const
 {
   return x;
 }
 
+
 inline colvarvalue const & colvar::run_ave() const
 {
   return runave;
 }
 
+
 inline colvarvalue const & colvar::velocity() const
 {
   return v_reported;
diff --git a/lib/colvars/colvar_UIestimator.h b/lib/colvars/colvar_UIestimator.h
index 365f46148a..cb4c7ed57d 100644
--- a/lib/colvars/colvar_UIestimator.h
+++ b/lib/colvars/colvar_UIestimator.h
@@ -2,7 +2,7 @@
 
 // This file is part of the Collective Variables module (Colvars).
 // The original version of Colvars and its updates are located at:
-// https://github.com/colvars/colvars
+// https://github.com/Colvars/colvars
 // Please update all Colvars source files before making any changes.
 // If you wish to distribute your changes, please submit them to the
 // Colvars repository at GitHub.
diff --git a/lib/colvars/colvar_arithmeticpath.h b/lib/colvars/colvar_arithmeticpath.h
new file mode 100644
index 0000000000..97d42a1bbc
--- /dev/null
+++ b/lib/colvars/colvar_arithmeticpath.h
@@ -0,0 +1,129 @@
+#ifndef ARITHMETICPATHCV_H
+#define ARITHMETICPATHCV_H
+
+#include "colvarmodule.h"
+
+#include <vector>
+#include <cmath>
+#include <iostream>
+#include <limits>
+
+namespace ArithmeticPathCV {
+
+using std::vector;
+
+enum path_sz {S, Z};
+
+template <typename element_type, typename scalar_type, path_sz path_type>
+class ArithmeticPathBase {
+public:
+    ArithmeticPathBase() {}
+    virtual ~ArithmeticPathBase() {}
+    virtual void initialize(size_t p_num_elements, size_t p_total_frames, double p_lambda, const vector<element_type>& p_element, const vector<double>& p_weights);
+    virtual void updateDistanceToReferenceFrames() = 0;
+    virtual void computeValue();
+    virtual void computeDerivatives();
+    virtual void compute();
+protected:
+    scalar_type lambda;
+    vector<scalar_type> weights;
+    size_t num_elements;
+    size_t total_frames;
+    vector< vector<element_type> > frame_element_distances;
+    scalar_type s;
+    scalar_type z;
+    vector<element_type> dsdx;
+    vector<element_type> dzdx;
+private:
+    // intermediate variables
+    vector<scalar_type> s_numerator_frame;
+    vector<scalar_type> s_denominator_frame;
+    scalar_type numerator_s;
+    scalar_type denominator_s;
+    scalar_type normalization_factor;
+};
+
+template <typename element_type, typename scalar_type, path_sz path_type>
+void ArithmeticPathBase<element_type, scalar_type, path_type>::initialize(size_t p_num_elements, size_t p_total_frames, double p_lambda, const vector<element_type>& p_element, const vector<double>& p_weights) {
+    lambda = p_lambda;
+    weights = p_weights;
+    num_elements = p_num_elements;
+    total_frames = p_total_frames;
+    frame_element_distances.resize(total_frames, p_element);
+    for (size_t i_frame = 0; i_frame < frame_element_distances.size(); ++i_frame) {
+        for (size_t j_elem = 0; j_elem < num_elements; ++j_elem) {
+            frame_element_distances[i_frame][j_elem].reset();
+        }
+    }
+    s = scalar_type(0);
+    z = scalar_type(0);
+    dsdx = p_element;
+    dzdx = p_element;
+    s_numerator_frame.resize(total_frames, scalar_type(0));
+    s_denominator_frame.resize(total_frames, scalar_type(0));
+    numerator_s = scalar_type(0);
+    denominator_s = scalar_type(0);
+    normalization_factor = 1.0 / static_cast<scalar_type>(total_frames - 1);
+}
+
+template <typename element_type, typename scalar_type, path_sz path_type>
+void ArithmeticPathBase<element_type, scalar_type, path_type>::computeValue() {
+    updateDistanceToReferenceFrames();
+    numerator_s = scalar_type(0);
+    denominator_s = scalar_type(0);
+    for (size_t i_frame = 0; i_frame < frame_element_distances.size(); ++i_frame) {
+        scalar_type exponent_tmp = scalar_type(0);
+        for (size_t j_elem = 0; j_elem < num_elements; ++j_elem) {
+            exponent_tmp += weights[j_elem] * frame_element_distances[i_frame][j_elem] * weights[j_elem] * frame_element_distances[i_frame][j_elem];
+        }
+        exponent_tmp = exponent_tmp * -1.0 * lambda;
+	// prevent underflow if the argument of cvm::exp is less than -708.4
+        if (exponent_tmp > -708.4) {
+            exponent_tmp = cvm::exp(exponent_tmp);
+        } else {
+            exponent_tmp = 0;
+        }
+        numerator_s += static_cast<scalar_type>(i_frame) * exponent_tmp;
+        denominator_s += exponent_tmp;
+        s_numerator_frame[i_frame] = static_cast<scalar_type>(i_frame) * exponent_tmp;
+        s_denominator_frame[i_frame] = exponent_tmp;
+    }
+    s = numerator_s / denominator_s * normalization_factor;
+    z = -1.0 / lambda * cvm::logn(denominator_s);
+}
+
+template <typename element_type, typename scalar_type, path_sz path_type>
+void ArithmeticPathBase<element_type, scalar_type, path_type>::compute() {
+    computeValue();
+    computeDerivatives();
+}
+
+template <typename element_type, typename scalar_type, path_sz path_type>
+void ArithmeticPathBase<element_type, scalar_type, path_type>::computeDerivatives() {
+    for (size_t j_elem = 0; j_elem < num_elements; ++j_elem) {
+        element_type dsdxj_numerator_part1(dsdx[j_elem]);
+        element_type dsdxj_numerator_part2(dsdx[j_elem]);
+        element_type dzdxj_numerator(dsdx[j_elem]);
+        dsdxj_numerator_part1.reset();
+        dsdxj_numerator_part2.reset();
+        dzdxj_numerator.reset();
+        for (size_t i_frame = 0; i_frame < frame_element_distances.size(); ++i_frame) {
+            element_type derivative_tmp = -2.0 * lambda * weights[j_elem] * weights[j_elem] * frame_element_distances[i_frame][j_elem];
+            dsdxj_numerator_part1 += s_numerator_frame[i_frame] * derivative_tmp;
+            dsdxj_numerator_part2 += s_denominator_frame[i_frame] * derivative_tmp;
+            dzdxj_numerator += s_denominator_frame[i_frame] * derivative_tmp;
+        }
+        dsdxj_numerator_part1 *= denominator_s;
+        dsdxj_numerator_part2 *= numerator_s;
+        if ((dsdxj_numerator_part1 - dsdxj_numerator_part2).norm() < std::numeric_limits<scalar_type>::min()) {
+            dsdx[j_elem] = 0;
+        } else {
+            dsdx[j_elem] = (dsdxj_numerator_part1 - dsdxj_numerator_part2) / (denominator_s * denominator_s) * normalization_factor;
+        }
+        dzdx[j_elem] = -1.0 / lambda * dzdxj_numerator / denominator_s;
+    }
+}
+
+}
+
+#endif // ARITHMETICPATHCV_H
diff --git a/lib/colvars/colvar_geometricpath.h b/lib/colvars/colvar_geometricpath.h
index a7ef7f337c..7f8acfd233 100644
--- a/lib/colvars/colvar_geometricpath.h
+++ b/lib/colvars/colvar_geometricpath.h
@@ -2,12 +2,14 @@
 #define GEOMETRICPATHCV_H
 // This file is part of the Collective Variables module (Colvars).
 // The original version of Colvars and its updates are located at:
-// https://github.com/colvars/colvars
+// https://github.com/Colvars/colvars
 // Please update all Colvars source files before making any changes.
 // If you wish to distribute your changes, please submit them to the
 // Colvars repository at GitHub.
 
 
+#include "colvarmodule.h"
+
 #include <vector>
 #include <cmath>
 #include <iostream>
@@ -67,8 +69,8 @@ public:
     virtual ~GeometricPathBase() {}
     virtual void initialize(size_t vector_size, const element_type& element = element_type(), size_t total_frames = 1, bool p_use_second_closest_frame = true, bool p_use_third_closest_frame = false, bool p_use_z_square = false);
     virtual void initialize(size_t vector_size, const std::vector<element_type>& elements, size_t total_frames = 1, bool p_use_second_closest_frame = true, bool p_use_third_closest_frame = false, bool p_use_z_square = false);
-    virtual void prepareVectors();
-    virtual void updateReferenceDistances();
+    virtual void prepareVectors() = 0;
+    virtual void updateDistanceToReferenceFrames() = 0;
     virtual void compute();
     virtual void determineClosestFrames();
     virtual void computeValue();
@@ -119,7 +121,7 @@ void GeometricPathBase<element_type, scalar_type, path_type>::initialize(size_t
 }
 
 template <typename element_type, typename scalar_type, path_sz path_type>
-void GeometricPathBase<element_type, scalar_type, path_type>::initialize(size_t vector_size, const std::vector<element_type>& elements, size_t total_frames, bool p_use_second_closest_frame, bool p_use_third_closest_frame, bool p_use_z_square) {
+void GeometricPathBase<element_type, scalar_type, path_type>::initialize(size_t /* vector_size */, const std::vector<element_type>& elements, size_t total_frames, bool p_use_second_closest_frame, bool p_use_third_closest_frame, bool p_use_z_square) {
     v1v1 = scalar_type();
     v2v2 = scalar_type();
     v3v3 = scalar_type();
@@ -151,18 +153,6 @@ void GeometricPathBase<element_type, scalar_type, path_type>::initialize(size_t
     m = static_cast<scalar_type>(1.0);
 }
 
-template <typename element_type, typename scalar_type, path_sz path_type>
-void GeometricPathBase<element_type, scalar_type, path_type>::prepareVectors() {
-    std::cout << "Warning: you should not call the prepareVectors() in base class!\n";
-    std::cout << std::flush;
-}
-
-template <typename element_type, typename scalar_type, path_sz path_type>
-void GeometricPathBase<element_type, scalar_type, path_type>::updateReferenceDistances() {
-    std::cout << "Warning: you should not call the updateReferenceDistances() in base class!\n";
-    std::cout << std::flush;
-}
-
 template <typename element_type, typename scalar_type, path_sz path_type>
 void GeometricPathBase<element_type, scalar_type, path_type>::compute() {
     computeValue();
@@ -182,7 +172,7 @@ void GeometricPathBase<element_type, scalar_type, path_type>::determineClosestFr
         // sigma(z) is on the right side of the closest frame
         sign = -1;
     }
-    if (std::abs(static_cast<long>(frame_index[0]) - static_cast<long>(frame_index[1])) > 1) {
+    if (cvm::fabs(static_cast<long>(frame_index[0]) - static_cast<long>(frame_index[1])) > 1) {
         std::cout << "Warning: Geometrical pathCV relies on the assumption that the second closest frame is the neighbouring frame\n";
         std::cout << "         Please check your configuration or increase restraint on z(σ)\n";
         for (size_t i_frame = 0; i_frame < frame_index.size(); ++i_frame) {
@@ -197,7 +187,7 @@ void GeometricPathBase<element_type, scalar_type, path_type>::determineClosestFr
 
 template <typename element_type, typename scalar_type, path_sz path_type>
 void GeometricPathBase<element_type, scalar_type, path_type>::computeValue() {
-    updateReferenceDistances();
+    updateDistanceToReferenceFrames();
     determineClosestFrames();
     prepareVectors();
     v1v1 = scalar_type();
@@ -218,14 +208,14 @@ void GeometricPathBase<element_type, scalar_type, path_type>::computeValue() {
             v4v4 += v4[i_elem] * v4[i_elem];
         }
     }
-    f = (std::sqrt(v1v3 * v1v3 - v3v3 * (v1v1 - v2v2)) - v1v3) / v3v3;
+    f = (cvm::sqrt(v1v3 * v1v3 - v3v3 * (v1v1 - v2v2)) - v1v3) / v3v3;
     if (path_type == Z) {
         dx = 0.5 * (f - 1);
         zz = v1v1 + 2 * dx * v1v4 + dx * dx * v4v4;
         if (use_z_square) {
             z = zz;
         } else {
-            z = std::sqrt(std::fabs(zz));
+            z = cvm::sqrt(cvm::fabs(zz));
         }
     }
     if (path_type == S) {
@@ -235,7 +225,7 @@ void GeometricPathBase<element_type, scalar_type, path_type>::computeValue() {
 
 template <typename element_type, typename scalar_type, path_sz path_type>
 void GeometricPathBase<element_type, scalar_type, path_type>::computeDerivatives() {
-    const scalar_type factor1 = 1.0 / (2.0 * v3v3 * std::sqrt(v1v3 * v1v3 - v3v3 * (v1v1 - v2v2)));
+    const scalar_type factor1 = 1.0 / (2.0 * v3v3 * cvm::sqrt(v1v3 * v1v3 - v3v3 * (v1v1 - v2v2)));
     const scalar_type factor2 = 1.0 / v3v3;
     for (size_t i_elem = 0; i_elem < v1.size(); ++i_elem) {
         // Compute the derivative of f with vector v1
diff --git a/lib/colvars/colvaratoms.cpp b/lib/colvars/colvaratoms.cpp
index af17d8df66..180fc69a85 100644
--- a/lib/colvars/colvaratoms.cpp
+++ b/lib/colvars/colvaratoms.cpp
@@ -2,7 +2,7 @@
 
 // This file is part of the Collective Variables module (Colvars).
 // The original version of Colvars and its updates are located at:
-// https://github.com/colvars/colvars
+// https://github.com/Colvars/colvars
 // Please update all Colvars source files before making any changes.
 // If you wish to distribute your changes, please submit them to the
 // Colvars repository at GitHub.
@@ -628,39 +628,42 @@ int cvm::atom_group::add_atom_numbers(std::string const &numbers_conf)
 
 int cvm::atom_group::add_index_group(std::string const &index_group_name)
 {
-  colvarmodule *cv = cvm::main();
+  std::vector<std::string> const &index_group_names =
+    cvm::main()->index_group_names;
+  std::vector<std::vector<int> *> const &index_groups =
+    cvm::main()->index_groups;
 
-  std::list<std::string>::iterator names_i = cv->index_group_names.begin();
-  std::list<std::vector<int> >::iterator index_groups_i = cv->index_groups.begin();
-  for ( ; names_i != cv->index_group_names.end() ; ++names_i, ++index_groups_i) {
-    if (*names_i == index_group_name)
+  size_t i_group = 0;
+  for ( ; i_group < index_groups.size(); i_group++) {
+    if (index_group_names[i_group] == index_group_name)
       break;
   }
 
-  if (names_i == cv->index_group_names.end()) {
-    cvm::error("Error: could not find index group "+
-               index_group_name+" among those provided by the index file.\n",
-               INPUT_ERROR);
-    return COLVARS_ERROR;
+  if (i_group >= index_group_names.size()) {
+    return cvm::error("Error: could not find index group "+
+                      index_group_name+" among those already provided.\n",
+                      INPUT_ERROR);
   }
 
-  atoms_ids.reserve(atoms_ids.size()+index_groups_i->size());
+  int error_code = COLVARS_OK;
+
+  std::vector<int> const &index_group = *(index_groups[i_group]);
+
+  atoms_ids.reserve(atoms_ids.size()+index_group.size());
 
   if (is_enabled(f_ag_scalable)) {
-    for (size_t i = 0; i < index_groups_i->size(); i++) {
-      add_atom_id((cvm::proxy)->check_atom_id((*index_groups_i)[i]));
+    for (size_t i = 0; i < index_group.size(); i++) {
+      error_code |=
+        add_atom_id((cvm::proxy)->check_atom_id(index_group[i]));
     }
   } else {
-    atoms.reserve(atoms.size()+index_groups_i->size());
-    for (size_t i = 0; i < index_groups_i->size(); i++) {
-      add_atom(cvm::atom((*index_groups_i)[i]));
+    atoms.reserve(atoms.size()+index_group.size());
+    for (size_t i = 0; i < index_group.size(); i++) {
+      error_code |= add_atom(cvm::atom(index_group[i]));
     }
   }
 
-  if (cvm::get_error())
-    return COLVARS_ERROR;
-
-  return COLVARS_OK;
+  return error_code;
 }
 
 
diff --git a/lib/colvars/colvaratoms.h b/lib/colvars/colvaratoms.h
index c8b6ac4541..af6a529f8a 100644
--- a/lib/colvars/colvaratoms.h
+++ b/lib/colvars/colvaratoms.h
@@ -2,7 +2,7 @@
 
 // This file is part of the Collective Variables module (Colvars).
 // The original version of Colvars and its updates are located at:
-// https://github.com/colvars/colvars
+// https://github.com/Colvars/colvars
 // Please update all Colvars source files before making any changes.
 // If you wish to distribute your changes, please submit them to the
 // Colvars repository at GitHub.
diff --git a/lib/colvars/colvarbias.cpp b/lib/colvars/colvarbias.cpp
index 724326d3b4..09bcca01b5 100644
--- a/lib/colvars/colvarbias.cpp
+++ b/lib/colvars/colvarbias.cpp
@@ -2,7 +2,7 @@
 
 // This file is part of the Collective Variables module (Colvars).
 // The original version of Colvars and its updates are located at:
-// https://github.com/colvars/colvars
+// https://github.com/Colvars/colvars
 // Please update all Colvars source files before making any changes.
 // If you wish to distribute your changes, please submit them to the
 // Colvars repository at GitHub.
@@ -15,8 +15,10 @@
 
 
 colvarbias::colvarbias(char const *key)
-  : bias_type(to_lower_cppstr(key))
 {
+  bias_type = to_lower_cppstr(key);
+  state_keyword = bias_type;
+
   description = "uninitialized " + cvm::to_str(key) + " bias";
   init_dependencies();
   rank = 1;
@@ -25,6 +27,7 @@ colvarbias::colvarbias(char const *key)
   b_output_energy = false;
   reset();
   state_file_step = 0L;
+  matching_state = false;
 }
 
 
@@ -80,10 +83,21 @@ int colvarbias::init(std::string const &conf)
     cvm::log("Reinitializing bias \""+name+"\".\n");
   }
 
+  colvar_values.resize(num_variables());
+
+  for (i = 0; i < num_variables(); i++) {
+    colvar_values[i].type(colvars[i]->value().type());
+    colvar_forces[i].type(colvar_values[i].type());
+    previous_colvar_forces[i].type(colvar_values[i].type());
+  }
+
   output_prefix = cvm::output_prefix();
 
   get_keyval(conf, "outputEnergy", b_output_energy, b_output_energy);
 
+  // Disabled by default in base class; default value can be overridden by derived class constructor
+  get_keyval_feature(this, conf, "bypassExtendedLagrangian", f_cvb_bypass_ext_lagrangian, is_enabled(f_cvb_bypass_ext_lagrangian), parse_silent);
+
   get_keyval(conf, "timeStepFactor", time_step_factor, 1);
   if (time_step_factor < 1) {
     cvm::error("Error: timeStepFactor must be 1 or greater.\n");
@@ -114,6 +128,11 @@ int colvarbias::init_dependencies() {
     init_feature(f_cvb_apply_force, "apply force", f_type_user);
     require_feature_children(f_cvb_apply_force, f_cv_gradient);
 
+    init_feature(f_cvb_bypass_ext_lagrangian, "bypass extended-Lagrangian coordinates", f_type_user);
+    // The exclusion below prevents the inconsistency where biasing forces are applied onto
+    // the actual colvar, while total forces are measured on the extended coordinate
+    exclude_feature_self(f_cvb_bypass_ext_lagrangian, f_cvb_get_total_force);
+
     init_feature(f_cvb_get_total_force, "obtain total force", f_type_dynamic);
     require_feature_children(f_cvb_get_total_force, f_cv_total_force);
 
@@ -158,6 +177,12 @@ int colvarbias::init_dependencies() {
   // only compute TI samples when deriving from colvarbias_ti
   feature_states[f_cvb_calc_ti_samples].available = false;
 
+  // The feature f_cvb_bypass_ext_lagrangian is only implemented by some derived classes
+  // (initially, harmonicWalls)
+  feature_states[f_cvb_bypass_ext_lagrangian].available = false;
+  // disabled by default; can be changed by derived classes that implement it
+  feature_states[f_cvb_bypass_ext_lagrangian].enabled = false;
+
   return COLVARS_OK;
 }
 
@@ -233,25 +258,18 @@ int colvarbias::add_colvar(std::string const &cv_name)
     }
 
     colvars.push_back(cv);
+    cv->biases.push_back(this); // add back-reference to this bias to colvar
+
+    // Add dependency link. All biases need at least the value of each colvar
+    // although possibly not at all timesteps
+    add_child(cv);
 
     colvar_forces.push_back(colvarvalue());
     colvar_forces.back().type(cv->value()); // make sure each force is initialized to zero
     colvar_forces.back().is_derivative(); // colvar constraints are not applied to the force
     colvar_forces.back().reset();
-
     previous_colvar_forces.push_back(colvar_forces.back());
 
-    cv->biases.push_back(this); // add back-reference to this bias to colvar
-
-    if (is_enabled(f_cvb_apply_force)) {
-      cv->enable(f_cv_gradient);
-    }
-
-    // Add dependency link.
-    // All biases need at least the value of each colvar
-    // although possibly not at all timesteps
-    add_child(cv);
-
   } else {
     cvm::error("Error: cannot find a colvar named \""+
                cv_name+"\".\n", INPUT_ERROR);
@@ -268,13 +286,34 @@ int colvarbias::update()
     cvm::log("Updating the "+bias_type+" bias \""+this->name+"\".\n");
   }
 
+  int error_code = COLVARS_OK;
+
   has_data = true;
 
+  // Update the cached colvar values
+  for (size_t i = 0; i < num_variables(); i++) {
+    colvar_values[i] = colvars[i]->value();
+  }
+
+  error_code |= calc_energy(NULL);
+  error_code |= calc_forces(NULL);
+
+  return error_code;
+}
+
+
+int colvarbias::calc_energy(std::vector<colvarvalue> const *)
+{
   bias_energy = 0.0;
+  return COLVARS_OK;
+}
+
+
+int colvarbias::calc_forces(std::vector<colvarvalue> const *)
+{
   for (size_t ir = 0; ir < num_variables(); ir++) {
     colvar_forces[ir].reset();
   }
-
   return COLVARS_OK;
 }
 
@@ -295,9 +334,11 @@ void colvarbias::communicate_forces()
     // may send forces to the same colvar
     // which is why rescaling has to happen now: the colvar is not
     // aware of this bias' time_step_factor
-    variables(i)->add_bias_force(cvm::real(time_step_factor) * colvar_forces[i]);
-  }
-  for (i = 0; i < num_variables(); i++) {
+    if (is_enabled(f_cvb_bypass_ext_lagrangian)) {
+      variables(i)->add_bias_force_actual_value(cvm::real(time_step_factor) * colvar_forces[i]);
+    } else {
+      variables(i)->add_bias_force(cvm::real(time_step_factor) * colvar_forces[i]);
+    }
     previous_colvar_forces[i] = colvar_forces[i];
   }
 }
@@ -309,7 +350,7 @@ int colvarbias::end_of_step()
 }
 
 
-int colvarbias::change_configuration(std::string const &conf)
+int colvarbias::change_configuration(std::string const & /* conf */)
 {
   cvm::error("Error: change_configuration() not implemented.\n",
              COLVARS_NOT_IMPLEMENTED);
@@ -317,7 +358,7 @@ int colvarbias::change_configuration(std::string const &conf)
 }
 
 
-cvm::real colvarbias::energy_difference(std::string const &conf)
+cvm::real colvarbias::energy_difference(std::string const & /* conf */)
 {
   cvm::error("Error: energy_difference() not implemented.\n",
              COLVARS_NOT_IMPLEMENTED);
@@ -336,7 +377,7 @@ int colvarbias::current_bin()
   cvm::error("Error: current_bin() not implemented.\n");
   return COLVARS_NOT_IMPLEMENTED;
 }
-int colvarbias::bin_count(int bin_index)
+int colvarbias::bin_count(int /* bin_index */)
 {
   cvm::error("Error: bin_count() not implemented.\n");
   return COLVARS_NOT_IMPLEMENTED;
@@ -359,20 +400,27 @@ std::string const colvarbias::get_state_params() const
 
 int colvarbias::set_state_params(std::string const &conf)
 {
-  std::string new_name = "";
-  if (colvarparse::get_keyval(conf, "name", new_name,
-                              std::string(""), colvarparse::parse_silent) &&
-      (new_name != this->name)) {
-    cvm::error("Error: in the state file, the "
-               "\""+bias_type+"\" block has a different name, \""+new_name+
-               "\": different system?\n", INPUT_ERROR);
-  }
+  matching_state = false;
 
-  if (name.size() == 0) {
+  std::string check_name = "";
+  colvarparse::get_keyval(conf, "name", check_name,
+                          std::string(""), colvarparse::parse_silent);
+
+  if (check_name.size() == 0) {
     cvm::error("Error: \""+bias_type+"\" block within the restart file "
                "has no identifiers.\n", INPUT_ERROR);
   }
 
+  if (check_name != this->name) {
+    if (cvm::debug()) {
+      cvm::log("Ignoring state of bias \""+check_name+
+               "\": this bias is named \""+name+"\".\n");
+    }
+    return COLVARS_OK;
+  }
+
+  matching_state = true;
+
   colvarparse::get_keyval(conf, "step", state_file_step,
                           cvm::step_absolute(), colvarparse::parse_silent);
 
@@ -387,7 +435,7 @@ std::ostream & colvarbias::write_state(std::ostream &os)
   }
   os.setf(std::ios::scientific, std::ios::floatfield);
   os.precision(cvm::cv_prec);
-  os << bias_type << " {\n"
+  os << state_keyword << " {\n"
      << "  configuration {\n";
   std::istringstream is(get_state_params());
   std::string line;
@@ -406,11 +454,12 @@ std::istream & colvarbias::read_state(std::istream &is)
   size_t const start_pos = is.tellg();
 
   std::string key, brace, conf;
-  if ( !(is >> key)   || !(key == bias_type) ||
+  if ( !(is >> key)   || !(key == state_keyword || key == bias_type) ||
        !(is >> brace) || !(brace == "{") ||
-       !(is >> colvarparse::read_block("configuration", conf)) ||
+       !(is >> colvarparse::read_block("configuration", &conf)) ||
        (set_state_params(conf) != COLVARS_OK) ) {
-    cvm::error("Error: in reading state configuration for \""+bias_type+"\" bias \""+
+    cvm::error("Error: in reading state configuration for \""+bias_type+
+               "\" bias \""+
                this->name+"\" at position "+
                cvm::to_str(static_cast<size_t>(is.tellg()))+
                " in stream.\n", INPUT_ERROR);
@@ -420,6 +469,15 @@ std::istream & colvarbias::read_state(std::istream &is)
     return is;
   }
 
+  if (matching_state == false) {
+    // This state is not for this bias
+    is.seekg(start_pos, std::ios::beg);
+    return is;
+  }
+
+  cvm::log("Restarting "+bias_type+" bias \""+name+"\" from step number "+
+           cvm::to_str(state_file_step)+".\n");
+
   if (!read_state_data(is)) {
     cvm::error("Error: in reading state data for \""+bias_type+"\" bias \""+
                this->name+"\" at position "+
@@ -646,7 +704,7 @@ std::string const colvarbias_ti::get_state_params() const
 }
 
 
-int colvarbias_ti::set_state_params(std::string const &state_conf)
+int colvarbias_ti::set_state_params(std::string const & /* state_conf */)
 {
   return COLVARS_OK;
 }
diff --git a/lib/colvars/colvarbias.h b/lib/colvars/colvarbias.h
index eac88a7f18..5179c42853 100644
--- a/lib/colvars/colvarbias.h
+++ b/lib/colvars/colvarbias.h
@@ -2,7 +2,7 @@
 
 // This file is part of the Collective Variables module (Colvars).
 // The original version of Colvars and its updates are located at:
-// https://github.com/colvars/colvars
+// https://github.com/Colvars/colvars
 // Please update all Colvars source files before making any changes.
 // If you wish to distribute your changes, please submit them to the
 // Colvars repository at GitHub.
@@ -23,9 +23,12 @@ public:
   /// Name of this bias
   std::string name;
 
-  /// Type of this bias
+  /// Keyword indicating the type of this bias
   std::string bias_type;
 
+  /// Keyword used in state files (== bias_type most of the time)
+  std::string state_keyword;
+
   /// If there is more than one bias of this type, record its rank
   int rank;
 
@@ -51,20 +54,21 @@ public:
   }
 
   /// Retrieve colvar values and calculate their biasing forces
-  /// Return bias energy
+  /// Some implementations may use calc_energy() and calc_forces()
   virtual int update();
 
-  /// \brief Compute the energy of the bias with alternative values of the
-  /// collective variables (suitable for bias exchange)
-  virtual int calc_energy(std::vector<colvarvalue> const &values =
-                          std::vector<colvarvalue>(0))
-  {
-    cvm::error("Error: calc_energy() not implemented.\n", COLVARS_NOT_IMPLEMENTED);
-    return COLVARS_NOT_IMPLEMENTED;
-  }
+  /// Compute the energy of the bias
+  /// Uses the vector of colvar values provided if not NULL, and the values
+  /// currently cached in the bias instance otherwise
+  virtual int calc_energy(std::vector<colvarvalue> const *values);
+
+  /// Compute the forces due to the bias
+  /// Uses the vector of colvar values provided if not NULL, and the values
+  /// currently cached in the bias instance otherwise
+  virtual int calc_forces(std::vector<colvarvalue> const *values);
 
   /// Send forces to the collective variables
-  virtual void communicate_forces();
+  void communicate_forces();
 
   /// Carry out operations needed before next step is run
   virtual int end_of_step();
@@ -143,10 +147,10 @@ public:
   std::istream & read_state_data_key(std::istream &is, char const *key);
 
   /// Write the bias configuration to a restart file or other stream
-  virtual std::ostream & write_state(std::ostream &os);
+  std::ostream & write_state(std::ostream &os);
 
   /// Read the bias configuration from a restart file or other stream
-  virtual std::istream & read_state(std::istream &is);
+  std::istream & read_state(std::istream &is);
 
   /// Write a label to the trajectory file (comment line)
   virtual std::ostream & write_traj_label(std::ostream &os);
@@ -206,6 +210,9 @@ protected:
   /// through each colvar object
   std::vector<colvar *>    colvars;
 
+  /// \brief Up to date value of each colvar
+  std::vector<colvarvalue> colvar_values;
+
   /// \brief Current forces from this bias to the variables
   std::vector<colvarvalue> colvar_forces;
 
@@ -225,6 +232,9 @@ protected:
   /// \brief Step number read from the last state file
   cvm::step_number         state_file_step;
 
+  /// Flag used to tell if the state string being read is for this bias
+  bool matching_state;
+
 };
 
 
diff --git a/lib/colvars/colvarbias_abf.cpp b/lib/colvars/colvarbias_abf.cpp
index bac021be99..5382a828f7 100644
--- a/lib/colvars/colvarbias_abf.cpp
+++ b/lib/colvars/colvarbias_abf.cpp
@@ -2,7 +2,7 @@
 
 // This file is part of the Collective Variables module (Colvars).
 // The original version of Colvars and its updates are located at:
-// https://github.com/colvars/colvars
+// https://github.com/Colvars/colvars
 // Please update all Colvars source files before making any changes.
 // If you wish to distribute your changes, please submit them to the
 // Colvars repository at GitHub.
@@ -35,6 +35,8 @@ int colvarbias_abf::init(std::string const &conf)
 {
   colvarbias::init(conf);
 
+  colvarproxy *proxy = cvm::main()->proxy;
+
   enable(f_cvb_scalar_variables);
   enable(f_cvb_calc_pmf);
 
@@ -76,11 +78,13 @@ int colvarbias_abf::init(std::string const &conf)
   // shared ABF
   get_keyval(conf, "shared", shared_on, false);
   if (shared_on) {
-    if (!cvm::replica_enabled() || cvm::replica_num() <= 1) {
-      cvm::error("Error: shared ABF requires more than one replica.");
-      return COLVARS_ERROR;
+    if ((proxy->replica_enabled() != COLVARS_OK) ||
+        (proxy->num_replicas() <= 1)) {
+      return cvm::error("Error: shared ABF requires more than one replica.",
+                        INPUT_ERROR);
     }
-    cvm::log("shared ABF will be applied among "+ cvm::to_str(cvm::replica_num()) + " replicas.\n");
+    cvm::log("shared ABF will be applied among "+
+             cvm::to_str(proxy->num_replicas()) + " replicas.\n");
     if (cvm::proxy->smp_enabled() == COLVARS_OK) {
       cvm::error("Error: shared ABF is currently not available with SMP parallelism; "
                  "please set \"SMP off\" at the top of the Colvars configuration file.\n",
@@ -111,7 +115,7 @@ int colvarbias_abf::init(std::string const &conf)
     if (colvars[i]->value().type() != colvarvalue::type_scalar) {
       cvm::error("Error: ABF bias can only use scalar-type variables.\n");
     }
-    colvars[i]->enable(f_cv_grid);
+    colvars[i]->enable(f_cv_grid); // Could be a child dependency of a f_cvb_use_grids feature
     if (hide_Jacobian) {
       colvars[i]->enable(f_cv_hide_Jacobian);
     }
@@ -483,13 +487,18 @@ int colvarbias_abf::update()
     eabf_UI.update(cvm::step_absolute(), x, y);
   }
 
+  /// Add the bias energy for 1D ABF
+  bias_energy = calc_energy(NULL);
+
   return COLVARS_OK;
 }
 
 
 int colvarbias_abf::replica_share() {
 
-  if ( !cvm::replica_enabled() ) {
+  colvarproxy *proxy = cvm::main()->proxy;
+
+  if (proxy->replica_enabled() != COLVARS_OK) {
     cvm::error("Error: shared ABF: No replicas.\n");
     return COLVARS_ERROR;
   }
@@ -508,12 +517,12 @@ int colvarbias_abf::replica_share() {
   size_t msg_total = data_n*sizeof(size_t) + samp_start;
   char* msg_data = new char[msg_total];
 
-  if (cvm::replica_index() == 0) {
+  if (proxy->replica_index() == 0) {
     int p;
     // Replica 0 collects the delta gradient and count from the others.
-    for (p = 1; p < cvm::replica_num(); p++) {
+    for (p = 1; p < proxy->num_replicas(); p++) {
       // Receive the deltas.
-      cvm::replica_comm_recv(msg_data, msg_total, p);
+      proxy->replica_comm_recv(msg_data, msg_total, p);
 
       // Map the deltas from the others into the grids.
       last_gradients->raw_data_in((cvm::real*)(&msg_data[0]));
@@ -528,8 +537,8 @@ int colvarbias_abf::replica_share() {
     // Now we must send the combined gradient to the other replicas.
     gradients->raw_data_out((cvm::real*)(&msg_data[0]));
     samples->raw_data_out((size_t*)(&msg_data[samp_start]));
-    for (p = 1; p < cvm::replica_num(); p++) {
-      cvm::replica_comm_send(msg_data, msg_total, p);
+    for (p = 1; p < proxy->num_replicas(); p++) {
+      proxy->replica_comm_send(msg_data, msg_total, p);
     }
 
   } else {
@@ -541,10 +550,10 @@ int colvarbias_abf::replica_share() {
     // Cast the raw char data to the gradient and samples.
     last_gradients->raw_data_out((cvm::real*)(&msg_data[0]));
     last_samples->raw_data_out((size_t*)(&msg_data[samp_start]));
-    cvm::replica_comm_send(msg_data, msg_total, 0);
+    proxy->replica_comm_send(msg_data, msg_total, 0);
 
     // We now receive the combined gradient from Replica 0.
-    cvm::replica_comm_recv(msg_data, msg_total, 0);
+    proxy->replica_comm_recv(msg_data, msg_total, 0);
     // We sync to the combined gradient computed by Replica 0.
     gradients->raw_data_in((cvm::real*)(&msg_data[0]));
     samples->raw_data_in((size_t*)(&msg_data[samp_start]));
@@ -552,7 +561,7 @@ int colvarbias_abf::replica_share() {
 
   // Without a barrier it's possible that one replica starts
   // share 2 when other replicas haven't finished share 1.
-  cvm::replica_comm_barrier();
+  proxy->replica_comm_barrier();
   // Done syncing the replicas.
   delete[] msg_data;
 
@@ -832,3 +841,50 @@ int colvarbias_abf::write_output_files()
   write_gradients_samples(output_prefix);
   return COLVARS_OK;
 }
+
+int colvarbias_abf::calc_energy(std::vector<colvarvalue> const *values)
+{
+  if (values) {
+    return cvm::error("colvarbias_abf::calc_energy() with an argument "
+                      "is currently not implemented.\n",
+                      COLVARS_NOT_IMPLEMENTED);
+  }
+
+  if (num_variables() != 1) return 0.0;
+
+  // Get the home bin.
+  int home0 = gradients->current_bin_scalar(0);
+  if (home0 < 0) return 0.0;
+  int gradient_len = (int)(gradients->number_of_points(0));
+  int home = (home0 < gradient_len) ? home0 : (gradient_len-1);
+
+  // Integrate the gradient up to the home bin.
+  cvm::real sum = 0.0;
+  for (int i = 0; i < home; i++) {
+    std::vector<int> ix(1,i);
+
+    // Include the full_samples factor if necessary.
+    unsigned int count = samples->value(ix);
+    cvm::real fact = 1.0;
+    if ( count < full_samples ) {
+      fact = (count < min_samples) ? 0.0 :
+        (cvm::real(count - min_samples)) / (cvm::real(full_samples - min_samples));
+    }
+    if (count > 0) sum += fact*gradients->value(ix)/count*gradients->widths[0];
+  }
+
+  // Integrate the gradient up to the current position in the home interval, a fractional portion of a bin.
+  std::vector<int> ix(1,home);
+  cvm::real frac = gradients->current_bin_scalar_fraction(0);
+  unsigned int count = samples->value(ix);
+  cvm::real fact = 1.0;
+  if ( count < full_samples ) {
+    fact = (count < min_samples) ? 0.0 :
+      (cvm::real(count - min_samples)) / (cvm::real(full_samples - min_samples));
+  }
+  if (count > 0)
+    sum += fact*gradients->value(ix)/count*gradients->widths[0]*frac;
+
+  // The applied potential is the negative integral of force samples.
+  return -sum;
+}
diff --git a/lib/colvars/colvarbias_abf.h b/lib/colvars/colvarbias_abf.h
index 4bcc149da5..1939b61a8b 100644
--- a/lib/colvars/colvarbias_abf.h
+++ b/lib/colvars/colvarbias_abf.h
@@ -2,7 +2,7 @@
 
 // This file is part of the Collective Variables module (Colvars).
 // The original version of Colvars and its updates are located at:
-// https://github.com/colvars/colvars
+// https://github.com/Colvars/colvars
 // Please update all Colvars source files before making any changes.
 // If you wish to distribute your changes, please submit them to the
 // Colvars repository at GitHub.
@@ -109,7 +109,7 @@ private:
   colvar_grid_gradient  *z_gradients;
   /// n-dim grid of number of samples on "real" coordinate for eABF z-based estimator
   colvar_grid_count     *z_samples;
-  /// n-dim grid contining CZAR estimator of "real" free energy gradients
+  /// n-dim grid containing CZAR estimator of "real" free energy gradients
   colvar_grid_gradient  *czar_gradients;
   /// n-dim grid of CZAR pmf (dimension 1 to 3)
   integrate_potential   *czar_pmf;
@@ -159,7 +159,9 @@ private:
   virtual std::istream& read_state_data(std::istream&);
   virtual std::ostream& write_state_data(std::ostream&);
   virtual int write_output_files();
+
+  /// Calculate the bias energy for 1D ABF
+  virtual int calc_energy(std::vector<colvarvalue> const *values);
 };
 
 #endif
-
diff --git a/lib/colvars/colvarbias_alb.cpp b/lib/colvars/colvarbias_alb.cpp
index 187ecc363a..3508270bf6 100644
--- a/lib/colvars/colvarbias_alb.cpp
+++ b/lib/colvars/colvarbias_alb.cpp
@@ -2,7 +2,7 @@
 
 // This file is part of the Collective Variables module (Colvars).
 // The original version of Colvars and its updates are located at:
-// https://github.com/colvars/colvars
+// https://github.com/Colvars/colvars
 // Please update all Colvars source files before making any changes.
 // If you wish to distribute your changes, please submit them to the
 // Colvars repository at GitHub.
@@ -246,6 +246,12 @@ int colvarbias_alb::update()
 
 int colvarbias_alb::set_state_params(std::string const &conf)
 {
+  int error_code = colvarbias::set_state_params(conf);
+
+  if (error_code != COLVARS_OK) {
+    return error_code;
+  }
+
   if (!get_keyval(conf, "setCoupling", set_coupling))
     cvm::fatal_error("Error: current setCoupling  is missing from the restart.\n");
 
@@ -255,14 +261,12 @@ int colvarbias_alb::set_state_params(std::string const &conf)
   if (!get_keyval(conf, "maxCouplingRange", max_coupling_range))
     cvm::fatal_error("Error: maxCouplingRange  is missing from the restart.\n");
 
-
   if (!get_keyval(conf, "couplingRate", coupling_rate))
     cvm::fatal_error("Error: current setCoupling  is missing from the restart.\n");
 
   if (!get_keyval(conf, "couplingAccum", coupling_accum))
     cvm::fatal_error("Error: couplingAccum is missing from the restart.\n");
 
-
   if (!get_keyval(conf, "mean", means))
     cvm::fatal_error("Error: current mean is missing from the restart.\n");
 
@@ -388,7 +392,7 @@ std::ostream & colvarbias_alb::write_traj(std::ostream &os)
     for (size_t i = 0; i < means.size(); i++) {
       os << " "
          << std::setprecision(cvm::cv_prec) << std::setw(cvm::cv_width)
-         << -2. * (means[i] / (static_cast<cvm::real> (colvar_centers[i])) - 1) * ssd[i] / (fmax(update_calls,2) - 1);
+         << -2.0 * (means[i] / (static_cast<cvm::real>(colvar_centers[i])) - 1) * ssd[i] / (fmax(update_calls, 2.0) - 1);
 
     }
 
@@ -405,8 +409,8 @@ cvm::real colvarbias_alb::restraint_potential(cvm::real k,
 
 
 colvarvalue colvarbias_alb::restraint_force(cvm::real k,
-                                            colvar const *x,
-                                            colvarvalue const &xcenter) const
+                                            colvar const * /* x */,
+                                            colvarvalue const & /* xcenter */) const
 {
   return k;
 }
diff --git a/lib/colvars/colvarbias_alb.h b/lib/colvars/colvarbias_alb.h
index d003c244e9..4d16a4e7e2 100644
--- a/lib/colvars/colvarbias_alb.h
+++ b/lib/colvars/colvarbias_alb.h
@@ -2,7 +2,7 @@
 
 // This file is part of the Collective Variables module (Colvars).
 // The original version of Colvars and its updates are located at:
-// https://github.com/colvars/colvars
+// https://github.com/Colvars/colvars
 // Please update all Colvars source files before making any changes.
 // If you wish to distribute your changes, please submit them to the
 // Colvars repository at GitHub.
diff --git a/lib/colvars/colvarbias_histogram.cpp b/lib/colvars/colvarbias_histogram.cpp
index 329b1d9dc0..92985b0f61 100644
--- a/lib/colvars/colvarbias_histogram.cpp
+++ b/lib/colvars/colvarbias_histogram.cpp
@@ -2,7 +2,7 @@
 
 // This file is part of the Collective Variables module (Colvars).
 // The original version of Colvars and its updates are located at:
-// https://github.com/colvars/colvars
+// https://github.com/Colvars/colvars
 // Please update all Colvars source files before making any changes.
 // If you wish to distribute your changes, please submit them to the
 // Colvars repository at GitHub.
@@ -17,6 +17,7 @@ colvarbias_histogram::colvarbias_histogram(char const *key)
   : colvarbias(key),
     grid(NULL), out_name("")
 {
+  provide(f_cvb_bypass_ext_lagrangian); // Allow histograms of actual cv for extended-Lagrangian
 }
 
 
@@ -78,12 +79,16 @@ int colvarbias_histogram::init(std::string const &conf)
   }
 
   for (i = 0; i < num_variables(); i++) {
-    colvars[i]->enable(f_cv_grid);
+    colvars[i]->enable(f_cv_grid); // Could be a child dependency of a f_cvb_use_grids feature
   }
 
   grid = new colvar_grid_scalar();
   grid->init_from_colvars(colvars);
 
+  if (is_enabled(f_cvb_bypass_ext_lagrangian)) {
+    grid->request_actual_value();
+  }
+
   {
     std::string grid_conf;
     if (key_lookup(conf, "histogramGrid", &grid_conf)) {
diff --git a/lib/colvars/colvarbias_histogram.h b/lib/colvars/colvarbias_histogram.h
index 23565caa5c..2e6c6884fb 100644
--- a/lib/colvars/colvarbias_histogram.h
+++ b/lib/colvars/colvarbias_histogram.h
@@ -2,7 +2,7 @@
 
 // This file is part of the Collective Variables module (Colvars).
 // The original version of Colvars and its updates are located at:
-// https://github.com/colvars/colvars
+// https://github.com/Colvars/colvars
 // Please update all Colvars source files before making any changes.
 // If you wish to distribute your changes, please submit them to the
 // Colvars repository at GitHub.
diff --git a/lib/colvars/colvarbias_meta.cpp b/lib/colvars/colvarbias_meta.cpp
index 8540e4a945..05f293d872 100644
--- a/lib/colvars/colvarbias_meta.cpp
+++ b/lib/colvars/colvarbias_meta.cpp
@@ -2,7 +2,7 @@
 
 // This file is part of the Collective Variables module (Colvars).
 // The original version of Colvars and its updates are located at:
-// https://github.com/colvars/colvars
+// https://github.com/Colvars/colvars
 // Please update all Colvars source files before making any changes.
 // If you wish to distribute your changes, please submit them to the
 // Colvars repository at GitHub.
@@ -38,14 +38,37 @@ colvarbias_meta::colvarbias_meta(char const *key)
   new_hills_begin = hills.end();
   hills_traj_os = NULL;
 
+  hill_width = 0.0;
+
+  new_hill_freq = 1000;
+
+  use_grids = true;
+  grids_freq = 0;
+  rebin_grids = false;
+  hills_energy = NULL;
+  hills_energy_gradients = NULL;
+
+  dump_fes = true;
+  keep_hills = false;
+  dump_fes_save = false;
+  dump_replica_fes = false;
+
+  b_hills_traj = false;
+
   ebmeta_equil_steps = 0L;
+
+  replica_update_freq = 0;
+  replica_id.clear();
 }
 
 
 int colvarbias_meta::init(std::string const &conf)
 {
-  colvarbias::init(conf);
-  colvarbias_ti::init(conf);
+  int error_code = COLVARS_OK;
+  size_t i = 0;
+
+  error_code |= colvarbias::init(conf);
+  error_code |= colvarbias_ti::init(conf);
 
   enable(f_cvb_calc_pmf);
 
@@ -56,16 +79,38 @@ int colvarbias_meta::init(std::string const &conf)
     cvm::error("Error: hillWeight must be provided, and a positive number.\n", INPUT_ERROR);
   }
 
-  get_keyval(conf, "newHillFrequency", new_hill_freq, 1000);
+  get_keyval(conf, "newHillFrequency", new_hill_freq, new_hill_freq);
   if (new_hill_freq > 0) {
     enable(f_cvb_history_dependent);
+    if (grids_freq == 0) {
+      grids_freq = new_hill_freq;
+    }
   }
 
-  get_keyval(conf, "hillWidth", hill_width, cvm::sqrt(2.0 * PI) / 2.0);
-  cvm::log("Half-widths of the Gaussian hills (sigma's):\n");
-  for (size_t i = 0; i < num_variables(); i++) {
-    cvm::log(variables(i)->name+std::string(": ")+
-             cvm::to_str(0.5 * variables(i)->width * hill_width));
+  get_keyval(conf, "gaussianSigmas", colvar_sigmas, colvar_sigmas);
+
+  get_keyval(conf, "hillWidth", hill_width, hill_width);
+
+  if ((colvar_sigmas.size() > 0) && (hill_width > 0.0)) {
+    error_code |= cvm::error("Error: hillWidth and gaussianSigmas are "
+                             "mutually exclusive.", INPUT_ERROR);
+  }
+
+  if (hill_width > 0.0) {
+    colvar_sigmas.resize(num_variables());
+    // Print the calculated sigma parameters
+    cvm::log("Half-widths of the Gaussian hills (sigma's):\n");
+    for (i = 0; i < num_variables(); i++) {
+      colvar_sigmas[i] = variables(i)->width * hill_width / 2.0;
+      cvm::log(variables(i)->name+std::string(": ")+
+               cvm::to_str(colvar_sigmas[i]));
+    }
+  }
+
+  if (colvar_sigmas.size() == 0) {
+    error_code |= cvm::error("Error: positive values are required for "
+                             "either hillWidth or gaussianSigmas.",
+                             INPUT_ERROR);
   }
 
   {
@@ -77,21 +122,23 @@ int colvarbias_meta::init(std::string const &conf)
       comm = single_replica;
   }
 
-  // in all cases, the first replica is this bias itself
-  if (replicas.size() == 0) {
-    replicas.push_back(this);
-  }
-
-  get_keyval(conf, "useGrids", use_grids, true);
+  get_keyval(conf, "useGrids", use_grids, use_grids);
 
   if (use_grids) {
-    get_keyval(conf, "gridsUpdateFrequency", grids_freq, new_hill_freq);
-    get_keyval(conf, "rebinGrids", rebin_grids, false);
+
+    for (i = 0; i < num_variables(); i++) {
+      if (2.0*colvar_sigmas[i] < variables(i)->width) {
+        cvm::log("Warning: gaussianSigmas is too narrow for the grid "
+                 "spacing along "+variables(i)->name+".");
+      }
+    }
+
+    get_keyval(conf, "gridsUpdateFrequency", grids_freq, grids_freq);
+    get_keyval(conf, "rebinGrids", rebin_grids, rebin_grids);
 
     expand_grids = false;
-    size_t i;
     for (i = 0; i < num_variables(); i++) {
-      variables(i)->enable(f_cv_grid);
+      variables(i)->enable(f_cv_grid); // Could be a child dependency of a f_cvb_use_grids feature
       if (variables(i)->expand_boundaries) {
         expand_grids = true;
         cvm::log("Metadynamics bias \""+this->name+"\""+
@@ -101,67 +148,26 @@ int colvarbias_meta::init(std::string const &conf)
       }
     }
 
-    get_keyval(conf, "keepHills", keep_hills, false);
-    if (! get_keyval(conf, "writeFreeEnergyFile", dump_fes, true))
-      get_keyval(conf, "dumpFreeEnergyFile", dump_fes, true, colvarparse::parse_silent);
-    if (get_keyval(conf, "saveFreeEnergyFile", dump_fes_save, false, colvarparse::parse_silent)) {
-      cvm::log("Option \"saveFreeEnergyFile\" is deprecated, "
-               "please use \"keepFreeEnergyFiles\" instead.");
-    }
+    get_keyval(conf, "writeFreeEnergyFile", dump_fes, dump_fes);
+
+    get_keyval(conf, "keepHills", keep_hills, keep_hills);
     get_keyval(conf, "keepFreeEnergyFiles", dump_fes_save, dump_fes_save);
 
-    hills_energy           = new colvar_grid_scalar(colvars);
-    hills_energy_gradients = new colvar_grid_gradient(colvars);
-  } else {
-    rebin_grids = false;
-    keep_hills = false;
-    dump_fes = false;
-    dump_fes_save = false;
-    dump_replica_fes = false;
-
-    hills_energy           = NULL;
-    hills_energy_gradients = NULL;
-  }
-
-  if (comm != single_replica) {
-
-    if (expand_grids)
-      cvm::fatal_error("Error: expandBoundaries is not supported when "
-                       "using more than one replicas; please allocate "
-                       "wide enough boundaries for each colvar"
-                       "ahead of time.\n");
-
-    if (get_keyval(conf, "dumpPartialFreeEnergyFile", dump_replica_fes, false)) {
-      if (dump_replica_fes && (! dump_fes)) {
-        cvm::log("Enabling \"dumpFreeEnergyFile\".\n");
-      }
+    if (hills_energy == NULL) {
+      hills_energy           = new colvar_grid_scalar(colvars);
+      hills_energy_gradients = new colvar_grid_gradient(colvars);
     }
 
-    get_keyval(conf, "replicaID", replica_id, std::string(""));
-    if (!replica_id.size())
-      cvm::error("Error: replicaID must be defined "
-                 "when using more than one replica.\n", INPUT_ERROR);
-
-    get_keyval(conf, "replicasRegistry",
-               replicas_registry_file,
-               (this->name+".replicas.registry.txt"));
-
-    get_keyval(conf, "replicaUpdateFrequency",
-               replica_update_freq, new_hill_freq);
-
-    if (keep_hills)
-      cvm::log("Warning: in metadynamics bias \""+this->name+"\""+
-               ((comm != single_replica) ? ", replica \""+replica_id+"\"" : "")+
-               ": keepHills with more than one replica can lead to a very "
-               "large amount of input/output and slow down your calculations.  "
-               "Please consider disabling it.\n");
+  } else {
 
+    dump_fes = false;
   }
 
-  get_keyval(conf, "writeHillsTrajectory", b_hills_traj, false);
+  get_keyval(conf, "writeHillsTrajectory", b_hills_traj, b_hills_traj);
 
-  init_well_tempered_params(conf);
-  init_ebmeta_params(conf);
+  error_code |= init_replicas_params(conf);
+  error_code |= init_well_tempered_params(conf);
+  error_code |= init_ebmeta_params(conf);
 
   if (cvm::debug())
     cvm::log("Done initializing the metadynamics bias \""+this->name+"\""+
@@ -171,6 +177,72 @@ int colvarbias_meta::init(std::string const &conf)
 }
 
 
+int colvarbias_meta::init_replicas_params(std::string const &conf)
+{
+  colvarproxy *proxy = cvm::main()->proxy;
+
+  // in all cases, the first replica is this bias itself
+  if (replicas.size() == 0) {
+    replicas.push_back(this);
+  }
+
+  if (comm != single_replica) {
+
+    if (!get_keyval(conf, "writePartialFreeEnergyFile",
+                    dump_replica_fes, dump_replica_fes)) {
+      get_keyval(conf, "dumpPartialFreeEnergyFile", dump_replica_fes,
+                 dump_replica_fes, colvarparse::parse_silent);
+    }
+
+    if (dump_replica_fes && (! dump_fes)) {
+      dump_fes = true;
+      cvm::log("Enabling \"writeFreeEnergyFile\".\n");
+    }
+
+    get_keyval(conf, "replicaID", replica_id, replica_id);
+    if (!replica_id.size()) {
+      if (proxy->replica_enabled() == COLVARS_OK) {
+        // Obtain replicaID from the communicator
+        replica_id = cvm::to_str(proxy->replica_index());
+        cvm::log("Setting replicaID from communication layer: replicaID = "+
+                 replica_id+".\n");
+      } else {
+        return cvm::error("Error: using more than one replica, but replicaID "
+                          "could not be obtained.\n", INPUT_ERROR);
+      }
+    }
+
+    get_keyval(conf, "replicasRegistry", replicas_registry_file,
+               replicas_registry_file);
+    if (!replicas_registry_file.size()) {
+      return cvm::error("Error: the name of the \"replicasRegistry\" file "
+                        "must be provided.\n", INPUT_ERROR);
+    }
+
+    get_keyval(conf, "replicaUpdateFrequency",
+               replica_update_freq, replica_update_freq);
+    if (replica_update_freq == 0) {
+      return cvm::error("Error: replicaUpdateFrequency must be positive.\n",
+                        INPUT_ERROR);
+    }
+
+    if (expand_grids) {
+      return cvm::error("Error: expandBoundaries is not supported when "
+                        "using more than one replicas; please allocate "
+                        "wide enough boundaries for each colvar"
+                        "ahead of time.\n", INPUT_ERROR);
+    }
+
+    if (keep_hills) {
+      return cvm::error("Error: multipleReplicas and keepHills are not "
+                        "supported together.\n", INPUT_ERROR);
+    }
+  }
+
+  return COLVARS_OK;
+}
+
+
 int colvarbias_meta::init_well_tempered_params(std::string const &conf)
 {
   // for well-tempered metadynamics
@@ -290,7 +362,7 @@ int colvarbias_meta::clear_state_data()
 // **********************************************************************
 
 std::list<colvarbias_meta::hill>::const_iterator
-colvarbias_meta::create_hill(colvarbias_meta::hill const &h)
+colvarbias_meta::add_hill(colvarbias_meta::hill const &h)
 {
   hill_iter const hills_end = hills.end();
   hills.push_back(h);
@@ -379,8 +451,8 @@ int colvarbias_meta::update()
     error_code |= replica_share();
   }
 
-  error_code |= calc_energy();
-  error_code |= calc_forces();
+  error_code |= calc_energy(NULL);
+  error_code |= calc_forces(NULL);
 
   return error_code;
 }
@@ -418,7 +490,7 @@ int colvarbias_meta::update_grid_params()
         int       &new_size = new_sizes[i];
         bool changed_lb = false, changed_ub = false;
 
-        if (!variables(i)->hard_lower_boundary)
+        if (!variables(i)->is_enabled(f_cv_hard_lower_boundary))
           if (curr_bin[i] < min_buffer) {
             int const extra_points = (min_buffer - curr_bin[i]);
             new_lb -= extra_points * variables(i)->width;
@@ -435,7 +507,7 @@ int colvarbias_meta::update_grid_params()
                      cvm::to_str(new_lower_boundaries[i])+".\n");
           }
 
-        if (!variables(i)->hard_upper_boundary)
+        if (!variables(i)->is_enabled(f_cv_hard_upper_boundary))
           if (curr_bin[i] > new_size - min_buffer - 1) {
             int const extra_points = (curr_bin[i] - (new_size - 1) + min_buffer);
             new_ub += extra_points * variables(i)->width;
@@ -521,7 +593,7 @@ int colvarbias_meta::update_bias()
         std::vector<int> curr_bin = hills_energy->get_colvars_index();
         hills_energy_sum_here = hills_energy->value(curr_bin);
       } else {
-        calc_hills(new_hills_begin, hills.end(), hills_energy_sum_here);
+        calc_hills(new_hills_begin, hills.end(), hills_energy_sum_here, NULL);
       }
       hills_scale *= cvm::exp(-1.0*hills_energy_sum_here/(bias_temperature*cvm::boltzmann()));
     }
@@ -530,12 +602,14 @@ int colvarbias_meta::update_bias()
 
     case single_replica:
 
-      create_hill(hill(hill_weight*hills_scale, colvars, hill_width));
+      add_hill(hill(cvm::step_absolute(), hill_weight*hills_scale,
+                    colvar_values, colvar_sigmas));
 
       break;
 
     case multiple_replicas:
-      create_hill(hill(hill_weight*hills_scale, colvars, hill_width, replica_id));
+      add_hill(hill(cvm::step_absolute(), hill_weight*hills_scale,
+                    colvar_values, colvar_sigmas, replica_id));
       std::ostream *replica_hills_os =
         cvm::proxy->get_output_stream(replica_hills_file);
       if (replica_hills_os) {
@@ -578,7 +652,7 @@ int colvarbias_meta::update_grid_data()
 }
 
 
-int colvarbias_meta::calc_energy(std::vector<colvarvalue> const &values)
+int colvarbias_meta::calc_energy(std::vector<colvarvalue> const *values)
 {
   size_t ir = 0;
 
@@ -586,8 +660,8 @@ int colvarbias_meta::calc_energy(std::vector<colvarvalue> const &values)
     replicas[ir]->bias_energy = 0.0;
   }
 
-  std::vector<int> const curr_bin = values.size() ?
-    hills_energy->get_colvars_index(values) :
+  std::vector<int> const curr_bin = values ?
+    hills_energy->get_colvars_index(*values) :
     hills_energy->get_colvars_index();
 
   if (hills_energy->index_ok(curr_bin)) {
@@ -619,7 +693,8 @@ int colvarbias_meta::calc_energy(std::vector<colvarvalue> const &values)
   for (ir = 0; ir < replicas.size(); ir++) {
     calc_hills(replicas[ir]->new_hills_begin,
                replicas[ir]->hills.end(),
-               bias_energy);
+               bias_energy,
+               values);
     if (cvm::debug()) {
       cvm::log("Hills energy = "+cvm::to_str(bias_energy)+".\n");
     }
@@ -629,7 +704,7 @@ int colvarbias_meta::calc_energy(std::vector<colvarvalue> const &values)
 }
 
 
-int colvarbias_meta::calc_forces(std::vector<colvarvalue> const &values)
+int colvarbias_meta::calc_forces(std::vector<colvarvalue> const *values)
 {
   size_t ir = 0, ic = 0;
   for (ir = 0; ir < replicas.size(); ir++) {
@@ -638,8 +713,8 @@ int colvarbias_meta::calc_forces(std::vector<colvarvalue> const &values)
     }
   }
 
-  std::vector<int> const curr_bin = values.size() ?
-    hills_energy->get_colvars_index(values) :
+  std::vector<int> const curr_bin = values ?
+    hills_energy->get_colvars_index(*values) :
     hills_energy->get_colvars_index();
 
   if (hills_energy->index_ok(curr_bin)) {
@@ -693,38 +768,24 @@ int colvarbias_meta::calc_forces(std::vector<colvarvalue> const &values)
 void colvarbias_meta::calc_hills(colvarbias_meta::hill_iter      h_first,
                                  colvarbias_meta::hill_iter      h_last,
                                  cvm::real                      &energy,
-                                 std::vector<colvarvalue> const &colvar_values)
+                                 std::vector<colvarvalue> const *values)
 {
   size_t i = 0;
-  std::vector<colvarvalue> curr_values(num_variables());
-  for (i = 0; i < num_variables(); i++) {
-    curr_values[i].type(variables(i)->value());
-  }
-
-  if (colvar_values.size()) {
-    for (i = 0; i < num_variables(); i++) {
-      curr_values[i] = colvar_values[i];
-    }
-  } else {
-    for (i = 0; i < num_variables(); i++) {
-      curr_values[i] = variables(i)->value();
-    }
-  }
 
   for (hill_iter h = h_first; h != h_last; h++) {
 
     // compute the gaussian exponent
     cvm::real cv_sqdev = 0.0;
     for (i = 0; i < num_variables(); i++) {
-      colvarvalue const &x  = curr_values[i];
+      colvarvalue const &x  = values ? (*values)[i] : colvar_values[i];
       colvarvalue const &center = h->centers[i];
-      cvm::real const    half_width = 0.5 * h->widths[i];
-      cv_sqdev += (variables(i)->dist2(x, center)) / (half_width*half_width);
+      cvm::real const sigma = h->sigmas[i];
+      cv_sqdev += (variables(i)->dist2(x, center)) / (sigma*sigma);
     }
 
     // compute the gaussian
     if (cv_sqdev > 23.0) {
-      // set it to zero if the exponent is more negative than log(1.0E-05)
+      // set it to zero if the exponent is more negative than log(1.0E-06)
       h->value(0.0);
     } else {
       h->value(cvm::exp(-0.5*cv_sqdev));
@@ -738,25 +799,25 @@ void colvarbias_meta::calc_hills_force(size_t const &i,
                                        colvarbias_meta::hill_iter      h_first,
                                        colvarbias_meta::hill_iter      h_last,
                                        std::vector<colvarvalue>       &forces,
-                                       std::vector<colvarvalue> const &values)
+                                       std::vector<colvarvalue> const *values)
 {
   // Retrieve the value of the colvar
-  colvarvalue const x(values.size() ? values[i] : variables(i)->value());
+  colvarvalue const x(values ? (*values)[i] : colvar_values[i]);
 
   // do the type check only once (all colvarvalues in the hills series
   // were already saved with their types matching those in the
   // colvars)
 
   hill_iter h;
-  switch (variables(i)->value().type()) {
+  switch (x.type()) {
 
   case colvarvalue::type_scalar:
     for (h = h_first; h != h_last; h++) {
       if (h->value() == 0.0) continue;
       colvarvalue const &center = h->centers[i];
-      cvm::real const    half_width = 0.5 * h->widths[i];
+      cvm::real const sigma = h->sigmas[i];
       forces[i].real_value +=
-        ( h->weight() * h->value() * (0.5 / (half_width*half_width)) *
+        ( h->weight() * h->value() * (0.5 / (sigma*sigma)) *
           (variables(i)->dist2_lgrad(x, center)).real_value );
     }
     break;
@@ -767,9 +828,9 @@ void colvarbias_meta::calc_hills_force(size_t const &i,
     for (h = h_first; h != h_last; h++) {
       if (h->value() == 0.0) continue;
       colvarvalue const &center = h->centers[i];
-      cvm::real const    half_width = 0.5 * h->widths[i];
+      cvm::real const sigma = h->sigmas[i];
       forces[i].rvector_value +=
-        ( h->weight() * h->value() * (0.5 / (half_width*half_width)) *
+        ( h->weight() * h->value() * (0.5 / (sigma*sigma)) *
           (variables(i)->dist2_lgrad(x, center)).rvector_value );
     }
     break;
@@ -779,9 +840,9 @@ void colvarbias_meta::calc_hills_force(size_t const &i,
     for (h = h_first; h != h_last; h++) {
       if (h->value() == 0.0) continue;
       colvarvalue const &center = h->centers[i];
-      cvm::real const    half_width = 0.5 * h->widths[i];
+      cvm::real const sigma = h->sigmas[i];
       forces[i].quaternion_value +=
-        ( h->weight() * h->value() * (0.5 / (half_width*half_width)) *
+        ( h->weight() * h->value() * (0.5 / (sigma*sigma)) *
           (variables(i)->dist2_lgrad(x, center)).quaternion_value );
     }
     break;
@@ -790,9 +851,9 @@ void colvarbias_meta::calc_hills_force(size_t const &i,
     for (h = h_first; h != h_last; h++) {
       if (h->value() == 0.0) continue;
       colvarvalue const &center = h->centers[i];
-      cvm::real const    half_width = 0.5 * h->widths[i];
+      cvm::real const sigma = h->sigmas[i];
       forces[i].vector1d_value +=
-        ( h->weight() * h->value() * (0.5 / (half_width*half_width)) *
+        ( h->weight() * h->value() * (0.5 / (sigma*sigma)) *
           (variables(i)->dist2_lgrad(x, center)).vector1d_value );
     }
     break;
@@ -846,12 +907,12 @@ void colvarbias_meta::project_hills(colvarbias_meta::hill_iter  h_first,
 
       // loop over the hills and increment the energy grid locally
       hills_energy_here = 0.0;
-      calc_hills(h_first, h_last, hills_energy_here, colvar_values);
+      calc_hills(h_first, h_last, hills_energy_here, &colvar_values);
       he->acc_value(he_ix, hills_energy_here);
 
       for (i = 0; i < num_variables(); i++) {
         hills_forces_here[i].reset();
-        calc_hills_force(i, h_first, h_last, hills_forces_here, colvar_values);
+        calc_hills_force(i, h_first, h_last, hills_forces_here, &colvar_values);
         colvar_forces_scalar[i] = hills_forces_here[i].real_value;
       }
       hg->acc_force(hg_ix, &(colvar_forces_scalar.front()));
@@ -883,7 +944,7 @@ void colvarbias_meta::project_hills(colvarbias_meta::hill_iter  h_first,
       }
 
       hills_energy_here = 0.0;
-      calc_hills(h_first, h_last, hills_energy_here, colvar_values);
+      calc_hills(h_first, h_last, hills_energy_here, &colvar_values);
       he->acc_value(he_ix, hills_energy_here);
 
       he->incr(he_ix);
@@ -915,7 +976,7 @@ void colvarbias_meta::project_hills(colvarbias_meta::hill_iter  h_first,
 
 void colvarbias_meta::recount_hills_off_grid(colvarbias_meta::hill_iter  h_first,
                                              colvarbias_meta::hill_iter  h_last,
-                                             colvar_grid_scalar         *he)
+                                             colvar_grid_scalar         * /* he */)
 {
   hills_off_grid.clear();
 
@@ -985,11 +1046,6 @@ void colvarbias_meta::update_replicas_registry()
 
       if (new_replica == this->replica_id) {
         // this is the record for this same replica, skip it
-        if (cvm::debug())
-          cvm::log("Metadynamics bias \""+this->name+"\""+
-                   ((comm != single_replica) ? ", replica \""+replica_id+"\"" : "")+
-                   ": skipping this replica's own record: \""+
-                   new_replica+"\", \""+new_replica_file+"\"\n");
         new_replica_file.clear();
         new_replica.clear();
         continue;
@@ -1039,11 +1095,12 @@ void colvarbias_meta::update_replicas_registry()
           (replicas.back())->enable(f_cvb_calc_ti_samples);
           (replicas.back())->colvarbias_ti::init_grids();
         }
+        (replicas.back())->update_status = 1;
       }
     }
   } else {
-    cvm::fatal_error("Error: cannot read the replicas registry file \""+
-                     replicas_registry+"\".\n");
+    cvm::error("Error: cannot read the replicas registry file \""+
+               replicas_registry+"\".\n", FILE_ERROR);
   }
 
   // now (re)read the list file of each replica
@@ -1068,7 +1125,6 @@ void colvarbias_meta::update_replicas_registry()
                cvm::to_str(replica_update_freq)+" steps.\n");
       (replicas[ir])->update_status++;
     } else {
-      (replicas[ir])->update_status = 0;
       if (new_state_file != (replicas[ir])->replica_state_file) {
         cvm::log("Metadynamics bias \""+this->name+"\""+
                  ": replica \""+(replicas[ir])->replica_id+
@@ -1092,27 +1148,41 @@ void colvarbias_meta::read_replica_files()
   // Note: we start from the 2nd replica.
   for (size_t ir = 1; ir < replicas.size(); ir++) {
 
-    if (! (replicas[ir])->replica_state_file_in_sync) {
-      // if a new state file is being read, the hills file is also new
-      (replicas[ir])->replica_hills_file_pos = 0;
-    }
-
     // (re)read the state file if necessary
     if ( (! (replicas[ir])->has_data) ||
          (! (replicas[ir])->replica_state_file_in_sync) ) {
-
-      cvm::log("Metadynamics bias \""+this->name+"\""+
-               ": reading the state of replica \""+
-               (replicas[ir])->replica_id+"\" from file \""+
-               (replicas[ir])->replica_state_file+"\".\n");
-
-      std::ifstream is((replicas[ir])->replica_state_file.c_str());
-      if ((replicas[ir])->read_state(is)) {
-        // state file has been read successfully
-        (replicas[ir])->replica_state_file_in_sync = true;
-        (replicas[ir])->update_status = 0;
+      if ((replicas[ir])->replica_state_file.size()) {
+        cvm::log("Metadynamics bias \""+this->name+"\""+
+                 ": reading the state of replica \""+
+                 (replicas[ir])->replica_id+"\" from file \""+
+                 (replicas[ir])->replica_state_file+"\".\n");
+        std::ifstream is((replicas[ir])->replica_state_file.c_str());
+        if ((replicas[ir])->read_state(is)) {
+          // state file has been read successfully
+          (replicas[ir])->replica_state_file_in_sync = true;
+          (replicas[ir])->update_status = 0;
+        } else {
+          cvm::log("Failed to read the file \""+
+                   (replicas[ir])->replica_state_file+
+                   "\": will try again in "+
+                   cvm::to_str(replica_update_freq)+" steps.\n");
+          (replicas[ir])->replica_state_file_in_sync = false;
+          (replicas[ir])->update_status++;
+        }
+        is.close();
+      } else {
+        cvm::log("Metadynamics bias \""+this->name+"\""+
+                 ": the state file of replica \""+
+                 (replicas[ir])->replica_id+"\" is currently undefined: "
+                 "will try again after "+
+                 cvm::to_str(replica_update_freq)+" steps.\n");
+        (replicas[ir])->update_status++;
       }
-      is.close();
+    }
+
+    if (! (replicas[ir])->replica_state_file_in_sync) {
+      // if a new state file is being read, the hills file is also new
+      (replicas[ir])->replica_hills_file_pos = 0;
     }
 
     // now read the hills added after writing the state file
@@ -1124,14 +1194,16 @@ void colvarbias_meta::read_replica_files()
                  (replicas[ir])->replica_id+"\" in the file \""+
                  (replicas[ir])->replica_hills_file+"\".\n");
 
-      // read hills from the other replicas' files; for each file, resume
-      // the position recorded previously
+      // read hills from the other replicas' files
 
       std::ifstream is((replicas[ir])->replica_hills_file.c_str());
       if (is.is_open()) {
 
-        // try to resume the previous position
-        is.seekg((replicas[ir])->replica_hills_file_pos, std::ios::beg);
+        // try to resume the previous position (if not the beginning)
+        if ((replicas[ir])->replica_hills_file_pos > 0) {
+          is.seekg((replicas[ir])->replica_hills_file_pos, std::ios::beg);
+        }
+
         if (!is.is_open()){
           // if fail (the file may have been overwritten), reset this
           // position
@@ -1149,7 +1221,6 @@ void colvarbias_meta::read_replica_files()
         } else {
 
           while ((replicas[ir])->read_hill(is)) {
-            //           if (cvm::debug())
             cvm::log("Metadynamics bias \""+this->name+"\""+
                      ": received a hill from replica \""+
                      (replicas[ir])->replica_id+
@@ -1159,11 +1230,13 @@ void colvarbias_meta::read_replica_files()
           is.clear();
           // store the position for the next read
           (replicas[ir])->replica_hills_file_pos = is.tellg();
-          if (cvm::debug())
+          if (cvm::debug()) {
             cvm::log("Metadynamics bias \""+this->name+"\""+
-                     ": stopped reading file \""+(replicas[ir])->replica_hills_file+
+                     ": stopped reading file \""+
+                     (replicas[ir])->replica_hills_file+
                      "\" at position "+
                      cvm::to_str((replicas[ir])->replica_hills_file_pos)+".\n");
+          }
 
           // test whether this is the end of the file
           is.seekg(0, std::ios::end);
@@ -1175,12 +1248,11 @@ void colvarbias_meta::read_replica_files()
         }
 
       } else {
-        cvm::log("Failed to read the file \""+(replicas[ir])->replica_hills_file+
+        cvm::log("Failed to read the file \""+
+                 (replicas[ir])->replica_hills_file+
                  "\": will try again in "+
                  cvm::to_str(replica_update_freq)+" steps.\n");
         (replicas[ir])->update_status++;
-        // cvm::fatal_error ("Error: cannot read from file \""+
-        //                   (replicas[ir])->replica_hills_file+"\".\n");
       }
       is.close();
     }
@@ -1188,8 +1260,8 @@ void colvarbias_meta::read_replica_files()
     size_t const n_flush = (replica_update_freq/new_hill_freq + 1);
     if ((replicas[ir])->update_status > 3*n_flush) {
       // TODO: suspend the calculation?
-      cvm::log("WARNING: in metadynamics bias \""+this->name+"\""+
-               " failed to read completely the output of replica \""+
+      cvm::log("WARNING: metadynamics bias \""+this->name+"\""+
+               " could not read information from replica \""+
                (replicas[ir])->replica_id+
                "\" after more than "+
                cvm::to_str((replicas[ir])->update_status * replica_update_freq)+
@@ -1201,14 +1273,20 @@ void colvarbias_meta::read_replica_files()
 
 int colvarbias_meta::set_state_params(std::string const &state_conf)
 {
-  std::string new_replica = "";
-  if (colvarparse::get_keyval(state_conf, "replicaID", new_replica,
+  int error_code = colvarbias::set_state_params(state_conf);
+
+  if (error_code != COLVARS_OK) {
+    return error_code;
+  }
+
+  std::string check_replica = "";
+  if (colvarparse::get_keyval(state_conf, "replicaID", check_replica,
                               std::string(""), colvarparse::parse_silent) &&
-      (new_replica != this->replica_id)) {
-    cvm::error("Error: in the state file, the "
-               "\"metadynamics\" block has a different replicaID: different system?\n",
-               INPUT_ERROR);
-    return INPUT_ERROR;
+      (check_replica != this->replica_id)) {
+    return cvm::error("Error: in the state file , the "
+                      "\"metadynamics\" block has a different replicaID ("+
+                      check_replica+" instead of "+replica_id+").\n",
+                      INPUT_ERROR);
   }
 
   return COLVARS_OK;
@@ -1434,17 +1512,18 @@ std::istream & colvarbias_meta::read_hill(std::istream &is)
   if (!is) return is; // do nothing if failbit is set
 
   size_t const start_pos = is.tellg();
+  size_t i = 0;
 
   std::string data;
-  if ( !(is >> read_block("hill", data)) ) {
+  if ( !(is >> read_block("hill", &data)) ) {
     is.clear();
     is.seekg(start_pos, std::ios::beg);
     is.setstate(std::ios::failbit);
     return is;
   }
 
-  cvm::step_number h_it;
-  get_keyval(data, "step", h_it, 0L, parse_silent);
+  cvm::step_number h_it = 0L;
+  get_keyval(data, "step", h_it, h_it, parse_restart);
   if (h_it <= state_file_step) {
     if (cvm::debug())
       cvm::log("Skipping a hill older than the state file for metadynamics bias \""+
@@ -1454,31 +1533,24 @@ std::istream & colvarbias_meta::read_hill(std::istream &is)
   }
 
   cvm::real h_weight;
-  get_keyval(data, "weight", h_weight, hill_weight, parse_silent);
+  get_keyval(data, "weight", h_weight, hill_weight, parse_restart);
 
   std::vector<colvarvalue> h_centers(num_variables());
-  for (size_t i = 0; i < num_variables(); i++) {
+  for (i = 0; i < num_variables(); i++) {
     h_centers[i].type(variables(i)->value());
   }
-  {
-    // it is safer to read colvarvalue objects one at a time;
-    // TODO: change this it later
-    std::string centers_input;
-    key_lookup(data, "centers", &centers_input);
-    std::istringstream centers_is(centers_input);
-    for (size_t i = 0; i < num_variables(); i++) {
-      centers_is >> h_centers[i];
-    }
-  }
+  get_keyval(data, "centers", h_centers, h_centers, parse_restart);
 
-  std::vector<cvm::real> h_widths(num_variables());
-  get_keyval(data, "widths", h_widths,
-             std::vector<cvm::real>(num_variables(), (cvm::sqrt(2.0 * PI) / 2.0)),
-             parse_silent);
+  std::vector<cvm::real> h_sigmas(num_variables());
+  get_keyval(data, "widths", h_sigmas, h_sigmas, parse_restart);
+  for (i = 0; i < num_variables(); i++) {
+    // For backward compatibility, read the widths instead of the sigmas
+    h_sigmas[i] /= 2.0;
+  }
 
   std::string h_replica = "";
   if (comm != single_replica) {
-    get_keyval(data, "replicaID", h_replica, replica_id, parse_silent);
+    get_keyval(data, "replicaID", h_replica, replica_id, parse_restart);
     if (h_replica != replica_id)
       cvm::fatal_error("Error: trying to read a hill created by replica \""+h_replica+
                        "\" for replica \""+replica_id+
@@ -1486,7 +1558,7 @@ std::istream & colvarbias_meta::read_hill(std::istream &is)
   }
 
   hill_iter const hills_end = hills.end();
-  hills.push_back(hill(h_it, h_weight, h_centers, h_widths, h_replica));
+  hills.push_back(hill(h_it, h_weight, h_centers, h_sigmas, h_replica));
   if (new_hills_begin == hills_end) {
     // if new_hills_begin is unset, set it for the first time
     new_hills_begin = hills.end();
@@ -1708,11 +1780,11 @@ void colvarbias_meta::write_pmf()
     if (ebmeta) {
       int nt_points=pmf->number_of_points();
       for (int i = 0; i < nt_points; i++) {
-         cvm:: real pmf_val=0.0;
-         cvm:: real target_val=target_dist->value(i);
+         cvm::real pmf_val=0.0;
+         cvm::real target_val=target_dist->value(i);
          if (target_val>0) {
            pmf_val=pmf->value(i);
-           pmf_val=pmf_val+cvm::temperature() * cvm::boltzmann() * std::log(target_val);
+           pmf_val=pmf_val+cvm::temperature() * cvm::boltzmann() * cvm::logn(target_val);
          }
          pmf->set_value(i,pmf_val);
       }
@@ -1749,11 +1821,11 @@ void colvarbias_meta::write_pmf()
     if (ebmeta) {
       int nt_points=pmf->number_of_points();
       for (int i = 0; i < nt_points; i++) {
-         cvm:: real pmf_val=0.0;
-         cvm:: real target_val=target_dist->value(i);
+         cvm::real pmf_val=0.0;
+         cvm::real target_val=target_dist->value(i);
          if (target_val>0) {
            pmf_val=pmf->value(i);
-           pmf_val=pmf_val+cvm::temperature() * cvm::boltzmann() * std::log(target_val);
+           pmf_val=pmf_val+cvm::temperature() * cvm::boltzmann() * cvm::logn(target_val);
          }
          pmf->set_value(i,pmf_val);
       }
@@ -1844,10 +1916,10 @@ std::string colvarbias_meta::hill::output_traj()
   }
 
   os << "  ";
-  for (i = 0; i < widths.size(); i++) {
+  for (i = 0; i < sigmas.size(); i++) {
     os << " ";
     os << std::setprecision(cvm::cv_prec)
-       << std::setw(cvm::cv_width) << widths[i];
+       << std::setw(cvm::cv_width) << sigmas[i];
   }
 
   os << "  ";
@@ -1858,6 +1930,47 @@ std::string colvarbias_meta::hill::output_traj()
 }
 
 
+colvarbias_meta::hill::hill(cvm::step_number it_in,
+                            cvm::real W_in,
+                            std::vector<colvarvalue> const &cv_values,
+                            std::vector<cvm::real> const &cv_sigmas,
+                            std::string const &replica_in)
+  : it(it_in),
+    sW(1.0),
+    W(W_in),
+    centers(cv_values.size()),
+    sigmas(cv_values.size()),
+    replica(replica_in)
+{
+  for (size_t i = 0; i < cv_values.size(); i++) {
+    centers[i].type(cv_values[i]);
+    centers[i] = cv_values[i];
+    sigmas[i] = cv_sigmas[i];
+  }
+  if (cvm::debug()) {
+    cvm::log("New hill, applied to "+cvm::to_str(cv_values.size())+
+             " collective variables, with centers "+
+             cvm::to_str(centers)+", sigmas "+
+             cvm::to_str(sigmas)+" and weight "+
+             cvm::to_str(W)+".\n");
+  }
+}
+
+
+colvarbias_meta::hill::hill(colvarbias_meta::hill const &h)
+  : sW(1.0),
+    W(h.W),
+    centers(h.centers),
+    sigmas(h.sigmas),
+    it(h.it),
+    replica(h.replica)
+{}
+
+
+colvarbias_meta::hill::~hill()
+{}
+
+
 std::ostream & operator << (std::ostream &os, colvarbias_meta::hill const &h)
 {
   os.setf(std::ios::scientific, std::ios::floatfield);
@@ -1882,12 +1995,13 @@ std::ostream & operator << (std::ostream &os, colvarbias_meta::hill const &h)
   }
   os << "\n";
 
+  // For backward compatibility, write the widths instead of the sigmas
   os << "  widths  ";
-  for (i = 0; i < (h.widths).size(); i++) {
+  for (i = 0; i < (h.sigmas).size(); i++) {
     os << " "
        << std::setprecision(cvm::cv_prec)
        << std::setw(cvm::cv_width)
-       << h.widths[i];
+       << 2.0 * h.sigmas[i];
   }
   os << "\n";
 
diff --git a/lib/colvars/colvarbias_meta.h b/lib/colvars/colvarbias_meta.h
index 8e98274b2d..9f9fc63fc7 100644
--- a/lib/colvars/colvarbias_meta.h
+++ b/lib/colvars/colvarbias_meta.h
@@ -2,7 +2,7 @@
 
 // This file is part of the Collective Variables module (Colvars).
 // The original version of Colvars and its updates are located at:
-// https://github.com/colvars/colvars
+// https://github.com/Colvars/colvars
 // Please update all Colvars source files before making any changes.
 // If you wish to distribute your changes, please submit them to the
 // Colvars repository at GitHub.
@@ -41,6 +41,7 @@ public:
   virtual ~colvarbias_meta();
 
   virtual int init(std::string const &conf);
+  virtual int init_replicas_params(std::string const &conf);
   virtual int init_well_tempered_params(std::string const &conf);
   virtual int init_ebmeta_params(std::string const &conf);
 
@@ -52,10 +53,8 @@ public:
   virtual int update_grid_data();
   virtual int replica_share();
 
-  virtual int calc_energy(std::vector<colvarvalue> const &values =
-                          std::vector<colvarvalue>(0));
-  virtual int calc_forces(std::vector<colvarvalue> const &values =
-                          std::vector<colvarvalue>(0));
+  virtual int calc_energy(std::vector<colvarvalue> const *values);
+  virtual int calc_forces(std::vector<colvarvalue> const *values);
 
   virtual std::string const get_state_params() const;
   virtual int set_state_params(std::string const &state_conf);
@@ -72,11 +71,14 @@ public:
 
 protected:
 
-  /// \brief width of a hill
+  /// Width of a hill in number of grid points
   ///
   /// The local width of each collective variable, multiplied by this
   /// number, provides the hill width along that direction
-  cvm::real  hill_width;
+  cvm::real hill_width;
+
+  /// The sigma parameters of the Gaussian hills
+  std::vector<cvm::real> colvar_sigmas;
 
   /// \brief Number of simulation steps between two hills
   size_t     new_hill_freq;
@@ -114,18 +116,18 @@ protected:
   /// \brief Add a new hill; if a .hills trajectory is written,
   /// write it there; if there is more than one replica, communicate
   /// it to the others
-  virtual std::list<hill>::const_iterator create_hill(hill const &h);
+  std::list<hill>::const_iterator add_hill(hill const &h);
 
   /// \brief Remove a previously saved hill (returns an iterator for
   /// the next hill in the list)
-  virtual std::list<hill>::const_iterator delete_hill(hill_iter &h);
+  std::list<hill>::const_iterator delete_hill(hill_iter &h);
 
   /// \brief Calculate the values of the hills, incrementing
   /// bias_energy
   virtual void calc_hills(hill_iter  h_first,
                           hill_iter  h_last,
                           cvm::real &energy,
-                          std::vector<colvarvalue> const &values = std::vector<colvarvalue>(0));
+                          std::vector<colvarvalue> const *values);
 
   /// \brief Calculate the forces acting on the i-th colvar,
   /// incrementing colvar_forces[i]; must be called after calc_hills
@@ -134,7 +136,7 @@ protected:
                                 hill_iter h_first,
                                 hill_iter h_last,
                                 std::vector<colvarvalue> &forces,
-                                std::vector<colvarvalue> const &values = std::vector<colvarvalue>(0));
+                                std::vector<colvarvalue> const *values);
 
 
   /// Height of new hills
@@ -267,6 +269,9 @@ class colvarbias_meta::hill {
 
 protected:
 
+  /// Time step at which this hill was added
+  cvm::step_number it;
+
   /// Value of the hill function (ranges between 0 and 1)
   cvm::real hill_value;
 
@@ -276,83 +281,35 @@ protected:
   /// Maximum height in energy of the hill
   cvm::real W;
 
-  /// Center of the hill in the collective variable space
-  std::vector<colvarvalue>  centers;
+  /// Centers of the hill in the collective variable space
+  std::vector<colvarvalue> centers;
 
-  /// Widths of the hill in the collective variable space
-  std::vector<cvm::real>    widths;
+  /// Half-widths of the hill in the collective variable space
+  std::vector<cvm::real> sigmas;
+
+  /// Identity of the replica who added this hill
+  std::string replica;
 
 public:
 
   friend class colvarbias_meta;
 
-  /// Time step at which this hill was added
-  cvm::step_number it;
-
-  /// Identity of the replica who added this hill (only in multiple replica simulations)
-  std::string replica;
-
-  /// \brief Runtime constructor: data are read directly from
-  /// collective variables \param weight Weight of the hill \param
-  /// cv Pointer to the array of collective variables involved \param
-  /// replica (optional) Identity of the replica which creates the
-  /// hill
-  inline hill(cvm::real             const &W_in,
-              std::vector<colvar *>       &cv,
-              cvm::real             const &hill_width,
-              std::string           const &replica_in = "")
-    : sW(1.0),
-      W(W_in),
-      centers(cv.size()),
-      widths(cv.size()),
-      it(cvm::step_absolute()),
-      replica(replica_in)
-  {
-    for (size_t i = 0; i < cv.size(); i++) {
-      centers[i].type(cv[i]->value());
-      centers[i] = cv[i]->value();
-      widths[i] = cv[i]->width * hill_width;
-    }
-    if (cvm::debug())
-      cvm::log("New hill, applied to "+cvm::to_str(cv.size())+
-                " collective variables, with centers "+
-                cvm::to_str(centers)+", widths "+
-                cvm::to_str(widths)+" and weight "+
-                cvm::to_str(W)+".\n");
-  }
-
-  /// \brief General constructor: all data are explicitly passed as
-  /// arguments (used for instance when reading hills saved on a
-  /// file) \param it Time step of creation of the hill \param
-  /// weight Weight of the hill \param centers Center of the hill
-  /// \param widths Width of the hill around centers \param replica
-  /// (optional) Identity of the replica which creates the hill
-  inline hill(cvm::step_number          const &it_in,
-              cvm::real                 const &W_in,
-              std::vector<colvarvalue>  const &centers_in,
-              std::vector<cvm::real>    const &widths_in,
-              std::string               const &replica_in = "")
-    : sW(1.0),
-      W(W_in),
-      centers(centers_in),
-      widths(widths_in),
-      it(it_in),
-      replica(replica_in)
-  {}
+  /// Constructor of a hill object
+  /// \param it Step number at which the hill was added
+  /// \param W Weight of the hill (energy units)
+  /// \param cv_values Array of collective variable values
+  /// \param cv_sigmas Array of collective variable values
+  /// \param replica ID of the replica that creates the hill (optional)
+  hill(cvm::step_number it, cvm::real W,
+       std::vector<colvarvalue> const &cv_values,
+       std::vector<cvm::real> const &cv_sigmas,
+       std::string const &replica = "");
 
   /// Copy constructor
-  inline hill(colvarbias_meta::hill const &h)
-    : sW(1.0),
-      W(h.W),
-      centers(h.centers),
-      widths(h.widths),
-      it(h.it),
-      replica(h.replica)
-  {}
+  hill(colvarbias_meta::hill const &h);
 
   /// Destructor
-  inline ~hill()
-  {}
+  ~hill();
 
   /// Get the energy
   inline cvm::real energy()
@@ -441,8 +398,7 @@ public:
   std::string output_traj();
 
   /// Write the hill to an output stream
-  inline friend std::ostream & operator << (std::ostream &os,
-                                            hill const &h);
+  friend std::ostream & operator << (std::ostream &os, hill const &h);
 
 };
 
diff --git a/lib/colvars/colvarbias_restraint.cpp b/lib/colvars/colvarbias_restraint.cpp
index ab02820cf0..486d77688b 100644
--- a/lib/colvars/colvarbias_restraint.cpp
+++ b/lib/colvars/colvarbias_restraint.cpp
@@ -2,7 +2,7 @@
 
 // This file is part of the Collective Variables module (Colvars).
 // The original version of Colvars and its updates are located at:
-// https://github.com/colvars/colvars
+// https://github.com/Colvars/colvars
 // Please update all Colvars source files before making any changes.
 // If you wish to distribute your changes, please submit them to the
 // Colvars repository at GitHub.
@@ -17,6 +17,7 @@
 colvarbias_restraint::colvarbias_restraint(char const *key)
   : colvarbias(key), colvarbias_ti(key)
 {
+  state_keyword = "restraint";
 }
 
 
@@ -174,7 +175,7 @@ int colvarbias_restraint_k::change_configuration(std::string const &conf)
 
 
 
-colvarbias_restraint_moving::colvarbias_restraint_moving(char const *key)
+colvarbias_restraint_moving::colvarbias_restraint_moving(char const * /* key */)
 {
   target_nstages = 0;
   target_nsteps = 0L;
@@ -705,67 +706,6 @@ std::ostream & colvarbias_restraint_k_moving::write_traj(std::ostream &os)
 
 
 
-// redefined due to legacy state file keyword "harmonic"
-std::istream & colvarbias_restraint::read_state(std::istream &is)
-{
-  size_t const start_pos = is.tellg();
-
-  std::string key, brace, conf;
-  if ( !(is >> key)   || !(key == "restraint" || key == "harmonic") ||
-       !(is >> brace) || !(brace == "{") ||
-       !(is >> colvarparse::read_block("configuration", conf)) ||
-       (set_state_params(conf) != COLVARS_OK) ) {
-    cvm::error("Error: in reading state configuration for \""+bias_type+"\" bias \""+
-               this->name+"\" at position "+
-               cvm::to_str(static_cast<size_t>(is.tellg()))+
-               " in stream.\n", INPUT_ERROR);
-    is.clear();
-    is.seekg(start_pos, std::ios::beg);
-    is.setstate(std::ios::failbit);
-    return is;
-  }
-
-  if (!read_state_data(is)) {
-    cvm::error("Error: in reading state data for \""+bias_type+"\" bias \""+
-               this->name+"\" at position "+
-               cvm::to_str(static_cast<size_t>(is.tellg()))+
-               " in stream.\n", INPUT_ERROR);
-    is.clear();
-    is.seekg(start_pos, std::ios::beg);
-    is.setstate(std::ios::failbit);
-  }
-
-  is >> brace;
-  if (brace != "}") {
-    cvm::log("brace = "+brace+"\n");
-    cvm::error("Error: corrupt restart information for \""+bias_type+"\" bias \""+
-               this->name+"\": no matching brace at position "+
-               cvm::to_str(static_cast<size_t>(is.tellg()))+" in stream.\n");
-    is.setstate(std::ios::failbit);
-  }
-
-  return is;
-}
-
-
-std::ostream & colvarbias_restraint::write_state(std::ostream &os)
-{
-  os.setf(std::ios::scientific, std::ios::floatfield);
-  os << "restraint {\n"
-     << "  configuration {\n";
-  std::istringstream is(get_state_params());
-  std::string line;
-  while (std::getline(is, line)) {
-    os << "    " << line << "\n";
-  }
-  os << "  }\n";
-  write_state_data(os);
-  os << "}\n\n";
-  return os;
-}
-
-
-
 colvarbias_restraint_harmonic::colvarbias_restraint_harmonic(char const *key)
   : colvarbias(key),
     colvarbias_ti(key),
@@ -928,6 +868,9 @@ colvarbias_restraint_harmonic_walls::colvarbias_restraint_harmonic_walls(char co
 {
   lower_wall_k = -1.0;
   upper_wall_k = -1.0;
+  // This bias implements the bias_actual_colvars feature (most others do not)
+  provide(f_cvb_bypass_ext_lagrangian);
+  set_enabled(f_cvb_bypass_ext_lagrangian); // Defaults to enabled
 }
 
 
@@ -1075,23 +1018,13 @@ int colvarbias_restraint_harmonic_walls::update()
 }
 
 
-void colvarbias_restraint_harmonic_walls::communicate_forces()
-{
-  for (size_t i = 0; i < num_variables(); i++) {
-    if (cvm::debug()) {
-      cvm::log("Communicating a force to colvar \""+
-               variables(i)->name+"\".\n");
-    }
-    // Impulse-style multiple timestep
-    variables(i)->add_bias_force_actual_value(cvm::real(time_step_factor) * colvar_forces[i]);
-  }
-}
-
-
 cvm::real colvarbias_restraint_harmonic_walls::colvar_distance(size_t i) const
 {
   colvar *cv = variables(i);
-  colvarvalue const &cvv = variables(i)->actual_value();
+
+  colvarvalue const &cvv = is_enabled(f_cvb_bypass_ext_lagrangian) ?
+    variables(i)->actual_value() :
+    variables(i)->value();
 
   // For a periodic colvar, both walls may be applicable at the same time
   // in which case we pick the closer one
diff --git a/lib/colvars/colvarbias_restraint.h b/lib/colvars/colvarbias_restraint.h
index 6493f7f16b..ac25e35646 100644
--- a/lib/colvars/colvarbias_restraint.h
+++ b/lib/colvars/colvarbias_restraint.h
@@ -2,7 +2,7 @@
 
 // This file is part of the Collective Variables module (Colvars).
 // The original version of Colvars and its updates are located at:
-// https://github.com/colvars/colvars
+// https://github.com/Colvars/colvars
 // Please update all Colvars source files before making any changes.
 // If you wish to distribute your changes, please submit them to the
 // Colvars repository at GitHub.
@@ -26,17 +26,15 @@ public:
   virtual int update();
 
   /// Load new configuration - force constant and/or centers only
-  virtual int change_configuration(std::string const &conf) { return COLVARS_NOT_IMPLEMENTED; }
+  virtual int change_configuration(std::string const & /* conf */) { return COLVARS_NOT_IMPLEMENTED; }
 
   /// Calculate change in energy from using alternate configuration
-  virtual cvm::real energy_difference(std::string const &conf) { return 0.0; }
+  virtual cvm::real energy_difference(std::string const & /* conf */) { return 0.0; }
 
   virtual std::string const get_state_params() const;
   virtual int set_state_params(std::string const &conf);
   // virtual std::ostream & write_state_data(std::ostream &os);
   // virtual std::istream & read_state_data(std::istream &os);
-  virtual std::ostream & write_state(std::ostream &os);
-  virtual std::istream & read_state(std::istream &is);
 
   virtual std::ostream & write_traj_label(std::ostream &os);
   virtual std::ostream & write_traj(std::ostream &os);
@@ -107,7 +105,7 @@ public:
   // Note: despite the diamond inheritance, most of this function gets only executed once
   virtual int init(std::string const &conf);
   virtual int update() { return COLVARS_OK; }
-  virtual int change_configuration(std::string const &conf) { return COLVARS_NOT_IMPLEMENTED; }
+  virtual int change_configuration(std::string const & /* conf */) { return COLVARS_NOT_IMPLEMENTED; }
 
   virtual std::string const get_state_params() const;
   virtual int set_state_params(std::string const &conf);
@@ -149,7 +147,7 @@ public:
   colvarbias_restraint_centers_moving(char const *key);
   virtual int init(std::string const &conf);
   virtual int update();
-  virtual int change_configuration(std::string const &conf) { return COLVARS_NOT_IMPLEMENTED; }
+  virtual int change_configuration(std::string const & /* conf */) { return COLVARS_NOT_IMPLEMENTED; }
 
   virtual std::string const get_state_params() const;
   virtual int set_state_params(std::string const &conf);
@@ -188,7 +186,7 @@ public:
   colvarbias_restraint_k_moving(char const *key);
   virtual int init(std::string const &conf);
   virtual int update();
-  virtual int change_configuration(std::string const &conf) { return COLVARS_NOT_IMPLEMENTED; }
+  virtual int change_configuration(std::string const & /* conf */) { return COLVARS_NOT_IMPLEMENTED; }
 
   virtual std::string const get_state_params() const;
   virtual int set_state_params(std::string const &conf);
@@ -258,7 +256,6 @@ public:
   colvarbias_restraint_harmonic_walls(char const *key);
   virtual int init(std::string const &conf);
   virtual int update();
-  virtual void communicate_forces();
   virtual std::string const get_state_params() const;
   virtual int set_state_params(std::string const &conf);
   virtual std::ostream & write_state_data(std::ostream &os);
diff --git a/lib/colvars/colvarcomp.cpp b/lib/colvars/colvarcomp.cpp
index 431884a877..05d1195d58 100644
--- a/lib/colvars/colvarcomp.cpp
+++ b/lib/colvars/colvarcomp.cpp
@@ -2,7 +2,7 @@
 
 // This file is part of the Collective Variables module (Colvars).
 // The original version of Colvars and its updates are located at:
-// https://github.com/colvars/colvars
+// https://github.com/Colvars/colvars
 // Please update all Colvars source files before making any changes.
 // If you wish to distribute your changes, please submit them to the
 // Colvars repository at GitHub.
@@ -17,30 +17,28 @@
 
 
 colvar::cvc::cvc()
-  : sup_coeff(1.0),
-    sup_np(1),
-    b_periodic(false),
-    b_try_scalable(true)
 {
   description = "uninitialized colvar component";
-  init_dependencies();
+  b_try_scalable = true;
   sup_coeff = 1.0;
+  sup_np = 1;
   period = 0.0;
   wrap_center = 0.0;
+  width = 0.0;
+  init_dependencies();
 }
 
 
 colvar::cvc::cvc(std::string const &conf)
-  : sup_coeff(1.0),
-    sup_np(1),
-    b_periodic(false),
-    b_try_scalable(true)
 {
   description = "uninitialized colvar component";
-  init_dependencies();
+  b_try_scalable = true;
   sup_coeff = 1.0;
+  sup_np = 1;
   period = 0.0;
   wrap_center = 0.0;
+  width = 0.0;
+  init_dependencies();
   init(conf);
 }
 
@@ -72,11 +70,17 @@ int colvar::cvc::init(std::string const &conf)
 
   get_keyval(conf, "componentCoeff", sup_coeff, sup_coeff);
   get_keyval(conf, "componentExp", sup_np, sup_np);
+  // TODO these could be condensed into get_keyval()
+  register_param("componentCoeff", reinterpret_cast<void *>(&sup_coeff));
+  register_param("componentExp", reinterpret_cast<void *>(&sup_np));
 
   get_keyval(conf, "period", period, period);
   get_keyval(conf, "wrapAround", wrap_center, wrap_center);
+  // TODO when init() is called after all constructors, check periodic flag
+  register_param("period", reinterpret_cast<void *>(&period));
+  register_param("wrapAround", reinterpret_cast<void *>(&wrap_center));
 
-  get_keyval_feature(dynamic_cast<colvarparse *>(this), conf, "debugGradients",
+  get_keyval_feature(this, conf, "debugGradients",
                      f_cvc_debug_gradient, false, parse_silent);
 
   bool b_no_PBC = !is_enabled(f_cvc_pbc_minimum_image); // Enabled by default
@@ -194,6 +198,14 @@ int colvar::cvc::init_dependencies() {
 
     init_feature(f_cvc_scalar, "scalar", f_type_static);
 
+    init_feature(f_cvc_periodic, "periodic", f_type_static);
+
+    init_feature(f_cvc_width, "defined width", f_type_static);
+
+    init_feature(f_cvc_lower_boundary, "defined lower boundary", f_type_static);
+
+    init_feature(f_cvc_upper_boundary, "defined upper boundary", f_type_static);
+
     init_feature(f_cvc_gradient, "gradient", f_type_dynamic);
 
     init_feature(f_cvc_explicit_gradient, "explicit gradient", f_type_static);
@@ -209,15 +221,15 @@ int colvar::cvc::init_dependencies() {
     init_feature(f_cvc_Jacobian, "Jacobian derivative", f_type_dynamic);
     require_feature_self(f_cvc_Jacobian, f_cvc_inv_gradient);
 
-    init_feature(f_cvc_com_based, "depends on group centers of mass", f_type_static);
-
-    init_feature(f_cvc_pbc_minimum_image, "use minimum-image distances with PBCs", f_type_user);
-
     // Compute total force on first site only to avoid unwanted
     // coupling to other colvars (see e.g. Ciccotti et al., 2005)
     init_feature(f_cvc_one_site_total_force, "compute total force from one group", f_type_user);
     require_feature_self(f_cvc_one_site_total_force, f_cvc_com_based);
 
+    init_feature(f_cvc_com_based, "depends on group centers of mass", f_type_static);
+
+    init_feature(f_cvc_pbc_minimum_image, "use minimum-image distances with PBCs", f_type_user);
+
     init_feature(f_cvc_scalable, "scalable calculation", f_type_static);
     require_feature_self(f_cvc_scalable, f_cvc_scalable_com);
 
@@ -291,6 +303,77 @@ colvar::cvc::~cvc()
 }
 
 
+void colvar::cvc::init_as_distance()
+{
+  x.type(colvarvalue::type_scalar);
+  enable(f_cvc_lower_boundary);
+  lower_boundary.type(colvarvalue::type_scalar);
+  lower_boundary.real_value = 0.0;
+  register_param("lowerBoundary", reinterpret_cast<void *>(&lower_boundary));
+}
+
+
+void colvar::cvc::init_as_angle()
+{
+  x.type(colvarvalue::type_scalar);
+  init_scalar_boundaries(0.0, 180);
+}
+
+
+void colvar::cvc::init_scalar_boundaries(cvm::real lb, cvm::real ub)
+{
+  enable(f_cvc_lower_boundary);
+  lower_boundary.type(colvarvalue::type_scalar);
+  lower_boundary.real_value = lb;
+  enable(f_cvc_upper_boundary);
+  upper_boundary.type(colvarvalue::type_scalar);
+  upper_boundary.real_value = ub;
+  register_param("lowerBoundary", reinterpret_cast<void *>(&lower_boundary));
+  register_param("upperBoundary", reinterpret_cast<void *>(&upper_boundary));
+}
+
+
+void colvar::cvc::register_atom_group(cvm::atom_group *ag)
+{
+  atom_groups.push_back(ag);
+  add_child(ag);
+}
+
+
+colvarvalue const *colvar::cvc::get_param_grad(std::string const &param_name)
+{
+  colvarvalue const *ptr =
+    reinterpret_cast<colvarvalue const *>(get_param_grad_ptr(param_name));
+  return ptr != NULL ? ptr : NULL;
+}
+
+
+int colvar::cvc::set_param(std::string const &param_name,
+                           void const *new_value)
+{
+  if (param_map.count(param_name) > 0) {
+
+    // TODO When we can use C++11, make this a proper function map
+    if (param_name.compare("componentCoeff") == 0) {
+      sup_coeff = *(reinterpret_cast<cvm::real const *>(new_value));
+    }
+    if (param_name.compare("componentExp") == 0) {
+      sup_np = *(reinterpret_cast<int const *>(new_value));
+    }
+    if (is_enabled(f_cvc_periodic)) {
+      if (param_name.compare("period") == 0) {
+        period = *(reinterpret_cast<cvm::real const *>(new_value));
+      }
+      if (param_name.compare("wrapAround") == 0) {
+        wrap_center = *(reinterpret_cast<cvm::real const *>(new_value));
+      }
+    }
+  }
+
+  return colvarparams::set_param(param_name, new_value);
+}
+
+
 void colvar::cvc::read_data()
 {
   size_t ig;
@@ -537,7 +620,7 @@ colvarvalue colvar::cvc::dist2_rgrad(colvarvalue const &x1,
 }
 
 
-void colvar::cvc::wrap(colvarvalue &x_unwrapped) const
+void colvar::cvc::wrap(colvarvalue & /* x_unwrapped */) const
 {
   return;
 }
diff --git a/lib/colvars/colvarcomp.h b/lib/colvars/colvarcomp.h
index 1d95cbe600..1ab7d17031 100644
--- a/lib/colvars/colvarcomp.h
+++ b/lib/colvars/colvarcomp.h
@@ -2,7 +2,7 @@
 
 // This file is part of the Collective Variables module (Colvars).
 // The original version of Colvars and its updates are located at:
-// https://github.com/colvars/colvars
+// https://github.com/Colvars/colvars
 // Please update all Colvars source files before making any changes.
 // If you wish to distribute your changes, please submit them to the
 // Colvars repository at GitHub.
@@ -23,11 +23,13 @@
 #include "colvarmodule.h"
 #include "colvar.h"
 #include "colvaratoms.h"
+#include "colvar_arithmeticpath.h"
 
 #if (__cplusplus >= 201103L)
+// C++11-only functions
 #include "colvar_geometricpath.h"
 #include <functional>
-#endif // C++11 checking
+#endif
 
 #include <map>
 
@@ -97,10 +99,7 @@ public:
   /// \brief Exponent in the polynomial combination (default: 1)
   int       sup_np;
 
-  /// \brief Is this a periodic component?
-  bool b_periodic;
-
-  /// \brief Period of this cvc value, (default: 0.0, non periodic)
+  /// \brief Period of the values of this CVC (default: 0.0, non periodic)
   cvm::real period;
 
   /// \brief If the component is periodic, wrap around this value (default: 0.0)
@@ -261,10 +260,13 @@ public:
   std::vector<cvm::atom_group *> atom_groups;
 
   /// \brief Store a pointer to new atom group, and list as child for dependencies
-  inline void register_atom_group(cvm::atom_group *ag) {
-    atom_groups.push_back(ag);
-    add_child(ag);
-  }
+  void register_atom_group(cvm::atom_group *ag);
+
+  /// Pointer to the gradient of parameter param_name
+  virtual colvarvalue const *get_param_grad(std::string const &param_name);
+
+  /// Set the named parameter to the given value
+  virtual int set_param(std::string const &param_name, void const *new_value);
 
   /// \brief Whether or not this CVC will be computed in parallel whenever possible
   bool b_try_scalable;
@@ -286,6 +288,24 @@ protected:
   /// \brief Calculated Jacobian derivative (divergence of the inverse
   /// gradients): serves to calculate the phase space correction
   colvarvalue jd;
+
+  /// \brief Set data types for a scalar distance (convenience function)
+  void init_as_distance();
+
+  /// \brief Set data types for a bounded angle (convenience function)
+  void init_as_angle();
+
+  /// \brief Set two scalar boundaries (convenience function)
+  void init_scalar_boundaries(cvm::real lb, cvm::real ub);
+
+  /// \brief Location of the lower boundary (not defined by user choice)
+  colvarvalue lower_boundary;
+
+  /// \brief Location of the upper boundary (not defined by user choice)
+  colvarvalue upper_boundary;
+
+  /// \brief CVC-specific default colvar width
+  cvm::real width;
 };
 
 
@@ -538,7 +558,6 @@ protected:
   bool b_no_PBC;
 public:
   distance_inv(std::string const &conf);
-  distance_inv();
   virtual ~distance_inv() {}
   virtual void calc_value();
   virtual void calc_gradients();
@@ -614,9 +633,7 @@ protected:
   /// Atoms involved
   cvm::atom_group  *atoms;
 public:
-  /// Constructor
   gyration(std::string const &conf);
-  gyration();
   virtual ~gyration() {}
   virtual void calc_value();
   virtual void calc_gradients();
@@ -752,7 +769,6 @@ public:
   angle(std::string const &conf);
   /// \brief Initialize the three groups after three atoms
   angle(cvm::atom const &a1, cvm::atom const &a2, cvm::atom const &a3);
-  angle();
   virtual ~angle() {}
   virtual void calc_value();
   virtual void calc_gradients();
@@ -902,7 +918,6 @@ protected:
 public:
 
   coordnum(std::string const &conf);
-  coordnum();
   ~coordnum();
 
   virtual void calc_value();
@@ -972,7 +987,6 @@ protected:
 public:
 
   selfcoordnum(std::string const &conf);
-  selfcoordnum();
   ~selfcoordnum();
   virtual void calc_value();
   virtual void calc_gradients();
@@ -1011,7 +1025,6 @@ protected:
 public:
   /// Constructor
   groupcoordnum(std::string const &conf);
-  groupcoordnum();
   virtual ~groupcoordnum() {}
   virtual void calc_value();
   virtual void calc_gradients();
@@ -1232,7 +1245,6 @@ class colvar::orientation_angle
 public:
 
   orientation_angle(std::string const &conf);
-  orientation_angle();
   virtual int init(std::string const &conf);
   virtual ~orientation_angle() {}
   virtual void calc_value();
@@ -1285,7 +1297,6 @@ protected:
 public:
 
   tilt(std::string const &conf);
-  tilt();
   virtual int init(std::string const &conf);
   virtual ~tilt() {}
   virtual void calc_value();
@@ -1394,13 +1405,13 @@ class colvar::componentDisabled
   : public colvar::cvc
 {
 public:
-    componentDisabled(std::string const &conf) {
+    componentDisabled(std::string const & /* conf */) {
         cvm::error("Error: this component is not enabled in the current build; please see https://colvars.github.io/README-c++11.html");
     }
     virtual ~componentDisabled() {}
     virtual void calc_value() {}
     virtual void calc_gradients() {}
-    virtual void apply_force(colvarvalue const &force) {}
+    virtual void apply_force(colvarvalue const & /* force */) {}
 };
 
 
@@ -1410,7 +1421,7 @@ class colvar::CartesianBasedPath
   : public colvar::cvc
 {
 protected:
-    virtual void computeReferenceDistance(std::vector<cvm::real>& result);
+    virtual void computeDistanceToReferenceFrames(std::vector<cvm::real>& result);
     /// Selected atoms
     cvm::atom_group *atoms;
     /// Fitting options
@@ -1440,7 +1451,7 @@ private:
     cvm::rotation rot_v3;
 protected:
     virtual void prepareVectors();
-    virtual void updateReferenceDistances();
+    virtual void updateDistanceToReferenceFrames();
 public:
     gspath(std::string const &conf);
     virtual ~gspath() {}
@@ -1462,7 +1473,7 @@ private:
     cvm::rotation rot_v4;
 protected:
     virtual void prepareVectors();
-    virtual void updateReferenceDistances();
+    virtual void updateDistanceToReferenceFrames();
 public:
     gzpath(std::string const &conf);
     virtual ~gzpath() {}
@@ -1501,14 +1512,16 @@ protected:
     std::map<std::string, std::function<colvar::cvc* (const std::string& subcv_conf)>> string_cv_map;
     /// Sub-colvar components
     std::vector<colvar::cvc*> cv;
-    /// Refernce colvar values from path
+    /// Reference colvar values from path
     std::vector<std::vector<colvarvalue>> ref_cv;
     /// If all sub-cvs use explicit gradients then we also use it
     bool use_explicit_gradients;
     /// Total number of reference frames
     size_t total_reference_frames;
 protected:
-    virtual void computeReferenceDistance(std::vector<cvm::real>& result);
+    virtual void computeDistanceToReferenceFrames(std::vector<cvm::real>& result);
+    /// Helper function to determine the distance between reference frames
+    virtual void computeDistanceBetweenReferenceFrames(std::vector<cvm::real>& result) const;
     cvm::real getPolynomialFactorOfCVGradient(size_t i_cv) const;
 public:
     CVBasedPath(std::string const &conf);
@@ -1526,7 +1539,7 @@ class colvar::gspathCV
   : public colvar::CVBasedPath, public GeometricPathCV::GeometricPathBase<colvarvalue, cvm::real, GeometricPathCV::path_sz::S>
 {
 protected:
-    virtual void updateReferenceDistances();
+    virtual void updateDistanceToReferenceFrames();
     virtual void prepareVectors();
 public:
     gspathCV(std::string const &conf);
@@ -1542,7 +1555,7 @@ class colvar::gzpathCV
   : public colvar::CVBasedPath, public GeometricPathCV::GeometricPathBase<colvarvalue, cvm::real, GeometricPathCV::path_sz::Z>
 {
 protected:
-    virtual void updateReferenceDistances();
+    virtual void updateDistanceToReferenceFrames();
     virtual void prepareVectors();
 public:
     gzpathCV(std::string const &conf);
@@ -1552,6 +1565,35 @@ public:
     virtual void apply_force(colvarvalue const &force);
 };
 
+
+
+class colvar::aspathCV
+  : public colvar::CVBasedPath, public ArithmeticPathCV::ArithmeticPathBase<colvarvalue, cvm::real, ArithmeticPathCV::path_sz::S>
+{
+protected:
+    virtual void updateDistanceToReferenceFrames();
+public:
+    aspathCV(std::string const &conf);
+    virtual ~aspathCV();
+    virtual void calc_value();
+    virtual void calc_gradients();
+    virtual void apply_force(colvarvalue const &force);
+};
+
+
+class colvar::azpathCV
+  : public colvar::CVBasedPath, public ArithmeticPathCV::ArithmeticPathBase<colvarvalue, cvm::real, ArithmeticPathCV::path_sz::Z>
+{
+protected:
+    virtual void updateDistanceToReferenceFrames();
+public:
+    azpathCV(std::string const &conf);
+    virtual ~azpathCV();
+    virtual void calc_value();
+    virtual void calc_gradients();
+    virtual void apply_force(colvarvalue const &force);
+};
+
 #else // if the compiler doesn't support C++11
 
 class colvar::linearCombination
@@ -1603,6 +1645,20 @@ public:
     gzpathCV(std::string const &conf) : componentDisabled(conf) {}
 };
 
+class colvar::aspathCV
+  : public colvar::componentDisabled
+{
+public:
+    aspathCV(std::string const &conf) : componentDisabled(conf) {}
+};
+
+class colvar::azpathCV
+  : public colvar::componentDisabled
+{
+public:
+    azpathCV(std::string const &conf) : componentDisabled(conf) {}
+};
+
 #endif // C++11 checking
 
 // metrics functions for cvc implementations
diff --git a/lib/colvars/colvarcomp_angles.cpp b/lib/colvars/colvarcomp_angles.cpp
index 97fb23b181..28d7677147 100644
--- a/lib/colvars/colvarcomp_angles.cpp
+++ b/lib/colvars/colvarcomp_angles.cpp
@@ -2,7 +2,7 @@
 
 // This file is part of the Collective Variables module (Colvars).
 // The original version of Colvars and its updates are located at:
-// https://github.com/colvars/colvars
+// https://github.com/Colvars/colvars
 // Please update all Colvars source files before making any changes.
 // If you wish to distribute your changes, please submit them to the
 // Colvars repository at GitHub.
@@ -16,6 +16,8 @@ colvar::angle::angle(std::string const &conf)
   : cvc(conf)
 {
   function_type = "angle";
+  init_as_angle();
+
   provide(f_cvc_inv_gradient);
   provide(f_cvc_Jacobian);
   enable(f_cvc_com_based);
@@ -25,8 +27,6 @@ colvar::angle::angle(std::string const &conf)
   group3 = parse_group(conf, "group3");
 
   init_total_force_params(conf);
-
-  x.type(colvarvalue::type_scalar);
 }
 
 
@@ -35,6 +35,8 @@ colvar::angle::angle(cvm::atom const &a1,
                      cvm::atom const &a3)
 {
   function_type = "angle";
+  init_as_angle();
+
   provide(f_cvc_inv_gradient);
   provide(f_cvc_Jacobian);
   enable(f_cvc_com_based);
@@ -45,15 +47,6 @@ colvar::angle::angle(cvm::atom const &a1,
   register_atom_group(group1);
   register_atom_group(group2);
   register_atom_group(group3);
-
-  x.type(colvarvalue::type_scalar);
-}
-
-
-colvar::angle::angle()
-{
-  function_type = "angle";
-  x.type(colvarvalue::type_scalar);
 }
 
 
@@ -148,13 +141,13 @@ colvar::dipole_angle::dipole_angle(std::string const &conf)
   : cvc(conf)
 {
   function_type = "dipole_angle";
+  init_as_angle();
+
   group1 = parse_group(conf, "group1");
   group2 = parse_group(conf, "group2");
   group3 = parse_group(conf, "group3");
 
   init_total_force_params(conf);
-
-  x.type(colvarvalue::type_scalar);
 }
 
 
@@ -178,6 +171,7 @@ colvar::dipole_angle::dipole_angle(cvm::atom const &a1,
 colvar::dipole_angle::dipole_angle()
 {
   function_type = "dipole_angle";
+  init_as_angle();
   x.type(colvarvalue::type_scalar);
 }
 
@@ -259,7 +253,7 @@ colvar::dihedral::dihedral(std::string const &conf)
 {
   function_type = "dihedral";
   period = 360.0;
-  b_periodic = true;
+  enable(f_cvc_periodic);
   provide(f_cvc_inv_gradient);
   provide(f_cvc_Jacobian);
   enable(f_cvc_com_based);
@@ -285,7 +279,7 @@ colvar::dihedral::dihedral(cvm::atom const &a1,
 
   function_type = "dihedral";
   period = 360.0;
-  b_periodic = true;
+  enable(f_cvc_periodic);
   provide(f_cvc_inv_gradient);
   provide(f_cvc_Jacobian);
   enable(f_cvc_com_based);
@@ -312,7 +306,7 @@ colvar::dihedral::dihedral()
 {
   function_type = "dihedral";
   period = 360.0;
-  b_periodic = true;
+  enable(f_cvc_periodic);
   provide(f_cvc_inv_gradient);
   provide(f_cvc_Jacobian);
   x.type(colvarvalue::type_scalar);
diff --git a/lib/colvars/colvarcomp_apath.cpp b/lib/colvars/colvarcomp_apath.cpp
new file mode 100644
index 0000000000..591d8d0012
--- /dev/null
+++ b/lib/colvars/colvarcomp_apath.cpp
@@ -0,0 +1,192 @@
+#if (__cplusplus >= 201103L)
+
+#include <numeric>
+#include <algorithm>
+#include <cmath>
+#include <cstdlib>
+#include <limits>
+
+#include "colvarmodule.h"
+#include "colvarvalue.h"
+#include "colvarparse.h"
+#include "colvar.h"
+#include "colvarcomp.h"
+
+colvar::aspathCV::aspathCV(std::string const &conf): CVBasedPath(conf) {
+    function_type = "aspathCV";
+    cvm::log(std::string("Total number of frames: ") + cvm::to_str(total_reference_frames) + std::string("\n"));
+    std::vector<cvm::real> p_weights(cv.size(), 1.0);
+    get_keyval(conf, "weights", p_weights, std::vector<cvm::real>(cv.size(), 1.0));
+    x.type(colvarvalue::type_scalar);
+    use_explicit_gradients = true;
+    std::vector<cvm::real> rmsd_between_refs(total_reference_frames - 1, 0.0);
+    computeDistanceBetweenReferenceFrames(rmsd_between_refs);
+    cvm::real mean_square_displacements = 0.0;
+    for (size_t i_frame = 1; i_frame < total_reference_frames; ++i_frame) {
+        cvm::log(std::string("Distance between frame ") + cvm::to_str(i_frame) + " and " + cvm::to_str(i_frame + 1) + " is " + cvm::to_str(rmsd_between_refs[i_frame - 1]) + std::string("\n"));
+        mean_square_displacements += rmsd_between_refs[i_frame - 1] * rmsd_between_refs[i_frame - 1];
+    }
+    mean_square_displacements /= cvm::real(total_reference_frames - 1);
+    cvm::real suggested_lambda = 1.0 / mean_square_displacements;
+    cvm::real p_lambda;
+    get_keyval(conf, "lambda", p_lambda, suggested_lambda);
+    ArithmeticPathCV::ArithmeticPathBase<colvarvalue, cvm::real, ArithmeticPathCV::path_sz::S>::initialize(cv.size(), total_reference_frames, p_lambda, ref_cv[0], p_weights);
+    cvm::log(std::string("Lambda is ") + cvm::to_str(lambda) + std::string("\n"));
+    for (size_t i_cv = 0; i_cv < cv.size(); ++i_cv) {
+        if (!cv[i_cv]->is_enabled(f_cvc_explicit_gradient)) {
+            use_explicit_gradients = false;
+        }
+        cvm::log(std::string("The weight of CV ") + cvm::to_str(i_cv) + std::string(" is ") + cvm::to_str(weights[i_cv]) + std::string("\n"));
+    }
+}
+
+void colvar::aspathCV::updateDistanceToReferenceFrames() {
+    for (size_t i_cv = 0; i_cv < cv.size(); ++i_cv) {
+        cv[i_cv]->calc_value();
+    }
+    for (size_t i_frame = 0; i_frame < ref_cv.size(); ++i_frame) {
+        for (size_t i_cv = 0; i_cv < cv.size(); ++i_cv) {
+            colvarvalue ref_cv_value(ref_cv[i_frame][i_cv]);
+            colvarvalue current_cv_value(cv[i_cv]->value());
+            if (current_cv_value.type() == colvarvalue::type_scalar) {
+                frame_element_distances[i_frame][i_cv] = 0.5 * cv[i_cv]->dist2_lgrad(cv[i_cv]->sup_coeff * (cvm::pow(current_cv_value.real_value, cv[i_cv]->sup_np)), ref_cv_value.real_value);
+            } else {
+                frame_element_distances[i_frame][i_cv] = 0.5 * cv[i_cv]->dist2_lgrad(cv[i_cv]->sup_coeff * current_cv_value, ref_cv_value);
+            }
+        }
+    }
+}
+
+void colvar::aspathCV::calc_value() {
+    computeValue();
+    x = s;
+}
+
+void colvar::aspathCV::calc_gradients() {
+    computeDerivatives();
+    for (size_t i_cv = 0; i_cv < cv.size(); ++i_cv) {
+        cv[i_cv]->calc_gradients();
+        if ( cv[i_cv]->is_enabled(f_cvc_explicit_gradient) &&
+            !cv[i_cv]->is_enabled(f_cvc_scalable) &&
+            !cv[i_cv]->is_enabled(f_cvc_scalable_com)) {
+            cvm::real factor_polynomial = getPolynomialFactorOfCVGradient(i_cv);
+            for (size_t j_elem = 0; j_elem < cv[i_cv]->value().size(); ++j_elem) {
+                for (size_t k_ag = 0 ; k_ag < cv[i_cv]->atom_groups.size(); ++k_ag) {
+                    for (size_t l_atom = 0; l_atom < (cv[i_cv]->atom_groups)[k_ag]->size(); ++l_atom) {
+                        (*(cv[i_cv]->atom_groups)[k_ag])[l_atom].grad = dsdx[i_cv][j_elem] * factor_polynomial * (*(cv[i_cv]->atom_groups)[k_ag])[l_atom].grad;
+                    }
+                }
+            }
+        }
+    }
+}
+
+void colvar::aspathCV::apply_force(colvarvalue const &force) {
+    for (size_t i_cv = 0; i_cv < cv.size(); ++i_cv) {
+        if ( cv[i_cv]->is_enabled(f_cvc_explicit_gradient) &&
+            !cv[i_cv]->is_enabled(f_cvc_scalable) &&
+            !cv[i_cv]->is_enabled(f_cvc_scalable_com)
+        ) {
+            for (size_t k_ag = 0 ; k_ag < cv[i_cv]->atom_groups.size(); ++k_ag) {
+                (cv[i_cv]->atom_groups)[k_ag]->apply_colvar_force(force.real_value);
+            }
+        } else {
+            cvm::real factor_polynomial = getPolynomialFactorOfCVGradient(i_cv);
+            colvarvalue cv_force = dsdx[i_cv] * force.real_value * factor_polynomial;
+            cv[i_cv]->apply_force(cv_force);
+        }
+    }
+}
+
+colvar::aspathCV::~aspathCV() {}
+
+colvar::azpathCV::azpathCV(std::string const &conf): CVBasedPath(conf) {
+    function_type = "azpathCV";
+    cvm::log(std::string("Total number of frames: ") + cvm::to_str(total_reference_frames) + std::string("\n"));
+    std::vector<cvm::real> p_weights(cv.size(), 1.0);
+    get_keyval(conf, "weights", p_weights, std::vector<cvm::real>(cv.size(), 1.0));
+    x.type(colvarvalue::type_scalar);
+    use_explicit_gradients = true;
+    std::vector<cvm::real> rmsd_between_refs(total_reference_frames - 1, 0.0);
+    computeDistanceBetweenReferenceFrames(rmsd_between_refs);
+    cvm::real mean_square_displacements = 0.0;
+    for (size_t i_frame = 1; i_frame < total_reference_frames; ++i_frame) {
+        cvm::log(std::string("Distance between frame ") + cvm::to_str(i_frame) + " and " + cvm::to_str(i_frame + 1) + " is " + cvm::to_str(rmsd_between_refs[i_frame - 1]) + std::string("\n"));
+        mean_square_displacements += rmsd_between_refs[i_frame - 1] * rmsd_between_refs[i_frame - 1];
+    }
+    mean_square_displacements /= cvm::real(total_reference_frames - 1);
+    cvm::real suggested_lambda = 1.0 / mean_square_displacements;
+    cvm::real p_lambda;
+    get_keyval(conf, "lambda", p_lambda, suggested_lambda);
+    ArithmeticPathCV::ArithmeticPathBase<colvarvalue, cvm::real, ArithmeticPathCV::path_sz::Z>::initialize(cv.size(), total_reference_frames, p_lambda, ref_cv[0], p_weights);
+    cvm::log(std::string("Lambda is ") + cvm::to_str(lambda) + std::string("\n"));
+    for (size_t i_cv = 0; i_cv < cv.size(); ++i_cv) {
+        if (!cv[i_cv]->is_enabled(f_cvc_explicit_gradient)) {
+            use_explicit_gradients = false;
+        }
+        cvm::log(std::string("The weight of CV ") + cvm::to_str(i_cv) + std::string(" is ") + cvm::to_str(weights[i_cv]) + std::string("\n"));
+    }
+}
+
+void colvar::azpathCV::updateDistanceToReferenceFrames() {
+    for (size_t i_cv = 0; i_cv < cv.size(); ++i_cv) {
+        cv[i_cv]->calc_value();
+    }
+    for (size_t i_frame = 0; i_frame < ref_cv.size(); ++i_frame) {
+        for (size_t i_cv = 0; i_cv < cv.size(); ++i_cv) {
+            colvarvalue ref_cv_value(ref_cv[i_frame][i_cv]);
+            colvarvalue current_cv_value(cv[i_cv]->value());
+            if (current_cv_value.type() == colvarvalue::type_scalar) {
+                frame_element_distances[i_frame][i_cv] = 0.5 * cv[i_cv]->dist2_lgrad(cv[i_cv]->sup_coeff * (cvm::pow(current_cv_value.real_value, cv[i_cv]->sup_np)), ref_cv_value.real_value);
+            } else {
+                frame_element_distances[i_frame][i_cv] = 0.5 * cv[i_cv]->dist2_lgrad(cv[i_cv]->sup_coeff * current_cv_value, ref_cv_value);
+            }
+        }
+    }
+}
+
+void colvar::azpathCV::calc_value() {
+    computeValue();
+    x = z;
+}
+
+void colvar::azpathCV::calc_gradients() {
+    computeDerivatives();
+    for (size_t i_cv = 0; i_cv < cv.size(); ++i_cv) {
+        cv[i_cv]->calc_gradients();
+        if ( cv[i_cv]->is_enabled(f_cvc_explicit_gradient) &&
+            !cv[i_cv]->is_enabled(f_cvc_scalable) &&
+            !cv[i_cv]->is_enabled(f_cvc_scalable_com)) {
+            cvm::real factor_polynomial = getPolynomialFactorOfCVGradient(i_cv);
+            for (size_t j_elem = 0; j_elem < cv[i_cv]->value().size(); ++j_elem) {
+                for (size_t k_ag = 0 ; k_ag < cv[i_cv]->atom_groups.size(); ++k_ag) {
+                    for (size_t l_atom = 0; l_atom < (cv[i_cv]->atom_groups)[k_ag]->size(); ++l_atom) {
+                        (*(cv[i_cv]->atom_groups)[k_ag])[l_atom].grad = dzdx[i_cv][j_elem] * factor_polynomial * (*(cv[i_cv]->atom_groups)[k_ag])[l_atom].grad;
+                    }
+                }
+            }
+
+        }
+    }
+}
+
+void colvar::azpathCV::apply_force(colvarvalue const &force) {
+    for (size_t i_cv = 0; i_cv < cv.size(); ++i_cv) {
+        if ( cv[i_cv]->is_enabled(f_cvc_explicit_gradient) &&
+            !cv[i_cv]->is_enabled(f_cvc_scalable) &&
+            !cv[i_cv]->is_enabled(f_cvc_scalable_com)
+        ) {
+            for (size_t k_ag = 0 ; k_ag < cv[i_cv]->atom_groups.size(); ++k_ag) {
+                (cv[i_cv]->atom_groups)[k_ag]->apply_colvar_force(force.real_value);
+            }
+        } else {
+            cvm::real factor_polynomial = getPolynomialFactorOfCVGradient(i_cv);
+            const colvarvalue cv_force = dzdx[i_cv] * force.real_value * factor_polynomial;
+            cv[i_cv]->apply_force(cv_force);
+        }
+    }
+}
+
+colvar::azpathCV::~azpathCV() {}
+
+#endif
diff --git a/lib/colvars/colvarcomp_coordnums.cpp b/lib/colvars/colvarcomp_coordnums.cpp
index b6dd6535ef..f0fbabfc4f 100644
--- a/lib/colvars/colvarcomp_coordnums.cpp
+++ b/lib/colvars/colvarcomp_coordnums.cpp
@@ -2,7 +2,7 @@
 
 // This file is part of the Collective Variables module (Colvars).
 // The original version of Colvars and its updates are located at:
-// https://github.com/colvars/colvars
+// https://github.com/Colvars/colvars
 // Please update all Colvars source files before making any changes.
 // If you wish to distribute your changes, please submit them to the
 // Colvars repository at GitHub.
@@ -97,6 +97,8 @@ colvar::coordnum::coordnum(std::string const &conf)
   function_type = "coordnum";
   x.type(colvarvalue::type_scalar);
 
+  colvarproxy *proxy = cvm::main()->proxy;
+
   group1 = parse_group(conf, "group1");
   group2 = parse_group(conf, "group2");
 
@@ -119,12 +121,12 @@ colvar::coordnum::coordnum(std::string const &conf)
   }
 
   bool const b_isotropic = get_keyval(conf, "cutoff", r0,
-                                      cvm::real(4.0 * cvm::unit_angstrom()));
+                                      cvm::real(4.0 * proxy->angstrom_value));
 
   if (get_keyval(conf, "cutoff3", r0_vec,
-                 cvm::rvector(4.0 * cvm::unit_angstrom(),
-                              4.0 * cvm::unit_angstrom(),
-                              4.0 * cvm::unit_angstrom()))) {
+                 cvm::rvector(4.0 * proxy->angstrom_value,
+                              4.0 * proxy->angstrom_value,
+                              4.0 * proxy->angstrom_value))) {
     if (b_isotropic) {
       cvm::error("Error: cannot specify \"cutoff\" and \"cutoff3\" "
                  "at the same time.\n",
@@ -174,14 +176,8 @@ colvar::coordnum::coordnum(std::string const &conf)
     }
   }
 
-}
-
-
-colvar::coordnum::coordnum()
-  : b_anisotropic(false), pairlist(NULL)
-{
-  function_type = "coordnum";
-  x.type(colvarvalue::type_scalar);
+  init_scalar_boundaries(0.0, b_group2_center_only ? group1->size() :
+                         group1->size() * group2->size());
 }
 
 
@@ -310,10 +306,13 @@ colvar::h_bond::h_bond(std::string const &conf)
 
   function_type = "h_bond";
   x.type(colvarvalue::type_scalar);
+  init_scalar_boundaries(0.0, 1.0);
 
-  int a_num, d_num;
-  get_keyval(conf, "acceptor", a_num, -1);
-  get_keyval(conf, "donor",    d_num, -1);
+  colvarproxy *proxy = cvm::main()->proxy;
+
+  int a_num = -1, d_num = -1;
+  get_keyval(conf, "acceptor", a_num, a_num);
+  get_keyval(conf, "donor",    d_num, a_num);
 
   if ( (a_num == -1) || (d_num == -1) ) {
     cvm::error("Error: either acceptor or donor undefined.\n");
@@ -326,7 +325,7 @@ colvar::h_bond::h_bond(std::string const &conf)
   atom_groups[0]->add_atom(acceptor);
   atom_groups[0]->add_atom(donor);
 
-  get_keyval(conf, "cutoff",   r0, (3.3 * cvm::unit_angstrom()));
+  get_keyval(conf, "cutoff",   r0, (3.3 * proxy->angstrom_value));
   get_keyval(conf, "expNumer", en, 6);
   get_keyval(conf, "expDenom", ed, 8);
 
@@ -352,6 +351,7 @@ colvar::h_bond::h_bond(cvm::atom const &acceptor,
 {
   function_type = "h_bond";
   x.type(colvarvalue::type_scalar);
+  init_scalar_boundaries(0.0, 1.0);
 
   register_atom_group(new cvm::atom_group);
   atom_groups[0]->add_atom(acceptor);
@@ -359,14 +359,6 @@ colvar::h_bond::h_bond(cvm::atom const &acceptor,
 }
 
 
-colvar::h_bond::h_bond()
-  : cvc()
-{
-  function_type = "h_bond";
-  x.type(colvarvalue::type_scalar);
-}
-
-
 void colvar::h_bond::calc_value()
 {
   int const flags = coordnum::ef_null;
@@ -406,9 +398,11 @@ colvar::selfcoordnum::selfcoordnum(std::string const &conf)
   function_type = "selfcoordnum";
   x.type(colvarvalue::type_scalar);
 
+  colvarproxy *proxy = cvm::main()->proxy;
+
   group1 = parse_group(conf, "group1");
 
-  get_keyval(conf, "cutoff", r0, cvm::real(4.0 * cvm::unit_angstrom()));
+  get_keyval(conf, "cutoff", r0, cvm::real(4.0 * proxy->angstrom_value));
   get_keyval(conf, "expNumer", en, 6);
   get_keyval(conf, "expDenom", ed, 12);
 
@@ -437,14 +431,8 @@ colvar::selfcoordnum::selfcoordnum(std::string const &conf)
     }
     pairlist = new bool[(group1->size()-1) * (group1->size()-1)];
   }
-}
 
-
-colvar::selfcoordnum::selfcoordnum()
-  : pairlist(NULL)
-{
-  function_type = "selfcoordnum";
-  x.type(colvarvalue::type_scalar);
+  init_scalar_boundaries(0.0, (group1->size()-1) * (group1->size()-1));
 }
 
 
@@ -553,6 +541,9 @@ colvar::groupcoordnum::groupcoordnum(std::string const &conf)
 {
   function_type = "groupcoordnum";
   x.type(colvarvalue::type_scalar);
+  init_scalar_boundaries(0.0, 1.0);
+
+  colvarproxy *proxy = cvm::main()->proxy;
 
   // group1 and group2 are already initialized by distance()
   if (group1->b_dummy || group2->b_dummy) {
@@ -561,7 +552,7 @@ colvar::groupcoordnum::groupcoordnum(std::string const &conf)
   }
 
   bool const b_scale = get_keyval(conf, "cutoff", r0,
-                                  cvm::real(4.0 * cvm::unit_angstrom()));
+                                  cvm::real(4.0 * proxy->angstrom_value));
 
   if (get_keyval(conf, "cutoff3", r0_vec,
                  cvm::rvector(4.0, 4.0, 4.0), parse_silent)) {
@@ -598,14 +589,6 @@ colvar::groupcoordnum::groupcoordnum(std::string const &conf)
 }
 
 
-colvar::groupcoordnum::groupcoordnum()
-  : b_anisotropic(false)
-{
-  function_type = "groupcoordnum";
-  x.type(colvarvalue::type_scalar);
-}
-
-
 void colvar::groupcoordnum::calc_value()
 {
   // create fake atoms to hold the com coordinates
diff --git a/lib/colvars/colvarcomp_distances.cpp b/lib/colvars/colvarcomp_distances.cpp
index 7cb4c30c31..c3c1ee55d5 100644
--- a/lib/colvars/colvarcomp_distances.cpp
+++ b/lib/colvars/colvarcomp_distances.cpp
@@ -2,7 +2,7 @@
 
 // This file is part of the Collective Variables module (Colvars).
 // The original version of Colvars and its updates are located at:
-// https://github.com/colvars/colvars
+// https://github.com/Colvars/colvars
 // Please update all Colvars source files before making any changes.
 // If you wish to distribute your changes, please submit them to the
 // Colvars repository at GitHub.
@@ -19,6 +19,8 @@ colvar::distance::distance(std::string const &conf)
   : cvc(conf)
 {
   function_type = "distance";
+  init_as_distance();
+
   provide(f_cvc_inv_gradient);
   provide(f_cvc_Jacobian);
   enable(f_cvc_com_based);
@@ -27,8 +29,6 @@ colvar::distance::distance(std::string const &conf)
   group2 = parse_group(conf, "group2");
 
   init_total_force_params(conf);
-
-  x.type(colvarvalue::type_scalar);
 }
 
 
@@ -36,10 +36,11 @@ colvar::distance::distance()
   : cvc()
 {
   function_type = "distance";
+  init_as_distance();
+
   provide(f_cvc_inv_gradient);
   provide(f_cvc_Jacobian);
   enable(f_cvc_com_based);
-  x.type(colvarvalue::type_scalar);
 }
 
 
@@ -177,7 +178,7 @@ colvar::distance_z::distance_z(std::string const &conf)
   // TODO detect PBC from MD engine (in simple cases)
   // and then update period in real time
   if (period != 0.0)
-    b_periodic = true;
+    enable(f_cvc_periodic);
 
   if ((wrap_center != 0.0) && (period == 0.0)) {
     cvm::error("Error: wrapAround was defined in a distanceZ component,"
@@ -317,7 +318,7 @@ cvm::real colvar::distance_z::dist2(colvarvalue const &x1,
                                     colvarvalue const &x2) const
 {
   cvm::real diff = x1.real_value - x2.real_value;
-  if (b_periodic) {
+  if (is_enabled(f_cvc_periodic)) {
     cvm::real shift = cvm::floor(diff/period + 0.5);
     diff -= shift * period;
   }
@@ -329,7 +330,7 @@ colvarvalue colvar::distance_z::dist2_lgrad(colvarvalue const &x1,
                                             colvarvalue const &x2) const
 {
   cvm::real diff = x1.real_value - x2.real_value;
-  if (b_periodic) {
+  if (is_enabled(f_cvc_periodic)) {
     cvm::real shift = cvm::floor(diff/period + 0.5);
     diff -= shift * period;
   }
@@ -341,7 +342,7 @@ colvarvalue colvar::distance_z::dist2_rgrad(colvarvalue const &x1,
                                             colvarvalue const &x2) const
 {
   cvm::real diff = x1.real_value - x2.real_value;
-  if (b_periodic) {
+  if (is_enabled(f_cvc_periodic)) {
     cvm::real shift = cvm::floor(diff/period + 0.5);
     diff -= shift * period;
   }
@@ -351,15 +352,13 @@ colvarvalue colvar::distance_z::dist2_rgrad(colvarvalue const &x1,
 
 void colvar::distance_z::wrap(colvarvalue &x_unwrapped) const
 {
-  if (!b_periodic) {
+  if (!is_enabled(f_cvc_periodic)) {
     // don't wrap if the period has not been set
     return;
   }
-
   cvm::real shift =
     cvm::floor((x_unwrapped.real_value - wrap_center) / period + 0.5);
   x_unwrapped.real_value -= shift * period;
-  return;
 }
 
 
@@ -368,10 +367,11 @@ colvar::distance_xy::distance_xy(std::string const &conf)
   : distance_z(conf)
 {
   function_type = "distance_xy";
+  init_as_distance();
+
   provide(f_cvc_inv_gradient);
   provide(f_cvc_Jacobian);
   enable(f_cvc_com_based);
-  x.type(colvarvalue::type_scalar);
 }
 
 
@@ -379,10 +379,11 @@ colvar::distance_xy::distance_xy()
   : distance_z()
 {
   function_type = "distance_xy";
+  init_as_distance();
+
   provide(f_cvc_inv_gradient);
   provide(f_cvc_Jacobian);
   enable(f_cvc_com_based);
-  x.type(colvarvalue::type_scalar);
 }
 
 
@@ -557,6 +558,7 @@ colvar::distance_inv::distance_inv(std::string const &conf)
   : cvc(conf)
 {
   function_type = "distance_inv";
+  init_as_distance();
 
   group1 = parse_group(conf, "group1");
   group2 = parse_group(conf, "group2");
@@ -585,16 +587,6 @@ colvar::distance_inv::distance_inv(std::string const &conf)
              "for distanceInv, because its value and gradients are computed "
              "simultaneously.\n");
   }
-
-  x.type(colvarvalue::type_scalar);
-}
-
-
-colvar::distance_inv::distance_inv()
-{
-  function_type = "distance_inv";
-  exponent = 6;
-  x.type(colvarvalue::type_scalar);
 }
 
 
@@ -807,6 +799,8 @@ colvar::gyration::gyration(std::string const &conf)
   : cvc(conf)
 {
   function_type = "gyration";
+  init_as_distance();
+
   provide(f_cvc_inv_gradient);
   provide(f_cvc_Jacobian);
   atoms = parse_group(conf, "atoms");
@@ -818,17 +812,6 @@ colvar::gyration::gyration(std::string const &conf)
     atoms->ref_pos.assign(1, cvm::atom_pos(0.0, 0.0, 0.0));
     atoms->fit_gradients.assign(atoms->size(), cvm::rvector(0.0, 0.0, 0.0));
   }
-
-  x.type(colvarvalue::type_scalar);
-}
-
-
-colvar::gyration::gyration()
-{
-  function_type = "gyration";
-  provide(f_cvc_inv_gradient);
-  provide(f_cvc_Jacobian);
-  x.type(colvarvalue::type_scalar);
 }
 
 
@@ -885,14 +868,7 @@ colvar::inertia::inertia(std::string const &conf)
   : gyration(conf)
 {
   function_type = "inertia";
-  x.type(colvarvalue::type_scalar);
-}
-
-
-colvar::inertia::inertia()
-{
-  function_type = "inertia";
-  x.type(colvarvalue::type_scalar);
+  init_as_distance();
 }
 
 
@@ -928,9 +904,10 @@ colvar::inertia_z::inertia_z(std::string const &conf)
   : inertia(conf)
 {
   function_type = "inertia_z";
+  init_as_distance();
   if (get_keyval(conf, "axis", axis, cvm::rvector(0.0, 0.0, 1.0))) {
     if (axis.norm2() == 0.0) {
-      cvm::error("Axis vector is zero!");
+      cvm::error("Axis vector is zero!", INPUT_ERROR);
       return;
     }
     if (axis.norm2() != 1.0) {
@@ -938,14 +915,6 @@ colvar::inertia_z::inertia_z(std::string const &conf)
       cvm::log("The normalized axis is: "+cvm::to_str(axis)+".\n");
     }
   }
-  x.type(colvarvalue::type_scalar);
-}
-
-
-colvar::inertia_z::inertia_z()
-{
-  function_type = "inertia_z";
-  x.type(colvarvalue::type_scalar);
 }
 
 
@@ -982,9 +951,10 @@ simple_scalar_dist_functions(inertia)
 colvar::rmsd::rmsd(std::string const &conf)
   : cvc(conf)
 {
-  provide(f_cvc_inv_gradient);
   function_type = "rmsd";
-  x.type(colvarvalue::type_scalar);
+  init_as_distance();
+
+  provide(f_cvc_inv_gradient);
 
   atoms = parse_group(conf, "atoms");
 
diff --git a/lib/colvars/colvarcomp_gpath.cpp b/lib/colvars/colvarcomp_gpath.cpp
index 530aaf3284..d563403628 100644
--- a/lib/colvars/colvarcomp_gpath.cpp
+++ b/lib/colvars/colvarcomp_gpath.cpp
@@ -2,7 +2,7 @@
 
 // This file is part of the Collective Variables module (Colvars).
 // The original version of Colvars and its updates are located at:
-// https://github.com/colvars/colvars
+// https://github.com/Colvars/colvars
 // Please update all Colvars source files before making any changes.
 // If you wish to distribute your changes, please submit them to the
 // Colvars repository at GitHub.
@@ -119,9 +119,10 @@ colvar::CartesianBasedPath::~CartesianBasedPath() {
             (*it_comp_atoms) = nullptr;
         }
     }
+    atom_groups.clear();
 }
 
-void colvar::CartesianBasedPath::computeReferenceDistance(std::vector<cvm::real>& result) {
+void colvar::CartesianBasedPath::computeDistanceToReferenceFrames(std::vector<cvm::real>& result) {
     for (size_t i_frame = 0; i_frame < reference_frames.size(); ++i_frame) {
         cvm::real frame_rmsd = 0.0;
         for (size_t i_atom = 0; i_atom < atoms->size(); ++i_atom) {
@@ -147,13 +148,16 @@ colvar::gspath::gspath(std::string const &conf): CartesianBasedPath(conf) {
     } else {
         cvm::log(std::string("Geometric path s(σ) will use the neighbouring frame to compute s_(m+1)\n"));
     }
+    if (total_reference_frames < 2) {
+        cvm::error("Error: you have specified " + cvm::to_str(total_reference_frames) + " reference frames, but gspath requires at least 2 frames.\n");
+    }
     GeometricPathCV::GeometricPathBase<cvm::atom_pos, cvm::real, GeometricPathCV::path_sz::S>::initialize(atoms->size(), cvm::atom_pos(), total_reference_frames, use_second_closest_frame, use_third_closest_frame);
     cvm::log(std::string("Geometric pathCV(s) is initialized.\n"));
     cvm::log(std::string("Geometric pathCV(s) loaded ") + cvm::to_str(reference_frames.size()) + std::string(" frames.\n"));
 }
 
-void colvar::gspath::updateReferenceDistances() {
-    computeReferenceDistance(frame_distances);
+void colvar::gspath::updateDistanceToReferenceFrames() {
+    computeDistanceToReferenceFrames(frame_distances);
 }
 
 void colvar::gspath::prepareVectors() {
@@ -290,14 +294,17 @@ colvar::gzpath::gzpath(std::string const &conf): CartesianBasedPath(conf) {
     if (b_use_z_square == true) {
         cvm::log(std::string("Geometric path z(σ) will use the square of distance from current frame to path compute z\n"));
     }
+    if (total_reference_frames < 2) {
+        cvm::error("Error: you have specified " + cvm::to_str(total_reference_frames) + " reference frames, but gzpath requires at least 2 frames.\n");
+    }
     GeometricPathCV::GeometricPathBase<cvm::atom_pos, cvm::real, GeometricPathCV::path_sz::Z>::initialize(atoms->size(), cvm::atom_pos(), total_reference_frames, use_second_closest_frame, use_third_closest_frame, b_use_z_square);
     // Logging
     cvm::log(std::string("Geometric pathCV(z) is initialized.\n"));
     cvm::log(std::string("Geometric pathCV(z) loaded ") + cvm::to_str(reference_frames.size()) + std::string(" frames.\n"));
 }
 
-void colvar::gzpath::updateReferenceDistances() {
-    computeReferenceDistance(frame_distances);
+void colvar::gzpath::updateDistanceToReferenceFrames() {
+    computeDistanceToReferenceFrames(frame_distances);
 }
 
 void colvar::gzpath::prepareVectors() {
@@ -538,6 +545,7 @@ colvar::CVBasedPath::CVBasedPath(std::string const &conf): cvc(conf) {
         std::vector<std::string> fields;
         split_string(line, token, fields);
         size_t num_value_required = 0;
+        cvm::log(std::string("Reading reference frame ") + cvm::to_str(total_reference_frames + 1) + std::string("\n"));
         for (size_t i_cv = 0; i_cv < tmp_cv.size(); ++i_cv) {
             const size_t value_size = tmp_cv[i_cv].size();
             num_value_required += value_size;
@@ -545,10 +553,9 @@ colvar::CVBasedPath::CVBasedPath(std::string const &conf): cvc(conf) {
             if (num_value_required <= fields.size()) {
                 size_t start_index = num_value_required - value_size;
                 for (size_t i = start_index; i < num_value_required; ++i) {
-                    tmp_cv[i_cv][i] = std::atof(fields[i].c_str());
-                    cvm::log(fields[i] + std::string(" "));
+                    tmp_cv[i_cv][i - start_index] = std::atof(fields[i].c_str());
+                    cvm::log(cvm::to_str(tmp_cv[i_cv][i - start_index]));
                 }
-                cvm::log(std::string("\n"));
             } else {
                 cvm::error("Error: incorrect format of path file.\n");
             }
@@ -558,6 +565,9 @@ colvar::CVBasedPath::CVBasedPath(std::string const &conf): cvc(conf) {
             ++total_reference_frames;
         }
     }
+    if (total_reference_frames <= 1) {
+	cvm::error("Error: there is only 1 or 0 reference frame, which doesn't constitute a path.\n");
+    }
     x.type(colvarvalue::type_scalar);
     use_explicit_gradients = true;
     for (size_t i_cv = 0; i_cv < cv.size(); ++i_cv) {
@@ -570,7 +580,7 @@ colvar::CVBasedPath::CVBasedPath(std::string const &conf): cvc(conf) {
     }
 }
 
-void colvar::CVBasedPath::computeReferenceDistance(std::vector<cvm::real>& result) {
+void colvar::CVBasedPath::computeDistanceToReferenceFrames(std::vector<cvm::real>& result) {
     for (size_t i_cv = 0; i_cv < cv.size(); ++i_cv) {
         cv[i_cv]->calc_value();
     }
@@ -593,6 +603,20 @@ void colvar::CVBasedPath::computeReferenceDistance(std::vector<cvm::real>& resul
     }
 }
 
+void colvar::CVBasedPath::computeDistanceBetweenReferenceFrames(std::vector<cvm::real>& result) const {
+    if (ref_cv.size() < 2) return;
+    for (size_t i_frame = 1; i_frame < ref_cv.size(); ++i_frame) {
+        cvm::real dist_ij = 0.0;
+        for (size_t i_cv = 0; i_cv < cv.size(); ++i_cv) {
+            colvarvalue ref_cv_value(ref_cv[i_frame][i_cv]);
+            colvarvalue prev_ref_cv_value(ref_cv[i_frame-1][i_cv]);
+            dist_ij += cv[i_cv]->dist2(ref_cv_value, prev_ref_cv_value);
+        }
+        dist_ij = cvm::sqrt(dist_ij);
+        result[i_frame-1] = dist_ij;
+    }
+}
+
 cvm::real colvar::CVBasedPath::getPolynomialFactorOfCVGradient(size_t i_cv) const {
     cvm::real factor_polynomial = 1.0;
     if (cv[i_cv]->value().type() == colvarvalue::type_scalar) {
@@ -607,6 +631,7 @@ colvar::CVBasedPath::~CVBasedPath() {
     for (auto it = cv.begin(); it != cv.end(); ++it) {
         delete (*it);
     }
+    atom_groups.clear();
 }
 
 colvar::gspathCV::gspathCV(std::string const &conf): CVBasedPath(conf) {
@@ -625,6 +650,9 @@ colvar::gspathCV::gspathCV(std::string const &conf): CVBasedPath(conf) {
     } else {
         cvm::log(std::string("Geometric path s(σ) will use the neighbouring frame to compute s_(m+1)\n"));
     }
+    if (total_reference_frames < 2) {
+        cvm::error("Error: you have specified " + cvm::to_str(total_reference_frames) + " reference frames, but gspathCV requires at least 2 frames.\n");
+    }
     GeometricPathCV::GeometricPathBase<colvarvalue, cvm::real, GeometricPathCV::path_sz::S>::initialize(cv.size(), ref_cv[0], total_reference_frames, use_second_closest_frame, use_third_closest_frame);
     x.type(colvarvalue::type_scalar);
     use_explicit_gradients = true;
@@ -641,8 +669,8 @@ colvar::gspathCV::gspathCV(std::string const &conf): CVBasedPath(conf) {
 
 colvar::gspathCV::~gspathCV() {}
 
-void colvar::gspathCV::updateReferenceDistances() {
-    computeReferenceDistance(frame_distances);
+void colvar::gspathCV::updateDistanceToReferenceFrames() {
+    computeDistanceToReferenceFrames(frame_distances);
 }
 
 void colvar::gspathCV::prepareVectors() {
@@ -766,6 +794,9 @@ colvar::gzpathCV::gzpathCV(std::string const &conf): CVBasedPath(conf) {
     if (b_use_z_square == true) {
         cvm::log(std::string("Geometric path z(σ) will use the square of distance from current frame to path compute z\n"));
     }
+    if (total_reference_frames < 2) {
+        cvm::error("Error: you have specified " + cvm::to_str(total_reference_frames) + " reference frames, but gzpathCV requires at least 2 frames.\n");
+    }
     GeometricPathCV::GeometricPathBase<colvarvalue, cvm::real, GeometricPathCV::path_sz::Z>::initialize(cv.size(), ref_cv[0], total_reference_frames, use_second_closest_frame, use_third_closest_frame, b_use_z_square);
     x.type(colvarvalue::type_scalar);
     use_explicit_gradients = true;
@@ -783,8 +814,8 @@ colvar::gzpathCV::gzpathCV(std::string const &conf): CVBasedPath(conf) {
 colvar::gzpathCV::~gzpathCV() {
 }
 
-void colvar::gzpathCV::updateReferenceDistances() {
-    computeReferenceDistance(frame_distances);
+void colvar::gzpathCV::updateDistanceToReferenceFrames() {
+    computeDistanceToReferenceFrames(frame_distances);
 }
 
 void colvar::gzpathCV::prepareVectors() {
diff --git a/lib/colvars/colvarcomp_protein.cpp b/lib/colvars/colvarcomp_protein.cpp
index aa61cdf1dc..3add471c04 100644
--- a/lib/colvars/colvarcomp_protein.cpp
+++ b/lib/colvars/colvarcomp_protein.cpp
@@ -2,7 +2,7 @@
 
 // This file is part of the Collective Variables module (Colvars).
 // The original version of Colvars and its updates are located at:
-// https://github.com/colvars/colvars
+// https://github.com/Colvars/colvars
 // Please update all Colvars source files before making any changes.
 // If you wish to distribute your changes, please submit them to the
 // Colvars repository at GitHub.
@@ -30,6 +30,8 @@ colvar::alpha_angles::alpha_angles(std::string const &conf)
   enable(f_cvc_explicit_gradient);
   x.type(colvarvalue::type_scalar);
 
+  colvarproxy *proxy = cvm::main()->proxy;
+
   std::string segment_id;
   get_keyval(conf, "psfSegID", segment_id, std::string("MAIN"));
 
@@ -91,7 +93,7 @@ colvar::alpha_angles::alpha_angles(std::string const &conf)
   {
     cvm::real r0;
     size_t en, ed;
-    get_keyval(conf, "hBondCutoff",   r0, (3.3 * cvm::unit_angstrom()));
+    get_keyval(conf, "hBondCutoff",   r0, (3.3 * proxy->angstrom_value));
     get_keyval(conf, "hBondExpNumer", en, 6);
     get_keyval(conf, "hBondExpDenom", ed, 8);
 
@@ -208,7 +210,7 @@ void colvar::alpha_angles::collect_gradients(std::vector<int> const &atom_ids, s
         1.0/(1.0 - (t*t*t*t)) *
         ( (-2.0 * t) + (-1.0*f)*(-4.0 * (t*t*t)) );
 
-      // Coeficient of this CVC's gradient in the colvar gradient, times coefficient of this
+      // Coefficient of this CVC's gradient in the colvar gradient, times coefficient of this
       // angle's gradient in the CVC's gradient
       cvm::real const coeff = cvc_coeff * theta_norm * dfdt * (1.0/theta_tol);
 
@@ -228,7 +230,7 @@ void colvar::alpha_angles::collect_gradients(std::vector<int> const &atom_ids, s
     cvm::real const hb_norm = hb_coeff / cvm::real(hb.size());
 
     for (size_t i = 0; i < hb.size(); i++) {
-      // Coeficient of this CVC's gradient in the colvar gradient, times coefficient of this
+      // Coefficient of this CVC's gradient in the colvar gradient, times coefficient of this
       // hbond's gradient in the CVC's gradient
       cvm::real const coeff = cvc_coeff * 0.5 * hb_norm;
 
@@ -471,7 +473,7 @@ void colvar::dihedPC::collect_gradients(std::vector<int> const &atom_ids, std::v
     cvm::real const t = (PI / 180.) * theta[i]->value().real_value;
     cvm::real const dcosdt = - (PI / 180.) * cvm::sin(t);
     cvm::real const dsindt =   (PI / 180.) * cvm::cos(t);
-    // Coeficient of this dihedPC's gradient in the colvar gradient, times coefficient of this
+    // Coefficient of this dihedPC's gradient in the colvar gradient, times coefficient of this
     // dihedral's gradient in the dihedPC's gradient
     cvm::real const coeff = cvc_coeff * (coeffs[2*i] * dcosdt + coeffs[2*i+1] * dsindt);
 
diff --git a/lib/colvars/colvarcomp_rotations.cpp b/lib/colvars/colvarcomp_rotations.cpp
index 3c8d0b4af6..c7a414b006 100644
--- a/lib/colvars/colvarcomp_rotations.cpp
+++ b/lib/colvars/colvarcomp_rotations.cpp
@@ -2,7 +2,7 @@
 
 // This file is part of the Collective Variables module (Colvars).
 // The original version of Colvars and its updates are located at:
-// https://github.com/colvars/colvars
+// https://github.com/Colvars/colvars
 // Please update all Colvars source files before making any changes.
 // If you wish to distribute your changes, please submit them to the
 // Colvars repository at GitHub.
@@ -164,8 +164,8 @@ colvar::orientation_angle::orientation_angle(std::string const &conf)
   : orientation()
 {
   function_type = "orientation_angle";
+  init_as_angle();
   enable(f_cvc_explicit_gradient);
-  x.type(colvarvalue::type_scalar);
   init(conf);
 }
 
@@ -176,15 +176,6 @@ int colvar::orientation_angle::init(std::string const &conf)
 }
 
 
-colvar::orientation_angle::orientation_angle()
-  : orientation()
-{
-  function_type = "orientation_angle";
-  enable(f_cvc_explicit_gradient);
-  x.type(colvarvalue::type_scalar);
-}
-
-
 void colvar::orientation_angle::calc_value()
 {
   atoms_cog = atoms->center_of_geometry();
@@ -231,6 +222,7 @@ colvar::orientation_proj::orientation_proj(std::string const &conf)
   function_type = "orientation_proj";
   enable(f_cvc_explicit_gradient);
   x.type(colvarvalue::type_scalar);
+  init_scalar_boundaries(0.0, 1.0);
   init(conf);
 }
 
@@ -241,15 +233,6 @@ int colvar::orientation_proj::init(std::string const &conf)
 }
 
 
-colvar::orientation_proj::orientation_proj()
-  : orientation()
-{
-  function_type = "orientation_proj";
-  enable(f_cvc_explicit_gradient);
-  x.type(colvarvalue::type_scalar);
-}
-
-
 void colvar::orientation_proj::calc_value()
 {
   atoms_cog = atoms->center_of_geometry();
@@ -287,6 +270,7 @@ colvar::tilt::tilt(std::string const &conf)
   function_type = "tilt";
   enable(f_cvc_explicit_gradient);
   x.type(colvarvalue::type_scalar);
+  init_scalar_boundaries(-1.0, 1.0);
   init(conf);
 }
 
@@ -307,15 +291,6 @@ int colvar::tilt::init(std::string const &conf)
 }
 
 
-colvar::tilt::tilt()
-  : orientation()
-{
-  function_type = "tilt";
-  enable(f_cvc_explicit_gradient);
-  x.type(colvarvalue::type_scalar);
-}
-
-
 void colvar::tilt::calc_value()
 {
   atoms_cog = atoms->center_of_geometry();
@@ -358,7 +333,7 @@ colvar::spin_angle::spin_angle(std::string const &conf)
 {
   function_type = "spin_angle";
   period = 360.0;
-  b_periodic = true;
+  enable(f_cvc_periodic);
   enable(f_cvc_explicit_gradient);
   x.type(colvarvalue::type_scalar);
   init(conf);
@@ -386,7 +361,7 @@ colvar::spin_angle::spin_angle()
 {
   function_type = "spin_angle";
   period = 360.0;
-  b_periodic = true;
+  enable(f_cvc_periodic);
   enable(f_cvc_explicit_gradient);
   x.type(colvarvalue::type_scalar);
 }
diff --git a/lib/colvars/colvardeps.cpp b/lib/colvars/colvardeps.cpp
index 276f2b39e7..f83458b51c 100644
--- a/lib/colvars/colvardeps.cpp
+++ b/lib/colvars/colvardeps.cpp
@@ -2,7 +2,7 @@
 
 // This file is part of the Collective Variables module (Colvars).
 // The original version of Colvars and its updates are located at:
-// https://github.com/colvars/colvars
+// https://github.com/Colvars/colvars
 // Please update all Colvars source files before making any changes.
 // If you wish to distribute your changes, please submit them to the
 // Colvars repository at GitHub.
@@ -428,11 +428,11 @@ void colvardeps::require_feature_alt(int f, int g, int h, int i, int j) {
 
 void colvardeps::print_state() {
   size_t i;
-  cvm::log("Enabled features of \"" + description + "\" (with reference count)");
+  cvm::log("Features of \"" + description + "\" ON/OFF (refcount)");
   for (i = 0; i < feature_states.size(); i++) {
-    if (is_enabled(i))
-      cvm::log("- " + features()[i]->description + " ("
-        + cvm::to_str(feature_states[i].ref_count) + ")");
+    std::string onoff = is_enabled(i) ? "ON" : "OFF";
+    cvm::log("- " + features()[i]->description + "   " + onoff + " ("
+      + cvm::to_str(feature_states[i].ref_count) + ")");
   }
   cvm::increase_depth();
   for (i=0; i<children.size(); i++) {
diff --git a/lib/colvars/colvardeps.h b/lib/colvars/colvardeps.h
index 198a24f330..63669536fe 100644
--- a/lib/colvars/colvardeps.h
+++ b/lib/colvars/colvardeps.h
@@ -2,7 +2,7 @@
 
 // This file is part of the Collective Variables module (Colvars).
 // The original version of Colvars and its updates are located at:
-// https://github.com/colvars/colvars
+// https://github.com/Colvars/colvars
 // Please update all Colvars source files before making any changes.
 // If you wish to distribute your changes, please submit them to the
 // Colvars repository at GitHub.
@@ -21,7 +21,7 @@
 /// system. They may be enabled or disabled depending on dependencies.
 /// 2. User features may be enabled based on user input (they may trigger a failure upon dependency resolution, though)
 /// 3. Static features are static properties of the object, determined
-///   programatically at initialization time.
+///   programmatically at initialization time.
 ///
 /// The following diagram summarizes the dependency tree at the bias, colvar, and colvarcomp levels.
 /// Isolated and atom group features are not shown to save space.
@@ -219,7 +219,7 @@ public:
   /// Implements possible actions to be carried out
   /// when a given feature is enabled
   /// Base function does nothing, can be overloaded
-  virtual void do_feature_side_effects(int id) {}
+  virtual void do_feature_side_effects(int /* id */) {}
 
   // NOTE that all feature enums should start with f_*_active
   enum features_biases {
@@ -229,6 +229,8 @@ public:
     f_cvb_awake,
     /// \brief will apply forces
     f_cvb_apply_force,
+    /// \brief force this bias to act on actual value for extended-Lagrangian coordinates
+    f_cvb_bypass_ext_lagrangian,
     /// \brief requires total forces
     f_cvb_get_total_force,
     /// \brief whether this bias should record the accumulated work
@@ -296,6 +298,10 @@ public:
     f_cv_lower_boundary,
     /// \brief An upper boundary is defined
     f_cv_upper_boundary,
+    /// \brief The lower boundary is not defined from user's choice
+    f_cv_hard_lower_boundary,
+    /// \brief The upper boundary is not defined from user's choice
+    f_cv_hard_upper_boundary,
     /// \brief Provide a discretization of the values of the colvar to
     /// be used by the biases or in analysis (needs lower and upper
     /// boundary)
@@ -310,6 +316,8 @@ public:
     f_cv_custom_function,
     /// \brief Colvar is periodic
     f_cv_periodic,
+    /// \brief The colvar has only one component
+    f_cv_single_cvc,
     /// \brief is scalar
     f_cv_scalar,
     f_cv_linear,
@@ -321,20 +329,40 @@ public:
   };
 
   enum features_cvc {
+    /// Computation of this CVC is enabled
     f_cvc_active,
+    /// This CVC computes a scalar value
     f_cvc_scalar,
+    /// Values of this CVC lie in a periodic interval
+    f_cvc_periodic,
+    /// This CVC provides a default value for the colvar's width
+    f_cvc_width,
+    /// This CVC provides a default value for the colvar's lower boundary
+    f_cvc_lower_boundary,
+    /// This CVC provides a default value for the colvar's upper boundary
+    f_cvc_upper_boundary,
+    /// CVC calculates atom gradients
     f_cvc_gradient,
-    /// \brief CVC calculates and stores explicit atom gradients
+    /// CVC calculates and stores explicit atom gradients
     f_cvc_explicit_gradient,
+    /// CVC calculates and stores inverse atom gradients (used for total force)
     f_cvc_inv_gradient,
-    /// \brief If enabled, calc_gradients() will call debug_gradients() for every group needed
-    f_cvc_debug_gradient,
+    /// CVC calculates the Jacobian term of the total-force expression
     f_cvc_Jacobian,
-    f_cvc_pbc_minimum_image,
+    /// The total force for this CVC will be computed from one group only
     f_cvc_one_site_total_force,
+    /// calc_gradients() will call debug_gradients() for every group needed
+    f_cvc_debug_gradient,
+    /// With PBCs, minimum-image convention will be used for distances
+    /// (does not affect the periodicity of CVC values, e.g. angles)
+    f_cvc_pbc_minimum_image,
+    /// This CVC is a function of centers of mass
     f_cvc_com_based,
+    /// This CVC can be computed in parallel
     f_cvc_scalable,
+    /// Centers-of-mass used in this CVC can be computed in parallel
     f_cvc_scalable_com,
+    /// Number of CVC features
     f_cvc_ntot
   };
 
diff --git a/lib/colvars/colvargrid.cpp b/lib/colvars/colvargrid.cpp
index bc5ac3c57c..7c2fe3b33c 100644
--- a/lib/colvars/colvargrid.cpp
+++ b/lib/colvars/colvargrid.cpp
@@ -2,7 +2,7 @@
 
 // This file is part of the Collective Variables module (Colvars).
 // The original version of Colvars and its updates are located at:
-// https://github.com/colvars/colvars
+// https://github.com/Colvars/colvars
 // Please update all Colvars source files before making any changes.
 // If you wish to distribute your changes, please submit them to the
 // Colvars repository at GitHub.
diff --git a/lib/colvars/colvargrid.h b/lib/colvars/colvargrid.h
index 7792b7d0df..6008f2068b 100644
--- a/lib/colvars/colvargrid.h
+++ b/lib/colvars/colvargrid.h
@@ -2,7 +2,7 @@
 
 // This file is part of the Collective Variables module (Colvars).
 // The original version of Colvars and its updates are located at:
-// https://github.com/colvars/colvars
+// https://github.com/Colvars/colvars
 // Please update all Colvars source files before making any changes.
 // If you wish to distribute your changes, please submit them to the
 // Colvars repository at GitHub.
@@ -209,7 +209,8 @@ public:
   /// \brief "Almost copy-constructor": only copies configuration
   /// parameters from another grid, but doesn't reallocate stuff;
   /// setup() must be called after that;
-  colvar_grid(colvar_grid<T> const &g) : nd(g.nd),
+  colvar_grid(colvar_grid<T> const &g) : colvarparse(),
+					 nd(g.nd),
                                          nx(g.nx),
                                          mult(g.mult),
                                          data(),
@@ -284,8 +285,8 @@ public:
       }
 
       widths.push_back(cv[i]->width);
-      hard_lower_boundaries.push_back(cv[i]->hard_lower_boundary);
-      hard_upper_boundaries.push_back(cv[i]->hard_upper_boundary);
+      hard_lower_boundaries.push_back(cv[i]->is_enabled(colvardeps::f_cv_hard_lower_boundary));
+      hard_upper_boundaries.push_back(cv[i]->is_enabled(colvardeps::f_cv_hard_upper_boundary));
       periodic.push_back(cv[i]->periodic_boundaries());
 
       // By default, get reported colvar value (for extended Lagrangian colvars)
@@ -415,6 +416,20 @@ public:
     return (int) cvm::floor( (value.real_value - lower_boundaries[i].real_value) / widths[i] );
   }
 
+  /// \brief Report the fraction of bin beyond current_bin_scalar()
+  inline cvm::real current_bin_scalar_fraction(int const i) const
+  {
+    return value_to_bin_scalar_fraction(use_actual_value[i] ? cv[i]->actual_value() : cv[i]->value(), i);
+  }
+
+  /// \brief Use the lower boundary and the width to report the fraction of bin
+  /// beyond value_to_bin_scalar() that the provided value is in
+  inline cvm::real value_to_bin_scalar_fraction(colvarvalue const &value, const int i) const
+  {
+    cvm::real x = (value.real_value - lower_boundaries[i].real_value) / widths[i];
+    return x - cvm::floor(x);
+  }
+
   /// \brief Use the lower boundary and the width to report which bin
   /// the provided value is in and assign first or last bin if out of boundaries
   inline int value_to_bin_scalar_bound(colvarvalue const &value, const int i) const
@@ -917,7 +932,7 @@ public:
     std::string key, conf;
     if ((is >> key) && (key == std::string("grid_parameters"))) {
       is.seekg(start_pos, std::ios::beg);
-      is >> colvarparse::read_block("grid_parameters", conf);
+      is >> colvarparse::read_block("grid_parameters", &conf);
       parse_params(conf, colvarparse::parse_silent);
     } else {
       cvm::log("Grid parameters are missing in the restart file, using those from the configuration.\n");
diff --git a/lib/colvars/colvarmodule.cpp b/lib/colvars/colvarmodule.cpp
index baffc25c28..1d5f75bbca 100644
--- a/lib/colvars/colvarmodule.cpp
+++ b/lib/colvars/colvarmodule.cpp
@@ -2,7 +2,7 @@
 
 // This file is part of the Collective Variables module (Colvars).
 // The original version of Colvars and its updates are located at:
-// https://github.com/colvars/colvars
+// https://github.com/Colvars/colvars
 // Please update all Colvars source files before making any changes.
 // If you wish to distribute your changes, please submit them to the
 // Colvars repository at GitHub.
@@ -32,6 +32,8 @@ colvarmodule::colvarmodule(colvarproxy *proxy_in)
 
   cv_traj_os = NULL;
 
+  xyz_reader_use_count = 0;
+
   if (proxy == NULL) {
     proxy = proxy_in; // Pointer to the proxy object
     parse = new colvarparse(); // Parsing object for global options
@@ -48,13 +50,21 @@ colvarmodule::colvarmodule(colvarproxy *proxy_in)
   cvm::log("Initializing the collective variables module, version "+
            cvm::to_str(COLVARS_VERSION)+".\n");
   cvm::log("Please cite Fiorin et al, Mol Phys 2013:\n "
-           "http://dx.doi.org/10.1080/00268976.2013.813594\n"
+           "https://doi.org/10.1080/00268976.2013.813594\n"
            "in any publication based on this calculation.\n");
 
   if (proxy->smp_enabled() == COLVARS_OK) {
-    cvm::log("SMP parallelism is available.\n");
+    cvm::log("SMP parallelism is enabled; if needed, use \"smp off\" to override this.\n");
   }
 
+#if (__cplusplus >= 201103L)
+  cvm::log("This version was built with the C++11 standard or higher.");
+#else
+  cvm::log("This version was built without the C++11 standard: some features are disabled.\n"
+    "Please see the following link for details:\n"
+    "https://colvars.github.io/README-c++11.html");
+#endif
+
   // set initial default values
 
   // "it_restart" will be set by the input state file, if any;
@@ -260,6 +270,16 @@ int colvarmodule::parse_global_params(std::string const &conf)
   // TODO document and then echo this keyword
   parse->get_keyval(conf, "logLevel", log_level_, log_level_,
                     colvarparse::parse_silent);
+  {
+    std::string units;
+    if (parse->get_keyval(conf, "units", units)) {
+      units = colvarparse::to_lower_cppstr(units);
+      int error_code = proxy->set_unit_system(units, (colvars.size() != 0));
+      if (error_code != COLVARS_OK) {
+        return error_code;
+      }
+    }
+  }
 
   {
     std::string index_file_name;
@@ -1160,8 +1180,7 @@ int colvarmodule::reset()
   }
   colvars.clear();
 
-  index_groups.clear();
-  index_group_names.clear();
+  reset_index_groups();
 
   proxy->reset();
 
@@ -1265,124 +1284,151 @@ std::istream & colvarmodule::read_restart(std::istream &is)
   {
     // read global restart information
     std::string restart_conf;
-    if (is >> colvarparse::read_block("configuration", restart_conf)) {
+    if (is >> colvarparse::read_block("configuration", &restart_conf)) {
+
       parse->get_keyval(restart_conf, "step",
                         it_restart, static_cast<step_number>(0),
                         colvarparse::parse_restart);
-        it = it_restart;
+      it = it_restart;
+
       std::string restart_version;
+      int restart_version_int = 0;
       parse->get_keyval(restart_conf, "version",
                         restart_version, std::string(""),
                         colvarparse::parse_restart);
-      if (restart_version.size() && (restart_version != std::string(COLVARS_VERSION))) {
-        cvm::log("This state file was generated with version "+restart_version+"\n");
+      if (restart_version.size()) {
+        if (restart_version != std::string(COLVARS_VERSION)) {
+          cvm::log("This state file was generated with version "+
+                   restart_version+"\n");
+        }
+        restart_version_int =
+          proxy->get_version_from_string(restart_version.c_str());
       }
-      if ((restart_version.size() == 0) || (restart_version.compare(std::string(COLVARS_VERSION)) < 0)) {
+
+      if (restart_version_int < 20160810) {
         // check for total force change
         if (proxy->total_forces_enabled()) {
           warn_total_forces = true;
         }
       }
+
+      std::string units_restart;
+      if (parse->get_keyval(restart_conf, "units",
+                            units_restart, std::string(""),
+                            colvarparse::parse_restart)) {
+        units_restart = colvarparse::to_lower_cppstr(units_restart);
+        if ((proxy->units.size() > 0) && (units_restart != proxy->units)) {
+          cvm::error("Error: the state file has units \""+units_restart+
+                     "\", but the current unit system is \""+proxy->units+
+                     "\".\n", INPUT_ERROR);
+        }
+      }
+
     }
     is.clear();
     parse->clear_keyword_registry();
   }
 
-  // colvars restart
-  cvm::increase_depth();
-  for (std::vector<colvar *>::iterator cvi = colvars.begin();
-       cvi != colvars.end();
-       cvi++) {
-    if ( !((*cvi)->read_restart(is)) ) {
-      cvm::error("Error: in reading restart configuration for collective variable \""+
-                 (*cvi)->name+"\".\n",
-                 INPUT_ERROR);
+  print_total_forces_errning(warn_total_forces);
+
+  read_objects_state(is);
+
+  return is;
+}
+
+
+
+std::istream & colvarmodule::read_objects_state(std::istream &is)
+{
+  size_t pos = 0;
+  std::string word;
+
+  while (is.good()) {
+    pos = is.tellg();
+    word.clear();
+    is >> word;
+
+    if (word.size()) {
+
+      is.seekg(pos, std::ios::beg);
+
+      if (word == "colvar") {
+
+        cvm::increase_depth();
+        for (std::vector<colvar *>::iterator cvi = colvars.begin();
+             cvi != colvars.end();
+             cvi++) {
+          if ( !((*cvi)->read_state(is)) ) {
+            // Here an error signals that the variable is a match, but the
+            // state is corrupt; otherwise, the variable rewinds is silently
+            cvm::error("Error: in reading restart configuration for "
+                       "collective variable \""+(*cvi)->name+"\".\n",
+                       INPUT_ERROR);
+          }
+          if (static_cast<size_t>(is.tellg()) > pos) break; // found it
+        }
+        cvm::decrease_depth();
+
+      } else {
+
+        cvm::increase_depth();
+        for (std::vector<colvarbias *>::iterator bi = biases.begin();
+             bi != biases.end();
+             bi++) {
+          if (((*bi)->state_keyword != word) && (*bi)->bias_type != word) {
+            // Skip biases with different type; state_keyword is used to
+            // support different versions of the state file format
+            continue;
+          }
+          if (!((*bi)->read_state(is))) {
+            // Same as above, an error means a match but the state is incorrect
+            cvm::error("Error: in reading restart configuration for bias \""+
+                       (*bi)->name+"\".\n",
+                       INPUT_ERROR);
+          }
+          if (static_cast<size_t>(is.tellg()) > pos) break; // found it
+        }
+        cvm::decrease_depth();
+      }
     }
-  }
 
-  // biases restart
-  for (std::vector<colvarbias *>::iterator bi = biases.begin();
-       bi != biases.end();
-       bi++) {
-    if (!((*bi)->read_state(is))) {
-      cvm::error("Error: in reading restart configuration for bias \""+
-                 (*bi)->name+"\".\n",
-                 INPUT_ERROR);
+    if (static_cast<size_t>(is.tellg()) == pos) {
+      // This block has not been read by any object: discard it and move on
+      // to the next one
+      is >> colvarparse::read_block(word, NULL);
     }
-  }
-  cvm::decrease_depth();
 
-  if (warn_total_forces) {
-    cvm::log(cvm::line_marker);
-    cvm::log("WARNING:\n");
-    std::string const warning("### CHANGES IN THE DEFINITION OF SYSTEM FORCES (NOW TOTAL FORCES)\n\
-\n\
-Starting from the version 2016-08-10 of the Colvars module, \n\
-the role of system forces has been replaced by total forces.\n\
-\n\
-These include *all* forces acting on a collective variable, whether they\n\
-come from the force field potential or from external terms\n\
-(e.g. restraints), including forces applied by Colvars itself.\n\
-\n\
-In NAMD, forces applied by Colvars, IMD, SMD, TMD, symmetry\n\
-restraints and tclForces are now all counted in the total force.\n\
-\n\
-In LAMMPS, forces applied by Colvars itself are now counted in the total\n\
-force (all forces from other fixes were being counted already).\n\
-\n\
-\n\
-### WHEN IS THIS CHANGE RELEVANT\n\
-\n\
-This change affects results *only* when (1) outputSystemForce is\n\
-requested or (2) the ABF bias is used.  All other usage cases are\n\
-*unaffected* (colvar restraints, metadynamics, etc).\n\
-\n\
-When system forces are reported (flag: outputSystemForce), their values\n\
-in the output may change, but the physical trajectory is never affected.\n\
-The physical results of ABF calculations may be affected in some cases.\n\
-\n\
-\n\
-### CHANGES TO ABF CALCULATIONS\n\
-\n\
-Compared to previous Colvars versions, the ABF method will now attempt\n\
-to cancel external forces (for example, boundary walls) and it may be\n\
-not possible to resume through a state file a simulation that was\n\
-performed with a previous version.\n\
-\n\
-There are three possible scenarios:\n\
-\n\
-1. No external forces are applied to the atoms used by ABF: results are\n\
-unchanged.\n\
-\n\
-2. Some of the atoms used by ABF experience external forces, but these\n\
-forces are not applied directly to the variables used by ABF\n\
-(e.g. another colvar that uses the same atoms, tclForces, etc): in this\n\
-case, we recommend beginning a new simulation.\n\
-\n\
-3. External forces are applied to one or more of the colvars used by\n\
-ABF, but no other forces are applied to their atoms: you may use the\n\
-subtractAppliedForce keyword inside the corresponding colvars to\n\
-continue the previous simulation.\n\n");
-    cvm::log(warning);
-    cvm::log(cvm::line_marker);
-
-    // update this ahead of time in this special case
-    output_prefix() = proxy->input_prefix();
-    cvm::log("All output files will now be saved with the prefix \""+output_prefix()+".tmp.*\".\n");
-    cvm::log(cvm::line_marker);
-    cvm::log("Please review the important warning above. After that, you may rename:\n\
-\""+output_prefix()+".tmp.colvars.state\"\n\
-to:\n\
-\""+ proxy->input_prefix()+".colvars.state\"\n");
-    output_prefix() = output_prefix()+".tmp";
-    write_restart_file(output_prefix()+".colvars.state");
-    cvm::error("Exiting with error until issue is addressed.\n", FATAL_ERROR);
+    if (!is) break;
   }
 
   return is;
 }
 
 
+int colvarmodule::print_total_forces_errning(bool warn_total_forces)
+{
+  if (warn_total_forces) {
+    cvm::log(cvm::line_marker);
+    cvm::log("WARNING: The definition of system forces has changed.  Please see:\n");
+    cvm::log("  https://colvars.github.io/README-totalforce.html\n");
+    // update this ahead of time in this special case
+    output_prefix() = proxy->input_prefix();
+    cvm::log("All output files will now be saved with the prefix \""+output_prefix()+".tmp.*\".\n");
+    cvm::log("Please review the important warning above. After that, you may rename:\n\
+\""+output_prefix()+".tmp.colvars.state\"\n\
+to:\n\
+\""+proxy->input_prefix()+".colvars.state\"\n\
+and load it to continue this simulation.\n");
+    output_prefix() = output_prefix()+".tmp";
+    write_restart_file(output_prefix()+".colvars.state");
+    return cvm::error("Exiting with error until issue is addressed.\n",
+                      INPUT_ERROR);
+  }
+
+  return COLVARS_OK;
+}
+
+
 int colvarmodule::backup_file(char const *filename)
 {
   return proxy->backup_file(filename);
@@ -1496,8 +1542,11 @@ std::ostream & colvarmodule::write_restart(std::ostream &os)
      << "  step " << std::setw(it_width)
      << it << "\n"
      << "  dt " << dt() << "\n"
-     << "  version " << std::string(COLVARS_VERSION) << "\n"
-     << "}\n\n";
+     << "  version " << std::string(COLVARS_VERSION) << "\n";
+  if (proxy->units.size() > 0) {
+    os << "  units " << proxy->units << "\n";
+  }
+  os << "}\n\n";
 
   int error_code = COLVARS_OK;
 
@@ -1505,7 +1554,7 @@ std::ostream & colvarmodule::write_restart(std::ostream &os)
   for (std::vector<colvar *>::iterator cvi = colvars.begin();
        cvi != colvars.end();
        cvi++) {
-    (*cvi)->write_restart(os);
+    (*cvi)->write_state(os);
   }
 
   for (std::vector<colvarbias *>::iterator bi = biases.begin();
@@ -1718,32 +1767,61 @@ int cvm::read_index_file(char const *filename)
   while (is.good()) {
     char open, close;
     std::string group_name;
+    int index_of_group = -1;
     if ( (is >> open) && (open == '[') &&
          (is >> group_name) &&
          (is >> close) && (close == ']') ) {
-      for (std::list<std::string>::iterator names_i = index_group_names.begin();
-           names_i != index_group_names.end();
-           names_i++) {
-        if (*names_i == group_name) {
-          cvm::error("Error: the group name \""+group_name+
-                     "\" appears in multiple index files.\n",
-                     FILE_ERROR);
+      size_t i = 0;
+      for ( ; i < index_group_names.size(); i++) {
+        if (index_group_names[i] == group_name) {
+          // Found a group with the same name
+          index_of_group = i;
         }
       }
-      index_group_names.push_back(group_name);
-      index_groups.push_back(std::vector<int>());
+      if (index_of_group < 0) {
+        index_group_names.push_back(group_name);
+        index_groups.push_back(NULL);
+        index_of_group = index_groups.size()-1;
+      }
     } else {
-      cvm::error("Error: in parsing index file \""+
-                 std::string(filename)+"\".\n",
-                 INPUT_ERROR);
+      return cvm::error("Error: in parsing index file \""+
+                        std::string(filename)+"\".\n",
+                        INPUT_ERROR);
     }
 
+    std::vector<int> *old_index_group = index_groups[index_of_group];
+    std::vector<int> *new_index_group = new std::vector<int>();
+
     int atom_number = 1;
     size_t pos = is.tellg();
     while ( (is >> atom_number) && (atom_number > 0) ) {
-      (index_groups.back()).push_back(atom_number);
+      new_index_group->push_back(atom_number);
       pos = is.tellg();
     }
+
+    if (old_index_group != NULL) {
+      bool equal = false;
+      if (new_index_group->size() == old_index_group->size()) {
+        if (std::equal(new_index_group->begin(), new_index_group->end(),
+                       old_index_group->begin())) {
+          equal = true;
+        }
+      }
+      if (! equal) {
+        new_index_group->clear();
+        delete new_index_group;
+        new_index_group = NULL;
+        return cvm::error("Error: the index group \""+group_name+
+                          "\" was redefined.\n", INPUT_ERROR);
+      } else {
+        old_index_group->clear();
+        delete old_index_group;
+        old_index_group = NULL;
+      }
+    }
+
+    index_groups[index_of_group] = new_index_group;
+
     is.clear();
     is.seekg(pos, std::ios::beg);
     std::string delim;
@@ -1756,14 +1834,27 @@ int cvm::read_index_file(char const *filename)
     }
   }
 
-  cvm::log("The following index groups were read from the index file \""+
-           std::string(filename)+"\":\n");
-  std::list<std::string>::iterator names_i = index_group_names.begin();
-  std::list<std::vector<int> >::iterator lists_i = index_groups.begin();
-  for ( ; names_i != index_group_names.end() ; names_i++, lists_i++) {
-    cvm::log("  "+(*names_i)+" ("+cvm::to_str(lists_i->size())+" atoms).\n");
+  cvm::log("The following index groups are currently defined:\n");
+  size_t i = 0;
+  for ( ; i < index_group_names.size(); i++) {
+    cvm::log("  "+(index_group_names[i])+" ("+
+             cvm::to_str((index_groups[i])->size())+" atoms)\n");
   }
-  return (cvm::get_error() ? COLVARS_ERROR : COLVARS_OK);
+
+  return COLVARS_OK;
+}
+
+
+int colvarmodule::reset_index_groups()
+{
+  size_t i = 0;
+  for ( ; i < index_groups.size(); i++) {
+    delete index_groups[i];
+    index_groups[i] = NULL;
+  }
+  index_group_names.clear();
+  index_groups.clear();
+  return COLVARS_OK;
 }
 
 
@@ -1799,7 +1890,7 @@ int cvm::load_coords(char const *file_name,
                         "for XYZ coordinate files.\n", INPUT_ERROR);
     }
     // For XYZ files, use internal parser
-    error_code |= cvm::load_coords_xyz(file_name, &sorted_pos, atoms);
+    error_code |= cvm::main()->load_coords_xyz(file_name, &sorted_pos, atoms);
   } else {
     // Otherwise, call proxy function for PDB
     error_code |= proxy->load_coords(file_name,
@@ -1824,11 +1915,18 @@ int cvm::load_coords_xyz(char const *filename,
   unsigned int natoms;
   char symbol[256];
   std::string line;
+  cvm::real x = 0.0, y = 0.0, z = 0.0;
 
   if ( ! (xyz_is >> natoms) ) {
     cvm::error("Error: cannot parse XYZ file "
                + std::string(filename) + ".\n", INPUT_ERROR);
   }
+
+  ++xyz_reader_use_count;
+  if (xyz_reader_use_count < 2) {
+    cvm::log("Warning: beginning from 2019-11-26 the XYZ file reader assumes Angstrom units.");
+  }
+
   // skip comment line
   cvm::getline(xyz_is, line);
   cvm::getline(xyz_is, line);
@@ -1845,12 +1943,19 @@ int cvm::load_coords_xyz(char const *filename,
         next++;
       }
       xyz_is >> symbol;
-      xyz_is >> (*pos_i)[0] >> (*pos_i)[1] >> (*pos_i)[2];
+      xyz_is >> x >> y >> z;
+      // XYZ files are assumed to be in Angstrom (as eg. VMD will)
+      (*pos_i)[0] = proxy->angstrom_to_internal(x);
+      (*pos_i)[1] = proxy->angstrom_to_internal(y);
+      (*pos_i)[2] = proxy->angstrom_to_internal(z);
     }
   } else {          // Use all positions
     for ( ; pos_i != pos->end() ; pos_i++) {
       xyz_is >> symbol;
-      xyz_is >> (*pos_i)[0] >> (*pos_i)[1] >> (*pos_i)[2];
+      xyz_is >> x >> y >> z;
+      (*pos_i)[0] = proxy->angstrom_to_internal(x);
+      (*pos_i)[1] = proxy->angstrom_to_internal(y);
+      (*pos_i)[2] = proxy->angstrom_to_internal(z);
     }
   }
   return (cvm::get_error() ? COLVARS_ERROR : COLVARS_OK);
@@ -1860,11 +1965,6 @@ int cvm::load_coords_xyz(char const *filename,
 
 // Wrappers to proxy functions: these may go in the future
 
-cvm::real cvm::unit_angstrom()
-{
-  return proxy->unit_angstrom();
-}
-
 
 cvm::real cvm::boltzmann()
 {
@@ -1903,39 +2003,6 @@ cvm::real cvm::rand_gaussian(void)
 }
 
 
-
-bool cvm::replica_enabled()
-{
-  return proxy->replica_enabled();
-}
-
-int cvm::replica_index()
-{
-  return proxy->replica_index();
-}
-
-int cvm::replica_num()
-{
-  return proxy->replica_num();
-}
-
-void cvm::replica_comm_barrier()
-{
-  return proxy->replica_comm_barrier();
-}
-
-int cvm::replica_comm_recv(char* msg_data, int buf_len, int src_rep)
-{
-  return proxy->replica_comm_recv(msg_data,buf_len,src_rep);
-}
-
-int cvm::replica_comm_send(char* msg_data, int msg_len, int dest_rep)
-{
-  return proxy->replica_comm_send(msg_data,msg_len,dest_rep);
-}
-
-
-
 template<typename T> std::string _to_str(T const &x,
                                          size_t width, size_t prec)
 {
diff --git a/lib/colvars/colvarmodule.h b/lib/colvars/colvarmodule.h
index 30620a2527..9346e8e1d6 100644
--- a/lib/colvars/colvarmodule.h
+++ b/lib/colvars/colvarmodule.h
@@ -2,7 +2,7 @@
 
 // This file is part of the Collective Variables module (Colvars).
 // The original version of Colvars and its updates are located at:
-// https://github.com/colvars/colvars
+// https://github.com/Colvars/colvars
 // Please update all Colvars source files before making any changes.
 // If you wish to distribute your changes, please submit them to the
 // Colvars repository at GitHub.
@@ -429,8 +429,15 @@ public:
   /// (Re)initialize the output trajectory and state file (does not write it yet)
   int setup_output();
 
-  /// Read the input restart file
+  /// Read a restart file
   std::istream & read_restart(std::istream &is);
+
+  /// Read the states of individual objects; allows for changes
+  std::istream & read_objects_state(std::istream &is);
+
+  /// If needed (old restart file), print the warning that cannot be ignored
+  int print_total_forces_errning(bool warn_total_forces);
+
   /// Write the output restart file
   std::ostream & write_restart(std::ostream &os);
 
@@ -608,10 +615,6 @@ public:
 
   // proxy functions
 
-  /// \brief Value of the unit for atomic coordinates with respect to
-  /// angstroms (used by some variables for hard-coded default values)
-  static real unit_angstrom();
-
   /// \brief Boltmann constant
   static real boltzmann();
 
@@ -678,29 +681,23 @@ public:
     return 5;
   }
 
-
-  // Replica exchange commands.
-  static bool replica_enabled();
-  static int replica_index();
-  static int replica_num();
-  static void replica_comm_barrier();
-  static int replica_comm_recv(char* msg_data, int buf_len, int src_rep);
-  static int replica_comm_send(char* msg_data, int msg_len, int dest_rep);
-
   /// \brief Get the distance between two atomic positions with pbcs handled
   /// correctly
   static rvector position_distance(atom_pos const &pos1,
                                    atom_pos const &pos2);
 
-  /// \brief Names of groups from a Gromacs .ndx file to be read at startup
-  std::list<std::string> index_group_names;
+  /// \brief Names of groups from one or more Gromacs .ndx files
+  std::vector<std::string> index_group_names;
 
-  /// \brief Groups from a Gromacs .ndx file read at startup
-  std::list<std::vector<int> > index_groups;
+  /// \brief Groups from one or more Gromacs .ndx files
+  std::vector<std::vector<int> *> index_groups;
 
   /// \brief Read a Gromacs .ndx file
   int read_index_file(char const *filename);
 
+  /// Clear the index groups loaded so far
+  int reset_index_groups();
+
   /// \brief Select atom IDs from a file (usually PDB) \param filename name of
   /// the file \param atoms array into which atoms read from "filename" will be
   /// appended \param pdb_field (optional) if the file is a PDB and this
@@ -726,11 +723,10 @@ public:
                          std::string const &pdb_field,
                          double pdb_field_value = 0.0);
 
-  /// \brief Load the coordinates for a group of atoms from an
-  /// XYZ file
-  static int load_coords_xyz(char const *filename,
-                             std::vector<rvector> *pos,
-                             atom_group *atoms);
+  /// Load coordinates into an atom group from an XYZ file (assumes Angstroms)
+  int load_coords_xyz(char const *filename,
+                      std::vector<rvector> *pos,
+                      atom_group *atoms);
 
   /// Frequency for collective variables trajectory output
   static size_t cv_traj_freq;
@@ -771,6 +767,9 @@ private:
   /// Thread-specific depth
   std::vector<size_t> depth_v;
 
+  /// Track how many times the XYZ reader has been used
+  int xyz_reader_use_count;
+
 public:
 
   /// Get the current object depth in the hierarchy
diff --git a/lib/colvars/colvarparams.cpp b/lib/colvars/colvarparams.cpp
new file mode 100644
index 0000000000..e957a1841d
--- /dev/null
+++ b/lib/colvars/colvarparams.cpp
@@ -0,0 +1,111 @@
+// -*- c++ -*-
+
+// This file is part of the Collective Variables module (Colvars).
+// The original version of Colvars and its updates are located at:
+// https://github.com/Colvars/colvars
+// Please update all Colvars source files before making any changes.
+// If you wish to distribute your changes, please submit them to the
+// Colvars repository at GitHub.
+
+#include <sstream>
+#include <iostream>
+#include <algorithm>
+
+#include "colvarmodule.h"
+#include "colvarvalue.h"
+#include "colvarparams.h"
+
+
+
+colvarparams::colvarparams()
+{}
+
+
+colvarparams::~colvarparams()
+{}
+
+
+void colvarparams::register_param(std::string const &param_name,
+                                  void *param_ptr)
+{
+  param_map[param_name] = param_ptr;
+}
+
+
+void colvarparams::register_param_grad(std::string const &param_name,
+                                       colvarvalue *param_grad_ptr)
+{
+  param_grad_map[param_name] = param_grad_ptr;
+}
+
+
+int colvarparams::param_exists(std::string const &param_name)
+{
+  if (param_map.count(param_name) > 0) {
+    return COLVARS_OK;
+  }
+  return INPUT_ERROR;
+}
+
+
+std::vector<std::string> colvarparams::get_param_names()
+{
+  std::vector<std::string> result;
+  for (std::map<std::string, void const *>::const_iterator elem =
+         param_map.begin(); elem != param_map.end(); elem++) {
+    result.push_back(elem->first);
+  }
+  return result;
+}
+
+
+std::vector<std::string> colvarparams::get_param_grad_names()
+{
+  std::vector<std::string> result;
+  for (std::map<std::string, colvarvalue const *>::const_iterator elem =
+         param_grad_map.begin(); elem != param_grad_map.end(); elem++) {
+    result.push_back(elem->first);
+  }
+  return result;
+}
+
+
+void const *colvarparams::get_param_ptr(std::string const &param_name)
+{
+  if (param_map.count(param_name) > 0) {
+    return param_map[param_name];
+  }
+  cvm::error("Error: parameter \""+param_name+"\" not found.\n", INPUT_ERROR);
+  return NULL;
+}
+
+
+void const *colvarparams::get_param_grad_ptr(std::string const &param_name)
+{
+  if (param_grad_map.count(param_name) > 0) {
+    return param_grad_map[param_name];
+  }
+  cvm::error("Error: gradient of parameter \""+param_name+"\" not found.\n",
+             INPUT_ERROR);
+  return NULL;
+}
+
+
+cvm::real colvarparams::get_param(std::string const &param_name)
+{
+  cvm::real const *ptr =
+    reinterpret_cast<cvm::real const *>(get_param_ptr(param_name));
+  return ptr != NULL ? *ptr : 0.0;
+}
+
+
+int colvarparams::set_param(std::string const &param_name,
+                            void const *new_value)
+{
+  if (param_map.count(param_name) > 0) {
+    return cvm::error("Error: parameter \""+param_name+"\" cannot be "
+                      "modified.\n", COLVARS_NOT_IMPLEMENTED);
+  }
+  return cvm::error("Error: parameter \""+param_name+"\" not found.\n",
+                    INPUT_ERROR);
+}
diff --git a/lib/colvars/colvarparams.h b/lib/colvars/colvarparams.h
new file mode 100644
index 0000000000..1d00300a8b
--- /dev/null
+++ b/lib/colvars/colvarparams.h
@@ -0,0 +1,66 @@
+// -*- c++ -*-
+
+// This file is part of the Collective Variables module (Colvars).
+// The original version of Colvars and its updates are located at:
+// https://github.com/Colvars/colvars
+// Please update all Colvars source files before making any changes.
+// If you wish to distribute your changes, please submit them to the
+// Colvars repository at GitHub.
+
+#ifndef COLVARPARAMS_H
+#define COLVARPARAMS_H
+
+#include <map>
+
+/// \file colvarparams.h Functions to handle scalar parameters used in objects
+
+
+class colvarparams {
+
+ public:
+
+  /// Whether the parameter param_name exists
+  int param_exists(std::string const &param_name);
+
+  /// Get a copy of the names of registered parameters
+  virtual std::vector<std::string> get_param_names();
+
+  /// Get a copy of the names of registered parameter gradients
+  virtual std::vector<std::string> get_param_grad_names();
+
+  /// Pointer to the parameter param_name
+  virtual void const *get_param_ptr(std::string const &param_name);
+
+  /// Pointer to the gradient of parameter param_name
+  virtual void const *get_param_grad_ptr(std::string const &param_name);
+
+  /// Value of the parameter param_name (must be a scalar)
+  virtual cvm::real get_param(std::string const &param_name);
+
+  /// Set the named parameter to the given value
+  virtual int set_param(std::string const &param_name, void const *new_value);
+
+ protected:
+
+  /// Default constructor
+  colvarparams();
+
+  /// Default destructor
+  virtual ~colvarparams();
+
+  /// Pointers to relevant parameters that may be accessed by other objects
+  std::map<std::string, void const *> param_map;
+
+  /// Derivatives of the object with respect to internal parameters
+  std::map<std::string, colvarvalue const *> param_grad_map;
+
+  /// Register the given parameter
+  void register_param(std::string const &param_name, void *param_ptr);
+
+  /// Register the gradient of the given parameter
+  void register_param_grad(std::string const &param_name,
+                           colvarvalue *param_grad_ptr);
+
+};
+
+#endif
diff --git a/lib/colvars/colvarparse.cpp b/lib/colvars/colvarparse.cpp
index 8041153494..a09d6be9ef 100644
--- a/lib/colvars/colvarparse.cpp
+++ b/lib/colvars/colvarparse.cpp
@@ -2,7 +2,7 @@
 
 // This file is part of the Collective Variables module (Colvars).
 // The original version of Colvars and its updates are located at:
-// https://github.com/colvars/colvars
+// https://github.com/Colvars/colvars
 // Please update all Colvars source files before making any changes.
 // If you wish to distribute your changes, please submit them to the
 // Colvars repository at GitHub.
@@ -32,6 +32,41 @@ namespace {
 }
 
 
+colvarparse::colvarparse()
+{
+  init();
+}
+
+
+void colvarparse::init()
+{
+  config_string.clear();
+  clear_keyword_registry();
+}
+
+
+colvarparse::colvarparse(const std::string& conf)
+{
+  init(conf);
+}
+
+
+void colvarparse::init(std::string const &conf)
+{
+  if (! config_string.size()) {
+    init();
+    config_string = conf;
+  }
+}
+
+
+colvarparse::~colvarparse()
+{
+  init();
+}
+
+
+
 bool colvarparse::get_key_string_value(std::string const &conf,
                                        char const *key, std::string &data)
 {
@@ -156,7 +191,7 @@ template<>
 int colvarparse::_get_keyval_scalar_value_(std::string const &key_str,
                                            std::string const &data,
                                            bool &value,
-                                           bool const &def_value)
+                                           bool const & /* def_value */)
 {
   if ( (data == std::string("on")) ||
        (data == std::string("yes")) ||
@@ -176,8 +211,8 @@ int colvarparse::_get_keyval_scalar_value_(std::string const &key_str,
 
 template<typename TYPE>
 int colvarparse::_get_keyval_scalar_novalue_(std::string const &key_str,
-                                             TYPE &value,
-                                             Parse_Mode const &parse_mode)
+                                             TYPE & /* value */,
+                                             Parse_Mode const & /* parse_mode */)
 {
   return cvm::error("Error: improper or missing value "
                     "for \""+key_str+"\".\n", INPUT_ERROR);
@@ -805,6 +840,17 @@ bool colvarparse::key_lookup(std::string const &conf,
 }
 
 
+colvarparse::read_block::read_block(std::string const &key_in,
+                                    std::string *data_in)
+  : key(key_in), data(data_in)
+{
+}
+
+
+colvarparse::read_block::~read_block()
+{}
+
+
 std::istream & operator>> (std::istream &is, colvarparse::read_block const &rb)
 {
   size_t start_pos = is.tellg();
@@ -821,7 +867,9 @@ std::istream & operator>> (std::istream &is, colvarparse::read_block const &rb)
   }
 
   if (next != "{") {
-    (*rb.data) = next;
+    if (rb.data) {
+      *(rb.data) = next;
+    }
     return is;
   }
 
@@ -835,9 +883,15 @@ std::istream & operator>> (std::istream &is, colvarparse::read_block const &rb)
       br_old = br;
       br++;
     }
-    if (brace_count) (*rb.data).append(line + "\n");
+    if (brace_count) {
+      if (rb.data) {
+        (rb.data)->append(line + "\n");
+      }
+    }
     else {
-      (*rb.data).append(line, 0, br_old);
+      if (rb.data) {
+        (rb.data)->append(line, 0, br_old);
+      }
       break;
     }
   }
diff --git a/lib/colvars/colvarparse.h b/lib/colvars/colvarparse.h
index f4ead26601..b7d42fdffa 100644
--- a/lib/colvars/colvarparse.h
+++ b/lib/colvars/colvarparse.h
@@ -2,7 +2,7 @@
 
 // This file is part of the Collective Variables module (Colvars).
 // The original version of Colvars and its updates are located at:
-// https://github.com/colvars/colvars
+// https://github.com/Colvars/colvars
 // Please update all Colvars source files before making any changes.
 // If you wish to distribute your changes, please submit them to the
 // Colvars repository at GitHub.
@@ -12,10 +12,10 @@
 
 #include <cstring>
 #include <string>
-#include <map>
 
 #include "colvarmodule.h"
 #include "colvarvalue.h"
+#include "colvarparams.h"
 
 
 /// \file colvarparse.h Parsing functions for collective variables
@@ -23,37 +23,24 @@
 
 /// \brief Base class containing parsing functions; all objects which
 /// need to parse input inherit from this
-class colvarparse {
+class colvarparse : public colvarparams {
 
 public:
 
   /// Default constructor
-  inline colvarparse()
-  {
-    init();
-  }
+  colvarparse();
 
   /// Constructor that stores the object's config string
-  inline colvarparse(const std::string& conf)
-  {
-    init(conf);
-  }
+  colvarparse(const std::string& conf);
 
   /// Set the object ready to parse a new configuration string
-  inline void init()
-  {
-    config_string.clear();
-    clear_keyword_registry();
-  }
+  void init();
 
   /// Set a new config string for this object
-  inline void init(std::string const &conf)
-  {
-    if (! config_string.size()) {
-      init();
-      config_string = conf;
-    }
-  }
+  void init(std::string const &conf);
+
+  /// Default destructor
+  virtual ~colvarparse();
 
   /// Get the configuration string (includes comments)
   inline std::string const & get_config() const
@@ -285,14 +272,18 @@ public:
   /// skipping other blocks
   class read_block {
 
-    std::string const   key;
+    /// The keyword that identifies the block
+    std::string const key;
+
+    /// Where to keep the data (may be NULL)
     std::string * const data;
 
   public:
-    inline read_block(std::string const &key_in, std::string &data_in)
-      : key(key_in), data(&data_in)
-    {}
-    inline ~read_block() {}
+
+    read_block(std::string const &key_in, std::string *data_in = NULL);
+
+    ~read_block();
+
     friend std::istream & operator >> (std::istream &is, read_block const &rb);
   };
 
diff --git a/lib/colvars/colvarproxy.cpp b/lib/colvars/colvarproxy.cpp
index f077984556..63ae07a57c 100644
--- a/lib/colvars/colvarproxy.cpp
+++ b/lib/colvars/colvarproxy.cpp
@@ -2,7 +2,7 @@
 
 // This file is part of the Collective Variables module (Colvars).
 // The original version of Colvars and its updates are located at:
-// https://github.com/colvars/colvars
+// https://github.com/Colvars/colvars
 // Please update all Colvars source files before making any changes.
 // If you wish to distribute your changes, please submit them to the
 // Colvars repository at GitHub.
@@ -33,6 +33,7 @@
 
 
 colvarproxy_system::colvarproxy_system()
+  : angstrom_value(0.)
 {
   reset_pbc_lattice();
 }
@@ -41,7 +42,7 @@ colvarproxy_system::colvarproxy_system()
 colvarproxy_system::~colvarproxy_system() {}
 
 
-void colvarproxy_system::add_energy(cvm::real energy) {}
+void colvarproxy_system::add_energy(cvm::real /* energy */) {}
 
 
 void colvarproxy_system::request_total_force(bool yesno)
@@ -173,9 +174,9 @@ int colvarproxy_atoms::add_atom_slot(int atom_id)
 }
 
 
-int colvarproxy_atoms::init_atom(cvm::residue_id const &residue,
-                                 std::string const     &atom_name,
-                                 std::string const     &segment_id)
+int colvarproxy_atoms::init_atom(cvm::residue_id const & /* residue */,
+                                 std::string const     & /* atom_name */,
+                                 std::string const     & /* segment_id */)
 {
   cvm::error("Error: initializing an atom by name and residue number is currently not supported.\n",
              COLVARS_NOT_IMPLEMENTED);
@@ -204,9 +205,9 @@ void colvarproxy_atoms::clear_atom(int index)
 }
 
 
-int colvarproxy_atoms::load_atoms(char const *filename,
-                                  cvm::atom_group &atoms,
-                                  std::string const &pdb_field,
+int colvarproxy_atoms::load_atoms(char const * /* filename */,
+                                  cvm::atom_group & /* atoms */,
+                                  std::string const & /* pdb_field */,
                                   double)
 {
   return cvm::error("Error: loading atom identifiers from a file "
@@ -215,10 +216,10 @@ int colvarproxy_atoms::load_atoms(char const *filename,
 }
 
 
-int colvarproxy_atoms::load_coords(char const *filename,
-                                   std::vector<cvm::atom_pos> &pos,
-                                   std::vector<int> const &sorted_ids,
-                                   std::string const &pdb_field,
+int colvarproxy_atoms::load_coords(char const * /* filename */,
+                                   std::vector<cvm::atom_pos> & /* pos */,
+                                   std::vector<int> const & /* sorted_ids */,
+                                   std::string const & /* pdb_field */,
                                    double)
 {
   return cvm::error("Error: loading atomic coordinates from a file "
@@ -269,7 +270,7 @@ int colvarproxy_atom_groups::scalable_group_coms()
 }
 
 
-int colvarproxy_atom_groups::init_atom_group(std::vector<int> const &atoms_ids)
+int colvarproxy_atom_groups::init_atom_group(std::vector<int> const & /* atoms_ids */)
 {
   cvm::error("Error: initializing a group outside of the Colvars module "
              "is currently not supported.\n",
@@ -456,51 +457,6 @@ int colvarproxy_smp::smp_unlock()
 
 
 
-colvarproxy_replicas::colvarproxy_replicas() {}
-
-
-colvarproxy_replicas::~colvarproxy_replicas() {}
-
-
-bool colvarproxy_replicas::replica_enabled()
-{
-  return false;
-}
-
-
-int colvarproxy_replicas::replica_index()
-{
-  return 0;
-}
-
-
-int colvarproxy_replicas::replica_num()
-{
-  return 1;
-}
-
-
-void colvarproxy_replicas::replica_comm_barrier() {}
-
-
-int colvarproxy_replicas::replica_comm_recv(char* msg_data,
-                                            int buf_len,
-                                            int src_rep)
-{
-  return COLVARS_NOT_IMPLEMENTED;
-}
-
-
-int colvarproxy_replicas::replica_comm_send(char* msg_data,
-                                            int msg_len,
-                                            int dest_rep)
-{
-  return COLVARS_NOT_IMPLEMENTED;
-}
-
-
-
-
 colvarproxy_script::colvarproxy_script()
 {
   script = NULL;
@@ -518,7 +474,7 @@ char const *colvarproxy_script::script_obj_to_str(unsigned char *obj)
 }
 
 
-std::vector<std::string> colvarproxy_script::script_obj_to_str_vector(unsigned char *obj)
+std::vector<std::string> colvarproxy_script::script_obj_to_str_vector(unsigned char * /* obj */)
 {
   cvm::error("Error: trying to print a script object without a scripting "
              "language interface.\n", BUG_ERROR);
@@ -532,19 +488,17 @@ int colvarproxy_script::run_force_callback()
 }
 
 
-int colvarproxy_script::run_colvar_callback(
-      std::string const &name,
-      std::vector<const colvarvalue *> const &cvcs,
-      colvarvalue &value)
+int colvarproxy_script::run_colvar_callback(std::string const & /* name */,
+					    std::vector<const colvarvalue *> const & /* cvcs */,
+					    colvarvalue & /* value */)
 {
   return COLVARS_NOT_IMPLEMENTED;
 }
 
 
-int colvarproxy_script::run_colvar_gradient_callback(
-      std::string const &name,
-      std::vector<const colvarvalue *> const &cvcs,
-      std::vector<cvm::matrix2d<cvm::real> > &gradient)
+int colvarproxy_script::run_colvar_gradient_callback(std::string const & /* name */,
+						     std::vector<const colvarvalue *> const & /* cvcs */,
+						     std::vector<cvm::matrix2d<cvm::real> > & /* gradient */)
 {
   return COLVARS_NOT_IMPLEMENTED;
 }
@@ -599,9 +553,9 @@ int colvarproxy_tcl::tcl_run_force_callback()
 
 
 int colvarproxy_tcl::tcl_run_colvar_callback(
-                         std::string const &name,
-                         std::vector<const colvarvalue *> const &cvc_values,
-                         colvarvalue &value)
+					     std::string const & name,
+					     std::vector<const colvarvalue *> const & cvc_values,
+					     colvarvalue & value)
 {
 #if defined(COLVARS_TCL)
 
@@ -636,9 +590,9 @@ int colvarproxy_tcl::tcl_run_colvar_callback(
 
 
 int colvarproxy_tcl::tcl_run_colvar_gradient_callback(
-                         std::string const &name,
-                         std::vector<const colvarvalue *> const &cvc_values,
-                         std::vector<cvm::matrix2d<cvm::real> > &gradient)
+						      std::string const & name,
+						      std::vector<const colvarvalue *> const & cvc_values,
+						      std::vector<cvm::matrix2d<cvm::real> > & gradient)
 {
 #if defined(COLVARS_TCL)
 
@@ -776,7 +730,7 @@ int colvarproxy_io::close_output_stream(std::string const &output_name)
 }
 
 
-int colvarproxy_io::backup_file(char const *filename)
+int colvarproxy_io::backup_file(char const * /* filename */)
 {
   // TODO implement this using rename_file()
   return COLVARS_NOT_IMPLEMENTED;
@@ -785,13 +739,33 @@ int colvarproxy_io::backup_file(char const *filename)
 
 int colvarproxy_io::remove_file(char const *filename)
 {
+  int error_code = COLVARS_OK;
+#if defined(WIN32) && !defined(__CYGWIN__)
+  // Because the file may be open by other processes, rename it to filename.old
+  std::string const renamed_file(std::string(filename)+".old");
+  // It may still be there from an interrupted run, so remove it to be safe
+  std::remove(renamed_file.c_str());
+  int rename_exit_code = 0;
+  while ((rename_exit_code = std::rename(filename,
+                                         renamed_file.c_str())) != 0) {
+    if (errno == EINTR) continue;
+    error_code |= FILE_ERROR;
+    break;
+  }
+  // Ask to remove filename.old, but ignore any errors raised
+  std::remove(renamed_file.c_str());
+#else
   if (std::remove(filename)) {
     if (errno != ENOENT) {
-      return cvm::error("Error: in removing file \""+std::string(filename)+
-                        "\".\n.",
-                        FILE_ERROR);
+      error_code |= FILE_ERROR;
     }
   }
+#endif
+  if (error_code != COLVARS_OK) {
+    return cvm::error("Error: in removing file \""+std::string(filename)+
+                      "\".\n.",
+                      error_code);
+  }
   return COLVARS_OK;
 }
 
diff --git a/lib/colvars/colvarproxy.h b/lib/colvars/colvarproxy.h
index 21944106f1..ba91afb40e 100644
--- a/lib/colvars/colvarproxy.h
+++ b/lib/colvars/colvarproxy.h
@@ -2,7 +2,7 @@
 
 // This file is part of the Collective Variables module (Colvars).
 // The original version of Colvars and its updates are located at:
-// https://github.com/colvars/colvars
+// https://github.com/Colvars/colvars
 // Please update all Colvars source files before making any changes.
 // If you wish to distribute your changes, please submit them to the
 // Colvars repository at GitHub.
@@ -48,11 +48,45 @@ public:
   /// Destructor
   virtual ~colvarproxy_system();
 
-  /// \brief Value of the unit for atomic coordinates with respect to
-  /// angstroms (used by some variables for hard-coded default values)
-  virtual cvm::real unit_angstrom() = 0;
+  /// \brief Name of the unit system used internally by Colvars (by default, that of the back-end).
+  /// Supported depending on the back-end: real (A, kcal/mol), metal (A, eV), electron (Bohr, Hartree), gromacs (nm, kJ/mol)
+  /// Note: calls to back-end PBC functions assume back-end length unit
+  /// We use different unit from back-end in VMD bc using PBC functions from colvarproxy base class
+  /// Colvars internal units are user specified, because the module exchanges info in unknown
+  /// composite dimensions with user input, while it only exchanges quantities of known
+  /// dimension with the back-end (length and forces)
+  std::string units;
 
-  /// \brief Boltzmann constant
+  /// \brief Request to set the units used internally by Colvars
+  virtual int set_unit_system(std::string const &units, bool check_only) = 0;
+
+  /// \brief Value of 1 Angstrom in the internal (front-end) Colvars unit for atomic coordinates
+  /// * defaults to 0. in the base class; derived proxy classes must set it
+  /// * in VMD proxy, can only be changed when no variables are defined
+  /// as user-defined values in composite units must be compatible with that system
+  cvm::real angstrom_value;
+
+  /// \brief Value of 1 Angstrom in the backend's unit for atomic coordinates
+  virtual cvm::real backend_angstrom_value() = 0;
+
+  /// \brief Value of 1 kcal/mol in the internal Colvars unit for energy
+  cvm::real kcal_mol_value;
+
+  /// \brief Convert a length from Angstrom to internal
+  inline cvm::real angstrom_to_internal(cvm::real l) const
+  {
+    return l * angstrom_value;
+  }
+
+  // /// \brief Convert a length from back-end unit to internal
+  // inline cvm::real back_end_to_internal_unit(cvm::real l) {
+  //   if (angstrom_value == 0.) {
+  //     return l / backend_angstrom_value();
+  //   }
+  //   return l * angstrom_value / backend_angstrom_value();
+  // }
+
+  /// \brief Boltzmann constant in internal Colvars units
   virtual cvm::real boltzmann() = 0;
 
   /// \brief Target temperature of the simulation (K units)
@@ -212,7 +246,7 @@ public:
   }
 
   /// Read the current velocity of the given atom
-  inline cvm::rvector get_atom_velocity(int index)
+  inline cvm::rvector get_atom_velocity(int /* index */)
   {
     cvm::error("Error: reading the current velocity of an atom "
                "is not yet implemented.\n",
@@ -300,7 +334,7 @@ class colvarproxy_atom_groups {
 
 public:
 
-  /// Contructor
+  /// Constructor
   colvarproxy_atom_groups();
 
   /// Destructor
@@ -355,7 +389,7 @@ public:
   }
 
   /// Read the current velocity of the given atom group
-  inline cvm::rvector get_atom_group_velocity(int index)
+  inline cvm::rvector get_atom_group_velocity(int /* index */)
   {
     cvm::error("Error: reading the current velocity of an atom group is not yet implemented.\n",
                COLVARS_NOT_IMPLEMENTED);
@@ -446,15 +480,15 @@ public:
   virtual ~colvarproxy_replicas();
 
   /// \brief Indicate if multi-replica support is available and active
-  virtual bool replica_enabled();
+  virtual int replica_enabled();
 
   /// \brief Index of this replica
   virtual int replica_index();
 
-  /// \brief Total number of replica
-  virtual int replica_num();
+  /// \brief Total number of replicas
+  virtual int num_replicas();
 
-  /// \brief Synchronize replica
+  /// \brief Synchronize replica with others
   virtual void replica_comm_barrier();
 
   /// \brief Receive data from other replica
@@ -591,10 +625,10 @@ public:
     return backup_file(filename.c_str());
   }
 
-  /// Remove the given file
+  /// Remove the given file (on Windows only, rename to filename.old)
   int remove_file(char const *filename);
 
-  /// Remove the given file
+  /// Remove the given file (on Windows only, rename to filename.old)
   inline int remove_file(std::string const &filename)
   {
     return remove_file(filename.c_str());
diff --git a/lib/colvars/colvarproxy_replicas.cpp b/lib/colvars/colvarproxy_replicas.cpp
new file mode 100644
index 0000000000..1f336d3e44
--- /dev/null
+++ b/lib/colvars/colvarproxy_replicas.cpp
@@ -0,0 +1,56 @@
+// -*- c++ -*-
+
+// This file is part of the Collective Variables module (Colvars).
+// The original version of Colvars and its updates are located at:
+// https://github.com/Colvars/colvars
+// Please update all Colvars source files before making any changes.
+// If you wish to distribute your changes, please submit them to the
+// Colvars repository at GitHub.
+
+#include "colvarmodule.h"
+#include "colvarproxy.h"
+
+
+colvarproxy_replicas::colvarproxy_replicas() {}
+
+
+colvarproxy_replicas::~colvarproxy_replicas() {}
+
+
+int colvarproxy_replicas::replica_enabled()
+{
+  return COLVARS_NOT_IMPLEMENTED;
+}
+
+
+int colvarproxy_replicas::replica_index()
+{
+  return 0;
+}
+
+
+int colvarproxy_replicas::num_replicas()
+{
+  return 1;
+}
+
+
+void colvarproxy_replicas::replica_comm_barrier() {}
+
+
+int colvarproxy_replicas::replica_comm_recv(char* /* msg_data */,
+                                            int /* buf_len */,
+                                            int /* src_rep */)
+{
+  return COLVARS_NOT_IMPLEMENTED;
+}
+
+
+int colvarproxy_replicas::replica_comm_send(char* /* msg_data */,
+                                            int /* msg_len */,
+                                            int /* dest_rep */)
+{
+  return COLVARS_NOT_IMPLEMENTED;
+}
+
+
diff --git a/lib/colvars/colvars_version.h b/lib/colvars/colvars_version.h
index 77b3bd7e38..cc8744d62b 100644
--- a/lib/colvars/colvars_version.h
+++ b/lib/colvars/colvars_version.h
@@ -1,10 +1,3 @@
 #ifndef COLVARS_VERSION
-#define COLVARS_VERSION "2019-08-05"
-// This file is part of the Collective Variables module (Colvars).
-// The original version of Colvars and its updates are located at:
-// https://github.com/colvars/colvars
-// Please update all Colvars source files before making any changes.
-// If you wish to distribute your changes, please submit them to the
-// Colvars repository at GitHub.
-
+#define COLVARS_VERSION "2020-02-25"
 #endif
diff --git a/lib/colvars/colvarscript.cpp b/lib/colvars/colvarscript.cpp
index 1ad3283337..10b276c89e 100644
--- a/lib/colvars/colvarscript.cpp
+++ b/lib/colvars/colvarscript.cpp
@@ -2,7 +2,7 @@
 
 // This file is part of the Collective Variables module (Colvars).
 // The original version of Colvars and its updates are located at:
-// https://github.com/colvars/colvars
+// https://github.com/Colvars/colvars
 // Please update all Colvars source files before making any changes.
 // If you wish to distribute your changes, please submit them to the
 // Colvars repository at GitHub.
diff --git a/lib/colvars/colvarscript.h b/lib/colvars/colvarscript.h
index 341cb1f72c..69d52cbb51 100644
--- a/lib/colvars/colvarscript.h
+++ b/lib/colvars/colvarscript.h
@@ -2,7 +2,7 @@
 
 // This file is part of the Collective Variables module (Colvars).
 // The original version of Colvars and its updates are located at:
-// https://github.com/colvars/colvars
+// https://github.com/Colvars/colvars
 // Please update all Colvars source files before making any changes.
 // If you wish to distribute your changes, please submit them to the
 // Colvars repository at GitHub.
@@ -86,6 +86,7 @@ public:
     cv_printframe,
     cv_printframelabels,
     cv_frame,
+    cv_units,
     cv_colvar,
     cv_colvar_value,
     cv_colvar_update,
@@ -269,9 +270,7 @@ extern "C" {
            "Clear the index groups loaded so far, allowing to replace them",
            0, 0,
            { },
-           cvm::main()->index_group_names.clear();
-           cvm::main()->index_groups.clear();
-           return COLVARS_OK;
+           return cvm::main()->reset_index_groups();
            )
 
   CVSCRIPT(cv_addenergy,
@@ -292,6 +291,18 @@ extern "C" {
            return COLVARS_OK;
            )
 
+  CVSCRIPT(cv_units,
+           "Get the current Colvars unit system",
+           0, 1,
+           { },
+           if (objc < 3) {
+            script->set_str_result(cvm::proxy->units);
+            return COLVARS_OK;
+           } else {
+            return cvm::proxy->set_unit_system(script->obj_to_str(objv[2]) , false);
+           }
+           )
+
 #ifndef COLVARSCRIPT_INIT_FN
 #ifdef __cplusplus
 } // extern "C"
diff --git a/lib/colvars/colvartypes.cpp b/lib/colvars/colvartypes.cpp
index b81a943eab..da00183323 100644
--- a/lib/colvars/colvartypes.cpp
+++ b/lib/colvars/colvartypes.cpp
@@ -2,7 +2,7 @@
 
 // This file is part of the Collective Variables module (Colvars).
 // The original version of Colvars and its updates are located at:
-// https://github.com/colvars/colvars
+// https://github.com/Colvars/colvars
 // Please update all Colvars source files before making any changes.
 // If you wish to distribute your changes, please submit them to the
 // Colvars repository at GitHub.
diff --git a/lib/colvars/colvartypes.h b/lib/colvars/colvartypes.h
index 9973d92e98..e5f12154e6 100644
--- a/lib/colvars/colvartypes.h
+++ b/lib/colvars/colvartypes.h
@@ -2,7 +2,7 @@
 
 // This file is part of the Collective Variables module (Colvars).
 // The original version of Colvars and its updates are located at:
-// https://github.com/colvars/colvars
+// https://github.com/Colvars/colvars
 // Please update all Colvars source files before making any changes.
 // If you wish to distribute your changes, please submit them to the
 // Colvars repository at GitHub.
diff --git a/lib/colvars/colvarvalue.cpp b/lib/colvars/colvarvalue.cpp
index accc5defec..7ab617bc44 100644
--- a/lib/colvars/colvarvalue.cpp
+++ b/lib/colvars/colvarvalue.cpp
@@ -2,7 +2,7 @@
 
 // This file is part of the Collective Variables module (Colvars).
 // The original version of Colvars and its updates are located at:
-// https://github.com/colvars/colvars
+// https://github.com/Colvars/colvars
 // Please update all Colvars source files before making any changes.
 // If you wish to distribute your changes, please submit them to the
 // Colvars repository at GitHub.
diff --git a/lib/colvars/colvarvalue.h b/lib/colvars/colvarvalue.h
index 29b535a1a8..ca367dd43f 100644
--- a/lib/colvars/colvarvalue.h
+++ b/lib/colvars/colvarvalue.h
@@ -2,7 +2,7 @@
 
 // This file is part of the Collective Variables module (Colvars).
 // The original version of Colvars and its updates are located at:
-// https://github.com/colvars/colvars
+// https://github.com/Colvars/colvars
 // Please update all Colvars source files before making any changes.
 // If you wish to distribute your changes, please submit them to the
 // Colvars repository at GitHub.
diff --git a/lib/gpu/README b/lib/gpu/README
index 969417a865..dfa8dcf7ff 100644
--- a/lib/gpu/README
+++ b/lib/gpu/README
@@ -52,7 +52,7 @@ user-gpu_SYSLIB = CUDA libraries needed by this package
 user-gpu_SYSPATH = path(s) to where those libraries are
 
 Because you have the CUDA compilers on your system, you should have
-the needed libraries.  If the CUDA developement tools were installed
+the needed libraries.  If the CUDA development tools were installed
 in the standard manner, the settings in the Makefile.lammps.standard
 file should work.
 
diff --git a/lib/gpu/cudpp_mini/cudpp.cpp b/lib/gpu/cudpp_mini/cudpp.cpp
index da5975406d..e2cd4621a4 100644
--- a/lib/gpu/cudpp_mini/cudpp.cpp
+++ b/lib/gpu/cudpp_mini/cudpp.cpp
@@ -27,7 +27,7 @@
  * defined in cudpp.h.  Public interface functions call functions in the
  * \link cudpp_app Application-Level\endlink interface. The public 
  * interface functions include Plan Interface functions and Algorithm
- * Interface functions.  Plan Inteface functions are used for creating
+ * Interface functions.  Plan Interface functions are used for creating
  * CUDPP Plan objects which contain configuration details, intermediate
  * storage space, and in the case of cudppSparseMatrix(), data.  The 
  * Algorithm Interface is the set of functions that do the real work 
diff --git a/lib/gpu/cudpp_mini/cudpp_maximal_launch.cpp b/lib/gpu/cudpp_mini/cudpp_maximal_launch.cpp
index 904d101b3b..1a7542e68c 100644
--- a/lib/gpu/cudpp_mini/cudpp_maximal_launch.cpp
+++ b/lib/gpu/cudpp_mini/cudpp_maximal_launch.cpp
@@ -8,16 +8,7 @@
 // in the root directory of this source distribution.
 // ------------------------------------------------------------- 
 #include "cudpp_maximal_launch.h"
- 
-inline size_t min(size_t x, size_t y)
-{
-    return (x <= y) ? x : y;
-}
-
-inline size_t max(size_t x, size_t y)
-{
-    return (x >= y) ? x : y;
-}
+#include <algorithm>
 
 // computes next highest multiple of f from x
 inline size_t multiple(size_t x, size_t f)
@@ -65,7 +56,7 @@ size_t maxBlocks(cudaFuncAttributes &attribs,
     size_t ctaLimitSMem    = smemPerCTA > 0 ? devprop.sharedMemPerBlock / smemPerCTA : maxBlocksPerSM;
     size_t ctaLimitThreads =                  maxThreadsPerSM           / threadsPerBlock;
 
-    return devprop.multiProcessorCount * min(ctaLimitRegs, min(ctaLimitSMem, min(ctaLimitThreads, maxBlocksPerSM)));
+    return devprop.multiProcessorCount * std::min(ctaLimitRegs, std::min(ctaLimitSMem, std::min(ctaLimitThreads, (size_t)maxBlocksPerSM)));
 }
 
 extern "C"
@@ -80,15 +71,15 @@ size_t maxBlocksFromPointer(void*  kernel,
     {
         err = cudaGetDeviceProperties(&devprop, deviceID);
         if (err != cudaSuccess)
-            return -1;
+            return (size_t)-1;
 
         cudaFuncAttributes attr;
         err = cudaFuncGetAttributes(&attr, (const char*)kernel);
         if (err != cudaSuccess)
-            return -1;
+            return (size_t)-1;
 
         return maxBlocks(attr, devprop, bytesDynamicSharedMem, threadsPerBlock);
     }
 
-    return -1;    
+    return (size_t)-1;
 }
diff --git a/lib/gpu/cudpp_mini/cutil.h b/lib/gpu/cudpp_mini/cutil.h
index 3df93fb886..fbf139cda3 100644
--- a/lib/gpu/cudpp_mini/cutil.h
+++ b/lib/gpu/cudpp_mini/cutil.h
@@ -367,7 +367,7 @@ extern "C" {
     //! @param w     width of the image
     //! @param h     height of the image
     //! @note If a NULL pointer is passed to this function and it is 
-    //!       initialized  withing Cutil then cutFree() has to be used to
+    //!       initialized within Cutil then cutFree() has to be used to
     //!       deallocate the memory
     ////////////////////////////////////////////////////////////////////////////
     DLL_MAPPING
@@ -382,7 +382,7 @@ extern "C" {
     //! @param w     width of the image
     //! @param h     height of the image
     //! @note If a NULL pointer is passed to this function and it is 
-    //!       initialized withing Cutil then cutFree() has to be used to 
+    //!       initialized within Cutil then cutFree() has to be used to
     //!       deallocate the memory
     ////////////////////////////////////////////////////////////////////////////
     DLL_MAPPING
@@ -466,7 +466,7 @@ extern "C" {
     ////////////////////////////////////////////////////////////////////////////
     // Command line arguments: General notes
     // * All command line arguments begin with '--' followed by the token; 
-    //   token and value are seperated by '='; example --samples=50
+    //   token and value are separated by '='; example --samples=50
     // * Arrays have the form --model=[one.obj,two.obj,three.obj] 
     //   (without whitespaces)
     ////////////////////////////////////////////////////////////////////////////
diff --git a/lib/gpu/cudpp_mini/kernel/scan_kernel.cu b/lib/gpu/cudpp_mini/kernel/scan_kernel.cu
index 966634c89b..d8eb477952 100644
--- a/lib/gpu/cudpp_mini/kernel/scan_kernel.cu
+++ b/lib/gpu/cudpp_mini/kernel/scan_kernel.cu
@@ -46,7 +46,7 @@
   * the rows of \a d_blockSums (in elements) in \a blockSumRowPitch, and invoke
   * with a thread block grid with height greater than 1.  
   * 
-  * This function peforms one level of a recursive, multiblock scan.  At the 
+  * This function performs one level of a recursive, multiblock scan.  At the
   * app level, this function is called by cudppScan and cudppMultiScan and used 
   * in combination with vectorAddUniform4() to produce a complete scan.
   *
diff --git a/lib/gpu/geryon/nvd_kernel.h b/lib/gpu/geryon/nvd_kernel.h
index d03a715e1b..9293db2fe4 100644
--- a/lib/gpu/geryon/nvd_kernel.h
+++ b/lib/gpu/geryon/nvd_kernel.h
@@ -244,7 +244,7 @@ class UCL_Kernel {
   template <class dtype>
   inline void add_arg(const dtype* const arg) {
     #if CUDA_VERSION >= 4000
-    _kernel_args[_num_args]=const_cast<dtype * const>(arg);
+    _kernel_args[_num_args]=const_cast<dtype *>(arg);
     #else
     _param_size = (_param_size+__alignof(dtype)-1) & ~(__alignof(dtype)-1);
     CU_SAFE_CALL(cuParamSetv(_kernel,_param_size,(void*)arg,sizeof(dtype)));
diff --git a/lib/gpu/lal_base_atomic.h b/lib/gpu/lal_base_atomic.h
index fef810b17b..c97f42c50e 100644
--- a/lib/gpu/lal_base_atomic.h
+++ b/lib/gpu/lal_base_atomic.h
@@ -45,7 +45,7 @@ class BaseAtomic {
     * \param k_name name for the kernel for force calculation
     *
     * Returns:
-    * -  0 if successfull
+    * -  0 if successful
     * - -1 if fix gpu not found
     * - -3 if there is an out of memory error
     * - -4 if the GPU library was not compiled for GPU
diff --git a/lib/gpu/lal_base_charge.h b/lib/gpu/lal_base_charge.h
index ea81dcdc4e..b6d3e9e3f8 100644
--- a/lib/gpu/lal_base_charge.h
+++ b/lib/gpu/lal_base_charge.h
@@ -46,7 +46,7 @@ class BaseCharge {
     * \param k_name name for the kernel for force calculation
     *
     * Returns:
-    * -  0 if successfull
+    * -  0 if successful
     * - -1 if fix gpu not found
     * - -3 if there is an out of memory error
     * - -4 if the GPU library was not compiled for GPU
diff --git a/lib/gpu/lal_base_dipole.h b/lib/gpu/lal_base_dipole.h
index 31a2a2d5f7..856b69b56b 100644
--- a/lib/gpu/lal_base_dipole.h
+++ b/lib/gpu/lal_base_dipole.h
@@ -44,7 +44,7 @@ class BaseDipole {
     * \param k_name name for the kernel for force calculation
     *
     * Returns:
-    * -  0 if successfull
+    * -  0 if successful
     * - -1 if fix gpu not found
     * - -3 if there is an out of memory error
     * - -4 if the GPU library was not compiled for GPU
diff --git a/lib/gpu/lal_base_dpd.h b/lib/gpu/lal_base_dpd.h
index 1e6f2ab1f2..5d1573c1a9 100644
--- a/lib/gpu/lal_base_dpd.h
+++ b/lib/gpu/lal_base_dpd.h
@@ -44,7 +44,7 @@ class BaseDPD {
     * \param k_name name for the kernel for force calculation
     *
     * Returns:
-    * -  0 if successfull
+    * -  0 if successful
     * - -1 if fix gpu not found
     * - -3 if there is an out of memory error
     * - -4 if the GPU library was not compiled for GPU
diff --git a/lib/gpu/lal_base_ellipsoid.h b/lib/gpu/lal_base_ellipsoid.h
index 061baac5b6..dc1e624a2f 100644
--- a/lib/gpu/lal_base_ellipsoid.h
+++ b/lib/gpu/lal_base_ellipsoid.h
@@ -46,7 +46,7 @@ class BaseEllipsoid {
     * \param k_name name for the kernel for force calculation
     *
     * Returns:
-    * -  0 if successfull
+    * -  0 if successful
     * - -1 if fix gpu not found
     * - -3 if there is an out of memory error
     * - -4 if the GPU library was not compiled for GPU
diff --git a/lib/gpu/lal_base_three.h b/lib/gpu/lal_base_three.h
index 75589f705d..38af78b78e 100644
--- a/lib/gpu/lal_base_three.h
+++ b/lib/gpu/lal_base_three.h
@@ -48,7 +48,7 @@ class BaseThree {
     * \param k_three name for the kernel for 3-body force calculation
     *
     * Returns:
-    * -  0 if successfull
+    * -  0 if successful
     * - -1 if fix gpu not found
     * - -3 if there is an out of memory error
     * - -4 if the GPU library was not compiled for GPU
diff --git a/lib/gpu/lal_beck.h b/lib/gpu/lal_beck.h
index db26bebeb0..638f1bf626 100644
--- a/lib/gpu/lal_beck.h
+++ b/lib/gpu/lal_beck.h
@@ -32,7 +32,7 @@ class Beck : public BaseAtomic<numtyp, acctyp> {
     * \param gpu_split fraction of particles handled by device
     *
     * Returns:
-    * -  0 if successfull
+    * -  0 if successful
     * - -1 if fix gpu not found
     * - -3 if there is an out of memory error
     * - -4 if the GPU library was not compiled for GPU
diff --git a/lib/gpu/lal_born.h b/lib/gpu/lal_born.h
index 685f4d87a9..2a7f355d69 100644
--- a/lib/gpu/lal_born.h
+++ b/lib/gpu/lal_born.h
@@ -32,7 +32,7 @@ class Born : public BaseAtomic<numtyp, acctyp> {
     * \param gpu_split fraction of particles handled by device
     *
     * Returns:
-    * -  0 if successfull
+    * -  0 if successful
     * - -1 if fix gpu not found
     * - -3 if there is an out of memory error
     * - -4 if the GPU library was not compiled for GPU
diff --git a/lib/gpu/lal_born_coul_long.h b/lib/gpu/lal_born_coul_long.h
index d236b7b57f..e383d18e0c 100644
--- a/lib/gpu/lal_born_coul_long.h
+++ b/lib/gpu/lal_born_coul_long.h
@@ -32,7 +32,7 @@ class BornCoulLong : public BaseCharge<numtyp, acctyp> {
     * \param gpu_split fraction of particles handled by device
     *
     * Returns:
-    * -  0 if successfull
+    * -  0 if successful
     * - -1 if fix gpu not found
     * - -3 if there is an out of memory error
     * - -4 if the GPU library was not compiled for GPU
diff --git a/lib/gpu/lal_born_coul_long_cs.h b/lib/gpu/lal_born_coul_long_cs.h
index df0fa0fcd4..6c4032b3be 100644
--- a/lib/gpu/lal_born_coul_long_cs.h
+++ b/lib/gpu/lal_born_coul_long_cs.h
@@ -32,7 +32,7 @@ class BornCoulLongCS : public BornCoulLong<numtyp, acctyp> {
     * \param gpu_split fraction of particles handled by device
     *
     * Returns:
-    * -  0 if successfull
+    * -  0 if successful
     * - -1 if fix gpu not found
     * - -3 if there is an out of memory error
     * - -4 if the GPU library was not compiled for GPU
diff --git a/lib/gpu/lal_born_coul_wolf.h b/lib/gpu/lal_born_coul_wolf.h
index 4b817ee0ce..fa53f48939 100644
--- a/lib/gpu/lal_born_coul_wolf.h
+++ b/lib/gpu/lal_born_coul_wolf.h
@@ -32,7 +32,7 @@ class BornCoulWolf : public BaseCharge<numtyp, acctyp> {
     * \param gpu_split fraction of particles handled by device
     *
     * Returns:
-    * -  0 if successfull
+    * -  0 if successful
     * - -1 if fix gpu not found
     * - -3 if there is an out of memory error
     * - -4 if the GPU library was not compiled for GPU
diff --git a/lib/gpu/lal_born_coul_wolf_cs.h b/lib/gpu/lal_born_coul_wolf_cs.h
index 1d9de0a457..e5bff1b4cc 100644
--- a/lib/gpu/lal_born_coul_wolf_cs.h
+++ b/lib/gpu/lal_born_coul_wolf_cs.h
@@ -32,7 +32,7 @@ class BornCoulWolfCS : public BornCoulWolf<numtyp, acctyp> {
     * \param gpu_split fraction of particles handled by device
     *
     * Returns:
-    * -  0 if successfull
+    * -  0 if successful
     * - -1 if fix gpu not found
     * - -3 if there is an out of memory error
     * - -4 if the GPU library was not compiled for GPU
diff --git a/lib/gpu/lal_buck.h b/lib/gpu/lal_buck.h
index 3b84066355..7a09fae5dd 100644
--- a/lib/gpu/lal_buck.h
+++ b/lib/gpu/lal_buck.h
@@ -32,7 +32,7 @@ class Buck : public BaseAtomic<numtyp, acctyp> {
     * \param gpu_split fraction of particles handled by device
     *
     * Returns:
-    * -  0 if successfull
+    * -  0 if successful
     * - -1 if fix gpu not found
     * - -3 if there is an out of memory error
     * - -4 if the GPU library was not compiled for GPU
diff --git a/lib/gpu/lal_buck_coul.h b/lib/gpu/lal_buck_coul.h
index 3f8428bfe1..eebba78eb0 100644
--- a/lib/gpu/lal_buck_coul.h
+++ b/lib/gpu/lal_buck_coul.h
@@ -32,7 +32,7 @@ class BuckCoul : public BaseCharge<numtyp, acctyp> {
     * \param gpu_split fraction of particles handled by device
     *
     * Returns:
-    * -  0 if successfull
+    * -  0 if successful
     * - -1 if fix gpu not found
     * - -3 if there is an out of memory error
     * - -4 if the GPU library was not compiled for GPU
diff --git a/lib/gpu/lal_buck_coul_long.h b/lib/gpu/lal_buck_coul_long.h
index 4a70a3a097..e2d69475cf 100644
--- a/lib/gpu/lal_buck_coul_long.h
+++ b/lib/gpu/lal_buck_coul_long.h
@@ -32,7 +32,7 @@ class BuckCoulLong : public BaseCharge<numtyp, acctyp> {
     * \param gpu_split fraction of particles handled by device
     *
     * Returns:
-    * -  0 if successfull
+    * -  0 if successful
     * - -1 if fix gpu not found
     * - -3 if there is an out of memory error
     * - -4 if the GPU library was not compiled for GPU
diff --git a/lib/gpu/lal_charmm_long.h b/lib/gpu/lal_charmm_long.h
index 011083db13..5d9d9ea50b 100644
--- a/lib/gpu/lal_charmm_long.h
+++ b/lib/gpu/lal_charmm_long.h
@@ -32,7 +32,7 @@ class CHARMMLong : public BaseCharge<numtyp, acctyp> {
     * \param gpu_split fraction of particles handled by device
     *
     * Returns:
-    * -  0 if successfull
+    * -  0 if successful
     * - -1 if fix gpu not found
     * - -3 if there is an out of memory error
     * - -4 if the GPU library was not compiled for GPU
diff --git a/lib/gpu/lal_colloid.h b/lib/gpu/lal_colloid.h
index dfbd4dbadd..35426007d8 100644
--- a/lib/gpu/lal_colloid.h
+++ b/lib/gpu/lal_colloid.h
@@ -32,7 +32,7 @@ class Colloid : public BaseAtomic<numtyp, acctyp> {
     * \param gpu_split fraction of particles handled by device
     *
     * Returns:
-    * -  0 if successfull
+    * -  0 if successful
     * - -1 if fix gpu not found
     * - -3 if there is an out of memory error
     * - -4 if the GPU library was not compiled for GPU
diff --git a/lib/gpu/lal_coul.h b/lib/gpu/lal_coul.h
index 6d9b6b1b2b..38472375fb 100644
--- a/lib/gpu/lal_coul.h
+++ b/lib/gpu/lal_coul.h
@@ -32,7 +32,7 @@ class Coul : public BaseCharge<numtyp, acctyp> {
     * \param gpu_split fraction of particles handled by device
     *
     * Returns:
-    * -  0 if successfull
+    * -  0 if successful
     * - -1 if fix gpu not found
     * - -3 if there is an out of memory error
     * - -4 if the GPU library was not compiled for GPU
diff --git a/lib/gpu/lal_coul_debye.h b/lib/gpu/lal_coul_debye.h
index 328c3dd64e..13e4c5b0c6 100644
--- a/lib/gpu/lal_coul_debye.h
+++ b/lib/gpu/lal_coul_debye.h
@@ -32,7 +32,7 @@ class CoulDebye : public BaseCharge<numtyp, acctyp> {
     * \param gpu_split fraction of particles handled by device
     *
     * Returns:
-    * -  0 if successfull
+    * -  0 if successful
     * - -1 if fix gpu not found
     * - -3 if there is an out of memory error
     * - -4 if the GPU library was not compiled for GPU
diff --git a/lib/gpu/lal_coul_dsf.h b/lib/gpu/lal_coul_dsf.h
index e52a51d583..3d57898f81 100644
--- a/lib/gpu/lal_coul_dsf.h
+++ b/lib/gpu/lal_coul_dsf.h
@@ -32,7 +32,7 @@ class CoulDSF : public BaseCharge<numtyp, acctyp> {
     * \param gpu_split fraction of particles handled by device
     *
     * Returns:
-    * -  0 if successfull
+    * -  0 if successful
     * - -1 if fix gpu not found
     * - -3 if there is an out of memory error
     * - -4 if the GPU library was not compiled for GPU
diff --git a/lib/gpu/lal_coul_long.h b/lib/gpu/lal_coul_long.h
index ae25b91dc7..0668e0fd02 100644
--- a/lib/gpu/lal_coul_long.h
+++ b/lib/gpu/lal_coul_long.h
@@ -32,7 +32,7 @@ class CoulLong : public BaseCharge<numtyp, acctyp> {
     * \param gpu_split fraction of particles handled by device
     *
     * Returns:
-    * -  0 if successfull
+    * -  0 if successful
     * - -1 if fix gpu not found
     * - -3 if there is an out of memory error
     * - -4 if the GPU library was not compiled for GPU
diff --git a/lib/gpu/lal_coul_long_cs.h b/lib/gpu/lal_coul_long_cs.h
index 3cfcb80fc8..fc3667d6a0 100644
--- a/lib/gpu/lal_coul_long_cs.h
+++ b/lib/gpu/lal_coul_long_cs.h
@@ -32,7 +32,7 @@ class CoulLongCS : public CoulLong<numtyp, acctyp> {
     * \param gpu_split fraction of particles handled by device
     *
     * Returns:
-    * -  0 if successfull
+    * -  0 if successful
     * - -1 if fix gpu not found
     * - -3 if there is an out of memory error
     * - -4 if the GPU library was not compiled for GPU
diff --git a/lib/gpu/lal_device.h b/lib/gpu/lal_device.h
index 0c4d5f8c43..21bd039c42 100644
--- a/lib/gpu/lal_device.h
+++ b/lib/gpu/lal_device.h
@@ -41,7 +41,7 @@ class Device {
   /** Sets up a per-device MPI communicator for load balancing and initializes
     * the device (>=first_gpu and <=last_gpu) that this proc will be using
     * Returns:
-    * -  0 if successfull
+    * -  0 if successful
     * - -2 if GPU not found
     * - -4 if GPU library not compiled for GPU
     * - -6 if GPU could not be initialized for use
@@ -62,7 +62,7 @@ class Device {
     * \param vel True if velocities need to be stored
     *
     * Returns:
-    * -  0 if successfull
+    * -  0 if successful
     * - -1 if fix gpu not found
     * - -3 if there is an out of memory error
     * - -4 if the GPU library was not compiled for GPU
@@ -76,7 +76,7 @@ class Device {
     * \param nall Total number of local+ghost particles
     *
     * Returns:
-    * -  0 if successfull
+    * -  0 if successful
     * - -1 if fix gpu not found
     * - -3 if there is an out of memory error
     * - -4 if the GPU library was not compiled for GPU
@@ -100,7 +100,7 @@ class Device {
     * \param threads_per_atom value to be used by the neighbor list only
     *
     * Returns:
-    * -  0 if successfull
+    * -  0 if successful
     * - -1 if fix gpu not found
     * - -3 if there is an out of memory error
     * - -4 if the GPU library was not compiled for GPU
diff --git a/lib/gpu/lal_dipole_lj.h b/lib/gpu/lal_dipole_lj.h
index 615784ee8b..bd312324c6 100644
--- a/lib/gpu/lal_dipole_lj.h
+++ b/lib/gpu/lal_dipole_lj.h
@@ -32,7 +32,7 @@ class DipoleLJ : public BaseDipole<numtyp, acctyp> {
     * \param gpu_split fraction of particles handled by device
     *
     * Returns:
-    * -  0 if successfull
+    * -  0 if successful
     * - -1 if fix gpu not found
     * - -3 if there is an out of memory error
     * - -4 if the GPU library was not compiled for GPU
diff --git a/lib/gpu/lal_dipole_lj_sf.h b/lib/gpu/lal_dipole_lj_sf.h
index 20357385a2..ae73508065 100644
--- a/lib/gpu/lal_dipole_lj_sf.h
+++ b/lib/gpu/lal_dipole_lj_sf.h
@@ -32,7 +32,7 @@ class DipoleLJSF : public BaseDipole<numtyp, acctyp> {
     * \param gpu_split fraction of particles handled by device
     *
     * Returns:
-    * -  0 if successfull
+    * -  0 if successful
     * - -1 if fix gpu not found
     * - -3 if there is an out of memory error
     * - -4 if the GPU library was not compiled for GPU
diff --git a/lib/gpu/lal_dipole_long_lj.h b/lib/gpu/lal_dipole_long_lj.h
index 1381e24326..77e22a10a7 100644
--- a/lib/gpu/lal_dipole_long_lj.h
+++ b/lib/gpu/lal_dipole_long_lj.h
@@ -32,7 +32,7 @@ class DipoleLongLJ : public BaseDipole<numtyp, acctyp> {
     * \param gpu_split fraction of particles handled by device
     *
     * Returns:
-    * -  0 if successfull
+    * -  0 if successful
     * - -1 if fix gpu not found
     * - -3 if there is an out of memory error
     * - -4 if the GPU library was not compiled for GPU
diff --git a/lib/gpu/lal_dpd.h b/lib/gpu/lal_dpd.h
index 42ef854522..3c36c39e05 100644
--- a/lib/gpu/lal_dpd.h
+++ b/lib/gpu/lal_dpd.h
@@ -32,7 +32,7 @@ class DPD : public BaseDPD<numtyp, acctyp> {
     * \param gpu_split fraction of particles handled by device
     *
     * Returns:
-    * -  0 if successfull
+    * -  0 if successful
     * - -1 if fix gpu not found
     * - -3 if there is an out of memory error
     * - -4 if the GPU library was not compiled for GPU
diff --git a/lib/gpu/lal_eam.h b/lib/gpu/lal_eam.h
index ce26edc1f4..fa05075883 100644
--- a/lib/gpu/lal_eam.h
+++ b/lib/gpu/lal_eam.h
@@ -33,7 +33,7 @@ class EAM : public BaseAtomic<numtyp, acctyp> {
     * \param gpu_split fraction of particles handled by device
     *
     * Returns:
-    * -  0 if successfull
+    * -  0 if successful
     * - -1 if fix gpu not found
     * - -3 if there is an out of memory error
     * - -4 if the GPU library was not compiled for GPU
diff --git a/lib/gpu/lal_gauss.h b/lib/gpu/lal_gauss.h
index d023310c6d..1399b82d03 100644
--- a/lib/gpu/lal_gauss.h
+++ b/lib/gpu/lal_gauss.h
@@ -32,7 +32,7 @@ class Gauss : public BaseAtomic<numtyp, acctyp> {
     * \param gpu_split fraction of particles handled by device
     *
     * Returns:
-    * -  0 if successfull
+    * -  0 if successful
     * - -1 if fix gpu not found
     * - -3 if there is an out of memory error
     * - -4 if the GPU library was not compiled for GPU
diff --git a/lib/gpu/lal_gayberne.h b/lib/gpu/lal_gayberne.h
index 8792f1f1db..750c739cec 100644
--- a/lib/gpu/lal_gayberne.h
+++ b/lib/gpu/lal_gayberne.h
@@ -34,7 +34,7 @@ class GayBerne : public BaseEllipsoid<numtyp, acctyp> {
     * \return false if there is not sufficient memory or device init prob
     *
     * Returns:
-    * -  0 if successfull
+    * -  0 if successful
     * - -1 if fix gpu not found
     * - -3 if there is an out of memory error
     * - -4 if the GPU library was not compiled for GPU
diff --git a/lib/gpu/lal_lj.h b/lib/gpu/lal_lj.h
index 01ce85c8ea..c6fec0d159 100644
--- a/lib/gpu/lal_lj.h
+++ b/lib/gpu/lal_lj.h
@@ -32,7 +32,7 @@ class LJ : public BaseAtomic<numtyp, acctyp> {
     * \param gpu_split fraction of particles handled by device
     *
     * Returns:
-    * -  0 if successfull
+    * -  0 if successful
     * - -1 if fix gpu not found
     * - -3 if there is an out of memory error
     * - -4 if the GPU library was not compiled for GPU
diff --git a/lib/gpu/lal_lj96.h b/lib/gpu/lal_lj96.h
index 3fdea5265e..eef6863f37 100644
--- a/lib/gpu/lal_lj96.h
+++ b/lib/gpu/lal_lj96.h
@@ -32,7 +32,7 @@ class LJ96 : public BaseAtomic<numtyp, acctyp> {
     * \param gpu_split fraction of particles handled by device
     *
     * Returns:
-    * -  0 if successfull
+    * -  0 if successful
     * - -1 if fix gpu not found
     * - -3 if there is an out of memory error
     * - -4 if the GPU library was not compiled for GPU
diff --git a/lib/gpu/lal_lj_class2_long.h b/lib/gpu/lal_lj_class2_long.h
index d07b974a90..eac6451b2e 100644
--- a/lib/gpu/lal_lj_class2_long.h
+++ b/lib/gpu/lal_lj_class2_long.h
@@ -32,7 +32,7 @@ class LJClass2Long : public BaseCharge<numtyp, acctyp> {
     * \param gpu_split fraction of particles handled by device
     *
     * Returns:
-    * -  0 if successfull
+    * -  0 if successful
     * - -1 if fix gpu not found
     * - -3 if there is an out of memory error
     * - -4 if the GPU library was not compiled for GPU
diff --git a/lib/gpu/lal_lj_coul.h b/lib/gpu/lal_lj_coul.h
index a262c0837f..0e11162aa5 100644
--- a/lib/gpu/lal_lj_coul.h
+++ b/lib/gpu/lal_lj_coul.h
@@ -32,7 +32,7 @@ class LJCoul : public BaseCharge<numtyp, acctyp> {
     * \param gpu_split fraction of particles handled by device
     *
     * Returns:
-    * -  0 if successfull
+    * -  0 if successful
     * - -1 if fix gpu not found
     * - -3 if there is an out of memory error
     * - -4 if the GPU library was not compiled for GPU
diff --git a/lib/gpu/lal_lj_coul_debye.h b/lib/gpu/lal_lj_coul_debye.h
index 1d3d0ba375..22fcf7234b 100644
--- a/lib/gpu/lal_lj_coul_debye.h
+++ b/lib/gpu/lal_lj_coul_debye.h
@@ -32,7 +32,7 @@ class LJCoulDebye : public BaseCharge<numtyp, acctyp> {
     * \param gpu_split fraction of particles handled by device
     *
     * Returns:
-    * -  0 if successfull
+    * -  0 if successful
     * - -1 if fix gpu not found
     * - -3 if there is an out of memory error
     * - -4 if the GPU library was not compiled for GPU
diff --git a/lib/gpu/lal_lj_coul_long.h b/lib/gpu/lal_lj_coul_long.h
index 7b2d79c2a6..8f77671dc0 100644
--- a/lib/gpu/lal_lj_coul_long.h
+++ b/lib/gpu/lal_lj_coul_long.h
@@ -32,7 +32,7 @@ class LJCoulLong : public BaseCharge<numtyp, acctyp> {
     * \param gpu_split fraction of particles handled by device
     *
     * Returns:
-    * -  0 if successfull
+    * -  0 if successful
     * - -1 if fix gpu not found
     * - -3 if there is an out of memory error
     * - -4 if the GPU library was not compiled for GPU
diff --git a/lib/gpu/lal_lj_coul_msm.h b/lib/gpu/lal_lj_coul_msm.h
index 48d49a8742..6369ce8cb5 100644
--- a/lib/gpu/lal_lj_coul_msm.h
+++ b/lib/gpu/lal_lj_coul_msm.h
@@ -32,7 +32,7 @@ class LJCoulMSM : public BaseCharge<numtyp, acctyp> {
     * \param gpu_split fraction of particles handled by device
     *
     * Returns:
-    * -  0 if successfull
+    * -  0 if successful
     * - -1 if fix gpu not found
     * - -3 if there is an out of memory error
     * - -4 if the GPU library was not compiled for GPU
diff --git a/lib/gpu/lal_lj_cubic.h b/lib/gpu/lal_lj_cubic.h
index 818fb3581b..9578ca27e4 100644
--- a/lib/gpu/lal_lj_cubic.h
+++ b/lib/gpu/lal_lj_cubic.h
@@ -32,7 +32,7 @@ class LJCubic : public BaseAtomic<numtyp, acctyp> {
     * \param gpu_split fraction of particles handled by device
     *
     * Returns:
-    * -  0 if successfull
+    * -  0 if successful
     * - -1 if fix gpu not found
     * - -3 if there is an out of memory error
     * - -4 if the GPU library was not compiled for GPU
diff --git a/lib/gpu/lal_lj_dsf.h b/lib/gpu/lal_lj_dsf.h
index 0195898ca4..b176e087db 100644
--- a/lib/gpu/lal_lj_dsf.h
+++ b/lib/gpu/lal_lj_dsf.h
@@ -32,7 +32,7 @@ class LJDSF : public BaseCharge<numtyp, acctyp> {
     * \param gpu_split fraction of particles handled by device
     *
     * Returns:
-    * -  0 if successfull
+    * -  0 if successful
     * - -1 if fix gpu not found
     * - -3 if there is an out of memory error
     * - -4 if the GPU library was not compiled for GPU
diff --git a/lib/gpu/lal_lj_expand.h b/lib/gpu/lal_lj_expand.h
index a732a3a686..2560d166c7 100644
--- a/lib/gpu/lal_lj_expand.h
+++ b/lib/gpu/lal_lj_expand.h
@@ -32,7 +32,7 @@ class LJExpand : public BaseAtomic<numtyp, acctyp> {
     * \param gpu_split fraction of particles handled by device
     *
     * Returns:
-    * -  0 if successfull
+    * -  0 if successful
     * - -1 if fix gpu not found
     * - -3 if there is an out of memory error
     * - -4 if the GPU library was not compiled for GPU
diff --git a/lib/gpu/lal_lj_expand_coul_long.h b/lib/gpu/lal_lj_expand_coul_long.h
index 64fd9df1ab..404a36e5bc 100644
--- a/lib/gpu/lal_lj_expand_coul_long.h
+++ b/lib/gpu/lal_lj_expand_coul_long.h
@@ -32,7 +32,7 @@ class LJExpandCoulLong : public BaseCharge<numtyp, acctyp> {
     * \param gpu_split fraction of particles handled by device
     *
     * Returns:
-    * -  0 if successfull
+    * -  0 if successful
     * - -1 if fix gpu not found
     * - -3 if there is an out of memory error
     * - -4 if the GPU library was not compiled for GPU
diff --git a/lib/gpu/lal_lj_gromacs.h b/lib/gpu/lal_lj_gromacs.h
index 1e0f72dafc..3dec13c6d7 100644
--- a/lib/gpu/lal_lj_gromacs.h
+++ b/lib/gpu/lal_lj_gromacs.h
@@ -32,7 +32,7 @@ class LJGROMACS : public BaseAtomic<numtyp, acctyp> {
     * \param gpu_split fraction of particles handled by device
     *
     * Returns:
-    * -  0 if successfull
+    * -  0 if successful
     * - -1 if fix gpu not found
     * - -3 if there is an out of memory error
     * - -4 if the GPU library was not compiled for GPU
diff --git a/lib/gpu/lal_lj_sdk.h b/lib/gpu/lal_lj_sdk.h
index ac2b9aafe3..fc50756a3f 100644
--- a/lib/gpu/lal_lj_sdk.h
+++ b/lib/gpu/lal_lj_sdk.h
@@ -32,7 +32,7 @@ class CGCMM : public BaseAtomic<numtyp, acctyp> {
     * \param gpu_split fraction of particles handled by device
     *
     * Returns:
-    * -  0 if successfull
+    * -  0 if successful
     * - -1 if fix gpu not found
     * - -3 if there is an out of memory error
     * - -4 if the GPU library was not compiled for GPU
diff --git a/lib/gpu/lal_lj_sdk_long.h b/lib/gpu/lal_lj_sdk_long.h
index f56687cd7d..608488bd30 100644
--- a/lib/gpu/lal_lj_sdk_long.h
+++ b/lib/gpu/lal_lj_sdk_long.h
@@ -32,7 +32,7 @@ class CGCMMLong : public BaseCharge<numtyp, acctyp> {
     * \param gpu_split fraction of particles handled by device
     *
     * Returns:
-    * -  0 if successfull
+    * -  0 if successful
     * - -1 if fix gpu not found
     * - -3 if there is an out of memory error
     * - -4 if the GPU library was not compiled for GPU
diff --git a/lib/gpu/lal_lj_tip4p_long.cpp b/lib/gpu/lal_lj_tip4p_long.cpp
index 0b781300c7..5dd082df33 100644
--- a/lib/gpu/lal_lj_tip4p_long.cpp
+++ b/lib/gpu/lal_lj_tip4p_long.cpp
@@ -74,11 +74,11 @@ int LJTIP4PLongT::init(const int ntypes,
   // If atom type constants fit in shared memory use fast kernel
   int lj_types=ntypes;
   shared_types=false;
-//  int max_shared_types=this->device->max_shared_types();
-//  if (lj_types<=max_shared_types && this->_block_size>=max_shared_types) {
-//    lj_types=max_shared_types;
-//    shared_types=true;
-//  }
+  int max_shared_types=this->device->max_shared_types();
+  if (lj_types<=max_shared_types && this->_block_size>=max_shared_types) {
+    lj_types=max_shared_types;
+    shared_types=true;
+  }
   _lj_types=lj_types;
 
   // Allocate a host write buffer for data initialization
@@ -202,7 +202,6 @@ void LJTIP4PLongT::loop(const bool _eflag, const bool _vflag) {
 
   GX=static_cast<int>(ceil(static_cast<double>(this->ans->inum())/
                                (BX/this->_threads_per_atom)));
-  this->k_pair.set_size(GX,BX);
   if (vflag) {
           this->ansO.resize_ib(ainum*3);
   } else {
@@ -210,13 +209,25 @@ void LJTIP4PLongT::loop(const bool _eflag, const bool _vflag) {
   }
   this->ansO.zero();
   this->device->gpu->sync();
-  this->k_pair.run(&this->atom->x, &lj1, &lj3, &_lj_types, &sp_lj,
+  if(shared_types) {
+    this->k_pair_fast.set_size(GX,BX);
+    this->k_pair_fast.run(&this->atom->x, &lj1, &lj3, &_lj_types, &sp_lj,
           &this->nbor->dev_nbor, &this->_nbor_data->begin(),
           &this->ans->force, &this->ans->engv, &eflag, &vflag,
           &ainum, &nbor_pitch, &this->_threads_per_atom,
           &hneight, &m, &TypeO, &TypeH, &alpha,
           &this->atom->q, &cutsq, &_qqrd2e, &_g_ewald,
           &cut_coulsq, &cut_coulsqplus, &this->ansO);
+  } else {
+    this->k_pair.set_size(GX,BX);
+    this->k_pair.run(&this->atom->x, &lj1, &lj3, &_lj_types, &sp_lj,
+          &this->nbor->dev_nbor, &this->_nbor_data->begin(),
+          &this->ans->force, &this->ans->engv, &eflag, &vflag,
+          &ainum, &nbor_pitch, &this->_threads_per_atom,
+          &hneight, &m, &TypeO, &TypeH, &alpha,
+          &this->atom->q, &cutsq, &_qqrd2e, &_g_ewald,
+          &cut_coulsq, &cut_coulsqplus, &this->ansO);
+  }
   GX=static_cast<int>(ceil(static_cast<double>(this->ans->inum())/BX));
   this->k_pair_distrib.set_size(GX,BX);
   this->k_pair_distrib.run(&this->atom->x, &this->ans->force, &this->ans->engv,
diff --git a/lib/gpu/lal_lj_tip4p_long.cu b/lib/gpu/lal_lj_tip4p_long.cu
index 092513da4d..66c9a6071e 100644
--- a/lib/gpu/lal_lj_tip4p_long.cu
+++ b/lib/gpu/lal_lj_tip4p_long.cu
@@ -572,4 +572,328 @@ __kernel void k_lj_tip4p_long(const __global numtyp4 *restrict x_,
   } // if ii
 }
 
-__kernel void k_lj_tip4p_long_fast() {}
+__kernel void k_lj_tip4p_long_fast(const __global numtyp4 *restrict x_,
+    const __global numtyp4 *restrict lj1_in,
+    const __global numtyp4 *restrict lj3_in,
+    const int lj_types,
+    const __global numtyp *restrict sp_lj_in,
+    const __global int * dev_nbor,
+    const __global int * dev_packed,
+    __global acctyp4 *restrict ans,
+    __global acctyp *restrict engv,
+    const int eflag, const int vflag, const int inum,
+    const int nbor_pitch, const int t_per_atom,
+    __global int *restrict hneigh,
+    __global numtyp4 *restrict m,
+    const int typeO, const int typeH,
+    const numtyp alpha,
+    const __global numtyp *restrict q_,
+    const __global numtyp *restrict cutsq,
+    const numtyp qqrd2e, const numtyp g_ewald,
+    const numtyp cut_coulsq, const numtyp cut_coulsqplus,
+    __global acctyp4 *restrict ansO) {
+  int tid, ii, offset;
+  atom_info(t_per_atom,ii,tid,offset);
+
+  const numtyp eq_zero = 1e-6;
+
+  __local numtyp4 lj1[MAX_SHARED_TYPES*MAX_SHARED_TYPES];
+  __local numtyp4 lj3[MAX_SHARED_TYPES*MAX_SHARED_TYPES];
+  __local numtyp sp_lj[8];
+  if (tid<8)
+    sp_lj[tid]=sp_lj_in[tid];
+  if (tid<MAX_SHARED_TYPES*MAX_SHARED_TYPES) {
+    lj1[tid]=lj1_in[tid];
+    if (eflag>0)
+      lj3[tid]=lj3_in[tid];
+  }
+  acctyp energy = (acctyp)0;
+  acctyp e_coul = (acctyp)0;
+  acctyp4 f, fO;
+  f.x=(acctyp)0;  f.y=(acctyp)0;  f.z=(acctyp)0;
+  fO.x=(acctyp)0; fO.y=(acctyp)0; fO.z=(acctyp)0;
+  acctyp virial[6],vO[6];
+  for (int i=0; i<6; i++) {
+    virial[i]=(acctyp)0;
+    vO[i]=(acctyp)0;
+  }
+
+  __syncthreads();
+  if (ii<inum) {
+    int i, numj, nbor, nbor_end;
+    __local int n_stride;
+    nbor_info(dev_nbor,dev_packed,nbor_pitch,t_per_atom,ii,offset,i,numj,
+        n_stride,nbor_end,nbor);
+
+    numtyp4 ix; fetch4(ix,i,pos_tex); //x_[i];
+    numtyp qtmp; fetch(qtmp,i,q_tex);
+    int itype = ix.w;
+    numtyp4 x1 = ix;
+
+    int non_local_oxy = 0;
+    int iH1, iH2, iO;
+
+    if(itype == typeO) {
+      iO  = i;
+      iH1 = hneigh[i*4  ];
+      iH2 = hneigh[i*4+1];
+      x1 = m[iO];
+    } else {
+      iO  = hneigh[i *4  ];
+      iH1 = hneigh[iO*4  ];
+      iH2 = hneigh[iO*4+1];
+      if (iO >= inum) {
+        non_local_oxy = 1;
+      }
+    }
+
+    for ( ; nbor<nbor_end; nbor+=n_stride) {
+      int j=dev_packed[nbor];
+
+      numtyp factor_lj,factor_coul;
+      factor_lj = sp_lj[sbmask(j)];
+      factor_coul = (numtyp)1.0-sp_lj[sbmask(j)+4];
+      j &= NEIGHMASK;
+
+      numtyp4 jx; fetch4(jx,j,pos_tex); //x_[j];
+      int jtype = jx.w;
+
+      // Compute r12
+      numtyp delx = ix.x-jx.x;
+      numtyp dely = ix.y-jx.y;
+      numtyp delz = ix.z-jx.z;
+      numtyp rsq = delx*delx+dely*dely+delz*delz;
+
+      int mtype = itype*lj_types+jtype;
+      if (rsq < lj1[mtype].z) { // cut_ljsq
+        numtyp r2inv = ucl_recip(rsq);
+        numtyp r6inv = r2inv*r2inv*r2inv;
+        numtyp forcelj = r6inv*(lj1[mtype].x*r6inv-lj1[mtype].y);
+        forcelj *= r2inv*factor_lj;
+
+        f.x += delx*forcelj;
+        f.y += dely*forcelj;
+        f.z += delz*forcelj;
+
+        if (eflag>0) {
+          numtyp e = r6inv * (lj3[mtype].x*r6inv-lj3[mtype].y);
+          energy += factor_lj * (e - lj3[mtype].z);
+        }
+        if (vflag>0) {
+          virial[0] += delx*delx*forcelj;
+          virial[1] += dely*dely*forcelj;
+          virial[2] += delz*delz*forcelj;
+          virial[3] += delx*dely*forcelj;
+          virial[4] += delx*delz*forcelj;
+          virial[5] += dely*delz*forcelj;
+        }
+      } // if LJ
+
+      if (rsq < cut_coulsqplus) { //cut_coulsqplus
+        int jH1, jH2, jO;
+        numtyp qj; fetch(qj,j,q_tex);
+        numtyp4 x2 = jx;
+        if(itype == typeO || jtype == typeO) {
+          if (jtype == typeO) {
+            jO = j;
+            jH1 = hneigh[j*4  ];
+            jH2 = hneigh[j*4+1];
+            x2 = m[j];
+          }
+          delx = x1.x-x2.x;
+          dely = x1.y-x2.y;
+          delz = x1.z-x2.z;
+          rsq = delx*delx+dely*dely+delz*delz;
+        }
+        if (rsq < cut_coulsq) {
+          numtyp r2inv = ucl_recip(rsq);
+          numtyp r = ucl_rsqrt(r2inv);
+          numtyp grij = g_ewald * r;
+          numtyp expm2 = ucl_exp(-grij*grij);
+          numtyp t = ucl_recip((numtyp)1.0 + EWALD_P*grij);
+          numtyp _erfc = t * (A1+t*(A2+t*(A3+t*(A4+t*A5)))) * expm2;
+
+          numtyp prefactor = qj;
+          prefactor *= qqrd2e*qtmp/r;
+          numtyp force_coul = r2inv*prefactor * (_erfc + EWALD_F*grij*expm2 - factor_coul);
+
+          if (itype == typeH) {
+            f.x += delx * force_coul;
+            f.y += dely * force_coul;
+            f.z += delz * force_coul;
+            f.w += 0;
+          } else {
+            fO.x += delx * force_coul;
+            fO.y += dely * force_coul;
+            fO.z += delz * force_coul;
+            fO.w += 0;
+          }
+          if (eflag>0) {
+            e_coul += prefactor*(_erfc-factor_coul);
+          }
+          if (vflag>0) {
+            acctyp4 fd;
+            fd.x = delx*force_coul;
+            fd.y = dely*force_coul;
+            fd.z = delz*force_coul;
+            if (itype == typeH) {
+              if (jtype == typeH) {
+                virial[0] += delx*fd.x;
+                virial[1] += dely*fd.y;
+                virial[2] += delz*fd.z;
+                virial[3] += delx*fd.y;
+                virial[4] += delx*fd.z;
+                virial[5] += dely*fd.z;
+              } else {
+                numtyp cO = 1 - alpha, cH = 0.5*alpha;
+                numtyp4 vdj;
+                numtyp4 xjH1; fetch4(xjH1,jH1,pos_tex);
+                numtyp4 xjH2; fetch4(xjH2,jH2,pos_tex);
+                numtyp4 xjO; fetch4(xjO,jO,pos_tex);
+                vdj.x = xjO.x*cO + xjH1.x*cH + xjH2.x*cH;
+                vdj.y = xjO.y*cO + xjH1.y*cH + xjH2.y*cH;
+                vdj.z = xjO.z*cO + xjH1.z*cH + xjH2.z*cH;
+                //vdj.w = vdj.w;
+                virial[0] += (ix.x - vdj.x)*fd.x;
+                virial[1] += (ix.y - vdj.y)*fd.y;
+                virial[2] += (ix.z - vdj.z)*fd.z;
+                virial[3] += (ix.x - vdj.x)*fd.y;
+                virial[4] += (ix.x - vdj.x)*fd.z;
+                virial[5] += (ix.y - vdj.y)*fd.z;
+              }
+            } else {
+              numtyp cO = 1 - alpha, cH = 0.5*alpha;
+              numtyp4 vdi, vdj;
+              numtyp4 xH1; fetch4(xH1,iH1,pos_tex);
+              numtyp4 xH2; fetch4(xH2,iH2,pos_tex);
+              numtyp4 xO; fetch4(xO,iO,pos_tex);
+              vdi.x = xO.x*cO + xH1.x*cH + xH2.x*cH;
+              vdi.y = xO.y*cO + xH1.y*cH + xH2.y*cH;
+              vdi.z = xO.z*cO + xH1.z*cH + xH2.z*cH;
+              //vdi.w = vdi.w;
+              if (jtype != typeH) {
+                numtyp4 xjH1; fetch4(xjH1,jH1,pos_tex);
+                numtyp4 xjH2; fetch4(xjH2,jH2,pos_tex);
+                numtyp4 xjO; fetch4(xjO,jO,pos_tex);
+                vdj.x = xjO.x*cO + xjH1.x*cH + xjH2.x*cH;
+                vdj.y = xjO.y*cO + xjH1.y*cH + xjH2.y*cH;
+                vdj.z = xjO.z*cO + xjH1.z*cH + xjH2.z*cH;
+                //vdj.w = vdj.w;
+              } else vdj = jx;
+              vO[0] += 0.5*(vdi.x - vdj.x)*fd.x;
+              vO[1] += 0.5*(vdi.y - vdj.y)*fd.y;
+              vO[2] += 0.5*(vdi.z - vdj.z)*fd.z;
+              vO[3] += 0.5*(vdi.x - vdj.x)*fd.y;
+              vO[4] += 0.5*(vdi.x - vdj.x)*fd.z;
+              vO[5] += 0.5*(vdi.y - vdj.y)*fd.z;
+            }
+          }
+        }
+        if (non_local_oxy == 1) {
+          if (iO == j) {
+            x2 = ix;
+            qj = qtmp;
+          }
+          numtyp4 x1m = m[iO];
+          delx = x1m.x-x2.x;
+          dely = x1m.y-x2.y;
+          delz = x1m.z-x2.z;
+          rsq = delx*delx+dely*dely+delz*delz;
+          if (rsq < cut_coulsq) {
+            numtyp r2inv = ucl_recip(rsq);
+            numtyp r = ucl_rsqrt(r2inv);
+            numtyp grij = g_ewald * r;
+            numtyp expm2 = ucl_exp(-grij*grij);
+            numtyp t = ucl_recip((numtyp)1.0 + EWALD_P*grij);
+            numtyp _erfc = t * (A1+t*(A2+t*(A3+t*(A4+t*A5)))) * expm2;
+
+            numtyp prefactor = qj;
+            prefactor *= qqrd2e*x1m.w/r;
+            numtyp force_coul = r2inv*prefactor * (_erfc + EWALD_F*grij*expm2 - factor_coul);
+
+            numtyp cO = 1 - alpha, cH = 0.5*alpha;
+            numtyp4 fd;
+            fd.x = delx * force_coul * cH;
+            fd.y = dely * force_coul * cH;
+            fd.z = delz * force_coul * cH;
+
+            f.x += fd.x;
+            f.y += fd.y;
+            f.z += fd.z;
+
+            if (eflag>0) {
+              e_coul += prefactor*(_erfc-factor_coul) * (acctyp)0.5 * alpha;
+            }
+            if (vflag>0) {
+              numtyp4 xH1; fetch4(xH1,iH1,pos_tex);
+              numtyp4 xH2; fetch4(xH2,iH2,pos_tex);
+              numtyp4 xO;  fetch4(xO,iO,pos_tex);
+
+              virial[0] += ((xO.x*cO + xH1.x*cH + xH2.x*cH) - x2.x) * fd.x;
+              virial[1] += ((xO.y*cO + xH1.y*cH + xH2.y*cH) - x2.y) * fd.y;
+              virial[2] += ((xO.z*cO + xH1.z*cH + xH2.z*cH) - x2.z) * fd.z;
+              virial[3] += ((xO.x*cO + xH1.x*cH + xH2.x*cH) - x2.x) * fd.y;
+              virial[4] += ((xO.x*cO + xH1.x*cH + xH2.x*cH) - x2.x) * fd.z;
+              virial[5] += ((xO.y*cO + xH1.y*cH + xH2.y*cH) - x2.y) * fd.z;
+            }
+          }
+        }
+      } // if cut_coulsqplus
+    } // for nbor
+    if (t_per_atom>1) {
+#if (ARCH < 300)
+      __local acctyp red_acc[6][BLOCK_PAIR];
+      red_acc[0][tid]=fO.x;
+      red_acc[1][tid]=fO.y;
+      red_acc[2][tid]=fO.z;
+      red_acc[3][tid]=fO.w;
+      for (unsigned int s=t_per_atom/2; s>0; s>>=1) {
+        if (offset < s) {
+          for (int r=0; r<4; r++)
+            red_acc[r][tid] += red_acc[r][tid+s];
+        }
+      }
+      fO.x=red_acc[0][tid];
+      fO.y=red_acc[1][tid];
+      fO.z=red_acc[2][tid];
+      fO.w=red_acc[3][tid];
+      if (vflag>0) {
+        for (int r=0; r<6; r++) red_acc[r][tid]=vO[r];
+        for (unsigned int s=t_per_atom/2; s>0; s>>=1) {
+          if (offset < s) {
+            for (int r=0; r<6; r++)
+              red_acc[r][tid] += red_acc[r][tid+s];
+          }
+        }
+        for (int r=0; r<6; r++) vO[r]=red_acc[r][tid];
+      }
+#else
+      for (unsigned int s=t_per_atom/2; s>0; s>>=1) {
+        fO.x += shfl_xor(fO.x, s, t_per_atom);
+        fO.y += shfl_xor(fO.y, s, t_per_atom);
+        fO.z += shfl_xor(fO.z, s, t_per_atom);
+        fO.w += shfl_xor(fO.w, s, t_per_atom);
+      }
+      if (vflag>0) {
+        for (unsigned int s=t_per_atom/2; s>0; s>>=1) {
+          for (int r=0; r<6; r++)
+            vO[r] += shfl_xor(vO[r], s, t_per_atom);
+        }
+      }
+#endif
+    }
+    if(offset == 0) {
+      ansO[i] = fO;
+      if (vflag>0) {
+        ansO[inum   + i].x = vO[0];
+        ansO[inum   + i].y = vO[1];
+        ansO[inum   + i].z = vO[2];
+        ansO[inum*2 + i].x = vO[3];
+        ansO[inum*2 + i].y = vO[4];
+        ansO[inum*2 + i].z = vO[5];
+      }
+    }
+    store_answers_q(f,energy,e_coul,virial,ii,inum,tid,t_per_atom,offset,eflag,
+        vflag,ans,engv);
+  } // if ii
+}
diff --git a/lib/gpu/lal_lj_tip4p_long.h b/lib/gpu/lal_lj_tip4p_long.h
index ab32d1e9f3..90c342e246 100644
--- a/lib/gpu/lal_lj_tip4p_long.h
+++ b/lib/gpu/lal_lj_tip4p_long.h
@@ -32,7 +32,7 @@ public:
     * \param gpu_split fraction of particles handled by device
     *
     * Returns:
-    * -  0 if successfull
+    * -  0 if successful
     * - -1 if fix gpu not found
     * - -3 if there is an out of memory error
     * - -4 if the GPU library was not compiled for GPU
diff --git a/lib/gpu/lal_mie.h b/lib/gpu/lal_mie.h
index 8752fe1748..dfc2ee6e53 100644
--- a/lib/gpu/lal_mie.h
+++ b/lib/gpu/lal_mie.h
@@ -32,7 +32,7 @@ class Mie : public BaseAtomic<numtyp, acctyp> {
     * \param gpu_split fraction of particles handled by device
     *
     * Returns:
-    * -  0 if successfull
+    * -  0 if successful
     * - -1 if fix gpu not found
     * - -3 if there is an out of memory error
     * - -4 if the GPU library was not compiled for GPU
diff --git a/lib/gpu/lal_morse.h b/lib/gpu/lal_morse.h
index ef80fb4235..bf5f1c0f8f 100644
--- a/lib/gpu/lal_morse.h
+++ b/lib/gpu/lal_morse.h
@@ -32,7 +32,7 @@ class Morse : public BaseAtomic<numtyp, acctyp> {
     * \param gpu_split fraction of particles handled by device
     *
     * Returns:
-    * -  0 if successfull
+    * -  0 if successful
     * - -1 if fix gpu not found
     * - -3 if there is an out of memory error
     * - -4 if the GPU library was not compiled for GPU
diff --git a/lib/gpu/lal_pppm.h b/lib/gpu/lal_pppm.h
index bc5f216076..499aa265d3 100644
--- a/lib/gpu/lal_pppm.h
+++ b/lib/gpu/lal_pppm.h
@@ -41,7 +41,7 @@ class PPPM {
 
   /// Clear any previous data and set up for a new LAMMPS run
   /** Success will be:
-    * -  0 if successfull
+    * -  0 if successful
     * - -1 if fix gpu not found
     * - -2 if GPU could not be found
     * - -3 if there is an out of memory error
diff --git a/lib/gpu/lal_re_squared.h b/lib/gpu/lal_re_squared.h
index 8dc137d829..9e4f4af67a 100644
--- a/lib/gpu/lal_re_squared.h
+++ b/lib/gpu/lal_re_squared.h
@@ -34,7 +34,7 @@ class RESquared : public BaseEllipsoid<numtyp, acctyp> {
     * \return false if there is not sufficient memory or device init prob
     *
     * Returns:
-    * -  0 if successfull
+    * -  0 if successful
     * - -1 if fix gpu not found
     * - -3 if there is an out of memory error
     * - -4 if the GPU library was not compiled for GPU
diff --git a/lib/gpu/lal_soft.h b/lib/gpu/lal_soft.h
index e72673248c..ff4524b30a 100644
--- a/lib/gpu/lal_soft.h
+++ b/lib/gpu/lal_soft.h
@@ -32,7 +32,7 @@ class Soft : public BaseAtomic<numtyp, acctyp> {
     * \param gpu_split fraction of particles handled by device
     *
     * Returns:
-    * -  0 if successfull
+    * -  0 if successful
     * - -1 if fix gpu not found
     * - -3 if there is an out of memory error
     * - -4 if the GPU library was not compiled for GPU
diff --git a/lib/gpu/lal_sw.h b/lib/gpu/lal_sw.h
index 3546f02eb7..1a2e025ae0 100644
--- a/lib/gpu/lal_sw.h
+++ b/lib/gpu/lal_sw.h
@@ -32,7 +32,7 @@ class SW : public BaseThree<numtyp, acctyp> {
     * \param gpu_split fraction of particles handled by device
     *
     * Returns:
-    * -  0 if successfull
+    * -  0 if successful
     * - -1 if fix gpu not found
     * - -3 if there is an out of memory error
     * - -4 if the GPU library was not compiled for GPU
diff --git a/lib/gpu/lal_table.h b/lib/gpu/lal_table.h
index f667336679..38ae012bee 100644
--- a/lib/gpu/lal_table.h
+++ b/lib/gpu/lal_table.h
@@ -32,7 +32,7 @@ class Table : public BaseAtomic<numtyp, acctyp> {
     * \param gpu_split fraction of particles handled by device
     *
     * Returns:
-    * -  0 if successfull
+    * -  0 if successful
     * - -1 if fix gpu not found
     * - -3 if there is an out of memory error
     * - -4 if the GPU library was not compiled for GPU
diff --git a/lib/gpu/lal_tersoff.h b/lib/gpu/lal_tersoff.h
index fd01af031a..51e64c987b 100644
--- a/lib/gpu/lal_tersoff.h
+++ b/lib/gpu/lal_tersoff.h
@@ -32,7 +32,7 @@ class Tersoff : public BaseThree<numtyp, acctyp> {
     * \param gpu_split fraction of particles handled by device
     *
     * Returns:
-    * -  0 if successfull
+    * -  0 if successful
     * - -1 if fix gpu not found
     * - -3 if there is an out of memory error
     * - -4 if the GPU library was not compiled for GPU
diff --git a/lib/gpu/lal_tersoff_mod.h b/lib/gpu/lal_tersoff_mod.h
index ab1560d951..29a561c71d 100644
--- a/lib/gpu/lal_tersoff_mod.h
+++ b/lib/gpu/lal_tersoff_mod.h
@@ -32,7 +32,7 @@ class TersoffMod : public BaseThree<numtyp, acctyp> {
     * \param gpu_split fraction of particles handled by device
     *
     * Returns:
-    * -  0 if successfull
+    * -  0 if successful
     * - -1 if fix gpu not found
     * - -3 if there is an out of memory error
     * - -4 if the GPU library was not compiled for GPU
diff --git a/lib/gpu/lal_tersoff_zbl.h b/lib/gpu/lal_tersoff_zbl.h
index 0e6cac9587..eb03e9fb02 100644
--- a/lib/gpu/lal_tersoff_zbl.h
+++ b/lib/gpu/lal_tersoff_zbl.h
@@ -32,7 +32,7 @@ class TersoffZBL : public BaseThree<numtyp, acctyp> {
     * \param gpu_split fraction of particles handled by device
     *
     * Returns:
-    * -  0 if successfull
+    * -  0 if successful
     * - -1 if fix gpu not found
     * - -3 if there is an out of memory error
     * - -4 if the GPU library was not compiled for GPU
diff --git a/lib/gpu/lal_ufm.h b/lib/gpu/lal_ufm.h
index aeeaacbe99..65ee15d5b5 100644
--- a/lib/gpu/lal_ufm.h
+++ b/lib/gpu/lal_ufm.h
@@ -34,7 +34,7 @@ class UFM : public BaseAtomic<numtyp, acctyp> {
     * \param gpu_split fraction of particles handled by device
     * 
     * Returns:
-    * -  0 if successfull
+    * -  0 if successful
     * - -1 if fix gpu not found
     * - -3 if there is an out of memory error
     * - -4 if the GPU library was not compiled for GPU
diff --git a/lib/gpu/lal_vashishta.h b/lib/gpu/lal_vashishta.h
index c5c96a5b80..2da7a11e1e 100644
--- a/lib/gpu/lal_vashishta.h
+++ b/lib/gpu/lal_vashishta.h
@@ -32,7 +32,7 @@ class Vashishta : public BaseThree<numtyp, acctyp> {
     * \param gpu_split fraction of particles handled by device
     *
     * Returns:
-    * -  0 if successfull
+    * -  0 if successful
     * - -1 if fix gpu not found
     * - -3 if there is an out of memory error
     * - -4 if the GPU library was not compiled for GPU
diff --git a/lib/gpu/lal_yukawa.h b/lib/gpu/lal_yukawa.h
index 4cc23c03e9..7d638d760e 100644
--- a/lib/gpu/lal_yukawa.h
+++ b/lib/gpu/lal_yukawa.h
@@ -32,7 +32,7 @@ class Yukawa : public BaseAtomic<numtyp, acctyp> {
     * \param gpu_split fraction of particles handled by device
     *
     * Returns:
-    * -  0 if successfull
+    * -  0 if successful
     * - -1 if fix gpu not found
     * - -3 if there is an out of memory error
     * - -4 if the GPU library was not compiled for GPU
diff --git a/lib/gpu/lal_yukawa_colloid.h b/lib/gpu/lal_yukawa_colloid.h
index ba69bc4bae..607bc42321 100644
--- a/lib/gpu/lal_yukawa_colloid.h
+++ b/lib/gpu/lal_yukawa_colloid.h
@@ -32,7 +32,7 @@ class YukawaColloid : public BaseAtomic<numtyp, acctyp> {
     * \param gpu_split fraction of particles handled by device
     *
     * Returns:
-    * -  0 if successfull
+    * -  0 if successful
     * - -1 if fix gpu not found
     * - -3 if there is an out of memory error
     * - -4 if the GPU library was not compiled for GPU
diff --git a/lib/gpu/lal_zbl.h b/lib/gpu/lal_zbl.h
index 9885fcedf2..e205d326c6 100644
--- a/lib/gpu/lal_zbl.h
+++ b/lib/gpu/lal_zbl.h
@@ -32,7 +32,7 @@ class ZBL : public BaseAtomic<numtyp, acctyp> {
     * \param gpu_split fraction of particles handled by device
     *
     * Returns:
-    * -  0 if successfull
+    * -  0 if successful
     * - -1 if fix gpu not found
     * - -3 if there is an out of memory error
     * - -4 if the GPU library was not compiled for GPU
diff --git a/lib/h5md/README b/lib/h5md/README
index fb7d82bfcc..4768b50697 100644
--- a/lib/h5md/README
+++ b/lib/h5md/README
@@ -19,7 +19,7 @@ ch5md is a set of C routines to manipulate H5MD files. H5MD is a file format
 specification based on [HDF5](http://www.hdfgroup.org/HDF5/) for storing
 molecular data, whose development is found at <http://nongnu.org/h5md/>.
 
-ch5md is developped by Pierre de Buyl and is released under the 3-clause BSD
+ch5md is developed by Pierre de Buyl and is released under the 3-clause BSD
 license that can be found in the file LICENSE.
 
 To use the h5md dump style in lammps, execute
diff --git a/lib/kokkos/BUILD.md b/lib/kokkos/BUILD.md
new file mode 100644
index 0000000000..84a1bc3b37
--- /dev/null
+++ b/lib/kokkos/BUILD.md
@@ -0,0 +1,323 @@
+![Kokkos](https://avatars2.githubusercontent.com/u/10199860?s=200&v=4)
+
+# Installing and Using Kokkos
+
+## Kokkos Philosophy
+Kokkos provides a modern CMake style build system.
+As C++ continues to develop for C++20 and beyond, CMake is likely to provide the most robust support
+for C++.  Applications heavily leveraging Kokkos are strongly encouraged to use a CMake build system.
+
+You can either use Kokkos as an installed package (encouraged) or use Kokkos in-tree in your project.
+Modern CMake is exceedingly simple at a high-level (with the devil in the details).
+Once Kokkos is installed In your `CMakeLists.txt` simply use:
+````
+find_package(Kokkos REQUIRED)
+````
+Then for every executable or library in your project:
+````
+target_link_libraries(myTarget Kokkos::kokkos)
+````
+That's it! There is no checking Kokkos preprocessor, compiler, or linker flags.
+Kokkos propagates all the necessary flags to your project.
+This means not only is linking to Kokkos easy, but Kokkos itself can actually configure compiler and linker flags for *your*
+project. If building in-tree, there is no `find_package` and you link with `target_link_libraries(kokkos)`.
+
+
+## Configuring CMake
+A very basic installation is done with:
+````
+cmake ${srcdir} \
+ -DCMAKE_CXX_COMPILER=g++ \
+ -DCMAKE_INSTALL_PREFIX=${my_install_folder}
+````
+which builds and installed a default Kokkos when you run `make install`.
+There are numerous device backends, options, and architecture-specific optimizations that can be configured, e.g.
+````
+cmake ${srcdir} \
+ -DCMAKE_CXX_COMPILER=g++ \
+ -DCMAKE_INSTALL_PREFIX=${my_install_folder} \
+ -DKokkos_ENABLE_OPENMP=On
+````
+which activates the OpenMP backend. All of the options controlling device backends, options, architectures, and third-party libraries (TPLs) are given below.
+
+## Spack
+An alternative to manually building with the CMake is to use the Spack package manager.
+To do so, download the `kokkos-spack` git repo and add to the package list:
+````
+spack repo add $path-to-kokkos-spack
+````
+A basic installation would be done as:
+````
+spack install kokkos
+````
+Spack allows options and and compilers to be tuned in the install command.
+````
+spack install kokkos@3.0 %gcc@7.3.0 +openmp
+````
+This example illustrates the three most common parameters to Spack:
+* Variants: specified with, e.g. `+openmp`, this activates (or deactivates with, e.g. `~openmp`) certain options.
+* Version:  immediately following `kokkos` the `@version` can specify a particular Kokkos to build
+* Compiler: a default compiler will be chosen if not specified, but an exact compiler version can be given with the `%`option.
+
+For a complete list of Kokkos options, run:
+````
+spack info kokkos
+````
+
+#### Spack Development
+Spack currently installs packages to a location determined by a unique hash. This hash name is not really "human readable".
+Generally, Spack usage should never really require you to reference the computer-generated unique install folder.
+If you must know, you can locate Spack Kokkos installations with:
+````
+spack find -p kokkos ...
+````
+where `...` is the unique spec identifying the particular Kokkos configuration and version.
+
+A better way to use Spack for doing Kokkos development is the DIY feature of Spack.
+If you wish to develop Kokkos itself, go to the Kokkos source folder:
+````
+spack diy -u cmake kokkos@diy ...
+````
+where `...` is a Spack spec identifying the exact Kokkos configuration.
+This then creates a `spack-build` directory where you can run `make`.
+
+If doing development on a downstream project, you can do almost exactly the same thing.
+````
+spack diy -u cmake ${myproject}@${myversion} ... ^kokkos...
+````
+where the `...` are the specs for your project and the desired Kokkos configuration.
+Again, a `spack-build` directory will be created where you can run `make`.
+
+Spack has a few idiosyncracies that make building outside of Spack annoying related to Spack forcing use of a compiler wrapper. This can be worked around by having a `-DSpack_WORKAROUND=On` given your CMake. Then add the block of code to your CMakeLists.txt:
+
+````
+if (Spack_WORKAROUND)
+ set(SPACK_CXX $ENV{SPACK_CXX})
+ if(SPACK_CXX)
+   set(CMAKE_CXX_COMPILER ${SPACK_CXX} CACHE STRING "the C++ compiler" FORCE)
+   set(ENV{CXX} ${SPACK_CXX})
+ endif()
+endif()
+````
+
+# Kokkos Keyword Listing
+
+## Device Backends
+Device backends can be enabled by specifying `-DKokkos_ENABLE_X`.
+
+* Kokkos_ENABLE_CUDA
+    * Whether to build CUDA backend
+    * BOOL Default: OFF
+* Kokkos_ENABLE_HPX
+    * Whether to build HPX backend (experimental)
+    * BOOL Default: OFF
+* Kokkos_ENABLE_OPENMP
+    * Whether to build OpenMP backend
+    * BOOL Default: OFF
+* Kokkos_ENABLE_PTHREAD
+    * Whether to build Pthread backend
+    * BOOL Default: OFF
+* Kokkos_ENABLE_SERIAL
+    * Whether to build serial  backend
+    * BOOL Default: ON
+
+## Enable Options
+Options can be enabled by specifying `-DKokkos_ENABLE_X`.
+
+* Kokkos_ENABLE_AGGRESSIVE_VECTORIZATION
+    * Whether to aggressively vectorize loops
+    * BOOL Default: OFF
+* Kokkos_ENABLE_COMPILER_WARNINGS
+    * Whether to print all compiler warnings
+    * BOOL Default: OFF
+* Kokkos_ENABLE_CUDA_CONSTEXPR
+    * Whether to activate experimental relaxed constexpr functions
+    * BOOL Default: OFF
+* Kokkos_ENABLE_CUDA_LAMBDA
+    * Whether to activate experimental lambda features
+    * BOOL Default: OFF
+* Kokkos_ENABLE_CUDA_LDG_INTRINSIC
+    * Whether to use CUDA LDG intrinsics
+    * BOOL Default: OFF
+* Kokkos_ENABLE_CUDA_RELOCATABLE_DEVICE_CODE
+    * Whether to enable relocatable device code (RDC) for CUDA
+    * BOOL Default: OFF
+* Kokkos_ENABLE_CUDA_UVM
+    * Whether to use unified memory (UM) by default for CUDA
+    * BOOL Default: OFF
+* Kokkos_ENABLE_DEBUG
+    * Whether to activate extra debug features - may increase compile times
+    * BOOL Default: OFF
+* Kokkos_ENABLE_DEBUG_BOUNDS_CHECK
+    * Whether to use bounds checking - will increase runtime
+    * BOOL Default: OFF
+* Kokkos_ENABLE_DEBUG_DUALVIEW_MODIFY_CHECK
+    * Debug check on dual views
+    * BOOL Default: OFF
+* Kokkos_ENABLE_DEPRECATED_CODE
+    * Whether to enable deprecated code
+    * BOOL Default: OFF
+* Kokkos_ENABLE_HPX_ASYNC_DISPATCH
+    * Whether HPX supports asynchronous dispatch
+    * BOOL Default: OFF
+* Kokkos_ENABLE_LARGE_MEM_TESTS
+    * Whether to perform extra large memory tests
+    * BOOL_Default: OFF
+* Kokkos_ENABLE_PROFILING
+    * Whether to create bindings for profiling tools
+    * BOOL Default: ON
+* Kokkos_ENABLE_PROFILING_LOAD_PRINT
+    * Whether to print information about which profiling tools gotloaded
+    * BOOL Default: OFF
+* Kokkos_ENABLE_TESTS
+    * Whether to build serial  backend
+    * BOOL Default: OFF
+
+## Other Options
+* Kokkos_CXX_STANDARD
+    * The C++ standard for Kokkos to use: c++11, c++14, c++17, or c++20. This should be given in CMake style as 11, 14, 17, or 20.
+    * STRING Default: 11
+
+## Third-party Libraries (TPLs)
+The following options control enabling TPLs:
+* Kokkos_ENABLE_HPX
+    * Whether to enable the HPX library
+    * BOOL Default: OFF
+* Kokkos_ENABLE_HWLOC
+    * Whether to enable the HWLOC library
+    * BOOL Default: Off
+* Kokkos_ENABLE_LIBNUMA
+    * Whether to enable the LIBNUMA library
+    * BOOL Default: Off
+* Kokkos_ENABLE_MEMKIND
+    * Whether to enable the MEMKIND library
+    * BOOL Default: Off
+* Kokkos_ENABLE_LIBDL
+    * Whether to enable the LIBDL library
+    * BOOL Default: On
+* Kokkos_ENABLE_LIBRT
+    * Whether to enable the LIBRT library
+    * BOOL Default: Off
+
+The following options control finding and configuring non-CMake TPLs:
+* Kokkos_CUDA_DIR or CUDA_ROOT
+    * Location of CUDA install prefix for libraries
+    * PATH Default:
+* Kokkos_HWLOC_DIR or HWLOC_ROOT
+    * Location of HWLOC install prefix
+    * PATH Default:
+* Kokkos_LIBNUMA_DIR or LIBNUMA_ROOT
+    * Location of LIBNUMA install prefix
+    * PATH Default:
+* Kokkos_MEMKIND_DIR or MEMKIND_ROOT
+    * Location of MEMKIND install prefix
+    * PATH Default:
+* Kokkos_LIBDL_DIR or LIBDL_ROOT
+    * Location of LIBDL install prefix
+    * PATH Default:
+* Kokkos_LIBRT_DIR or LIBRT_ROOT
+    * Location of LIBRT install prefix
+    * PATH Default:
+
+The following options control `find_package` paths for CMake-based TPLs:
+* HPX_DIR or HPX_ROOT
+    * Location of HPX prefix (ROOT) or CMake config file (DIR)
+    * PATH Default:
+
+## Architecture Keywords
+Architecture-specific optimizations can be enabled by specifying `-DKokkos_ARCH_X`.
+
+* Kokkos_ARCH_AMDAVX
+    * Whether to optimize for the AMDAVX architecture
+    * BOOL Default: OFF
+* Kokkos_ARCH_ARMV80
+    * Whether to optimize for the ARMV80 architecture
+    * BOOL Default: OFF
+* Kokkos_ARCH_ARMV81
+    * Whether to optimize for the ARMV81 architecture
+    * BOOL Default: OFF
+* Kokkos_ARCH_ARMV8_THUNDERX
+    * Whether to optimize for the ARMV8_THUNDERX architecture
+    * BOOL Default: OFF
+* Kokkos_ARCH_ARMV8_TX2
+    * Whether to optimize for the ARMV8_TX2 architecture
+    * BOOL Default: OFF
+* Kokkos_ARCH_BDW
+    * Whether to optimize for the BDW architecture
+    * BOOL Default: OFF
+* Kokkos_ARCH_BGQ
+    * Whether to optimize for the BGQ architecture
+    * BOOL Default: OFF
+* Kokkos_ARCH_EPYC
+    * Whether to optimize for the EPYC architecture
+    * BOOL Default: OFF
+* Kokkos_ARCH_HSW
+    * Whether to optimize for the HSW architecture
+    * BOOL Default: OFF
+* Kokkos_ARCH_KEPLER30
+    * Whether to optimize for the KEPLER30 architecture
+    * BOOL Default: OFF
+* Kokkos_ARCH_KEPLER32
+    * Whether to optimize for the KEPLER32 architecture
+    * BOOL Default: OFF
+* Kokkos_ARCH_KEPLER35
+    * Whether to optimize for the KEPLER35 architecture
+    * BOOL Default: OFF
+* Kokkos_ARCH_KEPLER37
+    * Whether to optimize for the KEPLER37 architecture
+    * BOOL Default: OFF
+* Kokkos_ARCH_KNC
+    * Whether to optimize for the KNC architecture
+    * BOOL Default: OFF
+* Kokkos_ARCH_KNL
+    * Whether to optimize for the KNL architecture
+    * BOOL Default: OFF
+* Kokkos_ARCH_MAXWELL50
+    * Whether to optimize for the MAXWELL50 architecture
+    * BOOL Default: OFF
+* Kokkos_ARCH_MAXWELL52
+    * Whether to optimize for the MAXWELL52 architecture
+    * BOOL Default: OFF
+* Kokkos_ARCH_MAXWELL53
+    * Whether to optimize for the MAXWELL53 architecture
+    * BOOL Default: OFF
+* Kokkos_ARCH_PASCAL60
+    * Whether to optimize for the PASCAL60 architecture
+    * BOOL Default: OFF
+* Kokkos_ARCH_PASCAL61
+    * Whether to optimize for the PASCAL61 architecture
+    * BOOL Default: OFF
+* Kokkos_ARCH_POWER7
+    * Whether to optimize for the POWER7 architecture
+    * BOOL Default: OFF
+* Kokkos_ARCH_POWER8
+    * Whether to optimize for the POWER8 architecture
+    * BOOL Default: OFF
+* Kokkos_ARCH_POWER9
+    * Whether to optimize for the POWER9 architecture
+    * BOOL Default: OFF
+* Kokkos_ARCH_SKX
+    * Whether to optimize for the SKX architecture
+    * BOOL Default: OFF
+* Kokkos_ARCH_SNB
+    * Whether to optimize for the SNB architecture
+    * BOOL Default: OFF
+* Kokkos_ARCH_TURING75
+    * Whether to optimize for the TURING75 architecture
+    * BOOL Default: OFF
+* Kokkos_ARCH_VOLTA70
+    * Whether to optimize for the VOLTA70 architecture
+    * BOOL Default: OFF
+* Kokkos_ARCH_VOLTA72
+    * Whether to optimize for the VOLTA72 architecture
+    * BOOL Default: OFF
+* Kokkos_ARCH_WSM
+    * Whether to optimize for the WSM architecture
+    * BOOL Default: OFF
+
+##### [LICENSE](https://github.com/kokkos/kokkos/blob/devel/LICENSE)
+
+[![License](https://img.shields.io/badge/License-BSD%203--Clause-blue.svg)](https://opensource.org/licenses/BSD-3-Clause)
+
+Under the terms of Contract DE-NA0003525 with NTESS,
+the U.S. Government retains certain rights in this software.
diff --git a/lib/kokkos/CHANGELOG.md b/lib/kokkos/CHANGELOG.md
index 8d196e2c35..1d54b4c21d 100644
--- a/lib/kokkos/CHANGELOG.md
+++ b/lib/kokkos/CHANGELOG.md
@@ -1,5 +1,45 @@
 # Change Log
 
+## [3.0.00](https://github.com/kokkos/kokkos/tree/3.0.00) (2020-01-27)
+[Full Changelog](https://github.com/kokkos/kokkos/compare/2.9.00...3.0.00)
+
+**Implemented enhancements:**
+
+- BuildSystem: Standalone Modern CMake Support [\#2104](https://github.com/kokkos/kokkos/issues/2104)
+- StyleFormat: ClangFormat Style [\#2157](https://github.com/kokkos/kokkos/issues/2157)
+- Documentation: Document build system and CMake philosophy [\#2263](https://github.com/kokkos/kokkos/issues/2263)
+- BuildSystem: Add Alias with Namespace Kokkos:: to Interal Libraries [\#2530](https://github.com/kokkos/kokkos/issues/2530)
+- BuildSystem: Universal Kokkos find\_package [\#2099](https://github.com/kokkos/kokkos/issues/2099)
+- BuildSystem: Dropping support for Kokkos\_{DEVICES,OPTIONS,ARCH} in CMake [\#2329](https://github.com/kokkos/kokkos/issues/2329)
+- BuildSystem: Set Kokkos\_DEVICES and Kokkos\_ARCH variables in exported CMake configuration [\#2193](https://github.com/kokkos/kokkos/issues/2193)
+- BuildSystem: Drop support for CUDA 7 and CUDA 8 [\#2489](https://github.com/kokkos/kokkos/issues/2489)
+- BuildSystem: Drop CMake option SEPARATE\_TESTS [\#2266](https://github.com/kokkos/kokkos/issues/2266)
+- BuildSystem: Support expt-relaxed-constexpr same as expt-extended-lambda [\#2411](https://github.com/kokkos/kokkos/issues/2411)
+- BuildSystem: Add Xnvlink to command line options allowed in nvcc\_wrapper [\#2197](https://github.com/kokkos/kokkos/issues/2197)
+- BuildSystem: Install Kokkos config files and target files to lib/cmake/Kokkos [\#2162](https://github.com/kokkos/kokkos/issues/2162)
+- BuildSystem: nvcc\_wrappers and c++ 14 [\#2035](https://github.com/kokkos/kokkos/issues/2035)
+- BuildSystem: Kokkos version major/version minor \(Feature request\) [\#1930](https://github.com/kokkos/kokkos/issues/1930)
+- BuildSystem: CMake namespaces \(and other modern cmake cleanup\) [\#1924](https://github.com/kokkos/kokkos/issues/1924)
+- BuildSystem: Remove capability to install Kokkos via GNU Makefiles [\#2332](https://github.com/kokkos/kokkos/issues/2332)
+- Documentation: Remove PDF ProgrammingGuide in Kokkos replace with link [\#2244](https://github.com/kokkos/kokkos/issues/2244)
+- View: Add Method to Resize View without Initialization [\#2048](https://github.com/kokkos/kokkos/issues/2048)
+- Vector: implement “insert” method for Kokkos\_Vector  \(as a serial function on host\) [\#2437](https://github.com/kokkos/kokkos/issues/2437)
+
+**Fixed bugs:**
+
+- ParallelScan: Kokkos::parallel\scan fix race condition seen in inter-block fence [\#2681](https://github.com/kokkos/kokkos/issues/2681)
+- OffsetView: Kokkos::OffsetView missing constructor which takes pointer [\#2247](https://github.com/kokkos/kokkos/issues/2247)
+- OffsetView: Kokkos::OffsetView: allow offset=0 [\#2246](https://github.com/kokkos/kokkos/issues/2246)
+- DeepCopy: Missing DeepCopy instrumentation in Kokkos [\#2522](https://github.com/kokkos/kokkos/issues/2522)
+- nvcc\_wrapper: --host-only fails with multiple -W\* flags [\#2484](https://github.com/kokkos/kokkos/issues/2484)
+- nvcc\_wrapper: taking first -std option is counterintuitive [\#2553](https://github.com/kokkos/kokkos/issues/2553)
+- Subview: Error taking subviews of views with static_extents of min rank [\#2448](https://github.com/kokkos/kokkos/issues/2448)
+- TeamPolicy: reducers with valuetypes without += broken on CUDA [\#2410](https://github.com/kokkos/kokkos/issues/2410)
+- Libs: Fix inconsistency of Kokkos library names in Kokkos and Trilinos [\#1902](https://github.com/kokkos/kokkos/issues/1902)
+- Complex: operator\>\> for complex\<T\> uses std::ostream, not std::istream [\#2313](https://github.com/kokkos/kokkos/issues/2313)
+- Macros: Restrict not honored for non-intel compilers  [\#1922](https://github.com/kokkos/kokkos/issues/1922)
+
+
 ## [2.9.00](https://github.com/kokkos/kokkos/tree/2.9.00) (2019-06-24)
 [Full Changelog](https://github.com/kokkos/kokkos/compare/2.8.00...2.9.00)
 
diff --git a/lib/kokkos/CMakeLists.txt b/lib/kokkos/CMakeLists.txt
index 236f523aec..6a4451b2e7 100644
--- a/lib/kokkos/CMakeLists.txt
+++ b/lib/kokkos/CMakeLists.txt
@@ -1,128 +1,218 @@
-# Is this a build as part of Trilinos?
 
+# We want to determine if options are given with the wrong case
+# In order to detect which arguments are given to compare against
+# the list of valid arguments, at the beginning here we need to
+# form a list of all the given variables. If it begins with any 
+# case of KoKkOS, we add it to the list.
+
+
+GET_CMAKE_PROPERTY(_variableNames VARIABLES)
+SET(KOKKOS_GIVEN_VARIABLES)
+FOREACH (var ${_variableNames})
+  STRING(TOUPPER ${var} UC_VAR)
+  STRING(FIND ${UC_VAR} KOKKOS IDX)
+  IF (${IDX} EQUAL 0)
+    LIST(APPEND KOKKOS_GIVEN_VARIABLES ${var})
+  ENDIF()
+ENDFOREACH()
+
+# Basic initialization (Used in KOKKOS_SETTINGS)
+SET(Kokkos_SOURCE_DIR    ${CMAKE_CURRENT_SOURCE_DIR})
+SET(KOKKOS_SOURCE_DIR    ${CMAKE_CURRENT_SOURCE_DIR})
+SET(KOKKOS_SRC_PATH      ${Kokkos_SOURCE_DIR})
+SET(KOKKOS_PATH          ${Kokkos_SOURCE_DIR})
+SET(KOKKOS_TOP_BUILD_DIR ${CMAKE_CURRENT_BINARY_DIR})
+
+# Needed to simplify syntax of if statements
+CMAKE_POLICY(SET CMP0054 NEW)
+
+# Is this a build as part of Trilinos?
 IF(COMMAND TRIBITS_PACKAGE_DECL)
-  SET(KOKKOS_HAS_TRILINOS ON CACHE BOOL "")
+  SET(KOKKOS_HAS_TRILINOS ON)
 ELSE()
-  SET(KOKKOS_HAS_TRILINOS OFF CACHE BOOL "")
+  SET(KOKKOS_HAS_TRILINOS OFF)
 ENDIF()
 
-IF(NOT KOKKOS_HAS_TRILINOS)
-  cmake_minimum_required(VERSION 3.3 FATAL_ERROR)
+INCLUDE(${KOKKOS_SRC_PATH}/cmake/kokkos_functions.cmake)
+INCLUDE(${KOKKOS_SRC_PATH}/cmake/kokkos_pick_cxx_std.cmake)
 
-  # Define Project Name if this is a standalone build
-  IF(NOT DEFINED ${PROJECT_NAME})
-    project(Kokkos CXX)
+SET(KOKKOS_ENABLED_OPTIONS)      #exported in config file
+SET(KOKKOS_ENABLED_DEVICES)      #exported in config file
+SET(KOKKOS_ENABLED_TPLS)         #exported in config file
+SET(KOKKOS_ENABLED_ARCH_LIST)    #exported in config file
+
+#These are helper flags used for sanity checks during config
+#Certain features should depend on other features being configured first
+SET(KOKKOS_CFG_DAG_NONE              On) #sentinel to indicate no dependencies
+SET(KOKKOS_CFG_DAG_DEVICES_DONE      Off)
+SET(KOKKOS_CFG_DAG_OPTIONS_DONE      Off)
+SET(KOKKOS_CFG_DAG_ARCH_DONE         Off)
+SET(KOKKOS_CFG_DAG_CXX_STD_DONE      Off)
+SET(KOKKOS_CFG_DAG_COMPILER_ID_DONE  Off)
+FUNCTION(KOKKOS_CFG_DEPENDS SUCCESSOR PRECURSOR)
+  SET(PRE_FLAG  KOKKOS_CFG_DAG_${PRECURSOR})
+  SET(POST_FLAG KOKKOS_CFG_DAG_${SUCCESSOR})
+  IF (NOT ${PRE_FLAG})
+    MESSAGE(FATAL_ERROR "Bad CMake refactor: feature ${SUCCESSOR} cannot be configured until ${PRECURSOR} is configured")
   ENDIF()
+  GLOBAL_SET(${POST_FLAG} On)
+ENDFUNCTION()
 
-  # Basic initialization (Used in KOKKOS_SETTINGS)
-  set(KOKKOS_SRC_PATH ${Kokkos_SOURCE_DIR})
-  set(KOKKOS_PATH ${KOKKOS_SRC_PATH})
 
-  #------------ COMPILER AND FEATURE CHECKS ------------------------------------
-  include(${KOKKOS_SRC_PATH}/cmake/kokkos_functions.cmake)
-  set_kokkos_cxx_compiler()
-  set_kokkos_cxx_standard()
+LIST(APPEND CMAKE_MODULE_PATH cmake/Modules)
 
-  #------------ GET OPTIONS AND KOKKOS_SETTINGS --------------------------------
-  # Add Kokkos' modules to CMake's module path.
-  set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${Kokkos_SOURCE_DIR}/cmake/Modules/")
+IF(NOT KOKKOS_HAS_TRILINOS)
+  cmake_minimum_required(VERSION 3.10 FATAL_ERROR)
+  set(CMAKE_DISABLE_SOURCE_CHANGES ON)
+  set(CMAKE_DISABLE_IN_SOURCE_BUILD ON)
+  IF (Spack_WORKAROUND) 
+    #if we are explicitly using Spack for development,
+    #nuke the Spack compiler
+    SET(SPACK_CXX $ENV{SPACK_CXX})
+    IF(SPACK_CXX)
+      SET(CMAKE_CXX_COMPILER ${SPACK_CXX} CACHE STRING "the C++ compiler" FORCE)
+      SET(ENV{CXX} ${SPACK_CXX})
+    ENDIF()
+  ENDif()
+  IF(NOT DEFINED ${PROJECT_NAME})
+    PROJECT(Kokkos CXX)
+  ENDIF()
+ENDIF()
 
-  set(KOKKOS_CMAKE_VERBOSE True)
-  include(${KOKKOS_SRC_PATH}/cmake/kokkos_options.cmake)
+IF (NOT CMAKE_SIZEOF_VOID_P)
+  STRING(FIND ${CMAKE_CXX_COMPILER} nvcc_wrapper FIND_IDX)
+  IF (NOT FIND_IDX STREQUAL -1)
+    MESSAGE(FATAL_ERROR "Kokkos did not configure correctly and failed to validate compiler. The most likely cause is CUDA linkage using nvcc_wrapper. Please ensure your CUDA environment is correctly configured.")
+  ELSE()
+    MESSAGE(FATAL_ERROR "Kokkos did not configure correctly and failed to validate compiler. The most likely cause is linkage errors during CMake compiler validation. Please consult the CMake error log shown below for the exact error during compiler validation")
+  ENDIF()
+ELSEIF (NOT CMAKE_SIZEOF_VOID_P EQUAL 8)
+  MESSAGE(FATAL_ERROR "Kokkos assumes a 64-bit build; i.e., 8-byte pointers, but found ${CMAKE_SIZEOF_VOID_P}-byte pointers instead")
+ENDIF()
 
-  include(${KOKKOS_SRC_PATH}/cmake/kokkos_settings.cmake)
 
-  #------------ GENERATE HEADER AND SOURCE FILES -------------------------------
-  execute_process(
-    COMMAND ${KOKKOS_SETTINGS} make -f ${KOKKOS_SRC_PATH}/cmake/Makefile.generate_cmake_settings CXX=${CMAKE_CXX_COMPILER} PREFIX=${CMAKE_INSTALL_PREFIX} generate_build_settings
-    WORKING_DIRECTORY "${Kokkos_BINARY_DIR}"
-    OUTPUT_FILE ${Kokkos_BINARY_DIR}/core_src_make.out
-    RESULT_VARIABLE GEN_SETTINGS_RESULT
-  )
-  if (GEN_SETTINGS_RESULT)
-    message(FATAL_ERROR "Kokkos settings generation failed:\n"
-        "${KOKKOS_SETTINGS} make -f ${KOKKOS_SRC_PATH}/cmake/Makefile.generate_cmake_settings CXX=${CMAKE_CXX_COMPILER} generate_build_settings")
-  endif()
-  include(${Kokkos_BINARY_DIR}/kokkos_generated_settings.cmake)
-  install(FILES ${Kokkos_BINARY_DIR}/kokkos_generated_settings.cmake DESTINATION lib/cmake/Kokkos)
-  install(FILES ${Kokkos_BINARY_DIR}/kokkos_generated_settings.cmake DESTINATION ${CMAKE_INSTALL_PREFIX})
-  string(REPLACE " " ";" KOKKOS_TPL_INCLUDE_DIRS "${KOKKOS_GMAKE_TPL_INCLUDE_DIRS}")
-  string(REPLACE " " ";" KOKKOS_TPL_LIBRARY_DIRS "${KOKKOS_GMAKE_TPL_LIBRARY_DIRS}")
-  string(REPLACE " " ";" KOKKOS_TPL_LIBRARY_NAMES "${KOKKOS_GMAKE_TPL_LIBRARY_NAMES}")
-  list(REMOVE_ITEM KOKKOS_TPL_INCLUDE_DIRS "")
-  list(REMOVE_ITEM KOKKOS_TPL_LIBRARY_DIRS "")
-  list(REMOVE_ITEM KOKKOS_TPL_LIBRARY_NAMES "")
-  set_kokkos_srcs(KOKKOS_SRC ${KOKKOS_SRC})
+set(Kokkos_VERSION_MAJOR 3)
+set(Kokkos_VERSION_MINOR 0)
+set(Kokkos_VERSION_PATCH 0)
+set(Kokkos_VERSION "${Kokkos_VERSION_MAJOR}.${Kokkos_VERSION_MINOR}.${Kokkos_VERSION_PATCH}")
 
-  #------------ NOW BUILD ------------------------------------------------------
-  include(${KOKKOS_SRC_PATH}/cmake/kokkos_build.cmake)
+IF(${CMAKE_VERSION} VERSION_GREATER_EQUAL "3.12.0") 
+  MESSAGE(STATUS "Setting policy CMP0074 to use <Package>_ROOT variables")
+  CMAKE_POLICY(SET CMP0074 NEW)
+ENDIF()
 
-  #------------ Add in Fake Tribits Handling to allow unit test builds- --------
+# Load either the real TriBITS or a TriBITS wrapper 
+# for certain utility functions that are universal (like GLOBAL_SET)
+INCLUDE(${KOKKOS_SRC_PATH}/cmake/fake_tribits.cmake)
 
-  include(${KOKKOS_SRC_PATH}/cmake/tribits.cmake)
+IF (Kokkos_ENABLE_CUDA AND ${CMAKE_VERSION} VERSION_GREATER_EQUAL "3.14.0")
+  #If we are building CUDA, we have tricked CMake because we declare a CXX project
+  #If the default C++ standard for a given compiler matches the requested
+  #standard, then CMake just omits the -std flag in later versions of CMake
+  #This breaks CUDA compilation (CUDA compiler can have a different default
+  #-std then the underlying host compiler by itself). Setting this variable
+  #forces CMake to always add the -std flag even if it thinks it doesn't need it
+  GLOBAL_SET(CMAKE_CXX_STANDARD_DEFAULT 98)
+ENDIF()
 
-  TRIBITS_PACKAGE_DECL(Kokkos)
+# These are the variables we will append to as we go
+# I really wish these were regular variables
+# but scoping issues can make it difficult
+GLOBAL_RESET(KOKKOS_COMPILE_OPTIONS)
+GLOBAL_RESET(KOKKOS_LINK_OPTIONS)
+GLOBAL_RESET(KOKKOS_CUDA_OPTIONS)
+GLOBAL_RESET(KOKKOS_CUDAFE_OPTIONS)
+GLOBAL_RESET(KOKKOS_XCOMPILER_OPTIONS)
+# We need to append text here for making sure TPLs
+# we import are available for an installed Kokkos
+GLOBAL_RESET(KOKKOS_TPL_EXPORTS)
+# We need these for controlling the exact -std flag
+GLOBAL_RESET(KOKKOS_DONT_ALLOW_EXTENSIONS)
+GLOBAL_RESET(KOKKOS_USE_CXX_EXTENSIONS)
+GLOBAL_RESET(KOKKOS_CXX_STANDARD_FEATURE)
 
-  ADD_SUBDIRECTORY(core)
-  ADD_SUBDIRECTORY(containers)
-  ADD_SUBDIRECTORY(algorithms)
+# Include a set of Kokkos-specific wrapper functions that
+# will either call raw CMake or TriBITS
+# These are functions like KOKKOS_INCLUDE_DIRECTORIES
+INCLUDE(${KOKKOS_SRC_PATH}/cmake/kokkos_tribits.cmake)
 
+
+# The build environment setup goes in the following steps
+# 1) Check all the enable options. This includes checking Kokkos_DEVICES
+# 2) Check the compiler ID (type and version)
+# 3) Check the CXX standard and select important CXX flags
+# 4) Check for any third-party libraries (TPLs) like hwloc
+# 5) Check if optimizing for a particular architecture and add arch-specific flags
+KOKKOS_SETUP_BUILD_ENVIRONMENT()
+
+# Finish off the build
+# 6) Recurse into subdirectories and configure individual libraries
+# 7) Export and install targets
+
+OPTION(BUILD_SHARED_LIBS "Build shared libraries" OFF)
+# Workaround for building position independent code.
+IF(BUILD_SHARED_LIBS)
+  SET(CMAKE_POSITION_INDEPENDENT_CODE ON)
+ENDIF()
+
+SET(KOKKOS_EXT_LIBRARIES Kokkos::kokkos Kokkos::kokkoscore Kokkos::kokkoscontainers Kokkos::kokkosalgorithms)
+SET(KOKKOS_INT_LIBRARIES kokkos kokkoscore kokkoscontainers kokkosalgorithms)
+SET_PROPERTY(GLOBAL PROPERTY KOKKOS_INT_LIBRARIES ${KOKKOS_INT_LIBRARIES})
+
+GET_DIRECTORY_PROPERTY(HAS_PARENT PARENT_DIRECTORY)
+IF (KOKKOS_HAS_TRILINOS)
+  SET(TRILINOS_INCDIR ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR})
+  SET(KOKKOS_HEADER_DIR ${TRILINOS_INCDIR})
+  SET(KOKKOS_IS_SUBDIRECTORY TRUE)
+ELSEIF(HAS_PARENT)
+  SET(KOKKOS_HEADER_DIR "include/kokkos")
+  SET(KOKKOS_IS_SUBDIRECTORY TRUE)
 ELSE()
+  SET(KOKKOS_HEADER_DIR "${CMAKE_INSTALL_INCLUDEDIR}")
+  SET(KOKKOS_IS_SUBDIRECTORY FALSE)
+ENDIF()
+
+
+
 #------------------------------------------------------------------------------
 #
 # A) Forward declare the package so that certain options are also defined for
 # subpackages
-#
 
-TRIBITS_PACKAGE_DECL(Kokkos) # ENABLE_SHADOWING_WARNINGS)
+## This restores the old behavior of ProjectCompilerPostConfig.cmake
+# It sets the CMAKE_CXX_FLAGS globally to those used by Kokkos
+# We must do this before KOKKOS_PACKAGE_DECL
+IF (KOKKOS_HAS_TRILINOS)
+  # Overwrite the old flags at the top-level
+  # Because Tribits doesn't use lists, it uses spaces for the list of CXX flags
+  # we have to match the annoying behavior
+  STRING(REPLACE ";" " " KOKKOSCORE_COMPILE_OPTIONS "${KOKKOS_COMPILE_OPTIONS}")
+  STRING(REPLACE ";" " " KOKKOSCORE_CUDA_OPTIONS    "${KOKKOS_CUDA_OPTIONS}")
+  FOREACH(CUDAFE_FLAG ${KOKKOS_CUDAFE_OPTIONS})
+    SET(KOKKOSCORE_CUDAFE_OPTIONS "${KOKKOSCORE_CUDAFE_OPTIONS} -Xcudafe ${CUDAFE_FLAG}")
+  ENDFOREACH()
+  FOREACH(XCOMP_FLAG ${KOKKOS_XCOMPILER_OPTIONS})
+    SET(KOKKOSCORE_XCOMPILER_OPTIONS "${KOKKOSCORE_XCOMPILER_OPTIONS} -Xcompiler ${XCOMP_FLAG}")
+  ENDFOREACH()
+  SET(KOKKOSCORE_CXX_FLAGS "${KOKKOSCORE_COMPILE_OPTIONS} ${CMAKE_CXX${KOKKOS_CXX_STANDARD}_STANDARD_COMPILE_OPTION} ${KOKKOSCORE_CUDA_OPTIONS} ${KOKKOSCORE_CUDAFE_OPTIONS} ${KOKKOSCORE_XCOMPILER_OPTIONS}")
+  # Both parent scope and this package
+  # In ProjectCompilerPostConfig.cmake, we capture the "global" flags Trilinos wants in
+  # TRILINOS_TOPLEVEL_CXX_FLAGS
+  SET(CMAKE_CXX_FLAGS "${TRILINOS_TOPLEVEL_CXX_FLAGS} ${KOKKOSCORE_CXX_FLAGS}" PARENT_SCOPE)
+  SET(CMAKE_CXX_FLAGS "${TRILINOS_TOPLEVEL_CXX_FLAGS} ${KOKKOSCORE_CXX_FLAGS}")
+  #CMAKE_CXX_FLAGS will get added to Kokkos and Kokkos dependencies automatically here
+  #These flags get set up in KOKKOS_PACKAGE_DECL, which means they
+  #must be configured before KOKKOS_PACKAGE_DECL
+ENDIF()
+
+KOKKOS_PACKAGE_DECL()
 
 
 #------------------------------------------------------------------------------
 #
-# B) Install Kokkos' build files
+# D) Process the subpackages (subdirectories) for Kokkos
 #
-# If using the Makefile-generated files, then need to set things up.
-# Here, assume that TriBITS has been run from ProjectCompilerPostConfig.cmake
-# and already generated KokkosCore_config.h and kokkos_generated_settings.cmake
-# in the previously define Kokkos_GEN_DIR
-# We need to copy them over to the correct place and source the cmake file
-
-if(NOT KOKKOS_LEGACY_TRIBITS)
-  set(Kokkos_GEN_DIR ${CMAKE_BINARY_DIR})
-  file(COPY "${Kokkos_GEN_DIR}/KokkosCore_config.h"
-    DESTINATION "${CMAKE_CURRENT_BINARY_DIR}" USE_SOURCE_PERMISSIONS)
-  install(FILES "${Kokkos_GEN_DIR}/KokkosCore_config.h"
-    DESTINATION include)
-  file(COPY "${Kokkos_GEN_DIR}/kokkos_generated_settings.cmake"
-    DESTINATION "${CMAKE_CURRENT_BINARY_DIR}" USE_SOURCE_PERMISSIONS)
-
-  include(${CMAKE_CURRENT_BINARY_DIR}/kokkos_generated_settings.cmake)
-  # Sources come from makefile-generated kokkos_generated_settings.cmake file
-  # Enable using the individual sources if needed
-  set_kokkos_srcs(KOKKOS_SRC ${KOKKOS_SRC})
-endif ()
-
-
-#------------------------------------------------------------------------------
-#
-# C) Install Kokkos' executable scripts
-#
-
-# nvcc_wrapper is Kokkos' wrapper for NVIDIA's NVCC CUDA compiler.
-# Kokkos needs nvcc_wrapper in order to build.  Other libraries and
-# executables also need nvcc_wrapper.  Thus, we need to install it.
-# If the argument of DESTINATION is a relative path, CMake computes it
-# as relative to ${CMAKE_INSTALL_PATH}.
-
-INSTALL(PROGRAMS ${CMAKE_CURRENT_SOURCE_DIR}/bin/nvcc_wrapper DESTINATION bin)
-
-
-#------------------------------------------------------------------------------
-#
-# D) Process the subpackages for Kokkos
-#
-
-TRIBITS_PROCESS_SUBPACKAGES()
+KOKKOS_PROCESS_SUBPACKAGES()
 
 
 #------------------------------------------------------------------------------
@@ -130,10 +220,39 @@ TRIBITS_PROCESS_SUBPACKAGES()
 # E) If Kokkos itself is enabled, process the Kokkos package
 #
 
-TRIBITS_PACKAGE_DEF()
+KOKKOS_PACKAGE_DEF()
+KOKKOS_EXCLUDE_AUTOTOOLS_FILES()
+KOKKOS_PACKAGE_POSTPROCESS()
 
-TRIBITS_EXCLUDE_AUTOTOOLS_FILES()
-
-TRIBITS_PACKAGE_POSTPROCESS()
+#We are ready to configure the header
+CONFIGURE_FILE(cmake/KokkosCore_config.h.in KokkosCore_config.h @ONLY)
 
+IF (NOT KOKKOS_HAS_TRILINOS)
+  ADD_LIBRARY(kokkos INTERFACE)
+  #Make sure in-tree projects can reference this as Kokkos::
+  #to match the installed target names
+  ADD_LIBRARY(Kokkos::kokkos ALIAS kokkos)
+  TARGET_LINK_LIBRARIES(kokkos INTERFACE kokkoscore kokkoscontainers kokkosalgorithms)
+  KOKKOS_INTERNAL_ADD_LIBRARY_INSTALL(kokkos)
+ENDIF()
+INCLUDE(${KOKKOS_SRC_PATH}/cmake/kokkos_install.cmake)
+
+# nvcc_wrapper is Kokkos' wrapper for NVIDIA's NVCC CUDA compiler.
+# Kokkos needs nvcc_wrapper in order to build.  Other libraries and
+# executables also need nvcc_wrapper.  Thus, we need to install it.
+# If the argument of DESTINATION is a relative path, CMake computes it
+# as relative to ${CMAKE_INSTALL_PATH}.
+INSTALL(PROGRAMS ${CMAKE_CURRENT_SOURCE_DIR}/bin/nvcc_wrapper DESTINATION ${CMAKE_INSTALL_BINDIR})
+INSTALL(FILES "${CMAKE_CURRENT_BINARY_DIR}/KokkosCore_config.h" DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
+
+
+#  Finally - if we are a subproject - make sure the enabled devices are visible
+IF (HAS_PARENT)
+  FOREACH(DEV Kokkos_ENABLED_DEVICES)
+    #I would much rather not make these cache variables or global properties, but I can't
+    #make any guarantees on whether PARENT_SCOPE is good enough to make 
+    #these variables visible where I need them
+    SET(Kokkos_ENABLE_${DEV} ON PARENT_SCOPE)
+    SET_PROPERTY(GLOBAL PROPERTY Kokkos_ENABLE_${DEV} ON)
+  ENDFOREACH()
 ENDIF()
diff --git a/lib/kokkos/CONTRIBUTING.md b/lib/kokkos/CONTRIBUTING.md
new file mode 100644
index 0000000000..b4f3057cef
--- /dev/null
+++ b/lib/kokkos/CONTRIBUTING.md
@@ -0,0 +1,14 @@
+# Contributing to Kokkos
+
+## Pull Requests
+We actively welcome pull requests.
+1. Fork the repo and create your branch from `develop`.
+2. If you've added code that should be tested, add tests.
+3. If you've changed APIs, update the documentation.
+4. Ensure the test suite passes.
+
+## Issues
+We use GitHub issues to track public bugs. Please ensure your description is clear and has sufficient instructions to be able to reproduce the issue.
+
+## License
+By contributing to Kokkos, you agree that your contributions will be licensed under the LICENSE file in the root directory of this source tree.
diff --git a/lib/kokkos/Copyright.txt b/lib/kokkos/Copyright.txt
index 50b76995af..06184796b2 100644
--- a/lib/kokkos/Copyright.txt
+++ b/lib/kokkos/Copyright.txt
@@ -1,10 +1,11 @@
 //@HEADER
 // ************************************************************************
 // 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 // 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 // 
 // Redistribution and use in source and binary forms, with or without
@@ -22,10 +23,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
diff --git a/lib/kokkos/LICENSE b/lib/kokkos/LICENSE
index c68a8a2a9f..c6f17087d5 100644
--- a/lib/kokkos/LICENSE
+++ b/lib/kokkos/LICENSE
@@ -1,10 +1,11 @@
 //@HEADER
 // ************************************************************************
 // 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 // 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
diff --git a/lib/kokkos/Makefile.kokkos b/lib/kokkos/Makefile.kokkos
index e9ad57f0ae..fd96e14bb5 100644
--- a/lib/kokkos/Makefile.kokkos
+++ b/lib/kokkos/Makefile.kokkos
@@ -23,14 +23,16 @@ KOKKOS_DEBUG ?= "no"
 KOKKOS_USE_TPLS ?= ""
 # Options: c++11,c++14,c++1y,c++17,c++1z,c++2a
 KOKKOS_CXX_STANDARD ?= "c++11"
-# Options: aggressive_vectorization,disable_profiling,enable_deprecated_code,disable_deprecated_code,enable_large_mem_tests
+# Options: aggressive_vectorization,disable_profiling,enable_deprecated_code,disable_deprecated_code,enable_large_mem_tests,disable_complex_align
 KOKKOS_OPTIONS ?= ""
 # Option for setting ETI path
 KOKKOS_ETI_PATH ?= ${KOKKOS_PATH}/core/src/eti
 KOKKOS_CMAKE ?= "no"
+KOKKOS_TRIBITS ?= "no"
+KOKKOS_STANDALONE_CMAKE ?= "no"
 
 # Default settings specific options.
-# Options: force_uvm,use_ldg,rdc,enable_lambda
+# Options: force_uvm,use_ldg,rdc,enable_lambda,enable_constexpr
 KOKKOS_CUDA_OPTIONS ?= "enable_lambda"
 
 # Default settings specific options.
@@ -47,7 +49,8 @@ kokkos_has_string=$(if $(findstring $2,$1),1,0)
 #   Will return a 1 if /path/to/file exists
 kokkos_path_exists=$(if $(wildcard $1),1,0)
 
-# Check for general settings.
+# Check for general settings
+
 KOKKOS_INTERNAL_ENABLE_DEBUG := $(call kokkos_has_string,$(KOKKOS_DEBUG),yes)
 KOKKOS_INTERNAL_ENABLE_CXX11 := $(call kokkos_has_string,$(KOKKOS_CXX_STANDARD),c++11)
 KOKKOS_INTERNAL_ENABLE_CXX14 := $(call kokkos_has_string,$(KOKKOS_CXX_STANDARD),c++14)
@@ -67,6 +70,7 @@ KOKKOS_INTERNAL_OPT_RANGE_AGGRESSIVE_VECTORIZATION := $(call kokkos_has_string,$
 KOKKOS_INTERNAL_DISABLE_PROFILING := $(call kokkos_has_string,$(KOKKOS_OPTIONS),disable_profiling)
 KOKKOS_INTERNAL_DISABLE_DEPRECATED_CODE := $(call kokkos_has_string,$(KOKKOS_OPTIONS),disable_deprecated_code)
 KOKKOS_INTERNAL_ENABLE_DEPRECATED_CODE := $(call kokkos_has_string,$(KOKKOS_OPTIONS),enable_deprecated_code)
+KOKKOS_INTERNAL_DISABLE_COMPLEX_ALIGN := $(call kokkos_has_string,$(KOKKOS_OPTIONS),disable_complex_align)
 KOKKOS_INTERNAL_DISABLE_DUALVIEW_MODIFY_CHECK := $(call kokkos_has_string,$(KOKKOS_OPTIONS),disable_dualview_modify_check)
 KOKKOS_INTERNAL_ENABLE_PROFILING_LOAD_PRINT := $(call kokkos_has_string,$(KOKKOS_OPTIONS),enable_profile_load_print)
 KOKKOS_INTERNAL_ENABLE_LARGE_MEM_TESTS := $(call kokkos_has_string,$(KOKKOS_OPTIONS),enable_large_mem_tests)
@@ -74,6 +78,7 @@ KOKKOS_INTERNAL_CUDA_USE_LDG := $(call kokkos_has_string,$(KOKKOS_CUDA_OPTIONS),
 KOKKOS_INTERNAL_CUDA_USE_UVM := $(call kokkos_has_string,$(KOKKOS_CUDA_OPTIONS),force_uvm)
 KOKKOS_INTERNAL_CUDA_USE_RELOC := $(call kokkos_has_string,$(KOKKOS_CUDA_OPTIONS),rdc)
 KOKKOS_INTERNAL_CUDA_USE_LAMBDA := $(call kokkos_has_string,$(KOKKOS_CUDA_OPTIONS),enable_lambda)
+KOKKOS_INTERNAL_CUDA_USE_CONSTEXPR := $(call kokkos_has_string,$(KOKKOS_CUDA_OPTIONS),enable_constexpr)
 KOKKOS_INTERNAL_HPX_ENABLE_ASYNC_DISPATCH := $(call kokkos_has_string,$(KOKKOS_HPX_OPTIONS),enable_async_dispatch)
 KOKKOS_INTERNAL_ENABLE_ETI := $(call kokkos_has_string,$(KOKKOS_OPTIONS),enable_eti)
 
@@ -123,7 +128,7 @@ KOKKOS_INTERNAL_COMPILER_INTEL       := $(call kokkos_has_string,$(KOKKOS_CXX_VE
 KOKKOS_INTERNAL_COMPILER_PGI         := $(call kokkos_has_string,$(KOKKOS_CXX_VERSION),PGI)
 KOKKOS_INTERNAL_COMPILER_XL          := $(strip $(shell $(CXX) -qversion       2>&1 | grep XL                  | wc -l))
 KOKKOS_INTERNAL_COMPILER_CRAY        := $(strip $(shell $(CXX) -craype-verbose 2>&1 | grep "CC-"               | wc -l))
-KOKKOS_INTERNAL_COMPILER_NVCC        := $(strip $(shell export OMPI_CXX=$(OMPI_CXX); export MPICH_CXX=$(MPICH_CXX); $(CXX) --version 2>&1 | grep nvcc | wc -l))
+KOKKOS_INTERNAL_COMPILER_NVCC        := $(strip $(shell export OMPI_CXX=$(OMPI_CXX); export MPICH_CXX=$(MPICH_CXX); echo "$(shell $(CXX) --version 2>&1 | grep nvcc | wc -l)>0" | bc))
 KOKKOS_INTERNAL_COMPILER_CLANG       := $(call kokkos_has_string,$(KOKKOS_CXX_VERSION),clang)
 KOKKOS_INTERNAL_COMPILER_APPLE_CLANG := $(call kokkos_has_string,$(KOKKOS_CXX_VERSION),Apple LLVM)
 KOKKOS_INTERNAL_COMPILER_HCC         := $(call kokkos_has_string,$(KOKKOS_CXX_VERSION),HCC)
@@ -383,10 +388,10 @@ endif
 
 # Generating the list of Flags.
 
-#CPPFLAGS is now unused
 KOKKOS_CPPFLAGS =
+KOKKOS_LIBDIRS =
 ifneq ($(KOKKOS_CMAKE), yes)
-  KOKKOS_CXXFLAGS = -I./ -I$(KOKKOS_PATH)/core/src -I$(KOKKOS_PATH)/containers/src -I$(KOKKOS_PATH)/algorithms/src -I$(KOKKOS_ETI_PATH)
+  KOKKOS_CPPFLAGS = -I./ -I$(KOKKOS_PATH)/core/src -I$(KOKKOS_PATH)/containers/src -I$(KOKKOS_PATH)/algorithms/src -I$(KOKKOS_ETI_PATH)
 endif
 KOKKOS_TPL_INCLUDE_DIRS =
 KOKKOS_TPL_LIBRARY_DIRS =
@@ -399,7 +404,7 @@ endif
 KOKKOS_LIBS = -ldl
 KOKKOS_TPL_LIBRARY_NAMES += dl
 ifneq ($(KOKKOS_CMAKE), yes)
-  KOKKOS_LDFLAGS = -L$(shell pwd)
+  KOKKOS_LIBDIRS = -L$(shell pwd)
   # CXXLDFLAGS is used together with CXXFLAGS in a combined compile/link command
   KOKKOS_CXXLDFLAGS = -L$(shell pwd)
 endif
@@ -492,28 +497,38 @@ ifeq ($(KOKKOS_INTERNAL_USE_ISA_POWERPCBE), 1)
   tmp := $(call kokkos_append_header,"\#endif")
 endif
 
+#only add the c++ standard flags if this is not CMake
 tmp := $(call kokkos_append_header,"/* General Settings */")
 ifeq ($(KOKKOS_INTERNAL_ENABLE_CXX11), 1)
+ifneq ($(KOKKOS_STANDALONE_CMAKE), yes)
   KOKKOS_CXXFLAGS += $(KOKKOS_INTERNAL_CXX11_FLAG)
+endif
   tmp := $(call kokkos_append_header,"\#define KOKKOS_ENABLE_CXX11")
 endif
 ifeq ($(KOKKOS_INTERNAL_ENABLE_CXX14), 1)
+ifneq ($(KOKKOS_STANDALONE_CMAKE), yes)
   KOKKOS_CXXFLAGS += $(KOKKOS_INTERNAL_CXX14_FLAG)
+endif
   tmp := $(call kokkos_append_header,"\#define KOKKOS_ENABLE_CXX14")
 endif
 ifeq ($(KOKKOS_INTERNAL_ENABLE_CXX1Y), 1)
+  #I cannot make CMake add this in a good way - so add it here
   KOKKOS_CXXFLAGS += $(KOKKOS_INTERNAL_CXX1Y_FLAG)
   tmp := $(call kokkos_append_header,"\#define KOKKOS_ENABLE_CXX14")
 endif
 ifeq ($(KOKKOS_INTERNAL_ENABLE_CXX17), 1)
+ifneq ($(KOKKOS_STANDALONE_CMAKE), yes)
   KOKKOS_CXXFLAGS += $(KOKKOS_INTERNAL_CXX17_FLAG)
+endif
   tmp := $(call kokkos_append_header,"\#define KOKKOS_ENABLE_CXX17")
 endif
 ifeq ($(KOKKOS_INTERNAL_ENABLE_CXX1Z), 1)
+  #I cannot make CMake add this in a good way - so add it here
   KOKKOS_CXXFLAGS += $(KOKKOS_INTERNAL_CXX1Z_FLAG)
   tmp := $(call kokkos_append_header,"\#define KOKKOS_ENABLE_CXX17")
 endif
 ifeq ($(KOKKOS_INTERNAL_ENABLE_CXX2A), 1)
+  #I cannot make CMake add this in a good way - so add it here
   KOKKOS_CXXFLAGS += $(KOKKOS_INTERNAL_CXX2A_FLAG)
   tmp := $(call kokkos_append_header,"\#define KOKKOS_ENABLE_CXX20")
 endif
@@ -531,23 +546,26 @@ ifeq ($(KOKKOS_INTERNAL_ENABLE_DEBUG), 1)
     tmp := $(call kokkos_append_header,"\#define KOKKOS_ENABLE_DEBUG_DUALVIEW_MODIFY_CHECK")
   endif
 endif
+ifeq ($(KOKKOS_INTERNAL_DISABLE_COMPLEX_ALIGN), 0)
+  tmp := $(call kokkos_append_header,"\#define KOKKOS_ENABLE_COMPLEX_ALIGN")
+endif
 
 ifeq ($(KOKKOS_INTERNAL_ENABLE_PROFILING_LOAD_PRINT), 1)
   tmp := $(call kokkos_append_header,"\#define KOKKOS_ENABLE_PROFILING_LOAD_PRINT")
 endif
 
 ifeq ($(KOKKOS_INTERNAL_USE_HWLOC), 1)
-  ifneq ($(HWLOC_PATH),)
-    ifneq ($(KOKKOS_CMAKE), yes)
-      KOKKOS_CXXFLAGS += -I$(HWLOC_PATH)/include
+  ifneq ($(KOKKOS_CMAKE), yes)
+    ifneq ($(HWLOC_PATH),)
+      KOKKOS_CPPFLAGS += -I$(HWLOC_PATH)/include
+      KOKKOS_LIBDIRS += -L$(HWLOC_PATH)/lib
+      KOKKOS_CXXLDFLAGS += -L$(HWLOC_PATH)/lib
+      KOKKOS_TPL_INCLUDE_DIRS += $(HWLOC_PATH)/include
+      KOKKOS_TPL_LIBRARY_DIRS += $(HWLOC_PATH)/lib
     endif
-    KOKKOS_LDFLAGS += -L$(HWLOC_PATH)/lib
-    KOKKOS_CXXLDFLAGS += -L$(HWLOC_PATH)/lib
-    KOKKOS_TPL_INCLUDE_DIRS += $(HWLOC_PATH)/include
-    KOKKOS_TPL_LIBRARY_DIRS += $(HWLOC_PATH)/lib
+    KOKKOS_LIBS += -lhwloc
+    KOKKOS_TPL_LIBRARY_NAMES += hwloc
   endif
-  KOKKOS_LIBS += -lhwloc
-  KOKKOS_TPL_LIBRARY_NAMES += hwloc
   tmp := $(call kokkos_append_header,"\#define KOKKOS_ENABLE_HWLOC")
 endif
 
@@ -558,17 +576,17 @@ ifeq ($(KOKKOS_INTERNAL_USE_LIBRT), 1)
 endif
 
 ifeq ($(KOKKOS_INTERNAL_USE_MEMKIND), 1)
-  ifneq ($(MEMKIND_PATH),)
-    ifneq ($(KOKKOS_CMAKE), yes)
-      KOKKOS_CXXFLAGS += -I$(MEMKIND_PATH)/include
+  ifneq ($(KOKKOS_CMAKE), yes)
+    ifneq ($(MEMKIND_PATH),)
+      KOKKOS_CPPFLAGS += -I$(MEMKIND_PATH)/include
+      KOKKOS_LIBDIRS += -L$(MEMKIND_PATH)/lib
+      KOKKOS_CXXLDFLAGS += -L$(MEMKIND_PATH)/lib
+      KOKKOS_TPL_INCLUDE_DIRS += $(MEMKIND_PATH)/include
+      KOKKOS_TPL_LIBRARY_DIRS += $(MEMKIND_PATH)/lib
     endif
-    KOKKOS_LDFLAGS += -L$(MEMKIND_PATH)/lib
-    KOKKOS_CXXLDFLAGS += -L$(MEMKIND_PATH)/lib
-    KOKKOS_TPL_INCLUDE_DIRS += $(MEMKIND_PATH)/include
-    KOKKOS_TPL_LIBRARY_DIRS += $(MEMKIND_PATH)/lib
+    KOKKOS_LIBS += -lmemkind -lnuma
+    KOKKOS_TPL_LIBRARY_NAMES += memkind numa
   endif
-  KOKKOS_LIBS += -lmemkind -lnuma
-  KOKKOS_TPL_LIBRARY_NAMES += memkind numa
   tmp := $(call kokkos_append_header,"\#define KOKKOS_ENABLE_HBWSPACE")
 endif
 
@@ -580,9 +598,6 @@ ifeq ($(KOKKOS_INTERNAL_USE_HPX), 0)
   ifeq ($(KOKKOS_INTERNAL_ENABLE_DEPRECATED_CODE), 1)
     tmp := $(call kokkos_append_header,"\#define KOKKOS_ENABLE_DEPRECATED_CODE")
   endif
-  ifeq ($(KOKKOS_INTERNAL_DISABLE_DEPRECATED_CODE), 0)
-    tmp := $(call kokkos_append_header,"\#define KOKKOS_ENABLE_DEPRECATED_CODE")
-  endif
 endif
 
 ifeq ($(KOKKOS_INTERNAL_ENABLE_ETI), 1)
@@ -648,6 +663,21 @@ ifeq ($(KOKKOS_INTERNAL_USE_CUDA), 1)
     endif
   endif
 
+  ifeq ($(KOKKOS_INTERNAL_CUDA_USE_CONSTEXPR), 1)
+    ifeq ($(KOKKOS_INTERNAL_COMPILER_NVCC), 1)
+      ifeq ($(shell test $(KOKKOS_INTERNAL_COMPILER_NVCC_VERSION) -ge 80; echo $$?),0)
+        tmp := $(call kokkos_append_header,"\#define KOKKOS_ENABLE_CUDA_CONSTEXPR")
+        KOKKOS_CXXFLAGS += -expt-relaxed-constexpr
+      else
+        $(warning Warning: Cuda relaxed constexpr support was requested but NVCC version is too low. This requires NVCC for Cuda version 8.0 or higher. Disabling relaxed constexpr support now.)
+      endif
+    endif
+
+    ifeq ($(KOKKOS_INTERNAL_COMPILER_CLANG), 1)
+      tmp := $(call kokkos_append_header,"\#define KOKKOS_ENABLE_CUDA_CONSTEXPR")
+    endif
+  endif
+
   ifeq ($(KOKKOS_INTERNAL_COMPILER_CLANG), 1)
     tmp := $(call kokkos_append_header,"\#define KOKKOS_IMPL_CUDA_CLANG_WORKAROUND")
   endif
@@ -1089,15 +1119,13 @@ ifeq ($(KOKKOS_INTERNAL_ENABLE_ETI), 1)
 endif
   KOKKOS_HEADERS += $(wildcard $(KOKKOS_PATH)/core/src/Cuda/*.hpp)
   ifneq ($(CUDA_PATH),)
-    ifneq ($(KOKKOS_CMAKE), yes)
-      KOKKOS_CXXFLAGS += -I$(CUDA_PATH)/include
-    endif
+    KOKKOS_CPPLAGS += -I$(CUDA_PATH)/include
     ifeq ($(call kokkos_path_exists,$(CUDA_PATH)/lib64), 1)
-      KOKKOS_LDFLAGS += -L$(CUDA_PATH)/lib64
+      KOKKOS_LIBDIRS += -L$(CUDA_PATH)/lib64
       KOKKOS_CXXLDFLAGS += -L$(CUDA_PATH)/lib64
       KOKKOS_TPL_LIBRARY_DIRS += $(CUDA_PATH)/lib64
     else ifeq ($(call kokkos_path_exists,$(CUDA_PATH)/lib), 1)
-      KOKKOS_LDFLAGS += -L$(CUDA_PATH)/lib
+      KOKKOS_LIBDIRS += -L$(CUDA_PATH)/lib
       KOKKOS_CXXLDFLAGS += -L$(CUDA_PATH)/lib
       KOKKOS_TPL_LIBRARY_DIRS += $(CUDA_PATH)/lib
     else
@@ -1153,17 +1181,17 @@ endif
 ifeq ($(KOKKOS_INTERNAL_USE_QTHREADS), 1)
   KOKKOS_SRC += $(wildcard $(KOKKOS_PATH)/core/src/Qthreads/*.cpp)
   KOKKOS_HEADERS += $(wildcard $(KOKKOS_PATH)/core/src/Qthreads/*.hpp)
-  ifneq ($(QTHREADS_PATH),)
-    ifneq ($(KOKKOS_CMAKE), yes)
-      KOKKOS_CXXFLAGS += -I$(QTHREADS_PATH)/include
+  ifneq ($(KOKKOS_CMAKE), yes)
+    ifneq ($(QTHREADS_PATH),)
+      KOKKOS_CPPFLAGS += -I$(QTHREADS_PATH)/include
+      KOKKOS_LIBDIRS += -L$(QTHREADS_PATH)/lib
+      KOKKOS_CXXLDFLAGS += -L$(QTHREADS_PATH)/lib
+      KOKKOS_TPL_INCLUDE_DIRS += $(QTHREADS_PATH)/include
+      KOKKOS_TPL_LIBRARY_DIRS += $(QTHREADS_PATH)/lib64
     endif
-    KOKKOS_LDFLAGS += -L$(QTHREADS_PATH)/lib
-    KOKKOS_CXXLDFLAGS += -L$(QTHREADS_PATH)/lib
-    KOKKOS_TPL_INCLUDE_DIRS += $(QTHREADS_PATH)/include
-    KOKKOS_TPL_LIBRARY_DIRS += $(QTHREADS_PATH)/lib64
+    KOKKOS_LIBS += -lqthread
+    KOKKOS_TPL_LIBRARY_NAMES += qthread
   endif
-  KOKKOS_LIBS += -lqthread
-  KOKKOS_TPL_LIBRARY_NAMES += qthread
 endif
 
 ifeq ($(KOKKOS_INTERNAL_USE_HPX), 1)
@@ -1173,21 +1201,21 @@ ifeq ($(KOKKOS_INTERNAL_USE_HPX), 1)
     ifeq ($(KOKKOS_INTERNAL_ENABLE_DEBUG), 1)
       KOKKOS_CXXFLAGS += $(shell PKG_CONFIG_PATH=$(HPX_PATH)/lib64/pkgconfig pkg-config --cflags hpx_application_debug)
       KOKKOS_CXXLDFLAGS += $(shell PKG_CONFIG_PATH=$(HPX_PATH)/lib64/pkgconfig pkg-config --libs hpx_application_debug)
-      KOKKOS_LDFLAGS += $(shell PKG_CONFIG_PATH=$(HPX_PATH)/lib64/pkgconfig pkg-config --libs hpx_application_debug)
+      KOKKOS_LIBS += $(shell PKG_CONFIG_PATH=$(HPX_PATH)/lib64/pkgconfig pkg-config --libs hpx_application_debug)
     else
       KOKKOS_CXXFLAGS += $(shell PKG_CONFIG_PATH=$(HPX_PATH)/lib64/pkgconfig pkg-config --cflags hpx_application)
       KOKKOS_CXXLDFLAGS += $(shell PKG_CONFIG_PATH=$(HPX_PATH)/lib64/pkgconfig pkg-config --libs hpx_application)
-      KOKKOS_LDFLAGS += $(shell PKG_CONFIG_PATH=$(HPX_PATH)/lib64/pkgconfig pkg-config --libs hpx_application)
+      KOKKOS_LIBS += $(shell PKG_CONFIG_PATH=$(HPX_PATH)/lib64/pkgconfig pkg-config --libs hpx_application)
     endif
   else
     ifeq ($(KOKKOS_INTERNAL_ENABLE_DEBUG), 1)
       KOKKOS_CXXFLAGS += $(shell pkg-config --cflags hpx_application_debug)
       KOKKOS_CXXLDFLAGS += $(shell pkg-config --libs hpx_application_debug)
-      KOKKOS_LDFLAGS += $(shell pkg-config --libs hpx_application_debug)
+      KOKKOS_LIBS += $(shell pkg-config --libs hpx_application_debug)
     else
       KOKKOS_CXXFLAGS += $(shell pkg-config --cflags hpx_application)
       KOKKOS_CXXLDFLAGS += $(shell pkg-config --libs hpx_application)
-      KOKKOS_LDFLAGS += $(shell pkg-config --libs hpx_application)
+      KOKKOS_LIBS += $(shell pkg-config --libs hpx_application)
     endif
   endif
   KOKKOS_TPL_LIBRARY_NAMES += hpx
@@ -1248,4 +1276,16 @@ libkokkos.a: $(KOKKOS_OBJ_LINK) $(KOKKOS_SRC) $(KOKKOS_HEADERS)
 	ar cr libkokkos.a $(KOKKOS_OBJ_LINK)
 	ranlib libkokkos.a
 
+print-cxx-flags: 
+	echo "$(KOKKOS_CXXFLAGS)"
+
 KOKKOS_LINK_DEPENDS=libkokkos.a
+
+#we have carefully separated LDFLAGS from LIBS and LIBDIRS
+#we have also separated CPPFLAGS from CXXFLAGS
+#if this is not cmake, for backwards compatibility
+#we just jam everything together into the CXXFLAGS and LDFLAGS
+ifneq ($(KOKKOS_CMAKE), yes)
+  KOKKOS_CXXFLAGS += $(KOKKOS_CPPFLAGS)
+  KOKKOS_LDFLAGS += $(KOKKOS_LIBDIRS)
+endif
diff --git a/lib/kokkos/Makefile.targets b/lib/kokkos/Makefile.targets
index e7d5a3c907..0a1f522016 100644
--- a/lib/kokkos/Makefile.targets
+++ b/lib/kokkos/Makefile.targets
@@ -6,6 +6,8 @@ Kokkos_CPUDiscovery.o: $(KOKKOS_CPP_DEPENDS) $(KOKKOS_PATH)/core/src/impl/Kokkos
 	$(CXX) $(KOKKOS_CPPFLAGS) $(KOKKOS_CXXFLAGS) $(CXXFLAGS) -c $(KOKKOS_PATH)/core/src/impl/Kokkos_CPUDiscovery.cpp
 Kokkos_Error.o: $(KOKKOS_CPP_DEPENDS) $(KOKKOS_PATH)/core/src/impl/Kokkos_Error.cpp
 	$(CXX) $(KOKKOS_CPPFLAGS) $(KOKKOS_CXXFLAGS) $(CXXFLAGS) -c $(KOKKOS_PATH)/core/src/impl/Kokkos_Error.cpp
+Kokkos_Stacktrace.o: $(KOKKOS_CPP_DEPENDS) $(KOKKOS_PATH)/core/src/impl/Kokkos_Stacktrace.cpp
+	$(CXX) $(KOKKOS_CPPFLAGS) $(KOKKOS_CXXFLAGS) $(CXXFLAGS) -c $(KOKKOS_PATH)/core/src/impl/Kokkos_Stacktrace.cpp
 Kokkos_ExecPolicy.o: $(KOKKOS_CPP_DEPENDS) $(KOKKOS_PATH)/core/src/impl/Kokkos_ExecPolicy.cpp
 	$(CXX) $(KOKKOS_CPPFLAGS) $(KOKKOS_CXXFLAGS) $(CXXFLAGS) -c $(KOKKOS_PATH)/core/src/impl/Kokkos_ExecPolicy.cpp
 Kokkos_HostSpace.o: $(KOKKOS_CPP_DEPENDS) $(KOKKOS_PATH)/core/src/impl/Kokkos_HostSpace.cpp
diff --git a/lib/kokkos/README b/lib/kokkos/README
deleted file mode 100644
index cb6ceb5581..0000000000
--- a/lib/kokkos/README
+++ /dev/null
@@ -1,193 +0,0 @@
-Kokkos Core implements a programming model in C++ for writing performance portable
-applications targeting all major HPC platforms. For that purpose it provides
-abstractions for both parallel execution of code and data management.
-Kokkos is designed to target complex node architectures with N-level memory
-hierarchies and multiple types of execution resources. It currently can use
-OpenMP, Pthreads and CUDA as backend programming models.
-
-Kokkos Core is part of the Kokkos C++ Performance Portability Programming EcoSystem,
-which also provides math kernels (https://github.com/kokkos/kokkos-kernels), as well as 
-profiling and debugging tools (https://github.com/kokkos/kokkos-tools).  
-
-# Learning about Kokkos
-
-A programming guide can be found on the Wiki, the API reference is under development.
-
-For questions find us on Slack: https://kokkosteam.slack.com or open a github issue.
-
-For non-public questions send an email to
-crtrott(at)sandia.gov
-
-A separate repository with extensive tutorial material can be found under 
-https://github.com/kokkos/kokkos-tutorials.
-
-Furthermore, the 'example/tutorial' directory provides step by step tutorial
-examples which explain many of the features of Kokkos. They work with
-simple Makefiles. To build with g++ and OpenMP simply type 'make'
-in the 'example/tutorial' directory. This will build all examples in the
-subfolders. To change the build options refer to the Programming Guide
-in the compilation section.
-
-To learn more about Kokkos consider watching one of our presentations:
-* GTC 2015:
-  - http://on-demand.gputechconf.com/gtc/2015/video/S5166.html
-  - http://on-demand.gputechconf.com/gtc/2015/presentation/S5166-H-Carter-Edwards.pdf
-
-
-# Contributing to Kokkos
-
-We are open and try to encourage contributions from external developers. 
-To do so please first open an issue describing the contribution and then issue
-a pull request against the develop branch. For larger features it may be good
-to get guidance from the core development team first through the github issue. 
-
-Note that Kokkos Core is licensed under standard 3-clause BSD terms of use. 
-Which means contributing to Kokkos allows anyone else to use your contributions
-not just for public purposes but also for closed source commercial projects.
-For specifics see the LICENSE file contained in the repository or distribution.
-
-# Requirements
-
-### Primary tested compilers on X86 are:
-  * GCC 4.8.4
-  * GCC 4.9.3
-  * GCC 5.1.0
-  * GCC 5.5.0
-  * GCC 6.1.0
-  * GCC 7.2.0
-  * GCC 7.3.0
-  * GCC 8.1.0
-  * Intel 15.0.2
-  * Intel 16.0.1
-  * Intel 17.0.1
-  * Intel 17.4.196
-  * Intel 18.2.128
-  * Clang 3.6.1
-  * Clang 3.7.1
-  * Clang 3.8.1
-  * Clang 3.9.0
-  * Clang 4.0.0
-  * Clang 6.0.0 for CUDA (CUDA Toolkit 9.0)
-  * Clang 7.0.0 for CUDA (CUDA Toolkit 9.1)
-  * PGI 18.7
-  * NVCC 7.5 for CUDA (with gcc 4.8.4)
-  * NVCC 8.0.44 for CUDA (with gcc 5.3.0)
-  * NVCC 9.1 for CUDA (with gcc 6.1.0)
-  * NVCC 9.2 for CUDA (with gcc 7.2.0)
-  * NVCC 10.0 for CUDA (with gcc 7.4.0)
-
-### Primary tested compilers on Power 8 are:
-  * GCC 6.4.0 (OpenMP,Serial)
-  * GCC 7.2.0 (OpenMP,Serial)
-  * IBM XL 16.1.0 (OpenMP, Serial)
-  * NVCC 9.2.88 for CUDA (with gcc 7.2.0 and XL 16.1.0)
-
-### Primary tested compilers on Intel KNL are:
-  * Intel 16.4.258 (with gcc 4.7.2)
-  * Intel 17.2.174 (with gcc 4.9.3)
-  * Intel 18.2.199 (with gcc 4.9.3)
-
-### Primary tested compilers on ARM (Cavium ThunderX2)
-  * GCC 7.2.0 
-  * ARM/Clang 18.4.0
-  
-### Other compilers working:
-  * X86:
-   - Cygwin 2.1.0 64bit with gcc 4.9.3
-   - GCC 8.1.0 (not warning free)
-
-### Known non-working combinations:
-  * Power8:
-   - Pthreads backend
-  * ARM
-   - Pthreads backend
-
-
-Primary tested compiler are passing in release mode
-with warnings as errors. They also are tested with a comprehensive set of 
-backend combinations (i.e. OpenMP, Pthreads, Serial, OpenMP+Serial, ...).
-We are using the following set of flags:
-GCC:   -Wall -Wshadow -pedantic -Werror -Wsign-compare -Wtype-limits
-       -Wignored-qualifiers -Wempty-body -Wclobbered -Wuninitialized
-Intel: -Wall -Wshadow -pedantic -Werror -Wsign-compare -Wtype-limits -Wuninitialized
-Clang: -Wall -Wshadow -pedantic -Werror -Wsign-compare -Wtype-limits -Wuninitialized
-NVCC:  -Wall -Wshadow -pedantic -Werror -Wsign-compare -Wtype-limits -Wuninitialized
-
-Other compilers are tested occasionally, in particular when pushing from develop to 
-master branch, without -Werror and only for a select set of backends.
-
-# Running Unit Tests
-
-To run the unit tests create a build directory and run the following commands
-
-KOKKOS_PATH/generate_makefile.bash
-make build-test
-make test
-
-Run KOKKOS_PATH/generate_makefile.bash --help for more detailed options such as
-changing the device type for which to build.
-
-# Installing the library
-
-To install Kokkos as a library create a build directory and run the following
-
-KOKKOS_PATH/generate_makefile.bash --prefix=INSTALL_PATH
-make kokkoslib
-make install
-
-KOKKOS_PATH/generate_makefile.bash --help for more detailed options such as
-changing the device type for which to build.
-
-Note that in many cases it is preferable to build Kokkos inline with an 
-application. The main reason is that you may otherwise need many different
-configurations of Kokkos installed depending on the required compile time
-features an application needs. For example there is only one default 
-execution space, which means you need different installations to have OpenMP
-or Pthreads as the default space. Also for the CUDA backend there are certain
-choices, such as allowing relocatable device code, which must be made at 
-installation time. Building Kokkos inline uses largely the same process
-as compiling an application against an installed Kokkos library. See for 
-example benchmarks/bytes_and_flops/Makefile which can be used with an installed
-library and for an inline build.  
-
-### CMake
-
-Kokkos supports being build as part of a CMake applications. An example can 
-be found in example/cmake_build. 
-
-# Kokkos and CUDA UVM
-
-Kokkos does support UVM as a specific memory space called CudaUVMSpace. 
-Allocations made with that space are accessible from host and device. 
-You can tell Kokkos to use that as the default space for Cuda allocations.
-In either case UVM comes with a number of restrictions:
-(i) You can't access allocations on the host while a kernel is potentially 
-running. This will lead to segfaults. To avoid that you either need to 
-call Kokkos::Cuda::fence() (or just Kokkos::fence()), after kernels, or
-you can set the environment variable CUDA_LAUNCH_BLOCKING=1.
-Furthermore in multi socket multi GPU machines without NVLINK, UVM defaults 
-to using zero copy allocations for technical reasons related to using multiple
-GPUs from the same process. If an executable doesn't do that (e.g. each
-MPI rank of an application uses a single GPU [can be the same GPU for 
-multiple MPI ranks]) you can set CUDA_MANAGED_FORCE_DEVICE_ALLOC=1.
-This will enforce proper UVM allocations, but can lead to errors if 
-more than a single GPU is used by a single process.
-
-
-# Citing Kokkos
-
-If you publish work which mentions Kokkos, please cite the following paper:
-
-@article{CarterEdwards20143202,
-title = "Kokkos: Enabling manycore performance portability through polymorphic memory access patterns ",
-journal = "Journal of Parallel and Distributed Computing ",
-volume = "74",
-number = "12",
-pages = "3202 - 3216",
-year = "2014",
-note = "Domain-Specific Languages and High-Level Frameworks for High-Performance Computing ",
-issn = "0743-7315",
-doi = "https://doi.org/10.1016/j.jpdc.2014.07.003",
-url = "http://www.sciencedirect.com/science/article/pii/S0743731514001257",
-author = "H. Carter Edwards and Christian R. Trott and Daniel Sunderland"
-}
diff --git a/lib/kokkos/README.md b/lib/kokkos/README.md
new file mode 100644
index 0000000000..322dabfdab
--- /dev/null
+++ b/lib/kokkos/README.md
@@ -0,0 +1,299 @@
+![Kokkos](https://avatars2.githubusercontent.com/u/10199860?s=200&v=4)
+
+# Kokkos: Core Libraries
+
+Kokkos Core implements a programming model in C++ for writing performance portable
+applications targeting all major HPC platforms. For that purpose it provides
+abstractions for both parallel execution of code and data management.
+Kokkos is designed to target complex node architectures with N-level memory
+hierarchies and multiple types of execution resources. It currently can use
+CUDA, HPX, OpenMP and Pthreads as backend programming models with several other
+backends in development.
+
+Kokkos Core is part of the Kokkos C++ Performance Portability Programming EcoSystem,
+which also provides math kernels (https://github.com/kokkos/kokkos-kernels), as well as 
+profiling and debugging tools (https://github.com/kokkos/kokkos-tools).  
+
+# Learning about Kokkos
+
+A programming guide can be found on the Wiki, the API reference is under development.
+
+For questions find us on Slack: https://kokkosteam.slack.com or open a github issue.
+
+For non-public questions send an email to
+crtrott(at)sandia.gov
+
+A separate repository with extensive tutorial material can be found under 
+https://github.com/kokkos/kokkos-tutorials.
+
+Furthermore, the 'example/tutorial' directory provides step by step tutorial
+examples which explain many of the features of Kokkos. They work with
+simple Makefiles. To build with g++ and OpenMP simply type 'make'
+in the 'example/tutorial' directory. This will build all examples in the
+subfolders. To change the build options refer to the Programming Guide
+in the compilation section.
+
+To learn more about Kokkos consider watching one of our presentations:
+* GTC 2015:
+  - http://on-demand.gputechconf.com/gtc/2015/video/S5166.html
+  - http://on-demand.gputechconf.com/gtc/2015/presentation/S5166-H-Carter-Edwards.pdf
+
+
+# Contributing to Kokkos
+
+We are open and try to encourage contributions from external developers. 
+To do so please first open an issue describing the contribution and then issue
+a pull request against the develop branch. For larger features it may be good
+to get guidance from the core development team first through the github issue. 
+
+Note that Kokkos Core is licensed under standard 3-clause BSD terms of use. 
+Which means contributing to Kokkos allows anyone else to use your contributions
+not just for public purposes but also for closed source commercial projects.
+For specifics see the LICENSE file contained in the repository or distribution.
+
+# Requirements
+
+### Primary tested compilers on X86 are:
+* GCC 4.8.4
+* GCC 4.9.3
+* GCC 5.1.0
+* GCC 5.4.0
+* GCC 5.5.0
+* GCC 6.1.0
+* GCC 7.2.0
+* GCC 7.3.0
+* GCC 8.1.0
+* Intel 15.0.2
+* Intel 16.0.1
+* Intel 17.0.1
+* Intel 17.4.196
+* Intel 18.2.128
+* Clang 3.6.1
+* Clang 3.7.1
+* Clang 3.8.1
+* Clang 3.9.0
+* Clang 4.0.0
+* Clang 6.0.0 for CUDA (CUDA Toolkit 9.0)
+* Clang 7.0.0 for CUDA (CUDA Toolkit 9.1)
+* Clang 8.0.0 for CUDA (CUDA Toolkit 9.2)
+* PGI 18.7
+* NVCC 9.1 for CUDA (with gcc 6.1.0)
+* NVCC 9.2 for CUDA (with gcc 7.2.0)
+* NVCC 10.0 for CUDA (with gcc 7.4.0)
+* NVCC 10.1 for CUDA (with gcc 7.4.0)
+
+### Primary tested compilers on Power 8 are:
+* GCC 6.4.0 (OpenMP,Serial)
+* GCC 7.2.0 (OpenMP,Serial)
+* IBM XL 16.1.0 (OpenMP, Serial)
+* NVCC 9.2.88 for CUDA (with gcc 7.2.0 and XL 16.1.0)
+
+### Primary tested compilers on Intel KNL are:
+* Intel 16.4.258 (with gcc 4.7.2)
+* Intel 17.2.174 (with gcc 4.9.3)
+* Intel 18.2.199 (with gcc 4.9.3)
+
+### Primary tested compilers on ARM (Cavium ThunderX2)
+* GCC 7.2.0 
+* ARM/Clang 18.4.0
+  
+### Other compilers working:
+* X86:
+    * Cygwin 2.1.0 64bit with gcc 4.9.3
+    * GCC 8.1.0 (not warning free)
+
+### Known non-working combinations:
+* Power8:
+    * Pthreads backend
+* ARM
+    * Pthreads backend
+
+
+Primary tested compiler are passing in release mode
+with warnings as errors. They also are tested with a comprehensive set of 
+backend combinations (i.e. OpenMP, Pthreads, Serial, OpenMP+Serial, ...).
+We are using the following set of flags:
+* GCC:   
+   ````
+      -Wall -Wshadow -pedantic 
+      -Werror -Wsign-compare -Wtype-limits
+      -Wignored-qualifiers -Wempty-body 
+      -Wclobbered -Wuninitialized
+   ````
+* Intel: 
+    ````
+      -Wall -Wshadow -pedantic 
+      -Werror -Wsign-compare -Wtype-limits 
+      -Wuninitialized
+    ````
+* Clang: 
+    ````
+      -Wall -Wshadow -pedantic 
+      -Werror -Wsign-compare -Wtype-limits 
+      -Wuninitialized
+    ````    
+
+* NVCC:  
+  ````
+    -Wall -Wshadow -pedantic 
+    -Werror -Wsign-compare -Wtype-limits 
+    -Wuninitialized
+  ````
+
+Other compilers are tested occasionally, in particular when pushing from develop to 
+master branch. These are tested less rigorously without `-Werror` and only for a select set of backends.
+
+# Building and Installing Kokkos
+Kokkos provide a CMake build system and a raw Makefile build system. 
+The CMake build system is strongly encouraged and will be the most rigorously supported in future releases.
+Full details are given in the [build instructions](BUILD.md). Basic setups are shown here:
+
+## CMake
+
+The best way to install Kokkos is using the CMake build system. Assuming Kokkos lives in `$srcdir`: 
+````
+cmake $srcdir \
+  -DCMAKE_CXX_COMPILER=$path_to_compiler \
+  -DCMAKE_INSTALL_PREFIX=$path_to_install \
+  -DKokkos_ENABLE_OPENMP=On \
+  -DKokkos_ARCH_HSW=On \
+  -DKokkos_ENABLE_HWLOC=On \
+  -DKokkos_HWLOC_DIR=$path_to_hwloc
+````
+then simply type `make install`. The Kokkos CMake package will then be installed in `$path_to_install` to be used by downstream packages.
+
+To validate the Kokkos build, configure with 
+````
+ -DKokkos_ENABLE_TESTS=On 
+````
+and run `make test` after completing the build.
+
+For your CMake project using Kokkos, code such as the following:
+
+````
+find_package(Kokkos)
+...
+target_link_libraries(myTarget Kokkos::kokkos)
+````
+should be added to your CMakeLists.txt. Your configure should additionally include
+````
+-DKokkos_DIR=$path_to_install/cmake/lib/Kokkos
+````
+or
+````
+-DKokkos_ROOT=$path_to_install
+````
+for the install location given above.
+
+## Spack
+An alternative to manually building with the CMake is to use the Spack package manager.
+To do so, download the `kokkos-spack` git repo and add to the package list:
+````
+spack repo add $path-to-kokkos-spack
+````
+A basic installation would be done as:
+````
+spack install kokkos
+````
+Spack allows options and and compilers to be tuned in the install command.
+````
+spack install kokkos@3.0 %gcc@7.3.0 +openmp
+````
+This example illustrates the three most common parameters to Spack:
+* Variants: specified with, e.g. `+openmp`, this activates (or deactivates with, e.g. `~openmp`) certain options.
+* Version:  immediately following `kokkos` the `@version` can specify a particular Kokkos to build
+* Compiler: a default compiler will be chosen if not specified, but an exact compiler version can be given with the `%`option.
+
+For a complete list of Kokkos options, run:
+````
+spack info kokkos
+````
+Spack currently installs packages to a location determined by a unique hash. This hash name is not really "human readable".
+Generally, Spack usage should never really require you to reference the computer-generated unique install folder. 
+More details are given in the [build instructions](BUILD.md). If you must know, you can locate Spack Kokkos installations with:
+````
+spack find -p kokkos ...
+````
+where `...` is the unique spec identifying the particular Kokkos configuration and version.
+
+
+## Raw Makefile 
+A bash script is provided to generate raw makefiles.
+To install Kokkos as a library create a build directory and run the following
+````
+$KOKKOS_PATH/generate_makefile.bash --prefix=$path_to_install
+````
+Once the Makefile is generated, run:
+````
+make kokkoslib
+make install
+````
+To additionally run the unit tests:
+````
+make build-test
+make test
+````
+Run `generate_makefile.bash --help` for more detailed options such as
+changing the device type for which to build.
+
+## Inline Builds vs. Installed Package
+For individual projects, it may be preferable to build Kokkos inline rather than link to an installed package.
+The main reason is that you may otherwise need many different
+configurations of Kokkos installed depending on the required compile time
+features an application needs. For example there is only one default 
+execution space, which means you need different installations to have OpenMP
+or Pthreads as the default space. Also for the CUDA backend there are certain
+choices, such as allowing relocatable device code, which must be made at 
+installation time. Building Kokkos inline uses largely the same process
+as compiling an application against an installed Kokkos library. 
+
+For CMake, this means copying over the Kokkos source code into your project and adding `add_subdirectory(kokkos)` to your CMakeLists.txt.
+
+For raw Makefiles, see the example benchmarks/bytes_and_flops/Makefile which can be used with an installed library and or an inline build.  
+
+# Kokkos and CUDA UVM
+
+Kokkos does support UVM as a specific memory space called CudaUVMSpace. 
+Allocations made with that space are accessible from host and device. 
+You can tell Kokkos to use that as the default space for Cuda allocations.
+In either case UVM comes with a number of restrictions:
+* You can't access allocations on the host while a kernel is potentially 
+running. This will lead to segfaults. To avoid that you either need to 
+call Kokkos::Cuda::fence() (or just Kokkos::fence()), after kernels, or
+you can set the environment variable CUDA_LAUNCH_BLOCKING=1.
+* In multi socket multi GPU machines without NVLINK, UVM defaults 
+to using zero copy allocations for technical reasons related to using multiple
+GPUs from the same process. If an executable doesn't do that (e.g. each
+MPI rank of an application uses a single GPU [can be the same GPU for 
+multiple MPI ranks]) you can set CUDA_MANAGED_FORCE_DEVICE_ALLOC=1.
+This will enforce proper UVM allocations, but can lead to errors if 
+more than a single GPU is used by a single process.
+
+
+# Citing Kokkos
+
+If you publish work which mentions Kokkos, please cite the following paper:
+
+````
+@article{CarterEdwards20143202,
+  title = "Kokkos: Enabling manycore performance portability through polymorphic memory access patterns ",
+  journal = "Journal of Parallel and Distributed Computing ",
+  volume = "74",
+  number = "12",
+  pages = "3202 - 3216",
+  year = "2014",
+  note = "Domain-Specific Languages and High-Level Frameworks for High-Performance Computing ",
+  issn = "0743-7315",
+  doi = "https://doi.org/10.1016/j.jpdc.2014.07.003",
+  url = "http://www.sciencedirect.com/science/article/pii/S0743731514001257",
+  author = "H. Carter Edwards and Christian R. Trott and Daniel Sunderland"
+}
+````
+
+##### [LICENSE](https://github.com/kokkos/kokkos/blob/master/LICENSE)
+
+[![License](https://img.shields.io/badge/License-BSD%203--Clause-blue.svg)](https://opensource.org/licenses/BSD-3-Clause)
+
+Under the terms of Contract DE-NA0003525 with NTESS,
+the U.S. Government retains certain rights in this software.
+
diff --git a/lib/kokkos/algorithms/CMakeLists.txt b/lib/kokkos/algorithms/CMakeLists.txt
index 507c9f2fdb..38747c152c 100644
--- a/lib/kokkos/algorithms/CMakeLists.txt
+++ b/lib/kokkos/algorithms/CMakeLists.txt
@@ -1,12 +1,12 @@
-
-
-TRIBITS_SUBPACKAGE(Algorithms)
-
-IF(KOKKOS_HAS_TRILINOS)
-  ADD_SUBDIRECTORY(src)
-ENDIF()
-
-TRIBITS_ADD_TEST_DIRECTORIES(unit_tests)
-#TRIBITS_ADD_TEST_DIRECTORIES(performance_tests)
-
-TRIBITS_SUBPACKAGE_POSTPROCESS()
+
+
+KOKKOS_SUBPACKAGE(Algorithms)
+
+ADD_SUBDIRECTORY(src)
+
+KOKKOS_ADD_TEST_DIRECTORIES(unit_tests)
+
+KOKKOS_SUBPACKAGE_POSTPROCESS()
+
+
+
diff --git a/lib/kokkos/algorithms/src/CMakeLists.txt b/lib/kokkos/algorithms/src/CMakeLists.txt
index dfbf3323c2..5afd319fcc 100644
--- a/lib/kokkos/algorithms/src/CMakeLists.txt
+++ b/lib/kokkos/algorithms/src/CMakeLists.txt
@@ -1,8 +1,9 @@
 
-TRIBITS_CONFIGURE_FILE(${PACKAGE_NAME}_config.h)
+KOKKOS_CONFIGURE_FILE(${PACKAGE_NAME}_config.h)
 
-INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR})
-INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR})
+#I have to leave these here for tribits
+KOKKOS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR})
+KOKKOS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR})
 
 #-----------------------------------------------------------------------------
 
@@ -12,10 +13,18 @@ LIST(APPEND HEADERS ${CMAKE_CURRENT_BINARY_DIR}/${PACKAGE_NAME}_config.h)
 
 #-----------------------------------------------------------------------------
 
-TRIBITS_ADD_LIBRARY(
-    kokkosalgorithms
-    HEADERS ${HEADERS}
-    SOURCES ${SOURCES}
-    DEPLIBS
-    )
+# We have to pass the sources in here for Tribits
+# These will get ignored for standalone CMake and a true interface library made
+KOKKOS_ADD_INTERFACE_LIBRARY(
+  kokkosalgorithms
+  HEADERS ${HEADERS}
+  SOURCES ${SOURCES}
+)
+KOKKOS_LIB_INCLUDE_DIRECTORIES(kokkosalgorithms
+  ${KOKKOS_TOP_BUILD_DIR}
+  ${CMAKE_CURRENT_BINARY_DIR}
+  ${CMAKE_CURRENT_SOURCE_DIR}
+)
+
+
 
diff --git a/lib/kokkos/algorithms/src/Kokkos_Random.hpp b/lib/kokkos/algorithms/src/Kokkos_Random.hpp
index e14471a48a..078db18edd 100644
--- a/lib/kokkos/algorithms/src/Kokkos_Random.hpp
+++ b/lib/kokkos/algorithms/src/Kokkos_Random.hpp
@@ -1,13 +1,14 @@
 /*
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -36,7 +37,7 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 */
@@ -59,6 +60,7 @@
 
 namespace Kokkos {
 
+// clang-format off
   /*Template functions to get equidistributed random numbers from a generator for a specific Scalar type
 
        template<class Generator,Scalar>
@@ -102,9 +104,9 @@ namespace Kokkos {
       //Initializing constructor: calls init(seed,Device_Specific_Number);
       Pool(unsigned int seed);
 
-      //Intialize Pool with seed as a starting seed with a pool_size of num_states
+      //Initialize Pool with seed as a starting seed with a pool_size of num_states
       //The Random_XorShift64 generator is used in serial to initialize all states,
-      //thus the intialization process is platform independent and deterministic.
+      //thus the initialization process is platform independent and deterministic.
       void init(unsigned int seed, int num_states);
 
       //Get a generator. This will lock one of the states, guaranteeing that each thread
@@ -229,1019 +231,979 @@ namespace Kokkos {
                      ViewType::value_type start, ViewType::value_type end);
 
 */
+// clang-format on
 
-  template<class Generator, class Scalar>
-  struct rand;
+template <class Generator, class Scalar>
+struct rand;
 
+template <class Generator>
+struct rand<Generator, char> {
+  KOKKOS_INLINE_FUNCTION
+  static short max() { return 127; }
+  KOKKOS_INLINE_FUNCTION
+  static short draw(Generator& gen) {
+    return short((gen.rand() & 0xff + 256) % 256);
+  }
+  KOKKOS_INLINE_FUNCTION
+  static short draw(Generator& gen, const char& range) {
+    return char(gen.rand(range));
+  }
+  KOKKOS_INLINE_FUNCTION
+  static short draw(Generator& gen, const char& start, const char& end) {
+    return char(gen.rand(start, end));
+  }
+};
 
-  template<class Generator>
-  struct rand<Generator,char> {
+template <class Generator>
+struct rand<Generator, short> {
+  KOKKOS_INLINE_FUNCTION
+  static short max() { return 32767; }
+  KOKKOS_INLINE_FUNCTION
+  static short draw(Generator& gen) {
+    return short((gen.rand() & 0xffff + 65536) % 32768);
+  }
+  KOKKOS_INLINE_FUNCTION
+  static short draw(Generator& gen, const short& range) {
+    return short(gen.rand(range));
+  }
+  KOKKOS_INLINE_FUNCTION
+  static short draw(Generator& gen, const short& start, const short& end) {
+    return short(gen.rand(start, end));
+  }
+};
 
-    KOKKOS_INLINE_FUNCTION
-    static short max(){return 127;}
-    KOKKOS_INLINE_FUNCTION
-    static short draw(Generator& gen)
-                          {return short((gen.rand()&0xff+256)%256);}
-    KOKKOS_INLINE_FUNCTION
-    static short draw(Generator& gen, const char& range)
-                          {return char(gen.rand(range));}
-    KOKKOS_INLINE_FUNCTION
-    static short draw(Generator& gen, const char& start, const char& end)
-                          {return char(gen.rand(start,end));}
+template <class Generator>
+struct rand<Generator, int> {
+  KOKKOS_INLINE_FUNCTION
+  static int max() { return Generator::MAX_RAND; }
+  KOKKOS_INLINE_FUNCTION
+  static int draw(Generator& gen) { return gen.rand(); }
+  KOKKOS_INLINE_FUNCTION
+  static int draw(Generator& gen, const int& range) { return gen.rand(range); }
+  KOKKOS_INLINE_FUNCTION
+  static int draw(Generator& gen, const int& start, const int& end) {
+    return gen.rand(start, end);
+  }
+};
 
-  };
+template <class Generator>
+struct rand<Generator, unsigned int> {
+  KOKKOS_INLINE_FUNCTION
+  static unsigned int max() { return Generator::MAX_URAND; }
+  KOKKOS_INLINE_FUNCTION
+  static unsigned int draw(Generator& gen) { return gen.urand(); }
+  KOKKOS_INLINE_FUNCTION
+  static unsigned int draw(Generator& gen, const unsigned int& range) {
+    return gen.urand(range);
+  }
+  KOKKOS_INLINE_FUNCTION
+  static unsigned int draw(Generator& gen, const unsigned int& start,
+                           const unsigned int& end) {
+    return gen.urand(start, end);
+  }
+};
 
-  template<class Generator>
-  struct rand<Generator,short> {
-    KOKKOS_INLINE_FUNCTION
-    static short max(){return 32767;}
-    KOKKOS_INLINE_FUNCTION
-    static short draw(Generator& gen)
-                          {return short((gen.rand()&0xffff+65536)%32768);}
-    KOKKOS_INLINE_FUNCTION
-    static short draw(Generator& gen, const short& range)
-                          {return short(gen.rand(range));}
-    KOKKOS_INLINE_FUNCTION
-    static short draw(Generator& gen, const short& start, const short& end)
-                          {return short(gen.rand(start,end));}
+template <class Generator>
+struct rand<Generator, long> {
+  KOKKOS_INLINE_FUNCTION
+  static long max() {
+    // FIXME (mfh 26 Oct 2014) It would be better to select the
+    // return value at compile time, using something like enable_if.
+    return sizeof(long) == 4 ? static_cast<long>(Generator::MAX_RAND)
+                             : static_cast<long>(Generator::MAX_RAND64);
+  }
+  KOKKOS_INLINE_FUNCTION
+  static long draw(Generator& gen) {
+    // FIXME (mfh 26 Oct 2014) It would be better to select the
+    // return value at compile time, using something like enable_if.
+    return sizeof(long) == 4 ? static_cast<long>(gen.rand())
+                             : static_cast<long>(gen.rand64());
+  }
+  KOKKOS_INLINE_FUNCTION
+  static long draw(Generator& gen, const long& range) {
+    // FIXME (mfh 26 Oct 2014) It would be better to select the
+    // return value at compile time, using something like enable_if.
+    return sizeof(long) == 4
+               ? static_cast<long>(gen.rand(static_cast<int>(range)))
+               : static_cast<long>(gen.rand64(range));
+  }
+  KOKKOS_INLINE_FUNCTION
+  static long draw(Generator& gen, const long& start, const long& end) {
+    // FIXME (mfh 26 Oct 2014) It would be better to select the
+    // return value at compile time, using something like enable_if.
+    return sizeof(long) == 4
+               ? static_cast<long>(
+                     gen.rand(static_cast<int>(start), static_cast<int>(end)))
+               : static_cast<long>(gen.rand64(start, end));
+  }
+};
 
-  };
+template <class Generator>
+struct rand<Generator, unsigned long> {
+  KOKKOS_INLINE_FUNCTION
+  static unsigned long max() {
+    // FIXME (mfh 26 Oct 2014) It would be better to select the
+    // return value at compile time, using something like enable_if.
+    return sizeof(unsigned long) == 4
+               ? static_cast<unsigned long>(Generator::MAX_URAND)
+               : static_cast<unsigned long>(Generator::MAX_URAND64);
+  }
+  KOKKOS_INLINE_FUNCTION
+  static unsigned long draw(Generator& gen) {
+    // FIXME (mfh 26 Oct 2014) It would be better to select the
+    // return value at compile time, using something like enable_if.
+    return sizeof(unsigned long) == 4
+               ? static_cast<unsigned long>(gen.urand())
+               : static_cast<unsigned long>(gen.urand64());
+  }
+  KOKKOS_INLINE_FUNCTION
+  static unsigned long draw(Generator& gen, const unsigned long& range) {
+    // FIXME (mfh 26 Oct 2014) It would be better to select the
+    // return value at compile time, using something like enable_if.
+    return sizeof(unsigned long) == 4
+               ? static_cast<unsigned long>(
+                     gen.urand(static_cast<unsigned int>(range)))
+               : static_cast<unsigned long>(gen.urand64(range));
+  }
+  KOKKOS_INLINE_FUNCTION
+  static unsigned long draw(Generator& gen, const unsigned long& start,
+                            const unsigned long& end) {
+    // FIXME (mfh 26 Oct 2014) It would be better to select the
+    // return value at compile time, using something like enable_if.
+    return sizeof(unsigned long) == 4
+               ? static_cast<unsigned long>(
+                     gen.urand(static_cast<unsigned int>(start),
+                               static_cast<unsigned int>(end)))
+               : static_cast<unsigned long>(gen.urand64(start, end));
+  }
+};
 
-  template<class Generator>
-  struct rand<Generator,int> {
-    KOKKOS_INLINE_FUNCTION
-    static int max(){return Generator::MAX_RAND;}
-    KOKKOS_INLINE_FUNCTION
-    static int draw(Generator& gen)
-                          {return gen.rand();}
-    KOKKOS_INLINE_FUNCTION
-    static int draw(Generator& gen, const int& range)
-                          {return gen.rand(range);}
-    KOKKOS_INLINE_FUNCTION
-    static int draw(Generator& gen, const int& start, const int& end)
-                          {return gen.rand(start,end);}
+// NOTE (mfh 26 oct 2014) This is a partial specialization for long
+// long, a C99 / C++11 signed type which is guaranteed to be at
+// least 64 bits.  Do NOT write a partial specialization for
+// int64_t!!!  This is just a typedef!  It could be either long or
+// long long.  We don't know which a priori, and I've seen both.
+// The types long and long long are guaranteed to differ, so it's
+// always safe to specialize for both.
+template <class Generator>
+struct rand<Generator, long long> {
+  KOKKOS_INLINE_FUNCTION
+  static long long max() {
+    // FIXME (mfh 26 Oct 2014) It's legal for long long to be > 64 bits.
+    return Generator::MAX_RAND64;
+  }
+  KOKKOS_INLINE_FUNCTION
+  static long long draw(Generator& gen) {
+    // FIXME (mfh 26 Oct 2014) It's legal for long long to be > 64 bits.
+    return gen.rand64();
+  }
+  KOKKOS_INLINE_FUNCTION
+  static long long draw(Generator& gen, const long long& range) {
+    // FIXME (mfh 26 Oct 2014) It's legal for long long to be > 64 bits.
+    return gen.rand64(range);
+  }
+  KOKKOS_INLINE_FUNCTION
+  static long long draw(Generator& gen, const long long& start,
+                        const long long& end) {
+    // FIXME (mfh 26 Oct 2014) It's legal for long long to be > 64 bits.
+    return gen.rand64(start, end);
+  }
+};
 
-  };
+// NOTE (mfh 26 oct 2014) This is a partial specialization for
+// unsigned long long, a C99 / C++11 unsigned type which is
+// guaranteed to be at least 64 bits.  Do NOT write a partial
+// specialization for uint64_t!!!  This is just a typedef!  It could
+// be either unsigned long or unsigned long long.  We don't know
+// which a priori, and I've seen both.  The types unsigned long and
+// unsigned long long are guaranteed to differ, so it's always safe
+// to specialize for both.
+template <class Generator>
+struct rand<Generator, unsigned long long> {
+  KOKKOS_INLINE_FUNCTION
+  static unsigned long long max() {
+    // FIXME (mfh 26 Oct 2014) It's legal for unsigned long long to be > 64
+    // bits.
+    return Generator::MAX_URAND64;
+  }
+  KOKKOS_INLINE_FUNCTION
+  static unsigned long long draw(Generator& gen) {
+    // FIXME (mfh 26 Oct 2014) It's legal for unsigned long long to be > 64
+    // bits.
+    return gen.urand64();
+  }
+  KOKKOS_INLINE_FUNCTION
+  static unsigned long long draw(Generator& gen,
+                                 const unsigned long long& range) {
+    // FIXME (mfh 26 Oct 2014) It's legal for long long to be > 64 bits.
+    return gen.urand64(range);
+  }
+  KOKKOS_INLINE_FUNCTION
+  static unsigned long long draw(Generator& gen,
+                                 const unsigned long long& start,
+                                 const unsigned long long& end) {
+    // FIXME (mfh 26 Oct 2014) It's legal for long long to be > 64 bits.
+    return gen.urand64(start, end);
+  }
+};
 
-  template<class Generator>
-  struct rand<Generator,unsigned int> {
-    KOKKOS_INLINE_FUNCTION
-    static unsigned int max () {
-      return Generator::MAX_URAND;
+template <class Generator>
+struct rand<Generator, float> {
+  KOKKOS_INLINE_FUNCTION
+  static float max() { return 1.0f; }
+  KOKKOS_INLINE_FUNCTION
+  static float draw(Generator& gen) { return gen.frand(); }
+  KOKKOS_INLINE_FUNCTION
+  static float draw(Generator& gen, const float& range) {
+    return gen.frand(range);
+  }
+  KOKKOS_INLINE_FUNCTION
+  static float draw(Generator& gen, const float& start, const float& end) {
+    return gen.frand(start, end);
+  }
+};
+
+template <class Generator>
+struct rand<Generator, double> {
+  KOKKOS_INLINE_FUNCTION
+  static double max() { return 1.0; }
+  KOKKOS_INLINE_FUNCTION
+  static double draw(Generator& gen) { return gen.drand(); }
+  KOKKOS_INLINE_FUNCTION
+  static double draw(Generator& gen, const double& range) {
+    return gen.drand(range);
+  }
+  KOKKOS_INLINE_FUNCTION
+  static double draw(Generator& gen, const double& start, const double& end) {
+    return gen.drand(start, end);
+  }
+};
+
+template <class Generator>
+struct rand<Generator, Kokkos::complex<float> > {
+  KOKKOS_INLINE_FUNCTION
+  static Kokkos::complex<float> max() {
+    return Kokkos::complex<float>(1.0, 1.0);
+  }
+  KOKKOS_INLINE_FUNCTION
+  static Kokkos::complex<float> draw(Generator& gen) {
+    const float re = gen.frand();
+    const float im = gen.frand();
+    return Kokkos::complex<float>(re, im);
+  }
+  KOKKOS_INLINE_FUNCTION
+  static Kokkos::complex<float> draw(Generator& gen,
+                                     const Kokkos::complex<float>& range) {
+    const float re = gen.frand(real(range));
+    const float im = gen.frand(imag(range));
+    return Kokkos::complex<float>(re, im);
+  }
+  KOKKOS_INLINE_FUNCTION
+  static Kokkos::complex<float> draw(Generator& gen,
+                                     const Kokkos::complex<float>& start,
+                                     const Kokkos::complex<float>& end) {
+    const float re = gen.frand(real(start), real(end));
+    const float im = gen.frand(imag(start), imag(end));
+    return Kokkos::complex<float>(re, im);
+  }
+};
+
+template <class Generator>
+struct rand<Generator, Kokkos::complex<double> > {
+  KOKKOS_INLINE_FUNCTION
+  static Kokkos::complex<double> max() {
+    return Kokkos::complex<double>(1.0, 1.0);
+  }
+  KOKKOS_INLINE_FUNCTION
+  static Kokkos::complex<double> draw(Generator& gen) {
+    const double re = gen.drand();
+    const double im = gen.drand();
+    return Kokkos::complex<double>(re, im);
+  }
+  KOKKOS_INLINE_FUNCTION
+  static Kokkos::complex<double> draw(Generator& gen,
+                                      const Kokkos::complex<double>& range) {
+    const double re = gen.drand(real(range));
+    const double im = gen.drand(imag(range));
+    return Kokkos::complex<double>(re, im);
+  }
+  KOKKOS_INLINE_FUNCTION
+  static Kokkos::complex<double> draw(Generator& gen,
+                                      const Kokkos::complex<double>& start,
+                                      const Kokkos::complex<double>& end) {
+    const double re = gen.drand(real(start), real(end));
+    const double im = gen.drand(imag(start), imag(end));
+    return Kokkos::complex<double>(re, im);
+  }
+};
+
+template <class DeviceType>
+class Random_XorShift64_Pool;
+
+template <class DeviceType>
+class Random_XorShift64 {
+ private:
+  uint64_t state_;
+  const int state_idx_;
+  friend class Random_XorShift64_Pool<DeviceType>;
+
+ public:
+  typedef DeviceType device_type;
+
+  enum { MAX_URAND = 0xffffffffU };
+  enum { MAX_URAND64 = 0xffffffffffffffffULL - 1 };
+  enum { MAX_RAND = static_cast<int>(0xffffffff / 2) };
+  enum { MAX_RAND64 = static_cast<int64_t>(0xffffffffffffffffLL / 2 - 1) };
+
+  KOKKOS_INLINE_FUNCTION
+  Random_XorShift64(uint64_t state, int state_idx = 0)
+      : state_(state == 0 ? uint64_t(1318319) : state), state_idx_(state_idx) {}
+
+  KOKKOS_INLINE_FUNCTION
+  uint32_t urand() {
+    state_ ^= state_ >> 12;
+    state_ ^= state_ << 25;
+    state_ ^= state_ >> 27;
+
+    uint64_t tmp = state_ * 2685821657736338717ULL;
+    tmp          = tmp >> 16;
+    return static_cast<uint32_t>(tmp & MAX_URAND);
+  }
+
+  KOKKOS_INLINE_FUNCTION
+  uint64_t urand64() {
+    state_ ^= state_ >> 12;
+    state_ ^= state_ << 25;
+    state_ ^= state_ >> 27;
+    return (state_ * 2685821657736338717ULL) - 1;
+  }
+
+  KOKKOS_INLINE_FUNCTION
+  uint32_t urand(const uint32_t& range) {
+    const uint32_t max_val = (MAX_URAND / range) * range;
+    uint32_t tmp           = urand();
+    while (tmp >= max_val) tmp = urand();
+    return tmp % range;
+  }
+
+  KOKKOS_INLINE_FUNCTION
+  uint32_t urand(const uint32_t& start, const uint32_t& end) {
+    return urand(end - start) + start;
+  }
+
+  KOKKOS_INLINE_FUNCTION
+  uint64_t urand64(const uint64_t& range) {
+    const uint64_t max_val = (MAX_URAND64 / range) * range;
+    uint64_t tmp           = urand64();
+    while (tmp >= max_val) tmp = urand64();
+    return tmp % range;
+  }
+
+  KOKKOS_INLINE_FUNCTION
+  uint64_t urand64(const uint64_t& start, const uint64_t& end) {
+    return urand64(end - start) + start;
+  }
+
+  KOKKOS_INLINE_FUNCTION
+  int rand() { return static_cast<int>(urand() / 2); }
+
+  KOKKOS_INLINE_FUNCTION
+  int rand(const int& range) {
+    const int max_val = (MAX_RAND / range) * range;
+    int tmp           = rand();
+    while (tmp >= max_val) tmp = rand();
+    return tmp % range;
+  }
+
+  KOKKOS_INLINE_FUNCTION
+  int rand(const int& start, const int& end) {
+    return rand(end - start) + start;
+  }
+
+  KOKKOS_INLINE_FUNCTION
+  int64_t rand64() { return static_cast<int64_t>(urand64() / 2); }
+
+  KOKKOS_INLINE_FUNCTION
+  int64_t rand64(const int64_t& range) {
+    const int64_t max_val = (MAX_RAND64 / range) * range;
+    int64_t tmp           = rand64();
+    while (tmp >= max_val) tmp = rand64();
+    return tmp % range;
+  }
+
+  KOKKOS_INLINE_FUNCTION
+  int64_t rand64(const int64_t& start, const int64_t& end) {
+    return rand64(end - start) + start;
+  }
+
+  KOKKOS_INLINE_FUNCTION
+  float frand() { return 1.0f * urand64() / MAX_URAND64; }
+
+  KOKKOS_INLINE_FUNCTION
+  float frand(const float& range) { return range * urand64() / MAX_URAND64; }
+
+  KOKKOS_INLINE_FUNCTION
+  float frand(const float& start, const float& end) {
+    return frand(end - start) + start;
+  }
+
+  KOKKOS_INLINE_FUNCTION
+  double drand() { return 1.0 * urand64() / MAX_URAND64; }
+
+  KOKKOS_INLINE_FUNCTION
+  double drand(const double& range) { return range * urand64() / MAX_URAND64; }
+
+  KOKKOS_INLINE_FUNCTION
+  double drand(const double& start, const double& end) {
+    return drand(end - start) + start;
+  }
+
+  // Marsaglia polar method for drawing a standard normal distributed random
+  // number
+  KOKKOS_INLINE_FUNCTION
+  double normal() {
+    double S = 2.0;
+    double U;
+    while (S >= 1.0) {
+      U              = 2.0 * drand() - 1.0;
+      const double V = 2.0 * drand() - 1.0;
+      S              = U * U + V * V;
     }
-    KOKKOS_INLINE_FUNCTION
-    static unsigned int draw (Generator& gen) {
-      return gen.urand ();
-    }
-    KOKKOS_INLINE_FUNCTION
-    static unsigned int draw(Generator& gen, const unsigned int& range) {
-      return gen.urand (range);
-    }
-    KOKKOS_INLINE_FUNCTION
-    static unsigned int
-    draw (Generator& gen, const unsigned int& start, const unsigned int& end) {
-      return gen.urand (start, end);
-    }
-  };
+    return U * std::sqrt(-2.0 * log(S) / S);
+  }
 
-  template<class Generator>
-  struct rand<Generator,long> {
-    KOKKOS_INLINE_FUNCTION
-    static long max () {
-      // FIXME (mfh 26 Oct 2014) It would be better to select the
-      // return value at compile time, using something like enable_if.
-      return sizeof (long) == 4 ?
-        static_cast<long> (Generator::MAX_RAND) :
-        static_cast<long> (Generator::MAX_RAND64);
-    }
-    KOKKOS_INLINE_FUNCTION
-    static long draw (Generator& gen) {
-      // FIXME (mfh 26 Oct 2014) It would be better to select the
-      // return value at compile time, using something like enable_if.
-      return sizeof (long) == 4 ?
-        static_cast<long> (gen.rand ()) :
-        static_cast<long> (gen.rand64 ());
-    }
-    KOKKOS_INLINE_FUNCTION
-    static long draw (Generator& gen, const long& range) {
-      // FIXME (mfh 26 Oct 2014) It would be better to select the
-      // return value at compile time, using something like enable_if.
-      return sizeof (long) == 4 ?
-        static_cast<long> (gen.rand (static_cast<int> (range))) :
-        static_cast<long> (gen.rand64 (range));
-    }
-    KOKKOS_INLINE_FUNCTION
-    static long draw (Generator& gen, const long& start, const long& end) {
-      // FIXME (mfh 26 Oct 2014) It would be better to select the
-      // return value at compile time, using something like enable_if.
-      return sizeof (long) == 4 ?
-        static_cast<long> (gen.rand (static_cast<int> (start),
-                                     static_cast<int> (end))) :
-        static_cast<long> (gen.rand64 (start, end));
-    }
-  };
+  KOKKOS_INLINE_FUNCTION
+  double normal(const double& mean, const double& std_dev = 1.0) {
+    return mean + normal() * std_dev;
+  }
+};
 
-  template<class Generator>
-  struct rand<Generator,unsigned long> {
-    KOKKOS_INLINE_FUNCTION
-    static unsigned long max () {
-      // FIXME (mfh 26 Oct 2014) It would be better to select the
-      // return value at compile time, using something like enable_if.
-      return sizeof (unsigned long) == 4 ?
-        static_cast<unsigned long> (Generator::MAX_URAND) :
-        static_cast<unsigned long> (Generator::MAX_URAND64);
-    }
-    KOKKOS_INLINE_FUNCTION
-    static unsigned long draw (Generator& gen) {
-      // FIXME (mfh 26 Oct 2014) It would be better to select the
-      // return value at compile time, using something like enable_if.
-      return sizeof (unsigned long) == 4 ?
-        static_cast<unsigned long> (gen.urand ()) :
-        static_cast<unsigned long> (gen.urand64 ());
-    }
-    KOKKOS_INLINE_FUNCTION
-    static unsigned long draw(Generator& gen, const unsigned long& range) {
-      // FIXME (mfh 26 Oct 2014) It would be better to select the
-      // return value at compile time, using something like enable_if.
-      return sizeof (unsigned long) == 4 ?
-        static_cast<unsigned long> (gen.urand (static_cast<unsigned int> (range))) :
-        static_cast<unsigned long> (gen.urand64 (range));
-    }
-    KOKKOS_INLINE_FUNCTION
-    static unsigned long
-    draw (Generator& gen, const unsigned long& start, const unsigned long& end) {
-      // FIXME (mfh 26 Oct 2014) It would be better to select the
-      // return value at compile time, using something like enable_if.
-      return sizeof (unsigned long) == 4 ?
-        static_cast<unsigned long> (gen.urand (static_cast<unsigned int> (start),
-                                               static_cast<unsigned int> (end))) :
-        static_cast<unsigned long> (gen.urand64 (start, end));
-    }
-  };
+template <class DeviceType = Kokkos::DefaultExecutionSpace>
+class Random_XorShift64_Pool {
+ private:
+  typedef View<int*, DeviceType> lock_type;
+  typedef View<uint64_t*, DeviceType> state_data_type;
+  lock_type locks_;
+  state_data_type state_;
+  int num_states_;
 
-  // NOTE (mfh 26 oct 2014) This is a partial specialization for long
-  // long, a C99 / C++11 signed type which is guaranteed to be at
-  // least 64 bits.  Do NOT write a partial specialization for
-  // int64_t!!!  This is just a typedef!  It could be either long or
-  // long long.  We don't know which a priori, and I've seen both.
-  // The types long and long long are guaranteed to differ, so it's
-  // always safe to specialize for both.
-  template<class Generator>
-  struct rand<Generator, long long> {
-    KOKKOS_INLINE_FUNCTION
-    static long long max () {
-      // FIXME (mfh 26 Oct 2014) It's legal for long long to be > 64 bits.
-      return Generator::MAX_RAND64;
-    }
-    KOKKOS_INLINE_FUNCTION
-    static long long draw (Generator& gen) {
-      // FIXME (mfh 26 Oct 2014) It's legal for long long to be > 64 bits.
-      return gen.rand64 ();
-    }
-    KOKKOS_INLINE_FUNCTION
-    static long long draw (Generator& gen, const long long& range) {
-      // FIXME (mfh 26 Oct 2014) It's legal for long long to be > 64 bits.
-      return gen.rand64 (range);
-    }
-    KOKKOS_INLINE_FUNCTION
-    static long long draw (Generator& gen, const long long& start, const long long& end) {
-      // FIXME (mfh 26 Oct 2014) It's legal for long long to be > 64 bits.
-      return gen.rand64 (start, end);
-    }
-  };
+ public:
+  typedef Random_XorShift64<DeviceType> generator_type;
+  typedef DeviceType device_type;
 
-  // NOTE (mfh 26 oct 2014) This is a partial specialization for
-  // unsigned long long, a C99 / C++11 unsigned type which is
-  // guaranteed to be at least 64 bits.  Do NOT write a partial
-  // specialization for uint64_t!!!  This is just a typedef!  It could
-  // be either unsigned long or unsigned long long.  We don't know
-  // which a priori, and I've seen both.  The types unsigned long and
-  // unsigned long long are guaranteed to differ, so it's always safe
-  // to specialize for both.
-  template<class Generator>
-  struct rand<Generator,unsigned long long> {
-    KOKKOS_INLINE_FUNCTION
-    static unsigned long long max () {
-      // FIXME (mfh 26 Oct 2014) It's legal for unsigned long long to be > 64 bits.
-      return Generator::MAX_URAND64;
-    }
-    KOKKOS_INLINE_FUNCTION
-    static unsigned long long draw (Generator& gen) {
-      // FIXME (mfh 26 Oct 2014) It's legal for unsigned long long to be > 64 bits.
-      return gen.urand64 ();
-    }
-    KOKKOS_INLINE_FUNCTION
-    static unsigned long long draw (Generator& gen, const unsigned long long& range) {
-      // FIXME (mfh 26 Oct 2014) It's legal for long long to be > 64 bits.
-      return gen.urand64 (range);
-    }
-    KOKKOS_INLINE_FUNCTION
-    static unsigned long long
-    draw (Generator& gen, const unsigned long long& start, const unsigned long long& end) {
-      // FIXME (mfh 26 Oct 2014) It's legal for long long to be > 64 bits.
-      return gen.urand64 (start, end);
-    }
-  };
-
-  template<class Generator>
-  struct rand<Generator,float> {
-    KOKKOS_INLINE_FUNCTION
-    static float max(){return 1.0f;}
-    KOKKOS_INLINE_FUNCTION
-    static float draw(Generator& gen)
-                          {return gen.frand();}
-    KOKKOS_INLINE_FUNCTION
-    static float draw(Generator& gen, const float& range)
-                          {return gen.frand(range);}
-    KOKKOS_INLINE_FUNCTION
-    static float draw(Generator& gen, const float& start, const float& end)
-                          {return gen.frand(start,end);}
-
-  };
-
-  template<class Generator>
-  struct rand<Generator,double> {
-    KOKKOS_INLINE_FUNCTION
-    static double max(){return 1.0;}
-    KOKKOS_INLINE_FUNCTION
-    static double draw(Generator& gen)
-                          {return gen.drand();}
-    KOKKOS_INLINE_FUNCTION
-    static double draw(Generator& gen, const double& range)
-                          {return gen.drand(range);}
-    KOKKOS_INLINE_FUNCTION
-    static double draw(Generator& gen, const double& start, const double& end)
-                          {return gen.drand(start,end);}
-
-  };
-
-  template<class Generator>
-  struct rand<Generator, Kokkos::complex<float> > {
-    KOKKOS_INLINE_FUNCTION
-    static Kokkos::complex<float> max () {
-      return Kokkos::complex<float> (1.0, 1.0);
-    }
-    KOKKOS_INLINE_FUNCTION
-    static Kokkos::complex<float> draw (Generator& gen) {
-      const float re = gen.frand ();
-      const float im = gen.frand ();
-      return Kokkos::complex<float> (re, im);
-    }
-    KOKKOS_INLINE_FUNCTION
-    static Kokkos::complex<float> draw (Generator& gen, const Kokkos::complex<float>& range) {
-      const float re = gen.frand (real (range));
-      const float im = gen.frand (imag (range));
-      return Kokkos::complex<float> (re, im);
-    }
-    KOKKOS_INLINE_FUNCTION
-    static Kokkos::complex<float> draw (Generator& gen, const Kokkos::complex<float>& start, const Kokkos::complex<float>& end) {
-      const float re = gen.frand (real (start), real (end));
-      const float im = gen.frand (imag (start), imag (end));
-      return Kokkos::complex<float> (re, im);
-    }
-  };
-
-  template<class Generator>
-  struct rand<Generator, Kokkos::complex<double> > {
-    KOKKOS_INLINE_FUNCTION
-    static Kokkos::complex<double> max () {
-      return Kokkos::complex<double> (1.0, 1.0);
-    }
-    KOKKOS_INLINE_FUNCTION
-    static Kokkos::complex<double> draw (Generator& gen) {
-      const double re = gen.drand ();
-      const double im = gen.drand ();
-      return Kokkos::complex<double> (re, im);
-    }
-    KOKKOS_INLINE_FUNCTION
-    static Kokkos::complex<double> draw (Generator& gen, const Kokkos::complex<double>& range) {
-      const double re = gen.drand (real (range));
-      const double im = gen.drand (imag (range));
-      return Kokkos::complex<double> (re, im);
-    }
-    KOKKOS_INLINE_FUNCTION
-    static Kokkos::complex<double> draw (Generator& gen, const Kokkos::complex<double>& start, const Kokkos::complex<double>& end) {
-      const double re = gen.drand (real (start), real (end));
-      const double im = gen.drand (imag (start), imag (end));
-      return Kokkos::complex<double> (re, im);
-    }
-  };
-
-  template<class DeviceType>
-  class Random_XorShift64_Pool;
-
-  template<class DeviceType>
-  class Random_XorShift64 {
-  private:
-    uint64_t state_;
-    const int state_idx_;
-    friend class Random_XorShift64_Pool<DeviceType>;
-  public:
-
-    typedef DeviceType device_type;
-
-    enum {MAX_URAND = 0xffffffffU};
-    enum {MAX_URAND64 = 0xffffffffffffffffULL-1};
-    enum {MAX_RAND = static_cast<int>(0xffffffff/2)};
-    enum {MAX_RAND64 = static_cast<int64_t>(0xffffffffffffffffLL/2-1)};
-
-    KOKKOS_INLINE_FUNCTION
-    Random_XorShift64 (uint64_t state, int state_idx = 0)
-     : state_(state==0?uint64_t(1318319):state),state_idx_(state_idx){}
-
-    KOKKOS_INLINE_FUNCTION
-    uint32_t urand() {
-      state_ ^= state_ >> 12;
-      state_ ^= state_ << 25;
-      state_ ^= state_ >> 27;
-
-      uint64_t tmp = state_ * 2685821657736338717ULL;
-      tmp = tmp>>16;
-      return static_cast<uint32_t>(tmp&MAX_URAND);
-    }
-
-    KOKKOS_INLINE_FUNCTION
-    uint64_t urand64() {
-      state_ ^= state_ >> 12;
-      state_ ^= state_ << 25;
-      state_ ^= state_ >> 27;
-      return (state_ * 2685821657736338717ULL) - 1;
-    }
-
-    KOKKOS_INLINE_FUNCTION
-    uint32_t urand(const uint32_t& range) {
-      const uint32_t max_val = (MAX_URAND/range)*range;
-      uint32_t tmp = urand();
-      while(tmp>=max_val)
-        tmp = urand();
-      return tmp%range;
-    }
-
-    KOKKOS_INLINE_FUNCTION
-    uint32_t urand(const uint32_t& start, const uint32_t& end ) {
-      return urand(end-start)+start;
-    }
-
-    KOKKOS_INLINE_FUNCTION
-    uint64_t urand64(const uint64_t& range) {
-      const uint64_t max_val = (MAX_URAND64/range)*range;
-      uint64_t tmp = urand64();
-      while(tmp>=max_val)
-        tmp = urand64();
-      return tmp%range;
-    }
-
-    KOKKOS_INLINE_FUNCTION
-    uint64_t urand64(const uint64_t& start, const uint64_t& end ) {
-      return urand64(end-start)+start;
-    }
-
-    KOKKOS_INLINE_FUNCTION
-    int rand() {
-      return static_cast<int>(urand()/2);
-    }
-
-    KOKKOS_INLINE_FUNCTION
-    int rand(const int& range) {
-      const int max_val = (MAX_RAND/range)*range;
-      int tmp = rand();
-      while(tmp>=max_val)
-        tmp = rand();
-      return tmp%range;
-    }
-
-    KOKKOS_INLINE_FUNCTION
-    int rand(const int& start, const int& end ) {
-      return rand(end-start)+start;
-    }
-
-    KOKKOS_INLINE_FUNCTION
-    int64_t rand64() {
-      return static_cast<int64_t>(urand64()/2);
-    }
-
-    KOKKOS_INLINE_FUNCTION
-    int64_t rand64(const int64_t& range) {
-      const int64_t max_val = (MAX_RAND64/range)*range;
-      int64_t tmp = rand64();
-      while(tmp>=max_val)
-        tmp = rand64();
-      return tmp%range;
-    }
-
-    KOKKOS_INLINE_FUNCTION
-    int64_t rand64(const int64_t& start, const int64_t& end ) {
-      return rand64(end-start)+start;
-    }
-
-    KOKKOS_INLINE_FUNCTION
-    float frand() {
-      return 1.0f * urand64()/MAX_URAND64;
-    }
-
-    KOKKOS_INLINE_FUNCTION
-    float frand(const float& range) {
-      return range * urand64()/MAX_URAND64;
-    }
-
-    KOKKOS_INLINE_FUNCTION
-    float frand(const float& start, const float& end ) {
-      return frand(end-start)+start;
-    }
-
-    KOKKOS_INLINE_FUNCTION
-    double drand() {
-      return 1.0 * urand64()/MAX_URAND64;
-    }
-
-    KOKKOS_INLINE_FUNCTION
-    double drand(const double& range) {
-      return range * urand64()/MAX_URAND64;
-    }
-
-    KOKKOS_INLINE_FUNCTION
-    double drand(const double& start, const double& end ) {
-      return drand(end-start)+start;
-    }
-
-    //Marsaglia polar method for drawing a standard normal distributed random number
-    KOKKOS_INLINE_FUNCTION
-    double normal() {
-      double S = 2.0;
-      double U;
-      while(S>=1.0) {
-        U = 2.0*drand() - 1.0;
-        const double V = 2.0*drand() - 1.0;
-        S = U*U+V*V;
-      }
-      return U*std::sqrt(-2.0*log(S)/S);
-    }
-
-    KOKKOS_INLINE_FUNCTION
-    double normal(const double& mean, const double& std_dev=1.0) {
-      return mean + normal()*std_dev;
-    }
-
-  };
-
-  template<class DeviceType = Kokkos::DefaultExecutionSpace>
-  class Random_XorShift64_Pool {
-  private:
-    typedef View<int*,DeviceType> lock_type;
-    typedef View<uint64_t*,DeviceType> state_data_type;
-    lock_type locks_;
-    state_data_type state_;
-    int num_states_;
-
-  public:
-    typedef Random_XorShift64<DeviceType> generator_type;
-    typedef DeviceType device_type;
-
-    KOKKOS_INLINE_FUNCTION
-    Random_XorShift64_Pool() {
-      num_states_ = 0;
-    }
-    Random_XorShift64_Pool(uint64_t seed) {
-      num_states_ = 0;
+  KOKKOS_INLINE_FUNCTION
+  Random_XorShift64_Pool() { num_states_ = 0; }
+  Random_XorShift64_Pool(uint64_t seed) {
+    num_states_ = 0;
 #ifdef KOKKOS_ENABLE_DEPRECATED_CODE
-      init(seed,DeviceType::max_hardware_threads());
+    init(seed, DeviceType::max_hardware_threads());
 #else
-      init(seed,DeviceType::impl_max_hardware_threads());
+    init(seed, DeviceType::impl_max_hardware_threads());
 #endif
+  }
+
+  KOKKOS_INLINE_FUNCTION
+  Random_XorShift64_Pool(const Random_XorShift64_Pool& src)
+      : locks_(src.locks_), state_(src.state_), num_states_(src.num_states_) {}
+
+  KOKKOS_INLINE_FUNCTION
+  Random_XorShift64_Pool operator=(const Random_XorShift64_Pool& src) {
+    locks_      = src.locks_;
+    state_      = src.state_;
+    num_states_ = src.num_states_;
+    return *this;
+  }
+
+  void init(uint64_t seed, int num_states) {
+    if (seed == 0) seed = uint64_t(1318319);
+
+    num_states_ = num_states;
+
+    locks_ = lock_type("Kokkos::Random_XorShift64::locks", num_states_);
+    state_ = state_data_type("Kokkos::Random_XorShift64::state", num_states_);
+
+    typename state_data_type::HostMirror h_state = create_mirror_view(state_);
+    typename lock_type::HostMirror h_lock        = create_mirror_view(locks_);
+
+    // Execute on the HostMirror's default execution space.
+    Random_XorShift64<typename state_data_type::HostMirror::execution_space>
+        gen(seed, 0);
+    for (int i = 0; i < 17; i++) gen.rand();
+    for (int i = 0; i < num_states_; i++) {
+      int n1     = gen.rand();
+      int n2     = gen.rand();
+      int n3     = gen.rand();
+      int n4     = gen.rand();
+      h_state(i) = (((static_cast<uint64_t>(n1)) & 0xffff) << 00) |
+                   (((static_cast<uint64_t>(n2)) & 0xffff) << 16) |
+                   (((static_cast<uint64_t>(n3)) & 0xffff) << 32) |
+                   (((static_cast<uint64_t>(n4)) & 0xffff) << 48);
+      h_lock(i) = 0;
     }
+    deep_copy(state_, h_state);
+    deep_copy(locks_, h_lock);
+  }
 
-    KOKKOS_INLINE_FUNCTION
-    Random_XorShift64_Pool(const Random_XorShift64_Pool& src):
-      locks_(src.locks_),
-      state_(src.state_),
-      num_states_(src.num_states_)
-    {}
-
-    KOKKOS_INLINE_FUNCTION
-    Random_XorShift64_Pool operator = (const Random_XorShift64_Pool& src) {
-      locks_ = src.locks_;
-      state_ = src.state_;
-      num_states_ = src.num_states_;
-      return *this;
-    }
-
-    void init(uint64_t seed, int num_states) {
-      if(seed==0)
-        seed = uint64_t(1318319);
-
-      num_states_ = num_states;
-
-      locks_ = lock_type("Kokkos::Random_XorShift64::locks",num_states_);
-      state_ = state_data_type("Kokkos::Random_XorShift64::state",num_states_);
-
-      typename state_data_type::HostMirror h_state = create_mirror_view(state_);
-      typename lock_type::HostMirror h_lock = create_mirror_view(locks_);
-
-      // Execute on the HostMirror's default execution space.
-      Random_XorShift64<typename state_data_type::HostMirror::execution_space> gen(seed,0);
-      for(int i = 0; i < 17; i++)
-        gen.rand();
-      for(int i = 0; i < num_states_; i++) {
-        int n1 = gen.rand();
-        int n2 = gen.rand();
-        int n3 = gen.rand();
-        int n4 = gen.rand();
-        h_state(i) = (((static_cast<uint64_t>(n1)) & 0xffff)<<00) |
-                     (((static_cast<uint64_t>(n2)) & 0xffff)<<16) |
-                     (((static_cast<uint64_t>(n3)) & 0xffff)<<32) |
-                     (((static_cast<uint64_t>(n4)) & 0xffff)<<48);
-        h_lock(i) = 0;
-      }
-      deep_copy(state_,h_state);
-      deep_copy(locks_,h_lock);
-    }
-
-    KOKKOS_INLINE_FUNCTION
-    Random_XorShift64<DeviceType> get_state() const {
+  KOKKOS_INLINE_FUNCTION
+  Random_XorShift64<DeviceType> get_state() const {
 #ifdef KOKKOS_ENABLE_DEPRECATED_CODE
-      const int i = DeviceType::hardware_thread_id();;
+    const int i = DeviceType::hardware_thread_id();
+    ;
 #else
-      const int i = DeviceType::impl_hardware_thread_id();;
+    const int i = DeviceType::impl_hardware_thread_id();
+    ;
 #endif
-      return Random_XorShift64<DeviceType>(state_(i),i);
-    }
+    return Random_XorShift64<DeviceType>(state_(i), i);
+  }
 
-    // NOTE: state_idx MUST be unique and less than num_states
-    KOKKOS_INLINE_FUNCTION
-    Random_XorShift64<DeviceType> get_state(const int state_idx) const {
-      return Random_XorShift64<DeviceType>(state_(state_idx),state_idx);
-    }
+  // NOTE: state_idx MUST be unique and less than num_states
+  KOKKOS_INLINE_FUNCTION
+  Random_XorShift64<DeviceType> get_state(const int state_idx) const {
+    return Random_XorShift64<DeviceType>(state_(state_idx), state_idx);
+  }
 
-    KOKKOS_INLINE_FUNCTION
-    void free_state(const Random_XorShift64<DeviceType>& state) const {
-      state_(state.state_idx_) = state.state_;
+  KOKKOS_INLINE_FUNCTION
+  void free_state(const Random_XorShift64<DeviceType>& state) const {
+    state_(state.state_idx_) = state.state_;
+  }
+};
+
+template <class DeviceType>
+class Random_XorShift1024_Pool;
+
+template <class DeviceType>
+class Random_XorShift1024 {
+ private:
+  int p_;
+  const int state_idx_;
+  uint64_t state_[16];
+  friend class Random_XorShift1024_Pool<DeviceType>;
+
+ public:
+  typedef Random_XorShift1024_Pool<DeviceType> pool_type;
+  typedef DeviceType device_type;
+
+  enum { MAX_URAND = 0xffffffffU };
+  enum { MAX_URAND64 = 0xffffffffffffffffULL - 1 };
+  enum { MAX_RAND = static_cast<int>(0xffffffffU / 2) };
+  enum { MAX_RAND64 = static_cast<int64_t>(0xffffffffffffffffULL / 2 - 1) };
+
+  KOKKOS_INLINE_FUNCTION
+  Random_XorShift1024(const typename pool_type::state_data_type& state, int p,
+                      int state_idx = 0)
+      : p_(p), state_idx_(state_idx) {
+    for (int i = 0; i < 16; i++) state_[i] = state(state_idx, i);
+  }
+
+  KOKKOS_INLINE_FUNCTION
+  uint32_t urand() {
+    uint64_t state_0 = state_[p_];
+    uint64_t state_1 = state_[p_ = (p_ + 1) & 15];
+    state_1 ^= state_1 << 31;
+    state_1 ^= state_1 >> 11;
+    state_0 ^= state_0 >> 30;
+    uint64_t tmp = (state_[p_] = state_0 ^ state_1) * 1181783497276652981ULL;
+    tmp          = tmp >> 16;
+    return static_cast<uint32_t>(tmp & MAX_URAND);
+  }
+
+  KOKKOS_INLINE_FUNCTION
+  uint64_t urand64() {
+    uint64_t state_0 = state_[p_];
+    uint64_t state_1 = state_[p_ = (p_ + 1) & 15];
+    state_1 ^= state_1 << 31;
+    state_1 ^= state_1 >> 11;
+    state_0 ^= state_0 >> 30;
+    return ((state_[p_] = state_0 ^ state_1) * 1181783497276652981LL) - 1;
+  }
+
+  KOKKOS_INLINE_FUNCTION
+  uint32_t urand(const uint32_t& range) {
+    const uint32_t max_val = (MAX_URAND / range) * range;
+    uint32_t tmp           = urand();
+    while (tmp >= max_val) tmp = urand();
+    return tmp % range;
+  }
+
+  KOKKOS_INLINE_FUNCTION
+  uint32_t urand(const uint32_t& start, const uint32_t& end) {
+    return urand(end - start) + start;
+  }
+
+  KOKKOS_INLINE_FUNCTION
+  uint64_t urand64(const uint64_t& range) {
+    const uint64_t max_val = (MAX_URAND64 / range) * range;
+    uint64_t tmp           = urand64();
+    while (tmp >= max_val) tmp = urand64();
+    return tmp % range;
+  }
+
+  KOKKOS_INLINE_FUNCTION
+  uint64_t urand64(const uint64_t& start, const uint64_t& end) {
+    return urand64(end - start) + start;
+  }
+
+  KOKKOS_INLINE_FUNCTION
+  int rand() { return static_cast<int>(urand() / 2); }
+
+  KOKKOS_INLINE_FUNCTION
+  int rand(const int& range) {
+    const int max_val = (MAX_RAND / range) * range;
+    int tmp           = rand();
+    while (tmp >= max_val) tmp = rand();
+    return tmp % range;
+  }
+
+  KOKKOS_INLINE_FUNCTION
+  int rand(const int& start, const int& end) {
+    return rand(end - start) + start;
+  }
+
+  KOKKOS_INLINE_FUNCTION
+  int64_t rand64() { return static_cast<int64_t>(urand64() / 2); }
+
+  KOKKOS_INLINE_FUNCTION
+  int64_t rand64(const int64_t& range) {
+    const int64_t max_val = (MAX_RAND64 / range) * range;
+    int64_t tmp           = rand64();
+    while (tmp >= max_val) tmp = rand64();
+    return tmp % range;
+  }
+
+  KOKKOS_INLINE_FUNCTION
+  int64_t rand64(const int64_t& start, const int64_t& end) {
+    return rand64(end - start) + start;
+  }
+
+  KOKKOS_INLINE_FUNCTION
+  float frand() { return 1.0f * urand64() / MAX_URAND64; }
+
+  KOKKOS_INLINE_FUNCTION
+  float frand(const float& range) { return range * urand64() / MAX_URAND64; }
+
+  KOKKOS_INLINE_FUNCTION
+  float frand(const float& start, const float& end) {
+    return frand(end - start) + start;
+  }
+
+  KOKKOS_INLINE_FUNCTION
+  double drand() { return 1.0 * urand64() / MAX_URAND64; }
+
+  KOKKOS_INLINE_FUNCTION
+  double drand(const double& range) { return range * urand64() / MAX_URAND64; }
+
+  KOKKOS_INLINE_FUNCTION
+  double drand(const double& start, const double& end) {
+    return frand(end - start) + start;
+  }
+
+  // Marsaglia polar method for drawing a standard normal distributed random
+  // number
+  KOKKOS_INLINE_FUNCTION
+  double normal() {
+    double S = 2.0;
+    double U;
+    while (S >= 1.0) {
+      U              = 2.0 * drand() - 1.0;
+      const double V = 2.0 * drand() - 1.0;
+      S              = U * U + V * V;
     }
+    return U * std::sqrt(-2.0 * log(S) / S);
+  }
+
+  KOKKOS_INLINE_FUNCTION
+  double normal(const double& mean, const double& std_dev = 1.0) {
+    return mean + normal() * std_dev;
+  }
+};
+
+template <class DeviceType = Kokkos::DefaultExecutionSpace>
+class Random_XorShift1024_Pool {
+ private:
+  typedef View<int*, DeviceType> int_view_type;
+  typedef View<uint64_t * [16], DeviceType> state_data_type;
+
+  int_view_type locks_;
+  state_data_type state_;
+  int_view_type p_;
+  int num_states_;
+  friend class Random_XorShift1024<DeviceType>;
+
+ public:
+  typedef Random_XorShift1024<DeviceType> generator_type;
+
+  typedef DeviceType device_type;
+
+  KOKKOS_INLINE_FUNCTION
+  Random_XorShift1024_Pool() { num_states_ = 0; }
+
+  inline Random_XorShift1024_Pool(uint64_t seed) {
+    num_states_ = 0;
+#ifdef KOKKOS_ENABLE_DEPRECATED_CODE
+    init(seed, DeviceType::max_hardware_threads());
+#else
+    init(seed, DeviceType::impl_max_hardware_threads());
+#endif
+  }
+
+  KOKKOS_INLINE_FUNCTION
+  Random_XorShift1024_Pool(const Random_XorShift1024_Pool& src)
+      : locks_(src.locks_),
+        state_(src.state_),
+        p_(src.p_),
+        num_states_(src.num_states_) {}
+
+  KOKKOS_INLINE_FUNCTION
+  Random_XorShift1024_Pool operator=(const Random_XorShift1024_Pool& src) {
+    locks_      = src.locks_;
+    state_      = src.state_;
+    p_          = src.p_;
+    num_states_ = src.num_states_;
+    return *this;
+  }
+
+  inline void init(uint64_t seed, int num_states) {
+    if (seed == 0) seed = uint64_t(1318319);
+    num_states_ = num_states;
+    locks_ = int_view_type("Kokkos::Random_XorShift1024::locks", num_states_);
+    state_ = state_data_type("Kokkos::Random_XorShift1024::state", num_states_);
+    p_     = int_view_type("Kokkos::Random_XorShift1024::p", num_states_);
+
+    typename state_data_type::HostMirror h_state = create_mirror_view(state_);
+    typename int_view_type::HostMirror h_lock    = create_mirror_view(locks_);
+    typename int_view_type::HostMirror h_p       = create_mirror_view(p_);
+
+    // Execute on the HostMirror's default execution space.
+    Random_XorShift64<typename state_data_type::HostMirror::execution_space>
+        gen(seed, 0);
+    for (int i = 0; i < 17; i++) gen.rand();
+    for (int i = 0; i < num_states_; i++) {
+      for (int j = 0; j < 16; j++) {
+        int n1        = gen.rand();
+        int n2        = gen.rand();
+        int n3        = gen.rand();
+        int n4        = gen.rand();
+        h_state(i, j) = (((static_cast<uint64_t>(n1)) & 0xffff) << 00) |
+                        (((static_cast<uint64_t>(n2)) & 0xffff) << 16) |
+                        (((static_cast<uint64_t>(n3)) & 0xffff) << 32) |
+                        (((static_cast<uint64_t>(n4)) & 0xffff) << 48);
+      }
+      h_p(i)    = 0;
+      h_lock(i) = 0;
+    }
+    deep_copy(state_, h_state);
+    deep_copy(locks_, h_lock);
+  }
+
+  KOKKOS_INLINE_FUNCTION
+  Random_XorShift1024<DeviceType> get_state() const {
+#ifdef KOKKOS_ENABLE_DEPRECATED_CODE
+    const int i = DeviceType::hardware_thread_id();
+#else
+    const int i = DeviceType::impl_hardware_thread_id();
+#endif
+    return Random_XorShift1024<DeviceType>(state_, p_(i), i);
   };
 
+  // NOTE: state_idx MUST be unique and less than num_states
+  KOKKOS_INLINE_FUNCTION
+  Random_XorShift1024<DeviceType> get_state(const int state_idx) const {
+    return Random_XorShift1024<DeviceType>(state_, p_(state_idx), state_idx);
+  }
 
-  template<class DeviceType>
-  class Random_XorShift1024_Pool;
-
-  template<class DeviceType>
-  class Random_XorShift1024 {
-  private:
-    int p_;
-    const int state_idx_;
-    uint64_t state_[16];
-    friend class Random_XorShift1024_Pool<DeviceType>;
-  public:
-
-    typedef Random_XorShift1024_Pool<DeviceType> pool_type;
-    typedef DeviceType device_type;
-
-    enum {MAX_URAND = 0xffffffffU};
-    enum {MAX_URAND64 = 0xffffffffffffffffULL-1};
-    enum {MAX_RAND = static_cast<int>(0xffffffffU/2)};
-    enum {MAX_RAND64 = static_cast<int64_t>(0xffffffffffffffffULL/2-1)};
-
-    KOKKOS_INLINE_FUNCTION
-    Random_XorShift1024 (const typename pool_type::state_data_type& state, int p, int state_idx = 0):
-      p_(p),state_idx_(state_idx){
-      for(int i=0 ; i<16; i++)
-        state_[i] = state(state_idx,i);
-    }
-
-    KOKKOS_INLINE_FUNCTION
-    uint32_t urand() {
-      uint64_t state_0 = state_[ p_ ];
-      uint64_t state_1 = state_[ p_ = ( p_ + 1 ) & 15 ];
-      state_1 ^= state_1 << 31;
-      state_1 ^= state_1 >> 11;
-      state_0 ^= state_0 >> 30;
-      uint64_t tmp = ( state_[ p_ ] = state_0 ^ state_1 ) * 1181783497276652981ULL;
-      tmp = tmp>>16;
-      return static_cast<uint32_t>(tmp&MAX_URAND);
-    }
-
-    KOKKOS_INLINE_FUNCTION
-    uint64_t urand64() {
-      uint64_t state_0 = state_[ p_ ];
-      uint64_t state_1 = state_[ p_ = ( p_ + 1 ) & 15 ];
-      state_1 ^= state_1 << 31;
-      state_1 ^= state_1 >> 11;
-      state_0 ^= state_0 >> 30;
-      return (( state_[ p_ ] = state_0 ^ state_1 ) * 1181783497276652981LL) - 1;
-    }
-
-    KOKKOS_INLINE_FUNCTION
-    uint32_t urand(const uint32_t& range) {
-      const uint32_t max_val = (MAX_URAND/range)*range;
-      uint32_t tmp = urand();
-      while(tmp>=max_val)
-        tmp = urand();
-      return tmp%range;
-    }
-
-    KOKKOS_INLINE_FUNCTION
-    uint32_t urand(const uint32_t& start, const uint32_t& end ) {
-      return urand(end-start)+start;
-    }
-
-    KOKKOS_INLINE_FUNCTION
-    uint64_t urand64(const uint64_t& range) {
-      const uint64_t max_val = (MAX_URAND64/range)*range;
-      uint64_t tmp = urand64();
-      while(tmp>=max_val)
-        tmp = urand64();
-      return tmp%range;
-    }
-
-    KOKKOS_INLINE_FUNCTION
-    uint64_t urand64(const uint64_t& start, const uint64_t& end ) {
-      return urand64(end-start)+start;
-    }
-
-    KOKKOS_INLINE_FUNCTION
-    int rand() {
-      return static_cast<int>(urand()/2);
-    }
-
-    KOKKOS_INLINE_FUNCTION
-    int rand(const int& range) {
-      const int max_val = (MAX_RAND/range)*range;
-      int tmp = rand();
-      while(tmp>=max_val)
-        tmp = rand();
-      return tmp%range;
-    }
-
-    KOKKOS_INLINE_FUNCTION
-    int rand(const int& start, const int& end ) {
-      return rand(end-start)+start;
-    }
-
-    KOKKOS_INLINE_FUNCTION
-    int64_t rand64() {
-      return static_cast<int64_t>(urand64()/2);
-    }
-
-    KOKKOS_INLINE_FUNCTION
-    int64_t rand64(const int64_t& range) {
-      const int64_t max_val = (MAX_RAND64/range)*range;
-      int64_t tmp = rand64();
-      while(tmp>=max_val)
-        tmp = rand64();
-      return tmp%range;
-    }
-
-    KOKKOS_INLINE_FUNCTION
-    int64_t rand64(const int64_t& start, const int64_t& end ) {
-      return rand64(end-start)+start;
-    }
-
-    KOKKOS_INLINE_FUNCTION
-    float frand() {
-      return 1.0f * urand64()/MAX_URAND64;
-    }
-
-    KOKKOS_INLINE_FUNCTION
-    float frand(const float& range) {
-      return range * urand64()/MAX_URAND64;
-    }
-
-    KOKKOS_INLINE_FUNCTION
-    float frand(const float& start, const float& end ) {
-      return frand(end-start)+start;
-    }
-
-    KOKKOS_INLINE_FUNCTION
-    double drand() {
-      return 1.0 * urand64()/MAX_URAND64;
-    }
-
-    KOKKOS_INLINE_FUNCTION
-    double drand(const double& range) {
-      return range * urand64()/MAX_URAND64;
-    }
-
-    KOKKOS_INLINE_FUNCTION
-    double drand(const double& start, const double& end ) {
-      return frand(end-start)+start;
-    }
-
-    //Marsaglia polar method for drawing a standard normal distributed random number
-    KOKKOS_INLINE_FUNCTION
-    double normal() {
-      double S = 2.0;
-      double U;
-      while(S>=1.0) {
-        U = 2.0*drand() - 1.0;
-        const double V = 2.0*drand() - 1.0;
-        S = U*U+V*V;
-      }
-      return U*std::sqrt(-2.0*log(S)/S);
-    }
-
-    KOKKOS_INLINE_FUNCTION
-    double normal(const double& mean, const double& std_dev=1.0) {
-      return mean + normal()*std_dev;
-    }
-  };
-
-
-  template<class DeviceType = Kokkos::DefaultExecutionSpace>
-  class Random_XorShift1024_Pool {
-  private:
-    typedef View<int*,DeviceType> int_view_type;
-    typedef View<uint64_t*[16],DeviceType> state_data_type;
-
-    int_view_type locks_;
-    state_data_type state_;
-    int_view_type p_;
-    int num_states_;
-    friend class Random_XorShift1024<DeviceType>;
-
-  public:
-    typedef Random_XorShift1024<DeviceType> generator_type;
-
-    typedef DeviceType device_type;
-
-    KOKKOS_INLINE_FUNCTION
-    Random_XorShift1024_Pool() {
-      num_states_ = 0;
-    }
-
-    inline
-    Random_XorShift1024_Pool(uint64_t seed){
-      num_states_ = 0;
-#ifdef KOKKOS_ENABLE_DEPRECATED_CODE
-      init(seed,DeviceType::max_hardware_threads());
-#else
-      init(seed,DeviceType::impl_max_hardware_threads());
-#endif
-    }
-
-    KOKKOS_INLINE_FUNCTION
-    Random_XorShift1024_Pool(const Random_XorShift1024_Pool& src):
-      locks_(src.locks_),
-      state_(src.state_),
-      p_(src.p_),
-      num_states_(src.num_states_)
-    {}
-
-    KOKKOS_INLINE_FUNCTION
-    Random_XorShift1024_Pool operator = (const Random_XorShift1024_Pool& src) {
-      locks_ = src.locks_;
-      state_ = src.state_;
-      p_ = src.p_;
-      num_states_ = src.num_states_;
-      return *this;
-    }
-
-    inline
-    void init(uint64_t seed, int num_states) {
-      if(seed==0)
-        seed = uint64_t(1318319);
-      num_states_ = num_states;
-      locks_ = int_view_type("Kokkos::Random_XorShift1024::locks",num_states_);
-      state_ = state_data_type("Kokkos::Random_XorShift1024::state",num_states_);
-      p_ = int_view_type("Kokkos::Random_XorShift1024::p",num_states_);
-
-      typename state_data_type::HostMirror h_state = create_mirror_view(state_);
-      typename int_view_type::HostMirror h_lock = create_mirror_view(locks_);
-      typename int_view_type::HostMirror h_p = create_mirror_view(p_);
-
-      // Execute on the HostMirror's default execution space.
-      Random_XorShift64<typename state_data_type::HostMirror::execution_space> gen(seed,0);
-      for(int i = 0; i < 17; i++)
-        gen.rand();
-      for(int i = 0; i < num_states_; i++) {
-        for(int j = 0; j < 16 ; j++) {
-          int n1 = gen.rand();
-          int n2 = gen.rand();
-          int n3 = gen.rand();
-          int n4 = gen.rand();
-          h_state(i,j) = (((static_cast<uint64_t>(n1)) & 0xffff)<<00) |
-                         (((static_cast<uint64_t>(n2)) & 0xffff)<<16) |
-                         (((static_cast<uint64_t>(n3)) & 0xffff)<<32) |
-                         (((static_cast<uint64_t>(n4)) & 0xffff)<<48);
-        }
-        h_p(i) = 0;
-        h_lock(i) = 0;
-      }
-      deep_copy(state_,h_state);
-      deep_copy(locks_,h_lock);
-    }
-
-    KOKKOS_INLINE_FUNCTION
-    Random_XorShift1024<DeviceType> get_state() const {
-#ifdef KOKKOS_ENABLE_DEPRECATED_CODE
-      const int i = DeviceType::hardware_thread_id();
-#else
-      const int i = DeviceType::impl_hardware_thread_id();
-#endif
-      return Random_XorShift1024<DeviceType>(state_,p_(i),i);
-    };
-
-    // NOTE: state_idx MUST be unique and less than num_states
-    KOKKOS_INLINE_FUNCTION
-    Random_XorShift1024<DeviceType> get_state(const int state_idx) const {
-      return Random_XorShift1024<DeviceType>(state_,p_(state_idx),state_idx);
-    }
-
-    KOKKOS_INLINE_FUNCTION
-    void free_state(const Random_XorShift1024<DeviceType>& state) const {
-      for(int i = 0; i<16; i++)
-        state_(state.state_idx_,i) = state.state_[i];
-      p_(state.state_idx_) = state.p_;
-    }
-  };
+  KOKKOS_INLINE_FUNCTION
+  void free_state(const Random_XorShift1024<DeviceType>& state) const {
+    for (int i = 0; i < 16; i++) state_(state.state_idx_, i) = state.state_[i];
+    p_(state.state_idx_) = state.p_;
+  }
+};
 
 #if defined(KOKKOS_ENABLE_CUDA) && defined(__CUDACC__)
 
-  template<>
-  class Random_XorShift1024<Kokkos::Cuda> {
-  private:
-    int p_;
-    const int state_idx_;
-    uint64_t* state_;
-    const int stride_;
-    friend class Random_XorShift1024_Pool<Kokkos::Cuda>;
-  public:
+template <>
+class Random_XorShift1024<Kokkos::Cuda> {
+ private:
+  int p_;
+  const int state_idx_;
+  uint64_t* state_;
+  const int stride_;
+  friend class Random_XorShift1024_Pool<Kokkos::Cuda>;
 
-    typedef Kokkos::Cuda device_type;
-    typedef Random_XorShift1024_Pool<device_type> pool_type;
+ public:
+  typedef Kokkos::Cuda device_type;
+  typedef Random_XorShift1024_Pool<device_type> pool_type;
 
-    enum {MAX_URAND = 0xffffffffU};
-    enum {MAX_URAND64 = 0xffffffffffffffffULL-1};
-    enum {MAX_RAND = static_cast<int>(0xffffffffU/2)};
-    enum {MAX_RAND64 = static_cast<int64_t>(0xffffffffffffffffULL/2-1)};
+  enum { MAX_URAND = 0xffffffffU };
+  enum { MAX_URAND64 = 0xffffffffffffffffULL - 1 };
+  enum { MAX_RAND = static_cast<int>(0xffffffffU / 2) };
+  enum { MAX_RAND64 = static_cast<int64_t>(0xffffffffffffffffULL / 2 - 1) };
 
-    KOKKOS_INLINE_FUNCTION
-    Random_XorShift1024 (const typename pool_type::state_data_type& state, int p, int state_idx = 0):
-      p_(p),state_idx_(state_idx),state_(&state(state_idx,0)),stride_(state.stride_1()){
-    }
+  KOKKOS_INLINE_FUNCTION
+  Random_XorShift1024(const typename pool_type::state_data_type& state, int p,
+                      int state_idx = 0)
+      : p_(p),
+        state_idx_(state_idx),
+        state_(&state(state_idx, 0)),
+        stride_(state.stride_1()) {}
 
-    KOKKOS_INLINE_FUNCTION
-    uint32_t urand() {
-      uint64_t state_0 = state_[ p_ * stride_ ];
-      uint64_t state_1 = state_[ (p_ = ( p_ + 1 ) & 15) * stride_ ];
-      state_1 ^= state_1 << 31;
-      state_1 ^= state_1 >> 11;
-      state_0 ^= state_0 >> 30;
-      uint64_t tmp = ( state_[ p_ * stride_ ] = state_0 ^ state_1 ) * 1181783497276652981ULL;
-      tmp = tmp>>16;
-      return static_cast<uint32_t>(tmp&MAX_URAND);
-    }
-
-    KOKKOS_INLINE_FUNCTION
-    uint64_t urand64() {
-      uint64_t state_0 = state_[ p_ * stride_ ];
-      uint64_t state_1 = state_[ (p_ = ( p_ + 1 ) & 15) * stride_ ];
-      state_1 ^= state_1 << 31;
-      state_1 ^= state_1 >> 11;
-      state_0 ^= state_0 >> 30;
-      return (( state_[ p_ * stride_ ] = state_0 ^ state_1 ) * 1181783497276652981LL) - 1;
-    }
-
-    KOKKOS_INLINE_FUNCTION
-    uint32_t urand(const uint32_t& range) {
-      const uint32_t max_val = (MAX_URAND/range)*range;
-      uint32_t tmp = urand();
-      while(tmp>=max_val)
-        urand();
-      return tmp%range;
-    }
-
-    KOKKOS_INLINE_FUNCTION
-    uint32_t urand(const uint32_t& start, const uint32_t& end ) {
-      return urand(end-start)+start;
-    }
-
-    KOKKOS_INLINE_FUNCTION
-    uint64_t urand64(const uint64_t& range) {
-      const uint64_t max_val = (MAX_URAND64/range)*range;
-      uint64_t tmp = urand64();
-      while(tmp>=max_val)
-        urand64();
-      return tmp%range;
-    }
-
-    KOKKOS_INLINE_FUNCTION
-    uint64_t urand64(const uint64_t& start, const uint64_t& end ) {
-      return urand64(end-start)+start;
-    }
-
-    KOKKOS_INLINE_FUNCTION
-    int rand() {
-      return static_cast<int>(urand()/2);
-    }
-
-    KOKKOS_INLINE_FUNCTION
-    int rand(const int& range) {
-      const int max_val = (MAX_RAND/range)*range;
-      int tmp = rand();
-      while(tmp>=max_val)
-        rand();
-      return tmp%range;
-    }
-
-    KOKKOS_INLINE_FUNCTION
-    int rand(const int& start, const int& end ) {
-      return rand(end-start)+start;
-    }
-
-    KOKKOS_INLINE_FUNCTION
-    int64_t rand64() {
-      return static_cast<int64_t>(urand64()/2);
-    }
-
-    KOKKOS_INLINE_FUNCTION
-    int64_t rand64(const int64_t& range) {
-      const int64_t max_val = (MAX_RAND64/range)*range;
-      int64_t tmp = rand64();
-      while(tmp>=max_val)
-        rand64();
-      return tmp%range;
-    }
-
-    KOKKOS_INLINE_FUNCTION
-    int64_t rand64(const int64_t& start, const int64_t& end ) {
-      return rand64(end-start)+start;
-    }
-
-    KOKKOS_INLINE_FUNCTION
-    float frand() {
-      return 1.0f * urand64()/MAX_URAND64;
-    }
-
-    KOKKOS_INLINE_FUNCTION
-    float frand(const float& range) {
-      return range * urand64()/MAX_URAND64;
-    }
-
-    KOKKOS_INLINE_FUNCTION
-    float frand(const float& start, const float& end ) {
-      return frand(end-start)+start;
-    }
-
-    KOKKOS_INLINE_FUNCTION
-    double drand() {
-      return 1.0 * urand64()/MAX_URAND64;
-    }
-
-    KOKKOS_INLINE_FUNCTION
-    double drand(const double& range) {
-      return range * urand64()/MAX_URAND64;
-    }
-
-    KOKKOS_INLINE_FUNCTION
-    double drand(const double& start, const double& end ) {
-      return frand(end-start)+start;
-    }
-
-    //Marsaglia polar method for drawing a standard normal distributed random number
-    KOKKOS_INLINE_FUNCTION
-    double normal() {
-      double S = 2.0;
-      double U;
-      while(S>=1.0) {
-        U = 2.0*drand() - 1.0;
-        const double V = 2.0*drand() - 1.0;
-        S = U*U+V*V;
-      }
-      return U*std::sqrt(-2.0*log(S)/S);
-    }
-
-    KOKKOS_INLINE_FUNCTION
-    double normal(const double& mean, const double& std_dev=1.0) {
-      return mean + normal()*std_dev;
-    }
-  };
-
-template<>
-inline
-Random_XorShift64_Pool<Kokkos::Cuda>::Random_XorShift64_Pool(uint64_t seed) {
-  num_states_ = 0;
-  init(seed,4*32768);
-}
-
-template<>
-KOKKOS_INLINE_FUNCTION
-Random_XorShift64<Kokkos::Cuda> Random_XorShift64_Pool<Kokkos::Cuda>::get_state() const {
-#ifdef __CUDA_ARCH__
-  const int i_offset = (threadIdx.x*blockDim.y + threadIdx.y)*blockDim.z+threadIdx.z;
-  int i = (((blockIdx.x*gridDim.y+blockIdx.y)*gridDim.z + blockIdx.z) *
-           blockDim.x*blockDim.y*blockDim.z + i_offset)%num_states_;
-  while(Kokkos::atomic_compare_exchange(&locks_(i),0,1)) {
-      i+=blockDim.x*blockDim.y*blockDim.z;
-      if(i>=num_states_) {i = i_offset;}
+  KOKKOS_INLINE_FUNCTION
+  uint32_t urand() {
+    uint64_t state_0 = state_[p_ * stride_];
+    uint64_t state_1 = state_[(p_ = (p_ + 1) & 15) * stride_];
+    state_1 ^= state_1 << 31;
+    state_1 ^= state_1 >> 11;
+    state_0 ^= state_0 >> 30;
+    uint64_t tmp =
+        (state_[p_ * stride_] = state_0 ^ state_1) * 1181783497276652981ULL;
+    tmp = tmp >> 16;
+    return static_cast<uint32_t>(tmp & MAX_URAND);
   }
 
-  return Random_XorShift64<Kokkos::Cuda>(state_(i),i);
+  KOKKOS_INLINE_FUNCTION
+  uint64_t urand64() {
+    uint64_t state_0 = state_[p_ * stride_];
+    uint64_t state_1 = state_[(p_ = (p_ + 1) & 15) * stride_];
+    state_1 ^= state_1 << 31;
+    state_1 ^= state_1 >> 11;
+    state_0 ^= state_0 >> 30;
+    return ((state_[p_ * stride_] = state_0 ^ state_1) *
+            1181783497276652981LL) -
+           1;
+  }
+
+  KOKKOS_INLINE_FUNCTION
+  uint32_t urand(const uint32_t& range) {
+    const uint32_t max_val = (MAX_URAND / range) * range;
+    uint32_t tmp           = urand();
+    while (tmp >= max_val) urand();
+    return tmp % range;
+  }
+
+  KOKKOS_INLINE_FUNCTION
+  uint32_t urand(const uint32_t& start, const uint32_t& end) {
+    return urand(end - start) + start;
+  }
+
+  KOKKOS_INLINE_FUNCTION
+  uint64_t urand64(const uint64_t& range) {
+    const uint64_t max_val = (MAX_URAND64 / range) * range;
+    uint64_t tmp           = urand64();
+    while (tmp >= max_val) urand64();
+    return tmp % range;
+  }
+
+  KOKKOS_INLINE_FUNCTION
+  uint64_t urand64(const uint64_t& start, const uint64_t& end) {
+    return urand64(end - start) + start;
+  }
+
+  KOKKOS_INLINE_FUNCTION
+  int rand() { return static_cast<int>(urand() / 2); }
+
+  KOKKOS_INLINE_FUNCTION
+  int rand(const int& range) {
+    const int max_val = (MAX_RAND / range) * range;
+    int tmp           = rand();
+    while (tmp >= max_val) rand();
+    return tmp % range;
+  }
+
+  KOKKOS_INLINE_FUNCTION
+  int rand(const int& start, const int& end) {
+    return rand(end - start) + start;
+  }
+
+  KOKKOS_INLINE_FUNCTION
+  int64_t rand64() { return static_cast<int64_t>(urand64() / 2); }
+
+  KOKKOS_INLINE_FUNCTION
+  int64_t rand64(const int64_t& range) {
+    const int64_t max_val = (MAX_RAND64 / range) * range;
+    int64_t tmp           = rand64();
+    while (tmp >= max_val) rand64();
+    return tmp % range;
+  }
+
+  KOKKOS_INLINE_FUNCTION
+  int64_t rand64(const int64_t& start, const int64_t& end) {
+    return rand64(end - start) + start;
+  }
+
+  KOKKOS_INLINE_FUNCTION
+  float frand() { return 1.0f * urand64() / MAX_URAND64; }
+
+  KOKKOS_INLINE_FUNCTION
+  float frand(const float& range) { return range * urand64() / MAX_URAND64; }
+
+  KOKKOS_INLINE_FUNCTION
+  float frand(const float& start, const float& end) {
+    return frand(end - start) + start;
+  }
+
+  KOKKOS_INLINE_FUNCTION
+  double drand() { return 1.0 * urand64() / MAX_URAND64; }
+
+  KOKKOS_INLINE_FUNCTION
+  double drand(const double& range) { return range * urand64() / MAX_URAND64; }
+
+  KOKKOS_INLINE_FUNCTION
+  double drand(const double& start, const double& end) {
+    return frand(end - start) + start;
+  }
+
+  // Marsaglia polar method for drawing a standard normal distributed random
+  // number
+  KOKKOS_INLINE_FUNCTION
+  double normal() {
+    double S = 2.0;
+    double U;
+    while (S >= 1.0) {
+      U              = 2.0 * drand() - 1.0;
+      const double V = 2.0 * drand() - 1.0;
+      S              = U * U + V * V;
+    }
+    return U * std::sqrt(-2.0 * log(S) / S);
+  }
+
+  KOKKOS_INLINE_FUNCTION
+  double normal(const double& mean, const double& std_dev = 1.0) {
+    return mean + normal() * std_dev;
+  }
+};
+
+template <>
+inline Random_XorShift64_Pool<Kokkos::Cuda>::Random_XorShift64_Pool(
+    uint64_t seed) {
+  num_states_ = 0;
+  init(seed, 4 * 32768);
+}
+
+template <>
+KOKKOS_INLINE_FUNCTION Random_XorShift64<Kokkos::Cuda>
+Random_XorShift64_Pool<Kokkos::Cuda>::get_state() const {
+#ifdef __CUDA_ARCH__
+  const int i_offset =
+      (threadIdx.x * blockDim.y + threadIdx.y) * blockDim.z + threadIdx.z;
+  int i = (((blockIdx.x * gridDim.y + blockIdx.y) * gridDim.z + blockIdx.z) *
+               blockDim.x * blockDim.y * blockDim.z +
+           i_offset) %
+          num_states_;
+  while (Kokkos::atomic_compare_exchange(&locks_(i), 0, 1)) {
+    i += blockDim.x * blockDim.y * blockDim.z;
+    if (i >= num_states_) {
+      i = i_offset;
+    }
+  }
+
+  return Random_XorShift64<Kokkos::Cuda>(state_(i), i);
 #else
-  return Random_XorShift64<Kokkos::Cuda>(state_(0),0);
+  return Random_XorShift64<Kokkos::Cuda>(state_(0), 0);
 #endif
 }
 
-template<>
-KOKKOS_INLINE_FUNCTION
-void Random_XorShift64_Pool<Kokkos::Cuda>::free_state(const Random_XorShift64<Kokkos::Cuda> &state) const {
+template <>
+KOKKOS_INLINE_FUNCTION void Random_XorShift64_Pool<Kokkos::Cuda>::free_state(
+    const Random_XorShift64<Kokkos::Cuda>& state) const {
   state_(state.state_idx_) = state.state_;
 #ifdef __CUDA_ARCH__
   locks_(state.state_idx_) = 0;
@@ -1249,24 +1211,28 @@ void Random_XorShift64_Pool<Kokkos::Cuda>::free_state(const Random_XorShift64<Ko
 #endif
 }
 
-
-template<>
-inline
-Random_XorShift1024_Pool<Kokkos::Cuda>::Random_XorShift1024_Pool(uint64_t seed) {
+template <>
+inline Random_XorShift1024_Pool<Kokkos::Cuda>::Random_XorShift1024_Pool(
+    uint64_t seed) {
   num_states_ = 0;
-  init(seed,4*32768);
+  init(seed, 4 * 32768);
 }
 
-template<>
-KOKKOS_INLINE_FUNCTION
-Random_XorShift1024<Kokkos::Cuda> Random_XorShift1024_Pool<Kokkos::Cuda>::get_state() const {
+template <>
+KOKKOS_INLINE_FUNCTION Random_XorShift1024<Kokkos::Cuda>
+Random_XorShift1024_Pool<Kokkos::Cuda>::get_state() const {
 #ifdef __CUDA_ARCH__
-  const int i_offset = (threadIdx.x*blockDim.y + threadIdx.y)*blockDim.z+threadIdx.z;
-  int i = (((blockIdx.x*gridDim.y+blockIdx.y)*gridDim.z + blockIdx.z) *
-           blockDim.x*blockDim.y*blockDim.z + i_offset)%num_states_;
-  while(Kokkos::atomic_compare_exchange(&locks_(i),0,1)) {
-      i+=blockDim.x*blockDim.y*blockDim.z;
-      if(i>=num_states_) {i = i_offset;}
+  const int i_offset =
+      (threadIdx.x * blockDim.y + threadIdx.y) * blockDim.z + threadIdx.z;
+  int i = (((blockIdx.x * gridDim.y + blockIdx.y) * gridDim.z + blockIdx.z) *
+               blockDim.x * blockDim.y * blockDim.z +
+           i_offset) %
+          num_states_;
+  while (Kokkos::atomic_compare_exchange(&locks_(i), 0, 1)) {
+    i += blockDim.x * blockDim.y * blockDim.z;
+    if (i >= num_states_) {
+      i = i_offset;
+    }
   }
 
   return Random_XorShift1024<Kokkos::Cuda>(state_, p_(i), i);
@@ -1275,210 +1241,205 @@ Random_XorShift1024<Kokkos::Cuda> Random_XorShift1024_Pool<Kokkos::Cuda>::get_st
 #endif
 }
 
-template<>
-KOKKOS_INLINE_FUNCTION
-void Random_XorShift1024_Pool<Kokkos::Cuda>::free_state(const Random_XorShift1024<Kokkos::Cuda> &state) const {
-  for(int i=0; i<16; i++)
-    state_(state.state_idx_,i) = state.state_[i];
+template <>
+KOKKOS_INLINE_FUNCTION void Random_XorShift1024_Pool<Kokkos::Cuda>::free_state(
+    const Random_XorShift1024<Kokkos::Cuda>& state) const {
+  for (int i = 0; i < 16; i++) state_(state.state_idx_, i) = state.state_[i];
 #ifdef __CUDA_ARCH__
   locks_(state.state_idx_) = 0;
   return;
 #endif
 }
 
-
 #endif
 
-#if defined(KOKKOS_ENABLE_ROCM) 
+#if defined(KOKKOS_ENABLE_ROCM)
 
-  template<>
-  class Random_XorShift1024<Kokkos::Experimental::ROCm> {
-  private:
-    int p_;
-    const int state_idx_;
-    uint64_t* state_;
-    const int stride_;
-    friend class Random_XorShift1024_Pool<Kokkos::Experimental::ROCm>;
-  public:
+template <>
+class Random_XorShift1024<Kokkos::Experimental::ROCm> {
+ private:
+  int p_;
+  const int state_idx_;
+  uint64_t* state_;
+  const int stride_;
+  friend class Random_XorShift1024_Pool<Kokkos::Experimental::ROCm>;
 
-    typedef Kokkos::Experimental::ROCm device_type;
-    typedef Random_XorShift1024_Pool<device_type> pool_type;
+ public:
+  typedef Kokkos::Experimental::ROCm device_type;
+  typedef Random_XorShift1024_Pool<device_type> pool_type;
 
-    enum {MAX_URAND = 0xffffffffU};
-    enum {MAX_URAND64 = 0xffffffffffffffffULL-1};
-    enum {MAX_RAND = static_cast<int>(0xffffffffU/2)};
-    enum {MAX_RAND64 = static_cast<int64_t>(0xffffffffffffffffULL/2-1)};
+  enum { MAX_URAND = 0xffffffffU };
+  enum { MAX_URAND64 = 0xffffffffffffffffULL - 1 };
+  enum { MAX_RAND = static_cast<int>(0xffffffffU / 2) };
+  enum { MAX_RAND64 = static_cast<int64_t>(0xffffffffffffffffULL / 2 - 1) };
 
-    KOKKOS_INLINE_FUNCTION
-    Random_XorShift1024 (const typename pool_type::state_data_type& state, int p, int state_idx = 0):
-      p_(p),state_idx_(state_idx),state_(&state(state_idx,0)),stride_(state.stride_1()){
-    }
+  KOKKOS_INLINE_FUNCTION
+  Random_XorShift1024(const typename pool_type::state_data_type& state, int p,
+                      int state_idx = 0)
+      : p_(p),
+        state_idx_(state_idx),
+        state_(&state(state_idx, 0)),
+        stride_(state.stride_1()) {}
 
-    KOKKOS_INLINE_FUNCTION
-    uint32_t urand() {
-      uint64_t state_0 = state_[ p_ * stride_ ];
-      uint64_t state_1 = state_[ (p_ = ( p_ + 1 ) & 15) * stride_ ];
-      state_1 ^= state_1 << 31;
-      state_1 ^= state_1 >> 11;
-      state_0 ^= state_0 >> 30;
-      uint64_t tmp = ( state_[ p_ * stride_ ] = state_0 ^ state_1 ) * 1181783497276652981ULL;
-      tmp = tmp>>16;
-      return static_cast<uint32_t>(tmp&MAX_URAND);
-    }
-
-    KOKKOS_INLINE_FUNCTION
-    uint64_t urand64() {
-      uint64_t state_0 = state_[ p_ * stride_ ];
-      uint64_t state_1 = state_[ (p_ = ( p_ + 1 ) & 15) * stride_ ];
-      state_1 ^= state_1 << 31;
-      state_1 ^= state_1 >> 11;
-      state_0 ^= state_0 >> 30;
-      return (( state_[ p_ * stride_ ] = state_0 ^ state_1 ) * 1181783497276652981LL) - 1;
-    }
-
-    KOKKOS_INLINE_FUNCTION
-    uint32_t urand(const uint32_t& range) {
-      const uint32_t max_val = (MAX_URAND/range)*range;
-      uint32_t tmp = urand();
-      while(tmp>=max_val)
-        urand();
-      return tmp%range;
-    }
-
-    KOKKOS_INLINE_FUNCTION
-    uint32_t urand(const uint32_t& start, const uint32_t& end ) {
-      return urand(end-start)+start;
-    }
-
-    KOKKOS_INLINE_FUNCTION
-    uint64_t urand64(const uint64_t& range) {
-      const uint64_t max_val = (MAX_URAND64/range)*range;
-      uint64_t tmp = urand64();
-      while(tmp>=max_val)
-        urand64();
-      return tmp%range;
-    }
-
-    KOKKOS_INLINE_FUNCTION
-    uint64_t urand64(const uint64_t& start, const uint64_t& end ) {
-      return urand64(end-start)+start;
-    }
-
-    KOKKOS_INLINE_FUNCTION
-    int rand() {
-      return static_cast<int>(urand()/2);
-    }
-
-    KOKKOS_INLINE_FUNCTION
-    int rand(const int& range) {
-      const int max_val = (MAX_RAND/range)*range;
-      int tmp = rand();
-      while(tmp>=max_val)
-        rand();
-      return tmp%range;
-    }
-
-    KOKKOS_INLINE_FUNCTION
-    int rand(const int& start, const int& end ) {
-      return rand(end-start)+start;
-    }
-
-    KOKKOS_INLINE_FUNCTION
-    int64_t rand64() {
-      return static_cast<int64_t>(urand64()/2);
-    }
-
-    KOKKOS_INLINE_FUNCTION
-    int64_t rand64(const int64_t& range) {
-      const int64_t max_val = (MAX_RAND64/range)*range;
-      int64_t tmp = rand64();
-      while(tmp>=max_val)
-        rand64();
-      return tmp%range;
-    }
-
-    KOKKOS_INLINE_FUNCTION
-    int64_t rand64(const int64_t& start, const int64_t& end ) {
-      return rand64(end-start)+start;
-    }
-
-    KOKKOS_INLINE_FUNCTION
-    float frand() {
-      return 1.0f * urand64()/MAX_URAND64;
-    }
-
-    KOKKOS_INLINE_FUNCTION
-    float frand(const float& range) {
-      return range * urand64()/MAX_URAND64;
-    }
-
-    KOKKOS_INLINE_FUNCTION
-    float frand(const float& start, const float& end ) {
-      return frand(end-start)+start;
-    }
-
-    KOKKOS_INLINE_FUNCTION
-    double drand() {
-      return 1.0 * urand64()/MAX_URAND64;
-    }
-
-    KOKKOS_INLINE_FUNCTION
-    double drand(const double& range) {
-      return range * urand64()/MAX_URAND64;
-    }
-
-    KOKKOS_INLINE_FUNCTION
-    double drand(const double& start, const double& end ) {
-      return frand(end-start)+start;
-    }
-
-    //Marsaglia polar method for drawing a standard normal distributed random number
-    KOKKOS_INLINE_FUNCTION
-    double normal() {
-      double S = 2.0;
-      double U;
-      while(S>=1.0) {
-        U = 2.0*drand() - 1.0;
-        const double V = 2.0*drand() - 1.0;
-        S = U*U+V*V;
-      }
-      return U*std::sqrt(-2.0*log(S)/S);
-    }
-
-    KOKKOS_INLINE_FUNCTION
-    double normal(const double& mean, const double& std_dev=1.0) {
-      return mean + normal()*std_dev;
-    }
-  };
-
-template<>
-inline
-Random_XorShift64_Pool<Kokkos::Experimental::ROCm>::Random_XorShift64_Pool(uint64_t seed) {
-  num_states_ = 0;
-  init(seed,4*32768);
-}
-
-template<>
-KOKKOS_INLINE_FUNCTION
-Random_XorShift64<Kokkos::Experimental::ROCm> Random_XorShift64_Pool<Kokkos::Experimental::ROCm>::get_state() const {
-#ifdef __HCC_ACCELERATOR__
-  const int i_offset = (threadIdx_x*blockDim_y + threadIdx_y)*blockDim_z+threadIdx_z;
-  int i = (((blockIdx_x*gridDim_y+blockIdx_y)*gridDim_z + blockIdx_z) *
-           blockDim_x*blockDim_y*blockDim_z + i_offset)%num_states_;
-  while(Kokkos::atomic_compare_exchange(&locks_(i),0,1)) {
-      i+=blockDim_x*blockDim_y*blockDim_z;
-      if(i>=num_states_) {i = i_offset;}
+  KOKKOS_INLINE_FUNCTION
+  uint32_t urand() {
+    uint64_t state_0 = state_[p_ * stride_];
+    uint64_t state_1 = state_[(p_ = (p_ + 1) & 15) * stride_];
+    state_1 ^= state_1 << 31;
+    state_1 ^= state_1 >> 11;
+    state_0 ^= state_0 >> 30;
+    uint64_t tmp =
+        (state_[p_ * stride_] = state_0 ^ state_1) * 1181783497276652981ULL;
+    tmp = tmp >> 16;
+    return static_cast<uint32_t>(tmp & MAX_URAND);
   }
 
-  return Random_XorShift64<Kokkos::Experimental::ROCm>(state_(i),i);
+  KOKKOS_INLINE_FUNCTION
+  uint64_t urand64() {
+    uint64_t state_0 = state_[p_ * stride_];
+    uint64_t state_1 = state_[(p_ = (p_ + 1) & 15) * stride_];
+    state_1 ^= state_1 << 31;
+    state_1 ^= state_1 >> 11;
+    state_0 ^= state_0 >> 30;
+    return ((state_[p_ * stride_] = state_0 ^ state_1) *
+            1181783497276652981LL) -
+           1;
+  }
+
+  KOKKOS_INLINE_FUNCTION
+  uint32_t urand(const uint32_t& range) {
+    const uint32_t max_val = (MAX_URAND / range) * range;
+    uint32_t tmp           = urand();
+    while (tmp >= max_val) urand();
+    return tmp % range;
+  }
+
+  KOKKOS_INLINE_FUNCTION
+  uint32_t urand(const uint32_t& start, const uint32_t& end) {
+    return urand(end - start) + start;
+  }
+
+  KOKKOS_INLINE_FUNCTION
+  uint64_t urand64(const uint64_t& range) {
+    const uint64_t max_val = (MAX_URAND64 / range) * range;
+    uint64_t tmp           = urand64();
+    while (tmp >= max_val) urand64();
+    return tmp % range;
+  }
+
+  KOKKOS_INLINE_FUNCTION
+  uint64_t urand64(const uint64_t& start, const uint64_t& end) {
+    return urand64(end - start) + start;
+  }
+
+  KOKKOS_INLINE_FUNCTION
+  int rand() { return static_cast<int>(urand() / 2); }
+
+  KOKKOS_INLINE_FUNCTION
+  int rand(const int& range) {
+    const int max_val = (MAX_RAND / range) * range;
+    int tmp           = rand();
+    while (tmp >= max_val) rand();
+    return tmp % range;
+  }
+
+  KOKKOS_INLINE_FUNCTION
+  int rand(const int& start, const int& end) {
+    return rand(end - start) + start;
+  }
+
+  KOKKOS_INLINE_FUNCTION
+  int64_t rand64() { return static_cast<int64_t>(urand64() / 2); }
+
+  KOKKOS_INLINE_FUNCTION
+  int64_t rand64(const int64_t& range) {
+    const int64_t max_val = (MAX_RAND64 / range) * range;
+    int64_t tmp           = rand64();
+    while (tmp >= max_val) rand64();
+    return tmp % range;
+  }
+
+  KOKKOS_INLINE_FUNCTION
+  int64_t rand64(const int64_t& start, const int64_t& end) {
+    return rand64(end - start) + start;
+  }
+
+  KOKKOS_INLINE_FUNCTION
+  float frand() { return 1.0f * urand64() / MAX_URAND64; }
+
+  KOKKOS_INLINE_FUNCTION
+  float frand(const float& range) { return range * urand64() / MAX_URAND64; }
+
+  KOKKOS_INLINE_FUNCTION
+  float frand(const float& start, const float& end) {
+    return frand(end - start) + start;
+  }
+
+  KOKKOS_INLINE_FUNCTION
+  double drand() { return 1.0 * urand64() / MAX_URAND64; }
+
+  KOKKOS_INLINE_FUNCTION
+  double drand(const double& range) { return range * urand64() / MAX_URAND64; }
+
+  KOKKOS_INLINE_FUNCTION
+  double drand(const double& start, const double& end) {
+    return frand(end - start) + start;
+  }
+
+  // Marsaglia polar method for drawing a standard normal distributed random
+  // number
+  KOKKOS_INLINE_FUNCTION
+  double normal() {
+    double S = 2.0;
+    double U;
+    while (S >= 1.0) {
+      U              = 2.0 * drand() - 1.0;
+      const double V = 2.0 * drand() - 1.0;
+      S              = U * U + V * V;
+    }
+    return U * std::sqrt(-2.0 * log(S) / S);
+  }
+
+  KOKKOS_INLINE_FUNCTION
+  double normal(const double& mean, const double& std_dev = 1.0) {
+    return mean + normal() * std_dev;
+  }
+};
+
+template <>
+inline Random_XorShift64_Pool<
+    Kokkos::Experimental::ROCm>::Random_XorShift64_Pool(uint64_t seed) {
+  num_states_ = 0;
+  init(seed, 4 * 32768);
+}
+
+template <>
+KOKKOS_INLINE_FUNCTION Random_XorShift64<Kokkos::Experimental::ROCm>
+Random_XorShift64_Pool<Kokkos::Experimental::ROCm>::get_state() const {
+#ifdef __HCC_ACCELERATOR__
+  const int i_offset =
+      (threadIdx_x * blockDim_y + threadIdx_y) * blockDim_z + threadIdx_z;
+  int i = (((blockIdx_x * gridDim_y + blockIdx_y) * gridDim_z + blockIdx_z) *
+               blockDim_x * blockDim_y * blockDim_z +
+           i_offset) %
+          num_states_;
+  while (Kokkos::atomic_compare_exchange(&locks_(i), 0, 1)) {
+    i += blockDim_x * blockDim_y * blockDim_z;
+    if (i >= num_states_) {
+      i = i_offset;
+    }
+  }
+
+  return Random_XorShift64<Kokkos::Experimental::ROCm>(state_(i), i);
 #else
-  return Random_XorShift64<Kokkos::Experimental::ROCm>(state_(0),0);
+  return Random_XorShift64<Kokkos::Experimental::ROCm>(state_(0), 0);
 #endif
 }
 
-template<>
-KOKKOS_INLINE_FUNCTION
-void Random_XorShift64_Pool<Kokkos::Experimental::ROCm>::free_state(const Random_XorShift64<Kokkos::Experimental::ROCm> &state) const {
+template <>
+KOKKOS_INLINE_FUNCTION void
+Random_XorShift64_Pool<Kokkos::Experimental::ROCm>::free_state(
+    const Random_XorShift64<Kokkos::Experimental::ROCm>& state) const {
 #ifdef __HCC_ACCELERATOR__
   state_(state.state_idx_) = state.state_;
   locks_(state.state_idx_) = 0;
@@ -1486,24 +1447,28 @@ void Random_XorShift64_Pool<Kokkos::Experimental::ROCm>::free_state(const Random
 #endif
 }
 
-
-template<>
-inline
-Random_XorShift1024_Pool<Kokkos::Experimental::ROCm>::Random_XorShift1024_Pool(uint64_t seed) {
+template <>
+inline Random_XorShift1024_Pool<
+    Kokkos::Experimental::ROCm>::Random_XorShift1024_Pool(uint64_t seed) {
   num_states_ = 0;
-  init(seed,4*32768);
+  init(seed, 4 * 32768);
 }
 
-template<>
-KOKKOS_INLINE_FUNCTION
-Random_XorShift1024<Kokkos::Experimental::ROCm> Random_XorShift1024_Pool<Kokkos::Experimental::ROCm>::get_state() const {
+template <>
+KOKKOS_INLINE_FUNCTION Random_XorShift1024<Kokkos::Experimental::ROCm>
+Random_XorShift1024_Pool<Kokkos::Experimental::ROCm>::get_state() const {
 #ifdef __HCC_ACCELERATOR__
-  const int i_offset = (threadIdx_x*blockDim_y + threadIdx_y)*blockDim_z+threadIdx_z;
-  int i = (((blockIdx_x*gridDim_y+blockIdx_y)*gridDim_z + blockIdx_z) *
-           blockDim_x*blockDim_y*blockDim_z + i_offset)%num_states_;
-  while(Kokkos::atomic_compare_exchange(&locks_(i),0,1)) {
-      i+=blockDim_x*blockDim_y*blockDim_z;
-      if(i>=num_states_) {i = i_offset;}
+  const int i_offset =
+      (threadIdx_x * blockDim_y + threadIdx_y) * blockDim_z + threadIdx_z;
+  int i = (((blockIdx_x * gridDim_y + blockIdx_y) * gridDim_z + blockIdx_z) *
+               blockDim_x * blockDim_y * blockDim_z +
+           i_offset) %
+          num_states_;
+  while (Kokkos::atomic_compare_exchange(&locks_(i), 0, 1)) {
+    i += blockDim_x * blockDim_y * blockDim_z;
+    if (i >= num_states_) {
+      i = i_offset;
+    }
   }
 
   return Random_XorShift1024<Kokkos::Experimental::ROCm>(state_, p_(i), i);
@@ -1512,515 +1477,589 @@ Random_XorShift1024<Kokkos::Experimental::ROCm> Random_XorShift1024_Pool<Kokkos:
 #endif
 }
 
-template<>
-KOKKOS_INLINE_FUNCTION
-void Random_XorShift1024_Pool<Kokkos::Experimental::ROCm>::free_state(const Random_XorShift1024<Kokkos::Experimental::ROCm> &state) const {
+template <>
+KOKKOS_INLINE_FUNCTION void
+Random_XorShift1024_Pool<Kokkos::Experimental::ROCm>::free_state(
+    const Random_XorShift1024<Kokkos::Experimental::ROCm>& state) const {
 #ifdef __HCC_ACCELERATOR__
-  for(int i=0; i<16; i++)
-    state_(state.state_idx_,i) = state.state_[i];
+  for (int i = 0; i < 16; i++) state_(state.state_idx_, i) = state.state_[i];
   locks_(state.state_idx_) = 0;
   return;
 #endif
 }
 
-
 #endif
 
-
 namespace Impl {
 
-template<class ViewType, class RandomPool, int loops, int rank, class IndexType>
+template <class ViewType, class RandomPool, int loops, int rank,
+          class IndexType>
 struct fill_random_functor_range;
-template<class ViewType, class RandomPool, int loops, int rank, class IndexType>
+template <class ViewType, class RandomPool, int loops, int rank,
+          class IndexType>
 struct fill_random_functor_begin_end;
 
-template<class ViewType, class RandomPool, int loops, class IndexType>
-struct fill_random_functor_range<ViewType,RandomPool,loops,1,IndexType>{
+template <class ViewType, class RandomPool, int loops, class IndexType>
+struct fill_random_functor_range<ViewType, RandomPool, loops, 1, IndexType> {
   typedef typename ViewType::execution_space execution_space;
   ViewType a;
   RandomPool rand_pool;
   typename ViewType::const_value_type range;
 
-  typedef rand<typename RandomPool::generator_type, typename ViewType::non_const_value_type> Rand;
+  typedef rand<typename RandomPool::generator_type,
+               typename ViewType::non_const_value_type>
+      Rand;
 
   fill_random_functor_range(ViewType a_, RandomPool rand_pool_,
-      typename ViewType::const_value_type range_):
-    a(a_),rand_pool(rand_pool_),range(range_) {}
+                            typename ViewType::const_value_type range_)
+      : a(a_), rand_pool(rand_pool_), range(range_) {}
 
   KOKKOS_INLINE_FUNCTION
-  void operator() (const IndexType& i) const {
+  void operator()(const IndexType& i) const {
     typename RandomPool::generator_type gen = rand_pool.get_state();
-    for(IndexType j=0;j<loops;j++) {
-      const IndexType idx = i*loops+j;
-      if(idx<static_cast<IndexType>(a.extent(0)))
-        a(idx) = Rand::draw(gen,range);
+    for (IndexType j = 0; j < loops; j++) {
+      const IndexType idx = i * loops + j;
+      if (idx < static_cast<IndexType>(a.extent(0)))
+        a(idx) = Rand::draw(gen, range);
     }
     rand_pool.free_state(gen);
   }
 };
 
-template<class ViewType, class RandomPool, int loops, class IndexType>
-struct fill_random_functor_range<ViewType,RandomPool,loops,2,IndexType>{
+template <class ViewType, class RandomPool, int loops, class IndexType>
+struct fill_random_functor_range<ViewType, RandomPool, loops, 2, IndexType> {
   typedef typename ViewType::execution_space execution_space;
   ViewType a;
   RandomPool rand_pool;
   typename ViewType::const_value_type range;
 
-  typedef rand<typename RandomPool::generator_type, typename ViewType::non_const_value_type> Rand;
+  typedef rand<typename RandomPool::generator_type,
+               typename ViewType::non_const_value_type>
+      Rand;
 
   fill_random_functor_range(ViewType a_, RandomPool rand_pool_,
-      typename ViewType::const_value_type range_):
-    a(a_),rand_pool(rand_pool_),range(range_) {}
+                            typename ViewType::const_value_type range_)
+      : a(a_), rand_pool(rand_pool_), range(range_) {}
 
   KOKKOS_INLINE_FUNCTION
-  void operator() (IndexType i) const {
+  void operator()(IndexType i) const {
     typename RandomPool::generator_type gen = rand_pool.get_state();
-    for(IndexType j=0;j<loops;j++) {
-      const IndexType idx = i*loops+j;
-      if(idx<static_cast<IndexType>(a.extent(0))) {
-        for(IndexType k=0;k<static_cast<IndexType>(a.extent(1));k++)
-          a(idx,k) = Rand::draw(gen,range);
+    for (IndexType j = 0; j < loops; j++) {
+      const IndexType idx = i * loops + j;
+      if (idx < static_cast<IndexType>(a.extent(0))) {
+        for (IndexType k = 0; k < static_cast<IndexType>(a.extent(1)); k++)
+          a(idx, k) = Rand::draw(gen, range);
       }
     }
     rand_pool.free_state(gen);
   }
 };
 
-
-template<class ViewType, class RandomPool, int loops, class IndexType>
-struct fill_random_functor_range<ViewType,RandomPool,loops,3,IndexType>{
+template <class ViewType, class RandomPool, int loops, class IndexType>
+struct fill_random_functor_range<ViewType, RandomPool, loops, 3, IndexType> {
   typedef typename ViewType::execution_space execution_space;
   ViewType a;
   RandomPool rand_pool;
   typename ViewType::const_value_type range;
 
-  typedef rand<typename RandomPool::generator_type, typename ViewType::non_const_value_type> Rand;
+  typedef rand<typename RandomPool::generator_type,
+               typename ViewType::non_const_value_type>
+      Rand;
 
   fill_random_functor_range(ViewType a_, RandomPool rand_pool_,
-      typename ViewType::const_value_type range_):
-    a(a_),rand_pool(rand_pool_),range(range_) {}
+                            typename ViewType::const_value_type range_)
+      : a(a_), rand_pool(rand_pool_), range(range_) {}
 
   KOKKOS_INLINE_FUNCTION
-  void operator() (IndexType i) const {
+  void operator()(IndexType i) const {
     typename RandomPool::generator_type gen = rand_pool.get_state();
-    for(IndexType j=0;j<loops;j++) {
-      const IndexType idx = i*loops+j;
-      if(idx<static_cast<IndexType>(a.extent(0))) {
-        for(IndexType k=0;k<static_cast<IndexType>(a.extent(1));k++)
-          for(IndexType l=0;l<static_cast<IndexType>(a.extent(2));l++)
-            a(idx,k,l) = Rand::draw(gen,range);
+    for (IndexType j = 0; j < loops; j++) {
+      const IndexType idx = i * loops + j;
+      if (idx < static_cast<IndexType>(a.extent(0))) {
+        for (IndexType k = 0; k < static_cast<IndexType>(a.extent(1)); k++)
+          for (IndexType l = 0; l < static_cast<IndexType>(a.extent(2)); l++)
+            a(idx, k, l) = Rand::draw(gen, range);
       }
     }
     rand_pool.free_state(gen);
   }
 };
 
-template<class ViewType, class RandomPool, int loops, class IndexType>
-struct fill_random_functor_range<ViewType,RandomPool,loops,4, IndexType>{
+template <class ViewType, class RandomPool, int loops, class IndexType>
+struct fill_random_functor_range<ViewType, RandomPool, loops, 4, IndexType> {
   typedef typename ViewType::execution_space execution_space;
   ViewType a;
   RandomPool rand_pool;
   typename ViewType::const_value_type range;
 
-  typedef rand<typename RandomPool::generator_type, typename ViewType::non_const_value_type> Rand;
+  typedef rand<typename RandomPool::generator_type,
+               typename ViewType::non_const_value_type>
+      Rand;
 
   fill_random_functor_range(ViewType a_, RandomPool rand_pool_,
-      typename ViewType::const_value_type range_):
-    a(a_),rand_pool(rand_pool_),range(range_) {}
+                            typename ViewType::const_value_type range_)
+      : a(a_), rand_pool(rand_pool_), range(range_) {}
 
   KOKKOS_INLINE_FUNCTION
-  void operator() (IndexType i) const {
+  void operator()(IndexType i) const {
     typename RandomPool::generator_type gen = rand_pool.get_state();
-    for(IndexType j=0;j<loops;j++) {
-      const IndexType idx = i*loops+j;
-      if(idx<static_cast<IndexType>(a.extent(0))) {
-        for(IndexType k=0;k<static_cast<IndexType>(a.extent(1));k++)
-          for(IndexType l=0;l<static_cast<IndexType>(a.extent(2));l++)
-            for(IndexType m=0;m<static_cast<IndexType>(a.extent(3));m++)
-              a(idx,k,l,m) = Rand::draw(gen,range);
+    for (IndexType j = 0; j < loops; j++) {
+      const IndexType idx = i * loops + j;
+      if (idx < static_cast<IndexType>(a.extent(0))) {
+        for (IndexType k = 0; k < static_cast<IndexType>(a.extent(1)); k++)
+          for (IndexType l = 0; l < static_cast<IndexType>(a.extent(2)); l++)
+            for (IndexType m = 0; m < static_cast<IndexType>(a.extent(3)); m++)
+              a(idx, k, l, m) = Rand::draw(gen, range);
       }
     }
     rand_pool.free_state(gen);
   }
 };
 
-template<class ViewType, class RandomPool, int loops, class IndexType>
-struct fill_random_functor_range<ViewType,RandomPool,loops,5,IndexType>{
+template <class ViewType, class RandomPool, int loops, class IndexType>
+struct fill_random_functor_range<ViewType, RandomPool, loops, 5, IndexType> {
   typedef typename ViewType::execution_space execution_space;
   ViewType a;
   RandomPool rand_pool;
   typename ViewType::const_value_type range;
 
-  typedef rand<typename RandomPool::generator_type, typename ViewType::non_const_value_type> Rand;
+  typedef rand<typename RandomPool::generator_type,
+               typename ViewType::non_const_value_type>
+      Rand;
 
   fill_random_functor_range(ViewType a_, RandomPool rand_pool_,
-      typename ViewType::const_value_type range_):
-    a(a_),rand_pool(rand_pool_),range(range_) {}
+                            typename ViewType::const_value_type range_)
+      : a(a_), rand_pool(rand_pool_), range(range_) {}
 
   KOKKOS_INLINE_FUNCTION
-  void operator() (IndexType i) const {
+  void operator()(IndexType i) const {
     typename RandomPool::generator_type gen = rand_pool.get_state();
-    for(IndexType j=0;j<loops;j++) {
-      const IndexType idx = i*loops+j;
-      if(idx<static_cast<IndexType>(a.extent(0))) {
-        for(IndexType k=0;k<static_cast<IndexType>(a.extent(1));k++)
-          for(IndexType l=0;l<static_cast<IndexType>(a.extent(2));l++)
-            for(IndexType m=0;m<static_cast<IndexType>(a.extent(3));m++)
-              for(IndexType n=0;n<static_cast<IndexType>(a.extent(4));n++)
-              a(idx,k,l,m,n) = Rand::draw(gen,range);
+    for (IndexType j = 0; j < loops; j++) {
+      const IndexType idx = i * loops + j;
+      if (idx < static_cast<IndexType>(a.extent(0))) {
+        for (IndexType k = 0; k < static_cast<IndexType>(a.extent(1)); k++)
+          for (IndexType l = 0; l < static_cast<IndexType>(a.extent(2)); l++)
+            for (IndexType m = 0; m < static_cast<IndexType>(a.extent(3)); m++)
+              for (IndexType n = 0; n < static_cast<IndexType>(a.extent(4));
+                   n++)
+                a(idx, k, l, m, n) = Rand::draw(gen, range);
       }
     }
     rand_pool.free_state(gen);
   }
 };
 
-template<class ViewType, class RandomPool, int loops, class IndexType>
-struct fill_random_functor_range<ViewType,RandomPool,loops,6,IndexType>{
+template <class ViewType, class RandomPool, int loops, class IndexType>
+struct fill_random_functor_range<ViewType, RandomPool, loops, 6, IndexType> {
   typedef typename ViewType::execution_space execution_space;
   ViewType a;
   RandomPool rand_pool;
   typename ViewType::const_value_type range;
 
-  typedef rand<typename RandomPool::generator_type, typename ViewType::non_const_value_type> Rand;
+  typedef rand<typename RandomPool::generator_type,
+               typename ViewType::non_const_value_type>
+      Rand;
 
   fill_random_functor_range(ViewType a_, RandomPool rand_pool_,
-      typename ViewType::const_value_type range_):
-    a(a_),rand_pool(rand_pool_),range(range_) {}
+                            typename ViewType::const_value_type range_)
+      : a(a_), rand_pool(rand_pool_), range(range_) {}
 
   KOKKOS_INLINE_FUNCTION
-  void operator() (IndexType i) const {
+  void operator()(IndexType i) const {
     typename RandomPool::generator_type gen = rand_pool.get_state();
-    for(IndexType j=0;j<loops;j++) {
-      const IndexType idx = i*loops+j;
-      if(idx<static_cast<IndexType>(a.extent(0))) {
-        for(IndexType k=0;k<static_cast<IndexType>(a.extent(1));k++)
-          for(IndexType l=0;l<static_cast<IndexType>(a.extent(2));l++)
-            for(IndexType m=0;m<static_cast<IndexType>(a.extent(3));m++)
-              for(IndexType n=0;n<static_cast<IndexType>(a.extent(4));n++)
-                for(IndexType o=0;o<static_cast<IndexType>(a.extent(5));o++)
-              a(idx,k,l,m,n,o) = Rand::draw(gen,range);
+    for (IndexType j = 0; j < loops; j++) {
+      const IndexType idx = i * loops + j;
+      if (idx < static_cast<IndexType>(a.extent(0))) {
+        for (IndexType k = 0; k < static_cast<IndexType>(a.extent(1)); k++)
+          for (IndexType l = 0; l < static_cast<IndexType>(a.extent(2)); l++)
+            for (IndexType m = 0; m < static_cast<IndexType>(a.extent(3)); m++)
+              for (IndexType n = 0; n < static_cast<IndexType>(a.extent(4));
+                   n++)
+                for (IndexType o = 0; o < static_cast<IndexType>(a.extent(5));
+                     o++)
+                  a(idx, k, l, m, n, o) = Rand::draw(gen, range);
       }
     }
     rand_pool.free_state(gen);
   }
 };
 
-template<class ViewType, class RandomPool, int loops, class IndexType>
-struct fill_random_functor_range<ViewType,RandomPool,loops,7,IndexType>{
+template <class ViewType, class RandomPool, int loops, class IndexType>
+struct fill_random_functor_range<ViewType, RandomPool, loops, 7, IndexType> {
   typedef typename ViewType::execution_space execution_space;
   ViewType a;
   RandomPool rand_pool;
   typename ViewType::const_value_type range;
 
-  typedef rand<typename RandomPool::generator_type, typename ViewType::non_const_value_type> Rand;
+  typedef rand<typename RandomPool::generator_type,
+               typename ViewType::non_const_value_type>
+      Rand;
 
   fill_random_functor_range(ViewType a_, RandomPool rand_pool_,
-      typename ViewType::const_value_type range_):
-    a(a_),rand_pool(rand_pool_),range(range_) {}
+                            typename ViewType::const_value_type range_)
+      : a(a_), rand_pool(rand_pool_), range(range_) {}
 
   KOKKOS_INLINE_FUNCTION
-  void operator() (IndexType i) const {
+  void operator()(IndexType i) const {
     typename RandomPool::generator_type gen = rand_pool.get_state();
-    for(IndexType j=0;j<loops;j++) {
-      const IndexType idx = i*loops+j;
-      if(idx<static_cast<IndexType>(a.extent(0))) {
-        for(IndexType k=0;k<static_cast<IndexType>(a.extent(1));k++)
-          for(IndexType l=0;l<static_cast<IndexType>(a.extent(2));l++)
-            for(IndexType m=0;m<static_cast<IndexType>(a.extent(3));m++)
-              for(IndexType n=0;n<static_cast<IndexType>(a.extent(4));n++)
-                for(IndexType o=0;o<static_cast<IndexType>(a.extent(5));o++)
-                  for(IndexType p=0;p<static_cast<IndexType>(a.extent(6));p++)
-              a(idx,k,l,m,n,o,p) = Rand::draw(gen,range);
+    for (IndexType j = 0; j < loops; j++) {
+      const IndexType idx = i * loops + j;
+      if (idx < static_cast<IndexType>(a.extent(0))) {
+        for (IndexType k = 0; k < static_cast<IndexType>(a.extent(1)); k++)
+          for (IndexType l = 0; l < static_cast<IndexType>(a.extent(2)); l++)
+            for (IndexType m = 0; m < static_cast<IndexType>(a.extent(3)); m++)
+              for (IndexType n = 0; n < static_cast<IndexType>(a.extent(4));
+                   n++)
+                for (IndexType o = 0; o < static_cast<IndexType>(a.extent(5));
+                     o++)
+                  for (IndexType p = 0; p < static_cast<IndexType>(a.extent(6));
+                       p++)
+                    a(idx, k, l, m, n, o, p) = Rand::draw(gen, range);
       }
     }
     rand_pool.free_state(gen);
   }
 };
 
-template<class ViewType, class RandomPool, int loops, class IndexType>
-struct fill_random_functor_range<ViewType,RandomPool,loops,8,IndexType>{
+template <class ViewType, class RandomPool, int loops, class IndexType>
+struct fill_random_functor_range<ViewType, RandomPool, loops, 8, IndexType> {
   typedef typename ViewType::execution_space execution_space;
   ViewType a;
   RandomPool rand_pool;
   typename ViewType::const_value_type range;
 
-  typedef rand<typename RandomPool::generator_type, typename ViewType::non_const_value_type> Rand;
+  typedef rand<typename RandomPool::generator_type,
+               typename ViewType::non_const_value_type>
+      Rand;
 
   fill_random_functor_range(ViewType a_, RandomPool rand_pool_,
-      typename ViewType::const_value_type range_):
-    a(a_),rand_pool(rand_pool_),range(range_) {}
+                            typename ViewType::const_value_type range_)
+      : a(a_), rand_pool(rand_pool_), range(range_) {}
 
   KOKKOS_INLINE_FUNCTION
-  void operator() (IndexType i) const {
+  void operator()(IndexType i) const {
     typename RandomPool::generator_type gen = rand_pool.get_state();
-    for(IndexType j=0;j<loops;j++) {
-      const IndexType idx = i*loops+j;
-      if(idx<static_cast<IndexType>(a.extent(0))) {
-        for(IndexType k=0;k<static_cast<IndexType>(a.extent(1));k++)
-          for(IndexType l=0;l<static_cast<IndexType>(a.extent(2));l++)
-            for(IndexType m=0;m<static_cast<IndexType>(a.extent(3));m++)
-              for(IndexType n=0;n<static_cast<IndexType>(a.extent(4));n++)
-                for(IndexType o=0;o<static_cast<IndexType>(a.extent(5));o++)
-                  for(IndexType p=0;p<static_cast<IndexType>(a.extent(6));p++)
-                    for(IndexType q=0;q<static_cast<IndexType>(a.extent(7));q++)
-              a(idx,k,l,m,n,o,p,q) = Rand::draw(gen,range);
+    for (IndexType j = 0; j < loops; j++) {
+      const IndexType idx = i * loops + j;
+      if (idx < static_cast<IndexType>(a.extent(0))) {
+        for (IndexType k = 0; k < static_cast<IndexType>(a.extent(1)); k++)
+          for (IndexType l = 0; l < static_cast<IndexType>(a.extent(2)); l++)
+            for (IndexType m = 0; m < static_cast<IndexType>(a.extent(3)); m++)
+              for (IndexType n = 0; n < static_cast<IndexType>(a.extent(4));
+                   n++)
+                for (IndexType o = 0; o < static_cast<IndexType>(a.extent(5));
+                     o++)
+                  for (IndexType p = 0; p < static_cast<IndexType>(a.extent(6));
+                       p++)
+                    for (IndexType q = 0;
+                         q < static_cast<IndexType>(a.extent(7)); q++)
+                      a(idx, k, l, m, n, o, p, q) = Rand::draw(gen, range);
       }
     }
     rand_pool.free_state(gen);
   }
 };
-template<class ViewType, class RandomPool, int loops, class IndexType>
-struct fill_random_functor_begin_end<ViewType,RandomPool,loops,1,IndexType>{
+template <class ViewType, class RandomPool, int loops, class IndexType>
+struct fill_random_functor_begin_end<ViewType, RandomPool, loops, 1,
+                                     IndexType> {
   typedef typename ViewType::execution_space execution_space;
   ViewType a;
   RandomPool rand_pool;
-  typename ViewType::const_value_type begin,end;
+  typename ViewType::const_value_type begin, end;
 
-  typedef rand<typename RandomPool::generator_type, typename ViewType::non_const_value_type> Rand;
+  typedef rand<typename RandomPool::generator_type,
+               typename ViewType::non_const_value_type>
+      Rand;
 
   fill_random_functor_begin_end(ViewType a_, RandomPool rand_pool_,
-      typename ViewType::const_value_type begin_, typename ViewType::const_value_type end_):
-    a(a_),rand_pool(rand_pool_),begin(begin_),end(end_) {}
+                                typename ViewType::const_value_type begin_,
+                                typename ViewType::const_value_type end_)
+      : a(a_), rand_pool(rand_pool_), begin(begin_), end(end_) {}
 
   KOKKOS_INLINE_FUNCTION
-  void operator() (IndexType i) const {
+  void operator()(IndexType i) const {
     typename RandomPool::generator_type gen = rand_pool.get_state();
-    for(IndexType j=0;j<loops;j++) {
-      const IndexType idx = i*loops+j;
-      if(idx<static_cast<IndexType>(a.extent(0)))
-        a(idx) = Rand::draw(gen,begin,end);
+    for (IndexType j = 0; j < loops; j++) {
+      const IndexType idx = i * loops + j;
+      if (idx < static_cast<IndexType>(a.extent(0)))
+        a(idx) = Rand::draw(gen, begin, end);
     }
     rand_pool.free_state(gen);
   }
 };
 
-template<class ViewType, class RandomPool, int loops, class IndexType>
-struct fill_random_functor_begin_end<ViewType,RandomPool,loops,2,IndexType>{
+template <class ViewType, class RandomPool, int loops, class IndexType>
+struct fill_random_functor_begin_end<ViewType, RandomPool, loops, 2,
+                                     IndexType> {
   typedef typename ViewType::execution_space execution_space;
   ViewType a;
   RandomPool rand_pool;
-  typename ViewType::const_value_type begin,end;
+  typename ViewType::const_value_type begin, end;
 
-  typedef rand<typename RandomPool::generator_type, typename ViewType::non_const_value_type> Rand;
+  typedef rand<typename RandomPool::generator_type,
+               typename ViewType::non_const_value_type>
+      Rand;
 
   fill_random_functor_begin_end(ViewType a_, RandomPool rand_pool_,
-      typename ViewType::const_value_type begin_, typename ViewType::const_value_type end_):
-    a(a_),rand_pool(rand_pool_),begin(begin_),end(end_) {}
+                                typename ViewType::const_value_type begin_,
+                                typename ViewType::const_value_type end_)
+      : a(a_), rand_pool(rand_pool_), begin(begin_), end(end_) {}
 
   KOKKOS_INLINE_FUNCTION
-  void operator() (IndexType i) const {
+  void operator()(IndexType i) const {
     typename RandomPool::generator_type gen = rand_pool.get_state();
-    for(IndexType j=0;j<loops;j++) {
-      const IndexType idx = i*loops+j;
-      if(idx<static_cast<IndexType>(a.extent(0))) {
-        for(IndexType k=0;k<static_cast<IndexType>(a.extent(1));k++)
-          a(idx,k) = Rand::draw(gen,begin,end);
+    for (IndexType j = 0; j < loops; j++) {
+      const IndexType idx = i * loops + j;
+      if (idx < static_cast<IndexType>(a.extent(0))) {
+        for (IndexType k = 0; k < static_cast<IndexType>(a.extent(1)); k++)
+          a(idx, k) = Rand::draw(gen, begin, end);
       }
     }
     rand_pool.free_state(gen);
   }
 };
 
-
-template<class ViewType, class RandomPool, int loops, class IndexType>
-struct fill_random_functor_begin_end<ViewType,RandomPool,loops,3,IndexType>{
+template <class ViewType, class RandomPool, int loops, class IndexType>
+struct fill_random_functor_begin_end<ViewType, RandomPool, loops, 3,
+                                     IndexType> {
   typedef typename ViewType::execution_space execution_space;
   ViewType a;
   RandomPool rand_pool;
-  typename ViewType::const_value_type begin,end;
+  typename ViewType::const_value_type begin, end;
 
-  typedef rand<typename RandomPool::generator_type, typename ViewType::non_const_value_type> Rand;
+  typedef rand<typename RandomPool::generator_type,
+               typename ViewType::non_const_value_type>
+      Rand;
 
   fill_random_functor_begin_end(ViewType a_, RandomPool rand_pool_,
-      typename ViewType::const_value_type begin_, typename ViewType::const_value_type end_):
-    a(a_),rand_pool(rand_pool_),begin(begin_),end(end_) {}
+                                typename ViewType::const_value_type begin_,
+                                typename ViewType::const_value_type end_)
+      : a(a_), rand_pool(rand_pool_), begin(begin_), end(end_) {}
 
   KOKKOS_INLINE_FUNCTION
-  void operator() (IndexType i) const {
+  void operator()(IndexType i) const {
     typename RandomPool::generator_type gen = rand_pool.get_state();
-    for(IndexType j=0;j<loops;j++) {
-      const IndexType idx = i*loops+j;
-      if(idx<static_cast<IndexType>(a.extent(0))) {
-        for(IndexType k=0;k<static_cast<IndexType>(a.extent(1));k++)
-          for(IndexType l=0;l<static_cast<IndexType>(a.extent(2));l++)
-            a(idx,k,l) = Rand::draw(gen,begin,end);
+    for (IndexType j = 0; j < loops; j++) {
+      const IndexType idx = i * loops + j;
+      if (idx < static_cast<IndexType>(a.extent(0))) {
+        for (IndexType k = 0; k < static_cast<IndexType>(a.extent(1)); k++)
+          for (IndexType l = 0; l < static_cast<IndexType>(a.extent(2)); l++)
+            a(idx, k, l) = Rand::draw(gen, begin, end);
       }
     }
     rand_pool.free_state(gen);
   }
 };
 
-template<class ViewType, class RandomPool, int loops, class IndexType>
-struct fill_random_functor_begin_end<ViewType,RandomPool,loops,4,IndexType>{
+template <class ViewType, class RandomPool, int loops, class IndexType>
+struct fill_random_functor_begin_end<ViewType, RandomPool, loops, 4,
+                                     IndexType> {
   typedef typename ViewType::execution_space execution_space;
   ViewType a;
   RandomPool rand_pool;
-  typename ViewType::const_value_type begin,end;
+  typename ViewType::const_value_type begin, end;
 
-  typedef rand<typename RandomPool::generator_type, typename ViewType::non_const_value_type> Rand;
+  typedef rand<typename RandomPool::generator_type,
+               typename ViewType::non_const_value_type>
+      Rand;
 
   fill_random_functor_begin_end(ViewType a_, RandomPool rand_pool_,
-      typename ViewType::const_value_type begin_, typename ViewType::const_value_type end_):
-    a(a_),rand_pool(rand_pool_),begin(begin_),end(end_) {}
+                                typename ViewType::const_value_type begin_,
+                                typename ViewType::const_value_type end_)
+      : a(a_), rand_pool(rand_pool_), begin(begin_), end(end_) {}
 
   KOKKOS_INLINE_FUNCTION
-  void operator() (IndexType i) const {
+  void operator()(IndexType i) const {
     typename RandomPool::generator_type gen = rand_pool.get_state();
-    for(IndexType j=0;j<loops;j++) {
-      const IndexType idx = i*loops+j;
-      if(idx<static_cast<IndexType>(a.extent(0))) {
-        for(IndexType k=0;k<static_cast<IndexType>(a.extent(1));k++)
-          for(IndexType l=0;l<static_cast<IndexType>(a.extent(2));l++)
-            for(IndexType m=0;m<static_cast<IndexType>(a.extent(3));m++)
-              a(idx,k,l,m) = Rand::draw(gen,begin,end);
+    for (IndexType j = 0; j < loops; j++) {
+      const IndexType idx = i * loops + j;
+      if (idx < static_cast<IndexType>(a.extent(0))) {
+        for (IndexType k = 0; k < static_cast<IndexType>(a.extent(1)); k++)
+          for (IndexType l = 0; l < static_cast<IndexType>(a.extent(2)); l++)
+            for (IndexType m = 0; m < static_cast<IndexType>(a.extent(3)); m++)
+              a(idx, k, l, m) = Rand::draw(gen, begin, end);
       }
     }
     rand_pool.free_state(gen);
   }
 };
 
-template<class ViewType, class RandomPool, int loops, class IndexType>
-struct fill_random_functor_begin_end<ViewType,RandomPool,loops,5,IndexType>{
+template <class ViewType, class RandomPool, int loops, class IndexType>
+struct fill_random_functor_begin_end<ViewType, RandomPool, loops, 5,
+                                     IndexType> {
   typedef typename ViewType::execution_space execution_space;
   ViewType a;
   RandomPool rand_pool;
-  typename ViewType::const_value_type begin,end;
+  typename ViewType::const_value_type begin, end;
 
-  typedef rand<typename RandomPool::generator_type, typename ViewType::non_const_value_type> Rand;
+  typedef rand<typename RandomPool::generator_type,
+               typename ViewType::non_const_value_type>
+      Rand;
 
   fill_random_functor_begin_end(ViewType a_, RandomPool rand_pool_,
-      typename ViewType::const_value_type begin_, typename ViewType::const_value_type end_):
-    a(a_),rand_pool(rand_pool_),begin(begin_),end(end_) {}
+                                typename ViewType::const_value_type begin_,
+                                typename ViewType::const_value_type end_)
+      : a(a_), rand_pool(rand_pool_), begin(begin_), end(end_) {}
 
   KOKKOS_INLINE_FUNCTION
-  void operator() (IndexType i) const {
+  void operator()(IndexType i) const {
     typename RandomPool::generator_type gen = rand_pool.get_state();
-    for(IndexType j=0;j<loops;j++) {
-      const IndexType idx = i*loops+j;
-      if(idx<static_cast<IndexType>(a.extent(0))){
-        for(IndexType l=0;l<static_cast<IndexType>(a.extent(1));l++)
-          for(IndexType m=0;m<static_cast<IndexType>(a.extent(2));m++)
-            for(IndexType n=0;n<static_cast<IndexType>(a.extent(3));n++)
-              for(IndexType o=0;o<static_cast<IndexType>(a.extent(4));o++)
-          a(idx,l,m,n,o) = Rand::draw(gen,begin,end);
+    for (IndexType j = 0; j < loops; j++) {
+      const IndexType idx = i * loops + j;
+      if (idx < static_cast<IndexType>(a.extent(0))) {
+        for (IndexType l = 0; l < static_cast<IndexType>(a.extent(1)); l++)
+          for (IndexType m = 0; m < static_cast<IndexType>(a.extent(2)); m++)
+            for (IndexType n = 0; n < static_cast<IndexType>(a.extent(3)); n++)
+              for (IndexType o = 0; o < static_cast<IndexType>(a.extent(4));
+                   o++)
+                a(idx, l, m, n, o) = Rand::draw(gen, begin, end);
       }
     }
     rand_pool.free_state(gen);
   }
 };
 
-template<class ViewType, class RandomPool, int loops, class IndexType>
-struct fill_random_functor_begin_end<ViewType,RandomPool,loops,6,IndexType>{
+template <class ViewType, class RandomPool, int loops, class IndexType>
+struct fill_random_functor_begin_end<ViewType, RandomPool, loops, 6,
+                                     IndexType> {
   typedef typename ViewType::execution_space execution_space;
   ViewType a;
   RandomPool rand_pool;
-  typename ViewType::const_value_type begin,end;
+  typename ViewType::const_value_type begin, end;
 
-  typedef rand<typename RandomPool::generator_type, typename ViewType::non_const_value_type> Rand;
+  typedef rand<typename RandomPool::generator_type,
+               typename ViewType::non_const_value_type>
+      Rand;
 
   fill_random_functor_begin_end(ViewType a_, RandomPool rand_pool_,
-      typename ViewType::const_value_type begin_, typename ViewType::const_value_type end_):
-    a(a_),rand_pool(rand_pool_),begin(begin_),end(end_) {}
+                                typename ViewType::const_value_type begin_,
+                                typename ViewType::const_value_type end_)
+      : a(a_), rand_pool(rand_pool_), begin(begin_), end(end_) {}
 
   KOKKOS_INLINE_FUNCTION
-  void operator() (IndexType i) const {
+  void operator()(IndexType i) const {
     typename RandomPool::generator_type gen = rand_pool.get_state();
-    for(IndexType j=0;j<loops;j++) {
-      const IndexType idx = i*loops+j;
-      if(idx<static_cast<IndexType>(a.extent(0))) {
-        for(IndexType k=0;k<static_cast<IndexType>(a.extent(1));k++)
-          for(IndexType l=0;l<static_cast<IndexType>(a.extent(2));l++)
-            for(IndexType m=0;m<static_cast<IndexType>(a.extent(3));m++)
-              for(IndexType n=0;n<static_cast<IndexType>(a.extent(4));n++)
-                for(IndexType o=0;o<static_cast<IndexType>(a.extent(5));o++)
-          a(idx,k,l,m,n,o) = Rand::draw(gen,begin,end);
+    for (IndexType j = 0; j < loops; j++) {
+      const IndexType idx = i * loops + j;
+      if (idx < static_cast<IndexType>(a.extent(0))) {
+        for (IndexType k = 0; k < static_cast<IndexType>(a.extent(1)); k++)
+          for (IndexType l = 0; l < static_cast<IndexType>(a.extent(2)); l++)
+            for (IndexType m = 0; m < static_cast<IndexType>(a.extent(3)); m++)
+              for (IndexType n = 0; n < static_cast<IndexType>(a.extent(4));
+                   n++)
+                for (IndexType o = 0; o < static_cast<IndexType>(a.extent(5));
+                     o++)
+                  a(idx, k, l, m, n, o) = Rand::draw(gen, begin, end);
       }
     }
     rand_pool.free_state(gen);
   }
 };
 
-
-template<class ViewType, class RandomPool, int loops, class IndexType>
-struct fill_random_functor_begin_end<ViewType,RandomPool,loops,7,IndexType>{
+template <class ViewType, class RandomPool, int loops, class IndexType>
+struct fill_random_functor_begin_end<ViewType, RandomPool, loops, 7,
+                                     IndexType> {
   typedef typename ViewType::execution_space execution_space;
   ViewType a;
   RandomPool rand_pool;
-  typename ViewType::const_value_type begin,end;
+  typename ViewType::const_value_type begin, end;
 
-  typedef rand<typename RandomPool::generator_type, typename ViewType::non_const_value_type> Rand;
+  typedef rand<typename RandomPool::generator_type,
+               typename ViewType::non_const_value_type>
+      Rand;
 
   fill_random_functor_begin_end(ViewType a_, RandomPool rand_pool_,
-      typename ViewType::const_value_type begin_, typename ViewType::const_value_type end_):
-    a(a_),rand_pool(rand_pool_),begin(begin_),end(end_) {}
+                                typename ViewType::const_value_type begin_,
+                                typename ViewType::const_value_type end_)
+      : a(a_), rand_pool(rand_pool_), begin(begin_), end(end_) {}
 
   KOKKOS_INLINE_FUNCTION
-  void operator() (IndexType i) const {
+  void operator()(IndexType i) const {
     typename RandomPool::generator_type gen = rand_pool.get_state();
-    for(IndexType j=0;j<loops;j++) {
-      const IndexType idx = i*loops+j;
-      if(idx<static_cast<IndexType>(a.extent(0))) {
-        for(IndexType k=0;k<static_cast<IndexType>(a.extent(1));k++)
-          for(IndexType l=0;l<static_cast<IndexType>(a.extent(2));l++)
-            for(IndexType m=0;m<static_cast<IndexType>(a.extent(3));m++)
-              for(IndexType n=0;n<static_cast<IndexType>(a.extent(4));n++)
-                for(IndexType o=0;o<static_cast<IndexType>(a.extent(5));o++)
-                  for(IndexType p=0;p<static_cast<IndexType>(a.extent(6));p++)
-            a(idx,k,l,m,n,o,p) = Rand::draw(gen,begin,end);
+    for (IndexType j = 0; j < loops; j++) {
+      const IndexType idx = i * loops + j;
+      if (idx < static_cast<IndexType>(a.extent(0))) {
+        for (IndexType k = 0; k < static_cast<IndexType>(a.extent(1)); k++)
+          for (IndexType l = 0; l < static_cast<IndexType>(a.extent(2)); l++)
+            for (IndexType m = 0; m < static_cast<IndexType>(a.extent(3)); m++)
+              for (IndexType n = 0; n < static_cast<IndexType>(a.extent(4));
+                   n++)
+                for (IndexType o = 0; o < static_cast<IndexType>(a.extent(5));
+                     o++)
+                  for (IndexType p = 0; p < static_cast<IndexType>(a.extent(6));
+                       p++)
+                    a(idx, k, l, m, n, o, p) = Rand::draw(gen, begin, end);
       }
     }
     rand_pool.free_state(gen);
   }
 };
 
-template<class ViewType, class RandomPool, int loops, class IndexType>
-struct fill_random_functor_begin_end<ViewType,RandomPool,loops,8,IndexType>{
+template <class ViewType, class RandomPool, int loops, class IndexType>
+struct fill_random_functor_begin_end<ViewType, RandomPool, loops, 8,
+                                     IndexType> {
   typedef typename ViewType::execution_space execution_space;
   ViewType a;
   RandomPool rand_pool;
-  typename ViewType::const_value_type begin,end;
+  typename ViewType::const_value_type begin, end;
 
-  typedef rand<typename RandomPool::generator_type, typename ViewType::non_const_value_type> Rand;
+  typedef rand<typename RandomPool::generator_type,
+               typename ViewType::non_const_value_type>
+      Rand;
 
   fill_random_functor_begin_end(ViewType a_, RandomPool rand_pool_,
-      typename ViewType::const_value_type begin_, typename ViewType::const_value_type end_):
-    a(a_),rand_pool(rand_pool_),begin(begin_),end(end_) {}
+                                typename ViewType::const_value_type begin_,
+                                typename ViewType::const_value_type end_)
+      : a(a_), rand_pool(rand_pool_), begin(begin_), end(end_) {}
 
   KOKKOS_INLINE_FUNCTION
-  void operator() (IndexType i) const {
+  void operator()(IndexType i) const {
     typename RandomPool::generator_type gen = rand_pool.get_state();
-    for(IndexType j=0;j<loops;j++) {
-      const IndexType idx = i*loops+j;
-      if(idx<static_cast<IndexType>(a.extent(0))) {
-        for(IndexType k=0;k<static_cast<IndexType>(a.extent(1));k++)
-          for(IndexType l=0;l<static_cast<IndexType>(a.extent(2));l++)
-            for(IndexType m=0;m<static_cast<IndexType>(a.extent(3));m++)
-              for(IndexType n=0;n<static_cast<IndexType>(a.extent(4));n++)
-                for(IndexType o=0;o<static_cast<IndexType>(a.extent(5));o++)
-                  for(IndexType p=0;p<static_cast<IndexType>(a.extent(6));p++)
-                    for(IndexType q=0;q<static_cast<IndexType>(a.extent(7));q++)
-              a(idx,k,l,m,n,o,p,q) = Rand::draw(gen,begin,end);
+    for (IndexType j = 0; j < loops; j++) {
+      const IndexType idx = i * loops + j;
+      if (idx < static_cast<IndexType>(a.extent(0))) {
+        for (IndexType k = 0; k < static_cast<IndexType>(a.extent(1)); k++)
+          for (IndexType l = 0; l < static_cast<IndexType>(a.extent(2)); l++)
+            for (IndexType m = 0; m < static_cast<IndexType>(a.extent(3)); m++)
+              for (IndexType n = 0; n < static_cast<IndexType>(a.extent(4));
+                   n++)
+                for (IndexType o = 0; o < static_cast<IndexType>(a.extent(5));
+                     o++)
+                  for (IndexType p = 0; p < static_cast<IndexType>(a.extent(6));
+                       p++)
+                    for (IndexType q = 0;
+                         q < static_cast<IndexType>(a.extent(7)); q++)
+                      a(idx, k, l, m, n, o, p, q) = Rand::draw(gen, begin, end);
       }
     }
     rand_pool.free_state(gen);
   }
 };
 
-}
+}  // namespace Impl
 
-template<class ViewType, class RandomPool, class IndexType = int64_t>
-void fill_random(ViewType a, RandomPool g, typename ViewType::const_value_type range) {
+template <class ViewType, class RandomPool, class IndexType = int64_t>
+void fill_random(ViewType a, RandomPool g,
+                 typename ViewType::const_value_type range) {
   int64_t LDA = a.extent(0);
-  if(LDA>0)
-    parallel_for((LDA+127)/128,Impl::fill_random_functor_range<ViewType,RandomPool,128,ViewType::Rank,IndexType>(a,g,range));
+  if (LDA > 0)
+    parallel_for((LDA + 127) / 128,
+                 Impl::fill_random_functor_range<ViewType, RandomPool, 128,
+                                                 ViewType::Rank, IndexType>(
+                     a, g, range));
 }
 
-template<class ViewType, class RandomPool, class IndexType = int64_t>
-void fill_random(ViewType a, RandomPool g, typename ViewType::const_value_type begin,typename ViewType::const_value_type end ) {
+template <class ViewType, class RandomPool, class IndexType = int64_t>
+void fill_random(ViewType a, RandomPool g,
+                 typename ViewType::const_value_type begin,
+                 typename ViewType::const_value_type end) {
   int64_t LDA = a.extent(0);
-  if(LDA>0)
-    parallel_for((LDA+127)/128,Impl::fill_random_functor_begin_end<ViewType,RandomPool,128,ViewType::Rank,IndexType>(a,g,begin,end));
-}
+  if (LDA > 0)
+    parallel_for((LDA + 127) / 128,
+                 Impl::fill_random_functor_begin_end<ViewType, RandomPool, 128,
+                                                     ViewType::Rank, IndexType>(
+                     a, g, begin, end));
 }
+}  // namespace Kokkos
 
 #endif
diff --git a/lib/kokkos/algorithms/src/Kokkos_Sort.hpp b/lib/kokkos/algorithms/src/Kokkos_Sort.hpp
index 7fb8505fe5..b7a988361f 100644
--- a/lib/kokkos/algorithms/src/Kokkos_Sort.hpp
+++ b/lib/kokkos/algorithms/src/Kokkos_Sort.hpp
@@ -1,13 +1,14 @@
 /*
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -36,12 +37,11 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 */
 
-
 #ifndef KOKKOS_SORT_HPP_
 #define KOKKOS_SORT_HPP_
 
@@ -51,125 +51,107 @@
 
 namespace Kokkos {
 
-  namespace Impl {
+namespace Impl {
 
-  template< class DstViewType , class SrcViewType
-          , int Rank = DstViewType::Rank >
-  struct CopyOp;
+template <class DstViewType, class SrcViewType, int Rank = DstViewType::Rank>
+struct CopyOp;
 
-  template< class DstViewType , class SrcViewType >
-  struct CopyOp<DstViewType,SrcViewType,1> {
-    KOKKOS_INLINE_FUNCTION
-    static void copy(DstViewType const& dst, size_t i_dst,
-                     SrcViewType const& src, size_t i_src ) {
-      dst(i_dst) = src(i_src);
-    }
-  };
-
-  template< class DstViewType , class SrcViewType >
-  struct CopyOp<DstViewType,SrcViewType,2> {
-    KOKKOS_INLINE_FUNCTION
-    static void copy(DstViewType const& dst, size_t i_dst,
-                     SrcViewType const& src, size_t i_src ) {
-      for(int j = 0;j< (int) dst.extent(1); j++)
-        dst(i_dst,j) = src(i_src,j);
-    }
-  };
-
-  template< class DstViewType , class SrcViewType >
-  struct CopyOp<DstViewType,SrcViewType,3> {
-    KOKKOS_INLINE_FUNCTION
-    static void copy(DstViewType const& dst, size_t i_dst,
-                     SrcViewType const& src, size_t i_src ) {
-      for(int j = 0; j<dst.extent(1); j++)
-        for(int k = 0; k<dst.extent(2); k++)
-          dst(i_dst,j,k) = src(i_src,j,k);
-    }
-  };
+template <class DstViewType, class SrcViewType>
+struct CopyOp<DstViewType, SrcViewType, 1> {
+  KOKKOS_INLINE_FUNCTION
+  static void copy(DstViewType const& dst, size_t i_dst, SrcViewType const& src,
+                   size_t i_src) {
+    dst(i_dst) = src(i_src);
   }
+};
+
+template <class DstViewType, class SrcViewType>
+struct CopyOp<DstViewType, SrcViewType, 2> {
+  KOKKOS_INLINE_FUNCTION
+  static void copy(DstViewType const& dst, size_t i_dst, SrcViewType const& src,
+                   size_t i_src) {
+    for (int j = 0; j < (int)dst.extent(1); j++) dst(i_dst, j) = src(i_src, j);
+  }
+};
+
+template <class DstViewType, class SrcViewType>
+struct CopyOp<DstViewType, SrcViewType, 3> {
+  KOKKOS_INLINE_FUNCTION
+  static void copy(DstViewType const& dst, size_t i_dst, SrcViewType const& src,
+                   size_t i_src) {
+    for (int j = 0; j < dst.extent(1); j++)
+      for (int k = 0; k < dst.extent(2); k++)
+        dst(i_dst, j, k) = src(i_src, j, k);
+  }
+};
+}  // namespace Impl
 
 //----------------------------------------------------------------------------
 
-template< class KeyViewType
-        , class BinSortOp
-        , class Space = typename KeyViewType::device_type
-        , class SizeType = typename KeyViewType::memory_space::size_type
-        >
+template <class KeyViewType, class BinSortOp,
+          class Space    = typename KeyViewType::device_type,
+          class SizeType = typename KeyViewType::memory_space::size_type>
 class BinSort {
-public:
-
-  template< class DstViewType , class SrcViewType >
+ public:
+  template <class DstViewType, class SrcViewType>
   struct copy_functor {
+    typedef typename SrcViewType::const_type src_view_type;
 
-    typedef typename SrcViewType::const_type  src_view_type ;
+    typedef Impl::CopyOp<DstViewType, src_view_type> copy_op;
 
-    typedef Impl::CopyOp< DstViewType , src_view_type > copy_op ;
+    DstViewType dst_values;
+    src_view_type src_values;
+    int dst_offset;
 
-    DstViewType     dst_values ;
-    src_view_type   src_values ;
-    int             dst_offset ;
-
-    copy_functor( DstViewType  const & dst_values_
-                , int          const & dst_offset_
-                , SrcViewType  const & src_values_
-                )
-      : dst_values( dst_values_ )
-      , src_values( src_values_ )
-      , dst_offset( dst_offset_ )
-      {}
+    copy_functor(DstViewType const& dst_values_, int const& dst_offset_,
+                 SrcViewType const& src_values_)
+        : dst_values(dst_values_),
+          src_values(src_values_),
+          dst_offset(dst_offset_) {}
 
     KOKKOS_INLINE_FUNCTION
-    void operator() (const int& i) const {
-      copy_op::copy(dst_values,i+dst_offset,src_values,i);
+    void operator()(const int& i) const {
+      copy_op::copy(dst_values, i + dst_offset, src_values, i);
     }
   };
 
-  template< class DstViewType
-          , class PermuteViewType
-          , class SrcViewType
-          >
+  template <class DstViewType, class PermuteViewType, class SrcViewType>
   struct copy_permute_functor {
-
     // If a Kokkos::View then can generate constant random access
     // otherwise can only use the constant type.
 
-    typedef typename std::conditional
-      < Kokkos::is_view< SrcViewType >::value
-      , Kokkos::View< typename SrcViewType::const_data_type
-                    , typename SrcViewType::array_layout
-                    , typename SrcViewType::device_type
-                    , Kokkos::MemoryTraits<Kokkos::RandomAccess>
-                    >
-      , typename SrcViewType::const_type
-      >::type src_view_type ;
+    typedef typename std::conditional<
+        Kokkos::is_view<SrcViewType>::value,
+        Kokkos::View<typename SrcViewType::const_data_type,
+                     typename SrcViewType::array_layout,
+                     typename SrcViewType::device_type,
+                     Kokkos::MemoryTraits<Kokkos::RandomAccess> >,
+        typename SrcViewType::const_type>::type src_view_type;
 
-    typedef typename PermuteViewType::const_type  perm_view_type ;
+    typedef typename PermuteViewType::const_type perm_view_type;
 
-    typedef Impl::CopyOp< DstViewType , src_view_type > copy_op ;
+    typedef Impl::CopyOp<DstViewType, src_view_type> copy_op;
 
-    DstViewType     dst_values ;
-    perm_view_type  sort_order ;
-    src_view_type   src_values ;
-    int             src_offset ;
+    DstViewType dst_values;
+    perm_view_type sort_order;
+    src_view_type src_values;
+    int src_offset;
 
-    copy_permute_functor( DstViewType     const & dst_values_
-                        , PermuteViewType const & sort_order_
-                        , SrcViewType     const & src_values_
-                        , int             const & src_offset_
-                        )
-      : dst_values( dst_values_ )
-      , sort_order( sort_order_ )
-      , src_values( src_values_ )
-      , src_offset( src_offset_ )
-      {}
+    copy_permute_functor(DstViewType const& dst_values_,
+                         PermuteViewType const& sort_order_,
+                         SrcViewType const& src_values_, int const& src_offset_)
+        : dst_values(dst_values_),
+          sort_order(sort_order_),
+          src_values(src_values_),
+          src_offset(src_offset_) {}
 
     KOKKOS_INLINE_FUNCTION
-    void operator() (const int& i)  const {
-      copy_op::copy(dst_values,i,src_values,src_offset+sort_order(i));
+    void operator()(const int& i) const {
+      copy_op::copy(dst_values, i, src_values, src_offset + sort_order(i));
     }
   };
 
-  typedef typename Space::execution_space  execution_space;
+  typedef typename Space::execution_space execution_space;
   typedef BinSortOp bin_op_type;
 
   struct bin_count_tag {};
@@ -177,221 +159,236 @@ public:
   struct bin_binning_tag {};
   struct bin_sort_bins_tag {};
 
-public:
-
+ public:
   typedef SizeType size_type;
   typedef size_type value_type;
 
   typedef Kokkos::View<size_type*, Space> offset_type;
   typedef Kokkos::View<const int*, Space> bin_count_type;
 
-  typedef typename KeyViewType::const_type  const_key_view_type ;
+  typedef typename KeyViewType::const_type const_key_view_type;
 
   // If a Kokkos::View then can generate constant random access
   // otherwise can only use the constant type.
 
-  typedef typename std::conditional
-    < Kokkos::is_view< KeyViewType >::value
-    , Kokkos::View< typename KeyViewType::const_data_type,
-                    typename KeyViewType::array_layout,
-                    typename KeyViewType::device_type,
-                    Kokkos::MemoryTraits<Kokkos::RandomAccess> >
-    , const_key_view_type
-    >::type const_rnd_key_view_type;
+  typedef typename std::conditional<
+      Kokkos::is_view<KeyViewType>::value,
+      Kokkos::View<typename KeyViewType::const_data_type,
+                   typename KeyViewType::array_layout,
+                   typename KeyViewType::device_type,
+                   Kokkos::MemoryTraits<Kokkos::RandomAccess> >,
+      const_key_view_type>::type const_rnd_key_view_type;
 
   typedef typename KeyViewType::non_const_value_type non_const_key_scalar;
-  typedef typename KeyViewType::const_value_type     const_key_scalar;
+  typedef typename KeyViewType::const_value_type const_key_scalar;
 
-  typedef Kokkos::View<int*, Space, Kokkos::MemoryTraits<Kokkos::Atomic> > bin_count_atomic_type ;
-
-private:
+  typedef Kokkos::View<int*, Space, Kokkos::MemoryTraits<Kokkos::Atomic> >
+      bin_count_atomic_type;
 
+ private:
   const_key_view_type keys;
   const_rnd_key_view_type keys_rnd;
 
-public:
+ public:
+  BinSortOp bin_op;
+  offset_type bin_offsets;
+  bin_count_atomic_type bin_count_atomic;
+  bin_count_type bin_count_const;
+  offset_type sort_order;
 
-  BinSortOp             bin_op ;
-  offset_type           bin_offsets ;
-  bin_count_atomic_type bin_count_atomic ;
-  bin_count_type        bin_count_const ;
-  offset_type           sort_order ;
-
-  int                   range_begin ;
-  int                   range_end ;
-  bool                  sort_within_bins ;
-
-public:
+  int range_begin;
+  int range_end;
+  bool sort_within_bins;
 
+ public:
   BinSort() {}
 
   //----------------------------------------
-  // Constructor: takes the keys, the binning_operator and optionally whether to sort within bins (default false)
-  BinSort( const_key_view_type  keys_
-         , int                  range_begin_
-         , int                  range_end_
-         , BinSortOp            bin_op_
-         , bool                 sort_within_bins_ = false
-         )
-     : keys(keys_)
-     , keys_rnd(keys_)
-     , bin_op(bin_op_)
-     , bin_offsets()
-     , bin_count_atomic()
-     , bin_count_const()
-     , sort_order()
-     , range_begin( range_begin_ )
-     , range_end( range_end_ )
-     , sort_within_bins( sort_within_bins_ )
-  {
-    bin_count_atomic = Kokkos::View<int*, Space >("Kokkos::SortImpl::BinSortFunctor::bin_count",bin_op.max_bins());
-    bin_count_const =  bin_count_atomic;
-    bin_offsets =      offset_type(ViewAllocateWithoutInitializing("Kokkos::SortImpl::BinSortFunctor::bin_offsets"),bin_op.max_bins());
-    sort_order =       offset_type(ViewAllocateWithoutInitializing("Kokkos::SortImpl::BinSortFunctor::sort_order"),range_end-range_begin);
+  // Constructor: takes the keys, the binning_operator and optionally whether to
+  // sort within bins (default false)
+  BinSort(const_key_view_type keys_, int range_begin_, int range_end_,
+          BinSortOp bin_op_, bool sort_within_bins_ = false)
+      : keys(keys_),
+        keys_rnd(keys_),
+        bin_op(bin_op_),
+        bin_offsets(),
+        bin_count_atomic(),
+        bin_count_const(),
+        sort_order(),
+        range_begin(range_begin_),
+        range_end(range_end_),
+        sort_within_bins(sort_within_bins_) {
+    bin_count_atomic = Kokkos::View<int*, Space>(
+        "Kokkos::SortImpl::BinSortFunctor::bin_count", bin_op.max_bins());
+    bin_count_const = bin_count_atomic;
+    bin_offsets =
+        offset_type(ViewAllocateWithoutInitializing(
+                        "Kokkos::SortImpl::BinSortFunctor::bin_offsets"),
+                    bin_op.max_bins());
+    sort_order =
+        offset_type(ViewAllocateWithoutInitializing(
+                        "Kokkos::SortImpl::BinSortFunctor::sort_order"),
+                    range_end - range_begin);
   }
 
-  BinSort( const_key_view_type  keys_
-         , BinSortOp            bin_op_
-         , bool                 sort_within_bins_ = false
-         )
-     : BinSort( keys_ , 0 , keys_.extent(0), bin_op_ , sort_within_bins_ ) {}
+  BinSort(const_key_view_type keys_, BinSortOp bin_op_,
+          bool sort_within_bins_ = false)
+      : BinSort(keys_, 0, keys_.extent(0), bin_op_, sort_within_bins_) {}
 
   //----------------------------------------
-  // Create the permutation vector, the bin_offset array and the bin_count array. Can be called again if keys changed
+  // Create the permutation vector, the bin_offset array and the bin_count
+  // array. Can be called again if keys changed
   void create_permute_vector() {
-    const size_t len = range_end - range_begin ;
-    Kokkos::parallel_for ("Kokkos::Sort::BinCount",Kokkos::RangePolicy<execution_space,bin_count_tag>    (0,len),*this);
-    Kokkos::parallel_scan("Kokkos::Sort::BinOffset",Kokkos::RangePolicy<execution_space,bin_offset_tag>   (0,bin_op.max_bins()) ,*this);
+    const size_t len = range_end - range_begin;
+    Kokkos::parallel_for(
+        "Kokkos::Sort::BinCount",
+        Kokkos::RangePolicy<execution_space, bin_count_tag>(0, len), *this);
+    Kokkos::parallel_scan("Kokkos::Sort::BinOffset",
+                          Kokkos::RangePolicy<execution_space, bin_offset_tag>(
+                              0, bin_op.max_bins()),
+                          *this);
 
-    Kokkos::deep_copy(bin_count_atomic,0);
-    Kokkos::parallel_for ("Kokkos::Sort::BinBinning",Kokkos::RangePolicy<execution_space,bin_binning_tag>  (0,len),*this);
+    Kokkos::deep_copy(bin_count_atomic, 0);
+    Kokkos::parallel_for(
+        "Kokkos::Sort::BinBinning",
+        Kokkos::RangePolicy<execution_space, bin_binning_tag>(0, len), *this);
 
-    if(sort_within_bins)
-      Kokkos::parallel_for ("Kokkos::Sort::BinSort",Kokkos::RangePolicy<execution_space,bin_sort_bins_tag>(0,bin_op.max_bins()) ,*this);
+    if (sort_within_bins)
+      Kokkos::parallel_for(
+          "Kokkos::Sort::BinSort",
+          Kokkos::RangePolicy<execution_space, bin_sort_bins_tag>(
+              0, bin_op.max_bins()),
+          *this);
   }
 
-  // Sort a subset of a view with respect to the first dimension using the permutation array
-  template<class ValuesViewType>
-  void sort( ValuesViewType const & values
-           , int values_range_begin
-           , int values_range_end) const
-  {
-    typedef
-      Kokkos::View< typename ValuesViewType::data_type,
-                    typename ValuesViewType::array_layout,
-                    typename ValuesViewType::device_type >
-        scratch_view_type ;
+  // Sort a subset of a view with respect to the first dimension using the
+  // permutation array
+  template <class ValuesViewType>
+  void sort(ValuesViewType const& values, int values_range_begin,
+            int values_range_end) const {
+    typedef Kokkos::View<typename ValuesViewType::data_type,
+                         typename ValuesViewType::array_layout,
+                         typename ValuesViewType::device_type>
+        scratch_view_type;
 
-    const size_t len = range_end - range_begin ;
-    const size_t values_len = values_range_end - values_range_begin ;
+    const size_t len        = range_end - range_begin;
+    const size_t values_len = values_range_end - values_range_begin;
     if (len != values_len) {
-      Kokkos::abort("BinSort::sort: values range length != permutation vector length");
+      Kokkos::abort(
+          "BinSort::sort: values range length != permutation vector length");
     }
 
 #ifdef KOKKOS_ENABLE_DEPRECATED_CODE
-    scratch_view_type
-      sorted_values(ViewAllocateWithoutInitializing("Kokkos::SortImpl::BinSortFunctor::sorted_values"),
-                    len,
-                    values.extent(1),
-                    values.extent(2),
-                    values.extent(3),
-                    values.extent(4),
-                    values.extent(5),
-                    values.extent(6),
-                    values.extent(7));
+    scratch_view_type sorted_values(
+        ViewAllocateWithoutInitializing(
+            "Kokkos::SortImpl::BinSortFunctor::sorted_values"),
+        len, values.extent(1), values.extent(2), values.extent(3),
+        values.extent(4), values.extent(5), values.extent(6), values.extent(7));
 #else
-    scratch_view_type
-      sorted_values(ViewAllocateWithoutInitializing("Kokkos::SortImpl::BinSortFunctor::sorted_values"),
-                  values.rank_dynamic > 0 ? len : KOKKOS_IMPL_CTOR_DEFAULT_ARG,
-                  values.rank_dynamic > 1 ? values.extent(1) : KOKKOS_IMPL_CTOR_DEFAULT_ARG ,
-                  values.rank_dynamic > 2 ? values.extent(2) : KOKKOS_IMPL_CTOR_DEFAULT_ARG,
-                  values.rank_dynamic > 3 ? values.extent(3) : KOKKOS_IMPL_CTOR_DEFAULT_ARG,
-                  values.rank_dynamic > 4 ? values.extent(4) : KOKKOS_IMPL_CTOR_DEFAULT_ARG,
-                  values.rank_dynamic > 5 ? values.extent(5) : KOKKOS_IMPL_CTOR_DEFAULT_ARG,
-                  values.rank_dynamic > 6 ? values.extent(6) : KOKKOS_IMPL_CTOR_DEFAULT_ARG,
-                  values.rank_dynamic > 7 ? values.extent(7) : KOKKOS_IMPL_CTOR_DEFAULT_ARG);
+    scratch_view_type sorted_values(
+        ViewAllocateWithoutInitializing(
+            "Kokkos::SortImpl::BinSortFunctor::sorted_values"),
+        values.rank_dynamic > 0 ? len : KOKKOS_IMPL_CTOR_DEFAULT_ARG,
+        values.rank_dynamic > 1 ? values.extent(1)
+                                : KOKKOS_IMPL_CTOR_DEFAULT_ARG,
+        values.rank_dynamic > 2 ? values.extent(2)
+                                : KOKKOS_IMPL_CTOR_DEFAULT_ARG,
+        values.rank_dynamic > 3 ? values.extent(3)
+                                : KOKKOS_IMPL_CTOR_DEFAULT_ARG,
+        values.rank_dynamic > 4 ? values.extent(4)
+                                : KOKKOS_IMPL_CTOR_DEFAULT_ARG,
+        values.rank_dynamic > 5 ? values.extent(5)
+                                : KOKKOS_IMPL_CTOR_DEFAULT_ARG,
+        values.rank_dynamic > 6 ? values.extent(6)
+                                : KOKKOS_IMPL_CTOR_DEFAULT_ARG,
+        values.rank_dynamic > 7 ? values.extent(7)
+                                : KOKKOS_IMPL_CTOR_DEFAULT_ARG);
 #endif
 
     {
-      copy_permute_functor< scratch_view_type /* DstViewType */
-                          , offset_type       /* PermuteViewType */
-                          , ValuesViewType    /* SrcViewType */
-                          >
-        functor( sorted_values , sort_order , values, values_range_begin - range_begin );
+      copy_permute_functor<scratch_view_type /* DstViewType */
+                           ,
+                           offset_type /* PermuteViewType */
+                           ,
+                           ValuesViewType /* SrcViewType */
+                           >
+          functor(sorted_values, sort_order, values,
+                  values_range_begin - range_begin);
 
-      parallel_for("Kokkos::Sort::CopyPermute", Kokkos::RangePolicy<execution_space>(0,len),functor);
+      parallel_for("Kokkos::Sort::CopyPermute",
+                   Kokkos::RangePolicy<execution_space>(0, len), functor);
     }
 
     {
-      copy_functor< ValuesViewType , scratch_view_type >
-        functor( values , range_begin , sorted_values );
+      copy_functor<ValuesViewType, scratch_view_type> functor(
+          values, range_begin, sorted_values);
 
-      parallel_for("Kokkos::Sort::Copy", Kokkos::RangePolicy<execution_space>(0,len),functor);
+      parallel_for("Kokkos::Sort::Copy",
+                   Kokkos::RangePolicy<execution_space>(0, len), functor);
     }
 
     Kokkos::fence();
   }
 
-  template<class ValuesViewType>
-  void sort( ValuesViewType const & values ) const
-  {
-    this->sort( values, 0, /*values.extent(0)*/ range_end - range_begin );
+  template <class ValuesViewType>
+  void sort(ValuesViewType const& values) const {
+    this->sort(values, 0, /*values.extent(0)*/ range_end - range_begin);
   }
 
   // Get the permutation vector
   KOKKOS_INLINE_FUNCTION
-  offset_type get_permute_vector() const { return sort_order;}
+  offset_type get_permute_vector() const { return sort_order; }
 
   // Get the start offsets for each bin
   KOKKOS_INLINE_FUNCTION
-  offset_type get_bin_offsets() const { return bin_offsets;}
+  offset_type get_bin_offsets() const { return bin_offsets; }
 
   // Get the count for each bin
   KOKKOS_INLINE_FUNCTION
-  bin_count_type get_bin_count() const {return bin_count_const;}
-
-public:
+  bin_count_type get_bin_count() const { return bin_count_const; }
 
+ public:
   KOKKOS_INLINE_FUNCTION
-  void operator() (const bin_count_tag& tag, const int& i) const {
-    const int j = range_begin + i ;
+  void operator()(const bin_count_tag& tag, const int& i) const {
+    const int j = range_begin + i;
     bin_count_atomic(bin_op.bin(keys, j))++;
   }
 
   KOKKOS_INLINE_FUNCTION
-  void operator() (const bin_offset_tag& tag, const int& i, value_type& offset, const bool& final)  const {
-    if(final) {
+  void operator()(const bin_offset_tag& tag, const int& i, value_type& offset,
+                  const bool& final) const {
+    if (final) {
       bin_offsets(i) = offset;
     }
-    offset+=bin_count_const(i);
+    offset += bin_count_const(i);
   }
 
   KOKKOS_INLINE_FUNCTION
-  void operator() (const bin_binning_tag& tag, const int& i)  const {
-    const int j     = range_begin + i ;
-    const int bin   = bin_op.bin(keys,j);
+  void operator()(const bin_binning_tag& tag, const int& i) const {
+    const int j     = range_begin + i;
+    const int bin   = bin_op.bin(keys, j);
     const int count = bin_count_atomic(bin)++;
 
-    sort_order(bin_offsets(bin) + count) = j ;
+    sort_order(bin_offsets(bin) + count) = j;
   }
 
   KOKKOS_INLINE_FUNCTION
-  void operator() (const bin_sort_bins_tag& tag, const int&i )  const {
+  void operator()(const bin_sort_bins_tag& tag, const int& i) const {
     auto bin_size = bin_count_const(i);
     if (bin_size <= 1) return;
-    int upper_bound = bin_offsets(i)+bin_size;
-    bool sorted = false;
-    while(!sorted) {
-      sorted = true;
+    int upper_bound = bin_offsets(i) + bin_size;
+    bool sorted     = false;
+    while (!sorted) {
+      sorted      = true;
       int old_idx = sort_order(bin_offsets(i));
       int new_idx;
-      for(int k=bin_offsets(i)+1; k<upper_bound; k++) {
+      for (int k = bin_offsets(i) + 1; k < upper_bound; k++) {
         new_idx = sort_order(k);
 
-        if(!bin_op(keys_rnd,old_idx,new_idx)) {
-          sort_order(k-1) = new_idx;
-          sort_order(k) = old_idx;
-          sorted = false;
+        if (!bin_op(keys_rnd, old_idx, new_idx)) {
+          sort_order(k - 1) = new_idx;
+          sort_order(k)     = old_idx;
+          sorted            = false;
         } else {
           old_idx = new_idx;
         }
@@ -403,44 +400,46 @@ public:
 
 //----------------------------------------------------------------------------
 
-template<class KeyViewType>
+template <class KeyViewType>
 struct BinOp1D {
   int max_bins_;
   double mul_;
   typename KeyViewType::const_value_type range_;
   typename KeyViewType::const_value_type min_;
 
-  BinOp1D():max_bins_(0),mul_(0.0),
-            range_(typename KeyViewType::const_value_type()),
-            min_(typename KeyViewType::const_value_type()) {}
+  BinOp1D()
+      : max_bins_(0),
+        mul_(0.0),
+        range_(typename KeyViewType::const_value_type()),
+        min_(typename KeyViewType::const_value_type()) {}
 
-  //Construct BinOp with number of bins, minimum value and maxuimum value
+  // Construct BinOp with number of bins, minimum value and maxuimum value
   BinOp1D(int max_bins__, typename KeyViewType::const_value_type min,
-                               typename KeyViewType::const_value_type max )
-     :max_bins_(max_bins__+1),mul_(1.0*max_bins__/(max-min)),range_(max-min),min_(min) {}
+          typename KeyViewType::const_value_type max)
+      : max_bins_(max_bins__ + 1),
+        mul_(1.0 * max_bins__ / (max - min)),
+        range_(max - min),
+        min_(min) {}
 
-  //Determine bin index from key value
-  template<class ViewType>
-  KOKKOS_INLINE_FUNCTION
-  int bin(ViewType& keys, const int& i) const {
-    return int(mul_*(keys(i)-min_));
+  // Determine bin index from key value
+  template <class ViewType>
+  KOKKOS_INLINE_FUNCTION int bin(ViewType& keys, const int& i) const {
+    return int(mul_ * (keys(i) - min_));
   }
 
-  //Return maximum bin index + 1
+  // Return maximum bin index + 1
   KOKKOS_INLINE_FUNCTION
-  int max_bins() const {
-    return max_bins_;
-  }
+  int max_bins() const { return max_bins_; }
 
-  //Compare to keys within a bin if true new_val will be put before old_val
-  template<class ViewType, typename iType1, typename iType2>
-  KOKKOS_INLINE_FUNCTION
-  bool operator()(ViewType& keys, iType1& i1, iType2& i2) const {
-    return keys(i1)<keys(i2);
+  // Compare to keys within a bin if true new_val will be put before old_val
+  template <class ViewType, typename iType1, typename iType2>
+  KOKKOS_INLINE_FUNCTION bool operator()(ViewType& keys, iType1& i1,
+                                         iType2& i2) const {
+    return keys(i1) < keys(i2);
   }
 };
 
-template<class KeyViewType>
+template <class KeyViewType>
 struct BinOp3D {
   int max_bins_[3];
   double mul_[3];
@@ -450,43 +449,42 @@ struct BinOp3D {
   BinOp3D() {}
 
   BinOp3D(int max_bins__[], typename KeyViewType::const_value_type min[],
-                               typename KeyViewType::const_value_type max[] )
-  {
+          typename KeyViewType::const_value_type max[]) {
     max_bins_[0] = max_bins__[0];
     max_bins_[1] = max_bins__[1];
     max_bins_[2] = max_bins__[2];
-    mul_[0] = 1.0*max_bins__[0]/(max[0]-min[0]);
-    mul_[1] = 1.0*max_bins__[1]/(max[1]-min[1]);
-    mul_[2] = 1.0*max_bins__[2]/(max[2]-min[2]);
-    range_[0] = max[0]-min[0];
-    range_[1] = max[1]-min[1];
-    range_[2] = max[2]-min[2];
-    min_[0] = min[0];
-    min_[1] = min[1];
-    min_[2] = min[2];
+    mul_[0]      = 1.0 * max_bins__[0] / (max[0] - min[0]);
+    mul_[1]      = 1.0 * max_bins__[1] / (max[1] - min[1]);
+    mul_[2]      = 1.0 * max_bins__[2] / (max[2] - min[2]);
+    range_[0]    = max[0] - min[0];
+    range_[1]    = max[1] - min[1];
+    range_[2]    = max[2] - min[2];
+    min_[0]      = min[0];
+    min_[1]      = min[1];
+    min_[2]      = min[2];
   }
 
-  template<class ViewType>
-  KOKKOS_INLINE_FUNCTION
-  int bin(ViewType& keys, const int& i) const {
-    return int( (((int(mul_[0]*(keys(i,0)-min_[0]))*max_bins_[1]) +
-                   int(mul_[1]*(keys(i,1)-min_[1])))*max_bins_[2]) +
-                   int(mul_[2]*(keys(i,2)-min_[2])));
+  template <class ViewType>
+  KOKKOS_INLINE_FUNCTION int bin(ViewType& keys, const int& i) const {
+    return int((((int(mul_[0] * (keys(i, 0) - min_[0])) * max_bins_[1]) +
+                 int(mul_[1] * (keys(i, 1) - min_[1]))) *
+                max_bins_[2]) +
+               int(mul_[2] * (keys(i, 2) - min_[2])));
   }
 
   KOKKOS_INLINE_FUNCTION
-  int max_bins() const {
-    return max_bins_[0]*max_bins_[1]*max_bins_[2];
-  }
+  int max_bins() const { return max_bins_[0] * max_bins_[1] * max_bins_[2]; }
 
-  template<class ViewType, typename iType1, typename iType2>
-  KOKKOS_INLINE_FUNCTION
-  bool operator()(ViewType& keys, iType1& i1 , iType2& i2) const {
-    if (keys(i1,0)>keys(i2,0)) return true;
-    else if (keys(i1,0)==keys(i2,0)) {
-      if (keys(i1,1)>keys(i2,1)) return true;
-      else if (keys(i1,1)==keys(i2,1)) {
-        if (keys(i1,2)>keys(i2,2)) return true;
+  template <class ViewType, typename iType1, typename iType2>
+  KOKKOS_INLINE_FUNCTION bool operator()(ViewType& keys, iType1& i1,
+                                         iType2& i2) const {
+    if (keys(i1, 0) > keys(i2, 0))
+      return true;
+    else if (keys(i1, 0) == keys(i2, 0)) {
+      if (keys(i1, 1) > keys(i2, 1))
+        return true;
+      else if (keys(i1, 1) == keys(i2, 1)) {
+        if (keys(i1, 2) > keys(i2, 2)) return true;
       }
     }
     return false;
@@ -495,85 +493,80 @@ struct BinOp3D {
 
 namespace Impl {
 
-template<class ViewType>
+template <class ViewType>
 bool try_std_sort(ViewType view) {
-  bool possible = true;
-  size_t stride[8] = { view.stride_0()
-                     , view.stride_1()
-                     , view.stride_2()
-                     , view.stride_3()
-                     , view.stride_4()
-                     , view.stride_5()
-                     , view.stride_6()
-                     , view.stride_7()
-                     };
-  possible  = possible && std::is_same<typename ViewType::memory_space, HostSpace>::value;
-  possible  = possible && (ViewType::Rank == 1);
-  possible  = possible && (stride[0] == 1);
-  if(possible)  {
-   std::sort(view.data(),view.data()+view.extent(0));
+  bool possible    = true;
+  size_t stride[8] = {view.stride_0(), view.stride_1(), view.stride_2(),
+                      view.stride_3(), view.stride_4(), view.stride_5(),
+                      view.stride_6(), view.stride_7()};
+  possible         = possible &&
+             std::is_same<typename ViewType::memory_space, HostSpace>::value;
+  possible = possible && (ViewType::Rank == 1);
+  possible = possible && (stride[0] == 1);
+  if (possible) {
+    std::sort(view.data(), view.data() + view.extent(0));
   }
   return possible;
 }
 
-template<class ViewType>
+template <class ViewType>
 struct min_max_functor {
-  typedef Kokkos::MinMaxScalar<typename ViewType::non_const_value_type> minmax_scalar;
+  typedef Kokkos::MinMaxScalar<typename ViewType::non_const_value_type>
+      minmax_scalar;
 
   ViewType view;
-  min_max_functor(const ViewType& view_):view(view_) {}
+  min_max_functor(const ViewType& view_) : view(view_) {}
 
   KOKKOS_INLINE_FUNCTION
-  void operator() (const size_t& i, minmax_scalar& minmax) const {
-    if(view(i) < minmax.min_val) minmax.min_val = view(i);
-    if(view(i) > minmax.max_val) minmax.max_val = view(i);
+  void operator()(const size_t& i, minmax_scalar& minmax) const {
+    if (view(i) < minmax.min_val) minmax.min_val = view(i);
+    if (view(i) > minmax.max_val) minmax.max_val = view(i);
   }
 };
 
-}
+}  // namespace Impl
 
-template<class ViewType>
-void sort( ViewType const & view , bool const always_use_kokkos_sort = false)
-{
-  if(!always_use_kokkos_sort) {
-    if(Impl::try_std_sort(view)) return;
+template <class ViewType>
+void sort(ViewType const& view, bool const always_use_kokkos_sort = false) {
+  if (!always_use_kokkos_sort) {
+    if (Impl::try_std_sort(view)) return;
   }
   typedef BinOp1D<ViewType> CompType;
 
   Kokkos::MinMaxScalar<typename ViewType::non_const_value_type> result;
   Kokkos::MinMax<typename ViewType::non_const_value_type> reducer(result);
-  parallel_reduce("Kokkos::Sort::FindExtent",Kokkos::RangePolicy<typename ViewType::execution_space>(0,view.extent(0)),
-                  Impl::min_max_functor<ViewType>(view),reducer);
-  if(result.min_val == result.max_val) return;
-  BinSort<ViewType, CompType> bin_sort(view,CompType(view.extent(0)/2,result.min_val,result.max_val),true);
+  parallel_reduce("Kokkos::Sort::FindExtent",
+                  Kokkos::RangePolicy<typename ViewType::execution_space>(
+                      0, view.extent(0)),
+                  Impl::min_max_functor<ViewType>(view), reducer);
+  if (result.min_val == result.max_val) return;
+  BinSort<ViewType, CompType> bin_sort(
+      view, CompType(view.extent(0) / 2, result.min_val, result.max_val), true);
   bin_sort.create_permute_vector();
   bin_sort.sort(view);
 }
 
-template<class ViewType>
-void sort( ViewType view
-         , size_t const begin
-         , size_t const end
-         )
-{
-  typedef Kokkos::RangePolicy<typename ViewType::execution_space> range_policy ;
+template <class ViewType>
+void sort(ViewType view, size_t const begin, size_t const end) {
+  typedef Kokkos::RangePolicy<typename ViewType::execution_space> range_policy;
   typedef BinOp1D<ViewType> CompType;
 
   Kokkos::MinMaxScalar<typename ViewType::non_const_value_type> result;
   Kokkos::MinMax<typename ViewType::non_const_value_type> reducer(result);
 
-  parallel_reduce("Kokkos::Sort::FindExtent", range_policy( begin , end )
-                 , Impl::min_max_functor<ViewType>(view),reducer );
+  parallel_reduce("Kokkos::Sort::FindExtent", range_policy(begin, end),
+                  Impl::min_max_functor<ViewType>(view), reducer);
 
-  if(result.min_val == result.max_val) return;
+  if (result.min_val == result.max_val) return;
 
-  BinSort<ViewType, CompType>
-    bin_sort(view,begin,end,CompType((end-begin)/2,result.min_val,result.max_val),true);
+  BinSort<ViewType, CompType> bin_sort(
+      view, begin, end,
+      CompType((end - begin) / 2, result.min_val, result.max_val), true);
 
   bin_sort.create_permute_vector();
-  bin_sort.sort(view,begin,end);
+  bin_sort.sort(view, begin, end);
 }
 
-}
+}  // namespace Kokkos
 
 #endif
diff --git a/lib/kokkos/algorithms/unit_tests/CMakeLists.txt b/lib/kokkos/algorithms/unit_tests/CMakeLists.txt
index e238b37c8e..6fb08ce2ed 100644
--- a/lib/kokkos/algorithms/unit_tests/CMakeLists.txt
+++ b/lib/kokkos/algorithms/unit_tests/CMakeLists.txt
@@ -1,18 +1,12 @@
 
-INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR})
-INCLUDE_DIRECTORIES(REQUIRED_DURING_INSTALLATION_TESTING ${CMAKE_CURRENT_SOURCE_DIR})
-INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../src )
+#Leave these here for now - I don't need transitive deps anyway
+KOKKOS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR})
+KOKKOS_INCLUDE_DIRECTORIES(REQUIRED_DURING_INSTALLATION_TESTING ${CMAKE_CURRENT_SOURCE_DIR})
+KOKKOS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../src )
 
-IF(NOT KOKKOS_HAS_TRILINOS)
-  IF(KOKKOS_SEPARATE_LIBS)
-    set(TEST_LINK_TARGETS kokkoscore)
-  ELSE()
-    set(TEST_LINK_TARGETS kokkos)
-  ENDIF()
-ENDIF()
 
 SET(GTEST_SOURCE_DIR ${${PARENT_PACKAGE_NAME}_SOURCE_DIR}/tpls/gtest)
-INCLUDE_DIRECTORIES(${GTEST_SOURCE_DIR})
+KOKKOS_INCLUDE_DIRECTORIES(${GTEST_SOURCE_DIR})
 
 # mfh 03 Nov 2017: The gtest library used here must have a different
 # name than that of the gtest library built in KokkosCore.  We can't
@@ -20,23 +14,20 @@ INCLUDE_DIRECTORIES(${GTEST_SOURCE_DIR})
 # possible to build only (e.g.,) KokkosAlgorithms tests, without
 # building KokkosCore tests.
 
-SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DGTEST_HAS_PTHREAD=0")
 
-TRIBITS_ADD_LIBRARY(
+KOKKOS_ADD_TEST_LIBRARY(
   kokkosalgorithms_gtest
   HEADERS ${GTEST_SOURCE_DIR}/gtest/gtest.h
   SOURCES ${GTEST_SOURCE_DIR}/gtest/gtest-all.cc
-  TESTONLY
-  )
+)
+KOKKOS_TARGET_COMPILE_DEFINITIONS(kokkosalgorithms_gtest PUBLIC "-DGTEST_HAS_PTHREAD=0")
 
 SET(SOURCES
   UnitTestMain.cpp 
   TestCuda.cpp
   )
 
-SET(LIBRARIES kokkoscore)
-
-IF(Kokkos_ENABLE_OpenMP)
+IF(Kokkos_ENABLE_OPENMP)
   LIST( APPEND SOURCES
     TestOpenMP.cpp
   )
@@ -48,23 +39,19 @@ IF(Kokkos_ENABLE_HPX)
   )
 ENDIF()
 
-IF(Kokkos_ENABLE_Serial)
+IF(Kokkos_ENABLE_SERIAL)
   LIST( APPEND SOURCES
     TestSerial.cpp
   )
 ENDIF()
 
-IF(Kokkos_ENABLE_Pthread)
+IF(Kokkos_ENABLE_PTHREAD)
   LIST( APPEND SOURCES
     TestThreads.cpp
   )
 ENDIF()
 
-TRIBITS_ADD_EXECUTABLE_AND_TEST(
+KOKKOS_ADD_EXECUTABLE_AND_TEST(
   UnitTest
   SOURCES ${SOURCES}
-  COMM serial mpi
-  NUM_MPI_PROCS 1
-  FAIL_REGULAR_EXPRESSION "  FAILED  "
-  TESTONLYLIBS kokkosalgorithms_gtest ${TEST_LINK_TARGETS}
-  )
+)
diff --git a/lib/kokkos/algorithms/unit_tests/TestCuda.cpp b/lib/kokkos/algorithms/unit_tests/TestCuda.cpp
index 86fdccd0e7..ab727b0326 100644
--- a/lib/kokkos/algorithms/unit_tests/TestCuda.cpp
+++ b/lib/kokkos/algorithms/unit_tests/TestCuda.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -57,51 +58,31 @@
 
 namespace Test {
 
-class cuda : public ::testing::Test {
-protected:
-  static void SetUpTestCase()
-  {
-  }
-  static void TearDownTestCase()
-  {
-  }
-};
-
-void cuda_test_random_xorshift64( int num_draws  )
-{
+void cuda_test_random_xorshift64(int num_draws) {
   Impl::test_random<Kokkos::Random_XorShift64_Pool<Kokkos::Cuda> >(num_draws);
 }
 
-void cuda_test_random_xorshift1024( int num_draws  )
-{
+void cuda_test_random_xorshift1024(int num_draws) {
   Impl::test_random<Kokkos::Random_XorShift1024_Pool<Kokkos::Cuda> >(num_draws);
 }
 
+#define CUDA_RANDOM_XORSHIFT64(num_draws) \
+  TEST(cuda, Random_XorShift64) { cuda_test_random_xorshift64(num_draws); }
 
-#define CUDA_RANDOM_XORSHIFT64( num_draws )                                \
-  TEST_F( cuda, Random_XorShift64 ) {   \
-  cuda_test_random_xorshift64(num_draws);                                   \
-  }
+#define CUDA_RANDOM_XORSHIFT1024(num_draws) \
+  TEST(cuda, Random_XorShift1024) { cuda_test_random_xorshift1024(num_draws); }
 
-#define CUDA_RANDOM_XORSHIFT1024( num_draws )                                \
-  TEST_F( cuda, Random_XorShift1024 ) {   \
-  cuda_test_random_xorshift1024(num_draws);                                   \
-  }
+#define CUDA_SORT_UNSIGNED(size) \
+  TEST(cuda, SortUnsigned) { Impl::test_sort<Kokkos::Cuda, unsigned>(size); }
 
-#define CUDA_SORT_UNSIGNED( size )                                \
-  TEST_F( cuda, SortUnsigned ) {   \
-      Impl::test_sort< Kokkos::Cuda, unsigned >(size);                                   \
-  }
-
-CUDA_RANDOM_XORSHIFT64(  132141141 )
-CUDA_RANDOM_XORSHIFT1024( 52428813 )
+CUDA_RANDOM_XORSHIFT64(132141141)
+CUDA_RANDOM_XORSHIFT1024(52428813)
 CUDA_SORT_UNSIGNED(171)
 
 #undef CUDA_RANDOM_XORSHIFT64
 #undef CUDA_RANDOM_XORSHIFT1024
 #undef CUDA_SORT_UNSIGNED
-}
+}  // namespace Test
 #else
 void KOKKOS_ALGORITHMS_UNITTESTS_TESTCUDA_PREVENT_LINK_ERROR() {}
-#endif  /* #ifdef KOKKOS_ENABLE_CUDA */
-
+#endif /* #ifdef KOKKOS_ENABLE_CUDA */
diff --git a/lib/kokkos/algorithms/unit_tests/TestHPX.cpp b/lib/kokkos/algorithms/unit_tests/TestHPX.cpp
index e5b7dbdb7a..2981e97945 100644
--- a/lib/kokkos/algorithms/unit_tests/TestHPX.cpp
+++ b/lib/kokkos/algorithms/unit_tests/TestHPX.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -41,7 +42,6 @@
 //@HEADER
 */
 
-
 #include <Kokkos_Macros.hpp>
 #ifdef KOKKOS_ENABLE_HPX
 
@@ -55,42 +55,33 @@
 
 namespace Test {
 
-class hpx : public ::testing::Test {
-protected:
-  static void SetUpTestCase()
-  {
-    std::cout << std::setprecision(5) << std::scientific;
+#define HPX_RANDOM_XORSHIFT64(num_draws)                             \
+  TEST(hpx, Random_XorShift64) {                                     \
+    Impl::test_random<                                               \
+        Kokkos::Random_XorShift64_Pool<Kokkos::Experimental::HPX> >( \
+        num_draws);                                                  \
   }
 
-  static void TearDownTestCase()
-  {
-  }
-};
-
-#define HPX_RANDOM_XORSHIFT64( num_draws )                                \
-  TEST_F( hpx, Random_XorShift64 ) {   \
-      Impl::test_random<Kokkos::Random_XorShift64_Pool<Kokkos::Experimental::HPX> >(num_draws); \
+#define HPX_RANDOM_XORSHIFT1024(num_draws)                             \
+  TEST(hpx, Random_XorShift1024) {                                     \
+    Impl::test_random<                                                 \
+        Kokkos::Random_XorShift1024_Pool<Kokkos::Experimental::HPX> >( \
+        num_draws);                                                    \
   }
 
-#define HPX_RANDOM_XORSHIFT1024( num_draws )                                \
-  TEST_F( hpx, Random_XorShift1024 ) {   \
-      Impl::test_random<Kokkos::Random_XorShift1024_Pool<Kokkos::Experimental::HPX> >(num_draws); \
+#define HPX_SORT_UNSIGNED(size)                                 \
+  TEST(hpx, SortUnsigned) {                                     \
+    Impl::test_sort<Kokkos::Experimental::HPX, unsigned>(size); \
   }
 
-#define HPX_SORT_UNSIGNED( size )                                \
-  TEST_F( hpx, SortUnsigned ) {   \
-      Impl::test_sort< Kokkos::Experimental::HPX, unsigned >(size); \
-  }
-
-HPX_RANDOM_XORSHIFT64( 10240000 )
-HPX_RANDOM_XORSHIFT1024( 10130144 )
+HPX_RANDOM_XORSHIFT64(10240000)
+HPX_RANDOM_XORSHIFT1024(10130144)
 HPX_SORT_UNSIGNED(171)
 
 #undef HPX_RANDOM_XORSHIFT64
 #undef HPX_RANDOM_XORSHIFT1024
 #undef HPX_SORT_UNSIGNED
-} // namespace test
+}  // namespace Test
 #else
 void KOKKOS_ALGORITHMS_UNITTESTS_TESTHPX_PREVENT_LINK_ERROR() {}
 #endif
-
diff --git a/lib/kokkos/algorithms/unit_tests/TestOpenMP.cpp b/lib/kokkos/algorithms/unit_tests/TestOpenMP.cpp
index c4ddde7b7f..3a9e306014 100644
--- a/lib/kokkos/algorithms/unit_tests/TestOpenMP.cpp
+++ b/lib/kokkos/algorithms/unit_tests/TestOpenMP.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -41,7 +42,6 @@
 //@HEADER
 */
 
-
 #include <Kokkos_Macros.hpp>
 #ifdef KOKKOS_ENABLE_OPENMP
 
@@ -55,42 +55,31 @@
 
 namespace Test {
 
-class openmp : public ::testing::Test {
-protected:
-  static void SetUpTestCase()
-  {
-    std::cout << std::setprecision(5) << std::scientific;
+#define OPENMP_RANDOM_XORSHIFT64(num_draws)                             \
+  TEST(openmp, Random_XorShift64) {                                     \
+    Impl::test_random<Kokkos::Random_XorShift64_Pool<Kokkos::OpenMP> >( \
+        num_draws);                                                     \
   }
 
-  static void TearDownTestCase()
-  {
-  }
-};
-
-#define OPENMP_RANDOM_XORSHIFT64( num_draws )                                \
-  TEST_F( openmp, Random_XorShift64 ) {   \
-      Impl::test_random<Kokkos::Random_XorShift64_Pool<Kokkos::OpenMP> >(num_draws);                                   \
+#define OPENMP_RANDOM_XORSHIFT1024(num_draws)                             \
+  TEST(openmp, Random_XorShift1024) {                                     \
+    Impl::test_random<Kokkos::Random_XorShift1024_Pool<Kokkos::OpenMP> >( \
+        num_draws);                                                       \
   }
 
-#define OPENMP_RANDOM_XORSHIFT1024( num_draws )                                \
-  TEST_F( openmp, Random_XorShift1024 ) {   \
-      Impl::test_random<Kokkos::Random_XorShift1024_Pool<Kokkos::OpenMP> >(num_draws);                                   \
+#define OPENMP_SORT_UNSIGNED(size)                   \
+  TEST(openmp, SortUnsigned) {                       \
+    Impl::test_sort<Kokkos::OpenMP, unsigned>(size); \
   }
 
-#define OPENMP_SORT_UNSIGNED( size )                                \
-  TEST_F( openmp, SortUnsigned ) {   \
-      Impl::test_sort< Kokkos::OpenMP, unsigned >(size);                                   \
-  }
-
-OPENMP_RANDOM_XORSHIFT64( 10240000 )
-OPENMP_RANDOM_XORSHIFT1024( 10130144 )
+OPENMP_RANDOM_XORSHIFT64(10240000)
+OPENMP_RANDOM_XORSHIFT1024(10130144)
 OPENMP_SORT_UNSIGNED(171)
 
 #undef OPENMP_RANDOM_XORSHIFT64
 #undef OPENMP_RANDOM_XORSHIFT1024
 #undef OPENMP_SORT_UNSIGNED
-} // namespace test
+}  // namespace Test
 #else
 void KOKKOS_ALGORITHMS_UNITTESTS_TESTOPENMP_PREVENT_LINK_ERROR() {}
 #endif
-
diff --git a/lib/kokkos/algorithms/unit_tests/TestROCm.cpp b/lib/kokkos/algorithms/unit_tests/TestROCm.cpp
index 15179509bb..29814cca3e 100644
--- a/lib/kokkos/algorithms/unit_tests/TestROCm.cpp
+++ b/lib/kokkos/algorithms/unit_tests/TestROCm.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -57,52 +58,35 @@
 
 namespace Test {
 
-class rocm : public ::testing::Test {
-protected:
-  static void SetUpTestCase()
-  {
-    std::cout << std::setprecision(5) << std::scientific;
-  }
-  static void TearDownTestCase()
-  {
-  }
-};
-
-void rocm_test_random_xorshift64( int num_draws  )
-{
-  Impl::test_random<Kokkos::Random_XorShift64_Pool<Kokkos::Experimental::ROCm> >(num_draws);
+void rocm_test_random_xorshift64(int num_draws) {
+  Impl::test_random<
+      Kokkos::Random_XorShift64_Pool<Kokkos::Experimental::ROCm> >(num_draws);
 }
 
-void rocm_test_random_xorshift1024( int num_draws  )
-{
-  Impl::test_random<Kokkos::Random_XorShift1024_Pool<Kokkos::Experimental::ROCm> >(num_draws);
+void rocm_test_random_xorshift1024(int num_draws) {
+  Impl::test_random<
+      Kokkos::Random_XorShift1024_Pool<Kokkos::Experimental::ROCm> >(num_draws);
 }
 
+#define ROCM_RANDOM_XORSHIFT64(num_draws) \
+  TEST(rocm, Random_XorShift64) { rocm_test_random_xorshift64(num_draws); }
 
-#define ROCM_RANDOM_XORSHIFT64( num_draws )  \
-  TEST_F( rocm, Random_XorShift64 ) {        \
-  rocm_test_random_xorshift64(num_draws);    \
+#define ROCM_RANDOM_XORSHIFT1024(num_draws) \
+  TEST(rocm, Random_XorShift1024) { rocm_test_random_xorshift1024(num_draws); }
+
+#define ROCM_SORT_UNSIGNED(size)                                 \
+  TEST(rocm, SortUnsigned) {                                     \
+    Impl::test_sort<Kokkos::Experimental::ROCm, unsigned>(size); \
   }
 
-#define ROCM_RANDOM_XORSHIFT1024( num_draws )  \
-  TEST_F( rocm, Random_XorShift1024 ) {        \
-  rocm_test_random_xorshift1024(num_draws);    \
-  }
-
-#define ROCM_SORT_UNSIGNED( size )                                    \
-  TEST_F( rocm, SortUnsigned ) {                                      \
-      Impl::test_sort< Kokkos::Experimental::ROCm, unsigned >(size);  \
-  }
-
-ROCM_RANDOM_XORSHIFT64(  132141141 )
-ROCM_RANDOM_XORSHIFT1024( 52428813 )
+ROCM_RANDOM_XORSHIFT64(132141141)
+ROCM_RANDOM_XORSHIFT1024(52428813)
 ROCM_SORT_UNSIGNED(171)
 
 #undef ROCM_RANDOM_XORSHIFT64
 #undef ROCM_RANDOM_XORSHIFT1024
 #undef ROCM_SORT_UNSIGNED
-}
+}  // namespace Test
 #else
 void KOKKOS_ALGORITHMS_UNITTESTS_TESTROCM_PREVENT_LINK_ERROR() {}
-#endif  /* #ifdef KOKKOS_ENABLE_ROCM */
-
+#endif /* #ifdef KOKKOS_ENABLE_ROCM */
diff --git a/lib/kokkos/algorithms/unit_tests/TestRandom.hpp b/lib/kokkos/algorithms/unit_tests/TestRandom.hpp
index 73bd416f2a..bc55ebfad3 100644
--- a/lib/kokkos/algorithms/unit_tests/TestRandom.hpp
+++ b/lib/kokkos/algorithms/unit_tests/TestRandom.hpp
@@ -1,10 +1,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -22,10 +23,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -54,18 +55,19 @@
 
 namespace Test {
 
-namespace Impl{
+namespace Impl {
 
 // This test runs the random number generators and uses some statistic tests to
 // check the 'goodness' of the random numbers:
 //    (i)   mean:         the mean is expected to be 0.5*RAND_MAX
 //    (ii)  variance:     the variance is 1/3*mean*mean
 //    (iii) covariance:   the covariance is 0
-//    (iv)  1-tupledistr: the mean, variance and covariance of a 1D Histrogram of random numbers
-//    (v)   3-tupledistr: the mean, variance and covariance of a 3D Histrogram of random numbers
+//    (iv)  1-tupledistr: the mean, variance and covariance of a 1D Histrogram
+//    of random numbers (v)   3-tupledistr: the mean, variance and covariance of
+//    a 3D Histrogram of random numbers
 
 #define HIST_DIM3D 24
-#define HIST_DIM1D (HIST_DIM3D*HIST_DIM3D*HIST_DIM3D)
+#define HIST_DIM1D (HIST_DIM3D * HIST_DIM3D * HIST_DIM3D)
 
 struct RandomProperties {
   uint64_t count;
@@ -77,37 +79,37 @@ struct RandomProperties {
 
   KOKKOS_INLINE_FUNCTION
   RandomProperties() {
-    count = 0;
-    mean = 0.0;
-    variance = 0.0;
+    count      = 0;
+    mean       = 0.0;
+    variance   = 0.0;
     covariance = 0.0;
-    min = 1e64;
-    max = -1e64;
+    min        = 1e64;
+    max        = -1e64;
   }
 
   KOKKOS_INLINE_FUNCTION
   RandomProperties& operator+=(const RandomProperties& add) {
-    count      += add.count;
-    mean       += add.mean;
-    variance   += add.variance;
+    count += add.count;
+    mean += add.mean;
+    variance += add.variance;
     covariance += add.covariance;
-    min         = add.min<min?add.min:min;
-    max         = add.max>max?add.max:max;
+    min = add.min < min ? add.min : min;
+    max = add.max > max ? add.max : max;
     return *this;
   }
 
   KOKKOS_INLINE_FUNCTION
   void operator+=(const volatile RandomProperties& add) volatile {
-    count      += add.count;
-    mean       += add.mean;
-    variance   += add.variance;
+    count += add.count;
+    mean += add.mean;
+    variance += add.variance;
     covariance += add.covariance;
-    min         = add.min<min?add.min:min;
-    max         = add.max>max?add.max:max;
+    min = add.min < min ? add.min : min;
+    max = add.max > max ? add.max : max;
   }
 };
 
-template<class GeneratorPool, class Scalar>
+template <class GeneratorPool, class Scalar>
 struct test_random_functor {
   typedef typename GeneratorPool::generator_type rnd_type;
 
@@ -123,38 +125,40 @@ struct test_random_functor {
   // implementations might violate this upper bound, due to rounding
   // error.  Just in case, we leave an extra space at the end of each
   // dimension, in the View types below.
-  typedef Kokkos::View<int[HIST_DIM1D+1],typename GeneratorPool::device_type> type_1d;
+  typedef Kokkos::View<int[HIST_DIM1D + 1], typename GeneratorPool::device_type>
+      type_1d;
   type_1d density_1d;
-  typedef Kokkos::View<int[HIST_DIM3D+1][HIST_DIM3D+1][HIST_DIM3D+1],typename GeneratorPool::device_type> type_3d;
+  typedef Kokkos::View<int[HIST_DIM3D + 1][HIST_DIM3D + 1][HIST_DIM3D + 1],
+                       typename GeneratorPool::device_type>
+      type_3d;
   type_3d density_3d;
 
-  test_random_functor (GeneratorPool rand_pool_, type_1d d1d, type_3d d3d) :
-    rand_pool (rand_pool_),
-    mean (0.5*Kokkos::rand<rnd_type,Scalar>::max ()),
-    density_1d (d1d),
-    density_3d (d3d)
-  {}
+  test_random_functor(GeneratorPool rand_pool_, type_1d d1d, type_3d d3d)
+      : rand_pool(rand_pool_),
+        mean(0.5 * Kokkos::rand<rnd_type, Scalar>::max()),
+        density_1d(d1d),
+        density_3d(d3d) {}
 
   KOKKOS_INLINE_FUNCTION
-  void operator() (int i, RandomProperties& prop) const {
+  void operator()(int i, RandomProperties& prop) const {
     using Kokkos::atomic_fetch_add;
 
     rnd_type rand_gen = rand_pool.get_state();
     for (int k = 0; k < 1024; ++k) {
-      const Scalar tmp = Kokkos::rand<rnd_type,Scalar>::draw(rand_gen);
+      const Scalar tmp = Kokkos::rand<rnd_type, Scalar>::draw(rand_gen);
       prop.count++;
       prop.mean += tmp;
-      prop.variance += (tmp-mean)*(tmp-mean);
-      const Scalar tmp2 = Kokkos::rand<rnd_type,Scalar>::draw(rand_gen);
+      prop.variance += (tmp - mean) * (tmp - mean);
+      const Scalar tmp2 = Kokkos::rand<rnd_type, Scalar>::draw(rand_gen);
       prop.count++;
       prop.mean += tmp2;
-      prop.variance += (tmp2-mean)*(tmp2-mean);
-      prop.covariance += (tmp-mean)*(tmp2-mean);
-      const Scalar tmp3 = Kokkos::rand<rnd_type,Scalar>::draw(rand_gen);
+      prop.variance += (tmp2 - mean) * (tmp2 - mean);
+      prop.covariance += (tmp - mean) * (tmp2 - mean);
+      const Scalar tmp3 = Kokkos::rand<rnd_type, Scalar>::draw(rand_gen);
       prop.count++;
       prop.mean += tmp3;
-      prop.variance += (tmp3-mean)*(tmp3-mean);
-      prop.covariance += (tmp2-mean)*(tmp3-mean);
+      prop.variance += (tmp3 - mean) * (tmp3 - mean);
+      prop.covariance += (tmp2 - mean) * (tmp3 - mean);
 
       // NOTE (mfh 03 Nov 2014): Kokkos::rand::max() is supposed to
       // define an exclusive upper bound on the range of random
@@ -169,26 +173,32 @@ struct test_random_functor {
       // returns values of max(), the histograms will still catch this
       // indirectly, since none of the other values will be filled in.
 
-      const Scalar theMax = Kokkos::rand<rnd_type, Scalar>::max ();
+      const Scalar theMax = Kokkos::rand<rnd_type, Scalar>::max();
 
-      const uint64_t ind1_1d = static_cast<uint64_t> (1.0 * HIST_DIM1D * tmp / theMax);
-      const uint64_t ind2_1d = static_cast<uint64_t> (1.0 * HIST_DIM1D * tmp2 / theMax);
-      const uint64_t ind3_1d = static_cast<uint64_t> (1.0 * HIST_DIM1D * tmp3 / theMax);
+      const uint64_t ind1_1d =
+          static_cast<uint64_t>(1.0 * HIST_DIM1D * tmp / theMax);
+      const uint64_t ind2_1d =
+          static_cast<uint64_t>(1.0 * HIST_DIM1D * tmp2 / theMax);
+      const uint64_t ind3_1d =
+          static_cast<uint64_t>(1.0 * HIST_DIM1D * tmp3 / theMax);
 
-      const uint64_t ind1_3d = static_cast<uint64_t> (1.0 * HIST_DIM3D * tmp / theMax);
-      const uint64_t ind2_3d = static_cast<uint64_t> (1.0 * HIST_DIM3D * tmp2 / theMax);
-      const uint64_t ind3_3d = static_cast<uint64_t> (1.0 * HIST_DIM3D * tmp3 / theMax);
+      const uint64_t ind1_3d =
+          static_cast<uint64_t>(1.0 * HIST_DIM3D * tmp / theMax);
+      const uint64_t ind2_3d =
+          static_cast<uint64_t>(1.0 * HIST_DIM3D * tmp2 / theMax);
+      const uint64_t ind3_3d =
+          static_cast<uint64_t>(1.0 * HIST_DIM3D * tmp3 / theMax);
 
-      atomic_fetch_add (&density_1d(ind1_1d), 1);
-      atomic_fetch_add (&density_1d(ind2_1d), 1);
-      atomic_fetch_add (&density_1d(ind3_1d), 1);
-      atomic_fetch_add (&density_3d(ind1_3d, ind2_3d, ind3_3d), 1);
+      atomic_fetch_add(&density_1d(ind1_1d), 1);
+      atomic_fetch_add(&density_1d(ind2_1d), 1);
+      atomic_fetch_add(&density_1d(ind3_1d), 1);
+      atomic_fetch_add(&density_3d(ind1_3d, ind2_3d, ind3_3d), 1);
     }
     rand_pool.free_state(rand_gen);
   }
 };
 
-template<class DeviceType>
+template <class DeviceType>
 struct test_histogram1d_functor {
   typedef RandomProperties value_type;
   typedef typename DeviceType::execution_space execution_space;
@@ -200,34 +210,29 @@ struct test_histogram1d_functor {
   // implementations might violate this upper bound, due to rounding
   // error.  Just in case, we leave an extra space at the end of each
   // dimension, in the View type below.
-  typedef Kokkos::View<int[HIST_DIM1D+1], memory_space> type_1d;
+  typedef Kokkos::View<int[HIST_DIM1D + 1], memory_space> type_1d;
   type_1d density_1d;
   double mean;
 
-  test_histogram1d_functor (type_1d d1d, int num_draws) :
-    density_1d (d1d),
-    mean (1.0*num_draws/HIST_DIM1D*3)
-  {
-  }
+  test_histogram1d_functor(type_1d d1d, int num_draws)
+      : density_1d(d1d), mean(1.0 * num_draws / HIST_DIM1D * 3) {}
 
-  KOKKOS_INLINE_FUNCTION void
-  operator() (const typename memory_space::size_type i,
-              RandomProperties& prop) const
-  {
+  KOKKOS_INLINE_FUNCTION void operator()(
+      const typename memory_space::size_type i, RandomProperties& prop) const {
     typedef typename memory_space::size_type size_type;
     const double count = density_1d(i);
     prop.mean += count;
     prop.variance += 1.0 * (count - mean) * (count - mean);
-    //prop.covariance += 1.0*count*count;
+    // prop.covariance += 1.0*count*count;
     prop.min = count < prop.min ? count : prop.min;
     prop.max = count > prop.max ? count : prop.max;
-    if (i < static_cast<size_type> (HIST_DIM1D-1)) {
-      prop.covariance += (count - mean) * (density_1d(i+1) - mean);
+    if (i < static_cast<size_type>(HIST_DIM1D - 1)) {
+      prop.covariance += (count - mean) * (density_1d(i + 1) - mean);
     }
   }
 };
 
-template<class DeviceType>
+template <class DeviceType>
 struct test_histogram3d_functor {
   typedef RandomProperties value_type;
   typedef typename DeviceType::execution_space execution_space;
@@ -239,29 +244,28 @@ struct test_histogram3d_functor {
   // implementations might violate this upper bound, due to rounding
   // error.  Just in case, we leave an extra space at the end of each
   // dimension, in the View type below.
-  typedef Kokkos::View<int[HIST_DIM3D+1][HIST_DIM3D+1][HIST_DIM3D+1], memory_space> type_3d;
+  typedef Kokkos::View<int[HIST_DIM3D + 1][HIST_DIM3D + 1][HIST_DIM3D + 1],
+                       memory_space>
+      type_3d;
   type_3d density_3d;
   double mean;
 
-  test_histogram3d_functor (type_3d d3d, int num_draws) :
-    density_3d (d3d),
-    mean (1.0*num_draws/HIST_DIM1D)
-  {}
+  test_histogram3d_functor(type_3d d3d, int num_draws)
+      : density_3d(d3d), mean(1.0 * num_draws / HIST_DIM1D) {}
 
-  KOKKOS_INLINE_FUNCTION void
-  operator() (const typename memory_space::size_type i,
-              RandomProperties& prop) const
-  {
+  KOKKOS_INLINE_FUNCTION void operator()(
+      const typename memory_space::size_type i, RandomProperties& prop) const {
     typedef typename memory_space::size_type size_type;
-    const double count = density_3d(i/(HIST_DIM3D*HIST_DIM3D),
-                                    (i % (HIST_DIM3D*HIST_DIM3D))/HIST_DIM3D,
-                                    i % HIST_DIM3D);
+    const double count = density_3d(
+        i / (HIST_DIM3D * HIST_DIM3D),
+        (i % (HIST_DIM3D * HIST_DIM3D)) / HIST_DIM3D, i % HIST_DIM3D);
     prop.mean += count;
     prop.variance += (count - mean) * (count - mean);
-    if (i < static_cast<size_type> (HIST_DIM1D-1)) {
-      const double count_next = density_3d((i+1)/(HIST_DIM3D*HIST_DIM3D),
-                                           ((i+1)%(HIST_DIM3D*HIST_DIM3D))/HIST_DIM3D,
-                                           (i+1)%HIST_DIM3D);
+    if (i < static_cast<size_type>(HIST_DIM1D - 1)) {
+      const double count_next =
+          density_3d((i + 1) / (HIST_DIM3D * HIST_DIM3D),
+                     ((i + 1) % (HIST_DIM3D * HIST_DIM3D)) / HIST_DIM3D,
+                     (i + 1) % HIST_DIM3D);
       prop.covariance += (count - mean) * (count_next - mean);
     }
   }
@@ -270,212 +274,223 @@ struct test_histogram3d_functor {
 //
 // Templated test that uses the above functors.
 //
-template <class RandomGenerator,class Scalar>
+template <class RandomGenerator, class Scalar>
 struct test_random_scalar {
   typedef typename RandomGenerator::generator_type rnd_type;
 
-  int pass_mean,pass_var,pass_covar;
-  int pass_hist1d_mean,pass_hist1d_var,pass_hist1d_covar;
-  int pass_hist3d_mean,pass_hist3d_var,pass_hist3d_covar;
+  int pass_mean, pass_var, pass_covar;
+  int pass_hist1d_mean, pass_hist1d_var, pass_hist1d_covar;
+  int pass_hist3d_mean, pass_hist3d_var, pass_hist3d_covar;
 
-  test_random_scalar (typename test_random_functor<RandomGenerator,int>::type_1d& density_1d,
-                      typename test_random_functor<RandomGenerator,int>::type_3d& density_3d,
-                      RandomGenerator& pool,
-                      unsigned int num_draws)
-  {
+  test_random_scalar(
+      typename test_random_functor<RandomGenerator, int>::type_1d& density_1d,
+      typename test_random_functor<RandomGenerator, int>::type_3d& density_3d,
+      RandomGenerator& pool, unsigned int num_draws) {
+    using Kokkos::parallel_reduce;
     using std::cout;
     using std::endl;
-    using Kokkos::parallel_reduce;
 
     {
       cout << " -- Testing randomness properties" << endl;
 
       RandomProperties result;
       typedef test_random_functor<RandomGenerator, Scalar> functor_type;
-      parallel_reduce (num_draws/1024, functor_type (pool, density_1d, density_3d), result);
+      parallel_reduce(num_draws / 1024,
+                      functor_type(pool, density_1d, density_3d), result);
 
-      //printf("Result: %lf %lf %lf\n",result.mean/num_draws/3,result.variance/num_draws/3,result.covariance/num_draws/2);
-      double tolerance = 1.6*std::sqrt(1.0/num_draws);
-      double mean_expect = 0.5*Kokkos::rand<rnd_type,Scalar>::max();
-      double variance_expect = 1.0/3.0*mean_expect*mean_expect;
-      double mean_eps = mean_expect/(result.mean/num_draws/3)-1.0;
-      double variance_eps = variance_expect/(result.variance/num_draws/3)-1.0;
-      double covariance_eps = result.covariance/num_draws/2/variance_expect;
-      pass_mean  = ((-tolerance < mean_eps) &&
-                    ( tolerance > mean_eps)) ? 1:0;
-      pass_var   = ((-1.5*tolerance < variance_eps) &&
-                    ( 1.5*tolerance > variance_eps)) ? 1:0;
-      pass_covar = ((-2.0*tolerance < covariance_eps) &&
-                    ( 2.0*tolerance > covariance_eps)) ? 1:0;
-      cout << "Pass: " << pass_mean
-           << " " << pass_var
-           << " " << mean_eps
-           << " " << variance_eps
-           << " " << covariance_eps
-           << " || " << tolerance << endl;
+      // printf("Result: %lf %lf
+      // %lf\n",result.mean/num_draws/3,result.variance/num_draws/3,result.covariance/num_draws/2);
+      double tolerance       = 1.6 * std::sqrt(1.0 / num_draws);
+      double mean_expect     = 0.5 * Kokkos::rand<rnd_type, Scalar>::max();
+      double variance_expect = 1.0 / 3.0 * mean_expect * mean_expect;
+      double mean_eps = mean_expect / (result.mean / num_draws / 3) - 1.0;
+      double variance_eps =
+          variance_expect / (result.variance / num_draws / 3) - 1.0;
+      double covariance_eps =
+          result.covariance / num_draws / 2 / variance_expect;
+      pass_mean = ((-tolerance < mean_eps) && (tolerance > mean_eps)) ? 1 : 0;
+      pass_var  = ((-1.5 * tolerance < variance_eps) &&
+                  (1.5 * tolerance > variance_eps))
+                     ? 1
+                     : 0;
+      pass_covar = ((-2.0 * tolerance < covariance_eps) &&
+                    (2.0 * tolerance > covariance_eps))
+                       ? 1
+                       : 0;
+      cout << "Pass: " << pass_mean << " " << pass_var << " " << mean_eps << " "
+           << variance_eps << " " << covariance_eps << " || " << tolerance
+           << endl;
     }
     {
       cout << " -- Testing 1-D histogram" << endl;
 
       RandomProperties result;
-      typedef test_histogram1d_functor<typename RandomGenerator::device_type> functor_type;
-      parallel_reduce (HIST_DIM1D, functor_type (density_1d, num_draws), result);
+      typedef test_histogram1d_functor<typename RandomGenerator::device_type>
+          functor_type;
+      parallel_reduce(HIST_DIM1D, functor_type(density_1d, num_draws), result);
 
-      double tolerance = 6*std::sqrt(1.0/HIST_DIM1D);
-      double mean_expect = 1.0*num_draws*3/HIST_DIM1D;
-      double variance_expect = 1.0*num_draws*3/HIST_DIM1D*(1.0-1.0/HIST_DIM1D);
-      double covariance_expect = -1.0*num_draws*3/HIST_DIM1D/HIST_DIM1D;
-      double mean_eps = mean_expect/(result.mean/HIST_DIM1D)-1.0;
-      double variance_eps = variance_expect/(result.variance/HIST_DIM1D)-1.0;
-      double covariance_eps = (result.covariance/HIST_DIM1D - covariance_expect)/mean_expect;
-      pass_hist1d_mean  = ((-0.0001 < mean_eps) &&
-                           ( 0.0001 > mean_eps)) ? 1:0;
-      pass_hist1d_var   = ((-0.07 < variance_eps) &&
-                           ( 0.07 > variance_eps)) ? 1:0;
-      pass_hist1d_covar = ((-0.06 < covariance_eps) &&
-                           ( 0.06 > covariance_eps)) ? 1:0;
+      double tolerance   = 6 * std::sqrt(1.0 / HIST_DIM1D);
+      double mean_expect = 1.0 * num_draws * 3 / HIST_DIM1D;
+      double variance_expect =
+          1.0 * num_draws * 3 / HIST_DIM1D * (1.0 - 1.0 / HIST_DIM1D);
+      double covariance_expect = -1.0 * num_draws * 3 / HIST_DIM1D / HIST_DIM1D;
+      double mean_eps          = mean_expect / (result.mean / HIST_DIM1D) - 1.0;
+      double variance_eps =
+          variance_expect / (result.variance / HIST_DIM1D) - 1.0;
+      double covariance_eps =
+          (result.covariance / HIST_DIM1D - covariance_expect) / mean_expect;
+      pass_hist1d_mean = ((-0.0001 < mean_eps) && (0.0001 > mean_eps)) ? 1 : 0;
+      pass_hist1d_var =
+          ((-0.07 < variance_eps) && (0.07 > variance_eps)) ? 1 : 0;
+      pass_hist1d_covar =
+          ((-0.06 < covariance_eps) && (0.06 > covariance_eps)) ? 1 : 0;
 
-      cout << "Density 1D: " << mean_eps
-           << " " << variance_eps
-           << " " << (result.covariance/HIST_DIM1D/HIST_DIM1D)
-           << " || " << tolerance
-           << " " << result.min
-           << " " << result.max
-           << " || " << result.variance/HIST_DIM1D
-           << " " << 1.0*num_draws*3/HIST_DIM1D*(1.0-1.0/HIST_DIM1D)
-           << " || " << result.covariance/HIST_DIM1D
-           << " " << -1.0*num_draws*3/HIST_DIM1D/HIST_DIM1D
-           << endl;
+      cout << "Density 1D: " << mean_eps << " " << variance_eps << " "
+           << (result.covariance / HIST_DIM1D / HIST_DIM1D) << " || "
+           << tolerance << " " << result.min << " " << result.max << " || "
+           << result.variance / HIST_DIM1D << " "
+           << 1.0 * num_draws * 3 / HIST_DIM1D * (1.0 - 1.0 / HIST_DIM1D)
+           << " || " << result.covariance / HIST_DIM1D << " "
+           << -1.0 * num_draws * 3 / HIST_DIM1D / HIST_DIM1D << endl;
     }
     {
       cout << " -- Testing 3-D histogram" << endl;
 
       RandomProperties result;
-      typedef test_histogram3d_functor<typename RandomGenerator::device_type> functor_type;
-      parallel_reduce (HIST_DIM1D, functor_type (density_3d, num_draws), result);
+      typedef test_histogram3d_functor<typename RandomGenerator::device_type>
+          functor_type;
+      parallel_reduce(HIST_DIM1D, functor_type(density_3d, num_draws), result);
 
-      double tolerance = 6*std::sqrt(1.0/HIST_DIM1D);
-      double mean_expect = 1.0*num_draws/HIST_DIM1D;
-      double variance_expect = 1.0*num_draws/HIST_DIM1D*(1.0-1.0/HIST_DIM1D);
-      double covariance_expect = -1.0*num_draws/HIST_DIM1D/HIST_DIM1D;
-      double mean_eps = mean_expect/(result.mean/HIST_DIM1D)-1.0;
-      double variance_eps = variance_expect/(result.variance/HIST_DIM1D)-1.0;
-      double covariance_eps = (result.covariance/HIST_DIM1D - covariance_expect)/mean_expect;
-      pass_hist3d_mean  = ((-tolerance < mean_eps) &&
-                           ( tolerance > mean_eps)) ? 1:0;
-      pass_hist3d_var   = ((-1.2*tolerance < variance_eps) &&
-                           ( 1.2*tolerance > variance_eps)) ? 1:0;
-      pass_hist3d_covar = ((-tolerance < covariance_eps) &&
-                           ( tolerance > covariance_eps)) ? 1:0;
+      double tolerance   = 6 * std::sqrt(1.0 / HIST_DIM1D);
+      double mean_expect = 1.0 * num_draws / HIST_DIM1D;
+      double variance_expect =
+          1.0 * num_draws / HIST_DIM1D * (1.0 - 1.0 / HIST_DIM1D);
+      double covariance_expect = -1.0 * num_draws / HIST_DIM1D / HIST_DIM1D;
+      double mean_eps          = mean_expect / (result.mean / HIST_DIM1D) - 1.0;
+      double variance_eps =
+          variance_expect / (result.variance / HIST_DIM1D) - 1.0;
+      double covariance_eps =
+          (result.covariance / HIST_DIM1D - covariance_expect) / mean_expect;
+      pass_hist3d_mean =
+          ((-tolerance < mean_eps) && (tolerance > mean_eps)) ? 1 : 0;
+      pass_hist3d_var = ((-1.2 * tolerance < variance_eps) &&
+                         (1.2 * tolerance > variance_eps))
+                            ? 1
+                            : 0;
+      pass_hist3d_covar =
+          ((-tolerance < covariance_eps) && (tolerance > covariance_eps)) ? 1
+                                                                          : 0;
 
-      cout << "Density 3D: " << mean_eps
-           << " " << variance_eps
-           << " " << result.covariance/HIST_DIM1D/HIST_DIM1D
-           << " || " << tolerance
-           << " " << result.min
-           << " " << result.max << endl;
+      cout << "Density 3D: " << mean_eps << " " << variance_eps << " "
+           << result.covariance / HIST_DIM1D / HIST_DIM1D << " || " << tolerance
+           << " " << result.min << " " << result.max << endl;
     }
   }
 };
 
 template <class RandomGenerator>
-void test_random(unsigned int num_draws)
-{
+void test_random(unsigned int num_draws) {
   using std::cout;
   using std::endl;
-  typename test_random_functor<RandomGenerator,int>::type_1d density_1d("D1d");
-  typename test_random_functor<RandomGenerator,int>::type_3d density_3d("D3d");
+  typename test_random_functor<RandomGenerator, int>::type_1d density_1d("D1d");
+  typename test_random_functor<RandomGenerator, int>::type_3d density_3d("D3d");
 
-
-  uint64_t ticks = std::chrono::high_resolution_clock::now().time_since_epoch().count();
+  uint64_t ticks =
+      std::chrono::high_resolution_clock::now().time_since_epoch().count();
   cout << "Test Seed:" << ticks << endl;
 
   RandomGenerator pool(ticks);
 
   cout << "Test Scalar=int" << endl;
-  test_random_scalar<RandomGenerator,int> test_int(density_1d,density_3d,pool,num_draws);
-  ASSERT_EQ( test_int.pass_mean,1);
-  ASSERT_EQ( test_int.pass_var,1);
-  ASSERT_EQ( test_int.pass_covar,1);
-  ASSERT_EQ( test_int.pass_hist1d_mean,1);
-  ASSERT_EQ( test_int.pass_hist1d_var,1);
-  ASSERT_EQ( test_int.pass_hist1d_covar,1);
-  ASSERT_EQ( test_int.pass_hist3d_mean,1);
-  ASSERT_EQ( test_int.pass_hist3d_var,1);
-  ASSERT_EQ( test_int.pass_hist3d_covar,1);
-  deep_copy(density_1d,0);
-  deep_copy(density_3d,0);
+  test_random_scalar<RandomGenerator, int> test_int(density_1d, density_3d,
+                                                    pool, num_draws);
+  ASSERT_EQ(test_int.pass_mean, 1);
+  ASSERT_EQ(test_int.pass_var, 1);
+  ASSERT_EQ(test_int.pass_covar, 1);
+  ASSERT_EQ(test_int.pass_hist1d_mean, 1);
+  ASSERT_EQ(test_int.pass_hist1d_var, 1);
+  ASSERT_EQ(test_int.pass_hist1d_covar, 1);
+  ASSERT_EQ(test_int.pass_hist3d_mean, 1);
+  ASSERT_EQ(test_int.pass_hist3d_var, 1);
+  ASSERT_EQ(test_int.pass_hist3d_covar, 1);
+  deep_copy(density_1d, 0);
+  deep_copy(density_3d, 0);
 
   cout << "Test Scalar=unsigned int" << endl;
-  test_random_scalar<RandomGenerator,unsigned int> test_uint(density_1d,density_3d,pool,num_draws);
-  ASSERT_EQ( test_uint.pass_mean,1);
-  ASSERT_EQ( test_uint.pass_var,1);
-  ASSERT_EQ( test_uint.pass_covar,1);
-  ASSERT_EQ( test_uint.pass_hist1d_mean,1);
-  ASSERT_EQ( test_uint.pass_hist1d_var,1);
-  ASSERT_EQ( test_uint.pass_hist1d_covar,1);
-  ASSERT_EQ( test_uint.pass_hist3d_mean,1);
-  ASSERT_EQ( test_uint.pass_hist3d_var,1);
-  ASSERT_EQ( test_uint.pass_hist3d_covar,1);
-  deep_copy(density_1d,0);
-  deep_copy(density_3d,0);
+  test_random_scalar<RandomGenerator, unsigned int> test_uint(
+      density_1d, density_3d, pool, num_draws);
+  ASSERT_EQ(test_uint.pass_mean, 1);
+  ASSERT_EQ(test_uint.pass_var, 1);
+  ASSERT_EQ(test_uint.pass_covar, 1);
+  ASSERT_EQ(test_uint.pass_hist1d_mean, 1);
+  ASSERT_EQ(test_uint.pass_hist1d_var, 1);
+  ASSERT_EQ(test_uint.pass_hist1d_covar, 1);
+  ASSERT_EQ(test_uint.pass_hist3d_mean, 1);
+  ASSERT_EQ(test_uint.pass_hist3d_var, 1);
+  ASSERT_EQ(test_uint.pass_hist3d_covar, 1);
+  deep_copy(density_1d, 0);
+  deep_copy(density_3d, 0);
 
   cout << "Test Scalar=int64_t" << endl;
-  test_random_scalar<RandomGenerator,int64_t> test_int64(density_1d,density_3d,pool,num_draws);
-  ASSERT_EQ( test_int64.pass_mean,1);
-  ASSERT_EQ( test_int64.pass_var,1);
-  ASSERT_EQ( test_int64.pass_covar,1);
-  ASSERT_EQ( test_int64.pass_hist1d_mean,1);
-  ASSERT_EQ( test_int64.pass_hist1d_var,1);
-  ASSERT_EQ( test_int64.pass_hist1d_covar,1);
-  ASSERT_EQ( test_int64.pass_hist3d_mean,1);
-  ASSERT_EQ( test_int64.pass_hist3d_var,1);
-  ASSERT_EQ( test_int64.pass_hist3d_covar,1);
-  deep_copy(density_1d,0);
-  deep_copy(density_3d,0);
+  test_random_scalar<RandomGenerator, int64_t> test_int64(
+      density_1d, density_3d, pool, num_draws);
+  ASSERT_EQ(test_int64.pass_mean, 1);
+  ASSERT_EQ(test_int64.pass_var, 1);
+  ASSERT_EQ(test_int64.pass_covar, 1);
+  ASSERT_EQ(test_int64.pass_hist1d_mean, 1);
+  ASSERT_EQ(test_int64.pass_hist1d_var, 1);
+  ASSERT_EQ(test_int64.pass_hist1d_covar, 1);
+  ASSERT_EQ(test_int64.pass_hist3d_mean, 1);
+  ASSERT_EQ(test_int64.pass_hist3d_var, 1);
+  ASSERT_EQ(test_int64.pass_hist3d_covar, 1);
+  deep_copy(density_1d, 0);
+  deep_copy(density_3d, 0);
 
   cout << "Test Scalar=uint64_t" << endl;
-  test_random_scalar<RandomGenerator,uint64_t> test_uint64(density_1d,density_3d,pool,num_draws);
-  ASSERT_EQ( test_uint64.pass_mean,1);
-  ASSERT_EQ( test_uint64.pass_var,1);
-  ASSERT_EQ( test_uint64.pass_covar,1);
-  ASSERT_EQ( test_uint64.pass_hist1d_mean,1);
-  ASSERT_EQ( test_uint64.pass_hist1d_var,1);
-  ASSERT_EQ( test_uint64.pass_hist1d_covar,1);
-  ASSERT_EQ( test_uint64.pass_hist3d_mean,1);
-  ASSERT_EQ( test_uint64.pass_hist3d_var,1);
-  ASSERT_EQ( test_uint64.pass_hist3d_covar,1);
-  deep_copy(density_1d,0);
-  deep_copy(density_3d,0);
+  test_random_scalar<RandomGenerator, uint64_t> test_uint64(
+      density_1d, density_3d, pool, num_draws);
+  ASSERT_EQ(test_uint64.pass_mean, 1);
+  ASSERT_EQ(test_uint64.pass_var, 1);
+  ASSERT_EQ(test_uint64.pass_covar, 1);
+  ASSERT_EQ(test_uint64.pass_hist1d_mean, 1);
+  ASSERT_EQ(test_uint64.pass_hist1d_var, 1);
+  ASSERT_EQ(test_uint64.pass_hist1d_covar, 1);
+  ASSERT_EQ(test_uint64.pass_hist3d_mean, 1);
+  ASSERT_EQ(test_uint64.pass_hist3d_var, 1);
+  ASSERT_EQ(test_uint64.pass_hist3d_covar, 1);
+  deep_copy(density_1d, 0);
+  deep_copy(density_3d, 0);
 
   cout << "Test Scalar=float" << endl;
-  test_random_scalar<RandomGenerator,float> test_float(density_1d,density_3d,pool,num_draws);
-  ASSERT_EQ( test_float.pass_mean,1);
-  ASSERT_EQ( test_float.pass_var,1);
-  ASSERT_EQ( test_float.pass_covar,1);
-  ASSERT_EQ( test_float.pass_hist1d_mean,1);
-  ASSERT_EQ( test_float.pass_hist1d_var,1);
-  ASSERT_EQ( test_float.pass_hist1d_covar,1);
-  ASSERT_EQ( test_float.pass_hist3d_mean,1);
-  ASSERT_EQ( test_float.pass_hist3d_var,1);
-  ASSERT_EQ( test_float.pass_hist3d_covar,1);
-  deep_copy(density_1d,0);
-  deep_copy(density_3d,0);
+  test_random_scalar<RandomGenerator, float> test_float(density_1d, density_3d,
+                                                        pool, num_draws);
+  ASSERT_EQ(test_float.pass_mean, 1);
+  ASSERT_EQ(test_float.pass_var, 1);
+  ASSERT_EQ(test_float.pass_covar, 1);
+  ASSERT_EQ(test_float.pass_hist1d_mean, 1);
+  ASSERT_EQ(test_float.pass_hist1d_var, 1);
+  ASSERT_EQ(test_float.pass_hist1d_covar, 1);
+  ASSERT_EQ(test_float.pass_hist3d_mean, 1);
+  ASSERT_EQ(test_float.pass_hist3d_var, 1);
+  ASSERT_EQ(test_float.pass_hist3d_covar, 1);
+  deep_copy(density_1d, 0);
+  deep_copy(density_3d, 0);
 
   cout << "Test Scalar=double" << endl;
-  test_random_scalar<RandomGenerator,double> test_double(density_1d,density_3d,pool,num_draws);
-  ASSERT_EQ( test_double.pass_mean,1);
-  ASSERT_EQ( test_double.pass_var,1);
-  ASSERT_EQ( test_double.pass_covar,1);
-  ASSERT_EQ( test_double.pass_hist1d_mean,1);
-  ASSERT_EQ( test_double.pass_hist1d_var,1);
-  ASSERT_EQ( test_double.pass_hist1d_covar,1);
-  ASSERT_EQ( test_double.pass_hist3d_mean,1);
-  ASSERT_EQ( test_double.pass_hist3d_var,1);
-  ASSERT_EQ( test_double.pass_hist3d_covar,1);
-}
+  test_random_scalar<RandomGenerator, double> test_double(
+      density_1d, density_3d, pool, num_draws);
+  ASSERT_EQ(test_double.pass_mean, 1);
+  ASSERT_EQ(test_double.pass_var, 1);
+  ASSERT_EQ(test_double.pass_covar, 1);
+  ASSERT_EQ(test_double.pass_hist1d_mean, 1);
+  ASSERT_EQ(test_double.pass_hist1d_var, 1);
+  ASSERT_EQ(test_double.pass_hist1d_covar, 1);
+  ASSERT_EQ(test_double.pass_hist3d_mean, 1);
+  ASSERT_EQ(test_double.pass_hist3d_var, 1);
+  ASSERT_EQ(test_double.pass_hist3d_covar, 1);
 }
+}  // namespace Impl
 
-} // namespace Test
+}  // namespace Test
 
-#endif //KOKKOS_TEST_UNORDERED_MAP_HPP
+#endif  // KOKKOS_TEST_UNORDERED_MAP_HPP
diff --git a/lib/kokkos/algorithms/unit_tests/TestSerial.cpp b/lib/kokkos/algorithms/unit_tests/TestSerial.cpp
index 9cf998f773..2eacdc2677 100644
--- a/lib/kokkos/algorithms/unit_tests/TestSerial.cpp
+++ b/lib/kokkos/algorithms/unit_tests/TestSerial.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -52,49 +53,36 @@
 #include <TestSort.hpp>
 #include <iomanip>
 
-
 //----------------------------------------------------------------------------
 
-
 namespace Test {
 
-class serial : public ::testing::Test {
-protected:
-  static void SetUpTestCase()
-  {
+#define SERIAL_RANDOM_XORSHIFT64(num_draws)                             \
+  TEST(serial, Random_XorShift64) {                                     \
+    Impl::test_random<Kokkos::Random_XorShift64_Pool<Kokkos::Serial> >( \
+        num_draws);                                                     \
   }
 
-  static void TearDownTestCase ()
-  {
-  }
-};
-
-#define SERIAL_RANDOM_XORSHIFT64( num_draws )  \
-  TEST_F( serial, Random_XorShift64 ) {                                \
-    Impl::test_random<Kokkos::Random_XorShift64_Pool<Kokkos::Serial> >(num_draws); \
+#define SERIAL_RANDOM_XORSHIFT1024(num_draws)                             \
+  TEST(serial, Random_XorShift1024) {                                     \
+    Impl::test_random<Kokkos::Random_XorShift1024_Pool<Kokkos::Serial> >( \
+        num_draws);                                                       \
   }
 
-#define SERIAL_RANDOM_XORSHIFT1024( num_draws )        \
-  TEST_F( serial, Random_XorShift1024 ) {                              \
-    Impl::test_random<Kokkos::Random_XorShift1024_Pool<Kokkos::Serial> >(num_draws); \
+#define SERIAL_SORT_UNSIGNED(size)                   \
+  TEST(serial, SortUnsigned) {                       \
+    Impl::test_sort<Kokkos::Serial, unsigned>(size); \
   }
 
-#define SERIAL_SORT_UNSIGNED( size )                                \
-  TEST_F( serial, SortUnsigned ) {   \
-      Impl::test_sort< Kokkos::Serial, unsigned >(size);                                   \
-  }
-
-SERIAL_RANDOM_XORSHIFT64( 10240000 )
-SERIAL_RANDOM_XORSHIFT1024( 10130144 )
+SERIAL_RANDOM_XORSHIFT64(10240000)
+SERIAL_RANDOM_XORSHIFT1024(10130144)
 SERIAL_SORT_UNSIGNED(171)
 
 #undef SERIAL_RANDOM_XORSHIFT64
 #undef SERIAL_RANDOM_XORSHIFT1024
 #undef SERIAL_SORT_UNSIGNED
 
-} // namespace Test
+}  // namespace Test
 #else
 void KOKKOS_ALGORITHMS_UNITTESTS_TESTSERIAL_PREVENT_LINK_ERROR() {}
-#endif // KOKKOS_ENABLE_SERIAL
-
-
+#endif  // KOKKOS_ENABLE_SERIAL
diff --git a/lib/kokkos/algorithms/unit_tests/TestSort.hpp b/lib/kokkos/algorithms/unit_tests/TestSort.hpp
index 5fd7f09b50..310a93c93d 100644
--- a/lib/kokkos/algorithms/unit_tests/TestSort.hpp
+++ b/lib/kokkos/algorithms/unit_tests/TestSort.hpp
@@ -1,10 +1,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -22,10 +23,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -43,235 +44,248 @@
 #define KOKKOS_ALGORITHMS_UNITTESTS_TESTSORT_HPP
 
 #include <gtest/gtest.h>
-#include<Kokkos_Core.hpp>
-#include<Kokkos_DynamicView.hpp>
-#include<Kokkos_Random.hpp>
-#include<Kokkos_Sort.hpp>
+#include <Kokkos_Core.hpp>
+#include <Kokkos_DynamicView.hpp>
+#include <Kokkos_Random.hpp>
+#include <Kokkos_Sort.hpp>
 
 namespace Test {
 
-namespace Impl{
+namespace Impl {
 
-template<class ExecutionSpace, class Scalar>
+template <class ExecutionSpace, class Scalar>
 struct is_sorted_struct {
   typedef unsigned int value_type;
   typedef ExecutionSpace execution_space;
 
-  Kokkos::View<Scalar*,ExecutionSpace> keys;
+  Kokkos::View<Scalar*, ExecutionSpace> keys;
 
-  is_sorted_struct(Kokkos::View<Scalar*,ExecutionSpace> keys_):keys(keys_) {}
+  is_sorted_struct(Kokkos::View<Scalar*, ExecutionSpace> keys_) : keys(keys_) {}
   KOKKOS_INLINE_FUNCTION
-  void operator() (int i, unsigned int& count) const {
-    if(keys(i)>keys(i+1)) count++;
+  void operator()(int i, unsigned int& count) const {
+    if (keys(i) > keys(i + 1)) count++;
   }
 };
 
-template<class ExecutionSpace, class Scalar>
+template <class ExecutionSpace, class Scalar>
 struct sum {
   typedef double value_type;
   typedef ExecutionSpace execution_space;
 
-  Kokkos::View<Scalar*,ExecutionSpace> keys;
+  Kokkos::View<Scalar*, ExecutionSpace> keys;
 
-  sum(Kokkos::View<Scalar*,ExecutionSpace> keys_):keys(keys_) {}
+  sum(Kokkos::View<Scalar*, ExecutionSpace> keys_) : keys(keys_) {}
   KOKKOS_INLINE_FUNCTION
-  void operator() (int i, double& count) const {
-    count+=keys(i);
-  }
+  void operator()(int i, double& count) const { count += keys(i); }
 };
 
-template<class ExecutionSpace, class Scalar>
+template <class ExecutionSpace, class Scalar>
 struct bin3d_is_sorted_struct {
   typedef unsigned int value_type;
   typedef ExecutionSpace execution_space;
 
-  Kokkos::View<Scalar*[3],ExecutionSpace> keys;
+  Kokkos::View<Scalar * [3], ExecutionSpace> keys;
 
   int max_bins;
   Scalar min;
   Scalar max;
 
-  bin3d_is_sorted_struct(Kokkos::View<Scalar*[3],ExecutionSpace> keys_,int max_bins_,Scalar min_,Scalar max_):
-    keys(keys_),max_bins(max_bins_),min(min_),max(max_) {
-  }
+  bin3d_is_sorted_struct(Kokkos::View<Scalar * [3], ExecutionSpace> keys_,
+                         int max_bins_, Scalar min_, Scalar max_)
+      : keys(keys_), max_bins(max_bins_), min(min_), max(max_) {}
   KOKKOS_INLINE_FUNCTION
-  void operator() (int i, unsigned int& count) const {
-    int ix1 = int ((keys(i,0)-min)/max * max_bins);
-    int iy1 = int ((keys(i,1)-min)/max * max_bins);
-    int iz1 = int ((keys(i,2)-min)/max * max_bins);
-    int ix2 = int ((keys(i+1,0)-min)/max * max_bins);
-    int iy2 = int ((keys(i+1,1)-min)/max * max_bins);
-    int iz2 = int ((keys(i+1,2)-min)/max * max_bins);
+  void operator()(int i, unsigned int& count) const {
+    int ix1 = int((keys(i, 0) - min) / max * max_bins);
+    int iy1 = int((keys(i, 1) - min) / max * max_bins);
+    int iz1 = int((keys(i, 2) - min) / max * max_bins);
+    int ix2 = int((keys(i + 1, 0) - min) / max * max_bins);
+    int iy2 = int((keys(i + 1, 1) - min) / max * max_bins);
+    int iz2 = int((keys(i + 1, 2) - min) / max * max_bins);
 
-    if (ix1>ix2)  count++;
-    else if(ix1==ix2) {
-      if (iy1>iy2)  count++;
-      else if ((iy1==iy2) && (iz1>iz2))  count++;
+    if (ix1 > ix2)
+      count++;
+    else if (ix1 == ix2) {
+      if (iy1 > iy2)
+        count++;
+      else if ((iy1 == iy2) && (iz1 > iz2))
+        count++;
     }
   }
 };
 
-template<class ExecutionSpace, class Scalar>
+template <class ExecutionSpace, class Scalar>
 struct sum3D {
   typedef double value_type;
   typedef ExecutionSpace execution_space;
 
-  Kokkos::View<Scalar*[3],ExecutionSpace> keys;
+  Kokkos::View<Scalar * [3], ExecutionSpace> keys;
 
-  sum3D(Kokkos::View<Scalar*[3],ExecutionSpace> keys_):keys(keys_) {}
+  sum3D(Kokkos::View<Scalar * [3], ExecutionSpace> keys_) : keys(keys_) {}
   KOKKOS_INLINE_FUNCTION
-  void operator() (int i, double& count) const {
-    count+=keys(i,0);
-    count+=keys(i,1);
-    count+=keys(i,2);
+  void operator()(int i, double& count) const {
+    count += keys(i, 0);
+    count += keys(i, 1);
+    count += keys(i, 2);
   }
 };
 
-template<class ExecutionSpace, typename KeyType>
-void test_1D_sort(unsigned int n,bool force_kokkos) {
-  typedef Kokkos::View<KeyType*,ExecutionSpace> KeyViewType;
-  KeyViewType keys("Keys",n);
+template <class ExecutionSpace, typename KeyType>
+void test_1D_sort(unsigned int n, bool force_kokkos) {
+  typedef Kokkos::View<KeyType*, ExecutionSpace> KeyViewType;
+  KeyViewType keys("Keys", n);
 
   // Test sorting array with all numbers equal
-  Kokkos::deep_copy(keys,KeyType(1));
-  Kokkos::sort(keys,force_kokkos);
+  Kokkos::deep_copy(keys, KeyType(1));
+  Kokkos::sort(keys, force_kokkos);
 
   Kokkos::Random_XorShift64_Pool<ExecutionSpace> g(1931);
-  Kokkos::fill_random(keys,g,Kokkos::Random_XorShift64_Pool<ExecutionSpace>::generator_type::MAX_URAND);
+  Kokkos::fill_random(keys, g,
+                      Kokkos::Random_XorShift64_Pool<
+                          ExecutionSpace>::generator_type::MAX_URAND);
 
-  double sum_before = 0.0;
-  double sum_after = 0.0;
+  double sum_before       = 0.0;
+  double sum_after        = 0.0;
   unsigned int sort_fails = 0;
 
-  Kokkos::parallel_reduce(n,sum<ExecutionSpace, KeyType>(keys),sum_before);
+  Kokkos::parallel_reduce(n, sum<ExecutionSpace, KeyType>(keys), sum_before);
 
-  Kokkos::sort(keys,force_kokkos);
+  Kokkos::sort(keys, force_kokkos);
 
-  Kokkos::parallel_reduce(n,sum<ExecutionSpace, KeyType>(keys),sum_after);
-  Kokkos::parallel_reduce(n-1,is_sorted_struct<ExecutionSpace, KeyType>(keys),sort_fails);
+  Kokkos::parallel_reduce(n, sum<ExecutionSpace, KeyType>(keys), sum_after);
+  Kokkos::parallel_reduce(
+      n - 1, is_sorted_struct<ExecutionSpace, KeyType>(keys), sort_fails);
 
-  double ratio = sum_before/sum_after;
+  double ratio   = sum_before / sum_after;
   double epsilon = 1e-10;
-  unsigned int equal_sum = (ratio > (1.0-epsilon)) && (ratio < (1.0+epsilon)) ? 1 : 0;
+  unsigned int equal_sum =
+      (ratio > (1.0 - epsilon)) && (ratio < (1.0 + epsilon)) ? 1 : 0;
 
-  ASSERT_EQ(sort_fails,0);
-  ASSERT_EQ(equal_sum,1);
+  ASSERT_EQ(sort_fails, 0);
+  ASSERT_EQ(equal_sum, 1);
 }
 
-template<class ExecutionSpace, typename KeyType>
+template <class ExecutionSpace, typename KeyType>
 void test_3D_sort(unsigned int n) {
-  typedef Kokkos::View<KeyType*[3],ExecutionSpace > KeyViewType;
+  typedef Kokkos::View<KeyType * [3], ExecutionSpace> KeyViewType;
 
-  KeyViewType keys("Keys",n*n*n);
+  KeyViewType keys("Keys", n * n * n);
 
   Kokkos::Random_XorShift64_Pool<ExecutionSpace> g(1931);
-  Kokkos::fill_random(keys,g,100.0);
+  Kokkos::fill_random(keys, g, 100.0);
 
-  double sum_before = 0.0;
-  double sum_after = 0.0;
+  double sum_before       = 0.0;
+  double sum_after        = 0.0;
   unsigned int sort_fails = 0;
 
-  Kokkos::parallel_reduce(keys.extent(0),sum3D<ExecutionSpace, KeyType>(keys),sum_before);
+  Kokkos::parallel_reduce(keys.extent(0), sum3D<ExecutionSpace, KeyType>(keys),
+                          sum_before);
 
   int bin_1d = 1;
-  while( bin_1d*bin_1d*bin_1d*4< (int) keys.extent(0) ) bin_1d*=2;
-  int bin_max[3] = {bin_1d,bin_1d,bin_1d};
-  typename KeyViewType::value_type min[3] = {0,0,0};
-  typename KeyViewType::value_type max[3] = {100,100,100};
+  while (bin_1d * bin_1d * bin_1d * 4 < (int)keys.extent(0)) bin_1d *= 2;
+  int bin_max[3]                          = {bin_1d, bin_1d, bin_1d};
+  typename KeyViewType::value_type min[3] = {0, 0, 0};
+  typename KeyViewType::value_type max[3] = {100, 100, 100};
 
-  typedef Kokkos::BinOp3D< KeyViewType > BinOp;
-  BinOp bin_op(bin_max,min,max);
-  Kokkos::BinSort< KeyViewType , BinOp >
-    Sorter(keys,bin_op,false);
+  typedef Kokkos::BinOp3D<KeyViewType> BinOp;
+  BinOp bin_op(bin_max, min, max);
+  Kokkos::BinSort<KeyViewType, BinOp> Sorter(keys, bin_op, false);
   Sorter.create_permute_vector();
-  Sorter.template sort< KeyViewType >(keys);
+  Sorter.template sort<KeyViewType>(keys);
 
-  Kokkos::parallel_reduce(keys.extent(0),sum3D<ExecutionSpace, KeyType>(keys),sum_after);
-  Kokkos::parallel_reduce(keys.extent(0)-1,bin3d_is_sorted_struct<ExecutionSpace, KeyType>(keys,bin_1d,min[0],max[0]),sort_fails);
+  Kokkos::parallel_reduce(keys.extent(0), sum3D<ExecutionSpace, KeyType>(keys),
+                          sum_after);
+  Kokkos::parallel_reduce(keys.extent(0) - 1,
+                          bin3d_is_sorted_struct<ExecutionSpace, KeyType>(
+                              keys, bin_1d, min[0], max[0]),
+                          sort_fails);
 
-  double ratio = sum_before/sum_after;
+  double ratio   = sum_before / sum_after;
   double epsilon = 1e-10;
-  unsigned int equal_sum = (ratio > (1.0-epsilon)) && (ratio < (1.0+epsilon)) ? 1 : 0;
+  unsigned int equal_sum =
+      (ratio > (1.0 - epsilon)) && (ratio < (1.0 + epsilon)) ? 1 : 0;
 
-  if ( sort_fails )
-    printf("3D Sort Sum: %f %f Fails: %u\n",sum_before,sum_after,sort_fails);
+  if (sort_fails)
+    printf("3D Sort Sum: %f %f Fails: %u\n", sum_before, sum_after, sort_fails);
 
-  ASSERT_EQ(sort_fails,0);
-  ASSERT_EQ(equal_sum,1);
+  ASSERT_EQ(sort_fails, 0);
+  ASSERT_EQ(equal_sum, 1);
 }
 
 //----------------------------------------------------------------------------
 
-template<class ExecutionSpace, typename KeyType>
-void test_dynamic_view_sort(unsigned int n )
-{
-  typedef Kokkos::Experimental::DynamicView<KeyType*,ExecutionSpace> KeyDynamicViewType;
-  typedef Kokkos::View<KeyType*,ExecutionSpace> KeyViewType;
+template <class ExecutionSpace, typename KeyType>
+void test_dynamic_view_sort(unsigned int n) {
+  typedef Kokkos::Experimental::DynamicView<KeyType*, ExecutionSpace>
+      KeyDynamicViewType;
+  typedef Kokkos::View<KeyType*, ExecutionSpace> KeyViewType;
 
-  const size_t upper_bound = 2 * n ;
+  const size_t upper_bound    = 2 * n;
   const size_t min_chunk_size = 1024;
 
   KeyDynamicViewType keys("Keys", min_chunk_size, upper_bound);
 
   keys.resize_serial(n);
 
-  KeyViewType keys_view("KeysTmp", n );
+  KeyViewType keys_view("KeysTmp", n);
 
   // Test sorting array with all numbers equal
-  Kokkos::deep_copy(keys_view,KeyType(1));
-  Kokkos::deep_copy(keys,keys_view);
-  Kokkos::sort(keys, 0 /* begin */ , n /* end */ );
+  Kokkos::deep_copy(keys_view, KeyType(1));
+  Kokkos::deep_copy(keys, keys_view);
+  Kokkos::sort(keys, 0 /* begin */, n /* end */);
 
   Kokkos::Random_XorShift64_Pool<ExecutionSpace> g(1931);
-  Kokkos::fill_random(keys_view,g,Kokkos::Random_XorShift64_Pool<ExecutionSpace>::generator_type::MAX_URAND);
+  Kokkos::fill_random(keys_view, g,
+                      Kokkos::Random_XorShift64_Pool<
+                          ExecutionSpace>::generator_type::MAX_URAND);
 
   ExecutionSpace().fence();
-  Kokkos::deep_copy(keys,keys_view);
-  //ExecutionSpace().fence();
+  Kokkos::deep_copy(keys, keys_view);
+  // ExecutionSpace().fence();
 
-  double sum_before = 0.0;
-  double sum_after = 0.0;
+  double sum_before       = 0.0;
+  double sum_after        = 0.0;
   unsigned int sort_fails = 0;
 
-  Kokkos::parallel_reduce(n,sum<ExecutionSpace, KeyType>(keys_view),sum_before);
+  Kokkos::parallel_reduce(n, sum<ExecutionSpace, KeyType>(keys_view),
+                          sum_before);
 
-  Kokkos::sort(keys, 0 /* begin */ , n /* end */ );
+  Kokkos::sort(keys, 0 /* begin */, n /* end */);
 
-  ExecutionSpace().fence(); // Need this fence to prevent BusError with Cuda
-  Kokkos::deep_copy( keys_view , keys );
-  //ExecutionSpace().fence();
+  ExecutionSpace().fence();  // Need this fence to prevent BusError with Cuda
+  Kokkos::deep_copy(keys_view, keys);
+  // ExecutionSpace().fence();
 
-  Kokkos::parallel_reduce(n,sum<ExecutionSpace, KeyType>(keys_view),sum_after);
-  Kokkos::parallel_reduce(n-1,is_sorted_struct<ExecutionSpace, KeyType>(keys_view),sort_fails);
+  Kokkos::parallel_reduce(n, sum<ExecutionSpace, KeyType>(keys_view),
+                          sum_after);
+  Kokkos::parallel_reduce(
+      n - 1, is_sorted_struct<ExecutionSpace, KeyType>(keys_view), sort_fails);
 
-  double ratio = sum_before/sum_after;
+  double ratio   = sum_before / sum_after;
   double epsilon = 1e-10;
-  unsigned int equal_sum = (ratio > (1.0-epsilon)) && (ratio < (1.0+epsilon)) ? 1 : 0;
+  unsigned int equal_sum =
+      (ratio > (1.0 - epsilon)) && (ratio < (1.0 + epsilon)) ? 1 : 0;
 
-  if ( sort_fails != 0 || equal_sum != 1 ) {
-    std::cout << " N = " << n
-              << " ; sum_before = " << sum_before
-              << " ; sum_after = " << sum_after
-              << " ; ratio = " << ratio
-              << std::endl ;
+  if (sort_fails != 0 || equal_sum != 1) {
+    std::cout << " N = " << n << " ; sum_before = " << sum_before
+              << " ; sum_after = " << sum_after << " ; ratio = " << ratio
+              << std::endl;
   }
 
-  ASSERT_EQ(sort_fails,0);
-  ASSERT_EQ(equal_sum,1);
+  ASSERT_EQ(sort_fails, 0);
+  ASSERT_EQ(equal_sum, 1);
 }
 
 //----------------------------------------------------------------------------
 
-template<class ExecutionSpace>
-void test_issue_1160()
-{
+template <class ExecutionSpace>
+void test_issue_1160() {
   Kokkos::View<int*, ExecutionSpace> element_("element", 10);
   Kokkos::View<double*, ExecutionSpace> x_("x", 10);
   Kokkos::View<double*, ExecutionSpace> v_("y", 10);
 
   auto h_element = Kokkos::create_mirror_view(element_);
-  auto h_x = Kokkos::create_mirror_view(x_);
-  auto h_v = Kokkos::create_mirror_view(v_);
+  auto h_x       = Kokkos::create_mirror_view(x_);
+  auto h_v       = Kokkos::create_mirror_view(v_);
 
   h_element(0) = 9;
   h_element(1) = 8;
@@ -292,20 +306,21 @@ void test_issue_1160()
   Kokkos::deep_copy(v_, h_v);
 
   typedef decltype(element_) KeyViewType;
-  typedef Kokkos::BinOp1D< KeyViewType > BinOp;
+  typedef Kokkos::BinOp1D<KeyViewType> BinOp;
 
   int begin = 3;
-  int end = 8;
-  auto max = h_element(begin);
-  auto min = h_element(end - 1);
+  int end   = 8;
+  auto max  = h_element(begin);
+  auto min  = h_element(end - 1);
   BinOp binner(end - begin, min, max);
 
-  Kokkos::BinSort<KeyViewType , BinOp > Sorter(element_,begin,end,binner,false);
+  Kokkos::BinSort<KeyViewType, BinOp> Sorter(element_, begin, end, binner,
+                                             false);
   Sorter.create_permute_vector();
-  Sorter.sort(element_,begin,end);
+  Sorter.sort(element_, begin, end);
 
-  Sorter.sort(x_,begin,end);
-  Sorter.sort(v_,begin,end);
+  Sorter.sort(x_, begin, end);
+  Sorter.sort(v_, begin, end);
 
   Kokkos::deep_copy(h_element, element_);
   Kokkos::deep_copy(h_x, x_);
@@ -330,18 +345,17 @@ void test_issue_1160()
 
 //----------------------------------------------------------------------------
 
-template<class ExecutionSpace, typename KeyType>
-void test_sort(unsigned int N)
-{
-  test_1D_sort<ExecutionSpace,KeyType>(N*N*N, true);
-  test_1D_sort<ExecutionSpace,KeyType>(N*N*N, false);
+template <class ExecutionSpace, typename KeyType>
+void test_sort(unsigned int N) {
+  test_1D_sort<ExecutionSpace, KeyType>(N * N * N, true);
+  test_1D_sort<ExecutionSpace, KeyType>(N * N * N, false);
 #if !defined(KOKKOS_ENABLE_ROCM)
-  test_3D_sort<ExecutionSpace,KeyType>(N);
-  test_dynamic_view_sort<ExecutionSpace,KeyType>(N*N);
+  test_3D_sort<ExecutionSpace, KeyType>(N);
+  test_dynamic_view_sort<ExecutionSpace, KeyType>(N * N);
 #endif
   test_issue_1160<ExecutionSpace>();
 }
 
-}
-}
+}  // namespace Impl
+}  // namespace Test
 #endif /* KOKKOS_ALGORITHMS_UNITTESTS_TESTSORT_HPP */
diff --git a/lib/kokkos/algorithms/unit_tests/TestThreads.cpp b/lib/kokkos/algorithms/unit_tests/TestThreads.cpp
index 99cdb7da92..c75e6e8dfb 100644
--- a/lib/kokkos/algorithms/unit_tests/TestThreads.cpp
+++ b/lib/kokkos/algorithms/unit_tests/TestThreads.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -52,51 +53,36 @@
 #include <TestSort.hpp>
 #include <iomanip>
 
-
 //----------------------------------------------------------------------------
 
-
 namespace Test {
 
-class threads : public ::testing::Test {
-protected:
-  static void SetUpTestCase()
-  {
-    std::cout << std::setprecision(5) << std::scientific;
+#define THREADS_RANDOM_XORSHIFT64(num_draws)                             \
+  TEST(threads, Random_XorShift64) {                                     \
+    Impl::test_random<Kokkos::Random_XorShift64_Pool<Kokkos::Threads> >( \
+        num_draws);                                                      \
   }
 
-  static void TearDownTestCase()
-  {
-  }
-};
-
-#define THREADS_RANDOM_XORSHIFT64( num_draws )                                \
-  TEST_F( threads, Random_XorShift64 ) {   \
-      Impl::test_random<Kokkos::Random_XorShift64_Pool<Kokkos::Threads> >(num_draws);                                   \
+#define THREADS_RANDOM_XORSHIFT1024(num_draws)                             \
+  TEST(threads, Random_XorShift1024) {                                     \
+    Impl::test_random<Kokkos::Random_XorShift1024_Pool<Kokkos::Threads> >( \
+        num_draws);                                                        \
   }
 
-#define THREADS_RANDOM_XORSHIFT1024( num_draws )                                \
-  TEST_F( threads, Random_XorShift1024 ) {   \
-      Impl::test_random<Kokkos::Random_XorShift1024_Pool<Kokkos::Threads> >(num_draws);                                   \
+#define THREADS_SORT_UNSIGNED(size)                 \
+  TEST(threads, SortUnsigned) {                     \
+    Impl::test_sort<Kokkos::Threads, double>(size); \
   }
 
-#define THREADS_SORT_UNSIGNED( size )                                \
-  TEST_F( threads, SortUnsigned ) {   \
-      Impl::test_sort< Kokkos::Threads, double >(size);                                   \
-  }
-
-
-THREADS_RANDOM_XORSHIFT64( 10240000 )
-THREADS_RANDOM_XORSHIFT1024( 10130144 )
+THREADS_RANDOM_XORSHIFT64(10240000)
+THREADS_RANDOM_XORSHIFT1024(10130144)
 THREADS_SORT_UNSIGNED(171)
 
 #undef THREADS_RANDOM_XORSHIFT64
 #undef THREADS_RANDOM_XORSHIFT1024
 #undef THREADS_SORT_UNSIGNED
 
-} // namespace Test
+}  // namespace Test
 #else
 void KOKKOS_ALGORITHMS_UNITTESTS_TESTTHREADS_PREVENT_LINK_ERROR() {}
 #endif
-
-
diff --git a/lib/kokkos/algorithms/unit_tests/UnitTestMain.cpp b/lib/kokkos/algorithms/unit_tests/UnitTestMain.cpp
index 8feb08332f..e245aad35f 100644
--- a/lib/kokkos/algorithms/unit_tests/UnitTestMain.cpp
+++ b/lib/kokkos/algorithms/unit_tests/UnitTestMain.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -45,10 +46,9 @@
 #include <Kokkos_Core.hpp>
 
 int main(int argc, char *argv[]) {
-  Kokkos::initialize(argc,argv);
-  ::testing::InitGoogleTest(&argc,argv);
+  Kokkos::initialize(argc, argv);
+  ::testing::InitGoogleTest(&argc, argv);
   int result = RUN_ALL_TESTS();
   Kokkos::finalize();
   return result;
 }
-
diff --git a/lib/kokkos/benchmarks/atomic/main.cpp b/lib/kokkos/benchmarks/atomic/main.cpp
index d86d196249..5f0977f754 100644
--- a/lib/kokkos/benchmarks/atomic/main.cpp
+++ b/lib/kokkos/benchmarks/atomic/main.cpp
@@ -1,124 +1,120 @@
-#include<Kokkos_Core.hpp>
-#include<impl/Kokkos_Timer.hpp>
-#include<Kokkos_Random.hpp>
+#include <Kokkos_Core.hpp>
+#include <impl/Kokkos_Timer.hpp>
+#include <Kokkos_Random.hpp>
 
-template<class Scalar>
-double test_atomic(int L, int N, int M,int K,int R,Kokkos::View<const int*> offsets) {
-  Kokkos::View<Scalar*> output("Output",N);
+template <class Scalar>
+double test_atomic(int L, int N, int M, int K, int R,
+                   Kokkos::View<const int*> offsets) {
+  Kokkos::View<Scalar*> output("Output", N);
   Kokkos::Impl::Timer timer;
 
-  for(int r = 0; r<R; r++)
-  Kokkos::parallel_for(L, KOKKOS_LAMBDA (const int&i) {
-    Scalar s = 2;
-    for(int m=0;m<M;m++) {
-      for(int k=0;k<K;k++)
-        s=s*s+s;
-      const int idx = (i+offsets(i,m))%N;
-      Kokkos::atomic_add(&output(idx),s);
-    }
-  }); 
+  for (int r = 0; r < R; r++)
+    Kokkos::parallel_for(
+        L, KOKKOS_LAMBDA(const int& i) {
+          Scalar s = 2;
+          for (int m = 0; m < M; m++) {
+            for (int k = 0; k < K; k++) s = s * s + s;
+            const int idx = (i + offsets(i, m)) % N;
+            Kokkos::atomic_add(&output(idx), s);
+          }
+        });
   Kokkos::fence();
   double time = timer.seconds();
- 
+
   return time;
 }
 
-template<class Scalar>
-double test_no_atomic(int L, int N, int M,int K,int R,Kokkos::View<const int*> offsets) {
-  Kokkos::View<Scalar*> output("Output",N);
+template <class Scalar>
+double test_no_atomic(int L, int N, int M, int K, int R,
+                      Kokkos::View<const int*> offsets) {
+  Kokkos::View<Scalar*> output("Output", N);
   Kokkos::Impl::Timer timer;
-  for(int r = 0; r<R; r++)
-  Kokkos::parallel_for(L, KOKKOS_LAMBDA (const int&i) {
-    Scalar s = 2;
-    for(int m=0;m<M;m++) {
-      for(int k=0;k<K;k++)
-        s=s*s+s;
-      const int idx = (i+offsets(i,m))%N;
-      output(idx) += s;
-    }
-  });
+  for (int r = 0; r < R; r++)
+    Kokkos::parallel_for(
+        L, KOKKOS_LAMBDA(const int& i) {
+          Scalar s = 2;
+          for (int m = 0; m < M; m++) {
+            for (int k = 0; k < K; k++) s = s * s + s;
+            const int idx = (i + offsets(i, m)) % N;
+            output(idx) += s;
+          }
+        });
   Kokkos::fence();
-  double time =  timer.seconds();
+  double time = timer.seconds();
   return time;
 }
 
 int main(int argc, char* argv[]) {
-  Kokkos::initialize(argc,argv);
-{
-  if(argc<8) {
-    printf("Arguments: L N M D K R T\n");
-    printf("  L:   Number of iterations to run\n");
-    printf("  N:   Length of array to do atomics into\n");
-    printf("  M:   Number of atomics per iteration to do\n");
-    printf("  D:   Distance from index i to do atomics into (randomly)\n");
-    printf("  K:   Number of FMAD per atomic\n");
-    printf("  R:   Number of repeats of the experiments\n");
-    printf("  T:   Type of atomic\n");
-    printf("       1 - int\n");
-    printf("       2 - long\n");
-    printf("       3 - float\n");
-    printf("       4 - double\n");
-    printf("       5 - complex<double>\n");
-    printf("Example Input GPU:\n");
-    printf("  Histogram : 1000000 1000 1 1000 1 10 1\n");
-    printf("  MD Force : 100000 100000 100 1000 20 10 4\n");
-    printf("  Matrix Assembly : 100000 1000000 50 1000 20 10 4\n");
-    Kokkos::finalize();
-    return 0;
+  Kokkos::initialize(argc, argv);
+  {
+    if (argc < 8) {
+      printf("Arguments: L N M D K R T\n");
+      printf("  L:   Number of iterations to run\n");
+      printf("  N:   Length of array to do atomics into\n");
+      printf("  M:   Number of atomics per iteration to do\n");
+      printf("  D:   Distance from index i to do atomics into (randomly)\n");
+      printf("  K:   Number of FMAD per atomic\n");
+      printf("  R:   Number of repeats of the experiments\n");
+      printf("  T:   Type of atomic\n");
+      printf("       1 - int\n");
+      printf("       2 - long\n");
+      printf("       3 - float\n");
+      printf("       4 - double\n");
+      printf("       5 - complex<double>\n");
+      printf("Example Input GPU:\n");
+      printf("  Histogram : 1000000 1000 1 1000 1 10 1\n");
+      printf("  MD Force : 100000 100000 100 1000 20 10 4\n");
+      printf("  Matrix Assembly : 100000 1000000 50 1000 20 10 4\n");
+      Kokkos::finalize();
+      return 0;
+    }
+
+    int L    = atoi(argv[1]);
+    int N    = atoi(argv[2]);
+    int M    = atoi(argv[3]);
+    int D    = atoi(argv[4]);
+    int K    = atoi(argv[5]);
+    int R    = atoi(argv[6]);
+    int type = atoi(argv[7]);
+
+    Kokkos::View<int*> offsets("Offsets", L, M);
+    Kokkos::Random_XorShift64_Pool<> pool(12371);
+    Kokkos::fill_random(offsets, pool, D);
+    double time = 0;
+    if (type == 1) time = test_atomic<int>(L, N, M, K, R, offsets);
+    if (type == 2) time = test_atomic<long>(L, N, M, K, R, offsets);
+    if (type == 3) time = test_atomic<float>(L, N, M, K, R, offsets);
+    if (type == 4) time = test_atomic<double>(L, N, M, K, R, offsets);
+    if (type == 5)
+      time = test_atomic<Kokkos::complex<double> >(L, N, M, K, R, offsets);
+
+    double time2 = 1;
+    if (type == 1) time2 = test_no_atomic<int>(L, N, M, K, R, offsets);
+    if (type == 2) time2 = test_no_atomic<long>(L, N, M, K, R, offsets);
+    if (type == 3) time2 = test_no_atomic<float>(L, N, M, K, R, offsets);
+    if (type == 4) time2 = test_no_atomic<double>(L, N, M, K, R, offsets);
+    if (type == 5)
+      time2 = test_no_atomic<Kokkos::complex<double> >(L, N, M, K, R, offsets);
+
+    int size = 0;
+    if (type == 1) size = sizeof(int);
+    if (type == 2) size = sizeof(long);
+    if (type == 3) size = sizeof(float);
+    if (type == 4) size = sizeof(double);
+    if (type == 5) size = sizeof(Kokkos::complex<double>);
+
+    printf("%i\n", size);
+    printf(
+        "Time: %s %i %i %i %i %i %i (t_atomic: %e t_nonatomic: %e ratio: %lf "
+        ")( GUpdates/s: %lf GB/s: %lf )\n",
+        (type == 1)
+            ? "int"
+            : ((type == 2)
+                   ? "long"
+                   : ((type == 3) ? "float"
+                                  : ((type == 4) ? "double" : "complex"))),
+        L, N, M, D, K, R, time, time2, time / time2, 1.e-9 * L * R * M / time,
+        1.0 * L * R * M * 2 * size / time / 1024 / 1024 / 1024);
   }
-
-
-  int L = atoi(argv[1]);
-  int N = atoi(argv[2]);
-  int M = atoi(argv[3]);
-  int D = atoi(argv[4]); 
-  int K = atoi(argv[5]);
-  int R = atoi(argv[6]); 
-  int type = atoi(argv[7]);
- 
-  Kokkos::View<int*> offsets("Offsets",L,M);
-  Kokkos::Random_XorShift64_Pool<> pool(12371);
-  Kokkos::fill_random(offsets,pool,D);
-  double time = 0;
-  if(type==1)
-    time  = test_atomic<int>(L,N,M,K,R,offsets);
-  if(type==2)
-    time = test_atomic<long>(L,N,M,K,R,offsets);
-  if(type==3)
-    time = test_atomic<float>(L,N,M,K,R,offsets);
-  if(type==4)
-    time = test_atomic<double>(L,N,M,K,R,offsets);
-  if(type==5)
-    time = test_atomic<Kokkos::complex<double> >(L,N,M,K,R,offsets);
-
-  double time2 = 1;
-  if(type==1)
-    time2 = test_no_atomic<int>(L,N,M,K,R,offsets);
-  if(type==2)
-    time2 = test_no_atomic<long>(L,N,M,K,R,offsets);
-  if(type==3)
-    time2 = test_no_atomic<float>(L,N,M,K,R,offsets);
-  if(type==4)
-    time2 = test_no_atomic<double>(L,N,M,K,R,offsets);
-  if(type==5)
-    time2 = test_no_atomic<Kokkos::complex<double> >(L,N,M,K,R,offsets);
-
-  int size = 0;
-  if(type==1) size = sizeof(int);
-  if(type==2) size = sizeof(long);
-  if(type==3) size = sizeof(float);
-  if(type==4) size = sizeof(double);
-  if(type==5) size = sizeof(Kokkos::complex<double>);
-
-  printf("%i\n",size);
-  printf("Time: %s %i %i %i %i %i %i (t_atomic: %e t_nonatomic: %e ratio: %lf )( GUpdates/s: %lf GB/s: %lf )\n",
-    (type==1)?"int": (
-    (type==2)?"long": (
-    (type==3)?"float": (
-    (type==4)?"double":"complex"))),
-    L,N,M,D,K,R,time,time2,time/time2,
-    1.e-9*L*R*M/time, 1.0*L*R*M*2*size/time/1024/1024/1024);
-}
   Kokkos::finalize();
 }
-
diff --git a/lib/kokkos/benchmarks/bytes_and_flops/bench.hpp b/lib/kokkos/benchmarks/bytes_and_flops/bench.hpp
index 59b4d50c44..62d7ef4a4c 100644
--- a/lib/kokkos/benchmarks/bytes_and_flops/bench.hpp
+++ b/lib/kokkos/benchmarks/bytes_and_flops/bench.hpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -41,59 +42,52 @@
 //@HEADER
 */
 
-#include<Kokkos_Core.hpp>
-#include<impl/Kokkos_Timer.hpp>
+#include <Kokkos_Core.hpp>
+#include <impl/Kokkos_Timer.hpp>
 
-template<class Scalar, int Unroll,int Stride>
+template <class Scalar, int Unroll, int Stride>
 struct Run {
-static void run(int N, int K, int R, int F, int T, int S);
+  static void run(int N, int K, int R, int F, int T, int S);
 };
 
-template<class Scalar, int Stride>
+template <class Scalar, int Stride>
 struct RunStride {
-static void run_1(int N, int K, int R, int F, int T, int S);
-static void run_2(int N, int K, int R, int F, int T, int S);
-static void run_3(int N, int K, int R, int F, int T, int S);
-static void run_4(int N, int K, int R, int F, int T, int S);
-static void run_5(int N, int K, int R, int F, int T, int S);
-static void run_6(int N, int K, int R, int F, int T, int S);
-static void run_7(int N, int K, int R, int F, int T, int S);
-static void run_8(int N, int K, int R, int F, int T, int S);
-static void run(int N, int K, int R, int U, int F, int T, int S);
+  static void run_1(int N, int K, int R, int F, int T, int S);
+  static void run_2(int N, int K, int R, int F, int T, int S);
+  static void run_3(int N, int K, int R, int F, int T, int S);
+  static void run_4(int N, int K, int R, int F, int T, int S);
+  static void run_5(int N, int K, int R, int F, int T, int S);
+  static void run_6(int N, int K, int R, int F, int T, int S);
+  static void run_7(int N, int K, int R, int F, int T, int S);
+  static void run_8(int N, int K, int R, int F, int T, int S);
+  static void run(int N, int K, int R, int U, int F, int T, int S);
 };
 
 #define STRIDE 1
-#include<bench_stride.hpp>
+#include <bench_stride.hpp>
 #undef STRIDE
 #define STRIDE 2
-#include<bench_stride.hpp>
+#include <bench_stride.hpp>
 #undef STRIDE
 #define STRIDE 4
-#include<bench_stride.hpp>
+#include <bench_stride.hpp>
 #undef STRIDE
 #define STRIDE 8
-#include<bench_stride.hpp>
+#include <bench_stride.hpp>
 #undef STRIDE
 #define STRIDE 16
-#include<bench_stride.hpp>
+#include <bench_stride.hpp>
 #undef STRIDE
 #define STRIDE 32
-#include<bench_stride.hpp>
+#include <bench_stride.hpp>
 #undef STRIDE
 
-template<class Scalar>
+template <class Scalar>
 void run_stride_unroll(int N, int K, int R, int D, int U, int F, int T, int S) {
- if(D == 1)
-   RunStride<Scalar,1>::run(N,K,R,U,F,T,S);
- if(D == 2)
-   RunStride<Scalar,2>::run(N,K,R,U,F,T,S);
- if(D == 4)
-   RunStride<Scalar,4>::run(N,K,R,U,F,T,S);
- if(D == 8)
-   RunStride<Scalar,8>::run(N,K,R,U,F,T,S);
- if(D == 16)
-   RunStride<Scalar,16>::run(N,K,R,U,F,T,S);
- if(D == 32)
-   RunStride<Scalar,32>::run(N,K,R,U,F,T,S);
+  if (D == 1) RunStride<Scalar, 1>::run(N, K, R, U, F, T, S);
+  if (D == 2) RunStride<Scalar, 2>::run(N, K, R, U, F, T, S);
+  if (D == 4) RunStride<Scalar, 4>::run(N, K, R, U, F, T, S);
+  if (D == 8) RunStride<Scalar, 8>::run(N, K, R, U, F, T, S);
+  if (D == 16) RunStride<Scalar, 16>::run(N, K, R, U, F, T, S);
+  if (D == 32) RunStride<Scalar, 32>::run(N, K, R, U, F, T, S);
 }
-
diff --git a/lib/kokkos/benchmarks/bytes_and_flops/bench_stride.hpp b/lib/kokkos/benchmarks/bytes_and_flops/bench_stride.hpp
index 6509c654e7..64817fe9dc 100644
--- a/lib/kokkos/benchmarks/bytes_and_flops/bench_stride.hpp
+++ b/lib/kokkos/benchmarks/bytes_and_flops/bench_stride.hpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -41,84 +42,82 @@
 //@HEADER
 */
 
-
 #define UNROLL 1
-#include<bench_unroll_stride.hpp>
+#include <bench_unroll_stride.hpp>
 #undef UNROLL
 #define UNROLL 2
-#include<bench_unroll_stride.hpp>
+#include <bench_unroll_stride.hpp>
 #undef UNROLL
 #define UNROLL 3
-#include<bench_unroll_stride.hpp>
+#include <bench_unroll_stride.hpp>
 #undef UNROLL
 #define UNROLL 4
-#include<bench_unroll_stride.hpp>
+#include <bench_unroll_stride.hpp>
 #undef UNROLL
 #define UNROLL 5
-#include<bench_unroll_stride.hpp>
+#include <bench_unroll_stride.hpp>
 #undef UNROLL
 #define UNROLL 6
-#include<bench_unroll_stride.hpp>
+#include <bench_unroll_stride.hpp>
 #undef UNROLL
 #define UNROLL 7
-#include<bench_unroll_stride.hpp>
+#include <bench_unroll_stride.hpp>
 #undef UNROLL
 #define UNROLL 8
-#include<bench_unroll_stride.hpp>
+#include <bench_unroll_stride.hpp>
 #undef UNROLL
 
-template<class Scalar>
-struct RunStride<Scalar,STRIDE> {
-static void run_1(int N, int K, int R, int F, int T, int S) {
-  Run<Scalar,1,STRIDE>::run(N,K,R,F,T,S);
-}
-static void run_2(int N, int K, int R, int F, int T, int S) {
-  Run<Scalar,2,STRIDE>::run(N,K,R,F,T,S);
-}
-static void run_3(int N, int K, int R, int F, int T, int S) {
-  Run<Scalar,3,STRIDE>::run(N,K,R,F,T,S);
-}
-static void run_4(int N, int K, int R, int F, int T, int S) {
-  Run<Scalar,4,STRIDE>::run(N,K,R,F,T,S);
-}
-static void run_5(int N, int K, int R, int F, int T, int S) {
-  Run<Scalar,5,STRIDE>::run(N,K,R,F,T,S);
-}
-static void run_6(int N, int K, int R, int F, int T, int S) {
-  Run<Scalar,6,STRIDE>::run(N,K,R,F,T,S);
-}
-static void run_7(int N, int K, int R, int F, int T, int S) {
-  Run<Scalar,7,STRIDE>::run(N,K,R,F,T,S);
-}
-static void run_8(int N, int K, int R, int F, int T, int S) {
-  Run<Scalar,8,STRIDE>::run(N,K,R,F,T,S);
-}
+template <class Scalar>
+struct RunStride<Scalar, STRIDE> {
+  static void run_1(int N, int K, int R, int F, int T, int S) {
+    Run<Scalar, 1, STRIDE>::run(N, K, R, F, T, S);
+  }
+  static void run_2(int N, int K, int R, int F, int T, int S) {
+    Run<Scalar, 2, STRIDE>::run(N, K, R, F, T, S);
+  }
+  static void run_3(int N, int K, int R, int F, int T, int S) {
+    Run<Scalar, 3, STRIDE>::run(N, K, R, F, T, S);
+  }
+  static void run_4(int N, int K, int R, int F, int T, int S) {
+    Run<Scalar, 4, STRIDE>::run(N, K, R, F, T, S);
+  }
+  static void run_5(int N, int K, int R, int F, int T, int S) {
+    Run<Scalar, 5, STRIDE>::run(N, K, R, F, T, S);
+  }
+  static void run_6(int N, int K, int R, int F, int T, int S) {
+    Run<Scalar, 6, STRIDE>::run(N, K, R, F, T, S);
+  }
+  static void run_7(int N, int K, int R, int F, int T, int S) {
+    Run<Scalar, 7, STRIDE>::run(N, K, R, F, T, S);
+  }
+  static void run_8(int N, int K, int R, int F, int T, int S) {
+    Run<Scalar, 8, STRIDE>::run(N, K, R, F, T, S);
+  }
 
-static void run(int N, int K, int R, int U, int F, int T, int S) {
-  if(U==1) {
-    run_1(N,K,R,F,T,S);
+  static void run(int N, int K, int R, int U, int F, int T, int S) {
+    if (U == 1) {
+      run_1(N, K, R, F, T, S);
+    }
+    if (U == 2) {
+      run_2(N, K, R, F, T, S);
+    }
+    if (U == 3) {
+      run_3(N, K, R, F, T, S);
+    }
+    if (U == 4) {
+      run_4(N, K, R, F, T, S);
+    }
+    if (U == 5) {
+      run_5(N, K, R, F, T, S);
+    }
+    if (U == 6) {
+      run_6(N, K, R, F, T, S);
+    }
+    if (U == 7) {
+      run_7(N, K, R, F, T, S);
+    }
+    if (U == 8) {
+      run_8(N, K, R, F, T, S);
+    }
   }
-  if(U==2) {
-    run_2(N,K,R,F,T,S);
-  }
-  if(U==3) {
-    run_3(N,K,R,F,T,S);
-  }
-  if(U==4) {
-    run_4(N,K,R,F,T,S);
-  }
-  if(U==5) {
-    run_5(N,K,R,F,T,S);
-  }
-  if(U==6) {
-    run_6(N,K,R,F,T,S);
-  }
-  if(U==7) {
-    run_7(N,K,R,F,T,S);
-  }
-  if(U==8) {
-    run_8(N,K,R,F,T,S);
-  } 
-}
 };
-
diff --git a/lib/kokkos/benchmarks/bytes_and_flops/bench_unroll_stride.hpp b/lib/kokkos/benchmarks/bytes_and_flops/bench_unroll_stride.hpp
index c6651da1e7..00ce635a48 100644
--- a/lib/kokkos/benchmarks/bytes_and_flops/bench_unroll_stride.hpp
+++ b/lib/kokkos/benchmarks/bytes_and_flops/bench_unroll_stride.hpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -41,108 +42,110 @@
 //@HEADER
 */
 
-template<class Scalar>
-struct Run<Scalar,UNROLL,STRIDE> {
-static void run(int N, int K, int R, int F, int T, int S) {
-  Kokkos::View<Scalar**[STRIDE],Kokkos::LayoutRight> A("A",N,K);
-  Kokkos::View<Scalar**[STRIDE],Kokkos::LayoutRight> B("B",N,K);
-  Kokkos::View<Scalar**[STRIDE],Kokkos::LayoutRight> C("C",N,K);
+template <class Scalar>
+struct Run<Scalar, UNROLL, STRIDE> {
+  static void run(int N, int K, int R, int F, int T, int S) {
+    Kokkos::View<Scalar* * [STRIDE], Kokkos::LayoutRight> A("A", N, K);
+    Kokkos::View<Scalar* * [STRIDE], Kokkos::LayoutRight> B("B", N, K);
+    Kokkos::View<Scalar* * [STRIDE], Kokkos::LayoutRight> C("C", N, K);
 
-  Kokkos::deep_copy(A,Scalar(1.5));
-  Kokkos::deep_copy(B,Scalar(2.5));
-  Kokkos::deep_copy(C,Scalar(3.5));
+    Kokkos::deep_copy(A, Scalar(1.5));
+    Kokkos::deep_copy(B, Scalar(2.5));
+    Kokkos::deep_copy(C, Scalar(3.5));
 
-  Kokkos::Timer timer;
-  Kokkos::parallel_for("BenchmarkKernel",Kokkos::TeamPolicy<>(N,T).set_scratch_size(0,Kokkos::PerTeam(S)),
-    KOKKOS_LAMBDA ( const Kokkos::TeamPolicy<>::member_type& team) {
-    const int n = team.league_rank();
-    for(int r=0; r<R; r++) {
-      Kokkos::parallel_for(Kokkos::TeamThreadRange(team,0,K), [&] (const int& i) {
-        Scalar a1 = A(n,i,0); 
-        const Scalar b = B(n,i,0);
-#if(UNROLL>1)
-        Scalar a2 = a1*1.3;
+    Kokkos::Timer timer;
+    Kokkos::parallel_for(
+        "BenchmarkKernel",
+        Kokkos::TeamPolicy<>(N, T).set_scratch_size(0, Kokkos::PerTeam(S)),
+        KOKKOS_LAMBDA(const Kokkos::TeamPolicy<>::member_type& team) {
+          const int n = team.league_rank();
+          for (int r = 0; r < R; r++) {
+            Kokkos::parallel_for(
+                Kokkos::TeamThreadRange(team, 0, K), [&](const int& i) {
+                  Scalar a1      = A(n, i, 0);
+                  const Scalar b = B(n, i, 0);
+#if (UNROLL > 1)
+                  Scalar a2 = a1 * 1.3;
 #endif
-#if(UNROLL>2)
-        Scalar a3 = a2*1.1;
+#if (UNROLL > 2)
+                  Scalar a3 = a2 * 1.1;
 #endif
-#if(UNROLL>3)
-        Scalar a4 = a3*1.1;
+#if (UNROLL > 3)
+                  Scalar a4 = a3 * 1.1;
 #endif
-#if(UNROLL>4)
-        Scalar a5 = a4*1.3;
+#if (UNROLL > 4)
+                  Scalar a5 = a4 * 1.3;
 #endif
-#if(UNROLL>5)
-        Scalar a6 = a5*1.1;
+#if (UNROLL > 5)
+                  Scalar a6 = a5 * 1.1;
 #endif
-#if(UNROLL>6)
-        Scalar a7 = a6*1.1;
+#if (UNROLL > 6)
+                  Scalar a7 = a6 * 1.1;
 #endif
-#if(UNROLL>7)
-        Scalar a8 = a7*1.1;
+#if (UNROLL > 7)
+                  Scalar a8 = a7 * 1.1;
 #endif
 
+                  for (int f = 0; f < F; f++) {
+                    a1 += b * a1;
+#if (UNROLL > 1)
+                    a2 += b * a2;
+#endif
+#if (UNROLL > 2)
+                    a3 += b * a3;
+#endif
+#if (UNROLL > 3)
+                    a4 += b * a4;
+#endif
+#if (UNROLL > 4)
+                    a5 += b * a5;
+#endif
+#if (UNROLL > 5)
+                    a6 += b * a6;
+#endif
+#if (UNROLL > 6)
+                    a7 += b * a7;
+#endif
+#if (UNROLL > 7)
+                    a8 += b * a8;
+#endif
+                  }
+#if (UNROLL == 1)
+                  C(n, i, 0) = a1;
+#endif
+#if (UNROLL == 2)
+                  C(n, i, 0) = a1 + a2;
+#endif
+#if (UNROLL == 3)
+                  C(n, i, 0) = a1 + a2 + a3;
+#endif
+#if (UNROLL == 4)
+                  C(n, i, 0) = a1 + a2 + a3 + a4;
+#endif
+#if (UNROLL == 5)
+                  C(n, i, 0) = a1 + a2 + a3 + a4 + a5;
+#endif
+#if (UNROLL == 6)
+                  C(n, i, 0) = a1 + a2 + a3 + a4 + a5 + a6;
+#endif
+#if (UNROLL == 7)
+                  C(n, i, 0) = a1 + a2 + a3 + a4 + a5 + a6 + a7;
+#endif
+#if (UNROLL == 8)
+                  C(n, i, 0) = a1 + a2 + a3 + a4 + a5 + a6 + a7 + a8;
+#endif
+                });
+          }
+        });
+    Kokkos::fence();
+    double seconds = timer.seconds();
 
-        for(int f = 0; f<F; f++) {
-          a1 += b*a1;
-#if(UNROLL>1)
-          a2 += b*a2;
-#endif
-#if(UNROLL>2)
-          a3 += b*a3;
-#endif
-#if(UNROLL>3)
-          a4 += b*a4;
-#endif
-#if(UNROLL>4)
-          a5 += b*a5;
-#endif
-#if(UNROLL>5)
-          a6 += b*a6;
-#endif
-#if(UNROLL>6)
-          a7 += b*a7;
-#endif
-#if(UNROLL>7)
-          a8 += b*a8;
-#endif
-
-
-        }
-#if(UNROLL==1)
-        C(n,i,0) = a1; 
-#endif
-#if(UNROLL==2)
-        C(n,i,0) = a1+a2; 
-#endif
-#if(UNROLL==3)
-        C(n,i,0) = a1+a2+a3; 
-#endif
-#if(UNROLL==4)
-        C(n,i,0) = a1+a2+a3+a4; 
-#endif
-#if(UNROLL==5)
-        C(n,i,0) = a1+a2+a3+a4+a5;
-#endif
-#if(UNROLL==6)
-        C(n,i,0) = a1+a2+a3+a4+a5+a6;
-#endif
-#if(UNROLL==7)
-        C(n,i,0) = a1+a2+a3+a4+a5+a6+a7;
-#endif
-#if(UNROLL==8)
-        C(n,i,0) = a1+a2+a3+a4+a5+a6+a7+a8;
-#endif
-
-      });
-    }
-  });
-  Kokkos::fence(); 
-  double seconds = timer.seconds();
-
-  double bytes = 1.0*N*K*R*3*sizeof(Scalar);
-  double flops = 1.0*N*K*R*(F*2*UNROLL + 2*(UNROLL-1));
-  printf("NKRUFTS: %i %i %i %i %i %i %i Time: %lfs Bandwidth: %lfGiB/s GFlop/s: %lf\n",N,K,R,UNROLL,F,T,S,seconds,1.0*bytes/seconds/1024/1024/1024,1.e-9*flops/seconds);
-}
+    double bytes = 1.0 * N * K * R * 3 * sizeof(Scalar);
+    double flops = 1.0 * N * K * R * (F * 2 * UNROLL + 2 * (UNROLL - 1));
+    printf(
+        "NKRUFTS: %i %i %i %i %i %i %i Time: %lfs Bandwidth: %lfGiB/s GFlop/s: "
+        "%lf\n",
+        N, K, R, UNROLL, F, T, S, seconds,
+        1.0 * bytes / seconds / 1024 / 1024 / 1024, 1.e-9 * flops / seconds);
+  }
 };
-
diff --git a/lib/kokkos/benchmarks/bytes_and_flops/main.cpp b/lib/kokkos/benchmarks/bytes_and_flops/main.cpp
index 4f46b38717..c21a16200e 100644
--- a/lib/kokkos/benchmarks/bytes_and_flops/main.cpp
+++ b/lib/kokkos/benchmarks/bytes_and_flops/main.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -41,25 +42,27 @@
 //@HEADER
 */
 
-#include<Kokkos_Core.hpp>
-#include<impl/Kokkos_Timer.hpp>
-#include<bench.hpp>
-#include<cstdlib>
+#include <Kokkos_Core.hpp>
+#include <impl/Kokkos_Timer.hpp>
+#include <bench.hpp>
+#include <cstdlib>
 
 int main(int argc, char* argv[]) {
   Kokkos::initialize();
 
-
-  if(argc<10) {
+  if (argc < 10) {
     printf("Arguments: N K R D U F T S\n");
     printf("  P:   Precision (1==float, 2==double)\n");
     printf("  N,K: dimensions of the 2D array to allocate\n");
     printf("  R:   how often to loop through the K dimension with each team\n");
     printf("  D:   distance between loaded elements (stride)\n");
     printf("  U:   how many independent flops to do per load\n");
-    printf("  F:   how many times to repeat the U unrolled operations before reading next element\n");
+    printf(
+        "  F:   how many times to repeat the U unrolled operations before "
+        "reading next element\n");
     printf("  T:   team size\n");
-    printf("  S:   shared memory per team (used to control occupancy on GPUs)\n");
+    printf(
+        "  S:   shared memory per team (used to control occupancy on GPUs)\n");
     printf("Example Input GPU:\n");
     printf("  Bandwidth Bound : 2 100000 1024 1 1 1 1 256 6000\n");
     printf("  Cache Bound     : 2 100000 1024 64 1 1 1 512 20000\n");
@@ -70,7 +73,6 @@ int main(int argc, char* argv[]) {
     return 0;
   }
 
-
   int P = atoi(argv[1]);
   int N = atoi(argv[2]);
   int K = atoi(argv[3]);
@@ -81,17 +83,25 @@ int main(int argc, char* argv[]) {
   int T = atoi(argv[8]);
   int S = atoi(argv[9]);
 
-  if(U>8) {printf("U must be 1-8\n"); return 0;}
-  if( (D!=1) && (D!=2) && (D!=4) && (D!=8) && (D!=16) && (D!=32)) {printf("D must be one of 1,2,4,8,16,32\n"); return 0;}
-  if( (P!=1) && (P!=2) ) {printf("P must be one of 1,2\n"); return 0;}
-
-  if(P==1) {
-    run_stride_unroll<float>(N,K,R,D,U,F,T,S);
+  if (U > 8) {
+    printf("U must be 1-8\n");
+    return 0;
   }
-  if(P==2) {
-    run_stride_unroll<double>(N,K,R,D,U,F,T,S);
+  if ((D != 1) && (D != 2) && (D != 4) && (D != 8) && (D != 16) && (D != 32)) {
+    printf("D must be one of 1,2,4,8,16,32\n");
+    return 0;
+  }
+  if ((P != 1) && (P != 2)) {
+    printf("P must be one of 1,2\n");
+    return 0;
+  }
+
+  if (P == 1) {
+    run_stride_unroll<float>(N, K, R, D, U, F, T, S);
+  }
+  if (P == 2) {
+    run_stride_unroll<double>(N, K, R, D, U, F, T, S);
   }
 
   Kokkos::finalize();
 }
-
diff --git a/lib/kokkos/benchmarks/gather/gather.hpp b/lib/kokkos/benchmarks/gather/gather.hpp
index bbbd65850f..239614184b 100644
--- a/lib/kokkos/benchmarks/gather/gather.hpp
+++ b/lib/kokkos/benchmarks/gather/gather.hpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -41,52 +42,44 @@
 //@HEADER
 */
 
-template<class Scalar, int UNROLL>
+template <class Scalar, int UNROLL>
 struct RunGather {
   static void run(int N, int K, int D, int R, int F);
 };
 
 #define UNROLL 1
-#include<gather_unroll.hpp>
+#include <gather_unroll.hpp>
 #undef UNROLL
 #define UNROLL 2
-#include<gather_unroll.hpp>
+#include <gather_unroll.hpp>
 #undef UNROLL
 #define UNROLL 3
-#include<gather_unroll.hpp>
+#include <gather_unroll.hpp>
 #undef UNROLL
 #define UNROLL 4
-#include<gather_unroll.hpp>
+#include <gather_unroll.hpp>
 #undef UNROLL
 #define UNROLL 5
-#include<gather_unroll.hpp>
+#include <gather_unroll.hpp>
 #undef UNROLL
 #define UNROLL 6
-#include<gather_unroll.hpp>
+#include <gather_unroll.hpp>
 #undef UNROLL
 #define UNROLL 7
-#include<gather_unroll.hpp>
+#include <gather_unroll.hpp>
 #undef UNROLL
 #define UNROLL 8
-#include<gather_unroll.hpp>
+#include <gather_unroll.hpp>
 #undef UNROLL
 
-template<class Scalar>
+template <class Scalar>
 void run_gather_test(int N, int K, int D, int R, int U, int F) {
- if(U == 1)
-   RunGather<Scalar,1>::run(N,K,D,R,F);
- if(U == 2)
-   RunGather<Scalar,2>::run(N,K,D,R,F);
- if(U == 3)
-   RunGather<Scalar,3>::run(N,K,D,R,F);
- if(U == 4)
-   RunGather<Scalar,4>::run(N,K,D,R,F);
- if(U == 5)
-   RunGather<Scalar,5>::run(N,K,D,R,F);
- if(U == 6)
-   RunGather<Scalar,6>::run(N,K,D,R,F);
- if(U == 7)
-   RunGather<Scalar,7>::run(N,K,D,R,F);
- if(U == 8)
-   RunGather<Scalar,8>::run(N,K,D,R,F);
+  if (U == 1) RunGather<Scalar, 1>::run(N, K, D, R, F);
+  if (U == 2) RunGather<Scalar, 2>::run(N, K, D, R, F);
+  if (U == 3) RunGather<Scalar, 3>::run(N, K, D, R, F);
+  if (U == 4) RunGather<Scalar, 4>::run(N, K, D, R, F);
+  if (U == 5) RunGather<Scalar, 5>::run(N, K, D, R, F);
+  if (U == 6) RunGather<Scalar, 6>::run(N, K, D, R, F);
+  if (U == 7) RunGather<Scalar, 7>::run(N, K, D, R, F);
+  if (U == 8) RunGather<Scalar, 8>::run(N, K, D, R, F);
 }
diff --git a/lib/kokkos/benchmarks/gather/gather_unroll.hpp b/lib/kokkos/benchmarks/gather/gather_unroll.hpp
index 1d9c99adf9..4dc046f99c 100644
--- a/lib/kokkos/benchmarks/gather/gather_unroll.hpp
+++ b/lib/kokkos/benchmarks/gather/gather_unroll.hpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -41,129 +42,132 @@
 //@HEADER
 */
 
-#include<Kokkos_Core.hpp>
-#include<Kokkos_Random.hpp>
+#include <Kokkos_Core.hpp>
+#include <Kokkos_Random.hpp>
 
-template<class Scalar>
-struct RunGather<Scalar,UNROLL> {
-static void run(int N, int K, int D, int R, int F) {
-  Kokkos::View<int**> connectivity("Connectivity",N,K);
-  Kokkos::View<Scalar*> A_in("Input",N);
-  Kokkos::View<Scalar*> B_in("Input",N);
-  Kokkos::View<Scalar*> C("Output",N);
+template <class Scalar>
+struct RunGather<Scalar, UNROLL> {
+  static void run(int N, int K, int D, int R, int F) {
+    Kokkos::View<int**> connectivity("Connectivity", N, K);
+    Kokkos::View<Scalar*> A_in("Input", N);
+    Kokkos::View<Scalar*> B_in("Input", N);
+    Kokkos::View<Scalar*> C("Output", N);
 
-  Kokkos::Random_XorShift64_Pool<> rand_pool(12313);
+    Kokkos::Random_XorShift64_Pool<> rand_pool(12313);
 
-  Kokkos::deep_copy(A_in,1.5);
-  Kokkos::deep_copy(B_in,2.0);
+    Kokkos::deep_copy(A_in, 1.5);
+    Kokkos::deep_copy(B_in, 2.0);
 
-  Kokkos::View<const Scalar*, Kokkos::MemoryTraits<Kokkos::RandomAccess> > A(A_in);
-  Kokkos::View<const Scalar*, Kokkos::MemoryTraits<Kokkos::RandomAccess> > B(B_in);
+    Kokkos::View<const Scalar*, Kokkos::MemoryTraits<Kokkos::RandomAccess> > A(
+        A_in);
+    Kokkos::View<const Scalar*, Kokkos::MemoryTraits<Kokkos::RandomAccess> > B(
+        B_in);
 
-  Kokkos::parallel_for("InitKernel",N,
-      KOKKOS_LAMBDA (const int& i) {
-    auto rand_gen = rand_pool.get_state();
-    for( int jj=0; jj<K; jj++) {
-      connectivity(i,jj) = (rand_gen.rand(D) + i - D/2 + N)%N;
+    Kokkos::parallel_for(
+        "InitKernel", N, KOKKOS_LAMBDA(const int& i) {
+          auto rand_gen = rand_pool.get_state();
+          for (int jj = 0; jj < K; jj++) {
+            connectivity(i, jj) = (rand_gen.rand(D) + i - D / 2 + N) % N;
+          }
+          rand_pool.free_state(rand_gen);
+        });
+    Kokkos::fence();
+
+    Kokkos::Timer timer;
+    for (int r = 0; r < R; r++) {
+      Kokkos::parallel_for(
+          "BenchmarkKernel", N, KOKKOS_LAMBDA(const int& i) {
+            Scalar c = Scalar(0.0);
+            for (int jj = 0; jj < K; jj++) {
+              const int j    = connectivity(i, jj);
+              Scalar a1      = A(j);
+              const Scalar b = B(j);
+#if (UNROLL > 1)
+              Scalar a2 = a1 * Scalar(1.3);
+#endif
+#if (UNROLL > 2)
+              Scalar a3 = a2 * Scalar(1.1);
+#endif
+#if (UNROLL > 3)
+              Scalar a4 = a3 * Scalar(1.1);
+#endif
+#if (UNROLL > 4)
+              Scalar a5 = a4 * Scalar(1.3);
+#endif
+#if (UNROLL > 5)
+              Scalar a6 = a5 * Scalar(1.1);
+#endif
+#if (UNROLL > 6)
+              Scalar a7 = a6 * Scalar(1.1);
+#endif
+#if (UNROLL > 7)
+              Scalar a8 = a7 * Scalar(1.1);
+#endif
+
+              for (int f = 0; f < F; f++) {
+                a1 += b * a1;
+#if (UNROLL > 1)
+                a2 += b * a2;
+#endif
+#if (UNROLL > 2)
+                a3 += b * a3;
+#endif
+#if (UNROLL > 3)
+                a4 += b * a4;
+#endif
+#if (UNROLL > 4)
+                a5 += b * a5;
+#endif
+#if (UNROLL > 5)
+                a6 += b * a6;
+#endif
+#if (UNROLL > 6)
+                a7 += b * a7;
+#endif
+#if (UNROLL > 7)
+                a8 += b * a8;
+#endif
+              }
+#if (UNROLL == 1)
+              c += a1;
+#endif
+#if (UNROLL == 2)
+              c += a1 + a2;
+#endif
+#if (UNROLL == 3)
+              c += a1 + a2 + a3;
+#endif
+#if (UNROLL == 4)
+              c += a1 + a2 + a3 + a4;
+#endif
+#if (UNROLL == 5)
+              c += a1 + a2 + a3 + a4 + a5;
+#endif
+#if (UNROLL == 6)
+              c += a1 + a2 + a3 + a4 + a5 + a6;
+#endif
+#if (UNROLL == 7)
+              c += a1 + a2 + a3 + a4 + a5 + a6 + a7;
+#endif
+#if (UNROLL == 8)
+              c += a1 + a2 + a3 + a4 + a5 + a6 + a7 + a8;
+#endif
+            }
+            C(i) = c;
+          });
+      Kokkos::fence();
     }
-    rand_pool.free_state(rand_gen);
-  });
-  Kokkos::fence();
+    double seconds = timer.seconds();
 
-
-  Kokkos::Timer timer;
-  for(int r = 0; r<R; r++) {
-  Kokkos::parallel_for("BenchmarkKernel",N,
-      KOKKOS_LAMBDA (const int& i) {
-      Scalar c = Scalar(0.0);
-      for( int jj=0; jj<K; jj++) {
-        const int j = connectivity(i,jj);
-        Scalar a1 = A(j);
-        const Scalar b = B(j);
-#if(UNROLL>1)
-        Scalar a2 = a1*Scalar(1.3);
-#endif
-#if(UNROLL>2)
-        Scalar a3 = a2*Scalar(1.1);
-#endif
-#if(UNROLL>3)
-        Scalar a4 = a3*Scalar(1.1);
-#endif
-#if(UNROLL>4)
-        Scalar a5 = a4*Scalar(1.3);
-#endif
-#if(UNROLL>5)
-        Scalar a6 = a5*Scalar(1.1);
-#endif
-#if(UNROLL>6)
-        Scalar a7 = a6*Scalar(1.1);
-#endif
-#if(UNROLL>7)
-        Scalar a8 = a7*Scalar(1.1);
-#endif
-
-
-        for(int f = 0; f<F; f++) {
-          a1 += b*a1;
-#if(UNROLL>1)
-          a2 += b*a2;
-#endif
-#if(UNROLL>2)
-          a3 += b*a3;
-#endif
-#if(UNROLL>3)
-          a4 += b*a4;
-#endif
-#if(UNROLL>4)
-          a5 += b*a5;
-#endif
-#if(UNROLL>5)
-          a6 += b*a6;
-#endif
-#if(UNROLL>6)
-          a7 += b*a7;
-#endif
-#if(UNROLL>7)
-          a8 += b*a8;
-#endif
-
-
-        }
-#if(UNROLL==1)
-        c += a1;
-#endif
-#if(UNROLL==2)
-        c += a1+a2;
-#endif
-#if(UNROLL==3)
-        c += a1+a2+a3;
-#endif
-#if(UNROLL==4)
-        c += a1+a2+a3+a4;
-#endif
-#if(UNROLL==5)
-        c += a1+a2+a3+a4+a5;
-#endif
-#if(UNROLL==6)
-        c += a1+a2+a3+a4+a5+a6;
-#endif
-#if(UNROLL==7)
-        c += a1+a2+a3+a4+a5+a6+a7;
-#endif
-#if(UNROLL==8)
-        c += a1+a2+a3+a4+a5+a6+a7+a8;
-#endif
-
-      }
-      C(i) = c ;
-  });
-  Kokkos::fence();
+    double bytes = 1.0 * N * K * R * (2 * sizeof(Scalar) + sizeof(int)) +
+                   1.0 * N * R * sizeof(Scalar);
+    double flops      = 1.0 * N * K * R * (F * 2 * UNROLL + 2 * (UNROLL - 1));
+    double gather_ops = 1.0 * N * K * R * 2;
+    printf(
+        "SNKDRUF: %i %i %i %i %i %i %i Time: %lfs Bandwidth: %lfGiB/s GFlop/s: "
+        "%lf GGather/s: %lf\n",
+        sizeof(Scalar) / 4, N, K, D, R, UNROLL, F, seconds,
+        1.0 * bytes / seconds / 1024 / 1024 / 1024, 1.e-9 * flops / seconds,
+        1.e-9 * gather_ops / seconds);
   }
-  double seconds = timer.seconds();
-
-  double bytes = 1.0*N*K*R*(2*sizeof(Scalar)+sizeof(int)) + 1.0*N*R*sizeof(Scalar);
-  double flops = 1.0*N*K*R*(F*2*UNROLL + 2*(UNROLL-1));
-  double gather_ops = 1.0*N*K*R*2;
-  printf("SNKDRUF: %i %i %i %i %i %i %i Time: %lfs Bandwidth: %lfGiB/s GFlop/s: %lf GGather/s: %lf\n",sizeof(Scalar)/4,N,K,D,R,UNROLL,F,seconds,1.0*bytes/seconds/1024/1024/1024,1.e-9*flops/seconds,1.e-9*gather_ops/seconds);
-}
 };
diff --git a/lib/kokkos/benchmarks/gather/main.cpp b/lib/kokkos/benchmarks/gather/main.cpp
index ca5238e7fd..6a2db3e024 100644
--- a/lib/kokkos/benchmarks/gather/main.cpp
+++ b/lib/kokkos/benchmarks/gather/main.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -41,23 +42,26 @@
 //@HEADER
 */
 
-#include<Kokkos_Core.hpp>
-#include<impl/Kokkos_Timer.hpp>
-#include<gather.hpp>
-#include<cstdlib>
+#include <Kokkos_Core.hpp>
+#include <impl/Kokkos_Timer.hpp>
+#include <gather.hpp>
+#include <cstdlib>
 
 int main(int argc, char* argv[]) {
-  Kokkos::initialize(argc,argv);
+  Kokkos::initialize(argc, argv);
 
-  if(argc<8) {
+  if (argc < 8) {
     printf("Arguments: S N K D\n");
-    printf("  S:   Scalar Type Size (1==float, 2==double, 4=complex<double>)\n");
+    printf(
+        "  S:   Scalar Type Size (1==float, 2==double, 4=complex<double>)\n");
     printf("  N:   Number of entities\n");
     printf("  K:   Number of things to gather per entity\n");
     printf("  D:   Max distance of gathered things of an entity\n");
     printf("  R:   how often to loop through the K dimension with each team\n");
     printf("  U:   how many independent flops to do per load\n");
-    printf("  F:   how many times to repeat the U unrolled operations before reading next element\n");
+    printf(
+        "  F:   how many times to repeat the U unrolled operations before "
+        "reading next element\n");
     printf("Example Input GPU:\n");
     printf("  Bandwidth Bound : 2 10000000 1 1 10 1 1\n");
     printf("  Cache Bound     : 2 10000000 64 1 10 1 1\n");
@@ -68,7 +72,6 @@ int main(int argc, char* argv[]) {
     return 0;
   }
 
-
   int S = atoi(argv[1]);
   int N = atoi(argv[2]);
   int K = atoi(argv[3]);
@@ -77,17 +80,22 @@ int main(int argc, char* argv[]) {
   int U = atoi(argv[6]);
   int F = atoi(argv[7]);
 
-  if( (S!=1) && (S!=2) && (S!=4)) {printf("S must be one of 1,2,4\n"); return 0;}
-  if( N<D ) {printf("N must be larger or equal to D\n"); return 0; }
-  if(S==1) {
-    run_gather_test<float>(N,K,D,R,U,F);
+  if ((S != 1) && (S != 2) && (S != 4)) {
+    printf("S must be one of 1,2,4\n");
+    return 0;
   }
-  if(S==2) {
-    run_gather_test<double>(N,K,D,R,U,F);
+  if (N < D) {
+    printf("N must be larger or equal to D\n");
+    return 0;
   }
-  if(S==4) {
-    run_gather_test<Kokkos::complex<double> >(N,K,D,R,U,F);
+  if (S == 1) {
+    run_gather_test<float>(N, K, D, R, U, F);
+  }
+  if (S == 2) {
+    run_gather_test<double>(N, K, D, R, U, F);
+  }
+  if (S == 4) {
+    run_gather_test<Kokkos::complex<double> >(N, K, D, R, U, F);
   }
   Kokkos::finalize();
 }
-
diff --git a/lib/kokkos/benchmarks/gups/gups-kokkos.cc b/lib/kokkos/benchmarks/gups/gups-kokkos.cc
index 4602adda79..9ac59be4a6 100644
--- a/lib/kokkos/benchmarks/gups/gups-kokkos.cc
+++ b/lib/kokkos/benchmarks/gups/gups-kokkos.cc
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
diff --git a/lib/kokkos/benchmarks/policy_performance/main.cpp b/lib/kokkos/benchmarks/policy_performance/main.cpp
index 2f5395734a..332e5574da 100644
--- a/lib/kokkos/benchmarks/policy_performance/main.cpp
+++ b/lib/kokkos/benchmarks/policy_performance/main.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -44,67 +45,86 @@
 #include <Kokkos_Core.hpp>
 #include "policy_perf_test.hpp"
 
-int main(int argc, char* argv[] ) {
-  Kokkos::initialize(argc,argv);
+int main(int argc, char* argv[]) {
+  Kokkos::initialize(argc, argv);
 
-  if(argc<10) {
+  if (argc < 10) {
     printf("  Ten arguments are needed to run this program:\n");
-    printf("    (1)team_range, (2)thread_range, (3)vector_range, (4)outer_repeat, (5)thread_repeat, (6)vector_repeat, (7)team_size, (8)vector_size, (9)schedule, (10)test_type\n");
+    printf(
+        "    (1)team_range, (2)thread_range, (3)vector_range, (4)outer_repeat, "
+        "(5)thread_repeat, (6)vector_repeat, (7)team_size, (8)vector_size, "
+        "(9)schedule, (10)test_type\n");
     printf("  team_range:     number of teams (league_size)\n");
     printf("  thread_range:   range for nested TeamThreadRange parallel_*\n");
     printf("  vector_range:   range for nested ThreadVectorRange parallel_*\n");
     printf("  outer_repeat:   number of repeats for outer parallel_* call\n");
-    printf("  thread_repeat:  number of repeats for TeamThreadRange parallel_* call\n");
-    printf("  vector_repeat:  number of repeats for ThreadVectorRange parallel_* call\n");
+    printf(
+        "  thread_repeat:  number of repeats for TeamThreadRange parallel_* "
+        "call\n");
+    printf(
+        "  vector_repeat:  number of repeats for ThreadVectorRange parallel_* "
+        "call\n");
     printf("  team_size:      number of team members (team_size)\n");
     printf("  vector_size:    desired vectorization (if possible)\n");
     printf("  schedule:       1 == Static  2 == Dynamic\n");
-    printf("  test_type:      3-digit code XYZ for testing (nested) parallel_*\n");
-    printf("  code key:       XYZ    X in {1,2,3,4,5}, Y in {0,1,2}, Z in {0,1,2}\n");
+    printf(
+        "  test_type:      3-digit code XYZ for testing (nested) parallel_*\n");
+    printf(
+        "  code key:       XYZ    X in {1,2,3,4,5}, Y in {0,1,2}, Z in "
+        "{0,1,2}\n");
     printf("                  TeamPolicy:\n");
-    printf("                    X: 0 = none (never used, makes no sense); 1 = parallel_for; 2 = parallel_reduce\n");
-    printf("                    Y: 0 = none; 1 = parallel_for; 2 = parallel_reduce\n");
-    printf("                    Z: 0 = none; 1 = parallel_for; 2 = parallel_reduce\n");
+    printf(
+        "                    X: 0 = none (never used, makes no sense); 1 = "
+        "parallel_for; 2 = parallel_reduce\n");
+    printf(
+        "                    Y: 0 = none; 1 = parallel_for; 2 = "
+        "parallel_reduce\n");
+    printf(
+        "                    Z: 0 = none; 1 = parallel_for; 2 = "
+        "parallel_reduce\n");
     printf("                  RangePolicy:\n");
-    printf("                    X: 3 = parallel_for; 4 = parallel_reduce; 5 = parallel_scan\n");
+    printf(
+        "                    X: 3 = parallel_for; 4 = parallel_reduce; 5 = "
+        "parallel_scan\n");
     printf("                    Y: 0 = none\n");
     printf("                    Z: 0 = none\n");
     printf("  Example Input:\n");
-    printf("  100000 32 32 100 100 100 8 1 1 100\n"); 
+    printf("  100000 32 32 100 100 100 8 1 1 100\n");
     Kokkos::finalize();
     return 0;
   }
 
-  int team_range = atoi(argv[1]);
+  int team_range   = atoi(argv[1]);
   int thread_range = atoi(argv[2]);
   int vector_range = atoi(argv[3]);
 
-  int outer_repeat = atoi(argv[4]);
+  int outer_repeat  = atoi(argv[4]);
   int thread_repeat = atoi(argv[5]);
   int vector_repeat = atoi(argv[6]);
 
-  int team_size = atoi(argv[7]);
+  int team_size   = atoi(argv[7]);
   int vector_size = atoi(argv[8]);
-  int schedule = atoi(argv[9]);
-  int test_type = atoi(argv[10]);
+  int schedule    = atoi(argv[9]);
+  int test_type   = atoi(argv[10]);
 
-  int disable_verbose_output = 0; 
-  if ( argc > 11 ) {
+  int disable_verbose_output = 0;
+  if (argc > 11) {
     disable_verbose_output = atoi(argv[11]);
   }
 
-  if ( schedule != 1 && schedule != 2 ) {
+  if (schedule != 1 && schedule != 2) {
     printf("schedule: %d\n", schedule);
     printf("Options for schedule are: 1 == Static  2 == Dynamic\n");
     Kokkos::finalize();
     return -1;
   }
 
-  if ( test_type != 100 && test_type != 110 && test_type != 111 && test_type != 112 && test_type != 120  && test_type != 121  && test_type != 122
-     && test_type != 200 && test_type != 210 && test_type != 211 && test_type != 212 && test_type != 220  && test_type != 221  && test_type != 222
-     && test_type != 300 && test_type != 400 && test_type != 500
-     )
-  {
+  if (test_type != 100 && test_type != 110 && test_type != 111 &&
+      test_type != 112 && test_type != 120 && test_type != 121 &&
+      test_type != 122 && test_type != 200 && test_type != 210 &&
+      test_type != 211 && test_type != 212 && test_type != 220 &&
+      test_type != 221 && test_type != 222 && test_type != 300 &&
+      test_type != 400 && test_type != 500) {
     printf("Incorrect test_type option\n");
     Kokkos::finalize();
     return -2;
@@ -112,56 +132,85 @@ int main(int argc, char* argv[] ) {
 
   double result = 0.0;
 
-  Kokkos::parallel_reduce( "parallel_reduce warmup", Kokkos::TeamPolicy<>(10,1), 
-    KOKKOS_LAMBDA(const Kokkos::TeamPolicy<>::member_type team, double& lval) {
-      lval += 1;
-    }, result);
+  Kokkos::parallel_reduce(
+      "parallel_reduce warmup", Kokkos::TeamPolicy<>(10, 1),
+      KOKKOS_LAMBDA(const Kokkos::TeamPolicy<>::member_type team,
+                    double& lval) { lval += 1; },
+      result);
 
-  typedef Kokkos::View<double*, Kokkos::LayoutRight>   view_type_1d;
-  typedef Kokkos::View<double**, Kokkos::LayoutRight>  view_type_2d;
+  typedef Kokkos::View<double*, Kokkos::LayoutRight> view_type_1d;
+  typedef Kokkos::View<double**, Kokkos::LayoutRight> view_type_2d;
   typedef Kokkos::View<double***, Kokkos::LayoutRight> view_type_3d;
 
   // Allocate view without initializing
-  // Call a 'warmup' test with 1 repeat - this will initialize the corresponding view appropriately for test and should obey first-touch etc
-  // Second call to test is the one we actually care about and time
-  view_type_1d v_1( Kokkos::ViewAllocateWithoutInitializing("v_1"), team_range*team_size);
-  view_type_2d v_2( Kokkos::ViewAllocateWithoutInitializing("v_2"), team_range*team_size, thread_range);
-  view_type_3d v_3( Kokkos::ViewAllocateWithoutInitializing("v_3"), team_range*team_size, thread_range, vector_range);
+  // Call a 'warmup' test with 1 repeat - this will initialize the corresponding
+  // view appropriately for test and should obey first-touch etc Second call to
+  // test is the one we actually care about and time
+  view_type_1d v_1(Kokkos::ViewAllocateWithoutInitializing("v_1"),
+                   team_range * team_size);
+  view_type_2d v_2(Kokkos::ViewAllocateWithoutInitializing("v_2"),
+                   team_range * team_size, thread_range);
+  view_type_3d v_3(Kokkos::ViewAllocateWithoutInitializing("v_3"),
+                   team_range * team_size, thread_range, vector_range);
 
   double result_computed = 0.0;
-  double result_expect = 0.0;
-  double time = 0.0;
+  double result_expect   = 0.0;
+  double time            = 0.0;
 
-  if(schedule==1) {
-    if ( test_type != 500 ) {
+  if (schedule == 1) {
+    if (test_type != 500) {
       // warmup - no repeat of loops
-      test_policy<Kokkos::Schedule<Kokkos::Static>,int>(team_range,thread_range,vector_range,1,1,1,team_size,vector_size,test_type,v_1,v_2,v_3,result_computed,result_expect,time);
-      test_policy<Kokkos::Schedule<Kokkos::Static>,int>(team_range,thread_range,vector_range,outer_repeat,thread_repeat,vector_repeat,team_size,vector_size,test_type,v_1,v_2,v_3,result_computed,result_expect,time);
-    }
-    else {
+      test_policy<Kokkos::Schedule<Kokkos::Static>, int>(
+          team_range, thread_range, vector_range, 1, 1, 1, team_size,
+          vector_size, test_type, v_1, v_2, v_3, result_computed, result_expect,
+          time);
+      test_policy<Kokkos::Schedule<Kokkos::Static>, int>(
+          team_range, thread_range, vector_range, outer_repeat, thread_repeat,
+          vector_repeat, team_size, vector_size, test_type, v_1, v_2, v_3,
+          result_computed, result_expect, time);
+    } else {
       // parallel_scan: initialize 1d view for parallel_scan
-      test_policy<Kokkos::Schedule<Kokkos::Static>,int>(team_range,thread_range,vector_range,1,1,1,team_size,vector_size,100,v_1,v_2,v_3,result_computed,result_expect,time);
-      test_policy<Kokkos::Schedule<Kokkos::Static>,int>(team_range,thread_range,vector_range,outer_repeat,thread_repeat,vector_repeat,team_size,vector_size,test_type,v_1,v_2,v_3,result_computed,result_expect,time);
+      test_policy<Kokkos::Schedule<Kokkos::Static>, int>(
+          team_range, thread_range, vector_range, 1, 1, 1, team_size,
+          vector_size, 100, v_1, v_2, v_3, result_computed, result_expect,
+          time);
+      test_policy<Kokkos::Schedule<Kokkos::Static>, int>(
+          team_range, thread_range, vector_range, outer_repeat, thread_repeat,
+          vector_repeat, team_size, vector_size, test_type, v_1, v_2, v_3,
+          result_computed, result_expect, time);
     }
   }
-  if(schedule==2) {
-    if ( test_type != 500 ) {
+  if (schedule == 2) {
+    if (test_type != 500) {
       // warmup - no repeat of loops
-      test_policy<Kokkos::Schedule<Kokkos::Dynamic>,int>(team_range,thread_range,vector_range,1,1,1,team_size,vector_size,test_type,v_1,v_2,v_3,result_computed,result_expect,time);
-      test_policy<Kokkos::Schedule<Kokkos::Dynamic>,int>(team_range,thread_range,vector_range,outer_repeat,thread_repeat,vector_repeat,team_size,vector_size,test_type,v_1,v_2,v_3,result_computed,result_expect,time);
-    }
-    else {
+      test_policy<Kokkos::Schedule<Kokkos::Dynamic>, int>(
+          team_range, thread_range, vector_range, 1, 1, 1, team_size,
+          vector_size, test_type, v_1, v_2, v_3, result_computed, result_expect,
+          time);
+      test_policy<Kokkos::Schedule<Kokkos::Dynamic>, int>(
+          team_range, thread_range, vector_range, outer_repeat, thread_repeat,
+          vector_repeat, team_size, vector_size, test_type, v_1, v_2, v_3,
+          result_computed, result_expect, time);
+    } else {
       // parallel_scan: initialize 1d view for parallel_scan
-      test_policy<Kokkos::Schedule<Kokkos::Static>,int>(team_range,thread_range,vector_range,1,1,1,team_size,vector_size,100,v_1,v_2,v_3,result_computed,result_expect,time);
-      test_policy<Kokkos::Schedule<Kokkos::Static>,int>(team_range,thread_range,vector_range,outer_repeat,thread_repeat,vector_repeat,team_size,vector_size,test_type,v_1,v_2,v_3,result_computed,result_expect,time);
+      test_policy<Kokkos::Schedule<Kokkos::Static>, int>(
+          team_range, thread_range, vector_range, 1, 1, 1, team_size,
+          vector_size, 100, v_1, v_2, v_3, result_computed, result_expect,
+          time);
+      test_policy<Kokkos::Schedule<Kokkos::Static>, int>(
+          team_range, thread_range, vector_range, outer_repeat, thread_repeat,
+          vector_repeat, team_size, vector_size, test_type, v_1, v_2, v_3,
+          result_computed, result_expect, time);
     }
   }
 
-  if ( disable_verbose_output == 0 ) {
-    printf("%7i %4i %2i %9i %4i %4i %4i %2i %1i %3i %e %e %lf\n",team_range,thread_range,vector_range,outer_repeat,thread_repeat,vector_repeat,team_size,vector_size,schedule,test_type,result_computed,result_expect,time);
-  }
-  else {
-    printf("%lf\n",time);
+  if (disable_verbose_output == 0) {
+    printf("%7i %4i %2i %9i %4i %4i %4i %2i %1i %3i %e %e %lf\n", team_range,
+           thread_range, vector_range, outer_repeat, thread_repeat,
+           vector_repeat, team_size, vector_size, schedule, test_type,
+           result_computed, result_expect, time);
+  } else {
+    printf("%lf\n", time);
   }
 
   Kokkos::finalize();
diff --git a/lib/kokkos/benchmarks/policy_performance/policy_perf_test.hpp b/lib/kokkos/benchmarks/policy_performance/policy_perf_test.hpp
index 1ab437928d..7a1500891f 100644
--- a/lib/kokkos/benchmarks/policy_performance/policy_perf_test.hpp
+++ b/lib/kokkos/benchmarks/policy_performance/policy_perf_test.hpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -43,297 +44,375 @@
 
 #include <Kokkos_Core.hpp>
 
-template < class ViewType >
+template <class ViewType>
 struct ParallelScanFunctor {
   using value_type = double;
   ViewType v;
 
-  ParallelScanFunctor( const ViewType & v_ )
-    : v(v_)
-  {}
+  ParallelScanFunctor(const ViewType& v_) : v(v_) {}
 
   KOKKOS_INLINE_FUNCTION
-    void operator()( const int idx, value_type& val, const bool& final ) const
-    {
-      // inclusive scan
-      val += v(idx);
-      if ( final ) {
-        v(idx) = val;
-      }
+  void operator()(const int idx, value_type& val, const bool& final) const {
+    // inclusive scan
+    val += v(idx);
+    if (final) {
+      v(idx) = val;
     }
+  }
 };
 
-template<class ScheduleType,class IndexType,class ViewType1, class ViewType2, class ViewType3>
+template <class ScheduleType, class IndexType, class ViewType1, class ViewType2,
+          class ViewType3>
 void test_policy(int team_range, int thread_range, int vector_range,
-          int outer_repeat, int thread_repeat, int inner_repeat,
-          int team_size, int vector_size, int test_type,
-          ViewType1 &v1, ViewType2 &v2, ViewType3 &v3,
-          double &result, double &result_expect, double &time) {
-
-  typedef Kokkos::TeamPolicy<ScheduleType,IndexType> t_policy;
+                 int outer_repeat, int thread_repeat, int inner_repeat,
+                 int team_size, int vector_size, int test_type, ViewType1& v1,
+                 ViewType2& v2, ViewType3& v3, double& result,
+                 double& result_expect, double& time) {
+  typedef Kokkos::TeamPolicy<ScheduleType, IndexType> t_policy;
   typedef typename t_policy::member_type t_team;
   Kokkos::Timer timer;
 
-  for(int orep = 0; orep<outer_repeat; orep++) {
-
+  for (int orep = 0; orep < outer_repeat; orep++) {
     if (test_type == 100) {
-      Kokkos::parallel_for("100 outer for", t_policy(team_range,team_size),
-        KOKKOS_LAMBDA (const t_team& team) {
-          long idx = team.league_rank()*team.team_size() + team.team_rank();
-          v1(idx) = idx;
-          // prevent compiler optimizing loop away
-      });
+      Kokkos::parallel_for(
+          "100 outer for", t_policy(team_range, team_size),
+          KOKKOS_LAMBDA(const t_team& team) {
+            long idx = team.league_rank() * team.team_size() + team.team_rank();
+            v1(idx)  = idx;
+            // prevent compiler optimizing loop away
+          });
     }
 
     if (test_type == 110) {
-      Kokkos::parallel_for("110 outer for", t_policy(team_range,team_size),
-        KOKKOS_LAMBDA (const t_team& team) {
-          long idx = team.league_rank()*team.team_size() + team.team_rank();
-          for (int tr = 0; tr<thread_repeat; ++tr) {
-            // Each team launches a parallel_for; thread_range is partitioned among team members
-            Kokkos::parallel_for(Kokkos::TeamThreadRange(team,thread_range), [&] (const int t) {
-              v2( idx, t ) = t;
-              // prevent compiler optimizing loop away
-            });
-          }
-      });
+      Kokkos::parallel_for(
+          "110 outer for", t_policy(team_range, team_size),
+          KOKKOS_LAMBDA(const t_team& team) {
+            long idx = team.league_rank() * team.team_size() + team.team_rank();
+            for (int tr = 0; tr < thread_repeat; ++tr) {
+              // Each team launches a parallel_for; thread_range is partitioned
+              // among team members
+              Kokkos::parallel_for(Kokkos::TeamThreadRange(team, thread_range),
+                                   [&](const int t) {
+                                     v2(idx, t) = t;
+                                     // prevent compiler optimizing loop away
+                                   });
+            }
+          });
     }
     if (test_type == 111) {
-      Kokkos::parallel_for("111 outer for", t_policy(team_range,team_size,vector_size),
-        KOKKOS_LAMBDA (const t_team& team) {
-          long idx = team.league_rank()*team.team_size() + team.team_rank();
-          for (int tr = 0; tr<thread_repeat; ++tr) {
-            // Each team launches a parallel_for; thread_range is partitioned among team members
-            Kokkos::parallel_for(Kokkos::TeamThreadRange(team,thread_range), [&] (const int t) {
-              for (int vr = 0; vr<inner_repeat; ++vr)
-                Kokkos::parallel_for(Kokkos::ThreadVectorRange(team,vector_range), [&] (const int vi) {
-                  v3( idx, t, vi ) = vi;
-                  // prevent compiler optimizing loop away
-                });
-            });
-          }
-      });
+      Kokkos::parallel_for(
+          "111 outer for", t_policy(team_range, team_size, vector_size),
+          KOKKOS_LAMBDA(const t_team& team) {
+            long idx = team.league_rank() * team.team_size() + team.team_rank();
+            for (int tr = 0; tr < thread_repeat; ++tr) {
+              // Each team launches a parallel_for; thread_range is partitioned
+              // among team members
+              Kokkos::parallel_for(
+                  Kokkos::TeamThreadRange(team, thread_range),
+                  [&](const int t) {
+                    for (int vr = 0; vr < inner_repeat; ++vr)
+                      Kokkos::parallel_for(
+                          Kokkos::ThreadVectorRange(team, vector_range),
+                          [&](const int vi) {
+                            v3(idx, t, vi) = vi;
+                            // prevent compiler optimizing loop away
+                          });
+                  });
+            }
+          });
     }
     if (test_type == 112) {
-      Kokkos::parallel_for("112 outer for", t_policy(team_range,team_size,vector_size),
-        KOKKOS_LAMBDA (const t_team& team) {
-          long idx = team.league_rank()*team.team_size() + team.team_rank();
-          for (int tr = 0; tr<thread_repeat; ++tr) {
-            // Each team launches a parallel_for; thread_range is partitioned among team members
-            Kokkos::parallel_for(Kokkos::TeamThreadRange(team,thread_range), [&] (const int t) {
-              double vector_result = 0.0;
-              for (int vr = 0; vr<inner_repeat; ++vr) {
-                vector_result = 0.0;
-                Kokkos::parallel_reduce(Kokkos::ThreadVectorRange(team,vector_range), [&] (const int vi, double &vval) {
-                  vval += 1;
-                }, vector_result);
-              }
-              v2( idx, t ) = vector_result;
-              // prevent compiler optimizing loop away
-            });
-          }
-      });
+      Kokkos::parallel_for(
+          "112 outer for", t_policy(team_range, team_size, vector_size),
+          KOKKOS_LAMBDA(const t_team& team) {
+            long idx = team.league_rank() * team.team_size() + team.team_rank();
+            for (int tr = 0; tr < thread_repeat; ++tr) {
+              // Each team launches a parallel_for; thread_range is partitioned
+              // among team members
+              Kokkos::parallel_for(
+                  Kokkos::TeamThreadRange(team, thread_range),
+                  [&](const int t) {
+                    double vector_result = 0.0;
+                    for (int vr = 0; vr < inner_repeat; ++vr) {
+                      vector_result = 0.0;
+                      Kokkos::parallel_reduce(
+                          Kokkos::ThreadVectorRange(team, vector_range),
+                          [&](const int vi, double& vval) { vval += 1; },
+                          vector_result);
+                    }
+                    v2(idx, t) = vector_result;
+                    // prevent compiler optimizing loop away
+                  });
+            }
+          });
     }
     if (test_type == 120) {
-      Kokkos::parallel_for("120 outer for", t_policy(team_range,team_size),
-        KOKKOS_LAMBDA (const t_team& team) {
-          long idx = team.league_rank()*team.team_size() + team.team_rank();
-          double team_result = 0.0;
-          for (int tr = 0; tr<thread_repeat; ++tr) {
-            team_result = 0.0;
-            Kokkos::parallel_reduce(Kokkos::TeamThreadRange(team,thread_range), [&] (const int t, double &lval) {
-              lval += 1;
-            }, team_result);
-          }
-          v1(idx) = team_result;
-          // prevent compiler optimizing loop away
-      });
+      Kokkos::parallel_for(
+          "120 outer for", t_policy(team_range, team_size),
+          KOKKOS_LAMBDA(const t_team& team) {
+            long idx = team.league_rank() * team.team_size() + team.team_rank();
+            double team_result = 0.0;
+            for (int tr = 0; tr < thread_repeat; ++tr) {
+              team_result = 0.0;
+              Kokkos::parallel_reduce(
+                  Kokkos::TeamThreadRange(team, thread_range),
+                  [&](const int t, double& lval) { lval += 1; }, team_result);
+            }
+            v1(idx) = team_result;
+            // prevent compiler optimizing loop away
+          });
     }
     if (test_type == 121) {
-      Kokkos::parallel_for("121 outer for", t_policy(team_range,team_size,vector_size),
-        KOKKOS_LAMBDA (const t_team& team) {
-          long idx = team.league_rank()*team.team_size() + team.team_rank();
-          double team_result = 0.0;
-          for (int tr = 0; tr<thread_repeat; ++tr) {
-            team_result = 0.0;
-            Kokkos::parallel_reduce(Kokkos::TeamThreadRange(team,thread_range), [&] (const int t, double &lval) {
-              lval += 1;
-              for (int vr = 0; vr<inner_repeat; ++vr) {
-                Kokkos::parallel_for(Kokkos::ThreadVectorRange(team,vector_range), [&] (const int vi) {
-                  v3( idx, t, vi ) = vi;
-                  // prevent compiler optimizing loop away
-                });
-              }
-            }, team_result);
-          }
-          v3( idx, 0, 0 ) = team_result;
-          // prevent compiler optimizing loop away
-      });
+      Kokkos::parallel_for(
+          "121 outer for", t_policy(team_range, team_size, vector_size),
+          KOKKOS_LAMBDA(const t_team& team) {
+            long idx = team.league_rank() * team.team_size() + team.team_rank();
+            double team_result = 0.0;
+            for (int tr = 0; tr < thread_repeat; ++tr) {
+              team_result = 0.0;
+              Kokkos::parallel_reduce(
+                  Kokkos::TeamThreadRange(team, thread_range),
+                  [&](const int t, double& lval) {
+                    lval += 1;
+                    for (int vr = 0; vr < inner_repeat; ++vr) {
+                      Kokkos::parallel_for(
+                          Kokkos::ThreadVectorRange(team, vector_range),
+                          [&](const int vi) {
+                            v3(idx, t, vi) = vi;
+                            // prevent compiler optimizing loop away
+                          });
+                    }
+                  },
+                  team_result);
+            }
+            v3(idx, 0, 0) = team_result;
+            // prevent compiler optimizing loop away
+          });
     }
     if (test_type == 122) {
-      Kokkos::parallel_for("122 outer for", t_policy(team_range,team_size,vector_size),
-        KOKKOS_LAMBDA (const t_team& team) {
-          long idx = team.league_rank()*team.team_size() + team.team_rank();
-          double team_result = 0.0;
-          for (int tr = 0; tr<thread_repeat; ++tr) {
-            Kokkos::parallel_reduce(Kokkos::TeamThreadRange(team,thread_range), [&] (const int t, double &lval) {
-              double vector_result = 0.0;
-              for (int vr = 0; vr<inner_repeat; ++vr) {
-                vector_result = 0.0;
-                Kokkos::parallel_reduce(Kokkos::ThreadVectorRange(team,vector_range), [&] (const int vi, double &vval) {
-                  vval += 1;
-                }, vector_result);
-                lval += vector_result;
-              }
-            }, team_result);
-          }
-          v1(idx) = team_result;
-          // prevent compiler optimizing loop away
-      });
+      Kokkos::parallel_for(
+          "122 outer for", t_policy(team_range, team_size, vector_size),
+          KOKKOS_LAMBDA(const t_team& team) {
+            long idx = team.league_rank() * team.team_size() + team.team_rank();
+            double team_result = 0.0;
+            for (int tr = 0; tr < thread_repeat; ++tr) {
+              Kokkos::parallel_reduce(
+                  Kokkos::TeamThreadRange(team, thread_range),
+                  [&](const int t, double& lval) {
+                    double vector_result = 0.0;
+                    for (int vr = 0; vr < inner_repeat; ++vr) {
+                      vector_result = 0.0;
+                      Kokkos::parallel_reduce(
+                          Kokkos::ThreadVectorRange(team, vector_range),
+                          [&](const int vi, double& vval) { vval += 1; },
+                          vector_result);
+                      lval += vector_result;
+                    }
+                  },
+                  team_result);
+            }
+            v1(idx) = team_result;
+            // prevent compiler optimizing loop away
+          });
     }
     if (test_type == 200) {
-      Kokkos::parallel_reduce("200 outer reduce", t_policy(team_range,team_size),
-        KOKKOS_LAMBDA (const t_team& team, double& lval) {
-          lval+=team.team_size()*team.league_rank() + team.team_rank();
-      },result);
-      result_expect = 0.5* (team_range*team_size)*(team_range*team_size-1);
+      Kokkos::parallel_reduce(
+          "200 outer reduce", t_policy(team_range, team_size),
+          KOKKOS_LAMBDA(const t_team& team, double& lval) {
+            lval += team.team_size() * team.league_rank() + team.team_rank();
+          },
+          result);
+      result_expect =
+          0.5 * (team_range * team_size) * (team_range * team_size - 1);
       // sum ( seq( [0, team_range*team_size) )
     }
     if (test_type == 210) {
-      Kokkos::parallel_reduce("210 outer reduce", t_policy(team_range,team_size),
-        KOKKOS_LAMBDA (const t_team& team, double& lval) {
-        long idx = team.league_rank()*team.team_size() + team.team_rank();
-        double thread_for = 1.0;
-        for(int tr = 0; tr<thread_repeat; tr++) {
-          Kokkos::parallel_for(Kokkos::TeamThreadRange(team,thread_range), [&] (const int t) {
-            v2(idx,t) = t;
-            // prevent compiler optimizing loop away
-          });
-        }
-        lval+=(team.team_size()*team.league_rank() + team.team_rank() + thread_for);
-      },result);
-      result_expect = 0.5* (team_range*team_size)*(team_range*team_size-1) + (team_range*team_size);
-      // sum ( seq( [0, team_range*team_size) + 1 per team_member (total of team_range*team_size) )
+      Kokkos::parallel_reduce(
+          "210 outer reduce", t_policy(team_range, team_size),
+          KOKKOS_LAMBDA(const t_team& team, double& lval) {
+            long idx = team.league_rank() * team.team_size() + team.team_rank();
+            double thread_for = 1.0;
+            for (int tr = 0; tr < thread_repeat; tr++) {
+              Kokkos::parallel_for(Kokkos::TeamThreadRange(team, thread_range),
+                                   [&](const int t) {
+                                     v2(idx, t) = t;
+                                     // prevent compiler optimizing loop away
+                                   });
+            }
+            lval += (team.team_size() * team.league_rank() + team.team_rank() +
+                     thread_for);
+          },
+          result);
+      result_expect =
+          0.5 * (team_range * team_size) * (team_range * team_size - 1) +
+          (team_range * team_size);
+      // sum ( seq( [0, team_range*team_size) + 1 per team_member (total of
+      // team_range*team_size) )
     }
     if (test_type == 211) {
-      Kokkos::parallel_reduce("211 outer reduce", t_policy(team_range,team_size,vector_size),
-        KOKKOS_LAMBDA (const t_team& team, double& lval) {
-        long idx = team.league_rank()*team.team_size() + team.team_rank();
-        double thread_for = 1.0;
-        for(int tr = 0; tr<thread_repeat; tr++) {
-          Kokkos::parallel_for(Kokkos::TeamThreadRange(team,thread_range), [&] (const int t) {
-            for (int vr = 0; vr<inner_repeat; ++vr)
-              Kokkos::parallel_for(Kokkos::ThreadVectorRange(team, vector_range), [&] (const int vi) {
-                v3(idx, t, vi) = vi;
-                // prevent compiler optimizing loop away
-              });
-          });
-        }
-        lval+=idx+thread_for;
-      },result);
-      result_expect = 0.5*(team_range*team_size)*(team_range*team_size-1) + (team_range*team_size);
-      // sum ( seq( [0, team_range*team_size) + 1 per team_member (total of team_range*team_size) )
+      Kokkos::parallel_reduce(
+          "211 outer reduce", t_policy(team_range, team_size, vector_size),
+          KOKKOS_LAMBDA(const t_team& team, double& lval) {
+            long idx = team.league_rank() * team.team_size() + team.team_rank();
+            double thread_for = 1.0;
+            for (int tr = 0; tr < thread_repeat; tr++) {
+              Kokkos::parallel_for(
+                  Kokkos::TeamThreadRange(team, thread_range),
+                  [&](const int t) {
+                    for (int vr = 0; vr < inner_repeat; ++vr)
+                      Kokkos::parallel_for(
+                          Kokkos::ThreadVectorRange(team, vector_range),
+                          [&](const int vi) {
+                            v3(idx, t, vi) = vi;
+                            // prevent compiler optimizing loop away
+                          });
+                  });
+            }
+            lval += idx + thread_for;
+          },
+          result);
+      result_expect =
+          0.5 * (team_range * team_size) * (team_range * team_size - 1) +
+          (team_range * team_size);
+      // sum ( seq( [0, team_range*team_size) + 1 per team_member (total of
+      // team_range*team_size) )
     }
     if (test_type == 212) {
-      Kokkos::parallel_reduce("212 outer reduce", t_policy(team_range,team_size,vector_size),
-        KOKKOS_LAMBDA (const t_team& team, double& lval) {
-        long idx = team.league_rank()*team.team_size() + team.team_rank();
-        double vector_result = 0.0;
-        for(int tr = 0; tr<thread_repeat; tr++) {
-          // This parallel_for is executed by each team; the thread_range is partitioned among the team members
-          Kokkos::parallel_for(Kokkos::TeamThreadRange(team,thread_range), [&] (const int t) {
-            v2(idx,t) = t;
-            // prevent compiler optimizing loop away
-            for (int vr = 0; vr<inner_repeat; ++vr) {
-              vector_result = 0.0;
-              Kokkos::parallel_reduce(Kokkos::ThreadVectorRange(team, vector_range), [&] (const int vi, double &vval) {
-                vval += vi;
-              }, vector_result );
+      Kokkos::parallel_reduce(
+          "212 outer reduce", t_policy(team_range, team_size, vector_size),
+          KOKKOS_LAMBDA(const t_team& team, double& lval) {
+            long idx = team.league_rank() * team.team_size() + team.team_rank();
+            double vector_result = 0.0;
+            for (int tr = 0; tr < thread_repeat; tr++) {
+              // This parallel_for is executed by each team; the thread_range is
+              // partitioned among the team members
+              Kokkos::parallel_for(
+                  Kokkos::TeamThreadRange(team, thread_range),
+                  [&](const int t) {
+                    v2(idx, t) = t;
+                    // prevent compiler optimizing loop away
+                    for (int vr = 0; vr < inner_repeat; ++vr) {
+                      vector_result = 0.0;
+                      Kokkos::parallel_reduce(
+                          Kokkos::ThreadVectorRange(team, vector_range),
+                          [&](const int vi, double& vval) { vval += vi; },
+                          vector_result);
+                    }
+                  });
             }
-          });
-        }
-        lval+= idx + vector_result;
-      },result);
-      result_expect = 0.5*(team_range*team_size)*(team_range*team_size-1) + (0.5*vector_range*(vector_range-1)*team_range*team_size);
-      // sum ( seq( [0, team_range*team_size) + sum( seq( [0, vector_range) ) per team_member (total of team_range*team_size) )
+            lval += idx + vector_result;
+          },
+          result);
+      result_expect =
+          0.5 * (team_range * team_size) * (team_range * team_size - 1) +
+          (0.5 * vector_range * (vector_range - 1) * team_range * team_size);
+      // sum ( seq( [0, team_range*team_size) + sum( seq( [0, vector_range) )
+      // per team_member (total of team_range*team_size) )
     }
     if (test_type == 220) {
-      Kokkos::parallel_reduce("220 outer reduce", t_policy(team_range,team_size),
-        KOKKOS_LAMBDA (const t_team& team, double& lval) {
-        double team_result = 0.0;
-        for(int tr = 0; tr<thread_repeat; tr++) {
-          Kokkos::parallel_reduce(Kokkos::TeamThreadRange(team,thread_range), [&] (const int t, double& tval) {
-            tval += t;
-          },team_result);
-        }
-        lval+=team_result*team.league_rank(); // constant * league_rank
-      },result);
-      result_expect = 0.5*(team_range)*(team_range-1) * team_size * 0.5*(thread_range)*(thread_range-1);
-      // sum ( seq( [0, team_range) * constant ); constant = sum( seq( [0, thread_range) )*team_size (1 per member, result for each team)
+      Kokkos::parallel_reduce(
+          "220 outer reduce", t_policy(team_range, team_size),
+          KOKKOS_LAMBDA(const t_team& team, double& lval) {
+            double team_result = 0.0;
+            for (int tr = 0; tr < thread_repeat; tr++) {
+              Kokkos::parallel_reduce(
+                  Kokkos::TeamThreadRange(team, thread_range),
+                  [&](const int t, double& tval) { tval += t; }, team_result);
+            }
+            lval += team_result * team.league_rank();  // constant * league_rank
+          },
+          result);
+      result_expect = 0.5 * (team_range) * (team_range - 1) * team_size * 0.5 *
+                      (thread_range) * (thread_range - 1);
+      // sum ( seq( [0, team_range) * constant ); constant = sum( seq( [0,
+      // thread_range) )*team_size (1 per member, result for each team)
     }
     if (test_type == 221) {
-      Kokkos::parallel_reduce("221 outer reduce", t_policy(team_range,team_size,vector_size),
-        KOKKOS_LAMBDA (const t_team& team, double& lval) {
-        long idx = team.league_rank()*team.team_size() + team.team_rank();
-        double team_result = 0;
-        for(int tr = 0; tr<thread_repeat; tr++) {
-          Kokkos::parallel_reduce(Kokkos::TeamThreadRange(team,thread_range), [&] (const int t, double& tval) {
-            double vector_for = 1.0;
-            for (int vr = 0; vr<inner_repeat; ++vr) {
-              Kokkos::parallel_for(Kokkos::ThreadVectorRange(team, vector_range), [&] (const int vi) {
-                v3(idx, t, vi) = vi;
-                // prevent compiler optimizing loop away
-              });
+      Kokkos::parallel_reduce(
+          "221 outer reduce", t_policy(team_range, team_size, vector_size),
+          KOKKOS_LAMBDA(const t_team& team, double& lval) {
+            long idx = team.league_rank() * team.team_size() + team.team_rank();
+            double team_result = 0;
+            for (int tr = 0; tr < thread_repeat; tr++) {
+              Kokkos::parallel_reduce(
+                  Kokkos::TeamThreadRange(team, thread_range),
+                  [&](const int t, double& tval) {
+                    double vector_for = 1.0;
+                    for (int vr = 0; vr < inner_repeat; ++vr) {
+                      Kokkos::parallel_for(
+                          Kokkos::ThreadVectorRange(team, vector_range),
+                          [&](const int vi) {
+                            v3(idx, t, vi) = vi;
+                            // prevent compiler optimizing loop away
+                          });
+                    }
+                    tval += t + vector_for;
+                  },
+                  team_result);
             }
-            tval += t + vector_for;
-          },team_result);
-        }
-        lval+=team_result*team.league_rank();
-      },result);
-      result_expect = 0.5* (team_range)*(team_range-1) * team_size * (0.5*(thread_range) * (thread_range-1) + thread_range);
-      // sum ( seq( [0, team_range) * constant ) + 1 per member per team; constant = sum( seq( [0, thread_range) )*team_size (1 per member, result for each team)
+            lval += team_result * team.league_rank();
+          },
+          result);
+      result_expect =
+          0.5 * (team_range) * (team_range - 1) * team_size *
+          (0.5 * (thread_range) * (thread_range - 1) + thread_range);
+      // sum ( seq( [0, team_range) * constant ) + 1 per member per team;
+      // constant = sum( seq( [0, thread_range) )*team_size (1 per member,
+      // result for each team)
     }
     if (test_type == 222) {
-      Kokkos::parallel_reduce("222 outer reduce", t_policy(team_range,team_size,vector_size),
-        KOKKOS_LAMBDA (const t_team& team, double& lval) {
-        double team_result = 0.0;
-        for(int tr = 0; tr<thread_repeat; tr++) {
-          Kokkos::parallel_reduce(Kokkos::TeamThreadRange(team,thread_range), [&] (const int t, double& tval) {
-            double vector_result = 0.0;
-            for (int vr = 0; vr<inner_repeat; ++vr) {
-              Kokkos::parallel_reduce(Kokkos::ThreadVectorRange(team, vector_range), [&] (const int vi, double& vval) {
-                vval += vi;
-              }, vector_result);
+      Kokkos::parallel_reduce(
+          "222 outer reduce", t_policy(team_range, team_size, vector_size),
+          KOKKOS_LAMBDA(const t_team& team, double& lval) {
+            double team_result = 0.0;
+            for (int tr = 0; tr < thread_repeat; tr++) {
+              Kokkos::parallel_reduce(
+                  Kokkos::TeamThreadRange(team, thread_range),
+                  [&](const int t, double& tval) {
+                    double vector_result = 0.0;
+                    for (int vr = 0; vr < inner_repeat; ++vr) {
+                      Kokkos::parallel_reduce(
+                          Kokkos::ThreadVectorRange(team, vector_range),
+                          [&](const int vi, double& vval) { vval += vi; },
+                          vector_result);
+                    }
+                    tval += t + vector_result;
+                  },
+                  team_result);
             }
-            tval += t + vector_result;
-          },team_result);
-        }
-        lval+=team_result*team.league_rank();
-      },result);
-      result_expect = 0.5* (team_range)*(team_range-1) * team_size * (0.5*(thread_range) * (thread_range-1) + thread_range*0.5*(vector_range)*(vector_range-1));
-      // sum ( seq( [0, team_range) * constant ) + 1 + sum( seq([0,vector_range) ) per member per team; constant = sum( seq( [0, thread_range) )*team_size (1 per member, result for each team)
+            lval += team_result * team.league_rank();
+          },
+          result);
+      result_expect =
+          0.5 * (team_range) * (team_range - 1) * team_size *
+          (0.5 * (thread_range) * (thread_range - 1) +
+           thread_range * 0.5 * (vector_range) * (vector_range - 1));
+      // sum ( seq( [0, team_range) * constant ) + 1 + sum( seq([0,vector_range)
+      // ) per member per team; constant = sum( seq( [0, thread_range)
+      // )*team_size (1 per member, result for each team)
     }
 
     // parallel_for RangePolicy: range = team_size*team_range
     if (test_type == 300) {
-      Kokkos::parallel_for("300 outer for", team_size*team_range,
-        KOKKOS_LAMBDA (const int idx) {
-          v1(idx) = idx;
-          // prevent compiler from optimizing away the loop
-      });
+      Kokkos::parallel_for(
+          "300 outer for", team_size * team_range,
+          KOKKOS_LAMBDA(const int idx) {
+            v1(idx) = idx;
+            // prevent compiler from optimizing away the loop
+          });
     }
     // parallel_reduce RangePolicy: range = team_size*team_range
     if (test_type == 400) {
-      Kokkos::parallel_reduce("400 outer reduce", team_size*team_range,
-        KOKKOS_LAMBDA (const int idx, double& val) {
-          val += idx;
-      }, result);
-      result_expect = 0.5*(team_size*team_range)*(team_size*team_range-1);
+      Kokkos::parallel_reduce(
+          "400 outer reduce", team_size * team_range,
+          KOKKOS_LAMBDA(const int idx, double& val) { val += idx; }, result);
+      result_expect =
+          0.5 * (team_size * team_range) * (team_size * team_range - 1);
     }
     // parallel_scan RangePolicy: range = team_size*team_range
     if (test_type == 500) {
-      Kokkos::parallel_scan("500 outer scan", team_size*team_range,
-        ParallelScanFunctor<ViewType1>(v1)
+      Kokkos::parallel_scan("500 outer scan", team_size * team_range,
+                            ParallelScanFunctor<ViewType1>(v1)
 #if 0
         // This does not compile with pre Cuda 8.0 - see Github Issue #913 for explanation
         KOKKOS_LAMBDA (const int idx, double& val, const bool& final) {
@@ -345,11 +424,12 @@ void test_policy(int team_range, int thread_range, int vector_range,
         }
 #endif
       );
-      // result = v1( team_size*team_range - 1 ); // won't work with Cuda - need to copy result back to host to print
-      // result_expect = 0.5*(team_size*team_range)*(team_size*team_range-1);
+      // result = v1( team_size*team_range - 1 ); // won't work with Cuda - need
+      // to copy result back to host to print result_expect =
+      // 0.5*(team_size*team_range)*(team_size*team_range-1);
     }
 
-  } // end outer for loop
+  }  // end outer for loop
 
   time = timer.seconds();
-} //end test_policy
+}  // end test_policy
diff --git a/lib/kokkos/benchmarks/policy_performance/script_sample_usage.sh b/lib/kokkos/benchmarks/policy_performance/script_sample_usage.sh
index f4bfb87f8f..1c2db56648 100755
--- a/lib/kokkos/benchmarks/policy_performance/script_sample_usage.sh
+++ b/lib/kokkos/benchmarks/policy_performance/script_sample_usage.sh
@@ -2,7 +2,7 @@
 
 # Sample script for benchmarking policy performance 
 
-# Suggested enviroment variables to export prior to executing script:
+# Suggested environment variables to export prior to executing script:
 # KNL: 
 # OMP_NUM_THREADS=256 KMP_AFFINITY=compact
 # Power:
diff --git a/lib/kokkos/benchmarks/stream/stream-kokkos.cc b/lib/kokkos/benchmarks/stream/stream-kokkos.cc
index 370995432e..6ce789dd82 100644
--- a/lib/kokkos/benchmarks/stream/stream-kokkos.cc
+++ b/lib/kokkos/benchmarks/stream/stream-kokkos.cc
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
diff --git a/lib/kokkos/bin/hpcbind b/lib/kokkos/bin/hpcbind
index b185a92821..6af091a7d8 100755
--- a/lib/kokkos/bin/hpcbind
+++ b/lib/kokkos/bin/hpcbind
@@ -383,7 +383,7 @@ fi
 # Check unknown arguments
 ################################################################################
 if [[ ${#UNKNOWN_ARGS[*]} > 0 ]]; then
-  echo "HPCBIND Uknown options: ${UNKNOWN_ARGS[*]}" > >(tee -a ${HPCBIND_LOG})
+  echo "HPCBIND Unknown options: ${UNKNOWN_ARGS[*]}" > >(tee -a ${HPCBIND_LOG})
   exit 1
 fi
 
diff --git a/lib/kokkos/bin/nvcc_wrapper b/lib/kokkos/bin/nvcc_wrapper
index 94bc72854e..8a23d0d620 100755
--- a/lib/kokkos/bin/nvcc_wrapper
+++ b/lib/kokkos/bin/nvcc_wrapper
@@ -85,11 +85,11 @@ first_xcompiler_arg=1
 
 temp_dir=${TMPDIR:-/tmp}
 
-# Check if we have an optimization argument already
-optimization_applied=0
+# optimization flag added as a command-line argument
+optimization_flag=""
 
-# Check if we have -std=c++X  or --std=c++X already
-stdcxx_applied=0
+# std standard flag added as a command-line argument
+std_flag=""
 
 # Run nvcc a second time to generate dependencies if needed
 depfile_separate=0
@@ -99,6 +99,10 @@ depfile_target_arg=""
 # Option to remove duplicate libraries and object files
 remove_duplicate_link_files=0
 
+function warn_std_flag() {
+  echo "nvcc_wrapper - *warning* you have set multiple standard flags (-std=c++1* or --std=c++1*), only the last is used because nvcc can only accept a single std setting"
+}
+
 #echo "Arguments: $# $@"
 
 while [ $# -gt 0 ]
@@ -130,12 +134,16 @@ do
     ;;
    # Ensure we only have one optimization flag because NVCC doesn't allow muliple
   -O*)
-    if [ $optimization_applied -eq 1 ]; then
-       echo "nvcc_wrapper - *warning* you have set multiple optimization flags (-O*), only the first is used because nvcc can only accept a single optimization setting."
-    else
-       shared_args="$shared_args $1"
-       optimization_applied=1
+    if [ -n "$optimization_flag" ]; then
+       echo "nvcc_wrapper - *warning* you have set multiple optimization flags (-O*), only the last is used because nvcc can only accept a single optimization setting."
+       shared_args=${shared_args/ $optimization_flag/}
     fi
+    if [ "$1" = "-O" ]; then
+      optimization_flag="-O2"
+    else
+      optimization_flag=$1
+    fi
+    shared_args="$shared_args $optimization_flag"
     ;;
   #Handle shared args (valid for both nvcc and the host compiler)
   -D*)
@@ -171,7 +179,7 @@ do
     shift
     ;;
   #Handle known nvcc args
-  --dryrun|--verbose|--keep|--keep-dir*|-G|--relocatable-device-code*|-lineinfo|-expt-extended-lambda|--resource-usage|-Xptxas*)
+  --dryrun|--verbose|--keep|--keep-dir*|-G|--relocatable-device-code*|-lineinfo|-expt-extended-lambda|--resource-usage|-Xptxas*|--fmad*)
     cuda_args="$cuda_args $1"
     ;;
   #Handle more known nvcc args
@@ -179,21 +187,43 @@ do
     cuda_args="$cuda_args $1"
     ;;
   #Handle known nvcc args that have an argument
-  -rdc|-maxrregcount|--default-stream)
+  -rdc|-maxrregcount|--default-stream|-Xnvlink|--fmad)
     cuda_args="$cuda_args $1 $2"
     shift
     ;;
   -rdc=*|-maxrregcount*|--maxrregcount*)
     cuda_args="$cuda_args $1"
     ;;
-  #Handle c++11
-  --std=c++11|-std=c++11|--std=c++14|-std=c++14|--std=c++1y|-std=c++1y|--std=c++17|-std=c++17|--std=c++1z|-std=c++1z)
-    if [ $stdcxx_applied -eq 1 ]; then
-       echo "nvcc_wrapper - *warning* you have set multiple optimization flags (-std=c++1* or --std=c++1*), only the first is used because nvcc can only accept a single std setting"
-    else
-       shared_args="$shared_args $1"
-       stdcxx_applied=1
+  #Handle unsupported standard flags
+  --std=c++1y|-std=c++1y|--std=c++1z|-std=c++1z|--std=gnu++1y|-std=gnu++1y|--std=gnu++1z|-std=gnu++1z|--std=c++2a|-std=c++2a|--std=c++17|-std=c++17)
+    fallback_std_flag="-std=c++14"
+    # this is hopefully just occurring in a downstream project during CMake feature tests
+    # we really have no choice here but to accept the flag and change  to an accepted C++ standard
+    echo "nvcc_wrapper does not accept standard flags $1 since partial standard flags and standards after C++14 are not supported. nvcc_wrapper will use $fallback_std_flag instead. It is undefined behavior to use this flag. This should only be occurring during CMake configuration."
+    if [ -n "$std_flag" ]; then
+       warn_std_flag
+       shared_args=${shared_args/ $std_flag/}
     fi
+    std_flag=$fallback_std_flag
+    shared_args="$shared_args $std_flag"
+    ;;
+  -std=gnu*)
+    corrected_std_flag=${1/gnu/c}
+    echo "nvcc_wrapper has been given GNU extension standard flag $1 - reverting flag to $corrected_std_flag"
+    if [ -n "$std_flag" ]; then
+       warn_std_flag
+       shared_args=${shared_args/ $std_flag/}
+    fi
+    std_flag=$corrected_std_flag
+    shared_args="$shared_args $std_flag"
+  ;;
+  --std=c++11|-std=c++11|--std=c++14|-std=c++14)
+    if [ -n "$std_flag" ]; then
+       warn_std_flag
+       shared_args=${shared_args/ $std_flag/}
+    fi
+    std_flag=$1
+    shared_args="$shared_args $std_flag"
     ;;
 
   #strip of -std=c++98 due to nvcc warnings and Tribits will place both -std=c++11 and -std=c++98
@@ -308,16 +338,6 @@ do
   shift
 done
 
-#Check if nvcc exists
-if [ $host_only -ne 1 ]; then
-  var=$(which nvcc )
-  if [ $? -gt 0 ]; then
-    echo "Could not find nvcc in PATH"
-    exit $?
-  fi
-fi
-
-
 # Only print host compiler version
 if [ $get_host_version -eq 1 ]; then
   $host_compiler --version
@@ -372,6 +392,9 @@ if [ $first_xcompiler_arg -eq 0 ]; then
   nvcc_command="$nvcc_command -Xcompiler $xcompiler_args"
 fi
 
+#Replace all commas in xcompiler_args with a space for the host only command
+xcompiler_args=${xcompiler_args//,/" "}
+
 #Compose host only command
 host_command="$host_compiler $shared_args $host_only_args $compile_arg $output_arg $xcompiler_args $host_linker_args $shared_versioned_libraries_host"
 
diff --git a/lib/kokkos/cm_generate_makefile.bash b/lib/kokkos/cm_generate_makefile.bash
new file mode 100755
index 0000000000..fd7cfe2d32
--- /dev/null
+++ b/lib/kokkos/cm_generate_makefile.bash
@@ -0,0 +1,339 @@
+#!/bin/bash
+
+update_kokkos_devices() {
+   SEARCH_TEXT="*$1*"
+   if [[ $KOKKOS_DEVICES == $SEARCH_TEXT ]]; then
+      echo kokkos devices already includes $SEARCH_TEXT
+   else
+      if [ "$KOKKOS_DEVICES" = "" ]; then
+         KOKKOS_DEVICES="$1"
+         echo reseting kokkos devices to $KOKKOS_DEVICES
+      else
+         KOKKOS_DEVICES="${KOKKOS_DEVICES},$1"
+         echo appending to kokkos devices $KOKKOS_DEVICES
+      fi
+   fi
+}
+
+get_kokkos_device_list() {
+  KOKKOS_DEVICE_CMD=
+  PARSE_DEVICES_LST=$(echo $KOKKOS_DEVICES | tr "," "\n")
+  for DEVICE_ in $PARSE_DEVICES_LST
+  do 
+     UC_DEVICE=$(echo $DEVICE_ | tr "[:lower:]" "[:upper:]")
+     KOKKOS_DEVICE_CMD="-DKokkos_ENABLE_${UC_DEVICE}=ON ${KOKKOS_DEVICE_CMD}"
+  done
+}
+
+get_kokkos_arch_list() {
+  KOKKOS_ARCH_CMD=
+  PARSE_ARCH_LST=$(echo $KOKKOS_ARCH | tr "," "\n")
+  for ARCH_ in $PARSE_ARCH_LST
+  do 
+     UC_ARCH=$(echo $ARCH_ | tr "[:lower:]" "[:upper:]")
+     KOKKOS_ARCH_CMD="-DKokkos_ARCH_${UC_ARCH}=ON ${KOKKOS_ARCH_CMD}"
+  done
+}
+
+get_kokkos_cuda_option_list() {
+  echo parsing KOKKOS_CUDA_OPTIONS=$KOKKOS_CUDA_OPTIONS
+  KOKKOS_CUDA_OPTION_CMD=
+  PARSE_CUDA_LST=$(echo $KOKKOS_CUDA_OPTIONS | tr "," "\n")
+  for CUDA_ in $PARSE_CUDA_LST
+  do 
+     CUDA_OPT_NAME=
+     if [ "${CUDA_}" == "enable_lambda" ]; then
+        CUDA_OPT_NAME=CUDA_LAMBDA
+     elif  [ "${CUDA_}" == "rdc" ]; then	
+        CUDA_OPT_NAME=CUDA_RELOCATABLE_DEVICE_CODE
+     elif  [ "${CUDA_}" == "force_uvm" ]; then
+        CUDA_OPT_NAME=CUDA_UVM
+     elif  [ "${CUDA_}" == "use_ldg" ]; then
+        CUDA_OPT_NAME=CUDA_LDG_INTRINSIC
+     else
+        echo "${CUDA_} is not a valid cuda options..."
+     fi
+     if [ "${CUDA_OPT_NAME}" != "" ]; then
+        KOKKOS_CUDA_OPTION_CMD="-DKokkos_ENABLE_${CUDA_OPT_NAME}=ON ${KOKKOS_CUDA_OPTION_CMD}"
+     fi
+  done
+}
+
+get_kokkos_option_list() {
+  echo parsing KOKKOS_OPTIONS=$KOKKOS_OPTIONS
+  KOKKOS_OPTION_CMD=
+  PARSE_OPTIONS_LST=$(echo $KOKKOS_OPTIONS | tr "," "\n")
+  for OPT_ in $PARSE_OPTIONS_LST
+  do 
+     UC_OPT_=$(echo $OPT_ | tr "[:lower:]" "[:upper:]")
+     if [[ "$UC_OPT_" == *DISABLE* ]]; then
+        FLIP_OPT_=${UC_OPT_/DISABLE/ENABLE}
+        KOKKOS_OPTION_CMD="-DKokkos_${FLIP_OPT_}=OFF ${KOKKOS_OPTION_CMD}"
+     elif [[ "$UC_OPT_" == *ENABLE* ]]; then
+        KOKKOS_OPTION_CMD="-DKokkos_${UC_OPT_}=ON ${KOKKOS_OPTION_CMD}"
+     else
+        KOKKOS_OPTION_CMD="-DKokkos_ENABLE_${UC_OPT_}=ON ${KOKKOS_OPTION_CMD}"
+     fi
+  done
+}
+
+display_help_text() {
+
+      echo "Kokkos configure options:"
+      echo ""
+      echo "--kokkos-path=/Path/To/Kokkos:        Path to the Kokkos root directory."
+      echo "--prefix=/Install/Path:               Path to install the Kokkos library."
+      echo ""
+      echo "--with-cuda[=/Path/To/Cuda]:          Enable Cuda and set path to Cuda Toolkit."
+      echo "--with-openmp:                        Enable OpenMP backend."
+      echo "--with-pthread:                       Enable Pthreads backend."
+      echo "--with-serial:                        Enable Serial backend."
+      echo "--with-devices:                       Explicitly add a set of backends."
+      echo ""
+      echo "--arch=[OPT]:  Set target architectures. Options are:"
+      echo "               [AMD]"
+      echo "                 AMDAVX          = AMD CPU"
+      echo "                 EPYC            = AMD EPYC Zen-Core CPU"
+      echo "               [ARM]"
+      echo "                 ARMv80          = ARMv8.0 Compatible CPU"
+      echo "                 ARMv81          = ARMv8.1 Compatible CPU"
+      echo "                 ARMv8-ThunderX  = ARMv8 Cavium ThunderX CPU"
+      echo "                 ARMv8-TX2       = ARMv8 Cavium ThunderX2 CPU"
+      echo "               [IBM]"
+      echo "                 BGQ             = IBM Blue Gene Q"
+      echo "                 Power7          = IBM POWER7 and POWER7+ CPUs"
+      echo "                 Power8          = IBM POWER8 CPUs"
+      echo "                 Power9          = IBM POWER9 CPUs"
+      echo "               [Intel]"
+      echo "                 WSM             = Intel Westmere CPUs"
+      echo "                 SNB             = Intel Sandy/Ivy Bridge CPUs"
+      echo "                 HSW             = Intel Haswell CPUs"
+      echo "                 BDW             = Intel Broadwell Xeon E-class CPUs"
+      echo "                 SKX             = Intel Sky Lake Xeon E-class HPC CPUs (AVX512)"
+      echo "               [Intel Xeon Phi]"
+      echo "                 KNC             = Intel Knights Corner Xeon Phi"
+      echo "                 KNL             = Intel Knights Landing Xeon Phi"
+      echo "               [NVIDIA]"
+      echo "                 Kepler30        = NVIDIA Kepler generation CC 3.0"
+      echo "                 Kepler32        = NVIDIA Kepler generation CC 3.2"
+      echo "                 Kepler35        = NVIDIA Kepler generation CC 3.5"
+      echo "                 Kepler37        = NVIDIA Kepler generation CC 3.7"
+      echo "                 Maxwell50       = NVIDIA Maxwell generation CC 5.0"
+      echo "                 Maxwell52       = NVIDIA Maxwell generation CC 5.2"
+      echo "                 Maxwell53       = NVIDIA Maxwell generation CC 5.3"
+      echo "                 Pascal60        = NVIDIA Pascal generation CC 6.0"
+      echo "                 Pascal61        = NVIDIA Pascal generation CC 6.1"
+      echo "                 Volta70         = NVIDIA Volta generation CC 7.0"
+      echo "                 Volta72         = NVIDIA Volta generation CC 7.2"
+      echo ""
+      echo "--compiler=/Path/To/Compiler  Set the compiler."
+      echo "--debug,-dbg:                 Enable Debugging."
+      echo "--cxxflags=[FLAGS]            Overwrite CXXFLAGS for library build and test"
+      echo "                                build.  This will still set certain required"
+      echo "                                flags via KOKKOS_CXXFLAGS (such as -fopenmp,"
+      echo "                                --std=c++11, etc.)."
+      echo "--cxxstandard=[FLAGS]         Overwrite KOKKOS_CXX_STANDARD for library build and test"
+      echo "                                c++11 (default), c++14, c++17, c++1y, c++1z, c++2a"
+      echo "--ldflags=[FLAGS]             Overwrite LDFLAGS for library build and test"
+      echo "                                build. This will still set certain required"
+      echo "                                flags via KOKKOS_LDFLAGS (such as -fopenmp,"
+      echo "                                -lpthread, etc.)."
+      echo "--with-gtest=/Path/To/Gtest:  Set path to gtest.  (Used in unit and performance"
+      echo "                                tests.)"
+      echo "--with-hwloc=/Path/To/Hwloc:  Set path to hwloc library."
+      echo "--with-memkind=/Path/To/MemKind:  Set path to memkind library."
+      echo "--with-options=[OPT]:         Additional options to Kokkos:"
+      echo "                                compiler_warnings"
+      echo "                                aggressive_vectorization = add ivdep on loops"
+      echo "                                disable_profiling = do not compile with profiling hooks"
+      echo "                                "
+      echo "--with-cuda-options=[OPT]:    Additional options to CUDA:"
+      echo "                                force_uvm, use_ldg, enable_lambda, rdc"
+      echo "--with-hpx-options=[OPT]:     Additional options to HPX:"
+      echo "                                enable_async_dispatch"
+      echo "--gcc-toolchain=/Path/To/GccRoot:  Set the gcc toolchain to use with clang (e.g. /usr)" 
+      echo "--make-j=[NUM]:               DEPRECATED: call make with appropriate"
+      echo "                                -j flag"
+
+}
+
+while [[ $# > 0 ]]
+do
+  key="$1"
+
+  case $key in
+    --kokkos-path*)
+      KOKKOS_PATH="${key#*=}"
+      ;;
+    --hpx-path*)
+      HPX_PATH="${key#*=}"
+      ;;
+    --prefix*)
+      PREFIX="${key#*=}"
+      ;;
+    --with-cuda)
+      update_kokkos_devices Cuda
+      CUDA_PATH_NVCC=$(command -v nvcc)
+      CUDA_PATH=${CUDA_PATH_NVCC%/bin/nvcc}
+      ;;
+    # Catch this before '--with-cuda*'
+    --with-cuda-options*)
+      KOKKOS_CUDA_OPTIONS="${key#*=}"
+      ;;
+    --with-cuda*)
+      update_kokkos_devices Cuda
+      CUDA_PATH="${key#*=}"
+      ;;
+    --with-openmp)
+      update_kokkos_devices OpenMP
+      ;;
+    --with-pthread)
+      update_kokkos_devices Pthread
+      ;;
+    --with-serial)
+      update_kokkos_devices Serial
+      ;;
+    --with-hpx-options*)
+      KOKKOS_HPX_OPT="${key#*=}"
+      ;;
+    --with-hpx*)
+      update_kokkos_devices HPX
+      if [ -z "$HPX_PATH" ]; then
+        HPX_PATH="${key#*=}"
+      fi
+      ;;
+    --with-devices*)
+      DEVICES="${key#*=}"
+      PARSE_DEVICES=$(echo $DEVICES | tr "," "\n")
+      for DEVICE_ in $PARSE_DEVICES
+      do 
+         update_kokkos_devices $DEVICE_
+      done
+      ;;
+    --with-gtest*)
+      GTEST_PATH="${key#*=}"
+      ;;
+    --with-hwloc*)
+      HWLOC_PATH="${key#*=}"
+      ;;
+    --with-memkind*)
+      MEMKIND_PATH="${key#*=}"
+      ;;
+    --arch*)
+      KOKKOS_ARCH="${key#*=}"
+      ;;
+    --cxxflags*)
+      KOKKOS_CXXFLAGS="${key#*=}"
+      KOKKOS_CXXFLAGS=${KOKKOS_CXXFLAGS//,/ }
+      ;;
+    --cxxstandard*)
+      KOKKOS_CXX_STANDARD="${key#*=}"
+      ;;
+    --ldflags*)
+      KOKKOS_LDFLAGS="${key#*=}"
+      ;;
+    --debug|-dbg)
+      KOKKOS_DEBUG=yes
+      ;;
+    --make-j*)
+      echo "Warning: ${key} is deprecated"
+      echo "Call make with appropriate -j flag"
+      ;;
+    --compiler*)
+      COMPILER="${key#*=}"
+      CNUM=$(command -v ${COMPILER} 2>&1 >/dev/null | grep "no ${COMPILER}" | wc -l)
+      if [ ${CNUM} -gt 0 ]; then
+        echo "Invalid compiler by --compiler command: '${COMPILER}'"
+        exit
+      fi
+      if [[ ! -n  ${COMPILER} ]]; then
+        echo "Empty compiler specified by --compiler command."
+        exit
+      fi
+      CNUM=$(command -v ${COMPILER} | grep ${COMPILER} | wc -l)
+      if [ ${CNUM} -eq 0 ]; then
+        echo "Invalid compiler by --compiler command: '${COMPILER}'"
+        exit
+      fi
+      # ... valid compiler, ensure absolute path set 
+      WCOMPATH=$(command -v $COMPILER)
+      COMPDIR=$(dirname $WCOMPATH)
+      COMPNAME=$(basename $WCOMPATH)
+      COMPILER=${COMPDIR}/${COMPNAME}
+      ;;
+    --with-options*)
+      KOKKOS_OPTIONS="${key#*=}"
+      ;;
+    --gcc-toolchain*)
+      KOKKOS_GCC_TOOLCHAIN="${key#*=}"
+      ;;
+    --help)
+      display_help_text
+      exit 0
+      ;;
+    *)
+      echo "warning: ignoring unknown option $key"
+      ;;
+  esac
+
+  shift
+done
+
+
+if [ "$COMPILER" == "" ]; then
+    COMPILER_CMD=
+else
+    COMPILER_CMD=-DCMAKE_CXX_COMPILER=$COMPILER
+fi
+
+if [ "$KOKKOS_DEBUG" == "" ]; then
+    KOKKOS_DEBUG_CMD=-DCMAKE_BUILD_TYPE=RELEASE
+else
+    KOKKOS_DEBUG_CMD=-DCMAKE_BUILD_TYPE=DEBUG
+fi
+
+if [ ! -e ${KOKKOS_PATH}/CMakeLists.txt ]; then
+   if [ "${KOKKOS_PATH}" == "" ]; then
+      CM_SCRIPT=$0
+      KOKKOS_PATH=`dirname $CM_SCRIPT`
+      if [ ! -e ${KOKKOS_PATH}/CMakeLists.txt ]; then
+         echo "${KOKKOS_PATH} repository appears to not be complete.  please verify and try again"
+         exit 0
+      fi
+   else
+      echo "KOKKOS_PATH does not appear to be set properly. please specify in location of CMakeLists.txt"   
+      display_help_text
+      exit 0
+   fi
+fi
+
+get_kokkos_device_list
+get_kokkos_option_list
+get_kokkos_arch_list
+get_kokkos_cuda_option_list
+
+## if HPX is enabled, we need to enforce cxx standard = 14
+if [[ ${KOKKOS_DEVICE_CMD} == *Kokkos_ENABLE_HPX* ]]; then
+   if [ "${KOKKOS_CXX_STANDARD}" == "" ] || [ ${#KOKKOS_CXX_STANDARD} -lt 14 ]; then
+      echo CXX Standard must be 14 or higher for HPX to work.
+      KOKKOS_CXX_STANDARD=14
+   fi
+fi
+
+if [ "$KOKKOS_CXX_STANDARD" == "" ]; then
+    STANDARD_CMD=
+else
+    STANDARD_CMD=-DKokkos_CXX_STANDARD=${KOKKOS_CXX_STANDARD}
+fi
+
+if [[ ${COMPILER} == *clang* ]]; then
+   gcc_path=$(which g++ | awk --field-separator='/bin/g++' '{printf $1}' )
+   KOKKOS_CXXFLAGS="${KOKKOS_CXXFLAGS} --gcc-toolchain=${gcc_path}"
+
+   if [ ! "${CUDA_PATH}" == "" ]; then
+      KOKKOS_CXXFLAGS="${KOKKOS_CXXFLAGS} --cuda-path=${CUDA_PATH}"
+   fi 
+fi
+ 
+echo cmake $COMPILER_CMD  -DCMAKE_CXX_FLAGS="${KOKKOS_CXXFLAGS}" -DCMAKE_EXE_LINKER_FLAGS="${KOKKOS_LDFLAGS}" -DCMAKE_INSTALL_PREFIX=${PREFIX} ${KOKKOS_DEVICE_CMD} ${KOKKOS_ARCH_CMD} -DKokkos_ENABLE_TESTS=ON ${KOKKOS_OPTION_CMD} ${KOKKOS_CUDA_OPTION_CMD} -DCMAKE_VERBOSE_MAKEFILE=ON -DCMAKE_CXX_EXTENSIONS=OFF ${STANDARD_CMD} ${KOKKOS_DEBUG_CMD} ${KOKKOS_PATH}
+cmake $COMPILER_CMD  -DCMAKE_CXX_FLAGS="${KOKKOS_CXXFLAGS//\"}" -DCMAKE_EXE_LINKER_FLAGS="${KOKKOS_LDFLAGS//\"}" -DCMAKE_INSTALL_PREFIX=${PREFIX} ${KOKKOS_DEVICE_CMD} ${KOKKOS_ARCH_CMD} -DKokkos_ENABLE_TESTS=ON ${KOKKOS_OPTION_CMD} ${KOKKOS_CUDA_OPTION_CMD} -DCMAKE_VERBOSE_MAKEFILE=ON -DCMAKE_CXX_EXTENSIONS=OFF ${STANDARD_CMD} ${KOKKOS_DEBUG_CMD} ${KOKKOS_PATH}
diff --git a/lib/kokkos/cmake/KokkosConfig.cmake.in b/lib/kokkos/cmake/KokkosConfig.cmake.in
index fc099a494c..6f4607687e 100644
--- a/lib/kokkos/cmake/KokkosConfig.cmake.in
+++ b/lib/kokkos/cmake/KokkosConfig.cmake.in
@@ -1,18 +1,14 @@
-# - Config file for the Kokkos package
-# It defines the following variables
-#  Kokkos_INCLUDE_DIRS - include directories for Kokkos
-#  Kokkos_LIBRARIES    - libraries to link against
-
 # Compute paths
+@PACKAGE_INIT@
+
+#Find dependencies
+INCLUDE(CMakeFindDependencyMacro)
+
+#This needs to go above the KokkosTargets in case
+#the Kokkos targets depend in some way on the TPL imports
+@KOKKOS_TPL_EXPORTS@
+
 GET_FILENAME_COMPONENT(Kokkos_CMAKE_DIR "${CMAKE_CURRENT_LIST_FILE}" PATH)
-SET(Kokkos_INCLUDE_DIRS "@CONF_INCLUDE_DIRS@")
-
-# Our library dependencies (contains definitions for IMPORTED targets)
-IF(NOT TARGET kokkos AND NOT Kokkos_BINARY_DIR)
-  INCLUDE("${Kokkos_CMAKE_DIR}/KokkosTargets.cmake")
-ENDIF()
-
-# These are IMPORTED targets created by KokkosTargets.cmake
-SET(Kokkos_LIBRARY_DIRS @INSTALL_LIB_DIR@)
-SET(Kokkos_LIBRARIES @Kokkos_LIBRARIES_NAMES@)
-SET(Kokkos_TPL_LIBRARIES @KOKKOS_LIBS@)
+INCLUDE("${Kokkos_CMAKE_DIR}/KokkosTargets.cmake")
+INCLUDE("${Kokkos_CMAKE_DIR}/KokkosConfigCommon.cmake")
+UNSET(Kokkos_CMAKE_DIR)
diff --git a/lib/kokkos/cmake/KokkosConfigCommon.cmake.in b/lib/kokkos/cmake/KokkosConfigCommon.cmake.in
new file mode 100644
index 0000000000..da9c61976c
--- /dev/null
+++ b/lib/kokkos/cmake/KokkosConfigCommon.cmake.in
@@ -0,0 +1,87 @@
+SET(Kokkos_DEVICES @KOKKOS_ENABLED_DEVICES@)
+SET(Kokkos_OPTIONS @KOKKOS_ENABLED_OPTIONS@)
+SET(Kokkos_TPLS @KOKKOS_ENABLED_TPLS@)
+SET(Kokkos_ARCH @KOKKOS_ENABLED_ARCH_LIST@)
+
+# These are needed by KokkosKernels
+FOREACH(DEV ${Kokkos_DEVICES})
+  SET(Kokkos_ENABLE_${DEV} ON)
+ENDFOREACH()
+
+IF(NOT Kokkos_FIND_QUIETLY)
+  MESSAGE(STATUS "Enabled Kokkos devices: ${Kokkos_DEVICES}")
+ENDIF()
+
+IF (Kokkos_ENABLE_CUDA AND ${CMAKE_VERSION} VERSION_GREATER_EQUAL "3.14.0")
+  #If we are building CUDA, we have tricked CMake because we declare a CXX project
+  #If the default C++ standard for a given compiler matches the requested
+  #standard, then CMake just omits the -std flag in later versions of CMake
+  #This breaks CUDA compilation (CUDA compiler can have a different default
+  #-std then the underlying host compiler by itself). Setting this variable
+  #forces CMake to always add the -std flag even if it thinks it doesn't need it
+  SET(CMAKE_CXX_STANDARD_DEFAULT 98 CACHE INTERNAL "" FORCE)
+ENDIF()
+
+SET(KOKKOS_USE_CXX_EXTENSIONS @KOKKOS_USE_CXX_EXTENSIONS@)
+IF (NOT DEFINED CMAKE_CXX_EXTENSIONS OR CMAKE_CXX_EXTENSIONS)
+  IF (NOT KOKKOS_USE_CXX_EXTENSIONS)
+    MESSAGE(WARNING "The installed Kokkos configuration does not support CXX extensions. Forcing -DCMAKE_CXX_EXTENSIONS=Off")
+    SET(CMAKE_CXX_EXTENSIONS OFF CACHE BOOL "" FORCE)
+  ENDIF()
+ENDIF()
+
+include(FindPackageHandleStandardArgs)
+
+#   This function makes sure that Kokkos was built with the requested backends
+#   and target architectures and generates a fatal error if it was not.
+#
+#   kokkos_check(
+#     [DEVICES <devices>...]   # Set of backends (e.g. "OpenMP" and/or "Cuda")
+#     [ARCH <archs>...]        # Target architectures (e.g. "Power9" and/or "Volta70")
+#     [OPTIONS <options>...]   # Optional settings (e.g. "PROFILING")
+#     [TPLS <tpls>...]         # Third party libraries
+#     [RETURN_VALUE <result>]  # Set a variable that indicates the result of the
+#                              # check instead of a fatal error
+#   )
+function(kokkos_check)
+  set(ALLOWED_ARGS DEVICES ARCH OPTIONS TPLS)
+  cmake_parse_arguments(KOKKOS_CHECK "" "RETURN_VALUE" "${ALLOWED_ARGS}" ${ARGN})
+  foreach(_arg ${KOKKOS_CHECK_UNPARSED_ARGUMENTS})
+    message(SEND_ERROR "Argument '${_arg}' passed to kokkos_check() was not recognized")
+  endforeach()
+  # Get the list of keywords that were actually passed to the function.
+  set(REQUESTED_ARGS)
+  foreach(arg ${ALLOWED_ARGS})
+    if(KOKKOS_CHECK_${arg})
+      list(APPEND REQUESTED_ARGS ${arg})
+    endif()
+  endforeach()
+  set(KOKKOS_CHECK_SUCCESS TRUE)
+  foreach(arg ${REQUESTED_ARGS})
+    # Define variables named after the required arguments that are provided by
+    # the Kokkos install.
+    foreach(requested ${KOKKOS_CHECK_${arg}})
+      foreach(provided ${Kokkos_${arg}})
+        STRING(TOUPPER ${requested} REQUESTED_UC)
+        STRING(TOUPPER ${provided}  PROVIDED_UC)
+        if(PROVIDED_UC STREQUAL REQUESTED_UC)
+          string(REPLACE ";" " " ${requested} "${KOKKOS_CHECK_${arg}}")
+        endif()
+      endforeach()
+    endforeach()
+    # Somewhat divert the CMake function below from its original purpose and
+    # use it to check that there are variables defined for all required
+    # arguments. Success or failure messages will be displayed but we are
+    # responsible for signaling failure and skip the build system generation.
+    find_package_handle_standard_args("Kokkos_${arg}" DEFAULT_MSG
+            ${KOKKOS_CHECK_${arg}})
+    if(NOT Kokkos_${arg}_FOUND)
+      set(KOKKOS_CHECK_SUCCESS FALSE)
+    endif()
+  endforeach()
+  if(NOT KOKKOS_CHECK_SUCCESS AND NOT KOKKOS_CHECK_RETURN_VALUE)
+    message(FATAL_ERROR "Kokkos does NOT provide all backends and/or architectures requested")
+  else()
+    set(${KOKKOS_CHECK_RETURN_VALUE} ${KOKKOS_CHECK_SUCCESS} PARENT_SCOPE)
+  endif()
+endfunction()
diff --git a/lib/kokkos/cmake/KokkosCore_config.h.in b/lib/kokkos/cmake/KokkosCore_config.h.in
new file mode 100644
index 0000000000..084afba8a8
--- /dev/null
+++ b/lib/kokkos/cmake/KokkosCore_config.h.in
@@ -0,0 +1,89 @@
+
+#if !defined(KOKKOS_MACROS_HPP) || defined(KOKKOS_CORE_CONFIG_H)
+#error "Do not include KokkosCore_config.h directly; include Kokkos_Macros.hpp instead."
+#else
+#define KOKKOS_CORE_CONFIG_H
+#endif
+
+/* Execution Spaces */
+#cmakedefine KOKKOS_ENABLE_SERIAL
+#cmakedefine KOKKOS_ENABLE_OPENMP
+#cmakedefine KOKKOS_ENABLE_THREADS
+#cmakedefine KOKKOS_ENABLE_CUDA
+#cmakedefine KOKKOS_ENABLE_HPX
+#cmakedefine KOKKOS_ENABLE_MEMKIND
+#cmakedefine KOKKOS_ENABLE_LIBRT
+
+#ifndef __CUDA_ARCH__
+#cmakedefine KOKKOS_ENABLE_TM
+#cmakedefine KOKKOS_USE_ISA_X86_64
+#cmakedefine KOKKOS_USE_ISA_KNC
+#cmakedefine KOKKOS_USE_ISA_POWERPCLE
+#cmakedefine KOKKOS_USE_ISA_POWERPCBE
+#endif
+
+/* General Settings */
+#cmakedefine KOKKOS_ENABLE_CXX11
+#cmakedefine KOKKOS_ENABLE_CXX14
+#cmakedefine KOKKOS_ENABLE_CXX17
+#cmakedefine KOKKOS_ENABLE_CXX20
+
+#cmakedefine KOKKOS_ENABLE_CUDA_RELOCATABLE_DEVICE_CODE
+#cmakedefine KOKKOS_ENABLE_CUDA_UVM
+#cmakedefine KOKKOS_ENABLE_CUDA_LAMBDA
+#cmakedefine KOKKOS_ENABLE_CUDA_CONSTEXPR
+#cmakedefine KOKKOS_ENABLE_CUDA_LDG_INTRINSIC
+#cmakedefine KOKKOS_ENABLE_HPX_ASYNC_DISPATCH
+#cmakedefine KOKKOS_ENABLE_DEBUG
+#cmakedefine KOKKOS_ENABLE_DEBUG_DUALVIEW_MODIFY_CHECK
+#cmakedefine KOKKOS_ENABLE_DEBUG_BOUNDS_CHECK
+#cmakedefine KOKKOS_ENABLE_COMPILER_WARNINGS
+#cmakedefine KOKKOS_ENABLE_PROFILING
+#cmakedefine KOKKOS_ENABLE_PROFILING_LOAD_PRINT
+#cmakedefine KOKKOS_ENABLE_DEPRECATED_CODE
+#cmakedefine KOKKOS_ENABLE_ETI
+#cmakedefine KOKKOS_ENABLE_LARGE_MEM_TESTS
+#cmakedefine KOKKOS_ENABLE_DUALVIEW_MODIFY_CHECK
+#cmakedefine KOKKOS_ENABLE_COMPLEX_ALIGN
+#cmakedefine KOKKOS_OPT_RANGE_AGGRESSIVE_VECTORIZATION
+
+/* TPL Settings */
+#cmakedefine KOKKOS_ENABLE_HWLOC
+#cmakedefine KOKKOS_USE_LIBRT
+#cmakedefine KOKKOS_ENABLE_HWBSPACE
+
+#cmakedefine KOKKOS_IMPL_CUDA_CLANG_WORKAROUND
+
+#cmakedefine KOKKOS_COMPILER_CUDA_VERSION @KOKKOS_COMPILER_CUDA_VERSION@
+
+#cmakedefine KOKKOS_ARCH_SSE42
+#cmakedefine KOKKOS_ARCH_ARMV80
+#cmakedefine KOKKOS_ARCH_ARMV8_THUNDERX
+#cmakedefine KOKKOS_ARCH_ARMV81
+#cmakedefine KOKKOS_ARCH_ARMV8_THUNDERX2
+#cmakedefine KOKKOS_ARCH_AMD_AVX2
+#cmakedefine KOKKOS_ARCH_AVX
+#cmakedefine KOKKOS_ARCH_AVX2
+#cmakedefine KOKKOS_ARCH_AVX512XEON
+#cmakedefine KOKKOS_ARCH_KNC
+#cmakedefine KOKKOS_ARCH_AVX512MIC
+#cmakedefine KOKKOS_ARCH_POWER7
+#cmakedefine KOKKOS_ARCH_POWER8
+#cmakedefine KOKKOS_ARCH_POWER9
+#cmakedefine KOKKOS_ARCH_KEPLER
+#cmakedefine KOKKOS_ARCH_KEPLER30
+#cmakedefine KOKKOS_ARCH_KEPLER32
+#cmakedefine KOKKOS_ARCH_KEPLER35
+#cmakedefine KOKKOS_ARCH_KEPLER37
+#cmakedefine KOKKOS_ARCH_MAXWELL
+#cmakedefine KOKKOS_ARCH_MAXWELL50
+#cmakedefine KOKKOS_ARCH_MAXWELL52
+#cmakedefine KOKKOS_ARCH_MAXWELL53
+#cmakedefine KOKKOS_ARCH_PASCAL
+#cmakedefine KOKKOS_ARCH_PASCAL60
+#cmakedefine KOKKOS_ARCH_PASCAL61
+#cmakedefine KOKKOS_ARCH_VOLTA
+#cmakedefine KOKKOS_ARCH_VOLTA70
+#cmakedefine KOKKOS_ARCH_VOLTA72
+#cmakedefine KOKKOS_ARCH_TURING75
+#cmakedefine KOKKOS_ARCH_AMD_EPYC
diff --git a/lib/kokkos/cmake/Makefile.generate_cmake_settings b/lib/kokkos/cmake/Makefile.generate_cmake_settings
deleted file mode 100644
index da076b23db..0000000000
--- a/lib/kokkos/cmake/Makefile.generate_cmake_settings
+++ /dev/null
@@ -1,8 +0,0 @@
-ifndef KOKKOS_PATH
-  MAKEFILE_PATH := $(abspath $(lastword $(MAKEFILE_LIST)))
-  KOKKOS_PATH = $(subst Makefile,,$(MAKEFILE_PATH))..
-endif
-
-include $(KOKKOS_PATH)/Makefile.kokkos
-include $(KOKKOS_PATH)/core/src/Makefile.generate_header_lists
-include $(KOKKOS_PATH)/core/src/Makefile.generate_build_files
diff --git a/lib/kokkos/cmake/Modules/FindHWLOC.cmake b/lib/kokkos/cmake/Modules/FindHWLOC.cmake
deleted file mode 100644
index 60df8084d8..0000000000
--- a/lib/kokkos/cmake/Modules/FindHWLOC.cmake
+++ /dev/null
@@ -1,20 +0,0 @@
-#.rst:
-# FindHWLOC
-# ----------
-#
-# Try to find HWLOC, based on KOKKOS_HWLOC_DIR
-#
-# The following variables are defined:
-#
-#   HWLOC_FOUND - System has HWLOC
-#   HWLOC_INCLUDE_DIR - HWLOC include directory
-#   HWLOC_LIBRARIES - Libraries needed to use HWLOC
-
-find_path(HWLOC_INCLUDE_DIR hwloc.h PATHS "${KOKKOS_HWLOC_DIR}/include")
-find_library(HWLOC_LIBRARIES hwloc PATHS "${KOKKOS_HWLOC_DIR}/lib")
-
-include(FindPackageHandleStandardArgs)
-find_package_handle_standard_args(HWLOC DEFAULT_MSG
-                                  HWLOC_INCLUDE_DIR HWLOC_LIBRARIES)
-
-mark_as_advanced(HWLOC_INCLUDE_DIR HWLOC_LIBRARIES)
diff --git a/lib/kokkos/cmake/Modules/FindMemkind.cmake b/lib/kokkos/cmake/Modules/FindMemkind.cmake
deleted file mode 100644
index 245fb44c19..0000000000
--- a/lib/kokkos/cmake/Modules/FindMemkind.cmake
+++ /dev/null
@@ -1,20 +0,0 @@
-#.rst:
-# FindMemkind
-# ----------
-#
-# Try to find Memkind.
-#
-# The following variables are defined:
-#
-#   MEMKIND_FOUND - System has Memkind
-#   MEMKIND_INCLUDE_DIR - Memkind include directory
-#   MEMKIND_LIBRARIES - Libraries needed to use Memkind
-
-find_path(MEMKIND_INCLUDE_DIR memkind.h)
-find_library(MEMKIND_LIBRARIES memkind)
-
-include(FindPackageHandleStandardArgs)
-find_package_handle_standard_args(Memkind DEFAULT_MSG
-  MEMKIND_INCLUDE_DIR MEMKIND_LIBRARIES)
-
-mark_as_advanced(MEMKIND_INCLUDE_DIR MEMKIND_LIBRARIES)
diff --git a/lib/kokkos/cmake/Modules/FindQthreads.cmake b/lib/kokkos/cmake/Modules/FindQthreads.cmake
deleted file mode 100644
index a254b0e996..0000000000
--- a/lib/kokkos/cmake/Modules/FindQthreads.cmake
+++ /dev/null
@@ -1,20 +0,0 @@
-#.rst:
-# FindQthreads
-# ----------
-#
-# Try to find Qthreads.
-#
-# The following variables are defined:
-#
-#   QTHREADS_FOUND - System has Qthreads
-#   QTHREADS_INCLUDE_DIR - Qthreads include directory
-#   QTHREADS_LIBRARIES - Libraries needed to use Qthreads
-
-find_path(QTHREADS_INCLUDE_DIR qthread.h)
-find_library(QTHREADS_LIBRARIES qthread)
-
-include(FindPackageHandleStandardArgs)
-find_package_handle_standard_args(Qthreads DEFAULT_MSG
-                                  QTHREADS_INCLUDE_DIR QTHREADS_LIBRARIES)
-
-mark_as_advanced(QTHREADS_INCLUDE_DIR QTHREADS_LIBRARIES)
diff --git a/lib/kokkos/cmake/Modules/FindTPLCUDA.cmake b/lib/kokkos/cmake/Modules/FindTPLCUDA.cmake
new file mode 100644
index 0000000000..36aefcdb44
--- /dev/null
+++ b/lib/kokkos/cmake/Modules/FindTPLCUDA.cmake
@@ -0,0 +1,13 @@
+
+IF (KOKKOS_CXX_COMPILER_ID STREQUAL Clang)
+   KOKKOS_FIND_IMPORTED(CUDA INTERFACE
+    LIBRARIES cudart cuda
+    LIBRARY_PATHS ENV LD_LIBRARY_PATH ENV CUDA_PATH
+    ALLOW_SYSTEM_PATH_FALLBACK
+   )
+ELSE()
+   KOKKOS_CREATE_IMPORTED_TPL(CUDA INTERFACE
+    LINK_LIBRARIES cuda
+   )
+ENDIF()
+
diff --git a/lib/kokkos/cmake/Modules/FindTPLHPX.cmake b/lib/kokkos/cmake/Modules/FindTPLHPX.cmake
new file mode 100644
index 0000000000..c8b3bc4c9b
--- /dev/null
+++ b/lib/kokkos/cmake/Modules/FindTPLHPX.cmake
@@ -0,0 +1,15 @@
+
+FIND_PACKAGE(HPX REQUIRED)
+#as of right now, HPX doesn't export correctly
+#so let's convert it to an interface target
+KOKKOS_CREATE_IMPORTED_TPL(HPX INTERFACE
+  LINK_LIBRARIES ${HPX_LIBRARIES}
+  INCLUDES ${HPX_INCLUDE_DIRS}
+)
+#this is a bit funky since this is a CMake target
+#but HPX doesn't export itself correctly
+KOKKOS_EXPORT_CMAKE_TPL(HPX)
+
+#I would prefer all of this gets replaced with
+#KOKKOS_IMPORT_CMAKE_TPL(HPX)
+
diff --git a/lib/kokkos/cmake/Modules/FindTPLHWLOC.cmake b/lib/kokkos/cmake/Modules/FindTPLHWLOC.cmake
new file mode 100644
index 0000000000..cf763b7e5b
--- /dev/null
+++ b/lib/kokkos/cmake/Modules/FindTPLHWLOC.cmake
@@ -0,0 +1 @@
+KOKKOS_FIND_IMPORTED(HWLOC  HEADER hwloc.h  LIBRARY hwloc)
diff --git a/lib/kokkos/cmake/Modules/FindTPLLIBDL.cmake b/lib/kokkos/cmake/Modules/FindTPLLIBDL.cmake
new file mode 100644
index 0000000000..5fc6a69303
--- /dev/null
+++ b/lib/kokkos/cmake/Modules/FindTPLLIBDL.cmake
@@ -0,0 +1 @@
+KOKKOS_FIND_IMPORTED(LIBDL HEADER dlfcn.h  LIBRARY dl)
diff --git a/lib/kokkos/cmake/Modules/FindTPLLIBNUMA.cmake b/lib/kokkos/cmake/Modules/FindTPLLIBNUMA.cmake
new file mode 100644
index 0000000000..811db5851b
--- /dev/null
+++ b/lib/kokkos/cmake/Modules/FindTPLLIBNUMA.cmake
@@ -0,0 +1 @@
+KOKKOS_FIND_IMPORTED(LIBNUMA HEADER numa.h   LIBRARY numa)
diff --git a/lib/kokkos/cmake/Modules/FindTPLLIBRT.cmake b/lib/kokkos/cmake/Modules/FindTPLLIBRT.cmake
new file mode 100644
index 0000000000..e75da56b5b
--- /dev/null
+++ b/lib/kokkos/cmake/Modules/FindTPLLIBRT.cmake
@@ -0,0 +1 @@
+KOKKOS_FIND_IMPORTED(LIBRT HEADER time.h   LIBRARY rt)
diff --git a/lib/kokkos/cmake/Modules/FindTPLMEMKIND.cmake b/lib/kokkos/cmake/Modules/FindTPLMEMKIND.cmake
new file mode 100644
index 0000000000..20aaff2295
--- /dev/null
+++ b/lib/kokkos/cmake/Modules/FindTPLMEMKIND.cmake
@@ -0,0 +1 @@
+KOKKOS_FIND_IMPORTED(MEMKIND HEADER memkind.h LIBRARY memkind)
diff --git a/lib/kokkos/cmake/Modules/FindTPLPTHREAD.cmake b/lib/kokkos/cmake/Modules/FindTPLPTHREAD.cmake
new file mode 100644
index 0000000000..b4b8c34122
--- /dev/null
+++ b/lib/kokkos/cmake/Modules/FindTPLPTHREAD.cmake
@@ -0,0 +1,17 @@
+
+TRY_COMPILE(KOKKOS_HAS_PTHREAD_ARG
+  ${KOKKOS_TOP_BUILD_DIR}/tpl_tests
+  ${KOKKOS_SOURCE_DIR}/cmake/compile_tests/pthread.cpp
+  LINK_LIBRARIES -pthread
+  COMPILE_DEFINITIONS -pthread)
+
+INCLUDE(FindPackageHandleStandardArgs)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(PTHREAD DEFAULT_MSG KOKKOS_HAS_PTHREAD_ARG)
+
+KOKKOS_CREATE_IMPORTED_TPL(PTHREAD
+  INTERFACE   #this is not a real library with a real location
+  COMPILE_OPTIONS -pthread
+  LINK_OPTIONS    -pthread)
+
+
+
diff --git a/lib/kokkos/cmake/README.md b/lib/kokkos/cmake/README.md
new file mode 100644
index 0000000000..0543a18e89
--- /dev/null
+++ b/lib/kokkos/cmake/README.md
@@ -0,0 +1,331 @@
+![Kokkos](https://avatars2.githubusercontent.com/u/10199860?s=200&v=4)
+
+# Developing Kokkos
+
+This document contains a build system overview for developers with information on adding new CMake options that could influence
+* Header configuration macros
+* Optional features
+* Third-partly libraries
+* Compiler and linker flags
+For build system details for users, refer to the [build instructions](../BUILD.md).
+
+## Build System
+
+Kokkos uses CMake to configure, build, and install.
+Rather than being a completely straightforward use of modern CMake,
+Kokkos has several extra complications, primarily due to:
+* Kokkos must support linking to an installed version or in-tree builds as a subdirectory of a larger project.
+* Kokkos must configure a special compiler `nvcc_wrapper` that allows `nvcc` to accept all C++ flags (which `nvcc` currently does not).
+* Kokkos must work as a part of TriBITS, a CMake library providing a particular build idiom for Trilinos.
+* Kokkos has many pre-existing users. We need to be careful about breaking previous versions or generating meaningful error messags if we do break backwards compatibility.
+
+If you are looking at the build system code wondering why certain decisions were made: we have had to balance many competing requirements and certain technical debt. Everything in the build system was done for a reason, trying to adhere as closely as possible to modern CMake best practices while meeting all pre-existing. customer requirements.
+
+### Modern CMake Philosophy
+
+Modern CMake relies on understanding the principle of *building* and *using* a code project.
+What preprocessor, compiler, and linker flags do I need to *build* my project?
+What flags does a downstream project that links to me need to *use* my project?
+In CMake terms, flags that are only needed for building are `PRIVATE`.
+Only Kokkos needs these flags, not a package that depends on Kokkos.
+Flags that must be used in a downstream project are `PUBLIC`.
+Kokkos must tell other projects to use them.
+
+In Kokkos, almost everything is a public flag since Kokkos is driven by headers and Kokkos is in charge of optimizing your code to achieve performance portability!
+Include paths, C++ standard flags, architecture-specific optimizations, or OpenMP and CUDA flags are all examples of flags that Kokkos configures and adds to your project.
+
+Modern CMake now automatically propagates flags through the `target_link_libraries` command.
+Suppose you have a library `stencil` that needs to build with Kokkos.
+Consider the following CMake code:
+
+````
+find_package(Kokkos)
+add_library(stencil stencil.cpp)
+target_link_libraries(stencil Kokkos::kokkos)
+````
+
+This locates the Kokkos package, adds your library, and tells CMake to link Kokkos to your library.
+All public build flags get added automatically through the `target_link_libraries` command.
+There is nothing to do. You can be happily oblivious to how Kokkos was configured.
+Everything should just work.
+
+As a Kokkos developer who wants to add new public compiler flags, how do you ensure that CMake does this properly? Modern CMake works through targets and properties.
+Each target has a set of standard properties:
+* `INTERFACE_COMPILE_OPTIONS` contains all the compiler options that Kokkos should add to downstream projects
+* `INTERFACE_INCLUDE_DIRECTORIES` contains all the directories downstream projects must include from Kokkos
+* `INTERFACE_COMPILE_DEFINITIONS` contains the list of preprocessor `-D` flags
+* `INTERFACE_LINK_LIBRARIES` contains all the libraries downstream projects need to link
+* `INTERFACE_COMPILE_FEATURES` essentially adds compiler flags, but with extra complications. Features names are specific to CMake. More later.
+
+CMake makes it easy to append to these properties using:
+* `target_compile_options(kokkos PUBLIC -fmyflag)`
+* `target_include_directories(kokkos PUBLIC mySpecialFolder)`
+* `target_compile_definitions(kokkos PUBLIC -DmySpecialFlag=0)`
+* `target_link_libraries(kokkos PUBLIC mySpecialLibrary)`
+* `target_compile_features(kokkos PUBLIC mySpecialFeature)`
+Note that all of these use `PUBLIC`! Almost every Kokkos flag is not private to Kokkos, but must also be used by downstream projects.
+
+
+### Compiler Features and Compiler Options
+Compiler options are flags like `-fopenmp` that do not need to be "resolved." 
+The flag is either on or off.
+Compiler features are more fine-grained and require conflicting requests to be resolved.
+Suppose I have
+````
+add_library(A a.cpp)
+target_compile_features(A PUBLIC cxx_std_11)
+````
+then another target
+````
+add_library(B b.cpp)
+target_compile_features(B PUBLIC cxx_std_14)
+target_link_libraries(A B)
+````
+I have requested two different features.
+CMake understands the requests and knows that `cxx_std_11` is a subset of `cxx_std_14`.
+CMake then picks C++14 for library `B`.
+CMake would not have been able to do feature resolution if we had directly done:
+````
+target_compile_options(A PUBLIC -std=c++11)
+````
+
+### Adding Kokkos Options
+After configuring for the first time,
+CMake creates a cache of configure variables in `CMakeCache.txt`.
+Reconfiguring in the folder "restarts" from those variables.
+All flags passed as `-DKokkos_SOME_OPTION=X` to `cmake` become variables in the cache.
+All Kokkos options begin with camel case `Kokkos_` followed by an upper case option name.
+
+CMake best practice is to avoid cache variables, if possible.
+In essence, you want the minimal amount of state cached between configurations.
+And never, ever have behavior influenced by multiple cache variables.
+If you want to change the Kokkos configuration, have a single unique variable that needs to be changed.
+Never require two cache variables to be changed.
+
+Kokkos provides a function `KOKKOS_OPTION` for defining valid cache-level variables,
+proofreading them, and defining local project variables.
+The most common variables are called `Kokkos_ENABLE_X`,
+for which a helper function `KOKKOS_ENABLE_OPTION` is provided, e.g.
+````
+KOKKOS_ENABLE_OPTION(TESTS OFF  "Whether to build tests")
+````
+The function checks if `-DKokkos_ENABLE_TESTS` was given,
+whether it was given with the wrong case, e.g. `-DKokkos_Enable_Tests`,
+and then defines a regular (non-cache) variable `KOKKOS_ENABLE_TESTS` to `ON` or `OFF`
+depending on the given default and whether the option was specified.
+
+### Defining Kokkos Config Macros
+
+Sometimes you may want to add `#define Kokkos_X` macros to the config header.
+This is straightforward with CMake.
+Suppose you want to define an optional macro `KOKKOS_SUPER_SCIENCE`.
+Simply go into `KokkosCore_config.h.in` and add
+````
+#cmakedefine KOKKOS_SUPER_SCIENCE
+````
+I can either add
+````
+KOKKOS_OPTION(SUPER_SCIENCE ON "Whether to do some super science")
+````
+to directly set the variable as a command-line `-D` option.
+Alternatively, based on other logic, I could add to a `CMakeLists.txt`
+````
+SET(KOKKOS_SUPER_SCIENCE ON)
+````
+If not set as a command-line option (cache variable), you must make sure the variable is visible in the top-level scope.
+If set in a function, you would need:
+````
+SET(KOKKOS_SUPER_SCIENCE ON PARENT_SCOPE)
+````
+
+### Third-Party Libraries
+In much the same way that compiler flags transitively propagate to dependent projects,
+modern CMake allows us to propagate dependent libraries.
+If Kokkos depends on, e.g. `hwloc` the downstream project will also need to link `hwloc`.
+There are three stages in adding a new third-party library (TPL):
+* Finding: find the desired library on the system and verify the installation is correct
+* Importing: create a CMake target, if necessary, that is compatible with `target_link_libraries`. This is mostly relevant for TPLs not installed with CMake.
+* Exporting: make the desired library visible to downstream projects 
+
+TPLs are somewhat complicated by whether the library was installed with CMake or some other build system.
+If CMake, our lives are greatly simplified. We simply use `find_package` to locate the installed CMake project then call `target_link_libraries(kokkoscore PUBLIC/PRIVATE TPL)`. For libaries not installed with CMake, the process is a bit more complex.
+It is up to the Kokkos developers to "convert" the library into a CMake target as if it had been installed as a valid modern CMake target with properties.  
+There are helper functions for simplifying the process of importing TPLs in Kokkos, but we walk through the process in detail to clearly illustrate the steps involved.
+
+#### TPL Search Order
+
+There are several options for where CMake could try to find a TPL.
+If there are multiple installations of the same TPL on the system,
+the search order is critical for making sure the correct TPL is found.
+There are 3 possibilities that could be used:
+
+1. Default system paths like /usr
+1. User-provided paths through options `<NAME>_ROOT` and `Kokkos_<NAME>_DIR`
+1. Additional paths not in the CMake default list or provided by the user that Kokkos decides to add. For example, Kokkos may query `nvcc` or `LD_LIBRARY_PATH` for where to find CUDA libraries.
+
+The following is the search order that Kokkos follows. Note: This differs from the default search order used by CMake `find_library` and `find_header`. CMake prefers default system paths over user-provided paths.
+For Kokkos (and package managers in general), it is better to prefer user-provided paths since this usually indicates a specific version we want.
+
+1. `<NAME>_ROOT`
+1. `Kokkos_<NAME>_DIR`
+1.  Paths added by Kokkos CMake logic
+1.  Default system paths (if allowed)
+
+Default system paths are allowed in two cases. First, none of the other options are given so the only place to look is system paths. Second, if explicitly given permission, configure will look in system paths.
+The rationale for this logic is that if you specify a custom location, you usually *only* want to look in that location.
+If you do not find the TPL where you expect it, you should error out rather than grab another random match.
+
+
+#### Finding TPLs
+
+If finding a TPL that is not a modern CMake project, refer to the `FindHWLOC.cmake` file in `cmake/Modules` for an example.
+You will usually need to verify expected headers with `find_path`
+````
+find_path(TPL_INCLUDE_DIR mytpl.h PATHS "${KOKKOS_MYTPL_DIR}/include")
+````
+This insures that the library header is in the expected include directory and defines the variable `TPL_INCLUDE_DIR` with a valid path if successful.
+Similarly, you can verify a library
+````
+find_library(TPL_LIBRARY mytpl PATHS "${KOKKOS_MYTPL_DIR/lib")
+````
+that then defines the variable `TPL_LIBRARY` with a valid path if successful.
+CMake provides a utility for checking if the `find_path` and `find_library` calls were successful that emulates the behavior of `find_package` for a CMake target.
+````
+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(MYTPL DEFAULT_MSG
+                                  MYTPL_INCLUDE_DIR MYTPL_LIBRARY)
+````
+If the find failed, CMake will print standard error messages explaining the failure.
+
+#### Importing TPLs
+
+The installed TPL must be adapted into a CMake target.
+CMake allows libraries to be added that are built externally as follows:
+````
+add_library(Kokkos::mytpl UNKNOWN IMPORTED)
+````
+Importantly, we use a `Kokkos::` namespace to avoid name conflicts and identify this specifically as the version imported by Kokkos.
+Because we are importing a non-CMake target, we must populate all the target properties that would have been automatically populated for a CMake target.
+````
+set_target_properties(Kokkos::mytpl PROPERTIES
+  INTERFACE_INCLUDE_DIRECTORIES "${MYTPL_INCLUDE_DIR}"
+  IMPORTED_LOCATION "${MYTPL_LIBRARY}"
+)
+````
+
+#### Exporting TPLs
+
+Kokkos may now depend on the target `Kokkos::mytpl` as a `PUBLIC` library (remember building and using).
+This means that downstream projects must also know about `Kokkos::myptl` - so Kokkos must export them.
+In the `KokkosConfig.cmake.in` file, we need to add code like the following:
+````
+set(MYTPL_LIBRARY @MYTPL_LIBRARY@)
+set(MYTPL_INCLUDE_DIR @MYTPL_INCLUDE_DIR@)
+add_library(Kokkos::mytpl UNKNOWN IMPORTED)
+set_target_properties(Kokkos::mytpl PROPERTIES
+  INTERFACE_INCLUDE_DIRECTORIES "${MYTPL_INCLUDE_DIR}"
+  IMPORTED_LOCATION "${MYTPL_LIBRARY}"
+)
+````
+If this looks familiar, that's because it is exactly the same code as above for importing the TPL.
+Exporting a TPL really just means importing the TPL when Kokkos is loaded by an external project.
+We will describe helper functions that simplify this process.
+
+#### Interface TPLs
+
+If a TPL is just a library and set of headers, we can make a simple `IMPORTED` target.
+However, a TPL is actually completely flexible and need not be limited to just headers and libraries.
+TPLs can configure compiler flags, linker flags, or multiple different libraries.
+For this, we use a special type of CMake target: `INTERFACE` libraries.
+These libraries don't build anything.
+They simply populate properties that will configure flags for dependent targets.
+We consider the example:
+````
+add_library(PTHREAD INTERFACE)
+target_compile_options(PTHREAD PUBLIC -pthread)
+````
+Kokkos uses the compiler flag `-pthread` to define compiler macros for re-entrant functions rather than treating it simply as a library with header `pthread.h` and library `-lpthread`.
+Any property can be configured, e.g.
+````
+target_link_libraries(MYTPL ...)
+````
+In contrast to imported TPLs which require direct modification of `KokkosConfig.cmake.in`,
+we can use CMake's built-in export functions:
+````
+INSTALL(
+  TARGETS MYTPL
+  EXPORT KokkosTargets
+  RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
+  LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
+  ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
+)
+````
+These interface targets will be automatically populated in the config file.
+
+#### Linking the TPL
+After finishing the import process, it still remains to link the imported target as needed.
+For example,
+````
+target_link_libraries(kokkoscore PUBLIC Kokkos::HWLOC)
+````
+The complexity of which includes, options, and libraries the TPL requires
+should be encapsulated in the CMake target.
+
+#### TPL Helper Functions
+##### KOKKOS_IMPORT_TPL
+This function can be invoked as, e.g.
+````
+KOKKOS_IMPORT_TPL(HWLOC)
+````
+This function checks if the TPL was enabled by a `-DKokkos_ENABLE_HWLOC=On` flag.
+If so, it calls `find_package(TPLHWLOC)`.
+This invokes the file `FindTPLHWLOC.cmake` which should be contained in the `cmake/Modules` folder.
+If successful, another function `KOKKOS_EXPORT_CMAKE_TPL` gets invoked.
+This automatically adds all the necessary import commands to `KokkosConfig.cmake`.
+
+##### KOKKOS_FIND_IMPORTED
+Inside a `FindTPLX.cmake` file, the simplest way to import a library is to call, e.g.
+````
+KOKKOS_FIND_IMPORTED(HWLOC LIBRARY hwloc HEADER hwloc.h)
+````
+This finds the location of the library and header and creates an imported target `Kokkos::HWLOC`
+that can be linked against.
+The library/header find can be guided with `-DHWLOC_ROOT=` or `-DKokkos_HWLOC_DIR=` during CMake configure.
+These both specify the install prefix.
+
+##### KOKKOS_LINK_TPL
+This function checks if the TPL has been enabled.
+If so, it links a given library against the imported (or interface) TPL target.
+
+##### KOKKOS_CREATE_IMPORTED_TPL
+This helper function is best understood by reading the actual code.
+This function takes arguments specifying the properties and creates the actual TPL target.
+The most important thing to understand for this function is whether you call this function with the optional `INTERFACE` keyword.
+This tells the project to either create the target as an imported target or interface target, as discussed above.
+
+##### KOKKOS_EXPORT_CMAKE_TPL
+Even if the TPL just loads a valid CMake target, we still must "export" it into the config file.
+When Kokkos is loaded by a downstream project, this TPL must be loaded.
+Calling this function simply appends text recording the location where the TPL was found
+and adding a `find_dependency(...)` call that will reload the CMake target.
+
+### The Great TriBITS Compromise
+
+TriBITS was a masterpiece of CMake version 2 before the modern CMake idioms of building and using.
+TriBITS greatly limited verbosity of CMake files, handled complicated dependency trees between packages, and handled automatically setting up include and linker paths for dependent libraries.
+
+Kokkos is now used by numerous projects that don't (and won't) depend on TriBITS for their build systems.
+Kokkos has to work outside of TriBITS and provide a standard CMake 3+ build system.
+At the same time, Kokkos is used by numerous projects that depend on TriBITS and don't (and won't) switch to a standard CMake 3+ build system.
+
+Instead of calling functions `TRIBITS_X(...)`, the CMake calls wrapper functions `KOKKOS_X(...)`.
+If TriBITS is available (as in Trilinos), `KOKKOS_X` will just be a thin wrapper around `TRIBITS_X`.
+If TriBITS is not available, Kokkos maps `KOKKOS_X` calls to native CMake that complies with CMake 3 idioms.
+For the time being, this seems the most sensible way to handle the competing requirements of a standalone modern CMake and TriBITS build system.
+
+##### [LICENSE](https://github.com/kokkos/kokkos/blob/devel/LICENSE)
+
+[![License](https://img.shields.io/badge/License-BSD%203--Clause-blue.svg)](https://opensource.org/licenses/BSD-3-Clause)
+
+Under the terms of Contract DE-NA0003525 with NTESS,
+the U.S. Government retains certain rights in this software.
diff --git a/lib/kokkos/cmake/compile_tests/clang_omp.cpp b/lib/kokkos/cmake/compile_tests/clang_omp.cpp
new file mode 100644
index 0000000000..ce3bbfb262
--- /dev/null
+++ b/lib/kokkos/cmake/compile_tests/clang_omp.cpp
@@ -0,0 +1,9 @@
+#include <omp.h>
+
+int main(int argc, char** argv) {
+  int thr = omp_get_num_threads();
+  if (thr > 0)
+    return thr;
+  else
+    return 0;
+}
diff --git a/lib/kokkos/cmake/compile_tests/pthread.cpp b/lib/kokkos/cmake/compile_tests/pthread.cpp
new file mode 100644
index 0000000000..3b13f7ba35
--- /dev/null
+++ b/lib/kokkos/cmake/compile_tests/pthread.cpp
@@ -0,0 +1,10 @@
+#include <pthread.h>
+
+void* kokkos_test(void* args) { return args; }
+
+int main(void) {
+  pthread_t thread;
+  pthread_create(&thread, NULL, kokkos_test, NULL);
+  pthread_join(thread, NULL);
+  return 0;
+}
diff --git a/lib/kokkos/cmake/cray.cmake b/lib/kokkos/cmake/cray.cmake
new file mode 100644
index 0000000000..08912f5130
--- /dev/null
+++ b/lib/kokkos/cmake/cray.cmake
@@ -0,0 +1,9 @@
+
+
+function(kokkos_set_cray_flags full_standard int_standard)
+  STRING(TOLOWER ${full_standard} FULL_LC_STANDARD)
+  STRING(TOLOWER ${int_standard} INT_LC_STANDARD)
+  SET(KOKKOS_CXX_STANDARD_FLAG "-hstd=c++${FULL_LC_STANDARD}", PARENT_SCOPE)
+  SET(KOKKOS_CXX_INTERMDIATE_STANDARD_FLAG "-hstd=c++${INT_LC_STANDARD}" PARENT_SCOPE)
+endfunction()
+
diff --git a/lib/kokkos/cmake/deps/CUDA.cmake b/lib/kokkos/cmake/deps/CUDA.cmake
index 801c20067b..4876bca259 100644
--- a/lib/kokkos/cmake/deps/CUDA.cmake
+++ b/lib/kokkos/cmake/deps/CUDA.cmake
@@ -73,7 +73,7 @@ IF(NOT _CUDA_FAILURE)
   GLOBAL_SET(TPL_CUDA_LIBRARY_DIRS)
   GLOBAL_SET(TPL_CUDA_INCLUDE_DIRS ${CUDA_TOOLKIT_INCLUDE})
   GLOBAL_SET(TPL_CUDA_LIBRARIES ${CUDA_CUDART_LIBRARY} ${CUDA_cublas_LIBRARY} ${CUDA_cufft_LIBRARY})
-  TIBITS_CREATE_IMPORTED_TPL_LIBRARY(CUSPARSE)
+  KOKKOS_CREATE_IMPORTED_TPL_LIBRARY(CUSPARSE)
 ELSE()
   SET(TPL_ENABLE_CUDA OFF)
 ENDIF()
diff --git a/lib/kokkos/cmake/deps/CUSPARSE.cmake b/lib/kokkos/cmake/deps/CUSPARSE.cmake
index 6f26d857c0..b2420d1168 100644
--- a/lib/kokkos/cmake/deps/CUSPARSE.cmake
+++ b/lib/kokkos/cmake/deps/CUSPARSE.cmake
@@ -59,6 +59,6 @@
 #  GLOBAL_SET(TPL_CUSPARSE_LIBRARY_DIRS)
 #  GLOBAL_SET(TPL_CUSPARSE_INCLUDE_DIRS ${TPL_CUDA_INCLUDE_DIRS})
 #  GLOBAL_SET(TPL_CUSPARSE_LIBRARIES    ${CUDA_cusparse_LIBRARY})
-#  TIBITS_CREATE_IMPORTED_TPL_LIBRARY(CUSPARSE)
+#  KOKKOS_CREATE_IMPORTED_TPL_LIBRARY(CUSPARSE)
 #ENDIF()
 
diff --git a/lib/kokkos/cmake/deps/HWLOC.cmake b/lib/kokkos/cmake/deps/HWLOC.cmake
index 275abd3a5d..ed89c8c1e5 100644
--- a/lib/kokkos/cmake/deps/HWLOC.cmake
+++ b/lib/kokkos/cmake/deps/HWLOC.cmake
@@ -64,7 +64,7 @@
 #    Version:       1.3
 #
 
-TRIBITS_TPL_FIND_INCLUDE_DIRS_AND_LIBRARIES( HWLOC
+KOKKOS_TPL_FIND_INCLUDE_DIRS_AND_LIBRARIES( HWLOC
   REQUIRED_HEADERS hwloc.h
   REQUIRED_LIBS_NAMES "hwloc"
   )
diff --git a/lib/kokkos/cmake/deps/Pthread.cmake b/lib/kokkos/cmake/deps/Pthread.cmake
index 46d0a939ca..5f835fc300 100644
--- a/lib/kokkos/cmake/deps/Pthread.cmake
+++ b/lib/kokkos/cmake/deps/Pthread.cmake
@@ -74,9 +74,9 @@ IF(USE_THREADS)
   SET(TPL_Pthread_INCLUDE_DIRS "")
   SET(TPL_Pthread_LIBRARIES "${CMAKE_THREAD_LIBS_INIT}")
   SET(TPL_Pthread_LIBRARY_DIRS "")
-  TIBITS_CREATE_IMPORTED_TPL_LIBRARY(Pthread)
+  KOKKOS_CREATE_IMPORTED_TPL_LIBRARY(Pthread)
 ELSE()
-  TRIBITS_TPL_FIND_INCLUDE_DIRS_AND_LIBRARIES( Pthread
+  KOKKOS_TPL_FIND_INCLUDE_DIRS_AND_LIBRARIES( Pthread
     REQUIRED_HEADERS pthread.h
     REQUIRED_LIBS_NAMES pthread
       )
diff --git a/lib/kokkos/cmake/deps/QTHREADS.cmake b/lib/kokkos/cmake/deps/QTHREADS.cmake
deleted file mode 100644
index c312f2590b..0000000000
--- a/lib/kokkos/cmake/deps/QTHREADS.cmake
+++ /dev/null
@@ -1,69 +0,0 @@
-# @HEADER
-# ************************************************************************
-#
-#            Trilinos: An Object-Oriented Solver Framework
-#                 Copyright (2001) Sandia Corporation
-#
-#
-# Copyright (2001) Sandia Corporation. Under the terms of Contract
-# DE-AC04-94AL85000, there is a non-exclusive license for use of this
-# work by or on behalf of the U.S. Government.  Export of this program
-# may require a license from the United States Government.
-#
-# 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 Corporation nor the names of the
-# contributors may be used to endorse or promote products derived from
-# this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "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 SANDIA CORPORATION OR THE
-# 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:  The United States Government is granted for itself and others
-# acting on its behalf a paid-up, nonexclusive, irrevocable worldwide
-# license in this data to reproduce, prepare derivative works, and
-# perform publicly and display publicly.  Beginning five (5) years from
-# July 25, 2001, the United States Government is granted for itself and
-# others acting on its behalf a paid-up, nonexclusive, irrevocable
-# worldwide license in this data to reproduce, prepare derivative works,
-# distribute copies to the public, perform publicly and display
-# publicly, and to permit others to do so.
-#
-# NEITHER THE UNITED STATES GOVERNMENT, NOR THE UNITED STATES DEPARTMENT
-# OF ENERGY, NOR SANDIA CORPORATION, NOR ANY OF THEIR EMPLOYEES, MAKES
-# ANY WARRANTY, EXPRESS OR IMPLIED, OR ASSUMES ANY LEGAL LIABILITY OR
-# RESPONSIBILITY FOR THE ACCURACY, COMPLETENESS, OR USEFULNESS OF ANY
-# INFORMATION, APPARATUS, PRODUCT, OR PROCESS DISCLOSED, OR REPRESENTS
-# THAT ITS USE WOULD NOT INFRINGE PRIVATELY OWNED RIGHTS.
-#
-# ************************************************************************
-# @HEADER
-
-
-#-----------------------------------------------------------------------------
-#  Hardware locality detection and control library.
-#
-#  Acquisition information:
-#    Date checked:  July 2014
-#    Checked by:    H. Carter Edwards <hcedwar AT sandia.gov>
-#    Source:        https://code.google.com/p/qthreads
-#
-
-TRIBITS_TPL_FIND_INCLUDE_DIRS_AND_LIBRARIES( QTHREADS
-  REQUIRED_HEADERS qthread.h
-  REQUIRED_LIBS_NAMES "qthread"
-  )
diff --git a/lib/kokkos/cmake/fake_tribits.cmake b/lib/kokkos/cmake/fake_tribits.cmake
new file mode 100644
index 0000000000..26948d2cfb
--- /dev/null
+++ b/lib/kokkos/cmake/fake_tribits.cmake
@@ -0,0 +1,338 @@
+#These are tribits wrappers used by all projects in the Kokkos ecosystem
+
+INCLUDE(CMakeParseArguments)
+INCLUDE(CTest)
+
+cmake_policy(SET CMP0054 NEW)
+
+FUNCTION(ASSERT_DEFINED VARS)
+  FOREACH(VAR ${VARS})
+    IF(NOT DEFINED ${VAR})
+      MESSAGE(SEND_ERROR "Error, the variable ${VAR} is not defined!")
+    ENDIF()
+  ENDFOREACH()
+ENDFUNCTION()
+
+MACRO(KOKKOS_ADD_OPTION_AND_DEFINE USER_OPTION_NAME MACRO_DEFINE_NAME DOCSTRING DEFAULT_VALUE )
+SET( ${USER_OPTION_NAME} "${DEFAULT_VALUE}" CACHE BOOL "${DOCSTRING}" )
+IF(NOT ${MACRO_DEFINE_NAME} STREQUAL "")
+  IF(${USER_OPTION_NAME})
+    GLOBAL_SET(${MACRO_DEFINE_NAME} ON)
+  ELSE()
+    GLOBAL_SET(${MACRO_DEFINE_NAME} OFF)
+  ENDIF()
+ENDIF()
+ENDMACRO()
+
+MACRO(GLOBAL_RESET VARNAME)
+  SET(${VARNAME} "" CACHE INTERNAL "" FORCE)
+ENDMACRO()
+
+MACRO(GLOBAL_OVERWRITE VARNAME VALUE TYPE)
+  SET(${VARNAME} ${VALUE} CACHE ${TYPE} "" FORCE)
+ENDMACRO()
+
+IF (NOT KOKKOS_HAS_TRILINOS)
+MACRO(APPEND_GLOB VAR)
+  FILE(GLOB LOCAL_TMP_VAR ${ARGN})
+  LIST(APPEND ${VAR} ${LOCAL_TMP_VAR})
+ENDMACRO()
+
+MACRO(GLOBAL_SET VARNAME)
+  SET(${VARNAME} ${ARGN} CACHE INTERNAL "" FORCE)
+ENDMACRO()
+
+FUNCTION(VERIFY_EMPTY CONTEXT)
+if(${ARGN})
+MESSAGE(FATAL_ERROR "Kokkos does not support all of Tribits. Unhandled arguments in ${CONTEXT}:\n${ARGN}")
+endif()
+ENDFUNCTION()
+
+MACRO(PREPEND_GLOBAL_SET VARNAME)
+  ASSERT_DEFINED(${VARNAME})
+  GLOBAL_SET(${VARNAME} ${ARGN} ${${VARNAME}})
+ENDMACRO()
+
+MACRO(PREPEND_TARGET_SET VARNAME TARGET_NAME TYPE)
+  IF(TYPE STREQUAL "REQUIRED")
+    SET(REQUIRED TRUE)
+  ELSE()
+    SET(REQUIRED FALSE)
+  ENDIF()
+  IF(TARGET ${TARGET_NAME})
+    PREPEND_GLOBAL_SET(${VARNAME} ${TARGET_NAME})
+  ELSE()
+    IF(REQUIRED)
+      MESSAGE(FATAL_ERROR "Missing dependency ${TARGET_NAME}")
+    ENDIF()
+  ENDIF()
+ENDMACRO()
+endif()
+
+
+FUNCTION(KOKKOS_CONFIGURE_FILE  PACKAGE_NAME_CONFIG_FILE)
+  if (KOKKOS_HAS_TRILINOS)
+    TRIBITS_CONFIGURE_FILE(${PACKAGE_NAME_CONFIG_FILE})
+  else()
+    # Configure the file
+    CONFIGURE_FILE(
+      ${PACKAGE_SOURCE_DIR}/cmake/${PACKAGE_NAME_CONFIG_FILE}.in
+      ${CMAKE_CURRENT_BINARY_DIR}/${PACKAGE_NAME_CONFIG_FILE}
+      )
+  endif()
+ENDFUNCTION()
+
+MACRO(ADD_INTERFACE_LIBRARY LIB_NAME)
+  FILE(WRITE ${CMAKE_CURRENT_BINARY_DIR}/dummy.cpp "")
+  ADD_LIBRARY(${LIB_NAME} STATIC ${CMAKE_CURRENT_BINARY_DIR}/dummy.cpp)
+  SET_TARGET_PROPERTIES(${LIB_NAME} PROPERTIES INTERFACE TRUE)
+ENDMACRO()
+
+IF(NOT TARGET check)
+  ADD_CUSTOM_TARGET(check COMMAND ${CMAKE_CTEST_COMMAND} -VV -C ${CMAKE_CFG_INTDIR})
+ENDIF()
+
+FUNCTION(KOKKOS_ADD_TEST)
+  if (KOKKOS_HAS_TRILINOS)
+    CMAKE_PARSE_ARGUMENTS(TEST 
+      ""
+      "EXE;NAME"
+      ""
+      ${ARGN})
+    IF(TEST_EXE)
+      SET(EXE_ROOT ${TEST_EXE})
+    ELSE()
+      SET(EXE_ROOT ${TEST_NAME})
+    ENDIF()
+
+    TRIBITS_ADD_TEST(
+      ${EXE_ROOT}
+      NAME ${TEST_NAME}
+      ${ARGN} 
+      COMM serial mpi
+      NUM_MPI_PROCS 1
+      ${TEST_UNPARSED_ARGUMENTS}
+    )
+  else()
+    CMAKE_PARSE_ARGUMENTS(TEST 
+      "WILL_FAIL"
+      "FAIL_REGULAR_EXPRESSION;PASS_REGULAR_EXPRESSION;EXE;NAME"
+      "CATEGORIES;CMD_ARGS"
+      ${ARGN})
+    IF(TEST_EXE)
+      SET(EXE ${TEST_EXE})
+    ELSE()
+      SET(EXE ${TEST_NAME})
+    ENDIF()
+    IF(WIN32)
+      ADD_TEST(NAME ${TEST_NAME} WORKING_DIRECTORY ${LIBRARY_OUTPUT_PATH} COMMAND ${EXE}${CMAKE_EXECUTABLE_SUFFIX} ${TEST_CMD_ARGS})
+    ELSE()
+      ADD_TEST(NAME ${TEST_NAME} COMMAND ${EXE} ${TEST_CMD_ARGS})
+    ENDIF()
+    IF(TEST_WILL_FAIL)
+      SET_TESTS_PROPERTIES(${TEST_NAME} PROPERTIES WILL_FAIL ${TEST_WILL_FAIL})
+    ENDIF()
+    IF(TEST_FAIL_REGULAR_EXPRESSION)
+      SET_TESTS_PROPERTIES(${TEST_NAME} PROPERTIES FAIL_REGULAR_EXPRESSION ${TEST_FAIL_REGULAR_EXPRESSION})
+    ENDIF()
+    IF(TEST_PASS_REGULAR_EXPRESSION)
+      SET_TESTS_PROPERTIES(${TEST_NAME} PROPERTIES PASS_REGULAR_EXPRESSION ${TEST_PASS_REGULAR_EXPRESSION})
+    ENDIF()
+    VERIFY_EMPTY(KOKKOS_ADD_TEST ${TEST_UNPARSED_ARGUMENTS})
+  endif()
+ENDFUNCTION()
+
+FUNCTION(KOKKOS_ADD_ADVANCED_TEST)
+  if (KOKKOS_HAS_TRILINOS)
+    TRIBITS_ADD_ADVANCED_TEST(${ARGN})
+  else()
+    # TODO Write this
+  endif()
+ENDFUNCTION()
+
+MACRO(KOKKOS_CREATE_IMPORTED_TPL_LIBRARY TPL_NAME)
+  ADD_INTERFACE_LIBRARY(TPL_LIB_${TPL_NAME})
+  TARGET_LINK_LIBRARIES(TPL_LIB_${TPL_NAME} LINK_PUBLIC ${TPL_${TPL_NAME}_LIBRARIES})
+  TARGET_INCLUDE_DIRECTORIES(TPL_LIB_${TPL_NAME} INTERFACE ${TPL_${TPL_NAME}_INCLUDE_DIRS})
+ENDMACRO()
+
+FUNCTION(KOKKOS_TPL_FIND_INCLUDE_DIRS_AND_LIBRARIES TPL_NAME)
+  if (KOKKOS_HAS_TRILINOS)
+    TRIBITS_TPL_FIND_INCLUDE_DIRS_AND_LIBRARIES(${TPL_NAME} ${ARGN})
+  else()
+    CMAKE_PARSE_ARGUMENTS(PARSE 
+      ""
+      ""
+      "REQUIRED_HEADERS;REQUIRED_LIBS_NAMES"
+      ${ARGN})
+
+    SET(_${TPL_NAME}_ENABLE_SUCCESS TRUE)
+    IF (PARSE_REQUIRED_LIBS_NAMES)
+      FIND_LIBRARY(TPL_${TPL_NAME}_LIBRARIES NAMES ${PARSE_REQUIRED_LIBS_NAMES})
+      IF(NOT TPL_${TPL_NAME}_LIBRARIES)
+        SET(_${TPL_NAME}_ENABLE_SUCCESS FALSE)
+      ENDIF()
+    ENDIF()
+    IF (PARSE_REQUIRED_HEADERS)
+      FIND_PATH(TPL_${TPL_NAME}_INCLUDE_DIRS NAMES ${PARSE_REQUIRED_HEADERS})
+      IF(NOT TPL_${TPL_NAME}_INCLUDE_DIRS)
+        SET(_${TPL_NAME}_ENABLE_SUCCESS FALSE)
+      ENDIF()
+    ENDIF()
+    IF (_${TPL_NAME}_ENABLE_SUCCESS)
+      KOKKOS_CREATE_IMPORTED_TPL_LIBRARY(${TPL_NAME})
+    ENDIF()
+    VERIFY_EMPTY(KOKKOS_CREATE_IMPORTED_TPL_LIBRARY ${PARSE_UNPARSED_ARGUMENTS})
+  endif()
+ENDFUNCTION()
+
+MACRO(KOKKOS_TARGET_COMPILE_OPTIONS TARGET)
+if(KOKKOS_HAS_TRILINOS)
+  TARGET_COMPILE_OPTIONS(${TARGET} ${ARGN})
+else()
+  TARGET_COMPILE_OPTIONS(${TARGET} ${ARGN})
+endif()
+ENDMACRO()
+
+
+MACRO(KOKKOS_EXCLUDE_AUTOTOOLS_FILES)
+  if (KOKKOS_HAS_TRILINOS)
+    TRIBITS_EXCLUDE_AUTOTOOLS_FILES()
+  else()
+    #do nothing
+  endif()
+ENDMACRO()
+
+FUNCTION(KOKKOS_LIB_TYPE LIB RET)
+GET_TARGET_PROPERTY(PROP ${LIB} TYPE)
+IF (${PROP} STREQUAL "INTERFACE_LIBRARY")
+  SET(${RET} "INTERFACE" PARENT_SCOPE)
+ELSE()
+  SET(${RET} "PUBLIC" PARENT_SCOPE)
+ENDIF()
+ENDFUNCTION()
+
+FUNCTION(KOKKOS_TARGET_INCLUDE_DIRECTORIES TARGET)
+IF(KOKKOS_HAS_TRILINOS)
+  KOKKOS_LIB_TYPE(${TARGET} INCTYPE) 
+  #don't trust tribits to do this correctly - but need to add package name
+  TARGET_INCLUDE_DIRECTORIES(${TARGET} ${INCTYPE} ${ARGN})
+ELSEIF(TARGET ${TARGET}) 
+  #the target actually exists - this means we are doing separate libs
+  #or this a test library
+  KOKKOS_LIB_TYPE(${TARGET} INCTYPE) 
+  TARGET_INCLUDE_DIRECTORIES(${TARGET} ${INCTYPE} ${ARGN})
+ELSE()
+  GET_PROPERTY(LIBS GLOBAL PROPERTY KOKKOS_LIBRARIES_NAMES)
+  IF (${TARGET} IN_LIST LIBS)
+     SET_PROPERTY(GLOBAL APPEND PROPERTY KOKKOS_LIBRARY_INCLUDES ${ARGN})
+  ELSE()
+    MESSAGE(FATAL_ERROR "Trying to set include directories on unknown target ${TARGET}")
+  ENDIF()
+ENDIF()
+ENDFUNCTION()
+
+FUNCTION(KOKKOS_LINK_INTERNAL_LIBRARY TARGET DEPLIB)
+IF(KOKKOS_HAS_TRILINOS)
+  #do nothing
+ELSE()
+  SET(options INTERFACE)
+  SET(oneValueArgs)
+  SET(multiValueArgs)
+  CMAKE_PARSE_ARGUMENTS(PARSE 
+    "INTERFACE"
+    ""
+    ""
+    ${ARGN})
+  SET(LINK_TYPE)
+  IF(PARSE_INTERFACE)
+    SET(LINK_TYPE INTERFACE)
+  ELSE()
+    SET(LINK_TYPE PUBLIC)
+  ENDIF()
+  TARGET_LINK_LIBRARIES(${TARGET} ${LINK_TYPE} ${DEPLIB})
+  VERIFY_EMPTY(KOKKOS_LINK_INTERNAL_LIBRARY ${PARSE_UNPARSED_ARGUMENTS})
+ENDIF()
+ENDFUNCTION()
+
+FUNCTION(KOKKOS_ADD_TEST_LIBRARY NAME)
+IF (KOKKOS_HAS_TRILINOS)
+  TRIBITS_ADD_LIBRARY(${NAME} ${ARGN} TESTONLY
+   ADDED_LIB_TARGET_NAME_OUT ${NAME}
+  )
+ELSE()
+  SET(oneValueArgs)
+  SET(multiValueArgs HEADERS SOURCES)
+
+  CMAKE_PARSE_ARGUMENTS(PARSE 
+    "STATIC;SHARED"
+    ""
+    "HEADERS;SOURCES"
+    ${ARGN})
+
+  IF(PARSE_HEADERS)
+    LIST(REMOVE_DUPLICATES PARSE_HEADERS)
+  ENDIF()
+  IF(PARSE_SOURCES)
+    LIST(REMOVE_DUPLICATES PARSE_SOURCES)
+  ENDIF()
+  ADD_LIBRARY(${NAME} ${PARSE_SOURCES})
+  target_link_libraries(
+    ${NAME}
+    PUBLIC kokkos
+  )
+ENDIF()
+ENDFUNCTION()
+
+
+FUNCTION(KOKKOS_TARGET_COMPILE_DEFINITIONS)
+  IF (KOKKOS_HAS_TRILINOS)
+    TARGET_COMPILE_DEFINITIONS(${TARGET} ${ARGN})
+  ELSE()
+    TARGET_COMPILE_DEFINITIONS(${TARGET} ${ARGN})
+  ENDIF()
+ENDFUNCTION()
+
+FUNCTION(KOKKOS_INCLUDE_DIRECTORIES)
+IF(KOKKOS_HAS_TRILINOS)
+  TRIBITS_INCLUDE_DIRECTORIES(${ARGN})
+ELSE()
+  CMAKE_PARSE_ARGUMENTS(
+    INC
+    "REQUIRED_DURING_INSTALLATION_TESTING"
+    ""
+    ""
+    ${ARGN}
+  )
+  INCLUDE_DIRECTORIES(${INC_UNPARSED_ARGUMENTS})
+ENDIF()
+ENDFUNCTION()
+
+
+MACRO(KOKKOS_ADD_COMPILE_OPTIONS)
+ADD_COMPILE_OPTIONS(${ARGN})
+ENDMACRO()
+
+MACRO(PRINTALL match)
+get_cmake_property(_variableNames VARIABLES)
+list (SORT _variableNames)
+foreach (_variableName ${_variableNames})
+  if("${_variableName}" MATCHES "${match}")
+    message(STATUS "${_variableName}=${${_variableName}}")
+  endif()
+endforeach()
+ENDMACRO()
+
+MACRO(SET_GLOBAL_REPLACE SUBSTR VARNAME)
+  STRING(REPLACE ${SUBSTR} ${${VARNAME}} TEMP)
+  GLOBAL_SET(${VARNAME} ${TEMP})
+ENDMACRO()
+
+FUNCTION(GLOBAL_APPEND VARNAME)
+  #We make this a function since we are setting variables
+  #and want to use scope to avoid overwriting local variables
+  SET(TEMP ${${VARNAME}})
+  LIST(APPEND TEMP ${ARGN})
+  GLOBAL_SET(${VARNAME} ${TEMP})
+ENDFUNCTION()
+
diff --git a/lib/kokkos/cmake/gnu.cmake b/lib/kokkos/cmake/gnu.cmake
new file mode 100644
index 0000000000..aa11fe87b1
--- /dev/null
+++ b/lib/kokkos/cmake/gnu.cmake
@@ -0,0 +1,23 @@
+
+FUNCTION(kokkos_set_gnu_flags full_standard int_standard)
+  STRING(TOLOWER ${full_standard} FULL_LC_STANDARD)
+  STRING(TOLOWER ${int_standard} INT_LC_STANDARD)
+  # The following three blocks of code were copied from
+  # /Modules/Compiler/Intel-CXX.cmake from CMake 3.7.2 and then modified.
+  IF(CMAKE_CXX_SIMULATE_ID STREQUAL MSVC)
+    SET(_std -Qstd)
+    SET(_ext c++)
+  ELSE()
+    SET(_std -std)
+    SET(_ext gnu++)
+  ENDIF()
+
+  IF (CMAKE_CXX_EXTENSIONS)
+    SET(KOKKOS_CXX_STANDARD_FLAG "-std=gnu++${FULL_LC_STANDARD}" PARENT_SCOPE)
+    SET(KOKKOS_CXX_INTERMEDIATE_STANDARD_FLAG "-std=gnu++${INT_LC_STANDARD}" PARENT_SCOPE)
+  ELSE()
+    SET(KOKKOS_CXX_STANDARD_FLAG "-std=c++${FULL_LC_STANDARD}" PARENT_SCOPE)
+    SET(KOKKOS_CXX_INTERMEDIATE_STANDARD_FLAG "-std=c++${INT_LC_STANDARD}" PARENT_SCOPE)
+  ENDIF()
+ENDFUNCTION()
+
diff --git a/lib/kokkos/cmake/intel.cmake b/lib/kokkos/cmake/intel.cmake
new file mode 100644
index 0000000000..f36f01d8ca
--- /dev/null
+++ b/lib/kokkos/cmake/intel.cmake
@@ -0,0 +1,30 @@
+
+FUNCTION(kokkos_set_intel_flags full_standard int_standard)
+  STRING(TOLOWER ${full_standard} FULL_LC_STANDARD)
+  STRING(TOLOWER ${int_standard} INT_LC_STANDARD)
+  # The following three blocks of code were copied from
+  # /Modules/Compiler/Intel-CXX.cmake from CMake 3.7.2 and then modified.
+  IF(CMAKE_CXX_SIMULATE_ID STREQUAL MSVC)
+    SET(_std -Qstd)
+    SET(_ext c++)
+  ELSE()
+    SET(_std -std)
+    SET(_ext gnu++)
+  ENDIF()
+
+  IF(NOT KOKKOS_CXX_STANDARD STREQUAL 11 AND NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 15.0.2)
+    #There is no gnu++14 value supported; figure out what to do.
+    SET(KOKKOS_CXX_STANDARD_FLAG "${_std}=c++${FULL_LC_STANDARD}" PARENT_SCOPE)
+    SET(KOKKOS_CXX_INTERMEDIATE_STANDARD_FLAG "${_std}=c++${INT_LC_STANDARD}" PARENT_SCOPE)
+  ELSEIF(KOKKOS_CXX_STANDARD STREQUAL 11 AND NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 13.0)
+    IF (CMAKE_CXX_EXTENSIONS)
+      SET(KOKKOS_CXX_STANDARD_FLAG "${_std}=${_ext}c++11" PARENT_SCOPE)
+    ELSE()
+      SET(KOKKOS_CXX_STANDARD_FLAG "${_std}=c++11" PARENT_SCOPE)
+    ENDIF()
+  ELSE()
+    MESSAGE(FATAL_ERROR "Intel compiler version too low - need 13.0 for C++11 and 15.0 for C++14")
+  ENDIF()
+
+ENDFUNCTION()
+
diff --git a/lib/kokkos/cmake/kokkos_arch.cmake b/lib/kokkos/cmake/kokkos_arch.cmake
new file mode 100644
index 0000000000..c33247c955
--- /dev/null
+++ b/lib/kokkos/cmake/kokkos_arch.cmake
@@ -0,0 +1,438 @@
+
+FUNCTION(KOKKOS_ARCH_OPTION SUFFIX DEV_TYPE DESCRIPTION)
+  #all optimizations off by default
+  KOKKOS_OPTION(ARCH_${SUFFIX} OFF BOOL "Optimize for ${DESCRIPTION} (${DEV_TYPE})")
+  IF (KOKKOS_ARCH_${SUFFIX})
+    LIST(APPEND KOKKOS_ENABLED_ARCH_LIST ${SUFFIX})
+    SET(KOKKOS_ENABLED_ARCH_LIST ${KOKKOS_ENABLED_ARCH_LIST} PARENT_SCOPE)
+  ENDIF()
+  SET(KOKKOS_ARCH_${SUFFIX} ${KOKKOS_ARCH_${SUFFIX}} PARENT_SCOPE)
+ENDFUNCTION()
+
+FUNCTION(ARCH_FLAGS)
+  SET(COMPILERS NVIDIA PGI XL DEFAULT Cray Intel Clang AppleClang GNU)
+  CMAKE_PARSE_ARGUMENTS(
+    PARSE
+    "LINK_ONLY;COMPILE_ONLY"
+    ""
+    "${COMPILERS}"
+    ${ARGN})
+
+  SET(COMPILER ${KOKKOS_CXX_COMPILER_ID})
+
+  SET(FLAGS)
+  SET(NEW_COMPILE_OPTIONS)
+  SET(NEW_XCOMPILER_OPTIONS)
+  SET(NEW_LINK_OPTIONS)
+  LIST(APPEND NEW_XCOMPILER_OPTIONS ${KOKKOS_XCOMPILER_OPTIONS})
+  LIST(APPEND NEW_COMPILE_OPTIONS ${KOKKOS_COMPILE_OPTIONS})
+  LIST(APPEND NEW_LINK_OPTIONS ${KOKKOS_LINK_OPTIONS})
+  FOREACH(COMP ${COMPILERS})
+    IF (COMPILER STREQUAL "${COMP}")
+      IF (PARSE_${COMPILER})
+        IF (NOT "${PARSE_${COMPILER}}" STREQUAL "NO-VALUE-SPECIFIED")
+           SET(FLAGS ${PARSE_${COMPILER}})
+        ENDIF()
+      ELSEIF(PARSE_DEFAULT)
+        SET(FLAGS ${PARSE_DEFAULT})
+      ENDIF()
+    ENDIF()
+  ENDFOREACH()
+
+  IF (NOT LINK_ONLY)
+    # The funky logic here is for future handling of argument deduplication
+    # If we naively pass multiple -Xcompiler flags to target_compile_options
+    # -Xcompiler will get deduplicated and break the build
+    IF ("-Xcompiler" IN_LIST FLAGS)
+      LIST(REMOVE_ITEM FLAGS "-Xcompiler")
+      GLOBAL_APPEND(KOKKOS_XCOMPILER_OPTIONS ${FLAGS})
+    ELSE()
+      GLOBAL_APPEND(KOKKOS_COMPILE_OPTIONS ${FLAGS})
+    ENDIF()
+  ENDIF()
+
+  IF (NOT COMPILE_ONLY)
+    GLOBAL_APPEND(KOKKOS_LINK_OPTIONS ${FLAGS})
+  ENDIF()
+ENDFUNCTION()
+
+# Make sure devices and compiler ID are done
+KOKKOS_CFG_DEPENDS(ARCH COMPILER_ID)
+KOKKOS_CFG_DEPENDS(ARCH DEVICES)
+KOKKOS_CFG_DEPENDS(ARCH OPTIONS)
+
+
+#-------------------------------------------------------------------------------
+# List of possible host architectures.
+#-------------------------------------------------------------------------------
+SET(KOKKOS_ARCH_LIST)
+
+
+KOKKOS_DEPRECATED_LIST(ARCH ARCH)
+KOKKOS_ARCH_OPTION(AMDAVX          HOST "AMD chip")
+KOKKOS_ARCH_OPTION(ARMV80          HOST "ARMv8.0 Compatible CPU")
+KOKKOS_ARCH_OPTION(ARMV81          HOST "ARMv8.1 Compatible CPU")
+KOKKOS_ARCH_OPTION(ARMV8_THUNDERX  HOST "ARMv8 Cavium ThunderX CPU")
+KOKKOS_ARCH_OPTION(ARMV8_THUNDERX2 HOST "ARMv8 Cavium ThunderX2 CPU")
+KOKKOS_ARCH_OPTION(WSM             HOST "Intel Westmere CPU")
+KOKKOS_ARCH_OPTION(SNB             HOST "Intel Sandy/Ivy Bridge CPUs")
+KOKKOS_ARCH_OPTION(HSW             HOST "Intel Haswell CPUs")
+KOKKOS_ARCH_OPTION(BDW             HOST "Intel Broadwell Xeon E-class CPUs")
+KOKKOS_ARCH_OPTION(SKX             HOST "Intel Sky Lake Xeon E-class HPC CPUs (AVX512)")
+KOKKOS_ARCH_OPTION(KNC             HOST "Intel Knights Corner Xeon Phi")
+KOKKOS_ARCH_OPTION(KNL             HOST "Intel Knights Landing Xeon Phi")
+KOKKOS_ARCH_OPTION(BGQ             HOST "IBM Blue Gene Q")
+KOKKOS_ARCH_OPTION(POWER7          HOST "IBM POWER7 CPUs")
+KOKKOS_ARCH_OPTION(POWER8          HOST "IBM POWER8 CPUs")
+KOKKOS_ARCH_OPTION(POWER9          HOST "IBM POWER9 CPUs")
+KOKKOS_ARCH_OPTION(KEPLER30        GPU  "NVIDIA Kepler generation CC 3.0")
+KOKKOS_ARCH_OPTION(KEPLER32        GPU  "NVIDIA Kepler generation CC 3.2")
+KOKKOS_ARCH_OPTION(KEPLER35        GPU  "NVIDIA Kepler generation CC 3.5")
+KOKKOS_ARCH_OPTION(KEPLER37        GPU  "NVIDIA Kepler generation CC 3.7")
+KOKKOS_ARCH_OPTION(MAXWELL50       GPU  "NVIDIA Maxwell generation CC 5.0")
+KOKKOS_ARCH_OPTION(MAXWELL52       GPU  "NVIDIA Maxwell generation CC 5.2")
+KOKKOS_ARCH_OPTION(MAXWELL53       GPU  "NVIDIA Maxwell generation CC 5.3")
+KOKKOS_ARCH_OPTION(PASCAL60        GPU  "NVIDIA Pascal generation CC 6.0")
+KOKKOS_ARCH_OPTION(PASCAL61        GPU  "NVIDIA Pascal generation CC 6.1")
+KOKKOS_ARCH_OPTION(VOLTA70         GPU  "NVIDIA Volta generation CC 7.0")
+KOKKOS_ARCH_OPTION(VOLTA72         GPU  "NVIDIA Volta generation CC 7.2")
+KOKKOS_ARCH_OPTION(TURING75        GPU  "NVIDIA Turing generation CC 7.5")
+KOKKOS_ARCH_OPTION(EPYC            HOST "AMD Epyc architecture")
+
+
+IF (KOKKOS_ENABLE_CUDA)
+ #Regardless of version, make sure we define the general architecture name
+ IF (KOKKOS_ARCH_KEPLER30 OR KOKKOS_ARCH_KEPLER32 OR KOKKOS_ARCH_KEPLER35 OR KOKKOS_ARCH_KEPLER37)
+   SET(KOKKOS_ARCH_KEPLER ON)
+ ENDIF()
+ 
+ #Regardless of version, make sure we define the general architecture name
+ IF (KOKKOS_ARCH_MAXWELL50 OR KOKKOS_ARCH_MAXWELL52 OR KOKKOS_ARCH_MAXWELL53)
+   SET(KOKKOS_ARCH_MAXWELL ON)
+ ENDIF()
+
+ #Regardless of version, make sure we define the general architecture name
+ IF (KOKKOS_ARCH_PASCAL60 OR KOKKOS_ARCH_PASCAL61)
+   SET(KOKKOS_ARCH_PASCAL ON)
+ ENDIF()
+
+  #Regardless of version, make sure we define the general architecture name
+  IF (KOKKOS_ARCH_VOLTA70 OR KOKKOS_ARCH_VOLTA72)
+    SET(KOKKOS_ARCH_VOLTA ON)
+  ENDIF()
+ENDIF()
+
+
+
+IF(KOKKOS_ENABLE_COMPILER_WARNINGS)
+  SET(COMMON_WARNINGS
+    "-Wall" "-Wshadow" "-pedantic" 
+    "-Wsign-compare" "-Wtype-limits" "-Wuninitialized")
+
+  SET(GNU_WARNINGS "-Wempty-body" "-Wclobbered" "-Wignored-qualifiers"
+    ${COMMON_WARNINGS})
+
+  ARCH_FLAGS(
+    PGI NO-VALUE-SPECIFIED
+    GNU     ${GNU_WARNINGS}
+    DEFAULT ${COMMON_WARNINGS}
+  )
+ENDIF()
+
+
+#------------------------------- KOKKOS_CUDA_OPTIONS ---------------------------
+GLOBAL_RESET(KOKKOS_CUDA_OPTIONS)
+# Construct the Makefile options
+IF (KOKKOS_ENABLE_CUDA_LAMBDA)
+  IF(KOKKOS_CXX_COMPILER_ID STREQUAL NVIDIA)
+    GLOBAL_APPEND(KOKKOS_CUDA_OPTIONS "-expt-extended-lambda")
+  ENDIF()
+ENDIF()
+
+IF (KOKKOS_ENABLE_CUDA_CONSTEXPR)
+  IF(KOKKOS_CXX_COMPILER_ID STREQUAL NVIDIA)
+    GLOBAL_APPEND(KOKKOS_CUDA_OPTIONS "-expt-relaxed-constexpr")
+  ENDIF()
+ENDIF()
+
+IF (KOKKOS_CXX_COMPILER_ID STREQUAL Clang)
+  SET(CUDA_ARCH_FLAG "--cuda-gpu-arch")
+  GLOBAL_APPEND(KOKKOS_CUDA_OPTIONS -x cuda)
+  IF (KOKKOS_ENABLE_CUDA)
+     SET(KOKKOS_IMPL_CUDA_CLANG_WORKAROUND ON CACHE BOOL "enable CUDA Clang workarounds" FORCE)
+  ENDIF()
+ELSEIF(KOKKOS_CXX_COMPILER_ID STREQUAL NVIDIA)
+  SET(CUDA_ARCH_FLAG "-arch")
+ENDIF()
+
+IF (KOKKOS_CXX_COMPILER_ID STREQUAL NVIDIA)
+  STRING(TOUPPER "${CMAKE_BUILD_TYPE}" _UPPERCASE_CMAKE_BUILD_TYPE)
+  IF (KOKKOS_ENABLE_DEBUG OR _UPPERCASE_CMAKE_BUILD_TYPE STREQUAL "DEBUG")
+    GLOBAL_APPEND(KOKKOS_CUDA_OPTIONS -lineinfo)
+  ENDIF()
+  UNSET(_UPPERCASE_CMAKE_BUILD_TYPE)
+  IF (KOKKOS_CXX_COMPILER_VERSION VERSION_GREATER 9.0 OR KOKKOS_CXX_COMPILER_VERSION VERSION_EQUAL 9.0)
+    GLOBAL_APPEND(KOKKOS_CUDAFE_OPTIONS --diag_suppress=esa_on_defaulted_function_ignored) 
+  ENDIF()
+ENDIF()
+
+IF(KOKKOS_ENABLE_OPENMP)
+  IF (KOKKOS_CXX_COMPILER_ID STREQUAL AppleClang)
+    MESSAGE(FATAL_ERROR "Apple Clang does not support OpenMP. Use native Clang instead")
+  ENDIF()
+  ARCH_FLAGS(
+    Clang      -fopenmp=libomp
+    PGI        -mp
+    NVIDIA     -Xcompiler -fopenmp
+    Cray       NO-VALUE-SPECIFIED
+    XL         -qsmp=omp
+    DEFAULT    -fopenmp 
+  )
+ENDIF()
+
+IF (KOKKOS_ARCH_ARMV80)
+  ARCH_FLAGS(
+    Cray NO-VALUE-SPECIFIED
+    PGI  NO-VALUE-SPECIFIED
+    DEFAULT -march=armv8-a
+  )
+ENDIF()
+
+IF (KOKKOS_ARCH_ARMV81)
+  ARCH_FLAGS(
+    Cray NO-VALUE-SPECIFIED
+    PGI  NO-VALUE-SPECIFIED
+    DEFAULT -march=armv8.1-a
+  )
+ENDIF()
+
+IF (KOKKOS_ARCH_ARMV8_THUNDERX)
+  SET(KOKKOS_ARCH_ARMV80 ON) #Not a cache variable
+  ARCH_FLAGS(
+    Cray NO-VALUE-SPECIFIED
+    PGI  NO-VALUE-SPECIFIED
+    DEFAULT -march=armv8-a -mtune=thunderx
+  )
+ENDIF()
+
+IF (KOKKOS_ARCH_ARMV8_THUNDERX2)
+  SET(KOKKOS_ARCH_ARMV81 ON) #Not a cache variable
+  ARCH_FLAGS(
+    Cray NO-VALUE-SPECIFIED
+    PGI  NO-VALUE-SPECIFIED
+    DEFAULT -mcpu=thunderx2t99 -mtune=thunderx2t99
+  )
+ENDIF()
+
+IF (KOKKOS_ARCH_EPYC)
+  ARCH_FLAGS(
+    Intel   -mavx2
+    DEFAULT -march=znver1 -mtune=znver1
+  )
+  SET(KOKKOS_ARCH_AMD_EPYC ON)
+  SET(KOKKOS_ARCH_AMD_AVX2 ON)
+ENDIF()
+
+IF (KOKKOS_ARCH_WSM)
+  ARCH_FLAGS(
+    Intel   -xSSE4.2
+    PGI     -tp=nehalem
+    Cray    NO-VALUE-SPECIFIED
+    DEFAULT -msse4.2
+  )
+  SET(KOKKOS_ARCH_SSE42 ON)
+ENDIF()
+
+IF (KOKKOS_ARCH_SNB OR KOKKOS_ARCH_AMDAVX)
+  SET(KOKKOS_ARCH_AVX ON)
+  ARCH_FLAGS(
+    Intel   -mavx
+    PGI     -tp=sandybridge
+    Cray    NO-VALUE-SPECIFIED
+    DEFAULT -mavx
+  )
+ENDIF()
+
+IF (KOKKOS_ARCH_HSW)
+  SET(KOKKOS_ARCH_AVX2 ON)
+  ARCH_FLAGS(
+    Intel   -xCORE-AVX2
+    PGI     -tp=haswell
+    Cray    NO-VALUE-SPECIFIED
+    DEFAULT -march=core-avx2 -mtune=core-avx2
+  )
+ENDIF()
+
+IF (KOKKOS_ARCH_BDW)
+  SET(KOKKOS_ARCH_AVX2 ON)
+  ARCH_FLAGS(
+    Intel   -xCORE-AVX2
+    PGI     -tp=haswell
+    Cray    NO-VALUE-SPECIFIED
+    DEFAULT -march=core-avx2 -mtune=core-avx2 -mrtm
+  )
+ENDIF()
+
+IF (KOKKOS_ARCH_EPYC)
+  SET(KOKKOS_ARCH_AMD_AVX2 ON)
+  ARCH_FLAGS(
+    Intel   -mvax2
+    DEFAULT  -march=znver1 -mtune=znver1
+  )
+ENDIF()
+
+IF (KOKKOS_ARCH_KNL)
+  #avx512-mic
+  SET(KOKKOS_ARCH_AVX512MIC ON) #not a cache variable
+  ARCH_FLAGS(
+    Intel   -xMIC-AVX512
+    PGI     NO-VALUE-SPECIFIED
+    Cray    NO-VALUE-SPECIFIED
+    DEFAULT -march=knl -mtune=knl
+  )
+ENDIF()
+
+IF (KOKKOS_ARCH_KNC)
+  SET(KOKKOS_USE_ISA_KNC ON)
+  ARCH_FLAGS(
+    DEFAULT -mmic
+  )
+ENDIF()
+
+IF (KOKKOS_ARCH_SKX)
+  #avx512-xeon
+  SET(KOKKOS_ARCH_AVX512XEON ON)
+  ARCH_FLAGS(
+    Intel   -xCORE-AVX512
+    PGI     NO-VALUE-SPECIFIED
+    Cray    NO-VALUE-SPECIFIED
+    DEFAULT -march=skylake-avx512 -mtune=skylake-avx512 -mrtm
+  )
+ENDIF()
+
+IF (KOKKOS_ARCH_WSM OR KOKKOS_ARCH_SNB OR KOKKOS_ARCH_HSW OR KOKKOS_ARCH_BDW OR KOKKOS_ARCH_KNL OR KOKKOS_ARCH_SKX OR KOKKOS_ARCH_EPYC)
+  SET(KOKKOS_USE_ISA_X86_64 ON)
+ENDIF()
+
+IF (KOKKOS_ARCH_BDW OR KOKKOS_ARCH_SKX)
+  SET(KOKKOS_ENABLE_TM ON) #not a cache variable
+ENDIF()
+
+IF (KOKKOS_ARCH_POWER7)
+  ARCH_FLAGS(
+    PGI     NO-VALUE-SPECIFIED
+    DEFAULT -mcpu=power7 -mtune=power7
+  )
+  SET(KOKKOS_USE_ISA_POWERPCBE ON)
+ENDIF()
+
+IF (KOKKOS_ARCH_POWER8)
+  ARCH_FLAGS(
+    PGI     NO-VALUE-SPECIFIED
+    NVIDIA  NO-VALUE-SPECIFIED
+    DEFAULT -mcpu=power8 -mtune=power8
+  )
+ENDIF()
+
+IF (KOKKOS_ARCH_POWER9)
+  ARCH_FLAGS(
+    PGI     NO-VALUE-SPECIFIED
+    NVIDIA  NO-VALUE-SPECIFIED
+    DEFAULT -mcpu=power9 -mtune=power9
+  )
+ENDIF()
+
+IF (KOKKOS_ARCH_POWER8 OR KOKKOS_ARCH_POWER9)
+  SET(KOKKOS_USE_ISA_POWERPCLE ON)
+ENDIF()
+
+IF (Kokkos_ENABLE_CUDA_RELOCATABLE_DEVICE_CODE)
+  ARCH_FLAGS(
+    Clang  -fcuda-rdc
+    NVIDIA --relocatable-device-code=true
+  )
+ENDIF()
+
+
+SET(CUDA_ARCH_ALREADY_SPECIFIED "")
+FUNCTION(CHECK_CUDA_ARCH ARCH FLAG)
+IF(KOKKOS_ARCH_${ARCH})
+  IF(CUDA_ARCH_ALREADY_SPECIFIED)
+    MESSAGE(FATAL_ERROR "Multiple GPU architectures given! Already have ${CUDA_ARCH_ALREADY_SPECIFIED}, but trying to add ${ARCH}. If you are re-running CMake, try clearing the cache and running again.")
+  ENDIF()
+  SET(CUDA_ARCH_ALREADY_SPECIFIED ${ARCH} PARENT_SCOPE)
+  IF (NOT KOKKOS_ENABLE_CUDA)
+    MESSAGE(WARNING "Given CUDA arch ${ARCH}, but Kokkos_ENABLE_CUDA is OFF. Option will be ignored.")
+    UNSET(KOKKOS_ARCH_${ARCH} PARENT_SCOPE)
+  ELSE()
+    GLOBAL_APPEND(KOKKOS_CUDA_OPTIONS "${CUDA_ARCH_FLAG}=${FLAG}")
+    IF(KOKKOS_ENABLE_CUDA_RELOCATABLE_DEVICE_CODE)
+       GLOBAL_APPEND(KOKKOS_LINK_OPTIONS "${CUDA_ARCH_FLAG}=${FLAG}")
+    ENDIF()
+  ENDIF()
+ENDIF()
+ENDFUNCTION()
+
+
+CHECK_CUDA_ARCH(KEPLER30  sm_30)
+CHECK_CUDA_ARCH(KEPLER32  sm_32)
+CHECK_CUDA_ARCH(KEPLER35  sm_35)
+CHECK_CUDA_ARCH(KEPLER37  sm_37)
+CHECK_CUDA_ARCH(MAXWELL50 sm_50)
+CHECK_CUDA_ARCH(MAXWELL52 sm_52)
+CHECK_CUDA_ARCH(MAXWELL53 sm_53)
+CHECK_CUDA_ARCH(PASCAL60  sm_60)
+CHECK_CUDA_ARCH(PASCAL61  sm_61)
+CHECK_CUDA_ARCH(VOLTA70  sm_70)
+CHECK_CUDA_ARCH(VOLTA72  sm_72)
+CHECK_CUDA_ARCH(TURING75  sm_75)
+
+#CMake verbose is kind of pointless
+#Let's just always print things
+MESSAGE(STATUS "Execution Spaces:")
+IF(KOKKOS_ENABLE_CUDA)
+  MESSAGE(STATUS "  Device Parallel: CUDA")
+ELSE()
+  MESSAGE(STATUS "  Device Parallel: NONE")
+ENDIF()
+
+FOREACH (_BACKEND OPENMP PTHREAD HPX)
+  IF(KOKKOS_ENABLE_${_BACKEND})
+    IF(_HOST_PARALLEL)
+      MESSAGE(FATAL_ERROR "Multiple host parallel execution spaces are not allowed! "
+                          "Trying to enable execution space ${_BACKEND}, "
+                          "but execution space ${_HOST_PARALLEL} is already enabled. "
+                          "Remove the CMakeCache.txt file and re-configure.")
+    ENDIF()
+    SET(_HOST_PARALLEL ${_BACKEND})
+  ENDIF()
+ENDFOREACH()
+
+IF(NOT _HOST_PARALLEL AND NOT KOKKOS_ENABLE_SERIAL)
+  MESSAGE(FATAL_ERROR "At least one host execution space must be enabled, "
+                      "but no host parallel execution space was requested "
+                      "and Kokkos_ENABLE_SERIAL=OFF.")
+ENDIF()
+
+IF(NOT _HOST_PARALLEL)
+  SET(_HOST_PARALLEL "NONE")
+ENDIF()
+MESSAGE(STATUS "    Host Parallel: ${_HOST_PARALLEL}")
+UNSET(_HOST_PARALLEL)
+
+IF(KOKKOS_ENABLE_PTHREAD)
+  SET(KOKKOS_ENABLE_THREADS ON)
+ENDIF()
+
+IF(KOKKOS_ENABLE_SERIAL)
+  MESSAGE(STATUS "      Host Serial: SERIAL")
+ELSE()
+  MESSAGE(STATUS "      Host Serial: NONE")
+ENDIF()
+
+MESSAGE(STATUS "")
+MESSAGE(STATUS "Architectures:")
+FOREACH(Arch ${KOKKOS_ENABLED_ARCH_LIST})
+  MESSAGE(STATUS " ${Arch}")
+ENDFOREACH()
+
diff --git a/lib/kokkos/cmake/kokkos_build.cmake b/lib/kokkos/cmake/kokkos_build.cmake
deleted file mode 100644
index f9b995baae..0000000000
--- a/lib/kokkos/cmake/kokkos_build.cmake
+++ /dev/null
@@ -1,261 +0,0 @@
-############################ Detect if submodule ###############################
-#
-# With thanks to StackOverflow:  
-#      http://stackoverflow.com/questions/25199677/how-to-detect-if-current-scope-has-a-parent-in-cmake
-#
-get_directory_property(HAS_PARENT PARENT_DIRECTORY)
-if(HAS_PARENT)
-  message(STATUS "Submodule build")
-  SET(KOKKOS_HEADER_DIR "include/kokkos")
-else()
-  message(STATUS "Standalone build")
-  SET(KOKKOS_HEADER_DIR "include")
-endif()
-
-################################ Handle the actual build #######################
-
-SET(INSTALL_LIB_DIR lib CACHE PATH "Installation directory for libraries")
-SET(INSTALL_BIN_DIR bin CACHE PATH "Installation directory for executables")
-SET(INSTALL_INCLUDE_DIR ${KOKKOS_HEADER_DIR} CACHE PATH
-  "Installation directory for header files")
-IF(WIN32 AND NOT CYGWIN)
-  SET(DEF_INSTALL_CMAKE_DIR CMake)
-ELSE()
-  SET(DEF_INSTALL_CMAKE_DIR lib/CMake/Kokkos)
-ENDIF()
-
-SET(INSTALL_CMAKE_DIR ${DEF_INSTALL_CMAKE_DIR} CACHE PATH
-    "Installation directory for CMake files")
-
-# Make relative paths absolute (needed later on)
-FOREACH(p LIB BIN INCLUDE CMAKE)
-  SET(var INSTALL_${p}_DIR)
-  IF(NOT IS_ABSOLUTE "${${var}}")
-    SET(${var} "${CMAKE_INSTALL_PREFIX}/${${var}}")
-  ENDIF()
-ENDFOREACH()
-
-# set up include-directories
-SET (Kokkos_INCLUDE_DIRS
-    ${Kokkos_SOURCE_DIR}/core/src
-    ${Kokkos_SOURCE_DIR}/containers/src
-    ${Kokkos_SOURCE_DIR}/algorithms/src
-    ${Kokkos_BINARY_DIR}  # to find KokkosCore_config.h
-    ${KOKKOS_INCLUDE_DIRS}
-)
-
-# pass include dirs back to parent scope
-if(HAS_PARENT)
-SET(Kokkos_INCLUDE_DIRS_RET ${Kokkos_INCLUDE_DIRS} PARENT_SCOPE)
-else()
-SET(Kokkos_INCLUDE_DIRS_RET ${Kokkos_INCLUDE_DIRS})
-endif()
-
-INCLUDE_DIRECTORIES(${Kokkos_INCLUDE_DIRS})
-
-IF(KOKKOS_SEPARATE_LIBS)
-  # Sources come from makefile-generated kokkos_generated_settings.cmake file
-  # Separate libs need to separate the sources
-  set_kokkos_srcs(KOKKOS_SRC ${KOKKOS_SRC})
-
-  # kokkoscore
-  ADD_LIBRARY(
-    kokkoscore
-    ${KOKKOS_CORE_SRCS}
-  )
-
-  target_compile_options(
-    kokkoscore
-    PUBLIC $<$<COMPILE_LANGUAGE:CXX>:${KOKKOS_CXX_FLAGS}>
-  )
-
-  target_include_directories(
-    kokkoscore
-    PUBLIC
-    ${KOKKOS_TPL_INCLUDE_DIRS}
-  )
-
-  foreach(lib IN LISTS KOKKOS_TPL_LIBRARY_NAMES)
-    if (("${lib}" STREQUAL "cuda") AND (NOT "${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang"))
-      set(LIB_cuda "-lcuda")
-    elseif ("${lib}" STREQUAL "hpx")
-      find_package(HPX REQUIRED)
-      if(${HPX_FOUND})
-        target_link_libraries(kokkoscore PUBLIC ${HPX_LIBRARIES})
-        target_link_libraries(kokkoscontainers PUBLIC ${HPX_LIBRARIES})
-        target_link_libraries(kokkosalgorithms PUBLIC ${HPX_LIBRARIES})
-        target_include_directories(kokkoscore PUBLIC ${HPX_INCLUDE_DIRS})
-        target_include_directories(kokkoscontainers PUBLIC ${HPX_INCLUDE_DIRS})
-        target_include_directories(kokkosalgorithms PUBLIC ${HPX_INCLUDE_DIRS})
-      else()
-        message(ERROR "HPX not found. Check the value of HPX_DIR (= ${HPX_DIR}) or CMAKE_PREFIX_PATH (= ${CMAKE_PREFIX_PATH}).")
-      endif()
-    else()
-      find_library(LIB_${lib} ${lib} PATHS ${KOKKOS_TPL_LIBRARY_DIRS})
-    endif()
-    target_link_libraries(kokkoscore PUBLIC ${LIB_${lib}})
-  endforeach()
-
-  target_link_libraries(kokkoscore PUBLIC "${KOKKOS_LINK_FLAGS}")
-
-  # Install the kokkoscore library
-  INSTALL (TARGETS kokkoscore
-           EXPORT KokkosTargets
-           ARCHIVE DESTINATION ${CMAKE_INSTALL_PREFIX}/lib
-           LIBRARY DESTINATION ${CMAKE_INSTALL_PREFIX}/lib
-           RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX}/bin
-  )
-
-  # kokkoscontainers
-  if (DEFINED KOKKOS_CONTAINERS_SRCS)
-    ADD_LIBRARY(
-      kokkoscontainers
-      ${KOKKOS_CONTAINERS_SRCS}
-    )
-  endif()
-
-  TARGET_LINK_LIBRARIES(
-    kokkoscontainers
-    kokkoscore
-  )
-
-  # Install the kokkocontainers library
-  INSTALL (TARGETS kokkoscontainers
-           EXPORT KokkosTargets
-           ARCHIVE DESTINATION ${CMAKE_INSTALL_PREFIX}/lib
-           LIBRARY DESTINATION ${CMAKE_INSTALL_PREFIX}/lib
-           RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX}/bin)
-
-  # kokkosalgorithms - Build as interface library since no source files.
-  ADD_LIBRARY(
-    kokkosalgorithms
-    INTERFACE
-  )
-
-  target_include_directories(
-    kokkosalgorithms
-    INTERFACE ${Kokkos_SOURCE_DIR}/algorithms/src
-  )
-
-  TARGET_LINK_LIBRARIES(
-    kokkosalgorithms
-    INTERFACE kokkoscore
-  )
-
-  # Install the kokkoalgorithms library
-  INSTALL (TARGETS kokkosalgorithms
-           ARCHIVE DESTINATION ${CMAKE_INSTALL_PREFIX}/lib
-           LIBRARY DESTINATION ${CMAKE_INSTALL_PREFIX}/lib
-           RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX}/bin)
-
-  SET (Kokkos_LIBRARIES_NAMES kokkoscore kokkoscontainers kokkosalgorithms)
-
-ELSE()
-  # kokkos
-  ADD_LIBRARY(
-    kokkos
-    ${KOKKOS_CORE_SRCS}
-    ${KOKKOS_CONTAINERS_SRCS}
-  )
-
-  target_compile_options(
-    kokkos
-    PUBLIC $<$<COMPILE_LANGUAGE:CXX>:${KOKKOS_CXX_FLAGS}>
-  )
-
-  target_include_directories(
-    kokkos
-    PUBLIC
-    ${KOKKOS_TPL_INCLUDE_DIRS}
-  )
-
-  foreach(lib IN LISTS KOKKOS_TPL_LIBRARY_NAMES)
-    if (("${lib}" STREQUAL "cuda") AND (NOT "${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang"))
-      set(LIB_cuda "-lcuda")
-    elseif ("${lib}" STREQUAL "hpx")
-      find_package(HPX REQUIRED)
-      if(${HPX_FOUND})
-        target_link_libraries(kokkos PUBLIC ${HPX_LIBRARIES})
-        target_include_directories(kokkos PUBLIC ${HPX_INCLUDE_DIRS})
-      else()
-        message(ERROR "HPX not found. Check the value of HPX_DIR (= ${HPX_DIR}) or CMAKE_PREFIX_PATH (= ${CMAKE_PREFIX_PATH}).")
-      endif()
-    else()
-      find_library(LIB_${lib} ${lib} PATHS ${KOKKOS_TPL_LIBRARY_DIRS})
-    endif()
-    target_link_libraries(kokkos PUBLIC ${LIB_${lib}})
-  endforeach()
-
-  target_link_libraries(kokkos PUBLIC "${KOKKOS_LINK_FLAGS}")
-
-  # Install the kokkos library
-  INSTALL (TARGETS kokkos
-           EXPORT KokkosTargets
-           ARCHIVE DESTINATION ${CMAKE_INSTALL_PREFIX}/lib
-           LIBRARY DESTINATION ${CMAKE_INSTALL_PREFIX}/lib
-           RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX}/bin)
-
-
-  SET (Kokkos_LIBRARIES_NAMES kokkos)
-
-endif()  # KOKKOS_SEPARATE_LIBS
-
-# Install the kokkos headers
-INSTALL (DIRECTORY
-         EXPORT KokkosTargets
-         ${Kokkos_SOURCE_DIR}/core/src/
-         DESTINATION ${KOKKOS_HEADER_DIR}
-         FILES_MATCHING PATTERN "*.hpp"
-)
-INSTALL (DIRECTORY
-         EXPORT KokkosTargets
-         ${Kokkos_SOURCE_DIR}/containers/src/
-         DESTINATION ${KOKKOS_HEADER_DIR}
-         FILES_MATCHING PATTERN "*.hpp"
-)
-INSTALL (DIRECTORY
-         EXPORT KokkosTargets
-         ${Kokkos_SOURCE_DIR}/algorithms/src/
-         DESTINATION ${KOKKOS_HEADER_DIR}
-         FILES_MATCHING PATTERN "*.hpp"
-)
-
-INSTALL (FILES
-         ${Kokkos_BINARY_DIR}/KokkosCore_config.h
-         DESTINATION ${KOKKOS_HEADER_DIR}
-)
-
-# Add all targets to the build-tree export set
-export(TARGETS ${Kokkos_LIBRARIES_NAMES}
-  FILE "${Kokkos_BINARY_DIR}/KokkosTargets.cmake")
-
-# Export the package for use from the build-tree
-# (this registers the build-tree with a global CMake-registry)
-export(PACKAGE Kokkos)
-
-# Create the KokkosConfig.cmake and KokkosConfigVersion files
-file(RELATIVE_PATH REL_INCLUDE_DIR "${INSTALL_CMAKE_DIR}"
-   "${INSTALL_INCLUDE_DIR}")
-# ... for the build tree
-set(CONF_INCLUDE_DIRS "${Kokkos_SOURCE_DIR}" "${Kokkos_BINARY_DIR}")
-configure_file(${Kokkos_SOURCE_DIR}/cmake/KokkosConfig.cmake.in
-  "${Kokkos_BINARY_DIR}/KokkosConfig.cmake" @ONLY)
-# ... for the install tree
-set(CONF_INCLUDE_DIRS "\${Kokkos_CMAKE_DIR}/${REL_INCLUDE_DIR}")
-configure_file(${Kokkos_SOURCE_DIR}/cmake/KokkosConfig.cmake.in
-  "${Kokkos_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/KokkosConfig.cmake" @ONLY)
-
-# Install the KokkosConfig.cmake and KokkosConfigVersion.cmake
-install(FILES
-  "${Kokkos_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/KokkosConfig.cmake"
-  DESTINATION "${INSTALL_CMAKE_DIR}")
-
-#This seems not to do anything?
-#message(STATUS "KokkosTargets: " ${KokkosTargets})
-# Install the export set for use with the install-tree
-INSTALL(EXPORT KokkosTargets DESTINATION
-       "${INSTALL_CMAKE_DIR}")
-
-# build and install pkgconfig file
-CONFIGURE_FILE(core/src/kokkos.pc.in kokkos.pc @ONLY)
-INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/kokkos.pc DESTINATION lib/pkgconfig)
diff --git a/lib/kokkos/cmake/kokkos_compiler_id.cmake b/lib/kokkos/cmake/kokkos_compiler_id.cmake
new file mode 100644
index 0000000000..d239c3b32e
--- /dev/null
+++ b/lib/kokkos/cmake/kokkos_compiler_id.cmake
@@ -0,0 +1,80 @@
+KOKKOS_CFG_DEPENDS(COMPILER_ID NONE)
+
+SET(KOKKOS_CXX_COMPILER ${CMAKE_CXX_COMPILER})
+SET(KOKKOS_CXX_COMPILER_ID ${CMAKE_CXX_COMPILER_ID})
+SET(KOKKOS_CXX_COMPILER_VERSION ${CMAKE_CXX_COMPILER_VERSION})
+
+# Check if the compiler is nvcc (which really means nvcc_wrapper).
+EXECUTE_PROCESS(COMMAND ${CMAKE_CXX_COMPILER} --version
+                COMMAND grep nvcc
+                COMMAND wc -l
+                OUTPUT_VARIABLE INTERNAL_HAVE_COMPILER_NVCC
+                OUTPUT_STRIP_TRAILING_WHITESPACE)
+
+
+STRING(REGEX REPLACE "^ +" ""
+       INTERNAL_HAVE_COMPILER_NVCC ${INTERNAL_HAVE_COMPILER_NVCC})
+
+
+IF(INTERNAL_HAVE_COMPILER_NVCC)
+  # SET the compiler id to nvcc.  We use the value used by CMake 3.8.
+  SET(KOKKOS_CXX_COMPILER_ID NVIDIA CACHE STRING INTERNAL FORCE)
+
+  # SET nvcc's compiler version.
+  EXECUTE_PROCESS(COMMAND ${CMAKE_CXX_COMPILER} --version
+                  COMMAND grep release
+                  OUTPUT_VARIABLE INTERNAL_CXX_COMPILER_VERSION
+                  OUTPUT_STRIP_TRAILING_WHITESPACE)
+
+  STRING(REGEX MATCH "[0-9]+\\.[0-9]+\\.[0-9]+$"
+         TEMP_CXX_COMPILER_VERSION ${INTERNAL_CXX_COMPILER_VERSION})
+  SET(KOKKOS_CXX_COMPILER_VERSION ${TEMP_CXX_COMPILER_VERSION} CACHE STRING INTERNAL FORCE)
+ENDIF()
+
+IF(KOKKOS_CXX_COMPILER_ID STREQUAL Cray)
+
+  # SET nvcc's compiler version.
+  EXECUTE_PROCESS(COMMAND ${CMAKE_CXX_COMPILER} --version
+                  OUTPUT_VARIABLE INTERNAL_CXX_COMPILER_VERSION
+                  OUTPUT_STRIP_TRAILING_WHITESPACE)
+
+  STRING(REGEX MATCH "[0-9]+\\.[0-9]+\\.[0-9]+$"
+         TEMP_CXX_COMPILER_VERSION ${INTERNAL_CXX_COMPILER_VERSION})
+  SET(KOKKOS_CXX_COMPILER_VERSION ${TEMP_CXX_COMPILER_VERSION} CACHE STRING INTERNAL FORCE)
+ENDIF()
+
+# Enforce the minimum compilers supported by Kokkos.
+SET(KOKKOS_MESSAGE_TEXT "Compiler not supported by Kokkos.  Required compiler versions:")
+SET(KOKKOS_MESSAGE_TEXT "${KOKKOS_MESSAGE_TEXT}\n    Clang      3.5.2 or higher")
+SET(KOKKOS_MESSAGE_TEXT "${KOKKOS_MESSAGE_TEXT}\n    GCC        4.8.4 or higher")
+SET(KOKKOS_MESSAGE_TEXT "${KOKKOS_MESSAGE_TEXT}\n    Intel     15.0.2 or higher")
+SET(KOKKOS_MESSAGE_TEXT "${KOKKOS_MESSAGE_TEXT}\n    NVCC      9.0.69 or higher")
+SET(KOKKOS_MESSAGE_TEXT "${KOKKOS_MESSAGE_TEXT}\n    PGI         17.1 or higher\n")
+
+IF(KOKKOS_CXX_COMPILER_ID STREQUAL Clang)
+  IF(KOKKOS_CXX_COMPILER_VERSION VERSION_LESS 3.5.2)
+    MESSAGE(FATAL_ERROR "${KOKKOS_MESSAGE_TEXT}")
+  ENDIF()
+ELSEIF(KOKKOS_CXX_COMPILER_ID STREQUAL GNU)
+  IF(KOKKOS_CXX_COMPILER_VERSION VERSION_LESS 4.8.4)
+    MESSAGE(FATAL_ERROR "${KOKKOS_MESSAGE_TEXT}")
+  ENDIF()
+ELSEIF(KOKKOS_CXX_COMPILER_ID STREQUAL Intel)
+  IF(KOKKOS_CXX_COMPILER_VERSION VERSION_LESS 15.0.2)
+    MESSAGE(FATAL_ERROR "${KOKKOS_MESSAGE_TEXT}")
+  ENDIF()
+ELSEIF(KOKKOS_CXX_COMPILER_ID STREQUAL NVIDIA)
+  IF(KOKKOS_CXX_COMPILER_VERSION VERSION_LESS 9.0.69)
+    MESSAGE(FATAL_ERROR "${KOKKOS_MESSAGE_TEXT}")
+  ENDIF()
+  SET(CMAKE_CXX_EXTENSIONS OFF CACHE BOOL "Kokkos turns off CXX extensions" FORCE)
+ELSEIF(KOKKOS_CXX_COMPILER_ID STREQUAL PGI)
+  IF(KOKKOS_CXX_COMPILER_VERSION VERSION_LESS 17.1)
+    MESSAGE(FATAL_ERROR "${KOKKOS_MESSAGE_TEXT}")
+  ENDIF()
+ENDIF()
+
+STRING(REPLACE "." ";" VERSION_LIST ${KOKKOS_CXX_COMPILER_VERSION})
+LIST(GET VERSION_LIST 0 KOKKOS_COMPILER_VERSION_MAJOR)
+LIST(GET VERSION_LIST 1 KOKKOS_COMPILER_VERSION_MINOR)
+LIST(GET VERSION_LIST 2 KOKKOS_COMPILER_VERSION_PATCH)
diff --git a/lib/kokkos/cmake/kokkos_corner_cases.cmake b/lib/kokkos/cmake/kokkos_corner_cases.cmake
new file mode 100644
index 0000000000..c03c385faf
--- /dev/null
+++ b/lib/kokkos/cmake/kokkos_corner_cases.cmake
@@ -0,0 +1,35 @@
+IF(KOKKOS_CXX_COMPILER_ID STREQUAL Clang AND KOKKOS_ENABLE_OPENMP)
+  # The clang "version" doesn't actually tell you what runtimes and tools
+  # were built into Clang. We should therefore make sure that libomp
+  # was actually built into Clang. Otherwise the user will get nonsensical
+  # errors when they try to build.
+
+  #Try compile is the height of CMake nonsense
+  #I can't just give it compiler and link flags
+  #I have to hackily pretend that compiler flags are compiler definitions
+  #and that linker flags are libraries
+  #also - this is easier to use than CMakeCheckCXXSourceCompiles
+  TRY_COMPILE(CLANG_HAS_OMP
+    ${KOKKOS_TOP_BUILD_DIR}/corner_cases
+    ${KOKKOS_SOURCE_DIR}/cmake/compile_tests/clang_omp.cpp 
+    COMPILE_DEFINITIONS -fopenmp=libomp
+    LINK_LIBRARIES -fopenmp=libomp
+  )
+  IF (NOT CLANG_HAS_OMP)
+    UNSET(CLANG_HAS_OMP CACHE) #make sure CMake always re-runs this
+    MESSAGE(FATAL_ERROR "Clang failed OpenMP check. You have requested -DKokkos_ENABLE_OPENMP=ON, but the Clang compiler does not appear to have been built with OpenMP support")
+  ENDIF()
+  UNSET(CLANG_HAS_OMP CACHE) #make sure CMake always re-runs this
+ENDIF()
+
+
+IF (KOKKOS_CXX_STANDARD STREQUAL 17)
+  IF (KOKKOS_CXX_COMPILER_ID STREQUAL GNU AND KOKKOS_CXX_COMPILER_VERSION VERSION_LESS 7)
+    MESSAGE(FATAL_ERROR "You have requested c++17 support for GCC ${KOKKOS_CXX_COMPILER_VERSION}. Although CMake has allowed this and GCC accepts -std=c++1z/c++17, GCC <= 6 does not properly support *this capture. Please reduce the C++ standard to 14 or upgrade the compiler if you do need 17 support")
+  ENDIF()
+
+  IF (KOKKOS_CXX_COMPILER_ID STREQUAL NVIDIA)
+    MESSAGE(FATAL_ERROR "You have requested c++17 support for NVCC. Please reduce the C++ standard to 14. No versions of NVCC currently support 17.")
+  ENDIF()
+ENDIF()
+
diff --git a/lib/kokkos/cmake/kokkos_enable_devices.cmake b/lib/kokkos/cmake/kokkos_enable_devices.cmake
new file mode 100644
index 0000000000..ff09876673
--- /dev/null
+++ b/lib/kokkos/cmake/kokkos_enable_devices.cmake
@@ -0,0 +1,61 @@
+
+FUNCTION(KOKKOS_DEVICE_OPTION SUFFIX DEFAULT DEV_TYPE DOCSTRING)
+  KOKKOS_OPTION(ENABLE_${SUFFIX} ${DEFAULT} BOOL ${DOCSTRING})
+  STRING(TOUPPER ${SUFFIX} UC_NAME)
+  IF (KOKKOS_ENABLE_${UC_NAME})
+    LIST(APPEND KOKKOS_ENABLED_DEVICES    ${SUFFIX})
+    #I hate that CMake makes me do this
+    SET(KOKKOS_ENABLED_DEVICES    ${KOKKOS_ENABLED_DEVICES}    PARENT_SCOPE)
+  ENDIF()
+  SET(KOKKOS_ENABLE_${UC_NAME} ${KOKKOS_ENABLE_${UC_NAME}} PARENT_SCOPE)
+  IF (KOKKOS_ENABLE_${UC_NAME} AND DEV_TYPE STREQUAL "HOST")
+    SET(KOKKOS_HAS_HOST ON PARENT_SCOPE)
+  ENDIF()
+ENDFUNCTION()
+
+KOKKOS_CFG_DEPENDS(DEVICES NONE)
+
+# Put a check in just in case people are using this option
+KOKKOS_DEPRECATED_LIST(DEVICES ENABLE)
+
+
+KOKKOS_DEVICE_OPTION(PTHREAD       OFF HOST "Whether to build Pthread backend")
+IF (KOKKOS_ENABLE_PTHREAD)
+  #patch the naming here
+  SET(KOKKOS_ENABLE_THREADS ON)
+ENDIF()
+
+IF(Trilinos_ENABLE_Kokkos AND Trilinos_ENABLE_OpenMP)
+  SET(OMP_DEFAULT ON)
+ELSE()
+  SET(OMP_DEFAULT OFF)
+ENDIF()
+KOKKOS_DEVICE_OPTION(OPENMP ${OMP_DEFAULT} HOST "Whether to build OpenMP backend")
+
+IF(Trilinos_ENABLE_Kokkos AND TPL_ENABLE_CUDA)
+  SET(CUDA_DEFAULT ON)
+ELSE()
+  SET(CUDA_DEFAULT OFF)
+ENDIF()
+KOKKOS_DEVICE_OPTION(CUDA ${CUDA_DEFAULT} DEVICE "Whether to build CUDA backend")
+
+IF (KOKKOS_ENABLE_CUDA)
+  GLOBAL_SET(KOKKOS_DONT_ALLOW_EXTENSIONS "CUDA enabled")
+ENDIF()
+
+# We want this to default to OFF for cache reasons, but if no
+# host space is given, then activate serial
+IF (KOKKOS_HAS_TRILINOS)
+  #However, Trilinos always wants Serial ON
+  SET(SERIAL_DEFAULT ON)
+ELSEIF (KOKKOS_HAS_HOST)
+  SET(SERIAL_DEFAULT OFF)
+ELSE()
+  SET(SERIAL_DEFAULT ON)
+  IF (NOT DEFINED Kokkos_ENABLE_SERIAL)
+    MESSAGE(STATUS "SERIAL backend is being turned on to ensure there is at least one Host space. To change this, you must enable another host execution space and configure with -DKokkos_ENABLE_SERIAL=OFF or change CMakeCache.txt")
+  ENDIF()
+ENDIF()
+KOKKOS_DEVICE_OPTION(SERIAL ${SERIAL_DEFAULT} HOST "Whether to build serial backend")
+
+KOKKOS_DEVICE_OPTION(HPX OFF HOST "Whether to build HPX backend (experimental)")
diff --git a/lib/kokkos/cmake/kokkos_enable_options.cmake b/lib/kokkos/cmake/kokkos_enable_options.cmake
new file mode 100644
index 0000000000..c0e49482b6
--- /dev/null
+++ b/lib/kokkos/cmake/kokkos_enable_options.cmake
@@ -0,0 +1,92 @@
+########################## NOTES ###############################################
+#  List the options for configuring kokkos using CMake method of doing it.
+#  These options then get mapped onto KOKKOS_SETTINGS environment variable by
+#  kokkos_settings.cmake.  It is separate to allow other packages to override
+#  these variables (e.g., TriBITS).
+
+########################## AVAILABLE OPTIONS ###################################
+# Use lists for documentation, verification, and programming convenience
+
+
+FUNCTION(KOKKOS_ENABLE_OPTION SUFFIX DEFAULT DOCSTRING)
+  KOKKOS_OPTION(ENABLE_${SUFFIX} ${DEFAULT} BOOL ${DOCSTRING})
+  STRING(TOUPPER ${SUFFIX} UC_NAME)
+  IF (KOKKOS_ENABLE_${UC_NAME})
+    LIST(APPEND KOKKOS_ENABLED_OPTIONS ${UC_NAME})
+    #I hate that CMake makes me do this
+    SET(KOKKOS_ENABLED_OPTIONS ${KOKKOS_ENABLED_OPTIONS} PARENT_SCOPE)
+  ENDIF()
+  SET(KOKKOS_ENABLE_${UC_NAME} ${KOKKOS_ENABLE_${UC_NAME}} PARENT_SCOPE)
+ENDFUNCTION()
+
+# Certain defaults will depend on knowing the enabled devices
+KOKKOS_CFG_DEPENDS(OPTIONS DEVICES)
+
+# Put a check in just in case people are using this option
+KOKKOS_DEPRECATED_LIST(OPTIONS ENABLE)
+
+KOKKOS_ENABLE_OPTION(CUDA_RELOCATABLE_DEVICE_CODE  OFF "Whether to enable relocatable device code (RDC) for CUDA")
+KOKKOS_ENABLE_OPTION(CUDA_UVM             OFF "Whether to use unified memory (UM) for CUDA by default")
+KOKKOS_ENABLE_OPTION(CUDA_LDG_INTRINSIC   OFF "Whether to use CUDA LDG intrinsics")
+KOKKOS_ENABLE_OPTION(HPX_ASYNC_DISPATCH   OFF "Whether HPX supports asynchronous dispatch")
+KOKKOS_ENABLE_OPTION(TESTS         OFF  "Whether to build the unit tests")
+STRING(TOUPPER "${CMAKE_BUILD_TYPE}" UPPERCASE_CMAKE_BUILD_TYPE)
+IF(UPPERCASE_CMAKE_BUILD_TYPE STREQUAL "DEBUG")
+  KOKKOS_ENABLE_OPTION(DEBUG                ON "Whether to activate extra debug features - may increase compile times")
+  KOKKOS_ENABLE_OPTION(DEBUG_DUALVIEW_MODIFY_CHECK ON "Debug check on dual views")
+ELSE()
+  KOKKOS_ENABLE_OPTION(DEBUG                OFF "Whether to activate extra debug features - may increase compile times")
+  KOKKOS_ENABLE_OPTION(DEBUG_DUALVIEW_MODIFY_CHECK OFF "Debug check on dual views")
+ENDIF()
+UNSET(_UPPERCASE_CMAKE_BUILD_TYPE)
+KOKKOS_ENABLE_OPTION(LARGE_MEM_TESTS      OFF "Whether to perform extra large memory tests")
+KOKKOS_ENABLE_OPTION(DEBUG_BOUNDS_CHECK   OFF "Whether to use bounds checking - will increase runtime")
+KOKKOS_ENABLE_OPTION(COMPILER_WARNINGS    OFF "Whether to print all compiler warnings")
+KOKKOS_ENABLE_OPTION(PROFILING            ON  "Whether to create bindings for profiling tools")
+KOKKOS_ENABLE_OPTION(PROFILING_LOAD_PRINT OFF "Whether to print information about which profiling tools got loaded")
+KOKKOS_ENABLE_OPTION(AGGRESSIVE_VECTORIZATION OFF "Whether to aggressively vectorize loops")
+KOKKOS_ENABLE_OPTION(DEPRECATED_CODE          OFF "Whether to enable deprecated code")
+
+IF (KOKKOS_ENABLE_CUDA)
+  SET(KOKKOS_COMPILER_CUDA_VERSION "${KOKKOS_COMPILER_VERSION_MAJOR}${KOKKOS_COMPILER_VERSION_MINOR}")
+ENDIF()
+
+IF (Trilinos_ENABLE_Kokkos AND TPL_ENABLE_CUDA AND DEFINED KOKKOS_COMPILER_CUDA_VERSION AND KOKKOS_COMPILER_CUDA_VERSION GREATER 70)
+  SET(LAMBDA_DEFAULT ON)
+ELSE()
+  SET(LAMBDA_DEFAULT OFF)
+ENDIF()
+KOKKOS_ENABLE_OPTION(CUDA_LAMBDA ${LAMBDA_DEFAULT} "Whether to activate experimental lambda features")
+IF (Trilinos_ENABLE_Kokkos)
+  SET(COMPLEX_ALIGN_DEFAULT OFF)
+ELSE()
+  SET(COMPLEX_ALIGN_DEFAULT ON)
+ENDIF()
+KOKKOS_ENABLE_OPTION(COMPLEX_ALIGN ${COMPLEX_ALIGN_DEFAULT}  "Whether to align Kokkos::complex to 2*alignof(RealType)")
+
+KOKKOS_ENABLE_OPTION(CUDA_CONSTEXPR OFF "Whether to activate experimental relaxed constexpr functions")
+
+FUNCTION(check_device_specific_options)
+  CMAKE_PARSE_ARGUMENTS(SOME "" "DEVICE" "OPTIONS" ${ARGN})
+  IF(NOT KOKKOS_ENABLE_${SOME_DEVICE})
+    FOREACH(OPTION ${SOME_OPTIONS})
+      IF(CMAKE_VERSION VERSION_GREATER_EQUAL 3.14)
+        IF(NOT DEFINED CACHE{Kokkos_ENABLE_${OPTION}} OR NOT DEFINED CACHE{Kokkos_ENABLE_${SOME_DEVICE}})
+          MESSAGE(FATAL_ERROR "Internal logic error: option '${OPTION}' or device '${SOME_DEVICE}' not recognized.")
+        ENDIF()
+      ENDIF()
+      IF(KOKKOS_ENABLE_${OPTION})
+        MESSAGE(WARNING "Kokkos_ENABLE_${OPTION} is ON but ${SOME_DEVICE} backend is not enabled. Option will be ignored.")
+        UNSET(KOKKOS_ENABLE_${OPTION} PARENT_SCOPE)
+      ENDIF()
+    ENDFOREACH()
+  ENDIF()
+ENDFUNCTION()
+
+CHECK_DEVICE_SPECIFIC_OPTIONS(DEVICE CUDA OPTIONS CUDA_UVM CUDA_RELOCATABLE_DEVICE_CODE CUDA_LAMBDA CUDA_CONSTEXPR CUDA_LDG_INTRINSIC)
+CHECK_DEVICE_SPECIFIC_OPTIONS(DEVICE HPX OPTIONS HPX_ASYNC_DISPATCH)
+
+# Needed due to change from deprecated name to new header define name
+IF (KOKKOS_ENABLE_AGGRESSIVE_VECTORIZATION)
+  SET(KOKKOS_OPT_RANGE_AGGRESSIVE_VECTORIZATION ON)
+ENDIF()
diff --git a/lib/kokkos/cmake/kokkos_functions.cmake b/lib/kokkos/cmake/kokkos_functions.cmake
index 616618753b..3644c48ddd 100644
--- a/lib/kokkos/cmake/kokkos_functions.cmake
+++ b/lib/kokkos/cmake/kokkos_functions.cmake
@@ -1,345 +1,700 @@
 ################################### FUNCTIONS ##################################
 # List of functions
-#   set_kokkos_cxx_compiler
-#   set_kokkos_cxx_standard
-#   set_kokkos_srcs
+#   kokkos_option
 
-#-------------------------------------------------------------------------------
-# function(set_kokkos_cxx_compiler)
-# Sets the following compiler variables that are analogous to the CMAKE_*
-# versions.  We add the ability to detect NVCC (really nvcc_wrapper).
-#   KOKKOS_CXX_COMPILER
-#   KOKKOS_CXX_COMPILER_ID
-#   KOKKOS_CXX_COMPILER_VERSION
-#
-# Inputs:
-#   KOKKOS_ENABLE_CUDA
-#   CMAKE_CXX_COMPILER
-#   CMAKE_CXX_COMPILER_ID
-#   CMAKE_CXX_COMPILER_VERSION
-#
-# Also verifies the compiler version meets the minimum required by Kokkos.
-function(set_kokkos_cxx_compiler)
-  # Since CMake doesn't recognize the nvcc compiler until 3.8, we use our own
-  # version of the CMake variables and detect nvcc ourselves.  Initially set to
-  # the CMake variable values.
-  set(INTERNAL_CXX_COMPILER ${CMAKE_CXX_COMPILER})
-  set(INTERNAL_CXX_COMPILER_ID ${CMAKE_CXX_COMPILER_ID})
-  set(INTERNAL_CXX_COMPILER_VERSION ${CMAKE_CXX_COMPILER_VERSION})
+# Validate options are given with correct case and define an internal
+# upper-case version for use within 
 
-  # Check if the compiler is nvcc (which really means nvcc_wrapper).
-  execute_process(COMMAND ${INTERNAL_CXX_COMPILER} --version
-                  COMMAND grep nvcc
-                  COMMAND wc -l
-                  OUTPUT_VARIABLE INTERNAL_HAVE_COMPILER_NVCC
-                  OUTPUT_STRIP_TRAILING_WHITESPACE)
-
-  string(REGEX REPLACE "^ +" ""
-         INTERNAL_HAVE_COMPILER_NVCC ${INTERNAL_HAVE_COMPILER_NVCC})
-
-  if(INTERNAL_HAVE_COMPILER_NVCC)
-    # Set the compiler id to nvcc.  We use the value used by CMake 3.8.
-    set(INTERNAL_CXX_COMPILER_ID NVIDIA)
-
-    # Set nvcc's compiler version.
-    execute_process(COMMAND ${INTERNAL_CXX_COMPILER} --version
-                    COMMAND grep release
-                    OUTPUT_VARIABLE INTERNAL_CXX_COMPILER_VERSION
-                    OUTPUT_STRIP_TRAILING_WHITESPACE)
-
-    string(REGEX MATCH "[0-9]+\\.[0-9]+\\.[0-9]+$"
-           INTERNAL_CXX_COMPILER_VERSION ${INTERNAL_CXX_COMPILER_VERSION})
-  endif()
-
-  # Enforce the minimum compilers supported by Kokkos.
-  set(KOKKOS_MESSAGE_TEXT "Compiler not supported by Kokkos.  Required compiler versions:")
-  set(KOKKOS_MESSAGE_TEXT "${KOKKOS_MESSAGE_TEXT}\n    Clang      3.5.2 or higher")
-  set(KOKKOS_MESSAGE_TEXT "${KOKKOS_MESSAGE_TEXT}\n    GCC        4.8.4 or higher")
-  set(KOKKOS_MESSAGE_TEXT "${KOKKOS_MESSAGE_TEXT}\n    Intel     15.0.2 or higher")
-  set(KOKKOS_MESSAGE_TEXT "${KOKKOS_MESSAGE_TEXT}\n    NVCC      7.0.28 or higher")
-  set(KOKKOS_MESSAGE_TEXT "${KOKKOS_MESSAGE_TEXT}\n    PGI         17.1 or higher\n")
-
-  if(INTERNAL_CXX_COMPILER_ID STREQUAL Clang)
-    if(INTERNAL_CXX_COMPILER_VERSION VERSION_LESS 3.5.2)
-      message(FATAL_ERROR "${KOKKOS_MESSAGE_TEXT}")
-    endif()
-  elseif(INTERNAL_CXX_COMPILER_ID STREQUAL GNU)
-    if(INTERNAL_CXX_COMPILER_VERSION VERSION_LESS 4.8.4)
-      message(FATAL_ERROR "${KOKKOS_MESSAGE_TEXT}")
-    endif()
-  elseif(INTERNAL_CXX_COMPILER_ID STREQUAL Intel)
-    if(INTERNAL_CXX_COMPILER_VERSION VERSION_LESS 15.0.2)
-      message(FATAL_ERROR "${KOKKOS_MESSAGE_TEXT}")
-    endif()
-  elseif(INTERNAL_CXX_COMPILER_ID STREQUAL NVIDIA)
-    if(INTERNAL_CXX_COMPILER_VERSION VERSION_LESS 7.0.28)
-      message(FATAL_ERROR "${KOKKOS_MESSAGE_TEXT}")
-    endif()
-  elseif(INTERNAL_CXX_COMPILER_ID STREQUAL PGI)
-    if(INTERNAL_CXX_COMPILER_VERSION VERSION_LESS 17.1)
-      message(FATAL_ERROR "${KOKKOS_MESSAGE_TEXT}")
-    endif()
-  endif()
-
-  # Enforce that extensions are turned off for nvcc_wrapper.
-  if(INTERNAL_CXX_COMPILER_ID STREQUAL NVIDIA)
-    if(DEFINED CMAKE_CXX_EXTENSIONS AND CMAKE_CXX_EXTENSIONS STREQUAL ON)
-      message(FATAL_ERROR "NVCC doesn't support C++ extensions.  Set CMAKE_CXX_EXTENSIONS to OFF in your CMakeLists.txt.")
-    endif()
-  endif()
-
-  if(KOKKOS_ENABLE_CUDA)
-    # Enforce that the compiler can compile CUDA code.
-    if(INTERNAL_CXX_COMPILER_ID STREQUAL Clang)
-      if(INTERNAL_CXX_COMPILER_VERSION VERSION_LESS 4.0.0)
-        message(FATAL_ERROR "Compiling CUDA code directly with Clang requires version 4.0.0 or higher.")
-      endif()
-    elseif(NOT INTERNAL_CXX_COMPILER_ID STREQUAL NVIDIA)
-      message(FATAL_ERROR "Invalid compiler for CUDA.  The compiler must be nvcc_wrapper or Clang, but compiler ID was ${INTERNAL_CXX_COMPILER_ID}")
-    endif()
-  endif()
-
-  set(KOKKOS_CXX_COMPILER ${INTERNAL_CXX_COMPILER} PARENT_SCOPE)
-  set(KOKKOS_CXX_COMPILER_ID ${INTERNAL_CXX_COMPILER_ID} PARENT_SCOPE)
-  set(KOKKOS_CXX_COMPILER_VERSION ${INTERNAL_CXX_COMPILER_VERSION} PARENT_SCOPE)
-endfunction()
-
-#-------------------------------------------------------------------------------
-# function(set_kokkos_cxx_standard)
-#  Transitively enforces that the appropriate CXX standard compile flags (C++11
-#  or above) are added to targets that use the Kokkos library.  Compile features
-#  are used if possible.  Otherwise, the appropriate flags are added to
-#  KOKKOS_CXX_FLAGS.  Values set by the user to CMAKE_CXX_STANDARD and
-#  CMAKE_CXX_EXTENSIONS are honored.
-#
-# Outputs:
-#   KOKKOS_CXX11_FEATURES
-#   KOKKOS_CXX_FLAGS
-#
-# Inputs:
-#  KOKKOS_CXX_COMPILER
-#  KOKKOS_CXX_COMPILER_ID
-#  KOKKOS_CXX_COMPILER_VERSION
-#
-function(set_kokkos_cxx_standard)
-  # The following table lists the versions of CMake that supports CXX_STANDARD
-  # and the CXX compile features for different compilers.  The versions are
-  # based on CMake documentation, looking at CMake code, and verifying by
-  # testing with specific CMake versions.
-  #
-  #   COMPILER                      CXX_STANDARD     Compile Features
-  #   ---------------------------------------------------------------
-  #   Clang                             3.1                3.1
-  #   GNU                               3.1                3.2
-  #   AppleClang                        3.2                3.2
-  #   Intel                             3.6                3.6
-  #   Cray                              No                 No
-  #   PGI                               No                 No
-  #   XL                                No                 No
-  #
-  # For compiling CUDA code using nvcc_wrapper, we will use the host compiler's
-  # flags for turning on C++11.  Since for compiler ID and versioning purposes
-  # CMake recognizes the host compiler when calling nvcc_wrapper, this just
-  # works.  Both NVCC and nvcc_wrapper only recognize '-std=c++11' which means
-  # that we can only use host compilers for CUDA builds that use those flags.
-  # It also means that extensions (gnu++11) can't be turned on for CUDA builds.
-
-  # Check if we can use compile features.
-  if(NOT KOKKOS_CXX_COMPILER_ID STREQUAL NVIDIA)
-    if(CMAKE_CXX_COMPILER_ID STREQUAL Clang)
-      if(NOT CMAKE_VERSION VERSION_LESS 3.1)
-        set(INTERNAL_USE_COMPILE_FEATURES ON)
-      endif()
-    elseif(CMAKE_CXX_COMPILER_ID STREQUAL AppleClang OR CMAKE_CXX_COMPILER_ID STREQUAL GNU)
-      if(NOT CMAKE_VERSION VERSION_LESS 3.2)
-        set(INTERNAL_USE_COMPILE_FEATURES ON)
-      endif()
-    elseif(CMAKE_CXX_COMPILER_ID STREQUAL Intel)
-      if(NOT CMAKE_VERSION VERSION_LESS 3.6)
-        set(INTERNAL_USE_COMPILE_FEATURES ON)
-      endif()
-    endif()
-  endif()
-
-  if(INTERNAL_USE_COMPILE_FEATURES)
-    # Use the compile features aspect of CMake to transitively cause C++ flags
-    # to populate to user code.
-
-    # I'm using a hack by requiring features that I know force the lowest version
-    # of the compilers we want to support.  Clang 3.3 and later support all of
-    # the C++11 standard.  With CMake 3.8 and higher, we could switch to using
-    # cxx_std_11.
-    set(KOKKOS_CXX11_FEATURES
-        cxx_nonstatic_member_init # Forces GCC 4.7 or later and Intel 14.0 or later.
-        PARENT_SCOPE
-       )
-  else()
-    # CXX compile features are not yet implemented for this combination of
-    # compiler and version of CMake.
-
-    if(CMAKE_CXX_COMPILER_ID STREQUAL AppleClang)
-      # Versions of CMAKE before 3.2 don't support CXX_STANDARD or C++ compile
-      # features for the AppleClang compiler.  Set compiler flags transitively
-      # here such that they trickle down to a call to target_compile_options().
-
-      # The following two blocks of code were copied from
-      # /Modules/Compiler/AppleClang-CXX.cmake from CMake 3.7.2 and then
-      # modified.
-      if(NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 4.0)
-        set(INTERNAL_CXX11_STANDARD_COMPILE_OPTION "-std=c++11")
-        set(INTERNAL_CXX11_EXTENSION_COMPILE_OPTION "-std=gnu++11")
-      endif()
-
-      if(NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 6.1)
-        set(INTERNAL_CXX14_STANDARD_COMPILE_OPTION "-std=c++14")
-        set(INTERNAL_CXX14_EXTENSION_COMPILE_OPTION "-std=gnu++14")
-      elseif(NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 5.1)
-        # AppleClang 5.0 knows this flag, but does not set a __cplusplus macro
-        # greater than 201103L.
-        set(INTERNAL_CXX14_STANDARD_COMPILE_OPTION "-std=c++1y")
-        set(INTERNAL_CXX14_EXTENSION_COMPILE_OPTION "-std=gnu++1y")
-      endif()
-    elseif(CMAKE_CXX_COMPILER_ID STREQUAL Intel)
-      # Versions of CMAKE before 3.6 don't support CXX_STANDARD or C++ compile
-      # features for the Intel compiler.  Set compiler flags transitively here
-      # such that they trickle down to a call to target_compile_options().
-
-      # The following three blocks of code were copied from
-      # /Modules/Compiler/Intel-CXX.cmake from CMake 3.7.2 and then modified.
-      if("x${CMAKE_CXX_SIMULATE_ID}" STREQUAL "xMSVC")
-        set(_std -Qstd)
-        set(_ext c++)
-      else()
-        set(_std -std)
-        set(_ext gnu++)
-      endif()
-
-      if(NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 15.0.2)
-        set(INTERNAL_CXX14_STANDARD_COMPILE_OPTION "${_std}=c++14")
-        # TODO: There is no gnu++14 value supported; figure out what to do.
-        set(INTERNAL_CXX14_EXTENSION_COMPILE_OPTION "${_std}=c++14")
-      elseif(NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 15.0.0)
-        set(INTERNAL_CXX14_STANDARD_COMPILE_OPTION "${_std}=c++1y")
-        # TODO: There is no gnu++14 value supported; figure out what to do.
-        set(INTERNAL_CXX14_EXTENSION_COMPILE_OPTION "${_std}=c++1y")
-      endif()
-
-      if(NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 13.0)
-        set(INTERNAL_CXX11_STANDARD_COMPILE_OPTION "${_std}=c++11")
-        set(INTERNAL_CXX11_EXTENSION_COMPILE_OPTION "${_std}=${_ext}11")
-      elseif(NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 12.1)
-        set(INTERNAL_CXX11_STANDARD_COMPILE_OPTION "${_std}=c++0x")
-        set(INTERNAL_CXX11_EXTENSION_COMPILE_OPTION "${_std}=${_ext}0x")
-      endif()
-    elseif(CMAKE_CXX_COMPILER_ID STREQUAL Cray)
-      # CMAKE doesn't support CXX_STANDARD or C++ compile features for the Cray
-      # compiler.  Set compiler options transitively here such that they trickle
-      # down to a call to target_compile_options().
-      set(INTERNAL_CXX11_STANDARD_COMPILE_OPTION "-hstd=c++11")
-      set(INTERNAL_CXX11_EXTENSION_COMPILE_OPTION "-hstd=c++11")
-      set(INTERNAL_CXX14_STANDARD_COMPILE_OPTION "-hstd=c++11")
-      set(INTERNAL_CXX14_EXTENSION_COMPILE_OPTION "-hstd=c++11")
-    elseif(CMAKE_CXX_COMPILER_ID STREQUAL PGI)
-      # CMAKE doesn't support CXX_STANDARD or C++ compile features for the PGI
-      # compiler.  Set compiler options transitively here such that they trickle
-      # down to a call to target_compile_options().
-      set(INTERNAL_CXX11_STANDARD_COMPILE_OPTION "--c++11")
-      set(INTERNAL_CXX11_EXTENSION_COMPILE_OPTION "--c++11")
-      set(INTERNAL_CXX14_STANDARD_COMPILE_OPTION "--c++11")
-      set(INTERNAL_CXX14_EXTENSION_COMPILE_OPTION "--c++11")
-    elseif(CMAKE_CXX_COMPILER_ID STREQUAL XL)
-      # CMAKE doesn't support CXX_STANDARD or C++ compile features for the XL
-      # compiler.  Set compiler options transitively here such that they trickle
-      # down to a call to target_compile_options().
-      set(INTERNAL_CXX11_STANDARD_COMPILE_OPTION "-std=c++11")
-      set(INTERNAL_CXX11_EXTENSION_COMPILE_OPTION "-std=c++11")
-      set(INTERNAL_CXX14_STANDARD_COMPILE_OPTION "-std=c++11")
-      set(INTERNAL_CXX14_EXTENSION_COMPILE_OPTION "-std=c++11")
-    else()
-      # Assume GNU.  CMAKE_CXX_STANDARD is handled correctly by CMake 3.1 and
-      # above for this compiler.  If the user explicitly requests a C++
-      # standard, CMake takes care of it.  If not, transitively require C++11.
-      if(NOT CMAKE_CXX_STANDARD)
-        set(INTERNAL_CXX11_STANDARD_COMPILE_OPTION ${CMAKE_CXX11_STANDARD_COMPILE_OPTION})
-        set(INTERNAL_CXX11_EXTENSION_COMPILE_OPTION ${CMAKE_CXX11_EXTENSION_COMPILE_OPTION})
-      endif()
-    endif()
-
-    # Set the C++ standard info for Kokkos respecting user set values for
-    # CMAKE_CXX_STANDARD and CMAKE_CXX_EXTENSIONS.
-    # Only use cxx extension if explicitly requested
-    if(CMAKE_CXX_STANDARD EQUAL 14)
-      if(DEFINED CMAKE_CXX_EXTENSIONS AND CMAKE_CXX_EXTENSIONS STREQUAL ON)
-        set(INTERNAL_CXX_FLAGS ${INTERNAL_CXX14_EXTENSION_COMPILE_OPTION})
-      else()
-        set(INTERNAL_CXX_FLAGS ${INTERNAL_CXX14_STANDARD_COMPILE_OPTION})
-      endif()
-    elseif(CMAKE_CXX_STANDARD EQUAL 11)
-      if(DEFINED CMAKE_CXX_EXTENSIONS AND CMAKE_CXX_EXTENSIONS STREQUAL ON)
-        set(INTERNAL_CXX_FLAGS ${INTERNAL_CXX11_EXTENSION_COMPILE_OPTION})
-      else()
-        set(INTERNAL_CXX_FLAGS ${INTERNAL_CXX11_STANDARD_COMPILE_OPTION})
-      endif()
-    else()
-      # The user didn't explicitly request a standard, transitively require
-      # C++11 respecting CMAKE_CXX_EXTENSIONS.
-      if(DEFINED CMAKE_CXX_EXTENSIONS AND CMAKE_CXX_EXTENSIONS STREQUAL ON)
-        set(INTERNAL_CXX_FLAGS ${INTERNAL_CXX11_EXTENSION_COMPILE_OPTION})
-      else()
-        set(INTERNAL_CXX_FLAGS ${INTERNAL_CXX11_STANDARD_COMPILE_OPTION})
-      endif()
-    endif()
-
-    set(KOKKOS_CXX_FLAGS ${INTERNAL_CXX_FLAGS} PARENT_SCOPE)
-  endif()
-endfunction()
-
-
-#-------------------------------------------------------------------------------
-# function(set_kokkos_sources)
-# Takes a list of sources for kokkos (e.g., KOKKOS_SRC from Makefile.kokkos and
-# put it into kokkos_generated_settings.cmake) and sorts the files into the subpackages or
-# separate_libraries.  This is core and containers (algorithms is pure header
-# files).
-#
-# Inputs:
-#   KOKKOS_SRC
 # 
-# Outputs:
-#   KOKKOS_CORE_SRCS
-#   KOKKOS_CONTAINERS_SRCS
 #
-function(set_kokkos_srcs)
-  set(opts ) # no-value args
-  set(oneValArgs )
-  set(multValArgs KOKKOS_SRC) # e.g., lists
-  cmake_parse_arguments(IN "${opts}" "${oneValArgs}" "${multValArgs}" ${ARGN})
+# @FUNCTION: kokkos_deprecated_list
+#
+# Function that checks if a deprecated list option like Kokkos_ARCH was given.
+# This prints an error and prevents configure from completing.
+# It attempts to print a helpful message about updating the options for the new CMake.
+# Kokkos_${SUFFIX} is the name of the option (like Kokkos_ARCH) being checked.
+# Kokkos_${PREFIX}_X is the name of new option to be defined from a list X,Y,Z,...
+FUNCTION(kokkos_deprecated_list SUFFIX PREFIX)
+  SET(CAMEL_NAME Kokkos_${SUFFIX})
+  STRING(TOUPPER ${CAMEL_NAME} UC_NAME)
 
-  foreach(sfile ${IN_KOKKOS_SRC})
-     string(REPLACE "${CMAKE_CURRENT_SOURCE_DIR}/" "" stripfile "${sfile}")
-     string(REPLACE "/" ";" striplist "${stripfile}")
-     list(GET striplist 0 firstdir)
-     if(${firstdir} STREQUAL "core")
-       list(APPEND KOKKOS_CORE_SRCS ${sfile})
-     else()
-       list(APPEND KOKKOS_CONTAINERS_SRCS ${sfile})
-     endif()
-  endforeach()
-  set(KOKKOS_CORE_SRCS ${KOKKOS_CORE_SRCS} PARENT_SCOPE)
-  set(KOKKOS_CONTAINERS_SRCS ${KOKKOS_CONTAINERS_SRCS} PARENT_SCOPE)
-  return()
-endfunction()
+  #I don't love doing it this way but better to be safe
+  FOREACH(opt ${KOKKOS_GIVEN_VARIABLES})
+    STRING(TOUPPER ${opt} OPT_UC)
+    IF ("${OPT_UC}" STREQUAL "${UC_NAME}")
+      STRING(REPLACE "," ";" optlist "${${opt}}")
+      SET(ERROR_MSG "Given deprecated option list ${opt}. This must now be given as separate -D options, which assuming you spelled options correctly would be:")
+      FOREACH(entry ${optlist})
+        STRING(TOUPPER ${entry} ENTRY_UC)
+        STRING(APPEND ERROR_MSG "\n  -DKokkos_${PREFIX}_${ENTRY_UC}=ON")
+      ENDFOREACH()
+      STRING(APPEND ERROR_MSG "\nRemove CMakeCache.txt and re-run. For a list of valid options, refer to BUILD.md or even look at CMakeCache.txt (before deleting it).")
+      IF (KOKKOS_HAS_TRILINOS)
+        MESSAGE(WARNING ${ERROR_MSG})
+        FOREACH(entry ${optlist})
+          STRING(TOUPPER ${entry} ENTRY_UC)
+          SET(${CAMEL_NAME}_${ENTRY_UC} ON CACHE BOOL "Deprecated Trilinos translation")
+        ENDFOREACH()
+        UNSET(${opt} CACHE)
+      ELSE()
+        MESSAGE(SEND_ERROR ${ERROR_MSG})
+      ENDIF()
+    ENDIF()
+  ENDFOREACH()
+ENDFUNCTION()
 
-# Setting a default value if it is not already set
-macro(set_kokkos_default_default VARIABLE DEFAULT)
-  IF( "${KOKKOS_INTERNAL_ENABLE_${VARIABLE}_DEFAULT}" STREQUAL "" )
-    IF( "${KOKKOS_ENABLE_${VARIABLE}}" STREQUAL "" )
-      set(KOKKOS_INTERNAL_ENABLE_${VARIABLE}_DEFAULT ${DEFAULT})
-  #    MESSAGE(WARNING "Set: KOKKOS_INTERNAL_ENABLE_${VARIABLE}_DEFAULT to ${KOKKOS_INTERNAL_ENABLE_${VARIABLE}_DEFAULT}")
+FUNCTION(kokkos_option CAMEL_SUFFIX DEFAULT TYPE DOCSTRING)
+  SET(CAMEL_NAME Kokkos_${CAMEL_SUFFIX})
+  STRING(TOUPPER ${CAMEL_NAME} UC_NAME)
+
+  # Make sure this appears in the cache with the appropriate DOCSTRING
+  SET(${CAMEL_NAME} ${DEFAULT} CACHE ${TYPE} ${DOCSTRING})
+
+  #I don't love doing it this way because it's N^2 in number options, but cest la vie
+  FOREACH(opt ${KOKKOS_GIVEN_VARIABLES})
+    STRING(TOUPPER ${opt} OPT_UC)
+    IF ("${OPT_UC}" STREQUAL "${UC_NAME}")
+      IF (NOT "${opt}" STREQUAL "${CAMEL_NAME}")
+        IF (KOKKOS_HAS_TRILINOS)
+          #Allow this for now if Trilinos... we need to bootstrap our way to integration
+          MESSAGE(WARNING "Deprecated option ${opt} found - please change spelling to ${CAMEL_NAME}")
+          SET(${CAMEL_NAME} "${${opt}}" CACHE ${TYPE} ${DOCSTRING} FORCE)
+          UNSET(${opt} CACHE)
+        ELSE()
+          MESSAGE(FATAL_ERROR "Matching option found for ${CAMEL_NAME} with the wrong case ${opt}. Please delete your CMakeCache.txt and change option to -D${CAMEL_NAME}=${${opt}}. This is now enforced to avoid hard-to-debug CMake cache inconsistencies.")
+	ENDIF()
+      ENDIF()
+    ENDIF()
+  ENDFOREACH()
+
+  #okay, great, we passed the validation test - use the default
+  IF (DEFINED ${CAMEL_NAME})
+    SET(${UC_NAME} ${${CAMEL_NAME}} PARENT_SCOPE)
+  ELSE()
+    SET(${UC_NAME} ${DEFAULT} PARENT_SCOPE)
+  ENDIF()
+
+ENDFUNCTION()
+
+FUNCTION(kokkos_append_config_line LINE)
+  GLOBAL_APPEND(KOKKOS_TPL_EXPORTS "${LINE}")
+ENDFUNCTION()
+
+MACRO(kokkos_export_cmake_tpl NAME)
+  #CMake TPLs are located with a call to find_package
+  #find_package locates XConfig.cmake files through
+  #X_DIR or X_ROOT variables set prior to calling find_package
+
+  #If Kokkos was configured to find the TPL through a _DIR variable
+  #make sure thar DIR variable is available to downstream packages
+  IF (DEFINED ${NAME}_DIR)
+    #The downstream project may override the TPL location that Kokkos used
+    #Check if the downstream project chose its own TPL location
+    #If not, make the Kokkos found location available
+    KOKKOS_APPEND_CONFIG_LINE("IF(NOT DEFINED ${NAME}_DIR)")
+    KOKKOS_APPEND_CONFIG_LINE("  SET(${NAME}_DIR  ${${NAME}_DIR})")
+    KOKKOS_APPEND_CONFIG_LINE("ENDIF()")
+  ENDIF()
+
+  IF (DEFINED ${NAME}_ROOT)
+    #The downstream project may override the TPL location that Kokkos used
+    #Check if the downstream project chose its own TPL location
+    #If not, make the Kokkos found location available
+    KOKKOS_APPEND_CONFIG_LINE("IF(NOT DEFINED ${NAME}_ROOT)")
+    KOKKOS_APPEND_CONFIG_LINE("  SET(${NAME}_ROOT  ${${NAME}_ROOT})")
+    KOKKOS_APPEND_CONFIG_LINE("ENDIF()")
+  ENDIF()
+  KOKKOS_APPEND_CONFIG_LINE("FIND_DEPENDENCY(${NAME})")
+ENDMACRO()
+
+MACRO(kokkos_export_imported_tpl NAME)
+  IF (NOT KOKKOS_HAS_TRILINOS)
+    GET_TARGET_PROPERTY(LIB_TYPE ${NAME} TYPE)
+    IF (${LIB_TYPE} STREQUAL "INTERFACE_LIBRARY")
+      # This is not an imported target
+      # This an interface library that we created
+      INSTALL(
+        TARGETS ${NAME}
+        EXPORT KokkosTargets
+        RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
+        LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
+        ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
+      )
     ELSE()
-      set(KOKKOS_INTERNAL_ENABLE_${VARIABLE}_DEFAULT ${KOKKOS_ENABLE_${VARIABLE}})
-   #   MESSAGE(WARNING "Set: KOKKOS_INTERNAL_ENABLE_${VARIABLE}_DEFAULT to ${KOKKOS_INTERNAL_ENABLE_${VARIABLE}_DEFAULT}")
+      #make sure this also gets "exported" in the config file
+      KOKKOS_APPEND_CONFIG_LINE("IF(NOT TARGET ${NAME})")
+      KOKKOS_APPEND_CONFIG_LINE("ADD_LIBRARY(${NAME} UNKNOWN IMPORTED)")
+      KOKKOS_APPEND_CONFIG_LINE("SET_TARGET_PROPERTIES(${NAME} PROPERTIES")
+      
+      GET_TARGET_PROPERTY(TPL_LIBRARY ${NAME} IMPORTED_LOCATION)
+      IF(TPL_LIBRARY)
+        KOKKOS_APPEND_CONFIG_LINE("IMPORTED_LOCATION ${TPL_LIBRARY}")
+      ENDIF()
+
+      GET_TARGET_PROPERTY(TPL_INCLUDES ${NAME} INTERFACE_INCLUDE_DIRECTORIES)
+      IF(TPL_INCLUDES)
+        KOKKOS_APPEND_CONFIG_LINE("INTERFACE_INCLUDE_DIRECTORIES ${TPL_INCLUDES}")
+      ENDIF()
+
+      GET_TARGET_PROPERTY(TPL_COMPILE_OPTIONS ${NAME} INTERFACE_COMPILE_OPTIONS)
+      IF(TPL_COMPILE_OPTIONS)
+        KOKKOS_APPEND_CONFIG_LINE("INTERFACE_COMPILE_OPTIONS ${TPL_COMPILE_OPTIONS}")
+      ENDIF()
+
+      SET(TPL_LINK_OPTIONS)
+      IF(${CMAKE_VERSION} VERSION_GREATER_EQUAL "3.13.0")
+        GET_TARGET_PROPERTY(TPL_LINK_OPTIONS ${NAME} INTERFACE_LINK_OPTIONS)
+      ENDIF()
+      IF(TPL_LINK_OPTIONS)
+        KOKKOS_APPEND_CONFIG_LINE("INTERFACE_LINK_OPTIONS ${TPL_LINK_OPTIONS}")
+      ENDIF()
+
+      GET_TARGET_PROPERTY(TPL_LINK_LIBRARIES  ${NAME} INTERFACE_LINK_LIBRARIES)
+      IF(TPL_LINK_LIBRARIES)
+        KOKKOS_APPEND_CONFIG_LINE("INTERFACE_LINK_LIBRARIES ${TPL_LINK_LIBRARIES}")
+      ENDIF()
+      KOKKOS_APPEND_CONFIG_LINE(")")
+      KOKKOS_APPEND_CONFIG_LINE("ENDIF()")
     ENDIF()
   ENDIF()
-  UNSET(KOKKOS_ENABLE_${VARIABLE} CACHE)
-endmacro()
+ENDMACRO()
+
+
+#
+# @MACRO: KOKKOS_IMPORT_TPL()
+#
+# Function that checks if a third-party library (TPL) has been enabled and calls `find_package`
+# to create an imported target encapsulating all the flags and libraries
+# needed to use the TPL
+#
+# Usage::
+#
+#   KOKKOS_IMPORT_TPL(
+#     <NAME>
+#     NO_EXPORT
+#     INTERFACE
+#
+#   ``NO_EXPORT``
+#
+#     If specified, this TPL will not be added to KokkosConfig.cmake as an export
+#
+#   ``INTERFACE``
+#
+#     If specified, this TPL will build an INTERFACE library rather than an
+#     IMPORTED target
+MACRO(kokkos_import_tpl NAME)
+  CMAKE_PARSE_ARGUMENTS(TPL
+   "NO_EXPORT;INTERFACE"
+   ""
+   ""
+   ${ARGN})
+  IF (TPL_INTERFACE)
+    SET(TPL_IMPORTED_NAME ${NAME})
+  ELSE()
+    SET(TPL_IMPORTED_NAME Kokkos::${NAME})
+  ENDIF()
+
+  # Even though this policy gets set in the top-level CMakeLists.txt,
+  # I have still been getting errors about ROOT variables being ignored
+  # I'm not sure if this is a scope issue - but make sure
+  # the policy is set before we do any find_package calls
+  IF(${CMAKE_VERSION} VERSION_GREATER_EQUAL "3.12.0") 
+    CMAKE_POLICY(SET CMP0074 NEW)
+  ENDIF()
+
+  IF (KOKKOS_ENABLE_${NAME})
+    #Tack on a TPL here to make sure we avoid using anyone else's find
+    FIND_PACKAGE(TPL${NAME} REQUIRED MODULE)
+    IF(NOT TARGET ${TPL_IMPORTED_NAME})
+      MESSAGE(FATAL_ERROR "Find module succeeded for ${NAME}, but did not produce valid target ${TPL_IMPORTED_NAME}")
+    ENDIF()
+    IF(NOT TPL_NO_EXPORT)
+      KOKKOS_EXPORT_IMPORTED_TPL(${TPL_IMPORTED_NAME})
+    ENDIF()
+    LIST(APPEND KOKKOS_ENABLED_TPLS ${NAME})
+  ENDIF()
+ENDMACRO(kokkos_import_tpl)
+
+MACRO(kokkos_import_cmake_tpl MODULE_NAME)
+  kokkos_import_tpl(${MODULE_NAME} ${ARGN} NO_EXPORT)
+  CMAKE_PARSE_ARGUMENTS(TPL
+   "NO_EXPORT"
+   "OPTION_NAME"
+   ""
+   ${ARGN})
+
+  IF (NOT TPL_OPTION_NAME)
+    SET(TPL_OPTION_NAME ${MODULE_NAME})
+  ENDIF()
+
+  IF (NOT TPL_NO_EXPORT)
+    KOKKOS_EXPORT_CMAKE_TPL(${MODULE_NAME})
+  ENDIF()
+ENDMACRO()
+
+#
+# @MACRO: KOKKOS_CREATE_IMPORTED_TPL()
+#
+# Function that creates an imported target encapsulating all the flags
+# and libraries needed to use the TPL
+#
+# Usage::
+#
+#   KOKKOS_CREATE_IMPORTED_TPL(
+#     <NAME>
+#     INTERFACE
+#     LIBRARY <path_to_librarY>
+#     LINK_LIBRARIES <lib1> <lib2> ...
+#     COMPILE_OPTIONS <opt1> <opt2> ...
+#     LINK_OPTIONS <opt1> <opt2> ...
+#
+#   ``INTERFACE``
+#
+#     If specified, this TPL will build an INTERFACE library rather than an
+#     IMPORTED target
+#
+#   ``LIBRARY <path_to_library>``
+#
+#     If specified, this gives the IMPORTED_LOCATION of the library.
+#
+#   ``LINK_LIBRARIES <lib1> <lib2> ...``
+#
+#     If specified, this gives a list of dependent libraries that also
+#     need to be linked against. Each entry can be a library path or
+#     the name of a valid CMake target.
+#
+#   ``INCLUDES <path1> <path2> ...``
+#
+#     If specified, this gives a list of directories that must be added
+#     to the include path for using this library.
+#
+#   ``COMPILE_OPTIONS <opt1> <opt2> ...``
+#
+#     If specified, this gives a list of compiler flags that must be used
+#     for using this library.
+#
+#   ``LINK_OPTIONS <opt1> <opt2> ...``
+#
+#     If specified, this gives a list of linker flags that must be used
+#     for using this library.
+MACRO(kokkos_create_imported_tpl NAME)
+  CMAKE_PARSE_ARGUMENTS(TPL
+   "INTERFACE"
+   "LIBRARY"
+   "LINK_LIBRARIES;INCLUDES;COMPILE_OPTIONS;LINK_OPTIONS"
+   ${ARGN})
+
+
+  IF (KOKKOS_HAS_TRILINOS)
+    #TODO: we need to set a bunch of cache variables here
+  ELSEIF (TPL_INTERFACE)
+    ADD_LIBRARY(${NAME} INTERFACE)
+    #Give this an importy-looking name
+    ADD_LIBRARY(Kokkos::${NAME} ALIAS ${NAME})
+    IF (TPL_LIBRARY)
+      MESSAGE(SEND_ERROR "TPL Interface library ${NAME} should not have an IMPORTED_LOCATION")
+    ENDIF()
+    #Things have to go in quoted in case we have multiple list entries
+    IF(TPL_LINK_LIBRARIES)
+      TARGET_LINK_LIBRARIES(${NAME} INTERFACE ${TPL_LINK_LIBRARIES})
+    ENDIF()
+    IF(TPL_INCLUDES)
+      TARGET_INCLUDE_DIRECTORIES(${NAME} INTERFACE ${TPL_INCLUDES})
+    ENDIF()
+    IF(TPL_COMPILE_OPTIONS)
+      TARGET_COMPILE_OPTIONS(${NAME} INTERFACE ${TPL_COMPILE_OPTIONS})
+    ENDIF()
+    IF(TPL_LINK_OPTIONS)
+      TARGET_LINK_LIBRARIES(${NAME} INTERFACE ${TPL_LINK_OPTIONS})
+    ENDIF()
+  ELSE()
+    ADD_LIBRARY(${NAME} UNKNOWN IMPORTED)
+    IF(TPL_LIBRARY)
+      SET_TARGET_PROPERTIES(${NAME} PROPERTIES
+        IMPORTED_LOCATION ${TPL_LIBRARY})
+    ENDIF()
+    #Things have to go in quoted in case we have multiple list entries
+    IF(TPL_LINK_LIBRARIES)
+      SET_TARGET_PROPERTIES(${NAME} PROPERTIES
+        INTERFACE_LINK_LIBRARIES "${TPL_LINK_LIBRARIES}")
+    ENDIF()
+    IF(TPL_INCLUDES)
+      SET_TARGET_PROPERTIES(${NAME} PROPERTIES
+        INTERFACE_INCLUDE_DIRECTORIES "${TPL_INCLUDES}")
+    ENDIF()
+    IF(TPL_COMPILE_OPTIONS)
+      SET_TARGET_PROPERTIES(${NAME} PROPERTIES
+        INTERFACE_COMPILE_OPTIONS "${TPL_COMPILE_OPTIONS}")
+    ENDIF()
+    IF(TPL_LINK_OPTIONS)
+      SET_TARGET_PROPERTIES(${NAME} PROPERTIES
+        INTERFACE_LINK_LIBRARIES "${TPL_LINK_OPTIONS}")
+    ENDIF()
+  ENDIF()
+ENDMACRO()
+
+#
+# @MACRO: KOKKOS_FIND_HEADER
+#
+# Function that finds a particular header. This searches custom paths
+# or default system paths depending on options. In constrast to CMake
+# default, custom paths are prioritized over system paths. The searched
+# order is:
+# 1. <NAME>_ROOT variable
+# 2. Kokkos_<NAME>_DIR variable
+# 3. Locations in the PATHS option
+# 4. Default system paths, if allowed.
+#
+# Default system paths are allowed if none of options (1)-(3) are specified
+# or if default paths are specifically allowed via ALLOW_SYSTEM_PATH_FALLBACK
+#
+# Usage::
+#
+#   KOKKOS_FIND_HEADER(
+#     <VAR_NAME>
+#     <HEADER>
+#     <TPL_NAME>
+#    [ALLOW_SYSTEM_PATH_FALLBACK]
+#    [PATHS path1 [path2 ...]]
+#   )
+#
+#   ``<VAR_NAME>``
+#
+#   The variable to define with the success or failure of the find
+#
+#   ``<HEADER>``
+#
+#   The name of the header to find
+#
+#   ``<TPL_NAME>``
+#
+#   The name of the TPL the header corresponds to
+#
+#   ``[ALLOW_SYSTEM_PATH_FALLBACK]``
+#
+#   If custom paths are given and the header is not found
+#   should we be allowed to search default system paths
+#   or error out if not found in given paths
+#
+#   ``[PATHS path1 [path2 ...]]``
+#
+#   Custom paths to search for the header
+#
+MACRO(kokkos_find_header VAR_NAME HEADER TPL_NAME)
+  CMAKE_PARSE_ARGUMENTS(TPL
+   "ALLOW_SYSTEM_PATH_FALLBACK"
+   ""
+   "PATHS"
+   ${ARGN})
+
+  SET(${HEADER}_FOUND FALSE)
+  SET(HAVE_CUSTOM_PATHS FALSE)
+  IF(NOT ${HEADER}_FOUND AND DEFINED ${TPL_NAME}_ROOT)
+    #ONLY look in the root directory
+    FIND_PATH(${VAR_NAME} ${HEADER} PATHS ${${TPL_NAME}_ROOT}/include NO_DEFAULT_PATH)
+    SET(HAVE_CUSTOM_PATHS TRUE)
+  ENDIF()
+
+  IF(NOT ${HEADER}_FOUND AND DEFINED KOKKOS_${TPL_NAME}_DIR)
+    #ONLY look in the root directory
+    FIND_PATH(${VAR_NAME} ${HEADER} PATHS ${KOKKOS_${TPL_NAME}_DIR}/include NO_DEFAULT_PATH)
+    SET(HAVE_CUSTOM_PATHS TRUE)
+  ENDIF()
+
+  IF (NOT ${HEADER}_FOUND AND TPL_PATHS)
+    #we got custom paths
+    #ONLY look in these paths and nowhere else
+    FIND_PATH(${VAR_NAME} ${HEADER} PATHS ${TPL_PATHS} NO_DEFAULT_PATH)
+    SET(HAVE_CUSTOM_PATHS TRUE)
+  ENDIF()
+
+  IF (NOT HAVE_CUSTOM_PATHS OR TPL_ALLOW_SYSTEM_PATH_FALLBACK)
+    #Now go ahead and look in system paths
+    IF (NOT ${HEADER}_FOUND)
+      FIND_PATH(${VAR_NAME} ${HEADER})
+    ENDIF()
+  ENDIF()
+ENDMACRO()
+
+#
+# @MACRO: KOKKOS_FIND_LIBRARY
+#
+# Function that find a particular library. This searches custom paths
+# or default system paths depending on options. In constrast to CMake
+# default, custom paths are prioritized over system paths. The search
+# order is:
+# 1. <NAME>_ROOT variable
+# 2. Kokkos_<NAME>_DIR variable
+# 3. Locations in the PATHS option
+# 4. Default system paths, if allowed.
+#
+# Default system paths are allowed if none of options (1)-(3) are specified
+# or if default paths are specifically allowed via ALLOW_SYSTEM_PATH_FALLBACK
+#
+# Usage::
+#
+#   KOKKOS_FIND_LIBRARY(
+#     <VAR_NAME>
+#     <HEADER>
+#     <TPL_NAME>
+#    [ALLOW_SYSTEM_PATH_FALLBACK]
+#    [PATHS path1 [path2 ...]]
+#   )
+#
+#   ``<VAR_NAME>``
+#
+#   The variable to define with the success or failure of the find
+#
+#   ``<LIBRARY>``
+#
+#   The name of the library to find (NOT prefixed with -l)
+#
+#   ``<TPL_NAME>``
+#
+#   The name of the TPL the library corresponds to
+#
+#   ``ALLOW_SYSTEM_PATH_FALLBACK``
+#
+#   If custom paths are given and the library is not found
+#   should we be allowed to search default system paths
+#   or error out if not found in given paths
+#
+#   ``PATHS``
+#
+#   Custom paths to search for the library
+#
+MACRO(kokkos_find_library VAR_NAME LIB TPL_NAME)
+  CMAKE_PARSE_ARGUMENTS(TPL
+   "ALLOW_SYSTEM_PATH_FALLBACK"
+   ""
+   "PATHS"
+   ${ARGN})
+
+  SET(${LIB}_FOUND FALSE)
+  SET(HAVE_CUSTOM_PATHS FALSE)
+  IF(NOT ${LIB}_FOUND AND DEFINED ${TPL_NAME}_ROOT)
+    FIND_LIBRARY(${VAR_NAME} ${LIB} PATHS ${${TPL_NAME}_ROOT}/lib ${${TPL_NAME}_ROOT}/lib64 NO_DEFAULT_PATH)
+    SET(HAVE_CUSTOM_PATHS TRUE)
+  ENDIF()
+
+  IF(NOT ${LIB}_FOUND AND DEFINED KOKKOS_${TPL_NAME}_DIR)
+    #we got root paths, only look in these paths and nowhere else
+    FIND_LIBRARY(${VAR_NAME} ${LIB} PATHS ${KOKKOS_${TPL_NAME}_DIR}/lib ${KOKKOS_${TPL_NAME}_DIR}/lib64 NO_DEFAULT_PATH)
+    SET(HAVE_CUSTOM_PATHS TRUE)
+  ENDIF()
+
+  IF (NOT ${LIB}_FOUND AND TPL_PATHS)
+    #we got custom paths, only look in these paths and nowhere else
+    FIND_LIBRARY(${VAR_NAME} ${LIB} PATHS ${TPL_PATHS} NO_DEFAULT_PATH)
+    SET(HAVE_CUSTOM_PATHS TRUE)
+  ENDIF()
+
+
+  IF (NOT HAVE_CUSTOM_PATHS OR TPL_ALLOW_SYSTEM_PATH_FALLBACK)
+    IF (NOT ${LIB}_FOUND)
+      #Now go ahead and look in system paths
+      FIND_LIBRARY(${VAR_NAME} ${LIB})
+    ENDIF()
+  ENDIF()
+ENDMACRO()
+
+#
+# @MACRO: KOKKOS_FIND_IMPORTED
+#
+# Function that finds all libraries and headers needed for the tpl
+# and creates an imported target encapsulating all the flags and libraries
+#
+# Usage::
+#
+#   KOKKOS_FIND_IMPORTED(
+#     <NAME>
+#     INTERFACE
+#     ALLOW_SYSTEM_PATH_FALLBACK
+#     LIBRARY <path_to_librarY>
+#     LINK_LIBRARIES <lib1> <lib2> ...
+#     COMPILE_OPTIONS <opt1> <opt2> ...
+#     LINK_OPTIONS <opt1> <opt2> ...
+#
+#   ``INTERFACE``
+#
+#     If specified, this TPL will build an INTERFACE library rather than an
+#     IMPORTED target
+#
+#   ``ALLOW_SYSTEM_PATH_FALLBACK"
+#
+#     If custom paths are given and the library is not found
+#     should we be allowed to search default system paths
+#     or error out if not found in given paths.
+#
+#   ``LIBRARY <name>``
+#
+#     If specified, this gives the name of the library to look for
+#
+#   ``MODULE_NAME <name>``
+#
+#     If specified, the name of the enclosing module passed to
+#     FIND_PACKAGE(<MODULE_NAME>). Defaults to TPL${NAME} if not
+#     given.
+#
+#   ``IMPORTED_NAME <name>``
+#
+#     If specified, this gives the name of the target to build.
+#     Defaults to Kokkos::<NAME>
+#
+#   ``LIBRARY_PATHS <path1> <path2> ...``
+#
+#     If specified, this gives a list of paths to search for the library
+#     If not given, <NAME>_ROOT/lib and <NAME>_ROOT/lib64 will be searched.
+#
+#   ``HEADER_PATHS <path1> <path2> ...``
+#
+#     If specified, this gives a list of paths to search for the headers
+#     If not given, <NAME>_ROOT/include and <NAME>_ROOT/include will be searched.
+#
+#   ``HEADERS <name1> <name2> ...``
+#
+#     If specified, this gives a list of headers to find for the package
+#
+#   ``LIBRARIES <name1> <name2> ...``
+#
+#     If specified, this gives a list of libraries to find for the package
+#
+MACRO(kokkos_find_imported NAME)
+  CMAKE_PARSE_ARGUMENTS(TPL
+   "INTERFACE;ALLOW_SYSTEM_PATH_FALLBACK"
+   "HEADER;LIBRARY;IMPORTED_NAME;MODULE_NAME"
+   "HEADER_PATHS;LIBRARY_PATHS;HEADERS;LIBRARIES"
+   ${ARGN})
+
+  IF(NOT TPL_MODULE_NAME)
+    SET(TPL_MODULE_NAME TPL${NAME})
+  ENDIF()
+
+  IF (TPL_ALLOW_SYSTEM_PATH_FALLBACK)
+    SET(ALLOW_PATH_FALLBACK_OPT ALLOW_SYSTEM_PATH_FALLBACK)
+  ELSE()
+    SET(ALLOW_PATH_FALLBACK_OPT)
+  ENDIF()
+
+  IF (NOT TPL_IMPORTED_NAME)
+    IF (TPL_INTERFACE)
+      SET(TPL_IMPORTED_NAME ${NAME})
+    ELSE()
+      SET(TPL_IMPORTED_NAME Kokkos::${NAME})
+    ENDIF()
+  ENDIF()
+
+  SET(${NAME}_INCLUDE_DIRS)
+  IF (TPL_HEADER)
+    KOKKOS_FIND_HEADER(${NAME}_INCLUDE_DIRS ${TPL_HEADER} ${NAME} ${ALLOW_PATH_FALLBACK_OPT} PATHS ${TPL_HEADER_PATHS})
+  ENDIF()
+
+  FOREACH(HEADER ${TPL_HEADERS})
+    KOKKOS_FIND_HEADER(HEADER_FIND_TEMP ${HEADER} ${NAME} ${ALLOW_PATH_FALLBACK_OPT} PATHS ${TPL_HEADER_PATHS})
+    IF(HEADER_FIND_TEMP)
+      LIST(APPEND ${NAME}_INCLUDE_DIRS ${HEADER_FIND_TEMP})
+    ENDIF()
+  ENDFOREACH()
+
+  SET(${NAME}_LIBRARY)
+  IF(TPL_LIBRARY)
+    KOKKOS_FIND_LIBRARY(${NAME}_LIBRARY ${TPL_LIBRARY} ${NAME} ${ALLOW_PATH_FALLBACK_OPT} PATHS ${TPL_LIBRARY_PATHS})
+  ENDIF()
+
+  SET(${NAME}_FOUND_LIBRARIES)
+  FOREACH(LIB ${TPL_LIBRARIES})
+    KOKKOS_FIND_LIBRARY(${LIB}_LOCATION ${LIB} ${NAME} ${ALLOW_PATH_FALLBACK_OPT} PATHS ${TPL_LIBRARY_PATHS})
+    IF(${LIB}_LOCATION)
+      LIST(APPEND ${NAME}_FOUND_LIBRARIES ${${LIB}_LOCATION})
+    ELSE()
+      SET(${NAME}_FOUND_LIBRARIES ${${LIB}_LOCATION}) 
+      BREAK()
+    ENDIF()
+  ENDFOREACH()
+
+  INCLUDE(FindPackageHandleStandardArgs)
+  #Collect all the variables we need to be valid for
+  #find_package to have succeeded
+  SET(TPL_VARS_NEEDED)
+  IF (TPL_LIBRARY)
+    LIST(APPEND TPL_VARS_NEEDED ${NAME}_LIBRARY)
+  ENDIF()
+  IF(TPL_HEADER)
+    LIST(APPEND TPL_VARS_NEEDED ${NAME}_INCLUDE_DIRS)
+  ENDIF()
+  IF(TPL_LIBRARIES)
+    LIST(APPEND TPL_VARS_NEEDED ${NAME}_FOUND_LIBRARIES)
+  ENDIF()
+  FIND_PACKAGE_HANDLE_STANDARD_ARGS(${TPL_MODULE_NAME} REQUIRED_VARS ${TPL_VARS_NEEDED})
+
+  MARK_AS_ADVANCED(${NAME}_INCLUDE_DIRS ${NAME}_FOUND_LIBRARIES ${NAME}_LIBRARY)
+
+  IF (${TPL_MODULE_NAME}_FOUND)
+    SET(IMPORT_TYPE)
+    IF (TPL_INTERFACE)
+      SET(IMPORT_TYPE "INTERFACE")
+    ENDIF()
+    KOKKOS_CREATE_IMPORTED_TPL(${TPL_IMPORTED_NAME}
+      ${IMPORT_TYPE}
+      INCLUDES "${${NAME}_INCLUDE_DIRS}"
+      LIBRARY  "${${NAME}_LIBRARY}"
+      LINK_LIBRARIES "${${NAME}_FOUND_LIBRARIES}")
+  ENDIF()
+ENDMACRO(kokkos_find_imported)
+
+#
+# @MACRO: KOKKOS_LINK_TPL()
+#
+# Function that checks if a third-party library (TPL) has been enabled and
+# calls target_link_libraries on the given target
+#
+# Usage::
+#
+#   KOKKOS_LINK_TPL(
+#     <TARGET>
+#     PUBLIC
+#     PRIVATE
+#     INTERFACE
+#     IMPORTED_NAME  <name>
+#     <TPL_NAME>
+#
+#   Checks if Kokkos_ENABLE_<TPL_NAME>=ON and if so links the library
+#
+#   ``PUBLIC/PRIVATE/INTERFACE``
+#
+#     Specifies the linkage mode. One of these arguments should be given.
+#     This will then invoke target_link_libraries(<TARGET> PUBLIC/PRIVATE/INTERFACE <TPL_NAME>)
+#
+#   ``IMPORTED_NAME <name>``
+#
+#     If specified, this gives the exact name of the target to link against
+#     target_link_libraries(<TARGET> <IMPORTED_NAME>)
+#
+FUNCTION(kokkos_link_tpl TARGET)
+  CMAKE_PARSE_ARGUMENTS(TPL
+   "PUBLIC;PRIVATE;INTERFACE"
+   "IMPORTED_NAME"
+   ""
+   ${ARGN})
+  #the name of the TPL
+  SET(TPL ${TPL_UNPARSED_ARGUMENTS})
+  IF (KOKKOS_HAS_TRILINOS)
+    #Do nothing, they will have already been linked
+  ELSE()
+    IF (NOT TPL_IMPORTED_NAME)
+      SET(TPL_IMPORTED_NAME Kokkos::${TPL})
+    ENDIF()
+    IF (KOKKOS_ENABLE_${TPL})
+      IF (TPL_PUBLIC)
+        TARGET_LINK_LIBRARIES(${TARGET} PUBLIC ${TPL_IMPORTED_NAME})
+      ELSEIF (TPL_PRIVATE)
+        TARGET_LINK_LIBRARIES(${TARGET} PRIVATE ${TPL_IMPORTED_NAME})
+      ELSEIF (TPL_INTERFACE)
+        TARGET_LINK_LIBRARIES(${TARGET} INTERFACE ${TPL_IMPORTED_NAME})
+      ELSE()
+        TARGET_LINK_LIBRARIES(${TARGET} ${TPL_IMPORTED_NAME})
+      ENDIF()
+    ENDIF()
+  ENDIF()
+ENDFUNCTION()
+
diff --git a/lib/kokkos/cmake/kokkos_install.cmake b/lib/kokkos/cmake/kokkos_install.cmake
new file mode 100644
index 0000000000..1e4a5a2aad
--- /dev/null
+++ b/lib/kokkos/cmake/kokkos_install.cmake
@@ -0,0 +1,42 @@
+IF (NOT KOKKOS_HAS_TRILINOS)
+  INCLUDE(GNUInstallDirs)
+
+  #Set all the variables needed for KokkosConfig.cmake
+  GET_PROPERTY(KOKKOS_PROP_LIBS GLOBAL PROPERTY KOKKOS_LIBRARIES_NAMES)
+  SET(KOKKOS_LIBRARIES ${KOKKOS_PROP_LIBS})
+
+  INCLUDE(CMakePackageConfigHelpers)
+  CONFIGURE_PACKAGE_CONFIG_FILE(
+    cmake/KokkosConfig.cmake.in
+    "${Kokkos_BINARY_DIR}/KokkosConfig.cmake"
+    INSTALL_DESTINATION ${CMAKE_INSTALL_FULL_LIBDIR}/cmake)
+
+  INCLUDE(CMakePackageConfigHelpers)
+  CONFIGURE_PACKAGE_CONFIG_FILE(
+	  cmake/KokkosConfigCommon.cmake.in
+	  "${Kokkos_BINARY_DIR}/KokkosConfigCommon.cmake"
+    INSTALL_DESTINATION ${CMAKE_INSTALL_FULL_LIBDIR}/cmake)
+
+  WRITE_BASIC_PACKAGE_VERSION_FILE("${Kokkos_BINARY_DIR}/KokkosConfigVersion.cmake"
+      VERSION "${Kokkos_VERSION}"
+      COMPATIBILITY SameMajorVersion)
+
+  # Install the KokkosConfig*.cmake files
+  install(FILES
+    "${Kokkos_BINARY_DIR}/KokkosConfig.cmake"
+    "${Kokkos_BINARY_DIR}/KokkosConfigCommon.cmake"
+    "${Kokkos_BINARY_DIR}/KokkosConfigVersion.cmake"
+    DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/Kokkos)
+  install(EXPORT KokkosTargets NAMESPACE Kokkos:: DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/Kokkos)
+ELSE()
+  CONFIGURE_FILE(cmake/KokkosConfigCommon.cmake.in ${Kokkos_BINARY_DIR}/KokkosConfigCommon.cmake @ONLY)
+  file(READ ${Kokkos_BINARY_DIR}/KokkosConfigCommon.cmake KOKKOS_CONFIG_COMMON)
+  file(APPEND "${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/KokkosConfig_install.cmake" ${KOKKOS_CONFIG_COMMON})
+ENDIF()
+
+# build and install pkgconfig file
+CONFIGURE_FILE(core/src/kokkos.pc.in kokkos.pc @ONLY)
+INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/kokkos.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)
+
+INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/KokkosCore_config.h DESTINATION ${KOKKOS_HEADER_DIR})
+
diff --git a/lib/kokkos/cmake/kokkos_options.cmake b/lib/kokkos/cmake/kokkos_options.cmake
deleted file mode 100644
index e730a94664..0000000000
--- a/lib/kokkos/cmake/kokkos_options.cmake
+++ /dev/null
@@ -1,418 +0,0 @@
-########################## NOTES ###############################################
-#  List the options for configuring kokkos using CMake method of doing it.
-#  These options then get mapped onto KOKKOS_SETTINGS environment variable by
-#  kokkos_settings.cmake.  It is separate to allow other packages to override
-#  these variables (e.g., TriBITS).
-
-########################## AVAILABLE OPTIONS ###################################
-# Use lists for documentation, verification, and programming convenience
-
-# All CMake options of the type KOKKOS_ENABLE_*
-set(KOKKOS_INTERNAL_ENABLE_OPTIONS_LIST)
-list(APPEND KOKKOS_INTERNAL_ENABLE_OPTIONS_LIST
-     Serial
-     OpenMP
-     Pthread
-     Qthread
-     HPX
-     Cuda
-     ROCm
-     HWLOC
-     MEMKIND
-     LIBRT
-     Cuda_Lambda
-     Cuda_Relocatable_Device_Code
-     Cuda_UVM
-     Cuda_LDG_Intrinsic
-     HPX_ASYNC_DISPATCH
-     Debug
-     Debug_DualView_Modify_Check
-     Debug_Bounds_Check
-     Compiler_Warnings
-     Profiling
-     Profiling_Load_Print
-     Aggressive_Vectorization
-     Deprecated_Code
-     Explicit_Instantiation
-     )
-
-#-------------------------------------------------------------------------------
-#------------------------------- Recognize CamelCase Options ---------------------------
-#-------------------------------------------------------------------------------
-
-foreach(opt ${KOKKOS_INTERNAL_ENABLE_OPTIONS_LIST})
-  string(TOUPPER ${opt} OPT )
-  IF(DEFINED Kokkos_ENABLE_${opt})
-    IF(DEFINED KOKKOS_ENABLE_${OPT})
-      IF(NOT ("${KOKKOS_ENABLE_${OPT}}" STREQUAL "${Kokkos_ENABLE_${opt}}"))
-        IF(DEFINED KOKKOS_ENABLE_${OPT}_INTERNAL)
-          MESSAGE(WARNING  "Defined both Kokkos_ENABLE_${opt}=[${Kokkos_ENABLE_${opt}}] and KOKKOS_ENABLE_${OPT}=[${KOKKOS_ENABLE_${OPT}}] and they differ! Could be caused by old CMakeCache Variable. Run CMake again and warning should disappear. If not you are truly setting both variables.")
-          IF(NOT ("${Kokkos_ENABLE_${opt}}" STREQUAL "${KOKKOS_ENABLE_${OPT}_INTERNAL}"))
-            UNSET(KOKKOS_ENABLE_${OPT} CACHE)
-            SET(KOKKOS_ENABLE_${OPT} ${Kokkos_ENABLE_${opt}})
-            MESSAGE(WARNING "SET BOTH VARIABLES KOKKOS_ENABLE_${OPT}: ${KOKKOS_ENABLE_${OPT}}")
-          ELSE()
-            SET(Kokkos_ENABLE_${opt} ${KOKKOS_ENABLE_${OPT}})
-          ENDIF()
-        ELSE()
-          MESSAGE(FATAL_ERROR "Defined both Kokkos_ENABLE_${opt}=[${Kokkos_ENABLE_${opt}}] and KOKKOS_ENABLE_${OPT}=[${KOKKOS_ENABLE_${OPT}}] and they differ!")
-        ENDIF()
-      ENDIF()
-    ELSE()
-      SET(KOKKOS_INTERNAL_ENABLE_${OPT}_DEFAULT ${Kokkos_ENABLE_${opt}})
-    ENDIF()
-  ENDIF()
-endforeach()
-
-IF(DEFINED Kokkos_ARCH)
-  MESSAGE(FATAL_ERROR "Defined Kokkos_ARCH, use KOKKOS_ARCH instead!")
-ENDIF()
-IF(DEFINED Kokkos_Arch)
-  MESSAGE(FATAL_ERROR "Defined Kokkos_Arch, use KOKKOS_ARCH instead!")
-ENDIF()
-  
-#-------------------------------------------------------------------------------
-# List of possible host architectures.
-#-------------------------------------------------------------------------------
-set(KOKKOS_ARCH_LIST)
-list(APPEND KOKKOS_ARCH_LIST
-     None            # No architecture optimization
-     AMDAVX          # (HOST) AMD chip
-     ARMv80          # (HOST) ARMv8.0 Compatible CPU
-     ARMv81          # (HOST) ARMv8.1 Compatible CPU
-     ARMv8-ThunderX  # (HOST) ARMv8 Cavium ThunderX CPU
-     ARMv8-TX2       # (HOST) ARMv8 Cavium ThunderX2 CPU
-     WSM             # (HOST) Intel Westmere CPU
-     SNB             # (HOST) Intel Sandy/Ivy Bridge CPUs
-     HSW             # (HOST) Intel Haswell CPUs
-     BDW             # (HOST) Intel Broadwell Xeon E-class CPUs
-     SKX             # (HOST) Intel Sky Lake Xeon E-class HPC CPUs (AVX512)
-     KNC             # (HOST) Intel Knights Corner Xeon Phi
-     KNL             # (HOST) Intel Knights Landing Xeon Phi
-     BGQ             # (HOST) IBM Blue Gene Q
-     Power7          # (HOST) IBM POWER7 CPUs
-     Power8          # (HOST) IBM POWER8 CPUs
-     Power9          # (HOST) IBM POWER9 CPUs
-     Kepler          # (GPU) NVIDIA Kepler default (generation CC 3.5)
-     Kepler30        # (GPU) NVIDIA Kepler generation CC 3.0
-     Kepler32        # (GPU) NVIDIA Kepler generation CC 3.2
-     Kepler35        # (GPU) NVIDIA Kepler generation CC 3.5
-     Kepler37        # (GPU) NVIDIA Kepler generation CC 3.7
-     Maxwell         # (GPU) NVIDIA Maxwell default (generation CC 5.0)
-     Maxwell50       # (GPU) NVIDIA Maxwell generation CC 5.0
-     Maxwell52       # (GPU) NVIDIA Maxwell generation CC 5.2
-     Maxwell53       # (GPU) NVIDIA Maxwell generation CC 5.3
-     Pascal60        # (GPU) NVIDIA Pascal generation CC 6.0
-     Pascal61        # (GPU) NVIDIA Pascal generation CC 6.1
-     Volta70         # (GPU) NVIDIA Volta generation CC 7.0
-     Volta72         # (GPU) NVIDIA Volta generation CC 7.2
-     Turing75         # (GPU) NVIDIA Turing generation CC 7.5
-    )
-
-# List of possible device architectures.
-# The case and spelling here needs to match Makefile.kokkos
-set(KOKKOS_DEVICES_LIST)
-# Options: Cuda,ROCm,OpenMP,Pthread,Qthreads,Serial
-list(APPEND KOKKOS_DEVICES_LIST
-    Cuda          # NVIDIA GPU -- see below
-    OpenMP        # OpenMP
-    Pthread       # pthread
-    Qthreads      # qthreads
-    HPX           # HPX
-    Serial        # serial
-    ROCm          # Relocatable device code
-    )
-
-# List of possible TPLs for Kokkos
-# From Makefile.kokkos: Options: hwloc,librt,experimental_memkind
-set(KOKKOS_USE_TPLS_LIST)
-if(APPLE)
-list(APPEND KOKKOS_USE_TPLS_LIST
-    HWLOC          # hwloc
-    MEMKIND        # experimental_memkind
-    )
-else()
-list(APPEND KOKKOS_USE_TPLS_LIST
-    HWLOC          # hwloc
-    LIBRT          # librt
-    MEMKIND        # experimental_memkind
-    )
-endif()
-# Map of cmake variables to Makefile variables
-set(KOKKOS_INTERNAL_HWLOC hwloc)
-set(KOKKOS_INTERNAL_LIBRT librt)
-set(KOKKOS_INTERNAL_MEMKIND experimental_memkind)
-
-# List of possible Advanced options
-set(KOKKOS_OPTIONS_LIST)
-list(APPEND KOKKOS_OPTIONS_LIST
-       AGGRESSIVE_VECTORIZATION    
-       DISABLE_PROFILING          
-       DISABLE_DUALVIEW_MODIFY_CHECK
-       ENABLE_PROFILE_LOAD_PRINT   
-    )
-# Map of cmake variables to Makefile variables
-set(KOKKOS_INTERNAL_LDG_INTRINSIC use_ldg)
-set(KOKKOS_INTERNAL_UVM librt)
-set(KOKKOS_INTERNAL_RELOCATABLE_DEVICE_CODE rdc)
-
-
-#-------------------------------------------------------------------------------
-# List of possible Options for CUDA
-#-------------------------------------------------------------------------------
-# From Makefile.kokkos: Options: use_ldg,force_uvm,rdc
-set(KOKKOS_CUDA_OPTIONS_LIST)
-list(APPEND KOKKOS_CUDA_OPTIONS_LIST
-    LDG_INTRINSIC              # use_ldg
-    UVM                        # force_uvm
-    RELOCATABLE_DEVICE_CODE    # rdc
-    LAMBDA                     # enable_lambda
-    )
-    
-# Map of cmake variables to Makefile variables
-set(KOKKOS_INTERNAL_LDG_INTRINSIC use_ldg)
-set(KOKKOS_INTERNAL_UVM force_uvm)
-set(KOKKOS_INTERNAL_RELOCATABLE_DEVICE_CODE rdc)
-set(KOKKOS_INTERNAL_LAMBDA enable_lambda)
-
-
-#-------------------------------------------------------------------------------
-# List of possible Options for HPX
-#-------------------------------------------------------------------------------
-# From Makefile.kokkos: Options: enable_async_dispatch
-set(KOKKOS_HPX_OPTIONS_LIST)
-list(APPEND KOKKOS_HPX_OPTIONS_LIST
-    ASYNC_DISPATCH # enable_async_dispatch
-    )
-
-# Map of cmake variables to Makefile variables
-set(KOKKOS_INTERNAL_ENABLE_ASYNC_DISPATCH enable_async_dispatch)
-
-
-#-------------------------------------------------------------------------------
-#------------------------------- Create doc strings ----------------------------
-#-------------------------------------------------------------------------------
-
-set(tmpr "\n       ")
-string(REPLACE ";" ${tmpr} KOKKOS_INTERNAL_ARCH_DOCSTR "${KOKKOS_ARCH_LIST}")
-set(KOKKOS_INTERNAL_ARCH_DOCSTR "${tmpr}${KOKKOS_INTERNAL_ARCH_DOCSTR}")
-# This would be useful, but we use Foo_ENABLE mechanisms
-#string(REPLACE ";" ${tmpr} KOKKOS_INTERNAL_DEVICES_DOCSTR "${KOKKOS_DEVICES_LIST}")
-#string(REPLACE ";" ${tmpr} KOKKOS_INTERNAL_USE_TPLS_DOCSTR "${KOKKOS_USE_TPLS_LIST}")
-#string(REPLACE ";" ${tmpr} KOKKOS_INTERNAL_CUDA_OPTIONS_DOCSTR "${KOKKOS_CUDA_OPTIONS_LIST}")
-
-#-------------------------------------------------------------------------------
-#------------------------------- GENERAL OPTIONS -------------------------------
-#-------------------------------------------------------------------------------
-
-# Setting this variable to a value other than "None" can improve host
-# performance by turning on architecture specific code.
-# NOT SET is used to determine if the option is passed in.  It is reset to
-# default "None" down below.
-set(KOKKOS_ARCH "NOT_SET" CACHE STRING 
-      "Optimize for specific host architecture. Options are: ${KOKKOS_INTERNAL_ARCH_DOCSTR}")
-
-# Whether to build separate libraries or now
-set(KOKKOS_SEPARATE_LIBS OFF CACHE BOOL "OFF = kokkos.  ON = kokkoscore, kokkoscontainers, and kokkosalgorithms.")
-
-# Qthreads options.
-set(KOKKOS_QTHREADS_DIR "" CACHE PATH "Location of Qthreads library.")
-
-# HPX options.
-set(KOKKOS_HPX_DIR "" CACHE PATH "Location of HPX library.")
-
-# Whether to build separate libraries or now
-set(KOKKOS_SEPARATE_TESTS OFF CACHE BOOL "Provide unit test targets with finer granularity.")
-
-#-------------------------------------------------------------------------------
-#------------------------------- KOKKOS_DEVICES --------------------------------
-#-------------------------------------------------------------------------------
-# Figure out default settings
-IF(Trilinos_ENABLE_Kokkos)             
-  set_kokkos_default_default(SERIAL ON)
-  set_kokkos_default_default(PTHREAD OFF)
-  IF(TPL_ENABLE_QTHREAD)
-    set_kokkos_default_default(QTHREADS ${TPL_ENABLE_QTHREAD})
-  ELSE()
-    set_kokkos_default_default(QTHREADS OFF)
-  ENDIF()
-  IF(TPL_ENABLE_HPX)
-    set_kokkos_default_default(HPX ON)
-  ELSE()
-    set_kokkos_default_default(HPX OFF)
-  ENDIF()
-  IF(Trilinos_ENABLE_OpenMP)
-    set_kokkos_default_default(OPENMP ${Trilinos_ENABLE_OpenMP})
-  ELSE()
-    set_kokkos_default_default(OPENMP OFF)
-  ENDIF()
-  IF(TPL_ENABLE_CUDA)
-    set_kokkos_default_default(CUDA ${TPL_ENABLE_CUDA})
-  ELSE()
-    set_kokkos_default_default(CUDA OFF)
-  ENDIF()
-  set_kokkos_default_default(ROCM OFF)
-ELSE()
-  set_kokkos_default_default(SERIAL ON)
-  set_kokkos_default_default(OPENMP OFF)
-  set_kokkos_default_default(PTHREAD OFF)
-  set_kokkos_default_default(QTHREAD OFF)
-  set_kokkos_default_default(HPX OFF)
-  set_kokkos_default_default(CUDA OFF)
-  set_kokkos_default_default(ROCM OFF)
-ENDIF()
-
-# Set which Kokkos backend to use.
-# These are the actual options that define the settings.
-set(KOKKOS_ENABLE_SERIAL ${KOKKOS_INTERNAL_ENABLE_SERIAL_DEFAULT} CACHE BOOL "Whether to enable the Kokkos::Serial device.  This device executes \"parallel\" kernels sequentially on a single CPU thread.  It is enabled by default.  If you disable this device, please enable at least one other CPU device, such as Kokkos::OpenMP or Kokkos::Threads.")
-set(KOKKOS_ENABLE_OPENMP ${KOKKOS_INTERNAL_ENABLE_OPENMP_DEFAULT} CACHE BOOL "Enable OpenMP support in Kokkos." FORCE)
-set(KOKKOS_ENABLE_PTHREAD ${KOKKOS_INTERNAL_ENABLE_PTHREAD_DEFAULT} CACHE BOOL "Enable Pthread support in Kokkos.")
-set(KOKKOS_ENABLE_QTHREADS ${KOKKOS_INTERNAL_ENABLE_QTHREADS_DEFAULT} CACHE BOOL "Enable Qthreads support in Kokkos.")
-set(KOKKOS_ENABLE_HPX ${KOKKOS_INTERNAL_ENABLE_HPX_DEFAULT} CACHE BOOL "Enable HPX support in Kokkos.")
-set(KOKKOS_ENABLE_CUDA ${KOKKOS_INTERNAL_ENABLE_CUDA_DEFAULT} CACHE BOOL "Enable CUDA support in Kokkos.")
-set(KOKKOS_ENABLE_ROCM ${KOKKOS_INTERNAL_ENABLE_ROCM_DEFAULT} CACHE BOOL "Enable ROCm support in Kokkos.")
-
-
-
-#-------------------------------------------------------------------------------
-#------------------------------- KOKKOS DEBUG and PROFILING --------------------
-#-------------------------------------------------------------------------------
-
-# Debug related options enable compiler warnings
-
-set_kokkos_default_default(DEBUG OFF)
-set(KOKKOS_ENABLE_DEBUG ${KOKKOS_INTERNAL_ENABLE_DEBUG_DEFAULT} CACHE BOOL "Enable Kokkos Debug.")
-
-# From Makefile.kokkos: Advanced Options: 
-#compiler_warnings, aggressive_vectorization, disable_profiling, disable_dualview_modify_check, enable_profile_load_print
-set_kokkos_default_default(COMPILER_WARNINGS OFF)
-set(KOKKOS_ENABLE_COMPILER_WARNINGS ${KOKKOS_INTERNAL_ENABLE_COMPILER_WARNINGS_DEFAULT} CACHE BOOL "Enable compiler warnings.")
-
-set_kokkos_default_default(DEBUG_DUALVIEW_MODIFY_CHECK OFF)
-set(KOKKOS_ENABLE_DEBUG_DUALVIEW_MODIFY_CHECK ${KOKKOS_INTERNAL_ENABLE_DEBUG_DUALVIEW_MODIFY_CHECK_DEFAULT} CACHE BOOL "Enable dualview modify check.")
-
-# Enable aggressive vectorization.
-set_kokkos_default_default(AGGRESSIVE_VECTORIZATION OFF)
-set(KOKKOS_ENABLE_AGGRESSIVE_VECTORIZATION ${KOKKOS_INTERNAL_ENABLE_AGGRESSIVE_VECTORIZATION_DEFAULT} CACHE BOOL "Enable aggressive vectorization.")
-
-# Enable profiling.
-set_kokkos_default_default(PROFILING ON)
-set(KOKKOS_ENABLE_PROFILING ${KOKKOS_INTERNAL_ENABLE_PROFILING_DEFAULT} CACHE BOOL "Enable profiling.")
-
-set_kokkos_default_default(PROFILING_LOAD_PRINT OFF)
-set(KOKKOS_ENABLE_PROFILING_LOAD_PRINT ${KOKKOS_INTERNAL_ENABLE_PROFILING_LOAD_PRINT_DEFAULT} CACHE BOOL "Enable profile load print.")
-
-set_kokkos_default_default(DEPRECATED_CODE ON)
-set(KOKKOS_ENABLE_DEPRECATED_CODE ${KOKKOS_INTERNAL_ENABLE_DEPRECATED_CODE_DEFAULT} CACHE BOOL "Enable deprecated code.")
-
-set_kokkos_default_default(EXPLICIT_INSTANTIATION OFF)
-set(KOKKOS_ENABLE_EXPLICIT_INSTANTIATION ${KOKKOS_INTERNAL_ENABLE_EXPLICIT_INSTANTIATION_DEFAULT} CACHE BOOL "Enable explicit template instantiation.")
-
-#-------------------------------------------------------------------------------
-#------------------------------- KOKKOS_USE_TPLS -------------------------------
-#-------------------------------------------------------------------------------
-# Enable hwloc library.
-# Figure out default:
-IF(Trilinos_ENABLE_Kokkos AND TPL_ENABLE_HWLOC)
-  set_kokkos_default_default(HWLOC ON)
-ELSE()
-  set_kokkos_default_default(HWLOC OFF)
-ENDIF()
-set(KOKKOS_ENABLE_HWLOC ${KOKKOS_INTERNAL_ENABLE_HWLOC_DEFAULT} CACHE BOOL "Enable hwloc for better process placement.")
-set(KOKKOS_HWLOC_DIR "" CACHE PATH "Location of hwloc library. (kokkos tpl)")
-
-# Enable memkind library.
-set_kokkos_default_default(MEMKIND OFF)
-set(KOKKOS_ENABLE_MEMKIND ${KOKKOS_INTERNAL_ENABLE_MEMKIND_DEFAULT} CACHE BOOL "Enable memkind. (kokkos tpl)")
-set(KOKKOS_MEMKIND_DIR "" CACHE PATH "Location of memkind library. (kokkos tpl)")
-
-# Enable rt library.
-IF(Trilinos_ENABLE_Kokkos)
-  IF(DEFINED TPL_ENABLE_LIBRT)
-    set_kokkos_default_default(LIBRT ${TPL_ENABLE_LIBRT})
-  ELSE()
-    set_kokkos_default_default(LIBRT OFF)
-  ENDIF()
-ELSE()
-  set_kokkos_default_default(LIBRT ON)
-ENDIF()
-set(KOKKOS_ENABLE_LIBRT ${KOKKOS_INTERNAL_ENABLE_LIBRT_DEFAULT} CACHE BOOL "Enable librt for more precise timer.  (kokkos tpl)")
-
-
-#-------------------------------------------------------------------------------
-#------------------------------- KOKKOS_CUDA_OPTIONS ---------------------------
-#-------------------------------------------------------------------------------
-
-# CUDA options.
-# Set Defaults
-set_kokkos_default_default(CUDA_LDG_INTRINSIC_DEFAULT OFF)
-set_kokkos_default_default(CUDA_UVM_DEFAULT OFF)
-set_kokkos_default_default(CUDA_RELOCATABLE_DEVICE_CODE OFF)
-IF(Trilinos_ENABLE_Kokkos)
-  IF(KOKKOS_ENABLE_CUDA)
-    find_package(CUDA)
-  ENDIF()
-  IF (DEFINED CUDA_VERSION)
-    IF (CUDA_VERSION VERSION_GREATER "7.0")
-      set_kokkos_default_default(CUDA_LAMBDA ON)
-    ELSE()
-      set_kokkos_default_default(CUDA_LAMBDA OFF)
-    ENDIF()
-  ENDIF()
-ELSE()
-  set_kokkos_default_default(CUDA_LAMBDA OFF)
-ENDIF()
-
-# Set actual options
-set(KOKKOS_CUDA_DIR "" CACHE PATH "Location of CUDA library.  Defaults to where nvcc installed.")
-set(KOKKOS_ENABLE_CUDA_LDG_INTRINSIC ${KOKKOS_INTERNAL_ENABLE_CUDA_LDG_INTRINSIC_DEFAULT} CACHE BOOL "Enable CUDA LDG. (cuda option)") 
-set(KOKKOS_ENABLE_CUDA_UVM ${KOKKOS_INTERNAL_ENABLE_CUDA_UVM_DEFAULT} CACHE BOOL "Enable CUDA unified virtual memory.")
-set(KOKKOS_ENABLE_CUDA_RELOCATABLE_DEVICE_CODE ${KOKKOS_INTERNAL_ENABLE_CUDA_RELOCATABLE_DEVICE_CODE_DEFAULT} CACHE BOOL "Enable relocatable device code for CUDA. (cuda option)")
-set(KOKKOS_ENABLE_CUDA_LAMBDA ${KOKKOS_INTERNAL_ENABLE_CUDA_LAMBDA_DEFAULT} CACHE BOOL "Enable lambdas for CUDA. (cuda option)")
-
-
-#-------------------------------------------------------------------------------
-#------------------------------- KOKKOS_HPX_OPTIONS ----------------------------
-#-------------------------------------------------------------------------------
-
-# HPX options.
-# Set Defaults
-set_kokkos_default_default(HPX_ASYNC_DISPATCH OFF)
-
-# Set actual options
-set(KOKKOS_ENABLE_HPX_ASYNC_DISPATCH ${KOKKOS_INTERNAL_ENABLE_HPX_ASYNC_DISPATCH_DEFAULT} CACHE BOOL "Enable HPX async dispatch.")
-
-
-#-------------------------------------------------------------------------------
-#----------------------- HOST ARCH AND LEGACY TRIBITS --------------------------
-#-------------------------------------------------------------------------------
-
-# This defines the previous legacy TriBITS builds. 
-set(KOKKOS_LEGACY_TRIBITS False)
-IF ("${KOKKOS_ARCH}" STREQUAL "NOT_SET")
-  set(KOKKOS_ARCH "None")
-  IF(KOKKOS_HAS_TRILINOS)
-    set(KOKKOS_LEGACY_TRIBITS True)
-  ENDIF()
-ENDIF()
-IF (KOKKOS_HAS_TRILINOS)
-  IF (KOKKOS_LEGACY_TRIBITS)
-    message(STATUS "Using the legacy tribits build because KOKKOS_ARCH not set")
-  ELSE()
-    message(STATUS "NOT using the legacy tribits build because KOKKOS_ARCH *is* set")
-  ENDIF()
-ENDIF()
-
-#-------------------------------------------------------------------------------
-#----------------------- Set CamelCase Options if they are not yet set ---------
-#-------------------------------------------------------------------------------
-
-foreach(opt ${KOKKOS_INTERNAL_ENABLE_OPTIONS_LIST})
-  string(TOUPPER ${opt} OPT )
-  UNSET(KOKKOS_ENABLE_${OPT}_INTERNAL CACHE)
-  SET(KOKKOS_ENABLE_${OPT}_INTERNAL ${KOKKOS_ENABLE_${OPT}} CACHE BOOL INTERNAL)
-  IF(DEFINED KOKKOS_ENABLE_${OPT})
-    UNSET(Kokkos_ENABLE_${opt} CACHE)
-    SET(Kokkos_ENABLE_${opt} ${KOKKOS_ENABLE_${OPT}} CACHE BOOL "CamelCase Compatibility setting for KOKKOS_ENABLE_${OPT}")
-  ENDIF()
-endforeach()
diff --git a/lib/kokkos/cmake/kokkos_pick_cxx_std.cmake b/lib/kokkos/cmake/kokkos_pick_cxx_std.cmake
new file mode 100644
index 0000000000..cf14948f43
--- /dev/null
+++ b/lib/kokkos/cmake/kokkos_pick_cxx_std.cmake
@@ -0,0 +1,46 @@
+# From CMake 3.10 documentation
+
+#This can run at any time
+KOKKOS_OPTION(CXX_STANDARD "" STRING "The C++ standard for Kokkos to use: 11, 14, 17, or 20. If empty, this will default to CMAKE_CXX_STANDARD. If both CMAKE_CXX_STANDARD and Kokkos_CXX_STANDARD are empty, this will default to 11")
+
+# Set CXX standard flags
+SET(KOKKOS_ENABLE_CXX11 OFF)
+SET(KOKKOS_ENABLE_CXX14 OFF)
+SET(KOKKOS_ENABLE_CXX17 OFF)
+SET(KOKKOS_ENABLE_CXX20 OFF)
+IF (KOKKOS_CXX_STANDARD)
+  IF (${KOKKOS_CXX_STANDARD} STREQUAL "c++98")
+    MESSAGE(FATAL_ERROR "Kokkos no longer supports C++98 - minimum C++11")
+  ELSEIF (${KOKKOS_CXX_STANDARD} STREQUAL "c++11")
+    MESSAGE(WARNING "Deprecated Kokkos C++ standard set as 'c++11'. Use '11' instead.")
+    SET(KOKKOS_CXX_STANDARD "11")
+  ELSEIF(${KOKKOS_CXX_STANDARD} STREQUAL "c++14")
+    MESSAGE(WARNING "Deprecated Kokkos C++ standard set as 'c++14'. Use '14' instead.")
+    SET(KOKKOS_CXX_STANDARD "14")
+  ELSEIF(${KOKKOS_CXX_STANDARD} STREQUAL "c++17")
+    MESSAGE(WARNING "Deprecated Kokkos C++ standard set as 'c++17'. Use '17' instead.")
+    SET(KOKKOS_CXX_STANDARD "17")
+  ELSEIF(${KOKKOS_CXX_STANDARD} STREQUAL "c++1y")
+    MESSAGE(WARNING "Deprecated Kokkos C++ standard set as 'c++1y'. Use '1Y' instead.")
+    SET(KOKKOS_CXX_STANDARD "1Y")
+  ELSEIF(${KOKKOS_CXX_STANDARD} STREQUAL "c++1z")
+    MESSAGE(WARNING "Deprecated Kokkos C++ standard set as 'c++1z'. Use '1Z' instead.")
+    SET(KOKKOS_CXX_STANDARD "1Z")
+  ELSEIF(${KOKKOS_CXX_STANDARD} STREQUAL "c++2a")
+    MESSAGE(WARNING "Deprecated Kokkos C++ standard set as 'c++2a'. Use '2A' instead.")
+    SET(KOKKOS_CXX_STANDARD "2A")
+  ENDIF()
+ENDIF()
+
+IF (NOT KOKKOS_CXX_STANDARD AND NOT CMAKE_CXX_STANDARD)
+  MESSAGE(STATUS "Setting default Kokkos CXX standard to 11")
+  SET(KOKKOS_CXX_STANDARD "11")
+ELSEIF(NOT KOKKOS_CXX_STANDARD)
+  MESSAGE(STATUS "Setting default Kokkos CXX standard to ${CMAKE_CXX_STANDARD}")
+  SET(KOKKOS_CXX_STANDARD ${CMAKE_CXX_STANDARD})
+ENDIF()
+
+
+
+
+
diff --git a/lib/kokkos/cmake/kokkos_settings.cmake b/lib/kokkos/cmake/kokkos_settings.cmake
deleted file mode 100644
index 2c622d0de9..0000000000
--- a/lib/kokkos/cmake/kokkos_settings.cmake
+++ /dev/null
@@ -1,259 +0,0 @@
-########################## NOTES ###############################################
-# This files goal is to take CMake options found in kokkos_options.cmake but 
-# possibly set from elsewhere 
-#   (see: trilinos/cmake/ProjectCOmpilerPostConfig.cmake) 
-# using CMake idioms and map them onto the KOKKOS_SETTINGS variables that gets 
-# passed to the kokkos makefile configuration:
-#  make -f ${CMAKE_SOURCE_DIR}/core/src/Makefile ${KOKKOS_SETTINGS} build-makefile-cmake-kokkos
-# that generates KokkosCore_config.h and kokkos_generated_settings.cmake
-# To understand how to form KOKKOS_SETTINGS, see
-#     <KOKKOS_PATH>/Makefile.kokkos
-
-#-------------------------------------------------------------------------------
-#------------------------------- GENERAL OPTIONS -------------------------------
-#-------------------------------------------------------------------------------
-
-# Ensure that KOKKOS_ARCH is in the ARCH_LIST
-if (KOKKOS_ARCH MATCHES ",")
-  message("-- Detected a comma in: KOKKOS_ARCH=`${KOKKOS_ARCH}`")
-  message("-- Although we prefer KOKKOS_ARCH to be semicolon-delimited, we do allow")
-  message("-- comma-delimited values for compatibility with scripts (see github.com/trilinos/Trilinos/issues/2330)")
-  string(REPLACE "," ";" KOKKOS_ARCH "${KOKKOS_ARCH}")
-  message("-- Commas were changed to semicolons, now KOKKOS_ARCH=`${KOKKOS_ARCH}`")
-endif()
-foreach(arch ${KOKKOS_ARCH})
-  list(FIND KOKKOS_ARCH_LIST ${arch} indx)
-  if (indx EQUAL -1)
-    message(FATAL_ERROR "`${arch}` is not an accepted value in KOKKOS_ARCH=`${KOKKOS_ARCH}`."
-      "  Please pick from these choices: ${KOKKOS_INTERNAL_ARCH_DOCSTR}")
-  endif ()
-endforeach()
-
-# KOKKOS_SETTINGS uses KOKKOS_ARCH
-string(REPLACE ";" "," KOKKOS_GMAKE_ARCH "${KOKKOS_ARCH}")
-
-# From Makefile.kokkos: Options: yes,no
-if(${KOKKOS_ENABLE_DEBUG})
-  set(KOKKOS_GMAKE_DEBUG yes)
-else()
-  set(KOKKOS_GMAKE_DEBUG no)
-endif()
-
-#------------------------------- KOKKOS_DEVICES --------------------------------
-# Can have multiple devices 
-set(KOKKOS_DEVICESl)
-foreach(devopt ${KOKKOS_DEVICES_LIST})
-  string(TOUPPER ${devopt} devoptuc)
-  if (${KOKKOS_ENABLE_${devoptuc}}) 
-    list(APPEND KOKKOS_DEVICESl ${devopt})
-  endif ()
-endforeach()
-# List needs to be comma-delmitted
-string(REPLACE ";" "," KOKKOS_GMAKE_DEVICES "${KOKKOS_DEVICESl}")
-
-#------------------------------- KOKKOS_OPTIONS --------------------------------
-# From Makefile.kokkos: Options: aggressive_vectorization,disable_profiling,disable_deprecated_code
-#compiler_warnings, aggressive_vectorization, disable_profiling, disable_dualview_modify_check, enable_profile_load_print
-
-set(KOKKOS_OPTIONSl)
-if(${KOKKOS_ENABLE_COMPILER_WARNINGS})
-      list(APPEND KOKKOS_OPTIONSl compiler_warnings)
-endif()
-if(${KOKKOS_ENABLE_AGGRESSIVE_VECTORIZATION})
-      list(APPEND KOKKOS_OPTIONSl aggressive_vectorization)
-endif()
-if(NOT ${KOKKOS_ENABLE_PROFILING})
-      list(APPEND KOKKOS_OPTIONSl disable_profiling)
-endif()
-if(NOT ${KOKKOS_ENABLE_DEPRECATED_CODE})
-      list(APPEND KOKKOS_OPTIONSl disable_deprecated_code)
-endif()
-if(NOT ${KOKKOS_ENABLE_DEBUG_DUALVIEW_MODIFY_CHECK})
-      list(APPEND KOKKOS_OPTIONSl disable_dualview_modify_check)
-endif()
-if(${KOKKOS_ENABLE_PROFILING_LOAD_PRINT})
-      list(APPEND KOKKOS_OPTIONSl enable_profile_load_print)
-endif()
-if(${KOKKOS_ENABLE_EXPLICIT_INSTANTIATION})
-      list(APPEND KOKKOS_OPTIONSl enable_eti)
-endif()
-# List needs to be comma-delimitted
-string(REPLACE ";" "," KOKKOS_GMAKE_OPTIONS "${KOKKOS_OPTIONSl}")
-
-
-#------------------------------- KOKKOS_USE_TPLS -------------------------------
-# Construct the Makefile options
-set(KOKKOS_USE_TPLSl)
-foreach(tplopt ${KOKKOS_USE_TPLS_LIST})
-  if (${KOKKOS_ENABLE_${tplopt}}) 
-    list(APPEND KOKKOS_USE_TPLSl ${KOKKOS_INTERNAL_${tplopt}})
-  endif ()
-endforeach()
-# List needs to be comma-delimitted
-string(REPLACE ";" "," KOKKOS_GMAKE_USE_TPLS "${KOKKOS_USE_TPLSl}")
-
-
-#------------------------------- KOKKOS_CUDA_OPTIONS ---------------------------
-# Construct the Makefile options
-set(KOKKOS_CUDA_OPTIONSl)
-foreach(cudaopt ${KOKKOS_CUDA_OPTIONS_LIST})
-  if (${KOKKOS_ENABLE_CUDA_${cudaopt}})
-    list(APPEND KOKKOS_CUDA_OPTIONSl ${KOKKOS_INTERNAL_${cudaopt}})
-  endif ()
-endforeach()
-# List needs to be comma-delmitted
-string(REPLACE ";" "," KOKKOS_GMAKE_CUDA_OPTIONS "${KOKKOS_CUDA_OPTIONSl}")
-
-#------------------------------- PATH VARIABLES --------------------------------
-#  Want makefile to use same executables specified which means modifying
-#  the path so the $(shell ...) commands in the makefile see the right exec
-#  Also, the Makefile's use FOO_PATH naming scheme for -I/-L construction
-#TODO:  Makefile.kokkos allows this to be overwritten? ROCM_HCC_PATH
-
-set(KOKKOS_INTERNAL_PATHS)
-set(addpathl)
-foreach(kvar IN LISTS KOKKOS_USE_TPLS_LIST ITEMS CUDA QTHREADS)
-  if(${KOKKOS_ENABLE_${kvar}})
-    if(DEFINED KOKKOS_${kvar}_DIR)
-      set(KOKKOS_INTERNAL_PATHS ${KOKKOS_INTERNAL_PATHS} "${kvar}_PATH=${KOKKOS_${kvar}_DIR}")
-      if(IS_DIRECTORY ${KOKKOS_${kvar}_DIR}/bin)
-        list(APPEND addpathl ${KOKKOS_${kvar}_DIR}/bin)
-      endif()
-    endif()
-  endif()
-endforeach()
-# Path env is : delimitted
-string(REPLACE ";" ":" KOKKOS_INTERNAL_ADDTOPATH "${addpathl}")
-
-
-######################### SET KOKKOS_SETTINGS ##################################
-# Set the KOKKOS_SETTINGS String -- this is the primary communication with the
-# makefile configuration.  See Makefile.kokkos
-
-set(KOKKOS_SETTINGS KOKKOS_CMAKE=yes)
-set(KOKKOS_SETTINGS ${KOKKOS_SETTINGS} KOKKOS_SRC_PATH=${KOKKOS_SRC_PATH})
-set(KOKKOS_SETTINGS ${KOKKOS_SETTINGS} KOKKOS_PATH=${KOKKOS_PATH})
-set(KOKKOS_SETTINGS ${KOKKOS_SETTINGS} KOKKOS_INSTALL_PATH=${CMAKE_INSTALL_PREFIX})
-
-# Form of KOKKOS_foo=$KOKKOS_foo
-foreach(kvar ARCH;DEVICES;DEBUG;OPTIONS;CUDA_OPTIONS;USE_TPLS)
-  if(DEFINED KOKKOS_GMAKE_${kvar})
-    if (NOT "${KOKKOS_GMAKE_${kvar}}" STREQUAL "")
-      set(KOKKOS_SETTINGS ${KOKKOS_SETTINGS} KOKKOS_${kvar}=${KOKKOS_GMAKE_${kvar}})
-    endif()
-  endif()
-endforeach()
-
-# Form of VAR=VAL
-#TODO:  Makefile supports MPICH_CXX, OMPI_CXX as well
-foreach(ovar CXX;CXXFLAGS;LDFLAGS)
-  if(DEFINED ${ovar})
-    if (NOT "${${ovar}}" STREQUAL "")
-      set(KOKKOS_SETTINGS ${KOKKOS_SETTINGS} ${ovar}=${${ovar}})
-    endif()
-  endif()
-endforeach()
-
-# Finally, do the paths
-if (NOT "${KOKKOS_INTERNAL_PATHS}" STREQUAL "")
-  set(KOKKOS_SETTINGS ${KOKKOS_SETTINGS} ${KOKKOS_INTERNAL_PATHS})
-endif()
-if (NOT "${KOKKOS_INTERNAL_ADDTOPATH}" STREQUAL "")
-  set(KOKKOS_SETTINGS ${KOKKOS_SETTINGS} "PATH=${KOKKOS_INTERNAL_ADDTOPATH}:$ENV{PATH}")
-endif()
-
-if (CMAKE_CXX_STANDARD)
-  if (CMAKE_CXX_STANDARD STREQUAL "98")
-    message(FATAL_ERROR "Kokkos requires C++11 or newer!")
-  endif()
-  set(KOKKOS_CXX_STANDARD "c++${CMAKE_CXX_STANDARD}")
-  if (CMAKE_CXX_EXTENSIONS)
-    if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
-      set(KOKKOS_CXX_STANDARD "gnu++${CMAKE_CXX_STANDARD}")
-    endif()
-  endif()
-  set(KOKKOS_SETTINGS ${KOKKOS_SETTINGS} "KOKKOS_CXX_STANDARD=\"${KOKKOS_CXX_STANDARD}\"")
-endif()
-
-# Final form that gets passed to make
-set(KOKKOS_SETTINGS env ${KOKKOS_SETTINGS})
-
-
-############################ PRINT CONFIGURE STATUS ############################
-
-if(KOKKOS_CMAKE_VERBOSE)
-  message(STATUS "")
-  message(STATUS "****************** Kokkos Settings ******************")
-  message(STATUS "Execution Spaces")
-
-  if(KOKKOS_ENABLE_CUDA)
-    message(STATUS "  Device Parallel: Cuda")
-  else()
-    message(STATUS "  Device Parallel: None")
-  endif()
-
-  if(KOKKOS_ENABLE_OPENMP)
-    message(STATUS "    Host Parallel: OpenMP")
-  elseif(KOKKOS_ENABLE_PTHREAD)
-    message(STATUS "    Host Parallel: Pthread")
-  elseif(KOKKOS_ENABLE_QTHREADS)
-    message(STATUS "    Host Parallel: Qthreads")
-  elseif(KOKKOS_ENABLE_HPX)
-    message(STATUS "    Host Parallel: HPX")
-  else()
-    message(STATUS "    Host Parallel: None")
-  endif()
-
-  if(KOKKOS_ENABLE_SERIAL)
-    message(STATUS "      Host Serial: Serial")
-  else()
-    message(STATUS "      Host Serial: None")
-  endif()
-
-  message(STATUS "")
-  message(STATUS "Architectures:")
-  message(STATUS "    ${KOKKOS_GMAKE_ARCH}")
-
-  message(STATUS "")
-  message(STATUS "Enabled options")
-
-  if(KOKKOS_SEPARATE_LIBS)
-    message(STATUS "  KOKKOS_SEPARATE_LIBS")
-  endif()
-
-  foreach(opt IN LISTS KOKKOS_INTERNAL_ENABLE_OPTIONS_LIST)
-    string(TOUPPER ${opt} OPT)
-    if (KOKKOS_ENABLE_${OPT})
-      message(STATUS "  KOKKOS_ENABLE_${OPT}")
-    endif()
-  endforeach()
-
-  if(KOKKOS_ENABLE_CUDA)
-    if(KOKKOS_CUDA_DIR)
-      message(STATUS "  KOKKOS_CUDA_DIR: ${KOKKOS_CUDA_DIR}")
-    endif()
-  endif()
-
-  if(KOKKOS_QTHREADS_DIR)
-    message(STATUS "  KOKKOS_QTHREADS_DIR: ${KOKKOS_QTHREADS_DIR}")
-  endif()
-
-  if(KOKKOS_HWLOC_DIR)
-    message(STATUS "  KOKKOS_HWLOC_DIR: ${KOKKOS_HWLOC_DIR}")
-  endif()
-
-  if(KOKKOS_MEMKIND_DIR)
-    message(STATUS "  KOKKOS_MEMKIND_DIR: ${KOKKOS_MEMKIND_DIR}")
-  endif()
-
-  if(KOKKOS_HPX_DIR)
-    message(STATUS "  KOKKOS_HPX_DIR: ${KOKKOS_HPX_DIR}")
-  endif()
-
-  message(STATUS "")
-  message(STATUS "Final kokkos settings variable:")
-  message(STATUS "  ${KOKKOS_SETTINGS}")
-
-  message(STATUS "*****************************************************")
-  message(STATUS "")
-endif()
diff --git a/lib/kokkos/cmake/kokkos_test_cxx_std.cmake b/lib/kokkos/cmake/kokkos_test_cxx_std.cmake
new file mode 100644
index 0000000000..c264517abe
--- /dev/null
+++ b/lib/kokkos/cmake/kokkos_test_cxx_std.cmake
@@ -0,0 +1,144 @@
+KOKKOS_CFG_DEPENDS(CXX_STD COMPILER_ID)
+
+FUNCTION(kokkos_set_cxx_standard_feature standard)
+  SET(EXTENSION_NAME CMAKE_CXX${standard}_EXTENSION_COMPILE_OPTION)
+  SET(STANDARD_NAME  CMAKE_CXX${standard}_STANDARD_COMPILE_OPTION)
+  SET(FEATURE_NAME   cxx_std_${standard})
+  #CMake's way of telling us that the standard (or extension)
+  #flags are supported is the extension/standard variables
+  IF (NOT DEFINED CMAKE_CXX_EXTENSIONS)
+    IF(KOKKOS_DONT_ALLOW_EXTENSIONS)
+      GLOBAL_SET(KOKKOS_USE_CXX_EXTENSIONS OFF)
+    ELSE()
+      GLOBAL_SET(KOKKOS_USE_CXX_EXTENSIONS ON)
+    ENDIF()
+  ELSEIF(CMAKE_CXX_EXTENSIONS)
+    IF(KOKKOS_DONT_ALLOW_EXTENSIONS)
+      MESSAGE(FATAL_ERROR "The chosen configuration does not support CXX extensions flags: ${KOKKOS_DONT_ALLOW_EXTENSIONS}. Must set CMAKE_CXX_EXTENSIONS=OFF to continue") 
+    ELSE()
+      GLOBAL_SET(KOKKOS_USE_CXX_EXTENSIONS ON)
+    ENDIF()
+  ELSE()
+    #For trilinos, we need to make sure downstream projects 
+    GLOBAL_SET(KOKKOS_USE_CXX_EXTENSIONS OFF)
+  ENDIF()
+
+  IF (KOKKOS_USE_CXX_EXTENSIONS AND ${EXTENSION_NAME})
+    MESSAGE(STATUS "Using ${${EXTENSION_NAME}} for C++${standard} extensions as feature")
+    GLOBAL_SET(KOKKOS_CXX_STANDARD_FEATURE ${FEATURE_NAME})
+  ELSEIF(NOT KOKKOS_USE_CXX_EXTENSIONS AND ${STANDARD_NAME})
+    MESSAGE(STATUS "Using ${${STANDARD_NAME}} for C++${standard} standard as feature")
+    GLOBAL_SET(KOKKOS_CXX_STANDARD_FEATURE ${FEATURE_NAME})
+  ELSE()
+    #nope, we can't do anything here
+    MESSAGE(WARNING "C++${standard} is not supported as a compiler feature. We will choose custom flags for now, but this behavior has been deprecated. Please open an issue at https://github.com/kokkos/kokkos/issues reporting that ${KOKKOS_CXX_COMPILER_ID} ${KOKKOS_CXX_COMPILER_VERSION} failed for ${KOKKOS_CXX_STANDARD}, preferrably including your CMake command.")
+    GLOBAL_SET(KOKKOS_CXX_STANDARD_FEATURE "")
+  ENDIF()
+
+  IF(NOT ${FEATURE_NAME} IN_LIST CMAKE_CXX_COMPILE_FEATURES)
+    MESSAGE(FATAL_ERROR "Compiler ${KOKKOS_CXX_COMPILER_ID} should support ${FEATURE_NAME}, but CMake reports feature not supported")
+  ENDIF()
+ENDFUNCTION()
+
+
+IF (KOKKOS_CXX_STANDARD AND CMAKE_CXX_STANDARD)
+  #make sure these are consistent
+  IF (NOT KOKKOS_CXX_STANDARD STREQUAL CMAKE_CXX_STANDARD)
+    MESSAGE(WARNING "Specified both CMAKE_CXX_STANDARD=${CMAKE_CXX_STANDARD} and KOKKOS_CXX_STANDARD=${KOKKOS_CXX_STANDARD}, but they don't match")
+    SET(CMAKE_CXX_STANDARD ${KOKKOS_CXX_STANDARD} CACHE STRING "C++ standard" FORCE)
+  ENDIF()
+ENDIF()
+
+
+IF (KOKKOS_CXX_STANDARD STREQUAL "11" )
+  kokkos_set_cxx_standard_feature(11)
+  SET(KOKKOS_ENABLE_CXX11 ON)
+  SET(KOKKOS_CXX_INTERMEDIATE_STANDARD "11")
+ELSEIF(KOKKOS_CXX_STANDARD STREQUAL "14")
+  kokkos_set_cxx_standard_feature(14)
+  SET(KOKKOS_CXX_INTERMEDIATE_STANDARD "1Y")
+  SET(KOKKOS_ENABLE_CXX14 ON)
+ELSEIF(KOKKOS_CXX_STANDARD STREQUAL "17")
+  kokkos_set_cxx_standard_feature(17)
+  SET(KOKKOS_CXX_INTERMEDIATE_STANDARD "1Z")
+  SET(KOKKOS_ENABLE_CXX17 ON)
+ELSEIF(KOKKOS_CXX_STANDARD STREQUAL "20")
+  kokkos_set_cxx_standard_feature(20)
+  SET(KOKKOS_CXX_INTERMEDIATE_STANDARD "2A")
+  SET(KOKKOS_ENABLE_CXX20 ON)
+ELSEIF(KOKKOS_CXX_STANDARD STREQUAL "98")
+  MESSAGE(FATAL_ERROR "Kokkos requires C++11 or newer!")
+ELSE()
+  MESSAGE(FATAL_ERROR "Unknown C++ standard ${KOKKOS_CXX_STANDARD} - must be 11, 14, 17, or 20")
+ENDIF()
+
+
+
+# Enforce that extensions are turned off for nvcc_wrapper.
+# For compiling CUDA code using nvcc_wrapper, we will use the host compiler's
+# flags for turning on C++11.  Since for compiler ID and versioning purposes
+# CMake recognizes the host compiler when calling nvcc_wrapper, this just
+# works.  Both NVCC and nvcc_wrapper only recognize '-std=c++11' which means
+# that we can only use host compilers for CUDA builds that use those flags.
+# It also means that extensions (gnu++11) can't be turned on for CUDA builds.
+
+IF(KOKKOS_CXX_COMPILER_ID STREQUAL NVIDIA)
+  IF(NOT DEFINED CMAKE_CXX_EXTENSIONS)
+    SET(CMAKE_CXX_EXTENSIONS OFF)
+  ELSEIF(CMAKE_CXX_EXTENSIONS)
+    MESSAGE(FATAL_ERROR "NVCC doesn't support C++ extensions.  Set -DCMAKE_CXX_EXTENSIONS=OFF")
+  ENDIF()
+ENDIF()
+
+IF(KOKKOS_ENABLE_CUDA)
+  # ENFORCE that the compiler can compile CUDA code.
+  IF(KOKKOS_CXX_COMPILER_ID STREQUAL Clang)
+    IF(KOKKOS_CXX_COMPILER_VERSION VERSION_LESS 4.0.0)
+      MESSAGE(FATAL_ERROR "Compiling CUDA code directly with Clang requires version 4.0.0 or higher.")
+    ENDIF()
+    IF(NOT DEFINED CMAKE_CXX_EXTENSIONS)
+      SET(CMAKE_CXX_EXTENSIONS OFF)
+    ELSEIF(CMAKE_CXX_EXTENSIONS)
+      MESSAGE(FATAL_ERROR "Compiling CUDA code with clang doesn't support C++ extensions.  Set -DCMAKE_CXX_EXTENSIONS=OFF")
+    ENDIF()
+  ELSEIF(NOT KOKKOS_CXX_COMPILER_ID STREQUAL NVIDIA)
+    MESSAGE(FATAL_ERROR "Invalid compiler for CUDA.  The compiler must be nvcc_wrapper or Clang, but compiler ID was ${KOKKOS_CXX_COMPILER_ID}")
+  ENDIF()
+ENDIF()
+
+IF (NOT KOKKOS_CXX_STANDARD_FEATURE)
+  #we need to pick the C++ flags ourselves
+  UNSET(CMAKE_CXX_STANDARD)
+  UNSET(CMAKE_CXX_STANDARD CACHE)
+  IF(KOKKOS_CXX_COMPILER_ID STREQUAL Cray)
+    INCLUDE(${KOKKOS_SRC_PATH}/cmake/cray.cmake)
+    kokkos_set_cray_flags(${KOKKOS_CXX_STANDARD} ${KOKKOS_CXX_INTERMEDIATE_STANDARD})
+  ELSEIF(KOKKOS_CXX_COMPILER_ID STREQUAL PGI)
+    INCLUDE(${KOKKOS_SRC_PATH}/cmake/pgi.cmake)
+    kokkos_set_pgi_flags(${KOKKOS_CXX_STANDARD} ${KOKKOS_CXX_INTERMEDIATE_STANDARD})
+  ELSEIF(KOKKOS_CXX_COMPILER_ID STREQUAL Intel)
+    INCLUDE(${KOKKOS_SRC_PATH}/cmake/intel.cmake)
+    kokkos_set_intel_flags(${KOKKOS_CXX_STANDARD} ${KOKKOS_CXX_INTERMEDIATE_STANDARD})
+  ELSE()
+    INCLUDE(${KOKKOS_SRC_PATH}/cmake/gnu.cmake)
+    kokkos_set_gnu_flags(${KOKKOS_CXX_STANDARD} ${KOKKOS_CXX_INTERMEDIATE_STANDARD})
+  ENDIF()
+  #check that the compiler accepts the C++ standard flag
+  INCLUDE(CheckCXXCompilerFlag)
+  IF (DEFINED CXX_STD_FLAGS_ACCEPTED)
+    UNSET(CXX_STD_FLAGS_ACCEPTED CACHE)
+  ENDIF()
+  CHECK_CXX_COMPILER_FLAG(${KOKKOS_CXX_STANDARD_FLAG} CXX_STD_FLAGS_ACCEPTED)
+  IF (NOT CXX_STD_FLAGS_ACCEPTED)
+    CHECK_CXX_COMPILER_FLAG(${KOKKOS_CXX_INTERMEDIATE_STANDARD_FLAG} CXX_INT_STD_FLAGS_ACCEPTED)
+    IF (NOT CXX_INT_STD_FLAGS_ACCEPTED)
+      MESSAGE(FATAL_ERROR "${KOKKOS_CXX_COMPILER_ID} did not accept ${KOKKOS_CXX_STANDARD_FLAG} or ${KOKKOS_CXX_INTERMEDIATE_STANDARD_FLAG}. You likely need to reduce the level of the C++ standard from ${KOKKOS_CXX_STANDARD}")
+    ENDIF()
+    SET(KOKKOS_CXX_STANDARD_FLAG ${KOKKOS_CXX_INTERMEDIATE_STANDARD_FLAG})
+  ENDIF()
+  MESSAGE(STATUS "Compiler features not supported, but ${KOKKOS_CXX_COMPILER_ID} accepts ${KOKKOS_CXX_STANDARD_FLAG}")
+ENDIF()
+
+
+
+
diff --git a/lib/kokkos/cmake/kokkos_tpls.cmake b/lib/kokkos/cmake/kokkos_tpls.cmake
new file mode 100644
index 0000000000..181a497d52
--- /dev/null
+++ b/lib/kokkos/cmake/kokkos_tpls.cmake
@@ -0,0 +1,47 @@
+KOKKOS_CFG_DEPENDS(TPLS OPTIONS)
+KOKKOS_CFG_DEPENDS(TPLS DEVICES)
+
+FUNCTION(KOKKOS_TPL_OPTION PKG DEFAULT)
+  KOKKOS_ENABLE_OPTION(${PKG} ${DEFAULT} "Whether to enable the ${PKG} library")
+  KOKKOS_OPTION(${PKG}_DIR "" PATH "Location of ${PKG} library")
+  SET(KOKKOS_ENABLE_${PKG} ${KOKKOS_ENABLE_${PKG}} PARENT_SCOPE)
+  SET(KOKKOS_${PKG}_DIR  ${KOKKOS_${PKG}_DIR} PARENT_SCOPE)
+ENDFUNCTION()
+
+KOKKOS_TPL_OPTION(HWLOC   Off)
+KOKKOS_TPL_OPTION(LIBNUMA Off)
+KOKKOS_TPL_OPTION(MEMKIND Off)
+KOKKOS_TPL_OPTION(CUDA    Off)
+KOKKOS_TPL_OPTION(LIBRT   Off)
+KOKKOS_TPL_OPTION(LIBDL   On)
+
+IF(Trilinos_ENABLE_Kokkos AND TPL_ENABLE_HPX)
+SET(HPX_DEFAULT ON)
+ELSE()
+SET(HPX_DEFAULT OFF)
+ENDIF()
+KOKKOS_TPL_OPTION(HPX ${HPX_DEFAULT})
+
+IF(Trilinos_ENABLE_Kokkos AND TPL_ENABLE_PTHREAD)
+SET(PTHREAD_DEFAULT ON)
+ELSE()
+SET(PTHREAD_DEFAULT OFF)
+ENDIF()
+KOKKOS_TPL_OPTION(PTHREAD ${PTHREAD_DEFAULT})
+
+
+#Make sure we use our local FindKokkosCuda.cmake
+KOKKOS_IMPORT_TPL(HPX INTERFACE)
+KOKKOS_IMPORT_TPL(CUDA INTERFACE)
+KOKKOS_IMPORT_TPL(HWLOC)
+KOKKOS_IMPORT_TPL(LIBNUMA)
+KOKKOS_IMPORT_TPL(LIBRT)
+KOKKOS_IMPORT_TPL(LIBDL)
+KOKKOS_IMPORT_TPL(MEMKIND)
+KOKKOS_IMPORT_TPL(PTHREAD INTERFACE)
+
+#Convert list to newlines (which CMake doesn't always like in cache variables)
+STRING(REPLACE ";" "\n" KOKKOS_TPL_EXPORT_TEMP "${KOKKOS_TPL_EXPORTS}")
+#Convert to a regular variable
+UNSET(KOKKOS_TPL_EXPORTS CACHE)
+SET(KOKKOS_TPL_EXPORTS ${KOKKOS_TPL_EXPORT_TEMP})
diff --git a/lib/kokkos/cmake/kokkos_tribits.cmake b/lib/kokkos/cmake/kokkos_tribits.cmake
new file mode 100644
index 0000000000..d2317d2446
--- /dev/null
+++ b/lib/kokkos/cmake/kokkos_tribits.cmake
@@ -0,0 +1,392 @@
+#These are tribits wrappers only ever called by Kokkos itself
+
+INCLUDE(CMakeParseArguments)
+INCLUDE(CTest)
+INCLUDE(GNUInstallDirs)
+
+MESSAGE(STATUS "The project name is: ${PROJECT_NAME}")
+
+#Leave this here for now - but only do for tribits
+#This breaks the standalone CMake
+IF (KOKKOS_HAS_TRILINOS)
+  IF(NOT DEFINED ${PROJECT_NAME}_ENABLE_OpenMP)
+    SET(${PROJECT_NAME}_ENABLE_OpenMP OFF)
+  ENDIF()
+
+  IF(NOT DEFINED ${PROJECT_NAME}_ENABLE_HPX)
+    SET(${PROJECT_NAME}_ENABLE_HPX OFF)
+  ENDIF()
+
+  IF(NOT DEFINED ${PROJECT_NAME}_ENABLE_DEBUG)
+    SET(${PROJECT_NAME}_ENABLE_DEBUG OFF)
+  ENDIF()
+
+  IF(NOT DEFINED ${PROJECT_NAME}_ENABLE_CXX11)
+    SET(${PROJECT_NAME}_ENABLE_CXX11 ON)
+  ENDIF()
+
+  IF(NOT DEFINED ${PROJECT_NAME}_ENABLE_TESTS)
+    SET(${PROJECT_NAME}_ENABLE_TESTS OFF)
+  ENDIF()
+
+  IF(NOT DEFINED TPL_ENABLE_Pthread)
+    SET(TPL_ENABLE_Pthread OFF)
+  ENDIF()
+ENDIF()
+
+MACRO(KOKKOS_SUBPACKAGE NAME)
+  if (KOKKOS_HAS_TRILINOS)
+    TRIBITS_SUBPACKAGE(${NAME})
+  else()
+    SET(PACKAGE_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR})
+    SET(PARENT_PACKAGE_NAME ${PACKAGE_NAME})
+    SET(PACKAGE_NAME ${PACKAGE_NAME}${NAME})
+    STRING(TOUPPER ${PACKAGE_NAME} PACKAGE_NAME_UC)
+    SET(${PACKAGE_NAME}_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR})
+  endif()
+ENDMACRO()
+
+MACRO(KOKKOS_SUBPACKAGE_POSTPROCESS)
+  if (KOKKOS_HAS_TRILINOS)
+    TRIBITS_SUBPACKAGE_POSTPROCESS()
+  endif()
+ENDMACRO()
+
+MACRO(KOKKOS_PACKAGE_DECL)
+
+  if (KOKKOS_HAS_TRILINOS)
+    TRIBITS_PACKAGE_DECL(Kokkos)
+  else()
+    SET(PACKAGE_NAME Kokkos)
+    SET(${PACKAGE_NAME}_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR})
+    STRING(TOUPPER ${PACKAGE_NAME} PACKAGE_NAME_UC)
+  endif()
+
+  #SET(TRIBITS_DEPS_DIR "${CMAKE_SOURCE_DIR}/cmake/deps")
+  #FILE(GLOB TPLS_FILES "${TRIBITS_DEPS_DIR}/*.cmake")
+  #FOREACH(TPL_FILE ${TPLS_FILES})
+  #  TRIBITS_PROCESS_TPL_DEP_FILE(${TPL_FILE})
+  #ENDFOREACH()
+
+ENDMACRO()
+
+
+MACRO(KOKKOS_PROCESS_SUBPACKAGES)
+  if (KOKKOS_HAS_TRILINOS)
+    TRIBITS_PROCESS_SUBPACKAGES()
+  else()
+    ADD_SUBDIRECTORY(core)
+    ADD_SUBDIRECTORY(containers)
+    ADD_SUBDIRECTORY(algorithms)
+    ADD_SUBDIRECTORY(example)
+  endif()
+ENDMACRO()
+
+MACRO(KOKKOS_PACKAGE_DEF)
+  if (KOKKOS_HAS_TRILINOS)
+    TRIBITS_PACKAGE_DEF()
+  else()
+    #do nothing
+  endif()
+ENDMACRO()
+
+MACRO(KOKKOS_INTERNAL_ADD_LIBRARY_INSTALL LIBRARY_NAME)
+  KOKKOS_LIB_TYPE(${LIBRARY_NAME} INCTYPE)
+  TARGET_INCLUDE_DIRECTORIES(${LIBRARY_NAME} ${INCTYPE} $<INSTALL_INTERFACE:${KOKKOS_HEADER_DIR}>)
+
+  INSTALL(
+    TARGETS ${LIBRARY_NAME}
+    EXPORT ${PROJECT_NAME}
+    RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
+    LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
+    ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
+    COMPONENT ${PACKAGE_NAME}
+  )
+
+  INSTALL(
+    TARGETS ${LIBRARY_NAME}
+    EXPORT KokkosTargets
+    RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
+    LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
+    ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
+  )
+
+  VERIFY_EMPTY(KOKKOS_ADD_LIBRARY ${PARSE_UNPARSED_ARGUMENTS})
+ENDMACRO()
+
+FUNCTION(KOKKOS_ADD_EXECUTABLE EXE_NAME)
+  if (KOKKOS_HAS_TRILINOS)
+    TRIBITS_ADD_EXECUTABLE(${EXE_NAME} ${ARGN})
+  else()
+    CMAKE_PARSE_ARGUMENTS(PARSE 
+      "TESTONLY"
+      ""
+      "SOURCES;TESTONLYLIBS"
+      ${ARGN})
+
+    ADD_EXECUTABLE(${EXE_NAME} ${PARSE_SOURCES})
+    IF (PARSE_TESTONLYLIBS)
+      TARGET_LINK_LIBRARIES(${EXE_NAME} ${PARSE_TESTONLYLIBS})
+    ENDIF()
+    VERIFY_EMPTY(KOKKOS_ADD_EXECUTABLE ${PARSE_UNPARSED_ARGUMENTS})
+  endif()
+ENDFUNCTION()
+
+IF(NOT TARGET check)
+  ADD_CUSTOM_TARGET(check COMMAND ${CMAKE_CTEST_COMMAND} -VV -C ${CMAKE_CFG_INTDIR})
+ENDIF()
+
+
+FUNCTION(KOKKOS_ADD_EXECUTABLE_AND_TEST ROOT_NAME)
+IF (KOKKOS_HAS_TRILINOS)
+  TRIBITS_ADD_EXECUTABLE_AND_TEST(
+    ${ROOT_NAME} 
+    TESTONLYLIBS kokkos_gtest 
+    ${ARGN}
+    NUM_MPI_PROCS 1
+    COMM serial mpi
+    FAIL_REGULAR_EXPRESSION "  FAILED  "
+  )
+ELSE()
+  CMAKE_PARSE_ARGUMENTS(PARSE 
+    ""
+    ""
+    "SOURCES;CATEGORIES"
+    ${ARGN})
+  VERIFY_EMPTY(KOKKOS_ADD_EXECUTABLE_AND_TEST ${PARSE_UNPARSED_ARGUMENTS})
+  SET(EXE_NAME ${PACKAGE_NAME}_${ROOT_NAME})
+  KOKKOS_ADD_TEST_EXECUTABLE(${EXE_NAME}
+    SOURCES ${PARSE_SOURCES}
+  )
+  KOKKOS_ADD_TEST(NAME ${ROOT_NAME} 
+    EXE ${EXE_NAME}
+    FAIL_REGULAR_EXPRESSION "  FAILED  "
+  )
+ENDIF()
+ENDFUNCTION()
+
+MACRO(KOKKOS_SETUP_BUILD_ENVIRONMENT)
+ INCLUDE(${KOKKOS_SRC_PATH}/cmake/kokkos_compiler_id.cmake)
+ INCLUDE(${KOKKOS_SRC_PATH}/cmake/kokkos_enable_devices.cmake)
+ INCLUDE(${KOKKOS_SRC_PATH}/cmake/kokkos_enable_options.cmake)
+ INCLUDE(${KOKKOS_SRC_PATH}/cmake/kokkos_test_cxx_std.cmake)
+ INCLUDE(${KOKKOS_SRC_PATH}/cmake/kokkos_arch.cmake)
+ IF (NOT KOKKOS_HAS_TRILINOS)
+  SET(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${Kokkos_SOURCE_DIR}/cmake/Modules/")
+  INCLUDE(${KOKKOS_SRC_PATH}/cmake/kokkos_tpls.cmake)
+ ENDIF()
+ INCLUDE(${KOKKOS_SRC_PATH}/cmake/kokkos_corner_cases.cmake)
+ENDMACRO()
+
+MACRO(KOKKOS_ADD_TEST_EXECUTABLE EXE_NAME)
+  CMAKE_PARSE_ARGUMENTS(PARSE 
+    ""
+    ""
+    "SOURCES"
+    ${ARGN})
+  KOKKOS_ADD_EXECUTABLE(${EXE_NAME}
+    SOURCES ${PARSE_SOURCES}
+    ${PARSE_UNPARSED_ARGUMENTS}
+    TESTONLYLIBS kokkos_gtest
+  )
+  IF (NOT KOKKOS_HAS_TRILINOS)
+    ADD_DEPENDENCIES(check ${EXE_NAME})
+  ENDIF()
+ENDMACRO()
+
+MACRO(KOKKOS_PACKAGE_POSTPROCESS)
+  if (KOKKOS_HAS_TRILINOS)
+    TRIBITS_PACKAGE_POSTPROCESS()
+  endif()
+ENDMACRO()
+
+FUNCTION(KOKKOS_SET_LIBRARY_PROPERTIES LIBRARY_NAME)
+  CMAKE_PARSE_ARGUMENTS(PARSE 
+    "PLAIN_STYLE"
+    ""
+    ""
+    ${ARGN})
+
+  IF(${CMAKE_VERSION} VERSION_GREATER_EQUAL "3.13")
+    #great, this works the "right" way
+    TARGET_LINK_OPTIONS(
+      ${LIBRARY_NAME} PUBLIC ${KOKKOS_LINK_OPTIONS}
+    )
+  ELSE()
+    IF (PARSE_PLAIN_STYLE)
+      TARGET_LINK_LIBRARIES(
+        ${LIBRARY_NAME} ${KOKKOS_LINK_OPTIONS}
+      )
+    ELSE()
+      #well, have to do it the wrong way for now
+      TARGET_LINK_LIBRARIES(
+        ${LIBRARY_NAME} PUBLIC ${KOKKOS_LINK_OPTIONS}
+      )
+    ENDIF()
+  ENDIF()
+
+  TARGET_COMPILE_OPTIONS(
+    ${LIBRARY_NAME} PUBLIC
+    $<$<COMPILE_LANGUAGE:CXX>:${KOKKOS_COMPILE_OPTIONS}>
+  )
+
+  IF (KOKKOS_ENABLE_CUDA)
+    TARGET_COMPILE_OPTIONS(
+      ${LIBRARY_NAME}
+      PUBLIC $<$<COMPILE_LANGUAGE:CXX>:${KOKKOS_CUDA_OPTIONS}>
+    )
+    SET(NODEDUP_CUDAFE_OPTIONS)
+    FOREACH(OPT ${KOKKOS_CUDAFE_OPTIONS})
+      LIST(APPEND NODEDUP_CUDAFE_OPTIONS -Xcudafe ${OPT})
+    ENDFOREACH()
+    TARGET_COMPILE_OPTIONS(
+      ${LIBRARY_NAME} 
+      PUBLIC $<$<COMPILE_LANGUAGE:CXX>:${NODEDUP_CUDAFE_OPTIONS}>
+    )
+  ENDIF()
+
+  LIST(LENGTH KOKKOS_XCOMPILER_OPTIONS XOPT_LENGTH)
+  IF (XOPT_LENGTH GREATER 1)
+    MESSAGE(FATAL_ERROR "CMake deduplication does not allow multiple -Xcompiler flags (${KOKKOS_XCOMPILER_OPTIONS}): will require Kokkos to upgrade to minimum 3.12")
+  ENDIF()
+  IF(KOKKOS_XCOMPILER_OPTIONS)
+    SET(NODEDUP_XCOMPILER_OPTIONS)
+    FOREACH(OPT ${KOKKOS_XCOMPILER_OPTIONS})
+      #I have to do this for now because we can't guarantee 3.12 support
+      #I really should do this with the shell option 
+      LIST(APPEND NODEDUP_XCOMPILER_OPTIONS -Xcompiler) 
+      LIST(APPEND NODEDUP_XCOMPILER_OPTIONS ${OPT}) 
+    ENDFOREACH()
+    TARGET_COMPILE_OPTIONS(
+      ${LIBRARY_NAME} 
+      PUBLIC $<$<COMPILE_LANGUAGE:CXX>:${NODEDUP_XCOMPILER_OPTIONS}>
+    )
+  ENDIF()
+
+  IF (KOKKOS_CXX_STANDARD_FEATURE)
+    #GREAT! I can do this the right way
+    TARGET_COMPILE_FEATURES(${LIBRARY_NAME} PUBLIC ${KOKKOS_CXX_STANDARD_FEATURE})
+    IF (NOT KOKKOS_USE_CXX_EXTENSIONS)
+      SET_TARGET_PROPERTIES(${LIBRARY_NAME} PROPERTIES CXX_EXTENSIONS OFF)
+    ENDIF()
+  ELSE()
+    #OH, well, no choice but the wrong way
+    TARGET_COMPILE_OPTIONS(${LIBRARY_NAME} PUBLIC ${KOKKOS_CXX_STANDARD_FLAG})
+  ENDIF()
+ENDFUNCTION()
+
+FUNCTION(KOKKOS_INTERNAL_ADD_LIBRARY LIBRARY_NAME)
+  CMAKE_PARSE_ARGUMENTS(PARSE 
+    "STATIC;SHARED"
+    ""
+    "HEADERS;SOURCES"
+    ${ARGN})
+
+  IF(PARSE_HEADERS)
+    LIST(REMOVE_DUPLICATES PARSE_HEADERS)
+  ENDIF()
+  IF(PARSE_SOURCES)
+    LIST(REMOVE_DUPLICATES PARSE_SOURCES)
+  ENDIF()
+
+  ADD_LIBRARY(
+    ${LIBRARY_NAME}
+    ${PARSE_HEADERS}
+    ${PARSE_SOURCES}
+  )
+
+  KOKKOS_INTERNAL_ADD_LIBRARY_INSTALL(${LIBRARY_NAME})
+
+  INSTALL(
+    FILES  ${PARSE_HEADERS}
+    DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
+    COMPONENT ${PACKAGE_NAME}
+  )
+
+  #In case we are building in-tree, add an alias name
+  #that matches the install Kokkos:: name
+  ADD_LIBRARY(Kokkos::${LIBRARY_NAME} ALIAS ${LIBRARY_NAME})
+ENDFUNCTION()
+
+FUNCTION(KOKKOS_ADD_LIBRARY LIBRARY_NAME)
+  IF (KOKKOS_HAS_TRILINOS)
+    TRIBITS_ADD_LIBRARY(${LIBRARY_NAME} ${ARGN})
+    #Stolen from Tribits - it can add prefixes
+    SET(TRIBITS_LIBRARY_NAME_PREFIX "${${PROJECT_NAME}_LIBRARY_NAME_PREFIX}")
+    SET(TRIBITS_LIBRARY_NAME ${TRIBITS_LIBRARY_NAME_PREFIX}${LIBRARY_NAME})
+    #Tribits has way too much techinical debt and baggage to even
+    #allow PUBLIC target_compile_options to be used. It forces C++ flags on projects
+    #as a giant blob of space-separated strings. We end up with duplicated
+    #flags between the flags implicitly forced on Kokkos-dependent and those Kokkos
+    #has in its public INTERFACE_COMPILE_OPTIONS.
+    #These do NOT get de-deduplicated because Tribits
+    #creates flags as a giant monolithic space-separated string
+    #Do not set any transitive properties and keep everything working as before
+    #KOKKOS_SET_LIBRARY_PROPERTIES(${TRIBITS_LIBRARY_NAME} PLAIN_STYLE)
+  ELSE()
+    KOKKOS_INTERNAL_ADD_LIBRARY(
+      ${LIBRARY_NAME} ${ARGN})
+    KOKKOS_SET_LIBRARY_PROPERTIES(${LIBRARY_NAME})
+  ENDIF()
+ENDFUNCTION()
+
+FUNCTION(KOKKOS_ADD_INTERFACE_LIBRARY NAME)
+IF (KOKKOS_HAS_TRILINOS)
+  TRIBITS_ADD_LIBRARY(${NAME} ${ARGN})
+ELSE()
+  CMAKE_PARSE_ARGUMENTS(PARSE
+    ""
+    ""
+    "HEADERS;SOURCES"
+    ${ARGN}
+  )
+
+  ADD_LIBRARY(${NAME} INTERFACE)
+  KOKKOS_INTERNAL_ADD_LIBRARY_INSTALL(${NAME})
+
+  INSTALL(
+    FILES  ${PARSE_HEADERS}
+    DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
+  )
+
+  INSTALL(
+    FILES  ${PARSE_HEADERS}
+    DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
+    COMPONENT ${PACKAGE_NAME}
+  )
+ENDIF()
+ENDFUNCTION()
+
+FUNCTION(KOKKOS_LIB_INCLUDE_DIRECTORIES TARGET)
+  IF(KOKKOS_HAS_TRILINOS)
+    #ignore the target, tribits doesn't do anything directly with targets
+    TRIBITS_INCLUDE_DIRECTORIES(${ARGN})
+  ELSE() #append to a list for later
+    KOKKOS_LIB_TYPE(${TARGET} INCTYPE) 
+    FOREACH(DIR ${ARGN})
+      TARGET_INCLUDE_DIRECTORIES(${TARGET} ${INCTYPE} $<BUILD_INTERFACE:${DIR}>)
+    ENDFOREACH()
+  ENDIF()
+ENDFUNCTION()
+
+FUNCTION(KOKKOS_LIB_COMPILE_OPTIONS TARGET)
+  IF(KOKKOS_HAS_TRILINOS)
+    #don't trust tribits to do this correctly
+    KOKKOS_TARGET_COMPILE_OPTIONS(${TARGET} ${ARGN})
+  ELSE()
+    KOKKOS_LIB_TYPE(${TARGET} INCTYPE)
+    KOKKOS_TARGET_COMPILE_OPTIONS(${${PROJECT_NAME}_LIBRARY_NAME_PREFIX}${TARGET} ${INCTYPE} ${ARGN})
+  ENDIF()
+ENDFUNCTION()
+
+MACRO(KOKKOS_ADD_TEST_DIRECTORIES)
+  IF (KOKKOS_HAS_TRILINOS)
+    TRIBITS_ADD_TEST_DIRECTORIES(${ARGN})
+  ELSE()
+    IF(KOKKOS_ENABLE_TESTS)
+      FOREACH(TEST_DIR ${ARGN})
+        ADD_SUBDIRECTORY(${TEST_DIR})
+      ENDFOREACH()
+    ENDIF()
+  ENDIF()
+ENDMACRO()
diff --git a/lib/kokkos/cmake/pgi.cmake b/lib/kokkos/cmake/pgi.cmake
new file mode 100644
index 0000000000..e98e849558
--- /dev/null
+++ b/lib/kokkos/cmake/pgi.cmake
@@ -0,0 +1,8 @@
+
+function(kokkos_set_pgi_flags full_standard int_standard)
+  STRING(TOLOWER ${full_standard} FULL_LC_STANDARD)
+  STRING(TOLOWER ${int_standard} INT_LC_STANDARD)
+  SET(KOKKOS_CXX_STANDARD_FLAG "--c++${FULL_LC_STANDARD}" PARENT_SCOPE)
+  SET(KOKKOS_CXX_INTERMDIATE_STANDARD_FLAG "--c++${INT_LC_STANDARD}" PARENT_SCOPE)
+endfunction()
+
diff --git a/lib/kokkos/cmake/tpls/FindTPLCUSPARSE.cmake b/lib/kokkos/cmake/tpls/FindTPLCUSPARSE.cmake
index aad1e2bad7..b8cee04804 100644
--- a/lib/kokkos/cmake/tpls/FindTPLCUSPARSE.cmake
+++ b/lib/kokkos/cmake/tpls/FindTPLCUSPARSE.cmake
@@ -67,7 +67,7 @@ ELSE()
     IF(CUDA_cusparse_LIBRARY STREQUAL "CUDA_cusparse_LIBRARY-NOTFOUND") 
       MESSAGE(FATAL_ERROR "\nCUSPARSE: could not find cuspasre library.")
     ENDIF()
-  ENDIF(CMAKE_VERSION VERSION_LESS "2.8.8")
+  ENDIF()
   GLOBAL_SET(TPL_CUSPARSE_LIBRARY_DIRS)
   GLOBAL_SET(TPL_CUSPARSE_INCLUDE_DIRS ${TPL_CUDA_INCLUDE_DIRS})
   GLOBAL_SET(TPL_CUSPARSE_LIBRARIES    ${CUDA_cusparse_LIBRARY})
diff --git a/lib/kokkos/cmake/tpls/FindTPLHWLOC.cmake b/lib/kokkos/cmake/tpls/FindTPLHWLOC.cmake
index 715b3e9bde..a4c55e1d7b 100644
--- a/lib/kokkos/cmake/tpls/FindTPLHWLOC.cmake
+++ b/lib/kokkos/cmake/tpls/FindTPLHWLOC.cmake
@@ -64,7 +64,7 @@
 #    Version:       1.3
 #
 
-TRIBITS_TPL_FIND_INCLUDE_DIRS_AND_LIBRARIES( HWLOC
+KOKKOS_TPL_FIND_INCLUDE_DIRS_AND_LIBRARIES( HWLOC
   REQUIRED_HEADERS hwloc.h
   REQUIRED_LIBS_NAMES "hwloc"
   )
diff --git a/lib/kokkos/cmake/tpls/FindTPLPthread.cmake b/lib/kokkos/cmake/tpls/FindTPLPthread.cmake
index fc401d7543..4dc1a87e18 100644
--- a/lib/kokkos/cmake/tpls/FindTPLPthread.cmake
+++ b/lib/kokkos/cmake/tpls/FindTPLPthread.cmake
@@ -75,7 +75,7 @@ IF(USE_THREADS)
   SET(TPL_Pthread_LIBRARIES "${CMAKE_THREAD_LIBS_INIT}")
   SET(TPL_Pthread_LIBRARY_DIRS "")
 ELSE()
-  TRIBITS_TPL_FIND_INCLUDE_DIRS_AND_LIBRARIES( Pthread
+  KOKKOS_TPL_FIND_INCLUDE_DIRS_AND_LIBRARIES( Pthread
     REQUIRED_HEADERS pthread.h
     REQUIRED_LIBS_NAMES pthread
       )
diff --git a/lib/kokkos/cmake/tpls/FindTPLQTHREADS.cmake b/lib/kokkos/cmake/tpls/FindTPLQTHREADS.cmake
deleted file mode 100644
index c312f2590b..0000000000
--- a/lib/kokkos/cmake/tpls/FindTPLQTHREADS.cmake
+++ /dev/null
@@ -1,69 +0,0 @@
-# @HEADER
-# ************************************************************************
-#
-#            Trilinos: An Object-Oriented Solver Framework
-#                 Copyright (2001) Sandia Corporation
-#
-#
-# Copyright (2001) Sandia Corporation. Under the terms of Contract
-# DE-AC04-94AL85000, there is a non-exclusive license for use of this
-# work by or on behalf of the U.S. Government.  Export of this program
-# may require a license from the United States Government.
-#
-# 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 Corporation nor the names of the
-# contributors may be used to endorse or promote products derived from
-# this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "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 SANDIA CORPORATION OR THE
-# 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:  The United States Government is granted for itself and others
-# acting on its behalf a paid-up, nonexclusive, irrevocable worldwide
-# license in this data to reproduce, prepare derivative works, and
-# perform publicly and display publicly.  Beginning five (5) years from
-# July 25, 2001, the United States Government is granted for itself and
-# others acting on its behalf a paid-up, nonexclusive, irrevocable
-# worldwide license in this data to reproduce, prepare derivative works,
-# distribute copies to the public, perform publicly and display
-# publicly, and to permit others to do so.
-#
-# NEITHER THE UNITED STATES GOVERNMENT, NOR THE UNITED STATES DEPARTMENT
-# OF ENERGY, NOR SANDIA CORPORATION, NOR ANY OF THEIR EMPLOYEES, MAKES
-# ANY WARRANTY, EXPRESS OR IMPLIED, OR ASSUMES ANY LEGAL LIABILITY OR
-# RESPONSIBILITY FOR THE ACCURACY, COMPLETENESS, OR USEFULNESS OF ANY
-# INFORMATION, APPARATUS, PRODUCT, OR PROCESS DISCLOSED, OR REPRESENTS
-# THAT ITS USE WOULD NOT INFRINGE PRIVATELY OWNED RIGHTS.
-#
-# ************************************************************************
-# @HEADER
-
-
-#-----------------------------------------------------------------------------
-#  Hardware locality detection and control library.
-#
-#  Acquisition information:
-#    Date checked:  July 2014
-#    Checked by:    H. Carter Edwards <hcedwar AT sandia.gov>
-#    Source:        https://code.google.com/p/qthreads
-#
-
-TRIBITS_TPL_FIND_INCLUDE_DIRS_AND_LIBRARIES( QTHREADS
-  REQUIRED_HEADERS qthread.h
-  REQUIRED_LIBS_NAMES "qthread"
-  )
diff --git a/lib/kokkos/cmake/tribits.cmake b/lib/kokkos/cmake/tribits.cmake
deleted file mode 100644
index 1f467f0662..0000000000
--- a/lib/kokkos/cmake/tribits.cmake
+++ /dev/null
@@ -1,531 +0,0 @@
-INCLUDE(CMakeParseArguments)
-INCLUDE(CTest)
-
-cmake_policy(SET CMP0054 NEW)
-
-MESSAGE(STATUS "The project name is: ${PROJECT_NAME}")
-
-IF(NOT DEFINED ${PROJECT_NAME}_ENABLE_OpenMP)
-  SET(${PROJECT_NAME}_ENABLE_OpenMP OFF)
-ENDIF()
-
-IF(NOT DEFINED ${PROJECT_NAME}_ENABLE_HPX)
-  SET(${PROJECT_NAME}_ENABLE_HPX OFF)
-ENDIF()
-
-IF(NOT DEFINED ${PROJECT_NAME}_ENABLE_DEBUG)
-  SET(${PROJECT_NAME}_ENABLE_DEBUG OFF)
-ENDIF()
-
-IF(NOT DEFINED ${PROJECT_NAME}_ENABLE_CXX11)
-  SET(${PROJECT_NAME}_ENABLE_CXX11 ON)
-ENDIF()
-
-IF(NOT DEFINED ${PROJECT_NAME}_ENABLE_TESTS)
-  SET(${PROJECT_NAME}_ENABLE_TESTS OFF)
-ENDIF()
-
-IF(NOT DEFINED TPL_ENABLE_Pthread)
-  SET(TPL_ENABLE_Pthread OFF)
-ENDIF()
-
-FUNCTION(ASSERT_DEFINED VARS)
-  FOREACH(VAR ${VARS})
-    IF(NOT DEFINED ${VAR})
-      MESSAGE(SEND_ERROR "Error, the variable ${VAR} is not defined!")
-    ENDIF()
-  ENDFOREACH()
-ENDFUNCTION()
-
-MACRO(GLOBAL_SET VARNAME)
-  SET(${VARNAME} ${ARGN} CACHE INTERNAL "")
-ENDMACRO()
-
-MACRO(PREPEND_GLOBAL_SET VARNAME)
-  ASSERT_DEFINED(${VARNAME})
-  GLOBAL_SET(${VARNAME} ${ARGN} ${${VARNAME}})
-ENDMACRO()
-
-#FUNCTION(REMOVE_GLOBAL_DUPLICATES VARNAME)
-#  ASSERT_DEFINED(${VARNAME})
-#  IF (${VARNAME})
-#    SET(TMP ${${VARNAME}})
-#    LIST(REMOVE_DUPLICATES TMP)
-#    GLOBAL_SET(${VARNAME} ${TMP})
-#  ENDIF()
-#ENDFUNCTION()
-
-#MACRO(TRIBITS_ADD_OPTION_AND_DEFINE  USER_OPTION_NAME  MACRO_DEFINE_NAME DOCSTRING  DEFAULT_VALUE)
-#  MESSAGE(STATUS "TRIBITS_ADD_OPTION_AND_DEFINE: '${USER_OPTION_NAME}' '${MACRO_DEFINE_NAME}' '${DEFAULT_VALUE}'")
-#  SET( ${USER_OPTION_NAME} "${DEFAULT_VALUE}" CACHE BOOL "${DOCSTRING}" )
-#  IF(NOT ${MACRO_DEFINE_NAME} STREQUAL "")
-#    IF(${USER_OPTION_NAME})
-#      GLOBAL_SET(${MACRO_DEFINE_NAME} ON)
-#    ELSE()
-#      GLOBAL_SET(${MACRO_DEFINE_NAME} OFF)
-#    ENDIF()
-#  ENDIF()
-#ENDMACRO()
-
-FUNCTION(TRIBITS_CONFIGURE_FILE  PACKAGE_NAME_CONFIG_FILE)
-
-  # Configure the file
-  CONFIGURE_FILE(
-    ${PACKAGE_SOURCE_DIR}/cmake/${PACKAGE_NAME_CONFIG_FILE}.in
-    ${CMAKE_CURRENT_BINARY_DIR}/${PACKAGE_NAME_CONFIG_FILE}
-    )
-
-ENDFUNCTION()
-
-#MACRO(TRIBITS_ADD_DEBUG_OPTION)
-#  TRIBITS_ADD_OPTION_AND_DEFINE(
-#    ${PROJECT_NAME}_ENABLE_DEBUG
-#    HAVE_${PROJECT_NAME_UC}_DEBUG
-#    "Enable a host of runtime debug checking."
-#    OFF
-#    )
-#ENDMACRO()
-
-
-MACRO(TRIBITS_ADD_TEST_DIRECTORIES)
-  IF(${${PROJECT_NAME}_ENABLE_TESTS})
-    FOREACH(TEST_DIR ${ARGN})
-      ADD_SUBDIRECTORY(${TEST_DIR})
-    ENDFOREACH()
-  ENDIF()
-ENDMACRO()
-
-MACRO(TRIBITS_ADD_EXAMPLE_DIRECTORIES)
-  IF(${PACKAGE_NAME}_ENABLE_EXAMPLES OR ${PARENT_PACKAGE_NAME}_ENABLE_EXAMPLES)
-    FOREACH(EXAMPLE_DIR ${ARGN})
-      ADD_SUBDIRECTORY(${EXAMPLE_DIR})
-    ENDFOREACH()
-  ENDIF()
-ENDMACRO()
-
-
-function(INCLUDE_DIRECTORIES)
-  cmake_parse_arguments(INCLUDE_DIRECTORIES "REQUIRED_DURING_INSTALLATION_TESTING" "" "" ${ARGN})
-  _INCLUDE_DIRECTORIES(${INCLUDE_DIRECTORIES_UNPARSED_ARGUMENTS})
-endfunction()
-
-
-MACRO(TARGET_TRANSFER_PROPERTY TARGET_NAME PROP_IN PROP_OUT)
-  SET(PROP_VALUES)
-  FOREACH(TARGET_X ${ARGN})
-    LIST(APPEND PROP_VALUES "$<TARGET_PROPERTY:${TARGET_X},${PROP_IN}>")
-  ENDFOREACH()
-  SET_TARGET_PROPERTIES(${TARGET_NAME} PROPERTIES ${PROP_OUT} "${PROP_VALUES}")
-ENDMACRO()
-
-MACRO(ADD_INTERFACE_LIBRARY LIB_NAME)
-  FILE(WRITE ${CMAKE_CURRENT_BINARY_DIR}/dummy.cpp "")
-  ADD_LIBRARY(${LIB_NAME} STATIC ${CMAKE_CURRENT_BINARY_DIR}/dummy.cpp)
-  SET_TARGET_PROPERTIES(${LIB_NAME} PROPERTIES INTERFACE TRUE)
-ENDMACRO()
-
-# Older versions of cmake does not make include directories transitive
-MACRO(TARGET_LINK_AND_INCLUDE_LIBRARIES TARGET_NAME)
-  TARGET_LINK_LIBRARIES(${TARGET_NAME} LINK_PUBLIC ${ARGN})
-  FOREACH(DEP_LIB ${ARGN})
-    TARGET_INCLUDE_DIRECTORIES(${TARGET_NAME} PUBLIC $<TARGET_PROPERTY:${DEP_LIB},INTERFACE_INCLUDE_DIRECTORIES>)
-    TARGET_INCLUDE_DIRECTORIES(${TARGET_NAME} PUBLIC $<TARGET_PROPERTY:${DEP_LIB},INCLUDE_DIRECTORIES>)
-  ENDFOREACH()
-ENDMACRO()
-
-FUNCTION(TRIBITS_ADD_LIBRARY LIBRARY_NAME)
-
-  SET(options STATIC SHARED TESTONLY NO_INSTALL_LIB_OR_HEADERS CUDALIBRARY)
-  SET(oneValueArgs)
-  SET(multiValueArgs HEADERS HEADERS_INSTALL_SUBDIR NOINSTALLHEADERS SOURCES DEPLIBS IMPORTEDLIBS DEFINES ADDED_LIB_TARGET_NAME_OUT)
-
-  CMAKE_PARSE_ARGUMENTS(PARSE "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN})
-
-  IF(PARSE_HEADERS)
-    LIST(REMOVE_DUPLICATES PARSE_HEADERS)
-  ENDIF()
-  IF(PARSE_SOURCES)
-    LIST(REMOVE_DUPLICATES PARSE_SOURCES)
-  ENDIF()
-
-  # Local variable to hold all of the libraries that will be directly linked
-  # to this library.
-  SET(LINK_LIBS ${${PACKAGE_NAME}_DEPS})
-
-  # Add dependent libraries passed directly in
-
-  IF (PARSE_IMPORTEDLIBS)
-    LIST(APPEND LINK_LIBS ${PARSE_IMPORTEDLIBS})
-  ENDIF()
-
-  IF (PARSE_DEPLIBS)
-    LIST(APPEND LINK_LIBS ${PARSE_DEPLIBS})
-  ENDIF()
-
-  # Add the library and all the dependencies
-
-  IF (PARSE_DEFINES)
-    ADD_DEFINITIONS(${PARSE_DEFINES})
-  ENDIF()
-
-  IF (PARSE_STATIC)
-    SET(STATIC_KEYWORD "STATIC")
-  ELSE()
-    SET(STATIC_KEYWORD)
-  ENDIF()
-
-  IF (PARSE_SHARED)
-    SET(SHARED_KEYWORD "SHARED")
-  ELSE()
-    SET(SHARED_KEYWORD)
-  ENDIF()
-
-  IF (PARSE_TESTONLY)
-    SET(EXCLUDE_FROM_ALL_KEYWORD "EXCLUDE_FROM_ALL")
-  ELSE()
-    SET(EXCLUDE_FROM_ALL_KEYWORD)
-  ENDIF()
-  IF (NOT PARSE_CUDALIBRARY)
-    ADD_LIBRARY(
-      ${LIBRARY_NAME}
-      ${STATIC_KEYWORD}
-      ${SHARED_KEYWORD}
-      ${EXCLUDE_FROM_ALL_KEYWORD}
-      ${PARSE_HEADERS}
-      ${PARSE_NOINSTALLHEADERS}
-      ${PARSE_SOURCES}
-      )
-  ELSE()
-    CUDA_ADD_LIBRARY(
-      ${LIBRARY_NAME}
-      ${PARSE_HEADERS}
-      ${PARSE_NOINSTALLHEADERS}
-      ${PARSE_SOURCES}
-      )
-  ENDIF()
-
-  TARGET_LINK_AND_INCLUDE_LIBRARIES(${LIBRARY_NAME} ${LINK_LIBS})
-
-  IF (NOT PARSE_TESTONLY OR PARSE_NO_INSTALL_LIB_OR_HEADERS)
-
-    INSTALL(
-      TARGETS ${LIBRARY_NAME}
-      EXPORT ${PROJECT_NAME}
-      RUNTIME DESTINATION bin
-      LIBRARY DESTINATION lib
-      ARCHIVE DESTINATION lib
-      COMPONENT ${PACKAGE_NAME}
-      )
-
-    INSTALL(
-      FILES  ${PARSE_HEADERS}
-      EXPORT ${PROJECT_NAME}
-      DESTINATION include
-      COMPONENT ${PACKAGE_NAME}
-      )
-
-      INSTALL(
-      DIRECTORY  ${PARSE_HEADERS_INSTALL_SUBDIR}
-      EXPORT ${PROJECT_NAME}
-      DESTINATION include
-      COMPONENT ${PACKAGE_NAME}
-      )
-
-  ENDIF()
-
-  IF (NOT PARSE_TESTONLY)
-    PREPEND_GLOBAL_SET(${PACKAGE_NAME}_LIBS ${LIBRARY_NAME})
-    REMOVE_GLOBAL_DUPLICATES(${PACKAGE_NAME}_LIBS)
-  ENDIF()
-
-ENDFUNCTION()
-
-FUNCTION(TRIBITS_ADD_EXECUTABLE EXE_NAME)
-
-  SET(options NOEXEPREFIX NOEXESUFFIX ADD_DIR_TO_NAME INSTALLABLE TESTONLY)
-  SET(oneValueArgs ADDED_EXE_TARGET_NAME_OUT)
-  SET(multiValueArgs SOURCES CATEGORIES HOST XHOST HOSTTYPE XHOSTTYPE DIRECTORY TESTONLYLIBS IMPORTEDLIBS DEPLIBS COMM LINKER_LANGUAGE TARGET_DEFINES DEFINES)
-
-  CMAKE_PARSE_ARGUMENTS(PARSE "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN})
-
-  IF (PARSE_TARGET_DEFINES)
-    TARGET_COMPILE_DEFINITIONS(${EXE_NAME} PUBLIC ${PARSE_TARGET_DEFINES})
-  ENDIF()
-
-  SET(LINK_LIBS PACKAGE_${PACKAGE_NAME})
-
-  IF (PARSE_TESTONLYLIBS)
-    LIST(APPEND LINK_LIBS ${PARSE_TESTONLYLIBS})
-  ENDIF()
-
-  IF (PARSE_IMPORTEDLIBS)
-    LIST(APPEND LINK_LIBS ${PARSE_IMPORTEDLIBS})
-  ENDIF()
-
-  SET (EXE_SOURCES)
-  IF(PARSE_DIRECTORY)
-    FOREACH( SOURCE_FILE ${PARSE_SOURCES} )
-      IF(IS_ABSOLUTE ${SOURCE_FILE})
-        SET (EXE_SOURCES ${EXE_SOURCES} ${SOURCE_FILE})
-      ELSE()
-        SET (EXE_SOURCES ${EXE_SOURCES} ${PARSE_DIRECTORY}/${SOURCE_FILE})
-      ENDIF()
-    ENDFOREACH( )
-  ELSE()
-    FOREACH( SOURCE_FILE ${PARSE_SOURCES} )
-      SET (EXE_SOURCES ${EXE_SOURCES} ${SOURCE_FILE})
-    ENDFOREACH( )
-  ENDIF()
-
-  SET(EXE_BINARY_NAME ${EXE_NAME})
-  IF(DEFINED PACKAGE_NAME AND NOT PARSE_NOEXEPREFIX)
-    SET(EXE_BINARY_NAME ${PACKAGE_NAME}_${EXE_BINARY_NAME})
-  ENDIF()
-
-  # IF (PARSE_TESTONLY)
-  #   SET(EXCLUDE_FROM_ALL_KEYWORD "EXCLUDE_FROM_ALL")
-  # ELSE()
-  #   SET(EXCLUDE_FROM_ALL_KEYWORD)
-  # ENDIF()
-  ADD_EXECUTABLE(${EXE_BINARY_NAME} ${EXCLUDE_FROM_ALL_KEYWORD} ${EXE_SOURCES})
-
-  TARGET_LINK_AND_INCLUDE_LIBRARIES(${EXE_BINARY_NAME} ${LINK_LIBS})
-
-  IF(PARSE_ADDED_EXE_TARGET_NAME_OUT)
-    SET(${PARSE_ADDED_EXE_TARGET_NAME_OUT} ${EXE_BINARY_NAME} PARENT_SCOPE)
-  ENDIF()
-
-  IF(PARSE_INSTALLABLE)
-    INSTALL(
-      TARGETS ${EXE_BINARY_NAME}
-      EXPORT ${PROJECT_NAME}
-        DESTINATION bin
-    )
-  ENDIF()
-ENDFUNCTION()
-
-IF(NOT TARGET check)
-  ADD_CUSTOM_TARGET(check COMMAND ${CMAKE_CTEST_COMMAND} -VV -C ${CMAKE_CFG_INTDIR})
-ENDIF()
-
-FUNCTION(TRIBITS_ADD_TEST)
-ENDFUNCTION()
-FUNCTION(TRIBITS_TPL_TENTATIVELY_ENABLE)
-ENDFUNCTION()
-
-FUNCTION(TRIBITS_ADD_ADVANCED_TEST)
-  # TODO Write this
-ENDFUNCTION()
-
-FUNCTION(TRIBITS_ADD_EXECUTABLE_AND_TEST EXE_NAME)
-
-  SET(options STANDARD_PASS_OUTPUT WILL_FAIL)
-  SET(oneValueArgs PASS_REGULAR_EXPRESSION FAIL_REGULAR_EXPRESSION ENVIRONMENT TIMEOUT CATEGORIES ADDED_TESTS_NAMES_OUT ADDED_EXE_TARGET_NAME_OUT)
-  SET(multiValueArgs)
-
-  CMAKE_PARSE_ARGUMENTS(PARSE "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN})
-
-  TRIBITS_ADD_EXECUTABLE(${EXE_NAME} TESTONLY ADDED_EXE_TARGET_NAME_OUT TEST_NAME ${PARSE_UNPARSED_ARGUMENTS})
-
-  IF(WIN32)
-    ADD_TEST(NAME ${TEST_NAME} WORKING_DIRECTORY ${LIBRARY_OUTPUT_PATH} COMMAND ${TEST_NAME}${CMAKE_EXECUTABLE_SUFFIX})
-  ELSE()
-    ADD_TEST(NAME ${TEST_NAME} COMMAND ${TEST_NAME})
-  ENDIF()
-  ADD_DEPENDENCIES(check ${TEST_NAME})
-
-  IF(PARSE_FAIL_REGULAR_EXPRESSION)
-    SET_TESTS_PROPERTIES(${TEST_NAME} PROPERTIES FAIL_REGULAR_EXPRESSION ${PARSE_FAIL_REGULAR_EXPRESSION})
-  ENDIF()
-
-  IF(PARSE_PASS_REGULAR_EXPRESSION)
-    SET_TESTS_PROPERTIES(${TEST_NAME} PROPERTIES PASS_REGULAR_EXPRESSION ${PARSE_PASS_REGULAR_EXPRESSION})
-  ENDIF()
-
-  IF(PARSE_WILL_FAIL)
-    SET_TESTS_PROPERTIES(${TEST_NAME} PROPERTIES WILL_FAIL ${PARSE_WILL_FAIL})
-  ENDIF()
-
-  IF(PARSE_ADDED_TESTS_NAMES_OUT)
-    SET(${PARSE_ADDED_TESTS_NAMES_OUT} ${TEST_NAME} PARENT_SCOPE)
-  ENDIF()
-
-  IF(PARSE_ADDED_EXE_TARGET_NAME_OUT)
-    SET(${PARSE_ADDED_EXE_TARGET_NAME_OUT} ${TEST_NAME} PARENT_SCOPE)
-  ENDIF()
-
-ENDFUNCTION()
-
-MACRO(TIBITS_CREATE_IMPORTED_TPL_LIBRARY TPL_NAME)
-  ADD_INTERFACE_LIBRARY(TPL_LIB_${TPL_NAME})
-  TARGET_LINK_LIBRARIES(TPL_LIB_${TPL_NAME} LINK_PUBLIC ${TPL_${TPL_NAME}_LIBRARIES})
-  TARGET_INCLUDE_DIRECTORIES(TPL_LIB_${TPL_NAME} INTERFACE ${TPL_${TPL_NAME}_INCLUDE_DIRS})
-ENDMACRO()
-
-FUNCTION(TRIBITS_TPL_FIND_INCLUDE_DIRS_AND_LIBRARIES TPL_NAME)
-
-  SET(options MUST_FIND_ALL_LIBS MUST_FIND_ALL_HEADERS NO_PRINT_ENABLE_SUCCESS_FAIL)
-  SET(oneValueArgs)
-  SET(multiValueArgs REQUIRED_HEADERS REQUIRED_LIBS_NAMES)
-
-  CMAKE_PARSE_ARGUMENTS(PARSE "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN})
-
-  SET(_${TPL_NAME}_ENABLE_SUCCESS TRUE)
-  IF (PARSE_REQUIRED_LIBS_NAMES)
-    FIND_LIBRARY(TPL_${TPL_NAME}_LIBRARIES NAMES ${PARSE_REQUIRED_LIBS_NAMES})
-    IF(NOT TPL_${TPL_NAME}_LIBRARIES)
-      SET(_${TPL_NAME}_ENABLE_SUCCESS FALSE)
-    ENDIF()
-  ENDIF()
-  IF (PARSE_REQUIRED_HEADERS)
-    FIND_PATH(TPL_${TPL_NAME}_INCLUDE_DIRS NAMES ${PARSE_REQUIRED_HEADERS})
-    IF(NOT TPL_${TPL_NAME}_INCLUDE_DIRS)
-      SET(_${TPL_NAME}_ENABLE_SUCCESS FALSE)
-    ENDIF()
-  ENDIF()
-
-
-  IF (_${TPL_NAME}_ENABLE_SUCCESS)
-    TIBITS_CREATE_IMPORTED_TPL_LIBRARY(${TPL_NAME})
-  ENDIF()
-
-ENDFUNCTION()
-
-#MACRO(TRIBITS_PROCESS_TPL_DEP_FILE TPL_FILE)
-#  GET_FILENAME_COMPONENT(TPL_NAME ${TPL_FILE} NAME_WE)
-#  INCLUDE("${TPL_FILE}")
-#  IF(TARGET TPL_LIB_${TPL_NAME})
-#    MESSAGE(STATUS "Found tpl library: ${TPL_NAME}")
-#    SET(TPL_ENABLE_${TPL_NAME} TRUE)
-#  ELSE()
-#    MESSAGE(STATUS "Tpl library not found: ${TPL_NAME}")
-#    SET(TPL_ENABLE_${TPL_NAME} FALSE)
-#  ENDIF()
-#ENDMACRO()
-
-MACRO(PREPEND_TARGET_SET VARNAME TARGET_NAME TYPE)
-  IF(TYPE STREQUAL "REQUIRED")
-    SET(REQUIRED TRUE)
-  ELSE()
-    SET(REQUIRED FALSE)
-  ENDIF()
-  IF(TARGET ${TARGET_NAME})
-    PREPEND_GLOBAL_SET(${VARNAME} ${TARGET_NAME})
-  ELSE()
-    IF(REQUIRED)
-      MESSAGE(FATAL_ERROR "Missing dependency ${TARGET_NAME}")
-    ENDIF()
-  ENDIF()
-ENDMACRO()
-
-MACRO(TRIBITS_APPEND_PACKAGE_DEPS DEP_LIST TYPE)
-  FOREACH(DEP ${ARGN})
-    PREPEND_GLOBAL_SET(${DEP_LIST} PACKAGE_${DEP})
-  ENDFOREACH()
-ENDMACRO()
-
-MACRO(TRIBITS_APPEND_TPLS_DEPS DEP_LIST TYPE)
-  FOREACH(DEP ${ARGN})
-    PREPEND_TARGET_SET(${DEP_LIST} TPL_LIB_${DEP} ${TYPE})
-  ENDFOREACH()
-ENDMACRO()
-
-MACRO(TRIBITS_ENABLE_TPLS)
-  FOREACH(TPL ${ARGN})
-    IF(TARGET ${TPL})
-      GLOBAL_SET(${PACKAGE_NAME}_ENABLE_${TPL} TRUE)
-    ELSE()
-      GLOBAL_SET(${PACKAGE_NAME}_ENABLE_${TPL} FALSE)
-    ENDIF()
-  ENDFOREACH()
-ENDMACRO()
-
-MACRO(TRIBITS_PACKAGE_DEFINE_DEPENDENCIES)
-
-  SET(options)
-  SET(oneValueArgs)
-  SET(multiValueArgs 
-    LIB_REQUIRED_PACKAGES
-    LIB_OPTIONAL_PACKAGES
-    TEST_REQUIRED_PACKAGES
-    TEST_OPTIONAL_PACKAGES
-    LIB_REQUIRED_TPLS
-    LIB_OPTIONAL_TPLS
-    TEST_REQUIRED_TPLS
-    TEST_OPTIONAL_TPLS
-    REGRESSION_EMAIL_LIST
-    SUBPACKAGES_DIRS_CLASSIFICATIONS_OPTREQS
-  )
-  CMAKE_PARSE_ARGUMENTS(PARSE "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN})
-
-  GLOBAL_SET(${PACKAGE_NAME}_DEPS "")
-  TRIBITS_APPEND_PACKAGE_DEPS(${PACKAGE_NAME}_DEPS REQUIRED ${PARSE_LIB_REQUIRED_PACKAGES})
-  TRIBITS_APPEND_PACKAGE_DEPS(${PACKAGE_NAME}_DEPS OPTIONAL ${PARSE_LIB_OPTIONAL_PACKAGES})
-  TRIBITS_APPEND_TPLS_DEPS(${PACKAGE_NAME}_DEPS REQUIRED ${PARSE_LIB_REQUIRED_TPLS})
-  TRIBITS_APPEND_TPLS_DEPS(${PACKAGE_NAME}_DEPS OPTIONAL ${PARSE_LIB_OPTIONAL_TPLS})
-
-  GLOBAL_SET(${PACKAGE_NAME}_TEST_DEPS "")
-  TRIBITS_APPEND_PACKAGE_DEPS(${PACKAGE_NAME}_TEST_DEPS REQUIRED ${PARSE_TEST_REQUIRED_PACKAGES})
-  TRIBITS_APPEND_PACKAGE_DEPS(${PACKAGE_NAME}_TEST_DEPS OPTIONAL ${PARSE_TEST_OPTIONAL_PACKAGES})
-  TRIBITS_APPEND_TPLS_DEPS(${PACKAGE_NAME}_TEST_DEPS REQUIRED ${PARSE_TEST_REQUIRED_TPLS})
-  TRIBITS_APPEND_TPLS_DEPS(${PACKAGE_NAME}_TEST_DEPS OPTIONAL ${PARSE_TEST_OPTIONAL_TPLS})
-
-  TRIBITS_ENABLE_TPLS(${PARSE_LIB_REQUIRED_TPLS} ${PARSE_LIB_OPTIONAL_TPLS} ${PARSE_TEST_REQUIRED_TPLS} ${PARSE_TEST_OPTIONAL_TPLS})
-
-ENDMACRO()
-
-MACRO(TRIBITS_SUBPACKAGE NAME)
-  SET(PACKAGE_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR})
-  SET(PARENT_PACKAGE_NAME ${PACKAGE_NAME})
-  SET(PACKAGE_NAME ${PACKAGE_NAME}${NAME})
-  STRING(TOUPPER ${PACKAGE_NAME} PACKAGE_NAME_UC)
-  SET(${PACKAGE_NAME}_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR})
-
-  ADD_INTERFACE_LIBRARY(PACKAGE_${PACKAGE_NAME})
-
-  GLOBAL_SET(${PACKAGE_NAME}_LIBS "")
-
-  INCLUDE(${PACKAGE_SOURCE_DIR}/cmake/Dependencies.cmake)
-
-ENDMACRO(TRIBITS_SUBPACKAGE)
-
-MACRO(TRIBITS_SUBPACKAGE_POSTPROCESS)
-  TARGET_LINK_AND_INCLUDE_LIBRARIES(PACKAGE_${PACKAGE_NAME} ${${PACKAGE_NAME}_LIBS})
-ENDMACRO(TRIBITS_SUBPACKAGE_POSTPROCESS)
-
-MACRO(TRIBITS_PACKAGE_DECL NAME)
-
-  SET(PACKAGE_NAME ${NAME})
-  SET(${PACKAGE_NAME}_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR})
-  STRING(TOUPPER ${PACKAGE_NAME} PACKAGE_NAME_UC)
-
-  #SET(TRIBITS_DEPS_DIR "${CMAKE_SOURCE_DIR}/cmake/deps")
-  #FILE(GLOB TPLS_FILES "${TRIBITS_DEPS_DIR}/*.cmake")
-  #FOREACH(TPL_FILE ${TPLS_FILES})
-  #  TRIBITS_PROCESS_TPL_DEP_FILE(${TPL_FILE})
-  #ENDFOREACH()
-
-ENDMACRO()
-
-
-MACRO(TRIBITS_PROCESS_SUBPACKAGES)
-  FILE(GLOB SUBPACKAGES RELATIVE ${CMAKE_SOURCE_DIR} */cmake/Dependencies.cmake)
-  FOREACH(SUBPACKAGE ${SUBPACKAGES})
-    GET_FILENAME_COMPONENT(SUBPACKAGE_CMAKE ${SUBPACKAGE} DIRECTORY)
-    GET_FILENAME_COMPONENT(SUBPACKAGE_DIR ${SUBPACKAGE_CMAKE} DIRECTORY)
-    ADD_SUBDIRECTORY(${CMAKE_BINARY_DIR}/../${SUBPACKAGE_DIR})
-  ENDFOREACH()
-ENDMACRO(TRIBITS_PROCESS_SUBPACKAGES)
-
-MACRO(TRIBITS_PACKAGE_DEF)
-ENDMACRO(TRIBITS_PACKAGE_DEF)
-
-MACRO(TRIBITS_EXCLUDE_AUTOTOOLS_FILES)
-ENDMACRO(TRIBITS_EXCLUDE_AUTOTOOLS_FILES)
-
-MACRO(TRIBITS_EXCLUDE_FILES)
-ENDMACRO(TRIBITS_EXCLUDE_FILES)
-
-MACRO(TRIBITS_PACKAGE_POSTPROCESS)
-ENDMACRO(TRIBITS_PACKAGE_POSTPROCESS)
-
diff --git a/lib/kokkos/containers/CMakeLists.txt b/lib/kokkos/containers/CMakeLists.txt
index c37aa3e3e2..2bfaea7a13 100644
--- a/lib/kokkos/containers/CMakeLists.txt
+++ b/lib/kokkos/containers/CMakeLists.txt
@@ -1,13 +1,10 @@
-
-
-TRIBITS_SUBPACKAGE(Containers)
-
-
-IF(KOKKOS_HAS_TRILINOS)
-  ADD_SUBDIRECTORY(src)
-ENDIF()
-
-TRIBITS_ADD_TEST_DIRECTORIES(unit_tests)
-TRIBITS_ADD_TEST_DIRECTORIES(performance_tests)
-
-TRIBITS_SUBPACKAGE_POSTPROCESS()
+
+
+KOKKOS_SUBPACKAGE(Containers)
+
+ADD_SUBDIRECTORY(src)
+
+KOKKOS_ADD_TEST_DIRECTORIES(unit_tests)
+KOKKOS_ADD_TEST_DIRECTORIES(performance_tests)
+
+KOKKOS_SUBPACKAGE_POSTPROCESS()
diff --git a/lib/kokkos/containers/performance_tests/CMakeLists.txt b/lib/kokkos/containers/performance_tests/CMakeLists.txt
index 3c6584bc34..ca76808190 100644
--- a/lib/kokkos/containers/performance_tests/CMakeLists.txt
+++ b/lib/kokkos/containers/performance_tests/CMakeLists.txt
@@ -1,49 +1,62 @@
 
-INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR})
-INCLUDE_DIRECTORIES(REQUIRED_DURING_INSTALLATION_TESTING ${CMAKE_CURRENT_SOURCE_DIR})
-INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../src )
+KOKKOS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR})
+KOKKOS_INCLUDE_DIRECTORIES(REQUIRED_DURING_INSTALLATION_TESTING ${CMAKE_CURRENT_SOURCE_DIR})
+KOKKOS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../src )
 
-IF(NOT KOKKOS_HAS_TRILINOS)
-  IF(KOKKOS_SEPARATE_LIBS)
-    set(TEST_LINK_TARGETS kokkoscore)
-  ELSE()
-    set(TEST_LINK_TARGETS kokkos)
-  ENDIF()
+IF(Kokkos_ENABLE_CUDA)
+   SET(SOURCES
+     TestMain.cpp 
+     TestCuda.cpp
+     )
+
+   KOKKOS_ADD_TEST_EXECUTABLE( PerfTestExec_Cuda
+                               SOURCES ${SOURCES}
+                             )
+
+   KOKKOS_ADD_TEST( NAME PerformanceTest_Cuda
+                    EXE  PerfTestExec_Cuda
+                  )
 ENDIF()
 
-SET(SOURCES
-  TestMain.cpp 
-  TestCuda.cpp
-  )
+IF(Kokkos_ENABLE_PTHREAD)
+   SET(SOURCES
+     TestMain.cpp 
+     TestThreads.cpp
+   )
+   KOKKOS_ADD_TEST_EXECUTABLE( PerfTestExec_Threads
+                               SOURCES ${SOURCES}
+                             )
 
-IF(Kokkos_ENABLE_Pthread)
-  LIST( APPEND SOURCES TestThreads.cpp)
+   KOKKOS_ADD_TEST( NAME PerformanceTest_Threads
+                    EXE  PerfTestExec_Threads
+                  )
 ENDIF()
 
-IF(Kokkos_ENABLE_OpenMP)
-  LIST( APPEND SOURCES TestOpenMP.cpp)
+IF(Kokkos_ENABLE_OPENMP)
+   SET(SOURCES
+     TestMain.cpp 
+     TestOpenMP.cpp
+   )
+   KOKKOS_ADD_TEST_EXECUTABLE( PerfTestExec_OpenMP
+                               SOURCES ${SOURCES}
+                             )
+
+   KOKKOS_ADD_TEST( NAME PerformanceTest_OpenMP
+                    EXE  PerfTestExec_OpenMP
+                  )
 ENDIF()
 
 IF(Kokkos_ENABLE_HPX)
-  LIST( APPEND SOURCES TestHPX.cpp)
+   SET(SOURCES
+     TestMain.cpp 
+     TestHPX.cpp
+   )
+   KOKKOS_ADD_TEST_EXECUTABLE( PerfTestExec_HPX
+                               SOURCES ${SOURCES}
+                             )
+
+   KOKKOS_ADD_TEST( NAME PerformanceTest_HPX
+                    EXE  PerfTestExec_HPX
+                  )
 ENDIF()
 
-# Per #374, we always want to build this test, but we only want to run
-# it as a PERFORMANCE test.  That's why we separate building the test
-# from running the test.
-
-TRIBITS_ADD_EXECUTABLE(
-  PerfTestExec
-  SOURCES ${SOURCES}
-  COMM serial mpi
-  TESTONLYLIBS kokkos_gtest ${TEST_LINK_TARGETS}
-  )
-
-TRIBITS_ADD_TEST(
-  PerformanceTest
-  NAME PerfTestExec
-  COMM serial mpi
-  NUM_MPI_PROCS 1
-  CATEGORIES PERFORMANCE
-  FAIL_REGULAR_EXPRESSION "  FAILED  "
-  )
diff --git a/lib/kokkos/containers/performance_tests/TestCuda.cpp b/lib/kokkos/containers/performance_tests/TestCuda.cpp
index 351fb86df3..697a006c3c 100644
--- a/lib/kokkos/containers/performance_tests/TestCuda.cpp
+++ b/lib/kokkos/containers/performance_tests/TestCuda.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -42,7 +43,7 @@
 */
 
 #include <Kokkos_Macros.hpp>
-#if defined( KOKKOS_ENABLE_CUDA )
+#if defined(KOKKOS_ENABLE_CUDA)
 
 #include <cstdint>
 #include <string>
@@ -66,45 +67,38 @@
 namespace Performance {
 
 class cuda : public ::testing::Test {
-protected:
-  static void SetUpTestCase()
-  {
+ protected:
+  static void SetUpTestCase() {
     std::cout << std::setprecision(5) << std::scientific;
     Kokkos::InitArguments args(-1, -1, 0);
     Kokkos::initialize(args);
   }
-  static void TearDownTestCase()
-  {
-    Kokkos::finalize();
-  }
+  static void TearDownTestCase() { Kokkos::finalize(); }
 };
 
-TEST_F( cuda, dynrankview_perf )
-{
+TEST_F(cuda, dynrankview_perf) {
   std::cout << "Cuda" << std::endl;
   std::cout << " DynRankView vs View: Initialization Only " << std::endl;
-  test_dynrankview_op_perf<Kokkos::Cuda>( 40960 );
+  test_dynrankview_op_perf<Kokkos::Cuda>(40960);
 }
 
-TEST_F( cuda, global_2_local)
-{
+TEST_F(cuda, global_2_local) {
   std::cout << "Cuda" << std::endl;
   std::cout << "size, create, generate, fill, find" << std::endl;
-  for (unsigned i=Performance::begin_id_size; i<=Performance::end_id_size; i *= Performance::id_step)
+  for (unsigned i = Performance::begin_id_size; i <= Performance::end_id_size;
+       i *= Performance::id_step)
     test_global_to_local_ids<Kokkos::Cuda>(i);
 }
 
-TEST_F( cuda, unordered_map_performance_near)
-{
-  Perf::run_performance_tests<Kokkos::Cuda,true>("cuda-near");
+TEST_F(cuda, unordered_map_performance_near) {
+  Perf::run_performance_tests<Kokkos::Cuda, true>("cuda-near");
 }
 
-TEST_F( cuda, unordered_map_performance_far)
-{
-  Perf::run_performance_tests<Kokkos::Cuda,false>("cuda-far");
+TEST_F(cuda, unordered_map_performance_far) {
+  Perf::run_performance_tests<Kokkos::Cuda, false>("cuda-far");
 }
 
-}
+}  // namespace Performance
 #else
 void KOKKOS_CONTAINERS_PERFORMANCE_TESTS_TESTCUDA_PREVENT_EMPTY_LINK_ERROR() {}
-#endif  /* #if defined( KOKKOS_ENABLE_CUDA ) */
+#endif /* #if defined( KOKKOS_ENABLE_CUDA ) */
diff --git a/lib/kokkos/containers/performance_tests/TestDynRankView.hpp b/lib/kokkos/containers/performance_tests/TestDynRankView.hpp
index db6274e057..ee13f7e58b 100644
--- a/lib/kokkos/containers/performance_tests/TestDynRankView.hpp
+++ b/lib/kokkos/containers/performance_tests/TestDynRankView.hpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -49,109 +50,102 @@
 
 #include <impl/Kokkos_Timer.hpp>
 
-// Compare performance of DynRankView to View, specific focus on the parenthesis operators
+// Compare performance of DynRankView to View, specific focus on the parenthesis
+// operators
 
 namespace Performance {
 
-//View functor
+// View functor
 template <typename DeviceType>
 struct InitViewFunctor {
-  typedef Kokkos::View<double***, DeviceType> inviewtype;
+  typedef Kokkos::View<double ***, DeviceType> inviewtype;
   inviewtype _inview;
 
-  InitViewFunctor( inviewtype &inview_ ) : _inview(inview_)
-  {}
+  InitViewFunctor(inviewtype &inview_) : _inview(inview_) {}
 
   KOKKOS_INLINE_FUNCTION
   void operator()(const int i) const {
     for (unsigned j = 0; j < _inview.extent(1); ++j) {
       for (unsigned k = 0; k < _inview.extent(2); ++k) {
-        _inview(i,j,k) = i/2 -j*j + k/3;
+        _inview(i, j, k) = i / 2 - j * j + k / 3;
       }
     }
   }
 
-  struct SumComputationTest
-  {
-    typedef Kokkos::View<double***, DeviceType> inviewtype;
+  struct SumComputationTest {
+    typedef Kokkos::View<double ***, DeviceType> inviewtype;
     inviewtype _inview;
 
-    typedef Kokkos::View<double*, DeviceType> outviewtype;
+    typedef Kokkos::View<double *, DeviceType> outviewtype;
     outviewtype _outview;
 
     KOKKOS_INLINE_FUNCTION
-    SumComputationTest(inviewtype &inview_ , outviewtype &outview_) : _inview(inview_), _outview(outview_) {}
+    SumComputationTest(inviewtype &inview_, outviewtype &outview_)
+        : _inview(inview_), _outview(outview_) {}
 
     KOKKOS_INLINE_FUNCTION
     void operator()(const int i) const {
       for (unsigned j = 0; j < _inview.extent(1); ++j) {
         for (unsigned k = 0; k < _inview.extent(2); ++k) {
-          _outview(i) += _inview(i,j,k) ;
+          _outview(i) += _inview(i, j, k);
         }
       }
     }
   };
-
 };
 
 template <typename DeviceType>
 struct InitStrideViewFunctor {
-  typedef Kokkos::View<double***, Kokkos::LayoutStride, DeviceType> inviewtype;
+  typedef Kokkos::View<double ***, Kokkos::LayoutStride, DeviceType> inviewtype;
   inviewtype _inview;
 
-  InitStrideViewFunctor( inviewtype &inview_ ) : _inview(inview_)
-  {}
+  InitStrideViewFunctor(inviewtype &inview_) : _inview(inview_) {}
 
   KOKKOS_INLINE_FUNCTION
   void operator()(const int i) const {
     for (unsigned j = 0; j < _inview.extent(1); ++j) {
       for (unsigned k = 0; k < _inview.extent(2); ++k) {
-        _inview(i,j,k) = i/2 -j*j + k/3;
+        _inview(i, j, k) = i / 2 - j * j + k / 3;
       }
     }
   }
-
 };
 
 template <typename DeviceType>
 struct InitViewRank7Functor {
-  typedef Kokkos::View<double*******, DeviceType> inviewtype;
+  typedef Kokkos::View<double *******, DeviceType> inviewtype;
   inviewtype _inview;
 
-  InitViewRank7Functor( inviewtype &inview_ ) : _inview(inview_)
-  {}
+  InitViewRank7Functor(inviewtype &inview_) : _inview(inview_) {}
 
   KOKKOS_INLINE_FUNCTION
   void operator()(const int i) const {
     for (unsigned j = 0; j < _inview.extent(1); ++j) {
       for (unsigned k = 0; k < _inview.extent(2); ++k) {
-        _inview(i,j,k,0,0,0,0) = i/2 -j*j + k/3;
+        _inview(i, j, k, 0, 0, 0, 0) = i / 2 - j * j + k / 3;
       }
     }
   }
-
 };
 
-//DynRankView functor
+// DynRankView functor
 template <typename DeviceType>
 struct InitDynRankViewFunctor {
   typedef Kokkos::DynRankView<double, DeviceType> inviewtype;
   inviewtype _inview;
 
-  InitDynRankViewFunctor( inviewtype &inview_ ) : _inview(inview_)
-  {}
+  InitDynRankViewFunctor(inviewtype &inview_) : _inview(inview_) {}
 
   KOKKOS_INLINE_FUNCTION
   void operator()(const int i) const {
     for (unsigned j = 0; j < _inview.extent(1); ++j) {
       for (unsigned k = 0; k < _inview.extent(2); ++k) {
-        _inview(i,j,k) = i/2 -j*j + k/3;
+        _inview(i, j, k) = i / 2 - j * j + k / 3;
       }
     }
   }
 
-  struct SumComputationTest
-  {
+  struct SumComputationTest {
     typedef Kokkos::DynRankView<double, DeviceType> inviewtype;
     inviewtype _inview;
 
@@ -159,108 +153,121 @@ struct InitDynRankViewFunctor {
     outviewtype _outview;
 
     KOKKOS_INLINE_FUNCTION
-    SumComputationTest(inviewtype &inview_ , outviewtype &outview_) : _inview(inview_), _outview(outview_) {}
+    SumComputationTest(inviewtype &inview_, outviewtype &outview_)
+        : _inview(inview_), _outview(outview_) {}
 
     KOKKOS_INLINE_FUNCTION
     void operator()(const int i) const {
       for (unsigned j = 0; j < _inview.extent(1); ++j) {
         for (unsigned k = 0; k < _inview.extent(2); ++k) {
-          _outview(i) += _inview(i,j,k) ;
+          _outview(i) += _inview(i, j, k);
         }
       }
     }
   };
-
 };
 
-
 template <typename DeviceType>
-void test_dynrankview_op_perf( const int par_size )
-{
-
+void test_dynrankview_op_perf(const int par_size) {
   typedef DeviceType execution_space;
   typedef typename execution_space::size_type size_type;
   const size_type dim_2 = 90;
   const size_type dim_3 = 30;
 
-  double elapsed_time_view = 0;
-  double elapsed_time_compview = 0;
+  double elapsed_time_view       = 0;
+  double elapsed_time_compview   = 0;
   double elapsed_time_strideview = 0;
   double elapsed_time_view_rank7 = 0;
-  double elapsed_time_drview = 0;
+  double elapsed_time_drview     = 0;
   double elapsed_time_compdrview = 0;
   Kokkos::Timer timer;
   {
-    Kokkos::View<double***,DeviceType> testview("testview",par_size,dim_2,dim_3);
+    Kokkos::View<double ***, DeviceType> testview("testview", par_size, dim_2,
+                                                  dim_3);
     typedef InitViewFunctor<DeviceType> FunctorType;
 
     timer.reset();
-    Kokkos::RangePolicy<DeviceType> policy(0,par_size);
-    Kokkos::parallel_for( policy , FunctorType(testview) );
+    Kokkos::RangePolicy<DeviceType> policy(0, par_size);
+    Kokkos::parallel_for(policy, FunctorType(testview));
     DeviceType().fence();
     elapsed_time_view = timer.seconds();
     std::cout << " View time (init only): " << elapsed_time_view << std::endl;
 
-
     timer.reset();
-    Kokkos::View<double*,DeviceType> sumview("sumview",par_size);
-    Kokkos::parallel_for( policy , typename FunctorType::SumComputationTest(testview, sumview) );
+    Kokkos::View<double *, DeviceType> sumview("sumview", par_size);
+    Kokkos::parallel_for(
+        policy, typename FunctorType::SumComputationTest(testview, sumview));
     DeviceType().fence();
     elapsed_time_compview = timer.seconds();
-    std::cout << " View sum computation time: " << elapsed_time_view << std::endl;
+    std::cout << " View sum computation time: " << elapsed_time_view
+              << std::endl;
 
-
-    Kokkos::View<double***,Kokkos::LayoutStride, DeviceType> teststrideview = Kokkos::subview(testview, Kokkos::ALL, Kokkos::ALL,Kokkos::ALL);
+    Kokkos::View<double ***, Kokkos::LayoutStride, DeviceType> teststrideview =
+        Kokkos::subview(testview, Kokkos::ALL, Kokkos::ALL, Kokkos::ALL);
     typedef InitStrideViewFunctor<DeviceType> FunctorStrideType;
 
     timer.reset();
-    Kokkos::parallel_for( policy , FunctorStrideType(teststrideview) );
+    Kokkos::parallel_for(policy, FunctorStrideType(teststrideview));
     DeviceType().fence();
     elapsed_time_strideview = timer.seconds();
-    std::cout << " Strided View time (init only): " << elapsed_time_strideview << std::endl;
+    std::cout << " Strided View time (init only): " << elapsed_time_strideview
+              << std::endl;
   }
   {
-    Kokkos::View<double*******,DeviceType> testview("testview",par_size,dim_2,dim_3,1,1,1,1);
+    Kokkos::View<double *******, DeviceType> testview("testview", par_size,
+                                                      dim_2, dim_3, 1, 1, 1, 1);
     typedef InitViewRank7Functor<DeviceType> FunctorType;
 
     timer.reset();
-    Kokkos::RangePolicy<DeviceType> policy(0,par_size);
-    Kokkos::parallel_for( policy , FunctorType(testview) );
+    Kokkos::RangePolicy<DeviceType> policy(0, par_size);
+    Kokkos::parallel_for(policy, FunctorType(testview));
     DeviceType().fence();
     elapsed_time_view_rank7 = timer.seconds();
-    std::cout << " View Rank7 time (init only): " << elapsed_time_view_rank7 << std::endl;
+    std::cout << " View Rank7 time (init only): " << elapsed_time_view_rank7
+              << std::endl;
   }
   {
-    Kokkos::DynRankView<double,DeviceType> testdrview("testdrview",par_size,dim_2,dim_3);
+    Kokkos::DynRankView<double, DeviceType> testdrview("testdrview", par_size,
+                                                       dim_2, dim_3);
     typedef InitDynRankViewFunctor<DeviceType> FunctorType;
 
     timer.reset();
-    Kokkos::RangePolicy<DeviceType> policy(0,par_size);
-    Kokkos::parallel_for( policy , FunctorType(testdrview) );
+    Kokkos::RangePolicy<DeviceType> policy(0, par_size);
+    Kokkos::parallel_for(policy, FunctorType(testdrview));
     DeviceType().fence();
     elapsed_time_drview = timer.seconds();
-    std::cout << " DynRankView time (init only): " << elapsed_time_drview << std::endl;
+    std::cout << " DynRankView time (init only): " << elapsed_time_drview
+              << std::endl;
 
     timer.reset();
-    Kokkos::DynRankView<double,DeviceType> sumview("sumview",par_size);
-    Kokkos::parallel_for( policy , typename FunctorType::SumComputationTest(testdrview, sumview) );
+    Kokkos::DynRankView<double, DeviceType> sumview("sumview", par_size);
+    Kokkos::parallel_for(
+        policy, typename FunctorType::SumComputationTest(testdrview, sumview));
     DeviceType().fence();
     elapsed_time_compdrview = timer.seconds();
-    std::cout << " DynRankView sum computation time: " << elapsed_time_compdrview << std::endl;
-
+    std::cout << " DynRankView sum computation time: "
+              << elapsed_time_compdrview << std::endl;
   }
 
-  std::cout << " Ratio of View to DynRankView time: " << elapsed_time_view / elapsed_time_drview << std::endl; //expect < 1
-  std::cout << " Ratio of View to DynRankView sum computation time: " << elapsed_time_compview / elapsed_time_compdrview << std::endl; //expect < 1
-  std::cout << " Ratio of View to View Rank7  time: " << elapsed_time_view / elapsed_time_view_rank7 << std::endl; //expect < 1
-  std::cout << " Ratio of StrideView to DynRankView time: " << elapsed_time_strideview / elapsed_time_drview << std::endl; //expect < 1
-  std::cout << " Ratio of DynRankView to View Rank7  time: " << elapsed_time_drview / elapsed_time_view_rank7 << std::endl; //expect ?
+  std::cout << " Ratio of View to DynRankView time: "
+            << elapsed_time_view / elapsed_time_drview
+            << std::endl;  // expect < 1
+  std::cout << " Ratio of View to DynRankView sum computation time: "
+            << elapsed_time_compview / elapsed_time_compdrview
+            << std::endl;  // expect < 1
+  std::cout << " Ratio of View to View Rank7  time: "
+            << elapsed_time_view / elapsed_time_view_rank7
+            << std::endl;  // expect < 1
+  std::cout << " Ratio of StrideView to DynRankView time: "
+            << elapsed_time_strideview / elapsed_time_drview
+            << std::endl;  // expect < 1
+  std::cout << " Ratio of DynRankView to View Rank7  time: "
+            << elapsed_time_drview / elapsed_time_view_rank7
+            << std::endl;  // expect ?
 
   timer.reset();
 
-} //end test_dynrankview
+}  // end test_dynrankview
 
-
-} //end Performance
+}  // namespace Performance
 #endif
-
diff --git a/lib/kokkos/containers/performance_tests/TestGlobal2LocalIds.hpp b/lib/kokkos/containers/performance_tests/TestGlobal2LocalIds.hpp
index 98997b3239..0d2ee4bc8d 100644
--- a/lib/kokkos/containers/performance_tests/TestGlobal2LocalIds.hpp
+++ b/lib/kokkos/containers/performance_tests/TestGlobal2LocalIds.hpp
@@ -1,12 +1,13 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -22,10 +23,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -35,7 +36,7 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
@@ -54,153 +55,137 @@
 namespace Performance {
 
 static const unsigned begin_id_size = 256u;
-static const unsigned end_id_size = 1u << 22;
-static const unsigned id_step = 2u;
+static const unsigned end_id_size   = 1u << 22;
+static const unsigned id_step       = 2u;
 
-union helper
-{
+union helper {
   uint32_t word;
   uint8_t byte[4];
 };
 
-
 template <typename Device>
-struct generate_ids
-{
+struct generate_ids {
   typedef Device execution_space;
   typedef typename execution_space::size_type size_type;
-  typedef Kokkos::View<uint32_t*,execution_space> local_id_view;
+  typedef Kokkos::View<uint32_t*, execution_space> local_id_view;
 
   local_id_view local_2_global;
 
-  generate_ids( local_id_view & ids)
-    : local_2_global(ids)
-  {
+  generate_ids(local_id_view& ids) : local_2_global(ids) {
     Kokkos::parallel_for(local_2_global.extent(0), *this);
   }
 
-
   KOKKOS_INLINE_FUNCTION
-  void operator()(size_type i) const
-  {
-
+  void operator()(size_type i) const {
     helper x = {static_cast<uint32_t>(i)};
 
     // shuffle the bytes of i to create a unique, semi-random global_id
     x.word = ~x.word;
 
     uint8_t tmp = x.byte[3];
-    x.byte[3] = x.byte[1];
-    x.byte[1] = tmp;
+    x.byte[3]   = x.byte[1];
+    x.byte[1]   = tmp;
 
-    tmp = x.byte[2];
+    tmp       = x.byte[2];
     x.byte[2] = x.byte[0];
     x.byte[0] = tmp;
 
     local_2_global[i] = x.word;
   }
-
 };
 
 template <typename Device>
-struct fill_map
-{
+struct fill_map {
   typedef Device execution_space;
   typedef typename execution_space::size_type size_type;
-  typedef Kokkos::View<const uint32_t*,execution_space, Kokkos::MemoryRandomAccess> local_id_view;
-  typedef Kokkos::UnorderedMap<uint32_t,size_type,execution_space> global_id_view;
+  typedef Kokkos::View<const uint32_t*, execution_space,
+                       Kokkos::MemoryRandomAccess>
+      local_id_view;
+  typedef Kokkos::UnorderedMap<uint32_t, size_type, execution_space>
+      global_id_view;
 
   global_id_view global_2_local;
   local_id_view local_2_global;
 
-  fill_map( global_id_view gIds, local_id_view lIds)
-    : global_2_local(gIds) , local_2_global(lIds)
-  {
+  fill_map(global_id_view gIds, local_id_view lIds)
+      : global_2_local(gIds), local_2_global(lIds) {
     Kokkos::parallel_for(local_2_global.extent(0), *this);
   }
 
   KOKKOS_INLINE_FUNCTION
-  void operator()(size_type i) const
-  {
-    global_2_local.insert( local_2_global[i], i);
+  void operator()(size_type i) const {
+    global_2_local.insert(local_2_global[i], i);
   }
-
 };
 
 template <typename Device>
-struct find_test
-{
+struct find_test {
   typedef Device execution_space;
   typedef typename execution_space::size_type size_type;
-  typedef Kokkos::View<const uint32_t*,execution_space, Kokkos::MemoryRandomAccess> local_id_view;
-  typedef Kokkos::UnorderedMap<const uint32_t, const size_type,execution_space> global_id_view;
+  typedef Kokkos::View<const uint32_t*, execution_space,
+                       Kokkos::MemoryRandomAccess>
+      local_id_view;
+  typedef Kokkos::UnorderedMap<const uint32_t, const size_type, execution_space>
+      global_id_view;
 
   global_id_view global_2_local;
   local_id_view local_2_global;
 
   typedef size_t value_type;
 
-  find_test( global_id_view gIds, local_id_view lIds, value_type & num_errors)
-    : global_2_local(gIds) , local_2_global(lIds)
-  {
+  find_test(global_id_view gIds, local_id_view lIds, value_type& num_errors)
+      : global_2_local(gIds), local_2_global(lIds) {
     Kokkos::parallel_reduce(local_2_global.extent(0), *this, num_errors);
   }
 
   KOKKOS_INLINE_FUNCTION
-  void init(value_type & v) const
-  { v = 0; }
+  void init(value_type& v) const { v = 0; }
 
   KOKKOS_INLINE_FUNCTION
-  void join(volatile value_type & dst, volatile value_type const & src) const
-  { dst += src; }
-
-  KOKKOS_INLINE_FUNCTION
-  void operator()(size_type i, value_type & num_errors) const
-  {
-    uint32_t index = global_2_local.find( local_2_global[i] );
-
-    if ( global_2_local.value_at(index) != i) ++num_errors;
+  void join(volatile value_type& dst, volatile value_type const& src) const {
+    dst += src;
   }
 
+  KOKKOS_INLINE_FUNCTION
+  void operator()(size_type i, value_type& num_errors) const {
+    uint32_t index = global_2_local.find(local_2_global[i]);
+
+    if (global_2_local.value_at(index) != i) ++num_errors;
+  }
 };
 
 template <typename Device>
-void test_global_to_local_ids(unsigned num_ids)
-{
-
+void test_global_to_local_ids(unsigned num_ids) {
   typedef Device execution_space;
   typedef typename execution_space::size_type size_type;
 
-  typedef Kokkos::View<uint32_t*,execution_space> local_id_view;
-  typedef Kokkos::UnorderedMap<uint32_t,size_type,execution_space> global_id_view;
+  typedef Kokkos::View<uint32_t*, execution_space> local_id_view;
+  typedef Kokkos::UnorderedMap<uint32_t, size_type, execution_space>
+      global_id_view;
 
-  //size
+  // size
   std::cout << num_ids << ", ";
 
   double elasped_time = 0;
   Kokkos::Timer timer;
 
   local_id_view local_2_global("local_ids", num_ids);
-  global_id_view global_2_local((3u*num_ids)/2u);
+  global_id_view global_2_local((3u * num_ids) / 2u);
 
-  //create
+  // create
   elasped_time = timer.seconds();
   std::cout << elasped_time << ", ";
   timer.reset();
 
   // generate unique ids
-  {
-    generate_ids<Device> gen(local_2_global);
-  }
+  { generate_ids<Device> gen(local_2_global); }
   Device().fence();
   // generate
   elasped_time = timer.seconds();
   std::cout << elasped_time << ", ";
   timer.reset();
 
-  {
-    fill_map<Device> fill(global_2_local, local_2_global);
-  }
+  { fill_map<Device> fill(global_2_local, local_2_global); }
   Device().fence();
 
   // fill
@@ -208,11 +193,9 @@ void test_global_to_local_ids(unsigned num_ids)
   std::cout << elasped_time << ", ";
   timer.reset();
 
-
   size_t num_errors = 0;
-  for (int i=0; i<100; ++i)
-  {
-    find_test<Device> find(global_2_local, local_2_global,num_errors);
+  for (int i = 0; i < 100; ++i) {
+    find_test<Device> find(global_2_local, local_2_global, num_errors);
   }
   Device().fence();
 
@@ -220,12 +203,9 @@ void test_global_to_local_ids(unsigned num_ids)
   elasped_time = timer.seconds();
   std::cout << elasped_time << std::endl;
 
-  ASSERT_EQ( num_errors, 0u);
+  ASSERT_EQ(num_errors, 0u);
 }
 
+}  // namespace Performance
 
-} // namespace Performance
-
-
-#endif //KOKKOS_TEST_GLOBAL_TO_LOCAL_IDS_HPP
-
+#endif  // KOKKOS_TEST_GLOBAL_TO_LOCAL_IDS_HPP
diff --git a/lib/kokkos/containers/performance_tests/TestHPX.cpp b/lib/kokkos/containers/performance_tests/TestHPX.cpp
index 0f43377cee..48be466bfa 100644
--- a/lib/kokkos/containers/performance_tests/TestHPX.cpp
+++ b/lib/kokkos/containers/performance_tests/TestHPX.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -42,7 +43,7 @@
 */
 
 #include <Kokkos_Macros.hpp>
-#if defined( KOKKOS_ENABLE_HPX )
+#if defined(KOKKOS_ENABLE_HPX)
 
 #include <gtest/gtest.h>
 
@@ -61,70 +62,63 @@
 #include <string>
 #include <fstream>
 
-
 namespace Performance {
 
 class hpx : public ::testing::Test {
-protected:
-  static void SetUpTestCase()
-  {
+ protected:
+  static void SetUpTestCase() {
     std::cout << std::setprecision(5) << std::scientific;
 
     Kokkos::initialize();
-    Kokkos::print_configuration( std::cout );
+    Kokkos::print_configuration(std::cout);
   }
 
-  static void TearDownTestCase()
-  {
-    Kokkos::finalize();
-  }
+  static void TearDownTestCase() { Kokkos::finalize(); }
 };
 
-TEST_F( hpx, dynrankview_perf )
-{
+TEST_F(hpx, dynrankview_perf) {
   std::cout << "HPX" << std::endl;
   std::cout << " DynRankView vs View: Initialization Only " << std::endl;
-  test_dynrankview_op_perf<Kokkos::Experimental::HPX>( 8192 );
+  test_dynrankview_op_perf<Kokkos::Experimental::HPX>(8192);
 }
 
-TEST_F( hpx, global_2_local)
-{
+TEST_F(hpx, global_2_local) {
   std::cout << "HPX" << std::endl;
   std::cout << "size, create, generate, fill, find" << std::endl;
-  for (unsigned i=Performance::begin_id_size; i<=Performance::end_id_size; i *= Performance::id_step)
+  for (unsigned i = Performance::begin_id_size; i <= Performance::end_id_size;
+       i *= Performance::id_step)
     test_global_to_local_ids<Kokkos::Experimental::HPX>(i);
 }
 
-TEST_F( hpx, unordered_map_performance_near)
-{
+TEST_F(hpx, unordered_map_performance_near) {
   unsigned num_hpx = 4;
   std::ostringstream base_file_name;
   base_file_name << "hpx-" << num_hpx << "-near";
-  Perf::run_performance_tests<Kokkos::Experimental::HPX,true>(base_file_name.str());
+  Perf::run_performance_tests<Kokkos::Experimental::HPX, true>(
+      base_file_name.str());
 }
 
-TEST_F( hpx, unordered_map_performance_far)
-{
+TEST_F(hpx, unordered_map_performance_far) {
   unsigned num_hpx = 4;
   std::ostringstream base_file_name;
   base_file_name << "hpx-" << num_hpx << "-far";
-  Perf::run_performance_tests<Kokkos::Experimental::HPX,false>(base_file_name.str());
+  Perf::run_performance_tests<Kokkos::Experimental::HPX, false>(
+      base_file_name.str());
 }
 
-TEST_F( hpx, scatter_view)
-{
+TEST_F(hpx, scatter_view) {
   std::cout << "ScatterView data-duplicated test:\n";
   Perf::test_scatter_view<Kokkos::Experimental::HPX, Kokkos::LayoutRight,
-    Kokkos::Experimental::ScatterDuplicated,
-    Kokkos::Experimental::ScatterNonAtomic>(10, 1000 * 1000);
-//std::cout << "ScatterView atomics test:\n";
-//Perf::test_scatter_view<Kokkos::Experimental::HPX, Kokkos::LayoutRight,
-//  Kokkos::Experimental::ScatterNonDuplicated,
-//  Kokkos::Experimental::ScatterAtomic>(10, 1000 * 1000);
+                          Kokkos::Experimental::ScatterDuplicated,
+                          Kokkos::Experimental::ScatterNonAtomic>(10,
+                                                                  1000 * 1000);
+  // std::cout << "ScatterView atomics test:\n";
+  // Perf::test_scatter_view<Kokkos::Experimental::HPX, Kokkos::LayoutRight,
+  //  Kokkos::Experimental::ScatterNonDuplicated,
+  //  Kokkos::Experimental::ScatterAtomic>(10, 1000 * 1000);
 }
 
-} // namespace test
+}  // namespace Performance
 #else
 void KOKKOS_CONTAINERS_PERFORMANCE_TESTS_TESTHPX_PREVENT_EMPTY_LINK_ERROR() {}
 #endif
-
diff --git a/lib/kokkos/containers/performance_tests/TestMain.cpp b/lib/kokkos/containers/performance_tests/TestMain.cpp
index 217b01a57a..e3c8edb045 100644
--- a/lib/kokkos/containers/performance_tests/TestMain.cpp
+++ b/lib/kokkos/containers/performance_tests/TestMain.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -47,7 +48,6 @@
 #include <Kokkos_Macros.hpp>
 
 int main(int argc, char *argv[]) {
-  ::testing::InitGoogleTest(&argc,argv);
+  ::testing::InitGoogleTest(&argc, argv);
   return RUN_ALL_TESTS();
 }
-
diff --git a/lib/kokkos/containers/performance_tests/TestOpenMP.cpp b/lib/kokkos/containers/performance_tests/TestOpenMP.cpp
index e6218074ea..a9c8639ed4 100644
--- a/lib/kokkos/containers/performance_tests/TestOpenMP.cpp
+++ b/lib/kokkos/containers/performance_tests/TestOpenMP.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -42,7 +43,7 @@
 */
 
 #include <Kokkos_Macros.hpp>
-#if defined( KOKKOS_ENABLE_OPENMP )
+#if defined(KOKKOS_ENABLE_OPENMP)
 
 #include <gtest/gtest.h>
 
@@ -61,82 +62,72 @@
 #include <string>
 #include <fstream>
 
-
 namespace Performance {
 
 class openmp : public ::testing::Test {
-protected:
-  static void SetUpTestCase()
-  {
+ protected:
+  static void SetUpTestCase() {
     std::cout << std::setprecision(5) << std::scientific;
 
     Kokkos::initialize();
-    Kokkos::OpenMP::print_configuration( std::cout );
+    Kokkos::OpenMP::print_configuration(std::cout);
   }
 
-  static void TearDownTestCase()
-  {
-    Kokkos::finalize();
-  }
+  static void TearDownTestCase() { Kokkos::finalize(); }
 };
 
-TEST_F( openmp, dynrankview_perf )
-{
+TEST_F(openmp, dynrankview_perf) {
   std::cout << "OpenMP" << std::endl;
   std::cout << " DynRankView vs View: Initialization Only " << std::endl;
-  test_dynrankview_op_perf<Kokkos::OpenMP>( 8192 );
+  test_dynrankview_op_perf<Kokkos::OpenMP>(8192);
 }
 
-TEST_F( openmp, global_2_local)
-{
+TEST_F(openmp, global_2_local) {
   std::cout << "OpenMP" << std::endl;
   std::cout << "size, create, generate, fill, find" << std::endl;
-  for (unsigned i=Performance::begin_id_size; i<=Performance::end_id_size; i *= Performance::id_step)
+  for (unsigned i = Performance::begin_id_size; i <= Performance::end_id_size;
+       i *= Performance::id_step)
     test_global_to_local_ids<Kokkos::OpenMP>(i);
 }
 
-TEST_F( openmp, unordered_map_performance_near)
-{
+TEST_F(openmp, unordered_map_performance_near) {
   unsigned num_openmp = 4;
   if (Kokkos::hwloc::available()) {
     num_openmp = Kokkos::hwloc::get_available_numa_count() *
-                  Kokkos::hwloc::get_available_cores_per_numa() *
-                  Kokkos::hwloc::get_available_threads_per_core();
-
+                 Kokkos::hwloc::get_available_cores_per_numa() *
+                 Kokkos::hwloc::get_available_threads_per_core();
   }
   std::ostringstream base_file_name;
   base_file_name << "openmp-" << num_openmp << "-near";
-  Perf::run_performance_tests<Kokkos::OpenMP,true>(base_file_name.str());
+  Perf::run_performance_tests<Kokkos::OpenMP, true>(base_file_name.str());
 }
 
-TEST_F( openmp, unordered_map_performance_far)
-{
+TEST_F(openmp, unordered_map_performance_far) {
   unsigned num_openmp = 4;
   if (Kokkos::hwloc::available()) {
     num_openmp = Kokkos::hwloc::get_available_numa_count() *
-                  Kokkos::hwloc::get_available_cores_per_numa() *
-                  Kokkos::hwloc::get_available_threads_per_core();
-
+                 Kokkos::hwloc::get_available_cores_per_numa() *
+                 Kokkos::hwloc::get_available_threads_per_core();
   }
   std::ostringstream base_file_name;
   base_file_name << "openmp-" << num_openmp << "-far";
-  Perf::run_performance_tests<Kokkos::OpenMP,false>(base_file_name.str());
+  Perf::run_performance_tests<Kokkos::OpenMP, false>(base_file_name.str());
 }
 
-TEST_F( openmp, scatter_view)
-{
+TEST_F(openmp, scatter_view) {
   std::cout << "ScatterView data-duplicated test:\n";
   Perf::test_scatter_view<Kokkos::OpenMP, Kokkos::LayoutRight,
-    Kokkos::Experimental::ScatterDuplicated,
-    Kokkos::Experimental::ScatterNonAtomic>(10, 1000 * 1000);
-//std::cout << "ScatterView atomics test:\n";
-//Perf::test_scatter_view<Kokkos::OpenMP, Kokkos::LayoutRight,
-//  Kokkos::Experimental::ScatterNonDuplicated,
-//  Kokkos::Experimental::ScatterAtomic>(10, 1000 * 1000);
+                          Kokkos::Experimental::ScatterDuplicated,
+                          Kokkos::Experimental::ScatterNonAtomic>(10,
+                                                                  1000 * 1000);
+  // std::cout << "ScatterView atomics test:\n";
+  // Perf::test_scatter_view<Kokkos::OpenMP, Kokkos::LayoutRight,
+  //  Kokkos::Experimental::ScatterNonDuplicated,
+  //  Kokkos::Experimental::ScatterAtomic>(10, 1000 * 1000);
 }
 
-} // namespace test
+}  // namespace Performance
 #else
-void KOKKOS_CONTAINERS_PERFORMANCE_TESTS_TESTOPENMP_PREVENT_EMPTY_LINK_ERROR() {}
+void KOKKOS_CONTAINERS_PERFORMANCE_TESTS_TESTOPENMP_PREVENT_EMPTY_LINK_ERROR() {
+}
 #endif
-
diff --git a/lib/kokkos/containers/performance_tests/TestROCm.cpp b/lib/kokkos/containers/performance_tests/TestROCm.cpp
index 3cf9f3bd14..55b770b49c 100644
--- a/lib/kokkos/containers/performance_tests/TestROCm.cpp
+++ b/lib/kokkos/containers/performance_tests/TestROCm.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -42,7 +43,7 @@
 */
 
 #include <Kokkos_Macros.hpp>
-#if defined( KOKKOS_ENABLE_ROCM )
+#if defined(KOKKOS_ENABLE_ROCM)
 
 #include <cstdint>
 #include <string>
@@ -66,15 +67,14 @@
 namespace Performance {
 
 class rocm : public ::testing::Test {
-protected:
-  static void SetUpTestCase()
-  {
+ protected:
+  static void SetUpTestCase() {
     std::cout << std::setprecision(5) << std::scientific;
     Kokkos::HostSpace::execution_space::initialize();
-    Kokkos::Experimental::ROCm::initialize( Kokkos::Experimental::ROCm::SelectDevice(0) );
+    Kokkos::Experimental::ROCm::initialize(
+        Kokkos::Experimental::ROCm::SelectDevice(0));
   }
-  static void TearDownTestCase()
-  {
+  static void TearDownTestCase() {
     Kokkos::Experimental::ROCm::finalize();
     Kokkos::HostSpace::execution_space::finalize();
   }
@@ -97,17 +97,15 @@ TEST_F( rocm, global_2_local)
 }
 
 #endif
-TEST_F( rocm, unordered_map_performance_near)
-{
-  Perf::run_performance_tests<Kokkos::Experimental::ROCm,true>("rocm-near");
+TEST_F(rocm, unordered_map_performance_near) {
+  Perf::run_performance_tests<Kokkos::Experimental::ROCm, true>("rocm-near");
 }
 
-TEST_F( rocm, unordered_map_performance_far)
-{
-  Perf::run_performance_tests<Kokkos::Experimental::ROCm,false>("rocm-far");
+TEST_F(rocm, unordered_map_performance_far) {
+  Perf::run_performance_tests<Kokkos::Experimental::ROCm, false>("rocm-far");
 }
 
-}
+}  // namespace Performance
 #else
 void KOKKOS_CONTAINERS_PERFORMANCE_TESTS_TESTROCM_PREVENT_EMPTY_LINK_ERROR() {}
-#endif  /* #if defined( KOKKOS_ENABLE_ROCM ) */
+#endif /* #if defined( KOKKOS_ENABLE_ROCM ) */
diff --git a/lib/kokkos/containers/performance_tests/TestScatterView.hpp b/lib/kokkos/containers/performance_tests/TestScatterView.hpp
index bd9121bb82..3d4c57f3e2 100644
--- a/lib/kokkos/containers/performance_tests/TestScatterView.hpp
+++ b/lib/kokkos/containers/performance_tests/TestScatterView.hpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -49,67 +50,68 @@
 
 namespace Perf {
 
-template <typename ExecSpace, typename Layout, int duplication, int contribution>
-void test_scatter_view(int m, int n)
-{
-  Kokkos::View<double *[3], Layout, ExecSpace> original_view("original_view", n);
+template <typename ExecSpace, typename Layout, int duplication,
+          int contribution>
+void test_scatter_view(int m, int n) {
+  Kokkos::View<double * [3], Layout, ExecSpace> original_view("original_view",
+                                                              n);
   {
-    auto scatter_view = Kokkos::Experimental::create_scatter_view
-      < Kokkos::Experimental::ScatterSum
-      , duplication
-      , contribution
-      > (original_view);
+    auto scatter_view = Kokkos::Experimental::create_scatter_view<
+        Kokkos::Experimental::ScatterSum, duplication, contribution>(
+        original_view);
     Kokkos::Experimental::UniqueToken<
-      ExecSpace, Kokkos::Experimental::UniqueTokenScope::Global>
-      unique_token{ExecSpace()};
-  //auto internal_view = scatter_view.internal_view;
+        ExecSpace, Kokkos::Experimental::UniqueTokenScope::Global>
+        unique_token{ExecSpace()};
+    // auto internal_view = scatter_view.internal_view;
     auto policy = Kokkos::RangePolicy<ExecSpace, int>(0, n);
     for (int foo = 0; foo < 5; ++foo) {
-    {
-      auto num_threads = unique_token.size();
-      std::cout << "num_threads " << num_threads << '\n';
-      Kokkos::View<double **[3], Layout, ExecSpace> hand_coded_duplicate_view("hand_coded_duplicate", num_threads, n);
-      auto f2 = KOKKOS_LAMBDA(int i) {
-        auto thread_id = unique_token.acquire();
-        for (int j = 0; j < 10; ++j) {
-          auto k = (i + j) % n;
-          hand_coded_duplicate_view(thread_id, k, 0) += 4.2;
-          hand_coded_duplicate_view(thread_id, k, 1) += 2.0;
-          hand_coded_duplicate_view(thread_id, k, 2) += 1.0;
+      {
+        auto num_threads = unique_token.size();
+        std::cout << "num_threads " << num_threads << '\n';
+        Kokkos::View<double* * [3], Layout, ExecSpace>
+            hand_coded_duplicate_view("hand_coded_duplicate", num_threads, n);
+        auto f2 = KOKKOS_LAMBDA(int i) {
+          auto thread_id = unique_token.acquire();
+          for (int j = 0; j < 10; ++j) {
+            auto k = (i + j) % n;
+            hand_coded_duplicate_view(thread_id, k, 0) += 4.2;
+            hand_coded_duplicate_view(thread_id, k, 1) += 2.0;
+            hand_coded_duplicate_view(thread_id, k, 2) += 1.0;
+          }
+        };
+        Kokkos::Timer timer;
+        timer.reset();
+        for (int k = 0; k < m; ++k) {
+          Kokkos::parallel_for(policy, f2,
+                               "hand_coded_duplicate_scatter_view_test");
         }
-      };
-      Kokkos::Timer timer;
-      timer.reset();
-      for (int k = 0; k < m; ++k) {
-        Kokkos::parallel_for(policy, f2, "hand_coded_duplicate_scatter_view_test");
+        Kokkos::fence();
+        auto t = timer.seconds();
+        std::cout << "hand-coded test took " << t << " seconds\n";
       }
-      Kokkos::fence();
-      auto t = timer.seconds();
-      std::cout << "hand-coded test took " << t << " seconds\n";
-    }
-    {
-      auto f = KOKKOS_LAMBDA(int i) {
-        auto scatter_access = scatter_view.access();
-        for (int j = 0; j < 10; ++j) {
-          auto k = (i + j) % n;
-          scatter_access(k, 0) += 4.2;
-          scatter_access(k, 1) += 2.0;
-          scatter_access(k, 2) += 1.0;
+      {
+        auto f = KOKKOS_LAMBDA(int i) {
+          auto scatter_access = scatter_view.access();
+          for (int j = 0; j < 10; ++j) {
+            auto k = (i + j) % n;
+            scatter_access(k, 0) += 4.2;
+            scatter_access(k, 1) += 2.0;
+            scatter_access(k, 2) += 1.0;
+          }
+        };
+        Kokkos::Timer timer;
+        timer.reset();
+        for (int k = 0; k < m; ++k) {
+          Kokkos::parallel_for(policy, f, "scatter_view_test");
         }
-      };
-      Kokkos::Timer timer;
-      timer.reset();
-      for (int k = 0; k < m; ++k) {
-        Kokkos::parallel_for(policy, f, "scatter_view_test");
+        Kokkos::fence();
+        auto t = timer.seconds();
+        std::cout << "test took " << t << " seconds\n";
       }
-      Kokkos::fence();
-      auto t = timer.seconds();
-      std::cout << "test took " << t << " seconds\n";
     }
   }
-  }
 }
 
-}
+}  // namespace Perf
 
 #endif
diff --git a/lib/kokkos/containers/performance_tests/TestThreads.cpp b/lib/kokkos/containers/performance_tests/TestThreads.cpp
index 6a02e67b25..2f37404539 100644
--- a/lib/kokkos/containers/performance_tests/TestThreads.cpp
+++ b/lib/kokkos/containers/performance_tests/TestThreads.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -42,7 +43,7 @@
 */
 
 #include <Kokkos_Macros.hpp>
-#if defined( KOKKOS_ENABLE_THREADS )
+#if defined(KOKKOS_ENABLE_THREADS)
 
 #include <gtest/gtest.h>
 
@@ -65,9 +66,8 @@
 namespace Performance {
 
 class threads : public ::testing::Test {
-protected:
-  static void SetUpTestCase()
-  {
+ protected:
+  static void SetUpTestCase() {
     std::cout << std::setprecision(5) << std::scientific;
 
     unsigned num_threads = 4;
@@ -76,66 +76,57 @@ protected:
       num_threads = Kokkos::hwloc::get_available_numa_count() *
                     Kokkos::hwloc::get_available_cores_per_numa() *
                     Kokkos::hwloc::get_available_threads_per_core();
-
     }
 
     std::cout << "Threads: " << num_threads << std::endl;
 
-    Kokkos::initialize( Kokkos::InitArguments(num_threads) );
+    Kokkos::initialize(Kokkos::InitArguments(num_threads));
   }
 
-  static void TearDownTestCase()
-  {
-    Kokkos::finalize();
-  }
+  static void TearDownTestCase() { Kokkos::finalize(); }
 };
 
-TEST_F( threads, dynrankview_perf )
-{
+TEST_F(threads, dynrankview_perf) {
   std::cout << "Threads" << std::endl;
   std::cout << " DynRankView vs View: Initialization Only " << std::endl;
-  test_dynrankview_op_perf<Kokkos::Threads>( 8192 );
+  test_dynrankview_op_perf<Kokkos::Threads>(8192);
 }
 
-TEST_F( threads, global_2_local)
-{
+TEST_F(threads, global_2_local) {
   std::cout << "Threads" << std::endl;
   std::cout << "size, create, generate, fill, find" << std::endl;
-  for (unsigned i=Performance::begin_id_size; i<=Performance::end_id_size; i *= Performance::id_step)
+  for (unsigned i = Performance::begin_id_size; i <= Performance::end_id_size;
+       i *= Performance::id_step)
     test_global_to_local_ids<Kokkos::Threads>(i);
 }
 
-TEST_F( threads, unordered_map_performance_near)
-{
+TEST_F(threads, unordered_map_performance_near) {
   unsigned num_threads = 4;
   if (Kokkos::hwloc::available()) {
     num_threads = Kokkos::hwloc::get_available_numa_count() *
                   Kokkos::hwloc::get_available_cores_per_numa() *
                   Kokkos::hwloc::get_available_threads_per_core();
-
   }
   std::ostringstream base_file_name;
   base_file_name << "threads-" << num_threads << "-near";
-  Perf::run_performance_tests<Kokkos::Threads,true>(base_file_name.str());
+  Perf::run_performance_tests<Kokkos::Threads, true>(base_file_name.str());
 }
 
-TEST_F( threads, unordered_map_performance_far)
-{
+TEST_F(threads, unordered_map_performance_far) {
   unsigned num_threads = 4;
   if (Kokkos::hwloc::available()) {
     num_threads = Kokkos::hwloc::get_available_numa_count() *
                   Kokkos::hwloc::get_available_cores_per_numa() *
                   Kokkos::hwloc::get_available_threads_per_core();
-
   }
   std::ostringstream base_file_name;
   base_file_name << "threads-" << num_threads << "-far";
-  Perf::run_performance_tests<Kokkos::Threads,false>(base_file_name.str());
+  Perf::run_performance_tests<Kokkos::Threads, false>(base_file_name.str());
 }
 
-} // namespace Performance
+}  // namespace Performance
 
 #else
-void KOKKOS_CONTAINERS_PERFORMANCE_TESTS_TESTTHREADS_PREVENT_EMPTY_LINK_ERROR() {}
+void KOKKOS_CONTAINERS_PERFORMANCE_TESTS_TESTTHREADS_PREVENT_EMPTY_LINK_ERROR() {
+}
 #endif
-
diff --git a/lib/kokkos/containers/performance_tests/TestUnorderedMapPerformance.hpp b/lib/kokkos/containers/performance_tests/TestUnorderedMapPerformance.hpp
index 8d09281ed3..9057842340 100644
--- a/lib/kokkos/containers/performance_tests/TestUnorderedMapPerformance.hpp
+++ b/lib/kokkos/containers/performance_tests/TestUnorderedMapPerformance.hpp
@@ -1,10 +1,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -22,10 +23,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -50,12 +51,10 @@
 #include <string>
 #include <sstream>
 
-
 namespace Perf {
 
 template <typename Device, bool Near>
-struct UnorderedMapTest
-{
+struct UnorderedMapTest {
   typedef Device execution_space;
   typedef Kokkos::UnorderedMap<uint32_t, uint32_t, execution_space> map_type;
   typedef typename map_type::histogram_type histogram_type;
@@ -68,22 +67,22 @@ struct UnorderedMapTest
   uint32_t capacity;
   uint32_t inserts;
   uint32_t collisions;
-  double   seconds;
+  double seconds;
   map_type map;
   histogram_type histogram;
 
-  UnorderedMapTest( uint32_t arg_capacity, uint32_t arg_inserts, uint32_t arg_collisions)
-    : capacity(arg_capacity)
-    , inserts(arg_inserts)
-    , collisions(arg_collisions)
-    , seconds(0)
-    , map(capacity)
-    , histogram(map.get_histogram())
-  {
-    Kokkos::Timer wall_clock ;
+  UnorderedMapTest(uint32_t arg_capacity, uint32_t arg_inserts,
+                   uint32_t arg_collisions)
+      : capacity(arg_capacity),
+        inserts(arg_inserts),
+        collisions(arg_collisions),
+        seconds(0),
+        map(capacity),
+        histogram(map.get_histogram()) {
+    Kokkos::Timer wall_clock;
     wall_clock.reset();
 
-    value_type v = {};
+    value_type v   = {};
     int loop_count = 0;
     do {
       ++loop_count;
@@ -92,81 +91,79 @@ struct UnorderedMapTest
       Kokkos::parallel_reduce(inserts, *this, v);
 
       if (v.failed_count > 0u) {
-        const uint32_t new_capacity = map.capacity() + ((map.capacity()*3ull)/20u) + v.failed_count/collisions ;
-        map.rehash( new_capacity );
+        const uint32_t new_capacity = map.capacity() +
+                                      ((map.capacity() * 3ull) / 20u) +
+                                      v.failed_count / collisions;
+        map.rehash(new_capacity);
       }
     } while (v.failed_count > 0u);
 
     seconds = wall_clock.seconds();
 
-    switch (loop_count)
-    {
-    case 1u: std::cout << " \033[0;32m" << loop_count << "\033[0m "; break;
-    case 2u: std::cout << " \033[1;31m" << loop_count << "\033[0m "; break;
-    default: std::cout << " \033[0;31m" << loop_count << "\033[0m "; break;
+    switch (loop_count) {
+      case 1u: std::cout << " \033[0;32m" << loop_count << "\033[0m "; break;
+      case 2u: std::cout << " \033[1;31m" << loop_count << "\033[0m "; break;
+      default: std::cout << " \033[0;31m" << loop_count << "\033[0m "; break;
     }
-    std::cout << std::setprecision(2) << std::fixed << std::setw(5) << (1e9*(seconds/(inserts))) << "; " << std::flush;
+    std::cout << std::setprecision(2) << std::fixed << std::setw(5)
+              << (1e9 * (seconds / (inserts))) << "; " << std::flush;
 
     histogram.calculate();
     Device().fence();
   }
 
-  void print(std::ostream & metrics_out, std::ostream & length_out, std::ostream & distance_out, std::ostream & block_distance_out)
-  {
+  void print(std::ostream& metrics_out, std::ostream& length_out,
+             std::ostream& distance_out, std::ostream& block_distance_out) {
     metrics_out << map.capacity() << " , ";
-    metrics_out << inserts/collisions << " , ";
-    metrics_out << (100.0 * inserts/collisions) / map.capacity() << " , ";
+    metrics_out << inserts / collisions << " , ";
+    metrics_out << (100.0 * inserts / collisions) / map.capacity() << " , ";
     metrics_out << inserts << " , ";
     metrics_out << (map.failed_insert() ? "true" : "false") << " , ";
     metrics_out << collisions << " , ";
-    metrics_out << 1e9*(seconds/inserts) << " , ";
+    metrics_out << 1e9 * (seconds / inserts) << " , ";
     metrics_out << seconds << std::endl;
 
     length_out << map.capacity() << " , ";
-    length_out << ((100.0 *inserts/collisions) / map.capacity()) << " , ";
+    length_out << ((100.0 * inserts / collisions) / map.capacity()) << " , ";
     length_out << collisions << " , ";
     histogram.print_length(length_out);
 
     distance_out << map.capacity() << " , ";
-    distance_out << ((100.0 *inserts/collisions) / map.capacity()) << " , ";
+    distance_out << ((100.0 * inserts / collisions) / map.capacity()) << " , ";
     distance_out << collisions << " , ";
     histogram.print_distance(distance_out);
 
     block_distance_out << map.capacity() << " , ";
-    block_distance_out << ((100.0 *inserts/collisions) / map.capacity()) << " , ";
+    block_distance_out << ((100.0 * inserts / collisions) / map.capacity())
+                       << " , ";
     block_distance_out << collisions << " , ";
     histogram.print_block_distance(block_distance_out);
   }
 
-
   KOKKOS_INLINE_FUNCTION
-  void init( value_type & v ) const
-  {
+  void init(value_type& v) const {
     v.failed_count = 0;
-    v.max_list = 0;
+    v.max_list     = 0;
   }
 
   KOKKOS_INLINE_FUNCTION
-  void join( volatile value_type & dst, const volatile value_type & src ) const
-  {
+  void join(volatile value_type& dst, const volatile value_type& src) const {
     dst.failed_count += src.failed_count;
     dst.max_list = src.max_list < dst.max_list ? dst.max_list : src.max_list;
   }
 
   KOKKOS_INLINE_FUNCTION
-  void operator()(uint32_t i, value_type & v) const
-  {
-    const uint32_t key = Near ? i/collisions : i%(inserts/collisions);
-    typename map_type::insert_result result = map.insert(key,i);
+  void operator()(uint32_t i, value_type& v) const {
+    const uint32_t key = Near ? i / collisions : i % (inserts / collisions);
+    typename map_type::insert_result result = map.insert(key, i);
     v.failed_count += !result.failed() ? 0 : 1;
-    v.max_list = result.list_position() < v.max_list ? v.max_list : result.list_position();
+    v.max_list = result.list_position() < v.max_list ? v.max_list
+                                                     : result.list_position();
   }
-
 };
 
 template <typename Device, bool Near>
-void run_performance_tests(std::string const & base_file_name)
-{
+void run_performance_tests(std::string const& base_file_name) {
 #if 0
   std::string metrics_file_name = base_file_name + std::string("-metrics.csv");
   std::string length_file_name = base_file_name  + std::string("-length.csv");
@@ -254,7 +251,6 @@ void run_performance_tests(std::string const & base_file_name)
 #endif
 }
 
+}  // namespace Perf
 
-} // namespace Perf
-
-#endif //KOKKOS_TEST_UNORDERED_MAP_PERFORMANCE_HPP
+#endif  // KOKKOS_TEST_UNORDERED_MAP_PERFORMANCE_HPP
diff --git a/lib/kokkos/containers/src/CMakeLists.txt b/lib/kokkos/containers/src/CMakeLists.txt
index e68fcad5e9..0c9d24d641 100644
--- a/lib/kokkos/containers/src/CMakeLists.txt
+++ b/lib/kokkos/containers/src/CMakeLists.txt
@@ -1,47 +1,34 @@
-
-TRIBITS_CONFIGURE_FILE(${PACKAGE_NAME}_config.h)
-
-INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR})
-INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR})
-
-#-----------------------------------------------------------------------------
-
-SET(TRILINOS_INCDIR ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR})
-
-if(KOKKOS_LEGACY_TRIBITS)
-
-  SET(HEADERS "")
-  SET(SOURCES "")
-
-  SET(HEADERS_IMPL "")
-
-  FILE(GLOB HEADERS *.hpp)
-  FILE(GLOB HEADERS_IMPL impl/*.hpp)
-  FILE(GLOB SOURCES impl/*.cpp)
-
-  INSTALL(FILES ${HEADERS_IMPL} DESTINATION ${TRILINOS_INCDIR}/impl/)
-
-  TRIBITS_ADD_LIBRARY(
-      kokkoscontainers
-      HEADERS ${HEADERS}
-      NOINSTALLHEADERS ${HEADERS_IMPL}
-      SOURCES ${SOURCES}
-      DEPLIBS
-      )
-
-else()
-
-  INSTALL (
-      DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/"
-      DESTINATION ${TRILINOS_INCDIR}
-      FILES_MATCHING PATTERN "*.hpp"
-      )
-
-  TRIBITS_ADD_LIBRARY(
-      kokkoscontainers
-      SOURCES ${KOKKOS_CONTAINERS_SRCS}
-      DEPLIBS
-      )
-
-endif()
-#-----------------------------------------------------------------------------
+
+KOKKOS_CONFIGURE_FILE(${PACKAGE_NAME}_config.h)
+
+#need these here for now
+KOKKOS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR})
+KOKKOS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR})
+
+#-----------------------------------------------------------------------------
+
+SET(KOKKOS_CONTAINERS_SRCS)
+APPEND_GLOB(KOKKOS_CONTAINERS_SRCS ${CMAKE_CURRENT_SOURCE_DIR}/impl/*.cpp)
+
+INSTALL (
+  DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/"
+  DESTINATION ${KOKKOS_HEADER_DIR}
+  FILES_MATCHING PATTERN "*.hpp"
+)
+
+KOKKOS_ADD_LIBRARY(
+  kokkoscontainers
+  SOURCES ${KOKKOS_CONTAINERS_SRCS}
+)
+
+SET_TARGET_PROPERTIES(kokkoscontainers PROPERTIES VERSION ${Kokkos_VERSION})
+
+KOKKOS_LIB_INCLUDE_DIRECTORIES(kokkoscontainers
+  ${KOKKOS_TOP_BUILD_DIR}
+  ${CMAKE_CURRENT_BINARY_DIR}
+  ${CMAKE_CURRENT_SOURCE_DIR}
+)
+KOKKOS_LINK_INTERNAL_LIBRARY(kokkoscontainers kokkoscore)
+
+#-----------------------------------------------------------------------------
+
diff --git a/lib/kokkos/containers/src/Kokkos_Bitset.hpp b/lib/kokkos/containers/src/Kokkos_Bitset.hpp
index 4d78430fc6..3596c7653a 100644
--- a/lib/kokkos/containers/src/Kokkos_Bitset.hpp
+++ b/lib/kokkos/containers/src/Kokkos_Bitset.hpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -53,27 +54,25 @@
 
 namespace Kokkos {
 
-template <typename Device = Kokkos::DefaultExecutionSpace >
+template <typename Device = Kokkos::DefaultExecutionSpace>
 class Bitset;
 
-template <typename Device = Kokkos::DefaultExecutionSpace >
+template <typename Device = Kokkos::DefaultExecutionSpace>
 class ConstBitset;
 
 template <typename DstDevice, typename SrcDevice>
-void deep_copy( Bitset<DstDevice> & dst, Bitset<SrcDevice> const& src);
+void deep_copy(Bitset<DstDevice>& dst, Bitset<SrcDevice> const& src);
 
 template <typename DstDevice, typename SrcDevice>
-void deep_copy( Bitset<DstDevice> & dst, ConstBitset<SrcDevice> const& src);
+void deep_copy(Bitset<DstDevice>& dst, ConstBitset<SrcDevice> const& src);
 
 template <typename DstDevice, typename SrcDevice>
-void deep_copy( ConstBitset<DstDevice> & dst, ConstBitset<SrcDevice> const& src);
-
+void deep_copy(ConstBitset<DstDevice>& dst, ConstBitset<SrcDevice> const& src);
 
 /// A thread safe view to a bitset
 template <typename Device>
-class Bitset
-{
-public:
+class Bitset {
+ public:
   typedef Device execution_space;
   typedef unsigned size_type;
 
@@ -81,98 +80,88 @@ public:
   enum { MOVE_HINT_BACKWARD = 2u };
 
   enum {
-      BIT_SCAN_FORWARD_MOVE_HINT_FORWARD = 0u
-    , BIT_SCAN_REVERSE_MOVE_HINT_FORWARD = BIT_SCAN_REVERSE
-    , BIT_SCAN_FORWARD_MOVE_HINT_BACKWARD = MOVE_HINT_BACKWARD
-    , BIT_SCAN_REVERSE_MOVE_HINT_BACKWARD = BIT_SCAN_REVERSE | MOVE_HINT_BACKWARD
+    BIT_SCAN_FORWARD_MOVE_HINT_FORWARD  = 0u,
+    BIT_SCAN_REVERSE_MOVE_HINT_FORWARD  = BIT_SCAN_REVERSE,
+    BIT_SCAN_FORWARD_MOVE_HINT_BACKWARD = MOVE_HINT_BACKWARD,
+    BIT_SCAN_REVERSE_MOVE_HINT_BACKWARD = BIT_SCAN_REVERSE | MOVE_HINT_BACKWARD
   };
 
-private:
-  enum { block_size = static_cast<unsigned>(sizeof(unsigned)*CHAR_BIT) };
-  enum { block_mask = block_size-1u };
+ private:
+  enum { block_size = static_cast<unsigned>(sizeof(unsigned) * CHAR_BIT) };
+  enum { block_mask = block_size - 1u };
   enum { block_shift = Kokkos::Impl::integral_power_of_two(block_size) };
 
-public:
-
-
+ public:
   /// constructor
   /// arg_size := number of bit in set
   Bitset(unsigned arg_size = 0u)
-    : m_size(arg_size)
-    , m_last_block_mask(0u)
-    , m_blocks("Bitset", ((m_size + block_mask) >> block_shift) )
-  {
-    for (int i=0, end = static_cast<int>(m_size & block_mask); i < end; ++i) {
+      : m_size(arg_size),
+        m_last_block_mask(0u),
+        m_blocks("Bitset", ((m_size + block_mask) >> block_shift)) {
+    for (int i = 0, end = static_cast<int>(m_size & block_mask); i < end; ++i) {
       m_last_block_mask |= 1u << i;
     }
   }
 
   KOKKOS_INLINE_FUNCTION
-  Bitset (const Bitset<Device>&) = default;
+  Bitset(const Bitset<Device>&) = default;
 
   KOKKOS_INLINE_FUNCTION
-  Bitset& operator= (const Bitset<Device>&) = default;
+  Bitset& operator=(const Bitset<Device>&) = default;
 
   KOKKOS_INLINE_FUNCTION
-  Bitset (Bitset<Device>&&) = default;
+  Bitset(Bitset<Device>&&) = default;
 
   KOKKOS_INLINE_FUNCTION
-  Bitset& operator= (Bitset<Device>&&) = default;
-  
+  Bitset& operator=(Bitset<Device>&&) = default;
+
   KOKKOS_INLINE_FUNCTION
-  ~Bitset () = default;
+  ~Bitset() = default;
 
   /// number of bits in the set
   /// can be call from the host or the device
   KOKKOS_FORCEINLINE_FUNCTION
-  unsigned size() const
-  { return m_size; }
+  unsigned size() const { return m_size; }
 
   /// number of bits which are set to 1
   /// can only be called from the host
-  unsigned count() const
-  {
-    Impl::BitsetCount< Bitset<Device> > f(*this);
+  unsigned count() const {
+    Impl::BitsetCount<Bitset<Device> > f(*this);
     return f.apply();
   }
 
   /// set all bits to 1
   /// can only be called from the host
-  void set()
-  {
-    Kokkos::deep_copy(m_blocks, ~0u );
+  void set() {
+    Kokkos::deep_copy(m_blocks, ~0u);
 
     if (m_last_block_mask) {
-      //clear the unused bits in the last block
-      typedef Kokkos::Impl::DeepCopy< typename execution_space::memory_space, Kokkos::HostSpace > raw_deep_copy;
-      raw_deep_copy( m_blocks.data() + (m_blocks.extent(0) -1u), &m_last_block_mask, sizeof(unsigned));
+      // clear the unused bits in the last block
+      typedef Kokkos::Impl::DeepCopy<typename execution_space::memory_space,
+                                     Kokkos::HostSpace>
+          raw_deep_copy;
+      raw_deep_copy(m_blocks.data() + (m_blocks.extent(0) - 1u),
+                    &m_last_block_mask, sizeof(unsigned));
     }
   }
 
   /// set all bits to 0
   /// can only be called from the host
-  void reset()
-  {
-    Kokkos::deep_copy(m_blocks, 0u );
-  }
+  void reset() { Kokkos::deep_copy(m_blocks, 0u); }
 
   /// set all bits to 0
   /// can only be called from the host
-  void clear()
-  {
-    Kokkos::deep_copy(m_blocks, 0u );
-  }
+  void clear() { Kokkos::deep_copy(m_blocks, 0u); }
 
   /// set i'th bit to 1
   /// can only be called from the device
   KOKKOS_FORCEINLINE_FUNCTION
-  bool set( unsigned i ) const
-  {
-    if ( i < m_size ) {
-      unsigned * block_ptr = &m_blocks[ i >> block_shift ];
-      const unsigned mask = 1u << static_cast<int>( i & block_mask );
+  bool set(unsigned i) const {
+    if (i < m_size) {
+      unsigned* block_ptr = &m_blocks[i >> block_shift];
+      const unsigned mask = 1u << static_cast<int>(i & block_mask);
 
-      return !( atomic_fetch_or( block_ptr, mask ) & mask );
+      return !(atomic_fetch_or(block_ptr, mask) & mask);
     }
     return false;
   }
@@ -180,13 +169,12 @@ public:
   /// set i'th bit to 0
   /// can only be called from the device
   KOKKOS_FORCEINLINE_FUNCTION
-  bool reset( unsigned i ) const
-  {
-    if ( i < m_size ) {
-      unsigned * block_ptr = &m_blocks[ i >> block_shift ];
-      const unsigned mask = 1u << static_cast<int>( i & block_mask );
+  bool reset(unsigned i) const {
+    if (i < m_size) {
+      unsigned* block_ptr = &m_blocks[i >> block_shift];
+      const unsigned mask = 1u << static_cast<int>(i & block_mask);
 
-      return atomic_fetch_and( block_ptr, ~mask ) & mask;
+      return atomic_fetch_and(block_ptr, ~mask) & mask;
     }
     return false;
   }
@@ -194,11 +182,10 @@ public:
   /// return true if the i'th bit set to 1
   /// can only be called from the device
   KOKKOS_FORCEINLINE_FUNCTION
-  bool test( unsigned i ) const
-  {
-    if ( i < m_size ) {
-      const unsigned block = volatile_load(&m_blocks[ i >> block_shift ]);
-      const unsigned mask = 1u << static_cast<int>( i & block_mask );
+  bool test(unsigned i) const {
+    if (i < m_size) {
+      const unsigned block = volatile_load(&m_blocks[i >> block_shift]);
+      const unsigned mask  = 1u << static_cast<int>(i & block_mask);
       return block & mask;
     }
     return false;
@@ -208,90 +195,93 @@ public:
   /// returns the max number of times those functions should be call
   /// when searching for an available bit
   KOKKOS_FORCEINLINE_FUNCTION
-  unsigned max_hint() const
-  {
-    return m_blocks.extent(0);
-  }
+  unsigned max_hint() const { return m_blocks.extent(0); }
 
   /// find a bit set to 1 near the hint
-  /// returns a pair< bool, unsigned> where if result.first is true then result.second is the bit found
-  /// and if result.first is false the result.second is a new hint
+  /// returns a pair< bool, unsigned> where if result.first is true then
+  /// result.second is the bit found and if result.first is false the
+  /// result.second is a new hint
   KOKKOS_INLINE_FUNCTION
-  Kokkos::pair<bool, unsigned> find_any_set_near( unsigned hint , unsigned scan_direction = BIT_SCAN_FORWARD_MOVE_HINT_FORWARD ) const
-  {
-    const unsigned block_idx = (hint >> block_shift) < m_blocks.extent(0) ? (hint >> block_shift) : 0;
+  Kokkos::pair<bool, unsigned> find_any_set_near(
+      unsigned hint,
+      unsigned scan_direction = BIT_SCAN_FORWARD_MOVE_HINT_FORWARD) const {
+    const unsigned block_idx =
+        (hint >> block_shift) < m_blocks.extent(0) ? (hint >> block_shift) : 0;
     const unsigned offset = hint & block_mask;
-    unsigned block = volatile_load(&m_blocks[ block_idx ]);
-    block = !m_last_block_mask || (block_idx < (m_blocks.extent(0)-1)) ? block : block & m_last_block_mask ;
+    unsigned block        = volatile_load(&m_blocks[block_idx]);
+    block = !m_last_block_mask || (block_idx < (m_blocks.extent(0) - 1))
+                ? block
+                : block & m_last_block_mask;
 
     return find_any_helper(block_idx, offset, block, scan_direction);
   }
 
   /// find a bit set to 0 near the hint
-  /// returns a pair< bool, unsigned> where if result.first is true then result.second is the bit found
-  /// and if result.first is false the result.second is a new hint
+  /// returns a pair< bool, unsigned> where if result.first is true then
+  /// result.second is the bit found and if result.first is false the
+  /// result.second is a new hint
   KOKKOS_INLINE_FUNCTION
-  Kokkos::pair<bool, unsigned> find_any_unset_near( unsigned hint , unsigned scan_direction = BIT_SCAN_FORWARD_MOVE_HINT_FORWARD ) const
-  {
+  Kokkos::pair<bool, unsigned> find_any_unset_near(
+      unsigned hint,
+      unsigned scan_direction = BIT_SCAN_FORWARD_MOVE_HINT_FORWARD) const {
     const unsigned block_idx = hint >> block_shift;
-    const unsigned offset = hint & block_mask;
-    unsigned block = volatile_load(&m_blocks[ block_idx ]);
-    block = !m_last_block_mask || (block_idx < (m_blocks.extent(0)-1) ) ? ~block : ~block & m_last_block_mask ;
+    const unsigned offset    = hint & block_mask;
+    unsigned block           = volatile_load(&m_blocks[block_idx]);
+    block = !m_last_block_mask || (block_idx < (m_blocks.extent(0) - 1))
+                ? ~block
+                : ~block & m_last_block_mask;
 
     return find_any_helper(block_idx, offset, block, scan_direction);
   }
 
-private:
-
+ private:
   KOKKOS_FORCEINLINE_FUNCTION
-  Kokkos::pair<bool, unsigned> find_any_helper(unsigned block_idx, unsigned offset, unsigned block, unsigned scan_direction) const
-  {
-    Kokkos::pair<bool, unsigned> result( block > 0u, 0);
+  Kokkos::pair<bool, unsigned> find_any_helper(unsigned block_idx,
+                                               unsigned offset, unsigned block,
+                                               unsigned scan_direction) const {
+    Kokkos::pair<bool, unsigned> result(block > 0u, 0);
 
     if (!result.first) {
-      result.second = update_hint( block_idx, offset, scan_direction );
-    }
-    else {
-      result.second = scan_block(  (block_idx << block_shift)
-                                 , offset
-                                 , block
-                                 , scan_direction
-                                );
+      result.second = update_hint(block_idx, offset, scan_direction);
+    } else {
+      result.second =
+          scan_block((block_idx << block_shift), offset, block, scan_direction);
     }
     return result;
   }
 
-
   KOKKOS_FORCEINLINE_FUNCTION
-  unsigned scan_block(unsigned block_start, int offset, unsigned block, unsigned scan_direction ) const
-  {
-    offset = !(scan_direction & BIT_SCAN_REVERSE) ? offset : (offset + block_mask) & block_mask;
+  unsigned scan_block(unsigned block_start, int offset, unsigned block,
+                      unsigned scan_direction) const {
+    offset = !(scan_direction & BIT_SCAN_REVERSE)
+                 ? offset
+                 : (offset + block_mask) & block_mask;
     block = Impl::rotate_right(block, offset);
-    return ((( !(scan_direction & BIT_SCAN_REVERSE) ?
-               Impl::bit_scan_forward(block) :
-               ::Kokkos::log2(block)
-             ) + offset
-            ) & block_mask
-           ) + block_start;
+    return (((!(scan_direction & BIT_SCAN_REVERSE)
+                  ? Impl::bit_scan_forward(block)
+                  : ::Kokkos::log2(block)) +
+             offset) &
+            block_mask) +
+           block_start;
   }
 
   KOKKOS_FORCEINLINE_FUNCTION
-  unsigned update_hint( long long block_idx, unsigned offset, unsigned scan_direction ) const
-  {
+  unsigned update_hint(long long block_idx, unsigned offset,
+                       unsigned scan_direction) const {
     block_idx += scan_direction & MOVE_HINT_BACKWARD ? -1 : 1;
     block_idx = block_idx >= 0 ? block_idx : m_blocks.extent(0) - 1;
-    block_idx = block_idx < static_cast<long long>(m_blocks.extent(0)) ? block_idx : 0;
+    block_idx =
+        block_idx < static_cast<long long>(m_blocks.extent(0)) ? block_idx : 0;
 
-    return static_cast<unsigned>(block_idx)*block_size + offset;
+    return static_cast<unsigned>(block_idx) * block_size + offset;
   }
 
-private:
-
+ private:
   unsigned m_size;
   unsigned m_last_block_mask;
-  View< unsigned *, execution_space, MemoryTraits<RandomAccess> > m_blocks;
+  View<unsigned*, execution_space, MemoryTraits<RandomAccess> > m_blocks;
 
-private:
+ private:
   template <typename DDevice>
   friend class Bitset;
 
@@ -302,87 +292,72 @@ private:
   friend struct Impl::BitsetCount;
 
   template <typename DstDevice, typename SrcDevice>
-  friend void deep_copy( Bitset<DstDevice> & dst, Bitset<SrcDevice> const& src);
+  friend void deep_copy(Bitset<DstDevice>& dst, Bitset<SrcDevice> const& src);
 
   template <typename DstDevice, typename SrcDevice>
-  friend void deep_copy( Bitset<DstDevice> & dst, ConstBitset<SrcDevice> const& src);
+  friend void deep_copy(Bitset<DstDevice>& dst,
+                        ConstBitset<SrcDevice> const& src);
 };
 
 /// a thread-safe view to a const bitset
 /// i.e. can only test bits
 template <typename Device>
-class ConstBitset
-{
-public:
+class ConstBitset {
+ public:
   typedef Device execution_space;
   typedef unsigned size_type;
 
-private:
-  enum { block_size = static_cast<unsigned>(sizeof(unsigned)*CHAR_BIT) };
-  enum { block_mask = block_size -1u };
+ private:
+  enum { block_size = static_cast<unsigned>(sizeof(unsigned) * CHAR_BIT) };
+  enum { block_mask = block_size - 1u };
   enum { block_shift = Kokkos::Impl::integral_power_of_two(block_size) };
 
-public:
-  ConstBitset()
-    : m_size (0)
-  {}
+ public:
+  ConstBitset() : m_size(0) {}
 
   ConstBitset(Bitset<Device> const& rhs)
-    : m_size(rhs.m_size)
-    , m_blocks(rhs.m_blocks)
-  {}
+      : m_size(rhs.m_size), m_blocks(rhs.m_blocks) {}
 
   ConstBitset(ConstBitset<Device> const& rhs)
-    : m_size( rhs.m_size )
-    , m_blocks( rhs.m_blocks )
-  {}
+      : m_size(rhs.m_size), m_blocks(rhs.m_blocks) {}
 
-  ConstBitset<Device> & operator = (Bitset<Device> const & rhs)
-  {
-    this->m_size = rhs.m_size;
+  ConstBitset<Device>& operator=(Bitset<Device> const& rhs) {
+    this->m_size   = rhs.m_size;
     this->m_blocks = rhs.m_blocks;
 
     return *this;
   }
 
-  ConstBitset<Device> & operator = (ConstBitset<Device> const & rhs)
-  {
-    this->m_size = rhs.m_size;
+  ConstBitset<Device>& operator=(ConstBitset<Device> const& rhs) {
+    this->m_size   = rhs.m_size;
     this->m_blocks = rhs.m_blocks;
 
     return *this;
   }
 
-
   KOKKOS_FORCEINLINE_FUNCTION
-  unsigned size() const
-  {
-    return m_size;
-  }
+  unsigned size() const { return m_size; }
 
-  unsigned count() const
-  {
-    Impl::BitsetCount< ConstBitset<Device> > f(*this);
+  unsigned count() const {
+    Impl::BitsetCount<ConstBitset<Device> > f(*this);
     return f.apply();
   }
 
   KOKKOS_FORCEINLINE_FUNCTION
-  bool test( unsigned i ) const
-  {
-    if ( i < m_size ) {
-      const unsigned block = m_blocks[ i >> block_shift ];
-      const unsigned mask = 1u << static_cast<int>( i & block_mask );
+  bool test(unsigned i) const {
+    if (i < m_size) {
+      const unsigned block = m_blocks[i >> block_shift];
+      const unsigned mask  = 1u << static_cast<int>(i & block_mask);
       return block & mask;
     }
     return false;
   }
 
-private:
-
+ private:
   unsigned m_size;
-  View< const unsigned *, execution_space, MemoryTraits<RandomAccess> > m_blocks;
+  View<const unsigned*, execution_space, MemoryTraits<RandomAccess> > m_blocks;
 
-private:
+ private:
   template <typename DDevice>
   friend class ConstBitset;
 
@@ -390,47 +365,56 @@ private:
   friend struct Impl::BitsetCount;
 
   template <typename DstDevice, typename SrcDevice>
-  friend void deep_copy( Bitset<DstDevice> & dst, ConstBitset<SrcDevice> const& src);
+  friend void deep_copy(Bitset<DstDevice>& dst,
+                        ConstBitset<SrcDevice> const& src);
 
   template <typename DstDevice, typename SrcDevice>
-  friend void deep_copy( ConstBitset<DstDevice> & dst, ConstBitset<SrcDevice> const& src);
+  friend void deep_copy(ConstBitset<DstDevice>& dst,
+                        ConstBitset<SrcDevice> const& src);
 };
 
-
 template <typename DstDevice, typename SrcDevice>
-void deep_copy( Bitset<DstDevice> & dst, Bitset<SrcDevice> const& src)
-{
+void deep_copy(Bitset<DstDevice>& dst, Bitset<SrcDevice> const& src) {
   if (dst.size() != src.size()) {
-    throw std::runtime_error("Error: Cannot deep_copy bitsets of different sizes!");
+    throw std::runtime_error(
+        "Error: Cannot deep_copy bitsets of different sizes!");
   }
 
-  typedef Kokkos::Impl::DeepCopy< typename DstDevice::memory_space, typename SrcDevice::memory_space > raw_deep_copy;
-  raw_deep_copy(dst.m_blocks.data(), src.m_blocks.data(), sizeof(unsigned)*src.m_blocks.extent(0));
+  typedef Kokkos::Impl::DeepCopy<typename DstDevice::memory_space,
+                                 typename SrcDevice::memory_space>
+      raw_deep_copy;
+  raw_deep_copy(dst.m_blocks.data(), src.m_blocks.data(),
+                sizeof(unsigned) * src.m_blocks.extent(0));
 }
 
 template <typename DstDevice, typename SrcDevice>
-void deep_copy( Bitset<DstDevice> & dst, ConstBitset<SrcDevice> const& src)
-{
+void deep_copy(Bitset<DstDevice>& dst, ConstBitset<SrcDevice> const& src) {
   if (dst.size() != src.size()) {
-    throw std::runtime_error("Error: Cannot deep_copy bitsets of different sizes!");
+    throw std::runtime_error(
+        "Error: Cannot deep_copy bitsets of different sizes!");
   }
 
-  typedef Kokkos::Impl::DeepCopy< typename DstDevice::memory_space, typename SrcDevice::memory_space > raw_deep_copy;
-  raw_deep_copy(dst.m_blocks.data(), src.m_blocks.data(), sizeof(unsigned)*src.m_blocks.extent(0));
+  typedef Kokkos::Impl::DeepCopy<typename DstDevice::memory_space,
+                                 typename SrcDevice::memory_space>
+      raw_deep_copy;
+  raw_deep_copy(dst.m_blocks.data(), src.m_blocks.data(),
+                sizeof(unsigned) * src.m_blocks.extent(0));
 }
 
 template <typename DstDevice, typename SrcDevice>
-void deep_copy( ConstBitset<DstDevice> & dst, ConstBitset<SrcDevice> const& src)
-{
+void deep_copy(ConstBitset<DstDevice>& dst, ConstBitset<SrcDevice> const& src) {
   if (dst.size() != src.size()) {
-    throw std::runtime_error("Error: Cannot deep_copy bitsets of different sizes!");
+    throw std::runtime_error(
+        "Error: Cannot deep_copy bitsets of different sizes!");
   }
 
-  typedef Kokkos::Impl::DeepCopy< typename DstDevice::memory_space, typename SrcDevice::memory_space > raw_deep_copy;
-  raw_deep_copy(dst.m_blocks.data(), src.m_blocks.data(), sizeof(unsigned)*src.m_blocks.extent(0));
+  typedef Kokkos::Impl::DeepCopy<typename DstDevice::memory_space,
+                                 typename SrcDevice::memory_space>
+      raw_deep_copy;
+  raw_deep_copy(dst.m_blocks.data(), src.m_blocks.data(),
+                sizeof(unsigned) * src.m_blocks.extent(0));
 }
 
-} // namespace Kokkos
-
-#endif //KOKKOS_BITSET_HPP
+}  // namespace Kokkos
 
+#endif  // KOKKOS_BITSET_HPP
diff --git a/lib/kokkos/containers/src/Kokkos_DualView.hpp b/lib/kokkos/containers/src/Kokkos_DualView.hpp
index d9b14d67a2..d8a3ebc1ae 100644
--- a/lib/kokkos/containers/src/Kokkos_DualView.hpp
+++ b/lib/kokkos/containers/src/Kokkos_DualView.hpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -90,47 +91,41 @@ namespace Kokkos {
  *     behavior.  Please see the documentation of Kokkos::View for
  *     examples.  The default suffices for most users.
  */
-template< class DataType ,
-          class Arg1Type = void ,
-          class Arg2Type = void ,
+template <class DataType, class Arg1Type = void, class Arg2Type = void,
           class Arg3Type = void>
-class DualView : public ViewTraits< DataType , Arg1Type , Arg2Type, Arg3Type >
-{
-template< class , class , class , class > friend class DualView ;
-public:
+class DualView : public ViewTraits<DataType, Arg1Type, Arg2Type, Arg3Type> {
+  template <class, class, class, class>
+  friend class DualView;
+
+ public:
   //! \name Typedefs for device types and various Kokkos::View specializations.
   //@{
-  typedef ViewTraits< DataType , Arg1Type , Arg2Type, Arg3Type > traits ;
+  typedef ViewTraits<DataType, Arg1Type, Arg2Type, Arg3Type> traits;
 
   //! The Kokkos Host Device type;
-  typedef typename traits::host_mirror_space host_mirror_space ;
+  typedef typename traits::host_mirror_space host_mirror_space;
 
   //! The type of a Kokkos::View on the device.
-  typedef View< typename traits::data_type ,
-                Arg1Type ,
-                Arg2Type ,
-                Arg3Type > t_dev ;
+  typedef View<typename traits::data_type, Arg1Type, Arg2Type, Arg3Type> t_dev;
 
   /// \typedef t_host
   /// \brief The type of a Kokkos::View host mirror of \c t_dev.
-  typedef typename t_dev::HostMirror t_host ;
+  typedef typename t_dev::HostMirror t_host;
 
   //! The type of a const View on the device.
   //! The type of a Kokkos::View on the device.
-  typedef View< typename traits::const_data_type ,
-                Arg1Type ,
-                Arg2Type ,
-                Arg3Type > t_dev_const ;
+  typedef View<typename traits::const_data_type, Arg1Type, Arg2Type, Arg3Type>
+      t_dev_const;
 
   /// \typedef t_host_const
   /// \brief The type of a const View host mirror of \c t_dev_const.
   typedef typename t_dev_const::HostMirror t_host_const;
 
   //! The type of a const, random-access View on the device.
-  typedef View< typename traits::const_data_type ,
-                typename traits::array_layout ,
-                typename traits::device_type ,
-                Kokkos::MemoryTraits<Kokkos::RandomAccess> > t_dev_const_randomread ;
+  typedef View<typename traits::const_data_type, typename traits::array_layout,
+               typename traits::device_type,
+               Kokkos::MemoryTraits<Kokkos::RandomAccess> >
+      t_dev_const_randomread;
 
   /// \typedef t_host_const_randomread
   /// \brief The type of a const, random-access View host mirror of
@@ -138,39 +133,36 @@ public:
   typedef typename t_dev_const_randomread::HostMirror t_host_const_randomread;
 
   //! The type of an unmanaged View on the device.
-  typedef View< typename traits::data_type ,
-                typename traits::array_layout ,
-                typename traits::device_type ,
-                MemoryUnmanaged> t_dev_um;
+  typedef View<typename traits::data_type, typename traits::array_layout,
+               typename traits::device_type, MemoryUnmanaged>
+      t_dev_um;
 
   //! The type of an unmanaged View host mirror of \c t_dev_um.
-  typedef View< typename t_host::data_type ,
-                typename t_host::array_layout ,
-                typename t_host::device_type ,
-                MemoryUnmanaged> t_host_um;
+  typedef View<typename t_host::data_type, typename t_host::array_layout,
+               typename t_host::device_type, MemoryUnmanaged>
+      t_host_um;
 
   //! The type of a const unmanaged View on the device.
-  typedef View< typename traits::const_data_type ,
-                typename traits::array_layout ,
-                typename traits::device_type ,
-                MemoryUnmanaged> t_dev_const_um;
+  typedef View<typename traits::const_data_type, typename traits::array_layout,
+               typename traits::device_type, MemoryUnmanaged>
+      t_dev_const_um;
 
   //! The type of a const unmanaged View host mirror of \c t_dev_const_um.
-  typedef View<typename t_host::const_data_type,
-               typename t_host::array_layout,
-               typename t_host::device_type,
-               MemoryUnmanaged> t_host_const_um;
+  typedef View<typename t_host::const_data_type, typename t_host::array_layout,
+               typename t_host::device_type, MemoryUnmanaged>
+      t_host_const_um;
 
   //! The type of a const, random-access View on the device.
-  typedef View< typename t_host::const_data_type ,
-                typename t_host::array_layout ,
-                typename t_host::device_type ,
-                Kokkos::MemoryTraits<Kokkos::Unmanaged|Kokkos::RandomAccess> > t_dev_const_randomread_um ;
+  typedef View<typename t_host::const_data_type, typename t_host::array_layout,
+               typename t_host::device_type,
+               Kokkos::MemoryTraits<Kokkos::Unmanaged | Kokkos::RandomAccess> >
+      t_dev_const_randomread_um;
 
   /// \typedef t_host_const_randomread
   /// \brief The type of a const, random-access View host mirror of
   ///   \c t_dev_const_randomread.
-  typedef typename t_dev_const_randomread::HostMirror t_host_const_randomread_um;
+  typedef
+      typename t_dev_const_randomread::HostMirror t_host_const_randomread_um;
 
   //@}
   //! \name The two View instances.
@@ -184,18 +176,20 @@ public:
   //@{
 
 #ifndef KOKKOS_ENABLE_DEPRECATED_CODE
-protected:
+ protected:
   // modified_flags[0] -> host
   // modified_flags[1] -> device
-  typedef View<unsigned int[2],LayoutLeft,Kokkos::HostSpace> t_modified_flags;
+  typedef View<unsigned int[2], LayoutLeft, Kokkos::HostSpace> t_modified_flags;
   t_modified_flags modified_flags;
 
-public:
+ public:
 #else
-  typedef View<unsigned int[2],LayoutLeft,typename t_host::execution_space> t_modified_flags;
-  typedef View<unsigned int,LayoutLeft,typename t_host::execution_space> t_modified_flag;
+  typedef View<unsigned int[2], LayoutLeft, typename t_host::execution_space>
+      t_modified_flags;
+  typedef View<unsigned int, LayoutLeft, typename t_host::execution_space>
+      t_modified_flag;
   t_modified_flags modified_flags;
-  t_modified_flag modified_host,modified_device;
+  t_modified_flag modified_host, modified_device;
 #endif
 
   //@}
@@ -208,11 +202,11 @@ public:
   /// default constructors.  The "modified" flags are both initialized
   /// to "unmodified."
 #ifndef KOKKOS_ENABLE_DEPRECATED_CODE
-  DualView () = default;
+  DualView() = default;
 #else
-  DualView ():modified_flags (t_modified_flags("DualView::modified_flags")) {
-    modified_host = t_modified_flag(modified_flags,0);
-    modified_device = t_modified_flag(modified_flags,1);
+  DualView() : modified_flags(t_modified_flags("DualView::modified_flags")) {
+    modified_host   = t_modified_flag(modified_flags, 0);
+    modified_device = t_modified_flag(modified_flags, 1);
   }
 #endif
 
@@ -225,52 +219,52 @@ public:
   /// View objects.  For example, if the View has three dimensions,
   /// the first three integer arguments will be nonzero, and you may
   /// omit the integer arguments that follow.
-  DualView (const std::string& label,
-            const size_t n0 = KOKKOS_IMPL_CTOR_DEFAULT_ARG,
-            const size_t n1 = KOKKOS_IMPL_CTOR_DEFAULT_ARG,
-            const size_t n2 = KOKKOS_IMPL_CTOR_DEFAULT_ARG,
-            const size_t n3 = KOKKOS_IMPL_CTOR_DEFAULT_ARG,
-            const size_t n4 = KOKKOS_IMPL_CTOR_DEFAULT_ARG,
-            const size_t n5 = KOKKOS_IMPL_CTOR_DEFAULT_ARG,
-            const size_t n6 = KOKKOS_IMPL_CTOR_DEFAULT_ARG,
-            const size_t n7 = KOKKOS_IMPL_CTOR_DEFAULT_ARG)
-    : d_view (label, n0, n1, n2, n3, n4, n5, n6, n7)
-    , h_view (create_mirror_view (d_view)) // without UVM, host View mirrors
-    , modified_flags (t_modified_flags("DualView::modified_flags"))
-  {
+  DualView(const std::string& label,
+           const size_t n0 = KOKKOS_IMPL_CTOR_DEFAULT_ARG,
+           const size_t n1 = KOKKOS_IMPL_CTOR_DEFAULT_ARG,
+           const size_t n2 = KOKKOS_IMPL_CTOR_DEFAULT_ARG,
+           const size_t n3 = KOKKOS_IMPL_CTOR_DEFAULT_ARG,
+           const size_t n4 = KOKKOS_IMPL_CTOR_DEFAULT_ARG,
+           const size_t n5 = KOKKOS_IMPL_CTOR_DEFAULT_ARG,
+           const size_t n6 = KOKKOS_IMPL_CTOR_DEFAULT_ARG,
+           const size_t n7 = KOKKOS_IMPL_CTOR_DEFAULT_ARG)
+      : d_view(label, n0, n1, n2, n3, n4, n5, n6, n7),
+        h_view(create_mirror_view(d_view))  // without UVM, host View mirrors
+        ,
+        modified_flags(t_modified_flags("DualView::modified_flags")) {
 #ifdef KOKKOS_ENABLE_DEPRECATED_CODE
-    modified_host = t_modified_flag(modified_flags,0);
-    modified_device = t_modified_flag(modified_flags,1);
+    modified_host   = t_modified_flag(modified_flags, 0);
+    modified_device = t_modified_flag(modified_flags, 1);
 #endif
   }
 
   //! Copy constructor (shallow copy)
-  template<class SS, class LS, class DS, class MS>
-  DualView (const DualView<SS,LS,DS,MS>& src) :
-    d_view (src.d_view),
-    h_view (src.h_view),
-    modified_flags (src.modified_flags)
+  template <class SS, class LS, class DS, class MS>
+  DualView(const DualView<SS, LS, DS, MS>& src)
+      : d_view(src.d_view),
+        h_view(src.h_view),
+        modified_flags(src.modified_flags)
 #ifdef KOKKOS_ENABLE_DEPRECATED_CODE
-    , modified_host(src.modified_host)
-    , modified_device(src.modified_device)
+        ,
+        modified_host(src.modified_host),
+        modified_device(src.modified_device)
 #endif
-  {}
+  {
+  }
 
   //! Subview constructor
-  template< class SD, class S1 , class S2 , class S3
-          , class Arg0 , class ... Args >
-  DualView( const DualView<SD,S1,S2,S3> & src
-          , const Arg0 & arg0
-          , Args ... args
-          )
-    : d_view( Kokkos::subview( src.d_view , arg0 , args ... ) )
-    , h_view( Kokkos::subview( src.h_view , arg0 , args ... ) )
-    , modified_flags (src.modified_flags)
+  template <class SD, class S1, class S2, class S3, class Arg0, class... Args>
+  DualView(const DualView<SD, S1, S2, S3>& src, const Arg0& arg0, Args... args)
+      : d_view(Kokkos::subview(src.d_view, arg0, args...)),
+        h_view(Kokkos::subview(src.h_view, arg0, args...)),
+        modified_flags(src.modified_flags)
 #ifdef KOKKOS_ENABLE_DEPRECATED_CODE
-    , modified_host(src.modified_host)
-    , modified_device(src.modified_device)
+        ,
+        modified_host(src.modified_host),
+        modified_device(src.modified_device)
 #endif
-    {}
+  {
+  }
 
   /// \brief Create DualView from existing device and host View objects.
   ///
@@ -282,34 +276,34 @@ public:
   ///
   /// \param d_view_ Device View
   /// \param h_view_ Host View (must have type t_host = t_dev::HostMirror)
-  DualView (const t_dev& d_view_, const t_host& h_view_) :
-    d_view (d_view_),
-    h_view (h_view_),
-    modified_flags (t_modified_flags("DualView::modified_flags"))
-  {
-    if ( int(d_view.rank)     != int(h_view.rank) ||
-         d_view.extent(0) != h_view.extent(0) ||
-         d_view.extent(1) != h_view.extent(1) ||
-         d_view.extent(2) != h_view.extent(2) ||
-         d_view.extent(3) != h_view.extent(3) ||
-         d_view.extent(4) != h_view.extent(4) ||
-         d_view.extent(5) != h_view.extent(5) ||
-         d_view.extent(6) != h_view.extent(6) ||
-         d_view.extent(7) != h_view.extent(7) ||
-         d_view.stride_0()    != h_view.stride_0() ||
-         d_view.stride_1()    != h_view.stride_1() ||
-         d_view.stride_2()    != h_view.stride_2() ||
-         d_view.stride_3()    != h_view.stride_3() ||
-         d_view.stride_4()    != h_view.stride_4() ||
-         d_view.stride_5()    != h_view.stride_5() ||
-         d_view.stride_6()    != h_view.stride_6() ||
-         d_view.stride_7()    != h_view.stride_7() ||
-         d_view.span()        != h_view.span() ) {
-      Kokkos::Impl::throw_runtime_exception("DualView constructed with incompatible views");
+  DualView(const t_dev& d_view_, const t_host& h_view_)
+      : d_view(d_view_),
+        h_view(h_view_),
+        modified_flags(t_modified_flags("DualView::modified_flags")) {
+    if (int(d_view.rank) != int(h_view.rank) ||
+        d_view.extent(0) != h_view.extent(0) ||
+        d_view.extent(1) != h_view.extent(1) ||
+        d_view.extent(2) != h_view.extent(2) ||
+        d_view.extent(3) != h_view.extent(3) ||
+        d_view.extent(4) != h_view.extent(4) ||
+        d_view.extent(5) != h_view.extent(5) ||
+        d_view.extent(6) != h_view.extent(6) ||
+        d_view.extent(7) != h_view.extent(7) ||
+        d_view.stride_0() != h_view.stride_0() ||
+        d_view.stride_1() != h_view.stride_1() ||
+        d_view.stride_2() != h_view.stride_2() ||
+        d_view.stride_3() != h_view.stride_3() ||
+        d_view.stride_4() != h_view.stride_4() ||
+        d_view.stride_5() != h_view.stride_5() ||
+        d_view.stride_6() != h_view.stride_6() ||
+        d_view.stride_7() != h_view.stride_7() ||
+        d_view.span() != h_view.span()) {
+      Kokkos::Impl::throw_runtime_exception(
+          "DualView constructed with incompatible views");
     }
 #ifdef KOKKOS_ENABLE_DEPRECATED_CODE
-    modified_host = t_modified_flag(modified_flags,0);
-    modified_device = t_modified_flag(modified_flags,1);
+    modified_host   = t_modified_flag(modified_flags, 0);
+    modified_device = t_modified_flag(modified_flags, 1);
 #endif
   }
 
@@ -326,119 +320,133 @@ public:
   ///
   /// For example, suppose you create a DualView on Cuda, like this:
   /// \code
-  /// typedef Kokkos::DualView<float, Kokkos::LayoutRight, Kokkos::Cuda> dual_view_type;
-  /// dual_view_type DV ("my dual view", 100);
-  /// \endcode
-  /// If you want to get the CUDA device View, do this:
-  /// \code
-  /// typename dual_view_type::t_dev cudaView = DV.view<Kokkos::Cuda> ();
-  /// \endcode
-  /// and if you want to get the host mirror of that View, do this:
-  /// \code
-  /// typedef typename Kokkos::HostSpace::execution_space host_device_type;
-  /// typename dual_view_type::t_host hostView = DV.view<host_device_type> ();
-  /// \endcode
-  template< class Device >
-  KOKKOS_INLINE_FUNCTION
-  const typename Impl::if_c<
-    std::is_same<typename t_dev::memory_space,
-                          typename Device::memory_space>::value,
-    t_dev,
-    t_host>::type& view () const
-  {
-    #ifndef KOKKOS_ENABLE_DEPRECATED_CODE
-    constexpr bool device_is_memspace  = std::is_same<Device,typename Device::memory_space>::value;
-    constexpr bool device_is_execspace = std::is_same<Device,typename Device::execution_space>::value;
-    constexpr bool device_exec_is_t_dev_exec  = std::is_same<typename Device::execution_space,typename t_dev::execution_space>::value;
-    constexpr bool device_mem_is_t_dev_mem    = std::is_same<typename Device::memory_space,typename t_dev::memory_space>::value;
-    constexpr bool device_exec_is_t_host_exec  = std::is_same<typename Device::execution_space,typename t_host::execution_space>::value;
-    constexpr bool device_mem_is_t_host_mem    = std::is_same<typename Device::memory_space,typename t_host::memory_space>::value;
-    constexpr bool device_is_t_host_device  = std::is_same<typename Device::execution_space,typename t_host::device_type>::value;
-    constexpr bool device_is_t_dev_device    = std::is_same<typename Device::memory_space,typename t_host::device_type>::value;
+  /// typedef Kokkos::DualView<float, Kokkos::LayoutRight, Kokkos::Cuda>
+  /// dual_view_type; dual_view_type DV ("my dual view", 100); \endcode If you
+  /// want to get the CUDA device View, do this: \code typename
+  /// dual_view_type::t_dev cudaView = DV.view<Kokkos::Cuda> (); \endcode and if
+  /// you want to get the host mirror of that View, do this: \code typedef
+  /// typename Kokkos::HostSpace::execution_space host_device_type; typename
+  /// dual_view_type::t_host hostView = DV.view<host_device_type> (); \endcode
+  template <class Device>
+  KOKKOS_INLINE_FUNCTION const typename Impl::if_c<
+      std::is_same<typename t_dev::memory_space,
+                   typename Device::memory_space>::value,
+      t_dev, t_host>::type&
+  view() const {
+#ifndef KOKKOS_ENABLE_DEPRECATED_CODE
+    constexpr bool device_is_memspace =
+        std::is_same<Device, typename Device::memory_space>::value;
+    constexpr bool device_is_execspace =
+        std::is_same<Device, typename Device::execution_space>::value;
+    constexpr bool device_exec_is_t_dev_exec =
+        std::is_same<typename Device::execution_space,
+                     typename t_dev::execution_space>::value;
+    constexpr bool device_mem_is_t_dev_mem =
+        std::is_same<typename Device::memory_space,
+                     typename t_dev::memory_space>::value;
+    constexpr bool device_exec_is_t_host_exec =
+        std::is_same<typename Device::execution_space,
+                     typename t_host::execution_space>::value;
+    constexpr bool device_mem_is_t_host_mem =
+        std::is_same<typename Device::memory_space,
+                     typename t_host::memory_space>::value;
+    constexpr bool device_is_t_host_device =
+        std::is_same<typename Device::execution_space,
+                     typename t_host::device_type>::value;
+    constexpr bool device_is_t_dev_device =
+        std::is_same<typename Device::memory_space,
+                     typename t_host::device_type>::value;
 
     static_assert(
         device_is_t_dev_device || device_is_t_host_device ||
-        (device_is_memspace  && (device_mem_is_t_dev_mem   || device_mem_is_t_host_mem) ) ||
-        (device_is_execspace && (device_exec_is_t_dev_exec || device_exec_is_t_host_exec) ) ||
-        (
-          (!device_is_execspace && !device_is_memspace) && (
-            (device_mem_is_t_dev_mem   || device_mem_is_t_host_mem)  ||
-            (device_exec_is_t_dev_exec || device_exec_is_t_host_exec)
-          )
-        )
-        ,
-        "Template parameter to .view() must exactly match one of the DualView's device types or one of the execution or memory spaces");
-    #endif
+            (device_is_memspace &&
+             (device_mem_is_t_dev_mem || device_mem_is_t_host_mem)) ||
+            (device_is_execspace &&
+             (device_exec_is_t_dev_exec || device_exec_is_t_host_exec)) ||
+            ((!device_is_execspace && !device_is_memspace) &&
+             ((device_mem_is_t_dev_mem || device_mem_is_t_host_mem) ||
+              (device_exec_is_t_dev_exec || device_exec_is_t_host_exec))),
+        "Template parameter to .view() must exactly match one of the "
+        "DualView's device types or one of the execution or memory spaces");
+#endif
 
-    return Impl::if_c<
-      std::is_same<
-        typename t_dev::memory_space,
-        typename Device::memory_space>::value,
-      t_dev,
-      t_host >::select (d_view , h_view);
+    return Impl::if_c<std::is_same<typename t_dev::memory_space,
+                                   typename Device::memory_space>::value,
+                      t_dev, t_host>::select(d_view, h_view);
   }
 
   KOKKOS_INLINE_FUNCTION
-  t_host view_host() const {
-    return h_view;
-  }
+  t_host view_host() const { return h_view; }
 
   KOKKOS_INLINE_FUNCTION
-  t_dev view_device() const {
-    return d_view;
-  }
+  t_dev view_device() const { return d_view; }
 
-  template<class Device>
+  template <class Device>
   static int get_device_side() {
-    constexpr bool device_is_memspace  = std::is_same<Device,typename Device::memory_space>::value;
-    constexpr bool device_is_execspace = std::is_same<Device,typename Device::execution_space>::value;
-    constexpr bool device_exec_is_t_dev_exec  = std::is_same<typename Device::execution_space,typename t_dev::execution_space>::value;
-    constexpr bool device_mem_is_t_dev_mem    = std::is_same<typename Device::memory_space,typename t_dev::memory_space>::value;
-    constexpr bool device_exec_is_t_host_exec  = std::is_same<typename Device::execution_space,typename t_host::execution_space>::value;
-    constexpr bool device_mem_is_t_host_mem    = std::is_same<typename Device::memory_space,typename t_host::memory_space>::value;
-    constexpr bool device_is_t_host_device  = std::is_same<typename Device::execution_space,typename t_host::device_type>::value;
-    constexpr bool device_is_t_dev_device    = std::is_same<typename Device::memory_space,typename t_host::device_type>::value;
+    constexpr bool device_is_memspace =
+        std::is_same<Device, typename Device::memory_space>::value;
+    constexpr bool device_is_execspace =
+        std::is_same<Device, typename Device::execution_space>::value;
+    constexpr bool device_exec_is_t_dev_exec =
+        std::is_same<typename Device::execution_space,
+                     typename t_dev::execution_space>::value;
+    constexpr bool device_mem_is_t_dev_mem =
+        std::is_same<typename Device::memory_space,
+                     typename t_dev::memory_space>::value;
+    constexpr bool device_exec_is_t_host_exec =
+        std::is_same<typename Device::execution_space,
+                     typename t_host::execution_space>::value;
+    constexpr bool device_mem_is_t_host_mem =
+        std::is_same<typename Device::memory_space,
+                     typename t_host::memory_space>::value;
+    constexpr bool device_is_t_host_device =
+        std::is_same<typename Device::execution_space,
+                     typename t_host::device_type>::value;
+    constexpr bool device_is_t_dev_device =
+        std::is_same<typename Device::memory_space,
+                     typename t_host::device_type>::value;
 
-    #ifndef KOKKOS_ENABLE_DEPRECATED_CODE
+#ifndef KOKKOS_ENABLE_DEPRECATED_CODE
     static_assert(
         device_is_t_dev_device || device_is_t_host_device ||
-        (device_is_memspace  && (device_mem_is_t_dev_mem   || device_mem_is_t_host_mem) ) ||
-        (device_is_execspace && (device_exec_is_t_dev_exec || device_exec_is_t_host_exec) ) ||
-        (
-          (!device_is_execspace && !device_is_memspace) && (
-            (device_mem_is_t_dev_mem   || device_mem_is_t_host_mem)  ||
-            (device_exec_is_t_dev_exec || device_exec_is_t_host_exec)
-          )
-        )
-        ,
-        "Template parameter to .sync() must exactly match one of the DualView's device types or one of the execution or memory spaces");
-    #endif
+            (device_is_memspace &&
+             (device_mem_is_t_dev_mem || device_mem_is_t_host_mem)) ||
+            (device_is_execspace &&
+             (device_exec_is_t_dev_exec || device_exec_is_t_host_exec)) ||
+            ((!device_is_execspace && !device_is_memspace) &&
+             ((device_mem_is_t_dev_mem || device_mem_is_t_host_mem) ||
+              (device_exec_is_t_dev_exec || device_exec_is_t_host_exec))),
+        "Template parameter to .sync() must exactly match one of the "
+        "DualView's device types or one of the execution or memory spaces");
+#endif
 
-    #ifndef KOKKOS_ENABLE_DEPRECATED_CODE
+#ifndef KOKKOS_ENABLE_DEPRECATED_CODE
     int dev = -1;
-    #else
+#else
     int dev = 0;
-    #endif
-    if(device_is_t_dev_device) dev = 1;
-    else if(device_is_t_host_device) dev = 0;
+#endif
+    if (device_is_t_dev_device)
+      dev = 1;
+    else if (device_is_t_host_device)
+      dev = 0;
     else {
-      if(device_is_memspace) {
-        if(device_mem_is_t_dev_mem) dev = 1;
-        if(device_mem_is_t_host_mem) dev = 0;
-        if(device_mem_is_t_host_mem && device_mem_is_t_dev_mem) dev = -1;
+      if (device_is_memspace) {
+        if (device_mem_is_t_dev_mem) dev = 1;
+        if (device_mem_is_t_host_mem) dev = 0;
+        if (device_mem_is_t_host_mem && device_mem_is_t_dev_mem) dev = -1;
       }
-      if(device_is_execspace) {
-        if(device_exec_is_t_dev_exec) dev = 1;
-        if(device_exec_is_t_host_exec) dev = 0;
-        if(device_exec_is_t_host_exec && device_exec_is_t_dev_exec) dev = -1;
+      if (device_is_execspace) {
+        if (device_exec_is_t_dev_exec) dev = 1;
+        if (device_exec_is_t_host_exec) dev = 0;
+        if (device_exec_is_t_host_exec && device_exec_is_t_dev_exec) dev = -1;
       }
-      if(!device_is_execspace && !device_is_memspace) {
-        if(device_mem_is_t_dev_mem) dev = 1;
-        if(device_mem_is_t_host_mem) dev = 0;
-        if(device_mem_is_t_host_mem && device_mem_is_t_dev_mem) dev = -1;
-        if(device_exec_is_t_dev_exec) dev = 1;
-        if(device_exec_is_t_host_exec) dev = 0;
-        if(device_exec_is_t_host_exec && device_exec_is_t_dev_exec) dev = -1;
+      if (!device_is_execspace && !device_is_memspace) {
+        if (device_mem_is_t_dev_mem) dev = 1;
+        if (device_mem_is_t_host_mem) dev = 0;
+        if (device_mem_is_t_host_mem && device_mem_is_t_dev_mem) dev = -1;
+        if (device_exec_is_t_dev_exec) dev = 1;
+        if (device_exec_is_t_host_exec) dev = 0;
+        if (device_exec_is_t_host_exec && device_exec_is_t_dev_exec) dev = -1;
       }
     }
     return dev;
@@ -461,88 +469,94 @@ public:
   ///   the data in either View.  You must manually mark modified data
   ///   as modified, by calling the modify() method with the
   ///   appropriate template parameter.
-  template<class Device>
-  void sync( const typename Impl::enable_if<
-        ( std::is_same< typename traits::data_type , typename traits::non_const_data_type>::value) ||
-        ( std::is_same< Device , int>::value)
-        , int >::type& = 0)
-  {
-    if(modified_flags.data()==NULL) return;
+  template <class Device>
+  void sync(const typename Impl::enable_if<
+                (std::is_same<typename traits::data_type,
+                              typename traits::non_const_data_type>::value) ||
+                    (std::is_same<Device, int>::value),
+                int>::type& = 0) {
+    if (modified_flags.data() == NULL) return;
 
     int dev = get_device_side<Device>();
 
-    if (dev == 1) { // if Device is the same as DualView's device type
+    if (dev == 1) {  // if Device is the same as DualView's device type
       if ((modified_flags(0) > 0) && (modified_flags(0) >= modified_flags(1))) {
-        deep_copy (d_view, h_view);
+        deep_copy(d_view, h_view);
         modified_flags(0) = modified_flags(1) = 0;
       }
     }
-    if (dev == 0) { // hopefully Device is the same as DualView's host type
+    if (dev == 0) {  // hopefully Device is the same as DualView's host type
       if ((modified_flags(1) > 0) && (modified_flags(1) >= modified_flags(0))) {
-        deep_copy (h_view, d_view);
+        deep_copy(h_view, d_view);
         modified_flags(0) = modified_flags(1) = 0;
       }
     }
-    if(std::is_same<typename t_host::memory_space,typename t_dev::memory_space>::value) {
+    if (std::is_same<typename t_host::memory_space,
+                     typename t_dev::memory_space>::value) {
       typename t_dev::execution_space().fence();
       typename t_host::execution_space().fence();
     }
   }
 
-  template<class Device>
-  void sync ( const typename Impl::enable_if<
-      ( ! std::is_same< typename traits::data_type , typename traits::non_const_data_type>::value ) ||
-      ( std::is_same< Device , int>::value)
-      , int >::type& = 0 )
-  {
-    if(modified_flags.data()==NULL) return;
+  template <class Device>
+  void sync(const typename Impl::enable_if<
+                (!std::is_same<typename traits::data_type,
+                               typename traits::non_const_data_type>::value) ||
+                    (std::is_same<Device, int>::value),
+                int>::type& = 0) {
+    if (modified_flags.data() == NULL) return;
 
     int dev = get_device_side<Device>();
 
-    if (dev == 1) { // if Device is the same as DualView's device type
+    if (dev == 1) {  // if Device is the same as DualView's device type
       if ((modified_flags(0) > 0) && (modified_flags(0) >= modified_flags(1))) {
-        Impl::throw_runtime_exception("Calling sync on a DualView with a const datatype.");
+        Impl::throw_runtime_exception(
+            "Calling sync on a DualView with a const datatype.");
       }
     }
-    if (dev == 0){ // hopefully Device is the same as DualView's host type
+    if (dev == 0) {  // hopefully Device is the same as DualView's host type
       if ((modified_flags(1) > 0) && (modified_flags(1) >= modified_flags(0))) {
-        Impl::throw_runtime_exception("Calling sync on a DualView with a const datatype.");
+        Impl::throw_runtime_exception(
+            "Calling sync on a DualView with a const datatype.");
       }
     }
   }
 
   void sync_host() {
-    if( ! std::is_same< typename traits::data_type , typename traits::non_const_data_type>::value )
-      Impl::throw_runtime_exception("Calling sync_host on a DualView with a const datatype.");
-    if(modified_flags.data()==NULL) return;
-    if(modified_flags(1) > modified_flags(0)) {
-      deep_copy (h_view, d_view);
+    if (!std::is_same<typename traits::data_type,
+                      typename traits::non_const_data_type>::value)
+      Impl::throw_runtime_exception(
+          "Calling sync_host on a DualView with a const datatype.");
+    if (modified_flags.data() == NULL) return;
+    if (modified_flags(1) > modified_flags(0)) {
+      deep_copy(h_view, d_view);
       modified_flags(1) = modified_flags(0) = 0;
     }
   }
 
   void sync_device() {
-    if( ! std::is_same< typename traits::data_type , typename traits::non_const_data_type>::value )
-      Impl::throw_runtime_exception("Calling sync_device on a DualView with a const datatype.");
-    if(modified_flags.data()==NULL) return;
-    if(modified_flags(0) > modified_flags(1)) {
-      deep_copy (d_view, h_view);
+    if (!std::is_same<typename traits::data_type,
+                      typename traits::non_const_data_type>::value)
+      Impl::throw_runtime_exception(
+          "Calling sync_device on a DualView with a const datatype.");
+    if (modified_flags.data() == NULL) return;
+    if (modified_flags(0) > modified_flags(1)) {
+      deep_copy(d_view, h_view);
       modified_flags(1) = modified_flags(0) = 0;
     }
   }
 
-  template<class Device>
-  bool need_sync() const
-  {
-    if(modified_flags.data()==NULL) return false;
+  template <class Device>
+  bool need_sync() const {
+    if (modified_flags.data() == NULL) return false;
     int dev = get_device_side<Device>();
 
-    if (dev == 1) { // if Device is the same as DualView's device type
+    if (dev == 1) {  // if Device is the same as DualView's device type
       if ((modified_flags(0) > 0) && (modified_flags(0) >= modified_flags(1))) {
         return true;
       }
     }
-    if (dev == 0){ // hopefully Device is the same as DualView's host type
+    if (dev == 0) {  // hopefully Device is the same as DualView's host type
       if ((modified_flags(1) > 0) && (modified_flags(1) >= modified_flags(0))) {
         return true;
       }
@@ -551,13 +565,13 @@ public:
   }
 
   inline bool need_sync_host() const {
-    if(modified_flags.data()==NULL) return false;
-    return modified_flags(0)<modified_flags(1);
+    if (modified_flags.data() == NULL) return false;
+    return modified_flags(0) < modified_flags(1);
   }
 
   inline bool need_sync_device() const {
-    if(modified_flags.data()==NULL) return false;
-    return modified_flags(1)<modified_flags(0);
+    if (modified_flags.data() == NULL) return false;
+    return modified_flags(1) < modified_flags(0);
   }
 
   /// \brief Mark data as modified on the given device \c Device.
@@ -565,20 +579,24 @@ public:
   /// If \c Device is the same as this DualView's device type, then
   /// mark the device's data as modified.  Otherwise, mark the host's
   /// data as modified.
-  template<class Device>
-  void modify () {
-    if(modified_flags.data()==NULL) return;
+  template <class Device>
+  void modify() {
+    if (modified_flags.data() == NULL) return;
     int dev = get_device_side<Device>();
 
-    if (dev == 1) { // if Device is the same as DualView's device type
+    if (dev == 1) {  // if Device is the same as DualView's device type
       // Increment the device's modified count.
-      modified_flags(1) = (modified_flags(1) > modified_flags(0) ?
-                            modified_flags(1) : modified_flags(0)) + 1;
+      modified_flags(1) =
+          (modified_flags(1) > modified_flags(0) ? modified_flags(1)
+                                                 : modified_flags(0)) +
+          1;
     }
-    if (dev == 0) { // hopefully Device is the same as DualView's host type
+    if (dev == 0) {  // hopefully Device is the same as DualView's host type
       // Increment the host's modified count.
-      modified_flags(0) = (modified_flags(1) > modified_flags(0) ?
-                          modified_flags(1) : modified_flags(0))  + 1;
+      modified_flags(0) =
+          (modified_flags(1) > modified_flags(0) ? modified_flags(1)
+                                                 : modified_flags(0)) +
+          1;
     }
 
 #ifdef KOKKOS_ENABLE_DEBUG_DUALVIEW_MODIFY_CHECK
@@ -594,10 +612,12 @@ public:
   }
 
   inline void modify_host() {
-    if(modified_flags.data()!=NULL) {
-      modified_flags(0) = (modified_flags(1) > modified_flags(0) ?
-          modified_flags(1) : modified_flags(0))  + 1;
-      #ifdef KOKKOS_ENABLE_DEBUG_DUALVIEW_MODIFY_CHECK
+    if (modified_flags.data() != NULL) {
+      modified_flags(0) =
+          (modified_flags(1) > modified_flags(0) ? modified_flags(1)
+                                                 : modified_flags(0)) +
+          1;
+#ifdef KOKKOS_ENABLE_DEBUG_DUALVIEW_MODIFY_CHECK
       if (modified_flags(0) && modified_flags(1)) {
         std::string msg = "Kokkos::DualView::modify_host ERROR: ";
         msg += "Concurrent modification of host and device views ";
@@ -606,15 +626,17 @@ public:
         msg += "\"\n";
         Kokkos::abort(msg.c_str());
       }
-    #endif
+#endif
     }
   }
 
   inline void modify_device() {
-    if(modified_flags.data()!=NULL) {
-      modified_flags(1) = (modified_flags(1) > modified_flags(0) ?
-          modified_flags(1) : modified_flags(0))  + 1;
-      #ifdef KOKKOS_ENABLE_DEBUG_DUALVIEW_MODIFY_CHECK
+    if (modified_flags.data() != NULL) {
+      modified_flags(1) =
+          (modified_flags(1) > modified_flags(0) ? modified_flags(1)
+                                                 : modified_flags(0)) +
+          1;
+#ifdef KOKKOS_ENABLE_DEBUG_DUALVIEW_MODIFY_CHECK
       if (modified_flags(0) && modified_flags(1)) {
         std::string msg = "Kokkos::DualView::modify_device ERROR: ";
         msg += "Concurrent modification of host and device views ";
@@ -623,12 +645,12 @@ public:
         msg += "\"\n";
         Kokkos::abort(msg.c_str());
       }
-      #endif
+#endif
     }
   }
 
   inline void clear_sync_state() {
-    if(modified_flags.data()!=NULL) 
+    if (modified_flags.data() != NULL)
       modified_flags(1) = modified_flags(0) = 0;
   }
 
@@ -641,75 +663,72 @@ public:
   /// This discards any existing contents of the objects, and resets
   /// their modified flags.  It does <i>not</i> copy the old contents
   /// of either View into the new View objects.
-  void realloc( const size_t n0 = KOKKOS_IMPL_CTOR_DEFAULT_ARG ,
-           const size_t n1 = KOKKOS_IMPL_CTOR_DEFAULT_ARG ,
-           const size_t n2 = KOKKOS_IMPL_CTOR_DEFAULT_ARG ,
-           const size_t n3 = KOKKOS_IMPL_CTOR_DEFAULT_ARG ,
-           const size_t n4 = KOKKOS_IMPL_CTOR_DEFAULT_ARG ,
-           const size_t n5 = KOKKOS_IMPL_CTOR_DEFAULT_ARG ,
-           const size_t n6 = KOKKOS_IMPL_CTOR_DEFAULT_ARG ,
-           const size_t n7 = KOKKOS_IMPL_CTOR_DEFAULT_ARG ) {
-    ::Kokkos::realloc(d_view,n0,n1,n2,n3,n4,n5,n6,n7);
-     h_view = create_mirror_view( d_view );
+  void realloc(const size_t n0 = KOKKOS_IMPL_CTOR_DEFAULT_ARG,
+               const size_t n1 = KOKKOS_IMPL_CTOR_DEFAULT_ARG,
+               const size_t n2 = KOKKOS_IMPL_CTOR_DEFAULT_ARG,
+               const size_t n3 = KOKKOS_IMPL_CTOR_DEFAULT_ARG,
+               const size_t n4 = KOKKOS_IMPL_CTOR_DEFAULT_ARG,
+               const size_t n5 = KOKKOS_IMPL_CTOR_DEFAULT_ARG,
+               const size_t n6 = KOKKOS_IMPL_CTOR_DEFAULT_ARG,
+               const size_t n7 = KOKKOS_IMPL_CTOR_DEFAULT_ARG) {
+    ::Kokkos::realloc(d_view, n0, n1, n2, n3, n4, n5, n6, n7);
+    h_view = create_mirror_view(d_view);
 
-     /* Reset dirty flags */
-     if(modified_flags.data()==NULL) {
-       modified_flags = t_modified_flags("DualView::modified_flags");
-     } else
-       modified_flags(1) = modified_flags(0) = 0;
+    /* Reset dirty flags */
+    if (modified_flags.data() == NULL) {
+      modified_flags = t_modified_flags("DualView::modified_flags");
+    } else
+      modified_flags(1) = modified_flags(0) = 0;
   }
 
   /// \brief Resize both views, copying old contents into new if necessary.
   ///
   /// This method only copies the old contents into the new View
   /// objects for the device which was last marked as modified.
-  void resize( const size_t n0 = KOKKOS_IMPL_CTOR_DEFAULT_ARG ,
-           const size_t n1 = KOKKOS_IMPL_CTOR_DEFAULT_ARG ,
-           const size_t n2 = KOKKOS_IMPL_CTOR_DEFAULT_ARG ,
-           const size_t n3 = KOKKOS_IMPL_CTOR_DEFAULT_ARG ,
-           const size_t n4 = KOKKOS_IMPL_CTOR_DEFAULT_ARG ,
-           const size_t n5 = KOKKOS_IMPL_CTOR_DEFAULT_ARG ,
-           const size_t n6 = KOKKOS_IMPL_CTOR_DEFAULT_ARG ,
-           const size_t n7 = KOKKOS_IMPL_CTOR_DEFAULT_ARG ) {
-   if(modified_flags.data()==NULL) {
-     modified_flags = t_modified_flags("DualView::modified_flags");
-   }
-   if(modified_flags(1) >= modified_flags(0)) {
-     /* Resize on Device */
-     ::Kokkos::resize(d_view,n0,n1,n2,n3,n4,n5,n6,n7);
-     h_view = create_mirror_view( d_view );
+  void resize(const size_t n0 = KOKKOS_IMPL_CTOR_DEFAULT_ARG,
+              const size_t n1 = KOKKOS_IMPL_CTOR_DEFAULT_ARG,
+              const size_t n2 = KOKKOS_IMPL_CTOR_DEFAULT_ARG,
+              const size_t n3 = KOKKOS_IMPL_CTOR_DEFAULT_ARG,
+              const size_t n4 = KOKKOS_IMPL_CTOR_DEFAULT_ARG,
+              const size_t n5 = KOKKOS_IMPL_CTOR_DEFAULT_ARG,
+              const size_t n6 = KOKKOS_IMPL_CTOR_DEFAULT_ARG,
+              const size_t n7 = KOKKOS_IMPL_CTOR_DEFAULT_ARG) {
+    if (modified_flags.data() == NULL) {
+      modified_flags = t_modified_flags("DualView::modified_flags");
+    }
+    if (modified_flags(1) >= modified_flags(0)) {
+      /* Resize on Device */
+      ::Kokkos::resize(d_view, n0, n1, n2, n3, n4, n5, n6, n7);
+      h_view = create_mirror_view(d_view);
 
-     /* Mark Device copy as modified */
-     modified_flags(1) = modified_flags(1)+1;
+      /* Mark Device copy as modified */
+      modified_flags(1) = modified_flags(1) + 1;
 
-   } else {
-     /* Realloc on Device */
+    } else {
+      /* Realloc on Device */
 
-     ::Kokkos::realloc(d_view,n0,n1,n2,n3,n4,n5,n6,n7);
+      ::Kokkos::realloc(d_view, n0, n1, n2, n3, n4, n5, n6, n7);
 
-     const bool sizeMismatch = ( h_view.extent(0) != n0 ) ||
-         ( h_view.extent(1) != n1 ) ||
-         ( h_view.extent(2) != n2 ) ||
-         ( h_view.extent(3) != n3 ) ||
-         ( h_view.extent(4) != n4 ) ||
-         ( h_view.extent(5) != n5 ) ||
-         ( h_view.extent(6) != n6 ) ||
-         ( h_view.extent(7) != n7 );
-     if ( sizeMismatch )
-       ::Kokkos::resize(h_view,n0,n1,n2,n3,n4,n5,n6,n7);
+      const bool sizeMismatch =
+          (h_view.extent(0) != n0) || (h_view.extent(1) != n1) ||
+          (h_view.extent(2) != n2) || (h_view.extent(3) != n3) ||
+          (h_view.extent(4) != n4) || (h_view.extent(5) != n5) ||
+          (h_view.extent(6) != n6) || (h_view.extent(7) != n7);
+      if (sizeMismatch)
+        ::Kokkos::resize(h_view, n0, n1, n2, n3, n4, n5, n6, n7);
 
-     t_host temp_view = create_mirror_view( d_view );
+      t_host temp_view = create_mirror_view(d_view);
 
-     /* Remap on Host */
-     Kokkos::deep_copy( temp_view , h_view );
+      /* Remap on Host */
+      Kokkos::deep_copy(temp_view, h_view);
 
-     h_view = temp_view;
+      h_view = temp_view;
 
-     d_view = create_mirror_view( typename t_dev::execution_space(), h_view );
+      d_view = create_mirror_view(typename t_dev::execution_space(), h_view);
 
-     /* Mark Host copy as modified */
-     modified_flags(0) = modified_flags(0)+1;
-   }
+      /* Mark Host copy as modified */
+      modified_flags(0) = modified_flags(0) + 1;
+    }
   }
 
   //@}
@@ -718,37 +737,35 @@ public:
 
 #ifdef KOKKOS_ENABLE_DEPRECATED_CODE
   //! The allocation size (same as Kokkos::View::capacity).
-  size_t capacity() const {
-    return d_view.span();
-  }
+  size_t capacity() const { return d_view.span(); }
 #endif
 
   //! The allocation size (same as Kokkos::View::span).
-  KOKKOS_INLINE_FUNCTION constexpr size_t span() const {
-    return d_view.span();
-  }
+  KOKKOS_INLINE_FUNCTION constexpr size_t span() const { return d_view.span(); }
 
-  KOKKOS_INLINE_FUNCTION bool span_is_contiguous() const { 
-    return d_view.span_is_contiguous(); 
+  KOKKOS_INLINE_FUNCTION bool span_is_contiguous() const {
+    return d_view.span_is_contiguous();
   }
 
   //! Get stride(s) for each dimension.
-  template< typename iType>
+  template <typename iType>
   void stride(iType* stride_) const {
     d_view.stride(stride_);
   }
 
-  template< typename iType >
-   KOKKOS_INLINE_FUNCTION constexpr
-   typename std::enable_if< std::is_integral<iType>::value , size_t >::type
-   extent( const iType & r ) const
-     { return d_view.extent(r); }
+  template <typename iType>
+  KOKKOS_INLINE_FUNCTION constexpr
+      typename std::enable_if<std::is_integral<iType>::value, size_t>::type
+      extent(const iType& r) const {
+    return d_view.extent(r);
+  }
 
-   template< typename iType >
-   KOKKOS_INLINE_FUNCTION constexpr
-   typename std::enable_if< std::is_integral<iType>::value , int >::type
-   extent_int( const iType & r ) const
-     { return static_cast<int>(d_view.extent(r)); }
+  template <typename iType>
+  KOKKOS_INLINE_FUNCTION constexpr
+      typename std::enable_if<std::is_integral<iType>::value, int>::type
+      extent_int(const iType& r) const {
+    return static_cast<int>(d_view.extent(r));
+  }
 
 #ifdef KOKKOS_ENABLE_DEPRECATED_CODE
   /*  Deprecate all 'dimension' functions in favor of
@@ -756,27 +773,27 @@ public:
    */
 
   /* \brief return size of dimension 0 */
-  size_t dimension_0() const {return d_view.extent(0);}
+  size_t dimension_0() const { return d_view.extent(0); }
   /* \brief return size of dimension 1 */
-  size_t dimension_1() const {return d_view.extent(1);}
+  size_t dimension_1() const { return d_view.extent(1); }
   /* \brief return size of dimension 2 */
-  size_t dimension_2() const {return d_view.extent(2);}
+  size_t dimension_2() const { return d_view.extent(2); }
   /* \brief return size of dimension 3 */
-  size_t dimension_3() const {return d_view.extent(3);}
+  size_t dimension_3() const { return d_view.extent(3); }
   /* \brief return size of dimension 4 */
-  size_t dimension_4() const {return d_view.extent(4);}
+  size_t dimension_4() const { return d_view.extent(4); }
   /* \brief return size of dimension 5 */
-  size_t dimension_5() const {return d_view.extent(5);}
+  size_t dimension_5() const { return d_view.extent(5); }
   /* \brief return size of dimension 6 */
-  size_t dimension_6() const {return d_view.extent(6);}
+  size_t dimension_6() const { return d_view.extent(6); }
   /* \brief return size of dimension 7 */
-  size_t dimension_7() const {return d_view.extent(7);}
+  size_t dimension_7() const { return d_view.extent(7); }
 #endif
 
   //@}
 };
 
-} // namespace Kokkos
+}  // namespace Kokkos
 
 //----------------------------------------------------------------------------
 //----------------------------------------------------------------------------
@@ -787,32 +804,24 @@ public:
 namespace Kokkos {
 namespace Impl {
 
-template< class D, class A1, class A2, class A3, class ... Args >
+template <class D, class A1, class A2, class A3, class... Args>
 struct DualViewSubview {
+  typedef typename Kokkos::Impl::ViewMapping<
+      void, Kokkos::ViewTraits<D, A1, A2, A3>, Args...>::traits_type dst_traits;
 
-  typedef typename Kokkos::Impl::ViewMapping
-    < void
-    , Kokkos::ViewTraits< D, A1, A2, A3 >
-    , Args ...
-    >::traits_type dst_traits ;
-
-  typedef Kokkos::DualView
-    < typename dst_traits::data_type
-    , typename dst_traits::array_layout
-    , typename dst_traits::device_type
-    , typename dst_traits::memory_traits
-    > type ;
+  typedef Kokkos::DualView<
+      typename dst_traits::data_type, typename dst_traits::array_layout,
+      typename dst_traits::device_type, typename dst_traits::memory_traits>
+      type;
 };
 
 } /* namespace Impl */
 
-
-template< class D , class A1 , class A2 , class A3 , class ... Args >
-typename Impl::DualViewSubview<D,A1,A2,A3,Args...>::type
-subview( const DualView<D,A1,A2,A3> & src , Args ... args )
-{
-  return typename
-    Impl::DualViewSubview<D,A1,A2,A3,Args...>::type( src , args ... );
+template <class D, class A1, class A2, class A3, class... Args>
+typename Impl::DualViewSubview<D, A1, A2, A3, Args...>::type subview(
+    const DualView<D, A1, A2, A3>& src, Args... args) {
+  return typename Impl::DualViewSubview<D, A1, A2, A3, Args...>::type(src,
+                                                                      args...);
 }
 
 } /* namespace Kokkos */
@@ -826,40 +835,35 @@ namespace Kokkos {
 // Partial specialization of Kokkos::deep_copy() for DualView objects.
 //
 
-template< class DT , class DL , class DD , class DM ,
-          class ST , class SL , class SD , class SM >
-void
-deep_copy (DualView<DT,DL,DD,DM> dst, // trust me, this must not be a reference
-           const DualView<ST,SL,SD,SM>& src )
-{
-  if ( src.need_sync_device() ) {
-    deep_copy (dst.h_view, src.h_view);
-    dst.modify_host();
-  }
-  else {
-    deep_copy (dst.d_view, src.d_view);
-    dst.modify_device();
-  } 
-}
-
-template< class ExecutionSpace ,
-          class DT , class DL , class DD , class DM ,
-          class ST , class SL , class SD , class SM >
-void
-deep_copy (const ExecutionSpace& exec ,
-           DualView<DT,DL,DD,DM> dst, // trust me, this must not be a reference
-           const DualView<ST,SL,SD,SM>& src )
-{
-  if ( src.need_sync_device() ) {
-    deep_copy (exec, dst.h_view, src.h_view);
+template <class DT, class DL, class DD, class DM, class ST, class SL, class SD,
+          class SM>
+void deep_copy(
+    DualView<DT, DL, DD, DM> dst,  // trust me, this must not be a reference
+    const DualView<ST, SL, SD, SM>& src) {
+  if (src.need_sync_device()) {
+    deep_copy(dst.h_view, src.h_view);
     dst.modify_host();
   } else {
-    deep_copy (exec, dst.d_view, src.d_view);
+    deep_copy(dst.d_view, src.d_view);
     dst.modify_device();
   }
 }
 
-} // namespace Kokkos
+template <class ExecutionSpace, class DT, class DL, class DD, class DM,
+          class ST, class SL, class SD, class SM>
+void deep_copy(
+    const ExecutionSpace& exec,
+    DualView<DT, DL, DD, DM> dst,  // trust me, this must not be a reference
+    const DualView<ST, SL, SD, SM>& src) {
+  if (src.need_sync_device()) {
+    deep_copy(exec, dst.h_view, src.h_view);
+    dst.modify_host();
+  } else {
+    deep_copy(exec, dst.d_view, src.d_view);
+    dst.modify_device();
+  }
+}
+
+}  // namespace Kokkos
 
 #endif
-
diff --git a/lib/kokkos/containers/src/Kokkos_DynRankView.hpp b/lib/kokkos/containers/src/Kokkos_DynRankView.hpp
index d1e6704a57..0ceb9d5d39 100644
--- a/lib/kokkos/containers/src/Kokkos_DynRankView.hpp
+++ b/lib/kokkos/containers/src/Kokkos_DynRankView.hpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -56,255 +57,240 @@
 
 namespace Kokkos {
 
-template< typename DataType , class ... Properties >
-class DynRankView;  //forward declare
+template <typename DataType, class... Properties>
+class DynRankView;  // forward declare
 
 namespace Impl {
 
 template <typename Specialize>
 struct DynRankDimTraits {
-
-  enum : size_t{unspecified = KOKKOS_INVALID_INDEX};
+  enum : size_t { unspecified = KOKKOS_INVALID_INDEX };
 
   // Compute the rank of the view from the nonzero dimension arguments.
   KOKKOS_INLINE_FUNCTION
-  static size_t computeRank( const size_t N0
-                           , const size_t N1
-                           , const size_t N2
-                           , const size_t N3
-                           , const size_t N4
-                           , const size_t N5
-                           , const size_t N6
-                           , const size_t /* N7 */)
-  {
-    return
-      (   (N6 == unspecified && N5 == unspecified && N4 == unspecified && N3 == unspecified && N2 == unspecified && N1 == unspecified && N0 == unspecified) ? 0
-      : ( (N6 == unspecified && N5 == unspecified && N4 == unspecified && N3 == unspecified && N2 == unspecified && N1 == unspecified) ? 1
-      : ( (N6 == unspecified && N5 == unspecified && N4 == unspecified && N3 == unspecified && N2 == unspecified) ? 2
-      : ( (N6 == unspecified && N5 == unspecified && N4 == unspecified && N3 == unspecified) ? 3
-      : ( (N6 == unspecified && N5 == unspecified && N4 == unspecified) ? 4
-      : ( (N6 == unspecified && N5 == unspecified) ? 5
-      : ( (N6 == unspecified) ? 6
-      : 7 ) ) ) ) ) ) );
+  static size_t computeRank(const size_t N0, const size_t N1, const size_t N2,
+                            const size_t N3, const size_t N4, const size_t N5,
+                            const size_t N6, const size_t /* N7 */) {
+    return (
+        (N6 == unspecified && N5 == unspecified && N4 == unspecified &&
+         N3 == unspecified && N2 == unspecified && N1 == unspecified &&
+         N0 == unspecified)
+            ? 0
+            : ((N6 == unspecified && N5 == unspecified && N4 == unspecified &&
+                N3 == unspecified && N2 == unspecified && N1 == unspecified)
+                   ? 1
+                   : ((N6 == unspecified && N5 == unspecified &&
+                       N4 == unspecified && N3 == unspecified &&
+                       N2 == unspecified)
+                          ? 2
+                          : ((N6 == unspecified && N5 == unspecified &&
+                              N4 == unspecified && N3 == unspecified)
+                                 ? 3
+                                 : ((N6 == unspecified && N5 == unspecified &&
+                                     N4 == unspecified)
+                                        ? 4
+                                        : ((N6 == unspecified &&
+                                            N5 == unspecified)
+                                               ? 5
+                                               : ((N6 == unspecified)
+                                                      ? 6
+                                                      : 7)))))));
   }
 
   // Compute the rank of the view from the nonzero layout arguments.
   template <typename Layout>
-  KOKKOS_INLINE_FUNCTION
-  static size_t computeRank( const Layout& layout )
-  {
-    return computeRank( layout.dimension[0]
-                      , layout.dimension[1]
-                      , layout.dimension[2]
-                      , layout.dimension[3]
-                      , layout.dimension[4]
-                      , layout.dimension[5]
-                      , layout.dimension[6]
-                      , layout.dimension[7] );
+  KOKKOS_INLINE_FUNCTION static size_t computeRank(const Layout& layout) {
+    return computeRank(layout.dimension[0], layout.dimension[1],
+                       layout.dimension[2], layout.dimension[3],
+                       layout.dimension[4], layout.dimension[5],
+                       layout.dimension[6], layout.dimension[7]);
   }
 
   // Extra overload to match that for specialize types v2
-  template <typename Layout, typename ... P>
-  KOKKOS_INLINE_FUNCTION
-  static size_t computeRank( const Kokkos::Impl::ViewCtorProp<P...>& /* prop */, const Layout& layout )
-  {
+  template <typename Layout, typename... P>
+  KOKKOS_INLINE_FUNCTION static size_t computeRank(
+      const Kokkos::Impl::ViewCtorProp<P...>& /* prop */,
+      const Layout& layout) {
     return computeRank(layout);
   }
 
   // Create the layout for the rank-7 view.
   // Non-strided Layout
   template <typename Layout>
-  KOKKOS_INLINE_FUNCTION
-  static typename std::enable_if< (std::is_same<Layout , Kokkos::LayoutRight>::value || std::is_same<Layout , Kokkos::LayoutLeft>::value) , Layout >::type createLayout( const Layout& layout )
-  {
-    return Layout( layout.dimension[0] != unspecified ? layout.dimension[0] : 1
-                 , layout.dimension[1] != unspecified ? layout.dimension[1] : 1
-                 , layout.dimension[2] != unspecified ? layout.dimension[2] : 1
-                 , layout.dimension[3] != unspecified ? layout.dimension[3] : 1
-                 , layout.dimension[4] != unspecified ? layout.dimension[4] : 1
-                 , layout.dimension[5] != unspecified ? layout.dimension[5] : 1
-                 , layout.dimension[6] != unspecified ? layout.dimension[6] : 1
-                 , layout.dimension[7] != unspecified ? layout.dimension[7] : 1
-                 );
+  KOKKOS_INLINE_FUNCTION static typename std::enable_if<
+      (std::is_same<Layout, Kokkos::LayoutRight>::value ||
+       std::is_same<Layout, Kokkos::LayoutLeft>::value),
+      Layout>::type
+  createLayout(const Layout& layout) {
+    return Layout(layout.dimension[0] != unspecified ? layout.dimension[0] : 1,
+                  layout.dimension[1] != unspecified ? layout.dimension[1] : 1,
+                  layout.dimension[2] != unspecified ? layout.dimension[2] : 1,
+                  layout.dimension[3] != unspecified ? layout.dimension[3] : 1,
+                  layout.dimension[4] != unspecified ? layout.dimension[4] : 1,
+                  layout.dimension[5] != unspecified ? layout.dimension[5] : 1,
+                  layout.dimension[6] != unspecified ? layout.dimension[6] : 1,
+                  layout.dimension[7] != unspecified ? layout.dimension[7] : 1);
   }
 
   // LayoutStride
   template <typename Layout>
-  KOKKOS_INLINE_FUNCTION
-  static typename std::enable_if< (std::is_same<Layout , Kokkos::LayoutStride>::value) , Layout>::type createLayout( const Layout& layout )
-  {
-    return Layout( layout.dimension[0] != unspecified ? layout.dimension[0] : 1
-                 , layout.stride[0]
-                 , layout.dimension[1] != unspecified ? layout.dimension[1] : 1
-                 , layout.stride[1]
-                 , layout.dimension[2] != unspecified ? layout.dimension[2] : 1
-                 , layout.stride[2]
-                 , layout.dimension[3] != unspecified ? layout.dimension[3] : 1
-                 , layout.stride[3]
-                 , layout.dimension[4] != unspecified ? layout.dimension[4] : 1
-                 , layout.stride[4]
-                 , layout.dimension[5] != unspecified ? layout.dimension[5] : 1
-                 , layout.stride[5]
-                 , layout.dimension[6] != unspecified ? layout.dimension[6] : 1
-                 , layout.stride[6]
-                 , layout.dimension[7] != unspecified ? layout.dimension[7] : 1
-                 , layout.stride[7]
-                 );
+  KOKKOS_INLINE_FUNCTION static typename std::enable_if<
+      (std::is_same<Layout, Kokkos::LayoutStride>::value), Layout>::type
+  createLayout(const Layout& layout) {
+    return Layout(layout.dimension[0] != unspecified ? layout.dimension[0] : 1,
+                  layout.stride[0],
+                  layout.dimension[1] != unspecified ? layout.dimension[1] : 1,
+                  layout.stride[1],
+                  layout.dimension[2] != unspecified ? layout.dimension[2] : 1,
+                  layout.stride[2],
+                  layout.dimension[3] != unspecified ? layout.dimension[3] : 1,
+                  layout.stride[3],
+                  layout.dimension[4] != unspecified ? layout.dimension[4] : 1,
+                  layout.stride[4],
+                  layout.dimension[5] != unspecified ? layout.dimension[5] : 1,
+                  layout.stride[5],
+                  layout.dimension[6] != unspecified ? layout.dimension[6] : 1,
+                  layout.stride[6],
+                  layout.dimension[7] != unspecified ? layout.dimension[7] : 1,
+                  layout.stride[7]);
   }
 
   // Extra overload to match that for specialize types
-  template <typename Traits, typename ... P>
-  KOKKOS_INLINE_FUNCTION
-  static typename std::enable_if< (std::is_same<typename Traits::array_layout , Kokkos::LayoutRight>::value || std::is_same<typename Traits::array_layout , Kokkos::LayoutLeft>::value || std::is_same<typename Traits::array_layout , Kokkos::LayoutStride>::value) , typename Traits::array_layout >::type createLayout( const Kokkos::Impl::ViewCtorProp<P...>& /* prop */, const typename Traits::array_layout& layout )
-  {
-    return createLayout( layout );
+  template <typename Traits, typename... P>
+  KOKKOS_INLINE_FUNCTION static typename std::enable_if<
+      (std::is_same<typename Traits::array_layout,
+                    Kokkos::LayoutRight>::value ||
+       std::is_same<typename Traits::array_layout, Kokkos::LayoutLeft>::value ||
+       std::is_same<typename Traits::array_layout,
+                    Kokkos::LayoutStride>::value),
+      typename Traits::array_layout>::type
+  createLayout(const Kokkos::Impl::ViewCtorProp<P...>& /* prop */,
+               const typename Traits::array_layout& layout) {
+    return createLayout(layout);
   }
 
   // Create a view from the given dimension arguments.
   // This is only necessary because the shmem constructor doesn't take a layout.
-  //   NDE shmem View's are not compatible with the added view_alloc value_type / fad_dim deduction functionality
+  //   NDE shmem View's are not compatible with the added view_alloc value_type
+  //   / fad_dim deduction functionality
   template <typename ViewType, typename ViewArg>
-  static ViewType createView( const ViewArg& arg
-                            , const size_t N0
-                            , const size_t N1
-                            , const size_t N2
-                            , const size_t N3
-                            , const size_t N4
-                            , const size_t N5
-                            , const size_t N6
-                            , const size_t N7 )
-  {
-    return ViewType( arg
-                   , N0 != unspecified ? N0 : 1
-                   , N1 != unspecified ? N1 : 1
-                   , N2 != unspecified ? N2 : 1
-                   , N3 != unspecified ? N3 : 1
-                   , N4 != unspecified ? N4 : 1
-                   , N5 != unspecified ? N5 : 1
-                   , N6 != unspecified ? N6 : 1
-                   , N7 != unspecified ? N7 : 1 );
+  static ViewType createView(const ViewArg& arg, const size_t N0,
+                             const size_t N1, const size_t N2, const size_t N3,
+                             const size_t N4, const size_t N5, const size_t N6,
+                             const size_t N7) {
+    return ViewType(arg, N0 != unspecified ? N0 : 1, N1 != unspecified ? N1 : 1,
+                    N2 != unspecified ? N2 : 1, N3 != unspecified ? N3 : 1,
+                    N4 != unspecified ? N4 : 1, N5 != unspecified ? N5 : 1,
+                    N6 != unspecified ? N6 : 1, N7 != unspecified ? N7 : 1);
   }
 };
 
-  // Non-strided Layout
-  template <typename Layout , typename iType>
-  KOKKOS_INLINE_FUNCTION
-  static typename std::enable_if< (std::is_same<Layout , Kokkos::LayoutRight>::value || std::is_same<Layout , Kokkos::LayoutLeft>::value) && std::is_integral<iType>::value , Layout >::type
-  reconstructLayout( const Layout& layout , iType dynrank )
-  {
-    return Layout( dynrank > 0 ? layout.dimension[0] :KOKKOS_INVALID_INDEX
-                 , dynrank > 1 ? layout.dimension[1] :KOKKOS_INVALID_INDEX
-                 , dynrank > 2 ? layout.dimension[2] :KOKKOS_INVALID_INDEX
-                 , dynrank > 3 ? layout.dimension[3] :KOKKOS_INVALID_INDEX
-                 , dynrank > 4 ? layout.dimension[4] :KOKKOS_INVALID_INDEX
-                 , dynrank > 5 ? layout.dimension[5] :KOKKOS_INVALID_INDEX
-                 , dynrank > 6 ? layout.dimension[6] :KOKKOS_INVALID_INDEX
-                 , dynrank > 7 ? layout.dimension[7] :KOKKOS_INVALID_INDEX
-                 );
-  }
-
-  // LayoutStride
-  template <typename Layout , typename iType>
-  KOKKOS_INLINE_FUNCTION
-  static typename std::enable_if< (std::is_same<Layout , Kokkos::LayoutStride>::value) && std::is_integral<iType>::value , Layout >::type
-  reconstructLayout( const Layout& layout , iType dynrank )
-  {
-    return Layout( dynrank > 0 ? layout.dimension[0] :KOKKOS_INVALID_INDEX
-                 , dynrank > 0 ? layout.stride[0] : (0)
-                 , dynrank > 1 ? layout.dimension[1] :KOKKOS_INVALID_INDEX
-                 , dynrank > 1 ? layout.stride[1] : (0)
-                 , dynrank > 2 ? layout.dimension[2] :KOKKOS_INVALID_INDEX
-                 , dynrank > 2 ? layout.stride[2] : (0)
-                 , dynrank > 3 ? layout.dimension[3] :KOKKOS_INVALID_INDEX
-                 , dynrank > 3 ? layout.stride[3] : (0)
-                 , dynrank > 4 ? layout.dimension[4] :KOKKOS_INVALID_INDEX
-                 , dynrank > 4 ? layout.stride[4] : (0)
-                 , dynrank > 5 ? layout.dimension[5] :KOKKOS_INVALID_INDEX
-                 , dynrank > 5 ? layout.stride[5] : (0)
-                 , dynrank > 6 ? layout.dimension[6] :KOKKOS_INVALID_INDEX
-                 , dynrank > 6 ? layout.stride[6] : (0)
-                 , dynrank > 7 ? layout.dimension[7] :KOKKOS_INVALID_INDEX
-                 , dynrank > 7 ? layout.stride[7] : (0)
-                 );
-  }
+// Non-strided Layout
+template <typename Layout, typename iType>
+KOKKOS_INLINE_FUNCTION static
+    typename std::enable_if<(std::is_same<Layout, Kokkos::LayoutRight>::value ||
+                             std::is_same<Layout, Kokkos::LayoutLeft>::value) &&
+                                std::is_integral<iType>::value,
+                            Layout>::type
+    reconstructLayout(const Layout& layout, iType dynrank) {
+  return Layout(dynrank > 0 ? layout.dimension[0] : KOKKOS_INVALID_INDEX,
+                dynrank > 1 ? layout.dimension[1] : KOKKOS_INVALID_INDEX,
+                dynrank > 2 ? layout.dimension[2] : KOKKOS_INVALID_INDEX,
+                dynrank > 3 ? layout.dimension[3] : KOKKOS_INVALID_INDEX,
+                dynrank > 4 ? layout.dimension[4] : KOKKOS_INVALID_INDEX,
+                dynrank > 5 ? layout.dimension[5] : KOKKOS_INVALID_INDEX,
+                dynrank > 6 ? layout.dimension[6] : KOKKOS_INVALID_INDEX,
+                dynrank > 7 ? layout.dimension[7] : KOKKOS_INVALID_INDEX);
+}
 
+// LayoutStride
+template <typename Layout, typename iType>
+KOKKOS_INLINE_FUNCTION static typename std::enable_if<
+    (std::is_same<Layout, Kokkos::LayoutStride>::value) &&
+        std::is_integral<iType>::value,
+    Layout>::type
+reconstructLayout(const Layout& layout, iType dynrank) {
+  return Layout(dynrank > 0 ? layout.dimension[0] : KOKKOS_INVALID_INDEX,
+                dynrank > 0 ? layout.stride[0] : (0),
+                dynrank > 1 ? layout.dimension[1] : KOKKOS_INVALID_INDEX,
+                dynrank > 1 ? layout.stride[1] : (0),
+                dynrank > 2 ? layout.dimension[2] : KOKKOS_INVALID_INDEX,
+                dynrank > 2 ? layout.stride[2] : (0),
+                dynrank > 3 ? layout.dimension[3] : KOKKOS_INVALID_INDEX,
+                dynrank > 3 ? layout.stride[3] : (0),
+                dynrank > 4 ? layout.dimension[4] : KOKKOS_INVALID_INDEX,
+                dynrank > 4 ? layout.stride[4] : (0),
+                dynrank > 5 ? layout.dimension[5] : KOKKOS_INVALID_INDEX,
+                dynrank > 5 ? layout.stride[5] : (0),
+                dynrank > 6 ? layout.dimension[6] : KOKKOS_INVALID_INDEX,
+                dynrank > 6 ? layout.stride[6] : (0),
+                dynrank > 7 ? layout.dimension[7] : KOKKOS_INVALID_INDEX,
+                dynrank > 7 ? layout.stride[7] : (0));
+}
 
 /** \brief  Debug bounds-checking routines */
 // Enhanced debug checking - most infrastructure matches that of functions in
 // Kokkos_ViewMapping; additional checks for extra arguments beyond rank are 0
-template< unsigned ,  typename iType0 , class MapType >
-KOKKOS_INLINE_FUNCTION
-bool dyn_rank_view_verify_operator_bounds( const iType0 & , const MapType & )
-{ return true ; }
+template <unsigned, typename iType0, class MapType>
+KOKKOS_INLINE_FUNCTION bool dyn_rank_view_verify_operator_bounds(
+    const iType0&, const MapType&) {
+  return true;
+}
 
-template< unsigned R , typename iType0 ,  class MapType , typename iType1 , class ... Args >
-KOKKOS_INLINE_FUNCTION
-bool dyn_rank_view_verify_operator_bounds
-  ( const iType0  & rank
-  , const MapType & map
-  , const iType1  & i
-  , Args ... args
-  )
-{
-  if ( static_cast<iType0>(R) < rank ) {
-    return ( size_t(i) < map.extent(R) )
-       && dyn_rank_view_verify_operator_bounds<R+1>( rank , map , args ... );
-  }
-  else if ( i != 0 ) {
-    printf("DynRankView Debug Bounds Checking Error: at rank %u\n  Extra arguments beyond the rank must be zero \n",R);
-    return ( false )
-       && dyn_rank_view_verify_operator_bounds<R+1>( rank , map , args ... );
-  }
-  else {
-    return ( true )
-       && dyn_rank_view_verify_operator_bounds<R+1>( rank , map , args ... );
+template <unsigned R, typename iType0, class MapType, typename iType1,
+          class... Args>
+KOKKOS_INLINE_FUNCTION bool dyn_rank_view_verify_operator_bounds(
+    const iType0& rank, const MapType& map, const iType1& i, Args... args) {
+  if (static_cast<iType0>(R) < rank) {
+    return (size_t(i) < map.extent(R)) &&
+           dyn_rank_view_verify_operator_bounds<R + 1>(rank, map, args...);
+  } else if (i != 0) {
+    printf(
+        "DynRankView Debug Bounds Checking Error: at rank %u\n  Extra "
+        "arguments beyond the rank must be zero \n",
+        R);
+    return (false) &&
+           dyn_rank_view_verify_operator_bounds<R + 1>(rank, map, args...);
+  } else {
+    return (true) &&
+           dyn_rank_view_verify_operator_bounds<R + 1>(rank, map, args...);
   }
 }
 
-template< unsigned , class MapType >
-inline
-void dyn_rank_view_error_operator_bounds( char * , int , const MapType & )
-{}
+template <unsigned, class MapType>
+inline void dyn_rank_view_error_operator_bounds(char*, int, const MapType&) {}
 
-template< unsigned R , class MapType , class iType , class ... Args >
-inline
-void dyn_rank_view_error_operator_bounds
-  ( char * buf
-  , int len
-  , const MapType & map
-  , const iType   & i
-  , Args ... args
-  )
-{
-  const int n =
-    snprintf(buf,len," %ld < %ld %c"
-            , static_cast<unsigned long>(i)
-            , static_cast<unsigned long>( map.extent(R) )
-            , ( sizeof...(Args) ? ',' : ')' )
-            );
-  dyn_rank_view_error_operator_bounds<R+1>(buf+n,len-n,map,args...);
+template <unsigned R, class MapType, class iType, class... Args>
+inline void dyn_rank_view_error_operator_bounds(char* buf, int len,
+                                                const MapType& map,
+                                                const iType& i, Args... args) {
+  const int n = snprintf(
+      buf, len, " %ld < %ld %c", static_cast<unsigned long>(i),
+      static_cast<unsigned long>(map.extent(R)), (sizeof...(Args) ? ',' : ')'));
+  dyn_rank_view_error_operator_bounds<R + 1>(buf + n, len - n, map, args...);
 }
 
 // op_rank = rank of the operator version that was called
-template< typename MemorySpace
-        , typename iType0 , typename iType1 ,  class MapType , class ... Args >
-KOKKOS_INLINE_FUNCTION
-void dyn_rank_view_verify_operator_bounds
-  ( const iType0 & op_rank , const iType1 & rank
-  , const Kokkos::Impl::SharedAllocationTracker & tracker
-  , const MapType & map , Args ... args )
-{
-  if ( static_cast<iType0>(rank) > op_rank ) {
-    Kokkos::abort( "DynRankView Bounds Checking Error: Need at least rank arguments to the operator()" );
+template <typename MemorySpace, typename iType0, typename iType1, class MapType,
+          class... Args>
+KOKKOS_INLINE_FUNCTION void dyn_rank_view_verify_operator_bounds(
+    const iType0& op_rank, const iType1& rank,
+    const Kokkos::Impl::SharedAllocationTracker& tracker, const MapType& map,
+    Args... args) {
+  if (static_cast<iType0>(rank) > op_rank) {
+    Kokkos::abort(
+        "DynRankView Bounds Checking Error: Need at least rank arguments to "
+        "the operator()");
   }
 
-  if ( ! dyn_rank_view_verify_operator_bounds<0>( rank , map , args ... ) ) {
-#if defined( KOKKOS_ACTIVE_EXECUTION_MEMORY_SPACE_HOST )
+  if (!dyn_rank_view_verify_operator_bounds<0>(rank, map, args...)) {
+#if defined(KOKKOS_ACTIVE_EXECUTION_MEMORY_SPACE_HOST)
     enum { LEN = 1024 };
-    char buffer[ LEN ];
+    char buffer[LEN];
     const std::string label = tracker.template get_label<MemorySpace>();
-    int n = snprintf(buffer,LEN,"DynRankView bounds error of view %s (", label.c_str());
-    dyn_rank_view_error_operator_bounds<0>( buffer + n , LEN - n , map , args ... );
+    int n = snprintf(buffer, LEN, "DynRankView bounds error of view %s (",
+                     label.c_str());
+    dyn_rank_view_error_operator_bounds<0>(buffer + n, LEN - n, map, args...);
     Kokkos::Impl::throw_runtime_exception(std::string(buffer));
 #else
     Kokkos::abort("DynRankView bounds error");
@@ -312,86 +298,84 @@ void dyn_rank_view_verify_operator_bounds
   }
 }
 
-
 /** \brief  Assign compatible default mappings */
 struct ViewToDynRankViewTag {};
 
-} // namespace Impl
+}  // namespace Impl
 
 namespace Impl {
 
-template< class DstTraits , class SrcTraits >
-class ViewMapping< DstTraits , SrcTraits ,
-  typename std::enable_if<(
-    std::is_same< typename DstTraits::memory_space , typename SrcTraits::memory_space >::value
-    &&
-    std::is_same< typename DstTraits::specialize , void >::value
-    &&
-    std::is_same< typename SrcTraits::specialize , void >::value
-    &&
-    (
-      std::is_same< typename DstTraits::array_layout , typename SrcTraits::array_layout >::value
-      ||
-      (
-        (
-          std::is_same< typename DstTraits::array_layout , Kokkos::LayoutLeft >::value ||
-          std::is_same< typename DstTraits::array_layout , Kokkos::LayoutRight >::value ||
-          std::is_same< typename DstTraits::array_layout , Kokkos::LayoutStride >::value
-        )
-        &&
-        (
-          std::is_same< typename SrcTraits::array_layout , Kokkos::LayoutLeft >::value ||
-          std::is_same< typename SrcTraits::array_layout , Kokkos::LayoutRight >::value ||
-          std::is_same< typename SrcTraits::array_layout , Kokkos::LayoutStride >::value
-        )
-      )
-    )
-  ) , Kokkos::Impl::ViewToDynRankViewTag >::type >
-{
-private:
+template <class DstTraits, class SrcTraits>
+class ViewMapping<
+    DstTraits, SrcTraits,
+    typename std::enable_if<
+        (std::is_same<typename DstTraits::memory_space,
+                      typename SrcTraits::memory_space>::value &&
+         std::is_same<typename DstTraits::specialize, void>::value &&
+         std::is_same<typename SrcTraits::specialize, void>::value &&
+         (std::is_same<typename DstTraits::array_layout,
+                       typename SrcTraits::array_layout>::value ||
+          ((std::is_same<typename DstTraits::array_layout,
+                         Kokkos::LayoutLeft>::value ||
+            std::is_same<typename DstTraits::array_layout,
+                         Kokkos::LayoutRight>::value ||
+            std::is_same<typename DstTraits::array_layout,
+                         Kokkos::LayoutStride>::value) &&
+           (std::is_same<typename SrcTraits::array_layout,
+                         Kokkos::LayoutLeft>::value ||
+            std::is_same<typename SrcTraits::array_layout,
+                         Kokkos::LayoutRight>::value ||
+            std::is_same<typename SrcTraits::array_layout,
+                         Kokkos::LayoutStride>::value)))),
+        Kokkos::Impl::ViewToDynRankViewTag>::type> {
+ private:
+  enum {
+    is_assignable_value_type =
+        std::is_same<typename DstTraits::value_type,
+                     typename SrcTraits::value_type>::value ||
+        std::is_same<typename DstTraits::value_type,
+                     typename SrcTraits::const_value_type>::value
+  };
 
-  enum { is_assignable_value_type =
-    std::is_same< typename DstTraits::value_type
-                , typename SrcTraits::value_type >::value ||
-    std::is_same< typename DstTraits::value_type
-                , typename SrcTraits::const_value_type >::value };
+  enum {
+    is_assignable_layout =
+        std::is_same<typename DstTraits::array_layout,
+                     typename SrcTraits::array_layout>::value ||
+        std::is_same<typename DstTraits::array_layout,
+                     Kokkos::LayoutStride>::value
+  };
 
-  enum { is_assignable_layout =
-    std::is_same< typename DstTraits::array_layout
-                , typename SrcTraits::array_layout >::value ||
-    std::is_same< typename DstTraits::array_layout
-                , Kokkos::LayoutStride >::value
-    };
+ public:
+  enum { is_assignable = is_assignable_value_type && is_assignable_layout };
 
-public:
+  typedef ViewMapping<DstTraits, typename DstTraits::specialize> DstType;
+  typedef ViewMapping<SrcTraits, typename SrcTraits::specialize> SrcType;
 
-  enum { is_assignable = is_assignable_value_type &&
-                         is_assignable_layout };
+  template <typename DT, typename... DP, typename ST, typename... SP>
+  KOKKOS_INLINE_FUNCTION static void assign(
+      Kokkos::DynRankView<DT, DP...>& dst, const Kokkos::View<ST, SP...>& src) {
+    static_assert(
+        is_assignable_value_type,
+        "View assignment must have same value type or const = non-const");
 
-  typedef ViewMapping< DstTraits , typename DstTraits::specialize >  DstType ;
-  typedef ViewMapping< SrcTraits , typename SrcTraits::specialize >  SrcType ;
-
-  template < typename DT , typename ... DP , typename ST , typename ... SP >
-  KOKKOS_INLINE_FUNCTION
-  static void assign( Kokkos::DynRankView< DT , DP...> & dst ,  const Kokkos::View< ST , SP... > & src )
-    {
-      static_assert( is_assignable_value_type
-                   , "View assignment must have same value type or const = non-const" );
-
-      static_assert( is_assignable_layout
-                   , "View assignment must have compatible layout or have rank <= 1" );
+    static_assert(
+        is_assignable_layout,
+        "View assignment must have compatible layout or have rank <= 1");
 
     // Removed dimension checks...
 
-      typedef typename DstType::offset_type  dst_offset_type ;
-      dst.m_map.m_impl_offset = dst_offset_type(std::integral_constant<unsigned,0>() , src.layout() ); //Check this for integer input1 for padding, etc
-      dst.m_map.m_impl_handle = Kokkos::Impl::ViewDataHandle< DstTraits >::assign( src.m_map.m_impl_handle , src.m_track );
-      dst.m_track.assign( src.m_track , DstTraits::is_managed );
-      dst.m_rank = src.Rank ;
-    }
+    typedef typename DstType::offset_type dst_offset_type;
+    dst.m_map.m_impl_offset = dst_offset_type(
+        std::integral_constant<unsigned, 0>(),
+        src.layout());  // Check this for integer input1 for padding, etc
+    dst.m_map.m_impl_handle = Kokkos::Impl::ViewDataHandle<DstTraits>::assign(
+        src.m_map.m_impl_handle, src.m_track);
+    dst.m_track.assign(src.m_track, DstTraits::is_managed);
+    dst.m_rank = src.Rank;
+  }
 };
 
-} //end Impl
+}  // namespace Impl
 
 /* \class DynRankView
  * \brief Container that creates a Kokkos view with rank determined at runtime.
@@ -400,7 +384,8 @@ public:
  *   Changes from View
  *   1. The rank of the DynRankView is returned by the method rank()
  *   2. Max rank of a DynRankView is 7
- *   3. subview called with 'subview(...)' or 'subdynrankview(...)' (backward compatibility) 
+ *   3. subview called with 'subview(...)' or 'subdynrankview(...)' (backward
+ * compatibility)
  *   4. Every subview is returned with LayoutStride
  *   5. Copy and Copy-Assign View to DynRankView
  *   6. deep_copy between Views and DynRankViews
@@ -408,93 +393,99 @@ public:
  *
  */
 
-template< class > struct is_dyn_rank_view : public std::false_type {};
+template <class>
+struct is_dyn_rank_view : public std::false_type {};
 
-template< class D, class ... P >
-struct is_dyn_rank_view< Kokkos::DynRankView<D,P...> > : public std::true_type {};
+template <class D, class... P>
+struct is_dyn_rank_view<Kokkos::DynRankView<D, P...> > : public std::true_type {
+};
 
+template <typename DataType, class... Properties>
+class DynRankView : public ViewTraits<DataType, Properties...> {
+  static_assert(!std::is_array<DataType>::value &&
+                    !std::is_pointer<DataType>::value,
+                "Cannot template DynRankView with array or pointer datatype - "
+                "must be pod");
 
-template< typename DataType , class ... Properties >
-class DynRankView : public ViewTraits< DataType , Properties ... >
-{
-  static_assert( !std::is_array<DataType>::value && !std::is_pointer<DataType>::value , "Cannot template DynRankView with array or pointer datatype - must be pod" );
+ private:
+  template <class, class...>
+  friend class DynRankView;
+  template <class, class...>
+  friend class Kokkos::Impl::ViewMapping;
 
-private:
-  template < class , class ... > friend class DynRankView ;
-  template < class , class ... > friend class Kokkos::Impl::ViewMapping ;
+ public:
+  typedef ViewTraits<DataType, Properties...> drvtraits;
 
-public:
-  typedef ViewTraits< DataType , Properties ... > drvtraits ;
+  typedef View<DataType*******, Properties...> view_type;
 
-  typedef View< DataType******* , Properties...> view_type ;
+  typedef ViewTraits<DataType*******, Properties...> traits;
 
-  typedef ViewTraits< DataType******* , Properties ... > traits ;
+ private:
+  typedef Kokkos::Impl::ViewMapping<traits, typename traits::specialize>
+      map_type;
+  typedef Kokkos::Impl::SharedAllocationTracker track_type;
 
-
-private:
-  typedef Kokkos::Impl::ViewMapping< traits , typename traits::specialize > map_type ;
-  typedef Kokkos::Impl::SharedAllocationTracker      track_type ;
-
-  track_type  m_track ;
-  map_type    m_map ;
+  track_type m_track;
+  map_type m_map;
   unsigned m_rank;
 
-public:
+ public:
   KOKKOS_INLINE_FUNCTION
-  view_type & DownCast() const { return ( view_type & ) (*this); }
+  view_type& DownCast() const { return (view_type&)(*this); }
   KOKKOS_INLINE_FUNCTION
-  const view_type & ConstDownCast() const { return (const view_type & ) (*this); }
+  const view_type& ConstDownCast() const { return (const view_type&)(*this); }
 
-  //Types below - at least the HostMirror requires the value_type, NOT the rank 7 data_type of the traits
+  // Types below - at least the HostMirror requires the value_type, NOT the rank
+  // 7 data_type of the traits
 
   /** \brief  Compatible view of array of scalar types */
-  typedef DynRankView< typename drvtraits::scalar_array_type ,
-                typename drvtraits::array_layout ,
-                typename drvtraits::device_type ,
-                typename drvtraits::memory_traits >
-    array_type ;
+  typedef DynRankView<
+      typename drvtraits::scalar_array_type, typename drvtraits::array_layout,
+      typename drvtraits::device_type, typename drvtraits::memory_traits>
+      array_type;
 
   /** \brief  Compatible view of const data type */
-  typedef DynRankView< typename drvtraits::const_data_type ,
-                typename drvtraits::array_layout ,
-                typename drvtraits::device_type ,
-                typename drvtraits::memory_traits >
-    const_type ;
+  typedef DynRankView<
+      typename drvtraits::const_data_type, typename drvtraits::array_layout,
+      typename drvtraits::device_type, typename drvtraits::memory_traits>
+      const_type;
 
   /** \brief  Compatible view of non-const data type */
-  typedef DynRankView< typename drvtraits::non_const_data_type ,
-                typename drvtraits::array_layout ,
-                typename drvtraits::device_type ,
-                typename drvtraits::memory_traits >
-    non_const_type ;
+  typedef DynRankView<
+      typename drvtraits::non_const_data_type, typename drvtraits::array_layout,
+      typename drvtraits::device_type, typename drvtraits::memory_traits>
+      non_const_type;
 
   /** \brief  Compatible HostMirror view */
-  typedef DynRankView< typename drvtraits::non_const_data_type ,
-                typename drvtraits::array_layout ,
-                typename drvtraits::host_mirror_space >
-    HostMirror ;
-
+  typedef DynRankView<typename drvtraits::non_const_data_type,
+                      typename drvtraits::array_layout,
+                      typename drvtraits::host_mirror_space>
+      HostMirror;
 
   //----------------------------------------
   // Domain rank and extents
 
-//  enum { Rank = map_type::Rank }; //Will be dyn rank of 7 always, keep the enum?
+  //  enum { Rank = map_type::Rank }; //Will be dyn rank of 7 always, keep the
+  //  enum?
 
-  template< typename iType >
+  template <typename iType>
   KOKKOS_INLINE_FUNCTION constexpr
-  typename std::enable_if< std::is_integral<iType>::value , size_t >::type
-  extent( const iType & r ) const
-    { return m_map.extent(r); }
+      typename std::enable_if<std::is_integral<iType>::value, size_t>::type
+      extent(const iType& r) const {
+    return m_map.extent(r);
+  }
 
-  template< typename iType >
+  template <typename iType>
   KOKKOS_INLINE_FUNCTION constexpr
-  typename std::enable_if< std::is_integral<iType>::value , int >::type
-  extent_int( const iType & r ) const
-    { return static_cast<int>(m_map.extent(r)); }
+      typename std::enable_if<std::is_integral<iType>::value, int>::type
+      extent_int(const iType& r) const {
+    return static_cast<int>(m_map.extent(r));
+  }
 
-  KOKKOS_INLINE_FUNCTION constexpr
-  typename traits::array_layout layout() const
-    { return m_map.layout(); }
+  KOKKOS_INLINE_FUNCTION constexpr typename traits::array_layout layout()
+      const {
+    return m_map.layout();
+  }
 
   //----------------------------------------
   /*  Deprecate all 'dimension' functions in favor of
@@ -502,421 +493,572 @@ public:
    */
 
 #ifdef KOKKOS_ENABLE_DEPRECATED_CODE
-  template< typename iType >
+  template <typename iType>
   KOKKOS_INLINE_FUNCTION constexpr
-  typename std::enable_if< std::is_integral<iType>::value , size_t >::type
-  dimension( const iType & r ) const { return extent( r ); }
+      typename std::enable_if<std::is_integral<iType>::value, size_t>::type
+      dimension(const iType& r) const {
+    return extent(r);
+  }
 
-  KOKKOS_INLINE_FUNCTION constexpr size_t dimension_0() const { return m_map.dimension_0(); }
-  KOKKOS_INLINE_FUNCTION constexpr size_t dimension_1() const { return m_map.dimension_1(); }
-  KOKKOS_INLINE_FUNCTION constexpr size_t dimension_2() const { return m_map.dimension_2(); }
-  KOKKOS_INLINE_FUNCTION constexpr size_t dimension_3() const { return m_map.dimension_3(); }
-  KOKKOS_INLINE_FUNCTION constexpr size_t dimension_4() const { return m_map.dimension_4(); }
-  KOKKOS_INLINE_FUNCTION constexpr size_t dimension_5() const { return m_map.dimension_5(); }
-  KOKKOS_INLINE_FUNCTION constexpr size_t dimension_6() const { return m_map.dimension_6(); }
-  KOKKOS_INLINE_FUNCTION constexpr size_t dimension_7() const { return m_map.dimension_7(); }
+  KOKKOS_INLINE_FUNCTION constexpr size_t dimension_0() const {
+    return m_map.dimension_0();
+  }
+  KOKKOS_INLINE_FUNCTION constexpr size_t dimension_1() const {
+    return m_map.dimension_1();
+  }
+  KOKKOS_INLINE_FUNCTION constexpr size_t dimension_2() const {
+    return m_map.dimension_2();
+  }
+  KOKKOS_INLINE_FUNCTION constexpr size_t dimension_3() const {
+    return m_map.dimension_3();
+  }
+  KOKKOS_INLINE_FUNCTION constexpr size_t dimension_4() const {
+    return m_map.dimension_4();
+  }
+  KOKKOS_INLINE_FUNCTION constexpr size_t dimension_5() const {
+    return m_map.dimension_5();
+  }
+  KOKKOS_INLINE_FUNCTION constexpr size_t dimension_6() const {
+    return m_map.dimension_6();
+  }
+  KOKKOS_INLINE_FUNCTION constexpr size_t dimension_7() const {
+    return m_map.dimension_7();
+  }
 #endif
 
   //----------------------------------------
 
-  KOKKOS_INLINE_FUNCTION constexpr size_t size() const { return m_map.extent(0) *
-                                                                m_map.extent(1) *
-                                                                m_map.extent(2) *
-                                                                m_map.extent(3) *
-                                                                m_map.extent(4) *
-                                                                m_map.extent(5) *
-                                                                m_map.extent(6) *
-                                                                m_map.extent(7); }
+  KOKKOS_INLINE_FUNCTION constexpr size_t size() const {
+    return m_map.extent(0) * m_map.extent(1) * m_map.extent(2) *
+           m_map.extent(3) * m_map.extent(4) * m_map.extent(5) *
+           m_map.extent(6) * m_map.extent(7);
+  }
 
-  KOKKOS_INLINE_FUNCTION constexpr size_t stride_0() const { return m_map.stride_0(); }
-  KOKKOS_INLINE_FUNCTION constexpr size_t stride_1() const { return m_map.stride_1(); }
-  KOKKOS_INLINE_FUNCTION constexpr size_t stride_2() const { return m_map.stride_2(); }
-  KOKKOS_INLINE_FUNCTION constexpr size_t stride_3() const { return m_map.stride_3(); }
-  KOKKOS_INLINE_FUNCTION constexpr size_t stride_4() const { return m_map.stride_4(); }
-  KOKKOS_INLINE_FUNCTION constexpr size_t stride_5() const { return m_map.stride_5(); }
-  KOKKOS_INLINE_FUNCTION constexpr size_t stride_6() const { return m_map.stride_6(); }
-  KOKKOS_INLINE_FUNCTION constexpr size_t stride_7() const { return m_map.stride_7(); }
+  KOKKOS_INLINE_FUNCTION constexpr size_t stride_0() const {
+    return m_map.stride_0();
+  }
+  KOKKOS_INLINE_FUNCTION constexpr size_t stride_1() const {
+    return m_map.stride_1();
+  }
+  KOKKOS_INLINE_FUNCTION constexpr size_t stride_2() const {
+    return m_map.stride_2();
+  }
+  KOKKOS_INLINE_FUNCTION constexpr size_t stride_3() const {
+    return m_map.stride_3();
+  }
+  KOKKOS_INLINE_FUNCTION constexpr size_t stride_4() const {
+    return m_map.stride_4();
+  }
+  KOKKOS_INLINE_FUNCTION constexpr size_t stride_5() const {
+    return m_map.stride_5();
+  }
+  KOKKOS_INLINE_FUNCTION constexpr size_t stride_6() const {
+    return m_map.stride_6();
+  }
+  KOKKOS_INLINE_FUNCTION constexpr size_t stride_7() const {
+    return m_map.stride_7();
+  }
 
-  template< typename iType >
-  KOKKOS_INLINE_FUNCTION void stride( iType * const s ) const { m_map.stride(s); }
+  template <typename iType>
+  KOKKOS_INLINE_FUNCTION void stride(iType* const s) const {
+    m_map.stride(s);
+  }
 
   //----------------------------------------
   // Range span is the span which contains all members.
 
-  typedef typename map_type::reference_type  reference_type ;
-  typedef typename map_type::pointer_type    pointer_type ;
+  typedef typename map_type::reference_type reference_type;
+  typedef typename map_type::pointer_type pointer_type;
 
-  enum { reference_type_is_lvalue_reference = std::is_lvalue_reference< reference_type >::value };
+  enum {
+    reference_type_is_lvalue_reference =
+        std::is_lvalue_reference<reference_type>::value
+  };
 
   KOKKOS_INLINE_FUNCTION constexpr size_t span() const { return m_map.span(); }
 #ifdef KOKKOS_ENABLE_DEPRECATED_CODE
   // Deprecated, use 'span()' instead
-  KOKKOS_INLINE_FUNCTION constexpr size_t capacity() const { return m_map.span(); }
+  KOKKOS_INLINE_FUNCTION constexpr size_t capacity() const {
+    return m_map.span();
+  }
 #endif
-  KOKKOS_INLINE_FUNCTION constexpr bool   span_is_contiguous() const { return m_map.span_is_contiguous(); }
-  KOKKOS_INLINE_FUNCTION constexpr pointer_type data() const { return m_map.data(); }
+  KOKKOS_INLINE_FUNCTION constexpr bool span_is_contiguous() const {
+    return m_map.span_is_contiguous();
+  }
+  KOKKOS_INLINE_FUNCTION constexpr pointer_type data() const {
+    return m_map.data();
+  }
 
 #ifdef KOKKOS_ENABLE_DEPRECATED_CODE
   // Deprecated, use 'span_is_contigous()' instead
-  KOKKOS_INLINE_FUNCTION constexpr bool   is_contiguous() const { return m_map.span_is_contiguous(); }
+  KOKKOS_INLINE_FUNCTION constexpr bool is_contiguous() const {
+    return m_map.span_is_contiguous();
+  }
   // Deprecated, use 'data()' instead
-  KOKKOS_INLINE_FUNCTION constexpr pointer_type ptr_on_device() const { return m_map.data(); }
+  KOKKOS_INLINE_FUNCTION constexpr pointer_type ptr_on_device() const {
+    return m_map.data();
+  }
 #endif
 
   //----------------------------------------
   // Allow specializations to query their specialized map
 #ifdef KOKKOS_ENABLE_DEPRECATED_CODE
   KOKKOS_INLINE_FUNCTION
-  const Kokkos::Impl::ViewMapping< traits , typename traits::specialize > &
-  implementation_map() const { return m_map ; }
+  const Kokkos::Impl::ViewMapping<traits, typename traits::specialize>&
+  implementation_map() const {
+    return m_map;
+  }
 #endif
   KOKKOS_INLINE_FUNCTION
-  const Kokkos::Impl::ViewMapping< traits , typename traits::specialize > &
-  impl_map() const { return m_map ; }
+  const Kokkos::Impl::ViewMapping<traits, typename traits::specialize>&
+  impl_map() const {
+    return m_map;
+  }
 
   //----------------------------------------
 
-private:
-
+ private:
   enum {
-    is_layout_left = std::is_same< typename traits::array_layout
-                                  , Kokkos::LayoutLeft >::value ,
+    is_layout_left =
+        std::is_same<typename traits::array_layout, Kokkos::LayoutLeft>::value,
 
-    is_layout_right = std::is_same< typename traits::array_layout
-                                  , Kokkos::LayoutRight >::value ,
+    is_layout_right =
+        std::is_same<typename traits::array_layout, Kokkos::LayoutRight>::value,
 
-    is_layout_stride = std::is_same< typename traits::array_layout
-                                   , Kokkos::LayoutStride >::value ,
+    is_layout_stride = std::is_same<typename traits::array_layout,
+                                    Kokkos::LayoutStride>::value,
 
-    is_default_map =
-      std::is_same< typename traits::specialize , void >::value &&
-      ( is_layout_left || is_layout_right || is_layout_stride )
+    is_default_map = std::is_same<typename traits::specialize, void>::value &&
+                     (is_layout_left || is_layout_right || is_layout_stride)
   };
 
-  template< class Space , bool = Kokkos::Impl::MemorySpaceAccess< Space , typename traits::memory_space >::accessible > struct verify_space
-    { KOKKOS_FORCEINLINE_FUNCTION static void check() {} };
+  template <class Space, bool = Kokkos::Impl::MemorySpaceAccess<
+                             Space, typename traits::memory_space>::accessible>
+  struct verify_space {
+    KOKKOS_FORCEINLINE_FUNCTION static void check() {}
+  };
 
-  template< class Space > struct verify_space<Space,false>
-    { KOKKOS_FORCEINLINE_FUNCTION static void check()
-        { Kokkos::abort("Kokkos::DynRankView ERROR: attempt to access inaccessible memory space"); };
+  template <class Space>
+  struct verify_space<Space, false> {
+    KOKKOS_FORCEINLINE_FUNCTION static void check() {
+      Kokkos::abort(
+          "Kokkos::DynRankView ERROR: attempt to access inaccessible memory "
+          "space");
     };
+  };
 
 // Bounds checking macros
-#if defined( KOKKOS_ENABLE_DEBUG_BOUNDS_CHECK )
+#if defined(KOKKOS_ENABLE_DEBUG_BOUNDS_CHECK)
 
 // rank of the calling operator - included as first argument in ARG
-#define KOKKOS_IMPL_VIEW_OPERATOR_VERIFY( ARG ) \
-  DynRankView::template verify_space< Kokkos::Impl::ActiveExecutionMemorySpace >::check(); \
-  Kokkos::Impl::dyn_rank_view_verify_operator_bounds< typename traits::memory_space > ARG ;
+#define KOKKOS_IMPL_VIEW_OPERATOR_VERIFY(ARG)             \
+  DynRankView::template verify_space<                     \
+      Kokkos::Impl::ActiveExecutionMemorySpace>::check(); \
+  Kokkos::Impl::dyn_rank_view_verify_operator_bounds<     \
+      typename traits::memory_space>                      \
+      ARG;
 
 #else
 
-#define KOKKOS_IMPL_VIEW_OPERATOR_VERIFY( ARG ) \
-  DynRankView::template verify_space< Kokkos::Impl::ActiveExecutionMemorySpace >::check();
+#define KOKKOS_IMPL_VIEW_OPERATOR_VERIFY(ARG) \
+  DynRankView::template verify_space<         \
+      Kokkos::Impl::ActiveExecutionMemorySpace>::check();
 
 #endif
 
-public:
-
+ public:
   KOKKOS_INLINE_FUNCTION
   constexpr unsigned rank() const { return m_rank; }
 
-
-  //operators ()
+  // operators ()
   // Rank 0
   KOKKOS_INLINE_FUNCTION
-  reference_type operator()() const
-    {
-      KOKKOS_IMPL_VIEW_OPERATOR_VERIFY( (0 , this->rank(), m_track, m_map) )
-      return impl_map().reference();
-      //return m_map.reference(0,0,0,0,0,0,0);
-    }
+  reference_type operator()() const {
+    KOKKOS_IMPL_VIEW_OPERATOR_VERIFY((0, this->rank(), m_track, m_map))
+    return impl_map().reference();
+    // return m_map.reference(0,0,0,0,0,0,0);
+  }
 
   // Rank 1
-  // This assumes a contiguous underlying memory (i.e. no padding, no striding...)
-  template< typename iType >
-  KOKKOS_INLINE_FUNCTION
-  typename std::enable_if< std::is_same<typename drvtraits::value_type, typename drvtraits::scalar_array_type>::value && std::is_integral<iType>::value, reference_type>::type
-  operator[](const iType & i0) const
-    {
-      //Phalanx is violating this, since they use the operator to access ALL elements in the allocation
-      //KOKKOS_IMPL_VIEW_OPERATOR_VERIFY( (1 , this->rank(), m_track, m_map) )
-      return data()[i0];
-    }
+  // This assumes a contiguous underlying memory (i.e. no padding, no
+  // striding...)
+  template <typename iType>
+  KOKKOS_INLINE_FUNCTION typename std::enable_if<
+      std::is_same<typename drvtraits::value_type,
+                   typename drvtraits::scalar_array_type>::value &&
+          std::is_integral<iType>::value,
+      reference_type>::type
+  operator[](const iType& i0) const {
+    // Phalanx is violating this, since they use the operator to access ALL
+    // elements in the allocation KOKKOS_IMPL_VIEW_OPERATOR_VERIFY( (1 ,
+    // this->rank(), m_track, m_map) )
+    return data()[i0];
+  }
 
-  // This assumes a contiguous underlying memory (i.e. no padding, no striding...
-  // AND a Trilinos/Sacado scalar type )
-  template< typename iType >
-  KOKKOS_INLINE_FUNCTION
-  typename std::enable_if< !std::is_same<typename drvtraits::value_type, typename drvtraits::scalar_array_type>::value && std::is_integral<iType>::value, reference_type>::type
-  operator[](const iType & i0) const
-    {
-//      auto map = impl_map();
-      const size_t dim_scalar = m_map.dimension_scalar();
-      const size_t bytes = this->span() / dim_scalar;
+  // This assumes a contiguous underlying memory (i.e. no padding, no
+  // striding... AND a Trilinos/Sacado scalar type )
+  template <typename iType>
+  KOKKOS_INLINE_FUNCTION typename std::enable_if<
+      !std::is_same<typename drvtraits::value_type,
+                    typename drvtraits::scalar_array_type>::value &&
+          std::is_integral<iType>::value,
+      reference_type>::type
+  operator[](const iType& i0) const {
+    //      auto map = impl_map();
+    const size_t dim_scalar = m_map.dimension_scalar();
+    const size_t bytes      = this->span() / dim_scalar;
 
-      typedef Kokkos::View<DataType*, typename traits::array_layout, typename traits::device_type, Kokkos::MemoryTraits<traits::memory_traits::is_unmanaged | traits::memory_traits::is_random_access | traits::memory_traits::is_atomic> > tmp_view_type;
-      tmp_view_type rankone_view(this->data(), bytes, dim_scalar);
-      return rankone_view(i0);
-    }
+    typedef Kokkos::View<
+        DataType*, typename traits::array_layout, typename traits::device_type,
+        Kokkos::MemoryTraits<traits::memory_traits::is_unmanaged |
+                             traits::memory_traits::is_random_access |
+                             traits::memory_traits::is_atomic> >
+        tmp_view_type;
+    tmp_view_type rankone_view(this->data(), bytes, dim_scalar);
+    return rankone_view(i0);
+  }
 
   // Rank 1 parenthesis
-  template< typename iType >
-  KOKKOS_INLINE_FUNCTION
-  typename std::enable_if< (std::is_same<typename traits::specialize , void>::value && std::is_integral<iType>::value), reference_type>::type
-  operator()(const iType & i0 ) const
-    {
-      KOKKOS_IMPL_VIEW_OPERATOR_VERIFY( (1 , this->rank(), m_track, m_map, i0) )
-      return m_map.reference(i0);
-    }
+  template <typename iType>
+  KOKKOS_INLINE_FUNCTION typename std::enable_if<
+      (std::is_same<typename traits::specialize, void>::value &&
+       std::is_integral<iType>::value),
+      reference_type>::type
+  operator()(const iType& i0) const {
+    KOKKOS_IMPL_VIEW_OPERATOR_VERIFY((1, this->rank(), m_track, m_map, i0))
+    return m_map.reference(i0);
+  }
 
-  template< typename iType >
-  KOKKOS_INLINE_FUNCTION
-  typename std::enable_if< !(std::is_same<typename traits::specialize , void>::value && std::is_integral<iType>::value), reference_type>::type
-  operator()(const iType & i0 ) const
-    {
-      KOKKOS_IMPL_VIEW_OPERATOR_VERIFY( (1 , this->rank(), m_track, m_map, i0) )
-      return m_map.reference(i0,0,0,0,0,0,0);
-    }
+  template <typename iType>
+  KOKKOS_INLINE_FUNCTION typename std::enable_if<
+      !(std::is_same<typename traits::specialize, void>::value &&
+        std::is_integral<iType>::value),
+      reference_type>::type
+  operator()(const iType& i0) const {
+    KOKKOS_IMPL_VIEW_OPERATOR_VERIFY((1, this->rank(), m_track, m_map, i0))
+    return m_map.reference(i0, 0, 0, 0, 0, 0, 0);
+  }
 
   // Rank 2
-  template< typename iType0 , typename iType1 >
-  KOKKOS_INLINE_FUNCTION
-  typename std::enable_if< (std::is_same<typename traits::specialize , void>::value && std::is_integral<iType0>::value  && std::is_integral<iType1>::value), reference_type>::type
-  operator()(const iType0 & i0 , const iType1 & i1 ) const
-    {
-      KOKKOS_IMPL_VIEW_OPERATOR_VERIFY( (2 , this->rank(), m_track, m_map, i0, i1) )
-      return m_map.reference(i0,i1);
-    }
+  template <typename iType0, typename iType1>
+  KOKKOS_INLINE_FUNCTION typename std::enable_if<
+      (std::is_same<typename traits::specialize, void>::value &&
+       std::is_integral<iType0>::value && std::is_integral<iType1>::value),
+      reference_type>::type
+  operator()(const iType0& i0, const iType1& i1) const {
+    KOKKOS_IMPL_VIEW_OPERATOR_VERIFY((2, this->rank(), m_track, m_map, i0, i1))
+    return m_map.reference(i0, i1);
+  }
 
-  template< typename iType0 , typename iType1 >
-  KOKKOS_INLINE_FUNCTION
-  typename std::enable_if< !(std::is_same<typename drvtraits::specialize , void>::value && std::is_integral<iType0>::value), reference_type>::type
-  operator()(const iType0 & i0 , const iType1 & i1 ) const
-    {
-      KOKKOS_IMPL_VIEW_OPERATOR_VERIFY( (2 , this->rank(), m_track, m_map, i0, i1) )
-      return m_map.reference(i0,i1,0,0,0,0,0);
-    }
+  template <typename iType0, typename iType1>
+  KOKKOS_INLINE_FUNCTION typename std::enable_if<
+      !(std::is_same<typename drvtraits::specialize, void>::value &&
+        std::is_integral<iType0>::value),
+      reference_type>::type
+  operator()(const iType0& i0, const iType1& i1) const {
+    KOKKOS_IMPL_VIEW_OPERATOR_VERIFY((2, this->rank(), m_track, m_map, i0, i1))
+    return m_map.reference(i0, i1, 0, 0, 0, 0, 0);
+  }
 
   // Rank 3
-  template< typename iType0 , typename iType1 , typename iType2 >
-  KOKKOS_INLINE_FUNCTION
-  typename std::enable_if< (std::is_same<typename traits::specialize , void>::value && std::is_integral<iType0>::value  && std::is_integral<iType1>::value && std::is_integral<iType2>::value), reference_type>::type
-  operator()(const iType0 & i0 , const iType1 & i1 , const iType2 & i2 ) const
-    {
-      KOKKOS_IMPL_VIEW_OPERATOR_VERIFY( (3 , this->rank(), m_track, m_map, i0, i1, i2) )
-      return m_map.reference(i0,i1,i2);
-    }
+  template <typename iType0, typename iType1, typename iType2>
+  KOKKOS_INLINE_FUNCTION typename std::enable_if<
+      (std::is_same<typename traits::specialize, void>::value &&
+       std::is_integral<iType0>::value && std::is_integral<iType1>::value &&
+       std::is_integral<iType2>::value),
+      reference_type>::type
+  operator()(const iType0& i0, const iType1& i1, const iType2& i2) const {
+    KOKKOS_IMPL_VIEW_OPERATOR_VERIFY(
+        (3, this->rank(), m_track, m_map, i0, i1, i2))
+    return m_map.reference(i0, i1, i2);
+  }
 
-  template< typename iType0 , typename iType1 , typename iType2 >
-  KOKKOS_INLINE_FUNCTION
-  typename std::enable_if< !(std::is_same<typename drvtraits::specialize , void>::value && std::is_integral<iType0>::value), reference_type>::type
-  operator()(const iType0 & i0 , const iType1 & i1 , const iType2 & i2 ) const
-    {
-      KOKKOS_IMPL_VIEW_OPERATOR_VERIFY( (3 , this->rank(), m_track, m_map, i0, i1, i2) )
-      return m_map.reference(i0,i1,i2,0,0,0,0);
-    }
+  template <typename iType0, typename iType1, typename iType2>
+  KOKKOS_INLINE_FUNCTION typename std::enable_if<
+      !(std::is_same<typename drvtraits::specialize, void>::value &&
+        std::is_integral<iType0>::value),
+      reference_type>::type
+  operator()(const iType0& i0, const iType1& i1, const iType2& i2) const {
+    KOKKOS_IMPL_VIEW_OPERATOR_VERIFY(
+        (3, this->rank(), m_track, m_map, i0, i1, i2))
+    return m_map.reference(i0, i1, i2, 0, 0, 0, 0);
+  }
 
   // Rank 4
-  template< typename iType0 , typename iType1 , typename iType2 , typename iType3 >
-  KOKKOS_INLINE_FUNCTION
-  typename std::enable_if< (std::is_same<typename traits::specialize , void>::value && std::is_integral<iType0>::value  && std::is_integral<iType1>::value && std::is_integral<iType2>::value && std::is_integral<iType3>::value), reference_type>::type
-  operator()(const iType0 & i0 , const iType1 & i1 , const iType2 & i2 , const iType3 & i3 ) const
-    {
-      KOKKOS_IMPL_VIEW_OPERATOR_VERIFY( (4 , this->rank(), m_track, m_map, i0, i1, i2, i3) )
-      return m_map.reference(i0,i1,i2,i3);
-    }
+  template <typename iType0, typename iType1, typename iType2, typename iType3>
+  KOKKOS_INLINE_FUNCTION typename std::enable_if<
+      (std::is_same<typename traits::specialize, void>::value &&
+       std::is_integral<iType0>::value && std::is_integral<iType1>::value &&
+       std::is_integral<iType2>::value && std::is_integral<iType3>::value),
+      reference_type>::type
+  operator()(const iType0& i0, const iType1& i1, const iType2& i2,
+             const iType3& i3) const {
+    KOKKOS_IMPL_VIEW_OPERATOR_VERIFY(
+        (4, this->rank(), m_track, m_map, i0, i1, i2, i3))
+    return m_map.reference(i0, i1, i2, i3);
+  }
 
-  template< typename iType0 , typename iType1 , typename iType2 , typename iType3 >
-  KOKKOS_INLINE_FUNCTION
-  typename std::enable_if< !(std::is_same<typename drvtraits::specialize , void>::value && std::is_integral<iType0>::value), reference_type>::type
-  operator()(const iType0 & i0 , const iType1 & i1 , const iType2 & i2 , const iType3 & i3 ) const
-    {
-      KOKKOS_IMPL_VIEW_OPERATOR_VERIFY( (4 , this->rank(), m_track, m_map, i0, i1, i2, i3) )
-      return m_map.reference(i0,i1,i2,i3,0,0,0);
-    }
+  template <typename iType0, typename iType1, typename iType2, typename iType3>
+  KOKKOS_INLINE_FUNCTION typename std::enable_if<
+      !(std::is_same<typename drvtraits::specialize, void>::value &&
+        std::is_integral<iType0>::value),
+      reference_type>::type
+  operator()(const iType0& i0, const iType1& i1, const iType2& i2,
+             const iType3& i3) const {
+    KOKKOS_IMPL_VIEW_OPERATOR_VERIFY(
+        (4, this->rank(), m_track, m_map, i0, i1, i2, i3))
+    return m_map.reference(i0, i1, i2, i3, 0, 0, 0);
+  }
 
   // Rank 5
-  template< typename iType0 , typename iType1 , typename iType2 , typename iType3, typename iType4 >
-  KOKKOS_INLINE_FUNCTION
-  typename std::enable_if< (std::is_same<typename traits::specialize , void>::value && std::is_integral<iType0>::value  && std::is_integral<iType1>::value && std::is_integral<iType2>::value && std::is_integral<iType3>::value && std::is_integral<iType4>::value), reference_type>::type
-  operator()(const iType0 & i0 , const iType1 & i1 , const iType2 & i2 , const iType3 & i3 , const iType4 & i4 ) const
-    {
-      KOKKOS_IMPL_VIEW_OPERATOR_VERIFY( (5 , this->rank(), m_track, m_map, i0, i1, i2, i3, i4) )
-      return m_map.reference(i0,i1,i2,i3,i4);
-    }
+  template <typename iType0, typename iType1, typename iType2, typename iType3,
+            typename iType4>
+  KOKKOS_INLINE_FUNCTION typename std::enable_if<
+      (std::is_same<typename traits::specialize, void>::value &&
+       std::is_integral<iType0>::value && std::is_integral<iType1>::value &&
+       std::is_integral<iType2>::value && std::is_integral<iType3>::value &&
+       std::is_integral<iType4>::value),
+      reference_type>::type
+  operator()(const iType0& i0, const iType1& i1, const iType2& i2,
+             const iType3& i3, const iType4& i4) const {
+    KOKKOS_IMPL_VIEW_OPERATOR_VERIFY(
+        (5, this->rank(), m_track, m_map, i0, i1, i2, i3, i4))
+    return m_map.reference(i0, i1, i2, i3, i4);
+  }
 
-  template< typename iType0 , typename iType1 , typename iType2 , typename iType3, typename iType4 >
-  KOKKOS_INLINE_FUNCTION
-  typename std::enable_if< !(std::is_same<typename drvtraits::specialize , void>::value && std::is_integral<iType0>::value), reference_type>::type
-  operator()(const iType0 & i0 , const iType1 & i1 , const iType2 & i2 , const iType3 & i3 , const iType4 & i4 ) const
-    {
-      KOKKOS_IMPL_VIEW_OPERATOR_VERIFY( (5 , this->rank(), m_track, m_map, i0, i1, i2, i3, i4) )
-      return m_map.reference(i0,i1,i2,i3,i4,0,0);
-    }
+  template <typename iType0, typename iType1, typename iType2, typename iType3,
+            typename iType4>
+  KOKKOS_INLINE_FUNCTION typename std::enable_if<
+      !(std::is_same<typename drvtraits::specialize, void>::value &&
+        std::is_integral<iType0>::value),
+      reference_type>::type
+  operator()(const iType0& i0, const iType1& i1, const iType2& i2,
+             const iType3& i3, const iType4& i4) const {
+    KOKKOS_IMPL_VIEW_OPERATOR_VERIFY(
+        (5, this->rank(), m_track, m_map, i0, i1, i2, i3, i4))
+    return m_map.reference(i0, i1, i2, i3, i4, 0, 0);
+  }
 
   // Rank 6
-  template< typename iType0 , typename iType1 , typename iType2 , typename iType3, typename iType4 , typename iType5 >
-  KOKKOS_INLINE_FUNCTION
-  typename std::enable_if< (std::is_same<typename traits::specialize , void>::value && std::is_integral<iType0>::value  && std::is_integral<iType1>::value && std::is_integral<iType2>::value && std::is_integral<iType3>::value && std::is_integral<iType4>::value && std::is_integral<iType5>::value), reference_type>::type
-  operator()(const iType0 & i0 , const iType1 & i1 , const iType2 & i2 , const iType3 & i3 , const iType4 & i4 , const iType5 & i5 ) const
-    {
-      KOKKOS_IMPL_VIEW_OPERATOR_VERIFY( (6 , this->rank(), m_track, m_map, i0, i1, i2, i3, i4, i5) )
-      return m_map.reference(i0,i1,i2,i3,i4,i5);
-    }
+  template <typename iType0, typename iType1, typename iType2, typename iType3,
+            typename iType4, typename iType5>
+  KOKKOS_INLINE_FUNCTION typename std::enable_if<
+      (std::is_same<typename traits::specialize, void>::value &&
+       std::is_integral<iType0>::value && std::is_integral<iType1>::value &&
+       std::is_integral<iType2>::value && std::is_integral<iType3>::value &&
+       std::is_integral<iType4>::value && std::is_integral<iType5>::value),
+      reference_type>::type
+  operator()(const iType0& i0, const iType1& i1, const iType2& i2,
+             const iType3& i3, const iType4& i4, const iType5& i5) const {
+    KOKKOS_IMPL_VIEW_OPERATOR_VERIFY(
+        (6, this->rank(), m_track, m_map, i0, i1, i2, i3, i4, i5))
+    return m_map.reference(i0, i1, i2, i3, i4, i5);
+  }
 
-  template< typename iType0 , typename iType1 , typename iType2 , typename iType3, typename iType4 , typename iType5 >
-  KOKKOS_INLINE_FUNCTION
-  typename std::enable_if< !(std::is_same<typename drvtraits::specialize , void>::value && std::is_integral<iType0>::value), reference_type>::type
-  operator()(const iType0 & i0 , const iType1 & i1 , const iType2 & i2 , const iType3 & i3 , const iType4 & i4 , const iType5 & i5 ) const
-    {
-      KOKKOS_IMPL_VIEW_OPERATOR_VERIFY( (6 , this->rank(), m_track, m_map, i0, i1, i2, i3, i4, i5) )
-      return m_map.reference(i0,i1,i2,i3,i4,i5,0);
-    }
+  template <typename iType0, typename iType1, typename iType2, typename iType3,
+            typename iType4, typename iType5>
+  KOKKOS_INLINE_FUNCTION typename std::enable_if<
+      !(std::is_same<typename drvtraits::specialize, void>::value &&
+        std::is_integral<iType0>::value),
+      reference_type>::type
+  operator()(const iType0& i0, const iType1& i1, const iType2& i2,
+             const iType3& i3, const iType4& i4, const iType5& i5) const {
+    KOKKOS_IMPL_VIEW_OPERATOR_VERIFY(
+        (6, this->rank(), m_track, m_map, i0, i1, i2, i3, i4, i5))
+    return m_map.reference(i0, i1, i2, i3, i4, i5, 0);
+  }
 
   // Rank 7
-  template< typename iType0 , typename iType1 , typename iType2 , typename iType3, typename iType4 , typename iType5 , typename iType6 >
-  KOKKOS_INLINE_FUNCTION
-  typename std::enable_if< (std::is_integral<iType0>::value  && std::is_integral<iType1>::value && std::is_integral<iType2>::value && std::is_integral<iType3>::value && std::is_integral<iType4>::value && std::is_integral<iType5>::value && std::is_integral<iType6>::value), reference_type>::type
-  operator()(const iType0 & i0 , const iType1 & i1 , const iType2 & i2 , const iType3 & i3 , const iType4 & i4 , const iType5 & i5 , const iType6 & i6 ) const
-    {
-      KOKKOS_IMPL_VIEW_OPERATOR_VERIFY( (7 , this->rank(), m_track, m_map, i0, i1, i2, i3, i4, i5, i6) )
-      return m_map.reference(i0,i1,i2,i3,i4,i5,i6);
-    }
+  template <typename iType0, typename iType1, typename iType2, typename iType3,
+            typename iType4, typename iType5, typename iType6>
+  KOKKOS_INLINE_FUNCTION typename std::enable_if<
+      (std::is_integral<iType0>::value && std::is_integral<iType1>::value &&
+       std::is_integral<iType2>::value && std::is_integral<iType3>::value &&
+       std::is_integral<iType4>::value && std::is_integral<iType5>::value &&
+       std::is_integral<iType6>::value),
+      reference_type>::type
+  operator()(const iType0& i0, const iType1& i1, const iType2& i2,
+             const iType3& i3, const iType4& i4, const iType5& i5,
+             const iType6& i6) const {
+    KOKKOS_IMPL_VIEW_OPERATOR_VERIFY(
+        (7, this->rank(), m_track, m_map, i0, i1, i2, i3, i4, i5, i6))
+    return m_map.reference(i0, i1, i2, i3, i4, i5, i6);
+  }
 
   // Rank 0
   KOKKOS_INLINE_FUNCTION
-  reference_type access() const
-    {
-      KOKKOS_IMPL_VIEW_OPERATOR_VERIFY( (0 , this->rank(), m_track, m_map) )
-      return impl_map().reference();
-      //return m_map.reference(0,0,0,0,0,0,0);
-    }
+  reference_type access() const {
+    KOKKOS_IMPL_VIEW_OPERATOR_VERIFY((0, this->rank(), m_track, m_map))
+    return impl_map().reference();
+    // return m_map.reference(0,0,0,0,0,0,0);
+  }
 
   // Rank 1
-   // Rank 1 parenthesis
-  template< typename iType >
-  KOKKOS_INLINE_FUNCTION
-  typename std::enable_if< (std::is_same<typename traits::specialize , void>::value && std::is_integral<iType>::value), reference_type>::type
-  access(const iType & i0 ) const
-    {
-      KOKKOS_IMPL_VIEW_OPERATOR_VERIFY( (1 , this->rank(), m_track, m_map, i0) )
-      return m_map.reference(i0);
-    }
+  // Rank 1 parenthesis
+  template <typename iType>
+  KOKKOS_INLINE_FUNCTION typename std::enable_if<
+      (std::is_same<typename traits::specialize, void>::value &&
+       std::is_integral<iType>::value),
+      reference_type>::type
+  access(const iType& i0) const {
+    KOKKOS_IMPL_VIEW_OPERATOR_VERIFY((1, this->rank(), m_track, m_map, i0))
+    return m_map.reference(i0);
+  }
 
-  template< typename iType >
-  KOKKOS_INLINE_FUNCTION
-  typename std::enable_if< !(std::is_same<typename traits::specialize , void>::value && std::is_integral<iType>::value), reference_type>::type
-  access(const iType & i0 ) const
-    {
-      KOKKOS_IMPL_VIEW_OPERATOR_VERIFY( (1 , this->rank(), m_track, m_map, i0) )
-      return m_map.reference(i0,0,0,0,0,0,0);
-    }
+  template <typename iType>
+  KOKKOS_INLINE_FUNCTION typename std::enable_if<
+      !(std::is_same<typename traits::specialize, void>::value &&
+        std::is_integral<iType>::value),
+      reference_type>::type
+  access(const iType& i0) const {
+    KOKKOS_IMPL_VIEW_OPERATOR_VERIFY((1, this->rank(), m_track, m_map, i0))
+    return m_map.reference(i0, 0, 0, 0, 0, 0, 0);
+  }
 
   // Rank 2
-  template< typename iType0 , typename iType1 >
-  KOKKOS_INLINE_FUNCTION
-  typename std::enable_if< (std::is_same<typename traits::specialize , void>::value && std::is_integral<iType0>::value  && std::is_integral<iType1>::value), reference_type>::type
- access(const iType0 & i0 , const iType1 & i1 ) const
-    {
-      KOKKOS_IMPL_VIEW_OPERATOR_VERIFY( (2 , this->rank(), m_track, m_map, i0, i1) )
-      return m_map.reference(i0,i1);
-    }
+  template <typename iType0, typename iType1>
+  KOKKOS_INLINE_FUNCTION typename std::enable_if<
+      (std::is_same<typename traits::specialize, void>::value &&
+       std::is_integral<iType0>::value && std::is_integral<iType1>::value),
+      reference_type>::type
+  access(const iType0& i0, const iType1& i1) const {
+    KOKKOS_IMPL_VIEW_OPERATOR_VERIFY((2, this->rank(), m_track, m_map, i0, i1))
+    return m_map.reference(i0, i1);
+  }
 
-  template< typename iType0 , typename iType1 >
-  KOKKOS_INLINE_FUNCTION
-  typename std::enable_if< !(std::is_same<typename drvtraits::specialize , void>::value && std::is_integral<iType0>::value), reference_type>::type
-  access(const iType0 & i0 , const iType1 & i1 ) const
-    {
-      KOKKOS_IMPL_VIEW_OPERATOR_VERIFY( (2 , this->rank(), m_track, m_map, i0, i1) )
-      return m_map.reference(i0,i1,0,0,0,0,0);
-    }
+  template <typename iType0, typename iType1>
+  KOKKOS_INLINE_FUNCTION typename std::enable_if<
+      !(std::is_same<typename drvtraits::specialize, void>::value &&
+        std::is_integral<iType0>::value),
+      reference_type>::type
+  access(const iType0& i0, const iType1& i1) const {
+    KOKKOS_IMPL_VIEW_OPERATOR_VERIFY((2, this->rank(), m_track, m_map, i0, i1))
+    return m_map.reference(i0, i1, 0, 0, 0, 0, 0);
+  }
 
   // Rank 3
-  template< typename iType0 , typename iType1 , typename iType2 >
-  KOKKOS_INLINE_FUNCTION
-  typename std::enable_if< (std::is_same<typename traits::specialize , void>::value && std::is_integral<iType0>::value  && std::is_integral<iType1>::value && std::is_integral<iType2>::value), reference_type>::type
-  access(const iType0 & i0 , const iType1 & i1 , const iType2 & i2 ) const
-    {
-      KOKKOS_IMPL_VIEW_OPERATOR_VERIFY( (3 , this->rank(), m_track, m_map, i0, i1, i2) )
-      return m_map.reference(i0,i1,i2);
-    }
+  template <typename iType0, typename iType1, typename iType2>
+  KOKKOS_INLINE_FUNCTION typename std::enable_if<
+      (std::is_same<typename traits::specialize, void>::value &&
+       std::is_integral<iType0>::value && std::is_integral<iType1>::value &&
+       std::is_integral<iType2>::value),
+      reference_type>::type
+  access(const iType0& i0, const iType1& i1, const iType2& i2) const {
+    KOKKOS_IMPL_VIEW_OPERATOR_VERIFY(
+        (3, this->rank(), m_track, m_map, i0, i1, i2))
+    return m_map.reference(i0, i1, i2);
+  }
 
-  template< typename iType0 , typename iType1 , typename iType2 >
-  KOKKOS_INLINE_FUNCTION
-  typename std::enable_if< !(std::is_same<typename drvtraits::specialize , void>::value && std::is_integral<iType0>::value), reference_type>::type
-  access(const iType0 & i0 , const iType1 & i1 , const iType2 & i2 ) const
-    {
-      KOKKOS_IMPL_VIEW_OPERATOR_VERIFY( (3 , this->rank(), m_track, m_map, i0, i1, i2) )
-      return m_map.reference(i0,i1,i2,0,0,0,0);
-    }
+  template <typename iType0, typename iType1, typename iType2>
+  KOKKOS_INLINE_FUNCTION typename std::enable_if<
+      !(std::is_same<typename drvtraits::specialize, void>::value &&
+        std::is_integral<iType0>::value),
+      reference_type>::type
+  access(const iType0& i0, const iType1& i1, const iType2& i2) const {
+    KOKKOS_IMPL_VIEW_OPERATOR_VERIFY(
+        (3, this->rank(), m_track, m_map, i0, i1, i2))
+    return m_map.reference(i0, i1, i2, 0, 0, 0, 0);
+  }
 
   // Rank 4
-  template< typename iType0 , typename iType1 , typename iType2 , typename iType3 >
-  KOKKOS_INLINE_FUNCTION
-  typename std::enable_if< (std::is_same<typename traits::specialize , void>::value && std::is_integral<iType0>::value  && std::is_integral<iType1>::value && std::is_integral<iType2>::value && std::is_integral<iType3>::value), reference_type>::type
-  access(const iType0 & i0 , const iType1 & i1 , const iType2 & i2 , const iType3 & i3 ) const
-    {
-      KOKKOS_IMPL_VIEW_OPERATOR_VERIFY( (4 , this->rank(), m_track, m_map, i0, i1, i2, i3) )
-      return m_map.reference(i0,i1,i2,i3);
-    }
+  template <typename iType0, typename iType1, typename iType2, typename iType3>
+  KOKKOS_INLINE_FUNCTION typename std::enable_if<
+      (std::is_same<typename traits::specialize, void>::value &&
+       std::is_integral<iType0>::value && std::is_integral<iType1>::value &&
+       std::is_integral<iType2>::value && std::is_integral<iType3>::value),
+      reference_type>::type
+  access(const iType0& i0, const iType1& i1, const iType2& i2,
+         const iType3& i3) const {
+    KOKKOS_IMPL_VIEW_OPERATOR_VERIFY(
+        (4, this->rank(), m_track, m_map, i0, i1, i2, i3))
+    return m_map.reference(i0, i1, i2, i3);
+  }
 
-  template< typename iType0 , typename iType1 , typename iType2 , typename iType3 >
-  KOKKOS_INLINE_FUNCTION
-  typename std::enable_if< !(std::is_same<typename drvtraits::specialize , void>::value && std::is_integral<iType0>::value), reference_type>::type
-  access(const iType0 & i0 , const iType1 & i1 , const iType2 & i2 , const iType3 & i3 ) const
-    {
-      KOKKOS_IMPL_VIEW_OPERATOR_VERIFY( (4 , this->rank(), m_track, m_map, i0, i1, i2, i3) )
-      return m_map.reference(i0,i1,i2,i3,0,0,0);
-    }
+  template <typename iType0, typename iType1, typename iType2, typename iType3>
+  KOKKOS_INLINE_FUNCTION typename std::enable_if<
+      !(std::is_same<typename drvtraits::specialize, void>::value &&
+        std::is_integral<iType0>::value),
+      reference_type>::type
+  access(const iType0& i0, const iType1& i1, const iType2& i2,
+         const iType3& i3) const {
+    KOKKOS_IMPL_VIEW_OPERATOR_VERIFY(
+        (4, this->rank(), m_track, m_map, i0, i1, i2, i3))
+    return m_map.reference(i0, i1, i2, i3, 0, 0, 0);
+  }
 
   // Rank 5
-  template< typename iType0 , typename iType1 , typename iType2 , typename iType3, typename iType4 >
-  KOKKOS_INLINE_FUNCTION
-  typename std::enable_if< (std::is_same<typename traits::specialize , void>::value && std::is_integral<iType0>::value  && std::is_integral<iType1>::value && std::is_integral<iType2>::value && std::is_integral<iType3>::value && std::is_integral<iType4>::value), reference_type>::type
-  access(const iType0 & i0 , const iType1 & i1 , const iType2 & i2 , const iType3 & i3 , const iType4 & i4 ) const
-    {
-      KOKKOS_IMPL_VIEW_OPERATOR_VERIFY( (5 , this->rank(), m_track, m_map, i0, i1, i2, i3, i4) )
-      return m_map.reference(i0,i1,i2,i3,i4);
-    }
+  template <typename iType0, typename iType1, typename iType2, typename iType3,
+            typename iType4>
+  KOKKOS_INLINE_FUNCTION typename std::enable_if<
+      (std::is_same<typename traits::specialize, void>::value &&
+       std::is_integral<iType0>::value && std::is_integral<iType1>::value &&
+       std::is_integral<iType2>::value && std::is_integral<iType3>::value &&
+       std::is_integral<iType4>::value),
+      reference_type>::type
+  access(const iType0& i0, const iType1& i1, const iType2& i2, const iType3& i3,
+         const iType4& i4) const {
+    KOKKOS_IMPL_VIEW_OPERATOR_VERIFY(
+        (5, this->rank(), m_track, m_map, i0, i1, i2, i3, i4))
+    return m_map.reference(i0, i1, i2, i3, i4);
+  }
 
-  template< typename iType0 , typename iType1 , typename iType2 , typename iType3, typename iType4 >
-  KOKKOS_INLINE_FUNCTION
-  typename std::enable_if< !(std::is_same<typename drvtraits::specialize , void>::value && std::is_integral<iType0>::value), reference_type>::type
-  access(const iType0 & i0 , const iType1 & i1 , const iType2 & i2 , const iType3 & i3 , const iType4 & i4 ) const
-    {
-      KOKKOS_IMPL_VIEW_OPERATOR_VERIFY( (5 , this->rank(), m_track, m_map, i0, i1, i2, i3, i4) )
-      return m_map.reference(i0,i1,i2,i3,i4,0,0);
-    }
+  template <typename iType0, typename iType1, typename iType2, typename iType3,
+            typename iType4>
+  KOKKOS_INLINE_FUNCTION typename std::enable_if<
+      !(std::is_same<typename drvtraits::specialize, void>::value &&
+        std::is_integral<iType0>::value),
+      reference_type>::type
+  access(const iType0& i0, const iType1& i1, const iType2& i2, const iType3& i3,
+         const iType4& i4) const {
+    KOKKOS_IMPL_VIEW_OPERATOR_VERIFY(
+        (5, this->rank(), m_track, m_map, i0, i1, i2, i3, i4))
+    return m_map.reference(i0, i1, i2, i3, i4, 0, 0);
+  }
 
   // Rank 6
-  template< typename iType0 , typename iType1 , typename iType2 , typename iType3, typename iType4 , typename iType5 >
-  KOKKOS_INLINE_FUNCTION
-  typename std::enable_if< (std::is_same<typename traits::specialize , void>::value && std::is_integral<iType0>::value  && std::is_integral<iType1>::value && std::is_integral<iType2>::value && std::is_integral<iType3>::value && std::is_integral<iType4>::value && std::is_integral<iType5>::value), reference_type>::type
-  access(const iType0 & i0 , const iType1 & i1 , const iType2 & i2 , const iType3 & i3 , const iType4 & i4 , const iType5 & i5 ) const
-    {
-      KOKKOS_IMPL_VIEW_OPERATOR_VERIFY( (6 , this->rank(), m_track, m_map, i0, i1, i2, i3, i4, i5) )
-      return m_map.reference(i0,i1,i2,i3,i4,i5);
-    }
+  template <typename iType0, typename iType1, typename iType2, typename iType3,
+            typename iType4, typename iType5>
+  KOKKOS_INLINE_FUNCTION typename std::enable_if<
+      (std::is_same<typename traits::specialize, void>::value &&
+       std::is_integral<iType0>::value && std::is_integral<iType1>::value &&
+       std::is_integral<iType2>::value && std::is_integral<iType3>::value &&
+       std::is_integral<iType4>::value && std::is_integral<iType5>::value),
+      reference_type>::type
+  access(const iType0& i0, const iType1& i1, const iType2& i2, const iType3& i3,
+         const iType4& i4, const iType5& i5) const {
+    KOKKOS_IMPL_VIEW_OPERATOR_VERIFY(
+        (6, this->rank(), m_track, m_map, i0, i1, i2, i3, i4, i5))
+    return m_map.reference(i0, i1, i2, i3, i4, i5);
+  }
 
-  template< typename iType0 , typename iType1 , typename iType2 , typename iType3, typename iType4 , typename iType5 >
-  KOKKOS_INLINE_FUNCTION
-  typename std::enable_if< !(std::is_same<typename drvtraits::specialize , void>::value && std::is_integral<iType0>::value), reference_type>::type
-  access(const iType0 & i0 , const iType1 & i1 , const iType2 & i2 , const iType3 & i3 , const iType4 & i4 , const iType5 & i5 ) const
-    {
-      KOKKOS_IMPL_VIEW_OPERATOR_VERIFY( (6 , this->rank(), m_track, m_map, i0, i1, i2, i3, i4, i5) )
-      return m_map.reference(i0,i1,i2,i3,i4,i5,0);
-    }
+  template <typename iType0, typename iType1, typename iType2, typename iType3,
+            typename iType4, typename iType5>
+  KOKKOS_INLINE_FUNCTION typename std::enable_if<
+      !(std::is_same<typename drvtraits::specialize, void>::value &&
+        std::is_integral<iType0>::value),
+      reference_type>::type
+  access(const iType0& i0, const iType1& i1, const iType2& i2, const iType3& i3,
+         const iType4& i4, const iType5& i5) const {
+    KOKKOS_IMPL_VIEW_OPERATOR_VERIFY(
+        (6, this->rank(), m_track, m_map, i0, i1, i2, i3, i4, i5))
+    return m_map.reference(i0, i1, i2, i3, i4, i5, 0);
+  }
 
   // Rank 7
-  template< typename iType0 , typename iType1 , typename iType2 , typename iType3, typename iType4 , typename iType5 , typename iType6 >
-  KOKKOS_INLINE_FUNCTION
-  typename std::enable_if< (std::is_integral<iType0>::value  && std::is_integral<iType1>::value && std::is_integral<iType2>::value && std::is_integral<iType3>::value && std::is_integral<iType4>::value && std::is_integral<iType5>::value && std::is_integral<iType6>::value), reference_type>::type
-  access(const iType0 & i0 , const iType1 & i1 , const iType2 & i2 , const iType3 & i3 , const iType4 & i4 , const iType5 & i5 , const iType6 & i6 ) const
-    {
-      KOKKOS_IMPL_VIEW_OPERATOR_VERIFY( (7 , this->rank(), m_track, m_map, i0, i1, i2, i3, i4, i5, i6) )
-      return m_map.reference(i0,i1,i2,i3,i4,i5,i6);
-    }
+  template <typename iType0, typename iType1, typename iType2, typename iType3,
+            typename iType4, typename iType5, typename iType6>
+  KOKKOS_INLINE_FUNCTION typename std::enable_if<
+      (std::is_integral<iType0>::value && std::is_integral<iType1>::value &&
+       std::is_integral<iType2>::value && std::is_integral<iType3>::value &&
+       std::is_integral<iType4>::value && std::is_integral<iType5>::value &&
+       std::is_integral<iType6>::value),
+      reference_type>::type
+  access(const iType0& i0, const iType1& i1, const iType2& i2, const iType3& i3,
+         const iType4& i4, const iType5& i5, const iType6& i6) const {
+    KOKKOS_IMPL_VIEW_OPERATOR_VERIFY(
+        (7, this->rank(), m_track, m_map, i0, i1, i2, i3, i4, i5, i6))
+    return m_map.reference(i0, i1, i2, i3, i4, i5, i6);
+  }
 
 #undef KOKKOS_IMPL_VIEW_OPERATOR_VERIFY
 
@@ -927,405 +1069,393 @@ public:
   ~DynRankView() {}
 
   KOKKOS_INLINE_FUNCTION
-  DynRankView() : m_track(), m_map(), m_rank() {} //Default ctor
+  DynRankView() : m_track(), m_map(), m_rank() {}  // Default ctor
 
   KOKKOS_INLINE_FUNCTION
-  DynRankView( const DynRankView & rhs ) : m_track( rhs.m_track ), m_map( rhs.m_map ), m_rank(rhs.m_rank) {}
+  DynRankView(const DynRankView& rhs)
+      : m_track(rhs.m_track), m_map(rhs.m_map), m_rank(rhs.m_rank) {}
 
   KOKKOS_INLINE_FUNCTION
-  DynRankView( DynRankView && rhs ) : m_track( rhs.m_track ), m_map( rhs.m_map ), m_rank(rhs.m_rank) {}
+  DynRankView(DynRankView&& rhs)
+      : m_track(rhs.m_track), m_map(rhs.m_map), m_rank(rhs.m_rank) {}
 
   KOKKOS_INLINE_FUNCTION
-  DynRankView & operator = ( const DynRankView & rhs ) { m_track = rhs.m_track; m_map = rhs.m_map; m_rank = rhs.m_rank; return *this; }
+  DynRankView& operator=(const DynRankView& rhs) {
+    m_track = rhs.m_track;
+    m_map   = rhs.m_map;
+    m_rank  = rhs.m_rank;
+    return *this;
+  }
 
   KOKKOS_INLINE_FUNCTION
-  DynRankView & operator = ( DynRankView && rhs ) { m_track = rhs.m_track; m_map = rhs.m_map; m_rank = rhs.m_rank; return *this; }
+  DynRankView& operator=(DynRankView&& rhs) {
+    m_track = rhs.m_track;
+    m_map   = rhs.m_map;
+    m_rank  = rhs.m_rank;
+    return *this;
+  }
 
   //----------------------------------------
   // Compatible view copy constructor and assignment
   // may assign unmanaged from managed.
-  template< class RT , class ... RP >
-  KOKKOS_INLINE_FUNCTION
-  DynRankView( const DynRankView<RT,RP...> & rhs )
-    : m_track( rhs.m_track , traits::is_managed )
-    , m_map()
-    , m_rank(rhs.m_rank)
-    {
-      typedef typename DynRankView<RT,RP...> ::traits SrcTraits ;
-      typedef Kokkos::Impl::ViewMapping< traits , SrcTraits , typename traits::specialize > Mapping ;
-      static_assert( Mapping::is_assignable , "Incompatible DynRankView copy construction" );
-      Mapping::assign( m_map , rhs.m_map , rhs.m_track );
-    }
+  template <class RT, class... RP>
+  KOKKOS_INLINE_FUNCTION DynRankView(const DynRankView<RT, RP...>& rhs)
+      : m_track(rhs.m_track, traits::is_managed), m_map(), m_rank(rhs.m_rank) {
+    typedef typename DynRankView<RT, RP...>::traits SrcTraits;
+    typedef Kokkos::Impl::ViewMapping<traits, SrcTraits,
+                                      typename traits::specialize>
+        Mapping;
+    static_assert(Mapping::is_assignable,
+                  "Incompatible DynRankView copy construction");
+    Mapping::assign(m_map, rhs.m_map, rhs.m_track);
+  }
 
-  template< class RT , class ... RP >
-  KOKKOS_INLINE_FUNCTION
-  DynRankView & operator = (const DynRankView<RT,RP...> & rhs )
-    {
-      typedef typename DynRankView<RT,RP...> ::traits SrcTraits ;
-      typedef Kokkos::Impl::ViewMapping< traits , SrcTraits , typename traits::specialize > Mapping ;
-      static_assert( Mapping::is_assignable , "Incompatible DynRankView copy construction" );
-      Mapping::assign( m_map , rhs.m_map , rhs.m_track );
-      m_track.assign( rhs.m_track , traits::is_managed );
-      m_rank = rhs.rank();
-      return *this;
-    }
+  template <class RT, class... RP>
+  KOKKOS_INLINE_FUNCTION DynRankView& operator=(
+      const DynRankView<RT, RP...>& rhs) {
+    typedef typename DynRankView<RT, RP...>::traits SrcTraits;
+    typedef Kokkos::Impl::ViewMapping<traits, SrcTraits,
+                                      typename traits::specialize>
+        Mapping;
+    static_assert(Mapping::is_assignable,
+                  "Incompatible DynRankView copy construction");
+    Mapping::assign(m_map, rhs.m_map, rhs.m_track);
+    m_track.assign(rhs.m_track, traits::is_managed);
+    m_rank = rhs.rank();
+    return *this;
+  }
 
-// Copy/Assign View to DynRankView
-  template< class RT , class ... RP >
-  KOKKOS_INLINE_FUNCTION
-  DynRankView( const View<RT,RP...> & rhs )
-    : m_track()
-    , m_map()
-    , m_rank( rhs.Rank )
-    {
-      typedef typename View<RT,RP...>::traits  SrcTraits ;
-      typedef Kokkos::Impl::ViewMapping< traits , SrcTraits , Kokkos::Impl::ViewToDynRankViewTag >  Mapping ;
-      static_assert( Mapping::is_assignable , "Incompatible View to DynRankView copy construction" );
-      Mapping::assign( *this , rhs );
-    }
+  // Copy/Assign View to DynRankView
+  template <class RT, class... RP>
+  KOKKOS_INLINE_FUNCTION DynRankView(const View<RT, RP...>& rhs)
+      : m_track(), m_map(), m_rank(rhs.Rank) {
+    typedef typename View<RT, RP...>::traits SrcTraits;
+    typedef Kokkos::Impl::ViewMapping<traits, SrcTraits,
+                                      Kokkos::Impl::ViewToDynRankViewTag>
+        Mapping;
+    static_assert(Mapping::is_assignable,
+                  "Incompatible View to DynRankView copy construction");
+    Mapping::assign(*this, rhs);
+  }
 
-  template< class RT , class ... RP >
-  KOKKOS_INLINE_FUNCTION
-  DynRankView & operator = ( const View<RT,RP...> & rhs )
-    {
-      typedef typename View<RT,RP...>::traits  SrcTraits ;
-      typedef Kokkos::Impl::ViewMapping< traits , SrcTraits , Kokkos::Impl::ViewToDynRankViewTag >  Mapping ;
-      static_assert( Mapping::is_assignable , "Incompatible View to DynRankView copy assignment" );
-      Mapping::assign( *this , rhs );
-      return *this ;
-    }
+  template <class RT, class... RP>
+  KOKKOS_INLINE_FUNCTION DynRankView& operator=(const View<RT, RP...>& rhs) {
+    typedef typename View<RT, RP...>::traits SrcTraits;
+    typedef Kokkos::Impl::ViewMapping<traits, SrcTraits,
+                                      Kokkos::Impl::ViewToDynRankViewTag>
+        Mapping;
+    static_assert(Mapping::is_assignable,
+                  "Incompatible View to DynRankView copy assignment");
+    Mapping::assign(*this, rhs);
+    return *this;
+  }
 
   //----------------------------------------
   // Allocation tracking properties
 
   KOKKOS_INLINE_FUNCTION
-  int use_count() const
-    { return m_track.use_count(); }
+  int use_count() const { return m_track.use_count(); }
 
-  inline
-  const std::string label() const
-    { return m_track.template get_label< typename traits::memory_space >(); }
+  inline const std::string label() const {
+    return m_track.template get_label<typename traits::memory_space>();
+  }
 
   //----------------------------------------
   // Allocation according to allocation properties and array layout
-  // unused arg_layout dimensions must be set to KOKKOS_INVALID_INDEX so that rank deduction can properly take place
-  template< class ... P >
-  explicit inline
-  DynRankView( const Kokkos::Impl::ViewCtorProp< P ... > & arg_prop
-             , typename std::enable_if< ! Kokkos::Impl::ViewCtorProp< P... >::has_pointer
-                               , typename traits::array_layout
-                               >::type const & arg_layout
-      )
-      : m_track()
-      , m_map()
-      , m_rank( Impl::DynRankDimTraits<typename traits::specialize>::template computeRank< typename traits::array_layout, P...>(arg_prop, arg_layout) )
-    {
-      // Append layout and spaces if not input
-      typedef Kokkos::Impl::ViewCtorProp< P ... > alloc_prop_input ;
+  // unused arg_layout dimensions must be set to KOKKOS_INVALID_INDEX so that
+  // rank deduction can properly take place
+  template <class... P>
+  explicit inline DynRankView(
+      const Kokkos::Impl::ViewCtorProp<P...>& arg_prop,
+      typename std::enable_if<!Kokkos::Impl::ViewCtorProp<P...>::has_pointer,
+                              typename traits::array_layout>::type const&
+          arg_layout)
+      : m_track(),
+        m_map(),
+        m_rank(Impl::DynRankDimTraits<typename traits::specialize>::
+                   template computeRank<typename traits::array_layout, P...>(
+                       arg_prop, arg_layout)) {
+    // Append layout and spaces if not input
+    typedef Kokkos::Impl::ViewCtorProp<P...> alloc_prop_input;
 
-      // use 'std::integral_constant<unsigned,I>' for non-types
-      // to avoid duplicate class error.
-      typedef Kokkos::Impl::ViewCtorProp
-        < P ...
-        , typename std::conditional
-            < alloc_prop_input::has_label
-            , std::integral_constant<unsigned,0>
-            , typename std::string
-            >::type
-        , typename std::conditional
-            < alloc_prop_input::has_memory_space
-            , std::integral_constant<unsigned,1>
-            , typename traits::device_type::memory_space
-            >::type
-        , typename std::conditional
-            < alloc_prop_input::has_execution_space
-            , std::integral_constant<unsigned,2>
-            , typename traits::device_type::execution_space
-            >::type
-        > alloc_prop ;
+    // use 'std::integral_constant<unsigned,I>' for non-types
+    // to avoid duplicate class error.
+    typedef Kokkos::Impl::ViewCtorProp<
+        P...,
+        typename std::conditional<alloc_prop_input::has_label,
+                                  std::integral_constant<unsigned, 0>,
+                                  typename std::string>::type,
+        typename std::conditional<
+            alloc_prop_input::has_memory_space,
+            std::integral_constant<unsigned, 1>,
+            typename traits::device_type::memory_space>::type,
+        typename std::conditional<
+            alloc_prop_input::has_execution_space,
+            std::integral_constant<unsigned, 2>,
+            typename traits::device_type::execution_space>::type>
+        alloc_prop;
 
-      static_assert( traits::is_managed
-                   , "View allocation constructor requires managed memory" );
+    static_assert(traits::is_managed,
+                  "View allocation constructor requires managed memory");
 
-      if ( alloc_prop::initialize &&
+    if (alloc_prop::initialize &&
 #ifdef KOKKOS_ENABLE_DEPRECATED_CODE
-           ! alloc_prop::execution_space::is_initialized()
+        !alloc_prop::execution_space::is_initialized()
 #else
-           ! alloc_prop::execution_space::impl_is_initialized()
+        !alloc_prop::execution_space::impl_is_initialized()
 #endif
-           ) {
-        // If initializing view data then
-        // the execution space must be initialized.
-        Kokkos::Impl::throw_runtime_exception("Constructing DynRankView and initializing data with uninitialized execution space");
-      }
-
-      // Copy the input allocation properties with possibly defaulted properties
-      alloc_prop prop_copy( arg_prop );
-
-//------------------------------------------------------------
-#if defined( KOKKOS_ENABLE_CUDA )
-      // If allocating in CudaUVMSpace must fence before and after
-      // the allocation to protect against possible concurrent access
-      // on the CPU and the GPU.
-      // Fence using the trait's executon space (which will be Kokkos::Cuda)
-      // to avoid incomplete type errors from usng Kokkos::Cuda directly.
-      if ( std::is_same< Kokkos::CudaUVMSpace , typename traits::device_type::memory_space >::value ) {
-        typename traits::device_type::memory_space::execution_space().fence();
-      }
-#endif
-//------------------------------------------------------------
-
-      Kokkos::Impl::SharedAllocationRecord<> *
-        record = m_map.allocate_shared( prop_copy, Impl::DynRankDimTraits<typename traits::specialize>::template createLayout<traits, P...>(arg_prop, arg_layout) );
-
-//------------------------------------------------------------
-#if defined( KOKKOS_ENABLE_CUDA )
-      if ( std::is_same< Kokkos::CudaUVMSpace , typename traits::device_type::memory_space >::value ) {
-        typename traits::device_type::memory_space::execution_space().fence();
-      }
-#endif
-//------------------------------------------------------------
-
-      // Setup and initialization complete, start tracking
-      m_track.assign_allocated_record_to_uninitialized( record );
+    ) {
+      // If initializing view data then
+      // the execution space must be initialized.
+      Kokkos::Impl::throw_runtime_exception(
+          "Constructing DynRankView and initializing data with uninitialized "
+          "execution space");
     }
 
+    // Copy the input allocation properties with possibly defaulted properties
+    alloc_prop prop_copy(arg_prop);
+
+//------------------------------------------------------------
+#if defined(KOKKOS_ENABLE_CUDA)
+    // If allocating in CudaUVMSpace must fence before and after
+    // the allocation to protect against possible concurrent access
+    // on the CPU and the GPU.
+    // Fence using the trait's executon space (which will be Kokkos::Cuda)
+    // to avoid incomplete type errors from usng Kokkos::Cuda directly.
+    if (std::is_same<Kokkos::CudaUVMSpace,
+                     typename traits::device_type::memory_space>::value) {
+      typename traits::device_type::memory_space::execution_space().fence();
+    }
+#endif
+    //------------------------------------------------------------
+
+    Kokkos::Impl::SharedAllocationRecord<>* record = m_map.allocate_shared(
+        prop_copy,
+        Impl::DynRankDimTraits<typename traits::specialize>::
+            template createLayout<traits, P...>(arg_prop, arg_layout));
+
+//------------------------------------------------------------
+#if defined(KOKKOS_ENABLE_CUDA)
+    if (std::is_same<Kokkos::CudaUVMSpace,
+                     typename traits::device_type::memory_space>::value) {
+      typename traits::device_type::memory_space::execution_space().fence();
+    }
+#endif
+    //------------------------------------------------------------
+
+    // Setup and initialization complete, start tracking
+    m_track.assign_allocated_record_to_uninitialized(record);
+  }
 
   // Wrappers
-  template< class ... P >
-  explicit KOKKOS_INLINE_FUNCTION
-  DynRankView( const Kokkos::Impl::ViewCtorProp< P ... > & arg_prop
-      , typename std::enable_if< Kokkos::Impl::ViewCtorProp< P... >::has_pointer
-                               , typename traits::array_layout
-                               >::type const & arg_layout
-      )
-      : m_track() // No memory tracking
-      , m_map( arg_prop , Impl::DynRankDimTraits<typename traits::specialize>::template createLayout<traits, P...>(arg_prop, arg_layout) )
-      , m_rank( Impl::DynRankDimTraits<typename traits::specialize>::template computeRank< typename traits::array_layout, P...>(arg_prop, arg_layout) )
-    {
-      static_assert(
-        std::is_same< pointer_type
-                    , typename Impl::ViewCtorProp< P... >::pointer_type
-                    >::value ,
-        "Constructing DynRankView to wrap user memory must supply matching pointer type" );
-    }
+  template <class... P>
+  explicit KOKKOS_INLINE_FUNCTION DynRankView(
+      const Kokkos::Impl::ViewCtorProp<P...>& arg_prop,
+      typename std::enable_if<Kokkos::Impl::ViewCtorProp<P...>::has_pointer,
+                              typename traits::array_layout>::type const&
+          arg_layout)
+      : m_track()  // No memory tracking
+        ,
+        m_map(arg_prop,
+              Impl::DynRankDimTraits<typename traits::specialize>::
+                  template createLayout<traits, P...>(arg_prop, arg_layout)),
+        m_rank(Impl::DynRankDimTraits<typename traits::specialize>::
+                   template computeRank<typename traits::array_layout, P...>(
+                       arg_prop, arg_layout)) {
+    static_assert(
+        std::is_same<pointer_type,
+                     typename Impl::ViewCtorProp<P...>::pointer_type>::value,
+        "Constructing DynRankView to wrap user memory must supply matching "
+        "pointer type");
+  }
 
   //----------------------------------------
-  //Constructor(s)
+  // Constructor(s)
 
   // Simple dimension-only layout
-  template< class ... P >
-  explicit inline
-  DynRankView( const Kokkos::Impl::ViewCtorProp< P ... > & arg_prop
-      , typename std::enable_if< ! Kokkos::Impl::ViewCtorProp< P... >::has_pointer
-                               , size_t
-                               >::type const arg_N0 =KOKKOS_INVALID_INDEX
-      , const size_t arg_N1 =KOKKOS_INVALID_INDEX
-      , const size_t arg_N2 =KOKKOS_INVALID_INDEX
-      , const size_t arg_N3 =KOKKOS_INVALID_INDEX
-      , const size_t arg_N4 =KOKKOS_INVALID_INDEX
-      , const size_t arg_N5 =KOKKOS_INVALID_INDEX
-      , const size_t arg_N6 =KOKKOS_INVALID_INDEX
-      , const size_t arg_N7 =KOKKOS_INVALID_INDEX
-      )
-    : DynRankView( arg_prop
-    , typename traits::array_layout
-          ( arg_N0 , arg_N1 , arg_N2 , arg_N3 , arg_N4 , arg_N5 , arg_N6 , arg_N7 )
-      )
-    {}
+  template <class... P>
+  explicit inline DynRankView(
+      const Kokkos::Impl::ViewCtorProp<P...>& arg_prop,
+      typename std::enable_if<!Kokkos::Impl::ViewCtorProp<P...>::has_pointer,
+                              size_t>::type const arg_N0 = KOKKOS_INVALID_INDEX,
+      const size_t arg_N1                                = KOKKOS_INVALID_INDEX,
+      const size_t arg_N2                                = KOKKOS_INVALID_INDEX,
+      const size_t arg_N3                                = KOKKOS_INVALID_INDEX,
+      const size_t arg_N4                                = KOKKOS_INVALID_INDEX,
+      const size_t arg_N5                                = KOKKOS_INVALID_INDEX,
+      const size_t arg_N6                                = KOKKOS_INVALID_INDEX,
+      const size_t arg_N7                                = KOKKOS_INVALID_INDEX)
+      : DynRankView(arg_prop, typename traits::array_layout(
+                                  arg_N0, arg_N1, arg_N2, arg_N3, arg_N4,
+                                  arg_N5, arg_N6, arg_N7)) {}
 
-  template< class ... P >
-  explicit KOKKOS_INLINE_FUNCTION
-  DynRankView( const Kokkos::Impl::ViewCtorProp< P ... > & arg_prop
-      , typename std::enable_if< Kokkos::Impl::ViewCtorProp< P... >::has_pointer
-                               , size_t
-                               >::type const arg_N0 =KOKKOS_INVALID_INDEX
-      , const size_t arg_N1 =KOKKOS_INVALID_INDEX
-      , const size_t arg_N2 =KOKKOS_INVALID_INDEX
-      , const size_t arg_N3 =KOKKOS_INVALID_INDEX
-      , const size_t arg_N4 =KOKKOS_INVALID_INDEX
-      , const size_t arg_N5 =KOKKOS_INVALID_INDEX
-      , const size_t arg_N6 =KOKKOS_INVALID_INDEX
-      , const size_t arg_N7 =KOKKOS_INVALID_INDEX
-      )
-    : DynRankView( arg_prop
-    , typename traits::array_layout
-          ( arg_N0 , arg_N1 , arg_N2 , arg_N3 , arg_N4 , arg_N5 , arg_N6 , arg_N7 )
-      )
-    {}
+  template <class... P>
+  explicit KOKKOS_INLINE_FUNCTION DynRankView(
+      const Kokkos::Impl::ViewCtorProp<P...>& arg_prop,
+      typename std::enable_if<Kokkos::Impl::ViewCtorProp<P...>::has_pointer,
+                              size_t>::type const arg_N0 = KOKKOS_INVALID_INDEX,
+      const size_t arg_N1                                = KOKKOS_INVALID_INDEX,
+      const size_t arg_N2                                = KOKKOS_INVALID_INDEX,
+      const size_t arg_N3                                = KOKKOS_INVALID_INDEX,
+      const size_t arg_N4                                = KOKKOS_INVALID_INDEX,
+      const size_t arg_N5                                = KOKKOS_INVALID_INDEX,
+      const size_t arg_N6                                = KOKKOS_INVALID_INDEX,
+      const size_t arg_N7                                = KOKKOS_INVALID_INDEX)
+      : DynRankView(arg_prop, typename traits::array_layout(
+                                  arg_N0, arg_N1, arg_N2, arg_N3, arg_N4,
+                                  arg_N5, arg_N6, arg_N7)) {}
 
   // Allocate with label and layout
-  template< typename Label >
-  explicit inline
-  DynRankView( const Label & arg_label
-      , typename std::enable_if<
-          Kokkos::Impl::is_view_label<Label>::value ,
-          typename traits::array_layout >::type const & arg_layout
-      )
-    : DynRankView( Kokkos::Impl::ViewCtorProp< std::string >( arg_label ) , arg_layout )
-    {}
+  template <typename Label>
+  explicit inline DynRankView(
+      const Label& arg_label,
+      typename std::enable_if<Kokkos::Impl::is_view_label<Label>::value,
+                              typename traits::array_layout>::type const&
+          arg_layout)
+      : DynRankView(Kokkos::Impl::ViewCtorProp<std::string>(arg_label),
+                    arg_layout) {}
 
   // Allocate label and layout, must disambiguate from subview constructor
-  template< typename Label >
-  explicit inline
-  DynRankView( const Label & arg_label
-      , typename std::enable_if<
-          Kokkos::Impl::is_view_label<Label>::value ,
-        const size_t >::type arg_N0 =KOKKOS_INVALID_INDEX
-      , const size_t arg_N1 =KOKKOS_INVALID_INDEX
-      , const size_t arg_N2 =KOKKOS_INVALID_INDEX
-      , const size_t arg_N3 =KOKKOS_INVALID_INDEX
-      , const size_t arg_N4 =KOKKOS_INVALID_INDEX
-      , const size_t arg_N5 =KOKKOS_INVALID_INDEX
-      , const size_t arg_N6 =KOKKOS_INVALID_INDEX
-      , const size_t arg_N7 =KOKKOS_INVALID_INDEX
-      )
-    : DynRankView( Kokkos::Impl::ViewCtorProp< std::string >( arg_label )
-    , typename traits::array_layout
-          ( arg_N0 , arg_N1 , arg_N2 , arg_N3 , arg_N4 , arg_N5 , arg_N6 , arg_N7 )
-      )
-    {}
+  template <typename Label>
+  explicit inline DynRankView(
+      const Label& arg_label,
+      typename std::enable_if<Kokkos::Impl::is_view_label<Label>::value,
+                              const size_t>::type arg_N0 = KOKKOS_INVALID_INDEX,
+      const size_t arg_N1                                = KOKKOS_INVALID_INDEX,
+      const size_t arg_N2                                = KOKKOS_INVALID_INDEX,
+      const size_t arg_N3                                = KOKKOS_INVALID_INDEX,
+      const size_t arg_N4                                = KOKKOS_INVALID_INDEX,
+      const size_t arg_N5                                = KOKKOS_INVALID_INDEX,
+      const size_t arg_N6                                = KOKKOS_INVALID_INDEX,
+      const size_t arg_N7                                = KOKKOS_INVALID_INDEX)
+      : DynRankView(
+            Kokkos::Impl::ViewCtorProp<std::string>(arg_label),
+            typename traits::array_layout(arg_N0, arg_N1, arg_N2, arg_N3,
+                                          arg_N4, arg_N5, arg_N6, arg_N7)) {}
 
   // For backward compatibility
-  // NDE This ctor does not take ViewCtorProp argument - should not use alternative createLayout call
-  explicit inline
-  DynRankView( const ViewAllocateWithoutInitializing & arg_prop
-      , const typename traits::array_layout & arg_layout
-      )
-    : DynRankView( Kokkos::Impl::ViewCtorProp< std::string , Kokkos::Impl::WithoutInitializing_t >( arg_prop.label , Kokkos::WithoutInitializing )
-                 , arg_layout
-      )
-    {}
+  // NDE This ctor does not take ViewCtorProp argument - should not use
+  // alternative createLayout call
+  explicit inline DynRankView(const ViewAllocateWithoutInitializing& arg_prop,
+                              const typename traits::array_layout& arg_layout)
+      : DynRankView(
+            Kokkos::Impl::ViewCtorProp<std::string,
+                                       Kokkos::Impl::WithoutInitializing_t>(
+                arg_prop.label, Kokkos::WithoutInitializing),
+            arg_layout) {}
 
-  explicit inline
-  DynRankView( const ViewAllocateWithoutInitializing & arg_prop
-      , const size_t arg_N0 =KOKKOS_INVALID_INDEX
-      , const size_t arg_N1 =KOKKOS_INVALID_INDEX
-      , const size_t arg_N2 =KOKKOS_INVALID_INDEX
-      , const size_t arg_N3 =KOKKOS_INVALID_INDEX
-      , const size_t arg_N4 =KOKKOS_INVALID_INDEX
-      , const size_t arg_N5 =KOKKOS_INVALID_INDEX
-      , const size_t arg_N6 =KOKKOS_INVALID_INDEX
-      , const size_t arg_N7 =KOKKOS_INVALID_INDEX
-      )
-    : DynRankView(Kokkos::Impl::ViewCtorProp< std::string , Kokkos::Impl::WithoutInitializing_t >( arg_prop.label , Kokkos::WithoutInitializing )
-      , typename traits::array_layout(arg_N0, arg_N1, arg_N2, arg_N3, arg_N4, arg_N5, arg_N6, arg_N7)
-      )
-    {}
+  explicit inline DynRankView(const ViewAllocateWithoutInitializing& arg_prop,
+                              const size_t arg_N0 = KOKKOS_INVALID_INDEX,
+                              const size_t arg_N1 = KOKKOS_INVALID_INDEX,
+                              const size_t arg_N2 = KOKKOS_INVALID_INDEX,
+                              const size_t arg_N3 = KOKKOS_INVALID_INDEX,
+                              const size_t arg_N4 = KOKKOS_INVALID_INDEX,
+                              const size_t arg_N5 = KOKKOS_INVALID_INDEX,
+                              const size_t arg_N6 = KOKKOS_INVALID_INDEX,
+                              const size_t arg_N7 = KOKKOS_INVALID_INDEX)
+      : DynRankView(
+            Kokkos::Impl::ViewCtorProp<std::string,
+                                       Kokkos::Impl::WithoutInitializing_t>(
+                arg_prop.label, Kokkos::WithoutInitializing),
+            typename traits::array_layout(arg_N0, arg_N1, arg_N2, arg_N3,
+                                          arg_N4, arg_N5, arg_N6, arg_N7)) {}
 
   //----------------------------------------
   // Memory span required to wrap these dimensions.
   static constexpr size_t required_allocation_size(
-                                       const size_t arg_N0 = 0
-                                     , const size_t arg_N1 = 0
-                                     , const size_t arg_N2 = 0
-                                     , const size_t arg_N3 = 0
-                                     , const size_t arg_N4 = 0
-                                     , const size_t arg_N5 = 0
-                                     , const size_t arg_N6 = 0
-                                     , const size_t arg_N7 = 0
-                                     )
-    {
-      return map_type::memory_span(
-        typename traits::array_layout
-          ( arg_N0 , arg_N1 , arg_N2 , arg_N3
-          , arg_N4 , arg_N5 , arg_N6 , arg_N7 ) );
-    }
+      const size_t arg_N0 = 0, const size_t arg_N1 = 0, const size_t arg_N2 = 0,
+      const size_t arg_N3 = 0, const size_t arg_N4 = 0, const size_t arg_N5 = 0,
+      const size_t arg_N6 = 0, const size_t arg_N7 = 0) {
+    return map_type::memory_span(typename traits::array_layout(
+        arg_N0, arg_N1, arg_N2, arg_N3, arg_N4, arg_N5, arg_N6, arg_N7));
+  }
 
-  explicit KOKKOS_INLINE_FUNCTION
-  DynRankView( pointer_type arg_ptr
-      , const size_t arg_N0 =KOKKOS_INVALID_INDEX
-      , const size_t arg_N1 =KOKKOS_INVALID_INDEX
-      , const size_t arg_N2 =KOKKOS_INVALID_INDEX
-      , const size_t arg_N3 =KOKKOS_INVALID_INDEX
-      , const size_t arg_N4 =KOKKOS_INVALID_INDEX
-      , const size_t arg_N5 =KOKKOS_INVALID_INDEX
-      , const size_t arg_N6 =KOKKOS_INVALID_INDEX
-      , const size_t arg_N7 =KOKKOS_INVALID_INDEX
-      )
-    : DynRankView( Kokkos::Impl::ViewCtorProp<pointer_type>(arg_ptr) , arg_N0, arg_N1, arg_N2, arg_N3, arg_N4, arg_N5, arg_N6, arg_N7 )
-    {}
-
-  explicit KOKKOS_INLINE_FUNCTION
-  DynRankView( pointer_type arg_ptr
-      , typename traits::array_layout & arg_layout
-      )
-    : DynRankView( Kokkos::Impl::ViewCtorProp<pointer_type>(arg_ptr) , arg_layout )
-    {}
+  explicit KOKKOS_INLINE_FUNCTION DynRankView(
+      pointer_type arg_ptr, const size_t arg_N0 = KOKKOS_INVALID_INDEX,
+      const size_t arg_N1 = KOKKOS_INVALID_INDEX,
+      const size_t arg_N2 = KOKKOS_INVALID_INDEX,
+      const size_t arg_N3 = KOKKOS_INVALID_INDEX,
+      const size_t arg_N4 = KOKKOS_INVALID_INDEX,
+      const size_t arg_N5 = KOKKOS_INVALID_INDEX,
+      const size_t arg_N6 = KOKKOS_INVALID_INDEX,
+      const size_t arg_N7 = KOKKOS_INVALID_INDEX)
+      : DynRankView(Kokkos::Impl::ViewCtorProp<pointer_type>(arg_ptr), arg_N0,
+                    arg_N1, arg_N2, arg_N3, arg_N4, arg_N5, arg_N6, arg_N7) {}
 
+  explicit KOKKOS_INLINE_FUNCTION DynRankView(
+      pointer_type arg_ptr, typename traits::array_layout& arg_layout)
+      : DynRankView(Kokkos::Impl::ViewCtorProp<pointer_type>(arg_ptr),
+                    arg_layout) {}
 
   //----------------------------------------
   // Shared scratch memory constructor
 
-  static inline
-  size_t shmem_size( const size_t arg_N0 =KOKKOS_INVALID_INDEX ,
-                     const size_t arg_N1 =KOKKOS_INVALID_INDEX ,
-                     const size_t arg_N2 =KOKKOS_INVALID_INDEX ,
-                     const size_t arg_N3 =KOKKOS_INVALID_INDEX ,
-                     const size_t arg_N4 =KOKKOS_INVALID_INDEX ,
-                     const size_t arg_N5 =KOKKOS_INVALID_INDEX ,
-                     const size_t arg_N6 =KOKKOS_INVALID_INDEX ,
-                     const size_t arg_N7 =KOKKOS_INVALID_INDEX )
-  {
+  static inline size_t shmem_size(const size_t arg_N0 = KOKKOS_INVALID_INDEX,
+                                  const size_t arg_N1 = KOKKOS_INVALID_INDEX,
+                                  const size_t arg_N2 = KOKKOS_INVALID_INDEX,
+                                  const size_t arg_N3 = KOKKOS_INVALID_INDEX,
+                                  const size_t arg_N4 = KOKKOS_INVALID_INDEX,
+                                  const size_t arg_N5 = KOKKOS_INVALID_INDEX,
+                                  const size_t arg_N6 = KOKKOS_INVALID_INDEX,
+                                  const size_t arg_N7 = KOKKOS_INVALID_INDEX) {
     const size_t num_passed_args =
-      ( arg_N0 !=KOKKOS_INVALID_INDEX ) + ( arg_N1 !=KOKKOS_INVALID_INDEX ) + ( arg_N2 !=KOKKOS_INVALID_INDEX ) +
-      ( arg_N3 !=KOKKOS_INVALID_INDEX ) + ( arg_N4 !=KOKKOS_INVALID_INDEX ) + ( arg_N5 !=KOKKOS_INVALID_INDEX ) +
-      ( arg_N6 !=KOKKOS_INVALID_INDEX ) + ( arg_N7 !=KOKKOS_INVALID_INDEX );
+        (arg_N0 != KOKKOS_INVALID_INDEX) + (arg_N1 != KOKKOS_INVALID_INDEX) +
+        (arg_N2 != KOKKOS_INVALID_INDEX) + (arg_N3 != KOKKOS_INVALID_INDEX) +
+        (arg_N4 != KOKKOS_INVALID_INDEX) + (arg_N5 != KOKKOS_INVALID_INDEX) +
+        (arg_N6 != KOKKOS_INVALID_INDEX) + (arg_N7 != KOKKOS_INVALID_INDEX);
 
-    if ( std::is_same<typename traits::specialize , void>::value && num_passed_args != traits::rank_dynamic ) {
-      Kokkos::abort( "Kokkos::View::shmem_size() rank_dynamic != number of arguments.\n" );
+    if (std::is_same<typename traits::specialize, void>::value &&
+        num_passed_args != traits::rank_dynamic) {
+      Kokkos::abort(
+          "Kokkos::View::shmem_size() rank_dynamic != number of arguments.\n");
     }
     {}
 
-    return map_type::memory_span(
-           typename traits::array_layout
-            ( arg_N0 , arg_N1 , arg_N2 , arg_N3
-            , arg_N4 , arg_N5 , arg_N6 , arg_N7 ) );
+    return map_type::memory_span(typename traits::array_layout(
+        arg_N0, arg_N1, arg_N2, arg_N3, arg_N4, arg_N5, arg_N6, arg_N7));
   }
 
-  explicit KOKKOS_INLINE_FUNCTION
-  DynRankView( const typename traits::execution_space::scratch_memory_space & arg_space
-      , const typename traits::array_layout & arg_layout )
-    : DynRankView( Kokkos::Impl::ViewCtorProp<pointer_type>(
-              reinterpret_cast<pointer_type>(
-                arg_space.get_shmem( map_type::memory_span(
-                  Impl::DynRankDimTraits<typename traits::specialize>::createLayout( arg_layout ) //is this correct?
-                ) ) ) )
-         , arg_layout )
-     {}
+  explicit KOKKOS_INLINE_FUNCTION DynRankView(
+      const typename traits::execution_space::scratch_memory_space& arg_space,
+      const typename traits::array_layout& arg_layout)
+      : DynRankView(
+            Kokkos::Impl::ViewCtorProp<pointer_type>(
+                reinterpret_cast<pointer_type>(
+                    arg_space.get_shmem(map_type::memory_span(
+                        Impl::DynRankDimTraits<typename traits::specialize>::
+                            createLayout(arg_layout)  // is this correct?
+                        )))),
+            arg_layout) {}
 
-  explicit KOKKOS_INLINE_FUNCTION
-  DynRankView( const typename traits::execution_space::scratch_memory_space & arg_space
-      , const size_t arg_N0 =KOKKOS_INVALID_INDEX
-      , const size_t arg_N1 =KOKKOS_INVALID_INDEX
-      , const size_t arg_N2 =KOKKOS_INVALID_INDEX
-      , const size_t arg_N3 =KOKKOS_INVALID_INDEX
-      , const size_t arg_N4 =KOKKOS_INVALID_INDEX
-      , const size_t arg_N5 =KOKKOS_INVALID_INDEX
-      , const size_t arg_N6 =KOKKOS_INVALID_INDEX
-      , const size_t arg_N7 =KOKKOS_INVALID_INDEX )
-
-    : DynRankView( Kokkos::Impl::ViewCtorProp<pointer_type>(
-                   reinterpret_cast<pointer_type>(
-                     arg_space.get_shmem(
-                       map_type::memory_span(
-                       Impl::DynRankDimTraits<typename traits::specialize>::createLayout(
-                       typename traits::array_layout
-                       ( arg_N0 , arg_N1 , arg_N2 , arg_N3
-                       , arg_N4 , arg_N5 , arg_N6 , arg_N7 ) ) ) ) )
-                    )
-                  , typename traits::array_layout
-                    ( arg_N0 , arg_N1 , arg_N2 , arg_N3
-                    , arg_N4 , arg_N5 , arg_N6 , arg_N7 )
-        )
-    {}
+  explicit KOKKOS_INLINE_FUNCTION DynRankView(
+      const typename traits::execution_space::scratch_memory_space& arg_space,
+      const size_t arg_N0 = KOKKOS_INVALID_INDEX,
+      const size_t arg_N1 = KOKKOS_INVALID_INDEX,
+      const size_t arg_N2 = KOKKOS_INVALID_INDEX,
+      const size_t arg_N3 = KOKKOS_INVALID_INDEX,
+      const size_t arg_N4 = KOKKOS_INVALID_INDEX,
+      const size_t arg_N5 = KOKKOS_INVALID_INDEX,
+      const size_t arg_N6 = KOKKOS_INVALID_INDEX,
+      const size_t arg_N7 = KOKKOS_INVALID_INDEX)
 
+      : DynRankView(
+            Kokkos::Impl::ViewCtorProp<pointer_type>(
+                reinterpret_cast<pointer_type>(
+                    arg_space.get_shmem(map_type::memory_span(
+                        Impl::DynRankDimTraits<typename traits::specialize>::
+                            createLayout(typename traits::array_layout(
+                                arg_N0, arg_N1, arg_N2, arg_N3, arg_N4, arg_N5,
+                                arg_N6, arg_N7)))))),
+            typename traits::array_layout(arg_N0, arg_N1, arg_N2, arg_N3,
+                                          arg_N4, arg_N5, arg_N6, arg_N7)) {}
 };
 
-
-  template < typename D , class ... P >
-  KOKKOS_INLINE_FUNCTION
-  constexpr unsigned rank( const DynRankView<D , P...> & DRV ) { return DRV.rank(); } //needed for transition to common constexpr method in view and dynrankview to return rank
+template <typename D, class... P>
+KOKKOS_INLINE_FUNCTION constexpr unsigned rank(
+    const DynRankView<D, P...>& DRV) {
+  return DRV.rank();
+}  // needed for transition to common constexpr method in view and dynrankview
+   // to return rank
 
 //----------------------------------------------------------------------------
 // Subview mapping.
@@ -1335,253 +1465,238 @@ namespace Impl {
 
 struct DynRankSubviewTag {};
 
-} // namespace Impl
+}  // namespace Impl
 
 namespace Impl {
 
-template< class SrcTraits , class ... Args >
-struct ViewMapping
-  < typename std::enable_if<(
-      std::is_same< typename SrcTraits::specialize , void >::value
-      &&
-      (
-        std::is_same< typename SrcTraits::array_layout
-                    , Kokkos::LayoutLeft >::value ||
-        std::is_same< typename SrcTraits::array_layout
-                    , Kokkos::LayoutRight >::value ||
-        std::is_same< typename SrcTraits::array_layout
-                    , Kokkos::LayoutStride >::value
-      )
-    ), Kokkos::Impl::DynRankSubviewTag >::type
-  , SrcTraits
-  , Args ... >
-{
-private:
-
-  enum
-    { RZ = false
-    , R0 = bool(is_integral_extent<0,Args...>::value)
-    , R1 = bool(is_integral_extent<1,Args...>::value)
-    , R2 = bool(is_integral_extent<2,Args...>::value)
-    , R3 = bool(is_integral_extent<3,Args...>::value)
-    , R4 = bool(is_integral_extent<4,Args...>::value)
-    , R5 = bool(is_integral_extent<5,Args...>::value)
-    , R6 = bool(is_integral_extent<6,Args...>::value)
-    };
-
-  enum { rank = unsigned(R0) + unsigned(R1) + unsigned(R2) + unsigned(R3)
-              + unsigned(R4) + unsigned(R5) + unsigned(R6) };
-
-  typedef Kokkos::LayoutStride array_layout ;
-
-  typedef typename SrcTraits::value_type  value_type ;
-
-  typedef value_type******* data_type ;
-
-public:
-
-  typedef Kokkos::ViewTraits
-    < data_type
-    , array_layout
-    , typename SrcTraits::device_type
-    , typename SrcTraits::memory_traits > traits_type ;
-
-  typedef Kokkos::View
-    < data_type
-    , array_layout
-    , typename SrcTraits::device_type
-    , typename SrcTraits::memory_traits > type ;
-
-
-  template< class MemoryTraits >
-  struct apply {
-
-    static_assert( Kokkos::Impl::is_memory_traits< MemoryTraits >::value , "" );
-
-    typedef Kokkos::ViewTraits
-      < data_type
-      , array_layout
-      , typename SrcTraits::device_type
-      , MemoryTraits > traits_type ;
-
-    typedef Kokkos::View
-      < data_type
-      , array_layout
-      , typename SrcTraits::device_type
-      , MemoryTraits > type ;
+template <class SrcTraits, class... Args>
+struct ViewMapping<
+    typename std::enable_if<
+        (std::is_same<typename SrcTraits::specialize, void>::value &&
+         (std::is_same<typename SrcTraits::array_layout,
+                       Kokkos::LayoutLeft>::value ||
+          std::is_same<typename SrcTraits::array_layout,
+                       Kokkos::LayoutRight>::value ||
+          std::is_same<typename SrcTraits::array_layout,
+                       Kokkos::LayoutStride>::value)),
+        Kokkos::Impl::DynRankSubviewTag>::type,
+    SrcTraits, Args...> {
+ private:
+  enum {
+    RZ = false,
+    R0 = bool(is_integral_extent<0, Args...>::value),
+    R1 = bool(is_integral_extent<1, Args...>::value),
+    R2 = bool(is_integral_extent<2, Args...>::value),
+    R3 = bool(is_integral_extent<3, Args...>::value),
+    R4 = bool(is_integral_extent<4, Args...>::value),
+    R5 = bool(is_integral_extent<5, Args...>::value),
+    R6 = bool(is_integral_extent<6, Args...>::value)
   };
 
+  enum {
+    rank = unsigned(R0) + unsigned(R1) + unsigned(R2) + unsigned(R3) +
+           unsigned(R4) + unsigned(R5) + unsigned(R6)
+  };
 
-  typedef typename SrcTraits::dimension dimension ;
+  typedef Kokkos::LayoutStride array_layout;
 
-  template < class Arg0 = int, class Arg1 = int, class Arg2 = int, class Arg3 = int, class Arg4 = int, class Arg5 = int, class Arg6 = int >
+  typedef typename SrcTraits::value_type value_type;
+
+  typedef value_type******* data_type;
+
+ public:
+  typedef Kokkos::ViewTraits<data_type, array_layout,
+                             typename SrcTraits::device_type,
+                             typename SrcTraits::memory_traits>
+      traits_type;
+
+  typedef Kokkos::View<data_type, array_layout, typename SrcTraits::device_type,
+                       typename SrcTraits::memory_traits>
+      type;
+
+  template <class MemoryTraits>
+  struct apply {
+    static_assert(Kokkos::Impl::is_memory_traits<MemoryTraits>::value, "");
+
+    typedef Kokkos::ViewTraits<data_type, array_layout,
+                               typename SrcTraits::device_type, MemoryTraits>
+        traits_type;
+
+    typedef Kokkos::View<data_type, array_layout,
+                         typename SrcTraits::device_type, MemoryTraits>
+        type;
+  };
+
+  typedef typename SrcTraits::dimension dimension;
+
+  template <class Arg0 = int, class Arg1 = int, class Arg2 = int,
+            class Arg3 = int, class Arg4 = int, class Arg5 = int,
+            class Arg6 = int>
   struct ExtentGenerator {
     KOKKOS_INLINE_FUNCTION
-    static SubviewExtents< 7 , rank > generator ( const dimension & dim , Arg0 arg0 = Arg0(), Arg1 arg1 = Arg1(), Arg2 arg2 = Arg2(), Arg3 arg3 = Arg3(), Arg4 arg4 = Arg4(), Arg5 arg5 = Arg5(), Arg6 arg6 = Arg6() )
-    {
-       return SubviewExtents< 7 , rank>( dim , arg0 , arg1 , arg2 , arg3 , arg4 , arg5 , arg6 );
+    static SubviewExtents<7, rank> generator(
+        const dimension& dim, Arg0 arg0 = Arg0(), Arg1 arg1 = Arg1(),
+        Arg2 arg2 = Arg2(), Arg3 arg3 = Arg3(), Arg4 arg4 = Arg4(),
+        Arg5 arg5 = Arg5(), Arg6 arg6 = Arg6()) {
+      return SubviewExtents<7, rank>(dim, arg0, arg1, arg2, arg3, arg4, arg5,
+                                     arg6);
     }
   };
 
+  typedef Kokkos::DynRankView<value_type, array_layout,
+                              typename SrcTraits::device_type,
+                              typename SrcTraits::memory_traits>
+      ret_type;
 
-  typedef Kokkos::DynRankView< value_type , array_layout , typename SrcTraits::device_type , typename SrcTraits::memory_traits >  ret_type;
+  template <typename T, class... P>
+  KOKKOS_INLINE_FUNCTION static ret_type subview(
+      const unsigned src_rank, Kokkos::DynRankView<T, P...> const& src,
+      Args... args) {
+    typedef ViewMapping<traits_type, typename traits_type::specialize> DstType;
 
-  template < typename T , class ... P >
-  KOKKOS_INLINE_FUNCTION
-  static ret_type subview( const unsigned src_rank , Kokkos::DynRankView< T , P...> const & src
-                    , Args ... args )
-    {
+    typedef typename std::conditional<
+        (rank == 0), ViewDimension<>,
+        typename std::conditional<
+            (rank == 1), ViewDimension<0>,
+            typename std::conditional<
+                (rank == 2), ViewDimension<0, 0>,
+                typename std::conditional<
+                    (rank == 3), ViewDimension<0, 0, 0>,
+                    typename std::conditional<
+                        (rank == 4), ViewDimension<0, 0, 0, 0>,
+                        typename std::conditional<
+                            (rank == 5), ViewDimension<0, 0, 0, 0, 0>,
+                            typename std::conditional<
+                                (rank == 6), ViewDimension<0, 0, 0, 0, 0, 0>,
+                                ViewDimension<0, 0, 0, 0, 0, 0, 0> >::type>::
+                            type>::type>::type>::type>::type>::type DstDimType;
 
-       typedef ViewMapping< traits_type, typename traits_type::specialize >  DstType ;
+    typedef ViewOffset<DstDimType, Kokkos::LayoutStride> dst_offset_type;
+    typedef typename DstType::handle_type dst_handle_type;
 
-       typedef typename std::conditional< (rank==0) , ViewDimension<>
-                                                    , typename std::conditional< (rank==1) , ViewDimension<0>
-                                                    , typename std::conditional< (rank==2) , ViewDimension<0,0>
-                                                    , typename std::conditional< (rank==3) , ViewDimension<0,0,0>
-                                                    , typename std::conditional< (rank==4) , ViewDimension<0,0,0,0>
-                                                    , typename std::conditional< (rank==5) , ViewDimension<0,0,0,0,0>
-                                                    , typename std::conditional< (rank==6) , ViewDimension<0,0,0,0,0,0>
-                                                                                           , ViewDimension<0,0,0,0,0,0,0>
-                                                    >::type >::type >::type >::type >::type >::type >::type  DstDimType ;
+    ret_type dst;
 
-      typedef ViewOffset< DstDimType , Kokkos::LayoutStride > dst_offset_type ;
-      typedef typename DstType::handle_type  dst_handle_type ;
+    const SubviewExtents<7, rank> extents = ExtentGenerator<Args...>::generator(
+        src.m_map.m_impl_offset.m_dim, args...);
 
-      ret_type dst ;
+    dst_offset_type tempdst(src.m_map.m_impl_offset, extents);
 
-      const SubviewExtents< 7 , rank > extents =
-        ExtentGenerator< Args ... >::generator( src.m_map.m_impl_offset.m_dim , args... ) ;
+    dst.m_track = src.m_track;
 
-      dst_offset_type tempdst( src.m_map.m_impl_offset , extents ) ;
+    dst.m_map.m_impl_offset.m_dim.N0 = tempdst.m_dim.N0;
+    dst.m_map.m_impl_offset.m_dim.N1 = tempdst.m_dim.N1;
+    dst.m_map.m_impl_offset.m_dim.N2 = tempdst.m_dim.N2;
+    dst.m_map.m_impl_offset.m_dim.N3 = tempdst.m_dim.N3;
+    dst.m_map.m_impl_offset.m_dim.N4 = tempdst.m_dim.N4;
+    dst.m_map.m_impl_offset.m_dim.N5 = tempdst.m_dim.N5;
+    dst.m_map.m_impl_offset.m_dim.N6 = tempdst.m_dim.N6;
 
-      dst.m_track = src.m_track ;
+    dst.m_map.m_impl_offset.m_stride.S0 = tempdst.m_stride.S0;
+    dst.m_map.m_impl_offset.m_stride.S1 = tempdst.m_stride.S1;
+    dst.m_map.m_impl_offset.m_stride.S2 = tempdst.m_stride.S2;
+    dst.m_map.m_impl_offset.m_stride.S3 = tempdst.m_stride.S3;
+    dst.m_map.m_impl_offset.m_stride.S4 = tempdst.m_stride.S4;
+    dst.m_map.m_impl_offset.m_stride.S5 = tempdst.m_stride.S5;
+    dst.m_map.m_impl_offset.m_stride.S6 = tempdst.m_stride.S6;
 
-      dst.m_map.m_impl_offset.m_dim.N0 = tempdst.m_dim.N0 ;
-      dst.m_map.m_impl_offset.m_dim.N1 = tempdst.m_dim.N1 ;
-      dst.m_map.m_impl_offset.m_dim.N2 = tempdst.m_dim.N2 ;
-      dst.m_map.m_impl_offset.m_dim.N3 = tempdst.m_dim.N3 ;
-      dst.m_map.m_impl_offset.m_dim.N4 = tempdst.m_dim.N4 ;
-      dst.m_map.m_impl_offset.m_dim.N5 = tempdst.m_dim.N5 ;
-      dst.m_map.m_impl_offset.m_dim.N6 = tempdst.m_dim.N6 ;
+    dst.m_map.m_impl_handle =
+        dst_handle_type(src.m_map.m_impl_handle +
+                        src.m_map.m_impl_offset(
+                            extents.domain_offset(0), extents.domain_offset(1),
+                            extents.domain_offset(2), extents.domain_offset(3),
+                            extents.domain_offset(4), extents.domain_offset(5),
+                            extents.domain_offset(6)));
 
-      dst.m_map.m_impl_offset.m_stride.S0 = tempdst.m_stride.S0 ;
-      dst.m_map.m_impl_offset.m_stride.S1 = tempdst.m_stride.S1 ;
-      dst.m_map.m_impl_offset.m_stride.S2 = tempdst.m_stride.S2 ;
-      dst.m_map.m_impl_offset.m_stride.S3 = tempdst.m_stride.S3 ;
-      dst.m_map.m_impl_offset.m_stride.S4 = tempdst.m_stride.S4 ;
-      dst.m_map.m_impl_offset.m_stride.S5 = tempdst.m_stride.S5 ;
-      dst.m_map.m_impl_offset.m_stride.S6 = tempdst.m_stride.S6 ;
+    dst.m_rank =
+        (src_rank > 0 ? unsigned(R0) : 0) + (src_rank > 1 ? unsigned(R1) : 0) +
+        (src_rank > 2 ? unsigned(R2) : 0) + (src_rank > 3 ? unsigned(R3) : 0) +
+        (src_rank > 4 ? unsigned(R4) : 0) + (src_rank > 5 ? unsigned(R5) : 0) +
+        (src_rank > 6 ? unsigned(R6) : 0);
 
-      dst.m_map.m_impl_handle = dst_handle_type( src.m_map.m_impl_handle +
-                                      src.m_map.m_impl_offset( extents.domain_offset(0)
-                                                  , extents.domain_offset(1)
-                                                  , extents.domain_offset(2)
-                                                  , extents.domain_offset(3)
-                                                  , extents.domain_offset(4)
-                                                  , extents.domain_offset(5)
-                                                  , extents.domain_offset(6)
-                                                  ) );
-
-      dst.m_rank = ( src_rank > 0 ? unsigned(R0) : 0 )
-                 + ( src_rank > 1 ? unsigned(R1) : 0 )
-                 + ( src_rank > 2 ? unsigned(R2) : 0 )
-                 + ( src_rank > 3 ? unsigned(R3) : 0 )
-                 + ( src_rank > 4 ? unsigned(R4) : 0 )
-                 + ( src_rank > 5 ? unsigned(R5) : 0 )
-                 + ( src_rank > 6 ? unsigned(R6) : 0 ) ;
-
-      return dst ;
-    }
+    return dst;
+  }
 };
 
-} // end Impl
+}  // namespace Impl
 
+template <class V, class... Args>
+using Subdynrankview =
+    typename Kokkos::Impl::ViewMapping<Kokkos::Impl::DynRankSubviewTag, V,
+                                       Args...>::ret_type;
 
-template< class V , class ... Args >
-using Subdynrankview = typename Kokkos::Impl::ViewMapping< Kokkos::Impl::DynRankSubviewTag , V , Args... >::ret_type ;
-
-template< class D , class ... P , class ...Args >
-KOKKOS_INLINE_FUNCTION
-Subdynrankview< ViewTraits<D******* , P...> , Args... >
-subdynrankview( const Kokkos::DynRankView< D , P... > &src , Args...args)
+template <class D, class... P, class... Args>
+KOKKOS_INLINE_FUNCTION Subdynrankview<ViewTraits<D*******, P...>, Args...>
+subdynrankview(const Kokkos::DynRankView<D, P...>& src, Args... args) {
+  if (src.rank() > sizeof...(Args))  // allow sizeof...(Args) >= src.rank(),
+                                     // ignore the remaining args
   {
-    if ( src.rank() > sizeof...(Args) ) //allow sizeof...(Args) >= src.rank(), ignore the remaining args
-      { Kokkos::abort("subdynrankview: num of args must be >= rank of the source DynRankView"); }
-
-    typedef Kokkos::Impl::ViewMapping< Kokkos::Impl::DynRankSubviewTag , Kokkos::ViewTraits< D*******, P... > , Args... > metafcn ;
-
-    return metafcn::subview( src.rank() , src , args... );
+    Kokkos::abort(
+        "subdynrankview: num of args must be >= rank of the source "
+        "DynRankView");
   }
 
-//Wrapper to allow subview function name
-template< class D , class ... P , class ...Args >
-KOKKOS_INLINE_FUNCTION
-Subdynrankview< ViewTraits<D******* , P...> , Args... >
-subview( const Kokkos::DynRankView< D , P... > &src , Args...args)
-  {
-    return subdynrankview( src , args... );
-  }
+  typedef Kokkos::Impl::ViewMapping<Kokkos::Impl::DynRankSubviewTag,
+                                    Kokkos::ViewTraits<D*******, P...>, Args...>
+      metafcn;
 
-} // namespace Kokkos
+  return metafcn::subview(src.rank(), src, args...);
+}
+
+// Wrapper to allow subview function name
+template <class D, class... P, class... Args>
+KOKKOS_INLINE_FUNCTION Subdynrankview<ViewTraits<D*******, P...>, Args...>
+subview(const Kokkos::DynRankView<D, P...>& src, Args... args) {
+  return subdynrankview(src, args...);
+}
+
+}  // namespace Kokkos
 
 namespace Kokkos {
 
 // overload == and !=
-template< class LT , class ... LP , class RT , class ... RP >
-KOKKOS_INLINE_FUNCTION
-bool operator == ( const DynRankView<LT,LP...> & lhs ,
-                   const DynRankView<RT,RP...> & rhs )
-{
+template <class LT, class... LP, class RT, class... RP>
+KOKKOS_INLINE_FUNCTION bool operator==(const DynRankView<LT, LP...>& lhs,
+                                       const DynRankView<RT, RP...>& rhs) {
   // Same data, layout, dimensions
-  typedef ViewTraits<LT,LP...>  lhs_traits ;
-  typedef ViewTraits<RT,RP...>  rhs_traits ;
+  typedef ViewTraits<LT, LP...> lhs_traits;
+  typedef ViewTraits<RT, RP...> rhs_traits;
 
-  return
-    std::is_same< typename lhs_traits::const_value_type ,
-                  typename rhs_traits::const_value_type >::value &&
-    std::is_same< typename lhs_traits::array_layout ,
-                  typename rhs_traits::array_layout >::value &&
-    std::is_same< typename lhs_traits::memory_space ,
-                  typename rhs_traits::memory_space >::value &&
-    lhs.rank()       ==  rhs.rank() &&
-    lhs.data()       == rhs.data() &&
-    lhs.span()       == rhs.span() &&
-    lhs.extent(0) == rhs.extent(0) &&
-    lhs.extent(1) == rhs.extent(1) &&
-    lhs.extent(2) == rhs.extent(2) &&
-    lhs.extent(3) == rhs.extent(3) &&
-    lhs.extent(4) == rhs.extent(4) &&
-    lhs.extent(5) == rhs.extent(5) &&
-    lhs.extent(6) == rhs.extent(6) &&
-    lhs.extent(7) == rhs.extent(7);
+  return std::is_same<typename lhs_traits::const_value_type,
+                      typename rhs_traits::const_value_type>::value &&
+         std::is_same<typename lhs_traits::array_layout,
+                      typename rhs_traits::array_layout>::value &&
+         std::is_same<typename lhs_traits::memory_space,
+                      typename rhs_traits::memory_space>::value &&
+         lhs.rank() == rhs.rank() && lhs.data() == rhs.data() &&
+         lhs.span() == rhs.span() && lhs.extent(0) == rhs.extent(0) &&
+         lhs.extent(1) == rhs.extent(1) && lhs.extent(2) == rhs.extent(2) &&
+         lhs.extent(3) == rhs.extent(3) && lhs.extent(4) == rhs.extent(4) &&
+         lhs.extent(5) == rhs.extent(5) && lhs.extent(6) == rhs.extent(6) &&
+         lhs.extent(7) == rhs.extent(7);
 }
 
-template< class LT , class ... LP , class RT , class ... RP >
-KOKKOS_INLINE_FUNCTION
-bool operator != ( const DynRankView<LT,LP...> & lhs ,
-                   const DynRankView<RT,RP...> & rhs )
-{
-  return ! ( operator==(lhs,rhs) );
+template <class LT, class... LP, class RT, class... RP>
+KOKKOS_INLINE_FUNCTION bool operator!=(const DynRankView<LT, LP...>& lhs,
+                                       const DynRankView<RT, RP...>& rhs) {
+  return !(operator==(lhs, rhs));
 }
 
-} //end Kokkos
+}  // namespace Kokkos
 
 //----------------------------------------------------------------------------
 //----------------------------------------------------------------------------
 namespace Kokkos {
 namespace Impl {
 
-template< class OutputView , typename Enable = void >
+template <class OutputView, typename Enable = void>
 struct DynRankViewFill {
+  typedef typename OutputView::traits::const_value_type const_value_type;
 
-  typedef typename OutputView::traits::const_value_type  const_value_type ;
-
-  const OutputView output ;
-  const_value_type input ;
+  const OutputView output;
+  const_value_type input;
 
   KOKKOS_INLINE_FUNCTION
-  void operator()( const size_t i0 ) const
-  {
+  void operator()(const size_t i0) const {
     const size_t n1 = output.extent(1);
     const size_t n2 = output.extent(2);
     const size_t n3 = output.extent(3);
@@ -1589,268 +1704,251 @@ struct DynRankViewFill {
     const size_t n5 = output.extent(5);
     const size_t n6 = output.extent(6);
 
-    for ( size_t i1 = 0 ; i1 < n1 ; ++i1 ) {
-    for ( size_t i2 = 0 ; i2 < n2 ; ++i2 ) {
-    for ( size_t i3 = 0 ; i3 < n3 ; ++i3 ) {
-    for ( size_t i4 = 0 ; i4 < n4 ; ++i4 ) {
-    for ( size_t i5 = 0 ; i5 < n5 ; ++i5 ) {
-    for ( size_t i6 = 0 ; i6 < n6 ; ++i6 ) {
-      output.access(i0,i1,i2,i3,i4,i5,i6) = input ;
-    }}}}}}
+    for (size_t i1 = 0; i1 < n1; ++i1) {
+      for (size_t i2 = 0; i2 < n2; ++i2) {
+        for (size_t i3 = 0; i3 < n3; ++i3) {
+          for (size_t i4 = 0; i4 < n4; ++i4) {
+            for (size_t i5 = 0; i5 < n5; ++i5) {
+              for (size_t i6 = 0; i6 < n6; ++i6) {
+                output.access(i0, i1, i2, i3, i4, i5, i6) = input;
+              }
+            }
+          }
+        }
+      }
+    }
   }
 
-  DynRankViewFill( const OutputView & arg_out , const_value_type & arg_in )
-    : output( arg_out ), input( arg_in )
-    {
-      typedef typename OutputView::execution_space  execution_space ;
-      typedef Kokkos::RangePolicy< execution_space > Policy ;
+  DynRankViewFill(const OutputView& arg_out, const_value_type& arg_in)
+      : output(arg_out), input(arg_in) {
+    typedef typename OutputView::execution_space execution_space;
+    typedef Kokkos::RangePolicy<execution_space> Policy;
 
-      const Kokkos::Impl::ParallelFor< DynRankViewFill , Policy > closure( *this , Policy( 0 , output.extent(0) ) );
+    const Kokkos::Impl::ParallelFor<DynRankViewFill, Policy> closure(
+        *this, Policy(0, output.extent(0)));
 
-      closure.execute();
+    closure.execute();
 
-      execution_space().fence();
-    }
+    execution_space().fence();
+  }
 };
 
-template< class OutputView >
-struct DynRankViewFill< OutputView , typename std::enable_if< OutputView::Rank == 0 >::type > {
-  DynRankViewFill( const OutputView & dst , const typename OutputView::const_value_type & src )
-    {
-      Kokkos::Impl::DeepCopy< typename OutputView::memory_space , Kokkos::HostSpace >
-        ( dst.data() , & src , sizeof(typename OutputView::const_value_type) );
-    }
+template <class OutputView>
+struct DynRankViewFill<OutputView,
+                       typename std::enable_if<OutputView::Rank == 0>::type> {
+  DynRankViewFill(const OutputView& dst,
+                  const typename OutputView::const_value_type& src) {
+    Kokkos::Impl::DeepCopy<typename OutputView::memory_space,
+                           Kokkos::HostSpace>(
+        dst.data(), &src, sizeof(typename OutputView::const_value_type));
+  }
 };
 
-template< class OutputView , class InputView , class ExecSpace = typename OutputView::execution_space >
+template <class OutputView, class InputView,
+          class ExecSpace = typename OutputView::execution_space>
 struct DynRankViewRemap {
+  const OutputView output;
+  const InputView input;
+  const size_t n0;
+  const size_t n1;
+  const size_t n2;
+  const size_t n3;
+  const size_t n4;
+  const size_t n5;
+  const size_t n6;
+  const size_t n7;
 
-  const OutputView output ;
-  const InputView  input ;
-  const size_t n0 ;
-  const size_t n1 ;
-  const size_t n2 ;
-  const size_t n3 ;
-  const size_t n4 ;
-  const size_t n5 ;
-  const size_t n6 ;
-  const size_t n7 ;
-
-  DynRankViewRemap( const OutputView & arg_out , const InputView & arg_in )
-    : output( arg_out ), input( arg_in )
-    , n0( std::min( (size_t)arg_out.extent(0) , (size_t)arg_in.extent(0) ) )
-    , n1( std::min( (size_t)arg_out.extent(1) , (size_t)arg_in.extent(1) ) )
-    , n2( std::min( (size_t)arg_out.extent(2) , (size_t)arg_in.extent(2) ) )
-    , n3( std::min( (size_t)arg_out.extent(3) , (size_t)arg_in.extent(3) ) )
-    , n4( std::min( (size_t)arg_out.extent(4) , (size_t)arg_in.extent(4) ) )
-    , n5( std::min( (size_t)arg_out.extent(5) , (size_t)arg_in.extent(5) ) )
-    , n6( std::min( (size_t)arg_out.extent(6) , (size_t)arg_in.extent(6) ) )
-    , n7( std::min( (size_t)arg_out.extent(7) , (size_t)arg_in.extent(7) ) )
-    {
-      typedef Kokkos::RangePolicy< ExecSpace > Policy ;
-      const Kokkos::Impl::ParallelFor< DynRankViewRemap , Policy > closure( *this , Policy( 0 , n0 ) );
-      closure.execute();
-      // Kokkos::fence(); // ??
-    }
+  DynRankViewRemap(const OutputView& arg_out, const InputView& arg_in)
+      : output(arg_out),
+        input(arg_in),
+        n0(std::min((size_t)arg_out.extent(0), (size_t)arg_in.extent(0))),
+        n1(std::min((size_t)arg_out.extent(1), (size_t)arg_in.extent(1))),
+        n2(std::min((size_t)arg_out.extent(2), (size_t)arg_in.extent(2))),
+        n3(std::min((size_t)arg_out.extent(3), (size_t)arg_in.extent(3))),
+        n4(std::min((size_t)arg_out.extent(4), (size_t)arg_in.extent(4))),
+        n5(std::min((size_t)arg_out.extent(5), (size_t)arg_in.extent(5))),
+        n6(std::min((size_t)arg_out.extent(6), (size_t)arg_in.extent(6))),
+        n7(std::min((size_t)arg_out.extent(7), (size_t)arg_in.extent(7))) {
+    typedef Kokkos::RangePolicy<ExecSpace> Policy;
+    const Kokkos::Impl::ParallelFor<DynRankViewRemap, Policy> closure(
+        *this, Policy(0, n0));
+    closure.execute();
+    // Kokkos::fence(); // ??
+  }
 
   KOKKOS_INLINE_FUNCTION
-  void operator()( const size_t i0 ) const
-  {
-    for ( size_t i1 = 0 ; i1 < n1 ; ++i1 ) {
-    for ( size_t i2 = 0 ; i2 < n2 ; ++i2 ) {
-    for ( size_t i3 = 0 ; i3 < n3 ; ++i3 ) {
-    for ( size_t i4 = 0 ; i4 < n4 ; ++i4 ) {
-    for ( size_t i5 = 0 ; i5 < n5 ; ++i5 ) {
-    for ( size_t i6 = 0 ; i6 < n6 ; ++i6 ) {
-      output.access(i0,i1,i2,i3,i4,i5,i6) = input.access(i0,i1,i2,i3,i4,i5,i6);
-    }}}}}}
+  void operator()(const size_t i0) const {
+    for (size_t i1 = 0; i1 < n1; ++i1) {
+      for (size_t i2 = 0; i2 < n2; ++i2) {
+        for (size_t i3 = 0; i3 < n3; ++i3) {
+          for (size_t i4 = 0; i4 < n4; ++i4) {
+            for (size_t i5 = 0; i5 < n5; ++i5) {
+              for (size_t i6 = 0; i6 < n6; ++i6) {
+                output.access(i0, i1, i2, i3, i4, i5, i6) =
+                    input.access(i0, i1, i2, i3, i4, i5, i6);
+              }
+            }
+          }
+        }
+      }
+    }
   }
 };
 
 } /* namespace Impl */
 } /* namespace Kokkos */
 
-
 namespace Kokkos {
 
 /** \brief  Deep copy a value from Host memory into a view.  */
-template< class DT , class ... DP >
-inline
-void deep_copy
-  ( const DynRankView<DT,DP...> & dst
-  , typename ViewTraits<DT,DP...>::const_value_type & value
-  , typename std::enable_if<
-    std::is_same< typename ViewTraits<DT,DP...>::specialize , void >::value
-    >::type * = 0 )
-{
+template <class DT, class... DP>
+inline void deep_copy(
+    const DynRankView<DT, DP...>& dst,
+    typename ViewTraits<DT, DP...>::const_value_type& value,
+    typename std::enable_if<std::is_same<
+        typename ViewTraits<DT, DP...>::specialize, void>::value>::type* = 0) {
   static_assert(
-    std::is_same< typename ViewTraits<DT,DP...>::non_const_value_type ,
-                  typename ViewTraits<DT,DP...>::value_type >::value
-    , "deep_copy requires non-const type" );
+      std::is_same<typename ViewTraits<DT, DP...>::non_const_value_type,
+                   typename ViewTraits<DT, DP...>::value_type>::value,
+      "deep_copy requires non-const type");
 
-  Kokkos::Impl::DynRankViewFill< DynRankView<DT,DP...> >( dst , value );
+  Kokkos::Impl::DynRankViewFill<DynRankView<DT, DP...> >(dst, value);
 }
 
 /** \brief  Deep copy into a value in Host memory from a view.  */
-template< class ST , class ... SP >
-inline
-void deep_copy
-  ( typename ViewTraits<ST,SP...>::non_const_value_type & dst
-  , const DynRankView<ST,SP...> & src
-  , typename std::enable_if<
-    std::is_same< typename ViewTraits<ST,SP...>::specialize , void >::value
-    >::type * = 0 )
-{
-  if ( src.rank() != 0 )
-  {
+template <class ST, class... SP>
+inline void deep_copy(
+    typename ViewTraits<ST, SP...>::non_const_value_type& dst,
+    const DynRankView<ST, SP...>& src,
+    typename std::enable_if<std::is_same<
+        typename ViewTraits<ST, SP...>::specialize, void>::value>::type* = 0) {
+  if (src.rank() != 0) {
     Kokkos::abort("");
   }
 
-  typedef ViewTraits<ST,SP...>               src_traits ;
-  typedef typename src_traits::memory_space  src_memory_space ;
-  Kokkos::Impl::DeepCopy< HostSpace , src_memory_space >( & dst , src.data() , sizeof(ST) );
+  typedef ViewTraits<ST, SP...> src_traits;
+  typedef typename src_traits::memory_space src_memory_space;
+  Kokkos::Impl::DeepCopy<HostSpace, src_memory_space>(&dst, src.data(),
+                                                      sizeof(ST));
 }
 
 //----------------------------------------------------------------------------
-/** \brief  A deep copy between views of the default specialization, compatible type,
- *          same rank, same contiguous layout.
+/** \brief  A deep copy between views of the default specialization, compatible
+ * type, same rank, same contiguous layout.
  */
-template< class DstType , class SrcType >
-inline
-void deep_copy
-  ( const DstType & dst
-  , const SrcType & src
-  , typename std::enable_if<(
-    std::is_same< typename DstType::traits::specialize , void >::value &&
-    std::is_same< typename SrcType::traits::specialize , void >::value
-    &&
-    ( Kokkos::is_dyn_rank_view<DstType>::value || Kokkos::is_dyn_rank_view<SrcType>::value)
-  )>::type * = 0 )
-{
+template <class DstType, class SrcType>
+inline void deep_copy(
+    const DstType& dst, const SrcType& src,
+    typename std::enable_if<
+        (std::is_same<typename DstType::traits::specialize, void>::value &&
+         std::is_same<typename SrcType::traits::specialize, void>::value &&
+         (Kokkos::is_dyn_rank_view<DstType>::value ||
+          Kokkos::is_dyn_rank_view<SrcType>::value))>::type* = 0) {
   static_assert(
-    std::is_same< typename DstType::traits::value_type ,
-                  typename DstType::traits::non_const_value_type >::value
-    , "deep_copy requires non-const destination type" );
+      std::is_same<typename DstType::traits::value_type,
+                   typename DstType::traits::non_const_value_type>::value,
+      "deep_copy requires non-const destination type");
 
-  typedef DstType  dst_type ;
-  typedef SrcType  src_type ;
+  typedef DstType dst_type;
+  typedef SrcType src_type;
 
-  typedef typename dst_type::execution_space  dst_execution_space ;
-  typedef typename src_type::execution_space  src_execution_space ;
-  typedef typename dst_type::memory_space     dst_memory_space ;
-  typedef typename src_type::memory_space     src_memory_space ;
+  typedef typename dst_type::execution_space dst_execution_space;
+  typedef typename src_type::execution_space src_execution_space;
+  typedef typename dst_type::memory_space dst_memory_space;
+  typedef typename src_type::memory_space src_memory_space;
 
-  enum { DstExecCanAccessSrc =
-   Kokkos::Impl::SpaceAccessibility< dst_execution_space , src_memory_space >::accessible };
+  enum {
+    DstExecCanAccessSrc =
+        Kokkos::Impl::SpaceAccessibility<dst_execution_space,
+                                         src_memory_space>::accessible
+  };
 
-  enum { SrcExecCanAccessDst =
-   Kokkos::Impl::SpaceAccessibility< src_execution_space , dst_memory_space >::accessible };
-
-  if ( (void *) dst.data() != (void*) src.data() ) {
+  enum {
+    SrcExecCanAccessDst =
+        Kokkos::Impl::SpaceAccessibility<src_execution_space,
+                                         dst_memory_space>::accessible
+  };
 
+  if ((void*)dst.data() != (void*)src.data()) {
     // Concern: If overlapping views then a parallel copy will be erroneous.
     // ...
 
-    // If same type, equal layout, equal dimensions, equal span, and contiguous memory then can byte-wise copy
-    if ( rank(src) == 0 && rank(dst) == 0 )
-    {
-      typedef typename dst_type::value_type    value_type ;
-      Kokkos::Impl::DeepCopy< dst_memory_space , src_memory_space >( dst.data() , src.data() , sizeof(value_type) );
-    }
-    else if ( std::is_same< typename DstType::traits::value_type ,
-                       typename SrcType::traits::non_const_value_type >::value &&
-         (
-           ( std::is_same< typename DstType::traits::array_layout ,
-                           typename SrcType::traits::array_layout >::value
-             &&
-             ( std::is_same< typename DstType::traits::array_layout ,
-                             typename Kokkos::LayoutLeft>::value
-             ||
-               std::is_same< typename DstType::traits::array_layout ,
-                             typename Kokkos::LayoutRight>::value
-             )
-           )
-           ||
-           (
-             rank(dst) == 1
-             &&
-             rank(src) == 1
-           )
-         ) &&
-         dst.span_is_contiguous() &&
-         src.span_is_contiguous() &&
-         dst.span() == src.span() &&
-         dst.extent(0) == src.extent(0) &&
-
-         dst.extent(1) == src.extent(1) &&
-         dst.extent(2) == src.extent(2) &&
-         dst.extent(3) == src.extent(3) &&
-         dst.extent(4) == src.extent(4) &&
-         dst.extent(5) == src.extent(5) &&
-         dst.extent(6) == src.extent(6) &&
-         dst.extent(7) == src.extent(7) ) {
+    // If same type, equal layout, equal dimensions, equal span, and contiguous
+    // memory then can byte-wise copy
+    if (rank(src) == 0 && rank(dst) == 0) {
+      typedef typename dst_type::value_type value_type;
+      Kokkos::Impl::DeepCopy<dst_memory_space, src_memory_space>(
+          dst.data(), src.data(), sizeof(value_type));
+    } else if (std::is_same<
+                   typename DstType::traits::value_type,
+                   typename SrcType::traits::non_const_value_type>::value &&
+               ((std::is_same<typename DstType::traits::array_layout,
+                              typename SrcType::traits::array_layout>::value &&
+                 (std::is_same<typename DstType::traits::array_layout,
+                               typename Kokkos::LayoutLeft>::value ||
+                  std::is_same<typename DstType::traits::array_layout,
+                               typename Kokkos::LayoutRight>::value)) ||
+                (rank(dst) == 1 && rank(src) == 1)) &&
+               dst.span_is_contiguous() && src.span_is_contiguous() &&
+               dst.span() == src.span() && dst.extent(0) == src.extent(0) &&
 
+               dst.extent(1) == src.extent(1) &&
+               dst.extent(2) == src.extent(2) &&
+               dst.extent(3) == src.extent(3) &&
+               dst.extent(4) == src.extent(4) &&
+               dst.extent(5) == src.extent(5) &&
+               dst.extent(6) == src.extent(6) &&
+               dst.extent(7) == src.extent(7)) {
       const size_t nbytes = sizeof(typename dst_type::value_type) * dst.span();
 
-      Kokkos::Impl::DeepCopy< dst_memory_space , src_memory_space >( dst.data() , src.data() , nbytes );
-    }
-    else if ( std::is_same< typename DstType::traits::value_type ,
-                            typename SrcType::traits::non_const_value_type >::value &&
-         (
-           ( std::is_same< typename DstType::traits::array_layout ,
-                           typename SrcType::traits::array_layout >::value
-             &&
-             std::is_same< typename DstType::traits::array_layout ,
-                          typename Kokkos::LayoutStride>::value
-           )
-           ||
-           (
-             rank(dst) == 1
-             &&
-             rank(src) == 1
-           )
-         ) &&
-         dst.span_is_contiguous() &&
-         src.span_is_contiguous() &&
-         dst.span() == src.span() &&
-         dst.extent(0) == src.extent(0) &&
-         dst.extent(1) == src.extent(1) &&
-         dst.extent(2) == src.extent(2) &&
-         dst.extent(3) == src.extent(3) &&
-         dst.extent(4) == src.extent(4) &&
-         dst.extent(5) == src.extent(5) &&
-         dst.extent(6) == src.extent(6) &&
-         dst.extent(7) == src.extent(7) &&
-         dst.stride_0() == src.stride_0() &&
-         dst.stride_1() == src.stride_1() &&
-         dst.stride_2() == src.stride_2() &&
-         dst.stride_3() == src.stride_3() &&
-         dst.stride_4() == src.stride_4() &&
-         dst.stride_5() == src.stride_5() &&
-         dst.stride_6() == src.stride_6() &&
-         dst.stride_7() == src.stride_7()
-         ) {
-
+      Kokkos::Impl::DeepCopy<dst_memory_space, src_memory_space>(
+          dst.data(), src.data(), nbytes);
+    } else if (std::is_same<
+                   typename DstType::traits::value_type,
+                   typename SrcType::traits::non_const_value_type>::value &&
+               ((std::is_same<typename DstType::traits::array_layout,
+                              typename SrcType::traits::array_layout>::value &&
+                 std::is_same<typename DstType::traits::array_layout,
+                              typename Kokkos::LayoutStride>::value) ||
+                (rank(dst) == 1 && rank(src) == 1)) &&
+               dst.span_is_contiguous() && src.span_is_contiguous() &&
+               dst.span() == src.span() && dst.extent(0) == src.extent(0) &&
+               dst.extent(1) == src.extent(1) &&
+               dst.extent(2) == src.extent(2) &&
+               dst.extent(3) == src.extent(3) &&
+               dst.extent(4) == src.extent(4) &&
+               dst.extent(5) == src.extent(5) &&
+               dst.extent(6) == src.extent(6) &&
+               dst.extent(7) == src.extent(7) &&
+               dst.stride_0() == src.stride_0() &&
+               dst.stride_1() == src.stride_1() &&
+               dst.stride_2() == src.stride_2() &&
+               dst.stride_3() == src.stride_3() &&
+               dst.stride_4() == src.stride_4() &&
+               dst.stride_5() == src.stride_5() &&
+               dst.stride_6() == src.stride_6() &&
+               dst.stride_7() == src.stride_7()) {
       const size_t nbytes = sizeof(typename dst_type::value_type) * dst.span();
 
-      Kokkos::Impl::DeepCopy< dst_memory_space , src_memory_space >( dst.data() , src.data() , nbytes );
-    }
-    else if ( DstExecCanAccessSrc ) {
-      // Copying data between views in accessible memory spaces and either non-contiguous or incompatible shape.
-      Kokkos::Impl::DynRankViewRemap< dst_type , src_type >( dst , src );
-    }
-    else if ( SrcExecCanAccessDst ) {
-      // Copying data between views in accessible memory spaces and either non-contiguous or incompatible shape.
-      Kokkos::Impl::DynRankViewRemap< dst_type , src_type , src_execution_space >( dst , src );
-    }
-    else {
-      Kokkos::Impl::throw_runtime_exception("deep_copy given views that would require a temporary allocation");
+      Kokkos::Impl::DeepCopy<dst_memory_space, src_memory_space>(
+          dst.data(), src.data(), nbytes);
+    } else if (DstExecCanAccessSrc) {
+      // Copying data between views in accessible memory spaces and either
+      // non-contiguous or incompatible shape.
+      Kokkos::Impl::DynRankViewRemap<dst_type, src_type>(dst, src);
+    } else if (SrcExecCanAccessDst) {
+      // Copying data between views in accessible memory spaces and either
+      // non-contiguous or incompatible shape.
+      Kokkos::Impl::DynRankViewRemap<dst_type, src_type, src_execution_space>(
+          dst, src);
+    } else {
+      Kokkos::Impl::throw_runtime_exception(
+          "deep_copy given views that would require a temporary allocation");
     }
   }
 }
 
-} //end Kokkos
-
+}  // namespace Kokkos
 
 //----------------------------------------------------------------------------
 //----------------------------------------------------------------------------
@@ -1858,223 +1956,219 @@ void deep_copy
 namespace Kokkos {
 namespace Impl {
 
-
 // Deduce Mirror Types
-template<class Space, class T, class ... P>
+template <class Space, class T, class... P>
 struct MirrorDRViewType {
   // The incoming view_type
-  typedef typename Kokkos::DynRankView<T,P...> src_view_type;
+  typedef typename Kokkos::DynRankView<T, P...> src_view_type;
   // The memory space for the mirror view
   typedef typename Space::memory_space memory_space;
   // Check whether it is the same memory space
-  enum { is_same_memspace = std::is_same<memory_space,typename src_view_type::memory_space>::value };
+  enum {
+    is_same_memspace =
+        std::is_same<memory_space, typename src_view_type::memory_space>::value
+  };
   // The array_layout
   typedef typename src_view_type::array_layout array_layout;
-  // The data type (we probably want it non-const since otherwise we can't even deep_copy to it.
+  // The data type (we probably want it non-const since otherwise we can't even
+  // deep_copy to it.
   typedef typename src_view_type::non_const_data_type data_type;
   // The destination view type if it is not the same memory space
-  typedef Kokkos::DynRankView<data_type,array_layout,Space> dest_view_type;
+  typedef Kokkos::DynRankView<data_type, array_layout, Space> dest_view_type;
   // If it is the same memory_space return the existsing view_type
   // This will also keep the unmanaged trait if necessary
-  typedef typename std::conditional<is_same_memspace,src_view_type,dest_view_type>::type view_type;
+  typedef typename std::conditional<is_same_memspace, src_view_type,
+                                    dest_view_type>::type view_type;
 };
 
-template<class Space, class T, class ... P>
+template <class Space, class T, class... P>
 struct MirrorDRVType {
   // The incoming view_type
-  typedef typename Kokkos::DynRankView<T,P...> src_view_type;
+  typedef typename Kokkos::DynRankView<T, P...> src_view_type;
   // The memory space for the mirror view
   typedef typename Space::memory_space memory_space;
   // Check whether it is the same memory space
-  enum { is_same_memspace = std::is_same<memory_space,typename src_view_type::memory_space>::value };
+  enum {
+    is_same_memspace =
+        std::is_same<memory_space, typename src_view_type::memory_space>::value
+  };
   // The array_layout
   typedef typename src_view_type::array_layout array_layout;
-  // The data type (we probably want it non-const since otherwise we can't even deep_copy to it.
+  // The data type (we probably want it non-const since otherwise we can't even
+  // deep_copy to it.
   typedef typename src_view_type::non_const_data_type data_type;
   // The destination view type if it is not the same memory space
-  typedef Kokkos::DynRankView<data_type,array_layout,Space> view_type;
+  typedef Kokkos::DynRankView<data_type, array_layout, Space> view_type;
 };
 
+}  // namespace Impl
+
+template <class T, class... P>
+inline typename DynRankView<T, P...>::HostMirror create_mirror(
+    const DynRankView<T, P...>& src,
+    typename std::enable_if<
+        std::is_same<typename ViewTraits<T, P...>::specialize, void>::value &&
+        !std::is_same<typename Kokkos::ViewTraits<T, P...>::array_layout,
+                      Kokkos::LayoutStride>::value>::type* = 0) {
+  typedef DynRankView<T, P...> src_type;
+  typedef typename src_type::HostMirror dst_type;
+
+  return dst_type(std::string(src.label()).append("_mirror"),
+                  Impl::reconstructLayout(src.layout(), src.rank()));
 }
 
-template< class T , class ... P >
-inline
-typename DynRankView<T,P...>::HostMirror
-create_mirror( const DynRankView<T,P...> & src
-             , typename std::enable_if<
-                 std::is_same< typename ViewTraits<T,P...>::specialize , void >::value &&
-                 ! std::is_same< typename Kokkos::ViewTraits<T,P...>::array_layout
-                               , Kokkos::LayoutStride >::value
-               >::type * = 0
-             )
-{
-  typedef DynRankView<T,P...>                   src_type ;
-  typedef typename src_type::HostMirror  dst_type ;
+template <class T, class... P>
+inline typename DynRankView<T, P...>::HostMirror create_mirror(
+    const DynRankView<T, P...>& src,
+    typename std::enable_if<
+        std::is_same<typename ViewTraits<T, P...>::specialize, void>::value &&
+        std::is_same<typename Kokkos::ViewTraits<T, P...>::array_layout,
+                     Kokkos::LayoutStride>::value>::type* = 0) {
+  typedef DynRankView<T, P...> src_type;
+  typedef typename src_type::HostMirror dst_type;
 
-  return dst_type( std::string( src.label() ).append("_mirror")
-                 , Impl::reconstructLayout(src.layout(), src.rank()) );
+  return dst_type(std::string(src.label()).append("_mirror"),
+                  Impl::reconstructLayout(src.layout(), src.rank()));
 }
 
-
-template< class T , class ... P >
-inline
-typename DynRankView<T,P...>::HostMirror
-create_mirror( const DynRankView<T,P...> & src
-             , typename std::enable_if<
-                 std::is_same< typename ViewTraits<T,P...>::specialize , void >::value &&
-                 std::is_same< typename Kokkos::ViewTraits<T,P...>::array_layout
-                             , Kokkos::LayoutStride >::value
-               >::type * = 0
-             )
-{
-  typedef DynRankView<T,P...>                   src_type ;
-  typedef typename src_type::HostMirror  dst_type ;
-
-  return dst_type( std::string( src.label() ).append("_mirror")
-                 , Impl::reconstructLayout(src.layout(), src.rank()) );
-}
-
-
 // Create a mirror in a new space (specialization for different space)
-template<class Space, class T, class ... P>
-typename Impl::MirrorDRVType<Space,T,P ...>::view_type
-create_mirror(const Space& , const Kokkos::DynRankView<T,P...> & src
-             , typename std::enable_if<
-                 std::is_same< typename ViewTraits<T,P...>::specialize , void >::value
-               >::type * = 0) {
-  return typename Impl::MirrorDRVType<Space,T,P ...>::view_type(src.label(), Impl::reconstructLayout(src.layout(), src.rank()) );
+template <class Space, class T, class... P>
+typename Impl::MirrorDRVType<Space, T, P...>::view_type create_mirror(
+    const Space&, const Kokkos::DynRankView<T, P...>& src,
+    typename std::enable_if<std::is_same<
+        typename ViewTraits<T, P...>::specialize, void>::value>::type* = 0) {
+  return typename Impl::MirrorDRVType<Space, T, P...>::view_type(
+      src.label(), Impl::reconstructLayout(src.layout(), src.rank()));
 }
 
-template< class T , class ... P >
-inline
-typename DynRankView<T,P...>::HostMirror
-create_mirror_view( const DynRankView<T,P...> & src
-                  , typename std::enable_if<(
-                      std::is_same< typename DynRankView<T,P...>::memory_space
-                                  , typename DynRankView<T,P...>::HostMirror::memory_space
-                                  >::value
-                      &&
-                      std::is_same< typename DynRankView<T,P...>::data_type
-                                  , typename DynRankView<T,P...>::HostMirror::data_type
-                                  >::value
-                    )>::type * = 0
-                  )
-{
-  return src ;
+template <class T, class... P>
+inline typename DynRankView<T, P...>::HostMirror create_mirror_view(
+    const DynRankView<T, P...>& src,
+    typename std::enable_if<
+        (std::is_same<
+             typename DynRankView<T, P...>::memory_space,
+             typename DynRankView<T, P...>::HostMirror::memory_space>::value &&
+         std::is_same<typename DynRankView<T, P...>::data_type,
+                      typename DynRankView<T, P...>::HostMirror::data_type>::
+             value)>::type* = 0) {
+  return src;
 }
 
-template< class T , class ... P >
-inline
-typename DynRankView<T,P...>::HostMirror
-create_mirror_view( const DynRankView<T,P...> & src
-                  , typename std::enable_if< ! (
-                      std::is_same< typename DynRankView<T,P...>::memory_space
-                                  , typename DynRankView<T,P...>::HostMirror::memory_space
-                                  >::value
-                      &&
-                      std::is_same< typename DynRankView<T,P...>::data_type
-                                  , typename DynRankView<T,P...>::HostMirror::data_type
-                                  >::value
-                    )>::type * = 0
-                  )
-{
-  return Kokkos::create_mirror( src );
+template <class T, class... P>
+inline typename DynRankView<T, P...>::HostMirror create_mirror_view(
+    const DynRankView<T, P...>& src,
+    typename std::enable_if<
+        !(std::is_same<
+              typename DynRankView<T, P...>::memory_space,
+              typename DynRankView<T, P...>::HostMirror::memory_space>::value &&
+          std::is_same<typename DynRankView<T, P...>::data_type,
+                       typename DynRankView<T, P...>::HostMirror::data_type>::
+              value)>::type* = 0) {
+  return Kokkos::create_mirror(src);
 }
 
 // Create a mirror view in a new space (specialization for same space)
-template<class Space, class T, class ... P>
-typename Impl::MirrorDRViewType<Space,T,P ...>::view_type
-create_mirror_view(const Space& , const Kokkos::DynRankView<T,P...> & src
-  , typename std::enable_if<Impl::MirrorDRViewType<Space,T,P ...>::is_same_memspace>::type* = 0 ) {
+template <class Space, class T, class... P>
+typename Impl::MirrorDRViewType<Space, T, P...>::view_type create_mirror_view(
+    const Space&, const Kokkos::DynRankView<T, P...>& src,
+    typename std::enable_if<
+        Impl::MirrorDRViewType<Space, T, P...>::is_same_memspace>::type* = 0) {
   return src;
 }
 
 // Create a mirror view in a new space (specialization for different space)
-template<class Space, class T, class ... P>
-typename Impl::MirrorDRViewType<Space,T,P ...>::view_type
-create_mirror_view(const Space& , const Kokkos::DynRankView<T,P...> & src
-  , typename std::enable_if<!Impl::MirrorDRViewType<Space,T,P ...>::is_same_memspace>::type* = 0 ) {
-  return typename Impl::MirrorDRViewType<Space,T,P ...>::view_type(src.label(), Impl::reconstructLayout(src.layout(), src.rank()) );
+template <class Space, class T, class... P>
+typename Impl::MirrorDRViewType<Space, T, P...>::view_type create_mirror_view(
+    const Space&, const Kokkos::DynRankView<T, P...>& src,
+    typename std::enable_if<
+        !Impl::MirrorDRViewType<Space, T, P...>::is_same_memspace>::type* = 0) {
+  return typename Impl::MirrorDRViewType<Space, T, P...>::view_type(
+      src.label(), Impl::reconstructLayout(src.layout(), src.rank()));
 }
 
-// Create a mirror view and deep_copy in a new space (specialization for same space)
-template<class Space, class T, class ... P>
-typename Impl::MirrorDRViewType<Space,T,P ...>::view_type
-create_mirror_view_and_copy(const Space& , const Kokkos::DynRankView<T,P...> & src
-  , std::string const& name = ""
-  , typename std::enable_if<Impl::MirrorDRViewType<Space,T,P ...>::is_same_memspace>::type* = 0 ) {
+// Create a mirror view and deep_copy in a new space (specialization for same
+// space)
+template <class Space, class T, class... P>
+typename Impl::MirrorDRViewType<Space, T, P...>::view_type
+create_mirror_view_and_copy(
+    const Space&, const Kokkos::DynRankView<T, P...>& src,
+    std::string const& name = "",
+    typename std::enable_if<
+        Impl::MirrorDRViewType<Space, T, P...>::is_same_memspace>::type* = 0) {
   (void)name;
   return src;
 }
 
-// Create a mirror view and deep_copy in a new space (specialization for different space)
-template<class Space, class T, class ... P>
-typename Impl::MirrorDRViewType<Space,T,P ...>::view_type
-create_mirror_view_and_copy(const Space& , const Kokkos::DynRankView<T,P...> & src
-  , std::string const& name = ""
-  , typename std::enable_if<!Impl::MirrorDRViewType<Space,T,P ...>::is_same_memspace>::type* = 0 ) {
-  using Mirror = typename Impl::MirrorDRViewType<Space,T,P ...>::view_type;
+// Create a mirror view and deep_copy in a new space (specialization for
+// different space)
+template <class Space, class T, class... P>
+typename Impl::MirrorDRViewType<Space, T, P...>::view_type
+create_mirror_view_and_copy(
+    const Space&, const Kokkos::DynRankView<T, P...>& src,
+    std::string const& name = "",
+    typename std::enable_if<
+        !Impl::MirrorDRViewType<Space, T, P...>::is_same_memspace>::type* = 0) {
+  using Mirror = typename Impl::MirrorDRViewType<Space, T, P...>::view_type;
   std::string label = name.empty() ? src.label() : name;
-  auto mirror = Mirror( Kokkos::ViewAllocateWithoutInitializing(label), Impl::reconstructLayout(src.layout(), src.rank()) );
+  auto mirror       = Mirror(Kokkos::ViewAllocateWithoutInitializing(label),
+                       Impl::reconstructLayout(src.layout(), src.rank()));
   deep_copy(mirror, src);
   return mirror;
 }
 
-} //end Kokkos
-
+}  // namespace Kokkos
 
 //----------------------------------------------------------------------------
 //----------------------------------------------------------------------------
 
 namespace Kokkos {
-/** \brief  Resize a view with copying old data to new data at the corresponding indices. */
-template< class T , class ... P >
-inline
-void resize( DynRankView<T,P...> & v ,
-             const size_t n0 =KOKKOS_INVALID_INDEX ,
-             const size_t n1 =KOKKOS_INVALID_INDEX ,
-             const size_t n2 =KOKKOS_INVALID_INDEX ,
-             const size_t n3 =KOKKOS_INVALID_INDEX ,
-             const size_t n4 =KOKKOS_INVALID_INDEX ,
-             const size_t n5 =KOKKOS_INVALID_INDEX ,
-             const size_t n6 =KOKKOS_INVALID_INDEX ,
-             const size_t n7 =KOKKOS_INVALID_INDEX )
-{
-  typedef DynRankView<T,P...> drview_type ;
+/** \brief  Resize a view with copying old data to new data at the corresponding
+ * indices. */
+template <class T, class... P>
+inline void resize(DynRankView<T, P...>& v,
+                   const size_t n0 = KOKKOS_INVALID_INDEX,
+                   const size_t n1 = KOKKOS_INVALID_INDEX,
+                   const size_t n2 = KOKKOS_INVALID_INDEX,
+                   const size_t n3 = KOKKOS_INVALID_INDEX,
+                   const size_t n4 = KOKKOS_INVALID_INDEX,
+                   const size_t n5 = KOKKOS_INVALID_INDEX,
+                   const size_t n6 = KOKKOS_INVALID_INDEX,
+                   const size_t n7 = KOKKOS_INVALID_INDEX) {
+  typedef DynRankView<T, P...> drview_type;
 
-  static_assert( Kokkos::ViewTraits<T,P...>::is_managed , "Can only resize managed views" );
+  static_assert(Kokkos::ViewTraits<T, P...>::is_managed,
+                "Can only resize managed views");
 
-  drview_type v_resized( v.label(), n0, n1, n2, n3, n4, n5, n6 );
+  drview_type v_resized(v.label(), n0, n1, n2, n3, n4, n5, n6);
 
-  Kokkos::Impl::DynRankViewRemap< drview_type , drview_type >( v_resized, v );
+  Kokkos::Impl::DynRankViewRemap<drview_type, drview_type>(v_resized, v);
 
-  v = v_resized ;
+  v = v_resized;
 }
 
-/** \brief  Resize a view with copying old data to new data at the corresponding indices. */
-template< class T , class ... P >
-inline
-void realloc( DynRankView<T,P...> & v ,
-              const size_t n0 =KOKKOS_INVALID_INDEX ,
-              const size_t n1 =KOKKOS_INVALID_INDEX ,
-              const size_t n2 =KOKKOS_INVALID_INDEX ,
-              const size_t n3 =KOKKOS_INVALID_INDEX ,
-              const size_t n4 =KOKKOS_INVALID_INDEX ,
-              const size_t n5 =KOKKOS_INVALID_INDEX ,
-              const size_t n6 =KOKKOS_INVALID_INDEX ,
-              const size_t n7 =KOKKOS_INVALID_INDEX )
-{
-  typedef DynRankView<T,P...>  drview_type ;
+/** \brief  Resize a view with copying old data to new data at the corresponding
+ * indices. */
+template <class T, class... P>
+inline void realloc(DynRankView<T, P...>& v,
+                    const size_t n0 = KOKKOS_INVALID_INDEX,
+                    const size_t n1 = KOKKOS_INVALID_INDEX,
+                    const size_t n2 = KOKKOS_INVALID_INDEX,
+                    const size_t n3 = KOKKOS_INVALID_INDEX,
+                    const size_t n4 = KOKKOS_INVALID_INDEX,
+                    const size_t n5 = KOKKOS_INVALID_INDEX,
+                    const size_t n6 = KOKKOS_INVALID_INDEX,
+                    const size_t n7 = KOKKOS_INVALID_INDEX) {
+  typedef DynRankView<T, P...> drview_type;
 
-  static_assert( Kokkos::ViewTraits<T,P...>::is_managed , "Can only realloc managed views" );
+  static_assert(Kokkos::ViewTraits<T, P...>::is_managed,
+                "Can only realloc managed views");
 
   const std::string label = v.label();
 
-  v = drview_type(); // Deallocate first, if the only view to allocation
-  v = drview_type( label, n0, n1, n2, n3, n4, n5, n6 );
+  v = drview_type();  // Deallocate first, if the only view to allocation
+  v = drview_type(label, n0, n1, n2, n3, n4, n5, n6);
 }
 
-} //end Kokkos
+}  // namespace Kokkos
 
 #endif
-
diff --git a/lib/kokkos/containers/src/Kokkos_DynamicView.hpp b/lib/kokkos/containers/src/Kokkos_DynamicView.hpp
index 37d56e7cfb..35a64d164f 100644
--- a/lib/kokkos/containers/src/Kokkos_DynamicView.hpp
+++ b/lib/kokkos/containers/src/Kokkos_DynamicView.hpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -53,536 +54,550 @@ namespace Kokkos {
 namespace Experimental {
 
 // Simple metafunction for choosing memory space
-// In the current implementation, if memory_space == CudaSpace, 
+// In the current implementation, if memory_space == CudaSpace,
 // use CudaUVMSpace for the chunk 'array' allocation, which
-// contains will contain pointers to chunks of memory allocated 
+// contains will contain pointers to chunks of memory allocated
 // in CudaSpace
 namespace Impl {
-template < class MemSpace >
+template <class MemSpace>
 struct ChunkArraySpace {
   using memory_space = MemSpace;
 };
 
 #ifdef KOKKOS_ENABLE_CUDA
 template <>
-struct ChunkArraySpace< Kokkos::CudaSpace > {
+struct ChunkArraySpace<Kokkos::CudaSpace> {
   using memory_space = typename Kokkos::CudaUVMSpace;
 };
 #endif
 #ifdef KOKKOS_ENABLE_ROCM
 template <>
-struct ChunkArraySpace< Kokkos::Experimental::ROCmSpace > {
+struct ChunkArraySpace<Kokkos::Experimental::ROCmSpace> {
   using memory_space = typename Kokkos::Experimental::ROCmHostPinnedSpace;
 };
 #endif
-} // end namespace Impl
+}  // end namespace Impl
 
 /** \brief Dynamic views are restricted to rank-one and no layout.
  *         Resize only occurs on host outside of parallel_regions.
  *         Subviews are not allowed.
  */
-template< typename DataType , typename ... P >
-class DynamicView : public Kokkos::ViewTraits< DataType , P ... >
-{
-public:
+template <typename DataType, typename... P>
+class DynamicView : public Kokkos::ViewTraits<DataType, P...> {
+ public:
+  typedef Kokkos::ViewTraits<DataType, P...> traits;
 
-  typedef Kokkos::ViewTraits< DataType , P ... >  traits ;
+ private:
+  template <class, class...>
+  friend class DynamicView;
 
-private:
+  typedef Kokkos::Impl::SharedAllocationTracker track_type;
 
-  template< class , class ... > friend class DynamicView ;
+  static_assert(traits::rank == 1 && traits::rank_dynamic == 1,
+                "DynamicView must be rank-one");
 
-  typedef Kokkos::Impl::SharedAllocationTracker   track_type ;
-
-  static_assert( traits::rank == 1 && traits::rank_dynamic == 1
-               , "DynamicView must be rank-one" );
-
-  // It is assumed that the value_type is trivially copyable; 
+  // It is assumed that the value_type is trivially copyable;
   // when this is not the case, potential problems can occur.
-  static_assert( std::is_same< typename traits::specialize , void >::value
-               , "DynamicView only implemented for non-specialized View type");
+  static_assert(std::is_same<typename traits::specialize, void>::value,
+                "DynamicView only implemented for non-specialized View type");
 
+  template <class Space, bool = Kokkos::Impl::MemorySpaceAccess<
+                             Space, typename traits::memory_space>::accessible>
+  struct verify_space {
+    KOKKOS_FORCEINLINE_FUNCTION static void check() {}
+  };
 
-  template< class Space , bool = Kokkos::Impl::MemorySpaceAccess< Space , typename traits::memory_space >::accessible > struct verify_space
-    { KOKKOS_FORCEINLINE_FUNCTION static void check() {} };
-
-  template< class Space > struct verify_space<Space,false>
-    { KOKKOS_FORCEINLINE_FUNCTION static void check()
-        { Kokkos::abort("Kokkos::DynamicView ERROR: attempt to access inaccessible memory space"); };
+  template <class Space>
+  struct verify_space<Space, false> {
+    KOKKOS_FORCEINLINE_FUNCTION static void check() {
+      Kokkos::abort(
+          "Kokkos::DynamicView ERROR: attempt to access inaccessible memory "
+          "space");
     };
+  };
 
-private:
-
-  track_type                     m_track ;
-  typename traits::value_type ** m_chunks ;      // array of pointers to 'chunks' of memory
-  unsigned                       m_chunk_shift ; // ceil(log2(m_chunk_size))
-  unsigned                       m_chunk_mask ;  // m_chunk_size - 1
-  unsigned                       m_chunk_max ;   // number of entries in the chunk array - each pointing to a chunk of extent == m_chunk_size entries
-  unsigned                       m_chunk_size ;  // 2 << (m_chunk_shift - 1)
-
-public:
+ private:
+  track_type m_track;
+  typename traits::value_type**
+      m_chunks;            // array of pointers to 'chunks' of memory
+  unsigned m_chunk_shift;  // ceil(log2(m_chunk_size))
+  unsigned m_chunk_mask;   // m_chunk_size - 1
+  unsigned m_chunk_max;  // number of entries in the chunk array - each pointing
+                         // to a chunk of extent == m_chunk_size entries
+  unsigned m_chunk_size;  // 2 << (m_chunk_shift - 1)
 
+ public:
   //----------------------------------------------------------------------
 
   /** \brief  Compatible view of array of scalar types */
-  typedef DynamicView< typename traits::data_type ,
-                       typename traits::device_type >
-    array_type ;
+  typedef DynamicView<typename traits::data_type, typename traits::device_type>
+      array_type;
 
   /** \brief  Compatible view of const data type */
-  typedef DynamicView< typename traits::const_data_type ,
-                       typename traits::device_type >
-    const_type ;
+  typedef DynamicView<typename traits::const_data_type,
+                      typename traits::device_type>
+      const_type;
 
   /** \brief  Compatible view of non-const data type */
-  typedef DynamicView< typename traits::non_const_data_type ,
-                       typename traits::device_type >
-    non_const_type ;
+  typedef DynamicView<typename traits::non_const_data_type,
+                      typename traits::device_type>
+      non_const_type;
 
   /** \brief  Must be accessible everywhere */
-  typedef DynamicView  HostMirror ;
+  typedef DynamicView HostMirror;
 
   /** \brief Unified types */
-  typedef Kokkos::Device<typename traits::device_type::execution_space, Kokkos::AnonymousSpace> uniform_device;
+  typedef Kokkos::Device<typename traits::device_type::execution_space,
+                         Kokkos::AnonymousSpace>
+      uniform_device;
   typedef array_type uniform_type;
   typedef const_type uniform_const_type;
   typedef array_type uniform_runtime_type;
   typedef const_type uniform_runtime_const_type;
-  typedef DynamicView<typename traits::data_type, uniform_device> uniform_nomemspace_type;
-  typedef DynamicView<typename traits::const_data_type, uniform_device> uniform_const_nomemspace_type;
-  typedef DynamicView<typename traits::data_type, uniform_device> uniform_runtime_nomemspace_type;
-  typedef DynamicView<typename traits::const_data_type, uniform_device> uniform_runtime_const_nomemspace_type;
+  typedef DynamicView<typename traits::data_type, uniform_device>
+      uniform_nomemspace_type;
+  typedef DynamicView<typename traits::const_data_type, uniform_device>
+      uniform_const_nomemspace_type;
+  typedef DynamicView<typename traits::data_type, uniform_device>
+      uniform_runtime_nomemspace_type;
+  typedef DynamicView<typename traits::const_data_type, uniform_device>
+      uniform_runtime_const_nomemspace_type;
 
   //----------------------------------------------------------------------
 
   enum { Rank = 1 };
 
   KOKKOS_INLINE_FUNCTION
-  size_t allocation_extent() const noexcept
-    {
-      uintptr_t n = *reinterpret_cast<const uintptr_t*>( m_chunks + m_chunk_max );
-      return (n << m_chunk_shift);
-    }
+  size_t allocation_extent() const noexcept {
+    uintptr_t n = *reinterpret_cast<const uintptr_t*>(m_chunks + m_chunk_max);
+    return (n << m_chunk_shift);
+  }
 
   KOKKOS_INLINE_FUNCTION
-  size_t chunk_size() const noexcept
-    {
-      return m_chunk_size;
-    }
+  size_t chunk_size() const noexcept { return m_chunk_size; }
 
   KOKKOS_INLINE_FUNCTION
-  size_t size() const noexcept
-    {
-      size_t extent_0 = *reinterpret_cast<const size_t*>( m_chunks + m_chunk_max +1 );
-      return extent_0;
-    }
+  size_t size() const noexcept {
+    size_t extent_0 =
+        *reinterpret_cast<const size_t*>(m_chunks + m_chunk_max + 1);
+    return extent_0;
+  }
 
-  template< typename iType >
-  KOKKOS_INLINE_FUNCTION
-  size_t extent( const iType & r ) const
-    { return r == 0 ? size() : 1 ; }
+  template <typename iType>
+  KOKKOS_INLINE_FUNCTION size_t extent(const iType& r) const {
+    return r == 0 ? size() : 1;
+  }
 
-  template< typename iType >
-  KOKKOS_INLINE_FUNCTION
-  size_t extent_int( const iType & r ) const
-    { return r == 0 ? size() : 1 ; }
+  template <typename iType>
+  KOKKOS_INLINE_FUNCTION size_t extent_int(const iType& r) const {
+    return r == 0 ? size() : 1;
+  }
 
 #ifdef KOKKOS_ENABLE_DEPRECATED_CODE
   KOKKOS_INLINE_FUNCTION size_t dimension_0() const { return size(); }
-  KOKKOS_INLINE_FUNCTION constexpr size_t dimension_1() const { return 1 ; }
-  KOKKOS_INLINE_FUNCTION constexpr size_t dimension_2() const { return 1 ; }
-  KOKKOS_INLINE_FUNCTION constexpr size_t dimension_3() const { return 1 ; }
-  KOKKOS_INLINE_FUNCTION constexpr size_t dimension_4() const { return 1 ; }
-  KOKKOS_INLINE_FUNCTION constexpr size_t dimension_5() const { return 1 ; }
-  KOKKOS_INLINE_FUNCTION constexpr size_t dimension_6() const { return 1 ; }
-  KOKKOS_INLINE_FUNCTION constexpr size_t dimension_7() const { return 1 ; }
+  KOKKOS_INLINE_FUNCTION constexpr size_t dimension_1() const { return 1; }
+  KOKKOS_INLINE_FUNCTION constexpr size_t dimension_2() const { return 1; }
+  KOKKOS_INLINE_FUNCTION constexpr size_t dimension_3() const { return 1; }
+  KOKKOS_INLINE_FUNCTION constexpr size_t dimension_4() const { return 1; }
+  KOKKOS_INLINE_FUNCTION constexpr size_t dimension_5() const { return 1; }
+  KOKKOS_INLINE_FUNCTION constexpr size_t dimension_6() const { return 1; }
+  KOKKOS_INLINE_FUNCTION constexpr size_t dimension_7() const { return 1; }
 #endif
 
-  KOKKOS_INLINE_FUNCTION constexpr size_t stride_0() const { return 0 ; }
-  KOKKOS_INLINE_FUNCTION constexpr size_t stride_1() const { return 0 ; }
-  KOKKOS_INLINE_FUNCTION constexpr size_t stride_2() const { return 0 ; }
-  KOKKOS_INLINE_FUNCTION constexpr size_t stride_3() const { return 0 ; }
-  KOKKOS_INLINE_FUNCTION constexpr size_t stride_4() const { return 0 ; }
-  KOKKOS_INLINE_FUNCTION constexpr size_t stride_5() const { return 0 ; }
-  KOKKOS_INLINE_FUNCTION constexpr size_t stride_6() const { return 0 ; }
-  KOKKOS_INLINE_FUNCTION constexpr size_t stride_7() const { return 0 ; }
+  KOKKOS_INLINE_FUNCTION constexpr size_t stride_0() const { return 0; }
+  KOKKOS_INLINE_FUNCTION constexpr size_t stride_1() const { return 0; }
+  KOKKOS_INLINE_FUNCTION constexpr size_t stride_2() const { return 0; }
+  KOKKOS_INLINE_FUNCTION constexpr size_t stride_3() const { return 0; }
+  KOKKOS_INLINE_FUNCTION constexpr size_t stride_4() const { return 0; }
+  KOKKOS_INLINE_FUNCTION constexpr size_t stride_5() const { return 0; }
+  KOKKOS_INLINE_FUNCTION constexpr size_t stride_6() const { return 0; }
+  KOKKOS_INLINE_FUNCTION constexpr size_t stride_7() const { return 0; }
 
-  template< typename iType >
-  KOKKOS_INLINE_FUNCTION void stride( iType * const s ) const { *s = 0 ; }
+  template <typename iType>
+  KOKKOS_INLINE_FUNCTION void stride(iType* const s) const {
+    *s = 0;
+  }
 
   //----------------------------------------
   // Allocation tracking properties
 
   KOKKOS_INLINE_FUNCTION
-  int use_count() const
-    { return m_track.use_count(); }
+  int use_count() const { return m_track.use_count(); }
 
-  inline
-  const std::string label() const
-    { return m_track.template get_label< typename traits::memory_space >(); }
+  inline const std::string label() const {
+    return m_track.template get_label<typename traits::memory_space>();
+  }
 
   //----------------------------------------------------------------------
   // Range span is the span which contains all members.
 
-  typedef typename traits::value_type &  reference_type ;
-  typedef typename traits::value_type *  pointer_type ;
+  typedef typename traits::value_type& reference_type;
+  typedef typename traits::value_type* pointer_type;
 
-  enum { reference_type_is_lvalue_reference = std::is_lvalue_reference< reference_type >::value };
+  enum {
+    reference_type_is_lvalue_reference =
+        std::is_lvalue_reference<reference_type>::value
+  };
 
-  KOKKOS_INLINE_FUNCTION constexpr bool   span_is_contiguous() const { return false ; }
-  KOKKOS_INLINE_FUNCTION constexpr size_t span() const { return 0 ; }
-  KOKKOS_INLINE_FUNCTION constexpr pointer_type data() const { return 0 ; }
+  KOKKOS_INLINE_FUNCTION constexpr bool span_is_contiguous() const {
+    return false;
+  }
+  KOKKOS_INLINE_FUNCTION constexpr size_t span() const { return 0; }
+  KOKKOS_INLINE_FUNCTION constexpr pointer_type data() const { return 0; }
 
   //----------------------------------------
 
-  template< typename I0 , class ... Args >
-  KOKKOS_INLINE_FUNCTION
-  reference_type operator()( const I0 & i0 , const Args & ... args ) const
-    {
-      static_assert( Kokkos::Impl::are_integral<I0,Args...>::value
-                   , "Indices must be integral type" );
+  template <typename I0, class... Args>
+  KOKKOS_INLINE_FUNCTION reference_type operator()(const I0& i0,
+                                                   const Args&... args) const {
+    static_assert(Kokkos::Impl::are_integral<I0, Args...>::value,
+                  "Indices must be integral type");
 
-      DynamicView::template verify_space< Kokkos::Impl::ActiveExecutionMemorySpace >::check();
+    DynamicView::template verify_space<
+        Kokkos::Impl::ActiveExecutionMemorySpace>::check();
 
-      // Which chunk is being indexed.
-      const uintptr_t ic = uintptr_t( i0 >> m_chunk_shift );
+    // Which chunk is being indexed.
+    const uintptr_t ic = uintptr_t(i0 >> m_chunk_shift);
 
-      typename traits::value_type * volatile * const ch = m_chunks + ic ;
+    typename traits::value_type* volatile* const ch = m_chunks + ic;
 
-      // Do bounds checking if enabled or if the chunk pointer is zero.
-      // If not bounds checking then we assume a non-zero pointer is valid.
+    // Do bounds checking if enabled or if the chunk pointer is zero.
+    // If not bounds checking then we assume a non-zero pointer is valid.
 
-#if ! defined( KOKKOS_ENABLE_DEBUG_BOUNDS_CHECK )
-      if ( 0 == *ch )
+#if !defined(KOKKOS_ENABLE_DEBUG_BOUNDS_CHECK)
+    if (0 == *ch)
 #endif
-      {
-        // Verify that allocation of the requested chunk in in progress.
+    {
+      // Verify that allocation of the requested chunk in in progress.
 
-        // The allocated chunk counter is m_chunks[ m_chunk_max ]
-        const uintptr_t n =
-          *reinterpret_cast<uintptr_t volatile *>( m_chunks + m_chunk_max );
+      // The allocated chunk counter is m_chunks[ m_chunk_max ]
+      const uintptr_t n =
+          *reinterpret_cast<uintptr_t volatile*>(m_chunks + m_chunk_max);
 
-        if ( n <= ic ) {
-          Kokkos::abort("Kokkos::DynamicView array bounds error");
-        }
-
-        // Allocation of this chunk is in progress
-        // so wait for allocation to complete.
-        while ( 0 == *ch );
+      if (n <= ic) {
+        Kokkos::abort("Kokkos::DynamicView array bounds error");
       }
 
-      return (*ch)[ i0 & m_chunk_mask ];
+      // Allocation of this chunk is in progress
+      // so wait for allocation to complete.
+      while (0 == *ch)
+        ;
     }
 
+    return (*ch)[i0 & m_chunk_mask];
+  }
+
   //----------------------------------------
   /** \brief  Resizing in serial can grow or shrink the array size
    *          up to the maximum number of chunks
    * */
-  template< typename IntType >
-  inline
-  typename std::enable_if
-    < std::is_integral<IntType>::value &&
-      Kokkos::Impl::MemorySpaceAccess< Kokkos::HostSpace
-                                     , typename Impl::ChunkArraySpace< typename traits::memory_space >::memory_space 
-                                     >::accessible
-    >::type
-  resize_serial( IntType const & n )
-    {
-      typedef typename traits::value_type local_value_type ;
-      typedef local_value_type * value_pointer_type ;
+  template <typename IntType>
+  inline typename std::enable_if<
+      std::is_integral<IntType>::value &&
+      Kokkos::Impl::MemorySpaceAccess<
+          Kokkos::HostSpace,
+          typename Impl::ChunkArraySpace<
+              typename traits::memory_space>::memory_space>::accessible>::type
+  resize_serial(IntType const& n) {
+    typedef typename traits::value_type local_value_type;
+    typedef local_value_type* value_pointer_type;
 
-      const uintptr_t NC = ( n + m_chunk_mask ) >> m_chunk_shift ; // New total number of chunks needed for resize
+    const uintptr_t NC =
+        (n + m_chunk_mask) >>
+        m_chunk_shift;  // New total number of chunks needed for resize
 
-      if ( m_chunk_max < NC ) {
-        Kokkos::abort("DynamicView::resize_serial exceeded maximum size");
-      }
-
-      // *m_chunks[m_chunk_max] stores the current number of chunks being used
-      uintptr_t * const pc =
-        reinterpret_cast<uintptr_t*>( m_chunks + m_chunk_max );
-
-      if ( *pc < NC ) {
-        while ( *pc < NC ) {
-          m_chunks[*pc] = reinterpret_cast<value_pointer_type>
-            (
-             typename traits::memory_space().allocate( sizeof(local_value_type) << m_chunk_shift )
-            );
-          ++*pc ;
-        }
-      }
-      else {
-        while ( NC + 1 <= *pc ) {
-          --*pc ;
-          typename traits::memory_space().deallocate( m_chunks[*pc]
-                                         , sizeof(local_value_type) << m_chunk_shift );
-          m_chunks[*pc] = 0 ;
-        }
-      }
-      // *m_chunks[m_chunk_max+1] stores the 'extent' requested by resize
-      *(pc+1) = n;
+    if (m_chunk_max < NC) {
+      Kokkos::abort("DynamicView::resize_serial exceeded maximum size");
     }
 
+    // *m_chunks[m_chunk_max] stores the current number of chunks being used
+    uintptr_t* const pc = reinterpret_cast<uintptr_t*>(m_chunks + m_chunk_max);
+
+    if (*pc < NC) {
+      while (*pc < NC) {
+        m_chunks[*pc] = reinterpret_cast<value_pointer_type>(
+            typename traits::memory_space().allocate(sizeof(local_value_type)
+                                                     << m_chunk_shift));
+        ++*pc;
+      }
+    } else {
+      while (NC + 1 <= *pc) {
+        --*pc;
+        typename traits::memory_space().deallocate(
+            m_chunks[*pc], sizeof(local_value_type) << m_chunk_shift);
+        m_chunks[*pc] = 0;
+      }
+    }
+    // *m_chunks[m_chunk_max+1] stores the 'extent' requested by resize
+    *(pc + 1) = n;
+  }
+
   //----------------------------------------------------------------------
 
-  ~DynamicView() = default ;
-  DynamicView() = default ;
-  DynamicView( DynamicView && ) = default ;
-  DynamicView( const DynamicView & ) = default ;
-  DynamicView & operator = ( DynamicView && ) = default ;
-  DynamicView & operator = ( const DynamicView & ) = default ;
+  ~DynamicView()                  = default;
+  DynamicView()                   = default;
+  DynamicView(DynamicView&&)      = default;
+  DynamicView(const DynamicView&) = default;
+  DynamicView& operator=(DynamicView&&) = default;
+  DynamicView& operator=(const DynamicView&) = default;
 
-  template< class RT , class ... RP >
-  DynamicView( const DynamicView<RT,RP...> & rhs )
-    : m_track( rhs.m_track )
-    , m_chunks( (typename traits::value_type **) rhs.m_chunks )
-    , m_chunk_shift( rhs.m_chunk_shift )
-    , m_chunk_mask( rhs.m_chunk_mask )
-    , m_chunk_max( rhs.m_chunk_max )
-    , m_chunk_size( rhs.m_chunk_size )
-    {
-      typedef typename DynamicView<RT,RP...>::traits  SrcTraits ;
-      typedef Kokkos::Impl::ViewMapping< traits , SrcTraits , void >  Mapping ;
-      static_assert( Mapping::is_assignable , "Incompatible DynamicView copy construction" );
-    }
+  template <class RT, class... RP>
+  DynamicView(const DynamicView<RT, RP...>& rhs)
+      : m_track(rhs.m_track),
+        m_chunks((typename traits::value_type**)rhs.m_chunks),
+        m_chunk_shift(rhs.m_chunk_shift),
+        m_chunk_mask(rhs.m_chunk_mask),
+        m_chunk_max(rhs.m_chunk_max),
+        m_chunk_size(rhs.m_chunk_size) {
+    typedef typename DynamicView<RT, RP...>::traits SrcTraits;
+    typedef Kokkos::Impl::ViewMapping<traits, SrcTraits, void> Mapping;
+    static_assert(Mapping::is_assignable,
+                  "Incompatible DynamicView copy construction");
+  }
 
   //----------------------------------------------------------------------
 
   struct Destroy {
-    typename traits::value_type ** m_chunks ;
-    unsigned                       m_chunk_max ;
-    bool                           m_destroy ;
-    unsigned                       m_chunk_size ;
+    typename traits::value_type** m_chunks;
+    unsigned m_chunk_max;
+    bool m_destroy;
+    unsigned m_chunk_size;
 
     // Initialize or destroy array of chunk pointers.
     // Two entries beyond the max chunks are allocation counters.
-    inline
-    void operator()( unsigned i ) const
-      {
-        if ( m_destroy && i < m_chunk_max && 0 != m_chunks[i] ) {
-          typename traits::memory_space().deallocate( m_chunks[i], m_chunk_size );
-        }
-        m_chunks[i] = 0 ;
+    inline void operator()(unsigned i) const {
+      if (m_destroy && i < m_chunk_max && 0 != m_chunks[i]) {
+        typename traits::memory_space().deallocate(m_chunks[i], m_chunk_size);
       }
+      m_chunks[i] = 0;
+    }
 
-    void execute( bool arg_destroy )
-      {
-        typedef Kokkos::RangePolicy< typename HostSpace::execution_space > Range ;
-        //typedef Kokkos::RangePolicy< typename Impl::ChunkArraySpace< typename traits::memory_space >::memory_space::execution_space > Range ;
+    void execute(bool arg_destroy) {
+      typedef Kokkos::RangePolicy<typename HostSpace::execution_space> Range;
+      // typedef Kokkos::RangePolicy< typename Impl::ChunkArraySpace< typename
+      // traits::memory_space >::memory_space::execution_space > Range ;
 
-        m_destroy = arg_destroy ;
+      m_destroy = arg_destroy;
 
-        Kokkos::Impl::ParallelFor<Destroy,Range>
-          closure( *this , Range(0, m_chunk_max + 2) ); // Add 2 to 'destroy' extra slots storing num_chunks and extent; previously + 1
+      Kokkos::Impl::ParallelFor<Destroy, Range> closure(
+          *this,
+          Range(0, m_chunk_max + 2));  // Add 2 to 'destroy' extra slots storing
+                                       // num_chunks and extent; previously + 1
 
-        closure.execute();
+      closure.execute();
 
-        typename traits::execution_space().fence();
-        //Impl::ChunkArraySpace< typename traits::memory_space >::memory_space::execution_space().fence(); 
-      }
+      typename traits::execution_space().fence();
+      // Impl::ChunkArraySpace< typename traits::memory_space
+      // >::memory_space::execution_space().fence();
+    }
 
-    void construct_shared_allocation()
-      { execute( false ); }
+    void construct_shared_allocation() { execute(false); }
 
-    void destroy_shared_allocation()
-      { execute( true ); }
+    void destroy_shared_allocation() { execute(true); }
 
-    Destroy() = default ;
-    Destroy( Destroy && ) = default ;
-    Destroy( const Destroy & ) = default ;
-    Destroy & operator = ( Destroy && ) = default ;
-    Destroy & operator = ( const Destroy & ) = default ;
+    Destroy()               = default;
+    Destroy(Destroy&&)      = default;
+    Destroy(const Destroy&) = default;
+    Destroy& operator=(Destroy&&) = default;
+    Destroy& operator=(const Destroy&) = default;
 
-    Destroy( typename traits::value_type ** arg_chunk
-           , const unsigned arg_chunk_max 
-           , const unsigned arg_chunk_size )
-     : m_chunks( arg_chunk )
-     , m_chunk_max( arg_chunk_max )
-     , m_destroy( false )
-     , m_chunk_size( arg_chunk_size )
-     {}
+    Destroy(typename traits::value_type** arg_chunk,
+            const unsigned arg_chunk_max, const unsigned arg_chunk_size)
+        : m_chunks(arg_chunk),
+          m_chunk_max(arg_chunk_max),
+          m_destroy(false),
+          m_chunk_size(arg_chunk_size) {}
   };
 
-
   /**\brief  Allocation constructor
    *
    *  Memory is allocated in chunks
    *  A maximum size is required in order to allocate a
    *  chunk-pointer array.
    */
-  explicit inline
-  DynamicView( const std::string & arg_label
-             , const unsigned min_chunk_size
-             , const unsigned max_extent ) 
-    : m_track()
-    , m_chunks(0)
-    // The chunk size is guaranteed to be a power of two
-    , m_chunk_shift(
-        Kokkos::Impl::integral_power_of_two_that_contains( min_chunk_size ) ) // div ceil(log2(min_chunk_size))
-    , m_chunk_mask( ( 1 << m_chunk_shift ) - 1 )                              // mod
-    , m_chunk_max( ( max_extent + m_chunk_mask ) >> m_chunk_shift )           // max num pointers-to-chunks in array
-    , m_chunk_size ( 2 << (m_chunk_shift - 1) )
-    {
-      typedef typename Impl::ChunkArraySpace< typename traits::memory_space >::memory_space chunk_array_memory_space;
-      // A functor to deallocate all of the chunks upon final destruction
-      typedef Kokkos::Impl::SharedAllocationRecord< chunk_array_memory_space , Destroy > record_type ;
+  explicit inline DynamicView(const std::string& arg_label,
+                              const unsigned min_chunk_size,
+                              const unsigned max_extent)
+      : m_track(),
+        m_chunks(0)
+        // The chunk size is guaranteed to be a power of two
+        ,
+        m_chunk_shift(Kokkos::Impl::integral_power_of_two_that_contains(
+            min_chunk_size))  // div ceil(log2(min_chunk_size))
+        ,
+        m_chunk_mask((1 << m_chunk_shift) - 1)  // mod
+        ,
+        m_chunk_max((max_extent + m_chunk_mask) >>
+                    m_chunk_shift)  // max num pointers-to-chunks in array
+        ,
+        m_chunk_size(2 << (m_chunk_shift - 1)) {
+    typedef typename Impl::ChunkArraySpace<
+        typename traits::memory_space>::memory_space chunk_array_memory_space;
+    // A functor to deallocate all of the chunks upon final destruction
+    typedef Kokkos::Impl::SharedAllocationRecord<chunk_array_memory_space,
+                                                 Destroy>
+        record_type;
 
-      // Allocate chunk pointers and allocation counter
-      record_type * const record =
-        record_type::allocate( chunk_array_memory_space()
-                             , arg_label
-                             , ( sizeof(pointer_type) * ( m_chunk_max + 2 ) ) ); 
-      // Allocate + 2 extra slots so that *m_chunk[m_chunk_max] == num_chunks_alloc and *m_chunk[m_chunk_max+1] == extent
-      // This must match in Destroy's execute(...) method
+    // Allocate chunk pointers and allocation counter
+    record_type* const record =
+        record_type::allocate(chunk_array_memory_space(), arg_label,
+                              (sizeof(pointer_type) * (m_chunk_max + 2)));
+    // Allocate + 2 extra slots so that *m_chunk[m_chunk_max] ==
+    // num_chunks_alloc and *m_chunk[m_chunk_max+1] == extent This must match in
+    // Destroy's execute(...) method
 
-      m_chunks = reinterpret_cast<pointer_type*>( record->data() );
+    m_chunks = reinterpret_cast<pointer_type*>(record->data());
 
-      record->m_destroy = Destroy( m_chunks , m_chunk_max, m_chunk_size );
+    record->m_destroy = Destroy(m_chunks, m_chunk_max, m_chunk_size);
 
-      // Initialize to zero
-      record->m_destroy.construct_shared_allocation();
-
-      m_track.assign_allocated_record_to_uninitialized( record );
-    }
+    // Initialize to zero
+    record->m_destroy.construct_shared_allocation();
 
+    m_track.assign_allocated_record_to_uninitialized(record);
+  }
 };
 
-} // namespace Experimental
-} // namespace Kokkos
+}  // namespace Experimental
+}  // namespace Kokkos
 
 namespace Kokkos {
 
-template< class T , class ... P >
-inline
-typename Kokkos::Experimental::DynamicView<T,P...>::HostMirror
-create_mirror_view( const Kokkos::Experimental::DynamicView<T,P...> & src )
-{
-  return src ;
+template <class T, class... P>
+inline typename Kokkos::Experimental::DynamicView<T, P...>::HostMirror
+create_mirror_view(const Kokkos::Experimental::DynamicView<T, P...>& src) {
+  return src;
 }
 
-template< class T , class ... DP , class ... SP >
-inline
-void deep_copy( const View<T,DP...> & dst
-              , const Kokkos::Experimental::DynamicView<T,SP...> & src
-              )
-{
-  typedef View<T,DP...>        dst_type ;
-  typedef Kokkos::Experimental::DynamicView<T,SP...> src_type ;
+template <class T, class... DP, class... SP>
+inline void deep_copy(const View<T, DP...>& dst,
+                      const Kokkos::Experimental::DynamicView<T, SP...>& src) {
+  typedef View<T, DP...> dst_type;
+  typedef Kokkos::Experimental::DynamicView<T, SP...> src_type;
 
-  typedef typename ViewTraits<T,DP...>::execution_space  dst_execution_space ;
-  typedef typename ViewTraits<T,SP...>::memory_space     src_memory_space ;
+  typedef typename ViewTraits<T, DP...>::execution_space dst_execution_space;
+  typedef typename ViewTraits<T, SP...>::memory_space src_memory_space;
 
-  enum { DstExecCanAccessSrc =
-   Kokkos::Impl::SpaceAccessibility< dst_execution_space , src_memory_space >::accessible };
+  enum {
+    DstExecCanAccessSrc =
+        Kokkos::Impl::SpaceAccessibility<dst_execution_space,
+                                         src_memory_space>::accessible
+  };
 
-  if ( DstExecCanAccessSrc ) {
-    // Copying data between views in accessible memory spaces and either non-contiguous or incompatible shape.
-    Kokkos::Impl::ViewRemap< dst_type , src_type >( dst , src );
-  }
-  else {
-    Kokkos::Impl::throw_runtime_exception("deep_copy given views that would require a temporary allocation");
+  if (DstExecCanAccessSrc) {
+    // Copying data between views in accessible memory spaces and either
+    // non-contiguous or incompatible shape.
+    Kokkos::Impl::ViewRemap<dst_type, src_type>(dst, src);
+  } else {
+    Kokkos::Impl::throw_runtime_exception(
+        "deep_copy given views that would require a temporary allocation");
   }
 }
 
-template< class T , class ... DP , class ... SP >
-inline
-void deep_copy( const Kokkos::Experimental::DynamicView<T,DP...> & dst
-              , const View<T,SP...> & src
-              )
-{
-  typedef Kokkos::Experimental::DynamicView<T,SP...> dst_type ;
-  typedef View<T,DP...>        src_type ;
+template <class T, class... DP, class... SP>
+inline void deep_copy(const Kokkos::Experimental::DynamicView<T, DP...>& dst,
+                      const View<T, SP...>& src) {
+  typedef Kokkos::Experimental::DynamicView<T, SP...> dst_type;
+  typedef View<T, DP...> src_type;
 
-  typedef typename ViewTraits<T,DP...>::execution_space  dst_execution_space ;
-  typedef typename ViewTraits<T,SP...>::memory_space     src_memory_space ;
+  typedef typename ViewTraits<T, DP...>::execution_space dst_execution_space;
+  typedef typename ViewTraits<T, SP...>::memory_space src_memory_space;
 
-  enum { DstExecCanAccessSrc =
-   Kokkos::Impl::SpaceAccessibility< dst_execution_space , src_memory_space >::accessible };
+  enum {
+    DstExecCanAccessSrc =
+        Kokkos::Impl::SpaceAccessibility<dst_execution_space,
+                                         src_memory_space>::accessible
+  };
 
-  if ( DstExecCanAccessSrc ) {
-    // Copying data between views in accessible memory spaces and either non-contiguous or incompatible shape.
-    Kokkos::Impl::ViewRemap< dst_type , src_type >( dst , src );
-  }
-  else {
-    Kokkos::Impl::throw_runtime_exception("deep_copy given views that would require a temporary allocation");
+  if (DstExecCanAccessSrc) {
+    // Copying data between views in accessible memory spaces and either
+    // non-contiguous or incompatible shape.
+    Kokkos::Impl::ViewRemap<dst_type, src_type>(dst, src);
+  } else {
+    Kokkos::Impl::throw_runtime_exception(
+        "deep_copy given views that would require a temporary allocation");
   }
 }
 
 namespace Impl {
-template<class Arg0, class ... DP , class ... SP>
-struct CommonSubview<Kokkos::Experimental::DynamicView<DP...>,Kokkos::Experimental::DynamicView<SP...>,1,Arg0> {
+template <class Arg0, class... DP, class... SP>
+struct CommonSubview<Kokkos::Experimental::DynamicView<DP...>,
+                     Kokkos::Experimental::DynamicView<SP...>, 1, Arg0> {
   typedef Kokkos::Experimental::DynamicView<DP...> DstType;
   typedef Kokkos::Experimental::DynamicView<SP...> SrcType;
   typedef DstType dst_subview_type;
   typedef SrcType src_subview_type;
   dst_subview_type dst_sub;
   src_subview_type src_sub;
-  CommonSubview(const DstType& dst, const SrcType& src, const Arg0& arg0):
-    dst_sub(dst),src_sub(src) {}
+  CommonSubview(const DstType& dst, const SrcType& src, const Arg0& arg0)
+      : dst_sub(dst), src_sub(src) {}
 };
 
-template<class ...DP, class SrcType, class Arg0>
-struct CommonSubview<Kokkos::Experimental::DynamicView<DP...>,SrcType,1,Arg0> {
+template <class... DP, class SrcType, class Arg0>
+struct CommonSubview<Kokkos::Experimental::DynamicView<DP...>, SrcType, 1,
+                     Arg0> {
   typedef Kokkos::Experimental::DynamicView<DP...> DstType;
   typedef DstType dst_subview_type;
-  typedef typename Kokkos::Subview<SrcType,Arg0> src_subview_type;
+  typedef typename Kokkos::Subview<SrcType, Arg0> src_subview_type;
   dst_subview_type dst_sub;
   src_subview_type src_sub;
-  CommonSubview(const DstType& dst, const SrcType& src, const Arg0& arg0):
-    dst_sub(dst),src_sub(src,arg0) {}
+  CommonSubview(const DstType& dst, const SrcType& src, const Arg0& arg0)
+      : dst_sub(dst), src_sub(src, arg0) {}
 };
 
-template<class DstType, class ...SP, class Arg0>
-struct CommonSubview<DstType,Kokkos::Experimental::DynamicView<SP...>,1,Arg0> {
+template <class DstType, class... SP, class Arg0>
+struct CommonSubview<DstType, Kokkos::Experimental::DynamicView<SP...>, 1,
+                     Arg0> {
   typedef Kokkos::Experimental::DynamicView<SP...> SrcType;
-  typedef typename Kokkos::Subview<DstType,Arg0> dst_subview_type;
+  typedef typename Kokkos::Subview<DstType, Arg0> dst_subview_type;
   typedef SrcType src_subview_type;
   dst_subview_type dst_sub;
   src_subview_type src_sub;
-  CommonSubview(const DstType& dst, const SrcType& src, const Arg0& arg0):
-    dst_sub(dst,arg0),src_sub(src) {}
+  CommonSubview(const DstType& dst, const SrcType& src, const Arg0& arg0)
+      : dst_sub(dst, arg0), src_sub(src) {}
 };
 
-template<class ...DP,class ViewTypeB, class Layout, class ExecSpace,typename iType>
-struct ViewCopy<Kokkos::Experimental::DynamicView<DP...>,ViewTypeB,Layout,ExecSpace,1,iType,false> {
+template <class... DP, class ViewTypeB, class Layout, class ExecSpace,
+          typename iType>
+struct ViewCopy<Kokkos::Experimental::DynamicView<DP...>, ViewTypeB, Layout,
+                ExecSpace, 1, iType, false> {
   Kokkos::Experimental::DynamicView<DP...> a;
   ViewTypeB b;
 
-  typedef Kokkos::RangePolicy<ExecSpace,Kokkos::IndexType<iType>> policy_type;
+  typedef Kokkos::RangePolicy<ExecSpace, Kokkos::IndexType<iType>> policy_type;
 
-  ViewCopy(const Kokkos::Experimental::DynamicView<DP...>& a_, const ViewTypeB& b_):a(a_),b(b_) {
-    Kokkos::parallel_for("Kokkos::ViewCopy-1D",
-       policy_type(0,b.extent(0)),*this);
+  ViewCopy(const Kokkos::Experimental::DynamicView<DP...>& a_,
+           const ViewTypeB& b_)
+      : a(a_), b(b_) {
+    Kokkos::parallel_for("Kokkos::ViewCopy-1D", policy_type(0, b.extent(0)),
+                         *this);
   }
 
   KOKKOS_INLINE_FUNCTION
-  void operator() (const iType& i0) const {
-      a(i0) = b(i0);
-  };
+  void operator()(const iType& i0) const { a(i0) = b(i0); };
 };
 
-template<class ...DP,class ...SP, class Layout, class ExecSpace,typename iType>
+template <class... DP, class... SP, class Layout, class ExecSpace,
+          typename iType>
 struct ViewCopy<Kokkos::Experimental::DynamicView<DP...>,
-                Kokkos::Experimental::DynamicView<SP...>,Layout,ExecSpace,1,iType,false> {
+                Kokkos::Experimental::DynamicView<SP...>, Layout, ExecSpace, 1,
+                iType, false> {
   Kokkos::Experimental::DynamicView<DP...> a;
   Kokkos::Experimental::DynamicView<SP...> b;
 
-  typedef Kokkos::RangePolicy<ExecSpace,Kokkos::IndexType<iType>> policy_type;
+  typedef Kokkos::RangePolicy<ExecSpace, Kokkos::IndexType<iType>> policy_type;
 
   ViewCopy(const Kokkos::Experimental::DynamicView<DP...>& a_,
-           const Kokkos::Experimental::DynamicView<SP...>& b_):a(a_),b(b_) {
-    const iType n = std::min(a.extent(0),b.extent(0));
-    Kokkos::parallel_for("Kokkos::ViewCopy-1D",
-       policy_type(0,n),*this);
+           const Kokkos::Experimental::DynamicView<SP...>& b_)
+      : a(a_), b(b_) {
+    const iType n = std::min(a.extent(0), b.extent(0));
+    Kokkos::parallel_for("Kokkos::ViewCopy-1D", policy_type(0, n), *this);
   }
 
   KOKKOS_INLINE_FUNCTION
-  void operator() (const iType& i0) const {
-      a(i0) = b(i0);
-  };
+  void operator()(const iType& i0) const { a(i0) = b(i0); };
 };
 
-} // namespace Impl
-} // namespace Kokkos
+}  // namespace Impl
+}  // namespace Kokkos
 
 #endif /* #ifndef KOKKOS_DYNAMIC_VIEW_HPP */
-
diff --git a/lib/kokkos/containers/src/Kokkos_ErrorReporter.hpp b/lib/kokkos/containers/src/Kokkos_ErrorReporter.hpp
index e05ea1a9d5..25335771e4 100644
--- a/lib/kokkos/containers/src/Kokkos_ErrorReporter.hpp
+++ b/lib/kokkos/containers/src/Kokkos_ErrorReporter.hpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -53,19 +54,16 @@ namespace Kokkos {
 namespace Experimental {
 
 template <typename ReportType, typename DeviceType>
-class ErrorReporter
-{
-public:
-
-  typedef ReportType                                      report_type;
-  typedef DeviceType                                      device_type;
-  typedef typename device_type::execution_space           execution_space;
+class ErrorReporter {
+ public:
+  typedef ReportType report_type;
+  typedef DeviceType device_type;
+  typedef typename device_type::execution_space execution_space;
 
   ErrorReporter(int max_results)
-    : m_numReportsAttempted(""),
-      m_reports("", max_results),
-      m_reporters("", max_results)
-  {
+      : m_numReportsAttempted(""),
+        m_reports("", max_results),
+        m_reporters("", max_results) {
     clear();
   }
 
@@ -75,49 +73,49 @@ public:
 
   int getNumReportAttempts();
 
-  void getReports(std::vector<int> &reporters_out, std::vector<report_type> &reports_out);
-  void getReports( typename Kokkos::View<int*, typename DeviceType::execution_space >::HostMirror &reporters_out,
-                   typename Kokkos::View<report_type*, typename DeviceType::execution_space >::HostMirror &reports_out);
+  void getReports(std::vector<int> &reporters_out,
+                  std::vector<report_type> &reports_out);
+  void getReports(
+      typename Kokkos::View<int *,
+                            typename DeviceType::execution_space>::HostMirror
+          &reporters_out,
+      typename Kokkos::View<report_type *,
+                            typename DeviceType::execution_space>::HostMirror
+          &reports_out);
 
   void clear();
 
   void resize(const size_t new_size);
 
-  bool full() {return (getNumReportAttempts() >= getCapacity()); }
+  bool full() { return (getNumReportAttempts() >= getCapacity()); }
 
   KOKKOS_INLINE_FUNCTION
-  bool add_report(int reporter_id, report_type report) const
-  {
+  bool add_report(int reporter_id, report_type report) const {
     int idx = Kokkos::atomic_fetch_add(&m_numReportsAttempted(), 1);
 
     if (idx >= 0 && (idx < static_cast<int>(m_reports.d_view.extent(0)))) {
       m_reporters.d_view(idx) = reporter_id;
       m_reports.d_view(idx)   = report;
       return true;
-    }
-    else {
+    } else {
       return false;
     }
   }
 
-private:
+ private:
+  typedef Kokkos::View<report_type *, execution_space> reports_view_t;
+  typedef Kokkos::DualView<report_type *, execution_space> reports_dualview_t;
 
-  typedef Kokkos::View<report_type *, execution_space>        reports_view_t;
-  typedef Kokkos::DualView<report_type *, execution_space>    reports_dualview_t;
-
-  typedef typename reports_dualview_t::host_mirror_space  host_mirror_space;
-  Kokkos::View<int, execution_space>   m_numReportsAttempted;
-  reports_dualview_t                   m_reports;
+  typedef typename reports_dualview_t::host_mirror_space host_mirror_space;
+  Kokkos::View<int, execution_space> m_numReportsAttempted;
+  reports_dualview_t m_reports;
   Kokkos::DualView<int *, execution_space> m_reporters;
-
 };
 
-
 template <typename ReportType, typename DeviceType>
-inline int ErrorReporter<ReportType, DeviceType>::getNumReports()
-{
+inline int ErrorReporter<ReportType, DeviceType>::getNumReports() {
   int num_reports = 0;
-  Kokkos::deep_copy(num_reports,m_numReportsAttempted);
+  Kokkos::deep_copy(num_reports, m_numReportsAttempted);
   if (num_reports > static_cast<int>(m_reports.h_view.extent(0))) {
     num_reports = m_reports.h_view.extent(0);
   }
@@ -125,16 +123,15 @@ inline int ErrorReporter<ReportType, DeviceType>::getNumReports()
 }
 
 template <typename ReportType, typename DeviceType>
-inline int ErrorReporter<ReportType, DeviceType>::getNumReportAttempts()
-{
+inline int ErrorReporter<ReportType, DeviceType>::getNumReportAttempts() {
   int num_reports = 0;
-  Kokkos::deep_copy(num_reports,m_numReportsAttempted);
+  Kokkos::deep_copy(num_reports, m_numReportsAttempted);
   return num_reports;
 }
 
 template <typename ReportType, typename DeviceType>
-void ErrorReporter<ReportType, DeviceType>::getReports(std::vector<int> &reporters_out, std::vector<report_type> &reports_out)
-{
+void ErrorReporter<ReportType, DeviceType>::getReports(
+    std::vector<int> &reporters_out, std::vector<report_type> &reports_out) {
   int num_reports = getNumReports();
   reporters_out.clear();
   reporters_out.reserve(num_reports);
@@ -154,12 +151,18 @@ void ErrorReporter<ReportType, DeviceType>::getReports(std::vector<int> &reporte
 
 template <typename ReportType, typename DeviceType>
 void ErrorReporter<ReportType, DeviceType>::getReports(
-    typename Kokkos::View<int*, typename DeviceType::execution_space >::HostMirror &reporters_out,
-    typename Kokkos::View<report_type*, typename DeviceType::execution_space >::HostMirror &reports_out)
-{
+    typename Kokkos::View<
+        int *, typename DeviceType::execution_space>::HostMirror &reporters_out,
+    typename Kokkos::View<report_type *,
+                          typename DeviceType::execution_space>::HostMirror
+        &reports_out) {
   int num_reports = getNumReports();
-  reporters_out = typename Kokkos::View<int*, typename DeviceType::execution_space >::HostMirror("ErrorReport::reporters_out",num_reports);
-  reports_out = typename Kokkos::View<report_type*, typename DeviceType::execution_space >::HostMirror("ErrorReport::reports_out",num_reports);
+  reporters_out =
+      typename Kokkos::View<int *, typename DeviceType::execution_space>::
+          HostMirror("ErrorReport::reporters_out", num_reports);
+  reports_out = typename Kokkos::
+      View<report_type *, typename DeviceType::execution_space>::HostMirror(
+          "ErrorReport::reports_out", num_reports);
 
   if (num_reports > 0) {
     m_reports.template sync<host_mirror_space>();
@@ -167,31 +170,27 @@ void ErrorReporter<ReportType, DeviceType>::getReports(
 
     for (int i = 0; i < num_reports; ++i) {
       reporters_out(i) = m_reporters.h_view(i);
-      reports_out(i) = m_reports.h_view(i);
+      reports_out(i)   = m_reports.h_view(i);
     }
   }
 }
 
 template <typename ReportType, typename DeviceType>
-void ErrorReporter<ReportType, DeviceType>::clear()
-{
-  int num_reports=0;
+void ErrorReporter<ReportType, DeviceType>::clear() {
+  int num_reports = 0;
   Kokkos::deep_copy(m_numReportsAttempted, num_reports);
   m_reports.template modify<execution_space>();
   m_reporters.template modify<execution_space>();
 }
 
 template <typename ReportType, typename DeviceType>
-void ErrorReporter<ReportType, DeviceType>::resize(const size_t new_size)
-{
+void ErrorReporter<ReportType, DeviceType>::resize(const size_t new_size) {
   m_reports.resize(new_size);
   m_reporters.resize(new_size);
   Kokkos::fence();
 }
 
-
-} // namespace Experimental
-} // namespace kokkos
+}  // namespace Experimental
+}  // namespace Kokkos
 
 #endif
-
diff --git a/lib/kokkos/containers/src/Kokkos_Functional.hpp b/lib/kokkos/containers/src/Kokkos_Functional.hpp
index 4d256cce27..d908458518 100644
--- a/lib/kokkos/containers/src/Kokkos_Functional.hpp
+++ b/lib/kokkos/containers/src/Kokkos_Functional.hpp
@@ -1,10 +1,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -22,10 +23,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -50,123 +51,107 @@ namespace Kokkos {
 // These should work for most types
 
 template <typename T>
-struct pod_hash
-{
+struct pod_hash {
   typedef T argument_type;
   typedef T first_argument_type;
   typedef uint32_t second_argument_type;
   typedef uint32_t result_type;
 
   KOKKOS_FORCEINLINE_FUNCTION
-  uint32_t operator()(T const & t) const
-  { return Impl::MurmurHash3_x86_32( &t, sizeof(T), 0); }
+  uint32_t operator()(T const& t) const {
+    return Impl::MurmurHash3_x86_32(&t, sizeof(T), 0);
+  }
 
   KOKKOS_FORCEINLINE_FUNCTION
-  uint32_t operator()(T const & t, uint32_t seed) const
-  { return Impl::MurmurHash3_x86_32( &t, sizeof(T), seed); }
+  uint32_t operator()(T const& t, uint32_t seed) const {
+    return Impl::MurmurHash3_x86_32(&t, sizeof(T), seed);
+  }
 };
 
 template <typename T>
-struct pod_equal_to
-{
+struct pod_equal_to {
   typedef T first_argument_type;
   typedef T second_argument_type;
   typedef bool result_type;
 
   KOKKOS_FORCEINLINE_FUNCTION
-  bool operator()(T const & a, T const & b) const
-  { return Impl::bitwise_equal(&a,&b); }
+  bool operator()(T const& a, T const& b) const {
+    return Impl::bitwise_equal(&a, &b);
+  }
 };
 
 template <typename T>
-struct pod_not_equal_to
-{
+struct pod_not_equal_to {
   typedef T first_argument_type;
   typedef T second_argument_type;
   typedef bool result_type;
 
   KOKKOS_FORCEINLINE_FUNCTION
-  bool operator()(T const & a, T const & b) const
-  { return !Impl::bitwise_equal(&a,&b); }
+  bool operator()(T const& a, T const& b) const {
+    return !Impl::bitwise_equal(&a, &b);
+  }
 };
 
 template <typename T>
-struct equal_to
-{
+struct equal_to {
   typedef T first_argument_type;
   typedef T second_argument_type;
   typedef bool result_type;
 
   KOKKOS_FORCEINLINE_FUNCTION
-  bool operator()(T const & a, T const & b) const
-  { return a == b; }
+  bool operator()(T const& a, T const& b) const { return a == b; }
 };
 
 template <typename T>
-struct not_equal_to
-{
+struct not_equal_to {
   typedef T first_argument_type;
   typedef T second_argument_type;
   typedef bool result_type;
 
   KOKKOS_FORCEINLINE_FUNCTION
-  bool operator()(T const & a, T const & b) const
-  { return a != b; }
+  bool operator()(T const& a, T const& b) const { return a != b; }
 };
 
-
 template <typename T>
-struct greater
-{
+struct greater {
   typedef T first_argument_type;
   typedef T second_argument_type;
   typedef bool result_type;
 
   KOKKOS_FORCEINLINE_FUNCTION
-  bool operator()(T const & a, T const & b) const
-  { return a > b; }
+  bool operator()(T const& a, T const& b) const { return a > b; }
 };
 
-
 template <typename T>
-struct less
-{
+struct less {
   typedef T first_argument_type;
   typedef T second_argument_type;
   typedef bool result_type;
 
   KOKKOS_FORCEINLINE_FUNCTION
-  bool operator()(T const & a, T const & b) const
-  { return a < b; }
+  bool operator()(T const& a, T const& b) const { return a < b; }
 };
 
 template <typename T>
-struct greater_equal
-{
+struct greater_equal {
   typedef T first_argument_type;
   typedef T second_argument_type;
   typedef bool result_type;
 
   KOKKOS_FORCEINLINE_FUNCTION
-  bool operator()(T const & a, T const & b) const
-  { return a >= b; }
+  bool operator()(T const& a, T const& b) const { return a >= b; }
 };
 
-
 template <typename T>
-struct less_equal
-{
+struct less_equal {
   typedef T first_argument_type;
   typedef T second_argument_type;
   typedef bool result_type;
 
   KOKKOS_FORCEINLINE_FUNCTION
-  bool operator()(T const & a, T const & b) const
-  { return a <= b; }
+  bool operator()(T const& a, T const& b) const { return a <= b; }
 };
 
-} // namespace Kokkos
-
-
-#endif //KOKKOS_FUNCTIONAL_HPP
+}  // namespace Kokkos
 
+#endif  // KOKKOS_FUNCTIONAL_HPP
diff --git a/lib/kokkos/containers/src/Kokkos_OffsetView.hpp b/lib/kokkos/containers/src/Kokkos_OffsetView.hpp
index 4ce1f4d84f..a1fe793cc5 100644
--- a/lib/kokkos/containers/src/Kokkos_OffsetView.hpp
+++ b/lib/kokkos/containers/src/Kokkos_OffsetView.hpp
@@ -8,1890 +8,2092 @@
 #ifndef KOKKOS_OFFSETVIEW_HPP_
 #define KOKKOS_OFFSETVIEW_HPP_
 
-
 #include <Kokkos_Core.hpp>
 
 #include <Kokkos_View.hpp>
 
 namespace Kokkos {
 
-   namespace Experimental {
-      //----------------------------------------------------------------------------
-      //----------------------------------------------------------------------------
+namespace Experimental {
+//----------------------------------------------------------------------------
+//----------------------------------------------------------------------------
 
-      template< class DataType , class ... Properties >
-      class OffsetView ;
+template <class DataType, class... Properties>
+class OffsetView;
 
-      template< class > struct is_offset_view : public std::false_type {};
+template <class>
+struct is_offset_view : public std::false_type {};
 
-      template< class D, class ... P >
-      struct is_offset_view< OffsetView<D,P...> > : public std::true_type {};
+template <class D, class... P>
+struct is_offset_view<OffsetView<D, P...> > : public std::true_type {};
 
-      template< class D, class ... P >
-      struct is_offset_view< const OffsetView<D,P...> > : public std::true_type {};
+template <class D, class... P>
+struct is_offset_view<const OffsetView<D, P...> > : public std::true_type {};
 
-#define KOKKOS_INVALID_OFFSET int64_t(0)
-#define KOKKOS_INVALID_INDEX_RANGE {KOKKOS_INVALID_OFFSET, KOKKOS_INVALID_OFFSET}
+#define KOKKOS_INVALID_OFFSET int64_t(0x7FFFFFFFFFFFFFFFLL)
+#define KOKKOS_INVALID_INDEX_RANGE \
+  { KOKKOS_INVALID_OFFSET, KOKKOS_INVALID_OFFSET }
 
-      template <typename iType, typename std::enable_if< std::is_integral<iType>::value &&
-      std::is_signed<iType>::value, iType >::type = 0>
-      using IndexRange  = Kokkos::Array<iType, 2>;
+template <typename iType,
+          typename std::enable_if<std::is_integral<iType>::value &&
+                                      std::is_signed<iType>::value,
+                                  iType>::type = 0>
+using IndexRange = Kokkos::Array<iType, 2>;
 
+using index_list_type = std::initializer_list<int64_t>;
 
-      using index_list_type = std::initializer_list<int64_t>;
+//  template <typename iType,
+//    typename std::enable_if< std::is_integral<iType>::value &&
+//      std::is_signed<iType>::value, iType >::type = 0> using min_index_type =
+//      std::initializer_list<iType>;
 
+namespace Impl {
 
-      //  template <typename iType,
-      //    typename std::enable_if< std::is_integral<iType>::value &&
-      //      std::is_signed<iType>::value, iType >::type = 0> using min_index_type = std::initializer_list<iType>;
+template <class ViewType>
+struct GetOffsetViewTypeFromViewType {
+  typedef OffsetView<
+      typename ViewType::data_type, typename ViewType::array_layout,
+      typename ViewType::device_type, typename ViewType::memory_traits>
+      type;
+};
 
-      namespace Impl {
+template <unsigned, class MapType, class BeginsType>
+KOKKOS_INLINE_FUNCTION bool offsetview_verify_operator_bounds(
+    const MapType&, const BeginsType&) {
+  return true;
+}
 
-         template<class ViewType>
-         struct GetOffsetViewTypeFromViewType {
+template <unsigned R, class MapType, class BeginsType, class iType,
+          class... Args>
+KOKKOS_INLINE_FUNCTION bool offsetview_verify_operator_bounds(
+    const MapType& map, const BeginsType& begins, const iType& i,
+    Args... args) {
+  const bool legalIndex =
+      (int64_t(i) >= begins[R]) &&
+      (int64_t(i) <= int64_t(begins[R] + map.extent(R) - 1));
+  return legalIndex &&
+         offsetview_verify_operator_bounds<R + 1>(map, begins, args...);
+}
+template <unsigned, class MapType, class BeginsType>
+inline void offsetview_error_operator_bounds(char*, int, const MapType&,
+                                             const BeginsType&) {}
 
-            typedef OffsetView<typename ViewType::data_type,typename ViewType::array_layout,
-                  typename ViewType::device_type,typename ViewType::memory_traits> type;
+template <unsigned R, class MapType, class BeginsType, class iType,
+          class... Args>
+inline void offsetview_error_operator_bounds(char* buf, int len,
+                                             const MapType& map,
+                                             const BeginsType begins,
+                                             const iType& i, Args... args) {
+  const int64_t b = begins[R];
+  const int64_t e = b + map.extent(R) - 1;
+  const int n =
+      snprintf(buf, len, " %ld <= %ld <= %ld %c", static_cast<unsigned long>(b),
+               static_cast<unsigned long>(i), static_cast<unsigned long>(e),
+               (sizeof...(Args) ? ',' : ')'));
+  offsetview_error_operator_bounds<R + 1>(buf + n, len - n, map, begins,
+                                          args...);
+}
 
-         };
-
-         template< unsigned , class MapType, class BeginsType >
-         KOKKOS_INLINE_FUNCTION
-         bool offsetview_verify_operator_bounds( const MapType &, const BeginsType & )
-         { return true ; }
-
-         template< unsigned R , class MapType , class BeginsType, class iType , class ... Args >
-         KOKKOS_INLINE_FUNCTION
-         bool offsetview_verify_operator_bounds
-         ( const MapType & map
-           , const BeginsType & begins
-           , const iType   & i
-           , Args ... args
-         )
-         {
-
-           const bool legalIndex =  ( int64_t(i) >=  begins[R]  ) &&
-               ( int64_t(i) <= int64_t(begins[R] + map.extent(R) - 1) );
-           return  legalIndex
-               && offsetview_verify_operator_bounds<R+1>( map , begins,  args ... );
-         }
-         template< unsigned , class MapType, class BeginsType >
-         inline
-         void offsetview_error_operator_bounds( char * , int , const MapType & , const BeginsType &)
-         {}
-
-         template< unsigned R , class MapType , class BeginsType , class iType , class ... Args >
-         inline
-         void offsetview_error_operator_bounds
-           ( char * buf
-           , int len
-           , const MapType & map
-           , const  BeginsType begins
-           , const iType   & i
-           , Args ... args
-           )
-         {
-           const int64_t b = begins[R];
-           const int64_t e = b + map.extent(R) - 1;
-           const int n =
-             snprintf(buf,len," %ld <= %ld <= %ld %c"
-                     , static_cast<unsigned long>(b)
-                     , static_cast<unsigned long>(i)
-                     , static_cast<unsigned long>(e)
-                     , ( sizeof...(Args) ? ',' : ')' )
-                     );
-           offsetview_error_operator_bounds<R+1>(buf+n,len-n,map,begins,args...);
-         }
-
-         template< class MemorySpace , class MapType , class BeginsType, class ... Args >
-         KOKKOS_INLINE_FUNCTION
-         void offsetview_verify_operator_bounds
-           ( Kokkos::Impl::SharedAllocationTracker const & tracker
-           , const MapType & map , const BeginsType & begins, Args ... args )
-         {
-           if ( ! offsetview_verify_operator_bounds<0>( map , begins, args ... ) ) {
-#if defined( KOKKOS_ACTIVE_EXECUTION_MEMORY_SPACE_HOST )
-              enum { LEN = 1024 };
-              char buffer[ LEN ];
-              const std::string label = tracker.template get_label<MemorySpace>();
-              int n = snprintf(buffer,LEN,"OffsetView bounds error of view labeled %s (",label.c_str());
-              offsetview_error_operator_bounds<0>( buffer + n , LEN - n , map ,begins, args ... );
-              Kokkos::Impl::throw_runtime_exception(std::string(buffer));
+template <class MemorySpace, class MapType, class BeginsType, class... Args>
+KOKKOS_INLINE_FUNCTION void offsetview_verify_operator_bounds(
+    Kokkos::Impl::SharedAllocationTracker const& tracker, const MapType& map,
+    const BeginsType& begins, Args... args) {
+  if (!offsetview_verify_operator_bounds<0>(map, begins, args...)) {
+#if defined(KOKKOS_ACTIVE_EXECUTION_MEMORY_SPACE_HOST)
+    enum { LEN = 1024 };
+    char buffer[LEN];
+    const std::string label = tracker.template get_label<MemorySpace>();
+    int n =
+        snprintf(buffer, LEN, "OffsetView bounds error of view labeled %s (",
+                 label.c_str());
+    offsetview_error_operator_bounds<0>(buffer + n, LEN - n, map, begins,
+                                        args...);
+    Kokkos::Impl::throw_runtime_exception(std::string(buffer));
 #else
-              /* Check #1: is there a SharedAllocationRecord?
-                (we won't use it, but if its not there then there isn't
-                 a corresponding SharedAllocationHeader containing a label).
-                This check should cover the case of Views that don't
-                have the Unmanaged trait but were initialized by pointer. */
-              if (tracker.has_record()) {
-		Kokkos::Impl::operator_bounds_error_on_device<MapType>(
-			      map, Kokkos::Impl::has_printable_label_typedef<MapType>());
-              } else {
-                 Kokkos::abort("OffsetView bounds error");
-              }
+    /* Check #1: is there a SharedAllocationRecord?
+      (we won't use it, but if its not there then there isn't
+       a corresponding SharedAllocationHeader containing a label).
+      This check should cover the case of Views that don't
+      have the Unmanaged trait but were initialized by pointer. */
+    if (tracker.has_record()) {
+      Kokkos::Impl::operator_bounds_error_on_device<MapType>(
+          map, Kokkos::Impl::has_printable_label_typedef<MapType>());
+    } else {
+      Kokkos::abort("OffsetView bounds error");
+    }
 #endif
-           }
-         }
+  }
+}
 
 #ifdef KOKKOS_ACTIVE_EXECUTION_MEMORY_SPACE_HOST
-         KOKKOS_INLINE_FUNCTION
-         void runtime_check_rank_host(const size_t rank_dynamic, const size_t rank,
-               const index_list_type minIndices, const std::string & label)
-         {
-            bool isBad = false;
-            std::string message = "Kokkos::Experimental::OffsetView ERROR: for OffsetView labeled '" + label + "':";
-            if (rank_dynamic != rank) {
-               message += "The full rank must be the same as the dynamic rank. full rank = ";
-               message += std::to_string(rank) + " dynamic rank = " + std::to_string(rank_dynamic) + "\n";
-               isBad = true;
-            }
+KOKKOS_INLINE_FUNCTION
+void runtime_check_rank_host(const size_t rank_dynamic, const size_t rank,
+                             const index_list_type minIndices,
+                             const std::string& label) {
+  bool isBad = false;
+  std::string message =
+      "Kokkos::Experimental::OffsetView ERROR: for OffsetView labeled '" +
+      label + "':";
+  if (rank_dynamic != rank) {
+    message +=
+        "The full rank must be the same as the dynamic rank. full rank = ";
+    message += std::to_string(rank) +
+               " dynamic rank = " + std::to_string(rank_dynamic) + "\n";
+    isBad = true;
+  }
 
-            size_t numOffsets = 0;
-            for(size_t i = 0; i < minIndices.size(); ++i ){
-               if( minIndices.begin()[i] != -KOKKOS_INVALID_OFFSET) numOffsets++;
-            }
-            if (numOffsets != rank_dynamic) {
-               message += "The number of offsets provided ( " + std::to_string(numOffsets) +
-                     " ) must equal the dynamic rank ( " + std::to_string(rank_dynamic) + " ).";
-               isBad = true;
-            }
+  size_t numOffsets = 0;
+  for (size_t i = 0; i < minIndices.size(); ++i) {
+    if (minIndices.begin()[i] != KOKKOS_INVALID_OFFSET) numOffsets++;
+  }
+  if (numOffsets != rank_dynamic) {
+    message += "The number of offsets provided ( " +
+               std::to_string(numOffsets) +
+               " ) must equal the dynamic rank ( " +
+               std::to_string(rank_dynamic) + " ).";
+    isBad = true;
+  }
 
-            if(isBad) Kokkos::abort(message.c_str());
-         }
+  if (isBad) Kokkos::abort(message.c_str());
+}
 #endif
 
-         KOKKOS_INLINE_FUNCTION
-         void runtime_check_rank_device(const size_t rank_dynamic, const size_t rank,
-               const index_list_type minIndices)
-         {
-            if (rank_dynamic != rank) {
-               Kokkos::abort("The full rank of an OffsetView must be the same as the dynamic rank.");
-            }
-            size_t numOffsets = 0;
-            for(size_t i = 0; i < minIndices.size(); ++i ){
-               if( minIndices.begin()[i] != -KOKKOS_INVALID_OFFSET) numOffsets++;
-            }
-            if (numOffsets != rank) {
-               Kokkos::abort("The number of offsets provided to an OffsetView constructor must equal the dynamic rank.");
-            }
+KOKKOS_INLINE_FUNCTION
+void runtime_check_rank_device(const size_t rank_dynamic, const size_t rank,
+                               const index_list_type minIndices) {
+  if (rank_dynamic != rank) {
+    Kokkos::abort(
+        "The full rank of an OffsetView must be the same as the dynamic rank.");
+  }
+  size_t numOffsets = 0;
+  for (size_t i = 0; i < minIndices.size(); ++i) {
+    if (minIndices.begin()[i] != KOKKOS_INVALID_OFFSET) numOffsets++;
+  }
+  if (numOffsets != rank) {
+    Kokkos::abort(
+        "The number of offsets provided to an OffsetView constructor must "
+        "equal the dynamic rank.");
+  }
+}
+}  // namespace Impl
 
-         }
-      }
+template <class DataType, class... Properties>
+class OffsetView : public ViewTraits<DataType, Properties...> {
+ public:
+  typedef ViewTraits<DataType, Properties...> traits;
 
-      template< class DataType , class ... Properties >
-      class OffsetView : public ViewTraits< DataType , Properties ... > {
-      public:
+ private:
+  template <class, class...>
+  friend class OffsetView;
+  template <class, class...>
+  friend class View;  // FIXME delete this line
+  template <class, class...>
+  friend class Kokkos::Impl::ViewMapping;
 
-         typedef ViewTraits< DataType , Properties ... > traits ;
+  typedef Kokkos::Impl::ViewMapping<traits, void> map_type;
+  typedef Kokkos::Impl::SharedAllocationTracker track_type;
 
+ public:
+  enum { Rank = map_type::Rank };
+  typedef Kokkos::Array<int64_t, Rank> begins_type;
 
+  template <
+      typename iType,
+      typename std::enable_if<std::is_integral<iType>::value, iType>::type = 0>
+  KOKKOS_INLINE_FUNCTION int64_t begin(const iType local_dimension) const {
+    return local_dimension < Rank ? m_begins[local_dimension]
+                                  : KOKKOS_INVALID_OFFSET;
+  }
 
-      private:
+  KOKKOS_INLINE_FUNCTION
+  begins_type begins() const { return m_begins; }
 
-         template< class , class ... > friend class OffsetView ;
-         template< class , class ... > friend class View ;  //FIXME delete this line
-         template< class , class ... > friend class Kokkos::Impl::ViewMapping ;
+  template <
+      typename iType,
+      typename std::enable_if<std::is_integral<iType>::value, iType>::type = 0>
+  KOKKOS_INLINE_FUNCTION int64_t end(const iType local_dimension) const {
+    return begin(local_dimension) + m_map.extent(local_dimension);
+  }
 
+ private:
+  track_type m_track;
+  map_type m_map;
+  begins_type m_begins;
 
-         typedef Kokkos::Impl::ViewMapping< traits , void > map_type ;
-         typedef Kokkos::Impl::SharedAllocationTracker      track_type ;
-      public:
-         enum { Rank = map_type::Rank };
-         typedef Kokkos::Array<int64_t, Rank>  begins_type ;
+ public:
+  //----------------------------------------
+  /** \brief  Compatible view of array of scalar types */
+  typedef OffsetView<
+      typename traits::scalar_array_type, typename traits::array_layout,
+      typename traits::device_type, typename traits::memory_traits>
+      array_type;
 
+  /** \brief  Compatible view of const data type */
+  typedef OffsetView<
+      typename traits::const_data_type, typename traits::array_layout,
+      typename traits::device_type, typename traits::memory_traits>
+      const_type;
 
-         template <typename iType, typename std::enable_if< std::is_integral<iType>::value, iType>::type = 0>
-         KOKKOS_INLINE_FUNCTION
-         int64_t begin(const iType local_dimension) const {
-             return local_dimension < Rank ? m_begins[local_dimension] : 0;
-         }
+  /** \brief  Compatible view of non-const data type */
+  typedef OffsetView<
+      typename traits::non_const_data_type, typename traits::array_layout,
+      typename traits::device_type, typename traits::memory_traits>
+      non_const_type;
 
-         KOKKOS_INLINE_FUNCTION
-         begins_type begins() const { return m_begins;}
+  /** \brief  Compatible HostMirror view */
+  typedef OffsetView<typename traits::non_const_data_type,
+                     typename traits::array_layout,
+                     typename traits::host_mirror_space>
+      HostMirror;
 
-         template <typename iType, typename std::enable_if< std::is_integral<iType>::value, iType>::type = 0>
-         KOKKOS_INLINE_FUNCTION
-         int64_t end(const iType local_dimension) const {
-             return begin(local_dimension) + m_map.extent(local_dimension);
-         }
+  //----------------------------------------
+  // Domain rank and extents
 
+  /** \brief rank() to be implemented
+   */
+  // KOKKOS_INLINE_FUNCTION
+  // static
+  // constexpr unsigned rank() { return map_type::Rank; }
 
-      private:
-         track_type  m_track ;
-         map_type    m_map ;
-         begins_type  m_begins;
+  template <typename iType>
+  KOKKOS_INLINE_FUNCTION constexpr
+      typename std::enable_if<std::is_integral<iType>::value, size_t>::type
+      extent(const iType& r) const {
+    return m_map.extent(r);
+  }
 
-      public:
-         //----------------------------------------
-         /** \brief  Compatible view of array of scalar types */
-         typedef OffsetView< typename traits::scalar_array_type ,
-               typename traits::array_layout ,
-               typename traits::device_type ,
-               typename traits::memory_traits >
-         array_type ;
+  template <typename iType>
+  KOKKOS_INLINE_FUNCTION constexpr
+      typename std::enable_if<std::is_integral<iType>::value, int>::type
+      extent_int(const iType& r) const {
+    return static_cast<int>(m_map.extent(r));
+  }
 
-         /** \brief  Compatible view of const data type */
-         typedef OffsetView< typename traits::const_data_type ,
-               typename traits::array_layout ,
-               typename traits::device_type ,
-               typename traits::memory_traits >
-         const_type ;
+  KOKKOS_INLINE_FUNCTION constexpr typename traits::array_layout layout()
+      const {
+    return m_map.layout();
+  }
 
-         /** \brief  Compatible view of non-const data type */
-         typedef OffsetView< typename traits::non_const_data_type ,
-               typename traits::array_layout ,
-               typename traits::device_type ,
-               typename traits::memory_traits >
-         non_const_type ;
+  KOKKOS_INLINE_FUNCTION constexpr size_t size() const {
+    return m_map.dimension_0() * m_map.dimension_1() * m_map.dimension_2() *
+           m_map.dimension_3() * m_map.dimension_4() * m_map.dimension_5() *
+           m_map.dimension_6() * m_map.dimension_7();
+  }
 
-         /** \brief  Compatible HostMirror view */
-         typedef OffsetView< typename traits::non_const_data_type ,
-               typename traits::array_layout ,
-               typename traits::host_mirror_space >
-         HostMirror ;
+  KOKKOS_INLINE_FUNCTION constexpr size_t stride_0() const {
+    return m_map.stride_0();
+  }
+  KOKKOS_INLINE_FUNCTION constexpr size_t stride_1() const {
+    return m_map.stride_1();
+  }
+  KOKKOS_INLINE_FUNCTION constexpr size_t stride_2() const {
+    return m_map.stride_2();
+  }
+  KOKKOS_INLINE_FUNCTION constexpr size_t stride_3() const {
+    return m_map.stride_3();
+  }
+  KOKKOS_INLINE_FUNCTION constexpr size_t stride_4() const {
+    return m_map.stride_4();
+  }
+  KOKKOS_INLINE_FUNCTION constexpr size_t stride_5() const {
+    return m_map.stride_5();
+  }
+  KOKKOS_INLINE_FUNCTION constexpr size_t stride_6() const {
+    return m_map.stride_6();
+  }
+  KOKKOS_INLINE_FUNCTION constexpr size_t stride_7() const {
+    return m_map.stride_7();
+  }
 
-         //----------------------------------------
-         // Domain rank and extents
+  template <typename iType>
+  KOKKOS_INLINE_FUNCTION constexpr
+      typename std::enable_if<std::is_integral<iType>::value, size_t>::type
+      stride(iType r) const {
+    return (
+        r == 0
+            ? m_map.stride_0()
+            : (r == 1
+                   ? m_map.stride_1()
+                   : (r == 2
+                          ? m_map.stride_2()
+                          : (r == 3
+                                 ? m_map.stride_3()
+                                 : (r == 4
+                                        ? m_map.stride_4()
+                                        : (r == 5
+                                               ? m_map.stride_5()
+                                               : (r == 6
+                                                      ? m_map.stride_6()
+                                                      : m_map.stride_7())))))));
+  }
 
-         /** \brief rank() to be implemented
-          */
-         //KOKKOS_INLINE_FUNCTION
-         //static
-         //constexpr unsigned rank() { return map_type::Rank; }
+  template <typename iType>
+  KOKKOS_INLINE_FUNCTION void stride(iType* const s) const {
+    m_map.stride(s);
+  }
 
-         template< typename iType >
-         KOKKOS_INLINE_FUNCTION constexpr
-         typename std::enable_if< std::is_integral<iType>::value , size_t >::type
-         extent( const iType & r ) const
-         { return m_map.extent(r); }
+  //----------------------------------------
+  // Range span is the span which contains all members.
 
-         template< typename iType >
-         KOKKOS_INLINE_FUNCTION constexpr
-         typename std::enable_if< std::is_integral<iType>::value , int >::type
-         extent_int( const iType & r ) const
-         { return static_cast<int>(m_map.extent(r)); }
+  typedef typename map_type::reference_type reference_type;
+  typedef typename map_type::pointer_type pointer_type;
 
-         KOKKOS_INLINE_FUNCTION constexpr
-         typename traits::array_layout layout() const
-         { return m_map.layout(); }
+  enum {
+    reference_type_is_lvalue_reference =
+        std::is_lvalue_reference<reference_type>::value
+  };
 
+  KOKKOS_INLINE_FUNCTION constexpr size_t span() const { return m_map.span(); }
+  KOKKOS_INLINE_FUNCTION bool span_is_contiguous() const {
+    return m_map.span_is_contiguous();
+  }
+  KOKKOS_INLINE_FUNCTION constexpr pointer_type data() const {
+    return m_map.data();
+  }
 
-         KOKKOS_INLINE_FUNCTION constexpr size_t size() const { return m_map.dimension_0() *
-               m_map.dimension_1() *
-               m_map.dimension_2() *
-               m_map.dimension_3() *
-               m_map.dimension_4() *
-               m_map.dimension_5() *
-               m_map.dimension_6() *
-               m_map.dimension_7(); }
+  //----------------------------------------
+  // Allow specializations to query their specialized map
 
-         KOKKOS_INLINE_FUNCTION constexpr size_t stride_0() const { return m_map.stride_0(); }
-         KOKKOS_INLINE_FUNCTION constexpr size_t stride_1() const { return m_map.stride_1(); }
-         KOKKOS_INLINE_FUNCTION constexpr size_t stride_2() const { return m_map.stride_2(); }
-         KOKKOS_INLINE_FUNCTION constexpr size_t stride_3() const { return m_map.stride_3(); }
-         KOKKOS_INLINE_FUNCTION constexpr size_t stride_4() const { return m_map.stride_4(); }
-         KOKKOS_INLINE_FUNCTION constexpr size_t stride_5() const { return m_map.stride_5(); }
-         KOKKOS_INLINE_FUNCTION constexpr size_t stride_6() const { return m_map.stride_6(); }
-         KOKKOS_INLINE_FUNCTION constexpr size_t stride_7() const { return m_map.stride_7(); }
+  KOKKOS_INLINE_FUNCTION
+  const Kokkos::Impl::ViewMapping<traits, void>& implementation_map() const {
+    return m_map;
+  }
 
-         template< typename iType >
-         KOKKOS_INLINE_FUNCTION constexpr
-         typename std::enable_if< std::is_integral<iType>::value , size_t >::type
-         stride(iType r) const {
-            return (r == 0 ? m_map.stride_0() :
-                  (r == 1 ? m_map.stride_1() :
-                        (r == 2 ? m_map.stride_2() :
-                              (r == 3 ? m_map.stride_3() :
-                                    (r == 4 ? m_map.stride_4() :
-                                          (r == 5 ? m_map.stride_5() :
-                                                (r == 6 ? m_map.stride_6() :
-                                                      m_map.stride_7())))))));
-         }
+  //----------------------------------------
 
-         template< typename iType >
-         KOKKOS_INLINE_FUNCTION void stride( iType * const s ) const { m_map.stride(s); }
+ private:
+  enum {
+    is_layout_left =
+        std::is_same<typename traits::array_layout, Kokkos::LayoutLeft>::value,
 
-         //----------------------------------------
-         // Range span is the span which contains all members.
+    is_layout_right =
+        std::is_same<typename traits::array_layout, Kokkos::LayoutRight>::value,
 
-         typedef typename map_type::reference_type  reference_type ;
-         typedef typename map_type::pointer_type    pointer_type ;
+    is_layout_stride = std::is_same<typename traits::array_layout,
+                                    Kokkos::LayoutStride>::value,
 
-         enum { reference_type_is_lvalue_reference = std::is_lvalue_reference< reference_type >::value };
+    is_default_map = std::is_same<typename traits::specialize, void>::value &&
+                     (is_layout_left || is_layout_right || is_layout_stride)
+  };
 
-         KOKKOS_INLINE_FUNCTION constexpr size_t span() const { return m_map.span(); }
-         KOKKOS_INLINE_FUNCTION bool span_is_contiguous() const { return m_map.span_is_contiguous(); }
-         KOKKOS_INLINE_FUNCTION constexpr pointer_type data() const { return m_map.data(); }
+  template <class Space, bool = Kokkos::Impl::MemorySpaceAccess<
+                             Space, typename traits::memory_space>::accessible>
+  struct verify_space {
+    KOKKOS_FORCEINLINE_FUNCTION static void check() {}
+  };
 
-         //----------------------------------------
-         // Allow specializations to query their specialized map
+  template <class Space>
+  struct verify_space<Space, false> {
+    KOKKOS_FORCEINLINE_FUNCTION static void check() {
+      Kokkos::abort(
+          "Kokkos::View ERROR: attempt to access inaccessible memory space");
+    };
+  };
 
-         KOKKOS_INLINE_FUNCTION
-         const Kokkos::Impl::ViewMapping< traits , void > &
-         implementation_map() const { return m_map ; }
+#if defined(KOKKOS_ENABLE_DEBUG_BOUNDS_CHECK)
 
-         //----------------------------------------
-
-      private:
-
-         enum {
-            is_layout_left = std::is_same< typename traits::array_layout
-            , Kokkos::LayoutLeft >::value ,
-
-            is_layout_right = std::is_same< typename traits::array_layout
-            , Kokkos::LayoutRight >::value ,
-
-            is_layout_stride = std::is_same< typename traits::array_layout
-            , Kokkos::LayoutStride >::value ,
-
-            is_default_map =
-                  std::is_same< typename traits::specialize , void >::value &&
-                  ( is_layout_left || is_layout_right || is_layout_stride )
-         };
-
-         template< class Space , bool = Kokkos::Impl::MemorySpaceAccess< Space , typename traits::memory_space >::accessible > struct verify_space
-               { KOKKOS_FORCEINLINE_FUNCTION static void check() {} };
-
-         template< class Space > struct verify_space<Space,false>
-         { KOKKOS_FORCEINLINE_FUNCTION static void check()
-         { Kokkos::abort("Kokkos::View ERROR: attempt to access inaccessible memory space");
-         };
-         };
-
-#if defined( KOKKOS_ENABLE_DEBUG_BOUNDS_CHECK )
-
-#define KOKKOS_IMPL_OFFSETVIEW_OPERATOR_VERIFY( ARG ) \
-      OffsetView::template verify_space< Kokkos::Impl::ActiveExecutionMemorySpace >::check(); \
-      Kokkos::Experimental::Impl::offsetview_verify_operator_bounds< typename traits::memory_space > ARG ;
+#define KOKKOS_IMPL_OFFSETVIEW_OPERATOR_VERIFY(ARG)              \
+  OffsetView::template verify_space<                             \
+      Kokkos::Impl::ActiveExecutionMemorySpace>::check();        \
+  Kokkos::Experimental::Impl::offsetview_verify_operator_bounds< \
+      typename traits::memory_space>                             \
+      ARG;
 
 #else
 
-#define KOKKOS_IMPL_OFFSETVIEW_OPERATOR_VERIFY( ARG ) \
-      OffsetView::template verify_space< Kokkos::Impl::ActiveExecutionMemorySpace >::check();
+#define KOKKOS_IMPL_OFFSETVIEW_OPERATOR_VERIFY(ARG) \
+  OffsetView::template verify_space<                \
+      Kokkos::Impl::ActiveExecutionMemorySpace>::check();
 
 #endif
-      public:
+ public:
+  //------------------------------
+  // Rank 0 operator()
 
-         //------------------------------
-         // Rank 0 operator()
+  KOKKOS_FORCEINLINE_FUNCTION
+  reference_type operator()() const { return m_map.reference(); }
+  //------------------------------
+  // Rank 1 operator()
 
-         KOKKOS_FORCEINLINE_FUNCTION
-         reference_type
-         operator()() const
-         {
-            return m_map.reference();
-         }
-         //------------------------------
-         // Rank 1 operator()
+  template <typename I0>
+  KOKKOS_FORCEINLINE_FUNCTION
+      typename std::enable_if<(Kokkos::Impl::are_integral<I0>::value &&
+                               (1 == Rank) && !is_default_map),
+                              reference_type>::type
+      operator()(const I0& i0) const {
+    KOKKOS_IMPL_OFFSETVIEW_OPERATOR_VERIFY((m_track, m_map, m_begins, i0))
+    const size_t j0 = i0 - m_begins[0];
+    return m_map.reference(j0);
+  }
 
+  template <typename I0>
+  KOKKOS_FORCEINLINE_FUNCTION
+      typename std::enable_if<(Kokkos::Impl::are_integral<I0>::value &&
+                               (1 == Rank) && is_default_map &&
+                               !is_layout_stride),
+                              reference_type>::type
+      operator()(const I0& i0) const {
+    KOKKOS_IMPL_OFFSETVIEW_OPERATOR_VERIFY((m_track, m_map, m_begins, i0))
+    const size_t j0 = i0 - m_begins[0];
+    return m_map.m_impl_handle[j0];
+  }
 
-         template< typename I0>
-         KOKKOS_FORCEINLINE_FUNCTION
-         typename std::enable_if<
-         ( Kokkos::Impl::are_integral<I0>::value
-               && ( 1 == Rank )
-               && ! is_default_map
-         ), reference_type >::type
-         operator()( const I0 & i0) const
-         {
+  template <typename I0>
+  KOKKOS_FORCEINLINE_FUNCTION
+      typename std::enable_if<(Kokkos::Impl::are_integral<I0>::value &&
+                               (1 == Rank) && is_default_map &&
+                               is_layout_stride),
+                              reference_type>::type
+      operator()(const I0& i0) const {
+    KOKKOS_IMPL_OFFSETVIEW_OPERATOR_VERIFY((m_track, m_map, m_begins, i0))
+    const size_t j0 = i0 - m_begins[0];
+    return m_map.m_impl_handle[m_map.m_impl_offset.m_stride.S0 * j0];
+  }
+  //------------------------------
+  // Rank 1 operator[]
 
-            KOKKOS_IMPL_OFFSETVIEW_OPERATOR_VERIFY( (m_track,m_map, m_begins, i0) )
-                          const size_t j0 = i0 - m_begins[0];
-            return m_map.reference(j0);
-         }
+  template <typename I0>
+  KOKKOS_FORCEINLINE_FUNCTION
+      typename std::enable_if<(Kokkos::Impl::are_integral<I0>::value &&
+                               (1 == Rank) && !is_default_map),
+                              reference_type>::type
+      operator[](const I0& i0) const {
+    KOKKOS_IMPL_OFFSETVIEW_OPERATOR_VERIFY((m_track, m_map, m_begins, i0))
+    const size_t j0 = i0 - m_begins[0];
+    return m_map.reference(j0);
+  }
 
-         template< typename I0>
-         KOKKOS_FORCEINLINE_FUNCTION
-         typename std::enable_if<
-         ( Kokkos::Impl::are_integral<I0>::value
-               && ( 1 == Rank )
-               && is_default_map
-               && ! is_layout_stride
-         ), reference_type >::type
-         operator()( const I0 & i0 ) const
-         {
-            KOKKOS_IMPL_OFFSETVIEW_OPERATOR_VERIFY( (m_track,m_map, m_begins, i0) )
-                          const size_t j0 = i0 - m_begins[0];
-            return m_map.m_impl_handle[ j0 ];
-         }
+  template <typename I0>
+  KOKKOS_FORCEINLINE_FUNCTION
+      typename std::enable_if<(Kokkos::Impl::are_integral<I0>::value &&
+                               (1 == Rank) && is_default_map &&
+                               !is_layout_stride),
+                              reference_type>::type
+      operator[](const I0& i0) const {
+    KOKKOS_IMPL_OFFSETVIEW_OPERATOR_VERIFY((m_track, m_map, m_begins, i0))
+    const size_t j0 = i0 - m_begins[0];
+    return m_map.m_impl_handle[j0];
+  }
 
-         template< typename I0 >
-         KOKKOS_FORCEINLINE_FUNCTION
-         typename std::enable_if<
-         ( Kokkos::Impl::are_integral<I0>::value
-               && ( 1 == Rank )
-               && is_default_map
-               && is_layout_stride
-         ), reference_type >::type
-         operator()( const I0 & i0) const
-         {
-            KOKKOS_IMPL_OFFSETVIEW_OPERATOR_VERIFY( (m_track,m_map, m_begins, i0) )
-                          const size_t j0 = i0 - m_begins[0];
-            return m_map.m_impl_handle[ m_map.m_impl_offset.m_stride.S0 * j0 ];
-         }
-         //------------------------------
-         // Rank 1 operator[]
+  template <typename I0>
+  KOKKOS_FORCEINLINE_FUNCTION
+      typename std::enable_if<(Kokkos::Impl::are_integral<I0>::value &&
+                               (1 == Rank) && is_default_map &&
+                               is_layout_stride),
+                              reference_type>::type
+      operator[](const I0& i0) const {
+    KOKKOS_IMPL_OFFSETVIEW_OPERATOR_VERIFY((m_track, m_map, m_begins, i0))
+    const size_t j0 = i0 - m_begins[0];
+    return m_map.m_impl_handle[m_map.m_impl_offset.m_stride.S0 * j0];
+  }
 
-         template< typename I0 >
-         KOKKOS_FORCEINLINE_FUNCTION
-         typename std::enable_if<
-         ( Kokkos::Impl::are_integral<I0>::value
-               && ( 1 == Rank )
-               && ! is_default_map
-         ), reference_type >::type
-         operator[]( const I0 & i0 ) const
-         {
-            KOKKOS_IMPL_OFFSETVIEW_OPERATOR_VERIFY( (m_track,m_map, m_begins, i0) )
-                          const size_t j0 = i0 - m_begins[0];
-            return m_map.reference(j0);
-         }
+  //------------------------------
+  // Rank 2
 
-         template< typename I0 >
-         KOKKOS_FORCEINLINE_FUNCTION
-         typename std::enable_if<
-         ( Kokkos::Impl::are_integral<I0>::value
-               && ( 1 == Rank )
-               && is_default_map
-               && ! is_layout_stride
-         ), reference_type >::type
-         operator[]( const I0 & i0 ) const
-         {
-            KOKKOS_IMPL_OFFSETVIEW_OPERATOR_VERIFY( (m_track,m_map, m_begins, i0) )
-                          const size_t j0 = i0 - m_begins[0];
-            return m_map.m_impl_handle[ j0 ];
-         }
+  template <typename I0, typename I1>
+  KOKKOS_FORCEINLINE_FUNCTION
+      typename std::enable_if<(Kokkos::Impl::are_integral<I0, I1>::value &&
+                               (2 == Rank) && !is_default_map),
+                              reference_type>::type
+      operator()(const I0& i0, const I1& i1) const {
+    KOKKOS_IMPL_OFFSETVIEW_OPERATOR_VERIFY((m_track, m_map, m_begins, i0, i1))
+    const size_t j0 = i0 - m_begins[0];
+    const size_t j1 = i1 - m_begins[1];
+    return m_map.reference(j0, j1);
+  }
 
-         template< typename I0 >
-         KOKKOS_FORCEINLINE_FUNCTION
-         typename std::enable_if<
-         ( Kokkos::Impl::are_integral<I0>::value
-               && ( 1 == Rank )
-               && is_default_map
-               && is_layout_stride
-         ), reference_type >::type
-         operator[]( const I0 & i0 ) const
-         {
-            KOKKOS_IMPL_OFFSETVIEW_OPERATOR_VERIFY( (m_track,m_map, m_begins, i0) )
-                          const size_t j0 = i0 - m_begins[0];
-            return m_map.m_impl_handle[ m_map.m_impl_offset.m_stride.S0 * j0 ];
-         }
+  template <typename I0, typename I1>
+  KOKKOS_FORCEINLINE_FUNCTION
+      typename std::enable_if<(Kokkos::Impl::are_integral<I0, I1>::value &&
+                               (2 == Rank) && is_default_map &&
+                               is_layout_left && (traits::rank_dynamic == 0)),
+                              reference_type>::type
+      operator()(const I0& i0, const I1& i1) const {
+    KOKKOS_IMPL_OFFSETVIEW_OPERATOR_VERIFY((m_track, m_map, m_begins, i0, i1))
+    const size_t j0 = i0 - m_begins[0];
+    const size_t j1 = i1 - m_begins[1];
+    return m_map.m_impl_handle[j0 + m_map.m_impl_offset.m_dim.N0 * j1];
+  }
 
+  template <typename I0, typename I1>
+  KOKKOS_FORCEINLINE_FUNCTION
+      typename std::enable_if<(Kokkos::Impl::are_integral<I0, I1>::value &&
+                               (2 == Rank) && is_default_map &&
+                               is_layout_left && (traits::rank_dynamic != 0)),
+                              reference_type>::type
+      operator()(const I0& i0, const I1& i1) const {
+    KOKKOS_IMPL_OFFSETVIEW_OPERATOR_VERIFY((m_track, m_map, m_begins, i0, i1))
+    const size_t j0 = i0 - m_begins[0];
+    const size_t j1 = i1 - m_begins[1];
+    return m_map.m_impl_handle[j0 + m_map.m_impl_offset.m_stride * j1];
+  }
 
-         //------------------------------
-         // Rank 2
+  template <typename I0, typename I1>
+  KOKKOS_FORCEINLINE_FUNCTION
+      typename std::enable_if<(Kokkos::Impl::are_integral<I0, I1>::value &&
+                               (2 == Rank) && is_default_map &&
+                               is_layout_right && (traits::rank_dynamic == 0)),
+                              reference_type>::type
+      operator()(const I0& i0, const I1& i1) const {
+    KOKKOS_IMPL_OFFSETVIEW_OPERATOR_VERIFY((m_track, m_map, m_begins, i0, i1))
+    const size_t j0 = i0 - m_begins[0];
+    const size_t j1 = i1 - m_begins[1];
+    return m_map.m_impl_handle[j1 + m_map.m_impl_offset.m_dim.N1 * j0];
+  }
 
-         template< typename I0 , typename I1 >
-         KOKKOS_FORCEINLINE_FUNCTION
-         typename std::enable_if<
-         ( Kokkos::Impl::are_integral<I0,I1>::value
-               && ( 2 == Rank )
-               && ! is_default_map
-         ), reference_type >::type
-         operator()( const I0 & i0 , const I1 & i1) const
-         {
-            KOKKOS_IMPL_OFFSETVIEW_OPERATOR_VERIFY( (m_track,m_map, m_begins, i0,i1) )
-                          const size_t j0 = i0 - m_begins[0];
-            const size_t j1 = i1 - m_begins[1];
-            return m_map.reference(j0,j1);
-         }
+  template <typename I0, typename I1>
+  KOKKOS_FORCEINLINE_FUNCTION
+      typename std::enable_if<(Kokkos::Impl::are_integral<I0, I1>::value &&
+                               (2 == Rank) && is_default_map &&
+                               is_layout_right && (traits::rank_dynamic != 0)),
+                              reference_type>::type
+      operator()(const I0& i0, const I1& i1) const {
+    KOKKOS_IMPL_OFFSETVIEW_OPERATOR_VERIFY((m_track, m_map, m_begins, i0, i1))
+    const size_t j0 = i0 - m_begins[0];
+    const size_t j1 = i1 - m_begins[1];
+    return m_map.m_impl_handle[j1 + m_map.m_impl_offset.m_stride * j0];
+  }
 
-         template< typename I0 , typename I1 >
-         KOKKOS_FORCEINLINE_FUNCTION
-         typename std::enable_if<
-         ( Kokkos::Impl::are_integral<I0,I1>::value
-               && ( 2 == Rank )
-               && is_default_map
-               && is_layout_left && ( traits::rank_dynamic == 0 )
-         ), reference_type >::type
-         operator()( const I0 & i0 , const I1 & i1) const
-         {
-            KOKKOS_IMPL_OFFSETVIEW_OPERATOR_VERIFY( (m_track,m_map, m_begins, i0,i1) )
-                          const size_t j0 = i0 - m_begins[0];
-            const size_t j1 = i1 - m_begins[1];
-            return m_map.m_impl_handle[ j0 + m_map.m_impl_offset.m_dim.N0 * j1 ];
-         }
+  template <typename I0, typename I1>
+  KOKKOS_FORCEINLINE_FUNCTION
+      typename std::enable_if<(Kokkos::Impl::are_integral<I0, I1>::value &&
+                               (2 == Rank) && is_default_map &&
+                               is_layout_stride),
+                              reference_type>::type
+      operator()(const I0& i0, const I1& i1) const {
+    KOKKOS_IMPL_OFFSETVIEW_OPERATOR_VERIFY((m_track, m_map, m_begins, i0, i1))
+    const size_t j0 = i0 - m_begins[0];
+    const size_t j1 = i1 - m_begins[1];
+    return m_map.m_impl_handle[j0 * m_map.m_impl_offset.m_stride.S0 +
+                               j1 * m_map.m_impl_offset.m_stride.S1];
+  }
 
-         template< typename I0 , typename I1>
-         KOKKOS_FORCEINLINE_FUNCTION
-         typename std::enable_if<
-         ( Kokkos::Impl::are_integral<I0,I1>::value
-               && ( 2 == Rank )
-               && is_default_map
-               && is_layout_left && ( traits::rank_dynamic != 0 )
-         ), reference_type >::type
-         operator()( const I0 & i0 , const I1 & i1) const
-         {
-            KOKKOS_IMPL_OFFSETVIEW_OPERATOR_VERIFY( (m_track,m_map, m_begins, i0,i1) )
-                          const size_t j0 = i0 - m_begins[0];
-            const size_t j1 = i1 - m_begins[1];
-            return m_map.m_impl_handle[ j0 + m_map.m_impl_offset.m_stride * j1 ];
-         }
+  //------------------------------
+  // Rank 3
 
-         template< typename I0 , typename I1 >
-         KOKKOS_FORCEINLINE_FUNCTION
-         typename std::enable_if<
-         ( Kokkos::Impl::are_integral<I0,I1>::value
-               && ( 2 == Rank )
-               && is_default_map
-               && is_layout_right && ( traits::rank_dynamic == 0 )
-         ), reference_type >::type
-         operator()( const I0 & i0 , const I1 & i1 ) const
-         {
-            KOKKOS_IMPL_OFFSETVIEW_OPERATOR_VERIFY( (m_track,m_map, m_begins, i0,i1) )
-                          const size_t j0 = i0 - m_begins[0];
-            const size_t j1 = i1 - m_begins[1];
-            return m_map.m_impl_handle[ j1 + m_map.m_impl_offset.m_dim.N1 * j0 ];
-         }
+  template <typename I0, typename I1, typename I2>
+  KOKKOS_FORCEINLINE_FUNCTION
+      typename std::enable_if<(Kokkos::Impl::are_integral<I0, I1, I2>::value &&
+                               (3 == Rank) && is_default_map),
+                              reference_type>::type
+      operator()(const I0& i0, const I1& i1, const I2& i2) const {
+    KOKKOS_IMPL_OFFSETVIEW_OPERATOR_VERIFY(
+        (m_track, m_map, m_begins, i0, i1, i2))
+    const size_t j0 = i0 - m_begins[0];
+    const size_t j1 = i1 - m_begins[1];
+    const size_t j2 = i2 - m_begins[2];
+    return m_map.m_impl_handle[m_map.m_impl_offset(j0, j1, j2)];
+  }
 
-         template< typename I0 , typename I1 >
-         KOKKOS_FORCEINLINE_FUNCTION
-         typename std::enable_if<
-         ( Kokkos::Impl::are_integral<I0,I1>::value
-               && ( 2 == Rank )
-               && is_default_map
-               && is_layout_right && ( traits::rank_dynamic != 0 )
-         ), reference_type >::type
-         operator()( const I0 & i0 , const I1 & i1 ) const
-         {
-            KOKKOS_IMPL_OFFSETVIEW_OPERATOR_VERIFY( (m_track,m_map, m_begins, i0,i1) )
-                          const size_t j0 = i0 - m_begins[0];
-            const size_t j1 = i1 - m_begins[1];
-            return m_map.m_impl_handle[ j1 + m_map.m_impl_offset.m_stride * j0 ];
-         }
+  template <typename I0, typename I1, typename I2>
+  KOKKOS_FORCEINLINE_FUNCTION
+      typename std::enable_if<(Kokkos::Impl::are_integral<I0, I1, I2>::value &&
+                               (3 == Rank) && !is_default_map),
+                              reference_type>::type
+      operator()(const I0& i0, const I1& i1, const I2& i2) const {
+    KOKKOS_IMPL_OFFSETVIEW_OPERATOR_VERIFY(
+        (m_track, m_map, m_begins, i0, i1, i2))
+    const size_t j0 = i0 - m_begins[0];
+    const size_t j1 = i1 - m_begins[1];
+    const size_t j2 = i2 - m_begins[2];
+    return m_map.reference(j0, j1, j2);
+  }
 
-         template< typename I0 , typename I1>
-         KOKKOS_FORCEINLINE_FUNCTION
-         typename std::enable_if<
-         ( Kokkos::Impl::are_integral<I0,I1>::value
-               && ( 2 == Rank )
-               && is_default_map
-               && is_layout_stride
-         ), reference_type >::type
-         operator()( const I0 & i0 , const I1 & i1 ) const
-         {
-            KOKKOS_IMPL_OFFSETVIEW_OPERATOR_VERIFY( (m_track,m_map, m_begins, i0,i1) )
-                          const size_t j0 = i0 - m_begins[0];
-            const size_t j1 = i1 - m_begins[1];
-            return m_map.m_impl_handle[ j0 * m_map.m_impl_offset.m_stride.S0 +
-                                        j1 * m_map.m_impl_offset.m_stride.S1 ];
-         }
+  //------------------------------
+  // Rank 4
 
-         //------------------------------
-         // Rank 3
+  template <typename I0, typename I1, typename I2, typename I3>
+  KOKKOS_FORCEINLINE_FUNCTION typename std::enable_if<
+      (Kokkos::Impl::are_integral<I0, I1, I2, I3>::value && (4 == Rank) &&
+       is_default_map),
+      reference_type>::type
+  operator()(const I0& i0, const I1& i1, const I2& i2, const I3& i3) const {
+    KOKKOS_IMPL_OFFSETVIEW_OPERATOR_VERIFY(
+        (m_track, m_map, m_begins, i0, i1, i2, i3))
+    const size_t j0 = i0 - m_begins[0];
+    const size_t j1 = i1 - m_begins[1];
+    const size_t j2 = i2 - m_begins[2];
+    const size_t j3 = i3 - m_begins[3];
+    return m_map.m_impl_handle[m_map.m_impl_offset(j0, j1, j2, j3)];
+  }
 
-         template< typename I0 , typename I1 , typename I2 >
-         KOKKOS_FORCEINLINE_FUNCTION
-         typename std::enable_if<
-         ( Kokkos::Impl::are_integral<I0,I1,I2>::value
-               && ( 3 == Rank )
-               && is_default_map
-         ), reference_type >::type
-         operator()( const I0 & i0 , const I1 & i1 , const I2 & i2) const
-         {
-            KOKKOS_IMPL_OFFSETVIEW_OPERATOR_VERIFY( (m_track,m_map, m_begins, i0,i1, i2) )
-                          const size_t j0 = i0 - m_begins[0];
-            const size_t j1 = i1 - m_begins[1];
-            const size_t j2 = i2 - m_begins[2];
-            return m_map.m_impl_handle[ m_map.m_impl_offset(j0, j1, j2) ];
-         }
+  template <typename I0, typename I1, typename I2, typename I3>
+  KOKKOS_FORCEINLINE_FUNCTION typename std::enable_if<
+      (Kokkos::Impl::are_integral<I0, I1, I2, I3>::value && (4 == Rank) &&
+       !is_default_map),
+      reference_type>::type
+  operator()(const I0& i0, const I1& i1, const I2& i2, const I3& i3) const {
+    KOKKOS_IMPL_OFFSETVIEW_OPERATOR_VERIFY(
+        (m_track, m_map, m_begins, i0, i1, i2, i3))
+    const size_t j0 = i0 - m_begins[0];
+    const size_t j1 = i1 - m_begins[1];
+    const size_t j2 = i2 - m_begins[2];
+    const size_t j3 = i3 - m_begins[3];
+    return m_map.reference(j0, j1, j2, j3);
+  }
 
-         template< typename I0 , typename I1 , typename I2>
-         KOKKOS_FORCEINLINE_FUNCTION
-         typename std::enable_if<
-         ( Kokkos::Impl::are_integral<I0,I1,I2>::value
-               && ( 3 == Rank )
-               && ! is_default_map
-         ), reference_type >::type
-         operator()( const I0 & i0 , const I1 & i1 , const I2 & i2) const
-         {
-            KOKKOS_IMPL_OFFSETVIEW_OPERATOR_VERIFY( (m_track,m_map,m_begins, i0,i1, i2) )
-                          const size_t j0 = i0 - m_begins[0];
-            const size_t j1 = i1 - m_begins[1];
-            const size_t j2 = i2 - m_begins[2];
-            return m_map.reference(j0, j1, j2);
-         }
+  //------------------------------
+  // Rank 5
 
-         //------------------------------
-         // Rank 4
+  template <typename I0, typename I1, typename I2, typename I3, typename I4>
+  KOKKOS_FORCEINLINE_FUNCTION typename std::enable_if<
+      (Kokkos::Impl::are_integral<I0, I1, I2, I3, I4>::value && (5 == Rank) &&
+       is_default_map),
+      reference_type>::type
+  operator()(const I0& i0, const I1& i1, const I2& i2, const I3& i3,
+             const I4& i4) const {
+    KOKKOS_IMPL_OFFSETVIEW_OPERATOR_VERIFY(
+        (m_track, m_map, m_begins, i0, i1, i2, i3, i4))
+    const size_t j0 = i0 - m_begins[0];
+    const size_t j1 = i1 - m_begins[1];
+    const size_t j2 = i2 - m_begins[2];
+    const size_t j3 = i3 - m_begins[3];
+    const size_t j4 = i4 - m_begins[4];
+    return m_map.m_impl_handle[m_map.m_impl_offset(j0, j1, j2, j3, j4)];
+  }
 
-         template< typename I0 , typename I1 , typename I2 , typename I3>
-         KOKKOS_FORCEINLINE_FUNCTION
-         typename std::enable_if<
-         ( Kokkos::Impl::are_integral<I0,I1,I2,I3>::value
-               && ( 4 == Rank )
-               && is_default_map
-         ), reference_type >::type
-         operator()( const I0 & i0 , const I1 & i1 , const I2 & i2 , const I3 & i3) const
-         {
-            KOKKOS_IMPL_OFFSETVIEW_OPERATOR_VERIFY( (m_track,m_map, m_begins, i0,i1, i2, i3) )
-                          const size_t j0 = i0 - m_begins[0];
-            const size_t j1 = i1 - m_begins[1];
-            const size_t j2 = i2 - m_begins[2];
-            const size_t j3 = i3 - m_begins[3];
-            return m_map.m_impl_handle[ m_map.m_impl_offset(j0,j1,j2,j3) ];
-         }
+  template <typename I0, typename I1, typename I2, typename I3, typename I4>
+  KOKKOS_FORCEINLINE_FUNCTION typename std::enable_if<
+      (Kokkos::Impl::are_integral<I0, I1, I2, I3, I4>::value && (5 == Rank) &&
+       !is_default_map),
+      reference_type>::type
+  operator()(const I0& i0, const I1& i1, const I2& i2, const I3& i3,
+             const I4& i4) const {
+    KOKKOS_IMPL_OFFSETVIEW_OPERATOR_VERIFY(
+        (m_track, m_map, m_begins, i0, i1, i2, i3, i4))
+    const size_t j0 = i0 - m_begins[0];
+    const size_t j1 = i1 - m_begins[1];
+    const size_t j2 = i2 - m_begins[2];
+    const size_t j3 = i3 - m_begins[3];
+    const size_t j4 = i4 - m_begins[4];
+    return m_map.reference(j0, j1, j2, j3, j4);
+  }
 
-         template< typename I0 , typename I1 , typename I2 , typename I3 >
-         KOKKOS_FORCEINLINE_FUNCTION
-         typename std::enable_if<
-         ( Kokkos::Impl::are_integral<I0,I1,I2,I3>::value
-               && ( 4 == Rank )
-               && ! is_default_map
-         ), reference_type >::type
-         operator()( const I0 & i0 , const I1 & i1 , const I2 & i2 , const I3 & i3) const
-         {
-            KOKKOS_IMPL_OFFSETVIEW_OPERATOR_VERIFY( (m_track,m_map, m_begins, i0,i1, i2, i3) )
-                          const size_t j0 = i0 - m_begins[0];
-            const size_t j1 = i1 - m_begins[1];
-            const size_t j2 = i2 - m_begins[2];
-            const size_t j3 = i3 - m_begins[3];
-            return m_map.reference(j0,j1,j2,j3);
-         }
+  //------------------------------
+  // Rank 6
 
-         //------------------------------
-         // Rank 5
+  template <typename I0, typename I1, typename I2, typename I3, typename I4,
+            typename I5>
+  KOKKOS_FORCEINLINE_FUNCTION typename std::enable_if<
+      (Kokkos::Impl::are_integral<I0, I1, I2, I3, I4, I5>::value &&
+       (6 == Rank) && is_default_map),
+      reference_type>::type
+  operator()(const I0& i0, const I1& i1, const I2& i2, const I3& i3,
+             const I4& i4, const I5& i5) const {
+    KOKKOS_IMPL_OFFSETVIEW_OPERATOR_VERIFY(
+        (m_track, m_map, m_begins, i0, i1, i2, i3, i4, i5))
+    const size_t j0 = i0 - m_begins[0];
+    const size_t j1 = i1 - m_begins[1];
+    const size_t j2 = i2 - m_begins[2];
+    const size_t j3 = i3 - m_begins[3];
+    const size_t j4 = i4 - m_begins[4];
+    const size_t j5 = i5 - m_begins[5];
+    return m_map.m_impl_handle[m_map.m_impl_offset(j0, j1, j2, j3, j4, j5)];
+  }
 
-         template< typename I0 , typename I1 , typename I2 , typename I3
-         , typename I4>
-         KOKKOS_FORCEINLINE_FUNCTION
-         typename std::enable_if<
-         ( Kokkos::Impl::are_integral<I0,I1,I2,I3,I4>::value
-               && ( 5 == Rank )
-               && is_default_map
-         ), reference_type >::type
-         operator()( const I0 & i0 , const I1 & i1 , const I2 & i2 , const I3 & i3
-               , const I4 & i4 ) const
-         {
-            KOKKOS_IMPL_OFFSETVIEW_OPERATOR_VERIFY( (m_track,m_map, m_begins, i0,i1, i2, i3, i4) )
-                          const size_t j0 = i0 - m_begins[0];
-            const size_t j1 = i1 - m_begins[1];
-            const size_t j2 = i2 - m_begins[2];
-            const size_t j3 = i3 - m_begins[3];
-            const size_t j4 = i4 - m_begins[4];
-            return m_map.m_impl_handle[ m_map.m_impl_offset(j0, j1,j2, j3, j4) ];
-         }
+  template <typename I0, typename I1, typename I2, typename I3, typename I4,
+            typename I5>
+  KOKKOS_FORCEINLINE_FUNCTION typename std::enable_if<
+      (Kokkos::Impl::are_integral<I0, I1, I2, I3, I4, I5>::value &&
+       (6 == Rank) && !is_default_map),
+      reference_type>::type
+  operator()(const I0& i0, const I1& i1, const I2& i2, const I3& i3,
+             const I4& i4, const I5& i5) const {
+    KOKKOS_IMPL_OFFSETVIEW_OPERATOR_VERIFY(
+        (m_track, m_map, m_begins, i0, i1, i2, i3, i4, i5))
+    const size_t j0 = i0 - m_begins[0];
+    const size_t j1 = i1 - m_begins[1];
+    const size_t j2 = i2 - m_begins[2];
+    const size_t j3 = i3 - m_begins[3];
+    const size_t j4 = i4 - m_begins[4];
+    const size_t j5 = i5 - m_begins[5];
+    return m_map.reference(j0, j1, j2, j3, j4, j5);
+  }
 
-         template< typename I0 , typename I1 , typename I2 , typename I3
-         , typename I4>
-         KOKKOS_FORCEINLINE_FUNCTION
-         typename std::enable_if<
-         ( Kokkos::Impl::are_integral<I0,I1,I2,I3,I4>::value
-               && ( 5 == Rank )
-               && ! is_default_map
-         ), reference_type >::type
-         operator()( const I0 & i0 , const I1 & i1 , const I2 & i2 , const I3 & i3
-               , const I4 & i4) const
-         {
-            KOKKOS_IMPL_OFFSETVIEW_OPERATOR_VERIFY( (m_track,m_map, m_begins, i0,i1, i2, i3, i4) )
-                          const size_t j0 = i0 - m_begins[0];
-            const size_t j1 = i1 - m_begins[1];
-            const size_t j2 = i2 - m_begins[2];
-            const size_t j3 = i3 - m_begins[3];
-            const size_t j4 = i4 - m_begins[4];
-            return m_map.reference(j0,j1,j2,j3,j4);
-         }
+  //------------------------------
+  // Rank 7
 
-         //------------------------------
-         // Rank 6
+  template <typename I0, typename I1, typename I2, typename I3, typename I4,
+            typename I5, typename I6>
+  KOKKOS_FORCEINLINE_FUNCTION typename std::enable_if<
+      (Kokkos::Impl::are_integral<I0, I1, I2, I3, I4, I5, I6>::value &&
+       (7 == Rank) && is_default_map),
+      reference_type>::type
+  operator()(const I0& i0, const I1& i1, const I2& i2, const I3& i3,
+             const I4& i4, const I5& i5, const I6& i6) const {
+    KOKKOS_IMPL_OFFSETVIEW_OPERATOR_VERIFY(
+        (m_track, m_map, m_begins, i0, i1, i2, i3, i4, i5, i6))
+    const size_t j0 = i0 - m_begins[0];
+    const size_t j1 = i1 - m_begins[1];
+    const size_t j2 = i2 - m_begins[2];
+    const size_t j3 = i3 - m_begins[3];
+    const size_t j4 = i4 - m_begins[4];
+    const size_t j5 = i5 - m_begins[5];
+    const size_t j6 = i6 - m_begins[6];
+    return m_map.m_impl_handle[m_map.m_impl_offset(j0, j1, j2, j3, j4, j5, j6)];
+  }
 
-         template< typename I0 , typename I1 , typename I2 , typename I3
-         , typename I4 , typename I5 >
-         KOKKOS_FORCEINLINE_FUNCTION
-         typename std::enable_if<
-         ( Kokkos::Impl::are_integral<I0,I1,I2,I3,I4,I5>::value
-               && ( 6 == Rank )
-               && is_default_map
-         ), reference_type >::type
-         operator()( const I0 & i0 , const I1 & i1 , const I2 & i2 , const I3 & i3
-               , const I4 & i4 , const I5 & i5 ) const
-         {
-            KOKKOS_IMPL_OFFSETVIEW_OPERATOR_VERIFY( (m_track,m_map,m_begins, i0,i1, i2, i3, i4, i5) )
-                          const size_t j0 = i0 - m_begins[0];
-            const size_t j1 = i1 - m_begins[1];
-            const size_t j2 = i2 - m_begins[2];
-            const size_t j3 = i3 - m_begins[3];
-            const size_t j4 = i4 - m_begins[4];
-            const size_t j5 = i5 - m_begins[5];
-            return m_map.m_impl_handle[ m_map.m_impl_offset(j0,j1,j2,j3,j4,j5) ];
-         }
+  template <typename I0, typename I1, typename I2, typename I3, typename I4,
+            typename I5, typename I6>
+  KOKKOS_FORCEINLINE_FUNCTION typename std::enable_if<
+      (Kokkos::Impl::are_integral<I0, I1, I2, I3, I4, I5, I6>::value &&
+       (7 == Rank) && !is_default_map),
+      reference_type>::type
+  operator()(const I0& i0, const I1& i1, const I2& i2, const I3& i3,
+             const I4& i4, const I5& i5, const I6& i6) const {
+    KOKKOS_IMPL_OFFSETVIEW_OPERATOR_VERIFY(
+        (m_track, m_map, m_begins, i0, i1, i2, i3, i4, i5, i6))
+    const size_t j0 = i0 - m_begins[0];
+    const size_t j1 = i1 - m_begins[1];
+    const size_t j2 = i2 - m_begins[2];
+    const size_t j3 = i3 - m_begins[3];
+    const size_t j4 = i4 - m_begins[4];
+    const size_t j5 = i5 - m_begins[5];
+    const size_t j6 = i6 - m_begins[6];
+    return m_map.reference(j0, j1, j2, j3, j4, j5, j6);
+  }
 
-         template< typename I0 , typename I1 , typename I2 , typename I3
-         , typename I4 , typename I5>
-         KOKKOS_FORCEINLINE_FUNCTION
-         typename std::enable_if<
-         ( Kokkos::Impl::are_integral<I0,I1,I2,I3,I4,I5>::value
-               && ( 6 == Rank )
-               && ! is_default_map
-         ), reference_type >::type
-         operator()( const I0 & i0 , const I1 & i1 , const I2 & i2 , const I3 & i3
-               , const I4 & i4 , const I5 & i5) const
-         {
-            KOKKOS_IMPL_OFFSETVIEW_OPERATOR_VERIFY( (m_track,m_map,m_begins, i0,i1, i2, i3, i4, i5) )
-                          const size_t j0 = i0 - m_begins[0];
-            const size_t j1 = i1 - m_begins[1];
-            const size_t j2 = i2 - m_begins[2];
-            const size_t j3 = i3 - m_begins[3];
-            const size_t j4 = i4 - m_begins[4];
-            const size_t j5 = i5 - m_begins[5];
-            return m_map.reference(j0,j1,j2,j3,j4,j5);
-         }
+  //------------------------------
+  // Rank 8
 
-         //------------------------------
-         // Rank 7
-
-         template< typename I0 , typename I1 , typename I2 , typename I3
-         , typename I4 , typename I5 , typename I6>
-         KOKKOS_FORCEINLINE_FUNCTION
-         typename std::enable_if<
-         ( Kokkos::Impl::are_integral<I0,I1,I2,I3,I4,I5,I6>::value
-               && ( 7 == Rank )
-               && is_default_map
-         ), reference_type >::type
-         operator()( const I0 & i0 , const I1 & i1 , const I2 & i2 , const I3 & i3
-               , const I4 & i4 , const I5 & i5 , const I6 & i6) const
-         {
-            KOKKOS_IMPL_OFFSETVIEW_OPERATOR_VERIFY( (m_track,m_map,m_begins, i0,i1, i2, i3, i4, i5, i6) )
-                          const size_t j0 = i0 - m_begins[0];
-            const size_t j1 = i1 - m_begins[1];
-            const size_t j2 = i2 - m_begins[2];
-            const size_t j3 = i3 - m_begins[3];
-            const size_t j4 = i4 - m_begins[4];
-            const size_t j5 = i5 - m_begins[5];
-            const size_t j6 = i6 - m_begins[6];
-            return m_map.m_impl_handle[ m_map.m_impl_offset(j0,j1,j2,j3,j4,j5,j6) ];
-         }
-
-         template< typename I0 , typename I1 , typename I2 , typename I3
-         , typename I4 , typename I5 , typename I6 >
-         KOKKOS_FORCEINLINE_FUNCTION
-         typename std::enable_if<
-         ( Kokkos::Impl::are_integral<I0,I1,I2,I3,I4,I5,I6>::value
-               && ( 7 == Rank )
-               && ! is_default_map
-         ), reference_type >::type
-         operator()( const I0 & i0 , const I1 & i1 , const I2 & i2 , const I3 & i3
-               , const I4 & i4 , const I5 & i5 , const I6 & i6) const
-         {
-            KOKKOS_IMPL_OFFSETVIEW_OPERATOR_VERIFY( (m_track,m_map,m_begins, i0,i1, i2, i3, i4, i5, i6) )
-                          const size_t j0 = i0 - m_begins[0];
-            const size_t j1 = i1 - m_begins[1];
-            const size_t j2 = i2 - m_begins[2];
-            const size_t j3 = i3 - m_begins[3];
-            const size_t j4 = i4 - m_begins[4];
-            const size_t j5 = i5 - m_begins[5];
-            const size_t j6 = i6 - m_begins[6];
-            return m_map.reference(j0,j1,j2,j3,j4,j5,j6);
-         }
-
-         //------------------------------
-         // Rank 8
-
-         template< typename I0 , typename I1 , typename I2 , typename I3
-         , typename I4 , typename I5 , typename I6 , typename I7 >
-         KOKKOS_FORCEINLINE_FUNCTION
-         typename std::enable_if<
-         ( Kokkos::Impl::are_integral<I0,I1,I2,I3,I4,I5,I6,I7>::value
-               && ( 8 == Rank )
-               && is_default_map
-         ), reference_type >::type
-         operator()( const I0 & i0 , const I1 & i1 , const I2 & i2 , const I3 & i3
-               , const I4 & i4 , const I5 & i5 , const I6 & i6 , const I7 & i7) const
-         {
-            KOKKOS_IMPL_OFFSETVIEW_OPERATOR_VERIFY( (m_track,m_map,m_begins, i0,i1, i2, i3, i4, i5, i6, i7) )
-                          const size_t j0 = i0 - m_begins[0];
-            const size_t j1 = i1 - m_begins[1];
-            const size_t j2 = i2 - m_begins[2];
-            const size_t j3 = i3 - m_begins[3];
-            const size_t j4 = i4 - m_begins[4];
-            const size_t j5 = i5 - m_begins[5];
-            const size_t j6 = i6 - m_begins[6];
-            const size_t j7 = i7 - m_begins[7];
-            return m_map.m_impl_handle[ m_map.m_impl_offset(j0,j1,j2,j3,j4,j5,j6,j7) ];
-         }
-
-         template< typename I0 , typename I1 , typename I2 , typename I3
-         , typename I4 , typename I5 , typename I6 , typename I7>
-         KOKKOS_FORCEINLINE_FUNCTION
-         typename std::enable_if<
-         ( Kokkos::Impl::are_integral<I0,I1,I2,I3,I4,I5,I6,I7>::value
-               && ( 8 == Rank )
-               && ! is_default_map
-         ), reference_type >::type
-         operator()( const I0 & i0 , const I1 & i1 , const I2 & i2 , const I3 & i3
-               , const I4 & i4 , const I5 & i5 , const I6 & i6 , const I7 & i7 ) const
-         {
-            KOKKOS_IMPL_OFFSETVIEW_OPERATOR_VERIFY( (m_track,m_map,m_begins, i0,i1, i2, i3, i4, i5, i6, i7) )
-                          const size_t j0 = i0 - m_begins[0];
-            const size_t j1 = i1 - m_begins[1];
-            const size_t j2 = i2 - m_begins[2];
-            const size_t j3 = i3 - m_begins[3];
-            const size_t j4 = i4 - m_begins[4];
-            const size_t j5 = i5 - m_begins[5];
-            const size_t j6 = i6 - m_begins[6];
-            const size_t j7 = i7 - m_begins[7];
-            return m_map.reference(j0,j1,j2,j3,j4,j5,j6,j7);
-         }
+  template <typename I0, typename I1, typename I2, typename I3, typename I4,
+            typename I5, typename I6, typename I7>
+  KOKKOS_FORCEINLINE_FUNCTION typename std::enable_if<
+      (Kokkos::Impl::are_integral<I0, I1, I2, I3, I4, I5, I6, I7>::value &&
+       (8 == Rank) && is_default_map),
+      reference_type>::type
+  operator()(const I0& i0, const I1& i1, const I2& i2, const I3& i3,
+             const I4& i4, const I5& i5, const I6& i6, const I7& i7) const {
+    KOKKOS_IMPL_OFFSETVIEW_OPERATOR_VERIFY(
+        (m_track, m_map, m_begins, i0, i1, i2, i3, i4, i5, i6, i7))
+    const size_t j0 = i0 - m_begins[0];
+    const size_t j1 = i1 - m_begins[1];
+    const size_t j2 = i2 - m_begins[2];
+    const size_t j3 = i3 - m_begins[3];
+    const size_t j4 = i4 - m_begins[4];
+    const size_t j5 = i5 - m_begins[5];
+    const size_t j6 = i6 - m_begins[6];
+    const size_t j7 = i7 - m_begins[7];
+    return m_map
+        .m_impl_handle[m_map.m_impl_offset(j0, j1, j2, j3, j4, j5, j6, j7)];
+  }
 
+  template <typename I0, typename I1, typename I2, typename I3, typename I4,
+            typename I5, typename I6, typename I7>
+  KOKKOS_FORCEINLINE_FUNCTION typename std::enable_if<
+      (Kokkos::Impl::are_integral<I0, I1, I2, I3, I4, I5, I6, I7>::value &&
+       (8 == Rank) && !is_default_map),
+      reference_type>::type
+  operator()(const I0& i0, const I1& i1, const I2& i2, const I3& i3,
+             const I4& i4, const I5& i5, const I6& i6, const I7& i7) const {
+    KOKKOS_IMPL_OFFSETVIEW_OPERATOR_VERIFY(
+        (m_track, m_map, m_begins, i0, i1, i2, i3, i4, i5, i6, i7))
+    const size_t j0 = i0 - m_begins[0];
+    const size_t j1 = i1 - m_begins[1];
+    const size_t j2 = i2 - m_begins[2];
+    const size_t j3 = i3 - m_begins[3];
+    const size_t j4 = i4 - m_begins[4];
+    const size_t j5 = i5 - m_begins[5];
+    const size_t j6 = i6 - m_begins[6];
+    const size_t j7 = i7 - m_begins[7];
+    return m_map.reference(j0, j1, j2, j3, j4, j5, j6, j7);
+  }
 
 #undef KOKKOS_IMPL_OFFSETVIEW_OPERATOR_VERIFY
 
-         //----------------------------------------
-         // Standard destructor, constructors, and assignment operators
+  //----------------------------------------
+  // Standard destructor, constructors, and assignment operators
 
-         KOKKOS_INLINE_FUNCTION
-         ~OffsetView() {}
+  KOKKOS_INLINE_FUNCTION
+  ~OffsetView() {}
 
-         KOKKOS_INLINE_FUNCTION
-         OffsetView() : m_track(), m_map() {
+  KOKKOS_INLINE_FUNCTION
+  OffsetView() : m_track(), m_map() {
+    for (size_t i = 0; i < Rank; ++i) m_begins[i] = KOKKOS_INVALID_OFFSET;
+  }
 
-            for(size_t i = 0; i < Rank; ++i) m_begins[i] = KOKKOS_INVALID_INDEX;
-         }
+  KOKKOS_INLINE_FUNCTION
+  OffsetView(const OffsetView& rhs)
+      : m_track(rhs.m_track, traits::is_managed),
+        m_map(rhs.m_map),
+        m_begins(rhs.m_begins) {}
 
-         KOKKOS_INLINE_FUNCTION
-         OffsetView( const OffsetView & rhs ) : m_track( rhs.m_track, traits::is_managed ), m_map( rhs.m_map ),
-         m_begins(rhs.m_begins) {}
+  KOKKOS_INLINE_FUNCTION
+  OffsetView(OffsetView&& rhs)
+      : m_track(std::move(rhs.m_track)),
+        m_map(std::move(rhs.m_map)),
+        m_begins(std::move(rhs.m_begins)) {}
 
-         KOKKOS_INLINE_FUNCTION
-         OffsetView( OffsetView && rhs ) : m_track( std::move(rhs.m_track) ),
-         m_map( std::move(rhs.m_map)), m_begins(std::move(rhs.m_begins)) {}
+  KOKKOS_INLINE_FUNCTION
+  OffsetView& operator=(const OffsetView& rhs) {
+    m_track  = rhs.m_track;
+    m_map    = rhs.m_map;
+    m_begins = rhs.m_begins;
+    return *this;
+  }
 
-         KOKKOS_INLINE_FUNCTION
-         OffsetView & operator = ( const OffsetView & rhs ) {
-            m_track = rhs.m_track ;
-            m_map = rhs.m_map ;
-            m_begins = rhs.m_begins;
-            return *this ;
-         }
+  KOKKOS_INLINE_FUNCTION
+  OffsetView& operator=(OffsetView&& rhs) {
+    m_track  = std::move(rhs.m_track);
+    m_map    = std::move(rhs.m_map);
+    m_begins = std::move(rhs.m_begins);
+    return *this;
+  }
 
-         KOKKOS_INLINE_FUNCTION
-         OffsetView & operator = ( OffsetView && rhs ) {
-            m_track = std::move(rhs.m_track) ;
-            m_map = std::move(rhs.m_map) ;
-            m_begins = std::move(rhs.m_begins) ;
-            return *this ;
-         }
+  // interoperability with View
+ private:
+  typedef View<typename traits::scalar_array_type,
+               typename traits::array_layout, typename traits::device_type,
+               typename traits::memory_traits>
+      view_type;
 
-         //interoperability with View
-      private:
-         typedef View< typename traits::scalar_array_type ,
-               typename traits::array_layout ,
-               typename traits::device_type ,
-               typename traits::memory_traits > view_type;
-      public:
+ public:
+  KOKKOS_INLINE_FUNCTION
+  view_type view() const {
+    view_type v(m_track, m_map);
+    return v;
+  }
 
-         KOKKOS_INLINE_FUNCTION
-         view_type view() const {
+  template <class RT, class... RP>
+  KOKKOS_INLINE_FUNCTION OffsetView(const View<RT, RP...>& aview)
+      : m_track(aview.impl_track()), m_map() {
+    typedef typename OffsetView<RT, RP...>::traits SrcTraits;
+    typedef Kokkos::Impl::ViewMapping<traits, SrcTraits, void> Mapping;
+    static_assert(Mapping::is_assignable,
+                  "Incompatible OffsetView copy construction");
+    Mapping::assign(m_map, aview.impl_map(), m_track);
 
-            view_type v(m_track, m_map);
-            return v ;
-         }
+    for (int i = 0; i < aview.Rank; ++i) {
+      m_begins[i] = 0;
+    }
+  }
 
-         template<class RT, class ... RP>
-         KOKKOS_INLINE_FUNCTION
-         OffsetView( const View<RT, RP...> & aview) :
-         m_track(aview.impl_track()), m_map(){
-
-            typedef typename OffsetView<RT,RP...>::traits  SrcTraits ;
-            typedef Kokkos::Impl::ViewMapping< traits , SrcTraits , void >  Mapping ;
-            static_assert( Mapping::is_assignable , "Incompatible OffsetView copy construction" );
-            Mapping::assign( m_map , aview.impl_map() , m_track );
-
-            for (int i = 0; i < aview.Rank; ++i) {
-               m_begins[i] = 0;
-            }
-         }
-
-         template<class RT, class ... RP>
-         KOKKOS_INLINE_FUNCTION
-         OffsetView( const View<RT, RP...> & aview
-               ,const index_list_type & minIndices) :
-               m_track(aview.impl_track()), m_map(){
-
-            typedef typename OffsetView<RT,RP...>::traits  SrcTraits ;
-            typedef Kokkos::Impl::ViewMapping< traits , SrcTraits , void >  Mapping ;
-            static_assert( Mapping::is_assignable , "Incompatible OffsetView copy construction" );
-            Mapping::assign( m_map , aview.impl_map() , m_track );
+  template <class RT, class... RP>
+  KOKKOS_INLINE_FUNCTION OffsetView(const View<RT, RP...>& aview,
+                                    const index_list_type& minIndices)
+      : m_track(aview.impl_track()), m_map() {
+    typedef typename OffsetView<RT, RP...>::traits SrcTraits;
+    typedef Kokkos::Impl::ViewMapping<traits, SrcTraits, void> Mapping;
+    static_assert(Mapping::is_assignable,
+                  "Incompatible OffsetView copy construction");
+    Mapping::assign(m_map, aview.impl_map(), m_track);
 
 #ifdef KOKKOS_ACTIVE_EXECUTION_MEMORY_SPACE_HOST
-            Kokkos::Experimental::Impl::runtime_check_rank_host(traits::rank_dynamic, Rank, minIndices, label());
+    Kokkos::Experimental::Impl::runtime_check_rank_host(
+        traits::rank_dynamic, Rank, minIndices, label());
 #else
-            Kokkos::Experimental::Impl::runtime_check_rank_device(traits::rank_dynamic, Rank, minIndices);
+    Kokkos::Experimental::Impl::runtime_check_rank_device(traits::rank_dynamic,
+                                                          Rank, minIndices);
 
 #endif
 
-            for (size_t i = 0; i < minIndices.size(); ++i) {
-               m_begins[i] = minIndices.begin()[i];
-            }
-         }
-         template<class RT, class ... RP>
-         KOKKOS_INLINE_FUNCTION
-         OffsetView( const View<RT, RP...> & aview
-               ,const begins_type & beg) :
-               m_track(aview.impl_track()), m_map(), m_begins(beg){
+    for (size_t i = 0; i < minIndices.size(); ++i) {
+      m_begins[i] = minIndices.begin()[i];
+    }
+  }
+  template <class RT, class... RP>
+  KOKKOS_INLINE_FUNCTION OffsetView(const View<RT, RP...>& aview,
+                                    const begins_type& beg)
+      : m_track(aview.impl_track()), m_map(), m_begins(beg) {
+    typedef typename OffsetView<RT, RP...>::traits SrcTraits;
+    typedef Kokkos::Impl::ViewMapping<traits, SrcTraits, void> Mapping;
+    static_assert(Mapping::is_assignable,
+                  "Incompatible OffsetView copy construction");
+    Mapping::assign(m_map, aview.impl_map(), m_track);
 
-            typedef typename OffsetView<RT,RP...>::traits  SrcTraits ;
-            typedef Kokkos::Impl::ViewMapping< traits , SrcTraits , void >  Mapping ;
-            static_assert( Mapping::is_assignable , "Incompatible OffsetView copy construction" );
-            Mapping::assign( m_map , aview.impl_map() , m_track );
+    //#ifdef KOKKOS_ACTIVE_EXECUTION_MEMORY_SPACE_HOST
+    //        Kokkos::Experimental::Impl::runtime_check_rank_host(traits::rank_dynamic,
+    //        Rank, minIndices, label());
+    //#else
+    //        Kokkos::Experimental::Impl::runtime_check_rank_device(traits::rank_dynamic,
+    //        Rank, minIndices);
+    //
+    //#endif
+  }
 
+  // may assign unmanaged from managed.
 
-            //#ifdef KOKKOS_ACTIVE_EXECUTION_MEMORY_SPACE_HOST
-            //        Kokkos::Experimental::Impl::runtime_check_rank_host(traits::rank_dynamic, Rank, minIndices, label());
-            //#else
-            //        Kokkos::Experimental::Impl::runtime_check_rank_device(traits::rank_dynamic, Rank, minIndices);
-            //
-            //#endif
+  template <class RT, class... RP>
+  KOKKOS_INLINE_FUNCTION OffsetView(const OffsetView<RT, RP...>& rhs)
+      : m_track(rhs.m_track, traits::is_managed),
+        m_map(),
+        m_begins(rhs.m_begins) {
+    typedef typename OffsetView<RT, RP...>::traits SrcTraits;
+    typedef Kokkos::Impl::ViewMapping<traits, SrcTraits, void> Mapping;
+    static_assert(Mapping::is_assignable,
+                  "Incompatible OffsetView copy construction");
+    Mapping::assign(m_map, rhs.m_map, rhs.m_track);  // swb what about assign?
+  }
 
-         }
+ private:
+  enum class subtraction_failure {
+    none,
+    negative,
+    overflow,
+  };
 
-         // may assign unmanaged from managed.
+  // Subtraction should return a non-negative number and not overflow
+  KOKKOS_INLINE_FUNCTION static subtraction_failure check_subtraction(
+      int64_t lhs, int64_t rhs) {
+    if (lhs < rhs) return subtraction_failure::negative;
 
+    if (static_cast<uint64_t>(-1) / static_cast<uint64_t>(2) <
+        static_cast<uint64_t>(lhs) - static_cast<uint64_t>(rhs))
+      return subtraction_failure::overflow;
 
-         template< class RT , class ... RP >
-         KOKKOS_INLINE_FUNCTION
-         OffsetView( const OffsetView<RT,RP...> & rhs )
-         : m_track( rhs.m_track , traits::is_managed )
-         , m_map()
-         , m_begins(rhs.m_begins)
-         {
-            typedef typename OffsetView<RT,RP...>::traits  SrcTraits ;
-            typedef Kokkos::Impl::ViewMapping< traits , SrcTraits , void >  Mapping ;
-            static_assert( Mapping::is_assignable , "Incompatible OffsetView copy construction" );
-            Mapping::assign( m_map , rhs.m_map , rhs.m_track );  //swb what about assign?
-         }
+    return subtraction_failure::none;
+  }
 
+  // Need a way to get at an element from both begins_type (aka Kokkos::Array
+  // which doesn't have iterators) and index_list_type (aka
+  // std::initializer_list which doesn't have .data() or operator[]).
+  // Returns by value
+  KOKKOS_INLINE_FUNCTION
+  static int64_t at(const begins_type& a, size_t pos) { return a[pos]; }
 
-         //----------------------------------------
-         // Allocation tracking properties
-         KOKKOS_INLINE_FUNCTION
-         int use_count() const
-         { return m_track.use_count(); }
+  KOKKOS_INLINE_FUNCTION
+  static int64_t at(index_list_type a, size_t pos) {
+    return *(a.begin() + pos);
+  }
 
-         inline
-         const std::string label() const
-         { return m_track.template get_label< typename traits::memory_space >(); }
+#ifdef KOKKOS_ACTIVE_EXECUTION_MEMORY_SPACE_HOST
+  // Check that begins < ends for all elements
+  // B, E can be begins_type and/or index_list_type
+  template <typename B, typename E>
+  KOKKOS_INLINE_FUNCTION static subtraction_failure
+  runtime_check_begins_ends_host(const B& begins, const E& ends) {
+    std::string message;
+    if (begins.size() != Rank)
+      message +=
+          "begins.size() "
+          "(" +
+          std::to_string(begins.size()) +
+          ")"
+          " != Rank "
+          "(" +
+          std::to_string(Rank) +
+          ")"
+          "\n";
 
+    if (ends.size() != Rank)
+      message +=
+          "ends.size() "
+          "(" +
+          std::to_string(begins.size()) +
+          ")"
+          " != Rank "
+          "(" +
+          std::to_string(Rank) +
+          ")"
+          "\n";
 
-         template< typename Label>
-         explicit inline
-         OffsetView( const Label & arg_label
-               ,typename std::enable_if<Kokkos::Impl::is_view_label<Label>::value , const index_list_type >::type
-               range0
-               ,const index_list_type range1 = KOKKOS_INVALID_INDEX_RANGE
-               ,const index_list_type range2 = KOKKOS_INVALID_INDEX_RANGE
-               ,const index_list_type range3 = KOKKOS_INVALID_INDEX_RANGE
-               ,const index_list_type range4 = KOKKOS_INVALID_INDEX_RANGE
-               ,const index_list_type range5 = KOKKOS_INVALID_INDEX_RANGE
-               ,const index_list_type range6 = KOKKOS_INVALID_INDEX_RANGE
-               ,const index_list_type range7 = KOKKOS_INVALID_INDEX_RANGE
+    // If there are no errors so far, then rank == Rank
+    // Otherwise, check as much as possible
+    size_t rank = begins.size() < ends.size() ? begins.size() : ends.size();
+    for (size_t i = 0; i != rank; ++i) {
+      subtraction_failure sf = check_subtraction(at(ends, i), at(begins, i));
+      if (sf != subtraction_failure::none) {
+        message +=
+            "("
+            "ends[" +
+            std::to_string(i) +
+            "]"
+            " "
+            "(" +
+            std::to_string(at(ends, i)) +
+            ")"
+            " - "
+            "begins[" +
+            std::to_string(i) +
+            "]"
+            " "
+            "(" +
+            std::to_string(at(begins, i)) +
+            ")"
+            ")";
+        switch (sf) {
+          case subtraction_failure::negative:
+            message += " must be non-negative\n";
+            break;
+          case subtraction_failure::overflow: message += " overflows\n"; break;
+          default: break;
+        }
+      }
+    }
 
-         ) : OffsetView( Kokkos::Impl::ViewCtorProp< std::string >( arg_label ),
-               typename traits::array_layout
-               ( range0.begin()[1] - range0.begin()[0] + 1, range1.begin()[1] - range1.begin()[0] + 1 ,
-                     range2.begin()[1] - range2.begin()[0] + 1, range3.begin()[1] - range3.begin()[0] + 1,
-                     range4.begin()[1] - range4.begin()[0] + 1, range5.begin()[1] - range5.begin()[0] + 1 ,
-                     range6.begin()[1] - range6.begin()[0] + 1, range7.begin()[1] - range7.begin()[0] + 1 ),
-                     {range0.begin()[0], range1.begin()[0], range2.begin()[0], range3.begin()[0], range4.begin()[0],
-                           range5.begin()[0], range6.begin()[0], range7.begin()[0] })
-         {
+    if (!message.empty()) {
+      message =
+          "Kokkos::Experimental::OffsetView ERROR: for unmanaged OffsetView\n" +
+          message;
+      Kokkos::Impl::throw_runtime_exception(message);
+    }
 
-         }
+    return subtraction_failure::none;
+  }
+#endif  // KOKKOS_ACTIVE_EXECUTION_MEMORY_SPACE_HOST
 
+  // Check the begins < ends for all elements
+  template <typename B, typename E>
+  KOKKOS_INLINE_FUNCTION static subtraction_failure
+  runtime_check_begins_ends_device(const B& begins, const E& ends) {
+    if (begins.size() != Rank)
+      Kokkos::abort(
+          "Kokkos::Experimental::OffsetView ERROR: for unmanaged "
+          "OffsetView: begins has bad Rank");
+    if (ends.size() != Rank)
+      Kokkos::abort(
+          "Kokkos::Experimental::OffsetView ERROR: for unmanaged "
+          "OffsetView: ends has bad Rank");
 
+    for (size_t i = 0; i != begins.size(); ++i) {
+      switch (check_subtraction(at(ends, i), at(begins, i))) {
+        case subtraction_failure::negative:
+          Kokkos::abort(
+              "Kokkos::Experimental::OffsetView ERROR: for unmanaged "
+              "OffsetView: bad range");
+          break;
+        case subtraction_failure::overflow:
+          Kokkos::abort(
+              "Kokkos::Experimental::OffsetView ERROR: for unmanaged "
+              "OffsetView: range overflows");
+          break;
+        default: break;
+      }
+    }
 
-         template<class ... P >
-         explicit KOKKOS_INLINE_FUNCTION
-         OffsetView( const Kokkos::Impl::ViewCtorProp< P ... > & arg_prop
-               ,typename std::enable_if< Kokkos::Impl::ViewCtorProp< P... >::has_pointer , typename traits::array_layout >::type const & arg_layout
-               ,const index_list_type minIndices
-         )
-         : m_track() // No memory tracking
-         , m_map( arg_prop , arg_layout )
-         {
+    return subtraction_failure::none;
+  }
 
+  // Constructor around unmanaged data after checking begins < ends for all
+  // elements
+  // Each of B, E can be begins_type and/or index_list_type
+  // Precondition: begins.size() == ends.size() == m_begins.size() == Rank
+  template <typename B, typename E>
+  KOKKOS_INLINE_FUNCTION OffsetView(const pointer_type& p, const B& begins_,
+                                    const E& ends_,
+                                    subtraction_failure)
+      : m_track()  // no tracking
+        ,
+        m_map(Kokkos::Impl::ViewCtorProp<pointer_type>(p),
+              typename traits::array_layout(
+                  Rank > 0 ? at(ends_, 0) - at(begins_, 0) : 0,
+                  Rank > 1 ? at(ends_, 1) - at(begins_, 1) : 0,
+                  Rank > 2 ? at(ends_, 2) - at(begins_, 2) : 0,
+                  Rank > 3 ? at(ends_, 3) - at(begins_, 3) : 0,
+                  Rank > 4 ? at(ends_, 4) - at(begins_, 4) : 0,
+                  Rank > 5 ? at(ends_, 5) - at(begins_, 5) : 0,
+                  Rank > 6 ? at(ends_, 6) - at(begins_, 6) : 0,
+                  Rank > 7 ? at(ends_, 7) - at(begins_, 7) : 0)) {
+    for (size_t i = 0; i != m_begins.size(); ++i) {
+      m_begins[i] = at(begins_, i);
+    };
+  }
 
-            for (size_t i = 0; i < minIndices.size(); ++i) {
-               m_begins[i] = minIndices.begin()[i];
-            }
-            static_assert(
-                  std::is_same< pointer_type
-                  , typename Kokkos::Impl::ViewCtorProp< P... >::pointer_type
-                  >::value ,
-                  "When constructing OffsetView to wrap user memory, you must supply matching pointer type" );
-         }
+ public:
+  // Constructor around unmanaged data
+  // Four overloads, as both begins and ends can be either
+  // begins_type or index_list_type
+  KOKKOS_INLINE_FUNCTION
+  OffsetView(const pointer_type& p, const begins_type& begins_,
+             const begins_type& ends_)
+#ifdef KOKKOS_ACTIVE_EXECUTION_MEMORY_SPACE_HOST
+      : OffsetView(p, begins_, ends_,
+                   runtime_check_begins_ends_host(begins_, ends_))
+#else
+      : OffsetView(p, begins_, ends_,
+                   runtime_check_begins_ends_device(begins_, ends_))
+#endif
+  {
+  }
 
-         template<class ... P >
-         explicit inline
-         OffsetView( const Kokkos::Impl::ViewCtorProp< P ... > & arg_prop
-               , typename std::enable_if< ! Kokkos::Impl::ViewCtorProp< P... >::has_pointer , typename traits::array_layout>::type const & arg_layout
-               ,const index_list_type minIndices
-         )
-         : m_track()
-         , m_map()
+  KOKKOS_INLINE_FUNCTION
+  OffsetView(const pointer_type& p, const begins_type& begins_,
+             index_list_type ends_)
+#ifdef KOKKOS_ACTIVE_EXECUTION_MEMORY_SPACE_HOST
+      : OffsetView(p, begins_, ends_,
+                   runtime_check_begins_ends_host(begins_, ends_))
+#else
+      : OffsetView(p, begins_, ends_,
+                   runtime_check_begins_ends_device(begins_, ends_))
+#endif
+  {
+  }
 
-         {
+  KOKKOS_INLINE_FUNCTION
+  OffsetView(const pointer_type& p, index_list_type begins_,
+             const begins_type& ends_)
+#ifdef KOKKOS_ACTIVE_EXECUTION_MEMORY_SPACE_HOST
+      : OffsetView(p, begins_, ends_,
+                   runtime_check_begins_ends_host(begins_, ends_))
+#else
+      : OffsetView(p, begins_, ends_,
+                   runtime_check_begins_ends_device(begins_, ends_))
+#endif
+  {
+  }
 
-            for(size_t i = 0; i < Rank; ++i)
-               m_begins[i] = minIndices.begin()[i];
+  KOKKOS_INLINE_FUNCTION
+  OffsetView(const pointer_type& p, index_list_type begins_,
+             index_list_type ends_)
+#ifdef KOKKOS_ACTIVE_EXECUTION_MEMORY_SPACE_HOST
+      : OffsetView(p, begins_, ends_,
+                   runtime_check_begins_ends_host(begins_, ends_))
+#else
+      : OffsetView(p, begins_, ends_,
+                   runtime_check_begins_ends_device(begins_, ends_))
+#endif
+  {
+  }
 
-            // Append layout and spaces if not input
-            typedef Kokkos::Impl::ViewCtorProp< P ... > alloc_prop_input ;
+  //----------------------------------------
+  // Allocation tracking properties
+  KOKKOS_INLINE_FUNCTION
+  int use_count() const { return m_track.use_count(); }
 
-            // use 'std::integral_constant<unsigned,I>' for non-types
-            // to avoid duplicate class error.
-            typedef Kokkos::Impl::ViewCtorProp
-                  < P ..., typename std::conditional < alloc_prop_input::has_label
-                  , std::integral_constant<unsigned,0>, typename std::string >::type
-                  , typename std::conditional
-                  < alloc_prop_input::has_memory_space
-                  , std::integral_constant<unsigned,1>
-            , typename traits::device_type::memory_space
-            >::type
-            , typename std::conditional
-            < alloc_prop_input::has_execution_space
-            , std::integral_constant<unsigned,2>
-            , typename traits::device_type::execution_space
-            >::type
-            > alloc_prop ;
+  inline const std::string label() const {
+    return m_track.template get_label<typename traits::memory_space>();
+  }
 
-            static_assert( traits::is_managed
-                  , "OffsetView allocation constructor requires managed memory" );
+  template <typename Label>
+  explicit inline OffsetView(
+      const Label& arg_label,
+      typename std::enable_if<Kokkos::Impl::is_view_label<Label>::value,
+                              const index_list_type>::type range0,
+      const index_list_type range1 = KOKKOS_INVALID_INDEX_RANGE,
+      const index_list_type range2 = KOKKOS_INVALID_INDEX_RANGE,
+      const index_list_type range3 = KOKKOS_INVALID_INDEX_RANGE,
+      const index_list_type range4 = KOKKOS_INVALID_INDEX_RANGE,
+      const index_list_type range5 = KOKKOS_INVALID_INDEX_RANGE,
+      const index_list_type range6 = KOKKOS_INVALID_INDEX_RANGE,
+      const index_list_type range7 = KOKKOS_INVALID_INDEX_RANGE
 
-            if ( alloc_prop::initialize &&
+      )
+      : OffsetView(Kokkos::Impl::ViewCtorProp<std::string>(arg_label),
+                   typename traits::array_layout(
+                       range0.begin()[1] - range0.begin()[0] + 1,
+                       range1.begin()[1] - range1.begin()[0] + 1,
+                       range2.begin()[1] - range2.begin()[0] + 1,
+                       range3.begin()[1] - range3.begin()[0] + 1,
+                       range4.begin()[1] - range4.begin()[0] + 1,
+                       range5.begin()[1] - range5.begin()[0] + 1,
+                       range6.begin()[1] - range6.begin()[0] + 1,
+                       range7.begin()[1] - range7.begin()[0] + 1),
+                   {range0.begin()[0], range1.begin()[0], range2.begin()[0],
+                    range3.begin()[0], range4.begin()[0], range5.begin()[0],
+                    range6.begin()[0], range7.begin()[0]}) {}
+
+  template <class... P>
+  explicit KOKKOS_INLINE_FUNCTION OffsetView(
+      const Kokkos::Impl::ViewCtorProp<P...>& arg_prop,
+      typename std::enable_if<Kokkos::Impl::ViewCtorProp<P...>::has_pointer,
+                              typename traits::array_layout>::type const&
+          arg_layout,
+      const index_list_type minIndices)
+      : m_track()  // No memory tracking
+        ,
+        m_map(arg_prop, arg_layout) {
+    for (size_t i = 0; i < minIndices.size(); ++i) {
+      m_begins[i] = minIndices.begin()[i];
+    }
+    static_assert(
+        std::is_same<pointer_type, typename Kokkos::Impl::ViewCtorProp<
+                                       P...>::pointer_type>::value,
+        "When constructing OffsetView to wrap user memory, you must supply "
+        "matching pointer type");
+  }
+
+  template <class... P>
+  explicit inline OffsetView(
+      const Kokkos::Impl::ViewCtorProp<P...>& arg_prop,
+      typename std::enable_if<!Kokkos::Impl::ViewCtorProp<P...>::has_pointer,
+                              typename traits::array_layout>::type const&
+          arg_layout,
+      const index_list_type minIndices)
+      : m_track(),
+        m_map()
+
+  {
+    for (size_t i = 0; i < Rank; ++i) m_begins[i] = minIndices.begin()[i];
+
+    // Append layout and spaces if not input
+    typedef Kokkos::Impl::ViewCtorProp<P...> alloc_prop_input;
+
+    // use 'std::integral_constant<unsigned,I>' for non-types
+    // to avoid duplicate class error.
+    typedef Kokkos::Impl::ViewCtorProp<
+        P...,
+        typename std::conditional<alloc_prop_input::has_label,
+                                  std::integral_constant<unsigned, 0>,
+                                  typename std::string>::type,
+        typename std::conditional<
+            alloc_prop_input::has_memory_space,
+            std::integral_constant<unsigned, 1>,
+            typename traits::device_type::memory_space>::type,
+        typename std::conditional<
+            alloc_prop_input::has_execution_space,
+            std::integral_constant<unsigned, 2>,
+            typename traits::device_type::execution_space>::type>
+        alloc_prop;
+
+    static_assert(traits::is_managed,
+                  "OffsetView allocation constructor requires managed memory");
+
+    if (alloc_prop::initialize &&
 #ifdef KOKKOS_ENABLE_DEPRECATED_CODE
-                  ! alloc_prop::execution_space::is_initialized()
+        !alloc_prop::execution_space::is_initialized()
 #else
-            ! alloc_prop::execution_space::impl_is_initialized()
+        !alloc_prop::execution_space::impl_is_initialized()
 #endif
-            ) {
-               // If initializing view data then
-               // the execution space must be initialized.
-               Kokkos::Impl::throw_runtime_exception("Constructing OffsetView and initializing data with uninitialized execution space");
-            }
+    ) {
+      // If initializing view data then
+      // the execution space must be initialized.
+      Kokkos::Impl::throw_runtime_exception(
+          "Constructing OffsetView and initializing data with uninitialized "
+          "execution space");
+    }
 
-            // Copy the input allocation properties with possibly defaulted properties
-            alloc_prop prop_copy( arg_prop );
+    // Copy the input allocation properties with possibly defaulted properties
+    alloc_prop prop_copy(arg_prop);
 
-            //------------------------------------------------------------
-#if defined( KOKKOS_ENABLE_CUDA )
-            // If allocating in CudaUVMSpace must fence before and after
-            // the allocation to protect against possible concurrent access
-            // on the CPU and the GPU.
-            // Fence using the trait's executon space (which will be Kokkos::Cuda)
-            // to avoid incomplete type errors from usng Kokkos::Cuda directly.
-            if ( std::is_same< Kokkos::CudaUVMSpace , typename traits::device_type::memory_space >::value ) {
-               typename traits::device_type::memory_space::execution_space().fence();
-            }
+    //------------------------------------------------------------
+#if defined(KOKKOS_ENABLE_CUDA)
+    // If allocating in CudaUVMSpace must fence before and after
+    // the allocation to protect against possible concurrent access
+    // on the CPU and the GPU.
+    // Fence using the trait's executon space (which will be Kokkos::Cuda)
+    // to avoid incomplete type errors from usng Kokkos::Cuda directly.
+    if (std::is_same<Kokkos::CudaUVMSpace,
+                     typename traits::device_type::memory_space>::value) {
+      typename traits::device_type::memory_space::execution_space().fence();
+    }
 #endif
-            //------------------------------------------------------------
+    //------------------------------------------------------------
 
-            Kokkos::Impl::SharedAllocationRecord<> *
-            record = m_map.allocate_shared( prop_copy , arg_layout );
+    Kokkos::Impl::SharedAllocationRecord<>* record =
+        m_map.allocate_shared(prop_copy, arg_layout);
 
-            //------------------------------------------------------------
-#if defined( KOKKOS_ENABLE_CUDA )
-            if ( std::is_same< Kokkos::CudaUVMSpace , typename traits::device_type::memory_space >::value ) {
-               typename traits::device_type::memory_space::execution_space().fence();
-            }
+    //------------------------------------------------------------
+#if defined(KOKKOS_ENABLE_CUDA)
+    if (std::is_same<Kokkos::CudaUVMSpace,
+                     typename traits::device_type::memory_space>::value) {
+      typename traits::device_type::memory_space::execution_space().fence();
+    }
 #endif
-            //------------------------------------------------------------
+    //------------------------------------------------------------
 
-            // Setup and initialization complete, start tracking
-            m_track.assign_allocated_record_to_uninitialized( record );
+    // Setup and initialization complete, start tracking
+    m_track.assign_allocated_record_to_uninitialized(record);
 
 #ifdef KOKKOS_ACTIVE_EXECUTION_MEMORY_SPACE_HOST
-            Kokkos::Experimental::Impl::runtime_check_rank_host(traits::rank_dynamic, Rank, minIndices, label());
+    Kokkos::Experimental::Impl::runtime_check_rank_host(
+        traits::rank_dynamic, Rank, minIndices, label());
 #else
-            Kokkos::Experimental::Impl::runtime_check_rank_device(traits::rank_dynamic, Rank, minIndices);
+    Kokkos::Experimental::Impl::runtime_check_rank_device(traits::rank_dynamic,
+                                                          Rank, minIndices);
 
 #endif
-
-         }
-
-
-      };
-
-
-
-      /** \brief Temporary free function rank()
-       *         until rank() is implemented
-       *         in the View
-       */
-      template < typename D , class ... P >
-      KOKKOS_INLINE_FUNCTION
-      constexpr unsigned rank( const OffsetView<D , P...> & V ) { return V.Rank; } //Temporary until added to view
-
-      //----------------------------------------------------------------------------
-      //----------------------------------------------------------------------------
-      namespace Impl {
-
-         template< class T >
-         KOKKOS_INLINE_FUNCTION
-         typename  std::enable_if< std::is_integral<T>::value, T>::type
-         shift_input(const T arg, const int64_t offset)
-         {
-            return arg - offset;
-         }
-
-         KOKKOS_INLINE_FUNCTION
-         Kokkos::Impl::ALL_t
-         shift_input(const Kokkos::Impl::ALL_t arg, const int64_t offset)
-         {
-            return arg;
-         }
-
-         template< class T >
-         KOKKOS_INLINE_FUNCTION
-         typename  std::enable_if< std::is_integral<T>::value, Kokkos::pair<T,T> >::type
-         shift_input(const Kokkos::pair<T, T> arg, const int64_t offset)
-         {
-
-            return Kokkos::make_pair<T,T>(arg.first - offset, arg.second - offset);
-
-         }
-         template< class T >
-	 inline
-         typename  std::enable_if< std::is_integral<T>::value, std::pair<T,T> >::type
-         shift_input(const std::pair<T, T> arg, const int64_t offset)
-         {
-
-            return std::make_pair<T,T>(arg.first - offset, arg.second - offset);
-
-         }
-
-         template <size_t N, class Arg, class A>
-         KOKKOS_INLINE_FUNCTION
-         void
-         map_arg_to_new_begin(const size_t i,
-               Kokkos::Array<int64_t, N> &subviewBegins, typename std::enable_if< N != 0, const Arg>::type shiftedArg,
-               const Arg arg, const A viewBegins, size_t & counter) {
-
-            if( !std::is_integral<Arg>::value) {
-               subviewBegins[counter] = shiftedArg == arg ? viewBegins[i] : 0;
-               counter++;
-            }
-         }
-
-         template <size_t N, class Arg, class A>
-         KOKKOS_INLINE_FUNCTION
-         void
-         map_arg_to_new_begin(const size_t i,
-               Kokkos::Array<int64_t, N> &subviewBegins, typename std::enable_if< N == 0, const Arg>::type shiftedArg,
-               const Arg arg, const A viewBegins, size_t & counter) {
-
-         }
-
-
-         template< class D, class ... P , class T >
-         KOKKOS_INLINE_FUNCTION
-         typename Kokkos::Experimental::Impl::GetOffsetViewTypeFromViewType<typename Kokkos::Impl::ViewMapping
-         < void /* deduce subview type from source view traits */
-         , ViewTraits< D , P... >
-         , T
-         >::type >::type
-         subview_offset(const OffsetView< D, P... > & src, T arg) {
-
-            auto theView = src.view();
-            auto begins = src.begins();
-
-            T shiftedArg = shift_input(arg, begins[0]);
-
-            constexpr size_t rank = Kokkos::Impl::ViewMapping
-                  < void /* deduce subview type from source view traits */
-                  , ViewTraits< D , P... >
-            , T>::type::Rank;
-
-            auto theSubview = Kokkos::subview( theView , shiftedArg);
-
-            Kokkos::Array<int64_t, rank> subviewBegins;
-            size_t counter = 0;
-            Kokkos::Experimental::Impl::map_arg_to_new_begin(0, subviewBegins, shiftedArg, arg, begins, counter);
-
-            typename Kokkos::Experimental::Impl::GetOffsetViewTypeFromViewType<typename Kokkos::Impl::ViewMapping<
-            void /* deduce subview type from source view traits */
-            , ViewTraits< D , P... > , T >::type >::type offsetView(theSubview, subviewBegins);
-
-            return offsetView;
-
-         }
-
-         template< class D, class ... P , class T0, class T1 >
-         KOKKOS_INLINE_FUNCTION
-         typename Kokkos::Experimental::Impl::GetOffsetViewTypeFromViewType<typename Kokkos::Impl::ViewMapping
-         < void /* deduce subview type from source view traits */
-         , ViewTraits< D , P... >
-         , T0, T1
-         >::type >::type
-         subview_offset(const Kokkos::Experimental::OffsetView< D, P... > & src, T0 arg0, T1 arg1) {
-
-            auto theView = src.view();
-            auto begins = src.begins();
-
-            T0 shiftedArg0 = shift_input(arg0, begins[0]);
-            T1 shiftedArg1 = shift_input(arg1, begins[1]);
-
-            auto theSubview = Kokkos::subview(theView , shiftedArg0, shiftedArg1);
-            constexpr size_t rank = Kokkos::Impl::ViewMapping
-                  < void /* deduce subview type from source view traits */
-                  , ViewTraits< D , P... >
-            , T0, T1>::type::Rank;
-
-            Kokkos::Array<int64_t, rank> subviewBegins;
-            size_t counter = 0;
-            Kokkos::Experimental::Impl::map_arg_to_new_begin(0, subviewBegins, shiftedArg0, arg0, begins, counter);
-            Kokkos::Experimental::Impl::map_arg_to_new_begin(1, subviewBegins, shiftedArg1, arg1, begins, counter);
-
-            typename Kokkos::Experimental::Impl::GetOffsetViewTypeFromViewType<typename Kokkos::Impl::ViewMapping<
-            void /* deduce subview type from source view traits */
-            , ViewTraits< D , P... > , T0, T1 >::type >::type offsetView(theSubview, subviewBegins);
-
-            return offsetView;
-
-         }
-
-         template< class D, class ... P , class T0, class T1, class T2 >
-         KOKKOS_INLINE_FUNCTION
-         typename Kokkos::Experimental::Impl::GetOffsetViewTypeFromViewType<typename Kokkos::Impl::ViewMapping
-         < void /* deduce subview type from source view traits */
-         , ViewTraits< D , P... >
-         , T0, T1, T2
-         >::type >::type
-         subview_offset(const OffsetView< D, P... > & src, T0 arg0, T1 arg1, T2 arg2) {
-
-            auto theView = src.view();
-            auto begins = src.begins();
-
-            T0 shiftedArg0 = shift_input(arg0, begins[0]);
-            T1 shiftedArg1 = shift_input(arg1, begins[1]);
-            T2 shiftedArg2 = shift_input(arg2, begins[2]);
-
-            auto theSubview = Kokkos::subview( theView , shiftedArg0, shiftedArg1, shiftedArg2);
-
-            constexpr size_t rank = Kokkos::Impl::ViewMapping
-                  < void /* deduce subview type from source view traits */
-                  , ViewTraits< D , P... >
-            , T0, T1, T2>::type::Rank;
-
-            Kokkos::Array<int64_t, rank> subviewBegins;
-
-            size_t counter = 0;
-            Kokkos::Experimental::Impl::map_arg_to_new_begin(0, subviewBegins, shiftedArg0, arg0, begins, counter);
-            Kokkos::Experimental::Impl::map_arg_to_new_begin(1, subviewBegins, shiftedArg1, arg1, begins, counter);
-            Kokkos::Experimental::Impl::map_arg_to_new_begin(2, subviewBegins, shiftedArg2, arg2, begins, counter);
-
-            typename Kokkos::Experimental::Impl::GetOffsetViewTypeFromViewType<typename Kokkos::Impl::ViewMapping<
-            void /* deduce subview type from source view traits */
-            , ViewTraits< D , P... > , T0, T1, T2 >::type >::type offsetView(theSubview, subviewBegins);
-
-            return offsetView;
-         }
-
-         template< class D, class ... P , class T0, class T1, class T2, class T3 >
-         KOKKOS_INLINE_FUNCTION
-         typename Kokkos::Experimental::Impl::GetOffsetViewTypeFromViewType<typename Kokkos::Impl::ViewMapping
-         < void /* deduce subview type from source view traits */
-         , ViewTraits< D , P... >
-         , T0, T1, T2, T3
-         >::type >::type
-         subview_offset(const OffsetView< D, P... > & src, T0 arg0, T1 arg1, T2 arg2, T3 arg3) {
-
-            auto theView = src.view();
-            auto begins = src.begins();
-
-            T0 shiftedArg0 = shift_input(arg0, begins[0]);
-            T1 shiftedArg1 = shift_input(arg1, begins[1]);
-            T2 shiftedArg2 = shift_input(arg2, begins[2]);
-            T3 shiftedArg3 = shift_input(arg3, begins[3]);
-
-            auto theSubview = Kokkos::subview( theView , shiftedArg0, shiftedArg1, shiftedArg2, shiftedArg3);
-
-            constexpr size_t rank = Kokkos::Impl::ViewMapping
-                  < void /* deduce subview type from source view traits */
-                  , ViewTraits< D , P... >
-            , T0, T1, T2, T3>::type::Rank;
-            Kokkos::Array<int64_t, rank> subviewBegins;
-
-            size_t counter = 0;
-            Kokkos::Experimental::Impl::map_arg_to_new_begin(0, subviewBegins, shiftedArg0, arg0, begins, counter);
-            Kokkos::Experimental::Impl::map_arg_to_new_begin(1, subviewBegins, shiftedArg1, arg1, begins, counter);
-            Kokkos::Experimental::Impl::map_arg_to_new_begin(2, subviewBegins, shiftedArg2, arg2, begins, counter);
-            Kokkos::Experimental::Impl::map_arg_to_new_begin(3, subviewBegins, shiftedArg3, arg3, begins, counter);
-
-            typename Kokkos::Experimental::Impl::GetOffsetViewTypeFromViewType<typename Kokkos::Impl::ViewMapping<
-            void /* deduce subview type from source view traits */
-            , ViewTraits< D , P... > , T0, T1, T2, T3 >::type >::type offsetView(theSubview, subviewBegins);
-
-            return offsetView;
-         }
-
-         template< class D, class ... P , class T0, class T1, class T2, class T3, class T4 >
-         KOKKOS_INLINE_FUNCTION
-         typename Kokkos::Experimental::Impl::GetOffsetViewTypeFromViewType<typename Kokkos::Impl::ViewMapping
-         < void /* deduce subview type from source view traits */
-         , ViewTraits< D , P... >
-         , T0, T1, T2, T3, T4
-         >::type >::type
-         subview_offset(const OffsetView< D, P... > & src, T0 arg0, T1 arg1, T2 arg2, T3 arg3, T4 arg4) {
-
-            auto theView = src.view();
-            auto begins = src.begins();
-
-            T0 shiftedArg0 = shift_input(arg0, begins[0]);
-            T1 shiftedArg1 = shift_input(arg1, begins[1]);
-            T2 shiftedArg2 = shift_input(arg2, begins[2]);
-            T3 shiftedArg3 = shift_input(arg3, begins[3]);
-            T4 shiftedArg4 = shift_input(arg4, begins[4]);
-
-            auto theSubview = Kokkos::subview( theView , shiftedArg0, shiftedArg1, shiftedArg2, shiftedArg3, shiftedArg4);
-
-            constexpr size_t rank = Kokkos::Impl::ViewMapping
-                  < void /* deduce subview type from source view traits */
-                  , ViewTraits< D , P... >
-            , T0, T1, T2, T3, T4>::type::Rank;
-            Kokkos::Array<int64_t, rank> subviewBegins;
-
-            size_t counter = 0;
-            Kokkos::Experimental::Impl::map_arg_to_new_begin(0, subviewBegins, shiftedArg0, arg0, begins, counter);
-            Kokkos::Experimental::Impl::map_arg_to_new_begin(1, subviewBegins, shiftedArg1, arg1, begins, counter);
-            Kokkos::Experimental::Impl::map_arg_to_new_begin(2, subviewBegins, shiftedArg2, arg2, begins, counter);
-            Kokkos::Experimental::Impl::map_arg_to_new_begin(3, subviewBegins, shiftedArg3, arg3, begins, counter);
-            Kokkos::Experimental::Impl::map_arg_to_new_begin(4, subviewBegins, shiftedArg4, arg4, begins, counter);
-
-            typename Kokkos::Experimental::Impl::GetOffsetViewTypeFromViewType<typename Kokkos::Impl::ViewMapping<
-            void /* deduce subview type from source view traits */
-            , ViewTraits< D , P... > , T0, T1, T2, T3, T4 >::type >::type offsetView(theSubview, subviewBegins);
-
-            return offsetView;
-         }
-
-         template< class D, class ... P , class T0, class T1, class T2, class T3, class T4,
-         class T5 >
-         KOKKOS_INLINE_FUNCTION
-         typename Kokkos::Experimental::Impl::GetOffsetViewTypeFromViewType<typename Kokkos::Impl::ViewMapping
-         < void /* deduce subview type from source view traits */
-         , ViewTraits< D , P... >
-         , T0, T1, T2, T3, T4, T5
-         >::type >::type
-         subview_offset(const OffsetView< D, P... > & src, T0 arg0, T1 arg1, T2 arg2, T3 arg3, T4 arg4, T5 arg5) {
-
-            auto theView = src.view();
-            auto begins = src.begins();
-
-            T0 shiftedArg0 = shift_input(arg0, begins[0]);
-            T1 shiftedArg1 = shift_input(arg1, begins[1]);
-            T2 shiftedArg2 = shift_input(arg2, begins[2]);
-            T3 shiftedArg3 = shift_input(arg3, begins[3]);
-            T4 shiftedArg4 = shift_input(arg4, begins[4]);
-            T5 shiftedArg5 = shift_input(arg5, begins[5]);
-
-            auto theSubview = Kokkos::subview( theView , shiftedArg0, shiftedArg1, shiftedArg2, shiftedArg3, shiftedArg4, shiftedArg5);
-
-            constexpr size_t rank = Kokkos::Impl::ViewMapping
-                  < void /* deduce subview type from source view traits */
-                  , ViewTraits< D , P... >
-            , T0, T1, T2, T3, T4, T5>::type::Rank;
-
-            Kokkos::Array<int64_t, rank> subviewBegins;
-
-            size_t counter = 0;
-            Kokkos::Experimental::Impl::map_arg_to_new_begin(0, subviewBegins, shiftedArg0, arg0, begins, counter);
-            Kokkos::Experimental::Impl::map_arg_to_new_begin(1, subviewBegins, shiftedArg1, arg1, begins, counter);
-            Kokkos::Experimental::Impl::map_arg_to_new_begin(2, subviewBegins, shiftedArg2, arg2, begins, counter);
-            Kokkos::Experimental::Impl::map_arg_to_new_begin(3, subviewBegins, shiftedArg3, arg3, begins, counter);
-            Kokkos::Experimental::Impl::map_arg_to_new_begin(4, subviewBegins, shiftedArg4, arg4, begins, counter);
-            Kokkos::Experimental::Impl::map_arg_to_new_begin(5, subviewBegins, shiftedArg5, arg5, begins, counter);
-
-            typename Kokkos::Experimental::Impl::GetOffsetViewTypeFromViewType<typename Kokkos::Impl::ViewMapping<
-            void /* deduce subview type from source view traits */
-            , ViewTraits< D , P... > , T0, T1, T2, T3, T4, T5 >::type >::type offsetView(theSubview, subviewBegins);
-
-            return offsetView;
-         }
-         template< class D, class ... P , class T0, class T1, class T2, class T3, class T4,
-         class T5, class T6>
-         KOKKOS_INLINE_FUNCTION
-         typename Kokkos::Experimental::Impl::GetOffsetViewTypeFromViewType<typename Kokkos::Impl::ViewMapping
-         < void /* deduce subview type from source view traits */
-         , ViewTraits< D , P... >
-         , T0, T1, T2, T3, T4, T5, T6
-         >::type >::type
-         subview_offset(const OffsetView< D, P... > & src, T0 arg0, T1 arg1, T2 arg2, T3 arg3, T4 arg4, T5 arg5,
-               T6 arg6) {
-
-            auto theView = src.view();
-            auto begins = src.begins();
-
-            T0 shiftedArg0 = shift_input(arg0, begins[0]);
-            T1 shiftedArg1 = shift_input(arg1, begins[1]);
-            T2 shiftedArg2 = shift_input(arg2, begins[2]);
-            T3 shiftedArg3 = shift_input(arg3, begins[3]);
-            T4 shiftedArg4 = shift_input(arg4, begins[4]);
-            T5 shiftedArg5 = shift_input(arg5, begins[5]);
-            T6 shiftedArg6 = shift_input(arg6, begins[6]);
-
-            auto theSubview = Kokkos::subview( theView , shiftedArg0, shiftedArg1, shiftedArg2, shiftedArg3, shiftedArg4, shiftedArg5,
-                  shiftedArg6);
-
-            constexpr size_t rank = Kokkos::Impl::ViewMapping
-                  < void /* deduce subview type from source view traits */
-                  , ViewTraits< D , P... >
-            , T0, T1, T2, T3, T4, T5, T6>::type::Rank;
-
-            Kokkos::Array<int64_t, rank> subviewBegins;
-
-            size_t counter = 0;
-            Kokkos::Experimental::Impl::map_arg_to_new_begin(0, subviewBegins, shiftedArg0, arg0, begins, counter);
-            Kokkos::Experimental::Impl::map_arg_to_new_begin(1, subviewBegins, shiftedArg1, arg1, begins, counter);
-            Kokkos::Experimental::Impl::map_arg_to_new_begin(2, subviewBegins, shiftedArg2, arg2, begins, counter);
-            Kokkos::Experimental::Impl::map_arg_to_new_begin(3, subviewBegins, shiftedArg3, arg3, begins, counter);
-            Kokkos::Experimental::Impl::map_arg_to_new_begin(4, subviewBegins, shiftedArg4, arg4, begins, counter);
-            Kokkos::Experimental::Impl::map_arg_to_new_begin(5, subviewBegins, shiftedArg5, arg5, begins, counter);
-            Kokkos::Experimental::Impl::map_arg_to_new_begin(6, subviewBegins, shiftedArg6, arg6, begins, counter);
-
-            typename Kokkos::Experimental::Impl::GetOffsetViewTypeFromViewType<typename Kokkos::Impl::ViewMapping<
-            void /* deduce subview type from source view traits */
-            , ViewTraits< D , P... > , T0, T1, T2, T3, T4, T5,
-            T6 >::type >::type offsetView(theSubview, subviewBegins);
-
-            return offsetView;
-         }
-
-         template< class D, class ... P , class T0, class T1, class T2, class T3, class T4,
-         class T5, class T6, class T7>
-         KOKKOS_INLINE_FUNCTION
-         typename Kokkos::Experimental::Impl::GetOffsetViewTypeFromViewType<typename Kokkos::Impl::ViewMapping
-         < void /* deduce subview type from source view traits */
-         , ViewTraits< D , P... >
-         , T0, T1, T2, T3, T4, T5, T6, T7
-         >::type >::type
-         subview_offset(const OffsetView< D, P... > & src, T0 arg0, T1 arg1, T2 arg2, T3 arg3, T4 arg4, T5 arg5,
-               T6 arg6, T7 arg7) {
-
-            auto theView = src.view();
-            auto begins = src.begins();
-
-            T0 shiftedArg0 = shift_input(arg0, begins[0]);
-            T1 shiftedArg1 = shift_input(arg1, begins[1]);
-            T2 shiftedArg2 = shift_input(arg2, begins[2]);
-            T3 shiftedArg3 = shift_input(arg3, begins[3]);
-            T4 shiftedArg4 = shift_input(arg4, begins[4]);
-            T5 shiftedArg5 = shift_input(arg5, begins[5]);
-            T6 shiftedArg6 = shift_input(arg6, begins[6]);
-            T7 shiftedArg7 = shift_input(arg7, begins[7]);
-
-            auto theSubview = Kokkos::subview( theView , shiftedArg0, shiftedArg1, shiftedArg2, shiftedArg3, shiftedArg4, shiftedArg5,
-                  shiftedArg6, shiftedArg7);
-
-            constexpr size_t rank = Kokkos::Impl::ViewMapping
-                  < void /* deduce subview type from source view traits */
-                  , ViewTraits< D , P... >
-            , T0, T1, T2, T3, T4, T5, T6, T7>::type::Rank;
-
-            Kokkos::Array<int64_t, rank> subviewBegins;
-
-            size_t counter = 0;
-            Kokkos::Experimental::Impl::map_arg_to_new_begin(0, subviewBegins, shiftedArg0, arg0, begins, counter);
-            Kokkos::Experimental::Impl::map_arg_to_new_begin(1, subviewBegins, shiftedArg1, arg1, begins, counter);
-            Kokkos::Experimental::Impl::map_arg_to_new_begin(2, subviewBegins, shiftedArg2, arg2, begins, counter);
-            Kokkos::Experimental::Impl::map_arg_to_new_begin(3, subviewBegins, shiftedArg3, arg3, begins, counter);
-            Kokkos::Experimental::Impl::map_arg_to_new_begin(4, subviewBegins, shiftedArg4, arg4, begins, counter);
-            Kokkos::Experimental::Impl::map_arg_to_new_begin(5, subviewBegins, shiftedArg5, arg5, begins, counter);
-            Kokkos::Experimental::Impl::map_arg_to_new_begin(6, subviewBegins, shiftedArg6, arg6, begins, counter);
-            Kokkos::Experimental::Impl::map_arg_to_new_begin(7, subviewBegins, shiftedArg7, arg7, begins, counter);
-
-            typename Kokkos::Experimental::Impl::GetOffsetViewTypeFromViewType<typename Kokkos::Impl::ViewMapping<
-            void /* deduce subview type from source view traits */
-            , ViewTraits< D , P... > , T0, T1, T2, T3, T4, T5,
-            T6, T7 >::type >::type offsetView(theSubview, subviewBegins);
-
-            return offsetView;
-         }
-      }
-
-      template< class D, class ... P , class ... Args >
-      KOKKOS_INLINE_FUNCTION
-      typename Kokkos::Experimental::Impl::GetOffsetViewTypeFromViewType<typename Kokkos::Impl::ViewMapping
-      < void /* deduce subview type from source view traits */
-      , ViewTraits< D , P... >
-      , Args ...
-      >::type >::type
-      subview( const OffsetView< D, P... > & src , Args ... args )
-      {
-         static_assert( OffsetView< D , P... >::Rank == sizeof...(Args) ,
-               "subview requires one argument for each source OffsetView rank" );
-
-
-         return Kokkos::Experimental::Impl::subview_offset(src, args...);
-
-
-      }
-
-   }
+  }
+};
+
+/** \brief Temporary free function rank()
+ *         until rank() is implemented
+ *         in the View
+ */
+template <typename D, class... P>
+KOKKOS_INLINE_FUNCTION constexpr unsigned rank(const OffsetView<D, P...>& V) {
+  return V.Rank;
+}  // Temporary until added to view
+
+//----------------------------------------------------------------------------
+//----------------------------------------------------------------------------
+namespace Impl {
+
+template <class T>
+KOKKOS_INLINE_FUNCTION
+    typename std::enable_if<std::is_integral<T>::value, T>::type
+    shift_input(const T arg, const int64_t offset) {
+  return arg - offset;
 }
+
+KOKKOS_INLINE_FUNCTION
+Kokkos::Impl::ALL_t shift_input(const Kokkos::Impl::ALL_t arg,
+                                const int64_t offset) {
+  return arg;
+}
+
+template <class T>
+KOKKOS_INLINE_FUNCTION typename std::enable_if<std::is_integral<T>::value,
+                                               Kokkos::pair<T, T> >::type
+shift_input(const Kokkos::pair<T, T> arg, const int64_t offset) {
+  return Kokkos::make_pair<T, T>(arg.first - offset, arg.second - offset);
+}
+template <class T>
+inline
+    typename std::enable_if<std::is_integral<T>::value, std::pair<T, T> >::type
+    shift_input(const std::pair<T, T> arg, const int64_t offset) {
+  return std::make_pair<T, T>(arg.first - offset, arg.second - offset);
+}
+
+template <size_t N, class Arg, class A>
+KOKKOS_INLINE_FUNCTION void map_arg_to_new_begin(
+    const size_t i, Kokkos::Array<int64_t, N>& subviewBegins,
+    typename std::enable_if<N != 0, const Arg>::type shiftedArg, const Arg arg,
+    const A viewBegins, size_t& counter) {
+  if (!std::is_integral<Arg>::value) {
+    subviewBegins[counter] = shiftedArg == arg ? viewBegins[i] : 0;
+    counter++;
+  }
+}
+
+template <size_t N, class Arg, class A>
+KOKKOS_INLINE_FUNCTION void map_arg_to_new_begin(
+    const size_t i, Kokkos::Array<int64_t, N>& subviewBegins,
+    typename std::enable_if<N == 0, const Arg>::type shiftedArg, const Arg arg,
+    const A viewBegins, size_t& counter) {}
+
+template <class D, class... P, class T>
+KOKKOS_INLINE_FUNCTION
+    typename Kokkos::Experimental::Impl::GetOffsetViewTypeFromViewType<
+        typename Kokkos::Impl::ViewMapping<void /* deduce subview type from
+                                                   source view traits */
+                                           ,
+                                           ViewTraits<D, P...>, T>::type>::type
+    subview_offset(const OffsetView<D, P...>& src, T arg) {
+  auto theView = src.view();
+  auto begins  = src.begins();
+
+  T shiftedArg = shift_input(arg, begins[0]);
+
+  constexpr size_t rank =
+      Kokkos::Impl::ViewMapping<void /* deduce subview type from source view
+                                        traits */
+                                ,
+                                ViewTraits<D, P...>, T>::type::Rank;
+
+  auto theSubview = Kokkos::subview(theView, shiftedArg);
+
+  Kokkos::Array<int64_t, rank> subviewBegins;
+  size_t counter = 0;
+  Kokkos::Experimental::Impl::map_arg_to_new_begin(0, subviewBegins, shiftedArg,
+                                                   arg, begins, counter);
+
+  typename Kokkos::Experimental::Impl::GetOffsetViewTypeFromViewType<
+      typename Kokkos::Impl::ViewMapping<void /* deduce subview type from source
+                                                 view traits */
+                                         ,
+                                         ViewTraits<D, P...>, T>::type>::type
+      offsetView(theSubview, subviewBegins);
+
+  return offsetView;
+}
+
+template <class D, class... P, class T0, class T1>
+KOKKOS_INLINE_FUNCTION
+    typename Kokkos::Experimental::Impl::GetOffsetViewTypeFromViewType<
+        typename Kokkos::Impl::ViewMapping<
+            void /* deduce subview type from source view traits */
+            ,
+            ViewTraits<D, P...>, T0, T1>::type>::type
+    subview_offset(const Kokkos::Experimental::OffsetView<D, P...>& src,
+                   T0 arg0, T1 arg1) {
+  auto theView = src.view();
+  auto begins  = src.begins();
+
+  T0 shiftedArg0 = shift_input(arg0, begins[0]);
+  T1 shiftedArg1 = shift_input(arg1, begins[1]);
+
+  auto theSubview = Kokkos::subview(theView, shiftedArg0, shiftedArg1);
+  constexpr size_t rank =
+      Kokkos::Impl::ViewMapping<void /* deduce subview type from source view
+                                        traits */
+                                ,
+                                ViewTraits<D, P...>, T0, T1>::type::Rank;
+
+  Kokkos::Array<int64_t, rank> subviewBegins;
+  size_t counter = 0;
+  Kokkos::Experimental::Impl::map_arg_to_new_begin(
+      0, subviewBegins, shiftedArg0, arg0, begins, counter);
+  Kokkos::Experimental::Impl::map_arg_to_new_begin(
+      1, subviewBegins, shiftedArg1, arg1, begins, counter);
+
+  typename Kokkos::Experimental::Impl::GetOffsetViewTypeFromViewType<
+      typename Kokkos::Impl::ViewMapping<
+          void /* deduce subview type from source view traits */
+          ,
+          ViewTraits<D, P...>, T0, T1>::type>::type offsetView(theSubview,
+                                                               subviewBegins);
+
+  return offsetView;
+}
+
+template <class D, class... P, class T0, class T1, class T2>
+KOKKOS_INLINE_FUNCTION
+    typename Kokkos::Experimental::Impl::GetOffsetViewTypeFromViewType<
+        typename Kokkos::Impl::ViewMapping<
+            void /* deduce subview type from source view traits */
+            ,
+            ViewTraits<D, P...>, T0, T1, T2>::type>::type
+    subview_offset(const OffsetView<D, P...>& src, T0 arg0, T1 arg1, T2 arg2) {
+  auto theView = src.view();
+  auto begins  = src.begins();
+
+  T0 shiftedArg0 = shift_input(arg0, begins[0]);
+  T1 shiftedArg1 = shift_input(arg1, begins[1]);
+  T2 shiftedArg2 = shift_input(arg2, begins[2]);
+
+  auto theSubview =
+      Kokkos::subview(theView, shiftedArg0, shiftedArg1, shiftedArg2);
+
+  constexpr size_t rank =
+      Kokkos::Impl::ViewMapping<void /* deduce subview type from source view
+                                        traits */
+                                ,
+                                ViewTraits<D, P...>, T0, T1, T2>::type::Rank;
+
+  Kokkos::Array<int64_t, rank> subviewBegins;
+
+  size_t counter = 0;
+  Kokkos::Experimental::Impl::map_arg_to_new_begin(
+      0, subviewBegins, shiftedArg0, arg0, begins, counter);
+  Kokkos::Experimental::Impl::map_arg_to_new_begin(
+      1, subviewBegins, shiftedArg1, arg1, begins, counter);
+  Kokkos::Experimental::Impl::map_arg_to_new_begin(
+      2, subviewBegins, shiftedArg2, arg2, begins, counter);
+
+  typename Kokkos::Experimental::Impl::GetOffsetViewTypeFromViewType<
+      typename Kokkos::Impl::ViewMapping<
+          void /* deduce subview type from source view traits */
+          ,
+          ViewTraits<D, P...>, T0, T1, T2>::type>::type
+      offsetView(theSubview, subviewBegins);
+
+  return offsetView;
+}
+
+template <class D, class... P, class T0, class T1, class T2, class T3>
+KOKKOS_INLINE_FUNCTION
+    typename Kokkos::Experimental::Impl::GetOffsetViewTypeFromViewType<
+        typename Kokkos::Impl::ViewMapping<
+            void /* deduce subview type from source view traits */
+            ,
+            ViewTraits<D, P...>, T0, T1, T2, T3>::type>::type
+    subview_offset(const OffsetView<D, P...>& src, T0 arg0, T1 arg1, T2 arg2,
+                   T3 arg3) {
+  auto theView = src.view();
+  auto begins  = src.begins();
+
+  T0 shiftedArg0 = shift_input(arg0, begins[0]);
+  T1 shiftedArg1 = shift_input(arg1, begins[1]);
+  T2 shiftedArg2 = shift_input(arg2, begins[2]);
+  T3 shiftedArg3 = shift_input(arg3, begins[3]);
+
+  auto theSubview = Kokkos::subview(theView, shiftedArg0, shiftedArg1,
+                                    shiftedArg2, shiftedArg3);
+
+  constexpr size_t rank = Kokkos::Impl::ViewMapping<
+      void /* deduce subview type from source view traits */
+      ,
+      ViewTraits<D, P...>, T0, T1, T2, T3>::type::Rank;
+  Kokkos::Array<int64_t, rank> subviewBegins;
+
+  size_t counter = 0;
+  Kokkos::Experimental::Impl::map_arg_to_new_begin(
+      0, subviewBegins, shiftedArg0, arg0, begins, counter);
+  Kokkos::Experimental::Impl::map_arg_to_new_begin(
+      1, subviewBegins, shiftedArg1, arg1, begins, counter);
+  Kokkos::Experimental::Impl::map_arg_to_new_begin(
+      2, subviewBegins, shiftedArg2, arg2, begins, counter);
+  Kokkos::Experimental::Impl::map_arg_to_new_begin(
+      3, subviewBegins, shiftedArg3, arg3, begins, counter);
+
+  typename Kokkos::Experimental::Impl::GetOffsetViewTypeFromViewType<
+      typename Kokkos::Impl::ViewMapping<
+          void /* deduce subview type from source view traits */
+          ,
+          ViewTraits<D, P...>, T0, T1, T2, T3>::type>::type
+      offsetView(theSubview, subviewBegins);
+
+  return offsetView;
+}
+
+template <class D, class... P, class T0, class T1, class T2, class T3, class T4>
+KOKKOS_INLINE_FUNCTION
+    typename Kokkos::Experimental::Impl::GetOffsetViewTypeFromViewType<
+        typename Kokkos::Impl::ViewMapping<
+            void /* deduce subview type from source view traits */
+            ,
+            ViewTraits<D, P...>, T0, T1, T2, T3, T4>::type>::type
+    subview_offset(const OffsetView<D, P...>& src, T0 arg0, T1 arg1, T2 arg2,
+                   T3 arg3, T4 arg4) {
+  auto theView = src.view();
+  auto begins  = src.begins();
+
+  T0 shiftedArg0 = shift_input(arg0, begins[0]);
+  T1 shiftedArg1 = shift_input(arg1, begins[1]);
+  T2 shiftedArg2 = shift_input(arg2, begins[2]);
+  T3 shiftedArg3 = shift_input(arg3, begins[3]);
+  T4 shiftedArg4 = shift_input(arg4, begins[4]);
+
+  auto theSubview = Kokkos::subview(theView, shiftedArg0, shiftedArg1,
+                                    shiftedArg2, shiftedArg3, shiftedArg4);
+
+  constexpr size_t rank = Kokkos::Impl::ViewMapping<
+      void /* deduce subview type from source view traits */
+      ,
+      ViewTraits<D, P...>, T0, T1, T2, T3, T4>::type::Rank;
+  Kokkos::Array<int64_t, rank> subviewBegins;
+
+  size_t counter = 0;
+  Kokkos::Experimental::Impl::map_arg_to_new_begin(
+      0, subviewBegins, shiftedArg0, arg0, begins, counter);
+  Kokkos::Experimental::Impl::map_arg_to_new_begin(
+      1, subviewBegins, shiftedArg1, arg1, begins, counter);
+  Kokkos::Experimental::Impl::map_arg_to_new_begin(
+      2, subviewBegins, shiftedArg2, arg2, begins, counter);
+  Kokkos::Experimental::Impl::map_arg_to_new_begin(
+      3, subviewBegins, shiftedArg3, arg3, begins, counter);
+  Kokkos::Experimental::Impl::map_arg_to_new_begin(
+      4, subviewBegins, shiftedArg4, arg4, begins, counter);
+
+  typename Kokkos::Experimental::Impl::GetOffsetViewTypeFromViewType<
+      typename Kokkos::Impl::ViewMapping<
+          void /* deduce subview type from source view traits */
+          ,
+          ViewTraits<D, P...>, T0, T1, T2, T3, T4>::type>::type
+      offsetView(theSubview, subviewBegins);
+
+  return offsetView;
+}
+
+template <class D, class... P, class T0, class T1, class T2, class T3, class T4,
+          class T5>
+KOKKOS_INLINE_FUNCTION
+    typename Kokkos::Experimental::Impl::GetOffsetViewTypeFromViewType<
+        typename Kokkos::Impl::ViewMapping<
+            void /* deduce subview type from source view traits */
+            ,
+            ViewTraits<D, P...>, T0, T1, T2, T3, T4, T5>::type>::type
+    subview_offset(const OffsetView<D, P...>& src, T0 arg0, T1 arg1, T2 arg2,
+                   T3 arg3, T4 arg4, T5 arg5) {
+  auto theView = src.view();
+  auto begins  = src.begins();
+
+  T0 shiftedArg0 = shift_input(arg0, begins[0]);
+  T1 shiftedArg1 = shift_input(arg1, begins[1]);
+  T2 shiftedArg2 = shift_input(arg2, begins[2]);
+  T3 shiftedArg3 = shift_input(arg3, begins[3]);
+  T4 shiftedArg4 = shift_input(arg4, begins[4]);
+  T5 shiftedArg5 = shift_input(arg5, begins[5]);
+
+  auto theSubview =
+      Kokkos::subview(theView, shiftedArg0, shiftedArg1, shiftedArg2,
+                      shiftedArg3, shiftedArg4, shiftedArg5);
+
+  constexpr size_t rank = Kokkos::Impl::ViewMapping<
+      void /* deduce subview type from source view traits */
+      ,
+      ViewTraits<D, P...>, T0, T1, T2, T3, T4, T5>::type::Rank;
+
+  Kokkos::Array<int64_t, rank> subviewBegins;
+
+  size_t counter = 0;
+  Kokkos::Experimental::Impl::map_arg_to_new_begin(
+      0, subviewBegins, shiftedArg0, arg0, begins, counter);
+  Kokkos::Experimental::Impl::map_arg_to_new_begin(
+      1, subviewBegins, shiftedArg1, arg1, begins, counter);
+  Kokkos::Experimental::Impl::map_arg_to_new_begin(
+      2, subviewBegins, shiftedArg2, arg2, begins, counter);
+  Kokkos::Experimental::Impl::map_arg_to_new_begin(
+      3, subviewBegins, shiftedArg3, arg3, begins, counter);
+  Kokkos::Experimental::Impl::map_arg_to_new_begin(
+      4, subviewBegins, shiftedArg4, arg4, begins, counter);
+  Kokkos::Experimental::Impl::map_arg_to_new_begin(
+      5, subviewBegins, shiftedArg5, arg5, begins, counter);
+
+  typename Kokkos::Experimental::Impl::GetOffsetViewTypeFromViewType<
+      typename Kokkos::Impl::ViewMapping<
+          void /* deduce subview type from source view traits */
+          ,
+          ViewTraits<D, P...>, T0, T1, T2, T3, T4, T5>::type>::type
+      offsetView(theSubview, subviewBegins);
+
+  return offsetView;
+}
+template <class D, class... P, class T0, class T1, class T2, class T3, class T4,
+          class T5, class T6>
+KOKKOS_INLINE_FUNCTION
+    typename Kokkos::Experimental::Impl::GetOffsetViewTypeFromViewType<
+        typename Kokkos::Impl::ViewMapping<
+            void /* deduce subview type from source view traits */
+            ,
+            ViewTraits<D, P...>, T0, T1, T2, T3, T4, T5, T6>::type>::type
+    subview_offset(const OffsetView<D, P...>& src, T0 arg0, T1 arg1, T2 arg2,
+                   T3 arg3, T4 arg4, T5 arg5, T6 arg6) {
+  auto theView = src.view();
+  auto begins  = src.begins();
+
+  T0 shiftedArg0 = shift_input(arg0, begins[0]);
+  T1 shiftedArg1 = shift_input(arg1, begins[1]);
+  T2 shiftedArg2 = shift_input(arg2, begins[2]);
+  T3 shiftedArg3 = shift_input(arg3, begins[3]);
+  T4 shiftedArg4 = shift_input(arg4, begins[4]);
+  T5 shiftedArg5 = shift_input(arg5, begins[5]);
+  T6 shiftedArg6 = shift_input(arg6, begins[6]);
+
+  auto theSubview =
+      Kokkos::subview(theView, shiftedArg0, shiftedArg1, shiftedArg2,
+                      shiftedArg3, shiftedArg4, shiftedArg5, shiftedArg6);
+
+  constexpr size_t rank = Kokkos::Impl::ViewMapping<
+      void /* deduce subview type from source view traits */
+      ,
+      ViewTraits<D, P...>, T0, T1, T2, T3, T4, T5, T6>::type::Rank;
+
+  Kokkos::Array<int64_t, rank> subviewBegins;
+
+  size_t counter = 0;
+  Kokkos::Experimental::Impl::map_arg_to_new_begin(
+      0, subviewBegins, shiftedArg0, arg0, begins, counter);
+  Kokkos::Experimental::Impl::map_arg_to_new_begin(
+      1, subviewBegins, shiftedArg1, arg1, begins, counter);
+  Kokkos::Experimental::Impl::map_arg_to_new_begin(
+      2, subviewBegins, shiftedArg2, arg2, begins, counter);
+  Kokkos::Experimental::Impl::map_arg_to_new_begin(
+      3, subviewBegins, shiftedArg3, arg3, begins, counter);
+  Kokkos::Experimental::Impl::map_arg_to_new_begin(
+      4, subviewBegins, shiftedArg4, arg4, begins, counter);
+  Kokkos::Experimental::Impl::map_arg_to_new_begin(
+      5, subviewBegins, shiftedArg5, arg5, begins, counter);
+  Kokkos::Experimental::Impl::map_arg_to_new_begin(
+      6, subviewBegins, shiftedArg6, arg6, begins, counter);
+
+  typename Kokkos::Experimental::Impl::GetOffsetViewTypeFromViewType<
+      typename Kokkos::Impl::ViewMapping<
+          void /* deduce subview type from source view traits */
+          ,
+          ViewTraits<D, P...>, T0, T1, T2, T3, T4, T5, T6>::type>::type
+      offsetView(theSubview, subviewBegins);
+
+  return offsetView;
+}
+
+template <class D, class... P, class T0, class T1, class T2, class T3, class T4,
+          class T5, class T6, class T7>
+KOKKOS_INLINE_FUNCTION
+    typename Kokkos::Experimental::Impl::GetOffsetViewTypeFromViewType<
+        typename Kokkos::Impl::ViewMapping<
+            void /* deduce subview type from source view traits */
+            ,
+            ViewTraits<D, P...>, T0, T1, T2, T3, T4, T5, T6, T7>::type>::type
+    subview_offset(const OffsetView<D, P...>& src, T0 arg0, T1 arg1, T2 arg2,
+                   T3 arg3, T4 arg4, T5 arg5, T6 arg6, T7 arg7) {
+  auto theView = src.view();
+  auto begins  = src.begins();
+
+  T0 shiftedArg0 = shift_input(arg0, begins[0]);
+  T1 shiftedArg1 = shift_input(arg1, begins[1]);
+  T2 shiftedArg2 = shift_input(arg2, begins[2]);
+  T3 shiftedArg3 = shift_input(arg3, begins[3]);
+  T4 shiftedArg4 = shift_input(arg4, begins[4]);
+  T5 shiftedArg5 = shift_input(arg5, begins[5]);
+  T6 shiftedArg6 = shift_input(arg6, begins[6]);
+  T7 shiftedArg7 = shift_input(arg7, begins[7]);
+
+  auto theSubview = Kokkos::subview(theView, shiftedArg0, shiftedArg1,
+                                    shiftedArg2, shiftedArg3, shiftedArg4,
+                                    shiftedArg5, shiftedArg6, shiftedArg7);
+
+  constexpr size_t rank = Kokkos::Impl::ViewMapping<
+      void /* deduce subview type from source view traits */
+      ,
+      ViewTraits<D, P...>, T0, T1, T2, T3, T4, T5, T6, T7>::type::Rank;
+
+  Kokkos::Array<int64_t, rank> subviewBegins;
+
+  size_t counter = 0;
+  Kokkos::Experimental::Impl::map_arg_to_new_begin(
+      0, subviewBegins, shiftedArg0, arg0, begins, counter);
+  Kokkos::Experimental::Impl::map_arg_to_new_begin(
+      1, subviewBegins, shiftedArg1, arg1, begins, counter);
+  Kokkos::Experimental::Impl::map_arg_to_new_begin(
+      2, subviewBegins, shiftedArg2, arg2, begins, counter);
+  Kokkos::Experimental::Impl::map_arg_to_new_begin(
+      3, subviewBegins, shiftedArg3, arg3, begins, counter);
+  Kokkos::Experimental::Impl::map_arg_to_new_begin(
+      4, subviewBegins, shiftedArg4, arg4, begins, counter);
+  Kokkos::Experimental::Impl::map_arg_to_new_begin(
+      5, subviewBegins, shiftedArg5, arg5, begins, counter);
+  Kokkos::Experimental::Impl::map_arg_to_new_begin(
+      6, subviewBegins, shiftedArg6, arg6, begins, counter);
+  Kokkos::Experimental::Impl::map_arg_to_new_begin(
+      7, subviewBegins, shiftedArg7, arg7, begins, counter);
+
+  typename Kokkos::Experimental::Impl::GetOffsetViewTypeFromViewType<
+      typename Kokkos::Impl::ViewMapping<
+          void /* deduce subview type from source view traits */
+          ,
+          ViewTraits<D, P...>, T0, T1, T2, T3, T4, T5, T6, T7>::type>::type
+      offsetView(theSubview, subviewBegins);
+
+  return offsetView;
+}
+}  // namespace Impl
+
+template <class D, class... P, class... Args>
+KOKKOS_INLINE_FUNCTION
+    typename Kokkos::Experimental::Impl::GetOffsetViewTypeFromViewType<
+        typename Kokkos::Impl::ViewMapping<
+            void /* deduce subview type from source view traits */
+            ,
+            ViewTraits<D, P...>, Args...>::type>::type
+    subview(const OffsetView<D, P...>& src, Args... args) {
+  static_assert(
+      OffsetView<D, P...>::Rank == sizeof...(Args),
+      "subview requires one argument for each source OffsetView rank");
+
+  return Kokkos::Experimental::Impl::subview_offset(src, args...);
+}
+
+}  // namespace Experimental
+}  // namespace Kokkos
 //----------------------------------------------------------------------------
 //----------------------------------------------------------------------------
 
 namespace Kokkos {
-   namespace Experimental {
-      template< class LT , class ... LP , class RT , class ... RP >
-      KOKKOS_INLINE_FUNCTION
-      bool operator == ( const OffsetView<LT,LP...> & lhs ,
-            const OffsetView<RT,RP...> & rhs )
-            {
-         // Same data, layout, dimensions
-         typedef ViewTraits<LT,LP...>  lhs_traits ;
-         typedef ViewTraits<RT,RP...>  rhs_traits ;
+namespace Experimental {
+template <class LT, class... LP, class RT, class... RP>
+KOKKOS_INLINE_FUNCTION bool operator==(const OffsetView<LT, LP...>& lhs,
+                                       const OffsetView<RT, RP...>& rhs) {
+  // Same data, layout, dimensions
+  typedef ViewTraits<LT, LP...> lhs_traits;
+  typedef ViewTraits<RT, RP...> rhs_traits;
 
-         return
-               std::is_same< typename lhs_traits::const_value_type ,
-               typename rhs_traits::const_value_type >::value &&
-               std::is_same< typename lhs_traits::array_layout ,
-               typename rhs_traits::array_layout >::value &&
-               std::is_same< typename lhs_traits::memory_space ,
-               typename rhs_traits::memory_space >::value &&
-               unsigned(lhs_traits::rank) == unsigned(rhs_traits::rank) &&
-               lhs.data()        == rhs.data() &&
-               lhs.span()        == rhs.span() &&
-               lhs.extent(0) == rhs.extent(0) &&
-               lhs.extent(1) == rhs.extent(1) &&
-               lhs.extent(2) == rhs.extent(2) &&
-               lhs.extent(3) == rhs.extent(3) &&
-               lhs.extent(4) == rhs.extent(4) &&
-               lhs.extent(5) == rhs.extent(5) &&
-               lhs.extent(6) == rhs.extent(6) &&
-               lhs.extent(7) == rhs.extent(7) &&
-               lhs.begin(0) == rhs.begin(0) &&
-               lhs.begin(1) == rhs.begin(1) &&
-               lhs.begin(2) == rhs.begin(2) &&
-               lhs.begin(3) == rhs.begin(3) &&
-               lhs.begin(4) == rhs.begin(4) &&
-               lhs.begin(5) == rhs.begin(5) &&
-               lhs.begin(6) == rhs.begin(6) &&
-               lhs.begin(7) == rhs.begin(7)
-               ;
-            }
+  return std::is_same<typename lhs_traits::const_value_type,
+                      typename rhs_traits::const_value_type>::value &&
+         std::is_same<typename lhs_traits::array_layout,
+                      typename rhs_traits::array_layout>::value &&
+         std::is_same<typename lhs_traits::memory_space,
+                      typename rhs_traits::memory_space>::value &&
+         unsigned(lhs_traits::rank) == unsigned(rhs_traits::rank) &&
+         lhs.data() == rhs.data() && lhs.span() == rhs.span() &&
+         lhs.extent(0) == rhs.extent(0) && lhs.extent(1) == rhs.extent(1) &&
+         lhs.extent(2) == rhs.extent(2) && lhs.extent(3) == rhs.extent(3) &&
+         lhs.extent(4) == rhs.extent(4) && lhs.extent(5) == rhs.extent(5) &&
+         lhs.extent(6) == rhs.extent(6) && lhs.extent(7) == rhs.extent(7) &&
+         lhs.begin(0) == rhs.begin(0) && lhs.begin(1) == rhs.begin(1) &&
+         lhs.begin(2) == rhs.begin(2) && lhs.begin(3) == rhs.begin(3) &&
+         lhs.begin(4) == rhs.begin(4) && lhs.begin(5) == rhs.begin(5) &&
+         lhs.begin(6) == rhs.begin(6) && lhs.begin(7) == rhs.begin(7);
+}
 
-      template< class LT , class ... LP , class RT , class ... RP >
-      KOKKOS_INLINE_FUNCTION
-      bool operator != ( const OffsetView<LT,LP...> & lhs ,
-            const OffsetView<RT,RP...> & rhs )
-            {
-         return ! ( operator==(lhs,rhs) );
-            }
+template <class LT, class... LP, class RT, class... RP>
+KOKKOS_INLINE_FUNCTION bool operator!=(const OffsetView<LT, LP...>& lhs,
+                                       const OffsetView<RT, RP...>& rhs) {
+  return !(operator==(lhs, rhs));
+}
 
-      template< class LT , class ... LP , class RT , class ... RP >
-      KOKKOS_INLINE_FUNCTION
-      bool operator == ( const View<LT,LP...> & lhs ,
-            const OffsetView<RT,RP...> & rhs )
-            {
-         // Same data, layout, dimensions
-         typedef ViewTraits<LT,LP...>  lhs_traits ;
-         typedef ViewTraits<RT,RP...>  rhs_traits ;
+template <class LT, class... LP, class RT, class... RP>
+KOKKOS_INLINE_FUNCTION bool operator==(const View<LT, LP...>& lhs,
+                                       const OffsetView<RT, RP...>& rhs) {
+  // Same data, layout, dimensions
+  typedef ViewTraits<LT, LP...> lhs_traits;
+  typedef ViewTraits<RT, RP...> rhs_traits;
 
-         return
-               std::is_same< typename lhs_traits::const_value_type ,
-               typename rhs_traits::const_value_type >::value &&
-               std::is_same< typename lhs_traits::array_layout ,
-               typename rhs_traits::array_layout >::value &&
-               std::is_same< typename lhs_traits::memory_space ,
-               typename rhs_traits::memory_space >::value &&
-               unsigned(lhs_traits::rank) == unsigned(rhs_traits::rank) &&
-               lhs.data()        == rhs.data() &&
-               lhs.span()        == rhs.span() &&
-               lhs.extent(0) == rhs.extent(0) &&
-               lhs.extent(1) == rhs.extent(1) &&
-               lhs.extent(2) == rhs.extent(2) &&
-               lhs.extent(3) == rhs.extent(3) &&
-               lhs.extent(4) == rhs.extent(4) &&
-               lhs.extent(5) == rhs.extent(5) &&
-               lhs.extent(6) == rhs.extent(6) &&
-               lhs.extent(7) == rhs.extent(7)
-               ;
-            }
+  return std::is_same<typename lhs_traits::const_value_type,
+                      typename rhs_traits::const_value_type>::value &&
+         std::is_same<typename lhs_traits::array_layout,
+                      typename rhs_traits::array_layout>::value &&
+         std::is_same<typename lhs_traits::memory_space,
+                      typename rhs_traits::memory_space>::value &&
+         unsigned(lhs_traits::rank) == unsigned(rhs_traits::rank) &&
+         lhs.data() == rhs.data() && lhs.span() == rhs.span() &&
+         lhs.extent(0) == rhs.extent(0) && lhs.extent(1) == rhs.extent(1) &&
+         lhs.extent(2) == rhs.extent(2) && lhs.extent(3) == rhs.extent(3) &&
+         lhs.extent(4) == rhs.extent(4) && lhs.extent(5) == rhs.extent(5) &&
+         lhs.extent(6) == rhs.extent(6) && lhs.extent(7) == rhs.extent(7);
+}
 
-      template< class LT , class ... LP , class RT , class ... RP >
-      KOKKOS_INLINE_FUNCTION
-      bool operator == ( const OffsetView<LT,LP...> & lhs ,
-            const View<RT,RP...> & rhs )
-            { return rhs == lhs;}
+template <class LT, class... LP, class RT, class... RP>
+KOKKOS_INLINE_FUNCTION bool operator==(const OffsetView<LT, LP...>& lhs,
+                                       const View<RT, RP...>& rhs) {
+  return rhs == lhs;
+}
 
-   }
+}  // namespace Experimental
 } /* namespace Kokkos */
 
 //----------------------------------------------------------------------------
 //----------------------------------------------------------------------------
 
-
 namespace Kokkos {
-   namespace Experimental {
-      template< class DT , class ... DP >
-      inline
-      void deep_copy
-      ( const OffsetView<DT,DP...> & dst
-            , typename ViewTraits<DT,DP...>::const_value_type & value
-            , typename std::enable_if<
-            std::is_same< typename ViewTraits<DT,DP...>::specialize , void >::value
-            >::type * = 0 )
-      {
-         static_assert(
-               std::is_same< typename ViewTraits<DT,DP...>::non_const_value_type ,
-               typename ViewTraits<DT,DP...>::value_type >::value
-               , "deep_copy requires non-const type" );
+namespace Experimental {
+template <class DT, class... DP>
+inline void deep_copy(
+    const OffsetView<DT, DP...>& dst,
+    typename ViewTraits<DT, DP...>::const_value_type& value,
+    typename std::enable_if<std::is_same<
+        typename ViewTraits<DT, DP...>::specialize, void>::value>::type* = 0) {
+  static_assert(
+      std::is_same<typename ViewTraits<DT, DP...>::non_const_value_type,
+                   typename ViewTraits<DT, DP...>::value_type>::value,
+      "deep_copy requires non-const type");
 
-         auto dstView = dst.view();
-         Kokkos::deep_copy( dstView , value );
+  auto dstView = dst.view();
+  Kokkos::deep_copy(dstView, value);
+}
 
-      }
+template <class DT, class... DP, class ST, class... SP>
+inline void deep_copy(
+    const OffsetView<DT, DP...>& dst, const OffsetView<ST, SP...>& value,
+    typename std::enable_if<std::is_same<
+        typename ViewTraits<DT, DP...>::specialize, void>::value>::type* = 0) {
+  static_assert(
+      std::is_same<typename ViewTraits<DT, DP...>::value_type,
+                   typename ViewTraits<ST, SP...>::non_const_value_type>::value,
+      "deep_copy requires matching non-const destination type");
 
-      template< class DT , class ... DP , class ST , class ... SP >
-      inline
-      void deep_copy
-      ( const OffsetView<DT,DP...> & dst
-            , const OffsetView<ST,SP...> & value
-            , typename std::enable_if<
-            std::is_same< typename ViewTraits<DT,DP...>::specialize , void >::value
-            >::type * = 0 )
-      {
-         static_assert(
-               std::is_same< typename ViewTraits<DT,DP...>::value_type ,
-               typename ViewTraits<ST,SP...>::non_const_value_type >::value
-               , "deep_copy requires matching non-const destination type" );
+  auto dstView = dst.view();
+  Kokkos::deep_copy(dstView, value.view());
+}
+template <class DT, class... DP, class ST, class... SP>
+inline void deep_copy(
+    const OffsetView<DT, DP...>& dst, const View<ST, SP...>& value,
+    typename std::enable_if<std::is_same<
+        typename ViewTraits<DT, DP...>::specialize, void>::value>::type* = 0) {
+  static_assert(
+      std::is_same<typename ViewTraits<DT, DP...>::value_type,
+                   typename ViewTraits<ST, SP...>::non_const_value_type>::value,
+      "deep_copy requires matching non-const destination type");
 
-         auto dstView = dst.view();
-         Kokkos::deep_copy( dstView , value.view() );
+  auto dstView = dst.view();
+  Kokkos::deep_copy(dstView, value);
+}
 
-      }
-      template< class DT , class ... DP , class ST , class ... SP >
-      inline
-      void deep_copy
-      ( const OffsetView<DT,DP...> & dst
-            , const View<ST,SP...> & value
-            , typename std::enable_if<
-            std::is_same< typename ViewTraits<DT,DP...>::specialize , void >::value
-            >::type * = 0 )
-      {
-         static_assert(
-               std::is_same< typename ViewTraits<DT,DP...>::value_type ,
-               typename ViewTraits<ST,SP...>::non_const_value_type >::value
-               , "deep_copy requires matching non-const destination type" );
+template <class DT, class... DP, class ST, class... SP>
+inline void deep_copy(
+    const View<DT, DP...>& dst, const OffsetView<ST, SP...>& value,
+    typename std::enable_if<std::is_same<
+        typename ViewTraits<DT, DP...>::specialize, void>::value>::type* = 0) {
+  static_assert(
+      std::is_same<typename ViewTraits<DT, DP...>::value_type,
+                   typename ViewTraits<ST, SP...>::non_const_value_type>::value,
+      "deep_copy requires matching non-const destination type");
 
-         auto dstView = dst.view();
-         Kokkos::deep_copy( dstView , value);
+  Kokkos::deep_copy(dst, value.view());
+}
+namespace Impl {
 
-      }
+// Deduce Mirror Types
+template <class Space, class T, class... P>
+struct MirrorOffsetViewType {
+  // The incoming view_type
+  typedef typename Kokkos::Experimental::OffsetView<T, P...> src_view_type;
+  // The memory space for the mirror view
+  typedef typename Space::memory_space memory_space;
+  // Check whether it is the same memory space
+  enum {
+    is_same_memspace =
+        std::is_same<memory_space, typename src_view_type::memory_space>::value
+  };
+  // The array_layout
+  typedef typename src_view_type::array_layout array_layout;
+  // The data type (we probably want it non-const since otherwise we can't even
+  // deep_copy to it.
+  typedef typename src_view_type::non_const_data_type data_type;
+  // The destination view type if it is not the same memory space
+  typedef Kokkos::Experimental::OffsetView<data_type, array_layout, Space>
+      dest_view_type;
+  // If it is the same memory_space return the existsing view_type
+  // This will also keep the unmanaged trait if necessary
+  typedef typename std::conditional<is_same_memspace, src_view_type,
+                                    dest_view_type>::type view_type;
+};
 
-      template< class DT , class ... DP , class ST , class ... SP >
-      inline
-      void deep_copy
-      ( const View<DT,DP...> & dst
-            , const OffsetView<ST,SP...> & value
-            , typename std::enable_if<
-            std::is_same< typename ViewTraits<DT,DP...>::specialize , void >::value
-            >::type * = 0 )
-      {
-         static_assert(
-               std::is_same< typename ViewTraits<DT,DP...>::value_type ,
-               typename ViewTraits<ST,SP...>::non_const_value_type >::value
-               , "deep_copy requires matching non-const destination type" );
+template <class Space, class T, class... P>
+struct MirrorOffsetType {
+  // The incoming view_type
+  typedef typename Kokkos::Experimental::OffsetView<T, P...> src_view_type;
+  // The memory space for the mirror view
+  typedef typename Space::memory_space memory_space;
+  // Check whether it is the same memory space
+  enum {
+    is_same_memspace =
+        std::is_same<memory_space, typename src_view_type::memory_space>::value
+  };
+  // The array_layout
+  typedef typename src_view_type::array_layout array_layout;
+  // The data type (we probably want it non-const since otherwise we can't even
+  // deep_copy to it.
+  typedef typename src_view_type::non_const_data_type data_type;
+  // The destination view type if it is not the same memory space
+  typedef Kokkos::Experimental::OffsetView<data_type, array_layout, Space>
+      view_type;
+};
 
-         Kokkos::deep_copy( dst , value.view() );
+}  // namespace Impl
 
-      }
-      namespace Impl {
+template <class T, class... P>
+inline typename Kokkos::Experimental::OffsetView<T, P...>::HostMirror
+create_mirror(
+    const Kokkos::Experimental::OffsetView<T, P...>& src,
+    typename std::enable_if<
+        !std::is_same<typename Kokkos::ViewTraits<T, P...>::array_layout,
+                      Kokkos::LayoutStride>::value>::type* = 0) {
+  typedef OffsetView<T, P...> src_type;
+  typedef typename src_type::HostMirror dst_type;
 
-         // Deduce Mirror Types
-         template<class Space, class T, class ... P>
-         struct MirrorOffsetViewType {
-            // The incoming view_type
-            typedef typename Kokkos::Experimental::OffsetView<T,P...> src_view_type;
-            // The memory space for the mirror view
-            typedef typename Space::memory_space memory_space;
-            // Check whether it is the same memory space
-            enum { is_same_memspace = std::is_same<memory_space,typename src_view_type::memory_space>::value };
-            // The array_layout
-            typedef typename src_view_type::array_layout array_layout;
-            // The data type (we probably want it non-const since otherwise we can't even deep_copy to it.
-            typedef typename src_view_type::non_const_data_type data_type;
-            // The destination view type if it is not the same memory space
-            typedef Kokkos::Experimental::OffsetView<data_type,array_layout,Space> dest_view_type;
-            // If it is the same memory_space return the existsing view_type
-            // This will also keep the unmanaged trait if necessary
-            typedef typename std::conditional<is_same_memspace,src_view_type,dest_view_type>::type view_type;
-         };
+  return dst_type(
+      Kokkos::Impl::ViewCtorProp<std::string>(
+          std::string(src.label()).append("_mirror")),
+      typename Kokkos::ViewTraits<T, P...>::array_layout(
+          src.extent(0), src.extent(1), src.extent(2), src.extent(3),
+          src.extent(4), src.extent(5), src.extent(6), src.extent(7)),
+      {src.begin(0), src.begin(1), src.begin(2), src.begin(3), src.begin(4),
+       src.begin(5), src.begin(6), src.begin(7)});
+}
 
-         template<class Space, class T, class ... P>
-         struct MirrorOffsetType {
-            // The incoming view_type
-            typedef typename Kokkos::Experimental::OffsetView<T,P...> src_view_type;
-            // The memory space for the mirror view
-            typedef typename Space::memory_space memory_space;
-            // Check whether it is the same memory space
-            enum { is_same_memspace = std::is_same<memory_space,typename src_view_type::memory_space>::value };
-            // The array_layout
-            typedef typename src_view_type::array_layout array_layout;
-            // The data type (we probably want it non-const since otherwise we can't even deep_copy to it.
-            typedef typename src_view_type::non_const_data_type data_type;
-            // The destination view type if it is not the same memory space
-            typedef Kokkos::Experimental::OffsetView<data_type,array_layout,Space> view_type;
-         };
+template <class T, class... P>
+inline typename Kokkos::Experimental::OffsetView<T, P...>::HostMirror
+create_mirror(
+    const Kokkos::Experimental::OffsetView<T, P...>& src,
+    typename std::enable_if<
+        std::is_same<typename Kokkos::ViewTraits<T, P...>::array_layout,
+                     Kokkos::LayoutStride>::value>::type* = 0) {
+  typedef OffsetView<T, P...> src_type;
+  typedef typename src_type::HostMirror dst_type;
 
-      }
+  Kokkos::LayoutStride layout;
 
-      template< class T , class ... P >
-      inline
-      typename Kokkos::Experimental::OffsetView<T,P...>::HostMirror
-      create_mirror( const Kokkos::Experimental::OffsetView<T,P...> & src
-            , typename std::enable_if<
-            ! std::is_same< typename Kokkos::ViewTraits<T,P...>::array_layout
-            , Kokkos::LayoutStride >::value
-            >::type * = 0
-      )
-      {
-         typedef OffsetView<T,P...>             src_type ;
-         typedef typename src_type::HostMirror  dst_type ;
+  layout.dimension[0] = src.extent(0);
+  layout.dimension[1] = src.extent(1);
+  layout.dimension[2] = src.extent(2);
+  layout.dimension[3] = src.extent(3);
+  layout.dimension[4] = src.extent(4);
+  layout.dimension[5] = src.extent(5);
+  layout.dimension[6] = src.extent(6);
+  layout.dimension[7] = src.extent(7);
 
-         return dst_type( Kokkos::Impl::ViewCtorProp< std::string >(std::string( src.label() ).append("_mirror") ),
-               typename Kokkos::ViewTraits<T,P...>::array_layout
-               ( src.extent(0), src.extent(1), src.extent(2), src.extent(3), src.extent(4),
-                     src.extent(5), src.extent(6), src.extent(7) ),
-                     { src.begin(0), src.begin(1), src.begin(2), src.begin(3), src.begin(4),
-                           src.begin(5), src.begin(6), src.begin(7) });
-      }
+  layout.stride[0] = src.stride_0();
+  layout.stride[1] = src.stride_1();
+  layout.stride[2] = src.stride_2();
+  layout.stride[3] = src.stride_3();
+  layout.stride[4] = src.stride_4();
+  layout.stride[5] = src.stride_5();
+  layout.stride[6] = src.stride_6();
+  layout.stride[7] = src.stride_7();
 
-      template< class T , class ... P >
-      inline
-      typename Kokkos::Experimental::OffsetView<T,P...>::HostMirror
-      create_mirror( const Kokkos::Experimental::OffsetView<T,P...> & src
-            , typename std::enable_if<
-            std::is_same< typename Kokkos::ViewTraits<T,P...>::array_layout
-            , Kokkos::LayoutStride >::value
-            >::type * = 0
-      )
-      {
-         typedef OffsetView<T,P...>             src_type ;
-         typedef typename src_type::HostMirror  dst_type ;
+  return dst_type(std::string(src.label()).append("_mirror"), layout,
+                  {src.begin(0), src.begin(1), src.begin(2), src.begin(3),
+                   src.begin(4), src.begin(5), src.begin(6), src.begin(7)});
+}
 
-         Kokkos::LayoutStride layout ;
+// Create a mirror in a new space (specialization for different space)
+template <class Space, class T, class... P>
+typename Kokkos::Experimental::Impl::MirrorOffsetType<Space, T, P...>::view_type
+create_mirror(const Space&,
+              const Kokkos::Experimental::OffsetView<T, P...>& src) {
+  return typename Kokkos::Experimental::Impl::MirrorOffsetType<
+      Space, T, P...>::view_type(src.label(), src.layout(),
+                                 {src.begin(0), src.begin(1), src.begin(2),
+                                  src.begin(3), src.begin(4), src.begin(5),
+                                  src.begin(6), src.begin(7)});
+}
 
-         layout.dimension[0] = src.extent(0);
-         layout.dimension[1] = src.extent(1);
-         layout.dimension[2] = src.extent(2);
-         layout.dimension[3] = src.extent(3);
-         layout.dimension[4] = src.extent(4);
-         layout.dimension[5] = src.extent(5);
-         layout.dimension[6] = src.extent(6);
-         layout.dimension[7] = src.extent(7);
+template <class T, class... P>
+inline typename Kokkos::Experimental::OffsetView<T, P...>::HostMirror
+create_mirror_view(
+    const typename Kokkos::Experimental::OffsetView<T, P...>& src,
+    typename std::enable_if<
+        (std::is_same<
+             typename Kokkos::Experimental::OffsetView<T, P...>::memory_space,
+             typename Kokkos::Experimental::OffsetView<
+                 T, P...>::HostMirror::memory_space>::value &&
+         std::is_same<
+             typename Kokkos::Experimental::OffsetView<T, P...>::data_type,
+             typename Kokkos::Experimental::OffsetView<
+                 T, P...>::HostMirror::data_type>::value)>::type* = 0) {
+  return src;
+}
 
-         layout.stride[0] = src.stride_0();
-         layout.stride[1] = src.stride_1();
-         layout.stride[2] = src.stride_2();
-         layout.stride[3] = src.stride_3();
-         layout.stride[4] = src.stride_4();
-         layout.stride[5] = src.stride_5();
-         layout.stride[6] = src.stride_6();
-         layout.stride[7] = src.stride_7();
+template <class T, class... P>
+inline typename Kokkos::Experimental::OffsetView<T, P...>::HostMirror
+create_mirror_view(
+    const Kokkos::Experimental::OffsetView<T, P...>& src,
+    typename std::enable_if<
+        !(std::is_same<
+              typename Kokkos::Experimental::OffsetView<T, P...>::memory_space,
+              typename Kokkos::Experimental::OffsetView<
+                  T, P...>::HostMirror::memory_space>::value &&
+          std::is_same<
+              typename Kokkos::Experimental::OffsetView<T, P...>::data_type,
+              typename Kokkos::Experimental::OffsetView<
+                  T, P...>::HostMirror::data_type>::value)>::type* = 0) {
+  return Kokkos::Experimental::create_mirror(src);
+}
 
-         return dst_type( std::string( src.label() ).append("_mirror") , layout,
-               { src.begin(0), src.begin(1), src.begin(2), src.begin(3), src.begin(4),
-                     src.begin(5), src.begin(6), src.begin(7) } );
-      }
+// Create a mirror view in a new space (specialization for same space)
+template <class Space, class T, class... P>
+typename Kokkos::Experimental::Impl::MirrorOffsetViewType<Space, T,
+                                                          P...>::view_type
+create_mirror_view(const Space&,
+                   const Kokkos::Experimental::OffsetView<T, P...>& src,
+                   typename std::enable_if<Impl::MirrorOffsetViewType<
+                       Space, T, P...>::is_same_memspace>::type* = 0) {
+  return src;
+}
 
+// Create a mirror view in a new space (specialization for different space)
+template <class Space, class T, class... P>
+typename Kokkos::Experimental::Impl::MirrorOffsetViewType<Space, T,
+                                                          P...>::view_type
+create_mirror_view(const Space&,
+                   const Kokkos::Experimental::OffsetView<T, P...>& src,
+                   typename std::enable_if<!Impl::MirrorOffsetViewType<
+                       Space, T, P...>::is_same_memspace>::type* = 0) {
+  return typename Kokkos::Experimental::Impl::MirrorOffsetViewType<
+      Space, T, P...>::view_type(src.label(), src.layout(),
+                                 {src.begin(0), src.begin(1), src.begin(2),
+                                  src.begin(3), src.begin(4), src.begin(5),
+                                  src.begin(6), src.begin(7)});
+}
+//
+//  // Create a mirror view and deep_copy in a new space (specialization for
+//  same space) template<class Space, class T, class ... P> typename
+//  Kokkos::Experimental::Impl::MirrorViewType<Space,T,P ...>::view_type
+//  create_mirror_view_and_copy(const Space& , const
+//  Kokkos::Experimental::OffsetView<T,P...> & src
+//                              , std::string const& name = ""
+//                                  , typename
+//                                  std::enable_if<Impl::MirrorViewType<Space,T,P
+//                                  ...>::is_same_memspace>::type* = 0 ) {
+//    (void)name;
+//    return src;
+//  }
+//
+//  // Create a mirror view and deep_copy in a new space (specialization for
+//  different space) template<class Space, class T, class ... P> typename
+//  Kokkos::Experimental::Impl::MirrorViewType<Space,T,P ...>::view_type
+//  create_mirror_view_and_copy(const Space& , const
+//  Kokkos::Experimental::OffsetView<T,P...> & src
+//                              , std::string const& name = ""
+//                                  , typename
+//                                  std::enable_if<!Impl::MirrorViewType<Space,T,P
+//                                  ...>::is_same_memspace>::type* = 0 ) {
+//    using Mirror = typename
+//    Kokkos::Experimental::Impl::MirrorViewType<Space,T,P ...>::view_type;
+//    std::string label = name.empty() ? src.label() : name;
+//    auto mirror = Mirror(ViewAllocateWithoutInitializing(label), src.layout(),
+//                         { src.begin(0), src.begin(1), src.begin(2),
+//                         src.begin(3), src.begin(4),
+//                             src.begin(5), src.begin(6), src.begin(7) });
+//    deep_copy(mirror, src);
+//    return mirror;
+//  }
 
-      // Create a mirror in a new space (specialization for different space)
-      template<class Space, class T, class ... P>
-      typename Kokkos::Experimental::Impl::MirrorOffsetType<Space,T,P ...>::view_type
-      create_mirror(const Space& , const Kokkos::Experimental::OffsetView<T,P...> & src) {
-         return typename Kokkos::Experimental::Impl::MirrorOffsetType<Space,T,P ...>::view_type(src.label(),src.layout(),
-               { src.begin(0), src.begin(1), src.begin(2), src.begin(3), src.begin(4),
-                     src.begin(5), src.begin(6), src.begin(7) } );
-      }
-
-
-      template< class T , class ... P >
-      inline
-      typename Kokkos::Experimental::OffsetView< T, P... >::HostMirror
-      create_mirror_view( const typename Kokkos::Experimental::OffsetView< T,P... > & src
-            , typename std::enable_if<(
-                  std::is_same< typename Kokkos::Experimental::OffsetView<T,P...>::memory_space
-                  , typename Kokkos::Experimental::OffsetView<T,P...>::HostMirror::memory_space
-                  >::value
-                  &&
-                  std::is_same< typename Kokkos::Experimental::OffsetView<T,P...>::data_type
-                  , typename Kokkos::Experimental::OffsetView<T,P...>::HostMirror::data_type
-                  >::value
-            )>::type * = 0
-      )
-      {
-         return src ;
-      }
-
-      template< class T , class ... P >
-      inline
-      typename Kokkos::Experimental::OffsetView<T,P...>::HostMirror
-      create_mirror_view( const Kokkos::Experimental::OffsetView<T,P...> & src
-            , typename std::enable_if< ! (
-                  std::is_same< typename Kokkos::Experimental::OffsetView<T,P...>::memory_space
-                  , typename Kokkos::Experimental::OffsetView<T,P...>::HostMirror::memory_space
-                  >::value
-                  &&
-                  std::is_same< typename Kokkos::Experimental::OffsetView<T,P...>::data_type
-                  , typename Kokkos::Experimental::OffsetView<T,P...>::HostMirror::data_type
-                  >::value
-            )>::type * = 0
-      )
-      {
-	return Kokkos::Experimental::create_mirror( src );
-      }
-
-      // Create a mirror view in a new space (specialization for same space)
-      template<class Space, class T, class ... P>
-      typename Kokkos::Experimental::Impl::MirrorOffsetViewType<Space,T,P ...>::view_type
-      create_mirror_view(const Space& , const Kokkos::Experimental::OffsetView<T,P...> & src
-            , typename std::enable_if<Impl::MirrorOffsetViewType<Space,T,P ...>::is_same_memspace>::type* = 0 ) {
-         return src;
-      }
-
-      // Create a mirror view in a new space (specialization for different space)
-      template<class Space, class T, class ... P>
-      typename Kokkos::Experimental::Impl::MirrorOffsetViewType<Space,T,P ...>::view_type
-      create_mirror_view(const Space& , const Kokkos::Experimental::OffsetView<T,P...> & src
-            , typename std::enable_if<!Impl::MirrorOffsetViewType<Space,T,P ...>::is_same_memspace>::type* = 0 ) {
-         return typename Kokkos::Experimental::Impl::MirrorOffsetViewType<Space,T,P ...>::view_type(src.label(),src.layout(),
-               { src.begin(0), src.begin(1), src.begin(2), src.begin(3), src.begin(4),
-                     src.begin(5), src.begin(6), src.begin(7) } );
-      }
-      //
-      //  // Create a mirror view and deep_copy in a new space (specialization for same space)
-      //  template<class Space, class T, class ... P>
-      //  typename Kokkos::Experimental::Impl::MirrorViewType<Space,T,P ...>::view_type
-      //  create_mirror_view_and_copy(const Space& , const Kokkos::Experimental::OffsetView<T,P...> & src
-      //                              , std::string const& name = ""
-      //                                  , typename std::enable_if<Impl::MirrorViewType<Space,T,P ...>::is_same_memspace>::type* = 0 ) {
-      //    (void)name;
-      //    return src;
-      //  }
-      //
-      //  // Create a mirror view and deep_copy in a new space (specialization for different space)
-      //  template<class Space, class T, class ... P>
-      //  typename Kokkos::Experimental::Impl::MirrorViewType<Space,T,P ...>::view_type
-      //  create_mirror_view_and_copy(const Space& , const Kokkos::Experimental::OffsetView<T,P...> & src
-      //                              , std::string const& name = ""
-      //                                  , typename std::enable_if<!Impl::MirrorViewType<Space,T,P ...>::is_same_memspace>::type* = 0 ) {
-      //    using Mirror = typename Kokkos::Experimental::Impl::MirrorViewType<Space,T,P ...>::view_type;
-      //    std::string label = name.empty() ? src.label() : name;
-      //    auto mirror = Mirror(ViewAllocateWithoutInitializing(label), src.layout(),
-      //                         { src.begin(0), src.begin(1), src.begin(2), src.begin(3), src.begin(4),
-      //                             src.begin(5), src.begin(6), src.begin(7) });
-      //    deep_copy(mirror, src);
-      //    return mirror;
-      //  }
-
-   }
+}  // namespace Experimental
 } /* namespace Kokkos */
 
-
 //----------------------------------------------------------------------------
 //----------------------------------------------------------------------------
 
-
 #endif /* KOKKOS_OFFSETVIEW_HPP_ */
diff --git a/lib/kokkos/containers/src/Kokkos_ScatterView.hpp b/lib/kokkos/containers/src/Kokkos_ScatterView.hpp
index a8c05e3f36..ec3a966325 100644
--- a/lib/kokkos/containers/src/Kokkos_ScatterView.hpp
+++ b/lib/kokkos/containers/src/Kokkos_ScatterView.hpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -41,7 +42,6 @@
 //@HEADER
 */
 
-
 /// \file Kokkos_ScatterView.hpp
 /// \brief Declaration and definition of Kokkos::ScatterView.
 ///
@@ -69,17 +69,12 @@ enum : int {
   ScatterMin,
 };
 
-enum : int {
-  ScatterNonDuplicated = 0,
-  ScatterDuplicated    = 1
-};
+enum : int { ScatterNonDuplicated = 0, ScatterDuplicated = 1 };
 
-enum : int {
-  ScatterNonAtomic = 0,
-  ScatterAtomic    = 1
-};
+enum : int { ScatterNonAtomic = 0, ScatterAtomic = 1 };
 
-}} // Kokkos::Experimental
+}  // namespace Experimental
+}  // namespace Kokkos
 
 namespace Kokkos {
 namespace Impl {
@@ -97,11 +92,13 @@ struct DefaultDuplication<Kokkos::Serial> {
   enum : int { value = Kokkos::Experimental::ScatterNonDuplicated };
 };
 template <>
-struct DefaultContribution<Kokkos::Serial, Kokkos::Experimental::ScatterNonDuplicated> {
+struct DefaultContribution<Kokkos::Serial,
+                           Kokkos::Experimental::ScatterNonDuplicated> {
   enum : int { value = Kokkos::Experimental::ScatterNonAtomic };
 };
 template <>
-struct DefaultContribution<Kokkos::Serial, Kokkos::Experimental::ScatterDuplicated> {
+struct DefaultContribution<Kokkos::Serial,
+                           Kokkos::Experimental::ScatterDuplicated> {
   enum : int { value = Kokkos::Experimental::ScatterNonAtomic };
 };
 #endif
@@ -112,11 +109,13 @@ struct DefaultDuplication<Kokkos::OpenMP> {
   enum : int { value = Kokkos::Experimental::ScatterDuplicated };
 };
 template <>
-struct DefaultContribution<Kokkos::OpenMP, Kokkos::Experimental::ScatterNonDuplicated> {
+struct DefaultContribution<Kokkos::OpenMP,
+                           Kokkos::Experimental::ScatterNonDuplicated> {
   enum : int { value = Kokkos::Experimental::ScatterAtomic };
 };
 template <>
-struct DefaultContribution<Kokkos::OpenMP, Kokkos::Experimental::ScatterDuplicated> {
+struct DefaultContribution<Kokkos::OpenMP,
+                           Kokkos::Experimental::ScatterDuplicated> {
   enum : int { value = Kokkos::Experimental::ScatterNonAtomic };
 };
 #endif
@@ -127,11 +126,13 @@ struct DefaultDuplication<Kokkos::Experimental::HPX> {
   enum : int { value = Kokkos::Experimental::ScatterDuplicated };
 };
 template <>
-struct DefaultContribution<Kokkos::Experimental::HPX, Kokkos::Experimental::ScatterNonDuplicated> {
+struct DefaultContribution<Kokkos::Experimental::HPX,
+                           Kokkos::Experimental::ScatterNonDuplicated> {
   enum : int { value = Kokkos::Experimental::ScatterAtomic };
 };
 template <>
-struct DefaultContribution<Kokkos::Experimental::HPX, Kokkos::Experimental::ScatterDuplicated> {
+struct DefaultContribution<Kokkos::Experimental::HPX,
+                           Kokkos::Experimental::ScatterDuplicated> {
   enum : int { value = Kokkos::Experimental::ScatterNonAtomic };
 };
 #endif
@@ -142,11 +143,13 @@ struct DefaultDuplication<Kokkos::Threads> {
   enum : int { value = Kokkos::Experimental::ScatterDuplicated };
 };
 template <>
-struct DefaultContribution<Kokkos::Threads, Kokkos::Experimental::ScatterNonDuplicated> {
+struct DefaultContribution<Kokkos::Threads,
+                           Kokkos::Experimental::ScatterNonDuplicated> {
   enum : int { value = Kokkos::Experimental::ScatterAtomic };
 };
 template <>
-struct DefaultContribution<Kokkos::Threads, Kokkos::Experimental::ScatterDuplicated> {
+struct DefaultContribution<Kokkos::Threads,
+                           Kokkos::Experimental::ScatterDuplicated> {
   enum : int { value = Kokkos::Experimental::ScatterNonAtomic };
 };
 #endif
@@ -157,313 +160,313 @@ struct DefaultDuplication<Kokkos::Cuda> {
   enum : int { value = Kokkos::Experimental::ScatterNonDuplicated };
 };
 template <>
-struct DefaultContribution<Kokkos::Cuda, Kokkos::Experimental::ScatterNonDuplicated> {
+struct DefaultContribution<Kokkos::Cuda,
+                           Kokkos::Experimental::ScatterNonDuplicated> {
   enum : int { value = Kokkos::Experimental::ScatterAtomic };
 };
 template <>
-struct DefaultContribution<Kokkos::Cuda, Kokkos::Experimental::ScatterDuplicated> {
+struct DefaultContribution<Kokkos::Cuda,
+                           Kokkos::Experimental::ScatterDuplicated> {
   enum : int { value = Kokkos::Experimental::ScatterAtomic };
 };
 #endif
 
-/* ScatterValue <Op=ScatterSum, contribution=ScatterNonAtomic> is the object returned by the access operator() of ScatterAccess,
-   This class inherits from the Sum<> reducer and it wraps join(dest, src) with convenient operator+=, etc. 
-   Note the addition of update(ValueType const& rhs) and reset()  so that all reducers can have common functions
-   See ReduceDuplicates and ResetDuplicates ) */
+/* ScatterValue <Op=ScatterSum, contribution=ScatterNonAtomic> is the object
+   returned by the access operator() of ScatterAccess, This class inherits from
+   the Sum<> reducer and it wraps join(dest, src) with convenient operator+=,
+   etc. Note the addition of update(ValueType const& rhs) and reset()  so that
+   all reducers can have common functions See ReduceDuplicates and
+   ResetDuplicates ) */
 template <typename ValueType, int Op, int contribution>
 struct ScatterValue;
 
 template <typename ValueType>
-struct ScatterValue<ValueType, Kokkos::Experimental::ScatterSum, Kokkos::Experimental::ScatterNonAtomic> :
-  Sum<ValueType,Kokkos::DefaultExecutionSpace> {
-  public:
-    KOKKOS_FORCEINLINE_FUNCTION ScatterValue(ValueType& value_in) : 
-       Sum<ValueType,Kokkos::DefaultExecutionSpace>(value_in)
-    {}
-    KOKKOS_FORCEINLINE_FUNCTION ScatterValue(ScatterValue&& other) : 
-       Sum<ValueType,Kokkos::DefaultExecutionSpace>(other.reference())
-    {}
-    KOKKOS_FORCEINLINE_FUNCTION void operator+=(ValueType const& rhs) {
-      this->join( this->reference(), rhs );
-    }
-    KOKKOS_FORCEINLINE_FUNCTION void operator-=(ValueType const& rhs) {
-      this->join( this->reference(), -rhs );
-    }
-    KOKKOS_FORCEINLINE_FUNCTION void update(ValueType const& rhs) {
-      this->join( this->reference(), rhs );
-    }
-    KOKKOS_FORCEINLINE_FUNCTION void reset() {
-      this->init( this->reference() );
-    }
+struct ScatterValue<ValueType, Kokkos::Experimental::ScatterSum,
+                    Kokkos::Experimental::ScatterNonAtomic>
+    : Sum<ValueType, Kokkos::DefaultExecutionSpace> {
+ public:
+  KOKKOS_FORCEINLINE_FUNCTION ScatterValue(ValueType& value_in)
+      : Sum<ValueType, Kokkos::DefaultExecutionSpace>(value_in) {}
+  KOKKOS_FORCEINLINE_FUNCTION ScatterValue(ScatterValue&& other)
+      : Sum<ValueType, Kokkos::DefaultExecutionSpace>(other.reference()) {}
+  KOKKOS_FORCEINLINE_FUNCTION void operator+=(ValueType const& rhs) {
+    this->join(this->reference(), rhs);
+  }
+  KOKKOS_FORCEINLINE_FUNCTION void operator-=(ValueType const& rhs) {
+    this->join(this->reference(), -rhs);
+  }
+  KOKKOS_FORCEINLINE_FUNCTION void update(ValueType const& rhs) {
+    this->join(this->reference(), rhs);
+  }
+  KOKKOS_FORCEINLINE_FUNCTION void reset() { this->init(this->reference()); }
 };
 
-/* ScatterValue <Op=ScatterSum, contribution=ScatterAtomic> is the object returned by the access operator() 
- * of ScatterAccess, similar to that returned by an Atomic View, it wraps Kokkos::atomic_add with convenient
-   operator+=, etc. This version also has the update(rhs) and reset() functions. */
+/* ScatterValue <Op=ScatterSum, contribution=ScatterAtomic> is the object
+ returned by the access operator()
+ * of ScatterAccess, similar to that returned by an Atomic View, it wraps
+ Kokkos::atomic_add with convenient operator+=, etc. This version also has the
+ update(rhs) and reset() functions. */
 template <typename ValueType>
-struct ScatterValue<ValueType, Kokkos::Experimental::ScatterSum, Kokkos::Experimental::ScatterAtomic> :
-  Sum<ValueType,Kokkos::DefaultExecutionSpace> {
-  public:
-    KOKKOS_FORCEINLINE_FUNCTION ScatterValue(ValueType& value_in) : 
-       Sum<ValueType,Kokkos::DefaultExecutionSpace>(value_in)
-    {}
+struct ScatterValue<ValueType, Kokkos::Experimental::ScatterSum,
+                    Kokkos::Experimental::ScatterAtomic>
+    : Sum<ValueType, Kokkos::DefaultExecutionSpace> {
+ public:
+  KOKKOS_FORCEINLINE_FUNCTION ScatterValue(ValueType& value_in)
+      : Sum<ValueType, Kokkos::DefaultExecutionSpace>(value_in) {}
 
-    KOKKOS_FORCEINLINE_FUNCTION void operator+=(ValueType const& rhs) {
-     this->join(this->reference(), rhs);
-    }
-    KOKKOS_FORCEINLINE_FUNCTION void operator-=(ValueType const& rhs) {
-      this->join(this->reference(), -rhs);
-    }
-    
-    KOKKOS_INLINE_FUNCTION
-    void join(ValueType& dest, const ValueType& src)  const {
-      Kokkos::atomic_add(&dest, src);
-    }
+  KOKKOS_FORCEINLINE_FUNCTION void operator+=(ValueType const& rhs) {
+    this->join(this->reference(), rhs);
+  }
+  KOKKOS_FORCEINLINE_FUNCTION void operator-=(ValueType const& rhs) {
+    this->join(this->reference(), -rhs);
+  }
 
-    KOKKOS_INLINE_FUNCTION
-    void join(volatile ValueType& dest, const volatile ValueType& src) const {
-      Kokkos::atomic_add(&dest, src);
-    } 
+  KOKKOS_INLINE_FUNCTION
+  void join(ValueType& dest, const ValueType& src) const {
+    Kokkos::atomic_add(&dest, src);
+  }
 
-    KOKKOS_FORCEINLINE_FUNCTION void update(ValueType const& rhs) {
-      this->join( this->reference(), rhs );
-    }
+  KOKKOS_INLINE_FUNCTION
+  void join(volatile ValueType& dest, const volatile ValueType& src) const {
+    Kokkos::atomic_add(&dest, src);
+  }
 
-    KOKKOS_FORCEINLINE_FUNCTION void reset() {
-      this->init( this->reference() );
-    }
+  KOKKOS_FORCEINLINE_FUNCTION void update(ValueType const& rhs) {
+    this->join(this->reference(), rhs);
+  }
+
+  KOKKOS_FORCEINLINE_FUNCTION void reset() { this->init(this->reference()); }
 };
 
-/* ScatterValue <Op=ScatterProd, contribution=ScatterNonAtomic> is the object returned by the access operator() of ScatterAccess,
-   This class inherits from the Prod<> reducer and it wraps join(dest, src) with convenient operator*=, etc. 
-   Note the addition of update(ValueType const& rhs) and reset()  so that all reducers can have common functions
-   See ReduceDuplicates and ResetDuplicates ) */
+/* ScatterValue <Op=ScatterProd, contribution=ScatterNonAtomic> is the object
+   returned by the access operator() of ScatterAccess, This class inherits from
+   the Prod<> reducer and it wraps join(dest, src) with convenient operator*=,
+   etc. Note the addition of update(ValueType const& rhs) and reset()  so that
+   all reducers can have common functions See ReduceDuplicates and
+   ResetDuplicates ) */
 template <typename ValueType>
-struct ScatterValue<ValueType, Kokkos::Experimental::ScatterProd, Kokkos::Experimental::ScatterNonAtomic> :
-  Prod<ValueType,Kokkos::DefaultExecutionSpace> {
-  public:
-    KOKKOS_FORCEINLINE_FUNCTION ScatterValue(ValueType& value_in) : 
-       Prod<ValueType,Kokkos::DefaultExecutionSpace>(value_in)
-    {}
-    KOKKOS_FORCEINLINE_FUNCTION ScatterValue(ScatterValue&& other) : 
-       Prod<ValueType,Kokkos::DefaultExecutionSpace>(other.reference())
-    {}
-    KOKKOS_FORCEINLINE_FUNCTION void operator*=(ValueType const& rhs) {
-      this->join( this->reference(), rhs );
-    }
-    KOKKOS_FORCEINLINE_FUNCTION void operator/=(ValueType const& rhs) {
-      this->join( this->reference(), static_cast<ValueType>(1)/rhs );
-    }
-    KOKKOS_FORCEINLINE_FUNCTION void update(ValueType const& rhs) {
-      this->join( this->reference(), rhs );
-    }
-    KOKKOS_FORCEINLINE_FUNCTION void reset() {
-      this->init( this->reference() );
-    }
+struct ScatterValue<ValueType, Kokkos::Experimental::ScatterProd,
+                    Kokkos::Experimental::ScatterNonAtomic>
+    : Prod<ValueType, Kokkos::DefaultExecutionSpace> {
+ public:
+  KOKKOS_FORCEINLINE_FUNCTION ScatterValue(ValueType& value_in)
+      : Prod<ValueType, Kokkos::DefaultExecutionSpace>(value_in) {}
+  KOKKOS_FORCEINLINE_FUNCTION ScatterValue(ScatterValue&& other)
+      : Prod<ValueType, Kokkos::DefaultExecutionSpace>(other.reference()) {}
+  KOKKOS_FORCEINLINE_FUNCTION void operator*=(ValueType const& rhs) {
+    this->join(this->reference(), rhs);
+  }
+  KOKKOS_FORCEINLINE_FUNCTION void operator/=(ValueType const& rhs) {
+    this->join(this->reference(), static_cast<ValueType>(1) / rhs);
+  }
+  KOKKOS_FORCEINLINE_FUNCTION void update(ValueType const& rhs) {
+    this->join(this->reference(), rhs);
+  }
+  KOKKOS_FORCEINLINE_FUNCTION void reset() { this->init(this->reference()); }
 };
 
-/* ScatterValue <Op=ScatterProd, contribution=ScatterAtomic> is the object returned by the access operator() 
- * of ScatterAccess, similar to that returned by an Atomic View, it wraps and atomic_prod with convenient
-   operator*=, etc. atomic_prod uses the atomic_compare_exchange. This version also has the update(rhs) and reset() functions. */
+/* ScatterValue <Op=ScatterProd, contribution=ScatterAtomic> is the object
+ returned by the access operator()
+ * of ScatterAccess, similar to that returned by an Atomic View, it wraps and
+ atomic_prod with convenient operator*=, etc. atomic_prod uses the
+ atomic_compare_exchange. This version also has the update(rhs) and reset()
+ functions. */
 template <typename ValueType>
-struct ScatterValue<ValueType, Kokkos::Experimental::ScatterProd, Kokkos::Experimental::ScatterAtomic> :
-  Prod<ValueType,Kokkos::DefaultExecutionSpace> {
-  public:
-    KOKKOS_FORCEINLINE_FUNCTION ScatterValue(ValueType& value_in) : 
-       Prod<ValueType,Kokkos::DefaultExecutionSpace>(value_in)
-    {}
+struct ScatterValue<ValueType, Kokkos::Experimental::ScatterProd,
+                    Kokkos::Experimental::ScatterAtomic>
+    : Prod<ValueType, Kokkos::DefaultExecutionSpace> {
+ public:
+  KOKKOS_FORCEINLINE_FUNCTION ScatterValue(ValueType& value_in)
+      : Prod<ValueType, Kokkos::DefaultExecutionSpace>(value_in) {}
 
-    KOKKOS_FORCEINLINE_FUNCTION void operator*=(ValueType const& rhs) {
-     this->join(this->reference(), rhs);
-    }
-    KOKKOS_FORCEINLINE_FUNCTION void operator/=(ValueType const& rhs) {
-      this->join(this->reference(), static_cast<ValueType>(1)/rhs);
-    }
+  KOKKOS_FORCEINLINE_FUNCTION void operator*=(ValueType const& rhs) {
+    this->join(this->reference(), rhs);
+  }
+  KOKKOS_FORCEINLINE_FUNCTION void operator/=(ValueType const& rhs) {
+    this->join(this->reference(), static_cast<ValueType>(1) / rhs);
+  }
 
-    KOKKOS_FORCEINLINE_FUNCTION 
-    void atomic_prod(ValueType & dest, const ValueType& src) const {
-
-        bool success = false;
-        while(!success) {
-            ValueType dest_old = dest;
-            ValueType dest_new = dest_old * src;
-            dest_new = Kokkos::atomic_compare_exchange<ValueType>(&dest,dest_old,dest_new);
-            success = ( (dest_new - dest_old)/dest_old <= 1e-15 );
-        }
-    }
-    
-    KOKKOS_INLINE_FUNCTION
-    void join(ValueType& dest, const ValueType& src)  const {
-      atomic_prod(dest, src);
+  KOKKOS_FORCEINLINE_FUNCTION
+  void atomic_prod(ValueType& dest, const ValueType& src) const {
+    bool success = false;
+    while (!success) {
+      ValueType dest_old = dest;
+      ValueType dest_new = dest_old * src;
+      dest_new =
+          Kokkos::atomic_compare_exchange<ValueType>(&dest, dest_old, dest_new);
+      success = ((dest_new - dest_old) / dest_old <= 1e-15);
     }
+  }
 
-    KOKKOS_INLINE_FUNCTION
-    void join(volatile ValueType& dest, const volatile ValueType& src) const {
-      atomic_prod(dest, src);
-    } 
+  KOKKOS_INLINE_FUNCTION
+  void join(ValueType& dest, const ValueType& src) const {
+    atomic_prod(dest, src);
+  }
 
-    KOKKOS_FORCEINLINE_FUNCTION void update(ValueType const& rhs) {
-      this->join( this->reference(), rhs );
-    }
-    KOKKOS_FORCEINLINE_FUNCTION void reset() {
-      this->init( this->reference() );
-    }
+  KOKKOS_INLINE_FUNCTION
+  void join(volatile ValueType& dest, const volatile ValueType& src) const {
+    atomic_prod(dest, src);
+  }
 
+  KOKKOS_FORCEINLINE_FUNCTION void update(ValueType const& rhs) {
+    this->join(this->reference(), rhs);
+  }
+  KOKKOS_FORCEINLINE_FUNCTION void reset() { this->init(this->reference()); }
 };
 
-/* ScatterValue <Op=ScatterMin, contribution=ScatterNonAtomic> is the object returned by the access operator() of ScatterAccess,
-   This class inherits from the Min<> reducer and it wraps join(dest, src) with convenient update(rhs). 
-   Note the addition of update(ValueType const& rhs) and reset() are so that all reducers can have a common update function
-   See ReduceDuplicates and ResetDuplicates ) */
+/* ScatterValue <Op=ScatterMin, contribution=ScatterNonAtomic> is the object
+   returned by the access operator() of ScatterAccess, This class inherits from
+   the Min<> reducer and it wraps join(dest, src) with convenient update(rhs).
+   Note the addition of update(ValueType const& rhs) and reset() are so that all
+   reducers can have a common update function See ReduceDuplicates and
+   ResetDuplicates ) */
 template <typename ValueType>
-struct ScatterValue<ValueType, Kokkos::Experimental::ScatterMin, Kokkos::Experimental::ScatterNonAtomic> :
-  Min<ValueType,Kokkos::DefaultExecutionSpace> {
-  public:
-    KOKKOS_FORCEINLINE_FUNCTION ScatterValue(ValueType& value_in) : 
-       Min<ValueType,Kokkos::DefaultExecutionSpace>(value_in)
-    {}
-    KOKKOS_FORCEINLINE_FUNCTION ScatterValue(ScatterValue&& other) : 
-       Min<ValueType,Kokkos::DefaultExecutionSpace>(other.reference())
-    {}
-    KOKKOS_FORCEINLINE_FUNCTION void update(ValueType const& rhs) {
-      this->join( this->reference(), rhs );
-    }
-    KOKKOS_FORCEINLINE_FUNCTION void reset() {
-      this->init( this->reference() );
-    }
+struct ScatterValue<ValueType, Kokkos::Experimental::ScatterMin,
+                    Kokkos::Experimental::ScatterNonAtomic>
+    : Min<ValueType, Kokkos::DefaultExecutionSpace> {
+ public:
+  KOKKOS_FORCEINLINE_FUNCTION ScatterValue(ValueType& value_in)
+      : Min<ValueType, Kokkos::DefaultExecutionSpace>(value_in) {}
+  KOKKOS_FORCEINLINE_FUNCTION ScatterValue(ScatterValue&& other)
+      : Min<ValueType, Kokkos::DefaultExecutionSpace>(other.reference()) {}
+  KOKKOS_FORCEINLINE_FUNCTION void update(ValueType const& rhs) {
+    this->join(this->reference(), rhs);
+  }
+  KOKKOS_FORCEINLINE_FUNCTION void reset() { this->init(this->reference()); }
 };
 
-/* ScatterValue <Op=ScatterMin, contribution=ScatterAtomic> is the object returned by the access operator() 
- * of ScatterAccess, similar to that returned by an Atomic View, it wraps and atomic_min with the update(rhs)
-   function. atomic_min uses the atomic_compare_exchange. This version also has the reset() function */
+/* ScatterValue <Op=ScatterMin, contribution=ScatterAtomic> is the object
+ returned by the access operator()
+ * of ScatterAccess, similar to that returned by an Atomic View, it wraps and
+ atomic_min with the update(rhs) function. atomic_min uses the
+ atomic_compare_exchange. This version also has the reset() function */
 template <typename ValueType>
-struct ScatterValue<ValueType, Kokkos::Experimental::ScatterMin, Kokkos::Experimental::ScatterAtomic> :
-  Min<ValueType,Kokkos::DefaultExecutionSpace> {
-  public:
-    KOKKOS_FORCEINLINE_FUNCTION ScatterValue(ValueType& value_in) : 
-       Min<ValueType,Kokkos::DefaultExecutionSpace>(value_in)
-    {}
+struct ScatterValue<ValueType, Kokkos::Experimental::ScatterMin,
+                    Kokkos::Experimental::ScatterAtomic>
+    : Min<ValueType, Kokkos::DefaultExecutionSpace> {
+ public:
+  KOKKOS_FORCEINLINE_FUNCTION ScatterValue(ValueType& value_in)
+      : Min<ValueType, Kokkos::DefaultExecutionSpace>(value_in) {}
 
-    KOKKOS_FORCEINLINE_FUNCTION 
-    void atomic_min(ValueType & dest, const ValueType& src) const {
-
-        bool success = false;
-        while(!success) {
-            ValueType dest_old = dest;
-            ValueType dest_new = ( dest_old > src ) ? src : dest_old;
-            dest_new = Kokkos::atomic_compare_exchange<ValueType>(&dest,dest_old,dest_new);
-            success = ( (dest_new - dest_old)/dest_old <= 1e-15 );
-        }
-    }
-    
-    KOKKOS_INLINE_FUNCTION
-    void join(ValueType& dest, const ValueType& src)  const {
-      atomic_min(dest, src);
+  KOKKOS_FORCEINLINE_FUNCTION
+  void atomic_min(ValueType& dest, const ValueType& src) const {
+    bool success = false;
+    while (!success) {
+      ValueType dest_old = dest;
+      ValueType dest_new = (dest_old > src) ? src : dest_old;
+      dest_new =
+          Kokkos::atomic_compare_exchange<ValueType>(&dest, dest_old, dest_new);
+      success = ((dest_new - dest_old) / dest_old <= 1e-15);
     }
+  }
 
-    KOKKOS_INLINE_FUNCTION
-    void join(volatile ValueType& dest, const volatile ValueType& src) const {
-      atomic_min(dest, src);
-    } 
+  KOKKOS_INLINE_FUNCTION
+  void join(ValueType& dest, const ValueType& src) const {
+    atomic_min(dest, src);
+  }
 
-    KOKKOS_FORCEINLINE_FUNCTION void update(ValueType const& rhs) {
-      this->join( this->reference(), rhs );
-    }
-    KOKKOS_FORCEINLINE_FUNCTION void reset() {
-      this->init( this->reference() );
-    }
+  KOKKOS_INLINE_FUNCTION
+  void join(volatile ValueType& dest, const volatile ValueType& src) const {
+    atomic_min(dest, src);
+  }
 
+  KOKKOS_FORCEINLINE_FUNCTION void update(ValueType const& rhs) {
+    this->join(this->reference(), rhs);
+  }
+  KOKKOS_FORCEINLINE_FUNCTION void reset() { this->init(this->reference()); }
 };
 
-/* ScatterValue <Op=ScatterMax, contribution=ScatterNonAtomic> is the object returned by the access operataor() of ScatterAccess,
-   This class inherits from the Max<> reducer and it wraps join(dest, src) with convenient update(rhs). 
-   Note the addition of update(ValueType const& rhs) and reset() are so that all reducers can have a common update function
-   See ReduceDuplicates and ResetDuplicates ) */
+/* ScatterValue <Op=ScatterMax, contribution=ScatterNonAtomic> is the object
+   returned by the access operataor() of ScatterAccess, This class inherits from
+   the Max<> reducer and it wraps join(dest, src) with convenient update(rhs).
+   Note the addition of update(ValueType const& rhs) and reset() are so that all
+   reducers can have a common update function See ReduceDuplicates and
+   ResetDuplicates ) */
 template <typename ValueType>
-struct ScatterValue<ValueType, Kokkos::Experimental::ScatterMax, Kokkos::Experimental::ScatterNonAtomic> :
-  Max<ValueType,Kokkos::DefaultExecutionSpace> {
-  public:
-    KOKKOS_FORCEINLINE_FUNCTION ScatterValue(ValueType& value_in) : 
-       Max<ValueType,Kokkos::DefaultExecutionSpace>(value_in)
-    {}
-    KOKKOS_FORCEINLINE_FUNCTION ScatterValue(ScatterValue&& other) : 
-       Max<ValueType,Kokkos::DefaultExecutionSpace>(other.reference())
-    {}
-    KOKKOS_FORCEINLINE_FUNCTION void update(ValueType const& rhs) {
-      this->join( this->reference(), rhs );
-    }
-    KOKKOS_FORCEINLINE_FUNCTION void reset() {
-      this->init( this->reference() );
-    }
+struct ScatterValue<ValueType, Kokkos::Experimental::ScatterMax,
+                    Kokkos::Experimental::ScatterNonAtomic>
+    : Max<ValueType, Kokkos::DefaultExecutionSpace> {
+ public:
+  KOKKOS_FORCEINLINE_FUNCTION ScatterValue(ValueType& value_in)
+      : Max<ValueType, Kokkos::DefaultExecutionSpace>(value_in) {}
+  KOKKOS_FORCEINLINE_FUNCTION ScatterValue(ScatterValue&& other)
+      : Max<ValueType, Kokkos::DefaultExecutionSpace>(other.reference()) {}
+  KOKKOS_FORCEINLINE_FUNCTION void update(ValueType const& rhs) {
+    this->join(this->reference(), rhs);
+  }
+  KOKKOS_FORCEINLINE_FUNCTION void reset() { this->init(this->reference()); }
 };
 
-/* ScatterValue <Op=ScatterMax, contribution=ScatterAtomic> is the object returned by the access operator() 
- * of ScatterAccess, similar to that returned by an Atomic View, it wraps and atomic_max with the update(rhs)
-   function. atomic_max uses the atomic_compare_exchange. This version also has the reset() function  */
+/* ScatterValue <Op=ScatterMax, contribution=ScatterAtomic> is the object
+ returned by the access operator()
+ * of ScatterAccess, similar to that returned by an Atomic View, it wraps and
+ atomic_max with the update(rhs) function. atomic_max uses the
+ atomic_compare_exchange. This version also has the reset() function  */
 template <typename ValueType>
-struct ScatterValue<ValueType, Kokkos::Experimental::ScatterMax, Kokkos::Experimental::ScatterAtomic> :
-  Max<ValueType,Kokkos::DefaultExecutionSpace> {
-  public:
-    KOKKOS_FORCEINLINE_FUNCTION ScatterValue(ValueType& value_in) : 
-       Max<ValueType,Kokkos::DefaultExecutionSpace>(value_in)
-    {}
+struct ScatterValue<ValueType, Kokkos::Experimental::ScatterMax,
+                    Kokkos::Experimental::ScatterAtomic>
+    : Max<ValueType, Kokkos::DefaultExecutionSpace> {
+ public:
+  KOKKOS_FORCEINLINE_FUNCTION ScatterValue(ValueType& value_in)
+      : Max<ValueType, Kokkos::DefaultExecutionSpace>(value_in) {}
 
-    KOKKOS_FORCEINLINE_FUNCTION 
-    void atomic_max(ValueType & dest, const ValueType& src) const {
-
-        bool success = false;
-        while(!success) {
-            ValueType dest_old = dest;
-            ValueType dest_new = ( dest_old < src ) ? src : dest_old;
-            dest_new = Kokkos::atomic_compare_exchange<ValueType>(&dest,dest_old,dest_new);
-            success = ( (dest_new - dest_old)/dest_old <= 1e-15 );
-        }
-    }
-    
-    KOKKOS_INLINE_FUNCTION
-    void join(ValueType& dest, const ValueType& src)  const {
-      atomic_max(dest, src);
+  KOKKOS_FORCEINLINE_FUNCTION
+  void atomic_max(ValueType& dest, const ValueType& src) const {
+    bool success = false;
+    while (!success) {
+      ValueType dest_old = dest;
+      ValueType dest_new = (dest_old < src) ? src : dest_old;
+      dest_new =
+          Kokkos::atomic_compare_exchange<ValueType>(&dest, dest_old, dest_new);
+      success = ((dest_new - dest_old) / dest_old <= 1e-15);
     }
+  }
 
-    KOKKOS_INLINE_FUNCTION
-    void join(volatile ValueType& dest, const volatile ValueType& src) const {
-      atomic_max(dest, src);
-    } 
+  KOKKOS_INLINE_FUNCTION
+  void join(ValueType& dest, const ValueType& src) const {
+    atomic_max(dest, src);
+  }
 
-    KOKKOS_FORCEINLINE_FUNCTION void update(ValueType const& rhs) {
-      this->join( this->reference(), rhs );
-    }
-    KOKKOS_FORCEINLINE_FUNCTION void reset() {
-      this->init( this->reference() );
-    }
+  KOKKOS_INLINE_FUNCTION
+  void join(volatile ValueType& dest, const volatile ValueType& src) const {
+    atomic_max(dest, src);
+  }
 
+  KOKKOS_FORCEINLINE_FUNCTION void update(ValueType const& rhs) {
+    this->join(this->reference(), rhs);
+  }
+  KOKKOS_FORCEINLINE_FUNCTION void reset() { this->init(this->reference()); }
 };
 
 /* DuplicatedDataType, given a View DataType, will create a new DataType
    that has a new runtime dimension which becomes the largest-stride dimension.
-   In the case of LayoutLeft, due to the limitation induced by the design of DataType
-   itself, it must convert any existing compile-time dimensions into runtime dimensions. */
+   In the case of LayoutLeft, due to the limitation induced by the design of
+   DataType itself, it must convert any existing compile-time dimensions into
+   runtime dimensions. */
 template <typename T, typename Layout>
 struct DuplicatedDataType;
 
 template <typename T>
 struct DuplicatedDataType<T, Kokkos::LayoutRight> {
-  typedef T* value_type; // For LayoutRight, add a star all the way on the left
+  typedef T* value_type;  // For LayoutRight, add a star all the way on the left
 };
 
 template <typename T, size_t N>
 struct DuplicatedDataType<T[N], Kokkos::LayoutRight> {
-  typedef typename DuplicatedDataType<T, Kokkos::LayoutRight>::value_type value_type[N];
+  typedef typename DuplicatedDataType<T, Kokkos::LayoutRight>::value_type
+      value_type[N];
 };
 
 template <typename T>
 struct DuplicatedDataType<T[], Kokkos::LayoutRight> {
-  typedef typename DuplicatedDataType<T, Kokkos::LayoutRight>::value_type value_type[];
+  typedef typename DuplicatedDataType<T, Kokkos::LayoutRight>::value_type
+      value_type[];
 };
 
 template <typename T>
 struct DuplicatedDataType<T*, Kokkos::LayoutRight> {
-  typedef typename DuplicatedDataType<T, Kokkos::LayoutRight>::value_type* value_type;
+  typedef typename DuplicatedDataType<T, Kokkos::LayoutRight>::value_type*
+      value_type;
 };
 
 template <typename T>
@@ -473,69 +476,63 @@ struct DuplicatedDataType<T, Kokkos::LayoutLeft> {
 
 template <typename T, size_t N>
 struct DuplicatedDataType<T[N], Kokkos::LayoutLeft> {
-  typedef typename DuplicatedDataType<T, Kokkos::LayoutLeft>::value_type* value_type;
+  typedef typename DuplicatedDataType<T, Kokkos::LayoutLeft>::value_type*
+      value_type;
 };
 
 template <typename T>
 struct DuplicatedDataType<T[], Kokkos::LayoutLeft> {
-  typedef typename DuplicatedDataType<T, Kokkos::LayoutLeft>::value_type* value_type;
+  typedef typename DuplicatedDataType<T, Kokkos::LayoutLeft>::value_type*
+      value_type;
 };
 
 template <typename T>
 struct DuplicatedDataType<T*, Kokkos::LayoutLeft> {
-  typedef typename DuplicatedDataType<T, Kokkos::LayoutLeft>::value_type* value_type;
+  typedef typename DuplicatedDataType<T, Kokkos::LayoutLeft>::value_type*
+      value_type;
 };
 
 /* Insert integer argument pack into array */
 
-template<class T>
+template <class T>
 void args_to_array(size_t* array, int pos, T dim0) {
   array[pos] = dim0;
 }
-template<class T, class ... Dims>
-void args_to_array(size_t* array, int pos, T dim0, Dims ... dims) {
+template <class T, class... Dims>
+void args_to_array(size_t* array, int pos, T dim0, Dims... dims) {
   array[pos] = dim0;
-  args_to_array(array,pos+1,dims...);
+  args_to_array(array, pos + 1, dims...);
 }
 
 /* Slice is just responsible for stuffing the correct number of Kokkos::ALL
    arguments on the correct side of the index in a call to subview() to get a
    subview where the index specified is the largest-stride one. */
-template <typename Layout, int rank, typename V, typename ... Args>
+template <typename Layout, int rank, typename V, typename... Args>
 struct Slice {
   typedef Slice<Layout, rank - 1, V, Kokkos::Impl::ALL_t, Args...> next;
   typedef typename next::value_type value_type;
 
-  static
-  value_type get(V const& src, const size_t i, Args ... args) {
+  static value_type get(V const& src, const size_t i, Args... args) {
     return next::get(src, i, Kokkos::ALL, args...);
   }
 };
 
-template <typename V, typename ... Args>
+template <typename V, typename... Args>
 struct Slice<Kokkos::LayoutRight, 1, V, Args...> {
-  typedef typename Kokkos::Impl::ViewMapping
-                          < void
-                          , V
-                          , const size_t
-                          , Args ...
-                          >::type value_type;
-  static
-  value_type get(V const& src, const size_t i, Args ... args) {
+  typedef
+      typename Kokkos::Impl::ViewMapping<void, V, const size_t, Args...>::type
+          value_type;
+  static value_type get(V const& src, const size_t i, Args... args) {
     return Kokkos::subview(src, i, args...);
   }
 };
 
-template <typename V, typename ... Args>
+template <typename V, typename... Args>
 struct Slice<Kokkos::LayoutLeft, 1, V, Args...> {
-  typedef typename Kokkos::Impl::ViewMapping
-                          < void
-                          , V
-                          , Args ...
-                          , const size_t
-                          >::type value_type;
-  static
-  value_type get(V const& src, const size_t i, Args ... args) {
+  typedef
+      typename Kokkos::Impl::ViewMapping<void, V, Args..., const size_t>::type
+          value_type;
+  static value_type get(V const& src, const size_t i, Args... args) {
     return Kokkos::subview(src, args..., i);
   }
 };
@@ -551,51 +548,49 @@ struct ReduceDuplicatesBase {
   size_t stride;
   size_t start;
   size_t n;
-  ReduceDuplicatesBase(ValueType const* src_in, ValueType* dest_in, size_t stride_in, size_t start_in, size_t n_in, std::string const& name)
-    : src(src_in)
-    , dst(dest_in)
-    , stride(stride_in)
-    , start(start_in)
-    , n(n_in)
-  {
+  ReduceDuplicatesBase(ValueType const* src_in, ValueType* dest_in,
+                       size_t stride_in, size_t start_in, size_t n_in,
+                       std::string const& name)
+      : src(src_in), dst(dest_in), stride(stride_in), start(start_in), n(n_in) {
 #if defined(KOKKOS_ENABLE_PROFILING)
     uint64_t kpID = 0;
-    if(Kokkos::Profiling::profileLibraryLoaded()) {
-      Kokkos::Profiling::beginParallelFor(std::string("reduce_") + name, 0, &kpID);
+    if (Kokkos::Profiling::profileLibraryLoaded()) {
+      Kokkos::Profiling::beginParallelFor(std::string("reduce_") + name, 0,
+                                          &kpID);
     }
 #endif
     typedef RangePolicy<ExecSpace, size_t> policy_type;
     typedef Kokkos::Impl::ParallelFor<Derived, policy_type> closure_type;
-    const closure_type closure(*(static_cast<Derived*>(this)), policy_type(0, stride));
+    const closure_type closure(*(static_cast<Derived*>(this)),
+                               policy_type(0, stride));
     closure.execute();
 #if defined(KOKKOS_ENABLE_PROFILING)
-    if(Kokkos::Profiling::profileLibraryLoaded()) {
+    if (Kokkos::Profiling::profileLibraryLoaded()) {
       Kokkos::Profiling::endParallelFor(kpID);
     }
 #endif
   }
 };
 
-/* ReduceDuplicates -- Perform reduction on destination array using strided source 
- *    Use ScatterValue<> specific to operation to wrap destination array so that
- *    the reduction operation can be accessed via the update(rhs) function */
+/* ReduceDuplicates -- Perform reduction on destination array using strided
+ * source Use ScatterValue<> specific to operation to wrap destination array so
+ * that the reduction operation can be accessed via the update(rhs) function */
 template <typename ExecSpace, typename ValueType, int Op>
-struct ReduceDuplicates :
-  public ReduceDuplicatesBase<ExecSpace, ValueType, Op>
-{
+struct ReduceDuplicates
+    : public ReduceDuplicatesBase<ExecSpace, ValueType, Op> {
   typedef ReduceDuplicatesBase<ExecSpace, ValueType, Op> Base;
-  ReduceDuplicates(ValueType const* src_in, ValueType* dst_in, size_t stride_in, size_t start_in, size_t n_in, std::string const& name):
-    Base(src_in, dst_in, stride_in, start_in, n_in, name)
-  {}
+  ReduceDuplicates(ValueType const* src_in, ValueType* dst_in, size_t stride_in,
+                   size_t start_in, size_t n_in, std::string const& name)
+      : Base(src_in, dst_in, stride_in, start_in, n_in, name) {}
   KOKKOS_FORCEINLINE_FUNCTION void operator()(size_t i) const {
     for (size_t j = Base::start; j < Base::n; ++j) {
-      ScatterValue<ValueType, Op, Kokkos::Experimental::ScatterNonAtomic> sv(Base::dst[i]);
-      sv.update( Base::src[i + Base::stride * j] );
+      ScatterValue<ValueType, Op, Kokkos::Experimental::ScatterNonAtomic> sv(
+          Base::dst[i]);
+      sv.update(Base::src[i + Base::stride * j]);
     }
   }
 };
 
-
 template <typename ExecSpace, typename ValueType, int Op>
 struct ResetDuplicates;
 
@@ -603,21 +598,23 @@ template <typename ExecSpace, typename ValueType, int Op>
 struct ResetDuplicatesBase {
   typedef ResetDuplicates<ExecSpace, ValueType, Op> Derived;
   ValueType* data;
-  ResetDuplicatesBase(ValueType* data_in, size_t size_in, std::string const& name)
-    : data(data_in)
-  {
+  ResetDuplicatesBase(ValueType* data_in, size_t size_in,
+                      std::string const& name)
+      : data(data_in) {
 #if defined(KOKKOS_ENABLE_PROFILING)
     uint64_t kpID = 0;
-    if(Kokkos::Profiling::profileLibraryLoaded()) {
-      Kokkos::Profiling::beginParallelFor(std::string("reduce_") + name, 0, &kpID);
+    if (Kokkos::Profiling::profileLibraryLoaded()) {
+      Kokkos::Profiling::beginParallelFor(std::string("reduce_") + name, 0,
+                                          &kpID);
     }
 #endif
     typedef RangePolicy<ExecSpace, size_t> policy_type;
     typedef Kokkos::Impl::ParallelFor<Derived, policy_type> closure_type;
-    const closure_type closure(*(static_cast<Derived*>(this)), policy_type(0, size_in));
+    const closure_type closure(*(static_cast<Derived*>(this)),
+                               policy_type(0, size_in));
     closure.execute();
 #if defined(KOKKOS_ENABLE_PROFILING)
-    if(Kokkos::Profiling::profileLibraryLoaded()) {
+    if (Kokkos::Profiling::profileLibraryLoaded()) {
       Kokkos::Profiling::endParallelFor(kpID);
     }
 #endif
@@ -628,606 +625,599 @@ struct ResetDuplicatesBase {
  *    Use ScatterValue<> specific to operation to wrap destination array so that
  *    the reset operation can be accessed via the reset() function */
 template <typename ExecSpace, typename ValueType, int Op>
-struct ResetDuplicates :
-  public ResetDuplicatesBase<ExecSpace, ValueType, Op>
-{
+struct ResetDuplicates : public ResetDuplicatesBase<ExecSpace, ValueType, Op> {
   typedef ResetDuplicatesBase<ExecSpace, ValueType, Op> Base;
-  ResetDuplicates(ValueType* data_in, size_t size_in, std::string const& name):
-    Base(data_in, size_in, name)
-  {}
+  ResetDuplicates(ValueType* data_in, size_t size_in, std::string const& name)
+      : Base(data_in, size_in, name) {}
   KOKKOS_FORCEINLINE_FUNCTION void operator()(size_t i) const {
-    ScatterValue<ValueType, Op, Kokkos::Experimental::ScatterNonAtomic> sv(Base::data[i]);
+    ScatterValue<ValueType, Op, Kokkos::Experimental::ScatterNonAtomic> sv(
+        Base::data[i]);
     sv.reset();
   }
 };
 
-
-}}} // Kokkos::Impl::Experimental
+}  // namespace Experimental
+}  // namespace Impl
+}  // namespace Kokkos
 
 namespace Kokkos {
 namespace Experimental {
 
-template <typename DataType
-         ,typename Layout = Kokkos::DefaultExecutionSpace::array_layout
-         ,typename ExecSpace = Kokkos::DefaultExecutionSpace
-         ,int Op = ScatterSum
-         ,int duplication = Kokkos::Impl::Experimental::DefaultDuplication<ExecSpace>::value
-         ,int contribution = Kokkos::Impl::Experimental::DefaultContribution<ExecSpace, duplication>::value
-         >
+template <typename DataType,
+          typename Layout     = Kokkos::DefaultExecutionSpace::array_layout,
+          typename DeviceType = Kokkos::DefaultExecutionSpace,
+          int Op              = ScatterSum,
+          int duplication     = Kokkos::Impl::Experimental::DefaultDuplication<
+              typename DeviceType::execution_space>::value,
+          int contribution = Kokkos::Impl::Experimental::DefaultContribution<
+              typename DeviceType::execution_space, duplication>::value>
 class ScatterView;
 
-template <typename DataType
-         ,int Op
-         ,typename ExecSpace
-         ,typename Layout
-         ,int duplication
-         ,int contribution
-         ,int override_contribution
-         >
+template <typename DataType, int Op, typename DeviceType, typename Layout,
+          int duplication, int contribution, int override_contribution>
 class ScatterAccess;
 
 // non-duplicated implementation
-template <typename DataType
-         ,int Op
-         ,typename ExecSpace
-         ,typename Layout
-         ,int contribution
-         >
-class ScatterView<DataType
-                   ,Layout
-                   ,ExecSpace
-                   ,Op
-                   ,ScatterNonDuplicated
-                   ,contribution>
-{
-public:
-  typedef Kokkos::View<DataType, Layout, ExecSpace> original_view_type;
+template <typename DataType, int Op, typename DeviceType, typename Layout,
+          int contribution>
+class ScatterView<DataType, Layout, DeviceType, Op, ScatterNonDuplicated,
+                  contribution> {
+ public:
+  using execution_space = typename DeviceType::execution_space;
+  using memory_space    = typename DeviceType::memory_space;
+  using device_type     = Kokkos::Device<execution_space, memory_space>;
+  typedef Kokkos::View<DataType, Layout, device_type> original_view_type;
   typedef typename original_view_type::value_type original_value_type;
   typedef typename original_view_type::reference_type original_reference_type;
-  friend class ScatterAccess<DataType, Op, ExecSpace, Layout, ScatterNonDuplicated, contribution, ScatterNonAtomic>;
-  friend class ScatterAccess<DataType, Op, ExecSpace, Layout, ScatterNonDuplicated, contribution, ScatterAtomic>;
+  friend class ScatterAccess<DataType, Op, DeviceType, Layout,
+                             ScatterNonDuplicated, contribution,
+                             ScatterNonAtomic>;
+  friend class ScatterAccess<DataType, Op, DeviceType, Layout,
+                             ScatterNonDuplicated, contribution, ScatterAtomic>;
+  template <class, class, class, int, int, int>
+  friend class ScatterView;
 
-  ScatterView()
-  {
-  }
+  ScatterView() = default;
 
-  template <typename RT, typename ... RP>
+  template <typename RT, typename... RP>
   ScatterView(View<RT, RP...> const& original_view)
-  : internal_view(original_view)
-  {
-  }
+      : internal_view(original_view) {}
 
-  template <typename ... Dims>
-  ScatterView(std::string const& name, Dims ... dims)
-  : internal_view(name, dims ...)
-  {
+  template <typename... Dims>
+  ScatterView(std::string const& name, Dims... dims)
+      : internal_view(name, dims...) {}
+
+  template <typename OtherDataType, typename OtherDeviceType>
+  KOKKOS_FUNCTION ScatterView(
+      const ScatterView<OtherDataType, Layout, OtherDeviceType, Op,
+                        ScatterNonDuplicated, contribution>& other_view)
+      : internal_view(other_view.internal_view) {}
+
+  template <typename OtherDataType, typename OtherDeviceType>
+  KOKKOS_FUNCTION void operator=(
+      const ScatterView<OtherDataType, Layout, OtherDeviceType, Op,
+                        ScatterNonDuplicated, contribution>& other_view) {
+    internal_view = other_view.internal_view;
   }
 
   template <int override_contrib = contribution>
   KOKKOS_FORCEINLINE_FUNCTION
-  ScatterAccess<DataType, Op, ExecSpace, Layout, ScatterNonDuplicated, contribution, override_contrib>
-  access() const {
-    return ScatterAccess<DataType, Op, ExecSpace, Layout, ScatterNonDuplicated, contribution, override_contrib>{*this};
+      ScatterAccess<DataType, Op, DeviceType, Layout, ScatterNonDuplicated,
+                    contribution, override_contrib>
+      access() const {
+    return ScatterAccess<DataType, Op, DeviceType, Layout, ScatterNonDuplicated,
+                         contribution, override_contrib>(*this);
   }
 
-  original_view_type subview() const {
-    return internal_view;
-  }
+  original_view_type subview() const { return internal_view; }
 
-  template <typename DT, typename ... RP>
-  void contribute_into(View<DT, RP...> const& dest) const
-  {
+  template <typename DT, typename... RP>
+  void contribute_into(View<DT, RP...> const& dest) const {
     typedef View<DT, RP...> dest_type;
-    static_assert(std::is_same<
-        typename dest_type::array_layout,
-        Layout>::value,
-        "ScatterView contribute destination has different layout");
-    static_assert(Kokkos::Impl::VerifyExecutionCanAccessMemorySpace<
-        typename ExecSpace::memory_space,
-        typename dest_type::memory_space>::value,
+    static_assert(std::is_same<typename dest_type::array_layout, Layout>::value,
+                  "ScatterView contribute destination has different layout");
+    static_assert(
+        Kokkos::Impl::VerifyExecutionCanAccessMemorySpace<
+            memory_space, typename dest_type::memory_space>::value,
         "ScatterView contribute destination memory space not accessible");
     if (dest.data() == internal_view.data()) return;
-    Kokkos::Impl::Experimental::ReduceDuplicates<ExecSpace, original_value_type, Op>(
-        internal_view.data(),
-        dest.data(),
-        0,
-        0,
-        1,
-        internal_view.label());
+    Kokkos::Impl::Experimental::ReduceDuplicates<execution_space,
+                                                 original_value_type, Op>(
+        internal_view.data(), dest.data(), 0, 0, 1, internal_view.label());
   }
 
   void reset() {
-    Kokkos::Impl::Experimental::ResetDuplicates<ExecSpace, original_value_type, Op>(
-        internal_view.data(),
-        internal_view.size(),
-        internal_view.label());
+    Kokkos::Impl::Experimental::ResetDuplicates<execution_space,
+                                                original_value_type, Op>(
+        internal_view.data(), internal_view.size(), internal_view.label());
   }
-  template <typename DT, typename ... RP>
+  template <typename DT, typename... RP>
   void reset_except(View<DT, RP...> const& view) {
     if (view.data() != internal_view.data()) reset();
   }
 
-  void resize(const size_t n0 = 0,
-           const size_t n1 = 0,
-           const size_t n2 = 0,
-           const size_t n3 = 0,
-           const size_t n4 = 0,
-           const size_t n5 = 0,
-           const size_t n6 = 0,
-           const size_t n7 = 0) {
-    ::Kokkos::resize(internal_view,n0,n1,n2,n3,n4,n5,n6,n7);
+  void resize(const size_t n0 = 0, const size_t n1 = 0, const size_t n2 = 0,
+              const size_t n3 = 0, const size_t n4 = 0, const size_t n5 = 0,
+              const size_t n6 = 0, const size_t n7 = 0) {
+    ::Kokkos::resize(internal_view, n0, n1, n2, n3, n4, n5, n6, n7);
   }
 
-  void realloc(const size_t n0 = 0,
-           const size_t n1 = 0,
-           const size_t n2 = 0,
-           const size_t n3 = 0,
-           const size_t n4 = 0,
-           const size_t n5 = 0,
-           const size_t n6 = 0,
-           const size_t n7 = 0) {
-    ::Kokkos::realloc(internal_view,n0,n1,n2,n3,n4,n5,n6,n7);
+  void realloc(const size_t n0 = 0, const size_t n1 = 0, const size_t n2 = 0,
+               const size_t n3 = 0, const size_t n4 = 0, const size_t n5 = 0,
+               const size_t n6 = 0, const size_t n7 = 0) {
+    ::Kokkos::realloc(internal_view, n0, n1, n2, n3, n4, n5, n6, n7);
   }
 
-protected:
-  template <typename ... Args>
-  KOKKOS_FORCEINLINE_FUNCTION
-  original_reference_type at(Args ... args) const {
+ protected:
+  template <typename... Args>
+  KOKKOS_FORCEINLINE_FUNCTION original_reference_type at(Args... args) const {
     return internal_view(args...);
   }
-private:
+
+ private:
   typedef original_view_type internal_view_type;
   internal_view_type internal_view;
 };
 
-template <typename DataType
-         ,int Op
-         ,typename ExecSpace
-         ,typename Layout
-         ,int contribution
-         ,int override_contribution
-         >
-class ScatterAccess<DataType
-                   ,Op
-                   ,ExecSpace
-                   ,Layout
-                   ,ScatterNonDuplicated
-                   ,contribution
-                   ,override_contribution>
-{
-public:
-  typedef ScatterView<DataType, Layout, ExecSpace, Op, ScatterNonDuplicated, contribution> view_type;
+template <typename DataType, int Op, typename DeviceType, typename Layout,
+          int contribution, int override_contribution>
+class ScatterAccess<DataType, Op, DeviceType, Layout, ScatterNonDuplicated,
+                    contribution, override_contribution> {
+ public:
+  typedef ScatterView<DataType, Layout, DeviceType, Op, ScatterNonDuplicated,
+                      contribution>
+      view_type;
   typedef typename view_type::original_value_type original_value_type;
-  typedef Kokkos::Impl::Experimental::ScatterValue<
-      original_value_type, Op, override_contribution> value_type;
+  typedef Kokkos::Impl::Experimental::ScatterValue<original_value_type, Op,
+                                                   override_contribution>
+      value_type;
 
   KOKKOS_INLINE_FUNCTION
-  ScatterAccess() :
-    view(view_type())  {
-  }
+  ScatterAccess() : view(view_type()) {}
 
   KOKKOS_INLINE_FUNCTION
-  ScatterAccess(view_type const& view_in)
-    : view(view_in)
-  {
-  }
+  ScatterAccess(view_type const& view_in) : view(view_in) {}
 
+//  KOKKOS_DEFAULTED_FUNCTION
+//  ~ScatterAccess() = default;
   KOKKOS_INLINE_FUNCTION
   ~ScatterAccess()
   {
   }
 
-  template <typename ... Args>
-  KOKKOS_FORCEINLINE_FUNCTION
-  value_type operator()(Args ... args) const {
+  template <typename... Args>
+  KOKKOS_FORCEINLINE_FUNCTION value_type operator()(Args... args) const {
     return view.at(args...);
   }
 
   template <typename Arg>
   KOKKOS_FORCEINLINE_FUNCTION
-  typename std::enable_if<view_type::original_view_type::rank == 1 &&
-  std::is_integral<Arg>::value, value_type>::type
-  operator[](Arg arg) const {
+      typename std::enable_if<view_type::original_view_type::rank == 1 &&
+                                  std::is_integral<Arg>::value,
+                              value_type>::type
+      operator[](Arg arg) const {
     return view.at(arg);
   }
 
-private:
+ private:
   view_type const& view;
 };
 
 // duplicated implementation
-// LayoutLeft and LayoutRight are different enough that we'll just specialize each
+// LayoutLeft and LayoutRight are different enough that we'll just specialize
+// each
 
-template <typename DataType
-         ,int Op
-         ,typename ExecSpace
-         ,int contribution
-         >
-class ScatterView<DataType
-                   ,Kokkos::LayoutRight
-                   ,ExecSpace
-                   ,Op
-                   ,ScatterDuplicated
-                   ,contribution>
-{
-public:
-  typedef Kokkos::View<DataType, Kokkos::LayoutRight, ExecSpace> original_view_type;
+template <typename DataType, int Op, typename DeviceType, int contribution>
+class ScatterView<DataType, Kokkos::LayoutRight, DeviceType, Op,
+                  ScatterDuplicated, contribution> {
+ public:
+  using execution_space = typename DeviceType::execution_space;
+  using memory_space    = typename DeviceType::memory_space;
+  using device_type     = Kokkos::Device<execution_space, memory_space>;
+  typedef Kokkos::View<DataType, Kokkos::LayoutRight, device_type>
+      original_view_type;
   typedef typename original_view_type::value_type original_value_type;
   typedef typename original_view_type::reference_type original_reference_type;
-  friend class ScatterAccess<DataType, Op, ExecSpace, Kokkos::LayoutRight, ScatterDuplicated, contribution, ScatterNonAtomic>;
-  friend class ScatterAccess<DataType, Op, ExecSpace, Kokkos::LayoutRight, ScatterDuplicated, contribution, ScatterAtomic>;
-  typedef typename Kokkos::Impl::Experimental::DuplicatedDataType<DataType, Kokkos::LayoutRight> data_type_info;
-  typedef typename data_type_info::value_type internal_data_type;
-  typedef Kokkos::View<internal_data_type, Kokkos::LayoutRight, ExecSpace> internal_view_type;
+  friend class ScatterAccess<DataType, Op, DeviceType, Kokkos::LayoutRight,
+                             ScatterDuplicated, contribution, ScatterNonAtomic>;
+  friend class ScatterAccess<DataType, Op, DeviceType, Kokkos::LayoutRight,
+                             ScatterDuplicated, contribution, ScatterAtomic>;
+  template <class, class, class, int, int, int>
+  friend class ScatterView;
 
-  ScatterView()
-  {
+  typedef typename Kokkos::Impl::Experimental::DuplicatedDataType<
+      DataType, Kokkos::LayoutRight>
+      data_type_info;
+  typedef typename data_type_info::value_type internal_data_type;
+  typedef Kokkos::View<internal_data_type, Kokkos::LayoutRight, device_type>
+      internal_view_type;
+
+  ScatterView() = default;
+
+  template <typename OtherDataType, typename OtherDeviceType>
+  KOKKOS_FUNCTION ScatterView(
+      const ScatterView<OtherDataType, Kokkos::LayoutRight, OtherDeviceType, Op,
+                        ScatterDuplicated, contribution>& other_view)
+      : unique_token(other_view.unique_token),
+        internal_view(other_view.internal_view) {}
+
+  template <typename OtherDataType, typename OtherDeviceType>
+  KOKKOS_FUNCTION void operator=(
+      const ScatterView<OtherDataType, Kokkos::LayoutRight, OtherDeviceType, Op,
+                        ScatterDuplicated, contribution>& other_view) {
+    unique_token  = other_view.unique_token;
+    internal_view = other_view.internal_view;
   }
 
-  template <typename RT, typename ... RP >
+  template <typename RT, typename... RP>
   ScatterView(View<RT, RP...> const& original_view)
-  : unique_token()
-  , internal_view(Kokkos::ViewAllocateWithoutInitializing(
-                    std::string("duplicated_") + original_view.label()),
-                  unique_token.size(),
+      : unique_token(),
+        internal_view(Kokkos::ViewAllocateWithoutInitializing(
+                          std::string("duplicated_") + original_view.label()),
+                      unique_token.size(),
 #ifdef KOKKOS_ENABLE_DEPRECATED_CODE
-                  original_view.extent(0),
-                  original_view.extent(1),
-                  original_view.extent(2),
-                  original_view.extent(3),
-                  original_view.extent(4),
-                  original_view.extent(5),
-                  original_view.extent(6) )
+                      original_view.extent(0), original_view.extent(1),
+                      original_view.extent(2), original_view.extent(3),
+                      original_view.extent(4), original_view.extent(5),
+                      original_view.extent(6))
 #else
-                  original_view.rank_dynamic > 0 ? original_view.extent(0): KOKKOS_IMPL_CTOR_DEFAULT_ARG,
-                  original_view.rank_dynamic > 1 ? original_view.extent(1): KOKKOS_IMPL_CTOR_DEFAULT_ARG,
-                  original_view.rank_dynamic > 2 ? original_view.extent(2): KOKKOS_IMPL_CTOR_DEFAULT_ARG,
-                  original_view.rank_dynamic > 3 ? original_view.extent(3): KOKKOS_IMPL_CTOR_DEFAULT_ARG,
-                  original_view.rank_dynamic > 4 ? original_view.extent(4): KOKKOS_IMPL_CTOR_DEFAULT_ARG,
-                  original_view.rank_dynamic > 5 ? original_view.extent(5): KOKKOS_IMPL_CTOR_DEFAULT_ARG,
-                  original_view.rank_dynamic > 6 ? original_view.extent(6): KOKKOS_IMPL_CTOR_DEFAULT_ARG)
+                      original_view.rank_dynamic > 0
+                          ? original_view.extent(0)
+                          : KOKKOS_IMPL_CTOR_DEFAULT_ARG,
+                      original_view.rank_dynamic > 1
+                          ? original_view.extent(1)
+                          : KOKKOS_IMPL_CTOR_DEFAULT_ARG,
+                      original_view.rank_dynamic > 2
+                          ? original_view.extent(2)
+                          : KOKKOS_IMPL_CTOR_DEFAULT_ARG,
+                      original_view.rank_dynamic > 3
+                          ? original_view.extent(3)
+                          : KOKKOS_IMPL_CTOR_DEFAULT_ARG,
+                      original_view.rank_dynamic > 4
+                          ? original_view.extent(4)
+                          : KOKKOS_IMPL_CTOR_DEFAULT_ARG,
+                      original_view.rank_dynamic > 5
+                          ? original_view.extent(5)
+                          : KOKKOS_IMPL_CTOR_DEFAULT_ARG,
+                      original_view.rank_dynamic > 6
+                          ? original_view.extent(6)
+                          : KOKKOS_IMPL_CTOR_DEFAULT_ARG)
 
 #endif
   {
     reset();
   }
 
-  template <typename ... Dims>
-  ScatterView(std::string const& name, Dims ... dims)
-  : internal_view(Kokkos::ViewAllocateWithoutInitializing(name), unique_token.size(), dims ...)
-  {
+  template <typename... Dims>
+  ScatterView(std::string const& name, Dims... dims)
+      : internal_view(Kokkos::ViewAllocateWithoutInitializing(name),
+                      unique_token.size(), dims...) {
     reset();
   }
 
   template <int override_contribution = contribution>
   KOKKOS_FORCEINLINE_FUNCTION
-  ScatterAccess<DataType, Op, ExecSpace, Kokkos::LayoutRight, ScatterDuplicated, contribution, override_contribution>
-  access() const {
-    return ScatterAccess<DataType, Op, ExecSpace, Kokkos::LayoutRight, ScatterDuplicated, contribution, override_contribution>{*this};
+      ScatterAccess<DataType, Op, DeviceType, Kokkos::LayoutRight,
+                    ScatterDuplicated, contribution, override_contribution>
+      access() const {
+    return ScatterAccess<DataType, Op, DeviceType, Kokkos::LayoutRight,
+                         ScatterDuplicated, contribution,
+                         override_contribution>(*this);
   }
 
-  typename Kokkos::Impl::Experimental::Slice<
-    Kokkos::LayoutRight, internal_view_type::rank, internal_view_type>::value_type
-  subview() const
-  {
+  typename Kokkos::Impl::Experimental::Slice<Kokkos::LayoutRight,
+                                             internal_view_type::rank,
+                                             internal_view_type>::value_type
+  subview() const {
     return Kokkos::Impl::Experimental::Slice<
-      Kokkos::LayoutRight, internal_view_type::Rank, internal_view_type>::get(internal_view, 0);
+        Kokkos::LayoutRight, internal_view_type::Rank,
+        internal_view_type>::get(internal_view, 0);
   }
 
-  template <typename DT, typename ... RP>
-  void contribute_into(View<DT, RP...> const& dest) const
-  {
+  template <typename DT, typename... RP>
+  void contribute_into(View<DT, RP...> const& dest) const {
     typedef View<DT, RP...> dest_type;
-    static_assert(std::is_same<
-        typename dest_type::array_layout,
-        Kokkos::LayoutRight>::value,
-        "ScatterView deep_copy destination has different layout");
-    static_assert(Kokkos::Impl::VerifyExecutionCanAccessMemorySpace<
-        typename ExecSpace::memory_space,
-        typename dest_type::memory_space>::value,
+    static_assert(std::is_same<typename dest_type::array_layout,
+                               Kokkos::LayoutRight>::value,
+                  "ScatterView deep_copy destination has different layout");
+    static_assert(
+        Kokkos::Impl::VerifyExecutionCanAccessMemorySpace<
+            memory_space, typename dest_type::memory_space>::value,
         "ScatterView deep_copy destination memory space not accessible");
     bool is_equal = (dest.data() == internal_view.data());
-    size_t start = is_equal ? 1 : 0;
-    Kokkos::Impl::Experimental::ReduceDuplicates<ExecSpace, original_value_type, Op>(
-        internal_view.data(),
-        dest.data(),
-        internal_view.stride(0),
-        start,
-        internal_view.extent(0),
-        internal_view.label());
+    size_t start  = is_equal ? 1 : 0;
+    Kokkos::Impl::Experimental::ReduceDuplicates<execution_space,
+                                                 original_value_type, Op>(
+        internal_view.data(), dest.data(), internal_view.stride(0), start,
+        internal_view.extent(0), internal_view.label());
   }
 
   void reset() {
-    Kokkos::Impl::Experimental::ResetDuplicates<ExecSpace, original_value_type, Op>(
-        internal_view.data(),
-        internal_view.size(),
-        internal_view.label());
+    Kokkos::Impl::Experimental::ResetDuplicates<execution_space,
+                                                original_value_type, Op>(
+        internal_view.data(), internal_view.size(), internal_view.label());
   }
-  template <typename DT, typename ... RP>
+  template <typename DT, typename... RP>
   void reset_except(View<DT, RP...> const& view) {
     if (view.data() != internal_view.data()) {
       reset();
       return;
     }
-    Kokkos::Impl::Experimental::ResetDuplicates<ExecSpace, original_value_type, Op>(
-        internal_view.data() + view.size(),
-        internal_view.size() - view.size(),
+    Kokkos::Impl::Experimental::ResetDuplicates<execution_space,
+                                                original_value_type, Op>(
+        internal_view.data() + view.size(), internal_view.size() - view.size(),
         internal_view.label());
   }
 
-  void resize(const size_t n0 = 0,
-           const size_t n1 = 0,
-           const size_t n2 = 0,
-           const size_t n3 = 0,
-           const size_t n4 = 0,
-           const size_t n5 = 0,
-           const size_t n6 = 0) {
-    ::Kokkos::resize(internal_view,unique_token.size(),n0,n1,n2,n3,n4,n5,n6);
+  void resize(const size_t n0 = 0, const size_t n1 = 0, const size_t n2 = 0,
+              const size_t n3 = 0, const size_t n4 = 0, const size_t n5 = 0,
+              const size_t n6 = 0) {
+    ::Kokkos::resize(internal_view, unique_token.size(), n0, n1, n2, n3, n4, n5,
+                     n6);
   }
 
-  void realloc(const size_t n0 = 0,
-           const size_t n1 = 0,
-           const size_t n2 = 0,
-           const size_t n3 = 0,
-           const size_t n4 = 0,
-           const size_t n5 = 0,
-           const size_t n6 = 0) {
-    ::Kokkos::realloc(internal_view,unique_token.size(),n0,n1,n2,n3,n4,n5,n6);
+  void realloc(const size_t n0 = 0, const size_t n1 = 0, const size_t n2 = 0,
+               const size_t n3 = 0, const size_t n4 = 0, const size_t n5 = 0,
+               const size_t n6 = 0) {
+    ::Kokkos::realloc(internal_view, unique_token.size(), n0, n1, n2, n3, n4,
+                      n5, n6);
   }
 
-protected:
-  template <typename ... Args>
-  KOKKOS_FORCEINLINE_FUNCTION
-  original_reference_type at(int rank, Args ... args) const {
+ protected:
+  template <typename... Args>
+  KOKKOS_FORCEINLINE_FUNCTION original_reference_type at(int rank,
+                                                         Args... args) const {
     return internal_view(rank, args...);
   }
 
-protected:
+ protected:
   typedef Kokkos::Experimental::UniqueToken<
-      ExecSpace, Kokkos::Experimental::UniqueTokenScope::Global> unique_token_type;
+      execution_space, Kokkos::Experimental::UniqueTokenScope::Global>
+      unique_token_type;
 
   unique_token_type unique_token;
   internal_view_type internal_view;
 };
 
-template <typename DataType
-         ,int Op
-         ,typename ExecSpace
-         ,int contribution
-         >
-class ScatterView<DataType
-                   ,Kokkos::LayoutLeft
-                   ,ExecSpace
-                   ,Op
-                   ,ScatterDuplicated
-                   ,contribution>
-{
-public:
-  typedef Kokkos::View<DataType, Kokkos::LayoutLeft, ExecSpace> original_view_type;
+template <typename DataType, int Op, typename DeviceType, int contribution>
+class ScatterView<DataType, Kokkos::LayoutLeft, DeviceType, Op,
+                  ScatterDuplicated, contribution> {
+ public:
+  using execution_space = typename DeviceType::execution_space;
+  using memory_space    = typename DeviceType::memory_space;
+  using device_type     = Kokkos::Device<execution_space, memory_space>;
+  typedef Kokkos::View<DataType, Kokkos::LayoutLeft, device_type>
+      original_view_type;
   typedef typename original_view_type::value_type original_value_type;
   typedef typename original_view_type::reference_type original_reference_type;
-  friend class ScatterAccess<DataType, Op, ExecSpace, Kokkos::LayoutLeft, ScatterDuplicated, contribution, ScatterNonAtomic>;
-  friend class ScatterAccess<DataType, Op, ExecSpace, Kokkos::LayoutLeft, ScatterDuplicated, contribution, ScatterAtomic>;
-  typedef typename Kokkos::Impl::Experimental::DuplicatedDataType<DataType, Kokkos::LayoutLeft> data_type_info;
+  friend class ScatterAccess<DataType, Op, DeviceType, Kokkos::LayoutLeft,
+                             ScatterDuplicated, contribution, ScatterNonAtomic>;
+  friend class ScatterAccess<DataType, Op, DeviceType, Kokkos::LayoutLeft,
+                             ScatterDuplicated, contribution, ScatterAtomic>;
+  template <class, class, class, int, int, int>
+  friend class ScatterView;
+
+  typedef typename Kokkos::Impl::Experimental::DuplicatedDataType<
+      DataType, Kokkos::LayoutLeft>
+      data_type_info;
   typedef typename data_type_info::value_type internal_data_type;
-  typedef Kokkos::View<internal_data_type, Kokkos::LayoutLeft, ExecSpace> internal_view_type;
+  typedef Kokkos::View<internal_data_type, Kokkos::LayoutLeft, device_type>
+      internal_view_type;
 
-  ScatterView()
-  {
-  }
+  ScatterView() = default;
 
-  template <typename RT, typename ... RP >
-  ScatterView(View<RT, RP...> const& original_view)
-  : unique_token()
-  {
-    size_t arg_N[8] = {
-      original_view.rank>0?original_view.extent(0):KOKKOS_IMPL_CTOR_DEFAULT_ARG,
-      original_view.rank>1?original_view.extent(1):KOKKOS_IMPL_CTOR_DEFAULT_ARG,
-      original_view.rank>2?original_view.extent(2):KOKKOS_IMPL_CTOR_DEFAULT_ARG,
-      original_view.rank>3?original_view.extent(3):KOKKOS_IMPL_CTOR_DEFAULT_ARG,
-      original_view.rank>4?original_view.extent(4):KOKKOS_IMPL_CTOR_DEFAULT_ARG,
-      original_view.rank>5?original_view.extent(5):KOKKOS_IMPL_CTOR_DEFAULT_ARG,
-      original_view.rank>6?original_view.extent(6):KOKKOS_IMPL_CTOR_DEFAULT_ARG,
-      KOKKOS_IMPL_CTOR_DEFAULT_ARG
-    };
+  template <typename RT, typename... RP>
+  ScatterView(View<RT, RP...> const& original_view) : unique_token() {
+    size_t arg_N[8] = {original_view.rank > 0 ? original_view.extent(0)
+                                              : KOKKOS_IMPL_CTOR_DEFAULT_ARG,
+                       original_view.rank > 1 ? original_view.extent(1)
+                                              : KOKKOS_IMPL_CTOR_DEFAULT_ARG,
+                       original_view.rank > 2 ? original_view.extent(2)
+                                              : KOKKOS_IMPL_CTOR_DEFAULT_ARG,
+                       original_view.rank > 3 ? original_view.extent(3)
+                                              : KOKKOS_IMPL_CTOR_DEFAULT_ARG,
+                       original_view.rank > 4 ? original_view.extent(4)
+                                              : KOKKOS_IMPL_CTOR_DEFAULT_ARG,
+                       original_view.rank > 5 ? original_view.extent(5)
+                                              : KOKKOS_IMPL_CTOR_DEFAULT_ARG,
+                       original_view.rank > 6 ? original_view.extent(6)
+                                              : KOKKOS_IMPL_CTOR_DEFAULT_ARG,
+                       KOKKOS_IMPL_CTOR_DEFAULT_ARG};
     arg_N[internal_view_type::rank - 1] = unique_token.size();
-    internal_view = internal_view_type(
-        Kokkos::ViewAllocateWithoutInitializing(
-          std::string("duplicated_") + original_view.label()),
-        arg_N[0], arg_N[1], arg_N[2], arg_N[3],
-        arg_N[4], arg_N[5], arg_N[6], arg_N[7]);
+    internal_view                       = internal_view_type(
+        Kokkos::ViewAllocateWithoutInitializing(std::string("duplicated_") +
+                                                original_view.label()),
+        arg_N[0], arg_N[1], arg_N[2], arg_N[3], arg_N[4], arg_N[5], arg_N[6],
+        arg_N[7]);
     reset();
   }
 
-  template <typename ... Dims>
-  ScatterView(std::string const& name, Dims ... dims) {
+  template <typename... Dims>
+  ScatterView(std::string const& name, Dims... dims) {
     original_view_type original_view;
-    size_t arg_N[8] = {
-      original_view.rank>0?original_view.static_extent(0):KOKKOS_IMPL_CTOR_DEFAULT_ARG,
-      original_view.rank>1?original_view.static_extent(1):KOKKOS_IMPL_CTOR_DEFAULT_ARG,
-      original_view.rank>2?original_view.static_extent(2):KOKKOS_IMPL_CTOR_DEFAULT_ARG,
-      original_view.rank>3?original_view.static_extent(3):KOKKOS_IMPL_CTOR_DEFAULT_ARG,
-      original_view.rank>4?original_view.static_extent(4):KOKKOS_IMPL_CTOR_DEFAULT_ARG,
-      original_view.rank>5?original_view.static_extent(5):KOKKOS_IMPL_CTOR_DEFAULT_ARG,
-      original_view.rank>6?original_view.static_extent(6):KOKKOS_IMPL_CTOR_DEFAULT_ARG,
-      KOKKOS_IMPL_CTOR_DEFAULT_ARG
-    };
-    Kokkos::Impl::Experimental::args_to_array(arg_N,0,dims ...);
+    size_t arg_N[8] = {original_view.rank > 0 ? original_view.static_extent(0)
+                                              : KOKKOS_IMPL_CTOR_DEFAULT_ARG,
+                       original_view.rank > 1 ? original_view.static_extent(1)
+                                              : KOKKOS_IMPL_CTOR_DEFAULT_ARG,
+                       original_view.rank > 2 ? original_view.static_extent(2)
+                                              : KOKKOS_IMPL_CTOR_DEFAULT_ARG,
+                       original_view.rank > 3 ? original_view.static_extent(3)
+                                              : KOKKOS_IMPL_CTOR_DEFAULT_ARG,
+                       original_view.rank > 4 ? original_view.static_extent(4)
+                                              : KOKKOS_IMPL_CTOR_DEFAULT_ARG,
+                       original_view.rank > 5 ? original_view.static_extent(5)
+                                              : KOKKOS_IMPL_CTOR_DEFAULT_ARG,
+                       original_view.rank > 6 ? original_view.static_extent(6)
+                                              : KOKKOS_IMPL_CTOR_DEFAULT_ARG,
+                       KOKKOS_IMPL_CTOR_DEFAULT_ARG};
+    Kokkos::Impl::Experimental::args_to_array(arg_N, 0, dims...);
     arg_N[internal_view_type::rank - 1] = unique_token.size();
-    internal_view = internal_view_type(Kokkos::ViewAllocateWithoutInitializing(name),
-     arg_N[0], arg_N[1], arg_N[2], arg_N[3],
-     arg_N[4], arg_N[5], arg_N[6], arg_N[7]);
+    internal_view                       = internal_view_type(
+        Kokkos::ViewAllocateWithoutInitializing(name), arg_N[0], arg_N[1],
+        arg_N[2], arg_N[3], arg_N[4], arg_N[5], arg_N[6], arg_N[7]);
     reset();
   }
 
+  template <typename OtherDataType, typename OtherDeviceType>
+  KOKKOS_FUNCTION ScatterView(
+      const ScatterView<OtherDataType, Kokkos::LayoutLeft, OtherDeviceType, Op,
+                        ScatterDuplicated, contribution>& other_view)
+      : unique_token(other_view.unique_token),
+        internal_view(other_view.internal_view) {}
+
+  template <typename OtherDataType, typename OtherDeviceType>
+  KOKKOS_FUNCTION void operator=(
+      const ScatterView<OtherDataType, Kokkos::LayoutLeft, OtherDeviceType, Op,
+                        ScatterDuplicated, contribution>& other_view) {
+    unique_token  = other_view.unique_token;
+    internal_view = other_view.internal_view;
+  }
+
   template <int override_contribution = contribution>
   KOKKOS_FORCEINLINE_FUNCTION
-  ScatterAccess<DataType, Op, ExecSpace, Kokkos::LayoutLeft, ScatterDuplicated, contribution, override_contribution>
-  access() const {
-    return ScatterAccess<DataType, Op, ExecSpace, Kokkos::LayoutLeft, ScatterDuplicated, contribution, override_contribution>{*this};
+      ScatterAccess<DataType, Op, DeviceType, Kokkos::LayoutLeft,
+                    ScatterDuplicated, contribution, override_contribution>
+      access() const {
+    return ScatterAccess<DataType, Op, DeviceType, Kokkos::LayoutLeft,
+                         ScatterDuplicated, contribution,
+                         override_contribution>(*this);
   }
 
-  typename Kokkos::Impl::Experimental::Slice<
-    Kokkos::LayoutLeft, internal_view_type::rank, internal_view_type>::value_type
-  subview() const
-  {
+  typename Kokkos::Impl::Experimental::Slice<Kokkos::LayoutLeft,
+                                             internal_view_type::rank,
+                                             internal_view_type>::value_type
+  subview() const {
     return Kokkos::Impl::Experimental::Slice<
-      Kokkos::LayoutLeft, internal_view_type::rank, internal_view_type>::get(internal_view, 0);
+        Kokkos::LayoutLeft, internal_view_type::rank,
+        internal_view_type>::get(internal_view, 0);
   }
 
-  template <typename ... RP>
-  void contribute_into(View<RP...> const& dest) const
-  {
+  template <typename... RP>
+  void contribute_into(View<RP...> const& dest) const {
     typedef View<RP...> dest_type;
-    static_assert(std::is_same<
-        typename dest_type::value_type,
-        typename original_view_type::non_const_value_type>::value,
+    static_assert(
+        std::is_same<typename dest_type::value_type,
+                     typename original_view_type::non_const_value_type>::value,
         "ScatterView deep_copy destination has wrong value_type");
-    static_assert(std::is_same<
-        typename dest_type::array_layout,
-        Kokkos::LayoutLeft>::value,
-        "ScatterView deep_copy destination has different layout");
-    static_assert(Kokkos::Impl::VerifyExecutionCanAccessMemorySpace<
-        typename ExecSpace::memory_space,
-        typename dest_type::memory_space>::value,
+    static_assert(std::is_same<typename dest_type::array_layout,
+                               Kokkos::LayoutLeft>::value,
+                  "ScatterView deep_copy destination has different layout");
+    static_assert(
+        Kokkos::Impl::VerifyExecutionCanAccessMemorySpace<
+            memory_space, typename dest_type::memory_space>::value,
         "ScatterView deep_copy destination memory space not accessible");
-    auto extent = internal_view.extent(
-        internal_view_type::rank - 1);
+    auto extent   = internal_view.extent(internal_view_type::rank - 1);
     bool is_equal = (dest.data() == internal_view.data());
-    size_t start = is_equal ? 1 : 0;
-    Kokkos::Impl::Experimental::ReduceDuplicates<ExecSpace, original_value_type, Op>(
-        internal_view.data(),
-        dest.data(),
-        internal_view.stride(internal_view_type::rank - 1),
-        start,
-        extent,
+    size_t start  = is_equal ? 1 : 0;
+    Kokkos::Impl::Experimental::ReduceDuplicates<execution_space,
+                                                 original_value_type, Op>(
+        internal_view.data(), dest.data(),
+        internal_view.stride(internal_view_type::rank - 1), start, extent,
         internal_view.label());
   }
 
   void reset() {
-    Kokkos::Impl::Experimental::ResetDuplicates<ExecSpace, original_value_type, Op>(
-        internal_view.data(),
-        internal_view.size(),
-        internal_view.label());
+    Kokkos::Impl::Experimental::ResetDuplicates<execution_space,
+                                                original_value_type, Op>(
+        internal_view.data(), internal_view.size(), internal_view.label());
   }
-  template <typename DT, typename ... RP>
+  template <typename DT, typename... RP>
   void reset_except(View<DT, RP...> const& view) {
     if (view.data() != internal_view.data()) {
       reset();
       return;
     }
-    Kokkos::Impl::Experimental::ResetDuplicates<ExecSpace, original_value_type, Op>(
-        internal_view.data() + view.size(),
-        internal_view.size() - view.size(),
+    Kokkos::Impl::Experimental::ResetDuplicates<execution_space,
+                                                original_value_type, Op>(
+        internal_view.data() + view.size(), internal_view.size() - view.size(),
         internal_view.label());
   }
 
-  void resize(const size_t n0 = 0,
-           const size_t n1 = 0,
-           const size_t n2 = 0,
-           const size_t n3 = 0,
-           const size_t n4 = 0,
-           const size_t n5 = 0,
-           const size_t n6 = 0) {
+  void resize(const size_t n0 = 0, const size_t n1 = 0, const size_t n2 = 0,
+              const size_t n3 = 0, const size_t n4 = 0, const size_t n5 = 0,
+              const size_t n6 = 0) {
+    size_t arg_N[8] = {n0, n1, n2, n3, n4, n5, n6, 0};
+    const int i     = internal_view.rank - 1;
+    arg_N[i]        = unique_token.size();
 
-    size_t arg_N[8] = {n0,n1,n2,n3,n4,n5,n6,0};
-    const int i = internal_view.rank-1;
-    arg_N[i] = unique_token.size();
-
-    ::Kokkos::resize(internal_view,
-        arg_N[0], arg_N[1], arg_N[2], arg_N[3],
-        arg_N[4], arg_N[5], arg_N[6], arg_N[7]);
+    ::Kokkos::resize(internal_view, arg_N[0], arg_N[1], arg_N[2], arg_N[3],
+                     arg_N[4], arg_N[5], arg_N[6], arg_N[7]);
   }
 
-  void realloc(const size_t n0 = 0,
-           const size_t n1 = 0,
-           const size_t n2 = 0,
-           const size_t n3 = 0,
-           const size_t n4 = 0,
-           const size_t n5 = 0,
-           const size_t n6 = 0) {
+  void realloc(const size_t n0 = 0, const size_t n1 = 0, const size_t n2 = 0,
+               const size_t n3 = 0, const size_t n4 = 0, const size_t n5 = 0,
+               const size_t n6 = 0) {
+    size_t arg_N[8] = {n0, n1, n2, n3, n4, n5, n6, 0};
+    const int i     = internal_view.rank - 1;
+    arg_N[i]        = unique_token.size();
 
-    size_t arg_N[8] = {n0,n1,n2,n3,n4,n5,n6,0};
-    const int i = internal_view.rank-1;
-    arg_N[i] = unique_token.size();
-
-    ::Kokkos::realloc(internal_view,
-        arg_N[0], arg_N[1], arg_N[2], arg_N[3],
-        arg_N[4], arg_N[5], arg_N[6], arg_N[7]);
+    ::Kokkos::realloc(internal_view, arg_N[0], arg_N[1], arg_N[2], arg_N[3],
+                      arg_N[4], arg_N[5], arg_N[6], arg_N[7]);
   }
 
-protected:
-  template <typename ... Args>
-  inline original_reference_type at(int thread_id, Args ... args) const {
+ protected:
+  template <typename... Args>
+  KOKKOS_FORCEINLINE_FUNCTION original_reference_type at(int thread_id,
+                                                         Args... args) const {
     return internal_view(args..., thread_id);
   }
 
-protected:
+ protected:
   typedef Kokkos::Experimental::UniqueToken<
-      ExecSpace, Kokkos::Experimental::UniqueTokenScope::Global> unique_token_type;
+      execution_space, Kokkos::Experimental::UniqueTokenScope::Global>
+      unique_token_type;
 
   unique_token_type unique_token;
   internal_view_type internal_view;
 };
 
-
 /* This object has to be separate in order to store the thread ID, which cannot
    be obtained until one is inside a parallel construct, and may be relatively
    expensive to obtain at every contribution
    (calls a non-inlined function, looks up a thread-local variable).
-   Due to the expense, it is sensible to query it at most once per parallel iterate
-   (ideally once per thread, but parallel_for doesn't expose that)
-   and then store it in a stack variable.
-   ScatterAccess serves as a non-const object on the stack which can store the thread ID */
+   Due to the expense, it is sensible to query it at most once per parallel
+   iterate (ideally once per thread, but parallel_for doesn't expose that) and
+   then store it in a stack variable.
+   ScatterAccess serves as a non-const object on the stack which can store the
+   thread ID */
 
-template <typename DataType
-         ,int Op
-         ,typename ExecSpace
-         ,typename Layout
-         ,int contribution
-         ,int override_contribution
-         >
-class ScatterAccess<DataType
-                   ,Op
-                   ,ExecSpace
-                   ,Layout
-                   ,ScatterDuplicated
-                   ,contribution
-                   ,override_contribution>
-{
-public:
-  typedef ScatterView<DataType, Layout, ExecSpace, Op, ScatterDuplicated, contribution> view_type;
+template <typename DataType, int Op, typename DeviceType, typename Layout,
+          int contribution, int override_contribution>
+class ScatterAccess<DataType, Op, DeviceType, Layout, ScatterDuplicated,
+                    contribution, override_contribution> {
+ public:
+  typedef ScatterView<DataType, Layout, DeviceType, Op, ScatterDuplicated,
+                      contribution>
+      view_type;
   typedef typename view_type::original_value_type original_value_type;
-  typedef Kokkos::Impl::Experimental::ScatterValue<
-      original_value_type, Op, override_contribution> value_type;
+  typedef Kokkos::Impl::Experimental::ScatterValue<original_value_type, Op,
+                                                   override_contribution>
+      value_type;
 
   KOKKOS_FORCEINLINE_FUNCTION
   ScatterAccess(view_type const& view_in)
-    : view(view_in)
-    , thread_id(view_in.unique_token.acquire()) {
-  }
+      : view(view_in), thread_id(view_in.unique_token.acquire()) {}
 
   KOKKOS_FORCEINLINE_FUNCTION
   ~ScatterAccess() {
     if (thread_id != ~thread_id_type(0)) view.unique_token.release(thread_id);
   }
 
-  template <typename ... Args>
-  KOKKOS_FORCEINLINE_FUNCTION
-  value_type operator()(Args ... args) const {
+  template <typename... Args>
+  KOKKOS_FORCEINLINE_FUNCTION value_type operator()(Args... args) const {
     return view.at(thread_id, args...);
   }
 
   template <typename Arg>
   KOKKOS_FORCEINLINE_FUNCTION
-  typename std::enable_if<view_type::original_view_type::rank == 1 &&
-  std::is_integral<Arg>::value, value_type>::type
-  operator[](Arg arg) const {
+      typename std::enable_if<view_type::original_view_type::rank == 1 &&
+                                  std::is_integral<Arg>::value,
+                              value_type>::type
+      operator[](Arg arg) const {
     return view.at(thread_id, arg);
   }
 
-private:
-
+ private:
   view_type const& view;
 
   // simplify RAII by disallowing copies
@@ -1235,84 +1225,83 @@ private:
   ScatterAccess& operator=(ScatterAccess const& other) = delete;
   ScatterAccess& operator=(ScatterAccess&& other) = delete;
 
-public:
+ public:
   // do need to allow moves though, for the common
   // auto b = a.access();
-  // that assignments turns into a move constructor call  
+  // that assignments turns into a move constructor call
   KOKKOS_FORCEINLINE_FUNCTION
   ScatterAccess(ScatterAccess&& other)
-    : view(other.view)
-    , thread_id(other.thread_id)
-  {
+      : view(other.view), thread_id(other.thread_id) {
     other.thread_id = ~thread_id_type(0);
   }
 
-private:
-
+ private:
   typedef typename view_type::unique_token_type unique_token_type;
   typedef typename unique_token_type::size_type thread_id_type;
   thread_id_type thread_id;
 };
 
-template <int Op = Kokkos::Experimental::ScatterSum,
-          int duplication = -1,
-          int contribution = -1,
-          typename RT, typename ... RP>
-ScatterView
-  < RT
-  , typename ViewTraits<RT, RP...>::array_layout
-  , typename ViewTraits<RT, RP...>::execution_space
-  , Op
-  /* just setting defaults if not specified... things got messy because the view type
-     does not come before the duplication/contribution settings in the
-     template parameter list */
-  , duplication == -1 ? Kokkos::Impl::Experimental::DefaultDuplication<typename ViewTraits<RT, RP...>::execution_space>::value : duplication
-  , contribution == -1 ?
-      Kokkos::Impl::Experimental::DefaultContribution<
-                        typename ViewTraits<RT, RP...>::execution_space,
-                        (duplication == -1 ?
-                           Kokkos::Impl::Experimental::DefaultDuplication<
-                             typename ViewTraits<RT, RP...>::execution_space
-                             >::value
-                                           : duplication
-                        )
-                        >::value
-                       : contribution
-  >
+template <int Op = Kokkos::Experimental::ScatterSum, int duplication = -1,
+          int contribution = -1, typename RT, typename... RP>
+ScatterView<
+    RT, typename ViewTraits<RT, RP...>::array_layout,
+    typename ViewTraits<RT, RP...>::device_type,
+    Op
+    /* just setting defaults if not specified... things got messy because the
+       view type does not come before the duplication/contribution settings in
+       the template parameter list */
+    ,
+    duplication == -1
+        ? Kokkos::Impl::Experimental::DefaultDuplication<
+              typename ViewTraits<RT, RP...>::execution_space>::value
+        : duplication,
+    contribution == -1
+        ? Kokkos::Impl::Experimental::DefaultContribution<
+              typename ViewTraits<RT, RP...>::execution_space,
+              (duplication == -1
+                   ? Kokkos::Impl::Experimental::DefaultDuplication<
+                         typename ViewTraits<RT, RP...>::execution_space>::value
+                   : duplication)>::value
+        : contribution>
 create_scatter_view(View<RT, RP...> const& original_view) {
-  return original_view; // implicit ScatterView constructor call
+  return original_view;  // implicit ScatterView constructor call
 }
 
-}} // namespace Kokkos::Experimental
+}  // namespace Experimental
+}  // namespace Kokkos
 
 namespace Kokkos {
 namespace Experimental {
 
-template <typename DT1, typename DT2, typename LY, typename ES,  int OP, int CT, int DP, typename ... VP>
-void
-contribute(View<DT1, VP...>& dest, Kokkos::Experimental::ScatterView<DT2, LY, ES, OP, CT, DP> const& src)
-{
+template <typename DT1, typename DT2, typename LY, typename ES, int OP, int CT,
+          int DP, typename... VP>
+void contribute(
+    View<DT1, VP...>& dest,
+    Kokkos::Experimental::ScatterView<DT2, LY, ES, OP, CT, DP> const& src) {
   src.contribute_into(dest);
 }
 
-}} // namespace Kokkos::Experimental
+}  // namespace Experimental
+}  // namespace Kokkos
 
 namespace Kokkos {
 
-template <typename DT, typename LY, typename ES,  int OP, int CT, int DP, typename ... IS>
-void
-realloc(Kokkos::Experimental::ScatterView<DT, LY, ES, OP, CT, DP>& scatter_view, IS ... is)
-{
-  scatter_view.realloc(is ...);
+template <typename DT, typename LY, typename ES, int OP, int CT, int DP,
+          typename... IS>
+void realloc(
+    Kokkos::Experimental::ScatterView<DT, LY, ES, OP, CT, DP>& scatter_view,
+    IS... is) {
+  scatter_view.realloc(is...);
 }
 
-template <typename DT, typename LY, typename ES,  int OP, int CT, int DP, typename ... IS>
-void
-resize(Kokkos::Experimental::ScatterView<DT, LY, ES, OP, CT, DP>& scatter_view, IS ... is)
-{
-  scatter_view.resize(is ...);
+template <typename DT, typename LY, typename ES, int OP, int CT, int DP,
+          typename... IS>
+void resize(
+    Kokkos::Experimental::ScatterView<DT, LY, ES, OP, CT, DP>& scatter_view,
+    IS... is) {
+  scatter_view.resize(is...);
 }
 
-} // namespace Kokkos
+}  // namespace Kokkos
 
 #endif
diff --git a/lib/kokkos/containers/src/Kokkos_StaticCrsGraph.hpp b/lib/kokkos/containers/src/Kokkos_StaticCrsGraph.hpp
index f63ce4b880..26c16c4e00 100644
--- a/lib/kokkos/containers/src/Kokkos_StaticCrsGraph.hpp
+++ b/lib/kokkos/containers/src/Kokkos_StaticCrsGraph.hpp
@@ -1,13 +1,14 @@
 /*
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -36,7 +37,7 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 */
@@ -54,82 +55,87 @@
 namespace Kokkos {
 
 namespace Impl {
-  template<class RowOffsetsType, class RowBlockOffsetsType>
-  struct StaticCrsGraphBalancerFunctor {
-    typedef typename RowOffsetsType::non_const_value_type int_type;
-    RowOffsetsType row_offsets;
-    RowBlockOffsetsType row_block_offsets;
+template <class RowOffsetsType, class RowBlockOffsetsType>
+struct StaticCrsGraphBalancerFunctor {
+  typedef typename RowOffsetsType::non_const_value_type int_type;
+  RowOffsetsType row_offsets;
+  RowBlockOffsetsType row_block_offsets;
 
-    int_type cost_per_row, num_blocks;
+  int_type cost_per_row, num_blocks;
 
-    StaticCrsGraphBalancerFunctor(RowOffsetsType row_offsets_,
-                                  RowBlockOffsetsType row_block_offsets_,
-                                  int_type cost_per_row_, int_type num_blocks_):
-                                    row_offsets(row_offsets_),
-                                    row_block_offsets(row_block_offsets_),
-                                    cost_per_row(cost_per_row_),
-                                    num_blocks(num_blocks_){}
+  StaticCrsGraphBalancerFunctor(RowOffsetsType row_offsets_,
+                                RowBlockOffsetsType row_block_offsets_,
+                                int_type cost_per_row_, int_type num_blocks_)
+      : row_offsets(row_offsets_),
+        row_block_offsets(row_block_offsets_),
+        cost_per_row(cost_per_row_),
+        num_blocks(num_blocks_) {}
 
-    KOKKOS_INLINE_FUNCTION
-    void operator() (const int_type& iRow) const {
-      const int_type num_rows = row_offsets.extent(0)-1;
-      const int_type num_entries = row_offsets(num_rows);
-      const int_type total_cost = num_entries + num_rows*cost_per_row;
+  KOKKOS_INLINE_FUNCTION
+  void operator()(const int_type& iRow) const {
+    const int_type num_rows    = row_offsets.extent(0) - 1;
+    const int_type num_entries = row_offsets(num_rows);
+    const int_type total_cost  = num_entries + num_rows * cost_per_row;
 
-      const double cost_per_workset = 1.0*total_cost/num_blocks;
+    const double cost_per_workset = 1.0 * total_cost / num_blocks;
 
-      const int_type row_cost = row_offsets(iRow+1)-row_offsets(iRow) + cost_per_row;
+    const int_type row_cost =
+        row_offsets(iRow + 1) - row_offsets(iRow) + cost_per_row;
 
-      int_type count = row_offsets(iRow+1) + cost_per_row*iRow;
+    int_type count = row_offsets(iRow + 1) + cost_per_row * iRow;
 
-      if(iRow == num_rows-1) row_block_offsets(num_blocks) = num_rows;
+    if (iRow == num_rows - 1) row_block_offsets(num_blocks) = num_rows;
 
-      if(true) {
-        int_type current_block = (count-row_cost-cost_per_row)/cost_per_workset;
-        int_type end_block = count/cost_per_workset;
+    if (true) {
+      int_type current_block =
+          (count - row_cost - cost_per_row) / cost_per_workset;
+      int_type end_block = count / cost_per_workset;
 
-        // Handle some corner cases for the last two blocks.
-        if(current_block >= num_blocks-2) {
-          if((current_block == num_blocks-2) && (count >= (current_block + 1) * cost_per_workset)) {
-            int_type row = iRow;
-            int_type cc = count-row_cost-cost_per_row;
-            int_type block = cc/cost_per_workset;
-            while((block>0) && (block==current_block)) {
-              cc = row_offsets(row)+row*cost_per_row;
-              block = cc/cost_per_workset;
-              row--;
-            }
-            if((count-cc-row_cost-cost_per_row) < num_entries-row_offsets(iRow+1)) {
-              row_block_offsets(current_block+1) = iRow+1;
-            } else {
-              row_block_offsets(current_block+1) = iRow;
-            }
+      // Handle some corner cases for the last two blocks.
+      if (current_block >= num_blocks - 2) {
+        if ((current_block == num_blocks - 2) &&
+            (count >= (current_block + 1) * cost_per_workset)) {
+          int_type row   = iRow;
+          int_type cc    = count - row_cost - cost_per_row;
+          int_type block = cc / cost_per_workset;
+          while ((block > 0) && (block == current_block)) {
+            cc    = row_offsets(row) + row * cost_per_row;
+            block = cc / cost_per_workset;
+            row--;
           }
-        } else {
-          if((count >= (current_block + 1) * cost_per_workset) ||
-             (iRow+2 == row_offsets.extent(0))) {
-            if(end_block>current_block+1) {
-              int_type num_block = end_block-current_block;
-              row_block_offsets(current_block+1) = iRow;
-              for(int_type block = current_block+2; block <= end_block; block++)
-                if((block<current_block+2+(num_block-1)/2))
-                  row_block_offsets(block) = iRow;
-                else
-                  row_block_offsets(block) = iRow+1;
-            } else {
-              row_block_offsets(current_block+1) = iRow+1;
-            }
+          if ((count - cc - row_cost - cost_per_row) <
+              num_entries - row_offsets(iRow + 1)) {
+            row_block_offsets(current_block + 1) = iRow + 1;
+          } else {
+            row_block_offsets(current_block + 1) = iRow;
+          }
+        }
+      } else {
+        if ((count >= (current_block + 1) * cost_per_workset) ||
+            (iRow + 2 == row_offsets.extent(0))) {
+          if (end_block > current_block + 1) {
+            int_type num_block                   = end_block - current_block;
+            row_block_offsets(current_block + 1) = iRow;
+            for (int_type block = current_block + 2; block <= end_block;
+                 block++)
+              if ((block < current_block + 2 + (num_block - 1) / 2))
+                row_block_offsets(block) = iRow;
+              else
+                row_block_offsets(block) = iRow + 1;
+          } else {
+            row_block_offsets(current_block + 1) = iRow + 1;
           }
         }
-
       }
     }
-  };
-}
+  }
+};
+}  // namespace Impl
 
 /// \class GraphRowViewConst
 /// \brief View of a row of a sparse graph.
-/// \tparam GraphType Sparse graph type, such as (but not limited to) StaticCrsGraph.
+/// \tparam GraphType Sparse graph type, such as (but not limited to)
+/// StaticCrsGraph.
 ///
 /// This class provides a generic view of a row of a sparse graph.
 /// We intended this class to view a row of a StaticCrsGraph, but
@@ -137,7 +143,8 @@ namespace Impl {
 ///
 /// The row view is suited for computational kernels like sparse
 /// matrix-vector multiply, as well as for modifying entries in the
-/// sparse matrix.  The view is always const as it does not allow graph modification.
+/// sparse matrix.  The view is always const as it does not allow graph
+/// modification.
 ///
 /// Here is an example loop over the entries in the row:
 /// \code
@@ -160,12 +167,12 @@ namespace Impl {
 /// The stride is one for the compressed sparse row storage format (as
 /// is used by CrsMatrix), but may be greater than one for other
 /// sparse matrix storage formats (e.g., ELLPACK or jagged diagonal).
-template<class GraphType>
+template <class GraphType>
 struct GraphRowViewConst {
   //! The type of the column indices in the row.
   typedef const typename GraphType::data_type ordinal_type;
 
-private:
+ private:
   //! Array of (local) column indices in the row.
   ordinal_type* colidx_;
   /// \brief Stride between successive entries in the row.
@@ -177,7 +184,7 @@ private:
   /// \c ordinal_type is the correct type.
   const ordinal_type stride_;
 
-public:
+ public:
   /// \brief Constructor
   ///
   /// \param values [in] Array of the row's values.
@@ -186,11 +193,9 @@ public:
   ///   each of the above arrays.
   /// \param count [in] Number of entries in the row.
   KOKKOS_INLINE_FUNCTION
-  GraphRowViewConst ( ordinal_type* const colidx_in,
-                      const ordinal_type& stride,
-                      const ordinal_type& count) :
-    colidx_ (colidx_in), stride_ (stride), length (count)
-  {}
+  GraphRowViewConst(ordinal_type* const colidx_in, const ordinal_type& stride,
+                    const ordinal_type& count)
+      : colidx_(colidx_in), stride_(stride), length(count) {}
 
   /// \brief Constructor with offset into \c colidx array
   ///
@@ -204,15 +209,14 @@ public:
   ///   built-in integer type.  This may differ from ordinal_type.
   ///   For example, the matrix may have dimensions that fit in int,
   ///   but a number of entries that does not fit in int.
-  template<class OffsetType>
-  KOKKOS_INLINE_FUNCTION
-  GraphRowViewConst ( const typename GraphType::entries_type& colidx_in,
-                      const ordinal_type& stride,
-                      const ordinal_type& count,
-                      const OffsetType& idx,
-                      const typename std::enable_if<std::is_integral<OffsetType>::value, int>::type& = 0) :
-    colidx_ (&colidx_in(idx)), stride_ (stride), length (count)
-  {}
+  template <class OffsetType>
+  KOKKOS_INLINE_FUNCTION GraphRowViewConst(
+      const typename GraphType::entries_type& colidx_in,
+      const ordinal_type& stride, const ordinal_type& count,
+      const OffsetType& idx,
+      const typename std::enable_if<std::is_integral<OffsetType>::value,
+                                    int>::type& = 0)
+      : colidx_(&colidx_in(idx)), stride_(stride), length(count) {}
 
   /// \brief Number of entries in the row.
   ///
@@ -232,18 +236,15 @@ public:
   /// "Entry i" is not necessarily the entry with column index i, nor
   /// does i necessarily correspond to the (local) row index.
   KOKKOS_INLINE_FUNCTION
-  ordinal_type& colidx (const ordinal_type& i) const {
-    return colidx_[i*stride_];
+  ordinal_type& colidx(const ordinal_type& i) const {
+    return colidx_[i * stride_];
   }
 
   /// \brief An alias for colidx
   KOKKOS_INLINE_FUNCTION
-  ordinal_type& operator()(const ordinal_type& i) const {
-    return colidx(i);
-  }
+  ordinal_type& operator()(const ordinal_type& i) const { return colidx(i); }
 };
 
-
 /// \class StaticCrsGraph
 /// \brief Compressed row storage array.
 ///
@@ -277,39 +278,50 @@ public:
 /// <li> <tt> entries( entry ,            i2 , i3 , ... ); </tt> </li>
 /// <li> <tt> entries( row_map[i0] + i1 , i2 , i3 , ... ); </tt> </li>
 /// </ul>
-template< class DataType,
-          class Arg1Type,
-          class Arg2Type = void,
+template <class DataType, class Arg1Type, class Arg2Type = void,
 #ifdef KOKKOS_ENABLE_DEPRECATED_CODE
-          typename SizeType = typename ViewTraits<DataType*, Arg1Type, Arg2Type >::size_type,
+          typename SizeType =
+              typename ViewTraits<DataType*, Arg1Type, Arg2Type>::size_type,
           class Arg3Type = void>
 #else
-          class Arg3Type = void,
-          typename SizeType = typename ViewTraits<DataType*, Arg1Type, Arg2Type, Arg3Type >::size_type>
+          class Arg3Type    = void,
+          typename SizeType = typename ViewTraits<DataType*, Arg1Type, Arg2Type,
+                                                  Arg3Type>::size_type>
 #endif
 class StaticCrsGraph {
-private:
+ private:
   typedef ViewTraits<DataType*, Arg1Type, Arg2Type, Arg3Type> traits;
 
-public:
-  typedef DataType                                            data_type;
-  typedef typename traits::array_layout                       array_layout;
-  typedef typename traits::execution_space                    execution_space;
-  typedef typename traits::device_type                        device_type;
-  typedef typename traits::memory_traits                      memory_traits;
-  typedef SizeType                                            size_type;
+ public:
+  typedef DataType data_type;
+  typedef typename traits::array_layout array_layout;
+  typedef typename traits::execution_space execution_space;
+  typedef typename traits::device_type device_type;
+  typedef typename traits::memory_traits memory_traits;
+  typedef SizeType size_type;
 
 #ifdef KOKKOS_ENABLE_DEPRECATED_CODE
-  typedef StaticCrsGraph< DataType , Arg1Type , Arg2Type , SizeType , Arg3Type > staticcrsgraph_type;
-  typedef StaticCrsGraph< data_type , array_layout , typename traits::host_mirror_space , size_type, memory_traits > HostMirror;
+  typedef StaticCrsGraph<DataType, Arg1Type, Arg2Type, SizeType, Arg3Type>
+      staticcrsgraph_type;
+  typedef StaticCrsGraph<data_type, array_layout,
+                         typename traits::host_mirror_space, size_type,
+                         memory_traits>
+      HostMirror;
 #else
-  typedef StaticCrsGraph< DataType , Arg1Type , Arg2Type , Arg3Type, SizeType > staticcrsgraph_type;
-  typedef StaticCrsGraph< data_type , array_layout , typename traits::host_mirror_space , memory_traits, size_type > HostMirror;
+  typedef StaticCrsGraph<DataType, Arg1Type, Arg2Type, Arg3Type, SizeType>
+      staticcrsgraph_type;
+  typedef StaticCrsGraph<data_type, array_layout,
+                         typename traits::host_mirror_space, memory_traits,
+                         size_type>
+      HostMirror;
 #endif
 
-  typedef View< const size_type* , array_layout, device_type , memory_traits >  row_map_type;
-  typedef View<       data_type* , array_layout, device_type , memory_traits >  entries_type;
-  typedef View< const size_type* , array_layout, device_type , memory_traits >  row_block_type;
+  typedef View<const size_type*, array_layout, device_type, memory_traits>
+      row_map_type;
+  typedef View<data_type*, array_layout, device_type, memory_traits>
+      entries_type;
+  typedef View<const size_type*, array_layout, device_type, memory_traits>
+      row_block_type;
 
   entries_type entries;
   row_map_type row_map;
@@ -317,28 +329,28 @@ public:
 
   //! Construct an empty view.
   KOKKOS_INLINE_FUNCTION
-  StaticCrsGraph () : entries(), row_map(), row_block_offsets() {}
+  StaticCrsGraph() : entries(), row_map(), row_block_offsets() {}
 
   //! Copy constructor (shallow copy).
   KOKKOS_INLINE_FUNCTION
-  StaticCrsGraph (const StaticCrsGraph& rhs) : entries (rhs.entries), row_map (rhs.row_map),
-                                               row_block_offsets(rhs.row_block_offsets)
-  {}
+  StaticCrsGraph(const StaticCrsGraph& rhs)
+      : entries(rhs.entries),
+        row_map(rhs.row_map),
+        row_block_offsets(rhs.row_block_offsets) {}
 
-  template<class EntriesType, class RowMapType>
-  KOKKOS_INLINE_FUNCTION
-  StaticCrsGraph (const EntriesType& entries_,const RowMapType& row_map_) : entries (entries_), row_map (row_map_),
-  row_block_offsets()
-  {}
+  template <class EntriesType, class RowMapType>
+  KOKKOS_INLINE_FUNCTION StaticCrsGraph(const EntriesType& entries_,
+                                        const RowMapType& row_map_)
+      : entries(entries_), row_map(row_map_), row_block_offsets() {}
 
   /** \brief  Assign to a view of the rhs array.
    *          If the old view is the last view
    *          then allocated memory is deallocated.
    */
   KOKKOS_INLINE_FUNCTION
-  StaticCrsGraph& operator= (const StaticCrsGraph& rhs) {
-    entries = rhs.entries;
-    row_map = rhs.row_map;
+  StaticCrsGraph& operator=(const StaticCrsGraph& rhs) {
+    entries           = rhs.entries;
+    row_map           = rhs.row_map;
     row_block_offsets = rhs.row_block_offsets;
     return *this;
   }
@@ -353,9 +365,9 @@ public:
    */
   KOKKOS_INLINE_FUNCTION
   size_type numRows() const {
-    return (row_map.extent(0) != 0) ?
-      row_map.extent(0) - static_cast<size_type> (1) :
-      static_cast<size_type> (0);
+    return (row_map.extent(0) != 0)
+               ? row_map.extent(0) - static_cast<size_type>(1)
+               : static_cast<size_type>(0);
   }
 
   /// \brief Return a const view of row i of the graph.
@@ -377,30 +389,33 @@ public:
   /// ELLPACK or Jagged Diagonal) that we may wish to support in the
   /// future.
   KOKKOS_INLINE_FUNCTION
-  GraphRowViewConst<StaticCrsGraph> rowConst (const data_type i) const {
+  GraphRowViewConst<StaticCrsGraph> rowConst(const data_type i) const {
     const size_type start = row_map(i);
     // count is guaranteed to fit in ordinal_type, as long as no row
     // has duplicate entries.
-    const data_type count = static_cast<data_type> (row_map(i+1) - start);
+    const data_type count = static_cast<data_type>(row_map(i + 1) - start);
 
     if (count == 0) {
-      return GraphRowViewConst<StaticCrsGraph> (NULL, 1, 0);
+      return GraphRowViewConst<StaticCrsGraph>(NULL, 1, 0);
     } else {
-      return GraphRowViewConst<StaticCrsGraph> (entries, 1, count, start);
+      return GraphRowViewConst<StaticCrsGraph>(entries, 1, count, start);
     }
   }
 
   /**  \brief  Create a row partitioning into a given number of blocks
    *           balancing non-zeros + a fixed cost per row.
    */
-  void create_block_partitioning(size_type num_blocks, size_type fix_cost_per_row = 4) {
-    View< size_type* , array_layout, device_type >
-      block_offsets("StatisCrsGraph::load_balance_offsets",num_blocks+1);
+  void create_block_partitioning(size_type num_blocks,
+                                 size_type fix_cost_per_row = 4) {
+    View<size_type*, array_layout, device_type> block_offsets(
+        "StatisCrsGraph::load_balance_offsets", num_blocks + 1);
 
-    Impl::StaticCrsGraphBalancerFunctor<row_map_type,View< size_type* , array_layout, device_type > >
-      partitioner(row_map,block_offsets,fix_cost_per_row,num_blocks);
+    Impl::StaticCrsGraphBalancerFunctor<
+        row_map_type, View<size_type*, array_layout, device_type> >
+        partitioner(row_map, block_offsets, fix_cost_per_row, num_blocks);
 
-    Kokkos::parallel_for(Kokkos::RangePolicy<execution_space>(0,numRows()),partitioner);
+    Kokkos::parallel_for(Kokkos::RangePolicy<execution_space>(0, numRows()),
+                         partitioner);
     Kokkos::fence();
 
     row_block_offsets = block_offsets;
@@ -409,49 +424,48 @@ public:
 
 //----------------------------------------------------------------------------
 
-template< class StaticCrsGraphType , class InputSizeType >
-typename StaticCrsGraphType::staticcrsgraph_type
-create_staticcrsgraph( const std::string & label ,
-                 const std::vector< InputSizeType > & input );
+template <class StaticCrsGraphType, class InputSizeType>
+typename StaticCrsGraphType::staticcrsgraph_type create_staticcrsgraph(
+    const std::string& label, const std::vector<InputSizeType>& input);
 
-template< class StaticCrsGraphType , class InputSizeType >
-typename StaticCrsGraphType::staticcrsgraph_type
-create_staticcrsgraph( const std::string & label ,
-                 const std::vector< std::vector< InputSizeType > > & input );
+template <class StaticCrsGraphType, class InputSizeType>
+typename StaticCrsGraphType::staticcrsgraph_type create_staticcrsgraph(
+    const std::string& label,
+    const std::vector<std::vector<InputSizeType> >& input);
 
 //----------------------------------------------------------------------------
 
-template< class DataType ,
-          class Arg1Type ,
-          class Arg2Type ,
+template <class DataType, class Arg1Type, class Arg2Type,
 #ifdef KOKKOS_ENABLE_DEPRECATED_CODE
-          typename SizeType ,
-          class Arg3Type >
-typename StaticCrsGraph< DataType , Arg1Type , Arg2Type , SizeType , Arg3Type >::HostMirror
-create_mirror_view( const StaticCrsGraph<DataType,Arg1Type,Arg2Type,SizeType,Arg3Type > & input );
+          typename SizeType, class Arg3Type>
+typename StaticCrsGraph<DataType, Arg1Type, Arg2Type, SizeType,
+                        Arg3Type>::HostMirror
+create_mirror_view(const StaticCrsGraph<DataType, Arg1Type, Arg2Type, SizeType,
+                                        Arg3Type>& input);
 #else
-          class Arg3Type ,
-          typename SizeType >
-typename StaticCrsGraph< DataType , Arg1Type , Arg2Type , Arg3Type , SizeType >::HostMirror
-create_mirror_view( const StaticCrsGraph<DataType,Arg1Type,Arg2Type,Arg3Type,SizeType > & input );
+          class Arg3Type, typename SizeType>
+typename StaticCrsGraph<DataType, Arg1Type, Arg2Type, Arg3Type,
+                        SizeType>::HostMirror
+create_mirror_view(const StaticCrsGraph<DataType, Arg1Type, Arg2Type, Arg3Type,
+                                        SizeType>& input);
 #endif
 
-template< class DataType ,
-          class Arg1Type ,
-          class Arg2Type ,
+template <class DataType, class Arg1Type, class Arg2Type,
 #ifdef KOKKOS_ENABLE_DEPRECATED_CODE
-          typename SizeType ,
-          class Arg3Type >
-typename StaticCrsGraph< DataType , Arg1Type , Arg2Type , SizeType , Arg3Type >::HostMirror
-create_mirror_view( const StaticCrsGraph<DataType,Arg1Type,Arg2Type,SizeType,Arg3Type > & input );
+          typename SizeType, class Arg3Type>
+typename StaticCrsGraph<DataType, Arg1Type, Arg2Type, SizeType,
+                        Arg3Type>::HostMirror
+create_mirror_view(const StaticCrsGraph<DataType, Arg1Type, Arg2Type, SizeType,
+                                        Arg3Type>& input);
 #else
-          class Arg3Type ,
-          typename SizeType >
-typename StaticCrsGraph< DataType , Arg1Type , Arg2Type , Arg3Type , SizeType >::HostMirror
-create_mirror( const StaticCrsGraph<DataType,Arg1Type,Arg2Type,Arg3Type,SizeType > & input );
+          class Arg3Type, typename SizeType>
+typename StaticCrsGraph<DataType, Arg1Type, Arg2Type, Arg3Type,
+                        SizeType>::HostMirror
+create_mirror(const StaticCrsGraph<DataType, Arg1Type, Arg2Type, Arg3Type,
+                                   SizeType>& input);
 #endif
 
-} // namespace Kokkos
+}  // namespace Kokkos
 
 //----------------------------------------------------------------------------
 //----------------------------------------------------------------------------
@@ -464,55 +478,57 @@ create_mirror( const StaticCrsGraph<DataType,Arg1Type,Arg2Type,Arg3Type,SizeType
 namespace Kokkos {
 namespace Impl {
 
-template< class GraphType >
+template <class GraphType>
 struct StaticCrsGraphMaximumEntry {
+  typedef typename GraphType::execution_space execution_space;
+  typedef typename GraphType::data_type value_type;
 
-  typedef typename GraphType::execution_space execution_space ;
-  typedef typename GraphType::data_type value_type ;
+  const typename GraphType::entries_type entries;
 
-  const typename GraphType::entries_type entries ;
-
-  StaticCrsGraphMaximumEntry( const GraphType & graph ) : entries( graph.entries ) {}
+  StaticCrsGraphMaximumEntry(const GraphType& graph) : entries(graph.entries) {}
 
   KOKKOS_INLINE_FUNCTION
-  void operator()( const unsigned i , value_type & update ) const
-    { if ( update < entries(i) ) update = entries(i); }
+  void operator()(const unsigned i, value_type& update) const {
+    if (update < entries(i)) update = entries(i);
+  }
 
   KOKKOS_INLINE_FUNCTION
-  void init( value_type & update ) const
-    { update = 0 ; }
+  void init(value_type& update) const { update = 0; }
 
   KOKKOS_INLINE_FUNCTION
-  void join( volatile value_type & update ,
-             volatile const value_type & input ) const
-    { if ( update < input ) update = input ; }
+  void join(volatile value_type& update,
+            volatile const value_type& input) const {
+    if (update < input) update = input;
+  }
 };
 
-}
+}  // namespace Impl
 
 #ifdef KOKKOS_ENABLE_DEPRECATED_CODE
-template< class DataType, class Arg1Type, class Arg2Type, typename SizeType , class Arg3Type >
-DataType maximum_entry( const StaticCrsGraph< DataType , Arg1Type , Arg2Type , SizeType , Arg3Type > & graph )
-{
-  typedef StaticCrsGraph<DataType,Arg1Type,Arg2Type,SizeType,Arg3Type> GraphType ;
+template <class DataType, class Arg1Type, class Arg2Type, typename SizeType,
+          class Arg3Type>
+DataType maximum_entry(const StaticCrsGraph<DataType, Arg1Type, Arg2Type,
+                                            SizeType, Arg3Type>& graph) {
+  typedef StaticCrsGraph<DataType, Arg1Type, Arg2Type, SizeType, Arg3Type>
+      GraphType;
 #else
-template< class DataType, class Arg1Type, class Arg2Type, class Arg3Type, typename SizeType >
-DataType maximum_entry( const StaticCrsGraph< DataType , Arg1Type , Arg2Type , Arg3Type , SizeType > & graph )
-{
-  typedef StaticCrsGraph<DataType,Arg1Type,Arg2Type,Arg3Type,SizeType> GraphType ;
+template <class DataType, class Arg1Type, class Arg2Type, class Arg3Type,
+          typename SizeType>
+DataType maximum_entry(const StaticCrsGraph<DataType, Arg1Type, Arg2Type,
+                                            Arg3Type, SizeType>& graph) {
+  typedef StaticCrsGraph<DataType, Arg1Type, Arg2Type, Arg3Type, SizeType>
+      GraphType;
 #endif
-  typedef Impl::StaticCrsGraphMaximumEntry< GraphType > FunctorType ;
+  typedef Impl::StaticCrsGraphMaximumEntry<GraphType> FunctorType;
 
-  DataType result = 0 ;
-  Kokkos::parallel_reduce( graph.entries.extent(0),
-                           FunctorType(graph), result );
-  return result ;
+  DataType result = 0;
+  Kokkos::parallel_reduce(graph.entries.extent(0), FunctorType(graph), result);
+  return result;
 }
 
-} // namespace Kokkos
+}  // namespace Kokkos
 
 //----------------------------------------------------------------------------
 //----------------------------------------------------------------------------
 
 #endif /* #ifndef KOKKOS_CRSARRAY_HPP */
-
diff --git a/lib/kokkos/containers/src/Kokkos_UnorderedMap.hpp b/lib/kokkos/containers/src/Kokkos_UnorderedMap.hpp
index aed723288f..32c04996bb 100644
--- a/lib/kokkos/containers/src/Kokkos_UnorderedMap.hpp
+++ b/lib/kokkos/containers/src/Kokkos_UnorderedMap.hpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -58,13 +59,11 @@
 #include <impl/Kokkos_Traits.hpp>
 #include <impl/Kokkos_UnorderedMap_impl.hpp>
 
-
 #include <iostream>
 
 #include <cstdint>
 #include <stdexcept>
 
-
 namespace Kokkos {
 
 enum { UnorderedMapInvalidIndex = ~0u };
@@ -83,17 +82,16 @@ enum { UnorderedMapInvalidIndex = ~0u };
 ///      ignored and the old value was left in place. </li>
 /// </ol>
 
-class UnorderedMapInsertResult
-{
-private:
-  enum Status{
-     SUCCESS = 1u << 31
-   , EXISTING = 1u << 30
-   , FREED_EXISTING = 1u << 29
-   , LIST_LENGTH_MASK = ~(SUCCESS | EXISTING | FREED_EXISTING)
+class UnorderedMapInsertResult {
+ private:
+  enum Status {
+    SUCCESS          = 1u << 31,
+    EXISTING         = 1u << 30,
+    FREED_EXISTING   = 1u << 29,
+    LIST_LENGTH_MASK = ~(SUCCESS | EXISTING | FREED_EXISTING)
   };
 
-public:
+ public:
   /// Did the map successful insert the key/value pair
   KOKKOS_FORCEINLINE_FUNCTION
   bool success() const { return (m_status & SUCCESS); }
@@ -102,7 +100,7 @@ public:
   KOKKOS_FORCEINLINE_FUNCTION
   bool existing() const { return (m_status & EXISTING); }
 
-  /// Did the map fail to insert the key due to insufficent capacity
+  /// Did the map fail to insert the key due to insufficient capacity
   KOKKOS_FORCEINLINE_FUNCTION
   bool failed() const { return m_index == UnorderedMapInvalidIndex; }
 
@@ -121,32 +119,27 @@ public:
   uint32_t index() const { return m_index; }
 
   KOKKOS_FORCEINLINE_FUNCTION
-  UnorderedMapInsertResult()
-    : m_index(UnorderedMapInvalidIndex)
-    , m_status(0)
-  {}
+  UnorderedMapInsertResult() : m_index(UnorderedMapInvalidIndex), m_status(0) {}
 
   KOKKOS_FORCEINLINE_FUNCTION
-  void increment_list_position()
-  {
+  void increment_list_position() {
     m_status += (list_position() < LIST_LENGTH_MASK) ? 1u : 0u;
   }
 
   KOKKOS_FORCEINLINE_FUNCTION
-  void set_existing(uint32_t i, bool arg_freed_existing)
-  {
+  void set_existing(uint32_t i, bool arg_freed_existing) {
     m_index = i;
-    m_status = EXISTING | (arg_freed_existing ? FREED_EXISTING : 0u) | list_position();
+    m_status =
+        EXISTING | (arg_freed_existing ? FREED_EXISTING : 0u) | list_position();
   }
 
   KOKKOS_FORCEINLINE_FUNCTION
-  void set_success(uint32_t i)
-  {
-    m_index = i;
+  void set_success(uint32_t i) {
+    m_index  = i;
     m_status = SUCCESS | list_position();
   }
 
-private:
+ private:
   uint32_t m_index;
   uint32_t m_status;
 };
@@ -206,26 +199,26 @@ private:
 /// \tparam EqualTo Definition of the equality function for instances of
 ///   <tt>Key</tt>.  The default will do a bitwise equality comparison.
 ///
-template <   typename Key
-           , typename Value
-           , typename Device = Kokkos::DefaultExecutionSpace
-           , typename Hasher = pod_hash<typename Impl::remove_const<Key>::type>
-           , typename EqualTo = pod_equal_to<typename Impl::remove_const<Key>::type>
-        >
-class UnorderedMap
-{
-private:
-  typedef typename ViewTraits<Key,Device,void,void>::host_mirror_space host_mirror_space ;
-public:
+template <typename Key, typename Value,
+          typename Device = Kokkos::DefaultExecutionSpace,
+          typename Hasher = pod_hash<typename Impl::remove_const<Key>::type>,
+          typename EqualTo =
+              pod_equal_to<typename Impl::remove_const<Key>::type> >
+class UnorderedMap {
+ private:
+  typedef typename ViewTraits<Key, Device, void, void>::host_mirror_space
+      host_mirror_space;
+
+ public:
   //! \name Public types and constants
   //@{
 
-  //key_types
+  // key_types
   typedef Key declared_key_type;
   typedef typename Impl::remove_const<declared_key_type>::type key_type;
   typedef typename Impl::add_const<key_type>::type const_key_type;
 
-  //value_types
+  // value_types
   typedef Value declared_value_type;
   typedef typename Impl::remove_const<declared_value_type>::type value_type;
   typedef typename Impl::add_const<value_type>::type const_value_type;
@@ -233,116 +226,126 @@ public:
   typedef Device device_type;
   typedef typename Device::execution_space execution_space;
   typedef Hasher hasher_type;
-  typedef EqualTo  equal_to_type;
+  typedef EqualTo equal_to_type;
   typedef uint32_t size_type;
 
-  //map_types
-  typedef UnorderedMap<declared_key_type,declared_value_type,device_type,hasher_type,equal_to_type> declared_map_type;
-  typedef UnorderedMap<key_type,value_type,device_type,hasher_type,equal_to_type>                   insertable_map_type;
-  typedef UnorderedMap<const_key_type,value_type,device_type,hasher_type,equal_to_type>             modifiable_map_type;
-  typedef UnorderedMap<const_key_type,const_value_type,device_type,hasher_type,equal_to_type>       const_map_type;
+  // map_types
+  typedef UnorderedMap<declared_key_type, declared_value_type, device_type,
+                       hasher_type, equal_to_type>
+      declared_map_type;
+  typedef UnorderedMap<key_type, value_type, device_type, hasher_type,
+                       equal_to_type>
+      insertable_map_type;
+  typedef UnorderedMap<const_key_type, value_type, device_type, hasher_type,
+                       equal_to_type>
+      modifiable_map_type;
+  typedef UnorderedMap<const_key_type, const_value_type, device_type,
+                       hasher_type, equal_to_type>
+      const_map_type;
 
-  static const bool is_set = std::is_same<void,value_type>::value;
-  static const bool has_const_key = std::is_same<const_key_type,declared_key_type>::value;
-  static const bool has_const_value = is_set || std::is_same<const_value_type,declared_value_type>::value;
+  static const bool is_set = std::is_same<void, value_type>::value;
+  static const bool has_const_key =
+      std::is_same<const_key_type, declared_key_type>::value;
+  static const bool has_const_value =
+      is_set || std::is_same<const_value_type, declared_value_type>::value;
 
-  static const bool is_insertable_map = !has_const_key && (is_set || !has_const_value);
+  static const bool is_insertable_map =
+      !has_const_key && (is_set || !has_const_value);
   static const bool is_modifiable_map = has_const_key && !has_const_value;
-  static const bool is_const_map = has_const_key && has_const_value;
-
+  static const bool is_const_map      = has_const_key && has_const_value;
 
   typedef UnorderedMapInsertResult insert_result;
 
-  typedef UnorderedMap<Key,Value,host_mirror_space,Hasher,EqualTo> HostMirror;
+  typedef UnorderedMap<Key, Value, host_mirror_space, Hasher, EqualTo>
+      HostMirror;
 
   typedef Impl::UnorderedMapHistogram<const_map_type> histogram_type;
 
   //@}
 
-private:
+ private:
   enum { invalid_index = ~static_cast<size_type>(0) };
 
-  typedef typename Impl::if_c< is_set, int, declared_value_type>::type impl_value_type;
+  typedef typename Impl::if_c<is_set, int, declared_value_type>::type
+      impl_value_type;
 
-  typedef typename Impl::if_c<   is_insertable_map
-                               , View< key_type *, device_type>
-                               , View< const key_type *, device_type, MemoryTraits<RandomAccess> >
-                             >::type key_type_view;
+  typedef typename Impl::if_c<
+      is_insertable_map, View<key_type *, device_type>,
+      View<const key_type *, device_type, MemoryTraits<RandomAccess> > >::type
+      key_type_view;
 
-  typedef typename Impl::if_c<   is_insertable_map || is_modifiable_map
-                               , View< impl_value_type *, device_type>
-                               , View< const impl_value_type *, device_type, MemoryTraits<RandomAccess> >
-                             >::type value_type_view;
+  typedef typename Impl::if_c<is_insertable_map || is_modifiable_map,
+                              View<impl_value_type *, device_type>,
+                              View<const impl_value_type *, device_type,
+                                   MemoryTraits<RandomAccess> > >::type
+      value_type_view;
 
-  typedef typename Impl::if_c<   is_insertable_map
-                               , View< size_type *, device_type>
-                               , View< const size_type *, device_type, MemoryTraits<RandomAccess> >
-                             >::type size_type_view;
+  typedef typename Impl::if_c<
+      is_insertable_map, View<size_type *, device_type>,
+      View<const size_type *, device_type, MemoryTraits<RandomAccess> > >::type
+      size_type_view;
 
-  typedef typename Impl::if_c<   is_insertable_map
-                               , Bitset< execution_space >
-                               , ConstBitset< execution_space>
-                             >::type bitset_type;
+  typedef typename Impl::if_c<is_insertable_map, Bitset<execution_space>,
+                              ConstBitset<execution_space> >::type bitset_type;
 
   enum { modified_idx = 0, erasable_idx = 1, failed_insert_idx = 2 };
   enum { num_scalars = 3 };
-  typedef View< int[num_scalars], LayoutLeft, device_type> scalars_view;
+  typedef View<int[num_scalars], LayoutLeft, device_type> scalars_view;
 
-public:
+ public:
   //! \name Public member functions
   //@{
 
   UnorderedMap()
-    : m_bounded_insert()
-    , m_hasher()
-    , m_equal_to()
-    , m_size()
-    , m_available_indexes()
-    , m_hash_lists()
-    , m_next_index()
-    , m_keys()
-    , m_values()
-    , m_scalars()
-  {}
+      : m_bounded_insert(),
+        m_hasher(),
+        m_equal_to(),
+        m_size(),
+        m_available_indexes(),
+        m_hash_lists(),
+        m_next_index(),
+        m_keys(),
+        m_values(),
+        m_scalars() {}
 
   /// \brief Constructor
   ///
-  /// \param capacity_hint [in] Initial guess of how many unique keys will be inserted into the map
-  /// \param hash [in] Hasher function for \c Key instances.  The
+  /// \param capacity_hint [in] Initial guess of how many unique keys will be
+  /// inserted into the map \param hash [in] Hasher function for \c Key
+  /// instances.  The
   ///   default value usually suffices.
-  UnorderedMap(  size_type capacity_hint, hasher_type hasher = hasher_type(), equal_to_type equal_to = equal_to_type() )
-    : m_bounded_insert(true)
-    , m_hasher(hasher)
-    , m_equal_to(equal_to)
-    , m_size()
-    , m_available_indexes(calculate_capacity(capacity_hint))
-    , m_hash_lists(ViewAllocateWithoutInitializing("UnorderedMap hash list"), Impl::find_hash_size(capacity()))
-    , m_next_index(ViewAllocateWithoutInitializing("UnorderedMap next index"), capacity()+1) // +1 so that the *_at functions can always return a valid reference
-    , m_keys("UnorderedMap keys",capacity()+1)
-    , m_values("UnorderedMap values",(is_set? 1 : capacity()+1))
-    , m_scalars("UnorderedMap scalars")
-  {
+  UnorderedMap(size_type capacity_hint, hasher_type hasher = hasher_type(),
+               equal_to_type equal_to = equal_to_type())
+      : m_bounded_insert(true),
+        m_hasher(hasher),
+        m_equal_to(equal_to),
+        m_size(),
+        m_available_indexes(calculate_capacity(capacity_hint)),
+        m_hash_lists(ViewAllocateWithoutInitializing("UnorderedMap hash list"),
+                     Impl::find_hash_size(capacity())),
+        m_next_index(ViewAllocateWithoutInitializing("UnorderedMap next index"),
+                     capacity() + 1)  // +1 so that the *_at functions can
+                                      // always return a valid reference
+        ,
+        m_keys("UnorderedMap keys", capacity() + 1),
+        m_values("UnorderedMap values", (is_set ? 1 : capacity() + 1)),
+        m_scalars("UnorderedMap scalars") {
     if (!is_insertable_map) {
-      throw std::runtime_error("Cannot construct a non-insertable (i.e. const key_type) unordered_map");
+      throw std::runtime_error(
+          "Cannot construct a non-insertable (i.e. const key_type) "
+          "unordered_map");
     }
 
     Kokkos::deep_copy(m_hash_lists, invalid_index);
     Kokkos::deep_copy(m_next_index, invalid_index);
   }
 
-  void reset_failed_insert_flag()
-  {
-    reset_flag(failed_insert_idx);
-  }
+  void reset_failed_insert_flag() { reset_flag(failed_insert_idx); }
 
-  histogram_type get_histogram()
-  {
-    return histogram_type(*this);
-  }
+  histogram_type get_histogram() { return histogram_type(*this); }
 
   //! Clear all entries in the table.
-  void clear()
-  {
+  void clear() {
     m_bounded_insert = true;
 
     if (capacity() == 0) return;
@@ -353,15 +356,13 @@ public:
     Kokkos::deep_copy(m_next_index, invalid_index);
     {
       const key_type tmp = key_type();
-      Kokkos::deep_copy(m_keys,tmp);
+      Kokkos::deep_copy(m_keys, tmp);
     }
-    if (is_set){
+    if (is_set) {
       const impl_value_type tmp = impl_value_type();
-      Kokkos::deep_copy(m_values,tmp);
-    }
-    {
-      Kokkos::deep_copy(m_scalars, 0);
+      Kokkos::deep_copy(m_values, tmp);
     }
+    { Kokkos::deep_copy(m_scalars, 0); }
   }
 
   /// \brief Change the capacity of the the map
@@ -374,24 +375,23 @@ public:
   ///
   /// This is <i>not</i> a device function; it may <i>not</i> be
   /// called in a parallel kernel.
-  bool rehash(size_type requested_capacity = 0)
-  {
+  bool rehash(size_type requested_capacity = 0) {
     const bool bounded_insert = (capacity() == 0) || (size() == 0u);
-    return rehash(requested_capacity, bounded_insert );
+    return rehash(requested_capacity, bounded_insert);
   }
 
-  bool rehash(size_type requested_capacity, bool bounded_insert)
-  {
-    if(!is_insertable_map) return false;
+  bool rehash(size_type requested_capacity, bool bounded_insert) {
+    if (!is_insertable_map) return false;
 
     const size_type curr_size = size();
-    requested_capacity = (requested_capacity < curr_size) ? curr_size : requested_capacity;
+    requested_capacity =
+        (requested_capacity < curr_size) ? curr_size : requested_capacity;
 
     insertable_map_type tmp(requested_capacity, m_hasher, m_equal_to);
 
     if (curr_size) {
       tmp.m_bounded_insert = false;
-      Impl::UnorderedMapRehash<insertable_map_type> f(tmp,*this);
+      Impl::UnorderedMapRehash<insertable_map_type> f(tmp, *this);
       f.apply();
     }
     tmp.m_bounded_insert = bounded_insert;
@@ -408,9 +408,8 @@ public:
   /// Note that this is not a device function; it cannot be called in
   /// a parallel kernel.  The value is not stored as a variable; it
   /// must be computed.
-  size_type size() const
-  {
-    if( capacity() == 0u ) return 0u;
+  size_type size() const {
+    if (capacity() == 0u) return 0u;
     if (modified()) {
       m_size = m_available_indexes.count();
       reset_flag(modified_idx);
@@ -423,18 +422,13 @@ public:
   /// This is <i>not</i> a device function; it may <i>not</i> be
   /// called in a parallel kernel.  The value is not stored as a
   /// variable; it must be computed.
-  bool failed_insert() const
-  {
-    return get_flag(failed_insert_idx);
-  }
+  bool failed_insert() const { return get_flag(failed_insert_idx); }
 
-  bool erasable() const
-  {
+  bool erasable() const {
     return is_insertable_map ? get_flag(erasable_idx) : false;
   }
 
-  bool begin_erase()
-  {
+  bool begin_erase() {
     bool result = !erasable();
     if (is_insertable_map && result) {
       execution_space().fence();
@@ -444,8 +438,7 @@ public:
     return result;
   }
 
-  bool end_erase()
-  {
+  bool end_erase() {
     bool result = erasable();
     if (is_insertable_map && result) {
       execution_space().fence();
@@ -462,8 +455,7 @@ public:
   /// This <i>is</i> a device function; it may be called in a parallel
   /// kernel.
   KOKKOS_FORCEINLINE_FUNCTION
-  size_type capacity() const
-  { return m_available_indexes.size(); }
+  size_type capacity() const { return m_available_indexes.size(); }
 
   /// \brief The number of hash table "buckets."
   ///
@@ -476,13 +468,11 @@ public:
   /// This <i>is</i> a device function; it may be called in a parallel
   /// kernel.
   KOKKOS_INLINE_FUNCTION
-  size_type hash_capacity() const
-  { return m_hash_lists.extent(0); }
+  size_type hash_capacity() const { return m_hash_lists.extent(0); }
 
   //---------------------------------------------------------------------------
   //---------------------------------------------------------------------------
 
-
   /// This <i>is</i> a device function; it may be called in a parallel
   /// kernel.  As discussed in the class documentation, it need not
   /// succeed.  The return value tells you if it did.
@@ -492,136 +482,138 @@ public:
   ///   using this class as a set (with Value = void), then you need not
   ///   provide this value.
   KOKKOS_INLINE_FUNCTION
-  insert_result insert(key_type const& k, impl_value_type const&v = impl_value_type()) const
-  {
+  insert_result insert(key_type const &k,
+                       impl_value_type const &v = impl_value_type()) const {
     insert_result result;
 
-    if ( !is_insertable_map || capacity() == 0u || m_scalars((int)erasable_idx) ) {
+    if (!is_insertable_map || capacity() == 0u ||
+        m_scalars((int)erasable_idx)) {
       return result;
     }
 
-    if ( !m_scalars((int)modified_idx) ) {
+    if (!m_scalars((int)modified_idx)) {
       m_scalars((int)modified_idx) = true;
     }
 
-    int volatile & failed_insert_ref = m_scalars((int)failed_insert_idx) ;
+    int volatile &failed_insert_ref = m_scalars((int)failed_insert_idx);
 
     const size_type hash_value = m_hasher(k);
-    const size_type hash_list = hash_value % m_hash_lists.extent(0);
+    const size_type hash_list  = hash_value % m_hash_lists.extent(0);
 
-    size_type * curr_ptr   = & m_hash_lists[ hash_list ];
-    size_type new_index    = invalid_index ;
+    size_type *curr_ptr = &m_hash_lists[hash_list];
+    size_type new_index = invalid_index;
 
     // Force integer multiply to long
-    size_type index_hint = static_cast<size_type>( (static_cast<double>(hash_list) * capacity()) / m_hash_lists.extent(0));
+    size_type index_hint = static_cast<size_type>(
+        (static_cast<double>(hash_list) * capacity()) / m_hash_lists.extent(0));
 
     size_type find_attempts = 0;
 
     enum : unsigned { bounded_find_attempts = 32u };
-    const size_type max_attempts = (m_bounded_insert && (bounded_find_attempts < m_available_indexes.max_hint()) ) ?
-                                    bounded_find_attempts :
-                                    m_available_indexes.max_hint();
+    const size_type max_attempts =
+        (m_bounded_insert &&
+         (bounded_find_attempts < m_available_indexes.max_hint()))
+            ? bounded_find_attempts
+            : m_available_indexes.max_hint();
 
-    bool not_done = true ;
+    bool not_done = true;
 
-#if defined( __MIC__ )
-      #pragma noprefetch
+#if defined(__MIC__)
+#pragma noprefetch
 #endif
-    while ( not_done ) {
-
+    while (not_done) {
       // Continue searching the unordered list for this key,
       // list will only be appended during insert phase.
       // Need volatile_load as other threads may be appending.
       size_type curr = volatile_load(curr_ptr);
 
-      KOKKOS_NONTEMPORAL_PREFETCH_LOAD(&m_keys[curr != invalid_index ? curr : 0]);
-#if defined( __MIC__ )
-      #pragma noprefetch
+      KOKKOS_NONTEMPORAL_PREFETCH_LOAD(
+          &m_keys[curr != invalid_index ? curr : 0]);
+#if defined(__MIC__)
+#pragma noprefetch
 #endif
-      while ( curr != invalid_index && ! m_equal_to( volatile_load(&m_keys[curr]), k) ) {
+      while (curr != invalid_index &&
+             !m_equal_to(volatile_load(&m_keys[curr]), k)) {
         result.increment_list_position();
         index_hint = curr;
-        curr_ptr = &m_next_index[curr];
-        curr = volatile_load(curr_ptr);
-        KOKKOS_NONTEMPORAL_PREFETCH_LOAD(&m_keys[curr != invalid_index ? curr : 0]);
+        curr_ptr   = &m_next_index[curr];
+        curr       = volatile_load(curr_ptr);
+        KOKKOS_NONTEMPORAL_PREFETCH_LOAD(
+            &m_keys[curr != invalid_index ? curr : 0]);
       }
 
       //------------------------------------------------------------
       // If key already present then return that index.
-      if ( curr != invalid_index ) {
-
+      if (curr != invalid_index) {
         const bool free_existing = new_index != invalid_index;
-        if ( free_existing ) {
+        if (free_existing) {
           // Previously claimed an unused entry that was not inserted.
           // Release this unused entry immediately.
-          if (!m_available_indexes.reset(new_index) ) {
+          if (!m_available_indexes.reset(new_index)) {
             printf("Unable to free existing\n");
           }
-
         }
 
         result.set_existing(curr, free_existing);
-        not_done = false ;
+        not_done = false;
       }
       //------------------------------------------------------------
       // Key is not currently in the map.
       // If the thread has claimed an entry try to insert now.
       else {
-
         //------------------------------------------------------------
         // If have not already claimed an unused entry then do so now.
         if (new_index == invalid_index) {
-
           bool found = false;
           // use the hash_list as the flag for the search direction
-          Kokkos::tie(found, index_hint) = m_available_indexes.find_any_unset_near( index_hint, hash_list );
+          Kokkos::tie(found, index_hint) =
+              m_available_indexes.find_any_unset_near(index_hint, hash_list);
 
           // found and index and this thread set it
-          if ( !found && ++find_attempts >= max_attempts ) {
+          if (!found && ++find_attempts >= max_attempts) {
             failed_insert_ref = true;
-            not_done = false ;
-          }
-          else if (m_available_indexes.set(index_hint) ) {
+            not_done          = false;
+          } else if (m_available_indexes.set(index_hint)) {
             new_index = index_hint;
             // Set key and value
             KOKKOS_NONTEMPORAL_PREFETCH_STORE(&m_keys[new_index]);
-            m_keys[new_index] = k ;
+            m_keys[new_index] = k;
 
             if (!is_set) {
               KOKKOS_NONTEMPORAL_PREFETCH_STORE(&m_values[new_index]);
-              m_values[new_index] = v ;
+              m_values[new_index] = v;
             }
 
             // Do not proceed until key and value are updated in global memory
             memory_fence();
           }
-        }
-        else if (failed_insert_ref) {
+        } else if (failed_insert_ref) {
           not_done = false;
         }
 
         // Attempt to append claimed entry into the list.
-        // Another thread may also be trying to append the same list so protect with atomic.
-        if ( new_index != invalid_index &&
-             curr ==  atomic_compare_exchange(curr_ptr, static_cast<size_type>(invalid_index), new_index) ) {
+        // Another thread may also be trying to append the same list so protect
+        // with atomic.
+        if (new_index != invalid_index &&
+            curr == atomic_compare_exchange(
+                        curr_ptr, static_cast<size_type>(invalid_index),
+                        new_index)) {
           // Succeeded in appending
           result.set_success(new_index);
-          not_done = false ;
+          not_done = false;
         }
       }
-    } // while ( not_done )
+    }  // while ( not_done )
 
-    return result ;
+    return result;
   }
 
   KOKKOS_INLINE_FUNCTION
-  bool erase(key_type const& k) const
-  {
+  bool erase(key_type const &k) const {
     bool result = false;
 
-    if(is_insertable_map && 0u < capacity() && m_scalars((int)erasable_idx)) {
-
-      if ( ! m_scalars((int)modified_idx) ) {
+    if (is_insertable_map && 0u < capacity() && m_scalars((int)erasable_idx)) {
+      if (!m_scalars((int)modified_idx)) {
         m_scalars((int)modified_idx) = true;
       }
 
@@ -643,13 +635,15 @@ public:
   /// This <i>is</i> a device function; it may be called in a parallel
   /// kernel.
   KOKKOS_INLINE_FUNCTION
-  size_type find( const key_type & k) const
-  {
-    size_type curr = 0u < capacity() ? m_hash_lists( m_hasher(k) % m_hash_lists.extent(0) ) : invalid_index ;
+  size_type find(const key_type &k) const {
+    size_type curr = 0u < capacity()
+                         ? m_hash_lists(m_hasher(k) % m_hash_lists.extent(0))
+                         : invalid_index;
 
     KOKKOS_NONTEMPORAL_PREFETCH_LOAD(&m_keys[curr != invalid_index ? curr : 0]);
-    while (curr != invalid_index && !m_equal_to( m_keys[curr], k) ) {
-      KOKKOS_NONTEMPORAL_PREFETCH_LOAD(&m_keys[curr != invalid_index ? curr : 0]);
+    while (curr != invalid_index && !m_equal_to(m_keys[curr], k)) {
+      KOKKOS_NONTEMPORAL_PREFETCH_LOAD(
+          &m_keys[curr != invalid_index ? curr : 0]);
       curr = m_next_index[curr];
     }
 
@@ -661,11 +655,7 @@ public:
   /// This <i>is</i> a device function; it may be called in a parallel
   /// kernel.
   KOKKOS_INLINE_FUNCTION
-  bool exists( const key_type & k) const
-  {
-    return valid_at(find(k));
-  }
-
+  bool exists(const key_type &k) const { return valid_at(find(k)); }
 
   /// \brief Get the value with \c i as its direct index.
   ///
@@ -676,10 +666,10 @@ public:
   ///
   /// 'const value_type' via Cuda texture fetch must return by value.
   KOKKOS_FORCEINLINE_FUNCTION
-  typename Impl::if_c< (is_set || has_const_value), impl_value_type, impl_value_type &>::type
-  value_at(size_type i) const
-  {
-    return m_values[ is_set ? 0 : (i < capacity() ? i : capacity()) ];
+  typename Impl::if_c<(is_set || has_const_value), impl_value_type,
+                      impl_value_type &>::type
+  value_at(size_type i) const {
+    return m_values[is_set ? 0 : (i < capacity() ? i : capacity())];
   }
 
   /// \brief Get the key with \c i as its direct index.
@@ -689,138 +679,154 @@ public:
   /// This <i>is</i> a device function; it may be called in a parallel
   /// kernel.
   KOKKOS_FORCEINLINE_FUNCTION
-  key_type key_at(size_type i) const
-  {
-    return m_keys[ i < capacity() ? i : capacity() ];
+  key_type key_at(size_type i) const {
+    return m_keys[i < capacity() ? i : capacity()];
   }
 
   KOKKOS_FORCEINLINE_FUNCTION
-  bool valid_at(size_type i) const
-  {
-    return m_available_indexes.test(i);
-  }
+  bool valid_at(size_type i) const { return m_available_indexes.test(i); }
 
   template <typename SKey, typename SValue>
-  UnorderedMap( UnorderedMap<SKey,SValue,Device,Hasher,EqualTo> const& src,
-                typename Impl::enable_if< Impl::UnorderedMapCanAssign<declared_key_type,declared_value_type,SKey,SValue>::value,int>::type = 0
-              )
-    : m_bounded_insert(src.m_bounded_insert)
-    , m_hasher(src.m_hasher)
-    , m_equal_to(src.m_equal_to)
-    , m_size(src.m_size)
-    , m_available_indexes(src.m_available_indexes)
-    , m_hash_lists(src.m_hash_lists)
-    , m_next_index(src.m_next_index)
-    , m_keys(src.m_keys)
-    , m_values(src.m_values)
-    , m_scalars(src.m_scalars)
-  {}
-
+  UnorderedMap(
+      UnorderedMap<SKey, SValue, Device, Hasher, EqualTo> const &src,
+      typename Impl::enable_if<
+          Impl::UnorderedMapCanAssign<declared_key_type, declared_value_type,
+                                      SKey, SValue>::value,
+          int>::type = 0)
+      : m_bounded_insert(src.m_bounded_insert),
+        m_hasher(src.m_hasher),
+        m_equal_to(src.m_equal_to),
+        m_size(src.m_size),
+        m_available_indexes(src.m_available_indexes),
+        m_hash_lists(src.m_hash_lists),
+        m_next_index(src.m_next_index),
+        m_keys(src.m_keys),
+        m_values(src.m_values),
+        m_scalars(src.m_scalars) {}
 
   template <typename SKey, typename SValue>
-  typename Impl::enable_if< Impl::UnorderedMapCanAssign<declared_key_type,declared_value_type,SKey,SValue>::value
-                           ,declared_map_type & >::type
-  operator=( UnorderedMap<SKey,SValue,Device,Hasher,EqualTo> const& src)
-  {
-    m_bounded_insert = src.m_bounded_insert;
-    m_hasher = src.m_hasher;
-    m_equal_to = src.m_equal_to;
-    m_size = src.m_size;
+  typename Impl::enable_if<
+      Impl::UnorderedMapCanAssign<declared_key_type, declared_value_type, SKey,
+                                  SValue>::value,
+      declared_map_type &>::type
+  operator=(UnorderedMap<SKey, SValue, Device, Hasher, EqualTo> const &src) {
+    m_bounded_insert    = src.m_bounded_insert;
+    m_hasher            = src.m_hasher;
+    m_equal_to          = src.m_equal_to;
+    m_size              = src.m_size;
     m_available_indexes = src.m_available_indexes;
-    m_hash_lists = src.m_hash_lists;
-    m_next_index = src.m_next_index;
-    m_keys = src.m_keys;
-    m_values = src.m_values;
-    m_scalars = src.m_scalars;
+    m_hash_lists        = src.m_hash_lists;
+    m_next_index        = src.m_next_index;
+    m_keys              = src.m_keys;
+    m_values            = src.m_values;
+    m_scalars           = src.m_scalars;
     return *this;
   }
 
   template <typename SKey, typename SValue, typename SDevice>
-  typename Impl::enable_if< std::is_same< typename Impl::remove_const<SKey>::type, key_type>::value &&
-                            std::is_same< typename Impl::remove_const<SValue>::type, value_type>::value
-                          >::type
-  create_copy_view( UnorderedMap<SKey, SValue, SDevice, Hasher,EqualTo> const& src)
-  {
+  typename Impl::enable_if<
+      std::is_same<typename Impl::remove_const<SKey>::type, key_type>::value &&
+      std::is_same<typename Impl::remove_const<SValue>::type,
+                   value_type>::value>::type
+  create_copy_view(
+      UnorderedMap<SKey, SValue, SDevice, Hasher, EqualTo> const &src) {
     if (m_hash_lists.data() != src.m_hash_lists.data()) {
-
       insertable_map_type tmp;
 
-      tmp.m_bounded_insert = src.m_bounded_insert;
-      tmp.m_hasher = src.m_hasher;
-      tmp.m_equal_to = src.m_equal_to;
-      tmp.m_size = src.size();
-      tmp.m_available_indexes = bitset_type( src.capacity() );
-      tmp.m_hash_lists        = size_type_view( ViewAllocateWithoutInitializing("UnorderedMap hash list"), src.m_hash_lists.extent(0) );
-      tmp.m_next_index        = size_type_view( ViewAllocateWithoutInitializing("UnorderedMap next index"), src.m_next_index.extent(0) );
-      tmp.m_keys              = key_type_view( ViewAllocateWithoutInitializing("UnorderedMap keys"), src.m_keys.extent(0) );
-      tmp.m_values            = value_type_view( ViewAllocateWithoutInitializing("UnorderedMap values"), src.m_values.extent(0) );
-      tmp.m_scalars           = scalars_view("UnorderedMap scalars");
+      tmp.m_bounded_insert    = src.m_bounded_insert;
+      tmp.m_hasher            = src.m_hasher;
+      tmp.m_equal_to          = src.m_equal_to;
+      tmp.m_size              = src.size();
+      tmp.m_available_indexes = bitset_type(src.capacity());
+      tmp.m_hash_lists        = size_type_view(
+          ViewAllocateWithoutInitializing("UnorderedMap hash list"),
+          src.m_hash_lists.extent(0));
+      tmp.m_next_index = size_type_view(
+          ViewAllocateWithoutInitializing("UnorderedMap next index"),
+          src.m_next_index.extent(0));
+      tmp.m_keys =
+          key_type_view(ViewAllocateWithoutInitializing("UnorderedMap keys"),
+                        src.m_keys.extent(0));
+      tmp.m_values = value_type_view(
+          ViewAllocateWithoutInitializing("UnorderedMap values"),
+          src.m_values.extent(0));
+      tmp.m_scalars = scalars_view("UnorderedMap scalars");
 
       Kokkos::deep_copy(tmp.m_available_indexes, src.m_available_indexes);
 
-      typedef Kokkos::Impl::DeepCopy< typename device_type::memory_space, typename SDevice::memory_space > raw_deep_copy;
+      typedef Kokkos::Impl::DeepCopy<typename device_type::memory_space,
+                                     typename SDevice::memory_space>
+          raw_deep_copy;
 
-      raw_deep_copy(tmp.m_hash_lists.data(), src.m_hash_lists.data(), sizeof(size_type)*src.m_hash_lists.extent(0));
-      raw_deep_copy(tmp.m_next_index.data(), src.m_next_index.data(), sizeof(size_type)*src.m_next_index.extent(0));
-      raw_deep_copy(tmp.m_keys.data(), src.m_keys.data(), sizeof(key_type)*src.m_keys.extent(0));
+      raw_deep_copy(tmp.m_hash_lists.data(), src.m_hash_lists.data(),
+                    sizeof(size_type) * src.m_hash_lists.extent(0));
+      raw_deep_copy(tmp.m_next_index.data(), src.m_next_index.data(),
+                    sizeof(size_type) * src.m_next_index.extent(0));
+      raw_deep_copy(tmp.m_keys.data(), src.m_keys.data(),
+                    sizeof(key_type) * src.m_keys.extent(0));
       if (!is_set) {
-        raw_deep_copy(tmp.m_values.data(), src.m_values.data(), sizeof(impl_value_type)*src.m_values.extent(0));
+        raw_deep_copy(tmp.m_values.data(), src.m_values.data(),
+                      sizeof(impl_value_type) * src.m_values.extent(0));
       }
-      raw_deep_copy(tmp.m_scalars.data(), src.m_scalars.data(), sizeof(int)*num_scalars );
+      raw_deep_copy(tmp.m_scalars.data(), src.m_scalars.data(),
+                    sizeof(int) * num_scalars);
 
       *this = tmp;
     }
   }
 
   //@}
-private: // private member functions
+ private:  // private member functions
+  bool modified() const { return get_flag(modified_idx); }
 
-  bool modified() const
-  {
-    return get_flag(modified_idx);
-  }
-
-  void set_flag(int flag) const
-  {
-    typedef Kokkos::Impl::DeepCopy< typename device_type::memory_space, Kokkos::HostSpace > raw_deep_copy;
+  void set_flag(int flag) const {
+    typedef Kokkos::Impl::DeepCopy<typename device_type::memory_space,
+                                   Kokkos::HostSpace>
+        raw_deep_copy;
     const int true_ = true;
     raw_deep_copy(m_scalars.data() + flag, &true_, sizeof(int));
   }
 
-  void reset_flag(int flag) const
-  {
-    typedef Kokkos::Impl::DeepCopy< typename device_type::memory_space, Kokkos::HostSpace > raw_deep_copy;
+  void reset_flag(int flag) const {
+    typedef Kokkos::Impl::DeepCopy<typename device_type::memory_space,
+                                   Kokkos::HostSpace>
+        raw_deep_copy;
     const int false_ = false;
     raw_deep_copy(m_scalars.data() + flag, &false_, sizeof(int));
   }
 
-  bool get_flag(int flag) const
-  {
-    typedef Kokkos::Impl::DeepCopy< Kokkos::HostSpace, typename device_type::memory_space > raw_deep_copy;
+  bool get_flag(int flag) const {
+    typedef Kokkos::Impl::DeepCopy<Kokkos::HostSpace,
+                                   typename device_type::memory_space>
+        raw_deep_copy;
     int result = false;
     raw_deep_copy(&result, m_scalars.data() + flag, sizeof(int));
     return result;
   }
 
-  static uint32_t calculate_capacity(uint32_t capacity_hint)
-  {
+  static uint32_t calculate_capacity(uint32_t capacity_hint) {
     // increase by 16% and round to nears multiple of 128
-    return capacity_hint ? ((static_cast<uint32_t>(7ull*capacity_hint/6u) + 127u)/128u)*128u : 128u;
+    return capacity_hint
+               ? ((static_cast<uint32_t>(7ull * capacity_hint / 6u) + 127u) /
+                  128u) *
+                     128u
+               : 128u;
   }
 
-private: // private members
-  bool              m_bounded_insert;
-  hasher_type       m_hasher;
-  equal_to_type     m_equal_to;
+ private:  // private members
+  bool m_bounded_insert;
+  hasher_type m_hasher;
+  equal_to_type m_equal_to;
   mutable size_type m_size;
-  bitset_type       m_available_indexes;
-  size_type_view    m_hash_lists;
-  size_type_view    m_next_index;
-  key_type_view     m_keys;
-  value_type_view   m_values;
-  scalars_view      m_scalars;
+  bitset_type m_available_indexes;
+  size_type_view m_hash_lists;
+  size_type_view m_next_index;
+  key_type_view m_keys;
+  value_type_view m_values;
+  scalars_view m_scalars;
 
-  template <typename KKey, typename VValue, typename DDevice, typename HHash, typename EEqualTo>
+  template <typename KKey, typename VValue, typename DDevice, typename HHash,
+            typename EEqualTo>
   friend class UnorderedMap;
 
   template <typename UMap>
@@ -834,17 +840,14 @@ private: // private members
 };
 
 // Specialization of deep_copy for two UnorderedMap objects.
-template <  typename DKey, typename DT, typename DDevice
-          , typename SKey, typename ST, typename SDevice
-          , typename Hasher, typename EqualTo >
-inline void deep_copy(         UnorderedMap<DKey, DT, DDevice, Hasher, EqualTo> & dst
-                       , const UnorderedMap<SKey, ST, SDevice, Hasher, EqualTo> & src )
-{
+template <typename DKey, typename DT, typename DDevice, typename SKey,
+          typename ST, typename SDevice, typename Hasher, typename EqualTo>
+inline void deep_copy(
+    UnorderedMap<DKey, DT, DDevice, Hasher, EqualTo> &dst,
+    const UnorderedMap<SKey, ST, SDevice, Hasher, EqualTo> &src) {
   dst.create_copy_view(src);
 }
 
+}  // namespace Kokkos
 
-} // namespace Kokkos
-
-#endif //KOKKOS_UNORDERED_MAP_HPP
-
+#endif  // KOKKOS_UNORDERED_MAP_HPP
diff --git a/lib/kokkos/containers/src/Kokkos_Vector.hpp b/lib/kokkos/containers/src/Kokkos_Vector.hpp
index 9b151d9505..0641eeba82 100644
--- a/lib/kokkos/containers/src/Kokkos_Vector.hpp
+++ b/lib/kokkos/containers/src/Kokkos_Vector.hpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -48,15 +49,15 @@
 #include <Kokkos_DualView.hpp>
 
 /* Drop in replacement for std::vector based on Kokkos::DualView
- * Most functions only work on the host (it will not compile if called from device kernel)
+ * Most functions only work on the host (it will not compile if called from
+ * device kernel)
  *
  */
-  namespace Kokkos {
+namespace Kokkos {
 
-template< class Scalar, class Arg1Type = void>
-class vector : public DualView<Scalar*,LayoutLeft,Arg1Type> {
-
-public:
+template <class Scalar, class Arg1Type = void>
+class vector : public DualView<Scalar*, LayoutLeft, Arg1Type> {
+ public:
   typedef Scalar value_type;
   typedef Scalar* pointer;
   typedef const Scalar* const_pointer;
@@ -64,213 +65,259 @@ public:
   typedef const Scalar& const_reference;
   typedef Scalar* iterator;
   typedef const Scalar* const_iterator;
-
-private:
-  size_t _size;
   typedef size_t size_type;
+
+ private:
+  size_t _size;
   float _extra_storage;
-  typedef DualView<Scalar*,LayoutLeft,Arg1Type> DV;
+  typedef DualView<Scalar*, LayoutLeft, Arg1Type> DV;
 
-
-public:
+ public:
 #ifdef KOKKOS_ENABLE_CUDA_UVM
-  KOKKOS_INLINE_FUNCTION reference operator() (int i) const {return DV::h_view(i);};
-  KOKKOS_INLINE_FUNCTION reference operator[] (int i) const {return DV::h_view(i);};
+  KOKKOS_INLINE_FUNCTION reference operator()(int i) const {
+    return DV::h_view(i);
+  };
+  KOKKOS_INLINE_FUNCTION reference operator[](int i) const {
+    return DV::h_view(i);
+  };
 #else
-  inline reference operator() (int i) const {return DV::h_view(i);};
-  inline reference operator[] (int i) const {return DV::h_view(i);};
+  inline reference operator()(int i) const { return DV::h_view(i); };
+  inline reference operator[](int i) const { return DV::h_view(i); };
 #endif
 
   /* Member functions which behave like std::vector functions */
 
-  vector():DV() {
-    _size = 0;
+  vector() : DV() {
+    _size          = 0;
     _extra_storage = 1.1;
   }
 
-
-  vector(int n, Scalar val=Scalar()):DualView<Scalar*,LayoutLeft,Arg1Type>("Vector",size_t(n*(1.1))) {
-    _size = n;
-    _extra_storage = 1.1;
+  vector(int n, Scalar val = Scalar())
+      : DualView<Scalar*, LayoutLeft, Arg1Type>("Vector", size_t(n * (1.1))) {
+    _size                 = n;
+    _extra_storage        = 1.1;
     DV::modified_flags(0) = 1;
 
-    assign(n,val);
+    assign(n, val);
   }
 
-
   void resize(size_t n) {
-    if(n>=span())
-      DV::resize(size_t (n*_extra_storage));
+    if (n >= span()) DV::resize(size_t(n * _extra_storage));
     _size = n;
   }
 
-  void resize(size_t n, const Scalar& val) {
-    assign(n,val);
-  }
+  void resize(size_t n, const Scalar& val) { assign(n, val); }
 
-  void assign (size_t n, const Scalar& val) {
+  void assign(size_t n, const Scalar& val) {
+    /* Resize if necessary (behavior of std:vector) */
 
-    /* Resize if necessary (behavour of std:vector) */
-
-    if(n>span())
-      DV::resize(size_t (n*_extra_storage));
+    if (n > span()) DV::resize(size_t(n * _extra_storage));
     _size = n;
 
-          /* Assign value either on host or on device */
+    /* Assign value either on host or on device */
 
-    if( DV::template need_sync<typename DV::t_dev::device_type>() ) {
-      set_functor_host f(DV::h_view,val);
-      parallel_for(n,f);
+    if (DV::template need_sync<typename DV::t_dev::device_type>()) {
+      set_functor_host f(DV::h_view, val);
+      parallel_for(n, f);
       typename DV::t_host::execution_space().fence();
       DV::template modify<typename DV::t_host::device_type>();
     } else {
-      set_functor f(DV::d_view,val);
-      parallel_for(n,f);
+      set_functor f(DV::d_view, val);
+      parallel_for(n, f);
       typename DV::t_dev::execution_space().fence();
       DV::template modify<typename DV::t_dev::device_type>();
     }
   }
 
-  void reserve(size_t n) {
-    DV::resize(size_t (n*_extra_storage));
-  }
+  void reserve(size_t n) { DV::resize(size_t(n * _extra_storage)); }
 
   void push_back(Scalar val) {
     DV::template sync<typename DV::t_host::device_type>();
     DV::template modify<typename DV::t_host::device_type>();
-    if(_size == span()) {
-      size_t new_size = _size*_extra_storage;
-      if(new_size == _size) new_size++;
+    if (_size == span()) {
+      size_t new_size = _size * _extra_storage;
+      if (new_size == _size) new_size++;
       DV::resize(new_size);
     }
 
     DV::h_view(_size) = val;
     _size++;
-
   }
 
-  void pop_back() {
-    _size--;
+  void pop_back() { _size--; }
+
+  void clear() { _size = 0; }
+
+  iterator insert(iterator it, const value_type& val) {
+    return insert(it, 1, val);
   }
 
-  void clear() {
-    _size = 0;
+  iterator insert(iterator it, size_type count, const value_type& val) {
+    if ((size() == 0) && (it == begin())) {
+      resize(count, val);
+      DV::sync_host();
+      return begin();
+    }
+    DV::sync_host();
+    DV::modify_host();
+    if (it < begin() || it > end())
+      Kokkos::abort("Kokkos::vector::insert : invalid insert iterator");
+    if (count == 0) return it;
+    ptrdiff_t start = std::distance(begin(), it);
+    auto org_size   = size();
+    resize(size() + count);
+
+    std::copy_backward(begin() + start, begin() + org_size,
+                       begin() + org_size + count);
+    std::fill_n(begin() + start, count, val);
+
+    return begin() + start;
   }
 
-  size_type size() const {return _size;}
-  size_type max_size() const {return 2000000000;}
+ private:
+  template <class T>
+  struct impl_is_input_iterator
+      : /* TODO replace this */ std::integral_constant<
+            bool, !std::is_convertible<T, size_type>::value> {};
+
+ public:
+  // TODO: can use detection idiom to generate better error message here later
+  template <typename InputIterator>
+  typename std::enable_if<impl_is_input_iterator<InputIterator>::value,
+                          iterator>::type
+  insert(iterator it, InputIterator b, InputIterator e) {
+    ptrdiff_t count = std::distance(b, e);
+    if (count == 0) return it;
+
+    DV::sync_host();
+    DV::modify_host();
+    if (it < begin() || it > end())
+      Kokkos::abort("Kokkos::vector::insert : invalid insert iterator");
+
+    bool resized = false;
+    if ((size() == 0) && (it == begin())) {
+      resize(count);
+      it      = begin();
+      resized = true;
+    }
+    ptrdiff_t start = std::distance(begin(), it);
+    auto org_size   = size();
+    if (!resized) resize(size() + count);
+    it = begin() + start;
+
+    std::copy_backward(begin() + start, begin() + org_size,
+                       begin() + org_size + count);
+    std::copy(b, e, it);
+
+    return begin() + start;
+  }
+
+  size_type size() const { return _size; }
+  size_type max_size() const { return 2000000000; }
 #ifdef KOKKOS_ENABLE_DEPRECATED_CODE
-  size_type capacity() const {return DV::capacity();}
+  size_type capacity() const { return DV::capacity(); }
 #endif
-  size_type span() const {return DV::span();}
-  bool empty() const {return _size==0;}
+  size_type span() const { return DV::span(); }
+  bool empty() const { return _size == 0; }
 
-  iterator begin() const {return &DV::h_view(0);}
+  iterator begin() const { return DV::h_view.data(); }
 
-  iterator end() const {return &DV::h_view(_size);}
+  iterator end() const {
+    return _size > 0 ? DV::h_view.data() + _size : DV::h_view.data();
+  }
 
-  reference front() {return DV::h_view(0);}
+  reference front() { return DV::h_view(0); }
 
-  reference back() {return DV::h_view(_size - 1);}
+  reference back() { return DV::h_view(_size - 1); }
 
-  const_reference front() const {return DV::h_view(0);}
+  const_reference front() const { return DV::h_view(0); }
 
-  const_reference back() const {return DV::h_view(_size - 1);}
+  const_reference back() const { return DV::h_view(_size - 1); }
 
-  /* std::algorithms wich work originally with iterators, here they are implemented as member functions */
+  /* std::algorithms which work originally with iterators, here they are
+   * implemented as member functions */
 
-  size_t
-  lower_bound (const size_t& start,
-               const size_t& theEnd,
-               const Scalar& comp_val) const
-  {
-    int lower = start; // FIXME (mfh 24 Apr 2014) narrowing conversion
-    int upper = _size > theEnd? theEnd : _size-1; // FIXME (mfh 24 Apr 2014) narrowing conversion
+  size_t lower_bound(const size_t& start, const size_t& theEnd,
+                     const Scalar& comp_val) const {
+    int lower = start;  // FIXME (mfh 24 Apr 2014) narrowing conversion
+    int upper =
+        _size > theEnd
+            ? theEnd
+            : _size - 1;  // FIXME (mfh 24 Apr 2014) narrowing conversion
     if (upper <= lower) {
       return theEnd;
     }
 
     Scalar lower_val = DV::h_view(lower);
     Scalar upper_val = DV::h_view(upper);
-    size_t idx = (upper+lower)/2;
-    Scalar val = DV::h_view(idx);
-    if(val>upper_val) return upper;
-    if(val<lower_val) return start;
+    size_t idx       = (upper + lower) / 2;
+    Scalar val       = DV::h_view(idx);
+    if (val > upper_val) return upper;
+    if (val < lower_val) return start;
 
-    while(upper>lower) {
-      if(comp_val>val) {
+    while (upper > lower) {
+      if (comp_val > val) {
         lower = ++idx;
       } else {
         upper = idx;
       }
-      idx = (upper+lower)/2;
+      idx = (upper + lower) / 2;
       val = DV::h_view(idx);
     }
     return idx;
   }
 
   bool is_sorted() {
-    for(int i=0;i<_size-1;i++) {
-      if(DV::h_view(i)>DV::h_view(i+1)) return false;
+    for (int i = 0; i < _size - 1; i++) {
+      if (DV::h_view(i) > DV::h_view(i + 1)) return false;
     }
     return true;
   }
 
   iterator find(Scalar val) const {
-    if(_size == 0) return end();
+    if (_size == 0) return end();
 
-    int upper,lower,current;
-    current = _size/2;
-    upper = _size-1;
-    lower = 0;
+    int upper, lower, current;
+    current = _size / 2;
+    upper   = _size - 1;
+    lower   = 0;
 
-    if((val<DV::h_view(0)) || (val>DV::h_view(_size-1)) ) return end();
+    if ((val < DV::h_view(0)) || (val > DV::h_view(_size - 1))) return end();
 
-    while(upper>lower)
-    {
-      if(val>DV::h_view(current)) lower = current+1;
-      else upper = current;
-      current = (upper+lower)/2;
+    while (upper > lower) {
+      if (val > DV::h_view(current))
+        lower = current + 1;
+      else
+        upper = current;
+      current = (upper + lower) / 2;
     }
 
-    if(val==DV::h_view(current)) return &DV::h_view(current);
-    else return end();
+    if (val == DV::h_view(current))
+      return &DV::h_view(current);
+    else
+      return end();
   }
 
   /* Additional functions for data management */
 
-  void device_to_host(){
-    deep_copy(DV::h_view,DV::d_view);
-  }
-  void host_to_device() const {
-    deep_copy(DV::d_view,DV::h_view);
-  }
+  void device_to_host() { deep_copy(DV::h_view, DV::d_view); }
+  void host_to_device() const { deep_copy(DV::d_view, DV::h_view); }
 
-  void on_host() {
-    DV::template modify<typename DV::t_host::device_type>();
-  }
-  void on_device() {
-    DV::template modify<typename DV::t_dev::device_type>();
-  }
+  void on_host() { DV::template modify<typename DV::t_host::device_type>(); }
+  void on_device() { DV::template modify<typename DV::t_dev::device_type>(); }
 
-  void set_overallocation(float extra) {
-    _extra_storage = 1.0 + extra;
-  }
+  void set_overallocation(float extra) { _extra_storage = 1.0 + extra; }
 
-
-public:
+ public:
   struct set_functor {
     typedef typename DV::t_dev::execution_space execution_space;
     typename DV::t_dev _data;
     Scalar _val;
 
-    set_functor(typename DV::t_dev data, Scalar val) :
-      _data(data),_val(val) {}
+    set_functor(typename DV::t_dev data, Scalar val) : _data(data), _val(val) {}
 
     KOKKOS_INLINE_FUNCTION
-    void operator() (const int &i) const {
-      _data(i) = _val;
-    }
+    void operator()(const int& i) const { _data(i) = _val; }
   };
 
   struct set_functor_host {
@@ -278,18 +325,13 @@ public:
     typename DV::t_host _data;
     Scalar _val;
 
-    set_functor_host(typename DV::t_host data, Scalar val) :
-      _data(data),_val(val) {}
+    set_functor_host(typename DV::t_host data, Scalar val)
+        : _data(data), _val(val) {}
 
     KOKKOS_INLINE_FUNCTION
-    void operator() (const int &i) const {
-      _data(i) = _val;
-    }
+    void operator()(const int& i) const { _data(i) = _val; }
   };
-
 };
 
-
-}
+}  // namespace Kokkos
 #endif
-
diff --git a/lib/kokkos/containers/src/impl/Kokkos_Bitset_impl.hpp b/lib/kokkos/containers/src/impl/Kokkos_Bitset_impl.hpp
index 7ea2e102ce..f5fa4d518a 100644
--- a/lib/kokkos/containers/src/impl/Kokkos_Bitset_impl.hpp
+++ b/lib/kokkos/containers/src/impl/Kokkos_Bitset_impl.hpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -57,53 +58,44 @@ namespace Kokkos {
 namespace Impl {
 
 KOKKOS_FORCEINLINE_FUNCTION
-unsigned rotate_right( unsigned i, int r )
-{
-  enum { size = static_cast<int>( sizeof(unsigned) * CHAR_BIT ) };
-  return r ? ( ( i >> r ) | ( i << ( size - r ) ) ) : i ;
+unsigned rotate_right(unsigned i, int r) {
+  enum { size = static_cast<int>(sizeof(unsigned) * CHAR_BIT) };
+  return r ? ((i >> r) | (i << (size - r))) : i;
 }
 
-template < typename Bitset >
-struct BitsetCount
-{
-  typedef Bitset                                                  bitset_type;
-  typedef typename bitset_type::execution_space::execution_space  execution_space;
-  typedef typename bitset_type::size_type                         size_type;
-  typedef size_type                                               value_type;
+template <typename Bitset>
+struct BitsetCount {
+  typedef Bitset bitset_type;
+  typedef
+      typename bitset_type::execution_space::execution_space execution_space;
+  typedef typename bitset_type::size_type size_type;
+  typedef size_type value_type;
 
   bitset_type m_bitset;
 
-  BitsetCount( bitset_type const& bitset )
-    : m_bitset(bitset)
-  {}
+  BitsetCount(bitset_type const& bitset) : m_bitset(bitset) {}
 
-  size_type apply() const
-  {
+  size_type apply() const {
     size_type count = 0u;
-    parallel_reduce( m_bitset.m_blocks.extent(0), *this, count );
+    parallel_reduce(m_bitset.m_blocks.extent(0), *this, count);
     return count;
   }
 
   KOKKOS_INLINE_FUNCTION
-  void init( value_type & count ) const
-  {
-    count = 0u;
-  }
+  void init(value_type& count) const { count = 0u; }
 
   KOKKOS_INLINE_FUNCTION
-  void join( volatile value_type & count, const volatile size_type & incr ) const
-  {
+  void join(volatile value_type& count, const volatile size_type& incr) const {
     count += incr;
   }
 
   KOKKOS_INLINE_FUNCTION
-  void operator()( size_type i, value_type & count ) const
-  {
-    count += bit_count( m_bitset.m_blocks[i] );
+  void operator()(size_type i, value_type& count) const {
+    count += bit_count(m_bitset.m_blocks[i]);
   }
 };
 
-} // namespace Impl
-} // namespace Kokkos
+}  // namespace Impl
+}  // namespace Kokkos
 
-#endif // KOKKOS_BITSET_IMPL_HPP
+#endif  // KOKKOS_BITSET_IMPL_HPP
diff --git a/lib/kokkos/containers/src/impl/Kokkos_Functional_impl.hpp b/lib/kokkos/containers/src/impl/Kokkos_Functional_impl.hpp
index 8b17dcce4b..6ba67766aa 100644
--- a/lib/kokkos/containers/src/impl/Kokkos_Functional_impl.hpp
+++ b/lib/kokkos/containers/src/impl/Kokkos_Functional_impl.hpp
@@ -1,10 +1,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -22,10 +23,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -45,28 +46,24 @@
 #include <Kokkos_Macros.hpp>
 #include <cstdint>
 
-namespace Kokkos { namespace Impl {
+namespace Kokkos {
+namespace Impl {
 
 // MurmurHash3 was written by Austin Appleby, and is placed in the public
 // domain. The author hereby disclaims copyright to this source code.
 KOKKOS_FORCEINLINE_FUNCTION
-uint32_t getblock32 ( const uint8_t * p, int i )
-{
-// used to avoid aliasing error which could cause errors with
-// forced inlining
-  return    ((uint32_t)p[i*4+0])
-          | ((uint32_t)p[i*4+1] << 8)
-          | ((uint32_t)p[i*4+2] << 16)
-          | ((uint32_t)p[i*4+3] << 24);
+uint32_t getblock32(const uint8_t* p, int i) {
+  // used to avoid aliasing error which could cause errors with
+  // forced inlining
+  return ((uint32_t)p[i * 4 + 0]) | ((uint32_t)p[i * 4 + 1] << 8) |
+         ((uint32_t)p[i * 4 + 2] << 16) | ((uint32_t)p[i * 4 + 3] << 24);
 }
 
 KOKKOS_FORCEINLINE_FUNCTION
-uint32_t rotl32 ( uint32_t x, int8_t r )
-{ return (x << r) | (x >> (32 - r)); }
+uint32_t rotl32(uint32_t x, int8_t r) { return (x << r) | (x >> (32 - r)); }
 
 KOKKOS_FORCEINLINE_FUNCTION
-uint32_t fmix32 ( uint32_t h )
-{
+uint32_t fmix32(uint32_t h) {
   h ^= h >> 16;
   h *= 0x85ebca6b;
   h ^= h >> 13;
@@ -77,10 +74,9 @@ uint32_t fmix32 ( uint32_t h )
 }
 
 KOKKOS_INLINE_FUNCTION
-uint32_t MurmurHash3_x86_32 ( const void * key, int len, uint32_t seed )
-{
-  const uint8_t * data = (const uint8_t*)key;
-  const int nblocks = len / 4;
+uint32_t MurmurHash3_x86_32(const void* key, int len, uint32_t seed) {
+  const uint8_t* data = (const uint8_t*)key;
+  const int nblocks   = len / 4;
 
   uint32_t h1 = seed;
 
@@ -90,32 +86,34 @@ uint32_t MurmurHash3_x86_32 ( const void * key, int len, uint32_t seed )
   //----------
   // body
 
-  for(int i=0; i<nblocks; ++i)
-  {
-    uint32_t k1 = getblock32(data,i);
+  for (int i = 0; i < nblocks; ++i) {
+    uint32_t k1 = getblock32(data, i);
 
     k1 *= c1;
-    k1 = rotl32(k1,15);
+    k1 = rotl32(k1, 15);
     k1 *= c2;
 
     h1 ^= k1;
-    h1 = rotl32(h1,13);
-    h1 = h1*5+0xe6546b64;
+    h1 = rotl32(h1, 13);
+    h1 = h1 * 5 + 0xe6546b64;
   }
 
   //----------
   // tail
 
-  const uint8_t * tail = (const uint8_t*)(data + nblocks*4);
+  const uint8_t* tail = (const uint8_t*)(data + nblocks * 4);
 
   uint32_t k1 = 0;
 
-  switch(len & 3)
-  {
-  case 3: k1 ^= tail[2] << 16;
-  case 2: k1 ^= tail[1] << 8;
-  case 1: k1 ^= tail[0];
-          k1 *= c1; k1 = rotl32(k1,15); k1 *= c2; h1 ^= k1;
+  switch (len & 3) {
+    case 3: k1 ^= tail[2] << 16;
+    case 2: k1 ^= tail[1] << 8;
+    case 1:
+      k1 ^= tail[0];
+      k1 *= c1;
+      k1 = rotl32(k1, 15);
+      k1 *= c2;
+      h1 ^= k1;
   };
 
   //----------
@@ -128,10 +126,8 @@ uint32_t MurmurHash3_x86_32 ( const void * key, int len, uint32_t seed )
   return h1;
 }
 
-
-#if defined( __GNUC__ ) /* GNU C   */ || \
-    defined( __GNUG__ ) /* GNU C++ */ || \
-    defined( __clang__ )
+#if defined(__GNUC__) /* GNU C   */ || defined(__GNUG__) /* GNU C++ */ || \
+    defined(__clang__)
 
 #define KOKKOS_IMPL_MAY_ALIAS __attribute__((__may_alias__))
 
@@ -142,13 +138,12 @@ uint32_t MurmurHash3_x86_32 ( const void * key, int len, uint32_t seed )
 #endif
 
 template <typename T>
-KOKKOS_FORCEINLINE_FUNCTION
-bool bitwise_equal(T const * const a_ptr, T const * const b_ptr)
-{
+KOKKOS_FORCEINLINE_FUNCTION bool bitwise_equal(T const* const a_ptr,
+                                               T const* const b_ptr) {
   typedef uint64_t KOKKOS_IMPL_MAY_ALIAS T64;
   typedef uint32_t KOKKOS_IMPL_MAY_ALIAS T32;
   typedef uint16_t KOKKOS_IMPL_MAY_ALIAS T16;
-  typedef uint8_t  KOKKOS_IMPL_MAY_ALIAS T8;
+  typedef uint8_t KOKKOS_IMPL_MAY_ALIAS T8;
 
   enum {
     NUM_8  = sizeof(T),
@@ -158,39 +153,37 @@ bool bitwise_equal(T const * const a_ptr, T const * const b_ptr)
   };
 
   union {
-    T   const * const ptr;
-    T64 const * const ptr64;
-    T32 const * const ptr32;
-    T16 const * const ptr16;
-    T8  const * const ptr8;
+    T const* const ptr;
+    T64 const* const ptr64;
+    T32 const* const ptr32;
+    T16 const* const ptr16;
+    T8 const* const ptr8;
   } a = {a_ptr}, b = {b_ptr};
 
   bool result = true;
 
-  for (int i=0; i < NUM_64; ++i) {
+  for (int i = 0; i < NUM_64; ++i) {
     result = result && a.ptr64[i] == b.ptr64[i];
   }
 
-  if ( NUM_64*2 < NUM_32 ) {
-    result = result && a.ptr32[NUM_64*2] == b.ptr32[NUM_64*2];
+  if (NUM_64 * 2 < NUM_32) {
+    result = result && a.ptr32[NUM_64 * 2] == b.ptr32[NUM_64 * 2];
   }
 
-  if ( NUM_32*2 < NUM_16 ) {
-    result = result && a.ptr16[NUM_32*2] == b.ptr16[NUM_32*2];
+  if (NUM_32 * 2 < NUM_16) {
+    result = result && a.ptr16[NUM_32 * 2] == b.ptr16[NUM_32 * 2];
   }
 
-  if ( NUM_16*2 < NUM_8 ) {
-    result = result && a.ptr8[NUM_16*2] == b.ptr8[NUM_16*2];
+  if (NUM_16 * 2 < NUM_8) {
+    result = result && a.ptr8[NUM_16 * 2] == b.ptr8[NUM_16 * 2];
   }
 
   return result;
 }
 
-
-
 #undef KOKKOS_IMPL_MAY_ALIAS
 
-}} // namespace Kokkos::Impl
-
-#endif //KOKKOS_FUNCTIONAL_IMPL_HPP
+}  // namespace Impl
+}  // namespace Kokkos
 
+#endif  // KOKKOS_FUNCTIONAL_IMPL_HPP
diff --git a/lib/kokkos/containers/src/impl/Kokkos_StaticCrsGraph_factory.hpp b/lib/kokkos/containers/src/impl/Kokkos_StaticCrsGraph_factory.hpp
index 743c345b45..d644c57c0a 100644
--- a/lib/kokkos/containers/src/impl/Kokkos_StaticCrsGraph_factory.hpp
+++ b/lib/kokkos/containers/src/impl/Kokkos_StaticCrsGraph_factory.hpp
@@ -1,13 +1,14 @@
 /*
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -36,7 +37,7 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 */
@@ -50,193 +51,207 @@
 namespace Kokkos {
 
 #ifdef KOKKOS_ENABLE_DEPRECATED_CODE
-template< class DataType , class Arg1Type , class Arg2Type , typename SizeType , class Arg3Type>
-inline
-typename StaticCrsGraph< DataType , Arg1Type , Arg2Type , SizeType , Arg3Type >::HostMirror
-create_mirror_view( const StaticCrsGraph<DataType,Arg1Type,Arg2Type,SizeType,Arg3Type > & view ,
-                    typename Impl::enable_if< ViewTraits<DataType,Arg1Type,Arg2Type,Arg3Type>::is_hostspace >::type * = 0 )
-{
-  return view ;
+template <class DataType, class Arg1Type, class Arg2Type, typename SizeType,
+          class Arg3Type>
+inline typename StaticCrsGraph<DataType, Arg1Type, Arg2Type, SizeType,
+                               Arg3Type>::HostMirror
+create_mirror_view(
+    const StaticCrsGraph<DataType, Arg1Type, Arg2Type, SizeType, Arg3Type>&
+        view,
+    typename Impl::enable_if<ViewTraits<DataType, Arg1Type, Arg2Type,
+                                        Arg3Type>::is_hostspace>::type* = 0) {
+  return view;
 }
 #else
-template< class DataType , class Arg1Type , class Arg2Type , class Arg3Type, typename SizeType >
-inline
-typename StaticCrsGraph< DataType , Arg1Type , Arg2Type , Arg3Type , SizeType >::HostMirror
-create_mirror_view( const StaticCrsGraph<DataType,Arg1Type,Arg2Type,Arg3Type,SizeType > & view ,
-                    typename Impl::enable_if< ViewTraits<DataType,Arg1Type,Arg2Type,Arg3Type>::is_hostspace >::type * = 0 )
-{
-  return view ;
+template <class DataType, class Arg1Type, class Arg2Type, class Arg3Type,
+          typename SizeType>
+inline typename StaticCrsGraph<DataType, Arg1Type, Arg2Type, Arg3Type,
+                               SizeType>::HostMirror
+create_mirror_view(
+    const StaticCrsGraph<DataType, Arg1Type, Arg2Type, Arg3Type, SizeType>&
+        view,
+    typename Impl::enable_if<ViewTraits<DataType, Arg1Type, Arg2Type,
+                                        Arg3Type>::is_hostspace>::type* = 0) {
+  return view;
 }
 #endif
 
 #ifdef KOKKOS_ENABLE_DEPRECATED_CODE
-template< class DataType , class Arg1Type , class Arg2Type , typename SizeType , class Arg3Type>
-inline
-typename StaticCrsGraph< DataType , Arg1Type , Arg2Type , SizeType , Arg3Type >::HostMirror
-create_mirror( const StaticCrsGraph<DataType,Arg1Type,Arg2Type,SizeType,Arg3Type > & view )
-{
+template <class DataType, class Arg1Type, class Arg2Type, typename SizeType,
+          class Arg3Type>
+inline typename StaticCrsGraph<DataType, Arg1Type, Arg2Type, SizeType,
+                               Arg3Type>::HostMirror
+create_mirror(const StaticCrsGraph<DataType, Arg1Type, Arg2Type, SizeType,
+                                   Arg3Type>& view) {
   // Force copy:
-  //typedef Impl::ViewAssignment< Impl::ViewDefault > alloc ; // unused
-  typedef StaticCrsGraph< DataType , Arg1Type , Arg2Type , SizeType , Arg3Type >  staticcrsgraph_type ;
+  // typedef Impl::ViewAssignment< Impl::ViewDefault > alloc ; // unused
+  typedef StaticCrsGraph<DataType, Arg1Type, Arg2Type, SizeType, Arg3Type>
+      staticcrsgraph_type;
 #else
-template< class DataType , class Arg1Type , class Arg2Type , class Arg3Type, typename SizeType >
-inline
-typename StaticCrsGraph< DataType , Arg1Type , Arg2Type , Arg3Type , SizeType >::HostMirror
-create_mirror( const StaticCrsGraph<DataType,Arg1Type,Arg2Type,Arg3Type,SizeType > & view )
-{
+template <class DataType, class Arg1Type, class Arg2Type, class Arg3Type,
+          typename SizeType>
+inline typename StaticCrsGraph<DataType, Arg1Type, Arg2Type, Arg3Type,
+                               SizeType>::HostMirror
+create_mirror(const StaticCrsGraph<DataType, Arg1Type, Arg2Type, Arg3Type,
+                                   SizeType>& view) {
   // Force copy:
-  //typedef Impl::ViewAssignment< Impl::ViewDefault > alloc ; // unused
-  typedef StaticCrsGraph< DataType , Arg1Type , Arg2Type , Arg3Type , SizeType >  staticcrsgraph_type ;
+  // typedef Impl::ViewAssignment< Impl::ViewDefault > alloc ; // unused
+  typedef StaticCrsGraph<DataType, Arg1Type, Arg2Type, Arg3Type, SizeType>
+      staticcrsgraph_type;
 #endif
 
-  typename staticcrsgraph_type::HostMirror               tmp ;
-  typename staticcrsgraph_type::row_map_type::HostMirror tmp_row_map = create_mirror( view.row_map);
-  typename staticcrsgraph_type::row_block_type::HostMirror tmp_row_block_offsets = create_mirror( view.row_block_offsets);
+  typename staticcrsgraph_type::HostMirror tmp;
+  typename staticcrsgraph_type::row_map_type::HostMirror tmp_row_map =
+      create_mirror(view.row_map);
+  typename staticcrsgraph_type::row_block_type::HostMirror
+      tmp_row_block_offsets = create_mirror(view.row_block_offsets);
 
   // Allocation to match:
-  tmp.row_map = tmp_row_map ; // Assignment of 'const' from 'non-const'
-  tmp.entries = create_mirror( view.entries );
-  tmp.row_block_offsets = tmp_row_block_offsets ; // Assignment of 'const' from 'non-const'
+  tmp.row_map = tmp_row_map;  // Assignment of 'const' from 'non-const'
+  tmp.entries = create_mirror(view.entries);
+  tmp.row_block_offsets =
+      tmp_row_block_offsets;  // Assignment of 'const' from 'non-const'
 
   // Deep copy:
-  deep_copy( tmp_row_map , view.row_map );
-  deep_copy( tmp.entries , view.entries );
-  deep_copy( tmp_row_block_offsets , view.row_block_offsets );
+  deep_copy(tmp_row_map, view.row_map);
+  deep_copy(tmp.entries, view.entries);
+  deep_copy(tmp_row_block_offsets, view.row_block_offsets);
 
-  return tmp ;
+  return tmp;
 }
 
 #ifdef KOKKOS_ENABLE_DEPRECATED_CODE
-template< class DataType , class Arg1Type , class Arg2Type , typename SizeType , class Arg3Type>
-inline
-typename StaticCrsGraph< DataType , Arg1Type , Arg2Type , SizeType , Arg3Type >::HostMirror
-create_mirror_view( const StaticCrsGraph<DataType,Arg1Type,Arg2Type,SizeType,Arg3Type > & view ,
-                    typename Impl::enable_if< ! ViewTraits<DataType,Arg1Type,Arg2Type,Arg3Type>::is_hostspace >::type * = 0 )
+template <class DataType, class Arg1Type, class Arg2Type, typename SizeType,
+          class Arg3Type>
+inline typename StaticCrsGraph<DataType, Arg1Type, Arg2Type, SizeType,
+                               Arg3Type>::HostMirror
+create_mirror_view(
+    const StaticCrsGraph<DataType, Arg1Type, Arg2Type, SizeType, Arg3Type>&
+        view,
+    typename Impl::enable_if<!ViewTraits<DataType, Arg1Type, Arg2Type,
+                                         Arg3Type>::is_hostspace>::type* = 0)
 #else
-template< class DataType , class Arg1Type , class Arg2Type , class Arg3Type, typename SizeType >
-inline
-typename StaticCrsGraph< DataType , Arg1Type , Arg2Type , Arg3Type , SizeType >::HostMirror
-create_mirror_view( const StaticCrsGraph<DataType,Arg1Type,Arg2Type,Arg3Type,SizeType > & view ,
-                    typename Impl::enable_if< ! ViewTraits<DataType,Arg1Type,Arg2Type,Arg3Type>::is_hostspace >::type * = 0 )
+template <class DataType, class Arg1Type, class Arg2Type, class Arg3Type,
+          typename SizeType>
+inline typename StaticCrsGraph<DataType, Arg1Type, Arg2Type, Arg3Type,
+                               SizeType>::HostMirror
+create_mirror_view(
+    const StaticCrsGraph<DataType, Arg1Type, Arg2Type, Arg3Type, SizeType>&
+        view,
+    typename Impl::enable_if<!ViewTraits<DataType, Arg1Type, Arg2Type,
+                                         Arg3Type>::is_hostspace>::type* = 0)
 #endif
 {
-  return create_mirror( view );
+  return create_mirror(view);
 }
-} // namespace Kokkos
+}  // namespace Kokkos
 
 //----------------------------------------------------------------------------
 //----------------------------------------------------------------------------
 
 namespace Kokkos {
 
-template< class StaticCrsGraphType , class InputSizeType >
-inline
-typename StaticCrsGraphType::staticcrsgraph_type
-create_staticcrsgraph( const std::string & label ,
-                 const std::vector< InputSizeType > & input )
-{
-  typedef StaticCrsGraphType                  output_type ;
-  //typedef std::vector< InputSizeType >  input_type ; // unused
+template <class StaticCrsGraphType, class InputSizeType>
+inline typename StaticCrsGraphType::staticcrsgraph_type create_staticcrsgraph(
+    const std::string& label, const std::vector<InputSizeType>& input) {
+  typedef StaticCrsGraphType output_type;
+  // typedef std::vector< InputSizeType >  input_type ; // unused
 
-  typedef typename output_type::entries_type   entries_type ;
+  typedef typename output_type::entries_type entries_type;
 
-  typedef View< typename output_type::size_type [] ,
-                typename output_type::array_layout ,
-                typename output_type::execution_space,
-                typename output_type::memory_traits > work_type ;
+  typedef View<typename output_type::size_type[],
+               typename output_type::array_layout,
+               typename output_type::execution_space,
+               typename output_type::memory_traits>
+      work_type;
 
-  output_type output ;
+  output_type output;
 
   // Create the row map:
 
   const size_t length = input.size();
 
   {
-    work_type row_work( "tmp" , length + 1 );
+    work_type row_work("tmp", length + 1);
 
-    typename work_type::HostMirror row_work_host =
-      create_mirror_view( row_work );
+    typename work_type::HostMirror row_work_host = create_mirror_view(row_work);
 
-    size_t sum = 0 ;
-    row_work_host[0] = 0 ;
-    for ( size_t i = 0 ; i < length ; ++i ) {
-      row_work_host[i+1] = sum += input[i];
+    size_t sum       = 0;
+    row_work_host[0] = 0;
+    for (size_t i = 0; i < length; ++i) {
+      row_work_host[i + 1] = sum += input[i];
     }
 
-    deep_copy( row_work , row_work_host );
+    deep_copy(row_work, row_work_host);
 
-    output.entries   = entries_type( label , sum );
-    output.row_map   = row_work ;
+    output.entries = entries_type(label, sum);
+    output.row_map = row_work;
   }
 
-  return output ;
+  return output;
 }
 
 //----------------------------------------------------------------------------
 
-template< class StaticCrsGraphType , class InputSizeType >
-inline
-typename StaticCrsGraphType::staticcrsgraph_type
-create_staticcrsgraph( const std::string & label ,
-                 const std::vector< std::vector< InputSizeType > > & input )
-{
-  typedef StaticCrsGraphType                  output_type ;
-  typedef typename output_type::entries_type  entries_type ;
+template <class StaticCrsGraphType, class InputSizeType>
+inline typename StaticCrsGraphType::staticcrsgraph_type create_staticcrsgraph(
+    const std::string& label,
+    const std::vector<std::vector<InputSizeType> >& input) {
+  typedef StaticCrsGraphType output_type;
+  typedef typename output_type::entries_type entries_type;
 
-  static_assert( entries_type::rank == 1
-               , "Graph entries view must be rank one" );
+  static_assert(entries_type::rank == 1, "Graph entries view must be rank one");
 
-  typedef View< typename output_type::size_type [] ,
-                typename output_type::array_layout ,
-                typename output_type::execution_space,
-                typename output_type::memory_traits > work_type ;
+  typedef View<typename output_type::size_type[],
+               typename output_type::array_layout,
+               typename output_type::execution_space,
+               typename output_type::memory_traits>
+      work_type;
 
-  output_type output ;
+  output_type output;
 
-    // Create the row map:
+  // Create the row map:
 
   const size_t length = input.size();
 
   {
-    work_type row_work( "tmp" , length + 1 );
+    work_type row_work("tmp", length + 1);
 
-    typename work_type::HostMirror row_work_host =
-      create_mirror_view( row_work );
+    typename work_type::HostMirror row_work_host = create_mirror_view(row_work);
 
-    size_t sum = 0 ;
-    row_work_host[0] = 0 ;
-    for ( size_t i = 0 ; i < length ; ++i ) {
-      row_work_host[i+1] = sum += input[i].size();
+    size_t sum       = 0;
+    row_work_host[0] = 0;
+    for (size_t i = 0; i < length; ++i) {
+      row_work_host[i + 1] = sum += input[i].size();
     }
 
-    deep_copy( row_work , row_work_host );
+    deep_copy(row_work, row_work_host);
 
-    output.entries   = entries_type( label , sum );
-    output.row_map   = row_work ;
+    output.entries = entries_type(label, sum);
+    output.row_map = row_work;
   }
 
   // Fill in the entries:
   {
     typename entries_type::HostMirror host_entries =
-      create_mirror_view( output.entries );
+        create_mirror_view(output.entries);
 
-    size_t sum = 0 ;
-    for ( size_t i = 0 ; i < length ; ++i ) {
-      for ( size_t j = 0 ; j < input[i].size() ; ++j , ++sum ) {
-        host_entries( sum ) = input[i][j] ;
+    size_t sum = 0;
+    for (size_t i = 0; i < length; ++i) {
+      for (size_t j = 0; j < input[i].size(); ++j, ++sum) {
+        host_entries(sum) = input[i][j];
       }
     }
 
-    deep_copy( output.entries , host_entries );
+    deep_copy(output.entries, host_entries);
   }
 
-  return output ;
+  return output;
 }
 
-} // namespace Kokkos
+}  // namespace Kokkos
 
 //----------------------------------------------------------------------------
 //----------------------------------------------------------------------------
 
 #endif /* #ifndef KOKKOS_IMPL_CRSARRAY_FACTORY_HPP */
-
diff --git a/lib/kokkos/containers/src/impl/Kokkos_UnorderedMap_impl.cpp b/lib/kokkos/containers/src/impl/Kokkos_UnorderedMap_impl.cpp
index 88ca200daf..e10e256b6a 100644
--- a/lib/kokkos/containers/src/impl/Kokkos_UnorderedMap_impl.cpp
+++ b/lib/kokkos/containers/src/impl/Kokkos_UnorderedMap_impl.cpp
@@ -1,13 +1,14 @@
 /*
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -36,58 +37,62 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 */
 
 #include <Kokkos_UnorderedMap.hpp>
 
-namespace Kokkos { namespace Impl {
+namespace Kokkos {
+namespace Impl {
 
-uint32_t find_hash_size(uint32_t size)
-{
+uint32_t find_hash_size(uint32_t size) {
   if (size == 0u) return 0u;
 
   // these primes try to preserve randomness of hash
-  static const uint32_t primes [] = {
-        3, 7, 13, 23, 53, 97, 193, 389, 769, 1543
-      , 2237, 2423, 2617, 2797, 2999, 3167, 3359, 3539
-      , 3727, 3911, 4441 , 4787 , 5119 , 5471 , 5801 , 6143 , 6521 , 6827
-      , 7177 , 7517 , 7853 , 8887 , 9587 , 10243 , 10937 , 11617 , 12289
-      , 12967 , 13649 , 14341 , 15013 , 15727
-      , 17749 , 19121 , 20479 , 21859 , 23209 , 24593 , 25939 , 27329
-      , 28669 , 30047 , 31469 , 35507 , 38231 , 40961 , 43711 , 46439
-      , 49157 , 51893 , 54617 , 57347 , 60077 , 62801 , 70583 , 75619
-      , 80669 , 85703 , 90749 , 95783 , 100823 , 105871 , 110909 , 115963
-      , 120997 , 126031 , 141157 , 151237 , 161323 , 171401 , 181499 , 191579
-      , 201653 , 211741 , 221813 , 231893 , 241979 , 252079
-      , 282311 , 302483 , 322649 , 342803 , 362969 , 383143 , 403301 , 423457
-      , 443629 , 463787 , 483953 , 504121 , 564617 , 604949 , 645313 , 685609
-      , 725939 , 766273 , 806609 , 846931 , 887261 , 927587 , 967919 , 1008239
-      , 1123477 , 1198397 , 1273289 , 1348177 , 1423067 , 1497983 , 1572869
-      , 1647761 , 1722667 , 1797581 , 1872461 , 1947359 , 2022253
-      , 2246953 , 2396759 , 2546543 , 2696363 , 2846161 , 2995973 , 3145739
-      , 3295541 , 3445357 , 3595117 , 3744941 , 3894707 , 4044503
-      , 4493921 , 4793501 , 5093089 , 5392679 , 5692279 , 5991883 , 6291469
-      , 6591059 , 6890641 , 7190243 , 7489829 , 7789447 , 8089033
-      , 8987807 , 9586981 , 10186177 , 10785371 , 11384539 , 11983729
-      , 12582917 , 13182109 , 13781291 , 14380469 , 14979667 , 15578861
-      , 16178053 , 17895707 , 19014187 , 20132683 , 21251141 , 22369661
-      , 23488103 , 24606583 , 25725083 , 26843549 , 27962027 , 29080529
-      , 30198989 , 31317469 , 32435981 , 35791397 , 38028379 , 40265327
-      , 42502283 , 44739259 , 46976221 , 49213237 , 51450131 , 53687099
-      , 55924061 , 58161041 , 60397993 , 62634959 , 64871921
-      , 71582857 , 76056727 , 80530643 , 85004567 , 89478503 , 93952427
-      , 98426347 , 102900263 , 107374217 , 111848111 , 116322053 , 120795971
-      , 125269877 , 129743807 , 143165587 , 152113427 , 161061283 , 170009141
-      , 178956983 , 187904819 , 196852693 , 205800547 , 214748383 , 223696237
-      , 232644089 , 241591943 , 250539763 , 259487603 , 268435399
-  };
+  static const uint32_t primes[] = {
+      3,         7,         13,        23,        53,        97,
+      193,       389,       769,       1543,      2237,      2423,
+      2617,      2797,      2999,      3167,      3359,      3539,
+      3727,      3911,      4441,      4787,      5119,      5471,
+      5801,      6143,      6521,      6827,      7177,      7517,
+      7853,      8887,      9587,      10243,     10937,     11617,
+      12289,     12967,     13649,     14341,     15013,     15727,
+      17749,     19121,     20479,     21859,     23209,     24593,
+      25939,     27329,     28669,     30047,     31469,     35507,
+      38231,     40961,     43711,     46439,     49157,     51893,
+      54617,     57347,     60077,     62801,     70583,     75619,
+      80669,     85703,     90749,     95783,     100823,    105871,
+      110909,    115963,    120997,    126031,    141157,    151237,
+      161323,    171401,    181499,    191579,    201653,    211741,
+      221813,    231893,    241979,    252079,    282311,    302483,
+      322649,    342803,    362969,    383143,    403301,    423457,
+      443629,    463787,    483953,    504121,    564617,    604949,
+      645313,    685609,    725939,    766273,    806609,    846931,
+      887261,    927587,    967919,    1008239,   1123477,   1198397,
+      1273289,   1348177,   1423067,   1497983,   1572869,   1647761,
+      1722667,   1797581,   1872461,   1947359,   2022253,   2246953,
+      2396759,   2546543,   2696363,   2846161,   2995973,   3145739,
+      3295541,   3445357,   3595117,   3744941,   3894707,   4044503,
+      4493921,   4793501,   5093089,   5392679,   5692279,   5991883,
+      6291469,   6591059,   6890641,   7190243,   7489829,   7789447,
+      8089033,   8987807,   9586981,   10186177,  10785371,  11384539,
+      11983729,  12582917,  13182109,  13781291,  14380469,  14979667,
+      15578861,  16178053,  17895707,  19014187,  20132683,  21251141,
+      22369661,  23488103,  24606583,  25725083,  26843549,  27962027,
+      29080529,  30198989,  31317469,  32435981,  35791397,  38028379,
+      40265327,  42502283,  44739259,  46976221,  49213237,  51450131,
+      53687099,  55924061,  58161041,  60397993,  62634959,  64871921,
+      71582857,  76056727,  80530643,  85004567,  89478503,  93952427,
+      98426347,  102900263, 107374217, 111848111, 116322053, 120795971,
+      125269877, 129743807, 143165587, 152113427, 161061283, 170009141,
+      178956983, 187904819, 196852693, 205800547, 214748383, 223696237,
+      232644089, 241591943, 250539763, 259487603, 268435399};
 
-  const uint32_t num_primes = sizeof(primes)/sizeof(uint32_t);
+  const uint32_t num_primes = sizeof(primes) / sizeof(uint32_t);
 
-  uint32_t hsize = primes[num_primes-1] ;
+  uint32_t hsize = primes[num_primes - 1];
   for (uint32_t i = 0; i < num_primes; ++i) {
     if (size <= primes[i]) {
       hsize = primes[i];
@@ -97,5 +102,5 @@ uint32_t find_hash_size(uint32_t size)
   return hsize;
 }
 
-}} // namespace Kokkos::Impl
-
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/containers/src/impl/Kokkos_UnorderedMap_impl.hpp b/lib/kokkos/containers/src/impl/Kokkos_UnorderedMap_impl.hpp
index f97c1fc046..55e76c424d 100644
--- a/lib/kokkos/containers/src/impl/Kokkos_UnorderedMap_impl.hpp
+++ b/lib/kokkos/containers/src/impl/Kokkos_UnorderedMap_impl.hpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -52,42 +53,34 @@
 #include <iostream>
 #include <iomanip>
 
-namespace Kokkos { namespace Impl {
+namespace Kokkos {
+namespace Impl {
 
-uint32_t find_hash_size( uint32_t size );
+uint32_t find_hash_size(uint32_t size);
 
 template <typename Map>
-struct UnorderedMapRehash
-{
+struct UnorderedMapRehash {
   typedef Map map_type;
   typedef typename map_type::const_map_type const_map_type;
   typedef typename map_type::execution_space execution_space;
   typedef typename map_type::size_type size_type;
 
-  map_type       m_dst;
+  map_type m_dst;
   const_map_type m_src;
 
-  UnorderedMapRehash( map_type const& dst, const_map_type const& src)
-    : m_dst(dst), m_src(src)
-  {}
+  UnorderedMapRehash(map_type const& dst, const_map_type const& src)
+      : m_dst(dst), m_src(src) {}
 
-  void apply() const
-  {
-    parallel_for(m_src.capacity(), *this);
-  }
+  void apply() const { parallel_for(m_src.capacity(), *this); }
 
   KOKKOS_INLINE_FUNCTION
-  void operator()(size_type i) const
-  {
-    if ( m_src.valid_at(i) )
-      m_dst.insert(m_src.key_at(i), m_src.value_at(i));
+  void operator()(size_type i) const {
+    if (m_src.valid_at(i)) m_dst.insert(m_src.key_at(i), m_src.value_at(i));
   }
-
 };
 
 template <typename UMap>
-struct UnorderedMapErase
-{
+struct UnorderedMapErase {
   typedef UMap map_type;
   typedef typename map_type::execution_space execution_space;
   typedef typename map_type::size_type size_type;
@@ -96,18 +89,12 @@ struct UnorderedMapErase
 
   map_type m_map;
 
-  UnorderedMapErase( map_type const& map)
-    : m_map(map)
-  {}
+  UnorderedMapErase(map_type const& map) : m_map(map) {}
 
-  void apply() const
-  {
-    parallel_for(m_map.m_hash_lists.extent(0), *this);
-  }
+  void apply() const { parallel_for(m_map.m_hash_lists.extent(0), *this); }
 
   KOKKOS_INLINE_FUNCTION
-  void operator()( size_type i ) const
-  {
+  void operator()(size_type i) const {
     const size_type invalid_index = map_type::invalid_index;
 
     size_type curr = m_map.m_hash_lists(i);
@@ -115,29 +102,28 @@ struct UnorderedMapErase
 
     // remove erased head of the linked-list
     while (curr != invalid_index && !m_map.valid_at(curr)) {
-      next = m_map.m_next_index[curr];
+      next                     = m_map.m_next_index[curr];
       m_map.m_next_index[curr] = invalid_index;
-      m_map.m_keys[curr] = key_type();
+      m_map.m_keys[curr]       = key_type();
       if (m_map.is_set) m_map.m_values[curr] = value_type();
-      curr = next;
+      curr                  = next;
       m_map.m_hash_lists(i) = next;
     }
 
     // if the list is non-empty and the head is valid
-    if (curr != invalid_index && m_map.valid_at(curr) ) {
+    if (curr != invalid_index && m_map.valid_at(curr)) {
       size_type prev = curr;
-      curr = m_map.m_next_index[prev];
+      curr           = m_map.m_next_index[prev];
 
       while (curr != invalid_index) {
         next = m_map.m_next_index[curr];
         if (m_map.valid_at(curr)) {
           prev = curr;
-        }
-        else {
+        } else {
           // remove curr from list
           m_map.m_next_index[prev] = next;
           m_map.m_next_index[curr] = invalid_index;
-          m_map.m_keys[curr] = key_type();
+          m_map.m_keys[curr]       = key_type();
           if (map_type::is_set) m_map.m_values[curr] = value_type();
         }
         curr = next;
@@ -147,8 +133,7 @@ struct UnorderedMapErase
 };
 
 template <typename UMap>
-struct UnorderedMapHistogram
-{
+struct UnorderedMapHistogram {
   typedef UMap map_type;
   typedef typename map_type::execution_space execution_space;
   typedef typename map_type::size_type size_type;
@@ -161,117 +146,100 @@ struct UnorderedMapHistogram
   histogram_view m_distance;
   histogram_view m_block_distance;
 
-  UnorderedMapHistogram( map_type const& map)
-    : m_map(map)
-    , m_length("UnorderedMap Histogram")
-    , m_distance("UnorderedMap Histogram")
-    , m_block_distance("UnorderedMap Histogram")
-  {}
+  UnorderedMapHistogram(map_type const& map)
+      : m_map(map),
+        m_length("UnorderedMap Histogram"),
+        m_distance("UnorderedMap Histogram"),
+        m_block_distance("UnorderedMap Histogram") {}
 
-  void calculate()
-  {
-    parallel_for(m_map.m_hash_lists.extent(0), *this);
-  }
+  void calculate() { parallel_for(m_map.m_hash_lists.extent(0), *this); }
 
-  void clear()
-  {
+  void clear() {
     Kokkos::deep_copy(m_length, 0);
     Kokkos::deep_copy(m_distance, 0);
     Kokkos::deep_copy(m_block_distance, 0);
   }
 
-  void print_length(std::ostream &out)
-  {
+  void print_length(std::ostream& out) {
     host_histogram_view host_copy = create_mirror_view(m_length);
     Kokkos::deep_copy(host_copy, m_length);
 
-    for (int i=0, size = host_copy.extent(0); i<size; ++i)
-    {
+    for (int i = 0, size = host_copy.extent(0); i < size; ++i) {
       out << host_copy[i] << " , ";
     }
     out << "\b\b\b   " << std::endl;
   }
 
-  void print_distance(std::ostream &out)
-  {
+  void print_distance(std::ostream& out) {
     host_histogram_view host_copy = create_mirror_view(m_distance);
     Kokkos::deep_copy(host_copy, m_distance);
 
-    for (int i=0, size = host_copy.extent(0); i<size; ++i)
-    {
+    for (int i = 0, size = host_copy.extent(0); i < size; ++i) {
       out << host_copy[i] << " , ";
     }
     out << "\b\b\b   " << std::endl;
   }
 
-  void print_block_distance(std::ostream &out)
-  {
+  void print_block_distance(std::ostream& out) {
     host_histogram_view host_copy = create_mirror_view(m_block_distance);
     Kokkos::deep_copy(host_copy, m_block_distance);
 
-    for (int i=0, size = host_copy.extent(0); i<size; ++i)
-    {
+    for (int i = 0, size = host_copy.extent(0); i < size; ++i) {
       out << host_copy[i] << " , ";
     }
     out << "\b\b\b   " << std::endl;
   }
 
   KOKKOS_INLINE_FUNCTION
-  void operator()( size_type i ) const
-  {
+  void operator()(size_type i) const {
     const size_type invalid_index = map_type::invalid_index;
 
-    uint32_t length = 0;
+    uint32_t length     = 0;
     size_type min_index = ~0u, max_index = 0;
-    for (size_type curr = m_map.m_hash_lists(i); curr != invalid_index; curr = m_map.m_next_index[curr]) {
+    for (size_type curr = m_map.m_hash_lists(i); curr != invalid_index;
+         curr           = m_map.m_next_index[curr]) {
       ++length;
       min_index = (curr < min_index) ? curr : min_index;
       max_index = (max_index < curr) ? curr : max_index;
     }
 
     size_type distance = (0u < length) ? max_index - min_index : 0u;
-    size_type blocks = (0u < length) ? max_index/32u - min_index/32u : 0u;
+    size_type blocks   = (0u < length) ? max_index / 32u - min_index / 32u : 0u;
 
     // normalize data
-    length   = length   < 100u ? length   : 99u;
+    length   = length < 100u ? length : 99u;
     distance = distance < 100u ? distance : 99u;
-    blocks   = blocks   < 100u ? blocks   : 99u;
+    blocks   = blocks < 100u ? blocks : 99u;
 
-    if (0u < length)
-    {
-      atomic_fetch_add( &m_length(length), 1);
-      atomic_fetch_add( &m_distance(distance), 1);
-      atomic_fetch_add( &m_block_distance(blocks), 1);
+    if (0u < length) {
+      atomic_fetch_add(&m_length(length), 1);
+      atomic_fetch_add(&m_distance(distance), 1);
+      atomic_fetch_add(&m_block_distance(blocks), 1);
     }
   }
 };
 
 template <typename UMap>
-struct UnorderedMapPrint
-{
+struct UnorderedMapPrint {
   typedef UMap map_type;
   typedef typename map_type::execution_space execution_space;
   typedef typename map_type::size_type size_type;
 
   map_type m_map;
 
-  UnorderedMapPrint( map_type const& map)
-    : m_map(map)
-  {}
+  UnorderedMapPrint(map_type const& map) : m_map(map) {}
 
-  void apply()
-  {
-    parallel_for(m_map.m_hash_lists.extent(0), *this);
-  }
+  void apply() { parallel_for(m_map.m_hash_lists.extent(0), *this); }
 
   KOKKOS_INLINE_FUNCTION
-  void operator()( size_type i ) const
-  {
+  void operator()(size_type i) const {
     const size_type invalid_index = map_type::invalid_index;
 
     uint32_t list = m_map.m_hash_lists(i);
-    for (size_type curr = list, ii=0; curr != invalid_index; curr = m_map.m_next_index[curr], ++ii) {
-      printf("%d[%d]: %d->%d\n", list, ii, m_map.key_at(curr), m_map.value_at(curr));
+    for (size_type curr = list, ii = 0; curr != invalid_index;
+         curr = m_map.m_next_index[curr], ++ii) {
+      printf("%d[%d]: %d->%d\n", list, ii, m_map.key_at(curr),
+             m_map.value_at(curr));
     }
   }
 };
@@ -280,19 +248,20 @@ template <typename DKey, typename DValue, typename SKey, typename SValue>
 struct UnorderedMapCanAssign : public false_ {};
 
 template <typename Key, typename Value>
-struct UnorderedMapCanAssign<Key,Value,Key,Value> : public true_ {};
+struct UnorderedMapCanAssign<Key, Value, Key, Value> : public true_ {};
 
 template <typename Key, typename Value>
-struct UnorderedMapCanAssign<const Key,Value,Key,Value> : public true_ {};
+struct UnorderedMapCanAssign<const Key, Value, Key, Value> : public true_ {};
 
 template <typename Key, typename Value>
-struct UnorderedMapCanAssign<const Key,const Value,Key,Value> : public true_ {};
+struct UnorderedMapCanAssign<const Key, const Value, Key, Value>
+    : public true_ {};
 
 template <typename Key, typename Value>
-struct UnorderedMapCanAssign<const Key,const Value,const Key,Value> : public true_ {};
+struct UnorderedMapCanAssign<const Key, const Value, const Key, Value>
+    : public true_ {};
 
+}  // namespace Impl
+}  // namespace Kokkos
 
-}} //Kokkos::Impl
-
-#endif // KOKKOS_UNORDERED_MAP_IMPL_HPP
-
+#endif  // KOKKOS_UNORDERED_MAP_IMPL_HPP
diff --git a/lib/kokkos/containers/unit_tests/CMakeLists.txt b/lib/kokkos/containers/unit_tests/CMakeLists.txt
index 8564bd9ddd..a83ab1293c 100644
--- a/lib/kokkos/containers/unit_tests/CMakeLists.txt
+++ b/lib/kokkos/containers/unit_tests/CMakeLists.txt
@@ -1,138 +1,35 @@
 
-INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR})
-INCLUDE_DIRECTORIES(REQUIRED_DURING_INSTALLATION_TESTING ${CMAKE_CURRENT_SOURCE_DIR})
-INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../src )
-
-IF(NOT KOKKOS_HAS_TRILINOS)
-  IF(KOKKOS_SEPARATE_LIBS)
-    set(TEST_LINK_TARGETS kokkoscore)
-  ELSE()
-    set(TEST_LINK_TARGETS kokkos)
-  ENDIF()
-ENDIF()
-
-IF(Kokkos_ENABLE_Pthread)
-TRIBITS_ADD_EXECUTABLE_AND_TEST(
-  UnitTest_Threads
-  SOURCES
-    UnitTestMain.cpp
-    threads/TestThreads_BitSet.cpp
-    threads/TestThreads_DualView.cpp
-    threads/TestThreads_DynamicView.cpp
-    threads/TestThreads_DynRankViewAPI_generic.cpp
-    threads/TestThreads_DynRankViewAPI_rank12345.cpp
-    threads/TestThreads_DynRankViewAPI_rank67.cpp
-    threads/TestThreads_ErrorReporter.cpp
-    threads/TestThreads_OffsetView.cpp
-    threads/TestThreads_ScatterView.cpp
-    threads/TestThreads_StaticCrsGraph.cpp
-    threads/TestThreads_UnorderedMap.cpp
-    threads/TestThreads_Vector.cpp
-    threads/TestThreads_ViewCtorPropEmbeddedDim.cpp
-  COMM serial mpi
-  NUM_MPI_PROCS 1
-  FAIL_REGULAR_EXPRESSION "  FAILED  "
-  TESTONLYLIBS kokkos_gtest ${TEST_LINK_TARGETS}
-  )
-ENDIF()
-
-IF(Kokkos_ENABLE_Serial)
-TRIBITS_ADD_EXECUTABLE_AND_TEST(
-  UnitTest_Serial
-  SOURCES
-    UnitTestMain.cpp
-    serial/TestSerial_BitSet.cpp
-    serial/TestSerial_DualView.cpp
-    serial/TestSerial_DynamicView.cpp
-    serial/TestSerial_DynRankViewAPI_generic.cpp
-    serial/TestSerial_DynRankViewAPI_rank12345.cpp
-    serial/TestSerial_DynRankViewAPI_rank67.cpp
-    serial/TestSerial_ErrorReporter.cpp
-    serial/TestSerial_OffsetView.cpp
-    serial/TestSerial_ScatterView.cpp
-    serial/TestSerial_StaticCrsGraph.cpp
-    serial/TestSerial_UnorderedMap.cpp
-    serial/TestSerial_Vector.cpp
-    serial/TestSerial_ViewCtorPropEmbeddedDim.cpp
-  COMM serial mpi
-  NUM_MPI_PROCS 1
-  FAIL_REGULAR_EXPRESSION "  FAILED  "
-  TESTONLYLIBS kokkos_gtest ${TEST_LINK_TARGETS}
-  )
-ENDIF()
-
-IF(Kokkos_ENABLE_OpenMP)
-TRIBITS_ADD_EXECUTABLE_AND_TEST(
-  UnitTest_OpenMP
-  SOURCES
-    UnitTestMain.cpp
-    openmp/TestOpenMP_BitSet.cpp
-    openmp/TestOpenMP_DualView.cpp
-    openmp/TestOpenMP_DynamicView.cpp
-    openmp/TestOpenMP_DynRankViewAPI_generic.cpp
-    openmp/TestOpenMP_DynRankViewAPI_rank12345.cpp
-    openmp/TestOpenMP_DynRankViewAPI_rank67.cpp
-    openmp/TestOpenMP_ErrorReporter.cpp
-    openmp/TestOpenMP_OffsetView.cpp
-    openmp/TestOpenMP_ScatterView.cpp
-    openmp/TestOpenMP_StaticCrsGraph.cpp
-    openmp/TestOpenMP_UnorderedMap.cpp
-    openmp/TestOpenMP_Vector.cpp
-    openmp/TestOpenMP_ViewCtorPropEmbeddedDim.cpp
-  COMM serial mpi
-  NUM_MPI_PROCS 1
-  FAIL_REGULAR_EXPRESSION "  FAILED  "
-  TESTONLYLIBS kokkos_gtest ${TEST_LINK_TARGETS}
-  )
-ENDIF()
-
-IF(Kokkos_ENABLE_HPX)
-TRIBITS_ADD_EXECUTABLE_AND_TEST(
-  UnitTest_HPX
-  SOURCES
-    UnitTestMain.cpp
-    hpx/TestHPX_BitSet.cpp
-    hpx/TestHPX_DualView.cpp
-    hpx/TestHPX_DynamicView.cpp
-    hpx/TestHPX_DynRankViewAPI_generic.cpp
-    hpx/TestHPX_DynRankViewAPI_rank12345.cpp
-    hpx/TestHPX_DynRankViewAPI_rank67.cpp
-    hpx/TestHPX_ErrorReporter.cpp
-    hpx/TestHPX_OffsetView.cpp
-    hpx/TestHPX_ScatterView.cpp
-    hpx/TestHPX_StaticCrsGraph.cpp
-    hpx/TestHPX_UnorderedMap.cpp
-    hpx/TestHPX_Vector.cpp
-    hpx/TestHPX_ViewCtorPropEmbeddedDim.cpp
-  COMM serial mpi
-  NUM_MPI_PROCS 1
-  FAIL_REGULAR_EXPRESSION "  FAILED  "
-  TESTONLYLIBS kokkos_gtest ${TEST_LINK_TARGETS}
-  )
-ENDIF()
-
-IF(Kokkos_ENABLE_Cuda)
-TRIBITS_ADD_EXECUTABLE_AND_TEST(
-  UnitTest_Cuda
-  SOURCES
-    UnitTestMain.cpp
-    cuda/TestCuda_BitSet.cpp
-    cuda/TestCuda_DualView.cpp
-    cuda/TestCuda_DynamicView.cpp
-    cuda/TestCuda_DynRankViewAPI_generic.cpp
-    cuda/TestCuda_DynRankViewAPI_rank12345.cpp
-    cuda/TestCuda_DynRankViewAPI_rank67.cpp
-    cuda/TestCuda_ErrorReporter.cpp
-    cuda/TestCuda_OffsetView.cpp
-    cuda/TestCuda_ScatterView.cpp
-    cuda/TestCuda_StaticCrsGraph.cpp
-    cuda/TestCuda_UnorderedMap.cpp
-    cuda/TestCuda_Vector.cpp
-    cuda/TestCuda_ViewCtorPropEmbeddedDim.cpp
-  COMM serial mpi
-  NUM_MPI_PROCS 1
-  FAIL_REGULAR_EXPRESSION "  FAILED  "
-  TESTONLYLIBS kokkos_gtest ${TEST_LINK_TARGETS}
-  )
-ENDIF()
+KOKKOS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR})
+KOKKOS_INCLUDE_DIRECTORIES(REQUIRED_DURING_INSTALLATION_TESTING ${CMAKE_CURRENT_SOURCE_DIR})
+KOKKOS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../src )
 
+foreach(Tag Threads;Serial;OpenMP;HPX;Cuda)
+  # Because there is always an exception to the rule
+  if(Tag STREQUAL "Threads")
+    set(DEVICE "PTHREAD")
+  else()
+    string(TOUPPER ${Tag} DEVICE)
+  endif()
+  string(TOLOWER ${Tag} dir)
+  # Add test for that backend if it is enabled
+  if(Kokkos_ENABLE_${DEVICE})
+    KOKKOS_ADD_EXECUTABLE_AND_TEST(
+      UnitTest_${Tag}
+      SOURCES
+        UnitTestMain.cpp
+        ${dir}/Test${Tag}_BitSet.cpp
+        ${dir}/Test${Tag}_DualView.cpp
+        ${dir}/Test${Tag}_DynamicView.cpp
+        ${dir}/Test${Tag}_DynRankViewAPI_generic.cpp
+        ${dir}/Test${Tag}_DynRankViewAPI_rank12345.cpp
+        ${dir}/Test${Tag}_DynRankViewAPI_rank67.cpp
+        ${dir}/Test${Tag}_ErrorReporter.cpp
+        ${dir}/Test${Tag}_OffsetView.cpp
+        ${dir}/Test${Tag}_ScatterView.cpp
+        ${dir}/Test${Tag}_StaticCrsGraph.cpp
+        ${dir}/Test${Tag}_UnorderedMap.cpp
+        ${dir}/Test${Tag}_Vector.cpp
+        ${dir}/Test${Tag}_ViewCtorPropEmbeddedDim.cpp
+      )
+  endif()
+endforeach()
diff --git a/lib/kokkos/containers/unit_tests/TestBitset.hpp b/lib/kokkos/containers/unit_tests/TestBitset.hpp
index 371c0288b1..ebd35d3ae7 100644
--- a/lib/kokkos/containers/unit_tests/TestBitset.hpp
+++ b/lib/kokkos/containers/unit_tests/TestBitset.hpp
@@ -1,12 +1,13 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -22,10 +23,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -35,7 +36,7 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
@@ -52,240 +53,208 @@ namespace Test {
 namespace Impl {
 
 template <typename Bitset, bool Set>
-struct TestBitset
-{
+struct TestBitset {
   typedef Bitset bitset_type;
   typedef typename bitset_type::execution_space execution_space;
   typedef uint32_t value_type;
 
   bitset_type m_bitset;
 
-  TestBitset( bitset_type const& bitset)
-    : m_bitset(bitset)
-  {}
+  TestBitset(bitset_type const& bitset) : m_bitset(bitset) {}
 
-  unsigned testit(unsigned collisions)
-  {
+  unsigned testit(unsigned collisions) {
     execution_space().fence();
 
     unsigned count = 0;
-    Kokkos::parallel_reduce( m_bitset.size()*collisions, *this, count);
+    Kokkos::parallel_reduce(m_bitset.size() * collisions, *this, count);
     return count;
   }
 
+  KOKKOS_INLINE_FUNCTION
+  void init(value_type& v) const { v = 0; }
 
   KOKKOS_INLINE_FUNCTION
-  void init( value_type & v ) const { v = 0; }
+  void join(volatile value_type& dst, const volatile value_type& src) const {
+    dst += src;
+  }
 
   KOKKOS_INLINE_FUNCTION
-  void join( volatile value_type & dst, const volatile value_type & src ) const
-  { dst += src; }
-
-  KOKKOS_INLINE_FUNCTION
-  void operator()(uint32_t i, value_type & v) const
-  {
+  void operator()(uint32_t i, value_type& v) const {
     i = i % m_bitset.size();
     if (Set) {
       if (m_bitset.set(i)) {
         if (m_bitset.test(i)) ++v;
       }
-    }
-    else {
+    } else {
       if (m_bitset.reset(i)) {
         if (!m_bitset.test(i)) ++v;
       }
     }
   }
-
 };
 
 template <typename Bitset>
-struct TestBitsetTest
-{
+struct TestBitsetTest {
   typedef Bitset bitset_type;
   typedef typename bitset_type::execution_space execution_space;
   typedef uint32_t value_type;
 
   bitset_type m_bitset;
 
-  TestBitsetTest( bitset_type const& bitset)
-    : m_bitset(bitset)
-  {}
+  TestBitsetTest(bitset_type const& bitset) : m_bitset(bitset) {}
 
-  unsigned testit()
-  {
+  unsigned testit() {
     execution_space().fence();
 
     unsigned count = 0;
-    Kokkos::parallel_reduce( m_bitset.size(), *this, count);
+    Kokkos::parallel_reduce(m_bitset.size(), *this, count);
     return count;
   }
 
+  KOKKOS_INLINE_FUNCTION
+  void init(value_type& v) const { v = 0; }
 
   KOKKOS_INLINE_FUNCTION
-  void init( value_type & v ) const { v = 0; }
+  void join(volatile value_type& dst, const volatile value_type& src) const {
+    dst += src;
+  }
 
   KOKKOS_INLINE_FUNCTION
-  void join( volatile value_type & dst, const volatile value_type & src ) const
-  { dst += src; }
-
-  KOKKOS_INLINE_FUNCTION
-  void operator()(uint32_t i, value_type & v) const
-  {
-    if (m_bitset.test( i )) ++v;
+  void operator()(uint32_t i, value_type& v) const {
+    if (m_bitset.test(i)) ++v;
   }
 };
 
 template <typename Bitset, bool Set>
-struct TestBitsetAny
-{
+struct TestBitsetAny {
   typedef Bitset bitset_type;
   typedef typename bitset_type::execution_space execution_space;
   typedef uint32_t value_type;
 
   bitset_type m_bitset;
 
-  TestBitsetAny( bitset_type const& bitset)
-    : m_bitset(bitset)
-  {}
+  TestBitsetAny(bitset_type const& bitset) : m_bitset(bitset) {}
 
-  unsigned testit()
-  {
+  unsigned testit() {
     execution_space().fence();
 
     unsigned count = 0;
-    Kokkos::parallel_reduce( m_bitset.size(), *this, count);
+    Kokkos::parallel_reduce(m_bitset.size(), *this, count);
     return count;
   }
 
+  KOKKOS_INLINE_FUNCTION
+  void init(value_type& v) const { v = 0; }
 
   KOKKOS_INLINE_FUNCTION
-  void init( value_type & v ) const { v = 0; }
+  void join(volatile value_type& dst, const volatile value_type& src) const {
+    dst += src;
+  }
 
   KOKKOS_INLINE_FUNCTION
-  void join( volatile value_type & dst, const volatile value_type & src ) const
-  { dst += src; }
-
-  KOKKOS_INLINE_FUNCTION
-  void operator()(uint32_t i, value_type & v) const
-  {
-    bool result = false;
+  void operator()(uint32_t i, value_type& v) const {
+    bool result       = false;
     unsigned attempts = 0;
-    uint32_t hint = (i >> 4) << 4;
+    uint32_t hint     = (i >> 4) << 4;
     while (attempts < m_bitset.max_hint()) {
       if (Set) {
         Kokkos::tie(result, hint) = m_bitset.find_any_unset_near(hint, i);
         if (result && m_bitset.set(hint)) {
           ++v;
           break;
-        }
-        else if (!result) {
+        } else if (!result) {
           ++attempts;
         }
-      }
-      else {
+      } else {
         Kokkos::tie(result, hint) = m_bitset.find_any_set_near(hint, i);
         if (result && m_bitset.reset(hint)) {
           ++v;
           break;
-        }
-        else if (!result) {
+        } else if (!result) {
           ++attempts;
         }
       }
     }
   }
-
 };
-} // namespace Impl
-
-
+}  // namespace Impl
 
 template <typename Device>
-void test_bitset()
-{
-  typedef Kokkos::Bitset< Device > bitset_type;
-  typedef Kokkos::ConstBitset< Device > const_bitset_type;
+void test_bitset() {
+  typedef Kokkos::Bitset<Device> bitset_type;
+  typedef Kokkos::ConstBitset<Device> const_bitset_type;
 
-  //unsigned test_sizes[] = { 0u, 1000u, 1u<<14, 1u<<16, 10000001 };
-  unsigned test_sizes[] = { 1000u, 1u<<14, 1u<<16, 10000001 };
+  // unsigned test_sizes[] = { 0u, 1000u, 1u<<14, 1u<<16, 10000001 };
+  unsigned test_sizes[] = {1000u, 1u << 14, 1u << 16, 10000001};
 
-  for (int i=0, end = sizeof(test_sizes)/sizeof(unsigned); i<end; ++i) {
-
-    //std::cout << "Bitset " << test_sizes[i] << std::endl;
+  for (int i = 0, end = sizeof(test_sizes) / sizeof(unsigned); i < end; ++i) {
+    // std::cout << "Bitset " << test_sizes[i] << std::endl;
 
     bitset_type bitset(test_sizes[i]);
 
-    //std::cout << "  Check inital count " << std::endl;
+    // std::cout << "  Check initial count " << std::endl;
     // nothing should be set
     {
-      Impl::TestBitsetTest< bitset_type > f(bitset);
+      Impl::TestBitsetTest<bitset_type> f(bitset);
       uint32_t count = f.testit();
       EXPECT_EQ(0u, count);
       EXPECT_EQ(count, bitset.count());
     }
 
-    //std::cout << "  Check set() " << std::endl;
+    // std::cout << "  Check set() " << std::endl;
     bitset.set();
     // everything should be set
     {
-      Impl::TestBitsetTest< const_bitset_type > f(bitset);
+      Impl::TestBitsetTest<const_bitset_type> f(bitset);
       uint32_t count = f.testit();
       EXPECT_EQ(bitset.size(), count);
       EXPECT_EQ(count, bitset.count());
     }
 
-    //std::cout << "  Check reset() " << std::endl;
+    // std::cout << "  Check reset() " << std::endl;
     bitset.reset();
     EXPECT_EQ(0u, bitset.count());
 
-    //std::cout << "  Check set(i) " << std::endl;
+    // std::cout << "  Check set(i) " << std::endl;
     // test setting bits
     {
-      Impl::TestBitset< bitset_type, true > f(bitset);
+      Impl::TestBitset<bitset_type, true> f(bitset);
       uint32_t count = f.testit(10u);
-      EXPECT_EQ( bitset.size(), bitset.count());
-      EXPECT_EQ( bitset.size(), count );
+      EXPECT_EQ(bitset.size(), bitset.count());
+      EXPECT_EQ(bitset.size(), count);
     }
 
-    //std::cout << "  Check reset(i) " << std::endl;
+    // std::cout << "  Check reset(i) " << std::endl;
     // test resetting bits
     {
-      Impl::TestBitset< bitset_type, false > f(bitset);
+      Impl::TestBitset<bitset_type, false> f(bitset);
       uint32_t count = f.testit(10u);
-      EXPECT_EQ( bitset.size(), count);
-      EXPECT_EQ( 0u, bitset.count() );
+      EXPECT_EQ(bitset.size(), count);
+      EXPECT_EQ(0u, bitset.count());
     }
 
-
-    //std::cout << "  Check find_any_set(i) " << std::endl;
+    // std::cout << "  Check find_any_set(i) " << std::endl;
     // test setting any bits
     {
-      Impl::TestBitsetAny< bitset_type, true > f(bitset);
+      Impl::TestBitsetAny<bitset_type, true> f(bitset);
       uint32_t count = f.testit();
-      EXPECT_EQ( bitset.size(), bitset.count());
-      EXPECT_EQ( bitset.size(), count );
+      EXPECT_EQ(bitset.size(), bitset.count());
+      EXPECT_EQ(bitset.size(), count);
     }
 
-    //std::cout << "  Check find_any_unset(i) " << std::endl;
+    // std::cout << "  Check find_any_unset(i) " << std::endl;
     // test resetting any bits
     {
-      Impl::TestBitsetAny< bitset_type, false > f(bitset);
+      Impl::TestBitsetAny<bitset_type, false> f(bitset);
       uint32_t count = f.testit();
-      EXPECT_EQ( bitset.size(), count);
-      EXPECT_EQ( 0u, bitset.count() );
+      EXPECT_EQ(bitset.size(), count);
+      EXPECT_EQ(0u, bitset.count());
     }
-
   }
-
 }
 
-TEST_F( TEST_CATEGORY, bitset )
-{
-  test_bitset<TEST_EXECSPACE>();
-}
+TEST(TEST_CATEGORY, bitset) { test_bitset<TEST_EXECSPACE>(); }
 
-} // namespace Test
-
-#endif //KOKKOS_TEST_BITSET_HPP
+}  // namespace Test
 
+#endif  // KOKKOS_TEST_BITSET_HPP
diff --git a/lib/kokkos/containers/unit_tests/TestDualView.hpp b/lib/kokkos/containers/unit_tests/TestDualView.hpp
index 767f93c093..572ef48839 100644
--- a/lib/kokkos/containers/unit_tests/TestDualView.hpp
+++ b/lib/kokkos/containers/unit_tests/TestDualView.hpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -55,169 +56,159 @@ namespace Test {
 
 namespace Impl {
 
-  template <typename Scalar, class Device>
-  struct test_dualview_combinations
-  {
-    typedef test_dualview_combinations<Scalar,Device> self_type;
+template <typename Scalar, class Device>
+struct test_dualview_combinations {
+  typedef test_dualview_combinations<Scalar, Device> self_type;
 
-    typedef Scalar scalar_type;
-    typedef Device execution_space;
+  typedef Scalar scalar_type;
+  typedef Device execution_space;
 
-    Scalar reference;
-    Scalar result;
+  Scalar reference;
+  Scalar result;
 
-    template <typename ViewType>
-    Scalar run_me(unsigned int n,unsigned int m){
-      if(n<10) n = 10;
-      if(m<3) m = 3;
-      ViewType a("A",n,m);
+  template <typename ViewType>
+  Scalar run_me(unsigned int n, unsigned int m) {
+    if (n < 10) n = 10;
+    if (m < 3) m = 3;
+    ViewType a("A", n, m);
 
-      Kokkos::deep_copy( a.d_view , 1 );
+    Kokkos::deep_copy(a.d_view, 1);
 
-      a.template modify<typename ViewType::execution_space>();
-      a.template sync<typename ViewType::host_mirror_space>();
+    a.template modify<typename ViewType::execution_space>();
+    a.template sync<typename ViewType::host_mirror_space>();
 
-      a.h_view(5,1) = 3;
-      a.h_view(6,1) = 4;
-      a.h_view(7,2) = 5;
-      a.template modify<typename ViewType::host_mirror_space>();
-      ViewType b = Kokkos::subview(a,std::pair<unsigned int, unsigned int>(6,9),std::pair<unsigned int, unsigned int>(0,1));
-      a.template sync<typename ViewType::execution_space>();
-      b.template modify<typename ViewType::execution_space>();
+    a.h_view(5, 1) = 3;
+    a.h_view(6, 1) = 4;
+    a.h_view(7, 2) = 5;
+    a.template modify<typename ViewType::host_mirror_space>();
+    ViewType b = Kokkos::subview(a, std::pair<unsigned int, unsigned int>(6, 9),
+                                 std::pair<unsigned int, unsigned int>(0, 1));
+    a.template sync<typename ViewType::execution_space>();
+    b.template modify<typename ViewType::execution_space>();
 
-      Kokkos::deep_copy( b.d_view , 2 );
+    Kokkos::deep_copy(b.d_view, 2);
 
-      a.template sync<typename ViewType::host_mirror_space>();
-      Scalar count = 0;
-      for(unsigned int i = 0; i<a.d_view.extent(0); i++)
-        for(unsigned int j = 0; j<a.d_view.extent(1); j++)
-          count += a.h_view(i,j);
-      return count -  a.d_view.extent(0)*a.d_view.extent(1)-2-4-3*2;
+    a.template sync<typename ViewType::host_mirror_space>();
+    Scalar count = 0;
+    for (unsigned int i = 0; i < a.d_view.extent(0); i++)
+      for (unsigned int j = 0; j < a.d_view.extent(1); j++)
+        count += a.h_view(i, j);
+    return count - a.d_view.extent(0) * a.d_view.extent(1) - 2 - 4 - 3 * 2;
+  }
+
+  test_dualview_combinations(unsigned int size) {
+    result = run_me<Kokkos::DualView<Scalar**, Kokkos::LayoutLeft, Device> >(
+        size, 3);
+  }
+};
+
+template <typename Scalar, class ViewType>
+struct SumViewEntriesFunctor {
+  typedef Scalar value_type;
+
+  ViewType fv;
+
+  SumViewEntriesFunctor(const ViewType& fv_) : fv(fv_) {}
+
+  KOKKOS_INLINE_FUNCTION
+  void operator()(const int i, value_type& total) const {
+    for (size_t j = 0; j < fv.extent(1); ++j) {
+      total += fv(i, j);
     }
+  }
+};
 
+template <typename Scalar, class Device>
+struct test_dual_view_deep_copy {
+  typedef Scalar scalar_type;
+  typedef Device execution_space;
 
-    test_dualview_combinations(unsigned int size)
-    {
-      result = run_me< Kokkos::DualView<Scalar**,Kokkos::LayoutLeft,Device> >(size,3);
-    }
+  template <typename ViewType>
+  void run_me() {
+    const unsigned int n         = 10;
+    const unsigned int m         = 5;
+    const unsigned int sum_total = n * m;
 
-  };
+    ViewType a("A", n, m);
+    ViewType b("B", n, m);
 
-  template < typename Scalar, class ViewType >
-  struct SumViewEntriesFunctor {
+    Kokkos::deep_copy(a.d_view, 1);
 
-    typedef Scalar value_type;
+    a.template modify<typename ViewType::execution_space>();
+    a.template sync<typename ViewType::host_mirror_space>();
 
-    ViewType fv;
+    // Check device view is initialized as expected
+    scalar_type a_d_sum = 0;
+    // Execute on the execution_space associated with t_dev's memory space
+    typedef typename ViewType::t_dev::memory_space::execution_space
+        t_dev_exec_space;
+    Kokkos::parallel_reduce(
+        Kokkos::RangePolicy<t_dev_exec_space>(0, n),
+        SumViewEntriesFunctor<scalar_type, typename ViewType::t_dev>(a.d_view),
+        a_d_sum);
+    ASSERT_EQ(a_d_sum, sum_total);
 
-    SumViewEntriesFunctor ( const ViewType & fv_ ) : fv(fv_) {}
-
-    KOKKOS_INLINE_FUNCTION
-    void operator() ( const int i , value_type & total ) const {
-      for ( size_t j = 0; j < fv.extent(1); ++j ) {
-        total += fv(i,j);
+    // Check host view is synced as expected
+    scalar_type a_h_sum = 0;
+    for (size_t i = 0; i < a.h_view.extent(0); ++i)
+      for (size_t j = 0; j < a.h_view.extent(1); ++j) {
+        a_h_sum += a.h_view(i, j);
       }
-    }
 
-  };
-  
+    ASSERT_EQ(a_h_sum, sum_total);
 
-  template <typename Scalar, class Device>
-  struct test_dual_view_deep_copy
-  {
-    typedef Scalar scalar_type;
-    typedef Device execution_space;
+    // Test deep_copy
+    Kokkos::deep_copy(b, a);
+    b.template sync<typename ViewType::host_mirror_space>();
 
-    template <typename ViewType>
-    void run_me() {
+    // Perform same checks on b as done on a
+    // Check device view is initialized as expected
+    scalar_type b_d_sum = 0;
+    // Execute on the execution_space associated with t_dev's memory space
+    Kokkos::parallel_reduce(
+        Kokkos::RangePolicy<t_dev_exec_space>(0, n),
+        SumViewEntriesFunctor<scalar_type, typename ViewType::t_dev>(b.d_view),
+        b_d_sum);
+    ASSERT_EQ(b_d_sum, sum_total);
 
-      const unsigned int n = 10;
-      const unsigned int m = 5;
-      const unsigned int sum_total = n * m;
+    // Check host view is synced as expected
+    scalar_type b_h_sum = 0;
+    for (size_t i = 0; i < b.h_view.extent(0); ++i)
+      for (size_t j = 0; j < b.h_view.extent(1); ++j) {
+        b_h_sum += b.h_view(i, j);
+      }
 
-      ViewType a("A",n,m);
-      ViewType b("B",n,m);
+    ASSERT_EQ(b_h_sum, sum_total);
 
-      Kokkos::deep_copy( a.d_view , 1 );
-
-      a.template modify<typename ViewType::execution_space>();
-      a.template sync<typename ViewType::host_mirror_space>();
-
-      // Check device view is initialized as expected
-      scalar_type a_d_sum = 0;
-      // Execute on the execution_space associated with t_dev's memory space
-      typedef typename ViewType::t_dev::memory_space::execution_space t_dev_exec_space;
-      Kokkos::parallel_reduce( Kokkos::RangePolicy<t_dev_exec_space>(0,n), SumViewEntriesFunctor<scalar_type, typename ViewType::t_dev>(a.d_view), a_d_sum );
-      ASSERT_EQ(a_d_sum, sum_total);
-
-      // Check host view is synced as expected
-      scalar_type a_h_sum = 0;
-      for ( size_t i = 0; i < a.h_view.extent(0); ++i )
-        for ( size_t j = 0; j < a.h_view.extent(1); ++j ) {
-          a_h_sum += a.h_view(i,j);
-        }
-
-      ASSERT_EQ(a_h_sum, sum_total);
-
-
-      // Test deep_copy
-      Kokkos::deep_copy( b, a );
-      b.template sync<typename ViewType::host_mirror_space>();
-
-      // Perform same checks on b as done on a
-      // Check device view is initialized as expected
-      scalar_type b_d_sum = 0;
-      // Execute on the execution_space associated with t_dev's memory space
-      Kokkos::parallel_reduce( Kokkos::RangePolicy<t_dev_exec_space>(0,n), SumViewEntriesFunctor<scalar_type, typename ViewType::t_dev>(b.d_view), b_d_sum );
-      ASSERT_EQ(b_d_sum, sum_total);
-
-      // Check host view is synced as expected
-      scalar_type b_h_sum = 0;
-      for ( size_t i = 0; i < b.h_view.extent(0); ++i )
-        for ( size_t j = 0; j < b.h_view.extent(1); ++j ) {
-          b_h_sum += b.h_view(i,j);
-        }
-
-      ASSERT_EQ(b_h_sum, sum_total);
-
-    } // end run_me
-
-    test_dual_view_deep_copy()
-    {
-      run_me< Kokkos::DualView<Scalar**,Kokkos::LayoutLeft,Device> >();
-    }
-
-  };
-
-} // namespace Impl
+  }  // end run_me
 
+  test_dual_view_deep_copy() {
+    run_me<Kokkos::DualView<Scalar**, Kokkos::LayoutLeft, Device> >();
+  }
+};
 
+}  // namespace Impl
 
 template <typename Scalar, typename Device>
-void test_dualview_combinations(unsigned int size)
-{
-  Impl::test_dualview_combinations<Scalar,Device> test(size);
-  ASSERT_EQ( test.result,0);
-
+void test_dualview_combinations(unsigned int size) {
+  Impl::test_dualview_combinations<Scalar, Device> test(size);
+  ASSERT_EQ(test.result, 0);
 }
 
 template <typename Scalar, typename Device>
-void test_dualview_deep_copy()
-{
-  Impl::test_dual_view_deep_copy<Scalar,Device> ();
+void test_dualview_deep_copy() {
+  Impl::test_dual_view_deep_copy<Scalar, Device>();
 }
 
-TEST_F( TEST_CATEGORY, dualview_combination) {
-    test_dualview_combinations<int,TEST_EXECSPACE>(10);
+TEST(TEST_CATEGORY, dualview_combination) {
+  test_dualview_combinations<int, TEST_EXECSPACE>(10);
 }
 
-TEST_F( TEST_CATEGORY, dualview_deep_copy) {
-    test_dualview_deep_copy<int,TEST_EXECSPACE>();
-    test_dualview_deep_copy<double,TEST_EXECSPACE>();
+TEST(TEST_CATEGORY, dualview_deep_copy) {
+  test_dualview_deep_copy<int, TEST_EXECSPACE>();
+  test_dualview_deep_copy<double, TEST_EXECSPACE>();
 }
 
+}  // namespace Test
 
-} // namespace Test
-
-#endif //KOKKOS_TEST_UNORDERED_MAP_HPP
-
+#endif  // KOKKOS_TEST_UNORDERED_MAP_HPP
diff --git a/lib/kokkos/containers/unit_tests/TestDynViewAPI.hpp b/lib/kokkos/containers/unit_tests/TestDynViewAPI.hpp
index 13e56c9f8d..3692aa8a12 100644
--- a/lib/kokkos/containers/unit_tests/TestDynViewAPI.hpp
+++ b/lib/kokkos/containers/unit_tests/TestDynViewAPI.hpp
@@ -1,13 +1,14 @@
 /*
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -36,7 +37,7 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 */
@@ -51,680 +52,661 @@
 
 /*--------------------------------------------------------------------------*/
 
-
 /*--------------------------------------------------------------------------*/
 
 namespace Test {
 
-template< class T , class ... P >
-size_t allocation_count( const Kokkos::DynRankView<T,P...> & view )
-{
+template <class T, class... P>
+size_t allocation_count(const Kokkos::DynRankView<T, P...>& view) {
   const size_t card  = view.size();
   const size_t alloc = view.span();
 
-  return card <= alloc ? alloc : 0 ;
+  return card <= alloc ? alloc : 0;
 }
 
 /*--------------------------------------------------------------------------*/
 
-template< typename T, class DeviceType>
-struct TestViewOperator
-{
-  typedef DeviceType  execution_space ;
+template <typename T, class DeviceType>
+struct TestViewOperator {
+  typedef DeviceType execution_space;
 
-  static const unsigned N = 100 ;
-  static const unsigned D = 3 ;
+  static const unsigned N = 100;
+  static const unsigned D = 3;
 
-  typedef Kokkos::DynRankView< T , execution_space > view_type ;
+  typedef Kokkos::DynRankView<T, execution_space> view_type;
 
-  const view_type v1 ;
-  const view_type v2 ;
+  const view_type v1;
+  const view_type v2;
 
-  TestViewOperator()
-    : v1( "v1" , N , D )
-    , v2( "v2" , N , D )
-    {}
+  TestViewOperator() : v1("v1", N, D), v2("v2", N, D) {}
 
-  static void testit()
-  {
-    Kokkos::parallel_for( N , TestViewOperator() );
-  }
+  static void testit() { Kokkos::parallel_for(N, TestViewOperator()); }
 
   KOKKOS_INLINE_FUNCTION
-  void operator()( const unsigned i ) const
-  {
-    const unsigned X = 0 ;
-    const unsigned Y = 1 ;
-    const unsigned Z = 2 ;
+  void operator()(const unsigned i) const {
+    const unsigned X = 0;
+    const unsigned Y = 1;
+    const unsigned Z = 2;
 
-    v2(i,X) = v1(i,X);
-    v2(i,Y) = v1(i,Y);
-    v2(i,Z) = v1(i,Z);
+    v2(i, X) = v1(i, X);
+    v2(i, Y) = v1(i, Y);
+    v2(i, Z) = v1(i, Z);
   }
 };
 
 /*--------------------------------------------------------------------------*/
 
-template< class DataType ,
-          class DeviceType ,
-          unsigned Rank >
-struct TestViewOperator_LeftAndRight ;
+template <class DataType, class DeviceType, unsigned Rank>
+struct TestViewOperator_LeftAndRight;
 
-template< class DataType , class DeviceType >
-struct TestViewOperator_LeftAndRight< DataType , DeviceType , 7 >
-{
-  typedef DeviceType                          execution_space ;
-  typedef typename execution_space::memory_space  memory_space ;
-  typedef typename execution_space::size_type     size_type ;
+template <class DataType, class DeviceType>
+struct TestViewOperator_LeftAndRight<DataType, DeviceType, 7> {
+  typedef DeviceType execution_space;
+  typedef typename execution_space::memory_space memory_space;
+  typedef typename execution_space::size_type size_type;
 
-  typedef int value_type ;
+  typedef int value_type;
 
   KOKKOS_INLINE_FUNCTION
-  static void join( volatile value_type & update ,
-                    const volatile value_type & input )
-    { update |= input ; }
-
-  KOKKOS_INLINE_FUNCTION
-  static void init( value_type & update )
-    { update = 0 ; }
-
-
-  typedef Kokkos::
-    DynRankView< DataType, Kokkos::LayoutLeft, execution_space > left_view ;
-
-  typedef Kokkos::
-    DynRankView< DataType, Kokkos::LayoutRight, execution_space > right_view ;
-
-  left_view    left ;
-  right_view   right ;
-  long         left_alloc ;
-  long         right_alloc ;
-
-  TestViewOperator_LeftAndRight(unsigned N0, unsigned N1, unsigned N2, unsigned N3, unsigned N4, unsigned N5, unsigned N6 )
-    : left(  "left" , N0, N1, N2, N3, N4, N5, N6 )
-    , right( "right" , N0, N1, N2, N3, N4, N5, N6 )
-    , left_alloc( allocation_count( left ) )
-    , right_alloc( allocation_count( right ) )
-    {}
-
-  static void testit(unsigned N0, unsigned N1, unsigned N2, unsigned N3, unsigned N4, unsigned N5, unsigned N6 )
-  {
-    TestViewOperator_LeftAndRight driver(N0, N1, N2, N3, N4, N5, N6 );
-
-    int error_flag = 0 ;
-
-    Kokkos::parallel_reduce( 1 , driver , error_flag );
-
-    ASSERT_EQ( error_flag , 0 );
+  static void join(volatile value_type& update,
+                   const volatile value_type& input) {
+    update |= input;
   }
 
   KOKKOS_INLINE_FUNCTION
-  void operator()( const size_type , value_type & update ) const
-  {
-    long offset ;
+  static void init(value_type& update) { update = 0; }
 
-    offset = -1 ;
-    for ( unsigned i6 = 0 ; i6 < unsigned(left.extent(6)) ; ++i6 )
-    for ( unsigned i5 = 0 ; i5 < unsigned(left.extent(5)) ; ++i5 )
-    for ( unsigned i4 = 0 ; i4 < unsigned(left.extent(4)) ; ++i4 )
-    for ( unsigned i3 = 0 ; i3 < unsigned(left.extent(3)) ; ++i3 )
-    for ( unsigned i2 = 0 ; i2 < unsigned(left.extent(2)) ; ++i2 )
-    for ( unsigned i1 = 0 ; i1 < unsigned(left.extent(1)) ; ++i1 )
-    for ( unsigned i0 = 0 ; i0 < unsigned(left.extent(0)) ; ++i0 )
-    {
-      const long j = & left( i0, i1, i2, i3, i4, i5, i6 ) -
-                     & left(  0,  0,  0,  0,  0,  0,  0 );
-      if ( j <= offset || left_alloc <= j ) { update |= 1 ; }
-      offset = j ;
-    }
+  typedef Kokkos::DynRankView<DataType, Kokkos::LayoutLeft, execution_space>
+      left_view;
 
-    offset = -1 ;
-    for ( unsigned i0 = 0 ; i0 < unsigned(right.extent(0)) ; ++i0 )
-    for ( unsigned i1 = 0 ; i1 < unsigned(right.extent(1)) ; ++i1 )
-    for ( unsigned i2 = 0 ; i2 < unsigned(right.extent(2)) ; ++i2 )
-    for ( unsigned i3 = 0 ; i3 < unsigned(right.extent(3)) ; ++i3 )
-    for ( unsigned i4 = 0 ; i4 < unsigned(right.extent(4)) ; ++i4 )
-    for ( unsigned i5 = 0 ; i5 < unsigned(right.extent(5)) ; ++i5 )
-    for ( unsigned i6 = 0 ; i6 < unsigned(right.extent(6)) ; ++i6 )
-    {
-      const long j = & right( i0, i1, i2, i3, i4, i5, i6 ) -
-                     & right(  0,  0,  0,  0,  0,  0,  0 );
-      if ( j <= offset || right_alloc <= j ) { update |= 2 ; }
-      offset = j ;
-    }
+  typedef Kokkos::DynRankView<DataType, Kokkos::LayoutRight, execution_space>
+      right_view;
+
+  left_view left;
+  right_view right;
+  long left_alloc;
+  long right_alloc;
+
+  TestViewOperator_LeftAndRight(unsigned N0, unsigned N1, unsigned N2,
+                                unsigned N3, unsigned N4, unsigned N5,
+                                unsigned N6)
+      : left("left", N0, N1, N2, N3, N4, N5, N6),
+        right("right", N0, N1, N2, N3, N4, N5, N6),
+        left_alloc(allocation_count(left)),
+        right_alloc(allocation_count(right)) {}
+
+  static void testit(unsigned N0, unsigned N1, unsigned N2, unsigned N3,
+                     unsigned N4, unsigned N5, unsigned N6) {
+    TestViewOperator_LeftAndRight driver(N0, N1, N2, N3, N4, N5, N6);
+
+    int error_flag = 0;
+
+    Kokkos::parallel_reduce(1, driver, error_flag);
+
+    ASSERT_EQ(error_flag, 0);
+  }
+
+  KOKKOS_INLINE_FUNCTION
+  void operator()(const size_type, value_type& update) const {
+    long offset;
+
+    offset = -1;
+    for (unsigned i6 = 0; i6 < unsigned(left.extent(6)); ++i6)
+      for (unsigned i5 = 0; i5 < unsigned(left.extent(5)); ++i5)
+        for (unsigned i4 = 0; i4 < unsigned(left.extent(4)); ++i4)
+          for (unsigned i3 = 0; i3 < unsigned(left.extent(3)); ++i3)
+            for (unsigned i2 = 0; i2 < unsigned(left.extent(2)); ++i2)
+              for (unsigned i1 = 0; i1 < unsigned(left.extent(1)); ++i1)
+                for (unsigned i0 = 0; i0 < unsigned(left.extent(0)); ++i0) {
+                  const long j = &left(i0, i1, i2, i3, i4, i5, i6) -
+                                 &left(0, 0, 0, 0, 0, 0, 0);
+                  if (j <= offset || left_alloc <= j) {
+                    update |= 1;
+                  }
+                  offset = j;
+                }
+
+    offset = -1;
+    for (unsigned i0 = 0; i0 < unsigned(right.extent(0)); ++i0)
+      for (unsigned i1 = 0; i1 < unsigned(right.extent(1)); ++i1)
+        for (unsigned i2 = 0; i2 < unsigned(right.extent(2)); ++i2)
+          for (unsigned i3 = 0; i3 < unsigned(right.extent(3)); ++i3)
+            for (unsigned i4 = 0; i4 < unsigned(right.extent(4)); ++i4)
+              for (unsigned i5 = 0; i5 < unsigned(right.extent(5)); ++i5)
+                for (unsigned i6 = 0; i6 < unsigned(right.extent(6)); ++i6) {
+                  const long j = &right(i0, i1, i2, i3, i4, i5, i6) -
+                                 &right(0, 0, 0, 0, 0, 0, 0);
+                  if (j <= offset || right_alloc <= j) {
+                    update |= 2;
+                  }
+                  offset = j;
+                }
   }
 };
 
-template< class DataType , class DeviceType >
-struct TestViewOperator_LeftAndRight< DataType , DeviceType , 6 >
-{
-  typedef DeviceType                          execution_space ;
-  typedef typename execution_space::memory_space  memory_space ;
-  typedef typename execution_space::size_type     size_type ;
+template <class DataType, class DeviceType>
+struct TestViewOperator_LeftAndRight<DataType, DeviceType, 6> {
+  typedef DeviceType execution_space;
+  typedef typename execution_space::memory_space memory_space;
+  typedef typename execution_space::size_type size_type;
 
-  typedef int value_type ;
+  typedef int value_type;
 
   KOKKOS_INLINE_FUNCTION
-  static void join( volatile value_type & update ,
-                    const volatile value_type & input )
-    { update |= input ; }
-
-  KOKKOS_INLINE_FUNCTION
-  static void init( value_type & update )
-    { update = 0 ; }
-
-
-  typedef Kokkos::
-    DynRankView< DataType, Kokkos::LayoutLeft, execution_space > left_view ;
-
-  typedef Kokkos::
-    DynRankView< DataType, Kokkos::LayoutRight, execution_space > right_view ;
-
-  left_view    left ;
-  right_view   right ;
-  long         left_alloc ;
-  long         right_alloc ;
-
-  TestViewOperator_LeftAndRight(unsigned N0, unsigned N1, unsigned N2, unsigned N3, unsigned N4, unsigned N5 )
-    : left(  "left" , N0, N1, N2, N3, N4, N5 )
-    , right( "right" , N0, N1, N2, N3, N4, N5 )
-    , left_alloc( allocation_count( left ) )
-    , right_alloc( allocation_count( right ) )
-    {}
-
-  static void testit(unsigned N0, unsigned N1, unsigned N2, unsigned N3, unsigned N4, unsigned N5)
-  {
-    TestViewOperator_LeftAndRight driver (N0, N1, N2, N3, N4, N5);
-
-    int error_flag = 0 ;
-
-    Kokkos::parallel_reduce( 1 , driver , error_flag );
-
-    ASSERT_EQ( error_flag , 0 );
+  static void join(volatile value_type& update,
+                   const volatile value_type& input) {
+    update |= input;
   }
 
   KOKKOS_INLINE_FUNCTION
-  void operator()( const size_type , value_type & update ) const
-  {
-    long offset ;
+  static void init(value_type& update) { update = 0; }
 
-    offset = -1 ;
-    for ( unsigned i5 = 0 ; i5 < unsigned(left.extent(5)) ; ++i5 )
-    for ( unsigned i4 = 0 ; i4 < unsigned(left.extent(4)) ; ++i4 )
-    for ( unsigned i3 = 0 ; i3 < unsigned(left.extent(3)) ; ++i3 )
-    for ( unsigned i2 = 0 ; i2 < unsigned(left.extent(2)) ; ++i2 )
-    for ( unsigned i1 = 0 ; i1 < unsigned(left.extent(1)) ; ++i1 )
-    for ( unsigned i0 = 0 ; i0 < unsigned(left.extent(0)) ; ++i0 )
-    {
-      const long j = & left( i0, i1, i2, i3, i4, i5 ) -
-                     & left(  0,  0,  0,  0,  0,  0 );
-      if ( j <= offset || left_alloc <= j ) { update |= 1 ; }
-      offset = j ;
-    }
+  typedef Kokkos::DynRankView<DataType, Kokkos::LayoutLeft, execution_space>
+      left_view;
 
-    offset = -1 ;
-    for ( unsigned i0 = 0 ; i0 < unsigned(right.extent(0)) ; ++i0 )
-    for ( unsigned i1 = 0 ; i1 < unsigned(right.extent(1)) ; ++i1 )
-    for ( unsigned i2 = 0 ; i2 < unsigned(right.extent(2)) ; ++i2 )
-    for ( unsigned i3 = 0 ; i3 < unsigned(right.extent(3)) ; ++i3 )
-    for ( unsigned i4 = 0 ; i4 < unsigned(right.extent(4)) ; ++i4 )
-    for ( unsigned i5 = 0 ; i5 < unsigned(right.extent(5)) ; ++i5 )
-    {
-      const long j = & right( i0, i1, i2, i3, i4, i5 ) -
-                     & right(  0,  0,  0,  0,  0,  0 );
-      if ( j <= offset || right_alloc <= j ) { update |= 2 ; }
-      offset = j ;
-    }
+  typedef Kokkos::DynRankView<DataType, Kokkos::LayoutRight, execution_space>
+      right_view;
+
+  left_view left;
+  right_view right;
+  long left_alloc;
+  long right_alloc;
+
+  TestViewOperator_LeftAndRight(unsigned N0, unsigned N1, unsigned N2,
+                                unsigned N3, unsigned N4, unsigned N5)
+      : left("left", N0, N1, N2, N3, N4, N5),
+        right("right", N0, N1, N2, N3, N4, N5),
+        left_alloc(allocation_count(left)),
+        right_alloc(allocation_count(right)) {}
+
+  static void testit(unsigned N0, unsigned N1, unsigned N2, unsigned N3,
+                     unsigned N4, unsigned N5) {
+    TestViewOperator_LeftAndRight driver(N0, N1, N2, N3, N4, N5);
+
+    int error_flag = 0;
+
+    Kokkos::parallel_reduce(1, driver, error_flag);
+
+    ASSERT_EQ(error_flag, 0);
+  }
+
+  KOKKOS_INLINE_FUNCTION
+  void operator()(const size_type, value_type& update) const {
+    long offset;
+
+    offset = -1;
+    for (unsigned i5 = 0; i5 < unsigned(left.extent(5)); ++i5)
+      for (unsigned i4 = 0; i4 < unsigned(left.extent(4)); ++i4)
+        for (unsigned i3 = 0; i3 < unsigned(left.extent(3)); ++i3)
+          for (unsigned i2 = 0; i2 < unsigned(left.extent(2)); ++i2)
+            for (unsigned i1 = 0; i1 < unsigned(left.extent(1)); ++i1)
+              for (unsigned i0 = 0; i0 < unsigned(left.extent(0)); ++i0) {
+                const long j =
+                    &left(i0, i1, i2, i3, i4, i5) - &left(0, 0, 0, 0, 0, 0);
+                if (j <= offset || left_alloc <= j) {
+                  update |= 1;
+                }
+                offset = j;
+              }
+
+    offset = -1;
+    for (unsigned i0 = 0; i0 < unsigned(right.extent(0)); ++i0)
+      for (unsigned i1 = 0; i1 < unsigned(right.extent(1)); ++i1)
+        for (unsigned i2 = 0; i2 < unsigned(right.extent(2)); ++i2)
+          for (unsigned i3 = 0; i3 < unsigned(right.extent(3)); ++i3)
+            for (unsigned i4 = 0; i4 < unsigned(right.extent(4)); ++i4)
+              for (unsigned i5 = 0; i5 < unsigned(right.extent(5)); ++i5) {
+                const long j =
+                    &right(i0, i1, i2, i3, i4, i5) - &right(0, 0, 0, 0, 0, 0);
+                if (j <= offset || right_alloc <= j) {
+                  update |= 2;
+                }
+                offset = j;
+              }
   }
 };
 
-template< class DataType , class DeviceType >
-struct TestViewOperator_LeftAndRight< DataType , DeviceType , 5 >
-{
-  typedef DeviceType                          execution_space ;
-  typedef typename execution_space::memory_space  memory_space ;
-  typedef typename execution_space::size_type     size_type ;
+template <class DataType, class DeviceType>
+struct TestViewOperator_LeftAndRight<DataType, DeviceType, 5> {
+  typedef DeviceType execution_space;
+  typedef typename execution_space::memory_space memory_space;
+  typedef typename execution_space::size_type size_type;
 
-  typedef int value_type ;
+  typedef int value_type;
 
   KOKKOS_INLINE_FUNCTION
-  static void join( volatile value_type & update ,
-                    const volatile value_type & input )
-    { update |= input ; }
+  static void join(volatile value_type& update,
+                   const volatile value_type& input) {
+    update |= input;
+  }
 
   KOKKOS_INLINE_FUNCTION
-  static void init( value_type & update )
-    { update = 0 ; }
+  static void init(value_type& update) { update = 0; }
 
+  typedef Kokkos::DynRankView<DataType, Kokkos::LayoutLeft, execution_space>
+      left_view;
 
-  typedef Kokkos::
-    DynRankView< DataType, Kokkos::LayoutLeft, execution_space > left_view ;
+  typedef Kokkos::DynRankView<DataType, Kokkos::LayoutRight, execution_space>
+      right_view;
 
-  typedef Kokkos::
-    DynRankView< DataType, Kokkos::LayoutRight, execution_space > right_view ;
+  typedef Kokkos::DynRankView<DataType, Kokkos::LayoutStride, execution_space>
+      stride_view;
 
-  typedef Kokkos::
-    DynRankView< DataType, Kokkos::LayoutStride, execution_space > stride_view ;
+  left_view left;
+  right_view right;
+  stride_view left_stride;
+  stride_view right_stride;
+  long left_alloc;
+  long right_alloc;
 
-  left_view    left ;
-  right_view   right ;
-  stride_view  left_stride ;
-  stride_view  right_stride ;
-  long         left_alloc ;
-  long         right_alloc ;
+  TestViewOperator_LeftAndRight(unsigned N0, unsigned N1, unsigned N2,
+                                unsigned N3, unsigned N4)
+      : left("left", N0, N1, N2, N3, N4),
+        right("right", N0, N1, N2, N3, N4),
+        left_stride(left),
+        right_stride(right),
+        left_alloc(allocation_count(left)),
+        right_alloc(allocation_count(right)) {}
 
-  TestViewOperator_LeftAndRight(unsigned N0, unsigned N1, unsigned N2, unsigned N3, unsigned N4 )
-    : left(  "left" , N0, N1, N2, N3, N4 )
-    , right( "right" , N0, N1, N2, N3, N4 )
-    , left_stride( left )
-    , right_stride( right )
-    , left_alloc( allocation_count( left ) )
-    , right_alloc( allocation_count( right ) )
-    {}
-
-  static void testit(unsigned N0, unsigned N1, unsigned N2, unsigned N3, unsigned N4)
-  {
+  static void testit(unsigned N0, unsigned N1, unsigned N2, unsigned N3,
+                     unsigned N4) {
     TestViewOperator_LeftAndRight driver(N0, N1, N2, N3, N4);
 
-    int error_flag = 0 ;
+    int error_flag = 0;
 
-    Kokkos::parallel_reduce( 1 , driver , error_flag );
+    Kokkos::parallel_reduce(1, driver, error_flag);
 
-    ASSERT_EQ( error_flag , 0 );
+    ASSERT_EQ(error_flag, 0);
   }
 
   KOKKOS_INLINE_FUNCTION
-  void operator()( const size_type , value_type & update ) const
-  {
-    long offset ;
+  void operator()(const size_type, value_type& update) const {
+    long offset;
 
-    offset = -1 ;
-    for ( unsigned i4 = 0 ; i4 < unsigned(left.extent(4)) ; ++i4 )
-    for ( unsigned i3 = 0 ; i3 < unsigned(left.extent(3)) ; ++i3 )
-    for ( unsigned i2 = 0 ; i2 < unsigned(left.extent(2)) ; ++i2 )
-    for ( unsigned i1 = 0 ; i1 < unsigned(left.extent(1)) ; ++i1 )
-    for ( unsigned i0 = 0 ; i0 < unsigned(left.extent(0)) ; ++i0 )
-    {
-      const long j = & left( i0, i1, i2, i3, i4 ) -
-                     & left(  0,  0,  0,  0,  0 );
-      if ( j <= offset || left_alloc <= j ) { update |= 1 ; }
-      offset = j ;
+    offset = -1;
+    for (unsigned i4 = 0; i4 < unsigned(left.extent(4)); ++i4)
+      for (unsigned i3 = 0; i3 < unsigned(left.extent(3)); ++i3)
+        for (unsigned i2 = 0; i2 < unsigned(left.extent(2)); ++i2)
+          for (unsigned i1 = 0; i1 < unsigned(left.extent(1)); ++i1)
+            for (unsigned i0 = 0; i0 < unsigned(left.extent(0)); ++i0) {
+              const long j = &left(i0, i1, i2, i3, i4) - &left(0, 0, 0, 0, 0);
+              if (j <= offset || left_alloc <= j) {
+                update |= 1;
+              }
+              offset = j;
 
-      if ( & left( i0, i1, i2, i3, i4 ) !=
-           & left_stride( i0, i1, i2, i3, i4 ) ) { update |= 4 ; }
-    }
+              if (&left(i0, i1, i2, i3, i4) !=
+                  &left_stride(i0, i1, i2, i3, i4)) {
+                update |= 4;
+              }
+            }
 
-    offset = -1 ;
-    for ( unsigned i0 = 0 ; i0 < unsigned(right.extent(0)) ; ++i0 )
-    for ( unsigned i1 = 0 ; i1 < unsigned(right.extent(1)) ; ++i1 )
-    for ( unsigned i2 = 0 ; i2 < unsigned(right.extent(2)) ; ++i2 )
-    for ( unsigned i3 = 0 ; i3 < unsigned(right.extent(3)) ; ++i3 )
-    for ( unsigned i4 = 0 ; i4 < unsigned(right.extent(4)) ; ++i4 )
-    {
-      const long j = & right( i0, i1, i2, i3, i4 ) -
-                     & right(  0,  0,  0,  0,  0 );
-      if ( j <= offset || right_alloc <= j ) { update |= 2 ; }
-      offset = j ;
+    offset = -1;
+    for (unsigned i0 = 0; i0 < unsigned(right.extent(0)); ++i0)
+      for (unsigned i1 = 0; i1 < unsigned(right.extent(1)); ++i1)
+        for (unsigned i2 = 0; i2 < unsigned(right.extent(2)); ++i2)
+          for (unsigned i3 = 0; i3 < unsigned(right.extent(3)); ++i3)
+            for (unsigned i4 = 0; i4 < unsigned(right.extent(4)); ++i4) {
+              const long j = &right(i0, i1, i2, i3, i4) - &right(0, 0, 0, 0, 0);
+              if (j <= offset || right_alloc <= j) {
+                update |= 2;
+              }
+              offset = j;
 
-      if ( & right( i0, i1, i2, i3, i4 ) !=
-           & right_stride( i0, i1, i2, i3, i4 ) ) { update |= 8 ; }
-    }
+              if (&right(i0, i1, i2, i3, i4) !=
+                  &right_stride(i0, i1, i2, i3, i4)) {
+                update |= 8;
+              }
+            }
   }
 };
 
-template< class DataType , class DeviceType >
-struct TestViewOperator_LeftAndRight< DataType , DeviceType , 4 >
-{
-  typedef DeviceType                          execution_space ;
-  typedef typename execution_space::memory_space  memory_space ;
-  typedef typename execution_space::size_type     size_type ;
+template <class DataType, class DeviceType>
+struct TestViewOperator_LeftAndRight<DataType, DeviceType, 4> {
+  typedef DeviceType execution_space;
+  typedef typename execution_space::memory_space memory_space;
+  typedef typename execution_space::size_type size_type;
 
-  typedef int value_type ;
+  typedef int value_type;
 
   KOKKOS_INLINE_FUNCTION
-  static void join( volatile value_type & update ,
-                    const volatile value_type & input )
-    { update |= input ; }
-
-  KOKKOS_INLINE_FUNCTION
-  static void init( value_type & update )
-    { update = 0 ; }
-
-
-  typedef Kokkos::
-    DynRankView< DataType, Kokkos::LayoutLeft, execution_space > left_view ;
-
-  typedef Kokkos::
-    DynRankView< DataType, Kokkos::LayoutRight, execution_space > right_view ;
-
-  left_view    left ;
-  right_view   right ;
-  long         left_alloc ;
-  long         right_alloc ;
-
-  TestViewOperator_LeftAndRight(unsigned N0, unsigned N1, unsigned N2, unsigned N3)
-    : left(  "left" , N0, N1, N2, N3 )
-    , right( "right" , N0, N1, N2, N3 )
-    , left_alloc( allocation_count( left ) )
-    , right_alloc( allocation_count( right ) )
-    {}
-
-  static void testit(unsigned N0, unsigned N1, unsigned N2, unsigned N3)
-  {
-    TestViewOperator_LeftAndRight driver (N0, N1, N2, N3);
-
-    int error_flag = 0 ;
-
-    Kokkos::parallel_reduce( 1 , driver , error_flag );
-
-    ASSERT_EQ( error_flag , 0 );
+  static void join(volatile value_type& update,
+                   const volatile value_type& input) {
+    update |= input;
   }
 
   KOKKOS_INLINE_FUNCTION
-  void operator()( const size_type , value_type & update ) const
-  {
-    long offset ;
+  static void init(value_type& update) { update = 0; }
 
-    offset = -1 ;
-    for ( unsigned i3 = 0 ; i3 < unsigned(left.extent(3)) ; ++i3 )
-    for ( unsigned i2 = 0 ; i2 < unsigned(left.extent(2)) ; ++i2 )
-    for ( unsigned i1 = 0 ; i1 < unsigned(left.extent(1)) ; ++i1 )
-    for ( unsigned i0 = 0 ; i0 < unsigned(left.extent(0)) ; ++i0 )
-    {
-      const long j = & left( i0, i1, i2, i3 ) -
-                     & left(  0,  0,  0,  0 );
-      if ( j <= offset || left_alloc <= j ) { update |= 1 ; }
-      offset = j ;
-    }
+  typedef Kokkos::DynRankView<DataType, Kokkos::LayoutLeft, execution_space>
+      left_view;
 
-    offset = -1 ;
-    for ( unsigned i0 = 0 ; i0 < unsigned(right.extent(0)) ; ++i0 )
-    for ( unsigned i1 = 0 ; i1 < unsigned(right.extent(1)) ; ++i1 )
-    for ( unsigned i2 = 0 ; i2 < unsigned(right.extent(2)) ; ++i2 )
-    for ( unsigned i3 = 0 ; i3 < unsigned(right.extent(3)) ; ++i3 )
-    {
-      const long j = & right( i0, i1, i2, i3 ) -
-                     & right(  0,  0,  0,  0 );
-      if ( j <= offset || right_alloc <= j ) { update |= 2 ; }
-      offset = j ;
-    }
+  typedef Kokkos::DynRankView<DataType, Kokkos::LayoutRight, execution_space>
+      right_view;
+
+  left_view left;
+  right_view right;
+  long left_alloc;
+  long right_alloc;
+
+  TestViewOperator_LeftAndRight(unsigned N0, unsigned N1, unsigned N2,
+                                unsigned N3)
+      : left("left", N0, N1, N2, N3),
+        right("right", N0, N1, N2, N3),
+        left_alloc(allocation_count(left)),
+        right_alloc(allocation_count(right)) {}
+
+  static void testit(unsigned N0, unsigned N1, unsigned N2, unsigned N3) {
+    TestViewOperator_LeftAndRight driver(N0, N1, N2, N3);
+
+    int error_flag = 0;
+
+    Kokkos::parallel_reduce(1, driver, error_flag);
+
+    ASSERT_EQ(error_flag, 0);
+  }
+
+  KOKKOS_INLINE_FUNCTION
+  void operator()(const size_type, value_type& update) const {
+    long offset;
+
+    offset = -1;
+    for (unsigned i3 = 0; i3 < unsigned(left.extent(3)); ++i3)
+      for (unsigned i2 = 0; i2 < unsigned(left.extent(2)); ++i2)
+        for (unsigned i1 = 0; i1 < unsigned(left.extent(1)); ++i1)
+          for (unsigned i0 = 0; i0 < unsigned(left.extent(0)); ++i0) {
+            const long j = &left(i0, i1, i2, i3) - &left(0, 0, 0, 0);
+            if (j <= offset || left_alloc <= j) {
+              update |= 1;
+            }
+            offset = j;
+          }
+
+    offset = -1;
+    for (unsigned i0 = 0; i0 < unsigned(right.extent(0)); ++i0)
+      for (unsigned i1 = 0; i1 < unsigned(right.extent(1)); ++i1)
+        for (unsigned i2 = 0; i2 < unsigned(right.extent(2)); ++i2)
+          for (unsigned i3 = 0; i3 < unsigned(right.extent(3)); ++i3) {
+            const long j = &right(i0, i1, i2, i3) - &right(0, 0, 0, 0);
+            if (j <= offset || right_alloc <= j) {
+              update |= 2;
+            }
+            offset = j;
+          }
   }
 };
 
-template< class DataType , class DeviceType >
-struct TestViewOperator_LeftAndRight< DataType , DeviceType , 3 >
-{
-  typedef DeviceType                          execution_space ;
-  typedef typename execution_space::memory_space  memory_space ;
-  typedef typename execution_space::size_type     size_type ;
+template <class DataType, class DeviceType>
+struct TestViewOperator_LeftAndRight<DataType, DeviceType, 3> {
+  typedef DeviceType execution_space;
+  typedef typename execution_space::memory_space memory_space;
+  typedef typename execution_space::size_type size_type;
 
-  typedef int value_type ;
+  typedef int value_type;
 
   KOKKOS_INLINE_FUNCTION
-  static void join( volatile value_type & update ,
-                    const volatile value_type & input )
-    { update |= input ; }
+  static void join(volatile value_type& update,
+                   const volatile value_type& input) {
+    update |= input;
+  }
 
   KOKKOS_INLINE_FUNCTION
-  static void init( value_type & update )
-    { update = 0 ; }
+  static void init(value_type& update) { update = 0; }
 
+  typedef Kokkos::DynRankView<DataType, Kokkos::LayoutLeft, execution_space>
+      left_view;
 
-  typedef Kokkos::
-    DynRankView< DataType, Kokkos::LayoutLeft, execution_space > left_view ;
+  typedef Kokkos::DynRankView<DataType, Kokkos::LayoutRight, execution_space>
+      right_view;
 
-  typedef Kokkos::
-    DynRankView< DataType, Kokkos::LayoutRight, execution_space > right_view ;
+  typedef Kokkos::DynRankView<DataType, Kokkos::LayoutStride, execution_space>
+      stride_view;
 
-  typedef Kokkos::
-    DynRankView< DataType, Kokkos::LayoutStride, execution_space > stride_view ;
-
-  left_view    left ;
-  right_view   right ;
-  stride_view  left_stride ;
-  stride_view  right_stride ;
-  long         left_alloc ;
-  long         right_alloc ;
+  left_view left;
+  right_view right;
+  stride_view left_stride;
+  stride_view right_stride;
+  long left_alloc;
+  long right_alloc;
 
   TestViewOperator_LeftAndRight(unsigned N0, unsigned N1, unsigned N2)
-    : left(  std::string("left") , N0, N1, N2 )
-    , right( std::string("right") , N0, N1, N2 )
-    , left_stride( left )
-    , right_stride( right )
-    , left_alloc( allocation_count( left ) )
-    , right_alloc( allocation_count( right ) )
-    {}
+      : left(std::string("left"), N0, N1, N2),
+        right(std::string("right"), N0, N1, N2),
+        left_stride(left),
+        right_stride(right),
+        left_alloc(allocation_count(left)),
+        right_alloc(allocation_count(right)) {}
 
-  static void testit(unsigned N0, unsigned N1, unsigned N2)
-  {
-    TestViewOperator_LeftAndRight driver (N0, N1, N2);
+  static void testit(unsigned N0, unsigned N1, unsigned N2) {
+    TestViewOperator_LeftAndRight driver(N0, N1, N2);
 
-    int error_flag = 0 ;
+    int error_flag = 0;
 
-    Kokkos::parallel_reduce( 1 , driver , error_flag );
+    Kokkos::parallel_reduce(1, driver, error_flag);
 
-    ASSERT_EQ( error_flag , 0 );
+    ASSERT_EQ(error_flag, 0);
   }
 
   KOKKOS_INLINE_FUNCTION
-  void operator()( const size_type , value_type & update ) const
-  {
-    long offset ;
+  void operator()(const size_type, value_type& update) const {
+    long offset;
 
-    offset = -1 ;
-    for ( unsigned i2 = 0 ; i2 < unsigned(left.extent(2)) ; ++i2 )
-    for ( unsigned i1 = 0 ; i1 < unsigned(left.extent(1)) ; ++i1 )
-    for ( unsigned i0 = 0 ; i0 < unsigned(left.extent(0)) ; ++i0 )
-    {
-      const long j = & left( i0, i1, i2 ) -
-                     & left(  0,  0,  0 );
-      if ( j <= offset || left_alloc <= j ) { update |= 1 ; }
-      offset = j ;
+    offset = -1;
+    for (unsigned i2 = 0; i2 < unsigned(left.extent(2)); ++i2)
+      for (unsigned i1 = 0; i1 < unsigned(left.extent(1)); ++i1)
+        for (unsigned i0 = 0; i0 < unsigned(left.extent(0)); ++i0) {
+          const long j = &left(i0, i1, i2) - &left(0, 0, 0);
+          if (j <= offset || left_alloc <= j) {
+            update |= 1;
+          }
+          offset = j;
 
-      if ( & left(i0,i1,i2) != & left_stride(i0,i1,i2) ) { update |= 4 ; }
-    }
+          if (&left(i0, i1, i2) != &left_stride(i0, i1, i2)) {
+            update |= 4;
+          }
+        }
 
-    offset = -1 ;
-    for ( unsigned i0 = 0 ; i0 < unsigned(right.extent(0)) ; ++i0 )
-    for ( unsigned i1 = 0 ; i1 < unsigned(right.extent(1)) ; ++i1 )
-    for ( unsigned i2 = 0 ; i2 < unsigned(right.extent(2)) ; ++i2 )
-    {
-      const long j = & right( i0, i1, i2 ) -
-                     & right(  0,  0,  0 );
-      if ( j <= offset || right_alloc <= j ) { update |= 2 ; }
-      offset = j ;
+    offset = -1;
+    for (unsigned i0 = 0; i0 < unsigned(right.extent(0)); ++i0)
+      for (unsigned i1 = 0; i1 < unsigned(right.extent(1)); ++i1)
+        for (unsigned i2 = 0; i2 < unsigned(right.extent(2)); ++i2) {
+          const long j = &right(i0, i1, i2) - &right(0, 0, 0);
+          if (j <= offset || right_alloc <= j) {
+            update |= 2;
+          }
+          offset = j;
 
-      if ( & right(i0,i1,i2) != & right_stride(i0,i1,i2) ) { update |= 8 ; }
-    }
+          if (&right(i0, i1, i2) != &right_stride(i0, i1, i2)) {
+            update |= 8;
+          }
+        }
 
-    for ( unsigned i0 = 0 ; i0 < unsigned(left.extent(0)) ; ++i0 )
-    for ( unsigned i1 = 0 ; i1 < unsigned(left.extent(1)) ; ++i1 )
-    for ( unsigned i2 = 0 ; i2 < unsigned(left.extent(2)) ; ++i2 )
-    {
-      if ( & left(i0,i1,i2)  != & left(i0,i1,i2,0,0,0,0) )  { update |= 3 ; }
-      if ( & right(i0,i1,i2) != & right(i0,i1,i2,0,0,0,0) ) { update |= 3 ; }
-    }
+    for (unsigned i0 = 0; i0 < unsigned(left.extent(0)); ++i0)
+      for (unsigned i1 = 0; i1 < unsigned(left.extent(1)); ++i1)
+        for (unsigned i2 = 0; i2 < unsigned(left.extent(2)); ++i2) {
+          if (&left(i0, i1, i2) != &left(i0, i1, i2, 0, 0, 0, 0)) {
+            update |= 3;
+          }
+          if (&right(i0, i1, i2) != &right(i0, i1, i2, 0, 0, 0, 0)) {
+            update |= 3;
+          }
+        }
   }
 };
 
-template< class DataType , class DeviceType >
-struct TestViewOperator_LeftAndRight< DataType , DeviceType , 2 >
-{
-  typedef DeviceType                          execution_space ;
-  typedef typename execution_space::memory_space  memory_space ;
-  typedef typename execution_space::size_type     size_type ;
+template <class DataType, class DeviceType>
+struct TestViewOperator_LeftAndRight<DataType, DeviceType, 2> {
+  typedef DeviceType execution_space;
+  typedef typename execution_space::memory_space memory_space;
+  typedef typename execution_space::size_type size_type;
 
-  typedef int value_type ;
+  typedef int value_type;
 
   KOKKOS_INLINE_FUNCTION
-  static void join( volatile value_type & update ,
-                    const volatile value_type & input )
-    { update |= input ; }
+  static void join(volatile value_type& update,
+                   const volatile value_type& input) {
+    update |= input;
+  }
 
   KOKKOS_INLINE_FUNCTION
-  static void init( value_type & update )
-    { update = 0 ; }
+  static void init(value_type& update) { update = 0; }
 
+  typedef Kokkos::DynRankView<DataType, Kokkos::LayoutLeft, execution_space>
+      left_view;
 
-  typedef Kokkos::
-    DynRankView< DataType, Kokkos::LayoutLeft, execution_space > left_view ;
+  typedef Kokkos::DynRankView<DataType, Kokkos::LayoutRight, execution_space>
+      right_view;
 
-  typedef Kokkos::
-    DynRankView< DataType, Kokkos::LayoutRight, execution_space > right_view ;
-
-  left_view    left ;
-  right_view   right ;
-  long         left_alloc ;
-  long         right_alloc ;
+  left_view left;
+  right_view right;
+  long left_alloc;
+  long right_alloc;
 
   TestViewOperator_LeftAndRight(unsigned N0, unsigned N1)
-    : left(  "left" , N0, N1 )
-    , right( "right" , N0, N1 )
-    , left_alloc( allocation_count( left ) )
-    , right_alloc( allocation_count( right ) )
-    {}
+      : left("left", N0, N1),
+        right("right", N0, N1),
+        left_alloc(allocation_count(left)),
+        right_alloc(allocation_count(right)) {}
 
-  static void testit(unsigned N0, unsigned N1)
-  {
+  static void testit(unsigned N0, unsigned N1) {
     TestViewOperator_LeftAndRight driver(N0, N1);
 
-    int error_flag = 0 ;
+    int error_flag = 0;
 
-    Kokkos::parallel_reduce( 1 , driver , error_flag );
+    Kokkos::parallel_reduce(1, driver, error_flag);
 
-    ASSERT_EQ( error_flag , 0 );
+    ASSERT_EQ(error_flag, 0);
   }
 
   KOKKOS_INLINE_FUNCTION
-  void operator()( const size_type , value_type & update ) const
-  {
-    long offset ;
+  void operator()(const size_type, value_type& update) const {
+    long offset;
 
-    offset = -1 ;
-    for ( unsigned i1 = 0 ; i1 < unsigned(left.extent(1)) ; ++i1 )
-    for ( unsigned i0 = 0 ; i0 < unsigned(left.extent(0)) ; ++i0 )
-    {
-      const long j = & left( i0, i1 ) -
-                     & left(  0,  0 );
-      if ( j <= offset || left_alloc <= j ) { update |= 1 ; }
-      offset = j ;
-    }
+    offset = -1;
+    for (unsigned i1 = 0; i1 < unsigned(left.extent(1)); ++i1)
+      for (unsigned i0 = 0; i0 < unsigned(left.extent(0)); ++i0) {
+        const long j = &left(i0, i1) - &left(0, 0);
+        if (j <= offset || left_alloc <= j) {
+          update |= 1;
+        }
+        offset = j;
+      }
 
-    offset = -1 ;
-    for ( unsigned i0 = 0 ; i0 < unsigned(right.extent(0)) ; ++i0 )
-    for ( unsigned i1 = 0 ; i1 < unsigned(right.extent(1)) ; ++i1 )
-    {
-      const long j = & right( i0, i1 ) -
-                     & right(  0,  0 );
-      if ( j <= offset || right_alloc <= j ) { update |= 2 ; }
-      offset = j ;
-    }
+    offset = -1;
+    for (unsigned i0 = 0; i0 < unsigned(right.extent(0)); ++i0)
+      for (unsigned i1 = 0; i1 < unsigned(right.extent(1)); ++i1) {
+        const long j = &right(i0, i1) - &right(0, 0);
+        if (j <= offset || right_alloc <= j) {
+          update |= 2;
+        }
+        offset = j;
+      }
 
-    for ( unsigned i0 = 0 ; i0 < unsigned(left.extent(0)) ; ++i0 )
-    for ( unsigned i1 = 0 ; i1 < unsigned(left.extent(1)) ; ++i1 )
-    {
-      if ( & left(i0,i1)  != & left(i0,i1,0,0,0,0,0) )  { update |= 3 ; }
-      if ( & right(i0,i1) != & right(i0,i1,0,0,0,0,0) ) { update |= 3 ; }
-    }
+    for (unsigned i0 = 0; i0 < unsigned(left.extent(0)); ++i0)
+      for (unsigned i1 = 0; i1 < unsigned(left.extent(1)); ++i1) {
+        if (&left(i0, i1) != &left(i0, i1, 0, 0, 0, 0, 0)) {
+          update |= 3;
+        }
+        if (&right(i0, i1) != &right(i0, i1, 0, 0, 0, 0, 0)) {
+          update |= 3;
+        }
+      }
   }
 };
 
-template< class DataType , class DeviceType >
-struct TestViewOperator_LeftAndRight< DataType , DeviceType , 1 >
-{
-  typedef DeviceType                          execution_space ;
-  typedef typename execution_space::memory_space  memory_space ;
-  typedef typename execution_space::size_type     size_type ;
+template <class DataType, class DeviceType>
+struct TestViewOperator_LeftAndRight<DataType, DeviceType, 1> {
+  typedef DeviceType execution_space;
+  typedef typename execution_space::memory_space memory_space;
+  typedef typename execution_space::size_type size_type;
 
-  typedef int value_type ;
+  typedef int value_type;
 
   KOKKOS_INLINE_FUNCTION
-  static void join( volatile value_type & update ,
-                    const volatile value_type & input )
-    { update |= input ; }
-
-  KOKKOS_INLINE_FUNCTION
-  static void init( value_type & update )
-    { update = 0 ; }
-
-
-  typedef Kokkos::
-    DynRankView< DataType, Kokkos::LayoutLeft, execution_space > left_view ;
-
-  typedef Kokkos::
-    DynRankView< DataType, Kokkos::LayoutRight, execution_space > right_view ;
-
-  typedef Kokkos::
-    DynRankView< DataType, Kokkos::LayoutStride, execution_space > stride_view ;
-
-  left_view    left ;
-  right_view   right ;
-  stride_view  left_stride ;
-  stride_view  right_stride ;
-  long         left_alloc ;
-  long         right_alloc ;
-
-  TestViewOperator_LeftAndRight(unsigned N0)
-    : left(  "left" , N0 )
-    , right( "right" , N0 )
-    , left_stride( left )
-    , right_stride( right )
-    , left_alloc( allocation_count( left ) )
-    , right_alloc( allocation_count( right ) )
-    {}
-
-  static void testit(unsigned N0)
-  {
-    TestViewOperator_LeftAndRight driver (N0) ;
-
-    int error_flag = 0 ;
-
-    Kokkos::parallel_reduce( 1 , driver , error_flag );
-
-    ASSERT_EQ( error_flag , 0 );
+  static void join(volatile value_type& update,
+                   const volatile value_type& input) {
+    update |= input;
   }
 
   KOKKOS_INLINE_FUNCTION
-  void operator()( const size_type , value_type & update ) const
-  {
-    for ( unsigned i0 = 0 ; i0 < unsigned(left.extent(0)) ; ++i0 )
-    {
-      if ( & left(i0)  != & left(i0,0,0,0,0,0,0) )  { update |= 3 ; }
-      if ( & right(i0) != & right(i0,0,0,0,0,0,0) ) { update |= 3 ; }
-      if ( & left(i0)  != & left_stride(i0) ) { update |= 4 ; }
-      if ( & right(i0) != & right_stride(i0) ) { update |= 8 ; }
+  static void init(value_type& update) { update = 0; }
+
+  typedef Kokkos::DynRankView<DataType, Kokkos::LayoutLeft, execution_space>
+      left_view;
+
+  typedef Kokkos::DynRankView<DataType, Kokkos::LayoutRight, execution_space>
+      right_view;
+
+  typedef Kokkos::DynRankView<DataType, Kokkos::LayoutStride, execution_space>
+      stride_view;
+
+  left_view left;
+  right_view right;
+  stride_view left_stride;
+  stride_view right_stride;
+  long left_alloc;
+  long right_alloc;
+
+  TestViewOperator_LeftAndRight(unsigned N0)
+      : left("left", N0),
+        right("right", N0),
+        left_stride(left),
+        right_stride(right),
+        left_alloc(allocation_count(left)),
+        right_alloc(allocation_count(right)) {}
+
+  static void testit(unsigned N0) {
+    TestViewOperator_LeftAndRight driver(N0);
+
+    int error_flag = 0;
+
+    Kokkos::parallel_reduce(1, driver, error_flag);
+
+    ASSERT_EQ(error_flag, 0);
+  }
+
+  KOKKOS_INLINE_FUNCTION
+  void operator()(const size_type, value_type& update) const {
+    for (unsigned i0 = 0; i0 < unsigned(left.extent(0)); ++i0) {
+      if (&left(i0) != &left(i0, 0, 0, 0, 0, 0, 0)) {
+        update |= 3;
+      }
+      if (&right(i0) != &right(i0, 0, 0, 0, 0, 0, 0)) {
+        update |= 3;
+      }
+      if (&left(i0) != &left_stride(i0)) {
+        update |= 4;
+      }
+      if (&right(i0) != &right_stride(i0)) {
+        update |= 8;
+      }
     }
   }
 };
 
 /*--------------------------------------------------------------------------*/
 
-template< typename T, class DeviceType >
-class TestDynViewAPI
-{
-public:
-  typedef DeviceType        device ;
+template <typename T, class DeviceType>
+class TestDynViewAPI {
+ public:
+  typedef DeviceType device;
 
-  enum { N0 = 1000 ,
-         N1 = 3 ,
-         N2 = 5 ,
-         N3 = 7 };
+  enum { N0 = 1000, N1 = 3, N2 = 5, N3 = 7 };
 
-  typedef Kokkos::DynRankView< T , device > dView0 ;
-  typedef Kokkos::DynRankView< const T , device > const_dView0 ;
+  typedef Kokkos::DynRankView<T, device> dView0;
+  typedef Kokkos::DynRankView<const T, device> const_dView0;
 
-  typedef Kokkos::DynRankView< T, device, Kokkos::MemoryUnmanaged > dView0_unmanaged ;
-  typedef typename dView0::host_mirror_space host_drv_space ;
+  typedef Kokkos::DynRankView<T, device, Kokkos::MemoryUnmanaged>
+      dView0_unmanaged;
+  typedef typename dView0::host_mirror_space host_drv_space;
 
-  typedef Kokkos::View< T , device >        View0 ;
-  typedef Kokkos::View< T* , device >       View1 ;
-  typedef Kokkos::View< T******* , device > View7 ;
+  typedef Kokkos::View<T, device> View0;
+  typedef Kokkos::View<T*, device> View1;
+  typedef Kokkos::View<T*******, device> View7;
 
-  typedef typename View0::host_mirror_space  host_view_space ;
+  typedef typename View0::host_mirror_space host_view_space;
 
-  TestDynViewAPI()
-  {
-  }
+  TestDynViewAPI() {}
 
   static void run_tests() {
     run_test_resize_realloc();
@@ -738,459 +720,475 @@ public:
     run_test_vector();
   }
 
-  static void run_operator_test_rank12345 () {
-    TestViewOperator< T , device >::testit();
-    TestViewOperator_LeftAndRight< int , device , 5 >::testit(2,3,4,2,3);
-    TestViewOperator_LeftAndRight< int , device , 4 >::testit(2,3,4,2);
-    TestViewOperator_LeftAndRight< int , device , 3 >::testit(2,3,4);
-    TestViewOperator_LeftAndRight< int , device , 2 >::testit(2,3);
-    TestViewOperator_LeftAndRight< int , device , 1 >::testit(2);
+  static void run_operator_test_rank12345() {
+    TestViewOperator<T, device>::testit();
+    TestViewOperator_LeftAndRight<int, device, 5>::testit(2, 3, 4, 2, 3);
+    TestViewOperator_LeftAndRight<int, device, 4>::testit(2, 3, 4, 2);
+    TestViewOperator_LeftAndRight<int, device, 3>::testit(2, 3, 4);
+    TestViewOperator_LeftAndRight<int, device, 2>::testit(2, 3);
+    TestViewOperator_LeftAndRight<int, device, 1>::testit(2);
   }
 
-  static void run_operator_test_rank67 () {
-    TestViewOperator_LeftAndRight< int , device , 7 >::testit(2,3,4,2,3,4,2);
-    TestViewOperator_LeftAndRight< int , device , 6 >::testit(2,3,4,2,3,4);
+  static void run_operator_test_rank67() {
+    TestViewOperator_LeftAndRight<int, device, 7>::testit(2, 3, 4, 2, 3, 4, 2);
+    TestViewOperator_LeftAndRight<int, device, 6>::testit(2, 3, 4, 2, 3, 4);
   }
 
-  static void run_test_resize_realloc()
-  {
+  static void run_test_resize_realloc() {
     dView0 drv0("drv0", 10, 20, 30);
-    ASSERT_EQ( drv0.rank(), 3);
+    ASSERT_EQ(drv0.rank(), 3);
 
     Kokkos::resize(drv0, 5, 10);
-    ASSERT_EQ( drv0.rank(), 2);
-    ASSERT_EQ( drv0.extent(0), 5);
-    ASSERT_EQ( drv0.extent(1), 10);
-    ASSERT_EQ( drv0.extent(2), 1);
+    ASSERT_EQ(drv0.rank(), 2);
+    ASSERT_EQ(drv0.extent(0), 5);
+    ASSERT_EQ(drv0.extent(1), 10);
+    ASSERT_EQ(drv0.extent(2), 1);
 
     Kokkos::realloc(drv0, 10, 20);
-    ASSERT_EQ( drv0.rank(), 2);
-    ASSERT_EQ( drv0.extent(0), 10);
-    ASSERT_EQ( drv0.extent(1), 20);
-    ASSERT_EQ( drv0.extent(2), 1);
-
+    ASSERT_EQ(drv0.rank(), 2);
+    ASSERT_EQ(drv0.extent(0), 10);
+    ASSERT_EQ(drv0.extent(1), 20);
+    ASSERT_EQ(drv0.extent(2), 1);
   }
 
-  static void run_test_mirror()
-  {
-    typedef Kokkos::DynRankView< int , host_drv_space > view_type ;
-    typedef typename view_type::HostMirror mirror_type ;
+  static void run_test_mirror() {
+    typedef Kokkos::DynRankView<int, host_drv_space> view_type;
+    typedef typename view_type::HostMirror mirror_type;
     view_type a("a");
     mirror_type am = Kokkos::create_mirror_view(a);
     mirror_type ax = Kokkos::create_mirror(a);
-    ASSERT_EQ( & a() , & am() );
-    ASSERT_EQ( a.rank() , am.rank() );
-    ASSERT_EQ( ax.rank() , am.rank() );
+    ASSERT_EQ(&a(), &am());
+    ASSERT_EQ(a.rank(), am.rank());
+    ASSERT_EQ(ax.rank(), am.rank());
 
     {
-      Kokkos::DynRankView<double, Kokkos::LayoutLeft, Kokkos::HostSpace> a_h("A",1000);
-      auto a_h2 = Kokkos::create_mirror(Kokkos::HostSpace(),a_h);
-      auto a_d = Kokkos::create_mirror(typename device::memory_space(),a_h);
+      Kokkos::DynRankView<double, Kokkos::LayoutLeft, Kokkos::HostSpace> a_h(
+          "A", 1000);
+      auto a_h2 = Kokkos::create_mirror(Kokkos::HostSpace(), a_h);
+      auto a_d  = Kokkos::create_mirror(typename device::memory_space(), a_h);
 
-      int equal_ptr_h_h2  = (a_h.data() ==a_h2.data())?1:0;
-      int equal_ptr_h_d   = (a_h.data() ==a_d. data())?1:0;
-      int equal_ptr_h2_d  = (a_h2.data()==a_d. data())?1:0;
+      int equal_ptr_h_h2 = (a_h.data() == a_h2.data()) ? 1 : 0;
+      int equal_ptr_h_d  = (a_h.data() == a_d.data()) ? 1 : 0;
+      int equal_ptr_h2_d = (a_h2.data() == a_d.data()) ? 1 : 0;
 
-      ASSERT_EQ(equal_ptr_h_h2,0);
-      ASSERT_EQ(equal_ptr_h_d ,0);
-      ASSERT_EQ(equal_ptr_h2_d,0);
-  
-      ASSERT_EQ(a_h.extent(0),a_h2.extent(0));
-      ASSERT_EQ(a_h.extent(0),a_d .extent(0));
+      ASSERT_EQ(equal_ptr_h_h2, 0);
+      ASSERT_EQ(equal_ptr_h_d, 0);
+      ASSERT_EQ(equal_ptr_h2_d, 0);
 
-      ASSERT_EQ(a_h.rank(),a_h2.rank());
-      ASSERT_EQ(a_h.rank(),a_d.rank());
+      ASSERT_EQ(a_h.extent(0), a_h2.extent(0));
+      ASSERT_EQ(a_h.extent(0), a_d.extent(0));
+
+      ASSERT_EQ(a_h.rank(), a_h2.rank());
+      ASSERT_EQ(a_h.rank(), a_d.rank());
     }
     {
-      Kokkos::DynRankView<double, Kokkos::LayoutRight, Kokkos::HostSpace> a_h("A",1000);
-      auto a_h2 = Kokkos::create_mirror(Kokkos::HostSpace(),a_h);
-      auto a_d = Kokkos::create_mirror(typename device::memory_space(),a_h);
+      Kokkos::DynRankView<double, Kokkos::LayoutRight, Kokkos::HostSpace> a_h(
+          "A", 1000);
+      auto a_h2 = Kokkos::create_mirror(Kokkos::HostSpace(), a_h);
+      auto a_d  = Kokkos::create_mirror(typename device::memory_space(), a_h);
 
-      int equal_ptr_h_h2  = (a_h.data() ==a_h2.data())?1:0;
-      int equal_ptr_h_d   = (a_h.data() ==a_d. data())?1:0;
-      int equal_ptr_h2_d  = (a_h2.data()==a_d. data())?1:0;
+      int equal_ptr_h_h2 = (a_h.data() == a_h2.data()) ? 1 : 0;
+      int equal_ptr_h_d  = (a_h.data() == a_d.data()) ? 1 : 0;
+      int equal_ptr_h2_d = (a_h2.data() == a_d.data()) ? 1 : 0;
 
-      ASSERT_EQ(equal_ptr_h_h2,0);
-      ASSERT_EQ(equal_ptr_h_d ,0);
-      ASSERT_EQ(equal_ptr_h2_d,0);
-  
-      ASSERT_EQ(a_h.extent(0),a_h2.extent(0));
-      ASSERT_EQ(a_h.extent(0),a_d .extent(0));
+      ASSERT_EQ(equal_ptr_h_h2, 0);
+      ASSERT_EQ(equal_ptr_h_d, 0);
+      ASSERT_EQ(equal_ptr_h2_d, 0);
 
-      ASSERT_EQ(a_h.rank(),a_h2.rank());
-      ASSERT_EQ(a_h.rank(),a_d.rank());
+      ASSERT_EQ(a_h.extent(0), a_h2.extent(0));
+      ASSERT_EQ(a_h.extent(0), a_d.extent(0));
+
+      ASSERT_EQ(a_h.rank(), a_h2.rank());
+      ASSERT_EQ(a_h.rank(), a_d.rank());
     }
 
     {
-      Kokkos::DynRankView<double, Kokkos::LayoutLeft, Kokkos::HostSpace> a_h("A",1000);
-      auto a_h2 = Kokkos::create_mirror_view(Kokkos::HostSpace(),a_h);
-      auto a_d = Kokkos::create_mirror_view(typename device::memory_space(),a_h);
+      Kokkos::DynRankView<double, Kokkos::LayoutLeft, Kokkos::HostSpace> a_h(
+          "A", 1000);
+      auto a_h2 = Kokkos::create_mirror_view(Kokkos::HostSpace(), a_h);
+      auto a_d =
+          Kokkos::create_mirror_view(typename device::memory_space(), a_h);
 
-      int equal_ptr_h_h2  = a_h.data() ==a_h2.data()?1:0;
-      int equal_ptr_h_d   = a_h.data() ==a_d. data()?1:0;
-      int equal_ptr_h2_d  = a_h2.data()==a_d. data()?1:0;
+      int equal_ptr_h_h2 = a_h.data() == a_h2.data() ? 1 : 0;
+      int equal_ptr_h_d  = a_h.data() == a_d.data() ? 1 : 0;
+      int equal_ptr_h2_d = a_h2.data() == a_d.data() ? 1 : 0;
 
-      int is_same_memspace = std::is_same<Kokkos::HostSpace,typename device::memory_space>::value?1:0;
-      ASSERT_EQ(equal_ptr_h_h2,1);
-      ASSERT_EQ(equal_ptr_h_d ,is_same_memspace);
-      ASSERT_EQ(equal_ptr_h2_d ,is_same_memspace);
+      int is_same_memspace =
+          std::is_same<Kokkos::HostSpace, typename device::memory_space>::value
+              ? 1
+              : 0;
+      ASSERT_EQ(equal_ptr_h_h2, 1);
+      ASSERT_EQ(equal_ptr_h_d, is_same_memspace);
+      ASSERT_EQ(equal_ptr_h2_d, is_same_memspace);
 
-      ASSERT_EQ(a_h.extent(0),a_h2.extent(0));
-      ASSERT_EQ(a_h.extent(0),a_d .extent(0));
+      ASSERT_EQ(a_h.extent(0), a_h2.extent(0));
+      ASSERT_EQ(a_h.extent(0), a_d.extent(0));
 
-      ASSERT_EQ(a_h.rank(),a_h2.rank());
-      ASSERT_EQ(a_h.rank(),a_d.rank());
+      ASSERT_EQ(a_h.rank(), a_h2.rank());
+      ASSERT_EQ(a_h.rank(), a_d.rank());
     }
     {
-      Kokkos::DynRankView<double, Kokkos::LayoutRight, Kokkos::HostSpace> a_h("A",1000);
-      auto a_h2 = Kokkos::create_mirror_view(Kokkos::HostSpace(),a_h);
-      auto a_d = Kokkos::create_mirror_view(typename device::memory_space(),a_h);
+      Kokkos::DynRankView<double, Kokkos::LayoutRight, Kokkos::HostSpace> a_h(
+          "A", 1000);
+      auto a_h2 = Kokkos::create_mirror_view(Kokkos::HostSpace(), a_h);
+      auto a_d =
+          Kokkos::create_mirror_view(typename device::memory_space(), a_h);
 
-      int equal_ptr_h_h2  = a_h.data() ==a_h2.data()?1:0;
-      int equal_ptr_h_d   = a_h.data() ==a_d. data()?1:0;
-      int equal_ptr_h2_d  = a_h2.data()==a_d. data()?1:0;
+      int equal_ptr_h_h2 = a_h.data() == a_h2.data() ? 1 : 0;
+      int equal_ptr_h_d  = a_h.data() == a_d.data() ? 1 : 0;
+      int equal_ptr_h2_d = a_h2.data() == a_d.data() ? 1 : 0;
 
-      int is_same_memspace = std::is_same<Kokkos::HostSpace,typename device::memory_space>::value?1:0;
-      ASSERT_EQ(equal_ptr_h_h2,1);
-      ASSERT_EQ(equal_ptr_h_d ,is_same_memspace);
-      ASSERT_EQ(equal_ptr_h2_d ,is_same_memspace);
+      int is_same_memspace =
+          std::is_same<Kokkos::HostSpace, typename device::memory_space>::value
+              ? 1
+              : 0;
+      ASSERT_EQ(equal_ptr_h_h2, 1);
+      ASSERT_EQ(equal_ptr_h_d, is_same_memspace);
+      ASSERT_EQ(equal_ptr_h2_d, is_same_memspace);
 
-  
-      ASSERT_EQ(a_h.extent(0),a_h2.extent(0));
-      ASSERT_EQ(a_h.extent(0),a_d .extent(0));
+      ASSERT_EQ(a_h.extent(0), a_h2.extent(0));
+      ASSERT_EQ(a_h.extent(0), a_d.extent(0));
 
-      ASSERT_EQ(a_h.rank(),a_h2.rank());
-      ASSERT_EQ(a_h.rank(),a_d.rank());
+      ASSERT_EQ(a_h.rank(), a_h2.rank());
+      ASSERT_EQ(a_h.rank(), a_d.rank());
     }
     {
-      typedef Kokkos::DynRankView< int , Kokkos::LayoutStride , Kokkos::HostSpace > view_stride_type ;
-      unsigned order[] = { 6,5,4,3,2,1,0 }, dimen[] = { N0, N1, N2, 2, 2, 2, 2 }; //LayoutRight equivalent
-      view_stride_type a_h( "a" , Kokkos::LayoutStride::order_dimensions(7, order, dimen) );
-      auto a_h2 = Kokkos::create_mirror_view(Kokkos::HostSpace(),a_h);
-      auto a_d = Kokkos::create_mirror_view(typename device::memory_space(),a_h);
+      typedef Kokkos::DynRankView<int, Kokkos::LayoutStride, Kokkos::HostSpace>
+          view_stride_type;
+      unsigned order[] = {6, 5, 4, 3, 2, 1, 0},
+               dimen[] = {N0, N1, N2, 2, 2, 2, 2};  // LayoutRight equivalent
+      view_stride_type a_h(
+          "a", Kokkos::LayoutStride::order_dimensions(7, order, dimen));
+      auto a_h2 = Kokkos::create_mirror_view(Kokkos::HostSpace(), a_h);
+      auto a_d =
+          Kokkos::create_mirror_view(typename device::memory_space(), a_h);
 
-      int equal_ptr_h_h2  = a_h.data() ==a_h2.data()?1:0;
-      int equal_ptr_h_d   = a_h.data() ==a_d. data()?1:0;
-      int equal_ptr_h2_d  = a_h2.data()==a_d. data()?1:0;
+      int equal_ptr_h_h2 = a_h.data() == a_h2.data() ? 1 : 0;
+      int equal_ptr_h_d  = a_h.data() == a_d.data() ? 1 : 0;
+      int equal_ptr_h2_d = a_h2.data() == a_d.data() ? 1 : 0;
 
-      int is_same_memspace = std::is_same<Kokkos::HostSpace,typename device::memory_space>::value?1:0;
-      ASSERT_EQ(equal_ptr_h_h2,1);
-      ASSERT_EQ(equal_ptr_h_d ,is_same_memspace);
-      ASSERT_EQ(equal_ptr_h2_d ,is_same_memspace);
+      int is_same_memspace =
+          std::is_same<Kokkos::HostSpace, typename device::memory_space>::value
+              ? 1
+              : 0;
+      ASSERT_EQ(equal_ptr_h_h2, 1);
+      ASSERT_EQ(equal_ptr_h_d, is_same_memspace);
+      ASSERT_EQ(equal_ptr_h2_d, is_same_memspace);
 
-      ASSERT_EQ(a_h.extent(0),a_h2.extent(0));
-      ASSERT_EQ(a_h.extent(0),a_d .extent(0));
+      ASSERT_EQ(a_h.extent(0), a_h2.extent(0));
+      ASSERT_EQ(a_h.extent(0), a_d.extent(0));
 
-      ASSERT_EQ(a_h.rank(),a_h2.rank());
-      ASSERT_EQ(a_h.rank(),a_d.rank());
+      ASSERT_EQ(a_h.rank(), a_h2.rank());
+      ASSERT_EQ(a_h.rank(), a_d.rank());
     }
   }
 
-  static void run_test_mirror_and_copy()
-  {
+  static void run_test_mirror_and_copy() {
     // LayoutLeft
     {
-      Kokkos::DynRankView< double, Kokkos::LayoutLeft, Kokkos::HostSpace > a_org( "A", 10 );
+      Kokkos::DynRankView<double, Kokkos::LayoutLeft, Kokkos::HostSpace> a_org(
+          "A", 10);
       a_org(5) = 42.0;
-      Kokkos::DynRankView< double, Kokkos::LayoutLeft, Kokkos::HostSpace > a_h = a_org;
-      auto a_h2 = Kokkos::create_mirror_view_and_copy( Kokkos::HostSpace(), a_h );
-      auto a_d = Kokkos::create_mirror_view_and_copy( DeviceType(), a_h );
-      auto a_h3 = Kokkos::create_mirror_view_and_copy( Kokkos::HostSpace(), a_d );
+      Kokkos::DynRankView<double, Kokkos::LayoutLeft, Kokkos::HostSpace> a_h =
+          a_org;
+      auto a_h2 = Kokkos::create_mirror_view_and_copy(Kokkos::HostSpace(), a_h);
+      auto a_d  = Kokkos::create_mirror_view_and_copy(DeviceType(), a_h);
+      auto a_h3 = Kokkos::create_mirror_view_and_copy(Kokkos::HostSpace(), a_d);
 
-      int equal_ptr_h_h2 = a_h.data()  == a_h2.data() ? 1 : 0;
-      int equal_ptr_h_d  = a_h.data()  ==  a_d.data() ? 1 : 0;
-      int equal_ptr_h2_d = a_h2.data() ==  a_d.data() ? 1 : 0;
-      int equal_ptr_h3_d = a_h3.data() ==  a_d.data() ? 1 : 0;
+      int equal_ptr_h_h2 = a_h.data() == a_h2.data() ? 1 : 0;
+      int equal_ptr_h_d  = a_h.data() == a_d.data() ? 1 : 0;
+      int equal_ptr_h2_d = a_h2.data() == a_d.data() ? 1 : 0;
+      int equal_ptr_h3_d = a_h3.data() == a_d.data() ? 1 : 0;
 
-      int is_same_memspace = std::is_same< Kokkos::HostSpace, typename DeviceType::memory_space >::value ? 1 : 0;
-      ASSERT_EQ( equal_ptr_h_h2, 1 );
-      ASSERT_EQ( equal_ptr_h_d, is_same_memspace );
-      ASSERT_EQ( equal_ptr_h2_d, is_same_memspace );
-      ASSERT_EQ( equal_ptr_h3_d, is_same_memspace );
+      int is_same_memspace =
+          std::is_same<Kokkos::HostSpace,
+                       typename DeviceType::memory_space>::value
+              ? 1
+              : 0;
+      ASSERT_EQ(equal_ptr_h_h2, 1);
+      ASSERT_EQ(equal_ptr_h_d, is_same_memspace);
+      ASSERT_EQ(equal_ptr_h2_d, is_same_memspace);
+      ASSERT_EQ(equal_ptr_h3_d, is_same_memspace);
 
-      ASSERT_EQ( a_h.extent(0), a_h3.extent(0) );
-      ASSERT_EQ( a_h.extent(0), a_h2.extent(0) );
-      ASSERT_EQ( a_h.extent(0), a_d .extent(0) );
-      ASSERT_EQ( a_h.extent(0), a_h3.extent(0) );
-      ASSERT_EQ( a_h.rank(), a_org.rank() );
-      ASSERT_EQ( a_h.rank(), a_h2.rank() );
-      ASSERT_EQ( a_h.rank(), a_h3.rank() );
-      ASSERT_EQ( a_h.rank(), a_d.rank() );
-      ASSERT_EQ( a_org(5), a_h3(5) );
+      ASSERT_EQ(a_h.extent(0), a_h3.extent(0));
+      ASSERT_EQ(a_h.extent(0), a_h2.extent(0));
+      ASSERT_EQ(a_h.extent(0), a_d.extent(0));
+      ASSERT_EQ(a_h.extent(0), a_h3.extent(0));
+      ASSERT_EQ(a_h.rank(), a_org.rank());
+      ASSERT_EQ(a_h.rank(), a_h2.rank());
+      ASSERT_EQ(a_h.rank(), a_h3.rank());
+      ASSERT_EQ(a_h.rank(), a_d.rank());
+      ASSERT_EQ(a_org(5), a_h3(5));
     }
     // LayoutRight
     {
-      Kokkos::DynRankView< double, Kokkos::LayoutRight, Kokkos::HostSpace > a_org( "A", 10 );
+      Kokkos::DynRankView<double, Kokkos::LayoutRight, Kokkos::HostSpace> a_org(
+          "A", 10);
       a_org(5) = 42.0;
-      Kokkos::DynRankView< double, Kokkos::LayoutRight, Kokkos::HostSpace > a_h = a_org;
-      auto a_h2 = Kokkos::create_mirror_view_and_copy( Kokkos::HostSpace(), a_h );
-      auto a_d = Kokkos::create_mirror_view_and_copy( DeviceType(), a_h );
-      auto a_h3 = Kokkos::create_mirror_view_and_copy( Kokkos::HostSpace(), a_d );
+      Kokkos::DynRankView<double, Kokkos::LayoutRight, Kokkos::HostSpace> a_h =
+          a_org;
+      auto a_h2 = Kokkos::create_mirror_view_and_copy(Kokkos::HostSpace(), a_h);
+      auto a_d  = Kokkos::create_mirror_view_and_copy(DeviceType(), a_h);
+      auto a_h3 = Kokkos::create_mirror_view_and_copy(Kokkos::HostSpace(), a_d);
 
-      int equal_ptr_h_h2 = a_h.data()  == a_h2.data() ? 1 : 0;
-      int equal_ptr_h_d  = a_h.data()  ==  a_d.data() ? 1 : 0;
-      int equal_ptr_h2_d = a_h2.data() ==  a_d.data() ? 1 : 0;
-      int equal_ptr_h3_d = a_h3.data() ==  a_d.data() ? 1 : 0;
+      int equal_ptr_h_h2 = a_h.data() == a_h2.data() ? 1 : 0;
+      int equal_ptr_h_d  = a_h.data() == a_d.data() ? 1 : 0;
+      int equal_ptr_h2_d = a_h2.data() == a_d.data() ? 1 : 0;
+      int equal_ptr_h3_d = a_h3.data() == a_d.data() ? 1 : 0;
 
-      int is_same_memspace = std::is_same< Kokkos::HostSpace, typename DeviceType::memory_space >::value ? 1 : 0;
-      ASSERT_EQ( equal_ptr_h_h2, 1 );
-      ASSERT_EQ( equal_ptr_h_d, is_same_memspace );
-      ASSERT_EQ( equal_ptr_h2_d, is_same_memspace );
-      ASSERT_EQ( equal_ptr_h3_d, is_same_memspace );
+      int is_same_memspace =
+          std::is_same<Kokkos::HostSpace,
+                       typename DeviceType::memory_space>::value
+              ? 1
+              : 0;
+      ASSERT_EQ(equal_ptr_h_h2, 1);
+      ASSERT_EQ(equal_ptr_h_d, is_same_memspace);
+      ASSERT_EQ(equal_ptr_h2_d, is_same_memspace);
+      ASSERT_EQ(equal_ptr_h3_d, is_same_memspace);
 
-      ASSERT_EQ( a_h.extent(0), a_h3.extent(0) );
-      ASSERT_EQ( a_h.extent(0), a_h2.extent(0) );
-      ASSERT_EQ( a_h.extent(0), a_d .extent(0) );
-      ASSERT_EQ( a_h.rank(), a_org.rank() );
-      ASSERT_EQ( a_h.rank(), a_h2.rank() );
-      ASSERT_EQ( a_h.rank(), a_h3.rank() );
-      ASSERT_EQ( a_h.rank(), a_d.rank() );
-      ASSERT_EQ( a_org(5), a_h3(5) );
+      ASSERT_EQ(a_h.extent(0), a_h3.extent(0));
+      ASSERT_EQ(a_h.extent(0), a_h2.extent(0));
+      ASSERT_EQ(a_h.extent(0), a_d.extent(0));
+      ASSERT_EQ(a_h.rank(), a_org.rank());
+      ASSERT_EQ(a_h.rank(), a_h2.rank());
+      ASSERT_EQ(a_h.rank(), a_h3.rank());
+      ASSERT_EQ(a_h.rank(), a_d.rank());
+      ASSERT_EQ(a_org(5), a_h3(5));
     }
   }
 
-  static void run_test_scalar()
-  {
-    typedef typename dView0::HostMirror  hView0 ; //HostMirror of DynRankView is a DynRankView
+  static void run_test_scalar() {
+    typedef typename dView0::HostMirror
+        hView0;  // HostMirror of DynRankView is a DynRankView
 
-    dView0 dx , dy ;
-    hView0 hx , hy ;
+    dView0 dx, dy;
+    hView0 hx, hy;
 
-    dx = dView0( "dx" );
-    dy = dView0( "dy" );
+    dx = dView0("dx");
+    dy = dView0("dy");
 
-    hx = Kokkos::create_mirror( dx );
-    hy = Kokkos::create_mirror( dy );
+    hx = Kokkos::create_mirror(dx);
+    hy = Kokkos::create_mirror(dy);
 
-    hx() = 1 ;
+    hx() = 1;
 
-    Kokkos::deep_copy( dx , hx );
-    Kokkos::deep_copy( dy , dx );
-    Kokkos::deep_copy( hy , dy );
+    Kokkos::deep_copy(dx, hx);
+    Kokkos::deep_copy(dy, dx);
+    Kokkos::deep_copy(hy, dy);
 
-    ASSERT_EQ( hx(), hy() );
-    ASSERT_EQ( dx.rank() , hx.rank() );
-    ASSERT_EQ( dy.rank() , hy.rank() );
+    ASSERT_EQ(hx(), hy());
+    ASSERT_EQ(dx.rank(), hx.rank());
+    ASSERT_EQ(dy.rank(), hy.rank());
 
-  //View - DynRankView Interoperability tests
-  // deep_copy DynRankView to View
+    // View - DynRankView Interoperability tests
+    // deep_copy DynRankView to View
     View0 vx("vx");
-    Kokkos::deep_copy( vx , dx );
-    ASSERT_EQ( rank(dx) , rank(vx) );
+    Kokkos::deep_copy(vx, dx);
+    ASSERT_EQ(rank(dx), rank(vx));
 
     View0 vy("vy");
-    Kokkos::deep_copy( vy , dy );
-    ASSERT_EQ( rank(dy) , rank(vy) );
+    Kokkos::deep_copy(vy, dy);
+    ASSERT_EQ(rank(dy), rank(vy));
 
-  // deep_copy View to DynRankView 
+    // deep_copy View to DynRankView
     dView0 dxx("dxx");
-    Kokkos::deep_copy( dxx , vx );
-    ASSERT_EQ( rank(dxx) , rank(vx) );
-
+    Kokkos::deep_copy(dxx, vx);
+    ASSERT_EQ(rank(dxx), rank(vx));
 
     View7 vcast = dx.ConstDownCast();
-    ASSERT_EQ( dx.extent(0) , vcast.extent(0) );
-    ASSERT_EQ( dx.extent(1) , vcast.extent(1) );
-    ASSERT_EQ( dx.extent(2) , vcast.extent(2) );
-    ASSERT_EQ( dx.extent(3) , vcast.extent(3) );
-    ASSERT_EQ( dx.extent(4) , vcast.extent(4) );
+    ASSERT_EQ(dx.extent(0), vcast.extent(0));
+    ASSERT_EQ(dx.extent(1), vcast.extent(1));
+    ASSERT_EQ(dx.extent(2), vcast.extent(2));
+    ASSERT_EQ(dx.extent(3), vcast.extent(3));
+    ASSERT_EQ(dx.extent(4), vcast.extent(4));
 
-    View7 vcast1( dy.ConstDownCast() );
-    ASSERT_EQ( dy.extent(0) , vcast1.extent(0) );
-    ASSERT_EQ( dy.extent(1) , vcast1.extent(1) );
-    ASSERT_EQ( dy.extent(2) , vcast1.extent(2) );
-    ASSERT_EQ( dy.extent(3) , vcast1.extent(3) );
-    ASSERT_EQ( dy.extent(4) , vcast1.extent(4) );
+    View7 vcast1(dy.ConstDownCast());
+    ASSERT_EQ(dy.extent(0), vcast1.extent(0));
+    ASSERT_EQ(dy.extent(1), vcast1.extent(1));
+    ASSERT_EQ(dy.extent(2), vcast1.extent(2));
+    ASSERT_EQ(dy.extent(3), vcast1.extent(3));
+    ASSERT_EQ(dy.extent(4), vcast1.extent(4));
 
-  //View - DynRankView Interoperability tests
-  // copy View to DynRankView
-    dView0 dfromvx( vx );
-    auto hmx = Kokkos::create_mirror_view(dfromvx) ;
-    Kokkos::deep_copy(hmx , dfromvx);
-    auto hvx = Kokkos::create_mirror_view(vx) ;
-    Kokkos::deep_copy(hvx , vx);
-    ASSERT_EQ( rank(hvx) , rank(hmx) );
-    ASSERT_EQ( hvx.extent(0) , hmx.extent(0) );
-    ASSERT_EQ( hvx.extent(1) , hmx.extent(1) );
+    // View - DynRankView Interoperability tests
+    // copy View to DynRankView
+    dView0 dfromvx(vx);
+    auto hmx = Kokkos::create_mirror_view(dfromvx);
+    Kokkos::deep_copy(hmx, dfromvx);
+    auto hvx = Kokkos::create_mirror_view(vx);
+    Kokkos::deep_copy(hvx, vx);
+    ASSERT_EQ(rank(hvx), rank(hmx));
+    ASSERT_EQ(hvx.extent(0), hmx.extent(0));
+    ASSERT_EQ(hvx.extent(1), hmx.extent(1));
 
-  // copy-assign View to DynRankView
-    dView0 dfromvy = vy ;
-    auto hmy = Kokkos::create_mirror_view(dfromvy) ;
-    Kokkos::deep_copy(hmy , dfromvy);
-    auto hvy = Kokkos::create_mirror_view(vy) ;
-    Kokkos::deep_copy(hvy , vy);
-    ASSERT_EQ( rank(hvy) , rank(hmy) );
-    ASSERT_EQ( hvy.extent(0) , hmy.extent(0) );
-    ASSERT_EQ( hvy.extent(1) , hmy.extent(1) );
+    // copy-assign View to DynRankView
+    dView0 dfromvy = vy;
+    auto hmy       = Kokkos::create_mirror_view(dfromvy);
+    Kokkos::deep_copy(hmy, dfromvy);
+    auto hvy = Kokkos::create_mirror_view(vy);
+    Kokkos::deep_copy(hvy, vy);
+    ASSERT_EQ(rank(hvy), rank(hmy));
+    ASSERT_EQ(hvy.extent(0), hmy.extent(0));
+    ASSERT_EQ(hvy.extent(1), hmy.extent(1));
 
+    View7 vtest1("vtest1", 2, 2, 2, 2, 2, 2, 2);
+    dView0 dfromv1(vtest1);
+    ASSERT_EQ(dfromv1.rank(), vtest1.Rank);
+    ASSERT_EQ(dfromv1.extent(0), vtest1.extent(0));
+    ASSERT_EQ(dfromv1.extent(1), vtest1.extent(1));
+    ASSERT_EQ(dfromv1.use_count(), vtest1.use_count());
 
-    View7 vtest1("vtest1",2,2,2,2,2,2,2);
-    dView0 dfromv1( vtest1 );
-    ASSERT_EQ( dfromv1.rank() , vtest1.Rank );
-    ASSERT_EQ( dfromv1.extent(0) , vtest1.extent(0) );
-    ASSERT_EQ( dfromv1.extent(1) , vtest1.extent(1) );
-    ASSERT_EQ( dfromv1.use_count() , vtest1.use_count() );
-
-    dView0 dfromv2( vcast );
-    ASSERT_EQ( dfromv2.rank() , vcast.Rank );
-    ASSERT_EQ( dfromv2.extent(0) , vcast.extent(0) );
-    ASSERT_EQ( dfromv2.extent(1) , vcast.extent(1) );
-    ASSERT_EQ( dfromv2.use_count() , vcast.use_count() );
+    dView0 dfromv2(vcast);
+    ASSERT_EQ(dfromv2.rank(), vcast.Rank);
+    ASSERT_EQ(dfromv2.extent(0), vcast.extent(0));
+    ASSERT_EQ(dfromv2.extent(1), vcast.extent(1));
+    ASSERT_EQ(dfromv2.use_count(), vcast.use_count());
 
     dView0 dfromv3 = vcast1;
-    ASSERT_EQ( dfromv3.rank() , vcast1.Rank );
-    ASSERT_EQ( dfromv3.extent(0) , vcast1.extent(0) );
-    ASSERT_EQ( dfromv3.extent(1) , vcast1.extent(1) );
-    ASSERT_EQ( dfromv3.use_count() , vcast1.use_count() );
+    ASSERT_EQ(dfromv3.rank(), vcast1.Rank);
+    ASSERT_EQ(dfromv3.extent(0), vcast1.extent(0));
+    ASSERT_EQ(dfromv3.extent(1), vcast1.extent(1));
+    ASSERT_EQ(dfromv3.use_count(), vcast1.use_count());
   }
 
-  static void run_test()
-  {
+  static void run_test() {
     // mfh 14 Feb 2014: This test doesn't actually create instances of
     // these types.  In order to avoid "declared but unused typedef"
     // warnings, we declare empty instances of these types, with the
     // usual "(void)" marker to avoid compiler warnings for unused
     // variables.
 
-    typedef typename dView0::HostMirror  hView0 ;
+    typedef typename dView0::HostMirror hView0;
 
     {
       hView0 thing;
-      (void) thing;
+      (void)thing;
     }
 
-    dView0 d_uninitialized(Kokkos::ViewAllocateWithoutInitializing("uninit"),10,20);
-    ASSERT_TRUE( d_uninitialized.data() != nullptr );
-    ASSERT_EQ( d_uninitialized.rank() , 2 );
-    ASSERT_EQ( d_uninitialized.extent(0) , 10 );
-    ASSERT_EQ( d_uninitialized.extent(1) , 20 );
-    ASSERT_EQ( d_uninitialized.extent(2) , 1  );
+    dView0 d_uninitialized(Kokkos::ViewAllocateWithoutInitializing("uninit"),
+                           10, 20);
+    ASSERT_TRUE(d_uninitialized.data() != nullptr);
+    ASSERT_EQ(d_uninitialized.rank(), 2);
+    ASSERT_EQ(d_uninitialized.extent(0), 10);
+    ASSERT_EQ(d_uninitialized.extent(1), 20);
+    ASSERT_EQ(d_uninitialized.extent(2), 1);
 
-    dView0 dx , dy , dz ;
-    hView0 hx , hy , hz ;
+    dView0 dx, dy, dz;
+    hView0 hx, hy, hz;
 
-    ASSERT_TRUE( Kokkos::is_dyn_rank_view<dView0>::value );
-    ASSERT_FALSE( Kokkos::is_dyn_rank_view< Kokkos::View<double> >::value );
+    ASSERT_TRUE(Kokkos::is_dyn_rank_view<dView0>::value);
+    ASSERT_FALSE(Kokkos::is_dyn_rank_view<Kokkos::View<double> >::value);
 
-    ASSERT_TRUE( dx.data() == 0 ); //Okay with UVM
-    ASSERT_TRUE( dy.data() == 0 );  //Okay with UVM
-    ASSERT_TRUE( dz.data() == 0 ); //Okay with UVM
-    ASSERT_TRUE( hx.data() == 0 );
-    ASSERT_TRUE( hy.data() == 0 );
-    ASSERT_TRUE( hz.data() == 0 );
-    ASSERT_EQ( dx.extent(0) , 0u ); //Okay with UVM
-    ASSERT_EQ( dy.extent(0) , 0u ); //Okay with UVM
-    ASSERT_EQ( dz.extent(0) , 0u ); //Okay with UVM
-    ASSERT_EQ( hx.extent(0) , 0u );
-    ASSERT_EQ( hy.extent(0) , 0u );
-    ASSERT_EQ( hz.extent(0) , 0u );
-    ASSERT_EQ( dx.rank() , 0u ); //Okay with UVM
-    ASSERT_EQ( hx.rank() , 0u );
+    ASSERT_TRUE(dx.data() == 0);  // Okay with UVM
+    ASSERT_TRUE(dy.data() == 0);  // Okay with UVM
+    ASSERT_TRUE(dz.data() == 0);  // Okay with UVM
+    ASSERT_TRUE(hx.data() == 0);
+    ASSERT_TRUE(hy.data() == 0);
+    ASSERT_TRUE(hz.data() == 0);
+    ASSERT_EQ(dx.extent(0), 0u);  // Okay with UVM
+    ASSERT_EQ(dy.extent(0), 0u);  // Okay with UVM
+    ASSERT_EQ(dz.extent(0), 0u);  // Okay with UVM
+    ASSERT_EQ(hx.extent(0), 0u);
+    ASSERT_EQ(hy.extent(0), 0u);
+    ASSERT_EQ(hz.extent(0), 0u);
+    ASSERT_EQ(dx.rank(), 0u);  // Okay with UVM
+    ASSERT_EQ(hx.rank(), 0u);
 
-    dx = dView0( "dx" , N1 , N2 , N3 );
-    dy = dView0( "dy" , N1 , N2 , N3 );
+    dx = dView0("dx", N1, N2, N3);
+    dy = dView0("dy", N1, N2, N3);
 
-    hx = hView0( "hx" , N1 , N2 , N3 );
-    hy = hView0( "hy" , N1 , N2 , N3 );
+    hx = hView0("hx", N1, N2, N3);
+    hy = hView0("hy", N1, N2, N3);
 
-    ASSERT_EQ( dx.extent(0) , unsigned(N1) ); //Okay with UVM
-    ASSERT_EQ( dy.extent(0) , unsigned(N1) ); //Okay with UVM
-    ASSERT_EQ( hx.extent(0) , unsigned(N1) );
-    ASSERT_EQ( hy.extent(0) , unsigned(N1) );
-    ASSERT_EQ( dx.rank() , 3 ); //Okay with UVM
-    ASSERT_EQ( hx.rank() , 3 );
+    ASSERT_EQ(dx.extent(0), unsigned(N1));  // Okay with UVM
+    ASSERT_EQ(dy.extent(0), unsigned(N1));  // Okay with UVM
+    ASSERT_EQ(hx.extent(0), unsigned(N1));
+    ASSERT_EQ(hy.extent(0), unsigned(N1));
+    ASSERT_EQ(dx.rank(), 3);  // Okay with UVM
+    ASSERT_EQ(hx.rank(), 3);
 
-    dx = dView0( "dx" , N0 , N1 , N2 , N3 );
-    dy = dView0( "dy" , N0 , N1 , N2 , N3 );
-    hx = hView0( "hx" , N0 , N1 , N2 , N3 );
-    hy = hView0( "hy" , N0 , N1 , N2 , N3 );
+    dx = dView0("dx", N0, N1, N2, N3);
+    dy = dView0("dy", N0, N1, N2, N3);
+    hx = hView0("hx", N0, N1, N2, N3);
+    hy = hView0("hy", N0, N1, N2, N3);
 
-    ASSERT_EQ( dx.extent(0) , unsigned(N0) );
-    ASSERT_EQ( dy.extent(0) , unsigned(N0) );
-    ASSERT_EQ( hx.extent(0) , unsigned(N0) );
-    ASSERT_EQ( hy.extent(0) , unsigned(N0) );
-    ASSERT_EQ( dx.rank() , 4 );
-    ASSERT_EQ( dy.rank() , 4 );
-    ASSERT_EQ( hx.rank() , 4 );
-    ASSERT_EQ( hy.rank() , 4 );
+    ASSERT_EQ(dx.extent(0), unsigned(N0));
+    ASSERT_EQ(dy.extent(0), unsigned(N0));
+    ASSERT_EQ(hx.extent(0), unsigned(N0));
+    ASSERT_EQ(hy.extent(0), unsigned(N0));
+    ASSERT_EQ(dx.rank(), 4);
+    ASSERT_EQ(dy.rank(), 4);
+    ASSERT_EQ(hx.rank(), 4);
+    ASSERT_EQ(hy.rank(), 4);
 
-    ASSERT_EQ( dx.use_count() , size_t(1) );
+    ASSERT_EQ(dx.use_count(), size_t(1));
 
     dView0_unmanaged unmanaged_dx = dx;
-    ASSERT_EQ( dx.use_count() , size_t(1) );
-
-
-    dView0_unmanaged unmanaged_from_ptr_dx = dView0_unmanaged(dx.data(),
-                                                              dx.extent(0),
-                                                              dx.extent(1),
-                                                              dx.extent(2),
-                                                              dx.extent(3));
+    ASSERT_EQ(dx.use_count(), size_t(1));
 
+    dView0_unmanaged unmanaged_from_ptr_dx = dView0_unmanaged(
+        dx.data(), dx.extent(0), dx.extent(1), dx.extent(2), dx.extent(3));
 
     {
       // Destruction of this view should be harmless
-      const_dView0 unmanaged_from_ptr_const_dx( dx.data() ,
-                                                dx.extent(0) ,
-                                                dx.extent(1) ,
-                                                dx.extent(2) ,
-                                                dx.extent(3) );
+      const_dView0 unmanaged_from_ptr_const_dx(
+          dx.data(), dx.extent(0), dx.extent(1), dx.extent(2), dx.extent(3));
     }
 
-    const_dView0 const_dx = dx ;
-    ASSERT_EQ( dx.use_count() , size_t(2) );
+    const_dView0 const_dx = dx;
+    ASSERT_EQ(dx.use_count(), size_t(2));
 
     {
       const_dView0 const_dx2;
       const_dx2 = const_dx;
-      ASSERT_EQ( dx.use_count() , size_t(3) );
+      ASSERT_EQ(dx.use_count(), size_t(3));
 
       const_dx2 = dy;
-      ASSERT_EQ( dx.use_count() , size_t(2) );
+      ASSERT_EQ(dx.use_count(), size_t(2));
 
       const_dView0 const_dx3(dx);
-      ASSERT_EQ( dx.use_count() , size_t(3) );
-      
+      ASSERT_EQ(dx.use_count(), size_t(3));
+
       dView0_unmanaged dx4_unmanaged(dx);
-      ASSERT_EQ( dx.use_count() , size_t(3) );
+      ASSERT_EQ(dx.use_count(), size_t(3));
     }
 
-    ASSERT_EQ( dx.use_count() , size_t(2) );
+    ASSERT_EQ(dx.use_count(), size_t(2));
 
+    ASSERT_FALSE(dx.data() == 0);
+    ASSERT_FALSE(const_dx.data() == 0);
+    ASSERT_FALSE(unmanaged_dx.data() == 0);
+    ASSERT_FALSE(unmanaged_from_ptr_dx.data() == 0);
+    ASSERT_FALSE(dy.data() == 0);
+    ASSERT_NE(dx, dy);
 
-    ASSERT_FALSE( dx.data() == 0 );
-    ASSERT_FALSE( const_dx.data() == 0 );
-    ASSERT_FALSE( unmanaged_dx.data() == 0 );
-    ASSERT_FALSE( unmanaged_from_ptr_dx.data() == 0 );
-    ASSERT_FALSE( dy.data() == 0 );
-    ASSERT_NE( dx , dy );
+    ASSERT_EQ(dx.extent(0), unsigned(N0));
+    ASSERT_EQ(dx.extent(1), unsigned(N1));
+    ASSERT_EQ(dx.extent(2), unsigned(N2));
+    ASSERT_EQ(dx.extent(3), unsigned(N3));
 
-    ASSERT_EQ( dx.extent(0) , unsigned(N0) );
-    ASSERT_EQ( dx.extent(1) , unsigned(N1) );
-    ASSERT_EQ( dx.extent(2) , unsigned(N2) );
-    ASSERT_EQ( dx.extent(3) , unsigned(N3) );
+    ASSERT_EQ(dy.extent(0), unsigned(N0));
+    ASSERT_EQ(dy.extent(1), unsigned(N1));
+    ASSERT_EQ(dy.extent(2), unsigned(N2));
+    ASSERT_EQ(dy.extent(3), unsigned(N3));
 
-    ASSERT_EQ( dy.extent(0) , unsigned(N0) );
-    ASSERT_EQ( dy.extent(1) , unsigned(N1) );
-    ASSERT_EQ( dy.extent(2) , unsigned(N2) );
-    ASSERT_EQ( dy.extent(3) , unsigned(N3) );
+    ASSERT_EQ(unmanaged_from_ptr_dx.span(),
+              unsigned(N0) * unsigned(N1) * unsigned(N2) * unsigned(N3));
 
-    ASSERT_EQ( unmanaged_from_ptr_dx.span(),unsigned(N0)*unsigned(N1)*unsigned(N2)*unsigned(N3) );
+    hx = Kokkos::create_mirror(dx);
+    hy = Kokkos::create_mirror(dy);
 
-    hx = Kokkos::create_mirror( dx );
-    hy = Kokkos::create_mirror( dy );
+    ASSERT_EQ(hx.rank(), dx.rank());
+    ASSERT_EQ(hy.rank(), dy.rank());
 
-    ASSERT_EQ( hx.rank() , dx.rank() );
-    ASSERT_EQ( hy.rank() , dy.rank() );
+    ASSERT_EQ(hx.extent(0), unsigned(N0));
+    ASSERT_EQ(hx.extent(1), unsigned(N1));
+    ASSERT_EQ(hx.extent(2), unsigned(N2));
+    ASSERT_EQ(hx.extent(3), unsigned(N3));
 
-    ASSERT_EQ( hx.extent(0) , unsigned(N0) );
-    ASSERT_EQ( hx.extent(1) , unsigned(N1) );
-    ASSERT_EQ( hx.extent(2) , unsigned(N2) );
-    ASSERT_EQ( hx.extent(3) , unsigned(N3) );
-
-    ASSERT_EQ( hy.extent(0) , unsigned(N0) );
-    ASSERT_EQ( hy.extent(1) , unsigned(N1) );
-    ASSERT_EQ( hy.extent(2) , unsigned(N2) );
-    ASSERT_EQ( hy.extent(3) , unsigned(N3) );
+    ASSERT_EQ(hy.extent(0), unsigned(N0));
+    ASSERT_EQ(hy.extent(1), unsigned(N1));
+    ASSERT_EQ(hy.extent(2), unsigned(N2));
+    ASSERT_EQ(hy.extent(3), unsigned(N3));
 
     // T v1 = hx() ;    // Generates compile error as intended
     // T v2 = hx(0,0) ; // Generates compile error as intended
@@ -1265,365 +1263,422 @@ public:
 
     // Testing with synchronous deep copy
     {
-      size_t count = 0 ;
-      for ( size_t ip = 0 ; ip < N0 ; ++ip ) {
-      for ( size_t i1 = 0 ; i1 < hx.extent(1) ; ++i1 ) {
-      for ( size_t i2 = 0 ; i2 < hx.extent(2) ; ++i2 ) {
-      for ( size_t i3 = 0 ; i3 < hx.extent(3) ; ++i3 ) {
-        hx(ip,i1,i2,i3) = ++count ;
-      }}}}
+      size_t count = 0;
+      for (size_t ip = 0; ip < N0; ++ip) {
+        for (size_t i1 = 0; i1 < hx.extent(1); ++i1) {
+          for (size_t i2 = 0; i2 < hx.extent(2); ++i2) {
+            for (size_t i3 = 0; i3 < hx.extent(3); ++i3) {
+              hx(ip, i1, i2, i3) = ++count;
+            }
+          }
+        }
+      }
 
-      Kokkos::deep_copy( dx , hx );
-      Kokkos::deep_copy( dy , dx );
-      Kokkos::deep_copy( hy , dy );
+      Kokkos::deep_copy(dx, hx);
+      Kokkos::deep_copy(dy, dx);
+      Kokkos::deep_copy(hy, dy);
       Kokkos::fence();
 
-      for ( size_t ip = 0 ; ip < N0 ; ++ip ) {
-      for ( size_t i1 = 0 ; i1 < N1 ; ++i1 ) {
-      for ( size_t i2 = 0 ; i2 < N2 ; ++i2 ) {
-      for ( size_t i3 = 0 ; i3 < N3 ; ++i3 ) {
-        { ASSERT_EQ( hx(ip,i1,i2,i3) , hy(ip,i1,i2,i3) ); }
-      }}}}
+      for (size_t ip = 0; ip < N0; ++ip) {
+        for (size_t i1 = 0; i1 < N1; ++i1) {
+          for (size_t i2 = 0; i2 < N2; ++i2) {
+            for (size_t i3 = 0; i3 < N3; ++i3) {
+              {
+                ASSERT_EQ(hx(ip, i1, i2, i3), hy(ip, i1, i2, i3));
+              }
+            }
+          }
+        }
+      }
 
-      Kokkos::deep_copy( dx , T(0) );
-      Kokkos::deep_copy( hx , dx );
+      Kokkos::deep_copy(dx, T(0));
+      Kokkos::deep_copy(hx, dx);
       Kokkos::fence();
 
-      for ( size_t ip = 0 ; ip < N0 ; ++ip ) {
-      for ( size_t i1 = 0 ; i1 < N1 ; ++i1 ) {
-      for ( size_t i2 = 0 ; i2 < N2 ; ++i2 ) {
-      for ( size_t i3 = 0 ; i3 < N3 ; ++i3 ) {
-        { ASSERT_EQ( hx(ip,i1,i2,i3) , T(0) ); }
-      }}}}
-//    ASSERT_EQ( hx(0,0,0,0,0,0,0,0) , T(0) ); //Test rank8 op behaves properly - if implemented
+      for (size_t ip = 0; ip < N0; ++ip) {
+        for (size_t i1 = 0; i1 < N1; ++i1) {
+          for (size_t i2 = 0; i2 < N2; ++i2) {
+            for (size_t i3 = 0; i3 < N3; ++i3) {
+              {
+                ASSERT_EQ(hx(ip, i1, i2, i3), T(0));
+              }
+            }
+          }
+        }
+      }
+      //    ASSERT_EQ( hx(0,0,0,0,0,0,0,0) , T(0) ); //Test rank8 op behaves
+      //    properly - if implemented
     }
 
-    dz = dx ; ASSERT_EQ( dx, dz); ASSERT_NE( dy, dz);
-    dz = dy ; ASSERT_EQ( dy, dz); ASSERT_NE( dx, dz);
+    dz = dx;
+    ASSERT_EQ(dx, dz);
+    ASSERT_NE(dy, dz);
+    dz = dy;
+    ASSERT_EQ(dy, dz);
+    ASSERT_NE(dx, dz);
 
     dx = dView0();
-    ASSERT_TRUE( dx.data() == 0 );
-    ASSERT_FALSE( dy.data() == 0 );
-    ASSERT_FALSE( dz.data() == 0 );
+    ASSERT_TRUE(dx.data() == 0);
+    ASSERT_FALSE(dy.data() == 0);
+    ASSERT_FALSE(dz.data() == 0);
     dy = dView0();
-    ASSERT_TRUE( dx.data() == 0 );
-    ASSERT_TRUE( dy.data() == 0 );
-    ASSERT_FALSE( dz.data() == 0 );
+    ASSERT_TRUE(dx.data() == 0);
+    ASSERT_TRUE(dy.data() == 0);
+    ASSERT_FALSE(dz.data() == 0);
     dz = dView0();
-    ASSERT_TRUE( dx.data() == 0 );
-    ASSERT_TRUE( dy.data() == 0 );
-    ASSERT_TRUE( dz.data() == 0 );
+    ASSERT_TRUE(dx.data() == 0);
+    ASSERT_TRUE(dy.data() == 0);
+    ASSERT_TRUE(dz.data() == 0);
 
-  //View - DynRankView Interoperability tests
+    // View - DynRankView Interoperability tests
     // deep_copy from view to dynrankview
     const int testdim = 4;
-    dView0 dxx("dxx",testdim);
-    View1  vxx("vxx",testdim);
-    auto hvxx = Kokkos::create_mirror_view(vxx); 
-    for (int i = 0; i < testdim; ++i)
-      { hvxx(i) = i; }
-    Kokkos::deep_copy(vxx,hvxx);
-    Kokkos::deep_copy(dxx,vxx);
+    dView0 dxx("dxx", testdim);
+    View1 vxx("vxx", testdim);
+    auto hvxx = Kokkos::create_mirror_view(vxx);
+    for (int i = 0; i < testdim; ++i) {
+      hvxx(i) = i;
+    }
+    Kokkos::deep_copy(vxx, hvxx);
+    Kokkos::deep_copy(dxx, vxx);
     auto hdxx = Kokkos::create_mirror_view(dxx);
-    Kokkos::deep_copy(hdxx,dxx);
-    for (int i = 0; i < testdim; ++i)
-      { ASSERT_EQ( hvxx(i) , hdxx(i) ); }
+    Kokkos::deep_copy(hdxx, dxx);
+    for (int i = 0; i < testdim; ++i) {
+      ASSERT_EQ(hvxx(i), hdxx(i));
+    }
 
-    ASSERT_EQ( rank(hdxx) , rank(hvxx) );
-    ASSERT_EQ( hdxx.extent(0) , testdim );
-    ASSERT_EQ( hdxx.extent(0) , hvxx.extent(0) );
+    ASSERT_EQ(rank(hdxx), rank(hvxx));
+    ASSERT_EQ(hdxx.extent(0), testdim);
+    ASSERT_EQ(hdxx.extent(0), hvxx.extent(0));
 
     // deep_copy from dynrankview to view
-    View1 vdxx("vdxx",testdim);
+    View1 vdxx("vdxx", testdim);
     auto hvdxx = Kokkos::create_mirror_view(vdxx);
-    Kokkos::deep_copy(hvdxx , hdxx);
-    ASSERT_EQ( rank(hdxx) , rank(hvdxx) );
-    ASSERT_EQ( hvdxx.extent(0) , testdim );
-    ASSERT_EQ( hdxx.extent(0) , hvdxx.extent(0) );
-    for (int i = 0; i < testdim; ++i)
-      { ASSERT_EQ( hvxx(i) , hvdxx(i) ); }
+    Kokkos::deep_copy(hvdxx, hdxx);
+    ASSERT_EQ(rank(hdxx), rank(hvdxx));
+    ASSERT_EQ(hvdxx.extent(0), testdim);
+    ASSERT_EQ(hdxx.extent(0), hvdxx.extent(0));
+    for (int i = 0; i < testdim; ++i) {
+      ASSERT_EQ(hvxx(i), hvdxx(i));
+    }
   }
 
-  typedef T DataType ;
+  typedef T DataType;
 
-  static void
-  check_auto_conversion_to_const(
-     const Kokkos::DynRankView< const DataType , device > & arg_const ,
-     const Kokkos::DynRankView< DataType , device > & arg )
-  {
-    ASSERT_TRUE( arg_const == arg );
+  static void check_auto_conversion_to_const(
+      const Kokkos::DynRankView<const DataType, device>& arg_const,
+      const Kokkos::DynRankView<DataType, device>& arg) {
+    ASSERT_TRUE(arg_const == arg);
   }
 
-  static void run_test_const()
-  {
-    typedef Kokkos::DynRankView< DataType , device > typeX ;
-    typedef Kokkos::DynRankView< const DataType , device > const_typeX ;
-    typedef Kokkos::DynRankView< const DataType , device , Kokkos::MemoryRandomAccess > const_typeR ;
-    typeX x( "X", 2 );
-    const_typeX xc = x ;
-    const_typeR xr = x ;
+  static void run_test_const() {
+    typedef Kokkos::DynRankView<DataType, device> typeX;
+    typedef Kokkos::DynRankView<const DataType, device> const_typeX;
+    typedef Kokkos::DynRankView<const DataType, device,
+                                Kokkos::MemoryRandomAccess>
+        const_typeR;
+    typeX x("X", 2);
+    const_typeX xc = x;
+    const_typeR xr = x;
 
-    ASSERT_TRUE( xc == x );
-    ASSERT_TRUE( x == xc );
+    ASSERT_TRUE(xc == x);
+    ASSERT_TRUE(x == xc);
 
     // For CUDA the constant random access View does not return
     // an lvalue reference due to retrieving through texture cache
     // therefore not allowed to query the underlying pointer.
 #if defined(KOKKOS_ENABLE_CUDA)
-    if ( ! std::is_same< typename device::execution_space , Kokkos::Cuda >::value )
+    if (!std::is_same<typename device::execution_space, Kokkos::Cuda>::value)
 #endif
     {
-      ASSERT_TRUE( x.data() == xr.data() );
+      ASSERT_TRUE(x.data() == xr.data());
     }
 
     // typeX xf = xc ; // setting non-const from const must not compile
 
-    check_auto_conversion_to_const( x , x );
+    check_auto_conversion_to_const(x, x);
   }
 
+  static void run_test_subview() {
+    typedef Kokkos::DynRankView<const T, device> cdView;
+    typedef Kokkos::DynRankView<T, device> dView;
+    // LayoutStride required for all returned DynRankView subdynrankview's
+    typedef Kokkos::DynRankView<T, Kokkos::LayoutStride, device> sdView;
 
-  static void run_test_subview()
-  {
-    typedef Kokkos::DynRankView< const T , device > cdView ;
-    typedef Kokkos::DynRankView< T , device > dView ;
-  // LayoutStride required for all returned DynRankView subdynrankview's
-    typedef Kokkos::DynRankView< T , Kokkos::LayoutStride , device > sdView ; 
+    dView0 d0("d0");
+    cdView s0 = d0;
 
-    dView0 d0( "d0" );
-    cdView s0 = d0 ;
+    //  N0 = 1000,N1 = 3,N2 = 5,N3 = 7
+    unsigned order[] = {6, 5, 4, 3, 2, 1, 0},
+             dimen[] = {N0, N1, N2, 2, 2, 2, 2};  // LayoutRight equivalent
+    sdView d7("d7", Kokkos::LayoutStride::order_dimensions(7, order, dimen));
+    ASSERT_EQ(d7.rank(), 7);
 
-  //  N0 = 1000,N1 = 3,N2 = 5,N3 = 7 
-    unsigned order[] = { 6,5,4,3,2,1,0 }, dimen[] = { N0, N1, N2, 2, 2, 2, 2 }; //LayoutRight equivalent
-    sdView d7( "d7" , Kokkos::LayoutStride::order_dimensions(7, order, dimen) );
-    ASSERT_EQ( d7.rank() , 7 );
+    sdView ds0 = Kokkos::subdynrankview(d7, 1, 1, 1, 1, 1, 1, 1);
+    ASSERT_EQ(ds0.rank(), 0);
 
-    sdView ds0 = Kokkos::subdynrankview( d7 , 1 , 1 , 1 , 1 , 1 , 1 , 1 ); 
-    ASSERT_EQ( ds0.rank() , 0 );
+    // Basic test - ALL
+    sdView dsALL = Kokkos::subdynrankview(
+        d7, Kokkos::ALL(), Kokkos::ALL(), Kokkos::ALL(), Kokkos::ALL(),
+        Kokkos::ALL(), Kokkos::ALL(), Kokkos::ALL());
+    ASSERT_EQ(dsALL.rank(), 7);
 
-//Basic test - ALL
-    sdView dsALL = Kokkos::subdynrankview( d7 , Kokkos::ALL() , Kokkos::ALL() , Kokkos::ALL() , Kokkos::ALL() , Kokkos::ALL() , Kokkos::ALL() , Kokkos::ALL() ); 
-    ASSERT_EQ( dsALL.rank() , 7 );
+    //  Send a value to final rank returning rank 6 subview
+    sdView dsm1 =
+        Kokkos::subdynrankview(d7, Kokkos::ALL(), Kokkos::ALL(), Kokkos::ALL(),
+                               Kokkos::ALL(), Kokkos::ALL(), Kokkos::ALL(), 1);
+    ASSERT_EQ(dsm1.rank(), 6);
 
-//  Send a value to final rank returning rank 6 subview
-    sdView dsm1 = Kokkos::subdynrankview( d7 , Kokkos::ALL() , Kokkos::ALL() , Kokkos::ALL() , Kokkos::ALL() , Kokkos::ALL() , Kokkos::ALL() , 1 );
-    ASSERT_EQ( dsm1.rank() , 6 );
+    //  Send a std::pair as argument to a rank
+    sdView dssp = Kokkos::subdynrankview(
+        d7, Kokkos::ALL(), Kokkos::ALL(), Kokkos::ALL(), Kokkos::ALL(),
+        Kokkos::ALL(), Kokkos::ALL(), std::pair<unsigned, unsigned>(1, 2));
+    ASSERT_EQ(dssp.rank(), 7);
 
-//  Send a std::pair as argument to a rank
-    sdView dssp = Kokkos::subdynrankview( d7 , Kokkos::ALL() , Kokkos::ALL() , Kokkos::ALL() , Kokkos::ALL() , Kokkos::ALL() , Kokkos::ALL() , std::pair<unsigned,unsigned>(1,2) );
-    ASSERT_EQ( dssp.rank() , 7 );
+    //  Send a kokkos::pair as argument to a rank; take default layout as input
+    dView0 dd0("dd0", N0, N1, N2, 2, 2, 2, 2);  // default layout
+    ASSERT_EQ(dd0.rank(), 7);
+    sdView dtkp = Kokkos::subdynrankview(
+        dd0, Kokkos::ALL(), Kokkos::ALL(), Kokkos::ALL(), Kokkos::ALL(),
+        Kokkos::ALL(), Kokkos::ALL(), Kokkos::pair<unsigned, unsigned>(0, 1));
+    ASSERT_EQ(dtkp.rank(), 7);
 
-//  Send a kokkos::pair as argument to a rank; take default layout as input
-    dView0 dd0("dd0" , N0 , N1 , N2 , 2 , 2 , 2 , 2 ); //default layout
-    ASSERT_EQ( dd0.rank() , 7 );
-    sdView dtkp = Kokkos::subdynrankview( dd0 , Kokkos::ALL() , Kokkos::ALL() , Kokkos::ALL() , Kokkos::ALL() , Kokkos::ALL() , Kokkos::ALL() , Kokkos::pair<unsigned,unsigned>(0,1) );
-    ASSERT_EQ( dtkp.rank() , 7 );
+    // Return rank 7 subview, taking a pair as one argument, layout stride input
+    sdView ds7 = Kokkos::subdynrankview(
+        d7, Kokkos::ALL(), Kokkos::ALL(), Kokkos::ALL(), Kokkos::ALL(),
+        Kokkos::ALL(), Kokkos::ALL(), Kokkos::pair<unsigned, unsigned>(0, 1));
+    ASSERT_EQ(ds7.rank(), 7);
 
-// Return rank 7 subview, taking a pair as one argument, layout stride input
-    sdView ds7 = Kokkos::subdynrankview( d7 , Kokkos::ALL() , Kokkos::ALL() , Kokkos::ALL() , Kokkos::ALL() , Kokkos::ALL() , Kokkos::ALL() , Kokkos::pair<unsigned,unsigned>(0,1) );
-    ASSERT_EQ( ds7.rank() , 7 );
+    // Default Layout DynRankView
+    dView dv6("dv6", N0, N1, N2, N3, 2, 2);
+    ASSERT_EQ(dv6.rank(), 6);
 
-// Default Layout DynRankView
-    dView dv6("dv6" , N0 , N1 , N2 , N3 , 2 , 2 );
-    ASSERT_EQ( dv6.rank() , 6 );
+    // DynRankView with LayoutRight
+    typedef Kokkos::DynRankView<T, Kokkos::LayoutRight, device> drView;
+    drView dr5("dr5", N0, N1, N2, 2, 2);
+    ASSERT_EQ(dr5.rank(), 5);
 
-// DynRankView with LayoutRight
-    typedef Kokkos::DynRankView< T , Kokkos::LayoutRight , device > drView ;
-    drView dr5( "dr5" , N0 , N1 , N2 , 2 , 2 );
-    ASSERT_EQ( dr5.rank() , 5 );
-
-// LayoutStride but arranged as LayoutRight
-  // NOTE: unused arg_layout dimensions must be set toKOKKOS_INVALID_INDEX so that 
-  //  rank deduction can properly take place
-    unsigned order5[] = { 4,3,2,1,0 }, dimen5[] = { N0, N1, N2, 2, 2 };
-    Kokkos::LayoutStride ls = Kokkos::LayoutStride::order_dimensions(5, order5, dimen5);
-    ls.dimension[5] =KOKKOS_INVALID_INDEX;
-    ls.dimension[6] =KOKKOS_INVALID_INDEX;
-    ls.dimension[7] =KOKKOS_INVALID_INDEX;
+    // LayoutStride but arranged as LayoutRight
+    // NOTE: unused arg_layout dimensions must be set toKOKKOS_INVALID_INDEX so
+    // that
+    //  rank deduction can properly take place
+    unsigned order5[] = {4, 3, 2, 1, 0}, dimen5[] = {N0, N1, N2, 2, 2};
+    Kokkos::LayoutStride ls =
+        Kokkos::LayoutStride::order_dimensions(5, order5, dimen5);
+    ls.dimension[5] = KOKKOS_INVALID_INDEX;
+    ls.dimension[6] = KOKKOS_INVALID_INDEX;
+    ls.dimension[7] = KOKKOS_INVALID_INDEX;
     sdView d5("d5", ls);
-    ASSERT_EQ( d5.rank() , 5 );
+    ASSERT_EQ(d5.rank(), 5);
 
-//  LayoutStride arranged as LayoutRight - commented out as example that fails unit test
-//    unsigned order5[] = { 4,3,2,1,0 }, dimen5[] = { N0, N1, N2, 2, 2 };
-//    sdView d5( "d5" , Kokkos::LayoutStride::order_dimensions(5, order5, dimen5) );
-//
-//  Fails the following unit test:
-//    ASSERT_EQ( d5.rank() , dr5.rank() );
-//
-//  Explanation: In construction of the Kokkos::LayoutStride below, since the 
-//   remaining dimensions are not specified, they will default to values of 0 
-//   rather thanKOKKOS_INVALID_INDEX. 
-//  When passed to the DynRankView constructor the default dimensions (of 0) 
-//   will be counted toward the dynamic rank and returning an incorrect value 
-//   (i.e. rank 7 rather than 5).
+    //  LayoutStride arranged as LayoutRight - commented out as example that
+    //  fails unit test
+    //    unsigned order5[] = { 4,3,2,1,0 }, dimen5[] = { N0, N1, N2, 2, 2 };
+    //    sdView d5( "d5" , Kokkos::LayoutStride::order_dimensions(5, order5,
+    //    dimen5) );
+    //
+    //  Fails the following unit test:
+    //    ASSERT_EQ( d5.rank() , dr5.rank() );
+    //
+    //  Explanation: In construction of the Kokkos::LayoutStride below, since
+    //  the
+    //   remaining dimensions are not specified, they will default to values of
+    //   0 rather thanKOKKOS_INVALID_INDEX.
+    //  When passed to the DynRankView constructor the default dimensions (of 0)
+    //   will be counted toward the dynamic rank and returning an incorrect
+    //   value (i.e. rank 7 rather than 5).
 
-// Check LayoutRight dr5 and LayoutStride d5 dimensions agree (as they should) 
-    ASSERT_EQ( d5.extent(0) , dr5.extent(0) );
-    ASSERT_EQ( d5.extent(1) , dr5.extent(1) );
-    ASSERT_EQ( d5.extent(2) , dr5.extent(2) );
-    ASSERT_EQ( d5.extent(3) , dr5.extent(3) );
-    ASSERT_EQ( d5.extent(4) , dr5.extent(4) );
-    ASSERT_EQ( d5.extent(5) , dr5.extent(5) );
-    ASSERT_EQ( d5.rank() , dr5.rank() );
+    // Check LayoutRight dr5 and LayoutStride d5 dimensions agree (as they
+    // should)
+    ASSERT_EQ(d5.extent(0), dr5.extent(0));
+    ASSERT_EQ(d5.extent(1), dr5.extent(1));
+    ASSERT_EQ(d5.extent(2), dr5.extent(2));
+    ASSERT_EQ(d5.extent(3), dr5.extent(3));
+    ASSERT_EQ(d5.extent(4), dr5.extent(4));
+    ASSERT_EQ(d5.extent(5), dr5.extent(5));
+    ASSERT_EQ(d5.rank(), dr5.rank());
 
-// Rank 5 subview of rank 5 dynamic rank view, layout stride input
-    sdView ds5 = Kokkos::subdynrankview( d5 , Kokkos::ALL() , Kokkos::ALL() , Kokkos::ALL() , Kokkos::ALL() , Kokkos::pair<unsigned,unsigned>(0,1) );
-    ASSERT_EQ( ds5.rank() , 5 );
+    // Rank 5 subview of rank 5 dynamic rank view, layout stride input
+    sdView ds5 = Kokkos::subdynrankview(d5, Kokkos::ALL(), Kokkos::ALL(),
+                                        Kokkos::ALL(), Kokkos::ALL(),
+                                        Kokkos::pair<unsigned, unsigned>(0, 1));
+    ASSERT_EQ(ds5.rank(), 5);
 
-// Pass in extra ALL arguments beyond the rank of the DynRank View.
-// This behavior is allowed - ignore the extra ALL arguments when
-//  the src.rank() < number of arguments, but be careful!
-    sdView ds5plus = Kokkos::subdynrankview( d5 , Kokkos::ALL() , Kokkos::ALL() , Kokkos::ALL() , Kokkos::ALL() , Kokkos::pair<unsigned,unsigned>(0,1) , Kokkos::ALL() );
+    // Pass in extra ALL arguments beyond the rank of the DynRank View.
+    // This behavior is allowed - ignore the extra ALL arguments when
+    //  the src.rank() < number of arguments, but be careful!
+    sdView ds5plus = Kokkos::subdynrankview(
+        d5, Kokkos::ALL(), Kokkos::ALL(), Kokkos::ALL(), Kokkos::ALL(),
+        Kokkos::pair<unsigned, unsigned>(0, 1), Kokkos::ALL());
 
-    ASSERT_EQ( ds5.rank() , ds5plus.rank() );
-    ASSERT_EQ( ds5.extent(0) , ds5plus.extent(0) );
-    ASSERT_EQ( ds5.extent(4) , ds5plus.extent(4) );
-    ASSERT_EQ( ds5.extent(5) , ds5plus.extent(5) );
+    ASSERT_EQ(ds5.rank(), ds5plus.rank());
+    ASSERT_EQ(ds5.extent(0), ds5plus.extent(0));
+    ASSERT_EQ(ds5.extent(4), ds5plus.extent(4));
+    ASSERT_EQ(ds5.extent(5), ds5plus.extent(5));
 
-#if ! defined( KOKKOS_ENABLE_CUDA ) || defined ( KOKKOS_ENABLE_CUDA_UVM )
-    ASSERT_EQ( & ds5(1,1,1,1,0) - & ds5plus(1,1,1,1,0) , 0 );
-    ASSERT_EQ( & ds5(1,1,1,1,0,0) - & ds5plus(1,1,1,1,0,0) , 0 );  // passing argument to rank beyond the view's rank is allowed iff it is a 0. 
+#if !defined(KOKKOS_ENABLE_CUDA) || defined(KOKKOS_ENABLE_CUDA_UVM)
+    ASSERT_EQ(&ds5(1, 1, 1, 1, 0) - &ds5plus(1, 1, 1, 1, 0), 0);
+    ASSERT_EQ(&ds5(1, 1, 1, 1, 0, 0) - &ds5plus(1, 1, 1, 1, 0, 0),
+              0);  // passing argument to rank beyond the view's rank is allowed
+                   // iff it is a 0.
 #endif
 
-// Similar test to rank 5 above, but create rank 4 subview
-// Check that the rank contracts (ds4 and ds4plus) and that subdynrankview can accept extra args (ds4plus)
-    sdView ds4 = Kokkos::subdynrankview( d5 , Kokkos::ALL() , Kokkos::ALL() , Kokkos::ALL() , Kokkos::ALL() , 0 );
-    sdView ds4plus = Kokkos::subdynrankview( d5 , Kokkos::ALL() , Kokkos::ALL() , Kokkos::ALL() , Kokkos::ALL() , 0 , Kokkos::ALL() );
+    // Similar test to rank 5 above, but create rank 4 subview
+    // Check that the rank contracts (ds4 and ds4plus) and that subdynrankview
+    // can accept extra args (ds4plus)
+    sdView ds4 = Kokkos::subdynrankview(d5, Kokkos::ALL(), Kokkos::ALL(),
+                                        Kokkos::ALL(), Kokkos::ALL(), 0);
+    sdView ds4plus =
+        Kokkos::subdynrankview(d5, Kokkos::ALL(), Kokkos::ALL(), Kokkos::ALL(),
+                               Kokkos::ALL(), 0, Kokkos::ALL());
 
-    ASSERT_EQ( ds4.rank() , ds4plus.rank() );
-    ASSERT_EQ( ds4.rank() , 4 );
-    ASSERT_EQ( ds4.extent(0) , ds4plus.extent(0) );
-    ASSERT_EQ( ds4.extent(4) , ds4plus.extent(4) );
-    ASSERT_EQ( ds4.extent(5) , ds4plus.extent(5) );
+    ASSERT_EQ(ds4.rank(), ds4plus.rank());
+    ASSERT_EQ(ds4.rank(), 4);
+    ASSERT_EQ(ds4.extent(0), ds4plus.extent(0));
+    ASSERT_EQ(ds4.extent(4), ds4plus.extent(4));
+    ASSERT_EQ(ds4.extent(5), ds4plus.extent(5));
   }
 
-  static void run_test_subview_strided()
-  {
-    typedef Kokkos::DynRankView < int , Kokkos::LayoutLeft , host_drv_space > drview_left ;
-    typedef Kokkos::DynRankView < int , Kokkos::LayoutRight , host_drv_space > drview_right ;
-    typedef Kokkos::DynRankView < int , Kokkos::LayoutStride , host_drv_space > drview_stride ;
+  static void run_test_subview_strided() {
+    typedef Kokkos::DynRankView<int, Kokkos::LayoutLeft, host_drv_space>
+        drview_left;
+    typedef Kokkos::DynRankView<int, Kokkos::LayoutRight, host_drv_space>
+        drview_right;
+    typedef Kokkos::DynRankView<int, Kokkos::LayoutStride, host_drv_space>
+        drview_stride;
 
-    drview_left  xl2( "xl2", 100 , 200 );
-    drview_right xr2( "xr2", 100 , 200 );
-    drview_stride yl1 = Kokkos::subdynrankview( xl2 , 0 , Kokkos::ALL() );
-    drview_stride yl2 = Kokkos::subdynrankview( xl2 , 1 , Kokkos::ALL() );
-    drview_stride ys1 = Kokkos::subdynrankview( xr2 , 0 , Kokkos::ALL() );
-    drview_stride ys2 = Kokkos::subdynrankview( xr2 , 1 , Kokkos::ALL() );
-    drview_stride yr1 = Kokkos::subdynrankview( xr2 , 0 , Kokkos::ALL() );
-    drview_stride yr2 = Kokkos::subdynrankview( xr2 , 1 , Kokkos::ALL() );
+    drview_left xl2("xl2", 100, 200);
+    drview_right xr2("xr2", 100, 200);
+    drview_stride yl1 = Kokkos::subdynrankview(xl2, 0, Kokkos::ALL());
+    drview_stride yl2 = Kokkos::subdynrankview(xl2, 1, Kokkos::ALL());
+    drview_stride ys1 = Kokkos::subdynrankview(xr2, 0, Kokkos::ALL());
+    drview_stride ys2 = Kokkos::subdynrankview(xr2, 1, Kokkos::ALL());
+    drview_stride yr1 = Kokkos::subdynrankview(xr2, 0, Kokkos::ALL());
+    drview_stride yr2 = Kokkos::subdynrankview(xr2, 1, Kokkos::ALL());
 
-    ASSERT_EQ( yl1.extent(0) , xl2.extent(1) );
-    ASSERT_EQ( yl2.extent(0) , xl2.extent(1) );
+    ASSERT_EQ(yl1.extent(0), xl2.extent(1));
+    ASSERT_EQ(yl2.extent(0), xl2.extent(1));
 
-    ASSERT_EQ( yr1.extent(0) , xr2.extent(1) );
-    ASSERT_EQ( yr2.extent(0) , xr2.extent(1) );
+    ASSERT_EQ(yr1.extent(0), xr2.extent(1));
+    ASSERT_EQ(yr2.extent(0), xr2.extent(1));
 
-    ASSERT_EQ( & yl1(0) - & xl2(0,0) , 0 );
-    ASSERT_EQ( & yl2(0) - & xl2(1,0) , 0 );
-    ASSERT_EQ( & yr1(0) - & xr2(0,0) , 0 );
-    ASSERT_EQ( & yr2(0) - & xr2(1,0) , 0 );
+    ASSERT_EQ(&yl1(0) - &xl2(0, 0), 0);
+    ASSERT_EQ(&yl2(0) - &xl2(1, 0), 0);
+    ASSERT_EQ(&yr1(0) - &xr2(0, 0), 0);
+    ASSERT_EQ(&yr2(0) - &xr2(1, 0), 0);
 
+    drview_left xl4("xl4", 10, 20, 30, 40);
+    drview_right xr4("xr4", 10, 20, 30, 40);
 
-    drview_left  xl4( "xl4", 10 , 20 , 30 , 40 );
-    drview_right xr4( "xr4", 10 , 20 , 30 , 40 );
+    // Replace subdynrankview with subview - test
+    drview_stride yl4 =
+        Kokkos::subview(xl4, 1, Kokkos::ALL(), 2, Kokkos::ALL());
+    drview_stride yr4 =
+        Kokkos::subview(xr4, 1, Kokkos::ALL(), 2, Kokkos::ALL());
 
-    //Replace subdynrankview with subview - test
-    drview_stride yl4 = Kokkos::subview( xl4 , 1 , Kokkos::ALL() , 2 , Kokkos::ALL() );
-    drview_stride yr4 = Kokkos::subview( xr4 , 1 , Kokkos::ALL() , 2 , Kokkos::ALL() );
+    ASSERT_EQ(yl4.extent(0), xl4.extent(1));
+    ASSERT_EQ(yl4.extent(1), xl4.extent(3));
+    ASSERT_EQ(yr4.extent(0), xr4.extent(1));
+    ASSERT_EQ(yr4.extent(1), xr4.extent(3));
+    ASSERT_EQ(yl4.rank(), 2);
+    ASSERT_EQ(yr4.rank(), 2);
 
-    ASSERT_EQ( yl4.extent(0) , xl4.extent(1) );
-    ASSERT_EQ( yl4.extent(1) , xl4.extent(3) );
-    ASSERT_EQ( yr4.extent(0) , xr4.extent(1) );
-    ASSERT_EQ( yr4.extent(1) , xr4.extent(3) );
-    ASSERT_EQ( yl4.rank() , 2);
-    ASSERT_EQ( yr4.rank() , 2);
-
-    ASSERT_EQ( & yl4(4,4) - & xl4(1,4,2,4) , 0 );
-    ASSERT_EQ( & yr4(4,4) - & xr4(1,4,2,4) , 0 );
+    ASSERT_EQ(&yl4(4, 4) - &xl4(1, 4, 2, 4), 0);
+    ASSERT_EQ(&yr4(4, 4) - &xr4(1, 4, 2, 4), 0);
   }
 
-  static void run_test_vector()
-  {
-    static const unsigned Length = 1000 , Count = 8 ;
+  static void run_test_vector() {
+    static const unsigned Length = 1000, Count = 8;
 
-    typedef typename Kokkos::DynRankView< T , Kokkos::LayoutLeft , host_drv_space > multivector_type ; 
+    typedef typename Kokkos::DynRankView<T, Kokkos::LayoutLeft, host_drv_space>
+        multivector_type;
 
-    typedef typename Kokkos::DynRankView< T , Kokkos::LayoutRight , host_drv_space > multivector_right_type ;
+    typedef typename Kokkos::DynRankView<T, Kokkos::LayoutRight, host_drv_space>
+        multivector_right_type;
 
-    multivector_type mv = multivector_type( "mv" , Length , Count );
-    multivector_right_type mv_right = multivector_right_type( "mv" , Length , Count );
+    multivector_type mv = multivector_type("mv", Length, Count);
+    multivector_right_type mv_right =
+        multivector_right_type("mv", Length, Count);
 
-    typedef typename Kokkos::DynRankView< T , Kokkos::LayoutStride , host_drv_space > svector_type ;
-    typedef typename Kokkos::DynRankView< T , Kokkos::LayoutStride , host_drv_space > smultivector_type ;
-    typedef typename Kokkos::DynRankView< const T , Kokkos::LayoutStride , host_drv_space > const_svector_right_type ; 
-    typedef typename Kokkos::DynRankView< const T , Kokkos::LayoutStride , host_drv_space > const_svector_type ;
-    typedef typename Kokkos::DynRankView< const T , Kokkos::LayoutStride , host_drv_space > const_smultivector_type ;
+    typedef
+        typename Kokkos::DynRankView<T, Kokkos::LayoutStride, host_drv_space>
+            svector_type;
+    typedef
+        typename Kokkos::DynRankView<T, Kokkos::LayoutStride, host_drv_space>
+            smultivector_type;
+    typedef typename Kokkos::DynRankView<const T, Kokkos::LayoutStride,
+                                         host_drv_space>
+        const_svector_right_type;
+    typedef typename Kokkos::DynRankView<const T, Kokkos::LayoutStride,
+                                         host_drv_space>
+        const_svector_type;
+    typedef typename Kokkos::DynRankView<const T, Kokkos::LayoutStride,
+                                         host_drv_space>
+        const_smultivector_type;
 
-    svector_type v1 = Kokkos::subdynrankview( mv , Kokkos::ALL() , 0 );
-    svector_type v2 = Kokkos::subdynrankview( mv , Kokkos::ALL() , 1 );
-    svector_type v3 = Kokkos::subdynrankview( mv , Kokkos::ALL() , 2 );
+    svector_type v1 = Kokkos::subdynrankview(mv, Kokkos::ALL(), 0);
+    svector_type v2 = Kokkos::subdynrankview(mv, Kokkos::ALL(), 1);
+    svector_type v3 = Kokkos::subdynrankview(mv, Kokkos::ALL(), 2);
 
-    svector_type rv1 = Kokkos::subdynrankview( mv_right , 0 , Kokkos::ALL() );
-    svector_type rv2 = Kokkos::subdynrankview( mv_right , 1 , Kokkos::ALL() );
-    svector_type rv3 = Kokkos::subdynrankview( mv_right , 2 , Kokkos::ALL() );
+    svector_type rv1 = Kokkos::subdynrankview(mv_right, 0, Kokkos::ALL());
+    svector_type rv2 = Kokkos::subdynrankview(mv_right, 1, Kokkos::ALL());
+    svector_type rv3 = Kokkos::subdynrankview(mv_right, 2, Kokkos::ALL());
 
-    smultivector_type mv1 = Kokkos::subdynrankview( mv , std::make_pair( 1 , 998 ) ,
-                                                 std::make_pair( 2 , 5 ) );
+    smultivector_type mv1 = Kokkos::subdynrankview(mv, std::make_pair(1, 998),
+                                                   std::make_pair(2, 5));
 
-    smultivector_type mvr1 =
-      Kokkos::subdynrankview( mv_right ,
-                       std::make_pair( 1 , 998 ) ,
-                       std::make_pair( 2 , 5 ) );
+    smultivector_type mvr1 = Kokkos::subdynrankview(
+        mv_right, std::make_pair(1, 998), std::make_pair(2, 5));
 
-    const_svector_type cv1 = Kokkos::subdynrankview( mv , Kokkos::ALL(), 0 );
-    const_svector_type cv2 = Kokkos::subdynrankview( mv , Kokkos::ALL(), 1 );
-    const_svector_type cv3 = Kokkos::subdynrankview( mv , Kokkos::ALL(), 2 );
+    const_svector_type cv1 = Kokkos::subdynrankview(mv, Kokkos::ALL(), 0);
+    const_svector_type cv2 = Kokkos::subdynrankview(mv, Kokkos::ALL(), 1);
+    const_svector_type cv3 = Kokkos::subdynrankview(mv, Kokkos::ALL(), 2);
 
-    svector_type vr1 = Kokkos::subdynrankview( mv , Kokkos::ALL() , 0 );
-    svector_type vr2 = Kokkos::subdynrankview( mv , Kokkos::ALL() , 1 );
-    svector_type vr3 = Kokkos::subdynrankview( mv , Kokkos::ALL() , 2 );
+    svector_type vr1 = Kokkos::subdynrankview(mv, Kokkos::ALL(), 0);
+    svector_type vr2 = Kokkos::subdynrankview(mv, Kokkos::ALL(), 1);
+    svector_type vr3 = Kokkos::subdynrankview(mv, Kokkos::ALL(), 2);
 
-    const_svector_right_type cvr1 = Kokkos::subdynrankview( mv , Kokkos::ALL() , 0 );
-    const_svector_right_type cvr2 = Kokkos::subdynrankview( mv , Kokkos::ALL() , 1 );
-    const_svector_right_type cvr3 = Kokkos::subdynrankview( mv , Kokkos::ALL() , 2 );
+    const_svector_right_type cvr1 =
+        Kokkos::subdynrankview(mv, Kokkos::ALL(), 0);
+    const_svector_right_type cvr2 =
+        Kokkos::subdynrankview(mv, Kokkos::ALL(), 1);
+    const_svector_right_type cvr3 =
+        Kokkos::subdynrankview(mv, Kokkos::ALL(), 2);
 
+    ASSERT_TRUE(&v1[0] == &v1(0));
+    ASSERT_TRUE(&v1[0] == &mv(0, 0));
+    ASSERT_TRUE(&v2[0] == &mv(0, 1));
+    ASSERT_TRUE(&v3[0] == &mv(0, 2));
 
-    ASSERT_TRUE( & v1[0] == & v1(0) );
-    ASSERT_TRUE( & v1[0] == & mv(0,0) );
-    ASSERT_TRUE( & v2[0] == & mv(0,1) );
-    ASSERT_TRUE( & v3[0] == & mv(0,2) );
+    ASSERT_TRUE(&cv1[0] == &mv(0, 0));
+    ASSERT_TRUE(&cv2[0] == &mv(0, 1));
+    ASSERT_TRUE(&cv3[0] == &mv(0, 2));
 
-    ASSERT_TRUE( & cv1[0] == & mv(0,0) );
-    ASSERT_TRUE( & cv2[0] == & mv(0,1) );
-    ASSERT_TRUE( & cv3[0] == & mv(0,2) );
+    ASSERT_TRUE(&vr1[0] == &mv(0, 0));
+    ASSERT_TRUE(&vr2[0] == &mv(0, 1));
+    ASSERT_TRUE(&vr3[0] == &mv(0, 2));
 
-    ASSERT_TRUE( & vr1[0] == & mv(0,0) );
-    ASSERT_TRUE( & vr2[0] == & mv(0,1) );
-    ASSERT_TRUE( & vr3[0] == & mv(0,2) );
+    ASSERT_TRUE(&cvr1[0] == &mv(0, 0));
+    ASSERT_TRUE(&cvr2[0] == &mv(0, 1));
+    ASSERT_TRUE(&cvr3[0] == &mv(0, 2));
 
-    ASSERT_TRUE( & cvr1[0] == & mv(0,0) );
-    ASSERT_TRUE( & cvr2[0] == & mv(0,1) );
-    ASSERT_TRUE( & cvr3[0] == & mv(0,2) );
+    ASSERT_TRUE(&mv1(0, 0) == &mv(1, 2));
+    ASSERT_TRUE(&mv1(1, 1) == &mv(2, 3));
+    ASSERT_TRUE(&mv1(3, 2) == &mv(4, 4));
+    ASSERT_TRUE(&mvr1(0, 0) == &mv_right(1, 2));
+    ASSERT_TRUE(&mvr1(1, 1) == &mv_right(2, 3));
+    ASSERT_TRUE(&mvr1(3, 2) == &mv_right(4, 4));
 
+    const_svector_type c_cv1(v1);
+    typename svector_type::const_type c_cv2(v2);
+    typename const_svector_type::const_type c_ccv2(v2);
 
-    ASSERT_TRUE( & mv1(0,0) == & mv( 1 , 2 ) );
-    ASSERT_TRUE( & mv1(1,1) == & mv( 2 , 3 ) );
-    ASSERT_TRUE( & mv1(3,2) == & mv( 4 , 4 ) );
-    ASSERT_TRUE( & mvr1(0,0) == & mv_right( 1 , 2 ) );
-    ASSERT_TRUE( & mvr1(1,1) == & mv_right( 2 , 3 ) );
-    ASSERT_TRUE( & mvr1(3,2) == & mv_right( 4 , 4 ) );
-
-    const_svector_type c_cv1( v1 );
-    typename svector_type::const_type c_cv2( v2 );
-    typename const_svector_type::const_type c_ccv2( v2 );
-
-
-    const_smultivector_type cmv( mv );
-    typename smultivector_type::const_type cmvX( cmv );
-    typename const_smultivector_type::const_type ccmvX( cmv );
+    const_smultivector_type cmv(mv);
+    typename smultivector_type::const_type cmvX(cmv);
+    typename const_smultivector_type::const_type ccmvX(cmv);
   }
 };
 
-} // namespace Test
+}  // namespace Test
 
 /*--------------------------------------------------------------------------*/
-
diff --git a/lib/kokkos/containers/unit_tests/TestDynViewAPI_generic.hpp b/lib/kokkos/containers/unit_tests/TestDynViewAPI_generic.hpp
index 2909e8cc76..90ca5df194 100644
--- a/lib/kokkos/containers/unit_tests/TestDynViewAPI_generic.hpp
+++ b/lib/kokkos/containers/unit_tests/TestDynViewAPI_generic.hpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -41,10 +42,9 @@
 //@HEADER
 */
 
-#include<TestDynViewAPI.hpp>
+#include <TestDynViewAPI.hpp>
 namespace Test {
-TEST_F( TEST_CATEGORY , dyn_rank_view_api_generic) {
-  TestDynViewAPI< double , TEST_EXECSPACE >::run_tests();
+TEST(TEST_CATEGORY, dyn_rank_view_api_generic) {
+  TestDynViewAPI<double, TEST_EXECSPACE>::run_tests();
 }
-}
-
+}  // namespace Test
diff --git a/lib/kokkos/containers/unit_tests/TestDynViewAPI_rank12345.hpp b/lib/kokkos/containers/unit_tests/TestDynViewAPI_rank12345.hpp
index 5b2c22440d..050ebbe35c 100644
--- a/lib/kokkos/containers/unit_tests/TestDynViewAPI_rank12345.hpp
+++ b/lib/kokkos/containers/unit_tests/TestDynViewAPI_rank12345.hpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -41,11 +42,10 @@
 //@HEADER
 */
 
-#include<TestDynViewAPI.hpp>
+#include <TestDynViewAPI.hpp>
 
 namespace Test {
-TEST_F( TEST_CATEGORY , dyn_rank_view_api_operator_rank12345) {
-  TestDynViewAPI< double , TEST_EXECSPACE >::run_operator_test_rank12345();
+TEST(TEST_CATEGORY, dyn_rank_view_api_operator_rank12345) {
+  TestDynViewAPI<double, TEST_EXECSPACE>::run_operator_test_rank12345();
 }
-}
-
+}  // namespace Test
diff --git a/lib/kokkos/containers/unit_tests/TestDynViewAPI_rank67.hpp b/lib/kokkos/containers/unit_tests/TestDynViewAPI_rank67.hpp
index 45a49fb819..eb8df60a89 100644
--- a/lib/kokkos/containers/unit_tests/TestDynViewAPI_rank67.hpp
+++ b/lib/kokkos/containers/unit_tests/TestDynViewAPI_rank67.hpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -41,10 +42,9 @@
 //@HEADER
 */
 
-#include<TestDynViewAPI.hpp>
+#include <TestDynViewAPI.hpp>
 namespace Test {
-TEST_F( TEST_CATEGORY , dyn_rank_view_api_operator_rank67) {
-  TestDynViewAPI< double , TEST_EXECSPACE >::run_operator_test_rank67();
+TEST(TEST_CATEGORY, dyn_rank_view_api_operator_rank67) {
+  TestDynViewAPI<double, TEST_EXECSPACE>::run_operator_test_rank67();
 }
-}
-
+}  // namespace Test
diff --git a/lib/kokkos/containers/unit_tests/TestDynamicView.hpp b/lib/kokkos/containers/unit_tests/TestDynamicView.hpp
index 9e87fdf5cc..235464ef07 100644
--- a/lib/kokkos/containers/unit_tests/TestDynamicView.hpp
+++ b/lib/kokkos/containers/unit_tests/TestDynamicView.hpp
@@ -1,13 +1,14 @@
 /*
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -36,7 +37,7 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 */
@@ -55,45 +56,43 @@
 
 namespace Test {
 
-template< typename Scalar , class Space >
-struct TestDynamicView
-{
-  typedef typename Space::execution_space  execution_space ;
-  typedef typename Space::memory_space     memory_space ;
+template <typename Scalar, class Space>
+struct TestDynamicView {
+  typedef typename Space::execution_space execution_space;
+  typedef typename Space::memory_space memory_space;
 
-  typedef Kokkos::Experimental::DynamicView<Scalar*,Space> view_type;
+  typedef Kokkos::Experimental::DynamicView<Scalar*, Space> view_type;
 
   typedef double value_type;
 
-  static void run( unsigned arg_total_size )
-  {
-    // Test: Create DynamicView, initialize size (via resize), run through parallel_for to set values, check values (via parallel_reduce); resize values and repeat
+  static void run(unsigned arg_total_size) {
+    // Test: Create DynamicView, initialize size (via resize), run through
+    // parallel_for to set values, check values (via parallel_reduce); resize
+    // values and repeat
     //   Case 1: min_chunk_size is a power of 2
     {
-      view_type da("da", 1024, arg_total_size );
-      ASSERT_EQ( da.size(), 0 );
+      view_type da("da", 1024, arg_total_size);
+      ASSERT_EQ(da.size(), 0);
       // Init
       unsigned da_size = arg_total_size / 8;
       da.resize_serial(da_size);
-      ASSERT_EQ( da.size(), da_size );
+      ASSERT_EQ(da.size(), da_size);
 
-#if defined( KOKKOS_ENABLE_CXX11_DISPATCH_LAMBDA )
-#if !defined(KOKKOS_ENABLE_CUDA) || ( 8000 <= CUDA_VERSION )
-      Kokkos::parallel_for( Kokkos::RangePolicy<execution_space>(0, da_size), KOKKOS_LAMBDA ( const int i )
-          {
-          da(i) = Scalar(i);
-          }
-          );
+#if defined(KOKKOS_ENABLE_CXX11_DISPATCH_LAMBDA)
+#if !defined(KOKKOS_ENABLE_CUDA) || (8000 <= CUDA_VERSION)
+      Kokkos::parallel_for(
+          Kokkos::RangePolicy<execution_space>(0, da_size),
+          KOKKOS_LAMBDA(const int i) { da(i) = Scalar(i); });
 
       value_type result_sum = 0.0;
-      Kokkos::parallel_reduce( Kokkos::RangePolicy<execution_space>(0, da_size), KOKKOS_LAMBDA ( const int i, value_type& partial_sum )
-          {
-          partial_sum += (value_type)da(i);
-          }
-          , result_sum
-          );
+      Kokkos::parallel_reduce(
+          Kokkos::RangePolicy<execution_space>(0, da_size),
+          KOKKOS_LAMBDA(const int i, value_type& partial_sum) {
+            partial_sum += (value_type)da(i);
+          },
+          result_sum);
 
-      ASSERT_EQ(result_sum, (value_type)( da_size * (da_size - 1) / 2 ) );
+      ASSERT_EQ(result_sum, (value_type)(da_size * (da_size - 1) / 2));
 #endif
 #endif
 
@@ -101,56 +100,55 @@ struct TestDynamicView
       // the first 1/4 should remain the same
       unsigned da_resize = arg_total_size / 2;
       da.resize_serial(da_resize);
-      ASSERT_EQ( da.size(), da_resize );
+      ASSERT_EQ(da.size(), da_resize);
 
-#if defined( KOKKOS_ENABLE_CXX11_DISPATCH_LAMBDA )
-#if !defined(KOKKOS_ENABLE_CUDA) || ( 8000 <= CUDA_VERSION )
-      Kokkos::parallel_for( Kokkos::RangePolicy<execution_space>(da_size, da_resize), KOKKOS_LAMBDA ( const int i )
-          {
-          da(i) = Scalar(i);
-          }
-          );
+#if defined(KOKKOS_ENABLE_CXX11_DISPATCH_LAMBDA)
+#if !defined(KOKKOS_ENABLE_CUDA) || (8000 <= CUDA_VERSION)
+      Kokkos::parallel_for(
+          Kokkos::RangePolicy<execution_space>(da_size, da_resize),
+          KOKKOS_LAMBDA(const int i) { da(i) = Scalar(i); });
 
       value_type new_result_sum = 0.0;
-      Kokkos::parallel_reduce( Kokkos::RangePolicy<execution_space>(da_size, da_resize), KOKKOS_LAMBDA ( const int i, value_type& partial_sum )
-          {
-          partial_sum += (value_type)da(i);
-          }
-          , new_result_sum
-          );
+      Kokkos::parallel_reduce(
+          Kokkos::RangePolicy<execution_space>(da_size, da_resize),
+          KOKKOS_LAMBDA(const int i, value_type& partial_sum) {
+            partial_sum += (value_type)da(i);
+          },
+          new_result_sum);
 
-      ASSERT_EQ(new_result_sum+result_sum, (value_type)( da_resize * (da_resize - 1) / 2 ) );
+      ASSERT_EQ(new_result_sum + result_sum,
+                (value_type)(da_resize * (da_resize - 1) / 2));
 #endif
 #endif
-    } // end scope
+    }  // end scope
 
-    // Test: Create DynamicView, initialize size (via resize), run through parallel_for to set values, check values (via parallel_reduce); resize values and repeat
+    // Test: Create DynamicView, initialize size (via resize), run through
+    // parallel_for to set values, check values (via parallel_reduce); resize
+    // values and repeat
     //   Case 2: min_chunk_size is NOT a power of 2
     {
-      view_type da("da", 1023, arg_total_size );
-      ASSERT_EQ( da.size(), 0 );
+      view_type da("da", 1023, arg_total_size);
+      ASSERT_EQ(da.size(), 0);
       // Init
       unsigned da_size = arg_total_size / 8;
       da.resize_serial(da_size);
-      ASSERT_EQ( da.size(), da_size );
+      ASSERT_EQ(da.size(), da_size);
 
-#if defined( KOKKOS_ENABLE_CXX11_DISPATCH_LAMBDA )
-#if !defined(KOKKOS_ENABLE_CUDA) || ( 8000 <= CUDA_VERSION )
-      Kokkos::parallel_for( Kokkos::RangePolicy<execution_space>(0, da_size), KOKKOS_LAMBDA ( const int i )
-          {
-          da(i) = Scalar(i);
-          }
-          );
+#if defined(KOKKOS_ENABLE_CXX11_DISPATCH_LAMBDA)
+#if !defined(KOKKOS_ENABLE_CUDA) || (8000 <= CUDA_VERSION)
+      Kokkos::parallel_for(
+          Kokkos::RangePolicy<execution_space>(0, da_size),
+          KOKKOS_LAMBDA(const int i) { da(i) = Scalar(i); });
 
       value_type result_sum = 0.0;
-      Kokkos::parallel_reduce( Kokkos::RangePolicy<execution_space>(0, da_size), KOKKOS_LAMBDA ( const int i, value_type& partial_sum )
-          {
-          partial_sum += (value_type)da(i);
-          }
-          , result_sum
-          );
+      Kokkos::parallel_reduce(
+          Kokkos::RangePolicy<execution_space>(0, da_size),
+          KOKKOS_LAMBDA(const int i, value_type& partial_sum) {
+            partial_sum += (value_type)da(i);
+          },
+          result_sum);
 
-      ASSERT_EQ(result_sum, (value_type)( da_size * (da_size - 1) / 2 ) );
+      ASSERT_EQ(result_sum, (value_type)(da_size * (da_size - 1) / 2));
 #endif
 #endif
 
@@ -158,99 +156,92 @@ struct TestDynamicView
       // the first 1/4 should remain the same
       unsigned da_resize = arg_total_size / 2;
       da.resize_serial(da_resize);
-      ASSERT_EQ( da.size(), da_resize );
+      ASSERT_EQ(da.size(), da_resize);
 
-#if defined( KOKKOS_ENABLE_CXX11_DISPATCH_LAMBDA )
-#if !defined(KOKKOS_ENABLE_CUDA) || ( 8000 <= CUDA_VERSION )
-      Kokkos::parallel_for( Kokkos::RangePolicy<execution_space>(da_size, da_resize), KOKKOS_LAMBDA ( const int i )
-          {
-          da(i) = Scalar(i);
-          }
-          );
+#if defined(KOKKOS_ENABLE_CXX11_DISPATCH_LAMBDA)
+#if !defined(KOKKOS_ENABLE_CUDA) || (8000 <= CUDA_VERSION)
+      Kokkos::parallel_for(
+          Kokkos::RangePolicy<execution_space>(da_size, da_resize),
+          KOKKOS_LAMBDA(const int i) { da(i) = Scalar(i); });
 
       value_type new_result_sum = 0.0;
-      Kokkos::parallel_reduce( Kokkos::RangePolicy<execution_space>(da_size, da_resize), KOKKOS_LAMBDA ( const int i, value_type& partial_sum )
-          {
-          partial_sum += (value_type)da(i);
-          }
-          , new_result_sum
-          );
+      Kokkos::parallel_reduce(
+          Kokkos::RangePolicy<execution_space>(da_size, da_resize),
+          KOKKOS_LAMBDA(const int i, value_type& partial_sum) {
+            partial_sum += (value_type)da(i);
+          },
+          new_result_sum);
 
-      ASSERT_EQ(new_result_sum+result_sum, (value_type)( da_resize * (da_resize - 1) / 2 ) );
+      ASSERT_EQ(new_result_sum + result_sum,
+                (value_type)(da_resize * (da_resize - 1) / 2));
 #endif
 #endif
-    } // end scope
+    }  // end scope
 
-    // Test: Create DynamicView, initialize size (via resize), run through parallel_for to set values, check values (via parallel_reduce); resize values and repeat
+    // Test: Create DynamicView, initialize size (via resize), run through
+    // parallel_for to set values, check values (via parallel_reduce); resize
+    // values and repeat
     //   Case 3: resize reduces the size
     {
-      view_type da("da", 1023, arg_total_size );
-      ASSERT_EQ( da.size(), 0 );
+      view_type da("da", 1023, arg_total_size);
+      ASSERT_EQ(da.size(), 0);
       // Init
       unsigned da_size = arg_total_size / 2;
       da.resize_serial(da_size);
-      ASSERT_EQ( da.size(), da_size );
+      ASSERT_EQ(da.size(), da_size);
 
-#if defined( KOKKOS_ENABLE_CXX11_DISPATCH_LAMBDA )
-#if !defined(KOKKOS_ENABLE_CUDA) || ( 8000 <= CUDA_VERSION )
-      Kokkos::parallel_for( Kokkos::RangePolicy<execution_space>(0, da_size), KOKKOS_LAMBDA ( const int i )
-          {
-          da(i) = Scalar(i);
-          }
-          );
+#if defined(KOKKOS_ENABLE_CXX11_DISPATCH_LAMBDA)
+#if !defined(KOKKOS_ENABLE_CUDA) || (8000 <= CUDA_VERSION)
+      Kokkos::parallel_for(
+          Kokkos::RangePolicy<execution_space>(0, da_size),
+          KOKKOS_LAMBDA(const int i) { da(i) = Scalar(i); });
 
       value_type result_sum = 0.0;
-      Kokkos::parallel_reduce( Kokkos::RangePolicy<execution_space>(0, da_size), KOKKOS_LAMBDA ( const int i, value_type& partial_sum )
-          {
-          partial_sum += (value_type)da(i);
-          }
-          , result_sum
-          );
+      Kokkos::parallel_reduce(
+          Kokkos::RangePolicy<execution_space>(0, da_size),
+          KOKKOS_LAMBDA(const int i, value_type& partial_sum) {
+            partial_sum += (value_type)da(i);
+          },
+          result_sum);
 
-      ASSERT_EQ(result_sum, (value_type)( da_size * (da_size - 1) / 2 ) );
+      ASSERT_EQ(result_sum, (value_type)(da_size * (da_size - 1) / 2));
 #endif
 #endif
 
       // remove the final 3/4 entries i.e. first 1/4 remain
       unsigned da_resize = arg_total_size / 8;
       da.resize_serial(da_resize);
-      ASSERT_EQ( da.size(), da_resize );
+      ASSERT_EQ(da.size(), da_resize);
 
-#if defined( KOKKOS_ENABLE_CXX11_DISPATCH_LAMBDA )
-#if !defined(KOKKOS_ENABLE_CUDA) || ( 8000 <= CUDA_VERSION )
-      Kokkos::parallel_for( Kokkos::RangePolicy<execution_space>(0, da_resize), KOKKOS_LAMBDA ( const int i )
-          {
-          da(i) = Scalar(i);
-          }
-          );
+#if defined(KOKKOS_ENABLE_CXX11_DISPATCH_LAMBDA)
+#if !defined(KOKKOS_ENABLE_CUDA) || (8000 <= CUDA_VERSION)
+      Kokkos::parallel_for(
+          Kokkos::RangePolicy<execution_space>(0, da_resize),
+          KOKKOS_LAMBDA(const int i) { da(i) = Scalar(i); });
 
       value_type new_result_sum = 0.0;
-      Kokkos::parallel_reduce( Kokkos::RangePolicy<execution_space>(0, da_resize), KOKKOS_LAMBDA ( const int i, value_type& partial_sum )
-          {
-          partial_sum += (value_type)da(i);
-          }
-          , new_result_sum
-          );
+      Kokkos::parallel_reduce(
+          Kokkos::RangePolicy<execution_space>(0, da_resize),
+          KOKKOS_LAMBDA(const int i, value_type& partial_sum) {
+            partial_sum += (value_type)da(i);
+          },
+          new_result_sum);
 
-      ASSERT_EQ(new_result_sum, (value_type)( da_resize * (da_resize - 1) / 2 ) );
+      ASSERT_EQ(new_result_sum, (value_type)(da_resize * (da_resize - 1) / 2));
 #endif
 #endif
-    } // end scope
-
+    }  // end scope
   }
 };
 
-TEST_F( TEST_CATEGORY , dynamic_view )
-{
-  typedef TestDynamicView< double , TEST_EXECSPACE >
-    TestDynView ;
+TEST(TEST_CATEGORY, dynamic_view) {
+  typedef TestDynamicView<double, TEST_EXECSPACE> TestDynView;
 
-  for ( int i = 0 ; i < 10 ; ++i ) {
-    TestDynView::run( 100000 + 100 * i );
+  for (int i = 0; i < 10; ++i) {
+    TestDynView::run(100000 + 100 * i);
   }
 }
 
-} // namespace Test
+}  // namespace Test
 
 #endif /* #ifndef KOKKOS_TEST_DYNAMICVIEW_HPP */
-
diff --git a/lib/kokkos/containers/unit_tests/TestErrorReporter.hpp b/lib/kokkos/containers/unit_tests/TestErrorReporter.hpp
index 7e48089b43..49b71cdea7 100644
--- a/lib/kokkos/containers/unit_tests/TestErrorReporter.hpp
+++ b/lib/kokkos/containers/unit_tests/TestErrorReporter.hpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -51,47 +52,47 @@
 
 namespace Test {
 
-// Just save the data in the report.  Informative text goies in the operator<<(..).
+// Just save the data in the report.  Informative text goies in the
+// operator<<(..).
 template <typename DataType1, typename DataType2, typename DataType3>
-struct ThreeValReport
-{
+struct ThreeValReport {
   DataType1 m_data1;
   DataType2 m_data2;
   DataType3 m_data3;
-
 };
 
 template <typename DataType1, typename DataType2, typename DataType3>
-std::ostream &operator<<(std::ostream & os, const ThreeValReport<DataType1, DataType2, DataType3> &val)
-{
-  return os << "{" << val.m_data1 << " " << val.m_data2 << " " << val.m_data3 << "}";
+std::ostream &operator<<(
+    std::ostream &os,
+    const ThreeValReport<DataType1, DataType2, DataType3> &val) {
+  return os << "{" << val.m_data1 << " " << val.m_data2 << " " << val.m_data3
+            << "}";
 }
 
-template<typename ReportType>
+template <typename ReportType>
 void checkReportersAndReportsAgree(const std::vector<int> &reporters,
-                                   const std::vector<ReportType> &reports)
-{
+                                   const std::vector<ReportType> &reports) {
   for (size_t i = 0; i < reports.size(); ++i) {
     EXPECT_EQ(1, reporters[i] % 2);
     EXPECT_EQ(reporters[i], reports[i].m_data1);
   }
 }
 
-
 template <typename DeviceType>
 struct ErrorReporterDriverBase {
-
-  typedef ThreeValReport<int, int, double>                                      report_type;
-  typedef Kokkos::Experimental::ErrorReporter<report_type, DeviceType>  error_reporter_type;
+  typedef ThreeValReport<int, int, double> report_type;
+  typedef Kokkos::Experimental::ErrorReporter<report_type, DeviceType>
+      error_reporter_type;
   error_reporter_type m_errorReporter;
 
   ErrorReporterDriverBase(int reporter_capacity, int test_size)
-    : m_errorReporter(reporter_capacity)  {  }
+      : m_errorReporter(reporter_capacity) {}
 
-  KOKKOS_INLINE_FUNCTION bool error_condition(const int work_idx) const { return (work_idx % 2 != 0); }
+  KOKKOS_INLINE_FUNCTION bool error_condition(const int work_idx) const {
+    return (work_idx % 2 != 0);
+  }
 
-  void check_expectations(int reporter_capacity, int test_size)
-  {
+  void check_expectations(int reporter_capacity, int test_size) {
     int num_reported = m_errorReporter.getNumReports();
     int num_attempts = m_errorReporter.getNumReportAttempts();
 
@@ -99,15 +100,14 @@ struct ErrorReporterDriverBase {
     EXPECT_EQ(expected_num_reports, num_reported);
     EXPECT_EQ(test_size / 2, num_attempts);
 
-    bool expect_full = (reporter_capacity <= (test_size / 2));
+    bool expect_full   = (reporter_capacity <= (test_size / 2));
     bool reported_full = m_errorReporter.full();
     EXPECT_EQ(expect_full, reported_full);
   }
 };
 
 template <typename ErrorReporterDriverType>
-void TestErrorReporter()
-{
+void TestErrorReporter() {
   typedef ErrorReporterDriverType tester_type;
   std::vector<int> reporters;
   std::vector<typename tester_type::report_type> reports;
@@ -120,9 +120,12 @@ void TestErrorReporter()
   test2.m_errorReporter.getReports(reporters, reports);
   checkReportersAndReportsAgree(reporters, reports);
 
-  typename Kokkos::View<int*, typename ErrorReporterDriverType::execution_space >::HostMirror view_reporters;
-  typename Kokkos::View<typename tester_type::report_type*, typename ErrorReporterDriverType::execution_space >::HostMirror
-     view_reports;
+  typename Kokkos::View<
+      int *, typename ErrorReporterDriverType::execution_space>::HostMirror
+      view_reporters;
+  typename Kokkos::View<typename tester_type::report_type *,
+                        typename ErrorReporterDriverType::execution_space>::
+      HostMirror view_reports;
   test2.m_errorReporter.getReports(view_reporters, view_reports);
 
   int num_reports = view_reporters.extent(0);
@@ -136,19 +139,16 @@ void TestErrorReporter()
     reports.push_back(view_reports(i));
   }
   checkReportersAndReportsAgree(reporters, reports);
-
 }
 
-
 template <typename DeviceType>
-struct ErrorReporterDriver : public ErrorReporterDriverBase<DeviceType>
-{
-  typedef ErrorReporterDriverBase<DeviceType>                             driver_base;
-  typedef typename driver_base::error_reporter_type::execution_space  execution_space;
+struct ErrorReporterDriver : public ErrorReporterDriverBase<DeviceType> {
+  typedef ErrorReporterDriverBase<DeviceType> driver_base;
+  typedef typename driver_base::error_reporter_type::execution_space
+      execution_space;
 
   ErrorReporterDriver(int reporter_capacity, int test_size)
-    : driver_base(reporter_capacity, test_size)
-  {
+      : driver_base(reporter_capacity, test_size) {
     execute(reporter_capacity, test_size);
 
     // Test that clear() and resize() work across memory spaces.
@@ -159,19 +159,18 @@ struct ErrorReporterDriver : public ErrorReporterDriverBase<DeviceType>
     }
   }
 
-  void execute(int reporter_capacity, int test_size)
-  {
-    Kokkos::parallel_for(Kokkos::RangePolicy<execution_space>(0,test_size), *this);
+  void execute(int reporter_capacity, int test_size) {
+    Kokkos::parallel_for(Kokkos::RangePolicy<execution_space>(0, test_size),
+                         *this);
     Kokkos::fence();
     driver_base::check_expectations(reporter_capacity, test_size);
   }
 
   KOKKOS_INLINE_FUNCTION
-  void operator()(const int work_idx) const
-  {
+  void operator()(const int work_idx) const {
     if (driver_base::error_condition(work_idx)) {
       double val = M_PI * static_cast<double>(work_idx);
-      typename driver_base::report_type report = {work_idx, -2*work_idx, val};
+      typename driver_base::report_type report = {work_idx, -2 * work_idx, val};
       driver_base::m_errorReporter.add_report(work_idx, report);
     }
   }
@@ -179,45 +178,45 @@ struct ErrorReporterDriver : public ErrorReporterDriverBase<DeviceType>
 
 #if defined(KOKKOS_CLASS_LAMBDA)
 template <typename DeviceType>
-struct ErrorReporterDriverUseLambda : public ErrorReporterDriverBase<DeviceType>
-{
-
-  typedef ErrorReporterDriverBase<DeviceType>                             driver_base;
-  typedef typename driver_base::error_reporter_type::execution_space  execution_space;
+struct ErrorReporterDriverUseLambda
+    : public ErrorReporterDriverBase<DeviceType> {
+  typedef ErrorReporterDriverBase<DeviceType> driver_base;
+  typedef typename driver_base::error_reporter_type::execution_space
+      execution_space;
 
   ErrorReporterDriverUseLambda(int reporter_capacity, int test_size)
-    : driver_base(reporter_capacity, test_size)
-  {
-    Kokkos::parallel_for(Kokkos::RangePolicy<execution_space>(0,test_size), KOKKOS_CLASS_LAMBDA (const int work_idx) {
-      if (driver_base::error_condition(work_idx)) {
-        double val = M_PI * static_cast<double>(work_idx);
-        typename driver_base::report_type report = {work_idx, -2*work_idx, val};
-        driver_base::m_errorReporter.add_report(work_idx, report);
-      }
-    });
+      : driver_base(reporter_capacity, test_size) {
+    Kokkos::parallel_for(
+        Kokkos::RangePolicy<execution_space>(0, test_size),
+        KOKKOS_CLASS_LAMBDA(const int work_idx) {
+          if (driver_base::error_condition(work_idx)) {
+            double val = M_PI * static_cast<double>(work_idx);
+            typename driver_base::report_type report = {work_idx, -2 * work_idx,
+                                                        val};
+            driver_base::m_errorReporter.add_report(work_idx, report);
+          }
+        });
     Kokkos::fence();
     driver_base::check_expectations(reporter_capacity, test_size);
   }
-
 };
 #endif
 
-
 #ifdef KOKKOS_ENABLE_OPENMP
-struct ErrorReporterDriverNativeOpenMP : public ErrorReporterDriverBase<Kokkos::OpenMP>
-{
-  typedef ErrorReporterDriverBase<Kokkos::OpenMP>  driver_base;
-  typedef typename driver_base::error_reporter_type::execution_space  execution_space;
+struct ErrorReporterDriverNativeOpenMP
+    : public ErrorReporterDriverBase<Kokkos::OpenMP> {
+  typedef ErrorReporterDriverBase<Kokkos::OpenMP> driver_base;
+  typedef typename driver_base::error_reporter_type::execution_space
+      execution_space;
 
   ErrorReporterDriverNativeOpenMP(int reporter_capacity, int test_size)
-    : driver_base(reporter_capacity, test_size)
-  {
+      : driver_base(reporter_capacity, test_size) {
 #pragma omp parallel for
-    for(int work_idx = 0; work_idx < test_size; ++work_idx)
-    {
+    for (int work_idx = 0; work_idx < test_size; ++work_idx) {
       if (driver_base::error_condition(work_idx)) {
         double val = M_PI * static_cast<double>(work_idx);
-        typename driver_base::report_type report = {work_idx, -2*work_idx, val};
+        typename driver_base::report_type report = {work_idx, -2 * work_idx,
+                                                    val};
         driver_base::m_errorReporter.add_report(work_idx, report);
       }
     };
@@ -227,17 +226,14 @@ struct ErrorReporterDriverNativeOpenMP : public ErrorReporterDriverBase<Kokkos::
 #endif
 
 #if defined(KOKKOS_CLASS_LAMBDA)
-TEST_F(TEST_CATEGORY, ErrorReporterViaLambda)
-{
+TEST(TEST_CATEGORY, ErrorReporterViaLambda) {
   TestErrorReporter<ErrorReporterDriverUseLambda<TEST_EXECSPACE>>();
 }
 #endif
 
-TEST_F(TEST_CATEGORY, ErrorReporter)
-{
+TEST(TEST_CATEGORY, ErrorReporter) {
   TestErrorReporter<ErrorReporterDriver<TEST_EXECSPACE>>();
 }
 
-} // namespace Test
-#endif // #ifndef KOKKOS_TEST_ERROR_REPORTING_HPP
-
+}  // namespace Test
+#endif  // #ifndef KOKKOS_TEST_ERROR_REPORTING_HPP
diff --git a/lib/kokkos/containers/unit_tests/TestOffsetView.hpp b/lib/kokkos/containers/unit_tests/TestOffsetView.hpp
index 6965199d45..12bcda9524 100644
--- a/lib/kokkos/containers/unit_tests/TestOffsetView.hpp
+++ b/lib/kokkos/containers/unit_tests/TestOffsetView.hpp
@@ -1,10 +1,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -22,10 +23,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -45,8 +46,6 @@
 #ifndef CONTAINERS_UNIT_TESTS_TESTOFFSETVIEW_HPP_
 #define CONTAINERS_UNIT_TESTS_TESTOFFSETVIEW_HPP_
 
-
-
 #include <gtest/gtest.h>
 #include <iostream>
 #include <cstdlib>
@@ -55,372 +54,652 @@
 #include <Kokkos_OffsetView.hpp>
 #include <KokkosExp_MDRangePolicy.hpp>
 
-using std::endl;
 using std::cout;
+using std::endl;
 
-namespace Test{
+namespace Test {
 
-   template <typename Scalar, typename Device>
-   void test_offsetview_construction(unsigned int size)
-   {
+template <typename Scalar, typename Device>
+void test_offsetview_construction(unsigned int size) {
+  typedef Kokkos::Experimental::OffsetView<Scalar**, Device> offset_view_type;
+  typedef Kokkos::View<Scalar**, Device> view_type;
 
-      typedef Kokkos::Experimental::OffsetView<Scalar**, Device> offset_view_type;
-      typedef Kokkos::View<Scalar**, Device> view_type;
+  Kokkos::Experimental::index_list_type range0 = {-1, 3};
+  Kokkos::Experimental::index_list_type range1 = {-2, 2};
 
-      Kokkos::Experimental::index_list_type range0 = {-1, 3};
-      Kokkos::Experimental::index_list_type range1 = {-2, 2};
+  offset_view_type ov("firstOV", range0, range1);
 
-      offset_view_type ov("firstOV", range0, range1);
+  ASSERT_EQ("firstOV", ov.label());
+  ASSERT_EQ(2, ov.Rank);
 
-      ASSERT_EQ("firstOV", ov.label());
-      ASSERT_EQ(2, ov.Rank);
+  ASSERT_EQ(ov.begin(0), -1);
+  ASSERT_EQ(ov.end(0), 4);
 
-      ASSERT_EQ(ov.begin(0), -1);
-      ASSERT_EQ(ov.end(0), 4);
+  ASSERT_EQ(ov.begin(1), -2);
+  ASSERT_EQ(ov.end(1), 3);
 
-      ASSERT_EQ(ov.begin(1), -2);
-      ASSERT_EQ(ov.end(1), 3);
-
-      ASSERT_EQ(ov.extent(0), 5);
-      ASSERT_EQ(ov.extent(1), 5);
-
-      const int ovmin0 = ov.begin(0);
-      const int ovend0 = ov.end(0);
-      const int ovmin1 = ov.begin(1);
-      const int ovend1 = ov.end(1);
+  ASSERT_EQ(ov.extent(0), 5);
+  ASSERT_EQ(ov.extent(1), 5);
 
 #if defined(KOKKOS_ENABLE_CUDA_LAMBDA) || !defined(KOKKOS_ENABLE_CUDA)
-      {
-         Kokkos::Experimental::OffsetView<Scalar*, Device> offsetV1("OneDOffsetView", range0);
+  const int ovmin0 = ov.begin(0);
+  const int ovend0 = ov.end(0);
+  const int ovmin1 = ov.begin(1);
+  const int ovend1 = ov.end(1);
+  {
+    Kokkos::Experimental::OffsetView<Scalar*, Device> offsetV1("OneDOffsetView",
+                                                               range0);
 
-         Kokkos::RangePolicy<Device, int> rangePolicy1(offsetV1.begin(0), offsetV1.end(0));
-         Kokkos::parallel_for(rangePolicy1, KOKKOS_LAMBDA (const int i){
-            offsetV1(i) = 1;
-         }
-         );
-	 Kokkos::fence();
+    Kokkos::RangePolicy<Device, int> rangePolicy1(offsetV1.begin(0),
+                                                  offsetV1.end(0));
+    Kokkos::parallel_for(
+        rangePolicy1, KOKKOS_LAMBDA(const int i) { offsetV1(i) = 1; });
+    Kokkos::fence();
 
-         int OVResult = 0;
-         Kokkos::parallel_reduce(rangePolicy1, KOKKOS_LAMBDA(const int i, int & updateMe){
-            updateMe += offsetV1(i);
-         }, OVResult);
-	 
-	 Kokkos::fence();
-         ASSERT_EQ(OVResult, offsetV1.end(0) - offsetV1.begin(0)) << "found wrong number of elements in OffsetView that was summed.";
+    int OVResult = 0;
+    Kokkos::parallel_reduce(
+        rangePolicy1,
+        KOKKOS_LAMBDA(const int i, int& updateMe) { updateMe += offsetV1(i); },
+        OVResult);
 
+    Kokkos::fence();
+    ASSERT_EQ(OVResult, offsetV1.end(0) - offsetV1.begin(0))
+        << "found wrong number of elements in OffsetView that was summed.";
+  }
+  {  // test deep copy of scalar const value into mirro
+    const int constVal = 6;
+    typename offset_view_type::HostMirror hostOffsetView =
+        Kokkos::Experimental::create_mirror_view(ov);
+
+    Kokkos::Experimental::deep_copy(hostOffsetView, constVal);
+
+    for (int i = hostOffsetView.begin(0); i < hostOffsetView.end(0); ++i) {
+      for (int j = hostOffsetView.begin(1); j < hostOffsetView.end(1); ++j) {
+        ASSERT_EQ(hostOffsetView(i, j), constVal)
+            << "Bad data found in OffsetView";
       }
-      {  //test deep copy of scalar const value into mirro
-         const int constVal = 6;
-         typename offset_view_type::HostMirror hostOffsetView =
-               Kokkos::Experimental::create_mirror_view(ov);
+    }
+  }
 
-         Kokkos::Experimental::deep_copy(hostOffsetView, constVal);
+  typedef Kokkos::MDRangePolicy<Device, Kokkos::Rank<2>,
+                                Kokkos::IndexType<int> >
+      range_type;
+  typedef typename range_type::point_type point_type;
 
-         for(int i = hostOffsetView.begin(0); i < hostOffsetView.end(0); ++i) {
-            for(int j = hostOffsetView.begin(1); j < hostOffsetView.end(1); ++j) {
-               ASSERT_EQ(hostOffsetView(i,j),  constVal) << "Bad data found in OffsetView";
-            }
-         }
-      }
+  range_type rangePolicy2D(point_type{{ovmin0, ovmin1}},
+                           point_type{{ovend0, ovend1}});
 
-      typedef Kokkos::MDRangePolicy<Device, Kokkos::Rank<2>, Kokkos::IndexType<int> > range_type;
+  const int constValue = 9;
+  Kokkos::parallel_for(
+      rangePolicy2D,
+      KOKKOS_LAMBDA(const int i, const int j) { ov(i, j) = constValue; });
+
+  // test offsetview to offsetviewmirror deep copy
+  typename offset_view_type::HostMirror hostOffsetView =
+      Kokkos::Experimental::create_mirror_view(ov);
+
+  Kokkos::Experimental::deep_copy(hostOffsetView, ov);
+
+  for (int i = hostOffsetView.begin(0); i < hostOffsetView.end(0); ++i) {
+    for (int j = hostOffsetView.begin(1); j < hostOffsetView.end(1); ++j) {
+      ASSERT_EQ(hostOffsetView(i, j), constValue)
+          << "Bad data found in OffsetView";
+    }
+  }
+
+  int OVResult = 0;
+  Kokkos::parallel_reduce(
+      rangePolicy2D,
+      KOKKOS_LAMBDA(const int i, const int j, int& updateMe) {
+        updateMe += ov(i, j);
+      },
+      OVResult);
+
+  int answer = 0;
+  for (int i = ov.begin(0); i < ov.end(0); ++i) {
+    for (int j = ov.begin(1); j < ov.end(1); ++j) {
+      answer += constValue;
+    }
+  }
+
+  ASSERT_EQ(OVResult, answer) << "Bad data found in OffsetView";
+#endif
+
+  {
+    offset_view_type ovCopy(ov);
+    ASSERT_EQ(ovCopy == ov, true)
+        << "Copy constructor or equivalence operator broken";
+  }
+
+  {
+    offset_view_type ovAssigned = ov;
+    ASSERT_EQ(ovAssigned == ov, true)
+        << "Assignment operator or equivalence operator broken";
+  }
+
+  {  // construct OffsetView from a View plus begins array
+    const int extent0 = 100;
+    const int extent1 = 200;
+    const int extent2 = 300;
+    Kokkos::View<Scalar***, Device> view3D("view3D", extent0, extent1, extent2);
+
+    Kokkos::deep_copy(view3D, 1);
+
+    Kokkos::Array<int64_t, 3> begins = {{-10, -20, -30}};
+    Kokkos::Experimental::OffsetView<Scalar***, Device> offsetView3D(view3D,
+                                                                     begins);
+
+    typedef Kokkos::MDRangePolicy<Device, Kokkos::Rank<3>,
+                                  Kokkos::IndexType<int64_t> >
+        range3_type;
+    typedef typename range3_type::point_type point3_type;
+
+    range3_type rangePolicy3DZero(point3_type{{0, 0, 0}},
+                                  point3_type{{extent0, extent1, extent2}});
+
+#if defined(KOKKOS_ENABLE_CUDA_LAMBDA) || !defined(KOKKOS_ENABLE_CUDA)
+    int view3DSum = 0;
+    Kokkos::parallel_reduce(
+        rangePolicy3DZero,
+        KOKKOS_LAMBDA(const int i, const int j, int k, int& updateMe) {
+          updateMe += view3D(i, j, k);
+        },
+        view3DSum);
+
+    range3_type rangePolicy3D(
+        point3_type{{begins[0], begins[1], begins[2]}},
+        point3_type{
+            {begins[0] + extent0, begins[1] + extent1, begins[2] + extent2}});
+    int offsetView3DSum = 0;
+
+    Kokkos::parallel_reduce(
+        rangePolicy3D,
+        KOKKOS_LAMBDA(const int i, const int j, int k, int& updateMe) {
+          updateMe += offsetView3D(i, j, k);
+        },
+        offsetView3DSum);
+
+    ASSERT_EQ(view3DSum, offsetView3DSum)
+        << "construction of OffsetView from View and begins array broken.";
+#endif
+  }
+  view_type viewFromOV = ov.view();
+
+  ASSERT_EQ(viewFromOV == ov, true)
+      << "OffsetView::view() or equivalence operator View == OffsetView broken";
+
+  {
+    offset_view_type ovFromV(viewFromOV, {-1, -2});
+
+    ASSERT_EQ(ovFromV == viewFromOV, true)
+        << "Construction of OffsetView from View or equivalence operator "
+           "OffsetView == View broken";
+  }
+  {
+    offset_view_type ovFromV = viewFromOV;
+    ASSERT_EQ(ovFromV == viewFromOV, true)
+        << "Construction of OffsetView from View by assignment (implicit "
+           "conversion) or equivalence operator OffsetView == View broken";
+  }
+
+  {  // test offsetview to view deep copy
+    view_type aView("aView", ov.extent(0), ov.extent(1));
+    Kokkos::Experimental::deep_copy(aView, ov);
+
+#if defined(KOKKOS_ENABLE_CUDA_LAMBDA) || !defined(KOKKOS_ENABLE_CUDA)
+    int sum = 0;
+    Kokkos::parallel_reduce(
+        rangePolicy2D,
+        KOKKOS_LAMBDA(const int i, const int j, int& updateMe) {
+          updateMe += ov(i, j) - aView(i - ov.begin(0), j - ov.begin(1));
+        },
+        sum);
+
+    ASSERT_EQ(sum, 0) << "deep_copy(view, offsetView) broken.";
+#endif
+  }
+
+  {  // test view to  offsetview deep copy
+    view_type aView("aView", ov.extent(0), ov.extent(1));
+
+    Kokkos::deep_copy(aView, 99);
+    Kokkos::Experimental::deep_copy(ov, aView);
+
+#if defined(KOKKOS_ENABLE_CUDA_LAMBDA) || !defined(KOKKOS_ENABLE_CUDA)
+    int sum = 0;
+    Kokkos::parallel_reduce(
+        rangePolicy2D,
+        KOKKOS_LAMBDA(const int i, const int j, int& updateMe) {
+          updateMe += ov(i, j) - aView(i - ov.begin(0), j - ov.begin(1));
+        },
+        sum);
+
+    ASSERT_EQ(sum, 0) << "deep_copy(offsetView, view) broken.";
+#endif
+  }
+}
+
+template <typename Scalar, typename Device>
+void test_offsetview_unmanaged_construction() {
+  // Preallocated memory (Only need a valid address for this test)
+  Scalar s;
+
+  {
+    // Constructing an OffsetView directly around our preallocated memory
+    Kokkos::Array<int64_t, 1> begins1{{2}};
+    Kokkos::Array<int64_t, 1> ends1{{3}};
+    Kokkos::Experimental::OffsetView<Scalar*, Device> ov1(&s, begins1, ends1);
+
+    // Constructing an OffsetView around an unmanaged View of our preallocated
+    // memory
+    Kokkos::View<Scalar*, Device> v1(&s, ends1[0] - begins1[0]);
+    Kokkos::Experimental::OffsetView<Scalar*, Device> ovv1(v1, begins1);
+
+    // They should match
+    ASSERT_EQ(ovv1, ov1)
+        << "OffsetView unmanaged construction fails for rank 1";
+  }
+
+  {
+    Kokkos::Array<int64_t, 2> begins2{{-2, -7}};
+    Kokkos::Array<int64_t, 2> ends2{{5, -3}};
+    Kokkos::Experimental::OffsetView<Scalar**, Device> ov2(&s, begins2, ends2);
+
+    Kokkos::View<Scalar**, Device> v2(&s, ends2[0] - begins2[0],
+                                      ends2[1] - begins2[1]);
+    Kokkos::Experimental::OffsetView<Scalar**, Device> ovv2(v2, begins2);
+
+    ASSERT_EQ(ovv2, ov2)
+        << "OffsetView unmanaged construction fails for rank 2";
+  }
+
+  {
+    Kokkos::Array<int64_t, 3> begins3{{2, 3, 5}};
+    Kokkos::Array<int64_t, 3> ends3{{7, 11, 13}};
+    Kokkos::Experimental::OffsetView<Scalar***, Device> ovv3(&s, begins3,
+                                                             ends3);
+
+    Kokkos::View<Scalar***, Device> v3(&s, ends3[0] - begins3[0],
+                                       ends3[1] - begins3[1],
+                                       ends3[2] - begins3[2]);
+    Kokkos::Experimental::OffsetView<Scalar***, Device> ov3(v3, begins3);
+
+    ASSERT_EQ(ovv3, ov3)
+        << "OffsetView unmanaged construction fails for rank 3";
+  }
+
+  {
+    // Test all four public constructor overloads (begins_type x
+    // index_list_type)
+    Kokkos::Array<int64_t, 1> begins{{-3}};
+    Kokkos::Array<int64_t, 1> ends{{2}};
+
+    Kokkos::Experimental::OffsetView<Scalar*, Device> bb(&s, begins, ends);
+    Kokkos::Experimental::OffsetView<Scalar*, Device> bi(&s, begins, {2});
+    Kokkos::Experimental::OffsetView<Scalar*, Device> ib(&s, {-3}, ends);
+    Kokkos::Experimental::OffsetView<Scalar*, Device> ii(&s, {-3}, {2});
+
+    ASSERT_EQ(bb, bi);
+    ASSERT_EQ(bb, ib);
+    ASSERT_EQ(bb, ii);
+  }
+
+#ifdef KOKKOS_ACTIVE_EXECUTION_MEMORY_SPACE_HOST
+  {
+    using offset_view_type = Kokkos::Experimental::OffsetView<Scalar*, Device>;
+
+    // Range calculations must be positive
+    ASSERT_NO_THROW(offset_view_type(&s, {0}, {1}));
+    ASSERT_NO_THROW(offset_view_type(&s, {0}, {0}));
+    ASSERT_THROW(offset_view_type(&s, {0}, {-1}), std::runtime_error);
+  }
+
+  {
+    using offset_view_type = Kokkos::Experimental::OffsetView<Scalar*, Device>;
+
+    // Range calculations must not overflow
+    ASSERT_NO_THROW(offset_view_type(&s, {0}, {0x7fffffffffffffffl}));
+    ASSERT_THROW(offset_view_type(&s, {-1}, {0x7fffffffffffffffl}),
+                 std::runtime_error);
+    ASSERT_THROW(
+        offset_view_type(&s, {-0x7fffffffffffffffl - 1}, {0x7fffffffffffffffl}),
+        std::runtime_error);
+    ASSERT_THROW(offset_view_type(&s, {-0x7fffffffffffffffl - 1}, {0}),
+                 std::runtime_error);
+  }
+
+  {
+    using offset_view_type = Kokkos::Experimental::OffsetView<Scalar**, Device>;
+
+    // Should throw when the rank of begins and/or ends doesn't match that of
+    // OffsetView
+    ASSERT_THROW(offset_view_type(&s, {0}, {1}), std::runtime_error);
+    ASSERT_THROW(offset_view_type(&s, {0}, {1, 1}), std::runtime_error);
+    ASSERT_THROW(offset_view_type(&s, {0}, {1, 1, 1}), std::runtime_error);
+    ASSERT_THROW(offset_view_type(&s, {0, 0}, {1}), std::runtime_error);
+    ASSERT_NO_THROW(offset_view_type(&s, {0, 0}, {1, 1}));
+    ASSERT_THROW(offset_view_type(&s, {0, 0}, {1, 1, 1}), std::runtime_error);
+    ASSERT_THROW(offset_view_type(&s, {0, 0, 0}, {1}), std::runtime_error);
+    ASSERT_THROW(offset_view_type(&s, {0, 0, 0}, {1, 1}), std::runtime_error);
+    ASSERT_THROW(offset_view_type(&s, {0, 0, 0}, {1, 1, 1}),
+                 std::runtime_error);
+  }
+#endif  // KOKKOS_ACTIVE_EXECUTION_MEMORY_SPACE_HOST
+}
+
+template <typename Scalar, typename Device>
+void test_offsetview_subview(unsigned int size) {
+  {  // test subview 1
+    Kokkos::Experimental::OffsetView<Scalar*, Device> sliceMe("offsetToSlice",
+                                                              {-10, 20});
+    {
+      auto offsetSubviewa = Kokkos::Experimental::subview(sliceMe, 0);
+      ASSERT_EQ(offsetSubviewa.Rank, 0) << "subview of offset is broken.";
+    }
+  }
+  {  // test subview 2
+    Kokkos::Experimental::OffsetView<Scalar**, Device> sliceMe(
+        "offsetToSlice", {-10, 20}, {-20, 30});
+    {
+      auto offsetSubview =
+          Kokkos::Experimental::subview(sliceMe, Kokkos::ALL(), -2);
+      ASSERT_EQ(offsetSubview.Rank, 1) << "subview of offset is broken.";
+    }
+
+    {
+      auto offsetSubview =
+          Kokkos::Experimental::subview(sliceMe, 0, Kokkos::ALL());
+      ASSERT_EQ(offsetSubview.Rank, 1) << "subview of offset is broken.";
+    }
+  }
+
+  {  // test subview rank 3
+
+    Kokkos::Experimental::OffsetView<Scalar***, Device> sliceMe(
+        "offsetToSlice", {-10, 20}, {-20, 30}, {-30, 40});
+
+    // slice 1
+    {
+      auto offsetSubview = Kokkos::Experimental::subview(sliceMe, Kokkos::ALL(),
+                                                         Kokkos::ALL(), 0);
+      ASSERT_EQ(offsetSubview.Rank, 2) << "subview of offset is broken.";
+    }
+    {
+      auto offsetSubview = Kokkos::Experimental::subview(sliceMe, Kokkos::ALL(),
+                                                         0, Kokkos::ALL());
+      ASSERT_EQ(offsetSubview.Rank, 2) << "subview of offset is broken.";
+    }
+
+    {
+      auto offsetSubview = Kokkos::Experimental::subview(
+          sliceMe, 0, Kokkos::ALL(), Kokkos::ALL());
+      ASSERT_EQ(offsetSubview.Rank, 2) << "subview of offset is broken.";
+    }
+    {
+      auto offsetSubview = Kokkos::Experimental::subview(
+          sliceMe, 0, Kokkos::ALL(), Kokkos::make_pair(-30, -21));
+      ASSERT_EQ(offsetSubview.Rank, 2) << "subview of offset is broken.";
+
+      ASSERT_EQ(offsetSubview.begin(0), -20);
+      ASSERT_EQ(offsetSubview.end(0), 31);
+      ASSERT_EQ(offsetSubview.begin(1), 0);
+      ASSERT_EQ(offsetSubview.end(1), 9);
+
+#if defined(KOKKOS_ENABLE_CUDA_LAMBDA) || !defined(KOKKOS_ENABLE_CUDA)
+      typedef Kokkos::MDRangePolicy<Device, Kokkos::Rank<2>,
+                                    Kokkos::IndexType<int> >
+          range_type;
       typedef typename range_type::point_type point_type;
 
-      range_type rangePolicy2D(point_type{ {ovmin0, ovmin1 } },
-            point_type{ { ovend0, ovend1 } });
+      const int b0 = offsetSubview.begin(0);
+      const int b1 = offsetSubview.begin(1);
 
-      const int constValue = 9;
-      Kokkos::parallel_for(rangePolicy2D, KOKKOS_LAMBDA (const int i, const int j) {
-         ov(i,j) =  constValue;
-      }
-      );
-      
-      //test offsetview to offsetviewmirror deep copy
-      typename offset_view_type::HostMirror hostOffsetView =
-            Kokkos::Experimental::create_mirror_view(ov);
+      const int e0 = offsetSubview.end(0);
+      const int e1 = offsetSubview.end(1);
 
-      Kokkos::Experimental::deep_copy(hostOffsetView, ov);
+      range_type rangeP2D(point_type{{b0, b1}}, point_type{{e0, e1}});
 
-      for(int i = hostOffsetView.begin(0); i < hostOffsetView.end(0); ++i) {
-         for(int j = hostOffsetView.begin(1); j < hostOffsetView.end(1); ++j) {
-            ASSERT_EQ(hostOffsetView(i,j),  constValue) << "Bad data found in OffsetView";
-         }
-      }
-      
-     int OVResult = 0;
-      Kokkos::parallel_reduce(rangePolicy2D, KOKKOS_LAMBDA(const int i, const int j, int & updateMe){
-         updateMe += ov(i, j);
-      }, OVResult);
+      Kokkos::parallel_for(
+          rangeP2D,
+          KOKKOS_LAMBDA(const int i, const int j) { offsetSubview(i, j) = 6; });
 
-      int answer = 0;
-      for(int i = ov.begin(0); i < ov.end(0); ++i) {
-         for(int j = ov.begin(1); j < ov.end(1); ++j) {
-            answer += constValue;
-         }
-      }
-      
-      ASSERT_EQ(OVResult, answer) << "Bad data found in OffsetView";
+      int sum = 0;
+      Kokkos::parallel_reduce(
+          rangeP2D,
+          KOKKOS_LAMBDA(const int i, const int j, int& updateMe) {
+            updateMe += offsetSubview(i, j);
+          },
+          sum);
+
+      ASSERT_EQ(sum, 6 * (e0 - b0) * (e1 - b1));
 #endif
+    }
 
-      {
-         offset_view_type ovCopy(ov);
-         ASSERT_EQ(ovCopy==ov, true) <<
-               "Copy constructor or equivalence operator broken";
-      }
-      
-      {
-         offset_view_type ovAssigned = ov;
-         ASSERT_EQ(ovAssigned==ov, true) <<
-               "Assignment operator or equivalence operator broken";
-      }
-      
-      {  //construct OffsetView from a View plus begins array
-         const int extent0 = 100;
-         const int extent1 = 200;
-         const int extent2 = 300;
-         Kokkos::View<Scalar***, Device> view3D("view3D", extent0, extent1, extent2);
+    // slice 2
+    {
+      auto offsetSubview =
+          Kokkos::Experimental::subview(sliceMe, Kokkos::ALL(), 0, 0);
+      ASSERT_EQ(offsetSubview.Rank, 1) << "subview of offset is broken.";
+    }
+    {
+      auto offsetSubview =
+          Kokkos::Experimental::subview(sliceMe, 0, 0, Kokkos::ALL());
+      ASSERT_EQ(offsetSubview.Rank, 1) << "subview of offset is broken.";
+    }
 
-         Kokkos::deep_copy(view3D, 1);
+    {
+      auto offsetSubview =
+          Kokkos::Experimental::subview(sliceMe, 0, Kokkos::ALL(), 0);
+      ASSERT_EQ(offsetSubview.Rank, 1) << "subview of offset is broken.";
+    }
+  }
 
-         Kokkos::Array<int64_t,3> begins = {{-10, -20, -30}};
-         Kokkos::Experimental::OffsetView<Scalar***, Device> offsetView3D(view3D, begins);
+  {  // test subview rank 4
 
-         typedef Kokkos::MDRangePolicy<Device, Kokkos::Rank<3>, Kokkos::IndexType<int64_t> > range3_type;
-         typedef typename range3_type::point_type point3_type;
+    Kokkos::Experimental::OffsetView<Scalar****, Device> sliceMe(
+        "offsetToSlice", {-10, 20}, {-20, 30}, {-30, 40}, {-40, 50});
 
-         range3_type rangePolicy3DZero(point3_type{ {0, 0, 0 } },
-               point3_type{ { extent0, extent1, extent2 } });
+    // slice 1
+    {
+      auto offsetSubview = Kokkos::Experimental::subview(
+          sliceMe, Kokkos::ALL(), Kokkos::ALL(), Kokkos::ALL(), 0);
+      ASSERT_EQ(offsetSubview.Rank, 3) << "subview of offset is broken.";
+    }
+    {
+      auto offsetSubview = Kokkos::Experimental::subview(
+          sliceMe, Kokkos::ALL(), Kokkos::ALL(), 0, Kokkos::ALL());
+      ASSERT_EQ(offsetSubview.Rank, 3) << "subview of offset is broken.";
+    }
+    {
+      auto offsetSubview = Kokkos::Experimental::subview(
+          sliceMe, Kokkos::ALL(), 0, Kokkos::ALL(), Kokkos::ALL());
+      ASSERT_EQ(offsetSubview.Rank, 3) << "subview of offset is broken.";
+    }
+    {
+      auto offsetSubview = Kokkos::Experimental::subview(
+          sliceMe, 0, Kokkos::ALL(), Kokkos::ALL(), Kokkos::ALL());
+      ASSERT_EQ(offsetSubview.Rank, 3) << "subview of offset is broken.";
+    }
+
+    // slice 2
+    auto offsetSubview2a = Kokkos::Experimental::subview(sliceMe, Kokkos::ALL(),
+                                                         Kokkos::ALL(), 0, 0);
+    ASSERT_EQ(offsetSubview2a.Rank, 2) << "subview of offset is broken.";
+    {
+      auto offsetSubview2b = Kokkos::Experimental::subview(
+          sliceMe, Kokkos::ALL(), 0, Kokkos::ALL(), 0);
+      ASSERT_EQ(offsetSubview2b.Rank, 2) << "subview of offset is broken.";
+    }
+    {
+      auto offsetSubview2b = Kokkos::Experimental::subview(
+          sliceMe, Kokkos::ALL(), 0, 0, Kokkos::ALL());
+      ASSERT_EQ(offsetSubview2b.Rank, 2) << "subview of offset is broken.";
+    }
+    {
+      auto offsetSubview2b = Kokkos::Experimental::subview(
+          sliceMe, 0, Kokkos::ALL(), 0, Kokkos::ALL());
+      ASSERT_EQ(offsetSubview2b.Rank, 2) << "subview of offset is broken.";
+    }
+    {
+      auto offsetSubview2b = Kokkos::Experimental::subview(
+          sliceMe, 0, 0, Kokkos::ALL(), Kokkos::ALL());
+      ASSERT_EQ(offsetSubview2b.Rank, 2) << "subview of offset is broken.";
+    }
+    // slice 3
+    {
+      auto offsetSubview =
+          Kokkos::Experimental::subview(sliceMe, Kokkos::ALL(), 0, 0, 0);
+      ASSERT_EQ(offsetSubview.Rank, 1) << "subview of offset is broken.";
+    }
+    {
+      auto offsetSubview =
+          Kokkos::Experimental::subview(sliceMe, 0, Kokkos::ALL(), 0, 0);
+      ASSERT_EQ(offsetSubview.Rank, 1) << "subview of offset is broken.";
+    }
+    {
+      auto offsetSubview =
+          Kokkos::Experimental::subview(sliceMe, 0, 0, Kokkos::ALL(), 0);
+      ASSERT_EQ(offsetSubview.Rank, 1) << "subview of offset is broken.";
+    }
+    {
+      auto offsetSubview =
+          Kokkos::Experimental::subview(sliceMe, 0, 0, 0, Kokkos::ALL());
+      ASSERT_EQ(offsetSubview.Rank, 1) << "subview of offset is broken.";
+    }
+  }
+}
 
 #if defined(KOKKOS_ENABLE_CUDA_LAMBDA) || !defined(KOKKOS_ENABLE_CUDA)
-        int view3DSum = 0;
-         Kokkos::parallel_reduce(rangePolicy3DZero, KOKKOS_LAMBDA(const int i, const int j, int k, int & updateMe){
-            updateMe += view3D(i, j, k);
-         }, view3DSum);
+template <class InputIt, class T, class BinaryOperation>
+KOKKOS_INLINE_FUNCTION T std_accumulate(InputIt first, InputIt last, T init,
+                                        BinaryOperation op) {
+  for (; first != last; ++first) {
+    init = op(std::move(init), *first);
+  }
+  return init;
+}
 
-         range3_type rangePolicy3D(point3_type{ {begins[0], begins[1], begins[2] } },
-               point3_type{ { begins[0] + extent0, begins[1] + extent1, begins[2] + extent2 } });
-         int offsetView3DSum = 0;
+KOKKOS_INLINE_FUNCTION int element(std::initializer_list<int> il) {
+  return std_accumulate(il.begin(), il.end(), 0,
+                        [](int l, int r) { return l * 10 + r; });
+}
 
-         Kokkos::parallel_reduce(rangePolicy3D, KOKKOS_LAMBDA(const int i, const int j, int k, int & updateMe){
-            updateMe += offsetView3D(i, j, k);
-         }, offsetView3DSum);
+template <typename DEVICE>
+void test_offsetview_offsets_rank1() {
+  using data_type        = int*;
+  using view_type        = Kokkos::View<data_type, DEVICE>;
+  using index_type       = Kokkos::IndexType<int>;
+  using execution_policy = Kokkos::RangePolicy<DEVICE, index_type>;
+  using offset_view_type = Kokkos::Experimental::OffsetView<data_type, DEVICE>;
 
-         ASSERT_EQ(view3DSum, offsetView3DSum) << "construction of OffsetView from View and begins array broken.";
-#endif
-      }
-      view_type viewFromOV = ov.view();
+  view_type v("View1", 10);
+  Kokkos::parallel_for(
+      "For1", execution_policy(0, v.extent_int(0)),
+      KOKKOS_LAMBDA(const int i) { v(i) = element({i}); });
 
-      ASSERT_EQ(viewFromOV == ov, true) <<
-            "OffsetView::view() or equivalence operator View == OffsetView broken";
+  int errors;
+  Kokkos::parallel_reduce(
+      "Reduce1", execution_policy(-3, 4),
+      KOKKOS_LAMBDA(const int ii, int& lerrors) {
+        offset_view_type ov(v, {ii});
+        lerrors += (ov(3) != element({3 - ii}));
+      },
+      errors);
 
-      {
-         offset_view_type ovFromV(viewFromOV, {-1, -2});
+  ASSERT_EQ(0, errors);
+}
 
-         ASSERT_EQ(ovFromV == viewFromOV , true) <<
-               "Construction of OffsetView from View or equivalence operator OffsetView == View broken";
-      }
-      {
-         offset_view_type ovFromV = viewFromOV;
-         ASSERT_EQ(ovFromV == viewFromOV , true) <<
-               "Construction of OffsetView from View by assignment (implicit conversion) or equivalence operator OffsetView == View broken";
-      }
+template <typename DEVICE>
+void test_offsetview_offsets_rank2() {
+  using data_type        = int**;
+  using view_type        = Kokkos::View<data_type, DEVICE>;
+  using index_type       = Kokkos::IndexType<int>;
+  using execution_policy = Kokkos::RangePolicy<DEVICE, index_type>;
+  using offset_view_type = Kokkos::Experimental::OffsetView<data_type, DEVICE>;
 
-      {// test offsetview to view deep copy
-         view_type aView("aView", ov.extent(0), ov.extent(1));
-         Kokkos::Experimental::deep_copy(aView, ov);
+  view_type v("View2", 10, 10);
+  Kokkos::parallel_for(
+      "For2", execution_policy(0, v.extent_int(0)), KOKKOS_LAMBDA(const int i) {
+        for (int j = 0; j != v.extent_int(1); ++j) {
+          v(i, j) = element({i, j});
+        }
+      });
 
-#if defined(KOKKOS_ENABLE_CUDA_LAMBDA) || !defined(KOKKOS_ENABLE_CUDA)
-         int sum = 0;
-         Kokkos::parallel_reduce(rangePolicy2D, KOKKOS_LAMBDA(const int i, const int j, int & updateMe){
-            updateMe += ov(i, j) - aView(i- ov.begin(0), j-ov.begin(1));
-         }, sum);
+  int errors;
+  Kokkos::parallel_reduce(
+      "Reduce2", execution_policy(-3, 4),
+      KOKKOS_LAMBDA(const int ii, int& lerrors) {
+        for (int jj = -3; jj <= 3; ++jj) {
+          offset_view_type ov(v, {ii, jj});
+          lerrors += (ov(3, 3) != element({3 - ii, 3 - jj}));
+        }
+      },
+      errors);
 
-         ASSERT_EQ(sum, 0) << "deep_copy(view, offsetView) broken.";
-#endif
-      }
+  ASSERT_EQ(0, errors);
+}
 
-      {// test view to  offsetview deep copy
-         view_type aView("aView", ov.extent(0), ov.extent(1));
+template <typename DEVICE>
+void test_offsetview_offsets_rank3() {
+  using data_type        = int***;
+  using view_type        = Kokkos::View<data_type, DEVICE>;
+  using index_type       = Kokkos::IndexType<int>;
+  using execution_policy = Kokkos::RangePolicy<DEVICE, index_type>;
+  using offset_view_type = Kokkos::Experimental::OffsetView<data_type, DEVICE>;
 
-         Kokkos::deep_copy(aView, 99);
-         Kokkos::Experimental::deep_copy(ov, aView);
-	 
-
-#if defined(KOKKOS_ENABLE_CUDA_LAMBDA) || !defined(KOKKOS_ENABLE_CUDA)
-         int sum = 0;
-         Kokkos::parallel_reduce(rangePolicy2D, KOKKOS_LAMBDA(const int i, const int j, int & updateMe){
-            updateMe += ov(i, j) - aView(i- ov.begin(0), j-ov.begin(1));
-         }, sum);
-
-         ASSERT_EQ(sum, 0) << "deep_copy(offsetView, view) broken.";
-#endif
-      }
-   }
-   template <typename Scalar, typename Device>
-   void test_offsetview_subview(unsigned int size)
-   {
-      {//test subview 1
-          Kokkos::Experimental::OffsetView<Scalar*, Device> sliceMe("offsetToSlice", {-10, 20});
-          {
-             auto offsetSubviewa = Kokkos::Experimental::subview(sliceMe, 0);
-             ASSERT_EQ(offsetSubviewa.Rank, 0) << "subview of offset is broken.";
+  view_type v("View3", 10, 10, 10);
+  Kokkos::parallel_for(
+      "For3", execution_policy(0, v.extent_int(0)), KOKKOS_LAMBDA(const int i) {
+        for (int j = 0; j != v.extent_int(1); ++j) {
+          for (int k = 0; k != v.extent_int(2); ++k) {
+            v(i, j, k) = element({i, j, k});
           }
+        }
+      });
 
-       }
-      {//test subview 2
-         Kokkos::Experimental::OffsetView<Scalar**, Device> sliceMe("offsetToSlice", {-10,20}, {-20,30});
-         {
-            auto offsetSubview = Kokkos::Experimental::subview(sliceMe, Kokkos::ALL(),-2);
-            ASSERT_EQ(offsetSubview.Rank, 1) << "subview of offset is broken.";
-         }
+  int errors;
+  Kokkos::parallel_reduce(
+      "Reduce3", execution_policy(-3, 4),
+      KOKKOS_LAMBDA(const int ii, int& lerrors) {
+        for (int jj = -3; jj <= 3; ++jj) {
+          for (int kk = -3; kk <= 3; ++kk) {
+            offset_view_type ov(v, {ii, jj, kk});
+            lerrors += (ov(3, 3, 3) != element({3 - ii, 3 - jj, 3 - kk}));
+          }
+        }
+      },
+      errors);
 
-         {
-            auto offsetSubview = Kokkos::Experimental::subview(sliceMe, 0, Kokkos::ALL());
-            ASSERT_EQ(offsetSubview.Rank, 1) << "subview of offset is broken.";
-         }
-      }
+  ASSERT_EQ(0, errors);
+}
+#endif
 
+TEST(TEST_CATEGORY, offsetview_construction) {
+  test_offsetview_construction<int, TEST_EXECSPACE>(10);
+}
 
-      {//test subview rank 3
+TEST(TEST_CATEGORY, offsetview_unmanaged_construction) {
+  test_offsetview_unmanaged_construction<int, TEST_EXECSPACE>();
+}
 
-         Kokkos::Experimental::OffsetView<Scalar***, Device> sliceMe("offsetToSlice", {-10,20}, {-20,30}, {-30,40});
-
-         //slice 1
-         {
-            auto offsetSubview = Kokkos::Experimental::subview(sliceMe,Kokkos::ALL(),Kokkos::ALL(), 0);
-            ASSERT_EQ(offsetSubview.Rank, 2) << "subview of offset is broken.";
-         }
-         {
-            auto offsetSubview = Kokkos::Experimental::subview(sliceMe,Kokkos::ALL(), 0,Kokkos::ALL());
-            ASSERT_EQ(offsetSubview.Rank, 2) << "subview of offset is broken.";
-         }
-
-         {
-            auto offsetSubview = Kokkos::Experimental::subview(sliceMe,0, Kokkos::ALL(),Kokkos::ALL());
-            ASSERT_EQ(offsetSubview.Rank, 2) << "subview of offset is broken.";
-
-         }
-         {
-	   auto offsetSubview = Kokkos::Experimental::subview(sliceMe,0, Kokkos::ALL(), Kokkos::make_pair(-30, -21));
-            ASSERT_EQ(offsetSubview.Rank, 2) << "subview of offset is broken.";
-
-            ASSERT_EQ(offsetSubview.begin(0) , -20);
-            ASSERT_EQ(offsetSubview.end(0) , 31);
-            ASSERT_EQ(offsetSubview.begin(1) , 0);
-            ASSERT_EQ(offsetSubview.end(1) , 9);
+TEST(TEST_CATEGORY, offsetview_subview) {
+  test_offsetview_subview<int, TEST_EXECSPACE>(10);
+}
 
 #if defined(KOKKOS_ENABLE_CUDA_LAMBDA) || !defined(KOKKOS_ENABLE_CUDA)
-            typedef Kokkos::MDRangePolicy<Device, Kokkos::Rank<2>, Kokkos::IndexType<int> > range_type;
-            typedef typename range_type::point_type point_type;
+TEST(TEST_CATEGORY, offsetview_offsets_rank1) {
+  test_offsetview_offsets_rank1<TEST_EXECSPACE>();
+}
 
-            const int b0 = offsetSubview.begin(0);
-            const int b1 = offsetSubview.begin(1);
+TEST(TEST_CATEGORY, offsetview_offsets_rank2) {
+  test_offsetview_offsets_rank2<TEST_EXECSPACE>();
+}
 
-            const int e0 = offsetSubview.end(0);
-            const int e1 = offsetSubview.end(1);
-
-            range_type rangeP2D(point_type{ {b0, b1 } }, point_type{ { e0, e1} });
-
-            Kokkos::parallel_for(rangeP2D, KOKKOS_LAMBDA(const int i, const int j) {
-               offsetSubview(i,j) =  6;
-            }
-            );
-
-            int sum = 0;
-             Kokkos::parallel_reduce(rangeP2D, KOKKOS_LAMBDA(const int i, const int j, int & updateMe){
-                updateMe += offsetSubview(i, j);
-             }, sum);
-
-            ASSERT_EQ(sum, 6*(e0-b0)*(e1-b1));
+TEST(TEST_CATEGORY, offsetview_offsets_rank3) {
+  test_offsetview_offsets_rank3<TEST_EXECSPACE>();
+}
 #endif
-         }
 
-         // slice 2
-         {
-            auto offsetSubview = Kokkos::Experimental::subview(sliceMe, Kokkos::ALL(), 0, 0);
-            ASSERT_EQ(offsetSubview.Rank, 1) << "subview of offset is broken.";
-         }
-         {
-            auto offsetSubview = Kokkos::Experimental::subview(sliceMe, 0, 0, Kokkos::ALL());
-            ASSERT_EQ(offsetSubview.Rank, 1) << "subview of offset is broken.";
-         }
-
-         {
-            auto offsetSubview = Kokkos::Experimental::subview(sliceMe, 0, Kokkos::ALL(), 0);
-            ASSERT_EQ(offsetSubview.Rank, 1) << "subview of offset is broken.";
-         }
-      }
-
-      {//test subview rank 4
-
-         Kokkos::Experimental::OffsetView<Scalar****, Device> sliceMe("offsetToSlice", {-10,20}, {-20,30}, {-30,40}, {-40, 50});
-
-         //slice 1
-         {
-            auto offsetSubview = Kokkos::Experimental::subview(sliceMe, Kokkos::ALL(),Kokkos::ALL(), Kokkos::ALL(), 0);
-            ASSERT_EQ(offsetSubview.Rank, 3) << "subview of offset is broken.";
-         }
-         {
-            auto offsetSubview = Kokkos::Experimental::subview(sliceMe, Kokkos::ALL(), Kokkos::ALL(), 0, Kokkos::ALL());
-            ASSERT_EQ(offsetSubview.Rank, 3) << "subview of offset is broken.";
-         }
-         {
-            auto offsetSubview = Kokkos::Experimental::subview(sliceMe ,Kokkos::ALL(), 0, Kokkos::ALL(),Kokkos::ALL());
-            ASSERT_EQ(offsetSubview.Rank, 3) << "subview of offset is broken.";
-         }
-         {
-            auto offsetSubview = Kokkos::Experimental::subview(sliceMe , 0, Kokkos::ALL(), Kokkos::ALL(),  Kokkos::ALL() );
-            ASSERT_EQ(offsetSubview.Rank, 3) << "subview of offset is broken.";
-         }
-
-         // slice 2
-         auto offsetSubview2a = Kokkos::Experimental::subview(sliceMe, Kokkos::ALL(), Kokkos::ALL(), 0, 0);
-         ASSERT_EQ(offsetSubview2a.Rank, 2) << "subview of offset is broken.";
-         {
-            auto offsetSubview2b = Kokkos::Experimental::subview(sliceMe, Kokkos::ALL(), 0, Kokkos::ALL(), 0);
-            ASSERT_EQ(offsetSubview2b.Rank, 2) << "subview of offset is broken.";
-         }
-         {
-            auto offsetSubview2b = Kokkos::Experimental::subview(sliceMe, Kokkos::ALL(), 0, 0, Kokkos::ALL());
-            ASSERT_EQ(offsetSubview2b.Rank, 2) << "subview of offset is broken.";
-         }
-         {
-            auto offsetSubview2b = Kokkos::Experimental::subview(sliceMe,  0, Kokkos::ALL(), 0, Kokkos::ALL());
-            ASSERT_EQ(offsetSubview2b.Rank, 2) << "subview of offset is broken.";
-         }
-         {
-            auto offsetSubview2b = Kokkos::Experimental::subview(sliceMe,  0, 0, Kokkos::ALL(), Kokkos::ALL());
-            ASSERT_EQ(offsetSubview2b.Rank, 2) << "subview of offset is broken.";
-         }
-         // slice 3
-         {
-            auto offsetSubview = Kokkos::Experimental::subview(sliceMe, Kokkos::ALL(), 0, 0, 0);
-            ASSERT_EQ(offsetSubview.Rank, 1) << "subview of offset is broken.";
-         }
-         {
-            auto offsetSubview = Kokkos::Experimental::subview(sliceMe, 0, Kokkos::ALL(), 0, 0);
-            ASSERT_EQ(offsetSubview.Rank, 1) << "subview of offset is broken.";
-         }
-         {
-            auto offsetSubview = Kokkos::Experimental::subview(sliceMe,  0, 0, Kokkos::ALL(), 0);
-            ASSERT_EQ(offsetSubview.Rank, 1) << "subview of offset is broken.";
-         }
-         {
-            auto offsetSubview = Kokkos::Experimental::subview(sliceMe,  0, 0, 0, Kokkos::ALL());
-            ASSERT_EQ(offsetSubview.Rank, 1) << "subview of offset is broken.";
-         }
-
-      }
-
-   }
-
-   TEST_F( TEST_CATEGORY, offsetview_construction) {
-      test_offsetview_construction<int,TEST_EXECSPACE>(10);
-   }
-   TEST_F( TEST_CATEGORY, offsetview_subview) {
-      test_offsetview_subview<int,TEST_EXECSPACE>(10);
-   }
-
-} // namespace Test
+}  // namespace Test
 
 #endif /* CONTAINERS_UNIT_TESTS_TESTOFFSETVIEW_HPP_ */
diff --git a/lib/kokkos/containers/unit_tests/TestScatterView.hpp b/lib/kokkos/containers/unit_tests/TestScatterView.hpp
index a9d97b32f3..93b69cc769 100644
--- a/lib/kokkos/containers/unit_tests/TestScatterView.hpp
+++ b/lib/kokkos/containers/unit_tests/TestScatterView.hpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -45,381 +46,378 @@
 #define KOKKOS_TEST_SCATTER_VIEW_HPP
 
 #include <Kokkos_ScatterView.hpp>
+#include <gtest/gtest.h>
 
 namespace Test {
 
-template <typename ExecSpace, typename Layout, int duplication, int contribution, int op>
+template <typename ExecSpace, typename Layout, int duplication,
+          int contribution, int op>
 struct test_scatter_view_impl_cls;
 
-template <typename ExecSpace, typename Layout, int duplication, int contribution>
-struct test_scatter_view_impl_cls<ExecSpace, Layout, duplication, contribution, Kokkos::Experimental::ScatterSum>   
-{
-public:   
-
-   typedef Kokkos::Experimental::ScatterView
-       < double*[3]
-       , Layout
-       , ExecSpace
-       , Kokkos::Experimental::ScatterSum
-       , duplication
-       , contribution
-        > scatter_view_type;
-
-   typedef Kokkos::View<double *[3], Layout, ExecSpace> orig_view_type; 
-
-
-   scatter_view_type scatter_view;
-   int scatterSize;
-
-   test_scatter_view_impl_cls(const scatter_view_type& view){
-      scatter_view = view;
-      scatterSize = 0;
-   }
-
-   void initialize(orig_view_type orig) {
-      auto host_view = Kokkos::create_mirror_view_and_copy(Kokkos::HostSpace(), orig);
-      Kokkos::fence();
-      for (typename decltype(host_view)::size_type i = 0; i < host_view.extent(0); ++i) {
-        host_view(i, 0) = 0.0;
-        host_view(i, 1) = 0.0;
-        host_view(i, 2) = 0.0;
-      }
-      Kokkos::fence();
-      Kokkos::deep_copy(orig, host_view);
-   }
-
-   void run_parallel(int n) {
-        scatterSize = n;
-        auto policy = Kokkos::RangePolicy<ExecSpace, int>(0, n);
-        Kokkos::parallel_for(policy, *this, "scatter_view_test: Sum");
-   }
-
-   KOKKOS_INLINE_FUNCTION
-   void operator()(int i) const {
-      auto scatter_access = scatter_view.access();
-      auto scatter_access_atomic = scatter_view.template access<Kokkos::Experimental::ScatterAtomic>();
-      for (int j = 0; j < 10; ++j) {
-        auto k = (i + j) % scatterSize;
-        scatter_access(k, 0) += 4.2;
-        scatter_access_atomic(k, 1) += 2.0;
-        scatter_access(k, 2) += 1.0;
-      }
-    }
-
-    void validateResults(orig_view_type orig) {
-      auto host_view = Kokkos::create_mirror_view_and_copy(Kokkos::HostSpace(), orig);
-      Kokkos::fence();
-      for (typename decltype(host_view)::size_type i = 0; i < host_view.extent(0); ++i) {
-        auto val0 = host_view(i, 0);
-        auto val1 = host_view(i, 1);
-        auto val2 = host_view(i, 2);
-        EXPECT_TRUE(std::fabs((val0 - 84.0) / 84.0) < 1e-14);
-        EXPECT_TRUE(std::fabs((val1 - 40.0) / 40.0) < 1e-14);
-        EXPECT_TRUE(std::fabs((val2 - 20.0) / 20.0) < 1e-14);
-      }
-    }
-};
-
-
-template <typename ExecSpace, typename Layout, int duplication, int contribution>
-struct test_scatter_view_impl_cls<ExecSpace, Layout, duplication, contribution, Kokkos::Experimental::ScatterProd>   
-{
-public:   
-
-   typedef Kokkos::Experimental::ScatterView
-       < double*[3]
-       , Layout
-       , ExecSpace
-       , Kokkos::Experimental::ScatterProd
-       , duplication
-       , contribution
-        > scatter_view_type;
-
-   typedef Kokkos::View<double *[3], Layout, ExecSpace> orig_view_type; 
-
-
-   scatter_view_type scatter_view;
-   int scatterSize;
-
-   test_scatter_view_impl_cls(const scatter_view_type& view){
-      scatter_view = view;
-      scatterSize = 0;
-   }
-
-   void initialize(orig_view_type orig) {
-      auto host_view = Kokkos::create_mirror_view_and_copy(Kokkos::HostSpace(), orig);
-      Kokkos::fence();
-      for (typename decltype(host_view)::size_type i = 0; i < host_view.extent(0); ++i) {
-        host_view(i, 0) = 1.0;
-        host_view(i, 1) = 1.0;
-        host_view(i, 2) = 1.0;
-      }
-      Kokkos::fence();
-      Kokkos::deep_copy(orig, host_view);
-   }
-
-   void run_parallel(int n) {
-        scatterSize = n;
-        auto policy = Kokkos::RangePolicy<ExecSpace, int>(0, n);
-        Kokkos::parallel_for(policy, *this, "scatter_view_test: Prod");
-   }
-
-   KOKKOS_INLINE_FUNCTION
-   void operator()(int i) const {
-      auto scatter_access = scatter_view.access();
-      auto scatter_access_atomic = scatter_view.template access<Kokkos::Experimental::ScatterAtomic>();
-      for (int j = 0; j < 4; ++j) {
-        auto k = (i + j) % scatterSize;
-        scatter_access(k, 0) *= 4.0;
-        scatter_access_atomic(k, 1) *= 2.0;
-        scatter_access(k, 2) *= 1.0;
-      }
-    }
-
-    void validateResults(orig_view_type orig) {
-      auto host_view = Kokkos::create_mirror_view_and_copy(Kokkos::HostSpace(), orig);
-      Kokkos::fence();
-      for (typename decltype(host_view)::size_type i = 0; i < host_view.extent(0); ++i) {
-        auto val0 = host_view(i, 0);
-        auto val1 = host_view(i, 1);
-        auto val2 = host_view(i, 2);
-        EXPECT_TRUE(std::fabs((val0 - 65536.0) / 65536.0) < 1e-14);
-        EXPECT_TRUE(std::fabs((val1 - 256.0) / 256.0) < 1e-14);
-        EXPECT_TRUE(std::fabs((val2 - 1.0) / 1.0) < 1e-14);
-      }
-    }
-};
-
-
-template <typename ExecSpace, typename Layout, int duplication, int contribution>
-struct test_scatter_view_impl_cls<ExecSpace, Layout, duplication, contribution, Kokkos::Experimental::ScatterMin>   
-{
-public:   
-
-   typedef Kokkos::Experimental::ScatterView
-       < double*[3]
-       , Layout
-       , ExecSpace
-       , Kokkos::Experimental::ScatterMin
-       , duplication
-       , contribution
-        > scatter_view_type;
-
-   typedef Kokkos::View<double *[3], Layout, ExecSpace> orig_view_type; 
-
-
-   scatter_view_type scatter_view;
-   int scatterSize;
-
-   test_scatter_view_impl_cls(const scatter_view_type& view){
-      scatter_view = view;
-      scatterSize = 0;
-   }
-
-   void initialize(orig_view_type orig) {
-      auto host_view = Kokkos::create_mirror_view_and_copy(Kokkos::HostSpace(), orig);
-      Kokkos::fence();
-      for (typename decltype(host_view)::size_type i = 0; i < host_view.extent(0); ++i) {
-        host_view(i, 0) = 999999.0;
-        host_view(i, 1) = 999999.0;
-        host_view(i, 2) = 999999.0;
-      }
-      Kokkos::fence();
-      Kokkos::deep_copy(orig, host_view);
-   }
-
-   void run_parallel(int n) {
-        scatterSize = n;
-        auto policy = Kokkos::RangePolicy<ExecSpace, int>(0, n);
-        Kokkos::parallel_for(policy, *this, "scatter_view_test: Prod");
-   }
-
-   KOKKOS_INLINE_FUNCTION
-   void operator()(int i) const {
-      auto scatter_access = scatter_view.access();
-      auto scatter_access_atomic = scatter_view.template access<Kokkos::Experimental::ScatterAtomic>();
-      for (int j = 0; j < 4; ++j) {
-        auto k = (i + j) % scatterSize;
-        scatter_access(k, 0).update((double)(j+1)*4);
-        scatter_access_atomic(k, 1).update((double)(j+1)*2.0);
-        scatter_access(k, 2).update((double)(j+1)*1.0);
-      }
-    }
-
-    void validateResults(orig_view_type orig) {
-      auto host_view = Kokkos::create_mirror_view_and_copy(Kokkos::HostSpace(), orig);
-      Kokkos::fence();
-      for (typename decltype(host_view)::size_type i = 0; i < host_view.extent(0); ++i) {
-        auto val0 = host_view(i, 0);
-        auto val1 = host_view(i, 1);
-        auto val2 = host_view(i, 2);
-        EXPECT_TRUE(std::fabs((val0 - 4.0) / 4.0) < 1e-14);
-        EXPECT_TRUE(std::fabs((val1 - 2.0) / 2.0) < 1e-14);
-        EXPECT_TRUE(std::fabs((val2 - 1.0) / 1.0) < 1e-14);
-      }
-    }
-};
-
-
-template <typename ExecSpace, typename Layout, int duplication, int contribution>
-struct test_scatter_view_impl_cls<ExecSpace, Layout, duplication, contribution, Kokkos::Experimental::ScatterMax>   
-{
-public:   
-
-   typedef Kokkos::Experimental::ScatterView
-       < double*[3]
-       , Layout
-       , ExecSpace
-       , Kokkos::Experimental::ScatterMax
-       , duplication
-       , contribution
-        > scatter_view_type;
-
-   typedef Kokkos::View<double *[3], Layout, ExecSpace> orig_view_type; 
-
-
-   scatter_view_type scatter_view;
-   int scatterSize;
-
-   test_scatter_view_impl_cls(const scatter_view_type& view){
-      scatter_view = view;
-      scatterSize = 0;
-   }
-
-   void initialize(orig_view_type orig) {
-      auto host_view = Kokkos::create_mirror_view_and_copy(Kokkos::HostSpace(), orig);
-      Kokkos::fence();
-      for (typename decltype(host_view)::size_type i = 0; i < host_view.extent(0); ++i) {
-        host_view(i, 0) = 0.0;
-        host_view(i, 1) = 0.0;
-        host_view(i, 2) = 0.0;
-      }
-      Kokkos::fence();
-      Kokkos::deep_copy(orig, host_view);
-   }
-
-   void run_parallel(int n) {
-        scatterSize = n;
-        auto policy = Kokkos::RangePolicy<ExecSpace, int>(0, n);
-        Kokkos::parallel_for(policy, *this, "scatter_view_test: Prod");
-   }
-
-   KOKKOS_INLINE_FUNCTION
-   void operator()(int i) const {
-      auto scatter_access = scatter_view.access();
-      auto scatter_access_atomic = scatter_view.template access<Kokkos::Experimental::ScatterAtomic>();
-      for (int j = 0; j < 4; ++j) {
-        auto k = (i + j) % scatterSize;
-        scatter_access(k, 0).update((double)(j+1)*4);
-        scatter_access_atomic(k, 1).update((double)(j+1)*2.0);
-        scatter_access(k, 2).update((double)(j+1)*1.0);
-      }
-    }
-
-    void validateResults(orig_view_type orig) {
-      auto host_view = Kokkos::create_mirror_view_and_copy(Kokkos::HostSpace(), orig);
-      Kokkos::fence();
-      for (typename decltype(host_view)::size_type i = 0; i < host_view.extent(0); ++i) {
-        auto val0 = host_view(i, 0);
-        auto val1 = host_view(i, 1);
-        auto val2 = host_view(i, 2);
-        EXPECT_TRUE(std::fabs((val0 - 16.0) / 16.0) < 1e-14);
-        EXPECT_TRUE(std::fabs((val1 - 8.0) / 8.0) < 1e-14);
-        EXPECT_TRUE(std::fabs((val2 - 4.0) / 4.0) < 1e-14);
-      }
-    }
-};
-
-
-
-template <typename ExecSpace, typename Layout, int duplication, int contribution, int op>
-struct test_scatter_view_config
-{
+template <typename ExecSpace, typename Layout, int duplication,
+          int contribution>
+struct test_scatter_view_impl_cls<ExecSpace, Layout, duplication, contribution,
+                                  Kokkos::Experimental::ScatterSum> {
  public:
-   typedef typename test_scatter_view_impl_cls<ExecSpace, Layout, 
-         duplication, contribution, op>::scatter_view_type scatter_view_def;
-   typedef typename test_scatter_view_impl_cls<ExecSpace, Layout, 
-         duplication, contribution, op>::orig_view_type orig_view_def;
+  typedef Kokkos::Experimental::ScatterView<double * [3], Layout, ExecSpace,
+                                            Kokkos::Experimental::ScatterSum,
+                                            duplication, contribution>
+      scatter_view_type;
 
-   test_scatter_view_config() {
-   }
+  typedef Kokkos::View<double * [3], Layout, ExecSpace> orig_view_type;
 
-   void run_test(int n)
-   {
-     //Test creation via create_scatter_view
-     {
-     orig_view_def original_view("original_view", n);
-     scatter_view_def scatter_view = Kokkos::Experimental::create_scatter_view
-       < op
-       , duplication
-       , contribution
-       > (original_view);
+  scatter_view_type scatter_view;
+  int scatterSize;
 
-     test_scatter_view_impl_cls<ExecSpace, Layout, duplication, contribution, op> scatter_view_test_impl(scatter_view);
-     scatter_view_test_impl.initialize(original_view);
-     scatter_view_test_impl.run_parallel(n);
+  test_scatter_view_impl_cls(const scatter_view_type& view) {
+    scatter_view = view;
+    scatterSize  = 0;
+  }
 
-     Kokkos::Experimental::contribute(original_view, scatter_view);
-     scatter_view.reset_except(original_view);
+  void initialize(orig_view_type orig) {
+    auto host_view =
+        Kokkos::create_mirror_view_and_copy(Kokkos::HostSpace(), orig);
+    Kokkos::fence();
+    for (typename decltype(host_view)::size_type i = 0; i < host_view.extent(0);
+         ++i) {
+      host_view(i, 0) = 0.0;
+      host_view(i, 1) = 0.0;
+      host_view(i, 2) = 0.0;
+    }
+    Kokkos::fence();
+    Kokkos::deep_copy(orig, host_view);
+  }
 
-     scatter_view_test_impl.run_parallel(n);
+  void run_parallel(int n) {
+    scatterSize = n;
+    auto policy = Kokkos::RangePolicy<ExecSpace, int>(0, n);
+    Kokkos::parallel_for(policy, *this, "scatter_view_test: Sum");
+  }
 
-     Kokkos::Experimental::contribute(original_view, scatter_view);
-     Kokkos::fence();
-
-     scatter_view_test_impl.validateResults(original_view);
-
-     {
-        scatter_view_def persistent_view("persistent", n);
-        auto result_view = persistent_view.subview();
-        contribute(result_view, persistent_view);
-        Kokkos::fence();
-     }
-     }
-     //Test creation via constructor
-     {
-     orig_view_def original_view("original_view", n);
-     scatter_view_def scatter_view(original_view);
-
-     test_scatter_view_impl_cls<ExecSpace, Layout, duplication, contribution, op> scatter_view_test_impl(scatter_view);
-     scatter_view_test_impl.initialize(original_view);
-     scatter_view_test_impl.run_parallel(n);
-
-     Kokkos::Experimental::contribute(original_view, scatter_view);
-     scatter_view.reset_except(original_view);
-
-     scatter_view_test_impl.run_parallel(n);
-
-     Kokkos::Experimental::contribute(original_view, scatter_view);
-     Kokkos::fence();
-
-     scatter_view_test_impl.validateResults(original_view);
-
-     {
-        scatter_view_def persistent_view("persistent", n);
-        auto result_view = persistent_view.subview();
-        contribute(result_view, persistent_view);
-        Kokkos::fence();
-     }
-     }
-   }
+  KOKKOS_INLINE_FUNCTION
+  void operator()(int i) const {
+    auto scatter_access = scatter_view.access();
+    auto scatter_access_atomic =
+        scatter_view.template access<Kokkos::Experimental::ScatterAtomic>();
+    for (int j = 0; j < 10; ++j) {
+      auto k = (i + j) % scatterSize;
+      scatter_access(k, 0) += 4.2;
+      scatter_access_atomic(k, 1) += 2.0;
+      scatter_access(k, 2) += 1.0;
+    }
+  }
 
+  void validateResults(orig_view_type orig) {
+    auto host_view =
+        Kokkos::create_mirror_view_and_copy(Kokkos::HostSpace(), orig);
+    Kokkos::fence();
+    for (typename decltype(host_view)::size_type i = 0; i < host_view.extent(0);
+         ++i) {
+      auto val0 = host_view(i, 0);
+      auto val1 = host_view(i, 1);
+      auto val2 = host_view(i, 2);
+      EXPECT_TRUE(std::fabs((val0 - 84.0) / 84.0) < 1e-14);
+      EXPECT_TRUE(std::fabs((val1 - 40.0) / 40.0) < 1e-14);
+      EXPECT_TRUE(std::fabs((val2 - 20.0) / 20.0) < 1e-14);
+    }
+  }
 };
 
+template <typename ExecSpace, typename Layout, int duplication,
+          int contribution>
+struct test_scatter_view_impl_cls<ExecSpace, Layout, duplication, contribution,
+                                  Kokkos::Experimental::ScatterProd> {
+ public:
+  typedef Kokkos::Experimental::ScatterView<double * [3], Layout, ExecSpace,
+                                            Kokkos::Experimental::ScatterProd,
+                                            duplication, contribution>
+      scatter_view_type;
+
+  typedef Kokkos::View<double * [3], Layout, ExecSpace> orig_view_type;
+
+  scatter_view_type scatter_view;
+  int scatterSize;
+
+  test_scatter_view_impl_cls(const scatter_view_type& view) {
+    scatter_view = view;
+    scatterSize  = 0;
+  }
+
+  void initialize(orig_view_type orig) {
+    auto host_view =
+        Kokkos::create_mirror_view_and_copy(Kokkos::HostSpace(), orig);
+    Kokkos::fence();
+    for (typename decltype(host_view)::size_type i = 0; i < host_view.extent(0);
+         ++i) {
+      host_view(i, 0) = 1.0;
+      host_view(i, 1) = 1.0;
+      host_view(i, 2) = 1.0;
+    }
+    Kokkos::fence();
+    Kokkos::deep_copy(orig, host_view);
+  }
+
+  void run_parallel(int n) {
+    scatterSize = n;
+    auto policy = Kokkos::RangePolicy<ExecSpace, int>(0, n);
+    Kokkos::parallel_for(policy, *this, "scatter_view_test: Prod");
+  }
+
+  KOKKOS_INLINE_FUNCTION
+  void operator()(int i) const {
+    auto scatter_access = scatter_view.access();
+    auto scatter_access_atomic =
+        scatter_view.template access<Kokkos::Experimental::ScatterAtomic>();
+    for (int j = 0; j < 4; ++j) {
+      auto k = (i + j) % scatterSize;
+      scatter_access(k, 0) *= 4.0;
+      scatter_access_atomic(k, 1) *= 2.0;
+      scatter_access(k, 2) *= 1.0;
+    }
+  }
+
+  void validateResults(orig_view_type orig) {
+    auto host_view =
+        Kokkos::create_mirror_view_and_copy(Kokkos::HostSpace(), orig);
+    Kokkos::fence();
+    for (typename decltype(host_view)::size_type i = 0; i < host_view.extent(0);
+         ++i) {
+      auto val0 = host_view(i, 0);
+      auto val1 = host_view(i, 1);
+      auto val2 = host_view(i, 2);
+      EXPECT_TRUE(std::fabs((val0 - 65536.0) / 65536.0) < 1e-14);
+      EXPECT_TRUE(std::fabs((val1 - 256.0) / 256.0) < 1e-14);
+      EXPECT_TRUE(std::fabs((val2 - 1.0) / 1.0) < 1e-14);
+    }
+  }
+};
+
+template <typename ExecSpace, typename Layout, int duplication,
+          int contribution>
+struct test_scatter_view_impl_cls<ExecSpace, Layout, duplication, contribution,
+                                  Kokkos::Experimental::ScatterMin> {
+ public:
+  typedef Kokkos::Experimental::ScatterView<double * [3], Layout, ExecSpace,
+                                            Kokkos::Experimental::ScatterMin,
+                                            duplication, contribution>
+      scatter_view_type;
+
+  typedef Kokkos::View<double * [3], Layout, ExecSpace> orig_view_type;
+
+  scatter_view_type scatter_view;
+  int scatterSize;
+
+  test_scatter_view_impl_cls(const scatter_view_type& view) {
+    scatter_view = view;
+    scatterSize  = 0;
+  }
+
+  void initialize(orig_view_type orig) {
+    auto host_view =
+        Kokkos::create_mirror_view_and_copy(Kokkos::HostSpace(), orig);
+    Kokkos::fence();
+    for (typename decltype(host_view)::size_type i = 0; i < host_view.extent(0);
+         ++i) {
+      host_view(i, 0) = 999999.0;
+      host_view(i, 1) = 999999.0;
+      host_view(i, 2) = 999999.0;
+    }
+    Kokkos::fence();
+    Kokkos::deep_copy(orig, host_view);
+  }
+
+  void run_parallel(int n) {
+    scatterSize = n;
+    auto policy = Kokkos::RangePolicy<ExecSpace, int>(0, n);
+    Kokkos::parallel_for(policy, *this, "scatter_view_test: Prod");
+  }
+
+  KOKKOS_INLINE_FUNCTION
+  void operator()(int i) const {
+    auto scatter_access = scatter_view.access();
+    auto scatter_access_atomic =
+        scatter_view.template access<Kokkos::Experimental::ScatterAtomic>();
+    for (int j = 0; j < 4; ++j) {
+      auto k = (i + j) % scatterSize;
+      scatter_access(k, 0).update((double)(j + 1) * 4);
+      scatter_access_atomic(k, 1).update((double)(j + 1) * 2.0);
+      scatter_access(k, 2).update((double)(j + 1) * 1.0);
+    }
+  }
+
+  void validateResults(orig_view_type orig) {
+    auto host_view =
+        Kokkos::create_mirror_view_and_copy(Kokkos::HostSpace(), orig);
+    Kokkos::fence();
+    for (typename decltype(host_view)::size_type i = 0; i < host_view.extent(0);
+         ++i) {
+      auto val0 = host_view(i, 0);
+      auto val1 = host_view(i, 1);
+      auto val2 = host_view(i, 2);
+      EXPECT_TRUE(std::fabs((val0 - 4.0) / 4.0) < 1e-14);
+      EXPECT_TRUE(std::fabs((val1 - 2.0) / 2.0) < 1e-14);
+      EXPECT_TRUE(std::fabs((val2 - 1.0) / 1.0) < 1e-14);
+    }
+  }
+};
+
+template <typename ExecSpace, typename Layout, int duplication,
+          int contribution>
+struct test_scatter_view_impl_cls<ExecSpace, Layout, duplication, contribution,
+                                  Kokkos::Experimental::ScatterMax> {
+ public:
+  typedef Kokkos::Experimental::ScatterView<double * [3], Layout, ExecSpace,
+                                            Kokkos::Experimental::ScatterMax,
+                                            duplication, contribution>
+      scatter_view_type;
+
+  typedef Kokkos::View<double * [3], Layout, ExecSpace> orig_view_type;
+
+  scatter_view_type scatter_view;
+  int scatterSize;
+
+  test_scatter_view_impl_cls(const scatter_view_type& view) {
+    scatter_view = view;
+    scatterSize  = 0;
+  }
+
+  void initialize(orig_view_type orig) {
+    auto host_view =
+        Kokkos::create_mirror_view_and_copy(Kokkos::HostSpace(), orig);
+    Kokkos::fence();
+    for (typename decltype(host_view)::size_type i = 0; i < host_view.extent(0);
+         ++i) {
+      host_view(i, 0) = 0.0;
+      host_view(i, 1) = 0.0;
+      host_view(i, 2) = 0.0;
+    }
+    Kokkos::fence();
+    Kokkos::deep_copy(orig, host_view);
+  }
+
+  void run_parallel(int n) {
+    scatterSize = n;
+    auto policy = Kokkos::RangePolicy<ExecSpace, int>(0, n);
+    Kokkos::parallel_for(policy, *this, "scatter_view_test: Prod");
+  }
+
+  KOKKOS_INLINE_FUNCTION
+  void operator()(int i) const {
+    auto scatter_access = scatter_view.access();
+    auto scatter_access_atomic =
+        scatter_view.template access<Kokkos::Experimental::ScatterAtomic>();
+    for (int j = 0; j < 4; ++j) {
+      auto k = (i + j) % scatterSize;
+      scatter_access(k, 0).update((double)(j + 1) * 4);
+      scatter_access_atomic(k, 1).update((double)(j + 1) * 2.0);
+      scatter_access(k, 2).update((double)(j + 1) * 1.0);
+    }
+  }
+
+  void validateResults(orig_view_type orig) {
+    auto host_view =
+        Kokkos::create_mirror_view_and_copy(Kokkos::HostSpace(), orig);
+    Kokkos::fence();
+    for (typename decltype(host_view)::size_type i = 0; i < host_view.extent(0);
+         ++i) {
+      auto val0 = host_view(i, 0);
+      auto val1 = host_view(i, 1);
+      auto val2 = host_view(i, 2);
+      EXPECT_TRUE(std::fabs((val0 - 16.0) / 16.0) < 1e-14);
+      EXPECT_TRUE(std::fabs((val1 - 8.0) / 8.0) < 1e-14);
+      EXPECT_TRUE(std::fabs((val2 - 4.0) / 4.0) < 1e-14);
+    }
+  }
+};
+
+template <typename ExecSpace, typename Layout, int duplication,
+          int contribution, int op>
+struct test_scatter_view_config {
+ public:
+  typedef
+      typename test_scatter_view_impl_cls<ExecSpace, Layout, duplication,
+                                          contribution, op>::scatter_view_type
+          scatter_view_def;
+  typedef typename test_scatter_view_impl_cls<ExecSpace, Layout, duplication,
+                                              contribution, op>::orig_view_type
+      orig_view_def;
+
+  test_scatter_view_config() {}
+
+  void run_test(int n) {
+    // Test creation via create_scatter_view
+    {
+      orig_view_def original_view("original_view", n);
+      scatter_view_def scatter_view = Kokkos::Experimental::create_scatter_view<
+          op, duplication, contribution>(original_view);
+
+      test_scatter_view_impl_cls<ExecSpace, Layout, duplication, contribution,
+                                 op>
+          scatter_view_test_impl(scatter_view);
+      scatter_view_test_impl.initialize(original_view);
+      scatter_view_test_impl.run_parallel(n);
+
+      Kokkos::Experimental::contribute(original_view, scatter_view);
+      scatter_view.reset_except(original_view);
+
+      scatter_view_test_impl.run_parallel(n);
+
+      Kokkos::Experimental::contribute(original_view, scatter_view);
+      Kokkos::fence();
+
+      scatter_view_test_impl.validateResults(original_view);
+
+      {
+        scatter_view_def persistent_view("persistent", n);
+        auto result_view = persistent_view.subview();
+        contribute(result_view, persistent_view);
+        Kokkos::fence();
+      }
+    }
+    // Test creation via constructor
+    {
+      orig_view_def original_view("original_view", n);
+      scatter_view_def scatter_view(original_view);
+
+      test_scatter_view_impl_cls<ExecSpace, Layout, duplication, contribution,
+                                 op>
+          scatter_view_test_impl(scatter_view);
+      scatter_view_test_impl.initialize(original_view);
+      scatter_view_test_impl.run_parallel(n);
+
+      Kokkos::Experimental::contribute(original_view, scatter_view);
+      scatter_view.reset_except(original_view);
+
+      scatter_view_test_impl.run_parallel(n);
+
+      Kokkos::Experimental::contribute(original_view, scatter_view);
+      Kokkos::fence();
+
+      scatter_view_test_impl.validateResults(original_view);
+
+      {
+        scatter_view_def persistent_view("persistent", n);
+        auto result_view = persistent_view.subview();
+        contribute(result_view, persistent_view);
+        Kokkos::fence();
+      }
+    }
+  }
+};
 
 template <typename ExecSpace, int ScatterType>
 struct TestDuplicatedScatterView {
   TestDuplicatedScatterView(int n) {
     // ScatterSum test
-    test_scatter_view_config<ExecSpace, Kokkos::LayoutRight,
-      Kokkos::Experimental::ScatterDuplicated,
-      Kokkos::Experimental::ScatterNonAtomic,
-      ScatterType> test_sv_right_config;
+    test_scatter_view_config<
+        ExecSpace, Kokkos::LayoutRight, Kokkos::Experimental::ScatterDuplicated,
+        Kokkos::Experimental::ScatterNonAtomic, ScatterType>
+        test_sv_right_config;
     test_sv_right_config.run_test(n);
-    test_scatter_view_config<ExecSpace, Kokkos::LayoutLeft,
-      Kokkos::Experimental::ScatterDuplicated,
-      Kokkos::Experimental::ScatterNonAtomic,
-      ScatterType> test_sv_left_config;
+    test_scatter_view_config<
+        ExecSpace, Kokkos::LayoutLeft, Kokkos::Experimental::ScatterDuplicated,
+        Kokkos::Experimental::ScatterNonAtomic, ScatterType>
+        test_sv_left_config;
     test_sv_left_config.run_test(n);
   }
 };
@@ -429,8 +427,7 @@ struct TestDuplicatedScatterView {
 // UniqueToken can support it
 template <int ScatterType>
 struct TestDuplicatedScatterView<Kokkos::Cuda, ScatterType> {
-  TestDuplicatedScatterView(int) {
-  }
+  TestDuplicatedScatterView(int) {}
 };
 #endif
 
@@ -439,14 +436,12 @@ struct TestDuplicatedScatterView<Kokkos::Cuda, ScatterType> {
 // UniqueToken can support it
 template <int ScatterType>
 struct TestDuplicatedScatterView<Kokkos::Experimental::ROCm, ScatterType> {
-  TestDuplicatedScatterView(int) {
-  }
+  TestDuplicatedScatterView(int) {}
 };
 #endif
 
 template <typename ExecSpace, int ScatterType>
-void test_scatter_view(int n)
-{
+void test_scatter_view(int n) {
   // all of these configurations should compile okay, but only some of them are
   // correct and/or sensible in terms of memory use
   Kokkos::Experimental::UniqueToken<ExecSpace> unique_token{ExecSpace()};
@@ -456,33 +451,37 @@ void test_scatter_view(int n)
   // we also test OpenMP with one thread: LAMMPS cares about that)
   if (unique_token.size() == 1) {
     test_scatter_view_config<ExecSpace, Kokkos::LayoutRight,
-      Kokkos::Experimental::ScatterNonDuplicated,
-      Kokkos::Experimental::ScatterNonAtomic,
-      ScatterType> test_sv_config;
+                             Kokkos::Experimental::ScatterNonDuplicated,
+                             Kokkos::Experimental::ScatterNonAtomic,
+                             ScatterType>
+        test_sv_config;
     test_sv_config.run_test(n);
   }
 #ifdef KOKKOS_ENABLE_SERIAL
   if (!std::is_same<ExecSpace, Kokkos::Serial>::value) {
 #endif
-  test_scatter_view_config<ExecSpace, Kokkos::LayoutRight,
-    Kokkos::Experimental::ScatterNonDuplicated,
-    Kokkos::Experimental::ScatterAtomic,
-    ScatterType> test_sv_config;
-  test_sv_config.run_test(n);
+    test_scatter_view_config<ExecSpace, Kokkos::LayoutRight,
+                             Kokkos::Experimental::ScatterNonDuplicated,
+                             Kokkos::Experimental::ScatterAtomic, ScatterType>
+        test_sv_config;
+    test_sv_config.run_test(n);
 #ifdef KOKKOS_ENABLE_SERIAL
   }
 #endif
   // with hundreds of threads we were running out of memory.
   // limit (n) so that duplication doesn't exceed 8GB
-  constexpr std::size_t maximum_allowed_total_bytes = 8ull * 1024ull * 1024ull * 1024ull;
-  std::size_t const maximum_allowed_copy_bytes = maximum_allowed_total_bytes / std::size_t(unique_token.size());
+  constexpr std::size_t maximum_allowed_total_bytes =
+      8ull * 1024ull * 1024ull * 1024ull;
+  std::size_t const maximum_allowed_copy_bytes =
+      maximum_allowed_total_bytes / std::size_t(unique_token.size());
   constexpr std::size_t bytes_per_value = sizeof(double) * 3;
-  std::size_t const maximum_allowed_copy_values = maximum_allowed_copy_bytes / bytes_per_value;
+  std::size_t const maximum_allowed_copy_values =
+      maximum_allowed_copy_bytes / bytes_per_value;
   n = std::min(n, int(maximum_allowed_copy_values));
   TestDuplicatedScatterView<ExecSpace, ScatterType> duptest(n);
 }
 
-TEST_F( TEST_CATEGORY, scatterview) {
+TEST(TEST_CATEGORY, scatterview) {
 #ifndef KOKKOS_ENABLE_ROCM
   test_scatter_view<TEST_EXECSPACE, Kokkos::Experimental::ScatterSum>(10);
   test_scatter_view<TEST_EXECSPACE, Kokkos::Experimental::ScatterProd>(10);
@@ -492,17 +491,22 @@ TEST_F( TEST_CATEGORY, scatterview) {
 #ifdef KOKKOS_ENABLE_DEBUG
   int big_n = 100 * 1000;
 #else
-  int big_n = 10 * 1000 * 1000;
+
+#ifdef KOKKOS_ENABLE_SERIAL
+  bool is_serial = std::is_same<TEST_EXECSPACE, Kokkos::Serial>::value;
+  int big_n      = is_serial ? 100 * 1000 : 10000 * 1000;
+#else
+  int big_n = 10000 * 1000;
 #endif
-  test_scatter_view<TEST_EXECSPACE,Kokkos::Experimental::ScatterSum>(big_n);
-  test_scatter_view<TEST_EXECSPACE,Kokkos::Experimental::ScatterProd>(big_n);
-  test_scatter_view<TEST_EXECSPACE,Kokkos::Experimental::ScatterMin>(big_n);
-  test_scatter_view<TEST_EXECSPACE,Kokkos::Experimental::ScatterMax>(big_n);
+
+#endif
+  test_scatter_view<TEST_EXECSPACE, Kokkos::Experimental::ScatterSum>(big_n);
+  test_scatter_view<TEST_EXECSPACE, Kokkos::Experimental::ScatterProd>(big_n);
+  test_scatter_view<TEST_EXECSPACE, Kokkos::Experimental::ScatterMin>(big_n);
+  test_scatter_view<TEST_EXECSPACE, Kokkos::Experimental::ScatterMax>(big_n);
 #endif
 }
 
-} // namespace Test
-
-#endif //KOKKOS_TEST_UNORDERED_MAP_HPP
-
+}  // namespace Test
 
+#endif  // KOKKOS_TEST_UNORDERED_MAP_HPP
diff --git a/lib/kokkos/containers/unit_tests/TestStaticCrsGraph.hpp b/lib/kokkos/containers/unit_tests/TestStaticCrsGraph.hpp
index 7ba307079f..15c190242c 100644
--- a/lib/kokkos/containers/unit_tests/TestStaticCrsGraph.hpp
+++ b/lib/kokkos/containers/unit_tests/TestStaticCrsGraph.hpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -52,233 +53,244 @@
 namespace Test {
 namespace TestStaticCrsGraph {
 
-template< class Space >
-void run_test_graph()
-{
-  typedef Kokkos::StaticCrsGraph< unsigned , Space > dView ;
-  typedef typename dView::HostMirror hView ;
+template <class Space>
+void run_test_graph() {
+  typedef Kokkos::StaticCrsGraph<unsigned, Space> dView;
+  typedef typename dView::HostMirror hView;
 
-  const unsigned LENGTH = 1000 ;
-  dView dx ;
-  hView hx ;
+  const unsigned LENGTH = 1000;
+  dView dx;
+  hView hx;
 
-  std::vector< std::vector< int > > graph( LENGTH );
+  std::vector<std::vector<int> > graph(LENGTH);
 
-  for ( size_t i = 0 ; i < LENGTH ; ++i ) {
+  for (size_t i = 0; i < LENGTH; ++i) {
     graph[i].reserve(8);
-    for ( size_t j = 0 ; j < 8 ; ++j ) {
-      graph[i].push_back( i + j * 3 );
+    for (size_t j = 0; j < 8; ++j) {
+      graph[i].push_back(i + j * 3);
     }
   }
 
-  dx = Kokkos::create_staticcrsgraph<dView>( "dx" , graph );
-  hx = Kokkos::create_mirror( dx );
+  dx = Kokkos::create_staticcrsgraph<dView>("dx", graph);
+  hx = Kokkos::create_mirror(dx);
 
-  ASSERT_EQ( hx.row_map.extent(0) - 1 , LENGTH );
+  ASSERT_EQ(hx.row_map.extent(0) - 1, LENGTH);
 
-  for ( size_t i = 0 ; i < LENGTH ; ++i ) {
+  for (size_t i = 0; i < LENGTH; ++i) {
     const size_t begin = hx.row_map[i];
-    const size_t n = hx.row_map[i+1] - begin ;
-    ASSERT_EQ( n , graph[i].size() );
-    for ( size_t j = 0 ; j < n ; ++j ) {
-      ASSERT_EQ( (int) hx.entries( j + begin ) , graph[i][j] );
+    const size_t n     = hx.row_map[i + 1] - begin;
+    ASSERT_EQ(n, graph[i].size());
+    for (size_t j = 0; j < n; ++j) {
+      ASSERT_EQ((int)hx.entries(j + begin), graph[i][j]);
     }
   }
 
   // Test row view access
-  for ( size_t i = 0 ; i < LENGTH ; ++i ) {
+  for (size_t i = 0; i < LENGTH; ++i) {
     auto rowView = hx.rowConst(i);
-    ASSERT_EQ( rowView.length, graph[i].size() );
-    for ( size_t j = 0 ; j < rowView.length ; ++j ) {
-      ASSERT_EQ( rowView.colidx( j ) , graph[i][j] );
-      ASSERT_EQ( rowView( j )        , graph[i][j] );
+    ASSERT_EQ(rowView.length, graph[i].size());
+    for (size_t j = 0; j < rowView.length; ++j) {
+      ASSERT_EQ(rowView.colidx(j), graph[i][j]);
+      ASSERT_EQ(rowView(j), graph[i][j]);
     }
   }
 }
 
-template< class Space >
-void run_test_graph2()
-{
-  typedef Kokkos::StaticCrsGraph< unsigned[3] , Space > dView ;
-  typedef typename dView::HostMirror hView ;
+template <class Space>
+void run_test_graph2() {
+  typedef Kokkos::StaticCrsGraph<unsigned[3], Space> dView;
+  typedef typename dView::HostMirror hView;
 
-  const unsigned LENGTH = 10 ;
+  const unsigned LENGTH = 10;
 
-  std::vector< size_t > sizes( LENGTH );
+  std::vector<size_t> sizes(LENGTH);
 
-  size_t total_length = 0 ;
+  size_t total_length = 0;
 
-  for ( size_t i = 0 ; i < LENGTH ; ++i ) {
-    total_length += ( sizes[i] = 6 + i % 4 );
+  for (size_t i = 0; i < LENGTH; ++i) {
+    total_length += (sizes[i] = 6 + i % 4);
   }
 
-  dView dx = Kokkos::create_staticcrsgraph<dView>( "test" , sizes );
-  hView hx = Kokkos::create_mirror( dx );
-  hView mx = Kokkos::create_mirror( dx );
+  dView dx = Kokkos::create_staticcrsgraph<dView>("test", sizes);
+  hView hx = Kokkos::create_mirror(dx);
+  hView mx = Kokkos::create_mirror(dx);
 
-  ASSERT_EQ( (size_t) dx.row_map.extent(0) , (size_t) LENGTH + 1 );
-  ASSERT_EQ( (size_t) hx.row_map.extent(0) , (size_t) LENGTH + 1 );
-  ASSERT_EQ( (size_t) mx.row_map.extent(0) , (size_t) LENGTH + 1 );
+  ASSERT_EQ((size_t)dx.row_map.extent(0), (size_t)LENGTH + 1);
+  ASSERT_EQ((size_t)hx.row_map.extent(0), (size_t)LENGTH + 1);
+  ASSERT_EQ((size_t)mx.row_map.extent(0), (size_t)LENGTH + 1);
 
-  ASSERT_EQ( (size_t) dx.entries.extent(0) , (size_t) total_length );
-  ASSERT_EQ( (size_t) hx.entries.extent(0) , (size_t) total_length );
-  ASSERT_EQ( (size_t) mx.entries.extent(0) , (size_t) total_length );
+  ASSERT_EQ((size_t)dx.entries.extent(0), (size_t)total_length);
+  ASSERT_EQ((size_t)hx.entries.extent(0), (size_t)total_length);
+  ASSERT_EQ((size_t)mx.entries.extent(0), (size_t)total_length);
 
-  ASSERT_EQ( (size_t) dx.entries.extent(1) , (size_t) 3 );
-  ASSERT_EQ( (size_t) hx.entries.extent(1) , (size_t) 3 );
-  ASSERT_EQ( (size_t) mx.entries.extent(1) , (size_t) 3 );
+  ASSERT_EQ((size_t)dx.entries.extent(1), (size_t)3);
+  ASSERT_EQ((size_t)hx.entries.extent(1), (size_t)3);
+  ASSERT_EQ((size_t)mx.entries.extent(1), (size_t)3);
 
-  for ( size_t i = 0 ; i < LENGTH ; ++i ) {
+  for (size_t i = 0; i < LENGTH; ++i) {
     const size_t entry_begin = hx.row_map[i];
-    const size_t entry_end   = hx.row_map[i+1];
-    for ( size_t j = entry_begin ; j < entry_end ; ++j ) {
-      hx.entries(j,0) = j + 1 ;
-      hx.entries(j,1) = j + 2 ;
-      hx.entries(j,2) = j + 3 ;
+    const size_t entry_end   = hx.row_map[i + 1];
+    for (size_t j = entry_begin; j < entry_end; ++j) {
+      hx.entries(j, 0) = j + 1;
+      hx.entries(j, 1) = j + 2;
+      hx.entries(j, 2) = j + 3;
     }
   }
 
-  Kokkos::deep_copy( dx.entries , hx.entries );
-  Kokkos::deep_copy( mx.entries , dx.entries );
+  Kokkos::deep_copy(dx.entries, hx.entries);
+  Kokkos::deep_copy(mx.entries, dx.entries);
 
-  ASSERT_EQ( mx.row_map.extent(0) , (size_t) LENGTH + 1 );
+  ASSERT_EQ(mx.row_map.extent(0), (size_t)LENGTH + 1);
 
-  for ( size_t i = 0 ; i < LENGTH ; ++i ) {
+  for (size_t i = 0; i < LENGTH; ++i) {
     const size_t entry_begin = mx.row_map[i];
-    const size_t entry_end   = mx.row_map[i+1];
-    ASSERT_EQ( ( entry_end - entry_begin ) , sizes[i] );
-    for ( size_t j = entry_begin ; j < entry_end ; ++j ) {
-      ASSERT_EQ( (size_t) mx.entries( j , 0 ) , ( j + 1 ) );
-      ASSERT_EQ( (size_t) mx.entries( j , 1 ) , ( j + 2 ) );
-      ASSERT_EQ( (size_t) mx.entries( j , 2 ) , ( j + 3 ) );
+    const size_t entry_end   = mx.row_map[i + 1];
+    ASSERT_EQ((entry_end - entry_begin), sizes[i]);
+    for (size_t j = entry_begin; j < entry_end; ++j) {
+      ASSERT_EQ((size_t)mx.entries(j, 0), (j + 1));
+      ASSERT_EQ((size_t)mx.entries(j, 1), (j + 2));
+      ASSERT_EQ((size_t)mx.entries(j, 2), (j + 3));
     }
   }
 }
 
-template< class Space >
-void run_test_graph3(size_t B, size_t N)
-{
+template <class Space>
+void run_test_graph3(size_t B, size_t N) {
   srand(10310);
 
-  typedef Kokkos::StaticCrsGraph< int , Space > dView ;
-  typedef typename dView::HostMirror hView ;
+  typedef Kokkos::StaticCrsGraph<int, Space> dView;
+  typedef typename dView::HostMirror hView;
 
-  const unsigned LENGTH = 2000 ;
+  const unsigned LENGTH = 2000;
 
-  std::vector< size_t > sizes( LENGTH );
+  std::vector<size_t> sizes(LENGTH);
 
-  size_t total_length = 0 ;
+  size_t total_length = 0;
 
-  for ( size_t i = 0 ; i < LENGTH ; ++i ) {
-    sizes[i] = rand()%1000;
+  for (size_t i = 0; i < LENGTH; ++i) {
+    sizes[i] = rand() % 1000;
   }
 
-  sizes[1] = N;
+  sizes[1]    = N;
   sizes[1998] = N;
 
-  for ( size_t i = 0 ; i < LENGTH ; ++i ) {
+  for (size_t i = 0; i < LENGTH; ++i) {
     total_length += sizes[i];
   }
 
-  int C = 0;
-  dView dx = Kokkos::create_staticcrsgraph<dView>( "test" , sizes );
-  dx.create_block_partitioning(B,C);
-  hView hx = Kokkos::create_mirror( dx );
+  int C    = 0;
+  dView dx = Kokkos::create_staticcrsgraph<dView>("test", sizes);
+  dx.create_block_partitioning(B, C);
+  hView hx = Kokkos::create_mirror(dx);
 
-  for( size_t i = 0; i<B; i++) {
+  for (size_t i = 0; i < B; i++) {
     size_t ne = 0;
-    for(size_t j = hx.row_block_offsets(i); j<hx.row_block_offsets(i+1); j++)
-      ne += hx.row_map(j+1)-hx.row_map(j)+C;
+    for (size_t j = hx.row_block_offsets(i); j < hx.row_block_offsets(i + 1);
+         j++)
+      ne += hx.row_map(j + 1) - hx.row_map(j) + C;
 
-    ASSERT_FALSE((ne>2*((hx.row_map(hx.numRows())+C*hx.numRows())/B))&&(hx.row_block_offsets(i+1)>hx.row_block_offsets(i)+1));
+    ASSERT_FALSE(
+        (ne > 2 * ((hx.row_map(hx.numRows()) + C * hx.numRows()) / B)) &&
+        (hx.row_block_offsets(i + 1) > hx.row_block_offsets(i) + 1));
   }
 }
 
-template< class Space >
-void run_test_graph4()
-{
+template <class Space>
+void run_test_graph4() {
   typedef unsigned ordinal_type;
   typedef Kokkos::LayoutRight layout_type;
   typedef Space space_type;
   typedef Kokkos::MemoryUnmanaged memory_traits_type;
 #ifdef KOKKOS_ENABLE_DEPRECATED_CODE
-  typedef Kokkos::StaticCrsGraph< ordinal_type , layout_type , space_type , ordinal_type , memory_traits_type > dView ;
+  typedef Kokkos::StaticCrsGraph<ordinal_type, layout_type, space_type,
+                                 ordinal_type, memory_traits_type>
+      dView;
 #else
-  typedef Kokkos::StaticCrsGraph< ordinal_type , layout_type , space_type , memory_traits_type > dView ;
+  typedef Kokkos::StaticCrsGraph<ordinal_type, layout_type, space_type,
+                                 memory_traits_type>
+      dView;
 #endif
-  typedef typename dView::HostMirror hView ;
+  typedef typename dView::HostMirror hView;
 
-  dView dx ;
+  dView dx;
 
-  // StaticCrsGraph with Unmanaged trait will contain row_map and entries members
-  // with the Unmanaged memory trait.
-  // Use of such a StaticCrsGraph requires an allocaton of memory for the unmanaged views
-  // to wrap.
+  // StaticCrsGraph with Unmanaged trait will contain row_map and entries
+  // members with the Unmanaged memory trait. Use of such a StaticCrsGraph
+  // requires an allocaton of memory for the unmanaged views to wrap.
   //
   // In this test, a graph (via raw arrays) resides on the host.
-  // The pointers are wrapped by unmanaged Views. 
-  // To make use of this on the device, managed device Views are created (allocation required),
-  // and data from the unmanaged host views is deep copied to the device Views
-  // Unmanaged views of the appropriate type wrap the device data and are assigned to
-  // their corresponding unmanaged view members of the unmanaged StaticCrsGraph
+  // The pointers are wrapped by unmanaged Views.
+  // To make use of this on the device, managed device Views are created
+  // (allocation required), and data from the unmanaged host views is deep
+  // copied to the device Views Unmanaged views of the appropriate type wrap the
+  // device data and are assigned to their corresponding unmanaged view members
+  // of the unmanaged StaticCrsGraph
 
   // Data types for raw pointers storing StaticCrsGraph info
   typedef typename dView::size_type ptr_row_map_type;
   typedef typename dView::data_type ptr_entries_type;
 
   const ordinal_type numRows = 8;
-  const ordinal_type nnz = 24;
-  ptr_row_map_type ptrRaw[] = {0, 4, 8, 10, 12, 14, 16, 20, 24};
-  ptr_entries_type indRaw[] = {0, 1, 4, 5, 0, 1, 4, 5, 2, 3, 2, 3, 4, 5, 4, 5, 2, 3, 6, 7, 2, 3, 6, 7};
+  const ordinal_type nnz     = 24;
+  ptr_row_map_type ptrRaw[]  = {0, 4, 8, 10, 12, 14, 16, 20, 24};
+  ptr_entries_type indRaw[]  = {0, 1, 4, 5, 0, 1, 4, 5, 2, 3, 2, 3,
+                               4, 5, 4, 5, 2, 3, 6, 7, 2, 3, 6, 7};
 
   // Wrap pointers in unmanaged host views
-  typedef typename hView::row_map_type local_row_map_type ;
-  typedef typename hView::entries_type local_entries_type ;
-  local_row_map_type unman_row_map( &(ptrRaw[0]) , numRows+1 );
-  local_entries_type unman_entries( &(indRaw[0]) , nnz );
+  typedef typename hView::row_map_type local_row_map_type;
+  typedef typename hView::entries_type local_entries_type;
+  local_row_map_type unman_row_map(&(ptrRaw[0]), numRows + 1);
+  local_entries_type unman_entries(&(indRaw[0]), nnz);
 
-  hView hx ;
-  hx = hView( unman_entries, unman_row_map );
+  hView hx;
+  hx = hView(unman_entries, unman_row_map);
 
   // Create the device Views for copying the host arrays into
-  // An allocation is needed on the device for the unmanaged StaticCrsGraph to wrap the pointer
-  typedef typename Kokkos::View< ptr_row_map_type*, layout_type, space_type > d_row_map_view_type;
-  typedef typename Kokkos::View< ptr_entries_type*, layout_type, space_type > d_entries_view_type;
+  // An allocation is needed on the device for the unmanaged StaticCrsGraph to
+  // wrap the pointer
+  typedef typename Kokkos::View<ptr_row_map_type*, layout_type, space_type>
+      d_row_map_view_type;
+  typedef typename Kokkos::View<ptr_entries_type*, layout_type, space_type>
+      d_entries_view_type;
 
-  d_row_map_view_type tmp_row_map( "tmp_row_map", numRows+1 );
-  d_entries_view_type tmp_entries( "tmp_entries", nnz );
+  d_row_map_view_type tmp_row_map("tmp_row_map", numRows + 1);
+  d_entries_view_type tmp_entries("tmp_entries", nnz);
 
-  Kokkos::deep_copy (tmp_row_map, unman_row_map);
-  Kokkos::deep_copy (tmp_entries, unman_entries);
+  Kokkos::deep_copy(tmp_row_map, unman_row_map);
+  Kokkos::deep_copy(tmp_entries, unman_entries);
 
-  // Wrap the pointer in unmanaged View and assign to the corresponding StaticCrsGraph member
-  dx.row_map = typename dView::row_map_type(tmp_row_map.data(), numRows+1);
+  // Wrap the pointer in unmanaged View and assign to the corresponding
+  // StaticCrsGraph member
+  dx.row_map = typename dView::row_map_type(tmp_row_map.data(), numRows + 1);
   dx.entries = typename dView::entries_type(tmp_entries.data(), nnz);
 
-  ASSERT_TRUE((std::is_same< typename dView::row_map_type::memory_traits , Kokkos::MemoryUnmanaged >::value));
-  ASSERT_TRUE((std::is_same< typename dView::entries_type::memory_traits , Kokkos::MemoryUnmanaged >::value));
-  ASSERT_TRUE((std::is_same< typename hView::row_map_type::memory_traits , Kokkos::MemoryUnmanaged >::value));
-  ASSERT_TRUE((std::is_same< typename hView::entries_type::memory_traits , Kokkos::MemoryUnmanaged >::value));
+  ASSERT_TRUE((std::is_same<typename dView::row_map_type::memory_traits,
+                            Kokkos::MemoryUnmanaged>::value));
+  ASSERT_TRUE((std::is_same<typename dView::entries_type::memory_traits,
+                            Kokkos::MemoryUnmanaged>::value));
+  ASSERT_TRUE((std::is_same<typename hView::row_map_type::memory_traits,
+                            Kokkos::MemoryUnmanaged>::value));
+  ASSERT_TRUE((std::is_same<typename hView::entries_type::memory_traits,
+                            Kokkos::MemoryUnmanaged>::value));
 }
 
 } /* namespace TestStaticCrsGraph */
 
-TEST_F( TEST_CATEGORY , staticcrsgraph )
-{
-  TestStaticCrsGraph::run_test_graph< TEST_EXECSPACE >();
-  TestStaticCrsGraph::run_test_graph2< TEST_EXECSPACE >();
-  TestStaticCrsGraph::run_test_graph3< TEST_EXECSPACE >(1, 0);
-  TestStaticCrsGraph::run_test_graph3< TEST_EXECSPACE >(1, 1000);
-  TestStaticCrsGraph::run_test_graph3< TEST_EXECSPACE >(1, 10000);
-  TestStaticCrsGraph::run_test_graph3< TEST_EXECSPACE >(1, 100000);
-  TestStaticCrsGraph::run_test_graph3< TEST_EXECSPACE >(3, 0);
-  TestStaticCrsGraph::run_test_graph3< TEST_EXECSPACE >(3, 1000);
-  TestStaticCrsGraph::run_test_graph3< TEST_EXECSPACE >(3, 10000);
-  TestStaticCrsGraph::run_test_graph3< TEST_EXECSPACE >(3, 100000);
-  TestStaticCrsGraph::run_test_graph3< TEST_EXECSPACE >(75, 0);
-  TestStaticCrsGraph::run_test_graph3< TEST_EXECSPACE >(75, 1000);
-  TestStaticCrsGraph::run_test_graph3< TEST_EXECSPACE >(75, 10000);
-  TestStaticCrsGraph::run_test_graph3< TEST_EXECSPACE >(75, 100000);
-  TestStaticCrsGraph::run_test_graph4< TEST_EXECSPACE >();
-}
+TEST(TEST_CATEGORY, staticcrsgraph) {
+  TestStaticCrsGraph::run_test_graph<TEST_EXECSPACE>();
+  TestStaticCrsGraph::run_test_graph2<TEST_EXECSPACE>();
+  TestStaticCrsGraph::run_test_graph3<TEST_EXECSPACE>(1, 0);
+  TestStaticCrsGraph::run_test_graph3<TEST_EXECSPACE>(1, 1000);
+  TestStaticCrsGraph::run_test_graph3<TEST_EXECSPACE>(1, 10000);
+  TestStaticCrsGraph::run_test_graph3<TEST_EXECSPACE>(1, 100000);
+  TestStaticCrsGraph::run_test_graph3<TEST_EXECSPACE>(3, 0);
+  TestStaticCrsGraph::run_test_graph3<TEST_EXECSPACE>(3, 1000);
+  TestStaticCrsGraph::run_test_graph3<TEST_EXECSPACE>(3, 10000);
+  TestStaticCrsGraph::run_test_graph3<TEST_EXECSPACE>(3, 100000);
+  TestStaticCrsGraph::run_test_graph3<TEST_EXECSPACE>(75, 0);
+  TestStaticCrsGraph::run_test_graph3<TEST_EXECSPACE>(75, 1000);
+  TestStaticCrsGraph::run_test_graph3<TEST_EXECSPACE>(75, 10000);
+  TestStaticCrsGraph::run_test_graph3<TEST_EXECSPACE>(75, 100000);
+  TestStaticCrsGraph::run_test_graph4<TEST_EXECSPACE>();
 }
+}  // namespace Test
diff --git a/lib/kokkos/containers/unit_tests/TestUnorderedMap.hpp b/lib/kokkos/containers/unit_tests/TestUnorderedMap.hpp
index 2d34267df3..82782d3bf4 100644
--- a/lib/kokkos/containers/unit_tests/TestUnorderedMap.hpp
+++ b/lib/kokkos/containers/unit_tests/TestUnorderedMap.hpp
@@ -1,10 +1,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -22,10 +23,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -51,8 +52,7 @@ namespace Test {
 namespace Impl {
 
 template <typename MapType, bool Near = false>
-struct TestInsert
-{
+struct TestInsert {
   typedef MapType map_type;
   typedef typename map_type::execution_space execution_space;
   typedef uint32_t value_type;
@@ -61,14 +61,10 @@ struct TestInsert
   uint32_t inserts;
   uint32_t collisions;
 
-  TestInsert( map_type arg_map, uint32_t arg_inserts, uint32_t arg_collisions)
-    : map(arg_map)
-    , inserts(arg_inserts)
-    , collisions(arg_collisions)
-  {}
+  TestInsert(map_type arg_map, uint32_t arg_inserts, uint32_t arg_collisions)
+      : map(arg_map), inserts(arg_inserts), collisions(arg_collisions) {}
 
-  void testit( bool rehash_on_fail = true )
-  {
+  void testit(bool rehash_on_fail = true) {
     execution_space().fence();
 
     uint32_t failed_count = 0;
@@ -77,138 +73,127 @@ struct TestInsert
       Kokkos::parallel_reduce(inserts, *this, failed_count);
 
       if (rehash_on_fail && failed_count > 0u) {
-        const uint32_t new_capacity = map.capacity() + ((map.capacity()*3ull)/20u) + failed_count/collisions ;
-        map.rehash( new_capacity );
+        const uint32_t new_capacity = map.capacity() +
+                                      ((map.capacity() * 3ull) / 20u) +
+                                      failed_count / collisions;
+        map.rehash(new_capacity);
       }
     } while (rehash_on_fail && failed_count > 0u);
 
     execution_space().fence();
   }
 
+  KOKKOS_INLINE_FUNCTION
+  void init(value_type &failed_count) const { failed_count = 0; }
 
   KOKKOS_INLINE_FUNCTION
-  void init( value_type & failed_count ) const { failed_count = 0; }
-
-  KOKKOS_INLINE_FUNCTION
-  void join( volatile value_type & failed_count, const volatile value_type & count ) const
-  { failed_count += count; }
-
-  KOKKOS_INLINE_FUNCTION
-  void operator()(uint32_t i, value_type & failed_count) const
-  {
-    const uint32_t key = Near ? i/collisions : i%(inserts/collisions);
-    if (map.insert(key,i).failed()) ++failed_count;
+  void join(volatile value_type &failed_count,
+            const volatile value_type &count) const {
+    failed_count += count;
   }
 
+  KOKKOS_INLINE_FUNCTION
+  void operator()(uint32_t i, value_type &failed_count) const {
+    const uint32_t key = Near ? i / collisions : i % (inserts / collisions);
+    if (map.insert(key, i).failed()) ++failed_count;
+  }
 };
 
-  template <typename MapType, bool Near>
-  struct TestErase
-  {
-    typedef TestErase<MapType, Near> self_type;
+template <typename MapType, bool Near>
+struct TestErase {
+  typedef TestErase<MapType, Near> self_type;
 
-    typedef MapType map_type;
-    typedef typename MapType::execution_space execution_space;
+  typedef MapType map_type;
+  typedef typename MapType::execution_space execution_space;
 
-    map_type m_map;
-    uint32_t m_num_erase;
-    uint32_t m_num_duplicates;
+  map_type m_map;
+  uint32_t m_num_erase;
+  uint32_t m_num_duplicates;
 
-    TestErase(map_type map, uint32_t num_erases, uint32_t num_duplicates)
-      : m_map(map)
-      , m_num_erase(num_erases)
-      , m_num_duplicates(num_duplicates)
-    {}
+  TestErase(map_type map, uint32_t num_erases, uint32_t num_duplicates)
+      : m_map(map), m_num_erase(num_erases), m_num_duplicates(num_duplicates) {}
 
-    void testit()
-    {
-      execution_space().fence();
-      Kokkos::parallel_for(m_num_erase, *this);
-      execution_space().fence();
+  void testit() {
+    execution_space().fence();
+    Kokkos::parallel_for(m_num_erase, *this);
+    execution_space().fence();
+  }
+
+  KOKKOS_INLINE_FUNCTION
+  void operator()(typename execution_space::size_type i) const {
+    if (Near) {
+      m_map.erase(i / m_num_duplicates);
+    } else {
+      m_map.erase(i % (m_num_erase / m_num_duplicates));
     }
+  }
+};
 
-    KOKKOS_INLINE_FUNCTION
-    void operator()(typename execution_space::size_type i) const
-    {
-      if (Near) {
-        m_map.erase(i/m_num_duplicates);
-      }
-      else {
-        m_map.erase(i%(m_num_erase/m_num_duplicates));
-      }
+template <typename MapType>
+struct TestFind {
+  typedef MapType map_type;
+  typedef typename MapType::execution_space::execution_space execution_space;
+  typedef uint32_t value_type;
 
-    }
-  };
+  map_type m_map;
+  uint32_t m_num_insert;
+  uint32_t m_num_duplicates;
+  uint32_t m_max_key;
 
-  template <typename MapType>
-  struct TestFind
-  {
-    typedef MapType map_type;
-    typedef typename MapType::execution_space::execution_space execution_space;
-    typedef uint32_t value_type;
+  TestFind(map_type map, uint32_t num_inserts, uint32_t num_duplicates)
+      : m_map(map),
+        m_num_insert(num_inserts),
+        m_num_duplicates(num_duplicates),
+        m_max_key(((num_inserts + num_duplicates) - 1) / num_duplicates) {}
 
-    map_type m_map;
-    uint32_t m_num_insert;
-    uint32_t m_num_duplicates;
-    uint32_t m_max_key;
+  void testit(value_type &errors) {
+    execution_space().fence();
+    Kokkos::parallel_reduce(m_map.capacity(), *this, errors);
+    execution_space().fence();
+  }
 
-    TestFind(map_type map, uint32_t num_inserts, uint32_t num_duplicates)
-      : m_map(map)
-      , m_num_insert(num_inserts)
-      , m_num_duplicates(num_duplicates)
-      , m_max_key( ((num_inserts + num_duplicates) - 1)/num_duplicates )
-    {}
+  KOKKOS_INLINE_FUNCTION
+  static void init(value_type &dst) { dst = 0; }
 
-    void testit(value_type &errors)
-    {
-      execution_space().fence();
-      Kokkos::parallel_reduce(m_map.capacity(), *this, errors);
-      execution_space().fence();
-    }
+  KOKKOS_INLINE_FUNCTION
+  static void join(volatile value_type &dst, const volatile value_type &src) {
+    dst += src;
+  }
 
-    KOKKOS_INLINE_FUNCTION
-    static void init( value_type & dst)
-    {
-      dst = 0;
-    }
+  KOKKOS_INLINE_FUNCTION
+  void operator()(typename execution_space::size_type i,
+                  value_type &errors) const {
+    const bool expect_to_find_i = (i < m_max_key);
 
-    KOKKOS_INLINE_FUNCTION
-    static void join( volatile value_type & dst, const volatile value_type & src)
-    { dst += src; }
-
-    KOKKOS_INLINE_FUNCTION
-    void operator()(typename execution_space::size_type i, value_type & errors) const
-    {
-      const bool expect_to_find_i = (i < m_max_key);
-
-      const bool exists = m_map.exists(i);
-
-      if (expect_to_find_i && !exists)  ++errors;
-      if (!expect_to_find_i && exists)  ++errors;
-    }
-  };
-
-} // namespace Impl
+    const bool exists = m_map.exists(i);
 
+    if (expect_to_find_i && !exists) ++errors;
+    if (!expect_to_find_i && exists) ++errors;
+  }
+};
 
+}  // namespace Impl
 
 template <typename Device>
-void test_insert( uint32_t num_nodes , uint32_t num_inserts , uint32_t num_duplicates , bool near )
-{
-  typedef Kokkos::UnorderedMap<uint32_t,uint32_t, Device> map_type;
-  typedef Kokkos::UnorderedMap<const uint32_t,const uint32_t, Device> const_map_type;
+void test_insert(uint32_t num_nodes, uint32_t num_inserts,
+                 uint32_t num_duplicates, bool near) {
+  typedef Kokkos::UnorderedMap<uint32_t, uint32_t, Device> map_type;
+  typedef Kokkos::UnorderedMap<const uint32_t, const uint32_t, Device>
+      const_map_type;
 
-  const uint32_t expected_inserts = (num_inserts + num_duplicates -1u) / num_duplicates;
+  const uint32_t expected_inserts =
+      (num_inserts + num_duplicates - 1u) / num_duplicates;
 
   map_type map;
-  map.rehash(num_nodes,false);
+  map.rehash(num_nodes, false);
 
   if (near) {
-    Impl::TestInsert<map_type,true> test_insert(map, num_inserts, num_duplicates);
+    Impl::TestInsert<map_type, true> test_insert(map, num_inserts,
+                                                 num_duplicates);
     test_insert.testit();
-  } else
-  {
-    Impl::TestInsert<map_type,false> test_insert(map, num_inserts, num_duplicates);
+  } else {
+    Impl::TestInsert<map_type, false> test_insert(map, num_inserts,
+                                                  num_duplicates);
     test_insert.testit();
   }
 
@@ -220,19 +205,21 @@ void test_insert( uint32_t num_nodes , uint32_t num_inserts , uint32_t num_dupli
 
   const uint32_t map_size = map.size();
 
-  ASSERT_FALSE( map.failed_insert());
+  ASSERT_FALSE(map.failed_insert());
   {
     EXPECT_EQ(expected_inserts, map_size);
 
     {
       uint32_t find_errors = 0;
-      Impl::TestFind<const_map_type> test_find(map, num_inserts, num_duplicates);
+      Impl::TestFind<const_map_type> test_find(map, num_inserts,
+                                               num_duplicates);
       test_find.testit(find_errors);
-      EXPECT_EQ( 0u, find_errors);
+      EXPECT_EQ(0u, find_errors);
     }
 
     map.begin_erase();
-    Impl::TestErase<map_type,false> test_erase(map, num_inserts, num_duplicates);
+    Impl::TestErase<map_type, false> test_erase(map, num_inserts,
+                                                num_duplicates);
     test_erase.testit();
     map.end_erase();
     EXPECT_EQ(0u, map.size());
@@ -240,56 +227,53 @@ void test_insert( uint32_t num_nodes , uint32_t num_inserts , uint32_t num_dupli
 }
 
 template <typename Device>
-void test_failed_insert( uint32_t num_nodes)
-{
-  typedef Kokkos::UnorderedMap<uint32_t,uint32_t, Device> map_type;
+void test_failed_insert(uint32_t num_nodes) {
+  typedef Kokkos::UnorderedMap<uint32_t, uint32_t, Device> map_type;
 
   map_type map(num_nodes);
-  Impl::TestInsert<map_type> test_insert(map, 2u*num_nodes, 1u);
+  Impl::TestInsert<map_type> test_insert(map, 2u * num_nodes, 1u);
   test_insert.testit(false /*don't rehash on fail*/);
   typename Device::execution_space().fence();
 
-  EXPECT_TRUE( map.failed_insert() );
+  EXPECT_TRUE(map.failed_insert());
 }
 
-
-
 template <typename Device>
-void test_deep_copy( uint32_t num_nodes )
-{
-  typedef Kokkos::UnorderedMap<uint32_t,uint32_t, Device> map_type;
-  typedef Kokkos::UnorderedMap<const uint32_t, const uint32_t, Device> const_map_type;
+void test_deep_copy(uint32_t num_nodes) {
+  typedef Kokkos::UnorderedMap<uint32_t, uint32_t, Device> map_type;
+  typedef Kokkos::UnorderedMap<const uint32_t, const uint32_t, Device>
+      const_map_type;
 
-  typedef typename map_type::HostMirror host_map_type ;
-  // typedef Kokkos::UnorderedMap<uint32_t, uint32_t, typename Device::host_mirror_execution_space > host_map_type;
+  typedef typename map_type::HostMirror host_map_type;
+  // typedef Kokkos::UnorderedMap<uint32_t, uint32_t, typename
+  // Device::host_mirror_execution_space > host_map_type;
 
   map_type map;
-  map.rehash(num_nodes,false);
+  map.rehash(num_nodes, false);
 
   {
     Impl::TestInsert<map_type> test_insert(map, num_nodes, 1);
     test_insert.testit();
-    ASSERT_EQ( map.size(), num_nodes);
-    ASSERT_FALSE( map.failed_insert() );
+    ASSERT_EQ(map.size(), num_nodes);
+    ASSERT_FALSE(map.failed_insert());
     {
       uint32_t find_errors = 0;
       Impl::TestFind<map_type> test_find(map, num_nodes, 1);
       test_find.testit(find_errors);
-      EXPECT_EQ( find_errors, 0u);
+      EXPECT_EQ(find_errors, 0u);
     }
-
   }
 
   host_map_type hmap;
   Kokkos::deep_copy(hmap, map);
 
-  ASSERT_EQ( map.size(), hmap.size());
-  ASSERT_EQ( map.capacity(), hmap.capacity());
+  ASSERT_EQ(map.size(), hmap.size());
+  ASSERT_EQ(map.capacity(), hmap.capacity());
   {
     uint32_t find_errors = 0;
     Impl::TestFind<host_map_type> test_find(hmap, num_nodes, 1);
     test_find.testit(find_errors);
-    EXPECT_EQ( find_errors, 0u);
+    EXPECT_EQ(find_errors, 0u);
   }
 
   map_type mmap;
@@ -297,35 +281,31 @@ void test_deep_copy( uint32_t num_nodes )
 
   const_map_type cmap = mmap;
 
-  EXPECT_EQ( cmap.size(), num_nodes);
+  EXPECT_EQ(cmap.size(), num_nodes);
 
   {
     uint32_t find_errors = 0;
     Impl::TestFind<const_map_type> test_find(cmap, num_nodes, 1);
     test_find.testit(find_errors);
-    EXPECT_EQ( find_errors, 0u);
+    EXPECT_EQ(find_errors, 0u);
   }
-
 }
 
-TEST_F( TEST_CATEGORY, UnorderedMap_insert) {
-  for (int i=0; i<500; ++i) {
+TEST(TEST_CATEGORY, UnorderedMap_insert) {
+  for (int i = 0; i < 500; ++i) {
     test_insert<TEST_EXECSPACE>(100000, 90000, 100, true);
     test_insert<TEST_EXECSPACE>(100000, 90000, 100, false);
   }
 }
 
-TEST_F( TEST_CATEGORY, UnorderedMap_failed_insert) {
-  for (int i=0; i<1000; ++i)
-    test_failed_insert<TEST_EXECSPACE>(10000);
+TEST(TEST_CATEGORY, UnorderedMap_failed_insert) {
+  for (int i = 0; i < 1000; ++i) test_failed_insert<TEST_EXECSPACE>(10000);
 }
 
-TEST_F( TEST_CATEGORY, UnorderedMap_deep_copy) {
-  for (int i=0; i<2; ++i)
-    test_deep_copy<TEST_EXECSPACE>(10000);
+TEST(TEST_CATEGORY, UnorderedMap_deep_copy) {
+  for (int i = 0; i < 2; ++i) test_deep_copy<TEST_EXECSPACE>(10000);
 }
 
-} // namespace Test
-
-#endif //KOKKOS_TEST_UNORDERED_MAP_HPP
+}  // namespace Test
 
+#endif  // KOKKOS_TEST_UNORDERED_MAP_HPP
diff --git a/lib/kokkos/containers/unit_tests/TestVector.hpp b/lib/kokkos/containers/unit_tests/TestVector.hpp
index b766ae8718..4174a477c4 100644
--- a/lib/kokkos/containers/unit_tests/TestVector.hpp
+++ b/lib/kokkos/containers/unit_tests/TestVector.hpp
@@ -1,10 +1,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -22,10 +23,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -52,85 +53,193 @@ namespace Test {
 
 namespace Impl {
 
-  template <typename Scalar, class Device>
-  struct test_vector_combinations
-  {
-    typedef test_vector_combinations<Scalar,Device> self_type;
+template <typename Scalar, class Device>
+struct test_vector_insert {
+  typedef Scalar scalar_type;
+  typedef Device execution_space;
 
-    typedef Scalar scalar_type;
-    typedef Device execution_space;
+  template <typename Vector>
+  void run_test(Vector& a) {
+    int n = a.size();
 
-    Scalar reference;
-    Scalar result;
+    auto it = a.begin();
+    it += 15;
+    ASSERT_EQ(*it, scalar_type(1));
 
-    template <typename Vector>
-    Scalar run_me(unsigned int n){
-      Vector a(n,1);
+    auto it_return = a.insert(it, scalar_type(3));
+    ASSERT_EQ(a.size(), n + 1);
+    ASSERT_EQ(std::distance(it_return, a.begin() + 15), 0);
 
+    it = a.begin();
+    it += 17;
+// Looks like some std::vector implementations do not have the restriction
+// right on the overload taking three iterators, and thus the following call
+// will hit that overload and then fail to compile.
+#if defined(KOKKOS_COMPILER_INTEL) && (1700 > KOKKOS_COMPILER_INTEL)
+// And at least GCC 4.8.4 doesn't implement vector insert correct for C++11
+// Return type is void ...
+#if (__GNUC__ < 5)
+    a.insert(it, typename Vector::size_type(n + 5), scalar_type(5));
+    it_return = a.begin() + 17;
+#else
+    it_return = a.insert(it, typename Vector::size_type(n + 5), scalar_type(5));
+#endif
+#else
+#if (__GNUC__ < 5)
+    a.insert(it, n + 5, scalar_type(5));
+    it_return = a.begin() + 17;
+#else
+    it_return = a.insert(it, n + 5, scalar_type(5));
+#endif
+#endif
 
-      a.push_back(2);
-      a.resize(n+4);
-      a[n+1] = 3;
-      a[n+2] = 4;
-      a[n+3] = 5;
+    ASSERT_EQ(a.size(), n + 1 + n + 5);
+    ASSERT_EQ(std::distance(it_return, a.begin() + 17), 0);
 
+    Vector b;
 
-      Scalar temp1 = a[2];
-      Scalar temp2 = a[n];
-      Scalar temp3 = a[n+1];
+// Looks like some std::vector implementations do not have the restriction
+// right on the overload taking three iterators, and thus the following call
+// will hit that overload and then fail to compile.
+#if defined(KOKKOS_COMPILER_INTEL) && (1700 > KOKKOS_COMPILER_INTEL)
+    b.insert(b.begin(), typename Vector::size_type(7), 9);
+#else
+    b.insert(b.begin(), 7, 9);
+#endif
+    ASSERT_EQ(b.size(), 7);
+    ASSERT_EQ(b[0], scalar_type(9));
 
-      a.assign(n+2,-1);
+    it = a.begin();
+    it += 27 + n;
+#if (__GNUC__ < 5)
+    a.insert(it, b.begin(), b.end());
+    it_return = a.begin() + (27 + n);
+#else
+    it_return = a.insert(it, b.begin(), b.end());
+#endif
+    ASSERT_EQ(a.size(), n + 1 + n + 5 + 7);
+    ASSERT_EQ(std::distance(it_return, a.begin() + 27 + n), 0);
 
-      a[2] = temp1;
-      a[n] = temp2;
-      a[n+1] = temp3;
+    // Testing insert at end via all three function interfaces
+    a.insert(a.end(), 11);
+#if defined(KOKKOS_COMPILER_INTEL) && (1700 > KOKKOS_COMPILER_INTEL)
+    a.insert(a.end(), typename Vector::size_type(2), 12);
+#else
+    a.insert(a.end(), 2, 12);
+#endif
+    a.insert(a.end(), b.begin(), b.end());
+  }
 
-      Scalar test1 = 0;
-      for(unsigned int i=0; i<a.size(); i++)
-        test1+=a[i];
-
-      a.assign(n+1,-2);
-      Scalar test2 = 0;
-      for(unsigned int i=0; i<a.size(); i++)
-        test2+=a[i];
-
-      a.reserve(n+10);
-
-      Scalar test3 = 0;
-      for(unsigned int i=0; i<a.size(); i++)
-        test3+=a[i];
-
-
-      return (test1*test2+test3)*test2+test1*test3;
+  template <typename Vector>
+  void check_test(Vector& a, int n) {
+    for (int i = 0; i < (int)a.size(); i++) {
+      if (i == 15)
+        ASSERT_EQ(a[i], scalar_type(3));
+      else if (i > 16 && i < 16 + 6 + n)
+        ASSERT_EQ(a[i], scalar_type(5));
+      else if (i > 26 + n && i < 34 + n)
+        ASSERT_EQ(a[i], scalar_type(9));
+      else if (i == (int)a.size() - 10)
+        ASSERT_EQ(a[i], scalar_type(11));
+      else if ((i == (int)a.size() - 9) || (i == (int)a.size() - 8))
+        ASSERT_EQ(a[i], scalar_type(12));
+      else if (i > (int)a.size() - 8)
+        ASSERT_EQ(a[i], scalar_type(9));
+      else
+        ASSERT_EQ(a[i], scalar_type(1));
     }
+  }
 
-
-    test_vector_combinations(unsigned int size)
+  test_vector_insert(unsigned int size) {
     {
-      reference = run_me<std::vector<Scalar> >(size);
-      result = run_me<Kokkos::vector<Scalar,Device> >(size);
+      std::vector<Scalar> a(size, scalar_type(1));
+      run_test(a);
+      check_test(a, size);
     }
+    {
+      Kokkos::vector<Scalar, Device> a(size, scalar_type(1));
+      a.sync_device();
+      run_test(a);
+      a.sync_host();
+      check_test(a, size);
+    }
+    {
+      Kokkos::vector<Scalar, Device> a(size, scalar_type(1));
+      a.sync_host();
+      run_test(a);
+      check_test(a, size);
+    }
+  }
+};
 
-   };
+template <typename Scalar, class Device>
+struct test_vector_combinations {
+  typedef test_vector_combinations<Scalar, Device> self_type;
 
-} // namespace Impl
+  typedef Scalar scalar_type;
+  typedef Device execution_space;
 
+  Scalar reference;
+  Scalar result;
 
+  template <typename Vector>
+  Scalar run_me(unsigned int n) {
+    Vector a(n, 1);
 
+    a.push_back(2);
+    a.resize(n + 4);
+    a[n + 1] = 3;
+    a[n + 2] = 4;
+    a[n + 3] = 5;
+
+    Scalar temp1 = a[2];
+    Scalar temp2 = a[n];
+    Scalar temp3 = a[n + 1];
+
+    a.assign(n + 2, -1);
+
+    a[2]     = temp1;
+    a[n]     = temp2;
+    a[n + 1] = temp3;
+
+    Scalar test1 = 0;
+    for (unsigned int i = 0; i < a.size(); i++) test1 += a[i];
+
+    a.assign(n + 1, -2);
+    Scalar test2 = 0;
+    for (unsigned int i = 0; i < a.size(); i++) test2 += a[i];
+
+    a.reserve(n + 10);
+
+    Scalar test3 = 0;
+    for (unsigned int i = 0; i < a.size(); i++) test3 += a[i];
+
+    return (test1 * test2 + test3) * test2 + test1 * test3;
+  }
+
+  test_vector_combinations(unsigned int size) {
+    reference = run_me<std::vector<Scalar> >(size);
+    result    = run_me<Kokkos::vector<Scalar, Device> >(size);
+  }
+};
+
+}  // namespace Impl
 
 template <typename Scalar, typename Device>
-void test_vector_combinations(unsigned int size)
-{
-  Impl::test_vector_combinations<Scalar,Device> test(size);
-  ASSERT_EQ( test.reference, test.result);
+void test_vector_combinations(unsigned int size) {
+  Impl::test_vector_combinations<Scalar, Device> test(size);
+  ASSERT_EQ(test.reference, test.result);
 }
 
-TEST_F( TEST_CATEGORY, vector_combination) {
-  test_vector_combinations<int,TEST_EXECSPACE>(10);
-  test_vector_combinations<int,TEST_EXECSPACE>(3057);
+TEST(TEST_CATEGORY, vector_combination) {
+  test_vector_combinations<int, TEST_EXECSPACE>(10);
+  test_vector_combinations<int, TEST_EXECSPACE>(3057);
 }
 
-} // namespace Test
+TEST(TEST_CATEGORY, vector_insert) {
+  Impl::test_vector_insert<int, TEST_EXECSPACE>(3057);
+}
 
-#endif //KOKKOS_TEST_UNORDERED_MAP_HPP
+}  // namespace Test
 
+#endif  // KOKKOS_TEST_UNORDERED_MAP_HPP
diff --git a/lib/kokkos/containers/unit_tests/TestViewCtorPropEmbeddedDim.hpp b/lib/kokkos/containers/unit_tests/TestViewCtorPropEmbeddedDim.hpp
index d4b7cf0bdb..3f7d4101f7 100644
--- a/lib/kokkos/containers/unit_tests/TestViewCtorPropEmbeddedDim.hpp
+++ b/lib/kokkos/containers/unit_tests/TestViewCtorPropEmbeddedDim.hpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -55,63 +56,58 @@ namespace Test {
 
 namespace {
 
-template <typename ExecSpace >
+template <typename ExecSpace>
 struct TestViewCtorProp_EmbeddedDim {
+  using ViewIntType    = typename Kokkos::View<int**, ExecSpace>;
+  using ViewDoubleType = typename Kokkos::View<double*, ExecSpace>;
 
-  using ViewIntType     = typename Kokkos::View< int**, ExecSpace >;
-  using ViewDoubleType     = typename Kokkos::View< double*, ExecSpace >;
+  using DynRankViewIntType    = typename Kokkos::DynRankView<int, ExecSpace>;
+  using DynRankViewDoubleType = typename Kokkos::DynRankView<double, ExecSpace>;
 
-  using DynRankViewIntType     = typename Kokkos::DynRankView< int, ExecSpace >;
-  using DynRankViewDoubleType     = typename Kokkos::DynRankView< double, ExecSpace >;
-
-  // Cuda 7.0 has issues with using a lamda in parallel_for to initialize the view - replace with this functor
-  template < class ViewType >
+  // Cuda 7.0 has issues with using a lambda in parallel_for to initialize the
+  // view - replace with this functor
+  template <class ViewType>
   struct Functor {
-
     ViewType v;
 
-    Functor( const ViewType & v_ ) : v(v_) {}
+    Functor(const ViewType& v_) : v(v_) {}
 
     KOKKOS_INLINE_FUNCTION
-    void operator()( const int i ) const {
-      v(i) = i;
-    }
-
+    void operator()(const int i) const { v(i) = i; }
   };
 
-
-  static void test_vcpt( const int N0, const int N1 )
-  {
-
+  static void test_vcpt(const int N0, const int N1) {
     // Create two views to test
     {
-      using VIT = typename TestViewCtorProp_EmbeddedDim::ViewIntType ;
-      using VDT = typename TestViewCtorProp_EmbeddedDim::ViewDoubleType ;
+      using VIT = typename TestViewCtorProp_EmbeddedDim::ViewIntType;
+      using VDT = typename TestViewCtorProp_EmbeddedDim::ViewDoubleType;
 
       VIT vi1("vi1", N0, N1);
       VDT vd1("vd1", N0);
 
-      // TEST: Test for common type between two views, one with type double, other with type int
-      // Deduce common value_type and construct a view with that type
+      // TEST: Test for common type between two views, one with type double,
+      // other with type int Deduce common value_type and construct a view with
+      // that type
       {
         // Two views
         auto view_alloc_arg = Kokkos::common_view_alloc_prop(vi1, vd1);
-        typedef typename decltype( view_alloc_arg )::value_type                    CommonViewValueType;
-        typedef typename Kokkos::View< CommonViewValueType*, ExecSpace >  CVT;
-        typedef typename CVT::HostMirror                                           HostCVT;
+        typedef
+            typename decltype(view_alloc_arg)::value_type CommonViewValueType;
+        typedef typename Kokkos::View<CommonViewValueType*, ExecSpace> CVT;
+        typedef typename CVT::HostMirror HostCVT;
 
-        // Construct View using the common type; for case of specialization, an 'embedded_dim' would be stored by view_alloc_arg
-        CVT cv1( Kokkos::view_alloc( "cv1", view_alloc_arg ), N0*N1 );
+        // Construct View using the common type; for case of specialization, an
+        // 'embedded_dim' would be stored by view_alloc_arg
+        CVT cv1(Kokkos::view_alloc("cv1", view_alloc_arg), N0 * N1);
 
-        Kokkos::parallel_for( Kokkos::RangePolicy< ExecSpace >(0, N0*N1), 
-          Functor<CVT>(cv1)
-        );
+        Kokkos::parallel_for(Kokkos::RangePolicy<ExecSpace>(0, N0 * N1),
+                             Functor<CVT>(cv1));
 
-        HostCVT hcv1 = Kokkos::create_mirror_view( cv1 );
-        Kokkos::deep_copy( hcv1, cv1 );
+        HostCVT hcv1 = Kokkos::create_mirror_view(cv1);
+        Kokkos::deep_copy(hcv1, cv1);
 
-        ASSERT_EQ( (std::is_same< CommonViewValueType, double >::value) , true ) ;
-      #if 0
+        ASSERT_EQ((std::is_same<CommonViewValueType, double>::value), true);
+#if 0
       // debug output
       for ( int i = 0; i < N0*N1; ++i ) {
         printf(" Output check: hcv1(%d) = %lf\n ", i, hcv1(i) );
@@ -126,91 +122,92 @@ struct TestViewCtorProp_EmbeddedDim {
         printf("WRONG common value_type\n");
       }
       // end debug output
-      #endif
+#endif
       }
 
       {
         // Single view
         auto view_alloc_arg = Kokkos::common_view_alloc_prop(vi1);
-        typedef typename decltype( view_alloc_arg )::value_type                    CommonViewValueType;
-        typedef typename Kokkos::View< CommonViewValueType*, ExecSpace >  CVT;
-        typedef typename CVT::HostMirror                                           HostCVT;
+        typedef
+            typename decltype(view_alloc_arg)::value_type CommonViewValueType;
+        typedef typename Kokkos::View<CommonViewValueType*, ExecSpace> CVT;
+        typedef typename CVT::HostMirror HostCVT;
 
-        // Construct View using the common type; for case of specialization, an 'embedded_dim' would be stored by view_alloc_arg
-        CVT cv1( Kokkos::view_alloc( "cv1", view_alloc_arg ), N0*N1 );
+        // Construct View using the common type; for case of specialization, an
+        // 'embedded_dim' would be stored by view_alloc_arg
+        CVT cv1(Kokkos::view_alloc("cv1", view_alloc_arg), N0 * N1);
 
-        Kokkos::parallel_for( Kokkos::RangePolicy< ExecSpace >(0, N0*N1), 
-          Functor<CVT>(cv1)
-        );
+        Kokkos::parallel_for(Kokkos::RangePolicy<ExecSpace>(0, N0 * N1),
+                             Functor<CVT>(cv1));
 
-        HostCVT hcv1 = Kokkos::create_mirror_view( cv1 );
-        Kokkos::deep_copy( hcv1, cv1 );
+        HostCVT hcv1 = Kokkos::create_mirror_view(cv1);
+        Kokkos::deep_copy(hcv1, cv1);
 
-        ASSERT_EQ( (std::is_same< CommonViewValueType, int>::value) , true ) ;
+        ASSERT_EQ((std::is_same<CommonViewValueType, int>::value), true);
       }
-
     }
 
     // Create two dynamic rank views to test
     {
-      using VIT = typename TestViewCtorProp_EmbeddedDim::DynRankViewIntType ;
-      using VDT = typename TestViewCtorProp_EmbeddedDim::DynRankViewDoubleType ;
+      using VIT = typename TestViewCtorProp_EmbeddedDim::DynRankViewIntType;
+      using VDT = typename TestViewCtorProp_EmbeddedDim::DynRankViewDoubleType;
 
       VIT vi1("vi1", N0, N1);
       VDT vd1("vd1", N0);
 
-      // TEST: Test for common type between two views, one with type double, other with type int
-      // Deduce common value_type and construct a view with that type
+      // TEST: Test for common type between two views, one with type double,
+      // other with type int Deduce common value_type and construct a view with
+      // that type
       {
         // Two views
-        auto view_alloc_arg = Kokkos::common_view_alloc_prop( vi1, vd1 );
-        typedef typename decltype( view_alloc_arg )::value_type                    CommonViewValueType;
-        typedef typename Kokkos::View< CommonViewValueType*, ExecSpace >  CVT;
-        typedef typename CVT::HostMirror                                           HostCVT;
+        auto view_alloc_arg = Kokkos::common_view_alloc_prop(vi1, vd1);
+        typedef
+            typename decltype(view_alloc_arg)::value_type CommonViewValueType;
+        typedef typename Kokkos::View<CommonViewValueType*, ExecSpace> CVT;
+        typedef typename CVT::HostMirror HostCVT;
 
-        // Construct View using the common type; for case of specialization, an 'embedded_dim' would be stored by view_alloc_arg
-        CVT cv1( Kokkos::view_alloc( "cv1", view_alloc_arg ), N0*N1 );
+        // Construct View using the common type; for case of specialization, an
+        // 'embedded_dim' would be stored by view_alloc_arg
+        CVT cv1(Kokkos::view_alloc("cv1", view_alloc_arg), N0 * N1);
 
+        Kokkos::parallel_for(Kokkos::RangePolicy<ExecSpace>(0, N0 * N1),
+                             Functor<CVT>(cv1));
 
-        Kokkos::parallel_for( Kokkos::RangePolicy< ExecSpace >(0, N0*N1), 
-          Functor<CVT>(cv1)
-        );
+        HostCVT hcv1 = Kokkos::create_mirror_view(cv1);
+        Kokkos::deep_copy(hcv1, cv1);
 
-        HostCVT hcv1 = Kokkos::create_mirror_view( cv1 );
-        Kokkos::deep_copy( hcv1, cv1 );
-
-        ASSERT_EQ( (std::is_same< CommonViewValueType, double >::value) , true ) ;
+        ASSERT_EQ((std::is_same<CommonViewValueType, double>::value), true);
       }
 
       {
         // Single views
-        auto view_alloc_arg = Kokkos::common_view_alloc_prop( vi1 );
-        typedef typename decltype( view_alloc_arg )::value_type                    CommonViewValueType;
-        typedef typename Kokkos::View< CommonViewValueType*, ExecSpace >  CVT;
-        typedef typename CVT::HostMirror                                           HostCVT;
+        auto view_alloc_arg = Kokkos::common_view_alloc_prop(vi1);
+        typedef
+            typename decltype(view_alloc_arg)::value_type CommonViewValueType;
+        typedef typename Kokkos::View<CommonViewValueType*, ExecSpace> CVT;
+        typedef typename CVT::HostMirror HostCVT;
 
-        // Construct View using the common type; for case of specialization, an 'embedded_dim' would be stored by view_alloc_arg
-        CVT cv1( Kokkos::view_alloc( "cv1", view_alloc_arg ), N0*N1 );
+        // Construct View using the common type; for case of specialization, an
+        // 'embedded_dim' would be stored by view_alloc_arg
+        CVT cv1(Kokkos::view_alloc("cv1", view_alloc_arg), N0 * N1);
 
-        Kokkos::parallel_for( Kokkos::RangePolicy< ExecSpace >(0, N0*N1), 
-          Functor<CVT>(cv1)
-        );
+        Kokkos::parallel_for(Kokkos::RangePolicy<ExecSpace>(0, N0 * N1),
+                             Functor<CVT>(cv1));
 
-        HostCVT hcv1 = Kokkos::create_mirror_view( cv1 );
-        Kokkos::deep_copy( hcv1, cv1 );
+        HostCVT hcv1 = Kokkos::create_mirror_view(cv1);
+        Kokkos::deep_copy(hcv1, cv1);
 
-        ASSERT_EQ( (std::is_same< CommonViewValueType, int>::value) , true ) ;
+        ASSERT_EQ((std::is_same<CommonViewValueType, int>::value), true);
       }
     }
 
+  }  // end test_vcpt
 
-  } // end test_vcpt
+};  // end struct
 
-}; // end struct
+}  // namespace
 
-} // namespace
-
-TEST_F( TEST_CATEGORY, viewctorprop_embedded_dim ) {
-  TestViewCtorProp_EmbeddedDim< TEST_EXECSPACE >::test_vcpt( 2, 3 );
+TEST(TEST_CATEGORY, viewctorprop_embedded_dim) {
+  TestViewCtorProp_EmbeddedDim<TEST_EXECSPACE>::test_vcpt(2, 3);
 }
-} // namespace Test
+}  // namespace Test
diff --git a/lib/kokkos/containers/unit_tests/UnitTestMain.cpp b/lib/kokkos/containers/unit_tests/UnitTestMain.cpp
index 508b43efd8..e245aad35f 100644
--- a/lib/kokkos/containers/unit_tests/UnitTestMain.cpp
+++ b/lib/kokkos/containers/unit_tests/UnitTestMain.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -42,14 +43,12 @@
 */
 
 #include <gtest/gtest.h>
-#include <cstdlib>
 #include <Kokkos_Core.hpp>
 
 int main(int argc, char *argv[]) {
-  Kokkos::initialize(argc,argv);
-  ::testing::InitGoogleTest(&argc,argv);
+  Kokkos::initialize(argc, argv);
+  ::testing::InitGoogleTest(&argc, argv);
   int result = RUN_ALL_TESTS();
   Kokkos::finalize();
   return result;
 }
-
diff --git a/lib/kokkos/containers/unit_tests/cuda/TestCuda_BitSet.cpp b/lib/kokkos/containers/unit_tests/cuda/TestCuda_BitSet.cpp
index 5f7bc684e6..5306ab3883 100644
--- a/lib/kokkos/containers/unit_tests/cuda/TestCuda_BitSet.cpp
+++ b/lib/kokkos/containers/unit_tests/cuda/TestCuda_BitSet.cpp
@@ -3,10 +3,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -42,6 +43,5 @@
 //@HEADER
 */
 
-#include<cuda/TestCuda_Category.hpp>
-#include<TestBitset.hpp>
-
+#include <cuda/TestCuda_Category.hpp>
+#include <TestBitset.hpp>
diff --git a/lib/kokkos/containers/unit_tests/cuda/TestCuda_Category.hpp b/lib/kokkos/containers/unit_tests/cuda/TestCuda_Category.hpp
index 3e0d142480..50935d7a34 100644
--- a/lib/kokkos/containers/unit_tests/cuda/TestCuda_Category.hpp
+++ b/lib/kokkos/containers/unit_tests/cuda/TestCuda_Category.hpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -44,21 +45,6 @@
 #ifndef KOKKOS_TEST_CUDA_HPP
 #define KOKKOS_TEST_CUDA_HPP
 
-#include <gtest/gtest.h>
-
-namespace Test {
-
-class cuda : public ::testing::Test {
-protected:
-  static void SetUpTestCase() {
-  }
-
-  static void TearDownTestCase() {
-  }
-};
-
-} // namespace Test
-
 #define TEST_CATEGORY cuda
 #define TEST_EXECSPACE Kokkos::Cuda
 
diff --git a/lib/kokkos/containers/unit_tests/cuda/TestCuda_DualView.cpp b/lib/kokkos/containers/unit_tests/cuda/TestCuda_DualView.cpp
index 1930293c3a..5641966db4 100644
--- a/lib/kokkos/containers/unit_tests/cuda/TestCuda_DualView.cpp
+++ b/lib/kokkos/containers/unit_tests/cuda/TestCuda_DualView.cpp
@@ -3,10 +3,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -42,6 +43,5 @@
 //@HEADER
 */
 
-#include<cuda/TestCuda_Category.hpp>
-#include<TestDualView.hpp>
-
+#include <cuda/TestCuda_Category.hpp>
+#include <TestDualView.hpp>
diff --git a/lib/kokkos/containers/unit_tests/cuda/TestCuda_DynRankViewAPI_generic.cpp b/lib/kokkos/containers/unit_tests/cuda/TestCuda_DynRankViewAPI_generic.cpp
index 3d381b3fb6..609c8b41a5 100644
--- a/lib/kokkos/containers/unit_tests/cuda/TestCuda_DynRankViewAPI_generic.cpp
+++ b/lib/kokkos/containers/unit_tests/cuda/TestCuda_DynRankViewAPI_generic.cpp
@@ -3,10 +3,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -42,6 +43,5 @@
 //@HEADER
 */
 
-#include<cuda/TestCuda_Category.hpp>
-#include<TestDynViewAPI_generic.hpp>
-
+#include <cuda/TestCuda_Category.hpp>
+#include <TestDynViewAPI_generic.hpp>
diff --git a/lib/kokkos/containers/unit_tests/cuda/TestCuda_DynRankViewAPI_rank12345.cpp b/lib/kokkos/containers/unit_tests/cuda/TestCuda_DynRankViewAPI_rank12345.cpp
index 08d5b3957a..66d2d17e8b 100644
--- a/lib/kokkos/containers/unit_tests/cuda/TestCuda_DynRankViewAPI_rank12345.cpp
+++ b/lib/kokkos/containers/unit_tests/cuda/TestCuda_DynRankViewAPI_rank12345.cpp
@@ -3,10 +3,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -42,6 +43,5 @@
 //@HEADER
 */
 
-#include<cuda/TestCuda_Category.hpp>
-#include<TestDynViewAPI_rank12345.hpp>
-
+#include <cuda/TestCuda_Category.hpp>
+#include <TestDynViewAPI_rank12345.hpp>
diff --git a/lib/kokkos/containers/unit_tests/cuda/TestCuda_DynRankViewAPI_rank67.cpp b/lib/kokkos/containers/unit_tests/cuda/TestCuda_DynRankViewAPI_rank67.cpp
index a655491e81..19e248dd93 100644
--- a/lib/kokkos/containers/unit_tests/cuda/TestCuda_DynRankViewAPI_rank67.cpp
+++ b/lib/kokkos/containers/unit_tests/cuda/TestCuda_DynRankViewAPI_rank67.cpp
@@ -3,10 +3,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -42,6 +43,5 @@
 //@HEADER
 */
 
-#include<cuda/TestCuda_Category.hpp>
-#include<TestDynViewAPI_rank67.hpp>
-
+#include <cuda/TestCuda_Category.hpp>
+#include <TestDynViewAPI_rank67.hpp>
diff --git a/lib/kokkos/containers/unit_tests/cuda/TestCuda_DynamicView.cpp b/lib/kokkos/containers/unit_tests/cuda/TestCuda_DynamicView.cpp
index 1986fd7e92..9eccb05a25 100644
--- a/lib/kokkos/containers/unit_tests/cuda/TestCuda_DynamicView.cpp
+++ b/lib/kokkos/containers/unit_tests/cuda/TestCuda_DynamicView.cpp
@@ -3,10 +3,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -42,6 +43,5 @@
 //@HEADER
 */
 
-#include<cuda/TestCuda_Category.hpp>
-#include<TestDynamicView.hpp>
-
+#include <cuda/TestCuda_Category.hpp>
+#include <TestDynamicView.hpp>
diff --git a/lib/kokkos/containers/unit_tests/cuda/TestCuda_ErrorReporter.cpp b/lib/kokkos/containers/unit_tests/cuda/TestCuda_ErrorReporter.cpp
index 22d8d15e03..806a3c6ecc 100644
--- a/lib/kokkos/containers/unit_tests/cuda/TestCuda_ErrorReporter.cpp
+++ b/lib/kokkos/containers/unit_tests/cuda/TestCuda_ErrorReporter.cpp
@@ -3,10 +3,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -42,6 +43,5 @@
 //@HEADER
 */
 
-#include<cuda/TestCuda_Category.hpp>
-#include<TestErrorReporter.hpp>
-
+#include <cuda/TestCuda_Category.hpp>
+#include <TestErrorReporter.hpp>
diff --git a/lib/kokkos/containers/unit_tests/cuda/TestCuda_OffsetView.cpp b/lib/kokkos/containers/unit_tests/cuda/TestCuda_OffsetView.cpp
index 546f6d603a..b2e851d099 100644
--- a/lib/kokkos/containers/unit_tests/cuda/TestCuda_OffsetView.cpp
+++ b/lib/kokkos/containers/unit_tests/cuda/TestCuda_OffsetView.cpp
@@ -3,10 +3,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -42,6 +43,5 @@
 //@HEADER
 */
 
-#include<cuda/TestCuda_Category.hpp>
-#include<TestOffsetView.hpp>
-
+#include <cuda/TestCuda_Category.hpp>
+#include <TestOffsetView.hpp>
diff --git a/lib/kokkos/containers/unit_tests/cuda/TestCuda_ScatterView.cpp b/lib/kokkos/containers/unit_tests/cuda/TestCuda_ScatterView.cpp
index 9bd1bbab2c..10b63d037d 100644
--- a/lib/kokkos/containers/unit_tests/cuda/TestCuda_ScatterView.cpp
+++ b/lib/kokkos/containers/unit_tests/cuda/TestCuda_ScatterView.cpp
@@ -3,10 +3,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -42,6 +43,5 @@
 //@HEADER
 */
 
-#include<cuda/TestCuda_Category.hpp>
-#include<TestScatterView.hpp>
-
+#include <cuda/TestCuda_Category.hpp>
+#include <TestScatterView.hpp>
diff --git a/lib/kokkos/containers/unit_tests/cuda/TestCuda_StaticCrsGraph.cpp b/lib/kokkos/containers/unit_tests/cuda/TestCuda_StaticCrsGraph.cpp
index b15abcf525..9c93da9c50 100644
--- a/lib/kokkos/containers/unit_tests/cuda/TestCuda_StaticCrsGraph.cpp
+++ b/lib/kokkos/containers/unit_tests/cuda/TestCuda_StaticCrsGraph.cpp
@@ -3,10 +3,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -42,6 +43,5 @@
 //@HEADER
 */
 
-#include<cuda/TestCuda_Category.hpp>
-#include<TestStaticCrsGraph.hpp>
-
+#include <cuda/TestCuda_Category.hpp>
+#include <TestStaticCrsGraph.hpp>
diff --git a/lib/kokkos/containers/unit_tests/cuda/TestCuda_UnorderedMap.cpp b/lib/kokkos/containers/unit_tests/cuda/TestCuda_UnorderedMap.cpp
index 881b20b575..b204e68977 100644
--- a/lib/kokkos/containers/unit_tests/cuda/TestCuda_UnorderedMap.cpp
+++ b/lib/kokkos/containers/unit_tests/cuda/TestCuda_UnorderedMap.cpp
@@ -3,10 +3,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -42,6 +43,5 @@
 //@HEADER
 */
 
-#include<cuda/TestCuda_Category.hpp>
-#include<TestUnorderedMap.hpp>
-
+#include <cuda/TestCuda_Category.hpp>
+#include <TestUnorderedMap.hpp>
diff --git a/lib/kokkos/containers/unit_tests/cuda/TestCuda_Vector.cpp b/lib/kokkos/containers/unit_tests/cuda/TestCuda_Vector.cpp
index cf0f2012dc..408d0c76fc 100644
--- a/lib/kokkos/containers/unit_tests/cuda/TestCuda_Vector.cpp
+++ b/lib/kokkos/containers/unit_tests/cuda/TestCuda_Vector.cpp
@@ -3,10 +3,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -42,6 +43,5 @@
 //@HEADER
 */
 
-#include<cuda/TestCuda_Category.hpp>
-#include<TestVector.hpp>
-
+#include <cuda/TestCuda_Category.hpp>
+#include <TestVector.hpp>
diff --git a/lib/kokkos/containers/unit_tests/cuda/TestCuda_ViewCtorPropEmbeddedDim.cpp b/lib/kokkos/containers/unit_tests/cuda/TestCuda_ViewCtorPropEmbeddedDim.cpp
index 7130195839..c865deb0b2 100644
--- a/lib/kokkos/containers/unit_tests/cuda/TestCuda_ViewCtorPropEmbeddedDim.cpp
+++ b/lib/kokkos/containers/unit_tests/cuda/TestCuda_ViewCtorPropEmbeddedDim.cpp
@@ -3,10 +3,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -42,6 +43,5 @@
 //@HEADER
 */
 
-#include<cuda/TestCuda_Category.hpp>
-#include<TestViewCtorPropEmbeddedDim.hpp>
-
+#include <cuda/TestCuda_Category.hpp>
+#include <TestViewCtorPropEmbeddedDim.hpp>
diff --git a/lib/kokkos/containers/unit_tests/hpx/TestHPX_BitSet.cpp b/lib/kokkos/containers/unit_tests/hpx/TestHPX_BitSet.cpp
index cec24e00c7..179cfcc7b4 100644
--- a/lib/kokkos/containers/unit_tests/hpx/TestHPX_BitSet.cpp
+++ b/lib/kokkos/containers/unit_tests/hpx/TestHPX_BitSet.cpp
@@ -3,10 +3,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -42,6 +43,5 @@
 //@HEADER
 */
 
-#include<hpx/TestHPX_Category.hpp>
-#include<TestBitset.hpp>
-
+#include <hpx/TestHPX_Category.hpp>
+#include <TestBitset.hpp>
diff --git a/lib/kokkos/containers/unit_tests/hpx/TestHPX_Category.hpp b/lib/kokkos/containers/unit_tests/hpx/TestHPX_Category.hpp
index 358b42d1aa..64fc7c0757 100644
--- a/lib/kokkos/containers/unit_tests/hpx/TestHPX_Category.hpp
+++ b/lib/kokkos/containers/unit_tests/hpx/TestHPX_Category.hpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -44,21 +45,6 @@
 #ifndef KOKKOS_TEST_HPX_HPP
 #define KOKKOS_TEST_HPX_HPP
 
-#include <gtest/gtest.h>
-
-namespace Test {
-
-class hpx : public ::testing::Test {
-protected:
-  static void SetUpTestCase() {
-  }
-
-  static void TearDownTestCase() {
-  }
-};
-
-} // namespace Test
-
 #define TEST_CATEGORY hpx
 #define TEST_EXECSPACE Kokkos::Experimental::HPX
 
diff --git a/lib/kokkos/containers/unit_tests/hpx/TestHPX_DualView.cpp b/lib/kokkos/containers/unit_tests/hpx/TestHPX_DualView.cpp
index 80af9dc33a..368cdde95c 100644
--- a/lib/kokkos/containers/unit_tests/hpx/TestHPX_DualView.cpp
+++ b/lib/kokkos/containers/unit_tests/hpx/TestHPX_DualView.cpp
@@ -3,10 +3,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -42,6 +43,5 @@
 //@HEADER
 */
 
-#include<hpx/TestHPX_Category.hpp>
-#include<TestDualView.hpp>
-
+#include <hpx/TestHPX_Category.hpp>
+#include <TestDualView.hpp>
diff --git a/lib/kokkos/containers/unit_tests/hpx/TestHPX_DynRankViewAPI_generic.cpp b/lib/kokkos/containers/unit_tests/hpx/TestHPX_DynRankViewAPI_generic.cpp
index 95d49c8acf..778bd891d6 100644
--- a/lib/kokkos/containers/unit_tests/hpx/TestHPX_DynRankViewAPI_generic.cpp
+++ b/lib/kokkos/containers/unit_tests/hpx/TestHPX_DynRankViewAPI_generic.cpp
@@ -3,10 +3,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -42,6 +43,5 @@
 //@HEADER
 */
 
-#include<hpx/TestHPX_Category.hpp>
-#include<TestDynViewAPI_generic.hpp>
-
+#include <hpx/TestHPX_Category.hpp>
+#include <TestDynViewAPI_generic.hpp>
diff --git a/lib/kokkos/containers/unit_tests/hpx/TestHPX_DynRankViewAPI_rank12345.cpp b/lib/kokkos/containers/unit_tests/hpx/TestHPX_DynRankViewAPI_rank12345.cpp
index 72e0bc6616..0bb77a266d 100644
--- a/lib/kokkos/containers/unit_tests/hpx/TestHPX_DynRankViewAPI_rank12345.cpp
+++ b/lib/kokkos/containers/unit_tests/hpx/TestHPX_DynRankViewAPI_rank12345.cpp
@@ -3,10 +3,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -42,6 +43,5 @@
 //@HEADER
 */
 
-#include<hpx/TestHPX_Category.hpp>
-#include<TestDynViewAPI_rank12345.hpp>
-
+#include <hpx/TestHPX_Category.hpp>
+#include <TestDynViewAPI_rank12345.hpp>
diff --git a/lib/kokkos/containers/unit_tests/hpx/TestHPX_DynRankViewAPI_rank67.cpp b/lib/kokkos/containers/unit_tests/hpx/TestHPX_DynRankViewAPI_rank67.cpp
index 5a104f0de2..6594cb3213 100644
--- a/lib/kokkos/containers/unit_tests/hpx/TestHPX_DynRankViewAPI_rank67.cpp
+++ b/lib/kokkos/containers/unit_tests/hpx/TestHPX_DynRankViewAPI_rank67.cpp
@@ -3,10 +3,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -42,6 +43,5 @@
 //@HEADER
 */
 
-#include<hpx/TestHPX_Category.hpp>
-#include<TestDynViewAPI_rank67.hpp>
-
+#include <hpx/TestHPX_Category.hpp>
+#include <TestDynViewAPI_rank67.hpp>
diff --git a/lib/kokkos/containers/unit_tests/hpx/TestHPX_DynamicView.cpp b/lib/kokkos/containers/unit_tests/hpx/TestHPX_DynamicView.cpp
index 718b322684..c1efc778a6 100644
--- a/lib/kokkos/containers/unit_tests/hpx/TestHPX_DynamicView.cpp
+++ b/lib/kokkos/containers/unit_tests/hpx/TestHPX_DynamicView.cpp
@@ -3,10 +3,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -42,6 +43,5 @@
 //@HEADER
 */
 
-#include<hpx/TestHPX_Category.hpp>
-#include<TestDynamicView.hpp>
-
+#include <hpx/TestHPX_Category.hpp>
+#include <TestDynamicView.hpp>
diff --git a/lib/kokkos/containers/unit_tests/hpx/TestHPX_ErrorReporter.cpp b/lib/kokkos/containers/unit_tests/hpx/TestHPX_ErrorReporter.cpp
index ea819ae343..3f68c6d07f 100644
--- a/lib/kokkos/containers/unit_tests/hpx/TestHPX_ErrorReporter.cpp
+++ b/lib/kokkos/containers/unit_tests/hpx/TestHPX_ErrorReporter.cpp
@@ -3,10 +3,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -42,6 +43,5 @@
 //@HEADER
 */
 
-#include<hpx/TestHPX_Category.hpp>
-#include<TestErrorReporter.hpp>
-
+#include <hpx/TestHPX_Category.hpp>
+#include <TestErrorReporter.hpp>
diff --git a/lib/kokkos/containers/unit_tests/hpx/TestHPX_OffsetView.cpp b/lib/kokkos/containers/unit_tests/hpx/TestHPX_OffsetView.cpp
index 4d3684923f..1719300228 100644
--- a/lib/kokkos/containers/unit_tests/hpx/TestHPX_OffsetView.cpp
+++ b/lib/kokkos/containers/unit_tests/hpx/TestHPX_OffsetView.cpp
@@ -3,10 +3,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -42,6 +43,5 @@
 //@HEADER
 */
 
-#include<hpx/TestHPX_Category.hpp>
-#include<TestOffsetView.hpp>
-
+#include <hpx/TestHPX_Category.hpp>
+#include <TestOffsetView.hpp>
diff --git a/lib/kokkos/containers/unit_tests/hpx/TestHPX_ScatterView.cpp b/lib/kokkos/containers/unit_tests/hpx/TestHPX_ScatterView.cpp
index 6a871cc121..8f9eb05918 100644
--- a/lib/kokkos/containers/unit_tests/hpx/TestHPX_ScatterView.cpp
+++ b/lib/kokkos/containers/unit_tests/hpx/TestHPX_ScatterView.cpp
@@ -3,10 +3,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -42,6 +43,5 @@
 //@HEADER
 */
 
-#include<hpx/TestHPX_Category.hpp>
-#include<TestScatterView.hpp>
-
+#include <hpx/TestHPX_Category.hpp>
+#include <TestScatterView.hpp>
diff --git a/lib/kokkos/containers/unit_tests/hpx/TestHPX_StaticCrsGraph.cpp b/lib/kokkos/containers/unit_tests/hpx/TestHPX_StaticCrsGraph.cpp
index fbb70a762b..4f513efb0f 100644
--- a/lib/kokkos/containers/unit_tests/hpx/TestHPX_StaticCrsGraph.cpp
+++ b/lib/kokkos/containers/unit_tests/hpx/TestHPX_StaticCrsGraph.cpp
@@ -3,10 +3,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -42,6 +43,5 @@
 //@HEADER
 */
 
-#include<hpx/TestHPX_Category.hpp>
-#include<TestStaticCrsGraph.hpp>
-
+#include <hpx/TestHPX_Category.hpp>
+#include <TestStaticCrsGraph.hpp>
diff --git a/lib/kokkos/containers/unit_tests/hpx/TestHPX_UnorderedMap.cpp b/lib/kokkos/containers/unit_tests/hpx/TestHPX_UnorderedMap.cpp
index 7e7aad309f..517135290a 100644
--- a/lib/kokkos/containers/unit_tests/hpx/TestHPX_UnorderedMap.cpp
+++ b/lib/kokkos/containers/unit_tests/hpx/TestHPX_UnorderedMap.cpp
@@ -3,10 +3,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -42,6 +43,5 @@
 //@HEADER
 */
 
-#include<hpx/TestHPX_Category.hpp>
-#include<TestUnorderedMap.hpp>
-
+#include <hpx/TestHPX_Category.hpp>
+#include <TestUnorderedMap.hpp>
diff --git a/lib/kokkos/containers/unit_tests/hpx/TestHPX_Vector.cpp b/lib/kokkos/containers/unit_tests/hpx/TestHPX_Vector.cpp
index 5fb3664197..d42cef4b28 100644
--- a/lib/kokkos/containers/unit_tests/hpx/TestHPX_Vector.cpp
+++ b/lib/kokkos/containers/unit_tests/hpx/TestHPX_Vector.cpp
@@ -3,10 +3,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -42,6 +43,5 @@
 //@HEADER
 */
 
-#include<hpx/TestHPX_Category.hpp>
-#include<TestVector.hpp>
-
+#include <hpx/TestHPX_Category.hpp>
+#include <TestVector.hpp>
diff --git a/lib/kokkos/containers/unit_tests/hpx/TestHPX_ViewCtorPropEmbeddedDim.cpp b/lib/kokkos/containers/unit_tests/hpx/TestHPX_ViewCtorPropEmbeddedDim.cpp
index fb9c263c83..de2e96be73 100644
--- a/lib/kokkos/containers/unit_tests/hpx/TestHPX_ViewCtorPropEmbeddedDim.cpp
+++ b/lib/kokkos/containers/unit_tests/hpx/TestHPX_ViewCtorPropEmbeddedDim.cpp
@@ -3,10 +3,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -42,6 +43,5 @@
 //@HEADER
 */
 
-#include<hpx/TestHPX_Category.hpp>
-#include<TestViewCtorPropEmbeddedDim.hpp>
-
+#include <hpx/TestHPX_Category.hpp>
+#include <TestViewCtorPropEmbeddedDim.hpp>
diff --git a/lib/kokkos/containers/unit_tests/openmp/TestOpenMP_BitSet.cpp b/lib/kokkos/containers/unit_tests/openmp/TestOpenMP_BitSet.cpp
index 2f3a52787d..db11017159 100644
--- a/lib/kokkos/containers/unit_tests/openmp/TestOpenMP_BitSet.cpp
+++ b/lib/kokkos/containers/unit_tests/openmp/TestOpenMP_BitSet.cpp
@@ -3,10 +3,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -42,6 +43,5 @@
 //@HEADER
 */
 
-#include<openmp/TestOpenMP_Category.hpp>
-#include<TestBitset.hpp>
-
+#include <openmp/TestOpenMP_Category.hpp>
+#include <TestBitset.hpp>
diff --git a/lib/kokkos/containers/unit_tests/openmp/TestOpenMP_Category.hpp b/lib/kokkos/containers/unit_tests/openmp/TestOpenMP_Category.hpp
index 150173e4bf..a0169d1702 100644
--- a/lib/kokkos/containers/unit_tests/openmp/TestOpenMP_Category.hpp
+++ b/lib/kokkos/containers/unit_tests/openmp/TestOpenMP_Category.hpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -44,21 +45,6 @@
 #ifndef KOKKOS_TEST_OPENMP_HPP
 #define KOKKOS_TEST_OPENMP_HPP
 
-#include <gtest/gtest.h>
-
-namespace Test {
-
-class openmp : public ::testing::Test {
-protected:
-  static void SetUpTestCase() {
-  }
-
-  static void TearDownTestCase() {
-  }
-};
-
-} // namespace Test
-
 #define TEST_CATEGORY openmp
 #define TEST_EXECSPACE Kokkos::OpenMP
 
diff --git a/lib/kokkos/containers/unit_tests/openmp/TestOpenMP_DualView.cpp b/lib/kokkos/containers/unit_tests/openmp/TestOpenMP_DualView.cpp
index fd6b9ae707..ed4eb23a8b 100644
--- a/lib/kokkos/containers/unit_tests/openmp/TestOpenMP_DualView.cpp
+++ b/lib/kokkos/containers/unit_tests/openmp/TestOpenMP_DualView.cpp
@@ -3,10 +3,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -42,6 +43,5 @@
 //@HEADER
 */
 
-#include<openmp/TestOpenMP_Category.hpp>
-#include<TestDualView.hpp>
-
+#include <openmp/TestOpenMP_Category.hpp>
+#include <TestDualView.hpp>
diff --git a/lib/kokkos/containers/unit_tests/openmp/TestOpenMP_DynRankViewAPI_generic.cpp b/lib/kokkos/containers/unit_tests/openmp/TestOpenMP_DynRankViewAPI_generic.cpp
index 066d8f9194..637be64dfa 100644
--- a/lib/kokkos/containers/unit_tests/openmp/TestOpenMP_DynRankViewAPI_generic.cpp
+++ b/lib/kokkos/containers/unit_tests/openmp/TestOpenMP_DynRankViewAPI_generic.cpp
@@ -3,10 +3,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -42,6 +43,5 @@
 //@HEADER
 */
 
-#include<openmp/TestOpenMP_Category.hpp>
-#include<TestDynViewAPI_generic.hpp>
-
+#include <openmp/TestOpenMP_Category.hpp>
+#include <TestDynViewAPI_generic.hpp>
diff --git a/lib/kokkos/containers/unit_tests/openmp/TestOpenMP_DynRankViewAPI_rank12345.cpp b/lib/kokkos/containers/unit_tests/openmp/TestOpenMP_DynRankViewAPI_rank12345.cpp
index f44e320eba..01b57a1690 100644
--- a/lib/kokkos/containers/unit_tests/openmp/TestOpenMP_DynRankViewAPI_rank12345.cpp
+++ b/lib/kokkos/containers/unit_tests/openmp/TestOpenMP_DynRankViewAPI_rank12345.cpp
@@ -3,10 +3,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -42,6 +43,5 @@
 //@HEADER
 */
 
-#include<openmp/TestOpenMP_Category.hpp>
-#include<TestDynViewAPI_rank12345.hpp>
-
+#include <openmp/TestOpenMP_Category.hpp>
+#include <TestDynViewAPI_rank12345.hpp>
diff --git a/lib/kokkos/containers/unit_tests/openmp/TestOpenMP_DynRankViewAPI_rank67.cpp b/lib/kokkos/containers/unit_tests/openmp/TestOpenMP_DynRankViewAPI_rank67.cpp
index 154243aec9..7d742eaeed 100644
--- a/lib/kokkos/containers/unit_tests/openmp/TestOpenMP_DynRankViewAPI_rank67.cpp
+++ b/lib/kokkos/containers/unit_tests/openmp/TestOpenMP_DynRankViewAPI_rank67.cpp
@@ -3,10 +3,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -42,6 +43,5 @@
 //@HEADER
 */
 
-#include<openmp/TestOpenMP_Category.hpp>
-#include<TestDynViewAPI_rank67.hpp>
-
+#include <openmp/TestOpenMP_Category.hpp>
+#include <TestDynViewAPI_rank67.hpp>
diff --git a/lib/kokkos/containers/unit_tests/openmp/TestOpenMP_DynamicView.cpp b/lib/kokkos/containers/unit_tests/openmp/TestOpenMP_DynamicView.cpp
index 7d9ead910f..75b616f168 100644
--- a/lib/kokkos/containers/unit_tests/openmp/TestOpenMP_DynamicView.cpp
+++ b/lib/kokkos/containers/unit_tests/openmp/TestOpenMP_DynamicView.cpp
@@ -3,10 +3,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -42,6 +43,5 @@
 //@HEADER
 */
 
-#include<openmp/TestOpenMP_Category.hpp>
-#include<TestDynamicView.hpp>
-
+#include <openmp/TestOpenMP_Category.hpp>
+#include <TestDynamicView.hpp>
diff --git a/lib/kokkos/containers/unit_tests/openmp/TestOpenMP_ErrorReporter.cpp b/lib/kokkos/containers/unit_tests/openmp/TestOpenMP_ErrorReporter.cpp
index d05bf163bf..1f00f18532 100644
--- a/lib/kokkos/containers/unit_tests/openmp/TestOpenMP_ErrorReporter.cpp
+++ b/lib/kokkos/containers/unit_tests/openmp/TestOpenMP_ErrorReporter.cpp
@@ -3,10 +3,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -42,6 +43,5 @@
 //@HEADER
 */
 
-#include<openmp/TestOpenMP_Category.hpp>
-#include<TestErrorReporter.hpp>
-
+#include <openmp/TestOpenMP_Category.hpp>
+#include <TestErrorReporter.hpp>
diff --git a/lib/kokkos/containers/unit_tests/openmp/TestOpenMP_OffsetView.cpp b/lib/kokkos/containers/unit_tests/openmp/TestOpenMP_OffsetView.cpp
index 169dae3212..98531ff212 100644
--- a/lib/kokkos/containers/unit_tests/openmp/TestOpenMP_OffsetView.cpp
+++ b/lib/kokkos/containers/unit_tests/openmp/TestOpenMP_OffsetView.cpp
@@ -3,10 +3,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -42,6 +43,5 @@
 //@HEADER
 */
 
-#include<openmp/TestOpenMP_Category.hpp>
-#include<TestOffsetView.hpp>
-
+#include <openmp/TestOpenMP_Category.hpp>
+#include <TestOffsetView.hpp>
diff --git a/lib/kokkos/containers/unit_tests/openmp/TestOpenMP_ScatterView.cpp b/lib/kokkos/containers/unit_tests/openmp/TestOpenMP_ScatterView.cpp
index 3adfcd8409..c49577f75d 100644
--- a/lib/kokkos/containers/unit_tests/openmp/TestOpenMP_ScatterView.cpp
+++ b/lib/kokkos/containers/unit_tests/openmp/TestOpenMP_ScatterView.cpp
@@ -3,10 +3,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -42,6 +43,5 @@
 //@HEADER
 */
 
-#include<openmp/TestOpenMP_Category.hpp>
-#include<TestScatterView.hpp>
-
+#include <openmp/TestOpenMP_Category.hpp>
+#include <TestScatterView.hpp>
diff --git a/lib/kokkos/containers/unit_tests/openmp/TestOpenMP_StaticCrsGraph.cpp b/lib/kokkos/containers/unit_tests/openmp/TestOpenMP_StaticCrsGraph.cpp
index 486a51a0b9..d8ab7b6b21 100644
--- a/lib/kokkos/containers/unit_tests/openmp/TestOpenMP_StaticCrsGraph.cpp
+++ b/lib/kokkos/containers/unit_tests/openmp/TestOpenMP_StaticCrsGraph.cpp
@@ -3,10 +3,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -42,6 +43,5 @@
 //@HEADER
 */
 
-#include<openmp/TestOpenMP_Category.hpp>
-#include<TestStaticCrsGraph.hpp>
-
+#include <openmp/TestOpenMP_Category.hpp>
+#include <TestStaticCrsGraph.hpp>
diff --git a/lib/kokkos/containers/unit_tests/openmp/TestOpenMP_UnorderedMap.cpp b/lib/kokkos/containers/unit_tests/openmp/TestOpenMP_UnorderedMap.cpp
index 32dc22ec93..c3db0c0d88 100644
--- a/lib/kokkos/containers/unit_tests/openmp/TestOpenMP_UnorderedMap.cpp
+++ b/lib/kokkos/containers/unit_tests/openmp/TestOpenMP_UnorderedMap.cpp
@@ -3,10 +3,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -42,6 +43,5 @@
 //@HEADER
 */
 
-#include<openmp/TestOpenMP_Category.hpp>
-#include<TestUnorderedMap.hpp>
-
+#include <openmp/TestOpenMP_Category.hpp>
+#include <TestUnorderedMap.hpp>
diff --git a/lib/kokkos/containers/unit_tests/openmp/TestOpenMP_Vector.cpp b/lib/kokkos/containers/unit_tests/openmp/TestOpenMP_Vector.cpp
index 006caba816..7ac49f24fb 100644
--- a/lib/kokkos/containers/unit_tests/openmp/TestOpenMP_Vector.cpp
+++ b/lib/kokkos/containers/unit_tests/openmp/TestOpenMP_Vector.cpp
@@ -3,10 +3,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -42,6 +43,5 @@
 //@HEADER
 */
 
-#include<openmp/TestOpenMP_Category.hpp>
-#include<TestVector.hpp>
-
+#include <openmp/TestOpenMP_Category.hpp>
+#include <TestVector.hpp>
diff --git a/lib/kokkos/containers/unit_tests/openmp/TestOpenMP_ViewCtorPropEmbeddedDim.cpp b/lib/kokkos/containers/unit_tests/openmp/TestOpenMP_ViewCtorPropEmbeddedDim.cpp
index dbbf14cb5b..b9ae5d80ed 100644
--- a/lib/kokkos/containers/unit_tests/openmp/TestOpenMP_ViewCtorPropEmbeddedDim.cpp
+++ b/lib/kokkos/containers/unit_tests/openmp/TestOpenMP_ViewCtorPropEmbeddedDim.cpp
@@ -3,10 +3,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -42,6 +43,5 @@
 //@HEADER
 */
 
-#include<openmp/TestOpenMP_Category.hpp>
-#include<TestViewCtorPropEmbeddedDim.hpp>
-
+#include <openmp/TestOpenMP_Category.hpp>
+#include <TestViewCtorPropEmbeddedDim.hpp>
diff --git a/lib/kokkos/containers/unit_tests/rocm/TestROCm_BitSet.cpp b/lib/kokkos/containers/unit_tests/rocm/TestROCm_BitSet.cpp
index 2c8657e464..c72077eb4c 100644
--- a/lib/kokkos/containers/unit_tests/rocm/TestROCm_BitSet.cpp
+++ b/lib/kokkos/containers/unit_tests/rocm/TestROCm_BitSet.cpp
@@ -3,10 +3,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -42,6 +43,5 @@
 //@HEADER
 */
 
-#include<rocm/TestROCm_Category.hpp>
-#include<TestBitset.hpp>
-
+#include <rocm/TestROCm_Category.hpp>
+#include <TestBitset.hpp>
diff --git a/lib/kokkos/containers/unit_tests/rocm/TestROCm_Category.hpp b/lib/kokkos/containers/unit_tests/rocm/TestROCm_Category.hpp
index d520bbc5a7..d37cd05db6 100644
--- a/lib/kokkos/containers/unit_tests/rocm/TestROCm_Category.hpp
+++ b/lib/kokkos/containers/unit_tests/rocm/TestROCm_Category.hpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -44,21 +45,6 @@
 #ifndef KOKKOS_TEST_ROCM_HPP
 #define KOKKOS_TEST_ROCM_HPP
 
-#include <gtest/gtest.h>
-
-namespace Test {
-
-class rocm : public ::testing::Test {
-protected:
-  static void SetUpTestCase() {
-  }
-
-  static void TearDownTestCase() {
-  }
-};
-
-} // namespace Test
-
 #define TEST_CATEGORY rocm
 #define TEST_EXECSPACE Kokkos::Experimental::ROCm
 
diff --git a/lib/kokkos/containers/unit_tests/rocm/TestROCm_DualView.cpp b/lib/kokkos/containers/unit_tests/rocm/TestROCm_DualView.cpp
index f60c6ade44..e9820395ba 100644
--- a/lib/kokkos/containers/unit_tests/rocm/TestROCm_DualView.cpp
+++ b/lib/kokkos/containers/unit_tests/rocm/TestROCm_DualView.cpp
@@ -3,10 +3,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -42,6 +43,5 @@
 //@HEADER
 */
 
-#include<rocm/TestROCm_Category.hpp>
-#include<TestDualView.hpp>
-
+#include <rocm/TestROCm_Category.hpp>
+#include <TestDualView.hpp>
diff --git a/lib/kokkos/containers/unit_tests/rocm/TestROCm_DynRankViewAPI_generic.cpp b/lib/kokkos/containers/unit_tests/rocm/TestROCm_DynRankViewAPI_generic.cpp
index 80bfe06153..7a3dd65f0e 100644
--- a/lib/kokkos/containers/unit_tests/rocm/TestROCm_DynRankViewAPI_generic.cpp
+++ b/lib/kokkos/containers/unit_tests/rocm/TestROCm_DynRankViewAPI_generic.cpp
@@ -3,10 +3,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -42,6 +43,5 @@
 //@HEADER
 */
 
-#include<rocm/TestROCm_Category.hpp>
-#include<TestDynViewAPI_generic.hpp>
-
+#include <rocm/TestROCm_Category.hpp>
+#include <TestDynViewAPI_generic.hpp>
diff --git a/lib/kokkos/containers/unit_tests/rocm/TestROCm_DynRankViewAPI_rank12345.cpp b/lib/kokkos/containers/unit_tests/rocm/TestROCm_DynRankViewAPI_rank12345.cpp
index b42ce07e8f..3963dd9c9c 100644
--- a/lib/kokkos/containers/unit_tests/rocm/TestROCm_DynRankViewAPI_rank12345.cpp
+++ b/lib/kokkos/containers/unit_tests/rocm/TestROCm_DynRankViewAPI_rank12345.cpp
@@ -3,10 +3,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -42,6 +43,5 @@
 //@HEADER
 */
 
-#include<rocm/TestROCm_Category.hpp>
-#include<TestDynViewAPI_rank12345.hpp>
-
+#include <rocm/TestROCm_Category.hpp>
+#include <TestDynViewAPI_rank12345.hpp>
diff --git a/lib/kokkos/containers/unit_tests/rocm/TestROCm_DynRankViewAPI_rank67.cpp b/lib/kokkos/containers/unit_tests/rocm/TestROCm_DynRankViewAPI_rank67.cpp
index 0f47b800c6..b9a4582622 100644
--- a/lib/kokkos/containers/unit_tests/rocm/TestROCm_DynRankViewAPI_rank67.cpp
+++ b/lib/kokkos/containers/unit_tests/rocm/TestROCm_DynRankViewAPI_rank67.cpp
@@ -3,10 +3,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -42,6 +43,5 @@
 //@HEADER
 */
 
-#include<rocm/TestROCm_Category.hpp>
-#include<TestDynViewAPI_rank67.hpp>
-
+#include <rocm/TestROCm_Category.hpp>
+#include <TestDynViewAPI_rank67.hpp>
diff --git a/lib/kokkos/containers/unit_tests/rocm/TestROCm_DynamicView.cpp b/lib/kokkos/containers/unit_tests/rocm/TestROCm_DynamicView.cpp
index 5540eb2d20..285ed916c4 100644
--- a/lib/kokkos/containers/unit_tests/rocm/TestROCm_DynamicView.cpp
+++ b/lib/kokkos/containers/unit_tests/rocm/TestROCm_DynamicView.cpp
@@ -3,10 +3,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -42,6 +43,5 @@
 //@HEADER
 */
 
-#include<rocm/TestROCm_Category.hpp>
-#include<TestDynamicView.hpp>
-
+#include <rocm/TestROCm_Category.hpp>
+#include <TestDynamicView.hpp>
diff --git a/lib/kokkos/containers/unit_tests/rocm/TestROCm_ErrorReporter.cpp b/lib/kokkos/containers/unit_tests/rocm/TestROCm_ErrorReporter.cpp
index 2c7a26c7fe..2af2f79a16 100644
--- a/lib/kokkos/containers/unit_tests/rocm/TestROCm_ErrorReporter.cpp
+++ b/lib/kokkos/containers/unit_tests/rocm/TestROCm_ErrorReporter.cpp
@@ -3,10 +3,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -42,6 +43,5 @@
 //@HEADER
 */
 
-#include<rocm/TestROCm_Category.hpp>
-#include<TestErrorReporter.hpp>
-
+#include <rocm/TestROCm_Category.hpp>
+#include <TestErrorReporter.hpp>
diff --git a/lib/kokkos/containers/unit_tests/rocm/TestROCm_ScatterView.cpp b/lib/kokkos/containers/unit_tests/rocm/TestROCm_ScatterView.cpp
index cc4a07ddbd..f7000bc99e 100644
--- a/lib/kokkos/containers/unit_tests/rocm/TestROCm_ScatterView.cpp
+++ b/lib/kokkos/containers/unit_tests/rocm/TestROCm_ScatterView.cpp
@@ -3,10 +3,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -42,6 +43,5 @@
 //@HEADER
 */
 
-#include<rocm/TestROCm_Category.hpp>
-#include<TestScatterView.hpp>
-
+#include <rocm/TestROCm_Category.hpp>
+#include <TestScatterView.hpp>
diff --git a/lib/kokkos/containers/unit_tests/rocm/TestROCm_StaticCrsGraph.cpp b/lib/kokkos/containers/unit_tests/rocm/TestROCm_StaticCrsGraph.cpp
index be83d4ef50..bb1e04c536 100644
--- a/lib/kokkos/containers/unit_tests/rocm/TestROCm_StaticCrsGraph.cpp
+++ b/lib/kokkos/containers/unit_tests/rocm/TestROCm_StaticCrsGraph.cpp
@@ -3,10 +3,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -42,6 +43,5 @@
 //@HEADER
 */
 
-#include<rocm/TestROCm_Category.hpp>
-#include<TestStaticCrsGraph.hpp>
-
+#include <rocm/TestROCm_Category.hpp>
+#include <TestStaticCrsGraph.hpp>
diff --git a/lib/kokkos/containers/unit_tests/rocm/TestROCm_UnorderedMap.cpp b/lib/kokkos/containers/unit_tests/rocm/TestROCm_UnorderedMap.cpp
index f6b2f9ef40..7b8172fabd 100644
--- a/lib/kokkos/containers/unit_tests/rocm/TestROCm_UnorderedMap.cpp
+++ b/lib/kokkos/containers/unit_tests/rocm/TestROCm_UnorderedMap.cpp
@@ -3,10 +3,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -42,6 +43,5 @@
 //@HEADER
 */
 
-#include<rocm/TestROCm_Category.hpp>
-#include<TestUnorderedMap.hpp>
-
+#include <rocm/TestROCm_Category.hpp>
+#include <TestUnorderedMap.hpp>
diff --git a/lib/kokkos/containers/unit_tests/rocm/TestROCm_Vector.cpp b/lib/kokkos/containers/unit_tests/rocm/TestROCm_Vector.cpp
index e9073b6bb5..1759797487 100644
--- a/lib/kokkos/containers/unit_tests/rocm/TestROCm_Vector.cpp
+++ b/lib/kokkos/containers/unit_tests/rocm/TestROCm_Vector.cpp
@@ -3,10 +3,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -42,6 +43,5 @@
 //@HEADER
 */
 
-#include<rocm/TestROCm_Category.hpp>
-#include<TestVector.hpp>
-
+#include <rocm/TestROCm_Category.hpp>
+#include <TestVector.hpp>
diff --git a/lib/kokkos/containers/unit_tests/rocm/TestROCm_ViewCtorPropEmbeddedDim.cpp b/lib/kokkos/containers/unit_tests/rocm/TestROCm_ViewCtorPropEmbeddedDim.cpp
index dd472270e7..e95680445b 100644
--- a/lib/kokkos/containers/unit_tests/rocm/TestROCm_ViewCtorPropEmbeddedDim.cpp
+++ b/lib/kokkos/containers/unit_tests/rocm/TestROCm_ViewCtorPropEmbeddedDim.cpp
@@ -3,10 +3,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -42,6 +43,5 @@
 //@HEADER
 */
 
-#include<rocm/TestROCm_Category.hpp>
-#include<TestViewCtorPropEmbeddedDim.hpp>
-
+#include <rocm/TestROCm_Category.hpp>
+#include <TestViewCtorPropEmbeddedDim.hpp>
diff --git a/lib/kokkos/containers/unit_tests/serial/TestSerial_BitSet.cpp b/lib/kokkos/containers/unit_tests/serial/TestSerial_BitSet.cpp
index 03edd30c34..322e88a6af 100644
--- a/lib/kokkos/containers/unit_tests/serial/TestSerial_BitSet.cpp
+++ b/lib/kokkos/containers/unit_tests/serial/TestSerial_BitSet.cpp
@@ -3,10 +3,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -42,6 +43,5 @@
 //@HEADER
 */
 
-#include<serial/TestSerial_Category.hpp>
-#include<TestBitset.hpp>
-
+#include <serial/TestSerial_Category.hpp>
+#include <TestBitset.hpp>
diff --git a/lib/kokkos/containers/unit_tests/serial/TestSerial_Category.hpp b/lib/kokkos/containers/unit_tests/serial/TestSerial_Category.hpp
index 858b669286..2aa09a315a 100644
--- a/lib/kokkos/containers/unit_tests/serial/TestSerial_Category.hpp
+++ b/lib/kokkos/containers/unit_tests/serial/TestSerial_Category.hpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -44,21 +45,6 @@
 #ifndef KOKKOS_TEST_SERIAL_HPP
 #define KOKKOS_TEST_SERIAL_HPP
 
-#include <gtest/gtest.h>
-
-namespace Test {
-
-class serial : public ::testing::Test {
-protected:
-  static void SetUpTestCase() {
-  }
-
-  static void TearDownTestCase() {
-  }
-};
-
-} // namespace Test
-
 #define TEST_CATEGORY serial
 #define TEST_EXECSPACE Kokkos::Serial
 
diff --git a/lib/kokkos/containers/unit_tests/serial/TestSerial_DualView.cpp b/lib/kokkos/containers/unit_tests/serial/TestSerial_DualView.cpp
index 0dac8eba87..c1646ed13b 100644
--- a/lib/kokkos/containers/unit_tests/serial/TestSerial_DualView.cpp
+++ b/lib/kokkos/containers/unit_tests/serial/TestSerial_DualView.cpp
@@ -3,10 +3,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -42,6 +43,5 @@
 //@HEADER
 */
 
-#include<serial/TestSerial_Category.hpp>
-#include<TestDualView.hpp>
-
+#include <serial/TestSerial_Category.hpp>
+#include <TestDualView.hpp>
diff --git a/lib/kokkos/containers/unit_tests/serial/TestSerial_DynRankViewAPI_generic.cpp b/lib/kokkos/containers/unit_tests/serial/TestSerial_DynRankViewAPI_generic.cpp
index 1a5874e7fa..e8f577c6ac 100644
--- a/lib/kokkos/containers/unit_tests/serial/TestSerial_DynRankViewAPI_generic.cpp
+++ b/lib/kokkos/containers/unit_tests/serial/TestSerial_DynRankViewAPI_generic.cpp
@@ -3,10 +3,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -42,6 +43,5 @@
 //@HEADER
 */
 
-#include<serial/TestSerial_Category.hpp>
-#include<TestDynViewAPI_generic.hpp>
-
+#include <serial/TestSerial_Category.hpp>
+#include <TestDynViewAPI_generic.hpp>
diff --git a/lib/kokkos/containers/unit_tests/serial/TestSerial_DynRankViewAPI_rank12345.cpp b/lib/kokkos/containers/unit_tests/serial/TestSerial_DynRankViewAPI_rank12345.cpp
index df802bfe68..7db8983c1b 100644
--- a/lib/kokkos/containers/unit_tests/serial/TestSerial_DynRankViewAPI_rank12345.cpp
+++ b/lib/kokkos/containers/unit_tests/serial/TestSerial_DynRankViewAPI_rank12345.cpp
@@ -3,10 +3,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -42,6 +43,5 @@
 //@HEADER
 */
 
-#include<serial/TestSerial_Category.hpp>
-#include<TestDynViewAPI_rank12345.hpp>
-
+#include <serial/TestSerial_Category.hpp>
+#include <TestDynViewAPI_rank12345.hpp>
diff --git a/lib/kokkos/containers/unit_tests/serial/TestSerial_DynRankViewAPI_rank67.cpp b/lib/kokkos/containers/unit_tests/serial/TestSerial_DynRankViewAPI_rank67.cpp
index 84e5b452c4..a3a745efb5 100644
--- a/lib/kokkos/containers/unit_tests/serial/TestSerial_DynRankViewAPI_rank67.cpp
+++ b/lib/kokkos/containers/unit_tests/serial/TestSerial_DynRankViewAPI_rank67.cpp
@@ -3,10 +3,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -42,6 +43,5 @@
 //@HEADER
 */
 
-#include<serial/TestSerial_Category.hpp>
-#include<TestDynViewAPI_rank67.hpp>
-
+#include <serial/TestSerial_Category.hpp>
+#include <TestDynViewAPI_rank67.hpp>
diff --git a/lib/kokkos/containers/unit_tests/serial/TestSerial_DynamicView.cpp b/lib/kokkos/containers/unit_tests/serial/TestSerial_DynamicView.cpp
index 34f4002db2..6624e3aa07 100644
--- a/lib/kokkos/containers/unit_tests/serial/TestSerial_DynamicView.cpp
+++ b/lib/kokkos/containers/unit_tests/serial/TestSerial_DynamicView.cpp
@@ -3,10 +3,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -42,6 +43,5 @@
 //@HEADER
 */
 
-#include<serial/TestSerial_Category.hpp>
-#include<TestDynamicView.hpp>
-
+#include <serial/TestSerial_Category.hpp>
+#include <TestDynamicView.hpp>
diff --git a/lib/kokkos/containers/unit_tests/serial/TestSerial_ErrorReporter.cpp b/lib/kokkos/containers/unit_tests/serial/TestSerial_ErrorReporter.cpp
index 326853f33a..280302275f 100644
--- a/lib/kokkos/containers/unit_tests/serial/TestSerial_ErrorReporter.cpp
+++ b/lib/kokkos/containers/unit_tests/serial/TestSerial_ErrorReporter.cpp
@@ -3,10 +3,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -42,6 +43,5 @@
 //@HEADER
 */
 
-#include<serial/TestSerial_Category.hpp>
-#include<TestErrorReporter.hpp>
-
+#include <serial/TestSerial_Category.hpp>
+#include <TestErrorReporter.hpp>
diff --git a/lib/kokkos/containers/unit_tests/serial/TestSerial_OffsetView.cpp b/lib/kokkos/containers/unit_tests/serial/TestSerial_OffsetView.cpp
index fadd748efb..5f8caf7c3f 100644
--- a/lib/kokkos/containers/unit_tests/serial/TestSerial_OffsetView.cpp
+++ b/lib/kokkos/containers/unit_tests/serial/TestSerial_OffsetView.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -41,6 +42,5 @@
 //@HEADER
 */
 
-#include<serial/TestSerial_Category.hpp>
-#include<TestOffsetView.hpp>
-
+#include <serial/TestSerial_Category.hpp>
+#include <TestOffsetView.hpp>
diff --git a/lib/kokkos/containers/unit_tests/serial/TestSerial_ScatterView.cpp b/lib/kokkos/containers/unit_tests/serial/TestSerial_ScatterView.cpp
index ee04d35584..3f102e5cbc 100644
--- a/lib/kokkos/containers/unit_tests/serial/TestSerial_ScatterView.cpp
+++ b/lib/kokkos/containers/unit_tests/serial/TestSerial_ScatterView.cpp
@@ -3,10 +3,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -42,6 +43,5 @@
 //@HEADER
 */
 
-#include<serial/TestSerial_Category.hpp>
-#include<TestScatterView.hpp>
-
+#include <serial/TestSerial_Category.hpp>
+#include <TestScatterView.hpp>
diff --git a/lib/kokkos/containers/unit_tests/serial/TestSerial_StaticCrsGraph.cpp b/lib/kokkos/containers/unit_tests/serial/TestSerial_StaticCrsGraph.cpp
index 2d10ee70d2..64f09e76e5 100644
--- a/lib/kokkos/containers/unit_tests/serial/TestSerial_StaticCrsGraph.cpp
+++ b/lib/kokkos/containers/unit_tests/serial/TestSerial_StaticCrsGraph.cpp
@@ -3,10 +3,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -42,6 +43,5 @@
 //@HEADER
 */
 
-#include<serial/TestSerial_Category.hpp>
-#include<TestStaticCrsGraph.hpp>
-
+#include <serial/TestSerial_Category.hpp>
+#include <TestStaticCrsGraph.hpp>
diff --git a/lib/kokkos/containers/unit_tests/serial/TestSerial_UnorderedMap.cpp b/lib/kokkos/containers/unit_tests/serial/TestSerial_UnorderedMap.cpp
index e78667e8aa..a72be8e2fc 100644
--- a/lib/kokkos/containers/unit_tests/serial/TestSerial_UnorderedMap.cpp
+++ b/lib/kokkos/containers/unit_tests/serial/TestSerial_UnorderedMap.cpp
@@ -3,10 +3,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -42,6 +43,5 @@
 //@HEADER
 */
 
-#include<serial/TestSerial_Category.hpp>
-#include<TestUnorderedMap.hpp>
-
+#include <serial/TestSerial_Category.hpp>
+#include <TestUnorderedMap.hpp>
diff --git a/lib/kokkos/containers/unit_tests/serial/TestSerial_Vector.cpp b/lib/kokkos/containers/unit_tests/serial/TestSerial_Vector.cpp
index bf98055622..3826dab1d7 100644
--- a/lib/kokkos/containers/unit_tests/serial/TestSerial_Vector.cpp
+++ b/lib/kokkos/containers/unit_tests/serial/TestSerial_Vector.cpp
@@ -3,10 +3,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -42,6 +43,5 @@
 //@HEADER
 */
 
-#include<serial/TestSerial_Category.hpp>
-#include<TestVector.hpp>
-
+#include <serial/TestSerial_Category.hpp>
+#include <TestVector.hpp>
diff --git a/lib/kokkos/containers/unit_tests/serial/TestSerial_ViewCtorPropEmbeddedDim.cpp b/lib/kokkos/containers/unit_tests/serial/TestSerial_ViewCtorPropEmbeddedDim.cpp
index 143b1f1c2d..1251808bed 100644
--- a/lib/kokkos/containers/unit_tests/serial/TestSerial_ViewCtorPropEmbeddedDim.cpp
+++ b/lib/kokkos/containers/unit_tests/serial/TestSerial_ViewCtorPropEmbeddedDim.cpp
@@ -3,10 +3,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -42,6 +43,5 @@
 //@HEADER
 */
 
-#include<serial/TestSerial_Category.hpp>
-#include<TestViewCtorPropEmbeddedDim.hpp>
-
+#include <serial/TestSerial_Category.hpp>
+#include <TestViewCtorPropEmbeddedDim.hpp>
diff --git a/lib/kokkos/containers/unit_tests/threads/TestThreads_BitSet.cpp b/lib/kokkos/containers/unit_tests/threads/TestThreads_BitSet.cpp
index 0dfe69fee2..ec93bb121c 100644
--- a/lib/kokkos/containers/unit_tests/threads/TestThreads_BitSet.cpp
+++ b/lib/kokkos/containers/unit_tests/threads/TestThreads_BitSet.cpp
@@ -3,10 +3,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -42,6 +43,5 @@
 //@HEADER
 */
 
-#include<threads/TestThreads_Category.hpp>
-#include<TestBitset.hpp>
-
+#include <threads/TestThreads_Category.hpp>
+#include <TestBitset.hpp>
diff --git a/lib/kokkos/containers/unit_tests/threads/TestThreads_Category.hpp b/lib/kokkos/containers/unit_tests/threads/TestThreads_Category.hpp
index c4d0ed6da2..74a2b0da36 100644
--- a/lib/kokkos/containers/unit_tests/threads/TestThreads_Category.hpp
+++ b/lib/kokkos/containers/unit_tests/threads/TestThreads_Category.hpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -44,21 +45,6 @@
 #ifndef KOKKOS_TEST_THREADS_HPP
 #define KOKKOS_TEST_THREADS_HPP
 
-#include <gtest/gtest.h>
-
-namespace Test {
-
-class threads : public ::testing::Test {
-protected:
-  static void SetUpTestCase() {
-  }
-
-  static void TearDownTestCase() {
-  }
-};
-
-} // namespace Test
-
 #define TEST_CATEGORY threads
 #define TEST_EXECSPACE Kokkos::Threads
 
diff --git a/lib/kokkos/containers/unit_tests/threads/TestThreads_DualView.cpp b/lib/kokkos/containers/unit_tests/threads/TestThreads_DualView.cpp
index 0ddafcd6fd..f6967bf0d4 100644
--- a/lib/kokkos/containers/unit_tests/threads/TestThreads_DualView.cpp
+++ b/lib/kokkos/containers/unit_tests/threads/TestThreads_DualView.cpp
@@ -3,10 +3,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -42,6 +43,5 @@
 //@HEADER
 */
 
-#include<threads/TestThreads_Category.hpp>
-#include<TestDualView.hpp>
-
+#include <threads/TestThreads_Category.hpp>
+#include <TestDualView.hpp>
diff --git a/lib/kokkos/containers/unit_tests/threads/TestThreads_DynRankViewAPI_generic.cpp b/lib/kokkos/containers/unit_tests/threads/TestThreads_DynRankViewAPI_generic.cpp
index 0030673785..b015683bb9 100644
--- a/lib/kokkos/containers/unit_tests/threads/TestThreads_DynRankViewAPI_generic.cpp
+++ b/lib/kokkos/containers/unit_tests/threads/TestThreads_DynRankViewAPI_generic.cpp
@@ -3,10 +3,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -42,6 +43,5 @@
 //@HEADER
 */
 
-#include<threads/TestThreads_Category.hpp>
-#include<TestDynViewAPI_generic.hpp>
-
+#include <threads/TestThreads_Category.hpp>
+#include <TestDynViewAPI_generic.hpp>
diff --git a/lib/kokkos/containers/unit_tests/threads/TestThreads_DynRankViewAPI_rank12345.cpp b/lib/kokkos/containers/unit_tests/threads/TestThreads_DynRankViewAPI_rank12345.cpp
index db39db38b3..dea56c408b 100644
--- a/lib/kokkos/containers/unit_tests/threads/TestThreads_DynRankViewAPI_rank12345.cpp
+++ b/lib/kokkos/containers/unit_tests/threads/TestThreads_DynRankViewAPI_rank12345.cpp
@@ -3,10 +3,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -42,6 +43,5 @@
 //@HEADER
 */
 
-#include<threads/TestThreads_Category.hpp>
-#include<TestDynViewAPI_rank12345.hpp>
-
+#include <threads/TestThreads_Category.hpp>
+#include <TestDynViewAPI_rank12345.hpp>
diff --git a/lib/kokkos/containers/unit_tests/threads/TestThreads_DynRankViewAPI_rank67.cpp b/lib/kokkos/containers/unit_tests/threads/TestThreads_DynRankViewAPI_rank67.cpp
index 1d1f94d6cf..17a289b506 100644
--- a/lib/kokkos/containers/unit_tests/threads/TestThreads_DynRankViewAPI_rank67.cpp
+++ b/lib/kokkos/containers/unit_tests/threads/TestThreads_DynRankViewAPI_rank67.cpp
@@ -3,10 +3,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -42,6 +43,5 @@
 //@HEADER
 */
 
-#include<threads/TestThreads_Category.hpp>
-#include<TestDynViewAPI_rank67.hpp>
-
+#include <threads/TestThreads_Category.hpp>
+#include <TestDynViewAPI_rank67.hpp>
diff --git a/lib/kokkos/containers/unit_tests/threads/TestThreads_DynamicView.cpp b/lib/kokkos/containers/unit_tests/threads/TestThreads_DynamicView.cpp
index 61616a5132..499321dbbe 100644
--- a/lib/kokkos/containers/unit_tests/threads/TestThreads_DynamicView.cpp
+++ b/lib/kokkos/containers/unit_tests/threads/TestThreads_DynamicView.cpp
@@ -3,10 +3,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -42,6 +43,5 @@
 //@HEADER
 */
 
-#include<threads/TestThreads_Category.hpp>
-#include<TestDynamicView.hpp>
-
+#include <threads/TestThreads_Category.hpp>
+#include <TestDynamicView.hpp>
diff --git a/lib/kokkos/containers/unit_tests/threads/TestThreads_ErrorReporter.cpp b/lib/kokkos/containers/unit_tests/threads/TestThreads_ErrorReporter.cpp
index a64c3f4082..513fdc4af6 100644
--- a/lib/kokkos/containers/unit_tests/threads/TestThreads_ErrorReporter.cpp
+++ b/lib/kokkos/containers/unit_tests/threads/TestThreads_ErrorReporter.cpp
@@ -3,10 +3,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -42,6 +43,5 @@
 //@HEADER
 */
 
-#include<threads/TestThreads_Category.hpp>
-#include<TestErrorReporter.hpp>
-
+#include <threads/TestThreads_Category.hpp>
+#include <TestErrorReporter.hpp>
diff --git a/lib/kokkos/containers/unit_tests/threads/TestThreads_OffsetView.cpp b/lib/kokkos/containers/unit_tests/threads/TestThreads_OffsetView.cpp
index d1eaa265e3..717967b2ef 100644
--- a/lib/kokkos/containers/unit_tests/threads/TestThreads_OffsetView.cpp
+++ b/lib/kokkos/containers/unit_tests/threads/TestThreads_OffsetView.cpp
@@ -3,10 +3,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -42,6 +43,5 @@
 //@HEADER
 */
 
-#include<threads/TestThreads_Category.hpp>
-#include<TestOffsetView.hpp>
-
+#include <threads/TestThreads_Category.hpp>
+#include <TestOffsetView.hpp>
diff --git a/lib/kokkos/containers/unit_tests/threads/TestThreads_ScatterView.cpp b/lib/kokkos/containers/unit_tests/threads/TestThreads_ScatterView.cpp
index 6c7138058d..fbb37606ea 100644
--- a/lib/kokkos/containers/unit_tests/threads/TestThreads_ScatterView.cpp
+++ b/lib/kokkos/containers/unit_tests/threads/TestThreads_ScatterView.cpp
@@ -3,10 +3,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -42,6 +43,5 @@
 //@HEADER
 */
 
-#include<threads/TestThreads_Category.hpp>
-#include<TestScatterView.hpp>
-
+#include <threads/TestThreads_Category.hpp>
+#include <TestScatterView.hpp>
diff --git a/lib/kokkos/containers/unit_tests/threads/TestThreads_StaticCrsGraph.cpp b/lib/kokkos/containers/unit_tests/threads/TestThreads_StaticCrsGraph.cpp
index f6a1204dd3..29117c4ef6 100644
--- a/lib/kokkos/containers/unit_tests/threads/TestThreads_StaticCrsGraph.cpp
+++ b/lib/kokkos/containers/unit_tests/threads/TestThreads_StaticCrsGraph.cpp
@@ -3,10 +3,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -42,6 +43,5 @@
 //@HEADER
 */
 
-#include<threads/TestThreads_Category.hpp>
-#include<TestStaticCrsGraph.hpp>
-
+#include <threads/TestThreads_Category.hpp>
+#include <TestStaticCrsGraph.hpp>
diff --git a/lib/kokkos/containers/unit_tests/threads/TestThreads_UnorderedMap.cpp b/lib/kokkos/containers/unit_tests/threads/TestThreads_UnorderedMap.cpp
index 2f3aeedae0..9a06288de4 100644
--- a/lib/kokkos/containers/unit_tests/threads/TestThreads_UnorderedMap.cpp
+++ b/lib/kokkos/containers/unit_tests/threads/TestThreads_UnorderedMap.cpp
@@ -3,10 +3,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -42,6 +43,5 @@
 //@HEADER
 */
 
-#include<threads/TestThreads_Category.hpp>
-#include<TestUnorderedMap.hpp>
-
+#include <threads/TestThreads_Category.hpp>
+#include <TestUnorderedMap.hpp>
diff --git a/lib/kokkos/containers/unit_tests/threads/TestThreads_Vector.cpp b/lib/kokkos/containers/unit_tests/threads/TestThreads_Vector.cpp
index a497d43772..33e8b26c8e 100644
--- a/lib/kokkos/containers/unit_tests/threads/TestThreads_Vector.cpp
+++ b/lib/kokkos/containers/unit_tests/threads/TestThreads_Vector.cpp
@@ -3,10 +3,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -42,6 +43,5 @@
 //@HEADER
 */
 
-#include<threads/TestThreads_Category.hpp>
-#include<TestVector.hpp>
-
+#include <threads/TestThreads_Category.hpp>
+#include <TestVector.hpp>
diff --git a/lib/kokkos/containers/unit_tests/threads/TestThreads_ViewCtorPropEmbeddedDim.cpp b/lib/kokkos/containers/unit_tests/threads/TestThreads_ViewCtorPropEmbeddedDim.cpp
index 89f85dca56..567b224195 100644
--- a/lib/kokkos/containers/unit_tests/threads/TestThreads_ViewCtorPropEmbeddedDim.cpp
+++ b/lib/kokkos/containers/unit_tests/threads/TestThreads_ViewCtorPropEmbeddedDim.cpp
@@ -3,10 +3,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -42,6 +43,5 @@
 //@HEADER
 */
 
-#include<threads/TestThreads_Category.hpp>
-#include<TestViewCtorPropEmbeddedDim.hpp>
-
+#include <threads/TestThreads_Category.hpp>
+#include <TestViewCtorPropEmbeddedDim.hpp>
diff --git a/lib/kokkos/core/CMakeLists.txt b/lib/kokkos/core/CMakeLists.txt
index 93db0d2ecf..8df72dfc90 100644
--- a/lib/kokkos/core/CMakeLists.txt
+++ b/lib/kokkos/core/CMakeLists.txt
@@ -1,13 +1,12 @@
-
-
-TRIBITS_SUBPACKAGE(Core)
-
-IF(KOKKOS_HAS_TRILINOS)
-  ADD_SUBDIRECTORY(src)
-ENDIF()
-
-TRIBITS_ADD_TEST_DIRECTORIES(unit_test)
-TRIBITS_ADD_TEST_DIRECTORIES(perf_test)
-
-TRIBITS_SUBPACKAGE_POSTPROCESS()
-
+
+
+KOKKOS_SUBPACKAGE(Core)
+
+ADD_SUBDIRECTORY(src)
+
+KOKKOS_ADD_TEST_DIRECTORIES(unit_test)
+KOKKOS_ADD_TEST_DIRECTORIES(perf_test)
+
+KOKKOS_SUBPACKAGE_POSTPROCESS()
+
+
diff --git a/lib/kokkos/core/cmake/KokkosCore_config.h.in b/lib/kokkos/core/cmake/KokkosCore_config.h.in
index b2c80207d4..f430c2b5f6 100644
--- a/lib/kokkos/core/cmake/KokkosCore_config.h.in
+++ b/lib/kokkos/core/cmake/KokkosCore_config.h.in
@@ -13,8 +13,7 @@
 
 #cmakedefine KOKKOS_ENABLE_CUDA
 #cmakedefine KOKKOS_ENABLE_OPENMP
-#cmakedefine KOKKOS_ENABLE_PTHREAD
-#cmakedefine KOKKOS_ENABLE_QTHREADS
+#cmakedefine KOKKOS_ENABLE_THREADS
 #cmakedefine KOKKOS_ENABLE_SERIAL
 #cmakedefine KOKKOS_ENABLE_Winthread
 
diff --git a/lib/kokkos/core/perf_test/CMakeLists.txt b/lib/kokkos/core/perf_test/CMakeLists.txt
index d92462a357..79567835ee 100644
--- a/lib/kokkos/core/perf_test/CMakeLists.txt
+++ b/lib/kokkos/core/perf_test/CMakeLists.txt
@@ -1,59 +1,71 @@
 
-INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR})
-INCLUDE_DIRECTORIES(REQUIRED_DURING_INSTALLATION_TESTING ${CMAKE_CURRENT_SOURCE_DIR})
+#INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR})
+#INCLUDE_DIRECTORIES(REQUIRED_DURING_INSTALLATION_TESTING ${CMAKE_CURRENT_SOURCE_DIR})
 
-IF(NOT KOKKOS_HAS_TRILINOS)
-  IF(KOKKOS_SEPARATE_LIBS)
-    set(TEST_LINK_TARGETS kokkoscore)
-  ELSE()
-    set(TEST_LINK_TARGETS kokkos)
-  ENDIF()
-ENDIF()
 
 # warning: PerfTest_CustomReduction.cpp uses
 # ../../algorithms/src/Kokkos_Random.hpp
 # we'll just allow it to be included, but note
 # that in TriBITS KokkosAlgorithms can be disabled...
-INCLUDE_DIRECTORIES("${CMAKE_CURRENT_SOURCE_DIR}/../../algorithms/src")
+#INCLUDE_DIRECTORIES("${CMAKE_CURRENT_SOURCE_DIR}/../../algorithms/src")
 
 SET(SOURCES
   PerfTestMain.cpp
   PerfTestGramSchmidt.cpp
   PerfTestHexGrad.cpp
   PerfTest_CustomReduction.cpp
+  PerfTest_ExecSpacePartitioning.cpp
+  PerfTest_ViewCopy_a123.cpp
+  PerfTest_ViewCopy_b123.cpp
+  PerfTest_ViewCopy_c123.cpp
+  PerfTest_ViewCopy_d123.cpp
+  PerfTest_ViewCopy_a45.cpp
+  PerfTest_ViewCopy_b45.cpp
+  PerfTest_ViewCopy_c45.cpp
+  PerfTest_ViewCopy_d45.cpp
+  PerfTest_ViewCopy_a6.cpp
+  PerfTest_ViewCopy_b6.cpp
+  PerfTest_ViewCopy_c6.cpp
+  PerfTest_ViewCopy_d6.cpp
+  PerfTest_ViewCopy_a7.cpp
+  PerfTest_ViewCopy_b7.cpp
+  PerfTest_ViewCopy_c7.cpp
+  PerfTest_ViewCopy_d7.cpp
+  PerfTest_ViewCopy_a8.cpp
+  PerfTest_ViewCopy_b8.cpp
+  PerfTest_ViewCopy_c8.cpp
+  PerfTest_ViewCopy_d8.cpp
+  PerfTest_ViewAllocate.cpp
+  PerfTest_ViewFill_123.cpp
+  PerfTest_ViewFill_45.cpp
+  PerfTest_ViewFill_6.cpp
+  PerfTest_ViewFill_7.cpp
+  PerfTest_ViewFill_8.cpp
+  PerfTest_ViewResize_123.cpp
+  PerfTest_ViewResize_45.cpp
+  PerfTest_ViewResize_6.cpp
+  PerfTest_ViewResize_7.cpp
+  PerfTest_ViewResize_8.cpp
   )
 
 # Per #374, we always want to build this test, but we only want to run
 # it as a PERFORMANCE test.  That's why we separate building the test
 # from running the test.
 
-TRIBITS_ADD_EXECUTABLE(
+#leave these as basic includes for now
+#I don't need anything transitive
+KOKKOS_INCLUDE_DIRECTORIES("${CMAKE_CURRENT_SOURCE_DIR}/../../algorithms/src")
+KOKKOS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR})
+KOKKOS_INCLUDE_DIRECTORIES(REQUIRED_DURING_INSTALLATION_TESTING ${CMAKE_CURRENT_SOURCE_DIR})
+
+KOKKOS_ADD_EXECUTABLE_AND_TEST(
   PerfTestExec
   SOURCES ${SOURCES}
-  COMM serial mpi
-  TESTONLYLIBS kokkos_gtest ${TEST_LINK_TARGETS}
-  )
-
-TRIBITS_ADD_TEST(
-  PerfTest
-  NAME PerfTestExec
-  COMM serial mpi
-  NUM_MPI_PROCS 1
   CATEGORIES PERFORMANCE
-  FAIL_REGULAR_EXPRESSION "  FAILED  "
-  )
+)
 
-TRIBITS_ADD_EXECUTABLE(
-  PerformanceTest_TaskDAG
+KOKKOS_ADD_EXECUTABLE_AND_TEST(
+  PerformanceTest_TaskDag
   SOURCES test_taskdag.cpp
-  COMM serial mpi
-  TESTONLYLIBS kokkos_gtest ${TEST_LINK_TARGETS}
-  )
-
-TRIBITS_ADD_TEST(
-  PerformanceTest_TaskDAG
-  NAME PerformanceTest_TaskDAG
-  COMM serial mpi
-  NUM_MPI_PROCS 1
   CATEGORIES PERFORMANCE
-  )
+)
diff --git a/lib/kokkos/core/perf_test/PerfTestBlasKernels.hpp b/lib/kokkos/core/perf_test/PerfTestBlasKernels.hpp
index ff9bf5a91b..a5a376565d 100644
--- a/lib/kokkos/core/perf_test/PerfTestBlasKernels.hpp
+++ b/lib/kokkos/core/perf_test/PerfTestBlasKernels.hpp
@@ -1,13 +1,14 @@
 /*
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -36,7 +37,7 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 */
@@ -48,217 +49,186 @@
 
 namespace Kokkos {
 
-template< class ConstVectorType ,
-          class Device = typename ConstVectorType::execution_space >
-struct Dot ;
+template <class ConstVectorType,
+          class Device = typename ConstVectorType::execution_space>
+struct Dot;
 
-template< class ConstVectorType ,
-          class Device = typename ConstVectorType::execution_space >
-struct DotSingle ;
+template <class ConstVectorType,
+          class Device = typename ConstVectorType::execution_space>
+struct DotSingle;
 
-template< class ConstScalarType ,
-          class VectorType ,
-          class Device = typename VectorType::execution_space >
-struct Scale ;
+template <class ConstScalarType, class VectorType,
+          class Device = typename VectorType::execution_space>
+struct Scale;
 
-template< class ConstScalarType ,
-          class ConstVectorType ,
-          class VectorType ,
-          class Device = typename VectorType::execution_space >
-struct AXPBY ;
+template <class ConstScalarType, class ConstVectorType, class VectorType,
+          class Device = typename VectorType::execution_space>
+struct AXPBY;
 
 /** \brief  Y = alpha * X + beta * Y */
-template< class ConstScalarType ,
-          class ConstVectorType ,
-          class      VectorType >
-void axpby( const ConstScalarType & alpha ,
-            const ConstVectorType & X ,
-            const ConstScalarType & beta ,
-            const      VectorType & Y )
-{
-  typedef AXPBY< ConstScalarType , ConstVectorType , VectorType > functor ;
+template <class ConstScalarType, class ConstVectorType, class VectorType>
+void axpby(const ConstScalarType& alpha, const ConstVectorType& X,
+           const ConstScalarType& beta, const VectorType& Y) {
+  typedef AXPBY<ConstScalarType, ConstVectorType, VectorType> functor;
 
-  parallel_for( Y.extent(0) , functor( alpha , X , beta , Y ) );
+  parallel_for(Y.extent(0), functor(alpha, X, beta, Y));
 }
 
 /** \brief  Y *= alpha */
-template< class ConstScalarType ,
-          class      VectorType >
-void scale( const ConstScalarType & alpha , const VectorType & Y )
-{
-  typedef Scale< ConstScalarType , VectorType > functor ;
+template <class ConstScalarType, class VectorType>
+void scale(const ConstScalarType& alpha, const VectorType& Y) {
+  typedef Scale<ConstScalarType, VectorType> functor;
 
-  parallel_for( Y.extent(0) , functor( alpha , Y ) );
+  parallel_for(Y.extent(0), functor(alpha, Y));
 }
 
-template< class ConstVectorType ,
-          class Finalize >
-void dot( const ConstVectorType & X ,
-          const ConstVectorType & Y ,
-          const Finalize & finalize )
-{
-  typedef Dot< ConstVectorType >  functor ;
+template <class ConstVectorType, class Finalize>
+void dot(const ConstVectorType& X, const ConstVectorType& Y,
+         const Finalize& finalize) {
+  typedef Dot<ConstVectorType> functor;
 
-  parallel_reduce( X.extent(0) , functor( X , Y ) , finalize );
+  parallel_reduce(X.extent(0), functor(X, Y), finalize);
 }
 
-template< class ConstVectorType ,
-          class Finalize >
-void dot( const ConstVectorType & X ,
-          const Finalize & finalize )
-{
-  typedef DotSingle< ConstVectorType >  functor ;
+template <class ConstVectorType, class Finalize>
+void dot(const ConstVectorType& X, const Finalize& finalize) {
+  typedef DotSingle<ConstVectorType> functor;
 
-  parallel_reduce( X.extent(0) , functor( X ) , finalize );
+  parallel_reduce(X.extent(0), functor(X), finalize);
 }
 
 } /* namespace Kokkos */
 
-
 //----------------------------------------------------------------------------
 //----------------------------------------------------------------------------
 
 namespace Kokkos {
 
-template< class Type , class Device >
-struct Dot
-{
-  typedef typename Device::execution_space execution_space ;
+template <class Type, class Device>
+struct Dot {
+  typedef typename Device::execution_space execution_space;
 
-  static_assert( static_cast<unsigned>(Type::Rank) == static_cast<unsigned>(1),
-    "Dot static_assert Fail: Rank != 1");
+  static_assert(static_cast<unsigned>(Type::Rank) == static_cast<unsigned>(1),
+                "Dot static_assert Fail: Rank != 1");
 
-
-  typedef double value_type ;
+  typedef double value_type;
 
 #if 1
-  typename Type::const_type X ;
-  typename Type::const_type Y ;
+  typename Type::const_type X;
+  typename Type::const_type Y;
 #else
-  Type X ;
-  Type Y ;
+  Type X;
+  Type Y;
 #endif
 
-  Dot( const Type & arg_x , const Type & arg_y )
-    : X(arg_x) , Y(arg_y) { }
+  Dot(const Type& arg_x, const Type& arg_y) : X(arg_x), Y(arg_y) {}
 
   KOKKOS_INLINE_FUNCTION
-  void operator()( int i , value_type & update ) const
-    { update += X[i] * Y[i]; }
+  void operator()(int i, value_type& update) const { update += X[i] * Y[i]; }
 
   KOKKOS_INLINE_FUNCTION
-  static void join( volatile value_type & update ,
-                    const volatile value_type & source )
-    { update += source; }
+  static void join(volatile value_type& update,
+                   const volatile value_type& source) {
+    update += source;
+  }
 
   KOKKOS_INLINE_FUNCTION
-  static void init( value_type & update )
-    { update = 0 ; }
+  static void init(value_type& update) { update = 0; }
 };
 
-template< class Type , class Device >
-struct DotSingle
-{
-  typedef typename Device::execution_space execution_space ;
+template <class Type, class Device>
+struct DotSingle {
+  typedef typename Device::execution_space execution_space;
 
-  static_assert( static_cast<unsigned>(Type::Rank) == static_cast<unsigned>(1),
-    "DotSingle static_assert Fail: Rank != 1");
+  static_assert(static_cast<unsigned>(Type::Rank) == static_cast<unsigned>(1),
+                "DotSingle static_assert Fail: Rank != 1");
 
-  typedef double value_type ;
+  typedef double value_type;
 
 #if 1
-  typename Type::const_type X ;
+  typename Type::const_type X;
 #else
-  Type X ;
+  Type X;
 #endif
 
-  DotSingle( const Type & arg_x ) : X(arg_x) {}
+  DotSingle(const Type& arg_x) : X(arg_x) {}
 
   KOKKOS_INLINE_FUNCTION
-  void operator()( int i , value_type & update ) const
-    {
-      const typename Type::value_type & x = X[i]; update += x * x ;
-    }
+  void operator()(int i, value_type& update) const {
+    const typename Type::value_type& x = X[i];
+    update += x * x;
+  }
 
   KOKKOS_INLINE_FUNCTION
-  static void join( volatile value_type & update ,
-                    const volatile value_type & source )
-    { update += source; }
+  static void join(volatile value_type& update,
+                   const volatile value_type& source) {
+    update += source;
+  }
 
   KOKKOS_INLINE_FUNCTION
-  static void init( value_type & update )
-    { update = 0 ; }
+  static void init(value_type& update) { update = 0; }
 };
 
+template <class ScalarType, class VectorType, class Device>
+struct Scale {
+  typedef typename Device::execution_space execution_space;
 
-template< class ScalarType , class VectorType , class Device>
-struct Scale
-{
-  typedef typename Device::execution_space execution_space ;
+  static_assert(static_cast<unsigned>(ScalarType::Rank) ==
+                    static_cast<unsigned>(0),
+                "Scale static_assert Fail: ScalarType::Rank != 0");
 
-  static_assert( static_cast<unsigned>(ScalarType::Rank) == static_cast<unsigned>(0),
-    "Scale static_assert Fail: ScalarType::Rank != 0");
-
-  static_assert( static_cast<unsigned>(VectorType::Rank) == static_cast<unsigned>(1),
-    "Scale static_assert Fail: VectorType::Rank != 1");
+  static_assert(static_cast<unsigned>(VectorType::Rank) ==
+                    static_cast<unsigned>(1),
+                "Scale static_assert Fail: VectorType::Rank != 1");
 
 #if 1
-  typename ScalarType::const_type alpha ;
+  typename ScalarType::const_type alpha;
 #else
-  ScalarType alpha ;
+  ScalarType alpha;
 #endif
 
-  VectorType Y ;
+  VectorType Y;
 
-  Scale( const ScalarType & arg_alpha , const VectorType & arg_Y )
-    : alpha( arg_alpha ), Y( arg_Y ) {}
+  Scale(const ScalarType& arg_alpha, const VectorType& arg_Y)
+      : alpha(arg_alpha), Y(arg_Y) {}
 
   KOKKOS_INLINE_FUNCTION
-  void operator()( int i ) const
-    {
-      Y[i] *= alpha() ;
-    }
+  void operator()(int i) const { Y[i] *= alpha(); }
 };
 
-
-template< class ScalarType ,
-          class ConstVectorType ,
-          class VectorType,
+template <class ScalarType, class ConstVectorType, class VectorType,
           class Device>
-struct AXPBY
-{
-  typedef typename Device::execution_space execution_space ;
+struct AXPBY {
+  typedef typename Device::execution_space execution_space;
 
-  static_assert( static_cast<unsigned>(ScalarType::Rank) == static_cast<unsigned>(0),
-    "AXPBY static_assert Fail: ScalarType::Rank != 0");
+  static_assert(static_cast<unsigned>(ScalarType::Rank) ==
+                    static_cast<unsigned>(0),
+                "AXPBY static_assert Fail: ScalarType::Rank != 0");
 
-  static_assert( static_cast<unsigned>(ConstVectorType::Rank) == static_cast<unsigned>(1),
-    "AXPBY static_assert Fail: ConstVectorType::Rank != 1");
+  static_assert(static_cast<unsigned>(ConstVectorType::Rank) ==
+                    static_cast<unsigned>(1),
+                "AXPBY static_assert Fail: ConstVectorType::Rank != 1");
 
-  static_assert( static_cast<unsigned>(VectorType::Rank) == static_cast<unsigned>(1),
-    "AXPBY static_assert Fail: VectorType::Rank != 1");
+  static_assert(static_cast<unsigned>(VectorType::Rank) ==
+                    static_cast<unsigned>(1),
+                "AXPBY static_assert Fail: VectorType::Rank != 1");
 
 #if 1
-  typename ScalarType::const_type alpha , beta ;
-  typename ConstVectorType::const_type X ;
+  typename ScalarType::const_type alpha, beta;
+  typename ConstVectorType::const_type X;
 #else
-  ScalarType alpha , beta ;
-  ConstVectorType X ;
+  ScalarType alpha, beta;
+  ConstVectorType X;
 #endif
 
-  VectorType Y ;
+  VectorType Y;
 
-  AXPBY( const ScalarType      & arg_alpha ,
-         const ConstVectorType & arg_X ,
-         const ScalarType      & arg_beta ,
-         const VectorType      & arg_Y )
-    : alpha( arg_alpha ), beta( arg_beta ), X( arg_X ), Y( arg_Y ) {}
+  AXPBY(const ScalarType& arg_alpha, const ConstVectorType& arg_X,
+        const ScalarType& arg_beta, const VectorType& arg_Y)
+      : alpha(arg_alpha), beta(arg_beta), X(arg_X), Y(arg_Y) {}
 
   KOKKOS_INLINE_FUNCTION
-  void operator()( int i ) const
-    {
-      Y[i] = alpha() * X[i] + beta() * Y[i] ;
-    }
+  void operator()(int i) const { Y[i] = alpha() * X[i] + beta() * Y[i]; }
 };
 
 } /* namespace Kokkos */
diff --git a/lib/kokkos/core/perf_test/PerfTestDriver.hpp b/lib/kokkos/core/perf_test/PerfTestDriver.hpp
index 5367f2542e..95d5128abf 100644
--- a/lib/kokkos/core/perf_test/PerfTestDriver.hpp
+++ b/lib/kokkos/core/perf_test/PerfTestDriver.hpp
@@ -1,13 +1,14 @@
 /*
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -36,7 +37,7 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 */
@@ -60,244 +61,262 @@ namespace Test {
 
 enum { NUMBER_OF_TRIALS = 5 };
 
-template< class DeviceType , class LayoutType >
-void run_test_mdrange( int exp_beg , int exp_end, const char deviceTypeName[], int range_offset = 0,  int tile_offset = 0 )
+template <class DeviceType, class LayoutType>
+void run_test_mdrange(int exp_beg, int exp_end, const char deviceTypeName[],
+                      int range_offset = 0, int tile_offset = 0)
 // exp_beg = 6 => 2^6 = 64 is starting range length
 {
 #define MDRANGE_PERFORMANCE_OUTPUT_VERBOSE 0
 
-  std::string label_mdrange ;
-  label_mdrange.append( "\"MDRange< double , " );
-  label_mdrange.append( deviceTypeName );
-  label_mdrange.append( " >\"" );
+  std::string label_mdrange;
+  label_mdrange.append("\"MDRange< double , ");
+  label_mdrange.append(deviceTypeName);
+  label_mdrange.append(" >\"");
 
-  std::string label_range_col2 ;
-  label_range_col2.append( "\"RangeColTwo< double , " );
-  label_range_col2.append( deviceTypeName );
-  label_range_col2.append( " >\"" );
+  std::string label_range_col2;
+  label_range_col2.append("\"RangeColTwo< double , ");
+  label_range_col2.append(deviceTypeName);
+  label_range_col2.append(" >\"");
 
-  std::string label_range_col_all ;
-  label_range_col_all.append( "\"RangeColAll< double , " );
-  label_range_col_all.append( deviceTypeName );
-  label_range_col_all.append( " >\"" );
+  std::string label_range_col_all;
+  label_range_col_all.append("\"RangeColAll< double , ");
+  label_range_col_all.append(deviceTypeName);
+  label_range_col_all.append(" >\"");
 
-  if ( std::is_same<LayoutType, Kokkos::LayoutRight>::value) {
-    std::cout << "--------------------------------------------------------------\n"
-      << "Performance tests for MDRange Layout Right"
-      << "\n--------------------------------------------------------------" << std::endl;
+  if (std::is_same<LayoutType, Kokkos::LayoutRight>::value) {
+    std::cout
+        << "--------------------------------------------------------------\n"
+        << "Performance tests for MDRange Layout Right"
+        << "\n--------------------------------------------------------------"
+        << std::endl;
   } else {
-    std::cout << "--------------------------------------------------------------\n"
-      << "Performance tests for MDRange Layout Left"
-      << "\n--------------------------------------------------------------" << std::endl;
+    std::cout
+        << "--------------------------------------------------------------\n"
+        << "Performance tests for MDRange Layout Left"
+        << "\n--------------------------------------------------------------"
+        << std::endl;
   }
 
+  for (int i = exp_beg; i < exp_end; ++i) {
+    const int range_length = (1 << i) + range_offset;
 
-  for (int i = exp_beg ; i < exp_end ; ++i) {
-    const int range_length = (1<<i) + range_offset;
-
-    std::cout << "\n--------------------------------------------------------------\n"
-      << "--------------------------------------------------------------\n"
-      << "MDRange Test:  range bounds: " << range_length << " , " << range_length << " , " << range_length 
-      << "\n--------------------------------------------------------------\n"
-      << "--------------------------------------------------------------\n";
-//      << std::endl;
+    std::cout
+        << "\n--------------------------------------------------------------\n"
+        << "--------------------------------------------------------------\n"
+        << "MDRange Test:  range bounds: " << range_length << " , "
+        << range_length << " , " << range_length
+        << "\n--------------------------------------------------------------\n"
+        << "--------------------------------------------------------------\n";
+    //      << std::endl;
 
     int t0_min = 0, t1_min = 0, t2_min = 0;
     double seconds_min = 0.0;
 
     // Test 1: The MDRange in full
     {
-    int t0 = 1, t1 = 1, t2 = 1;
-    int counter = 1;
+      int t0 = 1, t1 = 1, t2 = 1;
+      int counter = 1;
 #if !defined(KOKKOS_ENABLE_CUDA)
-    int min_bnd = 8;
-    int tfast = range_length;
+      int min_bnd = 8;
+      int tfast   = range_length;
 #else
-    int min_bnd = 2;
-    int tfast = 32;
+      int min_bnd = 2;
+      int tfast   = 32;
 #endif
-    while ( tfast >= min_bnd ) {
-      int tmid = min_bnd;
-      while ( tmid < tfast ) { 
-        t0 = min_bnd;
-        t1 = tmid;
-        t2 = tfast;
-        int t2_rev = min_bnd;
-        int t1_rev = tmid;
-        int t0_rev = tfast;
+      while (tfast >= min_bnd) {
+        int tmid = min_bnd;
+        while (tmid < tfast) {
+          t0         = min_bnd;
+          t1         = tmid;
+          t2         = tfast;
+          int t2_rev = min_bnd;
+          int t1_rev = tmid;
+          int t0_rev = tfast;
 
 #if defined(KOKKOS_ENABLE_CUDA)
-        //Note: Product of tile sizes must be < 1024 for Cuda
-        if ( t0*t1*t2 >= 1024 ) {
-          printf("  Exceeded Cuda tile limits; onto next range set\n\n");
-          break;
-        }
-#endif
-
-        // Run 1 with tiles LayoutRight style
-        double seconds_1 = 0;
-        { seconds_1 = MultiDimRangePerf3D< DeviceType , double , LayoutType >::test_multi_index(range_length,range_length,range_length, t0, t1, t2) ; }
-
-#if MDRANGE_PERFORMANCE_OUTPUT_VERBOSE
-        std::cout << label_mdrange
-          << " , " << t0 << " , " << t1 << " , " << t2
-          << " , " << seconds_1
-          << std::endl ;
-#endif
-
-        if ( counter == 1 ) {
-          seconds_min = seconds_1;
-          t0_min = t0;
-          t1_min = t1;
-          t2_min = t2;
-        } 
-        else {
-          if ( seconds_1 < seconds_min ) 
-          { 
-            seconds_min = seconds_1; 
-            t0_min = t0;
-            t1_min = t1;
-            t2_min = t2;
+          // Note: Product of tile sizes must be < 1024 for Cuda
+          if (t0 * t1 * t2 >= 1024) {
+            printf("  Exceeded Cuda tile limits; onto next range set\n\n");
+            break;
           }
-        }
-
-        // Run 2 with tiles LayoutLeft style - reverse order of tile dims
-        double seconds_1rev = 0;
-        { seconds_1rev = MultiDimRangePerf3D< DeviceType , double , LayoutType >::test_multi_index(range_length,range_length,range_length, t0_rev, t1_rev, t2_rev) ; }
-
-#if MDRANGE_PERFORMANCE_OUTPUT_VERBOSE
-        std::cout << label_mdrange
-          << " , " << t0_rev << " , " << t1_rev << " , " << t2_rev
-          << " , " << seconds_1rev
-          << std::endl ;
 #endif
 
-        if ( seconds_1rev < seconds_min ) 
-        { 
-          seconds_min = seconds_1rev; 
-          t0_min = t0_rev;
-          t1_min = t1_rev;
-          t2_min = t2_rev;
-        }
+          // Run 1 with tiles LayoutRight style
+          double seconds_1 = 0;
+          {
+            seconds_1 =
+                MultiDimRangePerf3D<DeviceType, double,
+                                    LayoutType>::test_multi_index(range_length,
+                                                                  range_length,
+                                                                  range_length,
+                                                                  t0, t1, t2);
+          }
 
-        ++counter;
-        tmid <<= 1;
-      } //end inner while
-      tfast >>=1;
-    } //end outer while
+#if MDRANGE_PERFORMANCE_OUTPUT_VERBOSE
+          std::cout << label_mdrange << " , " << t0 << " , " << t1 << " , "
+                    << t2 << " , " << seconds_1 << std::endl;
+#endif
 
-    std::cout << "\n"
-      << "--------------------------------------------------------------\n"
-      << label_mdrange
-      << "\n Min values "
-      << "\n Range length per dim (3D): " << range_length
-      << "\n TileDims:  " << t0_min << " , " << t1_min << " , " << t2_min
-      << "\n Min time: " << seconds_min
-      << "\n---------------------------------------------------------------"
-      << std::endl ;
-    } //end scope
+          if (counter == 1) {
+            seconds_min = seconds_1;
+            t0_min      = t0;
+            t1_min      = t1;
+            t2_min      = t2;
+          } else {
+            if (seconds_1 < seconds_min) {
+              seconds_min = seconds_1;
+              t0_min      = t0;
+              t1_min      = t1;
+              t2_min      = t2;
+            }
+          }
+
+          // Run 2 with tiles LayoutLeft style - reverse order of tile dims
+          double seconds_1rev = 0;
+          {
+            seconds_1rev =
+                MultiDimRangePerf3D<DeviceType, double,
+                                    LayoutType>::test_multi_index(range_length,
+                                                                  range_length,
+                                                                  range_length,
+                                                                  t0_rev,
+                                                                  t1_rev,
+                                                                  t2_rev);
+          }
+
+#if MDRANGE_PERFORMANCE_OUTPUT_VERBOSE
+          std::cout << label_mdrange << " , " << t0_rev << " , " << t1_rev
+                    << " , " << t2_rev << " , " << seconds_1rev << std::endl;
+#endif
+
+          if (seconds_1rev < seconds_min) {
+            seconds_min = seconds_1rev;
+            t0_min      = t0_rev;
+            t1_min      = t1_rev;
+            t2_min      = t2_rev;
+          }
+
+          ++counter;
+          tmid <<= 1;
+        }  // end inner while
+        tfast >>= 1;
+      }  // end outer while
+
+      std::cout
+          << "\n"
+          << "--------------------------------------------------------------\n"
+          << label_mdrange << "\n Min values "
+          << "\n Range length per dim (3D): " << range_length
+          << "\n TileDims:  " << t0_min << " , " << t1_min << " , " << t2_min
+          << "\n Min time: " << seconds_min
+          << "\n---------------------------------------------------------------"
+          << std::endl;
+    }  // end scope
 
 #if !defined(KOKKOS_ENABLE_CUDA)
-  double seconds_min_c = 0.0;
-  int t0c_min = 0, t1c_min = 0, t2c_min = 0;
-  int counter = 1;
-  {
-    int min_bnd = 8;
-    // Test 1_c: MDRange with 0 for 'inner' tile dim; this case will utilize the full span in that direction, should be similar to Collapse<2>
-    if ( std::is_same<LayoutType, Kokkos::LayoutRight>::value ) {
-      for ( unsigned int T0 = min_bnd; T0 < static_cast<unsigned int>(range_length); T0<<=1 ) {
-        for ( unsigned int T1 = min_bnd; T1 < static_cast<unsigned int>(range_length); T1<<=1 ) {
-          double seconds_c = 0;
-          { seconds_c = MultiDimRangePerf3D< DeviceType , double , LayoutType >::test_multi_index(range_length,range_length,range_length, T0, T1, 0) ; }
+    double seconds_min_c = 0.0;
+    int t0c_min = 0, t1c_min = 0, t2c_min = 0;
+    int counter = 1;
+    {
+      int min_bnd = 8;
+      // Test 1_c: MDRange with 0 for 'inner' tile dim; this case will utilize
+      // the full span in that direction, should be similar to Collapse<2>
+      if (std::is_same<LayoutType, Kokkos::LayoutRight>::value) {
+        for (unsigned int T0 = min_bnd;
+             T0 < static_cast<unsigned int>(range_length); T0 <<= 1) {
+          for (unsigned int T1 = min_bnd;
+               T1 < static_cast<unsigned int>(range_length); T1 <<= 1) {
+            double seconds_c = 0;
+            {
+              seconds_c = MultiDimRangePerf3D<DeviceType, double, LayoutType>::
+                  test_multi_index(range_length, range_length, range_length, T0,
+                                   T1, 0);
+            }
 
 #if MDRANGE_PERFORMANCE_OUTPUT_VERBOSE
-          std::cout << " MDRange LR with '0' tile - collapse-like \n"
-          << label_mdrange
-          << " , " << T0 << " , " << T1 << " , " << range_length
-          << " , " << seconds_c
-          << std::endl ;
+            std::cout << " MDRange LR with '0' tile - collapse-like \n"
+                      << label_mdrange << " , " << T0 << " , " << T1 << " , "
+                      << range_length << " , " << seconds_c << std::endl;
 #endif
 
-          t2c_min = range_length;
-          if ( counter == 1 ) {
-            seconds_min_c = seconds_c;
-            t0c_min = T0;
-            t1c_min = T1;
-          } 
-          else {
-            if ( seconds_c < seconds_min_c ) 
-            { 
-              seconds_min_c = seconds_c; 
-              t0c_min = T0;
-              t1c_min = T1;
+            t2c_min = range_length;
+            if (counter == 1) {
+              seconds_min_c = seconds_c;
+              t0c_min       = T0;
+              t1c_min       = T1;
+            } else {
+              if (seconds_c < seconds_min_c) {
+                seconds_min_c = seconds_c;
+                t0c_min       = T0;
+                t1c_min       = T1;
+              }
             }
+            ++counter;
           }
-          ++counter;
         }
-      }
-    }
-    else {
-      for ( unsigned int T1 = min_bnd; T1 <= static_cast<unsigned int>(range_length); T1<<=1 ) {
-        for ( unsigned int T2 = min_bnd; T2 <= static_cast<unsigned int>(range_length); T2<<=1 ) {
-          double seconds_c = 0;
-          { seconds_c = MultiDimRangePerf3D< DeviceType , double , LayoutType >::test_multi_index(range_length,range_length,range_length, 0, T1, T2) ; }
+      } else {
+        for (unsigned int T1 = min_bnd;
+             T1 <= static_cast<unsigned int>(range_length); T1 <<= 1) {
+          for (unsigned int T2 = min_bnd;
+               T2 <= static_cast<unsigned int>(range_length); T2 <<= 1) {
+            double seconds_c = 0;
+            {
+              seconds_c = MultiDimRangePerf3D<DeviceType, double, LayoutType>::
+                  test_multi_index(range_length, range_length, range_length, 0,
+                                   T1, T2);
+            }
 
 #if MDRANGE_PERFORMANCE_OUTPUT_VERBOSE
-          std::cout << " MDRange LL with '0' tile - collapse-like \n"
-          << label_mdrange
-          << " , " <<range_length << " < " << T1 << " , " << T2
-          << " , " << seconds_c
-          << std::endl ;
+            std::cout << " MDRange LL with '0' tile - collapse-like \n"
+                      << label_mdrange << " , " << range_length << " < " << T1
+                      << " , " << T2 << " , " << seconds_c << std::endl;
 #endif
 
-
-          t0c_min = range_length;
-          if ( counter == 1 ) {
-            seconds_min_c = seconds_c;
-            t1c_min = T1;
-            t2c_min = T2;
-          } 
-          else {
-            if ( seconds_c < seconds_min_c ) 
-            { 
-              seconds_min_c = seconds_c; 
-              t1c_min = T1;
-              t2c_min = T2;
+            t0c_min = range_length;
+            if (counter == 1) {
+              seconds_min_c = seconds_c;
+              t1c_min       = T1;
+              t2c_min       = T2;
+            } else {
+              if (seconds_c < seconds_min_c) {
+                seconds_min_c = seconds_c;
+                t1c_min       = T1;
+                t2c_min       = T2;
+              }
             }
+            ++counter;
           }
-          ++counter;
         }
       }
-    }
 
-    std::cout 
-//      << "--------------------------------------------------------------\n"
-      << label_mdrange
-      << "  Collapse<2> style: "
-      << "\n Min values "
-      << "\n Range length per dim (3D): " << range_length
-      << "\n TileDims:  " << t0c_min << " , " << t1c_min << " , " << t2c_min
-      << "\n Min time: " << seconds_min_c
-      << "\n---------------------------------------------------------------"
-      << std::endl ;
-  } //end scope test 2
+      std::cout
+          //      <<
+          //      "--------------------------------------------------------------\n"
+          << label_mdrange << "  Collapse<2> style: "
+          << "\n Min values "
+          << "\n Range length per dim (3D): " << range_length
+          << "\n TileDims:  " << t0c_min << " , " << t1c_min << " , " << t2c_min
+          << "\n Min time: " << seconds_min_c
+          << "\n---------------------------------------------------------------"
+          << std::endl;
+    }  // end scope test 2
 #endif
 
-
     // Test 2: RangePolicy Collapse2 style
     double seconds_2 = 0;
-    { seconds_2 = RangePolicyCollapseTwo< DeviceType , double , LayoutType >::test_index_collapse_two(range_length,range_length,range_length) ; }
-    std::cout << label_range_col2
-      << " , " << range_length
-      << " , " << seconds_2
-      << std::endl ;
-
+    {
+      seconds_2 = RangePolicyCollapseTwo<DeviceType, double, LayoutType>::
+          test_index_collapse_two(range_length, range_length, range_length);
+    }
+    std::cout << label_range_col2 << " , " << range_length << " , " << seconds_2
+              << std::endl;
 
     // Test 3: RangePolicy Collapse all style - not necessary, always slow
     /*
     double seconds_3 = 0;
-    { seconds_3 = RangePolicyCollapseAll< DeviceType , double , LayoutType >::test_collapse_all(range_length,range_length,range_length) ; }
-    std::cout << label_range_col_all
+    { seconds_3 = RangePolicyCollapseAll< DeviceType , double , LayoutType
+    >::test_collapse_all(range_length,range_length,range_length) ; } std::cout
+    << label_range_col_all
       << " , " << range_length
       << " , " << seconds_3
       << "\n---------------------------------------------------------------"
@@ -306,97 +325,105 @@ void run_test_mdrange( int exp_beg , int exp_end, const char deviceTypeName[], i
 
     // Compare fastest times... will never be collapse all so ignore it
     // seconds_min = tiled MDRange
-    // seconds_min_c = collapse<2>-like MDRange (tiledim = span for fast dim) - only for non-Cuda, else tile too long
-    // seconds_2 = collapse<2>-style RangePolicy
-    // seconds_3 = collapse<3>-style RangePolicy
+    // seconds_min_c = collapse<2>-like MDRange (tiledim = span for fast dim) -
+    // only for non-Cuda, else tile too long seconds_2 = collapse<2>-style
+    // RangePolicy seconds_3 = collapse<3>-style RangePolicy
 
 #if !defined(KOKKOS_ENABLE_CUDA)
-    if ( seconds_min < seconds_min_c ) {
-      if ( seconds_min < seconds_2 ) {
-        std::cout << "--------------------------------------------------------------\n"
-          << " Fastest run: MDRange tiled\n"
-          << " Time: " << seconds_min
-          << " Difference: " << seconds_2 - seconds_min
-          << " Other times: \n"
-          << "   MDrange collapse-like (tiledim = span on fast dim) type: " << seconds_min_c << "\n"
-          << "   Collapse2 Range Policy: " << seconds_2 << "\n"
-          << "\n--------------------------------------------------------------"
-          << "\n--------------------------------------------------------------"
-          //<< "\n\n"
-          << std::endl;
+    if (seconds_min < seconds_min_c) {
+      if (seconds_min < seconds_2) {
+        std::cout
+            << "--------------------------------------------------------------"
+               "\n"
+            << " Fastest run: MDRange tiled\n"
+            << " Time: " << seconds_min
+            << " Difference: " << seconds_2 - seconds_min << " Other times: \n"
+            << "   MDrange collapse-like (tiledim = span on fast dim) type: "
+            << seconds_min_c << "\n"
+            << "   Collapse2 Range Policy: " << seconds_2 << "\n"
+            << "\n-------------------------------------------------------------"
+               "-"
+            << "\n-------------------------------------------------------------"
+               "-"
+            //<< "\n\n"
+            << std::endl;
+      } else if (seconds_min > seconds_2) {
+        std::cout
+            << " Fastest run: Collapse2 RangePolicy\n"
+            << " Time: " << seconds_2
+            << " Difference: " << seconds_min - seconds_2 << " Other times: \n"
+            << "   MDrange Tiled: " << seconds_min << "\n"
+            << "   MDrange collapse-like (tiledim = span on fast dim) type: "
+            << seconds_min_c << "\n"
+            << "\n-------------------------------------------------------------"
+               "-"
+            << "\n-------------------------------------------------------------"
+               "-"
+            //<< "\n\n"
+            << std::endl;
       }
-      else if ( seconds_min > seconds_2 ) {
-        std::cout << " Fastest run: Collapse2 RangePolicy\n"
-          << " Time: " << seconds_2
-          << " Difference: " << seconds_min - seconds_2
-          << " Other times: \n"
-          << "   MDrange Tiled: " << seconds_min << "\n"
-          << "   MDrange collapse-like (tiledim = span on fast dim) type: " << seconds_min_c << "\n"
-          << "\n--------------------------------------------------------------"
-          << "\n--------------------------------------------------------------"
-          //<< "\n\n"
-          << std::endl;
+    } else if (seconds_min > seconds_min_c) {
+      if (seconds_min_c < seconds_2) {
+        std::cout << "---------------------------------------------------------"
+                     "-----\n"
+                  << " Fastest run: MDRange collapse-like (tiledim = span on "
+                     "fast dim) type\n"
+                  << " Time: " << seconds_min_c
+                  << " Difference: " << seconds_2 - seconds_min_c
+                  << " Other times: \n"
+                  << "   MDrange Tiled: " << seconds_min << "\n"
+                  << "   Collapse2 Range Policy: " << seconds_2 << "\n"
+                  << "\n-------------------------------------------------------"
+                     "-------"
+                  << "\n-------------------------------------------------------"
+                     "-------"
+                  //<< "\n\n"
+                  << std::endl;
+      } else if (seconds_min_c > seconds_2) {
+        std::cout
+            << " Fastest run: Collapse2 RangePolicy\n"
+            << " Time: " << seconds_2
+            << " Difference: " << seconds_min_c - seconds_2
+            << " Other times: \n"
+            << "   MDrange Tiled: " << seconds_min << "\n"
+            << "   MDrange collapse-like (tiledim = span on fast dim) type: "
+            << seconds_min_c << "\n"
+            << "\n-------------------------------------------------------------"
+               "-"
+            << "\n-------------------------------------------------------------"
+               "-"
+            //<< "\n\n"
+            << std::endl;
       }
-    }
-    else if ( seconds_min > seconds_min_c ) {
-      if ( seconds_min_c < seconds_2 ) {
-        std::cout << "--------------------------------------------------------------\n"
-          << " Fastest run: MDRange collapse-like (tiledim = span on fast dim) type\n"
-          << " Time: " << seconds_min_c
-          << " Difference: " << seconds_2 - seconds_min_c
-          << " Other times: \n"
-          << "   MDrange Tiled: " << seconds_min << "\n"
-          << "   Collapse2 Range Policy: " << seconds_2 << "\n"
-          << "\n--------------------------------------------------------------"
-          << "\n--------------------------------------------------------------"
-          //<< "\n\n"
-          << std::endl;
-      }
-      else if ( seconds_min_c > seconds_2 ) {
-        std::cout << " Fastest run: Collapse2 RangePolicy\n"
-          << " Time: " << seconds_2
-          << " Difference: " << seconds_min_c - seconds_2
-          << " Other times: \n"
-          << "   MDrange Tiled: " << seconds_min << "\n"
-          << "   MDrange collapse-like (tiledim = span on fast dim) type: " << seconds_min_c << "\n"
-          << "\n--------------------------------------------------------------"
-          << "\n--------------------------------------------------------------"
-          //<< "\n\n"
-          << std::endl;
-      }
-    } // end else if
+    }  // end else if
 #else
-      if ( seconds_min < seconds_2 ) {
-        std::cout << "--------------------------------------------------------------\n"
+    if (seconds_min < seconds_2) {
+      std::cout
+          << "--------------------------------------------------------------\n"
           << " Fastest run: MDRange tiled\n"
           << " Time: " << seconds_min
-          << " Difference: " << seconds_2 - seconds_min
-          << " Other times: \n"
+          << " Difference: " << seconds_2 - seconds_min << " Other times: \n"
           << "   Collapse2 Range Policy: " << seconds_2 << "\n"
           << "\n--------------------------------------------------------------"
           << "\n--------------------------------------------------------------"
           //<< "\n\n"
           << std::endl;
-      }
-      else if ( seconds_min > seconds_2 ) {
-        std::cout << " Fastest run: Collapse2 RangePolicy\n"
+    } else if (seconds_min > seconds_2) {
+      std::cout
+          << " Fastest run: Collapse2 RangePolicy\n"
           << " Time: " << seconds_2
-          << " Difference: " << seconds_min - seconds_2
-          << " Other times: \n"
+          << " Difference: " << seconds_min - seconds_2 << " Other times: \n"
           << "   MDrange Tiled: " << seconds_min << "\n"
           << "\n--------------------------------------------------------------"
           << "\n--------------------------------------------------------------"
           //<< "\n\n"
           << std::endl;
-      }
+    }
 #endif
 
-  } //end for
+  }  // end for
 
 #undef MDRANGE_PERFORMANCE_OUTPUT_VERBOSE
-
-}
-
-
 }
 
+}  // namespace Test
diff --git a/lib/kokkos/core/perf_test/PerfTestGramSchmidt.cpp b/lib/kokkos/core/perf_test/PerfTestGramSchmidt.cpp
index d812b16d85..5e85163acf 100644
--- a/lib/kokkos/core/perf_test/PerfTestGramSchmidt.cpp
+++ b/lib/kokkos/core/perf_test/PerfTestGramSchmidt.cpp
@@ -1,13 +1,14 @@
 /*
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -36,7 +37,7 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 */
@@ -55,131 +56,105 @@ namespace Test {
 
 // Reduction   : result = dot( Q(:,j) , Q(:,j) );
 // PostProcess : R(j,j) = result ; inv = 1 / result ;
-template< class VectorView , class ValueView  >
-struct InvNorm2 : public Kokkos::DotSingle< VectorView > {
+template <class VectorView, class ValueView>
+struct InvNorm2 : public Kokkos::DotSingle<VectorView> {
+  typedef typename Kokkos::DotSingle<VectorView>::value_type value_type;
 
-  typedef typename Kokkos::DotSingle< VectorView >::value_type value_type ;
+  ValueView Rjj;
+  ValueView inv;
 
-  ValueView  Rjj ;
-  ValueView  inv ;
-
-  InvNorm2( const VectorView & argX ,
-            const ValueView  & argR ,
-            const ValueView  & argInv )
-    : Kokkos::DotSingle< VectorView >( argX )
-    , Rjj( argR )
-    , inv( argInv )
-    {}
+  InvNorm2(const VectorView& argX, const ValueView& argR,
+           const ValueView& argInv)
+      : Kokkos::DotSingle<VectorView>(argX), Rjj(argR), inv(argInv) {}
 
   KOKKOS_INLINE_FUNCTION
-  void final( value_type & result ) const
-  {
-    result = std::sqrt( result );
-    Rjj() = result ;
-    inv() = ( 0 < result ) ? 1.0 / result : 0 ;
+  void final(value_type& result) const {
+    result = std::sqrt(result);
+    Rjj()  = result;
+    inv()  = (0 < result) ? 1.0 / result : 0;
   }
 };
 
-template< class VectorView , class ValueView >
-inline
-void invnorm2( const VectorView & x ,
-               const ValueView  & r ,
-               const ValueView  & r_inv )
-{
-  Kokkos::parallel_reduce( x.extent(0) , InvNorm2< VectorView , ValueView >( x , r , r_inv ) );
+template <class VectorView, class ValueView>
+inline void invnorm2(const VectorView& x, const ValueView& r,
+                     const ValueView& r_inv) {
+  Kokkos::parallel_reduce(x.extent(0),
+                          InvNorm2<VectorView, ValueView>(x, r, r_inv));
 }
 
 // PostProcess : tmp = - ( R(j,k) = result );
-template< class VectorView , class ValueView  >
-struct DotM : public Kokkos::Dot< VectorView > {
+template <class VectorView, class ValueView>
+struct DotM : public Kokkos::Dot<VectorView> {
+  typedef typename Kokkos::Dot<VectorView>::value_type value_type;
 
-  typedef typename Kokkos::Dot< VectorView >::value_type value_type ;
+  ValueView Rjk;
+  ValueView tmp;
 
-  ValueView  Rjk ;
-  ValueView  tmp ;
-
-  DotM( const VectorView & argX ,
-        const VectorView & argY ,
-        const ValueView & argR ,
-        const ValueView & argTmp )
-    : Kokkos::Dot< VectorView >( argX , argY )
-    , Rjk( argR )
-    , tmp( argTmp )
-    {}
+  DotM(const VectorView& argX, const VectorView& argY, const ValueView& argR,
+       const ValueView& argTmp)
+      : Kokkos::Dot<VectorView>(argX, argY), Rjk(argR), tmp(argTmp) {}
 
   KOKKOS_INLINE_FUNCTION
-  void final( value_type & result ) const
-  {
-     Rjk()  = result ;
-     tmp()  = - result ;
+  void final(value_type& result) const {
+    Rjk() = result;
+    tmp() = -result;
   }
 };
 
-template< class VectorView , class ValueView >
-inline
-void dot_neg( const VectorView & x ,
-              const VectorView & y ,
-              const ValueView  & r ,
-              const ValueView  & r_neg )
-{
-  Kokkos::parallel_reduce( x.extent(0) , DotM< VectorView , ValueView >( x , y , r , r_neg ) );
+template <class VectorView, class ValueView>
+inline void dot_neg(const VectorView& x, const VectorView& y,
+                    const ValueView& r, const ValueView& r_neg) {
+  Kokkos::parallel_reduce(x.extent(0),
+                          DotM<VectorView, ValueView>(x, y, r, r_neg));
 }
 
+template <typename Scalar, class DeviceType>
+struct ModifiedGramSchmidt {
+  typedef DeviceType execution_space;
+  typedef typename execution_space::size_type size_type;
 
-template< typename Scalar , class DeviceType >
-struct ModifiedGramSchmidt
-{
-  typedef DeviceType  execution_space ;
-  typedef typename execution_space::size_type  size_type ;
+  typedef Kokkos::View<Scalar**, Kokkos::LayoutLeft, execution_space>
+      multivector_type;
 
-  typedef Kokkos::View< Scalar** ,
-                        Kokkos::LayoutLeft ,
-                        execution_space > multivector_type ;
+  typedef Kokkos::View<Scalar*, Kokkos::LayoutLeft, execution_space>
+      vector_type;
 
-  typedef Kokkos::View< Scalar* ,
-                        Kokkos::LayoutLeft ,
-                        execution_space > vector_type ;
+  typedef Kokkos::View<Scalar, Kokkos::LayoutLeft, execution_space> value_view;
 
-  typedef Kokkos::View< Scalar ,
-                        Kokkos::LayoutLeft ,
-                        execution_space > value_view ;
+  multivector_type Q;
+  multivector_type R;
 
-
-  multivector_type Q ;
-  multivector_type R ;
-
-  static double factorization( const multivector_type Q_ ,
-                               const multivector_type R_ )
-  {
-    const size_type count  = Q_.extent(1);
+  static double factorization(const multivector_type Q_,
+                              const multivector_type R_) {
+    const size_type count = Q_.extent(1);
     value_view tmp("tmp");
     value_view one("one");
 
-    Kokkos::deep_copy( one , (Scalar) 1 );
+    Kokkos::deep_copy(one, (Scalar)1);
 
-    Kokkos::Timer timer ;
+    Kokkos::Timer timer;
 
-    for ( size_type j = 0 ; j < count ; ++j ) {
+    for (size_type j = 0; j < count; ++j) {
       // Reduction   : tmp = dot( Q(:,j) , Q(:,j) );
       // PostProcess : tmp = std::sqrt( tmp ); R(j,j) = tmp ; tmp = 1 / tmp ;
-      const vector_type Qj  = Kokkos::subview( Q_ , Kokkos::ALL() , j );
-      const value_view  Rjj = Kokkos::subview( R_ , j , j );
+      const vector_type Qj = Kokkos::subview(Q_, Kokkos::ALL(), j);
+      const value_view Rjj = Kokkos::subview(R_, j, j);
 
-      invnorm2( Qj , Rjj , tmp );
+      invnorm2(Qj, Rjj, tmp);
 
       // Q(:,j) *= ( 1 / R(j,j) ); => Q(:,j) *= tmp ;
-      Kokkos::scale( tmp , Qj );
+      Kokkos::scale(tmp, Qj);
 
-      for ( size_t k = j + 1 ; k < count ; ++k ) {
-        const vector_type Qk = Kokkos::subview( Q_ , Kokkos::ALL() , k );
-        const value_view  Rjk = Kokkos::subview( R_ , j , k );
+      for (size_t k = j + 1; k < count; ++k) {
+        const vector_type Qk = Kokkos::subview(Q_, Kokkos::ALL(), k);
+        const value_view Rjk = Kokkos::subview(R_, j, k);
 
         // Reduction   : R(j,k) = dot( Q(:,j) , Q(:,k) );
         // PostProcess : tmp = - R(j,k);
-        dot_neg( Qj , Qk , Rjk , tmp );
+        dot_neg(Qj, Qk, Rjk, tmp);
 
         // Q(:,k) -= R(j,k) * Q(:,j); => Q(:,k) += tmp * Q(:,j)
-        Kokkos::axpby( tmp , Qj , one , Qk );
+        Kokkos::axpby(tmp, Qj, one, Qk);
       }
     }
 
@@ -190,94 +165,87 @@ struct ModifiedGramSchmidt
 
   //--------------------------------------------------------------------------
 
-  static double test( const size_t length ,
-                      const size_t count ,
-                      const size_t iter = 1 )
-  {
-    multivector_type Q_( "Q" , length , count );
-    multivector_type R_( "R" , count , count );
+  static double test(const size_t length, const size_t count,
+                     const size_t iter = 1) {
+    multivector_type Q_("Q", length, count);
+    multivector_type R_("R", count, count);
 
-    typename multivector_type::HostMirror A =
-      Kokkos::create_mirror( Q_ );
+    typename multivector_type::HostMirror A = Kokkos::create_mirror(Q_);
 
     // Create and fill A on the host
 
-    for ( size_type j = 0 ; j < count ; ++j ) {
-      for ( size_type i = 0 ; i < length ; ++i ) {
-        A(i,j) = ( i + 1 ) * ( j + 1 );
+    for (size_type j = 0; j < count; ++j) {
+      for (size_type i = 0; i < length; ++i) {
+        A(i, j) = (i + 1) * (j + 1);
       }
     }
 
-    double dt_min = 0 ;
+    double dt_min = 0;
 
-    for ( size_t i = 0 ; i < iter ; ++i ) {
-
-      Kokkos::deep_copy( Q_ , A );
+    for (size_t i = 0; i < iter; ++i) {
+      Kokkos::deep_copy(Q_, A);
 
       // A = Q * R
 
-      const double dt = factorization( Q_ , R_ );
+      const double dt = factorization(Q_, R_);
 
-      if ( 0 == i ) dt_min = dt ;
-      else dt_min = dt < dt_min ? dt : dt_min ;
+      if (0 == i)
+        dt_min = dt;
+      else
+        dt_min = dt < dt_min ? dt : dt_min;
     }
 
-    return dt_min ;
+    return dt_min;
   }
 };
 
-template< class DeviceType >
-void run_test_gramschmidt( int exp_beg , int exp_end, int num_trials, const char deviceTypeName[] )
-{
-  std::string label_gramschmidt ;
-  label_gramschmidt.append( "\"GramSchmidt< double , " );
-  label_gramschmidt.append( deviceTypeName );
-  label_gramschmidt.append( " >\"" );
+template <class DeviceType>
+void run_test_gramschmidt(int exp_beg, int exp_end, int num_trials,
+                          const char deviceTypeName[]) {
+  std::string label_gramschmidt;
+  label_gramschmidt.append("\"GramSchmidt< double , ");
+  label_gramschmidt.append(deviceTypeName);
+  label_gramschmidt.append(" >\"");
 
-  for (int i = exp_beg ; i < exp_end ; ++i) {
-    double min_seconds = 0.0 ;
-    double max_seconds = 0.0 ;
-    double avg_seconds = 0.0 ;
+  for (int i = exp_beg; i < exp_end; ++i) {
+    double min_seconds = 0.0;
+    double max_seconds = 0.0;
+    double avg_seconds = 0.0;
 
-    const int parallel_work_length = 1<<i;
+    const int parallel_work_length = 1 << i;
 
-    for ( int j = 0 ; j < num_trials ; ++j ) {
-      const double seconds = ModifiedGramSchmidt< double , DeviceType >::test(parallel_work_length, 32 ) ;
+    for (int j = 0; j < num_trials; ++j) {
+      const double seconds = ModifiedGramSchmidt<double, DeviceType>::test(
+          parallel_work_length, 32);
 
-      if ( 0 == j ) {
-        min_seconds = seconds ;
-        max_seconds = seconds ;
+      if (0 == j) {
+        min_seconds = seconds;
+        max_seconds = seconds;
+      } else {
+        if (seconds < min_seconds) min_seconds = seconds;
+        if (seconds > max_seconds) max_seconds = seconds;
       }
-      else {
-        if ( seconds < min_seconds ) min_seconds = seconds ;
-        if ( seconds > max_seconds ) max_seconds = seconds ;
-      }
-      avg_seconds += seconds ;
+      avg_seconds += seconds;
     }
-    avg_seconds /= num_trials ;
+    avg_seconds /= num_trials;
 
-    std::cout << label_gramschmidt
-      << " , " << parallel_work_length
-      << " , " << min_seconds
-      << " , " << ( min_seconds / parallel_work_length )
-      << std::endl ;
+    std::cout << label_gramschmidt << " , " << parallel_work_length << " , "
+              << min_seconds << " , " << (min_seconds / parallel_work_length)
+              << std::endl;
   }
 }
 
-TEST_F( default_exec, gramschmidt ) {
-  int exp_beg = 10;
-  int exp_end = 20;
+TEST(default_exec, gramschmidt) {
+  int exp_beg    = 10;
+  int exp_end    = 20;
   int num_trials = 5;
 
-  if(command_line_num_args()>1)
-    exp_beg = atoi(command_line_arg(1));
-  if(command_line_num_args()>2)
-    exp_end = atoi(command_line_arg(2));
-  if(command_line_num_args()>3)
-    num_trials = atoi(command_line_arg(3));
-
-  EXPECT_NO_THROW(run_test_gramschmidt< Kokkos::DefaultExecutionSpace>( exp_beg, exp_end, num_trials, Kokkos::DefaultExecutionSpace::name()  ));
-}
+  if (command_line_num_args() > 1) exp_beg = atoi(command_line_arg(1));
+  if (command_line_num_args() > 2) exp_end = atoi(command_line_arg(2));
+  if (command_line_num_args() > 3) num_trials = atoi(command_line_arg(3));
 
+  EXPECT_NO_THROW(run_test_gramschmidt<Kokkos::DefaultExecutionSpace>(
+      exp_beg, exp_end, num_trials, Kokkos::DefaultExecutionSpace::name()));
 }
 
+}  // namespace Test
diff --git a/lib/kokkos/core/perf_test/PerfTestHexGrad.cpp b/lib/kokkos/core/perf_test/PerfTestHexGrad.cpp
index 03285a375c..d879282867 100644
--- a/lib/kokkos/core/perf_test/PerfTestHexGrad.cpp
+++ b/lib/kokkos/core/perf_test/PerfTestHexGrad.cpp
@@ -1,13 +1,14 @@
 /*
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -36,7 +37,7 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 */
@@ -47,279 +48,253 @@
 
 namespace Test {
 
-template< class DeviceType ,
-          typename CoordScalarType = double ,
-          typename GradScalarType  = float >
-struct HexGrad
-{
-  typedef DeviceType execution_space ;
-  typedef typename execution_space::size_type  size_type ;
+template <class DeviceType, typename CoordScalarType = double,
+          typename GradScalarType = float>
+struct HexGrad {
+  typedef DeviceType execution_space;
+  typedef typename execution_space::size_type size_type;
 
-  typedef HexGrad<DeviceType,CoordScalarType,GradScalarType> self_type;
+  typedef HexGrad<DeviceType, CoordScalarType, GradScalarType> self_type;
 
   // 3D array : ( ParallelWork , Space , Node )
 
-  enum { NSpace = 3 , NNode = 8 };
+  enum { NSpace = 3, NNode = 8 };
 
-  typedef Kokkos::View< CoordScalarType*[NSpace][NNode] , execution_space >
-    elem_coord_type ;
+  typedef Kokkos::View<CoordScalarType * [NSpace][NNode], execution_space>
+      elem_coord_type;
 
-  typedef Kokkos::View< GradScalarType*[NSpace][NNode] , execution_space >
-    elem_grad_type ;
+  typedef Kokkos::View<GradScalarType * [NSpace][NNode], execution_space>
+      elem_grad_type;
 
-  elem_coord_type  coords ;
-  elem_grad_type   grad_op ;
+  elem_coord_type coords;
+  elem_grad_type grad_op;
 
-  enum { FLOPS  = 318 }; // = 3 * ( 18 + 8 * 11 ) };
-  enum { READS  = 18 };
+  enum { FLOPS = 318 };  // = 3 * ( 18 + 8 * 11 ) };
+  enum { READS = 18 };
   enum { WRITES = 18 };
 
-  HexGrad( const elem_coord_type  & arg_coords ,
-           const elem_grad_type   & arg_grad_op )
-    : coords( arg_coords )
-    , grad_op( arg_grad_op )
-    {}
+  HexGrad(const elem_coord_type& arg_coords, const elem_grad_type& arg_grad_op)
+      : coords(arg_coords), grad_op(arg_grad_op) {}
 
-  KOKKOS_INLINE_FUNCTION static
-  void grad( const CoordScalarType x[] ,
-             const CoordScalarType z[] ,
-                   GradScalarType grad_y[] )
-  {
-    const GradScalarType R42=(x[3] - x[1]);
-    const GradScalarType R52=(x[4] - x[1]);
-    const GradScalarType R54=(x[4] - x[3]);
+  KOKKOS_INLINE_FUNCTION static void grad(const CoordScalarType x[],
+                                          const CoordScalarType z[],
+                                          GradScalarType grad_y[]) {
+    const GradScalarType R42 = (x[3] - x[1]);
+    const GradScalarType R52 = (x[4] - x[1]);
+    const GradScalarType R54 = (x[4] - x[3]);
 
-    const GradScalarType R63=(x[5] - x[2]);
-    const GradScalarType R83=(x[7] - x[2]);
-    const GradScalarType R86=(x[7] - x[5]);
+    const GradScalarType R63 = (x[5] - x[2]);
+    const GradScalarType R83 = (x[7] - x[2]);
+    const GradScalarType R86 = (x[7] - x[5]);
 
-    const GradScalarType R31=(x[2] - x[0]);
-    const GradScalarType R61=(x[5] - x[0]);
-    const GradScalarType R74=(x[6] - x[3]);
+    const GradScalarType R31 = (x[2] - x[0]);
+    const GradScalarType R61 = (x[5] - x[0]);
+    const GradScalarType R74 = (x[6] - x[3]);
 
-    const GradScalarType R72=(x[6] - x[1]);
-    const GradScalarType R75=(x[6] - x[4]);
-    const GradScalarType R81=(x[7] - x[0]);
+    const GradScalarType R72 = (x[6] - x[1]);
+    const GradScalarType R75 = (x[6] - x[4]);
+    const GradScalarType R81 = (x[7] - x[0]);
 
-    const GradScalarType t1=(R63 + R54);
-    const GradScalarType t2=(R61 + R74);
-    const GradScalarType t3=(R72 + R81);
+    const GradScalarType t1 = (R63 + R54);
+    const GradScalarType t2 = (R61 + R74);
+    const GradScalarType t3 = (R72 + R81);
 
-    const GradScalarType t4 =(R86 + R42);
-    const GradScalarType t5 =(R83 + R52);
-    const GradScalarType t6 =(R75 + R31);
+    const GradScalarType t4 = (R86 + R42);
+    const GradScalarType t5 = (R83 + R52);
+    const GradScalarType t6 = (R75 + R31);
 
     //  Calculate Y gradient from X and Z data
 
-    grad_y[0] = (z[1] *  t1) - (z[2] * R42) - (z[3] *  t5)  + (z[4] *  t4) + (z[5] * R52) - (z[7] * R54);
-    grad_y[1] = (z[2] *  t2) + (z[3] * R31) - (z[0] *  t1)  - (z[5] *  t6) + (z[6] * R63) - (z[4] * R61);
-    grad_y[2] = (z[3] *  t3) + (z[0] * R42) - (z[1] *  t2)  - (z[6] *  t4) + (z[7] * R74) - (z[5] * R72);
-    grad_y[3] = (z[0] *  t5) - (z[1] * R31) - (z[2] *  t3)  + (z[7] *  t6) + (z[4] * R81) - (z[6] * R83);
-    grad_y[4] = (z[5] *  t3) + (z[6] * R86) - (z[7] *  t2)  - (z[0] *  t4) - (z[3] * R81) + (z[1] * R61);
-    grad_y[5] = (z[6] *  t5) - (z[4] *  t3)  - (z[7] * R75) + (z[1] *  t6) - (z[0] * R52) + (z[2] * R72);
-    grad_y[6] = (z[7] *  t1) - (z[5] *  t5)  - (z[4] * R86) + (z[2] *  t4) - (z[1] * R63) + (z[3] * R83);
-    grad_y[7] = (z[4] *  t2) - (z[6] *  t1)  + (z[5] * R75) - (z[3] *  t6) - (z[2] * R74) + (z[0] * R54);
+    grad_y[0] = (z[1] * t1) - (z[2] * R42) - (z[3] * t5) + (z[4] * t4) +
+                (z[5] * R52) - (z[7] * R54);
+    grad_y[1] = (z[2] * t2) + (z[3] * R31) - (z[0] * t1) - (z[5] * t6) +
+                (z[6] * R63) - (z[4] * R61);
+    grad_y[2] = (z[3] * t3) + (z[0] * R42) - (z[1] * t2) - (z[6] * t4) +
+                (z[7] * R74) - (z[5] * R72);
+    grad_y[3] = (z[0] * t5) - (z[1] * R31) - (z[2] * t3) + (z[7] * t6) +
+                (z[4] * R81) - (z[6] * R83);
+    grad_y[4] = (z[5] * t3) + (z[6] * R86) - (z[7] * t2) - (z[0] * t4) -
+                (z[3] * R81) + (z[1] * R61);
+    grad_y[5] = (z[6] * t5) - (z[4] * t3) - (z[7] * R75) + (z[1] * t6) -
+                (z[0] * R52) + (z[2] * R72);
+    grad_y[6] = (z[7] * t1) - (z[5] * t5) - (z[4] * R86) + (z[2] * t4) -
+                (z[1] * R63) + (z[3] * R83);
+    grad_y[7] = (z[4] * t2) - (z[6] * t1) + (z[5] * R75) - (z[3] * t6) -
+                (z[2] * R74) + (z[0] * R54);
   }
 
   KOKKOS_INLINE_FUNCTION
-  void operator()( size_type ielem ) const
-  {
-    GradScalarType g[NNode] ;
+  void operator()(size_type ielem) const {
+    GradScalarType g[NNode];
 
-    const CoordScalarType x[NNode] = {
-      coords(ielem,0,0),
-      coords(ielem,0,1),
-      coords(ielem,0,2),
-      coords(ielem,0,3),
-      coords(ielem,0,4),
-      coords(ielem,0,5),
-      coords(ielem,0,6),
-      coords(ielem,0,7)
-    };
+    const CoordScalarType x[NNode] = {coords(ielem, 0, 0), coords(ielem, 0, 1),
+                                      coords(ielem, 0, 2), coords(ielem, 0, 3),
+                                      coords(ielem, 0, 4), coords(ielem, 0, 5),
+                                      coords(ielem, 0, 6), coords(ielem, 0, 7)};
 
-    const CoordScalarType y[NNode] = {
-      coords(ielem,1,0),
-      coords(ielem,1,1),
-      coords(ielem,1,2),
-      coords(ielem,1,3),
-      coords(ielem,1,4),
-      coords(ielem,1,5),
-      coords(ielem,1,6),
-      coords(ielem,1,7)
-    };
+    const CoordScalarType y[NNode] = {coords(ielem, 1, 0), coords(ielem, 1, 1),
+                                      coords(ielem, 1, 2), coords(ielem, 1, 3),
+                                      coords(ielem, 1, 4), coords(ielem, 1, 5),
+                                      coords(ielem, 1, 6), coords(ielem, 1, 7)};
 
-    const CoordScalarType z[NNode] = {
-      coords(ielem,2,0),
-      coords(ielem,2,1),
-      coords(ielem,2,2),
-      coords(ielem,2,3),
-      coords(ielem,2,4),
-      coords(ielem,2,5),
-      coords(ielem,2,6),
-      coords(ielem,2,7)
-    };
+    const CoordScalarType z[NNode] = {coords(ielem, 2, 0), coords(ielem, 2, 1),
+                                      coords(ielem, 2, 2), coords(ielem, 2, 3),
+                                      coords(ielem, 2, 4), coords(ielem, 2, 5),
+                                      coords(ielem, 2, 6), coords(ielem, 2, 7)};
 
-    grad( z , y , g );
+    grad(z, y, g);
 
-    grad_op(ielem,0,0) = g[0];
-    grad_op(ielem,0,1) = g[1];
-    grad_op(ielem,0,2) = g[2];
-    grad_op(ielem,0,3) = g[3];
-    grad_op(ielem,0,4) = g[4];
-    grad_op(ielem,0,5) = g[5];
-    grad_op(ielem,0,6) = g[6];
-    grad_op(ielem,0,7) = g[7];
+    grad_op(ielem, 0, 0) = g[0];
+    grad_op(ielem, 0, 1) = g[1];
+    grad_op(ielem, 0, 2) = g[2];
+    grad_op(ielem, 0, 3) = g[3];
+    grad_op(ielem, 0, 4) = g[4];
+    grad_op(ielem, 0, 5) = g[5];
+    grad_op(ielem, 0, 6) = g[6];
+    grad_op(ielem, 0, 7) = g[7];
 
-    grad( x , z , g );
+    grad(x, z, g);
 
-    grad_op(ielem,1,0) = g[0];
-    grad_op(ielem,1,1) = g[1];
-    grad_op(ielem,1,2) = g[2];
-    grad_op(ielem,1,3) = g[3];
-    grad_op(ielem,1,4) = g[4];
-    grad_op(ielem,1,5) = g[5];
-    grad_op(ielem,1,6) = g[6];
-    grad_op(ielem,1,7) = g[7];
+    grad_op(ielem, 1, 0) = g[0];
+    grad_op(ielem, 1, 1) = g[1];
+    grad_op(ielem, 1, 2) = g[2];
+    grad_op(ielem, 1, 3) = g[3];
+    grad_op(ielem, 1, 4) = g[4];
+    grad_op(ielem, 1, 5) = g[5];
+    grad_op(ielem, 1, 6) = g[6];
+    grad_op(ielem, 1, 7) = g[7];
 
-    grad( y , x , g );
+    grad(y, x, g);
 
-    grad_op(ielem,2,0) = g[0];
-    grad_op(ielem,2,1) = g[1];
-    grad_op(ielem,2,2) = g[2];
-    grad_op(ielem,2,3) = g[3];
-    grad_op(ielem,2,4) = g[4];
-    grad_op(ielem,2,5) = g[5];
-    grad_op(ielem,2,6) = g[6];
-    grad_op(ielem,2,7) = g[7];
+    grad_op(ielem, 2, 0) = g[0];
+    grad_op(ielem, 2, 1) = g[1];
+    grad_op(ielem, 2, 2) = g[2];
+    grad_op(ielem, 2, 3) = g[3];
+    grad_op(ielem, 2, 4) = g[4];
+    grad_op(ielem, 2, 5) = g[5];
+    grad_op(ielem, 2, 6) = g[6];
+    grad_op(ielem, 2, 7) = g[7];
   }
 
   //--------------------------------------------------------------------------
 
   struct Init {
-    typedef typename self_type::execution_space execution_space ;
+    typedef typename self_type::execution_space execution_space;
 
-    elem_coord_type coords ;
+    elem_coord_type coords;
 
-    Init( const elem_coord_type & arg_coords )
-      : coords( arg_coords ) {}
+    Init(const elem_coord_type& arg_coords) : coords(arg_coords) {}
 
     KOKKOS_INLINE_FUNCTION
-    void operator()( size_type ielem ) const
-    {
-      coords(ielem,0,0) = 0.;
-      coords(ielem,1,0) = 0.;
-      coords(ielem,2,0) = 0.;
+    void operator()(size_type ielem) const {
+      coords(ielem, 0, 0) = 0.;
+      coords(ielem, 1, 0) = 0.;
+      coords(ielem, 2, 0) = 0.;
 
-      coords(ielem,0,1) = 1.;
-      coords(ielem,1,1) = 0.;
-      coords(ielem,2,1) = 0.;
+      coords(ielem, 0, 1) = 1.;
+      coords(ielem, 1, 1) = 0.;
+      coords(ielem, 2, 1) = 0.;
 
-      coords(ielem,0,2) = 1.;
-      coords(ielem,1,2) = 1.;
-      coords(ielem,2,2) = 0.;
+      coords(ielem, 0, 2) = 1.;
+      coords(ielem, 1, 2) = 1.;
+      coords(ielem, 2, 2) = 0.;
 
-      coords(ielem,0,3) = 0.;
-      coords(ielem,1,3) = 1.;
-      coords(ielem,2,3) = 0.;
+      coords(ielem, 0, 3) = 0.;
+      coords(ielem, 1, 3) = 1.;
+      coords(ielem, 2, 3) = 0.;
 
+      coords(ielem, 0, 4) = 0.;
+      coords(ielem, 1, 4) = 0.;
+      coords(ielem, 2, 4) = 1.;
 
-      coords(ielem,0,4) = 0.;
-      coords(ielem,1,4) = 0.;
-      coords(ielem,2,4) = 1.;
+      coords(ielem, 0, 5) = 1.;
+      coords(ielem, 1, 5) = 0.;
+      coords(ielem, 2, 5) = 1.;
 
-      coords(ielem,0,5) = 1.;
-      coords(ielem,1,5) = 0.;
-      coords(ielem,2,5) = 1.;
+      coords(ielem, 0, 6) = 1.;
+      coords(ielem, 1, 6) = 1.;
+      coords(ielem, 2, 6) = 1.;
 
-      coords(ielem,0,6) = 1.;
-      coords(ielem,1,6) = 1.;
-      coords(ielem,2,6) = 1.;
-
-      coords(ielem,0,7) = 0.;
-      coords(ielem,1,7) = 1.;
-      coords(ielem,2,7) = 1.;
+      coords(ielem, 0, 7) = 0.;
+      coords(ielem, 1, 7) = 1.;
+      coords(ielem, 2, 7) = 1.;
     }
   };
 
   //--------------------------------------------------------------------------
 
-  static double test( const int count , const int iter = 1 )
-  {
-    elem_coord_type coord( "coord" , count );
-    elem_grad_type  grad ( "grad" , count );
+  static double test(const int count, const int iter = 1) {
+    elem_coord_type coord("coord", count);
+    elem_grad_type grad("grad", count);
 
     // Execute the parallel kernels on the arrays:
 
-    double dt_min = 0 ;
+    double dt_min = 0;
 
-    Kokkos::parallel_for( count , Init( coord ) );
+    Kokkos::parallel_for(count, Init(coord));
     execution_space().fence();
 
-    for ( int i = 0 ; i < iter ; ++i ) {
-      Kokkos::Timer timer ;
-      Kokkos::parallel_for( count , HexGrad<execution_space>( coord , grad ) );
+    for (int i = 0; i < iter; ++i) {
+      Kokkos::Timer timer;
+      Kokkos::parallel_for(count, HexGrad<execution_space>(coord, grad));
       execution_space().fence();
       const double dt = timer.seconds();
-      if ( 0 == i ) dt_min = dt ;
-      else dt_min = dt < dt_min ? dt : dt_min ;
+      if (0 == i)
+        dt_min = dt;
+      else
+        dt_min = dt < dt_min ? dt : dt_min;
     }
 
-    return dt_min ;
+    return dt_min;
   }
 };
 
-template< class DeviceType >
-void run_test_hexgrad( int exp_beg , int exp_end, int num_trials, const char deviceTypeName[] )
-{
-  std::string label_hexgrad ;
-  label_hexgrad.append( "\"HexGrad< double , " );
-  label_hexgrad.append( deviceTypeName );
-  label_hexgrad.append( " >\"" );
+template <class DeviceType>
+void run_test_hexgrad(int exp_beg, int exp_end, int num_trials,
+                      const char deviceTypeName[]) {
+  std::string label_hexgrad;
+  label_hexgrad.append("\"HexGrad< double , ");
+  label_hexgrad.append(deviceTypeName);
+  label_hexgrad.append(" >\"");
 
-  for (int i = exp_beg ; i < exp_end ; ++i) {
-    double min_seconds = 0.0 ;
-    double max_seconds = 0.0 ;
-    double avg_seconds = 0.0 ;
+  for (int i = exp_beg; i < exp_end; ++i) {
+    double min_seconds = 0.0;
+    double max_seconds = 0.0;
+    double avg_seconds = 0.0;
 
-    const int parallel_work_length = 1<<i;
+    const int parallel_work_length = 1 << i;
 
-    for ( int j = 0 ; j < num_trials ; ++j ) {
-      const double seconds = HexGrad< DeviceType >::test(parallel_work_length) ;
+    for (int j = 0; j < num_trials; ++j) {
+      const double seconds = HexGrad<DeviceType>::test(parallel_work_length);
 
-      if ( 0 == j ) {
-        min_seconds = seconds ;
-        max_seconds = seconds ;
+      if (0 == j) {
+        min_seconds = seconds;
+        max_seconds = seconds;
+      } else {
+        if (seconds < min_seconds) min_seconds = seconds;
+        if (seconds > max_seconds) max_seconds = seconds;
       }
-      else {
-        if ( seconds < min_seconds ) min_seconds = seconds ;
-        if ( seconds > max_seconds ) max_seconds = seconds ;
-      }
-      avg_seconds += seconds ;
+      avg_seconds += seconds;
     }
-    avg_seconds /= num_trials ;
+    avg_seconds /= num_trials;
 
-    std::cout << label_hexgrad
-      << " , " << parallel_work_length
-      << " , " << min_seconds
-      << " , " << ( min_seconds / parallel_work_length )
-      << std::endl ;
+    std::cout << label_hexgrad << " , " << parallel_work_length << " , "
+              << min_seconds << " , " << (min_seconds / parallel_work_length)
+              << std::endl;
   }
 }
 
-TEST_F( default_exec, hexgrad ) {
-  int exp_beg = 10;
-  int exp_end = 20;
+TEST(default_exec, hexgrad) {
+  int exp_beg    = 10;
+  int exp_end    = 20;
   int num_trials = 5;
 
-  if(command_line_num_args()>1)
-    exp_beg = atoi(command_line_arg(1));
-  if(command_line_num_args()>2)
-    exp_end = atoi(command_line_arg(2));
-  if(command_line_num_args()>3)
-    num_trials = atoi(command_line_arg(3));
-
-  EXPECT_NO_THROW(run_test_hexgrad< Kokkos::DefaultExecutionSpace >( exp_beg, exp_end, num_trials, Kokkos::DefaultExecutionSpace::name() ));
-}
+  if (command_line_num_args() > 1) exp_beg = atoi(command_line_arg(1));
+  if (command_line_num_args() > 2) exp_end = atoi(command_line_arg(2));
+  if (command_line_num_args() > 3) num_trials = atoi(command_line_arg(3));
 
+  EXPECT_NO_THROW(run_test_hexgrad<Kokkos::DefaultExecutionSpace>(
+      exp_beg, exp_end, num_trials, Kokkos::DefaultExecutionSpace::name()));
 }
 
+}  // namespace Test
diff --git a/lib/kokkos/core/perf_test/PerfTestMDRange.hpp b/lib/kokkos/core/perf_test/PerfTestMDRange.hpp
index f433451f78..3afff96ff3 100644
--- a/lib/kokkos/core/perf_test/PerfTestMDRange.hpp
+++ b/lib/kokkos/core/perf_test/PerfTestMDRange.hpp
@@ -1,13 +1,14 @@
 /*
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -36,24 +37,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 */
 
 namespace Test {
-template< class DeviceType 
-        , typename ScalarType = double  
-        , typename TestLayout = Kokkos::LayoutRight  
-        >
-struct MultiDimRangePerf3D
-{
+template <class DeviceType, typename ScalarType = double,
+          typename TestLayout = Kokkos::LayoutRight>
+struct MultiDimRangePerf3D {
   typedef DeviceType execution_space;
-  typedef typename execution_space::size_type  size_type;
+  typedef typename execution_space::size_type size_type;
 
   using iterate_type = Kokkos::Iterate;
 
-  typedef Kokkos::View<ScalarType***, TestLayout, DeviceType> view_type;
+  typedef Kokkos::View<ScalarType ***, TestLayout, DeviceType> view_type;
   typedef typename view_type::HostMirror host_view_type;
 
   view_type A;
@@ -62,39 +60,36 @@ struct MultiDimRangePerf3D
   const long jrange;
   const long krange;
 
-  MultiDimRangePerf3D(const view_type & A_, const view_type & B_, const long &irange_,  const long &jrange_, const long &krange_)
-  : A(A_), B(B_), irange(irange_), jrange(jrange_), krange(krange_)
-  {}
+  MultiDimRangePerf3D(const view_type &A_, const view_type &B_,
+                      const long &irange_, const long &jrange_,
+                      const long &krange_)
+      : A(A_), B(B_), irange(irange_), jrange(jrange_), krange(krange_) {}
 
   KOKKOS_INLINE_FUNCTION
-  void operator()(const long i, const long j, const long k) const
-  {
-    A(i,j,k) = 0.25*(ScalarType)( B(i+2,j,k) + B(i+1,j,k)
-                             + B(i,j+2,k) + B(i,j+1,k)
-                             + B(i,j,k+2) + B(i,j,k+1)
-                             + B(i,j,k) );
+  void operator()(const long i, const long j, const long k) const {
+    A(i, j, k) =
+        0.25 * (ScalarType)(B(i + 2, j, k) + B(i + 1, j, k) + B(i, j + 2, k) +
+                            B(i, j + 1, k) + B(i, j, k + 2) + B(i, j, k + 1) +
+                            B(i, j, k));
   }
 
-
   struct InitZeroTag {};
-//  struct InitViewTag {};
+  //  struct InitViewTag {};
 
-  struct Init
-  {
-
-    Init(const view_type & input_, const long &irange_,  const long &jrange_, const long &krange_)
-    : input(input_), irange(irange_), jrange(jrange_), krange(krange_) {}
+  struct Init {
+    Init(const view_type &input_, const long &irange_, const long &jrange_,
+         const long &krange_)
+        : input(input_), irange(irange_), jrange(jrange_), krange(krange_) {}
 
     KOKKOS_INLINE_FUNCTION
-    void operator()(const long i, const long j, const long k) const
-    {
-      input(i,j,k) = 1.0;
+    void operator()(const long i, const long j, const long k) const {
+      input(i, j, k) = 1.0;
     }
 
     KOKKOS_INLINE_FUNCTION
-    void operator()(const InitZeroTag&, const long i, const long j, const long k) const
-    {
-      input(i,j,k) = 0;
+    void operator()(const InitZeroTag &, const long i, const long j,
+                    const long k) const {
+      input(i, j, k) = 0;
     }
 
     view_type input;
@@ -103,166 +98,221 @@ struct MultiDimRangePerf3D
     const long krange;
   };
 
-
-  static double test_multi_index(const unsigned int icount, const unsigned int jcount, const unsigned int kcount, const unsigned int Ti = 1, const unsigned int Tj = 1, const unsigned int Tk = 1, const long iter = 1)
-  {
-    //This test performs multidim range over all dims
+  static double test_multi_index(const unsigned int icount,
+                                 const unsigned int jcount,
+                                 const unsigned int kcount,
+                                 const unsigned int Ti = 1,
+                                 const unsigned int Tj = 1,
+                                 const unsigned int Tk = 1,
+                                 const long iter       = 1) {
+    // This test performs multidim range over all dims
     view_type Atest("Atest", icount, jcount, kcount);
-    view_type Btest("Btest", icount+2, jcount+2, kcount+2);
-    typedef MultiDimRangePerf3D<execution_space,ScalarType,TestLayout> FunctorType;
+    view_type Btest("Btest", icount + 2, jcount + 2, kcount + 2);
+    typedef MultiDimRangePerf3D<execution_space, ScalarType, TestLayout>
+        FunctorType;
 
     double dt_min = 0;
 
     // LayoutRight
-    if ( std::is_same<TestLayout, Kokkos::LayoutRight>::value ) {
-      Kokkos::MDRangePolicy<Kokkos::Rank<3, iterate_type::Right, iterate_type::Right>, execution_space > policy_initA({{0,0,0}},{{icount,jcount,kcount}},{{Ti,Tj,Tk}}); 
-      Kokkos::MDRangePolicy<Kokkos::Rank<3, iterate_type::Right, iterate_type::Right>, execution_space > policy_initB({{0,0,0}},{{icount+2,jcount+2,kcount+2}},{{Ti,Tj,Tk}}); 
+    if (std::is_same<TestLayout, Kokkos::LayoutRight>::value) {
+      Kokkos::MDRangePolicy<
+          Kokkos::Rank<3, iterate_type::Right, iterate_type::Right>,
+          execution_space>
+          policy_initA({{0, 0, 0}}, {{icount, jcount, kcount}}, {{Ti, Tj, Tk}});
+      Kokkos::MDRangePolicy<
+          Kokkos::Rank<3, iterate_type::Right, iterate_type::Right>,
+          execution_space>
+          policy_initB({{0, 0, 0}}, {{icount + 2, jcount + 2, kcount + 2}},
+                       {{Ti, Tj, Tk}});
 
-      typedef typename Kokkos::MDRangePolicy<Kokkos::Rank<3, iterate_type::Right, iterate_type::Right>, execution_space > MDRangeType;
-      using tile_type = typename MDRangeType::tile_type;
+      typedef typename Kokkos::MDRangePolicy<
+          Kokkos::Rank<3, iterate_type::Right, iterate_type::Right>,
+          execution_space>
+          MDRangeType;
+      using tile_type  = typename MDRangeType::tile_type;
       using point_type = typename MDRangeType::point_type;
 
-      Kokkos::MDRangePolicy<Kokkos::Rank<3, iterate_type::Right, iterate_type::Right>, execution_space > policy(point_type{{0,0,0}},point_type{{icount,jcount,kcount}},tile_type{{Ti,Tj,Tk}} );
+      Kokkos::MDRangePolicy<
+          Kokkos::Rank<3, iterate_type::Right, iterate_type::Right>,
+          execution_space>
+          policy(point_type{{0, 0, 0}}, point_type{{icount, jcount, kcount}},
+                 tile_type{{Ti, Tj, Tk}});
 
-      Kokkos::parallel_for( policy_initA, Init(Atest, icount, jcount, kcount) );
+      Kokkos::parallel_for(policy_initA, Init(Atest, icount, jcount, kcount));
       execution_space().fence();
-      Kokkos::parallel_for( policy_initB, Init(Btest, icount+2, jcount+2, kcount+2) );
+      Kokkos::parallel_for(policy_initB,
+                           Init(Btest, icount + 2, jcount + 2, kcount + 2));
       execution_space().fence();
 
-    for (int i = 0; i < iter; ++i)
-    {
-      Kokkos::Timer timer;
-      Kokkos::parallel_for( policy, FunctorType(Atest, Btest, icount, jcount, kcount) );
-      execution_space().fence();
-      const double dt = timer.seconds();
-      if ( 0 == i ) dt_min = dt ;
-      else dt_min = dt < dt_min ? dt : dt_min ;
+      for (int i = 0; i < iter; ++i) {
+        Kokkos::Timer timer;
+        Kokkos::parallel_for(policy,
+                             FunctorType(Atest, Btest, icount, jcount, kcount));
+        execution_space().fence();
+        const double dt = timer.seconds();
+        if (0 == i)
+          dt_min = dt;
+        else
+          dt_min = dt < dt_min ? dt : dt_min;
 
-      //Correctness check - only the first run
-      if ( 0 == i )
-      {
-        long numErrors = 0;
-        host_view_type Ahost("Ahost", icount, jcount, kcount);
-        Kokkos::deep_copy(Ahost, Atest);
-        host_view_type Bhost("Bhost", icount+2, jcount+2, kcount+2);
-        Kokkos::deep_copy(Bhost, Btest);
+        // Correctness check - only the first run
+        if (0 == i) {
+          long numErrors = 0;
+          host_view_type Ahost("Ahost", icount, jcount, kcount);
+          Kokkos::deep_copy(Ahost, Atest);
+          host_view_type Bhost("Bhost", icount + 2, jcount + 2, kcount + 2);
+          Kokkos::deep_copy(Bhost, Btest);
 
-        // On KNL, this may vectorize - add print statement to prevent
-        // Also, compare against epsilon, as vectorization can change bitwise answer
-        for ( long l = 0; l < static_cast<long>(icount); ++l ) {
-        for ( long j = 0; j < static_cast<long>(jcount); ++j ) {
-        for ( long k = 0; k < static_cast<long>(kcount); ++k ) {
-          ScalarType check  = 0.25*(ScalarType)( Bhost(l+2,j,k) + Bhost(l+1,j,k)
-                                        + Bhost(l,j+2,k) + Bhost(l,j+1,k)
-                                        + Bhost(l,j,k+2) + Bhost(l,j,k+1)
-                                        + Bhost(l,j,k) );
-          if ( Ahost(l,j,k) - check != 0 ) {
-            ++numErrors;
-            std::cout << "  Correctness error at index: " << l << ","<<j<<","<<k<<"\n"
-                      << "  multi Ahost = " << Ahost(l,j,k) << "  expected = " << check  
-                      << "  multi Bhost(ijk) = " << Bhost(l,j,k) 
-                      << "  multi Bhost(l+1jk) = " << Bhost(l+1,j,k) 
-                      << "  multi Bhost(l+2jk) = " << Bhost(l+2,j,k) 
-                      << "  multi Bhost(ij+1k) = " << Bhost(l,j+1,k) 
-                      << "  multi Bhost(ij+2k) = " << Bhost(l,j+2,k) 
-                      << "  multi Bhost(ijk+1) = " << Bhost(l,j,k+1) 
-                      << "  multi Bhost(ijk+2) = " << Bhost(l,j,k+2) 
-                      << std::endl;
-            //exit(-1);
+          // On KNL, this may vectorize - add print statement to prevent
+          // Also, compare against epsilon, as vectorization can change bitwise
+          // answer
+          for (long l = 0; l < static_cast<long>(icount); ++l) {
+            for (long j = 0; j < static_cast<long>(jcount); ++j) {
+              for (long k = 0; k < static_cast<long>(kcount); ++k) {
+                ScalarType check =
+                    0.25 *
+                    (ScalarType)(Bhost(l + 2, j, k) + Bhost(l + 1, j, k) +
+                                 Bhost(l, j + 2, k) + Bhost(l, j + 1, k) +
+                                 Bhost(l, j, k + 2) + Bhost(l, j, k + 1) +
+                                 Bhost(l, j, k));
+                if (Ahost(l, j, k) - check != 0) {
+                  ++numErrors;
+                  std::cout << "  Correctness error at index: " << l << "," << j
+                            << "," << k << "\n"
+                            << "  multi Ahost = " << Ahost(l, j, k)
+                            << "  expected = " << check
+                            << "  multi Bhost(ijk) = " << Bhost(l, j, k)
+                            << "  multi Bhost(l+1jk) = " << Bhost(l + 1, j, k)
+                            << "  multi Bhost(l+2jk) = " << Bhost(l + 2, j, k)
+                            << "  multi Bhost(ij+1k) = " << Bhost(l, j + 1, k)
+                            << "  multi Bhost(ij+2k) = " << Bhost(l, j + 2, k)
+                            << "  multi Bhost(ijk+1) = " << Bhost(l, j, k + 1)
+                            << "  multi Bhost(ijk+2) = " << Bhost(l, j, k + 2)
+                            << std::endl;
+                  // exit(-1);
+                }
+              }
+            }
           }
-        } } }
-        if ( numErrors != 0 ) { std::cout << "LR multi: errors " << numErrors << "  range product " << icount*jcount*kcount << "  LL " << jcount*kcount << "  LR " << icount*jcount << std::endl; }
-        //else { std::cout << " multi: No errors!" <<  std::endl; }
-      }
-    } //end for
+          if (numErrors != 0) {
+            std::cout << "LR multi: errors " << numErrors << "  range product "
+                      << icount * jcount * kcount << "  LL " << jcount * kcount
+                      << "  LR " << icount * jcount << std::endl;
+          }
+          // else { std::cout << " multi: No errors!" <<  std::endl; }
+        }
+      }  // end for
 
-    } 
+    }
     // LayoutLeft
     else {
-      Kokkos::MDRangePolicy<Kokkos::Rank<3,iterate_type::Left,iterate_type::Left>, execution_space > policy_initA({{0,0,0}},{{icount,jcount,kcount}},{{Ti,Tj,Tk}}); 
-      Kokkos::MDRangePolicy<Kokkos::Rank<3,iterate_type::Left,iterate_type::Left>, execution_space > policy_initB({{0,0,0}},{{icount+2,jcount+2,kcount+2}},{{Ti,Tj,Tk}}); 
+      Kokkos::MDRangePolicy<
+          Kokkos::Rank<3, iterate_type::Left, iterate_type::Left>,
+          execution_space>
+          policy_initA({{0, 0, 0}}, {{icount, jcount, kcount}}, {{Ti, Tj, Tk}});
+      Kokkos::MDRangePolicy<
+          Kokkos::Rank<3, iterate_type::Left, iterate_type::Left>,
+          execution_space>
+          policy_initB({{0, 0, 0}}, {{icount + 2, jcount + 2, kcount + 2}},
+                       {{Ti, Tj, Tk}});
 
-      //typedef typename Kokkos::MDRangePolicy<Kokkos::Rank<3, iterate_type::Left, iterate_type::Left>, execution_space > MDRangeType;
-      //using tile_type = typename MDRangeType::tile_type;
-      //using point_type = typename MDRangeType::point_type;
-      //Kokkos::MDRangePolicy<Kokkos::Rank<3, iterate_type::Left, iterate_type::Left>, execution_space > policy(point_type{{0,0,0}},point_type{{icount,jcount,kcount}},tile_type{{Ti,Tj,Tk}} );
-      Kokkos::MDRangePolicy<Kokkos::Rank<3, iterate_type::Left, iterate_type::Left>, execution_space > policy({{0,0,0}},{{icount,jcount,kcount}},{{Ti,Tj,Tk}} ); 
+      // typedef typename Kokkos::MDRangePolicy<Kokkos::Rank<3,
+      // iterate_type::Left, iterate_type::Left>, execution_space > MDRangeType;
+      // using tile_type = typename MDRangeType::tile_type;
+      // using point_type = typename MDRangeType::point_type;
+      // Kokkos::MDRangePolicy<Kokkos::Rank<3, iterate_type::Left,
+      // iterate_type::Left>, execution_space >
+      // policy(point_type{{0,0,0}},point_type{{icount,jcount,kcount}},tile_type{{Ti,Tj,Tk}}
+      // );
+      Kokkos::MDRangePolicy<
+          Kokkos::Rank<3, iterate_type::Left, iterate_type::Left>,
+          execution_space>
+          policy({{0, 0, 0}}, {{icount, jcount, kcount}}, {{Ti, Tj, Tk}});
 
-      Kokkos::parallel_for( policy_initA, Init(Atest, icount, jcount, kcount) );
+      Kokkos::parallel_for(policy_initA, Init(Atest, icount, jcount, kcount));
       execution_space().fence();
-      Kokkos::parallel_for( policy_initB, Init(Btest, icount+2, jcount+2, kcount+2) );
+      Kokkos::parallel_for(policy_initB,
+                           Init(Btest, icount + 2, jcount + 2, kcount + 2));
       execution_space().fence();
 
-    for (int i = 0; i < iter; ++i)
-    {
-      Kokkos::Timer timer;
-      Kokkos::parallel_for( policy, FunctorType(Atest, Btest, icount, jcount, kcount) );
-      execution_space().fence();
-      const double dt = timer.seconds();
-      if ( 0 == i ) dt_min = dt ;
-      else dt_min = dt < dt_min ? dt : dt_min ;
+      for (int i = 0; i < iter; ++i) {
+        Kokkos::Timer timer;
+        Kokkos::parallel_for(policy,
+                             FunctorType(Atest, Btest, icount, jcount, kcount));
+        execution_space().fence();
+        const double dt = timer.seconds();
+        if (0 == i)
+          dt_min = dt;
+        else
+          dt_min = dt < dt_min ? dt : dt_min;
 
-      //Correctness check - only the first run
-      if ( 0 == i )
-      {
-        long numErrors = 0;
-        host_view_type Ahost("Ahost", icount, jcount, kcount);
-        Kokkos::deep_copy(Ahost, Atest);
-        host_view_type Bhost("Bhost", icount+2, jcount+2, kcount+2);
-        Kokkos::deep_copy(Bhost, Btest);
+        // Correctness check - only the first run
+        if (0 == i) {
+          long numErrors = 0;
+          host_view_type Ahost("Ahost", icount, jcount, kcount);
+          Kokkos::deep_copy(Ahost, Atest);
+          host_view_type Bhost("Bhost", icount + 2, jcount + 2, kcount + 2);
+          Kokkos::deep_copy(Bhost, Btest);
 
-        // On KNL, this may vectorize - add print statement to prevent
-        // Also, compare against epsilon, as vectorization can change bitwise answer
-        for ( long l = 0; l < static_cast<long>(icount); ++l ) {
-        for ( long j = 0; j < static_cast<long>(jcount); ++j ) {
-        for ( long k = 0; k < static_cast<long>(kcount); ++k ) {
-          ScalarType check  = 0.25*(ScalarType)( Bhost(l+2,j,k) + Bhost(l+1,j,k)
-                                        + Bhost(l,j+2,k) + Bhost(l,j+1,k)
-                                        + Bhost(l,j,k+2) + Bhost(l,j,k+1)
-                                        + Bhost(l,j,k) );
-          if ( Ahost(l,j,k) - check != 0 ) {
-            ++numErrors;
-            std::cout << "  Correctness error at index: " << l << ","<<j<<","<<k<<"\n"
-                      << "  multi Ahost = " << Ahost(l,j,k) << "  expected = " << check  
-                      << "  multi Bhost(ijk) = " << Bhost(l,j,k) 
-                      << "  multi Bhost(l+1jk) = " << Bhost(l+1,j,k) 
-                      << "  multi Bhost(l+2jk) = " << Bhost(l+2,j,k) 
-                      << "  multi Bhost(ij+1k) = " << Bhost(l,j+1,k) 
-                      << "  multi Bhost(ij+2k) = " << Bhost(l,j+2,k) 
-                      << "  multi Bhost(ijk+1) = " << Bhost(l,j,k+1) 
-                      << "  multi Bhost(ijk+2) = " << Bhost(l,j,k+2) 
-                      << std::endl;
-            //exit(-1);
+          // On KNL, this may vectorize - add print statement to prevent
+          // Also, compare against epsilon, as vectorization can change bitwise
+          // answer
+          for (long l = 0; l < static_cast<long>(icount); ++l) {
+            for (long j = 0; j < static_cast<long>(jcount); ++j) {
+              for (long k = 0; k < static_cast<long>(kcount); ++k) {
+                ScalarType check =
+                    0.25 *
+                    (ScalarType)(Bhost(l + 2, j, k) + Bhost(l + 1, j, k) +
+                                 Bhost(l, j + 2, k) + Bhost(l, j + 1, k) +
+                                 Bhost(l, j, k + 2) + Bhost(l, j, k + 1) +
+                                 Bhost(l, j, k));
+                if (Ahost(l, j, k) - check != 0) {
+                  ++numErrors;
+                  std::cout << "  Correctness error at index: " << l << "," << j
+                            << "," << k << "\n"
+                            << "  multi Ahost = " << Ahost(l, j, k)
+                            << "  expected = " << check
+                            << "  multi Bhost(ijk) = " << Bhost(l, j, k)
+                            << "  multi Bhost(l+1jk) = " << Bhost(l + 1, j, k)
+                            << "  multi Bhost(l+2jk) = " << Bhost(l + 2, j, k)
+                            << "  multi Bhost(ij+1k) = " << Bhost(l, j + 1, k)
+                            << "  multi Bhost(ij+2k) = " << Bhost(l, j + 2, k)
+                            << "  multi Bhost(ijk+1) = " << Bhost(l, j, k + 1)
+                            << "  multi Bhost(ijk+2) = " << Bhost(l, j, k + 2)
+                            << std::endl;
+                  // exit(-1);
+                }
+              }
+            }
           }
-        } } }
-        if ( numErrors != 0 ) { std::cout << " LL multi run: errors " << numErrors << "  range product " << icount*jcount*kcount << "  LL " << jcount*kcount << "  LR " << icount*jcount << std::endl; }
-        //else { std::cout << " multi: No errors!" <<  std::endl; }
-
-      }
-    } //end for
+          if (numErrors != 0) {
+            std::cout << " LL multi run: errors " << numErrors
+                      << "  range product " << icount * jcount * kcount
+                      << "  LL " << jcount * kcount << "  LR "
+                      << icount * jcount << std::endl;
+          }
+          // else { std::cout << " multi: No errors!" <<  std::endl; }
+        }
+      }  // end for
     }
 
     return dt_min;
-  } 
-
+  }
 };
 
-
-template< class DeviceType 
-        , typename ScalarType = double  
-        , typename TestLayout = Kokkos::LayoutRight  
-        >
-struct RangePolicyCollapseTwo
-{
-  // RangePolicy for 3D range, but will collapse only 2 dims => like Rank<2> for multi-dim; unroll 2 dims in one-dim
+template <class DeviceType, typename ScalarType = double,
+          typename TestLayout = Kokkos::LayoutRight>
+struct RangePolicyCollapseTwo {
+  // RangePolicy for 3D range, but will collapse only 2 dims => like Rank<2> for
+  // multi-dim; unroll 2 dims in one-dim
 
   typedef DeviceType execution_space;
-  typedef typename execution_space::size_type  size_type;
+  typedef typename execution_space::size_type size_type;
   typedef TestLayout layout;
 
   using iterate_type = Kokkos::Iterate;
 
-  typedef Kokkos::View<ScalarType***, TestLayout, DeviceType> view_type;
+  typedef Kokkos::View<ScalarType ***, TestLayout, DeviceType> view_type;
   typedef typename view_type::HostMirror host_view_type;
 
   view_type A;
@@ -271,165 +321,170 @@ struct RangePolicyCollapseTwo
   const long jrange;
   const long krange;
 
-  RangePolicyCollapseTwo(view_type & A_, const view_type & B_, const long &irange_,  const long &jrange_, const long &krange_)
-  : A(A_), B(B_) , irange(irange_), jrange(jrange_), krange(krange_)
-  {}
+  RangePolicyCollapseTwo(view_type &A_, const view_type &B_,
+                         const long &irange_, const long &jrange_,
+                         const long &krange_)
+      : A(A_), B(B_), irange(irange_), jrange(jrange_), krange(krange_) {}
 
   KOKKOS_INLINE_FUNCTION
-  void operator()(const long r) const
-  {
-    if ( std::is_same<TestLayout, Kokkos::LayoutRight>::value )
-    {
-//id(i,j,k) = k + j*Nk + i*Nk*Nj = k + Nk*(j + i*Nj) = k + Nk*r
-//r = j + i*Nj
-      long i = int(r / jrange); 
-      long j = int( r - i*jrange);
+  void operator()(const long r) const {
+    if (std::is_same<TestLayout, Kokkos::LayoutRight>::value) {
+      // id(i,j,k) = k + j*Nk + i*Nk*Nj = k + Nk*(j + i*Nj) = k + Nk*r
+      // r = j + i*Nj
+      long i = int(r / jrange);
+      long j = int(r - i * jrange);
       for (int k = 0; k < krange; ++k) {
-        A(i,j,k) = 0.25*(ScalarType)( B(i+2,j,k) + B(i+1,j,k)
-                                 + B(i,j+2,k) + B(i,j+1,k)
-                                 + B(i,j,k+2) + B(i,j,k+1)
-                                 + B(i,j,k) );
+        A(i, j, k) =
+            0.25 * (ScalarType)(B(i + 2, j, k) + B(i + 1, j, k) +
+                                B(i, j + 2, k) + B(i, j + 1, k) +
+                                B(i, j, k + 2) + B(i, j, k + 1) + B(i, j, k));
       }
-    }
-    else if ( std::is_same<TestLayout, Kokkos::LayoutLeft>::value )
-    {
-//id(i,j,k) = i + j*Ni + k*Ni*Nj = i + Ni*(j + k*Nj) = i + Ni*r
-//r = j + k*Nj
-      long k = int(r / jrange); 
-      long j = int( r - k*jrange);
+    } else if (std::is_same<TestLayout, Kokkos::LayoutLeft>::value) {
+      // id(i,j,k) = i + j*Ni + k*Ni*Nj = i + Ni*(j + k*Nj) = i + Ni*r
+      // r = j + k*Nj
+      long k = int(r / jrange);
+      long j = int(r - k * jrange);
       for (int i = 0; i < irange; ++i) {
-        A(i,j,k) = 0.25*(ScalarType)( B(i+2,j,k) + B(i+1,j,k)
-                                 + B(i,j+2,k) + B(i,j+1,k)
-                                 + B(i,j,k+2) + B(i,j,k+1)
-                                 + B(i,j,k) );
+        A(i, j, k) =
+            0.25 * (ScalarType)(B(i + 2, j, k) + B(i + 1, j, k) +
+                                B(i, j + 2, k) + B(i, j + 1, k) +
+                                B(i, j, k + 2) + B(i, j, k + 1) + B(i, j, k));
       }
     }
   }
 
-
-  struct Init
-  {
+  struct Init {
     view_type input;
     const long irange;
     const long jrange;
     const long krange;
 
-    Init(const view_type & input_, const long &irange_,  const long &jrange_, const long &krange_)
-    : input(input_), irange(irange_), jrange(jrange_), krange(krange_) {}
+    Init(const view_type &input_, const long &irange_, const long &jrange_,
+         const long &krange_)
+        : input(input_), irange(irange_), jrange(jrange_), krange(krange_) {}
 
     KOKKOS_INLINE_FUNCTION
-    void operator()(const long r) const
-    {
-      if ( std::is_same<TestLayout, Kokkos::LayoutRight>::value )
-      {
-        long i = int(r / jrange); 
-        long j = int( r - i*jrange);
+    void operator()(const long r) const {
+      if (std::is_same<TestLayout, Kokkos::LayoutRight>::value) {
+        long i = int(r / jrange);
+        long j = int(r - i * jrange);
         for (int k = 0; k < krange; ++k) {
-          input(i,j,k) = 1;
+          input(i, j, k) = 1;
         }
-      }
-      else if ( std::is_same<TestLayout, Kokkos::LayoutLeft>::value )
-      {
-        long k = int(r / jrange); 
-        long j = int( r - k*jrange);
+      } else if (std::is_same<TestLayout, Kokkos::LayoutLeft>::value) {
+        long k = int(r / jrange);
+        long j = int(r - k * jrange);
         for (int i = 0; i < irange; ++i) {
-          input(i,j,k) = 1;
+          input(i, j, k) = 1;
         }
       }
     }
   };
 
-
-  static double test_index_collapse_two(const unsigned int icount, const unsigned int jcount, const unsigned int kcount, const long iter = 1)
-  {
+  static double test_index_collapse_two(const unsigned int icount,
+                                        const unsigned int jcount,
+                                        const unsigned int kcount,
+                                        const long iter = 1) {
     // This test refers to collapsing two dims while using the RangePolicy
     view_type Atest("Atest", icount, jcount, kcount);
-    view_type Btest("Btest", icount+2, jcount+2, kcount+2);
-    typedef RangePolicyCollapseTwo<execution_space,ScalarType,TestLayout> FunctorType;
+    view_type Btest("Btest", icount + 2, jcount + 2, kcount + 2);
+    typedef RangePolicyCollapseTwo<execution_space, ScalarType, TestLayout>
+        FunctorType;
 
     long collapse_index_rangeA = 0;
     long collapse_index_rangeB = 0;
-    if ( std::is_same<TestLayout, Kokkos::LayoutRight>::value ) {
-      collapse_index_rangeA = icount*jcount;
-      collapse_index_rangeB = (icount+2)*(jcount+2);
-//      std::cout << "   LayoutRight " << std::endl;
-    } else if ( std::is_same<TestLayout, Kokkos::LayoutLeft>::value ) {
-      collapse_index_rangeA = kcount*jcount;
-      collapse_index_rangeB = (kcount+2)*(jcount+2);
-//      std::cout << "   LayoutLeft " << std::endl;
+    if (std::is_same<TestLayout, Kokkos::LayoutRight>::value) {
+      collapse_index_rangeA = icount * jcount;
+      collapse_index_rangeB = (icount + 2) * (jcount + 2);
+      //      std::cout << "   LayoutRight " << std::endl;
+    } else if (std::is_same<TestLayout, Kokkos::LayoutLeft>::value) {
+      collapse_index_rangeA = kcount * jcount;
+      collapse_index_rangeB = (kcount + 2) * (jcount + 2);
+      //      std::cout << "   LayoutLeft " << std::endl;
     } else {
-      std::cout << "  LayoutRight or LayoutLeft required - will pass 0 as range instead " << std::endl;
+      std::cout << "  LayoutRight or LayoutLeft required - will pass 0 as "
+                   "range instead "
+                << std::endl;
       exit(-1);
     }
 
-    Kokkos::RangePolicy<execution_space> policy(0, (collapse_index_rangeA) );
-    Kokkos::RangePolicy<execution_space> policy_initB(0, (collapse_index_rangeB) );
+    Kokkos::RangePolicy<execution_space> policy(0, (collapse_index_rangeA));
+    Kokkos::RangePolicy<execution_space> policy_initB(0,
+                                                      (collapse_index_rangeB));
 
     double dt_min = 0;
 
-    Kokkos::parallel_for( policy, Init(Atest,icount,jcount,kcount) );
+    Kokkos::parallel_for(policy, Init(Atest, icount, jcount, kcount));
     execution_space().fence();
-    Kokkos::parallel_for( policy_initB, Init(Btest,icount+2,jcount+2,kcount+2) );
+    Kokkos::parallel_for(policy_initB,
+                         Init(Btest, icount + 2, jcount + 2, kcount + 2));
     execution_space().fence();
 
-    for (int i = 0; i < iter; ++i)
-    {
+    for (int i = 0; i < iter; ++i) {
       Kokkos::Timer timer;
-      Kokkos::parallel_for(policy, FunctorType(Atest, Btest, icount, jcount, kcount));
+      Kokkos::parallel_for(policy,
+                           FunctorType(Atest, Btest, icount, jcount, kcount));
       execution_space().fence();
       const double dt = timer.seconds();
-      if ( 0 == i ) dt_min = dt ;
-      else dt_min = dt < dt_min ? dt : dt_min ;
+      if (0 == i)
+        dt_min = dt;
+      else
+        dt_min = dt < dt_min ? dt : dt_min;
 
-      //Correctness check - first iteration only
-      if ( 0 == i )
-      {
+      // Correctness check - first iteration only
+      if (0 == i) {
         long numErrors = 0;
         host_view_type Ahost("Ahost", icount, jcount, kcount);
         Kokkos::deep_copy(Ahost, Atest);
-        host_view_type Bhost("Bhost", icount+2, jcount+2, kcount+2);
+        host_view_type Bhost("Bhost", icount + 2, jcount + 2, kcount + 2);
         Kokkos::deep_copy(Bhost, Btest);
 
         // On KNL, this may vectorize - add print statement to prevent
-        // Also, compare against epsilon, as vectorization can change bitwise answer
-        for ( long l = 0; l < static_cast<long>(icount); ++l ) {
-        for ( long j = 0; j < static_cast<long>(jcount); ++j ) {
-        for ( long k = 0; k < static_cast<long>(kcount); ++k ) {
-          ScalarType check  = 0.25*(ScalarType)( Bhost(l+2,j,k) + Bhost(l+1,j,k)
-                                        + Bhost(l,j+2,k) + Bhost(l,j+1,k)
-                                        + Bhost(l,j,k+2) + Bhost(l,j,k+1)
-                                        + Bhost(l,j,k) );
-          if ( Ahost(l,j,k) - check != 0 ) {
-            ++numErrors;
-            std::cout << "  Correctness error at index: " << l << ","<<j<<","<<k<<"\n"
-                      << "  flat Ahost = " << Ahost(l,j,k) << "  expected = " << check  << std::endl;
-            //exit(-1);
+        // Also, compare against epsilon, as vectorization can change bitwise
+        // answer
+        for (long l = 0; l < static_cast<long>(icount); ++l) {
+          for (long j = 0; j < static_cast<long>(jcount); ++j) {
+            for (long k = 0; k < static_cast<long>(kcount); ++k) {
+              ScalarType check =
+                  0.25 * (ScalarType)(Bhost(l + 2, j, k) + Bhost(l + 1, j, k) +
+                                      Bhost(l, j + 2, k) + Bhost(l, j + 1, k) +
+                                      Bhost(l, j, k + 2) + Bhost(l, j, k + 1) +
+                                      Bhost(l, j, k));
+              if (Ahost(l, j, k) - check != 0) {
+                ++numErrors;
+                std::cout << "  Correctness error at index: " << l << "," << j
+                          << "," << k << "\n"
+                          << "  flat Ahost = " << Ahost(l, j, k)
+                          << "  expected = " << check << std::endl;
+                // exit(-1);
+              }
+            }
           }
-        } } }
-        if ( numErrors != 0 ) { std::cout << " RP collapse2: errors " << numErrors << "  range product " << icount*jcount*kcount << "  LL " << jcount*kcount << "  LR " << icount*jcount << std::endl; }
-        //else { std::cout << " RP collapse2: Pass! " << std::endl; }
+        }
+        if (numErrors != 0) {
+          std::cout << " RP collapse2: errors " << numErrors
+                    << "  range product " << icount * jcount * kcount << "  LL "
+                    << jcount * kcount << "  LR " << icount * jcount
+                    << std::endl;
+        }
+        // else { std::cout << " RP collapse2: Pass! " << std::endl; }
       }
     }
 
     return dt_min;
-  } 
-
+  }
 };
 
-
-template< class DeviceType 
-        , typename ScalarType = double  
-        , typename TestLayout = Kokkos::LayoutRight  
-        >
-struct RangePolicyCollapseAll
-{
+template <class DeviceType, typename ScalarType = double,
+          typename TestLayout = Kokkos::LayoutRight>
+struct RangePolicyCollapseAll {
   // RangePolicy for 3D range, but will collapse all dims
 
   typedef DeviceType execution_space;
-  typedef typename execution_space::size_type  size_type;
+  typedef typename execution_space::size_type size_type;
   typedef TestLayout layout;
 
-  typedef Kokkos::View<ScalarType***, TestLayout, DeviceType> view_type;
+  typedef Kokkos::View<ScalarType ***, TestLayout, DeviceType> view_type;
   typedef typename view_type::HostMirror host_view_type;
 
   view_type A;
@@ -438,127 +493,134 @@ struct RangePolicyCollapseAll
   const long jrange;
   const long krange;
 
-  RangePolicyCollapseAll(view_type & A_, const view_type & B_, const long &irange_,  const long &jrange_, const long &krange_)
-  : A(A_), B(B_), irange(irange_), jrange(jrange_), krange(krange_)
-  {}
+  RangePolicyCollapseAll(view_type &A_, const view_type &B_,
+                         const long &irange_, const long &jrange_,
+                         const long &krange_)
+      : A(A_), B(B_), irange(irange_), jrange(jrange_), krange(krange_) {}
 
   KOKKOS_INLINE_FUNCTION
-  void operator()(const long r) const
-  {
-    if ( std::is_same<TestLayout, Kokkos::LayoutRight>::value )
-    {
-      long i = int(r / (jrange*krange)); 
-      long j = int(( r - i*jrange*krange)/krange);
-      long k = int(r - i*jrange*krange - j*krange);
-        A(i,j,k) = 0.25*(ScalarType)( B(i+2,j,k) + B(i+1,j,k)
-            + B(i,j+2,k) + B(i,j+1,k)
-            + B(i,j,k+2) + B(i,j,k+1)
-            + B(i,j,k) );
-    }
-    else if ( std::is_same<TestLayout, Kokkos::LayoutLeft>::value )
-    {
-      long k = int(r / (irange*jrange)); 
-      long j = int(( r - k*irange*jrange)/irange);
-      long i = int(r - k*irange*jrange - j*irange);
-        A(i,j,k) = 0.25*(ScalarType)( B(i+2,j,k) + B(i+1,j,k)
-            + B(i,j+2,k) + B(i,j+1,k)
-            + B(i,j,k+2) + B(i,j,k+1)
-            + B(i,j,k) );
+  void operator()(const long r) const {
+    if (std::is_same<TestLayout, Kokkos::LayoutRight>::value) {
+      long i = int(r / (jrange * krange));
+      long j = int((r - i * jrange * krange) / krange);
+      long k = int(r - i * jrange * krange - j * krange);
+      A(i, j, k) =
+          0.25 * (ScalarType)(B(i + 2, j, k) + B(i + 1, j, k) + B(i, j + 2, k) +
+                              B(i, j + 1, k) + B(i, j, k + 2) + B(i, j, k + 1) +
+                              B(i, j, k));
+    } else if (std::is_same<TestLayout, Kokkos::LayoutLeft>::value) {
+      long k = int(r / (irange * jrange));
+      long j = int((r - k * irange * jrange) / irange);
+      long i = int(r - k * irange * jrange - j * irange);
+      A(i, j, k) =
+          0.25 * (ScalarType)(B(i + 2, j, k) + B(i + 1, j, k) + B(i, j + 2, k) +
+                              B(i, j + 1, k) + B(i, j, k + 2) + B(i, j, k + 1) +
+                              B(i, j, k));
     }
   }
 
-
-  struct Init
-  {
+  struct Init {
     view_type input;
     const long irange;
     const long jrange;
     const long krange;
 
-    Init(const view_type & input_, const long &irange_,  const long &jrange_, const long &krange_)
-    : input(input_), irange(irange_), jrange(jrange_), krange(krange_) {}
+    Init(const view_type &input_, const long &irange_, const long &jrange_,
+         const long &krange_)
+        : input(input_), irange(irange_), jrange(jrange_), krange(krange_) {}
 
     KOKKOS_INLINE_FUNCTION
-    void operator()(const long r) const
-    {
-      if ( std::is_same<TestLayout, Kokkos::LayoutRight>::value )
-      {
-        long i = int(r / (jrange*krange)); 
-        long j = int(( r - i*jrange*krange)/krange);
-        long k = int(r - i*jrange*krange - j*krange);
-        input(i,j,k) = 1;
-      }
-      else if ( std::is_same<TestLayout, Kokkos::LayoutLeft>::value )
-      {
-        long k = int(r / (irange*jrange));
-        long j = int(( r - k*irange*jrange)/irange);
-        long i = int(r - k*irange*jrange - j*irange);
-        input(i,j,k) = 1;
+    void operator()(const long r) const {
+      if (std::is_same<TestLayout, Kokkos::LayoutRight>::value) {
+        long i         = int(r / (jrange * krange));
+        long j         = int((r - i * jrange * krange) / krange);
+        long k         = int(r - i * jrange * krange - j * krange);
+        input(i, j, k) = 1;
+      } else if (std::is_same<TestLayout, Kokkos::LayoutLeft>::value) {
+        long k         = int(r / (irange * jrange));
+        long j         = int((r - k * irange * jrange) / irange);
+        long i         = int(r - k * irange * jrange - j * irange);
+        input(i, j, k) = 1;
       }
     }
   };
 
-
-  static double test_collapse_all(const unsigned int icount, const unsigned int jcount, const unsigned int kcount, const long iter = 1)
-  {
-    //This test refers to collapsing all dims using the RangePolicy
+  static double test_collapse_all(const unsigned int icount,
+                                  const unsigned int jcount,
+                                  const unsigned int kcount,
+                                  const long iter = 1) {
+    // This test refers to collapsing all dims using the RangePolicy
     view_type Atest("Atest", icount, jcount, kcount);
-    view_type Btest("Btest", icount+2, jcount+2, kcount+2);
-    typedef RangePolicyCollapseAll<execution_space,ScalarType,TestLayout> FunctorType;
+    view_type Btest("Btest", icount + 2, jcount + 2, kcount + 2);
+    typedef RangePolicyCollapseAll<execution_space, ScalarType, TestLayout>
+        FunctorType;
 
-    const long flat_index_range = icount*jcount*kcount;
-    Kokkos::RangePolicy<execution_space> policy(0, flat_index_range );
-    Kokkos::RangePolicy<execution_space> policy_initB(0, (icount+2)*(jcount+2)*(kcount+2) );
+    const long flat_index_range = icount * jcount * kcount;
+    Kokkos::RangePolicy<execution_space> policy(0, flat_index_range);
+    Kokkos::RangePolicy<execution_space> policy_initB(
+        0, (icount + 2) * (jcount + 2) * (kcount + 2));
 
     double dt_min = 0;
 
-    Kokkos::parallel_for( policy, Init(Atest,icount,jcount,kcount) );
+    Kokkos::parallel_for(policy, Init(Atest, icount, jcount, kcount));
     execution_space().fence();
-    Kokkos::parallel_for( policy_initB, Init(Btest,icount+2,jcount+2,kcount+2) );
+    Kokkos::parallel_for(policy_initB,
+                         Init(Btest, icount + 2, jcount + 2, kcount + 2));
     execution_space().fence();
 
-    for (int i = 0; i < iter; ++i)
-    {
+    for (int i = 0; i < iter; ++i) {
       Kokkos::Timer timer;
-      Kokkos::parallel_for(policy, FunctorType(Atest, Btest, icount, jcount, kcount));
+      Kokkos::parallel_for(policy,
+                           FunctorType(Atest, Btest, icount, jcount, kcount));
       execution_space().fence();
       const double dt = timer.seconds();
-      if ( 0 == i ) dt_min = dt ;
-      else dt_min = dt < dt_min ? dt : dt_min ;
+      if (0 == i)
+        dt_min = dt;
+      else
+        dt_min = dt < dt_min ? dt : dt_min;
 
-      //Correctness check - first iteration only
-      if ( 0 == i )
-      {
+      // Correctness check - first iteration only
+      if (0 == i) {
         long numErrors = 0;
         host_view_type Ahost("Ahost", icount, jcount, kcount);
         Kokkos::deep_copy(Ahost, Atest);
-        host_view_type Bhost("Bhost", icount+2, jcount+2, kcount+2);
+        host_view_type Bhost("Bhost", icount + 2, jcount + 2, kcount + 2);
         Kokkos::deep_copy(Bhost, Btest);
 
         // On KNL, this may vectorize - add print statement to prevent
-        // Also, compare against epsilon, as vectorization can change bitwise answer
-        for ( long l = 0; l < static_cast<long>(icount); ++l ) {
-        for ( long j = 0; j < static_cast<long>(jcount); ++j ) {
-        for ( long k = 0; k < static_cast<long>(kcount); ++k ) {
-          ScalarType check  = 0.25*(ScalarType)( Bhost(l+2,j,k) + Bhost(l+1,j,k)
-                                        + Bhost(l,j+2,k) + Bhost(l,j+1,k)
-                                        + Bhost(l,j,k+2) + Bhost(l,j,k+1)
-                                        + Bhost(l,j,k) );
-          if ( Ahost(l,j,k) - check != 0 ) {
-            ++numErrors;
-            std::cout << "  Callapse ALL Correctness error at index: " << l << ","<<j<<","<<k<<"\n"
-                      << "  flat Ahost = " << Ahost(l,j,k) << "  expected = " << check  << std::endl;
-            //exit(-1);
+        // Also, compare against epsilon, as vectorization can change bitwise
+        // answer
+        for (long l = 0; l < static_cast<long>(icount); ++l) {
+          for (long j = 0; j < static_cast<long>(jcount); ++j) {
+            for (long k = 0; k < static_cast<long>(kcount); ++k) {
+              ScalarType check =
+                  0.25 * (ScalarType)(Bhost(l + 2, j, k) + Bhost(l + 1, j, k) +
+                                      Bhost(l, j + 2, k) + Bhost(l, j + 1, k) +
+                                      Bhost(l, j, k + 2) + Bhost(l, j, k + 1) +
+                                      Bhost(l, j, k));
+              if (Ahost(l, j, k) - check != 0) {
+                ++numErrors;
+                std::cout << "  Callapse ALL Correctness error at index: " << l
+                          << "," << j << "," << k << "\n"
+                          << "  flat Ahost = " << Ahost(l, j, k)
+                          << "  expected = " << check << std::endl;
+                // exit(-1);
+              }
+            }
           }
-        } } }
-        if ( numErrors != 0 ) { std::cout << " RP collapse all: errors " << numErrors << "  range product " << icount*jcount*kcount << "  LL " << jcount*kcount << "  LR " << icount*jcount << std::endl; }
-        //else { std::cout << " RP collapse all: Pass! " << std::endl; }
+        }
+        if (numErrors != 0) {
+          std::cout << " RP collapse all: errors " << numErrors
+                    << "  range product " << icount * jcount * kcount << "  LL "
+                    << jcount * kcount << "  LR " << icount * jcount
+                    << std::endl;
+        }
+        // else { std::cout << " RP collapse all: Pass! " << std::endl; }
       }
     }
 
     return dt_min;
-  } 
-
+  }
 };
 
-} //end namespace Test
+}  // end namespace Test
diff --git a/lib/kokkos/core/perf_test/PerfTestMain.cpp b/lib/kokkos/core/perf_test/PerfTestMain.cpp
index f1f8a50f1b..8cd015fbe8 100644
--- a/lib/kokkos/core/perf_test/PerfTestMain.cpp
+++ b/lib/kokkos/core/perf_test/PerfTestMain.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -49,29 +50,27 @@
 namespace Test {
 int command_line_num_args(int n = 0) {
   static int n_args = 0;
-  if(n>0)
-    n_args = n;
+  if (n > 0) n_args = n;
   return n_args;
 }
 
 const char* command_line_arg(int k, char** input_args = NULL) {
   static char** args;
-  if(input_args != NULL)
-    args = input_args;
-  if(command_line_num_args() > k)
+  if (input_args != NULL) args = input_args;
+  if (command_line_num_args() > k)
     return args[k];
   else
     return NULL;
 }
 
-}
+}  // namespace Test
 
-int main(int argc, char *argv[]) {
-  ::testing::InitGoogleTest(&argc,argv);
-  Kokkos::initialize(argc,argv);
+int main(int argc, char* argv[]) {
+  ::testing::InitGoogleTest(&argc, argv);
+  Kokkos::initialize(argc, argv);
 
-  (void) Test::command_line_num_args(argc);
-  (void) Test::command_line_arg(0,argv);
+  (void)Test::command_line_num_args(argc);
+  (void)Test::command_line_arg(0, argv);
 
   int result = RUN_ALL_TESTS();
 
diff --git a/lib/kokkos/core/perf_test/PerfTest_Category.hpp b/lib/kokkos/core/perf_test/PerfTest_Category.hpp
index 18e309ab12..c2cff22502 100644
--- a/lib/kokkos/core/perf_test/PerfTest_Category.hpp
+++ b/lib/kokkos/core/perf_test/PerfTest_Category.hpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -51,16 +52,7 @@ namespace Test {
 extern int command_line_num_args(int n = 0);
 extern const char* command_line_arg(int k, char** input_args = NULL);
 
-class default_exec : public ::testing::Test {
-protected:
-  static void SetUpTestCase() {
-  }
-
-  static void TearDownTestCase() {
-  }
-};
-
-} // namespace Test
+}  // namespace Test
 
 #define TEST_CATEGORY default_exec
 #define TEST_EXECSPACE Kokkos::DefaultExecutionSpace
diff --git a/lib/kokkos/core/perf_test/PerfTest_CustomReduction.cpp b/lib/kokkos/core/perf_test/PerfTest_CustomReduction.cpp
index 5c67084c6e..d06851ec9b 100644
--- a/lib/kokkos/core/perf_test/PerfTest_CustomReduction.cpp
+++ b/lib/kokkos/core/perf_test/PerfTest_CustomReduction.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -48,71 +49,90 @@
 
 #ifdef KOKKOS_ENABLE_CXX11_DISPATCH_LAMBDA
 namespace Test {
-template<class Scalar>
+template <class Scalar>
 void custom_reduction_test(int N, int R, int num_trials) {
   Kokkos::Random_XorShift64_Pool<> rand_pool(183291);
-  Kokkos::View<Scalar*> a("A",N);
-  Kokkos::fill_random(a,rand_pool,1.0);
+  Kokkos::View<Scalar*> a("A", N);
+  Kokkos::fill_random(a, rand_pool, 1.0);
 
   Scalar max;
 
   int team_size = 32;
-  if ( team_size > Kokkos::DefaultExecutionSpace::concurrency() )
+  if (team_size > Kokkos::DefaultExecutionSpace::concurrency())
     team_size = Kokkos::DefaultExecutionSpace::concurrency();
   // Warm up
-  Kokkos::parallel_reduce(Kokkos::TeamPolicy<>(N/1024,team_size), KOKKOS_LAMBDA( const Kokkos::TeamPolicy<>::member_type& team, Scalar& lmax) {
-    Scalar team_max = Scalar(0);
-    for(int rr = 0; rr<R; rr++) {
-    int i = team.league_rank();
-    Kokkos::parallel_reduce(Kokkos::TeamThreadRange(team,32), [&] (const int& j, Scalar& thread_max) {
-      Scalar t_max = Scalar(0);
-      Kokkos::parallel_reduce(Kokkos::ThreadVectorRange(team,32), [&] (const int& k, Scalar& max_) {
-        const Scalar val =  a((i*32 + j)*32 + k);
-        if(val>lmax) lmax = val;
-        if((k == 11) && (j==17) && (i==2)) lmax = 11.5;
-      },Kokkos::Max<Scalar>(t_max));
-      if(t_max>thread_max) thread_max = t_max;
-    },Kokkos::Max<Scalar>(team_max));
-    }
-    if(team_max>lmax) lmax = team_max;
-  },Kokkos::Max<Scalar>(max));
+  Kokkos::parallel_reduce(
+      Kokkos::TeamPolicy<>(N / 1024, team_size),
+      KOKKOS_LAMBDA(const Kokkos::TeamPolicy<>::member_type& team,
+                    Scalar& lmax) {
+        Scalar team_max = Scalar(0);
+        for (int rr = 0; rr < R; rr++) {
+          int i = team.league_rank();
+          Kokkos::parallel_reduce(
+              Kokkos::TeamThreadRange(team, 32),
+              [&](const int& j, Scalar& thread_max) {
+                Scalar t_max = Scalar(0);
+                Kokkos::parallel_reduce(
+                    Kokkos::ThreadVectorRange(team, 32),
+                    [&](const int& k, Scalar& max_) {
+                      const Scalar val = a((i * 32 + j) * 32 + k);
+                      if (val > lmax) lmax = val;
+                      if ((k == 11) && (j == 17) && (i == 2)) lmax = 11.5;
+                    },
+                    Kokkos::Max<Scalar>(t_max));
+                if (t_max > thread_max) thread_max = t_max;
+              },
+              Kokkos::Max<Scalar>(team_max));
+        }
+        if (team_max > lmax) lmax = team_max;
+      },
+      Kokkos::Max<Scalar>(max));
 
   // Timing
   Kokkos::Timer timer;
-  for(int r = 0; r<num_trials; r++) {
-    Kokkos::parallel_reduce(Kokkos::TeamPolicy<>(N/1024,team_size), KOKKOS_LAMBDA( const Kokkos::TeamPolicy<>::member_type& team, Scalar& lmax) {
-      Scalar team_max = Scalar(0);
-      for(int rr = 0; rr<R; rr++) {
-      int i = team.league_rank();
-      Kokkos::parallel_reduce(Kokkos::TeamThreadRange(team,32), [&] (const int& j, Scalar& thread_max) {
-        Scalar t_max = Scalar(0);
-        Kokkos::parallel_reduce(Kokkos::ThreadVectorRange(team,32), [&] (const int& k, Scalar& max_) {
-          const Scalar val =  a((i*32 + j)*32 + k);
-          if(val>lmax) lmax = val;
-          if((k == 11) && (j==17) && (i==2)) lmax = 11.5;
-        },Kokkos::Max<Scalar>(t_max));
-        if(t_max>thread_max) thread_max = t_max;
-      },Kokkos::Max<Scalar>(team_max));
-      }
-      if(team_max>lmax) lmax = team_max;
-    },Kokkos::Max<Scalar>(max));
+  for (int r = 0; r < num_trials; r++) {
+    Kokkos::parallel_reduce(
+        Kokkos::TeamPolicy<>(N / 1024, team_size),
+        KOKKOS_LAMBDA(const Kokkos::TeamPolicy<>::member_type& team,
+                      Scalar& lmax) {
+          Scalar team_max = Scalar(0);
+          for (int rr = 0; rr < R; rr++) {
+            int i = team.league_rank();
+            Kokkos::parallel_reduce(
+                Kokkos::TeamThreadRange(team, 32),
+                [&](const int& j, Scalar& thread_max) {
+                  Scalar t_max = Scalar(0);
+                  Kokkos::parallel_reduce(
+                      Kokkos::ThreadVectorRange(team, 32),
+                      [&](const int& k, Scalar& max_) {
+                        const Scalar val = a((i * 32 + j) * 32 + k);
+                        if (val > lmax) lmax = val;
+                        if ((k == 11) && (j == 17) && (i == 2)) lmax = 11.5;
+                      },
+                      Kokkos::Max<Scalar>(t_max));
+                  if (t_max > thread_max) thread_max = t_max;
+                },
+                Kokkos::Max<Scalar>(team_max));
+          }
+          if (team_max > lmax) lmax = team_max;
+        },
+        Kokkos::Max<Scalar>(max));
   }
   double time = timer.seconds();
-  printf("%e %e %e\n",time,1.0*N*R*num_trials*sizeof(Scalar)/time/1024/1024/1024,max);
+  printf("%e %e %e\n", time,
+         1.0 * N * R * num_trials * sizeof(Scalar) / time / 1024 / 1024 / 1024,
+         max);
 }
 
-TEST_F( default_exec, custom_reduction ) {
-  int N = 100000;
-  int R = 1000;
+TEST(default_exec, custom_reduction) {
+  int N          = 100000;
+  int R          = 1000;
   int num_trials = 1;
 
-  if(command_line_num_args()>1)
-    N = atoi(command_line_arg(1));
-  if(command_line_num_args()>2)
-    R = atoi(command_line_arg(2));
-  if(command_line_num_args()>3)
-    num_trials = atoi(command_line_arg(3));
-  custom_reduction_test<double>(N,R,num_trials);
-}
+  if (command_line_num_args() > 1) N = atoi(command_line_arg(1));
+  if (command_line_num_args() > 2) R = atoi(command_line_arg(2));
+  if (command_line_num_args() > 3) num_trials = atoi(command_line_arg(3));
+  custom_reduction_test<double>(N, R, num_trials);
 }
+}  // namespace Test
 #endif
diff --git a/lib/kokkos/core/perf_test/PerfTest_ExecSpacePartitioning.cpp b/lib/kokkos/core/perf_test/PerfTest_ExecSpacePartitioning.cpp
index 2fc889beed..c6d5b2b8d6 100644
--- a/lib/kokkos/core/perf_test/PerfTest_ExecSpacePartitioning.cpp
+++ b/lib/kokkos/core/perf_test/PerfTest_ExecSpacePartitioning.cpp
@@ -2,563 +2,631 @@
 #include <gtest/gtest.h>
 #include <PerfTest_Category.hpp>
 
-
 namespace Test {
 
 namespace {
-  template<class ExecSpace>
-  struct SpaceInstance {
-    static ExecSpace create() {
-      return ExecSpace();
-    }
-    static void destroy(ExecSpace&) {
-    }
-    static bool overlap() {
-      return false;
-    }
-  };
+template <class ExecSpace>
+struct SpaceInstance {
+  static ExecSpace create() { return ExecSpace(); }
+  static void destroy(ExecSpace&) {}
+  static bool overlap() { return false; }
+};
 
-  #ifndef KOKKOS_ENABLE_DEBUG
-  #ifdef KOKKOS_ENABLE_CUDA
-  template<>
-  struct SpaceInstance<Kokkos::Cuda> {
-    static Kokkos::Cuda create() {
-      cudaStream_t stream;
-      cudaStreamCreate(&stream);
-      return Kokkos::Cuda(stream);
+#ifndef KOKKOS_ENABLE_DEBUG
+#ifdef KOKKOS_ENABLE_CUDA
+template <>
+struct SpaceInstance<Kokkos::Cuda> {
+  static Kokkos::Cuda create() {
+    cudaStream_t stream;
+    cudaStreamCreate(&stream);
+    return Kokkos::Cuda(stream);
+  }
+  static void destroy(Kokkos::Cuda& space) {
+    cudaStream_t stream = space.cuda_stream();
+    cudaStreamDestroy(stream);
+  }
+  static bool overlap() {
+    bool value          = true;
+    auto local_rank_str = std::getenv("CUDA_LAUNCH_BLOCKING");
+    if (local_rank_str) {
+      value = (std::atoi(local_rank_str) == 0);
     }
-    static void destroy(Kokkos::Cuda& space) {
-      cudaStream_t stream = space.cuda_stream();
-      cudaStreamDestroy(stream);
-    }
-    static bool overlap() {
-      bool value = true;
-      auto local_rank_str = std::getenv("CUDA_LAUNCH_BLOCKING");
-      if(local_rank_str) {
-        value = (std::atoi(local_rank_str)==0);
-      }
-      return value;
-    }
-  };
-  #endif
-  #endif
-}
+    return value;
+  }
+};
+#endif
+#endif
+}  // namespace
 
 struct FunctorRange {
-  int M,R;
-  Kokkos::View<double**,TEST_EXECSPACE> a;
-  FunctorRange(int M_, int R_, Kokkos::View<double**,TEST_EXECSPACE> a_):M(M_),R(R_),a(a_){}
+  int M, R;
+  Kokkos::View<double**, TEST_EXECSPACE> a;
+  FunctorRange(int M_, int R_, Kokkos::View<double**, TEST_EXECSPACE> a_)
+      : M(M_), R(R_), a(a_) {}
   KOKKOS_INLINE_FUNCTION
-  void operator() (const int i) const {
-    for(int r=0;r<R;r++)
-    for(int j=0;j<M;j++) {
-      a(i,j)+=1.0;
-    }
+  void operator()(const int i) const {
+    for (int r = 0; r < R; r++)
+      for (int j = 0; j < M; j++) {
+        a(i, j) += 1.0;
+      }
   }
 };
 
 struct FunctorMDRange {
-  int M,R;
-  Kokkos::View<double**,TEST_EXECSPACE> a;
-  FunctorMDRange(int M_, int R_, Kokkos::View<double**,TEST_EXECSPACE> a_):M(M_),R(R_),a(a_){}
+  int M, R;
+  Kokkos::View<double**, TEST_EXECSPACE> a;
+  FunctorMDRange(int M_, int R_, Kokkos::View<double**, TEST_EXECSPACE> a_)
+      : M(M_), R(R_), a(a_) {}
   KOKKOS_INLINE_FUNCTION
-  void operator() (const int i, const int) const {
-    for(int j=0;j<M;j++)
-      a(i,j)+=1.0;
+  void operator()(const int i, const int) const {
+    for (int j = 0; j < M; j++) a(i, j) += 1.0;
   }
 };
 
 struct FunctorTeam {
-  int M,R;
-  Kokkos::View<double**,Kokkos::LayoutRight,TEST_EXECSPACE> a;
-  FunctorTeam(int M_, int R_, Kokkos::View<double**,Kokkos::LayoutRight,TEST_EXECSPACE> a_):M(M_),R(R_),a(a_){}
+  int M, R;
+  Kokkos::View<double**, Kokkos::LayoutRight, TEST_EXECSPACE> a;
+  FunctorTeam(int M_, int R_,
+              Kokkos::View<double**, Kokkos::LayoutRight, TEST_EXECSPACE> a_)
+      : M(M_), R(R_), a(a_) {}
   KOKKOS_INLINE_FUNCTION
-  void operator() (const Kokkos::TeamPolicy<TEST_EXECSPACE>::member_type& team) const {
+  void operator()(
+      const Kokkos::TeamPolicy<TEST_EXECSPACE>::member_type& team) const {
     int i = team.league_rank();
-    for(int r=0;r<R;r++) {
-      Kokkos::parallel_for(Kokkos::TeamThreadRange(team,M), [&] (const int j) {
-        a(i,j)+=1.0;
-      });
+    for (int r = 0; r < R; r++) {
+      Kokkos::parallel_for(Kokkos::TeamThreadRange(team, M),
+                           [&](const int j) { a(i, j) += 1.0; });
     }
   }
 };
 
 struct FunctorRangeReduce {
-  int M,R;
-  Kokkos::View<double**,TEST_EXECSPACE> a;
-  FunctorRangeReduce(int M_, int R_, Kokkos::View<double**,TEST_EXECSPACE> a_):M(M_),R(R_),a(a_){}
+  int M, R;
+  Kokkos::View<double**, TEST_EXECSPACE> a;
+  FunctorRangeReduce(int M_, int R_, Kokkos::View<double**, TEST_EXECSPACE> a_)
+      : M(M_), R(R_), a(a_) {}
   KOKKOS_INLINE_FUNCTION
-  void operator() (const int i, double& tmp) const {
-    for(int r=0;r<R;r++)
-    for(int j=0;j<M;j++) {
-      tmp += a(i,j);
-    }
+  void operator()(const int i, double& tmp) const {
+    for (int r = 0; r < R; r++)
+      for (int j = 0; j < M; j++) {
+        tmp += a(i, j);
+      }
   }
 };
 
 struct FunctorMDRangeReduce {
-  int M,R;
-  Kokkos::View<double**,TEST_EXECSPACE> a;
-  FunctorMDRangeReduce(int M_, int R_, Kokkos::View<double**,TEST_EXECSPACE> a_):M(M_),R(R_),a(a_){}
+  int M, R;
+  Kokkos::View<double**, TEST_EXECSPACE> a;
+  FunctorMDRangeReduce(int M_, int R_,
+                       Kokkos::View<double**, TEST_EXECSPACE> a_)
+      : M(M_), R(R_), a(a_) {}
   KOKKOS_INLINE_FUNCTION
-  void operator() (const int i, const int, double& tmp) const {
-    for(int j=0;j<M;j++)
-      tmp += a(i,j);
+  void operator()(const int i, const int, double& tmp) const {
+    for (int j = 0; j < M; j++) tmp += a(i, j);
   }
 };
 
 struct FunctorTeamReduce {
-  int M,R;
-  Kokkos::View<double**,Kokkos::LayoutRight,TEST_EXECSPACE> a;
-  FunctorTeamReduce(int M_, int R_, Kokkos::View<double**,Kokkos::LayoutRight,TEST_EXECSPACE> a_):M(M_),R(R_),a(a_){}
+  int M, R;
+  Kokkos::View<double**, Kokkos::LayoutRight, TEST_EXECSPACE> a;
+  FunctorTeamReduce(
+      int M_, int R_,
+      Kokkos::View<double**, Kokkos::LayoutRight, TEST_EXECSPACE> a_)
+      : M(M_), R(R_), a(a_) {}
   KOKKOS_INLINE_FUNCTION
-  void operator() (const Kokkos::TeamPolicy<TEST_EXECSPACE>::member_type& team, double& tmp) const {
+  void operator()(const Kokkos::TeamPolicy<TEST_EXECSPACE>::member_type& team,
+                  double& tmp) const {
     int i = team.league_rank();
-    for(int r=0;r<R;r++) {
+    for (int r = 0; r < R; r++) {
       double val;
-      Kokkos::parallel_reduce(Kokkos::TeamThreadRange(team,M), [&] (const int j, double& tmp2) {
-        tmp2 += a(i,j);
-      },val);
-      tmp+=val;
+      Kokkos::parallel_reduce(
+          Kokkos::TeamThreadRange(team, M),
+          [&](const int j, double& tmp2) { tmp2 += a(i, j); }, val);
+      tmp += val;
     }
   }
 };
 
-TEST_F( default_exec, overlap_range_policy ) {
+TEST(default_exec, overlap_range_policy) {
   int N = 2000;
-   int M = 10000;
-   int R =  10;
+  int M = 10000;
+  int R = 10;
 
-   TEST_EXECSPACE space;
-   TEST_EXECSPACE space1 = SpaceInstance<TEST_EXECSPACE>::create();
-   TEST_EXECSPACE space2 = SpaceInstance<TEST_EXECSPACE>::create();
+  TEST_EXECSPACE space;
+  TEST_EXECSPACE space1 = SpaceInstance<TEST_EXECSPACE>::create();
+  TEST_EXECSPACE space2 = SpaceInstance<TEST_EXECSPACE>::create();
 
-   Kokkos::View<double**,TEST_EXECSPACE> a("A",N,M);
-   FunctorRange f(M,R,a);
-   FunctorRangeReduce fr(M,R,a);
-   Kokkos::parallel_for("default_exec::overlap_range_policy::kernel0",
-       Kokkos::RangePolicy<TEST_EXECSPACE>(0,N), FunctorRange(M,R,a));
+  Kokkos::View<double**, TEST_EXECSPACE> a("A", N, M);
+  FunctorRange f(M, R, a);
+  FunctorRangeReduce fr(M, R, a);
+  Kokkos::parallel_for("default_exec::overlap_range_policy::kernel0",
+                       Kokkos::RangePolicy<TEST_EXECSPACE>(0, N),
+                       FunctorRange(M, R, a));
 
-   Kokkos::parallel_for("default_exec::overlap_range_policy::kernel1",
-       Kokkos::Experimental::require(
-           Kokkos::RangePolicy<TEST_EXECSPACE>(space1,0,N),
-           Kokkos::Experimental::WorkItemProperty::HintLightWeight)
-       , f);
-   Kokkos::parallel_for("default_exec::overlap_range_policy::kernel2",
-       Kokkos::Experimental::require(
-           Kokkos::RangePolicy<TEST_EXECSPACE>(space2,0,N),
-           Kokkos::Experimental::WorkItemProperty::HintLightWeight)
-       , f);
-   Kokkos::fence();
+  Kokkos::parallel_for(
+      "default_exec::overlap_range_policy::kernel1",
+      Kokkos::Experimental::require(
+          Kokkos::RangePolicy<TEST_EXECSPACE>(space1, 0, N),
+          Kokkos::Experimental::WorkItemProperty::HintLightWeight),
+      f);
+  Kokkos::parallel_for(
+      "default_exec::overlap_range_policy::kernel2",
+      Kokkos::Experimental::require(
+          Kokkos::RangePolicy<TEST_EXECSPACE>(space2, 0, N),
+          Kokkos::Experimental::WorkItemProperty::HintLightWeight),
+      f);
+  Kokkos::fence();
 
-   Kokkos::Timer timer;
-   Kokkos::parallel_for("default_exec::overlap_range_policy::kernel3",
-       Kokkos::Experimental::require(
-           Kokkos::RangePolicy<TEST_EXECSPACE>(space,0,N),
-           Kokkos::Experimental::WorkItemProperty::HintLightWeight)
-       , f);
-   Kokkos::parallel_for("default_exec::overlap_range_policy::kernel4",
-       Kokkos::Experimental::require(
-           Kokkos::RangePolicy<TEST_EXECSPACE>(space,0,N),
-           Kokkos::Experimental::WorkItemProperty::HintLightWeight)
-       , f);
-   Kokkos::fence();
+  Kokkos::Timer timer;
+  Kokkos::parallel_for(
+      "default_exec::overlap_range_policy::kernel3",
+      Kokkos::Experimental::require(
+          Kokkos::RangePolicy<TEST_EXECSPACE>(space, 0, N),
+          Kokkos::Experimental::WorkItemProperty::HintLightWeight),
+      f);
+  Kokkos::parallel_for(
+      "default_exec::overlap_range_policy::kernel4",
+      Kokkos::Experimental::require(
+          Kokkos::RangePolicy<TEST_EXECSPACE>(space, 0, N),
+          Kokkos::Experimental::WorkItemProperty::HintLightWeight),
+      f);
+  Kokkos::fence();
 
-   timer.reset();
-   Kokkos::parallel_for("default_exec::overlap_range_policy::kernel5",
-       Kokkos::Experimental::require(
-           Kokkos::RangePolicy<TEST_EXECSPACE>(space1,0,N),
-           Kokkos::Experimental::WorkItemProperty::HintLightWeight)
-       , FunctorRange(M,R,a));
-   Kokkos::parallel_for("default_exec::overlap_range_policy::kernel6",
-       Kokkos::Experimental::require(
-           Kokkos::RangePolicy<TEST_EXECSPACE>(space2,0,N),
-           Kokkos::Experimental::WorkItemProperty::HintLightWeight)
-       , FunctorRange(M,R,a));
-   Kokkos::fence();
-   double time_overlap = timer.seconds();
+  timer.reset();
+  Kokkos::parallel_for(
+      "default_exec::overlap_range_policy::kernel5",
+      Kokkos::Experimental::require(
+          Kokkos::RangePolicy<TEST_EXECSPACE>(space1, 0, N),
+          Kokkos::Experimental::WorkItemProperty::HintLightWeight),
+      FunctorRange(M, R, a));
+  Kokkos::parallel_for(
+      "default_exec::overlap_range_policy::kernel6",
+      Kokkos::Experimental::require(
+          Kokkos::RangePolicy<TEST_EXECSPACE>(space2, 0, N),
+          Kokkos::Experimental::WorkItemProperty::HintLightWeight),
+      FunctorRange(M, R, a));
+  Kokkos::fence();
+  double time_overlap = timer.seconds();
 
-   timer.reset();
-   Kokkos::parallel_for("default_exec::overlap_range_policy::kernel7",
-       Kokkos::Experimental::require(
-           Kokkos::RangePolicy<TEST_EXECSPACE>(space,0,N),
-           Kokkos::Experimental::WorkItemProperty::HintLightWeight)
-       , f);
-   Kokkos::parallel_for("default_exec::overlap_range_policy::kernel8",
-       Kokkos::Experimental::require(
-           Kokkos::RangePolicy<TEST_EXECSPACE>(space,0,N),
-           Kokkos::Experimental::WorkItemProperty::HintLightWeight)
-       , f);
-   Kokkos::fence();
-   double time_end = timer.seconds();
+  timer.reset();
+  Kokkos::parallel_for(
+      "default_exec::overlap_range_policy::kernel7",
+      Kokkos::Experimental::require(
+          Kokkos::RangePolicy<TEST_EXECSPACE>(space, 0, N),
+          Kokkos::Experimental::WorkItemProperty::HintLightWeight),
+      f);
+  Kokkos::parallel_for(
+      "default_exec::overlap_range_policy::kernel8",
+      Kokkos::Experimental::require(
+          Kokkos::RangePolicy<TEST_EXECSPACE>(space, 0, N),
+          Kokkos::Experimental::WorkItemProperty::HintLightWeight),
+      f);
+  Kokkos::fence();
+  double time_end = timer.seconds();
 
-   if(SpaceInstance<TEST_EXECSPACE>::overlap()) {
-     ASSERT_TRUE( (time_end > 1.5*time_overlap) );
-   }
-   printf("Time RangePolicy: NonOverlap: %lf Time Overlap: %lf\n",time_end,time_overlap);
+  if (SpaceInstance<TEST_EXECSPACE>::overlap()) {
+    ASSERT_TRUE((time_end > 1.5 * time_overlap));
+  }
+  printf("Time RangePolicy: NonOverlap: %lf Time Overlap: %lf\n", time_end,
+         time_overlap);
 
-   Kokkos::View<double,TEST_EXECSPACE> result("result");
-   Kokkos::View<double,TEST_EXECSPACE> result1("result1");
-   Kokkos::View<double,TEST_EXECSPACE> result2("result2");
-   Kokkos::View<double,Kokkos::HostSpace> h_result("h_result");
-   Kokkos::View<double,Kokkos::HostSpace> h_result1("h_result1");
-   Kokkos::View<double,Kokkos::HostSpace> h_result2("h_result2");
+  Kokkos::View<double, TEST_EXECSPACE> result("result");
+  Kokkos::View<double, TEST_EXECSPACE> result1("result1");
+  Kokkos::View<double, TEST_EXECSPACE> result2("result2");
+  Kokkos::View<double, Kokkos::HostSpace> h_result("h_result");
+  Kokkos::View<double, Kokkos::HostSpace> h_result1("h_result1");
+  Kokkos::View<double, Kokkos::HostSpace> h_result2("h_result2");
 
-   timer.reset();
-   Kokkos::parallel_reduce("default_exec::overlap_range_policy::kernel_reduce",
-       Kokkos::Experimental::require(
-           Kokkos::RangePolicy<TEST_EXECSPACE>(space,0,N),
-           Kokkos::Experimental::WorkItemProperty::HintLightWeight)
-       , fr, result);
-   Kokkos::fence();
-   double time_fenced = timer.seconds();
-   Kokkos::deep_copy(h_result,result);
-   
-   timer.reset();  
-   Kokkos::parallel_reduce("default_exec::overlap_range_policy::kernel_reduce",
-       Kokkos::Experimental::require(
-           Kokkos::RangePolicy<TEST_EXECSPACE>(space,0,N),
-           Kokkos::Experimental::WorkItemProperty::HintLightWeight)
-       , fr, result);   
-   double time_not_fenced = timer.seconds();
-   Kokkos::fence();
-   if(SpaceInstance<TEST_EXECSPACE>::overlap()) {
-     ASSERT_TRUE(time_fenced>2.0*time_not_fenced);
-   }
+  timer.reset();
+  Kokkos::parallel_reduce(
+      "default_exec::overlap_range_policy::kernel_reduce",
+      Kokkos::Experimental::require(
+          Kokkos::RangePolicy<TEST_EXECSPACE>(space, 0, N),
+          Kokkos::Experimental::WorkItemProperty::HintLightWeight),
+      fr, result);
+  Kokkos::fence();
+  double time_fenced = timer.seconds();
+  Kokkos::deep_copy(h_result, result);
 
-   timer.reset();
-   Kokkos::parallel_reduce("default_exec::overlap_range_policy::kernel_reduce",
-       Kokkos::Experimental::require(
-           Kokkos::RangePolicy<TEST_EXECSPACE>(space,0,N),
-           Kokkos::Experimental::WorkItemProperty::HintLightWeight)
-       , fr, result);
-   Kokkos::parallel_reduce("default_exec::overlap_range_policy::kernel_reduce",
-       Kokkos::Experimental::require(
-           Kokkos::RangePolicy<TEST_EXECSPACE>(space,0,N),
-           Kokkos::Experimental::WorkItemProperty::HintLightWeight)
-       , fr, result);
+  timer.reset();
+  Kokkos::parallel_reduce(
+      "default_exec::overlap_range_policy::kernel_reduce",
+      Kokkos::Experimental::require(
+          Kokkos::RangePolicy<TEST_EXECSPACE>(space, 0, N),
+          Kokkos::Experimental::WorkItemProperty::HintLightWeight),
+      fr, result);
+  double time_not_fenced = timer.seconds();
+  Kokkos::fence();
+  if (SpaceInstance<TEST_EXECSPACE>::overlap()) {
+    ASSERT_TRUE(time_fenced > 2.0 * time_not_fenced);
+  }
+
+  timer.reset();
+  Kokkos::parallel_reduce(
+      "default_exec::overlap_range_policy::kernel_reduce",
+      Kokkos::Experimental::require(
+          Kokkos::RangePolicy<TEST_EXECSPACE>(space, 0, N),
+          Kokkos::Experimental::WorkItemProperty::HintLightWeight),
+      fr, result);
+  Kokkos::parallel_reduce(
+      "default_exec::overlap_range_policy::kernel_reduce",
+      Kokkos::Experimental::require(
+          Kokkos::RangePolicy<TEST_EXECSPACE>(space, 0, N),
+          Kokkos::Experimental::WorkItemProperty::HintLightWeight),
+      fr, result);
   Kokkos::fence();
   double time_no_overlapped_reduce = timer.seconds();
 
-   timer.reset();
-   Kokkos::parallel_reduce("default_exec::overlap_range_policy::kernel_reduce",
-       Kokkos::Experimental::require(
-           Kokkos::RangePolicy<TEST_EXECSPACE>(space1,0,N),
-           Kokkos::Experimental::WorkItemProperty::HintLightWeight)
-       , fr, result1);
-   Kokkos::parallel_reduce("default_exec::overlap_range_policy::kernel_reduce",
-       Kokkos::Experimental::require(
-           Kokkos::RangePolicy<TEST_EXECSPACE>(space2,0,N),
-           Kokkos::Experimental::WorkItemProperty::HintLightWeight)
-       , fr, result2);
+  timer.reset();
+  Kokkos::parallel_reduce(
+      "default_exec::overlap_range_policy::kernel_reduce",
+      Kokkos::Experimental::require(
+          Kokkos::RangePolicy<TEST_EXECSPACE>(space1, 0, N),
+          Kokkos::Experimental::WorkItemProperty::HintLightWeight),
+      fr, result1);
+  Kokkos::parallel_reduce(
+      "default_exec::overlap_range_policy::kernel_reduce",
+      Kokkos::Experimental::require(
+          Kokkos::RangePolicy<TEST_EXECSPACE>(space2, 0, N),
+          Kokkos::Experimental::WorkItemProperty::HintLightWeight),
+      fr, result2);
   Kokkos::fence();
   double time_overlapped_reduce = timer.seconds();
 
-  Kokkos::deep_copy(h_result2,result2);
-  Kokkos::deep_copy(h_result1,result1);
+  Kokkos::deep_copy(h_result2, result2);
+  Kokkos::deep_copy(h_result1, result1);
 
-  ASSERT_EQ(h_result1(),h_result()); 
-  ASSERT_EQ(h_result2(),h_result()); 
+  ASSERT_EQ(h_result1(), h_result());
+  ASSERT_EQ(h_result2(), h_result());
 
-   if(SpaceInstance<TEST_EXECSPACE>::overlap()) {
-     ASSERT_TRUE(time_overlapped_reduce < 1.5*time_no_overlapped_reduce);
-   }
-   printf("Time RangePolicy Reduce: NonOverlap: %lf Time Overlap: %lf\n",time_no_overlapped_reduce,time_overlapped_reduce);
-   SpaceInstance<TEST_EXECSPACE>::destroy(space1);
-   SpaceInstance<TEST_EXECSPACE>::destroy(space2);
+  if (SpaceInstance<TEST_EXECSPACE>::overlap()) {
+    ASSERT_TRUE(time_overlapped_reduce < 1.5 * time_no_overlapped_reduce);
+  }
+  printf("Time RangePolicy Reduce: NonOverlap: %lf Time Overlap: %lf\n",
+         time_no_overlapped_reduce, time_overlapped_reduce);
+  SpaceInstance<TEST_EXECSPACE>::destroy(space1);
+  SpaceInstance<TEST_EXECSPACE>::destroy(space2);
 }
 
-TEST_F( default_exec, overlap_mdrange_policy ) {
-   int N = 200;
-   int M = 10000;
-   int R =  10;
+TEST(default_exec, overlap_mdrange_policy) {
+  int N = 200;
+  int M = 10000;
+  int R = 10;
 
-   TEST_EXECSPACE space;
-   TEST_EXECSPACE space1 = SpaceInstance<TEST_EXECSPACE>::create();
-   TEST_EXECSPACE space2 = SpaceInstance<TEST_EXECSPACE>::create();
+  TEST_EXECSPACE space;
+  TEST_EXECSPACE space1 = SpaceInstance<TEST_EXECSPACE>::create();
+  TEST_EXECSPACE space2 = SpaceInstance<TEST_EXECSPACE>::create();
 
-   Kokkos::View<double**,TEST_EXECSPACE> a("A",N,M);
-   FunctorMDRange f(M,R,a);
-   FunctorMDRangeReduce fr(M,R,a);
-   Kokkos::parallel_for("default_exec::overlap_range_policy::kernel0",
-       Kokkos::Experimental::require(
-           Kokkos::MDRangePolicy<TEST_EXECSPACE,Kokkos::Rank<2>>({0,0},{N,R}),
-           Kokkos::Experimental::WorkItemProperty::HintLightWeight)
-       , FunctorMDRange(M,R,a));
+  Kokkos::View<double**, TEST_EXECSPACE> a("A", N, M);
+  FunctorMDRange f(M, R, a);
+  FunctorMDRangeReduce fr(M, R, a);
+  Kokkos::parallel_for(
+      "default_exec::overlap_range_policy::kernel0",
+      Kokkos::Experimental::require(
+          Kokkos::MDRangePolicy<TEST_EXECSPACE, Kokkos::Rank<2>>({0, 0},
+                                                                 {N, R}),
+          Kokkos::Experimental::WorkItemProperty::HintLightWeight),
+      FunctorMDRange(M, R, a));
 
-   Kokkos::parallel_for("default_exec::overlap_range_policy::kernel1",
-       Kokkos::Experimental::require(
-           Kokkos::MDRangePolicy<TEST_EXECSPACE,Kokkos::Rank<2>>(space1,{0,0},{N,R}),
-           Kokkos::Experimental::WorkItemProperty::HintLightWeight)
-       , f);
-   Kokkos::parallel_for("default_exec::overlap_range_policy::kernel2",
-       Kokkos::Experimental::require(
-           Kokkos::MDRangePolicy<TEST_EXECSPACE,Kokkos::Rank<2>>(space2,{0,0},{N,R}),
-           Kokkos::Experimental::WorkItemProperty::HintLightWeight)
-       , f);
-   Kokkos::fence();
+  Kokkos::parallel_for(
+      "default_exec::overlap_range_policy::kernel1",
+      Kokkos::Experimental::require(
+          Kokkos::MDRangePolicy<TEST_EXECSPACE, Kokkos::Rank<2>>(space1, {0, 0},
+                                                                 {N, R}),
+          Kokkos::Experimental::WorkItemProperty::HintLightWeight),
+      f);
+  Kokkos::parallel_for(
+      "default_exec::overlap_range_policy::kernel2",
+      Kokkos::Experimental::require(
+          Kokkos::MDRangePolicy<TEST_EXECSPACE, Kokkos::Rank<2>>(space2, {0, 0},
+                                                                 {N, R}),
+          Kokkos::Experimental::WorkItemProperty::HintLightWeight),
+      f);
+  Kokkos::fence();
 
-   Kokkos::Timer timer;
-   Kokkos::parallel_for("default_exec::overlap_range_policy::kernel3",
-       Kokkos::Experimental::require(
-           Kokkos::MDRangePolicy<TEST_EXECSPACE,Kokkos::Rank<2>>(space,{0,0},{N,R}),
-           Kokkos::Experimental::WorkItemProperty::HintLightWeight)
-       , f);
-   Kokkos::parallel_for("default_exec::overlap_range_policy::kernel4",
-       Kokkos::Experimental::require(
-           Kokkos::MDRangePolicy<TEST_EXECSPACE,Kokkos::Rank<2>>(space,{0,0},{N,R}),
-           Kokkos::Experimental::WorkItemProperty::HintLightWeight)
-       , f);
-   Kokkos::fence();
+  Kokkos::Timer timer;
+  Kokkos::parallel_for(
+      "default_exec::overlap_range_policy::kernel3",
+      Kokkos::Experimental::require(
+          Kokkos::MDRangePolicy<TEST_EXECSPACE, Kokkos::Rank<2>>(space, {0, 0},
+                                                                 {N, R}),
+          Kokkos::Experimental::WorkItemProperty::HintLightWeight),
+      f);
+  Kokkos::parallel_for(
+      "default_exec::overlap_range_policy::kernel4",
+      Kokkos::Experimental::require(
+          Kokkos::MDRangePolicy<TEST_EXECSPACE, Kokkos::Rank<2>>(space, {0, 0},
+                                                                 {N, R}),
+          Kokkos::Experimental::WorkItemProperty::HintLightWeight),
+      f);
+  Kokkos::fence();
 
-   timer.reset();
-   Kokkos::parallel_for("default_exec::overlap_range_policy::kernel5",
-       Kokkos::Experimental::require(
-           Kokkos::MDRangePolicy<TEST_EXECSPACE,Kokkos::Rank<2>>(space1,{0,0},{N,R}),
-           Kokkos::Experimental::WorkItemProperty::HintLightWeight)
-       , FunctorMDRange(M,R,a));
-   Kokkos::parallel_for("default_exec::overlap_range_policy::kernel6",
-       Kokkos::Experimental::require(
-           Kokkos::MDRangePolicy<TEST_EXECSPACE,Kokkos::Rank<2>>(space2,{0,0},{N,R}),
-           Kokkos::Experimental::WorkItemProperty::HintLightWeight)
-       , FunctorMDRange(M,R,a));
-   Kokkos::fence();
-   double time_overlap = timer.seconds();
+  timer.reset();
+  Kokkos::parallel_for(
+      "default_exec::overlap_range_policy::kernel5",
+      Kokkos::Experimental::require(
+          Kokkos::MDRangePolicy<TEST_EXECSPACE, Kokkos::Rank<2>>(space1, {0, 0},
+                                                                 {N, R}),
+          Kokkos::Experimental::WorkItemProperty::HintLightWeight),
+      FunctorMDRange(M, R, a));
+  Kokkos::parallel_for(
+      "default_exec::overlap_range_policy::kernel6",
+      Kokkos::Experimental::require(
+          Kokkos::MDRangePolicy<TEST_EXECSPACE, Kokkos::Rank<2>>(space2, {0, 0},
+                                                                 {N, R}),
+          Kokkos::Experimental::WorkItemProperty::HintLightWeight),
+      FunctorMDRange(M, R, a));
+  Kokkos::fence();
+  double time_overlap = timer.seconds();
 
-   timer.reset();
-   Kokkos::parallel_for("default_exec::overlap_range_policy::kernel7",
-       Kokkos::Experimental::require(
-           Kokkos::MDRangePolicy<TEST_EXECSPACE,Kokkos::Rank<2>>(space,{0,0},{N,R}),
-           Kokkos::Experimental::WorkItemProperty::HintLightWeight)
-       , f);
-   Kokkos::parallel_for("default_exec::overlap_range_policy::kernel8",
-       Kokkos::Experimental::require(
-           Kokkos::MDRangePolicy<TEST_EXECSPACE,Kokkos::Rank<2>>(space,{0,0},{N,R}),
-           Kokkos::Experimental::WorkItemProperty::HintLightWeight)
-       , f);
-   Kokkos::fence();
-   double time_end = timer.seconds();
+  timer.reset();
+  Kokkos::parallel_for(
+      "default_exec::overlap_range_policy::kernel7",
+      Kokkos::Experimental::require(
+          Kokkos::MDRangePolicy<TEST_EXECSPACE, Kokkos::Rank<2>>(space, {0, 0},
+                                                                 {N, R}),
+          Kokkos::Experimental::WorkItemProperty::HintLightWeight),
+      f);
+  Kokkos::parallel_for(
+      "default_exec::overlap_range_policy::kernel8",
+      Kokkos::Experimental::require(
+          Kokkos::MDRangePolicy<TEST_EXECSPACE, Kokkos::Rank<2>>(space, {0, 0},
+                                                                 {N, R}),
+          Kokkos::Experimental::WorkItemProperty::HintLightWeight),
+      f);
+  Kokkos::fence();
+  double time_end = timer.seconds();
 
-   if(SpaceInstance<TEST_EXECSPACE>::overlap()) {
-     ASSERT_TRUE( (time_end > 1.5*time_overlap) );
-   }
-   printf("Time MDRangePolicy: NonOverlap: %lf Time Overlap: %lf\n",time_end,time_overlap);
+  if (SpaceInstance<TEST_EXECSPACE>::overlap()) {
+    ASSERT_TRUE((time_end > 1.5 * time_overlap));
+  }
+  printf("Time MDRangePolicy: NonOverlap: %lf Time Overlap: %lf\n", time_end,
+         time_overlap);
 
-   Kokkos::View<double,TEST_EXECSPACE> result("result");
-   Kokkos::View<double,TEST_EXECSPACE> result1("result1");
-   Kokkos::View<double,TEST_EXECSPACE> result2("result2");
-   Kokkos::View<double,Kokkos::HostSpace> h_result("h_result");
-   Kokkos::View<double,Kokkos::HostSpace> h_result1("h_result1");
-   Kokkos::View<double,Kokkos::HostSpace> h_result2("h_result2");
+  Kokkos::View<double, TEST_EXECSPACE> result("result");
+  Kokkos::View<double, TEST_EXECSPACE> result1("result1");
+  Kokkos::View<double, TEST_EXECSPACE> result2("result2");
+  Kokkos::View<double, Kokkos::HostSpace> h_result("h_result");
+  Kokkos::View<double, Kokkos::HostSpace> h_result1("h_result1");
+  Kokkos::View<double, Kokkos::HostSpace> h_result2("h_result2");
 
-   timer.reset();
-   Kokkos::parallel_reduce("default_exec::overlap_mdrange_policy::kernel_reduce",
-       Kokkos::Experimental::require(
-           Kokkos::MDRangePolicy<TEST_EXECSPACE,Kokkos::Rank<2>>(space,{0,0},{N,R}),
-           Kokkos::Experimental::WorkItemProperty::HintLightWeight)
-       , fr, result);
-   Kokkos::fence();
-   double time_fenced = timer.seconds();
-   Kokkos::deep_copy(h_result,result);
-   
-   timer.reset();  
-   Kokkos::parallel_reduce("default_exec::overlap_mdrange_policy::kernel_reduce",
-       Kokkos::Experimental::require(
-           Kokkos::MDRangePolicy<TEST_EXECSPACE,Kokkos::Rank<2>>(space,{0,0},{N,R}),
-           Kokkos::Experimental::WorkItemProperty::HintLightWeight)
-       , fr, result);   
-   double time_not_fenced = timer.seconds();
-   Kokkos::fence();
-   if(SpaceInstance<TEST_EXECSPACE>::overlap()) {
-     ASSERT_TRUE(time_fenced>2.0*time_not_fenced);
-   }
+  timer.reset();
+  Kokkos::parallel_reduce(
+      "default_exec::overlap_mdrange_policy::kernel_reduce",
+      Kokkos::Experimental::require(
+          Kokkos::MDRangePolicy<TEST_EXECSPACE, Kokkos::Rank<2>>(space, {0, 0},
+                                                                 {N, R}),
+          Kokkos::Experimental::WorkItemProperty::HintLightWeight),
+      fr, result);
+  Kokkos::fence();
+  double time_fenced = timer.seconds();
+  Kokkos::deep_copy(h_result, result);
 
-   timer.reset();
-   Kokkos::parallel_reduce("default_exec::overlap_mdrange_policy::kernel_reduce",
-       Kokkos::Experimental::require(
-           Kokkos::MDRangePolicy<TEST_EXECSPACE,Kokkos::Rank<2>>(space,{0,0},{N,R}),
-           Kokkos::Experimental::WorkItemProperty::HintLightWeight)
-       , fr, result);
-   Kokkos::parallel_reduce("default_exec::overlap_mdrange_policy::kernel_reduce",
-       Kokkos::Experimental::require(
-           Kokkos::MDRangePolicy<TEST_EXECSPACE,Kokkos::Rank<2>>(space,{0,0},{N,R}),
-           Kokkos::Experimental::WorkItemProperty::HintLightWeight)
-       , fr, result);
+  timer.reset();
+  Kokkos::parallel_reduce(
+      "default_exec::overlap_mdrange_policy::kernel_reduce",
+      Kokkos::Experimental::require(
+          Kokkos::MDRangePolicy<TEST_EXECSPACE, Kokkos::Rank<2>>(space, {0, 0},
+                                                                 {N, R}),
+          Kokkos::Experimental::WorkItemProperty::HintLightWeight),
+      fr, result);
+  double time_not_fenced = timer.seconds();
+  Kokkos::fence();
+  if (SpaceInstance<TEST_EXECSPACE>::overlap()) {
+    ASSERT_TRUE(time_fenced > 2.0 * time_not_fenced);
+  }
+
+  timer.reset();
+  Kokkos::parallel_reduce(
+      "default_exec::overlap_mdrange_policy::kernel_reduce",
+      Kokkos::Experimental::require(
+          Kokkos::MDRangePolicy<TEST_EXECSPACE, Kokkos::Rank<2>>(space, {0, 0},
+                                                                 {N, R}),
+          Kokkos::Experimental::WorkItemProperty::HintLightWeight),
+      fr, result);
+  Kokkos::parallel_reduce(
+      "default_exec::overlap_mdrange_policy::kernel_reduce",
+      Kokkos::Experimental::require(
+          Kokkos::MDRangePolicy<TEST_EXECSPACE, Kokkos::Rank<2>>(space, {0, 0},
+                                                                 {N, R}),
+          Kokkos::Experimental::WorkItemProperty::HintLightWeight),
+      fr, result);
   Kokkos::fence();
   double time_no_overlapped_reduce = timer.seconds();
 
-   timer.reset();
-   Kokkos::parallel_reduce("default_exec::overlap_mdrange_policy::kernel_reduce",
-       Kokkos::Experimental::require(
-           Kokkos::MDRangePolicy<TEST_EXECSPACE,Kokkos::Rank<2>>(space1,{0,0},{N,R}),
-           Kokkos::Experimental::WorkItemProperty::HintLightWeight)
-       , fr, result1);
-   Kokkos::parallel_reduce("default_exec::overlap_mdrange_policy::kernel_reduce",
-       Kokkos::Experimental::require(
-           Kokkos::MDRangePolicy<TEST_EXECSPACE,Kokkos::Rank<2>>(space2,{0,0},{N,R}),
-           Kokkos::Experimental::WorkItemProperty::HintLightWeight)
-       , fr, result2);
+  timer.reset();
+  Kokkos::parallel_reduce(
+      "default_exec::overlap_mdrange_policy::kernel_reduce",
+      Kokkos::Experimental::require(
+          Kokkos::MDRangePolicy<TEST_EXECSPACE, Kokkos::Rank<2>>(space1, {0, 0},
+                                                                 {N, R}),
+          Kokkos::Experimental::WorkItemProperty::HintLightWeight),
+      fr, result1);
+  Kokkos::parallel_reduce(
+      "default_exec::overlap_mdrange_policy::kernel_reduce",
+      Kokkos::Experimental::require(
+          Kokkos::MDRangePolicy<TEST_EXECSPACE, Kokkos::Rank<2>>(space2, {0, 0},
+                                                                 {N, R}),
+          Kokkos::Experimental::WorkItemProperty::HintLightWeight),
+      fr, result2);
   Kokkos::fence();
   double time_overlapped_reduce = timer.seconds();
 
-  Kokkos::deep_copy(h_result2,result2);
-  Kokkos::deep_copy(h_result1,result1);
+  Kokkos::deep_copy(h_result2, result2);
+  Kokkos::deep_copy(h_result1, result1);
 
-  ASSERT_EQ(h_result1(),h_result()); 
-  ASSERT_EQ(h_result2(),h_result()); 
-
-   if(SpaceInstance<TEST_EXECSPACE>::overlap()) {
-     ASSERT_TRUE(time_overlapped_reduce < 1.5*time_no_overlapped_reduce);
-   }
-   printf("Time MDRangePolicy Reduce: NonOverlap: %lf Time Overlap: %lf\n",time_no_overlapped_reduce,time_overlapped_reduce);
-   SpaceInstance<TEST_EXECSPACE>::destroy(space2);
-   SpaceInstance<TEST_EXECSPACE>::destroy(space1);
+  ASSERT_EQ(h_result1(), h_result());
+  ASSERT_EQ(h_result2(), h_result());
 
+  if (SpaceInstance<TEST_EXECSPACE>::overlap()) {
+    ASSERT_TRUE(time_overlapped_reduce < 1.5 * time_no_overlapped_reduce);
+  }
+  printf("Time MDRangePolicy Reduce: NonOverlap: %lf Time Overlap: %lf\n",
+         time_no_overlapped_reduce, time_overlapped_reduce);
+  SpaceInstance<TEST_EXECSPACE>::destroy(space2);
+  SpaceInstance<TEST_EXECSPACE>::destroy(space1);
 }
 
-TEST_F( default_exec, overlap_team_policy ) {
+TEST(default_exec, overlap_team_policy) {
   int N = 20;
-   int M = 1000000;
-   int R =  10;
+  int M = 1000000;
+  int R = 10;
 
-   TEST_EXECSPACE space;
-   TEST_EXECSPACE space1 = SpaceInstance<TEST_EXECSPACE>::create();
-   TEST_EXECSPACE space2 = SpaceInstance<TEST_EXECSPACE>::create();
+  TEST_EXECSPACE space;
+  TEST_EXECSPACE space1 = SpaceInstance<TEST_EXECSPACE>::create();
+  TEST_EXECSPACE space2 = SpaceInstance<TEST_EXECSPACE>::create();
 
-   Kokkos::View<double**,Kokkos::LayoutRight,TEST_EXECSPACE> a("A",N,M);
-   FunctorTeam f(M,R,a);
-   FunctorTeamReduce fr(M,R,a);
-   Kokkos::parallel_for("default_exec::overlap_range_policy::kernel0",
-       Kokkos::Experimental::require(
-           Kokkos::TeamPolicy<TEST_EXECSPACE>(N,Kokkos::AUTO),
-           Kokkos::Experimental::WorkItemProperty::HintLightWeight)
-       , FunctorTeam(M,R,a));
+  Kokkos::View<double**, Kokkos::LayoutRight, TEST_EXECSPACE> a("A", N, M);
+  FunctorTeam f(M, R, a);
+  FunctorTeamReduce fr(M, R, a);
+  Kokkos::parallel_for(
+      "default_exec::overlap_range_policy::kernel0",
+      Kokkos::Experimental::require(
+          Kokkos::TeamPolicy<TEST_EXECSPACE>(N, Kokkos::AUTO),
+          Kokkos::Experimental::WorkItemProperty::HintLightWeight),
+      FunctorTeam(M, R, a));
 
-   Kokkos::parallel_for("default_exec::overlap_range_policy::kernel1",
-       Kokkos::Experimental::require(
-           Kokkos::TeamPolicy<TEST_EXECSPACE>(space1,N,Kokkos::AUTO),
-           Kokkos::Experimental::WorkItemProperty::HintLightWeight)
-       , f);
-   Kokkos::parallel_for("default_exec::overlap_range_policy::kernel2",
-       Kokkos::Experimental::require(
-           Kokkos::TeamPolicy<TEST_EXECSPACE>(space2,N,Kokkos::AUTO),
-           Kokkos::Experimental::WorkItemProperty::HintLightWeight)
-       , f);
-   Kokkos::fence();
+  Kokkos::parallel_for(
+      "default_exec::overlap_range_policy::kernel1",
+      Kokkos::Experimental::require(
+          Kokkos::TeamPolicy<TEST_EXECSPACE>(space1, N, Kokkos::AUTO),
+          Kokkos::Experimental::WorkItemProperty::HintLightWeight),
+      f);
+  Kokkos::parallel_for(
+      "default_exec::overlap_range_policy::kernel2",
+      Kokkos::Experimental::require(
+          Kokkos::TeamPolicy<TEST_EXECSPACE>(space2, N, Kokkos::AUTO),
+          Kokkos::Experimental::WorkItemProperty::HintLightWeight),
+      f);
+  Kokkos::fence();
 
-   Kokkos::Timer timer;
-   Kokkos::parallel_for("default_exec::overlap_range_policy::kernel3",
-       Kokkos::Experimental::require(
-           Kokkos::TeamPolicy<TEST_EXECSPACE>(space,N,Kokkos::AUTO),
-           Kokkos::Experimental::WorkItemProperty::HintLightWeight)
-       , f);
-   Kokkos::parallel_for("default_exec::overlap_range_policy::kernel4",
-       Kokkos::Experimental::require(
-           Kokkos::TeamPolicy<TEST_EXECSPACE>(space,N,Kokkos::AUTO),
-           Kokkos::Experimental::WorkItemProperty::HintLightWeight)
-       , f);
-   Kokkos::fence();
+  Kokkos::Timer timer;
+  Kokkos::parallel_for(
+      "default_exec::overlap_range_policy::kernel3",
+      Kokkos::Experimental::require(
+          Kokkos::TeamPolicy<TEST_EXECSPACE>(space, N, Kokkos::AUTO),
+          Kokkos::Experimental::WorkItemProperty::HintLightWeight),
+      f);
+  Kokkos::parallel_for(
+      "default_exec::overlap_range_policy::kernel4",
+      Kokkos::Experimental::require(
+          Kokkos::TeamPolicy<TEST_EXECSPACE>(space, N, Kokkos::AUTO),
+          Kokkos::Experimental::WorkItemProperty::HintLightWeight),
+      f);
+  Kokkos::fence();
 
-   timer.reset();
-   Kokkos::parallel_for("default_exec::overlap_range_policy::kernel5",
-       Kokkos::Experimental::require(
-           Kokkos::TeamPolicy<TEST_EXECSPACE>(space1,N,Kokkos::AUTO),
-           Kokkos::Experimental::WorkItemProperty::HintLightWeight)
-       , FunctorTeam(M,R,a));
-   Kokkos::parallel_for("default_exec::overlap_range_policy::kernel6",
-       Kokkos::Experimental::require(
-           Kokkos::TeamPolicy<TEST_EXECSPACE>(space2,N,Kokkos::AUTO),
-           Kokkos::Experimental::WorkItemProperty::HintLightWeight)
-       , FunctorTeam(M,R,a));
-   Kokkos::fence();
-   double time_overlap = timer.seconds();
+  timer.reset();
+  Kokkos::parallel_for(
+      "default_exec::overlap_range_policy::kernel5",
+      Kokkos::Experimental::require(
+          Kokkos::TeamPolicy<TEST_EXECSPACE>(space1, N, Kokkos::AUTO),
+          Kokkos::Experimental::WorkItemProperty::HintLightWeight),
+      FunctorTeam(M, R, a));
+  Kokkos::parallel_for(
+      "default_exec::overlap_range_policy::kernel6",
+      Kokkos::Experimental::require(
+          Kokkos::TeamPolicy<TEST_EXECSPACE>(space2, N, Kokkos::AUTO),
+          Kokkos::Experimental::WorkItemProperty::HintLightWeight),
+      FunctorTeam(M, R, a));
+  Kokkos::fence();
+  double time_overlap = timer.seconds();
 
-   timer.reset();
-   Kokkos::parallel_for("default_exec::overlap_range_policy::kernel7",
-       Kokkos::Experimental::require(
-           Kokkos::TeamPolicy<TEST_EXECSPACE>(space,N,Kokkos::AUTO),
-           Kokkos::Experimental::WorkItemProperty::HintLightWeight)
-       , f);
-   Kokkos::parallel_for("default_exec::overlap_range_policy::kernel8",
-       Kokkos::Experimental::require(
-           Kokkos::TeamPolicy<TEST_EXECSPACE>(space,N,Kokkos::AUTO),
-           Kokkos::Experimental::WorkItemProperty::HintLightWeight)
-       , f);
-   Kokkos::fence();
-   double time_end = timer.seconds();
+  timer.reset();
+  Kokkos::parallel_for(
+      "default_exec::overlap_range_policy::kernel7",
+      Kokkos::Experimental::require(
+          Kokkos::TeamPolicy<TEST_EXECSPACE>(space, N, Kokkos::AUTO),
+          Kokkos::Experimental::WorkItemProperty::HintLightWeight),
+      f);
+  Kokkos::parallel_for(
+      "default_exec::overlap_range_policy::kernel8",
+      Kokkos::Experimental::require(
+          Kokkos::TeamPolicy<TEST_EXECSPACE>(space, N, Kokkos::AUTO),
+          Kokkos::Experimental::WorkItemProperty::HintLightWeight),
+      f);
+  Kokkos::fence();
+  double time_end = timer.seconds();
 
-   if(SpaceInstance<TEST_EXECSPACE>::overlap()) {
-     ASSERT_TRUE( (time_end > 1.5*time_overlap) );
-   }
-   printf("Time TeamPolicy: NonOverlap: %lf Time Overlap: %lf\n",time_end,time_overlap);
+  if (SpaceInstance<TEST_EXECSPACE>::overlap()) {
+    ASSERT_TRUE((time_end > 1.5 * time_overlap));
+  }
+  printf("Time TeamPolicy: NonOverlap: %lf Time Overlap: %lf\n", time_end,
+         time_overlap);
 
-   Kokkos::View<double,TEST_EXECSPACE> result("result");
-   Kokkos::View<double,TEST_EXECSPACE> result1("result1");
-   Kokkos::View<double,TEST_EXECSPACE> result2("result2");
-   Kokkos::View<double,Kokkos::HostSpace> h_result("h_result");
-   Kokkos::View<double,Kokkos::HostSpace> h_result1("h_result1");
-   Kokkos::View<double,Kokkos::HostSpace> h_result2("h_result2");
+  Kokkos::View<double, TEST_EXECSPACE> result("result");
+  Kokkos::View<double, TEST_EXECSPACE> result1("result1");
+  Kokkos::View<double, TEST_EXECSPACE> result2("result2");
+  Kokkos::View<double, Kokkos::HostSpace> h_result("h_result");
+  Kokkos::View<double, Kokkos::HostSpace> h_result1("h_result1");
+  Kokkos::View<double, Kokkos::HostSpace> h_result2("h_result2");
 
-   timer.reset();
-   Kokkos::parallel_reduce("default_exec::overlap_team_policy::kernel_reduce",
-       Kokkos::Experimental::require(
-           Kokkos::TeamPolicy<TEST_EXECSPACE>(space,N,Kokkos::AUTO),
-           Kokkos::Experimental::WorkItemProperty::HintLightWeight)
-       , fr, result);
-   Kokkos::fence();
-   double time_fenced = timer.seconds();
-   Kokkos::deep_copy(h_result,result);
-   
-   timer.reset();  
-   Kokkos::parallel_reduce("default_exec::overlap_team_policy::kernel_reduce",
-       Kokkos::Experimental::require(
-           Kokkos::TeamPolicy<TEST_EXECSPACE>(space,N,Kokkos::AUTO),
-           Kokkos::Experimental::WorkItemProperty::HintLightWeight)
-       , fr, result);   
-   double time_not_fenced = timer.seconds();
-   Kokkos::fence();
-   if(SpaceInstance<TEST_EXECSPACE>::overlap()) {
-     ASSERT_TRUE(time_fenced>2.0*time_not_fenced);
-   }
-   timer.reset();
-   Kokkos::parallel_reduce("default_exec::overlap_team_policy::kernel_reduce",
-       Kokkos::Experimental::require(
-           Kokkos::TeamPolicy<TEST_EXECSPACE>(space,N,Kokkos::AUTO),
-           Kokkos::Experimental::WorkItemProperty::HintLightWeight)
-       , fr, result);
-   Kokkos::parallel_reduce("default_exec::overlap_team_policy::kernel_reduce",
-       Kokkos::Experimental::require(
-           Kokkos::TeamPolicy<TEST_EXECSPACE>(space,N,Kokkos::AUTO),
-           Kokkos::Experimental::WorkItemProperty::HintLightWeight)
-       , fr, result);
+  timer.reset();
+  Kokkos::parallel_reduce(
+      "default_exec::overlap_team_policy::kernel_reduce",
+      Kokkos::Experimental::require(
+          Kokkos::TeamPolicy<TEST_EXECSPACE>(space, N, Kokkos::AUTO),
+          Kokkos::Experimental::WorkItemProperty::HintLightWeight),
+      fr, result);
+  Kokkos::fence();
+  double time_fenced = timer.seconds();
+  Kokkos::deep_copy(h_result, result);
+
+  timer.reset();
+  Kokkos::parallel_reduce(
+      "default_exec::overlap_team_policy::kernel_reduce",
+      Kokkos::Experimental::require(
+          Kokkos::TeamPolicy<TEST_EXECSPACE>(space, N, Kokkos::AUTO),
+          Kokkos::Experimental::WorkItemProperty::HintLightWeight),
+      fr, result);
+  double time_not_fenced = timer.seconds();
+  Kokkos::fence();
+  if (SpaceInstance<TEST_EXECSPACE>::overlap()) {
+    ASSERT_TRUE(time_fenced > 2.0 * time_not_fenced);
+  }
+  timer.reset();
+  Kokkos::parallel_reduce(
+      "default_exec::overlap_team_policy::kernel_reduce",
+      Kokkos::Experimental::require(
+          Kokkos::TeamPolicy<TEST_EXECSPACE>(space, N, Kokkos::AUTO),
+          Kokkos::Experimental::WorkItemProperty::HintLightWeight),
+      fr, result);
+  Kokkos::parallel_reduce(
+      "default_exec::overlap_team_policy::kernel_reduce",
+      Kokkos::Experimental::require(
+          Kokkos::TeamPolicy<TEST_EXECSPACE>(space, N, Kokkos::AUTO),
+          Kokkos::Experimental::WorkItemProperty::HintLightWeight),
+      fr, result);
   Kokkos::fence();
   double time_no_overlapped_reduce = timer.seconds();
 
-   timer.reset();
-   Kokkos::parallel_reduce("default_exec::overlap_team_policy::kernel_reduce",
-       Kokkos::Experimental::require(
-           Kokkos::TeamPolicy<TEST_EXECSPACE>(space1,N,Kokkos::AUTO),
-           Kokkos::Experimental::WorkItemProperty::HintLightWeight)
-       , fr, result1);
-   Kokkos::parallel_reduce("default_exec::overlap_team_policy::kernel_reduce",
-       Kokkos::Experimental::require(
-           Kokkos::TeamPolicy<TEST_EXECSPACE>(space2,N,Kokkos::AUTO),
-           Kokkos::Experimental::WorkItemProperty::HintLightWeight)
-       , fr, result2);
+  timer.reset();
+  Kokkos::parallel_reduce(
+      "default_exec::overlap_team_policy::kernel_reduce",
+      Kokkos::Experimental::require(
+          Kokkos::TeamPolicy<TEST_EXECSPACE>(space1, N, Kokkos::AUTO),
+          Kokkos::Experimental::WorkItemProperty::HintLightWeight),
+      fr, result1);
+  Kokkos::parallel_reduce(
+      "default_exec::overlap_team_policy::kernel_reduce",
+      Kokkos::Experimental::require(
+          Kokkos::TeamPolicy<TEST_EXECSPACE>(space2, N, Kokkos::AUTO),
+          Kokkos::Experimental::WorkItemProperty::HintLightWeight),
+      fr, result2);
   Kokkos::fence();
   double time_overlapped_reduce = timer.seconds();
 
-  Kokkos::deep_copy(h_result2,result2);
-  Kokkos::deep_copy(h_result1,result1);
+  Kokkos::deep_copy(h_result2, result2);
+  Kokkos::deep_copy(h_result1, result1);
 
-  ASSERT_EQ(h_result1(),h_result()); 
-  ASSERT_EQ(h_result2(),h_result()); 
+  ASSERT_EQ(h_result1(), h_result());
+  ASSERT_EQ(h_result2(), h_result());
 
-   if(SpaceInstance<TEST_EXECSPACE>::overlap()) {
-     ASSERT_TRUE(time_overlapped_reduce < 1.5*time_no_overlapped_reduce);
-   }
-   printf("Time TeamPolicy Reduce: NonOverlap: %lf Time Overlap: %lf\n",time_no_overlapped_reduce,time_overlapped_reduce);
-   SpaceInstance<TEST_EXECSPACE>::destroy(space1);
-   SpaceInstance<TEST_EXECSPACE>::destroy(space2);
-}
+  if (SpaceInstance<TEST_EXECSPACE>::overlap()) {
+    ASSERT_TRUE(time_overlapped_reduce < 1.5 * time_no_overlapped_reduce);
+  }
+  printf("Time TeamPolicy Reduce: NonOverlap: %lf Time Overlap: %lf\n",
+         time_no_overlapped_reduce, time_overlapped_reduce);
+  SpaceInstance<TEST_EXECSPACE>::destroy(space1);
+  SpaceInstance<TEST_EXECSPACE>::destroy(space2);
 }
+}  // namespace Test
diff --git a/lib/kokkos/core/perf_test/PerfTest_ViewAllocate.cpp b/lib/kokkos/core/perf_test/PerfTest_ViewAllocate.cpp
index 685194c150..550316bec9 100644
--- a/lib/kokkos/core/perf_test/PerfTest_ViewAllocate.cpp
+++ b/lib/kokkos/core/perf_test/PerfTest_ViewAllocate.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -48,102 +49,112 @@
 
 namespace Test {
 
-template<class Layout>
+template <class Layout>
 void run_allocateview_tests(int N, int R) {
   const int N1 = N;
-  const int N2 = N*N;
-  const int N3 = N2*N;
-  const int N4 = N2*N2;
-  const int N8 = N4*N4;
+  const int N2 = N * N;
+  const int N3 = N2 * N;
+  const int N4 = N2 * N2;
+  const int N8 = N4 * N4;
 
-  double time1,time2,time3,time4,time5,time6,time7,time8,time_raw = 100000.0;
+  double time1, time2, time3, time4, time5, time6, time7, time8,
+      time_raw = 100000.0;
   {
     Kokkos::Timer timer;
-    for(int r=0; r<R; r++) {
-      Kokkos::View<double*,Layout> a("A1",N8);
+    for (int r = 0; r < R; r++) {
+      Kokkos::View<double*, Layout> a("A1", N8);
     }
-    time1 = timer.seconds()/R;
+    time1 = timer.seconds() / R;
   }
   {
     Kokkos::Timer timer;
-    for(int r=0; r<R; r++) {
-      Kokkos::View<double**,Layout> a("A2",N4,N4);
+    for (int r = 0; r < R; r++) {
+      Kokkos::View<double**, Layout> a("A2", N4, N4);
     }
-    time2 = timer.seconds()/R;
+    time2 = timer.seconds() / R;
   }
   {
     Kokkos::Timer timer;
-    for(int r=0; r<R; r++) {
-      Kokkos::View<double***,Layout> a("A3",N3,N3,N2);
+    for (int r = 0; r < R; r++) {
+      Kokkos::View<double***, Layout> a("A3", N3, N3, N2);
     }
-    time3 = timer.seconds()/R;
+    time3 = timer.seconds() / R;
   }
   {
     Kokkos::Timer timer;
-    for(int r=0; r<R; r++) {
-      Kokkos::View<double****,Layout> a("A4",N2,N2,N2,N2);
+    for (int r = 0; r < R; r++) {
+      Kokkos::View<double****, Layout> a("A4", N2, N2, N2, N2);
     }
-    time4 = timer.seconds()/R;
+    time4 = timer.seconds() / R;
   }
   {
     Kokkos::Timer timer;
-    for(int r=0; r<R; r++) {
-      Kokkos::View<double*****,Layout> a("A5",N2,N2,N1,N1,N2);
+    for (int r = 0; r < R; r++) {
+      Kokkos::View<double*****, Layout> a("A5", N2, N2, N1, N1, N2);
     }
-    time5 = timer.seconds()/R;
+    time5 = timer.seconds() / R;
   }
   {
     Kokkos::Timer timer;
-    for(int r=0; r<R; r++) {
-      Kokkos::View<double******,Layout> a("A6",N2,N1,N1,N1,N1,N2);
+    for (int r = 0; r < R; r++) {
+      Kokkos::View<double******, Layout> a("A6", N2, N1, N1, N1, N1, N2);
     }
-    time6 = timer.seconds()/R;
+    time6 = timer.seconds() / R;
   }
   {
     Kokkos::Timer timer;
-    for(int r=0; r<R; r++) {
-      Kokkos::View<double*******,Layout> a("A7",N2,N1,N1,N1,N1,N1,N1);
+    for (int r = 0; r < R; r++) {
+      Kokkos::View<double*******, Layout> a("A7", N2, N1, N1, N1, N1, N1, N1);
     }
-    time7 = timer.seconds()/R;
+    time7 = timer.seconds() / R;
   }
   {
     Kokkos::Timer timer;
-    for(int r=0; r<R; r++) {
-      Kokkos::View<double********,Layout> a("A8",N1,N1,N1,N1,N1,N1,N1,N1);
+    for (int r = 0; r < R; r++) {
+      Kokkos::View<double********, Layout> a("A8", N1, N1, N1, N1, N1, N1, N1,
+                                             N1);
     }
-    time8 = timer.seconds()/R;
+    time8 = timer.seconds() / R;
   }
-  #if defined(KOKKOS_ENABLE_CUDA_LAMBDA) || !defined(KOKKOS_ENABLE_CUDA)
+#if defined(KOKKOS_ENABLE_CUDA_LAMBDA) || !defined(KOKKOS_ENABLE_CUDA)
   {
     Kokkos::Timer timer;
-    for(int r=0;r<R;r++) {
-      double* a_ptr = (double*) Kokkos::kokkos_malloc("A", sizeof(double)*N8);
-      Kokkos::parallel_for(N8, KOKKOS_LAMBDA (const int& i) {
-        a_ptr[i] = 0.0;
-      });
+    for (int r = 0; r < R; r++) {
+      double* a_ptr = (double*)Kokkos::kokkos_malloc("A", sizeof(double) * N8);
+      Kokkos::parallel_for(
+          N8, KOKKOS_LAMBDA(const int& i) { a_ptr[i] = 0.0; });
       Kokkos::fence();
       Kokkos::kokkos_free(a_ptr);
     }
-    time_raw = timer.seconds()/R;
+    time_raw = timer.seconds() / R;
   }
-  #endif
-  double size = 1.0*N8*8/1024/1024;
-  printf("   Raw:   %lf s   %lf MB   %lf GB/s\n",time_raw,size,size/1024/time_raw);
-  printf("   Rank1: %lf s   %lf MB   %lf GB/s\n",time1,size,size/1024/time1);
-  printf("   Rank2: %lf s   %lf MB   %lf GB/s\n",time2,size,size/1024/time2);
-  printf("   Rank3: %lf s   %lf MB   %lf GB/s\n",time3,size,size/1024/time3);
-  printf("   Rank4: %lf s   %lf MB   %lf GB/s\n",time4,size,size/1024/time4);
-  printf("   Rank5: %lf s   %lf MB   %lf GB/s\n",time5,size,size/1024/time5);
-  printf("   Rank6: %lf s   %lf MB   %lf GB/s\n",time6,size,size/1024/time6);
-  printf("   Rank7: %lf s   %lf MB   %lf GB/s\n",time7,size,size/1024/time7);
-  printf("   Rank8: %lf s   %lf MB   %lf GB/s\n",time8,size,size/1024/time8);
+#endif
+  double size = 1.0 * N8 * 8 / 1024 / 1024;
+  printf("   Raw:   %lf s   %lf MB   %lf GB/s\n", time_raw, size,
+         size / 1024 / time_raw);
+  printf("   Rank1: %lf s   %lf MB   %lf GB/s\n", time1, size,
+         size / 1024 / time1);
+  printf("   Rank2: %lf s   %lf MB   %lf GB/s\n", time2, size,
+         size / 1024 / time2);
+  printf("   Rank3: %lf s   %lf MB   %lf GB/s\n", time3, size,
+         size / 1024 / time3);
+  printf("   Rank4: %lf s   %lf MB   %lf GB/s\n", time4, size,
+         size / 1024 / time4);
+  printf("   Rank5: %lf s   %lf MB   %lf GB/s\n", time5, size,
+         size / 1024 / time5);
+  printf("   Rank6: %lf s   %lf MB   %lf GB/s\n", time6, size,
+         size / 1024 / time6);
+  printf("   Rank7: %lf s   %lf MB   %lf GB/s\n", time7, size,
+         size / 1024 / time7);
+  printf("   Rank8: %lf s   %lf MB   %lf GB/s\n", time8, size,
+         size / 1024 / time8);
 }
 
-TEST_F( default_exec, ViewCreate ) {
+TEST(default_exec, ViewCreate) {
   printf("Create View Performance for LayoutLeft:\n");
-  run_allocateview_tests<Kokkos::LayoutLeft>(10,1);
+  run_allocateview_tests<Kokkos::LayoutLeft>(10, 1);
   printf("Create View Performance for LayoutRight:\n");
-  run_allocateview_tests<Kokkos::LayoutRight>(10,1);
+  run_allocateview_tests<Kokkos::LayoutRight>(10, 1);
 }
 
-}
+}  // namespace Test
diff --git a/lib/kokkos/core/perf_test/PerfTest_ViewCopy.hpp b/lib/kokkos/core/perf_test/PerfTest_ViewCopy.hpp
index eff31c69bb..8e7bf25e80 100644
--- a/lib/kokkos/core/perf_test/PerfTest_ViewCopy.hpp
+++ b/lib/kokkos/core/perf_test/PerfTest_ViewCopy.hpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -48,204 +49,213 @@
 
 namespace Test {
 
-template<class ViewTypeA, class ViewTypeB>
-double deepcopy_view (ViewTypeA& a, ViewTypeB& b, int repeat){
+template <class ViewTypeA, class ViewTypeB>
+double deepcopy_view(ViewTypeA& a, ViewTypeB& b, int repeat) {
   Kokkos::Timer timer;
-  for(int i=0; i<repeat; i++) {
-    Kokkos::deep_copy(a,b);
+  for (int i = 0; i < repeat; i++) {
+    Kokkos::deep_copy(a, b);
   }
   Kokkos::fence();
   return timer.seconds();
 }
 
-
-template<class LayoutA, class LayoutB>
+template <class LayoutA, class LayoutB>
 void run_deepcopyview_tests123(int N, int R) {
   const int N1 = N;
-  const int N2 = N1*N1;
-  const int N3 = N2*N1;
-  const int N4 = N2*N2;
-  const int N8 = N4*N4;
+  const int N2 = N1 * N1;
+  const int N3 = N2 * N1;
+  const int N4 = N2 * N2;
+  const int N8 = N4 * N4;
 
-  double time1,time2,time3,time_raw = 100000.0;
+  double time1, time2, time3, time_raw = 100000.0;
   {
-    Kokkos::View<double*,LayoutA> a("A1",N8);
-    Kokkos::View<double*,LayoutB> b("B1",N8);
-    time1 = deepcopy_view(a,b,R)/R;
+    Kokkos::View<double*, LayoutA> a("A1", N8);
+    Kokkos::View<double*, LayoutB> b("B1", N8);
+    time1 = deepcopy_view(a, b, R) / R;
   }
   {
-    Kokkos::View<double**,LayoutA> a("A2",N4,N4);
-    Kokkos::View<double**,LayoutB> b("B2",N4,N4);
-    time2 = deepcopy_view(a,b,R)/R;
+    Kokkos::View<double**, LayoutA> a("A2", N4, N4);
+    Kokkos::View<double**, LayoutB> b("B2", N4, N4);
+    time2 = deepcopy_view(a, b, R) / R;
   }
   {
-    Kokkos::View<double***,LayoutA> a("A3",N3,N3,N2);
-    Kokkos::View<double***,LayoutB> b("B3",N3,N3,N2);
-    time3 = deepcopy_view(a,b,R)/R;
+    Kokkos::View<double***, LayoutA> a("A3", N3, N3, N2);
+    Kokkos::View<double***, LayoutB> b("B3", N3, N3, N2);
+    time3 = deepcopy_view(a, b, R) / R;
   }
-  #if defined(KOKKOS_ENABLE_CUDA_LAMBDA) || !defined(KOKKOS_ENABLE_CUDA)
+#if defined(KOKKOS_ENABLE_CUDA_LAMBDA) || !defined(KOKKOS_ENABLE_CUDA)
   {
-    Kokkos::View<double*,LayoutA> a("A1",N8);
-    Kokkos::View<double*,LayoutB> b("B1",N8);
-    double* const a_ptr = a.data();
+    Kokkos::View<double*, LayoutA> a("A1", N8);
+    Kokkos::View<double*, LayoutB> b("B1", N8);
+    double* const a_ptr       = a.data();
     const double* const b_ptr = b.data();
     Kokkos::Timer timer;
-    for(int r=0;r<R;r++) {
-      Kokkos::parallel_for(N8, KOKKOS_LAMBDA (const int& i) {
-        a_ptr[i] = b_ptr[i];
-      });
+    for (int r = 0; r < R; r++) {
+      Kokkos::parallel_for(
+          N8, KOKKOS_LAMBDA(const int& i) { a_ptr[i] = b_ptr[i]; });
     }
     Kokkos::fence();
-    time_raw = timer.seconds()/R;
+    time_raw = timer.seconds() / R;
   }
-  #endif
-  double size = 1.0*N8*8/1024/1024;
-  printf("   Raw:   %lf s   %lf MB   %lf GB/s\n",time_raw,size,2.0*size/1024/time_raw);
-  printf("   Rank1: %lf s   %lf MB   %lf GB/s\n",time1,size,2.0*size/1024/time1);
-  printf("   Rank2: %lf s   %lf MB   %lf GB/s\n",time2,size,2.0*size/1024/time2);
-  printf("   Rank3: %lf s   %lf MB   %lf GB/s\n",time3,size,2.0*size/1024/time3);
+#endif
+  double size = 1.0 * N8 * 8 / 1024 / 1024;
+  printf("   Raw:   %lf s   %lf MB   %lf GB/s\n", time_raw, size,
+         2.0 * size / 1024 / time_raw);
+  printf("   Rank1: %lf s   %lf MB   %lf GB/s\n", time1, size,
+         2.0 * size / 1024 / time1);
+  printf("   Rank2: %lf s   %lf MB   %lf GB/s\n", time2, size,
+         2.0 * size / 1024 / time2);
+  printf("   Rank3: %lf s   %lf MB   %lf GB/s\n", time3, size,
+         2.0 * size / 1024 / time3);
 }
 
-template<class LayoutA, class LayoutB>
+template <class LayoutA, class LayoutB>
 void run_deepcopyview_tests45(int N, int R) {
   const int N1 = N;
-  const int N2 = N1*N1;
-  const int N4 = N2*N2;
-  const int N8 = N4*N4;
+  const int N2 = N1 * N1;
+  const int N4 = N2 * N2;
+  const int N8 = N4 * N4;
 
-  double time4,time5,time_raw = 100000.0;
+  double time4, time5, time_raw = 100000.0;
   {
-    Kokkos::View<double****,LayoutA> a("A4",N2,N2,N2,N2);
-    Kokkos::View<double****,LayoutB> b("B4",N2,N2,N2,N2);
-    time4 = deepcopy_view(a,b,R)/R;
+    Kokkos::View<double****, LayoutA> a("A4", N2, N2, N2, N2);
+    Kokkos::View<double****, LayoutB> b("B4", N2, N2, N2, N2);
+    time4 = deepcopy_view(a, b, R) / R;
   }
   {
-    Kokkos::View<double*****,LayoutA> a("A5",N2,N2,N1,N1,N2);
-    Kokkos::View<double*****,LayoutB> b("B5",N2,N2,N1,N1,N2);
-    time5 = deepcopy_view(a,b,R)/R;
+    Kokkos::View<double*****, LayoutA> a("A5", N2, N2, N1, N1, N2);
+    Kokkos::View<double*****, LayoutB> b("B5", N2, N2, N1, N1, N2);
+    time5 = deepcopy_view(a, b, R) / R;
   }
-  #if defined(KOKKOS_ENABLE_CUDA_LAMBDA) || !defined(KOKKOS_ENABLE_CUDA)
+#if defined(KOKKOS_ENABLE_CUDA_LAMBDA) || !defined(KOKKOS_ENABLE_CUDA)
   {
-    Kokkos::View<double*,LayoutA> a("A1",N8);
-    Kokkos::View<double*,LayoutB> b("B1",N8);
-    double* const a_ptr = a.data();
+    Kokkos::View<double*, LayoutA> a("A1", N8);
+    Kokkos::View<double*, LayoutB> b("B1", N8);
+    double* const a_ptr       = a.data();
     const double* const b_ptr = b.data();
     Kokkos::Timer timer;
-    for(int r=0;r<R;r++) {
-      Kokkos::parallel_for(N8, KOKKOS_LAMBDA (const int& i) {
-        a_ptr[i] = b_ptr[i];
-      });
+    for (int r = 0; r < R; r++) {
+      Kokkos::parallel_for(
+          N8, KOKKOS_LAMBDA(const int& i) { a_ptr[i] = b_ptr[i]; });
     }
     Kokkos::fence();
-    time_raw = timer.seconds()/R;
+    time_raw = timer.seconds() / R;
   }
-  #endif
-  double size = 1.0*N8*8/1024/1024;
-  printf("   Raw:   %lf s   %lf MB   %lf GB/s\n",time_raw,size,2.0*size/1024/time_raw);
-  printf("   Rank4: %lf s   %lf MB   %lf GB/s\n",time4,size,2.0*size/1024/time4);
-  printf("   Rank5: %lf s   %lf MB   %lf GB/s\n",time5,size,2.0*size/1024/time5);
+#endif
+  double size = 1.0 * N8 * 8 / 1024 / 1024;
+  printf("   Raw:   %lf s   %lf MB   %lf GB/s\n", time_raw, size,
+         2.0 * size / 1024 / time_raw);
+  printf("   Rank4: %lf s   %lf MB   %lf GB/s\n", time4, size,
+         2.0 * size / 1024 / time4);
+  printf("   Rank5: %lf s   %lf MB   %lf GB/s\n", time5, size,
+         2.0 * size / 1024 / time5);
 }
 
-template<class LayoutA, class LayoutB>
+template <class LayoutA, class LayoutB>
 void run_deepcopyview_tests6(int N, int R) {
   const int N1 = N;
-  const int N2 = N1*N1;
-  const int N4 = N2*N2;
-  const int N8 = N4*N4;
+  const int N2 = N1 * N1;
+  const int N4 = N2 * N2;
+  const int N8 = N4 * N4;
 
-  double time6,time_raw = 100000.0;
+  double time6, time_raw = 100000.0;
   {
-    Kokkos::View<double******,LayoutA> a("A6",N2,N1,N1,N1,N1,N2);
-    Kokkos::View<double******,LayoutB> b("B6",N2,N1,N1,N1,N1,N2);
-    time6 = deepcopy_view(a,b,R)/R;
+    Kokkos::View<double******, LayoutA> a("A6", N2, N1, N1, N1, N1, N2);
+    Kokkos::View<double******, LayoutB> b("B6", N2, N1, N1, N1, N1, N2);
+    time6 = deepcopy_view(a, b, R) / R;
   }
-  #if defined(KOKKOS_ENABLE_CUDA_LAMBDA) || !defined(KOKKOS_ENABLE_CUDA)
+#if defined(KOKKOS_ENABLE_CUDA_LAMBDA) || !defined(KOKKOS_ENABLE_CUDA)
   {
-    Kokkos::View<double*,LayoutA> a("A1",N8);
-    Kokkos::View<double*,LayoutB> b("B1",N8);
-    double* const a_ptr = a.data();
+    Kokkos::View<double*, LayoutA> a("A1", N8);
+    Kokkos::View<double*, LayoutB> b("B1", N8);
+    double* const a_ptr       = a.data();
     const double* const b_ptr = b.data();
     Kokkos::Timer timer;
-    for(int r=0;r<R;r++) {
-      Kokkos::parallel_for(N8, KOKKOS_LAMBDA (const int& i) {
-        a_ptr[i] = b_ptr[i];
-      });
+    for (int r = 0; r < R; r++) {
+      Kokkos::parallel_for(
+          N8, KOKKOS_LAMBDA(const int& i) { a_ptr[i] = b_ptr[i]; });
     }
     Kokkos::fence();
-    time_raw = timer.seconds()/R;
+    time_raw = timer.seconds() / R;
   }
-  #endif
-  double size = 1.0*N8*8/1024/1024;
-  printf("   Raw:   %lf s   %lf MB   %lf GB/s\n",time_raw,size,2.0*size/1024/time_raw);
-  printf("   Rank6: %lf s   %lf MB   %lf GB/s\n",time6,size,2.0*size/1024/time6);
+#endif
+  double size = 1.0 * N8 * 8 / 1024 / 1024;
+  printf("   Raw:   %lf s   %lf MB   %lf GB/s\n", time_raw, size,
+         2.0 * size / 1024 / time_raw);
+  printf("   Rank6: %lf s   %lf MB   %lf GB/s\n", time6, size,
+         2.0 * size / 1024 / time6);
 }
 
-template<class LayoutA, class LayoutB>
+template <class LayoutA, class LayoutB>
 void run_deepcopyview_tests7(int N, int R) {
   const int N1 = N;
-  const int N2 = N1*N1;
-  const int N4 = N2*N2;
-  const int N8 = N4*N4;
+  const int N2 = N1 * N1;
+  const int N4 = N2 * N2;
+  const int N8 = N4 * N4;
 
-  double time7,time_raw = 100000.0;
+  double time7, time_raw = 100000.0;
   {
-    Kokkos::View<double*******,LayoutA> a("A7",N2,N1,N1,N1,N1,N1,N1);
-    Kokkos::View<double*******,LayoutB> b("B7",N2,N1,N1,N1,N1,N1,N1);
-    time7 = deepcopy_view(a,b,R)/R;
+    Kokkos::View<double*******, LayoutA> a("A7", N2, N1, N1, N1, N1, N1, N1);
+    Kokkos::View<double*******, LayoutB> b("B7", N2, N1, N1, N1, N1, N1, N1);
+    time7 = deepcopy_view(a, b, R) / R;
   }
-  #if defined(KOKKOS_ENABLE_CUDA_LAMBDA) || !defined(KOKKOS_ENABLE_CUDA)
+#if defined(KOKKOS_ENABLE_CUDA_LAMBDA) || !defined(KOKKOS_ENABLE_CUDA)
   {
-    Kokkos::View<double*,LayoutA> a("A1",N8);
-    Kokkos::View<double*,LayoutB> b("B1",N8);
-    double* const a_ptr = a.data();
+    Kokkos::View<double*, LayoutA> a("A1", N8);
+    Kokkos::View<double*, LayoutB> b("B1", N8);
+    double* const a_ptr       = a.data();
     const double* const b_ptr = b.data();
     Kokkos::Timer timer;
-    for(int r=0;r<R;r++) {
-      Kokkos::parallel_for(N8, KOKKOS_LAMBDA (const int& i) {
-        a_ptr[i] = b_ptr[i];
-      });
+    for (int r = 0; r < R; r++) {
+      Kokkos::parallel_for(
+          N8, KOKKOS_LAMBDA(const int& i) { a_ptr[i] = b_ptr[i]; });
     }
     Kokkos::fence();
-    time_raw = timer.seconds()/R;
+    time_raw = timer.seconds() / R;
   }
-  #endif
-  double size = 1.0*N8*8/1024/1024;
-  printf("   Raw:   %lf s   %lf MB   %lf GB/s\n",time_raw,size,2.0*size/1024/time_raw);
-  printf("   Rank7: %lf s   %lf MB   %lf GB/s\n",time7,size,2.0*size/1024/time7);
+#endif
+  double size = 1.0 * N8 * 8 / 1024 / 1024;
+  printf("   Raw:   %lf s   %lf MB   %lf GB/s\n", time_raw, size,
+         2.0 * size / 1024 / time_raw);
+  printf("   Rank7: %lf s   %lf MB   %lf GB/s\n", time7, size,
+         2.0 * size / 1024 / time7);
 }
 
-template<class LayoutA, class LayoutB>
+template <class LayoutA, class LayoutB>
 void run_deepcopyview_tests8(int N, int R) {
   const int N1 = N;
-  const int N2 = N1*N1;
-  const int N4 = N2*N2;
-  const int N8 = N4*N4;
+  const int N2 = N1 * N1;
+  const int N4 = N2 * N2;
+  const int N8 = N4 * N4;
 
-  double time8,time_raw = 100000.0;
+  double time8, time_raw = 100000.0;
   {
-    Kokkos::View<double********,LayoutA> a("A8",N1,N1,N1,N1,N1,N1,N1,N1);
-    Kokkos::View<double********,LayoutB> b("B8",N1,N1,N1,N1,N1,N1,N1,N1);
-    time8 = deepcopy_view(a,b,R)/R;
+    Kokkos::View<double********, LayoutA> a("A8", N1, N1, N1, N1, N1, N1, N1,
+                                            N1);
+    Kokkos::View<double********, LayoutB> b("B8", N1, N1, N1, N1, N1, N1, N1,
+                                            N1);
+    time8 = deepcopy_view(a, b, R) / R;
   }
-  #if defined(KOKKOS_ENABLE_CUDA_LAMBDA) || !defined(KOKKOS_ENABLE_CUDA)
+#if defined(KOKKOS_ENABLE_CUDA_LAMBDA) || !defined(KOKKOS_ENABLE_CUDA)
   {
-    Kokkos::View<double*,LayoutA> a("A1",N8);
-    Kokkos::View<double*,LayoutB> b("B1",N8);
-    double* const a_ptr = a.data();
+    Kokkos::View<double*, LayoutA> a("A1", N8);
+    Kokkos::View<double*, LayoutB> b("B1", N8);
+    double* const a_ptr       = a.data();
     const double* const b_ptr = b.data();
     Kokkos::Timer timer;
-    for(int r=0;r<R;r++) {
-      Kokkos::parallel_for(N8, KOKKOS_LAMBDA (const int& i) {
-        a_ptr[i] = b_ptr[i];
-      });
+    for (int r = 0; r < R; r++) {
+      Kokkos::parallel_for(
+          N8, KOKKOS_LAMBDA(const int& i) { a_ptr[i] = b_ptr[i]; });
     }
     Kokkos::fence();
-    time_raw = timer.seconds()/R;
+    time_raw = timer.seconds() / R;
   }
-  #endif
-  double size = 1.0*N8*8/1024/1024;
-  printf("   Raw:   %lf s   %lf MB   %lf GB/s\n",time_raw,size,2.0*size/1024/time_raw);
-  printf("   Rank8: %lf s   %lf MB   %lf GB/s\n",time8,size,2.0*size/1024/time8);
+#endif
+  double size = 1.0 * N8 * 8 / 1024 / 1024;
+  printf("   Raw:   %lf s   %lf MB   %lf GB/s\n", time_raw, size,
+         2.0 * size / 1024 / time_raw);
+  printf("   Rank8: %lf s   %lf MB   %lf GB/s\n", time8, size,
+         2.0 * size / 1024 / time8);
 }
 
-}
+}  // namespace Test
diff --git a/lib/kokkos/core/perf_test/PerfTest_ViewCopy_a123.cpp b/lib/kokkos/core/perf_test/PerfTest_ViewCopy_a123.cpp
index 3dd2477ebb..dceef801aa 100644
--- a/lib/kokkos/core/perf_test/PerfTest_ViewCopy_a123.cpp
+++ b/lib/kokkos/core/perf_test/PerfTest_ViewCopy_a123.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -41,10 +42,10 @@
 //@HEADER
 */
 
-#include<PerfTest_ViewCopy.hpp>
+#include <PerfTest_ViewCopy.hpp>
 namespace Test {
-TEST_F( default_exec, ViewDeepCopy_LeftLeft_Rank123 ) {
+TEST(default_exec, ViewDeepCopy_LeftLeft_Rank123) {
   printf("DeepCopy Performance for LayoutLeft to LayoutLeft:\n");
-  run_deepcopyview_tests123<Kokkos::LayoutLeft,Kokkos::LayoutLeft>(10,1);
-}
+  run_deepcopyview_tests123<Kokkos::LayoutLeft, Kokkos::LayoutLeft>(10, 1);
 }
+}  // namespace Test
diff --git a/lib/kokkos/core/perf_test/PerfTest_ViewCopy_a45.cpp b/lib/kokkos/core/perf_test/PerfTest_ViewCopy_a45.cpp
index b7fa71b06f..3f9b694461 100644
--- a/lib/kokkos/core/perf_test/PerfTest_ViewCopy_a45.cpp
+++ b/lib/kokkos/core/perf_test/PerfTest_ViewCopy_a45.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -41,10 +42,10 @@
 //@HEADER
 */
 
-#include<PerfTest_ViewCopy.hpp>
+#include <PerfTest_ViewCopy.hpp>
 namespace Test {
-TEST_F( default_exec, ViewDeepCopy_LeftLeft_Rank45 ) {
+TEST(default_exec, ViewDeepCopy_LeftLeft_Rank45) {
   printf("DeepCopy Performance for LayoutLeft to LayoutLeft:\n");
-  run_deepcopyview_tests45<Kokkos::LayoutLeft,Kokkos::LayoutLeft>(10,1);
-}
+  run_deepcopyview_tests45<Kokkos::LayoutLeft, Kokkos::LayoutLeft>(10, 1);
 }
+}  // namespace Test
diff --git a/lib/kokkos/core/perf_test/PerfTest_ViewCopy_a6.cpp b/lib/kokkos/core/perf_test/PerfTest_ViewCopy_a6.cpp
index ee86af41b0..ac364c31cb 100644
--- a/lib/kokkos/core/perf_test/PerfTest_ViewCopy_a6.cpp
+++ b/lib/kokkos/core/perf_test/PerfTest_ViewCopy_a6.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -41,10 +42,10 @@
 //@HEADER
 */
 
-#include<PerfTest_ViewCopy.hpp>
+#include <PerfTest_ViewCopy.hpp>
 namespace Test {
-TEST_F( default_exec, ViewDeepCopy_LeftLeft_Rank6 ) {
+TEST(default_exec, ViewDeepCopy_LeftLeft_Rank6) {
   printf("DeepCopy Performance for LayoutLeft to LayoutLeft:\n");
-  run_deepcopyview_tests6<Kokkos::LayoutLeft,Kokkos::LayoutLeft>(10,1);
-}
+  run_deepcopyview_tests6<Kokkos::LayoutLeft, Kokkos::LayoutLeft>(10, 1);
 }
+}  // namespace Test
diff --git a/lib/kokkos/core/perf_test/PerfTest_ViewCopy_a7.cpp b/lib/kokkos/core/perf_test/PerfTest_ViewCopy_a7.cpp
index 5a7a78a196..94f30bac9f 100644
--- a/lib/kokkos/core/perf_test/PerfTest_ViewCopy_a7.cpp
+++ b/lib/kokkos/core/perf_test/PerfTest_ViewCopy_a7.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -41,10 +42,10 @@
 //@HEADER
 */
 
-#include<PerfTest_ViewCopy.hpp>
+#include <PerfTest_ViewCopy.hpp>
 namespace Test {
-TEST_F( default_exec, ViewDeepCopy_LeftLeft_Rank7 ) {
+TEST(default_exec, ViewDeepCopy_LeftLeft_Rank7) {
   printf("DeepCopy Performance for LayoutLeft to LayoutLeft:\n");
-  run_deepcopyview_tests7<Kokkos::LayoutLeft,Kokkos::LayoutLeft>(10,1);
-}
+  run_deepcopyview_tests7<Kokkos::LayoutLeft, Kokkos::LayoutLeft>(10, 1);
 }
+}  // namespace Test
diff --git a/lib/kokkos/core/perf_test/PerfTest_ViewCopy_a8.cpp b/lib/kokkos/core/perf_test/PerfTest_ViewCopy_a8.cpp
index cc0d7a6c2a..b916169f1b 100644
--- a/lib/kokkos/core/perf_test/PerfTest_ViewCopy_a8.cpp
+++ b/lib/kokkos/core/perf_test/PerfTest_ViewCopy_a8.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -41,10 +42,10 @@
 //@HEADER
 */
 
-#include<PerfTest_ViewCopy.hpp>
+#include <PerfTest_ViewCopy.hpp>
 namespace Test {
-TEST_F( default_exec, ViewDeepCopy_LeftLeft_Rank8 ) {
+TEST(default_exec, ViewDeepCopy_LeftLeft_Rank8) {
   printf("DeepCopy Performance for LayoutLeft to LayoutLeft:\n");
-  run_deepcopyview_tests8<Kokkos::LayoutLeft,Kokkos::LayoutLeft>(10,1);
-}
+  run_deepcopyview_tests8<Kokkos::LayoutLeft, Kokkos::LayoutLeft>(10, 1);
 }
+}  // namespace Test
diff --git a/lib/kokkos/core/perf_test/PerfTest_ViewCopy_b123.cpp b/lib/kokkos/core/perf_test/PerfTest_ViewCopy_b123.cpp
index eb9921d090..f314cb0ff4 100644
--- a/lib/kokkos/core/perf_test/PerfTest_ViewCopy_b123.cpp
+++ b/lib/kokkos/core/perf_test/PerfTest_ViewCopy_b123.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -41,10 +42,10 @@
 //@HEADER
 */
 
-#include<PerfTest_ViewCopy.hpp>
+#include <PerfTest_ViewCopy.hpp>
 namespace Test {
-TEST_F( default_exec, ViewDeepCopy_RightRight_Rank123 ) {
+TEST(default_exec, ViewDeepCopy_RightRight_Rank123) {
   printf("DeepCopy Performance for LayoutRight to LayoutRight:\n");
-  run_deepcopyview_tests123<Kokkos::LayoutRight,Kokkos::LayoutRight>(10,1);
-}
+  run_deepcopyview_tests123<Kokkos::LayoutRight, Kokkos::LayoutRight>(10, 1);
 }
+}  // namespace Test
diff --git a/lib/kokkos/core/perf_test/PerfTest_ViewCopy_b45.cpp b/lib/kokkos/core/perf_test/PerfTest_ViewCopy_b45.cpp
index b805c4c7fc..5d06f060af 100644
--- a/lib/kokkos/core/perf_test/PerfTest_ViewCopy_b45.cpp
+++ b/lib/kokkos/core/perf_test/PerfTest_ViewCopy_b45.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -41,10 +42,10 @@
 //@HEADER
 */
 
-#include<PerfTest_ViewCopy.hpp>
+#include <PerfTest_ViewCopy.hpp>
 namespace Test {
-TEST_F( default_exec, ViewDeepCopy_RightRight_Rank45 ) {
+TEST(default_exec, ViewDeepCopy_RightRight_Rank45) {
   printf("DeepCopy Performance for LayoutRight to LayoutRight:\n");
-  run_deepcopyview_tests45<Kokkos::LayoutRight,Kokkos::LayoutRight>(10,1);
-}
+  run_deepcopyview_tests45<Kokkos::LayoutRight, Kokkos::LayoutRight>(10, 1);
 }
+}  // namespace Test
diff --git a/lib/kokkos/core/perf_test/PerfTest_ViewCopy_b6.cpp b/lib/kokkos/core/perf_test/PerfTest_ViewCopy_b6.cpp
index 8f350f4895..0e28fee631 100644
--- a/lib/kokkos/core/perf_test/PerfTest_ViewCopy_b6.cpp
+++ b/lib/kokkos/core/perf_test/PerfTest_ViewCopy_b6.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -41,10 +42,10 @@
 //@HEADER
 */
 
-#include<PerfTest_ViewCopy.hpp>
+#include <PerfTest_ViewCopy.hpp>
 namespace Test {
-TEST_F( default_exec, ViewDeepCopy_RightRight_Rank6 ) {
+TEST(default_exec, ViewDeepCopy_RightRight_Rank6) {
   printf("DeepCopy Performance for LayoutRight to LayoutRight:\n");
-  run_deepcopyview_tests6<Kokkos::LayoutRight,Kokkos::LayoutRight>(10,1);
-}
+  run_deepcopyview_tests6<Kokkos::LayoutRight, Kokkos::LayoutRight>(10, 1);
 }
+}  // namespace Test
diff --git a/lib/kokkos/core/perf_test/PerfTest_ViewCopy_b7.cpp b/lib/kokkos/core/perf_test/PerfTest_ViewCopy_b7.cpp
index 6f82e178f9..37e1325fc4 100644
--- a/lib/kokkos/core/perf_test/PerfTest_ViewCopy_b7.cpp
+++ b/lib/kokkos/core/perf_test/PerfTest_ViewCopy_b7.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -41,10 +42,10 @@
 //@HEADER
 */
 
-#include<PerfTest_ViewCopy.hpp>
+#include <PerfTest_ViewCopy.hpp>
 namespace Test {
-TEST_F( default_exec, ViewDeepCopy_RightRight_Rank7 ) {
+TEST(default_exec, ViewDeepCopy_RightRight_Rank7) {
   printf("DeepCopy Performance for LayoutRight to LayoutRight:\n");
-  run_deepcopyview_tests7<Kokkos::LayoutRight,Kokkos::LayoutRight>(10,1);
-}
+  run_deepcopyview_tests7<Kokkos::LayoutRight, Kokkos::LayoutRight>(10, 1);
 }
+}  // namespace Test
diff --git a/lib/kokkos/core/perf_test/PerfTest_ViewCopy_b8.cpp b/lib/kokkos/core/perf_test/PerfTest_ViewCopy_b8.cpp
index ef165c9a35..986c39aaf4 100644
--- a/lib/kokkos/core/perf_test/PerfTest_ViewCopy_b8.cpp
+++ b/lib/kokkos/core/perf_test/PerfTest_ViewCopy_b8.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -41,10 +42,10 @@
 //@HEADER
 */
 
-#include<PerfTest_ViewCopy.hpp>
+#include <PerfTest_ViewCopy.hpp>
 namespace Test {
-TEST_F( default_exec, ViewDeepCopy_RightRight_Rank8 ) {
+TEST(default_exec, ViewDeepCopy_RightRight_Rank8) {
   printf("DeepCopy Performance for LayoutRight to LayoutRight:\n");
-  run_deepcopyview_tests8<Kokkos::LayoutRight,Kokkos::LayoutRight>(10,1);
-}
+  run_deepcopyview_tests8<Kokkos::LayoutRight, Kokkos::LayoutRight>(10, 1);
 }
+}  // namespace Test
diff --git a/lib/kokkos/core/perf_test/PerfTest_ViewCopy_c123.cpp b/lib/kokkos/core/perf_test/PerfTest_ViewCopy_c123.cpp
index ebc924d9f0..b98563ee42 100644
--- a/lib/kokkos/core/perf_test/PerfTest_ViewCopy_c123.cpp
+++ b/lib/kokkos/core/perf_test/PerfTest_ViewCopy_c123.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -41,10 +42,10 @@
 //@HEADER
 */
 
-#include<PerfTest_ViewCopy.hpp>
+#include <PerfTest_ViewCopy.hpp>
 namespace Test {
-TEST_F( default_exec, ViewDeepCopy_LeftRight_Rank123 ) {
+TEST(default_exec, ViewDeepCopy_LeftRight_Rank123) {
   printf("DeepCopy Performance for LayoutLeft to LayoutRight:\n");
-  run_deepcopyview_tests123<Kokkos::LayoutLeft,Kokkos::LayoutRight>(10,1);
-}
+  run_deepcopyview_tests123<Kokkos::LayoutLeft, Kokkos::LayoutRight>(10, 1);
 }
+}  // namespace Test
diff --git a/lib/kokkos/core/perf_test/PerfTest_ViewCopy_c45.cpp b/lib/kokkos/core/perf_test/PerfTest_ViewCopy_c45.cpp
index a8a7935640..a0ef11e09b 100644
--- a/lib/kokkos/core/perf_test/PerfTest_ViewCopy_c45.cpp
+++ b/lib/kokkos/core/perf_test/PerfTest_ViewCopy_c45.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -41,10 +42,10 @@
 //@HEADER
 */
 
-#include<PerfTest_ViewCopy.hpp>
+#include <PerfTest_ViewCopy.hpp>
 namespace Test {
-TEST_F( default_exec, ViewDeepCopy_LeftRight_Rank45 ) {
+TEST(default_exec, ViewDeepCopy_LeftRight_Rank45) {
   printf("DeepCopy Performance for LayoutLeft to LayoutRight:\n");
-  run_deepcopyview_tests45<Kokkos::LayoutLeft,Kokkos::LayoutRight>(10,1);
-}
+  run_deepcopyview_tests45<Kokkos::LayoutLeft, Kokkos::LayoutRight>(10, 1);
 }
+}  // namespace Test
diff --git a/lib/kokkos/core/perf_test/PerfTest_ViewCopy_c6.cpp b/lib/kokkos/core/perf_test/PerfTest_ViewCopy_c6.cpp
index c65c17c55b..fea5dde73a 100644
--- a/lib/kokkos/core/perf_test/PerfTest_ViewCopy_c6.cpp
+++ b/lib/kokkos/core/perf_test/PerfTest_ViewCopy_c6.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -41,10 +42,10 @@
 //@HEADER
 */
 
-#include<PerfTest_ViewCopy.hpp>
+#include <PerfTest_ViewCopy.hpp>
 namespace Test {
-TEST_F( default_exec, ViewDeepCopy_LeftRight_Rank6 ) {
+TEST(default_exec, ViewDeepCopy_LeftRight_Rank6) {
   printf("DeepCopy Performance for LayoutLeft to LayoutRight:\n");
-  run_deepcopyview_tests6<Kokkos::LayoutLeft,Kokkos::LayoutRight>(10,1);
-}
+  run_deepcopyview_tests6<Kokkos::LayoutLeft, Kokkos::LayoutRight>(10, 1);
 }
+}  // namespace Test
diff --git a/lib/kokkos/core/perf_test/PerfTest_ViewCopy_c7.cpp b/lib/kokkos/core/perf_test/PerfTest_ViewCopy_c7.cpp
index 48fcf053e6..a8c8d866f9 100644
--- a/lib/kokkos/core/perf_test/PerfTest_ViewCopy_c7.cpp
+++ b/lib/kokkos/core/perf_test/PerfTest_ViewCopy_c7.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -41,10 +42,10 @@
 //@HEADER
 */
 
-#include<PerfTest_ViewCopy.hpp>
+#include <PerfTest_ViewCopy.hpp>
 namespace Test {
-TEST_F( default_exec, ViewDeepCopy_LeftRight_Rank7 ) {
+TEST(default_exec, ViewDeepCopy_LeftRight_Rank7) {
   printf("DeepCopy Performance for LayoutLeft to LayoutRight:\n");
-  run_deepcopyview_tests7<Kokkos::LayoutLeft,Kokkos::LayoutRight>(10,1);
-}
+  run_deepcopyview_tests7<Kokkos::LayoutLeft, Kokkos::LayoutRight>(10, 1);
 }
+}  // namespace Test
diff --git a/lib/kokkos/core/perf_test/PerfTest_ViewCopy_c8.cpp b/lib/kokkos/core/perf_test/PerfTest_ViewCopy_c8.cpp
index 46e5798c8f..e5abdaa5d8 100644
--- a/lib/kokkos/core/perf_test/PerfTest_ViewCopy_c8.cpp
+++ b/lib/kokkos/core/perf_test/PerfTest_ViewCopy_c8.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -41,10 +42,10 @@
 //@HEADER
 */
 
-#include<PerfTest_ViewCopy.hpp>
+#include <PerfTest_ViewCopy.hpp>
 namespace Test {
-TEST_F( default_exec, ViewDeepCopy_LeftRight_Rank8 ) {
+TEST(default_exec, ViewDeepCopy_LeftRight_Rank8) {
   printf("DeepCopy Performance for LayoutLeft to LayoutRight:\n");
-  run_deepcopyview_tests8<Kokkos::LayoutLeft,Kokkos::LayoutRight>(10,1);
-}
+  run_deepcopyview_tests8<Kokkos::LayoutLeft, Kokkos::LayoutRight>(10, 1);
 }
+}  // namespace Test
diff --git a/lib/kokkos/core/perf_test/PerfTest_ViewCopy_d123.cpp b/lib/kokkos/core/perf_test/PerfTest_ViewCopy_d123.cpp
index ad0f455cfc..2b58f8dd1f 100644
--- a/lib/kokkos/core/perf_test/PerfTest_ViewCopy_d123.cpp
+++ b/lib/kokkos/core/perf_test/PerfTest_ViewCopy_d123.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -41,10 +42,10 @@
 //@HEADER
 */
 
-#include<PerfTest_ViewCopy.hpp>
+#include <PerfTest_ViewCopy.hpp>
 namespace Test {
-TEST_F( default_exec, ViewDeepCopy_RightLeft_Rank123 ) {
+TEST(default_exec, ViewDeepCopy_RightLeft_Rank123) {
   printf("DeepCopy Performance for LayoutRight to LayoutLeft:\n");
-  run_deepcopyview_tests123<Kokkos::LayoutRight,Kokkos::LayoutLeft>(10,1);
-}
+  run_deepcopyview_tests123<Kokkos::LayoutRight, Kokkos::LayoutLeft>(10, 1);
 }
+}  // namespace Test
diff --git a/lib/kokkos/core/perf_test/PerfTest_ViewCopy_d45.cpp b/lib/kokkos/core/perf_test/PerfTest_ViewCopy_d45.cpp
index 4853e343dd..fe34e4fd1a 100644
--- a/lib/kokkos/core/perf_test/PerfTest_ViewCopy_d45.cpp
+++ b/lib/kokkos/core/perf_test/PerfTest_ViewCopy_d45.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -41,10 +42,10 @@
 //@HEADER
 */
 
-#include<PerfTest_ViewCopy.hpp>
+#include <PerfTest_ViewCopy.hpp>
 namespace Test {
-TEST_F( default_exec, ViewDeepCopy_RightLeft_Rank45 ) {
+TEST(default_exec, ViewDeepCopy_RightLeft_Rank45) {
   printf("DeepCopy Performance for LayoutRight to LayoutLeft:\n");
-  run_deepcopyview_tests45<Kokkos::LayoutRight,Kokkos::LayoutLeft>(10,1);
-}
+  run_deepcopyview_tests45<Kokkos::LayoutRight, Kokkos::LayoutLeft>(10, 1);
 }
+}  // namespace Test
diff --git a/lib/kokkos/core/perf_test/PerfTest_ViewCopy_d6.cpp b/lib/kokkos/core/perf_test/PerfTest_ViewCopy_d6.cpp
index 1ce1041458..115b223e68 100644
--- a/lib/kokkos/core/perf_test/PerfTest_ViewCopy_d6.cpp
+++ b/lib/kokkos/core/perf_test/PerfTest_ViewCopy_d6.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -41,10 +42,10 @@
 //@HEADER
 */
 
-#include<PerfTest_ViewCopy.hpp>
+#include <PerfTest_ViewCopy.hpp>
 namespace Test {
-TEST_F( default_exec, ViewDeepCopy_RightLeft_Rank6 ) {
+TEST(default_exec, ViewDeepCopy_RightLeft_Rank6) {
   printf("DeepCopy Performance for LayoutRight to LayoutLeft:\n");
-  run_deepcopyview_tests6<Kokkos::LayoutRight,Kokkos::LayoutLeft>(10,1);
-}
+  run_deepcopyview_tests6<Kokkos::LayoutRight, Kokkos::LayoutLeft>(10, 1);
 }
+}  // namespace Test
diff --git a/lib/kokkos/core/perf_test/PerfTest_ViewCopy_d7.cpp b/lib/kokkos/core/perf_test/PerfTest_ViewCopy_d7.cpp
index af73733e64..51e88795e7 100644
--- a/lib/kokkos/core/perf_test/PerfTest_ViewCopy_d7.cpp
+++ b/lib/kokkos/core/perf_test/PerfTest_ViewCopy_d7.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -41,10 +42,10 @@
 //@HEADER
 */
 
-#include<PerfTest_ViewCopy.hpp>
+#include <PerfTest_ViewCopy.hpp>
 namespace Test {
-TEST_F( default_exec, ViewDeepCopy_RightLeft_Rank7 ) {
+TEST(default_exec, ViewDeepCopy_RightLeft_Rank7) {
   printf("DeepCopy Performance for LayoutRight to LayoutLeft:\n");
-  run_deepcopyview_tests7<Kokkos::LayoutRight,Kokkos::LayoutLeft>(10,1);
-}
+  run_deepcopyview_tests7<Kokkos::LayoutRight, Kokkos::LayoutLeft>(10, 1);
 }
+}  // namespace Test
diff --git a/lib/kokkos/core/perf_test/PerfTest_ViewCopy_d8.cpp b/lib/kokkos/core/perf_test/PerfTest_ViewCopy_d8.cpp
index 3c9b9934cb..2a53cdef21 100644
--- a/lib/kokkos/core/perf_test/PerfTest_ViewCopy_d8.cpp
+++ b/lib/kokkos/core/perf_test/PerfTest_ViewCopy_d8.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -41,10 +42,10 @@
 //@HEADER
 */
 
-#include<PerfTest_ViewCopy.hpp>
+#include <PerfTest_ViewCopy.hpp>
 namespace Test {
-TEST_F( default_exec, ViewDeepCopy_RightLeft_Rank8 ) {
+TEST(default_exec, ViewDeepCopy_RightLeft_Rank8) {
   printf("DeepCopy Performance for LayoutRight to LayoutLeft:\n");
-  run_deepcopyview_tests8<Kokkos::LayoutRight,Kokkos::LayoutLeft>(10,1);
-}
+  run_deepcopyview_tests8<Kokkos::LayoutRight, Kokkos::LayoutLeft>(10, 1);
 }
+}  // namespace Test
diff --git a/lib/kokkos/core/perf_test/PerfTest_ViewFill.hpp b/lib/kokkos/core/perf_test/PerfTest_ViewFill.hpp
index b17356f0c8..38be4bb212 100644
--- a/lib/kokkos/core/perf_test/PerfTest_ViewFill.hpp
+++ b/lib/kokkos/core/perf_test/PerfTest_ViewFill.hpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -48,186 +49,195 @@
 
 namespace Test {
 
-template<class ViewType>
-double fill_view (ViewType& a, typename ViewType::const_value_type& val, int repeat){
+template <class ViewType>
+double fill_view(ViewType& a, typename ViewType::const_value_type& val,
+                 int repeat) {
   Kokkos::Timer timer;
-  for(int i=0; i<repeat; i++) {
-    Kokkos::deep_copy(a,val);
+  for (int i = 0; i < repeat; i++) {
+    Kokkos::deep_copy(a, val);
   }
   Kokkos::fence();
   return timer.seconds();
 }
 
-
-template<class Layout>
+template <class Layout>
 void run_fillview_tests123(int N, int R) {
   const int N1 = N;
-  const int N2 = N1*N1;
-  const int N3 = N2*N1;
-  const int N4 = N2*N2;
-  const int N8 = N4*N4;
+  const int N2 = N1 * N1;
+  const int N3 = N2 * N1;
+  const int N4 = N2 * N2;
+  const int N8 = N4 * N4;
 
-  double time1,time2,time3,time_raw = 100000.0;
+  double time1, time2, time3, time_raw = 100000.0;
   {
-    Kokkos::View<double*,Layout> a("A1",N8);
-    time1 = fill_view(a,1.1,R)/R;
+    Kokkos::View<double*, Layout> a("A1", N8);
+    time1 = fill_view(a, 1.1, R) / R;
   }
   {
-    Kokkos::View<double**,Layout> a("A2",N4,N4);
-    time2 = fill_view(a,1.1,R)/R;
+    Kokkos::View<double**, Layout> a("A2", N4, N4);
+    time2 = fill_view(a, 1.1, R) / R;
   }
   {
-    Kokkos::View<double***,Layout> a("A3",N3,N3,N2);
-    time3 = fill_view(a,1.1,R)/R;
+    Kokkos::View<double***, Layout> a("A3", N3, N3, N2);
+    time3 = fill_view(a, 1.1, R) / R;
   }
-  #if defined(KOKKOS_ENABLE_CUDA_LAMBDA) || !defined(KOKKOS_ENABLE_CUDA)
+#if defined(KOKKOS_ENABLE_CUDA_LAMBDA) || !defined(KOKKOS_ENABLE_CUDA)
   {
-    Kokkos::View<double*,Layout> a("A1",N8);
+    Kokkos::View<double*, Layout> a("A1", N8);
     double* a_ptr = a.data();
     Kokkos::Timer timer;
-    for(int r=0;r<R;r++) {
-      Kokkos::parallel_for(N8, KOKKOS_LAMBDA (const int& i) {
-        a_ptr[i] = 1.1;
-      });
+    for (int r = 0; r < R; r++) {
+      Kokkos::parallel_for(
+          N8, KOKKOS_LAMBDA(const int& i) { a_ptr[i] = 1.1; });
     }
     Kokkos::fence();
-    time_raw = timer.seconds()/R;
+    time_raw = timer.seconds() / R;
   }
-  #endif
-  double size = 1.0*N8*8/1024/1024;
-  printf("   Raw:   %lf s   %lf MB   %lf GB/s\n",time_raw,size,size/1024/time_raw);
-  printf("   Rank1: %lf s   %lf MB   %lf GB/s\n",time1,size,size/1024/time1);
-  printf("   Rank2: %lf s   %lf MB   %lf GB/s\n",time2,size,size/1024/time2);
-  printf("   Rank3: %lf s   %lf MB   %lf GB/s\n",time3,size,size/1024/time3);
+#endif
+  double size = 1.0 * N8 * 8 / 1024 / 1024;
+  printf("   Raw:   %lf s   %lf MB   %lf GB/s\n", time_raw, size,
+         size / 1024 / time_raw);
+  printf("   Rank1: %lf s   %lf MB   %lf GB/s\n", time1, size,
+         size / 1024 / time1);
+  printf("   Rank2: %lf s   %lf MB   %lf GB/s\n", time2, size,
+         size / 1024 / time2);
+  printf("   Rank3: %lf s   %lf MB   %lf GB/s\n", time3, size,
+         size / 1024 / time3);
 }
 
-template<class Layout>
+template <class Layout>
 void run_fillview_tests45(int N, int R) {
   const int N1 = N;
-  const int N2 = N1*N1;
-  const int N4 = N2*N2;
-  const int N8 = N4*N4;
+  const int N2 = N1 * N1;
+  const int N4 = N2 * N2;
+  const int N8 = N4 * N4;
 
-  double time4,time5,time_raw = 100000.0;
+  double time4, time5, time_raw = 100000.0;
   {
-    Kokkos::View<double****,Layout> a("A4",N2,N2,N2,N2);
-    time4 = fill_view(a,1.1,R)/R;
+    Kokkos::View<double****, Layout> a("A4", N2, N2, N2, N2);
+    time4 = fill_view(a, 1.1, R) / R;
   }
   {
-    Kokkos::View<double*****,Layout> a("A5",N2,N2,N1,N1,N2);
-    time5 = fill_view(a,1.1,R)/R;
+    Kokkos::View<double*****, Layout> a("A5", N2, N2, N1, N1, N2);
+    time5 = fill_view(a, 1.1, R) / R;
   }
-  #if defined(KOKKOS_ENABLE_CUDA_LAMBDA) || !defined(KOKKOS_ENABLE_CUDA)
+#if defined(KOKKOS_ENABLE_CUDA_LAMBDA) || !defined(KOKKOS_ENABLE_CUDA)
   {
-    Kokkos::View<double*,Layout> a("A1",N8);
+    Kokkos::View<double*, Layout> a("A1", N8);
     double* a_ptr = a.data();
     Kokkos::Timer timer;
-    for(int r=0;r<R;r++) {
-      Kokkos::parallel_for(N8, KOKKOS_LAMBDA (const int& i) {
-        a_ptr[i] = 1.1;
-      });
+    for (int r = 0; r < R; r++) {
+      Kokkos::parallel_for(
+          N8, KOKKOS_LAMBDA(const int& i) { a_ptr[i] = 1.1; });
     }
     Kokkos::fence();
-    time_raw = timer.seconds()/R;
+    time_raw = timer.seconds() / R;
   }
-  #endif
-  double size = 1.0*N8*8/1024/1024;
-  printf("   Raw:   %lf s   %lf MB   %lf GB/s\n",time_raw,size,size/1024/time_raw);
-  printf("   Rank4: %lf s   %lf MB   %lf GB/s\n",time4,size,size/1024/time4);
-  printf("   Rank5: %lf s   %lf MB   %lf GB/s\n",time5,size,size/1024/time5);
+#endif
+  double size = 1.0 * N8 * 8 / 1024 / 1024;
+  printf("   Raw:   %lf s   %lf MB   %lf GB/s\n", time_raw, size,
+         size / 1024 / time_raw);
+  printf("   Rank4: %lf s   %lf MB   %lf GB/s\n", time4, size,
+         size / 1024 / time4);
+  printf("   Rank5: %lf s   %lf MB   %lf GB/s\n", time5, size,
+         size / 1024 / time5);
 }
 
-template<class Layout>
+template <class Layout>
 void run_fillview_tests6(int N, int R) {
   const int N1 = N;
-  const int N2 = N1*N1;
-  const int N4 = N2*N2;
-  const int N8 = N4*N4;
+  const int N2 = N1 * N1;
+  const int N4 = N2 * N2;
+  const int N8 = N4 * N4;
 
-  double time6,time_raw = 100000.0;
+  double time6, time_raw = 100000.0;
   {
-    Kokkos::View<double******,Layout> a("A6",N2,N1,N1,N1,N1,N2);
-    time6 = fill_view(a,1.1,R)/R;
+    Kokkos::View<double******, Layout> a("A6", N2, N1, N1, N1, N1, N2);
+    time6 = fill_view(a, 1.1, R) / R;
   }
-  #if defined(KOKKOS_ENABLE_CUDA_LAMBDA) || !defined(KOKKOS_ENABLE_CUDA)
+#if defined(KOKKOS_ENABLE_CUDA_LAMBDA) || !defined(KOKKOS_ENABLE_CUDA)
   {
-    Kokkos::View<double*,Layout> a("A1",N8);
+    Kokkos::View<double*, Layout> a("A1", N8);
     double* a_ptr = a.data();
     Kokkos::Timer timer;
-    for(int r=0;r<R;r++) {
-      Kokkos::parallel_for(N8, KOKKOS_LAMBDA (const int& i) {
-        a_ptr[i] = 1.1;
-      });
+    for (int r = 0; r < R; r++) {
+      Kokkos::parallel_for(
+          N8, KOKKOS_LAMBDA(const int& i) { a_ptr[i] = 1.1; });
     }
     Kokkos::fence();
-    time_raw = timer.seconds()/R;
+    time_raw = timer.seconds() / R;
   }
-  #endif
-  double size = 1.0*N8*8/1024/1024;
-  printf("   Raw:   %lf s   %lf MB   %lf GB/s\n",time_raw,size,size/1024/time_raw);
-  printf("   Rank6: %lf s   %lf MB   %lf GB/s\n",time6,size,size/1024/time6);
+#endif
+  double size = 1.0 * N8 * 8 / 1024 / 1024;
+  printf("   Raw:   %lf s   %lf MB   %lf GB/s\n", time_raw, size,
+         size / 1024 / time_raw);
+  printf("   Rank6: %lf s   %lf MB   %lf GB/s\n", time6, size,
+         size / 1024 / time6);
 }
 
-template<class Layout>
+template <class Layout>
 void run_fillview_tests7(int N, int R) {
   const int N1 = N;
-  const int N2 = N1*N1;
-  const int N4 = N2*N2;
-  const int N8 = N4*N4;
+  const int N2 = N1 * N1;
+  const int N4 = N2 * N2;
+  const int N8 = N4 * N4;
 
-  double time7,time_raw = 100000.0;
+  double time7, time_raw = 100000.0;
   {
-    Kokkos::View<double*******,Layout> a("A7",N2,N1,N1,N1,N1,N1,N1);
-    time7 = fill_view(a,1.1,R)/R;
+    Kokkos::View<double*******, Layout> a("A7", N2, N1, N1, N1, N1, N1, N1);
+    time7 = fill_view(a, 1.1, R) / R;
   }
-  #if defined(KOKKOS_ENABLE_CUDA_LAMBDA) || !defined(KOKKOS_ENABLE_CUDA)
+#if defined(KOKKOS_ENABLE_CUDA_LAMBDA) || !defined(KOKKOS_ENABLE_CUDA)
   {
-    Kokkos::View<double*,Layout> a("A1",N8);
+    Kokkos::View<double*, Layout> a("A1", N8);
     double* a_ptr = a.data();
     Kokkos::Timer timer;
-    for(int r=0;r<R;r++) {
-      Kokkos::parallel_for(N8, KOKKOS_LAMBDA (const int& i) {
-        a_ptr[i] = 1.1;
-      });
+    for (int r = 0; r < R; r++) {
+      Kokkos::parallel_for(
+          N8, KOKKOS_LAMBDA(const int& i) { a_ptr[i] = 1.1; });
     }
     Kokkos::fence();
-    time_raw = timer.seconds()/R;
+    time_raw = timer.seconds() / R;
   }
-  #endif
-  double size = 1.0*N8*8/1024/1024;
-  printf("   Raw:   %lf s   %lf MB   %lf GB/s\n",time_raw,size,size/1024/time_raw);
-  printf("   Rank7: %lf s   %lf MB   %lf GB/s\n",time7,size,size/1024/time7);
+#endif
+  double size = 1.0 * N8 * 8 / 1024 / 1024;
+  printf("   Raw:   %lf s   %lf MB   %lf GB/s\n", time_raw, size,
+         size / 1024 / time_raw);
+  printf("   Rank7: %lf s   %lf MB   %lf GB/s\n", time7, size,
+         size / 1024 / time7);
 }
 
-template<class Layout>
+template <class Layout>
 void run_fillview_tests8(int N, int R) {
   const int N1 = N;
-  const int N2 = N1*N1;
-  const int N4 = N2*N2;
-  const int N8 = N4*N4;
+  const int N2 = N1 * N1;
+  const int N4 = N2 * N2;
+  const int N8 = N4 * N4;
 
-  double time8,time_raw = 100000.0;
+  double time8, time_raw = 100000.0;
   {
-    Kokkos::View<double********,Layout> a("A8",N1,N1,N1,N1,N1,N1,N1,N1);
-    time8 = fill_view(a,1.1,R)/R;
+    Kokkos::View<double********, Layout> a("A8", N1, N1, N1, N1, N1, N1, N1,
+                                           N1);
+    time8 = fill_view(a, 1.1, R) / R;
   }
-  #if defined(KOKKOS_ENABLE_CUDA_LAMBDA) || !defined(KOKKOS_ENABLE_CUDA)
+#if defined(KOKKOS_ENABLE_CUDA_LAMBDA) || !defined(KOKKOS_ENABLE_CUDA)
   {
-    Kokkos::View<double*,Layout> a("A1",N8);
+    Kokkos::View<double*, Layout> a("A1", N8);
     double* a_ptr = a.data();
     Kokkos::Timer timer;
-    for(int r=0;r<R;r++) {
-      Kokkos::parallel_for(N8, KOKKOS_LAMBDA (const int& i) {
-        a_ptr[i] = 1.1;
-      });
+    for (int r = 0; r < R; r++) {
+      Kokkos::parallel_for(
+          N8, KOKKOS_LAMBDA(const int& i) { a_ptr[i] = 1.1; });
     }
     Kokkos::fence();
-    time_raw = timer.seconds()/R;
+    time_raw = timer.seconds() / R;
   }
-  #endif
-  double size = 1.0*N8*8/1024/1024;
-  printf("   Raw:   %lf s   %lf MB   %lf GB/s\n",time_raw,size,size/1024/time_raw);
-  printf("   Rank8: %lf s   %lf MB   %lf GB/s\n",time8,size,size/1024/time8);
+#endif
+  double size = 1.0 * N8 * 8 / 1024 / 1024;
+  printf("   Raw:   %lf s   %lf MB   %lf GB/s\n", time_raw, size,
+         size / 1024 / time_raw);
+  printf("   Rank8: %lf s   %lf MB   %lf GB/s\n", time8, size,
+         size / 1024 / time8);
 }
 
-}
+}  // namespace Test
diff --git a/lib/kokkos/core/perf_test/PerfTest_ViewFill_123.cpp b/lib/kokkos/core/perf_test/PerfTest_ViewFill_123.cpp
index 6b1a4a6bd6..0bf8a28329 100644
--- a/lib/kokkos/core/perf_test/PerfTest_ViewFill_123.cpp
+++ b/lib/kokkos/core/perf_test/PerfTest_ViewFill_123.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -44,10 +45,10 @@
 #include <PerfTest_ViewFill.hpp>
 
 namespace Test {
-TEST_F( default_exec, ViewFill_Rank123 ) {
+TEST(default_exec, ViewFill_Rank123) {
   printf("ViewFill Performance for LayoutLeft:\n");
-  run_fillview_tests123<Kokkos::LayoutLeft>(10,1);
+  run_fillview_tests123<Kokkos::LayoutLeft>(10, 1);
   printf("ViewFill Performance for LayoutRight:\n");
-  run_fillview_tests123<Kokkos::LayoutRight>(10,1);
-}
+  run_fillview_tests123<Kokkos::LayoutRight>(10, 1);
 }
+}  // namespace Test
diff --git a/lib/kokkos/core/perf_test/PerfTest_ViewFill_45.cpp b/lib/kokkos/core/perf_test/PerfTest_ViewFill_45.cpp
index e1d1b6900d..53ac509da8 100644
--- a/lib/kokkos/core/perf_test/PerfTest_ViewFill_45.cpp
+++ b/lib/kokkos/core/perf_test/PerfTest_ViewFill_45.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -44,10 +45,10 @@
 #include <PerfTest_ViewFill.hpp>
 
 namespace Test {
-TEST_F( default_exec, ViewFill_Rank45 ) {
+TEST(default_exec, ViewFill_Rank45) {
   printf("ViewFill Performance for LayoutLeft:\n");
-  run_fillview_tests45<Kokkos::LayoutLeft>(10,1);
+  run_fillview_tests45<Kokkos::LayoutLeft>(10, 1);
   printf("ViewFill Performance for LayoutRight:\n");
-  run_fillview_tests45<Kokkos::LayoutRight>(10,1);
-}
+  run_fillview_tests45<Kokkos::LayoutRight>(10, 1);
 }
+}  // namespace Test
diff --git a/lib/kokkos/core/perf_test/PerfTest_ViewFill_6.cpp b/lib/kokkos/core/perf_test/PerfTest_ViewFill_6.cpp
index 571867937e..f0a2e248f2 100644
--- a/lib/kokkos/core/perf_test/PerfTest_ViewFill_6.cpp
+++ b/lib/kokkos/core/perf_test/PerfTest_ViewFill_6.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -44,10 +45,10 @@
 #include <PerfTest_ViewFill.hpp>
 
 namespace Test {
-TEST_F( default_exec, ViewFill_Rank6 ) {
+TEST(default_exec, ViewFill_Rank6) {
   printf("ViewFill Performance for LayoutLeft:\n");
-  run_fillview_tests6<Kokkos::LayoutLeft>(10,1);
+  run_fillview_tests6<Kokkos::LayoutLeft>(10, 1);
   printf("ViewFill Performance for LayoutRight:\n");
-  run_fillview_tests6<Kokkos::LayoutRight>(10,1);
-}
+  run_fillview_tests6<Kokkos::LayoutRight>(10, 1);
 }
+}  // namespace Test
diff --git a/lib/kokkos/core/perf_test/PerfTest_ViewFill_7.cpp b/lib/kokkos/core/perf_test/PerfTest_ViewFill_7.cpp
index 9b89c8fc7b..675d9e636f 100644
--- a/lib/kokkos/core/perf_test/PerfTest_ViewFill_7.cpp
+++ b/lib/kokkos/core/perf_test/PerfTest_ViewFill_7.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -44,10 +45,10 @@
 #include <PerfTest_ViewFill.hpp>
 
 namespace Test {
-TEST_F( default_exec, ViewFill_Rank7 ) {
+TEST(default_exec, ViewFill_Rank7) {
   printf("ViewFill Performance for LayoutLeft:\n");
-  run_fillview_tests7<Kokkos::LayoutLeft>(10,1);
+  run_fillview_tests7<Kokkos::LayoutLeft>(10, 1);
   printf("ViewFill Performance for LayoutRight:\n");
-  run_fillview_tests7<Kokkos::LayoutRight>(10,1);
-}
+  run_fillview_tests7<Kokkos::LayoutRight>(10, 1);
 }
+}  // namespace Test
diff --git a/lib/kokkos/core/perf_test/PerfTest_ViewFill_8.cpp b/lib/kokkos/core/perf_test/PerfTest_ViewFill_8.cpp
index 4d3df50354..35e1e81c43 100644
--- a/lib/kokkos/core/perf_test/PerfTest_ViewFill_8.cpp
+++ b/lib/kokkos/core/perf_test/PerfTest_ViewFill_8.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -44,10 +45,10 @@
 #include <PerfTest_ViewFill.hpp>
 
 namespace Test {
-TEST_F( default_exec, ViewFill_Rank8 ) {
+TEST(default_exec, ViewFill_Rank8) {
   printf("ViewFill Performance for LayoutLeft:\n");
-  run_fillview_tests8<Kokkos::LayoutLeft>(10,1);
+  run_fillview_tests8<Kokkos::LayoutLeft>(10, 1);
   printf("ViewFill Performance for LayoutRight:\n");
-  run_fillview_tests8<Kokkos::LayoutRight>(10,1);
-}
+  run_fillview_tests8<Kokkos::LayoutRight>(10, 1);
 }
+}  // namespace Test
diff --git a/lib/kokkos/core/perf_test/PerfTest_ViewResize.hpp b/lib/kokkos/core/perf_test/PerfTest_ViewResize.hpp
index b5019b467a..2ea81b5046 100644
--- a/lib/kokkos/core/perf_test/PerfTest_ViewResize.hpp
+++ b/lib/kokkos/core/perf_test/PerfTest_ViewResize.hpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -48,230 +49,340 @@
 
 namespace Test {
 
-template<class Layout>
+template <class Layout>
 void run_resizeview_tests123(int N, int R) {
   const int N1 = N;
-  const int N2 = N1*N1;
-  const int N3 = N2*N1;
-  const int N4 = N2*N2;
-  const int N8 = N4*N4;
+  const int N2 = N1 * N1;
+  const int N3 = N2 * N1;
+  const int N4 = N2 * N2;
+  const int N8 = N4 * N4;
 
-  double time1,time2,time3,time_raw = 100000.0;
+  double time1, time2, time3, time_raw = 100000.0;
+  double time1_noinit, time2_noinit, time3_noinit;
   {
-    Kokkos::View<double*,Layout> a("A1",N8);
+    Kokkos::View<double*, Layout> a("A1", N8);
     Kokkos::Timer timer;
-    for(int r=0; r<R; r++) {
-      Kokkos::View<double*,Layout> a_(a);
-      Kokkos::resize(a_,int(N8*1.1));
+    for (int r = 0; r < R; r++) {
+      Kokkos::View<double*, Layout> a_(a);
+      Kokkos::resize(a_, int(N8 * 1.1));
     }
-    time1 = timer.seconds()/R;
+    time1 = timer.seconds() / R;
   }
   {
-    Kokkos::View<double**,Layout> a("A2",N4,N4);
+    Kokkos::View<double**, Layout> a("A2", N4, N4);
     Kokkos::Timer timer;
-    for(int r=0; r<R; r++) {
-      Kokkos::View<double**,Layout> a_(a);
-      Kokkos::resize(a_,int(N4*1.1),N4);
+    for (int r = 0; r < R; r++) {
+      Kokkos::View<double**, Layout> a_(a);
+      Kokkos::resize(a_, int(N4 * 1.1), N4);
     }
-    time2 = timer.seconds()/R;
+    time2 = timer.seconds() / R;
   }
   {
-    Kokkos::View<double***,Layout> a("A3",N3,N3,N2);
+    Kokkos::View<double***, Layout> a("A3", N3, N3, N2);
     Kokkos::Timer timer;
-    for(int r=0; r<R; r++) {
-      Kokkos::View<double***,Layout> a_(a);
-      Kokkos::resize(a_,int(N3*1.1),N3,N2);
+    for (int r = 0; r < R; r++) {
+      Kokkos::View<double***, Layout> a_(a);
+      Kokkos::resize(a_, int(N3 * 1.1), N3, N2);
     }
-    time3 = timer.seconds()/R;
+    time3 = timer.seconds() / R;
   }
-  #if defined(KOKKOS_ENABLE_CUDA_LAMBDA) || !defined(KOKKOS_ENABLE_CUDA)
   {
-    Kokkos::View<double*,Layout> a("A1",N8);
+    Kokkos::View<double*, Layout> a("A1", N8);
+    Kokkos::Timer timer;
+    for (int r = 0; r < R; r++) {
+      Kokkos::View<double*, Layout> a_(a);
+      Kokkos::resize(Kokkos::WithoutInitializing, a_, int(N8 * 1.1));
+    }
+    time1_noinit = timer.seconds() / R;
+  }
+  {
+    Kokkos::View<double**, Layout> a("A2", N4, N4);
+    Kokkos::Timer timer;
+    for (int r = 0; r < R; r++) {
+      Kokkos::View<double**, Layout> a_(a);
+      Kokkos::resize(Kokkos::WithoutInitializing, a_, int(N4 * 1.1), N4);
+    }
+    time2_noinit = timer.seconds() / R;
+  }
+  {
+    Kokkos::View<double***, Layout> a("A3", N3, N3, N2);
+    Kokkos::Timer timer;
+    for (int r = 0; r < R; r++) {
+      Kokkos::View<double***, Layout> a_(a);
+      Kokkos::resize(Kokkos::WithoutInitializing, a_, int(N3 * 1.1), N3, N2);
+    }
+    time3_noinit = timer.seconds() / R;
+  }
+#if defined(KOKKOS_ENABLE_CUDA_LAMBDA) || !defined(KOKKOS_ENABLE_CUDA)
+  {
+    Kokkos::View<double*, Layout> a("A1", N8);
     double* a_ptr = a.data();
     Kokkos::Timer timer;
-    for(int r=0;r<R;r++) {
-      Kokkos::View<double*,Layout> a1(Kokkos::ViewAllocateWithoutInitializing("A1"),int(N8*1.1));
+    for (int r = 0; r < R; r++) {
+      Kokkos::View<double*, Layout> a1(
+          Kokkos::ViewAllocateWithoutInitializing("A1"), int(N8 * 1.1));
       double* a1_ptr = a1.data();
-      Kokkos::parallel_for(N8, KOKKOS_LAMBDA (const int& i) {
-        a1_ptr[i] = a_ptr[i];
-      });
+      Kokkos::parallel_for(
+          N8, KOKKOS_LAMBDA(const int& i) { a1_ptr[i] = a_ptr[i]; });
       Kokkos::fence();
     }
     Kokkos::fence();
-    time_raw = timer.seconds()/R;
+    time_raw = timer.seconds() / R;
   }
-  #endif
-  double size = 1.0*N8*8/1024/1024;
-  printf("   Raw:   %lf s   %lf MB   %lf GB/s\n",time_raw,size,2.0*size/1024/time_raw);
-  printf("   Rank1: %lf s   %lf MB   %lf GB/s\n",time1,size,2.0*size/1024/time1);
-  printf("   Rank2: %lf s   %lf MB   %lf GB/s\n",time2,size,2.0*size/1024/time2);
-  printf("   Rank3: %lf s   %lf MB   %lf GB/s\n",time3,size,2.0*size/1024/time3);
+#endif
+  double size = 1.0 * N8 * 8 / 1024 / 1024;
+  printf("   Raw:   %lf s   %lf MB   %lf GB/s\n", time_raw, size,
+         2.0 * size / 1024 / time_raw);
+  printf("   Rank1: %lf s   %lf MB   %lf GB/s\n", time1, size,
+         2.0 * size / 1024 / time1);
+  printf("   Rank2: %lf s   %lf MB   %lf GB/s\n", time2, size,
+         2.0 * size / 1024 / time2);
+  printf("   Rank3: %lf s   %lf MB   %lf GB/s\n", time3, size,
+         2.0 * size / 1024 / time3);
+  printf("   Rank1 (WithoutInitializing): %lf s   %lf MB   %lf GB/s\n",
+         time1_noinit, size, 2.0 * size / 1024 / time1_noinit);
+  printf("   Rank2 (WithoutInitializing): %lf s   %lf MB   %lf GB/s\n",
+         time2_noinit, size, 2.0 * size / 1024 / time2_noinit);
+  printf("   Rank3 (WithoutInitializing): %lf s   %lf MB   %lf GB/s\n",
+         time3_noinit, size, 2.0 * size / 1024 / time3_noinit);
 }
 
-template<class Layout>
+template <class Layout>
 void run_resizeview_tests45(int N, int R) {
   const int N1 = N;
-  const int N2 = N1*N1;
-  const int N4 = N2*N2;
-  const int N8 = N4*N4;
+  const int N2 = N1 * N1;
+  const int N4 = N2 * N2;
+  const int N8 = N4 * N4;
 
-  double time4,time5,time_raw = 100000.0;
+  double time4, time5, time_raw = 100000.0;
+  double time4_noinit, time5_noinit;
   {
-    Kokkos::View<double****,Layout> a("A4",N2,N2,N2,N2);
+    Kokkos::View<double****, Layout> a("A4", N2, N2, N2, N2);
     Kokkos::Timer timer;
-    for(int r=0; r<R; r++) {
-      Kokkos::View<double****,Layout> a_(a);
-      Kokkos::resize(a_,int(N2*1.1),N2,N2,N2);
+    for (int r = 0; r < R; r++) {
+      Kokkos::View<double****, Layout> a_(a);
+      Kokkos::resize(a_, int(N2 * 1.1), N2, N2, N2);
     }
-    time4 = timer.seconds()/R;
+    time4 = timer.seconds() / R;
   }
   {
-    Kokkos::View<double*****,Layout> a("A5",N2,N2,N1,N1,N2);
+    Kokkos::View<double*****, Layout> a("A5", N2, N2, N1, N1, N2);
     Kokkos::Timer timer;
-    for(int r=0; r<R; r++) {
-      Kokkos::View<double*****,Layout> a_(a);
-      Kokkos::resize(a_,int(N2*1.1),N2,N1,N1,N2);
+    for (int r = 0; r < R; r++) {
+      Kokkos::View<double*****, Layout> a_(a);
+      Kokkos::resize(a_, int(N2 * 1.1), N2, N1, N1, N2);
     }
-    time5 = timer.seconds()/R;
+    time5 = timer.seconds() / R;
   }
-  #if defined(KOKKOS_ENABLE_CUDA_LAMBDA) || !defined(KOKKOS_ENABLE_CUDA)
   {
-    Kokkos::View<double*,Layout> a("A1",N8);
+    Kokkos::View<double****, Layout> a("A4", N2, N2, N2, N2);
+    Kokkos::Timer timer;
+    for (int r = 0; r < R; r++) {
+      Kokkos::View<double****, Layout> a_(a);
+      Kokkos::resize(Kokkos::WithoutInitializing, a_, int(N2 * 1.1), N2, N2,
+                     N2);
+    }
+    time4_noinit = timer.seconds() / R;
+  }
+  {
+    Kokkos::View<double*****, Layout> a("A5", N2, N2, N1, N1, N2);
+    Kokkos::Timer timer;
+    for (int r = 0; r < R; r++) {
+      Kokkos::View<double*****, Layout> a_(a);
+      Kokkos::resize(Kokkos::WithoutInitializing, a_, int(N2 * 1.1), N2, N1, N1,
+                     N2);
+    }
+    time5_noinit = timer.seconds() / R;
+  }
+#if defined(KOKKOS_ENABLE_CUDA_LAMBDA) || !defined(KOKKOS_ENABLE_CUDA)
+  {
+    Kokkos::View<double*, Layout> a("A1", N8);
     double* a_ptr = a.data();
     Kokkos::Timer timer;
-    for(int r=0;r<R;r++) {
-      Kokkos::View<double*,Layout> a1(Kokkos::ViewAllocateWithoutInitializing("A1"),int(N8*1.1));
+    for (int r = 0; r < R; r++) {
+      Kokkos::View<double*, Layout> a1(
+          Kokkos::ViewAllocateWithoutInitializing("A1"), int(N8 * 1.1));
       double* a1_ptr = a1.data();
-      Kokkos::parallel_for(N8, KOKKOS_LAMBDA (const int& i) {
-        a1_ptr[i] = a_ptr[i];
-      });
+      Kokkos::parallel_for(
+          N8, KOKKOS_LAMBDA(const int& i) { a1_ptr[i] = a_ptr[i]; });
       Kokkos::fence();
     }
     Kokkos::fence();
-    time_raw = timer.seconds()/R;
+    time_raw = timer.seconds() / R;
   }
-  #endif
-  double size = 1.0*N8*8/1024/1024;
-  printf("   Raw:   %lf s   %lf MB   %lf GB/s\n",time_raw,size,2.0*size/1024/time_raw);
-  printf("   Rank4: %lf s   %lf MB   %lf GB/s\n",time4,size,2.0*size/1024/time4);
-  printf("   Rank5: %lf s   %lf MB   %lf GB/s\n",time5,size,2.0*size/1024/time5);
+#endif
+  double size = 1.0 * N8 * 8 / 1024 / 1024;
+  printf("   Raw:   %lf s   %lf MB   %lf GB/s\n", time_raw, size,
+         2.0 * size / 1024 / time_raw);
+  printf("   Rank4: %lf s   %lf MB   %lf GB/s\n", time4, size,
+         2.0 * size / 1024 / time4);
+  printf("   Rank5: %lf s   %lf MB   %lf GB/s\n", time5, size,
+         2.0 * size / 1024 / time5);
+  printf("   Rank4 (WithoutInitializing): %lf s   %lf MB   %lf GB/s\n",
+         time4_noinit, size, 2.0 * size / 1024 / time4_noinit);
+  printf("   Rank5 (WithoutInitializing): %lf s   %lf MB   %lf GB/s\n",
+         time5_noinit, size, 2.0 * size / 1024 / time5_noinit);
 }
 
-template<class Layout>
+template <class Layout>
 void run_resizeview_tests6(int N, int R) {
   const int N1 = N;
-  const int N2 = N1*N1;
-  const int N4 = N2*N2;
-  const int N8 = N4*N4;
+  const int N2 = N1 * N1;
+  const int N4 = N2 * N2;
+  const int N8 = N4 * N4;
 
-  double time6,time_raw = 100000.0;
+  double time6, time6_noinit, time_raw = 100000.0;
   {
-    Kokkos::View<double******,Layout> a("A6",N2,N1,N1,N1,N1,N2);
+    Kokkos::View<double******, Layout> a("A6", N2, N1, N1, N1, N1, N2);
     Kokkos::Timer timer;
-    for(int r=0; r<R; r++) {
-      Kokkos::View<double******,Layout> a_(a);
-      Kokkos::resize(a_,int(N2*1.1),N1,N1,N1,N1,N2);
+    for (int r = 0; r < R; r++) {
+      Kokkos::View<double******, Layout> a_(a);
+      Kokkos::resize(a_, int(N2 * 1.1), N1, N1, N1, N1, N2);
     }
-    time6 = timer.seconds()/R;
+    time6 = timer.seconds() / R;
   }
-  #if defined(KOKKOS_ENABLE_CUDA_LAMBDA) || !defined(KOKKOS_ENABLE_CUDA)
   {
-    Kokkos::View<double*,Layout> a("A1",N8);
+    Kokkos::View<double******, Layout> a("A6", N2, N1, N1, N1, N1, N2);
+    Kokkos::Timer timer;
+    for (int r = 0; r < R; r++) {
+      Kokkos::View<double******, Layout> a_(a);
+      Kokkos::resize(Kokkos::WithoutInitializing, a_, int(N2 * 1.1), N1, N1, N1,
+                     N1, N2);
+    }
+    time6_noinit = timer.seconds() / R;
+  }
+#if defined(KOKKOS_ENABLE_CUDA_LAMBDA) || !defined(KOKKOS_ENABLE_CUDA)
+  {
+    Kokkos::View<double*, Layout> a("A1", N8);
     double* a_ptr = a.data();
     Kokkos::Timer timer;
-    for(int r=0;r<R;r++) {
-      Kokkos::View<double*,Layout> a1(Kokkos::ViewAllocateWithoutInitializing("A1"),int(N8*1.1));
+    for (int r = 0; r < R; r++) {
+      Kokkos::View<double*, Layout> a1(
+          Kokkos::ViewAllocateWithoutInitializing("A1"), int(N8 * 1.1));
       double* a1_ptr = a1.data();
-      Kokkos::parallel_for(N8, KOKKOS_LAMBDA (const int& i) {
-        a1_ptr[i] = a_ptr[i];
-      });
+      Kokkos::parallel_for(
+          N8, KOKKOS_LAMBDA(const int& i) { a1_ptr[i] = a_ptr[i]; });
       Kokkos::fence();
     }
     Kokkos::fence();
-    time_raw = timer.seconds()/R;
+    time_raw = timer.seconds() / R;
   }
-  #endif
-  double size = 1.0*N8*8/1024/1024;
-  printf("   Raw:   %lf s   %lf MB   %lf GB/s\n",time_raw,size,2.0*size/1024/time_raw);
-  printf("   Rank6: %lf s   %lf MB   %lf GB/s\n",time6,size,2.0*size/1024/time6);
+#endif
+  double size = 1.0 * N8 * 8 / 1024 / 1024;
+  printf("   Raw:   %lf s   %lf MB   %lf GB/s\n", time_raw, size,
+         2.0 * size / 1024 / time_raw);
+  printf("   Rank6: %lf s   %lf MB   %lf GB/s\n", time6, size,
+         2.0 * size / 1024 / time6);
+  printf("   Rank6 (WithoutInitializing): %lf s   %lf MB   %lf GB/s\n",
+         time6_noinit, size, 2.0 * size / 1024 / time6_noinit);
 }
 
-template<class Layout>
+template <class Layout>
 void run_resizeview_tests7(int N, int R) {
   const int N1 = N;
-  const int N2 = N1*N1;
-  const int N4 = N2*N2;
-  const int N8 = N4*N4;
+  const int N2 = N1 * N1;
+  const int N4 = N2 * N2;
+  const int N8 = N4 * N4;
 
-  double time7,time_raw = 100000.0;
+  double time7, time7_noinit, time_raw = 100000.0;
   {
-    Kokkos::View<double*******,Layout> a("A7",N2,N1,N1,N1,N1,N1,N1);
+    Kokkos::View<double*******, Layout> a("A7", N2, N1, N1, N1, N1, N1, N1);
     Kokkos::Timer timer;
-    for(int r=0; r<R; r++) {
-      Kokkos::View<double*******,Layout> a_(a);
-      Kokkos::resize(a_,int(N2*1.1),N1,N1,N1,N1,N1,N1);
+    for (int r = 0; r < R; r++) {
+      Kokkos::View<double*******, Layout> a_(a);
+      Kokkos::resize(a_, int(N2 * 1.1), N1, N1, N1, N1, N1, N1);
     }
-    time7 = timer.seconds()/R;
+    time7 = timer.seconds() / R;
   }
-  #if defined(KOKKOS_ENABLE_CUDA_LAMBDA) || !defined(KOKKOS_ENABLE_CUDA)
   {
-    Kokkos::View<double*,Layout> a("A1",N8);
+    Kokkos::View<double*******, Layout> a("A7", N2, N1, N1, N1, N1, N1, N1);
+    Kokkos::Timer timer;
+    for (int r = 0; r < R; r++) {
+      Kokkos::View<double*******, Layout> a_(a);
+      Kokkos::resize(Kokkos::WithoutInitializing, a_, int(N2 * 1.1), N1, N1, N1,
+                     N1, N1, N1);
+    }
+    time7_noinit = timer.seconds() / R;
+  }
+#if defined(KOKKOS_ENABLE_CUDA_LAMBDA) || !defined(KOKKOS_ENABLE_CUDA)
+  {
+    Kokkos::View<double*, Layout> a("A1", N8);
     double* a_ptr = a.data();
     Kokkos::Timer timer;
-    for(int r=0;r<R;r++) {
-      Kokkos::View<double*,Layout> a1(Kokkos::ViewAllocateWithoutInitializing("A1"),int(N8*1.1));
+    for (int r = 0; r < R; r++) {
+      Kokkos::View<double*, Layout> a1(
+          Kokkos::ViewAllocateWithoutInitializing("A1"), int(N8 * 1.1));
       double* a1_ptr = a1.data();
-      Kokkos::parallel_for(N8, KOKKOS_LAMBDA (const int& i) {
-        a1_ptr[i] = a_ptr[i];
-      });
+      Kokkos::parallel_for(
+          N8, KOKKOS_LAMBDA(const int& i) { a1_ptr[i] = a_ptr[i]; });
       Kokkos::fence();
     }
     Kokkos::fence();
-    time_raw = timer.seconds()/R;
+    time_raw = timer.seconds() / R;
   }
-  #endif
-  double size = 1.0*N8*8/1024/1024;
-  printf("   Raw:   %lf s   %lf MB   %lf GB/s\n",time_raw,size,2.0*size/1024/time_raw);
-  printf("   Rank7: %lf s   %lf MB   %lf GB/s\n",time7,size,2.0*size/1024/time7);
+#endif
+  double size = 1.0 * N8 * 8 / 1024 / 1024;
+  printf("   Raw:   %lf s   %lf MB   %lf GB/s\n", time_raw, size,
+         2.0 * size / 1024 / time_raw);
+  printf("   Rank7: %lf s   %lf MB   %lf GB/s\n", time7, size,
+         2.0 * size / 1024 / time7);
+  printf("   Rank7 (WithoutInitializing): %lf s   %lf MB   %lf GB/s\n",
+         time7_noinit, size, 2.0 * size / 1024 / time7_noinit);
 }
 
-template<class Layout>
+template <class Layout>
 void run_resizeview_tests8(int N, int R) {
   const int N1 = N;
-  const int N2 = N1*N1;
-  const int N4 = N2*N2;
-  const int N8 = N4*N4;
+  const int N2 = N1 * N1;
+  const int N4 = N2 * N2;
+  const int N8 = N4 * N4;
 
-  double time8,time_raw = 100000.0;
+  double time8, time8_noinit, time_raw = 100000.0;
   {
-    Kokkos::View<double********,Layout> a("A8",N1,N1,N1,N1,N1,N1,N1,N1);
+    Kokkos::View<double********, Layout> a("A8", N1, N1, N1, N1, N1, N1, N1,
+                                           N1);
     Kokkos::Timer timer;
-    for(int r=0; r<R; r++) {
-      Kokkos::View<double********,Layout> a_(a);
-      Kokkos::resize(a_,int(N1*1.1),N1,N1,N1,N1,N1,N1,N1);
+    for (int r = 0; r < R; r++) {
+      Kokkos::View<double********, Layout> a_(a);
+      Kokkos::resize(a_, int(N1 * 1.1), N1, N1, N1, N1, N1, N1, N1);
     }
-    time8 = timer.seconds()/R;
+    time8 = timer.seconds() / R;
   }
-  #if defined(KOKKOS_ENABLE_CUDA_LAMBDA) || !defined(KOKKOS_ENABLE_CUDA)
   {
-    Kokkos::View<double*,Layout> a("A1",N8);
+    Kokkos::View<double********, Layout> a("A8", N1, N1, N1, N1, N1, N1, N1,
+                                           N1);
+    Kokkos::Timer timer;
+    for (int r = 0; r < R; r++) {
+      Kokkos::View<double********, Layout> a_(a);
+      Kokkos::resize(Kokkos::WithoutInitializing, a_, int(N1 * 1.1), N1, N1, N1,
+                     N1, N1, N1, N1);
+    }
+    time8_noinit = timer.seconds() / R;
+  }
+#if defined(KOKKOS_ENABLE_CUDA_LAMBDA) || !defined(KOKKOS_ENABLE_CUDA)
+  {
+    Kokkos::View<double*, Layout> a("A1", N8);
     double* a_ptr = a.data();
     Kokkos::Timer timer;
-    for(int r=0;r<R;r++) {
-      Kokkos::View<double*,Layout> a1(Kokkos::ViewAllocateWithoutInitializing("A1"),int(N8*1.1));
+    for (int r = 0; r < R; r++) {
+      Kokkos::View<double*, Layout> a1(
+          Kokkos::ViewAllocateWithoutInitializing("A1"), int(N8 * 1.1));
       double* a1_ptr = a1.data();
-      Kokkos::parallel_for(N8, KOKKOS_LAMBDA (const int& i) {
-        a1_ptr[i] = a_ptr[i];
-      });
+      Kokkos::parallel_for(
+          N8, KOKKOS_LAMBDA(const int& i) { a1_ptr[i] = a_ptr[i]; });
       Kokkos::fence();
     }
     Kokkos::fence();
-    time_raw = timer.seconds()/R;
+    time_raw = timer.seconds() / R;
   }
-  #endif
-  double size = 1.0*N8*8/1024/1024;
-  printf("   Raw:   %lf s   %lf MB   %lf GB/s\n",time_raw,size,2.0*size/1024/time_raw);
-  printf("   Rank8: %lf s   %lf MB   %lf GB/s\n",time8,size,2.0*size/1024/time8);
+#endif
+  double size = 1.0 * N8 * 8 / 1024 / 1024;
+  printf("   Raw:   %lf s   %lf MB   %lf GB/s\n", time_raw, size,
+         2.0 * size / 1024 / time_raw);
+  printf("   Rank8: %lf s   %lf MB   %lf GB/s\n", time8, size,
+         2.0 * size / 1024 / time8);
+  printf("   Rank8 (WithoutInitializing): %lf s   %lf MB   %lf GB/s\n",
+         time8_noinit, size, 2.0 * size / 1024 / time8_noinit);
 }
 
-}
+}  // namespace Test
diff --git a/lib/kokkos/core/perf_test/PerfTest_ViewResize_123.cpp b/lib/kokkos/core/perf_test/PerfTest_ViewResize_123.cpp
index 61b7edf373..1dc4f285f5 100644
--- a/lib/kokkos/core/perf_test/PerfTest_ViewResize_123.cpp
+++ b/lib/kokkos/core/perf_test/PerfTest_ViewResize_123.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -45,11 +46,11 @@
 
 namespace Test {
 
-TEST_F( default_exec, ViewResize_Rank123 ) {
+TEST(default_exec, ViewResize_Rank123) {
   printf("Resize View Performance for LayoutLeft:\n");
-  run_resizeview_tests123<Kokkos::LayoutLeft>(10,1);
+  run_resizeview_tests123<Kokkos::LayoutLeft>(10, 1);
   printf("Resize View Performance for LayoutRight:\n");
-  run_resizeview_tests123<Kokkos::LayoutRight>(10,1);
+  run_resizeview_tests123<Kokkos::LayoutRight>(10, 1);
 }
 
-}
+}  // namespace Test
diff --git a/lib/kokkos/core/perf_test/PerfTest_ViewResize_45.cpp b/lib/kokkos/core/perf_test/PerfTest_ViewResize_45.cpp
index 172f9474d9..3754a5bb14 100644
--- a/lib/kokkos/core/perf_test/PerfTest_ViewResize_45.cpp
+++ b/lib/kokkos/core/perf_test/PerfTest_ViewResize_45.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -45,11 +46,11 @@
 
 namespace Test {
 
-TEST_F( default_exec, ViewResize_Rank_45 ) {
+TEST(default_exec, ViewResize_Rank_45) {
   printf("Resize View Performance for LayoutLeft:\n");
-  run_resizeview_tests45<Kokkos::LayoutLeft>(10,1);
+  run_resizeview_tests45<Kokkos::LayoutLeft>(10, 1);
   printf("Resize View Performance for LayoutRight:\n");
-  run_resizeview_tests45<Kokkos::LayoutRight>(10,1);
+  run_resizeview_tests45<Kokkos::LayoutRight>(10, 1);
 }
 
-}
+}  // namespace Test
diff --git a/lib/kokkos/core/perf_test/PerfTest_ViewResize_6.cpp b/lib/kokkos/core/perf_test/PerfTest_ViewResize_6.cpp
index d4f8fb2af0..1b8d6fbc8a 100644
--- a/lib/kokkos/core/perf_test/PerfTest_ViewResize_6.cpp
+++ b/lib/kokkos/core/perf_test/PerfTest_ViewResize_6.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -45,11 +46,11 @@
 
 namespace Test {
 
-TEST_F( default_exec, ViewResize_Rank6 ) {
+TEST(default_exec, ViewResize_Rank6) {
   printf("Resize View Performance for LayoutLeft:\n");
-  run_resizeview_tests6<Kokkos::LayoutLeft>(10,1);
+  run_resizeview_tests6<Kokkos::LayoutLeft>(10, 1);
   printf("Resize View Performance for LayoutRight:\n");
-  run_resizeview_tests6<Kokkos::LayoutRight>(10,1);
+  run_resizeview_tests6<Kokkos::LayoutRight>(10, 1);
 }
 
-}
+}  // namespace Test
diff --git a/lib/kokkos/core/perf_test/PerfTest_ViewResize_7.cpp b/lib/kokkos/core/perf_test/PerfTest_ViewResize_7.cpp
index f7b9b5b545..f8efa195fc 100644
--- a/lib/kokkos/core/perf_test/PerfTest_ViewResize_7.cpp
+++ b/lib/kokkos/core/perf_test/PerfTest_ViewResize_7.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -45,11 +46,11 @@
 
 namespace Test {
 
-TEST_F( default_exec, ViewResize_Rank7 ) {
+TEST(default_exec, ViewResize_Rank7) {
   printf("Resize View Performance for LayoutLeft:\n");
-  run_resizeview_tests7<Kokkos::LayoutLeft>(10,1);
+  run_resizeview_tests7<Kokkos::LayoutLeft>(10, 1);
   printf("Resize View Performance for LayoutRight:\n");
-  run_resizeview_tests7<Kokkos::LayoutRight>(10,1);
+  run_resizeview_tests7<Kokkos::LayoutRight>(10, 1);
 }
 
-}
+}  // namespace Test
diff --git a/lib/kokkos/core/perf_test/PerfTest_ViewResize_8.cpp b/lib/kokkos/core/perf_test/PerfTest_ViewResize_8.cpp
index 877fcef933..afeeb64356 100644
--- a/lib/kokkos/core/perf_test/PerfTest_ViewResize_8.cpp
+++ b/lib/kokkos/core/perf_test/PerfTest_ViewResize_8.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -45,11 +46,11 @@
 
 namespace Test {
 
-TEST_F( default_exec, ViewResize_Rank8 ) {
+TEST(default_exec, ViewResize_Rank8) {
   printf("Resize View Performance for LayoutLeft:\n");
-  run_resizeview_tests8<Kokkos::LayoutLeft>(10,1);
+  run_resizeview_tests8<Kokkos::LayoutLeft>(10, 1);
   printf("Resize View Performance for LayoutRight:\n");
-  run_resizeview_tests8<Kokkos::LayoutRight>(10,1);
+  run_resizeview_tests8<Kokkos::LayoutRight>(10, 1);
 }
 
-}
+}  // namespace Test
diff --git a/lib/kokkos/core/perf_test/test_atomic.cpp b/lib/kokkos/core/perf_test/test_atomic.cpp
index 24e4f015d3..7699d7b91c 100644
--- a/lib/kokkos/core/perf_test/test_atomic.cpp
+++ b/lib/kokkos/core/perf_test/test_atomic.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -50,335 +51,323 @@
 
 typedef Kokkos::DefaultExecutionSpace exec_space;
 
-#define RESET		0
-#define BRIGHT 		1
-#define DIM		2
-#define UNDERLINE 	3
-#define BLINK		4
-#define REVERSE		7
-#define HIDDEN		8
+#define RESET 0
+#define BRIGHT 1
+#define DIM 2
+#define UNDERLINE 3
+#define BLINK 4
+#define REVERSE 7
+#define HIDDEN 8
 
-#define BLACK 		0
-#define RED		1
-#define GREEN		2
-#define YELLOW		3
-#define BLUE		4
-#define MAGENTA		5
-#define CYAN		6
-#define GREY		7
-#define	WHITE		8
+#define BLACK 0
+#define RED 1
+#define GREEN 2
+#define YELLOW 3
+#define BLUE 4
+#define MAGENTA 5
+#define CYAN 6
+#define GREY 7
+#define WHITE 8
 
-void textcolor(int attr, int fg, int bg)
-{	char command[40];
+void textcolor(int attr, int fg, int bg) {
+  char command[40];
 
-	/* Command is the control command to the terminal */
-	sprintf(command, "%c[%d;%d;%dm", 0x1B, attr, fg + 30, bg + 40);
-	printf("%s", command);
+  /* Command is the control command to the terminal */
+  sprintf(command, "%c[%d;%d;%dm", 0x1B, attr, fg + 30, bg + 40);
+  printf("%s", command);
 }
-void textcolor_standard() {textcolor(RESET, BLACK, WHITE);}
+void textcolor_standard() { textcolor(RESET, BLACK, WHITE); }
 
-
-template<class T,class DEVICE_TYPE>
-struct ZeroFunctor{
+template <class T, class DEVICE_TYPE>
+struct ZeroFunctor {
   typedef DEVICE_TYPE execution_space;
-  typedef typename Kokkos::View<T,execution_space> type;
-  typedef typename Kokkos::View<T,execution_space>::HostMirror h_type;
+  typedef typename Kokkos::View<T, execution_space> type;
+  typedef typename Kokkos::View<T, execution_space>::HostMirror h_type;
   type data;
   KOKKOS_INLINE_FUNCTION
-  void operator()(int) const {
-    data() = 0;
-  }
+  void operator()(int) const { data() = 0; }
 };
 
 //---------------------------------------------------
 //--------------atomic_fetch_add---------------------
 //---------------------------------------------------
 
-template<class T,class DEVICE_TYPE>
-struct AddFunctor{
+template <class T, class DEVICE_TYPE>
+struct AddFunctor {
   typedef DEVICE_TYPE execution_space;
-  typedef Kokkos::View<T,execution_space> type;
+  typedef Kokkos::View<T, execution_space> type;
   type data;
 
   KOKKOS_INLINE_FUNCTION
-  void operator()(int) const {
-    Kokkos::atomic_fetch_add(&data(),(T)1);
-  }
+  void operator()(int) const { Kokkos::atomic_fetch_add(&data(), (T)1); }
 };
 
-template<class T>
+template <class T>
 T AddLoop(int loop) {
-  struct ZeroFunctor<T,exec_space> f_zero;
-  typename ZeroFunctor<T,exec_space>::type data("Data");
-  typename ZeroFunctor<T,exec_space>::h_type h_data("HData");
+  struct ZeroFunctor<T, exec_space> f_zero;
+  typename ZeroFunctor<T, exec_space>::type data("Data");
+  typename ZeroFunctor<T, exec_space>::h_type h_data("HData");
   f_zero.data = data;
-  Kokkos::parallel_for(1,f_zero);
+  Kokkos::parallel_for(1, f_zero);
   exec_space().fence();
 
-  struct AddFunctor<T,exec_space> f_add;
+  struct AddFunctor<T, exec_space> f_add;
   f_add.data = data;
-  Kokkos::parallel_for(loop,f_add);
+  Kokkos::parallel_for(loop, f_add);
   exec_space().fence();
 
-  Kokkos::deep_copy(h_data,data);
+  Kokkos::deep_copy(h_data, data);
   T val = h_data();
   return val;
 }
 
-template<class T,class DEVICE_TYPE>
-struct AddNonAtomicFunctor{
+template <class T, class DEVICE_TYPE>
+struct AddNonAtomicFunctor {
   typedef DEVICE_TYPE execution_space;
-  typedef Kokkos::View<T,execution_space> type;
+  typedef Kokkos::View<T, execution_space> type;
   type data;
 
   KOKKOS_INLINE_FUNCTION
-  void operator()(int) const {
-    data()+=(T)1;
-  }
+  void operator()(int) const { data() += (T)1; }
 };
 
-template<class T>
+template <class T>
 T AddLoopNonAtomic(int loop) {
-  struct ZeroFunctor<T,exec_space> f_zero;
-  typename ZeroFunctor<T,exec_space>::type data("Data");
-  typename ZeroFunctor<T,exec_space>::h_type h_data("HData");
+  struct ZeroFunctor<T, exec_space> f_zero;
+  typename ZeroFunctor<T, exec_space>::type data("Data");
+  typename ZeroFunctor<T, exec_space>::h_type h_data("HData");
 
   f_zero.data = data;
-  Kokkos::parallel_for(1,f_zero);
+  Kokkos::parallel_for(1, f_zero);
   exec_space().fence();
 
-  struct AddNonAtomicFunctor<T,exec_space> f_add;
+  struct AddNonAtomicFunctor<T, exec_space> f_add;
   f_add.data = data;
-  Kokkos::parallel_for(loop,f_add);
+  Kokkos::parallel_for(loop, f_add);
   exec_space().fence();
 
-  Kokkos::deep_copy(h_data,data);
+  Kokkos::deep_copy(h_data, data);
   T val = h_data();
 
   return val;
 }
 
-template<class T>
+template <class T>
 T AddLoopSerial(int loop) {
   T* data = new T[1];
   data[0] = 0;
 
-  for(int i=0;i<loop;i++)
-  *data+=(T)1;
+  for (int i = 0; i < loop; i++) *data += (T)1;
 
   T val = *data;
-  delete [] data;
+  delete[] data;
   return val;
 }
 
-template<class T,class DEVICE_TYPE>
-struct CASFunctor{
+template <class T, class DEVICE_TYPE>
+struct CASFunctor {
   typedef DEVICE_TYPE execution_space;
-  typedef Kokkos::View<T,execution_space> type;
+  typedef Kokkos::View<T, execution_space> type;
   type data;
 
   KOKKOS_INLINE_FUNCTION
   void operator()(int) const {
-	  T old = data();
-	  T newval, assumed;
-	  do {
-	    assumed = old;
-	    newval = assumed + (T)1;
-	    old = Kokkos::atomic_compare_exchange(&data(), assumed, newval);
-	  }
-	  while( old != assumed );
+    T old = data();
+    T newval, assumed;
+    do {
+      assumed = old;
+      newval  = assumed + (T)1;
+      old     = Kokkos::atomic_compare_exchange(&data(), assumed, newval);
+    } while (old != assumed);
   }
 };
 
-template<class T>
+template <class T>
 T CASLoop(int loop) {
-  struct ZeroFunctor<T,exec_space> f_zero;
-  typename ZeroFunctor<T,exec_space>::type data("Data");
-  typename ZeroFunctor<T,exec_space>::h_type h_data("HData");
+  struct ZeroFunctor<T, exec_space> f_zero;
+  typename ZeroFunctor<T, exec_space>::type data("Data");
+  typename ZeroFunctor<T, exec_space>::h_type h_data("HData");
   f_zero.data = data;
-  Kokkos::parallel_for(1,f_zero);
+  Kokkos::parallel_for(1, f_zero);
   exec_space().fence();
 
-  struct CASFunctor<T,exec_space> f_cas;
+  struct CASFunctor<T, exec_space> f_cas;
   f_cas.data = data;
-  Kokkos::parallel_for(loop,f_cas);
+  Kokkos::parallel_for(loop, f_cas);
   exec_space().fence();
 
-  Kokkos::deep_copy(h_data,data);
+  Kokkos::deep_copy(h_data, data);
   T val = h_data();
 
   return val;
 }
 
-template<class T,class DEVICE_TYPE>
-struct CASNonAtomicFunctor{
+template <class T, class DEVICE_TYPE>
+struct CASNonAtomicFunctor {
   typedef DEVICE_TYPE execution_space;
-  typedef Kokkos::View<T,execution_space> type;
+  typedef Kokkos::View<T, execution_space> type;
   type data;
 
   KOKKOS_INLINE_FUNCTION
   void operator()(int) const {
-	  volatile T assumed;
-	  volatile T newval;
-	  bool fail=1;
-	  do {
-	    assumed = data();
-	    newval = assumed + (T)1;
-	    if(data()==assumed) {
-	    	data() = newval;
-	    	fail = 0;
-	    }
-	  }
-	  while(fail);
+    volatile T assumed;
+    volatile T newval;
+    bool fail = 1;
+    do {
+      assumed = data();
+      newval  = assumed + (T)1;
+      if (data() == assumed) {
+        data() = newval;
+        fail   = 0;
+      }
+    } while (fail);
   }
 };
 
-template<class T>
+template <class T>
 T CASLoopNonAtomic(int loop) {
-  struct ZeroFunctor<T,exec_space> f_zero;
-  typename ZeroFunctor<T,exec_space>::type data("Data");
-  typename ZeroFunctor<T,exec_space>::h_type h_data("HData");
+  struct ZeroFunctor<T, exec_space> f_zero;
+  typename ZeroFunctor<T, exec_space>::type data("Data");
+  typename ZeroFunctor<T, exec_space>::h_type h_data("HData");
   f_zero.data = data;
-  Kokkos::parallel_for(1,f_zero);
+  Kokkos::parallel_for(1, f_zero);
   exec_space().fence();
 
-  struct CASNonAtomicFunctor<T,exec_space> f_cas;
+  struct CASNonAtomicFunctor<T, exec_space> f_cas;
   f_cas.data = data;
-  Kokkos::parallel_for(loop,f_cas);
+  Kokkos::parallel_for(loop, f_cas);
   exec_space().fence();
 
-  Kokkos::deep_copy(h_data,data);
+  Kokkos::deep_copy(h_data, data);
   T val = h_data();
 
   return val;
 }
 
-template<class T>
+template <class T>
 T CASLoopSerial(int loop) {
   T* data = new T[1];
   data[0] = 0;
 
-  for(int i=0;i<loop;i++) {
-	  T assumed;
-	  T newval;
-	  T old;
-	  do {
-	    assumed = *data;
-	    newval = assumed + (T)1;
-	    old = *data;
-	    *data = newval;
-	  }
-	  while(!(assumed==old));
+  for (int i = 0; i < loop; i++) {
+    T assumed;
+    T newval;
+    T old;
+    do {
+      assumed = *data;
+      newval  = assumed + (T)1;
+      old     = *data;
+      *data   = newval;
+    } while (!(assumed == old));
   }
 
   T val = *data;
-  delete [] data;
+  delete[] data;
   return val;
 }
 
-template<class T,class DEVICE_TYPE>
-struct ExchFunctor{
+template <class T, class DEVICE_TYPE>
+struct ExchFunctor {
   typedef DEVICE_TYPE execution_space;
-  typedef Kokkos::View<T,execution_space> type;
+  typedef Kokkos::View<T, execution_space> type;
   type data, data2;
 
   KOKKOS_INLINE_FUNCTION
   void operator()(int i) const {
-	T old = Kokkos::atomic_exchange(&data(),(T)i);
-    Kokkos::atomic_fetch_add(&data2(),old);
+    T old = Kokkos::atomic_exchange(&data(), (T)i);
+    Kokkos::atomic_fetch_add(&data2(), old);
   }
 };
 
-template<class T>
+template <class T>
 T ExchLoop(int loop) {
-  struct ZeroFunctor<T,exec_space> f_zero;
-  typename ZeroFunctor<T,exec_space>::type data("Data");
-  typename ZeroFunctor<T,exec_space>::h_type h_data("HData");
+  struct ZeroFunctor<T, exec_space> f_zero;
+  typename ZeroFunctor<T, exec_space>::type data("Data");
+  typename ZeroFunctor<T, exec_space>::h_type h_data("HData");
   f_zero.data = data;
-  Kokkos::parallel_for(1,f_zero);
+  Kokkos::parallel_for(1, f_zero);
   exec_space().fence();
 
-  typename ZeroFunctor<T,exec_space>::type data2("Data");
-  typename ZeroFunctor<T,exec_space>::h_type h_data2("HData");
+  typename ZeroFunctor<T, exec_space>::type data2("Data");
+  typename ZeroFunctor<T, exec_space>::h_type h_data2("HData");
   f_zero.data = data2;
-  Kokkos::parallel_for(1,f_zero);
+  Kokkos::parallel_for(1, f_zero);
   exec_space().fence();
 
-  struct ExchFunctor<T,exec_space> f_exch;
-  f_exch.data = data;
+  struct ExchFunctor<T, exec_space> f_exch;
+  f_exch.data  = data;
   f_exch.data2 = data2;
-  Kokkos::parallel_for(loop,f_exch);
+  Kokkos::parallel_for(loop, f_exch);
   exec_space().fence();
 
-  Kokkos::deep_copy(h_data,data);
-  Kokkos::deep_copy(h_data2,data2);
+  Kokkos::deep_copy(h_data, data);
+  Kokkos::deep_copy(h_data2, data2);
   T val = h_data() + h_data2();
 
   return val;
 }
 
-template<class T,class DEVICE_TYPE>
-struct ExchNonAtomicFunctor{
+template <class T, class DEVICE_TYPE>
+struct ExchNonAtomicFunctor {
   typedef DEVICE_TYPE execution_space;
-  typedef Kokkos::View<T,execution_space> type;
+  typedef Kokkos::View<T, execution_space> type;
   type data, data2;
 
   KOKKOS_INLINE_FUNCTION
   void operator()(int i) const {
-		T old = data();
-		data()=(T) i;
-		data2()+=old;
+    T old  = data();
+    data() = (T)i;
+    data2() += old;
   }
 };
 
-
-template<class T>
+template <class T>
 T ExchLoopNonAtomic(int loop) {
-  struct ZeroFunctor<T,exec_space> f_zero;
-  typename ZeroFunctor<T,exec_space>::type data("Data");
-  typename ZeroFunctor<T,exec_space>::h_type h_data("HData");
+  struct ZeroFunctor<T, exec_space> f_zero;
+  typename ZeroFunctor<T, exec_space>::type data("Data");
+  typename ZeroFunctor<T, exec_space>::h_type h_data("HData");
   f_zero.data = data;
-  Kokkos::parallel_for(1,f_zero);
+  Kokkos::parallel_for(1, f_zero);
   exec_space().fence();
 
-  typename ZeroFunctor<T,exec_space>::type data2("Data");
-  typename ZeroFunctor<T,exec_space>::h_type h_data2("HData");
+  typename ZeroFunctor<T, exec_space>::type data2("Data");
+  typename ZeroFunctor<T, exec_space>::h_type h_data2("HData");
   f_zero.data = data2;
-  Kokkos::parallel_for(1,f_zero);
+  Kokkos::parallel_for(1, f_zero);
   exec_space().fence();
 
-  struct ExchNonAtomicFunctor<T,exec_space> f_exch;
-  f_exch.data = data;
+  struct ExchNonAtomicFunctor<T, exec_space> f_exch;
+  f_exch.data  = data;
   f_exch.data2 = data2;
-  Kokkos::parallel_for(loop,f_exch);
+  Kokkos::parallel_for(loop, f_exch);
   exec_space().fence();
 
-  Kokkos::deep_copy(h_data,data);
-  Kokkos::deep_copy(h_data2,data2);
+  Kokkos::deep_copy(h_data, data);
+  Kokkos::deep_copy(h_data2, data2);
   T val = h_data() + h_data2();
 
   return val;
 }
 
-template<class T>
+template <class T>
 T ExchLoopSerial(int loop) {
-  T* data = new T[1];
+  T* data  = new T[1];
   T* data2 = new T[1];
-  data[0] = 0;
+  data[0]  = 0;
   data2[0] = 0;
-  for(int i=0;i<loop;i++) {
-	T old = *data;
-	*data=(T) i;
-	*data2+=old;
+  for (int i = 0; i < loop; i++) {
+    T old = *data;
+    *data = (T)i;
+    *data2 += old;
   }
 
   T val = *data2 + *data;
-  delete [] data;
-  delete [] data2;
+  delete[] data;
+  delete[] data2;
   return val;
 }
 
-template<class T>
+template <class T>
 T LoopVariant(int loop, int test) {
   switch (test) {
     case 1: return AddLoop<T>(loop);
@@ -388,7 +377,7 @@ T LoopVariant(int loop, int test) {
   return 0;
 }
 
-template<class T>
+template <class T>
 T LoopVariantSerial(int loop, int test) {
   switch (test) {
     case 1: return AddLoopSerial<T>(loop);
@@ -398,7 +387,7 @@ T LoopVariantSerial(int loop, int test) {
   return 0;
 }
 
-template<class T>
+template <class T>
 T LoopVariantNonAtomic(int loop, int test) {
   switch (test) {
     case 1: return AddLoopNonAtomic<T>(loop);
@@ -408,100 +397,105 @@ T LoopVariantNonAtomic(int loop, int test) {
   return 0;
 }
 
-template<class T>
+template <class T>
 void Loop(int loop, int test, const char* type_name) {
-  LoopVariant<T>(loop,test);
+  LoopVariant<T>(loop, test);
 
   Kokkos::Impl::Timer timer;
-  T res = LoopVariant<T>(loop,test);
+  T res       = LoopVariant<T>(loop, test);
   double time = timer.seconds();
 
   timer.reset();
-  T resNonAtomic = LoopVariantNonAtomic<T>(loop,test);
+  T resNonAtomic       = LoopVariantNonAtomic<T>(loop, test);
   double timeNonAtomic = timer.seconds();
 
   timer.reset();
-  T resSerial = LoopVariantSerial<T>(loop,test);
+  T resSerial       = LoopVariantSerial<T>(loop, test);
   double timeSerial = timer.seconds();
 
-  time         *=1e6/loop;
-  timeNonAtomic*=1e6/loop;
-  timeSerial   *=1e6/loop;
-  //textcolor_standard();
+  time *= 1e6 / loop;
+  timeNonAtomic *= 1e6 / loop;
+  timeSerial *= 1e6 / loop;
+  // textcolor_standard();
   bool passed = true;
-  if(resSerial!=res) passed = false;
-  //if(!passed) textcolor(RESET,BLACK,YELLOW);
-  printf("%s Test %i %s  --- Loop: %i Value (S,A,NA): %e %e %e Time: %7.4e %7.4e %7.4e Size of Type %i)",
-         type_name,test,passed?"PASSED":"FAILED",loop,
-         1.0*resSerial,1.0*res,1.0*resNonAtomic,
-         timeSerial,time,timeNonAtomic,(int)sizeof(T));
-  //if(!passed) textcolor_standard();
+  if (resSerial != res) passed = false;
+  // if(!passed) textcolor(RESET,BLACK,YELLOW);
+  printf(
+      "%s Test %i %s  --- Loop: %i Value (S,A,NA): %e %e %e Time: %7.4e %7.4e "
+      "%7.4e Size of Type %i)",
+      type_name, test, passed ? "PASSED" : "FAILED", loop, 1.0 * resSerial,
+      1.0 * res, 1.0 * resNonAtomic, timeSerial, time, timeNonAtomic,
+      (int)sizeof(T));
+  // if(!passed) textcolor_standard();
   printf("\n");
 }
 
-
-template<class T>
+template <class T>
 void Test(int loop, int test, const char* type_name) {
-  if(test==-1) {
-    Loop<T>(loop,1,type_name);
-    Loop<T>(loop,2,type_name);
-    Loop<T>(loop,3,type_name);
+  if (test == -1) {
+    Loop<T>(loop, 1, type_name);
+    Loop<T>(loop, 2, type_name);
+    Loop<T>(loop, 3, type_name);
 
-  }
-  else
-    Loop<T>(loop,test,type_name);
+  } else
+    Loop<T>(loop, test, type_name);
 }
 
-int main(int argc, char* argv[])
-{
+int main(int argc, char* argv[]) {
   int type = -1;
   int loop = 100000;
   int test = -1;
 
-  for(int i=0;i<argc;i++)
-  {
-     if((strcmp(argv[i],"--test")==0)) {test=atoi(argv[++i]); continue;}
-     if((strcmp(argv[i],"--type")==0)) {type=atoi(argv[++i]); continue;}
-     if((strcmp(argv[i],"-l")==0)||(strcmp(argv[i],"--loop")==0)) {loop=atoi(argv[++i]); continue;}
+  for (int i = 0; i < argc; i++) {
+    if ((strcmp(argv[i], "--test") == 0)) {
+      test = atoi(argv[++i]);
+      continue;
+    }
+    if ((strcmp(argv[i], "--type") == 0)) {
+      type = atoi(argv[++i]);
+      continue;
+    }
+    if ((strcmp(argv[i], "-l") == 0) || (strcmp(argv[i], "--loop") == 0)) {
+      loop = atoi(argv[++i]);
+      continue;
+    }
   }
 
+  Kokkos::initialize(argc, argv);
 
-  Kokkos::initialize(argc,argv);
-
-
-  printf("Using %s\n",Kokkos::atomic_query_version());
+  printf("Using %s\n", Kokkos::atomic_query_version());
   bool all_tests = false;
-  if(type==-1) all_tests = true;
-  while(type<100) {
-    if(type==1) {
-     Test<int>(loop,test,"int                    ");
+  if (type == -1) all_tests = true;
+  while (type < 100) {
+    if (type == 1) {
+      Test<int>(loop, test, "int                    ");
     }
-    if(type==2) {
-     Test<long int>(loop,test,"long int               ");
+    if (type == 2) {
+      Test<long int>(loop, test, "long int               ");
     }
-    if(type==3) {
-     Test<long long int>(loop,test,"long long int          ");
+    if (type == 3) {
+      Test<long long int>(loop, test, "long long int          ");
     }
-    if(type==4) {
-     Test<unsigned int>(loop,test,"unsigned int           ");
+    if (type == 4) {
+      Test<unsigned int>(loop, test, "unsigned int           ");
     }
-    if(type==5) {
-     Test<unsigned long int>(loop,test,"unsigned long int      ");
+    if (type == 5) {
+      Test<unsigned long int>(loop, test, "unsigned long int      ");
     }
-    if(type==6) {
-     Test<unsigned long long int>(loop,test,"unsigned long long int ");
+    if (type == 6) {
+      Test<unsigned long long int>(loop, test, "unsigned long long int ");
     }
-    if(type==10) {
-     //Test<float>(loop,test,"float                  ");
+    if (type == 10) {
+      // Test<float>(loop,test,"float                  ");
     }
-    if(type==11) {
-     Test<double>(loop,test,"double                 ");
+    if (type == 11) {
+      Test<double>(loop, test, "double                 ");
     }
-    if(!all_tests) type=100;
-    else type++;
+    if (!all_tests)
+      type = 100;
+    else
+      type++;
   }
 
   Kokkos::finalize();
-
 }
-
diff --git a/lib/kokkos/core/perf_test/test_mempool.cpp b/lib/kokkos/core/perf_test/test_mempool.cpp
index c47730ec69..ad8622e7a6 100644
--- a/lib/kokkos/core/perf_test/test_mempool.cpp
+++ b/lib/kokkos/core/perf_test/test_mempool.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -49,310 +50,271 @@
 #include <Kokkos_Core.hpp>
 #include <impl/Kokkos_Timer.hpp>
 
-using ExecSpace   = Kokkos::DefaultExecutionSpace ;
-using MemorySpace = Kokkos::DefaultExecutionSpace::memory_space ;
+using ExecSpace   = Kokkos::DefaultExecutionSpace;
+using MemorySpace = Kokkos::DefaultExecutionSpace::memory_space;
 
-using MemoryPool = Kokkos::MemoryPool< ExecSpace > ;
+using MemoryPool = Kokkos::MemoryPool<ExecSpace>;
 
 struct TestFunctor {
-
-  typedef Kokkos::View< uintptr_t * , ExecSpace >  ptrs_type ;
+  typedef Kokkos::View<uintptr_t*, ExecSpace> ptrs_type;
 
   enum : unsigned { chunk = 32 };
 
-  MemoryPool  pool ;
-  ptrs_type   ptrs ;
-  unsigned    chunk_span ;
-  unsigned    fill_stride ;
-  unsigned    range_iter ;
-  unsigned    repeat_inner ;
+  MemoryPool pool;
+  ptrs_type ptrs;
+  unsigned chunk_span;
+  unsigned fill_stride;
+  unsigned range_iter;
+  unsigned repeat_inner;
 
-  TestFunctor( size_t    total_alloc_size
-             , unsigned  min_superblock_size
-             , unsigned  number_alloc
-             , unsigned  arg_stride_alloc
-             , unsigned  arg_chunk_span
-             , unsigned  arg_repeat )
-    : pool()
-    , ptrs()
-    , chunk_span(0)
-    , fill_stride(0)
-    , repeat_inner(0)
-    {
-      MemorySpace m ;
+  TestFunctor(size_t total_alloc_size, unsigned min_superblock_size,
+              unsigned number_alloc, unsigned arg_stride_alloc,
+              unsigned arg_chunk_span, unsigned arg_repeat)
+      : pool(), ptrs(), chunk_span(0), fill_stride(0), repeat_inner(0) {
+    MemorySpace m;
 
-      const unsigned min_block_size = chunk ;
-      const unsigned max_block_size = chunk * arg_chunk_span ;
-      pool = MemoryPool( m , total_alloc_size
-                           , min_block_size
-                           , max_block_size
-                           , min_superblock_size );
+    const unsigned min_block_size = chunk;
+    const unsigned max_block_size = chunk * arg_chunk_span;
+    pool = MemoryPool(m, total_alloc_size, min_block_size, max_block_size,
+                      min_superblock_size);
 
-      ptrs = ptrs_type( Kokkos::view_alloc( m , "ptrs") , number_alloc );
-      fill_stride = arg_stride_alloc ;
-      chunk_span = arg_chunk_span ;
-      range_iter   = fill_stride * number_alloc ;
-      repeat_inner       = arg_repeat ;
-    }
+    ptrs         = ptrs_type(Kokkos::view_alloc(m, "ptrs"), number_alloc);
+    fill_stride  = arg_stride_alloc;
+    chunk_span   = arg_chunk_span;
+    range_iter   = fill_stride * number_alloc;
+    repeat_inner = arg_repeat;
+  }
 
   //----------------------------------------
 
-  typedef long value_type ;
+  typedef long value_type;
 
   //----------------------------------------
 
   struct TagFill {};
 
   KOKKOS_INLINE_FUNCTION
-  void operator()( TagFill , int i , value_type & update ) const noexcept
-    {
-      if ( 0 == i % fill_stride ) {
+  void operator()(TagFill, int i, value_type& update) const noexcept {
+    if (0 == i % fill_stride) {
+      const int j = i / fill_stride;
 
-        const int j = i / fill_stride ;
+      const unsigned size_alloc = chunk * (1 + (j % chunk_span));
 
-        const unsigned size_alloc = chunk * ( 1 + ( j % chunk_span ) );
+      ptrs(j) = (uintptr_t)pool.allocate(size_alloc);
 
-        ptrs(j) = (uintptr_t) pool.allocate(size_alloc);
-
-        if ( ptrs(j) ) ++update ;
-      }
+      if (ptrs(j)) ++update;
     }
+  }
 
-  bool test_fill()
-    {
-      typedef Kokkos::RangePolicy< ExecSpace , TagFill > policy ;
+  bool test_fill() {
+    typedef Kokkos::RangePolicy<ExecSpace, TagFill> policy;
 
-      long result = 0 ;
+    long result = 0;
 
-      Kokkos::parallel_reduce( policy(0,range_iter), *this , result );
+    Kokkos::parallel_reduce(policy(0, range_iter), *this, result);
 
-      if ( result == long(ptrs.extent(0)) ) return true;
-      pool.print_state( std::cerr );
-      return false;
-    }
+    if (result == long(ptrs.extent(0))) return true;
+    pool.print_state(std::cerr);
+    return false;
+  }
 
   //----------------------------------------
 
   struct TagDel {};
 
   KOKKOS_INLINE_FUNCTION
-  void operator()( TagDel , int i ) const noexcept
-    {
-      if ( 0 == i % fill_stride ) {
+  void operator()(TagDel, int i) const noexcept {
+    if (0 == i % fill_stride) {
+      const int j = i / fill_stride;
 
-        const int j = i / fill_stride ;
+      const unsigned size_alloc = chunk * (1 + (j % chunk_span));
 
-        const unsigned size_alloc = chunk * ( 1 + ( j % chunk_span ) );
-
-        pool.deallocate( (void*) ptrs(j) , size_alloc );
-      }
+      pool.deallocate((void*)ptrs(j), size_alloc);
     }
+  }
 
-  void test_del()
-    {
-      typedef Kokkos::RangePolicy< ExecSpace , TagDel > policy ;
+  void test_del() {
+    typedef Kokkos::RangePolicy<ExecSpace, TagDel> policy;
 
-      Kokkos::parallel_for( policy(0,range_iter), *this );
-      Kokkos::fence();
-    }
+    Kokkos::parallel_for(policy(0, range_iter), *this);
+    Kokkos::fence();
+  }
 
   //----------------------------------------
 
   struct TagAllocDealloc {};
 
   KOKKOS_INLINE_FUNCTION
-  void operator()( TagAllocDealloc , int i , long & update ) const noexcept
-    {
-      if ( 0 == i % fill_stride ) {
+  void operator()(TagAllocDealloc, int i, long& update) const noexcept {
+    if (0 == i % fill_stride) {
+      const int j = i / fill_stride;
 
-        const int j = i / fill_stride ;
+      if (0 == j % 3) {
+        for (unsigned k = 0; k < repeat_inner; ++k) {
+          const unsigned size_alloc = chunk * (1 + (j % chunk_span));
 
-        if ( 0 == j % 3 ) {
+          pool.deallocate((void*)ptrs(j), size_alloc);
 
-          for ( unsigned k = 0 ; k < repeat_inner ; ++k ) {
+          ptrs(j) = (uintptr_t)pool.allocate(size_alloc);
 
-            const unsigned size_alloc = chunk * ( 1 + ( j % chunk_span ) );
-
-            pool.deallocate( (void*) ptrs(j) , size_alloc );
-
-            ptrs(j) = (uintptr_t) pool.allocate(size_alloc);
-
-            if ( 0 == ptrs(j) ) update++ ;
-          }
+          if (0 == ptrs(j)) update++;
         }
       }
     }
+  }
 
-  bool test_alloc_dealloc()
-    {
-      typedef Kokkos::RangePolicy< ExecSpace , TagAllocDealloc > policy ;
+  bool test_alloc_dealloc() {
+    typedef Kokkos::RangePolicy<ExecSpace, TagAllocDealloc> policy;
 
-      long error_count = 0 ;
+    long error_count = 0;
 
-      Kokkos::parallel_reduce( policy(0,range_iter), *this , error_count );
+    Kokkos::parallel_reduce(policy(0, range_iter), *this, error_count);
 
-      return 0 == error_count ;
-    }
+    return 0 == error_count;
+  }
 };
 
+int main(int argc, char* argv[]) {
+  static const char help_flag[]         = "--help";
+  static const char alloc_size_flag[]   = "--alloc_size=";
+  static const char super_size_flag[]   = "--super_size=";
+  static const char chunk_span_flag[]   = "--chunk_span=";
+  static const char fill_stride_flag[]  = "--fill_stride=";
+  static const char fill_level_flag[]   = "--fill_level=";
+  static const char repeat_outer_flag[] = "--repeat_outer=";
+  static const char repeat_inner_flag[] = "--repeat_inner=";
 
+  long total_alloc_size   = 1000000;
+  int min_superblock_size = 10000;
+  int chunk_span          = 5;
+  int fill_stride         = 1;
+  int fill_level          = 70;
+  int repeat_outer        = 1;
+  int repeat_inner        = 1;
 
-int main( int argc , char* argv[] )
-{
-  static const char help_flag[] = "--help" ;
-  static const char alloc_size_flag[]   = "--alloc_size=" ;
-  static const char super_size_flag[]   = "--super_size=" ;
-  static const char chunk_span_flag[]   = "--chunk_span=" ;
-  static const char fill_stride_flag[]  = "--fill_stride=" ;
-  static const char fill_level_flag[]   = "--fill_level=" ;
-  static const char repeat_outer_flag[] = "--repeat_outer=" ;
-  static const char repeat_inner_flag[] = "--repeat_inner=" ;
+  int ask_help = 0;
 
-  long total_alloc_size    = 1000000 ;
-  int  min_superblock_size =   10000 ;
-  int  chunk_span          =       5 ;
-  int  fill_stride        =       1 ;
-  int  fill_level         =      70 ;
-  int  repeat_outer   =       1 ;
-  int  repeat_inner   =       1 ;
+  for (int i = 1; i < argc; i++) {
+    const char* const a = argv[i];
 
-  int  ask_help = 0 ;
+    if (!strncmp(a, help_flag, strlen(help_flag))) ask_help = 1;
 
-  for(int i=1;i<argc;i++)
-  {
-     const char * const a = argv[i];
+    if (!strncmp(a, alloc_size_flag, strlen(alloc_size_flag)))
+      total_alloc_size = atol(a + strlen(alloc_size_flag));
 
-     if ( ! strncmp(a,help_flag,strlen(help_flag) ) ) ask_help = 1 ;
+    if (!strncmp(a, super_size_flag, strlen(super_size_flag)))
+      min_superblock_size = atoi(a + strlen(super_size_flag));
 
-     if ( ! strncmp(a,alloc_size_flag,strlen(alloc_size_flag) ) )
-       total_alloc_size = atol( a + strlen(alloc_size_flag) );
+    if (!strncmp(a, fill_stride_flag, strlen(fill_stride_flag)))
+      fill_stride = atoi(a + strlen(fill_stride_flag));
 
-     if ( ! strncmp(a,super_size_flag,strlen(super_size_flag) ) )
-       min_superblock_size = atoi( a + strlen(super_size_flag) );
+    if (!strncmp(a, fill_level_flag, strlen(fill_level_flag)))
+      fill_level = atoi(a + strlen(fill_level_flag));
 
-     if ( ! strncmp(a,fill_stride_flag,strlen(fill_stride_flag) ) )
-       fill_stride = atoi( a + strlen(fill_stride_flag) );
+    if (!strncmp(a, chunk_span_flag, strlen(chunk_span_flag)))
+      chunk_span = atoi(a + strlen(chunk_span_flag));
 
-     if ( ! strncmp(a,fill_level_flag,strlen(fill_level_flag) ) )
-       fill_level = atoi( a + strlen(fill_level_flag) );
+    if (!strncmp(a, repeat_outer_flag, strlen(repeat_outer_flag)))
+      repeat_outer = atoi(a + strlen(repeat_outer_flag));
 
-     if ( ! strncmp(a,chunk_span_flag,strlen(chunk_span_flag) ) )
-       chunk_span = atoi( a + strlen(chunk_span_flag) );
-
-     if ( ! strncmp(a,repeat_outer_flag,strlen(repeat_outer_flag) ) )
-       repeat_outer = atoi( a + strlen(repeat_outer_flag) );
-
-     if ( ! strncmp(a,repeat_inner_flag,strlen(repeat_inner_flag) ) )
-       repeat_inner = atoi( a + strlen(repeat_inner_flag) );
+    if (!strncmp(a, repeat_inner_flag, strlen(repeat_inner_flag)))
+      repeat_inner = atoi(a + strlen(repeat_inner_flag));
   }
 
   int chunk_span_bytes = 0;
   for (int i = 0; i < chunk_span; ++i) {
-    auto chunk_bytes = TestFunctor::chunk * ( 1 + i );
+    auto chunk_bytes = TestFunctor::chunk * (1 + i);
     if (chunk_bytes < 64) chunk_bytes = 64;
-    auto block_bytes_lg2 = Kokkos::Impl::integral_power_of_two_that_contains( chunk_bytes );
+    auto block_bytes_lg2 =
+        Kokkos::Impl::integral_power_of_two_that_contains(chunk_bytes);
     auto block_bytes = (1 << block_bytes_lg2);
     chunk_span_bytes += block_bytes;
   }
-  auto actual_superblock_bytes_lg2 = Kokkos::Impl::integral_power_of_two_that_contains( min_superblock_size );
+  auto actual_superblock_bytes_lg2 =
+      Kokkos::Impl::integral_power_of_two_that_contains(min_superblock_size);
   auto actual_superblock_bytes = (1 << actual_superblock_bytes_lg2);
-  auto superblock_mask = actual_superblock_bytes - 1;
-  auto nsuperblocks = (total_alloc_size + superblock_mask) >> actual_superblock_bytes_lg2;
+  auto superblock_mask         = actual_superblock_bytes - 1;
+  auto nsuperblocks =
+      (total_alloc_size + superblock_mask) >> actual_superblock_bytes_lg2;
   auto actual_total_bytes = nsuperblocks * actual_superblock_bytes;
-  auto bytes_wanted = (actual_total_bytes * fill_level) / 100;
-  auto chunk_spans = bytes_wanted / chunk_span_bytes;
-  auto number_alloc = int( chunk_spans * chunk_span );
+  auto bytes_wanted       = (actual_total_bytes * fill_level) / 100;
+  auto chunk_spans        = bytes_wanted / chunk_span_bytes;
+  auto number_alloc       = int(chunk_spans * chunk_span);
 
-  if ( ask_help ) {
+  if (ask_help) {
     std::cout << "command line options:"
-              << " " << help_flag
-              << " " << alloc_size_flag << "##"
+              << " " << help_flag << " " << alloc_size_flag << "##"
               << " " << super_size_flag << "##"
               << " " << fill_stride_flag << "##"
               << " " << fill_level_flag << "##"
               << " " << chunk_span_flag << "##"
               << " " << repeat_outer_flag << "##"
-              << " " << repeat_inner_flag << "##"
-              << std::endl ;
+              << " " << repeat_inner_flag << "##" << std::endl;
     return 0;
   }
 
-  Kokkos::initialize(argc,argv);
+  Kokkos::initialize(argc, argv);
 
-  double sum_fill_time = 0;
+  double sum_fill_time  = 0;
   double sum_cycle_time = 0;
-  double sum_both_time = 0;
-  double min_fill_time = std::numeric_limits<double>::max();
+  double sum_both_time  = 0;
+  double min_fill_time  = std::numeric_limits<double>::max();
   double min_cycle_time = std::numeric_limits<double>::max();
-  double min_both_time = std::numeric_limits<double>::max();
-  //one alloc in fill, alloc/dealloc pair in repeat_inner
-  for ( int i = 0 ; i < repeat_outer ; ++i ) {
+  double min_both_time  = std::numeric_limits<double>::max();
+  // one alloc in fill, alloc/dealloc pair in repeat_inner
+  for (int i = 0; i < repeat_outer; ++i) {
+    TestFunctor functor(total_alloc_size, min_superblock_size, number_alloc,
+                        fill_stride, chunk_span, repeat_inner);
 
-    TestFunctor functor( total_alloc_size
-                       , min_superblock_size
-                       , number_alloc
-                       , fill_stride
-                       , chunk_span
-                       , repeat_inner );
+    Kokkos::Impl::Timer timer;
 
-    Kokkos::Impl::Timer timer ;
-
-    if ( ! functor.test_fill() ) {
+    if (!functor.test_fill()) {
       Kokkos::abort("fill ");
     }
 
     auto t0 = timer.seconds();
 
-    if ( ! functor.test_alloc_dealloc() ) {
+    if (!functor.test_alloc_dealloc()) {
       Kokkos::abort("alloc/dealloc ");
     }
 
-    auto t1 = timer.seconds();
-    auto this_fill_time = t0;
+    auto t1              = timer.seconds();
+    auto this_fill_time  = t0;
     auto this_cycle_time = t1 - t0;
-    auto this_both_time = t1;
+    auto this_both_time  = t1;
     sum_fill_time += this_fill_time;
     sum_cycle_time += this_cycle_time;
     sum_both_time += this_both_time;
-    min_fill_time = std::min(min_fill_time, this_fill_time);
+    min_fill_time  = std::min(min_fill_time, this_fill_time);
     min_cycle_time = std::min(min_cycle_time, this_cycle_time);
-    min_both_time = std::min(min_both_time, this_both_time);
+    min_both_time  = std::min(min_both_time, this_both_time);
   }
 
   Kokkos::finalize();
 
-  printf( "\"mempool: alloc super stride level span inner outer number\" %ld %d %d %d %d %d %d %d\n"
-        , total_alloc_size
-        , min_superblock_size
-        , fill_stride
-        , fill_level
-        , chunk_span
-        , repeat_inner
-        , repeat_outer
-        , number_alloc );
+  printf(
+      "\"mempool: alloc super stride level span inner outer number\" %ld %d %d "
+      "%d %d %d %d %d\n",
+      total_alloc_size, min_superblock_size, fill_stride, fill_level,
+      chunk_span, repeat_inner, repeat_outer, number_alloc);
 
-  auto avg_fill_time = sum_fill_time / repeat_outer;
+  auto avg_fill_time  = sum_fill_time / repeat_outer;
   auto avg_cycle_time = sum_cycle_time / repeat_outer;
-  auto avg_both_time = sum_both_time / repeat_outer;
+  auto avg_both_time  = sum_both_time / repeat_outer;
 
-  printf( "\"mempool: fill time (min, avg)\" %.8f %.8f\n"
-        , min_fill_time
-        , avg_fill_time );
+  printf("\"mempool: fill time (min, avg)\" %.8f %.8f\n", min_fill_time,
+         avg_fill_time);
 
-  printf( "\"mempool: cycle time (min, avg)\" %.8f %.8f\n"
-        , min_cycle_time
-        , avg_cycle_time );
+  printf("\"mempool: cycle time (min, avg)\" %.8f %.8f\n", min_cycle_time,
+         avg_cycle_time);
 
-  printf( "\"mempool: test time (min, avg)\" %.8f %.8f\n"
-        , min_both_time
-        , avg_both_time );
+  printf("\"mempool: test time (min, avg)\" %.8f %.8f\n", min_both_time,
+         avg_both_time);
 
-  printf( "\"mempool: fill ops per second (max, avg)\" %g %g\n"
-        , number_alloc / min_fill_time
-        , number_alloc / avg_fill_time );
+  printf("\"mempool: fill ops per second (max, avg)\" %g %g\n",
+         number_alloc / min_fill_time, number_alloc / avg_fill_time);
 
-  printf( "\"mempool: cycle ops per second (max, avg)\" %g %g\n"
-        , (2 * number_alloc * repeat_inner) / min_cycle_time
-        , (2 * number_alloc * repeat_inner) / avg_cycle_time );
+  printf("\"mempool: cycle ops per second (max, avg)\" %g %g\n",
+         (2 * number_alloc * repeat_inner) / min_cycle_time,
+         (2 * number_alloc * repeat_inner) / avg_cycle_time);
 }
-
diff --git a/lib/kokkos/core/perf_test/test_taskdag.cpp b/lib/kokkos/core/perf_test/test_taskdag.cpp
index 41198edfe1..a97edc59e8 100644
--- a/lib/kokkos/core/perf_test/test_taskdag.cpp
+++ b/lib/kokkos/core/perf_test/test_taskdag.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -43,13 +44,10 @@
 
 #include <Kokkos_Core.hpp>
 
-#if ! defined( KOKKOS_ENABLE_TASKDAG ) || \
-    defined( KOKKOS_ENABLE_DEFAULT_DEVICE_TYPE_THREADS )
+#if !defined(KOKKOS_ENABLE_TASKDAG) || \
+    defined(KOKKOS_ENABLE_DEFAULT_DEVICE_TYPE_THREADS)
 
-int main()
-{
-  return 0 ;
-}
+int main() { return 0; }
 
 #else
 
@@ -60,187 +58,160 @@ int main()
 
 #include <impl/Kokkos_Timer.hpp>
 
-using ExecSpace = Kokkos::DefaultExecutionSpace ;
+using ExecSpace = Kokkos::DefaultExecutionSpace;
 
-inline
-long eval_fib( long n )
-{
+inline long eval_fib(long n) {
   constexpr long mask = 0x03;
 
-  long fib[4] = { 0, 1, 0, 0 };
+  long fib[4] = {0, 1, 0, 0};
 
-  for ( long i = 2; i <= n; ++i ) {
-    fib[ i & mask ] = fib[ ( i - 1 ) & mask ] + fib[ ( i - 2 ) & mask ];
+  for (long i = 2; i <= n; ++i) {
+    fib[i & mask] = fib[(i - 1) & mask] + fib[(i - 2) & mask];
   }
 
-  return fib[ n & mask ];
+  return fib[n & mask];
 }
 
-inline
-long fib_alloc_count( long n )
-{
+inline long fib_alloc_count(long n) {
   constexpr long mask = 0x03;
 
-  long count[4] = { 1, 1, 0, 0 };
+  long count[4] = {1, 1, 0, 0};
 
-  for ( long i = 2; i <= n; ++i ) {
-    count[ i & mask ] = 2 // this task plus the 'when_all' task
-                      + count[ ( i - 1 ) & mask ]
-                      + count[ ( i - 2 ) & mask ];
+  for (long i = 2; i <= n; ++i) {
+    count[i & mask] = 2  // this task plus the 'when_all' task
+                      + count[(i - 1) & mask] + count[(i - 2) & mask];
   }
 
-  return count[ n & mask ];
+  return count[n & mask];
 }
 
-template< class Scheduler >
+template <class Scheduler>
 struct TestFib {
+  using MemorySpace = typename Scheduler::memory_space;
+  using MemberType  = typename Scheduler::member_type;
+  using FutureType  = Kokkos::BasicFuture<long, Scheduler>;
 
-  using MemorySpace = typename Scheduler::memory_space ;
-  using MemberType  = typename Scheduler::member_type ;
-  using FutureType  = Kokkos::BasicFuture< long , Scheduler > ;
+  typedef long value_type;
 
-  typedef long value_type ;
-
-  FutureType dep[2] ;
-  const value_type n ;
+  FutureType dep[2];
+  const value_type n;
 
   KOKKOS_INLINE_FUNCTION
-  TestFib( const value_type arg_n )
-    : dep{} , n( arg_n ) {}
+  TestFib(const value_type arg_n) : dep{}, n(arg_n) {}
 
   KOKKOS_INLINE_FUNCTION
-  void operator()( MemberType & member, value_type & result ) noexcept
-    {
-      auto& sched = member.scheduler();
-      if ( n < 2 ) {
-        result = n ;
-      }
-      else if ( ! dep[0].is_null() && ! dep[1].is_null() ) {
-        result = dep[0].get() + dep[1].get();
-      }
-      else {
-        // Spawn new children and respawn myself to sum their results.
-        // Spawn lower value at higher priority as it has a shorter
-        // path to completion.
+  void operator()(MemberType& member, value_type& result) noexcept {
+    auto& sched = member.scheduler();
+    if (n < 2) {
+      result = n;
+    } else if (!dep[0].is_null() && !dep[1].is_null()) {
+      result = dep[0].get() + dep[1].get();
+    } else {
+      // Spawn new children and respawn myself to sum their results.
+      // Spawn lower value at higher priority as it has a shorter
+      // path to completion.
 
-        dep[1] = Kokkos::task_spawn
-          ( Kokkos::TaskSingle( sched, Kokkos::TaskPriority::High )
-          , TestFib( n - 2 ) );
+      dep[1] = Kokkos::task_spawn(
+          Kokkos::TaskSingle(sched, Kokkos::TaskPriority::High),
+          TestFib(n - 2));
 
-        dep[0] = Kokkos::task_spawn
-          ( Kokkos::TaskSingle( sched )
-          , TestFib( n - 1 ) );
+      dep[0] = Kokkos::task_spawn(Kokkos::TaskSingle(sched), TestFib(n - 1));
 
-        auto fib_all = sched.when_all( dep, 2 );
+      auto fib_all = sched.when_all(dep, 2);
 
-        if ( ! dep[0].is_null() && ! dep[1].is_null() && ! fib_all.is_null() ) {
-          // High priority to retire this branch.
-          Kokkos::respawn( this, fib_all, Kokkos::TaskPriority::High );
-        }
-        else {
-          Kokkos::abort("Failed nested task spawn (allocation)");
-        }
+      if (!dep[0].is_null() && !dep[1].is_null() && !fib_all.is_null()) {
+        // High priority to retire this branch.
+        Kokkos::respawn(this, fib_all, Kokkos::TaskPriority::High);
+      } else {
+        Kokkos::abort("Failed nested task spawn (allocation)");
       }
     }
+  }
 };
 
+int main(int argc, char* argv[]) {
+  static const char help[]         = "--help";
+  static const char alloc_size[]   = "--alloc_size=";
+  static const char super_size[]   = "--super_size=";
+  static const char repeat_outer[] = "--repeat_outer=";
+  static const char input_value[]  = "--input=";
 
+  long total_alloc_size   = 1000000;
+  int min_superblock_size = 10000;
+  int test_repeat_outer   = 1;
+  int fib_input           = 4;
 
-int main( int argc , char* argv[] )
-{
-  static const char help[] = "--help" ;
-  static const char alloc_size[]   = "--alloc_size=" ;
-  static const char super_size[]   = "--super_size=" ;
-  static const char repeat_outer[] = "--repeat_outer=" ;
-  static const char input_value[]  = "--input=" ;
+  int ask_help = 0;
 
-  long total_alloc_size    = 1000000 ;
-  int  min_superblock_size =   10000 ;
-  int  test_repeat_outer   =       1 ;
-  int  fib_input           =       4 ;
+  for (int i = 1; i < argc; i++) {
+    const char* const a = argv[i];
 
-  int  ask_help = 0 ;
+    if (!strncmp(a, help, strlen(help))) ask_help = 1;
 
-  for(int i=1;i<argc;i++)
-  {
-     const char * const a = argv[i];
+    if (!strncmp(a, alloc_size, strlen(alloc_size)))
+      total_alloc_size = atol(a + strlen(alloc_size));
 
-     if ( ! strncmp(a,help,strlen(help) ) ) ask_help = 1 ;
+    if (!strncmp(a, super_size, strlen(super_size)))
+      min_superblock_size = atoi(a + strlen(super_size));
 
-     if ( ! strncmp(a,alloc_size,strlen(alloc_size) ) )
-       total_alloc_size = atol( a + strlen(alloc_size) );
+    if (!strncmp(a, repeat_outer, strlen(repeat_outer)))
+      test_repeat_outer = atoi(a + strlen(repeat_outer));
 
-     if ( ! strncmp(a,super_size,strlen(super_size) ) )
-       min_superblock_size = atoi( a + strlen(super_size) );
-
-     if ( ! strncmp(a,repeat_outer,strlen(repeat_outer) ) )
-       test_repeat_outer = atoi( a + strlen(repeat_outer) );
-
-     if ( ! strncmp(a,input_value,strlen(input_value) ) )
-       fib_input = atoi( a + strlen(input_value) );
+    if (!strncmp(a, input_value, strlen(input_value)))
+      fib_input = atoi(a + strlen(input_value));
   }
 
-  const long fib_output   = eval_fib( fib_input );
-  const long number_alloc = fib_alloc_count( fib_input );
+  const long fib_output   = eval_fib(fib_input);
+  const long number_alloc = fib_alloc_count(fib_input);
 
-  const unsigned min_block_size =  32 ;
-  const unsigned max_block_size = 128 ;
+  const unsigned min_block_size = 32;
+  const unsigned max_block_size = 128;
 
-  long task_count_max = 0 ;
-  long task_count_accum = 0 ;
-  long test_result = 0 ;
+  long task_count_max   = 0;
+  long task_count_accum = 0;
+  long test_result      = 0;
 
-  if ( ask_help ) {
+  if (ask_help) {
     std::cout << "command line options:"
-              << " " << help
-              << " " << alloc_size << "##"
+              << " " << help << " " << alloc_size << "##"
               << " " << super_size << "##"
               << " " << input_value << "##"
-              << " " << repeat_outer << "##"
-              << std::endl ;
+              << " " << repeat_outer << "##" << std::endl;
     return -1;
   }
 
   using Scheduler = Kokkos::TaskSchedulerMultiple<ExecSpace>;
 
-  typedef TestFib< Scheduler >  Functor ;
+  typedef TestFib<Scheduler> Functor;
 
-  Kokkos::initialize(argc,argv);
+  Kokkos::initialize(argc, argv);
 
   {
-
-    Scheduler sched( Functor::MemorySpace()
-                            , total_alloc_size
-                            , min_block_size
-                            , max_block_size
-                            , min_superblock_size
-                            );
+    Scheduler sched(Functor::MemorySpace(), total_alloc_size, min_block_size,
+                    max_block_size, min_superblock_size);
 
     Functor::FutureType f =
-      Kokkos::host_spawn( Kokkos::TaskSingle( sched )
-                        , Functor( fib_input )
-                        );
+        Kokkos::host_spawn(Kokkos::TaskSingle(sched), Functor(fib_input));
 
-    Kokkos::wait( sched );
+    Kokkos::wait(sched);
 
     test_result = f.get();
 
-    //task_count_max   = sched.allocated_task_count_max();
-    //task_count_accum = sched.allocated_task_count_accum();
+    // task_count_max   = sched.allocated_task_count_max();
+    // task_count_accum = sched.allocated_task_count_accum();
 
-    //if ( number_alloc != task_count_accum ) {
+    // if ( number_alloc != task_count_accum ) {
     //  std::cout << " number_alloc( " << number_alloc << " )"
     //            << " != task_count_accum( " << task_count_accum << " )"
     //            << std::endl ;
     //}
 
-    if ( fib_output != test_result ) {
+    if (fib_output != test_result) {
       std::cout << " answer( " << fib_output << " )"
-                << " != result( " << test_result << " )"
-                << std::endl ;
+                << " != result( " << test_result << " )" << std::endl;
     }
 
-    if ( fib_output != test_result) { // || number_alloc != task_count_accum ) {
+    if (fib_output != test_result) {  // || number_alloc != task_count_accum ) {
       printf("  TEST FAILED\n");
       return -1;
     }
@@ -248,41 +219,34 @@ int main( int argc , char* argv[] )
     double min_time = std::numeric_limits<double>::max();
     double time_sum = 0;
 
-    for ( int i = 0 ; i < test_repeat_outer ; ++i ) {
-      Kokkos::Impl::Timer timer ;
+    for (int i = 0; i < test_repeat_outer; ++i) {
+      Kokkos::Impl::Timer timer;
 
       Functor::FutureType ftmp =
-        Kokkos::host_spawn( Kokkos::TaskSingle( sched )
-                          , Functor( fib_input )
-                          );
+          Kokkos::host_spawn(Kokkos::TaskSingle(sched), Functor(fib_input));
 
-      Kokkos::wait( sched );
+      Kokkos::wait(sched);
       auto this_time = timer.seconds();
-      min_time = std::min(min_time, this_time);
+      min_time       = std::min(min_time, this_time);
       time_sum += this_time;
     }
 
     auto avg_time = time_sum / test_repeat_outer;
 
-    printf( "\"taskdag: alloc super repeat input output task-accum task-max\" %ld %d %d %d %ld %ld %ld\n"
-          , total_alloc_size
-          , min_superblock_size
-          , test_repeat_outer
-          , fib_input
-          , fib_output
-          , task_count_accum
-          , task_count_max );
+    printf(
+        "\"taskdag: alloc super repeat input output task-accum task-max\" %ld "
+        "%d %d %d %ld %ld %ld\n",
+        total_alloc_size, min_superblock_size, test_repeat_outer, fib_input,
+        fib_output, task_count_accum, task_count_max);
 
-    printf( "\"taskdag: time (min, avg)\" %g %g\n", min_time, avg_time);
-    printf( "\"taskdag: tasks per second (max, avg)\" %g %g\n"
-          , number_alloc / min_time
-          , number_alloc / avg_time );
-  } // end scope to destroy scheduler prior to finalize
+    printf("\"taskdag: time (min, avg)\" %g %g\n", min_time, avg_time);
+    printf("\"taskdag: tasks per second (max, avg)\" %g %g\n",
+           number_alloc / min_time, number_alloc / avg_time);
+  }  // end scope to destroy scheduler prior to finalize
 
   Kokkos::finalize();
 
-  return 0 ;
+  return 0;
 }
 
 #endif
-
diff --git a/lib/kokkos/core/src/CMakeLists.txt b/lib/kokkos/core/src/CMakeLists.txt
index a941c5da0c..eb058a982e 100644
--- a/lib/kokkos/core/src/CMakeLists.txt
+++ b/lib/kokkos/core/src/CMakeLists.txt
@@ -1,124 +1,81 @@
-
-
-INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR})
-INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR})
-
-#-----------------------------------------------------------------------------
-
-SET(TRILINOS_INCDIR ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR})
-
-#-----------------------------------------------------------------------------
-
-IF(KOKKOS_LEGACY_TRIBITS)
-
-  MESSAGE("LEGACY STUFF GETTING CALLED")
-
-  IF(KOKKOS_ENABLE_EXPLICIT_INSTANTIATION)
-    MESSAGE("GOING INTO ETI DIR")
-    ADD_SUBDIRECTORY(eti)
-    INCLUDE_DIRECTORIES("${CMAKE_CURRENT_SOURCE_DIR}/eti")
-  ENDIF()
-
-  ASSERT_DEFINED(${PROJECT_NAME}_ENABLE_CXX11)
-  ASSERT_DEFINED(${PACKAGE_NAME}_ENABLE_CUDA)
-
-  SET(HEADERS_PUBLIC "")
-  SET(HEADERS_PRIVATE "")
-  SET(SOURCES "")
-
-  FILE(GLOB HEADERS_PUBLIC Kokkos*.hpp)
-  LIST( APPEND HEADERS_PUBLIC ${CMAKE_BINARY_DIR}/${PACKAGE_NAME}_config.h )
-
-  #-----------------------------------------------------------------------------
-
-  FILE(GLOB HEADERS_IMPL impl/*.hpp)
-  FILE(GLOB SOURCES_IMPL impl/*.cpp)
-
-  LIST(APPEND HEADERS_PRIVATE ${HEADERS_IMPL} )
-  LIST(APPEND SOURCES         ${SOURCES_IMPL} )
-
-  INSTALL(FILES ${HEADERS_IMPL} DESTINATION ${TRILINOS_INCDIR}/impl/)
-
-  #-----------------------------------------------------------------------------
-
-  FILE(GLOB HEADERS_THREADS Threads/*.hpp)
-  FILE(GLOB SOURCES_THREADS Threads/*.cpp)
-
-  LIST(APPEND HEADERS_PRIVATE ${HEADERS_THREADS} )
-  LIST(APPEND SOURCES         ${SOURCES_THREADS} )
-
-  INSTALL(FILES ${HEADERS_THREADS} DESTINATION ${TRILINOS_INCDIR}/Threads/)
-
-  #-----------------------------------------------------------------------------
-
-  FILE(GLOB HEADERS_OPENMP OpenMP/*.hpp)
-  FILE(GLOB SOURCES_OPENMP OpenMP/*.cpp)
-
-  LIST(APPEND HEADERS_PRIVATE ${HEADERS_OPENMP} )
-  LIST(APPEND SOURCES         ${SOURCES_OPENMP} )
-
-  INSTALL(FILES ${HEADERS_OPENMP} DESTINATION ${TRILINOS_INCDIR}/OpenMP/)
-
-  #-----------------------------------------------------------------------------
-
-  FILE(GLOB HEADERS_HPX HPX/*.hpp)
-  FILE(GLOB SOURCES_HPX HPX/*.cpp)
-
-  LIST(APPEND HEADERS_PRIVATE ${HEADERS_HPX} )
-  LIST(APPEND SOURCES         ${SOURCES_HPX} )
-
-  INSTALL(FILES ${HEADERS_HPX} DESTINATION ${TRILINOS_INCDIR}/HPX/)
-
-  #-----------------------------------------------------------------------------
-
-  FILE(GLOB HEADERS_CUDA Cuda/*.hpp)
-  FILE(GLOB SOURCES_CUDA Cuda/*.cpp)
-
-  LIST(APPEND HEADERS_PRIVATE ${HEADERS_CUDA} )
-  LIST(APPEND SOURCES         ${SOURCES_CUDA} )
-
-  INSTALL(FILES ${HEADERS_CUDA} DESTINATION ${TRILINOS_INCDIR}/Cuda/)
-
-  #-----------------------------------------------------------------------------
-  FILE(GLOB HEADERS_QTHREADS Qthreads/*.hpp)
-  FILE(GLOB SOURCES_QTHREADS Qthreads/*.cpp)
-
-  LIST(APPEND HEADERS_PRIVATE ${HEADERS_QTHREADS} )
-  LIST(APPEND SOURCES         ${SOURCES_QTHREADS} )
-
-  IF(KOKKOS_ENABLE_EXPLICIT_INSTANTIATION)
-    LIST(APPEND SOURCES       ${ETI_SOURCES} )
-  ENDIF()
-
-  INSTALL(FILES ${HEADERS_QTHREADS} DESTINATION ${TRILINOS_INCDIR}/Qthreads/)
-
-  TRIBITS_ADD_LIBRARY(
-      kokkoscore
-      HEADERS ${HEADERS_PUBLIC}
-      NOINSTALLHEADERS ${HEADERS_PRIVATE}
-      SOURCES ${SOURCES}
-      DEPLIBS
-      )
-
-#-----------------------------------------------------------------------------
-#  In the new build system, sources are calculated by Makefile.kokkos
-else()
-
-  INSTALL (DIRECTORY
-           "${CMAKE_CURRENT_SOURCE_DIR}/"
-           DESTINATION ${TRILINOS_INCDIR}
-           FILES_MATCHING PATTERN "*.hpp"
-  )
-
-  TRIBITS_ADD_LIBRARY(
-      kokkoscore
-      SOURCES ${KOKKOS_CORE_SRCS}
-      DEPLIBS
-      )
-
-endif()
-#-----------------------------------------------------------------------------
-
-# build and install pkgconfig file
-CONFIGURE_FILE(kokkos.pc.in kokkos.pc @ONLY)
-INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/kokkos.pc DESTINATION lib/pkgconfig)
+#I have to leave these here for tribits
+KOKKOS_INCLUDE_DIRECTORIES(
+  ${CMAKE_CURRENT_BINARY_DIR}
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  ${KOKKOS_TOP_BUILD_DIR}
+)
+
+INSTALL (DIRECTORY
+  "${CMAKE_CURRENT_SOURCE_DIR}/"
+  DESTINATION ${KOKKOS_HEADER_DIR}
+  FILES_MATCHING PATTERN "*.hpp"
+)
+
+SET(KOKKOS_CORE_SRCS)
+APPEND_GLOB(KOKKOS_CORE_SRCS ${CMAKE_CURRENT_SOURCE_DIR}/impl/*.cpp)
+
+IF (KOKKOS_ENABLE_ROCM)
+  APPEND_GLOB(KOKKOS_CORE_SRCS ${CMAKE_CURRENT_SOURCE_DIR}/ROCm/*.cpp)
+  IF (KOKKOS_ENABLE_ETI)
+    APPEND_GLOB(KOKKOS_CORE_SRCS ${CMAKE_CURRENT_SOURCE_DIR}/eti/ROCm/*.cpp)
+  ENDIF()
+ENDIF()
+
+IF (KOKKOS_ENABLE_CUDA)
+  APPEND_GLOB(KOKKOS_CORE_SRCS ${CMAKE_CURRENT_SOURCE_DIR}/Cuda/*.cpp)
+  IF (KOKKOS_ENABLE_ETI)
+    APPEND_GLOB(KOKKOS_CORE_SRC ${CMAKE_CURRENT_SOURCE_DIR/eti/Cuda/*.cpp)
+  ENDIF()
+ENDIF()
+
+IF (KOKKOS_ENABLE_OPENMP)
+  APPEND_GLOB(KOKKOS_CORE_SRCS ${CMAKE_CURRENT_SOURCE_DIR}/OpenMP/*.cpp)
+  IF (KOKKOS_ENABLE_ETI)
+    APPEND_GLOB(KOKKOS_CORE_SRCS ${CMAKE_CURRENT_SOURCE_DIR}/eti/OpenMP/*.cpp)
+  ENDIF()
+ENDIF()
+
+IF (KOKKOS_ENABLE_PTHREAD)
+  APPEND_GLOB(KOKKOS_CORE_SRCS ${CMAKE_CURRENT_SOURCE_DIR}/Threads/*.cpp)
+  IF (KOKKOS_ENABLE_ETI)
+    APPEND_GLOB(KOKKOS_CORE_SRCS ${CMAKE_CURRENT_SOURCE_DIR}/eti/Threads/*.cpp)
+  ENDIF()
+ENDIF()
+
+IF (KOKKOS_ENABLE_HPX)
+  APPEND_GLOB(KOKKOS_CORE_SRCS ${CMAKE_CURRENT_SOURCE_DIR}/HPX/*.cpp)
+ENDIF()
+
+IF (NOT KOKKOS_ENABLE_MEMKIND)
+  LIST(REMOVE_ITEM KOKKOS_CORE_SRCS ${CMAKE_CURRENT_SOURCE_DIR}/impl/Kokkos_HBWSpace.cpp)
+ENDIF()
+
+IF (KOKKOS_ENABLE_SERIAL)
+  IF (KOKKOS_ENABLE_ETI)
+    APPEND_GLOB(KOKKOS_CORE_SRCS ${CMAKE_CURRENT_SOURCE_DIR}/eti/Serial/*.cpp)
+  ENDIF()
+ELSE()
+  LIST(REMOVE_ITEM KOKKOS_CORE_SRCS ${CMAKE_CURRENT_SOURCE_DIR}/impl/Kokkos_Serial.cpp)
+  LIST(REMOVE_ITEM KOKKOS_CORE_SRCS ${CMAKE_CURRENT_SOURCE_DIR}/impl/Kokkos_Serial_task.cpp)
+ENDIF()
+
+KOKKOS_ADD_LIBRARY(
+  kokkoscore
+  SOURCES ${KOKKOS_CORE_SRCS}
+)
+
+SET_TARGET_PROPERTIES(kokkoscore PROPERTIES VERSION ${Kokkos_VERSION})
+
+KOKKOS_LIB_INCLUDE_DIRECTORIES(kokkoscore
+  ${KOKKOS_TOP_BUILD_DIR}
+  ${CMAKE_CURRENT_BINARY_DIR}
+  ${CMAKE_CURRENT_SOURCE_DIR}
+)
+
+KOKKOS_LINK_TPL(kokkoscore PUBLIC HWLOC)
+KOKKOS_LINK_TPL(kokkoscore PUBLIC MEMKIND)
+KOKKOS_LINK_TPL(kokkoscore PUBLIC CUDA)
+KOKKOS_LINK_TPL(kokkoscore PUBLIC HPX)
+KOKKOS_LINK_TPL(kokkoscore PUBLIC LIBDL)
+KOKKOS_LINK_TPL(kokkoscore PUBLIC LIBRT)
+KOKKOS_LINK_TPL(kokkoscore PUBLIC PTHREAD)
diff --git a/lib/kokkos/core/src/Cuda/KokkosExp_Cuda_IterateTile.hpp b/lib/kokkos/core/src/Cuda/KokkosExp_Cuda_IterateTile.hpp
index 8a83dfff4a..3706263921 100644
--- a/lib/kokkos/core/src/Cuda/KokkosExp_Cuda_IterateTile.hpp
+++ b/lib/kokkos/core/src/Cuda/KokkosExp_Cuda_IterateTile.hpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -45,7 +46,7 @@
 #define KOKKOS_CUDA_EXP_ITERATE_TILE_HPP
 
 #include <Kokkos_Macros.hpp>
-#if defined( __CUDACC__ ) && defined( KOKKOS_ENABLE_CUDA )
+#if defined(__CUDACC__) && defined(KOKKOS_ENABLE_CUDA)
 
 #include <iostream>
 #include <algorithm>
@@ -55,245 +56,182 @@
 
 //#include<Cuda/Kokkos_CudaExec.hpp>
 // Including the file above, leads to following type of errors:
-// /home/ndellin/kokkos/core/src/Cuda/Kokkos_CudaExec.hpp(84): error: incomplete type is not allowed
-// As a result, recreate cuda_parallel_launch and associated code
+// /home/ndellin/kokkos/core/src/Cuda/Kokkos_CudaExec.hpp(84): error: incomplete
+// type is not allowed As a result, recreate cuda_parallel_launch and associated
+// code
 
 #if defined(KOKKOS_ENABLE_PROFILING)
 #include <impl/Kokkos_Profiling_Interface.hpp>
 #include <typeinfo>
 #endif
 
-namespace Kokkos { namespace Impl {
+namespace Kokkos {
+namespace Impl {
 
 // ------------------------------------------------------------------ //
 
-template< class DriverType >
-__global__
-static void cuda_parallel_launch( const DriverType driver )
-{
+template <class DriverType>
+__global__ static void cuda_parallel_launch(const DriverType driver) {
   driver();
 }
 
-template< class DriverType >
-struct CudaLaunch
-{
-  inline
-  CudaLaunch( const DriverType & driver
-                    , const dim3       & grid
-                    , const dim3       & block
-            )
-  {
-    cuda_parallel_launch< DriverType ><<< grid , block >>>(driver);
+template <class DriverType>
+struct CudaLaunch {
+  inline CudaLaunch(const DriverType& driver, const dim3& grid,
+                    const dim3& block) {
+    cuda_parallel_launch<DriverType><<<grid, block>>>(driver);
   }
-
 };
 
 // ------------------------------------------------------------------ //
-template< int N , typename RP , typename Functor , typename Tag >
+template <int N, typename RP, typename Functor, typename Tag>
 struct apply_impl;
 
-//Rank 2
+// Rank 2
 // Specializations for void tag type
-template< typename RP , typename Functor >
-struct apply_impl<2,RP,Functor,void >
-{
+template <typename RP, typename Functor>
+struct apply_impl<2, RP, Functor, void> {
   using index_type = typename RP::index_type;
 
-  __device__
-  apply_impl( const RP & rp_ , const Functor & f_ )
-  : m_rp(rp_)
-  , m_func(f_)
-  {}
+  __device__ apply_impl(const RP& rp_, const Functor& f_)
+      : m_rp(rp_), m_func(f_) {}
 
-  inline __device__
-  void exec_range() const
-  {
-// LL
-  if (RP::inner_direction == RP::Left) {
-    for ( index_type tile_id1 = blockIdx.y; tile_id1 < m_rp.m_tile_end[1]; tile_id1 += gridDim.y ) {
-      const index_type offset_1 = tile_id1*m_rp.m_tile[1] + (index_type)threadIdx.y + (index_type)m_rp.m_lower[1];
-      if ( offset_1 < m_rp.m_upper[1] && threadIdx.y < m_rp.m_tile[1] ) {
-
-        for ( index_type tile_id0 = blockIdx.x; tile_id0 < m_rp.m_tile_end[0]; tile_id0 += gridDim.x ) {
-          const index_type offset_0 = tile_id0*m_rp.m_tile[0] + (index_type)threadIdx.x + (index_type)m_rp.m_lower[0];
-          if ( offset_0 < m_rp.m_upper[0] && threadIdx.x < m_rp.m_tile[0] ) {
-            m_func(offset_0 , offset_1);
+  inline __device__ void exec_range() const {
+    // LL
+    if (RP::inner_direction == RP::Left) {
+      for (index_type tile_id1 = blockIdx.y; tile_id1 < m_rp.m_tile_end[1];
+           tile_id1 += gridDim.y) {
+        const index_type offset_1 = tile_id1 * m_rp.m_tile[1] +
+                                    (index_type)threadIdx.y +
+                                    (index_type)m_rp.m_lower[1];
+        if (offset_1 < m_rp.m_upper[1] && threadIdx.y < m_rp.m_tile[1]) {
+          for (index_type tile_id0 = blockIdx.x; tile_id0 < m_rp.m_tile_end[0];
+               tile_id0 += gridDim.x) {
+            const index_type offset_0 = tile_id0 * m_rp.m_tile[0] +
+                                        (index_type)threadIdx.x +
+                                        (index_type)m_rp.m_lower[0];
+            if (offset_0 < m_rp.m_upper[0] && threadIdx.x < m_rp.m_tile[0]) {
+              m_func(offset_0, offset_1);
+            }
           }
         }
       }
     }
-  }
-// LR
-  else {
-    for ( index_type tile_id0 = blockIdx.x; tile_id0 < m_rp.m_tile_end[0]; tile_id0 += gridDim.x ) {
-      const index_type offset_0 = tile_id0*m_rp.m_tile[0] + (index_type)threadIdx.x + (index_type)m_rp.m_lower[0];
-      if ( offset_0 < m_rp.m_upper[0] && threadIdx.x < m_rp.m_tile[0] ) {
-
-        for ( index_type tile_id1 = blockIdx.y; tile_id1 < m_rp.m_tile_end[1]; tile_id1 += gridDim.y ) {
-          const index_type offset_1 = tile_id1*m_rp.m_tile[1] + (index_type)threadIdx.y + (index_type)m_rp.m_lower[1];
-          if ( offset_1 < m_rp.m_upper[1] && threadIdx.y < m_rp.m_tile[1] ) {
-            m_func(offset_0 , offset_1);
+    // LR
+    else {
+      for (index_type tile_id0 = blockIdx.x; tile_id0 < m_rp.m_tile_end[0];
+           tile_id0 += gridDim.x) {
+        const index_type offset_0 = tile_id0 * m_rp.m_tile[0] +
+                                    (index_type)threadIdx.x +
+                                    (index_type)m_rp.m_lower[0];
+        if (offset_0 < m_rp.m_upper[0] && threadIdx.x < m_rp.m_tile[0]) {
+          for (index_type tile_id1 = blockIdx.y; tile_id1 < m_rp.m_tile_end[1];
+               tile_id1 += gridDim.y) {
+            const index_type offset_1 = tile_id1 * m_rp.m_tile[1] +
+                                        (index_type)threadIdx.y +
+                                        (index_type)m_rp.m_lower[1];
+            if (offset_1 < m_rp.m_upper[1] && threadIdx.y < m_rp.m_tile[1]) {
+              m_func(offset_0, offset_1);
+            }
           }
         }
       }
     }
-  }
 
-  } //end exec_range
-
-private:
-  const RP & m_rp;
-  const Functor & m_func;
+  }  // end exec_range
 
+ private:
+  const RP& m_rp;
+  const Functor& m_func;
 };
 
 // Specializations for tag type
-template< typename RP , typename Functor , typename Tag >
-struct apply_impl<2,RP,Functor,Tag>
-{
+template <typename RP, typename Functor, typename Tag>
+struct apply_impl<2, RP, Functor, Tag> {
   using index_type = typename RP::index_type;
 
-  inline __device__
-  apply_impl( const RP & rp_ , const Functor & f_ )
-  : m_rp(rp_)
-  , m_func(f_)
-  {}
+  inline __device__ apply_impl(const RP& rp_, const Functor& f_)
+      : m_rp(rp_), m_func(f_) {}
 
-  inline __device__
-  void exec_range() const
-  {
-  if (RP::inner_direction == RP::Left) {
-    // Loop over size maxnumblocks until full range covered
-    for ( index_type tile_id1 = blockIdx.y; tile_id1 < m_rp.m_tile_end[1]; tile_id1 += gridDim.y ) {
-      const index_type offset_1 = tile_id1*m_rp.m_tile[1] + (index_type)threadIdx.y + (index_type)m_rp.m_lower[1];
-      if ( offset_1 < m_rp.m_upper[1] && threadIdx.y < m_rp.m_tile[1] ) {
-
-        for ( index_type tile_id0 = blockIdx.x; tile_id0 < m_rp.m_tile_end[0]; tile_id0 += gridDim.x ) {
-          const index_type offset_0 = tile_id0*m_rp.m_tile[0] + (index_type)threadIdx.x + (index_type)m_rp.m_lower[0];
-          if ( offset_0 < m_rp.m_upper[0] && threadIdx.x < m_rp.m_tile[0] ) {
-            m_func(Tag(), offset_0 , offset_1);
+  inline __device__ void exec_range() const {
+    if (RP::inner_direction == RP::Left) {
+      // Loop over size maxnumblocks until full range covered
+      for (index_type tile_id1 = blockIdx.y; tile_id1 < m_rp.m_tile_end[1];
+           tile_id1 += gridDim.y) {
+        const index_type offset_1 = tile_id1 * m_rp.m_tile[1] +
+                                    (index_type)threadIdx.y +
+                                    (index_type)m_rp.m_lower[1];
+        if (offset_1 < m_rp.m_upper[1] && threadIdx.y < m_rp.m_tile[1]) {
+          for (index_type tile_id0 = blockIdx.x; tile_id0 < m_rp.m_tile_end[0];
+               tile_id0 += gridDim.x) {
+            const index_type offset_0 = tile_id0 * m_rp.m_tile[0] +
+                                        (index_type)threadIdx.x +
+                                        (index_type)m_rp.m_lower[0];
+            if (offset_0 < m_rp.m_upper[0] && threadIdx.x < m_rp.m_tile[0]) {
+              m_func(Tag(), offset_0, offset_1);
+            }
+          }
+        }
+      }
+    } else {
+      for (index_type tile_id0 = blockIdx.x; tile_id0 < m_rp.m_tile_end[0];
+           tile_id0 += gridDim.x) {
+        const index_type offset_0 = tile_id0 * m_rp.m_tile[0] +
+                                    (index_type)threadIdx.x +
+                                    (index_type)m_rp.m_lower[0];
+        if (offset_0 < m_rp.m_upper[0] && threadIdx.x < m_rp.m_tile[0]) {
+          for (index_type tile_id1 = blockIdx.y; tile_id1 < m_rp.m_tile_end[1];
+               tile_id1 += gridDim.y) {
+            const index_type offset_1 = tile_id1 * m_rp.m_tile[1] +
+                                        (index_type)threadIdx.y +
+                                        (index_type)m_rp.m_lower[1];
+            if (offset_1 < m_rp.m_upper[1] && threadIdx.y < m_rp.m_tile[1]) {
+              m_func(Tag(), offset_0, offset_1);
+            }
           }
         }
       }
     }
-  }
-  else {
-    for ( index_type tile_id0 = blockIdx.x; tile_id0 < m_rp.m_tile_end[0]; tile_id0 += gridDim.x ) {
-      const index_type offset_0 = tile_id0*m_rp.m_tile[0] + (index_type)threadIdx.x + (index_type)m_rp.m_lower[0];
-      if ( offset_0 < m_rp.m_upper[0] && threadIdx.x < m_rp.m_tile[0] ) {
 
-        for ( index_type tile_id1 = blockIdx.y; tile_id1 < m_rp.m_tile_end[1]; tile_id1 += gridDim.y ) {
-          const index_type offset_1 = tile_id1*m_rp.m_tile[1] + (index_type)threadIdx.y + (index_type)m_rp.m_lower[1];
-          if ( offset_1 < m_rp.m_upper[1] && threadIdx.y < m_rp.m_tile[1] ) {
-            m_func(Tag(), offset_0 , offset_1);
-          }
-        }
-      }
-    }
-  }
+  }  // end exec_range
 
-  } //end exec_range
-
-private:
-  const RP & m_rp;
-  const Functor & m_func;
+ private:
+  const RP& m_rp;
+  const Functor& m_func;
 };
 
-
-//Rank 3
+// Rank 3
 // Specializations for void tag type
-template< typename RP , typename Functor >
-struct apply_impl<3,RP,Functor,void >
-{
+template <typename RP, typename Functor>
+struct apply_impl<3, RP, Functor, void> {
   using index_type = typename RP::index_type;
 
-  __device__
-  apply_impl( const RP & rp_ , const Functor & f_ )
-  : m_rp(rp_)
-  , m_func(f_)
-  {}
+  __device__ apply_impl(const RP& rp_, const Functor& f_)
+      : m_rp(rp_), m_func(f_) {}
 
-  inline __device__
-  void exec_range() const
-  {
-// LL
+  inline __device__ void exec_range() const {
+    // LL
     if (RP::inner_direction == RP::Left) {
-      for ( index_type tile_id2 = blockIdx.z; tile_id2 < m_rp.m_tile_end[2]; tile_id2 += gridDim.z ) {
-        const index_type offset_2 = tile_id2*m_rp.m_tile[2] + (index_type)threadIdx.z + (index_type)m_rp.m_lower[2];
-        if ( offset_2 < m_rp.m_upper[2] && threadIdx.z < m_rp.m_tile[2] ) {
-
-          for ( index_type tile_id1 = blockIdx.y; tile_id1 < m_rp.m_tile_end[1]; tile_id1 += gridDim.y ) {
-            const index_type offset_1 = tile_id1*m_rp.m_tile[1] + (index_type)threadIdx.y + (index_type)m_rp.m_lower[1];
-            if ( offset_1 < m_rp.m_upper[1] && threadIdx.y < m_rp.m_tile[1] ) {
-
-              for ( index_type tile_id0 = blockIdx.x; tile_id0 < m_rp.m_tile_end[0]; tile_id0 += gridDim.x ) {
-                const index_type offset_0 = tile_id0*m_rp.m_tile[0] + (index_type)threadIdx.x + (index_type)m_rp.m_lower[0];
-                if ( offset_0 < m_rp.m_upper[0] && threadIdx.x < m_rp.m_tile[0] ) {
-                  m_func(offset_0 , offset_1 , offset_2);
-                }
-              }
-            }
-          }
-        }
-      }
-    }
-// LR
-  else {
-    for ( index_type tile_id0 = blockIdx.x; tile_id0 < m_rp.m_tile_end[0]; tile_id0 += gridDim.x ) {
-      const index_type offset_0 = tile_id0*m_rp.m_tile[0] + (index_type)threadIdx.x + (index_type)m_rp.m_lower[0];
-      if ( offset_0 < m_rp.m_upper[0] && threadIdx.x < m_rp.m_tile[0] ) {
-
-        for ( index_type tile_id1 = blockIdx.y; tile_id1 < m_rp.m_tile_end[1]; tile_id1 += gridDim.y ) {
-          const index_type offset_1 = tile_id1*m_rp.m_tile[1] + (index_type)threadIdx.y + (index_type)m_rp.m_lower[1];
-          if ( offset_1 < m_rp.m_upper[1] && threadIdx.y < m_rp.m_tile[1] ) {
-
-            for ( index_type tile_id2 = blockIdx.z; tile_id2 < m_rp.m_tile_end[2]; tile_id2 += gridDim.z ) {
-              const index_type offset_2 = tile_id2*m_rp.m_tile[2] + (index_type)threadIdx.z + (index_type)m_rp.m_lower[2];
-              if ( offset_2 < m_rp.m_upper[2] && threadIdx.z < m_rp.m_tile[2] ) {
-                m_func(offset_0 , offset_1 , offset_2);
-              }
-            }
-          }
-        }
-      }
-    }
-  }
-
-  } //end exec_range
-
-private:
-  const RP & m_rp;
-  const Functor & m_func;
-};
-
-// Specializations for void tag type
-template< typename RP , typename Functor , typename Tag >
-struct apply_impl<3,RP,Functor,Tag>
-{
-  using index_type = typename RP::index_type;
-
-  inline __device__
-  apply_impl( const RP & rp_ , const Functor & f_ )
-  : m_rp(rp_)
-  , m_func(f_)
-  {}
-
-  inline __device__
-  void exec_range() const
-  {
-    if (RP::inner_direction == RP::Left) {
-      for ( index_type tile_id2 = blockIdx.z; tile_id2 < m_rp.m_tile_end[2]; tile_id2 += gridDim.z ) {
-        const index_type offset_2 = tile_id2*m_rp.m_tile[2] + (index_type)threadIdx.z + (index_type)m_rp.m_lower[2];
-        if ( offset_2 < m_rp.m_upper[2] && threadIdx.z < m_rp.m_tile[2] ) {
-
-          for ( index_type tile_id1 = blockIdx.y; tile_id1 < m_rp.m_tile_end[1]; tile_id1 += gridDim.y ) {
-            const index_type offset_1 = tile_id1*m_rp.m_tile[1] + (index_type)threadIdx.y + (index_type)m_rp.m_lower[1];
-            if ( offset_1 < m_rp.m_upper[1] && threadIdx.y < m_rp.m_tile[1] ) {
-
-              for ( index_type tile_id0 = blockIdx.x; tile_id0 < m_rp.m_tile_end[0]; tile_id0 += gridDim.x ) {
-                const index_type offset_0 = tile_id0*m_rp.m_tile[0] + (index_type)threadIdx.x + (index_type)m_rp.m_lower[0];
-                if ( offset_0 < m_rp.m_upper[0] && threadIdx.x < m_rp.m_tile[0] ) {
-                  m_func(Tag(), offset_0 , offset_1 , offset_2);
+      for (index_type tile_id2 = blockIdx.z; tile_id2 < m_rp.m_tile_end[2];
+           tile_id2 += gridDim.z) {
+        const index_type offset_2 = tile_id2 * m_rp.m_tile[2] +
+                                    (index_type)threadIdx.z +
+                                    (index_type)m_rp.m_lower[2];
+        if (offset_2 < m_rp.m_upper[2] && threadIdx.z < m_rp.m_tile[2]) {
+          for (index_type tile_id1 = blockIdx.y; tile_id1 < m_rp.m_tile_end[1];
+               tile_id1 += gridDim.y) {
+            const index_type offset_1 = tile_id1 * m_rp.m_tile[1] +
+                                        (index_type)threadIdx.y +
+                                        (index_type)m_rp.m_lower[1];
+            if (offset_1 < m_rp.m_upper[1] && threadIdx.y < m_rp.m_tile[1]) {
+              for (index_type tile_id0 = blockIdx.x;
+                   tile_id0 < m_rp.m_tile_end[0]; tile_id0 += gridDim.x) {
+                const index_type offset_0 = tile_id0 * m_rp.m_tile[0] +
+                                            (index_type)threadIdx.x +
+                                            (index_type)m_rp.m_lower[0];
+                if (offset_0 < m_rp.m_upper[0] &&
+                    threadIdx.x < m_rp.m_tile[0]) {
+                  m_func(offset_0, offset_1, offset_2);
                 }
               }
             }
@@ -301,19 +239,28 @@ struct apply_impl<3,RP,Functor,Tag>
         }
       }
     }
+    // LR
     else {
-      for ( index_type tile_id0 = blockIdx.x; tile_id0 < m_rp.m_tile_end[0]; tile_id0 += gridDim.x ) {
-        const index_type offset_0 = tile_id0*m_rp.m_tile[0] + (index_type)threadIdx.x + (index_type)m_rp.m_lower[0];
-        if ( offset_0 < m_rp.m_upper[0] && threadIdx.x < m_rp.m_tile[0] ) {
-
-          for ( index_type tile_id1 = blockIdx.y; tile_id1 < m_rp.m_tile_end[1]; tile_id1 += gridDim.y ) {
-            const index_type offset_1 = tile_id1*m_rp.m_tile[1] + (index_type)threadIdx.y + (index_type)m_rp.m_lower[1];
-            if ( offset_1 < m_rp.m_upper[1] && threadIdx.y < m_rp.m_tile[1] ) {
-
-              for ( index_type tile_id2 = blockIdx.z; tile_id2 < m_rp.m_tile_end[2]; tile_id2 += gridDim.z ) {
-                const index_type offset_2 = tile_id2*m_rp.m_tile[2] + (index_type)threadIdx.z + (index_type)m_rp.m_lower[2];
-                if ( offset_2 < m_rp.m_upper[2] && threadIdx.z < m_rp.m_tile[2] ) {
-                  m_func(Tag(), offset_0 , offset_1 , offset_2);
+      for (index_type tile_id0 = blockIdx.x; tile_id0 < m_rp.m_tile_end[0];
+           tile_id0 += gridDim.x) {
+        const index_type offset_0 = tile_id0 * m_rp.m_tile[0] +
+                                    (index_type)threadIdx.x +
+                                    (index_type)m_rp.m_lower[0];
+        if (offset_0 < m_rp.m_upper[0] && threadIdx.x < m_rp.m_tile[0]) {
+          for (index_type tile_id1 = blockIdx.y; tile_id1 < m_rp.m_tile_end[1];
+               tile_id1 += gridDim.y) {
+            const index_type offset_1 = tile_id1 * m_rp.m_tile[1] +
+                                        (index_type)threadIdx.y +
+                                        (index_type)m_rp.m_lower[1];
+            if (offset_1 < m_rp.m_upper[1] && threadIdx.y < m_rp.m_tile[1]) {
+              for (index_type tile_id2 = blockIdx.z;
+                   tile_id2 < m_rp.m_tile_end[2]; tile_id2 += gridDim.z) {
+                const index_type offset_2 = tile_id2 * m_rp.m_tile[2] +
+                                            (index_type)threadIdx.z +
+                                            (index_type)m_rp.m_lower[2];
+                if (offset_2 < m_rp.m_upper[2] &&
+                    threadIdx.z < m_rp.m_tile[2]) {
+                  m_func(offset_0, offset_1, offset_2);
                 }
               }
             }
@@ -322,61 +269,136 @@ struct apply_impl<3,RP,Functor,Tag>
       }
     }
 
-  } //end exec_range
+  }  // end exec_range
 
-private:
-  const RP & m_rp;
-  const Functor & m_func;
+ private:
+  const RP& m_rp;
+  const Functor& m_func;
 };
 
-
-//Rank 4
 // Specializations for void tag type
-template< typename RP , typename Functor >
-struct apply_impl<4,RP,Functor,void >
-{
+template <typename RP, typename Functor, typename Tag>
+struct apply_impl<3, RP, Functor, Tag> {
   using index_type = typename RP::index_type;
 
-  __device__
-  apply_impl( const RP & rp_ , const Functor & f_ )
-  : m_rp(rp_)
-  , m_func(f_)
-  {}
+  inline __device__ apply_impl(const RP& rp_, const Functor& f_)
+      : m_rp(rp_), m_func(f_) {}
+
+  inline __device__ void exec_range() const {
+    if (RP::inner_direction == RP::Left) {
+      for (index_type tile_id2 = blockIdx.z; tile_id2 < m_rp.m_tile_end[2];
+           tile_id2 += gridDim.z) {
+        const index_type offset_2 = tile_id2 * m_rp.m_tile[2] +
+                                    (index_type)threadIdx.z +
+                                    (index_type)m_rp.m_lower[2];
+        if (offset_2 < m_rp.m_upper[2] && threadIdx.z < m_rp.m_tile[2]) {
+          for (index_type tile_id1 = blockIdx.y; tile_id1 < m_rp.m_tile_end[1];
+               tile_id1 += gridDim.y) {
+            const index_type offset_1 = tile_id1 * m_rp.m_tile[1] +
+                                        (index_type)threadIdx.y +
+                                        (index_type)m_rp.m_lower[1];
+            if (offset_1 < m_rp.m_upper[1] && threadIdx.y < m_rp.m_tile[1]) {
+              for (index_type tile_id0 = blockIdx.x;
+                   tile_id0 < m_rp.m_tile_end[0]; tile_id0 += gridDim.x) {
+                const index_type offset_0 = tile_id0 * m_rp.m_tile[0] +
+                                            (index_type)threadIdx.x +
+                                            (index_type)m_rp.m_lower[0];
+                if (offset_0 < m_rp.m_upper[0] &&
+                    threadIdx.x < m_rp.m_tile[0]) {
+                  m_func(Tag(), offset_0, offset_1, offset_2);
+                }
+              }
+            }
+          }
+        }
+      }
+    } else {
+      for (index_type tile_id0 = blockIdx.x; tile_id0 < m_rp.m_tile_end[0];
+           tile_id0 += gridDim.x) {
+        const index_type offset_0 = tile_id0 * m_rp.m_tile[0] +
+                                    (index_type)threadIdx.x +
+                                    (index_type)m_rp.m_lower[0];
+        if (offset_0 < m_rp.m_upper[0] && threadIdx.x < m_rp.m_tile[0]) {
+          for (index_type tile_id1 = blockIdx.y; tile_id1 < m_rp.m_tile_end[1];
+               tile_id1 += gridDim.y) {
+            const index_type offset_1 = tile_id1 * m_rp.m_tile[1] +
+                                        (index_type)threadIdx.y +
+                                        (index_type)m_rp.m_lower[1];
+            if (offset_1 < m_rp.m_upper[1] && threadIdx.y < m_rp.m_tile[1]) {
+              for (index_type tile_id2 = blockIdx.z;
+                   tile_id2 < m_rp.m_tile_end[2]; tile_id2 += gridDim.z) {
+                const index_type offset_2 = tile_id2 * m_rp.m_tile[2] +
+                                            (index_type)threadIdx.z +
+                                            (index_type)m_rp.m_lower[2];
+                if (offset_2 < m_rp.m_upper[2] &&
+                    threadIdx.z < m_rp.m_tile[2]) {
+                  m_func(Tag(), offset_0, offset_1, offset_2);
+                }
+              }
+            }
+          }
+        }
+      }
+    }
+
+  }  // end exec_range
+
+ private:
+  const RP& m_rp;
+  const Functor& m_func;
+};
+
+// Rank 4
+// Specializations for void tag type
+template <typename RP, typename Functor>
+struct apply_impl<4, RP, Functor, void> {
+  using index_type = typename RP::index_type;
+
+  __device__ apply_impl(const RP& rp_, const Functor& f_)
+      : m_rp(rp_), m_func(f_) {}
 
   static constexpr index_type max_blocks = 65535;
 
-  inline __device__
-  void exec_range() const
-  {
-// LL
+  inline __device__ void exec_range() const {
+    // LL
     if (RP::inner_direction == RP::Left) {
-      const index_type temp0  =  m_rp.m_tile_end[0];
-      const index_type temp1  =  m_rp.m_tile_end[1];
-      const index_type numbl0 = ( temp0 <= max_blocks ? temp0 : max_blocks ) ;
-      const index_type numbl1 = ( temp0*temp1 > max_blocks ? index_type( max_blocks / numbl0 ) :
-      (  temp1 <= max_blocks ? temp1 : max_blocks ) );
+      const index_type temp0  = m_rp.m_tile_end[0];
+      const index_type temp1  = m_rp.m_tile_end[1];
+      const index_type numbl0 = (temp0 <= max_blocks ? temp0 : max_blocks);
+      const index_type numbl1 =
+          (temp0 * temp1 > max_blocks
+               ? index_type(max_blocks / numbl0)
+               : (temp1 <= max_blocks ? temp1 : max_blocks));
 
       const index_type tile_id0 = blockIdx.x % numbl0;
       const index_type tile_id1 = blockIdx.x / numbl0;
-      const index_type thr_id0 = threadIdx.x % m_rp.m_tile[0];
-      const index_type thr_id1 = threadIdx.x / m_rp.m_tile[0];
+      const index_type thr_id0  = threadIdx.x % m_rp.m_tile[0];
+      const index_type thr_id1  = threadIdx.x / m_rp.m_tile[0];
 
-      for ( index_type tile_id3 = blockIdx.z; tile_id3 < m_rp.m_tile_end[3]; tile_id3 += gridDim.z ) {
-        const index_type offset_3 = tile_id3*m_rp.m_tile[3] + (index_type)threadIdx.z + (index_type)m_rp.m_lower[3];
-        if ( offset_3 < m_rp.m_upper[3] && threadIdx.z < m_rp.m_tile[3] ) {
-
-          for ( index_type tile_id2 = blockIdx.y; tile_id2 < m_rp.m_tile_end[2]; tile_id2 += gridDim.y ) {
-            const index_type offset_2 = tile_id2*m_rp.m_tile[2] + (index_type)threadIdx.y + (index_type)m_rp.m_lower[2];
-            if ( offset_2 < m_rp.m_upper[2] && threadIdx.y < m_rp.m_tile[2] ) {
-
-              for ( index_type j = tile_id1 ; j < m_rp.m_tile_end[1]; j += numbl1 ) {
-                const index_type offset_1 = j*m_rp.m_tile[1] + thr_id1 + (index_type)m_rp.m_lower[1];
-                if ( offset_1 < m_rp.m_upper[1] && thr_id1 < m_rp.m_tile[1] ) {
-
-                  for ( index_type i = tile_id0 ; i < m_rp.m_tile_end[0]; i += numbl0 ) {
-                    const index_type offset_0 = i*m_rp.m_tile[0] + thr_id0 + (index_type)m_rp.m_lower[0];
-                    if ( offset_0 < m_rp.m_upper[0] && thr_id0 < m_rp.m_tile[0] ) {
-                      m_func(offset_0 , offset_1 , offset_2 , offset_3);
+      for (index_type tile_id3 = blockIdx.z; tile_id3 < m_rp.m_tile_end[3];
+           tile_id3 += gridDim.z) {
+        const index_type offset_3 = tile_id3 * m_rp.m_tile[3] +
+                                    (index_type)threadIdx.z +
+                                    (index_type)m_rp.m_lower[3];
+        if (offset_3 < m_rp.m_upper[3] && threadIdx.z < m_rp.m_tile[3]) {
+          for (index_type tile_id2 = blockIdx.y; tile_id2 < m_rp.m_tile_end[2];
+               tile_id2 += gridDim.y) {
+            const index_type offset_2 = tile_id2 * m_rp.m_tile[2] +
+                                        (index_type)threadIdx.y +
+                                        (index_type)m_rp.m_lower[2];
+            if (offset_2 < m_rp.m_upper[2] && threadIdx.y < m_rp.m_tile[2]) {
+              for (index_type j = tile_id1; j < m_rp.m_tile_end[1];
+                   j += numbl1) {
+                const index_type offset_1 =
+                    j * m_rp.m_tile[1] + thr_id1 + (index_type)m_rp.m_lower[1];
+                if (offset_1 < m_rp.m_upper[1] && thr_id1 < m_rp.m_tile[1]) {
+                  for (index_type i = tile_id0; i < m_rp.m_tile_end[0];
+                       i += numbl0) {
+                    const index_type offset_0 = i * m_rp.m_tile[0] + thr_id0 +
+                                                (index_type)m_rp.m_lower[0];
+                    if (offset_0 < m_rp.m_upper[0] &&
+                        thr_id0 < m_rp.m_tile[0]) {
+                      m_func(offset_0, offset_1, offset_2, offset_3);
                     }
                   }
                 }
@@ -386,35 +408,44 @@ struct apply_impl<4,RP,Functor,void >
         }
       }
     }
-// LR
+    // LR
     else {
-      const index_type temp0  =  m_rp.m_tile_end[0];
-      const index_type temp1  =  m_rp.m_tile_end[1];
-      const index_type numbl1 = ( temp1 <= max_blocks ? temp1 : max_blocks ) ;
-      const index_type numbl0 = ( temp0*temp1 > max_blocks ? index_type( max_blocks / numbl1 ) :
-      ( temp0 <= max_blocks ? temp0 : max_blocks ) );
+      const index_type temp0  = m_rp.m_tile_end[0];
+      const index_type temp1  = m_rp.m_tile_end[1];
+      const index_type numbl1 = (temp1 <= max_blocks ? temp1 : max_blocks);
+      const index_type numbl0 =
+          (temp0 * temp1 > max_blocks
+               ? index_type(max_blocks / numbl1)
+               : (temp0 <= max_blocks ? temp0 : max_blocks));
 
       const index_type tile_id0 = blockIdx.x / numbl1;
       const index_type tile_id1 = blockIdx.x % numbl1;
-      const index_type thr_id0 = threadIdx.x / m_rp.m_tile[1];
-      const index_type thr_id1 = threadIdx.x % m_rp.m_tile[1];
+      const index_type thr_id0  = threadIdx.x / m_rp.m_tile[1];
+      const index_type thr_id1  = threadIdx.x % m_rp.m_tile[1];
 
-      for ( index_type i = tile_id0; i < m_rp.m_tile_end[0]; i += numbl0 ) {
-        const index_type offset_0 = i*m_rp.m_tile[0] + thr_id0 + (index_type)m_rp.m_lower[0];
-        if ( offset_0 < m_rp.m_upper[0] && thr_id0 < m_rp.m_tile[0] ) {
-
-          for ( index_type j = tile_id1; j < m_rp.m_tile_end[1]; j += numbl1 ) {
-            const index_type offset_1 = j*m_rp.m_tile[1] + thr_id1 + (index_type)m_rp.m_lower[1];
-            if ( offset_1 < m_rp.m_upper[1] && thr_id1 < m_rp.m_tile[1] ) {
-
-              for ( index_type tile_id2 = blockIdx.y; tile_id2 < m_rp.m_tile_end[2]; tile_id2 += gridDim.y ) {
-                const index_type offset_2 = tile_id2*m_rp.m_tile[2] + (index_type)threadIdx.y + (index_type)m_rp.m_lower[2];
-                if ( offset_2 < m_rp.m_upper[2] && threadIdx.y < m_rp.m_tile[2] ) {
-
-                  for ( index_type tile_id3 = blockIdx.z; tile_id3 < m_rp.m_tile_end[3]; tile_id3 += gridDim.z ) {
-                    const index_type offset_3 = tile_id3*m_rp.m_tile[3] + (index_type)threadIdx.z + (index_type)m_rp.m_lower[3];
-                    if ( offset_3 < m_rp.m_upper[3] && threadIdx.z < m_rp.m_tile[3] ) {
-                      m_func(offset_0 , offset_1 , offset_2 , offset_3);
+      for (index_type i = tile_id0; i < m_rp.m_tile_end[0]; i += numbl0) {
+        const index_type offset_0 =
+            i * m_rp.m_tile[0] + thr_id0 + (index_type)m_rp.m_lower[0];
+        if (offset_0 < m_rp.m_upper[0] && thr_id0 < m_rp.m_tile[0]) {
+          for (index_type j = tile_id1; j < m_rp.m_tile_end[1]; j += numbl1) {
+            const index_type offset_1 =
+                j * m_rp.m_tile[1] + thr_id1 + (index_type)m_rp.m_lower[1];
+            if (offset_1 < m_rp.m_upper[1] && thr_id1 < m_rp.m_tile[1]) {
+              for (index_type tile_id2 = blockIdx.y;
+                   tile_id2 < m_rp.m_tile_end[2]; tile_id2 += gridDim.y) {
+                const index_type offset_2 = tile_id2 * m_rp.m_tile[2] +
+                                            (index_type)threadIdx.y +
+                                            (index_type)m_rp.m_lower[2];
+                if (offset_2 < m_rp.m_upper[2] &&
+                    threadIdx.y < m_rp.m_tile[2]) {
+                  for (index_type tile_id3 = blockIdx.z;
+                       tile_id3 < m_rp.m_tile_end[3]; tile_id3 += gridDim.z) {
+                    const index_type offset_3 = tile_id3 * m_rp.m_tile[3] +
+                                                (index_type)threadIdx.z +
+                                                (index_type)m_rp.m_lower[3];
+                    if (offset_3 < m_rp.m_upper[3] &&
+                        threadIdx.z < m_rp.m_tile[3]) {
+                      m_func(offset_0, offset_1, offset_2, offset_3);
                     }
                   }
                 }
@@ -425,58 +456,62 @@ struct apply_impl<4,RP,Functor,void >
       }
     }
 
-  } //end exec_range
+  }  // end exec_range
 
-private:
-  const RP & m_rp;
-  const Functor & m_func;
+ private:
+  const RP& m_rp;
+  const Functor& m_func;
 };
 
 // Specializations for void tag type
-template< typename RP , typename Functor , typename Tag >
-struct apply_impl<4,RP,Functor,Tag>
-{
+template <typename RP, typename Functor, typename Tag>
+struct apply_impl<4, RP, Functor, Tag> {
   using index_type = typename RP::index_type;
 
-  inline __device__
-  apply_impl( const RP & rp_ , const Functor & f_ )
-  : m_rp(rp_)
-  , m_func(f_)
-  {}
+  inline __device__ apply_impl(const RP& rp_, const Functor& f_)
+      : m_rp(rp_), m_func(f_) {}
 
   static constexpr index_type max_blocks = 65535;
 
-  inline __device__
-  void exec_range() const
-  {
+  inline __device__ void exec_range() const {
     if (RP::inner_direction == RP::Left) {
-      const index_type temp0  =  m_rp.m_tile_end[0];
-      const index_type temp1  =  m_rp.m_tile_end[1];
-      const index_type numbl0 = ( temp0 <= max_blocks ? temp0 : max_blocks ) ;
-      const index_type numbl1 = ( temp0*temp1 > max_blocks ? index_type( max_blocks / numbl0 ) :
-      (  temp1 <= max_blocks ? temp1 : max_blocks ) );
+      const index_type temp0  = m_rp.m_tile_end[0];
+      const index_type temp1  = m_rp.m_tile_end[1];
+      const index_type numbl0 = (temp0 <= max_blocks ? temp0 : max_blocks);
+      const index_type numbl1 =
+          (temp0 * temp1 > max_blocks
+               ? index_type(max_blocks / numbl0)
+               : (temp1 <= max_blocks ? temp1 : max_blocks));
 
       const index_type tile_id0 = blockIdx.x % numbl0;
       const index_type tile_id1 = blockIdx.x / numbl0;
-      const index_type thr_id0 = threadIdx.x % m_rp.m_tile[0];
-      const index_type thr_id1 = threadIdx.x / m_rp.m_tile[0];
+      const index_type thr_id0  = threadIdx.x % m_rp.m_tile[0];
+      const index_type thr_id1  = threadIdx.x / m_rp.m_tile[0];
 
-      for ( index_type tile_id3 = blockIdx.z; tile_id3 < m_rp.m_tile_end[3]; tile_id3 += gridDim.z ) {
-        const index_type offset_3 = tile_id3*m_rp.m_tile[3] + (index_type)threadIdx.z + (index_type)m_rp.m_lower[3];
-        if ( offset_3 < m_rp.m_upper[3] && threadIdx.z < m_rp.m_tile[3] ) {
-
-          for ( index_type tile_id2 = blockIdx.y; tile_id2 < m_rp.m_tile_end[2]; tile_id2 += gridDim.y ) {
-            const index_type offset_2 = tile_id2*m_rp.m_tile[2] + (index_type)threadIdx.y + (index_type)m_rp.m_lower[2];
-            if ( offset_2 < m_rp.m_upper[2] && threadIdx.y < m_rp.m_tile[2] ) {
-
-              for ( index_type j = tile_id1; j < m_rp.m_tile_end[1]; j += numbl1 ) {
-                const index_type offset_1 = j*m_rp.m_tile[1] + thr_id1 + (index_type)m_rp.m_lower[1];
-                if ( offset_1 < m_rp.m_upper[1] && thr_id1 < m_rp.m_tile[1] ) {
-
-                  for ( index_type i = tile_id0; i < m_rp.m_tile_end[0]; i += numbl0 ) {
-                    const index_type offset_0 = i*m_rp.m_tile[0] + thr_id0 + (index_type)m_rp.m_lower[0];
-                    if ( offset_0 < m_rp.m_upper[0] && thr_id0 < m_rp.m_tile[0] ) {
-                      m_func(Tag(), offset_0 , offset_1 , offset_2 , offset_3);
+      for (index_type tile_id3 = blockIdx.z; tile_id3 < m_rp.m_tile_end[3];
+           tile_id3 += gridDim.z) {
+        const index_type offset_3 = tile_id3 * m_rp.m_tile[3] +
+                                    (index_type)threadIdx.z +
+                                    (index_type)m_rp.m_lower[3];
+        if (offset_3 < m_rp.m_upper[3] && threadIdx.z < m_rp.m_tile[3]) {
+          for (index_type tile_id2 = blockIdx.y; tile_id2 < m_rp.m_tile_end[2];
+               tile_id2 += gridDim.y) {
+            const index_type offset_2 = tile_id2 * m_rp.m_tile[2] +
+                                        (index_type)threadIdx.y +
+                                        (index_type)m_rp.m_lower[2];
+            if (offset_2 < m_rp.m_upper[2] && threadIdx.y < m_rp.m_tile[2]) {
+              for (index_type j = tile_id1; j < m_rp.m_tile_end[1];
+                   j += numbl1) {
+                const index_type offset_1 =
+                    j * m_rp.m_tile[1] + thr_id1 + (index_type)m_rp.m_lower[1];
+                if (offset_1 < m_rp.m_upper[1] && thr_id1 < m_rp.m_tile[1]) {
+                  for (index_type i = tile_id0; i < m_rp.m_tile_end[0];
+                       i += numbl0) {
+                    const index_type offset_0 = i * m_rp.m_tile[0] + thr_id0 +
+                                                (index_type)m_rp.m_lower[0];
+                    if (offset_0 < m_rp.m_upper[0] &&
+                        thr_id0 < m_rp.m_tile[0]) {
+                      m_func(Tag(), offset_0, offset_1, offset_2, offset_3);
                     }
                   }
                 }
@@ -485,35 +520,43 @@ struct apply_impl<4,RP,Functor,Tag>
           }
         }
       }
-    }
-    else {
-      const index_type temp0  =  m_rp.m_tile_end[0];
-      const index_type temp1  =  m_rp.m_tile_end[1];
-      const index_type numbl1 = ( temp1 <= max_blocks ? temp1 : max_blocks ) ;
-      const index_type numbl0 = ( temp0*temp1 > max_blocks ? index_type( max_blocks / numbl1 ) :
-      ( temp0 <= max_blocks ? temp0 : max_blocks ) );
+    } else {
+      const index_type temp0  = m_rp.m_tile_end[0];
+      const index_type temp1  = m_rp.m_tile_end[1];
+      const index_type numbl1 = (temp1 <= max_blocks ? temp1 : max_blocks);
+      const index_type numbl0 =
+          (temp0 * temp1 > max_blocks
+               ? index_type(max_blocks / numbl1)
+               : (temp0 <= max_blocks ? temp0 : max_blocks));
 
       const index_type tile_id0 = blockIdx.x / numbl1;
       const index_type tile_id1 = blockIdx.x % numbl1;
-      const index_type thr_id0 = threadIdx.x / m_rp.m_tile[1];
-      const index_type thr_id1 = threadIdx.x % m_rp.m_tile[1];
+      const index_type thr_id0  = threadIdx.x / m_rp.m_tile[1];
+      const index_type thr_id1  = threadIdx.x % m_rp.m_tile[1];
 
-      for ( index_type i = tile_id0; i < m_rp.m_tile_end[0]; i += numbl0 ) {
-        const index_type offset_0 = i*m_rp.m_tile[0] + thr_id0 + (index_type)m_rp.m_lower[0];
-        if ( offset_0 < m_rp.m_upper[0] && thr_id0 < m_rp.m_tile[0] ) {
-
-          for ( index_type j = tile_id1; j < m_rp.m_tile_end[1]; j += numbl1 ) {
-            const index_type offset_1 = tile_id1*m_rp.m_tile[1] + thr_id1 + (index_type)m_rp.m_lower[1];
-            if ( offset_1 < m_rp.m_upper[1] && thr_id1 < m_rp.m_tile[1] ) {
-
-              for ( index_type tile_id2 = blockIdx.y; tile_id2 < m_rp.m_tile_end[2]; tile_id2 += gridDim.y ) {
-                const index_type offset_2 = tile_id2*m_rp.m_tile[2] + (index_type)threadIdx.y + (index_type)m_rp.m_lower[2];
-                if ( offset_2 < m_rp.m_upper[2] && threadIdx.y < m_rp.m_tile[2] ) {
-
-                  for ( index_type tile_id3 = blockIdx.z; tile_id3 < m_rp.m_tile_end[3]; tile_id3 += gridDim.z ) {
-                    const index_type offset_3 = tile_id3*m_rp.m_tile[3] + (index_type)threadIdx.z + (index_type)m_rp.m_lower[3];
-                    if ( offset_3 < m_rp.m_upper[3] && threadIdx.z < m_rp.m_tile[3] ) {
-                      m_func(Tag() , offset_0 , offset_1 , offset_2 , offset_3);
+      for (index_type i = tile_id0; i < m_rp.m_tile_end[0]; i += numbl0) {
+        const index_type offset_0 =
+            i * m_rp.m_tile[0] + thr_id0 + (index_type)m_rp.m_lower[0];
+        if (offset_0 < m_rp.m_upper[0] && thr_id0 < m_rp.m_tile[0]) {
+          for (index_type j = tile_id1; j < m_rp.m_tile_end[1]; j += numbl1) {
+            const index_type offset_1 = tile_id1 * m_rp.m_tile[1] + thr_id1 +
+                                        (index_type)m_rp.m_lower[1];
+            if (offset_1 < m_rp.m_upper[1] && thr_id1 < m_rp.m_tile[1]) {
+              for (index_type tile_id2 = blockIdx.y;
+                   tile_id2 < m_rp.m_tile_end[2]; tile_id2 += gridDim.y) {
+                const index_type offset_2 = tile_id2 * m_rp.m_tile[2] +
+                                            (index_type)threadIdx.y +
+                                            (index_type)m_rp.m_lower[2];
+                if (offset_2 < m_rp.m_upper[2] &&
+                    threadIdx.y < m_rp.m_tile[2]) {
+                  for (index_type tile_id3 = blockIdx.z;
+                       tile_id3 < m_rp.m_tile_end[3]; tile_id3 += gridDim.z) {
+                    const index_type offset_3 = tile_id3 * m_rp.m_tile[3] +
+                                                (index_type)threadIdx.z +
+                                                (index_type)m_rp.m_lower[3];
+                    if (offset_3 < m_rp.m_upper[3] &&
+                        threadIdx.z < m_rp.m_tile[3]) {
+                      m_func(Tag(), offset_0, offset_1, offset_2, offset_3);
                     }
                   }
                 }
@@ -524,77 +567,83 @@ struct apply_impl<4,RP,Functor,Tag>
       }
     }
 
-  } //end exec_range
+  }  // end exec_range
 
-private:
-  const RP & m_rp;
-  const Functor & m_func;
+ private:
+  const RP& m_rp;
+  const Functor& m_func;
 };
 
-
-//Rank 5
+// Rank 5
 // Specializations for void tag type
-template< typename RP , typename Functor >
-struct apply_impl<5,RP,Functor,void >
-{
+template <typename RP, typename Functor>
+struct apply_impl<5, RP, Functor, void> {
   using index_type = typename RP::index_type;
 
-  __device__
-  apply_impl( const RP & rp_ , const Functor & f_ )
-  : m_rp(rp_)
-  , m_func(f_)
-  {}
+  __device__ apply_impl(const RP& rp_, const Functor& f_)
+      : m_rp(rp_), m_func(f_) {}
 
   static constexpr index_type max_blocks = 65535;
 
-  inline __device__
-  void exec_range() const
-  {
-// LL
+  inline __device__ void exec_range() const {
+    // LL
     if (RP::inner_direction == RP::Left) {
-
-      index_type temp0  =  m_rp.m_tile_end[0];
-      index_type temp1  =  m_rp.m_tile_end[1];
-      const index_type numbl0 = ( temp0 <= max_blocks ? temp0 : max_blocks ) ;
-      const index_type numbl1 = ( temp0*temp1 > max_blocks ? index_type( max_blocks / numbl0 ) :
-      (  temp1 <= max_blocks ? temp1 : max_blocks ) );
+      index_type temp0        = m_rp.m_tile_end[0];
+      index_type temp1        = m_rp.m_tile_end[1];
+      const index_type numbl0 = (temp0 <= max_blocks ? temp0 : max_blocks);
+      const index_type numbl1 =
+          (temp0 * temp1 > max_blocks
+               ? index_type(max_blocks / numbl0)
+               : (temp1 <= max_blocks ? temp1 : max_blocks));
 
       const index_type tile_id0 = blockIdx.x % numbl0;
       const index_type tile_id1 = blockIdx.x / numbl0;
-      const index_type thr_id0 = threadIdx.x % m_rp.m_tile[0];
-      const index_type thr_id1 = threadIdx.x / m_rp.m_tile[0];
+      const index_type thr_id0  = threadIdx.x % m_rp.m_tile[0];
+      const index_type thr_id1  = threadIdx.x / m_rp.m_tile[0];
 
-      temp0  =  m_rp.m_tile_end[2];
-      temp1  =  m_rp.m_tile_end[3];
-      const index_type numbl2 = ( temp0 <= max_blocks ? temp0 : max_blocks ) ;
-      const index_type numbl3 = ( temp0*temp1 > max_blocks ? index_type( max_blocks / numbl2 ) :
-      (  temp1 <= max_blocks ? temp1 : max_blocks ) );
+      temp0                   = m_rp.m_tile_end[2];
+      temp1                   = m_rp.m_tile_end[3];
+      const index_type numbl2 = (temp0 <= max_blocks ? temp0 : max_blocks);
+      const index_type numbl3 =
+          (temp0 * temp1 > max_blocks
+               ? index_type(max_blocks / numbl2)
+               : (temp1 <= max_blocks ? temp1 : max_blocks));
 
       const index_type tile_id2 = blockIdx.y % numbl2;
       const index_type tile_id3 = blockIdx.y / numbl2;
-      const index_type thr_id2 = threadIdx.y % m_rp.m_tile[2];
-      const index_type thr_id3 = threadIdx.y / m_rp.m_tile[2];
+      const index_type thr_id2  = threadIdx.y % m_rp.m_tile[2];
+      const index_type thr_id3  = threadIdx.y / m_rp.m_tile[2];
 
-      for ( index_type tile_id4 = blockIdx.z; tile_id4 < m_rp.m_tile_end[4]; tile_id4 += gridDim.z ) {
-        const index_type offset_4 = tile_id4*m_rp.m_tile[4] + (index_type)threadIdx.z + (index_type)m_rp.m_lower[4];
-        if ( offset_4 < m_rp.m_upper[4] && threadIdx.z < m_rp.m_tile[4] ) {
-
-          for ( index_type l = tile_id3; l < m_rp.m_tile_end[3]; l += numbl3 ) {
-            const index_type offset_3 = l*m_rp.m_tile[3] + thr_id3 + (index_type)m_rp.m_lower[3];
-            if ( offset_3 < m_rp.m_upper[3] && thr_id3 < m_rp.m_tile[3] ) {
-
-              for ( index_type k = tile_id2; k < m_rp.m_tile_end[2]; k += numbl2 ) {
-                const index_type offset_2 = k*m_rp.m_tile[2] + thr_id2 + (index_type)m_rp.m_lower[2];
-                if ( offset_2 < m_rp.m_upper[2] && thr_id2 < m_rp.m_tile[2] ) {
-
-                  for ( index_type j = tile_id1 ; j < m_rp.m_tile_end[1]; j += numbl1 ) {
-                    const index_type offset_1 = j*m_rp.m_tile[1] + thr_id1 + (index_type)m_rp.m_lower[1];
-                    if ( offset_1 < m_rp.m_upper[1] && thr_id1 < m_rp.m_tile[1] ) {
-
-                      for ( index_type i = tile_id0 ; i < m_rp.m_tile_end[0]; i += numbl0 ) {
-                        const index_type offset_0 = i*m_rp.m_tile[0] + thr_id0 + (index_type)m_rp.m_lower[0];
-                        if ( offset_0 < m_rp.m_upper[0] && thr_id0 < m_rp.m_tile[0] ) {
-                          m_func(offset_0 , offset_1 , offset_2 , offset_3, offset_4);
+      for (index_type tile_id4 = blockIdx.z; tile_id4 < m_rp.m_tile_end[4];
+           tile_id4 += gridDim.z) {
+        const index_type offset_4 = tile_id4 * m_rp.m_tile[4] +
+                                    (index_type)threadIdx.z +
+                                    (index_type)m_rp.m_lower[4];
+        if (offset_4 < m_rp.m_upper[4] && threadIdx.z < m_rp.m_tile[4]) {
+          for (index_type l = tile_id3; l < m_rp.m_tile_end[3]; l += numbl3) {
+            const index_type offset_3 =
+                l * m_rp.m_tile[3] + thr_id3 + (index_type)m_rp.m_lower[3];
+            if (offset_3 < m_rp.m_upper[3] && thr_id3 < m_rp.m_tile[3]) {
+              for (index_type k = tile_id2; k < m_rp.m_tile_end[2];
+                   k += numbl2) {
+                const index_type offset_2 =
+                    k * m_rp.m_tile[2] + thr_id2 + (index_type)m_rp.m_lower[2];
+                if (offset_2 < m_rp.m_upper[2] && thr_id2 < m_rp.m_tile[2]) {
+                  for (index_type j = tile_id1; j < m_rp.m_tile_end[1];
+                       j += numbl1) {
+                    const index_type offset_1 = j * m_rp.m_tile[1] + thr_id1 +
+                                                (index_type)m_rp.m_lower[1];
+                    if (offset_1 < m_rp.m_upper[1] &&
+                        thr_id1 < m_rp.m_tile[1]) {
+                      for (index_type i = tile_id0; i < m_rp.m_tile_end[0];
+                           i += numbl0) {
+                        const index_type offset_0 = i * m_rp.m_tile[0] +
+                                                    thr_id0 +
+                                                    (index_type)m_rp.m_lower[0];
+                        if (offset_0 < m_rp.m_upper[0] &&
+                            thr_id0 < m_rp.m_tile[0]) {
+                          m_func(offset_0, offset_1, offset_2, offset_3,
+                                 offset_4);
                         }
                       }
                     }
@@ -606,50 +655,63 @@ struct apply_impl<5,RP,Functor,void >
         }
       }
     }
-// LR
+    // LR
     else {
-      index_type temp0  =  m_rp.m_tile_end[0];
-      index_type temp1  =  m_rp.m_tile_end[1];
-      const index_type numbl1 = ( temp1 <= max_blocks ? temp1 : max_blocks ) ;
-      const index_type numbl0 = ( temp0*temp1 > max_blocks ? index_type( max_blocks / numbl1 ) :
-      ( temp0 <= max_blocks ? temp0 : max_blocks ) );
+      index_type temp0        = m_rp.m_tile_end[0];
+      index_type temp1        = m_rp.m_tile_end[1];
+      const index_type numbl1 = (temp1 <= max_blocks ? temp1 : max_blocks);
+      const index_type numbl0 =
+          (temp0 * temp1 > max_blocks
+               ? index_type(max_blocks / numbl1)
+               : (temp0 <= max_blocks ? temp0 : max_blocks));
 
       const index_type tile_id0 = blockIdx.x / numbl1;
       const index_type tile_id1 = blockIdx.x % numbl1;
-      const index_type thr_id0 = threadIdx.x / m_rp.m_tile[1];
-      const index_type thr_id1 = threadIdx.x % m_rp.m_tile[1];
+      const index_type thr_id0  = threadIdx.x / m_rp.m_tile[1];
+      const index_type thr_id1  = threadIdx.x % m_rp.m_tile[1];
 
-      temp0  =  m_rp.m_tile_end[2];
-      temp1  =  m_rp.m_tile_end[3];
-      const index_type numbl3 = ( temp1 <= max_blocks ? temp1 : max_blocks ) ;
-      const index_type numbl2 = ( temp0*temp1 > max_blocks ? index_type( max_blocks / numbl3 ) :
-      (  temp0 <= max_blocks ? temp0 : max_blocks ) );
+      temp0                   = m_rp.m_tile_end[2];
+      temp1                   = m_rp.m_tile_end[3];
+      const index_type numbl3 = (temp1 <= max_blocks ? temp1 : max_blocks);
+      const index_type numbl2 =
+          (temp0 * temp1 > max_blocks
+               ? index_type(max_blocks / numbl3)
+               : (temp0 <= max_blocks ? temp0 : max_blocks));
 
       const index_type tile_id2 = blockIdx.y / numbl3;
       const index_type tile_id3 = blockIdx.y % numbl3;
-      const index_type thr_id2 = threadIdx.y / m_rp.m_tile[3];
-      const index_type thr_id3 = threadIdx.y % m_rp.m_tile[3];
+      const index_type thr_id2  = threadIdx.y / m_rp.m_tile[3];
+      const index_type thr_id3  = threadIdx.y % m_rp.m_tile[3];
 
-      for ( index_type i = tile_id0; i < m_rp.m_tile_end[0]; i += numbl0 ) {
-        const index_type offset_0 = i*m_rp.m_tile[0] + thr_id0 + (index_type)m_rp.m_lower[0];
-        if ( offset_0 < m_rp.m_upper[0] && thr_id0 < m_rp.m_tile[0] ) {
-
-          for ( index_type j = tile_id1; j < m_rp.m_tile_end[1]; j += numbl1 ) {
-            const index_type offset_1 = j*m_rp.m_tile[1] + thr_id1 + (index_type)m_rp.m_lower[1];
-            if ( offset_1 < m_rp.m_upper[1] && thr_id1 < m_rp.m_tile[1] ) {
-
-              for ( index_type k = tile_id2; k < m_rp.m_tile_end[2]; k += numbl2 ) {
-                const index_type offset_2 = k*m_rp.m_tile[2] + thr_id2 + (index_type)m_rp.m_lower[2];
-                if ( offset_2 < m_rp.m_upper[2] && thr_id2 < m_rp.m_tile[2] ) {
-
-                  for ( index_type l = tile_id3; l < m_rp.m_tile_end[3]; l += numbl3 ) {
-                    const index_type offset_3 = l*m_rp.m_tile[3] + thr_id3 + (index_type)m_rp.m_lower[3];
-                    if ( offset_3 < m_rp.m_upper[3] && thr_id3 < m_rp.m_tile[3] ) {
-
-                      for ( index_type tile_id4 = blockIdx.z; tile_id4 < m_rp.m_tile_end[4]; tile_id4 += gridDim.z ) {
-                        const index_type offset_4 = tile_id4*m_rp.m_tile[4] + (index_type)threadIdx.z + (index_type)m_rp.m_lower[4];
-                        if ( offset_4 < m_rp.m_upper[4] && threadIdx.z < m_rp.m_tile[4] ) {
-                          m_func(offset_0 , offset_1 , offset_2 , offset_3 , offset_4);
+      for (index_type i = tile_id0; i < m_rp.m_tile_end[0]; i += numbl0) {
+        const index_type offset_0 =
+            i * m_rp.m_tile[0] + thr_id0 + (index_type)m_rp.m_lower[0];
+        if (offset_0 < m_rp.m_upper[0] && thr_id0 < m_rp.m_tile[0]) {
+          for (index_type j = tile_id1; j < m_rp.m_tile_end[1]; j += numbl1) {
+            const index_type offset_1 =
+                j * m_rp.m_tile[1] + thr_id1 + (index_type)m_rp.m_lower[1];
+            if (offset_1 < m_rp.m_upper[1] && thr_id1 < m_rp.m_tile[1]) {
+              for (index_type k = tile_id2; k < m_rp.m_tile_end[2];
+                   k += numbl2) {
+                const index_type offset_2 =
+                    k * m_rp.m_tile[2] + thr_id2 + (index_type)m_rp.m_lower[2];
+                if (offset_2 < m_rp.m_upper[2] && thr_id2 < m_rp.m_tile[2]) {
+                  for (index_type l = tile_id3; l < m_rp.m_tile_end[3];
+                       l += numbl3) {
+                    const index_type offset_3 = l * m_rp.m_tile[3] + thr_id3 +
+                                                (index_type)m_rp.m_lower[3];
+                    if (offset_3 < m_rp.m_upper[3] &&
+                        thr_id3 < m_rp.m_tile[3]) {
+                      for (index_type tile_id4 = blockIdx.z;
+                           tile_id4 < m_rp.m_tile_end[4];
+                           tile_id4 += gridDim.z) {
+                        const index_type offset_4 = tile_id4 * m_rp.m_tile[4] +
+                                                    (index_type)threadIdx.z +
+                                                    (index_type)m_rp.m_lower[4];
+                        if (offset_4 < m_rp.m_upper[4] &&
+                            threadIdx.z < m_rp.m_tile[4]) {
+                          m_func(offset_0, offset_1, offset_2, offset_3,
+                                 offset_4);
                         }
                       }
                     }
@@ -662,74 +724,82 @@ struct apply_impl<5,RP,Functor,void >
       }
     }
 
-  } //end exec_range
+  }  // end exec_range
 
-private:
-  const RP & m_rp;
-  const Functor & m_func;
+ private:
+  const RP& m_rp;
+  const Functor& m_func;
 };
 
 // Specializations for tag type
-template< typename RP , typename Functor , typename Tag >
-struct apply_impl<5,RP,Functor,Tag>
-{
+template <typename RP, typename Functor, typename Tag>
+struct apply_impl<5, RP, Functor, Tag> {
   using index_type = typename RP::index_type;
 
-  __device__
-  apply_impl( const RP & rp_ , const Functor & f_ )
-  : m_rp(rp_)
-  , m_func(f_)
-  {}
+  __device__ apply_impl(const RP& rp_, const Functor& f_)
+      : m_rp(rp_), m_func(f_) {}
 
   static constexpr index_type max_blocks = 65535;
 
-  inline __device__
-  void exec_range() const
-  {
-// LL
+  inline __device__ void exec_range() const {
+    // LL
     if (RP::inner_direction == RP::Left) {
-      index_type temp0  =  m_rp.m_tile_end[0];
-      index_type temp1  =  m_rp.m_tile_end[1];
-      const index_type numbl0 = ( temp0 <= max_blocks ? temp0 : max_blocks ) ;
-      const index_type numbl1 = ( temp0*temp1 > max_blocks ? index_type( max_blocks / numbl0 ) :
-      (  temp1 <= max_blocks ? temp1 : max_blocks ) );
+      index_type temp0        = m_rp.m_tile_end[0];
+      index_type temp1        = m_rp.m_tile_end[1];
+      const index_type numbl0 = (temp0 <= max_blocks ? temp0 : max_blocks);
+      const index_type numbl1 =
+          (temp0 * temp1 > max_blocks
+               ? index_type(max_blocks / numbl0)
+               : (temp1 <= max_blocks ? temp1 : max_blocks));
 
       const index_type tile_id0 = blockIdx.x % numbl0;
       const index_type tile_id1 = blockIdx.x / numbl0;
-      const index_type thr_id0 = threadIdx.x % m_rp.m_tile[0];
-      const index_type thr_id1 = threadIdx.x / m_rp.m_tile[0];
+      const index_type thr_id0  = threadIdx.x % m_rp.m_tile[0];
+      const index_type thr_id1  = threadIdx.x / m_rp.m_tile[0];
 
-      temp0  =  m_rp.m_tile_end[2];
-      temp1  =  m_rp.m_tile_end[3];
-      const index_type numbl2 = ( temp0 <= max_blocks ? temp0 : max_blocks ) ;
-      const index_type numbl3 = ( temp0*temp1 > max_blocks ? index_type( max_blocks / numbl2 ) :
-      (  temp1 <= max_blocks ? temp1 : max_blocks ) );
+      temp0                   = m_rp.m_tile_end[2];
+      temp1                   = m_rp.m_tile_end[3];
+      const index_type numbl2 = (temp0 <= max_blocks ? temp0 : max_blocks);
+      const index_type numbl3 =
+          (temp0 * temp1 > max_blocks
+               ? index_type(max_blocks / numbl2)
+               : (temp1 <= max_blocks ? temp1 : max_blocks));
 
       const index_type tile_id2 = blockIdx.y % numbl2;
       const index_type tile_id3 = blockIdx.y / numbl2;
-      const index_type thr_id2 = threadIdx.y % m_rp.m_tile[2];
-      const index_type thr_id3 = threadIdx.y / m_rp.m_tile[2];
+      const index_type thr_id2  = threadIdx.y % m_rp.m_tile[2];
+      const index_type thr_id3  = threadIdx.y / m_rp.m_tile[2];
 
-      for ( index_type tile_id4 = blockIdx.z; tile_id4 < m_rp.m_tile_end[4]; tile_id4 += gridDim.z ) {
-        const index_type offset_4 = tile_id4*m_rp.m_tile[4] + (index_type)threadIdx.z + (index_type)m_rp.m_lower[4];
-        if ( offset_4 < m_rp.m_upper[4] && threadIdx.z < m_rp.m_tile[4] ) {
-
-          for ( index_type l = tile_id3; l < m_rp.m_tile_end[3]; l += numbl3 ) {
-            const index_type offset_3 = l*m_rp.m_tile[3] + thr_id3 + (index_type)m_rp.m_lower[3];
-            if ( offset_3 < m_rp.m_upper[3] && thr_id3 < m_rp.m_tile[3] ) {
-
-              for ( index_type k = tile_id2; k < m_rp.m_tile_end[2]; k += numbl2 ) {
-                const index_type offset_2 = k*m_rp.m_tile[2] + thr_id2 + (index_type)m_rp.m_lower[2];
-                if ( offset_2 < m_rp.m_upper[2] && thr_id2 < m_rp.m_tile[2] ) {
-
-                  for ( index_type j = tile_id1 ; j < m_rp.m_tile_end[1]; j += numbl1 ) {
-                    const index_type offset_1 = j*m_rp.m_tile[1] + thr_id1 + (index_type)m_rp.m_lower[1];
-                    if ( offset_1 < m_rp.m_upper[1] && thr_id1 < m_rp.m_tile[1] ) {
-
-                      for ( index_type i = tile_id0 ; i < m_rp.m_tile_end[0]; i += numbl0 ) {
-                        const index_type offset_0 = i*m_rp.m_tile[0] + thr_id0 + (index_type)m_rp.m_lower[0];
-                        if ( offset_0 < m_rp.m_upper[0] && thr_id0 < m_rp.m_tile[0] ) {
-                          m_func(Tag() , offset_0 , offset_1 , offset_2 , offset_3, offset_4);
+      for (index_type tile_id4 = blockIdx.z; tile_id4 < m_rp.m_tile_end[4];
+           tile_id4 += gridDim.z) {
+        const index_type offset_4 = tile_id4 * m_rp.m_tile[4] +
+                                    (index_type)threadIdx.z +
+                                    (index_type)m_rp.m_lower[4];
+        if (offset_4 < m_rp.m_upper[4] && threadIdx.z < m_rp.m_tile[4]) {
+          for (index_type l = tile_id3; l < m_rp.m_tile_end[3]; l += numbl3) {
+            const index_type offset_3 =
+                l * m_rp.m_tile[3] + thr_id3 + (index_type)m_rp.m_lower[3];
+            if (offset_3 < m_rp.m_upper[3] && thr_id3 < m_rp.m_tile[3]) {
+              for (index_type k = tile_id2; k < m_rp.m_tile_end[2];
+                   k += numbl2) {
+                const index_type offset_2 =
+                    k * m_rp.m_tile[2] + thr_id2 + (index_type)m_rp.m_lower[2];
+                if (offset_2 < m_rp.m_upper[2] && thr_id2 < m_rp.m_tile[2]) {
+                  for (index_type j = tile_id1; j < m_rp.m_tile_end[1];
+                       j += numbl1) {
+                    const index_type offset_1 = j * m_rp.m_tile[1] + thr_id1 +
+                                                (index_type)m_rp.m_lower[1];
+                    if (offset_1 < m_rp.m_upper[1] &&
+                        thr_id1 < m_rp.m_tile[1]) {
+                      for (index_type i = tile_id0; i < m_rp.m_tile_end[0];
+                           i += numbl0) {
+                        const index_type offset_0 = i * m_rp.m_tile[0] +
+                                                    thr_id0 +
+                                                    (index_type)m_rp.m_lower[0];
+                        if (offset_0 < m_rp.m_upper[0] &&
+                            thr_id0 < m_rp.m_tile[0]) {
+                          m_func(Tag(), offset_0, offset_1, offset_2, offset_3,
+                                 offset_4);
                         }
                       }
                     }
@@ -741,50 +811,63 @@ struct apply_impl<5,RP,Functor,Tag>
         }
       }
     }
-// LR
+    // LR
     else {
-      index_type temp0  =  m_rp.m_tile_end[0];
-      index_type temp1  =  m_rp.m_tile_end[1];
-      const index_type numbl1 = ( temp1 <= max_blocks ? temp1 : max_blocks ) ;
-      const index_type numbl0 = ( temp0*temp1 > max_blocks ? index_type( max_blocks / numbl1 ) :
-      ( temp0 <= max_blocks ? temp0 : max_blocks ) );
+      index_type temp0        = m_rp.m_tile_end[0];
+      index_type temp1        = m_rp.m_tile_end[1];
+      const index_type numbl1 = (temp1 <= max_blocks ? temp1 : max_blocks);
+      const index_type numbl0 =
+          (temp0 * temp1 > max_blocks
+               ? index_type(max_blocks / numbl1)
+               : (temp0 <= max_blocks ? temp0 : max_blocks));
 
       const index_type tile_id0 = blockIdx.x / numbl1;
       const index_type tile_id1 = blockIdx.x % numbl1;
-      const index_type thr_id0 = threadIdx.x / m_rp.m_tile[1];
-      const index_type thr_id1 = threadIdx.x % m_rp.m_tile[1];
+      const index_type thr_id0  = threadIdx.x / m_rp.m_tile[1];
+      const index_type thr_id1  = threadIdx.x % m_rp.m_tile[1];
 
-      temp0  =  m_rp.m_tile_end[2];
-      temp1  =  m_rp.m_tile_end[3];
-      const index_type numbl3 = ( temp1 <= max_blocks ? temp1 : max_blocks ) ;
-      const index_type numbl2 = ( temp0*temp1 > max_blocks ? index_type( max_blocks / numbl3 ) :
-      (  temp0 <= max_blocks ? temp0 : max_blocks ) );
+      temp0                   = m_rp.m_tile_end[2];
+      temp1                   = m_rp.m_tile_end[3];
+      const index_type numbl3 = (temp1 <= max_blocks ? temp1 : max_blocks);
+      const index_type numbl2 =
+          (temp0 * temp1 > max_blocks
+               ? index_type(max_blocks / numbl3)
+               : (temp0 <= max_blocks ? temp0 : max_blocks));
 
       const index_type tile_id2 = blockIdx.y / numbl3;
       const index_type tile_id3 = blockIdx.y % numbl3;
-      const index_type thr_id2 = threadIdx.y / m_rp.m_tile[3];
-      const index_type thr_id3 = threadIdx.y % m_rp.m_tile[3];
+      const index_type thr_id2  = threadIdx.y / m_rp.m_tile[3];
+      const index_type thr_id3  = threadIdx.y % m_rp.m_tile[3];
 
-      for ( index_type i = tile_id0; i < m_rp.m_tile_end[0]; i += numbl0 ) {
-        const index_type offset_0 = i*m_rp.m_tile[0] + thr_id0 + (index_type)m_rp.m_lower[0];
-        if ( offset_0 < m_rp.m_upper[0] && thr_id0 < m_rp.m_tile[0] ) {
-
-          for ( index_type j = tile_id1; j < m_rp.m_tile_end[1]; j += numbl1 ) {
-            const index_type offset_1 = j*m_rp.m_tile[1] + thr_id1 + (index_type)m_rp.m_lower[1];
-            if ( offset_1 < m_rp.m_upper[1] && thr_id1 < m_rp.m_tile[1] ) {
-
-              for ( index_type k = tile_id2; k < m_rp.m_tile_end[2]; k += numbl2 ) {
-                const index_type offset_2 = k*m_rp.m_tile[2] + thr_id2 + (index_type)m_rp.m_lower[2];
-                if ( offset_2 < m_rp.m_upper[2] && thr_id2 < m_rp.m_tile[2] ) {
-
-                  for ( index_type l = tile_id3; l < m_rp.m_tile_end[3]; l += numbl3 ) {
-                    const index_type offset_3 = l*m_rp.m_tile[3] + thr_id3 + (index_type)m_rp.m_lower[3];
-                    if ( offset_3 < m_rp.m_upper[3] && thr_id3 < m_rp.m_tile[3] ) {
-
-                      for ( index_type tile_id4 = blockIdx.z; tile_id4 < m_rp.m_tile_end[4]; tile_id4 += gridDim.z ) {
-                        const index_type offset_4 = tile_id4*m_rp.m_tile[4] + (index_type)threadIdx.z + (index_type)m_rp.m_lower[4];
-                        if ( offset_4 < m_rp.m_upper[4] && threadIdx.z < m_rp.m_tile[4] ) {
-                          m_func(Tag() , offset_0 , offset_1 , offset_2 , offset_3 , offset_4);
+      for (index_type i = tile_id0; i < m_rp.m_tile_end[0]; i += numbl0) {
+        const index_type offset_0 =
+            i * m_rp.m_tile[0] + thr_id0 + (index_type)m_rp.m_lower[0];
+        if (offset_0 < m_rp.m_upper[0] && thr_id0 < m_rp.m_tile[0]) {
+          for (index_type j = tile_id1; j < m_rp.m_tile_end[1]; j += numbl1) {
+            const index_type offset_1 =
+                j * m_rp.m_tile[1] + thr_id1 + (index_type)m_rp.m_lower[1];
+            if (offset_1 < m_rp.m_upper[1] && thr_id1 < m_rp.m_tile[1]) {
+              for (index_type k = tile_id2; k < m_rp.m_tile_end[2];
+                   k += numbl2) {
+                const index_type offset_2 =
+                    k * m_rp.m_tile[2] + thr_id2 + (index_type)m_rp.m_lower[2];
+                if (offset_2 < m_rp.m_upper[2] && thr_id2 < m_rp.m_tile[2]) {
+                  for (index_type l = tile_id3; l < m_rp.m_tile_end[3];
+                       l += numbl3) {
+                    const index_type offset_3 = l * m_rp.m_tile[3] + thr_id3 +
+                                                (index_type)m_rp.m_lower[3];
+                    if (offset_3 < m_rp.m_upper[3] &&
+                        thr_id3 < m_rp.m_tile[3]) {
+                      for (index_type tile_id4 = blockIdx.z;
+                           tile_id4 < m_rp.m_tile_end[4];
+                           tile_id4 += gridDim.z) {
+                        const index_type offset_4 = tile_id4 * m_rp.m_tile[4] +
+                                                    (index_type)threadIdx.z +
+                                                    (index_type)m_rp.m_lower[4];
+                        if (offset_4 < m_rp.m_upper[4] &&
+                            threadIdx.z < m_rp.m_tile[4]) {
+                          m_func(Tag(), offset_0, offset_1, offset_2, offset_3,
+                                 offset_4);
                         }
                       }
                     }
@@ -797,91 +880,101 @@ struct apply_impl<5,RP,Functor,Tag>
       }
     }
 
-  } //end exec_range
+  }  // end exec_range
 
-private:
-  const RP & m_rp;
-  const Functor & m_func;
+ private:
+  const RP& m_rp;
+  const Functor& m_func;
 };
 
-
-//Rank 6
+// Rank 6
 // Specializations for void tag type
-template< typename RP , typename Functor >
-struct apply_impl<6,RP,Functor,void >
-{
+template <typename RP, typename Functor>
+struct apply_impl<6, RP, Functor, void> {
   using index_type = typename RP::index_type;
 
-  __device__
-  apply_impl( const RP & rp_ , const Functor & f_ )
-  : m_rp(rp_)
-  , m_func(f_)
-  {}
+  __device__ apply_impl(const RP& rp_, const Functor& f_)
+      : m_rp(rp_), m_func(f_) {}
 
   static constexpr index_type max_blocks = 65535;
 
-  inline __device__
-  void exec_range() const
-  {
-// LL
+  inline __device__ void exec_range() const {
+    // LL
     if (RP::inner_direction == RP::Left) {
-      index_type temp0  =  m_rp.m_tile_end[0];
-      index_type temp1  =  m_rp.m_tile_end[1];
-      const index_type numbl0 = ( temp0 <= max_blocks ? temp0 : max_blocks ) ;
-      const index_type numbl1 = ( temp0*temp1 > max_blocks ? index_type( max_blocks / numbl0 ) :
-      (  temp1 <= max_blocks ? temp1 : max_blocks ) );
+      index_type temp0        = m_rp.m_tile_end[0];
+      index_type temp1        = m_rp.m_tile_end[1];
+      const index_type numbl0 = (temp0 <= max_blocks ? temp0 : max_blocks);
+      const index_type numbl1 =
+          (temp0 * temp1 > max_blocks
+               ? index_type(max_blocks / numbl0)
+               : (temp1 <= max_blocks ? temp1 : max_blocks));
 
       const index_type tile_id0 = blockIdx.x % numbl0;
       const index_type tile_id1 = blockIdx.x / numbl0;
-      const index_type thr_id0 = threadIdx.x % m_rp.m_tile[0];
-      const index_type thr_id1 = threadIdx.x / m_rp.m_tile[0];
+      const index_type thr_id0  = threadIdx.x % m_rp.m_tile[0];
+      const index_type thr_id1  = threadIdx.x / m_rp.m_tile[0];
 
-      temp0  =  m_rp.m_tile_end[2];
-      temp1  =  m_rp.m_tile_end[3];
-      const index_type numbl2 = ( temp0 <= max_blocks ? temp0 : max_blocks ) ;
-      const index_type numbl3 = ( temp0*temp1 > max_blocks ? index_type( max_blocks / numbl2 ) :
-      (  temp1 <= max_blocks ? temp1 : max_blocks ) );
+      temp0                   = m_rp.m_tile_end[2];
+      temp1                   = m_rp.m_tile_end[3];
+      const index_type numbl2 = (temp0 <= max_blocks ? temp0 : max_blocks);
+      const index_type numbl3 =
+          (temp0 * temp1 > max_blocks
+               ? index_type(max_blocks / numbl2)
+               : (temp1 <= max_blocks ? temp1 : max_blocks));
 
       const index_type tile_id2 = blockIdx.y % numbl2;
       const index_type tile_id3 = blockIdx.y / numbl2;
-      const index_type thr_id2 = threadIdx.y % m_rp.m_tile[2];
-      const index_type thr_id3 = threadIdx.y / m_rp.m_tile[2];
+      const index_type thr_id2  = threadIdx.y % m_rp.m_tile[2];
+      const index_type thr_id3  = threadIdx.y / m_rp.m_tile[2];
 
-      temp0  =  m_rp.m_tile_end[4];
-      temp1  =  m_rp.m_tile_end[5];
-      const index_type numbl4 = ( temp0 <= max_blocks ? temp0 : max_blocks ) ;
-      const index_type numbl5 = ( temp0*temp1 > max_blocks ? index_type( max_blocks / numbl4 ) :
-      (  temp1 <= max_blocks ? temp1 : max_blocks ) );
+      temp0                   = m_rp.m_tile_end[4];
+      temp1                   = m_rp.m_tile_end[5];
+      const index_type numbl4 = (temp0 <= max_blocks ? temp0 : max_blocks);
+      const index_type numbl5 =
+          (temp0 * temp1 > max_blocks
+               ? index_type(max_blocks / numbl4)
+               : (temp1 <= max_blocks ? temp1 : max_blocks));
 
       const index_type tile_id4 = blockIdx.z % numbl4;
       const index_type tile_id5 = blockIdx.z / numbl4;
-      const index_type thr_id4 = threadIdx.z % m_rp.m_tile[4];
-      const index_type thr_id5 = threadIdx.z / m_rp.m_tile[4];
+      const index_type thr_id4  = threadIdx.z % m_rp.m_tile[4];
+      const index_type thr_id5  = threadIdx.z / m_rp.m_tile[4];
 
-      for ( index_type n = tile_id5; n < m_rp.m_tile_end[5]; n += numbl5 ) {
-        const index_type offset_5 = n*m_rp.m_tile[5] + thr_id5 + (index_type)m_rp.m_lower[5];
-        if ( offset_5 < m_rp.m_upper[5] && thr_id5 < m_rp.m_tile[5] ) {
-
-          for ( index_type m = tile_id4; m < m_rp.m_tile_end[4]; m += numbl4 ) {
-            const index_type offset_4 = m*m_rp.m_tile[4] + thr_id4 + (index_type)m_rp.m_lower[4];
-            if ( offset_4 < m_rp.m_upper[4] && thr_id4 < m_rp.m_tile[4] ) {
-
-              for ( index_type l = tile_id3; l < m_rp.m_tile_end[3]; l += numbl3 ) {
-                const index_type offset_3 = l*m_rp.m_tile[3] + thr_id3 + (index_type)m_rp.m_lower[3];
-                if ( offset_3 < m_rp.m_upper[3] && thr_id3 < m_rp.m_tile[3] ) {
-
-                  for ( index_type k = tile_id2; k < m_rp.m_tile_end[2]; k += numbl2 ) {
-                    const index_type offset_2 = k*m_rp.m_tile[2] + thr_id2 + (index_type)m_rp.m_lower[2];
-                    if ( offset_2 < m_rp.m_upper[2] && thr_id2 < m_rp.m_tile[2] ) {
-
-                      for ( index_type j = tile_id1 ; j < m_rp.m_tile_end[1]; j += numbl1 ) {
-                        const index_type offset_1 = j*m_rp.m_tile[1] + thr_id1 + (index_type)m_rp.m_lower[1];
-                        if ( offset_1 < m_rp.m_upper[1] && thr_id1 < m_rp.m_tile[1] ) {
-
-                          for ( index_type i = tile_id0 ; i < m_rp.m_tile_end[0]; i += numbl0 ) {
-                            const index_type offset_0 = i*m_rp.m_tile[0] + thr_id0 + (index_type)m_rp.m_lower[0];
-                            if ( offset_0 < m_rp.m_upper[0] && thr_id0 < m_rp.m_tile[0] ) {
-                              m_func(offset_0 , offset_1 , offset_2 , offset_3, offset_4, offset_5);
+      for (index_type n = tile_id5; n < m_rp.m_tile_end[5]; n += numbl5) {
+        const index_type offset_5 =
+            n * m_rp.m_tile[5] + thr_id5 + (index_type)m_rp.m_lower[5];
+        if (offset_5 < m_rp.m_upper[5] && thr_id5 < m_rp.m_tile[5]) {
+          for (index_type m = tile_id4; m < m_rp.m_tile_end[4]; m += numbl4) {
+            const index_type offset_4 =
+                m * m_rp.m_tile[4] + thr_id4 + (index_type)m_rp.m_lower[4];
+            if (offset_4 < m_rp.m_upper[4] && thr_id4 < m_rp.m_tile[4]) {
+              for (index_type l = tile_id3; l < m_rp.m_tile_end[3];
+                   l += numbl3) {
+                const index_type offset_3 =
+                    l * m_rp.m_tile[3] + thr_id3 + (index_type)m_rp.m_lower[3];
+                if (offset_3 < m_rp.m_upper[3] && thr_id3 < m_rp.m_tile[3]) {
+                  for (index_type k = tile_id2; k < m_rp.m_tile_end[2];
+                       k += numbl2) {
+                    const index_type offset_2 = k * m_rp.m_tile[2] + thr_id2 +
+                                                (index_type)m_rp.m_lower[2];
+                    if (offset_2 < m_rp.m_upper[2] &&
+                        thr_id2 < m_rp.m_tile[2]) {
+                      for (index_type j = tile_id1; j < m_rp.m_tile_end[1];
+                           j += numbl1) {
+                        const index_type offset_1 = j * m_rp.m_tile[1] +
+                                                    thr_id1 +
+                                                    (index_type)m_rp.m_lower[1];
+                        if (offset_1 < m_rp.m_upper[1] &&
+                            thr_id1 < m_rp.m_tile[1]) {
+                          for (index_type i = tile_id0; i < m_rp.m_tile_end[0];
+                               i += numbl0) {
+                            const index_type offset_0 =
+                                i * m_rp.m_tile[0] + thr_id0 +
+                                (index_type)m_rp.m_lower[0];
+                            if (offset_0 < m_rp.m_upper[0] &&
+                                thr_id0 < m_rp.m_tile[0]) {
+                              m_func(offset_0, offset_1, offset_2, offset_3,
+                                     offset_4, offset_5);
                             }
                           }
                         }
@@ -895,65 +988,82 @@ struct apply_impl<6,RP,Functor,void >
         }
       }
     }
-// LR
+    // LR
     else {
-      index_type temp0  =  m_rp.m_tile_end[0];
-      index_type temp1  =  m_rp.m_tile_end[1];
-      const index_type numbl1 = ( temp1 <= max_blocks ? temp1 : max_blocks ) ;
-      const index_type numbl0 = ( temp0*temp1 > max_blocks ? index_type( max_blocks / numbl1 ) :
-      ( temp0 <= max_blocks ? temp0 : max_blocks ) );
+      index_type temp0        = m_rp.m_tile_end[0];
+      index_type temp1        = m_rp.m_tile_end[1];
+      const index_type numbl1 = (temp1 <= max_blocks ? temp1 : max_blocks);
+      const index_type numbl0 =
+          (temp0 * temp1 > max_blocks
+               ? index_type(max_blocks / numbl1)
+               : (temp0 <= max_blocks ? temp0 : max_blocks));
 
       const index_type tile_id0 = blockIdx.x / numbl1;
       const index_type tile_id1 = blockIdx.x % numbl1;
-      const index_type thr_id0 = threadIdx.x / m_rp.m_tile[1];
-      const index_type thr_id1 = threadIdx.x % m_rp.m_tile[1];
+      const index_type thr_id0  = threadIdx.x / m_rp.m_tile[1];
+      const index_type thr_id1  = threadIdx.x % m_rp.m_tile[1];
 
-      temp0  =  m_rp.m_tile_end[2];
-      temp1  =  m_rp.m_tile_end[3];
-      const index_type numbl3 = ( temp1 <= max_blocks ? temp1 : max_blocks ) ;
-      const index_type numbl2 = ( temp0*temp1 > max_blocks ? index_type( max_blocks / numbl3 ) :
-      (  temp0 <= max_blocks ? temp0 : max_blocks ) );
+      temp0                   = m_rp.m_tile_end[2];
+      temp1                   = m_rp.m_tile_end[3];
+      const index_type numbl3 = (temp1 <= max_blocks ? temp1 : max_blocks);
+      const index_type numbl2 =
+          (temp0 * temp1 > max_blocks
+               ? index_type(max_blocks / numbl3)
+               : (temp0 <= max_blocks ? temp0 : max_blocks));
 
       const index_type tile_id2 = blockIdx.y / numbl3;
       const index_type tile_id3 = blockIdx.y % numbl3;
-      const index_type thr_id2 = threadIdx.y / m_rp.m_tile[3];
-      const index_type thr_id3 = threadIdx.y % m_rp.m_tile[3];
+      const index_type thr_id2  = threadIdx.y / m_rp.m_tile[3];
+      const index_type thr_id3  = threadIdx.y % m_rp.m_tile[3];
 
-      temp0  =  m_rp.m_tile_end[4];
-      temp1  =  m_rp.m_tile_end[5];
-      const index_type numbl5 = ( temp1 <= max_blocks ? temp1 : max_blocks ) ;
-      const index_type numbl4 = ( temp0*temp1 > max_blocks ? index_type( max_blocks / numbl5 ) :
-      (  temp0 <= max_blocks ? temp0 : max_blocks ) );
+      temp0                   = m_rp.m_tile_end[4];
+      temp1                   = m_rp.m_tile_end[5];
+      const index_type numbl5 = (temp1 <= max_blocks ? temp1 : max_blocks);
+      const index_type numbl4 =
+          (temp0 * temp1 > max_blocks
+               ? index_type(max_blocks / numbl5)
+               : (temp0 <= max_blocks ? temp0 : max_blocks));
 
       const index_type tile_id4 = blockIdx.z / numbl5;
       const index_type tile_id5 = blockIdx.z % numbl5;
-      const index_type thr_id4 = threadIdx.z / m_rp.m_tile[5];
-      const index_type thr_id5 = threadIdx.z % m_rp.m_tile[5];
+      const index_type thr_id4  = threadIdx.z / m_rp.m_tile[5];
+      const index_type thr_id5  = threadIdx.z % m_rp.m_tile[5];
 
-      for ( index_type i = tile_id0; i < m_rp.m_tile_end[0]; i += numbl0 ) {
-        const index_type offset_0 = i*m_rp.m_tile[0] + thr_id0 + (index_type)m_rp.m_lower[0];
-        if ( offset_0 < m_rp.m_upper[0] && thr_id0 < m_rp.m_tile[0] ) {
-
-          for ( index_type j = tile_id1; j < m_rp.m_tile_end[1]; j += numbl1 ) {
-            const index_type offset_1 = j*m_rp.m_tile[1] + thr_id1 + (index_type)m_rp.m_lower[1];
-            if ( offset_1 < m_rp.m_upper[1] && thr_id1 < m_rp.m_tile[1] ) {
-
-              for ( index_type k = tile_id2; k < m_rp.m_tile_end[2]; k += numbl2 ) {
-                const index_type offset_2 = k*m_rp.m_tile[2] + thr_id2 + (index_type)m_rp.m_lower[2];
-                if ( offset_2 < m_rp.m_upper[2] && thr_id2 < m_rp.m_tile[2] ) {
-
-                  for ( index_type l = tile_id3; l < m_rp.m_tile_end[3]; l += numbl3 ) {
-                    const index_type offset_3 = l*m_rp.m_tile[3] + thr_id3 + (index_type)m_rp.m_lower[3];
-                    if ( offset_3 < m_rp.m_upper[3] && thr_id3 < m_rp.m_tile[3] ) {
-
-                      for ( index_type m = tile_id4; m < m_rp.m_tile_end[4]; m += numbl4 ) {
-                        const index_type offset_4 = m*m_rp.m_tile[4] + thr_id4 + (index_type)m_rp.m_lower[4];
-                        if ( offset_4 < m_rp.m_upper[4] && thr_id4 < m_rp.m_tile[4] ) {
-
-                          for ( index_type n = tile_id5; n < m_rp.m_tile_end[5]; n += numbl5 ) {
-                            const index_type offset_5 = n*m_rp.m_tile[5] + thr_id5 + (index_type)m_rp.m_lower[5];
-                            if ( offset_5 < m_rp.m_upper[5] && thr_id5 < m_rp.m_tile[5] ) {
-                              m_func(offset_0 , offset_1 , offset_2 , offset_3 , offset_4 , offset_5);
+      for (index_type i = tile_id0; i < m_rp.m_tile_end[0]; i += numbl0) {
+        const index_type offset_0 =
+            i * m_rp.m_tile[0] + thr_id0 + (index_type)m_rp.m_lower[0];
+        if (offset_0 < m_rp.m_upper[0] && thr_id0 < m_rp.m_tile[0]) {
+          for (index_type j = tile_id1; j < m_rp.m_tile_end[1]; j += numbl1) {
+            const index_type offset_1 =
+                j * m_rp.m_tile[1] + thr_id1 + (index_type)m_rp.m_lower[1];
+            if (offset_1 < m_rp.m_upper[1] && thr_id1 < m_rp.m_tile[1]) {
+              for (index_type k = tile_id2; k < m_rp.m_tile_end[2];
+                   k += numbl2) {
+                const index_type offset_2 =
+                    k * m_rp.m_tile[2] + thr_id2 + (index_type)m_rp.m_lower[2];
+                if (offset_2 < m_rp.m_upper[2] && thr_id2 < m_rp.m_tile[2]) {
+                  for (index_type l = tile_id3; l < m_rp.m_tile_end[3];
+                       l += numbl3) {
+                    const index_type offset_3 = l * m_rp.m_tile[3] + thr_id3 +
+                                                (index_type)m_rp.m_lower[3];
+                    if (offset_3 < m_rp.m_upper[3] &&
+                        thr_id3 < m_rp.m_tile[3]) {
+                      for (index_type m = tile_id4; m < m_rp.m_tile_end[4];
+                           m += numbl4) {
+                        const index_type offset_4 = m * m_rp.m_tile[4] +
+                                                    thr_id4 +
+                                                    (index_type)m_rp.m_lower[4];
+                        if (offset_4 < m_rp.m_upper[4] &&
+                            thr_id4 < m_rp.m_tile[4]) {
+                          for (index_type n = tile_id5; n < m_rp.m_tile_end[5];
+                               n += numbl5) {
+                            const index_type offset_5 =
+                                n * m_rp.m_tile[5] + thr_id5 +
+                                (index_type)m_rp.m_lower[5];
+                            if (offset_5 < m_rp.m_upper[5] &&
+                                thr_id5 < m_rp.m_tile[5]) {
+                              m_func(offset_0, offset_1, offset_2, offset_3,
+                                     offset_4, offset_5);
                             }
                           }
                         }
@@ -968,89 +1078,100 @@ struct apply_impl<6,RP,Functor,void >
       }
     }
 
-  } //end exec_range
+  }  // end exec_range
 
-private:
-  const RP & m_rp;
-  const Functor & m_func;
+ private:
+  const RP& m_rp;
+  const Functor& m_func;
 };
 
 // Specializations for tag type
-template< typename RP , typename Functor , typename Tag >
-struct apply_impl<6,RP,Functor,Tag>
-{
+template <typename RP, typename Functor, typename Tag>
+struct apply_impl<6, RP, Functor, Tag> {
   using index_type = typename RP::index_type;
 
-  __device__
-  apply_impl( const RP & rp_ , const Functor & f_ )
-  : m_rp(rp_)
-  , m_func(f_)
-  {}
+  __device__ apply_impl(const RP& rp_, const Functor& f_)
+      : m_rp(rp_), m_func(f_) {}
 
   static constexpr index_type max_blocks = 65535;
 
-  inline __device__
-  void exec_range() const
-  {
-// LL
+  inline __device__ void exec_range() const {
+    // LL
     if (RP::inner_direction == RP::Left) {
-      index_type temp0  =  m_rp.m_tile_end[0];
-      index_type temp1  =  m_rp.m_tile_end[1];
-      const index_type numbl0 = ( temp0 <= max_blocks ? temp0 : max_blocks ) ;
-      const index_type numbl1 = ( temp0*temp1 > max_blocks ? index_type( max_blocks / numbl0 ) :
-      (  temp1 <= max_blocks ? temp1 : max_blocks ) );
+      index_type temp0        = m_rp.m_tile_end[0];
+      index_type temp1        = m_rp.m_tile_end[1];
+      const index_type numbl0 = (temp0 <= max_blocks ? temp0 : max_blocks);
+      const index_type numbl1 =
+          (temp0 * temp1 > max_blocks
+               ? index_type(max_blocks / numbl0)
+               : (temp1 <= max_blocks ? temp1 : max_blocks));
 
       const index_type tile_id0 = blockIdx.x % numbl0;
       const index_type tile_id1 = blockIdx.x / numbl0;
-      const index_type thr_id0 = threadIdx.x % m_rp.m_tile[0];
-      const index_type thr_id1 = threadIdx.x / m_rp.m_tile[0];
+      const index_type thr_id0  = threadIdx.x % m_rp.m_tile[0];
+      const index_type thr_id1  = threadIdx.x / m_rp.m_tile[0];
 
-      temp0  =  m_rp.m_tile_end[2];
-      temp1  =  m_rp.m_tile_end[3];
-      const index_type numbl2 = ( temp0 <= max_blocks ? temp0 : max_blocks ) ;
-      const index_type numbl3 = ( temp0*temp1 > max_blocks ? index_type( max_blocks / numbl2 ) :
-      (  temp1 <= max_blocks ? temp1 : max_blocks ) );
+      temp0                   = m_rp.m_tile_end[2];
+      temp1                   = m_rp.m_tile_end[3];
+      const index_type numbl2 = (temp0 <= max_blocks ? temp0 : max_blocks);
+      const index_type numbl3 =
+          (temp0 * temp1 > max_blocks
+               ? index_type(max_blocks / numbl2)
+               : (temp1 <= max_blocks ? temp1 : max_blocks));
 
       const index_type tile_id2 = blockIdx.y % numbl2;
       const index_type tile_id3 = blockIdx.y / numbl2;
-      const index_type thr_id2 = threadIdx.y % m_rp.m_tile[2];
-      const index_type thr_id3 = threadIdx.y / m_rp.m_tile[2];
+      const index_type thr_id2  = threadIdx.y % m_rp.m_tile[2];
+      const index_type thr_id3  = threadIdx.y / m_rp.m_tile[2];
 
-      temp0  =  m_rp.m_tile_end[4];
-      temp1  =  m_rp.m_tile_end[5];
-      const index_type numbl4 = ( temp0 <= max_blocks ? temp0 : max_blocks ) ;
-      const index_type numbl5 = ( temp0*temp1 > max_blocks ? index_type( max_blocks / numbl4 ) :
-      (  temp1 <= max_blocks ? temp1 : max_blocks ) );
+      temp0                   = m_rp.m_tile_end[4];
+      temp1                   = m_rp.m_tile_end[5];
+      const index_type numbl4 = (temp0 <= max_blocks ? temp0 : max_blocks);
+      const index_type numbl5 =
+          (temp0 * temp1 > max_blocks
+               ? index_type(max_blocks / numbl4)
+               : (temp1 <= max_blocks ? temp1 : max_blocks));
 
       const index_type tile_id4 = blockIdx.z % numbl4;
       const index_type tile_id5 = blockIdx.z / numbl4;
-      const index_type thr_id4 = threadIdx.z % m_rp.m_tile[4];
-      const index_type thr_id5 = threadIdx.z / m_rp.m_tile[4];
+      const index_type thr_id4  = threadIdx.z % m_rp.m_tile[4];
+      const index_type thr_id5  = threadIdx.z / m_rp.m_tile[4];
 
-      for ( index_type n = tile_id5; n < m_rp.m_tile_end[5]; n += numbl5 ) {
-        const index_type offset_5 = n*m_rp.m_tile[5] + thr_id5 + (index_type)m_rp.m_lower[5];
-        if ( offset_5 < m_rp.m_upper[5] && thr_id5 < m_rp.m_tile[5] ) {
-
-          for ( index_type m = tile_id4; m < m_rp.m_tile_end[4]; m += numbl4 ) {
-            const index_type offset_4 = m*m_rp.m_tile[4] + thr_id4 + (index_type)m_rp.m_lower[4];
-            if ( offset_4 < m_rp.m_upper[4] && thr_id4 < m_rp.m_tile[4] ) {
-
-              for ( index_type l = tile_id3; l < m_rp.m_tile_end[3]; l += numbl3 ) {
-                const index_type offset_3 = l*m_rp.m_tile[3] + thr_id3 + (index_type)m_rp.m_lower[3];
-                if ( offset_3 < m_rp.m_upper[3] && thr_id3 < m_rp.m_tile[3] ) {
-
-                  for ( index_type k = tile_id2; k < m_rp.m_tile_end[2]; k += numbl2 ) {
-                    const index_type offset_2 = k*m_rp.m_tile[2] + thr_id2 + (index_type)m_rp.m_lower[2];
-                    if ( offset_2 < m_rp.m_upper[2] && thr_id2 < m_rp.m_tile[2] ) {
-
-                      for ( index_type j = tile_id1 ; j < m_rp.m_tile_end[1]; j += numbl1 ) {
-                        const index_type offset_1 = j*m_rp.m_tile[1] + thr_id1 + (index_type)m_rp.m_lower[1];
-                        if ( offset_1 < m_rp.m_upper[1] && thr_id1 < m_rp.m_tile[1] ) {
-
-                          for ( index_type i = tile_id0 ; i < m_rp.m_tile_end[0]; i += numbl0 ) {
-                            const index_type offset_0 = i*m_rp.m_tile[0] + thr_id0 + (index_type)m_rp.m_lower[0];
-                            if ( offset_0 < m_rp.m_upper[0] && thr_id0 < m_rp.m_tile[0] ) {
-                              m_func(Tag() , offset_0 , offset_1 , offset_2 , offset_3, offset_4, offset_5);
+      for (index_type n = tile_id5; n < m_rp.m_tile_end[5]; n += numbl5) {
+        const index_type offset_5 =
+            n * m_rp.m_tile[5] + thr_id5 + (index_type)m_rp.m_lower[5];
+        if (offset_5 < m_rp.m_upper[5] && thr_id5 < m_rp.m_tile[5]) {
+          for (index_type m = tile_id4; m < m_rp.m_tile_end[4]; m += numbl4) {
+            const index_type offset_4 =
+                m * m_rp.m_tile[4] + thr_id4 + (index_type)m_rp.m_lower[4];
+            if (offset_4 < m_rp.m_upper[4] && thr_id4 < m_rp.m_tile[4]) {
+              for (index_type l = tile_id3; l < m_rp.m_tile_end[3];
+                   l += numbl3) {
+                const index_type offset_3 =
+                    l * m_rp.m_tile[3] + thr_id3 + (index_type)m_rp.m_lower[3];
+                if (offset_3 < m_rp.m_upper[3] && thr_id3 < m_rp.m_tile[3]) {
+                  for (index_type k = tile_id2; k < m_rp.m_tile_end[2];
+                       k += numbl2) {
+                    const index_type offset_2 = k * m_rp.m_tile[2] + thr_id2 +
+                                                (index_type)m_rp.m_lower[2];
+                    if (offset_2 < m_rp.m_upper[2] &&
+                        thr_id2 < m_rp.m_tile[2]) {
+                      for (index_type j = tile_id1; j < m_rp.m_tile_end[1];
+                           j += numbl1) {
+                        const index_type offset_1 = j * m_rp.m_tile[1] +
+                                                    thr_id1 +
+                                                    (index_type)m_rp.m_lower[1];
+                        if (offset_1 < m_rp.m_upper[1] &&
+                            thr_id1 < m_rp.m_tile[1]) {
+                          for (index_type i = tile_id0; i < m_rp.m_tile_end[0];
+                               i += numbl0) {
+                            const index_type offset_0 =
+                                i * m_rp.m_tile[0] + thr_id0 +
+                                (index_type)m_rp.m_lower[0];
+                            if (offset_0 < m_rp.m_upper[0] &&
+                                thr_id0 < m_rp.m_tile[0]) {
+                              m_func(Tag(), offset_0, offset_1, offset_2,
+                                     offset_3, offset_4, offset_5);
                             }
                           }
                         }
@@ -1064,65 +1185,82 @@ struct apply_impl<6,RP,Functor,Tag>
         }
       }
     }
-// LR
+    // LR
     else {
-      index_type temp0  =  m_rp.m_tile_end[0];
-      index_type temp1  =  m_rp.m_tile_end[1];
-      const index_type numbl1 = ( temp1 <= max_blocks ? temp1 : max_blocks ) ;
-      const index_type numbl0 = ( temp0*temp1 > max_blocks ? index_type( max_blocks / numbl1 ) :
-      ( temp0 <= max_blocks ? temp0 : max_blocks ) );
+      index_type temp0        = m_rp.m_tile_end[0];
+      index_type temp1        = m_rp.m_tile_end[1];
+      const index_type numbl1 = (temp1 <= max_blocks ? temp1 : max_blocks);
+      const index_type numbl0 =
+          (temp0 * temp1 > max_blocks
+               ? index_type(max_blocks / numbl1)
+               : (temp0 <= max_blocks ? temp0 : max_blocks));
 
       const index_type tile_id0 = blockIdx.x / numbl1;
       const index_type tile_id1 = blockIdx.x % numbl1;
-      const index_type thr_id0 = threadIdx.x / m_rp.m_tile[1];
-      const index_type thr_id1 = threadIdx.x % m_rp.m_tile[1];
+      const index_type thr_id0  = threadIdx.x / m_rp.m_tile[1];
+      const index_type thr_id1  = threadIdx.x % m_rp.m_tile[1];
 
-      temp0  =  m_rp.m_tile_end[2];
-      temp1  =  m_rp.m_tile_end[3];
-      const index_type numbl3 = ( temp1 <= max_blocks ? temp1 : max_blocks ) ;
-      const index_type numbl2 = ( temp0*temp1 > max_blocks ? index_type( max_blocks / numbl3 ) :
-      (  temp0 <= max_blocks ? temp0 : max_blocks ) );
+      temp0                   = m_rp.m_tile_end[2];
+      temp1                   = m_rp.m_tile_end[3];
+      const index_type numbl3 = (temp1 <= max_blocks ? temp1 : max_blocks);
+      const index_type numbl2 =
+          (temp0 * temp1 > max_blocks
+               ? index_type(max_blocks / numbl3)
+               : (temp0 <= max_blocks ? temp0 : max_blocks));
 
       const index_type tile_id2 = blockIdx.y / numbl3;
       const index_type tile_id3 = blockIdx.y % numbl3;
-      const index_type thr_id2 = threadIdx.y / m_rp.m_tile[3];
-      const index_type thr_id3 = threadIdx.y % m_rp.m_tile[3];
+      const index_type thr_id2  = threadIdx.y / m_rp.m_tile[3];
+      const index_type thr_id3  = threadIdx.y % m_rp.m_tile[3];
 
-      temp0  =  m_rp.m_tile_end[4];
-      temp1  =  m_rp.m_tile_end[5];
-      const index_type numbl5 = ( temp1 <= max_blocks ? temp1 : max_blocks ) ;
-      const index_type numbl4 = ( temp0*temp1 > max_blocks ? index_type( max_blocks / numbl5 ) :
-      (  temp0 <= max_blocks ? temp0 : max_blocks ) );
+      temp0                   = m_rp.m_tile_end[4];
+      temp1                   = m_rp.m_tile_end[5];
+      const index_type numbl5 = (temp1 <= max_blocks ? temp1 : max_blocks);
+      const index_type numbl4 =
+          (temp0 * temp1 > max_blocks
+               ? index_type(max_blocks / numbl5)
+               : (temp0 <= max_blocks ? temp0 : max_blocks));
 
       const index_type tile_id4 = blockIdx.z / numbl5;
       const index_type tile_id5 = blockIdx.z % numbl5;
-      const index_type thr_id4 = threadIdx.z / m_rp.m_tile[5];
-      const index_type thr_id5 = threadIdx.z % m_rp.m_tile[5];
+      const index_type thr_id4  = threadIdx.z / m_rp.m_tile[5];
+      const index_type thr_id5  = threadIdx.z % m_rp.m_tile[5];
 
-      for ( index_type i = tile_id0; i < m_rp.m_tile_end[0]; i += numbl0 ) {
-        const index_type offset_0 = i*m_rp.m_tile[0] + thr_id0 + (index_type)m_rp.m_lower[0];
-        if ( offset_0 < m_rp.m_upper[0] && thr_id0 < m_rp.m_tile[0] ) {
-
-          for ( index_type j = tile_id1; j < m_rp.m_tile_end[1]; j += numbl1 ) {
-            const index_type offset_1 = j*m_rp.m_tile[1] + thr_id1 + (index_type)m_rp.m_lower[1];
-            if ( offset_1 < m_rp.m_upper[1] && thr_id1 < m_rp.m_tile[1] ) {
-
-              for ( index_type k = tile_id2; k < m_rp.m_tile_end[2]; k += numbl2 ) {
-                const index_type offset_2 = k*m_rp.m_tile[2] + thr_id2 + (index_type)m_rp.m_lower[2];
-                if ( offset_2 < m_rp.m_upper[2] && thr_id2 < m_rp.m_tile[2] ) {
-
-                  for ( index_type l = tile_id3; l < m_rp.m_tile_end[3]; l += numbl3 ) {
-                    const index_type offset_3 = l*m_rp.m_tile[3] + thr_id3 + (index_type)m_rp.m_lower[3];
-                    if ( offset_3 < m_rp.m_upper[3] && thr_id3 < m_rp.m_tile[3] ) {
-
-                      for ( index_type m = tile_id4; m < m_rp.m_tile_end[4]; m += numbl4 ) {
-                        const index_type offset_4 = m*m_rp.m_tile[4] + thr_id4 + (index_type)m_rp.m_lower[4];
-                        if ( offset_4 < m_rp.m_upper[4] && thr_id4 < m_rp.m_tile[4] ) {
-
-                          for ( index_type n = tile_id5; n < m_rp.m_tile_end[5]; n += numbl5 ) {
-                            const index_type offset_5 = n*m_rp.m_tile[5] + thr_id5 + (index_type)m_rp.m_lower[5];
-                            if ( offset_5 < m_rp.m_upper[5] && thr_id5 < m_rp.m_tile[5] ) {
-                              m_func(Tag() , offset_0 , offset_1 , offset_2 , offset_3 , offset_4 , offset_5);
+      for (index_type i = tile_id0; i < m_rp.m_tile_end[0]; i += numbl0) {
+        const index_type offset_0 =
+            i * m_rp.m_tile[0] + thr_id0 + (index_type)m_rp.m_lower[0];
+        if (offset_0 < m_rp.m_upper[0] && thr_id0 < m_rp.m_tile[0]) {
+          for (index_type j = tile_id1; j < m_rp.m_tile_end[1]; j += numbl1) {
+            const index_type offset_1 =
+                j * m_rp.m_tile[1] + thr_id1 + (index_type)m_rp.m_lower[1];
+            if (offset_1 < m_rp.m_upper[1] && thr_id1 < m_rp.m_tile[1]) {
+              for (index_type k = tile_id2; k < m_rp.m_tile_end[2];
+                   k += numbl2) {
+                const index_type offset_2 =
+                    k * m_rp.m_tile[2] + thr_id2 + (index_type)m_rp.m_lower[2];
+                if (offset_2 < m_rp.m_upper[2] && thr_id2 < m_rp.m_tile[2]) {
+                  for (index_type l = tile_id3; l < m_rp.m_tile_end[3];
+                       l += numbl3) {
+                    const index_type offset_3 = l * m_rp.m_tile[3] + thr_id3 +
+                                                (index_type)m_rp.m_lower[3];
+                    if (offset_3 < m_rp.m_upper[3] &&
+                        thr_id3 < m_rp.m_tile[3]) {
+                      for (index_type m = tile_id4; m < m_rp.m_tile_end[4];
+                           m += numbl4) {
+                        const index_type offset_4 = m * m_rp.m_tile[4] +
+                                                    thr_id4 +
+                                                    (index_type)m_rp.m_lower[4];
+                        if (offset_4 < m_rp.m_upper[4] &&
+                            thr_id4 < m_rp.m_tile[4]) {
+                          for (index_type n = tile_id5; n < m_rp.m_tile_end[5];
+                               n += numbl5) {
+                            const index_type offset_5 =
+                                n * m_rp.m_tile[5] + thr_id5 +
+                                (index_type)m_rp.m_lower[5];
+                            if (offset_5 < m_rp.m_upper[5] &&
+                                thr_id5 < m_rp.m_tile[5]) {
+                              m_func(Tag(), offset_0, offset_1, offset_2,
+                                     offset_3, offset_4, offset_5);
                             }
                           }
                         }
@@ -1137,127 +1275,118 @@ struct apply_impl<6,RP,Functor,Tag>
       }
     }
 
-  } //end exec_range
+  }  // end exec_range
 
-private:
-  const RP & m_rp;
-  const Functor & m_func;
+ private:
+  const RP& m_rp;
+  const Functor& m_func;
 };
 
 // ----------------------------------------------------------------------------------
 
-template < typename RP
-         , typename Functor
-         , typename Tag
-         >
-struct DeviceIterateTile
-{
-  using index_type = typename RP::index_type;
+template <typename RP, typename Functor, typename Tag>
+struct DeviceIterateTile {
+  using index_type       = typename RP::index_type;
   using array_index_type = typename RP::array_index_type;
-  using point_type = typename RP::point_type;
+  using point_type       = typename RP::point_type;
 
   struct VoidDummy {};
-  typedef typename std::conditional< std::is_same<Tag, void>::value, VoidDummy, Tag>::type usable_tag;
+  typedef typename std::conditional<std::is_same<Tag, void>::value, VoidDummy,
+                                    Tag>::type usable_tag;
 
-  DeviceIterateTile( const RP & rp, const Functor & func )
-    : m_rp{rp}
-    , m_func{func}
-  {}
+  DeviceIterateTile(const RP& rp, const Functor& func)
+      : m_rp{rp}, m_func{func} {}
 
-private:
-  inline __device__
-  void apply() const
-  {
-    apply_impl<RP::rank,RP,Functor,Tag>(m_rp,m_func).exec_range();
-  } //end apply
+ private:
+  inline __device__ void apply() const {
+    apply_impl<RP::rank, RP, Functor, Tag>(m_rp, m_func).exec_range();
+  }  // end apply
 
-public:
+ public:
+  inline __device__ void operator()(void) const { this->apply(); }
 
-  inline
-  __device__
-  void operator()(void) const
-  {
-    this-> apply();
-  }
-
-  inline
-  void execute() const
-  {
-    const array_index_type maxblocks = 65535; //not true for blockIdx.x for newer archs
-    if ( RP::rank == 2 )
-    {
-      const dim3 block( m_rp.m_tile[0] , m_rp.m_tile[1] , 1);
+  inline void execute() const {
+    const array_index_type maxblocks =
+        65535;  // not true for blockIdx.x for newer archs
+    if (RP::rank == 2) {
+      const dim3 block(m_rp.m_tile[0], m_rp.m_tile[1], 1);
       const dim3 grid(
-            std::min( ( m_rp.m_upper[0] - m_rp.m_lower[0] + block.x - 1 ) / block.x , maxblocks )
-          , std::min( ( m_rp.m_upper[1] - m_rp.m_lower[1] + block.y - 1 ) / block.y , maxblocks )
-          , 1
-          );
-      CudaLaunch< DeviceIterateTile >( *this , grid , block );
-    }
-    else if ( RP::rank == 3 )
-    {
-      const dim3 block( m_rp.m_tile[0] , m_rp.m_tile[1] , m_rp.m_tile[2] );
+          std::min((m_rp.m_upper[0] - m_rp.m_lower[0] + block.x - 1) / block.x,
+                   maxblocks),
+          std::min((m_rp.m_upper[1] - m_rp.m_lower[1] + block.y - 1) / block.y,
+                   maxblocks),
+          1);
+      CudaLaunch<DeviceIterateTile>(*this, grid, block);
+    } else if (RP::rank == 3) {
+      const dim3 block(m_rp.m_tile[0], m_rp.m_tile[1], m_rp.m_tile[2]);
       const dim3 grid(
-          std::min( ( m_rp.m_upper[0] - m_rp.m_lower[0] + block.x - 1 ) / block.x , maxblocks )
-        , std::min( ( m_rp.m_upper[1] - m_rp.m_lower[1] + block.y - 1 ) / block.y , maxblocks )
-        , std::min( ( m_rp.m_upper[2] - m_rp.m_lower[2] + block.z - 1 ) / block.z , maxblocks )
-        );
-      CudaLaunch< DeviceIterateTile >( *this , grid , block );
-    }
-    else if ( RP::rank == 4 )
-    {
-      // id0,id1 encoded within threadIdx.x; id2 to threadIdx.y; id3 to threadIdx.z
-      const dim3 block( m_rp.m_tile[0]*m_rp.m_tile[1] , m_rp.m_tile[2] , m_rp.m_tile[3] );
+          std::min((m_rp.m_upper[0] - m_rp.m_lower[0] + block.x - 1) / block.x,
+                   maxblocks),
+          std::min((m_rp.m_upper[1] - m_rp.m_lower[1] + block.y - 1) / block.y,
+                   maxblocks),
+          std::min((m_rp.m_upper[2] - m_rp.m_lower[2] + block.z - 1) / block.z,
+                   maxblocks));
+      CudaLaunch<DeviceIterateTile>(*this, grid, block);
+    } else if (RP::rank == 4) {
+      // id0,id1 encoded within threadIdx.x; id2 to threadIdx.y; id3 to
+      // threadIdx.z
+      const dim3 block(m_rp.m_tile[0] * m_rp.m_tile[1], m_rp.m_tile[2],
+                       m_rp.m_tile[3]);
       const dim3 grid(
-          std::min( static_cast<index_type>( m_rp.m_tile_end[0] * m_rp.m_tile_end[1] )
-                  , static_cast<index_type>(maxblocks) )
-        , std::min( ( m_rp.m_upper[2] - m_rp.m_lower[2] + block.y - 1 ) / block.y , maxblocks )
-        , std::min( ( m_rp.m_upper[3] - m_rp.m_lower[3] + block.z - 1 ) / block.z , maxblocks )
-        );
-      CudaLaunch< DeviceIterateTile >( *this , grid , block );
-    }
-    else if ( RP::rank == 5 )
-    {
-      // id0,id1 encoded within threadIdx.x; id2,id3 to threadIdx.y; id4 to threadIdx.z
-      const dim3 block( m_rp.m_tile[0]*m_rp.m_tile[1] , m_rp.m_tile[2]*m_rp.m_tile[3] , m_rp.m_tile[4] );
+          std::min(
+              static_cast<index_type>(m_rp.m_tile_end[0] * m_rp.m_tile_end[1]),
+              static_cast<index_type>(maxblocks)),
+          std::min((m_rp.m_upper[2] - m_rp.m_lower[2] + block.y - 1) / block.y,
+                   maxblocks),
+          std::min((m_rp.m_upper[3] - m_rp.m_lower[3] + block.z - 1) / block.z,
+                   maxblocks));
+      CudaLaunch<DeviceIterateTile>(*this, grid, block);
+    } else if (RP::rank == 5) {
+      // id0,id1 encoded within threadIdx.x; id2,id3 to threadIdx.y; id4 to
+      // threadIdx.z
+      const dim3 block(m_rp.m_tile[0] * m_rp.m_tile[1],
+                       m_rp.m_tile[2] * m_rp.m_tile[3], m_rp.m_tile[4]);
       const dim3 grid(
-          std::min( static_cast<index_type>( m_rp.m_tile_end[0] * m_rp.m_tile_end[1] )
-                  , static_cast<index_type>(maxblocks) )
-        , std::min( static_cast<index_type>( m_rp.m_tile_end[2] * m_rp.m_tile_end[3] )
-                  , static_cast<index_type>(maxblocks) )
-        , std::min( ( m_rp.m_upper[4] - m_rp.m_lower[4] + block.z - 1 ) / block.z , maxblocks )
-        );
-      CudaLaunch< DeviceIterateTile >( *this , grid , block );
-    }
-    else if ( RP::rank == 6 )
-    {
-      // id0,id1 encoded within threadIdx.x; id2,id3 to threadIdx.y; id4,id5 to threadIdx.z
-      const dim3 block( m_rp.m_tile[0]*m_rp.m_tile[1] , m_rp.m_tile[2]*m_rp.m_tile[3] , m_rp.m_tile[4]*m_rp.m_tile[5] );
+          std::min(
+              static_cast<index_type>(m_rp.m_tile_end[0] * m_rp.m_tile_end[1]),
+              static_cast<index_type>(maxblocks)),
+          std::min(
+              static_cast<index_type>(m_rp.m_tile_end[2] * m_rp.m_tile_end[3]),
+              static_cast<index_type>(maxblocks)),
+          std::min((m_rp.m_upper[4] - m_rp.m_lower[4] + block.z - 1) / block.z,
+                   maxblocks));
+      CudaLaunch<DeviceIterateTile>(*this, grid, block);
+    } else if (RP::rank == 6) {
+      // id0,id1 encoded within threadIdx.x; id2,id3 to threadIdx.y; id4,id5 to
+      // threadIdx.z
+      const dim3 block(m_rp.m_tile[0] * m_rp.m_tile[1],
+                       m_rp.m_tile[2] * m_rp.m_tile[3],
+                       m_rp.m_tile[4] * m_rp.m_tile[5]);
       const dim3 grid(
-          std::min( static_cast<index_type>( m_rp.m_tile_end[0] * m_rp.m_tile_end[1] )
-                  , static_cast<index_type>(maxblocks) )
-        ,  std::min( static_cast<index_type>( m_rp.m_tile_end[2] * m_rp.m_tile_end[3] )
-                  , static_cast<index_type>(maxblocks) )
-        , std::min( static_cast<index_type>( m_rp.m_tile_end[4] * m_rp.m_tile_end[5] )
-                  , static_cast<index_type>(maxblocks) )
-        );
-      CudaLaunch< DeviceIterateTile >( *this , grid , block );
-    }
-    else
-    {
+          std::min(
+              static_cast<index_type>(m_rp.m_tile_end[0] * m_rp.m_tile_end[1]),
+              static_cast<index_type>(maxblocks)),
+          std::min(
+              static_cast<index_type>(m_rp.m_tile_end[2] * m_rp.m_tile_end[3]),
+              static_cast<index_type>(maxblocks)),
+          std::min(
+              static_cast<index_type>(m_rp.m_tile_end[4] * m_rp.m_tile_end[5]),
+              static_cast<index_type>(maxblocks)));
+      CudaLaunch<DeviceIterateTile>(*this, grid, block);
+    } else {
       printf("Kokkos::MDRange Error: Exceeded rank bounds with Cuda\n");
       Kokkos::abort("Aborting");
     }
 
-  } //end execute
+  }  // end execute
 
-protected:
-  const RP         m_rp;
-  const Functor    m_func;
+ protected:
+  const RP m_rp;
+  const Functor m_func;
 };
 
-} } //end namespace Kokkos::Impl
+}  // namespace Impl
+}  // namespace Kokkos
 
 #endif
 #endif
-
diff --git a/lib/kokkos/core/src/Cuda/KokkosExp_Cuda_IterateTile_Refactor.hpp b/lib/kokkos/core/src/Cuda/KokkosExp_Cuda_IterateTile_Refactor.hpp
index 636e05c8ac..cb7f5971ae 100644
--- a/lib/kokkos/core/src/Cuda/KokkosExp_Cuda_IterateTile_Refactor.hpp
+++ b/lib/kokkos/core/src/Cuda/KokkosExp_Cuda_IterateTile_Refactor.hpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -45,7 +46,7 @@
 #define KOKKOS_CUDA_EXP_ITERATE_TILE_REFACTOR_HPP
 
 #include <Kokkos_Macros.hpp>
-#if defined( __CUDACC__ ) && defined( KOKKOS_ENABLE_CUDA )
+#if defined(__CUDACC__) && defined(KOKKOS_ENABLE_CUDA)
 
 #include <iostream>
 #include <algorithm>
@@ -55,49 +56,52 @@
 
 // #include<Cuda/Kokkos_CudaExec.hpp>
 // Including the file above leads to following type of errors:
-// /home/ndellin/kokkos/core/src/Cuda/Kokkos_CudaExec.hpp(84): error: incomplete type is not allowed
-// use existing Kokkos functionality, e.g. max blocks, once resolved
+// /home/ndellin/kokkos/core/src/Cuda/Kokkos_CudaExec.hpp(84): error: incomplete
+// type is not allowed use existing Kokkos functionality, e.g. max blocks, once
+// resolved
 
 #if defined(KOKKOS_ENABLE_PROFILING)
 #include <impl/Kokkos_Profiling_Interface.hpp>
 #include <typeinfo>
 #endif
 
-namespace Kokkos { namespace Impl {
+namespace Kokkos {
+namespace Impl {
 
 namespace Refactor {
 
 // ------------------------------------------------------------------ //
 // ParallelFor iteration pattern
-template< int N , typename RP , typename Functor , typename Tag >
+template <int N, typename RP, typename Functor, typename Tag>
 struct DeviceIterateTile;
 
-//Rank 2
+// Rank 2
 // Specializations for void tag type
-template< typename RP , typename Functor >
-struct DeviceIterateTile<2,RP,Functor,void >
-{
+template <typename RP, typename Functor>
+struct DeviceIterateTile<2, RP, Functor, void> {
   using index_type = typename RP::index_type;
 
-  __device__
-  DeviceIterateTile( const RP & rp_ , const Functor & f_ )
-  : m_rp(rp_)
-  , m_func(f_)
-  {}
+  __device__ DeviceIterateTile(const RP& rp_, const Functor& f_)
+      : m_rp(rp_), m_func(f_) {}
 
-  inline __device__
-  void exec_range() const
-  {
+  inline __device__ void exec_range() const {
     // LL
     if (RP::inner_direction == RP::Left) {
-      for ( index_type tile_id1 = (index_type)blockIdx.y; tile_id1 < m_rp.m_tile_end[1]; tile_id1 += gridDim.y ) {
-        const index_type offset_1 = tile_id1*m_rp.m_tile[1] + (index_type)threadIdx.y + (index_type)m_rp.m_lower[1];
-        if ( offset_1 < m_rp.m_upper[1] && (index_type)threadIdx.y < m_rp.m_tile[1] ) {
-
-          for ( index_type tile_id0 = (index_type)blockIdx.x; tile_id0 < m_rp.m_tile_end[0]; tile_id0 += gridDim.x ) {
-            const index_type offset_0 = tile_id0*m_rp.m_tile[0] + (index_type)threadIdx.x + (index_type)m_rp.m_lower[0];
-            if ( offset_0 < m_rp.m_upper[0] && (index_type)threadIdx.x < m_rp.m_tile[0] ) {
-              m_func(offset_0 , offset_1);
+      for (index_type tile_id1 = (index_type)blockIdx.y;
+           tile_id1 < m_rp.m_tile_end[1]; tile_id1 += gridDim.y) {
+        const index_type offset_1 = tile_id1 * m_rp.m_tile[1] +
+                                    (index_type)threadIdx.y +
+                                    (index_type)m_rp.m_lower[1];
+        if (offset_1 < m_rp.m_upper[1] &&
+            (index_type)threadIdx.y < m_rp.m_tile[1]) {
+          for (index_type tile_id0 = (index_type)blockIdx.x;
+               tile_id0 < m_rp.m_tile_end[0]; tile_id0 += gridDim.x) {
+            const index_type offset_0 = tile_id0 * m_rp.m_tile[0] +
+                                        (index_type)threadIdx.x +
+                                        (index_type)m_rp.m_lower[0];
+            if (offset_0 < m_rp.m_upper[0] &&
+                (index_type)threadIdx.x < m_rp.m_tile[0]) {
+              m_func(offset_0, offset_1);
             }
           }
         }
@@ -105,108 +109,125 @@ struct DeviceIterateTile<2,RP,Functor,void >
     }
     // LR
     else {
-      for ( index_type tile_id0 = (index_type)blockIdx.x; tile_id0 < m_rp.m_tile_end[0]; tile_id0 += gridDim.x ) {
-        const index_type offset_0 = tile_id0*m_rp.m_tile[0] + (index_type)threadIdx.x + (index_type)m_rp.m_lower[0];
-        if ( offset_0 < m_rp.m_upper[0] && (index_type)threadIdx.x < m_rp.m_tile[0] ) {
-
-          for ( index_type tile_id1 = (index_type)blockIdx.y; tile_id1 < m_rp.m_tile_end[1]; tile_id1 += gridDim.y ) {
-            const index_type offset_1 = tile_id1*m_rp.m_tile[1] + (index_type)threadIdx.y + (index_type)m_rp.m_lower[1];
-            if ( offset_1 < m_rp.m_upper[1] && (index_type)threadIdx.y < m_rp.m_tile[1] ) {
-              m_func(offset_0 , offset_1);
+      for (index_type tile_id0 = (index_type)blockIdx.x;
+           tile_id0 < m_rp.m_tile_end[0]; tile_id0 += gridDim.x) {
+        const index_type offset_0 = tile_id0 * m_rp.m_tile[0] +
+                                    (index_type)threadIdx.x +
+                                    (index_type)m_rp.m_lower[0];
+        if (offset_0 < m_rp.m_upper[0] &&
+            (index_type)threadIdx.x < m_rp.m_tile[0]) {
+          for (index_type tile_id1 = (index_type)blockIdx.y;
+               tile_id1 < m_rp.m_tile_end[1]; tile_id1 += gridDim.y) {
+            const index_type offset_1 = tile_id1 * m_rp.m_tile[1] +
+                                        (index_type)threadIdx.y +
+                                        (index_type)m_rp.m_lower[1];
+            if (offset_1 < m_rp.m_upper[1] &&
+                (index_type)threadIdx.y < m_rp.m_tile[1]) {
+              m_func(offset_0, offset_1);
             }
           }
         }
       }
     }
-  } //end exec_range
+  }  // end exec_range
 
-private:
-  const RP & m_rp;
-  const Functor & m_func;
+ private:
+  const RP& m_rp;
+  const Functor& m_func;
 };
 
 // Specializations for tag type
-template< typename RP , typename Functor , typename Tag >
-struct DeviceIterateTile<2,RP,Functor,Tag>
-{
+template <typename RP, typename Functor, typename Tag>
+struct DeviceIterateTile<2, RP, Functor, Tag> {
   using index_type = typename RP::index_type;
 
-  inline __device__
-  DeviceIterateTile( const RP & rp_ , const Functor & f_ )
-  : m_rp(rp_)
-  , m_func(f_)
-  {}
+  inline __device__ DeviceIterateTile(const RP& rp_, const Functor& f_)
+      : m_rp(rp_), m_func(f_) {}
 
-  inline __device__
-  void exec_range() const
-  {
+  inline __device__ void exec_range() const {
     if (RP::inner_direction == RP::Left) {
       // Loop over size maxnumblocks until full range covered
-      for ( index_type tile_id1 = (index_type)blockIdx.y; tile_id1 < m_rp.m_tile_end[1]; tile_id1 += gridDim.y ) {
-        const index_type offset_1 = tile_id1*m_rp.m_tile[1] + (index_type)threadIdx.y + (index_type)m_rp.m_lower[1];
-        if ( offset_1 < m_rp.m_upper[1] && (index_type)threadIdx.y < m_rp.m_tile[1] ) {
-
-          for ( index_type tile_id0 = (index_type)blockIdx.x; tile_id0 < m_rp.m_tile_end[0]; tile_id0 += gridDim.x ) {
-            const index_type offset_0 = tile_id0*m_rp.m_tile[0] + (index_type)threadIdx.x + (index_type)m_rp.m_lower[0];
-            if ( offset_0 < m_rp.m_upper[0] && (index_type)threadIdx.x < m_rp.m_tile[0] ) {
-              m_func(Tag(), offset_0 , offset_1);
+      for (index_type tile_id1 = (index_type)blockIdx.y;
+           tile_id1 < m_rp.m_tile_end[1]; tile_id1 += gridDim.y) {
+        const index_type offset_1 = tile_id1 * m_rp.m_tile[1] +
+                                    (index_type)threadIdx.y +
+                                    (index_type)m_rp.m_lower[1];
+        if (offset_1 < m_rp.m_upper[1] &&
+            (index_type)threadIdx.y < m_rp.m_tile[1]) {
+          for (index_type tile_id0 = (index_type)blockIdx.x;
+               tile_id0 < m_rp.m_tile_end[0]; tile_id0 += gridDim.x) {
+            const index_type offset_0 = tile_id0 * m_rp.m_tile[0] +
+                                        (index_type)threadIdx.x +
+                                        (index_type)m_rp.m_lower[0];
+            if (offset_0 < m_rp.m_upper[0] &&
+                (index_type)threadIdx.x < m_rp.m_tile[0]) {
+              m_func(Tag(), offset_0, offset_1);
+            }
+          }
+        }
+      }
+    } else {
+      for (index_type tile_id0 = (index_type)blockIdx.x;
+           tile_id0 < m_rp.m_tile_end[0]; tile_id0 += gridDim.x) {
+        const index_type offset_0 = tile_id0 * m_rp.m_tile[0] +
+                                    (index_type)threadIdx.x +
+                                    (index_type)m_rp.m_lower[0];
+        if (offset_0 < m_rp.m_upper[0] &&
+            (index_type)threadIdx.x < m_rp.m_tile[0]) {
+          for (index_type tile_id1 = (index_type)blockIdx.y;
+               tile_id1 < m_rp.m_tile_end[1]; tile_id1 += gridDim.y) {
+            const index_type offset_1 = tile_id1 * m_rp.m_tile[1] +
+                                        (index_type)threadIdx.y +
+                                        (index_type)m_rp.m_lower[1];
+            if (offset_1 < m_rp.m_upper[1] &&
+                (index_type)threadIdx.y < m_rp.m_tile[1]) {
+              m_func(Tag(), offset_0, offset_1);
             }
           }
         }
       }
     }
-    else {
-      for ( index_type tile_id0 = (index_type)blockIdx.x; tile_id0 < m_rp.m_tile_end[0]; tile_id0 += gridDim.x ) {
-        const index_type offset_0 = tile_id0*m_rp.m_tile[0] + (index_type)threadIdx.x + (index_type)m_rp.m_lower[0];
-        if ( offset_0 < m_rp.m_upper[0] && (index_type)threadIdx.x < m_rp.m_tile[0] ) {
+  }  // end exec_range
 
-          for ( index_type tile_id1 = (index_type)blockIdx.y; tile_id1 < m_rp.m_tile_end[1]; tile_id1 += gridDim.y ) {
-            const index_type offset_1 = tile_id1*m_rp.m_tile[1] + (index_type)threadIdx.y + (index_type)m_rp.m_lower[1];
-            if ( offset_1 < m_rp.m_upper[1] && (index_type)threadIdx.y < m_rp.m_tile[1] ) {
-              m_func(Tag(), offset_0 , offset_1);
-            }
-          }
-        }
-      }
-    }
-  } //end exec_range
-
-private:
-  const RP & m_rp;
-  const Functor & m_func;
+ private:
+  const RP& m_rp;
+  const Functor& m_func;
 };
 
-
-//Rank 3
+// Rank 3
 // Specializations for void tag type
-template< typename RP , typename Functor >
-struct DeviceIterateTile<3,RP,Functor,void >
-{
+template <typename RP, typename Functor>
+struct DeviceIterateTile<3, RP, Functor, void> {
   using index_type = typename RP::index_type;
 
-  __device__
-  DeviceIterateTile( const RP & rp_ , const Functor & f_ )
-  : m_rp(rp_)
-  , m_func(f_)
-  {}
+  __device__ DeviceIterateTile(const RP& rp_, const Functor& f_)
+      : m_rp(rp_), m_func(f_) {}
 
-  inline __device__
-  void exec_range() const
-  {
+  inline __device__ void exec_range() const {
     // LL
     if (RP::inner_direction == RP::Left) {
-      for ( index_type tile_id2 = (index_type)blockIdx.z; tile_id2 < m_rp.m_tile_end[2]; tile_id2 += gridDim.z ) {
-        const index_type offset_2 = tile_id2*m_rp.m_tile[2] + (index_type)threadIdx.z + (index_type)m_rp.m_lower[2];
-        if ( offset_2 < m_rp.m_upper[2] && (index_type)threadIdx.z < m_rp.m_tile[2] ) {
-
-          for ( index_type tile_id1 = (index_type)blockIdx.y; tile_id1 < m_rp.m_tile_end[1]; tile_id1 += gridDim.y ) {
-            const index_type offset_1 = tile_id1*m_rp.m_tile[1] + (index_type)threadIdx.y + (index_type)m_rp.m_lower[1];
-            if ( offset_1 < m_rp.m_upper[1] && (index_type)threadIdx.y < m_rp.m_tile[1] ) {
-
-              for ( index_type tile_id0 = (index_type)blockIdx.x; tile_id0 < m_rp.m_tile_end[0]; tile_id0 += gridDim.x ) {
-                const index_type offset_0 = tile_id0*m_rp.m_tile[0] + (index_type)threadIdx.x + (index_type)m_rp.m_lower[0];
-                if ( offset_0 < m_rp.m_upper[0] && (index_type)threadIdx.x < m_rp.m_tile[0] ) {
-                  m_func(offset_0 , offset_1 , offset_2);
+      for (index_type tile_id2 = (index_type)blockIdx.z;
+           tile_id2 < m_rp.m_tile_end[2]; tile_id2 += gridDim.z) {
+        const index_type offset_2 = tile_id2 * m_rp.m_tile[2] +
+                                    (index_type)threadIdx.z +
+                                    (index_type)m_rp.m_lower[2];
+        if (offset_2 < m_rp.m_upper[2] &&
+            (index_type)threadIdx.z < m_rp.m_tile[2]) {
+          for (index_type tile_id1 = (index_type)blockIdx.y;
+               tile_id1 < m_rp.m_tile_end[1]; tile_id1 += gridDim.y) {
+            const index_type offset_1 = tile_id1 * m_rp.m_tile[1] +
+                                        (index_type)threadIdx.y +
+                                        (index_type)m_rp.m_lower[1];
+            if (offset_1 < m_rp.m_upper[1] &&
+                (index_type)threadIdx.y < m_rp.m_tile[1]) {
+              for (index_type tile_id0 = (index_type)blockIdx.x;
+                   tile_id0 < m_rp.m_tile_end[0]; tile_id0 += gridDim.x) {
+                const index_type offset_0 = tile_id0 * m_rp.m_tile[0] +
+                                            (index_type)threadIdx.x +
+                                            (index_type)m_rp.m_lower[0];
+                if (offset_0 < m_rp.m_upper[0] &&
+                    (index_type)threadIdx.x < m_rp.m_tile[0]) {
+                  m_func(offset_0, offset_1, offset_2);
                 }
               }
             }
@@ -216,18 +237,28 @@ struct DeviceIterateTile<3,RP,Functor,void >
     }
     // LR
     else {
-      for ( index_type tile_id0 = (index_type)blockIdx.x; tile_id0 < m_rp.m_tile_end[0]; tile_id0 += gridDim.x ) {
-        const index_type offset_0 = tile_id0*m_rp.m_tile[0] + (index_type)threadIdx.x + (index_type)m_rp.m_lower[0];
-        if ( offset_0 < m_rp.m_upper[0] && (index_type)threadIdx.x < m_rp.m_tile[0] ) {
-
-          for ( index_type tile_id1 = (index_type)blockIdx.y; tile_id1 < m_rp.m_tile_end[1]; tile_id1 += gridDim.y ) {
-            const index_type offset_1 = tile_id1*m_rp.m_tile[1] + (index_type)threadIdx.y + (index_type)m_rp.m_lower[1];
-            if ( offset_1 < m_rp.m_upper[1] && (index_type)threadIdx.y < m_rp.m_tile[1] ) {
-
-              for ( index_type tile_id2 = (index_type)blockIdx.z; tile_id2 < m_rp.m_tile_end[2]; tile_id2 += gridDim.z ) {
-                const index_type offset_2 = tile_id2*m_rp.m_tile[2] + (index_type)threadIdx.z + (index_type)m_rp.m_lower[2];
-                if ( offset_2 < m_rp.m_upper[2] && (index_type)threadIdx.z < m_rp.m_tile[2] ) {
-                  m_func(offset_0 , offset_1 , offset_2);
+      for (index_type tile_id0 = (index_type)blockIdx.x;
+           tile_id0 < m_rp.m_tile_end[0]; tile_id0 += gridDim.x) {
+        const index_type offset_0 = tile_id0 * m_rp.m_tile[0] +
+                                    (index_type)threadIdx.x +
+                                    (index_type)m_rp.m_lower[0];
+        if (offset_0 < m_rp.m_upper[0] &&
+            (index_type)threadIdx.x < m_rp.m_tile[0]) {
+          for (index_type tile_id1 = (index_type)blockIdx.y;
+               tile_id1 < m_rp.m_tile_end[1]; tile_id1 += gridDim.y) {
+            const index_type offset_1 = tile_id1 * m_rp.m_tile[1] +
+                                        (index_type)threadIdx.y +
+                                        (index_type)m_rp.m_lower[1];
+            if (offset_1 < m_rp.m_upper[1] &&
+                (index_type)threadIdx.y < m_rp.m_tile[1]) {
+              for (index_type tile_id2 = (index_type)blockIdx.z;
+                   tile_id2 < m_rp.m_tile_end[2]; tile_id2 += gridDim.z) {
+                const index_type offset_2 = tile_id2 * m_rp.m_tile[2] +
+                                            (index_type)threadIdx.z +
+                                            (index_type)m_rp.m_lower[2];
+                if (offset_2 < m_rp.m_upper[2] &&
+                    (index_type)threadIdx.z < m_rp.m_tile[2]) {
+                  m_func(offset_0, offset_1, offset_2);
                 }
               }
             }
@@ -235,41 +266,74 @@ struct DeviceIterateTile<3,RP,Functor,void >
         }
       }
     }
-  } //end exec_range
+  }  // end exec_range
 
-private:
-  const RP & m_rp;
-  const Functor & m_func;
+ private:
+  const RP& m_rp;
+  const Functor& m_func;
 };
 
 // Specializations for void tag type
-template< typename RP , typename Functor , typename Tag >
-struct DeviceIterateTile<3,RP,Functor,Tag>
-{
+template <typename RP, typename Functor, typename Tag>
+struct DeviceIterateTile<3, RP, Functor, Tag> {
   using index_type = typename RP::index_type;
 
-  inline __device__
-  DeviceIterateTile( const RP & rp_ , const Functor & f_ )
-  : m_rp(rp_)
-  , m_func(f_)
-  {}
+  inline __device__ DeviceIterateTile(const RP& rp_, const Functor& f_)
+      : m_rp(rp_), m_func(f_) {}
 
-  inline __device__
-  void exec_range() const
-  {
+  inline __device__ void exec_range() const {
     if (RP::inner_direction == RP::Left) {
-      for ( index_type tile_id2 = (index_type)blockIdx.z; tile_id2 < m_rp.m_tile_end[2]; tile_id2 += gridDim.z ) {
-        const index_type offset_2 = tile_id2*m_rp.m_tile[2] + (index_type)threadIdx.z + (index_type)m_rp.m_lower[2];
-        if ( offset_2 < m_rp.m_upper[2] && (index_type)threadIdx.z < m_rp.m_tile[2] ) {
-
-          for ( index_type tile_id1 = (index_type)blockIdx.y; tile_id1 < m_rp.m_tile_end[1]; tile_id1 += gridDim.y ) {
-            const index_type offset_1 = tile_id1*m_rp.m_tile[1] + (index_type)threadIdx.y + (index_type)m_rp.m_lower[1];
-            if ( offset_1 < m_rp.m_upper[1] && (index_type)threadIdx.y < m_rp.m_tile[1] ) {
-
-              for ( index_type tile_id0 = (index_type)blockIdx.x; tile_id0 < m_rp.m_tile_end[0]; tile_id0 += gridDim.x ) {
-                const index_type offset_0 = tile_id0*m_rp.m_tile[0] + (index_type)threadIdx.x + (index_type)m_rp.m_lower[0];
-                if ( offset_0 < m_rp.m_upper[0] && (index_type)threadIdx.x < m_rp.m_tile[0] ) {
-                  m_func(Tag(), offset_0 , offset_1 , offset_2);
+      for (index_type tile_id2 = (index_type)blockIdx.z;
+           tile_id2 < m_rp.m_tile_end[2]; tile_id2 += gridDim.z) {
+        const index_type offset_2 = tile_id2 * m_rp.m_tile[2] +
+                                    (index_type)threadIdx.z +
+                                    (index_type)m_rp.m_lower[2];
+        if (offset_2 < m_rp.m_upper[2] &&
+            (index_type)threadIdx.z < m_rp.m_tile[2]) {
+          for (index_type tile_id1 = (index_type)blockIdx.y;
+               tile_id1 < m_rp.m_tile_end[1]; tile_id1 += gridDim.y) {
+            const index_type offset_1 = tile_id1 * m_rp.m_tile[1] +
+                                        (index_type)threadIdx.y +
+                                        (index_type)m_rp.m_lower[1];
+            if (offset_1 < m_rp.m_upper[1] &&
+                (index_type)threadIdx.y < m_rp.m_tile[1]) {
+              for (index_type tile_id0 = (index_type)blockIdx.x;
+                   tile_id0 < m_rp.m_tile_end[0]; tile_id0 += gridDim.x) {
+                const index_type offset_0 = tile_id0 * m_rp.m_tile[0] +
+                                            (index_type)threadIdx.x +
+                                            (index_type)m_rp.m_lower[0];
+                if (offset_0 < m_rp.m_upper[0] &&
+                    (index_type)threadIdx.x < m_rp.m_tile[0]) {
+                  m_func(Tag(), offset_0, offset_1, offset_2);
+                }
+              }
+            }
+          }
+        }
+      }
+    } else {
+      for (index_type tile_id0 = (index_type)blockIdx.x;
+           tile_id0 < m_rp.m_tile_end[0]; tile_id0 += gridDim.x) {
+        const index_type offset_0 = tile_id0 * m_rp.m_tile[0] +
+                                    (index_type)threadIdx.x +
+                                    (index_type)m_rp.m_lower[0];
+        if (offset_0 < m_rp.m_upper[0] &&
+            (index_type)threadIdx.x < m_rp.m_tile[0]) {
+          for (index_type tile_id1 = (index_type)blockIdx.y;
+               tile_id1 < m_rp.m_tile_end[1]; tile_id1 += gridDim.y) {
+            const index_type offset_1 = tile_id1 * m_rp.m_tile[1] +
+                                        (index_type)threadIdx.y +
+                                        (index_type)m_rp.m_lower[1];
+            if (offset_1 < m_rp.m_upper[1] &&
+                (index_type)threadIdx.y < m_rp.m_tile[1]) {
+              for (index_type tile_id2 = (index_type)blockIdx.z;
+                   tile_id2 < m_rp.m_tile_end[2]; tile_id2 += gridDim.z) {
+                const index_type offset_2 = tile_id2 * m_rp.m_tile[2] +
+                                            (index_type)threadIdx.z +
+                                            (index_type)m_rp.m_lower[2];
+                if (offset_2 < m_rp.m_upper[2] &&
+                    (index_type)threadIdx.z < m_rp.m_tile[2]) {
+                  m_func(Tag(), offset_0, offset_1, offset_2);
                 }
               }
             }
@@ -277,84 +341,72 @@ struct DeviceIterateTile<3,RP,Functor,Tag>
         }
       }
     }
-    else {
-      for ( index_type tile_id0 = (index_type)blockIdx.x; tile_id0 < m_rp.m_tile_end[0]; tile_id0 += gridDim.x ) {
-        const index_type offset_0 = tile_id0*m_rp.m_tile[0] + (index_type)threadIdx.x + (index_type)m_rp.m_lower[0];
-        if ( offset_0 < m_rp.m_upper[0] && (index_type)threadIdx.x < m_rp.m_tile[0] ) {
+  }  // end exec_range
 
-          for ( index_type tile_id1 = (index_type)blockIdx.y; tile_id1 < m_rp.m_tile_end[1]; tile_id1 += gridDim.y ) {
-            const index_type offset_1 = tile_id1*m_rp.m_tile[1] + (index_type)threadIdx.y + (index_type)m_rp.m_lower[1];
-            if ( offset_1 < m_rp.m_upper[1] && (index_type)threadIdx.y < m_rp.m_tile[1] ) {
-
-              for ( index_type tile_id2 = (index_type)blockIdx.z; tile_id2 < m_rp.m_tile_end[2]; tile_id2 += gridDim.z ) {
-                const index_type offset_2 = tile_id2*m_rp.m_tile[2] + (index_type)threadIdx.z + (index_type)m_rp.m_lower[2];
-                if ( offset_2 < m_rp.m_upper[2] && (index_type)threadIdx.z < m_rp.m_tile[2] ) {
-                  m_func(Tag(), offset_0 , offset_1 , offset_2);
-                }
-              }
-            }
-          }
-        }
-      }
-    }
-  } //end exec_range
-
-private:
-  const RP & m_rp;
-  const Functor & m_func;
+ private:
+  const RP& m_rp;
+  const Functor& m_func;
 };
 
-
-//Rank 4
+// Rank 4
 // Specializations for void tag type
-template< typename RP , typename Functor >
-struct DeviceIterateTile<4,RP,Functor,void >
-{
+template <typename RP, typename Functor>
+struct DeviceIterateTile<4, RP, Functor, void> {
   using index_type = typename RP::index_type;
 
-  __device__
-  DeviceIterateTile( const RP & rp_ , const Functor & f_ )
-  : m_rp(rp_)
-  , m_func(f_)
-  {}
+  __device__ DeviceIterateTile(const RP& rp_, const Functor& f_)
+      : m_rp(rp_), m_func(f_) {}
 
   static constexpr index_type max_blocks = 65535;
-  //static constexpr index_type max_blocks = static_cast<index_type>(Kokkos::Impl::CudaTraits::UpperBoundGridCount);
+  // static constexpr index_type max_blocks =
+  // static_cast<index_type>(Kokkos::Impl::CudaTraits::UpperBoundGridCount);
 
-  inline __device__
-  void exec_range() const
-  {
-    //enum { max_blocks = static_cast<index_type>(Kokkos::Impl::CudaTraits::UpperBoundGridCount) };
-    //const index_type max_blocks = static_cast<index_type>( Kokkos::Impl::cuda_internal_maximum_grid_count() );
+  inline __device__ void exec_range() const {
+    // enum { max_blocks =
+    // static_cast<index_type>(Kokkos::Impl::CudaTraits::UpperBoundGridCount) };
+    // const index_type max_blocks = static_cast<index_type>(
+    // Kokkos::Impl::cuda_internal_maximum_grid_count() );
     // LL
     if (RP::inner_direction == RP::Left) {
-      const index_type temp0  =  m_rp.m_tile_end[0];
-      const index_type temp1  =  m_rp.m_tile_end[1];
-      const index_type numbl0 = ( temp0 <= max_blocks ? temp0 : max_blocks ) ;
-      const index_type numbl1 = ( temp0*temp1 > max_blocks ? index_type( max_blocks / numbl0 ) :
-          (  temp1 <= max_blocks ? temp1 : max_blocks ) );
+      const index_type temp0  = m_rp.m_tile_end[0];
+      const index_type temp1  = m_rp.m_tile_end[1];
+      const index_type numbl0 = (temp0 <= max_blocks ? temp0 : max_blocks);
+      const index_type numbl1 =
+          (temp0 * temp1 > max_blocks
+               ? index_type(max_blocks / numbl0)
+               : (temp1 <= max_blocks ? temp1 : max_blocks));
 
       const index_type tile_id0 = (index_type)blockIdx.x % numbl0;
       const index_type tile_id1 = (index_type)blockIdx.x / numbl0;
-      const index_type thr_id0 = (index_type)threadIdx.x % m_rp.m_tile[0];
-      const index_type thr_id1 = (index_type)threadIdx.x / m_rp.m_tile[0];
+      const index_type thr_id0  = (index_type)threadIdx.x % m_rp.m_tile[0];
+      const index_type thr_id1  = (index_type)threadIdx.x / m_rp.m_tile[0];
 
-      for ( index_type tile_id3 = (index_type)blockIdx.z; tile_id3 < m_rp.m_tile_end[3]; tile_id3 += gridDim.z ) {
-        const index_type offset_3 = tile_id3*m_rp.m_tile[3] + (index_type)threadIdx.z + (index_type)m_rp.m_lower[3];
-        if ( offset_3 < m_rp.m_upper[3] && (index_type)threadIdx.z < m_rp.m_tile[3] ) {
-
-          for ( index_type tile_id2 = (index_type)blockIdx.y; tile_id2 < m_rp.m_tile_end[2]; tile_id2 += gridDim.y ) {
-            const index_type offset_2 = tile_id2*m_rp.m_tile[2] + (index_type)threadIdx.y + (index_type)m_rp.m_lower[2];
-            if ( offset_2 < m_rp.m_upper[2] && (index_type)threadIdx.y < m_rp.m_tile[2] ) {
-
-              for ( index_type j = tile_id1 ; j < m_rp.m_tile_end[1]; j += numbl1 ) {
-                const index_type offset_1 = j*m_rp.m_tile[1] + thr_id1 + (index_type)m_rp.m_lower[1];
-                if ( offset_1 < m_rp.m_upper[1] && thr_id1 < m_rp.m_tile[1] ) {
-
-                  for ( index_type i = tile_id0 ; i < m_rp.m_tile_end[0]; i += numbl0 ) {
-                    const index_type offset_0 = i*m_rp.m_tile[0] + thr_id0 + (index_type)m_rp.m_lower[0];
-                    if ( offset_0 < m_rp.m_upper[0] && thr_id0 < m_rp.m_tile[0] ) {
-                      m_func(offset_0 , offset_1 , offset_2 , offset_3);
+      for (index_type tile_id3 = (index_type)blockIdx.z;
+           tile_id3 < m_rp.m_tile_end[3]; tile_id3 += gridDim.z) {
+        const index_type offset_3 = tile_id3 * m_rp.m_tile[3] +
+                                    (index_type)threadIdx.z +
+                                    (index_type)m_rp.m_lower[3];
+        if (offset_3 < m_rp.m_upper[3] &&
+            (index_type)threadIdx.z < m_rp.m_tile[3]) {
+          for (index_type tile_id2 = (index_type)blockIdx.y;
+               tile_id2 < m_rp.m_tile_end[2]; tile_id2 += gridDim.y) {
+            const index_type offset_2 = tile_id2 * m_rp.m_tile[2] +
+                                        (index_type)threadIdx.y +
+                                        (index_type)m_rp.m_lower[2];
+            if (offset_2 < m_rp.m_upper[2] &&
+                (index_type)threadIdx.y < m_rp.m_tile[2]) {
+              for (index_type j = tile_id1; j < m_rp.m_tile_end[1];
+                   j += numbl1) {
+                const index_type offset_1 =
+                    j * m_rp.m_tile[1] + thr_id1 + (index_type)m_rp.m_lower[1];
+                if (offset_1 < m_rp.m_upper[1] && thr_id1 < m_rp.m_tile[1]) {
+                  for (index_type i = tile_id0; i < m_rp.m_tile_end[0];
+                       i += numbl0) {
+                    const index_type offset_0 = i * m_rp.m_tile[0] + thr_id0 +
+                                                (index_type)m_rp.m_lower[0];
+                    if (offset_0 < m_rp.m_upper[0] &&
+                        thr_id0 < m_rp.m_tile[0]) {
+                      m_func(offset_0, offset_1, offset_2, offset_3);
                     }
                   }
                 }
@@ -366,33 +418,42 @@ struct DeviceIterateTile<4,RP,Functor,void >
     }
     // LR
     else {
-      const index_type temp0  =  m_rp.m_tile_end[0];
-      const index_type temp1  =  m_rp.m_tile_end[1];
-      const index_type numbl1 = ( temp1 <= max_blocks ? temp1 : max_blocks ) ;
-      const index_type numbl0 = ( temp0*temp1 > max_blocks ? index_type( max_blocks / numbl1 ) :
-          ( temp0 <= max_blocks ? temp0 : max_blocks ) );
+      const index_type temp0  = m_rp.m_tile_end[0];
+      const index_type temp1  = m_rp.m_tile_end[1];
+      const index_type numbl1 = (temp1 <= max_blocks ? temp1 : max_blocks);
+      const index_type numbl0 =
+          (temp0 * temp1 > max_blocks
+               ? index_type(max_blocks / numbl1)
+               : (temp0 <= max_blocks ? temp0 : max_blocks));
 
       const index_type tile_id0 = (index_type)blockIdx.x / numbl1;
       const index_type tile_id1 = (index_type)blockIdx.x % numbl1;
-      const index_type thr_id0 = (index_type)threadIdx.x / m_rp.m_tile[1];
-      const index_type thr_id1 = (index_type)threadIdx.x % m_rp.m_tile[1];
+      const index_type thr_id0  = (index_type)threadIdx.x / m_rp.m_tile[1];
+      const index_type thr_id1  = (index_type)threadIdx.x % m_rp.m_tile[1];
 
-      for ( index_type i = tile_id0; i < m_rp.m_tile_end[0]; i += numbl0 ) {
-        const index_type offset_0 = i*m_rp.m_tile[0] + thr_id0 + (index_type)m_rp.m_lower[0];
-        if ( offset_0 < m_rp.m_upper[0] && thr_id0 < m_rp.m_tile[0] ) {
-
-          for ( index_type j = tile_id1; j < m_rp.m_tile_end[1]; j += numbl1 ) {
-            const index_type offset_1 = j*m_rp.m_tile[1] + thr_id1 + (index_type)m_rp.m_lower[1];
-            if ( offset_1 < m_rp.m_upper[1] && thr_id1 < m_rp.m_tile[1] ) {
-
-              for ( index_type tile_id2 = (index_type)blockIdx.y; tile_id2 < m_rp.m_tile_end[2]; tile_id2 += gridDim.y ) {
-                const index_type offset_2 = tile_id2*m_rp.m_tile[2] + (index_type)threadIdx.y + (index_type)m_rp.m_lower[2];
-                if ( offset_2 < m_rp.m_upper[2] && (index_type)threadIdx.y < m_rp.m_tile[2] ) {
-
-                  for ( index_type tile_id3 = (index_type)blockIdx.z; tile_id3 < m_rp.m_tile_end[3]; tile_id3 += gridDim.z ) {
-                    const index_type offset_3 = tile_id3*m_rp.m_tile[3] + (index_type)threadIdx.z + (index_type)m_rp.m_lower[3];
-                    if ( offset_3 < m_rp.m_upper[3] && (index_type)threadIdx.z < m_rp.m_tile[3] ) {
-                      m_func(offset_0 , offset_1 , offset_2 , offset_3);
+      for (index_type i = tile_id0; i < m_rp.m_tile_end[0]; i += numbl0) {
+        const index_type offset_0 =
+            i * m_rp.m_tile[0] + thr_id0 + (index_type)m_rp.m_lower[0];
+        if (offset_0 < m_rp.m_upper[0] && thr_id0 < m_rp.m_tile[0]) {
+          for (index_type j = tile_id1; j < m_rp.m_tile_end[1]; j += numbl1) {
+            const index_type offset_1 =
+                j * m_rp.m_tile[1] + thr_id1 + (index_type)m_rp.m_lower[1];
+            if (offset_1 < m_rp.m_upper[1] && thr_id1 < m_rp.m_tile[1]) {
+              for (index_type tile_id2 = (index_type)blockIdx.y;
+                   tile_id2 < m_rp.m_tile_end[2]; tile_id2 += gridDim.y) {
+                const index_type offset_2 = tile_id2 * m_rp.m_tile[2] +
+                                            (index_type)threadIdx.y +
+                                            (index_type)m_rp.m_lower[2];
+                if (offset_2 < m_rp.m_upper[2] &&
+                    (index_type)threadIdx.y < m_rp.m_tile[2]) {
+                  for (index_type tile_id3 = (index_type)blockIdx.z;
+                       tile_id3 < m_rp.m_tile_end[3]; tile_id3 += gridDim.z) {
+                    const index_type offset_3 = tile_id3 * m_rp.m_tile[3] +
+                                                (index_type)threadIdx.z +
+                                                (index_type)m_rp.m_lower[3];
+                    if (offset_3 < m_rp.m_upper[3] &&
+                        (index_type)threadIdx.z < m_rp.m_tile[3]) {
+                      m_func(offset_0, offset_1, offset_2, offset_3);
                     }
                   }
                 }
@@ -402,61 +463,70 @@ struct DeviceIterateTile<4,RP,Functor,void >
         }
       }
     }
-  } //end exec_range
+  }  // end exec_range
 
-private:
-  const RP & m_rp;
-  const Functor & m_func;
+ private:
+  const RP& m_rp;
+  const Functor& m_func;
 };
 
 // Specializations for void tag type
-template< typename RP , typename Functor , typename Tag >
-struct DeviceIterateTile<4,RP,Functor,Tag>
-{
+template <typename RP, typename Functor, typename Tag>
+struct DeviceIterateTile<4, RP, Functor, Tag> {
   using index_type = typename RP::index_type;
 
-  inline __device__
-  DeviceIterateTile( const RP & rp_ , const Functor & f_ )
-  : m_rp(rp_)
-  , m_func(f_)
-  {}
+  inline __device__ DeviceIterateTile(const RP& rp_, const Functor& f_)
+      : m_rp(rp_), m_func(f_) {}
 
   static constexpr index_type max_blocks = 65535;
-  //static constexpr index_type max_blocks = static_cast<index_type>(Kokkos::Impl::CudaTraits::UpperBoundGridCount);
+  // static constexpr index_type max_blocks =
+  // static_cast<index_type>(Kokkos::Impl::CudaTraits::UpperBoundGridCount);
 
-  inline __device__
-  void exec_range() const
-  {
-    //enum { max_blocks = static_cast<index_type>(Kokkos::Impl::CudaTraits::UpperBoundGridCount) };
-    //const index_type max_blocks = static_cast<index_type>( Kokkos::Impl::cuda_internal_maximum_grid_count() );
+  inline __device__ void exec_range() const {
+    // enum { max_blocks =
+    // static_cast<index_type>(Kokkos::Impl::CudaTraits::UpperBoundGridCount) };
+    // const index_type max_blocks = static_cast<index_type>(
+    // Kokkos::Impl::cuda_internal_maximum_grid_count() );
     if (RP::inner_direction == RP::Left) {
-      const index_type temp0  =  m_rp.m_tile_end[0];
-      const index_type temp1  =  m_rp.m_tile_end[1];
-      const index_type numbl0 = ( temp0 <= max_blocks ? temp0 : max_blocks ) ;
-      const index_type numbl1 = ( temp0*temp1 > max_blocks ? index_type( max_blocks / numbl0 ) :
-          (  temp1 <= max_blocks ? temp1 : max_blocks ) );
+      const index_type temp0  = m_rp.m_tile_end[0];
+      const index_type temp1  = m_rp.m_tile_end[1];
+      const index_type numbl0 = (temp0 <= max_blocks ? temp0 : max_blocks);
+      const index_type numbl1 =
+          (temp0 * temp1 > max_blocks
+               ? index_type(max_blocks / numbl0)
+               : (temp1 <= max_blocks ? temp1 : max_blocks));
 
       const index_type tile_id0 = (index_type)blockIdx.x % numbl0;
       const index_type tile_id1 = (index_type)blockIdx.x / numbl0;
-      const index_type thr_id0 = (index_type)threadIdx.x % m_rp.m_tile[0];
-      const index_type thr_id1 = (index_type)threadIdx.x / m_rp.m_tile[0];
+      const index_type thr_id0  = (index_type)threadIdx.x % m_rp.m_tile[0];
+      const index_type thr_id1  = (index_type)threadIdx.x / m_rp.m_tile[0];
 
-      for ( index_type tile_id3 = (index_type)blockIdx.z; tile_id3 < m_rp.m_tile_end[3]; tile_id3 += gridDim.z ) {
-        const index_type offset_3 = tile_id3*m_rp.m_tile[3] + (index_type)threadIdx.z + (index_type)m_rp.m_lower[3];
-        if ( offset_3 < m_rp.m_upper[3] && (index_type)threadIdx.z < m_rp.m_tile[3] ) {
-
-          for ( index_type tile_id2 = (index_type)blockIdx.y; tile_id2 < m_rp.m_tile_end[2]; tile_id2 += gridDim.y ) {
-            const index_type offset_2 = tile_id2*m_rp.m_tile[2] + (index_type)threadIdx.y + (index_type)m_rp.m_lower[2];
-            if ( offset_2 < m_rp.m_upper[2] && (index_type)threadIdx.y < m_rp.m_tile[2] ) {
-
-              for ( index_type j = tile_id1; j < m_rp.m_tile_end[1]; j += numbl1 ) {
-                const index_type offset_1 = j*m_rp.m_tile[1] + thr_id1 + (index_type)m_rp.m_lower[1];
-                if ( offset_1 < m_rp.m_upper[1] && thr_id1 < m_rp.m_tile[1] ) {
-
-                  for ( index_type i = tile_id0; i < m_rp.m_tile_end[0]; i += numbl0 ) {
-                    const index_type offset_0 = i*m_rp.m_tile[0] + thr_id0 + (index_type)m_rp.m_lower[0];
-                    if ( offset_0 < m_rp.m_upper[0] && thr_id0 < m_rp.m_tile[0] ) {
-                      m_func(Tag(), offset_0 , offset_1 , offset_2 , offset_3);
+      for (index_type tile_id3 = (index_type)blockIdx.z;
+           tile_id3 < m_rp.m_tile_end[3]; tile_id3 += gridDim.z) {
+        const index_type offset_3 = tile_id3 * m_rp.m_tile[3] +
+                                    (index_type)threadIdx.z +
+                                    (index_type)m_rp.m_lower[3];
+        if (offset_3 < m_rp.m_upper[3] &&
+            (index_type)threadIdx.z < m_rp.m_tile[3]) {
+          for (index_type tile_id2 = (index_type)blockIdx.y;
+               tile_id2 < m_rp.m_tile_end[2]; tile_id2 += gridDim.y) {
+            const index_type offset_2 = tile_id2 * m_rp.m_tile[2] +
+                                        (index_type)threadIdx.y +
+                                        (index_type)m_rp.m_lower[2];
+            if (offset_2 < m_rp.m_upper[2] &&
+                (index_type)threadIdx.y < m_rp.m_tile[2]) {
+              for (index_type j = tile_id1; j < m_rp.m_tile_end[1];
+                   j += numbl1) {
+                const index_type offset_1 =
+                    j * m_rp.m_tile[1] + thr_id1 + (index_type)m_rp.m_lower[1];
+                if (offset_1 < m_rp.m_upper[1] && thr_id1 < m_rp.m_tile[1]) {
+                  for (index_type i = tile_id0; i < m_rp.m_tile_end[0];
+                       i += numbl0) {
+                    const index_type offset_0 = i * m_rp.m_tile[0] + thr_id0 +
+                                                (index_type)m_rp.m_lower[0];
+                    if (offset_0 < m_rp.m_upper[0] &&
+                        thr_id0 < m_rp.m_tile[0]) {
+                      m_func(Tag(), offset_0, offset_1, offset_2, offset_3);
                     }
                   }
                 }
@@ -465,35 +535,43 @@ struct DeviceIterateTile<4,RP,Functor,Tag>
           }
         }
       }
-    }
-    else {
-      const index_type temp0  =  m_rp.m_tile_end[0];
-      const index_type temp1  =  m_rp.m_tile_end[1];
-      const index_type numbl1 = ( temp1 <= max_blocks ? temp1 : max_blocks ) ;
-      const index_type numbl0 = ( temp0*temp1 > max_blocks ? index_type( max_blocks / numbl1 ) :
-          ( temp0 <= max_blocks ? temp0 : max_blocks ) );
+    } else {
+      const index_type temp0  = m_rp.m_tile_end[0];
+      const index_type temp1  = m_rp.m_tile_end[1];
+      const index_type numbl1 = (temp1 <= max_blocks ? temp1 : max_blocks);
+      const index_type numbl0 =
+          (temp0 * temp1 > max_blocks
+               ? index_type(max_blocks / numbl1)
+               : (temp0 <= max_blocks ? temp0 : max_blocks));
 
       const index_type tile_id0 = (index_type)blockIdx.x / numbl1;
       const index_type tile_id1 = (index_type)blockIdx.x % numbl1;
-      const index_type thr_id0 = (index_type)threadIdx.x / m_rp.m_tile[1];
-      const index_type thr_id1 = (index_type)threadIdx.x % m_rp.m_tile[1];
+      const index_type thr_id0  = (index_type)threadIdx.x / m_rp.m_tile[1];
+      const index_type thr_id1  = (index_type)threadIdx.x % m_rp.m_tile[1];
 
-      for ( index_type i = tile_id0; i < m_rp.m_tile_end[0]; i += numbl0 ) {
-        const index_type offset_0 = i*m_rp.m_tile[0] + thr_id0 + (index_type)m_rp.m_lower[0];
-        if ( offset_0 < m_rp.m_upper[0] && thr_id0 < m_rp.m_tile[0] ) {
-
-          for ( index_type j = tile_id1; j < m_rp.m_tile_end[1]; j += numbl1 ) {
-            const index_type offset_1 = tile_id1*m_rp.m_tile[1] + thr_id1 + (index_type)m_rp.m_lower[1];
-            if ( offset_1 < m_rp.m_upper[1] && thr_id1 < m_rp.m_tile[1] ) {
-
-              for ( index_type tile_id2 = (index_type)blockIdx.y; tile_id2 < m_rp.m_tile_end[2]; tile_id2 += gridDim.y ) {
-                const index_type offset_2 = tile_id2*m_rp.m_tile[2] + (index_type)threadIdx.y + (index_type)m_rp.m_lower[2];
-                if ( offset_2 < m_rp.m_upper[2] && (index_type)threadIdx.y < m_rp.m_tile[2] ) {
-
-                  for ( index_type tile_id3 = (index_type)blockIdx.z; tile_id3 < m_rp.m_tile_end[3]; tile_id3 += gridDim.z ) {
-                    const index_type offset_3 = tile_id3*m_rp.m_tile[3] + (index_type)threadIdx.z + (index_type)m_rp.m_lower[3];
-                    if ( offset_3 < m_rp.m_upper[3] && (index_type)threadIdx.z < m_rp.m_tile[3] ) {
-                      m_func(Tag() , offset_0 , offset_1 , offset_2 , offset_3);
+      for (index_type i = tile_id0; i < m_rp.m_tile_end[0]; i += numbl0) {
+        const index_type offset_0 =
+            i * m_rp.m_tile[0] + thr_id0 + (index_type)m_rp.m_lower[0];
+        if (offset_0 < m_rp.m_upper[0] && thr_id0 < m_rp.m_tile[0]) {
+          for (index_type j = tile_id1; j < m_rp.m_tile_end[1]; j += numbl1) {
+            const index_type offset_1 = tile_id1 * m_rp.m_tile[1] + thr_id1 +
+                                        (index_type)m_rp.m_lower[1];
+            if (offset_1 < m_rp.m_upper[1] && thr_id1 < m_rp.m_tile[1]) {
+              for (index_type tile_id2 = (index_type)blockIdx.y;
+                   tile_id2 < m_rp.m_tile_end[2]; tile_id2 += gridDim.y) {
+                const index_type offset_2 = tile_id2 * m_rp.m_tile[2] +
+                                            (index_type)threadIdx.y +
+                                            (index_type)m_rp.m_lower[2];
+                if (offset_2 < m_rp.m_upper[2] &&
+                    (index_type)threadIdx.y < m_rp.m_tile[2]) {
+                  for (index_type tile_id3 = (index_type)blockIdx.z;
+                       tile_id3 < m_rp.m_tile_end[3]; tile_id3 += gridDim.z) {
+                    const index_type offset_3 = tile_id3 * m_rp.m_tile[3] +
+                                                (index_type)threadIdx.z +
+                                                (index_type)m_rp.m_lower[3];
+                    if (offset_3 < m_rp.m_upper[3] &&
+                        (index_type)threadIdx.z < m_rp.m_tile[3]) {
+                      m_func(Tag(), offset_0, offset_1, offset_2, offset_3);
                     }
                   }
                 }
@@ -503,80 +581,90 @@ struct DeviceIterateTile<4,RP,Functor,Tag>
         }
       }
     }
-  } //end exec_range
+  }  // end exec_range
 
-private:
-  const RP & m_rp;
-  const Functor & m_func;
+ private:
+  const RP& m_rp;
+  const Functor& m_func;
 };
 
-
-//Rank 5
+// Rank 5
 // Specializations for void tag type
-template< typename RP , typename Functor >
-struct DeviceIterateTile<5,RP,Functor,void >
-{
+template <typename RP, typename Functor>
+struct DeviceIterateTile<5, RP, Functor, void> {
   using index_type = typename RP::index_type;
 
-  __device__
-  DeviceIterateTile( const RP & rp_ , const Functor & f_ )
-  : m_rp(rp_)
-  , m_func(f_)
-  {}
+  __device__ DeviceIterateTile(const RP& rp_, const Functor& f_)
+      : m_rp(rp_), m_func(f_) {}
 
   static constexpr index_type max_blocks = 65535;
-  //static constexpr index_type max_blocks = static_cast<index_type>(Kokkos::Impl::CudaTraits::UpperBoundGridCount);
+  // static constexpr index_type max_blocks =
+  // static_cast<index_type>(Kokkos::Impl::CudaTraits::UpperBoundGridCount);
 
-  inline __device__
-  void exec_range() const
-  {
-    //enum { max_blocks = static_cast<index_type>(Kokkos::Impl::CudaTraits::UpperBoundGridCount) };
-    //const index_type max_blocks = static_cast<index_type>( Kokkos::Impl::cuda_internal_maximum_grid_count() );
+  inline __device__ void exec_range() const {
+    // enum { max_blocks =
+    // static_cast<index_type>(Kokkos::Impl::CudaTraits::UpperBoundGridCount) };
+    // const index_type max_blocks = static_cast<index_type>(
+    // Kokkos::Impl::cuda_internal_maximum_grid_count() );
     // LL
     if (RP::inner_direction == RP::Left) {
-
-      index_type temp0  =  m_rp.m_tile_end[0];
-      index_type temp1  =  m_rp.m_tile_end[1];
-      const index_type numbl0 = ( temp0 <= max_blocks ? temp0 : max_blocks ) ;
-      const index_type numbl1 = ( temp0*temp1 > max_blocks ? index_type( max_blocks / numbl0 ) :
-          (  temp1 <= max_blocks ? temp1 : max_blocks ) );
+      index_type temp0        = m_rp.m_tile_end[0];
+      index_type temp1        = m_rp.m_tile_end[1];
+      const index_type numbl0 = (temp0 <= max_blocks ? temp0 : max_blocks);
+      const index_type numbl1 =
+          (temp0 * temp1 > max_blocks
+               ? index_type(max_blocks / numbl0)
+               : (temp1 <= max_blocks ? temp1 : max_blocks));
 
       const index_type tile_id0 = (index_type)blockIdx.x % numbl0;
       const index_type tile_id1 = (index_type)blockIdx.x / numbl0;
-      const index_type thr_id0 = (index_type)threadIdx.x % m_rp.m_tile[0];
-      const index_type thr_id1 = (index_type)threadIdx.x / m_rp.m_tile[0];
+      const index_type thr_id0  = (index_type)threadIdx.x % m_rp.m_tile[0];
+      const index_type thr_id1  = (index_type)threadIdx.x / m_rp.m_tile[0];
 
-      temp0  =  m_rp.m_tile_end[2];
-      temp1  =  m_rp.m_tile_end[3];
-      const index_type numbl2 = ( temp0 <= max_blocks ? temp0 : max_blocks ) ;
-      const index_type numbl3 = ( temp0*temp1 > max_blocks ? index_type( max_blocks / numbl2 ) :
-          (  temp1 <= max_blocks ? temp1 : max_blocks ) );
+      temp0                   = m_rp.m_tile_end[2];
+      temp1                   = m_rp.m_tile_end[3];
+      const index_type numbl2 = (temp0 <= max_blocks ? temp0 : max_blocks);
+      const index_type numbl3 =
+          (temp0 * temp1 > max_blocks
+               ? index_type(max_blocks / numbl2)
+               : (temp1 <= max_blocks ? temp1 : max_blocks));
 
       const index_type tile_id2 = (index_type)blockIdx.y % numbl2;
       const index_type tile_id3 = (index_type)blockIdx.y / numbl2;
-      const index_type thr_id2 = (index_type)threadIdx.y % m_rp.m_tile[2];
-      const index_type thr_id3 = (index_type)threadIdx.y / m_rp.m_tile[2];
+      const index_type thr_id2  = (index_type)threadIdx.y % m_rp.m_tile[2];
+      const index_type thr_id3  = (index_type)threadIdx.y / m_rp.m_tile[2];
 
-      for ( index_type tile_id4 = (index_type)blockIdx.z; tile_id4 < m_rp.m_tile_end[4]; tile_id4 += gridDim.z ) {
-        const index_type offset_4 = tile_id4*m_rp.m_tile[4] + (index_type)threadIdx.z + (index_type)m_rp.m_lower[4];
-        if ( offset_4 < m_rp.m_upper[4] && (index_type)threadIdx.z < m_rp.m_tile[4] ) {
-
-          for ( index_type l = tile_id3; l < m_rp.m_tile_end[3]; l += numbl3 ) {
-            const index_type offset_3 = l*m_rp.m_tile[3] + thr_id3 + (index_type)m_rp.m_lower[3];
-            if ( offset_3 < m_rp.m_upper[3] && thr_id3 < m_rp.m_tile[3] ) {
-
-              for ( index_type k = tile_id2; k < m_rp.m_tile_end[2]; k += numbl2 ) {
-                const index_type offset_2 = k*m_rp.m_tile[2] + thr_id2 + (index_type)m_rp.m_lower[2];
-                if ( offset_2 < m_rp.m_upper[2] && thr_id2 < m_rp.m_tile[2] ) {
-
-                  for ( index_type j = tile_id1 ; j < m_rp.m_tile_end[1]; j += numbl1 ) {
-                    const index_type offset_1 = j*m_rp.m_tile[1] + thr_id1 + (index_type)m_rp.m_lower[1];
-                    if ( offset_1 < m_rp.m_upper[1] && thr_id1 < m_rp.m_tile[1] ) {
-
-                      for ( index_type i = tile_id0 ; i < m_rp.m_tile_end[0]; i += numbl0 ) {
-                        const index_type offset_0 = i*m_rp.m_tile[0] + thr_id0 + (index_type)m_rp.m_lower[0];
-                        if ( offset_0 < m_rp.m_upper[0] && thr_id0 < m_rp.m_tile[0] ) {
-                          m_func(offset_0 , offset_1 , offset_2 , offset_3, offset_4);
+      for (index_type tile_id4 = (index_type)blockIdx.z;
+           tile_id4 < m_rp.m_tile_end[4]; tile_id4 += gridDim.z) {
+        const index_type offset_4 = tile_id4 * m_rp.m_tile[4] +
+                                    (index_type)threadIdx.z +
+                                    (index_type)m_rp.m_lower[4];
+        if (offset_4 < m_rp.m_upper[4] &&
+            (index_type)threadIdx.z < m_rp.m_tile[4]) {
+          for (index_type l = tile_id3; l < m_rp.m_tile_end[3]; l += numbl3) {
+            const index_type offset_3 =
+                l * m_rp.m_tile[3] + thr_id3 + (index_type)m_rp.m_lower[3];
+            if (offset_3 < m_rp.m_upper[3] && thr_id3 < m_rp.m_tile[3]) {
+              for (index_type k = tile_id2; k < m_rp.m_tile_end[2];
+                   k += numbl2) {
+                const index_type offset_2 =
+                    k * m_rp.m_tile[2] + thr_id2 + (index_type)m_rp.m_lower[2];
+                if (offset_2 < m_rp.m_upper[2] && thr_id2 < m_rp.m_tile[2]) {
+                  for (index_type j = tile_id1; j < m_rp.m_tile_end[1];
+                       j += numbl1) {
+                    const index_type offset_1 = j * m_rp.m_tile[1] + thr_id1 +
+                                                (index_type)m_rp.m_lower[1];
+                    if (offset_1 < m_rp.m_upper[1] &&
+                        thr_id1 < m_rp.m_tile[1]) {
+                      for (index_type i = tile_id0; i < m_rp.m_tile_end[0];
+                           i += numbl0) {
+                        const index_type offset_0 = i * m_rp.m_tile[0] +
+                                                    thr_id0 +
+                                                    (index_type)m_rp.m_lower[0];
+                        if (offset_0 < m_rp.m_upper[0] &&
+                            thr_id0 < m_rp.m_tile[0]) {
+                          m_func(offset_0, offset_1, offset_2, offset_3,
+                                 offset_4);
                         }
                       }
                     }
@@ -590,48 +678,61 @@ struct DeviceIterateTile<5,RP,Functor,void >
     }
     // LR
     else {
-      index_type temp0  =  m_rp.m_tile_end[0];
-      index_type temp1  =  m_rp.m_tile_end[1];
-      const index_type numbl1 = ( temp1 <= max_blocks ? temp1 : max_blocks ) ;
-      const index_type numbl0 = ( temp0*temp1 > max_blocks ? index_type( max_blocks / numbl1 ) :
-          ( temp0 <= max_blocks ? temp0 : max_blocks ) );
+      index_type temp0        = m_rp.m_tile_end[0];
+      index_type temp1        = m_rp.m_tile_end[1];
+      const index_type numbl1 = (temp1 <= max_blocks ? temp1 : max_blocks);
+      const index_type numbl0 =
+          (temp0 * temp1 > max_blocks
+               ? index_type(max_blocks / numbl1)
+               : (temp0 <= max_blocks ? temp0 : max_blocks));
 
       const index_type tile_id0 = (index_type)blockIdx.x / numbl1;
       const index_type tile_id1 = (index_type)blockIdx.x % numbl1;
-      const index_type thr_id0 = (index_type)threadIdx.x / m_rp.m_tile[1];
-      const index_type thr_id1 = (index_type)threadIdx.x % m_rp.m_tile[1];
+      const index_type thr_id0  = (index_type)threadIdx.x / m_rp.m_tile[1];
+      const index_type thr_id1  = (index_type)threadIdx.x % m_rp.m_tile[1];
 
-      temp0  =  m_rp.m_tile_end[2];
-      temp1  =  m_rp.m_tile_end[3];
-      const index_type numbl3 = ( temp1 <= max_blocks ? temp1 : max_blocks ) ;
-      const index_type numbl2 = ( temp0*temp1 > max_blocks ? index_type( max_blocks / numbl3 ) :
-          (  temp0 <= max_blocks ? temp0 : max_blocks ) );
+      temp0                   = m_rp.m_tile_end[2];
+      temp1                   = m_rp.m_tile_end[3];
+      const index_type numbl3 = (temp1 <= max_blocks ? temp1 : max_blocks);
+      const index_type numbl2 =
+          (temp0 * temp1 > max_blocks
+               ? index_type(max_blocks / numbl3)
+               : (temp0 <= max_blocks ? temp0 : max_blocks));
 
       const index_type tile_id2 = (index_type)blockIdx.y / numbl3;
       const index_type tile_id3 = (index_type)blockIdx.y % numbl3;
-      const index_type thr_id2 = (index_type)threadIdx.y / m_rp.m_tile[3];
-      const index_type thr_id3 = (index_type)threadIdx.y % m_rp.m_tile[3];
+      const index_type thr_id2  = (index_type)threadIdx.y / m_rp.m_tile[3];
+      const index_type thr_id3  = (index_type)threadIdx.y % m_rp.m_tile[3];
 
-      for ( index_type i = tile_id0; i < m_rp.m_tile_end[0]; i += numbl0 ) {
-        const index_type offset_0 = i*m_rp.m_tile[0] + thr_id0 + (index_type)m_rp.m_lower[0];
-        if ( offset_0 < m_rp.m_upper[0] && thr_id0 < m_rp.m_tile[0] ) {
-
-          for ( index_type j = tile_id1; j < m_rp.m_tile_end[1]; j += numbl1 ) {
-            const index_type offset_1 = j*m_rp.m_tile[1] + thr_id1 + (index_type)m_rp.m_lower[1];
-            if ( offset_1 < m_rp.m_upper[1] && thr_id1 < m_rp.m_tile[1] ) {
-
-              for ( index_type k = tile_id2; k < m_rp.m_tile_end[2]; k += numbl2 ) {
-                const index_type offset_2 = k*m_rp.m_tile[2] + thr_id2 + (index_type)m_rp.m_lower[2];
-                if ( offset_2 < m_rp.m_upper[2] && thr_id2 < m_rp.m_tile[2] ) {
-
-                  for ( index_type l = tile_id3; l < m_rp.m_tile_end[3]; l += numbl3 ) {
-                    const index_type offset_3 = l*m_rp.m_tile[3] + thr_id3 + (index_type)m_rp.m_lower[3];
-                    if ( offset_3 < m_rp.m_upper[3] && thr_id3 < m_rp.m_tile[3] ) {
-
-                      for ( index_type tile_id4 = (index_type)blockIdx.z; tile_id4 < m_rp.m_tile_end[4]; tile_id4 += gridDim.z ) {
-                        const index_type offset_4 = tile_id4*m_rp.m_tile[4] + (index_type)threadIdx.z + (index_type)m_rp.m_lower[4];
-                        if ( offset_4 < m_rp.m_upper[4] && (index_type)threadIdx.z < m_rp.m_tile[4] ) {
-                          m_func(offset_0 , offset_1 , offset_2 , offset_3 , offset_4);
+      for (index_type i = tile_id0; i < m_rp.m_tile_end[0]; i += numbl0) {
+        const index_type offset_0 =
+            i * m_rp.m_tile[0] + thr_id0 + (index_type)m_rp.m_lower[0];
+        if (offset_0 < m_rp.m_upper[0] && thr_id0 < m_rp.m_tile[0]) {
+          for (index_type j = tile_id1; j < m_rp.m_tile_end[1]; j += numbl1) {
+            const index_type offset_1 =
+                j * m_rp.m_tile[1] + thr_id1 + (index_type)m_rp.m_lower[1];
+            if (offset_1 < m_rp.m_upper[1] && thr_id1 < m_rp.m_tile[1]) {
+              for (index_type k = tile_id2; k < m_rp.m_tile_end[2];
+                   k += numbl2) {
+                const index_type offset_2 =
+                    k * m_rp.m_tile[2] + thr_id2 + (index_type)m_rp.m_lower[2];
+                if (offset_2 < m_rp.m_upper[2] && thr_id2 < m_rp.m_tile[2]) {
+                  for (index_type l = tile_id3; l < m_rp.m_tile_end[3];
+                       l += numbl3) {
+                    const index_type offset_3 = l * m_rp.m_tile[3] + thr_id3 +
+                                                (index_type)m_rp.m_lower[3];
+                    if (offset_3 < m_rp.m_upper[3] &&
+                        thr_id3 < m_rp.m_tile[3]) {
+                      for (index_type tile_id4 = (index_type)blockIdx.z;
+                           tile_id4 < m_rp.m_tile_end[4];
+                           tile_id4 += gridDim.z) {
+                        const index_type offset_4 = tile_id4 * m_rp.m_tile[4] +
+                                                    (index_type)threadIdx.z +
+                                                    (index_type)m_rp.m_lower[4];
+                        if (offset_4 < m_rp.m_upper[4] &&
+                            (index_type)threadIdx.z < m_rp.m_tile[4]) {
+                          m_func(offset_0, offset_1, offset_2, offset_3,
+                                 offset_4);
                         }
                       }
                     }
@@ -643,77 +744,89 @@ struct DeviceIterateTile<5,RP,Functor,void >
         }
       }
     }
-  } //end exec_range
+  }  // end exec_range
 
-private:
-  const RP & m_rp;
-  const Functor & m_func;
+ private:
+  const RP& m_rp;
+  const Functor& m_func;
 };
 
 // Specializations for tag type
-template< typename RP , typename Functor , typename Tag >
-struct DeviceIterateTile<5,RP,Functor,Tag>
-{
+template <typename RP, typename Functor, typename Tag>
+struct DeviceIterateTile<5, RP, Functor, Tag> {
   using index_type = typename RP::index_type;
 
-  __device__
-  DeviceIterateTile( const RP & rp_ , const Functor & f_ )
-  : m_rp(rp_)
-  , m_func(f_)
-  {}
+  __device__ DeviceIterateTile(const RP& rp_, const Functor& f_)
+      : m_rp(rp_), m_func(f_) {}
 
   static constexpr index_type max_blocks = 65535;
-  //static constexpr index_type max_blocks = static_cast<index_type>(Kokkos::Impl::CudaTraits::UpperBoundGridCount);
+  // static constexpr index_type max_blocks =
+  // static_cast<index_type>(Kokkos::Impl::CudaTraits::UpperBoundGridCount);
 
-  inline __device__
-  void exec_range() const
-  {
-    //enum { max_blocks = static_cast<index_type>(Kokkos::Impl::CudaTraits::UpperBoundGridCount) };
-    //const index_type max_blocks = static_cast<index_type>( Kokkos::Impl::cuda_internal_maximum_grid_count() );
+  inline __device__ void exec_range() const {
+    // enum { max_blocks =
+    // static_cast<index_type>(Kokkos::Impl::CudaTraits::UpperBoundGridCount) };
+    // const index_type max_blocks = static_cast<index_type>(
+    // Kokkos::Impl::cuda_internal_maximum_grid_count() );
     // LL
     if (RP::inner_direction == RP::Left) {
-      index_type temp0  =  m_rp.m_tile_end[0];
-      index_type temp1  =  m_rp.m_tile_end[1];
-      const index_type numbl0 = ( temp0 <= max_blocks ? temp0 : max_blocks ) ;
-      const index_type numbl1 = ( temp0*temp1 > max_blocks ? index_type( max_blocks / numbl0 ) :
-          (  temp1 <= max_blocks ? temp1 : max_blocks ) );
+      index_type temp0        = m_rp.m_tile_end[0];
+      index_type temp1        = m_rp.m_tile_end[1];
+      const index_type numbl0 = (temp0 <= max_blocks ? temp0 : max_blocks);
+      const index_type numbl1 =
+          (temp0 * temp1 > max_blocks
+               ? index_type(max_blocks / numbl0)
+               : (temp1 <= max_blocks ? temp1 : max_blocks));
 
       const index_type tile_id0 = (index_type)blockIdx.x % numbl0;
       const index_type tile_id1 = (index_type)blockIdx.x / numbl0;
-      const index_type thr_id0 = (index_type)threadIdx.x % m_rp.m_tile[0];
-      const index_type thr_id1 = (index_type)threadIdx.x / m_rp.m_tile[0];
+      const index_type thr_id0  = (index_type)threadIdx.x % m_rp.m_tile[0];
+      const index_type thr_id1  = (index_type)threadIdx.x / m_rp.m_tile[0];
 
-      temp0  =  m_rp.m_tile_end[2];
-      temp1  =  m_rp.m_tile_end[3];
-      const index_type numbl2 = ( temp0 <= max_blocks ? temp0 : max_blocks ) ;
-      const index_type numbl3 = ( temp0*temp1 > max_blocks ? index_type( max_blocks / numbl2 ) :
-          (  temp1 <= max_blocks ? temp1 : max_blocks ) );
+      temp0                   = m_rp.m_tile_end[2];
+      temp1                   = m_rp.m_tile_end[3];
+      const index_type numbl2 = (temp0 <= max_blocks ? temp0 : max_blocks);
+      const index_type numbl3 =
+          (temp0 * temp1 > max_blocks
+               ? index_type(max_blocks / numbl2)
+               : (temp1 <= max_blocks ? temp1 : max_blocks));
 
       const index_type tile_id2 = (index_type)blockIdx.y % numbl2;
       const index_type tile_id3 = (index_type)blockIdx.y / numbl2;
-      const index_type thr_id2 = (index_type)threadIdx.y % m_rp.m_tile[2];
-      const index_type thr_id3 = (index_type)threadIdx.y / m_rp.m_tile[2];
+      const index_type thr_id2  = (index_type)threadIdx.y % m_rp.m_tile[2];
+      const index_type thr_id3  = (index_type)threadIdx.y / m_rp.m_tile[2];
 
-      for ( index_type tile_id4 = (index_type)blockIdx.z; tile_id4 < m_rp.m_tile_end[4]; tile_id4 += gridDim.z ) {
-        const index_type offset_4 = tile_id4*m_rp.m_tile[4] + (index_type)threadIdx.z + (index_type)m_rp.m_lower[4];
-        if ( offset_4 < m_rp.m_upper[4] && (index_type)threadIdx.z < m_rp.m_tile[4] ) {
-
-          for ( index_type l = tile_id3; l < m_rp.m_tile_end[3]; l += numbl3 ) {
-            const index_type offset_3 = l*m_rp.m_tile[3] + thr_id3 + (index_type)m_rp.m_lower[3];
-            if ( offset_3 < m_rp.m_upper[3] && thr_id3 < m_rp.m_tile[3] ) {
-
-              for ( index_type k = tile_id2; k < m_rp.m_tile_end[2]; k += numbl2 ) {
-                const index_type offset_2 = k*m_rp.m_tile[2] + thr_id2 + (index_type)m_rp.m_lower[2];
-                if ( offset_2 < m_rp.m_upper[2] && thr_id2 < m_rp.m_tile[2] ) {
-
-                  for ( index_type j = tile_id1 ; j < m_rp.m_tile_end[1]; j += numbl1 ) {
-                    const index_type offset_1 = j*m_rp.m_tile[1] + thr_id1 + (index_type)m_rp.m_lower[1];
-                    if ( offset_1 < m_rp.m_upper[1] && thr_id1 < m_rp.m_tile[1] ) {
-
-                      for ( index_type i = tile_id0 ; i < m_rp.m_tile_end[0]; i += numbl0 ) {
-                        const index_type offset_0 = i*m_rp.m_tile[0] + thr_id0 + (index_type)m_rp.m_lower[0];
-                        if ( offset_0 < m_rp.m_upper[0] && thr_id0 < m_rp.m_tile[0] ) {
-                          m_func(Tag() , offset_0 , offset_1 , offset_2 , offset_3, offset_4);
+      for (index_type tile_id4 = (index_type)blockIdx.z;
+           tile_id4 < m_rp.m_tile_end[4]; tile_id4 += gridDim.z) {
+        const index_type offset_4 = tile_id4 * m_rp.m_tile[4] +
+                                    (index_type)threadIdx.z +
+                                    (index_type)m_rp.m_lower[4];
+        if (offset_4 < m_rp.m_upper[4] &&
+            (index_type)threadIdx.z < m_rp.m_tile[4]) {
+          for (index_type l = tile_id3; l < m_rp.m_tile_end[3]; l += numbl3) {
+            const index_type offset_3 =
+                l * m_rp.m_tile[3] + thr_id3 + (index_type)m_rp.m_lower[3];
+            if (offset_3 < m_rp.m_upper[3] && thr_id3 < m_rp.m_tile[3]) {
+              for (index_type k = tile_id2; k < m_rp.m_tile_end[2];
+                   k += numbl2) {
+                const index_type offset_2 =
+                    k * m_rp.m_tile[2] + thr_id2 + (index_type)m_rp.m_lower[2];
+                if (offset_2 < m_rp.m_upper[2] && thr_id2 < m_rp.m_tile[2]) {
+                  for (index_type j = tile_id1; j < m_rp.m_tile_end[1];
+                       j += numbl1) {
+                    const index_type offset_1 = j * m_rp.m_tile[1] + thr_id1 +
+                                                (index_type)m_rp.m_lower[1];
+                    if (offset_1 < m_rp.m_upper[1] &&
+                        thr_id1 < m_rp.m_tile[1]) {
+                      for (index_type i = tile_id0; i < m_rp.m_tile_end[0];
+                           i += numbl0) {
+                        const index_type offset_0 = i * m_rp.m_tile[0] +
+                                                    thr_id0 +
+                                                    (index_type)m_rp.m_lower[0];
+                        if (offset_0 < m_rp.m_upper[0] &&
+                            thr_id0 < m_rp.m_tile[0]) {
+                          m_func(Tag(), offset_0, offset_1, offset_2, offset_3,
+                                 offset_4);
                         }
                       }
                     }
@@ -727,48 +840,61 @@ struct DeviceIterateTile<5,RP,Functor,Tag>
     }
     // LR
     else {
-      index_type temp0  =  m_rp.m_tile_end[0];
-      index_type temp1  =  m_rp.m_tile_end[1];
-      const index_type numbl1 = ( temp1 <= max_blocks ? temp1 : max_blocks ) ;
-      const index_type numbl0 = ( temp0*temp1 > max_blocks ? index_type( max_blocks / numbl1 ) :
-          ( temp0 <= max_blocks ? temp0 : max_blocks ) );
+      index_type temp0        = m_rp.m_tile_end[0];
+      index_type temp1        = m_rp.m_tile_end[1];
+      const index_type numbl1 = (temp1 <= max_blocks ? temp1 : max_blocks);
+      const index_type numbl0 =
+          (temp0 * temp1 > max_blocks
+               ? index_type(max_blocks / numbl1)
+               : (temp0 <= max_blocks ? temp0 : max_blocks));
 
       const index_type tile_id0 = (index_type)blockIdx.x / numbl1;
       const index_type tile_id1 = (index_type)blockIdx.x % numbl1;
-      const index_type thr_id0 = (index_type)threadIdx.x / m_rp.m_tile[1];
-      const index_type thr_id1 = (index_type)threadIdx.x % m_rp.m_tile[1];
+      const index_type thr_id0  = (index_type)threadIdx.x / m_rp.m_tile[1];
+      const index_type thr_id1  = (index_type)threadIdx.x % m_rp.m_tile[1];
 
-      temp0  =  m_rp.m_tile_end[2];
-      temp1  =  m_rp.m_tile_end[3];
-      const index_type numbl3 = ( temp1 <= max_blocks ? temp1 : max_blocks ) ;
-      const index_type numbl2 = ( temp0*temp1 > max_blocks ? index_type( max_blocks / numbl3 ) :
-          (  temp0 <= max_blocks ? temp0 : max_blocks ) );
+      temp0                   = m_rp.m_tile_end[2];
+      temp1                   = m_rp.m_tile_end[3];
+      const index_type numbl3 = (temp1 <= max_blocks ? temp1 : max_blocks);
+      const index_type numbl2 =
+          (temp0 * temp1 > max_blocks
+               ? index_type(max_blocks / numbl3)
+               : (temp0 <= max_blocks ? temp0 : max_blocks));
 
       const index_type tile_id2 = (index_type)blockIdx.y / numbl3;
       const index_type tile_id3 = (index_type)blockIdx.y % numbl3;
-      const index_type thr_id2 = (index_type)threadIdx.y / m_rp.m_tile[3];
-      const index_type thr_id3 = (index_type)threadIdx.y % m_rp.m_tile[3];
+      const index_type thr_id2  = (index_type)threadIdx.y / m_rp.m_tile[3];
+      const index_type thr_id3  = (index_type)threadIdx.y % m_rp.m_tile[3];
 
-      for ( index_type i = tile_id0; i < m_rp.m_tile_end[0]; i += numbl0 ) {
-        const index_type offset_0 = i*m_rp.m_tile[0] + thr_id0 + (index_type)m_rp.m_lower[0];
-        if ( offset_0 < m_rp.m_upper[0] && thr_id0 < m_rp.m_tile[0] ) {
-
-          for ( index_type j = tile_id1; j < m_rp.m_tile_end[1]; j += numbl1 ) {
-            const index_type offset_1 = j*m_rp.m_tile[1] + thr_id1 + (index_type)m_rp.m_lower[1];
-            if ( offset_1 < m_rp.m_upper[1] && thr_id1 < m_rp.m_tile[1] ) {
-
-              for ( index_type k = tile_id2; k < m_rp.m_tile_end[2]; k += numbl2 ) {
-                const index_type offset_2 = k*m_rp.m_tile[2] + thr_id2 + (index_type)m_rp.m_lower[2];
-                if ( offset_2 < m_rp.m_upper[2] && thr_id2 < m_rp.m_tile[2] ) {
-
-                  for ( index_type l = tile_id3; l < m_rp.m_tile_end[3]; l += numbl3 ) {
-                    const index_type offset_3 = l*m_rp.m_tile[3] + thr_id3 + (index_type)m_rp.m_lower[3];
-                    if ( offset_3 < m_rp.m_upper[3] && thr_id3 < m_rp.m_tile[3] ) {
-
-                      for ( index_type tile_id4 = (index_type)blockIdx.z; tile_id4 < m_rp.m_tile_end[4]; tile_id4 += gridDim.z ) {
-                        const index_type offset_4 = tile_id4*m_rp.m_tile[4] + (index_type)threadIdx.z + (index_type)m_rp.m_lower[4];
-                        if ( offset_4 < m_rp.m_upper[4] && (index_type)threadIdx.z < m_rp.m_tile[4] ) {
-                          m_func(Tag() , offset_0 , offset_1 , offset_2 , offset_3 , offset_4);
+      for (index_type i = tile_id0; i < m_rp.m_tile_end[0]; i += numbl0) {
+        const index_type offset_0 =
+            i * m_rp.m_tile[0] + thr_id0 + (index_type)m_rp.m_lower[0];
+        if (offset_0 < m_rp.m_upper[0] && thr_id0 < m_rp.m_tile[0]) {
+          for (index_type j = tile_id1; j < m_rp.m_tile_end[1]; j += numbl1) {
+            const index_type offset_1 =
+                j * m_rp.m_tile[1] + thr_id1 + (index_type)m_rp.m_lower[1];
+            if (offset_1 < m_rp.m_upper[1] && thr_id1 < m_rp.m_tile[1]) {
+              for (index_type k = tile_id2; k < m_rp.m_tile_end[2];
+                   k += numbl2) {
+                const index_type offset_2 =
+                    k * m_rp.m_tile[2] + thr_id2 + (index_type)m_rp.m_lower[2];
+                if (offset_2 < m_rp.m_upper[2] && thr_id2 < m_rp.m_tile[2]) {
+                  for (index_type l = tile_id3; l < m_rp.m_tile_end[3];
+                       l += numbl3) {
+                    const index_type offset_3 = l * m_rp.m_tile[3] + thr_id3 +
+                                                (index_type)m_rp.m_lower[3];
+                    if (offset_3 < m_rp.m_upper[3] &&
+                        thr_id3 < m_rp.m_tile[3]) {
+                      for (index_type tile_id4 = (index_type)blockIdx.z;
+                           tile_id4 < m_rp.m_tile_end[4];
+                           tile_id4 += gridDim.z) {
+                        const index_type offset_4 = tile_id4 * m_rp.m_tile[4] +
+                                                    (index_type)threadIdx.z +
+                                                    (index_type)m_rp.m_lower[4];
+                        if (offset_4 < m_rp.m_upper[4] &&
+                            (index_type)threadIdx.z < m_rp.m_tile[4]) {
+                          m_func(Tag(), offset_0, offset_1, offset_2, offset_3,
+                                 offset_4);
                         }
                       }
                     }
@@ -780,94 +906,107 @@ struct DeviceIterateTile<5,RP,Functor,Tag>
         }
       }
     }
-  } //end exec_range
+  }  // end exec_range
 
-private:
-  const RP & m_rp;
-  const Functor & m_func;
+ private:
+  const RP& m_rp;
+  const Functor& m_func;
 };
 
-
-//Rank 6
+// Rank 6
 // Specializations for void tag type
-template< typename RP , typename Functor >
-struct DeviceIterateTile<6,RP,Functor,void >
-{
+template <typename RP, typename Functor>
+struct DeviceIterateTile<6, RP, Functor, void> {
   using index_type = typename RP::index_type;
 
-  __device__
-  DeviceIterateTile( const RP & rp_ , const Functor & f_ )
-  : m_rp(rp_)
-  , m_func(f_)
-  {}
+  __device__ DeviceIterateTile(const RP& rp_, const Functor& f_)
+      : m_rp(rp_), m_func(f_) {}
 
   static constexpr index_type max_blocks = 65535;
-  //static constexpr index_type max_blocks = static_cast<index_type>(Kokkos::Impl::CudaTraits::UpperBoundGridCount);
+  // static constexpr index_type max_blocks =
+  // static_cast<index_type>(Kokkos::Impl::CudaTraits::UpperBoundGridCount);
 
-  inline __device__
-  void exec_range() const
-  {
-    //enum { max_blocks = static_cast<index_type>(Kokkos::Impl::CudaTraits::UpperBoundGridCount) };
-    //const index_type max_blocks = static_cast<index_type>( Kokkos::Impl::cuda_internal_maximum_grid_count() );
+  inline __device__ void exec_range() const {
+    // enum { max_blocks =
+    // static_cast<index_type>(Kokkos::Impl::CudaTraits::UpperBoundGridCount) };
+    // const index_type max_blocks = static_cast<index_type>(
+    // Kokkos::Impl::cuda_internal_maximum_grid_count() );
     // LL
     if (RP::inner_direction == RP::Left) {
-      index_type temp0  =  m_rp.m_tile_end[0];
-      index_type temp1  =  m_rp.m_tile_end[1];
-      const index_type numbl0 = ( temp0 <= max_blocks ? temp0 : max_blocks ) ;
-      const index_type numbl1 = ( temp0*temp1 > max_blocks ? index_type( max_blocks / numbl0 ) :
-          (  temp1 <= max_blocks ? temp1 : max_blocks ) );
+      index_type temp0        = m_rp.m_tile_end[0];
+      index_type temp1        = m_rp.m_tile_end[1];
+      const index_type numbl0 = (temp0 <= max_blocks ? temp0 : max_blocks);
+      const index_type numbl1 =
+          (temp0 * temp1 > max_blocks
+               ? index_type(max_blocks / numbl0)
+               : (temp1 <= max_blocks ? temp1 : max_blocks));
 
       const index_type tile_id0 = (index_type)blockIdx.x % numbl0;
       const index_type tile_id1 = (index_type)blockIdx.x / numbl0;
-      const index_type thr_id0 = (index_type)threadIdx.x % m_rp.m_tile[0];
-      const index_type thr_id1 = (index_type)threadIdx.x / m_rp.m_tile[0];
+      const index_type thr_id0  = (index_type)threadIdx.x % m_rp.m_tile[0];
+      const index_type thr_id1  = (index_type)threadIdx.x / m_rp.m_tile[0];
 
-      temp0  =  m_rp.m_tile_end[2];
-      temp1  =  m_rp.m_tile_end[3];
-      const index_type numbl2 = ( temp0 <= max_blocks ? temp0 : max_blocks ) ;
-      const index_type numbl3 = ( temp0*temp1 > max_blocks ? index_type( max_blocks / numbl2 ) :
-          (  temp1 <= max_blocks ? temp1 : max_blocks ) );
+      temp0                   = m_rp.m_tile_end[2];
+      temp1                   = m_rp.m_tile_end[3];
+      const index_type numbl2 = (temp0 <= max_blocks ? temp0 : max_blocks);
+      const index_type numbl3 =
+          (temp0 * temp1 > max_blocks
+               ? index_type(max_blocks / numbl2)
+               : (temp1 <= max_blocks ? temp1 : max_blocks));
 
       const index_type tile_id2 = (index_type)blockIdx.y % numbl2;
       const index_type tile_id3 = (index_type)blockIdx.y / numbl2;
-      const index_type thr_id2 = (index_type)threadIdx.y % m_rp.m_tile[2];
-      const index_type thr_id3 = (index_type)threadIdx.y / m_rp.m_tile[2];
+      const index_type thr_id2  = (index_type)threadIdx.y % m_rp.m_tile[2];
+      const index_type thr_id3  = (index_type)threadIdx.y / m_rp.m_tile[2];
 
-      temp0  =  m_rp.m_tile_end[4];
-      temp1  =  m_rp.m_tile_end[5];
-      const index_type numbl4 = ( temp0 <= max_blocks ? temp0 : max_blocks ) ;
-      const index_type numbl5 = ( temp0*temp1 > max_blocks ? index_type( max_blocks / numbl4 ) :
-          (  temp1 <= max_blocks ? temp1 : max_blocks ) );
+      temp0                   = m_rp.m_tile_end[4];
+      temp1                   = m_rp.m_tile_end[5];
+      const index_type numbl4 = (temp0 <= max_blocks ? temp0 : max_blocks);
+      const index_type numbl5 =
+          (temp0 * temp1 > max_blocks
+               ? index_type(max_blocks / numbl4)
+               : (temp1 <= max_blocks ? temp1 : max_blocks));
 
       const index_type tile_id4 = (index_type)blockIdx.z % numbl4;
       const index_type tile_id5 = (index_type)blockIdx.z / numbl4;
-      const index_type thr_id4 = (index_type)threadIdx.z % m_rp.m_tile[4];
-      const index_type thr_id5 = (index_type)threadIdx.z / m_rp.m_tile[4];
+      const index_type thr_id4  = (index_type)threadIdx.z % m_rp.m_tile[4];
+      const index_type thr_id5  = (index_type)threadIdx.z / m_rp.m_tile[4];
 
-      for ( index_type n = tile_id5; n < m_rp.m_tile_end[5]; n += numbl5 ) {
-        const index_type offset_5 = n*m_rp.m_tile[5] + thr_id5 + (index_type)m_rp.m_lower[5];
-        if ( offset_5 < m_rp.m_upper[5] && thr_id5 < m_rp.m_tile[5] ) {
-
-          for ( index_type m = tile_id4; m < m_rp.m_tile_end[4]; m += numbl4 ) {
-            const index_type offset_4 = m*m_rp.m_tile[4] + thr_id4 + (index_type)m_rp.m_lower[4];
-            if ( offset_4 < m_rp.m_upper[4] && thr_id4 < m_rp.m_tile[4] ) {
-
-              for ( index_type l = tile_id3; l < m_rp.m_tile_end[3]; l += numbl3 ) {
-                const index_type offset_3 = l*m_rp.m_tile[3] + thr_id3 + (index_type)m_rp.m_lower[3];
-                if ( offset_3 < m_rp.m_upper[3] && thr_id3 < m_rp.m_tile[3] ) {
-
-                  for ( index_type k = tile_id2; k < m_rp.m_tile_end[2]; k += numbl2 ) {
-                    const index_type offset_2 = k*m_rp.m_tile[2] + thr_id2 + (index_type)m_rp.m_lower[2];
-                    if ( offset_2 < m_rp.m_upper[2] && thr_id2 < m_rp.m_tile[2] ) {
-
-                      for ( index_type j = tile_id1 ; j < m_rp.m_tile_end[1]; j += numbl1 ) {
-                        const index_type offset_1 = j*m_rp.m_tile[1] + thr_id1 + (index_type)m_rp.m_lower[1];
-                        if ( offset_1 < m_rp.m_upper[1] && thr_id1 < m_rp.m_tile[1] ) {
-
-                          for ( index_type i = tile_id0 ; i < m_rp.m_tile_end[0]; i += numbl0 ) {
-                            const index_type offset_0 = i*m_rp.m_tile[0] + thr_id0 + (index_type)m_rp.m_lower[0];
-                            if ( offset_0 < m_rp.m_upper[0] && thr_id0 < m_rp.m_tile[0] ) {
-                              m_func(offset_0 , offset_1 , offset_2 , offset_3, offset_4, offset_5);
+      for (index_type n = tile_id5; n < m_rp.m_tile_end[5]; n += numbl5) {
+        const index_type offset_5 =
+            n * m_rp.m_tile[5] + thr_id5 + (index_type)m_rp.m_lower[5];
+        if (offset_5 < m_rp.m_upper[5] && thr_id5 < m_rp.m_tile[5]) {
+          for (index_type m = tile_id4; m < m_rp.m_tile_end[4]; m += numbl4) {
+            const index_type offset_4 =
+                m * m_rp.m_tile[4] + thr_id4 + (index_type)m_rp.m_lower[4];
+            if (offset_4 < m_rp.m_upper[4] && thr_id4 < m_rp.m_tile[4]) {
+              for (index_type l = tile_id3; l < m_rp.m_tile_end[3];
+                   l += numbl3) {
+                const index_type offset_3 =
+                    l * m_rp.m_tile[3] + thr_id3 + (index_type)m_rp.m_lower[3];
+                if (offset_3 < m_rp.m_upper[3] && thr_id3 < m_rp.m_tile[3]) {
+                  for (index_type k = tile_id2; k < m_rp.m_tile_end[2];
+                       k += numbl2) {
+                    const index_type offset_2 = k * m_rp.m_tile[2] + thr_id2 +
+                                                (index_type)m_rp.m_lower[2];
+                    if (offset_2 < m_rp.m_upper[2] &&
+                        thr_id2 < m_rp.m_tile[2]) {
+                      for (index_type j = tile_id1; j < m_rp.m_tile_end[1];
+                           j += numbl1) {
+                        const index_type offset_1 = j * m_rp.m_tile[1] +
+                                                    thr_id1 +
+                                                    (index_type)m_rp.m_lower[1];
+                        if (offset_1 < m_rp.m_upper[1] &&
+                            thr_id1 < m_rp.m_tile[1]) {
+                          for (index_type i = tile_id0; i < m_rp.m_tile_end[0];
+                               i += numbl0) {
+                            const index_type offset_0 =
+                                i * m_rp.m_tile[0] + thr_id0 +
+                                (index_type)m_rp.m_lower[0];
+                            if (offset_0 < m_rp.m_upper[0] &&
+                                thr_id0 < m_rp.m_tile[0]) {
+                              m_func(offset_0, offset_1, offset_2, offset_3,
+                                     offset_4, offset_5);
                             }
                           }
                         }
@@ -883,63 +1022,80 @@ struct DeviceIterateTile<6,RP,Functor,void >
     }
     // LR
     else {
-      index_type temp0  =  m_rp.m_tile_end[0];
-      index_type temp1  =  m_rp.m_tile_end[1];
-      const index_type numbl1 = ( temp1 <= max_blocks ? temp1 : max_blocks ) ;
-      const index_type numbl0 = ( temp0*temp1 > max_blocks ? index_type( max_blocks / numbl1 ) :
-          ( temp0 <= max_blocks ? temp0 : max_blocks ) );
+      index_type temp0        = m_rp.m_tile_end[0];
+      index_type temp1        = m_rp.m_tile_end[1];
+      const index_type numbl1 = (temp1 <= max_blocks ? temp1 : max_blocks);
+      const index_type numbl0 =
+          (temp0 * temp1 > max_blocks
+               ? index_type(max_blocks / numbl1)
+               : (temp0 <= max_blocks ? temp0 : max_blocks));
 
       const index_type tile_id0 = (index_type)blockIdx.x / numbl1;
       const index_type tile_id1 = (index_type)blockIdx.x % numbl1;
-      const index_type thr_id0 = (index_type)threadIdx.x / m_rp.m_tile[1];
-      const index_type thr_id1 = (index_type)threadIdx.x % m_rp.m_tile[1];
+      const index_type thr_id0  = (index_type)threadIdx.x / m_rp.m_tile[1];
+      const index_type thr_id1  = (index_type)threadIdx.x % m_rp.m_tile[1];
 
-      temp0  =  m_rp.m_tile_end[2];
-      temp1  =  m_rp.m_tile_end[3];
-      const index_type numbl3 = ( temp1 <= max_blocks ? temp1 : max_blocks ) ;
-      const index_type numbl2 = ( temp0*temp1 > max_blocks ? index_type( max_blocks / numbl3 ) :
-          (  temp0 <= max_blocks ? temp0 : max_blocks ) );
+      temp0                   = m_rp.m_tile_end[2];
+      temp1                   = m_rp.m_tile_end[3];
+      const index_type numbl3 = (temp1 <= max_blocks ? temp1 : max_blocks);
+      const index_type numbl2 =
+          (temp0 * temp1 > max_blocks
+               ? index_type(max_blocks / numbl3)
+               : (temp0 <= max_blocks ? temp0 : max_blocks));
 
       const index_type tile_id2 = (index_type)blockIdx.y / numbl3;
       const index_type tile_id3 = (index_type)blockIdx.y % numbl3;
-      const index_type thr_id2 = (index_type)threadIdx.y / m_rp.m_tile[3];
-      const index_type thr_id3 = (index_type)threadIdx.y % m_rp.m_tile[3];
+      const index_type thr_id2  = (index_type)threadIdx.y / m_rp.m_tile[3];
+      const index_type thr_id3  = (index_type)threadIdx.y % m_rp.m_tile[3];
 
-      temp0  =  m_rp.m_tile_end[4];
-      temp1  =  m_rp.m_tile_end[5];
-      const index_type numbl5 = ( temp1 <= max_blocks ? temp1 : max_blocks ) ;
-      const index_type numbl4 = ( temp0*temp1 > max_blocks ? index_type( max_blocks / numbl5 ) :
-          (  temp0 <= max_blocks ? temp0 : max_blocks ) );
+      temp0                   = m_rp.m_tile_end[4];
+      temp1                   = m_rp.m_tile_end[5];
+      const index_type numbl5 = (temp1 <= max_blocks ? temp1 : max_blocks);
+      const index_type numbl4 =
+          (temp0 * temp1 > max_blocks
+               ? index_type(max_blocks / numbl5)
+               : (temp0 <= max_blocks ? temp0 : max_blocks));
 
       const index_type tile_id4 = (index_type)blockIdx.z / numbl5;
       const index_type tile_id5 = (index_type)blockIdx.z % numbl5;
-      const index_type thr_id4 = (index_type)threadIdx.z / m_rp.m_tile[5];
-      const index_type thr_id5 = (index_type)threadIdx.z % m_rp.m_tile[5];
+      const index_type thr_id4  = (index_type)threadIdx.z / m_rp.m_tile[5];
+      const index_type thr_id5  = (index_type)threadIdx.z % m_rp.m_tile[5];
 
-      for ( index_type i = tile_id0; i < m_rp.m_tile_end[0]; i += numbl0 ) {
-        const index_type offset_0 = i*m_rp.m_tile[0] + thr_id0 + (index_type)m_rp.m_lower[0];
-        if ( offset_0 < m_rp.m_upper[0] && thr_id0 < m_rp.m_tile[0] ) {
-
-          for ( index_type j = tile_id1; j < m_rp.m_tile_end[1]; j += numbl1 ) {
-            const index_type offset_1 = j*m_rp.m_tile[1] + thr_id1 + (index_type)m_rp.m_lower[1];
-            if ( offset_1 < m_rp.m_upper[1] && thr_id1 < m_rp.m_tile[1] ) {
-
-              for ( index_type k = tile_id2; k < m_rp.m_tile_end[2]; k += numbl2 ) {
-                const index_type offset_2 = k*m_rp.m_tile[2] + thr_id2 + (index_type)m_rp.m_lower[2];
-                if ( offset_2 < m_rp.m_upper[2] && thr_id2 < m_rp.m_tile[2] ) {
-
-                  for ( index_type l = tile_id3; l < m_rp.m_tile_end[3]; l += numbl3 ) {
-                    const index_type offset_3 = l*m_rp.m_tile[3] + thr_id3 + (index_type)m_rp.m_lower[3];
-                    if ( offset_3 < m_rp.m_upper[3] && thr_id3 < m_rp.m_tile[3] ) {
-
-                      for ( index_type m = tile_id4; m < m_rp.m_tile_end[4]; m += numbl4 ) {
-                        const index_type offset_4 = m*m_rp.m_tile[4] + thr_id4 + (index_type)m_rp.m_lower[4];
-                        if ( offset_4 < m_rp.m_upper[4] && thr_id4 < m_rp.m_tile[4] ) {
-
-                          for ( index_type n = tile_id5; n < m_rp.m_tile_end[5]; n += numbl5 ) {
-                            const index_type offset_5 = n*m_rp.m_tile[5] + thr_id5 + (index_type)m_rp.m_lower[5];
-                            if ( offset_5 < m_rp.m_upper[5] && thr_id5 < m_rp.m_tile[5] ) {
-                              m_func(offset_0 , offset_1 , offset_2 , offset_3 , offset_4 , offset_5);
+      for (index_type i = tile_id0; i < m_rp.m_tile_end[0]; i += numbl0) {
+        const index_type offset_0 =
+            i * m_rp.m_tile[0] + thr_id0 + (index_type)m_rp.m_lower[0];
+        if (offset_0 < m_rp.m_upper[0] && thr_id0 < m_rp.m_tile[0]) {
+          for (index_type j = tile_id1; j < m_rp.m_tile_end[1]; j += numbl1) {
+            const index_type offset_1 =
+                j * m_rp.m_tile[1] + thr_id1 + (index_type)m_rp.m_lower[1];
+            if (offset_1 < m_rp.m_upper[1] && thr_id1 < m_rp.m_tile[1]) {
+              for (index_type k = tile_id2; k < m_rp.m_tile_end[2];
+                   k += numbl2) {
+                const index_type offset_2 =
+                    k * m_rp.m_tile[2] + thr_id2 + (index_type)m_rp.m_lower[2];
+                if (offset_2 < m_rp.m_upper[2] && thr_id2 < m_rp.m_tile[2]) {
+                  for (index_type l = tile_id3; l < m_rp.m_tile_end[3];
+                       l += numbl3) {
+                    const index_type offset_3 = l * m_rp.m_tile[3] + thr_id3 +
+                                                (index_type)m_rp.m_lower[3];
+                    if (offset_3 < m_rp.m_upper[3] &&
+                        thr_id3 < m_rp.m_tile[3]) {
+                      for (index_type m = tile_id4; m < m_rp.m_tile_end[4];
+                           m += numbl4) {
+                        const index_type offset_4 = m * m_rp.m_tile[4] +
+                                                    thr_id4 +
+                                                    (index_type)m_rp.m_lower[4];
+                        if (offset_4 < m_rp.m_upper[4] &&
+                            thr_id4 < m_rp.m_tile[4]) {
+                          for (index_type n = tile_id5; n < m_rp.m_tile_end[5];
+                               n += numbl5) {
+                            const index_type offset_5 =
+                                n * m_rp.m_tile[5] + thr_id5 +
+                                (index_type)m_rp.m_lower[5];
+                            if (offset_5 < m_rp.m_upper[5] &&
+                                thr_id5 < m_rp.m_tile[5]) {
+                              m_func(offset_0, offset_1, offset_2, offset_3,
+                                     offset_4, offset_5);
                             }
                           }
                         }
@@ -953,92 +1109,106 @@ struct DeviceIterateTile<6,RP,Functor,void >
         }
       }
     }
-  } //end exec_range
+  }  // end exec_range
 
-private:
-  const RP & m_rp;
-  const Functor & m_func;
+ private:
+  const RP& m_rp;
+  const Functor& m_func;
 };
 
 // Specializations for tag type
-template< typename RP , typename Functor , typename Tag >
-struct DeviceIterateTile<6,RP,Functor,Tag>
-{
+template <typename RP, typename Functor, typename Tag>
+struct DeviceIterateTile<6, RP, Functor, Tag> {
   using index_type = typename RP::index_type;
 
-  __device__
-  DeviceIterateTile( const RP & rp_ , const Functor & f_ )
-  : m_rp(rp_)
-  , m_func(f_)
-  {}
+  __device__ DeviceIterateTile(const RP& rp_, const Functor& f_)
+      : m_rp(rp_), m_func(f_) {}
 
   static constexpr index_type max_blocks = 65535;
-  //static constexpr index_type max_blocks = static_cast<index_type>(Kokkos::Impl::CudaTraits::UpperBoundGridCount);
+  // static constexpr index_type max_blocks =
+  // static_cast<index_type>(Kokkos::Impl::CudaTraits::UpperBoundGridCount);
 
-  inline __device__
-  void exec_range() const
-  {
-    //enum { max_blocks = static_cast<index_type>(Kokkos::Impl::CudaTraits::UpperBoundGridCount) };
-    //const index_type max_blocks = static_cast<index_type>( Kokkos::Impl::cuda_internal_maximum_grid_count() );
+  inline __device__ void exec_range() const {
+    // enum { max_blocks =
+    // static_cast<index_type>(Kokkos::Impl::CudaTraits::UpperBoundGridCount) };
+    // const index_type max_blocks = static_cast<index_type>(
+    // Kokkos::Impl::cuda_internal_maximum_grid_count() );
     // LL
     if (RP::inner_direction == RP::Left) {
-      index_type temp0  =  m_rp.m_tile_end[0];
-      index_type temp1  =  m_rp.m_tile_end[1];
-      const index_type numbl0 = ( temp0 <= max_blocks ? temp0 : max_blocks ) ;
-      const index_type numbl1 = ( temp0*temp1 > max_blocks ? index_type( max_blocks / numbl0 ) :
-          (  temp1 <= max_blocks ? temp1 : max_blocks ) );
+      index_type temp0        = m_rp.m_tile_end[0];
+      index_type temp1        = m_rp.m_tile_end[1];
+      const index_type numbl0 = (temp0 <= max_blocks ? temp0 : max_blocks);
+      const index_type numbl1 =
+          (temp0 * temp1 > max_blocks
+               ? index_type(max_blocks / numbl0)
+               : (temp1 <= max_blocks ? temp1 : max_blocks));
 
       const index_type tile_id0 = (index_type)blockIdx.x % numbl0;
       const index_type tile_id1 = (index_type)blockIdx.x / numbl0;
-      const index_type thr_id0 = (index_type)threadIdx.x % m_rp.m_tile[0];
-      const index_type thr_id1 = (index_type)threadIdx.x / m_rp.m_tile[0];
+      const index_type thr_id0  = (index_type)threadIdx.x % m_rp.m_tile[0];
+      const index_type thr_id1  = (index_type)threadIdx.x / m_rp.m_tile[0];
 
-      temp0  =  m_rp.m_tile_end[2];
-      temp1  =  m_rp.m_tile_end[3];
-      const index_type numbl2 = ( temp0 <= max_blocks ? temp0 : max_blocks ) ;
-      const index_type numbl3 = ( temp0*temp1 > max_blocks ? index_type( max_blocks / numbl2 ) :
-          (  temp1 <= max_blocks ? temp1 : max_blocks ) );
+      temp0                   = m_rp.m_tile_end[2];
+      temp1                   = m_rp.m_tile_end[3];
+      const index_type numbl2 = (temp0 <= max_blocks ? temp0 : max_blocks);
+      const index_type numbl3 =
+          (temp0 * temp1 > max_blocks
+               ? index_type(max_blocks / numbl2)
+               : (temp1 <= max_blocks ? temp1 : max_blocks));
 
       const index_type tile_id2 = (index_type)blockIdx.y % numbl2;
       const index_type tile_id3 = (index_type)blockIdx.y / numbl2;
-      const index_type thr_id2 = (index_type)threadIdx.y % m_rp.m_tile[2];
-      const index_type thr_id3 = (index_type)threadIdx.y / m_rp.m_tile[2];
+      const index_type thr_id2  = (index_type)threadIdx.y % m_rp.m_tile[2];
+      const index_type thr_id3  = (index_type)threadIdx.y / m_rp.m_tile[2];
 
-      temp0  =  m_rp.m_tile_end[4];
-      temp1  =  m_rp.m_tile_end[5];
-      const index_type numbl4 = ( temp0 <= max_blocks ? temp0 : max_blocks ) ;
-      const index_type numbl5 = ( temp0*temp1 > max_blocks ? index_type( max_blocks / numbl4 ) :
-          (  temp1 <= max_blocks ? temp1 : max_blocks ) );
+      temp0                   = m_rp.m_tile_end[4];
+      temp1                   = m_rp.m_tile_end[5];
+      const index_type numbl4 = (temp0 <= max_blocks ? temp0 : max_blocks);
+      const index_type numbl5 =
+          (temp0 * temp1 > max_blocks
+               ? index_type(max_blocks / numbl4)
+               : (temp1 <= max_blocks ? temp1 : max_blocks));
 
       const index_type tile_id4 = (index_type)blockIdx.z % numbl4;
       const index_type tile_id5 = (index_type)blockIdx.z / numbl4;
-      const index_type thr_id4 = (index_type)threadIdx.z % m_rp.m_tile[4];
-      const index_type thr_id5 = (index_type)threadIdx.z / m_rp.m_tile[4];
+      const index_type thr_id4  = (index_type)threadIdx.z % m_rp.m_tile[4];
+      const index_type thr_id5  = (index_type)threadIdx.z / m_rp.m_tile[4];
 
-      for ( index_type n = tile_id5; n < m_rp.m_tile_end[5]; n += numbl5 ) {
-        const index_type offset_5 = n*m_rp.m_tile[5] + thr_id5 + (index_type)m_rp.m_lower[5];
-        if ( offset_5 < m_rp.m_upper[5] && thr_id5 < m_rp.m_tile[5] ) {
-
-          for ( index_type m = tile_id4; m < m_rp.m_tile_end[4]; m += numbl4 ) {
-            const index_type offset_4 = m*m_rp.m_tile[4] + thr_id4 + (index_type)m_rp.m_lower[4];
-            if ( offset_4 < m_rp.m_upper[4] && thr_id4 < m_rp.m_tile[4] ) {
-
-              for ( index_type l = tile_id3; l < m_rp.m_tile_end[3]; l += numbl3 ) {
-                const index_type offset_3 = l*m_rp.m_tile[3] + thr_id3 + (index_type)m_rp.m_lower[3];
-                if ( offset_3 < m_rp.m_upper[3] && thr_id3 < m_rp.m_tile[3] ) {
-
-                  for ( index_type k = tile_id2; k < m_rp.m_tile_end[2]; k += numbl2 ) {
-                    const index_type offset_2 = k*m_rp.m_tile[2] + thr_id2 + (index_type)m_rp.m_lower[2];
-                    if ( offset_2 < m_rp.m_upper[2] && thr_id2 < m_rp.m_tile[2] ) {
-
-                      for ( index_type j = tile_id1 ; j < m_rp.m_tile_end[1]; j += numbl1 ) {
-                        const index_type offset_1 = j*m_rp.m_tile[1] + thr_id1 + (index_type)m_rp.m_lower[1];
-                        if ( offset_1 < m_rp.m_upper[1] && thr_id1 < m_rp.m_tile[1] ) {
-
-                          for ( index_type i = tile_id0 ; i < m_rp.m_tile_end[0]; i += numbl0 ) {
-                            const index_type offset_0 = i*m_rp.m_tile[0] + thr_id0 + (index_type)m_rp.m_lower[0];
-                            if ( offset_0 < m_rp.m_upper[0] && thr_id0 < m_rp.m_tile[0] ) {
-                              m_func(Tag() , offset_0 , offset_1 , offset_2 , offset_3, offset_4, offset_5);
+      for (index_type n = tile_id5; n < m_rp.m_tile_end[5]; n += numbl5) {
+        const index_type offset_5 =
+            n * m_rp.m_tile[5] + thr_id5 + (index_type)m_rp.m_lower[5];
+        if (offset_5 < m_rp.m_upper[5] && thr_id5 < m_rp.m_tile[5]) {
+          for (index_type m = tile_id4; m < m_rp.m_tile_end[4]; m += numbl4) {
+            const index_type offset_4 =
+                m * m_rp.m_tile[4] + thr_id4 + (index_type)m_rp.m_lower[4];
+            if (offset_4 < m_rp.m_upper[4] && thr_id4 < m_rp.m_tile[4]) {
+              for (index_type l = tile_id3; l < m_rp.m_tile_end[3];
+                   l += numbl3) {
+                const index_type offset_3 =
+                    l * m_rp.m_tile[3] + thr_id3 + (index_type)m_rp.m_lower[3];
+                if (offset_3 < m_rp.m_upper[3] && thr_id3 < m_rp.m_tile[3]) {
+                  for (index_type k = tile_id2; k < m_rp.m_tile_end[2];
+                       k += numbl2) {
+                    const index_type offset_2 = k * m_rp.m_tile[2] + thr_id2 +
+                                                (index_type)m_rp.m_lower[2];
+                    if (offset_2 < m_rp.m_upper[2] &&
+                        thr_id2 < m_rp.m_tile[2]) {
+                      for (index_type j = tile_id1; j < m_rp.m_tile_end[1];
+                           j += numbl1) {
+                        const index_type offset_1 = j * m_rp.m_tile[1] +
+                                                    thr_id1 +
+                                                    (index_type)m_rp.m_lower[1];
+                        if (offset_1 < m_rp.m_upper[1] &&
+                            thr_id1 < m_rp.m_tile[1]) {
+                          for (index_type i = tile_id0; i < m_rp.m_tile_end[0];
+                               i += numbl0) {
+                            const index_type offset_0 =
+                                i * m_rp.m_tile[0] + thr_id0 +
+                                (index_type)m_rp.m_lower[0];
+                            if (offset_0 < m_rp.m_upper[0] &&
+                                thr_id0 < m_rp.m_tile[0]) {
+                              m_func(Tag(), offset_0, offset_1, offset_2,
+                                     offset_3, offset_4, offset_5);
                             }
                           }
                         }
@@ -1054,63 +1224,80 @@ struct DeviceIterateTile<6,RP,Functor,Tag>
     }
     // LR
     else {
-      index_type temp0  =  m_rp.m_tile_end[0];
-      index_type temp1  =  m_rp.m_tile_end[1];
-      const index_type numbl1 = ( temp1 <= max_blocks ? temp1 : max_blocks ) ;
-      const index_type numbl0 = ( temp0*temp1 > max_blocks ? index_type( max_blocks / numbl1 ) :
-          ( temp0 <= max_blocks ? temp0 : max_blocks ) );
+      index_type temp0        = m_rp.m_tile_end[0];
+      index_type temp1        = m_rp.m_tile_end[1];
+      const index_type numbl1 = (temp1 <= max_blocks ? temp1 : max_blocks);
+      const index_type numbl0 =
+          (temp0 * temp1 > max_blocks
+               ? index_type(max_blocks / numbl1)
+               : (temp0 <= max_blocks ? temp0 : max_blocks));
 
       const index_type tile_id0 = (index_type)blockIdx.x / numbl1;
       const index_type tile_id1 = (index_type)blockIdx.x % numbl1;
-      const index_type thr_id0 = (index_type)threadIdx.x / m_rp.m_tile[1];
-      const index_type thr_id1 = (index_type)threadIdx.x % m_rp.m_tile[1];
+      const index_type thr_id0  = (index_type)threadIdx.x / m_rp.m_tile[1];
+      const index_type thr_id1  = (index_type)threadIdx.x % m_rp.m_tile[1];
 
-      temp0  =  m_rp.m_tile_end[2];
-      temp1  =  m_rp.m_tile_end[3];
-      const index_type numbl3 = ( temp1 <= max_blocks ? temp1 : max_blocks ) ;
-      const index_type numbl2 = ( temp0*temp1 > max_blocks ? index_type( max_blocks / numbl3 ) :
-          (  temp0 <= max_blocks ? temp0 : max_blocks ) );
+      temp0                   = m_rp.m_tile_end[2];
+      temp1                   = m_rp.m_tile_end[3];
+      const index_type numbl3 = (temp1 <= max_blocks ? temp1 : max_blocks);
+      const index_type numbl2 =
+          (temp0 * temp1 > max_blocks
+               ? index_type(max_blocks / numbl3)
+               : (temp0 <= max_blocks ? temp0 : max_blocks));
 
       const index_type tile_id2 = (index_type)blockIdx.y / numbl3;
       const index_type tile_id3 = (index_type)blockIdx.y % numbl3;
-      const index_type thr_id2 = (index_type)threadIdx.y / m_rp.m_tile[3];
-      const index_type thr_id3 = (index_type)threadIdx.y % m_rp.m_tile[3];
+      const index_type thr_id2  = (index_type)threadIdx.y / m_rp.m_tile[3];
+      const index_type thr_id3  = (index_type)threadIdx.y % m_rp.m_tile[3];
 
-      temp0  =  m_rp.m_tile_end[4];
-      temp1  =  m_rp.m_tile_end[5];
-      const index_type numbl5 = ( temp1 <= max_blocks ? temp1 : max_blocks ) ;
-      const index_type numbl4 = ( temp0*temp1 > max_blocks ? index_type( max_blocks / numbl5 ) :
-          (  temp0 <= max_blocks ? temp0 : max_blocks ) );
+      temp0                   = m_rp.m_tile_end[4];
+      temp1                   = m_rp.m_tile_end[5];
+      const index_type numbl5 = (temp1 <= max_blocks ? temp1 : max_blocks);
+      const index_type numbl4 =
+          (temp0 * temp1 > max_blocks
+               ? index_type(max_blocks / numbl5)
+               : (temp0 <= max_blocks ? temp0 : max_blocks));
 
       const index_type tile_id4 = (index_type)blockIdx.z / numbl5;
       const index_type tile_id5 = (index_type)blockIdx.z % numbl5;
-      const index_type thr_id4 = (index_type)threadIdx.z / m_rp.m_tile[5];
-      const index_type thr_id5 = (index_type)threadIdx.z % m_rp.m_tile[5];
+      const index_type thr_id4  = (index_type)threadIdx.z / m_rp.m_tile[5];
+      const index_type thr_id5  = (index_type)threadIdx.z % m_rp.m_tile[5];
 
-      for ( index_type i = tile_id0; i < m_rp.m_tile_end[0]; i += numbl0 ) {
-        const index_type offset_0 = i*m_rp.m_tile[0] + thr_id0 + (index_type)m_rp.m_lower[0];
-        if ( offset_0 < m_rp.m_upper[0] && thr_id0 < m_rp.m_tile[0] ) {
-
-          for ( index_type j = tile_id1; j < m_rp.m_tile_end[1]; j += numbl1 ) {
-            const index_type offset_1 = j*m_rp.m_tile[1] + thr_id1 + (index_type)m_rp.m_lower[1];
-            if ( offset_1 < m_rp.m_upper[1] && thr_id1 < m_rp.m_tile[1] ) {
-
-              for ( index_type k = tile_id2; k < m_rp.m_tile_end[2]; k += numbl2 ) {
-                const index_type offset_2 = k*m_rp.m_tile[2] + thr_id2 + (index_type)m_rp.m_lower[2];
-                if ( offset_2 < m_rp.m_upper[2] && thr_id2 < m_rp.m_tile[2] ) {
-
-                  for ( index_type l = tile_id3; l < m_rp.m_tile_end[3]; l += numbl3 ) {
-                    const index_type offset_3 = l*m_rp.m_tile[3] + thr_id3 + (index_type)m_rp.m_lower[3];
-                    if ( offset_3 < m_rp.m_upper[3] && thr_id3 < m_rp.m_tile[3] ) {
-
-                      for ( index_type m = tile_id4; m < m_rp.m_tile_end[4]; m += numbl4 ) {
-                        const index_type offset_4 = m*m_rp.m_tile[4] + thr_id4 + (index_type)m_rp.m_lower[4];
-                        if ( offset_4 < m_rp.m_upper[4] && thr_id4 < m_rp.m_tile[4] ) {
-
-                          for ( index_type n = tile_id5; n < m_rp.m_tile_end[5]; n += numbl5 ) {
-                            const index_type offset_5 = n*m_rp.m_tile[5] + thr_id5 + (index_type)m_rp.m_lower[5];
-                            if ( offset_5 < m_rp.m_upper[5] && thr_id5 < m_rp.m_tile[5] ) {
-                              m_func(Tag() , offset_0 , offset_1 , offset_2 , offset_3 , offset_4 , offset_5);
+      for (index_type i = tile_id0; i < m_rp.m_tile_end[0]; i += numbl0) {
+        const index_type offset_0 =
+            i * m_rp.m_tile[0] + thr_id0 + (index_type)m_rp.m_lower[0];
+        if (offset_0 < m_rp.m_upper[0] && thr_id0 < m_rp.m_tile[0]) {
+          for (index_type j = tile_id1; j < m_rp.m_tile_end[1]; j += numbl1) {
+            const index_type offset_1 =
+                j * m_rp.m_tile[1] + thr_id1 + (index_type)m_rp.m_lower[1];
+            if (offset_1 < m_rp.m_upper[1] && thr_id1 < m_rp.m_tile[1]) {
+              for (index_type k = tile_id2; k < m_rp.m_tile_end[2];
+                   k += numbl2) {
+                const index_type offset_2 =
+                    k * m_rp.m_tile[2] + thr_id2 + (index_type)m_rp.m_lower[2];
+                if (offset_2 < m_rp.m_upper[2] && thr_id2 < m_rp.m_tile[2]) {
+                  for (index_type l = tile_id3; l < m_rp.m_tile_end[3];
+                       l += numbl3) {
+                    const index_type offset_3 = l * m_rp.m_tile[3] + thr_id3 +
+                                                (index_type)m_rp.m_lower[3];
+                    if (offset_3 < m_rp.m_upper[3] &&
+                        thr_id3 < m_rp.m_tile[3]) {
+                      for (index_type m = tile_id4; m < m_rp.m_tile_end[4];
+                           m += numbl4) {
+                        const index_type offset_4 = m * m_rp.m_tile[4] +
+                                                    thr_id4 +
+                                                    (index_type)m_rp.m_lower[4];
+                        if (offset_4 < m_rp.m_upper[4] &&
+                            thr_id4 < m_rp.m_tile[4]) {
+                          for (index_type n = tile_id5; n < m_rp.m_tile_end[5];
+                               n += numbl5) {
+                            const index_type offset_5 =
+                                n * m_rp.m_tile[5] + thr_id5 +
+                                (index_type)m_rp.m_lower[5];
+                            if (offset_5 < m_rp.m_upper[5] &&
+                                thr_id5 < m_rp.m_tile[5]) {
+                              m_func(Tag(), offset_0, offset_1, offset_2,
+                                     offset_3, offset_4, offset_5);
                             }
                           }
                         }
@@ -1124,168 +1311,175 @@ struct DeviceIterateTile<6,RP,Functor,Tag>
         }
       }
     }
-  } //end exec_range
+  }  // end exec_range
 
-private:
-  const RP & m_rp;
-  const Functor & m_func;
+ private:
+  const RP& m_rp;
+  const Functor& m_func;
 };
 
-} // Refactor
+}  // namespace Refactor
 
 // ----------------------------------------------------------------------------------
 
 namespace Reduce {
 
-template < typename T >
-using is_void = std::is_same< T, void >;
+template <typename T>
+using is_void = std::is_same<T, void>;
 
-template < typename T >
-struct is_array_type : std::false_type
-{
+template <typename T>
+struct is_array_type : std::false_type {
   using value_type = T;
 };
 
-template < typename T >
-struct is_array_type< T* > : std::true_type
-{
+template <typename T>
+struct is_array_type<T*> : std::true_type {
   using value_type = T;
 };
 
-template < typename T >
-struct is_array_type< T[] > : std::true_type
-{
+template <typename T>
+struct is_array_type<T[]> : std::true_type {
   using value_type = T;
 };
 
 // ------------------------------------------------------------------ //
-template< int N , typename RP , typename Functor , typename Tag , typename ValueType , typename Enable = void >
+template <int N, typename RP, typename Functor, typename Tag,
+          typename ValueType, typename Enable = void>
 struct DeviceIterateTile;
 
 // ParallelReduce iteration pattern
 // Scalar reductions
 
-// num_blocks = min( num_tiles, max_num_blocks ); //i.e. determined by number of tiles and reduction algorithm constraints
-// extract n-dim tile offsets (i.e. tile's global starting mulit-index) from the tileid = blockid using tile dimensions
-// local indices within a tile extracted from (index_type)threadIdx.x using tile dims, constrained by blocksize
-// combine tile and local id info for multi-dim global ids
+// num_blocks = min( num_tiles, max_num_blocks ); //i.e. determined by number of
+// tiles and reduction algorithm constraints extract n-dim tile offsets (i.e.
+// tile's global starting mulit-index) from the tileid = blockid using tile
+// dimensions local indices within a tile extracted from (index_type)threadIdx.x
+// using tile dims, constrained by blocksize combine tile and local id info for
+// multi-dim global ids
 
 // Pattern:
-// Each block+thread is responsible for a tile+local_id combo (additional when striding by num_blocks)
+// Each block+thread is responsible for a tile+local_id combo (additional when
+// striding by num_blocks)
 // 1. create offset arrays
-// 2. loop over number of tiles, striding by griddim (equal to num tiles, or max num blocks)
+// 2. loop over number of tiles, striding by griddim (equal to num tiles, or max
+// num blocks)
 // 3. temps set for tile_idx and thrd_idx, which will be modified
 // 4. if LL vs LR:
 //      determine tile starting point offsets (multidim)
 //      determine local index offsets (multidim)
 //      concatentate tile offset + local offset for global multi-dim index
-//    if offset withinin range bounds AND local offset within tile bounds, call functor
+//    if offset withinin range bounds AND local offset within tile bounds, call
+//    functor
 
 // ValueType = T
-//Rank 2
+// Rank 2
 // Specializations for void tag type
-template< typename RP , typename Functor , typename ValueType >
-struct DeviceIterateTile<2,RP,Functor,void,ValueType, typename std::enable_if< !is_array_type<ValueType>::value >::type >
-{
+template <typename RP, typename Functor, typename ValueType>
+struct DeviceIterateTile<
+    2, RP, Functor, void, ValueType,
+    typename std::enable_if<!is_array_type<ValueType>::value>::type> {
   using index_type = typename RP::index_type;
 
-  __device__
-  DeviceIterateTile( const RP & rp_ , const Functor & f_ , ValueType & v_)
-  : m_rp(rp_)
-  , m_func(f_)
-  , m_v(v_)
-  {}
+  __device__ DeviceIterateTile(const RP& rp_, const Functor& f_, ValueType& v_)
+      : m_rp(rp_), m_func(f_), m_v(v_) {}
 
-  inline __device__
-  void exec_range() const
-  {
-    if ( (index_type)blockIdx.x < m_rp.m_num_tiles && (index_type)threadIdx.y < m_rp.m_prod_tile_dims ) {
-      index_type m_offset[RP::rank]; // tile starting global id offset
-      index_type m_local_offset[RP::rank]; // tile starting global id offset
+  inline __device__ void exec_range() const {
+    if ((index_type)blockIdx.x < m_rp.m_num_tiles &&
+        (index_type)threadIdx.y < m_rp.m_prod_tile_dims) {
+      index_type m_offset[RP::rank];        // tile starting global id offset
+      index_type m_local_offset[RP::rank];  // tile starting global id offset
 
-      for ( index_type tileidx = (index_type)blockIdx.x; tileidx < m_rp.m_num_tiles; tileidx += gridDim.x ) {
-        index_type tile_idx = tileidx; // temp because tile_idx will be modified while determining tile starting point offsets
+      for (index_type tileidx = (index_type)blockIdx.x;
+           tileidx < m_rp.m_num_tiles; tileidx += gridDim.x) {
+        index_type tile_idx =
+            tileidx;  // temp because tile_idx will be modified while
+                      // determining tile starting point offsets
         index_type thrd_idx = (index_type)threadIdx.y;
-        bool in_bounds = true;
+        bool in_bounds      = true;
 
         // LL
         if (RP::inner_direction == RP::Left) {
-          for (int i=0; i<RP::rank; ++i) {
+          for (int i = 0; i < RP::rank; ++i) {
             // Deduce this blocks tile_id
-            m_offset[i] = (tile_idx % m_rp.m_tile_end[i]) * m_rp.m_tile[i] + m_rp.m_lower[i] ;
+            m_offset[i] = (tile_idx % m_rp.m_tile_end[i]) * m_rp.m_tile[i] +
+                          m_rp.m_lower[i];
             tile_idx /= m_rp.m_tile_end[i];
 
             m_local_offset[i] = (thrd_idx % m_rp.m_tile[i]);
             thrd_idx /= m_rp.m_tile[i];
 
             m_offset[i] += m_local_offset[i];
-            if ( !(m_offset[i] < m_rp.m_upper[i] && m_local_offset[i] < m_rp.m_tile[i]) ) {
+            if (!(m_offset[i] < m_rp.m_upper[i] &&
+                  m_local_offset[i] < m_rp.m_tile[i])) {
               in_bounds &= false;
             }
           }
-          if ( in_bounds )
-          {
-            m_func( m_offset[0], m_offset[1], m_v );
+          if (in_bounds) {
+            m_func(m_offset[0], m_offset[1], m_v);
           }
         }
         // LR
         else {
-          for (int i=RP::rank-1; i>=0; --i) {
-            m_offset[i] = (tile_idx % m_rp.m_tile_end[i]) * m_rp.m_tile[i] + m_rp.m_lower[i] ;
+          for (int i = RP::rank - 1; i >= 0; --i) {
+            m_offset[i] = (tile_idx % m_rp.m_tile_end[i]) * m_rp.m_tile[i] +
+                          m_rp.m_lower[i];
             tile_idx /= m_rp.m_tile_end[i];
 
             m_local_offset[i] = (thrd_idx % m_rp.m_tile[i]);
             thrd_idx /= m_rp.m_tile[i];
 
             m_offset[i] += m_local_offset[i];
-            if ( !(m_offset[i] < m_rp.m_upper[i] && m_local_offset[i] < m_rp.m_tile[i]) ) {
+            if (!(m_offset[i] < m_rp.m_upper[i] &&
+                  m_local_offset[i] < m_rp.m_tile[i])) {
               in_bounds &= false;
             }
           }
-          if ( in_bounds )
-          { m_func( m_offset[0], m_offset[1], m_v ); }
+          if (in_bounds) {
+            m_func(m_offset[0], m_offset[1], m_v);
+          }
         }
       }
     }
 
-  } //end exec_range
+  }  // end exec_range
 
-private:
-  const RP & m_rp;
-  const Functor & m_func;
-  ValueType & m_v;
+ private:
+  const RP& m_rp;
+  const Functor& m_func;
+  ValueType& m_v;
 };
 
-
 // Specializations for tag type
-template< typename RP , typename Functor , typename Tag, typename ValueType >
-struct DeviceIterateTile<2,RP,Functor,Tag, ValueType, typename std::enable_if< !is_array_type<ValueType>::value && !is_void< Tag >::value >::type >
-{
+template <typename RP, typename Functor, typename Tag, typename ValueType>
+struct DeviceIterateTile<
+    2, RP, Functor, Tag, ValueType,
+    typename std::enable_if<!is_array_type<ValueType>::value &&
+                            !is_void<Tag>::value>::type> {
   using index_type = typename RP::index_type;
 
-  inline __device__
-  DeviceIterateTile( const RP & rp_ , const Functor & f_ , ValueType & v_)
-  : m_rp(rp_)
-  , m_func(f_)
-  , m_v(v_)
-  {}
+  inline __device__ DeviceIterateTile(const RP& rp_, const Functor& f_,
+                                      ValueType& v_)
+      : m_rp(rp_), m_func(f_), m_v(v_) {}
 
-  inline __device__
-  void exec_range() const
-  {
-    if ( (index_type)blockIdx.x < m_rp.m_num_tiles && (index_type)threadIdx.y < m_rp.m_prod_tile_dims ) {
-      index_type m_offset[RP::rank]; // tile starting global id offset
-      index_type m_local_offset[RP::rank]; // tile starting global id offset
+  inline __device__ void exec_range() const {
+    if ((index_type)blockIdx.x < m_rp.m_num_tiles &&
+        (index_type)threadIdx.y < m_rp.m_prod_tile_dims) {
+      index_type m_offset[RP::rank];        // tile starting global id offset
+      index_type m_local_offset[RP::rank];  // tile starting global id offset
 
-      for ( index_type tileidx = (index_type)blockIdx.x; tileidx < m_rp.m_num_tiles; tileidx += gridDim.x ) {
-        index_type tile_idx = tileidx; // temp because tile_idx will be modified while determining tile starting point offsets
+      for (index_type tileidx = (index_type)blockIdx.x;
+           tileidx < m_rp.m_num_tiles; tileidx += gridDim.x) {
+        index_type tile_idx =
+            tileidx;  // temp because tile_idx will be modified while
+                      // determining tile starting point offsets
         index_type thrd_idx = (index_type)threadIdx.y;
-        bool in_bounds = true;
+        bool in_bounds      = true;
 
         // LL
         if (RP::inner_direction == RP::Left) {
-          for (int i=0; i<RP::rank; ++i) {
-            m_offset[i] = (tile_idx % m_rp.m_tile_end[i]) * m_rp.m_tile[i] + m_rp.m_lower[i] ;
+          for (int i = 0; i < RP::rank; ++i) {
+            m_offset[i] = (tile_idx % m_rp.m_tile_end[i]) * m_rp.m_tile[i] +
+                          m_rp.m_lower[i];
             tile_idx /= m_rp.m_tile_end[i];
 
             // tile-local indices identified with (index_type)threadIdx.y
@@ -1293,72 +1487,78 @@ struct DeviceIterateTile<2,RP,Functor,Tag, ValueType, typename std::enable_if< !
             thrd_idx /= m_rp.m_tile[i];
 
             m_offset[i] += m_local_offset[i];
-            if ( !(m_offset[i] < m_rp.m_upper[i] && m_local_offset[i] < m_rp.m_tile[i]) ) {
+            if (!(m_offset[i] < m_rp.m_upper[i] &&
+                  m_local_offset[i] < m_rp.m_tile[i])) {
               in_bounds &= false;
             }
           }
-          if ( in_bounds )
-          { m_func( Tag(), m_offset[0], m_offset[1], m_v ); }
+          if (in_bounds) {
+            m_func(Tag(), m_offset[0], m_offset[1], m_v);
+          }
         }
         // LR
         else {
-          for (int i=RP::rank-1; i>=0; --i) {
-            m_offset[i] = (tile_idx % m_rp.m_tile_end[i]) * m_rp.m_tile[i] + m_rp.m_lower[i] ;
+          for (int i = RP::rank - 1; i >= 0; --i) {
+            m_offset[i] = (tile_idx % m_rp.m_tile_end[i]) * m_rp.m_tile[i] +
+                          m_rp.m_lower[i];
             tile_idx /= m_rp.m_tile_end[i];
 
             // tile-local indices identified with (index_type)threadIdx.y
-            m_local_offset[i] = (thrd_idx % m_rp.m_tile[i]); // Move this to first computation, add to m_offset right away
+            m_local_offset[i] =
+                (thrd_idx % m_rp.m_tile[i]);  // Move this to first computation,
+                                              // add to m_offset right away
             thrd_idx /= m_rp.m_tile[i];
 
             m_offset[i] += m_local_offset[i];
-            if ( !(m_offset[i] < m_rp.m_upper[i] && m_local_offset[i] < m_rp.m_tile[i]) ) {
+            if (!(m_offset[i] < m_rp.m_upper[i] &&
+                  m_local_offset[i] < m_rp.m_tile[i])) {
               in_bounds &= false;
             }
           }
-          if ( in_bounds )
-          { m_func( Tag(), m_offset[0], m_offset[1], m_v ); }
+          if (in_bounds) {
+            m_func(Tag(), m_offset[0], m_offset[1], m_v);
+          }
         }
       }
     }
-  } //end exec_range
+  }  // end exec_range
 
-private:
-  const RP & m_rp;
-  const Functor & m_func;
-  ValueType & m_v;
+ private:
+  const RP& m_rp;
+  const Functor& m_func;
+  ValueType& m_v;
 };
 
-
-//Rank 3
+// Rank 3
 // Specializations for void tag type
-template< typename RP , typename Functor , typename ValueType >
-struct DeviceIterateTile<3,RP,Functor,void,ValueType , typename std::enable_if< !is_array_type<ValueType>::value >::type >
-{
+template <typename RP, typename Functor, typename ValueType>
+struct DeviceIterateTile<
+    3, RP, Functor, void, ValueType,
+    typename std::enable_if<!is_array_type<ValueType>::value>::type> {
   using index_type = typename RP::index_type;
 
-  __device__
-  DeviceIterateTile( const RP & rp_ , const Functor & f_ , ValueType & v_)
-  : m_rp(rp_)
-  , m_func(f_)
-  , m_v(v_)
-  {}
+  __device__ DeviceIterateTile(const RP& rp_, const Functor& f_, ValueType& v_)
+      : m_rp(rp_), m_func(f_), m_v(v_) {}
 
-  inline __device__
-  void exec_range() const
-  {
-    if ( (index_type)blockIdx.x < m_rp.m_num_tiles && (index_type)threadIdx.y < m_rp.m_prod_tile_dims ) {
-      index_type m_offset[RP::rank]; // tile starting global id offset
-      index_type m_local_offset[RP::rank]; // tile starting global id offset
+  inline __device__ void exec_range() const {
+    if ((index_type)blockIdx.x < m_rp.m_num_tiles &&
+        (index_type)threadIdx.y < m_rp.m_prod_tile_dims) {
+      index_type m_offset[RP::rank];        // tile starting global id offset
+      index_type m_local_offset[RP::rank];  // tile starting global id offset
 
-      for ( index_type tileidx = (index_type)blockIdx.x; tileidx < m_rp.m_num_tiles; tileidx += gridDim.x ) {
-        index_type tile_idx = tileidx; // temp because tile_idx will be modified while determining tile starting point offsets
+      for (index_type tileidx = (index_type)blockIdx.x;
+           tileidx < m_rp.m_num_tiles; tileidx += gridDim.x) {
+        index_type tile_idx =
+            tileidx;  // temp because tile_idx will be modified while
+                      // determining tile starting point offsets
         index_type thrd_idx = (index_type)threadIdx.y;
-        bool in_bounds = true;
+        bool in_bounds      = true;
 
         // LL
         if (RP::inner_direction == RP::Left) {
-          for (int i=0; i<RP::rank; ++i) {
-            m_offset[i] = (tile_idx % m_rp.m_tile_end[i]) * m_rp.m_tile[i] + m_rp.m_lower[i] ;
+          for (int i = 0; i < RP::rank; ++i) {
+            m_offset[i] = (tile_idx % m_rp.m_tile_end[i]) * m_rp.m_tile[i] +
+                          m_rp.m_lower[i];
             tile_idx /= m_rp.m_tile_end[i];
 
             // tile-local indices identified with (index_type)threadIdx.y
@@ -1366,71 +1566,79 @@ struct DeviceIterateTile<3,RP,Functor,void,ValueType , typename std::enable_if<
             thrd_idx /= m_rp.m_tile[i];
 
             m_offset[i] += m_local_offset[i];
-            if ( !(m_offset[i] < m_rp.m_upper[i] && m_local_offset[i] < m_rp.m_tile[i]) ) {
+            if (!(m_offset[i] < m_rp.m_upper[i] &&
+                  m_local_offset[i] < m_rp.m_tile[i])) {
               in_bounds &= false;
             }
           }
-          if ( in_bounds )
-          { m_func( m_offset[0], m_offset[1], m_offset[2], m_v ); }
+          if (in_bounds) {
+            m_func(m_offset[0], m_offset[1], m_offset[2], m_v);
+          }
         }
         // LR
         else {
-          for (int i=RP::rank-1; i>=0; --i) {
-            m_offset[i] = (tile_idx % m_rp.m_tile_end[i]) * m_rp.m_tile[i] + m_rp.m_lower[i] ;
+          for (int i = RP::rank - 1; i >= 0; --i) {
+            m_offset[i] = (tile_idx % m_rp.m_tile_end[i]) * m_rp.m_tile[i] +
+                          m_rp.m_lower[i];
             tile_idx /= m_rp.m_tile_end[i];
 
             // tile-local indices identified with (index_type)threadIdx.y
-            m_local_offset[i] = (thrd_idx % m_rp.m_tile[i]); // Move this to first computation, add to m_offset right away
+            m_local_offset[i] =
+                (thrd_idx % m_rp.m_tile[i]);  // Move this to first computation,
+                                              // add to m_offset right away
             thrd_idx /= m_rp.m_tile[i];
 
             m_offset[i] += m_local_offset[i];
-            if ( !(m_offset[i] < m_rp.m_upper[i] && m_local_offset[i] < m_rp.m_tile[i]) ) {
+            if (!(m_offset[i] < m_rp.m_upper[i] &&
+                  m_local_offset[i] < m_rp.m_tile[i])) {
               in_bounds &= false;
             }
           }
-          if ( in_bounds )
-          { m_func( m_offset[0], m_offset[1], m_offset[2], m_v ); }
+          if (in_bounds) {
+            m_func(m_offset[0], m_offset[1], m_offset[2], m_v);
+          }
         }
       }
     }
-  } //end exec_range
+  }  // end exec_range
 
-private:
-  const RP & m_rp;
-  const Functor & m_func;
-  ValueType & m_v;
+ private:
+  const RP& m_rp;
+  const Functor& m_func;
+  ValueType& m_v;
 };
 
-
 // Specializations for void tag type
-template< typename RP , typename Functor , typename Tag, typename ValueType >
-struct DeviceIterateTile<3,RP,Functor,Tag, ValueType, typename std::enable_if< !is_array_type<ValueType>::value && !is_void< Tag >::value >::type >
-{
+template <typename RP, typename Functor, typename Tag, typename ValueType>
+struct DeviceIterateTile<
+    3, RP, Functor, Tag, ValueType,
+    typename std::enable_if<!is_array_type<ValueType>::value &&
+                            !is_void<Tag>::value>::type> {
   using index_type = typename RP::index_type;
 
-  inline __device__
-  DeviceIterateTile( const RP & rp_ , const Functor & f_ , ValueType & v_)
-  : m_rp(rp_)
-  , m_func(f_)
-  , m_v(v_)
-  {}
+  inline __device__ DeviceIterateTile(const RP& rp_, const Functor& f_,
+                                      ValueType& v_)
+      : m_rp(rp_), m_func(f_), m_v(v_) {}
 
-  inline __device__
-  void exec_range() const
-  {
-    if ( (index_type)blockIdx.x < m_rp.m_num_tiles && (index_type)threadIdx.y < m_rp.m_prod_tile_dims ) {
-      index_type m_offset[RP::rank]; // tile starting global id offset
-      index_type m_local_offset[RP::rank]; // tile starting global id offset
+  inline __device__ void exec_range() const {
+    if ((index_type)blockIdx.x < m_rp.m_num_tiles &&
+        (index_type)threadIdx.y < m_rp.m_prod_tile_dims) {
+      index_type m_offset[RP::rank];        // tile starting global id offset
+      index_type m_local_offset[RP::rank];  // tile starting global id offset
 
-      for ( index_type tileidx = (index_type)blockIdx.x; tileidx < m_rp.m_num_tiles; tileidx += gridDim.x ) {
-        index_type tile_idx = tileidx; // temp because tile_idx will be modified while determining tile starting point offsets
+      for (index_type tileidx = (index_type)blockIdx.x;
+           tileidx < m_rp.m_num_tiles; tileidx += gridDim.x) {
+        index_type tile_idx =
+            tileidx;  // temp because tile_idx will be modified while
+                      // determining tile starting point offsets
         index_type thrd_idx = (index_type)threadIdx.y;
-        bool in_bounds = true;
+        bool in_bounds      = true;
 
         // LL
         if (RP::inner_direction == RP::Left) {
-          for (int i=0; i<RP::rank; ++i) {
-            m_offset[i] = (tile_idx % m_rp.m_tile_end[i]) * m_rp.m_tile[i] + m_rp.m_lower[i] ;
+          for (int i = 0; i < RP::rank; ++i) {
+            m_offset[i] = (tile_idx % m_rp.m_tile_end[i]) * m_rp.m_tile[i] +
+                          m_rp.m_lower[i];
             tile_idx /= m_rp.m_tile_end[i];
 
             // tile-local indices identified with (index_type)threadIdx.y
@@ -1438,77 +1646,86 @@ struct DeviceIterateTile<3,RP,Functor,Tag, ValueType, typename std::enable_if< !
             thrd_idx /= m_rp.m_tile[i];
 
             m_offset[i] += m_local_offset[i];
-            if ( !(m_offset[i] < m_rp.m_upper[i] && m_local_offset[i] < m_rp.m_tile[i]) ) {
+            if (!(m_offset[i] < m_rp.m_upper[i] &&
+                  m_local_offset[i] < m_rp.m_tile[i])) {
               in_bounds &= false;
             }
           }
-          if ( in_bounds )
-          { m_func( Tag(), m_offset[0], m_offset[1], m_offset[2], m_v ); }
+          if (in_bounds) {
+            m_func(Tag(), m_offset[0], m_offset[1], m_offset[2], m_v);
+          }
         }
         // LR
         else {
-          for (int i=RP::rank-1; i>=0; --i) {
-            m_offset[i] = (tile_idx % m_rp.m_tile_end[i]) * m_rp.m_tile[i] + m_rp.m_lower[i] ;
+          for (int i = RP::rank - 1; i >= 0; --i) {
+            m_offset[i] = (tile_idx % m_rp.m_tile_end[i]) * m_rp.m_tile[i] +
+                          m_rp.m_lower[i];
             tile_idx /= m_rp.m_tile_end[i];
 
             // tile-local indices identified with (index_type)threadIdx.y
-            m_local_offset[i] = (thrd_idx % m_rp.m_tile[i]); // Move this to first computation, add to m_offset right away
+            m_local_offset[i] =
+                (thrd_idx % m_rp.m_tile[i]);  // Move this to first computation,
+                                              // add to m_offset right away
             thrd_idx /= m_rp.m_tile[i];
 
             m_offset[i] += m_local_offset[i];
-            if ( !(m_offset[i] < m_rp.m_upper[i] && m_local_offset[i] < m_rp.m_tile[i]) ) {
+            if (!(m_offset[i] < m_rp.m_upper[i] &&
+                  m_local_offset[i] < m_rp.m_tile[i])) {
               in_bounds &= false;
             }
           }
-          if ( in_bounds )
-          { m_func( Tag(), m_offset[0], m_offset[1], m_offset[2], m_v ); }
+          if (in_bounds) {
+            m_func(Tag(), m_offset[0], m_offset[1], m_offset[2], m_v);
+          }
         }
       }
     }
-  } //end exec_range
+  }  // end exec_range
 
-private:
-  const RP & m_rp;
-  const Functor & m_func;
-  ValueType & m_v;
+ private:
+  const RP& m_rp;
+  const Functor& m_func;
+  ValueType& m_v;
 };
 
-
-//Rank 4
+// Rank 4
 // Specializations for void tag type
-template< typename RP , typename Functor , typename ValueType >
-struct DeviceIterateTile<4,RP,Functor,void,ValueType , typename std::enable_if< !is_array_type<ValueType>::value >::type >
-{
+template <typename RP, typename Functor, typename ValueType>
+struct DeviceIterateTile<
+    4, RP, Functor, void, ValueType,
+    typename std::enable_if<!is_array_type<ValueType>::value>::type> {
   using index_type = typename RP::index_type;
 
-  __device__
-  DeviceIterateTile( const RP & rp_ , const Functor & f_ , ValueType & v_)
-  : m_rp(rp_)
-  , m_func(f_)
-  , m_v(v_)
-  {}
+  __device__ DeviceIterateTile(const RP& rp_, const Functor& f_, ValueType& v_)
+      : m_rp(rp_), m_func(f_), m_v(v_) {}
 
   static constexpr index_type max_blocks = 65535;
-  //static constexpr index_type max_blocks = static_cast<index_type>(Kokkos::Impl::CudaTraits::UpperBoundGridCount);
+  // static constexpr index_type max_blocks =
+  // static_cast<index_type>(Kokkos::Impl::CudaTraits::UpperBoundGridCount);
 
-  inline __device__
-  void exec_range() const
-  {
-    //enum { max_blocks = static_cast<index_type>(Kokkos::Impl::CudaTraits::UpperBoundGridCount) };
-    //const index_type max_blocks = static_cast<index_type>( Kokkos::Impl::cuda_internal_maximum_grid_count() );
-    if ( (index_type)blockIdx.x < m_rp.m_num_tiles && (index_type)threadIdx.y < m_rp.m_prod_tile_dims ) {
-      index_type m_offset[RP::rank]; // tile starting global id offset
-      index_type m_local_offset[RP::rank]; // tile starting global id offset
+  inline __device__ void exec_range() const {
+    // enum { max_blocks =
+    // static_cast<index_type>(Kokkos::Impl::CudaTraits::UpperBoundGridCount) };
+    // const index_type max_blocks = static_cast<index_type>(
+    // Kokkos::Impl::cuda_internal_maximum_grid_count() );
+    if ((index_type)blockIdx.x < m_rp.m_num_tiles &&
+        (index_type)threadIdx.y < m_rp.m_prod_tile_dims) {
+      index_type m_offset[RP::rank];        // tile starting global id offset
+      index_type m_local_offset[RP::rank];  // tile starting global id offset
 
-      for ( index_type tileidx = (index_type)blockIdx.x; tileidx < m_rp.m_num_tiles; tileidx += gridDim.x ) {
-        index_type tile_idx = tileidx; // temp because tile_idx will be modified while determining tile starting point offsets
+      for (index_type tileidx = (index_type)blockIdx.x;
+           tileidx < m_rp.m_num_tiles; tileidx += gridDim.x) {
+        index_type tile_idx =
+            tileidx;  // temp because tile_idx will be modified while
+                      // determining tile starting point offsets
         index_type thrd_idx = (index_type)threadIdx.y;
-        bool in_bounds = true;
+        bool in_bounds      = true;
 
         // LL
         if (RP::inner_direction == RP::Left) {
-          for (int i=0; i<RP::rank; ++i) {
-            m_offset[i] = (tile_idx % m_rp.m_tile_end[i]) * m_rp.m_tile[i] + m_rp.m_lower[i] ;
+          for (int i = 0; i < RP::rank; ++i) {
+            m_offset[i] = (tile_idx % m_rp.m_tile_end[i]) * m_rp.m_tile[i] +
+                          m_rp.m_lower[i];
             tile_idx /= m_rp.m_tile_end[i];
 
             // tile-local indices identified with (index_type)threadIdx.y
@@ -1516,17 +1733,20 @@ struct DeviceIterateTile<4,RP,Functor,void,ValueType , typename std::enable_if<
             thrd_idx /= m_rp.m_tile[i];
 
             m_offset[i] += m_local_offset[i];
-            if ( !(m_offset[i] < m_rp.m_upper[i] && m_local_offset[i] < m_rp.m_tile[i]) ) {
+            if (!(m_offset[i] < m_rp.m_upper[i] &&
+                  m_local_offset[i] < m_rp.m_tile[i])) {
               in_bounds &= false;
             }
           }
-          if ( in_bounds )
-          { m_func( m_offset[0], m_offset[1], m_offset[2], m_offset[3], m_v ); }
+          if (in_bounds) {
+            m_func(m_offset[0], m_offset[1], m_offset[2], m_offset[3], m_v);
+          }
         }
         // LR
         else {
-          for (int i=RP::rank-1; i>=0; --i) {
-            m_offset[i] = (tile_idx % m_rp.m_tile_end[i]) * m_rp.m_tile[i] + m_rp.m_lower[i] ;
+          for (int i = RP::rank - 1; i >= 0; --i) {
+            m_offset[i] = (tile_idx % m_rp.m_tile_end[i]) * m_rp.m_tile[i] +
+                          m_rp.m_lower[i];
             tile_idx /= m_rp.m_tile_end[i];
 
             // tile-local indices identified with (index_type)threadIdx.y
@@ -1534,58 +1754,64 @@ struct DeviceIterateTile<4,RP,Functor,void,ValueType , typename std::enable_if<
             thrd_idx /= m_rp.m_tile[i];
 
             m_offset[i] += m_local_offset[i];
-            if ( !(m_offset[i] < m_rp.m_upper[i] && m_local_offset[i] < m_rp.m_tile[i]) ) {
+            if (!(m_offset[i] < m_rp.m_upper[i] &&
+                  m_local_offset[i] < m_rp.m_tile[i])) {
               in_bounds &= false;
             }
           }
-          if ( in_bounds )
-          { m_func( m_offset[0], m_offset[1], m_offset[2], m_offset[3], m_v ); }
+          if (in_bounds) {
+            m_func(m_offset[0], m_offset[1], m_offset[2], m_offset[3], m_v);
+          }
         }
       }
     }
-  } //end exec_range
+  }  // end exec_range
 
-private:
-  const RP & m_rp;
-  const Functor & m_func;
-  ValueType & m_v;
+ private:
+  const RP& m_rp;
+  const Functor& m_func;
+  ValueType& m_v;
 };
 
-
 // Specializations for void tag type
-template< typename RP , typename Functor , typename Tag, typename ValueType >
-struct DeviceIterateTile<4,RP,Functor,Tag,ValueType, typename std::enable_if< !is_array_type<ValueType>::value && !is_void< Tag >::value >::type >
-{
+template <typename RP, typename Functor, typename Tag, typename ValueType>
+struct DeviceIterateTile<
+    4, RP, Functor, Tag, ValueType,
+    typename std::enable_if<!is_array_type<ValueType>::value &&
+                            !is_void<Tag>::value>::type> {
   using index_type = typename RP::index_type;
 
-  inline __device__
-  DeviceIterateTile( const RP & rp_ , const Functor & f_ , ValueType & v_)
-  : m_rp(rp_)
-  , m_func(f_)
-  , m_v(v_)
-  {}
+  inline __device__ DeviceIterateTile(const RP& rp_, const Functor& f_,
+                                      ValueType& v_)
+      : m_rp(rp_), m_func(f_), m_v(v_) {}
 
   static constexpr index_type max_blocks = 65535;
-  //static constexpr index_type max_blocks = static_cast<index_type>(Kokkos::Impl::CudaTraits::UpperBoundGridCount);
+  // static constexpr index_type max_blocks =
+  // static_cast<index_type>(Kokkos::Impl::CudaTraits::UpperBoundGridCount);
 
-  inline __device__
-  void exec_range() const
-  {
-    //enum { max_blocks = static_cast<index_type>(Kokkos::Impl::CudaTraits::UpperBoundGridCount) };
-    //const index_type max_blocks = static_cast<index_type>( Kokkos::Impl::cuda_internal_maximum_grid_count() );
-    if ( (index_type)blockIdx.x < m_rp.m_num_tiles && (index_type)threadIdx.y < m_rp.m_prod_tile_dims ) {
-      index_type m_offset[RP::rank]; // tile starting global id offset
-      index_type m_local_offset[RP::rank]; // tile starting global id offset
+  inline __device__ void exec_range() const {
+    // enum { max_blocks =
+    // static_cast<index_type>(Kokkos::Impl::CudaTraits::UpperBoundGridCount) };
+    // const index_type max_blocks = static_cast<index_type>(
+    // Kokkos::Impl::cuda_internal_maximum_grid_count() );
+    if ((index_type)blockIdx.x < m_rp.m_num_tiles &&
+        (index_type)threadIdx.y < m_rp.m_prod_tile_dims) {
+      index_type m_offset[RP::rank];        // tile starting global id offset
+      index_type m_local_offset[RP::rank];  // tile starting global id offset
 
-      for ( index_type tileidx = (index_type)blockIdx.x; tileidx < m_rp.m_num_tiles; tileidx += gridDim.x ) {
-        index_type tile_idx = tileidx; // temp because tile_idx will be modified while determining tile starting point offsets
+      for (index_type tileidx = (index_type)blockIdx.x;
+           tileidx < m_rp.m_num_tiles; tileidx += gridDim.x) {
+        index_type tile_idx =
+            tileidx;  // temp because tile_idx will be modified while
+                      // determining tile starting point offsets
         index_type thrd_idx = (index_type)threadIdx.y;
-        bool in_bounds = true;
+        bool in_bounds      = true;
 
         // LL
         if (RP::inner_direction == RP::Left) {
-          for (int i=0; i<RP::rank; ++i) {
-            m_offset[i] = (tile_idx % m_rp.m_tile_end[i]) * m_rp.m_tile[i] + m_rp.m_lower[i] ;
+          for (int i = 0; i < RP::rank; ++i) {
+            m_offset[i] = (tile_idx % m_rp.m_tile_end[i]) * m_rp.m_tile[i] +
+                          m_rp.m_lower[i];
             tile_idx /= m_rp.m_tile_end[i];
 
             // tile-local indices identified with (index_type)threadIdx.y
@@ -1593,17 +1819,21 @@ struct DeviceIterateTile<4,RP,Functor,Tag,ValueType, typename std::enable_if< !i
             thrd_idx /= m_rp.m_tile[i];
 
             m_offset[i] += m_local_offset[i];
-            if ( !(m_offset[i] < m_rp.m_upper[i] && m_local_offset[i] < m_rp.m_tile[i]) ) {
+            if (!(m_offset[i] < m_rp.m_upper[i] &&
+                  m_local_offset[i] < m_rp.m_tile[i])) {
               in_bounds &= false;
             }
           }
-          if ( in_bounds )
-          { m_func( Tag(), m_offset[0], m_offset[1], m_offset[2], m_offset[3], m_v ); }
+          if (in_bounds) {
+            m_func(Tag(), m_offset[0], m_offset[1], m_offset[2], m_offset[3],
+                   m_v);
+          }
         }
         // LR
         else {
-          for (int i=RP::rank-1; i>=0; --i) {
-            m_offset[i] = (tile_idx % m_rp.m_tile_end[i]) * m_rp.m_tile[i] + m_rp.m_lower[i] ;
+          for (int i = RP::rank - 1; i >= 0; --i) {
+            m_offset[i] = (tile_idx % m_rp.m_tile_end[i]) * m_rp.m_tile[i] +
+                          m_rp.m_lower[i];
             tile_idx /= m_rp.m_tile_end[i];
 
             // tile-local indices identified with (index_type)threadIdx.y
@@ -1611,59 +1841,64 @@ struct DeviceIterateTile<4,RP,Functor,Tag,ValueType, typename std::enable_if< !i
             thrd_idx /= m_rp.m_tile[i];
 
             m_offset[i] += m_local_offset[i];
-            if ( !(m_offset[i] < m_rp.m_upper[i] && m_local_offset[i] < m_rp.m_tile[i]) ) {
+            if (!(m_offset[i] < m_rp.m_upper[i] &&
+                  m_local_offset[i] < m_rp.m_tile[i])) {
               in_bounds &= false;
             }
           }
-          if ( in_bounds )
-          { m_func( Tag(), m_offset[0], m_offset[1], m_offset[2], m_offset[3], m_v ); }
+          if (in_bounds) {
+            m_func(Tag(), m_offset[0], m_offset[1], m_offset[2], m_offset[3],
+                   m_v);
+          }
         }
       }
     }
-  } //end exec_range
+  }  // end exec_range
 
-private:
-  const RP & m_rp;
-  const Functor & m_func;
-  ValueType & m_v;
+ private:
+  const RP& m_rp;
+  const Functor& m_func;
+  ValueType& m_v;
 };
 
-
-//Rank 5
+// Rank 5
 // Specializations for void tag type
-template< typename RP , typename Functor , typename ValueType >
-struct DeviceIterateTile<5,RP,Functor,void,ValueType , typename std::enable_if< !is_array_type<ValueType>::value >::type >
-{
+template <typename RP, typename Functor, typename ValueType>
+struct DeviceIterateTile<
+    5, RP, Functor, void, ValueType,
+    typename std::enable_if<!is_array_type<ValueType>::value>::type> {
   using index_type = typename RP::index_type;
 
-  __device__
-  DeviceIterateTile( const RP & rp_ , const Functor & f_ , ValueType & v_)
-  : m_rp(rp_)
-  , m_func(f_)
-  , m_v(v_)
-  {}
+  __device__ DeviceIterateTile(const RP& rp_, const Functor& f_, ValueType& v_)
+      : m_rp(rp_), m_func(f_), m_v(v_) {}
 
   static constexpr index_type max_blocks = 65535;
-  //static constexpr index_type max_blocks = static_cast<index_type>(Kokkos::Impl::CudaTraits::UpperBoundGridCount);
+  // static constexpr index_type max_blocks =
+  // static_cast<index_type>(Kokkos::Impl::CudaTraits::UpperBoundGridCount);
 
-  inline __device__
-  void exec_range() const
-  {
-    //enum { max_blocks = static_cast<index_type>(Kokkos::Impl::CudaTraits::UpperBoundGridCount) };
-    //const index_type max_blocks = static_cast<index_type>( Kokkos::Impl::cuda_internal_maximum_grid_count() );
-    if ( (index_type)blockIdx.x < m_rp.m_num_tiles && (index_type)threadIdx.y < m_rp.m_prod_tile_dims ) {
-      index_type m_offset[RP::rank]; // tile starting global id offset
-      index_type m_local_offset[RP::rank]; // tile starting global id offset
+  inline __device__ void exec_range() const {
+    // enum { max_blocks =
+    // static_cast<index_type>(Kokkos::Impl::CudaTraits::UpperBoundGridCount) };
+    // const index_type max_blocks = static_cast<index_type>(
+    // Kokkos::Impl::cuda_internal_maximum_grid_count() );
+    if ((index_type)blockIdx.x < m_rp.m_num_tiles &&
+        (index_type)threadIdx.y < m_rp.m_prod_tile_dims) {
+      index_type m_offset[RP::rank];        // tile starting global id offset
+      index_type m_local_offset[RP::rank];  // tile starting global id offset
 
-      for ( index_type tileidx = (index_type)blockIdx.x; tileidx < m_rp.m_num_tiles; tileidx += gridDim.x ) {
-        index_type tile_idx = tileidx; // temp because tile_idx will be modified while determining tile starting point offsets
+      for (index_type tileidx = (index_type)blockIdx.x;
+           tileidx < m_rp.m_num_tiles; tileidx += gridDim.x) {
+        index_type tile_idx =
+            tileidx;  // temp because tile_idx will be modified while
+                      // determining tile starting point offsets
         index_type thrd_idx = (index_type)threadIdx.y;
-        bool in_bounds = true;
+        bool in_bounds      = true;
 
         // LL
         if (RP::inner_direction == RP::Left) {
-          for (int i=0; i<RP::rank; ++i) {
-            m_offset[i] = (tile_idx % m_rp.m_tile_end[i]) * m_rp.m_tile[i] + m_rp.m_lower[i] ;
+          for (int i = 0; i < RP::rank; ++i) {
+            m_offset[i] = (tile_idx % m_rp.m_tile_end[i]) * m_rp.m_tile[i] +
+                          m_rp.m_lower[i];
             tile_idx /= m_rp.m_tile_end[i];
 
             // tile-local indices identified with (index_type)threadIdx.y
@@ -1671,17 +1906,21 @@ struct DeviceIterateTile<5,RP,Functor,void,ValueType , typename std::enable_if<
             thrd_idx /= m_rp.m_tile[i];
 
             m_offset[i] += m_local_offset[i];
-            if ( !(m_offset[i] < m_rp.m_upper[i] && m_local_offset[i] < m_rp.m_tile[i]) ) {
+            if (!(m_offset[i] < m_rp.m_upper[i] &&
+                  m_local_offset[i] < m_rp.m_tile[i])) {
               in_bounds &= false;
             }
           }
-          if ( in_bounds )
-          { m_func( m_offset[0], m_offset[1], m_offset[2], m_offset[3], m_offset[4], m_v ); }
+          if (in_bounds) {
+            m_func(m_offset[0], m_offset[1], m_offset[2], m_offset[3],
+                   m_offset[4], m_v);
+          }
         }
         // LR
         else {
-          for (int i=RP::rank-1; i>=0; --i) {
-            m_offset[i] = (tile_idx % m_rp.m_tile_end[i]) * m_rp.m_tile[i] + m_rp.m_lower[i] ;
+          for (int i = RP::rank - 1; i >= 0; --i) {
+            m_offset[i] = (tile_idx % m_rp.m_tile_end[i]) * m_rp.m_tile[i] +
+                          m_rp.m_lower[i];
             tile_idx /= m_rp.m_tile_end[i];
 
             // tile-local indices identified with (index_type)threadIdx.y
@@ -1689,58 +1928,64 @@ struct DeviceIterateTile<5,RP,Functor,void,ValueType , typename std::enable_if<
             thrd_idx /= m_rp.m_tile[i];
 
             m_offset[i] += m_local_offset[i];
-            if ( !(m_offset[i] < m_rp.m_upper[i] && m_local_offset[i] < m_rp.m_tile[i]) ) {
+            if (!(m_offset[i] < m_rp.m_upper[i] &&
+                  m_local_offset[i] < m_rp.m_tile[i])) {
               in_bounds &= false;
             }
           }
-          if ( in_bounds )
-          { m_func( m_offset[0], m_offset[1], m_offset[2], m_offset[3], m_offset[4], m_v ); }
+          if (in_bounds) {
+            m_func(m_offset[0], m_offset[1], m_offset[2], m_offset[3],
+                   m_offset[4], m_v);
+          }
         }
       }
     }
-  } //end exec_range
+  }  // end exec_range
 
-private:
-  const RP & m_rp;
-  const Functor & m_func;
-  ValueType & m_v;
+ private:
+  const RP& m_rp;
+  const Functor& m_func;
+  ValueType& m_v;
 };
 
-
 // Specializations for tag type
-template< typename RP , typename Functor , typename Tag, typename ValueType >
-struct DeviceIterateTile<5,RP,Functor,Tag,ValueType, typename std::enable_if< !is_array_type<ValueType>::value && !is_void< Tag >::value >::type >
-{
+template <typename RP, typename Functor, typename Tag, typename ValueType>
+struct DeviceIterateTile<
+    5, RP, Functor, Tag, ValueType,
+    typename std::enable_if<!is_array_type<ValueType>::value &&
+                            !is_void<Tag>::value>::type> {
   using index_type = typename RP::index_type;
 
-  __device__
-  DeviceIterateTile( const RP & rp_ , const Functor & f_ , ValueType & v_)
-  : m_rp(rp_)
-  , m_func(f_)
-  , m_v(v_)
-  {}
+  __device__ DeviceIterateTile(const RP& rp_, const Functor& f_, ValueType& v_)
+      : m_rp(rp_), m_func(f_), m_v(v_) {}
 
   static constexpr index_type max_blocks = 65535;
-  //static constexpr index_type max_blocks = static_cast<index_type>(Kokkos::Impl::CudaTraits::UpperBoundGridCount);
+  // static constexpr index_type max_blocks =
+  // static_cast<index_type>(Kokkos::Impl::CudaTraits::UpperBoundGridCount);
 
-  inline __device__
-  void exec_range() const
-  {
-    //enum { max_blocks = static_cast<index_type>(Kokkos::Impl::CudaTraits::UpperBoundGridCount) };
-    //const index_type max_blocks = static_cast<index_type>( Kokkos::Impl::cuda_internal_maximum_grid_count() );
-    if ( (index_type)blockIdx.x < m_rp.m_num_tiles && (index_type)threadIdx.y < m_rp.m_prod_tile_dims ) {
-      index_type m_offset[RP::rank]; // tile starting global id offset
-      index_type m_local_offset[RP::rank]; // tile starting global id offset
+  inline __device__ void exec_range() const {
+    // enum { max_blocks =
+    // static_cast<index_type>(Kokkos::Impl::CudaTraits::UpperBoundGridCount) };
+    // const index_type max_blocks = static_cast<index_type>(
+    // Kokkos::Impl::cuda_internal_maximum_grid_count() );
+    if ((index_type)blockIdx.x < m_rp.m_num_tiles &&
+        (index_type)threadIdx.y < m_rp.m_prod_tile_dims) {
+      index_type m_offset[RP::rank];        // tile starting global id offset
+      index_type m_local_offset[RP::rank];  // tile starting global id offset
 
-      for ( index_type tileidx = (index_type)blockIdx.x; tileidx < m_rp.m_num_tiles; tileidx += gridDim.x ) {
-        index_type tile_idx = tileidx; // temp because tile_idx will be modified while determining tile starting point offsets
+      for (index_type tileidx = (index_type)blockIdx.x;
+           tileidx < m_rp.m_num_tiles; tileidx += gridDim.x) {
+        index_type tile_idx =
+            tileidx;  // temp because tile_idx will be modified while
+                      // determining tile starting point offsets
         index_type thrd_idx = (index_type)threadIdx.y;
-        bool in_bounds = true;
+        bool in_bounds      = true;
 
         // LL
         if (RP::inner_direction == RP::Left) {
-          for (int i=0; i<RP::rank; ++i) {
-            m_offset[i] = (tile_idx % m_rp.m_tile_end[i]) * m_rp.m_tile[i] + m_rp.m_lower[i] ;
+          for (int i = 0; i < RP::rank; ++i) {
+            m_offset[i] = (tile_idx % m_rp.m_tile_end[i]) * m_rp.m_tile[i] +
+                          m_rp.m_lower[i];
             tile_idx /= m_rp.m_tile_end[i];
 
             // tile-local indices identified with (index_type)threadIdx.y
@@ -1748,17 +1993,21 @@ struct DeviceIterateTile<5,RP,Functor,Tag,ValueType, typename std::enable_if< !i
             thrd_idx /= m_rp.m_tile[i];
 
             m_offset[i] += m_local_offset[i];
-            if ( !(m_offset[i] < m_rp.m_upper[i] && m_local_offset[i] < m_rp.m_tile[i]) ) {
+            if (!(m_offset[i] < m_rp.m_upper[i] &&
+                  m_local_offset[i] < m_rp.m_tile[i])) {
               in_bounds &= false;
             }
           }
-          if ( in_bounds )
-          { m_func( Tag(), m_offset[0], m_offset[1], m_offset[2], m_offset[3], m_offset[4], m_v ); }
+          if (in_bounds) {
+            m_func(Tag(), m_offset[0], m_offset[1], m_offset[2], m_offset[3],
+                   m_offset[4], m_v);
+          }
         }
         // LR
         else {
-          for (int i=RP::rank-1; i>=0; --i) {
-            m_offset[i] = (tile_idx % m_rp.m_tile_end[i]) * m_rp.m_tile[i] + m_rp.m_lower[i] ;
+          for (int i = RP::rank - 1; i >= 0; --i) {
+            m_offset[i] = (tile_idx % m_rp.m_tile_end[i]) * m_rp.m_tile[i] +
+                          m_rp.m_lower[i];
             tile_idx /= m_rp.m_tile_end[i];
 
             // tile-local indices identified with (index_type)threadIdx.y
@@ -1766,59 +2015,64 @@ struct DeviceIterateTile<5,RP,Functor,Tag,ValueType, typename std::enable_if< !i
             thrd_idx /= m_rp.m_tile[i];
 
             m_offset[i] += m_local_offset[i];
-            if ( !(m_offset[i] < m_rp.m_upper[i] && m_local_offset[i] < m_rp.m_tile[i]) ) {
+            if (!(m_offset[i] < m_rp.m_upper[i] &&
+                  m_local_offset[i] < m_rp.m_tile[i])) {
               in_bounds &= false;
             }
           }
-          if ( in_bounds )
-          { m_func( Tag(), m_offset[0], m_offset[1], m_offset[2], m_offset[3], m_offset[4], m_v ); }
+          if (in_bounds) {
+            m_func(Tag(), m_offset[0], m_offset[1], m_offset[2], m_offset[3],
+                   m_offset[4], m_v);
+          }
         }
       }
     }
-  } //end exec_range
+  }  // end exec_range
 
-private:
-  const RP & m_rp;
-  const Functor & m_func;
-  ValueType & m_v;
+ private:
+  const RP& m_rp;
+  const Functor& m_func;
+  ValueType& m_v;
 };
 
-
-//Rank 6
+// Rank 6
 // Specializations for void tag type
-template< typename RP , typename Functor , typename ValueType >
-struct DeviceIterateTile<6,RP,Functor,void,ValueType , typename std::enable_if< !is_array_type<ValueType>::value >::type >
-{
+template <typename RP, typename Functor, typename ValueType>
+struct DeviceIterateTile<
+    6, RP, Functor, void, ValueType,
+    typename std::enable_if<!is_array_type<ValueType>::value>::type> {
   using index_type = typename RP::index_type;
 
-  __device__
-  DeviceIterateTile( const RP & rp_ , const Functor & f_ , ValueType & v_)
-  : m_rp(rp_)
-  , m_func(f_)
-  , m_v(v_)
-  {}
+  __device__ DeviceIterateTile(const RP& rp_, const Functor& f_, ValueType& v_)
+      : m_rp(rp_), m_func(f_), m_v(v_) {}
 
   static constexpr index_type max_blocks = 65535;
-  //static constexpr index_type max_blocks = static_cast<index_type>(Kokkos::Impl::CudaTraits::UpperBoundGridCount);
+  // static constexpr index_type max_blocks =
+  // static_cast<index_type>(Kokkos::Impl::CudaTraits::UpperBoundGridCount);
 
-  inline __device__
-  void exec_range() const
-  {
-    //enum { max_blocks = static_cast<index_type>(Kokkos::Impl::CudaTraits::UpperBoundGridCount) };
-    //const index_type max_blocks = static_cast<index_type>( Kokkos::Impl::cuda_internal_maximum_grid_count() );
-    if ( (index_type)blockIdx.x < m_rp.m_num_tiles && (index_type)threadIdx.y < m_rp.m_prod_tile_dims ) {
-      index_type m_offset[RP::rank]; // tile starting global id offset
-      index_type m_local_offset[RP::rank]; // tile starting global id offset
+  inline __device__ void exec_range() const {
+    // enum { max_blocks =
+    // static_cast<index_type>(Kokkos::Impl::CudaTraits::UpperBoundGridCount) };
+    // const index_type max_blocks = static_cast<index_type>(
+    // Kokkos::Impl::cuda_internal_maximum_grid_count() );
+    if ((index_type)blockIdx.x < m_rp.m_num_tiles &&
+        (index_type)threadIdx.y < m_rp.m_prod_tile_dims) {
+      index_type m_offset[RP::rank];        // tile starting global id offset
+      index_type m_local_offset[RP::rank];  // tile starting global id offset
 
-      for ( index_type tileidx = (index_type)blockIdx.x; tileidx < m_rp.m_num_tiles; tileidx += gridDim.x ) {
-        index_type tile_idx = tileidx; // temp because tile_idx will be modified while determining tile starting point offsets
+      for (index_type tileidx = (index_type)blockIdx.x;
+           tileidx < m_rp.m_num_tiles; tileidx += gridDim.x) {
+        index_type tile_idx =
+            tileidx;  // temp because tile_idx will be modified while
+                      // determining tile starting point offsets
         index_type thrd_idx = (index_type)threadIdx.y;
-        bool in_bounds = true;
+        bool in_bounds      = true;
 
         // LL
         if (RP::inner_direction == RP::Left) {
-          for (int i=0; i<RP::rank; ++i) {
-            m_offset[i] = (tile_idx % m_rp.m_tile_end[i]) * m_rp.m_tile[i] + m_rp.m_lower[i] ;
+          for (int i = 0; i < RP::rank; ++i) {
+            m_offset[i] = (tile_idx % m_rp.m_tile_end[i]) * m_rp.m_tile[i] +
+                          m_rp.m_lower[i];
             tile_idx /= m_rp.m_tile_end[i];
 
             // tile-local indices identified with (index_type)threadIdx.y
@@ -1826,17 +2080,21 @@ struct DeviceIterateTile<6,RP,Functor,void,ValueType , typename std::enable_if<
             thrd_idx /= m_rp.m_tile[i];
 
             m_offset[i] += m_local_offset[i];
-            if ( !(m_offset[i] < m_rp.m_upper[i] && m_local_offset[i] < m_rp.m_tile[i]) ) {
+            if (!(m_offset[i] < m_rp.m_upper[i] &&
+                  m_local_offset[i] < m_rp.m_tile[i])) {
               in_bounds &= false;
             }
           }
-          if ( in_bounds )
-          { m_func( m_offset[0], m_offset[1], m_offset[2], m_offset[3], m_offset[4], m_offset[5], m_v ); }
+          if (in_bounds) {
+            m_func(m_offset[0], m_offset[1], m_offset[2], m_offset[3],
+                   m_offset[4], m_offset[5], m_v);
+          }
         }
         // LR
         else {
-          for (int i=RP::rank-1; i>=0; --i) {
-            m_offset[i] = (tile_idx % m_rp.m_tile_end[i]) * m_rp.m_tile[i] + m_rp.m_lower[i] ;
+          for (int i = RP::rank - 1; i >= 0; --i) {
+            m_offset[i] = (tile_idx % m_rp.m_tile_end[i]) * m_rp.m_tile[i] +
+                          m_rp.m_lower[i];
             tile_idx /= m_rp.m_tile_end[i];
 
             // tile-local indices identified with (index_type)threadIdx.y
@@ -1844,58 +2102,64 @@ struct DeviceIterateTile<6,RP,Functor,void,ValueType , typename std::enable_if<
             thrd_idx /= m_rp.m_tile[i];
 
             m_offset[i] += m_local_offset[i];
-            if ( !(m_offset[i] < m_rp.m_upper[i] && m_local_offset[i] < m_rp.m_tile[i]) ) {
+            if (!(m_offset[i] < m_rp.m_upper[i] &&
+                  m_local_offset[i] < m_rp.m_tile[i])) {
               in_bounds &= false;
             }
           }
-          if ( in_bounds )
-          { m_func( m_offset[0], m_offset[1], m_offset[2], m_offset[3], m_offset[4], m_offset[5], m_v ); }
+          if (in_bounds) {
+            m_func(m_offset[0], m_offset[1], m_offset[2], m_offset[3],
+                   m_offset[4], m_offset[5], m_v);
+          }
         }
       }
     }
-  } //end exec_range
+  }  // end exec_range
 
-private:
-  const RP & m_rp;
-  const Functor & m_func;
-  ValueType & m_v;
+ private:
+  const RP& m_rp;
+  const Functor& m_func;
+  ValueType& m_v;
 };
 
-
 // Specializations for tag type
-template< typename RP , typename Functor , typename Tag, typename ValueType >
-struct DeviceIterateTile<6,RP,Functor,Tag,ValueType, typename std::enable_if< !is_array_type<ValueType>::value && !is_void< Tag >::value >::type >
-{
+template <typename RP, typename Functor, typename Tag, typename ValueType>
+struct DeviceIterateTile<
+    6, RP, Functor, Tag, ValueType,
+    typename std::enable_if<!is_array_type<ValueType>::value &&
+                            !is_void<Tag>::value>::type> {
   using index_type = typename RP::index_type;
 
-  __device__
-  DeviceIterateTile( const RP & rp_ , const Functor & f_ , ValueType & v_)
-  : m_rp(rp_)
-  , m_func(f_)
-  , m_v(v_)
-  {}
+  __device__ DeviceIterateTile(const RP& rp_, const Functor& f_, ValueType& v_)
+      : m_rp(rp_), m_func(f_), m_v(v_) {}
 
   static constexpr index_type max_blocks = 65535;
-  //static constexpr index_type max_blocks = static_cast<index_type>(Kokkos::Impl::CudaTraits::UpperBoundGridCount);
+  // static constexpr index_type max_blocks =
+  // static_cast<index_type>(Kokkos::Impl::CudaTraits::UpperBoundGridCount);
 
-  inline __device__
-  void exec_range() const
-  {
-    //enum { max_blocks = static_cast<index_type>(Kokkos::Impl::CudaTraits::UpperBoundGridCount) };
-    //const index_type max_blocks = static_cast<index_type>( Kokkos::Impl::cuda_internal_maximum_grid_count() );
-    if ( (index_type)blockIdx.x < m_rp.m_num_tiles && (index_type)threadIdx.y < m_rp.m_prod_tile_dims ) {
-      index_type m_offset[RP::rank]; // tile starting global id offset
-      index_type m_local_offset[RP::rank]; // tile starting global id offset
+  inline __device__ void exec_range() const {
+    // enum { max_blocks =
+    // static_cast<index_type>(Kokkos::Impl::CudaTraits::UpperBoundGridCount) };
+    // const index_type max_blocks = static_cast<index_type>(
+    // Kokkos::Impl::cuda_internal_maximum_grid_count() );
+    if ((index_type)blockIdx.x < m_rp.m_num_tiles &&
+        (index_type)threadIdx.y < m_rp.m_prod_tile_dims) {
+      index_type m_offset[RP::rank];        // tile starting global id offset
+      index_type m_local_offset[RP::rank];  // tile starting global id offset
 
-      for ( index_type tileidx = (index_type)blockIdx.x; tileidx < m_rp.m_num_tiles; tileidx += gridDim.x ) {
-        index_type tile_idx = tileidx; // temp because tile_idx will be modified while determining tile starting point offsets
+      for (index_type tileidx = (index_type)blockIdx.x;
+           tileidx < m_rp.m_num_tiles; tileidx += gridDim.x) {
+        index_type tile_idx =
+            tileidx;  // temp because tile_idx will be modified while
+                      // determining tile starting point offsets
         index_type thrd_idx = (index_type)threadIdx.y;
-        bool in_bounds = true;
+        bool in_bounds      = true;
 
         // LL
         if (RP::inner_direction == RP::Left) {
-          for (int i=0; i<RP::rank; ++i) {
-            m_offset[i] = (tile_idx % m_rp.m_tile_end[i]) * m_rp.m_tile[i] + m_rp.m_lower[i] ;
+          for (int i = 0; i < RP::rank; ++i) {
+            m_offset[i] = (tile_idx % m_rp.m_tile_end[i]) * m_rp.m_tile[i] +
+                          m_rp.m_lower[i];
             tile_idx /= m_rp.m_tile_end[i];
 
             // tile-local indices identified with (index_type)threadIdx.y
@@ -1903,17 +2167,21 @@ struct DeviceIterateTile<6,RP,Functor,Tag,ValueType, typename std::enable_if< !i
             thrd_idx /= m_rp.m_tile[i];
 
             m_offset[i] += m_local_offset[i];
-            if ( !(m_offset[i] < m_rp.m_upper[i] && m_local_offset[i] < m_rp.m_tile[i]) ) {
+            if (!(m_offset[i] < m_rp.m_upper[i] &&
+                  m_local_offset[i] < m_rp.m_tile[i])) {
               in_bounds &= false;
             }
           }
-          if ( in_bounds )
-          { m_func( Tag(), m_offset[0], m_offset[1], m_offset[2], m_offset[3], m_offset[4], m_offset[5], m_v ); }
+          if (in_bounds) {
+            m_func(Tag(), m_offset[0], m_offset[1], m_offset[2], m_offset[3],
+                   m_offset[4], m_offset[5], m_v);
+          }
         }
         // LR
         else {
-          for (int i=RP::rank-1; i>=0; --i) {
-            m_offset[i] = (tile_idx % m_rp.m_tile_end[i]) * m_rp.m_tile[i] + m_rp.m_lower[i] ;
+          for (int i = RP::rank - 1; i >= 0; --i) {
+            m_offset[i] = (tile_idx % m_rp.m_tile_end[i]) * m_rp.m_tile[i] +
+                          m_rp.m_lower[i];
             tile_idx /= m_rp.m_tile_end[i];
 
             // tile-local indices identified with (index_type)threadIdx.y
@@ -1921,130 +2189,138 @@ struct DeviceIterateTile<6,RP,Functor,Tag,ValueType, typename std::enable_if< !i
             thrd_idx /= m_rp.m_tile[i];
 
             m_offset[i] += m_local_offset[i];
-            if ( !(m_offset[i] < m_rp.m_upper[i] && m_local_offset[i] < m_rp.m_tile[i]) ) {
+            if (!(m_offset[i] < m_rp.m_upper[i] &&
+                  m_local_offset[i] < m_rp.m_tile[i])) {
               in_bounds &= false;
             }
           }
-          if ( in_bounds )
-          { m_func( Tag(), m_offset[0], m_offset[1], m_offset[2], m_offset[3], m_offset[4], m_offset[5], m_v ); }
+          if (in_bounds) {
+            m_func(Tag(), m_offset[0], m_offset[1], m_offset[2], m_offset[3],
+                   m_offset[4], m_offset[5], m_v);
+          }
         }
       }
     }
-  } //end exec_range
+  }  // end exec_range
 
-private:
-  const RP & m_rp;
-  const Functor & m_func;
-  ValueType & m_v;
+ private:
+  const RP& m_rp;
+  const Functor& m_func;
+  ValueType& m_v;
 };
 
-
 // ValueType = T[], T*
-//Rank 2
+// Rank 2
 // Specializations for void tag type
-template< typename RP , typename Functor , typename ValueType >
-struct DeviceIterateTile<2,RP,Functor,void,ValueType, typename std::enable_if< is_array_type<ValueType>::value >::type >
-{
+template <typename RP, typename Functor, typename ValueType>
+struct DeviceIterateTile<
+    2, RP, Functor, void, ValueType,
+    typename std::enable_if<is_array_type<ValueType>::value>::type> {
   using index_type = typename RP::index_type;
-  using value_type = typename is_array_type< ValueType >::value_type;
+  using value_type = typename is_array_type<ValueType>::value_type;
 
-  __device__
-  DeviceIterateTile( const RP & rp_ , const Functor & f_ , value_type* v_)
-  : m_rp(rp_)
-  , m_func(f_)
-  , m_v(v_)
-  {}
+  __device__ DeviceIterateTile(const RP& rp_, const Functor& f_, value_type* v_)
+      : m_rp(rp_), m_func(f_), m_v(v_) {}
 
-  inline __device__
-  void exec_range() const
-  {
-    if ( (index_type)blockIdx.x < m_rp.m_num_tiles && (index_type)threadIdx.y < m_rp.m_prod_tile_dims ) {
-      index_type m_offset[RP::rank]; // tile starting global id offset
-      index_type m_local_offset[RP::rank]; // tile starting global id offset
+  inline __device__ void exec_range() const {
+    if ((index_type)blockIdx.x < m_rp.m_num_tiles &&
+        (index_type)threadIdx.y < m_rp.m_prod_tile_dims) {
+      index_type m_offset[RP::rank];        // tile starting global id offset
+      index_type m_local_offset[RP::rank];  // tile starting global id offset
 
-      for ( index_type tileidx = (index_type)blockIdx.x; tileidx < m_rp.m_num_tiles; tileidx += gridDim.x ) {
-        index_type tile_idx = tileidx; // temp because tile_idx will be modified while determining tile starting point offsets
+      for (index_type tileidx = (index_type)blockIdx.x;
+           tileidx < m_rp.m_num_tiles; tileidx += gridDim.x) {
+        index_type tile_idx =
+            tileidx;  // temp because tile_idx will be modified while
+                      // determining tile starting point offsets
         index_type thrd_idx = (index_type)threadIdx.y;
-        bool in_bounds = true;
+        bool in_bounds      = true;
 
         // LL
         if (RP::inner_direction == RP::Left) {
-          for (int i=0; i<RP::rank; ++i) {
-            m_offset[i] = (tile_idx % m_rp.m_tile_end[i]) * m_rp.m_tile[i] + m_rp.m_lower[i] ;
+          for (int i = 0; i < RP::rank; ++i) {
+            m_offset[i] = (tile_idx % m_rp.m_tile_end[i]) * m_rp.m_tile[i] +
+                          m_rp.m_lower[i];
             tile_idx /= m_rp.m_tile_end[i];
 
             m_local_offset[i] = (thrd_idx % m_rp.m_tile[i]);
             thrd_idx /= m_rp.m_tile[i];
 
             m_offset[i] += m_local_offset[i];
-            if ( !(m_offset[i] < m_rp.m_upper[i] && m_local_offset[i] < m_rp.m_tile[i]) ) {
+            if (!(m_offset[i] < m_rp.m_upper[i] &&
+                  m_local_offset[i] < m_rp.m_tile[i])) {
               in_bounds &= false;
             }
           }
-          if ( in_bounds )
-          {
-            m_func( m_offset[0], m_offset[1], m_v );
+          if (in_bounds) {
+            m_func(m_offset[0], m_offset[1], m_v);
           }
         }
         // LR
         else {
-          for (int i=RP::rank-1; i>=0; --i) {
-            m_offset[i] = (tile_idx % m_rp.m_tile_end[i]) * m_rp.m_tile[i] + m_rp.m_lower[i] ;
+          for (int i = RP::rank - 1; i >= 0; --i) {
+            m_offset[i] = (tile_idx % m_rp.m_tile_end[i]) * m_rp.m_tile[i] +
+                          m_rp.m_lower[i];
             tile_idx /= m_rp.m_tile_end[i];
 
             // tile-local indices identified with (index_type)threadIdx.y
-            m_local_offset[i] = (thrd_idx % m_rp.m_tile[i]); // Move this to first computation, add to m_offset right away
+            m_local_offset[i] =
+                (thrd_idx % m_rp.m_tile[i]);  // Move this to first computation,
+                                              // add to m_offset right away
             thrd_idx /= m_rp.m_tile[i];
 
             m_offset[i] += m_local_offset[i];
-            if ( !(m_offset[i] < m_rp.m_upper[i] && m_local_offset[i] < m_rp.m_tile[i]) ) {
+            if (!(m_offset[i] < m_rp.m_upper[i] &&
+                  m_local_offset[i] < m_rp.m_tile[i])) {
               in_bounds &= false;
             }
           }
-          if ( in_bounds )
-          { m_func( m_offset[0], m_offset[1], m_v ); }
+          if (in_bounds) {
+            m_func(m_offset[0], m_offset[1], m_v);
+          }
         }
       }
     }
-  } //end exec_range
+  }  // end exec_range
 
-private:
-  const RP & m_rp;
-  const Functor & m_func;
+ private:
+  const RP& m_rp;
+  const Functor& m_func;
   value_type* m_v;
 };
 
-
 // Specializations for tag type
-template< typename RP , typename Functor , typename Tag, typename ValueType >
-struct DeviceIterateTile<2,RP,Functor,Tag, ValueType, typename std::enable_if< is_array_type<ValueType>::value && !is_void< Tag >::value >::type >
-{
+template <typename RP, typename Functor, typename Tag, typename ValueType>
+struct DeviceIterateTile<
+    2, RP, Functor, Tag, ValueType,
+    typename std::enable_if<is_array_type<ValueType>::value &&
+                            !is_void<Tag>::value>::type> {
   using index_type = typename RP::index_type;
-  using value_type = typename is_array_type< ValueType >::value_type;
+  using value_type = typename is_array_type<ValueType>::value_type;
 
-  inline __device__
-  DeviceIterateTile( const RP & rp_ , const Functor & f_ , value_type* v_)
-  : m_rp(rp_)
-  , m_func(f_)
-  , m_v(v_)
-  {}
+  inline __device__ DeviceIterateTile(const RP& rp_, const Functor& f_,
+                                      value_type* v_)
+      : m_rp(rp_), m_func(f_), m_v(v_) {}
 
-  inline __device__
-  void exec_range() const
-  {
-    if ( (index_type)blockIdx.x < m_rp.m_num_tiles && (index_type)threadIdx.y < m_rp.m_prod_tile_dims ) {
-      index_type m_offset[RP::rank]; // tile starting global id offset
-      index_type m_local_offset[RP::rank]; // tile starting global id offset
+  inline __device__ void exec_range() const {
+    if ((index_type)blockIdx.x < m_rp.m_num_tiles &&
+        (index_type)threadIdx.y < m_rp.m_prod_tile_dims) {
+      index_type m_offset[RP::rank];        // tile starting global id offset
+      index_type m_local_offset[RP::rank];  // tile starting global id offset
 
-      for ( index_type tileidx = (index_type)blockIdx.x; tileidx < m_rp.m_num_tiles; tileidx += gridDim.x ) {
-        index_type tile_idx = tileidx; // temp because tile_idx will be modified while determining tile starting point offsets
+      for (index_type tileidx = (index_type)blockIdx.x;
+           tileidx < m_rp.m_num_tiles; tileidx += gridDim.x) {
+        index_type tile_idx =
+            tileidx;  // temp because tile_idx will be modified while
+                      // determining tile starting point offsets
         index_type thrd_idx = (index_type)threadIdx.y;
-        bool in_bounds = true;
+        bool in_bounds      = true;
 
         // LL
         if (RP::inner_direction == RP::Left) {
-          for (int i=0; i<RP::rank; ++i) {
-            m_offset[i] = (tile_idx % m_rp.m_tile_end[i]) * m_rp.m_tile[i] + m_rp.m_lower[i] ;
+          for (int i = 0; i < RP::rank; ++i) {
+            m_offset[i] = (tile_idx % m_rp.m_tile_end[i]) * m_rp.m_tile[i] +
+                          m_rp.m_lower[i];
             tile_idx /= m_rp.m_tile_end[i];
 
             // tile-local indices identified with (index_type)threadIdx.y
@@ -2052,17 +2328,20 @@ struct DeviceIterateTile<2,RP,Functor,Tag, ValueType, typename std::enable_if< i
             thrd_idx /= m_rp.m_tile[i];
 
             m_offset[i] += m_local_offset[i];
-            if ( !(m_offset[i] < m_rp.m_upper[i] && m_local_offset[i] < m_rp.m_tile[i]) ) {
+            if (!(m_offset[i] < m_rp.m_upper[i] &&
+                  m_local_offset[i] < m_rp.m_tile[i])) {
               in_bounds &= false;
             }
           }
-          if ( in_bounds )
-          { m_func( Tag(), m_offset[0], m_offset[1], m_v ); }
+          if (in_bounds) {
+            m_func(Tag(), m_offset[0], m_offset[1], m_v);
+          }
         }
         // LR
         else {
-          for (int i=RP::rank-1; i>=0; --i) {
-            m_offset[i] = (tile_idx % m_rp.m_tile_end[i]) * m_rp.m_tile[i] + m_rp.m_lower[i] ;
+          for (int i = RP::rank - 1; i >= 0; --i) {
+            m_offset[i] = (tile_idx % m_rp.m_tile_end[i]) * m_rp.m_tile[i] +
+                          m_rp.m_lower[i];
             tile_idx /= m_rp.m_tile_end[i];
 
             // tile-local indices identified with (index_type)threadIdx.y
@@ -2070,128 +2349,139 @@ struct DeviceIterateTile<2,RP,Functor,Tag, ValueType, typename std::enable_if< i
             thrd_idx /= m_rp.m_tile[i];
 
             m_offset[i] += m_local_offset[i];
-            if ( !(m_offset[i] < m_rp.m_upper[i] && m_local_offset[i] < m_rp.m_tile[i]) ) {
+            if (!(m_offset[i] < m_rp.m_upper[i] &&
+                  m_local_offset[i] < m_rp.m_tile[i])) {
               in_bounds &= false;
             }
           }
-          if ( in_bounds )
-          { m_func( Tag(), m_offset[0], m_offset[1], m_v ); }
+          if (in_bounds) {
+            m_func(Tag(), m_offset[0], m_offset[1], m_v);
+          }
         }
-      } //end for loop over num_tiles - product of tiles in each direction
+      }  // end for loop over num_tiles - product of tiles in each direction
     }
-  } //end exec_range
+  }  // end exec_range
 
-private:
-  const RP & m_rp;
-  const Functor & m_func;
+ private:
+  const RP& m_rp;
+  const Functor& m_func;
   value_type* m_v;
 };
 
-
-//Rank 3
+// Rank 3
 // Specializations for void tag type
-template< typename RP , typename Functor , typename ValueType >
-struct DeviceIterateTile<3,RP,Functor,void,ValueType , typename std::enable_if< is_array_type<ValueType>::value >::type >
-{
+template <typename RP, typename Functor, typename ValueType>
+struct DeviceIterateTile<
+    3, RP, Functor, void, ValueType,
+    typename std::enable_if<is_array_type<ValueType>::value>::type> {
   using index_type = typename RP::index_type;
-  using value_type = typename is_array_type< ValueType >::value_type;
+  using value_type = typename is_array_type<ValueType>::value_type;
 
-  __device__
-  DeviceIterateTile( const RP & rp_ , const Functor & f_ , value_type* v_)
-  : m_rp(rp_)
-  , m_func(f_)
-  , m_v(v_)
-  {}
+  __device__ DeviceIterateTile(const RP& rp_, const Functor& f_, value_type* v_)
+      : m_rp(rp_), m_func(f_), m_v(v_) {}
 
-  inline __device__
-  void exec_range() const
-  {
-    if ( (index_type)blockIdx.x < m_rp.m_num_tiles && (index_type)threadIdx.y < m_rp.m_prod_tile_dims ) {
-      index_type m_offset[RP::rank]; // tile starting global id offset
-      index_type m_local_offset[RP::rank]; // tile starting global id offset
+  inline __device__ void exec_range() const {
+    if ((index_type)blockIdx.x < m_rp.m_num_tiles &&
+        (index_type)threadIdx.y < m_rp.m_prod_tile_dims) {
+      index_type m_offset[RP::rank];        // tile starting global id offset
+      index_type m_local_offset[RP::rank];  // tile starting global id offset
 
-      for ( index_type tileidx = (index_type)blockIdx.x; tileidx < m_rp.m_num_tiles; tileidx += gridDim.x ) {
-        index_type tile_idx = tileidx; // temp because tile_idx will be modified while determining tile starting point offsets
+      for (index_type tileidx = (index_type)blockIdx.x;
+           tileidx < m_rp.m_num_tiles; tileidx += gridDim.x) {
+        index_type tile_idx =
+            tileidx;  // temp because tile_idx will be modified while
+                      // determining tile starting point offsets
         index_type thrd_idx = (index_type)threadIdx.y;
-        bool in_bounds = true;
+        bool in_bounds      = true;
 
         // LL
         if (RP::inner_direction == RP::Left) {
-          for (int i=0; i<RP::rank; ++i) {
-            m_offset[i] = (tile_idx % m_rp.m_tile_end[i]) * m_rp.m_tile[i] + m_rp.m_lower[i] ;
+          for (int i = 0; i < RP::rank; ++i) {
+            m_offset[i] = (tile_idx % m_rp.m_tile_end[i]) * m_rp.m_tile[i] +
+                          m_rp.m_lower[i];
             tile_idx /= m_rp.m_tile_end[i];
 
             // tile-local indices identified with (index_type)threadIdx.y
-            m_local_offset[i] = (thrd_idx % m_rp.m_tile[i]); // Move this to first computation, add to m_offset right away
+            m_local_offset[i] =
+                (thrd_idx % m_rp.m_tile[i]);  // Move this to first computation,
+                                              // add to m_offset right away
             thrd_idx /= m_rp.m_tile[i];
 
             m_offset[i] += m_local_offset[i];
-            if ( !(m_offset[i] < m_rp.m_upper[i] && m_local_offset[i] < m_rp.m_tile[i]) ) {
+            if (!(m_offset[i] < m_rp.m_upper[i] &&
+                  m_local_offset[i] < m_rp.m_tile[i])) {
               in_bounds &= false;
             }
           }
-          if ( in_bounds )
-          { m_func( m_offset[0], m_offset[1], m_offset[2], m_v ); }
+          if (in_bounds) {
+            m_func(m_offset[0], m_offset[1], m_offset[2], m_v);
+          }
         }
         // LR
         else {
-          for (int i=RP::rank-1; i>=0; --i) {
-            m_offset[i] = (tile_idx % m_rp.m_tile_end[i]) * m_rp.m_tile[i] + m_rp.m_lower[i] ;
+          for (int i = RP::rank - 1; i >= 0; --i) {
+            m_offset[i] = (tile_idx % m_rp.m_tile_end[i]) * m_rp.m_tile[i] +
+                          m_rp.m_lower[i];
             tile_idx /= m_rp.m_tile_end[i];
 
             // tile-local indices identified with (index_type)threadIdx.y
-            m_local_offset[i] = (thrd_idx % m_rp.m_tile[i]); // Move this to first computation, add to m_offset right away
+            m_local_offset[i] =
+                (thrd_idx % m_rp.m_tile[i]);  // Move this to first computation,
+                                              // add to m_offset right away
             thrd_idx /= m_rp.m_tile[i];
 
             m_offset[i] += m_local_offset[i];
-            if ( !(m_offset[i] < m_rp.m_upper[i] && m_local_offset[i] < m_rp.m_tile[i]) ) {
+            if (!(m_offset[i] < m_rp.m_upper[i] &&
+                  m_local_offset[i] < m_rp.m_tile[i])) {
               in_bounds &= false;
             }
           }
-          if ( in_bounds )
-          { m_func( m_offset[0], m_offset[1], m_offset[2], m_v ); }
+          if (in_bounds) {
+            m_func(m_offset[0], m_offset[1], m_offset[2], m_v);
+          }
         }
       }
     }
-  } //end exec_range
+  }  // end exec_range
 
-private:
-  const RP & m_rp;
-  const Functor & m_func;
+ private:
+  const RP& m_rp;
+  const Functor& m_func;
   value_type* m_v;
 };
 
-
 // Specializations for void tag type
-template< typename RP , typename Functor , typename Tag, typename ValueType >
-struct DeviceIterateTile<3,RP,Functor,Tag, ValueType, typename std::enable_if< is_array_type<ValueType>::value && !is_void< Tag >::value >::type >
-{
+template <typename RP, typename Functor, typename Tag, typename ValueType>
+struct DeviceIterateTile<
+    3, RP, Functor, Tag, ValueType,
+    typename std::enable_if<is_array_type<ValueType>::value &&
+                            !is_void<Tag>::value>::type> {
   using index_type = typename RP::index_type;
-  using value_type = typename is_array_type< ValueType >::value_type;
+  using value_type = typename is_array_type<ValueType>::value_type;
 
-  inline __device__
-  DeviceIterateTile( const RP & rp_ , const Functor & f_ , value_type* v_)
-  : m_rp(rp_)
-  , m_func(f_)
-  , m_v(v_)
-  {}
+  inline __device__ DeviceIterateTile(const RP& rp_, const Functor& f_,
+                                      value_type* v_)
+      : m_rp(rp_), m_func(f_), m_v(v_) {}
 
-  inline __device__
-  void exec_range() const
-  {
-    if ( (index_type)blockIdx.x < m_rp.m_num_tiles && (index_type)threadIdx.y < m_rp.m_prod_tile_dims ) {
-      index_type m_offset[RP::rank]; // tile starting global id offset
-      index_type m_local_offset[RP::rank]; // tile starting global id offset
+  inline __device__ void exec_range() const {
+    if ((index_type)blockIdx.x < m_rp.m_num_tiles &&
+        (index_type)threadIdx.y < m_rp.m_prod_tile_dims) {
+      index_type m_offset[RP::rank];        // tile starting global id offset
+      index_type m_local_offset[RP::rank];  // tile starting global id offset
 
-      for ( index_type tileidx = (index_type)blockIdx.x; tileidx < m_rp.m_num_tiles; tileidx += gridDim.x ) {
-        index_type tile_idx = tileidx; // temp because tile_idx will be modified while determining tile starting point offsets
+      for (index_type tileidx = (index_type)blockIdx.x;
+           tileidx < m_rp.m_num_tiles; tileidx += gridDim.x) {
+        index_type tile_idx =
+            tileidx;  // temp because tile_idx will be modified while
+                      // determining tile starting point offsets
         index_type thrd_idx = (index_type)threadIdx.y;
-        bool in_bounds = true;
+        bool in_bounds      = true;
 
         // LL
         if (RP::inner_direction == RP::Left) {
-          for (int i=0; i<RP::rank; ++i) {
-            m_offset[i] = (tile_idx % m_rp.m_tile_end[i]) * m_rp.m_tile[i] + m_rp.m_lower[i] ;
+          for (int i = 0; i < RP::rank; ++i) {
+            m_offset[i] = (tile_idx % m_rp.m_tile_end[i]) * m_rp.m_tile[i] +
+                          m_rp.m_lower[i];
             tile_idx /= m_rp.m_tile_end[i];
 
             // tile-local indices identified with (index_type)threadIdx.y
@@ -2199,17 +2489,20 @@ struct DeviceIterateTile<3,RP,Functor,Tag, ValueType, typename std::enable_if< i
             thrd_idx /= m_rp.m_tile[i];
 
             m_offset[i] += m_local_offset[i];
-            if ( !(m_offset[i] < m_rp.m_upper[i] && m_local_offset[i] < m_rp.m_tile[i]) ) {
+            if (!(m_offset[i] < m_rp.m_upper[i] &&
+                  m_local_offset[i] < m_rp.m_tile[i])) {
               in_bounds &= false;
             }
           }
-          if ( in_bounds )
-          { m_func( Tag(), m_offset[0], m_offset[1], m_offset[2], m_v ); }
+          if (in_bounds) {
+            m_func(Tag(), m_offset[0], m_offset[1], m_offset[2], m_v);
+          }
         }
         // LR
         else {
-          for (int i=RP::rank-1; i>=0; --i) {
-            m_offset[i] = (tile_idx % m_rp.m_tile_end[i]) * m_rp.m_tile[i] + m_rp.m_lower[i] ;
+          for (int i = RP::rank - 1; i >= 0; --i) {
+            m_offset[i] = (tile_idx % m_rp.m_tile_end[i]) * m_rp.m_tile[i] +
+                          m_rp.m_lower[i];
             tile_idx /= m_rp.m_tile_end[i];
 
             // tile-local indices identified with (index_type)threadIdx.y
@@ -2217,60 +2510,64 @@ struct DeviceIterateTile<3,RP,Functor,Tag, ValueType, typename std::enable_if< i
             thrd_idx /= m_rp.m_tile[i];
 
             m_offset[i] += m_local_offset[i];
-            if ( !(m_offset[i] < m_rp.m_upper[i] && m_local_offset[i] < m_rp.m_tile[i]) ) {
+            if (!(m_offset[i] < m_rp.m_upper[i] &&
+                  m_local_offset[i] < m_rp.m_tile[i])) {
               in_bounds &= false;
             }
           }
-          if ( in_bounds )
-          { m_func( Tag(), m_offset[0], m_offset[1], m_offset[2], m_v ); }
+          if (in_bounds) {
+            m_func(Tag(), m_offset[0], m_offset[1], m_offset[2], m_v);
+          }
         }
       }
     }
-  } //end exec_range
+  }  // end exec_range
 
-private:
-  const RP & m_rp;
-  const Functor & m_func;
+ private:
+  const RP& m_rp;
+  const Functor& m_func;
   value_type* m_v;
 };
 
-
-//Rank 4
+// Rank 4
 // Specializations for void tag type
-template< typename RP , typename Functor , typename ValueType >
-struct DeviceIterateTile<4,RP,Functor,void,ValueType , typename std::enable_if< is_array_type<ValueType>::value >::type >
-{
+template <typename RP, typename Functor, typename ValueType>
+struct DeviceIterateTile<
+    4, RP, Functor, void, ValueType,
+    typename std::enable_if<is_array_type<ValueType>::value>::type> {
   using index_type = typename RP::index_type;
-  using value_type = typename is_array_type< ValueType >::value_type;
+  using value_type = typename is_array_type<ValueType>::value_type;
 
-  __device__
-  DeviceIterateTile( const RP & rp_ , const Functor & f_ , value_type* v_)
-  : m_rp(rp_)
-  , m_func(f_)
-  , m_v(v_)
-  {}
+  __device__ DeviceIterateTile(const RP& rp_, const Functor& f_, value_type* v_)
+      : m_rp(rp_), m_func(f_), m_v(v_) {}
 
   static constexpr index_type max_blocks = 65535;
-  //static constexpr index_type max_blocks = static_cast<index_type>(Kokkos::Impl::CudaTraits::UpperBoundGridCount);
+  // static constexpr index_type max_blocks =
+  // static_cast<index_type>(Kokkos::Impl::CudaTraits::UpperBoundGridCount);
 
-  inline __device__
-  void exec_range() const
-  {
-    //enum { max_blocks = static_cast<index_type>(Kokkos::Impl::CudaTraits::UpperBoundGridCount) };
-    //const index_type max_blocks = static_cast<index_type>( Kokkos::Impl::cuda_internal_maximum_grid_count() );
-    if ( (index_type)blockIdx.x < m_rp.m_num_tiles && (index_type)threadIdx.y < m_rp.m_prod_tile_dims ) {
-      index_type m_offset[RP::rank]; // tile starting global id offset
-      index_type m_local_offset[RP::rank]; // tile starting global id offset
+  inline __device__ void exec_range() const {
+    // enum { max_blocks =
+    // static_cast<index_type>(Kokkos::Impl::CudaTraits::UpperBoundGridCount) };
+    // const index_type max_blocks = static_cast<index_type>(
+    // Kokkos::Impl::cuda_internal_maximum_grid_count() );
+    if ((index_type)blockIdx.x < m_rp.m_num_tiles &&
+        (index_type)threadIdx.y < m_rp.m_prod_tile_dims) {
+      index_type m_offset[RP::rank];        // tile starting global id offset
+      index_type m_local_offset[RP::rank];  // tile starting global id offset
 
-      for ( index_type tileidx = (index_type)blockIdx.x; tileidx < m_rp.m_num_tiles; tileidx += gridDim.x ) {
-        index_type tile_idx = tileidx; // temp because tile_idx will be modified while determining tile starting point offsets
+      for (index_type tileidx = (index_type)blockIdx.x;
+           tileidx < m_rp.m_num_tiles; tileidx += gridDim.x) {
+        index_type tile_idx =
+            tileidx;  // temp because tile_idx will be modified while
+                      // determining tile starting point offsets
         index_type thrd_idx = (index_type)threadIdx.y;
-        bool in_bounds = true;
+        bool in_bounds      = true;
 
         // LL
         if (RP::inner_direction == RP::Left) {
-          for (int i=0; i<RP::rank; ++i) {
-            m_offset[i] = (tile_idx % m_rp.m_tile_end[i]) * m_rp.m_tile[i] + m_rp.m_lower[i] ;
+          for (int i = 0; i < RP::rank; ++i) {
+            m_offset[i] = (tile_idx % m_rp.m_tile_end[i]) * m_rp.m_tile[i] +
+                          m_rp.m_lower[i];
             tile_idx /= m_rp.m_tile_end[i];
 
             // tile-local indices identified with (index_type)threadIdx.y
@@ -2278,17 +2575,20 @@ struct DeviceIterateTile<4,RP,Functor,void,ValueType , typename std::enable_if<
             thrd_idx /= m_rp.m_tile[i];
 
             m_offset[i] += m_local_offset[i];
-            if ( !(m_offset[i] < m_rp.m_upper[i] && m_local_offset[i] < m_rp.m_tile[i]) ) {
+            if (!(m_offset[i] < m_rp.m_upper[i] &&
+                  m_local_offset[i] < m_rp.m_tile[i])) {
               in_bounds &= false;
             }
           }
-          if ( in_bounds )
-          { m_func( m_offset[0], m_offset[1], m_offset[2], m_offset[3], m_v ); }
+          if (in_bounds) {
+            m_func(m_offset[0], m_offset[1], m_offset[2], m_offset[3], m_v);
+          }
         }
         // LR
         else {
-          for (int i=RP::rank-1; i>=0; --i) {
-            m_offset[i] = (tile_idx % m_rp.m_tile_end[i]) * m_rp.m_tile[i] + m_rp.m_lower[i] ;
+          for (int i = RP::rank - 1; i >= 0; --i) {
+            m_offset[i] = (tile_idx % m_rp.m_tile_end[i]) * m_rp.m_tile[i] +
+                          m_rp.m_lower[i];
             tile_idx /= m_rp.m_tile_end[i];
 
             // tile-local indices identified with (index_type)threadIdx.y
@@ -2296,59 +2596,65 @@ struct DeviceIterateTile<4,RP,Functor,void,ValueType , typename std::enable_if<
             thrd_idx /= m_rp.m_tile[i];
 
             m_offset[i] += m_local_offset[i];
-            if ( !(m_offset[i] < m_rp.m_upper[i] && m_local_offset[i] < m_rp.m_tile[i]) ) {
+            if (!(m_offset[i] < m_rp.m_upper[i] &&
+                  m_local_offset[i] < m_rp.m_tile[i])) {
               in_bounds &= false;
             }
           }
-          if ( in_bounds )
-          { m_func( m_offset[0], m_offset[1], m_offset[2], m_offset[3], m_v ); }
+          if (in_bounds) {
+            m_func(m_offset[0], m_offset[1], m_offset[2], m_offset[3], m_v);
+          }
         }
       }
     }
-  } //end exec_range
+  }  // end exec_range
 
-private:
-  const RP & m_rp;
-  const Functor & m_func;
+ private:
+  const RP& m_rp;
+  const Functor& m_func;
   value_type* m_v;
 };
 
-
 // Specializations for void tag type
-template< typename RP , typename Functor , typename Tag, typename ValueType >
-struct DeviceIterateTile<4,RP,Functor,Tag,ValueType, typename std::enable_if< is_array_type<ValueType>::value && !is_void< Tag >::value >::type >
-{
+template <typename RP, typename Functor, typename Tag, typename ValueType>
+struct DeviceIterateTile<
+    4, RP, Functor, Tag, ValueType,
+    typename std::enable_if<is_array_type<ValueType>::value &&
+                            !is_void<Tag>::value>::type> {
   using index_type = typename RP::index_type;
-  using value_type = typename is_array_type< ValueType >::value_type;
+  using value_type = typename is_array_type<ValueType>::value_type;
 
-  inline __device__
-  DeviceIterateTile( const RP & rp_ , const Functor & f_ , value_type* v_)
-  : m_rp(rp_)
-  , m_func(f_)
-  , m_v(v_)
-  {}
+  inline __device__ DeviceIterateTile(const RP& rp_, const Functor& f_,
+                                      value_type* v_)
+      : m_rp(rp_), m_func(f_), m_v(v_) {}
 
   static constexpr index_type max_blocks = 65535;
-  //static constexpr index_type max_blocks = static_cast<index_type>(Kokkos::Impl::CudaTraits::UpperBoundGridCount);
+  // static constexpr index_type max_blocks =
+  // static_cast<index_type>(Kokkos::Impl::CudaTraits::UpperBoundGridCount);
 
-  inline __device__
-  void exec_range() const
-  {
-    //enum { max_blocks = static_cast<index_type>(Kokkos::Impl::CudaTraits::UpperBoundGridCount) };
-    //const index_type max_blocks = static_cast<index_type>( Kokkos::Impl::cuda_internal_maximum_grid_count() );
-    if ( (index_type)blockIdx.x < m_rp.m_num_tiles && (index_type)threadIdx.y < m_rp.m_prod_tile_dims ) {
-      index_type m_offset[RP::rank]; // tile starting global id offset
-      index_type m_local_offset[RP::rank]; // tile starting global id offset
+  inline __device__ void exec_range() const {
+    // enum { max_blocks =
+    // static_cast<index_type>(Kokkos::Impl::CudaTraits::UpperBoundGridCount) };
+    // const index_type max_blocks = static_cast<index_type>(
+    // Kokkos::Impl::cuda_internal_maximum_grid_count() );
+    if ((index_type)blockIdx.x < m_rp.m_num_tiles &&
+        (index_type)threadIdx.y < m_rp.m_prod_tile_dims) {
+      index_type m_offset[RP::rank];        // tile starting global id offset
+      index_type m_local_offset[RP::rank];  // tile starting global id offset
 
-      for ( index_type tileidx = (index_type)blockIdx.x; tileidx < m_rp.m_num_tiles; tileidx += gridDim.x ) {
-        index_type tile_idx = tileidx; // temp because tile_idx will be modified while determining tile starting point offsets
+      for (index_type tileidx = (index_type)blockIdx.x;
+           tileidx < m_rp.m_num_tiles; tileidx += gridDim.x) {
+        index_type tile_idx =
+            tileidx;  // temp because tile_idx will be modified while
+                      // determining tile starting point offsets
         index_type thrd_idx = (index_type)threadIdx.y;
-        bool in_bounds = true;
+        bool in_bounds      = true;
 
         // LL
         if (RP::inner_direction == RP::Left) {
-          for (int i=0; i<RP::rank; ++i) {
-            m_offset[i] = (tile_idx % m_rp.m_tile_end[i]) * m_rp.m_tile[i] + m_rp.m_lower[i] ;
+          for (int i = 0; i < RP::rank; ++i) {
+            m_offset[i] = (tile_idx % m_rp.m_tile_end[i]) * m_rp.m_tile[i] +
+                          m_rp.m_lower[i];
             tile_idx /= m_rp.m_tile_end[i];
 
             // tile-local indices identified with (index_type)threadIdx.y
@@ -2356,17 +2662,21 @@ struct DeviceIterateTile<4,RP,Functor,Tag,ValueType, typename std::enable_if< is
             thrd_idx /= m_rp.m_tile[i];
 
             m_offset[i] += m_local_offset[i];
-            if ( !(m_offset[i] < m_rp.m_upper[i] && m_local_offset[i] < m_rp.m_tile[i]) ) {
+            if (!(m_offset[i] < m_rp.m_upper[i] &&
+                  m_local_offset[i] < m_rp.m_tile[i])) {
               in_bounds &= false;
             }
           }
-          if ( in_bounds )
-          { m_func( Tag(), m_offset[0], m_offset[1], m_offset[2], m_offset[3], m_v ); }
+          if (in_bounds) {
+            m_func(Tag(), m_offset[0], m_offset[1], m_offset[2], m_offset[3],
+                   m_v);
+          }
         }
         // LR
         else {
-          for (int i=RP::rank-1; i>=0; --i) {
-            m_offset[i] = (tile_idx % m_rp.m_tile_end[i]) * m_rp.m_tile[i] + m_rp.m_lower[i] ;
+          for (int i = RP::rank - 1; i >= 0; --i) {
+            m_offset[i] = (tile_idx % m_rp.m_tile_end[i]) * m_rp.m_tile[i] +
+                          m_rp.m_lower[i];
             tile_idx /= m_rp.m_tile_end[i];
 
             // tile-local indices identified with (index_type)threadIdx.y
@@ -2374,60 +2684,65 @@ struct DeviceIterateTile<4,RP,Functor,Tag,ValueType, typename std::enable_if< is
             thrd_idx /= m_rp.m_tile[i];
 
             m_offset[i] += m_local_offset[i];
-            if ( !(m_offset[i] < m_rp.m_upper[i] && m_local_offset[i] < m_rp.m_tile[i]) ) {
+            if (!(m_offset[i] < m_rp.m_upper[i] &&
+                  m_local_offset[i] < m_rp.m_tile[i])) {
               in_bounds &= false;
             }
           }
-          if ( in_bounds )
-          { m_func( Tag(), m_offset[0], m_offset[1], m_offset[2], m_offset[3], m_v ); }
+          if (in_bounds) {
+            m_func(Tag(), m_offset[0], m_offset[1], m_offset[2], m_offset[3],
+                   m_v);
+          }
         }
       }
     }
-  } //end exec_range
+  }  // end exec_range
 
-private:
-  const RP & m_rp;
-  const Functor & m_func;
+ private:
+  const RP& m_rp;
+  const Functor& m_func;
   value_type* m_v;
 };
 
-
-//Rank 5
+// Rank 5
 // Specializations for void tag type
-template< typename RP , typename Functor , typename ValueType >
-struct DeviceIterateTile<5,RP,Functor,void,ValueType , typename std::enable_if< is_array_type<ValueType>::value >::type >
-{
+template <typename RP, typename Functor, typename ValueType>
+struct DeviceIterateTile<
+    5, RP, Functor, void, ValueType,
+    typename std::enable_if<is_array_type<ValueType>::value>::type> {
   using index_type = typename RP::index_type;
-  using value_type = typename is_array_type< ValueType >::value_type;
+  using value_type = typename is_array_type<ValueType>::value_type;
 
-  __device__
-  DeviceIterateTile( const RP & rp_ , const Functor & f_ , value_type* v_)
-  : m_rp(rp_)
-  , m_func(f_)
-  , m_v(v_)
-  {}
+  __device__ DeviceIterateTile(const RP& rp_, const Functor& f_, value_type* v_)
+      : m_rp(rp_), m_func(f_), m_v(v_) {}
 
   static constexpr index_type max_blocks = 65535;
-  //static constexpr index_type max_blocks = static_cast<index_type>(Kokkos::Impl::CudaTraits::UpperBoundGridCount);
+  // static constexpr index_type max_blocks =
+  // static_cast<index_type>(Kokkos::Impl::CudaTraits::UpperBoundGridCount);
 
-  inline __device__
-  void exec_range() const
-  {
-    //enum { max_blocks = static_cast<index_type>(Kokkos::Impl::CudaTraits::UpperBoundGridCount) };
-    //const index_type max_blocks = static_cast<index_type>( Kokkos::Impl::cuda_internal_maximum_grid_count() );
-    if ( (index_type)blockIdx.x < m_rp.m_num_tiles && (index_type)threadIdx.y < m_rp.m_prod_tile_dims ) {
-      index_type m_offset[RP::rank]; // tile starting global id offset
-      index_type m_local_offset[RP::rank]; // tile starting global id offset
+  inline __device__ void exec_range() const {
+    // enum { max_blocks =
+    // static_cast<index_type>(Kokkos::Impl::CudaTraits::UpperBoundGridCount) };
+    // const index_type max_blocks = static_cast<index_type>(
+    // Kokkos::Impl::cuda_internal_maximum_grid_count() );
+    if ((index_type)blockIdx.x < m_rp.m_num_tiles &&
+        (index_type)threadIdx.y < m_rp.m_prod_tile_dims) {
+      index_type m_offset[RP::rank];        // tile starting global id offset
+      index_type m_local_offset[RP::rank];  // tile starting global id offset
 
-      for ( index_type tileidx = (index_type)blockIdx.x; tileidx < m_rp.m_num_tiles; tileidx += gridDim.x ) {
-        index_type tile_idx = tileidx; // temp because tile_idx will be modified while determining tile starting point offsets
+      for (index_type tileidx = (index_type)blockIdx.x;
+           tileidx < m_rp.m_num_tiles; tileidx += gridDim.x) {
+        index_type tile_idx =
+            tileidx;  // temp because tile_idx will be modified while
+                      // determining tile starting point offsets
         index_type thrd_idx = (index_type)threadIdx.y;
-        bool in_bounds = true;
+        bool in_bounds      = true;
 
         // LL
         if (RP::inner_direction == RP::Left) {
-          for (int i=0; i<RP::rank; ++i) {
-            m_offset[i] = (tile_idx % m_rp.m_tile_end[i]) * m_rp.m_tile[i] + m_rp.m_lower[i] ;
+          for (int i = 0; i < RP::rank; ++i) {
+            m_offset[i] = (tile_idx % m_rp.m_tile_end[i]) * m_rp.m_tile[i] +
+                          m_rp.m_lower[i];
             tile_idx /= m_rp.m_tile_end[i];
 
             // tile-local indices identified with (index_type)threadIdx.y
@@ -2435,17 +2750,21 @@ struct DeviceIterateTile<5,RP,Functor,void,ValueType , typename std::enable_if<
             thrd_idx /= m_rp.m_tile[i];
 
             m_offset[i] += m_local_offset[i];
-            if ( !(m_offset[i] < m_rp.m_upper[i] && m_local_offset[i] < m_rp.m_tile[i]) ) {
+            if (!(m_offset[i] < m_rp.m_upper[i] &&
+                  m_local_offset[i] < m_rp.m_tile[i])) {
               in_bounds &= false;
             }
           }
-          if ( in_bounds )
-          { m_func( m_offset[0], m_offset[1], m_offset[2], m_offset[3], m_offset[4], m_v ); }
+          if (in_bounds) {
+            m_func(m_offset[0], m_offset[1], m_offset[2], m_offset[3],
+                   m_offset[4], m_v);
+          }
         }
         // LR
         else {
-          for (int i=RP::rank-1; i>=0; --i) {
-            m_offset[i] = (tile_idx % m_rp.m_tile_end[i]) * m_rp.m_tile[i] + m_rp.m_lower[i] ;
+          for (int i = RP::rank - 1; i >= 0; --i) {
+            m_offset[i] = (tile_idx % m_rp.m_tile_end[i]) * m_rp.m_tile[i] +
+                          m_rp.m_lower[i];
             tile_idx /= m_rp.m_tile_end[i];
 
             // tile-local indices identified with (index_type)threadIdx.y
@@ -2453,59 +2772,65 @@ struct DeviceIterateTile<5,RP,Functor,void,ValueType , typename std::enable_if<
             thrd_idx /= m_rp.m_tile[i];
 
             m_offset[i] += m_local_offset[i];
-            if ( !(m_offset[i] < m_rp.m_upper[i] && m_local_offset[i] < m_rp.m_tile[i]) ) {
+            if (!(m_offset[i] < m_rp.m_upper[i] &&
+                  m_local_offset[i] < m_rp.m_tile[i])) {
               in_bounds &= false;
             }
           }
-          if ( in_bounds )
-          { m_func( m_offset[0], m_offset[1], m_offset[2], m_offset[3], m_offset[4], m_v ); }
+          if (in_bounds) {
+            m_func(m_offset[0], m_offset[1], m_offset[2], m_offset[3],
+                   m_offset[4], m_v);
+          }
         }
       }
     }
-  } //end exec_range
+  }  // end exec_range
 
-private:
-  const RP & m_rp;
-  const Functor & m_func;
+ private:
+  const RP& m_rp;
+  const Functor& m_func;
   value_type* m_v;
 };
 
-
 // Specializations for tag type
-template< typename RP , typename Functor , typename Tag, typename ValueType >
-struct DeviceIterateTile<5,RP,Functor,Tag,ValueType, typename std::enable_if< is_array_type<ValueType>::value && !is_void< Tag >::value >::type >
-{
+template <typename RP, typename Functor, typename Tag, typename ValueType>
+struct DeviceIterateTile<
+    5, RP, Functor, Tag, ValueType,
+    typename std::enable_if<is_array_type<ValueType>::value &&
+                            !is_void<Tag>::value>::type> {
   using index_type = typename RP::index_type;
-  using value_type = typename is_array_type< ValueType >::value_type;
+  using value_type = typename is_array_type<ValueType>::value_type;
 
-  __device__
-  DeviceIterateTile( const RP & rp_ , const Functor & f_ , value_type* v_)
-  : m_rp(rp_)
-  , m_func(f_)
-  , m_v(v_)
-  {}
+  __device__ DeviceIterateTile(const RP& rp_, const Functor& f_, value_type* v_)
+      : m_rp(rp_), m_func(f_), m_v(v_) {}
 
   static constexpr index_type max_blocks = 65535;
-  //static constexpr index_type max_blocks = static_cast<index_type>(Kokkos::Impl::CudaTraits::UpperBoundGridCount);
+  // static constexpr index_type max_blocks =
+  // static_cast<index_type>(Kokkos::Impl::CudaTraits::UpperBoundGridCount);
 
-  inline __device__
-  void exec_range() const
-  {
-    //enum { max_blocks = static_cast<index_type>(Kokkos::Impl::CudaTraits::UpperBoundGridCount) };
-    //const index_type max_blocks = static_cast<index_type>( Kokkos::Impl::cuda_internal_maximum_grid_count() );
-    if ( (index_type)blockIdx.x < m_rp.m_num_tiles && (index_type)threadIdx.y < m_rp.m_prod_tile_dims ) {
-      index_type m_offset[RP::rank]; // tile starting global id offset
-      index_type m_local_offset[RP::rank]; // tile starting global id offset
+  inline __device__ void exec_range() const {
+    // enum { max_blocks =
+    // static_cast<index_type>(Kokkos::Impl::CudaTraits::UpperBoundGridCount) };
+    // const index_type max_blocks = static_cast<index_type>(
+    // Kokkos::Impl::cuda_internal_maximum_grid_count() );
+    if ((index_type)blockIdx.x < m_rp.m_num_tiles &&
+        (index_type)threadIdx.y < m_rp.m_prod_tile_dims) {
+      index_type m_offset[RP::rank];        // tile starting global id offset
+      index_type m_local_offset[RP::rank];  // tile starting global id offset
 
-      for ( index_type tileidx = (index_type)blockIdx.x; tileidx < m_rp.m_num_tiles; tileidx += gridDim.x ) {
-        index_type tile_idx = tileidx; // temp because tile_idx will be modified while determining tile starting point offsets
+      for (index_type tileidx = (index_type)blockIdx.x;
+           tileidx < m_rp.m_num_tiles; tileidx += gridDim.x) {
+        index_type tile_idx =
+            tileidx;  // temp because tile_idx will be modified while
+                      // determining tile starting point offsets
         index_type thrd_idx = (index_type)threadIdx.y;
-        bool in_bounds = true;
+        bool in_bounds      = true;
 
         // LL
         if (RP::inner_direction == RP::Left) {
-          for (int i=0; i<RP::rank; ++i) {
-            m_offset[i] = (tile_idx % m_rp.m_tile_end[i]) * m_rp.m_tile[i] + m_rp.m_lower[i] ;
+          for (int i = 0; i < RP::rank; ++i) {
+            m_offset[i] = (tile_idx % m_rp.m_tile_end[i]) * m_rp.m_tile[i] +
+                          m_rp.m_lower[i];
             tile_idx /= m_rp.m_tile_end[i];
 
             // tile-local indices identified with (index_type)threadIdx.y
@@ -2513,17 +2838,21 @@ struct DeviceIterateTile<5,RP,Functor,Tag,ValueType, typename std::enable_if< is
             thrd_idx /= m_rp.m_tile[i];
 
             m_offset[i] += m_local_offset[i];
-            if ( !(m_offset[i] < m_rp.m_upper[i] && m_local_offset[i] < m_rp.m_tile[i]) ) {
+            if (!(m_offset[i] < m_rp.m_upper[i] &&
+                  m_local_offset[i] < m_rp.m_tile[i])) {
               in_bounds &= false;
             }
           }
-          if ( in_bounds )
-          { m_func( Tag(), m_offset[0], m_offset[1], m_offset[2], m_offset[3], m_offset[4], m_v ); }
+          if (in_bounds) {
+            m_func(Tag(), m_offset[0], m_offset[1], m_offset[2], m_offset[3],
+                   m_offset[4], m_v);
+          }
         }
         // LR
         else {
-          for (int i=RP::rank-1; i>=0; --i) {
-            m_offset[i] = (tile_idx % m_rp.m_tile_end[i]) * m_rp.m_tile[i] + m_rp.m_lower[i] ;
+          for (int i = RP::rank - 1; i >= 0; --i) {
+            m_offset[i] = (tile_idx % m_rp.m_tile_end[i]) * m_rp.m_tile[i] +
+                          m_rp.m_lower[i];
             tile_idx /= m_rp.m_tile_end[i];
 
             // tile-local indices identified with (index_type)threadIdx.y
@@ -2531,60 +2860,65 @@ struct DeviceIterateTile<5,RP,Functor,Tag,ValueType, typename std::enable_if< is
             thrd_idx /= m_rp.m_tile[i];
 
             m_offset[i] += m_local_offset[i];
-            if ( !(m_offset[i] < m_rp.m_upper[i] && m_local_offset[i] < m_rp.m_tile[i]) ) {
+            if (!(m_offset[i] < m_rp.m_upper[i] &&
+                  m_local_offset[i] < m_rp.m_tile[i])) {
               in_bounds &= false;
             }
           }
-          if ( in_bounds )
-          { m_func( Tag(), m_offset[0], m_offset[1], m_offset[2], m_offset[3], m_offset[4], m_v ); }
+          if (in_bounds) {
+            m_func(Tag(), m_offset[0], m_offset[1], m_offset[2], m_offset[3],
+                   m_offset[4], m_v);
+          }
         }
       }
     }
-  } //end exec_range
+  }  // end exec_range
 
-private:
-  const RP & m_rp;
-  const Functor & m_func;
+ private:
+  const RP& m_rp;
+  const Functor& m_func;
   value_type* m_v;
 };
 
-
-//Rank 6
+// Rank 6
 // Specializations for void tag type
-template< typename RP , typename Functor , typename ValueType >
-struct DeviceIterateTile<6,RP,Functor,void,ValueType , typename std::enable_if< is_array_type<ValueType>::value >::type >
-{
+template <typename RP, typename Functor, typename ValueType>
+struct DeviceIterateTile<
+    6, RP, Functor, void, ValueType,
+    typename std::enable_if<is_array_type<ValueType>::value>::type> {
   using index_type = typename RP::index_type;
-  using value_type = typename is_array_type< ValueType >::value_type;
+  using value_type = typename is_array_type<ValueType>::value_type;
 
-  __device__
-  DeviceIterateTile( const RP & rp_ , const Functor & f_ , value_type* v_)
-  : m_rp(rp_)
-  , m_func(f_)
-  , m_v(v_)
-  {}
+  __device__ DeviceIterateTile(const RP& rp_, const Functor& f_, value_type* v_)
+      : m_rp(rp_), m_func(f_), m_v(v_) {}
 
   static constexpr index_type max_blocks = 65535;
-  //static constexpr index_type max_blocks = static_cast<index_type>(Kokkos::Impl::CudaTraits::UpperBoundGridCount);
+  // static constexpr index_type max_blocks =
+  // static_cast<index_type>(Kokkos::Impl::CudaTraits::UpperBoundGridCount);
 
-  inline __device__
-  void exec_range() const
-  {
-    //enum { max_blocks = static_cast<index_type>(Kokkos::Impl::CudaTraits::UpperBoundGridCount) };
-    //const index_type max_blocks = static_cast<index_type>( Kokkos::Impl::cuda_internal_maximum_grid_count() );
-    if ( (index_type)blockIdx.x < m_rp.m_num_tiles && (index_type)threadIdx.y < m_rp.m_prod_tile_dims ) {
-      index_type m_offset[RP::rank]; // tile starting global id offset
-      index_type m_local_offset[RP::rank]; // tile starting global id offset
+  inline __device__ void exec_range() const {
+    // enum { max_blocks =
+    // static_cast<index_type>(Kokkos::Impl::CudaTraits::UpperBoundGridCount) };
+    // const index_type max_blocks = static_cast<index_type>(
+    // Kokkos::Impl::cuda_internal_maximum_grid_count() );
+    if ((index_type)blockIdx.x < m_rp.m_num_tiles &&
+        (index_type)threadIdx.y < m_rp.m_prod_tile_dims) {
+      index_type m_offset[RP::rank];        // tile starting global id offset
+      index_type m_local_offset[RP::rank];  // tile starting global id offset
 
-      for ( index_type tileidx = (index_type)blockIdx.x; tileidx < m_rp.m_num_tiles; tileidx += gridDim.x ) {
-        index_type tile_idx = tileidx; // temp because tile_idx will be modified while determining tile starting point offsets
+      for (index_type tileidx = (index_type)blockIdx.x;
+           tileidx < m_rp.m_num_tiles; tileidx += gridDim.x) {
+        index_type tile_idx =
+            tileidx;  // temp because tile_idx will be modified while
+                      // determining tile starting point offsets
         index_type thrd_idx = (index_type)threadIdx.y;
-        bool in_bounds = true;
+        bool in_bounds      = true;
 
         // LL
         if (RP::inner_direction == RP::Left) {
-          for (int i=0; i<RP::rank; ++i) {
-            m_offset[i] = (tile_idx % m_rp.m_tile_end[i]) * m_rp.m_tile[i] + m_rp.m_lower[i] ;
+          for (int i = 0; i < RP::rank; ++i) {
+            m_offset[i] = (tile_idx % m_rp.m_tile_end[i]) * m_rp.m_tile[i] +
+                          m_rp.m_lower[i];
             tile_idx /= m_rp.m_tile_end[i];
 
             // tile-local indices identified with (index_type)threadIdx.y
@@ -2592,17 +2926,21 @@ struct DeviceIterateTile<6,RP,Functor,void,ValueType , typename std::enable_if<
             thrd_idx /= m_rp.m_tile[i];
 
             m_offset[i] += m_local_offset[i];
-            if ( !(m_offset[i] < m_rp.m_upper[i] && m_local_offset[i] < m_rp.m_tile[i]) ) {
+            if (!(m_offset[i] < m_rp.m_upper[i] &&
+                  m_local_offset[i] < m_rp.m_tile[i])) {
               in_bounds &= false;
             }
           }
-          if ( in_bounds )
-          { m_func( m_offset[0], m_offset[1], m_offset[2], m_offset[3], m_offset[4], m_offset[5], m_v ); }
+          if (in_bounds) {
+            m_func(m_offset[0], m_offset[1], m_offset[2], m_offset[3],
+                   m_offset[4], m_offset[5], m_v);
+          }
         }
         // LR
         else {
-          for (int i=RP::rank-1; i>=0; --i) {
-            m_offset[i] = (tile_idx % m_rp.m_tile_end[i]) * m_rp.m_tile[i] + m_rp.m_lower[i] ;
+          for (int i = RP::rank - 1; i >= 0; --i) {
+            m_offset[i] = (tile_idx % m_rp.m_tile_end[i]) * m_rp.m_tile[i] +
+                          m_rp.m_lower[i];
             tile_idx /= m_rp.m_tile_end[i];
 
             // tile-local indices identified with (index_type)threadIdx.y
@@ -2610,59 +2948,65 @@ struct DeviceIterateTile<6,RP,Functor,void,ValueType , typename std::enable_if<
             thrd_idx /= m_rp.m_tile[i];
 
             m_offset[i] += m_local_offset[i];
-            if ( !(m_offset[i] < m_rp.m_upper[i] && m_local_offset[i] < m_rp.m_tile[i]) ) {
+            if (!(m_offset[i] < m_rp.m_upper[i] &&
+                  m_local_offset[i] < m_rp.m_tile[i])) {
               in_bounds &= false;
             }
           }
-          if ( in_bounds )
-          { m_func( m_offset[0], m_offset[1], m_offset[2], m_offset[3], m_offset[4], m_offset[5], m_v ); }
+          if (in_bounds) {
+            m_func(m_offset[0], m_offset[1], m_offset[2], m_offset[3],
+                   m_offset[4], m_offset[5], m_v);
+          }
         }
       }
     }
-  } //end exec_range
+  }  // end exec_range
 
-private:
-  const RP & m_rp;
-  const Functor & m_func;
+ private:
+  const RP& m_rp;
+  const Functor& m_func;
   value_type* m_v;
 };
 
-
 // Specializations for tag type
-template< typename RP , typename Functor , typename Tag, typename ValueType >
-struct DeviceIterateTile<6,RP,Functor,Tag,ValueType, typename std::enable_if< is_array_type<ValueType>::value && !is_void< Tag >::value >::type >
-{
+template <typename RP, typename Functor, typename Tag, typename ValueType>
+struct DeviceIterateTile<
+    6, RP, Functor, Tag, ValueType,
+    typename std::enable_if<is_array_type<ValueType>::value &&
+                            !is_void<Tag>::value>::type> {
   using index_type = typename RP::index_type;
-  using value_type = typename is_array_type< ValueType >::value_type;
+  using value_type = typename is_array_type<ValueType>::value_type;
 
-  __device__
-  DeviceIterateTile( const RP & rp_ , const Functor & f_ , value_type* v_)
-  : m_rp(rp_)
-  , m_func(f_)
-  , m_v(v_)
-  {}
+  __device__ DeviceIterateTile(const RP& rp_, const Functor& f_, value_type* v_)
+      : m_rp(rp_), m_func(f_), m_v(v_) {}
 
   static constexpr index_type max_blocks = 65535;
-  //static constexpr index_type max_blocks = static_cast<index_type>(Kokkos::Impl::CudaTraits::UpperBoundGridCount);
+  // static constexpr index_type max_blocks =
+  // static_cast<index_type>(Kokkos::Impl::CudaTraits::UpperBoundGridCount);
 
-  inline __device__
-  void exec_range() const
-  {
-    //enum { max_blocks = static_cast<index_type>(Kokkos::Impl::CudaTraits::UpperBoundGridCount) };
-    //const index_type max_blocks = static_cast<index_type>( Kokkos::Impl::cuda_internal_maximum_grid_count() );
-    if ( (index_type)blockIdx.x < m_rp.m_num_tiles && (index_type)threadIdx.y < m_rp.m_prod_tile_dims ) {
-      index_type m_offset[RP::rank]; // tile starting global id offset
-      index_type m_local_offset[RP::rank]; // tile starting global id offset
+  inline __device__ void exec_range() const {
+    // enum { max_blocks =
+    // static_cast<index_type>(Kokkos::Impl::CudaTraits::UpperBoundGridCount) };
+    // const index_type max_blocks = static_cast<index_type>(
+    // Kokkos::Impl::cuda_internal_maximum_grid_count() );
+    if ((index_type)blockIdx.x < m_rp.m_num_tiles &&
+        (index_type)threadIdx.y < m_rp.m_prod_tile_dims) {
+      index_type m_offset[RP::rank];        // tile starting global id offset
+      index_type m_local_offset[RP::rank];  // tile starting global id offset
 
-      for ( index_type tileidx = (index_type)blockIdx.x; tileidx < m_rp.m_num_tiles; tileidx += gridDim.x ) {
-        index_type tile_idx = tileidx; // temp because tile_idx will be modified while determining tile starting point offsets
+      for (index_type tileidx = (index_type)blockIdx.x;
+           tileidx < m_rp.m_num_tiles; tileidx += gridDim.x) {
+        index_type tile_idx =
+            tileidx;  // temp because tile_idx will be modified while
+                      // determining tile starting point offsets
         index_type thrd_idx = (index_type)threadIdx.y;
-        bool in_bounds = true;
+        bool in_bounds      = true;
 
         // LL
         if (RP::inner_direction == RP::Left) {
-          for (int i=0; i<RP::rank; ++i) {
-            m_offset[i] = (tile_idx % m_rp.m_tile_end[i]) * m_rp.m_tile[i] + m_rp.m_lower[i] ;
+          for (int i = 0; i < RP::rank; ++i) {
+            m_offset[i] = (tile_idx % m_rp.m_tile_end[i]) * m_rp.m_tile[i] +
+                          m_rp.m_lower[i];
             tile_idx /= m_rp.m_tile_end[i];
 
             // tile-local indices identified with (index_type)threadIdx.y
@@ -2670,17 +3014,21 @@ struct DeviceIterateTile<6,RP,Functor,Tag,ValueType, typename std::enable_if< is
             thrd_idx /= m_rp.m_tile[i];
 
             m_offset[i] += m_local_offset[i];
-            if ( !(m_offset[i] < m_rp.m_upper[i] && m_local_offset[i] < m_rp.m_tile[i]) ) {
+            if (!(m_offset[i] < m_rp.m_upper[i] &&
+                  m_local_offset[i] < m_rp.m_tile[i])) {
               in_bounds &= false;
             }
           }
-          if ( in_bounds )
-          { m_func( Tag(), m_offset[0], m_offset[1], m_offset[2], m_offset[3], m_offset[4], m_offset[5], m_v ); }
+          if (in_bounds) {
+            m_func(Tag(), m_offset[0], m_offset[1], m_offset[2], m_offset[3],
+                   m_offset[4], m_offset[5], m_v);
+          }
         }
         // LR
         else {
-          for (int i=RP::rank-1; i>=0; --i) {
-            m_offset[i] = (tile_idx % m_rp.m_tile_end[i]) * m_rp.m_tile[i] + m_rp.m_lower[i] ;
+          for (int i = RP::rank - 1; i >= 0; --i) {
+            m_offset[i] = (tile_idx % m_rp.m_tile_end[i]) * m_rp.m_tile[i] +
+                          m_rp.m_lower[i];
             tile_idx /= m_rp.m_tile_end[i];
 
             // tile-local indices identified with (index_type)threadIdx.y
@@ -2688,28 +3036,32 @@ struct DeviceIterateTile<6,RP,Functor,Tag,ValueType, typename std::enable_if< is
             thrd_idx /= m_rp.m_tile[i];
 
             m_offset[i] += m_local_offset[i];
-            if ( !(m_offset[i] < m_rp.m_upper[i] && m_local_offset[i] < m_rp.m_tile[i]) ) {
+            if (!(m_offset[i] < m_rp.m_upper[i] &&
+                  m_local_offset[i] < m_rp.m_tile[i])) {
               in_bounds &= false;
             }
           }
-          if ( in_bounds )
-          { m_func( Tag(), m_offset[0], m_offset[1], m_offset[2], m_offset[3], m_offset[4], m_offset[5], m_v ); }
+          if (in_bounds) {
+            m_func(Tag(), m_offset[0], m_offset[1], m_offset[2], m_offset[3],
+                   m_offset[4], m_offset[5], m_v);
+          }
         }
       }
     }
-  } //end exec_range
+  }  // end exec_range
 
-private:
-  const RP & m_rp;
-  const Functor & m_func;
+ private:
+  const RP& m_rp;
+  const Functor& m_func;
   value_type* m_v;
 };
 
-} // Reduce
+}  // namespace Reduce
 
 // ----------------------------------------------------------------------------------
 
-} } //end namespace Kokkos::Impl
+}  // namespace Impl
+}  // namespace Kokkos
 
 #endif
 #endif
diff --git a/lib/kokkos/core/src/Cuda/Kokkos_CudaSpace.cpp b/lib/kokkos/core/src/Cuda/Kokkos_CudaSpace.cpp
index 4c9ed47085..24be022d24 100644
--- a/lib/kokkos/core/src/Cuda/Kokkos_CudaSpace.cpp
+++ b/lib/kokkos/core/src/Cuda/Kokkos_CudaSpace.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -57,12 +58,12 @@
 
 //#include <Cuda/Kokkos_Cuda_BlockSize_Deduction.hpp>
 #include <impl/Kokkos_Error.hpp>
+#include <impl/Kokkos_MemorySpace.hpp>
 
 #if defined(KOKKOS_ENABLE_PROFILING)
 #include <impl/Kokkos_Profiling_Interface.hpp>
 #endif
 
-
 /*--------------------------------------------------------------------------*/
 /*--------------------------------------------------------------------------*/
 
@@ -71,68 +72,82 @@ namespace Impl {
 
 namespace {
 
-  static std::atomic<int> num_uvm_allocations(0) ;
+static std::atomic<int> num_uvm_allocations(0);
 
-   cudaStream_t get_deep_copy_stream() {
-     static cudaStream_t s = 0;
-     if( s == 0) {
-       cudaStreamCreate ( &s );
-     }
-     return s;
-   }
+cudaStream_t get_deep_copy_stream() {
+  static cudaStream_t s = 0;
+  if (s == 0) {
+    cudaStreamCreate(&s);
+  }
+  return s;
+}
+}  // namespace
+
+DeepCopy<CudaSpace, CudaSpace, Cuda>::DeepCopy(void *dst, const void *src,
+                                               size_t n) {
+  CUDA_SAFE_CALL(cudaMemcpy(dst, src, n, cudaMemcpyDefault));
 }
 
-DeepCopy<CudaSpace,CudaSpace,Cuda>::DeepCopy( void * dst , const void * src , size_t n )
-{ CUDA_SAFE_CALL( cudaMemcpy( dst , src , n , cudaMemcpyDefault ) ); }
+DeepCopy<HostSpace, CudaSpace, Cuda>::DeepCopy(void *dst, const void *src,
+                                               size_t n) {
+  CUDA_SAFE_CALL(cudaMemcpy(dst, src, n, cudaMemcpyDefault));
+}
 
-DeepCopy<HostSpace,CudaSpace,Cuda>::DeepCopy( void * dst , const void * src , size_t n )
-{ CUDA_SAFE_CALL( cudaMemcpy( dst , src , n , cudaMemcpyDefault ) ); }
+DeepCopy<CudaSpace, HostSpace, Cuda>::DeepCopy(void *dst, const void *src,
+                                               size_t n) {
+  CUDA_SAFE_CALL(cudaMemcpy(dst, src, n, cudaMemcpyDefault));
+}
 
-DeepCopy<CudaSpace,HostSpace,Cuda>::DeepCopy( void * dst , const void * src , size_t n )
-{ CUDA_SAFE_CALL( cudaMemcpy( dst , src , n , cudaMemcpyDefault ) ); }
+DeepCopy<CudaSpace, CudaSpace, Cuda>::DeepCopy(const Cuda &instance, void *dst,
+                                               const void *src, size_t n) {
+  CUDA_SAFE_CALL(
+      cudaMemcpyAsync(dst, src, n, cudaMemcpyDefault, instance.cuda_stream()));
+}
 
-DeepCopy<CudaSpace,CudaSpace,Cuda>::DeepCopy( const Cuda & instance , void * dst , const void * src , size_t n )
-{ CUDA_SAFE_CALL( cudaMemcpyAsync( dst , src , n , cudaMemcpyDefault , instance.cuda_stream() ) ); }
+DeepCopy<HostSpace, CudaSpace, Cuda>::DeepCopy(const Cuda &instance, void *dst,
+                                               const void *src, size_t n) {
+  CUDA_SAFE_CALL(
+      cudaMemcpyAsync(dst, src, n, cudaMemcpyDefault, instance.cuda_stream()));
+}
 
-DeepCopy<HostSpace,CudaSpace,Cuda>::DeepCopy( const Cuda & instance , void * dst , const void * src , size_t n )
-{ CUDA_SAFE_CALL( cudaMemcpyAsync( dst , src , n , cudaMemcpyDefault , instance.cuda_stream() ) ); }
+DeepCopy<CudaSpace, HostSpace, Cuda>::DeepCopy(const Cuda &instance, void *dst,
+                                               const void *src, size_t n) {
+  CUDA_SAFE_CALL(
+      cudaMemcpyAsync(dst, src, n, cudaMemcpyDefault, instance.cuda_stream()));
+}
 
-DeepCopy<CudaSpace,HostSpace,Cuda>::DeepCopy( const Cuda & instance , void * dst , const void * src , size_t n )
-{ CUDA_SAFE_CALL( cudaMemcpyAsync( dst , src , n , cudaMemcpyDefault , instance.cuda_stream() ) ); }
-
-void DeepCopyAsyncCuda( void * dst , const void * src , size_t n) {
+void DeepCopyAsyncCuda(void *dst, const void *src, size_t n) {
   cudaStream_t s = get_deep_copy_stream();
-  CUDA_SAFE_CALL( cudaMemcpyAsync( dst , src , n , cudaMemcpyDefault , s ) );
+  CUDA_SAFE_CALL(cudaMemcpyAsync(dst, src, n, cudaMemcpyDefault, s));
   cudaStreamSynchronize(s);
 }
 
-} // namespace Impl
-} // namespace Kokkos
+}  // namespace Impl
+}  // namespace Kokkos
 
 /*--------------------------------------------------------------------------*/
 /*--------------------------------------------------------------------------*/
 
-
 namespace Kokkos {
 
-void CudaSpace::access_error()
-{
-  const std::string msg("Kokkos::CudaSpace::access_error attempt to execute Cuda function from non-Cuda space" );
-  Kokkos::Impl::throw_runtime_exception( msg );
+void CudaSpace::access_error() {
+  const std::string msg(
+      "Kokkos::CudaSpace::access_error attempt to execute Cuda function from "
+      "non-Cuda space");
+  Kokkos::Impl::throw_runtime_exception(msg);
 }
 
-void CudaSpace::access_error( const void * const )
-{
-  const std::string msg("Kokkos::CudaSpace::access_error attempt to execute Cuda function from non-Cuda space" );
-  Kokkos::Impl::throw_runtime_exception( msg );
+void CudaSpace::access_error(const void *const) {
+  const std::string msg(
+      "Kokkos::CudaSpace::access_error attempt to execute Cuda function from "
+      "non-Cuda space");
+  Kokkos::Impl::throw_runtime_exception(msg);
 }
 
-
 /*--------------------------------------------------------------------------*/
 
-bool CudaUVMSpace::available()
-{
-#if defined( CUDA_VERSION ) && ( 6000 <= CUDA_VERSION ) && !defined(__APPLE__)
+bool CudaUVMSpace::available() {
+#if defined(CUDA_VERSION) && (6000 <= CUDA_VERSION) && !defined(__APPLE__)
   enum { UVM_available = true };
 #else
   enum { UVM_available = false };
@@ -142,99 +157,155 @@ bool CudaUVMSpace::available()
 
 /*--------------------------------------------------------------------------*/
 
-int CudaUVMSpace::number_of_allocations()
-{
+int CudaUVMSpace::number_of_allocations() {
   return Kokkos::Impl::num_uvm_allocations.load();
 }
+#ifdef KOKKOS_IMPL_DEBUG_CUDA_PIN_UVM_TO_HOST
+// The purpose of the following variable is to allow a state-based choice
+// for pinning UVM allocations to the CPU. For now this is considered
+// an experimental debugging capability - with the potential to work around
+// some CUDA issues.
+bool CudaUVMSpace::kokkos_impl_cuda_pin_uvm_to_host_v = false;
 
-} // namespace Kokkos
+bool CudaUVMSpace::cuda_pin_uvm_to_host() {
+  return CudaUVMSpace::kokkos_impl_cuda_pin_uvm_to_host_v;
+}
+void CudaUVMSpace::cuda_set_pin_uvm_to_host(bool val) {
+  CudaUVMSpace::kokkos_impl_cuda_pin_uvm_to_host_v = val;
+}
+#endif
+}  // namespace Kokkos
+
+#ifdef KOKKOS_IMPL_DEBUG_CUDA_PIN_UVM_TO_HOST
+bool kokkos_impl_cuda_pin_uvm_to_host() {
+  return Kokkos::CudaUVMSpace::cuda_pin_uvm_to_host();
+}
+
+void kokkos_impl_cuda_set_pin_uvm_to_host(bool val) {
+  Kokkos::CudaUVMSpace::cuda_set_pin_uvm_to_host(val);
+}
+#endif
 
 /*--------------------------------------------------------------------------*/
 /*--------------------------------------------------------------------------*/
 
 namespace Kokkos {
 
-CudaSpace::CudaSpace()
-  : m_device( Kokkos::Cuda().cuda_device() )
-{
+CudaSpace::CudaSpace() : m_device(Kokkos::Cuda().cuda_device()) {}
+
+CudaUVMSpace::CudaUVMSpace() : m_device(Kokkos::Cuda().cuda_device()) {}
+
+CudaHostPinnedSpace::CudaHostPinnedSpace() {}
+
+//==============================================================================
+// <editor-fold desc="allocate()"> {{{1
+
+void *CudaSpace::allocate(const size_t arg_alloc_size) const {
+  void *ptr = nullptr;
+
+  auto error_code = cudaMalloc(&ptr, arg_alloc_size);
+  if (error_code != cudaSuccess) {  // TODO tag as unlikely branch
+    cudaGetLastError();  // This is the only way to clear the last error, which
+                         // we should do here since we're turning it into an
+                         // exception here
+    throw Experimental::CudaRawMemoryAllocationFailure(
+        arg_alloc_size, error_code,
+        Experimental::RawMemoryAllocationFailure::AllocationMechanism::
+            CudaMalloc);
+  }
+  return ptr;
 }
 
-CudaUVMSpace::CudaUVMSpace()
-  : m_device( Kokkos::Cuda().cuda_device() )
-{
-}
-
-CudaHostPinnedSpace::CudaHostPinnedSpace()
-{
-}
-
-void * CudaSpace::allocate( const size_t arg_alloc_size ) const
-{
-  void * ptr = NULL;
-
-  CUDA_SAFE_CALL( cudaMalloc( &ptr, arg_alloc_size ) );
-
-  return ptr ;
-}
-
-void * CudaUVMSpace::allocate( const size_t arg_alloc_size ) const
-{
-  void * ptr = NULL;
+void *CudaUVMSpace::allocate(const size_t arg_alloc_size) const {
+  void *ptr = nullptr;
 
   enum { max_uvm_allocations = 65536 };
 
   Cuda::impl_static_fence();
-  if ( arg_alloc_size > 0 )
-  {
+  if (arg_alloc_size > 0) {
     Kokkos::Impl::num_uvm_allocations++;
 
-    if ( Kokkos::Impl::num_uvm_allocations.load() > max_uvm_allocations ) {
-      Kokkos::Impl::throw_runtime_exception( "CudaUVM error: The maximum limit of UVM allocations exceeded (currently 65536)." ) ;
+    if (Kokkos::Impl::num_uvm_allocations.load() > max_uvm_allocations) {
+      throw Experimental::CudaRawMemoryAllocationFailure(
+          arg_alloc_size, 1,
+          Experimental::RawMemoryAllocationFailure::FailureMode::
+              MaximumCudaUVMAllocationsExceeded);
     }
 
-    CUDA_SAFE_CALL( cudaMallocManaged( &ptr, arg_alloc_size , cudaMemAttachGlobal ) );
+    auto error_code =
+        cudaMallocManaged(&ptr, arg_alloc_size, cudaMemAttachGlobal);
+
+#ifdef KOKKOS_IMPL_DEBUG_CUDA_PIN_UVM_TO_HOST
+    if (Kokkos::CudaUVMSpace::cuda_pin_uvm_to_host())
+      cudaMemAdvise(ptr, arg_alloc_size, cudaMemAdviseSetPreferredLocation,
+                    cudaCpuDeviceId);
+#endif
+
+    if (error_code != cudaSuccess) {  // TODO tag as unlikely branch
+      cudaGetLastError();  // This is the only way to clear the last error,
+                           // which we should do here since we're turning it
+                           // into an exception here
+      throw Experimental::CudaRawMemoryAllocationFailure(
+          arg_alloc_size, error_code,
+          Experimental::RawMemoryAllocationFailure::AllocationMechanism::
+              CudaMallocManaged);
+    }
   }
   Cuda::impl_static_fence();
 
-  return ptr ;
+  return ptr;
 }
 
-void * CudaHostPinnedSpace::allocate( const size_t arg_alloc_size ) const
-{
-  void * ptr = NULL;
+void *CudaHostPinnedSpace::allocate(const size_t arg_alloc_size) const {
+  void *ptr = nullptr;
 
-  CUDA_SAFE_CALL( cudaHostAlloc( &ptr, arg_alloc_size , cudaHostAllocDefault ) );
+  auto error_code = cudaHostAlloc(&ptr, arg_alloc_size, cudaHostAllocDefault);
+  if (error_code != cudaSuccess) {  // TODO tag as unlikely branch
+    cudaGetLastError();  // This is the only way to clear the last error, which
+                         // we should do here since we're turning it into an
+                         // exception here
+    throw Experimental::CudaRawMemoryAllocationFailure(
+        arg_alloc_size, error_code,
+        Experimental::RawMemoryAllocationFailure::AllocationMechanism::
+            CudaHostAlloc);
+  }
 
-  return ptr ;
+  return ptr;
 }
 
-void CudaSpace::deallocate( void * const arg_alloc_ptr , const size_t /* arg_alloc_size */ ) const
-{
+// </editor-fold> end allocate() }}}1
+//==============================================================================
+
+void CudaSpace::deallocate(void *const arg_alloc_ptr,
+                           const size_t /* arg_alloc_size */) const {
   try {
-    CUDA_SAFE_CALL( cudaFree( arg_alloc_ptr ) );
-  } catch(...) {}
+    CUDA_SAFE_CALL(cudaFree(arg_alloc_ptr));
+  } catch (...) {
+  }
 }
 
-void CudaUVMSpace::deallocate( void * const arg_alloc_ptr , const size_t /* arg_alloc_size */ ) const
-{
+void CudaUVMSpace::deallocate(void *const arg_alloc_ptr,
+                              const size_t /* arg_alloc_size */) const {
   Cuda::impl_static_fence();
   try {
-    if ( arg_alloc_ptr != nullptr ) {
+    if (arg_alloc_ptr != nullptr) {
       Kokkos::Impl::num_uvm_allocations--;
-      CUDA_SAFE_CALL( cudaFree( arg_alloc_ptr ) );
+      CUDA_SAFE_CALL(cudaFree(arg_alloc_ptr));
     }
-  } catch(...) {}
+  } catch (...) {
+  }
   Cuda::impl_static_fence();
 }
 
-void CudaHostPinnedSpace::deallocate( void * const arg_alloc_ptr , const size_t /* arg_alloc_size */ ) const
-{
+void CudaHostPinnedSpace::deallocate(void *const arg_alloc_ptr,
+                                     const size_t /* arg_alloc_size */) const {
   try {
-    CUDA_SAFE_CALL( cudaFreeHost( arg_alloc_ptr ) );
-  } catch(...) {}
+    CUDA_SAFE_CALL(cudaFreeHost(arg_alloc_ptr));
+  } catch (...) {
+  }
 }
 
-} // namespace Kokkos
+}  // namespace Kokkos
 
 //----------------------------------------------------------------------------
 //----------------------------------------------------------------------------
@@ -243,606 +314,611 @@ namespace Kokkos {
 namespace Impl {
 
 #ifdef KOKKOS_DEBUG
-SharedAllocationRecord< void , void >
-SharedAllocationRecord< Kokkos::CudaSpace , void >::s_root_record ;
+SharedAllocationRecord<void, void>
+    SharedAllocationRecord<Kokkos::CudaSpace, void>::s_root_record;
 
-SharedAllocationRecord< void , void >
-SharedAllocationRecord< Kokkos::CudaUVMSpace , void >::s_root_record ;
+SharedAllocationRecord<void, void>
+    SharedAllocationRecord<Kokkos::CudaUVMSpace, void>::s_root_record;
 
-SharedAllocationRecord< void , void >
-SharedAllocationRecord< Kokkos::CudaHostPinnedSpace , void >::s_root_record ;
+SharedAllocationRecord<void, void>
+    SharedAllocationRecord<Kokkos::CudaHostPinnedSpace, void>::s_root_record;
 #endif
 
 ::cudaTextureObject_t
-SharedAllocationRecord< Kokkos::CudaSpace , void >::
-attach_texture_object( const unsigned sizeof_alias
-                     , void *   const alloc_ptr
-                     , size_t   const alloc_size )
-{
+SharedAllocationRecord<Kokkos::CudaSpace, void>::attach_texture_object(
+    const unsigned sizeof_alias, void *const alloc_ptr,
+    size_t const alloc_size) {
   enum { TEXTURE_BOUND_1D = 1u << 27 };
 
-  if ( ( alloc_ptr == 0 ) || ( sizeof_alias * TEXTURE_BOUND_1D <= alloc_size ) ) {
-    std::ostringstream msg ;
+  if ((alloc_ptr == 0) || (sizeof_alias * TEXTURE_BOUND_1D <= alloc_size)) {
+    std::ostringstream msg;
     msg << "Kokkos::CudaSpace ERROR: Cannot attach texture object to"
         << " alloc_ptr(" << alloc_ptr << ")"
         << " alloc_size(" << alloc_size << ")"
-        << " max_size(" << ( sizeof_alias * TEXTURE_BOUND_1D ) << ")" ;
-    std::cerr << msg.str() << std::endl ;
+        << " max_size(" << (sizeof_alias * TEXTURE_BOUND_1D) << ")";
+    std::cerr << msg.str() << std::endl;
     std::cerr.flush();
-    Kokkos::Impl::throw_runtime_exception( msg.str() );
+    Kokkos::Impl::throw_runtime_exception(msg.str());
   }
 
-  ::cudaTextureObject_t tex_obj ;
+  ::cudaTextureObject_t tex_obj;
 
-  struct cudaResourceDesc resDesc ;
-  struct cudaTextureDesc  texDesc ;
+  struct cudaResourceDesc resDesc;
+  struct cudaTextureDesc texDesc;
 
-  memset( & resDesc , 0 , sizeof(resDesc) );
-  memset( & texDesc , 0 , sizeof(texDesc) );
+  memset(&resDesc, 0, sizeof(resDesc));
+  memset(&texDesc, 0, sizeof(texDesc));
 
-  resDesc.resType                = cudaResourceTypeLinear ;
-  resDesc.res.linear.desc        = ( sizeof_alias ==  4 ?  cudaCreateChannelDesc< int >() :
-                                   ( sizeof_alias ==  8 ?  cudaCreateChannelDesc< ::int2 >() :
-                                  /* sizeof_alias == 16 */ cudaCreateChannelDesc< ::int4 >() ) );
-  resDesc.res.linear.sizeInBytes = alloc_size ;
-  resDesc.res.linear.devPtr      = alloc_ptr ;
+  resDesc.resType = cudaResourceTypeLinear;
+  resDesc.res.linear.desc =
+      (sizeof_alias == 4
+           ? cudaCreateChannelDesc<int>()
+           : (sizeof_alias == 8
+                  ? cudaCreateChannelDesc< ::int2>()
+                  :
+                  /* sizeof_alias == 16 */ cudaCreateChannelDesc< ::int4>()));
+  resDesc.res.linear.sizeInBytes = alloc_size;
+  resDesc.res.linear.devPtr      = alloc_ptr;
 
-  CUDA_SAFE_CALL( cudaCreateTextureObject( & tex_obj , & resDesc, & texDesc, NULL ) );
+  CUDA_SAFE_CALL(cudaCreateTextureObject(&tex_obj, &resDesc, &texDesc, NULL));
 
-  return tex_obj ;
+  return tex_obj;
+}
+
+//==============================================================================
+// <editor-fold desc="SharedAllocationRecord::get_label()"> {{{1
+
+std::string SharedAllocationRecord<Kokkos::CudaSpace, void>::get_label() const {
+  SharedAllocationHeader header;
+
+  Kokkos::Impl::DeepCopy<Kokkos::HostSpace, Kokkos::CudaSpace>(
+      &header, RecordBase::head(), sizeof(SharedAllocationHeader));
+
+  return std::string(header.m_label);
+}
+
+std::string SharedAllocationRecord<Kokkos::CudaUVMSpace, void>::get_label()
+    const {
+  return std::string(RecordBase::head()->m_label);
 }
 
 std::string
-SharedAllocationRecord< Kokkos::CudaSpace , void >::get_label() const
-{
-  SharedAllocationHeader header ;
-
-  Kokkos::Impl::DeepCopy< Kokkos::HostSpace , Kokkos::CudaSpace >( & header , RecordBase::head() , sizeof(SharedAllocationHeader) );
-
-  return std::string( header.m_label );
+SharedAllocationRecord<Kokkos::CudaHostPinnedSpace, void>::get_label() const {
+  return std::string(RecordBase::head()->m_label);
 }
 
-std::string
-SharedAllocationRecord< Kokkos::CudaUVMSpace , void >::get_label() const
-{
-  return std::string( RecordBase::head()->m_label );
+// </editor-fold> end SharedAllocationRecord::get_label() }}}1
+//==============================================================================
+
+//==============================================================================
+// <editor-fold desc="SharedAllocationRecord allocate()"> {{{1
+
+SharedAllocationRecord<Kokkos::CudaSpace, void>
+    *SharedAllocationRecord<Kokkos::CudaSpace, void>::allocate(
+        const Kokkos::CudaSpace &arg_space, const std::string &arg_label,
+        const size_t arg_alloc_size) {
+  return new SharedAllocationRecord(arg_space, arg_label, arg_alloc_size);
 }
 
-std::string
-SharedAllocationRecord< Kokkos::CudaHostPinnedSpace , void >::get_label() const
-{
-  return std::string( RecordBase::head()->m_label );
+SharedAllocationRecord<Kokkos::CudaUVMSpace, void>
+    *SharedAllocationRecord<Kokkos::CudaUVMSpace, void>::allocate(
+        const Kokkos::CudaUVMSpace &arg_space, const std::string &arg_label,
+        const size_t arg_alloc_size) {
+  return new SharedAllocationRecord(arg_space, arg_label, arg_alloc_size);
 }
 
-SharedAllocationRecord< Kokkos::CudaSpace , void > *
-SharedAllocationRecord< Kokkos::CudaSpace , void >::
-allocate( const Kokkos::CudaSpace &  arg_space
-        , const std::string       &  arg_label
-        , const size_t               arg_alloc_size
-        )
-{
-  return new SharedAllocationRecord( arg_space , arg_label , arg_alloc_size );
+SharedAllocationRecord<Kokkos::CudaHostPinnedSpace, void>
+    *SharedAllocationRecord<Kokkos::CudaHostPinnedSpace, void>::allocate(
+        const Kokkos::CudaHostPinnedSpace &arg_space,
+        const std::string &arg_label, const size_t arg_alloc_size) {
+  return new SharedAllocationRecord(arg_space, arg_label, arg_alloc_size);
 }
 
-SharedAllocationRecord< Kokkos::CudaUVMSpace , void > *
-SharedAllocationRecord< Kokkos::CudaUVMSpace , void >::
-allocate( const Kokkos::CudaUVMSpace &  arg_space
-        , const std::string          &  arg_label
-        , const size_t                  arg_alloc_size
-        )
-{
-  return new SharedAllocationRecord( arg_space , arg_label , arg_alloc_size );
+// </editor-fold> end SharedAllocationRecord allocate() }}}1
+//==============================================================================
+
+//==============================================================================
+// <editor-fold desc="SharedAllocationRecord deallocate"> {{{1
+
+void SharedAllocationRecord<Kokkos::CudaSpace, void>::deallocate(
+    SharedAllocationRecord<void, void> *arg_rec) {
+  delete static_cast<SharedAllocationRecord *>(arg_rec);
 }
 
-SharedAllocationRecord< Kokkos::CudaHostPinnedSpace , void > *
-SharedAllocationRecord< Kokkos::CudaHostPinnedSpace , void >::
-allocate( const Kokkos::CudaHostPinnedSpace &  arg_space
-        , const std::string                 &  arg_label
-        , const size_t                         arg_alloc_size
-        )
-{
-  return new SharedAllocationRecord( arg_space , arg_label , arg_alloc_size );
+void SharedAllocationRecord<Kokkos::CudaUVMSpace, void>::deallocate(
+    SharedAllocationRecord<void, void> *arg_rec) {
+  delete static_cast<SharedAllocationRecord *>(arg_rec);
 }
 
-void
-SharedAllocationRecord< Kokkos::CudaSpace , void >::
-deallocate( SharedAllocationRecord< void , void > * arg_rec )
-{
-  delete static_cast<SharedAllocationRecord*>(arg_rec);
+void SharedAllocationRecord<Kokkos::CudaHostPinnedSpace, void>::deallocate(
+    SharedAllocationRecord<void, void> *arg_rec) {
+  delete static_cast<SharedAllocationRecord *>(arg_rec);
 }
 
-void
-SharedAllocationRecord< Kokkos::CudaUVMSpace , void >::
-deallocate( SharedAllocationRecord< void , void > * arg_rec )
-{
-  delete static_cast<SharedAllocationRecord*>(arg_rec);
-}
+// </editor-fold> end SharedAllocationRecord deallocate }}}1
+//==============================================================================
 
-void
-SharedAllocationRecord< Kokkos::CudaHostPinnedSpace , void >::
-deallocate( SharedAllocationRecord< void , void > * arg_rec )
-{
-  delete static_cast<SharedAllocationRecord*>(arg_rec);
-}
+//==============================================================================
+// <editor-fold desc="SharedAllocationRecord destructors"> {{{1
 
-SharedAllocationRecord< Kokkos::CudaSpace , void >::
-~SharedAllocationRecord()
-{
-  #if defined(KOKKOS_ENABLE_PROFILING)
-  if(Kokkos::Profiling::profileLibraryLoaded()) {
-
-    SharedAllocationHeader header ;
-    Kokkos::Impl::DeepCopy<CudaSpace,HostSpace>( & header , RecordBase::m_alloc_ptr , sizeof(SharedAllocationHeader) );
+SharedAllocationRecord<Kokkos::CudaSpace, void>::~SharedAllocationRecord() {
+#if defined(KOKKOS_ENABLE_PROFILING)
+  if (Kokkos::Profiling::profileLibraryLoaded()) {
+    SharedAllocationHeader header;
+    Kokkos::Impl::DeepCopy<CudaSpace, HostSpace>(
+        &header, RecordBase::m_alloc_ptr, sizeof(SharedAllocationHeader));
 
     Kokkos::Profiling::deallocateData(
-      Kokkos::Profiling::SpaceHandle(Kokkos::CudaSpace::name()),header.m_label,
-      data(),size());
+        Kokkos::Profiling::SpaceHandle(Kokkos::CudaSpace::name()),
+        header.m_label, data(), size());
   }
-  #endif
-
-  m_space.deallocate( SharedAllocationRecord< void , void >::m_alloc_ptr
-                    , SharedAllocationRecord< void , void >::m_alloc_size
-                    );
-}
-
-SharedAllocationRecord< Kokkos::CudaUVMSpace , void >::
-~SharedAllocationRecord()
-{
-  #if defined(KOKKOS_ENABLE_PROFILING)
-  if(Kokkos::Profiling::profileLibraryLoaded()) {
-    Cuda::impl_static_fence(); //Make sure I can access the label ...
-    Kokkos::Profiling::deallocateData(
-      Kokkos::Profiling::SpaceHandle(Kokkos::CudaUVMSpace::name()),RecordBase::m_alloc_ptr->m_label,
-      data(),size());
-  }
-  #endif
-
-  m_space.deallocate( SharedAllocationRecord< void , void >::m_alloc_ptr
-                    , SharedAllocationRecord< void , void >::m_alloc_size
-                    );
-}
-
-SharedAllocationRecord< Kokkos::CudaHostPinnedSpace , void >::
-~SharedAllocationRecord()
-{
-  #if defined(KOKKOS_ENABLE_PROFILING)
-  if(Kokkos::Profiling::profileLibraryLoaded()) {
-    Kokkos::Profiling::deallocateData(
-      Kokkos::Profiling::SpaceHandle(Kokkos::CudaHostPinnedSpace::name()),RecordBase::m_alloc_ptr->m_label,
-      data(),size());
-  }
-  #endif
-
-  m_space.deallocate( SharedAllocationRecord< void , void >::m_alloc_ptr
-                    , SharedAllocationRecord< void , void >::m_alloc_size
-                    );
-}
-
-SharedAllocationRecord< Kokkos::CudaSpace , void >::
-SharedAllocationRecord( const Kokkos::CudaSpace & arg_space
-                      , const std::string       & arg_label
-                      , const size_t              arg_alloc_size
-                      , const SharedAllocationRecord< void , void >::function_type arg_dealloc
-                      )
-  // Pass through allocated [ SharedAllocationHeader , user_memory ]
-  // Pass through deallocation function
-  : SharedAllocationRecord< void , void >
-      (
-#ifdef KOKKOS_DEBUG
-        & SharedAllocationRecord< Kokkos::CudaSpace , void >::s_root_record,
 #endif
-        reinterpret_cast<SharedAllocationHeader*>( arg_space.allocate( sizeof(SharedAllocationHeader) + arg_alloc_size ) )
-      , sizeof(SharedAllocationHeader) + arg_alloc_size
-      , arg_dealloc
-      )
-  , m_tex_obj( 0 )
-  , m_space( arg_space )
-{
-  #if defined(KOKKOS_ENABLE_PROFILING)
-  if(Kokkos::Profiling::profileLibraryLoaded()) {
-    Kokkos::Profiling::allocateData(Kokkos::Profiling::SpaceHandle(arg_space.name()),arg_label,data(),arg_alloc_size);
-  }
-  #endif
 
-  SharedAllocationHeader header ;
+  m_space.deallocate(SharedAllocationRecord<void, void>::m_alloc_ptr,
+                     SharedAllocationRecord<void, void>::m_alloc_size);
+}
+
+SharedAllocationRecord<Kokkos::CudaUVMSpace, void>::~SharedAllocationRecord() {
+#if defined(KOKKOS_ENABLE_PROFILING)
+  if (Kokkos::Profiling::profileLibraryLoaded()) {
+    Cuda::impl_static_fence();  // Make sure I can access the label ...
+    Kokkos::Profiling::deallocateData(
+        Kokkos::Profiling::SpaceHandle(Kokkos::CudaUVMSpace::name()),
+        RecordBase::m_alloc_ptr->m_label, data(), size());
+  }
+#endif
+
+  m_space.deallocate(SharedAllocationRecord<void, void>::m_alloc_ptr,
+                     SharedAllocationRecord<void, void>::m_alloc_size);
+}
+
+SharedAllocationRecord<Kokkos::CudaHostPinnedSpace,
+                       void>::~SharedAllocationRecord() {
+#if defined(KOKKOS_ENABLE_PROFILING)
+  if (Kokkos::Profiling::profileLibraryLoaded()) {
+    Kokkos::Profiling::deallocateData(
+        Kokkos::Profiling::SpaceHandle(Kokkos::CudaHostPinnedSpace::name()),
+        RecordBase::m_alloc_ptr->m_label, data(), size());
+  }
+#endif
+
+  m_space.deallocate(SharedAllocationRecord<void, void>::m_alloc_ptr,
+                     SharedAllocationRecord<void, void>::m_alloc_size);
+}
+
+// </editor-fold> end SharedAllocationRecord destructors }}}1
+//==============================================================================
+
+//==============================================================================
+// <editor-fold desc="SharedAllocationRecord constructors"> {{{1
+
+SharedAllocationRecord<Kokkos::CudaSpace, void>::SharedAllocationRecord(
+    const Kokkos::CudaSpace &arg_space, const std::string &arg_label,
+    const size_t arg_alloc_size,
+    const SharedAllocationRecord<void, void>::function_type arg_dealloc)
+    // Pass through allocated [ SharedAllocationHeader , user_memory ]
+    // Pass through deallocation function
+    : SharedAllocationRecord<void, void>(
+#ifdef KOKKOS_DEBUG
+          &SharedAllocationRecord<Kokkos::CudaSpace, void>::s_root_record,
+#endif
+          Impl::checked_allocation_with_header(arg_space, arg_label,
+                                               arg_alloc_size),
+          sizeof(SharedAllocationHeader) + arg_alloc_size, arg_dealloc),
+      m_tex_obj(0),
+      m_space(arg_space) {
+#if defined(KOKKOS_ENABLE_PROFILING)
+  if (Kokkos::Profiling::profileLibraryLoaded()) {
+    Kokkos::Profiling::allocateData(
+        Kokkos::Profiling::SpaceHandle(arg_space.name()), arg_label, data(),
+        arg_alloc_size);
+  }
+#endif
+
+  SharedAllocationHeader header;
 
   // Fill in the Header information
-  header.m_record = static_cast< SharedAllocationRecord< void , void > * >( this );
+  header.m_record = static_cast<SharedAllocationRecord<void, void> *>(this);
 
-  strncpy( header.m_label
-          , arg_label.c_str()
-          , SharedAllocationHeader::maximum_label_length
-          );
+  strncpy(header.m_label, arg_label.c_str(),
+          SharedAllocationHeader::maximum_label_length);
   // Set last element zero, in case c_str is too long
-  header.m_label[SharedAllocationHeader::maximum_label_length - 1] = (char) 0;
+  header.m_label[SharedAllocationHeader::maximum_label_length - 1] = (char)0;
 
   // Copy to device memory
-  Kokkos::Impl::DeepCopy<CudaSpace,HostSpace>( RecordBase::m_alloc_ptr , & header , sizeof(SharedAllocationHeader) );
+  Kokkos::Impl::DeepCopy<CudaSpace, HostSpace>(RecordBase::m_alloc_ptr, &header,
+                                               sizeof(SharedAllocationHeader));
 }
 
-SharedAllocationRecord< Kokkos::CudaUVMSpace , void >::
-SharedAllocationRecord( const Kokkos::CudaUVMSpace & arg_space
-                      , const std::string          & arg_label
-                      , const size_t                 arg_alloc_size
-                      , const SharedAllocationRecord< void , void >::function_type arg_dealloc
-                      )
-  // Pass through allocated [ SharedAllocationHeader , user_memory ]
-  // Pass through deallocation function
-  : SharedAllocationRecord< void , void >
-      (
+SharedAllocationRecord<Kokkos::CudaUVMSpace, void>::SharedAllocationRecord(
+    const Kokkos::CudaUVMSpace &arg_space, const std::string &arg_label,
+    const size_t arg_alloc_size,
+    const SharedAllocationRecord<void, void>::function_type arg_dealloc)
+    // Pass through allocated [ SharedAllocationHeader , user_memory ]
+    // Pass through deallocation function
+    : SharedAllocationRecord<void, void>(
 #ifdef KOKKOS_DEBUG
-        & SharedAllocationRecord< Kokkos::CudaUVMSpace , void >::s_root_record,
+          &SharedAllocationRecord<Kokkos::CudaUVMSpace, void>::s_root_record,
 #endif
-        reinterpret_cast<SharedAllocationHeader*>( arg_space.allocate( sizeof(SharedAllocationHeader) + arg_alloc_size ) )
-      , sizeof(SharedAllocationHeader) + arg_alloc_size
-      , arg_dealloc
-      )
-  , m_tex_obj( 0 )
-  , m_space( arg_space )
-{
-  #if defined(KOKKOS_ENABLE_PROFILING)
-  if(Kokkos::Profiling::profileLibraryLoaded()) {
-    Kokkos::Profiling::allocateData(Kokkos::Profiling::SpaceHandle(arg_space.name()),arg_label,data(),arg_alloc_size);
+          Impl::checked_allocation_with_header(arg_space, arg_label,
+                                               arg_alloc_size),
+          sizeof(SharedAllocationHeader) + arg_alloc_size, arg_dealloc),
+      m_tex_obj(0),
+      m_space(arg_space) {
+#if defined(KOKKOS_ENABLE_PROFILING)
+  if (Kokkos::Profiling::profileLibraryLoaded()) {
+    Kokkos::Profiling::allocateData(
+        Kokkos::Profiling::SpaceHandle(arg_space.name()), arg_label, data(),
+        arg_alloc_size);
   }
-  #endif
- // Fill in the Header information, directly accessible via UVM
-
-  RecordBase::m_alloc_ptr->m_record = this ;
-
-  strncpy( RecordBase::m_alloc_ptr->m_label
-          , arg_label.c_str()
-          , SharedAllocationHeader::maximum_label_length
-          );
-
-  // Set last element zero, in case c_str is too long
-  RecordBase::m_alloc_ptr->m_label[SharedAllocationHeader::maximum_label_length - 1] = (char) 0;
-}
-
-SharedAllocationRecord< Kokkos::CudaHostPinnedSpace , void >::
-SharedAllocationRecord( const Kokkos::CudaHostPinnedSpace & arg_space
-                      , const std::string                 & arg_label
-                      , const size_t                        arg_alloc_size
-                      , const SharedAllocationRecord< void , void >::function_type arg_dealloc
-                      )
-  // Pass through allocated [ SharedAllocationHeader , user_memory ]
-  // Pass through deallocation function
-  : SharedAllocationRecord< void , void >
-      (
-#ifdef KOKKOS_DEBUG
-        & SharedAllocationRecord< Kokkos::CudaHostPinnedSpace , void >::s_root_record,
 #endif
-        reinterpret_cast<SharedAllocationHeader*>( arg_space.allocate( sizeof(SharedAllocationHeader) + arg_alloc_size ) )
-      , sizeof(SharedAllocationHeader) + arg_alloc_size
-      , arg_dealloc
-      )
-  , m_space( arg_space )
-{
-  #if defined(KOKKOS_ENABLE_PROFILING)
-  if(Kokkos::Profiling::profileLibraryLoaded()) {
-    Kokkos::Profiling::allocateData(Kokkos::Profiling::SpaceHandle(arg_space.name()),arg_label,data(),arg_alloc_size);
-  }
-  #endif
   // Fill in the Header information, directly accessible via UVM
 
-  RecordBase::m_alloc_ptr->m_record = this ;
+  RecordBase::m_alloc_ptr->m_record = this;
+
+  strncpy(RecordBase::m_alloc_ptr->m_label, arg_label.c_str(),
+          SharedAllocationHeader::maximum_label_length);
 
-  strncpy( RecordBase::m_alloc_ptr->m_label
-          , arg_label.c_str()
-          , SharedAllocationHeader::maximum_label_length
-          );
   // Set last element zero, in case c_str is too long
-  RecordBase::m_alloc_ptr->m_label[SharedAllocationHeader::maximum_label_length - 1] = (char) 0;
+  RecordBase::m_alloc_ptr
+      ->m_label[SharedAllocationHeader::maximum_label_length - 1] = (char)0;
 }
 
-//----------------------------------------------------------------------------
+SharedAllocationRecord<Kokkos::CudaHostPinnedSpace, void>::
+    SharedAllocationRecord(
+        const Kokkos::CudaHostPinnedSpace &arg_space,
+        const std::string &arg_label, const size_t arg_alloc_size,
+        const SharedAllocationRecord<void, void>::function_type arg_dealloc)
+    // Pass through allocated [ SharedAllocationHeader , user_memory ]
+    // Pass through deallocation function
+    : SharedAllocationRecord<void, void>(
+#ifdef KOKKOS_DEBUG
+          &SharedAllocationRecord<Kokkos::CudaHostPinnedSpace,
+                                  void>::s_root_record,
+#endif
+          Impl::checked_allocation_with_header(arg_space, arg_label,
+                                               arg_alloc_size),
+          sizeof(SharedAllocationHeader) + arg_alloc_size, arg_dealloc),
+      m_space(arg_space) {
+#if defined(KOKKOS_ENABLE_PROFILING)
+  if (Kokkos::Profiling::profileLibraryLoaded()) {
+    Kokkos::Profiling::allocateData(
+        Kokkos::Profiling::SpaceHandle(arg_space.name()), arg_label, data(),
+        arg_alloc_size);
+  }
+#endif
+  // Fill in the Header information, directly accessible on the host
 
-void * SharedAllocationRecord< Kokkos::CudaSpace , void >::
-allocate_tracked( const Kokkos::CudaSpace & arg_space
-                , const std::string & arg_alloc_label
-                , const size_t arg_alloc_size )
-{
-  if ( ! arg_alloc_size ) return (void *) 0 ;
+  RecordBase::m_alloc_ptr->m_record = this;
 
-  SharedAllocationRecord * const r =
-    allocate( arg_space , arg_alloc_label , arg_alloc_size );
+  strncpy(RecordBase::m_alloc_ptr->m_label, arg_label.c_str(),
+          SharedAllocationHeader::maximum_label_length);
+  // Set last element zero, in case c_str is too long
+  RecordBase::m_alloc_ptr
+      ->m_label[SharedAllocationHeader::maximum_label_length - 1] = (char)0;
+}
 
-  RecordBase::increment( r );
+// </editor-fold> end SharedAllocationRecord constructors }}}1
+//==============================================================================
+
+//==============================================================================
+// <editor-fold desc="SharedAllocationRecored::(re|de|)allocate_tracked"> {{{1
+
+void *SharedAllocationRecord<Kokkos::CudaSpace, void>::allocate_tracked(
+    const Kokkos::CudaSpace &arg_space, const std::string &arg_alloc_label,
+    const size_t arg_alloc_size) {
+  if (!arg_alloc_size) return (void *)0;
+
+  SharedAllocationRecord *const r =
+      allocate(arg_space, arg_alloc_label, arg_alloc_size);
+
+  RecordBase::increment(r);
 
   return r->data();
 }
 
-void SharedAllocationRecord< Kokkos::CudaSpace , void >::
-deallocate_tracked( void * const arg_alloc_ptr )
-{
-  if ( arg_alloc_ptr != 0 ) {
-    SharedAllocationRecord * const r = get_record( arg_alloc_ptr );
+void SharedAllocationRecord<Kokkos::CudaSpace, void>::deallocate_tracked(
+    void *const arg_alloc_ptr) {
+  if (arg_alloc_ptr != 0) {
+    SharedAllocationRecord *const r = get_record(arg_alloc_ptr);
 
-    RecordBase::decrement( r );
+    RecordBase::decrement(r);
   }
 }
 
-void * SharedAllocationRecord< Kokkos::CudaSpace , void >::
-reallocate_tracked( void * const arg_alloc_ptr
-                  , const size_t arg_alloc_size )
-{
-  SharedAllocationRecord * const r_old = get_record( arg_alloc_ptr );
-  SharedAllocationRecord * const r_new = allocate( r_old->m_space , r_old->get_label() , arg_alloc_size );
+void *SharedAllocationRecord<Kokkos::CudaSpace, void>::reallocate_tracked(
+    void *const arg_alloc_ptr, const size_t arg_alloc_size) {
+  SharedAllocationRecord *const r_old = get_record(arg_alloc_ptr);
+  SharedAllocationRecord *const r_new =
+      allocate(r_old->m_space, r_old->get_label(), arg_alloc_size);
 
-  Kokkos::Impl::DeepCopy<CudaSpace,CudaSpace>( r_new->data() , r_old->data()
-                                             , std::min( r_old->size() , r_new->size() ) );
+  Kokkos::Impl::DeepCopy<CudaSpace, CudaSpace>(
+      r_new->data(), r_old->data(), std::min(r_old->size(), r_new->size()));
 
-  RecordBase::increment( r_new );
-  RecordBase::decrement( r_old );
+  RecordBase::increment(r_new);
+  RecordBase::decrement(r_old);
 
   return r_new->data();
 }
 
-void * SharedAllocationRecord< Kokkos::CudaUVMSpace , void >::
-allocate_tracked( const Kokkos::CudaUVMSpace & arg_space
-                , const std::string & arg_alloc_label
-                , const size_t arg_alloc_size )
-{
-  if ( ! arg_alloc_size ) return (void *) 0 ;
+void *SharedAllocationRecord<Kokkos::CudaUVMSpace, void>::allocate_tracked(
+    const Kokkos::CudaUVMSpace &arg_space, const std::string &arg_alloc_label,
+    const size_t arg_alloc_size) {
+  if (!arg_alloc_size) return (void *)0;
 
-  SharedAllocationRecord * const r =
-    allocate( arg_space , arg_alloc_label , arg_alloc_size );
+  SharedAllocationRecord *const r =
+      allocate(arg_space, arg_alloc_label, arg_alloc_size);
 
-  RecordBase::increment( r );
+  RecordBase::increment(r);
 
   return r->data();
 }
 
-void SharedAllocationRecord< Kokkos::CudaUVMSpace , void >::
-deallocate_tracked( void * const arg_alloc_ptr )
-{
-  if ( arg_alloc_ptr != 0 ) {
+void SharedAllocationRecord<Kokkos::CudaUVMSpace, void>::deallocate_tracked(
+    void *const arg_alloc_ptr) {
+  if (arg_alloc_ptr != 0) {
+    SharedAllocationRecord *const r = get_record(arg_alloc_ptr);
 
-    SharedAllocationRecord * const r = get_record( arg_alloc_ptr );
-
-    RecordBase::decrement( r );
+    RecordBase::decrement(r);
   }
 }
 
-void * SharedAllocationRecord< Kokkos::CudaUVMSpace , void >::
-reallocate_tracked( void * const arg_alloc_ptr
-                  , const size_t arg_alloc_size )
-{
-  SharedAllocationRecord * const r_old = get_record( arg_alloc_ptr );
-  SharedAllocationRecord * const r_new = allocate( r_old->m_space , r_old->get_label() , arg_alloc_size );
+void *SharedAllocationRecord<Kokkos::CudaUVMSpace, void>::reallocate_tracked(
+    void *const arg_alloc_ptr, const size_t arg_alloc_size) {
+  SharedAllocationRecord *const r_old = get_record(arg_alloc_ptr);
+  SharedAllocationRecord *const r_new =
+      allocate(r_old->m_space, r_old->get_label(), arg_alloc_size);
 
-  Kokkos::Impl::DeepCopy<CudaUVMSpace,CudaUVMSpace>( r_new->data() , r_old->data()
-                                             , std::min( r_old->size() , r_new->size() ) );
+  Kokkos::Impl::DeepCopy<CudaUVMSpace, CudaUVMSpace>(
+      r_new->data(), r_old->data(), std::min(r_old->size(), r_new->size()));
 
-  RecordBase::increment( r_new );
-  RecordBase::decrement( r_old );
+  RecordBase::increment(r_new);
+  RecordBase::decrement(r_old);
 
   return r_new->data();
 }
 
-void * SharedAllocationRecord< Kokkos::CudaHostPinnedSpace , void >::
-allocate_tracked( const Kokkos::CudaHostPinnedSpace & arg_space
-                , const std::string & arg_alloc_label
-                , const size_t arg_alloc_size )
-{
-  if ( ! arg_alloc_size ) return (void *) 0 ;
+void *
+SharedAllocationRecord<Kokkos::CudaHostPinnedSpace, void>::allocate_tracked(
+    const Kokkos::CudaHostPinnedSpace &arg_space,
+    const std::string &arg_alloc_label, const size_t arg_alloc_size) {
+  if (!arg_alloc_size) return (void *)0;
 
-  SharedAllocationRecord * const r =
-    allocate( arg_space , arg_alloc_label , arg_alloc_size );
+  SharedAllocationRecord *const r =
+      allocate(arg_space, arg_alloc_label, arg_alloc_size);
 
-  RecordBase::increment( r );
+  RecordBase::increment(r);
 
   return r->data();
 }
 
-void SharedAllocationRecord< Kokkos::CudaHostPinnedSpace , void >::
-deallocate_tracked( void * const arg_alloc_ptr )
-{
-  if ( arg_alloc_ptr != 0 ) {
-    SharedAllocationRecord * const r = get_record( arg_alloc_ptr );
+void SharedAllocationRecord<Kokkos::CudaHostPinnedSpace,
+                            void>::deallocate_tracked(void *const
+                                                          arg_alloc_ptr) {
+  if (arg_alloc_ptr != 0) {
+    SharedAllocationRecord *const r = get_record(arg_alloc_ptr);
 
-    RecordBase::decrement( r );
+    RecordBase::decrement(r);
   }
 }
 
-void * SharedAllocationRecord< Kokkos::CudaHostPinnedSpace , void >::
-reallocate_tracked( void * const arg_alloc_ptr
-                  , const size_t arg_alloc_size )
-{
-  SharedAllocationRecord * const r_old = get_record( arg_alloc_ptr );
-  SharedAllocationRecord * const r_new = allocate( r_old->m_space , r_old->get_label() , arg_alloc_size );
+void *
+SharedAllocationRecord<Kokkos::CudaHostPinnedSpace, void>::reallocate_tracked(
+    void *const arg_alloc_ptr, const size_t arg_alloc_size) {
+  SharedAllocationRecord *const r_old = get_record(arg_alloc_ptr);
+  SharedAllocationRecord *const r_new =
+      allocate(r_old->m_space, r_old->get_label(), arg_alloc_size);
 
-  Kokkos::Impl::DeepCopy<CudaHostPinnedSpace,CudaHostPinnedSpace>( r_new->data() , r_old->data()
-                                             , std::min( r_old->size() , r_new->size() ) );
+  Kokkos::Impl::DeepCopy<CudaHostPinnedSpace, CudaHostPinnedSpace>(
+      r_new->data(), r_old->data(), std::min(r_old->size(), r_new->size()));
 
-  RecordBase::increment( r_new );
-  RecordBase::decrement( r_old );
+  RecordBase::increment(r_new);
+  RecordBase::decrement(r_old);
 
   return r_new->data();
 }
 
-//----------------------------------------------------------------------------
+// </editor-fold> end SharedAllocationRecored::(re|de|)allocate_tracked }}}1
+//==============================================================================
 
-SharedAllocationRecord< Kokkos::CudaSpace , void > *
-SharedAllocationRecord< Kokkos::CudaSpace , void >::get_record( void * alloc_ptr )
-{
-  using RecordCuda = SharedAllocationRecord< Kokkos::CudaSpace , void > ;
+//==============================================================================
+// <editor-fold desc="SharedAllocationRecord::get_record()"> {{{1
 
-  using Header     = SharedAllocationHeader ;
+SharedAllocationRecord<Kokkos::CudaSpace, void> *
+SharedAllocationRecord<Kokkos::CudaSpace, void>::get_record(void *alloc_ptr) {
+  using RecordCuda = SharedAllocationRecord<Kokkos::CudaSpace, void>;
+
+  using Header = SharedAllocationHeader;
 
   // Copy the header from the allocation
-  Header head ;
+  Header head;
 
-  Header const * const head_cuda = alloc_ptr ? Header::get_header( alloc_ptr ) : (Header*) 0 ;
+  Header const *const head_cuda =
+      alloc_ptr ? Header::get_header(alloc_ptr) : (Header *)0;
 
-  if ( alloc_ptr ) {
-    Kokkos::Impl::DeepCopy<HostSpace,CudaSpace>( & head , head_cuda , sizeof(SharedAllocationHeader) );
+  if (alloc_ptr) {
+    Kokkos::Impl::DeepCopy<HostSpace, CudaSpace>(
+        &head, head_cuda, sizeof(SharedAllocationHeader));
   }
 
-  RecordCuda * const record = alloc_ptr ? static_cast< RecordCuda * >( head.m_record ) : (RecordCuda *) 0 ;
+  RecordCuda *const record =
+      alloc_ptr ? static_cast<RecordCuda *>(head.m_record) : (RecordCuda *)0;
 
-  if ( ! alloc_ptr || record->m_alloc_ptr != head_cuda ) {
-    Kokkos::Impl::throw_runtime_exception( std::string("Kokkos::Impl::SharedAllocationRecord< Kokkos::CudaSpace , void >::get_record ERROR" ) );
+  if (!alloc_ptr || record->m_alloc_ptr != head_cuda) {
+    Kokkos::Impl::throw_runtime_exception(
+        std::string("Kokkos::Impl::SharedAllocationRecord< Kokkos::CudaSpace , "
+                    "void >::get_record ERROR"));
   }
 
-  return record ;
+  return record;
 }
 
-SharedAllocationRecord< Kokkos::CudaUVMSpace , void > *
-SharedAllocationRecord< Kokkos::CudaUVMSpace , void >::get_record( void * alloc_ptr )
-{
-  using Header     = SharedAllocationHeader ;
-  using RecordCuda = SharedAllocationRecord< Kokkos::CudaUVMSpace , void > ;
+SharedAllocationRecord<Kokkos::CudaUVMSpace, void> *SharedAllocationRecord<
+    Kokkos::CudaUVMSpace, void>::get_record(void *alloc_ptr) {
+  using Header     = SharedAllocationHeader;
+  using RecordCuda = SharedAllocationRecord<Kokkos::CudaUVMSpace, void>;
 
-  Header * const h = alloc_ptr ? reinterpret_cast< Header * >( alloc_ptr ) - 1 : (Header *) 0 ;
+  Header *const h =
+      alloc_ptr ? reinterpret_cast<Header *>(alloc_ptr) - 1 : (Header *)0;
 
-  if ( ! alloc_ptr || h->m_record->m_alloc_ptr != h ) {
-    Kokkos::Impl::throw_runtime_exception( std::string("Kokkos::Impl::SharedAllocationRecord< Kokkos::CudaUVMSpace , void >::get_record ERROR" ) );
+  if (!alloc_ptr || h->m_record->m_alloc_ptr != h) {
+    Kokkos::Impl::throw_runtime_exception(
+        std::string("Kokkos::Impl::SharedAllocationRecord< "
+                    "Kokkos::CudaUVMSpace , void >::get_record ERROR"));
   }
 
-  return static_cast< RecordCuda * >( h->m_record );
+  return static_cast<RecordCuda *>(h->m_record);
 }
 
-SharedAllocationRecord< Kokkos::CudaHostPinnedSpace , void > *
-SharedAllocationRecord< Kokkos::CudaHostPinnedSpace , void >::get_record( void * alloc_ptr )
-{
-  using Header     = SharedAllocationHeader ;
-  using RecordCuda = SharedAllocationRecord< Kokkos::CudaHostPinnedSpace , void > ;
+SharedAllocationRecord<Kokkos::CudaHostPinnedSpace, void>
+    *SharedAllocationRecord<Kokkos::CudaHostPinnedSpace, void>::get_record(
+        void *alloc_ptr) {
+  using Header     = SharedAllocationHeader;
+  using RecordCuda = SharedAllocationRecord<Kokkos::CudaHostPinnedSpace, void>;
 
-  Header * const h = alloc_ptr ? reinterpret_cast< Header * >( alloc_ptr ) - 1 : (Header *) 0 ;
+  Header *const h =
+      alloc_ptr ? reinterpret_cast<Header *>(alloc_ptr) - 1 : (Header *)0;
 
-  if ( ! alloc_ptr || h->m_record->m_alloc_ptr != h ) {
-    Kokkos::Impl::throw_runtime_exception( std::string("Kokkos::Impl::SharedAllocationRecord< Kokkos::CudaHostPinnedSpace , void >::get_record ERROR" ) );
+  if (!alloc_ptr || h->m_record->m_alloc_ptr != h) {
+    Kokkos::Impl::throw_runtime_exception(
+        std::string("Kokkos::Impl::SharedAllocationRecord< "
+                    "Kokkos::CudaHostPinnedSpace , void >::get_record ERROR"));
   }
 
-  return static_cast< RecordCuda * >( h->m_record );
+  return static_cast<RecordCuda *>(h->m_record);
 }
 
+// </editor-fold> end SharedAllocationRecord::get_record() }}}1
+//==============================================================================
+
+//==============================================================================
+// <editor-fold desc="SharedAllocationRecord::print_records()"> {{{1
+
 // Iterate records to print orphaned memory ...
-void
-SharedAllocationRecord< Kokkos::CudaSpace , void >::
-print_records( std::ostream & s , const Kokkos::CudaSpace & , bool detail )
-{
+void SharedAllocationRecord<Kokkos::CudaSpace, void>::print_records(
+    std::ostream &s, const Kokkos::CudaSpace &, bool detail) {
 #ifdef KOKKOS_DEBUG
-  SharedAllocationRecord< void , void > * r = & s_root_record ;
+  SharedAllocationRecord<void, void> *r = &s_root_record;
 
-  char buffer[256] ;
+  char buffer[256];
 
-  SharedAllocationHeader head ;
+  SharedAllocationHeader head;
 
-  if ( detail ) {
+  if (detail) {
     do {
-      if ( r->m_alloc_ptr ) {
-        Kokkos::Impl::DeepCopy<HostSpace,CudaSpace>( & head , r->m_alloc_ptr , sizeof(SharedAllocationHeader) );
-      }
-      else {
-        head.m_label[0] = 0 ;
+      if (r->m_alloc_ptr) {
+        Kokkos::Impl::DeepCopy<HostSpace, CudaSpace>(
+            &head, r->m_alloc_ptr, sizeof(SharedAllocationHeader));
+      } else {
+        head.m_label[0] = 0;
       }
 
-      //Formatting dependent on sizeof(uintptr_t)
-      const char * format_string;
+      // Formatting dependent on sizeof(uintptr_t)
+      const char *format_string;
 
       if (sizeof(uintptr_t) == sizeof(unsigned long)) {
-        format_string = "Cuda addr( 0x%.12lx ) list( 0x%.12lx 0x%.12lx ) extent[ 0x%.12lx + %.8ld ] count(%d) dealloc(0x%.12lx) %s\n";
-      }
-      else if (sizeof(uintptr_t) == sizeof(unsigned long long)) {
-        format_string = "Cuda addr( 0x%.12llx ) list( 0x%.12llx 0x%.12llx ) extent[ 0x%.12llx + %.8ld ] count(%d) dealloc(0x%.12llx) %s\n";
+        format_string =
+            "Cuda addr( 0x%.12lx ) list( 0x%.12lx 0x%.12lx ) extent[ 0x%.12lx "
+            "+ %.8ld ] count(%d) dealloc(0x%.12lx) %s\n";
+      } else if (sizeof(uintptr_t) == sizeof(unsigned long long)) {
+        format_string =
+            "Cuda addr( 0x%.12llx ) list( 0x%.12llx 0x%.12llx ) extent[ "
+            "0x%.12llx + %.8ld ] count(%d) dealloc(0x%.12llx) %s\n";
       }
 
-      snprintf( buffer , 256
-              , format_string
-              , reinterpret_cast<uintptr_t>( r )
-              , reinterpret_cast<uintptr_t>( r->m_prev )
-              , reinterpret_cast<uintptr_t>( r->m_next )
-              , reinterpret_cast<uintptr_t>( r->m_alloc_ptr )
-              , r->m_alloc_size
-              , r->m_count
-              , reinterpret_cast<uintptr_t>( r->m_dealloc )
-              , head.m_label
-              );
-      s << buffer ;
-      r = r->m_next ;
-    } while ( r != & s_root_record );
-  }
-  else {
+      snprintf(buffer, 256, format_string, reinterpret_cast<uintptr_t>(r),
+               reinterpret_cast<uintptr_t>(r->m_prev),
+               reinterpret_cast<uintptr_t>(r->m_next),
+               reinterpret_cast<uintptr_t>(r->m_alloc_ptr), r->m_alloc_size,
+               r->m_count, reinterpret_cast<uintptr_t>(r->m_dealloc),
+               head.m_label);
+      s << buffer;
+      r = r->m_next;
+    } while (r != &s_root_record);
+  } else {
     do {
-      if ( r->m_alloc_ptr ) {
+      if (r->m_alloc_ptr) {
+        Kokkos::Impl::DeepCopy<HostSpace, CudaSpace>(
+            &head, r->m_alloc_ptr, sizeof(SharedAllocationHeader));
 
-        Kokkos::Impl::DeepCopy<HostSpace,CudaSpace>( & head , r->m_alloc_ptr , sizeof(SharedAllocationHeader) );
-
-        //Formatting dependent on sizeof(uintptr_t)
-        const char * format_string;
+        // Formatting dependent on sizeof(uintptr_t)
+        const char *format_string;
 
         if (sizeof(uintptr_t) == sizeof(unsigned long)) {
           format_string = "Cuda [ 0x%.12lx + %ld ] %s\n";
-        }
-        else if (sizeof(uintptr_t) == sizeof(unsigned long long)) {
+        } else if (sizeof(uintptr_t) == sizeof(unsigned long long)) {
           format_string = "Cuda [ 0x%.12llx + %ld ] %s\n";
         }
 
-        snprintf( buffer , 256
-                , format_string
-                , reinterpret_cast< uintptr_t >( r->data() )
-                , r->size()
-                , head.m_label
-                );
+        snprintf(buffer, 256, format_string,
+                 reinterpret_cast<uintptr_t>(r->data()), r->size(),
+                 head.m_label);
+      } else {
+        snprintf(buffer, 256, "Cuda [ 0 + 0 ]\n");
       }
-      else {
-        snprintf( buffer , 256 , "Cuda [ 0 + 0 ]\n" );
-      }
-      s << buffer ;
-      r = r->m_next ;
-    } while ( r != & s_root_record );
+      s << buffer;
+      r = r->m_next;
+    } while (r != &s_root_record);
   }
 #else
-  Kokkos::Impl::throw_runtime_exception("SharedAllocationHeader<CudaSpace>::print_records only works with KOKKOS_DEBUG enabled");
+  Kokkos::Impl::throw_runtime_exception(
+      "SharedAllocationHeader<CudaSpace>::print_records only works with "
+      "KOKKOS_DEBUG enabled");
 #endif
 }
 
-void
-SharedAllocationRecord< Kokkos::CudaUVMSpace , void >::
-print_records( std::ostream & s , const Kokkos::CudaUVMSpace & , bool detail )
-{
+void SharedAllocationRecord<Kokkos::CudaUVMSpace, void>::print_records(
+    std::ostream &s, const Kokkos::CudaUVMSpace &, bool detail) {
 #ifdef KOKKOS_DEBUG
-  SharedAllocationRecord< void , void >::print_host_accessible_records( s , "CudaUVM" , & s_root_record , detail );
+  SharedAllocationRecord<void, void>::print_host_accessible_records(
+      s, "CudaUVM", &s_root_record, detail);
 #else
-  Kokkos::Impl::throw_runtime_exception("SharedAllocationHeader<CudaSpace>::print_records only works with KOKKOS_DEBUG enabled");
+  Kokkos::Impl::throw_runtime_exception(
+      "SharedAllocationHeader<CudaSpace>::print_records only works with "
+      "KOKKOS_DEBUG enabled");
 #endif
 }
 
-void
-SharedAllocationRecord< Kokkos::CudaHostPinnedSpace , void >::
-print_records( std::ostream & s , const Kokkos::CudaHostPinnedSpace & , bool detail )
-{
+void SharedAllocationRecord<Kokkos::CudaHostPinnedSpace, void>::print_records(
+    std::ostream &s, const Kokkos::CudaHostPinnedSpace &, bool detail) {
 #ifdef KOKKOS_DEBUG
-  SharedAllocationRecord< void , void >::print_host_accessible_records( s , "CudaHostPinned" , & s_root_record , detail );
+  SharedAllocationRecord<void, void>::print_host_accessible_records(
+      s, "CudaHostPinned", &s_root_record, detail);
 #else
-  Kokkos::Impl::throw_runtime_exception("SharedAllocationHeader<CudaSpace>::print_records only works with KOKKOS_DEBUG enabled");
+  Kokkos::Impl::throw_runtime_exception(
+      "SharedAllocationHeader<CudaSpace>::print_records only works with "
+      "KOKKOS_DEBUG enabled");
 #endif
 }
 
-void* cuda_resize_scratch_space(std::int64_t bytes, bool force_shrink) {
-  static void* ptr = NULL;
+// </editor-fold> end SharedAllocationRecord::print_records() }}}1
+//==============================================================================
+
+void *cuda_resize_scratch_space(std::int64_t bytes, bool force_shrink) {
+  static void *ptr                 = NULL;
   static std::int64_t current_size = 0;
-  if(current_size == 0) {
+  if (current_size == 0) {
     current_size = bytes;
-    ptr = Kokkos::kokkos_malloc<Kokkos::CudaSpace>("CudaSpace::ScratchMemory",current_size);
+    ptr = Kokkos::kokkos_malloc<Kokkos::CudaSpace>("CudaSpace::ScratchMemory",
+                                                   current_size);
   }
-  if(bytes > current_size) {
+  if (bytes > current_size) {
     current_size = bytes;
     Kokkos::kokkos_free<Kokkos::CudaSpace>(ptr);
-    ptr = Kokkos::kokkos_malloc<Kokkos::CudaSpace>("CudaSpace::ScratchMemory",current_size);
+    ptr = Kokkos::kokkos_malloc<Kokkos::CudaSpace>("CudaSpace::ScratchMemory",
+                                                   current_size);
   }
-  if((bytes < current_size) && (force_shrink)) {
+  if ((bytes < current_size) && (force_shrink)) {
     current_size = bytes;
     Kokkos::kokkos_free<Kokkos::CudaSpace>(ptr);
-    ptr = Kokkos::kokkos_malloc<Kokkos::CudaSpace>("CudaSpace::ScratchMemory",current_size);
+    ptr = Kokkos::kokkos_malloc<Kokkos::CudaSpace>("CudaSpace::ScratchMemory",
+                                                   current_size);
   }
   return ptr;
 }
 
-} // namespace Impl
-} // namespace Kokkos
+}  // namespace Impl
+}  // namespace Kokkos
 #else
 void KOKKOS_CORE_SRC_CUDA_CUDASPACE_PREVENT_LINK_ERROR() {}
-#endif // KOKKOS_ENABLE_CUDA
-
+#endif  // KOKKOS_ENABLE_CUDA
diff --git a/lib/kokkos/core/src/Cuda/Kokkos_Cuda_Alloc.hpp b/lib/kokkos/core/src/Cuda/Kokkos_Cuda_Alloc.hpp
index 5726e02180..e76133fae8 100644
--- a/lib/kokkos/core/src/Cuda/Kokkos_Cuda_Alloc.hpp
+++ b/lib/kokkos/core/src/Cuda/Kokkos_Cuda_Alloc.hpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -52,13 +53,12 @@
 namespace Kokkos {
 namespace Impl {
 
-template< class DestructFunctor >
-SharedAllocationRecord *
-shared_allocation_record( Kokkos::CudaSpace const & arg_space
-                        , void *            const   arg_alloc_ptr
-                        , DestructFunctor   const & arg_destruct )
-{
-  SharedAllocationRecord * const record = SharedAllocationRecord::get_record( arg_alloc_ptr );
+template <class DestructFunctor>
+SharedAllocationRecord* shared_allocation_record(
+    Kokkos::CudaSpace const& arg_space, void* const arg_alloc_ptr,
+    DestructFunctor const& arg_destruct) {
+  SharedAllocationRecord* const record =
+      SharedAllocationRecord::get_record(arg_alloc_ptr);
 
   // assert: record != 0
 
@@ -66,115 +66,88 @@ shared_allocation_record( Kokkos::CudaSpace const & arg_space
 
   // assert: record->m_destruct_function == 0
 
-  DestructFunctor * const functor =
-    reinterpret_cast< DestructFunctor * >(
-    reinterpret_cast< uintptr_t >( record ) + sizeof(SharedAllocationRecord) );
+  DestructFunctor* const functor = reinterpret_cast<DestructFunctor*>(
+      reinterpret_cast<uintptr_t>(record) + sizeof(SharedAllocationRecord));
 
-  new( functor ) DestructFunctor( arg_destruct );
+  new (functor) DestructFunctor(arg_destruct);
 
-  record->m_destruct_functor = & shared_allocation_destroy< DestructFunctor > ;
+  record->m_destruct_functor = &shared_allocation_destroy<DestructFunctor>;
 
-  return record ;
+  return record;
 }
 
-
 /// class CudaUnmanagedAllocator
 /// does nothing when deallocate(ptr,size) is called
-struct CudaUnmanagedAllocator
-{
-  static const char * name()
-  {
-    return "Cuda Unmanaged Allocator";
-  }
+struct CudaUnmanagedAllocator {
+  static const char* name() { return "Cuda Unmanaged Allocator"; }
 
-  static void deallocate(void * /*ptr*/, size_t /*size*/) {}
+  static void deallocate(void* /*ptr*/, size_t /*size*/) {}
 
   static bool support_texture_binding() { return true; }
 };
 
 /// class CudaUnmanagedAllocator
 /// does nothing when deallocate(ptr,size) is called
-struct CudaUnmanagedUVMAllocator
-{
-  static const char * name()
-  {
-    return "Cuda Unmanaged UVM Allocator";
-  }
+struct CudaUnmanagedUVMAllocator {
+  static const char* name() { return "Cuda Unmanaged UVM Allocator"; }
 
-  static void deallocate(void * /*ptr*/, size_t /*size*/) {}
+  static void deallocate(void* /*ptr*/, size_t /*size*/) {}
 
   static bool support_texture_binding() { return true; }
 };
 
 /// class CudaUnmanagedHostAllocator
 /// does nothing when deallocate(ptr,size) is called
-class CudaUnmanagedHostAllocator
-{
-public:
-  static const char * name()
-  {
-    return "Cuda Unmanaged Host Allocator";
-  }
+class CudaUnmanagedHostAllocator {
+ public:
+  static const char* name() { return "Cuda Unmanaged Host Allocator"; }
   // Unmanaged deallocate does nothing
-  static void deallocate(void * /*ptr*/, size_t /*size*/) {}
+  static void deallocate(void* /*ptr*/, size_t /*size*/) {}
 };
 
 /// class CudaMallocAllocator
-class CudaMallocAllocator
-{
-public:
-  static const char * name()
-  {
-    return "Cuda Malloc Allocator";
-  }
+class CudaMallocAllocator {
+ public:
+  static const char* name() { return "Cuda Malloc Allocator"; }
 
   static void* allocate(size_t size);
 
-  static void deallocate(void * ptr, size_t);
+  static void deallocate(void* ptr, size_t);
 
-  static void * reallocate(void * old_ptr, size_t old_size, size_t new_size);
+  static void* reallocate(void* old_ptr, size_t old_size, size_t new_size);
 
   static bool support_texture_binding() { return true; }
 };
 
 /// class CudaUVMAllocator
-class CudaUVMAllocator
-{
-public:
-  static const char * name()
-  {
-    return "Cuda UVM Allocator";
-  }
+class CudaUVMAllocator {
+ public:
+  static const char* name() { return "Cuda UVM Allocator"; }
 
   static void* allocate(size_t size);
 
-  static void deallocate(void * ptr, size_t);
+  static void deallocate(void* ptr, size_t);
 
-  static void * reallocate(void * old_ptr, size_t old_size, size_t new_size);
+  static void* reallocate(void* old_ptr, size_t old_size, size_t new_size);
 
   static bool support_texture_binding() { return true; }
 };
 
 /// class CudaHostAllocator
-class CudaHostAllocator
-{
-public:
-  static const char * name()
-  {
-    return "Cuda Host Allocator";
-  }
+class CudaHostAllocator {
+ public:
+  static const char* name() { return "Cuda Host Allocator"; }
 
   static void* allocate(size_t size);
 
-  static void deallocate(void * ptr, size_t);
+  static void deallocate(void* ptr, size_t);
 
-  static void * reallocate(void * old_ptr, size_t old_size, size_t new_size);
+  static void* reallocate(void* old_ptr, size_t old_size, size_t new_size);
 };
 
+}  // namespace Impl
+}  // namespace Kokkos
 
-}} // namespace Kokkos::Impl
-
-#endif //KOKKOS_ENABLE_CUDA
-
-#endif // #ifndef KOKKOS_CUDA_ALLOCATION_TRACKING_HPP
+#endif  // KOKKOS_ENABLE_CUDA
 
+#endif  // #ifndef KOKKOS_CUDA_ALLOCATION_TRACKING_HPP
diff --git a/lib/kokkos/core/src/Cuda/Kokkos_Cuda_Atomic_Intrinsics.hpp b/lib/kokkos/core/src/Cuda/Kokkos_Cuda_Atomic_Intrinsics.hpp
index 9d4bcbc8cf..8a6c0433c8 100644
--- a/lib/kokkos/core/src/Cuda/Kokkos_Cuda_Atomic_Intrinsics.hpp
+++ b/lib/kokkos/core/src/Cuda/Kokkos_Cuda_Atomic_Intrinsics.hpp
@@ -32,10 +32,10 @@ LICENSE ASSOCIATED WITH SUBSEQUENT MODIFICATIONS
 
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
+//                        Kokkos v. 3.0
 //              Copyright (2019) Sandia Corporation
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -53,10 +53,10 @@ LICENSE ASSOCIATED WITH SUBSEQUENT MODIFICATIONS
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -82,85 +82,334 @@ LICENSE ASSOCIATED WITH SUBSEQUENT MODIFICATIONS
 namespace Kokkos {
 namespace Impl {
 
-
 #ifndef __simt_scope
 // Modification: Kokkos GPU atomics should default to `gpu` scope
 #define __simt_scope "gpu"
 #endif
 
-#define __simt_fence_signal_() asm volatile("":::"memory")
-#define __simt_fence_sc_() asm volatile("fence.sc." __simt_scope ";":::"memory")
-#define __simt_fence_() asm volatile("fence." __simt_scope ";":::"memory")
+#define __simt_fence_signal_() asm volatile("" ::: "memory")
+#define __simt_fence_sc_() \
+  asm volatile("fence.sc." __simt_scope ";" ::: "memory")
+#define __simt_fence_() asm volatile("fence." __simt_scope ";" ::: "memory")
 
-#define __simt_load_acquire_8_as_32(ptr,ret) asm volatile("ld.acquire." __simt_scope ".b8 %0, [%1];" : "=r"(ret) : "l"(ptr) : "memory")
-#define __simt_load_relaxed_8_as_32(ptr,ret) asm volatile("ld.relaxed." __simt_scope ".b8 %0, [%1];" : "=r"(ret) : "l"(ptr) : "memory")
-#define __simt_store_release_8_as_32(ptr,desired) asm volatile("st.release." __simt_scope ".b8 [%0], %1;" :: "l"(ptr), "r"(desired) : "memory")
-#define __simt_store_relaxed_8_as_32(ptr,desired) asm volatile("st.relaxed." __simt_scope ".b8 [%0], %1;" :: "l"(ptr), "r"(desired) : "memory")
+#define __simt_load_acquire_8_as_32(ptr, ret)             \
+  asm volatile("ld.acquire." __simt_scope ".b8 %0, [%1];" \
+               : "=r"(ret)                                \
+               : "l"(ptr)                                 \
+               : "memory")
+#define __simt_load_relaxed_8_as_32(ptr, ret)             \
+  asm volatile("ld.relaxed." __simt_scope ".b8 %0, [%1];" \
+               : "=r"(ret)                                \
+               : "l"(ptr)                                 \
+               : "memory")
+#define __simt_store_release_8_as_32(ptr, desired)                    \
+  asm volatile("st.release." __simt_scope ".b8 [%0], %1;" ::"l"(ptr), \
+               "r"(desired)                                           \
+               : "memory")
+#define __simt_store_relaxed_8_as_32(ptr, desired)                    \
+  asm volatile("st.relaxed." __simt_scope ".b8 [%0], %1;" ::"l"(ptr), \
+               "r"(desired)                                           \
+               : "memory")
 
-#define __simt_load_acquire_16(ptr,ret) asm volatile("ld.acquire." __simt_scope ".b16 %0, [%1];" : "=h"(ret) : "l"(ptr) : "memory")
-#define __simt_load_relaxed_16(ptr,ret) asm volatile("ld.relaxed." __simt_scope ".b16 %0, [%1];" : "=h"(ret) : "l"(ptr) : "memory")
-#define __simt_store_release_16(ptr,desired) asm volatile("st.release." __simt_scope ".b16 [%0], %1;" :: "l"(ptr), "h"(desired) : "memory")
-#define __simt_store_relaxed_16(ptr,desired) asm volatile("st.relaxed." __simt_scope ".b16 [%0], %1;" :: "l"(ptr), "h"(desired) : "memory")
+#define __simt_load_acquire_16(ptr, ret)                   \
+  asm volatile("ld.acquire." __simt_scope ".b16 %0, [%1];" \
+               : "=h"(ret)                                 \
+               : "l"(ptr)                                  \
+               : "memory")
+#define __simt_load_relaxed_16(ptr, ret)                   \
+  asm volatile("ld.relaxed." __simt_scope ".b16 %0, [%1];" \
+               : "=h"(ret)                                 \
+               : "l"(ptr)                                  \
+               : "memory")
+#define __simt_store_release_16(ptr, desired)                          \
+  asm volatile("st.release." __simt_scope ".b16 [%0], %1;" ::"l"(ptr), \
+               "h"(desired)                                            \
+               : "memory")
+#define __simt_store_relaxed_16(ptr, desired)                          \
+  asm volatile("st.relaxed." __simt_scope ".b16 [%0], %1;" ::"l"(ptr), \
+               "h"(desired)                                            \
+               : "memory")
 
-#define __simt_load_acquire_32(ptr,ret) asm volatile("ld.acquire." __simt_scope ".b32 %0, [%1];" : "=r"(ret) : "l"(ptr) : "memory")
-#define __simt_load_relaxed_32(ptr,ret) asm volatile("ld.relaxed." __simt_scope ".b32 %0, [%1];" : "=r"(ret) : "l"(ptr) : "memory")
-#define __simt_store_release_32(ptr,desired) asm volatile("st.release." __simt_scope ".b32 [%0], %1;" :: "l"(ptr), "r"(desired) : "memory")
-#define __simt_store_relaxed_32(ptr,desired) asm volatile("st.relaxed." __simt_scope ".b32 [%0], %1;" :: "l"(ptr), "r"(desired) : "memory")
-#define __simt_exch_release_32(ptr,old,desired) asm volatile("atom.exch.release." __simt_scope ".b32 %0, [%1], %2;" : "=r"(old) : "l"(ptr), "r"(desired) : "memory")
-#define __simt_exch_acquire_32(ptr,old,desired) asm volatile("atom.exch.acquire." __simt_scope ".b32 %0, [%1], %2;" : "=r"(old) : "l"(ptr), "r"(desired) : "memory")
-#define __simt_exch_acq_rel_32(ptr,old,desired) asm volatile("atom.exch.acq_rel." __simt_scope ".b32 %0, [%1], %2;" : "=r"(old) : "l"(ptr), "r"(desired) : "memory")
-#define __simt_exch_relaxed_32(ptr,old,desired) asm volatile("atom.exch.relaxed." __simt_scope ".b32 %0, [%1], %2;" : "=r"(old) : "l"(ptr), "r"(desired) : "memory")
-#define __simt_cas_release_32(ptr,old,expected,desired) asm volatile("atom.cas.release." __simt_scope ".b32 %0, [%1], %2, %3;" : "=r"(old) : "l"(ptr), "r"(expected), "r"(desired) : "memory")
-#define __simt_cas_acquire_32(ptr,old,expected,desired) asm volatile("atom.cas.acquire." __simt_scope ".b32 %0, [%1], %2, %3;" : "=r"(old) : "l"(ptr), "r"(expected), "r"(desired) : "memory")
-#define __simt_cas_acq_rel_32(ptr,old,expected,desired) asm volatile("atom.cas.acq_rel." __simt_scope ".b32 %0, [%1], %2, %3;" : "=r"(old) : "l"(ptr), "r"(expected), "r"(desired) : "memory")
-#define __simt_cas_relaxed_32(ptr,old,expected,desired) asm volatile("atom.cas.relaxed." __simt_scope ".b32 %0, [%1], %2, %3;" : "=r"(old) : "l"(ptr), "r"(expected), "r"(desired) : "memory")
-#define __simt_add_release_32(ptr,old,addend) asm volatile("atom.add.release." __simt_scope ".u32 %0, [%1], %2;" : "=r"(old) : "l"(ptr), "r"(addend) : "memory")
-#define __simt_add_acquire_32(ptr,old,addend) asm volatile("atom.add.acquire." __simt_scope ".u32 %0, [%1], %2;" : "=r"(old) : "l"(ptr), "r"(addend) : "memory")
-#define __simt_add_acq_rel_32(ptr,old,addend) asm volatile("atom.add.acq_rel." __simt_scope ".u32 %0, [%1], %2;" : "=r"(old) : "l"(ptr), "r"(addend) : "memory")
-#define __simt_add_relaxed_32(ptr,old,addend) asm volatile("atom.add.relaxed." __simt_scope ".u32 %0, [%1], %2;" : "=r"(old) : "l"(ptr), "r"(addend) : "memory")
-#define __simt_and_release_32(ptr,old,andend) asm volatile("atom.and.release." __simt_scope ".b32 %0, [%1], %2;" : "=r"(old) : "l"(ptr), "r"(andend) : "memory")
-#define __simt_and_acquire_32(ptr,old,andend) asm volatile("atom.and.acquire." __simt_scope ".b32 %0, [%1], %2;" : "=r"(old) : "l"(ptr), "r"(andend) : "memory")
-#define __simt_and_acq_rel_32(ptr,old,andend) asm volatile("atom.and.acq_rel." __simt_scope ".b32 %0, [%1], %2;" : "=r"(old) : "l"(ptr), "r"(andend) : "memory")
-#define __simt_and_relaxed_32(ptr,old,andend) asm volatile("atom.and.relaxed." __simt_scope ".b32 %0, [%1], %2;" : "=r"(old) : "l"(ptr), "r"(andend) : "memory")
-#define __simt_or_release_32(ptr,old,orend) asm volatile("atom.or.release." __simt_scope ".b32 %0, [%1], %2;" : "=r"(old) : "l"(ptr), "r"(orend) : "memory")
-#define __simt_or_acquire_32(ptr,old,orend) asm volatile("atom.or.acquire." __simt_scope ".b32 %0, [%1], %2;" : "=r"(old) : "l"(ptr), "r"(orend) : "memory")
-#define __simt_or_acq_rel_32(ptr,old,orend) asm volatile("atom.or.acq_rel." __simt_scope ".b32 %0, [%1], %2;" : "=r"(old) : "l"(ptr), "r"(orend) : "memory")
-#define __simt_or_relaxed_32(ptr,old,orend) asm volatile("atom.or.relaxed." __simt_scope ".b32 %0, [%1], %2;" : "=r"(old) : "l"(ptr), "r"(orend) : "memory")
-#define __simt_xor_release_32(ptr,old,xorend) asm volatile("atom.xor.release." __simt_scope ".b32 %0, [%1], %2;" : "=r"(old) : "l"(ptr), "r"(xorend) : "memory")
-#define __simt_xor_acquire_32(ptr,old,xorend) asm volatile("atom.xor.acquire." __simt_scope ".b32 %0, [%1], %2;" : "=r"(old) : "l"(ptr), "r"(xorend) : "memory")
-#define __simt_xor_acq_rel_32(ptr,old,xorend) asm volatile("atom.xor.acq_rel." __simt_scope ".b32 %0, [%1], %2;" : "=r"(old) : "l"(ptr), "r"(xorend) : "memory")
-#define __simt_xor_relaxed_32(ptr,old,xorend) asm volatile("atom.xor.relaxed." __simt_scope ".b32 %0, [%1], %2;" : "=r"(old) : "l"(ptr), "r"(xorend) : "memory")
+#define __simt_load_acquire_32(ptr, ret)                   \
+  asm volatile("ld.acquire." __simt_scope ".b32 %0, [%1];" \
+               : "=r"(ret)                                 \
+               : "l"(ptr)                                  \
+               : "memory")
+#define __simt_load_relaxed_32(ptr, ret)                   \
+  asm volatile("ld.relaxed." __simt_scope ".b32 %0, [%1];" \
+               : "=r"(ret)                                 \
+               : "l"(ptr)                                  \
+               : "memory")
+#define __simt_store_release_32(ptr, desired)                          \
+  asm volatile("st.release." __simt_scope ".b32 [%0], %1;" ::"l"(ptr), \
+               "r"(desired)                                            \
+               : "memory")
+#define __simt_store_relaxed_32(ptr, desired)                          \
+  asm volatile("st.relaxed." __simt_scope ".b32 [%0], %1;" ::"l"(ptr), \
+               "r"(desired)                                            \
+               : "memory")
+#define __simt_exch_release_32(ptr, old, desired)                     \
+  asm volatile("atom.exch.release." __simt_scope ".b32 %0, [%1], %2;" \
+               : "=r"(old)                                            \
+               : "l"(ptr), "r"(desired)                               \
+               : "memory")
+#define __simt_exch_acquire_32(ptr, old, desired)                     \
+  asm volatile("atom.exch.acquire." __simt_scope ".b32 %0, [%1], %2;" \
+               : "=r"(old)                                            \
+               : "l"(ptr), "r"(desired)                               \
+               : "memory")
+#define __simt_exch_acq_rel_32(ptr, old, desired)                     \
+  asm volatile("atom.exch.acq_rel." __simt_scope ".b32 %0, [%1], %2;" \
+               : "=r"(old)                                            \
+               : "l"(ptr), "r"(desired)                               \
+               : "memory")
+#define __simt_exch_relaxed_32(ptr, old, desired)                     \
+  asm volatile("atom.exch.relaxed." __simt_scope ".b32 %0, [%1], %2;" \
+               : "=r"(old)                                            \
+               : "l"(ptr), "r"(desired)                               \
+               : "memory")
+#define __simt_cas_release_32(ptr, old, expected, desired)               \
+  asm volatile("atom.cas.release." __simt_scope ".b32 %0, [%1], %2, %3;" \
+               : "=r"(old)                                               \
+               : "l"(ptr), "r"(expected), "r"(desired)                   \
+               : "memory")
+#define __simt_cas_acquire_32(ptr, old, expected, desired)               \
+  asm volatile("atom.cas.acquire." __simt_scope ".b32 %0, [%1], %2, %3;" \
+               : "=r"(old)                                               \
+               : "l"(ptr), "r"(expected), "r"(desired)                   \
+               : "memory")
+#define __simt_cas_acq_rel_32(ptr, old, expected, desired)               \
+  asm volatile("atom.cas.acq_rel." __simt_scope ".b32 %0, [%1], %2, %3;" \
+               : "=r"(old)                                               \
+               : "l"(ptr), "r"(expected), "r"(desired)                   \
+               : "memory")
+#define __simt_cas_relaxed_32(ptr, old, expected, desired)               \
+  asm volatile("atom.cas.relaxed." __simt_scope ".b32 %0, [%1], %2, %3;" \
+               : "=r"(old)                                               \
+               : "l"(ptr), "r"(expected), "r"(desired)                   \
+               : "memory")
+#define __simt_add_release_32(ptr, old, addend)                      \
+  asm volatile("atom.add.release." __simt_scope ".u32 %0, [%1], %2;" \
+               : "=r"(old)                                           \
+               : "l"(ptr), "r"(addend)                               \
+               : "memory")
+#define __simt_add_acquire_32(ptr, old, addend)                      \
+  asm volatile("atom.add.acquire." __simt_scope ".u32 %0, [%1], %2;" \
+               : "=r"(old)                                           \
+               : "l"(ptr), "r"(addend)                               \
+               : "memory")
+#define __simt_add_acq_rel_32(ptr, old, addend)                      \
+  asm volatile("atom.add.acq_rel." __simt_scope ".u32 %0, [%1], %2;" \
+               : "=r"(old)                                           \
+               : "l"(ptr), "r"(addend)                               \
+               : "memory")
+#define __simt_add_relaxed_32(ptr, old, addend)                      \
+  asm volatile("atom.add.relaxed." __simt_scope ".u32 %0, [%1], %2;" \
+               : "=r"(old)                                           \
+               : "l"(ptr), "r"(addend)                               \
+               : "memory")
+#define __simt_and_release_32(ptr, old, andend)                      \
+  asm volatile("atom.and.release." __simt_scope ".b32 %0, [%1], %2;" \
+               : "=r"(old)                                           \
+               : "l"(ptr), "r"(andend)                               \
+               : "memory")
+#define __simt_and_acquire_32(ptr, old, andend)                      \
+  asm volatile("atom.and.acquire." __simt_scope ".b32 %0, [%1], %2;" \
+               : "=r"(old)                                           \
+               : "l"(ptr), "r"(andend)                               \
+               : "memory")
+#define __simt_and_acq_rel_32(ptr, old, andend)                      \
+  asm volatile("atom.and.acq_rel." __simt_scope ".b32 %0, [%1], %2;" \
+               : "=r"(old)                                           \
+               : "l"(ptr), "r"(andend)                               \
+               : "memory")
+#define __simt_and_relaxed_32(ptr, old, andend)                      \
+  asm volatile("atom.and.relaxed." __simt_scope ".b32 %0, [%1], %2;" \
+               : "=r"(old)                                           \
+               : "l"(ptr), "r"(andend)                               \
+               : "memory")
+#define __simt_or_release_32(ptr, old, orend)                       \
+  asm volatile("atom.or.release." __simt_scope ".b32 %0, [%1], %2;" \
+               : "=r"(old)                                          \
+               : "l"(ptr), "r"(orend)                               \
+               : "memory")
+#define __simt_or_acquire_32(ptr, old, orend)                       \
+  asm volatile("atom.or.acquire." __simt_scope ".b32 %0, [%1], %2;" \
+               : "=r"(old)                                          \
+               : "l"(ptr), "r"(orend)                               \
+               : "memory")
+#define __simt_or_acq_rel_32(ptr, old, orend)                       \
+  asm volatile("atom.or.acq_rel." __simt_scope ".b32 %0, [%1], %2;" \
+               : "=r"(old)                                          \
+               : "l"(ptr), "r"(orend)                               \
+               : "memory")
+#define __simt_or_relaxed_32(ptr, old, orend)                       \
+  asm volatile("atom.or.relaxed." __simt_scope ".b32 %0, [%1], %2;" \
+               : "=r"(old)                                          \
+               : "l"(ptr), "r"(orend)                               \
+               : "memory")
+#define __simt_xor_release_32(ptr, old, xorend)                      \
+  asm volatile("atom.xor.release." __simt_scope ".b32 %0, [%1], %2;" \
+               : "=r"(old)                                           \
+               : "l"(ptr), "r"(xorend)                               \
+               : "memory")
+#define __simt_xor_acquire_32(ptr, old, xorend)                      \
+  asm volatile("atom.xor.acquire." __simt_scope ".b32 %0, [%1], %2;" \
+               : "=r"(old)                                           \
+               : "l"(ptr), "r"(xorend)                               \
+               : "memory")
+#define __simt_xor_acq_rel_32(ptr, old, xorend)                      \
+  asm volatile("atom.xor.acq_rel." __simt_scope ".b32 %0, [%1], %2;" \
+               : "=r"(old)                                           \
+               : "l"(ptr), "r"(xorend)                               \
+               : "memory")
+#define __simt_xor_relaxed_32(ptr, old, xorend)                      \
+  asm volatile("atom.xor.relaxed." __simt_scope ".b32 %0, [%1], %2;" \
+               : "=r"(old)                                           \
+               : "l"(ptr), "r"(xorend)                               \
+               : "memory")
 
-#define __simt_load_acquire_64(ptr,ret) asm volatile("ld.acquire." __simt_scope ".b64 %0, [%1];" : "=l"(ret) : "l"(ptr) : "memory")
-#define __simt_load_relaxed_64(ptr,ret) asm volatile("ld.relaxed." __simt_scope ".b64 %0, [%1];" : "=l"(ret) : "l"(ptr) : "memory")
-#define __simt_store_release_64(ptr,desired) asm volatile("st.release." __simt_scope ".b64 [%0], %1;" :: "l"(ptr), "l"(desired) : "memory")
-#define __simt_store_relaxed_64(ptr,desired) asm volatile("st.relaxed." __simt_scope ".b64 [%0], %1;" :: "l"(ptr), "l"(desired) : "memory")
-#define __simt_exch_release_64(ptr,old,desired) asm volatile("atom.exch.release." __simt_scope ".b64 %0, [%1], %2;" : "=l"(old) : "l"(ptr), "l"(desired) : "memory")
-#define __simt_exch_acquire_64(ptr,old,desired) asm volatile("atom.exch.acquire." __simt_scope ".b64 %0, [%1], %2;" : "=l"(old) : "l"(ptr), "l"(desired) : "memory")
-#define __simt_exch_acq_rel_64(ptr,old,desired) asm volatile("atom.exch.acq_rel." __simt_scope ".b64 %0, [%1], %2;" : "=l"(old) : "l"(ptr), "l"(desired) : "memory")
-#define __simt_exch_relaxed_64(ptr,old,desired) asm volatile("atom.exch.relaxed." __simt_scope ".b64 %0, [%1], %2;" : "=l"(old) : "l"(ptr), "l"(desired) : "memory")
-#define __simt_cas_release_64(ptr,old,expected,desired) asm volatile("atom.cas.release." __simt_scope ".b64 %0, [%1], %2, %3;" : "=l"(old) : "l"(ptr), "l"(expected), "l"(desired) : "memory")
-#define __simt_cas_acquire_64(ptr,old,expected,desired) asm volatile("atom.cas.acquire." __simt_scope ".b64 %0, [%1], %2, %3;" : "=l"(old) : "l"(ptr), "l"(expected), "l"(desired) : "memory")
-#define __simt_cas_acq_rel_64(ptr,old,expected,desired) asm volatile("atom.cas.acq_rel." __simt_scope ".b64 %0, [%1], %2, %3;" : "=l"(old) : "l"(ptr), "l"(expected), "l"(desired) : "memory")
-#define __simt_cas_relaxed_64(ptr,old,expected,desired) asm volatile("atom.cas.relaxed." __simt_scope ".b64 %0, [%1], %2, %3;" : "=l"(old) : "l"(ptr), "l"(expected), "l"(desired) : "memory")
-#define __simt_add_release_64(ptr,old,addend) asm volatile("atom.add.release." __simt_scope ".u64 %0, [%1], %2;" : "=l"(old) : "l"(ptr), "l"(addend) : "memory")
-#define __simt_add_acquire_64(ptr,old,addend) asm volatile("atom.add.acquire." __simt_scope ".u64 %0, [%1], %2;" : "=l"(old) : "l"(ptr), "l"(addend) : "memory")
-#define __simt_add_acq_rel_64(ptr,old,addend) asm volatile("atom.add.acq_rel." __simt_scope ".u64 %0, [%1], %2;" : "=l"(old) : "l"(ptr), "l"(addend) : "memory")
-#define __simt_add_relaxed_64(ptr,old,addend) asm volatile("atom.add.relaxed." __simt_scope ".u64 %0, [%1], %2;" : "=l"(old) : "l"(ptr), "l"(addend) : "memory")
-#define __simt_and_release_64(ptr,old,andend) asm volatile("atom.and.release." __simt_scope ".b64 %0, [%1], %2;" : "=l"(old) : "l"(ptr), "l"(andend) : "memory")
-#define __simt_and_acquire_64(ptr,old,andend) asm volatile("atom.and.acquire." __simt_scope ".b64 %0, [%1], %2;" : "=l"(old) : "l"(ptr), "l"(andend) : "memory")
-#define __simt_and_acq_rel_64(ptr,old,andend) asm volatile("atom.and.acq_rel." __simt_scope ".b64 %0, [%1], %2;" : "=l"(old) : "l"(ptr), "l"(andend) : "memory")
-#define __simt_and_relaxed_64(ptr,old,andend) asm volatile("atom.and.relaxed." __simt_scope ".b64 %0, [%1], %2;" : "=l"(old) : "l"(ptr), "l"(andend) : "memory")
-#define __simt_or_release_64(ptr,old,orend) asm volatile("atom.or.release." __simt_scope ".b64 %0, [%1], %2;" : "=l"(old) : "l"(ptr), "l"(orend) : "memory")
-#define __simt_or_acquire_64(ptr,old,orend) asm volatile("atom.or.acquire." __simt_scope ".b64 %0, [%1], %2;" : "=l"(old) : "l"(ptr), "l"(orend) : "memory")
-#define __simt_or_acq_rel_64(ptr,old,orend) asm volatile("atom.or.acq_rel." __simt_scope ".b64 %0, [%1], %2;" : "=l"(old) : "l"(ptr), "l"(orend) : "memory")
-#define __simt_or_relaxed_64(ptr,old,orend) asm volatile("atom.or.relaxed." __simt_scope ".b64 %0, [%1], %2;" : "=l"(old) : "l"(ptr), "l"(orend) : "memory")
-#define __simt_xor_release_64(ptr,old,xorend) asm volatile("atom.xor.release." __simt_scope ".b64 %0, [%1], %2;" : "=l"(old) : "l"(ptr), "l"(xorend) : "memory")
-#define __simt_xor_acquire_64(ptr,old,xorend) asm volatile("atom.xor.acquire." __simt_scope ".b64 %0, [%1], %2;" : "=l"(old) : "l"(ptr), "l"(xorend) : "memory")
-#define __simt_xor_acq_rel_64(ptr,old,xorend) asm volatile("atom.xor.acq_rel." __simt_scope ".b64 %0, [%1], %2;" : "=l"(old) : "l"(ptr), "l"(xorend) : "memory")
-#define __simt_xor_relaxed_64(ptr,old,xorend) asm volatile("atom.xor.relaxed." __simt_scope ".b64 %0, [%1], %2;" : "=l"(old) : "l"(ptr), "l"(xorend) : "memory")
+#define __simt_load_acquire_64(ptr, ret)                   \
+  asm volatile("ld.acquire." __simt_scope ".b64 %0, [%1];" \
+               : "=l"(ret)                                 \
+               : "l"(ptr)                                  \
+               : "memory")
+#define __simt_load_relaxed_64(ptr, ret)                   \
+  asm volatile("ld.relaxed." __simt_scope ".b64 %0, [%1];" \
+               : "=l"(ret)                                 \
+               : "l"(ptr)                                  \
+               : "memory")
+#define __simt_store_release_64(ptr, desired)                          \
+  asm volatile("st.release." __simt_scope ".b64 [%0], %1;" ::"l"(ptr), \
+               "l"(desired)                                            \
+               : "memory")
+#define __simt_store_relaxed_64(ptr, desired)                          \
+  asm volatile("st.relaxed." __simt_scope ".b64 [%0], %1;" ::"l"(ptr), \
+               "l"(desired)                                            \
+               : "memory")
+#define __simt_exch_release_64(ptr, old, desired)                     \
+  asm volatile("atom.exch.release." __simt_scope ".b64 %0, [%1], %2;" \
+               : "=l"(old)                                            \
+               : "l"(ptr), "l"(desired)                               \
+               : "memory")
+#define __simt_exch_acquire_64(ptr, old, desired)                     \
+  asm volatile("atom.exch.acquire." __simt_scope ".b64 %0, [%1], %2;" \
+               : "=l"(old)                                            \
+               : "l"(ptr), "l"(desired)                               \
+               : "memory")
+#define __simt_exch_acq_rel_64(ptr, old, desired)                     \
+  asm volatile("atom.exch.acq_rel." __simt_scope ".b64 %0, [%1], %2;" \
+               : "=l"(old)                                            \
+               : "l"(ptr), "l"(desired)                               \
+               : "memory")
+#define __simt_exch_relaxed_64(ptr, old, desired)                     \
+  asm volatile("atom.exch.relaxed." __simt_scope ".b64 %0, [%1], %2;" \
+               : "=l"(old)                                            \
+               : "l"(ptr), "l"(desired)                               \
+               : "memory")
+#define __simt_cas_release_64(ptr, old, expected, desired)               \
+  asm volatile("atom.cas.release." __simt_scope ".b64 %0, [%1], %2, %3;" \
+               : "=l"(old)                                               \
+               : "l"(ptr), "l"(expected), "l"(desired)                   \
+               : "memory")
+#define __simt_cas_acquire_64(ptr, old, expected, desired)               \
+  asm volatile("atom.cas.acquire." __simt_scope ".b64 %0, [%1], %2, %3;" \
+               : "=l"(old)                                               \
+               : "l"(ptr), "l"(expected), "l"(desired)                   \
+               : "memory")
+#define __simt_cas_acq_rel_64(ptr, old, expected, desired)               \
+  asm volatile("atom.cas.acq_rel." __simt_scope ".b64 %0, [%1], %2, %3;" \
+               : "=l"(old)                                               \
+               : "l"(ptr), "l"(expected), "l"(desired)                   \
+               : "memory")
+#define __simt_cas_relaxed_64(ptr, old, expected, desired)               \
+  asm volatile("atom.cas.relaxed." __simt_scope ".b64 %0, [%1], %2, %3;" \
+               : "=l"(old)                                               \
+               : "l"(ptr), "l"(expected), "l"(desired)                   \
+               : "memory")
+#define __simt_add_release_64(ptr, old, addend)                      \
+  asm volatile("atom.add.release." __simt_scope ".u64 %0, [%1], %2;" \
+               : "=l"(old)                                           \
+               : "l"(ptr), "l"(addend)                               \
+               : "memory")
+#define __simt_add_acquire_64(ptr, old, addend)                      \
+  asm volatile("atom.add.acquire." __simt_scope ".u64 %0, [%1], %2;" \
+               : "=l"(old)                                           \
+               : "l"(ptr), "l"(addend)                               \
+               : "memory")
+#define __simt_add_acq_rel_64(ptr, old, addend)                      \
+  asm volatile("atom.add.acq_rel." __simt_scope ".u64 %0, [%1], %2;" \
+               : "=l"(old)                                           \
+               : "l"(ptr), "l"(addend)                               \
+               : "memory")
+#define __simt_add_relaxed_64(ptr, old, addend)                      \
+  asm volatile("atom.add.relaxed." __simt_scope ".u64 %0, [%1], %2;" \
+               : "=l"(old)                                           \
+               : "l"(ptr), "l"(addend)                               \
+               : "memory")
+#define __simt_and_release_64(ptr, old, andend)                      \
+  asm volatile("atom.and.release." __simt_scope ".b64 %0, [%1], %2;" \
+               : "=l"(old)                                           \
+               : "l"(ptr), "l"(andend)                               \
+               : "memory")
+#define __simt_and_acquire_64(ptr, old, andend)                      \
+  asm volatile("atom.and.acquire." __simt_scope ".b64 %0, [%1], %2;" \
+               : "=l"(old)                                           \
+               : "l"(ptr), "l"(andend)                               \
+               : "memory")
+#define __simt_and_acq_rel_64(ptr, old, andend)                      \
+  asm volatile("atom.and.acq_rel." __simt_scope ".b64 %0, [%1], %2;" \
+               : "=l"(old)                                           \
+               : "l"(ptr), "l"(andend)                               \
+               : "memory")
+#define __simt_and_relaxed_64(ptr, old, andend)                      \
+  asm volatile("atom.and.relaxed." __simt_scope ".b64 %0, [%1], %2;" \
+               : "=l"(old)                                           \
+               : "l"(ptr), "l"(andend)                               \
+               : "memory")
+#define __simt_or_release_64(ptr, old, orend)                       \
+  asm volatile("atom.or.release." __simt_scope ".b64 %0, [%1], %2;" \
+               : "=l"(old)                                          \
+               : "l"(ptr), "l"(orend)                               \
+               : "memory")
+#define __simt_or_acquire_64(ptr, old, orend)                       \
+  asm volatile("atom.or.acquire." __simt_scope ".b64 %0, [%1], %2;" \
+               : "=l"(old)                                          \
+               : "l"(ptr), "l"(orend)                               \
+               : "memory")
+#define __simt_or_acq_rel_64(ptr, old, orend)                       \
+  asm volatile("atom.or.acq_rel." __simt_scope ".b64 %0, [%1], %2;" \
+               : "=l"(old)                                          \
+               : "l"(ptr), "l"(orend)                               \
+               : "memory")
+#define __simt_or_relaxed_64(ptr, old, orend)                       \
+  asm volatile("atom.or.relaxed." __simt_scope ".b64 %0, [%1], %2;" \
+               : "=l"(old)                                          \
+               : "l"(ptr), "l"(orend)                               \
+               : "memory")
+#define __simt_xor_release_64(ptr, old, xorend)                      \
+  asm volatile("atom.xor.release." __simt_scope ".b64 %0, [%1], %2;" \
+               : "=l"(old)                                           \
+               : "l"(ptr), "l"(xorend)                               \
+               : "memory")
+#define __simt_xor_acquire_64(ptr, old, xorend)                      \
+  asm volatile("atom.xor.acquire." __simt_scope ".b64 %0, [%1], %2;" \
+               : "=l"(old)                                           \
+               : "l"(ptr), "l"(xorend)                               \
+               : "memory")
+#define __simt_xor_acq_rel_64(ptr, old, xorend)                      \
+  asm volatile("atom.xor.acq_rel." __simt_scope ".b64 %0, [%1], %2;" \
+               : "=l"(old)                                           \
+               : "l"(ptr), "l"(xorend)                               \
+               : "memory")
+#define __simt_xor_relaxed_64(ptr, old, xorend)                      \
+  asm volatile("atom.xor.relaxed." __simt_scope ".b64 %0, [%1], %2;" \
+               : "=l"(old)                                           \
+               : "l"(ptr), "l"(xorend)                               \
+               : "memory")
 
-#define __simt_nanosleep(timeout) asm volatile("nanosleep.u32 %0;" :: "r"(unsigned(timeout)) : )
+#define __simt_nanosleep(timeout) \
+  asm volatile("nanosleep.u32 %0;" ::"r"(unsigned(timeout)) :)
 
 /*
     definitions
@@ -189,309 +438,355 @@ namespace Impl {
 #endif
 
 inline __device__ int __stronger_order_simt_(int a, int b) {
-    if (b == __ATOMIC_SEQ_CST) return __ATOMIC_SEQ_CST;
-    if (b == __ATOMIC_RELAXED) return a;
-    switch (a) {
+  if (b == __ATOMIC_SEQ_CST) return __ATOMIC_SEQ_CST;
+  if (b == __ATOMIC_RELAXED) return a;
+  switch (a) {
     case __ATOMIC_SEQ_CST:
     case __ATOMIC_ACQ_REL: return a;
     case __ATOMIC_CONSUME:
-    case __ATOMIC_ACQUIRE: if (b != __ATOMIC_ACQUIRE) return __ATOMIC_ACQ_REL; else return __ATOMIC_ACQUIRE;
-    case __ATOMIC_RELEASE: if (b != __ATOMIC_RELEASE) return __ATOMIC_ACQ_REL; else return __ATOMIC_RELEASE;
+    case __ATOMIC_ACQUIRE:
+      if (b != __ATOMIC_ACQUIRE)
+        return __ATOMIC_ACQ_REL;
+      else
+        return __ATOMIC_ACQUIRE;
+    case __ATOMIC_RELEASE:
+      if (b != __ATOMIC_RELEASE)
+        return __ATOMIC_ACQ_REL;
+      else
+        return __ATOMIC_RELEASE;
     case __ATOMIC_RELAXED: return b;
     default: assert(0);
-    }
-    return __ATOMIC_SEQ_CST;
+  }
+  return __ATOMIC_SEQ_CST;
 }
 
 /*
     base
 */
 
-#define DO__atomic_load_simt_(bytes, bits) \
-template<class type, typename std::enable_if<sizeof(type)==bytes, int>::type = 0> \
-void __device__ __atomic_load_simt_ (const type *ptr, type *ret, int memorder) { \
-    int##bits##_t tmp = 0; \
-    switch (memorder) { \
-    case __ATOMIC_SEQ_CST: __simt_fence_sc_(); \
-    case __ATOMIC_CONSUME: \
-    case __ATOMIC_ACQUIRE: __simt_load_acquire_##bits(ptr, tmp); break; \
-    case __ATOMIC_RELAXED: __simt_load_relaxed_##bits(ptr, tmp); break; \
-    default: assert(0); \
-    } \
-    memcpy(ret, &tmp, bytes); \
-}
-DO__atomic_load_simt_(1,32)
-DO__atomic_load_simt_(2,16)
-DO__atomic_load_simt_(4,32)
-DO__atomic_load_simt_(8,64)
+#define DO__atomic_load_simt_(bytes, bits)                                 \
+  template <class type,                                                    \
+            typename std::enable_if<sizeof(type) == bytes, int>::type = 0> \
+  void __device__ __atomic_load_simt_(const type *ptr, type *ret,          \
+                                      int memorder) {                      \
+    int##bits##_t tmp = 0;                                                 \
+    switch (memorder) {                                                    \
+      case __ATOMIC_SEQ_CST: __simt_fence_sc_();                           \
+      case __ATOMIC_CONSUME:                                               \
+      case __ATOMIC_ACQUIRE: __simt_load_acquire_##bits(ptr, tmp); break;  \
+      case __ATOMIC_RELAXED: __simt_load_relaxed_##bits(ptr, tmp); break;  \
+      default: assert(0);                                                  \
+    }                                                                      \
+    memcpy(ret, &tmp, bytes);                                              \
+  }
+DO__atomic_load_simt_(1, 32) DO__atomic_load_simt_(2, 16)
+    DO__atomic_load_simt_(4, 32) DO__atomic_load_simt_(8, 64)
 
-template<class type>
-type __device__ __atomic_load_n_simt_(const type *ptr, int memorder) {
-    type ret;
-    __atomic_load_simt_(ptr, &ret, memorder);
-    return ret;
+        template <class type>
+        type __device__ __atomic_load_n_simt_(const type *ptr, int memorder) {
+  type ret;
+  __atomic_load_simt_(ptr, &ret, memorder);
+  return ret;
 }
 
-#define DO__atomic_store_simt_(bytes, bits) \
-template<class type, typename std::enable_if<sizeof(type)==bytes, int>::type = 0> \
-void __device__ __atomic_store_simt_ (type *ptr, type *val, int memorder) { \
-    int##bits##_t tmp = 0; \
-    memcpy(&tmp, val, bytes); \
-    switch (memorder) { \
-    case __ATOMIC_RELEASE: __simt_store_release_##bits(ptr, tmp); break; \
-    case __ATOMIC_SEQ_CST: __simt_fence_sc_(); \
-    case __ATOMIC_RELAXED: __simt_store_relaxed_##bits(ptr, tmp); break; \
-    default: assert(0); \
-    } \
-}
-DO__atomic_store_simt_(1,32)
-DO__atomic_store_simt_(2,16)
-DO__atomic_store_simt_(4,32)
-DO__atomic_store_simt_(8,64)
+#define DO__atomic_store_simt_(bytes, bits)                                  \
+  template <class type,                                                      \
+            typename std::enable_if<sizeof(type) == bytes, int>::type = 0>   \
+  void __device__ __atomic_store_simt_(type *ptr, type *val, int memorder) { \
+    int##bits##_t tmp = 0;                                                   \
+    memcpy(&tmp, val, bytes);                                                \
+    switch (memorder) {                                                      \
+      case __ATOMIC_RELEASE: __simt_store_release_##bits(ptr, tmp); break;   \
+      case __ATOMIC_SEQ_CST: __simt_fence_sc_();                             \
+      case __ATOMIC_RELAXED: __simt_store_relaxed_##bits(ptr, tmp); break;   \
+      default: assert(0);                                                    \
+    }                                                                        \
+  }
+DO__atomic_store_simt_(1, 32) DO__atomic_store_simt_(2, 16)
+    DO__atomic_store_simt_(4, 32) DO__atomic_store_simt_(8, 64)
 
-template<class type>
-void __device__ __atomic_store_n_simt_(type *ptr, type val, int memorder) {
-    __atomic_store_simt_(ptr, &val, memorder);
+        template <class type>
+        void __device__
+    __atomic_store_n_simt_(type *ptr, type val, int memorder) {
+  __atomic_store_simt_(ptr, &val, memorder);
 }
 
-#define DO__atomic_compare_exchange_simt_(bytes, bits) \
-template<class type, typename std::enable_if<sizeof(type)==bytes, int>::type = 0> \
-bool __device__ __atomic_compare_exchange_simt_ (type *ptr, type *expected, const type *desired, bool, int success_memorder, int failure_memorder) { \
-    int##bits##_t tmp = 0, old = 0, old_tmp; \
-    memcpy(&tmp, desired, bytes); \
-    memcpy(&old, expected, bytes); \
-    old_tmp = old; \
-    switch (__stronger_order_simt_(success_memorder, failure_memorder)) { \
-    case __ATOMIC_SEQ_CST: __simt_fence_sc_(); \
-    case __ATOMIC_CONSUME: \
-    case __ATOMIC_ACQUIRE: __simt_cas_acquire_##bits(ptr, old, old_tmp, tmp); break; \
-    case __ATOMIC_ACQ_REL: __simt_cas_acq_rel_##bits(ptr, old, old_tmp, tmp); break; \
-    case __ATOMIC_RELEASE: __simt_cas_release_##bits(ptr, old, old_tmp, tmp); break; \
-    case __ATOMIC_RELAXED: __simt_cas_relaxed_##bits(ptr, old, old_tmp, tmp); break; \
-    default: assert(0); \
-    } \
-    bool const ret = old == old_tmp; \
-    memcpy(expected, &old, bytes); \
-    return ret; \
-}
+#define DO__atomic_compare_exchange_simt_(bytes, bits)                     \
+  template <class type,                                                    \
+            typename std::enable_if<sizeof(type) == bytes, int>::type = 0> \
+  bool __device__ __atomic_compare_exchange_simt_(                         \
+      type *ptr, type *expected, const type *desired, bool,                \
+      int success_memorder, int failure_memorder) {                        \
+    int##bits##_t tmp = 0, old = 0, old_tmp;                               \
+    memcpy(&tmp, desired, bytes);                                          \
+    memcpy(&old, expected, bytes);                                         \
+    old_tmp = old;                                                         \
+    switch (__stronger_order_simt_(success_memorder, failure_memorder)) {  \
+      case __ATOMIC_SEQ_CST: __simt_fence_sc_();                           \
+      case __ATOMIC_CONSUME:                                               \
+      case __ATOMIC_ACQUIRE:                                               \
+        __simt_cas_acquire_##bits(ptr, old, old_tmp, tmp);                 \
+        break;                                                             \
+      case __ATOMIC_ACQ_REL:                                               \
+        __simt_cas_acq_rel_##bits(ptr, old, old_tmp, tmp);                 \
+        break;                                                             \
+      case __ATOMIC_RELEASE:                                               \
+        __simt_cas_release_##bits(ptr, old, old_tmp, tmp);                 \
+        break;                                                             \
+      case __ATOMIC_RELAXED:                                               \
+        __simt_cas_relaxed_##bits(ptr, old, old_tmp, tmp);                 \
+        break;                                                             \
+      default: assert(0);                                                  \
+    }                                                                      \
+    bool const ret = old == old_tmp;                                       \
+    memcpy(expected, &old, bytes);                                         \
+    return ret;                                                            \
+  }
 DO__atomic_compare_exchange_simt_(4, 32)
-DO__atomic_compare_exchange_simt_(8, 64)
+    DO__atomic_compare_exchange_simt_(8, 64)
 
-template<class type, typename std::enable_if<sizeof(type) <= 2, int>::type = 0> \
-bool __device__ __atomic_compare_exchange_simt_(type *ptr, type *expected, const type *desired, bool, int success_memorder, int failure_memorder) {
+        template <class type,
+                  typename std::enable_if<sizeof(type) <= 2, int>::type = 0>
+        bool __device__
+    __atomic_compare_exchange_simt_(type *ptr, type *expected,
+                                    const type *desired, bool,
+                                    int success_memorder,
+                                    int failure_memorder) {
+  using R            = typename std::conditional<std::is_volatile<type>::value,
+                                      volatile uint32_t, uint32_t>::type;
+  auto const aligned = (R *)((intptr_t)ptr & ~(sizeof(uint32_t) - 1));
+  auto const offset  = uint32_t((intptr_t)ptr & (sizeof(uint32_t) - 1)) * 8;
+  auto const mask    = ((1 << sizeof(type) * 8) - 1) << offset;
 
-    using R = typename std::conditional<std::is_volatile<type>::value, volatile uint32_t, uint32_t>::type;
-    auto const aligned = (R*)((intptr_t)ptr & ~(sizeof(uint32_t) - 1));
-    auto const offset = uint32_t((intptr_t)ptr & (sizeof(uint32_t) - 1)) * 8;
-    auto const mask = ((1 << sizeof(type)*8) - 1) << offset;
-
-    uint32_t old = *expected << offset, old_value;
-    while (1) {
-        old_value = (old & mask) >> offset;
-        if (old_value != *expected)
-            break;
-        uint32_t const attempt = (old & ~mask) | (*desired << offset);
-        if (__atomic_compare_exchange_simt_ (aligned, &old, &attempt, true, success_memorder, failure_memorder))
-            return true;
-    }
-    *expected = old_value;
-    return false;
+  uint32_t old = *expected << offset, old_value;
+  while (1) {
+    old_value = (old & mask) >> offset;
+    if (old_value != *expected) break;
+    uint32_t const attempt = (old & ~mask) | (*desired << offset);
+    if (__atomic_compare_exchange_simt_(aligned, &old, &attempt, true,
+                                        success_memorder, failure_memorder))
+      return true;
+  }
+  *expected = old_value;
+  return false;
 }
 
-template<class type>
-bool __device__ __atomic_compare_exchange_n_simt_(type *ptr, type *expected, type desired, bool weak, int success_memorder, int failure_memorder) {
-    return __atomic_compare_exchange_simt_(ptr, expected, &desired, weak, success_memorder, failure_memorder);
+template <class type>
+bool __device__ __atomic_compare_exchange_n_simt_(type *ptr, type *expected,
+                                                  type desired, bool weak,
+                                                  int success_memorder,
+                                                  int failure_memorder) {
+  return __atomic_compare_exchange_simt_(ptr, expected, &desired, weak,
+                                         success_memorder, failure_memorder);
 }
 
-#define DO__atomic_exchange_simt_(bytes, bits) \
-template<class type, typename std::enable_if<sizeof(type)==bytes, int>::type = 0> \
-void __device__ __atomic_exchange_simt_ (type *ptr, type *val, type *ret, int memorder) { \
-    int##bits##_t tmp = 0; \
-    memcpy(&tmp, val, bytes); \
-    switch (memorder) { \
-    case __ATOMIC_SEQ_CST: __simt_fence_sc_(); \
-    case __ATOMIC_CONSUME: \
-    case __ATOMIC_ACQUIRE: __simt_exch_acquire_##bits(ptr, tmp, tmp); break; \
-    case __ATOMIC_ACQ_REL: __simt_exch_acq_rel_##bits(ptr, tmp, tmp); break; \
-    case __ATOMIC_RELEASE: __simt_exch_release_##bits(ptr, tmp, tmp); break; \
-    case __ATOMIC_RELAXED: __simt_exch_relaxed_##bits(ptr, tmp, tmp); break; \
-    default: assert(0); \
-    } \
-    memcpy(ret, &tmp, bytes); \
-}
-DO__atomic_exchange_simt_(4,32)
-DO__atomic_exchange_simt_(8,64)
+#define DO__atomic_exchange_simt_(bytes, bits)                                 \
+  template <class type,                                                        \
+            typename std::enable_if<sizeof(type) == bytes, int>::type = 0>     \
+  void __device__ __atomic_exchange_simt_(type *ptr, type *val, type *ret,     \
+                                          int memorder) {                      \
+    int##bits##_t tmp = 0;                                                     \
+    memcpy(&tmp, val, bytes);                                                  \
+    switch (memorder) {                                                        \
+      case __ATOMIC_SEQ_CST: __simt_fence_sc_();                               \
+      case __ATOMIC_CONSUME:                                                   \
+      case __ATOMIC_ACQUIRE: __simt_exch_acquire_##bits(ptr, tmp, tmp); break; \
+      case __ATOMIC_ACQ_REL: __simt_exch_acq_rel_##bits(ptr, tmp, tmp); break; \
+      case __ATOMIC_RELEASE: __simt_exch_release_##bits(ptr, tmp, tmp); break; \
+      case __ATOMIC_RELAXED: __simt_exch_relaxed_##bits(ptr, tmp, tmp); break; \
+      default: assert(0);                                                      \
+    }                                                                          \
+    memcpy(ret, &tmp, bytes);                                                  \
+  }
+DO__atomic_exchange_simt_(4, 32) DO__atomic_exchange_simt_(8, 64)
 
-template<class type, typename std::enable_if<sizeof(type)<=2, int>::type = 0>
-void __device__ __atomic_exchange_simt_ (type *ptr, type *val, type *ret, int memorder) {
-
-    type expected = __atomic_load_n_simt_(ptr, __ATOMIC_RELAXED);
-    while(!__atomic_compare_exchange_simt_(ptr, &expected, val, true, memorder, memorder))
-        ;
-    *ret = expected;
+    template <class type,
+              typename std::enable_if<sizeof(type) <= 2, int>::type = 0>
+    void __device__
+    __atomic_exchange_simt_(type *ptr, type *val, type *ret, int memorder) {
+  type expected = __atomic_load_n_simt_(ptr, __ATOMIC_RELAXED);
+  while (!__atomic_compare_exchange_simt_(ptr, &expected, val, true, memorder,
+                                          memorder))
+    ;
+  *ret = expected;
 }
 
-template<class type>
+template <class type>
 type __device__ __atomic_exchange_n_simt_(type *ptr, type val, int memorder) {
-    type ret;
-    __atomic_exchange_simt_(ptr, &val, &ret, memorder);
-    return ret;
+  type ret;
+  __atomic_exchange_simt_(ptr, &val, &ret, memorder);
+  return ret;
 }
 
-#define DO__atomic_fetch_add_simt_(bytes, bits) \
-template<class type, class delta, typename std::enable_if<sizeof(type)==bytes, int>::type = 0> \
-type __device__ __atomic_fetch_add_simt_ (type *ptr, delta val, int memorder) { \
-    type ret; \
-    switch (memorder) { \
-    case __ATOMIC_SEQ_CST: __simt_fence_sc_(); \
-    case __ATOMIC_CONSUME: \
-    case __ATOMIC_ACQUIRE: __simt_add_acquire_##bits(ptr, ret, val); break; \
-    case __ATOMIC_ACQ_REL: __simt_add_acq_rel_##bits(ptr, ret, val); break; \
-    case __ATOMIC_RELEASE: __simt_add_release_##bits(ptr, ret, val); break; \
-    case __ATOMIC_RELAXED: __simt_add_relaxed_##bits(ptr, ret, val); break; \
-    default: assert(0); \
-    } \
-    return ret; \
-}
-DO__atomic_fetch_add_simt_(4, 32)
-DO__atomic_fetch_add_simt_(8, 64)
+#define DO__atomic_fetch_add_simt_(bytes, bits)                               \
+  template <class type, class delta,                                          \
+            typename std::enable_if<sizeof(type) == bytes, int>::type = 0>    \
+  type __device__ __atomic_fetch_add_simt_(type *ptr, delta val,              \
+                                           int memorder) {                    \
+    type ret;                                                                 \
+    switch (memorder) {                                                       \
+      case __ATOMIC_SEQ_CST: __simt_fence_sc_();                              \
+      case __ATOMIC_CONSUME:                                                  \
+      case __ATOMIC_ACQUIRE: __simt_add_acquire_##bits(ptr, ret, val); break; \
+      case __ATOMIC_ACQ_REL: __simt_add_acq_rel_##bits(ptr, ret, val); break; \
+      case __ATOMIC_RELEASE: __simt_add_release_##bits(ptr, ret, val); break; \
+      case __ATOMIC_RELAXED: __simt_add_relaxed_##bits(ptr, ret, val); break; \
+      default: assert(0);                                                     \
+    }                                                                         \
+    return ret;                                                               \
+  }
+DO__atomic_fetch_add_simt_(4, 32) DO__atomic_fetch_add_simt_(8, 64)
 
-template<class type, class delta, typename std::enable_if<sizeof(type)<=2, int>::type = 0>
-type __device__ __atomic_fetch_add_simt_ (type *ptr, delta val, int memorder) {
-
-    type expected = __atomic_load_n_simt_(ptr, __ATOMIC_RELAXED);
-    type const desired = expected + val;
-    while(!__atomic_compare_exchange_simt_(ptr, &expected, &desired, true, memorder, memorder))
-        ;
-    return expected;
+    template <class type, class delta,
+              typename std::enable_if<sizeof(type) <= 2, int>::type = 0>
+    type __device__
+    __atomic_fetch_add_simt_(type *ptr, delta val, int memorder) {
+  type expected      = __atomic_load_n_simt_(ptr, __ATOMIC_RELAXED);
+  type const desired = expected + val;
+  while (!__atomic_compare_exchange_simt_(ptr, &expected, &desired, true,
+                                          memorder, memorder))
+    ;
+  return expected;
 }
 
-#define DO__atomic_fetch_sub_simt_(bytes, bits) \
-template<class type, class delta, typename std::enable_if<sizeof(type)==bytes, int>::type = 0> \
-type __device__ __atomic_fetch_sub_simt_ (type *ptr, delta val, int memorder) { \
-    type ret; \
-    switch (memorder) { \
-    case __ATOMIC_SEQ_CST: __simt_fence_sc_(); \
-    case __ATOMIC_CONSUME: \
-    case __ATOMIC_ACQUIRE: __simt_add_acquire_##bits(ptr, ret, -val); break; \
-    case __ATOMIC_ACQ_REL: __simt_add_acq_rel_##bits(ptr, ret, -val); break; \
-    case __ATOMIC_RELEASE: __simt_add_release_##bits(ptr, ret, -val); break; \
-    case __ATOMIC_RELAXED: __simt_add_relaxed_##bits(ptr, ret, -val); break; \
-    default: assert(0); \
-    } \
-    return ret; \
-}
-DO__atomic_fetch_sub_simt_(4,32)
-DO__atomic_fetch_sub_simt_(8,64)
+#define DO__atomic_fetch_sub_simt_(bytes, bits)                                \
+  template <class type, class delta,                                           \
+            typename std::enable_if<sizeof(type) == bytes, int>::type = 0>     \
+  type __device__ __atomic_fetch_sub_simt_(type *ptr, delta val,               \
+                                           int memorder) {                     \
+    type ret;                                                                  \
+    switch (memorder) {                                                        \
+      case __ATOMIC_SEQ_CST: __simt_fence_sc_();                               \
+      case __ATOMIC_CONSUME:                                                   \
+      case __ATOMIC_ACQUIRE: __simt_add_acquire_##bits(ptr, ret, -val); break; \
+      case __ATOMIC_ACQ_REL: __simt_add_acq_rel_##bits(ptr, ret, -val); break; \
+      case __ATOMIC_RELEASE: __simt_add_release_##bits(ptr, ret, -val); break; \
+      case __ATOMIC_RELAXED: __simt_add_relaxed_##bits(ptr, ret, -val); break; \
+      default: assert(0);                                                      \
+    }                                                                          \
+    return ret;                                                                \
+  }
+DO__atomic_fetch_sub_simt_(4, 32) DO__atomic_fetch_sub_simt_(8, 64)
 
-template<class type, class delta, typename std::enable_if<sizeof(type)<=2, int>::type = 0>
-type __device__ __atomic_fetch_sub_simt_ (type *ptr, delta val, int memorder) {
-
-    type expected = __atomic_load_n_simt_(ptr, __ATOMIC_RELAXED);
-    type const desired = expected - val;
-    while(!__atomic_compare_exchange_simt_(ptr, &expected, &desired, true, memorder, memorder))
-        ;
-    return expected;
+    template <class type, class delta,
+              typename std::enable_if<sizeof(type) <= 2, int>::type = 0>
+    type __device__
+    __atomic_fetch_sub_simt_(type *ptr, delta val, int memorder) {
+  type expected      = __atomic_load_n_simt_(ptr, __ATOMIC_RELAXED);
+  type const desired = expected - val;
+  while (!__atomic_compare_exchange_simt_(ptr, &expected, &desired, true,
+                                          memorder, memorder))
+    ;
+  return expected;
 }
 
-#define DO__atomic_fetch_and_simt_(bytes, bits) \
-template<class type, typename std::enable_if<sizeof(type)==bytes, int>::type = 0> \
-type __device__ __atomic_fetch_and_simt_ (type *ptr, type val, int memorder) { \
-    type ret; \
-    switch (memorder) { \
-    case __ATOMIC_SEQ_CST: __simt_fence_sc_(); \
-    case __ATOMIC_CONSUME: \
-    case __ATOMIC_ACQUIRE: __simt_and_acquire_##bits(ptr, ret, val); break; \
-    case __ATOMIC_ACQ_REL: __simt_and_acq_rel_##bits(ptr, ret, val); break; \
-    case __ATOMIC_RELEASE: __simt_and_release_##bits(ptr, ret, val); break; \
-    case __ATOMIC_RELAXED: __simt_and_relaxed_##bits(ptr, ret, val); break; \
-    default: assert(0); \
-    } \
-    return ret; \
-}
-DO__atomic_fetch_and_simt_(4,32)
-DO__atomic_fetch_and_simt_(8,64)
+#define DO__atomic_fetch_and_simt_(bytes, bits)                               \
+  template <class type,                                                       \
+            typename std::enable_if<sizeof(type) == bytes, int>::type = 0>    \
+  type __device__ __atomic_fetch_and_simt_(type *ptr, type val,               \
+                                           int memorder) {                    \
+    type ret;                                                                 \
+    switch (memorder) {                                                       \
+      case __ATOMIC_SEQ_CST: __simt_fence_sc_();                              \
+      case __ATOMIC_CONSUME:                                                  \
+      case __ATOMIC_ACQUIRE: __simt_and_acquire_##bits(ptr, ret, val); break; \
+      case __ATOMIC_ACQ_REL: __simt_and_acq_rel_##bits(ptr, ret, val); break; \
+      case __ATOMIC_RELEASE: __simt_and_release_##bits(ptr, ret, val); break; \
+      case __ATOMIC_RELAXED: __simt_and_relaxed_##bits(ptr, ret, val); break; \
+      default: assert(0);                                                     \
+    }                                                                         \
+    return ret;                                                               \
+  }
+DO__atomic_fetch_and_simt_(4, 32) DO__atomic_fetch_and_simt_(8, 64)
 
-template<class type, class delta, typename std::enable_if<sizeof(type)<=2, int>::type = 0>
-type __device__ __atomic_fetch_and_simt_ (type *ptr, delta val, int memorder) {
-
-    type expected = __atomic_load_n_simt_(ptr, __ATOMIC_RELAXED);
-    type const desired = expected & val;
-    while(!__atomic_compare_exchange_simt_(ptr, &expected, &desired, true, memorder, memorder))
-        ;
-    return expected;
+    template <class type, class delta,
+              typename std::enable_if<sizeof(type) <= 2, int>::type = 0>
+    type __device__
+    __atomic_fetch_and_simt_(type *ptr, delta val, int memorder) {
+  type expected      = __atomic_load_n_simt_(ptr, __ATOMIC_RELAXED);
+  type const desired = expected & val;
+  while (!__atomic_compare_exchange_simt_(ptr, &expected, &desired, true,
+                                          memorder, memorder))
+    ;
+  return expected;
 }
 
-#define DO__atomic_fetch_xor_simt_(bytes, bits) \
-template<class type, typename std::enable_if<sizeof(type)==bytes, int>::type = 0> \
-type __device__ __atomic_fetch_xor_simt_ (type *ptr, type val, int memorder) { \
-    type ret; \
-    switch (memorder) { \
-    case __ATOMIC_SEQ_CST: __simt_fence_sc_(); \
-    case __ATOMIC_CONSUME: \
-    case __ATOMIC_ACQUIRE: __simt_xor_acquire_##bits(ptr, ret, val); break; \
-    case __ATOMIC_ACQ_REL: __simt_xor_acq_rel_##bits(ptr, ret, val); break; \
-    case __ATOMIC_RELEASE: __simt_xor_release_##bits(ptr, ret, val); break; \
-    case __ATOMIC_RELAXED: __simt_xor_relaxed_##bits(ptr, ret, val); break; \
-    default: assert(0); \
-    } \
-    return ret; \
-}
-DO__atomic_fetch_xor_simt_(4,32)
-DO__atomic_fetch_xor_simt_(8,64)
+#define DO__atomic_fetch_xor_simt_(bytes, bits)                               \
+  template <class type,                                                       \
+            typename std::enable_if<sizeof(type) == bytes, int>::type = 0>    \
+  type __device__ __atomic_fetch_xor_simt_(type *ptr, type val,               \
+                                           int memorder) {                    \
+    type ret;                                                                 \
+    switch (memorder) {                                                       \
+      case __ATOMIC_SEQ_CST: __simt_fence_sc_();                              \
+      case __ATOMIC_CONSUME:                                                  \
+      case __ATOMIC_ACQUIRE: __simt_xor_acquire_##bits(ptr, ret, val); break; \
+      case __ATOMIC_ACQ_REL: __simt_xor_acq_rel_##bits(ptr, ret, val); break; \
+      case __ATOMIC_RELEASE: __simt_xor_release_##bits(ptr, ret, val); break; \
+      case __ATOMIC_RELAXED: __simt_xor_relaxed_##bits(ptr, ret, val); break; \
+      default: assert(0);                                                     \
+    }                                                                         \
+    return ret;                                                               \
+  }
+DO__atomic_fetch_xor_simt_(4, 32) DO__atomic_fetch_xor_simt_(8, 64)
 
-template<class type, class delta, typename std::enable_if<sizeof(type)<=2, int>::type = 0>
-type __device__ __atomic_fetch_xor_simt_ (type *ptr, delta val, int memorder) {
-
-    type expected = __atomic_load_n_simt_(ptr, __ATOMIC_RELAXED);
-    type const desired = expected ^ val;
-    while(!__atomic_compare_exchange_simt_(ptr, &expected, &desired, true, memorder, memorder))
-        ;
-    return expected;
+    template <class type, class delta,
+              typename std::enable_if<sizeof(type) <= 2, int>::type = 0>
+    type __device__
+    __atomic_fetch_xor_simt_(type *ptr, delta val, int memorder) {
+  type expected      = __atomic_load_n_simt_(ptr, __ATOMIC_RELAXED);
+  type const desired = expected ^ val;
+  while (!__atomic_compare_exchange_simt_(ptr, &expected, &desired, true,
+                                          memorder, memorder))
+    ;
+  return expected;
 }
 
-#define DO__atomic_fetch_or_simt_(bytes, bits) \
-template<class type, typename std::enable_if<sizeof(type)==bytes, int>::type = 0> \
-type __device__ __atomic_fetch_or_simt_ (type *ptr, type val, int memorder) { \
-    type ret; \
-    switch (memorder) { \
-    case __ATOMIC_SEQ_CST: __simt_fence_sc_(); \
-    case __ATOMIC_CONSUME: \
-    case __ATOMIC_ACQUIRE: __simt_or_acquire_##bits(ptr, ret, val); break; \
-    case __ATOMIC_ACQ_REL: __simt_or_acq_rel_##bits(ptr, ret, val); break; \
-    case __ATOMIC_RELEASE: __simt_or_release_##bits(ptr, ret, val); break; \
-    case __ATOMIC_RELAXED: __simt_or_relaxed_##bits(ptr, ret, val); break; \
-    default: assert(0); \
-    } \
-    return ret; \
-}
-DO__atomic_fetch_or_simt_(4,32)
-DO__atomic_fetch_or_simt_(8,64)
+#define DO__atomic_fetch_or_simt_(bytes, bits)                                 \
+  template <class type,                                                        \
+            typename std::enable_if<sizeof(type) == bytes, int>::type = 0>     \
+  type __device__ __atomic_fetch_or_simt_(type *ptr, type val, int memorder) { \
+    type ret;                                                                  \
+    switch (memorder) {                                                        \
+      case __ATOMIC_SEQ_CST: __simt_fence_sc_();                               \
+      case __ATOMIC_CONSUME:                                                   \
+      case __ATOMIC_ACQUIRE: __simt_or_acquire_##bits(ptr, ret, val); break;   \
+      case __ATOMIC_ACQ_REL: __simt_or_acq_rel_##bits(ptr, ret, val); break;   \
+      case __ATOMIC_RELEASE: __simt_or_release_##bits(ptr, ret, val); break;   \
+      case __ATOMIC_RELAXED: __simt_or_relaxed_##bits(ptr, ret, val); break;   \
+      default: assert(0);                                                      \
+    }                                                                          \
+    return ret;                                                                \
+  }
+DO__atomic_fetch_or_simt_(4, 32) DO__atomic_fetch_or_simt_(8, 64)
 
-template<class type, class delta, typename std::enable_if<sizeof(type)<=2, int>::type = 0>
-type __device__ __atomic_fetch_or_simt_ (type *ptr, delta val, int memorder) {
-
-    type expected = __atomic_load_n_simt_(ptr, __ATOMIC_RELAXED);
-    type const desired = expected | val;
-    while(!__atomic_compare_exchange_simt_(ptr, &expected, &desired, true, memorder, memorder))
-        ;
-    return expected;
+    template <class type, class delta,
+              typename std::enable_if<sizeof(type) <= 2, int>::type = 0>
+    type __device__
+    __atomic_fetch_or_simt_(type *ptr, delta val, int memorder) {
+  type expected      = __atomic_load_n_simt_(ptr, __ATOMIC_RELAXED);
+  type const desired = expected | val;
+  while (!__atomic_compare_exchange_simt_(ptr, &expected, &desired, true,
+                                          memorder, memorder))
+    ;
+  return expected;
 }
 
-template<class type>
+template <class type>
 inline bool __device__ __atomic_test_and_set_simt_(type *ptr, int memorder) {
-    return __atomic_exchange_n_simt_((char*)ptr, (char)1, memorder) == 1;
+  return __atomic_exchange_n_simt_((char *)ptr, (char)1, memorder) == 1;
 }
-template<class type>
+template <class type>
 inline void __device__ __atomic_clear_simt_(type *ptr, int memorder) {
-    return __atomic_store_n_simt_((char*)ptr, (char)0, memorder);
+  return __atomic_store_n_simt_((char *)ptr, (char)0, memorder);
 }
 
-inline constexpr __device__ bool __atomic_always_lock_free_simt_ (size_t size, void *) {
-    return size <= 8;
+inline constexpr __device__ bool __atomic_always_lock_free_simt_(size_t size,
+                                                                 void *) {
+  return size <= 8;
 }
-inline __device__ bool __atomic_is_lock_free_simt_(size_t size, void * ptr) {
-    return __atomic_always_lock_free_simt_(size, ptr);
+inline __device__ bool __atomic_is_lock_free_simt_(size_t size, void *ptr) {
+  return __atomic_always_lock_free_simt_(size, ptr);
 }
 
 /*
@@ -499,7 +794,7 @@ inline __device__ bool __atomic_is_lock_free_simt_(size_t size, void * ptr) {
 */
 
 inline void __device__ __atomic_thread_fence_simt(int memorder) {
-    switch (memorder) {
+  switch (memorder) {
     case __ATOMIC_SEQ_CST: __simt_fence_sc_(); break;
     case __ATOMIC_CONSUME:
     case __ATOMIC_ACQUIRE:
@@ -507,124 +802,184 @@ inline void __device__ __atomic_thread_fence_simt(int memorder) {
     case __ATOMIC_RELEASE: __simt_fence_(); break;
     case __ATOMIC_RELAXED: break;
     default: assert(0);
-    }
+  }
 }
-inline void __device__ __atomic_signal_fence_simt(int memorder) { 
-    __atomic_thread_fence_simt(memorder);
+inline void __device__ __atomic_signal_fence_simt(int memorder) {
+  __atomic_thread_fence_simt(memorder);
 }
 
 /*
     non-volatile
 */
 
-template<class type> type __device__ __atomic_load_n_simt(const type *ptr, int memorder) {
-    return __atomic_load_n_simt_(const_cast<const type*>(ptr), memorder);
+template <class type>
+type __device__ __atomic_load_n_simt(const type *ptr, int memorder) {
+  return __atomic_load_n_simt_(const_cast<const type *>(ptr), memorder);
 }
-template<class type> void __device__ __atomic_load_simt(const type *ptr, type *ret, int memorder) {
-    __atomic_load_simt_(const_cast<const type*>(ptr), ret, memorder);
+template <class type>
+void __device__ __atomic_load_simt(const type *ptr, type *ret, int memorder) {
+  __atomic_load_simt_(const_cast<const type *>(ptr), ret, memorder);
 }
-template<class type> void __device__ __atomic_store_n_simt(type *ptr, type val, int memorder) {
-    __atomic_store_n_simt_(const_cast<type*>(ptr), val, memorder);
+template <class type>
+void __device__ __atomic_store_n_simt(type *ptr, type val, int memorder) {
+  __atomic_store_n_simt_(const_cast<type *>(ptr), val, memorder);
 }
-template<class type> void __device__ __atomic_store_simt(type *ptr, type *val, int memorder) {
-    __atomic_store_simt_(const_cast<type*>(ptr), val, memorder);
+template <class type>
+void __device__ __atomic_store_simt(type *ptr, type *val, int memorder) {
+  __atomic_store_simt_(const_cast<type *>(ptr), val, memorder);
 }
-template<class type> type __device__ __atomic_exchange_n_simt(type *ptr, type val, int memorder) {
-    return __atomic_exchange_n_simt_(const_cast<type*>(ptr), val, memorder);
+template <class type>
+type __device__ __atomic_exchange_n_simt(type *ptr, type val, int memorder) {
+  return __atomic_exchange_n_simt_(const_cast<type *>(ptr), val, memorder);
 }
-template<class type> void __device__ __atomic_exchange_simt(type *ptr, type *val, type *ret, int memorder) {
-    __atomic_exchange_simt_(const_cast<type*>(ptr), val, ret, memorder);
+template <class type>
+void __device__ __atomic_exchange_simt(type *ptr, type *val, type *ret,
+                                       int memorder) {
+  __atomic_exchange_simt_(const_cast<type *>(ptr), val, ret, memorder);
 }
-template<class type> bool __device__ __atomic_compare_exchange_n_simt(type *ptr, type *expected, type desired, bool weak, int success_memorder, int failure_memorder) {
-    return __atomic_compare_exchange_n_simt_(const_cast<type*>(ptr), expected, desired, weak, success_memorder, failure_memorder);
+template <class type>
+bool __device__ __atomic_compare_exchange_n_simt(type *ptr, type *expected,
+                                                 type desired, bool weak,
+                                                 int success_memorder,
+                                                 int failure_memorder) {
+  return __atomic_compare_exchange_n_simt_(const_cast<type *>(ptr), expected,
+                                           desired, weak, success_memorder,
+                                           failure_memorder);
 }
-template<class type> bool __device__ __atomic_compare_exchange_simt(type *ptr, type *expected, type *desired, bool weak, int success_memorder, int failure_memorder) {
-    return __atomic_compare_exchange_simt_(const_cast<type*>(ptr), expected, desired, weak, success_memorder, failure_memorder);
+template <class type>
+bool __device__ __atomic_compare_exchange_simt(type *ptr, type *expected,
+                                               type *desired, bool weak,
+                                               int success_memorder,
+                                               int failure_memorder) {
+  return __atomic_compare_exchange_simt_(const_cast<type *>(ptr), expected,
+                                         desired, weak, success_memorder,
+                                         failure_memorder);
 }
-template<class type, class delta> type __device__ __atomic_fetch_add_simt(type *ptr, delta val, int memorder) {
-    return __atomic_fetch_add_simt_(const_cast<type*>(ptr), val, memorder);
+template <class type, class delta>
+type __device__ __atomic_fetch_add_simt(type *ptr, delta val, int memorder) {
+  return __atomic_fetch_add_simt_(const_cast<type *>(ptr), val, memorder);
 }
-template<class type, class delta> type __device__ __atomic_fetch_sub_simt(type *ptr, delta val, int memorder) {
-    return __atomic_fetch_sub_simt_(const_cast<type*>(ptr), val, memorder);
+template <class type, class delta>
+type __device__ __atomic_fetch_sub_simt(type *ptr, delta val, int memorder) {
+  return __atomic_fetch_sub_simt_(const_cast<type *>(ptr), val, memorder);
 }
-template<class type> type __device__ __atomic_fetch_and_simt(type *ptr, type val, int memorder) {
-    return __atomic_fetch_and_simt_(const_cast<type*>(ptr), val, memorder);
+template <class type>
+type __device__ __atomic_fetch_and_simt(type *ptr, type val, int memorder) {
+  return __atomic_fetch_and_simt_(const_cast<type *>(ptr), val, memorder);
 }
-template<class type> type __device__ __atomic_fetch_xor_simt(type *ptr, type val, int memorder) {
-    return __atomic_fetch_xor_simt_(const_cast<type*>(ptr), val, memorder);
+template <class type>
+type __device__ __atomic_fetch_xor_simt(type *ptr, type val, int memorder) {
+  return __atomic_fetch_xor_simt_(const_cast<type *>(ptr), val, memorder);
 }
-template<class type> type __device__ __atomic_fetch_or_simt(type *ptr, type val, int memorder) {
-    return __atomic_fetch_or_simt_(const_cast<type*>(ptr), val, memorder);
+template <class type>
+type __device__ __atomic_fetch_or_simt(type *ptr, type val, int memorder) {
+  return __atomic_fetch_or_simt_(const_cast<type *>(ptr), val, memorder);
 }
-template<class type> bool __device__ __atomic_test_and_set_simt(void *ptr, int memorder) {
-    return __atomic_test_and_set_simt_(const_cast<void*>(ptr), memorder);
+template <class type>
+bool __device__ __atomic_test_and_set_simt(void *ptr, int memorder) {
+  return __atomic_test_and_set_simt_(const_cast<void *>(ptr), memorder);
 }
-template<class type> void __device__ __atomic_clear_simt(void *ptr, int memorder) {
-    return __atomic_clear_simt_(const_cast<void*>(ptr), memorder);
+template <class type>
+void __device__ __atomic_clear_simt(void *ptr, int memorder) {
+  return __atomic_clear_simt_(const_cast<void *>(ptr), memorder);
 }
 inline bool __device__ __atomic_always_lock_free_simt(size_t size, void *ptr) {
-    return __atomic_always_lock_free_simt_(size, const_cast<void*>(ptr));
+  return __atomic_always_lock_free_simt_(size, const_cast<void *>(ptr));
 }
 inline bool __device__ __atomic_is_lock_free_simt(size_t size, void *ptr) {
-    return __atomic_is_lock_free_simt_(size, const_cast<void*>(ptr));
+  return __atomic_is_lock_free_simt_(size, const_cast<void *>(ptr));
 }
 
 /*
-    volatile 
+    volatile
 */
 
-template<class type> type __device__ __atomic_load_n_simt(const volatile type *ptr, int memorder) {
-    return __atomic_load_n_simt_(const_cast<const type*>(ptr), memorder);
+template <class type>
+type __device__ __atomic_load_n_simt(const volatile type *ptr, int memorder) {
+  return __atomic_load_n_simt_(const_cast<const type *>(ptr), memorder);
 }
-template<class type> void __device__ __atomic_load_simt(const volatile type *ptr, type *ret, int memorder) {
-    __atomic_load_simt_(const_cast<const type*>(ptr), ret, memorder);
+template <class type>
+void __device__ __atomic_load_simt(const volatile type *ptr, type *ret,
+                                   int memorder) {
+  __atomic_load_simt_(const_cast<const type *>(ptr), ret, memorder);
 }
-template<class type> void __device__ __atomic_store_n_simt(volatile type *ptr, type val, int memorder) {
-    __atomic_store_n_simt_(const_cast<type*>(ptr), val, memorder);
+template <class type>
+void __device__ __atomic_store_n_simt(volatile type *ptr, type val,
+                                      int memorder) {
+  __atomic_store_n_simt_(const_cast<type *>(ptr), val, memorder);
 }
-template<class type> void __device__ __atomic_store_simt(volatile type *ptr, type *val, int memorder) {
-    __atomic_store_simt_(const_cast<type*>(ptr), val, memorder);
+template <class type>
+void __device__ __atomic_store_simt(volatile type *ptr, type *val,
+                                    int memorder) {
+  __atomic_store_simt_(const_cast<type *>(ptr), val, memorder);
 }
-template<class type> type __device__ __atomic_exchange_n_simt(volatile type *ptr, type val, int memorder) {
-    return __atomic_exchange_n_simt_(const_cast<type*>(ptr), val, memorder);
+template <class type>
+type __device__ __atomic_exchange_n_simt(volatile type *ptr, type val,
+                                         int memorder) {
+  return __atomic_exchange_n_simt_(const_cast<type *>(ptr), val, memorder);
 }
-template<class type> void __device__ __atomic_exchange_simt(volatile type *ptr, type *val, type *ret, int memorder) {
-    __atomic_exchange_simt_(const_cast<type*>(ptr), val, ret, memorder);
+template <class type>
+void __device__ __atomic_exchange_simt(volatile type *ptr, type *val, type *ret,
+                                       int memorder) {
+  __atomic_exchange_simt_(const_cast<type *>(ptr), val, ret, memorder);
 }
-template<class type> bool __device__ __atomic_compare_exchange_n_simt(volatile type *ptr, type *expected, type desired, bool weak, int success_memorder, int failure_memorder) {
-    return __atomic_compare_exchange_n_simt_(const_cast<type*>(ptr), expected, desired, weak, success_memorder, failure_memorder);
+template <class type>
+bool __device__ __atomic_compare_exchange_n_simt(volatile type *ptr,
+                                                 type *expected, type desired,
+                                                 bool weak,
+                                                 int success_memorder,
+                                                 int failure_memorder) {
+  return __atomic_compare_exchange_n_simt_(const_cast<type *>(ptr), expected,
+                                           desired, weak, success_memorder,
+                                           failure_memorder);
 }
-template<class type> bool __device__ __atomic_compare_exchange_simt(volatile type *ptr, type *expected, type *desired, bool weak, int success_memorder, int failure_memorder) {
-    return __atomic_compare_exchange_simt_(const_cast<type*>(ptr), expected, desired, weak, success_memorder, failure_memorder);
+template <class type>
+bool __device__ __atomic_compare_exchange_simt(volatile type *ptr,
+                                               type *expected, type *desired,
+                                               bool weak, int success_memorder,
+                                               int failure_memorder) {
+  return __atomic_compare_exchange_simt_(const_cast<type *>(ptr), expected,
+                                         desired, weak, success_memorder,
+                                         failure_memorder);
 }
-template<class type, class delta> type __device__ __atomic_fetch_add_simt(volatile type *ptr, delta val, int memorder) {
-    return __atomic_fetch_add_simt_(const_cast<type*>(ptr), val, memorder);
+template <class type, class delta>
+type __device__ __atomic_fetch_add_simt(volatile type *ptr, delta val,
+                                        int memorder) {
+  return __atomic_fetch_add_simt_(const_cast<type *>(ptr), val, memorder);
 }
-template<class type, class delta> type __device__ __atomic_fetch_sub_simt(volatile type *ptr, delta val, int memorder) {
-    return __atomic_fetch_sub_simt_(const_cast<type*>(ptr), val, memorder);
+template <class type, class delta>
+type __device__ __atomic_fetch_sub_simt(volatile type *ptr, delta val,
+                                        int memorder) {
+  return __atomic_fetch_sub_simt_(const_cast<type *>(ptr), val, memorder);
 }
-template<class type> type __device__ __atomic_fetch_and_simt(volatile type *ptr, type val, int memorder) {
-    return __atomic_fetch_and_simt_(const_cast<type*>(ptr), val, memorder);
+template <class type>
+type __device__ __atomic_fetch_and_simt(volatile type *ptr, type val,
+                                        int memorder) {
+  return __atomic_fetch_and_simt_(const_cast<type *>(ptr), val, memorder);
 }
-template<class type> type __device__ __atomic_fetch_xor_simt(volatile type *ptr, type val, int memorder) {
-    return __atomic_fetch_xor_simt_(const_cast<type*>(ptr), val, memorder);
+template <class type>
+type __device__ __atomic_fetch_xor_simt(volatile type *ptr, type val,
+                                        int memorder) {
+  return __atomic_fetch_xor_simt_(const_cast<type *>(ptr), val, memorder);
 }
-template<class type> type __device__ __atomic_fetch_or_simt(volatile type *ptr, type val, int memorder) {
-    return __atomic_fetch_or_simt_(const_cast<type*>(ptr), val, memorder);
+template <class type>
+type __device__ __atomic_fetch_or_simt(volatile type *ptr, type val,
+                                       int memorder) {
+  return __atomic_fetch_or_simt_(const_cast<type *>(ptr), val, memorder);
 }
-template<class type> bool __device__ __atomic_test_and_set_simt(volatile void *ptr, int memorder) {
-    return __atomic_test_and_set_simt_(const_cast<void*>(ptr), memorder);
+template <class type>
+bool __device__ __atomic_test_and_set_simt(volatile void *ptr, int memorder) {
+  return __atomic_test_and_set_simt_(const_cast<void *>(ptr), memorder);
 }
-template<class type> void __device__ __atomic_clear_simt(volatile void *ptr, int memorder) {
-    return __atomic_clear_simt_(const_cast<void*>(ptr), memorder);
+template <class type>
+void __device__ __atomic_clear_simt(volatile void *ptr, int memorder) {
+  return __atomic_clear_simt_(const_cast<void *>(ptr), memorder);
 }
 
+}  // end namespace Impl
+}  // end namespace Kokkos
 
-
-} // end namespace Impl
-} // end namespace Kokkos
-
-#endif //_SIMT_DETAILS_CONFIG
+#endif  //_SIMT_DETAILS_CONFIG
 
 #ifndef KOKKOS_SIMT_ATOMIC_BUILTIN_REPLACEMENTS_DEFINED
 /*
@@ -653,5 +1008,5 @@ template<class type> void __device__ __atomic_clear_simt(volatile void *ptr, int
 
 #define KOKKOS_SIMT_ATOMIC_BUILTIN_REPLACEMENTS_DEFINED
 
-#endif //__CUDA_ARCH__ && KOKKOS_ENABLE_CUDA_ASM_ATOMICS
-#endif // KOKKOS_SIMT_ATOMIC_BUILTIN_REPLACEMENTS_DEFINED
+#endif  //__CUDA_ARCH__ && KOKKOS_ENABLE_CUDA_ASM_ATOMICS
+#endif  // KOKKOS_SIMT_ATOMIC_BUILTIN_REPLACEMENTS_DEFINED
diff --git a/lib/kokkos/core/src/Cuda/Kokkos_Cuda_Atomic_Intrinsics_Restore_Builtins.hpp b/lib/kokkos/core/src/Cuda/Kokkos_Cuda_Atomic_Intrinsics_Restore_Builtins.hpp
index bedb147227..d7cd1bab13 100644
--- a/lib/kokkos/core/src/Cuda/Kokkos_Cuda_Atomic_Intrinsics_Restore_Builtins.hpp
+++ b/lib/kokkos/core/src/Cuda/Kokkos_Cuda_Atomic_Intrinsics_Restore_Builtins.hpp
@@ -2,10 +2,10 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
+//                        Kokkos v. 3.0
 //              Copyright (2019) Sandia Corporation
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +23,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -65,4 +65,4 @@
 
 #undef KOKKOS_SIMT_ATOMIC_BUILTIN_REPLACEMENTS_DEFINED
 
-#endif // KOKKOS_SIMT_ATOMIC_BUILTIN_REPLACEMENTS_DEFINED
+#endif  // KOKKOS_SIMT_ATOMIC_BUILTIN_REPLACEMENTS_DEFINED
diff --git a/lib/kokkos/core/src/Cuda/Kokkos_Cuda_BlockSize_Deduction.hpp b/lib/kokkos/core/src/Cuda/Kokkos_Cuda_BlockSize_Deduction.hpp
index 932bde2b37..34b681be15 100644
--- a/lib/kokkos/core/src/Cuda/Kokkos_Cuda_BlockSize_Deduction.hpp
+++ b/lib/kokkos/core/src/Cuda/Kokkos_Cuda_BlockSize_Deduction.hpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -47,377 +48,415 @@
 #include <Kokkos_Macros.hpp>
 #ifdef KOKKOS_ENABLE_CUDA
 
-#include<iostream>
+#include <iostream>
 #include <Cuda/Kokkos_Cuda_Error.hpp>
 
-namespace Kokkos { namespace Impl {
+namespace Kokkos {
+namespace Impl {
 
-template<class DriverType, class LaunchBounds, bool Large>
+template <class DriverType, class LaunchBounds, bool Large>
 struct CudaGetMaxBlockSize;
 
-template<class DriverType, class LaunchBounds>
-int cuda_get_max_block_size(const typename DriverType::functor_type & f, const size_t vector_length,
-                            const size_t shmem_extra_block, const size_t shmem_extra_thread) {
-  return CudaGetMaxBlockSize<DriverType,LaunchBounds
-          , true
-      >::get_block_size(f,vector_length, shmem_extra_block,shmem_extra_thread);
+template <class DriverType, class LaunchBounds>
+int cuda_get_max_block_size(const typename DriverType::functor_type& f,
+                            const size_t vector_length,
+                            const size_t shmem_extra_block,
+                            const size_t shmem_extra_thread) {
+  return CudaGetMaxBlockSize<DriverType, LaunchBounds, true>::get_block_size(
+      f, vector_length, shmem_extra_block, shmem_extra_thread);
 }
 
-template<class FunctorType, class LaunchBounds>
-int cuda_get_max_block_size(const CudaInternal* cuda_instance, const cudaFuncAttributes& attr, const FunctorType& f, const size_t vector_length,
-    const size_t shmem_block, const size_t shmem_thread) {
+template <class FunctorType, class LaunchBounds>
+int cuda_get_max_block_size(const CudaInternal* cuda_instance,
+                            const cudaFuncAttributes& attr,
+                            const FunctorType& f, const size_t vector_length,
+                            const size_t shmem_block,
+                            const size_t shmem_thread) {
+  const int min_blocks_per_sm =
+      LaunchBounds::minBperSM == 0 ? 1 : LaunchBounds::minBperSM;
+  const int max_threads_per_block = LaunchBounds::maxTperB == 0
+                                        ? cuda_instance->m_maxThreadsPerBlock
+                                        : LaunchBounds::maxTperB;
 
-  const int min_blocks_per_sm = LaunchBounds::minBperSM == 0 ?
-                                     1 : LaunchBounds::minBperSM ;
-  const int max_threads_per_block = LaunchBounds::maxTperB == 0 ?
-                                     cuda_instance->m_maxThreadsPerBlock : LaunchBounds::maxTperB ;
-
-  const int regs_per_thread = attr.numRegs;
-  const int regs_per_sm = cuda_instance->m_regsPerSM;
-  const int shmem_per_sm = cuda_instance->m_shmemPerSM;
+  const int regs_per_thread     = attr.numRegs;
+  const int regs_per_sm         = cuda_instance->m_regsPerSM;
+  const int shmem_per_sm        = cuda_instance->m_shmemPerSM;
   const int max_shmem_per_block = cuda_instance->m_maxShmemPerBlock;
-  const int max_blocks_per_sm = cuda_instance->m_maxBlocksPerSM;
-  const int max_threads_per_sm = cuda_instance->m_maxThreadsPerSM;
+  const int max_blocks_per_sm   = cuda_instance->m_maxBlocksPerSM;
+  const int max_threads_per_sm  = cuda_instance->m_maxThreadsPerSM;
 
-  int block_size = std::min(attr.maxThreadsPerBlock,max_threads_per_block);
+  int block_size = std::min(attr.maxThreadsPerBlock, max_threads_per_block);
 
-  int functor_shmem = FunctorTeamShmemSize< FunctorType  >::value( f , block_size/vector_length );
-  int total_shmem = shmem_block + shmem_thread*(block_size/vector_length) + functor_shmem + attr.sharedSizeBytes;
-  int max_blocks_regs = regs_per_sm/(regs_per_thread*block_size);
-  int max_blocks_shmem = (total_shmem<max_shmem_per_block)?(total_shmem>0?shmem_per_sm/total_shmem:max_blocks_regs):0;
-  int blocks_per_sm = std::min(max_blocks_regs,max_blocks_shmem);
+  int functor_shmem =
+      FunctorTeamShmemSize<FunctorType>::value(f, block_size / vector_length);
+  int total_shmem = shmem_block + shmem_thread * (block_size / vector_length) +
+                    functor_shmem + attr.sharedSizeBytes;
+  int max_blocks_regs = regs_per_sm / (regs_per_thread * block_size);
+  int max_blocks_shmem =
+      (total_shmem < max_shmem_per_block)
+          ? (total_shmem > 0 ? shmem_per_sm / total_shmem : max_blocks_regs)
+          : 0;
+  int blocks_per_sm  = std::min(max_blocks_regs, max_blocks_shmem);
   int threads_per_sm = blocks_per_sm * block_size;
-  if(threads_per_sm > max_threads_per_sm) {
-    blocks_per_sm = max_threads_per_sm/block_size;
+  if (threads_per_sm > max_threads_per_sm) {
+    blocks_per_sm  = max_threads_per_sm / block_size;
     threads_per_sm = blocks_per_sm * block_size;
   }
-  int opt_block_size = (blocks_per_sm>=min_blocks_per_sm) ? block_size : 0;
+  int opt_block_size = (blocks_per_sm >= min_blocks_per_sm) ? block_size : 0;
   int opt_threads_per_sm = threads_per_sm;
-  //printf("BlockSizeMax: %i Shmem: %i %i %i %i Regs: %i %i Blocks: %i %i Achieved: %i %i Opt: %i %i\n",block_size,
+  // printf("BlockSizeMax: %i Shmem: %i %i %i %i Regs: %i %i Blocks: %i %i
+  // Achieved: %i %i Opt: %i %i\n",block_size,
   //   shmem_per_sm,max_shmem_per_block,functor_shmem,total_shmem,
   //   regs_per_sm,regs_per_thread,max_blocks_shmem,max_blocks_regs,blocks_per_sm,threads_per_sm,opt_block_size,opt_threads_per_sm);
-  block_size-=32;
-  while ((blocks_per_sm==0) && (block_size>=32)) {
-    functor_shmem = FunctorTeamShmemSize< FunctorType  >::value( f , block_size/vector_length );
-    total_shmem = shmem_block + shmem_thread*(block_size/vector_length) + functor_shmem + attr.sharedSizeBytes;
-    max_blocks_regs = regs_per_sm/(regs_per_thread*block_size);
-    max_blocks_shmem = (total_shmem<max_shmem_per_block)?(total_shmem>0?shmem_per_sm/total_shmem:max_blocks_regs):0;
-    blocks_per_sm = std::min(max_blocks_regs,max_blocks_shmem);
+  block_size -= 32;
+  while ((blocks_per_sm == 0) && (block_size >= 32)) {
+    functor_shmem =
+        FunctorTeamShmemSize<FunctorType>::value(f, block_size / vector_length);
+    total_shmem = shmem_block + shmem_thread * (block_size / vector_length) +
+                  functor_shmem + attr.sharedSizeBytes;
+    max_blocks_regs = regs_per_sm / (regs_per_thread * block_size);
+    max_blocks_shmem =
+        (total_shmem < max_shmem_per_block)
+            ? (total_shmem > 0 ? shmem_per_sm / total_shmem : max_blocks_regs)
+            : 0;
+    blocks_per_sm  = std::min(max_blocks_regs, max_blocks_shmem);
     threads_per_sm = blocks_per_sm * block_size;
-    if(threads_per_sm > max_threads_per_sm) {
-      blocks_per_sm = max_threads_per_sm/block_size;
+    if (threads_per_sm > max_threads_per_sm) {
+      blocks_per_sm  = max_threads_per_sm / block_size;
       threads_per_sm = blocks_per_sm * block_size;
     }
-    if((blocks_per_sm >= min_blocks_per_sm) && (blocks_per_sm <= max_blocks_per_sm)) {
-      if(threads_per_sm>=opt_threads_per_sm) {
-        opt_block_size = block_size;
+    if ((blocks_per_sm >= min_blocks_per_sm) &&
+        (blocks_per_sm <= max_blocks_per_sm)) {
+      if (threads_per_sm >= opt_threads_per_sm) {
+        opt_block_size     = block_size;
         opt_threads_per_sm = threads_per_sm;
       }
     }
-  //printf("BlockSizeMax: %i Shmem: %i %i %i %i Regs: %i %i Blocks: %i %i Achieved: %i %i Opt: %i %i\n",block_size,
-  //   shmem_per_sm,max_shmem_per_block,functor_shmem,total_shmem,
-  //   regs_per_sm,regs_per_thread,max_blocks_shmem,max_blocks_regs,blocks_per_sm,threads_per_sm,opt_block_size,opt_threads_per_sm);
-    block_size-=32;
+    // printf("BlockSizeMax: %i Shmem: %i %i %i %i Regs: %i %i Blocks: %i %i
+    // Achieved: %i %i Opt: %i %i\n",block_size,
+    //   shmem_per_sm,max_shmem_per_block,functor_shmem,total_shmem,
+    //   regs_per_sm,regs_per_thread,max_blocks_shmem,max_blocks_regs,blocks_per_sm,threads_per_sm,opt_block_size,opt_threads_per_sm);
+    block_size -= 32;
   }
   return opt_block_size;
 }
 
-
-template<class DriverType>
-struct CudaGetMaxBlockSize<DriverType,Kokkos::LaunchBounds<>,true> {
-  static int get_block_size(const typename DriverType::functor_type & f, const size_t vector_length,
-                            const size_t shmem_extra_block, const size_t shmem_extra_thread) {
+template <class DriverType>
+struct CudaGetMaxBlockSize<DriverType, Kokkos::LaunchBounds<>, true> {
+  static int get_block_size(const typename DriverType::functor_type& f,
+                            const size_t vector_length,
+                            const size_t shmem_extra_block,
+                            const size_t shmem_extra_thread) {
     int numBlocks;
-    int blockSize=1024;
-    int sharedmem = shmem_extra_block + shmem_extra_thread*(blockSize/vector_length) +
-                    FunctorTeamShmemSize< typename DriverType::functor_type  >::value( f , blockSize/vector_length );
+    int blockSize = 1024;
+    int sharedmem =
+        shmem_extra_block + shmem_extra_thread * (blockSize / vector_length) +
+        FunctorTeamShmemSize<typename DriverType::functor_type>::value(
+            f, blockSize / vector_length);
     cudaOccupancyMaxActiveBlocksPerMultiprocessor(
-        &numBlocks,
-        cuda_parallel_launch_constant_memory<DriverType>,
-        blockSize,
+        &numBlocks, cuda_parallel_launch_constant_memory<DriverType>, blockSize,
         sharedmem);
 
-    if(numBlocks>0) return blockSize;
-    while (blockSize>32 && numBlocks==0) {
-      blockSize/=2;
-      sharedmem = shmem_extra_block + shmem_extra_thread*(blockSize/vector_length) +
-                  FunctorTeamShmemSize< typename DriverType::functor_type  >::value( f , blockSize/vector_length );
+    if (numBlocks > 0) return blockSize;
+    while (blockSize > 32 && numBlocks == 0) {
+      blockSize /= 2;
+      sharedmem =
+          shmem_extra_block + shmem_extra_thread * (blockSize / vector_length) +
+          FunctorTeamShmemSize<typename DriverType::functor_type>::value(
+              f, blockSize / vector_length);
 
       cudaOccupancyMaxActiveBlocksPerMultiprocessor(
-          &numBlocks,
-          cuda_parallel_launch_constant_memory<DriverType>,
-          blockSize,
-          sharedmem);
+          &numBlocks, cuda_parallel_launch_constant_memory<DriverType>,
+          blockSize, sharedmem);
     }
-    int blockSizeUpperBound = blockSize*2;
-    while (blockSize<blockSizeUpperBound && numBlocks>0) {
-      blockSize+=32;
-      sharedmem = shmem_extra_block + shmem_extra_thread*(blockSize/vector_length) +
-                  FunctorTeamShmemSize< typename DriverType::functor_type  >::value( f , blockSize/vector_length );
+    int blockSizeUpperBound = blockSize * 2;
+    while (blockSize < blockSizeUpperBound && numBlocks > 0) {
+      blockSize += 32;
+      sharedmem =
+          shmem_extra_block + shmem_extra_thread * (blockSize / vector_length) +
+          FunctorTeamShmemSize<typename DriverType::functor_type>::value(
+              f, blockSize / vector_length);
 
       cudaOccupancyMaxActiveBlocksPerMultiprocessor(
-            &numBlocks,
-            cuda_parallel_launch_constant_memory<DriverType>,
-            blockSize,
-            sharedmem);
+          &numBlocks, cuda_parallel_launch_constant_memory<DriverType>,
+          blockSize, sharedmem);
     }
     return blockSize - 32;
   }
 };
 
-template<class DriverType>
-struct CudaGetMaxBlockSize<DriverType,Kokkos::LaunchBounds<>,false> {
-  static int get_block_size(const typename DriverType::functor_type & f, const size_t vector_length,
-                            const size_t shmem_extra_block, const size_t shmem_extra_thread) {
+template <class DriverType>
+struct CudaGetMaxBlockSize<DriverType, Kokkos::LaunchBounds<>, false> {
+  static int get_block_size(const typename DriverType::functor_type& f,
+                            const size_t vector_length,
+                            const size_t shmem_extra_block,
+                            const size_t shmem_extra_thread) {
     int numBlocks;
 
-    unsigned int blockSize=1024;
-    unsigned int sharedmem = shmem_extra_block + shmem_extra_thread*(blockSize/vector_length) +
-                    FunctorTeamShmemSize< typename DriverType::functor_type  >::value( f , blockSize/vector_length );
+    unsigned int blockSize = 1024;
+    unsigned int sharedmem =
+        shmem_extra_block + shmem_extra_thread * (blockSize / vector_length) +
+        FunctorTeamShmemSize<typename DriverType::functor_type>::value(
+            f, blockSize / vector_length);
     cudaOccupancyMaxActiveBlocksPerMultiprocessor(
-        &numBlocks,
-        cuda_parallel_launch_local_memory<DriverType>,
-        blockSize,
+        &numBlocks, cuda_parallel_launch_local_memory<DriverType>, blockSize,
         sharedmem);
 
-    if(numBlocks>0) return blockSize;
-    while (blockSize>32 && numBlocks==0) {
-      blockSize/=2;
-      sharedmem = shmem_extra_block + shmem_extra_thread*(blockSize/vector_length) +
-                  FunctorTeamShmemSize< typename DriverType::functor_type  >::value( f , blockSize/vector_length );
+    if (numBlocks > 0) return blockSize;
+    while (blockSize > 32 && numBlocks == 0) {
+      blockSize /= 2;
+      sharedmem =
+          shmem_extra_block + shmem_extra_thread * (blockSize / vector_length) +
+          FunctorTeamShmemSize<typename DriverType::functor_type>::value(
+              f, blockSize / vector_length);
 
       cudaOccupancyMaxActiveBlocksPerMultiprocessor(
-          &numBlocks,
-          cuda_parallel_launch_local_memory<DriverType>,
-          blockSize,
+          &numBlocks, cuda_parallel_launch_local_memory<DriverType>, blockSize,
           sharedmem);
     }
-    unsigned int blockSizeUpperBound = blockSize*2;
-    while (blockSize<blockSizeUpperBound && numBlocks>0) {
-      blockSize+=32;
-      sharedmem = shmem_extra_block + shmem_extra_thread*(blockSize/vector_length) +
-                  FunctorTeamShmemSize< typename DriverType::functor_type  >::value( f , blockSize/vector_length );
+    unsigned int blockSizeUpperBound = blockSize * 2;
+    while (blockSize < blockSizeUpperBound && numBlocks > 0) {
+      blockSize += 32;
+      sharedmem =
+          shmem_extra_block + shmem_extra_thread * (blockSize / vector_length) +
+          FunctorTeamShmemSize<typename DriverType::functor_type>::value(
+              f, blockSize / vector_length);
 
       cudaOccupancyMaxActiveBlocksPerMultiprocessor(
-            &numBlocks,
-            cuda_parallel_launch_local_memory<DriverType>,
-            blockSize,
-            sharedmem);
+          &numBlocks, cuda_parallel_launch_local_memory<DriverType>, blockSize,
+          sharedmem);
     }
     return blockSize - 32;
   }
 };
 
-template<class DriverType, unsigned int MaxThreadsPerBlock, unsigned int MinBlocksPerSM>
-struct CudaGetMaxBlockSize<DriverType,Kokkos::LaunchBounds<MaxThreadsPerBlock,MinBlocksPerSM>,true> {
-  static int get_block_size(const typename DriverType::functor_type & f, const size_t vector_length,
-                            const size_t shmem_extra_block, const size_t shmem_extra_thread) {
+template <class DriverType, unsigned int MaxThreadsPerBlock,
+          unsigned int MinBlocksPerSM>
+struct CudaGetMaxBlockSize<
+    DriverType, Kokkos::LaunchBounds<MaxThreadsPerBlock, MinBlocksPerSM>,
+    true> {
+  static int get_block_size(const typename DriverType::functor_type& f,
+                            const size_t vector_length,
+                            const size_t shmem_extra_block,
+                            const size_t shmem_extra_thread) {
     int numBlocks = 0, oldNumBlocks = 0;
-    unsigned int blockSize=MaxThreadsPerBlock;
-    unsigned int sharedmem = shmem_extra_block + shmem_extra_thread*(blockSize/vector_length) +
-                    FunctorTeamShmemSize< typename DriverType::functor_type  >::value( f , blockSize/vector_length );
+    unsigned int blockSize = MaxThreadsPerBlock;
+    unsigned int sharedmem =
+        shmem_extra_block + shmem_extra_thread * (blockSize / vector_length) +
+        FunctorTeamShmemSize<typename DriverType::functor_type>::value(
+            f, blockSize / vector_length);
     cudaOccupancyMaxActiveBlocksPerMultiprocessor(
         &numBlocks,
-        cuda_parallel_launch_constant_memory<DriverType,MaxThreadsPerBlock,MinBlocksPerSM>,
-        blockSize,
-        sharedmem);
+        cuda_parallel_launch_constant_memory<DriverType, MaxThreadsPerBlock,
+                                             MinBlocksPerSM>,
+        blockSize, sharedmem);
 
-    if(static_cast<unsigned int>(numBlocks)>=MinBlocksPerSM) return blockSize;
+    if (static_cast<unsigned int>(numBlocks) >= MinBlocksPerSM)
+      return blockSize;
 
-    while (blockSize>32 && static_cast<unsigned int>(numBlocks)<MinBlocksPerSM) {
-      blockSize/=2;
-      sharedmem = shmem_extra_block + shmem_extra_thread*(blockSize/vector_length) +
-                  FunctorTeamShmemSize< typename DriverType::functor_type  >::value( f , blockSize/vector_length );
+    while (blockSize > 32 &&
+           static_cast<unsigned int>(numBlocks) < MinBlocksPerSM) {
+      blockSize /= 2;
+      sharedmem =
+          shmem_extra_block + shmem_extra_thread * (blockSize / vector_length) +
+          FunctorTeamShmemSize<typename DriverType::functor_type>::value(
+              f, blockSize / vector_length);
 
       cudaOccupancyMaxActiveBlocksPerMultiprocessor(
-          &numBlocks,
-          cuda_parallel_launch_constant_memory<DriverType>,
-          blockSize,
-          sharedmem);
+          &numBlocks, cuda_parallel_launch_constant_memory<DriverType>,
+          blockSize, sharedmem);
     }
-    unsigned int blockSizeUpperBound = (blockSize*2<MaxThreadsPerBlock?blockSize*2:MaxThreadsPerBlock);
-    while (blockSize<blockSizeUpperBound && static_cast<unsigned int>(numBlocks)>MinBlocksPerSM) {
-      blockSize+=32;
-      sharedmem = shmem_extra_block + shmem_extra_thread*(blockSize/vector_length) +
-                  FunctorTeamShmemSize< typename DriverType::functor_type  >::value( f , blockSize/vector_length );
+    unsigned int blockSizeUpperBound =
+        (blockSize * 2 < MaxThreadsPerBlock ? blockSize * 2
+                                            : MaxThreadsPerBlock);
+    while (blockSize<blockSizeUpperBound&& static_cast<unsigned int>(numBlocks)>
+               MinBlocksPerSM) {
+      blockSize += 32;
+      sharedmem =
+          shmem_extra_block + shmem_extra_thread * (blockSize / vector_length) +
+          FunctorTeamShmemSize<typename DriverType::functor_type>::value(
+              f, blockSize / vector_length);
       oldNumBlocks = numBlocks;
       cudaOccupancyMaxActiveBlocksPerMultiprocessor(
-            &numBlocks,
-            cuda_parallel_launch_constant_memory<DriverType>,
-            blockSize,
-            sharedmem);
+          &numBlocks, cuda_parallel_launch_constant_memory<DriverType>,
+          blockSize, sharedmem);
     }
-    if(static_cast<unsigned int>(oldNumBlocks)>=MinBlocksPerSM) return blockSize - 32;
+    if (static_cast<unsigned int>(oldNumBlocks) >= MinBlocksPerSM)
+      return blockSize - 32;
     return -1;
   }
 };
 
-template<class DriverType, unsigned int MaxThreadsPerBlock, unsigned int MinBlocksPerSM>
-struct CudaGetMaxBlockSize<DriverType,Kokkos::LaunchBounds<MaxThreadsPerBlock,MinBlocksPerSM>,false> {
-  static int get_block_size(const typename DriverType::functor_type & f, const size_t vector_length,
-                            const size_t shmem_extra_block, const size_t shmem_extra_thread) {
+template <class DriverType, unsigned int MaxThreadsPerBlock,
+          unsigned int MinBlocksPerSM>
+struct CudaGetMaxBlockSize<
+    DriverType, Kokkos::LaunchBounds<MaxThreadsPerBlock, MinBlocksPerSM>,
+    false> {
+  static int get_block_size(const typename DriverType::functor_type& f,
+                            const size_t vector_length,
+                            const size_t shmem_extra_block,
+                            const size_t shmem_extra_thread) {
     int numBlocks = 0, oldNumBlocks = 0;
-    unsigned int blockSize=MaxThreadsPerBlock;
-    int sharedmem = shmem_extra_block + shmem_extra_thread*(blockSize/vector_length) +
-                    FunctorTeamShmemSize< typename DriverType::functor_type  >::value( f , blockSize/vector_length );
+    unsigned int blockSize = MaxThreadsPerBlock;
+    int sharedmem =
+        shmem_extra_block + shmem_extra_thread * (blockSize / vector_length) +
+        FunctorTeamShmemSize<typename DriverType::functor_type>::value(
+            f, blockSize / vector_length);
     cudaOccupancyMaxActiveBlocksPerMultiprocessor(
         &numBlocks,
-        cuda_parallel_launch_local_memory<DriverType,MaxThreadsPerBlock,MinBlocksPerSM>,
-        blockSize,
-        sharedmem);
-    if(static_cast<unsigned int>(numBlocks)>=MinBlocksPerSM) return blockSize;
+        cuda_parallel_launch_local_memory<DriverType, MaxThreadsPerBlock,
+                                          MinBlocksPerSM>,
+        blockSize, sharedmem);
+    if (static_cast<unsigned int>(numBlocks) >= MinBlocksPerSM)
+      return blockSize;
 
-    while (blockSize>32 && static_cast<unsigned int>(numBlocks)<MinBlocksPerSM) {
-      blockSize/=2;
-      sharedmem = shmem_extra_block + shmem_extra_thread*(blockSize/vector_length) +
-                  FunctorTeamShmemSize< typename DriverType::functor_type  >::value( f , blockSize/vector_length );
+    while (blockSize > 32 &&
+           static_cast<unsigned int>(numBlocks) < MinBlocksPerSM) {
+      blockSize /= 2;
+      sharedmem =
+          shmem_extra_block + shmem_extra_thread * (blockSize / vector_length) +
+          FunctorTeamShmemSize<typename DriverType::functor_type>::value(
+              f, blockSize / vector_length);
 
       cudaOccupancyMaxActiveBlocksPerMultiprocessor(
-          &numBlocks,
-          cuda_parallel_launch_local_memory<DriverType>,
-          blockSize,
+          &numBlocks, cuda_parallel_launch_local_memory<DriverType>, blockSize,
           sharedmem);
     }
-    unsigned int blockSizeUpperBound = (blockSize*2<MaxThreadsPerBlock?blockSize*2:MaxThreadsPerBlock);
-    while (blockSize<blockSizeUpperBound && static_cast<unsigned int>(numBlocks)>=MinBlocksPerSM) {
-      blockSize+=32;
-      sharedmem = shmem_extra_block + shmem_extra_thread*(blockSize/vector_length) +
-                  FunctorTeamShmemSize< typename DriverType::functor_type  >::value( f , blockSize/vector_length );
+    unsigned int blockSizeUpperBound =
+        (blockSize * 2 < MaxThreadsPerBlock ? blockSize * 2
+                                            : MaxThreadsPerBlock);
+    while (blockSize < blockSizeUpperBound &&
+           static_cast<unsigned int>(numBlocks) >= MinBlocksPerSM) {
+      blockSize += 32;
+      sharedmem =
+          shmem_extra_block + shmem_extra_thread * (blockSize / vector_length) +
+          FunctorTeamShmemSize<typename DriverType::functor_type>::value(
+              f, blockSize / vector_length);
       oldNumBlocks = numBlocks;
       cudaOccupancyMaxActiveBlocksPerMultiprocessor(
-            &numBlocks,
-            cuda_parallel_launch_local_memory<DriverType>,
-            blockSize,
-            sharedmem);
+          &numBlocks, cuda_parallel_launch_local_memory<DriverType>, blockSize,
+          sharedmem);
     }
-    if(static_cast<unsigned int>(oldNumBlocks)>=MinBlocksPerSM) return blockSize - 32;
+    if (static_cast<unsigned int>(oldNumBlocks) >= MinBlocksPerSM)
+      return blockSize - 32;
     return -1;
   }
 };
 
-
-template<class DriverType, class LaunchBounds, bool Large>
+template <class DriverType, class LaunchBounds, bool Large>
 struct CudaGetOptBlockSize;
 
-template<class DriverType, class LaunchBounds>
-int cuda_get_opt_block_size(const typename DriverType::functor_type & f, const size_t vector_length,
-                            const size_t shmem_extra_block, const size_t shmem_extra_thread) {
-  return CudaGetOptBlockSize<DriverType,LaunchBounds,
-      //LaunchBounds::launch_mechanism == Kokkos::Experimental::LaunchDefault ?
-      //            (( CudaTraits::ConstantMemoryUseThreshold < sizeof(DriverType) )?
+template <class DriverType, class LaunchBounds>
+int cuda_get_opt_block_size(const typename DriverType::functor_type& f,
+                            const size_t vector_length,
+                            const size_t shmem_extra_block,
+                            const size_t shmem_extra_thread) {
+  return CudaGetOptBlockSize<
+      DriverType, LaunchBounds,
+      // LaunchBounds::launch_mechanism == Kokkos::Experimental::LaunchDefault ?
+      //            (( CudaTraits::ConstantMemoryUseThreshold <
+      //            sizeof(DriverType) )?
       //                   Kokkos::Experimental::CudaLaunchConstantMemory:Kokkos::Experimental::CudaLaunchLocalMemory):
       //             LaunchBounds::launch_mechanism
-      (CudaTraits::ConstantMemoryUseThreshold < sizeof(DriverType))
-      >::get_block_size(f,vector_length,shmem_extra_block,shmem_extra_thread);
+      (CudaTraits::ConstantMemoryUseThreshold <
+       sizeof(DriverType))>::get_block_size(f, vector_length, shmem_extra_block,
+                                            shmem_extra_thread);
 }
 
-template<class FunctorType, class LaunchBounds>
-int cuda_get_opt_block_size(const CudaInternal* cuda_instance, const cudaFuncAttributes& attr, const FunctorType& f, const size_t vector_length,
-    const size_t shmem_block, const size_t shmem_thread) {
+template <class FunctorType, class LaunchBounds>
+int cuda_get_opt_block_size(const CudaInternal* cuda_instance,
+                            const cudaFuncAttributes& attr,
+                            const FunctorType& f, const size_t vector_length,
+                            const size_t shmem_block,
+                            const size_t shmem_thread) {
+  const int min_blocks_per_sm =
+      LaunchBounds::minBperSM == 0 ? 1 : LaunchBounds::minBperSM;
+  const int max_threads_per_block = LaunchBounds::maxTperB == 0
+                                        ? cuda_instance->m_maxThreadsPerBlock
+                                        : LaunchBounds::maxTperB;
 
-  const int min_blocks_per_sm = LaunchBounds::minBperSM == 0 ?
-                                     1 : LaunchBounds::minBperSM ;
-  const int max_threads_per_block = LaunchBounds::maxTperB == 0 ?
-                                     cuda_instance->m_maxThreadsPerBlock : LaunchBounds::maxTperB ;
-
-  const int regs_per_thread = attr.numRegs;
-  const int regs_per_sm = cuda_instance->m_regsPerSM;
-  const int shmem_per_sm = cuda_instance->m_shmemPerSM;
+  const int regs_per_thread     = attr.numRegs;
+  const int regs_per_sm         = cuda_instance->m_regsPerSM;
+  const int shmem_per_sm        = cuda_instance->m_shmemPerSM;
   const int max_shmem_per_block = cuda_instance->m_maxShmemPerBlock;
-  const int max_blocks_per_sm = cuda_instance->m_maxBlocksPerSM;
-  const int max_threads_per_sm = cuda_instance->m_maxThreadsPerSM;
+  const int max_blocks_per_sm   = cuda_instance->m_maxBlocksPerSM;
+  const int max_threads_per_sm  = cuda_instance->m_maxThreadsPerSM;
 
-  int block_size = std::min(attr.maxThreadsPerBlock,max_threads_per_block);
+  int block_size = std::min(attr.maxThreadsPerBlock, max_threads_per_block);
 
-  int functor_shmem = FunctorTeamShmemSize< FunctorType  >::value( f , block_size/vector_length );
-  int total_shmem = shmem_block + shmem_thread*(block_size/vector_length) + functor_shmem + attr.sharedSizeBytes;
-  int max_blocks_regs = regs_per_sm/(regs_per_thread*block_size);
-  int max_blocks_shmem = (total_shmem<max_shmem_per_block)?(total_shmem>0?shmem_per_sm/total_shmem:max_blocks_regs):0;
-  int blocks_per_sm = std::min(max_blocks_regs,max_blocks_shmem);
+  int functor_shmem =
+      FunctorTeamShmemSize<FunctorType>::value(f, block_size / vector_length);
+  int total_shmem = shmem_block + shmem_thread * (block_size / vector_length) +
+                    functor_shmem + attr.sharedSizeBytes;
+  int max_blocks_regs = regs_per_sm / (regs_per_thread * block_size);
+  int max_blocks_shmem =
+      (total_shmem < max_shmem_per_block)
+          ? (total_shmem > 0 ? shmem_per_sm / total_shmem : max_blocks_regs)
+          : 0;
+  int blocks_per_sm  = std::min(max_blocks_regs, max_blocks_shmem);
   int threads_per_sm = blocks_per_sm * block_size;
-  if(threads_per_sm > max_threads_per_sm) {
-    blocks_per_sm = max_threads_per_sm/block_size;
+  if (threads_per_sm > max_threads_per_sm) {
+    blocks_per_sm  = max_threads_per_sm / block_size;
     threads_per_sm = blocks_per_sm * block_size;
   }
-  int opt_block_size = (blocks_per_sm>=min_blocks_per_sm) ? block_size : 0;
+  int opt_block_size = (blocks_per_sm >= min_blocks_per_sm) ? block_size : 0;
   int opt_threads_per_sm = threads_per_sm;
 
-  block_size-=32;
-  while ((block_size>=32)) {
-    functor_shmem = FunctorTeamShmemSize< FunctorType  >::value( f , block_size/vector_length );
-    total_shmem = shmem_block + shmem_thread*(block_size/vector_length) + functor_shmem + attr.sharedSizeBytes;
-    max_blocks_regs = regs_per_sm/(regs_per_thread*block_size);
-    max_blocks_shmem = (total_shmem<max_shmem_per_block)?(total_shmem>0?shmem_per_sm/total_shmem:max_blocks_regs):0;
-    blocks_per_sm = std::min(max_blocks_regs,max_blocks_shmem);
+  block_size -= 32;
+  while ((block_size >= 32)) {
+    functor_shmem =
+        FunctorTeamShmemSize<FunctorType>::value(f, block_size / vector_length);
+    total_shmem = shmem_block + shmem_thread * (block_size / vector_length) +
+                  functor_shmem + attr.sharedSizeBytes;
+    max_blocks_regs = regs_per_sm / (regs_per_thread * block_size);
+    max_blocks_shmem =
+        (total_shmem < max_shmem_per_block)
+            ? (total_shmem > 0 ? shmem_per_sm / total_shmem : max_blocks_regs)
+            : 0;
+    blocks_per_sm  = std::min(max_blocks_regs, max_blocks_shmem);
     threads_per_sm = blocks_per_sm * block_size;
-    if(threads_per_sm > max_threads_per_sm) {
-      blocks_per_sm = max_threads_per_sm/block_size;
+    if (threads_per_sm > max_threads_per_sm) {
+      blocks_per_sm  = max_threads_per_sm / block_size;
       threads_per_sm = blocks_per_sm * block_size;
     }
-    if((blocks_per_sm >= min_blocks_per_sm) && (blocks_per_sm <= max_blocks_per_sm)) {
-      if(threads_per_sm>=opt_threads_per_sm) {
-        opt_block_size = block_size;
+    if ((blocks_per_sm >= min_blocks_per_sm) &&
+        (blocks_per_sm <= max_blocks_per_sm)) {
+      if (threads_per_sm >= opt_threads_per_sm) {
+        opt_block_size     = block_size;
         opt_threads_per_sm = threads_per_sm;
       }
     }
-    block_size-=32;
+    block_size -= 32;
   }
   return opt_block_size;
 }
 
-template<class DriverType>
-struct CudaGetOptBlockSize<DriverType,Kokkos::LaunchBounds<0,0>,true> {
-  static int get_block_size(const typename DriverType::functor_type & f, const size_t vector_length,
-                            const size_t shmem_extra_block, const size_t shmem_extra_thread) {
-    int blockSize=16;
+template <class DriverType>
+struct CudaGetOptBlockSize<DriverType, Kokkos::LaunchBounds<0, 0>, true> {
+  static int get_block_size(const typename DriverType::functor_type& f,
+                            const size_t vector_length,
+                            const size_t shmem_extra_block,
+                            const size_t shmem_extra_thread) {
+    int blockSize = 16;
     int numBlocks;
     int sharedmem;
-    int maxOccupancy=0;
-    int bestBlockSize=0;
+    int maxOccupancy  = 0;
+    int bestBlockSize = 0;
 
-    while(blockSize<1024) {
-      blockSize*=2;
+    while (blockSize < 1024) {
+      blockSize *= 2;
 
-      //calculate the occupancy with that optBlockSize and check whether its larger than the largest one found so far
-      sharedmem = shmem_extra_block + shmem_extra_thread*(blockSize/vector_length) +
-                  FunctorTeamShmemSize< typename DriverType::functor_type  >::value( f , blockSize/vector_length );
+      // calculate the occupancy with that optBlockSize and check whether its
+      // larger than the largest one found so far
+      sharedmem =
+          shmem_extra_block + shmem_extra_thread * (blockSize / vector_length) +
+          FunctorTeamShmemSize<typename DriverType::functor_type>::value(
+              f, blockSize / vector_length);
       cudaOccupancyMaxActiveBlocksPerMultiprocessor(
-              &numBlocks,
-              cuda_parallel_launch_constant_memory<DriverType>,
-              blockSize,
-              sharedmem);
-      if(maxOccupancy < numBlocks*blockSize) {
-         maxOccupancy = numBlocks*blockSize;
-         bestBlockSize = blockSize;
-      }
-    }
-    return bestBlockSize;
-  }
-};
-
-template<class DriverType>
-struct CudaGetOptBlockSize<DriverType,Kokkos::LaunchBounds<0,0>,false> {
-  static int get_block_size(const typename DriverType::functor_type & f, const size_t vector_length,
-                            const size_t shmem_extra_block, const size_t shmem_extra_thread) {
-    int blockSize=16;
-    int numBlocks;
-    int sharedmem;
-    int maxOccupancy=0;
-    int bestBlockSize=0;
-
-    while(blockSize<1024) {
-      blockSize*=2;
-      sharedmem = shmem_extra_block + shmem_extra_thread*(blockSize/vector_length) +
-                  FunctorTeamShmemSize< typename DriverType::functor_type  >::value( f , blockSize/vector_length );
-
-      cudaOccupancyMaxActiveBlocksPerMultiprocessor(
-              &numBlocks,
-              cuda_parallel_launch_local_memory<DriverType>,
-              blockSize,
-              sharedmem);
-
-      if(maxOccupancy < numBlocks*blockSize) {
-        maxOccupancy = numBlocks*blockSize;
+          &numBlocks, cuda_parallel_launch_constant_memory<DriverType>,
+          blockSize, sharedmem);
+      if (maxOccupancy < numBlocks * blockSize) {
+        maxOccupancy  = numBlocks * blockSize;
         bestBlockSize = blockSize;
       }
     }
@@ -425,77 +464,128 @@ struct CudaGetOptBlockSize<DriverType,Kokkos::LaunchBounds<0,0>,false> {
   }
 };
 
-template<class DriverType, unsigned int MaxThreadsPerBlock, unsigned int MinBlocksPerSM>
-struct CudaGetOptBlockSize<DriverType,Kokkos::LaunchBounds< MaxThreadsPerBlock, MinBlocksPerSM>,true> {
-  static int get_block_size(const typename DriverType::functor_type & f, const size_t vector_length,
-                            const size_t shmem_extra_block, const size_t shmem_extra_thread) {
-    int blockSize=16;
+template <class DriverType>
+struct CudaGetOptBlockSize<DriverType, Kokkos::LaunchBounds<0, 0>, false> {
+  static int get_block_size(const typename DriverType::functor_type& f,
+                            const size_t vector_length,
+                            const size_t shmem_extra_block,
+                            const size_t shmem_extra_thread) {
+    int blockSize = 16;
     int numBlocks;
     int sharedmem;
-    int maxOccupancy=0;
-    int bestBlockSize=0;
-    int max_threads_per_block = std::min(MaxThreadsPerBlock,cuda_internal_maximum_warp_count()*CudaTraits::WarpSize);
+    int maxOccupancy  = 0;
+    int bestBlockSize = 0;
 
-    while(blockSize < max_threads_per_block ) {
-      blockSize*=2;
+    while (blockSize < 1024) {
+      blockSize *= 2;
+      sharedmem =
+          shmem_extra_block + shmem_extra_thread * (blockSize / vector_length) +
+          FunctorTeamShmemSize<typename DriverType::functor_type>::value(
+              f, blockSize / vector_length);
 
-      //calculate the occupancy with that optBlockSize and check whether its larger than the largest one found so far
-      sharedmem = shmem_extra_block + shmem_extra_thread*(blockSize/vector_length) +
-                  FunctorTeamShmemSize< typename DriverType::functor_type  >::value( f , blockSize/vector_length );
       cudaOccupancyMaxActiveBlocksPerMultiprocessor(
-              &numBlocks,
-              cuda_parallel_launch_constant_memory<DriverType,MaxThreadsPerBlock,MinBlocksPerSM>,
-              blockSize,
-              sharedmem);
-      if(numBlocks >= int(MinBlocksPerSM) && blockSize<=int(MaxThreadsPerBlock)) {
-        if(maxOccupancy < numBlocks*blockSize) {
-           maxOccupancy = numBlocks*blockSize;
-           bestBlockSize = blockSize;
-        }
+          &numBlocks, cuda_parallel_launch_local_memory<DriverType>, blockSize,
+          sharedmem);
+
+      if (maxOccupancy < numBlocks * blockSize) {
+        maxOccupancy  = numBlocks * blockSize;
+        bestBlockSize = blockSize;
       }
     }
-    if(maxOccupancy > 0)
-      return bestBlockSize;
-    return -1;
+    return bestBlockSize;
   }
 };
 
-template<class DriverType, unsigned int MaxThreadsPerBlock, unsigned int MinBlocksPerSM>
-struct CudaGetOptBlockSize<DriverType,Kokkos::LaunchBounds< MaxThreadsPerBlock, MinBlocksPerSM >,false> {
-  static int get_block_size(const typename DriverType::functor_type & f, const size_t vector_length,
-                            const size_t shmem_extra_block, const size_t shmem_extra_thread) {
-    int blockSize=16;
+template <class DriverType, unsigned int MaxThreadsPerBlock,
+          unsigned int MinBlocksPerSM>
+struct CudaGetOptBlockSize<
+    DriverType, Kokkos::LaunchBounds<MaxThreadsPerBlock, MinBlocksPerSM>,
+    true> {
+  static int get_block_size(const typename DriverType::functor_type& f,
+                            const size_t vector_length,
+                            const size_t shmem_extra_block,
+                            const size_t shmem_extra_thread) {
+    int blockSize = 16;
     int numBlocks;
     int sharedmem;
-    int maxOccupancy=0;
-    int bestBlockSize=0;
-    int max_threads_per_block = std::min(MaxThreadsPerBlock,cuda_internal_maximum_warp_count()*CudaTraits::WarpSize);
+    int maxOccupancy  = 0;
+    int bestBlockSize = 0;
+    int max_threads_per_block =
+        std::min(MaxThreadsPerBlock,
+                 cuda_internal_maximum_warp_count() * CudaTraits::WarpSize);
 
-    while(blockSize < max_threads_per_block ) {
-      blockSize*=2;
-      sharedmem = shmem_extra_block + shmem_extra_thread*(blockSize/vector_length) +
-                  FunctorTeamShmemSize< typename DriverType::functor_type  >::value( f , blockSize/vector_length );
+    while (blockSize < max_threads_per_block) {
+      blockSize *= 2;
 
+      // calculate the occupancy with that optBlockSize and check whether its
+      // larger than the largest one found so far
+      sharedmem =
+          shmem_extra_block + shmem_extra_thread * (blockSize / vector_length) +
+          FunctorTeamShmemSize<typename DriverType::functor_type>::value(
+              f, blockSize / vector_length);
       cudaOccupancyMaxActiveBlocksPerMultiprocessor(
-              &numBlocks,
-              cuda_parallel_launch_local_memory<DriverType,MaxThreadsPerBlock,MinBlocksPerSM>,
-              blockSize,
-              sharedmem);
-      if(numBlocks >= int(MinBlocksPerSM) && blockSize<=int(MaxThreadsPerBlock)) {
-        if(maxOccupancy < numBlocks*blockSize) {
-          maxOccupancy = numBlocks*blockSize;
+          &numBlocks,
+          cuda_parallel_launch_constant_memory<DriverType, MaxThreadsPerBlock,
+                                               MinBlocksPerSM>,
+          blockSize, sharedmem);
+      if (numBlocks >= int(MinBlocksPerSM) &&
+          blockSize <= int(MaxThreadsPerBlock)) {
+        if (maxOccupancy < numBlocks * blockSize) {
+          maxOccupancy  = numBlocks * blockSize;
           bestBlockSize = blockSize;
         }
       }
     }
-    if(maxOccupancy > 0)
-      return bestBlockSize;
+    if (maxOccupancy > 0) return bestBlockSize;
     return -1;
   }
 };
 
-}} // namespace Kokkos::Impl
+template <class DriverType, unsigned int MaxThreadsPerBlock,
+          unsigned int MinBlocksPerSM>
+struct CudaGetOptBlockSize<
+    DriverType, Kokkos::LaunchBounds<MaxThreadsPerBlock, MinBlocksPerSM>,
+    false> {
+  static int get_block_size(const typename DriverType::functor_type& f,
+                            const size_t vector_length,
+                            const size_t shmem_extra_block,
+                            const size_t shmem_extra_thread) {
+    int blockSize = 16;
+    int numBlocks;
+    int sharedmem;
+    int maxOccupancy  = 0;
+    int bestBlockSize = 0;
+    int max_threads_per_block =
+        std::min(MaxThreadsPerBlock,
+                 cuda_internal_maximum_warp_count() * CudaTraits::WarpSize);
 
-#endif // KOKKOS_ENABLE_CUDA
-#endif /* #ifndef KOKKOS_CUDA_INTERNAL_HPP */
+    while (blockSize < max_threads_per_block) {
+      blockSize *= 2;
+      sharedmem =
+          shmem_extra_block + shmem_extra_thread * (blockSize / vector_length) +
+          FunctorTeamShmemSize<typename DriverType::functor_type>::value(
+              f, blockSize / vector_length);
 
+      cudaOccupancyMaxActiveBlocksPerMultiprocessor(
+          &numBlocks,
+          cuda_parallel_launch_local_memory<DriverType, MaxThreadsPerBlock,
+                                            MinBlocksPerSM>,
+          blockSize, sharedmem);
+      if (numBlocks >= int(MinBlocksPerSM) &&
+          blockSize <= int(MaxThreadsPerBlock)) {
+        if (maxOccupancy < numBlocks * blockSize) {
+          maxOccupancy  = numBlocks * blockSize;
+          bestBlockSize = blockSize;
+        }
+      }
+    }
+    if (maxOccupancy > 0) return bestBlockSize;
+    return -1;
+  }
+};
+
+}  // namespace Impl
+}  // namespace Kokkos
+
+#endif  // KOKKOS_ENABLE_CUDA
+#endif  /* #ifndef KOKKOS_CUDA_INTERNAL_HPP */
diff --git a/lib/kokkos/core/src/Cuda/Kokkos_Cuda_Error.hpp b/lib/kokkos/core/src/Cuda/Kokkos_Cuda_Error.hpp
index 55c7c782fe..3b674bbb30 100644
--- a/lib/kokkos/core/src/Cuda/Kokkos_Cuda_Error.hpp
+++ b/lib/kokkos/core/src/Cuda/Kokkos_Cuda_Error.hpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -47,22 +48,82 @@
 #include <Kokkos_Macros.hpp>
 #ifdef KOKKOS_ENABLE_CUDA
 
-namespace Kokkos { namespace Impl {
+#include <impl/Kokkos_Error.hpp>
+
+#include <iostream>
+
+namespace Kokkos {
+namespace Impl {
 
 void cuda_device_synchronize();
 
-void cuda_internal_error_throw( cudaError e , const char * name, const char * file = NULL, const int line = 0 );
+void cuda_internal_error_throw(cudaError e, const char* name,
+                               const char* file = NULL, const int line = 0);
 
-inline void cuda_internal_safe_call( cudaError e , const char * name, const char * file = NULL, const int line = 0)
-{
-  if ( cudaSuccess != e ) { cuda_internal_error_throw( e , name, file, line ); }
+inline void cuda_internal_safe_call(cudaError e, const char* name,
+                                    const char* file = NULL,
+                                    const int line   = 0) {
+  if (cudaSuccess != e) {
+    cuda_internal_error_throw(e, name, file, line);
+  }
 }
 
-#define CUDA_SAFE_CALL( call )  \
-	Kokkos::Impl::cuda_internal_safe_call( call , #call, __FILE__, __LINE__ )
+#define CUDA_SAFE_CALL(call) \
+  Kokkos::Impl::cuda_internal_safe_call(call, #call, __FILE__, __LINE__)
 
-}} // namespace Kokkos::Impl
+}  // namespace Impl
 
-#endif //KOKKOS_ENABLE_CUDA
-#endif //KOKKOS_CUDA_ERROR_HPP
+namespace Experimental {
 
+class CudaRawMemoryAllocationFailure : public RawMemoryAllocationFailure {
+ private:
+  using base_t = RawMemoryAllocationFailure;
+
+  cudaError_t m_error_code = cudaSuccess;
+
+  static FailureMode get_failure_mode(cudaError_t error_code) {
+    switch (error_code) {
+      case cudaErrorMemoryAllocation: return FailureMode::OutOfMemoryError;
+      case cudaErrorInvalidValue: return FailureMode::InvalidAllocationSize;
+      // TODO handle cudaErrorNotSupported for cudaMallocManaged
+      default: return FailureMode::Unknown;
+    }
+  }
+
+ public:
+  // using base_t::base_t;
+  // would trigger
+  //
+  // error: cannot determine the exception specification of the default
+  // constructor due to a circular dependency
+  //
+  // using NVCC 9.1 and gcc 7.4
+  CudaRawMemoryAllocationFailure(
+      size_t arg_attempted_size, size_t arg_attempted_alignment,
+      FailureMode arg_failure_mode = FailureMode::OutOfMemoryError,
+      AllocationMechanism arg_mechanism =
+          AllocationMechanism::StdMalloc) noexcept
+      : base_t(arg_attempted_size, arg_attempted_alignment, arg_failure_mode,
+               arg_mechanism) {}
+
+  CudaRawMemoryAllocationFailure(size_t arg_attempted_size,
+                                 cudaError_t arg_error_code,
+                                 AllocationMechanism arg_mechanism) noexcept
+      : base_t(arg_attempted_size, /* CudaSpace doesn't handle alignment? */ 1,
+               get_failure_mode(arg_error_code), arg_mechanism),
+        m_error_code(arg_error_code) {}
+
+  void append_additional_error_information(std::ostream& o) const override {
+    if (m_error_code != cudaSuccess) {
+      o << "  The Cuda allocation returned the error code \"\""
+        << cudaGetErrorName(m_error_code) << "\".";
+    }
+  }
+};
+
+}  // end namespace Experimental
+
+}  // namespace Kokkos
+
+#endif  // KOKKOS_ENABLE_CUDA
+#endif  // KOKKOS_CUDA_ERROR_HPP
diff --git a/lib/kokkos/core/src/Cuda/Kokkos_Cuda_Instance.cpp b/lib/kokkos/core/src/Cuda/Kokkos_Cuda_Instance.cpp
index 0ca9e3c160..b3c7edf67c 100644
--- a/lib/kokkos/core/src/Cuda/Kokkos_Cuda_Instance.cpp
+++ b/lib/kokkos/core/src/Cuda/Kokkos_Cuda_Instance.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -66,10 +67,34 @@
 #include <sstream>
 #include <string>
 
+#ifdef KOKKOS_IMPL_DEBUG_CUDA_SERIAL_EXECUTION
+namespace Kokkos {
+namespace Impl {
+
+bool CudaInternal::kokkos_impl_cuda_use_serial_execution_v = false;
+
+void CudaInternal::cuda_set_serial_execution(bool val) {
+  CudaInternal::kokkos_impl_cuda_use_serial_execution_v = val;
+}
+bool CudaInternal::cuda_use_serial_execution() {
+  return CudaInternal::kokkos_impl_cuda_use_serial_execution_v;
+}
+
+}  // namespace Impl
+}  // namespace Kokkos
+
+void kokkos_impl_cuda_set_serial_execution(bool val) {
+  Kokkos::Impl::CudaInternal::cuda_set_serial_execution(val);
+}
+bool kokkos_impl_cuda_use_serial_execution() {
+  return Kokkos::Impl::CudaInternal::cuda_use_serial_execution();
+}
+#endif
+
 #ifdef KOKKOS_ENABLE_CUDA_RELOCATABLE_DEVICE_CODE
 
-__device__ __constant__
-unsigned long kokkos_impl_cuda_constant_memory_buffer[ Kokkos::Impl::CudaTraits::ConstantMemoryUsage / sizeof(unsigned long) ] ;
+__device__ __constant__ unsigned long kokkos_impl_cuda_constant_memory_buffer
+    [Kokkos::Impl::CudaTraits::ConstantMemoryUsage / sizeof(unsigned long)];
 
 #endif
 
@@ -80,32 +105,28 @@ namespace Impl {
 
 namespace {
 
-__global__
-void query_cuda_kernel_arch( int * d_arch )
-{
-#if defined( __CUDA_ARCH__ )
-  *d_arch = __CUDA_ARCH__ ;
+__global__ void query_cuda_kernel_arch(int *d_arch) {
+#if defined(__CUDA_ARCH__)
+  *d_arch = __CUDA_ARCH__;
 #else
-  *d_arch = 0 ;
+  *d_arch = 0;
 #endif
 }
 
 /** Query what compute capability is actually launched to the device: */
-int cuda_kernel_arch()
-{
-  int * d_arch = 0 ;
-  cudaMalloc( (void **) & d_arch , sizeof(int) );
-  query_cuda_kernel_arch<<<1,1>>>( d_arch );
-  int arch = 0 ;
-  cudaMemcpy( & arch , d_arch , sizeof(int) , cudaMemcpyDefault );
-  cudaFree( d_arch );
-  return arch ;
+int cuda_kernel_arch() {
+  int *d_arch = 0;
+  cudaMalloc((void **)&d_arch, sizeof(int));
+  query_cuda_kernel_arch<<<1, 1>>>(d_arch);
+  int arch = 0;
+  cudaMemcpy(&arch, d_arch, sizeof(int), cudaMemcpyDefault);
+  cudaFree(d_arch);
+  return arch;
 }
 
 #ifdef KOKKOS_ENABLE_CUDA_UVM
-bool cuda_launch_blocking()
-{
-  const char * env = getenv("CUDA_LAUNCH_BLOCKING");
+bool cuda_launch_blocking() {
+  const char *env = getenv("CUDA_LAUNCH_BLOCKING");
 
   if (env == 0) return false;
 
@@ -113,21 +134,19 @@ bool cuda_launch_blocking()
 }
 #endif
 
-}
+}  // namespace
 
-void cuda_device_synchronize()
-{
-  CUDA_SAFE_CALL( cudaDeviceSynchronize() );
-}
+void cuda_device_synchronize() { CUDA_SAFE_CALL(cudaDeviceSynchronize()); }
 
-void cuda_internal_error_throw( cudaError e , const char * name, const char * file, const int line )
-{
-  std::ostringstream out ;
-  out << name << " error( " << cudaGetErrorName(e) << "): " << cudaGetErrorString(e);
+void cuda_internal_error_throw(cudaError e, const char *name, const char *file,
+                               const int line) {
+  std::ostringstream out;
+  out << name << " error( " << cudaGetErrorName(e)
+      << "): " << cudaGetErrorString(e);
   if (file) {
     out << " " << file << ":" << line;
   }
-  throw_runtime_exception( out.str() );
+  throw_runtime_exception(out.str());
 }
 
 //----------------------------------------------------------------------------
@@ -180,231 +199,220 @@ void cuda_internal_error_throw( cudaError e , const char * name, const char * fi
 //   int maxThreadsPerMultiProcessor;
 // };
 
-
 namespace {
 
-
-
 class CudaInternalDevices {
-public:
+ public:
   enum { MAXIMUM_DEVICE_COUNT = 64 };
-  struct cudaDeviceProp  m_cudaProp[ MAXIMUM_DEVICE_COUNT ] ;
-  int                    m_cudaDevCount ;
+  struct cudaDeviceProp m_cudaProp[MAXIMUM_DEVICE_COUNT];
+  int m_cudaDevCount;
 
   CudaInternalDevices();
 
-  static const CudaInternalDevices & singleton();
+  static const CudaInternalDevices &singleton();
 };
 
-CudaInternalDevices::CudaInternalDevices()
-{
+CudaInternalDevices::CudaInternalDevices() {
   // See 'cudaSetDeviceFlags' for host-device thread interaction
   // Section 4.4.2.6 of the CUDA Toolkit Reference Manual
 
-  CUDA_SAFE_CALL (cudaGetDeviceCount( & m_cudaDevCount ) );
+  CUDA_SAFE_CALL(cudaGetDeviceCount(&m_cudaDevCount));
 
-  if(m_cudaDevCount > MAXIMUM_DEVICE_COUNT) {
-    Kokkos::abort("Sorry, you have more GPUs per node than we thought anybody would ever have. Please report this to github.com/kokkos/kokkos.");
+  if (m_cudaDevCount > MAXIMUM_DEVICE_COUNT) {
+    Kokkos::abort(
+        "Sorry, you have more GPUs per node than we thought anybody would ever "
+        "have. Please report this to github.com/kokkos/kokkos.");
   }
-  for ( int i = 0 ; i < m_cudaDevCount ; ++i ) {
-    CUDA_SAFE_CALL( cudaGetDeviceProperties( m_cudaProp + i , i ) );
+  for (int i = 0; i < m_cudaDevCount; ++i) {
+    CUDA_SAFE_CALL(cudaGetDeviceProperties(m_cudaProp + i, i));
   }
 }
 
-const CudaInternalDevices & CudaInternalDevices::singleton()
-{
-  static CudaInternalDevices self ; return self ;
-}
-
+const CudaInternalDevices &CudaInternalDevices::singleton() {
+  static CudaInternalDevices self;
+  return self;
 }
 
+}  // namespace
 
 int CudaInternal::was_initialized = 0;
-int CudaInternal::was_finalized = 0;
+int CudaInternal::was_finalized   = 0;
 //----------------------------------------------------------------------------
 
+void CudaInternal::print_configuration(std::ostream &s) const {
+  const CudaInternalDevices &dev_info = CudaInternalDevices::singleton();
 
-void CudaInternal::print_configuration( std::ostream & s ) const
-{
-  const CudaInternalDevices & dev_info = CudaInternalDevices::singleton();
-
-#if defined( KOKKOS_ENABLE_CUDA )
-    s << "macro  KOKKOS_ENABLE_CUDA      : defined" << std::endl ;
+#if defined(KOKKOS_ENABLE_CUDA)
+  s << "macro  KOKKOS_ENABLE_CUDA      : defined" << std::endl;
 #endif
-#if defined( CUDA_VERSION )
-    s << "macro  CUDA_VERSION          = " << CUDA_VERSION
-      << " = version " << CUDA_VERSION / 1000
-      << "." << ( CUDA_VERSION % 1000 ) / 10
-      << std::endl ;
+#if defined(CUDA_VERSION)
+  s << "macro  CUDA_VERSION          = " << CUDA_VERSION << " = version "
+    << CUDA_VERSION / 1000 << "." << (CUDA_VERSION % 1000) / 10 << std::endl;
 #endif
 
-  for ( int i = 0 ; i < dev_info.m_cudaDevCount ; ++i ) {
-    s << "Kokkos::Cuda[ " << i << " ] "
-      << dev_info.m_cudaProp[i].name
-      << " capability " << dev_info.m_cudaProp[i].major << "." << dev_info.m_cudaProp[i].minor
-      << ", Total Global Memory: " << human_memory_size(dev_info.m_cudaProp[i].totalGlobalMem)
-      << ", Shared Memory per Block: " << human_memory_size(dev_info.m_cudaProp[i].sharedMemPerBlock);
-    if ( m_cudaDev == i ) s << " : Selected" ;
-    s << std::endl ;
+  for (int i = 0; i < dev_info.m_cudaDevCount; ++i) {
+    s << "Kokkos::Cuda[ " << i << " ] " << dev_info.m_cudaProp[i].name
+      << " capability " << dev_info.m_cudaProp[i].major << "."
+      << dev_info.m_cudaProp[i].minor << ", Total Global Memory: "
+      << human_memory_size(dev_info.m_cudaProp[i].totalGlobalMem)
+      << ", Shared Memory per Block: "
+      << human_memory_size(dev_info.m_cudaProp[i].sharedMemPerBlock);
+    if (m_cudaDev == i) s << " : Selected";
+    s << std::endl;
   }
 }
 
 //----------------------------------------------------------------------------
 
-CudaInternal::~CudaInternal()
-{
-  if ( m_stream ||
-       m_scratchSpace ||
-       m_scratchFlags ||
-       m_scratchUnified ||
-       m_scratchConcurrentBitset ) {
+CudaInternal::~CudaInternal() {
+  if (m_stream || m_scratchSpace || m_scratchFlags || m_scratchUnified ||
+      m_scratchConcurrentBitset) {
     std::cerr << "Kokkos::Cuda ERROR: Failed to call Kokkos::Cuda::finalize()"
-              << std::endl ;
+              << std::endl;
     std::cerr.flush();
   }
 
-  m_cudaDev                 = -1 ;
-  m_cudaArch                = -1 ;
-  m_multiProcCount          = 0 ;
-  m_maxWarpCount            = 0 ;
-  m_maxBlock                = 0 ;
-  m_maxSharedWords          = 0 ;
-  m_maxConcurrency          = 0 ;
-  m_scratchSpaceCount       = 0 ;
-  m_scratchFlagsCount       = 0 ;
-  m_scratchUnifiedCount     = 0 ;
-  m_scratchUnifiedSupported = 0 ;
-  m_streamCount             = 0 ;
-  m_scratchSpace            = 0 ;
-  m_scratchFlags            = 0 ;
-  m_scratchUnified          = 0 ;
-  m_scratchConcurrentBitset = 0 ;
-  m_stream                  = 0 ;
+  m_cudaDev                 = -1;
+  m_cudaArch                = -1;
+  m_multiProcCount          = 0;
+  m_maxWarpCount            = 0;
+  m_maxBlock                = 0;
+  m_maxSharedWords          = 0;
+  m_maxConcurrency          = 0;
+  m_scratchSpaceCount       = 0;
+  m_scratchFlagsCount       = 0;
+  m_scratchUnifiedCount     = 0;
+  m_scratchUnifiedSupported = 0;
+  m_streamCount             = 0;
+  m_scratchSpace            = 0;
+  m_scratchFlags            = 0;
+  m_scratchUnified          = 0;
+  m_scratchConcurrentBitset = 0;
+  m_stream                  = 0;
 }
 
-int CudaInternal::verify_is_initialized( const char * const label ) const
-{
-  if ( m_cudaDev < 0 ) {
-    std::cerr << "Kokkos::Cuda::" << label << " : ERROR device not initialized" << std::endl ;
+int CudaInternal::verify_is_initialized(const char *const label) const {
+  if (m_cudaDev < 0) {
+    std::cerr << "Kokkos::Cuda::" << label << " : ERROR device not initialized"
+              << std::endl;
   }
-  return 0 <= m_cudaDev ;
+  return 0 <= m_cudaDev;
 }
 
-CudaInternal & CudaInternal::singleton()
-{
-  static CudaInternal self ;
-  return self ;
-}
-void CudaInternal::fence() const {
-  cudaStreamSynchronize(m_stream);
+CudaInternal &CudaInternal::singleton() {
+  static CudaInternal self;
+  return self;
 }
+void CudaInternal::fence() const { cudaStreamSynchronize(m_stream); }
 
-void CudaInternal::initialize( int cuda_device_id , cudaStream_t stream )
-{
-  if ( was_finalized ) Kokkos::abort("Calling Cuda::initialize after Cuda::finalize is illegal\n");
+void CudaInternal::initialize(int cuda_device_id, cudaStream_t stream) {
+  if (was_finalized)
+    Kokkos::abort("Calling Cuda::initialize after Cuda::finalize is illegal\n");
   was_initialized = 1;
-  if ( is_initialized() ) return;
+  if (is_initialized()) return;
 
   enum { WordSize = sizeof(size_type) };
 
 #ifdef KOKKOS_ENABLE_DEPRECATED_CODE
-  if ( ! HostSpace::execution_space::is_initialized() ) {
+  if (!HostSpace::execution_space::is_initialized()) {
 #else
-  if ( ! HostSpace::execution_space::impl_is_initialized() ) {
+  if (!HostSpace::execution_space::impl_is_initialized()) {
 #endif
-    const std::string msg("Cuda::initialize ERROR : HostSpace::execution_space is not initialized");
-    throw_runtime_exception( msg );
+    const std::string msg(
+        "Cuda::initialize ERROR : HostSpace::execution_space is not "
+        "initialized");
+    throw_runtime_exception(msg);
   }
 
-  const CudaInternalDevices & dev_info = CudaInternalDevices::singleton();
+  const CudaInternalDevices &dev_info = CudaInternalDevices::singleton();
 
-  const bool ok_init = 0 == m_scratchSpace || 0 == m_scratchFlags ;
+  const bool ok_init = 0 == m_scratchSpace || 0 == m_scratchFlags;
 
-  const bool ok_id   = 0 <= cuda_device_id &&
-                            cuda_device_id < dev_info.m_cudaDevCount ;
+  const bool ok_id =
+      0 <= cuda_device_id && cuda_device_id < dev_info.m_cudaDevCount;
 
   // Need device capability 3.0 or better
 
-  const bool ok_dev = ok_id &&
-    ( 3 <= dev_info.m_cudaProp[ cuda_device_id ].major &&
-      0 <= dev_info.m_cudaProp[ cuda_device_id ].minor );
+  const bool ok_dev =
+      ok_id && (3 <= dev_info.m_cudaProp[cuda_device_id].major &&
+                0 <= dev_info.m_cudaProp[cuda_device_id].minor);
 
-  if ( ok_init && ok_dev ) {
+  if (ok_init && ok_dev) {
+    const struct cudaDeviceProp &cudaProp = dev_info.m_cudaProp[cuda_device_id];
 
-    const struct cudaDeviceProp & cudaProp =
-      dev_info.m_cudaProp[ cuda_device_id ];
+    m_cudaDev = cuda_device_id;
 
-    m_cudaDev = cuda_device_id ;
-
-    CUDA_SAFE_CALL( cudaSetDevice( m_cudaDev ) );
+    CUDA_SAFE_CALL(cudaSetDevice(m_cudaDev));
     Kokkos::Impl::cuda_device_synchronize();
 
     // Query what compute capability architecture a kernel executes:
     m_cudaArch = cuda_kernel_arch();
 
     int compiled_major = m_cudaArch / 100;
-    int compiled_minor = ( m_cudaArch % 100 ) / 10;
+    int compiled_minor = (m_cudaArch % 100) / 10;
 
-    if ( compiled_major < 5 && cudaProp.major >= 5 ) {
+    if (compiled_major < 5 && cudaProp.major >= 5) {
       std::stringstream ss;
-      ss << "Kokkos::Cuda::initialize ERROR: running kernels compiled for compute capability "
+      ss << "Kokkos::Cuda::initialize ERROR: running kernels compiled for "
+            "compute capability "
          << compiled_major << "." << compiled_minor
-         << " (< 5.0) on device with compute capability "
-         << cudaProp.major << "." << cudaProp.minor
-         << " (>=5.0), this would give incorrect results!"
-         << std::endl ;
+         << " (< 5.0) on device with compute capability " << cudaProp.major
+         << "." << cudaProp.minor
+         << " (>=5.0), this would give incorrect results!" << std::endl;
       std::string msg = ss.str();
-      Kokkos::abort( msg.c_str() );
+      Kokkos::abort(msg.c_str());
     }
-    if ( Kokkos::show_warnings() && (compiled_major != cudaProp.major || compiled_minor != cudaProp.minor) ) {
-      std::cerr << "Kokkos::Cuda::initialize WARNING: running kernels compiled for compute capability "
+    if (Kokkos::show_warnings() && (compiled_major != cudaProp.major ||
+                                    compiled_minor != cudaProp.minor)) {
+      std::cerr << "Kokkos::Cuda::initialize WARNING: running kernels compiled "
+                   "for compute capability "
                 << compiled_major << "." << compiled_minor
-                << " on device with compute capability "
-                << cudaProp.major << "." << cudaProp.minor
+                << " on device with compute capability " << cudaProp.major
+                << "." << cudaProp.minor
                 << " , this will likely reduce potential performance."
-                << std::endl ;
+                << std::endl;
     }
 
     // number of multiprocessors
 
-    m_multiProcCount = cudaProp.multiProcessorCount ;
+    m_multiProcCount = cudaProp.multiProcessorCount;
 
     //----------------------------------
     // Maximum number of warps,
     // at most one warp per thread in a warp for reduction.
 
-    m_maxWarpCount = cudaProp.maxThreadsPerBlock / Impl::CudaTraits::WarpSize ;
+    m_maxWarpCount = cudaProp.maxThreadsPerBlock / Impl::CudaTraits::WarpSize;
 
-    if ( Impl::CudaTraits::WarpSize < m_maxWarpCount ) {
-      m_maxWarpCount = Impl::CudaTraits::WarpSize ;
+    if (Impl::CudaTraits::WarpSize < m_maxWarpCount) {
+      m_maxWarpCount = Impl::CudaTraits::WarpSize;
     }
 
-    m_maxSharedWords = cudaProp.sharedMemPerBlock / WordSize ;
+    m_maxSharedWords = cudaProp.sharedMemPerBlock / WordSize;
 
     //----------------------------------
     // Maximum number of blocks:
 
-    m_maxBlock = cudaProp.maxGridSize[0] ;
+    m_maxBlock = cudaProp.maxGridSize[0];
 
-    m_shmemPerSM = cudaProp.sharedMemPerMultiprocessor ;
-    m_maxShmemPerBlock = cudaProp.sharedMemPerBlock ;
-    m_regsPerSM = cudaProp.regsPerMultiprocessor ;
-    m_maxBlocksPerSM = m_cudaArch < 500 ? 16 : (
-                       m_cudaArch < 750 ? 32 : (
-                       m_cudaArch == 750 ? 16 : 32));
-    m_maxThreadsPerSM = cudaProp.maxThreadsPerMultiProcessor ;
-    m_maxThreadsPerBlock = cudaProp.maxThreadsPerBlock ;
+    m_shmemPerSM       = cudaProp.sharedMemPerMultiprocessor;
+    m_maxShmemPerBlock = cudaProp.sharedMemPerBlock;
+    m_regsPerSM        = cudaProp.regsPerMultiprocessor;
+    m_maxBlocksPerSM =
+        m_cudaArch < 500
+            ? 16
+            : (m_cudaArch < 750 ? 32 : (m_cudaArch == 750 ? 16 : 32));
+    m_maxThreadsPerSM    = cudaProp.maxThreadsPerMultiProcessor;
+    m_maxThreadsPerBlock = cudaProp.maxThreadsPerBlock;
 
     //----------------------------------
 
-    m_scratchUnifiedSupported = cudaProp.unifiedAddressing ;
+    m_scratchUnifiedSupported = cudaProp.unifiedAddressing;
 
-    if ( Kokkos::show_warnings() && ! m_scratchUnifiedSupported ) {
-      std::cerr << "Kokkos::Cuda device "
-                << cudaProp.name << " capability "
+    if (Kokkos::show_warnings() && !m_scratchUnifiedSupported) {
+      std::cerr << "Kokkos::Cuda device " << cudaProp.name << " capability "
                 << cudaProp.major << "." << cudaProp.minor
                 << " does not support unified virtual address space"
-                << std::endl ;
+                << std::endl;
     }
 
     //----------------------------------
@@ -413,345 +421,362 @@ void CudaInternal::initialize( int cuda_device_id , cudaStream_t stream )
     // Allocate some initial space.  This will grow as needed.
 
     {
-      const unsigned reduce_block_count = m_maxWarpCount * Impl::CudaTraits::WarpSize ;
+      const unsigned reduce_block_count =
+          m_maxWarpCount * Impl::CudaTraits::WarpSize;
 
-      (void) scratch_unified( 16 * sizeof(size_type) );
-      (void) scratch_flags( reduce_block_count * 2  * sizeof(size_type) );
-      (void) scratch_space( reduce_block_count * 16 * sizeof(size_type) );
+      (void)scratch_unified(16 * sizeof(size_type));
+      (void)scratch_flags(reduce_block_count * 2 * sizeof(size_type));
+      (void)scratch_space(reduce_block_count * 16 * sizeof(size_type));
     }
     //----------------------------------
     // Concurrent bitset for obtaining unique tokens from within
     // an executing kernel.
     {
-
-      m_maxConcurrency =
-        m_maxThreadsPerSM * cudaProp.multiProcessorCount ;
+      m_maxConcurrency = m_maxThreadsPerSM * cudaProp.multiProcessorCount;
 
       const int32_t buffer_bound =
-         Kokkos::Impl::concurrent_bitset::buffer_bound( m_maxConcurrency );
+          Kokkos::Impl::concurrent_bitset::buffer_bound(m_maxConcurrency);
 
       // Allocate and initialize uint32_t[ buffer_bound ]
 
-      typedef Kokkos::Impl::SharedAllocationRecord< Kokkos::CudaSpace , void > Record ;
+      typedef Kokkos::Impl::SharedAllocationRecord<Kokkos::CudaSpace, void>
+          Record;
 
-      Record * const r = Record::allocate( Kokkos::CudaSpace()
-                                         , "InternalScratchBitset"
-                                         , sizeof(uint32_t) * buffer_bound );
+      Record *const r =
+          Record::allocate(Kokkos::CudaSpace(), "InternalScratchBitset",
+                           sizeof(uint32_t) * buffer_bound);
 
-      Record::increment( r );
+      Record::increment(r);
 
-      m_scratchConcurrentBitset = reinterpret_cast<uint32_t *>( r->data() );
-
-      CUDA_SAFE_CALL( cudaMemset( m_scratchConcurrentBitset , 0 , sizeof(uint32_t) * buffer_bound ) );
+      m_scratchConcurrentBitset = reinterpret_cast<uint32_t *>(r->data());
 
+      CUDA_SAFE_CALL(cudaMemset(m_scratchConcurrentBitset, 0,
+                                sizeof(uint32_t) * buffer_bound));
     }
     //----------------------------------
 
-  }
-  else {
+  } else {
+    std::ostringstream msg;
+    msg << "Kokkos::Cuda::initialize(" << cuda_device_id << ") FAILED";
 
-    std::ostringstream msg ;
-    msg << "Kokkos::Cuda::initialize(" << cuda_device_id << ") FAILED" ;
-
-    if ( ! ok_init ) {
-      msg << " : Already initialized" ;
+    if (!ok_init) {
+      msg << " : Already initialized";
     }
-    if ( ! ok_id ) {
+    if (!ok_id) {
       msg << " : Device identifier out of range "
-          << "[0.." << dev_info.m_cudaDevCount << "]" ;
+          << "[0.." << dev_info.m_cudaDevCount << "]";
+    } else if (!ok_dev) {
+      msg << " : Device ";
+      msg << dev_info.m_cudaProp[cuda_device_id].major;
+      msg << ".";
+      msg << dev_info.m_cudaProp[cuda_device_id].minor;
+      msg << " has insufficient capability, required 3.0 or better";
     }
-    else if ( ! ok_dev ) {
-      msg << " : Device " ;
-      msg << dev_info.m_cudaProp[ cuda_device_id ].major ;
-      msg << "." ;
-      msg << dev_info.m_cudaProp[ cuda_device_id ].minor ;
-      msg << " has insufficient capability, required 3.0 or better" ;
-    }
-    Kokkos::Impl::throw_runtime_exception( msg.str() );
+    Kokkos::Impl::throw_runtime_exception(msg.str());
   }
 
-  #ifdef KOKKOS_ENABLE_CUDA_UVM
-    if( Kokkos::show_warnings() && !cuda_launch_blocking() ) {
-      std::cerr << "Kokkos::Cuda::initialize WARNING: Cuda is allocating into UVMSpace by default" << std::endl;
-      std::cerr << "                                  without setting CUDA_LAUNCH_BLOCKING=1." << std::endl;
-      std::cerr << "                                  The code must call Cuda().fence() after each kernel" << std::endl;
-      std::cerr << "                                  or will likely crash when accessing data on the host." << std::endl;
-    }
+#ifdef KOKKOS_ENABLE_CUDA_UVM
+  if (Kokkos::show_warnings() && !cuda_launch_blocking()) {
+    std::cerr << "Kokkos::Cuda::initialize WARNING: Cuda is allocating into "
+                 "UVMSpace by default"
+              << std::endl;
+    std::cerr << "                                  without setting "
+                 "CUDA_LAUNCH_BLOCKING=1."
+              << std::endl;
+    std::cerr << "                                  The code must call "
+                 "Cuda().fence() after each kernel"
+              << std::endl;
+    std::cerr << "                                  or will likely crash when "
+                 "accessing data on the host."
+              << std::endl;
+  }
 
-    const char * env_force_device_alloc = getenv("CUDA_MANAGED_FORCE_DEVICE_ALLOC");
-    bool force_device_alloc;
-    if (env_force_device_alloc == 0) force_device_alloc=false;
-    else force_device_alloc=atoi(env_force_device_alloc)!=0;
+  const char *env_force_device_alloc =
+      getenv("CUDA_MANAGED_FORCE_DEVICE_ALLOC");
+  bool force_device_alloc;
+  if (env_force_device_alloc == 0)
+    force_device_alloc = false;
+  else
+    force_device_alloc = atoi(env_force_device_alloc) != 0;
 
-    const char * env_visible_devices = getenv("CUDA_VISIBLE_DEVICES");
-    bool visible_devices_one=true;
-    if (env_visible_devices == 0) visible_devices_one=false;
+  const char *env_visible_devices = getenv("CUDA_VISIBLE_DEVICES");
+  bool visible_devices_one        = true;
+  if (env_visible_devices == 0) visible_devices_one = false;
 
-    if( Kokkos::show_warnings() && (!visible_devices_one && !force_device_alloc) ) {
-      std::cerr << "Kokkos::Cuda::initialize WARNING: Cuda is allocating into UVMSpace by default" << std::endl;
-      std::cerr << "                                  without setting CUDA_MANAGED_FORCE_DEVICE_ALLOC=1 or " << std::endl;
-      std::cerr << "                                  setting CUDA_VISIBLE_DEVICES." << std::endl;
-      std::cerr << "                                  This could on multi GPU systems lead to severe performance" << std::endl;
-      std::cerr << "                                  penalties." << std::endl;
-    }
-  #endif
+  if (Kokkos::show_warnings() &&
+      (!visible_devices_one && !force_device_alloc)) {
+    std::cerr << "Kokkos::Cuda::initialize WARNING: Cuda is allocating into "
+                 "UVMSpace by default"
+              << std::endl;
+    std::cerr << "                                  without setting "
+                 "CUDA_MANAGED_FORCE_DEVICE_ALLOC=1 or "
+              << std::endl;
+    std::cerr
+        << "                                  setting CUDA_VISIBLE_DEVICES."
+        << std::endl;
+    std::cerr << "                                  This could on multi GPU "
+                 "systems lead to severe performance"
+              << std::endl;
+    std::cerr << "                                  penalties." << std::endl;
+  }
+#endif
 
-  #ifdef KOKKOS_ENABLE_PRE_CUDA_10_DEPRECATION_API
+#ifdef KOKKOS_ENABLE_PRE_CUDA_10_DEPRECATION_API
   cudaThreadSetCacheConfig(cudaFuncCachePreferShared);
-  #else
+#else
   cudaDeviceSetCacheConfig(cudaFuncCachePreferShared);
-  #endif
+#endif
 
   // Init the array for used for arbitrarily sized atomics
-  if(stream == 0)
-    Impl::initialize_host_cuda_lock_arrays();
+  if (stream == 0) Impl::initialize_host_cuda_lock_arrays();
 
   m_stream = stream;
 }
 
 //----------------------------------------------------------------------------
 
-typedef Cuda::size_type ScratchGrain[ Impl::CudaTraits::WarpSize ] ;
+typedef Cuda::size_type ScratchGrain[Impl::CudaTraits::WarpSize];
 enum { sizeScratchGrain = sizeof(ScratchGrain) };
 
+Cuda::size_type *CudaInternal::scratch_flags(const Cuda::size_type size) const {
+  if (verify_is_initialized("scratch_flags") &&
+      m_scratchFlagsCount * sizeScratchGrain < size) {
+    m_scratchFlagsCount = (size + sizeScratchGrain - 1) / sizeScratchGrain;
 
-Cuda::size_type *
-CudaInternal::scratch_flags( const Cuda::size_type size ) const 
-{
-  if ( verify_is_initialized("scratch_flags") && m_scratchFlagsCount * sizeScratchGrain < size ) {
+    typedef Kokkos::Impl::SharedAllocationRecord<Kokkos::CudaSpace, void>
+        Record;
 
+    if (m_scratchFlags) Record::decrement(Record::get_record(m_scratchFlags));
 
-    m_scratchFlagsCount = ( size + sizeScratchGrain - 1 ) / sizeScratchGrain ;
+    Record *const r =
+        Record::allocate(Kokkos::CudaSpace(), "InternalScratchFlags",
+                         (sizeof(ScratchGrain) * m_scratchFlagsCount));
 
-    typedef Kokkos::Impl::SharedAllocationRecord< Kokkos::CudaSpace , void > Record ;
+    Record::increment(r);
 
-    if( m_scratchFlags )
-      Record::decrement( Record::get_record( m_scratchFlags ) );
+    m_scratchFlags = reinterpret_cast<size_type *>(r->data());
 
-    Record * const r = Record::allocate( Kokkos::CudaSpace()
-                                       , "InternalScratchFlags"
-                                       , ( sizeof( ScratchGrain ) * m_scratchFlagsCount ) );
-
-    Record::increment( r );
-
-    m_scratchFlags = reinterpret_cast<size_type *>( r->data() );
-
-    CUDA_SAFE_CALL( cudaMemset( m_scratchFlags , 0 , m_scratchFlagsCount * sizeScratchGrain ) );
+    CUDA_SAFE_CALL(
+        cudaMemset(m_scratchFlags, 0, m_scratchFlagsCount * sizeScratchGrain));
   }
 
-  return m_scratchFlags ;
+  return m_scratchFlags;
 }
 
-Cuda::size_type *
-CudaInternal::scratch_space( const Cuda::size_type size ) const 
-{
-  if ( verify_is_initialized("scratch_space") && m_scratchSpaceCount * sizeScratchGrain < size ) {
+Cuda::size_type *CudaInternal::scratch_space(const Cuda::size_type size) const {
+  if (verify_is_initialized("scratch_space") &&
+      m_scratchSpaceCount * sizeScratchGrain < size) {
+    m_scratchSpaceCount = (size + sizeScratchGrain - 1) / sizeScratchGrain;
 
-    m_scratchSpaceCount = ( size + sizeScratchGrain - 1 ) / sizeScratchGrain ;
+    typedef Kokkos::Impl::SharedAllocationRecord<Kokkos::CudaSpace, void>
+        Record;
 
-     typedef Kokkos::Impl::SharedAllocationRecord< Kokkos::CudaSpace , void > Record ;
+    if (m_scratchSpace) Record::decrement(Record::get_record(m_scratchSpace));
 
-     if( m_scratchSpace )
-       Record::decrement( Record::get_record( m_scratchSpace ) );
+    Record *const r =
+        Record::allocate(Kokkos::CudaSpace(), "InternalScratchSpace",
+                         (sizeof(ScratchGrain) * m_scratchSpaceCount));
 
-     Record * const r = Record::allocate( Kokkos::CudaSpace()
-                                        , "InternalScratchSpace"
-                                        , ( sizeof( ScratchGrain ) * m_scratchSpaceCount ) );
+    Record::increment(r);
 
-     Record::increment( r );
-
-     m_scratchSpace = reinterpret_cast<size_type *>( r->data() );
+    m_scratchSpace = reinterpret_cast<size_type *>(r->data());
   }
 
-  return m_scratchSpace ;
+  return m_scratchSpace;
 }
 
-Cuda::size_type *
-CudaInternal::scratch_unified( const Cuda::size_type size ) const
-{
-  if ( verify_is_initialized("scratch_unified") &&
-       m_scratchUnifiedSupported && m_scratchUnifiedCount * sizeScratchGrain < size ) {
+Cuda::size_type *CudaInternal::scratch_unified(
+    const Cuda::size_type size) const {
+  if (verify_is_initialized("scratch_unified") && m_scratchUnifiedSupported &&
+      m_scratchUnifiedCount * sizeScratchGrain < size) {
+    m_scratchUnifiedCount = (size + sizeScratchGrain - 1) / sizeScratchGrain;
 
-    m_scratchUnifiedCount = ( size + sizeScratchGrain - 1 ) / sizeScratchGrain ;
+    typedef Kokkos::Impl::SharedAllocationRecord<Kokkos::CudaHostPinnedSpace,
+                                                 void>
+        Record;
 
-    typedef Kokkos::Impl::SharedAllocationRecord< Kokkos::CudaHostPinnedSpace , void > Record ;
+    if (m_scratchUnified)
+      Record::decrement(Record::get_record(m_scratchUnified));
 
-    if( m_scratchUnified )
-      Record::decrement( Record::get_record( m_scratchUnified ) );
+    Record *const r = Record::allocate(
+        Kokkos::CudaHostPinnedSpace(), "InternalScratchUnified",
+        (sizeof(ScratchGrain) * m_scratchUnifiedCount));
 
-    Record * const r = Record::allocate( Kokkos::CudaHostPinnedSpace()
-                                       , "InternalScratchUnified"
-                                       , ( sizeof( ScratchGrain ) * m_scratchUnifiedCount ) );
+    Record::increment(r);
 
-    Record::increment( r );
-
-    m_scratchUnified = reinterpret_cast<size_type *>( r->data() );
+    m_scratchUnified = reinterpret_cast<size_type *>(r->data());
   }
 
-  return m_scratchUnified ;
+  return m_scratchUnified;
 }
 
-Cuda::size_type *
-CudaInternal::scratch_functor( const Cuda::size_type size ) const
-{
-  if ( verify_is_initialized("scratch_functor") &&
-       m_scratchFunctorSize < size ) {
+Cuda::size_type *CudaInternal::scratch_functor(
+    const Cuda::size_type size) const {
+  if (verify_is_initialized("scratch_functor") && m_scratchFunctorSize < size) {
+    m_scratchFunctorSize = size;
 
-    m_scratchFunctorSize = size ;
+    typedef Kokkos::Impl::SharedAllocationRecord<Kokkos::CudaSpace, void>
+        Record;
 
-    typedef Kokkos::Impl::SharedAllocationRecord< Kokkos::CudaSpace , void > Record ;
+    if (m_scratchFunctor)
+      Record::decrement(Record::get_record(m_scratchFunctor));
 
-    if( m_scratchFunctor )
-      Record::decrement( Record::get_record( m_scratchFunctor ) );
+    Record *const r = Record::allocate(
+        Kokkos::CudaSpace(), "InternalScratchFunctor", m_scratchFunctorSize);
 
-    Record * const r = Record::allocate( Kokkos::CudaSpace()
-                                       , "InternalScratchFunctor"
-                                       , m_scratchFunctorSize );
+    Record::increment(r);
 
-    Record::increment( r );
-
-    m_scratchFunctor = reinterpret_cast<size_type *>( r->data() );
+    m_scratchFunctor = reinterpret_cast<size_type *>(r->data());
   }
 
-  return m_scratchFunctor ;
+  return m_scratchFunctor;
 }
 
 //----------------------------------------------------------------------------
 
-void CudaInternal::finalize()
-{
+void CudaInternal::finalize() {
   was_finalized = 1;
-  if ( 0 != m_scratchSpace || 0 != m_scratchFlags ) {
-
+  if (0 != m_scratchSpace || 0 != m_scratchFlags) {
     Impl::finalize_host_cuda_lock_arrays();
 
-    if(m_stream!=0) cudaStreamDestroy(m_stream);
+    if (m_stream != 0) cudaStreamDestroy(m_stream);
 
-    typedef Kokkos::Impl::SharedAllocationRecord< CudaSpace > RecordCuda ;
-    typedef Kokkos::Impl::SharedAllocationRecord< CudaHostPinnedSpace > RecordHost ;
+    typedef Kokkos::Impl::SharedAllocationRecord<CudaSpace> RecordCuda;
+    typedef Kokkos::Impl::SharedAllocationRecord<CudaHostPinnedSpace>
+        RecordHost;
 
-    RecordCuda::decrement( RecordCuda::get_record( m_scratchFlags ) );
-    RecordCuda::decrement( RecordCuda::get_record( m_scratchSpace ) );
-    RecordHost::decrement( RecordHost::get_record( m_scratchUnified ) );
-    RecordCuda::decrement( RecordCuda::get_record( m_scratchConcurrentBitset ) );
-    if(m_scratchFunctorSize>0)
-    RecordCuda::decrement( RecordCuda::get_record( m_scratchFunctor ) );
+    RecordCuda::decrement(RecordCuda::get_record(m_scratchFlags));
+    RecordCuda::decrement(RecordCuda::get_record(m_scratchSpace));
+    RecordHost::decrement(RecordHost::get_record(m_scratchUnified));
+    RecordCuda::decrement(RecordCuda::get_record(m_scratchConcurrentBitset));
+    if (m_scratchFunctorSize > 0)
+      RecordCuda::decrement(RecordCuda::get_record(m_scratchFunctor));
 
-    m_cudaDev             = -1 ;
-    m_multiProcCount      = 0 ;
-    m_maxWarpCount        = 0 ;
-    m_maxBlock            = 0 ;
-    m_maxSharedWords      = 0 ;
-    m_scratchSpaceCount   = 0 ;
-    m_scratchFlagsCount   = 0 ;
-    m_scratchUnifiedCount = 0 ;
-    m_streamCount         = 0 ;
-    m_scratchSpace        = 0 ;
-    m_scratchFlags        = 0 ;
-    m_scratchUnified      = 0 ;
-    m_scratchConcurrentBitset = 0 ;
-    m_stream              = 0 ;
+    m_cudaDev                 = -1;
+    m_multiProcCount          = 0;
+    m_maxWarpCount            = 0;
+    m_maxBlock                = 0;
+    m_maxSharedWords          = 0;
+    m_scratchSpaceCount       = 0;
+    m_scratchFlagsCount       = 0;
+    m_scratchUnifiedCount     = 0;
+    m_streamCount             = 0;
+    m_scratchSpace            = 0;
+    m_scratchFlags            = 0;
+    m_scratchUnified          = 0;
+    m_scratchConcurrentBitset = 0;
+    m_stream                  = 0;
   }
 }
 
 //----------------------------------------------------------------------------
 
-Cuda::size_type cuda_internal_multiprocessor_count()
-{ return CudaInternal::singleton().m_multiProcCount ; }
+Cuda::size_type cuda_internal_multiprocessor_count() {
+  return CudaInternal::singleton().m_multiProcCount;
+}
 
-CudaSpace::size_type cuda_internal_maximum_concurrent_block_count()
-{
-  #if defined(KOKKOS_ARCH_KEPLER)
+CudaSpace::size_type cuda_internal_maximum_concurrent_block_count() {
+#if defined(KOKKOS_ARCH_KEPLER)
   // Compute capability 3.0 through 3.7
   enum : int { max_resident_blocks_per_multiprocessor = 16 };
-  #else
+#else
   // Compute capability 5.0 through 6.2
   enum : int { max_resident_blocks_per_multiprocessor = 32 };
-  #endif
-   return CudaInternal::singleton().m_multiProcCount
-          * max_resident_blocks_per_multiprocessor ;
+#endif
+  return CudaInternal::singleton().m_multiProcCount *
+         max_resident_blocks_per_multiprocessor;
 };
 
-Cuda::size_type cuda_internal_maximum_warp_count()
-{ return CudaInternal::singleton().m_maxWarpCount ; }
+Cuda::size_type cuda_internal_maximum_warp_count() {
+  return CudaInternal::singleton().m_maxWarpCount;
+}
 
-Cuda::size_type cuda_internal_maximum_grid_count()
-{ return CudaInternal::singleton().m_maxBlock ; }
+Cuda::size_type cuda_internal_maximum_grid_count() {
+  return CudaInternal::singleton().m_maxBlock;
+}
 
-Cuda::size_type cuda_internal_maximum_shared_words()
-{ return CudaInternal::singleton().m_maxSharedWords ; }
+Cuda::size_type cuda_internal_maximum_shared_words() {
+  return CudaInternal::singleton().m_maxSharedWords;
+}
 
-Cuda::size_type * cuda_internal_scratch_space( const Cuda& instance, const Cuda::size_type size )
-{ return instance.impl_internal_space_instance()->scratch_space( size ); }
+Cuda::size_type *cuda_internal_scratch_space(const Cuda &instance,
+                                             const Cuda::size_type size) {
+  return instance.impl_internal_space_instance()->scratch_space(size);
+}
 
-Cuda::size_type * cuda_internal_scratch_flags( const Cuda& instance, const Cuda::size_type size )
-{ return instance.impl_internal_space_instance()->scratch_flags( size ); }
+Cuda::size_type *cuda_internal_scratch_flags(const Cuda &instance,
+                                             const Cuda::size_type size) {
+  return instance.impl_internal_space_instance()->scratch_flags(size);
+}
 
-Cuda::size_type * cuda_internal_scratch_unified( const Cuda& instance, const Cuda::size_type size )
-{ return instance.impl_internal_space_instance()->scratch_unified( size ); }
+Cuda::size_type *cuda_internal_scratch_unified(const Cuda &instance,
+                                               const Cuda::size_type size) {
+  return instance.impl_internal_space_instance()->scratch_unified(size);
+}
 
-
-} // namespace Impl
-} // namespace Kokkos
+}  // namespace Impl
+}  // namespace Kokkos
 
 //----------------------------------------------------------------------------
 
 namespace Kokkos {
 
-Cuda::size_type Cuda::detect_device_count()
-{ return Impl::CudaInternalDevices::singleton().m_cudaDevCount ; }
+Cuda::size_type Cuda::detect_device_count() {
+  return Impl::CudaInternalDevices::singleton().m_cudaDevCount;
+}
 
-int Cuda::concurrency()
-{ return Impl::CudaInternal::singleton().m_maxConcurrency ; }
+int Cuda::concurrency() {
+  return Impl::CudaInternal::singleton().m_maxConcurrency;
+}
 
 #ifdef KOKKOS_ENABLE_DEPRECATED_CODE
 int Cuda::is_initialized()
 #else
 int Cuda::impl_is_initialized()
 #endif
-{ return Impl::CudaInternal::singleton().is_initialized(); }
+{
+  return Impl::CudaInternal::singleton().is_initialized();
+}
 
 #ifdef KOKKOS_ENABLE_DEPRECATED_CODE
-void Cuda::initialize( const Cuda::SelectDevice config , size_t num_instances )
+void Cuda::initialize(const Cuda::SelectDevice config, size_t num_instances)
 #else
-void Cuda::impl_initialize( const Cuda::SelectDevice config , size_t num_instances )
+void Cuda::impl_initialize(const Cuda::SelectDevice config,
+                           size_t num_instances)
 #endif
 {
-  Impl::CudaInternal::singleton().initialize( config.cuda_device_id , 0 );
+  Impl::CudaInternal::singleton().initialize(config.cuda_device_id, 0);
 
-  #if defined(KOKKOS_ENABLE_PROFILING)
-    Kokkos::Profiling::initialize();
-  #endif
+#if defined(KOKKOS_ENABLE_PROFILING)
+  Kokkos::Profiling::initialize();
+#endif
 }
 
-std::vector<unsigned>
-Cuda::detect_device_arch()
-{
-  const Impl::CudaInternalDevices & s = Impl::CudaInternalDevices::singleton();
+std::vector<unsigned> Cuda::detect_device_arch() {
+  const Impl::CudaInternalDevices &s = Impl::CudaInternalDevices::singleton();
 
-  std::vector<unsigned> output( s.m_cudaDevCount );
+  std::vector<unsigned> output(s.m_cudaDevCount);
 
-  for ( int i = 0 ; i < s.m_cudaDevCount ; ++i ) {
-    output[i] = s.m_cudaProp[i].major * 100 + s.m_cudaProp[i].minor ;
+  for (int i = 0; i < s.m_cudaDevCount; ++i) {
+    output[i] = s.m_cudaProp[i].major * 100 + s.m_cudaProp[i].minor;
   }
 
-  return output ;
+  return output;
 }
 
-Cuda::size_type Cuda::device_arch()
-{
-  const int dev_id = Impl::CudaInternal::singleton().m_cudaDev ;
+Cuda::size_type Cuda::device_arch() {
+  const int dev_id = Impl::CudaInternal::singleton().m_cudaDev;
 
-  int dev_arch = 0 ;
+  int dev_arch = 0;
 
-  if ( 0 <= dev_id ) {
-    const struct cudaDeviceProp & cudaProp =
-      Impl::CudaInternalDevices::singleton().m_cudaProp[ dev_id ] ;
+  if (0 <= dev_id) {
+    const struct cudaDeviceProp &cudaProp =
+        Impl::CudaInternalDevices::singleton().m_cudaProp[dev_id];
 
-    dev_arch = cudaProp.major * 100 + cudaProp.minor ;
+    dev_arch = cudaProp.major * 100 + cudaProp.minor;
   }
 
-  return dev_arch ;
+  return dev_arch;
 }
 
 #ifdef KOKKOS_ENABLE_DEPRECATED_CODE
@@ -762,71 +787,62 @@ void Cuda::impl_finalize()
 {
   Impl::CudaInternal::singleton().finalize();
 
-  #if defined(KOKKOS_ENABLE_PROFILING)
-    Kokkos::Profiling::finalize();
-  #endif
+#if defined(KOKKOS_ENABLE_PROFILING)
+  Kokkos::Profiling::finalize();
+#endif
 }
 
-Cuda::Cuda()
-  : m_space_instance( &Impl::CudaInternal::singleton() )
-{
-  Impl::CudaInternal::singleton().verify_is_initialized( "Cuda instance constructor" );
+Cuda::Cuda() : m_space_instance(&Impl::CudaInternal::singleton()) {
+  Impl::CudaInternal::singleton().verify_is_initialized(
+      "Cuda instance constructor");
 }
 
-Cuda::Cuda(cudaStream_t stream)
-  :   m_space_instance(new Impl::CudaInternal)
-{
-  Impl::CudaInternal::singleton().verify_is_initialized( "Cuda instance constructor" );
-  m_space_instance->initialize(Impl::CudaInternal::singleton().m_cudaDev,stream);
+Cuda::Cuda(cudaStream_t stream) : m_space_instance(new Impl::CudaInternal) {
+  Impl::CudaInternal::singleton().verify_is_initialized(
+      "Cuda instance constructor");
+  m_space_instance->initialize(Impl::CudaInternal::singleton().m_cudaDev,
+                               stream);
 }
 
-void Cuda::print_configuration( std::ostream & s , const bool )
-{ Impl::CudaInternal::singleton().print_configuration( s ); }
+void Cuda::print_configuration(std::ostream &s, const bool) {
+  Impl::CudaInternal::singleton().print_configuration(s);
+}
 
 #ifdef KOKKOS_ENABLE_DEPRECATED_CODE
-bool Cuda::sleep() { return false ; }
+bool Cuda::sleep() { return false; }
 
-bool Cuda::wake() { return true ; }
+bool Cuda::wake() { return true; }
 #endif
 
-void Cuda::impl_static_fence()
-{
-  Kokkos::Impl::cuda_device_synchronize();
-}
+void Cuda::impl_static_fence() { Kokkos::Impl::cuda_device_synchronize(); }
 
 #ifdef KOKKOS_ENABLE_DEPRECATED_CODE
-void Cuda::fence() {
-  impl_static_fence();
-}
+void Cuda::fence() { impl_static_fence(); }
 #else
-void Cuda::fence() const {
-  m_space_instance->fence();
-}
+void Cuda::fence() const { m_space_instance->fence(); }
 #endif
 
-const char* Cuda::name() { return "Cuda"; }
+const char *Cuda::name() { return "Cuda"; }
 
-cudaStream_t Cuda::cuda_stream() const { return m_space_instance->m_stream ; }
-int          Cuda::cuda_device() const { return m_space_instance->m_cudaDev ; }
+cudaStream_t Cuda::cuda_stream() const { return m_space_instance->m_stream; }
+int Cuda::cuda_device() const { return m_space_instance->m_cudaDev; }
 
-
-} // namespace Kokkos
+}  // namespace Kokkos
 
 namespace Kokkos {
 namespace Experimental {
 
-UniqueToken< Kokkos::Cuda , Kokkos::Experimental::UniqueTokenScope::Global >::
-UniqueToken( Kokkos::Cuda const & )
-  : m_buffer( Kokkos::Impl::CudaInternal::singleton().m_scratchConcurrentBitset )
-  , m_count(  Kokkos::Impl::CudaInternal::singleton().m_maxConcurrency )
-  {}
+UniqueToken<Kokkos::Cuda, Kokkos::Experimental::UniqueTokenScope::Global>::
+    UniqueToken(Kokkos::Cuda const &)
+    : m_buffer(
+          Kokkos::Impl::CudaInternal::singleton().m_scratchConcurrentBitset),
+      m_count(Kokkos::Impl::CudaInternal::singleton().m_maxConcurrency) {}
 
-} // namespace Experimental
-} // namespace Kokkos
+}  // namespace Experimental
+}  // namespace Kokkos
 
 #else
 
 void KOKKOS_CORE_SRC_CUDA_IMPL_PREVENT_LINK_ERROR() {}
 
-#endif // KOKKOS_ENABLE_CUDA
-
+#endif  // KOKKOS_ENABLE_CUDA
diff --git a/lib/kokkos/core/src/Cuda/Kokkos_Cuda_Instance.hpp b/lib/kokkos/core/src/Cuda/Kokkos_Cuda_Instance.hpp
index f9e333fcf0..9d2c939af8 100644
--- a/lib/kokkos/core/src/Cuda/Kokkos_Cuda_Instance.hpp
+++ b/lib/kokkos/core/src/Cuda/Kokkos_Cuda_Instance.hpp
@@ -3,39 +3,48 @@
 
 //----------------------------------------------------------------------------
 //----------------------------------------------------------------------------
+// These functions fulfill the purpose of allowing to work around
+// a suspected system software issue, or to check for race conditions.
+// They are not currently a fully officially supported capability.
+#ifdef KOKKOS_IMPL_DEBUG_CUDA_SERIAL_EXECUTION
+extern "C" void kokkos_impl_cuda_set_serial_execution(bool);
+extern "C" bool kokkos_impl_cuda_use_serial_execution();
+#endif
 
 namespace Kokkos {
 namespace Impl {
 
 struct CudaTraits {
-  enum { WarpSize       = 32      /* 0x0020 */ };
-  enum { WarpIndexMask  = 0x001f  /* Mask for warpindex */ };
-  enum { WarpIndexShift = 5       /* WarpSize == 1 << WarpShift */ };
+  enum { WarpSize = 32 /* 0x0020 */ };
+  enum { WarpIndexMask = 0x001f /* Mask for warpindex */ };
+  enum { WarpIndexShift = 5 /* WarpSize == 1 << WarpShift */ };
 
-  enum { ConstantMemoryUsage    = 0x008000 /* 32k bytes */ };
-  enum { ConstantMemoryCache    = 0x002000 /*  8k bytes */ };
-  enum { KernelArgumentLimit    = 0x001000 /*  4k bytes */ };
+  enum { ConstantMemoryUsage = 0x008000 /* 32k bytes */ };
+  enum { ConstantMemoryCache = 0x002000 /*  8k bytes */ };
+  enum { KernelArgumentLimit = 0x001000 /*  4k bytes */ };
 
   typedef unsigned long
-    ConstantGlobalBufferType[ ConstantMemoryUsage / sizeof(unsigned long) ];
+      ConstantGlobalBufferType[ConstantMemoryUsage / sizeof(unsigned long)];
 
-#if defined(KOKKOS_ARCH_VOLTA) || \
-    defined(KOKKOS_ARCH_PASCAL)
-  enum { ConstantMemoryUseThreshold = 0x000200 /* 0 bytes -> always use constant (or global)*/ };
+#if defined(KOKKOS_ARCH_VOLTA) || defined(KOKKOS_ARCH_PASCAL)
+  enum {
+    ConstantMemoryUseThreshold =
+        0x000200 /* 0 bytes -> always use constant (or global)*/
+  };
 #else
   enum { ConstantMemoryUseThreshold = 0x000200 /* 512 bytes */ };
 #endif
 
-  KOKKOS_INLINE_FUNCTION static
-  CudaSpace::size_type warp_count( CudaSpace::size_type i )
-    { return ( i + WarpIndexMask ) >> WarpIndexShift ; }
+  KOKKOS_INLINE_FUNCTION static CudaSpace::size_type warp_count(
+      CudaSpace::size_type i) {
+    return (i + WarpIndexMask) >> WarpIndexShift;
+  }
 
-  KOKKOS_INLINE_FUNCTION static
-  CudaSpace::size_type warp_align( CudaSpace::size_type i )
-    {
-      enum { Mask = ~CudaSpace::size_type( WarpIndexMask ) };
-      return ( i + WarpIndexMask ) & Mask ;
-    }
+  KOKKOS_INLINE_FUNCTION static CudaSpace::size_type warp_align(
+      CudaSpace::size_type i) {
+    enum { Mask = ~CudaSpace::size_type(WarpIndexMask) };
+    return (i + WarpIndexMask) & Mask;
+  }
 };
 
 //----------------------------------------------------------------------------
@@ -47,110 +56,118 @@ CudaSpace::size_type cuda_internal_maximum_shared_words();
 
 CudaSpace::size_type cuda_internal_maximum_concurrent_block_count();
 
-CudaSpace::size_type * cuda_internal_scratch_flags( const Cuda&, const CudaSpace::size_type size );
-CudaSpace::size_type * cuda_internal_scratch_space( const Cuda&, const CudaSpace::size_type size );
-CudaSpace::size_type * cuda_internal_scratch_unified( const Cuda&, const CudaSpace::size_type size );
+CudaSpace::size_type* cuda_internal_scratch_flags(
+    const Cuda&, const CudaSpace::size_type size);
+CudaSpace::size_type* cuda_internal_scratch_space(
+    const Cuda&, const CudaSpace::size_type size);
+CudaSpace::size_type* cuda_internal_scratch_unified(
+    const Cuda&, const CudaSpace::size_type size);
 
-} // namespace Impl
-} // namespace Kokkos
+}  // namespace Impl
+}  // namespace Kokkos
 
 //----------------------------------------------------------------------------
 namespace Kokkos {
 namespace Impl {
 
 class CudaInternal {
-private:
+ private:
+  CudaInternal(const CudaInternal&);
+  CudaInternal& operator=(const CudaInternal&);
+#ifdef KOKKOS_IMPL_DEBUG_CUDA_SERIAL_EXECUTION
+  static bool kokkos_impl_cuda_use_serial_execution_v;
+#endif
 
-  CudaInternal( const CudaInternal & );
-  CudaInternal & operator = ( const CudaInternal & );
+ public:
+  typedef Cuda::size_type size_type;
 
-
-public:
-
-  typedef Cuda::size_type size_type ;
-
-  int         m_cudaDev ;
+  int m_cudaDev;
 
   // Device Properties
-  int         m_cudaArch ;
-  unsigned    m_multiProcCount ;
-  unsigned    m_maxWarpCount ;
-  unsigned    m_maxBlock ;
-  unsigned    m_maxSharedWords ;
-  uint32_t    m_maxConcurrency ;
-  int         m_shmemPerSM ;
-  int         m_maxShmemPerBlock ;
-  int         m_regsPerSM ;
-  int         m_maxBlocksPerSM ;
-  int         m_maxThreadsPerSM ;
-  int         m_maxThreadsPerBlock ;
+  int m_cudaArch;
+  unsigned m_multiProcCount;
+  unsigned m_maxWarpCount;
+  unsigned m_maxBlock;
+  unsigned m_maxSharedWords;
+  uint32_t m_maxConcurrency;
+  int m_shmemPerSM;
+  int m_maxShmemPerBlock;
+  int m_regsPerSM;
+  int m_maxBlocksPerSM;
+  int m_maxThreadsPerSM;
+  int m_maxThreadsPerBlock;
 
-  mutable size_type   m_scratchSpaceCount ;
-  mutable size_type   m_scratchFlagsCount ;
-  mutable size_type   m_scratchUnifiedCount ;
-  mutable size_type   m_scratchFunctorSize ;
-  size_type   m_scratchUnifiedSupported ;
-  size_type   m_streamCount ;
-  mutable size_type * m_scratchSpace ;
-  mutable size_type * m_scratchFlags ;
-  mutable size_type * m_scratchUnified ;
-  mutable size_type * m_scratchFunctor ;
-  uint32_t  * m_scratchConcurrentBitset ;
-  cudaStream_t m_stream ;
+  mutable size_type m_scratchSpaceCount;
+  mutable size_type m_scratchFlagsCount;
+  mutable size_type m_scratchUnifiedCount;
+  mutable size_type m_scratchFunctorSize;
+  size_type m_scratchUnifiedSupported;
+  size_type m_streamCount;
+  mutable size_type* m_scratchSpace;
+  mutable size_type* m_scratchFlags;
+  mutable size_type* m_scratchUnified;
+  mutable size_type* m_scratchFunctor;
+  uint32_t* m_scratchConcurrentBitset;
+  cudaStream_t m_stream;
 
   static int was_initialized;
   static int was_finalized;
 
-  static CudaInternal & singleton();
+  static CudaInternal& singleton();
 
-  int verify_is_initialized( const char * const label ) const ;
+  int verify_is_initialized(const char* const label) const;
 
-  int is_initialized() const
-    { return 0 != m_scratchSpace && 0 != m_scratchFlags ; }
+  int is_initialized() const {
+    return 0 != m_scratchSpace && 0 != m_scratchFlags;
+  }
 
-  void initialize( int cuda_device_id , cudaStream_t stream = 0 );
+  void initialize(int cuda_device_id, cudaStream_t stream = 0);
   void finalize();
 
-  void print_configuration( std::ostream & ) const ;
+  void print_configuration(std::ostream&) const;
 
-  void fence() const ;
+#ifdef KOKKOS_IMPL_DEBUG_CUDA_SERIAL_EXECUTION
+  static bool cuda_use_serial_execution();
+  static void cuda_set_serial_execution(bool);
+#endif
+
+  void fence() const;
 
   ~CudaInternal();
 
   CudaInternal()
-    : m_cudaDev( -1 )
-    , m_cudaArch( -1 )
-    , m_multiProcCount( 0 )
-    , m_maxWarpCount( 0 )
-    , m_maxBlock( 0 )
-    , m_maxSharedWords( 0 )
-    , m_maxConcurrency( 0 )
-    , m_shmemPerSM( 0 )
-    , m_maxShmemPerBlock( 0 )
-    , m_regsPerSM( 0 )
-    , m_maxBlocksPerSM( 0 )
-    , m_maxThreadsPerSM( 0 )
-    , m_maxThreadsPerBlock( 0 )
-    , m_scratchSpaceCount( 0 )
-    , m_scratchFlagsCount( 0 )
-    , m_scratchUnifiedCount( 0 )
-    , m_scratchFunctorSize( 0 )
-    , m_scratchUnifiedSupported( 0 )
-    , m_streamCount( 0 )
-    , m_scratchSpace( 0 )
-    , m_scratchFlags( 0 )
-    , m_scratchUnified( 0 )
-    , m_scratchFunctor( 0 )
-    , m_scratchConcurrentBitset( 0 )
-    , m_stream( 0 )
-    {}
+      : m_cudaDev(-1),
+        m_cudaArch(-1),
+        m_multiProcCount(0),
+        m_maxWarpCount(0),
+        m_maxBlock(0),
+        m_maxSharedWords(0),
+        m_maxConcurrency(0),
+        m_shmemPerSM(0),
+        m_maxShmemPerBlock(0),
+        m_regsPerSM(0),
+        m_maxBlocksPerSM(0),
+        m_maxThreadsPerSM(0),
+        m_maxThreadsPerBlock(0),
+        m_scratchSpaceCount(0),
+        m_scratchFlagsCount(0),
+        m_scratchUnifiedCount(0),
+        m_scratchFunctorSize(0),
+        m_scratchUnifiedSupported(0),
+        m_streamCount(0),
+        m_scratchSpace(0),
+        m_scratchFlags(0),
+        m_scratchUnified(0),
+        m_scratchFunctor(0),
+        m_scratchConcurrentBitset(0),
+        m_stream(0) {}
 
-  size_type * scratch_space( const size_type size ) const ;
-  size_type * scratch_flags( const size_type size ) const ;
-  size_type * scratch_unified( const size_type size ) const ;
-  size_type * scratch_functor( const size_type size ) const ;
+  size_type* scratch_space(const size_type size) const;
+  size_type* scratch_flags(const size_type size) const;
+  size_type* scratch_unified(const size_type size) const;
+  size_type* scratch_functor(const size_type size) const;
 };
 
-} // Namespace Impl
-} // Namespace Kokkos
+}  // Namespace Impl
+}  // Namespace Kokkos
 #endif
diff --git a/lib/kokkos/core/src/Cuda/Kokkos_Cuda_KernelLaunch.hpp b/lib/kokkos/core/src/Cuda/Kokkos_Cuda_KernelLaunch.hpp
index 2ec868c1f1..590fa7a784 100644
--- a/lib/kokkos/core/src/Cuda/Kokkos_Cuda_KernelLaunch.hpp
+++ b/lib/kokkos/core/src/Cuda/Kokkos_Cuda_KernelLaunch.hpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -59,32 +60,32 @@
 //----------------------------------------------------------------------------
 //----------------------------------------------------------------------------
 
-#if defined( __CUDACC__ )
+#if defined(__CUDACC__)
 
 /** \brief  Access to constant memory on the device */
 #ifdef KOKKOS_ENABLE_CUDA_RELOCATABLE_DEVICE_CODE
 
-__device__ __constant__
-extern unsigned long kokkos_impl_cuda_constant_memory_buffer[] ;
+__device__ __constant__ extern unsigned long
+    kokkos_impl_cuda_constant_memory_buffer[];
 
 #else
 
-__device__ __constant__
-unsigned long kokkos_impl_cuda_constant_memory_buffer[ Kokkos::Impl::CudaTraits::ConstantMemoryUsage / sizeof(unsigned long) ] ;
+__device__ __constant__ unsigned long kokkos_impl_cuda_constant_memory_buffer
+    [Kokkos::Impl::CudaTraits::ConstantMemoryUsage / sizeof(unsigned long)];
 
 #endif
 
 namespace Kokkos {
 namespace Impl {
-  void* cuda_resize_scratch_space(std::int64_t bytes, bool force_shrink = false);
-}
+void* cuda_resize_scratch_space(std::int64_t bytes, bool force_shrink = false);
 }
+}  // namespace Kokkos
 
-template< typename T >
-inline
-__device__
-T * kokkos_impl_cuda_shared_memory()
-{ extern __shared__ Kokkos::CudaSpace::size_type sh[]; return (T*) sh ; }
+template <typename T>
+inline __device__ T* kokkos_impl_cuda_shared_memory() {
+  extern __shared__ Kokkos::CudaSpace::size_type sh[];
+  return (T*)sh;
+}
 
 namespace Kokkos {
 namespace Impl {
@@ -100,105 +101,111 @@ namespace Impl {
 // For 2.0 capability: 48 KB L1 and 16 KB shared
 //----------------------------------------------------------------------------
 
-template< class DriverType>
-__global__
-static void cuda_parallel_launch_constant_memory()
-{
-  const DriverType & driver =
-    *((const DriverType *) kokkos_impl_cuda_constant_memory_buffer );
+template <class DriverType>
+__global__ static void cuda_parallel_launch_constant_memory() {
+  const DriverType& driver =
+      *((const DriverType*)kokkos_impl_cuda_constant_memory_buffer);
 
   driver();
 }
 
-template< class DriverType, unsigned int maxTperB, unsigned int minBperSM >
-__global__
-__launch_bounds__(maxTperB, minBperSM)
-static void cuda_parallel_launch_constant_memory()
-{
-  const DriverType & driver =
-    *((const DriverType *) kokkos_impl_cuda_constant_memory_buffer );
+template <class DriverType, unsigned int maxTperB, unsigned int minBperSM>
+__global__ __launch_bounds__(
+    maxTperB, minBperSM) static void cuda_parallel_launch_constant_memory() {
+  const DriverType& driver =
+      *((const DriverType*)kokkos_impl_cuda_constant_memory_buffer);
 
   driver();
 }
 
-template< class DriverType>
-__global__
-static void cuda_parallel_launch_local_memory( const DriverType driver )
-{
+template <class DriverType>
+__global__ static void cuda_parallel_launch_local_memory(
+    const DriverType driver) {
   driver();
 }
 
-template< class DriverType, unsigned int maxTperB, unsigned int minBperSM >
-__global__
-__launch_bounds__(maxTperB, minBperSM)
-static void cuda_parallel_launch_local_memory( const DriverType driver )
-{
+template <class DriverType, unsigned int maxTperB, unsigned int minBperSM>
+__global__ __launch_bounds__(
+    maxTperB,
+    minBperSM) static void cuda_parallel_launch_local_memory(const DriverType
+                                                                 driver) {
   driver();
 }
 
-template< class DriverType>
-__global__
-static void cuda_parallel_launch_global_memory( const DriverType* driver )
-{
+template <class DriverType>
+__global__ static void cuda_parallel_launch_global_memory(
+    const DriverType* driver) {
   driver->operator()();
 }
 
-template< class DriverType, unsigned int maxTperB, unsigned int minBperSM >
-__global__
-__launch_bounds__(maxTperB, minBperSM)
-static void cuda_parallel_launch_global_memory( const DriverType* driver )
-{
+template <class DriverType, unsigned int maxTperB, unsigned int minBperSM>
+__global__ __launch_bounds__(
+    maxTperB,
+    minBperSM) static void cuda_parallel_launch_global_memory(const DriverType*
+                                                                  driver) {
   driver->operator()();
 }
 
-template< class DriverType>
-__global__
-static void cuda_parallel_launch_constant_or_global_memory( const DriverType* driver_ptr )
-{
-  const DriverType & driver = driver_ptr!=NULL ? *driver_ptr :
-    *((const DriverType *) kokkos_impl_cuda_constant_memory_buffer );
+template <class DriverType>
+__global__ static void cuda_parallel_launch_constant_or_global_memory(
+    const DriverType* driver_ptr) {
+  const DriverType& driver =
+      driver_ptr != NULL
+          ? *driver_ptr
+          : *((const DriverType*)kokkos_impl_cuda_constant_memory_buffer);
 
   driver();
 }
 
-template< class DriverType, unsigned int maxTperB, unsigned int minBperSM >
+template <class DriverType, unsigned int maxTperB, unsigned int minBperSM>
 __global__
-__launch_bounds__(maxTperB, minBperSM)
-static void cuda_parallel_launch_constant_or_global_memory( const DriverType* driver_ptr )
-{
-  const DriverType & driver = driver_ptr!=NULL ? *driver_ptr :
-    *((const DriverType *) kokkos_impl_cuda_constant_memory_buffer );
+__launch_bounds__(maxTperB, minBperSM) static void cuda_parallel_launch_constant_or_global_memory(
+    const DriverType* driver_ptr) {
+  const DriverType& driver =
+      driver_ptr != NULL
+          ? *driver_ptr
+          : *((const DriverType*)kokkos_impl_cuda_constant_memory_buffer);
 
   driver();
 }
 
-template< class DriverType >
+template <class DriverType>
 struct DeduceCudaLaunchMechanism {
-  constexpr static const Kokkos::Experimental::WorkItemProperty::HintLightWeight_t light_weight = Kokkos::Experimental::WorkItemProperty::HintLightWeight;
-  constexpr static const Kokkos::Experimental::WorkItemProperty::HintHeavyWeight_t heavy_weight = Kokkos::Experimental::WorkItemProperty::HintHeavyWeight ;
-  constexpr static const typename DriverType::Policy::work_item_property property = typename DriverType::Policy::work_item_property();
+  constexpr static const Kokkos::Experimental::WorkItemProperty::
+      HintLightWeight_t light_weight =
+          Kokkos::Experimental::WorkItemProperty::HintLightWeight;
+  constexpr static const Kokkos::Experimental::WorkItemProperty::
+      HintHeavyWeight_t heavy_weight =
+          Kokkos::Experimental::WorkItemProperty::HintHeavyWeight;
+  constexpr static const typename DriverType::Policy::work_item_property
+      property = typename DriverType::Policy::work_item_property();
 
-  static constexpr const Experimental::CudaLaunchMechanism valid_launch_mechanism =
-      // BuildValidMask
-      (sizeof(DriverType)<CudaTraits::KernelArgumentLimit?
-          Experimental::CudaLaunchMechanism::LocalMemory:Experimental::CudaLaunchMechanism::Default)|
-      (sizeof(DriverType)<CudaTraits::ConstantMemoryUsage?
-          Experimental::CudaLaunchMechanism::ConstantMemory:Experimental::CudaLaunchMechanism::Default)|
+  static constexpr const Experimental::CudaLaunchMechanism
+      valid_launch_mechanism =
+          // BuildValidMask
+      (sizeof(DriverType) < CudaTraits::KernelArgumentLimit
+           ? Experimental::CudaLaunchMechanism::LocalMemory
+           : Experimental::CudaLaunchMechanism::Default) |
+      (sizeof(DriverType) < CudaTraits::ConstantMemoryUsage
+           ? Experimental::CudaLaunchMechanism::ConstantMemory
+           : Experimental::CudaLaunchMechanism::Default) |
       Experimental::CudaLaunchMechanism::GlobalMemory;
 
-  static constexpr const Experimental::CudaLaunchMechanism requested_launch_mechanism =
-      (((property&light_weight)==light_weight)?
-           Experimental::CudaLaunchMechanism::LocalMemory :
-           Experimental::CudaLaunchMechanism::ConstantMemory)
-    | Experimental::CudaLaunchMechanism::GlobalMemory;
+  static constexpr const Experimental::CudaLaunchMechanism
+      requested_launch_mechanism =
+          (((property & light_weight) == light_weight)
+               ? Experimental::CudaLaunchMechanism::LocalMemory
+               : Experimental::CudaLaunchMechanism::ConstantMemory) |
+          Experimental::CudaLaunchMechanism::GlobalMemory;
 
-  static constexpr const Experimental::CudaLaunchMechanism default_launch_mechanism =
-      // BuildValidMask
-      (sizeof(DriverType)<CudaTraits::ConstantMemoryUseThreshold)?
-          Experimental::CudaLaunchMechanism::LocalMemory:(
-      (sizeof(DriverType)<CudaTraits::ConstantMemoryUsage)?
-          Experimental::CudaLaunchMechanism::ConstantMemory:
-          Experimental::CudaLaunchMechanism::GlobalMemory);
+  static constexpr const Experimental::CudaLaunchMechanism
+      default_launch_mechanism =
+          // BuildValidMask
+      (sizeof(DriverType) < CudaTraits::ConstantMemoryUseThreshold)
+          ? Experimental::CudaLaunchMechanism::LocalMemory
+          : ((sizeof(DriverType) < CudaTraits::ConstantMemoryUsage)
+                 ? Experimental::CudaLaunchMechanism::ConstantMemory
+                 : Experimental::CudaLaunchMechanism::GlobalMemory);
 
   //              None                LightWeight    HeavyWeight
   // F<UseT       LCG LCG L  L        LCG  LG L  L    LCG  CG L  C
@@ -206,76 +213,69 @@ struct DeduceCudaLaunchMechanism {
   // Kal<F<CMU     CG LCG C  C         CG  LG C  G     CG  CG C  C
   // CMU<F          G LCG G  G          G  LG G  G      G  CG G  G
   static constexpr const Experimental::CudaLaunchMechanism launch_mechanism =
-      ((property&light_weight)==light_weight)?
-          (sizeof(DriverType)<CudaTraits::KernelArgumentLimit?
-              Experimental::CudaLaunchMechanism::LocalMemory:
-              Experimental::CudaLaunchMechanism::GlobalMemory):(
-        ((property&heavy_weight)==heavy_weight)?
-          (sizeof(DriverType)<CudaTraits::ConstantMemoryUsage?
-              Experimental::CudaLaunchMechanism::ConstantMemory:
-              Experimental::CudaLaunchMechanism::GlobalMemory):
-          (default_launch_mechanism)
-      );
+      ((property & light_weight) == light_weight)
+          ? (sizeof(DriverType) < CudaTraits::KernelArgumentLimit
+                 ? Experimental::CudaLaunchMechanism::LocalMemory
+                 : Experimental::CudaLaunchMechanism::GlobalMemory)
+          : (((property & heavy_weight) == heavy_weight)
+                 ? (sizeof(DriverType) < CudaTraits::ConstantMemoryUsage
+                        ? Experimental::CudaLaunchMechanism::ConstantMemory
+                        : Experimental::CudaLaunchMechanism::GlobalMemory)
+                 : (default_launch_mechanism));
 };
 // Use local memory up to ConstantMemoryUseThreshold
 // Use global memory above ConstantMemoryUsage
 // In between use ConstantMemory
-template < class DriverType
-         , class LaunchBounds = Kokkos::LaunchBounds<>
-         , Experimental::CudaLaunchMechanism LaunchMechanism =
-             DeduceCudaLaunchMechanism<DriverType>::launch_mechanism >
-struct CudaParallelLaunch ;
-
-template < class DriverType
-         , unsigned int MaxThreadsPerBlock
-         , unsigned int MinBlocksPerSM>
-struct CudaParallelLaunch< DriverType
-                         , Kokkos::LaunchBounds< MaxThreadsPerBlock 
-                                               , MinBlocksPerSM >
-                          , Experimental::CudaLaunchMechanism::ConstantMemory>
-{
-  static_assert(sizeof(DriverType)<CudaTraits::ConstantMemoryUsage,"Kokkos Error: Requested CudaLaunchConstantMemory with a Functor larger than 32kB.");
-  inline
-  CudaParallelLaunch( const DriverType & driver
-                    , const dim3       & grid
-                    , const dim3       & block
-                    , const int          shmem
-                    , const CudaInternal* cuda_instance
-                    , const bool prefer_shmem )
-  {
-    if ( (grid.x != 0) && ( ( block.x * block.y * block.z ) != 0 ) ) {
+template <class DriverType, class LaunchBounds = Kokkos::LaunchBounds<>,
+          Experimental::CudaLaunchMechanism LaunchMechanism =
+              DeduceCudaLaunchMechanism<DriverType>::launch_mechanism>
+struct CudaParallelLaunch;
 
+template <class DriverType, unsigned int MaxThreadsPerBlock,
+          unsigned int MinBlocksPerSM>
+struct CudaParallelLaunch<
+    DriverType, Kokkos::LaunchBounds<MaxThreadsPerBlock, MinBlocksPerSM>,
+    Experimental::CudaLaunchMechanism::ConstantMemory> {
+  static_assert(sizeof(DriverType) < CudaTraits::ConstantMemoryUsage,
+                "Kokkos Error: Requested CudaLaunchConstantMemory with a "
+                "Functor larger than 32kB.");
+  inline CudaParallelLaunch(const DriverType& driver, const dim3& grid,
+                            const dim3& block, const int shmem,
+                            const CudaInternal* cuda_instance,
+                            const bool prefer_shmem) {
+    if ((grid.x != 0) && ((block.x * block.y * block.z) != 0)) {
       // Fence before changing settings and copying closure
       Kokkos::Cuda().fence();
 
-      if ( cuda_instance->m_maxShmemPerBlock < shmem ) {
-        Kokkos::Impl::throw_runtime_exception( std::string("CudaParallelLaunch FAILED: shared memory request is too large") );
+      if (cuda_instance->m_maxShmemPerBlock < shmem) {
+        Kokkos::Impl::throw_runtime_exception(std::string(
+            "CudaParallelLaunch FAILED: shared memory request is too large"));
       }
-      #ifndef KOKKOS_ARCH_KEPLER
+#ifndef KOKKOS_ARCH_KEPLER
       // On Kepler the L1 has no benefit since it doesn't cache reads
       else {
-        CUDA_SAFE_CALL(
-          cudaFuncSetCacheConfig
-            ( cuda_parallel_launch_constant_memory
-                < DriverType, MaxThreadsPerBlock, MinBlocksPerSM >
-            , ( prefer_shmem ? cudaFuncCachePreferShared : cudaFuncCachePreferL1 )
-            ) );
+        CUDA_SAFE_CALL(cudaFuncSetCacheConfig(
+            cuda_parallel_launch_constant_memory<DriverType, MaxThreadsPerBlock,
+                                                 MinBlocksPerSM>,
+            (prefer_shmem ? cudaFuncCachePreferShared
+                          : cudaFuncCachePreferL1)));
       }
-      #endif
+#endif
 
       // Copy functor to constant memory on the device
-      cudaMemcpyToSymbolAsync(
-        kokkos_impl_cuda_constant_memory_buffer, &driver, sizeof(DriverType), 0, cudaMemcpyHostToDevice, cudaStream_t(cuda_instance->m_stream));
+      cudaMemcpyToSymbolAsync(kokkos_impl_cuda_constant_memory_buffer, &driver,
+                              sizeof(DriverType), 0, cudaMemcpyHostToDevice,
+                              cudaStream_t(cuda_instance->m_stream));
 
       KOKKOS_ENSURE_CUDA_LOCK_ARRAYS_ON_DEVICE();
 
       // Invoke the driver function on the device
-      cuda_parallel_launch_constant_memory
-        < DriverType, MaxThreadsPerBlock, MinBlocksPerSM >
-          <<< grid , block , shmem , cuda_instance->m_stream >>>();
+      cuda_parallel_launch_constant_memory<DriverType, MaxThreadsPerBlock,
+                                           MinBlocksPerSM>
+          <<<grid, block, shmem, cuda_instance->m_stream>>>();
 
-#if defined( KOKKOS_ENABLE_DEBUG_BOUNDS_CHECK )
-      CUDA_SAFE_CALL( cudaGetLastError() );
+#if defined(KOKKOS_ENABLE_DEBUG_BOUNDS_CHECK)
+      CUDA_SAFE_CALL(cudaGetLastError());
       Kokkos::Cuda().fence();
 #endif
     }
@@ -283,57 +283,55 @@ struct CudaParallelLaunch< DriverType
 
   static cudaFuncAttributes get_cuda_func_attributes() {
     cudaFuncAttributes attr;
-    cudaFuncGetAttributes(&attr,cuda_parallel_launch_constant_memory
-            < DriverType, MaxThreadsPerBlock, MinBlocksPerSM >);
+    CUDA_SAFE_CALL(cudaFuncGetAttributes(
+        &attr,
+        cuda_parallel_launch_constant_memory<DriverType, MaxThreadsPerBlock,
+                                             MinBlocksPerSM>));
     return attr;
   }
 };
 
-template < class DriverType>
-struct CudaParallelLaunch< DriverType
-                         , Kokkos::LaunchBounds<0,0>
-                         , Experimental::CudaLaunchMechanism::ConstantMemory >
-{
-  static_assert(sizeof(DriverType)<CudaTraits::ConstantMemoryUsage,"Kokkos Error: Requested CudaLaunchConstantMemory with a Functor larger than 32kB.");
-  inline
-  CudaParallelLaunch( const DriverType & driver
-                    , const dim3       & grid
-                    , const dim3       & block
-                    , const int          shmem
-                    , const CudaInternal* cuda_instance
-                    , const bool prefer_shmem )
-  {
-    if ( (grid.x != 0) && ( ( block.x * block.y * block.z ) != 0 ) ) {
-
+template <class DriverType>
+struct CudaParallelLaunch<DriverType, Kokkos::LaunchBounds<0, 0>,
+                          Experimental::CudaLaunchMechanism::ConstantMemory> {
+  static_assert(sizeof(DriverType) < CudaTraits::ConstantMemoryUsage,
+                "Kokkos Error: Requested CudaLaunchConstantMemory with a "
+                "Functor larger than 32kB.");
+  inline CudaParallelLaunch(const DriverType& driver, const dim3& grid,
+                            const dim3& block, const int shmem,
+                            const CudaInternal* cuda_instance,
+                            const bool prefer_shmem) {
+    if ((grid.x != 0) && ((block.x * block.y * block.z) != 0)) {
       // Fence before changing settings and copying closure
       Kokkos::Cuda().fence();
 
-      if ( cuda_instance->m_maxShmemPerBlock < shmem ) {
-        Kokkos::Impl::throw_runtime_exception( std::string("CudaParallelLaunch FAILED: shared memory request is too large") );
+      if (cuda_instance->m_maxShmemPerBlock < shmem) {
+        Kokkos::Impl::throw_runtime_exception(std::string(
+            "CudaParallelLaunch FAILED: shared memory request is too large"));
       }
-      #ifndef KOKKOS_ARCH_KEPLER
+#ifndef KOKKOS_ARCH_KEPLER
       // On Kepler the L1 has no benefit since it doesn't cache reads
       else {
-        CUDA_SAFE_CALL(
-          cudaFuncSetCacheConfig
-            ( cuda_parallel_launch_constant_memory< DriverType >
-            , ( prefer_shmem ? cudaFuncCachePreferShared : cudaFuncCachePreferL1 )
-            ) );
+        CUDA_SAFE_CALL(cudaFuncSetCacheConfig(
+            cuda_parallel_launch_constant_memory<DriverType>,
+            (prefer_shmem ? cudaFuncCachePreferShared
+                          : cudaFuncCachePreferL1)));
       }
-      #endif
+#endif
 
       // Copy functor to constant memory on the device
-      cudaMemcpyToSymbolAsync(
-        kokkos_impl_cuda_constant_memory_buffer, &driver, sizeof(DriverType), 0, cudaMemcpyHostToDevice, cudaStream_t(cuda_instance->m_stream));
+      cudaMemcpyToSymbolAsync(kokkos_impl_cuda_constant_memory_buffer, &driver,
+                              sizeof(DriverType), 0, cudaMemcpyHostToDevice,
+                              cudaStream_t(cuda_instance->m_stream));
 
       KOKKOS_ENSURE_CUDA_LOCK_ARRAYS_ON_DEVICE();
 
       // Invoke the driver function on the device
-      cuda_parallel_launch_constant_memory< DriverType >
-          <<< grid , block , shmem , cuda_instance->m_stream >>>();
+      cuda_parallel_launch_constant_memory<DriverType>
+          <<<grid, block, shmem, cuda_instance->m_stream>>>();
 
-#if defined( KOKKOS_ENABLE_DEBUG_BOUNDS_CHECK )
-      CUDA_SAFE_CALL( cudaGetLastError() );
+#if defined(KOKKOS_ENABLE_DEBUG_BOUNDS_CHECK)
+      CUDA_SAFE_CALL(cudaGetLastError());
       Kokkos::Cuda().fence();
 #endif
     }
@@ -341,55 +339,49 @@ struct CudaParallelLaunch< DriverType
 
   static cudaFuncAttributes get_cuda_func_attributes() {
     cudaFuncAttributes attr;
-    cudaFuncGetAttributes(&attr,cuda_parallel_launch_constant_memory
-            < DriverType >);
+    CUDA_SAFE_CALL(cudaFuncGetAttributes(
+        &attr, cuda_parallel_launch_constant_memory<DriverType>));
     return attr;
   }
 };
 
-template < class DriverType
-         , unsigned int MaxThreadsPerBlock
-         , unsigned int MinBlocksPerSM >
-struct CudaParallelLaunch< DriverType
-                         , Kokkos::LaunchBounds< MaxThreadsPerBlock 
-                                               , MinBlocksPerSM >
-                         , Experimental::CudaLaunchMechanism::LocalMemory >
-{
-  static_assert(sizeof(DriverType)<CudaTraits::KernelArgumentLimit,"Kokkos Error: Requested CudaLaunchLocalMemory with a Functor larger than 4096 bytes.");
-  inline
-  CudaParallelLaunch( const DriverType & driver
-                    , const dim3       & grid
-                    , const dim3       & block
-                    , const int          shmem
-                    , const CudaInternal* cuda_instance
-                    , const bool prefer_shmem )
-  {
-    if ( (grid.x != 0) && ( ( block.x * block.y * block.z ) != 0 ) ) {
-
-      if ( cuda_instance->m_maxShmemPerBlock < shmem ) {
-        Kokkos::Impl::throw_runtime_exception( std::string("CudaParallelLaunch FAILED: shared memory request is too large") );
+template <class DriverType, unsigned int MaxThreadsPerBlock,
+          unsigned int MinBlocksPerSM>
+struct CudaParallelLaunch<
+    DriverType, Kokkos::LaunchBounds<MaxThreadsPerBlock, MinBlocksPerSM>,
+    Experimental::CudaLaunchMechanism::LocalMemory> {
+  static_assert(sizeof(DriverType) < CudaTraits::KernelArgumentLimit,
+                "Kokkos Error: Requested CudaLaunchLocalMemory with a Functor "
+                "larger than 4096 bytes.");
+  inline CudaParallelLaunch(const DriverType& driver, const dim3& grid,
+                            const dim3& block, const int shmem,
+                            const CudaInternal* cuda_instance,
+                            const bool prefer_shmem) {
+    if ((grid.x != 0) && ((block.x * block.y * block.z) != 0)) {
+      if (cuda_instance->m_maxShmemPerBlock < shmem) {
+        Kokkos::Impl::throw_runtime_exception(std::string(
+            "CudaParallelLaunch FAILED: shared memory request is too large"));
       }
-      #ifndef KOKKOS_ARCH_KEPLER
+#ifndef KOKKOS_ARCH_KEPLER
       // On Kepler the L1 has no benefit since it doesn't cache reads
       else {
-        CUDA_SAFE_CALL(
-          cudaFuncSetCacheConfig
-            ( cuda_parallel_launch_local_memory
-                < DriverType, MaxThreadsPerBlock, MinBlocksPerSM >
-            , ( prefer_shmem ? cudaFuncCachePreferShared : cudaFuncCachePreferL1 )
-            ) );
+        CUDA_SAFE_CALL(cudaFuncSetCacheConfig(
+            cuda_parallel_launch_local_memory<DriverType, MaxThreadsPerBlock,
+                                              MinBlocksPerSM>,
+            (prefer_shmem ? cudaFuncCachePreferShared
+                          : cudaFuncCachePreferL1)));
       }
-      #endif
+#endif
 
       KOKKOS_ENSURE_CUDA_LOCK_ARRAYS_ON_DEVICE();
 
       // Invoke the driver function on the device
-      cuda_parallel_launch_local_memory
-        < DriverType, MaxThreadsPerBlock, MinBlocksPerSM >
-          <<< grid , block , shmem , cuda_instance->m_stream >>>( driver );
+      cuda_parallel_launch_local_memory<DriverType, MaxThreadsPerBlock,
+                                        MinBlocksPerSM>
+          <<<grid, block, shmem, cuda_instance->m_stream>>>(driver);
 
-#if defined( KOKKOS_ENABLE_DEBUG_BOUNDS_CHECK )
-      CUDA_SAFE_CALL( cudaGetLastError() );
+#if defined(KOKKOS_ENABLE_DEBUG_BOUNDS_CHECK)
+      CUDA_SAFE_CALL(cudaGetLastError());
       Kokkos::Cuda().fence();
 #endif
     }
@@ -397,50 +389,46 @@ struct CudaParallelLaunch< DriverType
 
   static cudaFuncAttributes get_cuda_func_attributes() {
     cudaFuncAttributes attr;
-    cudaFuncGetAttributes(&attr,cuda_parallel_launch_local_memory
-            < DriverType, MaxThreadsPerBlock, MinBlocksPerSM >);
+    CUDA_SAFE_CALL(cudaFuncGetAttributes(
+        &attr, cuda_parallel_launch_local_memory<DriverType, MaxThreadsPerBlock,
+                                                 MinBlocksPerSM>));
     return attr;
   }
 };
 
-template < class DriverType>
-struct CudaParallelLaunch< DriverType
-                         , Kokkos::LaunchBounds<0,0>
-                         , Experimental::CudaLaunchMechanism::LocalMemory >
-{
-  static_assert(sizeof(DriverType)<CudaTraits::KernelArgumentLimit,"Kokkos Error: Requested CudaLaunchLocalMemory with a Functor larger than 4096 bytes.");
-  inline
-  CudaParallelLaunch( const DriverType & driver
-                    , const dim3       & grid
-                    , const dim3       & block
-                    , const int          shmem
-                    , const CudaInternal* cuda_instance
-                    , const bool prefer_shmem)
-  {
-    if ( (grid.x != 0) && ( ( block.x * block.y * block.z ) != 0 ) ) {
-
-      if ( cuda_instance->m_maxShmemPerBlock < shmem ) {
-        Kokkos::Impl::throw_runtime_exception( std::string("CudaParallelLaunch FAILED: shared memory request is too large") );
+template <class DriverType>
+struct CudaParallelLaunch<DriverType, Kokkos::LaunchBounds<0, 0>,
+                          Experimental::CudaLaunchMechanism::LocalMemory> {
+  static_assert(sizeof(DriverType) < CudaTraits::KernelArgumentLimit,
+                "Kokkos Error: Requested CudaLaunchLocalMemory with a Functor "
+                "larger than 4096 bytes.");
+  inline CudaParallelLaunch(const DriverType& driver, const dim3& grid,
+                            const dim3& block, const int shmem,
+                            const CudaInternal* cuda_instance,
+                            const bool prefer_shmem) {
+    if ((grid.x != 0) && ((block.x * block.y * block.z) != 0)) {
+      if (cuda_instance->m_maxShmemPerBlock < shmem) {
+        Kokkos::Impl::throw_runtime_exception(std::string(
+            "CudaParallelLaunch FAILED: shared memory request is too large"));
       }
-      #ifndef KOKKOS_ARCH_KEPLER
+#ifndef KOKKOS_ARCH_KEPLER
       // On Kepler the L1 has no benefit since it doesn't cache reads
       else {
-        CUDA_SAFE_CALL(
-          cudaFuncSetCacheConfig
-            ( cuda_parallel_launch_local_memory< DriverType >
-            , ( prefer_shmem ? cudaFuncCachePreferShared : cudaFuncCachePreferL1 )
-            ) );
+        CUDA_SAFE_CALL(cudaFuncSetCacheConfig(
+            cuda_parallel_launch_local_memory<DriverType>,
+            (prefer_shmem ? cudaFuncCachePreferShared
+                          : cudaFuncCachePreferL1)));
       }
-      #endif
+#endif
 
       KOKKOS_ENSURE_CUDA_LOCK_ARRAYS_ON_DEVICE();
 
       // Invoke the driver function on the device
-      cuda_parallel_launch_local_memory< DriverType >
-          <<< grid , block , shmem , cuda_instance->m_stream >>>( driver );
+      cuda_parallel_launch_local_memory<DriverType>
+          <<<grid, block, shmem, cuda_instance->m_stream>>>(driver);
 
-#if defined( KOKKOS_ENABLE_DEBUG_BOUNDS_CHECK )
-      CUDA_SAFE_CALL( cudaGetLastError() );
+#if defined(KOKKOS_ENABLE_DEBUG_BOUNDS_CHECK)
+      CUDA_SAFE_CALL(cudaGetLastError());
       Kokkos::Cuda().fence();
 #endif
     }
@@ -448,111 +436,101 @@ struct CudaParallelLaunch< DriverType
 
   static cudaFuncAttributes get_cuda_func_attributes() {
     cudaFuncAttributes attr;
-    cudaFuncGetAttributes(&attr,cuda_parallel_launch_local_memory
-            < DriverType >);
+    CUDA_SAFE_CALL(cudaFuncGetAttributes(
+        &attr, cuda_parallel_launch_local_memory<DriverType>));
     return attr;
   }
 };
 
-template < class DriverType
-         , unsigned int MaxThreadsPerBlock
-         , unsigned int MinBlocksPerSM>
-struct CudaParallelLaunch< DriverType
-                         , Kokkos::LaunchBounds< MaxThreadsPerBlock
-                                               , MinBlocksPerSM>
-                         , Experimental::CudaLaunchMechanism::GlobalMemory >
-{
-  inline
-  CudaParallelLaunch( const DriverType & driver
-                    , const dim3       & grid
-                    , const dim3       & block
-                    , const int          shmem
-                    , CudaInternal* cuda_instance
-                    , const bool prefer_shmem )
-  {
-    if ( (grid.x != 0) && ( ( block.x * block.y * block.z ) != 0 ) ) {
-
-      if ( cuda_instance->m_maxShmemPerBlock < shmem ) {
-        Kokkos::Impl::throw_runtime_exception( std::string("CudaParallelLaunch FAILED: shared memory request is too large") );
+template <class DriverType, unsigned int MaxThreadsPerBlock,
+          unsigned int MinBlocksPerSM>
+struct CudaParallelLaunch<
+    DriverType, Kokkos::LaunchBounds<MaxThreadsPerBlock, MinBlocksPerSM>,
+    Experimental::CudaLaunchMechanism::GlobalMemory> {
+  inline CudaParallelLaunch(const DriverType& driver, const dim3& grid,
+                            const dim3& block, const int shmem,
+                            CudaInternal* cuda_instance,
+                            const bool prefer_shmem) {
+    if ((grid.x != 0) && ((block.x * block.y * block.z) != 0)) {
+      if (cuda_instance->m_maxShmemPerBlock < shmem) {
+        Kokkos::Impl::throw_runtime_exception(std::string(
+            "CudaParallelLaunch FAILED: shared memory request is too large"));
       }
-      #ifndef KOKKOS_ARCH_KEPLER
+#ifndef KOKKOS_ARCH_KEPLER
       // On Kepler the L1 has no benefit since it doesn't cache reads
       else {
-        CUDA_SAFE_CALL(
-          cudaFuncSetCacheConfig
-            ( cuda_parallel_launch_global_memory
-                < DriverType, MaxThreadsPerBlock, MinBlocksPerSM >
-            , ( prefer_shmem ? cudaFuncCachePreferShared : cudaFuncCachePreferL1 )
-            ) );
+        CUDA_SAFE_CALL(cudaFuncSetCacheConfig(
+            cuda_parallel_launch_global_memory<DriverType, MaxThreadsPerBlock,
+                                               MinBlocksPerSM>,
+            (prefer_shmem ? cudaFuncCachePreferShared
+                          : cudaFuncCachePreferL1)));
       }
-      #endif
+#endif
 
       KOKKOS_ENSURE_CUDA_LOCK_ARRAYS_ON_DEVICE();
 
       DriverType* driver_ptr = NULL;
-      driver_ptr = reinterpret_cast<DriverType*>(cuda_instance->scratch_functor(sizeof(DriverType)));
-      cudaMemcpyAsync(driver_ptr,&driver, sizeof(DriverType), cudaMemcpyDefault, cuda_instance->m_stream);
+      driver_ptr             = reinterpret_cast<DriverType*>(
+          cuda_instance->scratch_functor(sizeof(DriverType)));
+      cudaMemcpyAsync(driver_ptr, &driver, sizeof(DriverType),
+                      cudaMemcpyDefault, cuda_instance->m_stream);
 
       // Invoke the driver function on the device
-      cuda_parallel_launch_global_memory
-        < DriverType, MaxThreadsPerBlock, MinBlocksPerSM >
-          <<< grid , block , shmem , cuda_instance->m_stream >>>( driver_ptr );
+      cuda_parallel_launch_global_memory<DriverType, MaxThreadsPerBlock,
+                                         MinBlocksPerSM>
+          <<<grid, block, shmem, cuda_instance->m_stream>>>(driver_ptr);
 
-#if defined( KOKKOS_ENABLE_DEBUG_BOUNDS_CHECK )
-      CUDA_SAFE_CALL( cudaGetLastError() );
+#if defined(KOKKOS_ENABLE_DEBUG_BOUNDS_CHECK)
+      CUDA_SAFE_CALL(cudaGetLastError());
       Kokkos::Cuda().fence();
 #endif
     }
   }
   static cudaFuncAttributes get_cuda_func_attributes() {
     cudaFuncAttributes attr;
-    cudaFuncGetAttributes(&attr,cuda_parallel_launch_global_memory
-            < DriverType, MaxThreadsPerBlock, MinBlocksPerSM >);
+    CUDA_SAFE_CALL(cudaFuncGetAttributes(
+        &attr,
+        cuda_parallel_launch_global_memory<DriverType, MaxThreadsPerBlock,
+                                           MinBlocksPerSM>));
     return attr;
   }
-
 };
 
-template < class DriverType>
-struct CudaParallelLaunch< DriverType
-                         , Kokkos::LaunchBounds<0,0>
-                         , Experimental::CudaLaunchMechanism::GlobalMemory >
-{
-  inline
-  CudaParallelLaunch( const DriverType & driver
-                    , const dim3       & grid
-                    , const dim3       & block
-                    , const int          shmem
-                    , CudaInternal* cuda_instance
-                    , const bool prefer_shmem)
-  {
-    if ( (grid.x != 0) && ( ( block.x * block.y * block.z ) != 0 ) ) {
-
-      if ( cuda_instance->m_maxShmemPerBlock < shmem ) {
-        Kokkos::Impl::throw_runtime_exception( std::string("CudaParallelLaunch FAILED: shared memory request is too large") );
+template <class DriverType>
+struct CudaParallelLaunch<DriverType, Kokkos::LaunchBounds<0, 0>,
+                          Experimental::CudaLaunchMechanism::GlobalMemory> {
+  inline CudaParallelLaunch(const DriverType& driver, const dim3& grid,
+                            const dim3& block, const int shmem,
+                            CudaInternal* cuda_instance,
+                            const bool prefer_shmem) {
+    if ((grid.x != 0) && ((block.x * block.y * block.z) != 0)) {
+      if (cuda_instance->m_maxShmemPerBlock < shmem) {
+        Kokkos::Impl::throw_runtime_exception(std::string(
+            "CudaParallelLaunch FAILED: shared memory request is too large"));
       }
-      #ifndef KOKKOS_ARCH_KEPLER
+#ifndef KOKKOS_ARCH_KEPLER
       // On Kepler the L1 has no benefit since it doesn't cache reads
       else {
-        CUDA_SAFE_CALL(
-          cudaFuncSetCacheConfig
-            ( cuda_parallel_launch_global_memory< DriverType >
-            , ( prefer_shmem ? cudaFuncCachePreferShared : cudaFuncCachePreferL1 )
-            ) );
+        CUDA_SAFE_CALL(cudaFuncSetCacheConfig(
+            cuda_parallel_launch_global_memory<DriverType>,
+            (prefer_shmem ? cudaFuncCachePreferShared
+                          : cudaFuncCachePreferL1)));
       }
-      #endif
+#endif
 
       KOKKOS_ENSURE_CUDA_LOCK_ARRAYS_ON_DEVICE();
 
       DriverType* driver_ptr = NULL;
-      driver_ptr = reinterpret_cast<DriverType*>(cuda_instance->scratch_functor(sizeof(DriverType)));
-      cudaMemcpyAsync(driver_ptr,&driver, sizeof(DriverType), cudaMemcpyDefault, cuda_instance->m_stream);
+      driver_ptr             = reinterpret_cast<DriverType*>(
+          cuda_instance->scratch_functor(sizeof(DriverType)));
+      cudaMemcpyAsync(driver_ptr, &driver, sizeof(DriverType),
+                      cudaMemcpyDefault, cuda_instance->m_stream);
 
-      cuda_parallel_launch_global_memory< DriverType >
-          <<< grid , block , shmem , cuda_instance->m_stream >>>( driver_ptr );
+      cuda_parallel_launch_global_memory<DriverType>
+          <<<grid, block, shmem, cuda_instance->m_stream>>>(driver_ptr);
 
-#if defined( KOKKOS_ENABLE_DEBUG_BOUNDS_CHECK )
-      CUDA_SAFE_CALL( cudaGetLastError() );
+#if defined(KOKKOS_ENABLE_DEBUG_BOUNDS_CHECK)
+      CUDA_SAFE_CALL(cudaGetLastError());
       Kokkos::Cuda().fence();
 #endif
     }
@@ -560,15 +538,15 @@ struct CudaParallelLaunch< DriverType
 
   static cudaFuncAttributes get_cuda_func_attributes() {
     cudaFuncAttributes attr;
-    cudaFuncGetAttributes(&attr,cuda_parallel_launch_global_memory
-            < DriverType >);
+    CUDA_SAFE_CALL(cudaFuncGetAttributes(
+        &attr, cuda_parallel_launch_global_memory<DriverType>));
     return attr;
   }
 };
 //----------------------------------------------------------------------------
 
-} // namespace Impl
-} // namespace Kokkos
+}  // namespace Impl
+}  // namespace Kokkos
 
 //----------------------------------------------------------------------------
 //----------------------------------------------------------------------------
@@ -576,4 +554,3 @@ struct CudaParallelLaunch< DriverType
 #endif /* defined( __CUDACC__ ) */
 #endif /* defined( KOKKOS_ENABLE_CUDA ) */
 #endif /* #ifndef KOKKOS_CUDAEXEC_HPP */
-
diff --git a/lib/kokkos/core/src/Cuda/Kokkos_Cuda_Locks.cpp b/lib/kokkos/core/src/Cuda/Kokkos_Cuda_Locks.cpp
index f1828ea2de..07dadb3c16 100644
--- a/lib/kokkos/core/src/Cuda/Kokkos_Cuda_Locks.cpp
+++ b/lib/kokkos/core/src/Cuda/Kokkos_Cuda_Locks.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -52,10 +53,10 @@
 #ifdef KOKKOS_ENABLE_CUDA_RELOCATABLE_DEVICE_CODE
 namespace Kokkos {
 namespace Impl {
-__device__ __constant__
-CudaLockArrays g_device_cuda_lock_arrays = { nullptr, nullptr, 0 };
-}
+__device__ __constant__ CudaLockArrays g_device_cuda_lock_arrays = {nullptr,
+                                                                    nullptr, 0};
 }
+}  // namespace Kokkos
 #endif
 
 namespace Kokkos {
@@ -63,36 +64,38 @@ namespace Kokkos {
 namespace {
 
 __global__ void init_lock_array_kernel_atomic() {
-  unsigned i = blockIdx.x*blockDim.x + threadIdx.x;
-  if(i<CUDA_SPACE_ATOMIC_MASK+1) {
+  unsigned i = blockIdx.x * blockDim.x + threadIdx.x;
+  if (i < CUDA_SPACE_ATOMIC_MASK + 1) {
     Kokkos::Impl::g_device_cuda_lock_arrays.atomic[i] = 0;
   }
 }
 
 __global__ void init_lock_array_kernel_threadid(int N) {
-  unsigned i = blockIdx.x*blockDim.x + threadIdx.x;
-  if(i<(unsigned)N) {
+  unsigned i = blockIdx.x * blockDim.x + threadIdx.x;
+  if (i < (unsigned)N) {
     Kokkos::Impl::g_device_cuda_lock_arrays.scratch[i] = 0;
   }
 }
 
-} // namespace
+}  // namespace
 
 namespace Impl {
 
-CudaLockArrays g_host_cuda_lock_arrays = { nullptr, nullptr, 0 };
+CudaLockArrays g_host_cuda_lock_arrays = {nullptr, nullptr, 0};
 
 void initialize_host_cuda_lock_arrays() {
   if (g_host_cuda_lock_arrays.atomic != nullptr) return;
   CUDA_SAFE_CALL(cudaMalloc(&g_host_cuda_lock_arrays.atomic,
-                 sizeof(int)*(CUDA_SPACE_ATOMIC_MASK+1)));
+                            sizeof(int) * (CUDA_SPACE_ATOMIC_MASK + 1)));
   CUDA_SAFE_CALL(cudaMalloc(&g_host_cuda_lock_arrays.scratch,
-                 sizeof(int)*(Cuda::concurrency())));
+                            sizeof(int) * (Cuda::concurrency())));
   CUDA_SAFE_CALL(cudaDeviceSynchronize());
   g_host_cuda_lock_arrays.n = Cuda::concurrency();
   KOKKOS_COPY_CUDA_LOCK_ARRAYS_TO_DEVICE();
-  init_lock_array_kernel_atomic<<<(CUDA_SPACE_ATOMIC_MASK+1+255)/256,256>>>();
-  init_lock_array_kernel_threadid<<<(Kokkos::Cuda::concurrency()+255)/256,256>>>(Kokkos::Cuda::concurrency());
+  init_lock_array_kernel_atomic<<<(CUDA_SPACE_ATOMIC_MASK + 1 + 255) / 256,
+                                  256>>>();
+  init_lock_array_kernel_threadid<<<(Kokkos::Cuda::concurrency() + 255) / 256,
+                                    256>>>(Kokkos::Cuda::concurrency());
   CUDA_SAFE_CALL(cudaDeviceSynchronize());
 }
 
@@ -102,15 +105,15 @@ void finalize_host_cuda_lock_arrays() {
   g_host_cuda_lock_arrays.atomic = nullptr;
   cudaFree(g_host_cuda_lock_arrays.scratch);
   g_host_cuda_lock_arrays.scratch = nullptr;
-  g_host_cuda_lock_arrays.n = 0;
+  g_host_cuda_lock_arrays.n       = 0;
 #ifdef KOKKOS_ENABLE_CUDA_RELOCATABLE_DEVICE_CODE
   KOKKOS_COPY_CUDA_LOCK_ARRAYS_TO_DEVICE();
 #endif
 }
 
-} // namespace Impl
+}  // namespace Impl
 
-} // namespace Kokkos
+}  // namespace Kokkos
 
 #else
 
diff --git a/lib/kokkos/core/src/Cuda/Kokkos_Cuda_Locks.hpp b/lib/kokkos/core/src/Cuda/Kokkos_Cuda_Locks.hpp
index 8363a45662..a4b5d08ccf 100644
--- a/lib/kokkos/core/src/Cuda/Kokkos_Cuda_Locks.hpp
+++ b/lib/kokkos/core/src/Cuda/Kokkos_Cuda_Locks.hpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -63,7 +64,7 @@ struct CudaLockArrays {
 
 /// \brief This global variable in Host space is the central definition
 ///        of these arrays.
-extern Kokkos::Impl::CudaLockArrays g_host_cuda_lock_arrays ;
+extern Kokkos::Impl::CudaLockArrays g_host_cuda_lock_arrays;
 
 /// \brief After this call, the g_host_cuda_lock_arrays variable has
 ///        valid, initialized arrays.
@@ -77,10 +78,10 @@ void initialize_host_cuda_lock_arrays();
 /// This call is idempotent.
 void finalize_host_cuda_lock_arrays();
 
-} // namespace Impl
-} // namespace Kokkos
+}  // namespace Impl
+}  // namespace Kokkos
 
-#if defined( __CUDACC__ )
+#if defined(__CUDACC__)
 
 namespace Kokkos {
 namespace Impl {
@@ -106,73 +107,70 @@ namespace Impl {
 /// That is the purpose of the KOKKOS_ENSURE_CUDA_LOCK_ARRAYS_ON_DEVICE macro.
 __device__
 #ifdef KOKKOS_ENABLE_CUDA_RELOCATABLE_DEVICE_CODE
-__constant__
-extern
+    __constant__ extern
 #endif
-Kokkos::Impl::CudaLockArrays g_device_cuda_lock_arrays ;
+    Kokkos::Impl::CudaLockArrays g_device_cuda_lock_arrays;
 
 #define CUDA_SPACE_ATOMIC_MASK 0x1FFFF
 
-/// \brief Aquire a lock for the address
+/// \brief Acquire a lock for the address
 ///
-/// This function tries to aquire the lock for the hash value derived
-/// from the provided ptr. If the lock is successfully aquired the
+/// This function tries to acquire the lock for the hash value derived
+/// from the provided ptr. If the lock is successfully acquired the
 /// function returns true. Otherwise it returns false.
-__device__ inline
-bool lock_address_cuda_space(void* ptr) {
+__device__ inline bool lock_address_cuda_space(void* ptr) {
   size_t offset = size_t(ptr);
-  offset = offset >> 2;
-  offset = offset & CUDA_SPACE_ATOMIC_MASK;
-  return (0 == atomicCAS(&Kokkos::Impl::g_device_cuda_lock_arrays.atomic[offset],0,1));
+  offset        = offset >> 2;
+  offset        = offset & CUDA_SPACE_ATOMIC_MASK;
+  return (
+      0 ==
+      atomicCAS(&Kokkos::Impl::g_device_cuda_lock_arrays.atomic[offset], 0, 1));
 }
 
 /// \brief Release lock for the address
 ///
 /// This function releases the lock for the hash value derived
 /// from the provided ptr. This function should only be called
-/// after previously successfully aquiring a lock with
+/// after previously successfully acquiring a lock with
 /// lock_address.
-__device__ inline
-void unlock_address_cuda_space(void* ptr) {
+__device__ inline void unlock_address_cuda_space(void* ptr) {
   size_t offset = size_t(ptr);
-  offset = offset >> 2;
-  offset = offset & CUDA_SPACE_ATOMIC_MASK;
-  atomicExch( &Kokkos::Impl::g_device_cuda_lock_arrays.atomic[ offset ], 0);
+  offset        = offset >> 2;
+  offset        = offset & CUDA_SPACE_ATOMIC_MASK;
+  atomicExch(&Kokkos::Impl::g_device_cuda_lock_arrays.atomic[offset], 0);
 }
 
-} // namespace Impl
-} // namespace Kokkos
+}  // namespace Impl
+}  // namespace Kokkos
 
 // Make lock_array_copied an explicit translation unit scope thingy
 namespace Kokkos {
 namespace Impl {
 namespace {
-  static int lock_array_copied = 0;
-  inline int eliminate_warning_for_lock_array() {
-    return lock_array_copied;
-  }
-}
-}
-}
+static int lock_array_copied = 0;
+inline int eliminate_warning_for_lock_array() { return lock_array_copied; }
+}  // namespace
+}  // namespace Impl
+}  // namespace Kokkos
 /* Dan Ibanez: it is critical that this code be a macro, so that it will
    capture the right address for Kokkos::Impl::g_device_cuda_lock_arrays!
    putting this in an inline function will NOT do the right thing! */
-#define KOKKOS_COPY_CUDA_LOCK_ARRAYS_TO_DEVICE() \
-{ \
-  if(::Kokkos::Impl::lock_array_copied == 0) { \
-    CUDA_SAFE_CALL(cudaMemcpyToSymbol( \
-        Kokkos::Impl::g_device_cuda_lock_arrays , \
-        & Kokkos::Impl::g_host_cuda_lock_arrays , \
-        sizeof(Kokkos::Impl::CudaLockArrays) ) ); \
-  } \
-  lock_array_copied = 1; \
-  \
-}
+#define KOKKOS_COPY_CUDA_LOCK_ARRAYS_TO_DEVICE()                      \
+  {                                                                   \
+    if (::Kokkos::Impl::lock_array_copied == 0) {                     \
+      CUDA_SAFE_CALL(                                                 \
+          cudaMemcpyToSymbol(Kokkos::Impl::g_device_cuda_lock_arrays, \
+                             &Kokkos::Impl::g_host_cuda_lock_arrays,  \
+                             sizeof(Kokkos::Impl::CudaLockArrays)));  \
+    }                                                                 \
+    lock_array_copied = 1;                                            \
+  }
 
 #ifdef KOKKOS_ENABLE_CUDA_RELOCATABLE_DEVICE_CODE
 #define KOKKOS_ENSURE_CUDA_LOCK_ARRAYS_ON_DEVICE()
 #else
-#define KOKKOS_ENSURE_CUDA_LOCK_ARRAYS_ON_DEVICE() KOKKOS_COPY_CUDA_LOCK_ARRAYS_TO_DEVICE()
+#define KOKKOS_ENSURE_CUDA_LOCK_ARRAYS_ON_DEVICE() \
+  KOKKOS_COPY_CUDA_LOCK_ARRAYS_TO_DEVICE()
 #endif
 
 #endif /* defined( __CUDACC__ ) */
diff --git a/lib/kokkos/core/src/Cuda/Kokkos_Cuda_Parallel.hpp b/lib/kokkos/core/src/Cuda/Kokkos_Cuda_Parallel.hpp
index c05fbcc6c1..78db807478 100644
--- a/lib/kokkos/core/src/Cuda/Kokkos_Cuda_Parallel.hpp
+++ b/lib/kokkos/core/src/Cuda/Kokkos_Cuda_Parallel.hpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -45,7 +46,7 @@
 #define KOKKOS_CUDA_PARALLEL_HPP
 
 #include <Kokkos_Macros.hpp>
-#if defined( __CUDACC__ ) && defined( KOKKOS_ENABLE_CUDA )
+#if defined(__CUDACC__) && defined(KOKKOS_ENABLE_CUDA)
 
 #include <iostream>
 #include <algorithm>
@@ -78,202 +79,223 @@ extern bool show_warnings() noexcept;
 
 namespace Impl {
 
-template< class ... Properties >
-class TeamPolicyInternal< Kokkos::Cuda , Properties ... >: public PolicyTraits<Properties ... >
-{
-public:
-
+template <class... Properties>
+class TeamPolicyInternal<Kokkos::Cuda, Properties...>
+    : public PolicyTraits<Properties...> {
+ public:
   //! Tag this class as a kokkos execution policy
-  typedef TeamPolicyInternal      execution_policy ;
+  typedef TeamPolicyInternal execution_policy;
 
-  typedef PolicyTraits<Properties ... > traits;
+  typedef PolicyTraits<Properties...> traits;
 
-  template< class ExecSpace, class ... OtherProperties >
+  template <class ExecSpace, class... OtherProperties>
   friend class TeamPolicyInternal;
 
-private:
-
+ private:
   enum { MAX_WARP = 8 };
 
   typename traits::execution_space m_space;
-  int m_league_size ;
-  int m_team_size ;
-  int m_vector_length ;
-  int m_team_scratch_size[2] ;
-  int m_thread_scratch_size[2] ;
+  int m_league_size;
+  int m_team_size;
+  int m_vector_length;
+  int m_team_scratch_size[2];
+  int m_thread_scratch_size[2];
   int m_chunk_size;
 
-public:
-
+ public:
   //! Execution space of this execution policy
-  typedef Kokkos::Cuda  execution_space ;
+  typedef Kokkos::Cuda execution_space;
 
-  template<class ... OtherProperties>
-  TeamPolicyInternal( const TeamPolicyInternal<OtherProperties...>& p ) {
-    m_league_size = p.m_league_size;
-    m_team_size = p.m_team_size;
-    m_vector_length = p.m_vector_length;
-    m_team_scratch_size[0] = p.m_team_scratch_size[0];
-    m_team_scratch_size[1] = p.m_team_scratch_size[1];
+  template <class... OtherProperties>
+  TeamPolicyInternal(const TeamPolicyInternal<OtherProperties...>& p) {
+    m_league_size            = p.m_league_size;
+    m_team_size              = p.m_team_size;
+    m_vector_length          = p.m_vector_length;
+    m_team_scratch_size[0]   = p.m_team_scratch_size[0];
+    m_team_scratch_size[1]   = p.m_team_scratch_size[1];
     m_thread_scratch_size[0] = p.m_thread_scratch_size[0];
     m_thread_scratch_size[1] = p.m_thread_scratch_size[1];
-    m_chunk_size = p.m_chunk_size;
-    m_space = p.m_space;
+    m_chunk_size             = p.m_chunk_size;
+    m_space                  = p.m_space;
   }
 
-  TeamPolicyInternal& operator = (const TeamPolicyInternal& p) {
-    m_league_size = p.m_league_size;
-    m_team_size = p.m_team_size;
-    m_vector_length = p.m_vector_length;
-    m_team_scratch_size[0] = p.m_team_scratch_size[0];
-    m_team_scratch_size[1] = p.m_team_scratch_size[1];
+  TeamPolicyInternal& operator=(const TeamPolicyInternal& p) {
+    m_league_size            = p.m_league_size;
+    m_team_size              = p.m_team_size;
+    m_vector_length          = p.m_vector_length;
+    m_team_scratch_size[0]   = p.m_team_scratch_size[0];
+    m_team_scratch_size[1]   = p.m_team_scratch_size[1];
     m_thread_scratch_size[0] = p.m_thread_scratch_size[0];
     m_thread_scratch_size[1] = p.m_thread_scratch_size[1];
-    m_chunk_size = p.m_chunk_size;
-    m_space = p.m_space;
+    m_chunk_size             = p.m_chunk_size;
+    m_space                  = p.m_space;
     return *this;
   }
 
   //----------------------------------------
 
 #ifdef KOKKOS_ENABLE_DEPRECATED_CODE
-  template< class FunctorType >
-  static inline
-  int team_size_max( const FunctorType & functor )
-    {
-      int n = MAX_WARP * Impl::CudaTraits::WarpSize ;
+  template <class FunctorType>
+  static inline int team_size_max(const FunctorType& functor) {
+    int n = MAX_WARP * Impl::CudaTraits::WarpSize;
 
-      for ( ; n ; n >>= 1 ) {
-        const int shmem_size =
-          /* for global reduce */ Impl::cuda_single_inter_block_reduce_scan_shmem<false,FunctorType,typename traits::work_tag>( functor , n )
-          /* for team   reduce */ + ( n + 2 ) * sizeof(double)
-          /* for team   shared */ + Impl::FunctorTeamShmemSize< FunctorType >::value( functor , n );
+    for (; n; n >>= 1) {
+      const int shmem_size =
+          /* for global reduce */ Impl::
+              cuda_single_inter_block_reduce_scan_shmem<
+                  false, FunctorType, typename traits::work_tag>(functor, n)
+          /* for team   reduce */
+          + (n + 2) * sizeof(double)
+          /* for team   shared */
+          + Impl::FunctorTeamShmemSize<FunctorType>::value(functor, n);
 
-        if ( shmem_size < typename traits::execution_space().impl_internal_space_instance()->m_maxShmemPerBlock ) break ;
-      }
-
-      return n ;
+      if (shmem_size < typename traits::execution_space()
+                           .impl_internal_space_instance()
+                           ->m_maxShmemPerBlock)
+        break;
     }
+
+    return n;
+  }
 #endif
 
-  template<class FunctorType>
-  int team_size_max( const FunctorType& f, const ParallelForTag& ) const {
-    typedef Impl::ParallelFor< FunctorType , TeamPolicy<Properties...> > closure_type;
-    cudaFuncAttributes attr = CudaParallelLaunch< closure_type, typename traits::launch_bounds >::
-        get_cuda_func_attributes();
-    int block_size = Kokkos::Impl::cuda_get_max_block_size< FunctorType, typename traits::launch_bounds >( 
-        space().impl_internal_space_instance(),attr,f ,(size_t) vector_length(),
-        (size_t) team_scratch_size(0) + 2*sizeof(double), (size_t) thread_scratch_size(0) + sizeof(double) );
-    return block_size/vector_length();
+  template <class FunctorType>
+  int team_size_max(const FunctorType& f, const ParallelForTag&) const {
+    typedef Impl::ParallelFor<FunctorType, TeamPolicy<Properties...>>
+        closure_type;
+    cudaFuncAttributes attr =
+        CudaParallelLaunch<closure_type, typename traits::launch_bounds>::
+            get_cuda_func_attributes();
+    int block_size =
+        Kokkos::Impl::cuda_get_max_block_size<FunctorType,
+                                              typename traits::launch_bounds>(
+            space().impl_internal_space_instance(), attr, f,
+            (size_t)vector_length(),
+            (size_t)team_scratch_size(0) + 2 * sizeof(double),
+            (size_t)thread_scratch_size(0) + sizeof(double));
+    return block_size / vector_length();
   }
 
-  template<class FunctorType>
-  int team_size_max( const FunctorType& f, const ParallelReduceTag& ) const {
-    typedef Impl::FunctorAnalysis<Impl::FunctorPatternInterface::REDUCE,TeamPolicyInternal,FunctorType> functor_analysis_type;
-    typedef typename Impl::ParallelReduceReturnValue<void,typename functor_analysis_type::value_type,FunctorType>::reducer_type reducer_type;
-    typedef Impl::ParallelReduce< FunctorType , TeamPolicy<Properties...>, reducer_type > closure_type;
-    typedef Impl::FunctorValueTraits< FunctorType , typename traits::work_tag > functor_value_traits;
+  template <class FunctorType>
+  inline int team_size_max(const FunctorType& f,
+                           const ParallelReduceTag&) const {
+    typedef Impl::FunctorAnalysis<Impl::FunctorPatternInterface::REDUCE,
+                                  TeamPolicyInternal, FunctorType>
+        functor_analysis_type;
+    typedef typename Impl::ParallelReduceReturnValue<
+        void, typename functor_analysis_type::value_type,
+        FunctorType>::reducer_type reducer_type;
+    typedef Impl::ParallelReduce<FunctorType, TeamPolicy<Properties...>,
+                                 reducer_type>
+        closure_type;
+    return internal_team_size_max<closure_type>(f);
+  }
 
-    cudaFuncAttributes attr = CudaParallelLaunch< closure_type, typename traits::launch_bounds >::
-        get_cuda_func_attributes();
-    int block_size = Kokkos::Impl::cuda_get_max_block_size< FunctorType, typename traits::launch_bounds >( 
-        space().impl_internal_space_instance(),attr,f ,(size_t) vector_length(),
-        (size_t) team_scratch_size(0) + 2*sizeof(double), (size_t) thread_scratch_size(0) + sizeof(double) +
-                                                          ((functor_value_traits::StaticValueSize!=0)?0:functor_value_traits::value_size( f )));
-
-    // Currently we require Power-of-2 team size for reductions.
-    int p2 = 1;
-    while(p2<=block_size) p2*=2;
-    p2/=2;
-    return p2/vector_length();
+  template <class FunctorType, class ReducerType>
+  inline int team_size_max(const FunctorType& f, const ReducerType& r,
+                           const ParallelReduceTag&) const {
+    using closure_type =
+        Impl::ParallelReduce<FunctorType, TeamPolicy<Properties...>,
+                             ReducerType>;
+    return internal_team_size_max<closure_type>(f);
   }
 
 #ifdef KOKKOS_ENABLE_DEPRECATED_CODE
-  template< class FunctorType >
-  static int team_size_recommended( const FunctorType & functor )
-    { return team_size_max( functor ); }
+  template <class FunctorType>
+  static int team_size_recommended(const FunctorType& functor) {
+    return team_size_max(functor);
+  }
 
-  template< class FunctorType >
-  static int team_size_recommended( const FunctorType & functor , const int vector_length)
-    {
-      int max = team_size_max( functor )/vector_length;
-      if(max<1) max = 1;
-      return max;
-    }
+  template <class FunctorType>
+  static int team_size_recommended(const FunctorType& functor,
+                                   const int vector_length) {
+    int max = team_size_max(functor) / vector_length;
+    if (max < 1) max = 1;
+    return max;
+  }
 #endif
 
-  template<class FunctorType>
-  int team_size_recommended( const FunctorType& f, const ParallelForTag& ) const {
-    typedef Impl::ParallelFor< FunctorType , TeamPolicy<Properties...> > closure_type;
-    cudaFuncAttributes attr = CudaParallelLaunch< closure_type, typename traits::launch_bounds >::
-        get_cuda_func_attributes();
-    const int block_size = Kokkos::Impl::cuda_get_opt_block_size< FunctorType, typename traits::launch_bounds>(
-        space().impl_internal_space_instance(),
-        attr, f , (size_t) vector_length(),
-        (size_t) team_scratch_size(0) + 2*sizeof(double), (size_t) thread_scratch_size(0) + sizeof(double));
-    return block_size/vector_length();
+  template <class FunctorType>
+  int team_size_recommended(const FunctorType& f, const ParallelForTag&) const {
+    typedef Impl::ParallelFor<FunctorType, TeamPolicy<Properties...>>
+        closure_type;
+    cudaFuncAttributes attr =
+        CudaParallelLaunch<closure_type, typename traits::launch_bounds>::
+            get_cuda_func_attributes();
+    const int block_size =
+        Kokkos::Impl::cuda_get_opt_block_size<FunctorType,
+                                              typename traits::launch_bounds>(
+            space().impl_internal_space_instance(), attr, f,
+            (size_t)vector_length(),
+            (size_t)team_scratch_size(0) + 2 * sizeof(double),
+            (size_t)thread_scratch_size(0) + sizeof(double));
+    return block_size / vector_length();
   }
 
-  template<class FunctorType>
-  int team_size_recommended( const FunctorType& f, const ParallelReduceTag& ) const {
-    typedef Impl::FunctorAnalysis<Impl::FunctorPatternInterface::REDUCE,TeamPolicyInternal,FunctorType> functor_analysis_type;
-    typedef typename Impl::ParallelReduceReturnValue<void,typename functor_analysis_type::value_type,FunctorType>::reducer_type reducer_type;
-    typedef Impl::ParallelReduce< FunctorType , TeamPolicy<Properties...>, reducer_type > closure_type;
-    typedef Impl::FunctorValueTraits< FunctorType , typename traits::work_tag > functor_value_traits;
-
-    cudaFuncAttributes attr = CudaParallelLaunch< closure_type, typename traits::launch_bounds >::
-        get_cuda_func_attributes();
-    const int block_size = Kokkos::Impl::cuda_get_opt_block_size< FunctorType, typename traits::launch_bounds>(
-        space().impl_internal_space_instance(),
-        attr, f , (size_t) vector_length(),
-        (size_t) team_scratch_size(0) + 2*sizeof(double), (size_t) thread_scratch_size(0) + sizeof(double) +
-                                                          ((functor_value_traits::StaticValueSize!=0)?0:functor_value_traits::value_size( f )));
-    // Currently we require Power-of-2 team size for reductions.
-    int p2 = 1;
-    while(p2<=block_size) p2*=2;
-    p2/=2;
-    return p2/vector_length();
+  template <class FunctorType>
+  inline int team_size_recommended(const FunctorType& f,
+                                   const ParallelReduceTag&) const {
+    typedef Impl::FunctorAnalysis<Impl::FunctorPatternInterface::REDUCE,
+                                  TeamPolicyInternal, FunctorType>
+        functor_analysis_type;
+    typedef typename Impl::ParallelReduceReturnValue<
+        void, typename functor_analysis_type::value_type,
+        FunctorType>::reducer_type reducer_type;
+    typedef Impl::ParallelReduce<FunctorType, TeamPolicy<Properties...>,
+                                 reducer_type>
+        closure_type;
+    return internal_team_size_recommended<closure_type>(f);
   }
 
+  template <class FunctorType, class ReducerType>
+  int team_size_recommended(const FunctorType& f, const ReducerType&,
+                            const ParallelReduceTag&) const {
+    typedef Impl::ParallelReduce<FunctorType, TeamPolicy<Properties...>,
+                                 ReducerType>
+        closure_type;
+    return internal_team_size_recommended<closure_type>(f);
+  }
 
-  inline static
-  int vector_length_max()
-    { return Impl::CudaTraits::WarpSize; }
+  inline static int vector_length_max() { return Impl::CudaTraits::WarpSize; }
 
-  inline static
-  int verify_requested_vector_length( int requested_vector_length ) {
-      int test_vector_length = std::min( requested_vector_length, vector_length_max() );
+  inline static int verify_requested_vector_length(
+      int requested_vector_length) {
+    int test_vector_length =
+        std::min(requested_vector_length, vector_length_max());
 
-      // Allow only power-of-two vector_length
-      if ( !(is_integral_power_of_two( test_vector_length ) ) ) {
-         int test_pow2 = 1;
-         for (int i = 0; i < 5; i++) {
-            test_pow2 = test_pow2 << 1;
-            if (test_pow2 > test_vector_length) {
-               break;
-            }
-         }
-         test_vector_length = test_pow2 >> 1;
+    // Allow only power-of-two vector_length
+    if (!(is_integral_power_of_two(test_vector_length))) {
+      int test_pow2 = 1;
+      for (int i = 0; i < 5; i++) {
+        test_pow2 = test_pow2 << 1;
+        if (test_pow2 > test_vector_length) {
+          break;
+        }
       }
+      test_vector_length = test_pow2 >> 1;
+    }
 
-      return test_vector_length;
+    return test_vector_length;
   }
 
-  inline static
-  int scratch_size_max(int level)
-    { return (level==0?
-        1024*40:             // 48kB is the max for CUDA, but we need some for team_member.reduce etc.
-        20*1024*1024);   // arbitrarily setting this to 20MB, for a Volta V100 that would give us about 3.2GB for 2 teams per SM
-    }
+  inline static int scratch_size_max(int level) {
+    return (
+        level == 0 ? 1024 * 40 :  // 48kB is the max for CUDA, but we need some
+                                  // for team_member.reduce etc.
+            20 * 1024 *
+                1024);  // arbitrarily setting this to 20MB, for a Volta V100
+                        // that would give us about 3.2GB for 2 teams per SM
+  }
 
   //----------------------------------------
 
-  inline int vector_length()   const { return m_vector_length ; }
-  inline int team_size()   const { return m_team_size ; }
-  inline int league_size() const { return m_league_size ; }
+  inline int vector_length() const { return m_vector_length; }
+  inline int team_size() const { return m_team_size; }
+  inline int league_size() const { return m_league_size; }
   inline int scratch_size(int level, int team_size_ = -1) const {
-    if(team_size_<0) team_size_ = m_team_size;
-    return m_team_scratch_size[level] + team_size_*m_thread_scratch_size[level];
+    if (team_size_ < 0) team_size_ = m_team_size;
+    return m_team_scratch_size[level] +
+           team_size_ * m_thread_scratch_size[level];
   }
   inline int team_scratch_size(int level) const {
     return m_team_scratch_size[level];
@@ -282,189 +304,259 @@ public:
     return m_thread_scratch_size[level];
   }
 
-  inline typename traits::execution_space space() const {
-    return m_space;
-  }
+  inline typename traits::execution_space space() const { return m_space; }
 
   TeamPolicyInternal()
-    : m_space(typename traits::execution_space())
-    , m_league_size( 0 )
-    , m_team_size( -1 )
-    , m_vector_length( 0 )
-    , m_team_scratch_size {0,0}
-    , m_thread_scratch_size {0,0}
-    , m_chunk_size ( 32 )
-   {}
+      : m_space(typename traits::execution_space()),
+        m_league_size(0),
+        m_team_size(-1),
+        m_vector_length(0),
+        m_team_scratch_size{0, 0},
+        m_thread_scratch_size{0, 0},
+        m_chunk_size(32) {}
 
   /** \brief  Specify league size, request team size */
-  TeamPolicyInternal( const execution_space space_
-            , int league_size_
-            , int team_size_request
-            , int vector_length_request = 1 )
-    : m_space( space_ )
-    , m_league_size( league_size_ )
-    , m_team_size( team_size_request )
-    , m_vector_length( verify_requested_vector_length(vector_length_request) )
-    , m_team_scratch_size {0,0}
-    , m_thread_scratch_size {0,0}
-    , m_chunk_size ( 32 )
-    {
-      // Make sure league size is permissable
-      if(league_size_ >= int(Impl::cuda_internal_maximum_grid_count()))
-        Impl::throw_runtime_exception( "Requested too large league_size for TeamPolicy on Cuda execution space.");
+  TeamPolicyInternal(const execution_space space_, int league_size_,
+                     int team_size_request, int vector_length_request = 1)
+      : m_space(space_),
+        m_league_size(league_size_),
+        m_team_size(team_size_request),
+        m_vector_length(verify_requested_vector_length(vector_length_request)),
+        m_team_scratch_size{0, 0},
+        m_thread_scratch_size{0, 0},
+        m_chunk_size(32) {
+    // Make sure league size is permissible
+    if (league_size_ >= int(Impl::cuda_internal_maximum_grid_count()))
+      Impl::throw_runtime_exception(
+          "Requested too large league_size for TeamPolicy on Cuda execution "
+          "space.");
 
-      // Make sure total block size is permissable
-      if ( m_team_size * m_vector_length > 1024 ) {
-        Impl::throw_runtime_exception(std::string("Kokkos::TeamPolicy< Cuda > the team size is too large. Team size x vector length must be smaller than 1024."));
-      }
+    // Make sure total block size is permissible
+    if (m_team_size * m_vector_length > 1024) {
+      Impl::throw_runtime_exception(
+          std::string("Kokkos::TeamPolicy< Cuda > the team size is too large. "
+                      "Team size x vector length must be smaller than 1024."));
     }
+  }
 
   /** \brief  Specify league size, request team size */
-  TeamPolicyInternal( const execution_space space_
-            , int league_size_
-            , const Kokkos::AUTO_t & /* team_size_request */
-            , int vector_length_request = 1 )
-    : m_space( space_ )
-    , m_league_size( league_size_ )
-    , m_team_size( -1 )
-    , m_vector_length( verify_requested_vector_length(vector_length_request) )
-    , m_team_scratch_size {0,0}
-    , m_thread_scratch_size {0,0}
-    , m_chunk_size ( 32 )
-    {
-      // Make sure league size is permissable
-      if(league_size_ >= int(Impl::cuda_internal_maximum_grid_count()))
-        Impl::throw_runtime_exception( "Requested too large league_size for TeamPolicy on Cuda execution space.");
+  TeamPolicyInternal(const execution_space space_, int league_size_,
+                     const Kokkos::AUTO_t& /* team_size_request */
+                     ,
+                     int vector_length_request = 1)
+      : m_space(space_),
+        m_league_size(league_size_),
+        m_team_size(-1),
+        m_vector_length(verify_requested_vector_length(vector_length_request)),
+        m_team_scratch_size{0, 0},
+        m_thread_scratch_size{0, 0},
+        m_chunk_size(32) {
+    // Make sure league size is permissible
+    if (league_size_ >= int(Impl::cuda_internal_maximum_grid_count()))
+      Impl::throw_runtime_exception(
+          "Requested too large league_size for TeamPolicy on Cuda execution "
+          "space.");
+  }
+
+  TeamPolicyInternal(int league_size_, int team_size_request,
+                     int vector_length_request = 1)
+      : m_space(typename traits::execution_space()),
+        m_league_size(league_size_),
+        m_team_size(team_size_request),
+        m_vector_length(verify_requested_vector_length(vector_length_request)),
+        m_team_scratch_size{0, 0},
+        m_thread_scratch_size{0, 0},
+        m_chunk_size(32) {
+    // Make sure league size is permissible
+    if (league_size_ >= int(Impl::cuda_internal_maximum_grid_count()))
+      Impl::throw_runtime_exception(
+          "Requested too large league_size for TeamPolicy on Cuda execution "
+          "space.");
+
+    // Make sure total block size is permissible
+    if (m_team_size * m_vector_length > 1024) {
+      Impl::throw_runtime_exception(
+          std::string("Kokkos::TeamPolicy< Cuda > the team size is too large. "
+                      "Team size x vector length must be smaller than 1024."));
     }
+  }
 
-  TeamPolicyInternal( int league_size_
-            , int team_size_request
-            , int vector_length_request = 1 )
-    : m_space( typename traits::execution_space() )
-    , m_league_size( league_size_ )
-    , m_team_size( team_size_request )
-    , m_vector_length ( verify_requested_vector_length(vector_length_request) )
-    , m_team_scratch_size {0,0}
-    , m_thread_scratch_size {0,0}
-    , m_chunk_size ( 32 )
-    {
-      // Make sure league size is permissable
-      if(league_size_ >= int(Impl::cuda_internal_maximum_grid_count()))
-        Impl::throw_runtime_exception( "Requested too large league_size for TeamPolicy on Cuda execution space.");
+  TeamPolicyInternal(int league_size_,
+                     const Kokkos::AUTO_t& /* team_size_request */
+                     ,
+                     int vector_length_request = 1)
+      : m_space(typename traits::execution_space()),
+        m_league_size(league_size_),
+        m_team_size(-1),
+        m_vector_length(verify_requested_vector_length(vector_length_request)),
+        m_team_scratch_size{0, 0},
+        m_thread_scratch_size{0, 0},
+        m_chunk_size(32) {
+    // Make sure league size is permissible
+    if (league_size_ >= int(Impl::cuda_internal_maximum_grid_count()))
+      Impl::throw_runtime_exception(
+          "Requested too large league_size for TeamPolicy on Cuda execution "
+          "space.");
+  }
 
-      // Make sure total block size is permissable
-      if ( m_team_size * m_vector_length > 1024 ) {
-        Impl::throw_runtime_exception(std::string("Kokkos::TeamPolicy< Cuda > the team size is too large. Team size x vector length must be smaller than 1024."));
-      }
-    }
-
-  TeamPolicyInternal( int league_size_
-            , const Kokkos::AUTO_t & /* team_size_request */
-            , int vector_length_request = 1 )
-    : m_space( typename traits::execution_space() )
-    , m_league_size( league_size_ )
-    , m_team_size( -1 )
-    , m_vector_length ( verify_requested_vector_length(vector_length_request) )
-    , m_team_scratch_size {0,0}
-    , m_thread_scratch_size {0,0}
-    , m_chunk_size ( 32 )
-    {
-      // Make sure league size is permissable
-      if(league_size_ >= int(Impl::cuda_internal_maximum_grid_count()))
-        Impl::throw_runtime_exception( "Requested too large league_size for TeamPolicy on Cuda execution space.");
-    }
-
-  inline int chunk_size() const { return m_chunk_size ; }
+  inline int chunk_size() const { return m_chunk_size; }
 
 #ifdef KOKKOS_ENABLE_DEPRECATED_CODE
   /** \brief set chunk_size to a discrete value*/
-  inline TeamPolicyInternal set_chunk_size(typename traits::index_type chunk_size_) const {
+  inline TeamPolicyInternal set_chunk_size(
+      typename traits::index_type chunk_size_) const {
     TeamPolicyInternal p = *this;
-    p.m_chunk_size = chunk_size_;
+    p.m_chunk_size       = chunk_size_;
     return p;
   }
 
-  /** \brief set per team scratch size for a specific level of the scratch hierarchy */
-  inline TeamPolicyInternal set_scratch_size(const int& level, const PerTeamValue& per_team) const {
-    TeamPolicyInternal p = *this;
+  /** \brief set per team scratch size for a specific level of the scratch
+   * hierarchy */
+  inline TeamPolicyInternal set_scratch_size(
+      const int& level, const PerTeamValue& per_team) const {
+    TeamPolicyInternal p         = *this;
     p.m_team_scratch_size[level] = per_team.value;
     return p;
   };
 
-  /** \brief set per thread scratch size for a specific level of the scratch hierarchy */
-  inline TeamPolicyInternal set_scratch_size(const int& level, const PerThreadValue& per_thread) const {
-    TeamPolicyInternal p = *this;
+  /** \brief set per thread scratch size for a specific level of the scratch
+   * hierarchy */
+  inline TeamPolicyInternal set_scratch_size(
+      const int& level, const PerThreadValue& per_thread) const {
+    TeamPolicyInternal p           = *this;
     p.m_thread_scratch_size[level] = per_thread.value;
     return p;
   };
 
-  /** \brief set per thread and per team scratch size for a specific level of the scratch hierarchy */
-  inline TeamPolicyInternal set_scratch_size(const int& level, const PerTeamValue& per_team, const PerThreadValue& per_thread) const {
-    TeamPolicyInternal p = *this;
-    p.m_team_scratch_size[level] = per_team.value;
+  /** \brief set per thread and per team scratch size for a specific level of
+   * the scratch hierarchy */
+  inline TeamPolicyInternal set_scratch_size(
+      const int& level, const PerTeamValue& per_team,
+      const PerThreadValue& per_thread) const {
+    TeamPolicyInternal p           = *this;
+    p.m_team_scratch_size[level]   = per_team.value;
     p.m_thread_scratch_size[level] = per_thread.value;
     return p;
   };
 #else
   /** \brief set chunk_size to a discrete value*/
-  inline TeamPolicyInternal& set_chunk_size(typename traits::index_type chunk_size_) {
+  inline TeamPolicyInternal& set_chunk_size(
+      typename traits::index_type chunk_size_) {
     m_chunk_size = chunk_size_;
     return *this;
   }
 
-  /** \brief set per team scratch size for a specific level of the scratch hierarchy */
-  inline TeamPolicyInternal& set_scratch_size(const int& level, const PerTeamValue& per_team) {
+  /** \brief set per team scratch size for a specific level of the scratch
+   * hierarchy */
+  inline TeamPolicyInternal& set_scratch_size(const int& level,
+                                              const PerTeamValue& per_team) {
     m_team_scratch_size[level] = per_team.value;
     return *this;
   }
 
-  /** \brief set per thread scratch size for a specific level of the scratch hierarchy */
-  inline TeamPolicyInternal& set_scratch_size(const int& level, const PerThreadValue& per_thread) {
+  /** \brief set per thread scratch size for a specific level of the scratch
+   * hierarchy */
+  inline TeamPolicyInternal& set_scratch_size(
+      const int& level, const PerThreadValue& per_thread) {
     m_thread_scratch_size[level] = per_thread.value;
     return *this;
   }
 
-  /** \brief set per thread and per team scratch size for a specific level of the scratch hierarchy */
-  inline TeamPolicyInternal& set_scratch_size(const int& level, const PerTeamValue& per_team, const PerThreadValue& per_thread) {
-    m_team_scratch_size[level] = per_team.value;
+  /** \brief set per thread and per team scratch size for a specific level of
+   * the scratch hierarchy */
+  inline TeamPolicyInternal& set_scratch_size(
+      const int& level, const PerTeamValue& per_team,
+      const PerThreadValue& per_thread) {
+    m_team_scratch_size[level]   = per_team.value;
     m_thread_scratch_size[level] = per_thread.value;
     return *this;
   }
 #endif
 
-  typedef Kokkos::Impl::CudaTeamMember member_type ;
+  typedef Kokkos::Impl::CudaTeamMember member_type;
 
-protected:
+ protected:
 #ifdef KOKKOS_ENABLE_DEPRECATED_CODE
   /** \brief set chunk_size to a discrete value*/
-  inline TeamPolicyInternal internal_set_chunk_size(typename traits::index_type chunk_size_) {
+  inline TeamPolicyInternal internal_set_chunk_size(
+      typename traits::index_type chunk_size_) {
     m_chunk_size = chunk_size_;
     return *this;
   }
 
-  /** \brief set per team scratch size for a specific level of the scratch hierarchy */
-  inline TeamPolicyInternal internal_set_scratch_size(const int& level, const PerTeamValue& per_team) {
+  /** \brief set per team scratch size for a specific level of the scratch
+   * hierarchy */
+  inline TeamPolicyInternal internal_set_scratch_size(
+      const int& level, const PerTeamValue& per_team) {
     m_team_scratch_size[level] = per_team.value;
     return *this;
   }
 
-  /** \brief set per thread scratch size for a specific level of the scratch hierarchy */
-  inline TeamPolicyInternal internal_set_scratch_size(const int& level, const PerThreadValue& per_thread) {
+  /** \brief set per thread scratch size for a specific level of the scratch
+   * hierarchy */
+  inline TeamPolicyInternal internal_set_scratch_size(
+      const int& level, const PerThreadValue& per_thread) {
     m_thread_scratch_size[level] = per_thread.value;
     return *this;
   }
 
-  /** \brief set per thread and per team scratch size for a specific level of the scratch hierarchy */
-  inline TeamPolicyInternal internal_set_scratch_size(const int& level, const PerTeamValue& per_team, const PerThreadValue& per_thread) {
-    m_team_scratch_size[level] = per_team.value;
+  /** \brief set per thread and per team scratch size for a specific level of
+   * the scratch hierarchy */
+  inline TeamPolicyInternal internal_set_scratch_size(
+      const int& level, const PerTeamValue& per_team,
+      const PerThreadValue& per_thread) {
+    m_team_scratch_size[level]   = per_team.value;
     m_thread_scratch_size[level] = per_thread.value;
     return *this;
   }
 #endif
+
+  template <class ClosureType, class FunctorType, class BlockSizeCallable>
+  int internal_team_size_common(const FunctorType& f,
+                                BlockSizeCallable&& block_size_callable) const {
+    using closure_type = ClosureType;
+    using functor_value_traits =
+        Impl::FunctorValueTraits<FunctorType, typename traits::work_tag>;
+
+    cudaFuncAttributes attr =
+        CudaParallelLaunch<closure_type, typename traits::launch_bounds>::
+            get_cuda_func_attributes();
+    const int block_size = std::forward<BlockSizeCallable>(block_size_callable)(
+        space().impl_internal_space_instance(), attr, f,
+        (size_t)vector_length(),
+        (size_t)team_scratch_size(0) + 2 * sizeof(double),
+        (size_t)thread_scratch_size(0) + sizeof(double) +
+            ((functor_value_traits::StaticValueSize != 0)
+                 ? 0
+                 : functor_value_traits::value_size(f)));
+    KOKKOS_ASSERT(block_size > 0);
+
+    // Currently we require Power-of-2 team size for reductions.
+    int p2 = 1;
+    while (p2 <= block_size) p2 *= 2;
+    p2 /= 2;
+    return p2 / vector_length();
+  }
+
+  template <class ClosureType, class FunctorType>
+  int internal_team_size_max(const FunctorType& f) const {
+    return internal_team_size_common<ClosureType>(
+        f,
+        Kokkos::Impl::cuda_get_max_block_size<FunctorType,
+                                              typename traits::launch_bounds>);
+  }
+
+  template <class ClosureType, class FunctorType>
+  int internal_team_size_recommended(const FunctorType& f) const {
+    return internal_team_size_common<ClosureType>(
+        f,
+        Kokkos::Impl::cuda_get_opt_block_size<FunctorType,
+                                              typename traits::launch_bounds>);
+  }
 };
 
-} // namspace Impl
-} // namespace Kokkos
+}  // namespace Impl
+}  // namespace Kokkos
 
 //----------------------------------------------------------------------------
 //----------------------------------------------------------------------------
@@ -472,262 +564,268 @@ protected:
 namespace Kokkos {
 namespace Impl {
 
-template< class FunctorType , class ... Traits >
-class ParallelFor< FunctorType
-                 , Kokkos::RangePolicy< Traits ... >
-                 , Kokkos::Cuda
-                 >
-{
-public:
-  typedef Kokkos::RangePolicy< Traits ... > Policy;
-private:
+template <class FunctorType, class... Traits>
+class ParallelFor<FunctorType, Kokkos::RangePolicy<Traits...>, Kokkos::Cuda> {
+ public:
+  typedef Kokkos::RangePolicy<Traits...> Policy;
 
-  typedef typename Policy::member_type  Member ;
-  typedef typename Policy::work_tag     WorkTag ;
-  typedef typename Policy::launch_bounds LaunchBounds ;
+ private:
+  typedef typename Policy::member_type Member;
+  typedef typename Policy::work_tag WorkTag;
+  typedef typename Policy::launch_bounds LaunchBounds;
 
-  const FunctorType  m_functor ;
-  const Policy       m_policy ;
+  const FunctorType m_functor;
+  const Policy m_policy;
 
-  ParallelFor() = delete ;
-  ParallelFor & operator = ( const ParallelFor & ) = delete ;
+  ParallelFor()        = delete;
+  ParallelFor& operator=(const ParallelFor&) = delete;
 
-  template< class TagType >
+  template <class TagType>
   inline __device__
-  typename std::enable_if< std::is_same< TagType , void >::value >::type
-  exec_range( const Member i ) const
-    { m_functor( i ); }
+      typename std::enable_if<std::is_same<TagType, void>::value>::type
+      exec_range(const Member i) const {
+    m_functor(i);
+  }
 
-  template< class TagType >
+  template <class TagType>
   inline __device__
-  typename std::enable_if< ! std::is_same< TagType , void >::value >::type
-  exec_range( const Member i ) const
-    { m_functor( TagType() , i ); }
+      typename std::enable_if<!std::is_same<TagType, void>::value>::type
+      exec_range(const Member i) const {
+    m_functor(TagType(), i);
+  }
 
-public:
+ public:
+  typedef FunctorType functor_type;
 
-  typedef FunctorType functor_type ;
+  inline __device__ void operator()(void) const {
+    const Member work_stride = blockDim.y * gridDim.x;
+    const Member work_end    = m_policy.end();
 
-  inline
-  __device__
-  void operator()(void) const
-    {
-      const Member work_stride = blockDim.y * gridDim.x ;
-      const Member work_end    = m_policy.end();
-
-      for ( Member
-              iwork =  m_policy.begin() + threadIdx.y + blockDim.y * blockIdx.x ;
-              iwork <  work_end ;
-              iwork = iwork < work_end - work_stride ? iwork + work_stride : work_end) {
-        this-> template exec_range< WorkTag >( iwork );
-      }
+    for (Member iwork =
+             m_policy.begin() + threadIdx.y + blockDim.y * blockIdx.x;
+         iwork < work_end;
+         iwork = iwork < work_end - work_stride ? iwork + work_stride
+                                                : work_end) {
+      this->template exec_range<WorkTag>(iwork);
     }
+  }
 
-  inline
-  void execute() const
-    {
-      const typename Policy::index_type nwork = m_policy.end() - m_policy.begin();
+  inline void execute() const {
+    const typename Policy::index_type nwork = m_policy.end() - m_policy.begin();
 
-      cudaFuncAttributes attr = CudaParallelLaunch< ParallelFor, LaunchBounds >::
-          get_cuda_func_attributes();
-      const int block_size = Kokkos::Impl::cuda_get_opt_block_size< FunctorType, LaunchBounds>(
-          m_policy.space().impl_internal_space_instance(),
-          attr, m_functor , 1, 0 , 0 );
-      const dim3 block(  1 , block_size , 1);
-      const dim3 grid( std::min( typename Policy::index_type(( nwork + block.y - 1 ) / block.y) ,
-                       typename Policy::index_type(cuda_internal_maximum_grid_count()) ) , 1 , 1);
-
-      CudaParallelLaunch< ParallelFor, LaunchBounds >( *this , grid , block , 0 , m_policy.space().impl_internal_space_instance() , false );
+    cudaFuncAttributes attr =
+        CudaParallelLaunch<ParallelFor,
+                           LaunchBounds>::get_cuda_func_attributes();
+    const int block_size =
+        Kokkos::Impl::cuda_get_opt_block_size<FunctorType, LaunchBounds>(
+            m_policy.space().impl_internal_space_instance(), attr, m_functor, 1,
+            0, 0);
+    dim3 block(1, block_size, 1);
+    dim3 grid(
+        std::min(
+            typename Policy::index_type((nwork + block.y - 1) / block.y),
+            typename Policy::index_type(cuda_internal_maximum_grid_count())),
+        1, 1);
+#ifdef KOKKOS_IMPL_DEBUG_CUDA_SERIAL_EXECUTION
+    if (Kokkos::Impl::CudaInternal::cuda_use_serial_execution()) {
+      block = dim3(1, 1, 1);
+      grid  = dim3(1, 1, 1);
     }
+#endif
 
-  ParallelFor( const FunctorType  & arg_functor ,
-               const Policy       & arg_policy )
-    : m_functor( arg_functor )
-    , m_policy(  arg_policy )
-    { }
+    CudaParallelLaunch<ParallelFor, LaunchBounds>(
+        *this, grid, block, 0, m_policy.space().impl_internal_space_instance(),
+        false);
+  }
 
+  ParallelFor(const FunctorType& arg_functor, const Policy& arg_policy)
+      : m_functor(arg_functor), m_policy(arg_policy) {}
 };
 
-
 // MDRangePolicy impl
-template< class FunctorType , class ... Traits >
-class ParallelFor< FunctorType
-                 , Kokkos::MDRangePolicy< Traits ... >
-                 , Kokkos::Cuda
-                 >
-{
-public:
-  typedef Kokkos::MDRangePolicy< Traits ...  > Policy ;
-private:
+template <class FunctorType, class... Traits>
+class ParallelFor<FunctorType, Kokkos::MDRangePolicy<Traits...>, Kokkos::Cuda> {
+ public:
+  typedef Kokkos::MDRangePolicy<Traits...> Policy;
+
+ private:
   using RP = Policy;
   typedef typename Policy::array_index_type array_index_type;
   typedef typename Policy::index_type index_type;
   typedef typename Policy::launch_bounds LaunchBounds;
 
+  const FunctorType m_functor;
+  const Policy m_rp;
 
-  const FunctorType m_functor ;
-  const Policy      m_rp ;
+ public:
+  inline __device__ void operator()(void) const {
+    Kokkos::Impl::Refactor::DeviceIterateTile<Policy::rank, Policy, FunctorType,
+                                              typename Policy::work_tag>(
+        m_rp, m_functor)
+        .exec_range();
+  }
 
-public:
-
-  inline
-  __device__
-  void operator()(void) const
-    {
-      Kokkos::Impl::Refactor::DeviceIterateTile<Policy::rank,Policy,FunctorType,typename Policy::work_tag>(m_rp,m_functor).exec_range();
-    }
-
-
-  inline
-  void execute() const
-  {
-    if(m_rp.m_num_tiles==0) return;
-    const array_index_type maxblocks = static_cast<array_index_type>(m_rp.space().impl_internal_space_instance()->m_maxBlock);
-    if ( RP::rank == 2 )
-    {
-      const dim3 block( m_rp.m_tile[0] , m_rp.m_tile[1] , 1);
+  inline void execute() const {
+    if (m_rp.m_num_tiles == 0) return;
+    const array_index_type maxblocks = static_cast<array_index_type>(
+        m_rp.space().impl_internal_space_instance()->m_maxBlock);
+    if (RP::rank == 2) {
+      const dim3 block(m_rp.m_tile[0], m_rp.m_tile[1], 1);
       const dim3 grid(
-            std::min( ( m_rp.m_upper[0] - m_rp.m_lower[0] + block.x - 1 ) / block.x , maxblocks )
-          , std::min( ( m_rp.m_upper[1] - m_rp.m_lower[1] + block.y - 1 ) / block.y , maxblocks )
-          , 1
-          );
-      CudaParallelLaunch< ParallelFor, LaunchBounds >( *this , grid , block , 0 , m_rp.space().impl_internal_space_instance() , false );
-    }
-    else if ( RP::rank == 3 )
-    {
-      const dim3 block( m_rp.m_tile[0] , m_rp.m_tile[1] , m_rp.m_tile[2] );
+          std::min((m_rp.m_upper[0] - m_rp.m_lower[0] + block.x - 1) / block.x,
+                   maxblocks),
+          std::min((m_rp.m_upper[1] - m_rp.m_lower[1] + block.y - 1) / block.y,
+                   maxblocks),
+          1);
+      CudaParallelLaunch<ParallelFor, LaunchBounds>(
+          *this, grid, block, 0, m_rp.space().impl_internal_space_instance(),
+          false);
+    } else if (RP::rank == 3) {
+      const dim3 block(m_rp.m_tile[0], m_rp.m_tile[1], m_rp.m_tile[2]);
       const dim3 grid(
-          std::min( ( m_rp.m_upper[0] - m_rp.m_lower[0] + block.x - 1 ) / block.x , maxblocks )
-        , std::min( ( m_rp.m_upper[1] - m_rp.m_lower[1] + block.y - 1 ) / block.y , maxblocks )
-        , std::min( ( m_rp.m_upper[2] - m_rp.m_lower[2] + block.z - 1 ) / block.z , maxblocks )
-        );
-      CudaParallelLaunch< ParallelFor, LaunchBounds >( *this , grid , block , 0 , m_rp.space().impl_internal_space_instance() , false );
-    }
-    else if ( RP::rank == 4 )
-    {
-      // id0,id1 encoded within threadIdx.x; id2 to threadIdx.y; id3 to threadIdx.z
-      const dim3 block( m_rp.m_tile[0]*m_rp.m_tile[1] , m_rp.m_tile[2] , m_rp.m_tile[3] );
+          std::min((m_rp.m_upper[0] - m_rp.m_lower[0] + block.x - 1) / block.x,
+                   maxblocks),
+          std::min((m_rp.m_upper[1] - m_rp.m_lower[1] + block.y - 1) / block.y,
+                   maxblocks),
+          std::min((m_rp.m_upper[2] - m_rp.m_lower[2] + block.z - 1) / block.z,
+                   maxblocks));
+      CudaParallelLaunch<ParallelFor, LaunchBounds>(
+          *this, grid, block, 0, m_rp.space().impl_internal_space_instance(),
+          false);
+    } else if (RP::rank == 4) {
+      // id0,id1 encoded within threadIdx.x; id2 to threadIdx.y; id3 to
+      // threadIdx.z
+      const dim3 block(m_rp.m_tile[0] * m_rp.m_tile[1], m_rp.m_tile[2],
+                       m_rp.m_tile[3]);
       const dim3 grid(
-          std::min( static_cast<index_type>( m_rp.m_tile_end[0] * m_rp.m_tile_end[1] )
-                  , static_cast<index_type>(maxblocks) )
-        , std::min( ( m_rp.m_upper[2] - m_rp.m_lower[2] + block.y - 1 ) / block.y , maxblocks )
-        , std::min( ( m_rp.m_upper[3] - m_rp.m_lower[3] + block.z - 1 ) / block.z , maxblocks )
-        );
-      CudaParallelLaunch< ParallelFor, LaunchBounds >( *this , grid , block , 0 , m_rp.space().impl_internal_space_instance() , false );
-    }
-    else if ( RP::rank == 5 )
-    {
-      // id0,id1 encoded within threadIdx.x; id2,id3 to threadIdx.y; id4 to threadIdx.z
-      const dim3 block( m_rp.m_tile[0]*m_rp.m_tile[1] , m_rp.m_tile[2]*m_rp.m_tile[3] , m_rp.m_tile[4] );
+          std::min(
+              static_cast<index_type>(m_rp.m_tile_end[0] * m_rp.m_tile_end[1]),
+              static_cast<index_type>(maxblocks)),
+          std::min((m_rp.m_upper[2] - m_rp.m_lower[2] + block.y - 1) / block.y,
+                   maxblocks),
+          std::min((m_rp.m_upper[3] - m_rp.m_lower[3] + block.z - 1) / block.z,
+                   maxblocks));
+      CudaParallelLaunch<ParallelFor, LaunchBounds>(
+          *this, grid, block, 0, m_rp.space().impl_internal_space_instance(),
+          false);
+    } else if (RP::rank == 5) {
+      // id0,id1 encoded within threadIdx.x; id2,id3 to threadIdx.y; id4 to
+      // threadIdx.z
+      const dim3 block(m_rp.m_tile[0] * m_rp.m_tile[1],
+                       m_rp.m_tile[2] * m_rp.m_tile[3], m_rp.m_tile[4]);
       const dim3 grid(
-          std::min( static_cast<index_type>( m_rp.m_tile_end[0] * m_rp.m_tile_end[1] )
-                  , static_cast<index_type>(maxblocks) )
-        , std::min( static_cast<index_type>( m_rp.m_tile_end[2] * m_rp.m_tile_end[3] )
-                  , static_cast<index_type>(maxblocks) )
-        , std::min( ( m_rp.m_upper[4] - m_rp.m_lower[4] + block.z - 1 ) / block.z , maxblocks )
-        );
-      CudaParallelLaunch< ParallelFor, LaunchBounds >( *this , grid , block , 0 , m_rp.space().impl_internal_space_instance() , false );
-    }
-    else if ( RP::rank == 6 )
-    {
-      // id0,id1 encoded within threadIdx.x; id2,id3 to threadIdx.y; id4,id5 to threadIdx.z
-      const dim3 block( m_rp.m_tile[0]*m_rp.m_tile[1] , m_rp.m_tile[2]*m_rp.m_tile[3] , m_rp.m_tile[4]*m_rp.m_tile[5] );
+          std::min(
+              static_cast<index_type>(m_rp.m_tile_end[0] * m_rp.m_tile_end[1]),
+              static_cast<index_type>(maxblocks)),
+          std::min(
+              static_cast<index_type>(m_rp.m_tile_end[2] * m_rp.m_tile_end[3]),
+              static_cast<index_type>(maxblocks)),
+          std::min((m_rp.m_upper[4] - m_rp.m_lower[4] + block.z - 1) / block.z,
+                   maxblocks));
+      CudaParallelLaunch<ParallelFor, LaunchBounds>(
+          *this, grid, block, 0, m_rp.space().impl_internal_space_instance(),
+          false);
+    } else if (RP::rank == 6) {
+      // id0,id1 encoded within threadIdx.x; id2,id3 to threadIdx.y; id4,id5 to
+      // threadIdx.z
+      const dim3 block(m_rp.m_tile[0] * m_rp.m_tile[1],
+                       m_rp.m_tile[2] * m_rp.m_tile[3],
+                       m_rp.m_tile[4] * m_rp.m_tile[5]);
       const dim3 grid(
-          std::min( static_cast<index_type>( m_rp.m_tile_end[0] * m_rp.m_tile_end[1] )
-                  , static_cast<index_type>(maxblocks) )
-        ,  std::min( static_cast<index_type>( m_rp.m_tile_end[2] * m_rp.m_tile_end[3] )
-                  , static_cast<index_type>(maxblocks) )
-        , std::min( static_cast<index_type>( m_rp.m_tile_end[4] * m_rp.m_tile_end[5] )
-                  , static_cast<index_type>(maxblocks) )
-        );
-      CudaParallelLaunch< ParallelFor, LaunchBounds >( *this , grid , block , 0 , m_rp.space().impl_internal_space_instance() , false );
-    }
-    else
-    {
+          std::min(
+              static_cast<index_type>(m_rp.m_tile_end[0] * m_rp.m_tile_end[1]),
+              static_cast<index_type>(maxblocks)),
+          std::min(
+              static_cast<index_type>(m_rp.m_tile_end[2] * m_rp.m_tile_end[3]),
+              static_cast<index_type>(maxblocks)),
+          std::min(
+              static_cast<index_type>(m_rp.m_tile_end[4] * m_rp.m_tile_end[5]),
+              static_cast<index_type>(maxblocks)));
+      CudaParallelLaunch<ParallelFor, LaunchBounds>(
+          *this, grid, block, 0, m_rp.space().impl_internal_space_instance(),
+          false);
+    } else {
       printf("Kokkos::MDRange Error: Exceeded rank bounds with Cuda\n");
       Kokkos::abort("Aborting");
     }
 
-  } //end execute
+  }  // end execute
 
-//  inline
-  ParallelFor( const FunctorType & arg_functor
-             , Policy arg_policy )
-    : m_functor( arg_functor )
-    , m_rp(  arg_policy )
-    {}
+  //  inline
+  ParallelFor(const FunctorType& arg_functor, Policy arg_policy)
+      : m_functor(arg_functor), m_rp(arg_policy) {}
 };
 
+template <class FunctorType, class... Properties>
+class ParallelFor<FunctorType, Kokkos::TeamPolicy<Properties...>,
+                  Kokkos::Cuda> {
+ public:
+  typedef TeamPolicyInternal<Kokkos::Cuda, Properties...> Policy;
 
-template< class FunctorType , class ... Properties >
-class ParallelFor< FunctorType
-                 , Kokkos::TeamPolicy< Properties ... >
-                 , Kokkos::Cuda
-                 >
-{
-public:
-  typedef TeamPolicyInternal< Kokkos::Cuda , Properties ... >   Policy ;
-private:
+ private:
+  typedef typename Policy::member_type Member;
+  typedef typename Policy::work_tag WorkTag;
+  typedef typename Policy::launch_bounds LaunchBounds;
 
-  typedef typename Policy::member_type  Member ;
-  typedef typename Policy::work_tag     WorkTag ;
-  typedef typename Policy::launch_bounds  LaunchBounds ;
+ public:
+  typedef FunctorType functor_type;
+  typedef Cuda::size_type size_type;
 
-public:
-
-  typedef FunctorType      functor_type ;
-  typedef Cuda::size_type  size_type ;
-
-private:
-
-  // Algorithmic constraints: blockDim.y is a power of two AND blockDim.y == blockDim.z == 1
-  // shared memory utilization:
+ private:
+  // Algorithmic constraints: blockDim.y is a power of two AND blockDim.y ==
+  // blockDim.z == 1 shared memory utilization:
   //
   //  [ team   reduce space ]
   //  [ team   shared space ]
   //
 
-  const FunctorType  m_functor ;
-  const Policy       m_policy ;
-  const size_type    m_league_size ;
-  int    m_team_size ;
-  const size_type    m_vector_size ;
-  int m_shmem_begin ;
-  int m_shmem_size ;
-  void*              m_scratch_ptr[2] ;
-  int m_scratch_size[2] ;
+  const FunctorType m_functor;
+  const Policy m_policy;
+  const size_type m_league_size;
+  int m_team_size;
+  const size_type m_vector_size;
+  int m_shmem_begin;
+  int m_shmem_size;
+  void* m_scratch_ptr[2];
+  int m_scratch_size[2];
 
-  template< class TagType >
+  template <class TagType>
   __device__ inline
-  typename std::enable_if< std::is_same< TagType , void >::value >::type
-  exec_team( const Member & member ) const
-    { m_functor( member ); }
+      typename std::enable_if<std::is_same<TagType, void>::value>::type
+      exec_team(const Member& member) const {
+    m_functor(member);
+  }
 
-  template< class TagType >
+  template <class TagType>
   __device__ inline
-  typename std::enable_if< ! std::is_same< TagType , void >::value >::type
-  exec_team( const Member & member ) const
-    { m_functor( TagType() , member ); }
+      typename std::enable_if<!std::is_same<TagType, void>::value>::type
+      exec_team(const Member& member) const {
+    m_functor(TagType(), member);
+  }
 
-public:
-
-  __device__ inline
-  void operator()(void) const
-  {
+ public:
+  __device__ inline void operator()(void) const {
     // Iterate this block through the league
     int64_t threadid = 0;
-    if ( m_scratch_size[1]>0 ) {
+    if (m_scratch_size[1] > 0) {
       __shared__ int64_t base_thread_id;
-      if (threadIdx.x==0 && threadIdx.y==0 ) {
-        threadid = (blockIdx.x*blockDim.z + threadIdx.z) %
-          (Kokkos::Impl::g_device_cuda_lock_arrays.n / (blockDim.x * blockDim.y));
+      if (threadIdx.x == 0 && threadIdx.y == 0) {
+        threadid = (blockIdx.x * blockDim.z + threadIdx.z) %
+                   (Kokkos::Impl::g_device_cuda_lock_arrays.n /
+                    (blockDim.x * blockDim.y));
         threadid *= blockDim.x * blockDim.y;
         int done = 0;
         while (!done) {
-          done = (0 == atomicCAS(&Kokkos::Impl::g_device_cuda_lock_arrays.scratch[threadid],0,1));
-          if(!done) {
+          done =
+              (0 ==
+               atomicCAS(
+                   &Kokkos::Impl::g_device_cuda_lock_arrays.scratch[threadid],
+                   0, 1));
+          if (!done) {
             threadid += blockDim.x * blockDim.y;
-            if(int64_t(threadid+blockDim.x * blockDim.y) >= int64_t(Kokkos::Impl::g_device_cuda_lock_arrays.n)) threadid = 0;
+            if (int64_t(threadid + blockDim.x * blockDim.y) >=
+                int64_t(Kokkos::Impl::g_device_cuda_lock_arrays.n))
+              threadid = 0;
           }
         }
         base_thread_id = threadid;
@@ -736,79 +834,102 @@ public:
       threadid = base_thread_id;
     }
 
-
     const int int_league_size = (int)m_league_size;
-    for ( int league_rank = blockIdx.x ; league_rank < int_league_size ; league_rank += gridDim.x ) {
-
-      this-> template exec_team< WorkTag >(
-        typename Policy::member_type( kokkos_impl_cuda_shared_memory<void>()
-                                    , m_shmem_begin
-                                    , m_shmem_size
-                                    , (void*) ( ((char*)m_scratch_ptr[1]) + ptrdiff_t(threadid/(blockDim.x*blockDim.y)) * m_scratch_size[1])
-                                    , m_scratch_size[1]
-                                    , league_rank
-                                    , m_league_size ) );
+    for (int league_rank = blockIdx.x; league_rank < int_league_size;
+         league_rank += gridDim.x) {
+      this->template exec_team<WorkTag>(typename Policy::member_type(
+          kokkos_impl_cuda_shared_memory<void>(), m_shmem_begin, m_shmem_size,
+          (void*)(((char*)m_scratch_ptr[1]) +
+                  ptrdiff_t(threadid / (blockDim.x * blockDim.y)) *
+                      m_scratch_size[1]),
+          m_scratch_size[1], league_rank, m_league_size));
     }
-    if ( m_scratch_size[1]>0 ) {
+    if (m_scratch_size[1] > 0) {
       __syncthreads();
-      if (threadIdx.x==0 && threadIdx.y==0 )
-        Kokkos::Impl::g_device_cuda_lock_arrays.scratch[threadid]=0;
+      if (threadIdx.x == 0 && threadIdx.y == 0)
+        Kokkos::Impl::g_device_cuda_lock_arrays.scratch[threadid] = 0;
     }
   }
 
-  inline
-  void execute() const
-    {
-      const int64_t shmem_size_total = m_shmem_begin + m_shmem_size ;
-      const dim3 grid( int(m_league_size) , 1 , 1 );
-      const dim3 block( int(m_vector_size) , int(m_team_size) , 1 );
-
-      CudaParallelLaunch< ParallelFor, LaunchBounds >( *this, grid, block, shmem_size_total, m_policy.space().impl_internal_space_instance() , true ); // copy to device and execute
+  inline void execute() const {
+    const int64_t shmem_size_total = m_shmem_begin + m_shmem_size;
+    dim3 grid(int(m_league_size), 1, 1);
+    const dim3 block(int(m_vector_size), int(m_team_size), 1);
 
+#ifdef KOKKOS_IMPL_DEBUG_CUDA_SERIAL_EXECUTION
+    if (Kokkos::Impl::CudaInternal::cuda_use_serial_execution()) {
+      grid = dim3(1, 1, 1);
     }
+#endif
 
-  ParallelFor( const FunctorType  & arg_functor
-             , const Policy       & arg_policy
-             )
-    : m_functor( arg_functor )
-    , m_policy( arg_policy )
-    , m_league_size( arg_policy.league_size() )
-    , m_team_size( arg_policy.team_size() )
-    , m_vector_size( arg_policy.vector_length() )
-    {
-      cudaFuncAttributes attr = CudaParallelLaunch< ParallelFor, LaunchBounds >::
-          get_cuda_func_attributes();
-      m_team_size = m_team_size>=0?m_team_size:Kokkos::Impl::cuda_get_opt_block_size< FunctorType, LaunchBounds>(
+    CudaParallelLaunch<ParallelFor, LaunchBounds>(
+        *this, grid, block, shmem_size_total,
         m_policy.space().impl_internal_space_instance(),
-        attr, m_functor , m_vector_size,
-        m_policy.team_scratch_size(0), m_policy.thread_scratch_size(0) )/m_vector_size;
+        true);  // copy to device and execute
+  }
 
-      m_shmem_begin = ( sizeof(double) * ( m_team_size + 2 ) );
-      m_shmem_size = ( m_policy.scratch_size(0,m_team_size) + FunctorTeamShmemSize< FunctorType >::value( m_functor , m_team_size ) );
-      m_scratch_size[0] = m_policy.scratch_size(0,m_team_size);
-      m_scratch_size[1] = m_policy.scratch_size(1,m_team_size);
+  ParallelFor(const FunctorType& arg_functor, const Policy& arg_policy)
+      : m_functor(arg_functor),
+        m_policy(arg_policy),
+        m_league_size(arg_policy.league_size()),
+        m_team_size(arg_policy.team_size()),
+        m_vector_size(arg_policy.vector_length()) {
+    cudaFuncAttributes attr =
+        CudaParallelLaunch<ParallelFor,
+                           LaunchBounds>::get_cuda_func_attributes();
+    m_team_size =
+        m_team_size >= 0
+            ? m_team_size
+            : Kokkos::Impl::cuda_get_opt_block_size<FunctorType, LaunchBounds>(
+                  m_policy.space().impl_internal_space_instance(), attr,
+                  m_functor, m_vector_size, m_policy.team_scratch_size(0),
+                  m_policy.thread_scratch_size(0)) /
+                  m_vector_size;
 
-      // Functor's reduce memory, team scan memory, and team shared memory depend upon team size.
-      m_scratch_ptr[0] = NULL;
-      m_scratch_ptr[1] = m_team_size<=0?NULL:cuda_resize_scratch_space(static_cast<ptrdiff_t>(m_scratch_size[1])*static_cast<ptrdiff_t>(Cuda::concurrency()/(m_team_size*m_vector_size)));
+    m_shmem_begin = (sizeof(double) * (m_team_size + 2));
+    m_shmem_size =
+        (m_policy.scratch_size(0, m_team_size) +
+         FunctorTeamShmemSize<FunctorType>::value(m_functor, m_team_size));
+    m_scratch_size[0] = m_policy.scratch_size(0, m_team_size);
+    m_scratch_size[1] = m_policy.scratch_size(1, m_team_size);
 
-      const int shmem_size_total = m_shmem_begin + m_shmem_size ;
-      if ( m_policy.space().impl_internal_space_instance()->m_maxShmemPerBlock < shmem_size_total ) {
-        printf("%i %i\n",m_policy.space().impl_internal_space_instance()->m_maxShmemPerBlock,shmem_size_total);
-        Kokkos::Impl::throw_runtime_exception(std::string("Kokkos::Impl::ParallelFor< Cuda > insufficient shared memory"));
-      }
+    // Functor's reduce memory, team scan memory, and team shared memory depend
+    // upon team size.
+    m_scratch_ptr[0] = NULL;
+    m_scratch_ptr[1] =
+        m_team_size <= 0
+            ? NULL
+            : cuda_resize_scratch_space(
+                  static_cast<ptrdiff_t>(m_scratch_size[1]) *
+                  static_cast<ptrdiff_t>(Cuda::concurrency() /
+                                         (m_team_size * m_vector_size)));
 
-      if ( int(m_team_size) >
-           int(Kokkos::Impl::cuda_get_max_block_size< FunctorType, LaunchBounds >
-                 ( m_policy.space().impl_internal_space_instance(),
-        attr, arg_functor , arg_policy.vector_length(), arg_policy.team_scratch_size(0),arg_policy.thread_scratch_size(0) ) / arg_policy.vector_length())) {
-        Kokkos::Impl::throw_runtime_exception(std::string("Kokkos::Impl::ParallelFor< Cuda > requested too large team size."));
-      }
+    const int shmem_size_total = m_shmem_begin + m_shmem_size;
+    if (m_policy.space().impl_internal_space_instance()->m_maxShmemPerBlock <
+        shmem_size_total) {
+      printf(
+          "%i %i\n",
+          m_policy.space().impl_internal_space_instance()->m_maxShmemPerBlock,
+          shmem_size_total);
+      Kokkos::Impl::throw_runtime_exception(std::string(
+          "Kokkos::Impl::ParallelFor< Cuda > insufficient shared memory"));
     }
+
+    if (int(m_team_size) >
+        int(Kokkos::Impl::cuda_get_max_block_size<FunctorType, LaunchBounds>(
+                m_policy.space().impl_internal_space_instance(), attr,
+                arg_functor, arg_policy.vector_length(),
+                arg_policy.team_scratch_size(0),
+                arg_policy.thread_scratch_size(0)) /
+            arg_policy.vector_length())) {
+      Kokkos::Impl::throw_runtime_exception(std::string(
+          "Kokkos::Impl::ParallelFor< Cuda > requested too large team size."));
+    }
+  }
 };
 
-} // namespace Impl
-} // namespace Kokkos
+}  // namespace Impl
+}  // namespace Kokkos
 
 //----------------------------------------------------------------------------
 //----------------------------------------------------------------------------
@@ -816,576 +937,696 @@ public:
 namespace Kokkos {
 namespace Impl {
 
-template< class FunctorType , class ReducerType, class ... Traits >
-class ParallelReduce< FunctorType
-                    , Kokkos::RangePolicy< Traits ... >
-                    , ReducerType
-                    , Kokkos::Cuda
-                    >
-{
-public:
-  typedef Kokkos::RangePolicy< Traits ... >         Policy ;
-private:
+template <class FunctorType, class ReducerType, class... Traits>
+class ParallelReduce<FunctorType, Kokkos::RangePolicy<Traits...>, ReducerType,
+                     Kokkos::Cuda> {
+ public:
+  typedef Kokkos::RangePolicy<Traits...> Policy;
 
+ private:
+  typedef typename Policy::WorkRange WorkRange;
+  typedef typename Policy::work_tag WorkTag;
+  typedef typename Policy::member_type Member;
+  typedef typename Policy::launch_bounds LaunchBounds;
 
-  typedef typename Policy::WorkRange    WorkRange ;
-  typedef typename Policy::work_tag     WorkTag ;
-  typedef typename Policy::member_type  Member ;
-  typedef typename Policy::launch_bounds LaunchBounds ;
-
-  typedef Kokkos::Impl::if_c< std::is_same<InvalidType,ReducerType>::value, FunctorType, ReducerType> ReducerConditional;
+  typedef Kokkos::Impl::if_c<std::is_same<InvalidType, ReducerType>::value,
+                             FunctorType, ReducerType>
+      ReducerConditional;
   typedef typename ReducerConditional::type ReducerTypeFwd;
-  typedef typename Kokkos::Impl::if_c< std::is_same<InvalidType,ReducerType>::value, WorkTag, void>::type WorkTagFwd;
+  typedef
+      typename Kokkos::Impl::if_c<std::is_same<InvalidType, ReducerType>::value,
+                                  WorkTag, void>::type WorkTagFwd;
 
-  typedef Kokkos::Impl::FunctorValueTraits< ReducerTypeFwd, WorkTagFwd > ValueTraits ;
-  typedef Kokkos::Impl::FunctorValueInit<   ReducerTypeFwd, WorkTagFwd > ValueInit ;
-  typedef Kokkos::Impl::FunctorValueJoin<   ReducerTypeFwd, WorkTagFwd > ValueJoin ;
+  typedef Kokkos::Impl::FunctorValueTraits<ReducerTypeFwd, WorkTagFwd>
+      ValueTraits;
+  typedef Kokkos::Impl::FunctorValueInit<ReducerTypeFwd, WorkTagFwd> ValueInit;
+  typedef Kokkos::Impl::FunctorValueJoin<ReducerTypeFwd, WorkTagFwd> ValueJoin;
 
-public:
+ public:
+  typedef typename ValueTraits::pointer_type pointer_type;
+  typedef typename ValueTraits::value_type value_type;
+  typedef typename ValueTraits::reference_type reference_type;
+  typedef FunctorType functor_type;
+  typedef Kokkos::Cuda::size_type size_type;
+  typedef typename Policy::index_type index_type;
 
-  typedef typename ValueTraits::pointer_type    pointer_type ;
-  typedef typename ValueTraits::value_type      value_type ;
-  typedef typename ValueTraits::reference_type  reference_type ;
-  typedef FunctorType                           functor_type ;
-  typedef Kokkos::Cuda::size_type                  size_type ;
-  typedef typename Policy::index_type             index_type ;
+  // Algorithmic constraints: blockSize is a power of two AND blockDim.y ==
+  // blockDim.z == 1
 
-  // Algorithmic constraints: blockSize is a power of two AND blockDim.y == blockDim.z == 1
+  const FunctorType m_functor;
+  const Policy m_policy;
+  const ReducerType m_reducer;
+  const pointer_type m_result_ptr;
+  const bool m_result_ptr_device_accessible;
+  size_type* m_scratch_space;
+  size_type* m_scratch_flags;
+  size_type* m_unified_space;
 
-  const FunctorType   m_functor ;
-  const Policy        m_policy ;
-  const ReducerType   m_reducer ;
-  const pointer_type  m_result_ptr ;
-  const bool          m_result_ptr_device_accessible ;
-  size_type *         m_scratch_space ;
-  size_type *         m_scratch_flags ;
-  size_type *         m_unified_space ;
-
-  // Shall we use the shfl based reduction or not (only use it for static sized types of more than 128bit)
-  enum { UseShflReduction = false };//((sizeof(value_type)>2*sizeof(double)) && ValueTraits::StaticValueSize) };
-  // Some crutch to do function overloading
-private:
+  // Shall we use the shfl based reduction or not (only use it for static sized
+  // types of more than 128bit)
+  enum {
+    UseShflReduction = false
+  };  //((sizeof(value_type)>2*sizeof(double)) && ValueTraits::StaticValueSize)
+      //};
+      // Some crutch to do function overloading
+ private:
   typedef double DummyShflReductionType;
   typedef int DummySHMEMReductionType;
 
-public:
+ public:
   // Make the exec_range calls call to Reduce::DeviceIterateTile
-  template< class TagType >
+  template <class TagType>
   __device__ inline
-  typename std::enable_if< std::is_same< TagType , void >::value >::type
-  exec_range( const Member & i , reference_type update ) const
-    { m_functor( i , update ); }
-
-  template< class TagType >
-  __device__ inline
-  typename std::enable_if< ! std::is_same< TagType , void >::value >::type
-  exec_range( const Member & i , reference_type update ) const
-    { m_functor( TagType() , i , update ); }
-
-  __device__ inline
-  void operator() () const {
-/*    run(Kokkos::Impl::if_c<UseShflReduction, DummyShflReductionType, DummySHMEMReductionType>::select(1,1.0) );
+      typename std::enable_if<std::is_same<TagType, void>::value>::type
+      exec_range(const Member& i, reference_type update) const {
+    m_functor(i, update);
   }
 
+  template <class TagType>
   __device__ inline
-  void run(const DummySHMEMReductionType& ) const
-  {*/
-    const integral_nonzero_constant< size_type , ValueTraits::StaticValueSize / sizeof(size_type) >
-      word_count( ValueTraits::value_size( ReducerConditional::select(m_functor , m_reducer) ) / sizeof(size_type) );
+      typename std::enable_if<!std::is_same<TagType, void>::value>::type
+      exec_range(const Member& i, reference_type update) const {
+    m_functor(TagType(), i, update);
+  }
+
+  __device__ inline void operator()() const {
+    /*    run(Kokkos::Impl::if_c<UseShflReduction, DummyShflReductionType,
+      DummySHMEMReductionType>::select(1,1.0) );
+      }
+
+      __device__ inline
+      void run(const DummySHMEMReductionType& ) const
+      {*/
+    const integral_nonzero_constant<size_type, ValueTraits::StaticValueSize /
+                                                   sizeof(size_type)>
+        word_count(ValueTraits::value_size(
+                       ReducerConditional::select(m_functor, m_reducer)) /
+                   sizeof(size_type));
 
     {
       reference_type value =
-        ValueInit::init( ReducerConditional::select(m_functor , m_reducer) , kokkos_impl_cuda_shared_memory<size_type>() + threadIdx.y * word_count.value );
+          ValueInit::init(ReducerConditional::select(m_functor, m_reducer),
+                          kokkos_impl_cuda_shared_memory<size_type>() +
+                              threadIdx.y * word_count.value);
 
-      // Number of blocks is bounded so that the reduction can be limited to two passes.
-      // Each thread block is given an approximately equal amount of work to perform.
-      // Accumulate the values for this block.
-      // The accumulation ordering does not match the final pass, but is arithmatically equivalent.
+      // Number of blocks is bounded so that the reduction can be limited to two
+      // passes. Each thread block is given an approximately equal amount of
+      // work to perform. Accumulate the values for this block. The accumulation
+      // ordering does not match the final pass, but is arithmatically
+      // equivalent.
 
-      const WorkRange range( m_policy , blockIdx.x , gridDim.x );
+      const WorkRange range(m_policy, blockIdx.x, gridDim.x);
 
-      for ( Member iwork = range.begin() + threadIdx.y , iwork_end = range.end() ;
-            iwork < iwork_end ; iwork += blockDim.y ) {
-        this-> template exec_range< WorkTag >( iwork , value );
+      for (Member iwork = range.begin() + threadIdx.y, iwork_end = range.end();
+           iwork < iwork_end; iwork += blockDim.y) {
+        this->template exec_range<WorkTag>(iwork, value);
       }
     }
 
     // Reduce with final value at blockDim.y - 1 location.
-    if ( cuda_single_inter_block_reduce_scan<false,ReducerTypeFwd,WorkTagFwd>(
-           ReducerConditional::select(m_functor , m_reducer) , blockIdx.x , gridDim.x ,
-           kokkos_impl_cuda_shared_memory<size_type>() , m_scratch_space , m_scratch_flags ) ) {
+    if (cuda_single_inter_block_reduce_scan<false, ReducerTypeFwd, WorkTagFwd>(
+            ReducerConditional::select(m_functor, m_reducer), blockIdx.x,
+            gridDim.x, kokkos_impl_cuda_shared_memory<size_type>(),
+            m_scratch_space, m_scratch_flags)) {
+      // This is the final block with the final result at the final threads'
+      // location
 
-      // This is the final block with the final result at the final threads' location
+      size_type* const shared = kokkos_impl_cuda_shared_memory<size_type>() +
+                                (blockDim.y - 1) * word_count.value;
+      size_type* const global =
+          m_result_ptr_device_accessible
+              ? reinterpret_cast<size_type*>(m_result_ptr)
+              : (m_unified_space ? m_unified_space : m_scratch_space);
 
-      size_type * const shared = kokkos_impl_cuda_shared_memory<size_type>() + ( blockDim.y - 1 ) * word_count.value ;
-      size_type * const global = m_result_ptr_device_accessible? reinterpret_cast<size_type*>(m_result_ptr) : 
-                                 ( m_unified_space ? m_unified_space : m_scratch_space );
-
-      if ( threadIdx.y == 0 ) {
-        Kokkos::Impl::FunctorFinal< ReducerTypeFwd , WorkTagFwd >::final( ReducerConditional::select(m_functor , m_reducer) , shared );
+      if (threadIdx.y == 0) {
+        Kokkos::Impl::FunctorFinal<ReducerTypeFwd, WorkTagFwd>::final(
+            ReducerConditional::select(m_functor, m_reducer), shared);
       }
 
-      if ( CudaTraits::WarpSize < word_count.value ) { __syncthreads(); }
+      if (CudaTraits::WarpSize < word_count.value) {
+        __syncthreads();
+      }
 
-      for ( unsigned i = threadIdx.y ; i < word_count.value ; i += blockDim.y ) { global[i] = shared[i]; }
+      for (unsigned i = threadIdx.y; i < word_count.value; i += blockDim.y) {
+        global[i] = shared[i];
+      }
     }
   }
 
-/*  __device__ inline
-   void run(const DummyShflReductionType&) const
-   {
-     value_type value;
-     ValueInit::init( ReducerConditional::select(m_functor , m_reducer) , &value);
-     // Number of blocks is bounded so that the reduction can be limited to two passes.
-     // Each thread block is given an approximately equal amount of work to perform.
-     // Accumulate the values for this block.
-     // The accumulation ordering does not match the final pass, but is arithmatically equivalent.
+  /*  __device__ inline
+     void run(const DummyShflReductionType&) const
+     {
+       value_type value;
+       ValueInit::init( ReducerConditional::select(m_functor , m_reducer) ,
+     &value);
+       // Number of blocks is bounded so that the reduction can be limited to
+     two passes.
+       // Each thread block is given an approximately equal amount of work to
+     perform.
+       // Accumulate the values for this block.
+       // The accumulation ordering does not match the final pass, but is
+     arithmatically equivalent.
 
-     const WorkRange range( m_policy , blockIdx.x , gridDim.x );
+       const WorkRange range( m_policy , blockIdx.x , gridDim.x );
 
-     for ( Member iwork = range.begin() + threadIdx.y , iwork_end = range.end() ;
-           iwork < iwork_end ; iwork += blockDim.y ) {
-       this-> template exec_range< WorkTag >( iwork , value );
-     }
-
-     pointer_type const result = (pointer_type) (m_unified_space ? m_unified_space : m_scratch_space) ;
-
-     int max_active_thread = range.end()-range.begin() < blockDim.y ? range.end() - range.begin():blockDim.y;
-
-     max_active_thread = (max_active_thread == 0)?blockDim.y:max_active_thread;
-
-    value_type init;
-    ValueInit::init( ReducerConditional::select(m_functor , m_reducer) , &init);
-     if(Impl::cuda_inter_block_reduction<ReducerTypeFwd,ValueJoin,WorkTagFwd>
-            (value,init,ValueJoin(ReducerConditional::select(m_functor , m_reducer)),m_scratch_space,result,m_scratch_flags,max_active_thread)) {
-       const unsigned id = threadIdx.y*blockDim.x + threadIdx.x;
-       if(id==0) {
-         Kokkos::Impl::FunctorFinal< ReducerTypeFwd , WorkTagFwd >::final( ReducerConditional::select(m_functor , m_reducer) , (void*) &value );
-         *result = value;
+       for ( Member iwork = range.begin() + threadIdx.y , iwork_end =
+     range.end() ; iwork < iwork_end ; iwork += blockDim.y ) { this-> template
+     exec_range< WorkTag >( iwork , value );
        }
-     }
-   }*/
+
+       pointer_type const result = (pointer_type) (m_unified_space ?
+     m_unified_space : m_scratch_space) ;
+
+       int max_active_thread = range.end()-range.begin() < blockDim.y ?
+     range.end() - range.begin():blockDim.y;
+
+       max_active_thread = (max_active_thread ==
+     0)?blockDim.y:max_active_thread;
+
+      value_type init;
+      ValueInit::init( ReducerConditional::select(m_functor , m_reducer) ,
+     &init);
+       if(Impl::cuda_inter_block_reduction<ReducerTypeFwd,ValueJoin,WorkTagFwd>
+              (value,init,ValueJoin(ReducerConditional::select(m_functor ,
+     m_reducer)),m_scratch_space,result,m_scratch_flags,max_active_thread)) {
+         const unsigned id = threadIdx.y*blockDim.x + threadIdx.x;
+         if(id==0) {
+           Kokkos::Impl::FunctorFinal< ReducerTypeFwd , WorkTagFwd >::final(
+     ReducerConditional::select(m_functor , m_reducer) , (void*) &value );
+           *result = value;
+         }
+       }
+     }*/
 
   // Determine block size constrained by shared memory:
-  inline
-  unsigned local_block_size( const FunctorType & f )
-    {
-      unsigned n = CudaTraits::WarpSize * 8 ;
-      int shmem_size = cuda_single_inter_block_reduce_scan_shmem<false,FunctorType,WorkTag>( f , n );
-      while ( (n && (m_policy.space().impl_internal_space_instance()->m_maxShmemPerBlock < shmem_size)) ||
-          (n > static_cast<unsigned>(Kokkos::Impl::cuda_get_max_block_size< ParallelReduce, LaunchBounds>( f , 1, shmem_size , 0 )))) {
-        n >>= 1 ;
-        shmem_size = cuda_single_inter_block_reduce_scan_shmem<false,FunctorType,WorkTag>( f , n );
-      }
-      return n ;
+  inline unsigned local_block_size(const FunctorType& f) {
+    unsigned n = CudaTraits::WarpSize * 8;
+    int shmem_size =
+        cuda_single_inter_block_reduce_scan_shmem<false, FunctorType, WorkTag>(
+            f, n);
+    while (
+        (n &&
+         (m_policy.space().impl_internal_space_instance()->m_maxShmemPerBlock <
+          shmem_size)) ||
+        (n > static_cast<unsigned>(
+                 Kokkos::Impl::cuda_get_max_block_size<
+                     ParallelReduce, LaunchBounds>(f, 1, shmem_size, 0)))) {
+      n >>= 1;
+      shmem_size = cuda_single_inter_block_reduce_scan_shmem<false, FunctorType,
+                                                             WorkTag>(f, n);
     }
+    return n;
+  }
 
-  inline
-  void execute()
-    {
-      const index_type nwork = m_policy.end() - m_policy.begin();
-      if ( nwork ) {
-        const int block_size = local_block_size( m_functor );
+  inline void execute() {
+    const index_type nwork = m_policy.end() - m_policy.begin();
+    if (nwork) {
+      const int block_size = local_block_size(m_functor);
 
-        m_scratch_space = cuda_internal_scratch_space( m_policy.space(), ValueTraits::value_size( ReducerConditional::select(m_functor , m_reducer) ) * block_size /* block_size == max block_count */ );
-        m_scratch_flags = cuda_internal_scratch_flags( m_policy.space(), sizeof(size_type) );
-        m_unified_space = cuda_internal_scratch_unified( m_policy.space(), ValueTraits::value_size( ReducerConditional::select(m_functor , m_reducer) ) );
+      m_scratch_space = cuda_internal_scratch_space(
+          m_policy.space(), ValueTraits::value_size(ReducerConditional::select(
+                                m_functor, m_reducer)) *
+                                block_size /* block_size == max block_count */);
+      m_scratch_flags =
+          cuda_internal_scratch_flags(m_policy.space(), sizeof(size_type));
+      m_unified_space = cuda_internal_scratch_unified(
+          m_policy.space(), ValueTraits::value_size(ReducerConditional::select(
+                                m_functor, m_reducer)));
 
-        // REQUIRED ( 1 , N , 1 )
-        const dim3 block( 1 , block_size , 1 );
-        // Required grid.x <= block.y
-        const dim3 grid( std::min( int(block.y) , int( ( nwork + block.y - 1 ) / block.y ) ) , 1 , 1 );
+      // REQUIRED ( 1 , N , 1 )
+      dim3 block(1, block_size, 1);
+      // Required grid.x <= block.y
+      dim3 grid(std::min(int(block.y), int((nwork + block.y - 1) / block.y)), 1,
+                1);
 
-      const int shmem = UseShflReduction?0:cuda_single_inter_block_reduce_scan_shmem<false,FunctorType,WorkTag>( m_functor , block.y );
+      const int shmem =
+          UseShflReduction
+              ? 0
+              : cuda_single_inter_block_reduce_scan_shmem<false, FunctorType,
+                                                          WorkTag>(m_functor,
+                                                                   block.y);
 
-      CudaParallelLaunch< ParallelReduce, LaunchBounds >( *this, grid, block, shmem , m_policy.space().impl_internal_space_instance() , false ); // copy to device and execute
+#ifdef KOKKOS_IMPL_DEBUG_CUDA_SERIAL_EXECUTION
+      if (Kokkos::Impl::CudaInternal::cuda_use_serial_execution()) {
+        block = dim3(1, 1, 1);
+        grid  = dim3(1, 1, 1);
+      }
+#endif
 
-      if(!m_result_ptr_device_accessible) {
+      CudaParallelLaunch<ParallelReduce, LaunchBounds>(
+          *this, grid, block, shmem,
+          m_policy.space().impl_internal_space_instance(),
+          false);  // copy to device and execute
+
+      if (!m_result_ptr_device_accessible) {
         Cuda().fence();
 
-        if ( m_result_ptr ) {
-          if ( m_unified_space ) {
-            const int count = ValueTraits::value_count( ReducerConditional::select(m_functor , m_reducer)  );
-            for ( int i = 0 ; i < count ; ++i ) { m_result_ptr[i] = pointer_type(m_unified_space)[i] ; }
-          }
-          else {
-            const int size = ValueTraits::value_size( ReducerConditional::select(m_functor , m_reducer)  );
-            DeepCopy<HostSpace,CudaSpace>( m_result_ptr , m_scratch_space , size );
+        if (m_result_ptr) {
+          if (m_unified_space) {
+            const int count = ValueTraits::value_count(
+                ReducerConditional::select(m_functor, m_reducer));
+            for (int i = 0; i < count; ++i) {
+              m_result_ptr[i] = pointer_type(m_unified_space)[i];
+            }
+          } else {
+            const int size = ValueTraits::value_size(
+                ReducerConditional::select(m_functor, m_reducer));
+            DeepCopy<HostSpace, CudaSpace>(m_result_ptr, m_scratch_space, size);
           }
         }
       }
-    }
-    else {
+    } else {
       if (m_result_ptr) {
-        ValueInit::init( ReducerConditional::select(m_functor , m_reducer) , m_result_ptr );
+        ValueInit::init(ReducerConditional::select(m_functor, m_reducer),
+                        m_result_ptr);
       }
     }
   }
 
-  template< class ViewType >
-  ParallelReduce( const FunctorType  & arg_functor
-                , const Policy       & arg_policy
-                , const ViewType & arg_result
-                , typename std::enable_if<
-                   Kokkos::is_view< ViewType >::value
-                ,void*>::type = NULL)
-  : m_functor( arg_functor )
-  , m_policy(  arg_policy )
-  , m_reducer( InvalidType() )
-  , m_result_ptr( arg_result.data() )
-  , m_result_ptr_device_accessible(MemorySpaceAccess< Kokkos::CudaSpace , typename ViewType::memory_space>::accessible )
-  , m_scratch_space( 0 )
-  , m_scratch_flags( 0 )
-  , m_unified_space( 0 )
-  { }
+  template <class ViewType>
+  ParallelReduce(const FunctorType& arg_functor, const Policy& arg_policy,
+                 const ViewType& arg_result,
+                 typename std::enable_if<Kokkos::is_view<ViewType>::value,
+                                         void*>::type = NULL)
+      : m_functor(arg_functor),
+        m_policy(arg_policy),
+        m_reducer(InvalidType()),
+        m_result_ptr(arg_result.data()),
+        m_result_ptr_device_accessible(
+            MemorySpaceAccess<Kokkos::CudaSpace,
+                              typename ViewType::memory_space>::accessible),
+        m_scratch_space(0),
+        m_scratch_flags(0),
+        m_unified_space(0) {}
 
-  ParallelReduce( const FunctorType  & arg_functor
-                , const Policy       & arg_policy
-                , const ReducerType & reducer)
-  : m_functor( arg_functor )
-  , m_policy(  arg_policy )
-  , m_reducer( reducer )
-  , m_result_ptr( reducer.view().data() )
-  , m_result_ptr_device_accessible(MemorySpaceAccess< Kokkos::CudaSpace , typename ReducerType::result_view_type::memory_space>::accessible )
-  , m_scratch_space( 0 )
-  , m_scratch_flags( 0 )
-  , m_unified_space( 0 )
-  { }
+  ParallelReduce(const FunctorType& arg_functor, const Policy& arg_policy,
+                 const ReducerType& reducer)
+      : m_functor(arg_functor),
+        m_policy(arg_policy),
+        m_reducer(reducer),
+        m_result_ptr(reducer.view().data()),
+        m_result_ptr_device_accessible(
+            MemorySpaceAccess<Kokkos::CudaSpace,
+                              typename ReducerType::result_view_type::
+                                  memory_space>::accessible),
+        m_scratch_space(0),
+        m_scratch_flags(0),
+        m_unified_space(0) {}
 };
 
-
 // MDRangePolicy impl
-template< class FunctorType , class ReducerType, class ... Traits >
-class ParallelReduce< FunctorType
-                    , Kokkos::MDRangePolicy< Traits ... >
-                    , ReducerType
-                    , Kokkos::Cuda
-                    >
-{
-public:
-  typedef Kokkos::MDRangePolicy< Traits ... > Policy ;
-private:
+template <class FunctorType, class ReducerType, class... Traits>
+class ParallelReduce<FunctorType, Kokkos::MDRangePolicy<Traits...>, ReducerType,
+                     Kokkos::Cuda> {
+ public:
+  typedef Kokkos::MDRangePolicy<Traits...> Policy;
 
-  typedef typename Policy::array_index_type                 array_index_type;
-  typedef typename Policy::index_type                       index_type;
+ private:
+  typedef typename Policy::array_index_type array_index_type;
+  typedef typename Policy::index_type index_type;
 
-  typedef typename Policy::work_tag     WorkTag ;
-  typedef typename Policy::member_type  Member ;
+  typedef typename Policy::work_tag WorkTag;
+  typedef typename Policy::member_type Member;
   typedef typename Policy::launch_bounds LaunchBounds;
 
-  typedef Kokkos::Impl::if_c< std::is_same<InvalidType,ReducerType>::value, FunctorType, ReducerType> ReducerConditional;
+  typedef Kokkos::Impl::if_c<std::is_same<InvalidType, ReducerType>::value,
+                             FunctorType, ReducerType>
+      ReducerConditional;
   typedef typename ReducerConditional::type ReducerTypeFwd;
-  typedef typename Kokkos::Impl::if_c< std::is_same<InvalidType,ReducerType>::value, WorkTag, void>::type WorkTagFwd;
+  typedef
+      typename Kokkos::Impl::if_c<std::is_same<InvalidType, ReducerType>::value,
+                                  WorkTag, void>::type WorkTagFwd;
 
-  typedef Kokkos::Impl::FunctorValueTraits< ReducerTypeFwd, WorkTagFwd > ValueTraits ;
-  typedef Kokkos::Impl::FunctorValueInit<   ReducerTypeFwd, WorkTagFwd > ValueInit ;
-  typedef Kokkos::Impl::FunctorValueJoin<   ReducerTypeFwd, WorkTagFwd > ValueJoin ;
+  typedef Kokkos::Impl::FunctorValueTraits<ReducerTypeFwd, WorkTagFwd>
+      ValueTraits;
+  typedef Kokkos::Impl::FunctorValueInit<ReducerTypeFwd, WorkTagFwd> ValueInit;
+  typedef Kokkos::Impl::FunctorValueJoin<ReducerTypeFwd, WorkTagFwd> ValueJoin;
 
-public:
+ public:
+  typedef typename ValueTraits::pointer_type pointer_type;
+  typedef typename ValueTraits::value_type value_type;
+  typedef typename ValueTraits::reference_type reference_type;
+  typedef FunctorType functor_type;
+  typedef Cuda::size_type size_type;
 
-  typedef typename ValueTraits::pointer_type    pointer_type ;
-  typedef typename ValueTraits::value_type      value_type ;
-  typedef typename ValueTraits::reference_type  reference_type ;
-  typedef FunctorType                           functor_type ;
-  typedef Cuda::size_type                       size_type ;
+  // Algorithmic constraints: blockSize is a power of two AND blockDim.y ==
+  // blockDim.z == 1
 
-  // Algorithmic constraints: blockSize is a power of two AND blockDim.y == blockDim.z == 1
+  const FunctorType m_functor;
+  const Policy m_policy;  // used for workrange and nwork
+  const ReducerType m_reducer;
+  const pointer_type m_result_ptr;
+  const bool m_result_ptr_device_accessible;
+  size_type* m_scratch_space;
+  size_type* m_scratch_flags;
+  size_type* m_unified_space;
 
-  const FunctorType   m_functor ;
-  const Policy        m_policy ; // used for workrange and nwork
-  const ReducerType   m_reducer ;
-  const pointer_type  m_result_ptr ;
-  const bool          m_result_ptr_device_accessible ;
-  size_type *         m_scratch_space ;
-  size_type *         m_scratch_flags ;
-  size_type *         m_unified_space ;
+  typedef typename Kokkos::Impl::Reduce::DeviceIterateTile<
+      Policy::rank, Policy, FunctorType, typename Policy::work_tag,
+      reference_type>
+      DeviceIteratePattern;
 
-  typedef typename Kokkos::Impl::Reduce::DeviceIterateTile<Policy::rank, Policy, FunctorType, typename Policy::work_tag, reference_type> DeviceIteratePattern;
-
-  // Shall we use the shfl based reduction or not (only use it for static sized types of more than 128bit
-  enum { UseShflReduction = ((sizeof(value_type)>2*sizeof(double)) && (ValueTraits::StaticValueSize!=0)) };
+  // Shall we use the shfl based reduction or not (only use it for static sized
+  // types of more than 128bit
+  enum {
+    UseShflReduction = ((sizeof(value_type) > 2 * sizeof(double)) &&
+                        (ValueTraits::StaticValueSize != 0))
+  };
   // Some crutch to do function overloading
-private:
+ private:
   typedef double DummyShflReductionType;
   typedef int DummySHMEMReductionType;
 
-public:
-  inline
-  __device__
-  void
-  exec_range( reference_type update ) const
-  {
-    Kokkos::Impl::Reduce::DeviceIterateTile<Policy::rank,Policy,FunctorType,typename Policy::work_tag, reference_type>(m_policy, m_functor, update).exec_range();
+ public:
+  inline __device__ void exec_range(reference_type update) const {
+    Kokkos::Impl::Reduce::DeviceIterateTile<Policy::rank, Policy, FunctorType,
+                                            typename Policy::work_tag,
+                                            reference_type>(m_policy, m_functor,
+                                                            update)
+        .exec_range();
   }
 
-  inline
-  __device__
-  void operator() (void) const {
-/*    run(Kokkos::Impl::if_c<UseShflReduction, DummyShflReductionType, DummySHMEMReductionType>::select(1,1.0) );
-  }
+  inline __device__ void operator()(void) const {
+    /*    run(Kokkos::Impl::if_c<UseShflReduction, DummyShflReductionType,
+      DummySHMEMReductionType>::select(1,1.0) );
+      }
 
-  __device__ inline
-  void run(const DummySHMEMReductionType& ) const
-  {*/
-    const integral_nonzero_constant< size_type , ValueTraits::StaticValueSize / sizeof(size_type) >
-      word_count( ValueTraits::value_size( ReducerConditional::select(m_functor , m_reducer) ) / sizeof(size_type) );
+      __device__ inline
+      void run(const DummySHMEMReductionType& ) const
+      {*/
+    const integral_nonzero_constant<size_type, ValueTraits::StaticValueSize /
+                                                   sizeof(size_type)>
+        word_count(ValueTraits::value_size(
+                       ReducerConditional::select(m_functor, m_reducer)) /
+                   sizeof(size_type));
 
     {
       reference_type value =
-        ValueInit::init( ReducerConditional::select(m_functor , m_reducer) , kokkos_impl_cuda_shared_memory<size_type>() + threadIdx.y * word_count.value );
+          ValueInit::init(ReducerConditional::select(m_functor, m_reducer),
+                          kokkos_impl_cuda_shared_memory<size_type>() +
+                              threadIdx.y * word_count.value);
 
-      // Number of blocks is bounded so that the reduction can be limited to two passes.
-      // Each thread block is given an approximately equal amount of work to perform.
-      // Accumulate the values for this block.
-      // The accumulation ordering does not match the final pass, but is arithmatically equivalent.
+      // Number of blocks is bounded so that the reduction can be limited to two
+      // passes. Each thread block is given an approximately equal amount of
+      // work to perform. Accumulate the values for this block. The accumulation
+      // ordering does not match the final pass, but is arithmatically
+      // equivalent.
 
-      this-> exec_range( value );
+      this->exec_range(value);
     }
 
     // Reduce with final value at blockDim.y - 1 location.
     // Problem: non power-of-two blockDim
-    if ( cuda_single_inter_block_reduce_scan<false,ReducerTypeFwd,WorkTagFwd>(
-           ReducerConditional::select(m_functor , m_reducer) , blockIdx.x , gridDim.x ,
-           kokkos_impl_cuda_shared_memory<size_type>() , m_scratch_space , m_scratch_flags ) ) {
+    if (cuda_single_inter_block_reduce_scan<false, ReducerTypeFwd, WorkTagFwd>(
+            ReducerConditional::select(m_functor, m_reducer), blockIdx.x,
+            gridDim.x, kokkos_impl_cuda_shared_memory<size_type>(),
+            m_scratch_space, m_scratch_flags)) {
+      // This is the final block with the final result at the final threads'
+      // location
+      size_type* const shared = kokkos_impl_cuda_shared_memory<size_type>() +
+                                (blockDim.y - 1) * word_count.value;
+      size_type* const global =
+          m_result_ptr_device_accessible
+              ? reinterpret_cast<size_type*>(m_result_ptr)
+              : (m_unified_space ? m_unified_space : m_scratch_space);
 
-      // This is the final block with the final result at the final threads' location
-      size_type * const shared = kokkos_impl_cuda_shared_memory<size_type>() + ( blockDim.y - 1 ) * word_count.value ;
-      size_type * const global = m_result_ptr_device_accessible? reinterpret_cast<size_type*>(m_result_ptr) :
-                                 ( m_unified_space ? m_unified_space : m_scratch_space );
-
-      if ( threadIdx.y == 0 ) {
-        Kokkos::Impl::FunctorFinal< ReducerTypeFwd , WorkTagFwd >::final( ReducerConditional::select(m_functor , m_reducer) , shared );
+      if (threadIdx.y == 0) {
+        Kokkos::Impl::FunctorFinal<ReducerTypeFwd, WorkTagFwd>::final(
+            ReducerConditional::select(m_functor, m_reducer), shared);
       }
 
-      if ( CudaTraits::WarpSize < word_count.value ) { __syncthreads(); }
+      if (CudaTraits::WarpSize < word_count.value) {
+        __syncthreads();
+      }
 
-      for ( unsigned i = threadIdx.y ; i < word_count.value ; i += blockDim.y ) { global[i] = shared[i]; }
+      for (unsigned i = threadIdx.y; i < word_count.value; i += blockDim.y) {
+        global[i] = shared[i];
+      }
     }
   }
 
-/*  __device__ inline
-   void run(const DummyShflReductionType&) const
-   {
+  /*  __device__ inline
+     void run(const DummyShflReductionType&) const
+     {
 
-     value_type value;
-     ValueInit::init( ReducerConditional::select(m_functor , m_reducer) , &value);
-     // Number of blocks is bounded so that the reduction can be limited to two passes.
-     // Each thread block is given an approximately equal amount of work to perform.
-     // Accumulate the values for this block.
-     // The accumulation ordering does not match the final pass, but is arithmatically equivalent.
+       value_type value;
+       ValueInit::init( ReducerConditional::select(m_functor , m_reducer) ,
+     &value);
+       // Number of blocks is bounded so that the reduction can be limited to
+     two passes.
+       // Each thread block is given an approximately equal amount of work to
+     perform.
+       // Accumulate the values for this block.
+       // The accumulation ordering does not match the final pass, but is
+     arithmatically equivalent.
 
-     const Member work_part =
-       ( ( m_policy.m_num_tiles + ( gridDim.x - 1 ) ) / gridDim.x ); //portion of tiles handled by each block
+       const Member work_part =
+         ( ( m_policy.m_num_tiles + ( gridDim.x - 1 ) ) / gridDim.x ); //portion
+     of tiles handled by each block
 
-     this-> exec_range( value );
+       this-> exec_range( value );
 
-     pointer_type const result = (pointer_type) (m_unified_space ? m_unified_space : m_scratch_space) ;
+       pointer_type const result = (pointer_type) (m_unified_space ?
+     m_unified_space : m_scratch_space) ;
 
-     int max_active_thread = work_part < blockDim.y ? work_part:blockDim.y;
-     max_active_thread = (max_active_thread == 0)?blockDim.y:max_active_thread;
+       int max_active_thread = work_part < blockDim.y ? work_part:blockDim.y;
+       max_active_thread = (max_active_thread ==
+     0)?blockDim.y:max_active_thread;
 
-     value_type init;
-     ValueInit::init( ReducerConditional::select(m_functor , m_reducer) , &init);
-     if(Impl::cuda_inter_block_reduction<ReducerTypeFwd,ValueJoin,WorkTagFwd>
-         (value,init,ValueJoin(ReducerConditional::select(m_functor , m_reducer)),m_scratch_space,result,m_scratch_flags,max_active_thread)) {
-       const unsigned id = threadIdx.y*blockDim.x + threadIdx.x;
-       if(id==0) {
-         Kokkos::Impl::FunctorFinal< ReducerTypeFwd , WorkTagFwd >::final( ReducerConditional::select(m_functor , m_reducer) , (void*) &value );
-         *result = value;
+       value_type init;
+       ValueInit::init( ReducerConditional::select(m_functor , m_reducer) ,
+     &init);
+       if(Impl::cuda_inter_block_reduction<ReducerTypeFwd,ValueJoin,WorkTagFwd>
+           (value,init,ValueJoin(ReducerConditional::select(m_functor ,
+     m_reducer)),m_scratch_space,result,m_scratch_flags,max_active_thread)) {
+         const unsigned id = threadIdx.y*blockDim.x + threadIdx.x;
+         if(id==0) {
+           Kokkos::Impl::FunctorFinal< ReducerTypeFwd , WorkTagFwd >::final(
+     ReducerConditional::select(m_functor , m_reducer) , (void*) &value );
+           *result = value;
+         }
        }
      }
-   }
-*/
+  */
   // Determine block size constrained by shared memory:
-  inline
-  unsigned local_block_size( const FunctorType & f )
-    {
-      unsigned n = CudaTraits::WarpSize * 8 ;
-      int shmem_size = cuda_single_inter_block_reduce_scan_shmem<false,FunctorType,WorkTag>( f , n );
-      while ( (n && (m_policy.space().impl_internal_space_instance()->m_maxShmemPerBlock < shmem_size)) ||
-          (n > static_cast<unsigned>(Kokkos::Impl::cuda_get_max_block_size< ParallelReduce, LaunchBounds>( f , 1, shmem_size , 0 )))) {
-        n >>= 1 ;
-        shmem_size = cuda_single_inter_block_reduce_scan_shmem<false,FunctorType,WorkTag>( f , n );
-      }
-      return n ;
+  inline unsigned local_block_size(const FunctorType& f) {
+    unsigned n = CudaTraits::WarpSize * 8;
+    int shmem_size =
+        cuda_single_inter_block_reduce_scan_shmem<false, FunctorType, WorkTag>(
+            f, n);
+    while (
+        (n &&
+         (m_policy.space().impl_internal_space_instance()->m_maxShmemPerBlock <
+          shmem_size)) ||
+        (n > static_cast<unsigned>(
+                 Kokkos::Impl::cuda_get_max_block_size<
+                     ParallelReduce, LaunchBounds>(f, 1, shmem_size, 0)))) {
+      n >>= 1;
+      shmem_size = cuda_single_inter_block_reduce_scan_shmem<false, FunctorType,
+                                                             WorkTag>(f, n);
     }
+    return n;
+  }
 
-  inline
-  void execute()
-    {
-      const int nwork = m_policy.m_num_tiles;
-      if ( nwork ) {
-        int block_size = m_policy.m_prod_tile_dims;
-        // CONSTRAINT: Algorithm requires block_size >= product of tile dimensions
-        // Nearest power of two
-        int exponent_pow_two = std::ceil( std::log2(block_size) );
-        block_size = std::pow(2, exponent_pow_two);
-        int suggested_blocksize = local_block_size( m_functor );
+  inline void execute() {
+    const int nwork = m_policy.m_num_tiles;
+    if (nwork) {
+      int block_size = m_policy.m_prod_tile_dims;
+      // CONSTRAINT: Algorithm requires block_size >= product of tile dimensions
+      // Nearest power of two
+      int exponent_pow_two    = std::ceil(std::log2(block_size));
+      block_size              = std::pow(2, exponent_pow_two);
+      int suggested_blocksize = local_block_size(m_functor);
 
-        block_size = (block_size > suggested_blocksize) ? block_size : suggested_blocksize ; //Note: block_size must be less than or equal to 512
+      block_size = (block_size > suggested_blocksize)
+                       ? block_size
+                       : suggested_blocksize;  // Note: block_size must be less
+                                               // than or equal to 512
 
+      m_scratch_space = cuda_internal_scratch_space(
+          m_policy.space(), ValueTraits::value_size(ReducerConditional::select(
+                                m_functor, m_reducer)) *
+                                block_size /* block_size == max block_count */);
+      m_scratch_flags =
+          cuda_internal_scratch_flags(m_policy.space(), sizeof(size_type));
+      m_unified_space = cuda_internal_scratch_unified(
+          m_policy.space(), ValueTraits::value_size(ReducerConditional::select(
+                                m_functor, m_reducer)));
 
-        m_scratch_space = cuda_internal_scratch_space( m_policy.space(), ValueTraits::value_size( ReducerConditional::select(m_functor , m_reducer) ) * block_size /* block_size == max block_count */ );
-        m_scratch_flags = cuda_internal_scratch_flags( m_policy.space(), sizeof(size_type) );
-        m_unified_space = cuda_internal_scratch_unified( m_policy.space(), ValueTraits::value_size( ReducerConditional::select(m_functor , m_reducer) ) );
+      // REQUIRED ( 1 , N , 1 )
+      const dim3 block(1, block_size, 1);
+      // Required grid.x <= block.y
+      const dim3 grid(std::min(int(block.y), int(nwork)), 1, 1);
 
-        // REQUIRED ( 1 , N , 1 )
-        const dim3 block( 1 , block_size , 1 );
-        // Required grid.x <= block.y
-        const dim3 grid( std::min( int(block.y) , int( nwork ) ) , 1 , 1 );
+      const int shmem =
+          UseShflReduction
+              ? 0
+              : cuda_single_inter_block_reduce_scan_shmem<false, FunctorType,
+                                                          WorkTag>(m_functor,
+                                                                   block.y);
 
-      const int shmem = UseShflReduction?0:cuda_single_inter_block_reduce_scan_shmem<false,FunctorType,WorkTag>( m_functor , block.y );
+      CudaParallelLaunch<ParallelReduce, LaunchBounds>(
+          *this, grid, block, shmem,
+          m_policy.space().impl_internal_space_instance(),
+          false);  // copy to device and execute
 
-      CudaParallelLaunch< ParallelReduce, LaunchBounds >( *this, grid, block, shmem , m_policy.space().impl_internal_space_instance() , false ); // copy to device and execute
-
-      if(!m_result_ptr_device_accessible) {
+      if (!m_result_ptr_device_accessible) {
         Cuda().fence();
 
-        if ( m_result_ptr ) {
-          if ( m_unified_space ) {
-            const int count = ValueTraits::value_count( ReducerConditional::select(m_functor , m_reducer)  );
-            for ( int i = 0 ; i < count ; ++i ) { m_result_ptr[i] = pointer_type(m_unified_space)[i] ; }
-          }
-          else {
-            const int size = ValueTraits::value_size( ReducerConditional::select(m_functor , m_reducer)  );
-            DeepCopy<HostSpace,CudaSpace>( m_result_ptr , m_scratch_space , size );
+        if (m_result_ptr) {
+          if (m_unified_space) {
+            const int count = ValueTraits::value_count(
+                ReducerConditional::select(m_functor, m_reducer));
+            for (int i = 0; i < count; ++i) {
+              m_result_ptr[i] = pointer_type(m_unified_space)[i];
+            }
+          } else {
+            const int size = ValueTraits::value_size(
+                ReducerConditional::select(m_functor, m_reducer));
+            DeepCopy<HostSpace, CudaSpace>(m_result_ptr, m_scratch_space, size);
           }
         }
       }
-    }
-    else {
+    } else {
       if (m_result_ptr) {
-        ValueInit::init( ReducerConditional::select(m_functor , m_reducer) , m_result_ptr );
+        ValueInit::init(ReducerConditional::select(m_functor, m_reducer),
+                        m_result_ptr);
       }
     }
   }
 
-  template< class ViewType >
-  ParallelReduce( const FunctorType  & arg_functor
-                , const Policy       & arg_policy
-                , const ViewType & arg_result
-                , typename std::enable_if<
-                   Kokkos::is_view< ViewType >::value
-                ,void*>::type = NULL)
-  : m_functor( arg_functor )
-  , m_policy(  arg_policy )
-  , m_reducer( InvalidType() )
-  , m_result_ptr( arg_result.data() )
-  , m_result_ptr_device_accessible(MemorySpaceAccess< Kokkos::CudaSpace , typename ViewType::memory_space>::accessible )
-  , m_scratch_space( 0 )
-  , m_scratch_flags( 0 )
-  , m_unified_space( 0 )
-  {}
+  template <class ViewType>
+  ParallelReduce(const FunctorType& arg_functor, const Policy& arg_policy,
+                 const ViewType& arg_result,
+                 typename std::enable_if<Kokkos::is_view<ViewType>::value,
+                                         void*>::type = NULL)
+      : m_functor(arg_functor),
+        m_policy(arg_policy),
+        m_reducer(InvalidType()),
+        m_result_ptr(arg_result.data()),
+        m_result_ptr_device_accessible(
+            MemorySpaceAccess<Kokkos::CudaSpace,
+                              typename ViewType::memory_space>::accessible),
+        m_scratch_space(0),
+        m_scratch_flags(0),
+        m_unified_space(0) {}
 
-  ParallelReduce( const FunctorType  & arg_functor
-                , const Policy       & arg_policy
-                , const ReducerType & reducer)
-  : m_functor( arg_functor )
-  , m_policy(  arg_policy )
-  , m_reducer( reducer )
-  , m_result_ptr( reducer.view().data() )
-  , m_result_ptr_device_accessible(MemorySpaceAccess< Kokkos::CudaSpace , typename ReducerType::result_view_type::memory_space>::accessible )
-  , m_scratch_space( 0 )
-  , m_scratch_flags( 0 )
-  , m_unified_space( 0 )
-  {}
+  ParallelReduce(const FunctorType& arg_functor, const Policy& arg_policy,
+                 const ReducerType& reducer)
+      : m_functor(arg_functor),
+        m_policy(arg_policy),
+        m_reducer(reducer),
+        m_result_ptr(reducer.view().data()),
+        m_result_ptr_device_accessible(
+            MemorySpaceAccess<Kokkos::CudaSpace,
+                              typename ReducerType::result_view_type::
+                                  memory_space>::accessible),
+        m_scratch_space(0),
+        m_scratch_flags(0),
+        m_unified_space(0) {}
 };
 
-
 //----------------------------------------------------------------------------
 
-template< class FunctorType , class ReducerType, class ... Properties >
-class ParallelReduce< FunctorType
-                    , Kokkos::TeamPolicy< Properties ... >
-                    , ReducerType
-                    , Kokkos::Cuda
-                    >
-{
-public:
-  typedef TeamPolicyInternal< Kokkos::Cuda, Properties ... >  Policy ;
-private:
+template <class FunctorType, class ReducerType, class... Properties>
+class ParallelReduce<FunctorType, Kokkos::TeamPolicy<Properties...>,
+                     ReducerType, Kokkos::Cuda> {
+ public:
+  typedef TeamPolicyInternal<Kokkos::Cuda, Properties...> Policy;
 
-  typedef typename Policy::member_type  Member ;
-  typedef typename Policy::work_tag     WorkTag ;
-  typedef typename Policy::launch_bounds     LaunchBounds ;
+ private:
+  typedef typename Policy::member_type Member;
+  typedef typename Policy::work_tag WorkTag;
+  typedef typename Policy::launch_bounds LaunchBounds;
 
-  typedef Kokkos::Impl::if_c< std::is_same<InvalidType,ReducerType>::value, FunctorType, ReducerType> ReducerConditional;
+  typedef Kokkos::Impl::if_c<std::is_same<InvalidType, ReducerType>::value,
+                             FunctorType, ReducerType>
+      ReducerConditional;
   typedef typename ReducerConditional::type ReducerTypeFwd;
-  typedef typename Kokkos::Impl::if_c< std::is_same<InvalidType,ReducerType>::value, WorkTag, void>::type WorkTagFwd;
+  typedef
+      typename Kokkos::Impl::if_c<std::is_same<InvalidType, ReducerType>::value,
+                                  WorkTag, void>::type WorkTagFwd;
 
-  typedef Kokkos::Impl::FunctorValueTraits< ReducerTypeFwd, WorkTagFwd > ValueTraits ;
-  typedef Kokkos::Impl::FunctorValueInit<   ReducerTypeFwd, WorkTagFwd > ValueInit ;
-  typedef Kokkos::Impl::FunctorValueJoin<   ReducerTypeFwd, WorkTagFwd > ValueJoin ;
+  typedef Kokkos::Impl::FunctorValueTraits<ReducerTypeFwd, WorkTagFwd>
+      ValueTraits;
+  typedef Kokkos::Impl::FunctorValueInit<ReducerTypeFwd, WorkTagFwd> ValueInit;
+  typedef Kokkos::Impl::FunctorValueJoin<ReducerTypeFwd, WorkTagFwd> ValueJoin;
 
-  typedef typename ValueTraits::pointer_type    pointer_type ;
-  typedef typename ValueTraits::reference_type  reference_type ;
-  typedef typename ValueTraits::value_type      value_type ;
+  typedef typename ValueTraits::pointer_type pointer_type;
+  typedef typename ValueTraits::reference_type reference_type;
+  typedef typename ValueTraits::value_type value_type;
 
-public:
+ public:
+  typedef FunctorType functor_type;
+  typedef Cuda::size_type size_type;
 
-  typedef FunctorType      functor_type ;
-  typedef Cuda::size_type  size_type ;
+  enum { UseShflReduction = (true && (ValueTraits::StaticValueSize != 0)) };
 
-  enum { UseShflReduction = (true && (ValueTraits::StaticValueSize!=0)) };
-
-private:
+ private:
   typedef double DummyShflReductionType;
   typedef int DummySHMEMReductionType;
 
-  // Algorithmic constraints: blockDim.y is a power of two AND blockDim.y == blockDim.z == 1
-  // shared memory utilization:
+  // Algorithmic constraints: blockDim.y is a power of two AND blockDim.y ==
+  // blockDim.z == 1 shared memory utilization:
   //
   //  [ global reduce space ]
   //  [ team   reduce space ]
   //  [ team   shared space ]
   //
 
-  const FunctorType   m_functor ;
-  const Policy        m_policy ;
-  const ReducerType   m_reducer ;
-  const pointer_type  m_result_ptr ;
-  const bool          m_result_ptr_device_accessible ;
-  size_type *         m_scratch_space ;
-  size_type *         m_scratch_flags ;
-  size_type *         m_unified_space ;
-  size_type           m_team_begin ;
-  size_type           m_shmem_begin ;
-  size_type           m_shmem_size ;
-  void*               m_scratch_ptr[2] ;
-  int                 m_scratch_size[2] ;
-  const size_type     m_league_size ;
-  int                 m_team_size ;
-  const size_type     m_vector_size ;
+  const FunctorType m_functor;
+  const Policy m_policy;
+  const ReducerType m_reducer;
+  const pointer_type m_result_ptr;
+  const bool m_result_ptr_device_accessible;
+  size_type* m_scratch_space;
+  size_type* m_scratch_flags;
+  size_type* m_unified_space;
+  size_type m_team_begin;
+  size_type m_shmem_begin;
+  size_type m_shmem_size;
+  void* m_scratch_ptr[2];
+  int m_scratch_size[2];
+  const size_type m_league_size;
+  int m_team_size;
+  const size_type m_vector_size;
 
-  template< class TagType >
+  template <class TagType>
   __device__ inline
-  typename std::enable_if< std::is_same< TagType , void >::value >::type
-  exec_team( const Member & member , reference_type update ) const
-    { m_functor( member , update ); }
+      typename std::enable_if<std::is_same<TagType, void>::value>::type
+      exec_team(const Member& member, reference_type update) const {
+    m_functor(member, update);
+  }
 
-  template< class TagType >
+  template <class TagType>
   __device__ inline
-  typename std::enable_if< ! std::is_same< TagType , void >::value >::type
-  exec_team( const Member & member , reference_type update ) const
-    { m_functor( TagType() , member , update ); }
+      typename std::enable_if<!std::is_same<TagType, void>::value>::type
+      exec_team(const Member& member, reference_type update) const {
+    m_functor(TagType(), member, update);
+  }
 
-public:
-
-  __device__ inline
-  void operator() () const {
+ public:
+  __device__ inline void operator()() const {
     int64_t threadid = 0;
-    if ( m_scratch_size[1]>0 ) {
+    if (m_scratch_size[1] > 0) {
       __shared__ int64_t base_thread_id;
-      if (threadIdx.x==0 && threadIdx.y==0 ) {
-        threadid = (blockIdx.x*blockDim.z + threadIdx.z) %
-          (Kokkos::Impl::g_device_cuda_lock_arrays.n / (blockDim.x * blockDim.y));
+      if (threadIdx.x == 0 && threadIdx.y == 0) {
+        threadid = (blockIdx.x * blockDim.z + threadIdx.z) %
+                   (Kokkos::Impl::g_device_cuda_lock_arrays.n /
+                    (blockDim.x * blockDim.y));
         threadid *= blockDim.x * blockDim.y;
         int done = 0;
         while (!done) {
-          done = (0 == atomicCAS(&Kokkos::Impl::g_device_cuda_lock_arrays.scratch[threadid],0,1));
-          if(!done) {
+          done =
+              (0 ==
+               atomicCAS(
+                   &Kokkos::Impl::g_device_cuda_lock_arrays.scratch[threadid],
+                   0, 1));
+          if (!done) {
             threadid += blockDim.x * blockDim.y;
-            if(int64_t(threadid + blockDim.x * blockDim.y) >= int64_t(Kokkos::Impl::g_device_cuda_lock_arrays.n)) threadid = 0;
+            if (int64_t(threadid + blockDim.x * blockDim.y) >=
+                int64_t(Kokkos::Impl::g_device_cuda_lock_arrays.n))
+              threadid = 0;
           }
         }
         base_thread_id = threadid;
@@ -1394,736 +1635,970 @@ public:
       threadid = base_thread_id;
     }
 
-    run(Kokkos::Impl::if_c<UseShflReduction, DummyShflReductionType, DummySHMEMReductionType>::select(1,1.0), threadid );
-    if ( m_scratch_size[1]>0 ) {
+    run(Kokkos::Impl::if_c<UseShflReduction, DummyShflReductionType,
+                           DummySHMEMReductionType>::select(1, 1.0),
+        threadid);
+    if (m_scratch_size[1] > 0) {
       __syncthreads();
-      if (threadIdx.x==0 && threadIdx.y==0 )
-        Kokkos::Impl::g_device_cuda_lock_arrays.scratch[threadid]=0;
+      if (threadIdx.x == 0 && threadIdx.y == 0)
+        Kokkos::Impl::g_device_cuda_lock_arrays.scratch[threadid] = 0;
     }
   }
 
-  __device__ inline
-  void run(const DummySHMEMReductionType&, const int& threadid) const
-  {
-    const integral_nonzero_constant< size_type , ValueTraits::StaticValueSize / sizeof(size_type) >
-      word_count( ValueTraits::value_size( ReducerConditional::select(m_functor , m_reducer) ) / sizeof(size_type) );
+  __device__ inline void run(const DummySHMEMReductionType&,
+                             const int& threadid) const {
+    const integral_nonzero_constant<size_type, ValueTraits::StaticValueSize /
+                                                   sizeof(size_type)>
+        word_count(ValueTraits::value_size(
+                       ReducerConditional::select(m_functor, m_reducer)) /
+                   sizeof(size_type));
 
     reference_type value =
-      ValueInit::init( ReducerConditional::select(m_functor , m_reducer) , kokkos_impl_cuda_shared_memory<size_type>() + threadIdx.y * word_count.value );
+        ValueInit::init(ReducerConditional::select(m_functor, m_reducer),
+                        kokkos_impl_cuda_shared_memory<size_type>() +
+                            threadIdx.y * word_count.value);
 
     // Iterate this block through the league
     const int int_league_size = (int)m_league_size;
-    for ( int league_rank = blockIdx.x ; league_rank < int_league_size ; league_rank += gridDim.x ) {
-      this-> template exec_team< WorkTag >
-        ( Member( kokkos_impl_cuda_shared_memory<char>() + m_team_begin
-                                        , m_shmem_begin
-                                        , m_shmem_size
-                                        , (void*) ( ((char*)m_scratch_ptr[1]) + ptrdiff_t(threadid/(blockDim.x*blockDim.y)) * m_scratch_size[1])
-                                        , m_scratch_size[1]
-                                        , league_rank
-                                        , m_league_size )
-        , value );
+    for (int league_rank = blockIdx.x; league_rank < int_league_size;
+         league_rank += gridDim.x) {
+      this->template exec_team<WorkTag>(
+          Member(kokkos_impl_cuda_shared_memory<char>() + m_team_begin,
+                 m_shmem_begin, m_shmem_size,
+                 (void*)(((char*)m_scratch_ptr[1]) +
+                         ptrdiff_t(threadid / (blockDim.x * blockDim.y)) *
+                             m_scratch_size[1]),
+                 m_scratch_size[1], league_rank, m_league_size),
+          value);
     }
 
     // Reduce with final value at blockDim.y - 1 location.
-    if ( cuda_single_inter_block_reduce_scan<false,FunctorType,WorkTag>(
-           ReducerConditional::select(m_functor , m_reducer) , blockIdx.x , gridDim.x ,
-           kokkos_impl_cuda_shared_memory<size_type>() , m_scratch_space , m_scratch_flags ) ) {
+    if (cuda_single_inter_block_reduce_scan<false, FunctorType, WorkTag>(
+            ReducerConditional::select(m_functor, m_reducer), blockIdx.x,
+            gridDim.x, kokkos_impl_cuda_shared_memory<size_type>(),
+            m_scratch_space, m_scratch_flags)) {
+      // This is the final block with the final result at the final threads'
+      // location
 
-      // This is the final block with the final result at the final threads' location
+      size_type* const shared = kokkos_impl_cuda_shared_memory<size_type>() +
+                                (blockDim.y - 1) * word_count.value;
+      size_type* const global =
+          m_result_ptr_device_accessible
+              ? reinterpret_cast<size_type*>(m_result_ptr)
+              : (m_unified_space ? m_unified_space : m_scratch_space);
 
-      size_type * const shared = kokkos_impl_cuda_shared_memory<size_type>() + ( blockDim.y - 1 ) * word_count.value ;
-      size_type * const global = m_result_ptr_device_accessible? reinterpret_cast<size_type*>(m_result_ptr) :
-                                 ( m_unified_space ? m_unified_space : m_scratch_space );
-
-      if ( threadIdx.y == 0 ) {
-        Kokkos::Impl::FunctorFinal< ReducerTypeFwd , WorkTagFwd >::final( ReducerConditional::select(m_functor , m_reducer) , shared );
+      if (threadIdx.y == 0) {
+        Kokkos::Impl::FunctorFinal<ReducerTypeFwd, WorkTagFwd>::final(
+            ReducerConditional::select(m_functor, m_reducer), shared);
       }
 
-      if ( CudaTraits::WarpSize < word_count.value ) { __syncthreads(); }
+      if (CudaTraits::WarpSize < word_count.value) {
+        __syncthreads();
+      }
 
-      for ( unsigned i = threadIdx.y ; i < word_count.value ; i += blockDim.y ) { global[i] = shared[i]; }
+      for (unsigned i = threadIdx.y; i < word_count.value; i += blockDim.y) {
+        global[i] = shared[i];
+      }
     }
-
   }
 
-  __device__ inline
-  void run(const DummyShflReductionType&, const int& threadid) const
-  {
+  __device__ inline void run(const DummyShflReductionType&,
+                             const int& threadid) const {
     value_type value;
-    ValueInit::init( ReducerConditional::select(m_functor , m_reducer) , &value);
+    ValueInit::init(ReducerConditional::select(m_functor, m_reducer), &value);
 
     // Iterate this block through the league
     const int int_league_size = (int)m_league_size;
-    for ( int league_rank = blockIdx.x ; league_rank < int_league_size ; league_rank += gridDim.x ) {
-      this-> template exec_team< WorkTag >
-        ( Member( kokkos_impl_cuda_shared_memory<char>() + m_team_begin
-                                        , m_shmem_begin
-                                        , m_shmem_size
-                                        , (void*) ( ((char*)m_scratch_ptr[1]) + ptrdiff_t(threadid/(blockDim.x*blockDim.y)) * m_scratch_size[1])
-                                        , m_scratch_size[1]
-                                        , league_rank
-                                        , m_league_size )
-        , value );
+    for (int league_rank = blockIdx.x; league_rank < int_league_size;
+         league_rank += gridDim.x) {
+      this->template exec_team<WorkTag>(
+          Member(kokkos_impl_cuda_shared_memory<char>() + m_team_begin,
+                 m_shmem_begin, m_shmem_size,
+                 (void*)(((char*)m_scratch_ptr[1]) +
+                         ptrdiff_t(threadid / (blockDim.x * blockDim.y)) *
+                             m_scratch_size[1]),
+                 m_scratch_size[1], league_rank, m_league_size),
+          value);
     }
 
-    pointer_type const result = m_result_ptr_device_accessible? m_result_ptr :
-                                (pointer_type) ( m_unified_space ? m_unified_space : m_scratch_space );
+    pointer_type const result =
+        m_result_ptr_device_accessible
+            ? m_result_ptr
+            : (pointer_type)(m_unified_space ? m_unified_space
+                                             : m_scratch_space);
 
     value_type init;
-    ValueInit::init( ReducerConditional::select(m_functor , m_reducer) , &init);
-    if(
-        Impl::cuda_inter_block_reduction<FunctorType,ValueJoin,WorkTag>
-           (value,init,ValueJoin(ReducerConditional::select(m_functor , m_reducer)),m_scratch_space,result,m_scratch_flags,blockDim.y)
-        //This breaks a test
-        //   Kokkos::Impl::CudaReductionsFunctor<FunctorType,WorkTag,false,true>::scalar_inter_block_reduction(ReducerConditional::select(m_functor , m_reducer) , blockIdx.x , gridDim.x ,
-        //              kokkos_impl_cuda_shared_memory<size_type>() , m_scratch_space , m_scratch_flags)
+    ValueInit::init(ReducerConditional::select(m_functor, m_reducer), &init);
+    if (Impl::cuda_inter_block_reduction<FunctorType, ValueJoin, WorkTag>(
+            value, init,
+            ValueJoin(ReducerConditional::select(m_functor, m_reducer)),
+            m_scratch_space, result, m_scratch_flags, blockDim.y)
+        // This breaks a test
+        //   Kokkos::Impl::CudaReductionsFunctor<FunctorType,WorkTag,false,true>::scalar_inter_block_reduction(ReducerConditional::select(m_functor
+        //   , m_reducer) , blockIdx.x , gridDim.x ,
+        //              kokkos_impl_cuda_shared_memory<size_type>() ,
+        //              m_scratch_space , m_scratch_flags)
     ) {
-      const unsigned id = threadIdx.y*blockDim.x + threadIdx.x;
-      if(id==0) {
-        Kokkos::Impl::FunctorFinal< ReducerTypeFwd , WorkTagFwd >::final( ReducerConditional::select(m_functor , m_reducer) , (void*) &value );
+      const unsigned id = threadIdx.y * blockDim.x + threadIdx.x;
+      if (id == 0) {
+        Kokkos::Impl::FunctorFinal<ReducerTypeFwd, WorkTagFwd>::final(
+            ReducerConditional::select(m_functor, m_reducer), (void*)&value);
         *result = value;
       }
     }
   }
 
-  inline
-  void execute()
-    {
-      const int nwork = m_league_size * m_team_size ;
-      if ( nwork ) {
-        const int block_count = UseShflReduction? std::min( m_league_size , size_type(1024*32) )
-          :std::min( int(m_league_size) , m_team_size );
+  inline void execute() {
+    const int nwork = m_league_size * m_team_size;
+    if (nwork) {
+      const int block_count =
+          UseShflReduction ? std::min(m_league_size, size_type(1024 * 32))
+                           : std::min(int(m_league_size), m_team_size);
 
-        m_scratch_space = cuda_internal_scratch_space(m_policy.space(), ValueTraits::value_size( ReducerConditional::select(m_functor , m_reducer) ) * block_count );
-        m_scratch_flags = cuda_internal_scratch_flags(m_policy.space(), sizeof(size_type) );
-        m_unified_space = cuda_internal_scratch_unified( m_policy.space(),ValueTraits::value_size( ReducerConditional::select(m_functor , m_reducer) ) );
+      m_scratch_space = cuda_internal_scratch_space(
+          m_policy.space(), ValueTraits::value_size(ReducerConditional::select(
+                                m_functor, m_reducer)) *
+                                block_count);
+      m_scratch_flags =
+          cuda_internal_scratch_flags(m_policy.space(), sizeof(size_type));
+      m_unified_space = cuda_internal_scratch_unified(
+          m_policy.space(), ValueTraits::value_size(ReducerConditional::select(
+                                m_functor, m_reducer)));
 
-        const dim3 block( m_vector_size , m_team_size , 1 );
-        const dim3 grid( block_count , 1 , 1 );
-        const int shmem_size_total = m_team_begin + m_shmem_begin + m_shmem_size ;
+      dim3 block(m_vector_size, m_team_size, 1);
+      dim3 grid(block_count, 1, 1);
+      const int shmem_size_total = m_team_begin + m_shmem_begin + m_shmem_size;
 
-        CudaParallelLaunch< ParallelReduce, LaunchBounds >( *this, grid, block, shmem_size_total , m_policy.space().impl_internal_space_instance() , true ); // copy to device and execute
+#ifdef KOKKOS_IMPL_DEBUG_CUDA_SERIAL_EXECUTION
+      if (Kokkos::Impl::CudaInternal::cuda_use_serial_execution()) {
+        block = dim3(1, 1, 1);
+        grid  = dim3(1, 1, 1);
+      }
+#endif
 
-        if(!m_result_ptr_device_accessible) {
-          Cuda().fence();
+      CudaParallelLaunch<ParallelReduce, LaunchBounds>(
+          *this, grid, block, shmem_size_total,
+          m_policy.space().impl_internal_space_instance(),
+          true);  // copy to device and execute
 
-          if ( m_result_ptr ) {
-            if ( m_unified_space ) {
-              const int count = ValueTraits::value_count( ReducerConditional::select(m_functor , m_reducer) );
-              for ( int i = 0 ; i < count ; ++i ) { m_result_ptr[i] = pointer_type(m_unified_space)[i] ; }
-            }
-            else {
-              const int size = ValueTraits::value_size( ReducerConditional::select(m_functor , m_reducer) );
-              DeepCopy<HostSpace,CudaSpace>( m_result_ptr, m_scratch_space, size );
+      if (!m_result_ptr_device_accessible) {
+        Cuda().fence();
+
+        if (m_result_ptr) {
+          if (m_unified_space) {
+            const int count = ValueTraits::value_count(
+                ReducerConditional::select(m_functor, m_reducer));
+            for (int i = 0; i < count; ++i) {
+              m_result_ptr[i] = pointer_type(m_unified_space)[i];
             }
+          } else {
+            const int size = ValueTraits::value_size(
+                ReducerConditional::select(m_functor, m_reducer));
+            DeepCopy<HostSpace, CudaSpace>(m_result_ptr, m_scratch_space, size);
           }
         }
       }
-      else {
-        if (m_result_ptr) {
-          ValueInit::init( ReducerConditional::select(m_functor , m_reducer) , m_result_ptr );
+    } else {
+      if (m_result_ptr) {
+        ValueInit::init(ReducerConditional::select(m_functor, m_reducer),
+                        m_result_ptr);
+      }
+    }
+  }
+
+  template <class ViewType>
+  ParallelReduce(const FunctorType& arg_functor, const Policy& arg_policy,
+                 const ViewType& arg_result,
+                 typename std::enable_if<Kokkos::is_view<ViewType>::value,
+                                         void*>::type = NULL)
+      : m_functor(arg_functor),
+        m_policy(arg_policy),
+        m_reducer(InvalidType()),
+        m_result_ptr(arg_result.data()),
+        m_result_ptr_device_accessible(
+            MemorySpaceAccess<Kokkos::CudaSpace,
+                              typename ViewType::memory_space>::accessible),
+        m_scratch_space(0),
+        m_scratch_flags(0),
+        m_unified_space(0),
+        m_team_begin(0),
+        m_shmem_begin(0),
+        m_shmem_size(0),
+        m_scratch_ptr{NULL, NULL},
+        m_league_size(arg_policy.league_size()),
+        m_team_size(arg_policy.team_size()),
+        m_vector_size(arg_policy.vector_length()) {
+    cudaFuncAttributes attr =
+        CudaParallelLaunch<ParallelReduce,
+                           LaunchBounds>::get_cuda_func_attributes();
+    m_team_size =
+        m_team_size >= 0
+            ? m_team_size
+            : Kokkos::Impl::cuda_get_opt_block_size<FunctorType, LaunchBounds>(
+                  m_policy.space().impl_internal_space_instance(), attr,
+                  m_functor, m_vector_size, m_policy.team_scratch_size(0),
+                  m_policy.thread_scratch_size(0)) /
+                  m_vector_size;
+
+    // Return Init value if the number of worksets is zero
+    if (m_league_size * m_team_size == 0) {
+      ValueInit::init(ReducerConditional::select(m_functor, m_reducer),
+                      arg_result.data());
+      return;
+    }
+
+    m_team_begin =
+        UseShflReduction
+            ? 0
+            : cuda_single_inter_block_reduce_scan_shmem<false, FunctorType,
+                                                        WorkTag>(arg_functor,
+                                                                 m_team_size);
+    m_shmem_begin = sizeof(double) * (m_team_size + 2);
+    m_shmem_size =
+        m_policy.scratch_size(0, m_team_size) +
+        FunctorTeamShmemSize<FunctorType>::value(arg_functor, m_team_size);
+    m_scratch_size[0] = m_shmem_size;
+    m_scratch_size[1] = m_policy.scratch_size(1, m_team_size);
+    m_scratch_ptr[1] =
+        m_team_size <= 0
+            ? NULL
+            : cuda_resize_scratch_space(
+                  static_cast<std::int64_t>(m_scratch_size[1]) *
+                  (static_cast<std::int64_t>(Cuda::concurrency() /
+                                             (m_team_size * m_vector_size))));
+
+    // The global parallel_reduce does not support vector_length other than 1 at
+    // the moment
+    if ((arg_policy.vector_length() > 1) && !UseShflReduction)
+      Impl::throw_runtime_exception(
+          "Kokkos::parallel_reduce with a TeamPolicy using a vector length of "
+          "greater than 1 is not currently supported for CUDA for dynamic "
+          "sized reduction types.");
+
+    if ((m_team_size < 32) && !UseShflReduction)
+      Impl::throw_runtime_exception(
+          "Kokkos::parallel_reduce with a TeamPolicy using a team_size smaller "
+          "than 32 is not currently supported with CUDA for dynamic sized "
+          "reduction types.");
+
+    // Functor's reduce memory, team scan memory, and team shared memory depend
+    // upon team size.
+
+    const int shmem_size_total = m_team_begin + m_shmem_begin + m_shmem_size;
+
+    if (!Kokkos::Impl::is_integral_power_of_two(m_team_size) &&
+        !UseShflReduction) {
+      Kokkos::Impl::throw_runtime_exception(
+          std::string("Kokkos::Impl::ParallelReduce< Cuda > bad team size"));
+    }
+
+    if (m_policy.space().impl_internal_space_instance()->m_maxShmemPerBlock <
+        shmem_size_total) {
+      Kokkos::Impl::throw_runtime_exception(
+          std::string("Kokkos::Impl::ParallelReduce< Cuda > requested too much "
+                      "L0 scratch memory"));
+    }
+
+    if (int(m_team_size) >
+        arg_policy.team_size_max(m_functor, m_reducer, ParallelReduceTag())) {
+      Kokkos::Impl::throw_runtime_exception(
+          std::string("Kokkos::Impl::ParallelReduce< Cuda > requested too "
+                      "large team size."));
+    }
+  }
+
+  ParallelReduce(const FunctorType& arg_functor, const Policy& arg_policy,
+                 const ReducerType& reducer)
+      : m_functor(arg_functor),
+        m_policy(arg_policy),
+        m_reducer(reducer),
+        m_result_ptr(reducer.view().data()),
+        m_result_ptr_device_accessible(
+            MemorySpaceAccess<Kokkos::CudaSpace,
+                              typename ReducerType::result_view_type::
+                                  memory_space>::accessible),
+        m_scratch_space(0),
+        m_scratch_flags(0),
+        m_unified_space(0),
+        m_team_begin(0),
+        m_shmem_begin(0),
+        m_shmem_size(0),
+        m_scratch_ptr{NULL, NULL},
+        m_league_size(arg_policy.league_size()),
+        m_team_size(arg_policy.team_size()),
+        m_vector_size(arg_policy.vector_length()) {
+    cudaFuncAttributes attr =
+        CudaParallelLaunch<ParallelReduce,
+                           LaunchBounds>::get_cuda_func_attributes();
+    m_team_size =
+        m_team_size >= 0
+            ? m_team_size
+            : Kokkos::Impl::cuda_get_opt_block_size<FunctorType, LaunchBounds>(
+                  m_policy.space().impl_internal_space_instance(), attr,
+                  m_functor, m_vector_size, m_policy.team_scratch_size(0),
+                  m_policy.thread_scratch_size(0)) /
+                  m_vector_size;
+
+    // Return Init value if the number of worksets is zero
+    if (arg_policy.league_size() == 0) {
+      ValueInit::init(ReducerConditional::select(m_functor, m_reducer),
+                      m_result_ptr);
+      return;
+    }
+
+    m_team_begin =
+        UseShflReduction
+            ? 0
+            : cuda_single_inter_block_reduce_scan_shmem<false, FunctorType,
+                                                        WorkTag>(arg_functor,
+                                                                 m_team_size);
+    m_shmem_begin = sizeof(double) * (m_team_size + 2);
+    m_shmem_size =
+        m_policy.scratch_size(0, m_team_size) +
+        FunctorTeamShmemSize<FunctorType>::value(arg_functor, m_team_size);
+    m_scratch_size[0] = m_shmem_size;
+    m_scratch_size[1] = m_policy.scratch_size(1, m_team_size);
+    m_scratch_ptr[1] =
+        m_team_size <= 0
+            ? NULL
+            : cuda_resize_scratch_space(
+                  static_cast<ptrdiff_t>(m_scratch_size[1]) *
+                  static_cast<ptrdiff_t>(Cuda::concurrency() /
+                                         (m_team_size * m_vector_size)));
+
+    // The global parallel_reduce does not support vector_length other than 1 at
+    // the moment
+    if ((arg_policy.vector_length() > 1) && !UseShflReduction)
+      Impl::throw_runtime_exception(
+          "Kokkos::parallel_reduce with a TeamPolicy using a vector length of "
+          "greater than 1 is not currently supported for CUDA for dynamic "
+          "sized reduction types.");
+
+    if ((m_team_size < 32) && !UseShflReduction)
+      Impl::throw_runtime_exception(
+          "Kokkos::parallel_reduce with a TeamPolicy using a team_size smaller "
+          "than 32 is not currently supported with CUDA for dynamic sized "
+          "reduction types.");
+
+    // Functor's reduce memory, team scan memory, and team shared memory depend
+    // upon team size.
+
+    const int shmem_size_total = m_team_begin + m_shmem_begin + m_shmem_size;
+
+    if ((!Kokkos::Impl::is_integral_power_of_two(m_team_size) &&
+         !UseShflReduction) ||
+        m_policy.space().impl_internal_space_instance()->m_maxShmemPerBlock <
+            shmem_size_total) {
+      Kokkos::Impl::throw_runtime_exception(
+          std::string("Kokkos::Impl::ParallelReduce< Cuda > bad team size"));
+    }
+    if (int(m_team_size) >
+        arg_policy.team_size_max(m_functor, m_reducer, ParallelReduceTag())) {
+      Kokkos::Impl::throw_runtime_exception(
+          std::string("Kokkos::Impl::ParallelReduce< Cuda > requested too "
+                      "large team size."));
+    }
+  }
+};
+
+}  // namespace Impl
+}  // namespace Kokkos
+
+//----------------------------------------------------------------------------
+//----------------------------------------------------------------------------
+
+namespace Kokkos {
+namespace Impl {
+
+template <class FunctorType, class... Traits>
+class ParallelScan<FunctorType, Kokkos::RangePolicy<Traits...>, Kokkos::Cuda> {
+ public:
+  typedef Kokkos::RangePolicy<Traits...> Policy;
+
+ private:
+  typedef typename Policy::member_type Member;
+  typedef typename Policy::work_tag WorkTag;
+  typedef typename Policy::WorkRange WorkRange;
+  typedef typename Policy::launch_bounds LaunchBounds;
+
+  typedef Kokkos::Impl::FunctorValueTraits<FunctorType, WorkTag> ValueTraits;
+  typedef Kokkos::Impl::FunctorValueInit<FunctorType, WorkTag> ValueInit;
+  typedef Kokkos::Impl::FunctorValueOps<FunctorType, WorkTag> ValueOps;
+
+ public:
+  typedef typename ValueTraits::pointer_type pointer_type;
+  typedef typename ValueTraits::reference_type reference_type;
+  typedef FunctorType functor_type;
+  typedef Cuda::size_type size_type;
+
+ private:
+  // Algorithmic constraints:
+  //  (a) blockDim.y is a power of two
+  //  (b) blockDim.y == blockDim.z == 1
+  //  (c) gridDim.x  <= blockDim.y * blockDim.y
+  //  (d) gridDim.y  == gridDim.z == 1
+
+  const FunctorType m_functor;
+  const Policy m_policy;
+  size_type* m_scratch_space;
+  size_type* m_scratch_flags;
+  size_type m_final;
+#ifdef KOKKOS_IMPL_DEBUG_CUDA_SERIAL_EXECUTION
+  bool m_run_serial;
+#endif
+
+  template <class TagType>
+  __device__ inline
+      typename std::enable_if<std::is_same<TagType, void>::value>::type
+      exec_range(const Member& i, reference_type update,
+                 const bool final_result) const {
+    m_functor(i, update, final_result);
+  }
+
+  template <class TagType>
+  __device__ inline
+      typename std::enable_if<!std::is_same<TagType, void>::value>::type
+      exec_range(const Member& i, reference_type update,
+                 const bool final_result) const {
+    m_functor(TagType(), i, update, final_result);
+  }
+
+  //----------------------------------------
+
+  __device__ inline void initial(void) const {
+    const integral_nonzero_constant<size_type, ValueTraits::StaticValueSize /
+                                                   sizeof(size_type)>
+        word_count(ValueTraits::value_size(m_functor) / sizeof(size_type));
+
+    size_type* const shared_value =
+        kokkos_impl_cuda_shared_memory<size_type>() +
+        word_count.value * threadIdx.y;
+
+    ValueInit::init(m_functor, shared_value);
+
+    // Number of blocks is bounded so that the reduction can be limited to two
+    // passes. Each thread block is given an approximately equal amount of work
+    // to perform. Accumulate the values for this block. The accumulation
+    // ordering does not match the final pass, but is arithmatically equivalent.
+
+    const WorkRange range(m_policy, blockIdx.x, gridDim.x);
+
+    for (Member iwork = range.begin() + threadIdx.y, iwork_end = range.end();
+         iwork < iwork_end; iwork += blockDim.y) {
+      this->template exec_range<WorkTag>(
+          iwork, ValueOps::reference(shared_value), false);
+    }
+
+    // Reduce and scan, writing out scan of blocks' totals and block-groups'
+    // totals. Blocks' scan values are written to 'blockIdx.x' location.
+    // Block-groups' scan values are at: i = ( j * blockDim.y - 1 ) for i <
+    // gridDim.x
+    cuda_single_inter_block_reduce_scan<true, FunctorType, WorkTag>(
+        m_functor, blockIdx.x, gridDim.x,
+        kokkos_impl_cuda_shared_memory<size_type>(), m_scratch_space,
+        m_scratch_flags);
+  }
+
+  //----------------------------------------
+
+  __device__ inline void final(void) const {
+    const integral_nonzero_constant<size_type, ValueTraits::StaticValueSize /
+                                                   sizeof(size_type)>
+        word_count(ValueTraits::value_size(m_functor) / sizeof(size_type));
+
+    // Use shared memory as an exclusive scan: { 0 , value[0] , value[1] ,
+    // value[2] , ... }
+    size_type* const shared_data = kokkos_impl_cuda_shared_memory<size_type>();
+    size_type* const shared_prefix =
+        shared_data + word_count.value * threadIdx.y;
+    size_type* const shared_accum =
+        shared_data + word_count.value * (blockDim.y + 1);
+
+    // Starting value for this thread block is the previous block's total.
+    if (blockIdx.x) {
+      size_type* const block_total =
+          m_scratch_space + word_count.value * (blockIdx.x - 1);
+      for (unsigned i = threadIdx.y; i < word_count.value; ++i) {
+        shared_accum[i] = block_total[i];
+      }
+    } else if (0 == threadIdx.y) {
+      ValueInit::init(m_functor, shared_accum);
+    }
+
+    const WorkRange range(m_policy, blockIdx.x, gridDim.x);
+
+    for (typename Policy::member_type iwork_base = range.begin();
+         iwork_base < range.end(); iwork_base += blockDim.y) {
+#ifdef KOKKOS_IMPL_CUDA_SYNCWARP_NEEDS_MASK
+      unsigned MASK = KOKKOS_IMPL_CUDA_ACTIVEMASK;
+#endif
+      const typename Policy::member_type iwork = iwork_base + threadIdx.y;
+
+      __syncthreads();  // Don't overwrite previous iteration values until they
+                        // are used
+
+      ValueInit::init(m_functor, shared_prefix + word_count.value);
+
+      // Copy previous block's accumulation total into thread[0] prefix and
+      // inclusive scan value of this block
+      for (unsigned i = threadIdx.y; i < word_count.value; ++i) {
+        shared_data[i + word_count.value] = shared_data[i] = shared_accum[i];
+      }
+#ifdef KOKKOS_IMPL_CUDA_SYNCWARP_NEEDS_MASK
+      KOKKOS_IMPL_CUDA_SYNCWARP_MASK(MASK);
+#else
+      KOKKOS_IMPL_CUDA_SYNCWARP;
+#endif
+      if (CudaTraits::WarpSize < word_count.value) {
+        __syncthreads();
+      }  // Protect against large scan values.
+
+      // Call functor to accumulate inclusive scan value for this work item
+      if (iwork < range.end()) {
+        this->template exec_range<WorkTag>(
+            iwork, ValueOps::reference(shared_prefix + word_count.value),
+            false);
+      }
+
+      // Scan block values into locations shared_data[1..blockDim.y]
+      cuda_intra_block_reduce_scan<true, FunctorType, WorkTag>(
+          m_functor,
+          typename ValueTraits::pointer_type(shared_data + word_count.value));
+
+      {
+        size_type* const block_total =
+            shared_data + word_count.value * blockDim.y;
+        for (unsigned i = threadIdx.y; i < word_count.value; ++i) {
+          shared_accum[i] = block_total[i];
         }
       }
+
+      // Call functor with exclusive scan value
+      if (iwork < range.end()) {
+        this->template exec_range<WorkTag>(
+            iwork, ValueOps::reference(shared_prefix), true);
+      }
     }
-
-  template< class ViewType >
-  ParallelReduce( const FunctorType  & arg_functor
-                , const Policy       & arg_policy
-                , const ViewType & arg_result
-                , typename std::enable_if<
-                                   Kokkos::is_view< ViewType >::value
-                                ,void*>::type = NULL)
-  : m_functor( arg_functor )
-  , m_policy ( arg_policy )
-  , m_reducer( InvalidType() )
-  , m_result_ptr( arg_result.data() )
-  , m_result_ptr_device_accessible(MemorySpaceAccess< Kokkos::CudaSpace , typename ViewType::memory_space>::accessible )
-  , m_scratch_space( 0 )
-  , m_scratch_flags( 0 )
-  , m_unified_space( 0 )
-  , m_team_begin( 0 )
-  , m_shmem_begin( 0 )
-  , m_shmem_size( 0 )
-  , m_scratch_ptr{NULL,NULL}
-  , m_league_size( arg_policy.league_size() )
-  , m_team_size( arg_policy.team_size() )
-  , m_vector_size( arg_policy.vector_length() )
-  {
-    cudaFuncAttributes attr = CudaParallelLaunch< ParallelReduce, LaunchBounds >::
-        get_cuda_func_attributes();
-    m_team_size = m_team_size>=0?m_team_size:
-        Kokkos::Impl::cuda_get_opt_block_size< FunctorType, LaunchBounds>(
-      m_policy.space().impl_internal_space_instance(),
-      attr, m_functor , m_vector_size,
-      m_policy.team_scratch_size(0), m_policy.thread_scratch_size(0) )/m_vector_size;
-
-    // Return Init value if the number of worksets is zero
-    if( m_league_size*m_team_size == 0) {
-      ValueInit::init( ReducerConditional::select(m_functor , m_reducer) , arg_result.data() );
-      return ;
-    }
-
-    m_team_begin = UseShflReduction?0:cuda_single_inter_block_reduce_scan_shmem<false,FunctorType,WorkTag>( arg_functor , m_team_size );
-    m_shmem_begin = sizeof(double) * ( m_team_size + 2 );
-    m_shmem_size = m_policy.scratch_size(0,m_team_size) + FunctorTeamShmemSize< FunctorType >::value( arg_functor , m_team_size );
-    m_scratch_size[0] = m_shmem_size;
-    m_scratch_size[1] = m_policy.scratch_size(1,m_team_size);
-    m_scratch_ptr[1] = m_team_size<=0?NULL:cuda_resize_scratch_space(static_cast<std::int64_t>(m_scratch_size[1])*(static_cast<std::int64_t>(Cuda::concurrency()/(m_team_size*m_vector_size))));
-
-    // The global parallel_reduce does not support vector_length other than 1 at the moment
-    if( (arg_policy.vector_length() > 1) && !UseShflReduction )
-      Impl::throw_runtime_exception( "Kokkos::parallel_reduce with a TeamPolicy using a vector length of greater than 1 is not currently supported for CUDA for dynamic sized reduction types.");
-
-    if( (m_team_size < 32) && !UseShflReduction )
-      Impl::throw_runtime_exception( "Kokkos::parallel_reduce with a TeamPolicy using a team_size smaller than 32 is not currently supported with CUDA for dynamic sized reduction types.");
-
-    // Functor's reduce memory, team scan memory, and team shared memory depend upon team size.
-
-    const int shmem_size_total = m_team_begin + m_shmem_begin + m_shmem_size ;
-
-    if (! Kokkos::Impl::is_integral_power_of_two( m_team_size )  && !UseShflReduction ) {
-      Kokkos::Impl::throw_runtime_exception(std::string("Kokkos::Impl::ParallelReduce< Cuda > bad team size"));
-    }
-
-    if ( m_policy.space().impl_internal_space_instance()->m_maxShmemPerBlock < shmem_size_total ) {
-      Kokkos::Impl::throw_runtime_exception(std::string("Kokkos::Impl::ParallelReduce< Cuda > requested too much L0 scratch memory"));
-    }
-
-    if ( int(m_team_size) > arg_policy.team_size_max(m_functor,ParallelReduceTag()) ) {
-      Kokkos::Impl::throw_runtime_exception(std::string("Kokkos::Impl::ParallelReduce< Cuda > requested too large team size."));
-    }
-
   }
 
-  ParallelReduce( const FunctorType  & arg_functor
-                , const Policy       & arg_policy
-                , const ReducerType & reducer)
-  : m_functor( arg_functor )
-  , m_policy( arg_policy )
-  , m_reducer( reducer )
-  , m_result_ptr( reducer.view().data() )
-  , m_result_ptr_device_accessible(MemorySpaceAccess< Kokkos::CudaSpace , typename ReducerType::result_view_type::memory_space>::accessible )
-  , m_scratch_space( 0 )
-  , m_scratch_flags( 0 )
-  , m_unified_space( 0 )
-  , m_team_begin( 0 )
-  , m_shmem_begin( 0 )
-  , m_shmem_size( 0 )
-  , m_scratch_ptr{NULL,NULL}
-  , m_league_size( arg_policy.league_size() )
-  , m_team_size( arg_policy.team_size() )
-  , m_vector_size( arg_policy.vector_length() )
+ public:
+  //----------------------------------------
+
+  __device__ inline void operator()(void) const {
+#ifdef KOKKOS_IMPL_DEBUG_CUDA_SERIAL_EXECUTION
+    if (m_run_serial) {
+      typename ValueTraits::value_type value;
+      ValueInit::init(m_functor, (void*)&value);
+      const WorkRange range(m_policy, blockIdx.x, gridDim.x);
+
+      for (typename Policy::member_type iwork_base = range.begin();
+           iwork_base < range.end(); iwork_base++) {
+        this->template exec_range<WorkTag>(iwork_base, value, true);
+      }
+    } else {
+#endif
+      if (!m_final) {
+        initial();
+      } else {
+        final();
+      }
+#ifdef KOKKOS_IMPL_DEBUG_CUDA_SERIAL_EXECUTION
+    }
+#endif
+  }
+
+  // Determine block size constrained by shared memory:
+  inline unsigned local_block_size(const FunctorType& f) {
+    // blockDim.y must be power of two = 128 (4 warps) or 256 (8 warps) or 512
+    // (16 warps) gridDim.x <= blockDim.y * blockDim.y
+    //
+    // 4 warps was 10% faster than 8 warps and 20% faster than 16 warps in unit
+    // testing
+
+    unsigned n = CudaTraits::WarpSize * 4;
+    while (n &&
+           unsigned(m_policy.space()
+                        .impl_internal_space_instance()
+                        ->m_maxShmemPerBlock) <
+               cuda_single_inter_block_reduce_scan_shmem<false, FunctorType,
+                                                         WorkTag>(f, n)) {
+      n >>= 1;
+    }
+    return n;
+  }
+
+  inline void execute() {
+    const int nwork = m_policy.end() - m_policy.begin();
+    if (nwork) {
+      enum { GridMaxComputeCapability_2x = 0x0ffff };
+
+      const int block_size = local_block_size(m_functor);
+
+      const int grid_max =
+          (block_size * block_size) < GridMaxComputeCapability_2x
+              ? (block_size * block_size)
+              : GridMaxComputeCapability_2x;
+
+      // At most 'max_grid' blocks:
+      const int max_grid =
+          std::min(int(grid_max), int((nwork + block_size - 1) / block_size));
+
+      // How much work per block:
+      const int work_per_block = (nwork + max_grid - 1) / max_grid;
+
+      // How many block are really needed for this much work:
+      const int grid_x = (nwork + work_per_block - 1) / work_per_block;
+
+      m_scratch_space = cuda_internal_scratch_space(
+          m_policy.space(), ValueTraits::value_size(m_functor) * grid_x);
+      m_scratch_flags =
+          cuda_internal_scratch_flags(m_policy.space(), sizeof(size_type) * 1);
+
+      dim3 grid(grid_x, 1, 1);
+      dim3 block(1, block_size, 1);  // REQUIRED DIMENSIONS ( 1 , N , 1 )
+      const int shmem = ValueTraits::value_size(m_functor) * (block_size + 2);
+
+#ifdef KOKKOS_IMPL_DEBUG_CUDA_SERIAL_EXECUTION
+      if (m_run_serial) {
+        block = dim3(1, 1, 1);
+        grid  = dim3(1, 1, 1);
+      } else {
+#endif
+        m_final = false;
+        CudaParallelLaunch<ParallelScan, LaunchBounds>(
+            *this, grid, block, shmem,
+            m_policy.space().impl_internal_space_instance(),
+            false);  // copy to device and execute
+#ifdef KOKKOS_IMPL_DEBUG_CUDA_SERIAL_EXECUTION
+      }
+#endif
+      m_final = true;
+      CudaParallelLaunch<ParallelScan, LaunchBounds>(
+          *this, grid, block, shmem,
+          m_policy.space().impl_internal_space_instance(),
+          false);  // copy to device and execute
+    }
+  }
+
+  ParallelScan(const FunctorType& arg_functor, const Policy& arg_policy)
+      : m_functor(arg_functor),
+        m_policy(arg_policy),
+        m_scratch_space(0),
+        m_scratch_flags(0),
+        m_final(false)
+#ifdef KOKKOS_IMPL_DEBUG_CUDA_SERIAL_EXECUTION
+        ,
+        m_run_serial(Kokkos::Impl::CudaInternal::cuda_use_serial_execution())
+#endif
   {
-    cudaFuncAttributes attr = CudaParallelLaunch< ParallelReduce, LaunchBounds >::
-        get_cuda_func_attributes();
-    m_team_size = m_team_size>=0?m_team_size:
-        Kokkos::Impl::cuda_get_opt_block_size< FunctorType, LaunchBounds>(
-      m_policy.space().impl_internal_space_instance(),
-      attr, m_functor , m_vector_size,
-      m_policy.team_scratch_size(0), m_policy.thread_scratch_size(0) )/m_vector_size;
-
-    // Return Init value if the number of worksets is zero
-    if( arg_policy.league_size() == 0) {
-      ValueInit::init( ReducerConditional::select(m_functor , m_reducer) , m_result_ptr );
-      return ;
-    }
-
-    m_team_begin = UseShflReduction?0:cuda_single_inter_block_reduce_scan_shmem<false,FunctorType,WorkTag>( arg_functor , m_team_size );
-    m_shmem_begin = sizeof(double) * ( m_team_size + 2 );
-    m_shmem_size = m_policy.scratch_size(0,m_team_size) + FunctorTeamShmemSize< FunctorType >::value( arg_functor , m_team_size );
-    m_scratch_size[0] = m_shmem_size;
-    m_scratch_size[1] = m_policy.scratch_size(1,m_team_size);
-    m_scratch_ptr[1] = m_team_size<=0?NULL:cuda_resize_scratch_space(static_cast<ptrdiff_t>(m_scratch_size[1])*static_cast<ptrdiff_t>(Cuda::concurrency()/(m_team_size*m_vector_size)));
-
-    // The global parallel_reduce does not support vector_length other than 1 at the moment
-    if( (arg_policy.vector_length() > 1) && !UseShflReduction )
-      Impl::throw_runtime_exception( "Kokkos::parallel_reduce with a TeamPolicy using a vector length of greater than 1 is not currently supported for CUDA for dynamic sized reduction types.");
-
-    if( (m_team_size < 32) && !UseShflReduction )
-      Impl::throw_runtime_exception( "Kokkos::parallel_reduce with a TeamPolicy using a team_size smaller than 32 is not currently supported with CUDA for dynamic sized reduction types.");
-
-    // Functor's reduce memory, team scan memory, and team shared memory depend upon team size.
-
-    const int shmem_size_total = m_team_begin + m_shmem_begin + m_shmem_size ;
-
-    if ( (! Kokkos::Impl::is_integral_power_of_two( m_team_size )  && !UseShflReduction ) ||
-         m_policy.space().impl_internal_space_instance()->m_maxShmemPerBlock < shmem_size_total ) {
-      Kokkos::Impl::throw_runtime_exception(std::string("Kokkos::Impl::ParallelReduce< Cuda > bad team size"));
-    }
-    if ( int(m_team_size) > arg_policy.team_size_max(m_functor,ParallelReduceTag()) ) {
-      Kokkos::Impl::throw_runtime_exception(std::string("Kokkos::Impl::ParallelReduce< Cuda > requested too large team size."));
-    }
-
   }
 };
 
-} // namespace Impl
-} // namespace Kokkos
-
-//----------------------------------------------------------------------------
 //----------------------------------------------------------------------------
+template <class FunctorType, class ReturnType, class... Traits>
+class ParallelScanWithTotal<FunctorType, Kokkos::RangePolicy<Traits...>,
+                            ReturnType, Kokkos::Cuda> {
+ public:
+  typedef Kokkos::RangePolicy<Traits...> Policy;
 
-namespace Kokkos {
-namespace Impl {
+ private:
+  typedef typename Policy::member_type Member;
+  typedef typename Policy::work_tag WorkTag;
+  typedef typename Policy::WorkRange WorkRange;
+  typedef typename Policy::launch_bounds LaunchBounds;
 
-template< class FunctorType , class ... Traits >
-class ParallelScan< FunctorType
-                  , Kokkos::RangePolicy< Traits ... >
-                  , Kokkos::Cuda
-                  >
-{
-public:
-  typedef Kokkos::RangePolicy< Traits ... >  Policy ;
-private:
-  typedef typename Policy::member_type  Member ;
-  typedef typename Policy::work_tag     WorkTag ;
-  typedef typename Policy::WorkRange    WorkRange ;
-  typedef typename Policy::launch_bounds  LaunchBounds ;
+  typedef Kokkos::Impl::FunctorValueTraits<FunctorType, WorkTag> ValueTraits;
+  typedef Kokkos::Impl::FunctorValueInit<FunctorType, WorkTag> ValueInit;
+  typedef Kokkos::Impl::FunctorValueOps<FunctorType, WorkTag> ValueOps;
 
-  typedef Kokkos::Impl::FunctorValueTraits< FunctorType, WorkTag > ValueTraits ;
-  typedef Kokkos::Impl::FunctorValueInit<   FunctorType, WorkTag > ValueInit ;
-  typedef Kokkos::Impl::FunctorValueOps<    FunctorType, WorkTag > ValueOps ;
-
-public:
-
-  typedef typename ValueTraits::pointer_type    pointer_type ;
-  typedef typename ValueTraits::reference_type  reference_type ;
-  typedef FunctorType                           functor_type ;
-  typedef Cuda::size_type                       size_type ;
-
-private:
+ public:
+  typedef typename ValueTraits::pointer_type pointer_type;
+  typedef typename ValueTraits::reference_type reference_type;
+  typedef FunctorType functor_type;
+  typedef Cuda::size_type size_type;
 
+ private:
   // Algorithmic constraints:
   //  (a) blockDim.y is a power of two
   //  (b) blockDim.y == blockDim.z == 1
   //  (c) gridDim.x  <= blockDim.y * blockDim.y
   //  (d) gridDim.y  == gridDim.z == 1
 
-  const FunctorType m_functor ;
-  const Policy      m_policy ;
-  size_type *       m_scratch_space ;
-  size_type *       m_scratch_flags ;
-  size_type         m_final ;
+  const FunctorType m_functor;
+  const Policy m_policy;
+  size_type* m_scratch_space;
+  size_type* m_scratch_flags;
+  size_type m_final;
+  ReturnType& m_returnvalue;
+#ifdef KOKKOS_IMPL_DEBUG_CUDA_SERIAL_EXECUTION
+  bool m_run_serial;
+#endif
 
-  template< class TagType >
+  template <class TagType>
   __device__ inline
-  typename std::enable_if< std::is_same< TagType , void >::value >::type
-  exec_range( const Member & i , reference_type update , const bool final_result ) const
-    { m_functor( i , update , final_result ); }
+      typename std::enable_if<std::is_same<TagType, void>::value>::type
+      exec_range(const Member& i, reference_type update,
+                 const bool final_result) const {
+    m_functor(i, update, final_result);
+  }
 
-  template< class TagType >
+  template <class TagType>
   __device__ inline
-  typename std::enable_if< ! std::is_same< TagType , void >::value >::type
-  exec_range( const Member & i , reference_type update , const bool final_result ) const
-    { m_functor( TagType() , i , update , final_result ); }
-
-  //----------------------------------------
-
-  __device__ inline
-  void initial(void) const
-  {
-    const integral_nonzero_constant< size_type , ValueTraits::StaticValueSize / sizeof(size_type) >
-      word_count( ValueTraits::value_size( m_functor ) / sizeof(size_type) );
-
-    size_type * const shared_value = kokkos_impl_cuda_shared_memory<size_type>() + word_count.value * threadIdx.y ;
-
-    ValueInit::init( m_functor , shared_value );
-
-    // Number of blocks is bounded so that the reduction can be limited to two passes.
-    // Each thread block is given an approximately equal amount of work to perform.
-    // Accumulate the values for this block.
-    // The accumulation ordering does not match the final pass, but is arithmatically equivalent.
-
-    const WorkRange range( m_policy , blockIdx.x , gridDim.x );
-
-    for ( Member iwork = range.begin() + threadIdx.y , iwork_end = range.end() ;
-          iwork < iwork_end ; iwork += blockDim.y ) {
-      this-> template exec_range< WorkTag >( iwork , ValueOps::reference( shared_value ) , false );
-    }
-
-    // Reduce and scan, writing out scan of blocks' totals and block-groups' totals.
-    // Blocks' scan values are written to 'blockIdx.x' location.
-    // Block-groups' scan values are at: i = ( j * blockDim.y - 1 ) for i < gridDim.x
-    cuda_single_inter_block_reduce_scan<true,FunctorType,WorkTag>( m_functor , blockIdx.x , gridDim.x , kokkos_impl_cuda_shared_memory<size_type>() , m_scratch_space , m_scratch_flags );
+      typename std::enable_if<!std::is_same<TagType, void>::value>::type
+      exec_range(const Member& i, reference_type update,
+                 const bool final_result) const {
+    m_functor(TagType(), i, update, final_result);
   }
 
   //----------------------------------------
 
-  __device__ inline
-  void final(void) const
-  {
-    const integral_nonzero_constant< size_type , ValueTraits::StaticValueSize / sizeof(size_type) >
-      word_count( ValueTraits::value_size( m_functor ) / sizeof(size_type) );
+  __device__ inline void initial(void) const {
+    const integral_nonzero_constant<size_type, ValueTraits::StaticValueSize /
+                                                   sizeof(size_type)>
+        word_count(ValueTraits::value_size(m_functor) / sizeof(size_type));
 
-    // Use shared memory as an exclusive scan: { 0 , value[0] , value[1] , value[2] , ... }
-    size_type * const shared_data   = kokkos_impl_cuda_shared_memory<size_type>();
-    size_type * const shared_prefix = shared_data + word_count.value * threadIdx.y ;
-    size_type * const shared_accum  = shared_data + word_count.value * ( blockDim.y + 1 );
+    size_type* const shared_value =
+        kokkos_impl_cuda_shared_memory<size_type>() +
+        word_count.value * threadIdx.y;
+
+    ValueInit::init(m_functor, shared_value);
+
+    // Number of blocks is bounded so that the reduction can be limited to two
+    // passes. Each thread block is given an approximately equal amount of work
+    // to perform. Accumulate the values for this block. The accumulation
+    // ordering does not match the final pass, but is arithmatically equivalent.
+
+    const WorkRange range(m_policy, blockIdx.x, gridDim.x);
+
+    for (Member iwork = range.begin() + threadIdx.y, iwork_end = range.end();
+         iwork < iwork_end; iwork += blockDim.y) {
+      this->template exec_range<WorkTag>(
+          iwork, ValueOps::reference(shared_value), false);
+    }
+
+    // Reduce and scan, writing out scan of blocks' totals and block-groups'
+    // totals. Blocks' scan values are written to 'blockIdx.x' location.
+    // Block-groups' scan values are at: i = ( j * blockDim.y - 1 ) for i <
+    // gridDim.x
+    cuda_single_inter_block_reduce_scan<true, FunctorType, WorkTag>(
+        m_functor, blockIdx.x, gridDim.x,
+        kokkos_impl_cuda_shared_memory<size_type>(), m_scratch_space,
+        m_scratch_flags);
+  }
+
+  //----------------------------------------
+
+  __device__ inline void final(void) const {
+    const integral_nonzero_constant<size_type, ValueTraits::StaticValueSize /
+                                                   sizeof(size_type)>
+        word_count(ValueTraits::value_size(m_functor) / sizeof(size_type));
+
+    // Use shared memory as an exclusive scan: { 0 , value[0] , value[1] ,
+    // value[2] , ... }
+    size_type* const shared_data = kokkos_impl_cuda_shared_memory<size_type>();
+    size_type* const shared_prefix =
+        shared_data + word_count.value * threadIdx.y;
+    size_type* const shared_accum =
+        shared_data + word_count.value * (blockDim.y + 1);
 
     // Starting value for this thread block is the previous block's total.
-    if ( blockIdx.x ) {
-      size_type * const block_total = m_scratch_space + word_count.value * ( blockIdx.x - 1 );
-      for ( unsigned i = threadIdx.y ; i < word_count.value ; ++i ) { shared_accum[i] = block_total[i] ; }
-    }
-    else if ( 0 == threadIdx.y ) {
-      ValueInit::init( m_functor , shared_accum );
-    }
-
-    const WorkRange range( m_policy , blockIdx.x , gridDim.x );
-
-    for ( typename Policy::member_type iwork_base = range.begin(); iwork_base < range.end() ; iwork_base += blockDim.y ) {
-      #ifdef KOKKOS_IMPL_CUDA_SYNCWARP_NEEDS_MASK
-      unsigned MASK=KOKKOS_IMPL_CUDA_ACTIVEMASK;
-      #endif
-      const typename Policy::member_type iwork = iwork_base + threadIdx.y ;
-
-      __syncthreads(); // Don't overwrite previous iteration values until they are used
-
-      ValueInit::init( m_functor , shared_prefix + word_count.value );
-
-      // Copy previous block's accumulation total into thread[0] prefix and inclusive scan value of this block
-      for ( unsigned i = threadIdx.y ; i < word_count.value ; ++i ) {
-        shared_data[i + word_count.value] = shared_data[i] = shared_accum[i] ;
+    if (blockIdx.x) {
+      size_type* const block_total =
+          m_scratch_space + word_count.value * (blockIdx.x - 1);
+      for (unsigned i = threadIdx.y; i < word_count.value; ++i) {
+        shared_accum[i] = block_total[i];
       }
-      #ifdef KOKKOS_IMPL_CUDA_SYNCWARP_NEEDS_MASK
+    } else if (0 == threadIdx.y) {
+      ValueInit::init(m_functor, shared_accum);
+    }
+
+    const WorkRange range(m_policy, blockIdx.x, gridDim.x);
+
+    for (typename Policy::member_type iwork_base = range.begin();
+         iwork_base < range.end(); iwork_base += blockDim.y) {
+#ifdef KOKKOS_IMPL_CUDA_SYNCWARP_NEEDS_MASK
+      unsigned MASK = KOKKOS_IMPL_CUDA_ACTIVEMASK;
+#endif
+
+      const typename Policy::member_type iwork = iwork_base + threadIdx.y;
+
+      __syncthreads();  // Don't overwrite previous iteration values until they
+                        // are used
+
+      ValueInit::init(m_functor, shared_prefix + word_count.value);
+
+      // Copy previous block's accumulation total into thread[0] prefix and
+      // inclusive scan value of this block
+      for (unsigned i = threadIdx.y; i < word_count.value; ++i) {
+        shared_data[i + word_count.value] = shared_data[i] = shared_accum[i];
+      }
+
+#ifdef KOKKOS_IMPL_CUDA_SYNCWARP_NEEDS_MASK
       KOKKOS_IMPL_CUDA_SYNCWARP_MASK(MASK);
-      #else
+#else
       KOKKOS_IMPL_CUDA_SYNCWARP;
-      #endif
-      if ( CudaTraits::WarpSize < word_count.value ) { __syncthreads(); } // Protect against large scan values.
+#endif
+      if (CudaTraits::WarpSize < word_count.value) {
+        __syncthreads();
+      }  // Protect against large scan values.
 
       // Call functor to accumulate inclusive scan value for this work item
-      if ( iwork < range.end() ) {
-        this-> template exec_range< WorkTag >( iwork , ValueOps::reference( shared_prefix + word_count.value ) , false );
+      if (iwork < range.end()) {
+        this->template exec_range<WorkTag>(
+            iwork, ValueOps::reference(shared_prefix + word_count.value),
+            false);
       }
 
       // Scan block values into locations shared_data[1..blockDim.y]
-      cuda_intra_block_reduce_scan<true,FunctorType,WorkTag>( m_functor , typename ValueTraits::pointer_type(shared_data+word_count.value) );
+      cuda_intra_block_reduce_scan<true, FunctorType, WorkTag>(
+          m_functor,
+          typename ValueTraits::pointer_type(shared_data + word_count.value));
 
       {
-        size_type * const block_total = shared_data + word_count.value * blockDim.y ;
-        for ( unsigned i = threadIdx.y ; i < word_count.value ; ++i ) { shared_accum[i] = block_total[i]; }
+        size_type* const block_total =
+            shared_data + word_count.value * blockDim.y;
+        for (unsigned i = threadIdx.y; i < word_count.value; ++i) {
+          shared_accum[i] = block_total[i];
+        }
       }
 
       // Call functor with exclusive scan value
-      if ( iwork < range.end() ) {
-        this-> template exec_range< WorkTag >( iwork , ValueOps::reference( shared_prefix ) , true );
+      if (iwork < range.end()) {
+        this->template exec_range<WorkTag>(
+            iwork, ValueOps::reference(shared_prefix), true);
       }
     }
   }
 
-public:
-
+ public:
   //----------------------------------------
 
-  __device__ inline
-  void operator()(void) const
-  {
-    if ( ! m_final ) {
-      initial();
-    }
-    else {
-      final();
+  __device__ inline void operator()(void) const {
+#ifdef KOKKOS_IMPL_DEBUG_CUDA_SERIAL_EXECUTION
+    if (m_run_serial) {
+      typename ValueTraits::value_type value;
+      ValueInit::init(m_functor, (void*)&value);
+      const WorkRange range(m_policy, blockIdx.x, gridDim.x);
+
+      for (typename Policy::member_type iwork_base = range.begin();
+           iwork_base < range.end(); iwork_base++) {
+        this->template exec_range<WorkTag>(iwork_base, value, true);
+      }
+      *((typename ValueTraits::value_type*)m_scratch_space) = value;
+    } else {
+#endif
+      if (!m_final) {
+        initial();
+      } else {
+        final();
+      }
+#ifdef KOKKOS_IMPL_DEBUG_CUDA_SERIAL_EXECUTION
     }
+#endif
   }
 
   // Determine block size constrained by shared memory:
-  inline
-  unsigned local_block_size( const FunctorType & f )
-    {
-      // blockDim.y must be power of two = 128 (4 warps) or 256 (8 warps) or 512 (16 warps)
-      // gridDim.x <= blockDim.y * blockDim.y
-      //
-      // 4 warps was 10% faster than 8 warps and 20% faster than 16 warps in unit testing
+  inline unsigned local_block_size(const FunctorType& f) {
+    // blockDim.y must be power of two = 128 (4 warps) or 256 (8 warps) or 512
+    // (16 warps) gridDim.x <= blockDim.y * blockDim.y
+    //
+    // 4 warps was 10% faster than 8 warps and 20% faster than 16 warps in unit
+    // testing
 
-      unsigned n = CudaTraits::WarpSize * 4 ;
-      while ( n && unsigned(m_policy.space().impl_internal_space_instance()->m_maxShmemPerBlock) < cuda_single_inter_block_reduce_scan_shmem<false,FunctorType,WorkTag>( f , n ) ) { n >>= 1 ; }
-      return n ;
+    unsigned n = CudaTraits::WarpSize * 4;
+    while (n &&
+           unsigned(m_policy.space()
+                        .impl_internal_space_instance()
+                        ->m_maxShmemPerBlock) <
+               cuda_single_inter_block_reduce_scan_shmem<false, FunctorType,
+                                                         WorkTag>(f, n)) {
+      n >>= 1;
     }
+    return n;
+  }
 
-  inline
-  void execute()
-    {
-      const int nwork    = m_policy.end() - m_policy.begin();
-      if ( nwork ) {
-        enum { GridMaxComputeCapability_2x = 0x0ffff };
+  inline void execute() {
+    const int nwork = m_policy.end() - m_policy.begin();
+    if (nwork) {
+      enum { GridMaxComputeCapability_2x = 0x0ffff };
 
-        const int block_size = local_block_size( m_functor );
+      const int block_size = local_block_size(m_functor);
 
-        const int grid_max =
-          ( block_size * block_size ) < GridMaxComputeCapability_2x ?
-          ( block_size * block_size ) : GridMaxComputeCapability_2x ;
+      const int grid_max =
+          (block_size * block_size) < GridMaxComputeCapability_2x
+              ? (block_size * block_size)
+              : GridMaxComputeCapability_2x;
 
-        // At most 'max_grid' blocks:
-        const int max_grid = std::min( int(grid_max) , int(( nwork + block_size - 1 ) / block_size ));
+      // At most 'max_grid' blocks:
+      const int max_grid =
+          std::min(int(grid_max), int((nwork + block_size - 1) / block_size));
 
-        // How much work per block:
-        const int work_per_block = ( nwork + max_grid - 1 ) / max_grid ;
+      // How much work per block:
+      const int work_per_block = (nwork + max_grid - 1) / max_grid;
 
-        // How many block are really needed for this much work:
-        const int grid_x = ( nwork + work_per_block - 1 ) / work_per_block ;
+      // How many block are really needed for this much work:
+      const int grid_x = (nwork + work_per_block - 1) / work_per_block;
 
-        m_scratch_space = cuda_internal_scratch_space( m_policy.space(), ValueTraits::value_size( m_functor ) * grid_x );
-        m_scratch_flags = cuda_internal_scratch_flags( m_policy.space(), sizeof(size_type) * 1 );
+      m_scratch_space = cuda_internal_scratch_space(
+          m_policy.space(), ValueTraits::value_size(m_functor) * grid_x);
+      m_scratch_flags =
+          cuda_internal_scratch_flags(m_policy.space(), sizeof(size_type) * 1);
 
-        const dim3 grid( grid_x , 1 , 1 );
-        const dim3 block( 1 , block_size , 1 ); // REQUIRED DIMENSIONS ( 1 , N , 1 )
-        const int shmem = ValueTraits::value_size( m_functor ) * ( block_size + 2 );
+      dim3 grid(grid_x, 1, 1);
+      dim3 block(1, block_size, 1);  // REQUIRED DIMENSIONS ( 1 , N , 1 )
+      const int shmem = ValueTraits::value_size(m_functor) * (block_size + 2);
 
-        m_final = false ;
-        CudaParallelLaunch< ParallelScan, LaunchBounds >( *this, grid, block, shmem , m_policy.space().impl_internal_space_instance() , false ); // copy to device and execute
+#ifdef KOKKOS_IMPL_DEBUG_CUDA_SERIAL_EXECUTION
+      if (m_run_serial) {
+        block = dim3(1, 1, 1);
+        grid  = dim3(1, 1, 1);
+      } else {
+#endif
 
-        m_final = true ;
-        CudaParallelLaunch< ParallelScan, LaunchBounds >( *this, grid, block, shmem , m_policy.space().impl_internal_space_instance() , false ); // copy to device and execute
+        m_final = false;
+        CudaParallelLaunch<ParallelScanWithTotal, LaunchBounds>(
+            *this, grid, block, shmem,
+            m_policy.space().impl_internal_space_instance(),
+            false);  // copy to device and execute
+#ifdef KOKKOS_IMPL_DEBUG_CUDA_SERIAL_EXECUTION
       }
-    }
+#endif
+      m_final = true;
+      CudaParallelLaunch<ParallelScanWithTotal, LaunchBounds>(
+          *this, grid, block, shmem,
+          m_policy.space().impl_internal_space_instance(),
+          false);  // copy to device and execute
 
-  ParallelScan( const FunctorType  & arg_functor ,
-                const Policy       & arg_policy )
-  : m_functor( arg_functor )
-  , m_policy( arg_policy )
-  , m_scratch_space( 0 )
-  , m_scratch_flags( 0 )
-  , m_final( false )
-  { }
+      const int size = ValueTraits::value_size(m_functor);
+#ifdef KOKKOS_IMPL_DEBUG_CUDA_SERIAL_EXECUTION
+      if (m_run_serial)
+        DeepCopy<HostSpace, CudaSpace>(&m_returnvalue, m_scratch_space, size);
+      else
+#endif
+        DeepCopy<HostSpace, CudaSpace>(
+            &m_returnvalue, m_scratch_space + (grid_x - 1) * size / sizeof(int),
+            size);
+    }
+  }
+
+  ParallelScanWithTotal(const FunctorType& arg_functor,
+                        const Policy& arg_policy, ReturnType& arg_returnvalue)
+      : m_functor(arg_functor),
+        m_policy(arg_policy),
+        m_scratch_space(0),
+        m_scratch_flags(0),
+        m_final(false),
+        m_returnvalue(arg_returnvalue)
+#ifdef KOKKOS_IMPL_DEBUG_CUDA_SERIAL_EXECUTION
+        ,
+        m_run_serial(Kokkos::Impl::CudaInternal::cuda_use_serial_execution())
+#endif
+  {
+  }
 };
 
-//----------------------------------------------------------------------------
-template< class FunctorType, class ReturnType, class ... Traits >
-class ParallelScanWithTotal< FunctorType
-                           , Kokkos::RangePolicy< Traits ... >
-                           , ReturnType
-                           , Kokkos::Cuda
-                           >
-{
-public:
-  typedef Kokkos::RangePolicy< Traits ... >  Policy ;
-
-private:
-  typedef typename Policy::member_type  Member ;
-  typedef typename Policy::work_tag     WorkTag ;
-  typedef typename Policy::WorkRange    WorkRange ;
-  typedef typename Policy::launch_bounds  LaunchBounds ;
-
-  typedef Kokkos::Impl::FunctorValueTraits< FunctorType, WorkTag > ValueTraits ;
-  typedef Kokkos::Impl::FunctorValueInit<   FunctorType, WorkTag > ValueInit ;
-  typedef Kokkos::Impl::FunctorValueOps<    FunctorType, WorkTag > ValueOps ;
-
-public:
-
-  typedef typename ValueTraits::pointer_type    pointer_type ;
-  typedef typename ValueTraits::reference_type  reference_type ;
-  typedef FunctorType                           functor_type ;
-  typedef Cuda::size_type                       size_type ;
-
-private:
-
-  // Algorithmic constraints:
-  //  (a) blockDim.y is a power of two
-  //  (b) blockDim.y == blockDim.z == 1
-  //  (c) gridDim.x  <= blockDim.y * blockDim.y
-  //  (d) gridDim.y  == gridDim.z == 1
-
-  const FunctorType m_functor ;
-  const Policy      m_policy ;
-  size_type *       m_scratch_space ;
-  size_type *       m_scratch_flags ;
-  size_type         m_final ;
-  ReturnType      & m_returnvalue;
-
-  template< class TagType >
-  __device__ inline
-  typename std::enable_if< std::is_same< TagType , void >::value >::type
-  exec_range( const Member & i , reference_type update , const bool final_result ) const
-    { m_functor( i , update , final_result ); }
-
-  template< class TagType >
-  __device__ inline
-  typename std::enable_if< ! std::is_same< TagType , void >::value >::type
-  exec_range( const Member & i , reference_type update , const bool final_result ) const
-    { m_functor( TagType() , i , update , final_result ); }
-
-  //----------------------------------------
-
-  __device__ inline
-  void initial(void) const
-  {
-    const integral_nonzero_constant< size_type , ValueTraits::StaticValueSize / sizeof(size_type) >
-      word_count( ValueTraits::value_size( m_functor ) / sizeof(size_type) );
-
-    size_type * const shared_value = kokkos_impl_cuda_shared_memory<size_type>() + word_count.value * threadIdx.y ;
-
-    ValueInit::init( m_functor , shared_value );
-
-    // Number of blocks is bounded so that the reduction can be limited to two passes.
-    // Each thread block is given an approximately equal amount of work to perform.
-    // Accumulate the values for this block.
-    // The accumulation ordering does not match the final pass, but is arithmatically equivalent.
-
-    const WorkRange range( m_policy , blockIdx.x , gridDim.x );
-
-    for ( Member iwork = range.begin() + threadIdx.y , iwork_end = range.end() ;
-          iwork < iwork_end ; iwork += blockDim.y ) {
-      this-> template exec_range< WorkTag >( iwork , ValueOps::reference( shared_value ) , false );
-    }
-
-    // Reduce and scan, writing out scan of blocks' totals and block-groups' totals.
-    // Blocks' scan values are written to 'blockIdx.x' location.
-    // Block-groups' scan values are at: i = ( j * blockDim.y - 1 ) for i < gridDim.x
-    cuda_single_inter_block_reduce_scan<true,FunctorType,WorkTag>( m_functor , blockIdx.x , gridDim.x , kokkos_impl_cuda_shared_memory<size_type>() , m_scratch_space , m_scratch_flags );
-  }
-
-  //----------------------------------------
-
-  __device__ inline
-  void final(void) const
-  {
-    const integral_nonzero_constant< size_type , ValueTraits::StaticValueSize / sizeof(size_type) >
-      word_count( ValueTraits::value_size( m_functor ) / sizeof(size_type) );
-
-    // Use shared memory as an exclusive scan: { 0 , value[0] , value[1] , value[2] , ... }
-    size_type * const shared_data   = kokkos_impl_cuda_shared_memory<size_type>();
-    size_type * const shared_prefix = shared_data + word_count.value * threadIdx.y ;
-    size_type * const shared_accum  = shared_data + word_count.value * ( blockDim.y + 1 );
-
-    // Starting value for this thread block is the previous block's total.
-    if ( blockIdx.x ) {
-      size_type * const block_total = m_scratch_space + word_count.value * ( blockIdx.x - 1 );
-      for ( unsigned i = threadIdx.y ; i < word_count.value ; ++i ) { shared_accum[i] = block_total[i] ; }
-    }
-    else if ( 0 == threadIdx.y ) {
-      ValueInit::init( m_functor , shared_accum );
-    }
-
-    const WorkRange range( m_policy , blockIdx.x , gridDim.x );
-
-    for ( typename Policy::member_type iwork_base = range.begin(); iwork_base < range.end() ; iwork_base += blockDim.y ) {
-      #ifdef KOKKOS_IMPL_CUDA_SYNCWARP_NEEDS_MASK
-      unsigned MASK=KOKKOS_IMPL_CUDA_ACTIVEMASK;
-      #endif
-
-      const typename Policy::member_type iwork = iwork_base + threadIdx.y ;
-
-      __syncthreads(); // Don't overwrite previous iteration values until they are used
-
-      ValueInit::init( m_functor , shared_prefix + word_count.value );
-
-      // Copy previous block's accumulation total into thread[0] prefix and inclusive scan value of this block
-      for ( unsigned i = threadIdx.y ; i < word_count.value ; ++i ) {
-        shared_data[i + word_count.value] = shared_data[i] = shared_accum[i] ;
-      }
-
-      #ifdef KOKKOS_IMPL_CUDA_SYNCWARP_NEEDS_MASK
-      KOKKOS_IMPL_CUDA_SYNCWARP_MASK(MASK);
-      #else
-      KOKKOS_IMPL_CUDA_SYNCWARP;
-      #endif
-      if ( CudaTraits::WarpSize < word_count.value ) { __syncthreads(); } // Protect against large scan values.
-
-      // Call functor to accumulate inclusive scan value for this work item
-      if ( iwork < range.end() ) {
-        this-> template exec_range< WorkTag >( iwork , ValueOps::reference( shared_prefix + word_count.value ) , false );
-      }
-
-      // Scan block values into locations shared_data[1..blockDim.y]
-      cuda_intra_block_reduce_scan<true,FunctorType,WorkTag>( m_functor , typename ValueTraits::pointer_type(shared_data+word_count.value) );
-
-      {
-        size_type * const block_total = shared_data + word_count.value * blockDim.y ;
-        for ( unsigned i = threadIdx.y ; i < word_count.value ; ++i ) { shared_accum[i] = block_total[i]; }
-      }
-
-      // Call functor with exclusive scan value
-      if ( iwork < range.end() ) {
-        this-> template exec_range< WorkTag >( iwork , ValueOps::reference( shared_prefix ) , true );
-      }
-    }
-  }
-
-public:
-
-  //----------------------------------------
-
-  __device__ inline
-  void operator()(void) const
-  {
-    if ( ! m_final ) {
-      initial();
-    }
-    else {
-      final();
-    }
-  }
-
-  // Determine block size constrained by shared memory:
-  inline
-  unsigned local_block_size( const FunctorType & f )
-    {
-      // blockDim.y must be power of two = 128 (4 warps) or 256 (8 warps) or 512 (16 warps)
-      // gridDim.x <= blockDim.y * blockDim.y
-      //
-      // 4 warps was 10% faster than 8 warps and 20% faster than 16 warps in unit testing
-
-      unsigned n = CudaTraits::WarpSize * 4 ;
-      while ( n && unsigned(m_policy.space().impl_internal_space_instance()->m_maxShmemPerBlock) < cuda_single_inter_block_reduce_scan_shmem<false,FunctorType,WorkTag>( f , n ) ) { n >>= 1 ; }
-      return n ;
-    }
-
-  inline
-  void execute()
-    {
-      const int nwork    = m_policy.end() - m_policy.begin();
-      if ( nwork ) {
-        enum { GridMaxComputeCapability_2x = 0x0ffff };
-
-        const int block_size = local_block_size( m_functor );
-
-        const int grid_max =
-          ( block_size * block_size ) < GridMaxComputeCapability_2x ?
-          ( block_size * block_size ) : GridMaxComputeCapability_2x ;
-
-        // At most 'max_grid' blocks:
-        const int max_grid = std::min( int(grid_max) , int(( nwork + block_size - 1 ) / block_size ));
-
-        // How much work per block:
-        const int work_per_block = ( nwork + max_grid - 1 ) / max_grid ;
-
-        // How many block are really needed for this much work:
-        const int grid_x = ( nwork + work_per_block - 1 ) / work_per_block ;
-
-        m_scratch_space = cuda_internal_scratch_space( m_policy.space(), ValueTraits::value_size( m_functor ) * grid_x );
-        m_scratch_flags = cuda_internal_scratch_flags( m_policy.space(), sizeof(size_type) * 1 );
-
-        const dim3 grid( grid_x , 1 , 1 );
-        const dim3 block( 1 , block_size , 1 ); // REQUIRED DIMENSIONS ( 1 , N , 1 )
-        const int shmem = ValueTraits::value_size( m_functor ) * ( block_size + 2 );
-
-        m_final = false ;
-        CudaParallelLaunch< ParallelScanWithTotal, LaunchBounds >( *this, grid, block, shmem , m_policy.space().impl_internal_space_instance() , false ); // copy to device and execute
-
-        m_final = true ;
-        CudaParallelLaunch< ParallelScanWithTotal, LaunchBounds >( *this, grid, block, shmem , m_policy.space().impl_internal_space_instance() , false ); // copy to device and execute
-
-        const int size = ValueTraits::value_size( m_functor );
-        DeepCopy<HostSpace,CudaSpace>( &m_returnvalue, m_scratch_space + (grid_x - 1)*size/sizeof(int), size );
-      }
-    }
-
-  ParallelScanWithTotal( const FunctorType  & arg_functor ,
-                         const Policy       & arg_policy ,   
-                         ReturnType         & arg_returnvalue )
-  : m_functor( arg_functor )
-  , m_policy( arg_policy )
-  , m_scratch_space( 0 )
-  , m_scratch_flags( 0 )
-  , m_final( false )
-  , m_returnvalue( arg_returnvalue )
-  { }
-};
-
-} // namespace Impl
-} // namespace Kokkos
+}  // namespace Impl
+}  // namespace Kokkos
 
 //----------------------------------------------------------------------------
 //----------------------------------------------------------------------------
@@ -2131,155 +2606,228 @@ public:
 namespace Kokkos {
 
 namespace Impl {
-  template< class FunctorType, class ExecPolicy, class ValueType , class Tag = typename ExecPolicy::work_tag>
-  struct CudaFunctorAdapter {
-    const FunctorType f;
-    typedef ValueType value_type;
-    CudaFunctorAdapter(const FunctorType& f_):f(f_) {}
+template <class FunctorType, class ExecPolicy, class ValueType,
+          class Tag = typename ExecPolicy::work_tag>
+struct CudaFunctorAdapter {
+  const FunctorType f;
+  typedef ValueType value_type;
+  CudaFunctorAdapter(const FunctorType& f_) : f(f_) {}
 
-    __device__ inline
-    void operator() (typename ExecPolicy::work_tag, const typename ExecPolicy::member_type& i, ValueType& val) const {
-      //Insert Static Assert with decltype on ValueType equals third argument type of FunctorType::operator()
-      f(typename ExecPolicy::work_tag(), i, val);
-    }
+  __device__ inline void operator()(typename ExecPolicy::work_tag,
+                                    const typename ExecPolicy::member_type& i,
+                                    ValueType& val) const {
+    // Insert Static Assert with decltype on ValueType equals third argument
+    // type of FunctorType::operator()
+    f(typename ExecPolicy::work_tag(), i, val);
+  }
 
-    __device__ inline
-    void operator() (typename ExecPolicy::work_tag, const typename ExecPolicy::member_type& i, const typename ExecPolicy::member_type& j, ValueType& val) const {
-      //Insert Static Assert with decltype on ValueType equals third argument type of FunctorType::operator()
-      f(typename ExecPolicy::work_tag(), i, j, val);
-    }
+  __device__ inline void operator()(typename ExecPolicy::work_tag,
+                                    const typename ExecPolicy::member_type& i,
+                                    const typename ExecPolicy::member_type& j,
+                                    ValueType& val) const {
+    // Insert Static Assert with decltype on ValueType equals third argument
+    // type of FunctorType::operator()
+    f(typename ExecPolicy::work_tag(), i, j, val);
+  }
 
-    __device__ inline
-    void operator() (typename ExecPolicy::work_tag, const typename ExecPolicy::member_type& i, const typename ExecPolicy::member_type& j, const typename ExecPolicy::member_type& k, ValueType& val) const {
-      //Insert Static Assert with decltype on ValueType equals third argument type of FunctorType::operator()
-      f(typename ExecPolicy::work_tag(), i, j, k, val);
-    }
+  __device__ inline void operator()(typename ExecPolicy::work_tag,
+                                    const typename ExecPolicy::member_type& i,
+                                    const typename ExecPolicy::member_type& j,
+                                    const typename ExecPolicy::member_type& k,
+                                    ValueType& val) const {
+    // Insert Static Assert with decltype on ValueType equals third argument
+    // type of FunctorType::operator()
+    f(typename ExecPolicy::work_tag(), i, j, k, val);
+  }
 
-    __device__ inline
-    void operator() (typename ExecPolicy::work_tag, const typename ExecPolicy::member_type& i, const typename ExecPolicy::member_type& j, const typename ExecPolicy::member_type& k, const typename ExecPolicy::member_type& l, ValueType& val) const {
-      //Insert Static Assert with decltype on ValueType equals third argument type of FunctorType::operator()
-      f(typename ExecPolicy::work_tag(), i, j, k, l, val);
-    }
+  __device__ inline void operator()(typename ExecPolicy::work_tag,
+                                    const typename ExecPolicy::member_type& i,
+                                    const typename ExecPolicy::member_type& j,
+                                    const typename ExecPolicy::member_type& k,
+                                    const typename ExecPolicy::member_type& l,
+                                    ValueType& val) const {
+    // Insert Static Assert with decltype on ValueType equals third argument
+    // type of FunctorType::operator()
+    f(typename ExecPolicy::work_tag(), i, j, k, l, val);
+  }
 
-    __device__ inline
-    void operator() (typename ExecPolicy::work_tag, const typename ExecPolicy::member_type& i, const typename ExecPolicy::member_type& j, const typename ExecPolicy::member_type& k, const typename ExecPolicy::member_type& l, const typename ExecPolicy::member_type& m, ValueType& val) const {
-      //Insert Static Assert with decltype on ValueType equals third argument type of FunctorType::operator()
-      f(typename ExecPolicy::work_tag(), i, j, k, l, m, val);
-    }
+  __device__ inline void operator()(typename ExecPolicy::work_tag,
+                                    const typename ExecPolicy::member_type& i,
+                                    const typename ExecPolicy::member_type& j,
+                                    const typename ExecPolicy::member_type& k,
+                                    const typename ExecPolicy::member_type& l,
+                                    const typename ExecPolicy::member_type& m,
+                                    ValueType& val) const {
+    // Insert Static Assert with decltype on ValueType equals third argument
+    // type of FunctorType::operator()
+    f(typename ExecPolicy::work_tag(), i, j, k, l, m, val);
+  }
 
-    __device__ inline
-    void operator() (typename ExecPolicy::work_tag, const typename ExecPolicy::member_type& i, const typename ExecPolicy::member_type& j, const typename ExecPolicy::member_type& k, const typename ExecPolicy::member_type& l, const typename ExecPolicy::member_type& m, const typename ExecPolicy::member_type& n, ValueType& val) const {
-      //Insert Static Assert with decltype on ValueType equals third argument type of FunctorType::operator()
-      f(typename ExecPolicy::work_tag(), i, j, k, l, m, n, val);
-    }
+  __device__ inline void operator()(typename ExecPolicy::work_tag,
+                                    const typename ExecPolicy::member_type& i,
+                                    const typename ExecPolicy::member_type& j,
+                                    const typename ExecPolicy::member_type& k,
+                                    const typename ExecPolicy::member_type& l,
+                                    const typename ExecPolicy::member_type& m,
+                                    const typename ExecPolicy::member_type& n,
+                                    ValueType& val) const {
+    // Insert Static Assert with decltype on ValueType equals third argument
+    // type of FunctorType::operator()
+    f(typename ExecPolicy::work_tag(), i, j, k, l, m, n, val);
+  }
+};
 
+template <class FunctorType, class ExecPolicy, class ValueType>
+struct CudaFunctorAdapter<FunctorType, ExecPolicy, ValueType, void> {
+  const FunctorType f;
+  typedef ValueType value_type;
+  CudaFunctorAdapter(const FunctorType& f_) : f(f_) {}
+
+  __device__ inline void operator()(const typename ExecPolicy::member_type& i,
+                                    ValueType& val) const {
+    // Insert Static Assert with decltype on ValueType equals second argument
+    // type of FunctorType::operator()
+    f(i, val);
+  }
+
+  __device__ inline void operator()(const typename ExecPolicy::member_type& i,
+                                    const typename ExecPolicy::member_type& j,
+                                    ValueType& val) const {
+    // Insert Static Assert with decltype on ValueType equals second argument
+    // type of FunctorType::operator()
+    f(i, j, val);
+  }
+
+  __device__ inline void operator()(const typename ExecPolicy::member_type& i,
+                                    const typename ExecPolicy::member_type& j,
+                                    const typename ExecPolicy::member_type& k,
+                                    ValueType& val) const {
+    // Insert Static Assert with decltype on ValueType equals second argument
+    // type of FunctorType::operator()
+    f(i, j, k, val);
+  }
+
+  __device__ inline void operator()(const typename ExecPolicy::member_type& i,
+                                    const typename ExecPolicy::member_type& j,
+                                    const typename ExecPolicy::member_type& k,
+                                    const typename ExecPolicy::member_type& l,
+                                    ValueType& val) const {
+    // Insert Static Assert with decltype on ValueType equals second argument
+    // type of FunctorType::operator()
+    f(i, j, k, l, val);
+  }
+
+  __device__ inline void operator()(const typename ExecPolicy::member_type& i,
+                                    const typename ExecPolicy::member_type& j,
+                                    const typename ExecPolicy::member_type& k,
+                                    const typename ExecPolicy::member_type& l,
+                                    const typename ExecPolicy::member_type& m,
+                                    ValueType& val) const {
+    // Insert Static Assert with decltype on ValueType equals second argument
+    // type of FunctorType::operator()
+    f(i, j, k, l, m, val);
+  }
+
+  __device__ inline void operator()(const typename ExecPolicy::member_type& i,
+                                    const typename ExecPolicy::member_type& j,
+                                    const typename ExecPolicy::member_type& k,
+                                    const typename ExecPolicy::member_type& l,
+                                    const typename ExecPolicy::member_type& m,
+                                    const typename ExecPolicy::member_type& n,
+                                    ValueType& val) const {
+    // Insert Static Assert with decltype on ValueType equals second argument
+    // type of FunctorType::operator()
+    f(i, j, k, l, m, n, val);
+  }
+
+  __device__ inline void operator()(typename ExecPolicy::member_type& i,
+                                    ValueType& val) const {
+    // Insert Static Assert with decltype on ValueType equals second argument
+    // type of FunctorType::operator()
+    f(i, val);
+  }
+
+  __device__ inline void operator()(typename ExecPolicy::member_type& i,
+                                    typename ExecPolicy::member_type& j,
+                                    ValueType& val) const {
+    // Insert Static Assert with decltype on ValueType equals second argument
+    // type of FunctorType::operator()
+    f(i, j, val);
+  }
+
+  __device__ inline void operator()(typename ExecPolicy::member_type& i,
+                                    typename ExecPolicy::member_type& j,
+                                    typename ExecPolicy::member_type& k,
+                                    ValueType& val) const {
+    // Insert Static Assert with decltype on ValueType equals second argument
+    // type of FunctorType::operator()
+    f(i, j, k, val);
+  }
+
+  __device__ inline void operator()(typename ExecPolicy::member_type& i,
+                                    typename ExecPolicy::member_type& j,
+                                    typename ExecPolicy::member_type& k,
+                                    typename ExecPolicy::member_type& l,
+                                    ValueType& val) const {
+    // Insert Static Assert with decltype on ValueType equals second argument
+    // type of FunctorType::operator()
+    f(i, j, k, l, val);
+  }
+
+  __device__ inline void operator()(typename ExecPolicy::member_type& i,
+                                    typename ExecPolicy::member_type& j,
+                                    typename ExecPolicy::member_type& k,
+                                    typename ExecPolicy::member_type& l,
+                                    typename ExecPolicy::member_type& m,
+                                    ValueType& val) const {
+    // Insert Static Assert with decltype on ValueType equals second argument
+    // type of FunctorType::operator()
+    f(i, j, k, l, m, val);
+  }
+
+  __device__ inline void operator()(typename ExecPolicy::member_type& i,
+                                    typename ExecPolicy::member_type& j,
+                                    typename ExecPolicy::member_type& k,
+                                    typename ExecPolicy::member_type& l,
+                                    typename ExecPolicy::member_type& m,
+                                    typename ExecPolicy::member_type& n,
+                                    ValueType& val) const {
+    // Insert Static Assert with decltype on ValueType equals second argument
+    // type of FunctorType::operator()
+    f(i, j, k, l, m, n, val);
+  }
+};
+
+template <class FunctorType, class ResultType, class Tag,
+          bool Enable = IsNonTrivialReduceFunctor<FunctorType>::value>
+struct FunctorReferenceType {
+  typedef ResultType& reference_type;
+};
+
+template <class FunctorType, class ResultType, class Tag>
+struct FunctorReferenceType<FunctorType, ResultType, Tag, true> {
+  typedef typename Kokkos::Impl::FunctorValueTraits<
+      FunctorType, Tag>::reference_type reference_type;
+};
+
+template <class FunctorTypeIn, class ExecPolicy, class ValueType>
+struct ParallelReduceFunctorType<FunctorTypeIn, ExecPolicy, ValueType, Cuda> {
+  enum {
+    FunctorHasValueType = IsNonTrivialReduceFunctor<FunctorTypeIn>::value
   };
+  typedef typename Kokkos::Impl::if_c<
+      FunctorHasValueType, FunctorTypeIn,
+      Impl::CudaFunctorAdapter<FunctorTypeIn, ExecPolicy, ValueType>>::type
+      functor_type;
+  static functor_type functor(const FunctorTypeIn& functor_in) {
+    return Impl::if_c<FunctorHasValueType, FunctorTypeIn, functor_type>::select(
+        functor_in, functor_type(functor_in));
+  }
+};
 
-  template< class FunctorType, class ExecPolicy, class ValueType >
-  struct CudaFunctorAdapter<FunctorType,ExecPolicy,ValueType,void> {
-    const FunctorType f;
-    typedef ValueType value_type;
-    CudaFunctorAdapter(const FunctorType& f_):f(f_) {}
+}  // namespace Impl
 
-    __device__ inline
-    void operator() (const typename ExecPolicy::member_type& i, ValueType& val) const {
-      //Insert Static Assert with decltype on ValueType equals second argument type of FunctorType::operator()
-      f(i,val);
-    }
-
-    __device__ inline
-    void operator() (const typename ExecPolicy::member_type& i, const typename ExecPolicy::member_type& j, ValueType& val) const {
-      //Insert Static Assert with decltype on ValueType equals second argument type of FunctorType::operator()
-      f(i,j,val);
-    }
-
-    __device__ inline
-    void operator() (const typename ExecPolicy::member_type& i, const typename ExecPolicy::member_type& j, const typename ExecPolicy::member_type& k, ValueType& val) const {
-      //Insert Static Assert with decltype on ValueType equals second argument type of FunctorType::operator()
-      f(i,j,k,val);
-    }
-
-    __device__ inline
-    void operator() (const typename ExecPolicy::member_type& i, const typename ExecPolicy::member_type& j, const typename ExecPolicy::member_type& k, const typename ExecPolicy::member_type& l, ValueType& val) const {
-      //Insert Static Assert with decltype on ValueType equals second argument type of FunctorType::operator()
-      f(i,j,k,l,val);
-    }
-
-    __device__ inline
-    void operator() (const typename ExecPolicy::member_type& i, const typename ExecPolicy::member_type& j, const typename ExecPolicy::member_type& k, const typename ExecPolicy::member_type& l, const typename ExecPolicy::member_type& m, ValueType& val) const {
-      //Insert Static Assert with decltype on ValueType equals second argument type of FunctorType::operator()
-      f(i,j,k,l,m,val);
-    }
-
-    __device__ inline
-    void operator() (const typename ExecPolicy::member_type& i, const typename ExecPolicy::member_type& j, const typename ExecPolicy::member_type& k, const typename ExecPolicy::member_type& l, const typename ExecPolicy::member_type& m, const typename ExecPolicy::member_type& n, ValueType& val) const {
-      //Insert Static Assert with decltype on ValueType equals second argument type of FunctorType::operator()
-      f(i,j,k,l,m,n,val);
-    }
-
-
-    __device__ inline
-    void operator() (typename ExecPolicy::member_type& i, ValueType& val) const {
-      //Insert Static Assert with decltype on ValueType equals second argument type of FunctorType::operator()
-      f(i,val);
-    }
-
-    __device__ inline
-    void operator() (typename ExecPolicy::member_type& i, typename ExecPolicy::member_type& j, ValueType& val) const {
-      //Insert Static Assert with decltype on ValueType equals second argument type of FunctorType::operator()
-      f(i,j,val);
-    }
-
-    __device__ inline
-    void operator() (typename ExecPolicy::member_type& i, typename ExecPolicy::member_type& j, typename ExecPolicy::member_type& k, ValueType& val) const {
-      //Insert Static Assert with decltype on ValueType equals second argument type of FunctorType::operator()
-      f(i,j,k,val);
-    }
-
-    __device__ inline
-    void operator() (typename ExecPolicy::member_type& i, typename ExecPolicy::member_type& j, typename ExecPolicy::member_type& k, typename ExecPolicy::member_type& l, ValueType& val) const {
-      //Insert Static Assert with decltype on ValueType equals second argument type of FunctorType::operator()
-      f(i,j,k,l,val);
-    }
-
-    __device__ inline
-    void operator() (typename ExecPolicy::member_type& i, typename ExecPolicy::member_type& j, typename ExecPolicy::member_type& k, typename ExecPolicy::member_type& l, typename ExecPolicy::member_type& m, ValueType& val) const {
-      //Insert Static Assert with decltype on ValueType equals second argument type of FunctorType::operator()
-      f(i,j,k,l,m,val);
-    }
-
-    __device__ inline
-    void operator() (typename ExecPolicy::member_type& i, typename ExecPolicy::member_type& j, typename ExecPolicy::member_type& k, typename ExecPolicy::member_type& l, typename ExecPolicy::member_type& m, typename ExecPolicy::member_type& n, ValueType& val) const {
-      //Insert Static Assert with decltype on ValueType equals second argument type of FunctorType::operator()
-      f(i,j,k,l,m,n,val);
-    }
-
-  };
-
-  template<class FunctorType, class ResultType, class Tag, bool Enable = IsNonTrivialReduceFunctor<FunctorType>::value >
-  struct FunctorReferenceType {
-    typedef ResultType& reference_type;
-  };
-
-  template<class FunctorType, class ResultType, class Tag>
-  struct FunctorReferenceType<FunctorType, ResultType, Tag, true> {
-    typedef typename Kokkos::Impl::FunctorValueTraits< FunctorType ,Tag >::reference_type reference_type;
-  };
-
-  template< class FunctorTypeIn, class ExecPolicy, class ValueType>
-  struct ParallelReduceFunctorType<FunctorTypeIn,ExecPolicy,ValueType,Cuda> {
-
-    enum {FunctorHasValueType = IsNonTrivialReduceFunctor<FunctorTypeIn>::value };
-    typedef typename Kokkos::Impl::if_c<FunctorHasValueType, FunctorTypeIn, Impl::CudaFunctorAdapter<FunctorTypeIn,ExecPolicy,ValueType> >::type functor_type;
-    static functor_type functor(const FunctorTypeIn& functor_in) {
-      return Impl::if_c<FunctorHasValueType,FunctorTypeIn,functor_type>::select(functor_in,functor_type(functor_in));
-    }
-  };
-
-}
-
-} // namespace Kokkos
+}  // namespace Kokkos
 
 #endif /* defined( __CUDACC__ ) */
 #endif /* #ifndef KOKKOS_CUDA_PARALLEL_HPP */
-
diff --git a/lib/kokkos/core/src/Cuda/Kokkos_Cuda_ReduceScan.hpp b/lib/kokkos/core/src/Cuda/Kokkos_Cuda_ReduceScan.hpp
index c39dddb198..41431bfb8d 100644
--- a/lib/kokkos/core/src/Cuda/Kokkos_Cuda_ReduceScan.hpp
+++ b/lib/kokkos/core/src/Cuda/Kokkos_Cuda_ReduceScan.hpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -45,7 +46,7 @@
 #define KOKKOS_CUDA_REDUCESCAN_HPP
 
 #include <Kokkos_Macros.hpp>
-#if defined( __CUDACC__ ) && defined( KOKKOS_ENABLE_CUDA )
+#if defined(__CUDACC__) && defined(KOKKOS_ENABLE_CUDA)
 
 #include <utility>
 
@@ -60,131 +61,6 @@
 namespace Kokkos {
 namespace Impl {
 
-//----------------------------------------------------------------------------
-// Shuffle operations require input to be a register (stack) variable
-
-// TODO: reconcile these implementations with those in Kokkos_Cuda_Vectorization.hpp
-
-template< typename T >
-__device__ inline
-void cuda_shfl( T & out , T const & in , int lane ,
-  typename std::enable_if< sizeof(int) == sizeof(T) , int >::type width
-  , unsigned mask = 0xffffffff )
-{
-  *reinterpret_cast<int*>(&out) =
-    KOKKOS_IMPL_CUDA_SHFL_MASK( mask , *reinterpret_cast<int const *>(&in) , lane , width );
-}
-
-// TODO: figure out why 64-bit shfl fails in Clang
-#if ( CUDA_VERSION >= 9000 ) && (!defined(KOKKOS_COMPILER_CLANG))
-
-template< typename T >
-__device__ inline
-void cuda_shfl( T & out , T const & in , int lane ,
-  typename std::enable_if< sizeof(long long) == sizeof(T) , int >::type width
-  , unsigned mask = 0xffffffff )
-{
-  *reinterpret_cast<long long*>(&out) =
-    KOKKOS_IMPL_CUDA_SHFL_MASK( mask , *reinterpret_cast<long long const *>(&in) , lane , width );
-}
-
-#endif
-
-template< typename T >
-__device__ inline
-void cuda_shfl( T & out , T const & in , int lane ,
-  typename std::enable_if
-    < ( KOKKOS_IMPL_CUDA_MAX_SHFL_SIZEOF < sizeof(T) ) && ( 0 == ( sizeof(T) % sizeof(int) ) )
-    , int >::type width, unsigned mask = 0xffffffff )
-{
-  enum : int { N = sizeof(T) / sizeof(int) };
-
-  for ( int i = 0 ; i < N ; ++i ) {
-    reinterpret_cast<int*>(&out)[i] =
-      KOKKOS_IMPL_CUDA_SHFL_MASK( mask , reinterpret_cast<int const *>(&in)[i] , lane , width );
-  }
-}
-
-//----------------------------------------------------------------------------
-
-template< typename T >
-__device__ inline
-void cuda_shfl_down( T & out , T const & in , int delta ,
-  typename std::enable_if< sizeof(int) == sizeof(T) , int >::type width , unsigned mask = 0xffffffff )
-{
-  *reinterpret_cast<int*>(&out) =
-    KOKKOS_IMPL_CUDA_SHFL_DOWN_MASK( mask , *reinterpret_cast<int const *>(&in) , delta , width );
-}
-
-// TODO: figure out why 64-bit shfl fails in Clang
-#if ( CUDA_VERSION >= 9000 ) && (!defined(KOKKOS_COMPILER_CLANG))
-
-template< typename T >
-__device__ inline
-void cuda_shfl_down( T & out , T const & in , int delta ,
-  typename std::enable_if< sizeof(long long) == sizeof(T) , int >::type width , unsigned mask = 0xffffffff )
-{
-  *reinterpret_cast<long long*>(&out) =
-    KOKKOS_IMPL_CUDA_SHFL_DOWN_MASK( mask , *reinterpret_cast<long long const *>(&in) , delta , width );
-}
-
-#endif
-
-template< typename T >
-__device__ inline
-void cuda_shfl_down( T & out , T const & in , int delta ,
-  typename std::enable_if
-    < ( KOKKOS_IMPL_CUDA_MAX_SHFL_SIZEOF < sizeof(T) ) && ( 0 == ( sizeof(T) % sizeof(int) ) )
-    , int >::type width , unsigned mask = 0xffffffff )
-{
-  enum : int { N = sizeof(T) / sizeof(int) };
-
-  for ( int i = 0 ; i < N ; ++i ) {
-    reinterpret_cast<int*>(&out)[i] =
-      KOKKOS_IMPL_CUDA_SHFL_DOWN_MASK( mask , reinterpret_cast<int const *>(&in)[i] , delta , width );
-  }
-}
-
-//----------------------------------------------------------------------------
-
-template< typename T >
-__device__ inline
-void cuda_shfl_up( T & out , T const & in , int delta ,
-  typename std::enable_if< sizeof(int) == sizeof(T) , int >::type width , unsigned mask = 0xffffffff )
-{
-  *reinterpret_cast<int*>(&out) =
-    KOKKOS_IMPL_CUDA_SHFL_UP_MASK( mask , *reinterpret_cast<int const *>(&in) , delta , width );
-}
-
-// TODO: figure out why 64-bit shfl fails in Clang
-#if ( CUDA_VERSION >= 9000 ) && (!defined(KOKKOS_COMPILER_CLANG))
-
-template< typename T >
-__device__ inline
-void cuda_shfl_up( T & out , T const & in , int delta ,
-  typename std::enable_if< sizeof(long long) == sizeof(T) , int >::type width , unsigned mask = 0xffffffff )
-{
-  *reinterpret_cast<long long*>(&out) =
-    KOKKOS_IMPL_CUDA_SHFL_UP_MASK( mask , *reinterpret_cast<long long const *>(&in) , delta , width );
-}
-
-#endif
-
-template< typename T >
-__device__ inline
-void cuda_shfl_up( T & out , T const & in , int delta ,
-  typename std::enable_if
-    < ( KOKKOS_IMPL_CUDA_MAX_SHFL_SIZEOF < sizeof(T) ) && ( 0 == ( sizeof(T) % sizeof(int) ) )
-    , int >::type width , unsigned mask = 0xffffffff )
-{
-  enum : int { N = sizeof(T) / sizeof(int) };
-
-  for ( int i = 0 ; i < N ; ++i ) {
-    reinterpret_cast<int*>(&out)[i] =
-      KOKKOS_IMPL_CUDA_SHFL_UP_MASK( mask , reinterpret_cast<int const *>(&in)[i] , delta , width );
-  }
-}
-
 //----------------------------------------------------------------------------
 /*
  *  Algorithmic constraints:
@@ -193,511 +69,502 @@ void cuda_shfl_up( T & out , T const & in , int delta ,
  *   (c) blockDim.z == 1
  */
 
-template< class ValueType , class JoinOp>
+template <class ValueType, class JoinOp>
 __device__ inline
-typename std::enable_if< !Kokkos::is_reducer<ValueType>::value >::type
-cuda_intra_warp_reduction( ValueType& result,
-                                       const JoinOp& join,
-                                       const uint32_t max_active_thread = blockDim.y) {
-
+    typename std::enable_if<!Kokkos::is_reducer<ValueType>::value>::type
+    cuda_intra_warp_reduction(ValueType& result, const JoinOp& join,
+                              const uint32_t max_active_thread = blockDim.y) {
   unsigned int shift = 1;
 
-  //Reduce over values from threads with different threadIdx.y
-  while(blockDim.x * shift < 32 ) {
-    const ValueType tmp = shfl_down(result, blockDim.x*shift,32u);
-    //Only join if upper thread is active (this allows non power of two for blockDim.y
-    if(threadIdx.y + shift < max_active_thread)
-      join(result , tmp);
-    shift*=2;
+  // Reduce over values from threads with different threadIdx.y
+  while (blockDim.x * shift < 32) {
+    const ValueType tmp = shfl_down(result, blockDim.x * shift, 32u);
+    // Only join if upper thread is active (this allows non power of two for
+    // blockDim.y
+    if (threadIdx.y + shift < max_active_thread) join(result, tmp);
+    shift *= 2;
   }
 
-  result = shfl(result,0,32);
+  result = shfl(result, 0, 32);
 }
 
-template< class ValueType , class JoinOp>
+template <class ValueType, class JoinOp>
 __device__ inline
-typename std::enable_if< !Kokkos::is_reducer<ValueType>::value >::type
-cuda_inter_warp_reduction( ValueType& value,
-                                       const JoinOp& join,
-                                       const int max_active_thread = blockDim.y) {
-
-  #define STEP_WIDTH 4
-  // Depending on the ValueType _shared__ memory must be aligned up to 8byte boundaries
-  // The reason not to use ValueType directly is that for types with constructors it
-  // could lead to race conditions
-  __shared__ double sh_result[(sizeof(ValueType)+7)/8*STEP_WIDTH];
-  ValueType* result = (ValueType*) & sh_result;
-  const int step = 32 / blockDim.x;
-  int shift = STEP_WIDTH;
-  const int id = threadIdx.y%step==0?threadIdx.y/step:65000;
-  if(id < STEP_WIDTH ) {
+    typename std::enable_if<!Kokkos::is_reducer<ValueType>::value>::type
+    cuda_inter_warp_reduction(ValueType& value, const JoinOp& join,
+                              const int max_active_thread = blockDim.y) {
+#define STEP_WIDTH 4
+  // Depending on the ValueType _shared__ memory must be aligned up to 8byte
+  // boundaries The reason not to use ValueType directly is that for types with
+  // constructors it could lead to race conditions
+  __shared__ double sh_result[(sizeof(ValueType) + 7) / 8 * STEP_WIDTH];
+  ValueType* result = (ValueType*)&sh_result;
+  const int step    = 32 / blockDim.x;
+  int shift         = STEP_WIDTH;
+  const int id      = threadIdx.y % step == 0 ? threadIdx.y / step : 65000;
+  if (id < STEP_WIDTH) {
     result[id] = value;
   }
   __syncthreads();
-  while (shift<=max_active_thread/step) {
-    if(shift<=id && shift+STEP_WIDTH>id && threadIdx.x==0) {
-      join(result[id%STEP_WIDTH],value);
+  while (shift <= max_active_thread / step) {
+    if (shift <= id && shift + STEP_WIDTH > id && threadIdx.x == 0) {
+      join(result[id % STEP_WIDTH], value);
     }
     __syncthreads();
-    shift+=STEP_WIDTH;
+    shift += STEP_WIDTH;
   }
 
-
   value = result[0];
-  for(int i = 1; (i*step<max_active_thread) && i<STEP_WIDTH; i++)
-    join(value,result[i]);
+  for (int i = 1; (i * step < max_active_thread) && i < STEP_WIDTH; i++)
+    join(value, result[i]);
 }
 
-template< class ValueType , class JoinOp>
+template <class ValueType, class JoinOp>
 __device__ inline
-typename std::enable_if< !Kokkos::is_reducer<ValueType>::value >::type
-cuda_intra_block_reduction( ValueType& value,
-                                        const JoinOp& join,
-                                        const int max_active_thread = blockDim.y) {
-  cuda_intra_warp_reduction(value,join,max_active_thread);
-  cuda_inter_warp_reduction(value,join,max_active_thread);
+    typename std::enable_if<!Kokkos::is_reducer<ValueType>::value>::type
+    cuda_intra_block_reduction(ValueType& value, const JoinOp& join,
+                               const int max_active_thread = blockDim.y) {
+  cuda_intra_warp_reduction(value, join, max_active_thread);
+  cuda_inter_warp_reduction(value, join, max_active_thread);
 }
 
-template< class FunctorType , class JoinOp , class ArgTag = void >
-__device__
-bool cuda_inter_block_reduction( typename FunctorValueTraits< FunctorType , ArgTag >::reference_type  value,
-                                 typename FunctorValueTraits< FunctorType , ArgTag >::reference_type  neutral,
-                                 const JoinOp& join,
-                                 Cuda::size_type * const m_scratch_space,
-                                 typename FunctorValueTraits< FunctorType , ArgTag >::pointer_type const result,
-                                 Cuda::size_type * const m_scratch_flags,
-                                 const int max_active_thread = blockDim.y) {
+template <class FunctorType, class JoinOp, class ArgTag = void>
+__device__ bool cuda_inter_block_reduction(
+    typename FunctorValueTraits<FunctorType, ArgTag>::reference_type value,
+    typename FunctorValueTraits<FunctorType, ArgTag>::reference_type neutral,
+    const JoinOp& join, Cuda::size_type* const m_scratch_space,
+    typename FunctorValueTraits<FunctorType, ArgTag>::pointer_type const result,
+    Cuda::size_type* const m_scratch_flags,
+    const int max_active_thread = blockDim.y) {
 #ifdef __CUDA_ARCH__
-  typedef typename FunctorValueTraits< FunctorType , ArgTag >::pointer_type pointer_type;
-  typedef typename FunctorValueTraits< FunctorType , ArgTag >::value_type value_type;
+  typedef typename FunctorValueTraits<FunctorType, ArgTag>::pointer_type
+      pointer_type;
+  typedef
+      typename FunctorValueTraits<FunctorType, ArgTag>::value_type value_type;
 
-  //Do the intra-block reduction with shfl operations and static shared memory
-  cuda_intra_block_reduction(value,join,max_active_thread);
+  // Do the intra-block reduction with shfl operations and static shared memory
+  cuda_intra_block_reduction(value, join, max_active_thread);
 
-  const int id = threadIdx.y*blockDim.x + threadIdx.x;
+  const int id = threadIdx.y * blockDim.x + threadIdx.x;
 
-  //One thread in the block writes block result to global scratch_memory
-  if(id == 0 ) {
-    pointer_type global = ((pointer_type) m_scratch_space) + blockIdx.x;
-    *global = value;
+  // One thread in the block writes block result to global scratch_memory
+  if (id == 0) {
+    pointer_type global = ((pointer_type)m_scratch_space) + blockIdx.x;
+    *global             = value;
   }
 
-  //One warp of last block performs inter block reduction through loading the block values from global scratch_memory
+  // One warp of last block performs inter block reduction through loading the
+  // block values from global scratch_memory
   bool last_block = false;
-
+  __threadfence();
   __syncthreads();
-  if ( id < 32 ) {
+  if (id < 32) {
     Cuda::size_type count;
 
-    //Figure out whether this is the last block
-    if(id == 0)
-      count = Kokkos::atomic_fetch_add(m_scratch_flags,1);
-    count = Kokkos::shfl(count,0,32);
+    // Figure out whether this is the last block
+    if (id == 0) count = Kokkos::atomic_fetch_add(m_scratch_flags, 1);
+    count = Kokkos::shfl(count, 0, 32);
 
-    //Last block does the inter block reduction
-    if( count == gridDim.x - 1) {
-      //set flag back to zero
-      if(id == 0)
-        *m_scratch_flags = 0;
+    // Last block does the inter block reduction
+    if (count == gridDim.x - 1) {
+      // set flag back to zero
+      if (id == 0) *m_scratch_flags = 0;
       last_block = true;
-      value = neutral;
+      value      = neutral;
 
-      pointer_type const volatile global = (pointer_type) m_scratch_space ;
+      pointer_type const volatile global = (pointer_type)m_scratch_space;
 
-      //Reduce all global values with splitting work over threads in one warp
-      const int step_size = blockDim.x*blockDim.y < 32 ? blockDim.x*blockDim.y : 32;
-      for(int i=id; i<(int)gridDim.x; i+=step_size) {
+      // Reduce all global values with splitting work over threads in one warp
+      const int step_size =
+          blockDim.x * blockDim.y < 32 ? blockDim.x * blockDim.y : 32;
+      for (int i = id; i < (int)gridDim.x; i += step_size) {
         value_type tmp = global[i];
         join(value, tmp);
       }
 
-      //Perform shfl reductions within the warp only join if contribution is valid (allows gridDim.x non power of two and <32)
-      if (int(blockDim.x*blockDim.y) > 1) {
-        value_type tmp = Kokkos::shfl_down(value, 1,32);
-        if( id + 1 < int(gridDim.x) )
-          join(value, tmp);
+      // Perform shfl reductions within the warp only join if contribution is
+      // valid (allows gridDim.x non power of two and <32)
+      if (int(blockDim.x * blockDim.y) > 1) {
+        value_type tmp = Kokkos::shfl_down(value, 1, 32);
+        if (id + 1 < int(gridDim.x)) join(value, tmp);
       }
 #ifdef KOKKOS_IMPL_CUDA_SYNCWARP_NEEDS_MASK
       unsigned int mask = KOKKOS_IMPL_CUDA_ACTIVEMASK;
-      int active = KOKKOS_IMPL_CUDA_BALLOT_MASK(mask,1);
+      int active        = KOKKOS_IMPL_CUDA_BALLOT_MASK(mask, 1);
 #else
       int active = KOKKOS_IMPL_CUDA_BALLOT(1);
 #endif
-      if (int(blockDim.x*blockDim.y) > 2) {
-        value_type tmp = Kokkos::shfl_down(value, 2,32);
-        if( id + 2 < int(gridDim.x) )
-          join(value, tmp);
+      if (int(blockDim.x * blockDim.y) > 2) {
+        value_type tmp = Kokkos::shfl_down(value, 2, 32);
+        if (id + 2 < int(gridDim.x)) join(value, tmp);
       }
 #ifdef KOKKOS_IMPL_CUDA_SYNCWARP_NEEDS_MASK
-      active += KOKKOS_IMPL_CUDA_BALLOT_MASK(mask,1);
+      active += KOKKOS_IMPL_CUDA_BALLOT_MASK(mask, 1);
 #else
       active += KOKKOS_IMPL_CUDA_BALLOT(1);
 #endif
-      if (int(blockDim.x*blockDim.y) > 4) {
-        value_type tmp = Kokkos::shfl_down(value, 4,32);
-        if( id + 4 < int(gridDim.x) )
-          join(value, tmp);
+      if (int(blockDim.x * blockDim.y) > 4) {
+        value_type tmp = Kokkos::shfl_down(value, 4, 32);
+        if (id + 4 < int(gridDim.x)) join(value, tmp);
       }
 #ifdef KOKKOS_IMPL_CUDA_SYNCWARP_NEEDS_MASK
-      active += KOKKOS_IMPL_CUDA_BALLOT_MASK(mask,1);
+      active += KOKKOS_IMPL_CUDA_BALLOT_MASK(mask, 1);
 #else
       active += KOKKOS_IMPL_CUDA_BALLOT(1);
 #endif
-      if (int(blockDim.x*blockDim.y) > 8) {
-        value_type tmp = Kokkos::shfl_down(value, 8,32);
-        if( id + 8 < int(gridDim.x) )
-          join(value, tmp);
+      if (int(blockDim.x * blockDim.y) > 8) {
+        value_type tmp = Kokkos::shfl_down(value, 8, 32);
+        if (id + 8 < int(gridDim.x)) join(value, tmp);
       }
 #ifdef KOKKOS_IMPL_CUDA_SYNCWARP_NEEDS_MASK
-      active += KOKKOS_IMPL_CUDA_BALLOT_MASK(mask,1);
+      active += KOKKOS_IMPL_CUDA_BALLOT_MASK(mask, 1);
 #else
       active += KOKKOS_IMPL_CUDA_BALLOT(1);
 #endif
-      if (int(blockDim.x*blockDim.y) > 16) {
-        value_type tmp = Kokkos::shfl_down(value, 16,32);
-        if( id + 16 < int(gridDim.x) )
-          join(value, tmp);
+      if (int(blockDim.x * blockDim.y) > 16) {
+        value_type tmp = Kokkos::shfl_down(value, 16, 32);
+        if (id + 16 < int(gridDim.x)) join(value, tmp);
       }
 #ifdef KOKKOS_IMPL_CUDA_SYNCWARP_NEEDS_MASK
-      active += KOKKOS_IMPL_CUDA_BALLOT_MASK(mask,1);
+      active += KOKKOS_IMPL_CUDA_BALLOT_MASK(mask, 1);
 #else
       active += KOKKOS_IMPL_CUDA_BALLOT(1);
 #endif
     }
   }
-  //The last block has in its thread=0 the global reduction value through "value"
+  // The last block has in its thread=0 the global reduction value through
+  // "value"
   return last_block;
 #else
   return true;
 #endif
 }
 
-template< class ReducerType >
+template <class ReducerType>
 __device__ inline
-typename std::enable_if< Kokkos::is_reducer<ReducerType>::value >::type
-cuda_intra_warp_reduction( const ReducerType& reducer,
-                           typename ReducerType::value_type& result,
-                           const uint32_t max_active_thread = blockDim.y) {
-
+    typename std::enable_if<Kokkos::is_reducer<ReducerType>::value>::type
+    cuda_intra_warp_reduction(const ReducerType& reducer,
+                              typename ReducerType::value_type& result,
+                              const uint32_t max_active_thread = blockDim.y) {
   typedef typename ReducerType::value_type ValueType;
 
   unsigned int shift = 1;
 
-  //Reduce over values from threads with different threadIdx.y
-  while(blockDim.x * shift < 32 ) {
-    const ValueType tmp = shfl_down(result, blockDim.x*shift,32u);
-    //Only join if upper thread is active (this allows non power of two for blockDim.y
-    if(threadIdx.y + shift < max_active_thread)
-      reducer.join(result , tmp);
-    shift*=2;
+  // Reduce over values from threads with different threadIdx.y
+  while (blockDim.x * shift < 32) {
+    const ValueType tmp = shfl_down(result, blockDim.x * shift, 32u);
+    // Only join if upper thread is active (this allows non power of two for
+    // blockDim.y
+    if (threadIdx.y + shift < max_active_thread) reducer.join(result, tmp);
+    shift *= 2;
   }
 
-  result = shfl(result,0,32);
+  result              = shfl(result, 0, 32);
   reducer.reference() = result;
 }
 
-template< class ReducerType >
+template <class ReducerType>
 __device__ inline
-typename std::enable_if< Kokkos::is_reducer<ReducerType>::value >::type
-cuda_inter_warp_reduction( const ReducerType& reducer,
-                           typename ReducerType::value_type value,
-                           const int max_active_thread = blockDim.y) {
-
+    typename std::enable_if<Kokkos::is_reducer<ReducerType>::value>::type
+    cuda_inter_warp_reduction(const ReducerType& reducer,
+                              typename ReducerType::value_type value,
+                              const int max_active_thread = blockDim.y) {
   typedef typename ReducerType::value_type ValueType;
 
-  #define STEP_WIDTH 4
-  // Depending on the ValueType _shared__ memory must be aligned up to 8byte boundaries
-  // The reason not to use ValueType directly is that for types with constructors it
-  // could lead to race conditions
-  __shared__ double sh_result[(sizeof(ValueType)+7)/8*STEP_WIDTH];
-  ValueType* result = (ValueType*) & sh_result;
-  const int step = 32 / blockDim.x;
-  int shift = STEP_WIDTH;
-  const int id = threadIdx.y%step==0?threadIdx.y/step:65000;
-  if(id < STEP_WIDTH ) {
+#define STEP_WIDTH 4
+  // Depending on the ValueType _shared__ memory must be aligned up to 8byte
+  // boundaries The reason not to use ValueType directly is that for types with
+  // constructors it could lead to race conditions
+  __shared__ double sh_result[(sizeof(ValueType) + 7) / 8 * STEP_WIDTH];
+  ValueType* result = (ValueType*)&sh_result;
+  const int step    = 32 / blockDim.x;
+  int shift         = STEP_WIDTH;
+  const int id      = threadIdx.y % step == 0 ? threadIdx.y / step : 65000;
+  if (id < STEP_WIDTH) {
     result[id] = value;
   }
   __syncthreads();
-  while (shift<=max_active_thread/step) {
-    if(shift<=id && shift+STEP_WIDTH>id && threadIdx.x==0) {
-      reducer.join(result[id%STEP_WIDTH],value);
+  while (shift <= max_active_thread / step) {
+    if (shift <= id && shift + STEP_WIDTH > id && threadIdx.x == 0) {
+      reducer.join(result[id % STEP_WIDTH], value);
     }
     __syncthreads();
-    shift+=STEP_WIDTH;
+    shift += STEP_WIDTH;
   }
 
-
   value = result[0];
-  for(int i = 1; (i*step<max_active_thread) && i<STEP_WIDTH; i++)
-    reducer.join(value,result[i]);
+  for (int i = 1; (i * step < max_active_thread) && i < STEP_WIDTH; i++)
+    reducer.join(value, result[i]);
 
   reducer.reference() = value;
 }
 
-template< class ReducerType >
+template <class ReducerType>
 __device__ inline
-typename std::enable_if< Kokkos::is_reducer<ReducerType>::value >::type
-cuda_intra_block_reduction( const ReducerType& reducer,
-                            typename ReducerType::value_type value,
-                            const int max_active_thread = blockDim.y) {
-  cuda_intra_warp_reduction(reducer,value,max_active_thread);
-  cuda_inter_warp_reduction(reducer,value,max_active_thread);
+    typename std::enable_if<Kokkos::is_reducer<ReducerType>::value>::type
+    cuda_intra_block_reduction(const ReducerType& reducer,
+                               typename ReducerType::value_type value,
+                               const int max_active_thread = blockDim.y) {
+  cuda_intra_warp_reduction(reducer, value, max_active_thread);
+  cuda_inter_warp_reduction(reducer, value, max_active_thread);
 }
 
-template< class ReducerType >
+template <class ReducerType>
 __device__ inline
-typename std::enable_if< Kokkos::is_reducer<ReducerType>::value >::type
-cuda_intra_block_reduction( const ReducerType& reducer,
-                            const int max_active_thread = blockDim.y) {
-  cuda_intra_block_reduction(reducer,reducer.reference(),max_active_thread);
+    typename std::enable_if<Kokkos::is_reducer<ReducerType>::value>::type
+    cuda_intra_block_reduction(const ReducerType& reducer,
+                               const int max_active_thread = blockDim.y) {
+  cuda_intra_block_reduction(reducer, reducer.reference(), max_active_thread);
 }
 
-template< class ReducerType>
+template <class ReducerType>
 __device__ inline
-typename std::enable_if< Kokkos::is_reducer<ReducerType>::value , bool >::type
-cuda_inter_block_reduction( const ReducerType& reducer,
-                            Cuda::size_type * const m_scratch_space,
-                            Cuda::size_type * const m_scratch_flags,
-                            const int max_active_thread = blockDim.y) {
+    typename std::enable_if<Kokkos::is_reducer<ReducerType>::value, bool>::type
+    cuda_inter_block_reduction(const ReducerType& reducer,
+                               Cuda::size_type* const m_scratch_space,
+                               Cuda::size_type* const m_scratch_flags,
+                               const int max_active_thread = blockDim.y) {
 #ifdef __CUDA_ARCH__
   typedef typename ReducerType::value_type* pointer_type;
   typedef typename ReducerType::value_type value_type;
 
-  //Do the intra-block reduction with shfl operations and static shared memory
-  cuda_intra_block_reduction(reducer,max_active_thread);
+  // Do the intra-block reduction with shfl operations and static shared memory
+  cuda_intra_block_reduction(reducer, max_active_thread);
 
   value_type value = reducer.reference();
 
-  const int id = threadIdx.y*blockDim.x + threadIdx.x;
+  const int id = threadIdx.y * blockDim.x + threadIdx.x;
 
-  //One thread in the block writes block result to global scratch_memory
-  if(id == 0 ) {
-    pointer_type global = ((pointer_type) m_scratch_space) + blockIdx.x;
-    *global = value;
+  // One thread in the block writes block result to global scratch_memory
+  if (id == 0) {
+    pointer_type global = ((pointer_type)m_scratch_space) + blockIdx.x;
+    *global             = value;
   }
 
-  //One warp of last block performs inter block reduction through loading the block values from global scratch_memory
+  // One warp of last block performs inter block reduction through loading the
+  // block values from global scratch_memory
   bool last_block = false;
 
+  __threadfence();
   __syncthreads();
-  if ( id < 32 ) {
+  if (id < 32) {
     Cuda::size_type count;
 
-    //Figure out whether this is the last block
-    if(id == 0)
-      count = Kokkos::atomic_fetch_add(m_scratch_flags,1);
-    count = Kokkos::shfl(count,0,32);
+    // Figure out whether this is the last block
+    if (id == 0) count = Kokkos::atomic_fetch_add(m_scratch_flags, 1);
+    count = Kokkos::shfl(count, 0, 32);
 
-    //Last block does the inter block reduction
-    if( count == gridDim.x - 1) {
-      //set flag back to zero
-      if(id == 0)
-        *m_scratch_flags = 0;
+    // Last block does the inter block reduction
+    if (count == gridDim.x - 1) {
+      // set flag back to zero
+      if (id == 0) *m_scratch_flags = 0;
       last_block = true;
       reducer.init(value);
 
-      pointer_type const volatile global = (pointer_type) m_scratch_space ;
+      pointer_type const volatile global = (pointer_type)m_scratch_space;
 
-      //Reduce all global values with splitting work over threads in one warp
-      const int step_size = blockDim.x*blockDim.y < 32 ? blockDim.x*blockDim.y : 32;
-      for(int i=id; i<(int)gridDim.x; i+=step_size) {
+      // Reduce all global values with splitting work over threads in one warp
+      const int step_size =
+          blockDim.x * blockDim.y < 32 ? blockDim.x * blockDim.y : 32;
+      for (int i = id; i < (int)gridDim.x; i += step_size) {
         value_type tmp = global[i];
         reducer.join(value, tmp);
       }
 
-      //Perform shfl reductions within the warp only join if contribution is valid (allows gridDim.x non power of two and <32)
-      if (int(blockDim.x*blockDim.y) > 1) {
-        value_type tmp = Kokkos::shfl_down(value, 1,32);
-        if( id + 1 < int(gridDim.x) )
-          reducer.join(value, tmp);
+      // Perform shfl reductions within the warp only join if contribution is
+      // valid (allows gridDim.x non power of two and <32)
+      if (int(blockDim.x * blockDim.y) > 1) {
+        value_type tmp = Kokkos::shfl_down(value, 1, 32);
+        if (id + 1 < int(gridDim.x)) reducer.join(value, tmp);
       }
 #ifdef KOKKOS_IMPL_CUDA_SYNCWARP_NEEDS_MASK
       unsigned int mask = KOKKOS_IMPL_CUDA_ACTIVEMASK;
-      int active = KOKKOS_IMPL_CUDA_BALLOT_MASK(mask,1);
+      int active        = KOKKOS_IMPL_CUDA_BALLOT_MASK(mask, 1);
 #else
       int active = KOKKOS_IMPL_CUDA_BALLOT(1);
 #endif
-      if (int(blockDim.x*blockDim.y) > 2) {
-        value_type tmp = Kokkos::shfl_down(value, 2,32);
-        if( id + 2 < int(gridDim.x) )
-          reducer.join(value, tmp);
+      if (int(blockDim.x * blockDim.y) > 2) {
+        value_type tmp = Kokkos::shfl_down(value, 2, 32);
+        if (id + 2 < int(gridDim.x)) reducer.join(value, tmp);
       }
 #ifdef KOKKOS_IMPL_CUDA_SYNCWARP_NEEDS_MASK
-      active += KOKKOS_IMPL_CUDA_BALLOT_MASK(mask,1);
+      active += KOKKOS_IMPL_CUDA_BALLOT_MASK(mask, 1);
 #else
       active += KOKKOS_IMPL_CUDA_BALLOT(1);
 #endif
-      if (int(blockDim.x*blockDim.y) > 4) {
-        value_type tmp = Kokkos::shfl_down(value, 4,32);
-        if( id + 4 < int(gridDim.x) )
-          reducer.join(value, tmp);
+      if (int(blockDim.x * blockDim.y) > 4) {
+        value_type tmp = Kokkos::shfl_down(value, 4, 32);
+        if (id + 4 < int(gridDim.x)) reducer.join(value, tmp);
       }
 #ifdef KOKKOS_IMPL_CUDA_SYNCWARP_NEEDS_MASK
-      active += KOKKOS_IMPL_CUDA_BALLOT_MASK(mask,1);
+      active += KOKKOS_IMPL_CUDA_BALLOT_MASK(mask, 1);
 #else
       active += KOKKOS_IMPL_CUDA_BALLOT(1);
 #endif
-      if (int(blockDim.x*blockDim.y) > 8) {
-        value_type tmp = Kokkos::shfl_down(value, 8,32);
-        if( id + 8 < int(gridDim.x) )
-          reducer.join(value, tmp);
+      if (int(blockDim.x * blockDim.y) > 8) {
+        value_type tmp = Kokkos::shfl_down(value, 8, 32);
+        if (id + 8 < int(gridDim.x)) reducer.join(value, tmp);
       }
 #ifdef KOKKOS_IMPL_CUDA_SYNCWARP_NEEDS_MASK
-      active += KOKKOS_IMPL_CUDA_BALLOT_MASK(mask,1);
+      active += KOKKOS_IMPL_CUDA_BALLOT_MASK(mask, 1);
 #else
       active += KOKKOS_IMPL_CUDA_BALLOT(1);
 #endif
-      if (int(blockDim.x*blockDim.y) > 16) {
-        value_type tmp = Kokkos::shfl_down(value, 16,32);
-        if( id + 16 < int(gridDim.x) )
-          reducer.join(value, tmp);
+      if (int(blockDim.x * blockDim.y) > 16) {
+        value_type tmp = Kokkos::shfl_down(value, 16, 32);
+        if (id + 16 < int(gridDim.x)) reducer.join(value, tmp);
       }
 #ifdef KOKKOS_IMPL_CUDA_SYNCWARP_NEEDS_MASK
-      active += KOKKOS_IMPL_CUDA_BALLOT_MASK(mask,1);
+      active += KOKKOS_IMPL_CUDA_BALLOT_MASK(mask, 1);
 #else
       active += KOKKOS_IMPL_CUDA_BALLOT(1);
 #endif
     }
   }
 
-  //The last block has in its thread=0 the global reduction value through "value"
+  // The last block has in its thread=0 the global reduction value through
+  // "value"
   return last_block;
 #else
   return true;
 #endif
 }
 
-template<class FunctorType, class ArgTag, bool DoScan, bool UseShfl>
+template <class FunctorType, class ArgTag, bool DoScan, bool UseShfl>
 struct CudaReductionsFunctor;
 
-template<class FunctorType, class ArgTag>
+template <class FunctorType, class ArgTag>
 struct CudaReductionsFunctor<FunctorType, ArgTag, false, true> {
-  typedef FunctorValueTraits< FunctorType , ArgTag >  ValueTraits ;
-  typedef FunctorValueJoin<   FunctorType , ArgTag >  ValueJoin ;
-  typedef FunctorValueInit<   FunctorType , ArgTag >  ValueInit ;
-  typedef FunctorValueOps<    FunctorType , ArgTag >  ValueOps ;
-  typedef typename ValueTraits::pointer_type  pointer_type ;
+  typedef FunctorValueTraits<FunctorType, ArgTag> ValueTraits;
+  typedef FunctorValueJoin<FunctorType, ArgTag> ValueJoin;
+  typedef FunctorValueInit<FunctorType, ArgTag> ValueInit;
+  typedef FunctorValueOps<FunctorType, ArgTag> ValueOps;
+  typedef typename ValueTraits::pointer_type pointer_type;
   typedef typename ValueTraits::value_type Scalar;
 
-  __device__
-  static inline void scalar_intra_warp_reduction(
+  __device__ static inline void scalar_intra_warp_reduction(
       const FunctorType& functor,
-      Scalar value,                            // Contribution
-      const bool skip_vector,                  // Skip threads if Kokkos vector lanes are not part of the reduction
-      const int width,                         // How much of the warp participates
-      Scalar& result)
-  {
-    unsigned mask = width==32?0xffffffff:((1<<width)-1)<<((threadIdx.y*blockDim.x+threadIdx.x)/width)*width;
-    for(int delta=skip_vector?blockDim.x:1; delta<width; delta*=2) {
-      Scalar tmp;
-      cuda_shfl_down(tmp,value,delta,width,mask);
-      ValueJoin::join( functor , &value, &tmp);
+      Scalar value,            // Contribution
+      const bool skip_vector,  // Skip threads if Kokkos vector lanes are not
+                               // part of the reduction
+      const int width,         // How much of the warp participates
+      Scalar& result) {
+    unsigned mask =
+        width == 32
+            ? 0xffffffff
+            : ((1 << width) - 1)
+                  << ((threadIdx.y * blockDim.x + threadIdx.x) / width) * width;
+    for (int delta = skip_vector ? blockDim.x : 1; delta < width; delta *= 2) {
+      Scalar tmp = Kokkos::shfl_down(value, delta, width, mask);
+      ValueJoin::join(functor, &value, &tmp);
     }
 
-    cuda_shfl(result,value,0,width,mask);
+    Impl::in_place_shfl(result, value, 0, width, mask);
   }
 
-
-  __device__
-  static inline void scalar_intra_block_reduction(
-      const FunctorType& functor,
-      Scalar value,
-      const bool skip,
-      Scalar* my_global_team_buffer_element,
-      const int shared_elements,
+  __device__ static inline void scalar_intra_block_reduction(
+      const FunctorType& functor, Scalar value, const bool skip,
+      Scalar* my_global_team_buffer_element, const int shared_elements,
       Scalar* shared_team_buffer_element) {
-
-    const int warp_id = (threadIdx.y*blockDim.x)/32;
+    const int warp_id = (threadIdx.y * blockDim.x) / 32;
     Scalar* const my_shared_team_buffer_element =
-        shared_team_buffer_element + warp_id%shared_elements;
+        shared_team_buffer_element + warp_id % shared_elements;
 
     // Warp Level Reduction, ignoring Kokkos vector entries
-    scalar_intra_warp_reduction(functor,value,skip,32,value);
+    scalar_intra_warp_reduction(functor, value, skip, 32, value);
 
-    if(warp_id<shared_elements) {
-        *my_shared_team_buffer_element=value;
+    if (warp_id < shared_elements) {
+      *my_shared_team_buffer_element = value;
     }
-    // Wait for every warp to be done before using one warp to do final cross warp reduction
+    // Wait for every warp to be done before using one warp to do final cross
+    // warp reduction
     __syncthreads();
 
-    const int num_warps = blockDim.x*blockDim.y/32;
-    for(int w = shared_elements; w<num_warps; w+=shared_elements) {
-      if(warp_id>=w && warp_id<w+shared_elements) {
-        if((threadIdx.y*blockDim.x + threadIdx.x)%32==0)
-          ValueJoin::join( functor , my_shared_team_buffer_element, &value);
+    const int num_warps = blockDim.x * blockDim.y / 32;
+    for (int w = shared_elements; w < num_warps; w += shared_elements) {
+      if (warp_id >= w && warp_id < w + shared_elements) {
+        if ((threadIdx.y * blockDim.x + threadIdx.x) % 32 == 0)
+          ValueJoin::join(functor, my_shared_team_buffer_element, &value);
       }
       __syncthreads();
     }
 
-
-    if( warp_id == 0) {
-      ValueInit::init( functor , &value );
-      for(unsigned int i=threadIdx.y*blockDim.x+threadIdx.x; i<blockDim.y*blockDim.x/32; i+=32)
-        ValueJoin::join( functor , &value,&shared_team_buffer_element[i]);
-      scalar_intra_warp_reduction(functor,value,false,32,*my_global_team_buffer_element);
+    if (warp_id == 0) {
+      ValueInit::init(functor, &value);
+      for (unsigned int i = threadIdx.y * blockDim.x + threadIdx.x;
+           i < blockDim.y * blockDim.x / 32; i += 32)
+        ValueJoin::join(functor, &value, &shared_team_buffer_element[i]);
+      scalar_intra_warp_reduction(functor, value, false, 32,
+                                  *my_global_team_buffer_element);
     }
   }
 
-  __device__
-  static inline bool scalar_inter_block_reduction(
-      const FunctorType     & functor ,
-      const Cuda::size_type   block_id ,
-      const Cuda::size_type   block_count ,
-      Cuda::size_type * const shared_data ,
-      Cuda::size_type * const global_data ,
-      Cuda::size_type * const global_flags )  {
-    Scalar* const global_team_buffer_element = ((Scalar*) global_data);
-    Scalar* const my_global_team_buffer_element = global_team_buffer_element + blockIdx.x;
-    Scalar* shared_team_buffer_elements = ((Scalar*) shared_data);
-    Scalar value = shared_team_buffer_elements[threadIdx.y];
-    int shared_elements=blockDim.x*blockDim.y/32;
-    int global_elements=block_count;
+  __device__ static inline bool scalar_inter_block_reduction(
+      const FunctorType& functor, const Cuda::size_type block_id,
+      const Cuda::size_type block_count, Cuda::size_type* const shared_data,
+      Cuda::size_type* const global_data, Cuda::size_type* const global_flags) {
+    Scalar* const global_team_buffer_element = ((Scalar*)global_data);
+    Scalar* const my_global_team_buffer_element =
+        global_team_buffer_element + blockIdx.x;
+    Scalar* shared_team_buffer_elements = ((Scalar*)shared_data);
+    Scalar value        = shared_team_buffer_elements[threadIdx.y];
+    int shared_elements = blockDim.x * blockDim.y / 32;
+    int global_elements = block_count;
     __syncthreads();
 
-    scalar_intra_block_reduction(functor,value,true,my_global_team_buffer_element,shared_elements,shared_team_buffer_elements);
+    scalar_intra_block_reduction(functor, value, true,
+                                 my_global_team_buffer_element, shared_elements,
+                                 shared_team_buffer_elements);
+    __threadfence();
     __syncthreads();
     unsigned int num_teams_done = 0;
-    if(threadIdx.x + threadIdx.y == 0) {
-      __threadfence();
-      num_teams_done = Kokkos::atomic_fetch_add(global_flags,1)+1;
+    if (threadIdx.x + threadIdx.y == 0) {
+      num_teams_done = Kokkos::atomic_fetch_add(global_flags, 1) + 1;
     }
     bool is_last_block = false;
-    if(__syncthreads_or(num_teams_done == gridDim.x)) {
-      is_last_block=true;
+    if (__syncthreads_or(num_teams_done == gridDim.x)) {
+      is_last_block = true;
       *global_flags = 0;
-      ValueInit::init( functor, &value);
-      for(int i=threadIdx.y*blockDim.x+threadIdx.x; i<global_elements; i+=blockDim.x*blockDim.y) {
-        ValueJoin::join( functor , &value,&global_team_buffer_element[i]);
+      ValueInit::init(functor, &value);
+      for (int i = threadIdx.y * blockDim.x + threadIdx.x; i < global_elements;
+           i += blockDim.x * blockDim.y) {
+        ValueJoin::join(functor, &value, &global_team_buffer_element[i]);
       }
-      scalar_intra_block_reduction(functor,value,false,shared_team_buffer_elements+(blockDim.y-1),shared_elements,shared_team_buffer_elements);
+      scalar_intra_block_reduction(
+          functor, value, false, shared_team_buffer_elements + (blockDim.y - 1),
+          shared_elements, shared_team_buffer_elements);
     }
     return is_last_block;
   }
 };
 
-template<class FunctorType, class ArgTag>
+template <class FunctorType, class ArgTag>
 struct CudaReductionsFunctor<FunctorType, ArgTag, false, false> {
-  typedef FunctorValueTraits< FunctorType , ArgTag >  ValueTraits ;
-  typedef FunctorValueJoin<   FunctorType , ArgTag >  ValueJoin ;
-  typedef FunctorValueInit<   FunctorType , ArgTag >  ValueInit ;
-  typedef FunctorValueOps<    FunctorType , ArgTag >  ValueOps ;
-  typedef typename ValueTraits::pointer_type  pointer_type ;
+  typedef FunctorValueTraits<FunctorType, ArgTag> ValueTraits;
+  typedef FunctorValueJoin<FunctorType, ArgTag> ValueJoin;
+  typedef FunctorValueInit<FunctorType, ArgTag> ValueInit;
+  typedef FunctorValueOps<FunctorType, ArgTag> ValueOps;
+  typedef typename ValueTraits::pointer_type pointer_type;
   typedef typename ValueTraits::value_type Scalar;
 
-  __device__
-  static inline void scalar_intra_warp_reduction(
+  __device__ static inline void scalar_intra_warp_reduction(
       const FunctorType& functor,
-      Scalar* value,                           // Contribution
-      const bool skip_vector,                  // Skip threads if Kokkos vector lanes are not part of the reduction
-      const int width)                         // How much of the warp participates
+      Scalar* value,           // Contribution
+      const bool skip_vector,  // Skip threads if Kokkos vector lanes are not
+                               // part of the reduction
+      const int width)         // How much of the warp participates
   {
 #ifdef KOKKOS_IMPL_CUDA_SYNCWARP_NEEDS_MASK
-    unsigned mask = width==32?0xffffffff:((1<<width)-1)<<((threadIdx.y*blockDim.x+threadIdx.x)/width)*width;
+    unsigned mask =
+        width == 32
+            ? 0xffffffff
+            : ((1 << width) - 1)
+                  << ((threadIdx.y * blockDim.x + threadIdx.x) / width) * width;
 #endif
-    const int lane_id = (threadIdx.y*blockDim.x+threadIdx.x)%32;
-    for(int delta=skip_vector?blockDim.x:1; delta<width; delta*=2) {
-      if(lane_id + delta<32) {
-        ValueJoin::join( functor , value, value+delta);
+    const int lane_id = (threadIdx.y * blockDim.x + threadIdx.x) % 32;
+    for (int delta = skip_vector ? blockDim.x : 1; delta < width; delta *= 2) {
+      if (lane_id + delta < 32) {
+        ValueJoin::join(functor, value, value + delta);
       }
 #ifdef KOKKOS_IMPL_CUDA_SYNCWARP_NEEDS_MASK
       KOKKOS_IMPL_CUDA_SYNCWARP_MASK(mask);
@@ -705,71 +572,69 @@ struct CudaReductionsFunctor<FunctorType, ArgTag, false, false> {
       KOKKOS_IMPL_CUDA_SYNCWARP;
 #endif
     }
-    *value=*(value-lane_id);
+    *value = *(value - lane_id);
   }
 
-
-  __device__
-  static inline void scalar_intra_block_reduction(
-      const FunctorType& functor,
-      Scalar value,
-      const bool skip,
-      Scalar* result,
-      const int shared_elements,
-      Scalar* shared_team_buffer_element) {
-
-    const int warp_id = (threadIdx.y*blockDim.x)/32;
+  __device__ static inline void scalar_intra_block_reduction(
+      const FunctorType& functor, Scalar value, const bool skip, Scalar* result,
+      const int shared_elements, Scalar* shared_team_buffer_element) {
+    const int warp_id = (threadIdx.y * blockDim.x) / 32;
     Scalar* const my_shared_team_buffer_element =
-        shared_team_buffer_element + threadIdx.y*blockDim.x+threadIdx.x;
+        shared_team_buffer_element + threadIdx.y * blockDim.x + threadIdx.x;
     *my_shared_team_buffer_element = value;
     // Warp Level Reduction, ignoring Kokkos vector entries
-    scalar_intra_warp_reduction(functor,my_shared_team_buffer_element,skip,32);
-    // Wait for every warp to be done before using one warp to do final cross warp reduction
+    scalar_intra_warp_reduction(functor, my_shared_team_buffer_element, skip,
+                                32);
+    // Wait for every warp to be done before using one warp to do final cross
+    // warp reduction
     __syncthreads();
 
-    if( warp_id == 0) {
-      const unsigned int delta = (threadIdx.y*blockDim.x+threadIdx.x)*32;
-      if(delta<blockDim.x*blockDim.y)
+    if (warp_id == 0) {
+      const unsigned int delta = (threadIdx.y * blockDim.x + threadIdx.x) * 32;
+      if (delta < blockDim.x * blockDim.y)
         *my_shared_team_buffer_element = shared_team_buffer_element[delta];
-      KOKKOS_IMPL_CUDA_SYNCWARP;   
-      scalar_intra_warp_reduction(functor,my_shared_team_buffer_element,false,blockDim.x*blockDim.y/32);
-      if(threadIdx.x + threadIdx.y == 0) *result = *shared_team_buffer_element;
+      KOKKOS_IMPL_CUDA_SYNCWARP;
+      scalar_intra_warp_reduction(functor, my_shared_team_buffer_element, false,
+                                  blockDim.x * blockDim.y / 32);
+      if (threadIdx.x + threadIdx.y == 0) *result = *shared_team_buffer_element;
     }
   }
 
-  __device__
-  static inline bool scalar_inter_block_reduction(
-      const FunctorType     & functor ,
-      const Cuda::size_type   block_id ,
-      const Cuda::size_type   block_count ,
-      Cuda::size_type * const shared_data ,
-      Cuda::size_type * const global_data ,
-      Cuda::size_type * const global_flags )  {
-    Scalar* const global_team_buffer_element = ((Scalar*) global_data);
-    Scalar* const my_global_team_buffer_element = global_team_buffer_element + blockIdx.x;
-    Scalar* shared_team_buffer_elements = ((Scalar*) shared_data);
-    Scalar value = shared_team_buffer_elements[threadIdx.y];
-    int shared_elements=blockDim.x*blockDim.y/32;
-    int global_elements=block_count;
+  __device__ static inline bool scalar_inter_block_reduction(
+      const FunctorType& functor, const Cuda::size_type block_id,
+      const Cuda::size_type block_count, Cuda::size_type* const shared_data,
+      Cuda::size_type* const global_data, Cuda::size_type* const global_flags) {
+    Scalar* const global_team_buffer_element = ((Scalar*)global_data);
+    Scalar* const my_global_team_buffer_element =
+        global_team_buffer_element + blockIdx.x;
+    Scalar* shared_team_buffer_elements = ((Scalar*)shared_data);
+    Scalar value        = shared_team_buffer_elements[threadIdx.y];
+    int shared_elements = blockDim.x * blockDim.y / 32;
+    int global_elements = block_count;
     __syncthreads();
 
-    scalar_intra_block_reduction(functor,value,true,my_global_team_buffer_element,shared_elements,shared_team_buffer_elements);
+    scalar_intra_block_reduction(functor, value, true,
+                                 my_global_team_buffer_element, shared_elements,
+                                 shared_team_buffer_elements);
+    __threadfence();
     __syncthreads();
 
     unsigned int num_teams_done = 0;
-    if(threadIdx.x + threadIdx.y == 0) {
-      __threadfence();
-      num_teams_done = Kokkos::atomic_fetch_add(global_flags,1)+1;
+    if (threadIdx.x + threadIdx.y == 0) {
+      num_teams_done = Kokkos::atomic_fetch_add(global_flags, 1) + 1;
     }
     bool is_last_block = false;
-    if(__syncthreads_or(num_teams_done == gridDim.x)) {
-      is_last_block=true;
+    if (__syncthreads_or(num_teams_done == gridDim.x)) {
+      is_last_block = true;
       *global_flags = 0;
-      ValueInit::init( functor, &value);
-      for(int i=threadIdx.y*blockDim.x+threadIdx.x; i<global_elements; i+=blockDim.x*blockDim.y) {
-        ValueJoin::join( functor , &value,&global_team_buffer_element[i]);
+      ValueInit::init(functor, &value);
+      for (int i = threadIdx.y * blockDim.x + threadIdx.x; i < global_elements;
+           i += blockDim.x * blockDim.y) {
+        ValueJoin::join(functor, &value, &global_team_buffer_element[i]);
       }
-      scalar_intra_block_reduction(functor,value,false,shared_team_buffer_elements+(blockDim.y-1),shared_elements,shared_team_buffer_elements);
+      scalar_intra_block_reduction(
+          functor, value, false, shared_team_buffer_elements + (blockDim.y - 1),
+          shared_elements, shared_team_buffer_elements);
     }
     return is_last_block;
   }
@@ -792,116 +657,168 @@ struct CudaReductionsFunctor<FunctorType, ArgTag, false, false> {
  *   (c) blockDim.x == blockDim.z == 1
  */
 
-template< bool DoScan , class FunctorType , class ArgTag >
-__device__
-void cuda_intra_block_reduce_scan( const FunctorType & functor ,
-                                   const typename FunctorValueTraits< FunctorType , ArgTag >::pointer_type base_data )
-{
-  typedef FunctorValueTraits< FunctorType , ArgTag >  ValueTraits ;
-  typedef FunctorValueJoin<   FunctorType , ArgTag >  ValueJoin ;
+template <bool DoScan, class FunctorType, class ArgTag>
+__device__ void cuda_intra_block_reduce_scan(
+    const FunctorType& functor,
+    const typename FunctorValueTraits<FunctorType, ArgTag>::pointer_type
+        base_data) {
+  typedef FunctorValueTraits<FunctorType, ArgTag> ValueTraits;
+  typedef FunctorValueJoin<FunctorType, ArgTag> ValueJoin;
 
-  typedef typename ValueTraits::pointer_type  pointer_type ;
+  typedef typename ValueTraits::pointer_type pointer_type;
 
-  const unsigned value_count   = ValueTraits::value_count( functor );
-  const unsigned BlockSizeMask = blockDim.y - 1 ;
+  const unsigned value_count   = ValueTraits::value_count(functor);
+  const unsigned BlockSizeMask = blockDim.y - 1;
 
   // Must have power of two thread count
 
-  if ( BlockSizeMask & blockDim.y ) { Kokkos::abort("Cuda::cuda_intra_block_scan requires power-of-two blockDim"); }
+  if (BlockSizeMask & blockDim.y) {
+    Kokkos::abort("Cuda::cuda_intra_block_scan requires power-of-two blockDim");
+  }
 
-#define BLOCK_REDUCE_STEP( R , TD , S )  \
-  if ( ! ( R & ((1<<(S+1))-1) ) ) { ValueJoin::join( functor , TD , (TD - (value_count<<S)) ); }
+#define BLOCK_REDUCE_STEP(R, TD, S)                          \
+  if (!(R & ((1 << (S + 1)) - 1))) {                         \
+    ValueJoin::join(functor, TD, (TD - (value_count << S))); \
+  }
 
-#define BLOCK_SCAN_STEP( TD , N , S )  \
-  if ( N == (1<<S) ) { ValueJoin::join( functor , TD , (TD - (value_count<<S))); }
+#define BLOCK_SCAN_STEP(TD, N, S)                            \
+  if (N == (1 << S)) {                                       \
+    ValueJoin::join(functor, TD, (TD - (value_count << S))); \
+  }
 
-  const unsigned     rtid_intra = threadIdx.y ^ BlockSizeMask ;
-  const pointer_type tdata_intra = base_data + value_count * threadIdx.y ;
+  const unsigned rtid_intra      = threadIdx.y ^ BlockSizeMask;
+  const pointer_type tdata_intra = base_data + value_count * threadIdx.y;
 
-  { // Intra-warp reduction:
+  {  // Intra-warp reduction:
     KOKKOS_IMPL_CUDA_SYNCWARP;
-    BLOCK_REDUCE_STEP(rtid_intra,tdata_intra,0)
+    BLOCK_REDUCE_STEP(rtid_intra, tdata_intra, 0)
     KOKKOS_IMPL_CUDA_SYNCWARP;
-    BLOCK_REDUCE_STEP(rtid_intra,tdata_intra,1)
+    BLOCK_REDUCE_STEP(rtid_intra, tdata_intra, 1)
     KOKKOS_IMPL_CUDA_SYNCWARP;
-    BLOCK_REDUCE_STEP(rtid_intra,tdata_intra,2)
+    BLOCK_REDUCE_STEP(rtid_intra, tdata_intra, 2)
     KOKKOS_IMPL_CUDA_SYNCWARP;
-    BLOCK_REDUCE_STEP(rtid_intra,tdata_intra,3)
+    BLOCK_REDUCE_STEP(rtid_intra, tdata_intra, 3)
     KOKKOS_IMPL_CUDA_SYNCWARP;
-    BLOCK_REDUCE_STEP(rtid_intra,tdata_intra,4)
+    BLOCK_REDUCE_STEP(rtid_intra, tdata_intra, 4)
     KOKKOS_IMPL_CUDA_SYNCWARP;
- }
+  }
 
-  __syncthreads(); // Wait for all warps to reduce
+  __syncthreads();  // Wait for all warps to reduce
 
-  { // Inter-warp reduce-scan by a single warp to avoid extra synchronizations
-    const unsigned rtid_inter = ( threadIdx.y ^ BlockSizeMask ) << CudaTraits::WarpIndexShift ;
+  {  // Inter-warp reduce-scan by a single warp to avoid extra synchronizations
+    const unsigned rtid_inter = (threadIdx.y ^ BlockSizeMask)
+                                << CudaTraits::WarpIndexShift;
 
-    #ifdef KOKKOS_IMPL_CUDA_SYNCWARP_NEEDS_MASK
-    unsigned inner_mask = KOKKOS_IMPL_CUDA_BALLOT_MASK(0xffffffff,(rtid_inter<blockDim.y));
-    #endif
-    if ( rtid_inter < blockDim.y ) {
+#ifdef KOKKOS_IMPL_CUDA_SYNCWARP_NEEDS_MASK
+    unsigned inner_mask =
+        KOKKOS_IMPL_CUDA_BALLOT_MASK(0xffffffff, (rtid_inter < blockDim.y));
+#endif
+    if (rtid_inter < blockDim.y) {
+      const pointer_type tdata_inter =
+          base_data + value_count * (rtid_inter ^ BlockSizeMask);
 
-      const pointer_type tdata_inter = base_data + value_count * ( rtid_inter ^ BlockSizeMask );
+#ifdef KOKKOS_IMPL_CUDA_SYNCWARP_NEEDS_MASK
+      if ((1 << 5) < BlockSizeMask) {
+        KOKKOS_IMPL_CUDA_SYNCWARP_MASK(inner_mask);
+        BLOCK_REDUCE_STEP(rtid_inter, tdata_inter, 5)
+      }
+      if ((1 << 6) < BlockSizeMask) {
+        KOKKOS_IMPL_CUDA_SYNCWARP_MASK(inner_mask);
+        BLOCK_REDUCE_STEP(rtid_inter, tdata_inter, 6)
+      }
+      if ((1 << 7) < BlockSizeMask) {
+        KOKKOS_IMPL_CUDA_SYNCWARP_MASK(inner_mask);
+        BLOCK_REDUCE_STEP(rtid_inter, tdata_inter, 7)
+      }
+      if ((1 << 8) < BlockSizeMask) {
+        KOKKOS_IMPL_CUDA_SYNCWARP_MASK(inner_mask);
+        BLOCK_REDUCE_STEP(rtid_inter, tdata_inter, 8)
+      }
+      if ((1 << 9) < BlockSizeMask) {
+        KOKKOS_IMPL_CUDA_SYNCWARP_MASK(inner_mask);
+        BLOCK_REDUCE_STEP(rtid_inter, tdata_inter, 9)
+      }
+#else
+      if ((1 << 5) < BlockSizeMask) {
+        KOKKOS_IMPL_CUDA_SYNCWARP;
+        BLOCK_REDUCE_STEP(rtid_inter, tdata_inter, 5)
+      }
+      if ((1 << 6) < BlockSizeMask) {
+        KOKKOS_IMPL_CUDA_SYNCWARP;
+        BLOCK_REDUCE_STEP(rtid_inter, tdata_inter, 6)
+      }
+      if ((1 << 7) < BlockSizeMask) {
+        KOKKOS_IMPL_CUDA_SYNCWARP;
+        BLOCK_REDUCE_STEP(rtid_inter, tdata_inter, 7)
+      }
+      if ((1 << 8) < BlockSizeMask) {
+        KOKKOS_IMPL_CUDA_SYNCWARP;
+        BLOCK_REDUCE_STEP(rtid_inter, tdata_inter, 8)
+      }
+      if ((1 << 9) < BlockSizeMask) {
+        KOKKOS_IMPL_CUDA_SYNCWARP;
+        BLOCK_REDUCE_STEP(rtid_inter, tdata_inter, 9)
+      }
+#endif
 
-      #ifdef KOKKOS_IMPL_CUDA_SYNCWARP_NEEDS_MASK
-      if ( (1<<5) < BlockSizeMask ) { KOKKOS_IMPL_CUDA_SYNCWARP_MASK(inner_mask); BLOCK_REDUCE_STEP(rtid_inter,tdata_inter,5) }
-      if ( (1<<6) < BlockSizeMask ) { KOKKOS_IMPL_CUDA_SYNCWARP_MASK(inner_mask); BLOCK_REDUCE_STEP(rtid_inter,tdata_inter,6) }
-      if ( (1<<7) < BlockSizeMask ) { KOKKOS_IMPL_CUDA_SYNCWARP_MASK(inner_mask); BLOCK_REDUCE_STEP(rtid_inter,tdata_inter,7) }
-      if ( (1<<8) < BlockSizeMask ) { KOKKOS_IMPL_CUDA_SYNCWARP_MASK(inner_mask); BLOCK_REDUCE_STEP(rtid_inter,tdata_inter,8) }
-      if ( (1<<9) < BlockSizeMask ) { KOKKOS_IMPL_CUDA_SYNCWARP_MASK(inner_mask); BLOCK_REDUCE_STEP(rtid_inter,tdata_inter,9) }
-      #else
-      if ( (1<<5) < BlockSizeMask ) { KOKKOS_IMPL_CUDA_SYNCWARP; BLOCK_REDUCE_STEP(rtid_inter,tdata_inter,5) }
-      if ( (1<<6) < BlockSizeMask ) { KOKKOS_IMPL_CUDA_SYNCWARP; BLOCK_REDUCE_STEP(rtid_inter,tdata_inter,6) }
-      if ( (1<<7) < BlockSizeMask ) { KOKKOS_IMPL_CUDA_SYNCWARP; BLOCK_REDUCE_STEP(rtid_inter,tdata_inter,7) }
-      if ( (1<<8) < BlockSizeMask ) { KOKKOS_IMPL_CUDA_SYNCWARP; BLOCK_REDUCE_STEP(rtid_inter,tdata_inter,8) }
-      if ( (1<<9) < BlockSizeMask ) { KOKKOS_IMPL_CUDA_SYNCWARP; BLOCK_REDUCE_STEP(rtid_inter,tdata_inter,9) }
-      #endif
+      if (DoScan) {
+        int n =
+            (rtid_inter & 32)
+                ? 32
+                : ((rtid_inter & 64)
+                       ? 64
+                       : ((rtid_inter & 128) ? 128
+                                             : ((rtid_inter & 256) ? 256 : 0)));
 
-      if ( DoScan ) {
+        if (!(rtid_inter + n < blockDim.y)) n = 0;
 
-        int n = ( rtid_inter &  32 ) ?  32 : (
-                ( rtid_inter &  64 ) ?  64 : (
-                ( rtid_inter & 128 ) ? 128 : (
-                ( rtid_inter & 256 ) ? 256 : 0 )));
-
-        if ( ! ( rtid_inter + n < blockDim.y ) ) n = 0 ;
-
-        #ifdef KOKKOS_IMPL_CUDA_SYNCWARP_NEEDS_MASK
-        KOKKOS_IMPL_CUDA_SYNCWARP_MASK(inner_mask); BLOCK_SCAN_STEP(tdata_inter,n,8)
-        KOKKOS_IMPL_CUDA_SYNCWARP_MASK(inner_mask); BLOCK_SCAN_STEP(tdata_inter,n,7)
-        KOKKOS_IMPL_CUDA_SYNCWARP_MASK(inner_mask); BLOCK_SCAN_STEP(tdata_inter,n,6)
-        KOKKOS_IMPL_CUDA_SYNCWARP_MASK(inner_mask); BLOCK_SCAN_STEP(tdata_inter,n,5)
-        #else
-        KOKKOS_IMPL_CUDA_SYNCWARP; BLOCK_SCAN_STEP(tdata_inter,n,8)
-        KOKKOS_IMPL_CUDA_SYNCWARP; BLOCK_SCAN_STEP(tdata_inter,n,7)
-        KOKKOS_IMPL_CUDA_SYNCWARP; BLOCK_SCAN_STEP(tdata_inter,n,6)
-        KOKKOS_IMPL_CUDA_SYNCWARP; BLOCK_SCAN_STEP(tdata_inter,n,5)
-        #endif
+#ifdef KOKKOS_IMPL_CUDA_SYNCWARP_NEEDS_MASK
+        KOKKOS_IMPL_CUDA_SYNCWARP_MASK(inner_mask);
+        BLOCK_SCAN_STEP(tdata_inter, n, 8)
+        KOKKOS_IMPL_CUDA_SYNCWARP_MASK(inner_mask);
+        BLOCK_SCAN_STEP(tdata_inter, n, 7)
+        KOKKOS_IMPL_CUDA_SYNCWARP_MASK(inner_mask);
+        BLOCK_SCAN_STEP(tdata_inter, n, 6)
+        KOKKOS_IMPL_CUDA_SYNCWARP_MASK(inner_mask);
+        BLOCK_SCAN_STEP(tdata_inter, n, 5)
+#else
+        KOKKOS_IMPL_CUDA_SYNCWARP;
+        BLOCK_SCAN_STEP(tdata_inter, n, 8)
+        KOKKOS_IMPL_CUDA_SYNCWARP;
+        BLOCK_SCAN_STEP(tdata_inter, n, 7)
+        KOKKOS_IMPL_CUDA_SYNCWARP;
+        BLOCK_SCAN_STEP(tdata_inter, n, 6)
+        KOKKOS_IMPL_CUDA_SYNCWARP;
+        BLOCK_SCAN_STEP(tdata_inter, n, 5)
+#endif
       }
     }
   }
 
-  __syncthreads(); // Wait for inter-warp reduce-scan to complete
+  __syncthreads();  // Wait for inter-warp reduce-scan to complete
 
-  if ( DoScan ) {
-    int n = ( rtid_intra &  1 ) ?  1 : (
-            ( rtid_intra &  2 ) ?  2 : (
-            ( rtid_intra &  4 ) ?  4 : (
-            ( rtid_intra &  8 ) ?  8 : (
-            ( rtid_intra & 16 ) ? 16 : 0 ))));
+  if (DoScan) {
+    int n =
+        (rtid_intra & 1)
+            ? 1
+            : ((rtid_intra & 2)
+                   ? 2
+                   : ((rtid_intra & 4)
+                          ? 4
+                          : ((rtid_intra & 8) ? 8
+                                              : ((rtid_intra & 16) ? 16 : 0))));
 
-    if ( ! ( rtid_intra + n < blockDim.y ) ) n = 0 ;
+    if (!(rtid_intra + n < blockDim.y)) n = 0;
     KOKKOS_IMPL_CUDA_SYNCWARP;
-    BLOCK_SCAN_STEP(tdata_intra,n,4) __threadfence_block();
+    BLOCK_SCAN_STEP(tdata_intra, n, 4) __threadfence_block();
     KOKKOS_IMPL_CUDA_SYNCWARP;
-    BLOCK_SCAN_STEP(tdata_intra,n,3) __threadfence_block();
+    BLOCK_SCAN_STEP(tdata_intra, n, 3) __threadfence_block();
     KOKKOS_IMPL_CUDA_SYNCWARP;
-    BLOCK_SCAN_STEP(tdata_intra,n,2) __threadfence_block();
+    BLOCK_SCAN_STEP(tdata_intra, n, 2) __threadfence_block();
     KOKKOS_IMPL_CUDA_SYNCWARP;
-    BLOCK_SCAN_STEP(tdata_intra,n,1) __threadfence_block();
+    BLOCK_SCAN_STEP(tdata_intra, n, 1) __threadfence_block();
     KOKKOS_IMPL_CUDA_SYNCWARP;
-    BLOCK_SCAN_STEP(tdata_intra,n,0) __threadfence_block();
+    BLOCK_SCAN_STEP(tdata_intra, n, 0) __threadfence_block();
     KOKKOS_IMPL_CUDA_SYNCWARP;
   }
 
@@ -918,116 +835,130 @@ void cuda_intra_block_reduce_scan( const FunctorType & functor ,
  *  Global reduce result is in the last threads' 'shared_data' location.
  */
 
-template< bool DoScan , class FunctorType , class ArgTag >
-__device__
-bool cuda_single_inter_block_reduce_scan2( const FunctorType     & functor ,
-                                    const Cuda::size_type   block_id ,
-                                    const Cuda::size_type   block_count ,
-                                    Cuda::size_type * const shared_data ,
-                                    Cuda::size_type * const global_data ,
-                                    Cuda::size_type * const global_flags )
-{
-  typedef Cuda::size_type                  size_type ;
-  typedef FunctorValueTraits< FunctorType , ArgTag >  ValueTraits ;
-  typedef FunctorValueJoin<   FunctorType , ArgTag >  ValueJoin ;
-  typedef FunctorValueInit<   FunctorType , ArgTag >  ValueInit ;
-  typedef FunctorValueOps<    FunctorType , ArgTag >  ValueOps ;
+template <bool DoScan, class FunctorType, class ArgTag>
+__device__ bool cuda_single_inter_block_reduce_scan2(
+    const FunctorType& functor, const Cuda::size_type block_id,
+    const Cuda::size_type block_count, Cuda::size_type* const shared_data,
+    Cuda::size_type* const global_data, Cuda::size_type* const global_flags) {
+  typedef Cuda::size_type size_type;
+  typedef FunctorValueTraits<FunctorType, ArgTag> ValueTraits;
+  typedef FunctorValueJoin<FunctorType, ArgTag> ValueJoin;
+  typedef FunctorValueInit<FunctorType, ArgTag> ValueInit;
+  typedef FunctorValueOps<FunctorType, ArgTag> ValueOps;
 
-  typedef typename ValueTraits::pointer_type    pointer_type ;
+  typedef typename ValueTraits::pointer_type pointer_type;
 
   // '__ffs' = position of the least significant bit set to 1.
   // 'blockDim.y' is guaranteed to be a power of two so this
   // is the integral shift value that can replace an integral divide.
-  const unsigned BlockSizeShift = __ffs( blockDim.y ) - 1 ;
-  const unsigned BlockSizeMask  = blockDim.y - 1 ;
+  const unsigned BlockSizeShift = __ffs(blockDim.y) - 1;
+  const unsigned BlockSizeMask  = blockDim.y - 1;
 
   // Must have power of two thread count
-  if ( BlockSizeMask & blockDim.y ) { Kokkos::abort("Cuda::cuda_single_inter_block_reduce_scan requires power-of-two blockDim"); }
+  if (BlockSizeMask & blockDim.y) {
+    Kokkos::abort(
+        "Cuda::cuda_single_inter_block_reduce_scan requires power-of-two "
+        "blockDim");
+  }
 
-  const integral_nonzero_constant< size_type , ValueTraits::StaticValueSize / sizeof(size_type) >
-    word_count( ValueTraits::value_size( functor ) / sizeof(size_type) );
+  const integral_nonzero_constant<size_type, ValueTraits::StaticValueSize /
+                                                 sizeof(size_type)>
+      word_count(ValueTraits::value_size(functor) / sizeof(size_type));
 
   // Reduce the accumulation for the entire block.
-  cuda_intra_block_reduce_scan<false,FunctorType,ArgTag>( functor , pointer_type(shared_data) );
+  cuda_intra_block_reduce_scan<false, FunctorType, ArgTag>(
+      functor, pointer_type(shared_data));
 
   {
     // Write accumulation total to global scratch space.
     // Accumulation total is the last thread's data.
-    size_type * const shared = shared_data + word_count.value * BlockSizeMask ;
-    size_type * const global = global_data + word_count.value * block_id ;
+    size_type* const shared = shared_data + word_count.value * BlockSizeMask;
+    size_type* const global = global_data + word_count.value * block_id;
 
-    for ( int i = int(threadIdx.y) ; i < int(word_count.value) ; i += int(blockDim.y) ) { global[i] = shared[i] ; }
+    for (int i = int(threadIdx.y); i < int(word_count.value);
+         i += int(blockDim.y)) {
+      global[i] = shared[i];
+    }
   }
+  __threadfence();
 
-  // Contributing blocks note that their contribution has been completed via an atomic-increment flag
-  // If this block is not the last block to contribute to this group then the block is done.
-  const bool is_last_block =
-    ! __syncthreads_or( threadIdx.y ? 0 : ( 1 + atomicInc( global_flags , block_count - 1 ) < block_count ) );
+  // Contributing blocks note that their contribution has been completed via an
+  // atomic-increment flag If this block is not the last block to contribute to
+  // this group then the block is done.
+  const bool is_last_block = !__syncthreads_or(
+      threadIdx.y
+          ? 0
+          : (1 + atomicInc(global_flags, block_count - 1) < block_count));
 
-  if ( is_last_block ) {
-
-    const size_type b = ( long(block_count) * long(threadIdx.y) ) >> BlockSizeShift ;
-    const size_type e = ( long(block_count) * long( threadIdx.y + 1 ) ) >> BlockSizeShift ;
+  if (is_last_block) {
+    const size_type b =
+        (long(block_count) * long(threadIdx.y)) >> BlockSizeShift;
+    const size_type e =
+        (long(block_count) * long(threadIdx.y + 1)) >> BlockSizeShift;
 
     {
-      void * const shared_ptr = shared_data + word_count.value * threadIdx.y ;
-      /* reference_type shared_value = */ ValueInit::init( functor , shared_ptr );
+      void* const shared_ptr = shared_data + word_count.value * threadIdx.y;
+      /* reference_type shared_value = */ ValueInit::init(functor, shared_ptr);
 
-      for ( size_type i = b ; i < e ; ++i ) {
-        ValueJoin::join( functor , shared_ptr , global_data + word_count.value * i );
+      for (size_type i = b; i < e; ++i) {
+        ValueJoin::join(functor, shared_ptr,
+                        global_data + word_count.value * i);
       }
     }
 
-    cuda_intra_block_reduce_scan<DoScan,FunctorType,ArgTag>( functor , pointer_type(shared_data) );
+    cuda_intra_block_reduce_scan<DoScan, FunctorType, ArgTag>(
+        functor, pointer_type(shared_data));
 
-    if ( DoScan ) {
+    if (DoScan) {
+      size_type* const shared_value =
+          shared_data +
+          word_count.value * (threadIdx.y ? threadIdx.y - 1 : blockDim.y);
 
-      size_type * const shared_value = shared_data + word_count.value * ( threadIdx.y ? threadIdx.y - 1 : blockDim.y );
-
-      if ( ! threadIdx.y ) { ValueInit::init( functor , shared_value ); }
+      if (!threadIdx.y) {
+        ValueInit::init(functor, shared_value);
+      }
 
       // Join previous inclusive scan value to each member
-      for ( size_type i = b ; i < e ; ++i ) {
-        size_type * const global_value = global_data + word_count.value * i ;
-        ValueJoin::join( functor , shared_value , global_value );
-        ValueOps ::copy( functor , global_value , shared_value );
+      for (size_type i = b; i < e; ++i) {
+        size_type* const global_value = global_data + word_count.value * i;
+        ValueJoin::join(functor, shared_value, global_value);
+        ValueOps ::copy(functor, global_value, shared_value);
       }
     }
   }
 
-  return is_last_block ;
+  return is_last_block;
 }
 
-template< bool DoScan , class FunctorType , class ArgTag >
-__device__
-bool cuda_single_inter_block_reduce_scan( const FunctorType     & functor ,
-                                          const Cuda::size_type   block_id ,
-                                          const Cuda::size_type   block_count ,
-                                          Cuda::size_type * const shared_data ,
-                                          Cuda::size_type * const global_data ,
-                                          Cuda::size_type * const global_flags )
-{
-  typedef FunctorValueTraits< FunctorType , ArgTag >  ValueTraits ;
-  if(!DoScan && ValueTraits::StaticValueSize)
-    return Kokkos::Impl::CudaReductionsFunctor<FunctorType,ArgTag,false,(ValueTraits::StaticValueSize>16)>::scalar_inter_block_reduction(functor,block_id,block_count,shared_data,global_data,global_flags);
+template <bool DoScan, class FunctorType, class ArgTag>
+__device__ bool cuda_single_inter_block_reduce_scan(
+    const FunctorType& functor, const Cuda::size_type block_id,
+    const Cuda::size_type block_count, Cuda::size_type* const shared_data,
+    Cuda::size_type* const global_data, Cuda::size_type* const global_flags) {
+  typedef FunctorValueTraits<FunctorType, ArgTag> ValueTraits;
+  if (!DoScan && ValueTraits::StaticValueSize)
+    return Kokkos::Impl::CudaReductionsFunctor<
+        FunctorType, ArgTag, false, (ValueTraits::StaticValueSize > 16)>::
+        scalar_inter_block_reduction(functor, block_id, block_count,
+                                     shared_data, global_data, global_flags);
   else
-    return cuda_single_inter_block_reduce_scan2<DoScan, FunctorType, ArgTag>(functor, block_id, block_count, shared_data, global_data, global_flags);
+    return cuda_single_inter_block_reduce_scan2<DoScan, FunctorType, ArgTag>(
+        functor, block_id, block_count, shared_data, global_data, global_flags);
 }
 
 // Size in bytes required for inter block reduce or scan
-template< bool DoScan , class FunctorType , class ArgTag >
-inline
-unsigned cuda_single_inter_block_reduce_scan_shmem( const FunctorType & functor , const unsigned BlockSize )
-{
-  return ( BlockSize + 2 ) * Impl::FunctorValueTraits< FunctorType , ArgTag >::value_size( functor );
+template <bool DoScan, class FunctorType, class ArgTag>
+inline unsigned cuda_single_inter_block_reduce_scan_shmem(
+    const FunctorType& functor, const unsigned BlockSize) {
+  return (BlockSize + 2) *
+         Impl::FunctorValueTraits<FunctorType, ArgTag>::value_size(functor);
 }
 
-} // namespace Impl
-} // namespace Kokkos
+}  // namespace Impl
+}  // namespace Kokkos
 
 //----------------------------------------------------------------------------
 //----------------------------------------------------------------------------
 
 #endif /* #if defined( __CUDACC__ ) */
 #endif /* KOKKOS_CUDA_REDUCESCAN_HPP */
-
diff --git a/lib/kokkos/core/src/Cuda/Kokkos_Cuda_Task.cpp b/lib/kokkos/core/src/Cuda/Kokkos_Cuda_Task.cpp
index ac36cfd67e..777f57ced4 100644
--- a/lib/kokkos/core/src/Cuda/Kokkos_Cuda_Task.cpp
+++ b/lib/kokkos/core/src/Cuda/Kokkos_Cuda_Task.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -42,7 +43,7 @@
 */
 
 #include <Kokkos_Macros.hpp>
-#if defined( KOKKOS_ENABLE_CUDA ) && defined( KOKKOS_ENABLE_TASKDAG )
+#if defined(KOKKOS_ENABLE_CUDA) && defined(KOKKOS_ENABLE_TASKDAG)
 
 #include <Kokkos_Core.hpp>
 
@@ -54,13 +55,18 @@
 namespace Kokkos {
 namespace Impl {
 
-template class TaskQueue< Kokkos::Cuda, Impl::default_tasking_memory_space_for_execution_space_t<Kokkos::Cuda> > ;
-template class TaskQueueMultiple< Kokkos::Cuda, Impl::default_tasking_memory_space_for_execution_space_t<Kokkos::Cuda> > ;
+template class TaskQueue<
+    Kokkos::Cuda,
+    Impl::default_tasking_memory_space_for_execution_space_t<Kokkos::Cuda> >;
+template class TaskQueueMultiple<
+    Kokkos::Cuda,
+    Impl::default_tasking_memory_space_for_execution_space_t<Kokkos::Cuda> >;
 
-}} /* namespace Kokkos::Impl */
+}  // namespace Impl
+}  // namespace Kokkos
 
 //----------------------------------------------------------------------------
 #else
 void KOKKOS_CORE_SRC_CUDA_KOKKOS_CUDA_TASK_PREVENT_LINK_ERROR() {}
-#endif /* #if defined( KOKKOS_ENABLE_CUDA ) && defined( KOKKOS_ENABLE_TASKDAG ) */
-
+#endif /* #if defined( KOKKOS_ENABLE_CUDA ) && defined( KOKKOS_ENABLE_TASKDAG \
+          ) */
diff --git a/lib/kokkos/core/src/Cuda/Kokkos_Cuda_Task.hpp b/lib/kokkos/core/src/Cuda/Kokkos_Cuda_Task.hpp
index c35987e49e..237d2430d6 100644
--- a/lib/kokkos/core/src/Cuda/Kokkos_Cuda_Task.hpp
+++ b/lib/kokkos/core/src/Cuda/Kokkos_Cuda_Task.hpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -45,7 +46,7 @@
 #define KOKKOS_IMPL_CUDA_TASK_HPP
 
 #include <Kokkos_Macros.hpp>
-#if defined( KOKKOS_ENABLE_TASKDAG )
+#if defined(KOKKOS_ENABLE_TASKDAG)
 
 //----------------------------------------------------------------------------
 //----------------------------------------------------------------------------
@@ -53,7 +54,7 @@
 #include <Kokkos_Core_fwd.hpp>
 
 #include <impl/Kokkos_TaskBase.hpp>
-#include <Cuda/Kokkos_Cuda_Error.hpp> // CUDA_SAFE_CALL
+#include <Cuda/Kokkos_Cuda_Error.hpp>  // CUDA_SAFE_CALL
 #include <impl/Kokkos_TaskTeamMember.hpp>
 
 //----------------------------------------------------------------------------
@@ -62,65 +63,57 @@ namespace Kokkos {
 namespace Impl {
 namespace {
 
-template< typename TaskType >
-__global__
-void set_cuda_task_base_apply_function_pointer
-  ( typename TaskType::function_type * ptr, typename TaskType::destroy_type* dtor )
-{ 
-  *ptr = TaskType::apply;
+template <typename TaskType>
+__global__ void set_cuda_task_base_apply_function_pointer(
+    typename TaskType::function_type* ptr,
+    typename TaskType::destroy_type* dtor) {
+  *ptr  = TaskType::apply;
   *dtor = TaskType::destroy;
 }
 
-template< typename Scheduler >
-__global__
-void cuda_task_queue_execute( Scheduler scheduler, int32_t shmem_size ) {
-  TaskQueueSpecialization< Scheduler >::driver( std::move(scheduler) , shmem_size );
+template <typename Scheduler>
+__global__ void cuda_task_queue_execute(Scheduler scheduler,
+                                        int32_t shmem_size) {
+  TaskQueueSpecialization<Scheduler>::driver(std::move(scheduler), shmem_size);
 }
 
-}
+}  // namespace
 
-template <class, class> class TaskExec ;
+template <class, class>
+class TaskExec;
 
-template<class QueueType>
-class TaskQueueSpecialization<
-  SimpleTaskScheduler<Kokkos::Cuda, QueueType>
->
-{
-public:
-
-  using scheduler_type = SimpleTaskScheduler<Kokkos::Cuda, QueueType>;
+template <class QueueType>
+class TaskQueueSpecialization<SimpleTaskScheduler<Kokkos::Cuda, QueueType>> {
+ public:
+  using scheduler_type  = SimpleTaskScheduler<Kokkos::Cuda, QueueType>;
   using execution_space = Kokkos::Cuda;
-  using memory_space = Kokkos::CudaUVMSpace;
-  using member_type = TaskExec<Kokkos::Cuda, scheduler_type> ;
+  using memory_space    = Kokkos::CudaUVMSpace;
+  using member_type     = TaskExec<Kokkos::Cuda, scheduler_type>;
 
   enum : long { max_league_size = 16 };
   enum : int { warps_per_block = 4 };
 
   KOKKOS_INLINE_FUNCTION
-  static
-  void iff_single_thread_recursive_execute( scheduler_type const& ) {}
+  static void iff_single_thread_recursive_execute(scheduler_type const&) {}
 
-  static int get_max_team_count(
-    execution_space const&
-  ) {
+  static int get_max_team_count(execution_space const&) {
     return Kokkos::Impl::cuda_internal_multiprocessor_count() * warps_per_block;
   }
 
-  __device__
-  static void driver(scheduler_type scheduler, int32_t shmem_per_warp)
-  {
-    using queue_type = typename scheduler_type::task_queue_type;
+  __device__ static void driver(scheduler_type scheduler,
+                                int32_t shmem_per_warp) {
+    using queue_type     = typename scheduler_type::task_queue_type;
     using task_base_type = typename scheduler_type::task_base_type;
-    using runnable_task_base_type = typename scheduler_type::runnable_task_base_type;
-    using scheduling_info_storage_type =
-      SchedulingInfoStorage<
+    using runnable_task_base_type =
+        typename scheduler_type::runnable_task_base_type;
+    using scheduling_info_storage_type = SchedulingInfoStorage<
         runnable_task_base_type,
-        typename scheduler_type::task_scheduling_info_type
-      >;
+        typename scheduler_type::task_scheduling_info_type>;
 
     extern __shared__ int32_t shmem_all[];
 
-    int32_t* const warp_shmem = shmem_all + (threadIdx.z * shmem_per_warp) / sizeof(int32_t);
+    int32_t* const warp_shmem =
+        shmem_all + (threadIdx.z * shmem_per_warp) / sizeof(int32_t);
 
     task_base_type* const shared_memory_task_copy = (task_base_type*)warp_shmem;
 
@@ -129,44 +122,47 @@ public:
     member_type single_exec(scheduler, warp_shmem, 1);
     member_type team_exec(scheduler, warp_shmem, blockDim.y);
 
-    auto& queue = scheduler.queue();
+    auto& queue          = scheduler.queue();
     auto& team_scheduler = team_exec.scheduler();
 
     auto current_task = OptionalRef<task_base_type>();
 
     // Loop until all queues are empty and no tasks in flight
-    while(not queue.is_done()) {
-
-      if(warp_lane == 0) {  // should be (?) same as team_exec.team_rank() == 0
+    while (not queue.is_done()) {
+      if (warp_lane == 0) {  // should be (?) same as team_exec.team_rank() == 0
         // pop off a task
-        current_task = queue.pop_ready_task(team_scheduler.team_scheduler_info());
+        current_task =
+            queue.pop_ready_task(team_scheduler.team_scheduler_info());
       }
 
       // Broadcast task pointer:
 
       // Sync before the broadcast
       KOKKOS_IMPL_CUDA_SYNCWARP;
-      
+
       // pretend it's an int* for shuffle purposes
-      ((int*) &current_task)[0] = KOKKOS_IMPL_CUDA_SHFL(((int*) &current_task)[0], 0, 32);
-      ((int*) &current_task)[1] = KOKKOS_IMPL_CUDA_SHFL(((int*) &current_task)[1], 0, 32);
-
-      if(current_task) {
+      ((int*)&current_task)[0] =
+          KOKKOS_IMPL_CUDA_SHFL(((int*)&current_task)[0], 0, 32);
+      ((int*)&current_task)[1] =
+          KOKKOS_IMPL_CUDA_SHFL(((int*)&current_task)[1], 0, 32);
 
+      if (current_task) {
         KOKKOS_ASSERT(!current_task->as_runnable_task().get_respawn_flag());
 
         int32_t b = sizeof(scheduling_info_storage_type) / sizeof(int32_t);
         static_assert(
-          sizeof(scheduling_info_storage_type) % sizeof(int32_t) == 0,
-          "bad task size"
-        );
+            sizeof(scheduling_info_storage_type) % sizeof(int32_t) == 0,
+            "bad task size");
         int32_t const e = current_task->get_allocation_size() / sizeof(int32_t);
-        KOKKOS_ASSERT(current_task->get_allocation_size() % sizeof(int32_t) == 0);
+        KOKKOS_ASSERT(current_task->get_allocation_size() % sizeof(int32_t) ==
+                      0);
 
-        int32_t volatile* const task_mem = (int32_t volatile*)current_task.get();
+        int32_t volatile* const task_mem =
+            (int32_t volatile*)current_task.get();
 
-        // do a coordinated copy of the task closure from global to shared memory:
-        for(int32_t i = warp_lane; i < e; i += CudaTraits::WarpSize) {
+        // do a coordinated copy of the task closure from global to shared
+        // memory:
+        for (int32_t i = warp_lane; i < e; i += CudaTraits::WarpSize) {
           warp_shmem[i] = task_mem[i];
         }
 
@@ -174,13 +170,12 @@ public:
         // writes are visible to all threads in the warp.
         KOKKOS_IMPL_CUDA_SYNCWARP;
 
-        if(shared_memory_task_copy->is_team_runnable()) {
+        if (shared_memory_task_copy->is_team_runnable()) {
           // Thread Team Task
           shared_memory_task_copy->as_runnable_task().run(team_exec);
-        }
-        else if(threadIdx.y == 0) {
-          // TODO @tasking @optimization DSH Change this to warp_lane == 0 when we allow blockDim.x to be more than 1
-          // Single Thread Task
+        } else if (threadIdx.y == 0) {
+          // TODO @tasking @optimization DSH Change this to warp_lane == 0 when
+          // we allow blockDim.x to be more than 1 Single Thread Task
           shared_memory_task_copy->as_runnable_task().run(single_exec);
         }
 
@@ -189,8 +184,8 @@ public:
 
         KOKKOS_IMPL_CUDA_SYNCWARP;
 
-        //if(warp_lane < b % CudaTraits::WarpSize) b += CudaTraits::WarpSize;
-        //b -= b % CudaTraits::WarpSize;
+        // if(warp_lane < b % CudaTraits::WarpSize) b += CudaTraits::WarpSize;
+        // b -= b % CudaTraits::WarpSize;
 
         // copy task closure from shared to global memory:
         for (int32_t i = b + warp_lane; i < e; i += CudaTraits::WarpSize) {
@@ -203,17 +198,15 @@ public:
 
         KOKKOS_IMPL_CUDA_SYNCWARP;
 
-
         if (warp_lane == 0) {
           // If respawn requested copy respawn data back to main memory
-          if(shared_memory_task_copy->as_runnable_task().get_respawn_flag()) {
-            if(shared_memory_task_copy->as_runnable_task().has_predecessor()) {
+          if (shared_memory_task_copy->as_runnable_task().get_respawn_flag()) {
+            if (shared_memory_task_copy->as_runnable_task().has_predecessor()) {
               // It's not necessary to make this a volatile write because
               // the next read of the predecessor is on this thread in complete,
               // and the predecessor is cleared there (using a volatile write)
               current_task->as_runnable_task().acquire_predecessor_from(
-                shared_memory_task_copy->as_runnable_task()
-              );
+                  shared_memory_task_copy->as_runnable_task());
             }
 
             // It may not necessary to make this a volatile write, since the
@@ -224,39 +217,35 @@ public:
             // where else the priority would be read after it is scheduled
             // by this thread; for now, we leave it volatile, but we should
             // benchmark the cost of this.)
-            current_task.as_volatile()->set_priority(shared_memory_task_copy->get_priority());
+            current_task.as_volatile()->set_priority(
+                shared_memory_task_copy->get_priority());
 
             // It's not necessary to make this a volatile write, since the
             // next read of it (if true) will be by this thread in `complete()`,
             // which will unset the flag (using volatile) once it has handled
             // the respawn
             current_task->as_runnable_task().set_respawn_flag();
-
           }
 
-          queue.complete(
-            (*std::move(current_task)).as_runnable_task(),
-            team_scheduler.team_scheduler_info()
-          );
+          queue.complete((*std::move(current_task)).as_runnable_task(),
+                         team_scheduler.team_scheduler_info());
         }
-
       }
     }
   }
 
-  static
-  void execute(scheduler_type const& scheduler)
-  {
-    const int shared_per_warp = 2048 ;
+  static void execute(scheduler_type const& scheduler) {
+    const int shared_per_warp = 2048;
     const dim3 grid(Kokkos::Impl::cuda_internal_multiprocessor_count(), 1, 1);
     const dim3 block(1, Kokkos::Impl::CudaTraits::WarpSize, warps_per_block);
-    const int shared_total = shared_per_warp * warps_per_block;
+    const int shared_total    = shared_per_warp * warps_per_block;
     const cudaStream_t stream = nullptr;
 
     KOKKOS_ASSERT(
-      static_cast<long>(grid.x * grid.y * grid.z * block.x * block.y * block.z)
-        == static_cast<long>(get_max_team_count(scheduler.get_execution_space()) * Kokkos::Impl::CudaTraits::WarpSize)
-    );
+        static_cast<long>(grid.x * grid.y * grid.z * block.x * block.y *
+                          block.z) ==
+        static_cast<long>(get_max_team_count(scheduler.get_execution_space()) *
+                          Kokkos::Impl::CudaTraits::WarpSize));
 
     auto& queue = scheduler.queue();
 
@@ -265,7 +254,8 @@ public:
     // Query the stack size, in bytes:
 
     size_t previous_stack_size = 0;
-    CUDA_SAFE_CALL(cudaDeviceGetLimit(&previous_stack_size, cudaLimitStackSize));
+    CUDA_SAFE_CALL(
+        cudaDeviceGetLimit(&previous_stack_size, cudaLimitStackSize));
 
     // If not large enough then set the stack size, in bytes:
 
@@ -275,45 +265,45 @@ public:
       CUDA_SAFE_CALL(cudaDeviceSetLimit(cudaLimitStackSize, larger_stack_size));
     }
 
-    cuda_task_queue_execute<<<grid, block, shared_total, stream>>>(scheduler, shared_per_warp);
+    cuda_task_queue_execute<<<grid, block, shared_total, stream>>>(
+        scheduler, shared_per_warp);
 
     CUDA_SAFE_CALL(cudaGetLastError());
 
     CUDA_SAFE_CALL(cudaDeviceSynchronize());
 
     if (previous_stack_size < larger_stack_size) {
-      CUDA_SAFE_CALL(cudaDeviceSetLimit(cudaLimitStackSize, previous_stack_size));
+      CUDA_SAFE_CALL(
+          cudaDeviceSetLimit(cudaLimitStackSize, previous_stack_size));
     }
   }
 
   template <typename TaskType>
   static
-  // TODO @tasking @optimiazation DSH specialize this for trivially destructible types
-  void
-  get_function_pointer(
-    typename TaskType::function_type& ptr,
-    typename TaskType::destroy_type& dtor
-  )
-  {
+      // TODO @tasking @optimiazation DSH specialize this for trivially
+      // destructible types
+      void
+      get_function_pointer(typename TaskType::function_type& ptr,
+                           typename TaskType::destroy_type& dtor) {
     using function_type = typename TaskType::function_type;
-    using destroy_type = typename TaskType::destroy_type;
+    using destroy_type  = typename TaskType::destroy_type;
 
     // TODO @tasking @minor DSH make sure there aren't any alignment concerns?
-    void* storage = cuda_internal_scratch_unified( 
-      Kokkos::Cuda(),
-      sizeof(function_type) + sizeof(destroy_type)
-    );
+    void* storage = cuda_internal_scratch_unified(
+        Kokkos::Cuda(), sizeof(function_type) + sizeof(destroy_type));
     function_type* ptr_ptr = (function_type*)storage;
-    destroy_type* dtor_ptr = (destroy_type*)((char*)storage + sizeof(function_type));
+    destroy_type* dtor_ptr =
+        (destroy_type*)((char*)storage + sizeof(function_type));
 
-    CUDA_SAFE_CALL( cudaDeviceSynchronize() );
+    CUDA_SAFE_CALL(cudaDeviceSynchronize());
 
-    set_cuda_task_base_apply_function_pointer<TaskType><<<1,1>>>(ptr_ptr, dtor_ptr);
+    set_cuda_task_base_apply_function_pointer<TaskType>
+        <<<1, 1>>>(ptr_ptr, dtor_ptr);
 
-    CUDA_SAFE_CALL( cudaGetLastError() );
-    CUDA_SAFE_CALL( cudaDeviceSynchronize() );
+    CUDA_SAFE_CALL(cudaGetLastError());
+    CUDA_SAFE_CALL(cudaDeviceSynchronize());
 
-    ptr = *ptr_ptr;
+    ptr  = *ptr_ptr;
     dtor = *dtor_ptr;
   }
 };
@@ -321,144 +311,133 @@ public:
 //----------------------------------------------------------------------------
 //----------------------------------------------------------------------------
 
-template<class Scheduler>
+template <class Scheduler>
 class TaskQueueSpecializationConstrained<
-  Scheduler,
-  typename std::enable_if<
-    std::is_same<typename Scheduler::execution_space, Kokkos::Cuda>::value
-  >::type
->
-{
-public:
-
-  using scheduler_type = Scheduler;
+    Scheduler,
+    typename std::enable_if<std::is_same<typename Scheduler::execution_space,
+                                         Kokkos::Cuda>::value>::type> {
+ public:
+  using scheduler_type  = Scheduler;
   using execution_space = Kokkos::Cuda;
-  using memory_space = Kokkos::CudaUVMSpace;
-  using member_type = TaskExec<Kokkos::Cuda, Scheduler> ;
+  using memory_space    = Kokkos::CudaUVMSpace;
+  using member_type     = TaskExec<Kokkos::Cuda, Scheduler>;
 
   enum : long { max_league_size = 16 };
 
   KOKKOS_INLINE_FUNCTION
-  static
-  void iff_single_thread_recursive_execute( scheduler_type const& ) {}
+  static void iff_single_thread_recursive_execute(scheduler_type const&) {}
 
-  __device__
-  static void driver(scheduler_type scheduler, int32_t shmem_per_warp)
-  {
-    using queue_type = typename scheduler_type::queue_type;
+  __device__ static void driver(scheduler_type scheduler,
+                                int32_t shmem_per_warp) {
+    using queue_type     = typename scheduler_type::queue_type;
     using task_root_type = TaskBase;
 
     extern __shared__ int32_t shmem_all[];
 
-    task_root_type* const end = (task_root_type *) task_root_type::EndTag ;
+    task_root_type* const end = (task_root_type*)task_root_type::EndTag;
     task_root_type* const no_more_tasks_sentinel = nullptr;
 
-    int32_t * const warp_shmem =
-      shmem_all + ( threadIdx.z * shmem_per_warp ) / sizeof(int32_t);
+    int32_t* const warp_shmem =
+        shmem_all + (threadIdx.z * shmem_per_warp) / sizeof(int32_t);
 
-    task_root_type * const task_shmem = (task_root_type *) warp_shmem ;
+    task_root_type* const task_shmem = (task_root_type*)warp_shmem;
 
-    const int warp_lane = threadIdx.x + threadIdx.y * blockDim.x ;
+    const int warp_lane = threadIdx.x + threadIdx.y * blockDim.x;
 
     member_type single_exec(scheduler, warp_shmem, 1);
     member_type team_exec(scheduler, warp_shmem, blockDim.y);
 
     auto& team_queue = team_exec.scheduler().queue();
 
-    task_root_type * task_ptr = no_more_tasks_sentinel;
+    task_root_type* task_ptr = no_more_tasks_sentinel;
 
     // Loop until all queues are empty and no tasks in flight
 
     do {
-
       // Each team lead attempts to acquire either a thread team task
       // or collection of single thread tasks for the team.
 
-      if ( 0 == warp_lane ) {
-
-        if( *((volatile int *) & team_queue.m_ready_count) > 0 ) {
+      if (0 == warp_lane) {
+        if (*((volatile int*)&team_queue.m_ready_count) > 0) {
           task_ptr = end;
           // Attempt to acquire a task
           // Loop by priority and then type
-          for ( int i = 0 ; i < queue_type::NumQueue && end == task_ptr ; ++i ) {
-            for ( int j = 0 ; j < 2 && end == task_ptr ; ++j ) {
-              task_ptr = queue_type::pop_ready_task( & team_queue.m_ready[i][j] );
+          for (int i = 0; i < queue_type::NumQueue && end == task_ptr; ++i) {
+            for (int j = 0; j < 2 && end == task_ptr; ++j) {
+              task_ptr = queue_type::pop_ready_task(&team_queue.m_ready[i][j]);
             }
           }
-        }
-        else {
+        } else {
           // returns nullptr if and only if all other queues have a ready
           // count of 0 also. Otherwise, returns a task from another queue
           // or `end` if one couldn't be popped
           task_ptr = team_queue.attempt_to_steal_task();
-          #if 0
+#if 0
           if(task != no_more_tasks_sentinel && task != end) {
             std::printf("task stolen on rank %d\n", team_exec.league_rank());
           }
-          #endif
+#endif
         }
-
       }
 
       // Synchronize warp with memory fence before broadcasting task pointer:
 
       // KOKKOS_IMPL_CUDA_SYNCWARP_OR_RETURN( "A" );
-      KOKKOS_IMPL_CUDA_SYNCWARP ;
+      KOKKOS_IMPL_CUDA_SYNCWARP;
 
       // Broadcast task pointer:
 
-      ((int*) & task_ptr )[0] = KOKKOS_IMPL_CUDA_SHFL( ((int*) & task_ptr )[0] , 0 , 32 );
-      ((int*) & task_ptr )[1] = KOKKOS_IMPL_CUDA_SHFL( ((int*) & task_ptr )[1] , 0 , 32 );
+      ((int*)&task_ptr)[0] = KOKKOS_IMPL_CUDA_SHFL(((int*)&task_ptr)[0], 0, 32);
+      ((int*)&task_ptr)[1] = KOKKOS_IMPL_CUDA_SHFL(((int*)&task_ptr)[1], 0, 32);
 
-      #if defined( KOKKOS_DEBUG )
-      KOKKOS_IMPL_CUDA_SYNCWARP_OR_RETURN( "TaskQueue CUDA task_ptr" );
-      #endif
+#if defined(KOKKOS_DEBUG)
+      KOKKOS_IMPL_CUDA_SYNCWARP_OR_RETURN("TaskQueue CUDA task_ptr");
+#endif
 
-      if ( 0 == task_ptr ) break ; // 0 == queue->m_ready_count
-
-      if ( end != task_ptr ) {
+      if (0 == task_ptr) break;  // 0 == queue->m_ready_count
 
+      if (end != task_ptr) {
         // Whole warp copy task's closure to/from shared memory.
         // Use all threads of warp for coalesced read/write.
 
         int32_t const b = sizeof(task_root_type) / sizeof(int32_t);
-        int32_t const e = *((int32_t volatile *)( & task_ptr->m_alloc_size )) / sizeof(int32_t);
+        int32_t const e =
+            *((int32_t volatile*)(&task_ptr->m_alloc_size)) / sizeof(int32_t);
 
-        int32_t volatile * const task_mem = (int32_t volatile *) task_ptr ;
+        int32_t volatile* const task_mem = (int32_t volatile*)task_ptr;
 
         KOKKOS_ASSERT(e * sizeof(int32_t) < shmem_per_warp);
 
         // copy task closure from global to shared memory:
 
-        for ( int32_t i = warp_lane ; i < e ; i += CudaTraits::WarpSize ) {
-          warp_shmem[i] = task_mem[i] ;
+        for (int32_t i = warp_lane; i < e; i += CudaTraits::WarpSize) {
+          warp_shmem[i] = task_mem[i];
         }
 
         // Synchronize threads of the warp and insure memory
         // writes are visible to all threads in the warp.
 
         // KOKKOS_IMPL_CUDA_SYNCWARP_OR_RETURN( "B" );
-        KOKKOS_IMPL_CUDA_SYNCWARP ;
+        KOKKOS_IMPL_CUDA_SYNCWARP;
 
-        if ( task_root_type::TaskTeam == task_shmem->m_task_type ) {
+        if (task_root_type::TaskTeam == task_shmem->m_task_type) {
           // Thread Team Task
-          (*task_shmem->m_apply)( task_shmem , & team_exec );
-        }
-        else if ( 0 == threadIdx.y ) {
+          (*task_shmem->m_apply)(task_shmem, &team_exec);
+        } else if (0 == threadIdx.y) {
           // Single Thread Task
-          (*task_shmem->m_apply)( task_shmem , & single_exec );
+          (*task_shmem->m_apply)(task_shmem, &single_exec);
         }
 
         // Synchronize threads of the warp and insure memory
         // writes are visible to all threads in the warp.
 
         // KOKKOS_IMPL_CUDA_SYNCWARP_OR_RETURN( "C" );
-        KOKKOS_IMPL_CUDA_SYNCWARP ;
+        KOKKOS_IMPL_CUDA_SYNCWARP;
 
         // copy task closure from shared to global memory:
 
-        for ( int32_t i = b + warp_lane ; i < e ; i += CudaTraits::WarpSize ) {
-          task_mem[i] = warp_shmem[i] ;
+        for (int32_t i = b + warp_lane; i < e; i += CudaTraits::WarpSize) {
+          task_mem[i] = warp_shmem[i];
         }
 
         // Synchronize threads of the warp and insure memory
@@ -466,99 +445,96 @@ public:
         // respawn or completion.
 
         // KOKKOS_IMPL_CUDA_SYNCWARP_OR_RETURN( "D" );
-        KOKKOS_IMPL_CUDA_SYNCWARP ;
+        KOKKOS_IMPL_CUDA_SYNCWARP;
 
         // If respawn requested copy respawn data back to main memory
 
-        if ( 0 == warp_lane ) {
-
-          if ( ((task_root_type *) task_root_type::LockTag) != task_shmem->m_next ) {
-            ( (volatile task_root_type *) task_ptr )->m_next = task_shmem->m_next ;
-            ( (volatile task_root_type *) task_ptr )->m_priority = task_shmem->m_priority ;
+        if (0 == warp_lane) {
+          if (((task_root_type*)task_root_type::LockTag) !=
+              task_shmem->m_next) {
+            ((volatile task_root_type*)task_ptr)->m_next = task_shmem->m_next;
+            ((volatile task_root_type*)task_ptr)->m_priority =
+                task_shmem->m_priority;
           }
 
-          team_queue.complete( task_ptr );
+          team_queue.complete(task_ptr);
         }
-
       }
-    } while(1);
+    } while (1);
   }
 
-  static
-  void execute(scheduler_type const& scheduler)
-  {
-    const int shared_per_warp = 2048 ;
-    const int warps_per_block = 4 ;
-    const dim3 grid( Kokkos::Impl::cuda_internal_multiprocessor_count() , 1 , 1 );
-    //const dim3 grid( 1 , 1 , 1 );
-    const dim3 block( 1 , Kokkos::Impl::CudaTraits::WarpSize , warps_per_block );
-    const int shared_total = shared_per_warp * warps_per_block ;
-    const cudaStream_t stream = 0 ;
+  static void execute(scheduler_type const& scheduler) {
+    const int shared_per_warp = 2048;
+    const int warps_per_block = 4;
+    const dim3 grid(Kokkos::Impl::cuda_internal_multiprocessor_count(), 1, 1);
+    // const dim3 grid( 1 , 1 , 1 );
+    const dim3 block(1, Kokkos::Impl::CudaTraits::WarpSize, warps_per_block);
+    const int shared_total    = shared_per_warp * warps_per_block;
+    const cudaStream_t stream = 0;
 
     auto& queue = scheduler.queue();
     queue.initialize_team_queues(warps_per_block * grid.x);
 
-    CUDA_SAFE_CALL( cudaDeviceSynchronize() );
+    CUDA_SAFE_CALL(cudaDeviceSynchronize());
 
     // Query the stack size, in bytes:
 
-    size_t previous_stack_size = 0 ;
-    CUDA_SAFE_CALL( cudaDeviceGetLimit( & previous_stack_size , cudaLimitStackSize ) );
+    size_t previous_stack_size = 0;
+    CUDA_SAFE_CALL(
+        cudaDeviceGetLimit(&previous_stack_size, cudaLimitStackSize));
 
     // If not large enough then set the stack size, in bytes:
 
-    const size_t larger_stack_size = 2048 ;
+    const size_t larger_stack_size = 2048;
 
-    if ( previous_stack_size < larger_stack_size ) {
-      CUDA_SAFE_CALL( cudaDeviceSetLimit( cudaLimitStackSize , larger_stack_size ) );
+    if (previous_stack_size < larger_stack_size) {
+      CUDA_SAFE_CALL(cudaDeviceSetLimit(cudaLimitStackSize, larger_stack_size));
     }
 
-    cuda_task_queue_execute<<< grid , block , shared_total , stream >>>( scheduler , shared_per_warp );
+    cuda_task_queue_execute<<<grid, block, shared_total, stream>>>(
+        scheduler, shared_per_warp);
 
-    CUDA_SAFE_CALL( cudaGetLastError() );
+    CUDA_SAFE_CALL(cudaGetLastError());
 
-    CUDA_SAFE_CALL( cudaDeviceSynchronize() );
+    CUDA_SAFE_CALL(cudaDeviceSynchronize());
 
-    if ( previous_stack_size < larger_stack_size ) {
-      CUDA_SAFE_CALL( cudaDeviceSetLimit( cudaLimitStackSize , previous_stack_size ) );
+    if (previous_stack_size < larger_stack_size) {
+      CUDA_SAFE_CALL(
+          cudaDeviceSetLimit(cudaLimitStackSize, previous_stack_size));
     }
-
   }
 
-  template< typename TaskType >
-  static
-  void
-  get_function_pointer(
-    typename TaskType::function_type& ptr,
-    typename TaskType::destroy_type& dtor
-  )
-    {
-      using function_type = typename TaskType::function_type;
-      using destroy_type = typename TaskType::destroy_type;
+  template <typename TaskType>
+  static void get_function_pointer(typename TaskType::function_type& ptr,
+                                   typename TaskType::destroy_type& dtor) {
+    using function_type = typename TaskType::function_type;
+    using destroy_type  = typename TaskType::destroy_type;
 
-      void* storage = cuda_internal_scratch_unified(
-        Kokkos::Cuda(),
-        sizeof(function_type) + sizeof(destroy_type)
-      );
-      function_type* ptr_ptr = (function_type*)storage;
-      destroy_type* dtor_ptr = (destroy_type*)((char*)storage + sizeof(function_type));
+    void* storage = cuda_internal_scratch_unified(
+        Kokkos::Cuda(), sizeof(function_type) + sizeof(destroy_type));
+    function_type* ptr_ptr = (function_type*)storage;
+    destroy_type* dtor_ptr =
+        (destroy_type*)((char*)storage + sizeof(function_type));
 
-      CUDA_SAFE_CALL( cudaDeviceSynchronize() );
+    CUDA_SAFE_CALL(cudaDeviceSynchronize());
 
-      set_cuda_task_base_apply_function_pointer<TaskType><<<1,1>>>(ptr_ptr, dtor_ptr);
+    set_cuda_task_base_apply_function_pointer<TaskType>
+        <<<1, 1>>>(ptr_ptr, dtor_ptr);
 
-      CUDA_SAFE_CALL( cudaGetLastError() );
-      CUDA_SAFE_CALL( cudaDeviceSynchronize() );
+    CUDA_SAFE_CALL(cudaGetLastError());
+    CUDA_SAFE_CALL(cudaDeviceSynchronize());
 
-      ptr = *ptr_ptr;
-      dtor = *dtor_ptr;
-
-    }
+    ptr  = *ptr_ptr;
+    dtor = *dtor_ptr;
+  }
 };
 
-extern template class TaskQueue< Kokkos::Cuda, default_tasking_memory_space_for_execution_space_t<Kokkos::Cuda> > ;
+extern template class TaskQueue<
+    Kokkos::Cuda,
+    default_tasking_memory_space_for_execution_space_t<Kokkos::Cuda>>;
 
-}} /* namespace Kokkos::Impl */
+}  // namespace Impl
+}  // namespace Kokkos
 
 //----------------------------------------------------------------------------
 //----------------------------------------------------------------------------
@@ -589,85 +565,82 @@ namespace Impl {
  *  warp synchronizing functions must not be called.
  */
 template <class Scheduler>
-class TaskExec<Kokkos::Cuda, Scheduler>
-{
-private:
-
+class TaskExec<Kokkos::Cuda, Scheduler> {
+ private:
   enum : int { WarpSize = Kokkos::Impl::CudaTraits::WarpSize };
 
-  TaskExec( TaskExec && ) = delete ;
-  TaskExec( TaskExec const & ) = delete ;
-  TaskExec & operator = ( TaskExec && ) = delete ;
-  TaskExec & operator = ( TaskExec const & ) = delete ;
+  TaskExec(TaskExec&&)      = delete;
+  TaskExec(TaskExec const&) = delete;
+  TaskExec& operator=(TaskExec&&) = delete;
+  TaskExec& operator=(TaskExec const&) = delete;
 
-  friend class Kokkos::Impl::TaskQueue< Kokkos::Cuda, default_tasking_memory_space_for_execution_space_t<Kokkos::Cuda> > ;
+  friend class Kokkos::Impl::TaskQueue<
+      Kokkos::Cuda,
+      default_tasking_memory_space_for_execution_space_t<Kokkos::Cuda>>;
   template <class, class>
   friend class Kokkos::Impl::TaskQueueSpecializationConstrained;
   template <class>
   friend class Kokkos::Impl::TaskQueueSpecialization;
 
-  int32_t * m_team_shmem ;
-  const int m_team_size ;
+  int32_t* m_team_shmem;
+  const int m_team_size;
   Scheduler m_scheduler;
 
   // If constructed with arg_team_size == 1 the object
   // can only be used by 0 == threadIdx.y.
   KOKKOS_INLINE_FUNCTION
-  TaskExec(
-    Scheduler const& parent_scheduler,
-    int32_t* arg_team_shmem,
-    int arg_team_size = blockDim.y
-  )
-    : m_team_shmem(arg_team_shmem),
-      m_team_size(arg_team_size),
-      m_scheduler(parent_scheduler.get_team_scheduler(league_rank()))
-  { }
-
-public:
+  TaskExec(Scheduler const& parent_scheduler, int32_t* arg_team_shmem,
+           int arg_team_size = blockDim.y)
+      : m_team_shmem(arg_team_shmem),
+        m_team_size(arg_team_size),
+        m_scheduler(parent_scheduler.get_team_scheduler(league_rank())) {}
 
+ public:
   using thread_team_member = TaskExec;
 
-#if defined( __CUDA_ARCH__ )
-  __device__ int team_rank() const { return threadIdx.y ; }
-  __device__ int team_size() const { return m_team_size ; }
+#if defined(__CUDA_ARCH__)
+  __device__ int team_rank() const { return threadIdx.y; }
+  __device__ int team_size() const { return m_team_size; }
   //__device__ int league_rank() const { return threadIdx.z; }
-  __device__ int league_rank() const { return blockIdx.x * blockDim.z + threadIdx.z; }
+  __device__ int league_rank() const {
+    return blockIdx.x * blockDim.z + threadIdx.z;
+  }
   __device__ int league_size() const { return blockDim.z * gridDim.x; }
 
-  __device__ void team_barrier() const
-    {
-      if ( 1 < m_team_size ) {
-        KOKKOS_IMPL_CUDA_SYNCWARP ;
-      }
+  __device__ void team_barrier() const {
+    if (1 < m_team_size) {
+      KOKKOS_IMPL_CUDA_SYNCWARP;
     }
+  }
 
-  template< class ValueType >
-  __device__ void team_broadcast( ValueType & val , const int thread_id ) const
-    {
-      if ( 1 < m_team_size ) {
-        // WarpSize = blockDim.X * blockDim.y
-        // thread_id < blockDim.y
-        ValueType tmp( val ); // input might not be register variable
-        cuda_shfl( val, tmp, blockDim.x * thread_id, WarpSize );
-      }
+  template <class ValueType>
+  __device__ void team_broadcast(ValueType& val, const int thread_id) const {
+    if (1 < m_team_size) {
+      // WarpSize = blockDim.X * blockDim.y
+      // thread_id < blockDim.y
+      ValueType tmp(val);  // input might not be register variable
+      Impl::in_place_shfl(val, tmp, blockDim.x * thread_id, WarpSize);
     }
+  }
 
 #else
-  __host__ int team_rank() const { return 0 ; }
-  __host__ int team_size() const { return 0 ; }
+  __host__ int team_rank() const { return 0; }
+  __host__ int team_size() const { return 0; }
   __host__ int league_rank() const { return 0; }
   __host__ int league_size() const { return 0; }
   __host__ void team_barrier() const {}
-  template< class ValueType >
-  __host__ void team_broadcast( ValueType & , const int ) const {}
+  template <class ValueType>
+  __host__ void team_broadcast(ValueType&, const int) const {}
 #endif
 
-  KOKKOS_INLINE_FUNCTION Scheduler const& scheduler() const noexcept { return m_scheduler; }
+  KOKKOS_INLINE_FUNCTION Scheduler const& scheduler() const noexcept {
+    return m_scheduler;
+  }
   KOKKOS_INLINE_FUNCTION Scheduler& scheduler() noexcept { return m_scheduler; }
-
 };
 
-}} /* namespace Kokkos::Impl */
+}  // namespace Impl
+}  // namespace Kokkos
 
 //----------------------------------------------------------------------------
 //----------------------------------------------------------------------------
@@ -675,144 +648,137 @@ public:
 namespace Kokkos {
 namespace Impl {
 
-template<typename iType, typename Scheduler>
-struct TeamThreadRangeBoundariesStruct<iType, TaskExec<Kokkos::Cuda, Scheduler>>
-{
-  using index_type = iType;
+template <typename iType, typename Scheduler>
+struct TeamThreadRangeBoundariesStruct<iType,
+                                       TaskExec<Kokkos::Cuda, Scheduler>> {
+  using index_type  = iType;
   using member_type = TaskExec<Kokkos::Cuda, Scheduler>;
 
-  const iType start ;
-  const iType end ;
-  const iType increment ;
+  const iType start;
+  const iType end;
+  const iType increment;
   member_type const& thread;
 
-#if defined( __CUDA_ARCH__ )
+#if defined(__CUDA_ARCH__)
 
-  __device__ inline
-  TeamThreadRangeBoundariesStruct
-    ( member_type const& arg_thread, const iType& arg_count)
-    : start( threadIdx.y )
-    , end(arg_count)
-    , increment( blockDim.y )
-    , thread(arg_thread)
-    {}
+  __device__ inline TeamThreadRangeBoundariesStruct(
+      member_type const& arg_thread, const iType& arg_count)
+      : start(threadIdx.y),
+        end(arg_count),
+        increment(blockDim.y),
+        thread(arg_thread) {}
 
-  __device__ inline
-  TeamThreadRangeBoundariesStruct
-    ( member_type const& arg_thread
-    , const iType & arg_start
-    , const iType & arg_end
-    )
-    : start( arg_start + threadIdx.y )
-    , end(   arg_end)
-    , increment( blockDim.y )
-    , thread( arg_thread )
-    {}
+  __device__ inline TeamThreadRangeBoundariesStruct(
+      member_type const& arg_thread, const iType& arg_start,
+      const iType& arg_end)
+      : start(arg_start + threadIdx.y),
+        end(arg_end),
+        increment(blockDim.y),
+        thread(arg_thread) {}
 
 #else
 
-  TeamThreadRangeBoundariesStruct
-    ( member_type const& arg_thread, const iType& arg_count);
+  TeamThreadRangeBoundariesStruct(member_type const& arg_thread,
+                                  const iType& arg_count);
 
-  TeamThreadRangeBoundariesStruct
-    ( member_type const& arg_thread
-    , const iType & arg_start
-    , const iType & arg_end
-    );
+  TeamThreadRangeBoundariesStruct(member_type const& arg_thread,
+                                  const iType& arg_start, const iType& arg_end);
 
 #endif
-
 };
 
 //----------------------------------------------------------------------------
 
-template<typename iType, typename Scheduler>
-struct ThreadVectorRangeBoundariesStruct<iType, TaskExec< Kokkos::Cuda, Scheduler > >
-{
-  using index_type = iType;
+template <typename iType, typename Scheduler>
+struct ThreadVectorRangeBoundariesStruct<iType,
+                                         TaskExec<Kokkos::Cuda, Scheduler>> {
+  using index_type  = iType;
   using member_type = TaskExec<Kokkos::Cuda, Scheduler>;
 
-  const index_type start ;
-  const index_type end ;
-  const index_type increment ;
+  const index_type start;
+  const index_type end;
+  const index_type increment;
   const member_type& thread;
 
-#if defined( __CUDA_ARCH__ )
+#if defined(__CUDA_ARCH__)
 
-  __device__ inline
-  ThreadVectorRangeBoundariesStruct
-    ( member_type const& arg_thread, const index_type& arg_count )
-    : start( threadIdx.x )
-    , end(arg_count)
-    , increment( blockDim.x )
-    , thread(arg_thread)
-    {}
+  __device__ inline ThreadVectorRangeBoundariesStruct(
+      member_type const& arg_thread, const index_type& arg_count)
+      : start(threadIdx.x),
+        end(arg_count),
+        increment(blockDim.x),
+        thread(arg_thread) {}
 
-  __device__ inline
-  ThreadVectorRangeBoundariesStruct
-    ( member_type const& arg_thread, const index_type& arg_begin, const index_type& arg_end )
-    : start( arg_begin + threadIdx.x )
-    , end(arg_end)
-    , increment( blockDim.x )
-    , thread(arg_thread)
-    {}
+  __device__ inline ThreadVectorRangeBoundariesStruct(
+      member_type const& arg_thread, const index_type& arg_begin,
+      const index_type& arg_end)
+      : start(arg_begin + threadIdx.x),
+        end(arg_end),
+        increment(blockDim.x),
+        thread(arg_thread) {}
 
 #else
 
-  ThreadVectorRangeBoundariesStruct
-    ( member_type const& arg_thread, const index_type& arg_count );
+  ThreadVectorRangeBoundariesStruct(member_type const& arg_thread,
+                                    const index_type& arg_count);
 
-  ThreadVectorRangeBoundariesStruct
-    ( member_type const& arg_thread, const index_type& arg_begin, const index_type& arg_end);
+  ThreadVectorRangeBoundariesStruct(member_type const& arg_thread,
+                                    const index_type& arg_begin,
+                                    const index_type& arg_end);
 
 #endif
-
 };
 
-}} /* namespace Kokkos::Impl */
+}  // namespace Impl
+}  // namespace Kokkos
 
 //----------------------------------------------------------------------------
 
 namespace Kokkos {
 
-//template<typename iType>
-//KOKKOS_INLINE_FUNCTION
-//Impl::TeamThreadRangeBoundariesStruct< iType, Impl::TaskExec< Kokkos::Cuda > >
-//TeamThreadRange( const Impl::TaskExec< Kokkos::Cuda > & thread, const iType & count )
+// template<typename iType>
+// KOKKOS_INLINE_FUNCTION
+// Impl::TeamThreadRangeBoundariesStruct< iType, Impl::TaskExec< Kokkos::Cuda >
+// > TeamThreadRange( const Impl::TaskExec< Kokkos::Cuda > & thread, const iType
+// & count )
 //{
-//  return Impl::TeamThreadRangeBoundariesStruct< iType, Impl::TaskExec< Kokkos::Cuda > >( thread, count );
+//  return Impl::TeamThreadRangeBoundariesStruct< iType, Impl::TaskExec<
+//  Kokkos::Cuda > >( thread, count );
 //}
 //
-//template<typename iType1, typename iType2>
-//KOKKOS_INLINE_FUNCTION
-//Impl::TeamThreadRangeBoundariesStruct
+// template<typename iType1, typename iType2>
+// KOKKOS_INLINE_FUNCTION
+// Impl::TeamThreadRangeBoundariesStruct
 //  < typename std::common_type<iType1,iType2>::type
 //  , Impl::TaskExec< Kokkos::Cuda > >
-//TeamThreadRange( const Impl::TaskExec< Kokkos::Cuda > & thread
+// TeamThreadRange( const Impl::TaskExec< Kokkos::Cuda > & thread
 //               , const iType1 & begin, const iType2 & end )
 //{
 //  typedef typename std::common_type< iType1, iType2 >::type iType;
-//  return Impl::TeamThreadRangeBoundariesStruct< iType, Impl::TaskExec< Kokkos::Cuda > >(
+//  return Impl::TeamThreadRangeBoundariesStruct< iType, Impl::TaskExec<
+//  Kokkos::Cuda > >(
 //           thread, iType(begin), iType(end) );
 //}
 //
-//template<typename iType>
-//KOKKOS_INLINE_FUNCTION
-//Impl::ThreadVectorRangeBoundariesStruct<iType,Impl::TaskExec< Kokkos::Cuda > >
-//ThreadVectorRange( const Impl::TaskExec< Kokkos::Cuda > & thread
+// template<typename iType>
+// KOKKOS_INLINE_FUNCTION
+// Impl::ThreadVectorRangeBoundariesStruct<iType,Impl::TaskExec< Kokkos::Cuda >
+// > ThreadVectorRange( const Impl::TaskExec< Kokkos::Cuda > & thread
 //                 , const iType & count )
 //{
-//  return Impl::ThreadVectorRangeBoundariesStruct<iType,Impl::TaskExec< Kokkos::Cuda > >(thread,count);
+//  return Impl::ThreadVectorRangeBoundariesStruct<iType,Impl::TaskExec<
+//  Kokkos::Cuda > >(thread,count);
 //}
 //
-//template<typename iType>
-//KOKKOS_INLINE_FUNCTION
-//Impl::ThreadVectorRangeBoundariesStruct<iType,Impl::TaskExec< Kokkos::Cuda > >
-//ThreadVectorRange( const Impl::TaskExec< Kokkos::Cuda > & thread
+// template<typename iType>
+// KOKKOS_INLINE_FUNCTION
+// Impl::ThreadVectorRangeBoundariesStruct<iType,Impl::TaskExec< Kokkos::Cuda >
+// > ThreadVectorRange( const Impl::TaskExec< Kokkos::Cuda > & thread
 //                 , const iType & arg_begin
 //                 , const iType & arg_end )
 //{
-//  return Impl::ThreadVectorRangeBoundariesStruct<iType,Impl::TaskExec< Kokkos::Cuda > >(thread,arg_begin,arg_end);
+//  return Impl::ThreadVectorRangeBoundariesStruct<iType,Impl::TaskExec<
+//  Kokkos::Cuda > >(thread,arg_begin,arg_end);
 //}
 
 // KOKKOS_INLINE_FUNCTION
@@ -829,78 +795,70 @@ namespace Kokkos {
 //   return Impl::VectorSingleStruct<Impl::TaskExec< Kokkos::Cuda > >(thread);
 // }
 
-/** \brief  Inter-thread parallel_for. Executes lambda(iType i) for each i=0..N-1.
+/** \brief  Inter-thread parallel_for. Executes lambda(iType i) for each
+ * i=0..N-1.
  *
  * The range i=0..N-1 is mapped to all threads of the the calling thread team.
  * This functionality requires C++11 support.
-*/
-template<typename iType, class Lambda, class Scheduler>
-KOKKOS_INLINE_FUNCTION
-void parallel_for
-  ( const Impl::TeamThreadRangeBoundariesStruct<iType,Impl:: TaskExec< Kokkos::Cuda, Scheduler > >& loop_boundaries
-  , const Lambda& lambda
-  )
-{
-  for( iType i = loop_boundaries.start; i < loop_boundaries.end; i+=loop_boundaries.increment) {
+ */
+template <typename iType, class Lambda, class Scheduler>
+KOKKOS_INLINE_FUNCTION void parallel_for(
+    const Impl::TeamThreadRangeBoundariesStruct<
+        iType, Impl::TaskExec<Kokkos::Cuda, Scheduler>>& loop_boundaries,
+    const Lambda& lambda) {
+  for (iType i = loop_boundaries.start; i < loop_boundaries.end;
+       i += loop_boundaries.increment) {
     lambda(i);
   }
 }
 
-template< typename iType, class Lambda, class Scheduler >
-KOKKOS_INLINE_FUNCTION
-void parallel_for
-  (const Impl::ThreadVectorRangeBoundariesStruct<iType,Impl::TaskExec< Kokkos::Cuda, Scheduler > >& loop_boundaries,
-   const Lambda & lambda) {
-  for( iType i = loop_boundaries.start; i < loop_boundaries.end; i+=loop_boundaries.increment) {
+template <typename iType, class Lambda, class Scheduler>
+KOKKOS_INLINE_FUNCTION void parallel_for(
+    const Impl::ThreadVectorRangeBoundariesStruct<
+        iType, Impl::TaskExec<Kokkos::Cuda, Scheduler>>& loop_boundaries,
+    const Lambda& lambda) {
+  for (iType i = loop_boundaries.start; i < loop_boundaries.end;
+       i += loop_boundaries.increment) {
     lambda(i);
   }
 }
 
 // reduce across corresponding lanes between team members within warp
 // assume stride*team_size == warp_size
-template< typename ValueType, class JoinType >
-KOKKOS_INLINE_FUNCTION
-void strided_shfl_warp_reduction
-  (const JoinType& join,
-   ValueType& val,
-   int team_size,
-   int stride)
-{
-  for (int lane_delta=(team_size*stride)>>1; lane_delta>=stride; lane_delta>>=1) {
-    join(val, Kokkos::shfl_down(val, lane_delta, team_size*stride));
+template <typename ValueType, class JoinType>
+KOKKOS_INLINE_FUNCTION void strided_shfl_warp_reduction(const JoinType& join,
+                                                        ValueType& val,
+                                                        int team_size,
+                                                        int stride) {
+  for (int lane_delta = (team_size * stride) >> 1; lane_delta >= stride;
+       lane_delta >>= 1) {
+    join(val, Kokkos::shfl_down(val, lane_delta, team_size * stride));
   }
 }
 
 // multiple within-warp non-strided reductions
-template< typename ValueType, class JoinType >
-KOKKOS_INLINE_FUNCTION
-void multi_shfl_warp_reduction
-  (const JoinType& join,
-   ValueType& val,
-   int vec_length)
-{
-  for (int lane_delta=vec_length>>1; lane_delta; lane_delta>>=1) {
+template <typename ValueType, class JoinType>
+KOKKOS_INLINE_FUNCTION void multi_shfl_warp_reduction(const JoinType& join,
+                                                      ValueType& val,
+                                                      int vec_length) {
+  for (int lane_delta = vec_length >> 1; lane_delta; lane_delta >>= 1) {
     join(val, Kokkos::shfl_down(val, lane_delta, vec_length));
   }
 }
 
 // broadcast within warp
-template< class ValueType >
-KOKKOS_INLINE_FUNCTION
-ValueType shfl_warp_broadcast
-  (ValueType& val,
-   int src_lane,
-   int width)
-{
-  if ( 1 < width ) {
+template <class ValueType>
+KOKKOS_INLINE_FUNCTION ValueType shfl_warp_broadcast(ValueType& val,
+                                                     int src_lane, int width) {
+  if (1 < width) {
     return Kokkos::shfl(val, src_lane, width);
-  }
-  else {
-    return val ;
+  } else {
+    return val;
   }
 }
 
-/*// all-reduce across corresponding vector lanes between team members within warp
+/*// all-reduce across corresponding vector lanes between team members within
+warp
 // assume vec_length*team_size == warp_size
 // blockDim.x == vec_length == stride
 // blockDim.y == team_size
@@ -909,14 +867,13 @@ ValueType shfl_warp_broadcast
 template< typename iType, class Lambda, typename ValueType, class JoinType >
 KOKKOS_INLINE_FUNCTION
 void parallel_reduce
-  (const Impl::TeamThreadRangeBoundariesStruct<iType,Impl::TaskExec< Kokkos::Cuda > >& loop_boundaries,
-   const Lambda & lambda,
-   const JoinType& join,
+  (const Impl::TeamThreadRangeBoundariesStruct<iType,Impl::TaskExec<
+Kokkos::Cuda > >& loop_boundaries, const Lambda & lambda, const JoinType& join,
    ValueType& initialized_result) {
 
   ValueType result = initialized_result;
-  for( iType i = loop_boundaries.start; i < loop_boundaries.end; i+=loop_boundaries.increment) {
-    lambda(i,result);
+  for( iType i = loop_boundaries.start; i < loop_boundaries.end;
+i+=loop_boundaries.increment) { lambda(i,result);
   }
   initialized_result = result;
 
@@ -925,7 +882,8 @@ void parallel_reduce
                           initialized_result,
                           loop_boundaries.thread.team_size(),
                           blockDim.x);
-  initialized_result = shfl_warp_broadcast<ValueType>( initialized_result, threadIdx.x, Impl::CudaTraits::WarpSize );
+  initialized_result = shfl_warp_broadcast<ValueType>( initialized_result,
+threadIdx.x, Impl::CudaTraits::WarpSize );
 }*/
 
 // all-reduce across corresponding vector lanes between team members within warp
@@ -935,63 +893,55 @@ void parallel_reduce
 // blockDim.y == team_size
 // threadIdx.x == position in vec
 // threadIdx.y == member number
-template< typename iType, class Lambda, typename ValueType, class Scheduler >
-KOKKOS_INLINE_FUNCTION
-void parallel_reduce
-  (const Impl::TeamThreadRangeBoundariesStruct<iType,Impl::TaskExec< Kokkos::Cuda, Scheduler > >& loop_boundaries,
-   const Lambda & lambda,
-   ValueType& initialized_result) {
-
-  //TODO @internal_documentation what is the point of creating this temporary?
+template <typename iType, class Lambda, typename ValueType, class Scheduler>
+KOKKOS_INLINE_FUNCTION void parallel_reduce(
+    const Impl::TeamThreadRangeBoundariesStruct<
+        iType, Impl::TaskExec<Kokkos::Cuda, Scheduler>>& loop_boundaries,
+    const Lambda& lambda, ValueType& initialized_result) {
+  // TODO @internal_documentation what is the point of creating this temporary?
   ValueType result = initialized_result;
-  for( iType i = loop_boundaries.start; i < loop_boundaries.end; i+=loop_boundaries.increment) {
-    lambda(i,result);
+  for (iType i = loop_boundaries.start; i < loop_boundaries.end;
+       i += loop_boundaries.increment) {
+    lambda(i, result);
   }
   initialized_result = result;
 
-  if ( 1 < loop_boundaries.thread.team_size() ) {
-
+  if (1 < loop_boundaries.thread.team_size()) {
     strided_shfl_warp_reduction(
-      [&] (ValueType& val1, const ValueType& val2) { val1 += val2; },
-      initialized_result,
-      loop_boundaries.thread.team_size(),
-      blockDim.x);
+        [&](ValueType& val1, const ValueType& val2) { val1 += val2; },
+        initialized_result, loop_boundaries.thread.team_size(), blockDim.x);
 
-    initialized_result =
-      shfl_warp_broadcast<ValueType>(
-        initialized_result, threadIdx.x, Impl::CudaTraits::WarpSize );
+    initialized_result = shfl_warp_broadcast<ValueType>(
+        initialized_result, threadIdx.x, Impl::CudaTraits::WarpSize);
   }
 }
 
-template< typename iType, class Lambda, typename ReducerType, class Scheduler >
-KOKKOS_INLINE_FUNCTION
-void parallel_reduce
-  (const Impl::TeamThreadRangeBoundariesStruct<iType,Impl::TaskExec< Kokkos::Cuda, Scheduler > >& loop_boundaries,
-   const Lambda & lambda,
-   const ReducerType& reducer) {
-
+template <typename iType, class Lambda, typename ReducerType, class Scheduler>
+KOKKOS_INLINE_FUNCTION void parallel_reduce(
+    const Impl::TeamThreadRangeBoundariesStruct<
+        iType, Impl::TaskExec<Kokkos::Cuda, Scheduler>>& loop_boundaries,
+    const Lambda& lambda, const ReducerType& reducer) {
   typedef typename ReducerType::value_type ValueType;
-  //TODO @internal_documentation what is the point of creating this temporary?
+  // TODO @internal_documentation what is the point of creating this temporary?
   ValueType result = ValueType();
   reducer.init(result);
 
-  for( iType i = loop_boundaries.start; i < loop_boundaries.end; i+=loop_boundaries.increment) {
-    lambda(i,result);
+  for (iType i = loop_boundaries.start; i < loop_boundaries.end;
+       i += loop_boundaries.increment) {
+    lambda(i, result);
   }
 
-  if ( 1 < loop_boundaries.thread.team_size() ) {
+  if (1 < loop_boundaries.thread.team_size()) {
     strided_shfl_warp_reduction(
-      [&] (ValueType& val1, const ValueType& val2) { reducer.join(val1,val2); },
-      result,
-      loop_boundaries.thread.team_size(),
-      blockDim.x);
+        [&](ValueType& val1, const ValueType& val2) {
+          reducer.join(val1, val2);
+        },
+        result, loop_boundaries.thread.team_size(), blockDim.x);
 
-    reducer.reference() =
-      shfl_warp_broadcast<ValueType>(
-        result, threadIdx.x, Impl::CudaTraits::WarpSize );
-  }
-  else {
-    reducer.reference() = result ;
+    reducer.reference() = shfl_warp_broadcast<ValueType>(
+        result, threadIdx.x, Impl::CudaTraits::WarpSize);
+  } else {
+    reducer.reference() = result;
   }
 }
 // all-reduce within team members within warp
@@ -1003,19 +953,19 @@ void parallel_reduce
 /*template< typename iType, class Lambda, typename ValueType, class JoinType >
 KOKKOS_INLINE_FUNCTION
 void parallel_reduce
-  (const Impl::ThreadVectorRangeBoundariesStruct<iType,Impl::TaskExec< Kokkos::Cuda > >& loop_boundaries,
-   const Lambda & lambda,
-   const JoinType& join,
+  (const Impl::ThreadVectorRangeBoundariesStruct<iType,Impl::TaskExec<
+Kokkos::Cuda > >& loop_boundaries, const Lambda & lambda, const JoinType& join,
    ValueType& initialized_result) {
 
   ValueType result = initialized_result;
-  for( iType i = loop_boundaries.start; i < loop_boundaries.end; i+=loop_boundaries.increment) {
-    lambda(i,result);
+  for( iType i = loop_boundaries.start; i < loop_boundaries.end;
+i+=loop_boundaries.increment) { lambda(i,result);
   }
   initialized_result = result;
 
-  multi_shfl_warp_reduction<ValueType, JoinType>(join, initialized_result, blockDim.x);
-  initialized_result = shfl_warp_broadcast<ValueType>( initialized_result, 0, blockDim.x );
+  multi_shfl_warp_reduction<ValueType, JoinType>(join, initialized_result,
+blockDim.x); initialized_result = shfl_warp_broadcast<ValueType>(
+initialized_result, 0, blockDim.x );
 }*/
 
 // all-reduce within team members within warp
@@ -1025,60 +975,56 @@ void parallel_reduce
 // blockDim.y == team_size
 // threadIdx.x == position in vec
 // threadIdx.y == member number
-template< typename iType, class Lambda, typename ValueType, class Scheduler >
-KOKKOS_INLINE_FUNCTION
-void parallel_reduce
-  (const Impl::ThreadVectorRangeBoundariesStruct<iType,Impl::TaskExec< Kokkos::Cuda, Scheduler > >& loop_boundaries,
-   const Lambda & lambda,
-   ValueType& initialized_result) {
-
+template <typename iType, class Lambda, typename ValueType, class Scheduler>
+KOKKOS_INLINE_FUNCTION void parallel_reduce(
+    const Impl::ThreadVectorRangeBoundariesStruct<
+        iType, Impl::TaskExec<Kokkos::Cuda, Scheduler>>& loop_boundaries,
+    const Lambda& lambda, ValueType& initialized_result) {
   ValueType result = initialized_result;
 
-  for( iType i = loop_boundaries.start; i < loop_boundaries.end; i+=loop_boundaries.increment) {
-    lambda(i,result);
+  for (iType i = loop_boundaries.start; i < loop_boundaries.end;
+       i += loop_boundaries.increment) {
+    lambda(i, result);
   }
 
   initialized_result = result;
 
-  if ( 1 < loop_boundaries.thread.team_size() ) {
-    //initialized_result = multi_shfl_warp_reduction(
+  if (1 < loop_boundaries.thread.team_size()) {
+    // initialized_result = multi_shfl_warp_reduction(
     multi_shfl_warp_reduction(
-      [&] (ValueType& val1, const ValueType& val2) { val1 += val2; },
-      initialized_result,
-      blockDim.x);
+        [&](ValueType& val1, const ValueType& val2) { val1 += val2; },
+        initialized_result, blockDim.x);
 
     initialized_result =
-      shfl_warp_broadcast<ValueType>( initialized_result, 0, blockDim.x );
+        shfl_warp_broadcast<ValueType>(initialized_result, 0, blockDim.x);
   }
 }
 
-template< typename iType, class Lambda, typename ReducerType, class Scheduler >
-KOKKOS_INLINE_FUNCTION
-void parallel_reduce
-  (const Impl::ThreadVectorRangeBoundariesStruct<iType,Impl::TaskExec< Kokkos::Cuda, Scheduler > >& loop_boundaries,
-   const Lambda & lambda,
-   const ReducerType& reducer) {
-
+template <typename iType, class Lambda, typename ReducerType, class Scheduler>
+KOKKOS_INLINE_FUNCTION void parallel_reduce(
+    const Impl::ThreadVectorRangeBoundariesStruct<
+        iType, Impl::TaskExec<Kokkos::Cuda, Scheduler>>& loop_boundaries,
+    const Lambda& lambda, const ReducerType& reducer) {
   typedef typename ReducerType::value_type ValueType;
 
   ValueType result = ValueType();
   reducer.init(result);
 
-  for( iType i = loop_boundaries.start; i < loop_boundaries.end; i+=loop_boundaries.increment) {
-    lambda(i,result);
+  for (iType i = loop_boundaries.start; i < loop_boundaries.end;
+       i += loop_boundaries.increment) {
+    lambda(i, result);
   }
 
-  if ( 1 < loop_boundaries.thread.team_size() ) {
+  if (1 < loop_boundaries.thread.team_size()) {
     multi_shfl_warp_reduction(
-      [&] (ValueType& val1, const ValueType& val2) { reducer.join(val1,val2); },
-      result,
-      blockDim.x);
+        [&](ValueType& val1, const ValueType& val2) {
+          reducer.join(val1, val2);
+        },
+        result, blockDim.x);
 
-    reducer.reference() =
-      shfl_warp_broadcast<ValueType>( result, 0, blockDim.x );
-  }
-  else {
-    reducer.reference() = result ;
+    reducer.reference() = shfl_warp_broadcast<ValueType>(result, 0, blockDim.x);
+  } else {
+    reducer.reference() = result;
   }
 }
 // scan across corresponding vector lanes between team members within warp
@@ -1087,61 +1033,61 @@ void parallel_reduce
 // blockDim.y == team_size
 // threadIdx.x == position in vec
 // threadIdx.y == member number
-template< typename iType, class Closure, class Scheduler >
-KOKKOS_INLINE_FUNCTION
-void parallel_scan
-  (const Impl::TeamThreadRangeBoundariesStruct<iType,Impl::TaskExec< Kokkos::Cuda, Scheduler > >& loop_boundaries,
-   const Closure & closure )
-{
+template <typename iType, class Closure, class Scheduler>
+KOKKOS_INLINE_FUNCTION void parallel_scan(
+    const Impl::TeamThreadRangeBoundariesStruct<
+        iType, Impl::TaskExec<Kokkos::Cuda, Scheduler>>& loop_boundaries,
+    const Closure& closure) {
   // Extract value_type from closure
 
-  using value_type =
-    typename Kokkos::Impl::FunctorAnalysis
-      < Kokkos::Impl::FunctorPatternInterface::SCAN
-      , void
-      , Closure >::value_type ;
-
-  if ( 1 < loop_boundaries.thread.team_size() ) {
+  using value_type = typename Kokkos::Impl::FunctorAnalysis<
+      Kokkos::Impl::FunctorPatternInterface::SCAN, void, Closure>::value_type;
 
+  if (1 < loop_boundaries.thread.team_size()) {
     // make sure all threads perform all loop iterations
-    const iType bound = loop_boundaries.end + loop_boundaries.start ;
-    const int lane = threadIdx.y * blockDim.x ;
+    const iType bound = loop_boundaries.end + loop_boundaries.start;
+    const int lane    = threadIdx.y * blockDim.x;
 
-    value_type accum = 0 ;
+    value_type accum = 0;
     value_type val, y, local_total;
 
-    for( iType i = loop_boundaries.start; i < bound; i+=loop_boundaries.increment) {
+    for (iType i = loop_boundaries.start; i < bound;
+         i += loop_boundaries.increment) {
       val = 0;
-      if ( i < loop_boundaries.end ) closure(i,val,false);
+      if (i < loop_boundaries.end) closure(i, val, false);
 
       // intra-blockDim.y exclusive scan on 'val'
       // accum = accumulated, sum in total for this iteration
 
       // INCLUSIVE scan
-      for( int offset = blockDim.x ; offset < Impl::CudaTraits::WarpSize ; offset <<= 1 ) {
+      for (int offset = blockDim.x; offset < Impl::CudaTraits::WarpSize;
+           offset <<= 1) {
         y = Kokkos::shfl_up(val, offset, Impl::CudaTraits::WarpSize);
-        if(lane >= offset) { val += y; }
+        if (lane >= offset) {
+          val += y;
+        }
       }
 
       // pass accum to all threads
       local_total = shfl_warp_broadcast<value_type>(
-         val,
-         threadIdx.x+Impl::CudaTraits::WarpSize-blockDim.x,
-         Impl::CudaTraits::WarpSize);
+          val, threadIdx.x + Impl::CudaTraits::WarpSize - blockDim.x,
+          Impl::CudaTraits::WarpSize);
 
       // make EXCLUSIVE scan by shifting values over one
       val = Kokkos::shfl_up(val, blockDim.x, Impl::CudaTraits::WarpSize);
-      if ( threadIdx.y == 0 ) { val = 0 ; }
+      if (threadIdx.y == 0) {
+        val = 0;
+      }
 
       val += accum;
-      if ( i < loop_boundaries.end ) closure(i,val,true);
+      if (i < loop_boundaries.end) closure(i, val, true);
       accum += local_total;
     }
-  }
-  else {
-    value_type accum = 0 ;
-    for( iType i = loop_boundaries.start; i < loop_boundaries.end; i+=loop_boundaries.increment) {
-      closure(i,accum,true);
+  } else {
+    value_type accum = 0;
+    for (iType i = loop_boundaries.start; i < loop_boundaries.end;
+         i += loop_boundaries.increment) {
+      closure(i, accum, true);
     }
   }
 }
@@ -1152,57 +1098,58 @@ void parallel_scan
 // blockDim.y == team_size
 // threadIdx.x == position in vec
 // threadIdx.y == member number
-template< typename iType, class Closure, class Scheduler >
-KOKKOS_INLINE_FUNCTION
-void parallel_scan
-  (const Impl::ThreadVectorRangeBoundariesStruct<iType,Impl::TaskExec< Kokkos::Cuda, Scheduler > >& loop_boundaries,
-   const Closure & closure )
-{
+template <typename iType, class Closure, class Scheduler>
+KOKKOS_INLINE_FUNCTION void parallel_scan(
+    const Impl::ThreadVectorRangeBoundariesStruct<
+        iType, Impl::TaskExec<Kokkos::Cuda, Scheduler>>& loop_boundaries,
+    const Closure& closure) {
   // Extract value_type from closure
 
-  using value_type =
-    typename Kokkos::Impl::FunctorAnalysis
-      < Kokkos::Impl::FunctorPatternInterface::SCAN
-      , void
-      , Closure >::value_type ;
-
-  if ( 1 < loop_boundaries.thread.team_size() ) {
+  using value_type = typename Kokkos::Impl::FunctorAnalysis<
+      Kokkos::Impl::FunctorPatternInterface::SCAN, void, Closure>::value_type;
 
+  if (1 < loop_boundaries.thread.team_size()) {
     // make sure all threads perform all loop iterations
-    const iType bound = loop_boundaries.end + loop_boundaries.start ;
+    const iType bound = loop_boundaries.end + loop_boundaries.start;
 
-    value_type accum = 0 ;
+    value_type accum = 0;
     value_type val, y, local_total;
 
-    for( iType i = loop_boundaries.start; i < bound; i+=loop_boundaries.increment) {
+    for (iType i = loop_boundaries.start; i < bound;
+         i += loop_boundaries.increment) {
       val = 0;
-      if ( i < loop_boundaries.end ) closure(i,val,false);
+      if (i < loop_boundaries.end) closure(i, val, false);
 
       // intra-blockDim.x exclusive scan on 'val'
       // accum = accumulated, sum in total for this iteration
 
       // INCLUSIVE scan
-      for( int offset = 1 ; offset < blockDim.x ; offset <<= 1 ) {
+      for (int offset = 1; offset < blockDim.x; offset <<= 1) {
         y = Kokkos::shfl_up(val, offset, blockDim.x);
-        if(threadIdx.x >= offset) { val += y; }
+        if (threadIdx.x >= offset) {
+          val += y;
+        }
       }
 
       // pass accum to all threads
-      local_total = shfl_warp_broadcast<value_type>(val, blockDim.x-1, blockDim.x);
+      local_total =
+          shfl_warp_broadcast<value_type>(val, blockDim.x - 1, blockDim.x);
 
       // make EXCLUSIVE scan by shifting values over one
       val = Kokkos::shfl_up(val, 1, blockDim.x);
-      if ( threadIdx.x == 0 ) { val = 0 ; }
+      if (threadIdx.x == 0) {
+        val = 0;
+      }
 
       val += accum;
-      if ( i < loop_boundaries.end ) closure(i,val,true);
+      if (i < loop_boundaries.end) closure(i, val, true);
       accum += local_total;
     }
-  }
-  else {
-    value_type accum = 0 ;
-    for( iType i = loop_boundaries.start; i < loop_boundaries.end; i+=loop_boundaries.increment) {
-      closure(i,accum,true);
+  } else {
+    value_type accum = 0;
+    for (iType i = loop_boundaries.start; i < loop_boundaries.end;
+         i += loop_boundaries.increment) {
+      closure(i, accum, true);
     }
   }
 }
@@ -1211,49 +1158,53 @@ void parallel_scan
 
 namespace Kokkos {
 
-  template<class FunctorType, class Scheduler>
-  KOKKOS_INLINE_FUNCTION
-  void single(const Impl::VectorSingleStruct<Impl::TaskExec< Kokkos::Cuda, Scheduler > >& , const FunctorType& lambda) {
+template <class FunctorType, class Scheduler>
+KOKKOS_INLINE_FUNCTION void single(
+    const Impl::VectorSingleStruct<Impl::TaskExec<Kokkos::Cuda, Scheduler>>&,
+    const FunctorType& lambda) {
 #ifdef __CUDA_ARCH__
-    if(threadIdx.x == 0) lambda();
+  if (threadIdx.x == 0) lambda();
 #endif
-  }
-  
-  template<class FunctorType, class Scheduler>
-  KOKKOS_INLINE_FUNCTION
-  void single(const Impl::ThreadSingleStruct<Impl::TaskExec< Kokkos::Cuda, Scheduler > >& , const FunctorType& lambda) {
-#ifdef __CUDA_ARCH__
-    if(threadIdx.x == 0 && threadIdx.y == 0) lambda();
-#endif
-  }
-  
-  template<class FunctorType, class ValueType, class Scheduler>
-  KOKKOS_INLINE_FUNCTION
-  void single(const Impl::VectorSingleStruct<Impl::TaskExec< Kokkos::Cuda, Scheduler > >& s , const FunctorType& lambda, ValueType& val) {
-#ifdef __CUDA_ARCH__
-    if(threadIdx.x == 0) lambda(val);
-    if ( 1 < s.team_member.team_size() ) {
-      val = shfl(val,0,blockDim.x);
-    }
-#endif
-  }
-  
-  template<class FunctorType, class ValueType, class Scheduler>
-  KOKKOS_INLINE_FUNCTION
-  void single(const Impl::ThreadSingleStruct<Impl::TaskExec< Kokkos::Cuda, Scheduler > >& single_struct, const FunctorType& lambda, ValueType& val) {
-#ifdef __CUDA_ARCH__
-    if(threadIdx.x == 0 && threadIdx.y == 0) {
-      lambda(val);
-    }
-    single_struct.team_member.team_broadcast(val,0);
-#endif
-  }
+}
 
-} // namespace Kokkos
+template <class FunctorType, class Scheduler>
+KOKKOS_INLINE_FUNCTION void single(
+    const Impl::ThreadSingleStruct<Impl::TaskExec<Kokkos::Cuda, Scheduler>>&,
+    const FunctorType& lambda) {
+#ifdef __CUDA_ARCH__
+  if (threadIdx.x == 0 && threadIdx.y == 0) lambda();
+#endif
+}
+
+template <class FunctorType, class ValueType, class Scheduler>
+KOKKOS_INLINE_FUNCTION void single(
+    const Impl::VectorSingleStruct<Impl::TaskExec<Kokkos::Cuda, Scheduler>>& s,
+    const FunctorType& lambda, ValueType& val) {
+#ifdef __CUDA_ARCH__
+  if (threadIdx.x == 0) lambda(val);
+  if (1 < s.team_member.team_size()) {
+    val = shfl(val, 0, blockDim.x);
+  }
+#endif
+}
+
+template <class FunctorType, class ValueType, class Scheduler>
+KOKKOS_INLINE_FUNCTION void single(
+    const Impl::ThreadSingleStruct<Impl::TaskExec<Kokkos::Cuda, Scheduler>>&
+        single_struct,
+    const FunctorType& lambda, ValueType& val) {
+#ifdef __CUDA_ARCH__
+  if (threadIdx.x == 0 && threadIdx.y == 0) {
+    lambda(val);
+  }
+  single_struct.team_member.team_broadcast(val, 0);
+#endif
+}
+
+}  // namespace Kokkos
 
 //----------------------------------------------------------------------------
 //----------------------------------------------------------------------------
 
 #endif /* #if defined( KOKKOS_ENABLE_TASKDAG ) */
 #endif /* #ifndef KOKKOS_IMPL_CUDA_TASK_HPP */
-
diff --git a/lib/kokkos/core/src/Cuda/Kokkos_Cuda_Team.hpp b/lib/kokkos/core/src/Cuda/Kokkos_Cuda_Team.hpp
index 587ad6001d..ac9ab9660c 100644
--- a/lib/kokkos/core/src/Cuda/Kokkos_Cuda_Team.hpp
+++ b/lib/kokkos/core/src/Cuda/Kokkos_Cuda_Team.hpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -51,7 +52,7 @@
 #include <Kokkos_Macros.hpp>
 
 /* only compile this file if CUDA is enabled for Kokkos */
-#if defined( __CUDACC__ ) && defined( KOKKOS_ENABLE_CUDA )
+#if defined(__CUDACC__) && defined(KOKKOS_ENABLE_CUDA)
 
 #include <utility>
 #include <Kokkos_Parallel.hpp>
@@ -72,14 +73,15 @@
 namespace Kokkos {
 namespace Impl {
 
-template< typename Type >
+template <typename Type>
 struct CudaJoinFunctor {
-  typedef Type value_type ;
+  typedef Type value_type;
 
   KOKKOS_INLINE_FUNCTION
-  static void join( volatile value_type & update ,
-                    volatile const value_type & input )
-    { update += input ; }
+  static void join(volatile value_type& update,
+                   volatile const value_type& input) {
+    update += input;
+  }
 };
 
 /**\brief  Team member_type passed to TeamPolicy or TeamTask closures.
@@ -101,108 +103,105 @@ struct CudaJoinFunctor {
  *  total available shared memory must be partitioned among teams.
  */
 class CudaTeamMember {
+ public:
+  typedef Kokkos::Cuda execution_space;
+  typedef execution_space::scratch_memory_space scratch_memory_space;
 
-public:
-  typedef Kokkos::Cuda                           execution_space ;
-  typedef execution_space::scratch_memory_space  scratch_memory_space ;
+ private:
+  mutable void* m_team_reduce;
+  scratch_memory_space m_team_shared;
+  int m_team_reduce_size;
+  int m_league_rank;
+  int m_league_size;
 
-private:
-
-  mutable void        * m_team_reduce ;
-  scratch_memory_space  m_team_shared ;
-  int                   m_team_reduce_size ;
-  int                   m_league_rank ;
-  int                   m_league_size ;
-
-public:
+ public:
+  KOKKOS_INLINE_FUNCTION
+  const execution_space::scratch_memory_space& team_shmem() const {
+    return m_team_shared.set_team_thread_mode(0, 1, 0);
+  }
 
   KOKKOS_INLINE_FUNCTION
-  const execution_space::scratch_memory_space & team_shmem() const
-    { return m_team_shared.set_team_thread_mode(0,1,0) ; }
+  const execution_space::scratch_memory_space& team_scratch(
+      const int& level) const {
+    return m_team_shared.set_team_thread_mode(level, 1, 0);
+  }
 
   KOKKOS_INLINE_FUNCTION
-  const execution_space::scratch_memory_space &
-    team_scratch(const int& level) const
-      { return m_team_shared.set_team_thread_mode(level,1,0) ; }
+  const execution_space::scratch_memory_space& thread_scratch(
+      const int& level) const {
+    return m_team_shared.set_team_thread_mode(level, team_size(), team_rank());
+  }
 
-  KOKKOS_INLINE_FUNCTION
-  const execution_space::scratch_memory_space &
-    thread_scratch(const int& level) const
-      { return m_team_shared.set_team_thread_mode(level,team_size(),team_rank()) ; }
+  KOKKOS_INLINE_FUNCTION int league_rank() const { return m_league_rank; }
+  KOKKOS_INLINE_FUNCTION int league_size() const { return m_league_size; }
+  KOKKOS_INLINE_FUNCTION int team_rank() const {
+#ifdef __CUDA_ARCH__
+    return threadIdx.y;
+#else
+    return 0;
+#endif
+  }
 
-  KOKKOS_INLINE_FUNCTION int league_rank() const { return m_league_rank ; }
-  KOKKOS_INLINE_FUNCTION int league_size() const { return m_league_size ; }
-  KOKKOS_INLINE_FUNCTION int team_rank() const
-    {
-      #ifdef __CUDA_ARCH__
-      return threadIdx.y ;
-      #else
-      return 0;
-      #endif
-    }
+  KOKKOS_INLINE_FUNCTION int team_size() const {
+#ifdef __CUDA_ARCH__
+    return blockDim.y;
+#else
+    return 1;
+#endif
+  }
 
-  KOKKOS_INLINE_FUNCTION int team_size() const
-    {
-      #ifdef __CUDA_ARCH__
-      return blockDim.y ;
-      #else
-      return 1;
-      #endif
-    }
-
-  KOKKOS_INLINE_FUNCTION void team_barrier() const
-    {
-      #ifdef __CUDA_ARCH__
-      if ( 1 == blockDim.z ) __syncthreads();       // team == block
-      else                   __threadfence_block(); // team <= warp
-      #endif
-    }
+  KOKKOS_INLINE_FUNCTION void team_barrier() const {
+#ifdef __CUDA_ARCH__
+    if (1 == blockDim.z)
+      __syncthreads();  // team == block
+    else
+      __threadfence_block();  // team <= warp
+#endif
+  }
 
   //--------------------------------------------------------------------------
 
-  template<class ValueType>
-  KOKKOS_INLINE_FUNCTION
-  void team_broadcast( ValueType & val, const int& thread_id ) const
-    {
-      #ifdef __CUDA_ARCH__
-      if ( 1 == blockDim.z ) { // team == block
-        __syncthreads();
-        // Wait for shared data write until all threads arrive here
-        if ( threadIdx.x == 0u && threadIdx.y == (uint32_t)thread_id ) {
-          *((ValueType*) m_team_reduce) = val ;
-        }
-        __syncthreads(); // Wait for shared data read until root thread writes
-        val = *((ValueType*) m_team_reduce);
+  template <class ValueType>
+  KOKKOS_INLINE_FUNCTION void team_broadcast(ValueType& val,
+                                             const int& thread_id) const {
+#ifdef __CUDA_ARCH__
+    if (1 == blockDim.z) {  // team == block
+      __syncthreads();
+      // Wait for shared data write until all threads arrive here
+      if (threadIdx.x == 0u && threadIdx.y == (uint32_t)thread_id) {
+        *((ValueType*)m_team_reduce) = val;
       }
-      else { // team <= warp
-        ValueType tmp( val ); // input might not be a register variable
-        cuda_shfl( val, tmp, blockDim.x * thread_id, blockDim.x * blockDim.y );
-      }
-      #endif
+      __syncthreads();  // Wait for shared data read until root thread writes
+      val = *((ValueType*)m_team_reduce);
+    } else {               // team <= warp
+      ValueType tmp(val);  // input might not be a register variable
+      Impl::in_place_shfl(val, tmp, blockDim.x * thread_id,
+                          blockDim.x * blockDim.y);
     }
-	
-  template<class Closure, class ValueType>
-  KOKKOS_INLINE_FUNCTION
-  void team_broadcast( Closure const & f, ValueType & val, const int& thread_id ) const
-    {
-      #ifdef __CUDA_ARCH__
-      f( val );
+#endif
+  }
 
-      if ( 1 == blockDim.z ) { // team == block
-        __syncthreads();
-        // Wait for shared data write until all threads arrive here
-        if ( threadIdx.x == 0u && threadIdx.y == (uint32_t)thread_id ) {
-          *((ValueType*) m_team_reduce) = val ;
-        }
-        __syncthreads(); // Wait for shared data read until root thread writes
-        val = *((ValueType*) m_team_reduce);
+  template <class Closure, class ValueType>
+  KOKKOS_INLINE_FUNCTION void team_broadcast(Closure const& f, ValueType& val,
+                                             const int& thread_id) const {
+#ifdef __CUDA_ARCH__
+    f(val);
+
+    if (1 == blockDim.z) {  // team == block
+      __syncthreads();
+      // Wait for shared data write until all threads arrive here
+      if (threadIdx.x == 0u && threadIdx.y == (uint32_t)thread_id) {
+        *((ValueType*)m_team_reduce) = val;
       }
-      else { // team <= warp
-        ValueType tmp( val ); // input might not be a register variable
-        cuda_shfl( val, tmp, blockDim.x * thread_id, blockDim.x * blockDim.y );
-      }
-      #endif
+      __syncthreads();  // Wait for shared data read until root thread writes
+      val = *((ValueType*)m_team_reduce);
+    } else {               // team <= warp
+      ValueType tmp(val);  // input might not be a register variable
+      Impl::in_place_shfl(val, tmp, blockDim.x * thread_id,
+                          blockDim.x * blockDim.y);
     }
+#endif
+  }
 
   //--------------------------------------------------------------------------
   /**\brief  Reduction across a team
@@ -219,24 +218,22 @@ public:
    *      OR
    *    ( 1 == blockDim.z )
    */
-  template< typename ReducerType >
+  template <typename ReducerType>
   KOKKOS_INLINE_FUNCTION
-  typename std::enable_if< is_reducer< ReducerType >::value >::type
-  team_reduce( ReducerType const & reducer ) const noexcept
-    {
-      team_reduce(reducer,reducer.reference());
-    }
-  
-  template< typename ReducerType >
-  KOKKOS_INLINE_FUNCTION
-  typename std::enable_if< is_reducer< ReducerType >::value >::type
-  team_reduce( ReducerType const & reducer, typename ReducerType::value_type& value ) const noexcept
-    {
-      #ifdef __CUDA_ARCH__
-      cuda_intra_block_reduction(reducer,value,blockDim.y);
-      #endif /* #ifdef __CUDA_ARCH__ */
-    }
+      typename std::enable_if<is_reducer<ReducerType>::value>::type
+      team_reduce(ReducerType const& reducer) const noexcept {
+    team_reduce(reducer, reducer.reference());
+  }
 
+  template <typename ReducerType>
+  KOKKOS_INLINE_FUNCTION
+      typename std::enable_if<is_reducer<ReducerType>::value>::type
+      team_reduce(ReducerType const& reducer,
+                  typename ReducerType::value_type& value) const noexcept {
+#ifdef __CUDA_ARCH__
+    cuda_intra_block_reduction(reducer, value, blockDim.y);
+#endif /* #ifdef __CUDA_ARCH__ */
+  }
 
   //--------------------------------------------------------------------------
   /** \brief  Intra-team exclusive prefix sum with team_rank() ordering
@@ -248,307 +245,299 @@ public:
    *  As such the base value for each team's scan operation is similarly
    *  non-deterministic.
    */
-  template< typename Type >
-  KOKKOS_INLINE_FUNCTION
-  Type team_scan( const Type & value , Type * const global_accum ) const
-    {
-      #ifdef __CUDA_ARCH__
-      Type * const base_data = (Type *) m_team_reduce ;
+  template <typename Type>
+  KOKKOS_INLINE_FUNCTION Type team_scan(const Type& value,
+                                        Type* const global_accum) const {
+#ifdef __CUDA_ARCH__
+    Type* const base_data = (Type*)m_team_reduce;
 
-      __syncthreads(); // Don't write in to shared data until all threads have entered this function
+    __syncthreads();  // Don't write in to shared data until all threads have
+                      // entered this function
 
-      if ( 0 == threadIdx.y ) { base_data[0] = 0 ; }
-
-      base_data[ threadIdx.y + 1 ] = value ;
-
-      Impl::cuda_intra_block_reduce_scan<true,Impl::CudaJoinFunctor<Type>,void>( Impl::CudaJoinFunctor<Type>() , base_data + 1 );
-
-      if ( global_accum ) {
-        if ( blockDim.y == threadIdx.y + 1 ) {
-          base_data[ blockDim.y ] = atomic_fetch_add( global_accum , base_data[ blockDim.y ] );
-        }
-        __syncthreads(); // Wait for atomic
-        base_data[ threadIdx.y ] += base_data[ blockDim.y ] ;
-      }
-
-      return base_data[ threadIdx.y ];
-      #else
-      return Type();
-      #endif
+    if (0 == threadIdx.y) {
+      base_data[0] = 0;
     }
 
+    base_data[threadIdx.y + 1] = value;
+
+    Impl::cuda_intra_block_reduce_scan<true, Impl::CudaJoinFunctor<Type>, void>(
+        Impl::CudaJoinFunctor<Type>(), base_data + 1);
+
+    if (global_accum) {
+      if (blockDim.y == threadIdx.y + 1) {
+        base_data[blockDim.y] =
+            atomic_fetch_add(global_accum, base_data[blockDim.y]);
+      }
+      __syncthreads();  // Wait for atomic
+      base_data[threadIdx.y] += base_data[blockDim.y];
+    }
+
+    return base_data[threadIdx.y];
+#else
+    return Type();
+#endif
+  }
+
   /** \brief  Intra-team exclusive prefix sum with team_rank() ordering.
    *
    *  The highest rank thread can compute the reduction total as
    *    reduction_total = dev.team_scan( value ) + value ;
    */
-  template< typename Type >
-  KOKKOS_INLINE_FUNCTION Type team_scan( const Type & value ) const {
-    return this->template team_scan<Type>( value , 0 );
+  template <typename Type>
+  KOKKOS_INLINE_FUNCTION Type team_scan(const Type& value) const {
+    return this->template team_scan<Type>(value, 0);
   }
 
   //----------------------------------------
 
-  template< typename ReducerType >
+  template <typename ReducerType>
   KOKKOS_INLINE_FUNCTION static
-  typename std::enable_if< is_reducer< ReducerType >::value >::type
-  vector_reduce( ReducerType const & reducer ) {
-    vector_reduce(reducer,reducer.reference());
+      typename std::enable_if<is_reducer<ReducerType>::value>::type
+      vector_reduce(ReducerType const& reducer) {
+    vector_reduce(reducer, reducer.reference());
   }
 
-  template< typename ReducerType >
+  template <typename ReducerType>
   KOKKOS_INLINE_FUNCTION static
-  typename std::enable_if< is_reducer< ReducerType >::value >::type
-  vector_reduce( ReducerType const & reducer, typename ReducerType::value_type& value )
-    {
+      typename std::enable_if<is_reducer<ReducerType>::value>::type
+      vector_reduce(ReducerType const& reducer,
+                    typename ReducerType::value_type& value) {
+#ifdef __CUDA_ARCH__
+    if (blockDim.x == 1) return;
 
-      #ifdef __CUDA_ARCH__
-      if(blockDim.x == 1) return;
+    // Intra vector lane shuffle reduction:
+    typename ReducerType::value_type tmp(value);
+    typename ReducerType::value_type tmp2 = tmp;
 
-      // Intra vector lane shuffle reduction:
-      typename ReducerType::value_type tmp ( value );
-      typename ReducerType::value_type tmp2 = tmp;
+    unsigned mask =
+        blockDim.x == 32
+            ? 0xffffffff
+            : ((1 << blockDim.x) - 1)
+                  << ((threadIdx.y % (32 / blockDim.x)) * blockDim.x);
 
-      unsigned mask = blockDim.x==32?0xffffffff:((1<<blockDim.x)-1)<<((threadIdx.y%(32/blockDim.x))*blockDim.x);
-
-      for ( int i = blockDim.x ; ( i >>= 1 ) ; ) {
-        cuda_shfl_down( tmp2 , tmp , i , blockDim.x , mask );
-        if ( (int)threadIdx.x < i ) { reducer.join( tmp , tmp2 ); }
+    for (int i = blockDim.x; (i >>= 1);) {
+      Impl::in_place_shfl_down(tmp2, tmp, i, blockDim.x, mask);
+      if ((int)threadIdx.x < i) {
+        reducer.join(tmp, tmp2);
       }
-
-      // Broadcast from root lane to all other lanes.
-      // Cannot use "butterfly" algorithm to avoid the broadcast
-      // because floating point summation is not associative
-      // and thus different threads could have different results.
-
-      cuda_shfl( tmp2 , tmp , 0 , blockDim.x , mask );
-      value = tmp2;
-      reducer.reference() = tmp2;
-      #endif
     }
 
+    // Broadcast from root lane to all other lanes.
+    // Cannot use "butterfly" algorithm to avoid the broadcast
+    // because floating point summation is not associative
+    // and thus different threads could have different results.
+
+    Impl::in_place_shfl(tmp2, tmp, 0, blockDim.x, mask);
+    value               = tmp2;
+    reducer.reference() = tmp2;
+#endif
+  }
+
   //--------------------------------------------------------------------------
   /**\brief  Global reduction across all blocks
    *
    *  Return !0 if reducer contains the final value
    */
-  template< typename ReducerType >
+  template <typename ReducerType>
   KOKKOS_INLINE_FUNCTION static
-  typename std::enable_if< is_reducer< ReducerType >::value , int >::type
-  global_reduce( ReducerType const & reducer
-               , int  * const global_scratch_flags
-               , void * const global_scratch_space
-               , void * const shmem
-               , int    const shmem_size
-               )
-    {
-    #ifdef __CUDA_ARCH__
+      typename std::enable_if<is_reducer<ReducerType>::value, int>::type
+      global_reduce(ReducerType const& reducer, int* const global_scratch_flags,
+                    void* const global_scratch_space, void* const shmem,
+                    int const shmem_size) {
+#ifdef __CUDA_ARCH__
 
-      typedef typename ReducerType::value_type value_type ;
-      typedef value_type volatile * pointer_type ;
+    typedef typename ReducerType::value_type value_type;
+    typedef value_type volatile* pointer_type;
 
-      // Number of shared memory entries for the reduction:
-      const int nsh = shmem_size / sizeof(value_type);
+    // Number of shared memory entries for the reduction:
+    const int nsh = shmem_size / sizeof(value_type);
 
-      // Number of CUDA threads in the block, rank within the block
-      const int nid = blockDim.x * blockDim.y * blockDim.z ;
-      const int tid = threadIdx.x + blockDim.x * (
-                      threadIdx.y + blockDim.y * threadIdx.z );
+    // Number of CUDA threads in the block, rank within the block
+    const int nid = blockDim.x * blockDim.y * blockDim.z;
+    const int tid =
+        threadIdx.x + blockDim.x * (threadIdx.y + blockDim.y * threadIdx.z);
 
-      // Reduces within block using all available shared memory
-      // Contributes if it is the root "vector lane"
+    // Reduces within block using all available shared memory
+    // Contributes if it is the root "vector lane"
 
-      // wn == number of warps in the block
-      // wx == which lane within the warp
-      // wy == which warp within the block
+    // wn == number of warps in the block
+    // wx == which lane within the warp
+    // wy == which warp within the block
 
-      const int wn = ( nid + CudaTraits::WarpIndexMask ) >> CudaTraits::WarpIndexShift ;
-      const int wx = tid &  CudaTraits::WarpIndexMask ;
-      const int wy = tid >> CudaTraits::WarpIndexShift ;
+    const int wn =
+        (nid + CudaTraits::WarpIndexMask) >> CudaTraits::WarpIndexShift;
+    const int wx = tid & CudaTraits::WarpIndexMask;
+    const int wy = tid >> CudaTraits::WarpIndexShift;
 
-      //------------------------
-      { // Intra warp shuffle reduction from contributing CUDA threads
+    //------------------------
+    {  // Intra warp shuffle reduction from contributing CUDA threads
 
-        value_type tmp( reducer.reference() );
+      value_type tmp(reducer.reference());
 
-        for ( int i = CudaTraits::WarpSize ; (int)blockDim.x <= ( i >>= 1 ) ; ) {
+      for (int i = CudaTraits::WarpSize; (int)blockDim.x <= (i >>= 1);) {
+        Impl::in_place_shfl_down(reducer.reference(), tmp, i,
+                                 CudaTraits::WarpSize);
 
-          cuda_shfl_down( reducer.reference(), tmp, i, CudaTraits::WarpSize );
-
-          // Root of each vector lane reduces "thread" contribution
-          if ( 0 == threadIdx.x && wx < i ) {
-            reducer.join( & tmp , reducer.data() );
-          }
+        // Root of each vector lane reduces "thread" contribution
+        if (0 == threadIdx.x && wx < i) {
+          reducer.join(&tmp, reducer.data());
         }
+      }
 
-        // Reduce across warps using shared memory.
-        // Number of warps may not be power of two.
+      // Reduce across warps using shared memory.
+      // Number of warps may not be power of two.
 
-        __syncthreads(); // Wait before shared data write
+      __syncthreads();  // Wait before shared data write
 
-        // Number of shared memory entries for the reduction
-        // is at most one per warp
-        const int nentry = wn < nsh ? wn : nsh ;
+      // Number of shared memory entries for the reduction
+      // is at most one per warp
+      const int nentry = wn < nsh ? wn : nsh;
 
-        if ( 0 == wx && wy < nentry ) {
+      if (0 == wx && wy < nentry) {
+        // Root thread of warp 'wy' has warp's value to contribute
+        ((value_type*)shmem)[wy] = tmp;
+      }
+
+      __syncthreads();  // Wait for write to be visible to block
+
+      // When more warps than shared entries
+      // then warps must take turns joining their contribution
+      // to the designated shared memory entry.
+      for (int i = nentry; i < wn; i += nentry) {
+        const int k = wy - i;
+
+        if (0 == wx && i <= wy && k < nentry) {
           // Root thread of warp 'wy' has warp's value to contribute
-          ((value_type*) shmem)[wy] = tmp ;
+          reducer.join(((value_type*)shmem) + k, &tmp);
         }
 
-        __syncthreads(); // Wait for write to be visible to block
-
-        // When more warps than shared entries
-        // then warps must take turns joining their contribution
-        // to the designated shared memory entry.
-        for ( int i = nentry ; i < wn ; i += nentry ) {
-
-          const int k = wy - i ;
-
-          if ( 0 == wx && i <= wy && k < nentry ) {
-            // Root thread of warp 'wy' has warp's value to contribute
-            reducer.join( ((value_type*) shmem) + k , & tmp );
-          }
-
-          __syncthreads(); // Wait for write to be visible to block
-        }
-
-        // One warp performs the inter-warp reduction:
-
-        if ( 0 == wy ) {
-
-          // Start fan-in at power of two covering nentry
-
-          for ( int i = ( 1 << ( 32 - __clz(nentry-1) ) ) ; ( i >>= 1 ) ; ) {
-            const int k = wx + i ;
-            if ( wx < i && k < nentry ) {
-              reducer.join( ((pointer_type)shmem) + wx
-                          , ((pointer_type)shmem) + k );
-              __threadfence_block(); // Wait for write to be visible to warp
-            }
-          }
-        }
-      }
-      //------------------------
-      { // Write block's value to global_scratch_memory
-
-        int last_block = 0 ;
-
-        if ( 0 == wx ) {
-          reducer.copy( ((pointer_type)global_scratch_space)
-                        + blockIdx.x * reducer.length()
-                      , reducer.data() );
-
-          __threadfence(); // Wait until global write is visible.
-
-          last_block = (int)gridDim.x ==
-                       1 + Kokkos::atomic_fetch_add(global_scratch_flags,1);
-
-          // If last block then reset count
-          if ( last_block ) *global_scratch_flags = 0 ;
-        }
-
-        last_block = __syncthreads_or( last_block );
-
-        if ( ! last_block ) return 0 ;
-
-      }
-      //------------------------
-      // Last block reads global_scratch_memory into shared memory.
-
-      const int nentry = nid < gridDim.x ?
-                       ( nid       < nsh ? nid       : nsh ) :
-                       ( gridDim.x < nsh ? gridDim.x : nsh ) ;
-
-      // nentry = min( nid , nsh , gridDim.x )
-
-      // whole block reads global memory into shared memory:
-
-      if ( tid < nentry ) {
-
-        const int offset = tid * reducer.length();
-
-        reducer.copy( ((pointer_type)shmem) + offset
-                    , ((pointer_type)global_scratch_space) + offset );
-
-        for ( int i = nentry + tid ; i < (int)gridDim.x ; i += nentry ) {
-          reducer.join( ((pointer_type)shmem) + offset
-                      , ((pointer_type)global_scratch_space)
-                        + i * reducer.length() );
-        }
+        __syncthreads();  // Wait for write to be visible to block
       }
 
-      __syncthreads(); // Wait for writes to be visible to block
-
-      if ( 0 == wy ) {
-
-        // Iterate to reduce shared memory to single warp fan-in size
-
-        const int nreduce = CudaTraits::WarpSize < nentry
-                          ? CudaTraits::WarpSize : nentry ;
-
-        // nreduce = min( CudaTraits::WarpSize , nsh , gridDim.x )
-
-        if ( wx < nreduce && nreduce < nentry ) {
-          for ( int i = nreduce + wx ; i < nentry ; i += nreduce ) {
-            reducer.join( ((pointer_type)shmem) + wx
-                        , ((pointer_type)shmem) + i );
-          }
-          __threadfence_block(); // Wait for writes to be visible to warp
-        }
+      // One warp performs the inter-warp reduction:
 
+      if (0 == wy) {
         // Start fan-in at power of two covering nentry
 
-        for ( int i = ( 1 << ( 32 - __clz(nreduce-1) ) ) ; ( i >>= 1 ) ; ) {
-          const int k = wx + i ;
-          if ( wx < i && k < nreduce ) {
-            reducer.join( ((pointer_type)shmem) + wx
-                        , ((pointer_type)shmem) + k );
-            __threadfence_block(); // Wait for writes to be visible to warp
+        for (int i = (1 << (32 - __clz(nentry - 1))); (i >>= 1);) {
+          const int k = wx + i;
+          if (wx < i && k < nentry) {
+            reducer.join(((pointer_type)shmem) + wx, ((pointer_type)shmem) + k);
+            __threadfence_block();  // Wait for write to be visible to warp
           }
         }
+      }
+    }
+    //------------------------
+    {  // Write block's value to global_scratch_memory
 
-        if ( 0 == wx ) {
-          reducer.copy( reducer.data() , (pointer_type)shmem );
-          return 1 ;
+      int last_block = 0;
+
+      if (0 == wx) {
+        reducer.copy(((pointer_type)global_scratch_space) +
+                         blockIdx.x * reducer.length(),
+                     reducer.data());
+
+        __threadfence();  // Wait until global write is visible.
+
+        last_block = (int)gridDim.x ==
+                     1 + Kokkos::atomic_fetch_add(global_scratch_flags, 1);
+
+        // If last block then reset count
+        if (last_block) *global_scratch_flags = 0;
+      }
+
+      last_block = __syncthreads_or(last_block);
+
+      if (!last_block) return 0;
+    }
+    //------------------------
+    // Last block reads global_scratch_memory into shared memory.
+
+    const int nentry = nid < gridDim.x ? (nid < nsh ? nid : nsh)
+                                       : (gridDim.x < nsh ? gridDim.x : nsh);
+
+    // nentry = min( nid , nsh , gridDim.x )
+
+    // whole block reads global memory into shared memory:
+
+    if (tid < nentry) {
+      const int offset = tid * reducer.length();
+
+      reducer.copy(((pointer_type)shmem) + offset,
+                   ((pointer_type)global_scratch_space) + offset);
+
+      for (int i = nentry + tid; i < (int)gridDim.x; i += nentry) {
+        reducer.join(
+            ((pointer_type)shmem) + offset,
+            ((pointer_type)global_scratch_space) + i * reducer.length());
+      }
+    }
+
+    __syncthreads();  // Wait for writes to be visible to block
+
+    if (0 == wy) {
+      // Iterate to reduce shared memory to single warp fan-in size
+
+      const int nreduce =
+          CudaTraits::WarpSize < nentry ? CudaTraits::WarpSize : nentry;
+
+      // nreduce = min( CudaTraits::WarpSize , nsh , gridDim.x )
+
+      if (wx < nreduce && nreduce < nentry) {
+        for (int i = nreduce + wx; i < nentry; i += nreduce) {
+          reducer.join(((pointer_type)shmem) + wx, ((pointer_type)shmem) + i);
+        }
+        __threadfence_block();  // Wait for writes to be visible to warp
+      }
+
+      // Start fan-in at power of two covering nentry
+
+      for (int i = (1 << (32 - __clz(nreduce - 1))); (i >>= 1);) {
+        const int k = wx + i;
+        if (wx < i && k < nreduce) {
+          reducer.join(((pointer_type)shmem) + wx, ((pointer_type)shmem) + k);
+          __threadfence_block();  // Wait for writes to be visible to warp
         }
       }
-      return 0 ;
 
-    #else
-      return 0 ;
-    #endif
+      if (0 == wx) {
+        reducer.copy(reducer.data(), (pointer_type)shmem);
+        return 1;
+      }
     }
+    return 0;
+
+#else
+    return 0;
+#endif
+  }
 
   //----------------------------------------
   // Private for the driver
 
   KOKKOS_INLINE_FUNCTION
-  CudaTeamMember( void * shared
-                , const int shared_begin
-                , const int shared_size
-                , void*     scratch_level_1_ptr
-                , const int scratch_level_1_size
-                , const int arg_league_rank
-                , const int arg_league_size )
-    : m_team_reduce( shared )
-    , m_team_shared( ((char *)shared) + shared_begin , shared_size,  scratch_level_1_ptr, scratch_level_1_size)
-    , m_team_reduce_size( shared_begin )
-    , m_league_rank( arg_league_rank )
-    , m_league_size( arg_league_size )
-    {}
+  CudaTeamMember(void* shared, const int shared_begin, const int shared_size,
+                 void* scratch_level_1_ptr, const int scratch_level_1_size,
+                 const int arg_league_rank, const int arg_league_size)
+      : m_team_reduce(shared),
+        m_team_shared(((char*)shared) + shared_begin, shared_size,
+                      scratch_level_1_ptr, scratch_level_1_size),
+        m_team_reduce_size(shared_begin),
+        m_league_rank(arg_league_rank),
+        m_league_size(arg_league_size) {}
 
-public:
+ public:
   // Declare to avoid unused private member warnings which are trigger
   // when SFINAE excludes the member function which uses these variables
   // Making another class a friend also surpresses these warnings
-  bool impl_avoid_sfinae_warning() const noexcept
-  {
+  bool impl_avoid_sfinae_warning() const noexcept {
     return m_team_reduce_size > 0 && m_team_reduce != nullptr;
   }
 };
 
-} // namspace Impl
-} // namespace Kokkos
+}  // namespace Impl
+}  // namespace Kokkos
 
 //----------------------------------------------------------------------------
 //----------------------------------------------------------------------------
@@ -556,124 +545,128 @@ public:
 namespace Kokkos {
 namespace Impl {
 
-template<typename iType>
-struct TeamThreadRangeBoundariesStruct<iType,CudaTeamMember> {
+template <typename iType>
+struct TeamThreadRangeBoundariesStruct<iType, CudaTeamMember> {
   typedef iType index_type;
   const CudaTeamMember& member;
   const iType start;
   const iType end;
 
   KOKKOS_INLINE_FUNCTION
-  TeamThreadRangeBoundariesStruct (const CudaTeamMember& thread_, iType count)
-    : member(thread_)
-    , start( 0 )
-    , end( count ) {}
+  TeamThreadRangeBoundariesStruct(const CudaTeamMember& thread_, iType count)
+      : member(thread_), start(0), end(count) {}
 
   KOKKOS_INLINE_FUNCTION
-  TeamThreadRangeBoundariesStruct (const CudaTeamMember& thread_, iType begin_, iType end_)
-    : member(thread_)
-    , start( begin_ )
-    , end( end_ ) {}
+  TeamThreadRangeBoundariesStruct(const CudaTeamMember& thread_, iType begin_,
+                                  iType end_)
+      : member(thread_), start(begin_), end(end_) {}
 };
 
-template<typename iType>
-struct TeamVectorRangeBoundariesStruct<iType,CudaTeamMember> {
+template <typename iType>
+struct TeamVectorRangeBoundariesStruct<iType, CudaTeamMember> {
   typedef iType index_type;
   const CudaTeamMember& member;
   const iType start;
   const iType end;
 
   KOKKOS_INLINE_FUNCTION
-  TeamVectorRangeBoundariesStruct (const CudaTeamMember& thread_, const iType& count)
-    : member(thread_)
-    , start( 0 )
-    , end( count ) {}
+  TeamVectorRangeBoundariesStruct(const CudaTeamMember& thread_,
+                                  const iType& count)
+      : member(thread_), start(0), end(count) {}
 
   KOKKOS_INLINE_FUNCTION
-  TeamVectorRangeBoundariesStruct (const CudaTeamMember& thread_,  const iType& begin_, const iType& end_)
-    : member(thread_)
-    , start( begin_ )
-    , end( end_ ) {}
+  TeamVectorRangeBoundariesStruct(const CudaTeamMember& thread_,
+                                  const iType& begin_, const iType& end_)
+      : member(thread_), start(begin_), end(end_) {}
 };
 
-template<typename iType>
-struct ThreadVectorRangeBoundariesStruct<iType,CudaTeamMember> {
+template <typename iType>
+struct ThreadVectorRangeBoundariesStruct<iType, CudaTeamMember> {
   typedef iType index_type;
   const index_type start;
   const index_type end;
 
   KOKKOS_INLINE_FUNCTION
-  ThreadVectorRangeBoundariesStruct (const CudaTeamMember, index_type count)
-    : start( static_cast<index_type>(0) ), end( count ) {}
+  ThreadVectorRangeBoundariesStruct(const CudaTeamMember, index_type count)
+      : start(static_cast<index_type>(0)), end(count) {}
 
   KOKKOS_INLINE_FUNCTION
-  ThreadVectorRangeBoundariesStruct (index_type count)
-    : start( static_cast<index_type>(0) ), end( count ) {}
+  ThreadVectorRangeBoundariesStruct(index_type count)
+      : start(static_cast<index_type>(0)), end(count) {}
 
   KOKKOS_INLINE_FUNCTION
-  ThreadVectorRangeBoundariesStruct (const CudaTeamMember, index_type arg_begin, index_type arg_end)
-    : start( arg_begin ), end( arg_end ) {}
+  ThreadVectorRangeBoundariesStruct(const CudaTeamMember, index_type arg_begin,
+                                    index_type arg_end)
+      : start(arg_begin), end(arg_end) {}
 
   KOKKOS_INLINE_FUNCTION
-  ThreadVectorRangeBoundariesStruct (index_type arg_begin, index_type arg_end)
-    : start( arg_begin ), end( arg_end ) {}
+  ThreadVectorRangeBoundariesStruct(index_type arg_begin, index_type arg_end)
+      : start(arg_begin), end(arg_end) {}
 };
 
-} // namespace Impl
+}  // namespace Impl
 
-template<typename iType>
+template <typename iType>
 KOKKOS_INLINE_FUNCTION
-Impl::TeamThreadRangeBoundariesStruct< iType, Impl::CudaTeamMember >
-TeamThreadRange( const Impl::CudaTeamMember & thread, iType count ) {
-  return Impl::TeamThreadRangeBoundariesStruct< iType, Impl::CudaTeamMember >( thread, count );
+    Impl::TeamThreadRangeBoundariesStruct<iType, Impl::CudaTeamMember>
+    TeamThreadRange(const Impl::CudaTeamMember& thread, iType count) {
+  return Impl::TeamThreadRangeBoundariesStruct<iType, Impl::CudaTeamMember>(
+      thread, count);
 }
 
-template< typename iType1, typename iType2 >
-KOKKOS_INLINE_FUNCTION
-Impl::TeamThreadRangeBoundariesStruct< typename std::common_type< iType1, iType2 >::type,
-                                       Impl::CudaTeamMember >
-TeamThreadRange( const Impl::CudaTeamMember & thread, iType1 begin, iType2 end ) {
-  typedef typename std::common_type< iType1, iType2 >::type iType;
-  return Impl::TeamThreadRangeBoundariesStruct< iType, Impl::CudaTeamMember >( thread, iType(begin), iType(end) );
+template <typename iType1, typename iType2>
+KOKKOS_INLINE_FUNCTION Impl::TeamThreadRangeBoundariesStruct<
+    typename std::common_type<iType1, iType2>::type, Impl::CudaTeamMember>
+TeamThreadRange(const Impl::CudaTeamMember& thread, iType1 begin, iType2 end) {
+  typedef typename std::common_type<iType1, iType2>::type iType;
+  return Impl::TeamThreadRangeBoundariesStruct<iType, Impl::CudaTeamMember>(
+      thread, iType(begin), iType(end));
 }
 
-template<typename iType>
+template <typename iType>
 KOKKOS_INLINE_FUNCTION
-Impl::TeamVectorRangeBoundariesStruct< iType, Impl::CudaTeamMember >
-TeamVectorRange( const Impl::CudaTeamMember & thread, const iType & count ) {
-  return Impl::TeamVectorRangeBoundariesStruct< iType, Impl::CudaTeamMember >( thread, count );
+    Impl::TeamVectorRangeBoundariesStruct<iType, Impl::CudaTeamMember>
+    TeamVectorRange(const Impl::CudaTeamMember& thread, const iType& count) {
+  return Impl::TeamVectorRangeBoundariesStruct<iType, Impl::CudaTeamMember>(
+      thread, count);
 }
 
-template< typename iType1, typename iType2 >
-KOKKOS_INLINE_FUNCTION
-Impl::TeamVectorRangeBoundariesStruct< typename std::common_type< iType1, iType2 >::type,
-                                       Impl::CudaTeamMember >
-TeamVectorRange( const Impl::CudaTeamMember & thread, const iType1 & begin, const iType2 & end ) {
-  typedef typename std::common_type< iType1, iType2 >::type iType;
-  return Impl::TeamVectorRangeBoundariesStruct< iType, Impl::CudaTeamMember >( thread, iType(begin), iType(end) );
+template <typename iType1, typename iType2>
+KOKKOS_INLINE_FUNCTION Impl::TeamVectorRangeBoundariesStruct<
+    typename std::common_type<iType1, iType2>::type, Impl::CudaTeamMember>
+TeamVectorRange(const Impl::CudaTeamMember& thread, const iType1& begin,
+                const iType2& end) {
+  typedef typename std::common_type<iType1, iType2>::type iType;
+  return Impl::TeamVectorRangeBoundariesStruct<iType, Impl::CudaTeamMember>(
+      thread, iType(begin), iType(end));
 }
 
-template<typename iType>
+template <typename iType>
 KOKKOS_INLINE_FUNCTION
-Impl::ThreadVectorRangeBoundariesStruct<iType,Impl::CudaTeamMember >
-ThreadVectorRange(const Impl::CudaTeamMember& thread, iType count) {
-  return Impl::ThreadVectorRangeBoundariesStruct<iType,Impl::CudaTeamMember >(thread,count);
+    Impl::ThreadVectorRangeBoundariesStruct<iType, Impl::CudaTeamMember>
+    ThreadVectorRange(const Impl::CudaTeamMember& thread, iType count) {
+  return Impl::ThreadVectorRangeBoundariesStruct<iType, Impl::CudaTeamMember>(
+      thread, count);
 }
 
-template<typename iType>
+template <typename iType>
 KOKKOS_INLINE_FUNCTION
-Impl::ThreadVectorRangeBoundariesStruct<iType,Impl::CudaTeamMember >
-ThreadVectorRange(const Impl::CudaTeamMember& thread, iType arg_begin, iType arg_end) {
-  return Impl::ThreadVectorRangeBoundariesStruct<iType,Impl::CudaTeamMember >(thread,arg_begin,arg_end);
+    Impl::ThreadVectorRangeBoundariesStruct<iType, Impl::CudaTeamMember>
+    ThreadVectorRange(const Impl::CudaTeamMember& thread, iType arg_begin,
+                      iType arg_end) {
+  return Impl::ThreadVectorRangeBoundariesStruct<iType, Impl::CudaTeamMember>(
+      thread, arg_begin, arg_end);
 }
 
 KOKKOS_INLINE_FUNCTION
-Impl::ThreadSingleStruct<Impl::CudaTeamMember> PerTeam(const Impl::CudaTeamMember& thread) {
+Impl::ThreadSingleStruct<Impl::CudaTeamMember> PerTeam(
+    const Impl::CudaTeamMember& thread) {
   return Impl::ThreadSingleStruct<Impl::CudaTeamMember>(thread);
 }
 
 KOKKOS_INLINE_FUNCTION
-Impl::VectorSingleStruct<Impl::CudaTeamMember> PerThread(const Impl::CudaTeamMember& thread) {
+Impl::VectorSingleStruct<Impl::CudaTeamMember> PerThread(
+    const Impl::CudaTeamMember& thread) {
   return Impl::VectorSingleStruct<Impl::CudaTeamMember>(thread);
 }
 
@@ -685,20 +678,16 @@ Impl::VectorSingleStruct<Impl::CudaTeamMember> PerThread(const Impl::CudaTeamMem
  *
  * The range [0..N) is mapped to all threads of the the calling thread team.
  */
-template<typename iType, class Closure >
-KOKKOS_INLINE_FUNCTION
-void parallel_for
-  ( const Impl::TeamThreadRangeBoundariesStruct<iType,Impl::CudaTeamMember>&
-      loop_boundaries
-  , const Closure & closure
-  )
-{
-  #ifdef __CUDA_ARCH__
-  for( iType i = loop_boundaries.start + threadIdx.y
-     ; i < loop_boundaries.end
-     ; i += blockDim.y )
+template <typename iType, class Closure>
+KOKKOS_INLINE_FUNCTION void parallel_for(
+    const Impl::TeamThreadRangeBoundariesStruct<iType, Impl::CudaTeamMember>&
+        loop_boundaries,
+    const Closure& closure) {
+#ifdef __CUDA_ARCH__
+  for (iType i = loop_boundaries.start + threadIdx.y; i < loop_boundaries.end;
+       i += blockDim.y)
     closure(i);
-  #endif
+#endif
 }
 
 //----------------------------------------------------------------------------
@@ -711,32 +700,26 @@ void parallel_for
  *  calling thread team and a summation of val is
  *  performed and put into result.
  */
-template< typename iType, class Closure, class ReducerType >
+template <typename iType, class Closure, class ReducerType>
 KOKKOS_INLINE_FUNCTION
-typename std::enable_if< Kokkos::is_reducer< ReducerType >::value >::type
-parallel_reduce
-  ( const Impl::TeamThreadRangeBoundariesStruct<iType,Impl::CudaTeamMember> &
-      loop_boundaries
-  , const Closure & closure
-  , const ReducerType & reducer
-  )
-{
+    typename std::enable_if<Kokkos::is_reducer<ReducerType>::value>::type
+    parallel_reduce(const Impl::TeamThreadRangeBoundariesStruct<
+                        iType, Impl::CudaTeamMember>& loop_boundaries,
+                    const Closure& closure, const ReducerType& reducer) {
 #ifdef __CUDA_ARCH__
   typename ReducerType::value_type value;
-  reducer.init( value );
+  reducer.init(value);
 
-  for( iType i = loop_boundaries.start + threadIdx.y
-     ; i < loop_boundaries.end
-     ; i += blockDim.y ) {
-    closure(i,value);
+  for (iType i = loop_boundaries.start + threadIdx.y; i < loop_boundaries.end;
+       i += blockDim.y) {
+    closure(i, value);
   }
 
-  loop_boundaries.member.team_reduce( reducer, value );
+  loop_boundaries.member.team_reduce(reducer, value);
 
 #endif
 }
 
-
 /** \brief  Inter-thread parallel_reduce assuming summation.
  *
  *  Executes closure(iType i, ValueType & val) for each i=[0..N)
@@ -745,98 +728,79 @@ parallel_reduce
  *  calling thread team and a summation of val is
  *  performed and put into result.
  */
-template< typename iType, class Closure, typename ValueType >
+template <typename iType, class Closure, typename ValueType>
 KOKKOS_INLINE_FUNCTION
-typename std::enable_if< ! Kokkos::is_reducer< ValueType >::value >::type
-parallel_reduce
-  ( const Impl::TeamThreadRangeBoundariesStruct<iType,Impl::CudaTeamMember> &
-      loop_boundaries
-  , const Closure & closure
-  , ValueType & result
-  )
-{
+    typename std::enable_if<!Kokkos::is_reducer<ValueType>::value>::type
+    parallel_reduce(const Impl::TeamThreadRangeBoundariesStruct<
+                        iType, Impl::CudaTeamMember>& loop_boundaries,
+                    const Closure& closure, ValueType& result) {
 #ifdef __CUDA_ARCH__
   ValueType val;
   Kokkos::Sum<ValueType> reducer(val);
 
-  reducer.init( reducer.reference() );
+  reducer.init(reducer.reference());
 
-  for( iType i = loop_boundaries.start + threadIdx.y
-     ; i < loop_boundaries.end
-     ; i += blockDim.y ) {
-    closure(i,val);
+  for (iType i = loop_boundaries.start + threadIdx.y; i < loop_boundaries.end;
+       i += blockDim.y) {
+    closure(i, val);
   }
 
-  loop_boundaries.member.team_reduce( reducer , val);
+  loop_boundaries.member.team_reduce(reducer, val);
   result = reducer.reference();
 #endif
 }
 
-template<typename iType, class Closure >
-KOKKOS_INLINE_FUNCTION
-void parallel_for
-  ( const Impl::TeamVectorRangeBoundariesStruct<iType,Impl::CudaTeamMember>&
-      loop_boundaries
-  , const Closure & closure
-  )
-{
-  #ifdef __CUDA_ARCH__
-  for( iType i = loop_boundaries.start + threadIdx.y * blockDim.x + threadIdx.x
-     ; i < loop_boundaries.end
-     ; i += blockDim.y*blockDim.x )
-    closure(i);
-  #endif
-}
-
-template< typename iType, class Closure, class ReducerType >
-KOKKOS_INLINE_FUNCTION
-typename std::enable_if< Kokkos::is_reducer< ReducerType >::value >::type
-parallel_reduce
-  ( const Impl::TeamVectorRangeBoundariesStruct<iType,Impl::CudaTeamMember> &
-      loop_boundaries
-  , const Closure & closure
-  , const ReducerType & reducer
-  )
-{
+template <typename iType, class Closure>
+KOKKOS_INLINE_FUNCTION void parallel_for(
+    const Impl::TeamVectorRangeBoundariesStruct<iType, Impl::CudaTeamMember>&
+        loop_boundaries,
+    const Closure& closure) {
 #ifdef __CUDA_ARCH__
-  typename ReducerType::value_type value;
-  reducer.init( value );
-
-  for( iType i = loop_boundaries.start + threadIdx.y * blockDim.x + threadIdx.x
-     ; i < loop_boundaries.end
-     ; i += blockDim.y * blockDim.x ) {
-    closure(i,value);
-  }
-
-  loop_boundaries.member.vector_reduce( reducer, value );
-  loop_boundaries.member.team_reduce( reducer, value );
+  for (iType i = loop_boundaries.start + threadIdx.y * blockDim.x + threadIdx.x;
+       i < loop_boundaries.end; i += blockDim.y * blockDim.x)
+    closure(i);
 #endif
 }
 
-template< typename iType, class Closure, typename ValueType >
+template <typename iType, class Closure, class ReducerType>
 KOKKOS_INLINE_FUNCTION
-typename std::enable_if< ! Kokkos::is_reducer< ValueType >::value >::type
-parallel_reduce
-  ( const Impl::TeamVectorRangeBoundariesStruct<iType,Impl::CudaTeamMember> &
-      loop_boundaries
-  , const Closure & closure
-  , ValueType & result
-  )
-{
+    typename std::enable_if<Kokkos::is_reducer<ReducerType>::value>::type
+    parallel_reduce(const Impl::TeamVectorRangeBoundariesStruct<
+                        iType, Impl::CudaTeamMember>& loop_boundaries,
+                    const Closure& closure, const ReducerType& reducer) {
+#ifdef __CUDA_ARCH__
+  typename ReducerType::value_type value;
+  reducer.init(value);
+
+  for (iType i = loop_boundaries.start + threadIdx.y * blockDim.x + threadIdx.x;
+       i < loop_boundaries.end; i += blockDim.y * blockDim.x) {
+    closure(i, value);
+  }
+
+  loop_boundaries.member.vector_reduce(reducer, value);
+  loop_boundaries.member.team_reduce(reducer, value);
+#endif
+}
+
+template <typename iType, class Closure, typename ValueType>
+KOKKOS_INLINE_FUNCTION
+    typename std::enable_if<!Kokkos::is_reducer<ValueType>::value>::type
+    parallel_reduce(const Impl::TeamVectorRangeBoundariesStruct<
+                        iType, Impl::CudaTeamMember>& loop_boundaries,
+                    const Closure& closure, ValueType& result) {
 #ifdef __CUDA_ARCH__
   ValueType val;
   Kokkos::Sum<ValueType> reducer(val);
 
-  reducer.init( reducer.reference() );
+  reducer.init(reducer.reference());
 
-  for( iType i = loop_boundaries.start + threadIdx.y * blockDim.x + threadIdx.x
-     ; i < loop_boundaries.end
-     ; i += blockDim.y * blockDim.x ) {
-    closure(i,val);
+  for (iType i = loop_boundaries.start + threadIdx.y * blockDim.x + threadIdx.x;
+       i < loop_boundaries.end; i += blockDim.y * blockDim.x) {
+    closure(i, val);
   }
 
-  loop_boundaries.member.vector_reduce( reducer );
-  loop_boundaries.member.team_reduce( reducer );
+  loop_boundaries.member.vector_reduce(reducer);
+  loop_boundaries.member.team_reduce(reducer);
   result = reducer.reference();
 #endif
 }
@@ -849,25 +813,24 @@ parallel_reduce
  *
  * The range [0..N) is mapped to all vector lanes of the the calling thread.
  */
-template<typename iType, class Closure >
-KOKKOS_INLINE_FUNCTION
-void parallel_for
-  ( const Impl::ThreadVectorRangeBoundariesStruct<iType,Impl::CudaTeamMember>&
-    loop_boundaries
-  , const Closure & closure
-  )
-{
+template <typename iType, class Closure>
+KOKKOS_INLINE_FUNCTION void parallel_for(
+    const Impl::ThreadVectorRangeBoundariesStruct<iType, Impl::CudaTeamMember>&
+        loop_boundaries,
+    const Closure& closure) {
 #ifdef __CUDA_ARCH__
-  for ( iType i = loop_boundaries.start + threadIdx.x
-      ; i < loop_boundaries.end
-      ; i += blockDim.x ) {
+  for (iType i = loop_boundaries.start + threadIdx.x; i < loop_boundaries.end;
+       i += blockDim.x) {
     closure(i);
   }
-  #ifdef KOKKOS_IMPL_CUDA_SYNCWARP_NEEDS_MASK
-  KOKKOS_IMPL_CUDA_SYNCWARP_MASK(blockDim.x==32?0xffffffff:((1<<blockDim.x)-1)<<(threadIdx.y%(32/blockDim.x))*blockDim.x);
-  #else
+#ifdef KOKKOS_IMPL_CUDA_SYNCWARP_NEEDS_MASK
+  KOKKOS_IMPL_CUDA_SYNCWARP_MASK(
+      blockDim.x == 32 ? 0xffffffff
+                       : ((1 << blockDim.x) - 1)
+                             << (threadIdx.y % (32 / blockDim.x)) * blockDim.x);
+#else
   KOKKOS_IMPL_CUDA_SYNCWARP;
-  #endif
+#endif
 #endif
 }
 
@@ -884,26 +847,22 @@ void parallel_for
  *  The identity value for the += operator is assumed to be the default
  *  constructed value.
  */
-template< typename iType, class Closure, class ReducerType >
+template <typename iType, class Closure, class ReducerType>
 KOKKOS_INLINE_FUNCTION
-typename std::enable_if< is_reducer< ReducerType >::value >::type
-parallel_reduce
-  ( Impl::ThreadVectorRangeBoundariesStruct<iType,Impl::CudaTeamMember>
-      const & loop_boundaries
-  , Closure const & closure
-  , ReducerType const & reducer )
-{
+    typename std::enable_if<is_reducer<ReducerType>::value>::type
+    parallel_reduce(Impl::ThreadVectorRangeBoundariesStruct<
+                        iType, Impl::CudaTeamMember> const& loop_boundaries,
+                    Closure const& closure, ReducerType const& reducer) {
 #ifdef __CUDA_ARCH__
 
-  reducer.init( reducer.reference() );
+  reducer.init(reducer.reference());
 
-  for ( iType i = loop_boundaries.start + threadIdx.x
-      ; i < loop_boundaries.end
-      ; i += blockDim.x ) {
-    closure(i,reducer.reference());
+  for (iType i = loop_boundaries.start + threadIdx.x; i < loop_boundaries.end;
+       i += blockDim.x) {
+    closure(i, reducer.reference());
   }
 
-  Impl::CudaTeamMember::vector_reduce( reducer );
+  Impl::CudaTeamMember::vector_reduce(reducer);
 
 #endif
 }
@@ -919,26 +878,21 @@ parallel_reduce
  *  The identity value for the += operator is assumed to be the default
  *  constructed value.
  */
-template< typename iType, class Closure, typename ValueType >
+template <typename iType, class Closure, typename ValueType>
 KOKKOS_INLINE_FUNCTION
-typename std::enable_if< ! is_reducer< ValueType >::value >::type
-parallel_reduce
-  ( Impl::ThreadVectorRangeBoundariesStruct<iType,Impl::CudaTeamMember>
-      const & loop_boundaries
-  , Closure const & closure
-  , ValueType & result )
-{
+    typename std::enable_if<!is_reducer<ValueType>::value>::type
+    parallel_reduce(Impl::ThreadVectorRangeBoundariesStruct<
+                        iType, Impl::CudaTeamMember> const& loop_boundaries,
+                    Closure const& closure, ValueType& result) {
 #ifdef __CUDA_ARCH__
   result = ValueType();
 
-  for ( iType i = loop_boundaries.start + threadIdx.x
-      ; i < loop_boundaries.end
-      ; i += blockDim.x ) {
-    closure(i,result);
+  for (iType i = loop_boundaries.start + threadIdx.x; i < loop_boundaries.end;
+       i += blockDim.x) {
+    closure(i, result);
   }
 
-  Impl::CudaTeamMember::vector_reduce(
-    Kokkos::Sum<ValueType>(result ) );
+  Impl::CudaTeamMember::vector_reduce(Kokkos::Sum<ValueType>(result));
 
 #endif
 }
@@ -953,29 +907,22 @@ parallel_reduce
  *  thread and a scan operation is performed.
  *  The last call to closure has final == true.
  */
-template< typename iType, class Closure >
-KOKKOS_INLINE_FUNCTION
-void parallel_scan
-  ( const Impl::ThreadVectorRangeBoundariesStruct<iType,Impl::CudaTeamMember >&
-      loop_boundaries
-  , const Closure & closure
-  )
-{
-
+template <typename iType, class Closure>
+KOKKOS_INLINE_FUNCTION void parallel_scan(
+    const Impl::ThreadVectorRangeBoundariesStruct<iType, Impl::CudaTeamMember>&
+        loop_boundaries,
+    const Closure& closure) {
 #ifdef __CUDA_ARCH__
 
   // Extract value_type from closure
 
-  using value_type =
-    typename Kokkos::Impl::FunctorAnalysis
-      < Kokkos::Impl::FunctorPatternInterface::SCAN
-      , void
-      , Closure >::value_type ;
+  using value_type = typename Kokkos::Impl::FunctorAnalysis<
+      Kokkos::Impl::FunctorPatternInterface::SCAN, void, Closure>::value_type;
 
   // Loop through boundaries by vector-length chunks
   // must scan at each iteration
 
-  value_type accum = 0 ;
+  value_type accum = 0;
 
   // All thread "lanes" must loop the same number of times.
   // Determine an loop end for all thread "lanes."
@@ -984,19 +931,21 @@ void parallel_scan
   //     ( end % blockDim.x ) == ( end & ( blockDim.x - 1 ) )
   //   1 <= blockDim.x <= CudaTraits::WarpSize
 
-  const int mask = blockDim.x - 1 ;
-  const unsigned active_mask = blockDim.x==32?0xffffffff:((1<<blockDim.x)-1)<<(threadIdx.y%(32/blockDim.x))*blockDim.x;
-  const int rem  = loop_boundaries.end & mask ; // == end % blockDim.x
-  const int end  = loop_boundaries.end + ( rem ? blockDim.x - rem : 0 );
+  const int mask = blockDim.x - 1;
+  const unsigned active_mask =
+      blockDim.x == 32 ? 0xffffffff
+                       : ((1 << blockDim.x) - 1)
+                             << (threadIdx.y % (32 / blockDim.x)) * blockDim.x;
+  const int rem = loop_boundaries.end & mask;  // == end % blockDim.x
+  const int end = loop_boundaries.end + (rem ? blockDim.x - rem : 0);
 
-  for ( int i = threadIdx.x ; i < end ; i += blockDim.x ) {
-
-    value_type val = 0 ;
+  for (int i = threadIdx.x; i < end; i += blockDim.x) {
+    value_type val = 0;
 
     // First acquire per-lane contributions:
-    if ( i < loop_boundaries.end ) closure( i , val , false );
+    if (i < loop_boundaries.end) closure(i, val, false);
 
-    value_type sval = val ;
+    value_type sval = val;
 
     // Bottom up inclusive scan in triangular pattern
     // where each CUDA thread is the root of a reduction tree
@@ -1006,81 +955,95 @@ void parallel_scan
     //  [t] += [t-4] if t >= 4
     //  ...
 
-    for ( int j = 1 ; j < (int)blockDim.x ; j <<= 1 ) {
-      value_type tmp = 0 ;
-      Impl::cuda_shfl_up(tmp, sval , j , blockDim.x, active_mask );
-      if ( j <= (int)threadIdx.x ) { sval += tmp ; }
+    for (int j = 1; j < (int)blockDim.x; j <<= 1) {
+      value_type tmp = 0;
+      Impl::in_place_shfl_up(tmp, sval, j, blockDim.x, active_mask);
+      if (j <= (int)threadIdx.x) {
+        sval += tmp;
+      }
     }
 
     // Include accumulation and remove value for exclusive scan:
-    val = accum + sval - val ;
+    val = accum + sval - val;
 
     // Provide exclusive scan value:
-    if ( i < loop_boundaries.end ) closure( i , val , true );
+    if (i < loop_boundaries.end) closure(i, val, true);
 
     // Accumulate the last value in the inclusive scan:
-    Impl::cuda_shfl( sval , sval , mask , blockDim.x, active_mask );
+    Impl::in_place_shfl(sval, sval, mask, blockDim.x, active_mask);
 
-    accum += sval ;
+    accum += sval;
   }
 
 #endif
 }
 
-}
+}  // namespace Kokkos
 
 namespace Kokkos {
 
-template<class FunctorType>
-KOKKOS_INLINE_FUNCTION
-void single(const Impl::VectorSingleStruct<Impl::CudaTeamMember>& , const FunctorType& lambda) {
+template <class FunctorType>
+KOKKOS_INLINE_FUNCTION void single(
+    const Impl::VectorSingleStruct<Impl::CudaTeamMember>&,
+    const FunctorType& lambda) {
 #ifdef __CUDA_ARCH__
-  if(threadIdx.x == 0) lambda();
-  #ifdef KOKKOS_IMPL_CUDA_SYNCWARP_NEEDS_MASK
-  KOKKOS_IMPL_CUDA_SYNCWARP_MASK(blockDim.x==32?0xffffffff:((1<<blockDim.x)-1)<<(threadIdx.y%(32/blockDim.x))*blockDim.x);
-  #else
+  if (threadIdx.x == 0) lambda();
+#ifdef KOKKOS_IMPL_CUDA_SYNCWARP_NEEDS_MASK
+  KOKKOS_IMPL_CUDA_SYNCWARP_MASK(
+      blockDim.x == 32 ? 0xffffffff
+                       : ((1 << blockDim.x) - 1)
+                             << (threadIdx.y % (32 / blockDim.x)) * blockDim.x);
+#else
   KOKKOS_IMPL_CUDA_SYNCWARP;
-  #endif
+#endif
 #endif
 }
 
-template<class FunctorType>
-KOKKOS_INLINE_FUNCTION
-void single(const Impl::ThreadSingleStruct<Impl::CudaTeamMember>& , const FunctorType& lambda) {
+template <class FunctorType>
+KOKKOS_INLINE_FUNCTION void single(
+    const Impl::ThreadSingleStruct<Impl::CudaTeamMember>&,
+    const FunctorType& lambda) {
 #ifdef __CUDA_ARCH__
-  if(threadIdx.x == 0 && threadIdx.y == 0) lambda();
-  #ifdef KOKKOS_IMPL_CUDA_SYNCWARP_NEEDS_MASK
-  KOKKOS_IMPL_CUDA_SYNCWARP_MASK(blockDim.x==32?0xffffffff:((1<<blockDim.x)-1)<<(threadIdx.y%(32/blockDim.x))*blockDim.x);
-  #else
+  if (threadIdx.x == 0 && threadIdx.y == 0) lambda();
+#ifdef KOKKOS_IMPL_CUDA_SYNCWARP_NEEDS_MASK
+  KOKKOS_IMPL_CUDA_SYNCWARP_MASK(
+      blockDim.x == 32 ? 0xffffffff
+                       : ((1 << blockDim.x) - 1)
+                             << (threadIdx.y % (32 / blockDim.x)) * blockDim.x);
+#else
   KOKKOS_IMPL_CUDA_SYNCWARP;
-  #endif
+#endif
 #endif
 }
 
-template<class FunctorType, class ValueType>
-KOKKOS_INLINE_FUNCTION
-void single(const Impl::VectorSingleStruct<Impl::CudaTeamMember>& , const FunctorType& lambda, ValueType& val) {
+template <class FunctorType, class ValueType>
+KOKKOS_INLINE_FUNCTION void single(
+    const Impl::VectorSingleStruct<Impl::CudaTeamMember>&,
+    const FunctorType& lambda, ValueType& val) {
 #ifdef __CUDA_ARCH__
-  if(threadIdx.x == 0) lambda(val);
-  unsigned mask = blockDim.x==32?0xffffffff:((1<<blockDim.x)-1)<<((threadIdx.y%(32/blockDim.x))*blockDim.x);
-  Impl::cuda_shfl(val,val,0,blockDim.x,mask);
+  if (threadIdx.x == 0) lambda(val);
+  unsigned mask = blockDim.x == 32
+                      ? 0xffffffff
+                      : ((1 << blockDim.x) - 1)
+                            << ((threadIdx.y % (32 / blockDim.x)) * blockDim.x);
+  Impl::in_place_shfl(val, val, 0, blockDim.x, mask);
 #endif
 }
 
-template<class FunctorType, class ValueType>
-KOKKOS_INLINE_FUNCTION
-void single(const Impl::ThreadSingleStruct<Impl::CudaTeamMember>& single_struct, const FunctorType& lambda, ValueType& val) {
+template <class FunctorType, class ValueType>
+KOKKOS_INLINE_FUNCTION void single(
+    const Impl::ThreadSingleStruct<Impl::CudaTeamMember>& single_struct,
+    const FunctorType& lambda, ValueType& val) {
 #ifdef __CUDA_ARCH__
-  if(threadIdx.x == 0 && threadIdx.y == 0) {
+  if (threadIdx.x == 0 && threadIdx.y == 0) {
     lambda(val);
   }
-  single_struct.team_member.team_broadcast(val,0);
+  single_struct.team_member.team_broadcast(val, 0);
 #endif
 }
 
-} // namespace Kokkos
+}  // namespace Kokkos
 
 #endif /* defined( __CUDACC__ ) */
 
 #endif /* #ifndef KOKKOS_CUDA_TEAM_HPP */
-
diff --git a/lib/kokkos/core/src/Cuda/Kokkos_Cuda_UniqueToken.hpp b/lib/kokkos/core/src/Cuda/Kokkos_Cuda_UniqueToken.hpp
index c4140750da..a0de4eaa7f 100644
--- a/lib/kokkos/core/src/Cuda/Kokkos_Cuda_UniqueToken.hpp
+++ b/lib/kokkos/core/src/Cuda/Kokkos_Cuda_UniqueToken.hpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -52,92 +53,79 @@
 #include <impl/Kokkos_SharedAlloc.hpp>
 #include <impl/Kokkos_ConcurrentBitset.hpp>
 
-namespace Kokkos { namespace Experimental {
+namespace Kokkos {
+namespace Experimental {
 
 // both global and instance Unique Tokens are implemented in the same way
-template<>
-class UniqueToken< Cuda, UniqueTokenScope::Global >
-{
-private:
-
-  uint32_t volatile * m_buffer ;
-  uint32_t            m_count ;
-
-public:
+template <>
+class UniqueToken<Cuda, UniqueTokenScope::Global> {
+ private:
+  uint32_t volatile* m_buffer;
+  uint32_t m_count;
 
+ public:
   using execution_space = Cuda;
-  using size_type = int32_t;
+  using size_type       = int32_t;
 
-#if defined( KOKKOS_ENABLE_DEPRECATED_CODE )
-  explicit
-  UniqueToken( execution_space const& );
+#if defined(KOKKOS_ENABLE_DEPRECATED_CODE)
+  explicit UniqueToken(execution_space const&);
 
   KOKKOS_INLINE_FUNCTION
   UniqueToken() : m_buffer(0), m_count(0) {}
 #else
-  explicit
-  UniqueToken( execution_space const& = execution_space() );
+  explicit UniqueToken(execution_space const& = execution_space());
 #endif
 
 #ifdef KOKKOS_CUDA_9_DEFAULTED_BUG_WORKAROUND
   KOKKOS_INLINE_FUNCTION
-  UniqueToken( const UniqueToken & rhs )
-  : m_buffer(rhs.m_buffer)
-  , m_count(rhs.m_count)
-  {
-  }
+  UniqueToken(const UniqueToken& rhs)
+      : m_buffer(rhs.m_buffer), m_count(rhs.m_count) {}
 
   KOKKOS_INLINE_FUNCTION
-  UniqueToken( UniqueToken && rhs )
-  : m_buffer(std::move(rhs.m_buffer))
-  , m_count(std::move(rhs.m_count))
-  {
-  }
+  UniqueToken(UniqueToken&& rhs)
+      : m_buffer(std::move(rhs.m_buffer)), m_count(std::move(rhs.m_count)) {}
 
   KOKKOS_INLINE_FUNCTION
-  UniqueToken & operator=( const UniqueToken & rhs ) {
+  UniqueToken& operator=(const UniqueToken& rhs) {
     m_buffer = rhs.m_buffer;
-    m_count = rhs.m_count;
+    m_count  = rhs.m_count;
     return *this;
   }
 
   KOKKOS_INLINE_FUNCTION
-  UniqueToken & operator=( UniqueToken && rhs ) {
+  UniqueToken& operator=(UniqueToken&& rhs) {
     m_buffer = std::move(rhs.m_buffer);
-    m_count = std::move(rhs.m_count);
+    m_count  = std::move(rhs.m_count);
     return *this;
   }
 #else
   KOKKOS_INLINE_FUNCTION
-  UniqueToken( const UniqueToken & ) = default;
+  UniqueToken(const UniqueToken&) = default;
 
   KOKKOS_INLINE_FUNCTION
-  UniqueToken( UniqueToken && )      = default;
+  UniqueToken(UniqueToken&&) = default;
 
   KOKKOS_INLINE_FUNCTION
-  UniqueToken & operator=( const UniqueToken & ) = default ;
+  UniqueToken& operator=(const UniqueToken&) = default;
 
   KOKKOS_INLINE_FUNCTION
-  UniqueToken & operator=( UniqueToken && ) = default ;
+  UniqueToken& operator=(UniqueToken&&) = default;
 #endif
 
   /// \brief upper bound for acquired values, i.e. 0 <= value < size()
   KOKKOS_INLINE_FUNCTION
-  size_type size() const noexcept { return m_count ; }
+  size_type size() const noexcept { return m_count; }
 
   /// \brief acquire value such that 0 <= value < size()
   KOKKOS_INLINE_FUNCTION
-  size_type acquire() const
-  {
-    const Kokkos::pair<int,int> result =
-      Kokkos::Impl::concurrent_bitset::
-        acquire_bounded( m_buffer
-                       , m_count
-                       , Kokkos::Impl::clock_tic() % m_count
-                       );
+  size_type acquire() const {
+    const Kokkos::pair<int, int> result =
+        Kokkos::Impl::concurrent_bitset::acquire_bounded(
+            m_buffer, m_count, Kokkos::Impl::clock_tic() % m_count);
 
-    if ( result.first < 0 ) {
-      Kokkos::abort("UniqueToken<Cuda> failure to release tokens, no tokens available" );
+    if (result.first < 0) {
+      Kokkos::abort(
+          "UniqueToken<Cuda> failure to release tokens, no tokens available");
     }
 
     return result.first;
@@ -145,31 +133,26 @@ public:
 
   /// \brief release an acquired value
   KOKKOS_INLINE_FUNCTION
-  void release( size_type i ) const noexcept
-  {
-    Kokkos::Impl::concurrent_bitset::release( m_buffer, i );
+  void release(size_type i) const noexcept {
+    Kokkos::Impl::concurrent_bitset::release(m_buffer, i);
   }
 };
 
-template<>
-class UniqueToken< Cuda, UniqueTokenScope::Instance >
-  : public UniqueToken< Cuda, UniqueTokenScope::Global >
-{
-public:
-
+template <>
+class UniqueToken<Cuda, UniqueTokenScope::Instance>
+    : public UniqueToken<Cuda, UniqueTokenScope::Global> {
+ public:
 #ifdef KOKKOS_ENABLE_DEPRECATED_CODE
-  explicit
-  UniqueToken( execution_space const& arg )
-    : UniqueToken< Cuda, UniqueTokenScope::Global >( arg ) {}
+  explicit UniqueToken(execution_space const& arg)
+      : UniqueToken<Cuda, UniqueTokenScope::Global>(arg) {}
 #else
-  explicit
-  UniqueToken( execution_space const& arg = execution_space() )
-    : UniqueToken< Cuda, UniqueTokenScope::Global >( arg ) {}
+  explicit UniqueToken(execution_space const& arg = execution_space())
+      : UniqueToken<Cuda, UniqueTokenScope::Global>(arg) {}
 #endif
 };
 
-}} // namespace Kokkos::Experimental
-
-#endif // KOKKOS_ENABLE_CUDA
-#endif // KOKKOS_CUDA_UNIQUE_TOKEN_HPP
+}  // namespace Experimental
+}  // namespace Kokkos
 
+#endif  // KOKKOS_ENABLE_CUDA
+#endif  // KOKKOS_CUDA_UNIQUE_TOKEN_HPP
diff --git a/lib/kokkos/core/src/Cuda/Kokkos_Cuda_Vectorization.hpp b/lib/kokkos/core/src/Cuda/Kokkos_Cuda_Vectorization.hpp
index fc369191bd..085262b804 100644
--- a/lib/kokkos/core/src/Cuda/Kokkos_Cuda_Vectorization.hpp
+++ b/lib/kokkos/core/src/Cuda/Kokkos_Cuda_Vectorization.hpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -48,342 +49,163 @@
 
 #include <Kokkos_Cuda.hpp>
 #include <Cuda/Kokkos_Cuda_Version_9_8_Compatibility.hpp>
+
 namespace Kokkos {
 
-
-// Shuffle only makes sense on >= Kepler GPUs; it doesn't work on CPUs
-// or other GPUs.  We provide a generic definition (which is trivial
-// and doesn't do what it claims to do) because we don't actually use
-// this function unless we are on a suitable GPU, with a suitable
-// Scalar type.  (For example, in the mat-vec, the "ThreadsPerRow"
-// internal parameter depends both on the ExecutionSpace and the Scalar type,
-// and it controls whether shfl_down() gets called.)
 namespace Impl {
 
-  template< typename Scalar >
-  struct shfl_union {
-    enum {n = sizeof(Scalar)/4};
-    float fval[n];
-    KOKKOS_INLINE_FUNCTION
-    Scalar value() {
-      return *(Scalar*) fval;
-    }
-    KOKKOS_INLINE_FUNCTION
-    void operator= (Scalar& value_) {
-      float* const val_ptr = (float*) &value_;
-      for(int i=0; i<n ; i++) {
-        fval[i] = val_ptr[i];
-      }
-    }
-    KOKKOS_INLINE_FUNCTION
-    void operator= (const Scalar& value_) {
-      float* const val_ptr = (float*) &value_;
-      for(int i=0; i<n ; i++) {
-        fval[i] = val_ptr[i];
-      }
-    }
+// Include all lanes
+constexpr unsigned shfl_all_mask = 0xffffffff;
 
-  };
+//----------------------------------------------------------------------------
+// Shuffle operations require input to be a register (stack) variable
+
+// Derived implements do_shfl_op(unsigned mask, T& in, int lane, int width),
+// which turns in to one of KOKKOS_IMPL_CUDA_SHFL(_UP_|_DOWN_|_)MASK
+// Since the logic with respect to value sizes, etc., is the same everywhere,
+// put it all in one place.
+template <class Derived>
+struct in_place_shfl_op {
+  // CRTP boilerplate
+  __device__ KOKKOS_IMPL_FORCEINLINE const Derived& self() const noexcept {
+    return *static_cast<Derived const*>(this);
+  }
+
+  // sizeof(Scalar) == sizeof(int) case
+  template <class Scalar>
+  // requires _assignable_from_bits<Scalar>
+  __device__ inline typename std::enable_if<sizeof(Scalar) == sizeof(int)>::type
+  operator()(Scalar& out, Scalar const& in, int lane_or_delta, int width,
+             unsigned mask = shfl_all_mask) const noexcept {
+    //------------------------------------------------
+    reinterpret_cast<int&>(out) = self().do_shfl_op(
+        mask, reinterpret_cast<int const&>(in), lane_or_delta, width);
+    //------------------------------------------------
+  }
+
+// TODO: figure out why 64-bit shfl fails in Clang
+#if (CUDA_VERSION >= 9000) && (!defined(KOKKOS_COMPILER_CLANG))
+  // sizeof(Scalar) == sizeof(double) case
+  // requires _assignable_from_bits<Scalar>
+  template <class Scalar>
+  __device__ inline
+      typename std::enable_if<sizeof(Scalar) == sizeof(double)>::type
+      operator()(Scalar& out, Scalar const& in, int lane_or_delta, int width,
+                 unsigned mask = shfl_all_mask) const noexcept {
+    //------------------------------------------------
+    reinterpret_cast<double&>(out) = self().do_shfl_op(
+        mask, *reinterpret_cast<double const*>(&in), lane_or_delta, width);
+    //------------------------------------------------
+  }
+#else
+  // sizeof(Scalar) == sizeof(double) case
+  // requires _assignable_from_bits<Scalar>
+  template <typename Scalar>
+  __device__ inline
+      typename std::enable_if<sizeof(Scalar) == sizeof(double)>::type
+      operator()(Scalar& out, const Scalar& val, int lane_or_delta, int width,
+                 unsigned mask = shfl_all_mask) const noexcept {
+    //------------------------------------------------
+    int lo   = __double2loint(*reinterpret_cast<const double*>(&val));
+    int hi   = __double2hiint(*reinterpret_cast<const double*>(&val));
+    lo       = self().do_shfl_op(mask, lo, lane_or_delta, width);
+    hi       = self().do_shfl_op(mask, hi, lane_or_delta, width);
+    auto tmp = __hiloint2double(hi, lo);
+    out      = reinterpret_cast<Scalar&>(tmp);
+    //------------------------------------------------
+  }
+#endif
+
+  // sizeof(Scalar) > sizeof(double) case
+  template <typename Scalar>
+  __device__ inline
+      typename std::enable_if<(sizeof(Scalar) > sizeof(double))>::type
+      operator()(Scalar& out, const Scalar& val, int lane_or_delta, int width,
+                 unsigned mask = shfl_all_mask) const noexcept {
+    // TODO DSH shouldn't this be KOKKOS_IMPL_CUDA_MAX_SHFL_SIZEOF instead of
+    //      sizeof(int)? (Need benchmarks to decide which is faster)
+    using shuffle_as_t = int;
+    enum : int { N = sizeof(Scalar) / sizeof(shuffle_as_t) };
+
+    for (int i = 0; i < N; ++i) {
+      reinterpret_cast<shuffle_as_t*>(&out)[i] = self().do_shfl_op(
+          mask, reinterpret_cast<shuffle_as_t const*>(&val)[i], lane_or_delta,
+          width);
+    }
+  }
+};
+
+struct in_place_shfl_fn : in_place_shfl_op<in_place_shfl_fn> {
+  template <class T>
+  __device__ KOKKOS_IMPL_FORCEINLINE T do_shfl_op(unsigned mask, T& val,
+                                                  int lane, int width) const
+      noexcept {
+    return KOKKOS_IMPL_CUDA_SHFL_MASK(mask, val, lane, width);
+  }
+};
+template <class... Args>
+__device__ KOKKOS_IMPL_FORCEINLINE void in_place_shfl(Args&&... args) noexcept {
+  in_place_shfl_fn{}((Args &&) args...);
 }
 
-#ifdef __CUDA_ARCH__
-#if (__CUDA_ARCH__ >= 300)
+struct in_place_shfl_up_fn : in_place_shfl_op<in_place_shfl_up_fn> {
+  template <class T>
+  __device__ KOKKOS_IMPL_FORCEINLINE T do_shfl_op(unsigned mask, T& val,
+                                                  int lane, int width) const
+      noexcept {
+    return KOKKOS_IMPL_CUDA_SHFL_UP_MASK(mask, val, lane, width);
+  }
+};
+template <class... Args>
+__device__ KOKKOS_IMPL_FORCEINLINE void in_place_shfl_up(
+    Args&&... args) noexcept {
+  in_place_shfl_up_fn{}((Args &&) args...);
+}
 
-    KOKKOS_INLINE_FUNCTION
-    int shfl(const int &val, const int& srcLane, const int& width ) {
-      return KOKKOS_IMPL_CUDA_SHFL(val,srcLane,width);
-    }
+struct in_place_shfl_down_fn : in_place_shfl_op<in_place_shfl_down_fn> {
+  template <class T>
+  __device__ KOKKOS_IMPL_FORCEINLINE T do_shfl_op(unsigned mask, T& val,
+                                                  int lane, int width) const
+      noexcept {
+    return KOKKOS_IMPL_CUDA_SHFL_DOWN_MASK(mask, val, lane, width);
+  }
+};
+template <class... Args>
+__device__ KOKKOS_IMPL_FORCEINLINE void in_place_shfl_down(
+    Args&&... args) noexcept {
+  in_place_shfl_down_fn{}((Args &&) args...);
+}
 
-    KOKKOS_INLINE_FUNCTION
-    float shfl(const float &val, const int& srcLane, const int& width ) {
-      return KOKKOS_IMPL_CUDA_SHFL(val,srcLane,width);
-    }
+}  // namespace Impl
 
-// TODO: figure out why 64-bit shfl fails with Clang
-#if ( CUDA_VERSION >= 9000 ) && (!defined(KOKKOS_COMPILER_CLANG))
+template <class T>
+// requires default_constructible<T> && _assignable_from_bits<T>
+__device__ inline T shfl(const T& val, const int& srcLane, const int& width,
+                         unsigned mask = Impl::shfl_all_mask) {
+  T rv = {};
+  Impl::in_place_shfl(rv, val, srcLane, width, mask);
+  return rv;
+}
 
-    KOKKOS_INLINE_FUNCTION
-    long shfl(const long &val, const int& srcLane, const int& width ) {
-      return KOKKOS_IMPL_CUDA_SHFL(val,srcLane,width);
-    }
+template <class T>
+// requires default_constructible<T> && _assignable_from_bits<T>
+__device__ inline T shfl_down(const T& val, int delta, int width,
+                              unsigned mask = Impl::shfl_all_mask) {
+  T rv = {};
+  Impl::in_place_shfl_down(rv, val, delta, width, mask);
+  return rv;
+}
 
-    KOKKOS_INLINE_FUNCTION
-    long long shfl(const long long &val, const int& srcLane, const int& width ) {
-      return KOKKOS_IMPL_CUDA_SHFL(val,srcLane,width);
-    }
+template <class T>
+// requires default_constructible<T> && _assignable_from_bits<T>
+__device__ inline T shfl_up(const T& val, int delta, int width,
+                            unsigned mask = Impl::shfl_all_mask) {
+  T rv = {};
+  Impl::in_place_shfl_up(rv, val, delta, width, mask);
+  return rv;
+}
 
-    KOKKOS_INLINE_FUNCTION
-    double shfl(const double &val, const int& srcLane, const int& width ) {
-      return KOKKOS_IMPL_CUDA_SHFL(val,srcLane,width);
-    }
-
-    template<typename Scalar>
-    KOKKOS_INLINE_FUNCTION
-    Scalar shfl(const Scalar &val, const int& srcLane, const typename Impl::enable_if< (sizeof(Scalar) == 8) , int >::type& width
-        ) {
-      Scalar tmp1 = val;
-      double tmp = *reinterpret_cast<double*>(&tmp1);
-      tmp = KOKKOS_IMPL_CUDA_SHFL(tmp,srcLane,width);
-      return *reinterpret_cast<Scalar*>(&tmp);
-    }
-
-#else // ( CUDA_VERSION < 9000 )
-
-    KOKKOS_INLINE_FUNCTION
-    double shfl(const double &val, const int& srcLane, const int& width) {
-      int lo = __double2loint(val);
-      int hi = __double2hiint(val);
-      lo = KOKKOS_IMPL_CUDA_SHFL(lo,srcLane,width);
-      hi = KOKKOS_IMPL_CUDA_SHFL(hi,srcLane,width);
-      return __hiloint2double(hi,lo);
-    }
-
-    template<typename Scalar>
-    KOKKOS_INLINE_FUNCTION
-    Scalar shfl(const Scalar &val, const int& srcLane, const typename Impl::enable_if< (sizeof(Scalar) == 8) ,int>::type& width) {
-      int lo = __double2loint(*reinterpret_cast<const double*>(&val));
-      int hi = __double2hiint(*reinterpret_cast<const double*>(&val));
-      lo = KOKKOS_IMPL_CUDA_SHFL(lo,srcLane,width);
-      hi = KOKKOS_IMPL_CUDA_SHFL(hi,srcLane,width);
-      const double tmp = __hiloint2double(hi,lo);
-      return *(reinterpret_cast<const Scalar*>(&tmp));
-    }
-
-#endif // ( CUDA_VERSION < 9000 )
-
-    template<typename Scalar>
-    KOKKOS_INLINE_FUNCTION
-    Scalar shfl(const Scalar &val, const int& srcLane, const typename Impl::enable_if< (sizeof(Scalar) == 4) , int >::type& width
-        ) {
-      Scalar tmp1 = val;
-      float tmp = *reinterpret_cast<float*>(&tmp1);
-      tmp = KOKKOS_IMPL_CUDA_SHFL(tmp,srcLane,width);
-      return *reinterpret_cast<Scalar*>(&tmp);
-    }
-
-    template<typename Scalar>
-    KOKKOS_INLINE_FUNCTION
-    Scalar shfl(const Scalar &val, const int& srcLane, const typename Impl::enable_if< (sizeof(Scalar) > 8) ,int>::type& width) {
-      Impl::shfl_union<Scalar> s_val;
-      Impl::shfl_union<Scalar> r_val;
-      s_val = val;
-
-      for(int i = 0; i<s_val.n; i++)
-        r_val.fval[i] = KOKKOS_IMPL_CUDA_SHFL(s_val.fval[i],srcLane,width);
-      return r_val.value();
-    }
-
-    KOKKOS_INLINE_FUNCTION
-    int shfl_down(const int &val, const int& delta, const int& width) {
-      return KOKKOS_IMPL_CUDA_SHFL_DOWN(val,delta,width);
-    }
-
-    KOKKOS_INLINE_FUNCTION
-    float shfl_down(const float &val, const int& delta, const int& width) {
-      return KOKKOS_IMPL_CUDA_SHFL_DOWN(val,delta,width);
-    }
-
-// TODO: figure out why 64-bit shfl fails with Clang
-#if ( CUDA_VERSION >= 9000 ) && (!defined(KOKKOS_COMPILER_CLANG))
-
-    KOKKOS_INLINE_FUNCTION
-    long shfl_down(const long &val, const int& delta, const int& width) {
-      return KOKKOS_IMPL_CUDA_SHFL_DOWN(val,delta,width);
-    }
-
-    KOKKOS_INLINE_FUNCTION
-    long long shfl_down(const long long &val, const int& delta, const int& width) {
-      return KOKKOS_IMPL_CUDA_SHFL_DOWN(val,delta,width);
-    }
-
-    KOKKOS_INLINE_FUNCTION
-    double shfl_down(const double &val, const int& delta, const int& width) {
-      return KOKKOS_IMPL_CUDA_SHFL_DOWN(val,delta,width);
-    }
-
-    template<typename Scalar>
-    KOKKOS_INLINE_FUNCTION
-    Scalar shfl_down(const Scalar &val, const int& delta, const typename Impl::enable_if< (sizeof(Scalar) == 8) , int >::type & width) {
-      Scalar tmp1 = val;
-      double tmp = *reinterpret_cast<double*>(&tmp1);
-      tmp = KOKKOS_IMPL_CUDA_SHFL_DOWN(tmp,delta,width);
-      return *reinterpret_cast<Scalar*>(&tmp);
-    }
-
-#else // ( CUDA_VERSION < 9000 )
-
-    KOKKOS_INLINE_FUNCTION
-    double shfl_down(const double &val, const int& delta, const int& width) {
-      int lo = __double2loint(val);
-      int hi = __double2hiint(val);
-      lo = KOKKOS_IMPL_CUDA_SHFL_DOWN(lo,delta,width);
-      hi = KOKKOS_IMPL_CUDA_SHFL_DOWN(hi,delta,width);
-      return __hiloint2double(hi,lo);
-    }
-
-    template<typename Scalar>
-    KOKKOS_INLINE_FUNCTION
-    Scalar shfl_down(const Scalar &val, const int& delta, const typename Impl::enable_if< (sizeof(Scalar) == 8) , int >::type & width) {
-      int lo = __double2loint(*reinterpret_cast<const double*>(&val));
-      int hi = __double2hiint(*reinterpret_cast<const double*>(&val));
-      lo = KOKKOS_IMPL_CUDA_SHFL_DOWN(lo,delta,width);
-      hi = KOKKOS_IMPL_CUDA_SHFL_DOWN(hi,delta,width);
-      const double tmp = __hiloint2double(hi,lo);
-      return *(reinterpret_cast<const Scalar*>(&tmp));
-    }
-
-#endif // ( CUDA_VERSION < 9000 )
-
-    template<typename Scalar>
-    KOKKOS_INLINE_FUNCTION
-    Scalar shfl_down(const Scalar &val, const int& delta, const typename Impl::enable_if< (sizeof(Scalar) == 4) , int >::type & width) {
-      Scalar tmp1 = val;
-      float tmp = *reinterpret_cast<float*>(&tmp1);
-      tmp = KOKKOS_IMPL_CUDA_SHFL_DOWN(tmp,delta,width);
-      return *reinterpret_cast<Scalar*>(&tmp);
-    }
-
-    template<typename Scalar>
-    KOKKOS_INLINE_FUNCTION
-    Scalar shfl_down(const Scalar &val, const int& delta, const typename Impl::enable_if< (sizeof(Scalar) > 8) , int >::type & width) {
-      Impl::shfl_union<Scalar> s_val;
-      Impl::shfl_union<Scalar> r_val;
-      s_val = val;
-
-      for(int i = 0; i<s_val.n; i++)
-        r_val.fval[i] = KOKKOS_IMPL_CUDA_SHFL_DOWN(s_val.fval[i],delta,width);
-      return r_val.value();
-    }
-
-    KOKKOS_INLINE_FUNCTION
-    int shfl_up(const int &val, const int& delta, const int& width ) {
-      return KOKKOS_IMPL_CUDA_SHFL_UP(val,delta,width);
-    }
-
-    KOKKOS_INLINE_FUNCTION
-    float shfl_up(const float &val, const int& delta, const int& width ) {
-      return KOKKOS_IMPL_CUDA_SHFL_UP(val,delta,width);
-    }
-
-// TODO: figure out why 64-bit shfl fails with Clang
-#if ( CUDA_VERSION >= 9000 ) && (!defined(KOKKOS_COMPILER_CLANG))
-
-    KOKKOS_INLINE_FUNCTION
-    long shfl_up(const long &val, const int& delta, const int& width ) {
-      return KOKKOS_IMPL_CUDA_SHFL_UP(val,delta,width);
-    }
-
-    KOKKOS_INLINE_FUNCTION
-    long long shfl_up(const long long &val, const int& delta, const int& width ) {
-      return KOKKOS_IMPL_CUDA_SHFL_UP(val,delta,width);
-    }
-
-    KOKKOS_INLINE_FUNCTION
-    double shfl_up(const double &val, const int& delta, const int& width ) {
-      return KOKKOS_IMPL_CUDA_SHFL_UP(val,delta,width);
-    }
-
-    template<typename Scalar>
-    KOKKOS_INLINE_FUNCTION
-    Scalar shfl_up(const Scalar &val, const int& delta, const typename Impl::enable_if< (sizeof(Scalar) == 8) , int >::type & width) {
-      Scalar tmp1 = val;
-      double tmp = *reinterpret_cast<double*>(&tmp1);
-      tmp = KOKKOS_IMPL_CUDA_SHFL_UP(tmp,delta,width);
-      return *reinterpret_cast<Scalar*>(&tmp);
-    }
-
-#else // ( CUDA_VERSION < 9000 )
-
-    KOKKOS_INLINE_FUNCTION
-    double shfl_up(const double &val, const int& delta, const int& width ) {
-      int lo = __double2loint(val);
-      int hi = __double2hiint(val);
-      lo = KOKKOS_IMPL_CUDA_SHFL_UP(lo,delta,width);
-      hi = KOKKOS_IMPL_CUDA_SHFL_UP(hi,delta,width);
-      return __hiloint2double(hi,lo);
-    }
-
-    template<typename Scalar>
-    KOKKOS_INLINE_FUNCTION
-    Scalar shfl_up(const Scalar &val, const int& delta, const typename Impl::enable_if< (sizeof(Scalar) == 8) , int >::type & width) {
-      int lo = __double2loint(*reinterpret_cast<const double*>(&val));
-      int hi = __double2hiint(*reinterpret_cast<const double*>(&val));
-      lo = KOKKOS_IMPL_CUDA_SHFL_UP(lo,delta,width);
-      hi = KOKKOS_IMPL_CUDA_SHFL_UP(hi,delta,width);
-      const double tmp = __hiloint2double(hi,lo);
-      return *(reinterpret_cast<const Scalar*>(&tmp));
-    }
-
-#endif // ( CUDA_VERSION < 9000 )
-
-    template<typename Scalar>
-    KOKKOS_INLINE_FUNCTION
-    Scalar shfl_up(const Scalar &val, const int& delta, const typename Impl::enable_if< (sizeof(Scalar) == 4) , int >::type & width) {
-      Scalar tmp1 = val;
-      float tmp = *reinterpret_cast<float*>(&tmp1);
-      tmp = KOKKOS_IMPL_CUDA_SHFL_UP(tmp,delta,width);
-      return *reinterpret_cast<Scalar*>(&tmp);
-    }
-
-    template<typename Scalar>
-    KOKKOS_INLINE_FUNCTION
-    Scalar shfl_up(const Scalar &val, const int& delta, const typename Impl::enable_if< (sizeof(Scalar) > 8) , int >::type & width) {
-      Impl::shfl_union<Scalar> s_val;
-      Impl::shfl_union<Scalar> r_val;
-      s_val = val;
-
-      for(int i = 0; i<s_val.n; i++)
-        r_val.fval[i] = KOKKOS_IMPL_CUDA_SHFL_UP(s_val.fval[i],delta,width);
-      return r_val.value();
-    }
-
-#else // (__CUDA_ARCH__ < 300)
-    template<typename Scalar>
-    KOKKOS_INLINE_FUNCTION
-    Scalar shfl(const Scalar &val, const int& srcLane, const int& width) {
-      if(width > 1) Kokkos::abort("Error: calling shfl from a device with CC<3.0.");
-      return val;
-    }
-
-    template<typename Scalar>
-    KOKKOS_INLINE_FUNCTION
-    Scalar shfl_down(const Scalar &val, const int& delta, const int& width) {
-      if(width > 1) Kokkos::abort("Error: calling shfl_down from a device with CC<3.0.");
-      return val;
-    }
-
-    template<typename Scalar>
-    KOKKOS_INLINE_FUNCTION
-    Scalar shfl_up(const Scalar &val, const int& delta, const int& width) {
-      if(width > 1) Kokkos::abort("Error: calling shfl_down from a device with CC<3.0.");
-      return val;
-    }
-#endif // (__CUDA_ARCH__ < 300)
-#else // !defined( __CUDA_ARCH__ )
-    template<typename Scalar>
-    inline
-    Scalar shfl(const Scalar &val, const int& srcLane, const int& width) {
-      if(width > 1) Kokkos::abort("Error: calling shfl outside __CUDA_ARCH__.");
-      return val;
-    }
-
-    template<typename Scalar>
-    inline
-    Scalar shfl_down(const Scalar &val, const int& delta, const int& width) {
-      if(width > 1) Kokkos::abort("Error: calling shfl_down outside __CUDA_ARCH__.");
-      return val;
-    }
-
-    template<typename Scalar>
-    inline
-    Scalar shfl_up(const Scalar &val, const int& delta, const int& width) {
-      if(width > 1) Kokkos::abort("Error: calling shfl_down outside __CUDA_ARCH__.");
-      return val;
-    }
-#endif // !defined( __CUDA_ARCH__ )
-
-} // end namespace Kokkos
-
-#endif // defined( KOKKOS_ENABLE_CUDA )
-#endif // !defined( KOKKOS_CUDA_VECTORIZATION_HPP )
+}  // end namespace Kokkos
 
+#endif  // defined( KOKKOS_ENABLE_CUDA )
+#endif  // !defined( KOKKOS_CUDA_VECTORIZATION_HPP )
diff --git a/lib/kokkos/core/src/Cuda/Kokkos_Cuda_Version_9_8_Compatibility.hpp b/lib/kokkos/core/src/Cuda/Kokkos_Cuda_Version_9_8_Compatibility.hpp
index 8aa8b8f459..66231e55f9 100644
--- a/lib/kokkos/core/src/Cuda/Kokkos_Cuda_Version_9_8_Compatibility.hpp
+++ b/lib/kokkos/core/src/Cuda/Kokkos_Cuda_Version_9_8_Compatibility.hpp
@@ -1,86 +1,77 @@
-#include<Kokkos_Macros.hpp>
+#include <Kokkos_Macros.hpp>
 
-#if defined( __CUDA_ARCH__ )
-#if ( CUDA_VERSION < 9000 )
+#if defined(__CUDA_ARCH__)
+#if (CUDA_VERSION < 9000)
 #define KOKKOS_IMPL_CUDA_ACTIVEMASK 0
 #define KOKKOS_IMPL_CUDA_SYNCWARP __threadfence_block()
-#define KOKKOS_IMPL_CUDA_SYNCWARP_MASK(m) if(m)__threadfence_block()
+#define KOKKOS_IMPL_CUDA_SYNCWARP_MASK(m) \
+  if (m) __threadfence_block()
 #define KOKKOS_IMPL_CUDA_BALLOT(x) __ballot(x)
-#define KOKKOS_IMPL_CUDA_BALLOT_MASK(m,x) __ballot(x)
-#define KOKKOS_IMPL_CUDA_SHFL(x,y,z) __shfl(x,y,z)
-#define KOKKOS_IMPL_CUDA_SHFL_MASK(m,x,y,z) __shfl(x,y,z)
-#define KOKKOS_IMPL_CUDA_SHFL_UP(x,y,z) __shfl_up(x,y,z)
-#define KOKKOS_IMPL_CUDA_SHFL_UP_MASK(m,x,y,z) __shfl_up(x,y,z)
-#define KOKKOS_IMPL_CUDA_SHFL_DOWN(x,y,z) __shfl_down(x,y,z)
-#define KOKKOS_IMPL_CUDA_SHFL_DOWN_MASK(m,x,y,z) __shfl_down(x,y,z)
+#define KOKKOS_IMPL_CUDA_BALLOT_MASK(m, x) __ballot(x)
+#define KOKKOS_IMPL_CUDA_SHFL(x, y, z) __shfl(x, y, z)
+#define KOKKOS_IMPL_CUDA_SHFL_MASK(m, x, y, z) __shfl(x, y, z)
+#define KOKKOS_IMPL_CUDA_SHFL_UP(x, y, z) __shfl_up(x, y, z)
+#define KOKKOS_IMPL_CUDA_SHFL_UP_MASK(m, x, y, z) __shfl_up(x, y, z)
+#define KOKKOS_IMPL_CUDA_SHFL_DOWN(x, y, z) __shfl_down(x, y, z)
+#define KOKKOS_IMPL_CUDA_SHFL_DOWN_MASK(m, x, y, z) __shfl_down(x, y, z)
 #else
 #define KOKKOS_IMPL_CUDA_ACTIVEMASK __activemask()
 #define KOKKOS_IMPL_CUDA_SYNCWARP __syncwarp(0xffffffff)
 #define KOKKOS_IMPL_CUDA_SYNCWARP_MASK(m) __syncwarp(m)
-#define KOKKOS_IMPL_CUDA_BALLOT(x) __ballot_sync(__activemask(),x)
-#define KOKKOS_IMPL_CUDA_BALLOT_MASK(m,x) __ballot_sync(m,x)
-#define KOKKOS_IMPL_CUDA_SHFL(x,y,z) __shfl_sync(0xffffffff,x,y,z)
-#define KOKKOS_IMPL_CUDA_SHFL_MASK(m,x,y,z) __shfl_sync(m,x,y,z)
-#define KOKKOS_IMPL_CUDA_SHFL_UP(x,y,z) __shfl_up_sync(0xffffffff,x,y,z)
-#define KOKKOS_IMPL_CUDA_SHFL_UP_MASK(m,x,y,z) __shfl_up_sync(m,x,y,z)
-#define KOKKOS_IMPL_CUDA_SHFL_DOWN(x,y,z) __shfl_down_sync(0xffffffff,x,y,z)
-#define KOKKOS_IMPL_CUDA_SHFL_DOWN_MASK(m,x,y,z) __shfl_down_sync(m,x,y,z)
-#endif 
+#define KOKKOS_IMPL_CUDA_BALLOT(x) __ballot_sync(__activemask(), x)
+#define KOKKOS_IMPL_CUDA_BALLOT_MASK(m, x) __ballot_sync(m, x)
+#define KOKKOS_IMPL_CUDA_SHFL(x, y, z) __shfl_sync(0xffffffff, x, y, z)
+#define KOKKOS_IMPL_CUDA_SHFL_MASK(m, x, y, z) __shfl_sync(m, x, y, z)
+#define KOKKOS_IMPL_CUDA_SHFL_UP(x, y, z) __shfl_up_sync(0xffffffff, x, y, z)
+#define KOKKOS_IMPL_CUDA_SHFL_UP_MASK(m, x, y, z) __shfl_up_sync(m, x, y, z)
+#define KOKKOS_IMPL_CUDA_SHFL_DOWN(x, y, z) \
+  __shfl_down_sync(0xffffffff, x, y, z)
+#define KOKKOS_IMPL_CUDA_SHFL_DOWN_MASK(m, x, y, z) __shfl_down_sync(m, x, y, z)
+#endif
 #else
 #define KOKKOS_IMPL_CUDA_ACTIVEMASK 0
-#define KOKKOS_IMPL_CUDA_SYNCWARP 
+#define KOKKOS_IMPL_CUDA_SYNCWARP
 #define KOKKOS_IMPL_CUDA_SYNCWARP_MASK(m) (void)m
 #define KOKKOS_IMPL_CUDA_BALLOT(x) 0
-#define KOKKOS_IMPL_CUDA_BALLOT_MASK(m,x) 0
-#define KOKKOS_IMPL_CUDA_SHFL(x,y,z) 0
-#define KOKKOS_IMPL_CUDA_SHFL_MASK(m,x,y,z) 0
-#define KOKKOS_IMPL_CUDA_SHFL_UP(x,y,z) 0
-#define KOKKOS_IMPL_CUDA_SHFL_DOWN(x,y,z) 0
-#define KOKKOS_IMPL_CUDA_SHFL_DOWN_MASK(m,x,y,z) 0
-#endif 
+#define KOKKOS_IMPL_CUDA_BALLOT_MASK(m, x) 0
+#define KOKKOS_IMPL_CUDA_SHFL(x, y, z) 0
+#define KOKKOS_IMPL_CUDA_SHFL_MASK(m, x, y, z) 0
+#define KOKKOS_IMPL_CUDA_SHFL_UP(x, y, z) 0
+#define KOKKOS_IMPL_CUDA_SHFL_DOWN(x, y, z) 0
+#define KOKKOS_IMPL_CUDA_SHFL_DOWN_MASK(m, x, y, z) 0
+#endif
 
-#if ( CUDA_VERSION >= 9000 ) && (!defined(KOKKOS_COMPILER_CLANG))
+#if (CUDA_VERSION >= 9000) && (!defined(KOKKOS_COMPILER_CLANG))
 #define KOKKOS_IMPL_CUDA_MAX_SHFL_SIZEOF sizeof(long long)
 #else
 #define KOKKOS_IMPL_CUDA_MAX_SHFL_SIZEOF sizeof(int)
 #endif
 
-#if defined( __CUDA_ARCH__ )
-#if ( CUDA_VERSION < 9000 )
-#define KOKKOS_IMPL_CUDA_SYNCWARP_OR_RETURN( MSG ) { \
-  const unsigned b = __ballot(1); \
-  if ( b != 0xffffffff ) { \
-    printf(" SYNCWARP AT %s (%d,%d,%d) (%d,%d,%d) failed %x\n" \
-      , MSG \
-      , blockIdx.x \
-      , blockIdx.y \
-      , blockIdx.z \
-      , threadIdx.x \
-      , threadIdx.y \
-      , threadIdx.z \
-      , b ); \
-    return ; \
-  } \
-}
+#if defined(__CUDA_ARCH__)
+#if (CUDA_VERSION < 9000)
+#define KOKKOS_IMPL_CUDA_SYNCWARP_OR_RETURN(MSG)                           \
+  {                                                                        \
+    const unsigned b = __ballot(1);                                        \
+    if (b != 0xffffffff) {                                                 \
+      printf(" SYNCWARP AT %s (%d,%d,%d) (%d,%d,%d) failed %x\n", MSG,     \
+             blockIdx.x, blockIdx.y, blockIdx.z, threadIdx.x, threadIdx.y, \
+             threadIdx.z, b);                                              \
+      return;                                                              \
+    }                                                                      \
+  }
 #else
-#define KOKKOS_IMPL_CUDA_SYNCWARP_OR_RETURN( MSG ) { \
-  __syncwarp(); \
-  const unsigned b = __activemask(); \
-  if ( b != 0xffffffff ) { \
-    printf(" SYNCWARP AT %s (%d,%d,%d) (%d,%d,%d) failed %x\n" \
-      , MSG \
-      , blockIdx.x \
-      , blockIdx.y \
-      , blockIdx.z \
-      , threadIdx.x \
-      , threadIdx.y \
-      , threadIdx.z \
-      , b ); \
-    return ; \
-  } \
-}
-#endif 
+#define KOKKOS_IMPL_CUDA_SYNCWARP_OR_RETURN(MSG)                           \
+  {                                                                        \
+    __syncwarp();                                                          \
+    const unsigned b = __activemask();                                     \
+    if (b != 0xffffffff) {                                                 \
+      printf(" SYNCWARP AT %s (%d,%d,%d) (%d,%d,%d) failed %x\n", MSG,     \
+             blockIdx.x, blockIdx.y, blockIdx.z, threadIdx.x, threadIdx.y, \
+             threadIdx.z, b);                                              \
+      return;                                                              \
+    }                                                                      \
+  }
+#endif
 #else
-#define KOKKOS_IMPL_CUDA_SYNCWARP_OR_RETURN( MSG ) 
-#endif 
-
+#define KOKKOS_IMPL_CUDA_SYNCWARP_OR_RETURN(MSG)
+#endif
diff --git a/lib/kokkos/core/src/Cuda/Kokkos_Cuda_View.hpp b/lib/kokkos/core/src/Cuda/Kokkos_Cuda_View.hpp
index 2fe9d8ccf7..08fdbea387 100644
--- a/lib/kokkos/core/src/Cuda/Kokkos_Cuda_View.hpp
+++ b/lib/kokkos/core/src/Cuda/Kokkos_Cuda_View.hpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -45,7 +46,7 @@
 #define KOKKOS_EXPERIMENTAL_CUDA_VIEW_HPP
 
 #include <Kokkos_Macros.hpp>
-#if defined( KOKKOS_ENABLE_CUDA )
+#if defined(KOKKOS_ENABLE_CUDA)
 
 //----------------------------------------------------------------------------
 //----------------------------------------------------------------------------
@@ -53,117 +54,101 @@
 namespace Kokkos {
 namespace Impl {
 
-// Cuda Texture fetches can be performed for 4, 8 and 16 byte objects (int,int2,int4)
-// Via reinterpret_case this can be used to support all scalar types of those sizes.
-// Any other scalar type falls back to either normal reads out of global memory,
-// or using the __ldg intrinsic on Kepler GPUs or newer (Compute Capability >= 3.0)
+// Cuda Texture fetches can be performed for 4, 8 and 16 byte objects
+// (int,int2,int4) Via reinterpret_case this can be used to support all scalar
+// types of those sizes. Any other scalar type falls back to either normal reads
+// out of global memory, or using the __ldg intrinsic on Kepler GPUs or newer
+// (Compute Capability >= 3.0)
 
-template< typename ValueType , typename AliasType >
+template <typename ValueType, typename AliasType>
 struct CudaTextureFetch {
-
-  ::cudaTextureObject_t   m_obj ;
-  const ValueType       * m_ptr ;
-  int                     m_offset ;
+  ::cudaTextureObject_t m_obj;
+  const ValueType* m_ptr;
+  int m_offset;
 
   // Deference operator pulls through texture object and returns by value
-  template< typename iType >
-  KOKKOS_INLINE_FUNCTION
-  ValueType operator[]( const iType & i ) const
-    {
-#if defined( __CUDA_ARCH__ ) && ( 300 <= __CUDA_ARCH__ )
-      AliasType v = tex1Dfetch<AliasType>( m_obj , i + m_offset );
-      return  *(reinterpret_cast<ValueType*> (&v));
+  template <typename iType>
+  KOKKOS_INLINE_FUNCTION ValueType operator[](const iType& i) const {
+#if defined(__CUDA_ARCH__) && (300 <= __CUDA_ARCH__)
+    AliasType v = tex1Dfetch<AliasType>(m_obj, i + m_offset);
+    return *(reinterpret_cast<ValueType*>(&v));
 #else
-      return m_ptr[ i ];
+    return m_ptr[i];
 #endif
-    }
+  }
 
   // Pointer to referenced memory
   KOKKOS_INLINE_FUNCTION
-  operator const ValueType * () const { return m_ptr ; }
-
+  operator const ValueType*() const { return m_ptr; }
 
   KOKKOS_INLINE_FUNCTION
-  CudaTextureFetch() : m_obj() , m_ptr() , m_offset() {}
+  CudaTextureFetch() : m_obj(), m_ptr(), m_offset() {}
 
   KOKKOS_INLINE_FUNCTION
   ~CudaTextureFetch() {}
 
   KOKKOS_INLINE_FUNCTION
-  CudaTextureFetch( const CudaTextureFetch & rhs )
-    : m_obj(     rhs.m_obj )
-    , m_ptr(     rhs.m_ptr )
-    , m_offset(  rhs.m_offset )
-    {}
+  CudaTextureFetch(const CudaTextureFetch& rhs)
+      : m_obj(rhs.m_obj), m_ptr(rhs.m_ptr), m_offset(rhs.m_offset) {}
 
   KOKKOS_INLINE_FUNCTION
-  CudaTextureFetch( CudaTextureFetch && rhs )
-    : m_obj(     rhs.m_obj )
-    , m_ptr(     rhs.m_ptr )
-    , m_offset(  rhs.m_offset )
-    {}
+  CudaTextureFetch(CudaTextureFetch&& rhs)
+      : m_obj(rhs.m_obj), m_ptr(rhs.m_ptr), m_offset(rhs.m_offset) {}
 
   KOKKOS_INLINE_FUNCTION
-  CudaTextureFetch & operator = ( const CudaTextureFetch & rhs )
-    {
-      m_obj     = rhs.m_obj ;
-      m_ptr     = rhs.m_ptr ;
-      m_offset  = rhs.m_offset ;
-      return *this ;
-    }
+  CudaTextureFetch& operator=(const CudaTextureFetch& rhs) {
+    m_obj    = rhs.m_obj;
+    m_ptr    = rhs.m_ptr;
+    m_offset = rhs.m_offset;
+    return *this;
+  }
 
   KOKKOS_INLINE_FUNCTION
-  CudaTextureFetch & operator = ( CudaTextureFetch && rhs )
-    {
-      m_obj     = rhs.m_obj ;
-      m_ptr     = rhs.m_ptr ;
-      m_offset  = rhs.m_offset ;
-      return *this ;
-    }
+  CudaTextureFetch& operator=(CudaTextureFetch&& rhs) {
+    m_obj    = rhs.m_obj;
+    m_ptr    = rhs.m_ptr;
+    m_offset = rhs.m_offset;
+    return *this;
+  }
 
   // Texture object spans the entire allocation.
   // This handle may view a subset of the allocation, so an offset is required.
-  template< class CudaMemorySpace >
-  inline explicit
-  CudaTextureFetch( const ValueType * const arg_ptr
-                  , Kokkos::Impl::SharedAllocationRecord< CudaMemorySpace , void > * record
-                  )
-    : m_obj( record->template attach_texture_object< AliasType >() )
-    , m_ptr( arg_ptr )
-    , m_offset( record->attach_texture_object_offset( reinterpret_cast<const AliasType*>( arg_ptr ) ) )
-    {}
+  template <class CudaMemorySpace>
+  inline explicit CudaTextureFetch(
+      const ValueType* const arg_ptr,
+      Kokkos::Impl::SharedAllocationRecord<CudaMemorySpace, void>* record)
+      : m_obj(record->template attach_texture_object<AliasType>()),
+        m_ptr(arg_ptr),
+        m_offset(record->attach_texture_object_offset(
+            reinterpret_cast<const AliasType*>(arg_ptr))) {}
 
   // Texture object spans the entire allocation.
   // This handle may view a subset of the allocation, so an offset is required.
   KOKKOS_INLINE_FUNCTION
-  CudaTextureFetch( const CudaTextureFetch & rhs , size_t offset )
-    : m_obj(     rhs.m_obj )
-    , m_ptr(     rhs.m_ptr + offset)
-    , m_offset( offset + rhs.m_offset )
-    {}
+  CudaTextureFetch(const CudaTextureFetch& rhs, size_t offset)
+      : m_obj(rhs.m_obj),
+        m_ptr(rhs.m_ptr + offset),
+        m_offset(offset + rhs.m_offset) {}
 };
 
-#if defined( KOKKOS_ENABLE_CUDA_LDG_INTRINSIC )
+#if defined(KOKKOS_ENABLE_CUDA_LDG_INTRINSIC)
 
-template< typename ValueType , typename AliasType >
+template <typename ValueType, typename AliasType>
 struct CudaLDGFetch {
+  const ValueType* m_ptr;
 
-  const ValueType * m_ptr ;
-
-  template< typename iType >
-  KOKKOS_INLINE_FUNCTION
-  ValueType operator[]( const iType & i ) const
-    {
-      #ifdef __CUDA_ARCH__
-      AliasType v = __ldg(reinterpret_cast<const AliasType*>(&m_ptr[i]));
-      return  *(reinterpret_cast<ValueType*> (&v));
-      #else
-      return m_ptr[i];
-      #endif
-    }
+  template <typename iType>
+  KOKKOS_INLINE_FUNCTION ValueType operator[](const iType& i) const {
+#ifdef __CUDA_ARCH__
+    AliasType v = __ldg(reinterpret_cast<const AliasType*>(&m_ptr[i]));
+    return *(reinterpret_cast<ValueType*>(&v));
+#else
+    return m_ptr[i];
+#endif
+  }
 
   KOKKOS_INLINE_FUNCTION
-  operator const ValueType * () const { return m_ptr ; }
+  operator const ValueType*() const { return m_ptr; }
 
   KOKKOS_INLINE_FUNCTION
   CudaLDGFetch() : m_ptr() {}
@@ -172,48 +157,38 @@ struct CudaLDGFetch {
   ~CudaLDGFetch() {}
 
   KOKKOS_INLINE_FUNCTION
-  CudaLDGFetch( const CudaLDGFetch & rhs )
-    : m_ptr( rhs.m_ptr )
-    {}
+  CudaLDGFetch(const CudaLDGFetch& rhs) : m_ptr(rhs.m_ptr) {}
 
   KOKKOS_INLINE_FUNCTION
-  CudaLDGFetch( CudaLDGFetch && rhs )
-    : m_ptr( rhs.m_ptr )
-    {}
+  CudaLDGFetch(CudaLDGFetch&& rhs) : m_ptr(rhs.m_ptr) {}
 
   KOKKOS_INLINE_FUNCTION
-  CudaLDGFetch & operator = ( const CudaLDGFetch & rhs )
-    {
-      m_ptr = rhs.m_ptr ;
-      return *this ;
-    }
+  CudaLDGFetch& operator=(const CudaLDGFetch& rhs) {
+    m_ptr = rhs.m_ptr;
+    return *this;
+  }
 
   KOKKOS_INLINE_FUNCTION
-  CudaLDGFetch & operator = ( CudaLDGFetch && rhs )
-    {
-      m_ptr = rhs.m_ptr ;
-      return *this ;
-    }
+  CudaLDGFetch& operator=(CudaLDGFetch&& rhs) {
+    m_ptr = rhs.m_ptr;
+    return *this;
+  }
 
-  template< class CudaMemorySpace >
-  inline explicit
-  CudaLDGFetch( const ValueType * const arg_ptr
-              , Kokkos::Impl::SharedAllocationRecord<CudaMemorySpace,void>*
-              )
-    : m_ptr( arg_ptr )
-    {}
+  template <class CudaMemorySpace>
+  inline explicit CudaLDGFetch(
+      const ValueType* const arg_ptr,
+      Kokkos::Impl::SharedAllocationRecord<CudaMemorySpace, void>*)
+      : m_ptr(arg_ptr) {}
 
   KOKKOS_INLINE_FUNCTION
-  CudaLDGFetch( CudaLDGFetch const rhs ,size_t offset)
-    : m_ptr( rhs.m_ptr + offset )
-    {}
-
+  CudaLDGFetch(CudaLDGFetch const rhs, size_t offset)
+      : m_ptr(rhs.m_ptr + offset) {}
 };
 
 #endif
 
-} // namespace Impl
-} // namespace Kokkos
+}  // namespace Impl
+}  // namespace Kokkos
 
 //----------------------------------------------------------------------------
 //----------------------------------------------------------------------------
@@ -221,98 +196,95 @@ struct CudaLDGFetch {
 namespace Kokkos {
 namespace Impl {
 
-/** \brief  Replace Default ViewDataHandle with Cuda texture fetch specialization
- *          if 'const' value type, CudaSpace and random access.
+/** \brief  Replace Default ViewDataHandle with Cuda texture fetch
+ * specialization if 'const' value type, CudaSpace and random access.
  */
-template< class Traits >
-class ViewDataHandle< Traits ,
-  typename std::enable_if<(
-    // Is Cuda memory space
-    ( std::is_same< typename Traits::memory_space,Kokkos::CudaSpace>::value ||
-      std::is_same< typename Traits::memory_space,Kokkos::CudaUVMSpace>::value )
-    &&
-    // Is a trivial const value of 4, 8, or 16 bytes
-    std::is_trivial<typename Traits::const_value_type>::value
-    &&
-    std::is_same<typename Traits::const_value_type,typename Traits::value_type>::value
-    &&
-    ( sizeof(typename Traits::const_value_type) ==  4 ||
-      sizeof(typename Traits::const_value_type) ==  8 ||
-      sizeof(typename Traits::const_value_type) == 16 )
-    &&
-    // Random access trait
-    ( Traits::memory_traits::is_random_access != 0 )
-  )>::type >
-{
-public:
+template <class Traits>
+class ViewDataHandle<
+    Traits, typename std::enable_if<(
+                // Is Cuda memory space
+                (std::is_same<typename Traits::memory_space,
+                              Kokkos::CudaSpace>::value ||
+                 std::is_same<typename Traits::memory_space,
+                              Kokkos::CudaUVMSpace>::value) &&
+                // Is a trivial const value of 4, 8, or 16 bytes
+                std::is_trivial<typename Traits::const_value_type>::value &&
+                std::is_same<typename Traits::const_value_type,
+                             typename Traits::value_type>::value &&
+                (sizeof(typename Traits::const_value_type) == 4 ||
+                 sizeof(typename Traits::const_value_type) == 8 ||
+                 sizeof(typename Traits::const_value_type) == 16) &&
+                // Random access trait
+                (Traits::memory_traits::is_random_access != 0))>::type> {
+ public:
+  using track_type = Kokkos::Impl::SharedAllocationTracker;
 
-  using track_type  = Kokkos::Impl::SharedAllocationTracker ;
+  using value_type  = typename Traits::const_value_type;
+  using return_type = typename Traits::const_value_type;  // NOT a reference
 
-  using value_type  = typename Traits::const_value_type ;
-  using return_type = typename Traits::const_value_type ; // NOT a reference
+  using alias_type = typename std::conditional<
+      (sizeof(value_type) == 4), int,
+      typename std::conditional<
+          (sizeof(value_type) == 8), ::int2,
+          typename std::conditional<(sizeof(value_type) == 16), ::int4,
+                                    void>::type>::type>::type;
 
-  using alias_type = typename std::conditional< ( sizeof(value_type) ==  4 ) , int ,
-                     typename std::conditional< ( sizeof(value_type) ==  8 ) , ::int2 ,
-                     typename std::conditional< ( sizeof(value_type) == 16 ) , ::int4 , void
-                     >::type
-                     >::type
-                     >::type ;
-
-#if defined( KOKKOS_ENABLE_CUDA_LDG_INTRINSIC )
-  using handle_type = Kokkos::Impl::CudaLDGFetch< value_type , alias_type > ;
+#if defined(KOKKOS_ENABLE_CUDA_LDG_INTRINSIC)
+  using handle_type = Kokkos::Impl::CudaLDGFetch<value_type, alias_type>;
 #else
-  using handle_type = Kokkos::Impl::CudaTextureFetch< value_type , alias_type > ;
+  using handle_type = Kokkos::Impl::CudaTextureFetch<value_type, alias_type>;
 #endif
 
   KOKKOS_INLINE_FUNCTION
-  static handle_type const & assign( handle_type const & arg_handle , track_type const & /* arg_tracker */ )
-    {
-      return arg_handle ;
-    }
+  static handle_type const& assign(handle_type const& arg_handle,
+                                   track_type const& /* arg_tracker */) {
+    return arg_handle;
+  }
 
   KOKKOS_INLINE_FUNCTION
-  static handle_type const assign( handle_type const & arg_handle , size_t offset )
-    {
-      return handle_type(arg_handle,offset) ;
-    }
+  static handle_type const assign(handle_type const& arg_handle,
+                                  size_t offset) {
+    return handle_type(arg_handle, offset);
+  }
 
   KOKKOS_INLINE_FUNCTION
-  static handle_type assign( value_type * arg_data_ptr, track_type const & arg_tracker )
-    {
-      if(arg_data_ptr == NULL) return handle_type();
+  static handle_type assign(value_type* arg_data_ptr,
+                            track_type const& arg_tracker) {
+    if (arg_data_ptr == NULL) return handle_type();
 
-#if defined( KOKKOS_ACTIVE_EXECUTION_MEMORY_SPACE_HOST )
-      // Assignment of texture = non-texture requires creation of a texture object
-      // which can only occur on the host.  In addition, 'get_record' is only valid
-      // if called in a host execution space
+#if defined(KOKKOS_ACTIVE_EXECUTION_MEMORY_SPACE_HOST)
+    // Assignment of texture = non-texture requires creation of a texture object
+    // which can only occur on the host.  In addition, 'get_record' is only
+    // valid if called in a host execution space
 
+    typedef typename Traits::memory_space memory_space;
+    typedef typename Impl::SharedAllocationRecord<memory_space, void> record;
 
-      typedef typename Traits::memory_space memory_space ;
-      typedef typename Impl::SharedAllocationRecord<memory_space,void> record ;
+    record* const r = arg_tracker.template get_record<memory_space>();
 
-      record * const r = arg_tracker.template get_record< memory_space >();
-
-#if ! defined( KOKKOS_ENABLE_CUDA_LDG_INTRINSIC )
-      if ( 0 == r ) {
-        Kokkos::abort("Cuda const random access View using Cuda texture memory requires Kokkos to allocate the View's memory");
-      }
+#if !defined(KOKKOS_ENABLE_CUDA_LDG_INTRINSIC)
+    if (0 == r) {
+      Kokkos::abort(
+          "Cuda const random access View using Cuda texture memory requires "
+          "Kokkos to allocate the View's memory");
+    }
 #endif
 
-      return handle_type( arg_data_ptr , r );
+    return handle_type(arg_data_ptr, r);
 
 #else
-      Kokkos::Impl::cuda_abort("Cannot create Cuda texture object from within a Cuda kernel");
-      return handle_type();
+    Kokkos::Impl::cuda_abort(
+        "Cannot create Cuda texture object from within a Cuda kernel");
+    return handle_type();
 #endif
-    }
+  }
 };
 
-} // namespace Impl
-} // namespace Kokkos
+}  // namespace Impl
+}  // namespace Kokkos
 
 //----------------------------------------------------------------------------
 //----------------------------------------------------------------------------
 
 #endif /* #if defined( KOKKOS_ENABLE_CUDA ) */
 #endif /* #ifndef KOKKOS_CUDA_VIEW_HPP */
-
diff --git a/lib/kokkos/core/src/Cuda/Kokkos_Cuda_ViewCopyETIAvail.hpp b/lib/kokkos/core/src/Cuda/Kokkos_Cuda_ViewCopyETIAvail.hpp
index 33615f3f9f..2fbfb67277 100644
--- a/lib/kokkos/core/src/Cuda/Kokkos_Cuda_ViewCopyETIAvail.hpp
+++ b/lib/kokkos/core/src/Cuda/Kokkos_Cuda_ViewCopyETIAvail.hpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -48,10 +49,9 @@ namespace Kokkos {
 namespace Impl {
 #define KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE Kokkos::Cuda
 
-#include<eti/common/Kokkos_ViewFillCopyETIAvail_Macros.hpp>
+#include <eti/common/Kokkos_ViewFillCopyETIAvail_Macros.hpp>
 
 #undef KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
 #endif
-
diff --git a/lib/kokkos/core/src/Cuda/Kokkos_Cuda_ViewCopyETIDecl.hpp b/lib/kokkos/core/src/Cuda/Kokkos_Cuda_ViewCopyETIDecl.hpp
index befff1a865..18e56aa32d 100644
--- a/lib/kokkos/core/src/Cuda/Kokkos_Cuda_ViewCopyETIDecl.hpp
+++ b/lib/kokkos/core/src/Cuda/Kokkos_Cuda_ViewCopyETIDecl.hpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -48,10 +49,9 @@ namespace Kokkos {
 namespace Impl {
 #define KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE Kokkos::Cuda
 
-#include<eti/common/Kokkos_ViewFillCopyETIDecl_Macros.hpp>
+#include <eti/common/Kokkos_ViewFillCopyETIDecl_Macros.hpp>
 
 #undef KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
 #endif
-
diff --git a/lib/kokkos/core/src/Cuda/Kokkos_Cuda_WorkGraphPolicy.hpp b/lib/kokkos/core/src/Cuda/Kokkos_Cuda_WorkGraphPolicy.hpp
index 9c0ac470c8..0753e383a1 100644
--- a/lib/kokkos/core/src/Cuda/Kokkos_Cuda_WorkGraphPolicy.hpp
+++ b/lib/kokkos/core/src/Cuda/Kokkos_Cuda_WorkGraphPolicy.hpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -47,74 +48,64 @@
 namespace Kokkos {
 namespace Impl {
 
-template< class FunctorType , class ... Traits >
-class ParallelFor< FunctorType
-                 , Kokkos::WorkGraphPolicy< Traits ... >
-                 , Kokkos::Cuda
-                 >
-{
-public:
+template <class FunctorType, class... Traits>
+class ParallelFor<FunctorType, Kokkos::WorkGraphPolicy<Traits...>,
+                  Kokkos::Cuda> {
+ public:
+  typedef Kokkos::WorkGraphPolicy<Traits...> Policy;
+  typedef ParallelFor<FunctorType, Policy, Kokkos::Cuda> Self;
 
-  typedef Kokkos::WorkGraphPolicy< Traits ... >   Policy ;
-  typedef ParallelFor<FunctorType, Policy, Kokkos::Cuda>        Self ;
+ private:
+  Policy m_policy;
+  FunctorType m_functor;
 
-private:
-
-  Policy       m_policy ;
-  FunctorType  m_functor ;
-
-  template< class TagType >
+  template <class TagType>
   __device__ inline
-  typename std::enable_if< std::is_same< TagType , void >::value >::type
-  exec_one( const std::int32_t w ) const noexcept
-    { m_functor( w ); }
+      typename std::enable_if<std::is_same<TagType, void>::value>::type
+      exec_one(const std::int32_t w) const noexcept {
+    m_functor(w);
+  }
 
-  template< class TagType >
+  template <class TagType>
   __device__ inline
-  typename std::enable_if< ! std::is_same< TagType , void >::value >::type
-  exec_one( const std::int32_t w ) const noexcept
-    { const TagType t{} ; m_functor( t , w ); }
+      typename std::enable_if<!std::is_same<TagType, void>::value>::type
+      exec_one(const std::int32_t w) const noexcept {
+    const TagType t{};
+    m_functor(t, w);
+  }
 
-public:
+ public:
+  __device__ inline void operator()() const noexcept {
+    if (0 == (threadIdx.y % 16)) {
+      // Spin until COMPLETED_TOKEN.
+      // END_TOKEN indicates no work is currently available.
 
-  __device__ inline
-  void operator()() const noexcept
-    {
-      if ( 0 == ( threadIdx.y % 16 ) ) {
-
-        // Spin until COMPLETED_TOKEN.
-        // END_TOKEN indicates no work is currently available.
-
-        for ( std::int32_t w = Policy::END_TOKEN ;
-              Policy::COMPLETED_TOKEN != ( w = m_policy.pop_work() ) ; ) {
-          if ( Policy::END_TOKEN != w ) {
-            exec_one< typename Policy::work_tag >( w );
-            m_policy.completed_work(w);
-          }
+      for (std::int32_t w = Policy::END_TOKEN;
+           Policy::COMPLETED_TOKEN != (w = m_policy.pop_work());) {
+        if (Policy::END_TOKEN != w) {
+          exec_one<typename Policy::work_tag>(w);
+          m_policy.completed_work(w);
         }
       }
     }
-
-  inline
-  void execute()
-  {
-    const int warps_per_block = 4 ;
-    const dim3 grid( Kokkos::Impl::cuda_internal_multiprocessor_count() , 1 , 1 );
-    const dim3 block( 1 , Kokkos::Impl::CudaTraits::WarpSize , warps_per_block );
-    const int shared = 0 ;
-
-    Kokkos::Impl::CudaParallelLaunch<Self>(*this, grid, block, shared, Cuda().impl_internal_space_instance() , false );
   }
 
-  inline
-  ParallelFor( const FunctorType & arg_functor
-             , const Policy      & arg_policy )
-    : m_policy( arg_policy )
-    , m_functor( arg_functor )
-  {}
+  inline void execute() {
+    const int warps_per_block = 4;
+    const dim3 grid(Kokkos::Impl::cuda_internal_multiprocessor_count(), 1, 1);
+    const dim3 block(1, Kokkos::Impl::CudaTraits::WarpSize, warps_per_block);
+    const int shared = 0;
+
+    Kokkos::Impl::CudaParallelLaunch<Self>(
+        *this, grid, block, shared, Cuda().impl_internal_space_instance(),
+        false);
+  }
+
+  inline ParallelFor(const FunctorType& arg_functor, const Policy& arg_policy)
+      : m_policy(arg_policy), m_functor(arg_functor) {}
 };
 
-} // namespace Impl
-} // namespace Kokkos
+}  // namespace Impl
+}  // namespace Kokkos
 
 #endif /* #define KOKKOS_CUDA_WORKGRAPHPOLICY_HPP */
diff --git a/lib/kokkos/core/src/Cuda/Kokkos_Cuda_abort.hpp b/lib/kokkos/core/src/Cuda/Kokkos_Cuda_abort.hpp
index 9f5415b511..698695dbdb 100644
--- a/lib/kokkos/core/src/Cuda/Kokkos_Cuda_abort.hpp
+++ b/lib/kokkos/core/src/Cuda/Kokkos_Cuda_abort.hpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -47,7 +48,7 @@
 //----------------------------------------------------------------------------
 //----------------------------------------------------------------------------
 #include <Kokkos_Macros.hpp>
-#if defined( __CUDACC__ ) && defined( KOKKOS_ENABLE_CUDA )
+#if defined(__CUDACC__) && defined(KOKKOS_ENABLE_CUDA)
 
 #include <cuda.h>
 
@@ -55,35 +56,26 @@ extern "C" {
 /*  Cuda runtime function, declared in <crt/device_runtime.h>
  *  Requires capability 2.x or better.
  */
-extern __device__ void __assertfail(
-  const void  *message,
-  const void  *file,
-  unsigned int line,
-  const void  *function,
-  size_t       charsize);
+extern __device__ void __assertfail(const void *message, const void *file,
+                                    unsigned int line, const void *function,
+                                    size_t charsize);
 }
 
 namespace Kokkos {
 namespace Impl {
 
-__device__ inline
-void cuda_abort( const char * const message )
-{
+__device__ inline void cuda_abort(const char *const message) {
 #ifndef __APPLE__
-  const char empty[] = "" ;
+  const char empty[] = "";
 
-  __assertfail( (const void *) message ,
-                (const void *) empty ,
-                (unsigned int) 0 ,
-                (const void *) empty ,
-                sizeof(char) );
+  __assertfail((const void *)message, (const void *)empty, (unsigned int)0,
+               (const void *)empty, sizeof(char));
 #endif
 }
 
-} // namespace Impl
-} // namespace Kokkos
+}  // namespace Impl
+}  // namespace Kokkos
 #else
 void KOKKOS_CORE_SRC_CUDA_ABORT_PREVENT_LINK_ERROR() {}
 #endif /* #if defined(__CUDACC__) && defined( KOKKOS_ENABLE_CUDA ) */
 #endif /* #ifndef KOKKOS_CUDA_ABORT_HPP */
-
diff --git a/lib/kokkos/core/src/HPX/Kokkos_HPX.cpp b/lib/kokkos/core/src/HPX/Kokkos_HPX.cpp
index da9783467c..0c4cca70f8 100644
--- a/lib/kokkos/core/src/HPX/Kokkos_HPX.cpp
+++ b/lib/kokkos/core/src/HPX/Kokkos_HPX.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -41,7 +42,6 @@
 //@HEADER
 */
 
-
 #include <Kokkos_Macros.hpp>
 
 #ifdef KOKKOS_ENABLE_HPX
@@ -80,8 +80,8 @@ void HPX::impl_initialize(int thread_count) {
         "--hpx:attach-debugger=exception",
 #endif
     };
-    int argc_hpx = 1;
-    char name[] = "kokkos_hpx";
+    int argc_hpx     = 1;
+    char name[]      = "kokkos_hpx";
     char *argv_hpx[] = {name, nullptr};
     hpx::start(nullptr, argc_hpx, argv_hpx, config);
 
@@ -107,8 +107,8 @@ void HPX::impl_initialize() {
         "--hpx:attach-debugger=exception",
 #endif
     };
-    int argc_hpx = 1;
-    char name[] = "kokkos_hpx";
+    int argc_hpx     = 1;
+    char name[]      = "kokkos_hpx";
     char *argv_hpx[] = {name, nullptr};
     hpx::start(nullptr, argc_hpx, argv_hpx, config);
 
@@ -138,15 +138,16 @@ void HPX::impl_finalize() {
       hpx::apply([]() { hpx::finalize(); });
       hpx::stop();
     } else {
-      Kokkos::abort("Kokkos::Experimental::HPX::impl_finalize: Kokkos started "
-                    "HPX but something else already stopped HPX\n");
+      Kokkos::abort(
+          "Kokkos::Experimental::HPX::impl_finalize: Kokkos started "
+          "HPX but something else already stopped HPX\n");
     }
   }
 }
 
-} // namespace Experimental
-} // namespace Kokkos
+}  // namespace Experimental
+}  // namespace Kokkos
 
 #else
 void KOKKOS_CORE_SRC_IMPL_HPX_PREVENT_LINK_ERROR() {}
-#endif //#ifdef KOKKOS_ENABLE_HPX
+#endif  //#ifdef KOKKOS_ENABLE_HPX
diff --git a/lib/kokkos/core/src/HPX/Kokkos_HPX_ChunkedRoundRobinExecutor.hpp b/lib/kokkos/core/src/HPX/Kokkos_HPX_ChunkedRoundRobinExecutor.hpp
new file mode 100644
index 0000000000..b364b4a6eb
--- /dev/null
+++ b/lib/kokkos/core/src/HPX/Kokkos_HPX_ChunkedRoundRobinExecutor.hpp
@@ -0,0 +1,208 @@
+/*
+//@HEADER
+// ************************************************************************
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
+// the U.S. Government retains certain rights in this software.
+//
+// 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 Corporation nor the names of the
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 NTESS OR THE
+// 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.
+//
+// Questions? Contact Christian R. Trott (crtrott@sandia.gov)
+//
+// ************************************************************************
+//@HEADER
+*/
+
+#ifndef KOKKOS_HPX_CHUNKEDROUNDROBINEXECUTOR_HPP
+#define KOKKOS_HPX_CHUNKEDROUNDROBINEXECUTOR_HPP
+
+#include <hpx/config.hpp>
+#include <hpx/async_launch_policy_dispatch.hpp>
+#include <hpx/lcos/local/latch.hpp>
+#include <hpx/parallel/executors/execution.hpp>
+#include <hpx/parallel/executors/post_policy_dispatch.hpp>
+#include <hpx/runtime/get_os_thread_count.hpp>
+#include <hpx/runtime/threads/thread_helpers.hpp>
+#include <hpx/traits/is_executor.hpp>
+#include <hpx/traits/is_launch_policy.hpp>
+#include <hpx/util/deferred_call.hpp>
+
+#include <cstddef>
+#include <type_traits>
+#include <utility>
+#include <vector>
+
+namespace Kokkos {
+namespace Impl {
+
+///////////////////////////////////////////////////////////////////////////
+/// A \a ChunkedRoundRobinExecutor creates groups of parallel execution
+/// agents which execute in threads implicitly created by the executor. This
+/// executor uses the scheduling hint to spawn threads with the first grouped on
+/// the first core, the second group getting the next consecutive threads, etc.
+/// For example, if 10 tasks are spawned (num_tasks is set to 10) and num_cores
+/// is set to 2 the executor will schedule the tasks in the following order:
+///
+/// worker thread | 1 | 2
+/// --------------+---+---
+/// tasks         | 1 | 6
+///               | 2 | 7
+///               | 3 | 8
+///               | 4 | 9
+///               | 5 | 10
+///
+/// rather than the typical round robin:
+///
+/// worker thread | 1 | 2
+/// --------------+---+---
+/// tasks         | 1 | 2
+///               | 3 | 4
+///               | 5 | 6
+///               | 7 | 8
+///               | 9 | 10
+struct ChunkedRoundRobinExecutor {
+  using execution_category = hpx::parallel::execution::parallel_execution_tag;
+
+  HPX_CONSTEXPR explicit ChunkedRoundRobinExecutor(
+      std::size_t num_tasks = std::size_t(-1), std::size_t core_offset = 0,
+      std::size_t num_cores = hpx::get_os_thread_count())
+      : num_tasks_(num_tasks),
+        core_offset_(core_offset),
+        num_cores_(num_cores),
+        num_tasks_per_core_(double(num_tasks_) / num_cores_),
+        num_tasks_spawned_(0) {}
+
+  bool operator==(ChunkedRoundRobinExecutor const &rhs) const noexcept {
+    return num_cores_ == rhs.num_cores_ && num_tasks_ == rhs.num_tasks_;
+  }
+
+  bool operator!=(ChunkedRoundRobinExecutor const &rhs) const noexcept {
+    return !(*this == rhs);
+  }
+
+  ChunkedRoundRobinExecutor const &context() const noexcept { return *this; }
+
+  template <typename F, typename... Ts>
+  hpx::future<
+      typename hpx::util::detail::invoke_deferred_result<F, Ts...>::type>
+  async_execute(F &&f, Ts &&... ts) const {
+    return hpx::detail::async_launch_policy_dispatch<hpx::launch>::call(
+        hpx::launch::async_policy{}, std::forward<F>(f),
+        std::forward<Ts>(ts)...);
+  }
+
+  template <typename F, typename... Ts>
+  void post(F &&f, Ts &&... ts) const {
+    hpx::util::thread_description const desc(
+        f, "Kokkos::Impl::ChunkedRoundRobinExecutor::async_execute");
+    hpx::threads::thread_schedule_hint const hint(
+        hpx::threads::thread_schedule_hint_mode_thread,
+        core_offset_ + std::floor(double(num_tasks_spawned_ % num_tasks_) /
+                                  num_tasks_per_core_));
+
+    hpx::threads::register_thread_nullary(
+        hpx::util::deferred_call(std::forward<F>(f), std::forward<Ts>(ts)...),
+        desc, hpx::threads::pending, false,
+        hpx::threads::thread_priority_normal, hint,
+        hpx::threads::thread_stacksize_default);
+
+    ++num_tasks_spawned_;
+  }
+
+  template <typename F, typename Shape, typename... Ts>
+  std::vector<hpx::future<typename hpx::parallel::execution::detail::
+                              bulk_function_result<F, Shape, Ts...>::type>>
+  bulk_async_execute(F &&f, Shape const &shape, Ts &&... ts) {
+    hpx::util::thread_description desc(
+        f, "Kokkos::Impl::ChunkedRoundRobinExecutor::bulk_sync_execute");
+
+    hpx::lcos::local::latch l(hpx::util::size(shape));
+    // Keep a separate counter for bulk launch
+    std::size_t num_tasks_spawned = 0;
+
+    for (auto const &s : shape) {
+      hpx::threads::thread_schedule_hint const hint(
+          hpx::threads::thread_schedule_hint_mode_thread,
+          core_offset_ + std::floor(double(num_tasks_spawned % num_tasks_) /
+                                    num_tasks_per_core_));
+
+      hpx::threads::register_thread_nullary(
+          [&, s]() {
+            hpx::util::invoke(f, s, ts...);
+            l.count_down(1);
+          },
+          desc, hpx::threads::pending, false,
+          hpx::threads::thread_priority_normal, hint,
+          hpx::threads::thread_stacksize_default);
+
+      ++num_tasks_spawned;
+    }
+
+    // NOTE: We block here to avoid extra synchronization. Since this executor
+    // is only used in the HPX backend we get away with this.
+    l.wait();
+
+    return {};
+  }
+
+ private:
+  std::size_t num_tasks_;
+  std::size_t core_offset_;
+  std::size_t num_cores_;
+  double num_tasks_per_core_;
+  mutable std::size_t num_tasks_spawned_;
+};
+
+}  // namespace Impl
+}  // namespace Kokkos
+
+namespace hpx {
+namespace parallel {
+namespace execution {
+
+template <>
+struct is_one_way_executor<Kokkos::Impl::ChunkedRoundRobinExecutor>
+    : std::true_type {};
+
+template <>
+struct is_two_way_executor<Kokkos::Impl::ChunkedRoundRobinExecutor>
+    : std::true_type {};
+
+template <>
+struct is_bulk_two_way_executor<Kokkos::Impl::ChunkedRoundRobinExecutor>
+    : std::true_type {};
+
+}  // namespace execution
+}  // namespace parallel
+}  // namespace hpx
+
+#endif
diff --git a/lib/kokkos/core/src/HPX/Kokkos_HPX_Task.cpp b/lib/kokkos/core/src/HPX/Kokkos_HPX_Task.cpp
index df7c403685..8d42589bdf 100644
--- a/lib/kokkos/core/src/HPX/Kokkos_HPX_Task.cpp
+++ b/lib/kokkos/core/src/HPX/Kokkos_HPX_Task.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -57,9 +58,9 @@ namespace Impl {
 template class TaskQueue<Kokkos::Experimental::HPX,
                          Kokkos::Experimental::HPX::memory_space>;
 
-} // namespace Impl
-} // namespace Kokkos
+}  // namespace Impl
+}  // namespace Kokkos
 
 #else
 void KOKKOS_CORE_SRC_IMPL_HPX_TASK_PREVENT_LINK_ERROR() {}
-#endif // #if defined( KOKKOS_ENABLE_HPX ) && defined( KOKKOS_ENABLE_TASKDAG )
+#endif  // #if defined( KOKKOS_ENABLE_HPX ) && defined( KOKKOS_ENABLE_TASKDAG )
diff --git a/lib/kokkos/core/src/HPX/Kokkos_HPX_Task.hpp b/lib/kokkos/core/src/HPX/Kokkos_HPX_Task.hpp
index c3a14efee6..803d955914 100644
--- a/lib/kokkos/core/src/HPX/Kokkos_HPX_Task.hpp
+++ b/lib/kokkos/core/src/HPX/Kokkos_HPX_Task.hpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -49,10 +50,11 @@
 
 #include <Kokkos_TaskScheduler_fwd.hpp>
 
+#include <HPX/Kokkos_HPX_ChunkedRoundRobinExecutor.hpp>
 #include <Kokkos_HPX.hpp>
 
 #include <hpx/apply.hpp>
-#include <hpx/lcos/local/counting_semaphore.hpp>
+#include <hpx/lcos/local/latch.hpp>
 
 #include <type_traits>
 
@@ -65,7 +67,7 @@ namespace Impl {
 template <class QueueType>
 class TaskQueueSpecialization<
     SimpleTaskScheduler<Kokkos::Experimental::HPX, QueueType>> {
-public:
+ public:
   using execution_space = Kokkos::Experimental::HPX;
   using scheduler_type =
       SimpleTaskScheduler<Kokkos::Experimental::HPX, QueueType>;
@@ -85,7 +87,7 @@ public:
   // Must provide task queue execution function
   void execute_task() const {
     using hpx::apply;
-    using hpx::lcos::local::counting_semaphore;
+    using hpx::lcos::local::latch;
     using task_base_type = typename scheduler_type::task_base_type;
 
     const int num_worker_threads = Kokkos::Experimental::HPX::concurrency();
@@ -95,25 +97,28 @@ public:
 
     auto &queue = scheduler->queue();
 
-    counting_semaphore sem(0);
+    latch num_tasks_remaining(num_worker_threads);
+    ChunkedRoundRobinExecutor exec(num_worker_threads);
 
     for (int thread = 0; thread < num_worker_threads; ++thread) {
-      apply([this, &sem, &queue, &buffer, num_worker_threads, thread]() {
+      apply(exec, [this, &num_tasks_remaining, &queue, &buffer,
+                   num_worker_threads]() {
         // NOTE: This implementation has been simplified based on the
         // assumption that team_size = 1. The HPX backend currently only
         // supports a team size of 1.
         std::size_t t = Kokkos::Experimental::HPX::impl_hardware_thread_id();
 
         buffer.get(Kokkos::Experimental::HPX::impl_hardware_thread_id());
-        HPXTeamMember member(TeamPolicyInternal<Kokkos::Experimental::HPX>(
-                                 Kokkos::Experimental::HPX(), num_worker_threads, 1),
-                             0, t, buffer.get(t), 512);
+        HPXTeamMember member(
+            TeamPolicyInternal<Kokkos::Experimental::HPX>(
+                Kokkos::Experimental::HPX(), num_worker_threads, 1),
+            0, t, buffer.get(t), 512);
 
         member_type single_exec(*scheduler, member);
         member_type &team_exec = single_exec;
 
         auto &team_scheduler = team_exec.scheduler();
-        auto current_task = OptionalRef<task_base_type>(nullptr);
+        auto current_task    = OptionalRef<task_base_type>(nullptr);
 
         while (!queue.is_done()) {
           current_task =
@@ -128,11 +133,11 @@ public:
           }
         }
 
-        sem.signal(1);
+        num_tasks_remaining.count_down(1);
       });
     }
 
-    sem.wait(num_worker_threads);
+    num_tasks_remaining.wait();
   }
 
   static uint32_t get_max_team_count(execution_space const &espace) {
@@ -142,11 +147,11 @@ public:
   template <typename TaskType>
   static void get_function_pointer(typename TaskType::function_type &ptr,
                                    typename TaskType::destroy_type &dtor) {
-    ptr = TaskType::apply;
+    ptr  = TaskType::apply;
     dtor = TaskType::destroy;
   }
 
-private:
+ private:
   const scheduler_type *scheduler;
 };
 
@@ -155,21 +160,21 @@ class TaskQueueSpecializationConstrained<
     Scheduler, typename std::enable_if<
                    std::is_same<typename Scheduler::execution_space,
                                 Kokkos::Experimental::HPX>::value>::type> {
-public:
+ public:
   using execution_space = Kokkos::Experimental::HPX;
-  using scheduler_type = Scheduler;
+  using scheduler_type  = Scheduler;
   using member_type =
       TaskTeamMemberAdapter<Kokkos::Impl::HPXTeamMember, scheduler_type>;
   using memory_space = Kokkos::HostSpace;
 
-  static void
-  iff_single_thread_recursive_execute(scheduler_type const &scheduler) {
+  static void iff_single_thread_recursive_execute(
+      scheduler_type const &scheduler) {
     using task_base_type = typename scheduler_type::task_base;
-    using queue_type = typename scheduler_type::queue_type;
+    using queue_type     = typename scheduler_type::queue_type;
 
     if (1 == Kokkos::Experimental::HPX::concurrency()) {
       task_base_type *const end = (task_base_type *)task_base_type::EndTag;
-      task_base_type *task = end;
+      task_base_type *task      = end;
 
       HPXTeamMember member(TeamPolicyInternal<Kokkos::Experimental::HPX>(
                                Kokkos::Experimental::HPX(), 1, 1),
@@ -187,8 +192,7 @@ public:
           }
         }
 
-        if (end == task)
-          break;
+        if (end == task) break;
 
         (*task->m_apply)(task, &single_exec);
 
@@ -210,11 +214,11 @@ public:
   // Must provide task queue execution function
   void execute_task() const {
     using hpx::apply;
-    using hpx::lcos::local::counting_semaphore;
+    using hpx::lcos::local::latch;
     using task_base_type = typename scheduler_type::task_base;
-    using queue_type = typename scheduler_type::queue_type;
+    using queue_type     = typename scheduler_type::queue_type;
 
-    const int num_worker_threads = Kokkos::Experimental::HPX::concurrency();
+    const int num_worker_threads     = Kokkos::Experimental::HPX::concurrency();
     static task_base_type *const end = (task_base_type *)task_base_type::EndTag;
     constexpr task_base_type *no_more_tasks_sentinel = nullptr;
 
@@ -224,10 +228,11 @@ public:
     auto &queue = scheduler->queue();
     queue.initialize_team_queues(num_worker_threads);
 
-    counting_semaphore sem(0);
+    latch num_tasks_remaining(num_worker_threads);
+    ChunkedRoundRobinExecutor exec(num_worker_threads);
 
     for (int thread = 0; thread < num_worker_threads; ++thread) {
-      apply([this, &sem, &buffer, num_worker_threads, thread]() {
+      apply(exec, [this, &num_tasks_remaining, &buffer, num_worker_threads]() {
         // NOTE: This implementation has been simplified based on the assumption
         // that team_size = 1. The HPX backend currently only supports a team
         // size of 1.
@@ -242,7 +247,7 @@ public:
         member_type single_exec(*scheduler, member);
         member_type &team_exec = single_exec;
 
-        auto &team_queue = team_exec.scheduler().queue();
+        auto &team_queue     = team_exec.scheduler().queue();
         task_base_type *task = no_more_tasks_sentinel;
 
         do {
@@ -266,21 +271,21 @@ public:
           }
         } while (task != no_more_tasks_sentinel);
 
-        sem.signal(1);
+        num_tasks_remaining.count_down(1);
       });
     }
 
-    sem.wait(num_worker_threads);
+    num_tasks_remaining.wait();
   }
 
   template <typename TaskType>
   static void get_function_pointer(typename TaskType::function_type &ptr,
                                    typename TaskType::destroy_type &dtor) {
-    ptr = TaskType::apply;
+    ptr  = TaskType::apply;
     dtor = TaskType::destroy;
   }
 
-private:
+ private:
   const scheduler_type *scheduler;
 };
 
@@ -288,8 +293,8 @@ extern template class TaskQueue<
     Kokkos::Experimental::HPX,
     typename Kokkos::Experimental::HPX::memory_space>;
 
-} // namespace Impl
-} // namespace Kokkos
+}  // namespace Impl
+}  // namespace Kokkos
 
 //----------------------------------------------------------------------------
 //----------------------------------------------------------------------------
diff --git a/lib/kokkos/core/src/HPX/Kokkos_HPX_ViewCopyETIAvail.hpp b/lib/kokkos/core/src/HPX/Kokkos_HPX_ViewCopyETIAvail.hpp
index bbc1b33bf9..99020a3e0d 100644
--- a/lib/kokkos/core/src/HPX/Kokkos_HPX_ViewCopyETIAvail.hpp
+++ b/lib/kokkos/core/src/HPX/Kokkos_HPX_ViewCopyETIAvail.hpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -48,10 +49,9 @@ namespace Kokkos {
 namespace Impl {
 #define KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE Kokkos::Experimental::HPX
 
-#include<eti/common/Kokkos_ViewFillCopyETIAvail_Macros.hpp>
+#include <eti/common/Kokkos_ViewFillCopyETIAvail_Macros.hpp>
 
 #undef KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
 #endif
-
diff --git a/lib/kokkos/core/src/HPX/Kokkos_HPX_ViewCopyETIDecl.hpp b/lib/kokkos/core/src/HPX/Kokkos_HPX_ViewCopyETIDecl.hpp
index aa1c2f1518..fae486f4b0 100644
--- a/lib/kokkos/core/src/HPX/Kokkos_HPX_ViewCopyETIDecl.hpp
+++ b/lib/kokkos/core/src/HPX/Kokkos_HPX_ViewCopyETIDecl.hpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -48,10 +49,9 @@ namespace Kokkos {
 namespace Impl {
 #define KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE Kokkos::Experimental::HPX
 
-#include<eti/common/Kokkos_ViewFillCopyETIDecl_Macros.hpp>
+#include <eti/common/Kokkos_ViewFillCopyETIDecl_Macros.hpp>
 
 #undef KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
 #endif
-
diff --git a/lib/kokkos/core/src/HPX/Kokkos_HPX_WorkGraphPolicy.hpp b/lib/kokkos/core/src/HPX/Kokkos_HPX_WorkGraphPolicy.hpp
index 4dd28dd994..6705005c1b 100644
--- a/lib/kokkos/core/src/HPX/Kokkos_HPX_WorkGraphPolicy.hpp
+++ b/lib/kokkos/core/src/HPX/Kokkos_HPX_WorkGraphPolicy.hpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -44,8 +45,10 @@
 #ifndef KOKKOS_HPX_WORKGRAPHPOLICY_HPP
 #define KOKKOS_HPX_WORKGRAPHPOLICY_HPP
 
+#include <HPX/Kokkos_HPX_ChunkedRoundRobinExecutor.hpp>
+
 #include <hpx/apply.hpp>
-#include <hpx/lcos/local/counting_semaphore.hpp>
+#include <hpx/lcos/local/latch.hpp>
 
 namespace Kokkos {
 namespace Impl {
@@ -53,8 +56,8 @@ namespace Impl {
 template <class FunctorType, class... Traits>
 class ParallelFor<FunctorType, Kokkos::WorkGraphPolicy<Traits...>,
                   Kokkos::Experimental::HPX> {
-private:
-  using Policy = Kokkos::WorkGraphPolicy<Traits...>;
+ private:
+  using Policy  = Kokkos::WorkGraphPolicy<Traits...>;
   using WorkTag = typename Policy::work_tag;
 
   Policy m_policy;
@@ -73,7 +76,7 @@ private:
     m_functor(t, w);
   }
 
-public:
+ public:
   void execute() const {
     dispatch_execute_task(this);
     Kokkos::Experimental::HPX().fence();
@@ -83,12 +86,13 @@ public:
     const int num_worker_threads = Kokkos::Experimental::HPX::concurrency();
 
     using hpx::apply;
-    using hpx::lcos::local::counting_semaphore;
+    using hpx::lcos::local::latch;
 
-    counting_semaphore sem(0);
+    latch num_tasks_remaining(num_worker_threads);
+    ChunkedRoundRobinExecutor exec(num_worker_threads);
 
     for (int thread = 0; thread < num_worker_threads; ++thread) {
-      apply([this, &sem]() {
+      apply(exec, [this, &num_tasks_remaining]() {
         std::int32_t w = m_policy.pop_work();
         while (w != Policy::COMPLETED_TOKEN) {
           if (w != Policy::END_TOKEN) {
@@ -99,18 +103,18 @@ public:
           w = m_policy.pop_work();
         }
 
-        sem.signal(1);
+        num_tasks_remaining.count_down(1);
       });
     }
 
-    sem.wait(num_worker_threads);
+    num_tasks_remaining.wait();
   }
 
   inline ParallelFor(const FunctorType &arg_functor, const Policy &arg_policy)
       : m_policy(arg_policy), m_functor(arg_functor) {}
 };
 
-} // namespace Impl
-} // namespace Kokkos
+}  // namespace Impl
+}  // namespace Kokkos
 
 #endif /* #define KOKKOS_HPX_WORKGRAPHPOLICY_HPP */
diff --git a/lib/kokkos/core/src/KokkosExp_MDRangePolicy.hpp b/lib/kokkos/core/src/KokkosExp_MDRangePolicy.hpp
index 1972aa485b..7981c04b4f 100644
--- a/lib/kokkos/core/src/KokkosExp_MDRangePolicy.hpp
+++ b/lib/kokkos/core/src/KokkosExp_MDRangePolicy.hpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -48,16 +49,16 @@
 
 #include <Kokkos_Layout.hpp>
 
-#include<impl/KokkosExp_Host_IterateTile.hpp>
+#include <impl/KokkosExp_Host_IterateTile.hpp>
 #include <Kokkos_ExecPolicy.hpp>
 #include <Kokkos_Parallel.hpp>
 
-#if defined( __CUDACC__ ) && defined( KOKKOS_ENABLE_CUDA )
-#include<Cuda/KokkosExp_Cuda_IterateTile.hpp>
+#if defined(__CUDACC__) && defined(KOKKOS_ENABLE_CUDA)
+#include <Cuda/KokkosExp_Cuda_IterateTile.hpp>
 #include <Cuda/KokkosExp_Cuda_IterateTile_Refactor.hpp>
 #endif
 
-#if defined( __HCC__ ) && defined( KOKKOS_ENABLE_ROCM )
+#if defined(__HCC__) && defined(KOKKOS_ENABLE_ROCM)
 //#include<ROCm/KokkosExp_ROCm_IterateTile.hpp>
 #include <ROCm/KokkosExp_ROCm_IterateTile_Refactor.hpp>
 #endif
@@ -76,583 +77,613 @@ enum class Iterate
 */
 
 template <typename ExecSpace>
-struct default_outer_direction
-{
+struct default_outer_direction {
   using type = Iterate;
-  #if defined( KOKKOS_ENABLE_CUDA)||defined( KOKKOS_ENABLE_ROCM)
+#if defined(KOKKOS_ENABLE_CUDA) || defined(KOKKOS_ENABLE_ROCM)
   static constexpr Iterate value = Iterate::Left;
-  #else
+#else
   static constexpr Iterate value = Iterate::Right;
-  #endif
+#endif
 };
 
 template <typename ExecSpace>
-struct default_inner_direction
-{
+struct default_inner_direction {
   using type = Iterate;
-  #if defined( KOKKOS_ENABLE_CUDA)||defined( KOKKOS_ENABLE_ROCM)
+#if defined(KOKKOS_ENABLE_CUDA) || defined(KOKKOS_ENABLE_ROCM)
   static constexpr Iterate value = Iterate::Left;
-  #else
+#else
   static constexpr Iterate value = Iterate::Right;
-  #endif
+#endif
 };
 
-
 // Iteration Pattern
-template < unsigned N
-         , Iterate OuterDir = Iterate::Default
-         , Iterate InnerDir = Iterate::Default
-         >
-struct Rank
-{
-  static_assert( N != 0u, "Kokkos Error: rank 0 undefined");
-  static_assert( N != 1u, "Kokkos Error: rank 1 is not a multi-dimensional range");
-  static_assert( N < 7u, "Kokkos Error: Unsupported rank...");
+template <unsigned N, Iterate OuterDir = Iterate::Default,
+          Iterate InnerDir = Iterate::Default>
+struct Rank {
+  static_assert(N != 0u, "Kokkos Error: rank 0 undefined");
+  static_assert(N != 1u,
+                "Kokkos Error: rank 1 is not a multi-dimensional range");
+  static_assert(N < 7u, "Kokkos Error: Unsupported rank...");
 
   using iteration_pattern = Rank<N, OuterDir, InnerDir>;
 
-  static constexpr int rank = N;
+  static constexpr int rank                = N;
   static constexpr Iterate outer_direction = OuterDir;
   static constexpr Iterate inner_direction = InnerDir;
 };
 
-
 // multi-dimensional iteration pattern
 template <typename... Properties>
-struct MDRangePolicy
-  : public Kokkos::Impl::PolicyTraits<Properties ...>
-{
-  using traits = Kokkos::Impl::PolicyTraits<Properties ...>;
+struct MDRangePolicy : public Kokkos::Impl::PolicyTraits<Properties...> {
+  using traits       = Kokkos::Impl::PolicyTraits<Properties...>;
   using range_policy = RangePolicy<Properties...>;
 
   typename traits::execution_space m_space;
 
-  using impl_range_policy = RangePolicy< typename traits::execution_space
-                                       , typename traits::schedule_type
-                                       , typename traits::index_type
-                                       > ;
+  using impl_range_policy =
+      RangePolicy<typename traits::execution_space,
+                  typename traits::schedule_type, typename traits::index_type>;
 
-  typedef MDRangePolicy execution_policy; // needed for is_execution_space interrogation
+  typedef MDRangePolicy
+      execution_policy;  // needed for is_execution_space interrogation
 
-  template<class ... OtherProperties>
+  template <class... OtherProperties>
   friend struct MDRangePolicy;
 
-  static_assert( !std::is_same<typename traits::iteration_pattern,void>::value
-               , "Kokkos Error: MD iteration pattern not defined" );
+  static_assert(!std::is_same<typename traits::iteration_pattern, void>::value,
+                "Kokkos Error: MD iteration pattern not defined");
 
-  using iteration_pattern   = typename traits::iteration_pattern;
-  using work_tag            = typename traits::work_tag;
-  using launch_bounds       = typename traits::launch_bounds;
-  using member_type = typename range_policy::member_type;
+  using iteration_pattern = typename traits::iteration_pattern;
+  using work_tag          = typename traits::work_tag;
+  using launch_bounds     = typename traits::launch_bounds;
+  using member_type       = typename range_policy::member_type;
 
   enum { rank = static_cast<int>(iteration_pattern::rank) };
 
-  using index_type  = typename traits::index_type;
+  using index_type       = typename traits::index_type;
   using array_index_type = long;
-  using point_type  = Kokkos::Array<array_index_type,rank>; //was index_type
-  using tile_type   = Kokkos::Array<array_index_type,rank>;
-  // If point_type or tile_type is not templated on a signed integral type (if it is unsigned), 
-  // then if user passes in intializer_list of runtime-determined values of 
-  // signed integral type that are not const will receive a compiler error due 
-  // to an invalid case for implicit conversion - 
-  // "conversion from integer or unscoped enumeration type to integer type that cannot represent all values of the original, except where source is a constant expression whose value can be stored exactly in the target type"
+  using point_type = Kokkos::Array<array_index_type, rank>;  // was index_type
+  using tile_type  = Kokkos::Array<array_index_type, rank>;
+  // If point_type or tile_type is not templated on a signed integral type (if
+  // it is unsigned), then if user passes in intializer_list of
+  // runtime-determined values of signed integral type that are not const will
+  // receive a compiler error due to an invalid case for implicit conversion -
+  // "conversion from integer or unscoped enumeration type to integer type that
+  // cannot represent all values of the original, except where source is a
+  // constant expression whose value can be stored exactly in the target type"
   // This would require the user to either pass a matching index_type parameter
-  // as template parameter to the MDRangePolicy or static_cast the individual values
+  // as template parameter to the MDRangePolicy or static_cast the individual
+  // values
 
   point_type m_lower;
   point_type m_upper;
-  tile_type  m_tile;
+  tile_type m_tile;
   point_type m_tile_end;
   index_type m_num_tiles;
   index_type m_prod_tile_dims;
 
-/*
-  // NDE enum impl definition alternative - replace static constexpr int ? 
-  enum { outer_direction = static_cast<int> (
+  /*
+    // NDE enum impl definition alternative - replace static constexpr int ?
+    enum { outer_direction = static_cast<int> (
+        (iteration_pattern::outer_direction != Iterate::Default)
+      ? iteration_pattern::outer_direction
+      : default_outer_direction< typename traits::execution_space>::value ) };
+
+    enum { inner_direction = static_cast<int> (
+        iteration_pattern::inner_direction != Iterate::Default
+      ? iteration_pattern::inner_direction
+      : default_inner_direction< typename traits::execution_space>::value ) };
+
+    enum { Right = static_cast<int>( Iterate::Right ) };
+    enum { Left  = static_cast<int>( Iterate::Left ) };
+  */
+  // static constexpr int rank = iteration_pattern::rank;
+
+  static constexpr int outer_direction = static_cast<int>(
       (iteration_pattern::outer_direction != Iterate::Default)
-    ? iteration_pattern::outer_direction
-    : default_outer_direction< typename traits::execution_space>::value ) };
+          ? iteration_pattern::outer_direction
+          : default_outer_direction<typename traits::execution_space>::value);
 
-  enum { inner_direction = static_cast<int> (
+  static constexpr int inner_direction = static_cast<int>(
       iteration_pattern::inner_direction != Iterate::Default
-    ? iteration_pattern::inner_direction
-    : default_inner_direction< typename traits::execution_space>::value ) };
-
-  enum { Right = static_cast<int>( Iterate::Right ) };
-  enum { Left  = static_cast<int>( Iterate::Left ) };
-*/
-  //static constexpr int rank = iteration_pattern::rank;
-
-  static constexpr int outer_direction = static_cast<int> (
-      (iteration_pattern::outer_direction != Iterate::Default)
-    ? iteration_pattern::outer_direction
-    : default_outer_direction< typename traits::execution_space>::value );
-
-  static constexpr int inner_direction = static_cast<int> (
-      iteration_pattern::inner_direction != Iterate::Default
-    ? iteration_pattern::inner_direction
-    : default_inner_direction< typename traits::execution_space>::value ) ;
+          ? iteration_pattern::inner_direction
+          : default_inner_direction<typename traits::execution_space>::value);
 
   // Ugly ugly workaround intel 14 not handling scoped enum correctly
-  static constexpr int Right = static_cast<int>( Iterate::Right );
-  static constexpr int Left  = static_cast<int>( Iterate::Left );
+  static constexpr int Right = static_cast<int>(Iterate::Right);
+  static constexpr int Left  = static_cast<int>(Iterate::Left);
 
-  KOKKOS_INLINE_FUNCTION const typename traits::execution_space & space() const { return m_space ; }
-  template < typename LT , typename UT , typename TT = array_index_type >
-  MDRangePolicy(std::initializer_list<LT> const& lower, std::initializer_list<UT> const& upper, std::initializer_list<TT> const& tile = {} )
-    : m_space() {
+  KOKKOS_INLINE_FUNCTION const typename traits::execution_space& space() const {
+    return m_space;
+  }
+  template <typename LT, typename UT, typename TT = array_index_type>
+  MDRangePolicy(std::initializer_list<LT> const& lower,
+                std::initializer_list<UT> const& upper,
+                std::initializer_list<TT> const& tile = {})
+      : m_space() {
     init(lower, upper, tile);
   }
 
-  template < typename LT , typename UT , typename TT = array_index_type >
-  MDRangePolicy(const typename traits::execution_space & work_space,
-    std::initializer_list<LT> const& lower, std::initializer_list<UT> const& upper, std::initializer_list<TT> const& tile = {} )
-    : m_space( work_space ) {
+  template <typename LT, typename UT, typename TT = array_index_type>
+  MDRangePolicy(const typename traits::execution_space& work_space,
+                std::initializer_list<LT> const& lower,
+                std::initializer_list<UT> const& upper,
+                std::initializer_list<TT> const& tile = {})
+      : m_space(work_space) {
     init(lower, upper, tile);
   }
 
-  MDRangePolicy( point_type const& lower, point_type const& upper, tile_type const& tile = tile_type{} )
-    : m_space()
-    , m_lower(lower)
-    , m_upper(upper)
-    , m_tile(tile)
-    , m_num_tiles(1)
-    , m_prod_tile_dims(1) {
+  MDRangePolicy(point_type const& lower, point_type const& upper,
+                tile_type const& tile = tile_type{})
+      : m_space(),
+        m_lower(lower),
+        m_upper(upper),
+        m_tile(tile),
+        m_num_tiles(1),
+        m_prod_tile_dims(1) {
     init();
   }
 
-  MDRangePolicy( const typename traits::execution_space & work_space,
-    point_type const& lower, point_type const& upper, tile_type const& tile = tile_type{} )
-    : m_space( work_space )
-    , m_lower(lower)
-    , m_upper(upper)
-    , m_tile(tile)
-    , m_num_tiles(1)
-    , m_prod_tile_dims(1) {
+  MDRangePolicy(const typename traits::execution_space& work_space,
+                point_type const& lower, point_type const& upper,
+                tile_type const& tile = tile_type{})
+      : m_space(work_space),
+        m_lower(lower),
+        m_upper(upper),
+        m_tile(tile),
+        m_num_tiles(1),
+        m_prod_tile_dims(1) {
     init();
   }
 
-  template<class ... OtherProperties>
-  MDRangePolicy( const MDRangePolicy<OtherProperties...> p ):
-     m_space(p.m_space),
-     m_lower(p.m_lower),
-     m_upper(p.m_upper),
-     m_tile(p.m_tile),
-     m_tile_end(p.m_tile_end),
-     m_num_tiles(p.m_num_tiles),
-     m_prod_tile_dims(p.m_prod_tile_dims) {}
-
-private:
+  template <class... OtherProperties>
+  MDRangePolicy(const MDRangePolicy<OtherProperties...> p)
+      : m_space(p.m_space),
+        m_lower(p.m_lower),
+        m_upper(p.m_upper),
+        m_tile(p.m_tile),
+        m_tile_end(p.m_tile_end),
+        m_num_tiles(p.m_num_tiles),
+        m_prod_tile_dims(p.m_prod_tile_dims) {}
 
+ private:
   void init() {
     // Host
-    if ( true
-       #if defined(KOKKOS_ENABLE_CUDA)
-         && !std::is_same< typename traits::execution_space, Kokkos::Cuda >::value
-       #endif
-       #if defined(KOKKOS_ENABLE_ROCM)
-         && !std::is_same< typename traits::execution_space, Kokkos::Experimental::ROCm >::value
-       #endif
-       )
-    {
+    if (true
+#if defined(KOKKOS_ENABLE_CUDA)
+        && !std::is_same<typename traits::execution_space, Kokkos::Cuda>::value
+#endif
+#if defined(KOKKOS_ENABLE_ROCM)
+        && !std::is_same<typename traits::execution_space,
+                         Kokkos::Experimental::ROCm>::value
+#endif
+    ) {
       index_type span;
-      for (int i=0; i<rank; ++i) {
+      for (int i = 0; i < rank; ++i) {
         span = m_upper[i] - m_lower[i];
-        if ( m_tile[i] <= 0 ) {
-          if (  ((int)inner_direction == (int)Right && (i < rank-1))
-              || ((int)inner_direction == (int)Left && (i > 0)) )
-          {
+        if (m_tile[i] <= 0) {
+          if (((int)inner_direction == (int)Right && (i < rank - 1)) ||
+              ((int)inner_direction == (int)Left && (i > 0))) {
             m_tile[i] = 2;
-          }
-          else {
+          } else {
             m_tile[i] = (span == 0 ? 1 : span);
           }
         }
-        m_tile_end[i] = static_cast<index_type>((span + m_tile[i] - 1) / m_tile[i]);
+        m_tile_end[i] =
+            static_cast<index_type>((span + m_tile[i] - 1) / m_tile[i]);
         m_num_tiles *= m_tile_end[i];
         m_prod_tile_dims *= m_tile[i];
       }
     }
-    #if defined(KOKKOS_ENABLE_CUDA)
-    else // Cuda
+#if defined(KOKKOS_ENABLE_CUDA)
+    else  // Cuda
     {
       index_type span;
-      int increment = 1;
+      int increment  = 1;
       int rank_start = 0;
-      int rank_end = rank;
-      if((int)inner_direction == (int)Right) {
-        increment = -1;
-        rank_start = rank-1;
-        rank_end = -1;
+      int rank_end   = rank;
+      if ((int)inner_direction == (int)Right) {
+        increment  = -1;
+        rank_start = rank - 1;
+        rank_end   = -1;
       }
-      for (int i=rank_start; i!=rank_end; i+=increment) {
+      for (int i = rank_start; i != rank_end; i += increment) {
         span = m_upper[i] - m_lower[i];
-        if ( m_tile[i] <= 0 ) {
+        if (m_tile[i] <= 0) {
           // TODO: determine what is a good default tile size for cuda
           // may be rank dependent
-          if (  ((int)inner_direction == (int)Right && (i < rank-1))
-              || ((int)inner_direction == (int)Left && (i > 0)) )
-          {
-            if ( m_prod_tile_dims < 256 ) {
+          if (((int)inner_direction == (int)Right && (i < rank - 1)) ||
+              ((int)inner_direction == (int)Left && (i > 0))) {
+            if (m_prod_tile_dims < 256) {
               m_tile[i] = 2;
             } else {
               m_tile[i] = 1;
             }
-          }
-          else {
+          } else {
             m_tile[i] = 16;
           }
         }
-        m_tile_end[i] = static_cast<index_type>((span + m_tile[i] - 1) / m_tile[i]);
+        m_tile_end[i] =
+            static_cast<index_type>((span + m_tile[i] - 1) / m_tile[i]);
         m_num_tiles *= m_tile_end[i];
         m_prod_tile_dims *= m_tile[i];
       }
-      if ( m_prod_tile_dims > 1024 ) { // Match Cuda restriction for ParallelReduce; 1024,1024,64 max per dim (Kepler), but product num_threads < 1024
+      if (m_prod_tile_dims >
+          1024) {  // Match Cuda restriction for ParallelReduce; 1024,1024,64
+                   // max per dim (Kepler), but product num_threads < 1024
         printf(" Tile dimensions exceed Cuda limits\n");
-        Kokkos::abort(" Cuda ExecSpace Error: MDRange tile dims exceed maximum number of threads per block - choose smaller tile dims");
-        //Kokkos::Impl::throw_runtime_exception( " Cuda ExecSpace Error: MDRange tile dims exceed maximum number of threads per block - choose smaller tile dims");
+        Kokkos::abort(
+            " Cuda ExecSpace Error: MDRange tile dims exceed maximum number of "
+            "threads per block - choose smaller tile dims");
+        // Kokkos::Impl::throw_runtime_exception( " Cuda ExecSpace Error:
+        // MDRange tile dims exceed maximum number of threads per block - choose
+        // smaller tile dims");
       }
     }
-    #endif
-    #if defined(KOKKOS_ENABLE_ROCM)
-    else // ROCm
+#endif
+#if defined(KOKKOS_ENABLE_ROCM)
+    else  // ROCm
     {
       index_type span;
-      int increment = 1;
+      int increment  = 1;
       int rank_start = 0;
-      int rank_end = rank;
-      if((int)inner_direction == (int)Right) {
-        increment = -1;
-        rank_start = rank-1;
-        rank_end = -1;
+      int rank_end   = rank;
+      if ((int)inner_direction == (int)Right) {
+        increment  = -1;
+        rank_start = rank - 1;
+        rank_end   = -1;
       }
-      for (int i=rank_start; i!=rank_end; i+=increment) {
+      for (int i = rank_start; i != rank_end; i += increment) {
         span = m_upper[i] - m_lower[i];
-        if ( m_tile[i] <= 0 ) {
+        if (m_tile[i] <= 0) {
           // TODO: determine what is a good default tile size for rocm
           // may be rank dependent
-          if (  ((int)inner_direction == (int)Right && (i < rank-1))
-              || ((int)inner_direction == (int)Left && (i > 0)) )
-          {
-            if ( m_prod_tile_dims < 256 ) {
+          if (((int)inner_direction == (int)Right && (i < rank - 1)) ||
+              ((int)inner_direction == (int)Left && (i > 0))) {
+            if (m_prod_tile_dims < 256) {
               m_tile[i] = 4;
             } else {
               m_tile[i] = 1;
             }
-          }
-          else {
+          } else {
             m_tile[i] = 16;
           }
         }
-        m_tile_end[i] = static_cast<index_type>((span + m_tile[i] - 1) / m_tile[i]);
+        m_tile_end[i] =
+            static_cast<index_type>((span + m_tile[i] - 1) / m_tile[i]);
         m_num_tiles *= m_tile_end[i];
         m_prod_tile_dims *= m_tile[i];
       }
-      if ( m_prod_tile_dims > 1024 ) { //but product num_threads < 1024
+      if (m_prod_tile_dims > 1024) {  // but product num_threads < 1024
         printf(" Tile dimensions exceed ROCm limits\n");
-        Kokkos::abort(" ROCm ExecSpace Error: MDRange tile dims exceed maximum number of threads per block - choose smaller tile dims");
-        //Kokkos::Impl::throw_runtime_exception( " Cuda ExecSpace Error: MDRange tile dims exceed maximum number of threads per block - choose smaller tile dims");
+        Kokkos::abort(
+            " ROCm ExecSpace Error: MDRange tile dims exceed maximum number of "
+            "threads per block - choose smaller tile dims");
+        // Kokkos::Impl::throw_runtime_exception( " Cuda ExecSpace Error:
+        // MDRange tile dims exceed maximum number of threads per block - choose
+        // smaller tile dims");
       }
     }
-    #endif
+#endif
   }
 
-  template < typename LT , typename UT , typename TT = array_index_type >
-  void init( std::initializer_list<LT> const& lower, std::initializer_list<UT> const& upper, std::initializer_list<TT> const& tile = {} )
-  {
-    if(static_cast<int>(m_lower.size()) != rank || static_cast<int>(m_upper.size()) != rank)
-      Kokkos::abort("MDRangePolicy: Constructor initializer lists have wrong size");
+  template <typename LT, typename UT, typename TT = array_index_type>
+  void init(std::initializer_list<LT> const& lower,
+            std::initializer_list<UT> const& upper,
+            std::initializer_list<TT> const& tile = {}) {
+    if (static_cast<int>(m_lower.size()) != rank ||
+        static_cast<int>(m_upper.size()) != rank)
+      Kokkos::abort(
+          "MDRangePolicy: Constructor initializer lists have wrong size");
 
-    for ( auto i = 0; i < rank; ++i ) {
+    for (auto i = 0; i < rank; ++i) {
       m_lower[i] = static_cast<array_index_type>(lower.begin()[i]);
       m_upper[i] = static_cast<array_index_type>(upper.begin()[i]);
-      if(static_cast<int>(tile.size())==rank)
+      if (static_cast<int>(tile.size()) == rank)
         m_tile[i] = static_cast<array_index_type>(tile.begin()[i]);
       else
         m_tile[i] = 0;
     }
 
-    m_num_tiles = 1;
+    m_num_tiles      = 1;
     m_prod_tile_dims = 1;
 
     // Host
-    if ( true
-       #if defined(KOKKOS_ENABLE_CUDA)
-         && !std::is_same< typename traits::execution_space, Kokkos::Cuda >::value
-       #endif
-       #if defined(KOKKOS_ENABLE_ROCM)
-         && !std::is_same< typename traits::execution_space, Kokkos::Experimental::ROCm >::value
-       #endif
-       )
-    {
+    if (true
+#if defined(KOKKOS_ENABLE_CUDA)
+        && !std::is_same<typename traits::execution_space, Kokkos::Cuda>::value
+#endif
+#if defined(KOKKOS_ENABLE_ROCM)
+        && !std::is_same<typename traits::execution_space,
+                         Kokkos::Experimental::ROCm>::value
+#endif
+    ) {
       index_type span;
-      for (int i=0; i<rank; ++i) {
+      for (int i = 0; i < rank; ++i) {
         span = m_upper[i] - m_lower[i];
-        if ( m_tile[i] <= 0 ) {
-          if (  ((int)inner_direction == (int)Right && (i < rank-1))
-              || ((int)inner_direction == (int)Left && (i > 0)) )
-          {
+        if (m_tile[i] <= 0) {
+          if (((int)inner_direction == (int)Right && (i < rank - 1)) ||
+              ((int)inner_direction == (int)Left && (i > 0))) {
             m_tile[i] = 2;
-          }
-          else {
+          } else {
             m_tile[i] = (span == 0 ? 1 : span);
           }
         }
-        m_tile_end[i] = static_cast<index_type>((span + m_tile[i] - 1) / m_tile[i]);
+        m_tile_end[i] =
+            static_cast<index_type>((span + m_tile[i] - 1) / m_tile[i]);
         m_num_tiles *= m_tile_end[i];
         m_prod_tile_dims *= m_tile[i];
       }
     }
-    #if defined(KOKKOS_ENABLE_CUDA)
-    else // Cuda
+#if defined(KOKKOS_ENABLE_CUDA)
+    else  // Cuda
     {
       index_type span;
-      int increment = 1;
+      int increment  = 1;
       int rank_start = 0;
-      int rank_end = rank;
-      if((int)inner_direction == (int)Right) {
-        increment = -1;
-        rank_start = rank-1;
-        rank_end = -1;
+      int rank_end   = rank;
+      if ((int)inner_direction == (int)Right) {
+        increment  = -1;
+        rank_start = rank - 1;
+        rank_end   = -1;
       }
-      for (int i=rank_start; i!=rank_end; i+=increment) {
+      for (int i = rank_start; i != rank_end; i += increment) {
         span = m_upper[i] - m_lower[i];
-        if ( m_tile[i] <= 0 ) {
+        if (m_tile[i] <= 0) {
           // TODO: determine what is a good default tile size for cuda
           // may be rank dependent
-          if (  ((int)inner_direction == (int)Right && (i < rank-1))
-              || ((int)inner_direction == (int)Left && (i > 0)) )
-          {
-            if ( m_prod_tile_dims < 256 ) {
+          if (((int)inner_direction == (int)Right && (i < rank - 1)) ||
+              ((int)inner_direction == (int)Left && (i > 0))) {
+            if (m_prod_tile_dims < 256) {
               m_tile[i] = 2;
             } else {
               m_tile[i] = 1;
             }
-          }
-          else {
+          } else {
             m_tile[i] = 16;
           }
         }
-        m_tile_end[i] = static_cast<index_type>((span + m_tile[i] - 1) / m_tile[i]);
+        m_tile_end[i] =
+            static_cast<index_type>((span + m_tile[i] - 1) / m_tile[i]);
         m_num_tiles *= m_tile_end[i];
         m_prod_tile_dims *= m_tile[i];
       }
-      if ( m_prod_tile_dims > 1024 ) { // Match Cuda restriction for ParallelReduce; 1024,1024,64 max per dim (Kepler), but product num_threads < 1024
+      if (m_prod_tile_dims >
+          1024) {  // Match Cuda restriction for ParallelReduce; 1024,1024,64
+                   // max per dim (Kepler), but product num_threads < 1024
         printf(" Tile dimensions exceed Cuda limits\n");
-        Kokkos::abort(" Cuda ExecSpace Error: MDRange tile dims exceed maximum number of threads per block - choose smaller tile dims");
-        //Kokkos::Impl::throw_runtime_exception( " Cuda ExecSpace Error: MDRange tile dims exceed maximum number of threads per block - choose smaller tile dims");
+        Kokkos::abort(
+            " Cuda ExecSpace Error: MDRange tile dims exceed maximum number of "
+            "threads per block - choose smaller tile dims");
+        // Kokkos::Impl::throw_runtime_exception( " Cuda ExecSpace Error:
+        // MDRange tile dims exceed maximum number of threads per block - choose
+        // smaller tile dims");
       }
     }
-    #endif
-    #if defined(KOKKOS_ENABLE_ROCM)
-    else // ROCm
+#endif
+#if defined(KOKKOS_ENABLE_ROCM)
+    else  // ROCm
     {
       index_type span;
-      int increment = 1;
+      int increment  = 1;
       int rank_start = 0;
-      int rank_end = rank;
-      if((int)inner_direction == (int)Right) {
-        increment = -1;
-        rank_start = rank-1;
-        rank_end = -1;
+      int rank_end   = rank;
+      if ((int)inner_direction == (int)Right) {
+        increment  = -1;
+        rank_start = rank - 1;
+        rank_end   = -1;
       }
-      for (int i=rank_start; i!=rank_end; i+=increment) {
+      for (int i = rank_start; i != rank_end; i += increment) {
         span = m_upper[i] - m_lower[i];
-        if ( m_tile[i] <= 0 ) {
+        if (m_tile[i] <= 0) {
           // TODO: determine what is a good default tile size for cuda
           // may be rank dependent
-          if (  ((int)inner_direction == (int)Right && (i < rank-1))
-              || ((int)inner_direction == (int)Left && (i > 0)) )
-          {
-            if ( m_prod_tile_dims < 256 ) {
+          if (((int)inner_direction == (int)Right && (i < rank - 1)) ||
+              ((int)inner_direction == (int)Left && (i > 0))) {
+            if (m_prod_tile_dims < 256) {
               m_tile[i] = 2;
             } else {
               m_tile[i] = 1;
             }
-          }
-          else {
+          } else {
             m_tile[i] = 16;
           }
         }
-        m_tile_end[i] = static_cast<index_type>((span + m_tile[i] - 1) / m_tile[i]);
+        m_tile_end[i] =
+            static_cast<index_type>((span + m_tile[i] - 1) / m_tile[i]);
         m_num_tiles *= m_tile_end[i];
         m_prod_tile_dims *= m_tile[i];
       }
-      if ( m_prod_tile_dims > 1024 ) { // Match ROCm restriction for ParallelReduce; 1024,1024,1024 max per dim , but product num_threads < 1024
+      if (m_prod_tile_dims >
+          1024) {  // Match ROCm restriction for ParallelReduce; 1024,1024,1024
+                   // max per dim , but product num_threads < 1024
         printf(" Tile dimensions exceed ROCm limits\n");
-        Kokkos::abort(" ROCm ExecSpace Error: MDRange tile dims exceed maximum number of threads per block - choose smaller tile dims");
-        //Kokkos::Impl::throw_runtime_exception( " Cuda ExecSpace Error: MDRange tile dims exceed maximum number of threads per block - choose smaller tile dims");
+        Kokkos::abort(
+            " ROCm ExecSpace Error: MDRange tile dims exceed maximum number of "
+            "threads per block - choose smaller tile dims");
+        // Kokkos::Impl::throw_runtime_exception( " Cuda ExecSpace Error:
+        // MDRange tile dims exceed maximum number of threads per block - choose
+        // smaller tile dims");
       }
     }
-    #endif
+#endif
   }
-
 };
 
-} // namespace Kokkos
+}  // namespace Kokkos
 
 // For backward compatibility
-namespace Kokkos { namespace Experimental {
-  using Kokkos::MDRangePolicy;
-  using Kokkos::Rank;
-  using Kokkos::Iterate;
-} } // end Kokkos::Experimental
+namespace Kokkos {
+namespace Experimental {
+using Kokkos::Iterate;
+using Kokkos::MDRangePolicy;
+using Kokkos::Rank;
+}  // namespace Experimental
+}  // namespace Kokkos
 // ------------------------------------------------------------------ //
 
 #ifdef KOKKOS_ENABLE_DEPRECATED_CODE
 // ------------------------------------------------------------------ //
-//md_parallel_for - deprecated use parallel_for
+// md_parallel_for - deprecated use parallel_for
 // ------------------------------------------------------------------ //
 
-namespace Kokkos { namespace Experimental {
+namespace Kokkos {
+namespace Experimental {
 
 template <typename MDRange, typename Functor, typename Enable = void>
-void md_parallel_for( MDRange const& range
-                    , Functor const& f
-                    , const std::string& str = ""
-                    , typename std::enable_if<( true
-                      #if defined( KOKKOS_ENABLE_CUDA)
-                      && !std::is_same< typename MDRange::range_policy::execution_space, Kokkos::Cuda>::value
-                      #endif
-                      #if defined( KOKKOS_ENABLE_ROCM)
-                      && !std::is_same< typename MDRange::range_policy::execution_space, Kokkos::Experimental::ROCm>::value
-                      #endif
-                      ) >::type* = 0
-                    )
-{
+void md_parallel_for(
+    MDRange const& range, Functor const& f, const std::string& str = "",
+    typename std::enable_if<
+        (true
+#if defined(KOKKOS_ENABLE_CUDA)
+         && !std::is_same<typename MDRange::range_policy::execution_space,
+                          Kokkos::Cuda>::value
+#endif
+#if defined(KOKKOS_ENABLE_ROCM)
+         && !std::is_same<typename MDRange::range_policy::execution_space,
+                          Kokkos::Experimental::ROCm>::value
+#endif
+         )>::type* = 0) {
   Kokkos::Impl::Experimental::MDFunctor<MDRange, Functor, void> g(range, f);
 
   using range_policy = typename MDRange::impl_range_policy;
 
-  Kokkos::parallel_for( range_policy(0, range.m_num_tiles).set_chunk_size(1), g, str );
+  Kokkos::parallel_for(range_policy(0, range.m_num_tiles).set_chunk_size(1), g,
+                       str);
 }
 
 template <typename MDRange, typename Functor>
-void md_parallel_for( const std::string& str
-                    , MDRange const& range
-                    , Functor const& f
-                    , typename std::enable_if<( true
-                      #if defined( KOKKOS_ENABLE_CUDA)
-                      && !std::is_same< typename MDRange::range_policy::execution_space, Kokkos::Cuda>::value
-                      #endif
-                      #if defined( KOKKOS_ENABLE_ROCM)
-                      && !std::is_same< typename MDRange::range_policy::execution_space, Kokkos::Experimental::ROCm>::value
-                      #endif
-                      ) >::type* = 0
-                    )
-{
+void md_parallel_for(
+    const std::string& str, MDRange const& range, Functor const& f,
+    typename std::enable_if<
+        (true
+#if defined(KOKKOS_ENABLE_CUDA)
+         && !std::is_same<typename MDRange::range_policy::execution_space,
+                          Kokkos::Cuda>::value
+#endif
+#if defined(KOKKOS_ENABLE_ROCM)
+         && !std::is_same<typename MDRange::range_policy::execution_space,
+                          Kokkos::Experimental::ROCm>::value
+#endif
+         )>::type* = 0) {
   Kokkos::Impl::Experimental::MDFunctor<MDRange, Functor, void> g(range, f);
 
   using range_policy = typename MDRange::impl_range_policy;
 
-  Kokkos::parallel_for( range_policy(0, range.m_num_tiles).set_chunk_size(1), g, str );
+  Kokkos::parallel_for(range_policy(0, range.m_num_tiles).set_chunk_size(1), g,
+                       str);
 }
 
 // Cuda specialization
-#if defined( __CUDACC__ ) && defined( KOKKOS_ENABLE_CUDA )
+#if defined(__CUDACC__) && defined(KOKKOS_ENABLE_CUDA)
 template <typename MDRange, typename Functor>
-void md_parallel_for( const std::string& str
-                    , MDRange const& range
-                    , Functor const& f
-                    , typename std::enable_if<( true
-                      #if defined( KOKKOS_ENABLE_CUDA)
-                      && std::is_same< typename MDRange::range_policy::execution_space, Kokkos::Cuda>::value
-                      #endif
-                      ) >::type* = 0
-                    )
-{
-  Kokkos::Impl::DeviceIterateTile<MDRange, Functor, typename MDRange::work_tag> closure(range, f);
+void md_parallel_for(
+    const std::string& str, MDRange const& range, Functor const& f,
+    typename std::enable_if<
+        (true
+#if defined(KOKKOS_ENABLE_CUDA)
+         && std::is_same<typename MDRange::range_policy::execution_space,
+                         Kokkos::Cuda>::value
+#endif
+         )>::type* = 0) {
+  Kokkos::Impl::DeviceIterateTile<MDRange, Functor, typename MDRange::work_tag>
+      closure(range, f);
   closure.execute();
 }
 
 template <typename MDRange, typename Functor>
-void md_parallel_for( MDRange const& range
-                    , Functor const& f
-                    , const std::string& str = ""
-                    , typename std::enable_if<( true
-                      #if defined( KOKKOS_ENABLE_CUDA)
-                      && std::is_same< typename MDRange::range_policy::execution_space, Kokkos::Cuda>::value
-                      #endif
-                      ) >::type* = 0
-                    )
-{
-  Kokkos::Impl::DeviceIterateTile<MDRange, Functor, typename MDRange::work_tag> closure(range, f);
+void md_parallel_for(
+    MDRange const& range, Functor const& f, const std::string& str = "",
+    typename std::enable_if<
+        (true
+#if defined(KOKKOS_ENABLE_CUDA)
+         && std::is_same<typename MDRange::range_policy::execution_space,
+                         Kokkos::Cuda>::value
+#endif
+         )>::type* = 0) {
+  Kokkos::Impl::DeviceIterateTile<MDRange, Functor, typename MDRange::work_tag>
+      closure(range, f);
   closure.execute();
 }
 #endif
 // ------------------------------------------------------------------ //
 
 // ------------------------------------------------------------------ //
-//md_parallel_reduce - deprecated use parallel_reduce
+// md_parallel_reduce - deprecated use parallel_reduce
 // ------------------------------------------------------------------ //
 template <typename MDRange, typename Functor, typename ValueType>
-void md_parallel_reduce( MDRange const& range
-                    , Functor const& f
-                    , ValueType & v
-                    , const std::string& str = ""
-                    , typename std::enable_if<( true
-                      #if defined( KOKKOS_ENABLE_CUDA)
-                      && !std::is_same< typename MDRange::range_policy::execution_space, Kokkos::Cuda>::value
-                      #endif
-                      #if defined( KOKKOS_ENABLE_ROCM)
-                      && !std::is_same< typename MDRange::range_policy::execution_space, Kokkos::Experimental::ROCm>::value
-                      #endif
-                      ) >::type* = 0
-                    )
-{
-  Kokkos::Impl::Experimental::MDFunctor<MDRange, Functor, ValueType> g(range, f);
+void md_parallel_reduce(
+    MDRange const& range, Functor const& f, ValueType& v,
+    const std::string& str = "",
+    typename std::enable_if<
+        (true
+#if defined(KOKKOS_ENABLE_CUDA)
+         && !std::is_same<typename MDRange::range_policy::execution_space,
+                          Kokkos::Cuda>::value
+#endif
+#if defined(KOKKOS_ENABLE_ROCM)
+         && !std::is_same<typename MDRange::range_policy::execution_space,
+                          Kokkos::Experimental::ROCm>::value
+#endif
+         )>::type* = 0) {
+  Kokkos::Impl::Experimental::MDFunctor<MDRange, Functor, ValueType> g(range,
+                                                                       f);
 
   using range_policy = typename MDRange::impl_range_policy;
-  Kokkos::parallel_reduce( str, range_policy(0, range.m_num_tiles).set_chunk_size(1), g, v );
+  Kokkos::parallel_reduce(
+      str, range_policy(0, range.m_num_tiles).set_chunk_size(1), g, v);
 }
 
 template <typename MDRange, typename Functor, typename ValueType>
-void md_parallel_reduce( const std::string& str
-                    , MDRange const& range
-                    , Functor const& f
-                    , ValueType & v
-                    , typename std::enable_if<( true
-                      #if defined( KOKKOS_ENABLE_CUDA)
-                      && !std::is_same< typename MDRange::range_policy::execution_space, Kokkos::Cuda>::value
-                      #endif
-                      #if defined( KOKKOS_ENABLE_ROCM)
-                      && !std::is_same< typename MDRange::range_policy::execution_space, Kokkos::Experimental::ROCm>::value
-                      #endif
-                      ) >::type* = 0
-                    )
-{
-  Kokkos::Impl::Experimental::MDFunctor<MDRange, Functor, ValueType> g(range, f);
+void md_parallel_reduce(
+    const std::string& str, MDRange const& range, Functor const& f,
+    ValueType& v,
+    typename std::enable_if<
+        (true
+#if defined(KOKKOS_ENABLE_CUDA)
+         && !std::is_same<typename MDRange::range_policy::execution_space,
+                          Kokkos::Cuda>::value
+#endif
+#if defined(KOKKOS_ENABLE_ROCM)
+         && !std::is_same<typename MDRange::range_policy::execution_space,
+                          Kokkos::Experimental::ROCm>::value
+#endif
+         )>::type* = 0) {
+  Kokkos::Impl::Experimental::MDFunctor<MDRange, Functor, ValueType> g(range,
+                                                                       f);
 
   using range_policy = typename MDRange::impl_range_policy;
 
-  Kokkos::parallel_reduce( str, range_policy(0, range.m_num_tiles).set_chunk_size(1), g, v );
+  Kokkos::parallel_reduce(
+      str, range_policy(0, range.m_num_tiles).set_chunk_size(1), g, v);
 }
 
 // Cuda - md_parallel_reduce not implemented - use parallel_reduce
 
-} } // namespace Kokkos::Experimental
+}  // namespace Experimental
+}  // namespace Kokkos
 #endif
 
 namespace Kokkos {
 namespace Experimental {
 namespace Impl {
 
-template<unsigned long P, class ... Properties>
-struct PolicyPropertyAdaptor<WorkItemProperty::ImplWorkItemProperty<P>,MDRangePolicy<Properties...>> {
+template <unsigned long P, class... Properties>
+struct PolicyPropertyAdaptor<WorkItemProperty::ImplWorkItemProperty<P>,
+                             MDRangePolicy<Properties...>> {
   typedef MDRangePolicy<Properties...> policy_in_t;
   typedef MDRangePolicy<typename policy_in_t::traits::execution_space,
-                      typename policy_in_t::traits::schedule_type,
-                      typename policy_in_t::traits::work_tag,
-                      typename policy_in_t::traits::index_type,
-                      typename policy_in_t::traits::iteration_pattern,
-                      typename policy_in_t::traits::launch_bounds,
-                      WorkItemProperty::ImplWorkItemProperty<P>> policy_out_t;
+                        typename policy_in_t::traits::schedule_type,
+                        typename policy_in_t::traits::work_tag,
+                        typename policy_in_t::traits::index_type,
+                        typename policy_in_t::traits::iteration_pattern,
+                        typename policy_in_t::traits::launch_bounds,
+                        WorkItemProperty::ImplWorkItemProperty<P>>
+      policy_out_t;
 };
 
-}
-}
-}
-
-
-#endif //KOKKOS_CORE_EXP_MD_RANGE_POLICY_HPP
+}  // namespace Impl
+}  // namespace Experimental
+}  // namespace Kokkos
 
+#endif  // KOKKOS_CORE_EXP_MD_RANGE_POLICY_HPP
diff --git a/lib/kokkos/core/src/Kokkos_AnonymousSpace.hpp b/lib/kokkos/core/src/Kokkos_AnonymousSpace.hpp
index c345158996..a4e887668f 100644
--- a/lib/kokkos/core/src/Kokkos_AnonymousSpace.hpp
+++ b/lib/kokkos/core/src/Kokkos_AnonymousSpace.hpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -53,28 +54,28 @@
 namespace Kokkos {
 
 class AnonymousSpace {
-public:
+ public:
   //! Tag this class as a kokkos memory space
-  typedef AnonymousSpace  memory_space;
+  typedef AnonymousSpace memory_space;
   typedef Kokkos::DefaultExecutionSpace execution_space;
-  typedef size_t     size_type;
+  typedef size_t size_type;
 
   //! This memory space preferred device_type
-  typedef Kokkos::Device< execution_space, memory_space > device_type;
+  typedef Kokkos::Device<execution_space, memory_space> device_type;
 
   /**\brief  Default memory space instance */
-  AnonymousSpace() = default;
-  AnonymousSpace( AnonymousSpace && rhs ) = default;
-  AnonymousSpace( const AnonymousSpace & rhs ) = default;
-  AnonymousSpace & operator = ( AnonymousSpace && ) = default;
-  AnonymousSpace & operator = ( const AnonymousSpace & ) = default;
-  ~AnonymousSpace() = default;
+  AnonymousSpace()                          = default;
+  AnonymousSpace(AnonymousSpace &&rhs)      = default;
+  AnonymousSpace(const AnonymousSpace &rhs) = default;
+  AnonymousSpace &operator=(AnonymousSpace &&) = default;
+  AnonymousSpace &operator=(const AnonymousSpace &) = default;
+  ~AnonymousSpace()                                 = default;
 
   /**\brief Return Name of the MemorySpace */
-  static constexpr const char* name() { return "Anonymous"; }
+  static constexpr const char *name() { return "Anonymous"; }
 };
 
-} // namespace Kokkos
+}  // namespace Kokkos
 
 //----------------------------------------------------------------------------
 
@@ -82,46 +83,43 @@ namespace Kokkos {
 
 namespace Impl {
 
-template<typename OtherSpace>
-struct MemorySpaceAccess< Kokkos::AnonymousSpace , OtherSpace > {
+template <typename OtherSpace>
+struct MemorySpaceAccess<Kokkos::AnonymousSpace, OtherSpace> {
   enum { assignable = true };
   enum { accessible = true };
-  enum { deepcopy   = true };
+  enum { deepcopy = true };
 };
 
-template<typename OtherSpace>
-struct MemorySpaceAccess<  OtherSpace, Kokkos::AnonymousSpace > {
+template <typename OtherSpace>
+struct MemorySpaceAccess<OtherSpace, Kokkos::AnonymousSpace> {
   enum { assignable = true };
   enum { accessible = true };
-  enum { deepcopy   = true };
+  enum { deepcopy = true };
 };
 
-template<>
-struct MemorySpaceAccess<  Kokkos::AnonymousSpace, Kokkos::AnonymousSpace > {
+template <>
+struct MemorySpaceAccess<Kokkos::AnonymousSpace, Kokkos::AnonymousSpace> {
   enum { assignable = true };
   enum { accessible = true };
-  enum { deepcopy   = true };
+  enum { deepcopy = true };
 };
 
-template<typename OtherSpace>
-struct VerifyExecutionCanAccessMemorySpace<OtherSpace, Kokkos::AnonymousSpace>
-{
-  enum {value = 1};
+template <typename OtherSpace>
+struct VerifyExecutionCanAccessMemorySpace<OtherSpace, Kokkos::AnonymousSpace> {
+  enum { value = 1 };
   KOKKOS_INLINE_FUNCTION static void verify(void) {}
   KOKKOS_INLINE_FUNCTION static void verify(const void *) {}
 };
 
-template<typename OtherSpace>
-struct VerifyExecutionCanAccessMemorySpace<Kokkos::AnonymousSpace, OtherSpace>
-{
-  enum {value = 1};
+template <typename OtherSpace>
+struct VerifyExecutionCanAccessMemorySpace<Kokkos::AnonymousSpace, OtherSpace> {
+  enum { value = 1 };
   KOKKOS_INLINE_FUNCTION static void verify(void) {}
   KOKKOS_INLINE_FUNCTION static void verify(const void *) {}
 };
 
-} // namespace Impl
+}  // namespace Impl
 
-} // namespace Kokkos
-
-#endif // #define KOKKOS_ANONYMOUSSPACE_HPP
+}  // namespace Kokkos
 
+#endif  // #define KOKKOS_ANONYMOUSSPACE_HPP
diff --git a/lib/kokkos/core/src/Kokkos_Array.hpp b/lib/kokkos/core/src/Kokkos_Array.hpp
index 8e5862fe9c..88e7883cb9 100644
--- a/lib/kokkos/core/src/Kokkos_Array.hpp
+++ b/lib/kokkos/core/src/Kokkos_Array.hpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -82,7 +83,7 @@ template <typename Integral>
 struct ArrayBoundsCheck<Integral, false> {
   KOKKOS_INLINE_FUNCTION
   ArrayBoundsCheck(Integral i, size_t N) {
-    if ( size_t(i) >= N) {
+    if (size_t(i) >= N) {
 #ifdef KOKKOS_ACTIVE_EXECUTION_MEMORY_SPACE_HOST
       std::string s = "Kokkos::Array: index ";
       s += std::to_string(i);
@@ -95,7 +96,7 @@ struct ArrayBoundsCheck<Integral, false> {
     }
   }
 };
-} // end namespace Impl
+}  // end namespace Impl
 
 #define KOKKOS_ARRAY_BOUNDS_CHECK(i, N) \
   Kokkos::Impl::ArrayBoundsCheck<decltype(i)>(i, N)
@@ -104,17 +105,14 @@ struct ArrayBoundsCheck<Integral, false> {
 
 #define KOKKOS_ARRAY_BOUNDS_CHECK(i, N) (void)0
 
-#endif // !defined( KOKKOS_ENABLE_DEBUG_BOUNDS_CHECK )
+#endif  // !defined( KOKKOS_ENABLE_DEBUG_BOUNDS_CHECK )
 
 /**\brief  Derived from the C++17 'std::array'.
  *         Dropping the iterator interface.
  */
-template< class T      = void
-        , size_t N     =KOKKOS_INVALID_INDEX
-        , class Proxy  = void
-        >
+template <class T = void, size_t N = KOKKOS_INVALID_INDEX, class Proxy = void>
 struct Array {
-public:
+ public:
   /**
    * The elements of this C array shall not be accessed directly. The data
    * member has to be declared public to enable aggregate initialization as for
@@ -122,115 +120,113 @@ public:
    * @private
    */
   T m_internal_implementation_private_member_data[N];
-public:
 
-  typedef T &                                 reference ;
-  typedef typename std::add_const<T>::type &  const_reference ;
-  typedef size_t                              size_type ;
-  typedef ptrdiff_t                           difference_type ;
-  typedef T                                   value_type ;
-  typedef T *                                 pointer ;
-  typedef typename std::add_const<T>::type *  const_pointer ;
+ public:
+  typedef T& reference;
+  typedef typename std::add_const<T>::type& const_reference;
+  typedef size_t size_type;
+  typedef ptrdiff_t difference_type;
+  typedef T value_type;
+  typedef T* pointer;
+  typedef typename std::add_const<T>::type* const_pointer;
 
-  KOKKOS_INLINE_FUNCTION static constexpr size_type size() { return N ; }
-  KOKKOS_INLINE_FUNCTION static constexpr bool      empty(){ return false ; }
-  KOKKOS_INLINE_FUNCTION constexpr size_type max_size() const { return N ; }
+  KOKKOS_INLINE_FUNCTION static constexpr size_type size() { return N; }
+  KOKKOS_INLINE_FUNCTION static constexpr bool empty() { return false; }
+  KOKKOS_INLINE_FUNCTION constexpr size_type max_size() const { return N; }
 
-  template< typename iType >
-  KOKKOS_INLINE_FUNCTION
-  reference operator[]( const iType & i )
-    {
-      static_assert( ( std::is_integral<iType>::value || std::is_enum<iType>::value ) , "Must be integral argument" );
-      KOKKOS_ARRAY_BOUNDS_CHECK(i, N);
-      return m_internal_implementation_private_member_data[i];
-    }
+  template <typename iType>
+  KOKKOS_INLINE_FUNCTION reference operator[](const iType& i) {
+    static_assert(
+        (std::is_integral<iType>::value || std::is_enum<iType>::value),
+        "Must be integral argument");
+    KOKKOS_ARRAY_BOUNDS_CHECK(i, N);
+    return m_internal_implementation_private_member_data[i];
+  }
 
-  template< typename iType >
-  KOKKOS_INLINE_FUNCTION
-  const_reference operator[]( const iType & i ) const
-    {
-      static_assert( ( std::is_integral<iType>::value || std::is_enum<iType>::value ) , "Must be integral argument" );
-      KOKKOS_ARRAY_BOUNDS_CHECK(i, N);
-      return m_internal_implementation_private_member_data[i];
-    }
+  template <typename iType>
+  KOKKOS_INLINE_FUNCTION const_reference operator[](const iType& i) const {
+    static_assert(
+        (std::is_integral<iType>::value || std::is_enum<iType>::value),
+        "Must be integral argument");
+    KOKKOS_ARRAY_BOUNDS_CHECK(i, N);
+    return m_internal_implementation_private_member_data[i];
+  }
 
-  KOKKOS_INLINE_FUNCTION pointer       data()
-    {
-      return & m_internal_implementation_private_member_data[0];
-    }
-  KOKKOS_INLINE_FUNCTION const_pointer data() const
-    {
-      return & m_internal_implementation_private_member_data[0];
-    }
+  KOKKOS_INLINE_FUNCTION pointer data() {
+    return &m_internal_implementation_private_member_data[0];
+  }
+  KOKKOS_INLINE_FUNCTION const_pointer data() const {
+    return &m_internal_implementation_private_member_data[0];
+  }
 
-  #ifdef KOKKOS_IMPL_ROCM_CLANG_WORKAROUND
+#ifdef KOKKOS_IMPL_ROCM_CLANG_WORKAROUND
   // Do not default unless move and move-assignment are also defined
   KOKKOS_INLINE_FUNCTION
-  ~Array() = default ;
-  Array() = default ;
-  Array( const Array & ) = default ;
-  Array & operator = ( const Array & ) = default ;
+  ~Array()            = default;
+  Array()             = default;
+  Array(const Array&) = default;
+  Array& operator=(const Array&) = default;
 
   // Some supported compilers are not sufficiently C++11 compliant
   // for default move constructor and move assignment operator.
-  Array( Array && ) = default ;
-  Array & operator = ( Array && ) = default ;
- 
+  Array(Array&&) = default;
+  Array& operator=(Array&&) = default;
+
   KOKKOS_INLINE_FUNCTION
   Array(const std::initializer_list<T>& vals) {
-    for(int i=0; i<N; i++) {
+    for (int i = 0; i < N; i++) {
       m_internal_implementation_private_member_data[i] = vals.begin()[i];
     }
   }
-  #endif
+#endif
 };
 
+template <class T, class Proxy>
+struct Array<T, 0, Proxy> {
+ public:
+  typedef T& reference;
+  typedef typename std::add_const<T>::type& const_reference;
+  typedef size_t size_type;
+  typedef ptrdiff_t difference_type;
+  typedef T value_type;
+  typedef T* pointer;
+  typedef typename std::add_const<T>::type* const_pointer;
 
-template< class T , class Proxy >
-struct Array<T,0,Proxy> {
-public:
+  KOKKOS_INLINE_FUNCTION static constexpr size_type size() { return 0; }
+  KOKKOS_INLINE_FUNCTION static constexpr bool empty() { return true; }
+  KOKKOS_INLINE_FUNCTION constexpr size_type max_size() const { return 0; }
 
-  typedef typename std::add_const<T>::type &  reference ;
-  typedef typename std::add_const<T>::type &  const_reference ;
-  typedef size_t                              size_type ;
-  typedef ptrdiff_t                           difference_type ;
-  typedef typename std::add_const<T>::type    value_type ;
-  typedef typename std::add_const<T>::type *  pointer ;
-  typedef typename std::add_const<T>::type *  const_pointer ;
+  template <typename iType>
+  KOKKOS_INLINE_FUNCTION reference operator[](const iType&) {
+    static_assert(
+        (std::is_integral<iType>::value || std::is_enum<iType>::value),
+        "Must be integer argument");
+    Kokkos::abort("Unreachable code");
+    return *reinterpret_cast<pointer>(-1);
+  }
 
-  KOKKOS_INLINE_FUNCTION static constexpr size_type size()  { return 0 ; }
-  KOKKOS_INLINE_FUNCTION static constexpr bool      empty() { return true ; }
-  KOKKOS_INLINE_FUNCTION constexpr size_type max_size() const { return 0 ; }
+  template <typename iType>
+  KOKKOS_INLINE_FUNCTION const_reference operator[](const iType&) const {
+    static_assert(
+        (std::is_integral<iType>::value || std::is_enum<iType>::value),
+        "Must be integer argument");
+    Kokkos::abort("Unreachable code");
+    return *reinterpret_cast<const_pointer>(-1);
+  }
 
-  template< typename iType >
-  KOKKOS_INLINE_FUNCTION
-  value_type operator[]( const iType & )
-    {
-      static_assert( ( std::is_integral<iType>::value || std::is_enum<iType>::value ) , "Must be integer argument" );
-      return value_type();
-    }
-
-  template< typename iType >
-  KOKKOS_INLINE_FUNCTION
-  value_type operator[]( const iType & ) const
-    {
-      static_assert( ( std::is_integral<iType>::value || std::is_enum<iType>::value ) , "Must be integer argument" );
-      return value_type();
-    }
-
-  KOKKOS_INLINE_FUNCTION pointer       data()       { return pointer(0) ; }
+  KOKKOS_INLINE_FUNCTION pointer data() { return pointer(0); }
   KOKKOS_INLINE_FUNCTION const_pointer data() const { return const_pointer(0); }
 
 #ifdef KOKKOS_CUDA_9_DEFAULTED_BUG_WORKAROUND
   KOKKOS_INLINE_FUNCTION ~Array() {}
   KOKKOS_INLINE_FUNCTION Array() {}
-  KOKKOS_INLINE_FUNCTION Array( const Array & ) {}
-  KOKKOS_INLINE_FUNCTION Array & operator = ( const Array & ) {}
+  KOKKOS_INLINE_FUNCTION Array(const Array&) {}
+  KOKKOS_INLINE_FUNCTION Array& operator=(const Array&) {}
 #else
-  KOKKOS_INLINE_FUNCTION ~Array() = default;
-  KOKKOS_INLINE_FUNCTION Array() = default;
-  KOKKOS_INLINE_FUNCTION Array( const Array & ) = default;
-  KOKKOS_INLINE_FUNCTION Array & operator = ( const Array & ) = default;
+  KOKKOS_INLINE_FUNCTION ~Array()            = default;
+  KOKKOS_INLINE_FUNCTION Array()             = default;
+  KOKKOS_INLINE_FUNCTION Array(const Array&) = default;
+  KOKKOS_INLINE_FUNCTION Array& operator=(const Array&) = default;
 #endif
 
   // Some supported compilers are not sufficiently C++11 compliant
@@ -239,62 +235,59 @@ public:
   // Array & operator = ( Array && ) = default ;
 };
 
-
-template<>
-struct Array<void,KOKKOS_INVALID_INDEX,void>
-{
+template <>
+struct Array<void, KOKKOS_INVALID_INDEX, void> {
   struct contiguous {};
   struct strided {};
 };
 
-template< class T >
-struct Array< T ,KOKKOS_INVALID_INDEX , Array<>::contiguous >
-{
-private:
-  T *    m_elem ;
-  size_t m_size ;
-public:
+template <class T>
+struct Array<T, KOKKOS_INVALID_INDEX, Array<>::contiguous> {
+ private:
+  T* m_elem;
+  size_t m_size;
 
-  typedef T &                                 reference ;
-  typedef typename std::add_const<T>::type &  const_reference ;
-  typedef size_t                              size_type ;
-  typedef ptrdiff_t                           difference_type ;
-  typedef T                                   value_type ;
-  typedef T *                                 pointer ;
-  typedef typename std::add_const<T>::type *  const_pointer ;
+ public:
+  typedef T& reference;
+  typedef typename std::add_const<T>::type& const_reference;
+  typedef size_t size_type;
+  typedef ptrdiff_t difference_type;
+  typedef T value_type;
+  typedef T* pointer;
+  typedef typename std::add_const<T>::type* const_pointer;
 
-  KOKKOS_INLINE_FUNCTION constexpr size_type size()  const { return m_size ; }
-  KOKKOS_INLINE_FUNCTION constexpr bool      empty() const { return 0 != m_size ; }
-  KOKKOS_INLINE_FUNCTION constexpr size_type max_size() const { return m_size ; }
+  KOKKOS_INLINE_FUNCTION constexpr size_type size() const { return m_size; }
+  KOKKOS_INLINE_FUNCTION constexpr bool empty() const { return 0 != m_size; }
+  KOKKOS_INLINE_FUNCTION constexpr size_type max_size() const { return m_size; }
 
-  template< typename iType >
-  KOKKOS_INLINE_FUNCTION
-  reference operator[]( const iType & i )
-    {
-      static_assert( ( std::is_integral<iType>::value || std::is_enum<iType>::value ) , "Must be integral argument" );
-      KOKKOS_ARRAY_BOUNDS_CHECK(i, m_size);
-      return m_elem[i];
-    }
+  template <typename iType>
+  KOKKOS_INLINE_FUNCTION reference operator[](const iType& i) {
+    static_assert(
+        (std::is_integral<iType>::value || std::is_enum<iType>::value),
+        "Must be integral argument");
+    KOKKOS_ARRAY_BOUNDS_CHECK(i, m_size);
+    return m_elem[i];
+  }
 
-  template< typename iType >
-  KOKKOS_INLINE_FUNCTION
-  const_reference operator[]( const iType & i ) const
-    {
-      static_assert( ( std::is_integral<iType>::value || std::is_enum<iType>::value ) , "Must be integral argument" );
-      KOKKOS_ARRAY_BOUNDS_CHECK(i, m_size);
-      return m_elem[i];
-    }
+  template <typename iType>
+  KOKKOS_INLINE_FUNCTION const_reference operator[](const iType& i) const {
+    static_assert(
+        (std::is_integral<iType>::value || std::is_enum<iType>::value),
+        "Must be integral argument");
+    KOKKOS_ARRAY_BOUNDS_CHECK(i, m_size);
+    return m_elem[i];
+  }
 
-  KOKKOS_INLINE_FUNCTION pointer       data()       { return m_elem ; }
-  KOKKOS_INLINE_FUNCTION const_pointer data() const { return m_elem ; }
+  KOKKOS_INLINE_FUNCTION pointer data() { return m_elem; }
+  KOKKOS_INLINE_FUNCTION const_pointer data() const { return m_elem; }
 
 #ifdef KOKKOS_CUDA_9_DEFAULTED_BUG_WORKAROUND
   KOKKOS_INLINE_FUNCTION ~Array() {}
 #else
-  KOKKOS_INLINE_FUNCTION ~Array() = default;
+  KOKKOS_INLINE_FUNCTION ~Array()                       = default;
 #endif
-  Array() = delete ;
-  Array( const Array & rhs ) = delete ;
+  Array()                 = delete;
+  Array(const Array& rhs) = delete;
 
   // Some supported compilers are not sufficiently C++11 compliant
   // for default move constructor and move assignment operator.
@@ -302,76 +295,72 @@ public:
   // Array & operator = ( Array && rhs ) = delete ;
 
   KOKKOS_INLINE_FUNCTION
-  Array & operator = ( const Array & rhs )
-    {
-      const size_t n = std::min( m_size , rhs.size() );
-      for ( size_t i = 0 ; i < n ; ++i ) m_elem[i] = rhs[i] ;
-      return *this ;
-    }
+  Array& operator=(const Array& rhs) {
+    const size_t n = std::min(m_size, rhs.size());
+    for (size_t i = 0; i < n; ++i) m_elem[i] = rhs[i];
+    return *this;
+  }
 
-  template< size_t N , class P >
-  KOKKOS_INLINE_FUNCTION
-  Array & operator = ( const Array<T,N,P> & rhs )
-    {
-      const size_t n = std::min( m_size , rhs.size() );
-      for ( size_t i = 0 ; i < n ; ++i ) m_elem[i] = rhs[i] ;
-      return *this ;
-    }
+  template <size_t N, class P>
+  KOKKOS_INLINE_FUNCTION Array& operator=(const Array<T, N, P>& rhs) {
+    const size_t n = std::min(m_size, rhs.size());
+    for (size_t i = 0; i < n; ++i) m_elem[i] = rhs[i];
+    return *this;
+  }
 
-  KOKKOS_INLINE_FUNCTION constexpr Array( pointer arg_ptr , size_type arg_size , size_type = 0 )
-    : m_elem(arg_ptr), m_size(arg_size) {}
+  KOKKOS_INLINE_FUNCTION constexpr Array(pointer arg_ptr, size_type arg_size,
+                                         size_type = 0)
+      : m_elem(arg_ptr), m_size(arg_size) {}
 };
 
-template< class T >
-struct Array< T ,KOKKOS_INVALID_INDEX , Array<>::strided >
-{
-private:
-  T *    m_elem ;
-  size_t m_size ;
-  size_t m_stride ;
-public:
+template <class T>
+struct Array<T, KOKKOS_INVALID_INDEX, Array<>::strided> {
+ private:
+  T* m_elem;
+  size_t m_size;
+  size_t m_stride;
 
-  typedef T &                                 reference ;
-  typedef typename std::add_const<T>::type &  const_reference ;
-  typedef size_t                              size_type ;
-  typedef ptrdiff_t                           difference_type ;
-  typedef T                                   value_type ;
-  typedef T *                                 pointer ;
-  typedef typename std::add_const<T>::type *  const_pointer ;
+ public:
+  typedef T& reference;
+  typedef typename std::add_const<T>::type& const_reference;
+  typedef size_t size_type;
+  typedef ptrdiff_t difference_type;
+  typedef T value_type;
+  typedef T* pointer;
+  typedef typename std::add_const<T>::type* const_pointer;
 
-  KOKKOS_INLINE_FUNCTION constexpr size_type size()  const { return m_size ; }
-  KOKKOS_INLINE_FUNCTION constexpr bool      empty() const { return 0 != m_size ; }
-  KOKKOS_INLINE_FUNCTION constexpr size_type max_size() const { return m_size ; }
+  KOKKOS_INLINE_FUNCTION constexpr size_type size() const { return m_size; }
+  KOKKOS_INLINE_FUNCTION constexpr bool empty() const { return 0 != m_size; }
+  KOKKOS_INLINE_FUNCTION constexpr size_type max_size() const { return m_size; }
 
-  template< typename iType >
-  KOKKOS_INLINE_FUNCTION
-  reference operator[]( const iType & i )
-    {
-      static_assert( ( std::is_integral<iType>::value || std::is_enum<iType>::value ) , "Must be integral argument" );
-      KOKKOS_ARRAY_BOUNDS_CHECK(i, m_size);
-      return m_elem[i*m_stride];
-    }
+  template <typename iType>
+  KOKKOS_INLINE_FUNCTION reference operator[](const iType& i) {
+    static_assert(
+        (std::is_integral<iType>::value || std::is_enum<iType>::value),
+        "Must be integral argument");
+    KOKKOS_ARRAY_BOUNDS_CHECK(i, m_size);
+    return m_elem[i * m_stride];
+  }
 
-  template< typename iType >
-  KOKKOS_INLINE_FUNCTION
-  const_reference operator[]( const iType & i ) const
-    {
-      static_assert( ( std::is_integral<iType>::value || std::is_enum<iType>::value ) , "Must be integral argument" );
-      KOKKOS_ARRAY_BOUNDS_CHECK(i, m_size);
-      return m_elem[i*m_stride];
-    }
+  template <typename iType>
+  KOKKOS_INLINE_FUNCTION const_reference operator[](const iType& i) const {
+    static_assert(
+        (std::is_integral<iType>::value || std::is_enum<iType>::value),
+        "Must be integral argument");
+    KOKKOS_ARRAY_BOUNDS_CHECK(i, m_size);
+    return m_elem[i * m_stride];
+  }
 
-  KOKKOS_INLINE_FUNCTION pointer       data()       { return m_elem ; }
-  KOKKOS_INLINE_FUNCTION const_pointer data() const { return m_elem ; }
+  KOKKOS_INLINE_FUNCTION pointer data() { return m_elem; }
+  KOKKOS_INLINE_FUNCTION const_pointer data() const { return m_elem; }
 
 #ifdef KOKKOS_CUDA_9_DEFAULTED_BUG_WORKAROUND
   KOKKOS_INLINE_FUNCTION ~Array() {}
 #else
-  KOKKOS_INLINE_FUNCTION ~Array() = default;
+  KOKKOS_INLINE_FUNCTION ~Array()                       = default;
 #endif
-  Array()  = delete ;
-  Array( const Array & ) = delete ;
-
+  Array()             = delete;
+  Array(const Array&) = delete;
 
   // Some supported compilers are not sufficiently C++11 compliant
   // for default move constructor and move assignment operator.
@@ -379,27 +368,24 @@ public:
   // Array & operator = ( Array && rhs ) = delete ;
 
   KOKKOS_INLINE_FUNCTION
-  Array & operator = ( const Array & rhs )
-    {
-      const size_t n = std::min( m_size , rhs.size() );
-      for ( size_t i = 0 ; i < n ; ++i ) m_elem[i] = rhs[i] ;
-      return *this ;
-    }
+  Array& operator=(const Array& rhs) {
+    const size_t n = std::min(m_size, rhs.size());
+    for (size_t i = 0; i < n; ++i) m_elem[i] = rhs[i];
+    return *this;
+  }
 
-  template< size_t N , class P >
-  KOKKOS_INLINE_FUNCTION
-  Array & operator = ( const Array<T,N,P> & rhs )
-    {
-      const size_t n = std::min( m_size , rhs.size() );
-      for ( size_t i = 0 ; i < n ; ++i ) m_elem[i] = rhs[i] ;
-      return *this ;
-    }
+  template <size_t N, class P>
+  KOKKOS_INLINE_FUNCTION Array& operator=(const Array<T, N, P>& rhs) {
+    const size_t n = std::min(m_size, rhs.size());
+    for (size_t i = 0; i < n; ++i) m_elem[i] = rhs[i];
+    return *this;
+  }
 
-  KOKKOS_INLINE_FUNCTION constexpr Array( pointer arg_ptr , size_type arg_size , size_type arg_stride )
-    : m_elem(arg_ptr), m_size(arg_size), m_stride(arg_stride) {}
+  KOKKOS_INLINE_FUNCTION constexpr Array(pointer arg_ptr, size_type arg_size,
+                                         size_type arg_stride)
+      : m_elem(arg_ptr), m_size(arg_size), m_stride(arg_stride) {}
 };
 
-} // namespace Kokkos
+}  // namespace Kokkos
 
 #endif /* #ifndef KOKKOS_ARRAY_HPP */
-
diff --git a/lib/kokkos/core/src/Kokkos_Atomic.hpp b/lib/kokkos/core/src/Kokkos_Atomic.hpp
index c2268bd35f..c4f7fa3ec1 100644
--- a/lib/kokkos/core/src/Kokkos_Atomic.hpp
+++ b/lib/kokkos/core/src/Kokkos_Atomic.hpp
@@ -1,13 +1,14 @@
 /*
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -36,7 +37,7 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 */
@@ -75,7 +76,7 @@
 #if defined(_WIN32)
 #define KOKKOS_ENABLE_WINDOWS_ATOMICS
 #else
-#if defined( KOKKOS_ENABLE_CUDA )
+#if defined(KOKKOS_ENABLE_CUDA)
 
 // Compiling NVIDIA device code, must use Cuda atomics:
 
@@ -87,32 +88,30 @@
 
 #endif
 
-#if ! defined( KOKKOS_ENABLE_GNU_ATOMICS ) && \
-    ! defined( KOKKOS_ENABLE_INTEL_ATOMICS ) && \
-    ! defined( KOKKOS_ENABLE_OPENMP_ATOMICS ) && \
-    ! defined( KOKKOS_ENABLE_STD_ATOMICS ) && \
-    ! defined( KOKKOS_ENABLE_SERIAL_ATOMICS )
+#if !defined(KOKKOS_ENABLE_GNU_ATOMICS) &&    \
+    !defined(KOKKOS_ENABLE_INTEL_ATOMICS) &&  \
+    !defined(KOKKOS_ENABLE_OPENMP_ATOMICS) && \
+    !defined(KOKKOS_ENABLE_STD_ATOMICS) &&    \
+    !defined(KOKKOS_ENABLE_SERIAL_ATOMICS)
 
 // Compiling for non-Cuda atomic implementation has not been pre-selected.
 // Choose the best implementation for the detected compiler.
 // Preference: GCC, INTEL, OMP31
 
-#if defined( KOKKOS_INTERNAL_NOT_PARALLEL )
+#if defined(KOKKOS_INTERNAL_NOT_PARALLEL)
 
 #define KOKKOS_ENABLE_SERIAL_ATOMICS
 
-#elif defined( KOKKOS_COMPILER_GNU ) || \
-    defined( KOKKOS_COMPILER_CLANG ) || \
-    ( defined ( KOKKOS_COMPILER_NVCC ) )
+#elif defined(KOKKOS_COMPILER_GNU) || defined(KOKKOS_COMPILER_CLANG) || \
+    (defined(KOKKOS_COMPILER_NVCC))
 
 #define KOKKOS_ENABLE_GNU_ATOMICS
 
-#elif defined( KOKKOS_COMPILER_INTEL ) || \
-      defined( KOKKOS_COMPILER_CRAYC )
+#elif defined(KOKKOS_COMPILER_INTEL) || defined(KOKKOS_COMPILER_CRAYC)
 
 #define KOKKOS_ENABLE_INTEL_ATOMICS
 
-#elif defined( _OPENMP ) && ( 201107 <= _OPENMP )
+#elif defined(_OPENMP) && (201107 <= _OPENMP)
 
 #define KOKKOS_ENABLE_OPENMP_ATOMICS
 
@@ -131,43 +130,37 @@
 
 namespace Kokkos {
 template <typename T>
-KOKKOS_INLINE_FUNCTION
-void atomic_add(volatile T * const dest, const T src);
+KOKKOS_INLINE_FUNCTION void atomic_add(volatile T* const dest, const T src);
 
 // Atomic increment
-template<typename T>
-KOKKOS_INLINE_FUNCTION
-void atomic_increment(volatile T* a);
+template <typename T>
+KOKKOS_INLINE_FUNCTION void atomic_increment(volatile T* a);
 
-template<typename T>
-KOKKOS_INLINE_FUNCTION
-void atomic_decrement(volatile T* a);
-}
+template <typename T>
+KOKKOS_INLINE_FUNCTION void atomic_decrement(volatile T* a);
+}  // namespace Kokkos
 
 namespace Kokkos {
 
-
-inline
-const char * atomic_query_version()
-{
-#if defined( KOKKOS_ENABLE_CUDA_ATOMICS )
-  return "KOKKOS_ENABLE_CUDA_ATOMICS" ;
-#elif defined( KOKKOS_ENABLE_GNU_ATOMICS )
-  return "KOKKOS_ENABLE_GNU_ATOMICS" ;
-#elif defined( KOKKOS_ENABLE_INTEL_ATOMICS )
-  return "KOKKOS_ENABLE_INTEL_ATOMICS" ;
-#elif defined( KOKKOS_ENABLE_OPENMP_ATOMICS )
-  return "KOKKOS_ENABLE_OPENMP_ATOMICS" ;
-#elif defined( KOKKOS_ENABLE_WINDOWS_ATOMICS )
+inline const char* atomic_query_version() {
+#if defined(KOKKOS_ENABLE_CUDA_ATOMICS)
+  return "KOKKOS_ENABLE_CUDA_ATOMICS";
+#elif defined(KOKKOS_ENABLE_GNU_ATOMICS)
+  return "KOKKOS_ENABLE_GNU_ATOMICS";
+#elif defined(KOKKOS_ENABLE_INTEL_ATOMICS)
+  return "KOKKOS_ENABLE_INTEL_ATOMICS";
+#elif defined(KOKKOS_ENABLE_OPENMP_ATOMICS)
+  return "KOKKOS_ENABLE_OPENMP_ATOMICS";
+#elif defined(KOKKOS_ENABLE_WINDOWS_ATOMICS)
   return "KOKKOS_ENABLE_WINDOWS_ATOMICS";
-#elif defined( KOKKOS_ENABLE_SERIAL_ATOMICS )
+#elif defined(KOKKOS_ENABLE_SERIAL_ATOMICS)
   return "KOKKOS_ENABLE_SERIAL_ATOMICS";
 #else
 #error "No valid response for atomic_query_version!"
 #endif
 }
 
-} // namespace Kokkos
+}  // namespace Kokkos
 
 //----------------------------------------------------------------------------
 // Atomic Memory Orders
@@ -175,16 +168,14 @@ const char * atomic_query_version()
 // Implements Strongly-typed analogs of C++ standard memory orders
 #include "impl/Kokkos_Atomic_Memory_Order.hpp"
 
-#if defined( KOKKOS_ENABLE_ROCM )
+#if defined(KOKKOS_ENABLE_ROCM)
 namespace Kokkos {
 namespace Impl {
-extern KOKKOS_INLINE_FUNCTION
-bool lock_address_rocm_space(void* ptr);
+extern KOKKOS_INLINE_FUNCTION bool lock_address_rocm_space(void* ptr);
 
-extern KOKKOS_INLINE_FUNCTION
-void unlock_address_rocm_space(void* ptr);
-}
-}
+extern KOKKOS_INLINE_FUNCTION void unlock_address_rocm_space(void* ptr);
+}  // namespace Impl
+}  // namespace Kokkos
 #include <ROCm/Kokkos_ROCm_Atomic.hpp>
 #endif
 
@@ -212,8 +203,9 @@ void unlock_address_rocm_space(void* ptr);
 // Atomic compare-and-exchange
 //
 // template<class T>
-// bool atomic_compare_exchange_strong(volatile T* const dest, const T compare, const T val)
-// { bool equal = compare == *dest ; if ( equal ) { *dest = val ; } return equal ; }
+// bool atomic_compare_exchange_strong(volatile T* const dest, const T compare,
+// const T val) { bool equal = compare == *dest ; if ( equal ) { *dest = val ; }
+// return equal ; }
 
 #include "impl/Kokkos_Atomic_Compare_Exchange_Strong.hpp"
 
@@ -275,7 +267,8 @@ void unlock_address_rocm_space(void* ptr);
 //----------------------------------------------------------------------------
 // Memory fence
 //
-// All loads and stores from this thread will be globally consistent before continuing
+// All loads and stores from this thread will be globally consistent before
+// continuing
 //
 // void memory_fence() {...};
 #include "impl/Kokkos_Memory_Fence.hpp"
@@ -301,23 +294,22 @@ void unlock_address_rocm_space(void* ptr);
 #include "impl/Kokkos_Atomic_Load.hpp"
 #include "impl/Kokkos_Atomic_Store.hpp"
 
-
 //----------------------------------------------------------------------------
 // This atomic-style macro should be an inlined function, not a macro
 
-#if defined( KOKKOS_COMPILER_GNU ) && !defined(__PGIC__) && !defined(__CUDA_ARCH__)
+#if defined(KOKKOS_COMPILER_GNU) && !defined(__PGIC__) && \
+    !defined(__CUDA_ARCH__)
 
-  #define KOKKOS_NONTEMPORAL_PREFETCH_LOAD(addr) __builtin_prefetch(addr,0,0)
-  #define KOKKOS_NONTEMPORAL_PREFETCH_STORE(addr) __builtin_prefetch(addr,1,0)
+#define KOKKOS_NONTEMPORAL_PREFETCH_LOAD(addr) __builtin_prefetch(addr, 0, 0)
+#define KOKKOS_NONTEMPORAL_PREFETCH_STORE(addr) __builtin_prefetch(addr, 1, 0)
 
 #else
 
-  #define KOKKOS_NONTEMPORAL_PREFETCH_LOAD(addr) ((void)0)
-  #define KOKKOS_NONTEMPORAL_PREFETCH_STORE(addr) ((void)0)
+#define KOKKOS_NONTEMPORAL_PREFETCH_LOAD(addr) ((void)0)
+#define KOKKOS_NONTEMPORAL_PREFETCH_STORE(addr) ((void)0)
 
 #endif
 
 //----------------------------------------------------------------------------
 
 #endif /* KOKKOS_ATOMIC_HPP */
-
diff --git a/lib/kokkos/core/src/Kokkos_Complex.hpp b/lib/kokkos/core/src/Kokkos_Complex.hpp
index a3ada5d55e..a9af073b41 100644
--- a/lib/kokkos/core/src/Kokkos_Complex.hpp
+++ b/lib/kokkos/core/src/Kokkos_Complex.hpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -57,658 +58,683 @@ namespace Kokkos {
 ///   complex number.  As with std::complex, this is only defined for
 ///   \c float, \c double, and <tt>long double</tt>.  The latter is
 ///   currently forbidden in CUDA device kernels.
-template<class RealType>
-class complex {
-private:
-  RealType re_, im_;
+template <class RealType>
+class
+#ifdef KOKKOS_ENABLE_COMPLEX_ALIGN
+    alignas(2 * sizeof(RealType))
+#endif
+        complex {
+ private:
+  RealType re_{};
+  RealType im_{};
 
-public:
+ public:
   //! The type of the real or imaginary parts of this complex number.
-  typedef RealType value_type;
+  using value_type = RealType;
 
   //! Default constructor (initializes both real and imaginary parts to zero).
-  KOKKOS_INLINE_FUNCTION complex () :
-    re_ (0.0), im_ (0.0)
-  {}
+  KOKKOS_INLINE_FUNCTION
+  complex() noexcept = default;
 
   //! Copy constructor.
-  KOKKOS_INLINE_FUNCTION complex (const complex<RealType>& src) :
-    re_ (src.re_), im_ (src.im_)
-  {}
+  KOKKOS_INLINE_FUNCTION
+  complex(const complex&) noexcept = default;
 
-  //! Copy constructor from volatile.
-  KOKKOS_INLINE_FUNCTION complex (const volatile complex<RealType>& src) :
-    re_ (src.re_), im_ (src.im_)
-  {}
+  KOKKOS_INLINE_FUNCTION
+  complex& operator=(const complex&) noexcept = default;
+
+  /// \brief Conversion constructor from compatible RType
+  template <class RType,
+            typename std::enable_if<std::is_convertible<RType, RealType>::value,
+                                    int>::type = 0>
+  KOKKOS_INLINE_FUNCTION complex(const complex<RType>& other) noexcept
+      // Intentionally do the conversions implicitly here so that users don't
+      // get any warnings about narrowing, etc., that they would expect to get
+      // otherwise.
+      : re_(other.real()), im_(other.imag()) {}
 
   /// \brief Conversion constructor from std::complex.
   ///
   /// This constructor cannot be called in a CUDA device function,
   /// because std::complex's methods and nonmember functions are not
   /// marked as CUDA device functions.
-  template<class InputRealType>
-  complex (const std::complex<InputRealType>& src) :
-    re_ (std::real (src)), im_ (std::imag (src))
-  {}
+  KOKKOS_INLINE_FUNCTION
+  complex(const std::complex<RealType>& src) noexcept
+      // We can use this aspect of the standard to avoid calling
+      // non-device-marked functions `std::real` and `std::imag`: "For any
+      // object z of type complex<T>, reinterpret_cast<T(&)[2]>(z)[0] is the
+      // real part of z and reinterpret_cast<T(&)[2]>(z)[1] is the imaginary
+      // part of z." Now we don't have to provide a whole bunch of the overloads
+      // of things taking either Kokkos::complex or std::complex
+      : re_(reinterpret_cast<const RealType (&)[2]>(src)[0]),
+        im_(reinterpret_cast<const RealType (&)[2]>(src)[1]) {}
 
   /// \brief Conversion operator to std::complex.
   ///
   /// This operator cannot be called in a CUDA device function,
   /// because std::complex's methods and nonmember functions are not
   /// marked as CUDA device functions.
-  operator std::complex<RealType> () const {
-    return std::complex<RealType> (re_, im_);
+  // TODO: make explicit.  DJS 2019-08-28
+  operator std::complex<RealType>() const noexcept {
+    return std::complex<RealType>(re_, im_);
   }
 
   /// \brief Constructor that takes just the real part, and sets the
   ///   imaginary part to zero.
-  template<class InputRealType>
-  KOKKOS_INLINE_FUNCTION complex (const InputRealType& val) :
-    re_ (val), im_ (static_cast<InputRealType>(0.0))
-  {}
+  KOKKOS_INLINE_FUNCTION complex(const RealType& val) noexcept
+      : re_(val), im_(static_cast<RealType>(0)) {}
 
-  // BUG HCC WORKAROUND
-  KOKKOS_INLINE_FUNCTION complex( const RealType& re, const RealType& im):
-    re_ (re), im_ (im)
-  {}
- 
   //! Constructor that takes the real and imaginary parts.
-  template<class RealType1, class RealType2>
-  KOKKOS_INLINE_FUNCTION complex (const RealType1& re, const RealType2& im) :
-    re_ (re), im_ (im)
-  {}
-
-  //! Assignment operator.
-  template<class InputRealType>
   KOKKOS_INLINE_FUNCTION
-  complex<RealType>& operator= (const complex<InputRealType>& src) {
-    re_ = src.re_;
-    im_ = src.im_;
-    return *this;
-  }
-
-  /// \brief Assignment operator, for volatile <tt>*this</tt> and
-  ///   nonvolatile input.
-  ///
-  /// \param src [in] Input; right-hand side of the assignment.
-  ///
-  /// This operator returns \c void instead of <tt>volatile
-  /// complex<RealType>& </tt>.  See Kokkos Issue #177 for the
-  /// explanation.  In practice, this means that you should not chain
-  /// assignments with volatile lvalues.
-  template<class InputRealType>
-  KOKKOS_INLINE_FUNCTION
-  void operator= (const complex<InputRealType>& src) volatile {
-    re_ = src.re_;
-    im_ = src.im_;
-    // We deliberately do not return anything here.  See explanation
-    // in public documentation above.
-  }
-
-  //! Assignment operator.
-  template<class InputRealType>
-  KOKKOS_INLINE_FUNCTION
-  volatile complex<RealType>& operator= (const volatile complex<InputRealType>& src) volatile {
-    re_ = src.re_;
-    im_ = src.im_;
-    return *this;
-  }
-
-  //! Assignment operator.
-  template<class InputRealType>
-  KOKKOS_INLINE_FUNCTION
-  complex<RealType>& operator= (const volatile complex<InputRealType>& src) {
-    re_ = src.re_;
-    im_ = src.im_;
-    return *this;
-  }
+  complex(const RealType& re, const RealType& im) noexcept : re_(re), im_(im) {}
 
   //! Assignment operator (from a real number).
-  template<class InputRealType>
-  KOKKOS_INLINE_FUNCTION
-  complex<RealType>& operator= (const InputRealType& val) {
+  KOKKOS_INLINE_FUNCTION complex& operator=(const RealType& val) noexcept {
     re_ = val;
-    im_ = static_cast<RealType> (0.0);
+    im_ = RealType(0);
     return *this;
   }
 
-  //! Assignment operator (from a real number).
-  template<class InputRealType>
-  KOKKOS_INLINE_FUNCTION
-  void operator= (const InputRealType& val) volatile {
-    re_ = val;
-    im_ = static_cast<RealType> (0.0);
-  }
-
   /// \brief Assignment operator from std::complex.
   ///
   /// This constructor cannot be called in a CUDA device function,
   /// because std::complex's methods and nonmember functions are not
   /// marked as CUDA device functions.
-  template<class InputRealType>
-  complex<RealType>& operator= (const std::complex<InputRealType>& src) {
-    re_ = std::real (src);
-    im_ = std::imag (src);
+  complex& operator=(const std::complex<RealType>& src) noexcept {
+    *this = complex(src);
     return *this;
   }
 
   //! The imaginary part of this complex number.
-  KOKKOS_INLINE_FUNCTION RealType& imag () {
-    return im_;
-  }
+  KOKKOS_INLINE_FUNCTION
+  KOKKOS_CONSTEXPR_14 RealType& imag() noexcept { return im_; }
 
   //! The real part of this complex number.
-  KOKKOS_INLINE_FUNCTION RealType& real () {
-    return re_;
-  }
+  KOKKOS_INLINE_FUNCTION
+  KOKKOS_CONSTEXPR_14 RealType& real() noexcept { return re_; }
 
   //! The imaginary part of this complex number.
-  KOKKOS_INLINE_FUNCTION const RealType imag () const {
-    return im_;
-  }
+  KOKKOS_INLINE_FUNCTION
+  constexpr RealType imag() const noexcept { return im_; }
 
   //! The real part of this complex number.
-  KOKKOS_INLINE_FUNCTION const RealType real () const {
-    return re_;
-  }
-
-  //! The imaginary part of this complex number (volatile overload).
-  KOKKOS_INLINE_FUNCTION volatile RealType& imag () volatile {
-    return im_;
-  }
-
-  //! The real part of this complex number (volatile overload).
-  KOKKOS_INLINE_FUNCTION volatile RealType& real () volatile {
-    return re_;
-  }
-
-  //! The imaginary part of this complex number (volatile overload).
-  KOKKOS_INLINE_FUNCTION const RealType imag () const volatile {
-    return im_;
-  }
-
-  //! The real part of this complex number (volatile overload).
-  KOKKOS_INLINE_FUNCTION const RealType real () const volatile {
-    return re_;
-  }
+  KOKKOS_INLINE_FUNCTION
+  constexpr RealType real() const noexcept { return re_; }
 
   //! Set the imaginary part of this complex number.
-  KOKKOS_INLINE_FUNCTION void imag (RealType v) {
-    im_ = v;
-  }
+  KOKKOS_INLINE_FUNCTION
+  KOKKOS_CONSTEXPR_14
+  void imag(RealType v) noexcept { im_ = v; }
 
   //! Set the real part of this complex number.
-  KOKKOS_INLINE_FUNCTION void real (RealType v) {
-    re_ = v;
-  }
-
-  template<typename InputRealType>
   KOKKOS_INLINE_FUNCTION
-  complex<RealType>&
-  operator += (const complex<InputRealType>& src) {
-    static_assert(std::is_convertible<InputRealType,RealType>::value, 
-                  "InputRealType must be convertible to RealType");
+  KOKKOS_CONSTEXPR_14
+  void real(RealType v) noexcept { re_ = v; }
+
+  KOKKOS_CONSTEXPR_14 KOKKOS_INLINE_FUNCTION complex& operator+=(
+      const complex<RealType>& src) noexcept {
     re_ += src.re_;
     im_ += src.im_;
     return *this;
   }
 
-  template<typename InputRealType>
-  KOKKOS_INLINE_FUNCTION
-  void
-  operator += (const volatile complex<InputRealType>& src) volatile {
-    static_assert(std::is_convertible<InputRealType,RealType>::value, 
-                  "InputRealType must be convertible to RealType");
-    re_ += src.re_;
-    im_ += src.im_;
-  }
-
-  KOKKOS_INLINE_FUNCTION
-  complex<RealType>&
-  operator += (const std::complex<RealType>& src) {
-    re_ += src.real();
-    im_ += src.imag();
-    return *this;
-  }
-
-  template<typename InputRealType>
-  KOKKOS_INLINE_FUNCTION
-  complex<RealType>&
-  operator += (const InputRealType& src) {
-    static_assert(std::is_convertible<InputRealType,RealType>::value, 
-                  "InputRealType must be convertible to RealType");
+  KOKKOS_CONSTEXPR_14 KOKKOS_INLINE_FUNCTION complex& operator+=(
+      const RealType& src) noexcept {
     re_ += src;
     return *this;
   }
 
-  template<typename InputRealType>
-  KOKKOS_INLINE_FUNCTION
-  void
-  operator += (const volatile InputRealType& src) volatile {
-    static_assert(std::is_convertible<InputRealType,RealType>::value, 
-                  "InputRealType must be convertible to RealType");
-    re_ += src;
-  }
-  
-  template<typename InputRealType>
-  KOKKOS_INLINE_FUNCTION
-  complex<RealType>&
-  operator -= (const complex<InputRealType>& src) {
-    static_assert(std::is_convertible<InputRealType,RealType>::value, 
-                  "InputRealType must be convertible to RealType");
+  KOKKOS_CONSTEXPR_14 KOKKOS_INLINE_FUNCTION complex& operator-=(
+      const complex<RealType>& src) noexcept {
     re_ -= src.re_;
     im_ -= src.im_;
     return *this;
   }
 
-  KOKKOS_INLINE_FUNCTION
-  complex<RealType>&
-  operator -= (const std::complex<RealType>& src) {
-    re_ -= src.real();
-    im_ -= src.imag();
-    return *this;
-  }
-
-  template<typename InputRealType>
-  KOKKOS_INLINE_FUNCTION
-  complex<RealType>&
-  operator -= (const InputRealType& src) {
-    static_assert(std::is_convertible<InputRealType,RealType>::value, 
-                  "InputRealType must be convertible to RealType");
+  KOKKOS_CONSTEXPR_14 KOKKOS_INLINE_FUNCTION complex& operator-=(
+      const RealType& src) noexcept {
     re_ -= src;
     return *this;
   }
 
-  template<typename InputRealType>
-  KOKKOS_INLINE_FUNCTION
-  complex<RealType>&
-  operator *= (const complex<InputRealType>& src) {
-    static_assert(std::is_convertible<InputRealType,RealType>::value, 
-                  "InputRealType must be convertible to RealType");
+  KOKKOS_CONSTEXPR_14 KOKKOS_INLINE_FUNCTION complex& operator*=(
+      const complex<RealType>& src) noexcept {
     const RealType realPart = re_ * src.re_ - im_ * src.im_;
     const RealType imagPart = re_ * src.im_ + im_ * src.re_;
-    re_ = realPart;
-    im_ = imagPart;
+    re_                     = realPart;
+    im_                     = imagPart;
     return *this;
   }
 
-  template<typename InputRealType>
-  KOKKOS_INLINE_FUNCTION
-  void
-  operator *= (const volatile complex<InputRealType>& src) volatile {
-    static_assert(std::is_convertible<InputRealType,RealType>::value, 
-                  "InputRealType must be convertible to RealType");
-    const RealType realPart = re_ * src.re_ - im_ * src.im_;
-    const RealType imagPart = re_ * src.im_ + im_ * src.re_;
-    re_ = realPart;
-    im_ = imagPart;
-  }
-
-  KOKKOS_INLINE_FUNCTION
-  complex<RealType>&
-  operator *= (const std::complex<RealType>& src) {
-    const RealType realPart = re_ * src.real() - im_ * src.imag();
-    const RealType imagPart = re_ * src.imag() + im_ * src.real();
-    re_ = realPart;
-    im_ = imagPart;
-    return *this;
-  }
-
-  template<typename InputRealType>
-  KOKKOS_INLINE_FUNCTION
-  complex<RealType>&
-  operator *= (const InputRealType& src) {
-    static_assert(std::is_convertible<InputRealType,RealType>::value, 
-                  "InputRealType must be convertible to RealType");
+  KOKKOS_CONSTEXPR_14 KOKKOS_INLINE_FUNCTION complex& operator*=(
+      const RealType& src) noexcept {
     re_ *= src;
     im_ *= src;
     return *this;
   }
 
-  template<typename InputRealType>
-  KOKKOS_INLINE_FUNCTION
-  void
-  operator *= (const volatile InputRealType& src) volatile {
-    static_assert(std::is_convertible<InputRealType,RealType>::value, 
-                  "InputRealType must be convertible to RealType");
-    re_ *= src;
-    im_ *= src;
-  }
-
-  template<typename InputRealType>
-  KOKKOS_INLINE_FUNCTION
-  complex<RealType>&
-  operator /= (const complex<InputRealType>& y) {
-    static_assert(std::is_convertible<InputRealType,RealType>::value, 
-                  "InputRealType must be convertible to RealType");
-
+  // Conditional noexcept, just in case RType throws on divide-by-zero
+  KOKKOS_CONSTEXPR_14 KOKKOS_INLINE_FUNCTION complex& operator/=(
+      const complex<RealType>& y) noexcept(noexcept(RealType{} / RealType{})) {
     // Scale (by the "1-norm" of y) to avoid unwarranted overflow.
     // If the real part is +/-Inf and the imaginary part is -/+Inf,
     // this won't change the result.
-    const RealType s = std::fabs (y.real ()) + std::fabs (y.imag ());
+    const RealType s = std::fabs(y.real()) + std::fabs(y.imag());
 
     // If s is 0, then y is zero, so x/y == real(x)/0 + i*imag(x)/0.
     // In that case, the relation x/y == (x/s) / (y/s) doesn't hold,
     // because y/s is NaN.
-    if (s == 0.0) {
+    // TODO mark this branch unlikely
+    if (s == RealType(0)) {
       this->re_ /= s;
       this->im_ /= s;
-    }
-    else {
-      const complex<RealType> x_scaled (this->re_ / s, this->im_ / s);
-      const complex<RealType> y_conj_scaled (y.re_ / s, -(y.im_) / s);
-      const RealType y_scaled_abs = y_conj_scaled.re_ * y_conj_scaled.re_ +
-        y_conj_scaled.im_ * y_conj_scaled.im_; // abs(y) == abs(conj(y))
-      *this = x_scaled * y_conj_scaled;
-      *this /= y_scaled_abs;
-    }
-    return *this;
-  }
-  
-  KOKKOS_INLINE_FUNCTION
-  complex<RealType>&
-  operator /= (const std::complex<RealType>& y) {
-
-    // Scale (by the "1-norm" of y) to avoid unwarranted overflow.
-    // If the real part is +/-Inf and the imaginary part is -/+Inf,
-    // this won't change the result.
-    const RealType s = std::fabs (y.real ()) + std::fabs (y.imag ());
-
-    // If s is 0, then y is zero, so x/y == real(x)/0 + i*imag(x)/0.
-    // In that case, the relation x/y == (x/s) / (y/s) doesn't hold,
-    // because y/s is NaN.
-    if (s == 0.0) {
-      this->re_ /= s;
-      this->im_ /= s;
-    }
-    else {
-      const complex<RealType> x_scaled (this->re_ / s, this->im_ / s);
-      const complex<RealType> y_conj_scaled (y.re_ / s, -(y.im_) / s);
-      const RealType y_scaled_abs = y_conj_scaled.re_ * y_conj_scaled.re_ +
-        y_conj_scaled.im_ * y_conj_scaled.im_; // abs(y) == abs(conj(y))
+    } else {
+      const complex x_scaled(this->re_ / s, this->im_ / s);
+      const complex y_conj_scaled(y.re_ / s, -(y.im_) / s);
+      const RealType y_scaled_abs =
+          y_conj_scaled.re_ * y_conj_scaled.re_ +
+          y_conj_scaled.im_ * y_conj_scaled.im_;  // abs(y) == abs(conj(y))
       *this = x_scaled * y_conj_scaled;
       *this /= y_scaled_abs;
     }
     return *this;
   }
 
+  KOKKOS_CONSTEXPR_14
+  KOKKOS_INLINE_FUNCTION complex& operator/=(
+      const std::complex<RealType>& y) noexcept(noexcept(RealType{} /
+                                                         RealType{})) {
+    // Scale (by the "1-norm" of y) to avoid unwarranted overflow.
+    // If the real part is +/-Inf and the imaginary part is -/+Inf,
+    // this won't change the result.
+    const RealType s = std::fabs(y.real()) + std::fabs(y.imag());
 
-  template<typename InputRealType>
-  KOKKOS_INLINE_FUNCTION
-  complex<RealType>&
-  operator /= (const InputRealType& src) {
-    static_assert(std::is_convertible<InputRealType,RealType>::value, 
-                  "InputRealType must be convertible to RealType");
+    // If s is 0, then y is zero, so x/y == real(x)/0 + i*imag(x)/0.
+    // In that case, the relation x/y == (x/s) / (y/s) doesn't hold,
+    // because y/s is NaN.
+    if (s == RealType(0)) {
+      this->re_ /= s;
+      this->im_ /= s;
+    } else {
+      const complex x_scaled(this->re_ / s, this->im_ / s);
+      const complex y_conj_scaled(y.re_ / s, -(y.im_) / s);
+      const RealType y_scaled_abs =
+          y_conj_scaled.re_ * y_conj_scaled.re_ +
+          y_conj_scaled.im_ * y_conj_scaled.im_;  // abs(y) == abs(conj(y))
+      *this = x_scaled * y_conj_scaled;
+      *this /= y_scaled_abs;
+    }
+    return *this;
+  }
 
+  KOKKOS_CONSTEXPR_14 KOKKOS_INLINE_FUNCTION complex& operator/=(
+      const RealType& src) noexcept(noexcept(RealType{} / RealType{})) {
     re_ /= src;
     im_ /= src;
     return *this;
   }
 
-  template<typename InputRealType>
-  KOKKOS_INLINE_FUNCTION
-  bool
-  operator == (const complex<InputRealType>& src) {
-    static_assert(std::is_convertible<InputRealType,RealType>::value, 
-                  "InputRealType must be convertible to RealType");
+  //---------------------------------------------------------------------------
+  // TODO: refactor Kokkos reductions to remove dependency on
+  // volatile member overloads since they are being deprecated in c++20
+  //---------------------------------------------------------------------------
 
-    return (re_ == static_cast<RealType>(src.re_)) && (im_ == static_cast<RealType>(src.im_));
+  //! Copy constructor from volatile.
+  template <class RType,
+            typename std::enable_if<std::is_convertible<RType, RealType>::value,
+                                    int>::type = 0>
+  KOKKOS_INLINE_FUNCTION complex(const volatile complex<RType>& src) noexcept
+      // Intentionally do the conversions implicitly here so that users don't
+      // get any warnings about narrowing, etc., that they would expect to get
+      // otherwise.
+      : re_(src.re_), im_(src.im_) {}
+
+  /// \brief Assignment operator, for volatile <tt>*this</tt> and
+  ///   nonvolatile input.
+  ///
+  /// \param src [in] Input; right-hand side of the assignment.
+  ///
+  /// This operator returns \c void instead of <tt>volatile
+  /// complex& </tt>.  See Kokkos Issue #177 for the
+  /// explanation.  In practice, this means that you should not chain
+  /// assignments with volatile lvalues.
+  KOKKOS_INLINE_FUNCTION void operator=(
+      const complex<RealType>& src) volatile noexcept {
+    re_ = src.re_;
+    im_ = src.im_;
+    // We deliberately do not return anything here.  See explanation
+    // in public documentation above.
   }
 
-  KOKKOS_INLINE_FUNCTION
-  bool
-  operator == (const std::complex<RealType>& src) {
-    return (re_ == src.real()) && (im_ == src.imag());
+  //! Assignment operator, volatile LHS and volatile RHS
+  // TODO Should this return void like the other volatile assignment operators?
+  KOKKOS_INLINE_FUNCTION volatile complex& operator=(
+      const volatile complex<RealType>& src) volatile noexcept {
+    re_ = src.re_;
+    im_ = src.im_;
+    return *this;
   }
 
-  template<typename InputRealType>
-  KOKKOS_INLINE_FUNCTION
-  bool
-  operator == (const InputRealType src) {
-    static_assert(std::is_convertible<InputRealType,RealType>::value, 
-                  "InputRealType must be convertible to RealType");
-
-    return (re_ == static_cast<RealType>(src)) && (im_ == RealType(0));
+  //! Assignment operator, volatile RHS and non-volatile LHS
+  KOKKOS_INLINE_FUNCTION complex& operator=(
+      const volatile complex<RealType>& src) noexcept {
+    re_ = src.re_;
+    im_ = src.im_;
+    return *this;
   }
 
-  template<typename InputRealType>
-  KOKKOS_INLINE_FUNCTION
-  bool
-  operator != (const complex<InputRealType>& src) {
-    static_assert(std::is_convertible<InputRealType,RealType>::value, 
-                  "InputRealType must be convertible to RealType");
+  // Mirroring the behavior of the assignment operators from complex RHS in the
+  // RealType RHS versions.
 
-    return (re_ != static_cast<RealType>(src.re_)) || (im_ != static_cast<RealType>(src.im_));
+  //! Assignment operator (from a volatile real number).
+  KOKKOS_INLINE_FUNCTION void operator=(const volatile RealType& val) noexcept {
+    re_ = val;
+    im_ = RealType(0);
+    // We deliberately do not return anything here.  See explanation
+    // in public documentation above.
   }
 
-  KOKKOS_INLINE_FUNCTION
-  bool
-  operator != (const std::complex<RealType>& src) {
-    return (re_ != src.real()) || (im_ != src.imag());
+  //! Assignment operator volatile LHS and non-volatile RHS
+  KOKKOS_INLINE_FUNCTION complex& operator=(
+      const RealType& val) volatile noexcept {
+    re_ = val;
+    im_ = RealType(0);
+    return *this;
   }
 
-  template<typename InputRealType>
-  KOKKOS_INLINE_FUNCTION
-  bool
-  operator != (const InputRealType src) {
-    static_assert(std::is_convertible<InputRealType,RealType>::value, 
-                  "InputRealType must be convertible to RealType");
-
-    return (re_ != static_cast<RealType>(src)) || (im_ != RealType(0));
+  //! Assignment operator volatile LHS and volatile RHS
+  // TODO Should this return void like the other volatile assignment operators?
+  KOKKOS_INLINE_FUNCTION complex& operator=(
+      const volatile RealType& val) volatile noexcept {
+    re_ = val;
+    im_ = RealType(0);
+    return *this;
   }
-  
+
+  //! The imaginary part of this complex number (volatile overload).
+  KOKKOS_INLINE_FUNCTION
+  volatile RealType& imag() volatile noexcept { return im_; }
+
+  //! The real part of this complex number (volatile overload).
+  KOKKOS_INLINE_FUNCTION
+  volatile RealType& real() volatile noexcept { return re_; }
+
+  //! The imaginary part of this complex number (volatile overload).
+  KOKKOS_INLINE_FUNCTION
+  RealType imag() const volatile noexcept { return im_; }
+
+  //! The real part of this complex number (volatile overload).
+  KOKKOS_INLINE_FUNCTION
+  RealType real() const volatile noexcept { return re_; }
+
+  KOKKOS_INLINE_FUNCTION void operator+=(
+      const volatile complex<RealType>& src) volatile noexcept {
+    re_ += src.re_;
+    im_ += src.im_;
+  }
+
+  KOKKOS_INLINE_FUNCTION void operator+=(
+      const volatile RealType& src) volatile noexcept {
+    re_ += src;
+  }
+
+  KOKKOS_INLINE_FUNCTION void operator*=(
+      const volatile complex<RealType>& src) volatile noexcept {
+    const RealType realPart = re_ * src.re_ - im_ * src.im_;
+    const RealType imagPart = re_ * src.im_ + im_ * src.re_;
+
+    re_ = realPart;
+    im_ = imagPart;
+  }
+
+  KOKKOS_INLINE_FUNCTION void operator*=(
+      const volatile RealType& src) volatile noexcept {
+    re_ *= src;
+    im_ *= src;
+  }
+
+  // TODO DSH 2019-10-7 why are there no volatile /= and friends?
 };
 
+//==============================================================================
+// <editor-fold desc="Equality and inequality"> {{{1
+
+// Note that this is not the same behavior as std::complex, which doesn't allow
+// implicit conversions, but since this is the way we had it before, we have
+// to do it this way now.
+
+//! Binary == operator for complex complex.
+template <class RealType1, class RealType2>
+KOKKOS_INLINE_FUNCTION bool operator==(complex<RealType1> const& x,
+                                       complex<RealType2> const& y) noexcept {
+  using common_type = typename std::common_type<RealType1, RealType2>::type;
+  return common_type(x.real()) == common_type(y.real()) &&
+         common_type(x.imag()) == common_type(y.imag());
+}
+
+// TODO (here and elsewhere) decide if we should convert to a Kokkos::complex
+//      and do the comparison in a device-marked function
+//! Binary == operator for std::complex complex.
+template <class RealType1, class RealType2>
+inline bool operator==(std::complex<RealType1> const& x,
+                       complex<RealType2> const& y) noexcept {
+  using common_type = typename std::common_type<RealType1, RealType2>::type;
+  return common_type(x.real()) == common_type(y.real()) &&
+         common_type(x.imag()) == common_type(y.imag());
+}
+
+//! Binary == operator for complex std::complex.
+template <class RealType1, class RealType2>
+inline bool operator==(complex<RealType1> const& x,
+                       std::complex<RealType2> const& y) noexcept {
+  using common_type = typename std::common_type<RealType1, RealType2>::type;
+  return common_type(x.real()) == common_type(y.real()) &&
+         common_type(x.imag()) == common_type(y.imag());
+}
+
+//! Binary == operator for complex real.
+template <
+    class RealType1, class RealType2,
+    // Constraints to avoid participation in oparator==() for every possible RHS
+    typename std::enable_if<std::is_convertible<RealType2, RealType1>::value,
+                            int>::type = 0>
+KOKKOS_INLINE_FUNCTION bool operator==(complex<RealType1> const& x,
+                                       RealType2 const& y) noexcept {
+  using common_type = typename std::common_type<RealType1, RealType2>::type;
+  return common_type(x.real()) == common_type(y) &&
+         common_type(x.imag()) == common_type(0);
+}
+
+//! Binary == operator for real complex.
+template <
+    class RealType1, class RealType2,
+    // Constraints to avoid participation in oparator==() for every possible RHS
+    typename std::enable_if<std::is_convertible<RealType1, RealType2>::value,
+                            int>::type = 0>
+KOKKOS_INLINE_FUNCTION bool operator==(RealType1 const& x,
+                                       complex<RealType2> const& y) noexcept {
+  using common_type = typename std::common_type<RealType1, RealType2>::type;
+  return common_type(x) == common_type(y.real()) &&
+         common_type(0) == common_type(y.imag());
+}
+
+//! Binary != operator for complex complex.
+template <class RealType1, class RealType2>
+KOKKOS_INLINE_FUNCTION bool operator!=(complex<RealType1> const& x,
+                                       complex<RealType2> const& y) noexcept {
+  using common_type = typename std::common_type<RealType1, RealType2>::type;
+  return common_type(x.real()) != common_type(y.real()) ||
+         common_type(x.imag()) != common_type(y.imag());
+}
+
+//! Binary != operator for std::complex complex.
+template <class RealType1, class RealType2>
+inline bool operator!=(std::complex<RealType1> const& x,
+                       complex<RealType2> const& y) noexcept {
+  using common_type = typename std::common_type<RealType1, RealType2>::type;
+  return common_type(x.real()) != common_type(y.real()) ||
+         common_type(x.imag()) != common_type(y.imag());
+}
+
+//! Binary != operator for complex std::complex.
+template <class RealType1, class RealType2>
+inline bool operator!=(complex<RealType1> const& x,
+                       std::complex<RealType2> const& y) noexcept {
+  using common_type = typename std::common_type<RealType1, RealType2>::type;
+  return common_type(x.real()) != common_type(y.real()) ||
+         common_type(x.imag()) != common_type(y.imag());
+}
+
+//! Binary != operator for complex real.
+template <
+    class RealType1, class RealType2,
+    // Constraints to avoid participation in oparator==() for every possible RHS
+    typename std::enable_if<std::is_convertible<RealType2, RealType1>::value,
+                            int>::type = 0>
+KOKKOS_INLINE_FUNCTION bool operator!=(complex<RealType1> const& x,
+                                       RealType2 const& y) noexcept {
+  using common_type = typename std::common_type<RealType1, RealType2>::type;
+  return common_type(x.real()) != common_type(y) ||
+         common_type(x.imag()) != common_type(0);
+}
+
+//! Binary != operator for real complex.
+template <
+    class RealType1, class RealType2,
+    // Constraints to avoid participation in oparator==() for every possible RHS
+    typename std::enable_if<std::is_convertible<RealType1, RealType2>::value,
+                            int>::type = 0>
+KOKKOS_INLINE_FUNCTION bool operator!=(RealType1 const& x,
+                                       complex<RealType2> const& y) noexcept {
+  using common_type = typename std::common_type<RealType1, RealType2>::type;
+  return common_type(x) != common_type(y.real()) ||
+         common_type(0) != common_type(y.imag());
+}
+
+// </editor-fold> end Equality and inequality }}}1
+//==============================================================================
 
 //! Binary + operator for complex complex.
-template<class RealType1, class RealType2>
+template <class RealType1, class RealType2>
 KOKKOS_INLINE_FUNCTION
-complex<typename std::common_type<RealType1,RealType2>::type>
-operator + (const complex<RealType1>& x, const complex<RealType2>& y) {
-  return complex<typename std::common_type<RealType1,RealType2>::type > (x.real () + y.real (), x.imag () + y.imag ());
+    complex<typename std::common_type<RealType1, RealType2>::type>
+    operator+(const complex<RealType1>& x,
+              const complex<RealType2>& y) noexcept {
+  return complex<typename std::common_type<RealType1, RealType2>::type>(
+      x.real() + y.real(), x.imag() + y.imag());
 }
 
 //! Binary + operator for complex scalar.
-template<class RealType1, class RealType2>
+template <class RealType1, class RealType2>
 KOKKOS_INLINE_FUNCTION
-complex<typename std::common_type<RealType1,RealType2>::type>
-operator + (const complex<RealType1>& x, const RealType2& y) {
-  return complex<typename std::common_type<RealType1,RealType2>::type> (x.real () + y , x.imag ());
+    complex<typename std::common_type<RealType1, RealType2>::type>
+    operator+(const complex<RealType1>& x, const RealType2& y) noexcept {
+  return complex<typename std::common_type<RealType1, RealType2>::type>(
+      x.real() + y, x.imag());
 }
 
 //! Binary + operator for scalar complex.
-template<class RealType1, class RealType2>
+template <class RealType1, class RealType2>
 KOKKOS_INLINE_FUNCTION
-complex<typename std::common_type<RealType1,RealType2>::type>
-operator + (const RealType1& x, const complex<RealType2>& y) {
-  return complex<typename std::common_type<RealType1,RealType2>::type> (x + y.real (), y.imag ());
+    complex<typename std::common_type<RealType1, RealType2>::type>
+    operator+(const RealType1& x, const complex<RealType2>& y) noexcept {
+  return complex<typename std::common_type<RealType1, RealType2>::type>(
+      x + y.real(), y.imag());
 }
 
 //! Unary + operator for complex.
-template<class RealType>
-KOKKOS_INLINE_FUNCTION
-complex<RealType>
-operator + (const complex<RealType>& x) {
-  return x;
+template <class RealType>
+KOKKOS_INLINE_FUNCTION complex<RealType> operator+(
+    const complex<RealType>& x) noexcept {
+  return complex<RealType>{+x.real(), +x.imag()};
 }
 
 //! Binary - operator for complex.
-template<class RealType1, class RealType2>
+template <class RealType1, class RealType2>
 KOKKOS_INLINE_FUNCTION
-complex<typename std::common_type<RealType1,RealType2>::type>
-operator - (const complex<RealType1>& x, const complex<RealType2>& y) {
-  return complex<typename std::common_type<RealType1,RealType2>::type> (x.real () - y.real (), x.imag () - y.imag ());
+    complex<typename std::common_type<RealType1, RealType2>::type>
+    operator-(const complex<RealType1>& x,
+              const complex<RealType2>& y) noexcept {
+  return complex<typename std::common_type<RealType1, RealType2>::type>(
+      x.real() - y.real(), x.imag() - y.imag());
 }
 
 //! Binary - operator for complex scalar.
-template<class RealType1, class RealType2>
+template <class RealType1, class RealType2>
 KOKKOS_INLINE_FUNCTION
-complex<typename std::common_type<RealType1,RealType2>::type>
-operator - (const complex<RealType1>& x, const RealType2& y) {
-  return complex<typename std::common_type<RealType1,RealType2>::type> (x.real () - y , x.imag ());
+    complex<typename std::common_type<RealType1, RealType2>::type>
+    operator-(const complex<RealType1>& x, const RealType2& y) noexcept {
+  return complex<typename std::common_type<RealType1, RealType2>::type>(
+      x.real() - y, x.imag());
 }
 
 //! Binary - operator for scalar complex.
-template<class RealType1, class RealType2>
+template <class RealType1, class RealType2>
 KOKKOS_INLINE_FUNCTION
-complex<typename std::common_type<RealType1,RealType2>::type>
-operator - (const RealType1& x, const complex<RealType2>& y) {
-  return complex<typename std::common_type<RealType1,RealType2>::type> (x - y.real (), - y.imag ());
+    complex<typename std::common_type<RealType1, RealType2>::type>
+    operator-(const RealType1& x, const complex<RealType2>& y) noexcept {
+  return complex<typename std::common_type<RealType1, RealType2>::type>(
+      x - y.real(), -y.imag());
 }
 
 //! Unary - operator for complex.
-template<class RealType>
-KOKKOS_INLINE_FUNCTION
-complex<RealType>
-operator - (const complex<RealType>& x) {
-  return complex<RealType> (-x.real (), -x.imag ());
+template <class RealType>
+KOKKOS_INLINE_FUNCTION complex<RealType> operator-(
+    const complex<RealType>& x) noexcept {
+  return complex<RealType>(-x.real(), -x.imag());
 }
 
 //! Binary * operator for complex.
-template<class RealType1, class RealType2>
+template <class RealType1, class RealType2>
 KOKKOS_INLINE_FUNCTION
-complex<typename std::common_type<RealType1,RealType2>::type>
-operator * (const complex<RealType1>& x, const complex<RealType2>& y) {
-  return complex<typename std::common_type<RealType1,RealType2>::type> (x.real () * y.real () - x.imag () * y.imag (),
-                                                                        x.real () * y.imag () + x.imag () * y.real ());
+    complex<typename std::common_type<RealType1, RealType2>::type>
+    operator*(const complex<RealType1>& x,
+              const complex<RealType2>& y) noexcept {
+  return complex<typename std::common_type<RealType1, RealType2>::type>(
+      x.real() * y.real() - x.imag() * y.imag(),
+      x.real() * y.imag() + x.imag() * y.real());
 }
 
 /// \brief Binary * operator for std::complex and complex.
 ///
-/// This function exists because GCC 4.7.2 (and perhaps other
-/// compilers) are not able to deduce that they can multiply
-/// std::complex by Kokkos::complex, by first converting std::complex
-/// to Kokkos::complex.
+/// This needs to exist because template parameters can't be deduced when
+/// conversions occur.  We could probably fix this using hidden friends patterns
 ///
 /// This function cannot be called in a CUDA device function, because
 /// std::complex's methods and nonmember functions are not marked as
 /// CUDA device functions.
-template<class RealType1, class RealType2>
-inline
-complex<typename std::common_type<RealType1,RealType2>::type>
-operator * (const std::complex<RealType1>& x, const complex<RealType2>& y) {
-  return complex<typename std::common_type<RealType1,RealType2>::type> (x.real () * y.real () - x.imag () * y.imag (),
-                                                                        x.real () * y.imag () + x.imag () * y.real ());
+template <class RealType1, class RealType2>
+inline complex<typename std::common_type<RealType1, RealType2>::type> operator*(
+    const std::complex<RealType1>& x, const complex<RealType2>& y) {
+  return complex<typename std::common_type<RealType1, RealType2>::type>(
+      x.real() * y.real() - x.imag() * y.imag(),
+      x.real() * y.imag() + x.imag() * y.real());
 }
 
 /// \brief Binary * operator for RealType times complex.
 ///
 /// This function exists because the compiler doesn't know that
 /// RealType and complex<RealType> commute with respect to operator*.
-template<class RealType1, class RealType2>
+template <class RealType1, class RealType2>
 KOKKOS_INLINE_FUNCTION
-complex<typename std::common_type<RealType1,RealType2>::type>
-operator * (const RealType1& x, const complex<RealType2>& y) {
-  return complex<typename std::common_type<RealType1,RealType2>::type> (x * y.real (), x * y.imag ());
+    complex<typename std::common_type<RealType1, RealType2>::type>
+    operator*(const RealType1& x, const complex<RealType2>& y) noexcept {
+  return complex<typename std::common_type<RealType1, RealType2>::type>(
+      x * y.real(), x * y.imag());
 }
 
 /// \brief Binary * operator for RealType times complex.
 ///
 /// This function exists because the compiler doesn't know that
 /// RealType and complex<RealType> commute with respect to operator*.
-template<class RealType1, class RealType2>
+template <class RealType1, class RealType2>
 KOKKOS_INLINE_FUNCTION
-complex<typename std::common_type<RealType1,RealType2>::type>
-operator * (const complex<RealType1>& y, const RealType2& x) {
-  return complex<typename std::common_type<RealType1,RealType2>::type> (x * y.real (), x * y.imag ());
+    complex<typename std::common_type<RealType1, RealType2>::type>
+    operator*(const complex<RealType1>& y, const RealType2& x) noexcept {
+  return complex<typename std::common_type<RealType1, RealType2>::type>(
+      x * y.real(), x * y.imag());
 }
 
 //! Imaginary part of a complex number.
-template<class RealType>
-KOKKOS_INLINE_FUNCTION
-RealType imag (const complex<RealType>& x) {
-  return x.imag ();
+template <class RealType>
+KOKKOS_INLINE_FUNCTION RealType imag(const complex<RealType>& x) noexcept {
+  return x.imag();
 }
 
 //! Real part of a complex number.
-template<class RealType>
-KOKKOS_INLINE_FUNCTION
-RealType real (const complex<RealType>& x) {
-  return x.real ();
+template <class RealType>
+KOKKOS_INLINE_FUNCTION RealType real(const complex<RealType>& x) noexcept {
+  return x.real();
 }
 
 //! Absolute value (magnitude) of a complex number.
-template<class RealType>
-KOKKOS_INLINE_FUNCTION
-RealType abs (const complex<RealType>& x) {
+template <class RealType>
+KOKKOS_INLINE_FUNCTION RealType abs(const complex<RealType>& x) {
 #ifndef __CUDA_ARCH__
   using std::hypot;
 #endif
-  return hypot(x.real(),x.imag());
+  return hypot(x.real(), x.imag());
 }
 
 //! Power of a complex number
-template<class RealType>
-KOKKOS_INLINE_FUNCTION
-Kokkos::complex<RealType> pow (const complex<RealType>& x, const RealType& e) {
-  RealType r = abs(x);
-  RealType phi = std::atan(x.imag()/x.real());
-  return std::pow(r,e) * Kokkos::complex<RealType>(std::cos(phi*e),std::sin(phi*e)); 
+template <class RealType>
+KOKKOS_INLINE_FUNCTION Kokkos::complex<RealType> pow(const complex<RealType>& x,
+                                                     const RealType& e) {
+  RealType r   = abs(x);
+  RealType phi = std::atan(x.imag() / x.real());
+  return std::pow(r, e) *
+         Kokkos::complex<RealType>(std::cos(phi * e), std::sin(phi * e));
 }
 
 //! Square root of a complex number.
-template<class RealType>
-KOKKOS_INLINE_FUNCTION
-Kokkos::complex<RealType> sqrt (const complex<RealType>& x) {
-  RealType r = abs(x);
-  RealType phi = std::atan(x.imag()/x.real());
-  return std::sqrt(r) * Kokkos::complex<RealType>(std::cos(phi*0.5),std::sin(phi*0.5));
+template <class RealType>
+KOKKOS_INLINE_FUNCTION Kokkos::complex<RealType> sqrt(
+    const complex<RealType>& x) {
+  RealType r   = abs(x);
+  RealType phi = std::atan(x.imag() / x.real());
+  return std::sqrt(r) *
+         Kokkos::complex<RealType>(std::cos(phi * 0.5), std::sin(phi * 0.5));
 }
 
 //! Conjugate of a complex number.
-template<class RealType>
-KOKKOS_INLINE_FUNCTION
-complex<RealType> conj (const complex<RealType>& x) {
-  return complex<RealType> (real (x), -imag (x));
+template <class RealType>
+KOKKOS_INLINE_FUNCTION complex<RealType> conj(
+    const complex<RealType>& x) noexcept {
+  return complex<RealType>(real(x), -imag(x));
 }
 
 //! Exponential of a complex number.
-template<class RealType>
-KOKKOS_INLINE_FUNCTION
-complex<RealType> exp (const complex<RealType>& x) {
-  return std::exp(x.real()) * complex<RealType> (std::cos (x.imag()),  std::sin(x.imag()));
+template <class RealType>
+KOKKOS_INLINE_FUNCTION complex<RealType> exp(const complex<RealType>& x) {
+  return std::exp(x.real()) *
+         complex<RealType>(std::cos(x.imag()), std::sin(x.imag()));
 }
 
 /// This function cannot be called in a CUDA device function,
 /// because std::complex's methods and nonmember functions are not
 /// marked as CUDA device functions.
-template<class RealType>
-inline
-complex<RealType>
-exp (const std::complex<RealType>& c) {
-  return complex<RealType>( std::exp( c.real() )*std::cos( c.imag() ), std::exp( c.real() )*std::sin( c.imag() ) );
+template <class RealType>
+inline complex<RealType> exp(const std::complex<RealType>& c) {
+  return complex<RealType>(std::exp(c.real()) * std::cos(c.imag()),
+                           std::exp(c.real()) * std::sin(c.imag()));
 }
 
 //! Binary operator / for complex and real numbers
-template<class RealType1, class RealType2>
+template <class RealType1, class RealType2>
 KOKKOS_INLINE_FUNCTION
-complex<typename std::common_type<RealType1,RealType2>::type>
-operator / (const complex<RealType1>& x, const RealType2& y) {
-  return complex<typename std::common_type<RealType1,RealType2>::type> (real (x) / y, imag (x) / y);
+    complex<typename std::common_type<RealType1, RealType2>::type>
+    operator/(const complex<RealType1>& x,
+              const RealType2& y) noexcept(noexcept(RealType1{} /
+                                                    RealType2{})) {
+  return complex<typename std::common_type<RealType1, RealType2>::type>(
+      real(x) / y, imag(x) / y);
 }
 
 //! Binary operator / for complex.
-template<class RealType1, class RealType2>
+template <class RealType1, class RealType2>
 KOKKOS_INLINE_FUNCTION
-complex<typename std::common_type<RealType1,RealType2>::type>
-operator / (const complex<RealType1>& x, const complex<RealType2>& y) {
+    complex<typename std::common_type<RealType1, RealType2>::type>
+    operator/(const complex<RealType1>& x,
+              const complex<RealType2>& y) noexcept(noexcept(RealType1{} /
+                                                             RealType2{})) {
   // Scale (by the "1-norm" of y) to avoid unwarranted overflow.
   // If the real part is +/-Inf and the imaginary part is -/+Inf,
   // this won't change the result.
-  typedef typename std::common_type<RealType1,RealType2>::type common_real_type;
-  const common_real_type s = std::fabs (real (y)) + std::fabs (imag (y));
+  typedef
+      typename std::common_type<RealType1, RealType2>::type common_real_type;
+  const common_real_type s = std::fabs(real(y)) + std::fabs(imag(y));
 
   // If s is 0, then y is zero, so x/y == real(x)/0 + i*imag(x)/0.
   // In that case, the relation x/y == (x/s) / (y/s) doesn't hold,
   // because y/s is NaN.
   if (s == 0.0) {
-    return complex<common_real_type> (real (x) / s, imag (x) / s);
-  }
-  else {
-    const complex<common_real_type> x_scaled (real (x) / s, imag (x) / s);
-    const complex<common_real_type> y_conj_scaled (real (y) / s, -imag (y) / s);
-    const RealType1 y_scaled_abs = real (y_conj_scaled) * real (y_conj_scaled) +
-      imag (y_conj_scaled) * imag (y_conj_scaled); // abs(y) == abs(conj(y))
+    return complex<common_real_type>(real(x) / s, imag(x) / s);
+  } else {
+    const complex<common_real_type> x_scaled(real(x) / s, imag(x) / s);
+    const complex<common_real_type> y_conj_scaled(real(y) / s, -imag(y) / s);
+    const RealType1 y_scaled_abs =
+        real(y_conj_scaled) * real(y_conj_scaled) +
+        imag(y_conj_scaled) * imag(y_conj_scaled);  // abs(y) == abs(conj(y))
     complex<common_real_type> result = x_scaled * y_conj_scaled;
     result /= y_scaled_abs;
     return result;
@@ -716,119 +742,43 @@ operator / (const complex<RealType1>& x, const complex<RealType2>& y) {
 }
 
 //! Binary operator / for complex and real numbers
-template<class RealType1, class RealType2>
+template <class RealType1, class RealType2>
 KOKKOS_INLINE_FUNCTION
-complex<typename std::common_type<RealType1,RealType2>::type>
-operator / (const RealType1& x, const complex<RealType2>& y) {
-  return complex<typename std::common_type<RealType1,RealType2>::type> (x)/y;
+    complex<typename std::common_type<RealType1, RealType2>::type>
+    operator/(const RealType1& x,
+              const complex<RealType2>& y) noexcept(noexcept(RealType1{} /
+                                                             RealType2{})) {
+  return complex<typename std::common_type<RealType1, RealType2>::type>(x) / y;
 }
 
-//! Equality operator for two complex numbers.
-template<class RealType1, class RealType2>
-KOKKOS_INLINE_FUNCTION
-bool
-operator == (const complex<RealType1>& x, const complex<RealType2>& y) {
-  typedef typename std::common_type<RealType1,RealType2>::type common_real_type;
-  return ( static_cast<common_real_type>(real (x)) == static_cast<common_real_type>(real (y)) && 
-           static_cast<common_real_type>(imag (x)) == static_cast<common_real_type>(imag (y)) );
-}
-
-/// \brief Equality operator for std::complex and Kokkos::complex.
-///
-/// This cannot be a device function, since std::real is not.
-/// Otherwise, CUDA builds will give compiler warnings ("warning:
-/// calling a constexpr __host__ function("real") from a __host__
-/// __device__ function("operator==") is not allowed").
-template<class RealType1, class RealType2>
-inline
-bool
-operator == (const std::complex<RealType1>& x, const complex<RealType2>& y) {
-  typedef typename std::common_type<RealType1,RealType2>::type common_real_type;
-  return ( static_cast<common_real_type>(std::real (x)) == static_cast<common_real_type>(real (y)) && 
-           static_cast<common_real_type>(std::imag (x)) == static_cast<common_real_type>(imag (y)) );
-}
-  
-//! Equality operator for complex and real number.
-template<class RealType1, class RealType2>
-KOKKOS_INLINE_FUNCTION
-bool
-operator == (const complex<RealType1>& x, const RealType2& y) {
-  typedef typename std::common_type<RealType1,RealType2>::type common_real_type;
-  return ( static_cast<common_real_type>(real (x)) == static_cast<common_real_type>(y) && 
-           static_cast<common_real_type>(imag (x)) == static_cast<common_real_type>(0.0) );
-}
-
-//! Equality operator for real and complex number.
-template<class RealType1, class RealType2>
-KOKKOS_INLINE_FUNCTION
-bool
-operator == (const RealType1& x, const complex<RealType2>& y) {
-  return y == x;
-}
-
-//! Inequality operator for two complex numbers.
-template<class RealType1, class RealType2>
-KOKKOS_INLINE_FUNCTION
-bool
-operator != (const complex<RealType1>& x, const complex<RealType2>& y) {
-  typedef typename std::common_type<RealType1,RealType2>::type common_real_type;
-  return ( static_cast<common_real_type>(real (x)) != static_cast<common_real_type>(real (y)) || 
-           static_cast<common_real_type>(imag (x)) != static_cast<common_real_type>(imag (y)) );
-}
-
-//! Inequality operator for std::complex and Kokkos::complex.
-template<class RealType1, class RealType2>
-inline
-bool
-operator != (const std::complex<RealType1>& x, const complex<RealType2>& y) {
-  typedef typename std::common_type<RealType1,RealType2>::type common_real_type;
-  return ( static_cast<common_real_type>(std::real (x)) != static_cast<common_real_type>(real (y)) || 
-           static_cast<common_real_type>(std::imag (x)) != static_cast<common_real_type>(imag (y)) );
-}
-
-//! Inequality operator for complex and real number.
-template<class RealType1, class RealType2>
-KOKKOS_INLINE_FUNCTION
-bool
-operator != (const complex<RealType1>& x, const RealType2& y) {
-  typedef typename std::common_type<RealType1,RealType2>::type common_real_type;
-  return ( static_cast<common_real_type>(real (x)) != static_cast<common_real_type>(y) || 
-           static_cast<common_real_type>(imag (x)) != static_cast<common_real_type>(0.0) );
-}
-
-//! Inequality operator for real and complex number.
-template<class RealType1, class RealType2>
-KOKKOS_INLINE_FUNCTION
-bool
-operator != (const RealType1& x, const complex<RealType2>& y) {
-  return y != x;
-}
-
-template<class RealType>
-std::ostream& operator << (std::ostream& os, const complex<RealType>& x) {
-  const std::complex<RealType> x_std (Kokkos::real (x), Kokkos::imag (x));
+template <class RealType>
+std::ostream& operator<<(std::ostream& os, const complex<RealType>& x) {
+  const std::complex<RealType> x_std(Kokkos::real(x), Kokkos::imag(x));
   os << x_std;
   return os;
 }
 
-template<class RealType>
-std::ostream& operator >> (std::ostream& os, complex<RealType>& x) {
+template <class RealType>
+std::istream& operator>>(std::istream& is, complex<RealType>& x) {
   std::complex<RealType> x_std;
-  os >> x_std;
-  x = x_std; // only assigns on success of above
-  return os;
+  is >> x_std;
+  x = x_std;  // only assigns on success of above
+  return is;
 }
 
-
-template<class T>
+template <class T>
 struct reduction_identity<Kokkos::complex<T> > {
   typedef reduction_identity<T> t_red_ident;
-  KOKKOS_FORCEINLINE_FUNCTION constexpr static Kokkos::complex<T> sum()
-      {return Kokkos::complex<T>(t_red_ident::sum(),t_red_ident::sum());}
-  KOKKOS_FORCEINLINE_FUNCTION constexpr static Kokkos::complex<T> prod()
-      {return Kokkos::complex<T>(t_red_ident::prod(),t_red_ident::sum());}
+  KOKKOS_FORCEINLINE_FUNCTION constexpr static Kokkos::complex<T>
+  sum() noexcept {
+    return Kokkos::complex<T>(t_red_ident::sum(), t_red_ident::sum());
+  }
+  KOKKOS_FORCEINLINE_FUNCTION constexpr static Kokkos::complex<T>
+  prod() noexcept {
+    return Kokkos::complex<T>(t_red_ident::prod(), t_red_ident::sum());
+  }
 };
 
-} // namespace Kokkos
+}  // namespace Kokkos
 
-#endif // KOKKOS_COMPLEX_HPP
+#endif  // KOKKOS_COMPLEX_HPP
diff --git a/lib/kokkos/core/src/Kokkos_Concepts.hpp b/lib/kokkos/core/src/Kokkos_Concepts.hpp
index 98ae141de4..99b7aa9aab 100644
--- a/lib/kokkos/core/src/Kokkos_Concepts.hpp
+++ b/lib/kokkos/core/src/Kokkos_Concepts.hpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -54,245 +55,264 @@
 
 namespace Kokkos {
 
-//Schedules for Execution Policies
+// Schedules for Execution Policies
 struct Static {};
 struct Dynamic {};
 
-//Schedule Wrapper Type
-template<class T>
-struct Schedule
-{
-  static_assert(  std::is_same<T,Static>::value
-               || std::is_same<T,Dynamic>::value
-               , "Kokkos: Invalid Schedule<> type."
-               );
-  using schedule_type = Schedule ;
-  using type = T;
+// Schedule Wrapper Type
+template <class T>
+struct Schedule {
+  static_assert(std::is_same<T, Static>::value ||
+                    std::is_same<T, Dynamic>::value,
+                "Kokkos: Invalid Schedule<> type.");
+  using schedule_type = Schedule;
+  using type          = T;
 };
 
-//Specify Iteration Index Type
-template<typename T>
-struct IndexType
-{
-  static_assert(std::is_integral<T>::value,"Kokkos: Invalid IndexType<>.");
-  using index_type = IndexType ;
-  using type = T;
+// Specify Iteration Index Type
+template <typename T>
+struct IndexType {
+  static_assert(std::is_integral<T>::value, "Kokkos: Invalid IndexType<>.");
+  using index_type = IndexType;
+  using type       = T;
 };
 
 namespace Experimental {
-  struct WorkItemProperty {
-    template<unsigned long Property>
-    struct ImplWorkItemProperty {
-      static const unsigned value = Property;
-      using work_item_property = ImplWorkItemProperty<Property>;
-    };
-
-    constexpr static const ImplWorkItemProperty<0> None = ImplWorkItemProperty<0>();
-    constexpr static const ImplWorkItemProperty<1> HintLightWeight = ImplWorkItemProperty<1>();
-    constexpr static const ImplWorkItemProperty<2> HintHeavyWeight = ImplWorkItemProperty<2>();
-    constexpr static const ImplWorkItemProperty<4> HintRegular = ImplWorkItemProperty<4>();
-    constexpr static const ImplWorkItemProperty<8> HintIrregular = ImplWorkItemProperty<8>();
-    typedef ImplWorkItemProperty<0> None_t;
-    typedef ImplWorkItemProperty<1> HintLightWeight_t;
-    typedef ImplWorkItemProperty<2> HintHeavyWeight_t;
-    typedef ImplWorkItemProperty<4> HintRegular_t;
-    typedef ImplWorkItemProperty<8> HintIrregular_t;
+struct WorkItemProperty {
+  template <unsigned long Property>
+  struct ImplWorkItemProperty {
+    static const unsigned value = Property;
+    using work_item_property    = ImplWorkItemProperty<Property>;
   };
 
-template<unsigned long pv1, unsigned long pv2>
-inline constexpr WorkItemProperty::ImplWorkItemProperty<pv1|pv2> operator |
-  (WorkItemProperty::ImplWorkItemProperty<pv1>, WorkItemProperty::ImplWorkItemProperty<pv2>) {
-  return WorkItemProperty::ImplWorkItemProperty<pv1|pv2>();
+  constexpr static const ImplWorkItemProperty<0> None =
+      ImplWorkItemProperty<0>();
+  constexpr static const ImplWorkItemProperty<1> HintLightWeight =
+      ImplWorkItemProperty<1>();
+  constexpr static const ImplWorkItemProperty<2> HintHeavyWeight =
+      ImplWorkItemProperty<2>();
+  constexpr static const ImplWorkItemProperty<4> HintRegular =
+      ImplWorkItemProperty<4>();
+  constexpr static const ImplWorkItemProperty<8> HintIrregular =
+      ImplWorkItemProperty<8>();
+  typedef ImplWorkItemProperty<0> None_t;
+  typedef ImplWorkItemProperty<1> HintLightWeight_t;
+  typedef ImplWorkItemProperty<2> HintHeavyWeight_t;
+  typedef ImplWorkItemProperty<4> HintRegular_t;
+  typedef ImplWorkItemProperty<8> HintIrregular_t;
+};
+
+template <unsigned long pv1, unsigned long pv2>
+inline constexpr WorkItemProperty::ImplWorkItemProperty<pv1 | pv2> operator|(
+    WorkItemProperty::ImplWorkItemProperty<pv1>,
+    WorkItemProperty::ImplWorkItemProperty<pv2>) {
+  return WorkItemProperty::ImplWorkItemProperty<pv1 | pv2>();
 }
 
-template<unsigned long pv1, unsigned long pv2>
-inline constexpr WorkItemProperty::ImplWorkItemProperty<pv1&pv2> operator &
-  (WorkItemProperty::ImplWorkItemProperty<pv1>, WorkItemProperty::ImplWorkItemProperty<pv2>) {
-  return WorkItemProperty::ImplWorkItemProperty<pv1&pv2>();
+template <unsigned long pv1, unsigned long pv2>
+inline constexpr WorkItemProperty::ImplWorkItemProperty<pv1 & pv2> operator&(
+    WorkItemProperty::ImplWorkItemProperty<pv1>,
+    WorkItemProperty::ImplWorkItemProperty<pv2>) {
+  return WorkItemProperty::ImplWorkItemProperty<pv1 & pv2>();
 }
 
-template<unsigned long pv1, unsigned long pv2>
-inline constexpr bool operator == (WorkItemProperty::ImplWorkItemProperty<pv1>, WorkItemProperty::ImplWorkItemProperty<pv2>) {
-  return pv1 ==  pv2;
+template <unsigned long pv1, unsigned long pv2>
+inline constexpr bool operator==(WorkItemProperty::ImplWorkItemProperty<pv1>,
+                                 WorkItemProperty::ImplWorkItemProperty<pv2>) {
+  return pv1 == pv2;
 }
 
-}
+}  // namespace Experimental
 
 /**\brief Specify Launch Bounds for CUDA execution.
  *
  *  If no launch bounds specified then do not set launch bounds.
  */
-template< unsigned int maxT = 0 /* Max threads per block */
-        , unsigned int minB = 0 /* Min blocks per SM */
-        >
-struct LaunchBounds
-{
+template <unsigned int maxT = 0 /* Max threads per block */
+          ,
+          unsigned int minB = 0 /* Min blocks per SM */
+          >
+struct LaunchBounds {
   using launch_bounds = LaunchBounds;
-  using type = LaunchBounds<maxT,minB>;
-  static unsigned int constexpr maxTperB {maxT};
-  static unsigned int constexpr minBperSM {minB};
+  using type          = LaunchBounds<maxT, minB>;
+  static unsigned int constexpr maxTperB{maxT};
+  static unsigned int constexpr minBperSM{minB};
 };
 
-} // namespace Kokkos
+}  // namespace Kokkos
 
 //----------------------------------------------------------------------------
 //----------------------------------------------------------------------------
 
 namespace Kokkos {
 
-#define KOKKOS_IMPL_IS_CONCEPT( CONCEPT ) \
-  template< typename T > struct is_ ## CONCEPT { \
-  private: \
-    template< typename , typename = std::true_type > struct have : std::false_type {}; \
-    template< typename U > struct have<U,typename std::is_base_of< \
-     typename std::remove_cv<typename U:: CONCEPT>::type, \
-     typename std::remove_cv<U>::type \
-   >::type> : std::true_type {}; \
-    template< typename U > struct have<U,typename std::is_base_of< \
-     typename std::remove_cv<typename U:: CONCEPT ## _type>::type, \
-     typename std::remove_cv<U>::type \
-   >::type> : std::true_type {}; \
-  public: \
-    enum { value = is_ ## CONCEPT::template have<T>::value }; \
+#define KOKKOS_IMPL_IS_CONCEPT(CONCEPT)                                        \
+  template <typename T>                                                        \
+  struct is_##CONCEPT {                                                        \
+   private:                                                                    \
+    template <typename, typename = std::true_type>                             \
+    struct have : std::false_type {};                                          \
+    template <typename U>                                                      \
+    struct have<U, typename std::is_base_of<                                   \
+                       typename std::remove_cv<typename U::CONCEPT>::type,     \
+                       typename std::remove_cv<U>::type>::type>                \
+        : std::true_type {};                                                   \
+    template <typename U>                                                      \
+    struct have<U,                                                             \
+                typename std::is_base_of<                                      \
+                    typename std::remove_cv<typename U::CONCEPT##_type>::type, \
+                    typename std::remove_cv<U>::type>::type>                   \
+        : std::true_type {};                                                   \
+                                                                               \
+   public:                                                                     \
+    enum { value = is_##CONCEPT::template have<T>::value };                    \
   };
 
 // Public concept:
 
-KOKKOS_IMPL_IS_CONCEPT( memory_space )
-KOKKOS_IMPL_IS_CONCEPT( memory_traits )
-KOKKOS_IMPL_IS_CONCEPT( execution_space )
-KOKKOS_IMPL_IS_CONCEPT( execution_policy )
-KOKKOS_IMPL_IS_CONCEPT( array_layout )
-KOKKOS_IMPL_IS_CONCEPT( reducer )
+KOKKOS_IMPL_IS_CONCEPT(memory_space)
+KOKKOS_IMPL_IS_CONCEPT(memory_traits)
+KOKKOS_IMPL_IS_CONCEPT(execution_space)
+KOKKOS_IMPL_IS_CONCEPT(execution_policy)
+KOKKOS_IMPL_IS_CONCEPT(array_layout)
+KOKKOS_IMPL_IS_CONCEPT(reducer)
 namespace Experimental {
-KOKKOS_IMPL_IS_CONCEPT( work_item_property )
+KOKKOS_IMPL_IS_CONCEPT(work_item_property)
 }
 
 namespace Impl {
 
 // For backward compatibility:
 
-using Kokkos::is_memory_space ;
-using Kokkos::is_memory_traits ;
-using Kokkos::is_execution_space ;
-using Kokkos::is_execution_policy ;
-using Kokkos::is_array_layout ;
+using Kokkos::is_array_layout;
+using Kokkos::is_execution_policy;
+using Kokkos::is_execution_space;
+using Kokkos::is_memory_space;
+using Kokkos::is_memory_traits;
 
 // Implementation concept:
 
-KOKKOS_IMPL_IS_CONCEPT( iteration_pattern )
-KOKKOS_IMPL_IS_CONCEPT( schedule_type )
-KOKKOS_IMPL_IS_CONCEPT( index_type )
-KOKKOS_IMPL_IS_CONCEPT( launch_bounds )
-KOKKOS_IMPL_IS_CONCEPT( thread_team_member )
-KOKKOS_IMPL_IS_CONCEPT( host_thread_team_member )
+KOKKOS_IMPL_IS_CONCEPT(iteration_pattern)
+KOKKOS_IMPL_IS_CONCEPT(schedule_type)
+KOKKOS_IMPL_IS_CONCEPT(index_type)
+KOKKOS_IMPL_IS_CONCEPT(launch_bounds)
+KOKKOS_IMPL_IS_CONCEPT(thread_team_member)
+KOKKOS_IMPL_IS_CONCEPT(host_thread_team_member)
 
-}
+}  // namespace Impl
 
 #undef KOKKOS_IMPL_IS_CONCEPT
 
-} // namespace Kokkos
+}  // namespace Kokkos
 
 //----------------------------------------------------------------------------
 
 namespace Kokkos {
 
-template< class ExecutionSpace , class MemorySpace >
+template <class ExecutionSpace, class MemorySpace>
 struct Device {
-  static_assert( Kokkos::is_execution_space<ExecutionSpace>::value
-               , "Execution space is not valid" );
-  static_assert( Kokkos::is_memory_space<MemorySpace>::value
-               , "Memory space is not valid" );
-  typedef ExecutionSpace                        execution_space;
-  typedef MemorySpace                           memory_space;
-  typedef Device<execution_space,memory_space>  device_type;
+  static_assert(Kokkos::is_execution_space<ExecutionSpace>::value,
+                "Execution space is not valid");
+  static_assert(Kokkos::is_memory_space<MemorySpace>::value,
+                "Memory space is not valid");
+  typedef ExecutionSpace execution_space;
+  typedef MemorySpace memory_space;
+  typedef Device<execution_space, memory_space> device_type;
 };
 
-
-template< typename T >
+template <typename T>
 struct is_space {
-private:
+ private:
+  template <typename, typename = void>
+  struct exe : std::false_type {
+    typedef void space;
+  };
 
-  template< typename , typename = void >
-  struct exe : std::false_type { typedef void space ; };
+  template <typename, typename = void>
+  struct mem : std::false_type {
+    typedef void space;
+  };
 
-  template< typename , typename = void >
-  struct mem : std::false_type { typedef void space ; };
+  template <typename, typename = void>
+  struct dev : std::false_type {
+    typedef void space;
+  };
 
-  template< typename , typename = void >
-  struct dev : std::false_type { typedef void space ; };
+  template <typename U>
+  struct exe<U, typename std::conditional<true, void,
+                                          typename U::execution_space>::type>
+      : std::is_same<U, typename U::execution_space>::type {
+    typedef typename U::execution_space space;
+  };
 
-  template< typename U >
-  struct exe<U,typename std::conditional<true,void,typename U::execution_space>::type>
-    : std::is_same<U,typename U::execution_space>::type
-    { typedef typename U::execution_space space ; };
+  template <typename U>
+  struct mem<
+      U, typename std::conditional<true, void, typename U::memory_space>::type>
+      : std::is_same<U, typename U::memory_space>::type {
+    typedef typename U::memory_space space;
+  };
 
-  template< typename U >
-  struct mem<U,typename std::conditional<true,void,typename U::memory_space>::type>
-    : std::is_same<U,typename U::memory_space>::type
-    { typedef typename U::memory_space space ; };
+  template <typename U>
+  struct dev<
+      U, typename std::conditional<true, void, typename U::device_type>::type>
+      : std::is_same<U, typename U::device_type>::type {
+    typedef typename U::device_type space;
+  };
 
-  template< typename U >
-  struct dev<U,typename std::conditional<true,void,typename U::device_type>::type>
-    : std::is_same<U,typename U::device_type>::type
-    { typedef typename U::device_type space ; };
-
-  typedef typename is_space::template exe<T> is_exe ;
-  typedef typename is_space::template mem<T> is_mem ;
-  typedef typename is_space::template dev<T> is_dev ;
-
-public:
+  typedef typename is_space::template exe<T> is_exe;
+  typedef typename is_space::template mem<T> is_mem;
+  typedef typename is_space::template dev<T> is_dev;
 
+ public:
   enum { value = is_exe::value || is_mem::value || is_dev::value };
 
-  typedef typename is_exe::space execution_space ;
-  typedef typename is_mem::space memory_space ;
+  typedef typename is_exe::space execution_space;
+  typedef typename is_mem::space memory_space;
 
   // For backward compatibility, deprecated in favor of
   // Kokkos::Impl::HostMirror<S>::host_mirror_space
 
-  typedef typename std::conditional
-    < std::is_same< memory_space , Kokkos::HostSpace >::value
-#if defined( KOKKOS_ENABLE_CUDA )
-      || std::is_same< memory_space , Kokkos::CudaUVMSpace >::value
-      || std::is_same< memory_space , Kokkos::CudaHostPinnedSpace >::value
+  typedef typename std::conditional<
+      std::is_same<memory_space, Kokkos::HostSpace>::value
+#if defined(KOKKOS_ENABLE_CUDA)
+          || std::is_same<memory_space, Kokkos::CudaUVMSpace>::value ||
+          std::is_same<memory_space, Kokkos::CudaHostPinnedSpace>::value
 #endif /* #if defined( KOKKOS_ENABLE_CUDA ) */
-    , memory_space
-    , Kokkos::HostSpace
-    >::type  host_memory_space ;
+      ,
+      memory_space, Kokkos::HostSpace>::type host_memory_space;
 
-#if defined( KOKKOS_ENABLE_CUDA )
-  typedef typename std::conditional
-    < std::is_same< execution_space , Kokkos::Cuda >::value
-    , Kokkos::DefaultHostExecutionSpace , execution_space
-    >::type  host_execution_space ;
+#if defined(KOKKOS_ENABLE_CUDA)
+  typedef typename std::conditional<
+      std::is_same<execution_space, Kokkos::Cuda>::value,
+      Kokkos::DefaultHostExecutionSpace, execution_space>::type
+      host_execution_space;
 #else
-  #if defined( KOKKOS_ENABLE_OPENMPTARGET )
-    typedef typename std::conditional
-      < std::is_same< execution_space , Kokkos::Experimental::OpenMPTarget >::value
-      , Kokkos::DefaultHostExecutionSpace , execution_space
-      >::type  host_execution_space ;
-  #else
-    typedef execution_space  host_execution_space ;
-  #endif
+#if defined(KOKKOS_ENABLE_OPENMPTARGET)
+  typedef typename std::conditional<
+      std::is_same<execution_space, Kokkos::Experimental::OpenMPTarget>::value,
+      Kokkos::DefaultHostExecutionSpace, execution_space>::type
+      host_execution_space;
+#else
+  typedef execution_space host_execution_space;
+#endif
 #endif
 
-  typedef typename std::conditional
-    < std::is_same< execution_space , host_execution_space >::value &&
-      std::is_same< memory_space ,    host_memory_space    >::value
-    , T , Kokkos::Device< host_execution_space , host_memory_space >
-    >::type  host_mirror_space ;
+  typedef typename std::conditional<
+      std::is_same<execution_space, host_execution_space>::value &&
+          std::is_same<memory_space, host_memory_space>::value,
+      T, Kokkos::Device<host_execution_space, host_memory_space> >::type
+      host_mirror_space;
 };
 
-// For backward compatiblity
+// For backward compatibility
 
 namespace Impl {
 
-using Kokkos::is_space ;
+using Kokkos::is_space;
 
 }
 
-} // namespace Kokkos
+}  // namespace Kokkos
 
 //----------------------------------------------------------------------------
 
@@ -304,12 +324,11 @@ namespace Impl {
  *  The default case can assume accessibility for the same space.
  *  Specializations must be defined for different memory spaces.
  */
-template< typename DstMemorySpace , typename SrcMemorySpace >
+template <typename DstMemorySpace, typename SrcMemorySpace>
 struct MemorySpaceAccess {
-
-  static_assert( Kokkos::is_memory_space< DstMemorySpace >::value &&
-                 Kokkos::is_memory_space< SrcMemorySpace >::value
-               , "template arguments must be memory spaces" );
+  static_assert(Kokkos::is_memory_space<DstMemorySpace>::value &&
+                    Kokkos::is_memory_space<SrcMemorySpace>::value,
+                "template arguments must be memory spaces");
 
   /**\brief  Can a View (or pointer) to memory in SrcMemorySpace
    *         be assigned to a View (or pointer) to memory marked DstMemorySpace.
@@ -318,7 +337,7 @@ struct MemorySpaceAccess {
    *  2. All execution spaces that can access DstMemorySpace can also access
    *     SrcMemorySpace.
    */
-  enum { assignable = std::is_same<DstMemorySpace,SrcMemorySpace>::value };
+  enum { assignable = std::is_same<DstMemorySpace, SrcMemorySpace>::value };
 
   /**\brief  For all DstExecSpace::memory_space == DstMemorySpace
    *         DstExecSpace can access SrcMemorySpace.
@@ -331,7 +350,8 @@ struct MemorySpaceAccess {
   enum { deepcopy = assignable };
 };
 
-}} // namespace Kokkos::Impl
+}  // namespace Impl
+}  // namespace Kokkos
 
 namespace Kokkos {
 
@@ -354,34 +374,31 @@ namespace Kokkos {
  *   When AccessSpace::memory_space == Kokkos::HostSpace
  *   then space is the View host mirror space.
  */
-template< typename AccessSpace , typename MemorySpace >
+template <typename AccessSpace, typename MemorySpace>
 struct SpaceAccessibility {
-private:
+ private:
+  static_assert(Kokkos::is_space<AccessSpace>::value,
+                "template argument #1 must be a Kokkos space");
 
-  static_assert( Kokkos::is_space< AccessSpace >::value
-               , "template argument #1 must be a Kokkos space" );
-
-  static_assert( Kokkos::is_memory_space< MemorySpace >::value
-               , "template argument #2 must be a Kokkos memory space" );
+  static_assert(Kokkos::is_memory_space<MemorySpace>::value,
+                "template argument #2 must be a Kokkos memory space");
 
   // The input AccessSpace may be a Device<ExecSpace,MemSpace>
   // verify that it is a valid combination of spaces.
-  static_assert( Kokkos::Impl::MemorySpaceAccess
-                   < typename AccessSpace::execution_space::memory_space
-                   , typename AccessSpace::memory_space
-                   >::accessible
-               , "template argument #1 is an invalid space" );
+  static_assert(Kokkos::Impl::MemorySpaceAccess<
+                    typename AccessSpace::execution_space::memory_space,
+                    typename AccessSpace::memory_space>::accessible,
+                "template argument #1 is an invalid space");
 
-  typedef Kokkos::Impl::MemorySpaceAccess
-    < typename AccessSpace::execution_space::memory_space , MemorySpace >
-      exe_access ;
+  typedef Kokkos::Impl::MemorySpaceAccess<
+      typename AccessSpace::execution_space::memory_space, MemorySpace>
+      exe_access;
 
-  typedef Kokkos::Impl::MemorySpaceAccess
-    < typename AccessSpace::memory_space , MemorySpace >
-      mem_access ;
-
-public:
+  typedef Kokkos::Impl::MemorySpaceAccess<typename AccessSpace::memory_space,
+                                          MemorySpace>
+      mem_access;
 
+ public:
   /**\brief  Can AccessSpace::execution_space access MemorySpace ?
    *
    *  Default based upon memory space accessibility.
@@ -394,8 +411,9 @@ public:
    *  Default based upon memory space accessibility.
    *  Specialization required for other relationships.
    */
-  enum { assignable =
-    is_memory_space< AccessSpace >::value && mem_access::assignable };
+  enum {
+    assignable = is_memory_space<AccessSpace>::value && mem_access::assignable
+  };
 
   /**\brief  Can deep copy to AccessSpace::memory_Space from MemorySpace ?  */
   enum { deepcopy = mem_access::deepcopy };
@@ -404,24 +422,24 @@ public:
   // to be able to access MemorySpace?
   // If same memory space or not accessible use the AccessSpace
   // else construct a device with execution space and memory space.
-  typedef typename std::conditional
-    < std::is_same<typename AccessSpace::memory_space,MemorySpace>::value ||
-      ! exe_access::accessible
-    , AccessSpace
-    , Kokkos::Device< typename AccessSpace::execution_space , MemorySpace >
-    >::type  space ;
+  typedef typename std::conditional<
+      std::is_same<typename AccessSpace::memory_space, MemorySpace>::value ||
+          !exe_access::accessible,
+      AccessSpace,
+      Kokkos::Device<typename AccessSpace::execution_space, MemorySpace> >::type
+      space;
 };
 
-} // namespace Kokkos
+}  // namespace Kokkos
 
 namespace Kokkos {
 namespace Impl {
 
-using Kokkos::SpaceAccessibility ; // For backward compatibility
+using Kokkos::SpaceAccessibility;  // For backward compatibility
 
-}} // namespace Kokkos::Impl
+}
+}  // namespace Kokkos
 
 //----------------------------------------------------------------------------
 
-#endif // KOKKOS_CORE_CONCEPTS_HPP
-
+#endif  // KOKKOS_CORE_CONCEPTS_HPP
diff --git a/lib/kokkos/core/src/Kokkos_CopyViews.hpp b/lib/kokkos/core/src/Kokkos_CopyViews.hpp
index f919fdb755..9b3db1277d 100644
--- a/lib/kokkos/core/src/Kokkos_CopyViews.hpp
+++ b/lib/kokkos/core/src/Kokkos_CopyViews.hpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -56,1479 +57,1781 @@ namespace Kokkos {
 
 namespace Impl {
 
-template<class Layout>
-struct ViewFillLayoutSelector {
-};
+template <class Layout>
+struct ViewFillLayoutSelector {};
 
-template<>
+template <>
 struct ViewFillLayoutSelector<Kokkos::LayoutLeft> {
   static const Kokkos::Iterate iterate = Kokkos::Iterate::Left;
 };
 
-template<>
+template <>
 struct ViewFillLayoutSelector<Kokkos::LayoutRight> {
   static const Kokkos::Iterate iterate = Kokkos::Iterate::Right;
 };
 
-} // namespace Impl
-} // namespace Kokkos
+}  // namespace Impl
+}  // namespace Kokkos
 
-#include<impl/Kokkos_ViewFillCopyETIAvail.hpp>
+#include <impl/Kokkos_ViewFillCopyETIAvail.hpp>
 
 namespace Kokkos {
 namespace Impl {
 
-template<class ViewType,class Layout, class ExecSpace,typename iType,bool ETIAvail>
-struct ViewFill<ViewType,Layout,ExecSpace,0,iType,ETIAvail> {
+template <class ViewType, class Layout, class ExecSpace, typename iType,
+          bool ETIAvail>
+struct ViewFill<ViewType, Layout, ExecSpace, 0, iType, ETIAvail> {
   ViewType a;
   typename ViewType::const_value_type val;
   typedef typename ViewType::non_const_value_type ST;
   ViewFill(const ViewType&, const ST&);
 };
 
-template<class ViewType,class Layout, class ExecSpace,typename iType,bool ETIAvail>
-struct ViewFill<ViewType,Layout,ExecSpace,1,iType,ETIAvail> {
+template <class ViewType, class Layout, class ExecSpace, typename iType,
+          bool ETIAvail>
+struct ViewFill<ViewType, Layout, ExecSpace, 1, iType, ETIAvail> {
   ViewType a;
   typename ViewType::const_value_type val;
   typedef typename ViewType::non_const_value_type ST;
   ViewFill(const ViewType&, const ST&);
   KOKKOS_INLINE_FUNCTION
-  void operator() (const iType&) const;
+  void operator()(const iType&) const;
 };
 
-template<class ViewType,class Layout, class ExecSpace,typename iType,bool ETIAvail>
-struct ViewFill<ViewType,Layout,ExecSpace,2,iType,ETIAvail> {
+template <class ViewType, class Layout, class ExecSpace, typename iType,
+          bool ETIAvail>
+struct ViewFill<ViewType, Layout, ExecSpace, 2, iType, ETIAvail> {
   ViewType a;
   typename ViewType::const_value_type val;
   typedef typename ViewType::non_const_value_type ST;
   ViewFill(const ViewType&, const ST&);
   KOKKOS_INLINE_FUNCTION
-  void operator() (const iType&, const iType&) const;
+  void operator()(const iType&, const iType&) const;
 };
 
-template<class ViewType,class Layout, class ExecSpace,typename iType,bool ETIAvail>
-struct ViewFill<ViewType,Layout,ExecSpace,3,iType,ETIAvail> {
+template <class ViewType, class Layout, class ExecSpace, typename iType,
+          bool ETIAvail>
+struct ViewFill<ViewType, Layout, ExecSpace, 3, iType, ETIAvail> {
   ViewType a;
   typename ViewType::const_value_type val;
   typedef typename ViewType::non_const_value_type ST;
   ViewFill(const ViewType&, const ST&);
   KOKKOS_INLINE_FUNCTION
-  void operator() (const iType&, const iType&, const iType&) const;
+  void operator()(const iType&, const iType&, const iType&) const;
 };
 
-template<class ViewType,class Layout, class ExecSpace,typename iType,bool ETIAvail>
-struct ViewFill<ViewType,Layout,ExecSpace,4,iType,ETIAvail> {
+template <class ViewType, class Layout, class ExecSpace, typename iType,
+          bool ETIAvail>
+struct ViewFill<ViewType, Layout, ExecSpace, 4, iType, ETIAvail> {
   ViewType a;
   typename ViewType::const_value_type val;
   typedef typename ViewType::non_const_value_type ST;
   ViewFill(const ViewType&, const ST&);
   KOKKOS_INLINE_FUNCTION
-  void operator() (const iType&, const iType&, const iType&, const iType&) const;
+  void operator()(const iType&, const iType&, const iType&, const iType&) const;
 };
 
-template<class ViewType,class Layout, class ExecSpace,typename iType,bool ETIAvail>
-struct ViewFill<ViewType,Layout,ExecSpace,5,iType,ETIAvail> {
+template <class ViewType, class Layout, class ExecSpace, typename iType,
+          bool ETIAvail>
+struct ViewFill<ViewType, Layout, ExecSpace, 5, iType, ETIAvail> {
   ViewType a;
   typename ViewType::const_value_type val;
   typedef typename ViewType::non_const_value_type ST;
   ViewFill(const ViewType&, const ST&);
   KOKKOS_INLINE_FUNCTION
-  void operator() (const iType&, const iType&, const iType&, const iType&,
-                   const iType&) const;
+  void operator()(const iType&, const iType&, const iType&, const iType&,
+                  const iType&) const;
 };
 
-template<class ViewType,class Layout, class ExecSpace,typename iType,bool ETIAvail>
-struct ViewFill<ViewType,Layout,ExecSpace,6,iType,ETIAvail> {
+template <class ViewType, class Layout, class ExecSpace, typename iType,
+          bool ETIAvail>
+struct ViewFill<ViewType, Layout, ExecSpace, 6, iType, ETIAvail> {
   ViewType a;
   typename ViewType::const_value_type val;
   typedef typename ViewType::non_const_value_type ST;
   ViewFill(const ViewType&, const ST&);
   KOKKOS_INLINE_FUNCTION
-  void operator() (const iType&, const iType&, const iType&, const iType&,
-                   const iType&, const iType&) const;
+  void operator()(const iType&, const iType&, const iType&, const iType&,
+                  const iType&, const iType&) const;
 };
 
-template<class ViewType,class Layout, class ExecSpace,typename iType,bool ETIAvail>
-struct ViewFill<ViewType,Layout,ExecSpace,7,iType,ETIAvail> {
+template <class ViewType, class Layout, class ExecSpace, typename iType,
+          bool ETIAvail>
+struct ViewFill<ViewType, Layout, ExecSpace, 7, iType, ETIAvail> {
   ViewType a;
   typename ViewType::const_value_type val;
   typedef typename ViewType::non_const_value_type ST;
   ViewFill(const ViewType&, const ST&);
   KOKKOS_INLINE_FUNCTION
-  void operator() (const iType&, const iType&, const iType&, const iType&,
-                   const iType&, const iType&, const iType&) const;
+  void operator()(const iType&, const iType&, const iType&, const iType&,
+                  const iType&, const iType&, const iType&) const;
 };
 
-template<class ViewType,class Layout, class ExecSpace,typename iType,bool ETIAvail>
-struct ViewFill<ViewType,Layout,ExecSpace,8,iType,ETIAvail> {
+template <class ViewType, class Layout, class ExecSpace, typename iType,
+          bool ETIAvail>
+struct ViewFill<ViewType, Layout, ExecSpace, 8, iType, ETIAvail> {
   ViewType a;
   typename ViewType::const_value_type val;
   typedef typename ViewType::non_const_value_type ST;
   ViewFill(const ViewType&, const ST&);
   KOKKOS_INLINE_FUNCTION
-  void operator() (const iType&, const iType&, const iType&, const iType&,
-                   const iType&, const iType&, const iType&, const iType&) const;
+  void operator()(const iType&, const iType&, const iType&, const iType&,
+                  const iType&, const iType&, const iType&, const iType&) const;
 };
 
-template<class ViewType,class Layout, class ExecSpace,typename iType>
-struct ViewFill<ViewType,Layout,ExecSpace,0,iType,KOKKOS_IMPL_COMPILING_LIBRARY> {
+template <class ViewType, class Layout, class ExecSpace, typename iType>
+struct ViewFill<ViewType, Layout, ExecSpace, 0, iType,
+                KOKKOS_IMPL_COMPILING_LIBRARY> {
   typedef typename ViewType::non_const_value_type ST;
   ViewFill(const ViewType& a, const ST& val) {
-    Kokkos::Impl::DeepCopy< typename ViewType::memory_space, Kokkos::HostSpace >( a.data() , &val, sizeof(ST) );
+    Kokkos::Impl::DeepCopy<typename ViewType::memory_space, Kokkos::HostSpace>(
+        a.data(), &val, sizeof(ST));
   }
 };
 
-
-template<class ViewType,class Layout, class ExecSpace,typename iType>
-struct ViewFill<ViewType,Layout,ExecSpace,1,iType,KOKKOS_IMPL_COMPILING_LIBRARY> {
+template <class ViewType, class Layout, class ExecSpace, typename iType>
+struct ViewFill<ViewType, Layout, ExecSpace, 1, iType,
+                KOKKOS_IMPL_COMPILING_LIBRARY> {
   ViewType a;
   typename ViewType::const_value_type val;
-  typedef Kokkos::RangePolicy<ExecSpace,Kokkos::IndexType<iType>> policy_type;
+  typedef Kokkos::RangePolicy<ExecSpace, Kokkos::IndexType<iType>> policy_type;
 
-  ViewFill(const ViewType& a_, typename ViewType::const_value_type& val_):a(a_),val(val_) {
+  ViewFill(const ViewType& a_, typename ViewType::const_value_type& val_)
+      : a(a_), val(val_) {
     ExecSpace().fence();
-    Kokkos::parallel_for("Kokkos::ViewFill-1D",policy_type(0,a.extent(0)),*this);
+    Kokkos::parallel_for("Kokkos::ViewFill-1D", policy_type(0, a.extent(0)),
+                         *this);
     ExecSpace().fence();
   }
 
   KOKKOS_INLINE_FUNCTION
-  void operator() (const iType& i) const {
-    a(i) = val;
-  };
+  void operator()(const iType& i) const { a(i) = val; };
 };
 
-template<class ViewType,class Layout, class ExecSpace,typename iType>
-struct ViewFill<ViewType,Layout,ExecSpace,2,iType,KOKKOS_IMPL_COMPILING_LIBRARY> {
+template <class ViewType, class Layout, class ExecSpace, typename iType>
+struct ViewFill<ViewType, Layout, ExecSpace, 2, iType,
+                KOKKOS_IMPL_COMPILING_LIBRARY> {
   ViewType a;
   typename ViewType::const_value_type val;
 
-  typedef Kokkos::Rank<2,ViewFillLayoutSelector<Layout>::iterate,ViewFillLayoutSelector<Layout>::iterate> iterate_type;
-  typedef Kokkos::MDRangePolicy<ExecSpace,iterate_type,Kokkos::IndexType<iType>> policy_type;
+  typedef Kokkos::Rank<2, ViewFillLayoutSelector<Layout>::iterate,
+                       ViewFillLayoutSelector<Layout>::iterate>
+      iterate_type;
+  typedef Kokkos::MDRangePolicy<ExecSpace, iterate_type,
+                                Kokkos::IndexType<iType>>
+      policy_type;
 
-  ViewFill(const ViewType& a_, typename ViewType::const_value_type& val_):a(a_),val(val_) {
+  ViewFill(const ViewType& a_, typename ViewType::const_value_type& val_)
+      : a(a_), val(val_) {
     ExecSpace().fence();
     Kokkos::parallel_for("Kokkos::ViewFill-2D",
-       policy_type({0,0},{a.extent(0),a.extent(1)}),*this);
+                         policy_type({0, 0}, {a.extent(0), a.extent(1)}),
+                         *this);
     ExecSpace().fence();
   }
 
   KOKKOS_INLINE_FUNCTION
-  void operator() (const iType& i0, const iType& i1) const {
-    a(i0,i1) = val;
-  };
+  void operator()(const iType& i0, const iType& i1) const { a(i0, i1) = val; };
 };
 
-template<class ViewType,class Layout, class ExecSpace,typename iType>
-struct ViewFill<ViewType,Layout,ExecSpace,3,iType,KOKKOS_IMPL_COMPILING_LIBRARY> {
+template <class ViewType, class Layout, class ExecSpace, typename iType>
+struct ViewFill<ViewType, Layout, ExecSpace, 3, iType,
+                KOKKOS_IMPL_COMPILING_LIBRARY> {
   ViewType a;
   typename ViewType::const_value_type val;
 
-  typedef Kokkos::Rank<3,ViewFillLayoutSelector<Layout>::iterate,ViewFillLayoutSelector<Layout>::iterate> iterate_type;
-  typedef Kokkos::MDRangePolicy<ExecSpace,iterate_type,Kokkos::IndexType<iType>> policy_type;
+  typedef Kokkos::Rank<3, ViewFillLayoutSelector<Layout>::iterate,
+                       ViewFillLayoutSelector<Layout>::iterate>
+      iterate_type;
+  typedef Kokkos::MDRangePolicy<ExecSpace, iterate_type,
+                                Kokkos::IndexType<iType>>
+      policy_type;
 
-  ViewFill(const ViewType& a_, typename ViewType::const_value_type& val_):a(a_),val(val_) {
+  ViewFill(const ViewType& a_, typename ViewType::const_value_type& val_)
+      : a(a_), val(val_) {
     ExecSpace().fence();
-    Kokkos::parallel_for("Kokkos::ViewFill-3D",
-       policy_type({0,0,0},{a.extent(0),a.extent(1),a.extent(2)}),*this);
+    Kokkos::parallel_for(
+        "Kokkos::ViewFill-3D",
+        policy_type({0, 0, 0}, {a.extent(0), a.extent(1), a.extent(2)}), *this);
     ExecSpace().fence();
   }
 
   KOKKOS_INLINE_FUNCTION
-  void operator() (const iType& i0, const iType& i1, const iType& i2) const {
-    a(i0,i1,i2) = val;
+  void operator()(const iType& i0, const iType& i1, const iType& i2) const {
+    a(i0, i1, i2) = val;
   };
 };
 
-template<class ViewType,class Layout, class ExecSpace,typename iType>
-struct ViewFill<ViewType,Layout,ExecSpace,4,iType,KOKKOS_IMPL_COMPILING_LIBRARY> {
+template <class ViewType, class Layout, class ExecSpace, typename iType>
+struct ViewFill<ViewType, Layout, ExecSpace, 4, iType,
+                KOKKOS_IMPL_COMPILING_LIBRARY> {
   ViewType a;
   typename ViewType::const_value_type val;
 
-  typedef Kokkos::Rank<4,ViewFillLayoutSelector<Layout>::iterate,ViewFillLayoutSelector<Layout>::iterate> iterate_type;
-  typedef Kokkos::MDRangePolicy<ExecSpace,iterate_type,Kokkos::IndexType<iType>> policy_type;
+  typedef Kokkos::Rank<4, ViewFillLayoutSelector<Layout>::iterate,
+                       ViewFillLayoutSelector<Layout>::iterate>
+      iterate_type;
+  typedef Kokkos::MDRangePolicy<ExecSpace, iterate_type,
+                                Kokkos::IndexType<iType>>
+      policy_type;
 
-  ViewFill(const ViewType& a_, typename ViewType::const_value_type& val_):a(a_),val(val_) {
+  ViewFill(const ViewType& a_, typename ViewType::const_value_type& val_)
+      : a(a_), val(val_) {
     ExecSpace().fence();
     Kokkos::parallel_for("Kokkos::ViewFill-4D",
-       policy_type({0,0,0,0},{a.extent(0),a.extent(1),a.extent(2),a.extent(3)}),*this);
+                         policy_type({0, 0, 0, 0}, {a.extent(0), a.extent(1),
+                                                    a.extent(2), a.extent(3)}),
+                         *this);
     ExecSpace().fence();
   }
 
   KOKKOS_INLINE_FUNCTION
-  void operator() (const iType& i0, const iType& i1, const iType& i2, const iType& i3) const {
-    a(i0,i1,i2,i3) = val;
+  void operator()(const iType& i0, const iType& i1, const iType& i2,
+                  const iType& i3) const {
+    a(i0, i1, i2, i3) = val;
   };
 };
 
-template<class ViewType,class Layout, class ExecSpace,typename iType>
-struct ViewFill<ViewType,Layout,ExecSpace,5,iType,KOKKOS_IMPL_COMPILING_LIBRARY> {
+template <class ViewType, class Layout, class ExecSpace, typename iType>
+struct ViewFill<ViewType, Layout, ExecSpace, 5, iType,
+                KOKKOS_IMPL_COMPILING_LIBRARY> {
   ViewType a;
   typename ViewType::const_value_type val;
 
-  typedef Kokkos::Rank<5,ViewFillLayoutSelector<Layout>::iterate,ViewFillLayoutSelector<Layout>::iterate> iterate_type;
-  typedef Kokkos::MDRangePolicy<ExecSpace,iterate_type,Kokkos::IndexType<iType>> policy_type;
+  typedef Kokkos::Rank<5, ViewFillLayoutSelector<Layout>::iterate,
+                       ViewFillLayoutSelector<Layout>::iterate>
+      iterate_type;
+  typedef Kokkos::MDRangePolicy<ExecSpace, iterate_type,
+                                Kokkos::IndexType<iType>>
+      policy_type;
 
-  ViewFill(const ViewType& a_, typename ViewType::const_value_type& val_):a(a_),val(val_) {
+  ViewFill(const ViewType& a_, typename ViewType::const_value_type& val_)
+      : a(a_), val(val_) {
     ExecSpace().fence();
-    Kokkos::parallel_for("Kokkos::ViewFill-5D",
-       policy_type({0,0,0,0,0},{a.extent(0),a.extent(1),a.extent(2),a.extent(3),a.extent(4)}),*this);
+    Kokkos::parallel_for(
+        "Kokkos::ViewFill-5D",
+        policy_type({0, 0, 0, 0, 0}, {a.extent(0), a.extent(1), a.extent(2),
+                                      a.extent(3), a.extent(4)}),
+        *this);
     ExecSpace().fence();
   }
 
   KOKKOS_INLINE_FUNCTION
-  void operator() (const iType& i0, const iType& i1, const iType& i2, const iType& i3, const iType& i4) const {
-    a(i0,i1,i2,i3,i4) = val;
+  void operator()(const iType& i0, const iType& i1, const iType& i2,
+                  const iType& i3, const iType& i4) const {
+    a(i0, i1, i2, i3, i4) = val;
   };
 };
 
-template<class ViewType,class Layout, class ExecSpace,typename iType>
-struct ViewFill<ViewType,Layout,ExecSpace,6,iType,KOKKOS_IMPL_COMPILING_LIBRARY> {
+template <class ViewType, class Layout, class ExecSpace, typename iType>
+struct ViewFill<ViewType, Layout, ExecSpace, 6, iType,
+                KOKKOS_IMPL_COMPILING_LIBRARY> {
   ViewType a;
   typename ViewType::const_value_type val;
 
-  typedef Kokkos::Rank<6,ViewFillLayoutSelector<Layout>::iterate,ViewFillLayoutSelector<Layout>::iterate> iterate_type;
-  typedef Kokkos::MDRangePolicy<ExecSpace,iterate_type,Kokkos::IndexType<iType>> policy_type;
+  typedef Kokkos::Rank<6, ViewFillLayoutSelector<Layout>::iterate,
+                       ViewFillLayoutSelector<Layout>::iterate>
+      iterate_type;
+  typedef Kokkos::MDRangePolicy<ExecSpace, iterate_type,
+                                Kokkos::IndexType<iType>>
+      policy_type;
 
-  ViewFill(const ViewType& a_, typename ViewType::const_value_type& val_):a(a_),val(val_) {
+  ViewFill(const ViewType& a_, typename ViewType::const_value_type& val_)
+      : a(a_), val(val_) {
     ExecSpace().fence();
     Kokkos::parallel_for("Kokkos::ViewFill-6D",
-       policy_type({0,0,0,0,0,0},{a.extent(0),a.extent(1),a.extent(2),a.extent(3),a.extent(4),a.extent(5)}),*this);
+                         policy_type({0, 0, 0, 0, 0, 0},
+                                     {a.extent(0), a.extent(1), a.extent(2),
+                                      a.extent(3), a.extent(4), a.extent(5)}),
+                         *this);
     ExecSpace().fence();
   }
 
   KOKKOS_INLINE_FUNCTION
-  void operator() (const iType& i0, const iType& i1, const iType& i2, const iType& i3, const iType& i4, const iType& i5) const {
-    a(i0,i1,i2,i3,i4,i5) = val;
+  void operator()(const iType& i0, const iType& i1, const iType& i2,
+                  const iType& i3, const iType& i4, const iType& i5) const {
+    a(i0, i1, i2, i3, i4, i5) = val;
   };
 };
 
-template<class ViewType,class Layout, class ExecSpace,typename iType>
-struct ViewFill<ViewType,Layout,ExecSpace,7,iType,KOKKOS_IMPL_COMPILING_LIBRARY> {
+template <class ViewType, class Layout, class ExecSpace, typename iType>
+struct ViewFill<ViewType, Layout, ExecSpace, 7, iType,
+                KOKKOS_IMPL_COMPILING_LIBRARY> {
   ViewType a;
   typename ViewType::const_value_type val;
 
-  typedef Kokkos::Rank<6,ViewFillLayoutSelector<Layout>::iterate,ViewFillLayoutSelector<Layout>::iterate> iterate_type;
-  typedef Kokkos::MDRangePolicy<ExecSpace,iterate_type,Kokkos::IndexType<iType>> policy_type;
+  typedef Kokkos::Rank<6, ViewFillLayoutSelector<Layout>::iterate,
+                       ViewFillLayoutSelector<Layout>::iterate>
+      iterate_type;
+  typedef Kokkos::MDRangePolicy<ExecSpace, iterate_type,
+                                Kokkos::IndexType<iType>>
+      policy_type;
 
-  ViewFill(const ViewType& a_, typename ViewType::const_value_type& val_):a(a_),val(val_) {
+  ViewFill(const ViewType& a_, typename ViewType::const_value_type& val_)
+      : a(a_), val(val_) {
     ExecSpace().fence();
     Kokkos::parallel_for("Kokkos::ViewFill-7D",
-       policy_type({0,0,0,0,0,0},{a.extent(0),a.extent(1),a.extent(2),a.extent(3),
-                                  a.extent(5),a.extent(6)}),*this);
+                         policy_type({0, 0, 0, 0, 0, 0},
+                                     {a.extent(0), a.extent(1), a.extent(2),
+                                      a.extent(3), a.extent(5), a.extent(6)}),
+                         *this);
     ExecSpace().fence();
   }
 
   KOKKOS_INLINE_FUNCTION
-  void operator() (const iType& i0, const iType& i1, const iType& i3,
-                   const iType& i4, const iType& i5, const iType& i6) const {
-    for(iType i2=0; i2<iType(a.extent(2));i2++)
-      a(i0,i1,i2,i3,i4,i5,i6) = val;
+  void operator()(const iType& i0, const iType& i1, const iType& i3,
+                  const iType& i4, const iType& i5, const iType& i6) const {
+    for (iType i2 = 0; i2 < iType(a.extent(2)); i2++)
+      a(i0, i1, i2, i3, i4, i5, i6) = val;
   };
 };
 
-template<class ViewType,class Layout, class ExecSpace,typename iType>
-struct ViewFill<ViewType,Layout,ExecSpace,8,iType,KOKKOS_IMPL_COMPILING_LIBRARY> {
+template <class ViewType, class Layout, class ExecSpace, typename iType>
+struct ViewFill<ViewType, Layout, ExecSpace, 8, iType,
+                KOKKOS_IMPL_COMPILING_LIBRARY> {
   ViewType a;
   typename ViewType::const_value_type val;
 
-  typedef Kokkos::Rank<6,ViewFillLayoutSelector<Layout>::iterate,ViewFillLayoutSelector<Layout>::iterate> iterate_type;
-  typedef Kokkos::MDRangePolicy<ExecSpace,iterate_type,Kokkos::IndexType<iType>> policy_type;
+  typedef Kokkos::Rank<6, ViewFillLayoutSelector<Layout>::iterate,
+                       ViewFillLayoutSelector<Layout>::iterate>
+      iterate_type;
+  typedef Kokkos::MDRangePolicy<ExecSpace, iterate_type,
+                                Kokkos::IndexType<iType>>
+      policy_type;
 
-  ViewFill(const ViewType& a_, typename ViewType::const_value_type& val_):a(a_),val(val_) {
+  ViewFill(const ViewType& a_, typename ViewType::const_value_type& val_)
+      : a(a_), val(val_) {
     ExecSpace().fence();
     Kokkos::parallel_for("Kokkos::ViewFill-8D",
-       policy_type({0,0,0,0,0,0},{a.extent(0),a.extent(1),a.extent(3),
-                                  a.extent(5),a.extent(6),a.extent(7)}),*this);
+                         policy_type({0, 0, 0, 0, 0, 0},
+                                     {a.extent(0), a.extent(1), a.extent(3),
+                                      a.extent(5), a.extent(6), a.extent(7)}),
+                         *this);
     ExecSpace().fence();
   }
 
   KOKKOS_INLINE_FUNCTION
-  void operator() (const iType& i0, const iType& i1, const iType& i3,
-                   const iType& i5, const iType& i6, const iType& i7) const {
-    for(iType i2=0; i2<iType(a.extent(2));i2++)
-    for(iType i4=0; i4<iType(a.extent(4));i4++)
-      a(i0,i1,i2,i3,i4,i5,i6,i7) = val;
+  void operator()(const iType& i0, const iType& i1, const iType& i3,
+                  const iType& i5, const iType& i6, const iType& i7) const {
+    for (iType i2 = 0; i2 < iType(a.extent(2)); i2++)
+      for (iType i4 = 0; i4 < iType(a.extent(4)); i4++)
+        a(i0, i1, i2, i3, i4, i5, i6, i7) = val;
   };
 };
 
-template<class ViewTypeA,class ViewTypeB, class Layout, class ExecSpace,typename iType, bool ETIAvail>
-struct ViewCopy<ViewTypeA,ViewTypeB,Layout,ExecSpace,1,iType,ETIAvail> {
+template <class ViewTypeA, class ViewTypeB, class Layout, class ExecSpace,
+          typename iType, bool ETIAvail>
+struct ViewCopy<ViewTypeA, ViewTypeB, Layout, ExecSpace, 1, iType, ETIAvail> {
   ViewTypeA a;
   ViewTypeB b;
   ViewCopy(const ViewTypeA&, const ViewTypeB&);
   KOKKOS_INLINE_FUNCTION
-  void operator() (const iType& i0) const;
+  void operator()(const iType& i0) const;
 };
 
-template<class ViewTypeA,class ViewTypeB, class Layout, class ExecSpace,typename iType, bool ETIAvail>
-struct ViewCopy<ViewTypeA,ViewTypeB,Layout,ExecSpace,2,iType,ETIAvail> {
+template <class ViewTypeA, class ViewTypeB, class Layout, class ExecSpace,
+          typename iType, bool ETIAvail>
+struct ViewCopy<ViewTypeA, ViewTypeB, Layout, ExecSpace, 2, iType, ETIAvail> {
   ViewTypeA a;
   ViewTypeB b;
   ViewCopy(const ViewTypeA&, const ViewTypeB&);
   KOKKOS_INLINE_FUNCTION
-  void operator() (const iType& i0,const iType& i1) const;
+  void operator()(const iType& i0, const iType& i1) const;
 };
 
-template<class ViewTypeA,class ViewTypeB, class Layout, class ExecSpace,typename iType, bool ETIAvail>
-struct ViewCopy<ViewTypeA,ViewTypeB,Layout,ExecSpace,3,iType,ETIAvail> {
+template <class ViewTypeA, class ViewTypeB, class Layout, class ExecSpace,
+          typename iType, bool ETIAvail>
+struct ViewCopy<ViewTypeA, ViewTypeB, Layout, ExecSpace, 3, iType, ETIAvail> {
   ViewTypeA a;
   ViewTypeB b;
   ViewCopy(const ViewTypeA&, const ViewTypeB&);
   KOKKOS_INLINE_FUNCTION
-  void operator() (const iType& i0,const iType& i1,const iType& i2) const;
+  void operator()(const iType& i0, const iType& i1, const iType& i2) const;
 };
 
-template<class ViewTypeA,class ViewTypeB, class Layout, class ExecSpace,typename iType, bool ETIAvail>
-struct ViewCopy<ViewTypeA,ViewTypeB,Layout,ExecSpace,4,iType,ETIAvail> {
+template <class ViewTypeA, class ViewTypeB, class Layout, class ExecSpace,
+          typename iType, bool ETIAvail>
+struct ViewCopy<ViewTypeA, ViewTypeB, Layout, ExecSpace, 4, iType, ETIAvail> {
   ViewTypeA a;
   ViewTypeB b;
   ViewCopy(const ViewTypeA&, const ViewTypeB&);
   KOKKOS_INLINE_FUNCTION
-  void operator() (const iType& i0,const iType& i1,const iType& i2,const iType& i3) const;
+  void operator()(const iType& i0, const iType& i1, const iType& i2,
+                  const iType& i3) const;
 };
 
-template<class ViewTypeA,class ViewTypeB, class Layout, class ExecSpace,typename iType, bool ETIAvail>
-struct ViewCopy<ViewTypeA,ViewTypeB,Layout,ExecSpace,5,iType,ETIAvail> {
+template <class ViewTypeA, class ViewTypeB, class Layout, class ExecSpace,
+          typename iType, bool ETIAvail>
+struct ViewCopy<ViewTypeA, ViewTypeB, Layout, ExecSpace, 5, iType, ETIAvail> {
   ViewTypeA a;
   ViewTypeB b;
   ViewCopy(const ViewTypeA&, const ViewTypeB&);
   KOKKOS_INLINE_FUNCTION
-  void operator() (const iType& i0,const iType& i1,const iType& i2,const iType& i3,
-                   const iType& i4) const;
+  void operator()(const iType& i0, const iType& i1, const iType& i2,
+                  const iType& i3, const iType& i4) const;
 };
 
-template<class ViewTypeA,class ViewTypeB, class Layout, class ExecSpace,typename iType, bool ETIAvail>
-struct ViewCopy<ViewTypeA,ViewTypeB,Layout,ExecSpace,6,iType,ETIAvail> {
+template <class ViewTypeA, class ViewTypeB, class Layout, class ExecSpace,
+          typename iType, bool ETIAvail>
+struct ViewCopy<ViewTypeA, ViewTypeB, Layout, ExecSpace, 6, iType, ETIAvail> {
   ViewTypeA a;
   ViewTypeB b;
   ViewCopy(const ViewTypeA&, const ViewTypeB&);
   KOKKOS_INLINE_FUNCTION
-  void operator() (const iType& i0,const iType& i1,const iType& i2,const iType& i3,
-                   const iType& i4,const iType& i5) const;
+  void operator()(const iType& i0, const iType& i1, const iType& i2,
+                  const iType& i3, const iType& i4, const iType& i5) const;
 };
 
-template<class ViewTypeA,class ViewTypeB, class Layout, class ExecSpace,typename iType, bool ETIAvail>
-struct ViewCopy<ViewTypeA,ViewTypeB,Layout,ExecSpace,7,iType,ETIAvail> {
+template <class ViewTypeA, class ViewTypeB, class Layout, class ExecSpace,
+          typename iType, bool ETIAvail>
+struct ViewCopy<ViewTypeA, ViewTypeB, Layout, ExecSpace, 7, iType, ETIAvail> {
   ViewTypeA a;
   ViewTypeB b;
   ViewCopy(const ViewTypeA&, const ViewTypeB&);
   KOKKOS_INLINE_FUNCTION
-  void operator() (const iType& i0,const iType& i1,const iType& i2,const iType& i3,
-                   const iType& i4,const iType& i5,const iType& i6) const;
+  void operator()(const iType& i0, const iType& i1, const iType& i2,
+                  const iType& i3, const iType& i4, const iType& i5,
+                  const iType& i6) const;
 };
 
-template<class ViewTypeA,class ViewTypeB, class Layout, class ExecSpace,typename iType, bool ETIAvail>
-struct ViewCopy<ViewTypeA,ViewTypeB,Layout,ExecSpace,8,iType,ETIAvail> {
+template <class ViewTypeA, class ViewTypeB, class Layout, class ExecSpace,
+          typename iType, bool ETIAvail>
+struct ViewCopy<ViewTypeA, ViewTypeB, Layout, ExecSpace, 8, iType, ETIAvail> {
   ViewTypeA a;
   ViewTypeB b;
   ViewCopy(const ViewTypeA&, const ViewTypeB&);
   KOKKOS_INLINE_FUNCTION
-  void operator() (const iType& i0,const iType& i1,const iType& i2,const iType& i3,
-                   const iType& i4,const iType& i5,const iType& i6,const iType& i7) const;
+  void operator()(const iType& i0, const iType& i1, const iType& i2,
+                  const iType& i3, const iType& i4, const iType& i5,
+                  const iType& i6, const iType& i7) const;
 };
 
-
-
-template<class ViewTypeA,class ViewTypeB, class Layout, class ExecSpace,typename iType>
-struct ViewCopy<ViewTypeA,ViewTypeB,Layout,ExecSpace,1,iType,KOKKOS_IMPL_COMPILING_LIBRARY> {
+template <class ViewTypeA, class ViewTypeB, class Layout, class ExecSpace,
+          typename iType>
+struct ViewCopy<ViewTypeA, ViewTypeB, Layout, ExecSpace, 1, iType,
+                KOKKOS_IMPL_COMPILING_LIBRARY> {
   ViewTypeA a;
   ViewTypeB b;
 
-  typedef Kokkos::RangePolicy<ExecSpace,Kokkos::IndexType<iType>> policy_type;
+  typedef Kokkos::RangePolicy<ExecSpace, Kokkos::IndexType<iType>> policy_type;
 
-  ViewCopy(const ViewTypeA& a_, const ViewTypeB& b_):a(a_),b(b_) {
+  ViewCopy(const ViewTypeA& a_, const ViewTypeB& b_) : a(a_), b(b_) {
     ExecSpace().fence();
-    Kokkos::parallel_for("Kokkos::ViewCopy-1D",
-       policy_type(0,a.extent(0)),*this);
+    Kokkos::parallel_for("Kokkos::ViewCopy-1D", policy_type(0, a.extent(0)),
+                         *this);
     ExecSpace().fence();
   }
 
   KOKKOS_INLINE_FUNCTION
-  void operator() (const iType& i0) const {
-      a(i0) = b(i0);
-  };
+  void operator()(const iType& i0) const { a(i0) = b(i0); };
 };
 
-template<class ViewTypeA,class ViewTypeB, class Layout, class ExecSpace,typename iType>
-struct ViewCopy<ViewTypeA,ViewTypeB,Layout,ExecSpace,2,iType,KOKKOS_IMPL_COMPILING_LIBRARY> {
+template <class ViewTypeA, class ViewTypeB, class Layout, class ExecSpace,
+          typename iType>
+struct ViewCopy<ViewTypeA, ViewTypeB, Layout, ExecSpace, 2, iType,
+                KOKKOS_IMPL_COMPILING_LIBRARY> {
   ViewTypeA a;
   ViewTypeB b;
-  static const Kokkos::Iterate outer_iteration_pattern = Kokkos::layout_iterate_type_selector<Layout>::outer_iteration_pattern;
-  static const Kokkos::Iterate inner_iteration_pattern = Kokkos::layout_iterate_type_selector<Layout>::inner_iteration_pattern;
-  typedef Kokkos::Rank<2,outer_iteration_pattern,inner_iteration_pattern> iterate_type;
-  typedef Kokkos::MDRangePolicy<ExecSpace,iterate_type,Kokkos::IndexType<iType>> policy_type;
+  static const Kokkos::Iterate outer_iteration_pattern =
+      Kokkos::layout_iterate_type_selector<Layout>::outer_iteration_pattern;
+  static const Kokkos::Iterate inner_iteration_pattern =
+      Kokkos::layout_iterate_type_selector<Layout>::inner_iteration_pattern;
+  typedef Kokkos::Rank<2, outer_iteration_pattern, inner_iteration_pattern>
+      iterate_type;
+  typedef Kokkos::MDRangePolicy<ExecSpace, iterate_type,
+                                Kokkos::IndexType<iType>>
+      policy_type;
 
-  ViewCopy(const ViewTypeA& a_, const ViewTypeB& b_):a(a_),b(b_) {
+  ViewCopy(const ViewTypeA& a_, const ViewTypeB& b_) : a(a_), b(b_) {
     ExecSpace().fence();
     Kokkos::parallel_for("Kokkos::ViewCopy-2D",
-       policy_type({0,0},{a.extent(0),a.extent(1)}),*this);
+                         policy_type({0, 0}, {a.extent(0), a.extent(1)}),
+                         *this);
     ExecSpace().fence();
   }
 
   KOKKOS_INLINE_FUNCTION
-  void operator() (const iType& i0, const iType& i1) const {
-      a(i0,i1) = b(i0,i1);
+  void operator()(const iType& i0, const iType& i1) const {
+    a(i0, i1) = b(i0, i1);
   };
 };
 
-template<class ViewTypeA,class ViewTypeB, class Layout, class ExecSpace,typename iType>
-struct ViewCopy<ViewTypeA,ViewTypeB,Layout,ExecSpace,3,iType,KOKKOS_IMPL_COMPILING_LIBRARY> {
+template <class ViewTypeA, class ViewTypeB, class Layout, class ExecSpace,
+          typename iType>
+struct ViewCopy<ViewTypeA, ViewTypeB, Layout, ExecSpace, 3, iType,
+                KOKKOS_IMPL_COMPILING_LIBRARY> {
   ViewTypeA a;
   ViewTypeB b;
 
-  static const Kokkos::Iterate outer_iteration_pattern = Kokkos::layout_iterate_type_selector<Layout>::outer_iteration_pattern;
-  static const Kokkos::Iterate inner_iteration_pattern = Kokkos::layout_iterate_type_selector<Layout>::inner_iteration_pattern;
-  typedef Kokkos::Rank<3,outer_iteration_pattern,inner_iteration_pattern> iterate_type;
-  typedef Kokkos::MDRangePolicy<ExecSpace,iterate_type,Kokkos::IndexType<iType>> policy_type;
+  static const Kokkos::Iterate outer_iteration_pattern =
+      Kokkos::layout_iterate_type_selector<Layout>::outer_iteration_pattern;
+  static const Kokkos::Iterate inner_iteration_pattern =
+      Kokkos::layout_iterate_type_selector<Layout>::inner_iteration_pattern;
+  typedef Kokkos::Rank<3, outer_iteration_pattern, inner_iteration_pattern>
+      iterate_type;
+  typedef Kokkos::MDRangePolicy<ExecSpace, iterate_type,
+                                Kokkos::IndexType<iType>>
+      policy_type;
 
-  ViewCopy(const ViewTypeA& a_, const ViewTypeB& b_):a(a_),b(b_) {
+  ViewCopy(const ViewTypeA& a_, const ViewTypeB& b_) : a(a_), b(b_) {
     ExecSpace().fence();
-    Kokkos::parallel_for("Kokkos::ViewCopy-3D",
-       policy_type({0,0,0},{a.extent(0),a.extent(1),a.extent(2)}),*this);
+    Kokkos::parallel_for(
+        "Kokkos::ViewCopy-3D",
+        policy_type({0, 0, 0}, {a.extent(0), a.extent(1), a.extent(2)}), *this);
     ExecSpace().fence();
   }
 
   KOKKOS_INLINE_FUNCTION
-  void operator() (const iType& i0, const iType& i1, const iType& i2) const {
-      a(i0,i1,i2) = b(i0,i1,i2);
+  void operator()(const iType& i0, const iType& i1, const iType& i2) const {
+    a(i0, i1, i2) = b(i0, i1, i2);
   };
 };
 
-template<class ViewTypeA,class ViewTypeB, class Layout, class ExecSpace,typename iType>
-struct ViewCopy<ViewTypeA,ViewTypeB,Layout,ExecSpace,4,iType,KOKKOS_IMPL_COMPILING_LIBRARY> {
+template <class ViewTypeA, class ViewTypeB, class Layout, class ExecSpace,
+          typename iType>
+struct ViewCopy<ViewTypeA, ViewTypeB, Layout, ExecSpace, 4, iType,
+                KOKKOS_IMPL_COMPILING_LIBRARY> {
   ViewTypeA a;
   ViewTypeB b;
 
-  static const Kokkos::Iterate outer_iteration_pattern = Kokkos::layout_iterate_type_selector<Layout>::outer_iteration_pattern;
-  static const Kokkos::Iterate inner_iteration_pattern = Kokkos::layout_iterate_type_selector<Layout>::inner_iteration_pattern;
-  typedef Kokkos::Rank<4,outer_iteration_pattern,inner_iteration_pattern> iterate_type;
-  typedef Kokkos::MDRangePolicy<ExecSpace,iterate_type,Kokkos::IndexType<iType>> policy_type;
+  static const Kokkos::Iterate outer_iteration_pattern =
+      Kokkos::layout_iterate_type_selector<Layout>::outer_iteration_pattern;
+  static const Kokkos::Iterate inner_iteration_pattern =
+      Kokkos::layout_iterate_type_selector<Layout>::inner_iteration_pattern;
+  typedef Kokkos::Rank<4, outer_iteration_pattern, inner_iteration_pattern>
+      iterate_type;
+  typedef Kokkos::MDRangePolicy<ExecSpace, iterate_type,
+                                Kokkos::IndexType<iType>>
+      policy_type;
 
-  ViewCopy(const ViewTypeA& a_, const ViewTypeB& b_):a(a_),b(b_) {
+  ViewCopy(const ViewTypeA& a_, const ViewTypeB& b_) : a(a_), b(b_) {
     ExecSpace().fence();
     Kokkos::parallel_for("Kokkos::ViewCopy-4D",
-       policy_type({0,0,0,0},{a.extent(0),a.extent(1),a.extent(2),
-                              a.extent(3)}),*this);
+                         policy_type({0, 0, 0, 0}, {a.extent(0), a.extent(1),
+                                                    a.extent(2), a.extent(3)}),
+                         *this);
     ExecSpace().fence();
   }
 
   KOKKOS_INLINE_FUNCTION
-  void operator() (const iType& i0, const iType& i1, const iType& i2,
-                   const iType& i3) const {
-      a(i0,i1,i2,i3) = b(i0,i1,i2,i3);
+  void operator()(const iType& i0, const iType& i1, const iType& i2,
+                  const iType& i3) const {
+    a(i0, i1, i2, i3) = b(i0, i1, i2, i3);
   };
 };
 
-template<class ViewTypeA,class ViewTypeB, class Layout, class ExecSpace,typename iType>
-struct ViewCopy<ViewTypeA,ViewTypeB,Layout,ExecSpace,5,iType,KOKKOS_IMPL_COMPILING_LIBRARY> {
+template <class ViewTypeA, class ViewTypeB, class Layout, class ExecSpace,
+          typename iType>
+struct ViewCopy<ViewTypeA, ViewTypeB, Layout, ExecSpace, 5, iType,
+                KOKKOS_IMPL_COMPILING_LIBRARY> {
   ViewTypeA a;
   ViewTypeB b;
 
-  static const Kokkos::Iterate outer_iteration_pattern = Kokkos::layout_iterate_type_selector<Layout>::outer_iteration_pattern;
-  static const Kokkos::Iterate inner_iteration_pattern = Kokkos::layout_iterate_type_selector<Layout>::inner_iteration_pattern;
-  typedef Kokkos::Rank<5,outer_iteration_pattern,inner_iteration_pattern> iterate_type;
-  typedef Kokkos::MDRangePolicy<ExecSpace,iterate_type,Kokkos::IndexType<iType>> policy_type;
+  static const Kokkos::Iterate outer_iteration_pattern =
+      Kokkos::layout_iterate_type_selector<Layout>::outer_iteration_pattern;
+  static const Kokkos::Iterate inner_iteration_pattern =
+      Kokkos::layout_iterate_type_selector<Layout>::inner_iteration_pattern;
+  typedef Kokkos::Rank<5, outer_iteration_pattern, inner_iteration_pattern>
+      iterate_type;
+  typedef Kokkos::MDRangePolicy<ExecSpace, iterate_type,
+                                Kokkos::IndexType<iType>>
+      policy_type;
 
-  ViewCopy(const ViewTypeA& a_, const ViewTypeB& b_):a(a_),b(b_) {
+  ViewCopy(const ViewTypeA& a_, const ViewTypeB& b_) : a(a_), b(b_) {
     ExecSpace().fence();
-    Kokkos::parallel_for("Kokkos::ViewCopy-5D",
-       policy_type({0,0,0,0,0},{a.extent(0),a.extent(1),a.extent(2),
-                                a.extent(3),a.extent(4)}),*this);
+    Kokkos::parallel_for(
+        "Kokkos::ViewCopy-5D",
+        policy_type({0, 0, 0, 0, 0}, {a.extent(0), a.extent(1), a.extent(2),
+                                      a.extent(3), a.extent(4)}),
+        *this);
     ExecSpace().fence();
   }
 
   KOKKOS_INLINE_FUNCTION
-  void operator() (const iType& i0, const iType& i1, const iType& i2,
-                   const iType& i3, const iType& i4) const {
-      a(i0,i1,i2,i3,i4) = b(i0,i1,i2,i3,i4);
+  void operator()(const iType& i0, const iType& i1, const iType& i2,
+                  const iType& i3, const iType& i4) const {
+    a(i0, i1, i2, i3, i4) = b(i0, i1, i2, i3, i4);
   };
 };
 
-template<class ViewTypeA,class ViewTypeB, class Layout, class ExecSpace,typename iType>
-struct ViewCopy<ViewTypeA,ViewTypeB,Layout,ExecSpace,6,iType,KOKKOS_IMPL_COMPILING_LIBRARY> {
+template <class ViewTypeA, class ViewTypeB, class Layout, class ExecSpace,
+          typename iType>
+struct ViewCopy<ViewTypeA, ViewTypeB, Layout, ExecSpace, 6, iType,
+                KOKKOS_IMPL_COMPILING_LIBRARY> {
   ViewTypeA a;
   ViewTypeB b;
 
-  static const Kokkos::Iterate outer_iteration_pattern = Kokkos::layout_iterate_type_selector<Layout>::outer_iteration_pattern;
-  static const Kokkos::Iterate inner_iteration_pattern = Kokkos::layout_iterate_type_selector<Layout>::inner_iteration_pattern;
-  typedef Kokkos::Rank<6,outer_iteration_pattern,inner_iteration_pattern> iterate_type;
-  typedef Kokkos::MDRangePolicy<ExecSpace,iterate_type,Kokkos::IndexType<iType>> policy_type;
+  static const Kokkos::Iterate outer_iteration_pattern =
+      Kokkos::layout_iterate_type_selector<Layout>::outer_iteration_pattern;
+  static const Kokkos::Iterate inner_iteration_pattern =
+      Kokkos::layout_iterate_type_selector<Layout>::inner_iteration_pattern;
+  typedef Kokkos::Rank<6, outer_iteration_pattern, inner_iteration_pattern>
+      iterate_type;
+  typedef Kokkos::MDRangePolicy<ExecSpace, iterate_type,
+                                Kokkos::IndexType<iType>>
+      policy_type;
 
-  ViewCopy(const ViewTypeA& a_, const ViewTypeB& b_):a(a_),b(b_) {
+  ViewCopy(const ViewTypeA& a_, const ViewTypeB& b_) : a(a_), b(b_) {
     ExecSpace().fence();
     Kokkos::parallel_for("Kokkos::ViewCopy-6D",
-       policy_type({0,0,0,0,0,0},{a.extent(0),a.extent(1),a.extent(2),
-                                  a.extent(3),a.extent(4),a.extent(5)}),*this);
+                         policy_type({0, 0, 0, 0, 0, 0},
+                                     {a.extent(0), a.extent(1), a.extent(2),
+                                      a.extent(3), a.extent(4), a.extent(5)}),
+                         *this);
     ExecSpace().fence();
   }
 
   KOKKOS_INLINE_FUNCTION
-  void operator() (const iType& i0, const iType& i1, const iType& i2,
-                   const iType& i3, const iType& i4, const iType& i5) const {
-      a(i0,i1,i2,i3,i4,i5) = b(i0,i1,i2,i3,i4,i5);
+  void operator()(const iType& i0, const iType& i1, const iType& i2,
+                  const iType& i3, const iType& i4, const iType& i5) const {
+    a(i0, i1, i2, i3, i4, i5) = b(i0, i1, i2, i3, i4, i5);
   };
 };
 
-
-template<class ViewTypeA, class ViewTypeB, class Layout, class ExecSpace,typename iType>
-struct ViewCopy<ViewTypeA,ViewTypeB,Layout,ExecSpace,7,iType,KOKKOS_IMPL_COMPILING_LIBRARY> {
+template <class ViewTypeA, class ViewTypeB, class Layout, class ExecSpace,
+          typename iType>
+struct ViewCopy<ViewTypeA, ViewTypeB, Layout, ExecSpace, 7, iType,
+                KOKKOS_IMPL_COMPILING_LIBRARY> {
   ViewTypeA a;
   ViewTypeB b;
 
-  static const Kokkos::Iterate outer_iteration_pattern = Kokkos::layout_iterate_type_selector<Layout>::outer_iteration_pattern;
-  static const Kokkos::Iterate inner_iteration_pattern = Kokkos::layout_iterate_type_selector<Layout>::inner_iteration_pattern;
-  typedef Kokkos::Rank<6,outer_iteration_pattern,inner_iteration_pattern> iterate_type;
-  typedef Kokkos::MDRangePolicy<ExecSpace,iterate_type,Kokkos::IndexType<iType>> policy_type;
+  static const Kokkos::Iterate outer_iteration_pattern =
+      Kokkos::layout_iterate_type_selector<Layout>::outer_iteration_pattern;
+  static const Kokkos::Iterate inner_iteration_pattern =
+      Kokkos::layout_iterate_type_selector<Layout>::inner_iteration_pattern;
+  typedef Kokkos::Rank<6, outer_iteration_pattern, inner_iteration_pattern>
+      iterate_type;
+  typedef Kokkos::MDRangePolicy<ExecSpace, iterate_type,
+                                Kokkos::IndexType<iType>>
+      policy_type;
 
-  ViewCopy(const ViewTypeA& a_, const ViewTypeB& b_):a(a_),b(b_) {
+  ViewCopy(const ViewTypeA& a_, const ViewTypeB& b_) : a(a_), b(b_) {
     ExecSpace().fence();
     Kokkos::parallel_for("Kokkos::ViewCopy-7D",
-       policy_type({0,0,0,0,0,0},{a.extent(0),a.extent(1),a.extent(3),
-                                  a.extent(4),a.extent(5),a.extent(6)}),*this);
+                         policy_type({0, 0, 0, 0, 0, 0},
+                                     {a.extent(0), a.extent(1), a.extent(3),
+                                      a.extent(4), a.extent(5), a.extent(6)}),
+                         *this);
     ExecSpace().fence();
   }
 
   KOKKOS_INLINE_FUNCTION
-  void operator() (const iType& i0, const iType& i1, const iType& i3,
-                   const iType& i4, const iType& i5, const iType& i6) const {
-    for(iType i2=0; i2<iType(a.extent(2));i2++)
-      a(i0,i1,i2,i3,i4,i5,i6) = b(i0,i1,i2,i3,i4,i5,i6);
+  void operator()(const iType& i0, const iType& i1, const iType& i3,
+                  const iType& i4, const iType& i5, const iType& i6) const {
+    for (iType i2 = 0; i2 < iType(a.extent(2)); i2++)
+      a(i0, i1, i2, i3, i4, i5, i6) = b(i0, i1, i2, i3, i4, i5, i6);
   };
 };
 
-template<class ViewTypeA,class ViewTypeB, class Layout, class ExecSpace,typename iType>
-struct ViewCopy<ViewTypeA,ViewTypeB,Layout,ExecSpace,8,iType,KOKKOS_IMPL_COMPILING_LIBRARY> {
+template <class ViewTypeA, class ViewTypeB, class Layout, class ExecSpace,
+          typename iType>
+struct ViewCopy<ViewTypeA, ViewTypeB, Layout, ExecSpace, 8, iType,
+                KOKKOS_IMPL_COMPILING_LIBRARY> {
   ViewTypeA a;
   ViewTypeB b;
 
-  static const Kokkos::Iterate outer_iteration_pattern = Kokkos::layout_iterate_type_selector<Layout>::outer_iteration_pattern;
-  static const Kokkos::Iterate inner_iteration_pattern = Kokkos::layout_iterate_type_selector<Layout>::inner_iteration_pattern;
-  typedef Kokkos::Rank<6,outer_iteration_pattern,inner_iteration_pattern> iterate_type;
-  typedef Kokkos::MDRangePolicy<ExecSpace,iterate_type,Kokkos::IndexType<iType>> policy_type;
+  static const Kokkos::Iterate outer_iteration_pattern =
+      Kokkos::layout_iterate_type_selector<Layout>::outer_iteration_pattern;
+  static const Kokkos::Iterate inner_iteration_pattern =
+      Kokkos::layout_iterate_type_selector<Layout>::inner_iteration_pattern;
+  typedef Kokkos::Rank<6, outer_iteration_pattern, inner_iteration_pattern>
+      iterate_type;
+  typedef Kokkos::MDRangePolicy<ExecSpace, iterate_type,
+                                Kokkos::IndexType<iType>>
+      policy_type;
 
-  ViewCopy(const ViewTypeA& a_, const ViewTypeB& b_):a(a_),b(b_) {
+  ViewCopy(const ViewTypeA& a_, const ViewTypeB& b_) : a(a_), b(b_) {
     ExecSpace().fence();
     Kokkos::parallel_for("Kokkos::ViewCopy-8D",
-       policy_type({0,0,0,0,0,0},{a.extent(0),a.extent(1),a.extent(3),
-                                  a.extent(5),a.extent(6),a.extent(7)}),*this);
+                         policy_type({0, 0, 0, 0, 0, 0},
+                                     {a.extent(0), a.extent(1), a.extent(3),
+                                      a.extent(5), a.extent(6), a.extent(7)}),
+                         *this);
     ExecSpace().fence();
   }
 
   KOKKOS_INLINE_FUNCTION
-  void operator() (const iType& i0, const iType& i1, const iType& i3,
-                   const iType& i5, const iType& i6, const iType& i7) const {
-    for(iType i2=0; i2<iType(a.extent(2));i2++)
-    for(iType i4=0; i4<iType(a.extent(4));i4++)
-      a(i0,i1,i2,i3,i4,i5,i6,i7) = b(i0,i1,i2,i3,i4,i5,i6,i7);
+  void operator()(const iType& i0, const iType& i1, const iType& i3,
+                  const iType& i5, const iType& i6, const iType& i7) const {
+    for (iType i2 = 0; i2 < iType(a.extent(2)); i2++)
+      for (iType i4 = 0; i4 < iType(a.extent(4)); i4++)
+        a(i0, i1, i2, i3, i4, i5, i6, i7) = b(i0, i1, i2, i3, i4, i5, i6, i7);
   };
 };
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
 
-#include<impl/Kokkos_ViewFillCopyETIDecl.hpp>
+#include <impl/Kokkos_ViewFillCopyETIDecl.hpp>
 
 namespace Kokkos {
 namespace Impl {
 
-template<class DstType, class SrcType>
+template <class DstType, class SrcType>
 void view_copy(const DstType& dst, const SrcType& src) {
   typedef typename DstType::execution_space dst_execution_space;
   typedef typename SrcType::execution_space src_execution_space;
   typedef typename DstType::memory_space dst_memory_space;
   typedef typename SrcType::memory_space src_memory_space;
 
-  enum { DstExecCanAccessSrc =
-   Kokkos::Impl::SpaceAccessibility< dst_execution_space , src_memory_space >::accessible };
+  enum {
+    DstExecCanAccessSrc =
+        Kokkos::Impl::SpaceAccessibility<dst_execution_space,
+                                         src_memory_space>::accessible
+  };
 
-  enum { SrcExecCanAccessDst =
-   Kokkos::Impl::SpaceAccessibility< src_execution_space , dst_memory_space >::accessible };
+  enum {
+    SrcExecCanAccessDst =
+        Kokkos::Impl::SpaceAccessibility<src_execution_space,
+                                         dst_memory_space>::accessible
+  };
 
-  if( ! DstExecCanAccessSrc && ! SrcExecCanAccessDst) {
-    std::string message("Error: Kokkos::deep_copy with no available copy mechanism: ");
-    message += src.label(); message += " to ";
+  if (!DstExecCanAccessSrc && !SrcExecCanAccessDst) {
+    std::string message(
+        "Error: Kokkos::deep_copy with no available copy mechanism: ");
+    message += src.label();
+    message += " to ";
     message += dst.label();
     Kokkos::Impl::throw_runtime_exception(message);
   }
 
   // Figure out iteration order in case we need it
-  int64_t strides[DstType::Rank+1];
+  int64_t strides[DstType::Rank + 1];
   dst.stride(strides);
   Kokkos::Iterate iterate;
-  if        ( Kokkos::is_layouttiled<typename DstType::array_layout>::value ) {
-    iterate = Kokkos::layout_iterate_type_selector<typename DstType::array_layout>::outer_iteration_pattern;
-  } else if        ( std::is_same<typename DstType::array_layout,Kokkos::LayoutRight>::value ) {
+  if (Kokkos::is_layouttiled<typename DstType::array_layout>::value) {
+    iterate = Kokkos::layout_iterate_type_selector<
+        typename DstType::array_layout>::outer_iteration_pattern;
+  } else if (std::is_same<typename DstType::array_layout,
+                          Kokkos::LayoutRight>::value) {
     iterate = Kokkos::Iterate::Right;
-  } else if ( std::is_same<typename DstType::array_layout,Kokkos::LayoutLeft>::value ) {
+  } else if (std::is_same<typename DstType::array_layout,
+                          Kokkos::LayoutLeft>::value) {
     iterate = Kokkos::Iterate::Left;
-  } else if ( std::is_same<typename DstType::array_layout,Kokkos::LayoutStride>::value ) {
-    if( strides[0] > strides[DstType::Rank-1] )
+  } else if (std::is_same<typename DstType::array_layout,
+                          Kokkos::LayoutStride>::value) {
+    if (strides[0] > strides[DstType::Rank - 1])
       iterate = Kokkos::Iterate::Right;
     else
       iterate = Kokkos::Iterate::Left;
   } else {
-    if( std::is_same<typename DstType::execution_space::array_layout, Kokkos::LayoutRight>::value )
+    if (std::is_same<typename DstType::execution_space::array_layout,
+                     Kokkos::LayoutRight>::value)
       iterate = Kokkos::Iterate::Right;
     else
       iterate = Kokkos::Iterate::Left;
   }
 
-  if( (dst.span() >= size_t(std::numeric_limits<int>::max())) ||
-      (src.span() >= size_t(std::numeric_limits<int>::max())) ){
-    if(DstExecCanAccessSrc) {
-      if(iterate == Kokkos::Iterate::Right)
-        Kokkos::Impl::ViewCopy< typename DstType::uniform_runtime_nomemspace_type, typename SrcType::uniform_runtime_const_nomemspace_type, Kokkos::LayoutRight, dst_execution_space,
-                                DstType::Rank, int64_t >( dst , src );
+  if ((dst.span() >= size_t(std::numeric_limits<int>::max())) ||
+      (src.span() >= size_t(std::numeric_limits<int>::max()))) {
+    if (DstExecCanAccessSrc) {
+      if (iterate == Kokkos::Iterate::Right)
+        Kokkos::Impl::ViewCopy<
+            typename DstType::uniform_runtime_nomemspace_type,
+            typename SrcType::uniform_runtime_const_nomemspace_type,
+            Kokkos::LayoutRight, dst_execution_space, DstType::Rank, int64_t>(
+            dst, src);
       else
-        Kokkos::Impl::ViewCopy< typename DstType::uniform_runtime_nomemspace_type, typename SrcType::uniform_runtime_const_nomemspace_type, Kokkos::LayoutLeft, dst_execution_space,
-                                DstType::Rank, int64_t >( dst , src );
+        Kokkos::Impl::ViewCopy<
+            typename DstType::uniform_runtime_nomemspace_type,
+            typename SrcType::uniform_runtime_const_nomemspace_type,
+            Kokkos::LayoutLeft, dst_execution_space, DstType::Rank, int64_t>(
+            dst, src);
     } else {
-      if(iterate == Kokkos::Iterate::Right)
-        Kokkos::Impl::ViewCopy< typename DstType::uniform_runtime_nomemspace_type, typename SrcType::uniform_runtime_const_nomemspace_type, Kokkos::LayoutRight, src_execution_space,
-                                DstType::Rank, int64_t >( dst , src );
+      if (iterate == Kokkos::Iterate::Right)
+        Kokkos::Impl::ViewCopy<
+            typename DstType::uniform_runtime_nomemspace_type,
+            typename SrcType::uniform_runtime_const_nomemspace_type,
+            Kokkos::LayoutRight, src_execution_space, DstType::Rank, int64_t>(
+            dst, src);
       else
-        Kokkos::Impl::ViewCopy< typename DstType::uniform_runtime_nomemspace_type, typename SrcType::uniform_runtime_const_nomemspace_type, Kokkos::LayoutLeft, src_execution_space,
-                                DstType::Rank, int64_t >( dst , src );
+        Kokkos::Impl::ViewCopy<
+            typename DstType::uniform_runtime_nomemspace_type,
+            typename SrcType::uniform_runtime_const_nomemspace_type,
+            Kokkos::LayoutLeft, src_execution_space, DstType::Rank, int64_t>(
+            dst, src);
     }
   } else {
-    if(DstExecCanAccessSrc) {
-      if(iterate == Kokkos::Iterate::Right)
-        Kokkos::Impl::ViewCopy< typename DstType::uniform_runtime_nomemspace_type, typename SrcType::uniform_runtime_const_nomemspace_type, Kokkos::LayoutRight, dst_execution_space,
-                                DstType::Rank, int >( dst , src );
+    if (DstExecCanAccessSrc) {
+      if (iterate == Kokkos::Iterate::Right)
+        Kokkos::Impl::ViewCopy<
+            typename DstType::uniform_runtime_nomemspace_type,
+            typename SrcType::uniform_runtime_const_nomemspace_type,
+            Kokkos::LayoutRight, dst_execution_space, DstType::Rank, int>(dst,
+                                                                          src);
       else
-        Kokkos::Impl::ViewCopy< typename DstType::uniform_runtime_nomemspace_type, typename SrcType::uniform_runtime_const_nomemspace_type, Kokkos::LayoutLeft, dst_execution_space,
-                                DstType::Rank, int >( dst , src );
+        Kokkos::Impl::ViewCopy<
+            typename DstType::uniform_runtime_nomemspace_type,
+            typename SrcType::uniform_runtime_const_nomemspace_type,
+            Kokkos::LayoutLeft, dst_execution_space, DstType::Rank, int>(dst,
+                                                                         src);
     } else {
-      if(iterate == Kokkos::Iterate::Right)
-        Kokkos::Impl::ViewCopy< typename DstType::uniform_runtime_nomemspace_type, typename SrcType::uniform_runtime_const_nomemspace_type, Kokkos::LayoutRight, src_execution_space,
-                                DstType::Rank, int >( dst , src );
+      if (iterate == Kokkos::Iterate::Right)
+        Kokkos::Impl::ViewCopy<
+            typename DstType::uniform_runtime_nomemspace_type,
+            typename SrcType::uniform_runtime_const_nomemspace_type,
+            Kokkos::LayoutRight, src_execution_space, DstType::Rank, int>(dst,
+                                                                          src);
       else
-        Kokkos::Impl::ViewCopy< typename DstType::uniform_runtime_nomemspace_type, typename SrcType::uniform_runtime_const_nomemspace_type, Kokkos::LayoutLeft, src_execution_space,
-                                DstType::Rank, int >( dst , src );
+        Kokkos::Impl::ViewCopy<
+            typename DstType::uniform_runtime_nomemspace_type,
+            typename SrcType::uniform_runtime_const_nomemspace_type,
+            Kokkos::LayoutLeft, src_execution_space, DstType::Rank, int>(dst,
+                                                                         src);
     }
-
   }
 }
 
-template<class DstType, class SrcType, int Rank, class ... Args>
+template <class DstType, class SrcType, int Rank, class... Args>
 struct CommonSubview;
 
-template<class DstType, class SrcType, class Arg0, class ... Args>
-struct CommonSubview<DstType,SrcType,1,Arg0,Args...> {
-  typedef typename Kokkos::Subview<DstType,Arg0> dst_subview_type;
-  typedef typename Kokkos::Subview<SrcType,Arg0> src_subview_type;
+template <class DstType, class SrcType, class Arg0, class... Args>
+struct CommonSubview<DstType, SrcType, 1, Arg0, Args...> {
+  typedef typename Kokkos::Subview<DstType, Arg0> dst_subview_type;
+  typedef typename Kokkos::Subview<SrcType, Arg0> src_subview_type;
   dst_subview_type dst_sub;
   src_subview_type src_sub;
-  CommonSubview(const DstType& dst, const SrcType& src, const Arg0& arg0, Args... ):
-    dst_sub(dst,arg0),src_sub(src,arg0) {}
+  CommonSubview(const DstType& dst, const SrcType& src, const Arg0& arg0,
+                Args...)
+      : dst_sub(dst, arg0), src_sub(src, arg0) {}
 };
 
-template<class DstType, class SrcType, class Arg0, class Arg1, class ... Args>
-struct CommonSubview<DstType,SrcType,2,Arg0,Arg1,Args...> {
-  typedef typename Kokkos::Subview<DstType,Arg0,Arg1> dst_subview_type;
-  typedef typename Kokkos::Subview<SrcType,Arg0,Arg1> src_subview_type;
+template <class DstType, class SrcType, class Arg0, class Arg1, class... Args>
+struct CommonSubview<DstType, SrcType, 2, Arg0, Arg1, Args...> {
+  typedef typename Kokkos::Subview<DstType, Arg0, Arg1> dst_subview_type;
+  typedef typename Kokkos::Subview<SrcType, Arg0, Arg1> src_subview_type;
   dst_subview_type dst_sub;
   src_subview_type src_sub;
-  CommonSubview(const DstType& dst, const SrcType& src, const Arg0& arg0, const Arg1& arg1, Args... ):
-    dst_sub(dst,arg0,arg1),src_sub(src,arg0,arg1) {}
+  CommonSubview(const DstType& dst, const SrcType& src, const Arg0& arg0,
+                const Arg1& arg1, Args...)
+      : dst_sub(dst, arg0, arg1), src_sub(src, arg0, arg1) {}
 };
 
-template<class DstType, class SrcType, class Arg0, class Arg1, class Arg2, class ... Args>
-struct CommonSubview<DstType,SrcType,3,Arg0,Arg1,Arg2,Args...> {
-  typedef typename Kokkos::Subview<DstType,Arg0,Arg1,Arg2> dst_subview_type;
-  typedef typename Kokkos::Subview<SrcType,Arg0,Arg1,Arg2> src_subview_type;
+template <class DstType, class SrcType, class Arg0, class Arg1, class Arg2,
+          class... Args>
+struct CommonSubview<DstType, SrcType, 3, Arg0, Arg1, Arg2, Args...> {
+  typedef typename Kokkos::Subview<DstType, Arg0, Arg1, Arg2> dst_subview_type;
+  typedef typename Kokkos::Subview<SrcType, Arg0, Arg1, Arg2> src_subview_type;
   dst_subview_type dst_sub;
   src_subview_type src_sub;
-  CommonSubview(const DstType& dst, const SrcType& src, const Arg0& arg0, const Arg1& arg1,
-                const Arg2& arg2, Args... ):
-    dst_sub(dst,arg0,arg1,arg2),src_sub(src,arg0,arg1,arg2) {}
+  CommonSubview(const DstType& dst, const SrcType& src, const Arg0& arg0,
+                const Arg1& arg1, const Arg2& arg2, Args...)
+      : dst_sub(dst, arg0, arg1, arg2), src_sub(src, arg0, arg1, arg2) {}
 };
 
-template<class DstType, class SrcType, class Arg0, class Arg1, class Arg2, class Arg3,
-         class ... Args>
-struct CommonSubview<DstType,SrcType,4,Arg0,Arg1,Arg2,Arg3,Args...> {
-  typedef typename Kokkos::Subview<DstType,Arg0,Arg1,Arg2,Arg3> dst_subview_type;
-  typedef typename Kokkos::Subview<SrcType,Arg0,Arg1,Arg2,Arg3> src_subview_type;
+template <class DstType, class SrcType, class Arg0, class Arg1, class Arg2,
+          class Arg3, class... Args>
+struct CommonSubview<DstType, SrcType, 4, Arg0, Arg1, Arg2, Arg3, Args...> {
+  typedef typename Kokkos::Subview<DstType, Arg0, Arg1, Arg2, Arg3>
+      dst_subview_type;
+  typedef typename Kokkos::Subview<SrcType, Arg0, Arg1, Arg2, Arg3>
+      src_subview_type;
   dst_subview_type dst_sub;
   src_subview_type src_sub;
-  CommonSubview(const DstType& dst, const SrcType& src, const Arg0& arg0, const Arg1& arg1,
-                const Arg2& arg2, const Arg3& arg3,
-                const Args ...):
-    dst_sub(dst,arg0,arg1,arg2,arg3),src_sub(src,arg0,arg1,arg2,arg3) {}
+  CommonSubview(const DstType& dst, const SrcType& src, const Arg0& arg0,
+                const Arg1& arg1, const Arg2& arg2, const Arg3& arg3,
+                const Args...)
+      : dst_sub(dst, arg0, arg1, arg2, arg3),
+        src_sub(src, arg0, arg1, arg2, arg3) {}
 };
 
-template<class DstType, class SrcType, class Arg0, class Arg1, class Arg2, class Arg3,
-         class Arg4, class ... Args>
-struct CommonSubview<DstType,SrcType,5,Arg0,Arg1,Arg2,Arg3,Arg4,Args...> {
-  typedef typename Kokkos::Subview<DstType,Arg0,Arg1,Arg2,Arg3,Arg4> dst_subview_type;
-  typedef typename Kokkos::Subview<SrcType,Arg0,Arg1,Arg2,Arg3,Arg4> src_subview_type;
+template <class DstType, class SrcType, class Arg0, class Arg1, class Arg2,
+          class Arg3, class Arg4, class... Args>
+struct CommonSubview<DstType, SrcType, 5, Arg0, Arg1, Arg2, Arg3, Arg4,
+                     Args...> {
+  typedef typename Kokkos::Subview<DstType, Arg0, Arg1, Arg2, Arg3, Arg4>
+      dst_subview_type;
+  typedef typename Kokkos::Subview<SrcType, Arg0, Arg1, Arg2, Arg3, Arg4>
+      src_subview_type;
   dst_subview_type dst_sub;
   src_subview_type src_sub;
-  CommonSubview(const DstType& dst, const SrcType& src, const Arg0& arg0, const Arg1& arg1,
-                const Arg2& arg2, const Arg3& arg3, const Arg4& arg4,
-                const Args ...):
-    dst_sub(dst,arg0,arg1,arg2,arg3,arg4),src_sub(src,arg0,arg1,arg2,arg3,arg4) {}
+  CommonSubview(const DstType& dst, const SrcType& src, const Arg0& arg0,
+                const Arg1& arg1, const Arg2& arg2, const Arg3& arg3,
+                const Arg4& arg4, const Args...)
+      : dst_sub(dst, arg0, arg1, arg2, arg3, arg4),
+        src_sub(src, arg0, arg1, arg2, arg3, arg4) {}
 };
 
-template<class DstType, class SrcType, class Arg0, class Arg1, class Arg2, class Arg3,
-         class Arg4, class Arg5, class ... Args>
-struct CommonSubview<DstType,SrcType,6,Arg0,Arg1,Arg2,Arg3,Arg4,Arg5,Args...> {
-  typedef typename Kokkos::Subview<DstType,Arg0,Arg1,Arg2,Arg3,Arg4,Arg5> dst_subview_type;
-  typedef typename Kokkos::Subview<SrcType,Arg0,Arg1,Arg2,Arg3,Arg4,Arg5> src_subview_type;
+template <class DstType, class SrcType, class Arg0, class Arg1, class Arg2,
+          class Arg3, class Arg4, class Arg5, class... Args>
+struct CommonSubview<DstType, SrcType, 6, Arg0, Arg1, Arg2, Arg3, Arg4, Arg5,
+                     Args...> {
+  typedef typename Kokkos::Subview<DstType, Arg0, Arg1, Arg2, Arg3, Arg4, Arg5>
+      dst_subview_type;
+  typedef typename Kokkos::Subview<SrcType, Arg0, Arg1, Arg2, Arg3, Arg4, Arg5>
+      src_subview_type;
   dst_subview_type dst_sub;
   src_subview_type src_sub;
-  CommonSubview(const DstType& dst, const SrcType& src, const Arg0& arg0, const Arg1& arg1,
-                const Arg2& arg2, const Arg3& arg3, const Arg4& arg4, const Arg5& arg5,
-                const Args ...):
-    dst_sub(dst,arg0,arg1,arg2,arg3,arg4,arg5),src_sub(src,arg0,arg1,arg2,arg3,arg4,arg5) {}
+  CommonSubview(const DstType& dst, const SrcType& src, const Arg0& arg0,
+                const Arg1& arg1, const Arg2& arg2, const Arg3& arg3,
+                const Arg4& arg4, const Arg5& arg5, const Args...)
+      : dst_sub(dst, arg0, arg1, arg2, arg3, arg4, arg5),
+        src_sub(src, arg0, arg1, arg2, arg3, arg4, arg5) {}
 };
 
-template<class DstType, class SrcType, class Arg0, class Arg1, class Arg2, class Arg3,
-         class Arg4, class Arg5, class Arg6, class ...Args>
-struct CommonSubview<DstType,SrcType,7,Arg0,Arg1,Arg2,Arg3,Arg4,Arg5,Arg6,Args...> {
-  typedef typename Kokkos::Subview<DstType,Arg0,Arg1,Arg2,Arg3,Arg4,Arg5,Arg6> dst_subview_type;
-  typedef typename Kokkos::Subview<SrcType,Arg0,Arg1,Arg2,Arg3,Arg4,Arg5,Arg6> src_subview_type;
+template <class DstType, class SrcType, class Arg0, class Arg1, class Arg2,
+          class Arg3, class Arg4, class Arg5, class Arg6, class... Args>
+struct CommonSubview<DstType, SrcType, 7, Arg0, Arg1, Arg2, Arg3, Arg4, Arg5,
+                     Arg6, Args...> {
+  typedef typename Kokkos::Subview<DstType, Arg0, Arg1, Arg2, Arg3, Arg4, Arg5,
+                                   Arg6>
+      dst_subview_type;
+  typedef typename Kokkos::Subview<SrcType, Arg0, Arg1, Arg2, Arg3, Arg4, Arg5,
+                                   Arg6>
+      src_subview_type;
   dst_subview_type dst_sub;
   src_subview_type src_sub;
-  CommonSubview(const DstType& dst, const SrcType& src, const Arg0& arg0, const Arg1& arg1,
-                const Arg2& arg2, const Arg3& arg3, const Arg4& arg4, const Arg5& arg5,
-                const Arg6& arg6, Args...):
-    dst_sub(dst,arg0,arg1,arg2,arg3,arg4,arg5,arg6),src_sub(src,arg0,arg1,arg2,arg3,arg4,arg5,arg6) {}
+  CommonSubview(const DstType& dst, const SrcType& src, const Arg0& arg0,
+                const Arg1& arg1, const Arg2& arg2, const Arg3& arg3,
+                const Arg4& arg4, const Arg5& arg5, const Arg6& arg6, Args...)
+      : dst_sub(dst, arg0, arg1, arg2, arg3, arg4, arg5, arg6),
+        src_sub(src, arg0, arg1, arg2, arg3, arg4, arg5, arg6) {}
 };
 
-template<class DstType, class SrcType, class Arg0, class Arg1, class Arg2, class Arg3,
-         class Arg4, class Arg5, class Arg6, class Arg7>
-struct CommonSubview<DstType,SrcType,8,Arg0,Arg1,Arg2,Arg3,Arg4,Arg5,Arg6,Arg7> {
-  typedef typename Kokkos::Subview<DstType,Arg0,Arg1,Arg2,Arg3,Arg4,Arg5,Arg6,Arg7> dst_subview_type;
-  typedef typename Kokkos::Subview<SrcType,Arg0,Arg1,Arg2,Arg3,Arg4,Arg5,Arg6,Arg7> src_subview_type;
+template <class DstType, class SrcType, class Arg0, class Arg1, class Arg2,
+          class Arg3, class Arg4, class Arg5, class Arg6, class Arg7>
+struct CommonSubview<DstType, SrcType, 8, Arg0, Arg1, Arg2, Arg3, Arg4, Arg5,
+                     Arg6, Arg7> {
+  typedef typename Kokkos::Subview<DstType, Arg0, Arg1, Arg2, Arg3, Arg4, Arg5,
+                                   Arg6, Arg7>
+      dst_subview_type;
+  typedef typename Kokkos::Subview<SrcType, Arg0, Arg1, Arg2, Arg3, Arg4, Arg5,
+                                   Arg6, Arg7>
+      src_subview_type;
   dst_subview_type dst_sub;
   src_subview_type src_sub;
-  CommonSubview(const DstType& dst, const SrcType& src, const Arg0& arg0, const Arg1& arg1,
-                const Arg2& arg2, const Arg3& arg3, const Arg4& arg4, const Arg5& arg5,
-                const Arg6& arg6, const Arg7& arg7):
-    dst_sub(dst,arg0,arg1,arg2,arg3,arg4,arg5,arg6,arg7),src_sub(src,arg0,arg1,arg2,arg3,arg4,arg5,arg6,arg7) {}
+  CommonSubview(const DstType& dst, const SrcType& src, const Arg0& arg0,
+                const Arg1& arg1, const Arg2& arg2, const Arg3& arg3,
+                const Arg4& arg4, const Arg5& arg5, const Arg6& arg6,
+                const Arg7& arg7)
+      : dst_sub(dst, arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7),
+        src_sub(src, arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7) {}
 };
 
-
-template<class DstType, class SrcType, class ExecSpace = typename DstType::execution_space, int Rank = DstType::Rank>
+template <class DstType, class SrcType,
+          class ExecSpace = typename DstType::execution_space,
+          int Rank        = DstType::Rank>
 struct ViewRemap;
 
-template<class DstType, class SrcType, class ExecSpace>
-struct ViewRemap<DstType,SrcType,ExecSpace,1> {
-  typedef Kokkos::pair<int64_t,int64_t> p_type;
+template <class DstType, class SrcType, class ExecSpace>
+struct ViewRemap<DstType, SrcType, ExecSpace, 1> {
+  typedef Kokkos::pair<int64_t, int64_t> p_type;
 
   ViewRemap(const DstType& dst, const SrcType& src) {
-    if(dst.extent(0) == src.extent(0)) {
-      view_copy(dst,src);
+    if (dst.extent(0) == src.extent(0)) {
+      view_copy(dst, src);
     } else {
-      p_type ext0(0,std::min(dst.extent(0),src.extent(0)));
-      typedef CommonSubview<DstType,SrcType,1,p_type> sv_adapter_type;
-      sv_adapter_type common_subview(dst,src,ext0);
-      view_copy(common_subview.dst_sub,common_subview.src_sub);
+      p_type ext0(0, std::min(dst.extent(0), src.extent(0)));
+      typedef CommonSubview<DstType, SrcType, 1, p_type> sv_adapter_type;
+      sv_adapter_type common_subview(dst, src, ext0);
+      view_copy(common_subview.dst_sub, common_subview.src_sub);
     }
   }
 };
 
-template<class DstType, class SrcType, class ExecSpace>
-struct ViewRemap<DstType,SrcType,ExecSpace,2> {
-  typedef Kokkos::pair<int64_t,int64_t> p_type;
+template <class DstType, class SrcType, class ExecSpace>
+struct ViewRemap<DstType, SrcType, ExecSpace, 2> {
+  typedef Kokkos::pair<int64_t, int64_t> p_type;
 
   ViewRemap(const DstType& dst, const SrcType& src) {
-    if(dst.extent(0) == src.extent(0)) {
-      if(dst.extent(1) == src.extent(1)) {
-        view_copy(dst,src);
+    if (dst.extent(0) == src.extent(0)) {
+      if (dst.extent(1) == src.extent(1)) {
+        view_copy(dst, src);
       } else {
-        p_type ext1(0,std::min(dst.extent(1),src.extent(1)));
-        typedef CommonSubview<DstType,SrcType,2,Kokkos::Impl::ALL_t,p_type> sv_adapter_type;
-        sv_adapter_type common_subview(dst,src,Kokkos::ALL,ext1);
-        view_copy(common_subview.dst_sub,common_subview.src_sub);
+        p_type ext1(0, std::min(dst.extent(1), src.extent(1)));
+        typedef CommonSubview<DstType, SrcType, 2, Kokkos::Impl::ALL_t, p_type>
+            sv_adapter_type;
+        sv_adapter_type common_subview(dst, src, Kokkos::ALL, ext1);
+        view_copy(common_subview.dst_sub, common_subview.src_sub);
       }
     } else {
-      if(dst.extent(1) == src.extent(1)) {
-        p_type ext0(0,std::min(dst.extent(0),src.extent(0)));
-        typedef CommonSubview<DstType,SrcType,2,p_type,Kokkos::Impl::ALL_t> sv_adapter_type;
-        sv_adapter_type common_subview(dst,src,ext0,Kokkos::ALL);
-        view_copy(common_subview.dst_sub,common_subview.src_sub);
+      if (dst.extent(1) == src.extent(1)) {
+        p_type ext0(0, std::min(dst.extent(0), src.extent(0)));
+        typedef CommonSubview<DstType, SrcType, 2, p_type, Kokkos::Impl::ALL_t>
+            sv_adapter_type;
+        sv_adapter_type common_subview(dst, src, ext0, Kokkos::ALL);
+        view_copy(common_subview.dst_sub, common_subview.src_sub);
       } else {
-        p_type ext0(0,std::min(dst.extent(0),src.extent(0)));
-        p_type ext1(0,std::min(dst.extent(1),src.extent(1)));
-        typedef CommonSubview<DstType,SrcType,2,p_type,p_type> sv_adapter_type;
-        sv_adapter_type common_subview(dst,src,ext0,ext1);
-        view_copy(common_subview.dst_sub,common_subview.src_sub);
+        p_type ext0(0, std::min(dst.extent(0), src.extent(0)));
+        p_type ext1(0, std::min(dst.extent(1), src.extent(1)));
+        typedef CommonSubview<DstType, SrcType, 2, p_type, p_type>
+            sv_adapter_type;
+        sv_adapter_type common_subview(dst, src, ext0, ext1);
+        view_copy(common_subview.dst_sub, common_subview.src_sub);
       }
     }
   }
 };
 
-template<class DstType, class SrcType, class ExecSpace>
-struct ViewRemap<DstType,SrcType,ExecSpace,3> {
-  typedef Kokkos::pair<int64_t,int64_t> p_type;
+template <class DstType, class SrcType, class ExecSpace>
+struct ViewRemap<DstType, SrcType, ExecSpace, 3> {
+  typedef Kokkos::pair<int64_t, int64_t> p_type;
 
   ViewRemap(const DstType& dst, const SrcType& src) {
-    if(dst.extent(0) == src.extent(0)) {
-      if(dst.extent(2) == src.extent(2)) {
-        p_type ext1(0,std::min(dst.extent(1),src.extent(1)));
-        typedef CommonSubview<DstType,SrcType,3,Kokkos::Impl::ALL_t,p_type,Kokkos::Impl::ALL_t> sv_adapter_type;
-        sv_adapter_type common_subview(dst,src,Kokkos::ALL,ext1,Kokkos::ALL);
-        view_copy(common_subview.dst_sub,common_subview.src_sub);
-      } else {
-        p_type ext1(0,std::min(dst.extent(1),src.extent(1)));
-        p_type ext2(0,std::min(dst.extent(2),src.extent(2)));
-        typedef CommonSubview<DstType,SrcType,3,Kokkos::Impl::ALL_t,p_type,p_type> sv_adapter_type;
-        sv_adapter_type common_subview(dst,src,Kokkos::ALL,ext1,ext2);
-        view_copy(common_subview.dst_sub,common_subview.src_sub);
-      }
-    } else {
-      if(dst.extent(2) == src.extent(2)) {
-        p_type ext0(0,std::min(dst.extent(0),src.extent(0)));
-        p_type ext1(0,std::min(dst.extent(1),src.extent(1)));
-        typedef CommonSubview<DstType,SrcType,3,p_type,p_type,Kokkos::Impl::ALL_t> sv_adapter_type;
-        sv_adapter_type common_subview(dst,src,ext0,ext1,Kokkos::ALL);
-        view_copy(common_subview.dst_sub,common_subview.src_sub);
-      } else {
-        p_type ext0(0,std::min(dst.extent(0),src.extent(0)));
-        p_type ext1(0,std::min(dst.extent(1),src.extent(1)));
-        p_type ext2(0,std::min(dst.extent(2),src.extent(2)));
-        typedef CommonSubview<DstType,SrcType,3,p_type,p_type,p_type> sv_adapter_type;
-        sv_adapter_type common_subview(dst,src,ext0,ext1,ext2);
-        view_copy(common_subview.dst_sub,common_subview.src_sub);
-      }
-    }
-  }
-};
-
-template<class DstType, class SrcType, class ExecSpace>
-struct ViewRemap<DstType,SrcType,ExecSpace,4> {
-  typedef Kokkos::pair<int64_t,int64_t> p_type;
-
-  ViewRemap(const DstType& dst, const SrcType& src) {
-    if(dst.extent(0) == src.extent(0)) {
-      if(dst.extent(3) == src.extent(3)) {
-        p_type ext1(0,std::min(dst.extent(1),src.extent(1)));
-        p_type ext2(0,std::min(dst.extent(2),src.extent(2)));
-        typedef CommonSubview<DstType,SrcType,4,Kokkos::Impl::ALL_t,
-                              p_type,p_type,
-                              Kokkos::Impl::ALL_t> sv_adapter_type;
-        sv_adapter_type common_subview(dst,src,Kokkos::ALL,
-                                       ext1,ext2,
+    if (dst.extent(0) == src.extent(0)) {
+      if (dst.extent(2) == src.extent(2)) {
+        p_type ext1(0, std::min(dst.extent(1), src.extent(1)));
+        typedef CommonSubview<DstType, SrcType, 3, Kokkos::Impl::ALL_t, p_type,
+                              Kokkos::Impl::ALL_t>
+            sv_adapter_type;
+        sv_adapter_type common_subview(dst, src, Kokkos::ALL, ext1,
                                        Kokkos::ALL);
-        view_copy(common_subview.dst_sub,common_subview.src_sub);
+        view_copy(common_subview.dst_sub, common_subview.src_sub);
       } else {
-        p_type ext1(0,std::min(dst.extent(1),src.extent(1)));
-        p_type ext2(0,std::min(dst.extent(2),src.extent(2)));
-        p_type ext3(0,std::min(dst.extent(3),src.extent(3)));
-        typedef CommonSubview<DstType,SrcType,4,Kokkos::Impl::ALL_t,
-                              p_type,p_type,
-                              p_type> sv_adapter_type;
-        sv_adapter_type common_subview(dst,src,Kokkos::ALL,
-                                       ext1,ext2,
-                                       ext3);
-        view_copy(common_subview.dst_sub,common_subview.src_sub);
+        p_type ext1(0, std::min(dst.extent(1), src.extent(1)));
+        p_type ext2(0, std::min(dst.extent(2), src.extent(2)));
+        typedef CommonSubview<DstType, SrcType, 3, Kokkos::Impl::ALL_t, p_type,
+                              p_type>
+            sv_adapter_type;
+        sv_adapter_type common_subview(dst, src, Kokkos::ALL, ext1, ext2);
+        view_copy(common_subview.dst_sub, common_subview.src_sub);
       }
     } else {
-      if(dst.extent(7) == src.extent(7)) {
-        p_type ext0(0,std::min(dst.extent(0),src.extent(0)));
-        p_type ext1(0,std::min(dst.extent(1),src.extent(1)));
-        p_type ext2(0,std::min(dst.extent(2),src.extent(2)));
-        typedef CommonSubview<DstType,SrcType,4,p_type,
-                              p_type,p_type,
-                              Kokkos::Impl::ALL_t> sv_adapter_type;
-        sv_adapter_type common_subview(dst,src,ext0,
-                                       ext1,ext2,
-                                       Kokkos::ALL);
-        view_copy(common_subview.dst_sub,common_subview.src_sub);
+      if (dst.extent(2) == src.extent(2)) {
+        p_type ext0(0, std::min(dst.extent(0), src.extent(0)));
+        p_type ext1(0, std::min(dst.extent(1), src.extent(1)));
+        typedef CommonSubview<DstType, SrcType, 3, p_type, p_type,
+                              Kokkos::Impl::ALL_t>
+            sv_adapter_type;
+        sv_adapter_type common_subview(dst, src, ext0, ext1, Kokkos::ALL);
+        view_copy(common_subview.dst_sub, common_subview.src_sub);
       } else {
-        p_type ext0(0,std::min(dst.extent(0),src.extent(0)));
-        p_type ext1(0,std::min(dst.extent(1),src.extent(1)));
-        p_type ext2(0,std::min(dst.extent(2),src.extent(2)));
-        p_type ext3(0,std::min(dst.extent(3),src.extent(3)));
-        typedef CommonSubview<DstType,SrcType,4,p_type,
-                              p_type,p_type,
-                              p_type> sv_adapter_type;
-        sv_adapter_type common_subview(dst,src,ext0,
-                                       ext1,ext2,
-                                       ext3);
-        view_copy(common_subview.dst_sub,common_subview.src_sub);
+        p_type ext0(0, std::min(dst.extent(0), src.extent(0)));
+        p_type ext1(0, std::min(dst.extent(1), src.extent(1)));
+        p_type ext2(0, std::min(dst.extent(2), src.extent(2)));
+        typedef CommonSubview<DstType, SrcType, 3, p_type, p_type, p_type>
+            sv_adapter_type;
+        sv_adapter_type common_subview(dst, src, ext0, ext1, ext2);
+        view_copy(common_subview.dst_sub, common_subview.src_sub);
       }
     }
   }
 };
 
-template<class DstType, class SrcType, class ExecSpace>
-struct ViewRemap<DstType,SrcType,ExecSpace,5> {
-  typedef Kokkos::pair<int64_t,int64_t> p_type;
+template <class DstType, class SrcType, class ExecSpace>
+struct ViewRemap<DstType, SrcType, ExecSpace, 4> {
+  typedef Kokkos::pair<int64_t, int64_t> p_type;
 
   ViewRemap(const DstType& dst, const SrcType& src) {
-    if(dst.extent(0) == src.extent(0)) {
-      if(dst.extent(4) == src.extent(4)) {
-        p_type ext1(0,std::min(dst.extent(1),src.extent(1)));
-        p_type ext2(0,std::min(dst.extent(2),src.extent(2)));
-        p_type ext3(0,std::min(dst.extent(3),src.extent(3)));
-        typedef CommonSubview<DstType,SrcType,5,Kokkos::Impl::ALL_t,
-                              p_type,p_type,p_type,
-                              Kokkos::Impl::ALL_t> sv_adapter_type;
-        sv_adapter_type common_subview(dst,src,Kokkos::ALL,
-                                       ext1,ext2,ext3,
+    if (dst.extent(0) == src.extent(0)) {
+      if (dst.extent(3) == src.extent(3)) {
+        p_type ext1(0, std::min(dst.extent(1), src.extent(1)));
+        p_type ext2(0, std::min(dst.extent(2), src.extent(2)));
+        typedef CommonSubview<DstType, SrcType, 4, Kokkos::Impl::ALL_t, p_type,
+                              p_type, Kokkos::Impl::ALL_t>
+            sv_adapter_type;
+        sv_adapter_type common_subview(dst, src, Kokkos::ALL, ext1, ext2,
                                        Kokkos::ALL);
-        view_copy(common_subview.dst_sub,common_subview.src_sub);
+        view_copy(common_subview.dst_sub, common_subview.src_sub);
       } else {
-        p_type ext1(0,std::min(dst.extent(1),src.extent(1)));
-        p_type ext2(0,std::min(dst.extent(2),src.extent(2)));
-        p_type ext3(0,std::min(dst.extent(3),src.extent(3)));
-        p_type ext4(0,std::min(dst.extent(4),src.extent(4)));
-        typedef CommonSubview<DstType,SrcType,5,Kokkos::Impl::ALL_t,
-                              p_type,p_type,p_type,
-                              p_type> sv_adapter_type;
-        sv_adapter_type common_subview(dst,src,Kokkos::ALL,
-                                       ext1,ext2,ext3,
+        p_type ext1(0, std::min(dst.extent(1), src.extent(1)));
+        p_type ext2(0, std::min(dst.extent(2), src.extent(2)));
+        p_type ext3(0, std::min(dst.extent(3), src.extent(3)));
+        typedef CommonSubview<DstType, SrcType, 4, Kokkos::Impl::ALL_t, p_type,
+                              p_type, p_type>
+            sv_adapter_type;
+        sv_adapter_type common_subview(dst, src, Kokkos::ALL, ext1, ext2, ext3);
+        view_copy(common_subview.dst_sub, common_subview.src_sub);
+      }
+    } else {
+      if (dst.extent(7) == src.extent(7)) {
+        p_type ext0(0, std::min(dst.extent(0), src.extent(0)));
+        p_type ext1(0, std::min(dst.extent(1), src.extent(1)));
+        p_type ext2(0, std::min(dst.extent(2), src.extent(2)));
+        typedef CommonSubview<DstType, SrcType, 4, p_type, p_type, p_type,
+                              Kokkos::Impl::ALL_t>
+            sv_adapter_type;
+        sv_adapter_type common_subview(dst, src, ext0, ext1, ext2, Kokkos::ALL);
+        view_copy(common_subview.dst_sub, common_subview.src_sub);
+      } else {
+        p_type ext0(0, std::min(dst.extent(0), src.extent(0)));
+        p_type ext1(0, std::min(dst.extent(1), src.extent(1)));
+        p_type ext2(0, std::min(dst.extent(2), src.extent(2)));
+        p_type ext3(0, std::min(dst.extent(3), src.extent(3)));
+        typedef CommonSubview<DstType, SrcType, 4, p_type, p_type, p_type,
+                              p_type>
+            sv_adapter_type;
+        sv_adapter_type common_subview(dst, src, ext0, ext1, ext2, ext3);
+        view_copy(common_subview.dst_sub, common_subview.src_sub);
+      }
+    }
+  }
+};
+
+template <class DstType, class SrcType, class ExecSpace>
+struct ViewRemap<DstType, SrcType, ExecSpace, 5> {
+  typedef Kokkos::pair<int64_t, int64_t> p_type;
+
+  ViewRemap(const DstType& dst, const SrcType& src) {
+    if (dst.extent(0) == src.extent(0)) {
+      if (dst.extent(4) == src.extent(4)) {
+        p_type ext1(0, std::min(dst.extent(1), src.extent(1)));
+        p_type ext2(0, std::min(dst.extent(2), src.extent(2)));
+        p_type ext3(0, std::min(dst.extent(3), src.extent(3)));
+        typedef CommonSubview<DstType, SrcType, 5, Kokkos::Impl::ALL_t, p_type,
+                              p_type, p_type, Kokkos::Impl::ALL_t>
+            sv_adapter_type;
+        sv_adapter_type common_subview(dst, src, Kokkos::ALL, ext1, ext2, ext3,
+                                       Kokkos::ALL);
+        view_copy(common_subview.dst_sub, common_subview.src_sub);
+      } else {
+        p_type ext1(0, std::min(dst.extent(1), src.extent(1)));
+        p_type ext2(0, std::min(dst.extent(2), src.extent(2)));
+        p_type ext3(0, std::min(dst.extent(3), src.extent(3)));
+        p_type ext4(0, std::min(dst.extent(4), src.extent(4)));
+        typedef CommonSubview<DstType, SrcType, 5, Kokkos::Impl::ALL_t, p_type,
+                              p_type, p_type, p_type>
+            sv_adapter_type;
+        sv_adapter_type common_subview(dst, src, Kokkos::ALL, ext1, ext2, ext3,
                                        ext4);
-        view_copy(common_subview.dst_sub,common_subview.src_sub);
+        view_copy(common_subview.dst_sub, common_subview.src_sub);
       }
     } else {
-      if(dst.extent(4) == src.extent(4)) {
-        p_type ext0(0,std::min(dst.extent(0),src.extent(0)));
-        p_type ext1(0,std::min(dst.extent(1),src.extent(1)));
-        p_type ext2(0,std::min(dst.extent(2),src.extent(2)));
-        p_type ext3(0,std::min(dst.extent(3),src.extent(3)));
-        typedef CommonSubview<DstType,SrcType,5,p_type,
-                              p_type,p_type,p_type,
-                              Kokkos::Impl::ALL_t> sv_adapter_type;
-        sv_adapter_type common_subview(dst,src,ext0,
-                                       ext1,ext2,ext3,
+      if (dst.extent(4) == src.extent(4)) {
+        p_type ext0(0, std::min(dst.extent(0), src.extent(0)));
+        p_type ext1(0, std::min(dst.extent(1), src.extent(1)));
+        p_type ext2(0, std::min(dst.extent(2), src.extent(2)));
+        p_type ext3(0, std::min(dst.extent(3), src.extent(3)));
+        typedef CommonSubview<DstType, SrcType, 5, p_type, p_type, p_type,
+                              p_type, Kokkos::Impl::ALL_t>
+            sv_adapter_type;
+        sv_adapter_type common_subview(dst, src, ext0, ext1, ext2, ext3,
                                        Kokkos::ALL);
-        view_copy(common_subview.dst_sub,common_subview.src_sub);
+        view_copy(common_subview.dst_sub, common_subview.src_sub);
       } else {
-        p_type ext0(0,std::min(dst.extent(0),src.extent(0)));
-        p_type ext1(0,std::min(dst.extent(1),src.extent(1)));
-        p_type ext2(0,std::min(dst.extent(2),src.extent(2)));
-        p_type ext3(0,std::min(dst.extent(3),src.extent(3)));
-        p_type ext4(0,std::min(dst.extent(4),src.extent(4)));
-        typedef CommonSubview<DstType,SrcType,5,p_type,
-                              p_type,p_type,p_type,
-                              p_type> sv_adapter_type;
-        sv_adapter_type common_subview(dst,src,ext0,
-                                       ext1,ext2,ext3,
-                                       ext4);
-        view_copy(common_subview.dst_sub,common_subview.src_sub);
+        p_type ext0(0, std::min(dst.extent(0), src.extent(0)));
+        p_type ext1(0, std::min(dst.extent(1), src.extent(1)));
+        p_type ext2(0, std::min(dst.extent(2), src.extent(2)));
+        p_type ext3(0, std::min(dst.extent(3), src.extent(3)));
+        p_type ext4(0, std::min(dst.extent(4), src.extent(4)));
+        typedef CommonSubview<DstType, SrcType, 5, p_type, p_type, p_type,
+                              p_type, p_type>
+            sv_adapter_type;
+        sv_adapter_type common_subview(dst, src, ext0, ext1, ext2, ext3, ext4);
+        view_copy(common_subview.dst_sub, common_subview.src_sub);
       }
     }
   }
 };
-template<class DstType, class SrcType, class ExecSpace>
-struct ViewRemap<DstType,SrcType,ExecSpace,6> {
-  typedef Kokkos::pair<int64_t,int64_t> p_type;
+template <class DstType, class SrcType, class ExecSpace>
+struct ViewRemap<DstType, SrcType, ExecSpace, 6> {
+  typedef Kokkos::pair<int64_t, int64_t> p_type;
 
   ViewRemap(const DstType& dst, const SrcType& src) {
-    if(dst.extent(0) == src.extent(0)) {
-      if(dst.extent(5) == src.extent(5)) {
-        p_type ext1(0,std::min(dst.extent(1),src.extent(1)));
-        p_type ext2(0,std::min(dst.extent(2),src.extent(2)));
-        p_type ext3(0,std::min(dst.extent(3),src.extent(3)));
-        p_type ext4(0,std::min(dst.extent(4),src.extent(4)));
-        typedef CommonSubview<DstType,SrcType,6,Kokkos::Impl::ALL_t,
-                              p_type,p_type,p_type,p_type,
-                              Kokkos::Impl::ALL_t> sv_adapter_type;
-        sv_adapter_type common_subview(dst,src,Kokkos::ALL,
-                                       ext1,ext2,ext3,ext4,
-                                       Kokkos::ALL);
-        view_copy(common_subview.dst_sub,common_subview.src_sub);
+    if (dst.extent(0) == src.extent(0)) {
+      if (dst.extent(5) == src.extent(5)) {
+        p_type ext1(0, std::min(dst.extent(1), src.extent(1)));
+        p_type ext2(0, std::min(dst.extent(2), src.extent(2)));
+        p_type ext3(0, std::min(dst.extent(3), src.extent(3)));
+        p_type ext4(0, std::min(dst.extent(4), src.extent(4)));
+        typedef CommonSubview<DstType, SrcType, 6, Kokkos::Impl::ALL_t, p_type,
+                              p_type, p_type, p_type, Kokkos::Impl::ALL_t>
+            sv_adapter_type;
+        sv_adapter_type common_subview(dst, src, Kokkos::ALL, ext1, ext2, ext3,
+                                       ext4, Kokkos::ALL);
+        view_copy(common_subview.dst_sub, common_subview.src_sub);
       } else {
-        p_type ext1(0,std::min(dst.extent(1),src.extent(1)));
-        p_type ext2(0,std::min(dst.extent(2),src.extent(2)));
-        p_type ext3(0,std::min(dst.extent(3),src.extent(3)));
-        p_type ext4(0,std::min(dst.extent(4),src.extent(4)));
-        p_type ext5(0,std::min(dst.extent(5),src.extent(5)));
-        typedef CommonSubview<DstType,SrcType,6,Kokkos::Impl::ALL_t,
-                              p_type,p_type,p_type,p_type,
-                              p_type> sv_adapter_type;
-        sv_adapter_type common_subview(dst,src,Kokkos::ALL,
-                                       ext1,ext2,ext3,ext4,
+        p_type ext1(0, std::min(dst.extent(1), src.extent(1)));
+        p_type ext2(0, std::min(dst.extent(2), src.extent(2)));
+        p_type ext3(0, std::min(dst.extent(3), src.extent(3)));
+        p_type ext4(0, std::min(dst.extent(4), src.extent(4)));
+        p_type ext5(0, std::min(dst.extent(5), src.extent(5)));
+        typedef CommonSubview<DstType, SrcType, 6, Kokkos::Impl::ALL_t, p_type,
+                              p_type, p_type, p_type, p_type>
+            sv_adapter_type;
+        sv_adapter_type common_subview(dst, src, Kokkos::ALL, ext1, ext2, ext3,
+                                       ext4, ext5);
+        view_copy(common_subview.dst_sub, common_subview.src_sub);
+      }
+    } else {
+      if (dst.extent(5) == src.extent(5)) {
+        p_type ext0(0, std::min(dst.extent(0), src.extent(0)));
+        p_type ext1(0, std::min(dst.extent(1), src.extent(1)));
+        p_type ext2(0, std::min(dst.extent(2), src.extent(2)));
+        p_type ext3(0, std::min(dst.extent(3), src.extent(3)));
+        p_type ext4(0, std::min(dst.extent(4), src.extent(4)));
+
+        typedef CommonSubview<DstType, SrcType, 6, p_type, p_type, p_type,
+                              p_type, p_type, Kokkos::Impl::ALL_t>
+            sv_adapter_type;
+        sv_adapter_type common_subview(dst, src, ext0, ext1, ext2, ext3, ext4,
+                                       Kokkos::ALL);
+        view_copy(common_subview.dst_sub, common_subview.src_sub);
+      } else {
+        p_type ext0(0, std::min(dst.extent(0), src.extent(0)));
+        p_type ext1(0, std::min(dst.extent(1), src.extent(1)));
+        p_type ext2(0, std::min(dst.extent(2), src.extent(2)));
+        p_type ext3(0, std::min(dst.extent(3), src.extent(3)));
+        p_type ext4(0, std::min(dst.extent(4), src.extent(4)));
+        p_type ext5(0, std::min(dst.extent(5), src.extent(5)));
+
+        typedef CommonSubview<DstType, SrcType, 6, p_type, p_type, p_type,
+                              p_type, p_type, p_type>
+            sv_adapter_type;
+        sv_adapter_type common_subview(dst, src, ext0, ext1, ext2, ext3, ext4,
                                        ext5);
-        view_copy(common_subview.dst_sub,common_subview.src_sub);
-      }
-    } else {
-      if(dst.extent(5) == src.extent(5)) {
-        p_type ext0(0,std::min(dst.extent(0),src.extent(0)));
-        p_type ext1(0,std::min(dst.extent(1),src.extent(1)));
-        p_type ext2(0,std::min(dst.extent(2),src.extent(2)));
-        p_type ext3(0,std::min(dst.extent(3),src.extent(3)));
-        p_type ext4(0,std::min(dst.extent(4),src.extent(4)));
-
-        typedef CommonSubview<DstType,SrcType,6,p_type,
-                              p_type,p_type,p_type,p_type,
-                              Kokkos::Impl::ALL_t> sv_adapter_type;
-        sv_adapter_type common_subview(dst,src,ext0,
-                                       ext1,ext2,ext3,ext4,
-                                       Kokkos::ALL);
-        view_copy(common_subview.dst_sub,common_subview.src_sub);
-      } else {
-        p_type ext0(0,std::min(dst.extent(0),src.extent(0)));
-        p_type ext1(0,std::min(dst.extent(1),src.extent(1)));
-        p_type ext2(0,std::min(dst.extent(2),src.extent(2)));
-        p_type ext3(0,std::min(dst.extent(3),src.extent(3)));
-        p_type ext4(0,std::min(dst.extent(4),src.extent(4)));
-        p_type ext5(0,std::min(dst.extent(5),src.extent(5)));
-
-        typedef CommonSubview<DstType,SrcType,6,p_type,
-                              p_type,p_type,p_type,p_type,
-                              p_type> sv_adapter_type;
-        sv_adapter_type common_subview(dst,src,ext0,
-                                       ext1,ext2,ext3,ext4,
-                                       ext5);
-        view_copy(common_subview.dst_sub,common_subview.src_sub);
+        view_copy(common_subview.dst_sub, common_subview.src_sub);
       }
     }
   }
 };
 
-template<class DstType, class SrcType, class ExecSpace>
-struct ViewRemap<DstType,SrcType,ExecSpace,7> {
-  typedef Kokkos::pair<int64_t,int64_t> p_type;
+template <class DstType, class SrcType, class ExecSpace>
+struct ViewRemap<DstType, SrcType, ExecSpace, 7> {
+  typedef Kokkos::pair<int64_t, int64_t> p_type;
 
   ViewRemap(const DstType& dst, const SrcType& src) {
-    if(dst.extent(0) == src.extent(0)) {
-      if(dst.extent(6) == src.extent(6)) {
-        p_type ext1(0,std::min(dst.extent(1),src.extent(1)));
-        p_type ext2(0,std::min(dst.extent(2),src.extent(2)));
-        p_type ext3(0,std::min(dst.extent(3),src.extent(3)));
-        p_type ext4(0,std::min(dst.extent(4),src.extent(4)));
-        p_type ext5(0,std::min(dst.extent(5),src.extent(5)));
-        typedef CommonSubview<DstType,SrcType,7,Kokkos::Impl::ALL_t,
-                              p_type,p_type,p_type,p_type,p_type,
-                              Kokkos::Impl::ALL_t> sv_adapter_type;
-        sv_adapter_type common_subview(dst,src,Kokkos::ALL,
-                                       ext1,ext2,ext3,ext4,ext5,
-                                       Kokkos::ALL);
-        view_copy(common_subview.dst_sub,common_subview.src_sub);
+    if (dst.extent(0) == src.extent(0)) {
+      if (dst.extent(6) == src.extent(6)) {
+        p_type ext1(0, std::min(dst.extent(1), src.extent(1)));
+        p_type ext2(0, std::min(dst.extent(2), src.extent(2)));
+        p_type ext3(0, std::min(dst.extent(3), src.extent(3)));
+        p_type ext4(0, std::min(dst.extent(4), src.extent(4)));
+        p_type ext5(0, std::min(dst.extent(5), src.extent(5)));
+        typedef CommonSubview<DstType, SrcType, 7, Kokkos::Impl::ALL_t, p_type,
+                              p_type, p_type, p_type, p_type,
+                              Kokkos::Impl::ALL_t>
+            sv_adapter_type;
+        sv_adapter_type common_subview(dst, src, Kokkos::ALL, ext1, ext2, ext3,
+                                       ext4, ext5, Kokkos::ALL);
+        view_copy(common_subview.dst_sub, common_subview.src_sub);
       } else {
-        p_type ext1(0,std::min(dst.extent(1),src.extent(1)));
-        p_type ext2(0,std::min(dst.extent(2),src.extent(2)));
-        p_type ext3(0,std::min(dst.extent(3),src.extent(3)));
-        p_type ext4(0,std::min(dst.extent(4),src.extent(4)));
-        p_type ext5(0,std::min(dst.extent(5),src.extent(5)));
-        p_type ext6(0,std::min(dst.extent(6),src.extent(6)));
-        typedef CommonSubview<DstType,SrcType,7,Kokkos::Impl::ALL_t,
-                              p_type,p_type,p_type,p_type,p_type,
-                              p_type> sv_adapter_type;
-        sv_adapter_type common_subview(dst,src,Kokkos::ALL,
-                                       ext1,ext2,ext3,ext4,ext5,
-                                       ext6);
-        view_copy(common_subview.dst_sub,common_subview.src_sub);
+        p_type ext1(0, std::min(dst.extent(1), src.extent(1)));
+        p_type ext2(0, std::min(dst.extent(2), src.extent(2)));
+        p_type ext3(0, std::min(dst.extent(3), src.extent(3)));
+        p_type ext4(0, std::min(dst.extent(4), src.extent(4)));
+        p_type ext5(0, std::min(dst.extent(5), src.extent(5)));
+        p_type ext6(0, std::min(dst.extent(6), src.extent(6)));
+        typedef CommonSubview<DstType, SrcType, 7, Kokkos::Impl::ALL_t, p_type,
+                              p_type, p_type, p_type, p_type, p_type>
+            sv_adapter_type;
+        sv_adapter_type common_subview(dst, src, Kokkos::ALL, ext1, ext2, ext3,
+                                       ext4, ext5, ext6);
+        view_copy(common_subview.dst_sub, common_subview.src_sub);
       }
     } else {
-      if(dst.extent(6) == src.extent(6)) {
-        p_type ext0(0,std::min(dst.extent(0),src.extent(0)));
-        p_type ext1(0,std::min(dst.extent(1),src.extent(1)));
-        p_type ext2(0,std::min(dst.extent(2),src.extent(2)));
-        p_type ext3(0,std::min(dst.extent(3),src.extent(3)));
-        p_type ext4(0,std::min(dst.extent(4),src.extent(4)));
-        p_type ext5(0,std::min(dst.extent(5),src.extent(5)));
-        typedef CommonSubview<DstType,SrcType,7,p_type,
-                              p_type,p_type,p_type,p_type,p_type,
-                              Kokkos::Impl::ALL_t> sv_adapter_type;
-        sv_adapter_type common_subview(dst,src,ext0,
-                                       ext1,ext2,ext3,ext4,ext5,
-                                       Kokkos::ALL);
-        view_copy(common_subview.dst_sub,common_subview.src_sub);
+      if (dst.extent(6) == src.extent(6)) {
+        p_type ext0(0, std::min(dst.extent(0), src.extent(0)));
+        p_type ext1(0, std::min(dst.extent(1), src.extent(1)));
+        p_type ext2(0, std::min(dst.extent(2), src.extent(2)));
+        p_type ext3(0, std::min(dst.extent(3), src.extent(3)));
+        p_type ext4(0, std::min(dst.extent(4), src.extent(4)));
+        p_type ext5(0, std::min(dst.extent(5), src.extent(5)));
+        typedef CommonSubview<DstType, SrcType, 7, p_type, p_type, p_type,
+                              p_type, p_type, p_type, Kokkos::Impl::ALL_t>
+            sv_adapter_type;
+        sv_adapter_type common_subview(dst, src, ext0, ext1, ext2, ext3, ext4,
+                                       ext5, Kokkos::ALL);
+        view_copy(common_subview.dst_sub, common_subview.src_sub);
       } else {
-        p_type ext0(0,std::min(dst.extent(0),src.extent(0)));
-        p_type ext1(0,std::min(dst.extent(1),src.extent(1)));
-        p_type ext2(0,std::min(dst.extent(2),src.extent(2)));
-        p_type ext3(0,std::min(dst.extent(3),src.extent(3)));
-        p_type ext4(0,std::min(dst.extent(4),src.extent(4)));
-        p_type ext5(0,std::min(dst.extent(5),src.extent(5)));
-        p_type ext6(0,std::min(dst.extent(6),src.extent(6)));
-        typedef CommonSubview<DstType,SrcType,7,p_type,
-                              p_type,p_type,p_type,p_type,p_type,
-                              p_type> sv_adapter_type;
-        sv_adapter_type common_subview(dst,src,ext0,
-                                       ext1,ext2,ext3,ext4,ext5,
-                                       ext6);
-        view_copy(common_subview.dst_sub,common_subview.src_sub);
+        p_type ext0(0, std::min(dst.extent(0), src.extent(0)));
+        p_type ext1(0, std::min(dst.extent(1), src.extent(1)));
+        p_type ext2(0, std::min(dst.extent(2), src.extent(2)));
+        p_type ext3(0, std::min(dst.extent(3), src.extent(3)));
+        p_type ext4(0, std::min(dst.extent(4), src.extent(4)));
+        p_type ext5(0, std::min(dst.extent(5), src.extent(5)));
+        p_type ext6(0, std::min(dst.extent(6), src.extent(6)));
+        typedef CommonSubview<DstType, SrcType, 7, p_type, p_type, p_type,
+                              p_type, p_type, p_type, p_type>
+            sv_adapter_type;
+        sv_adapter_type common_subview(dst, src, ext0, ext1, ext2, ext3, ext4,
+                                       ext5, ext6);
+        view_copy(common_subview.dst_sub, common_subview.src_sub);
       }
     }
   }
 };
 
-template<class DstType, class SrcType, class ExecSpace>
-struct ViewRemap<DstType,SrcType,ExecSpace,8> {
-  typedef Kokkos::pair<int64_t,int64_t> p_type;
+template <class DstType, class SrcType, class ExecSpace>
+struct ViewRemap<DstType, SrcType, ExecSpace, 8> {
+  typedef Kokkos::pair<int64_t, int64_t> p_type;
 
   ViewRemap(const DstType& dst, const SrcType& src) {
-    if(dst.extent(0) == src.extent(0)) {
-      if(dst.extent(7) == src.extent(7)) {
-        p_type ext1(0,std::min(dst.extent(1),src.extent(1)));
-        p_type ext2(0,std::min(dst.extent(2),src.extent(2)));
-        p_type ext3(0,std::min(dst.extent(3),src.extent(3)));
-        p_type ext4(0,std::min(dst.extent(4),src.extent(4)));
-        p_type ext5(0,std::min(dst.extent(5),src.extent(5)));
-        p_type ext6(0,std::min(dst.extent(6),src.extent(6)));
-        typedef CommonSubview<DstType,SrcType,8,Kokkos::Impl::ALL_t,
-                              p_type,p_type,p_type,p_type,p_type,p_type,
-                              Kokkos::Impl::ALL_t> sv_adapter_type;
-        sv_adapter_type common_subview(dst,src,Kokkos::ALL,
-                                       ext1,ext2,ext3,ext4,ext5,ext6,
-                                       Kokkos::ALL);
-        view_copy(common_subview.dst_sub,common_subview.src_sub);
+    if (dst.extent(0) == src.extent(0)) {
+      if (dst.extent(7) == src.extent(7)) {
+        p_type ext1(0, std::min(dst.extent(1), src.extent(1)));
+        p_type ext2(0, std::min(dst.extent(2), src.extent(2)));
+        p_type ext3(0, std::min(dst.extent(3), src.extent(3)));
+        p_type ext4(0, std::min(dst.extent(4), src.extent(4)));
+        p_type ext5(0, std::min(dst.extent(5), src.extent(5)));
+        p_type ext6(0, std::min(dst.extent(6), src.extent(6)));
+        typedef CommonSubview<DstType, SrcType, 8, Kokkos::Impl::ALL_t, p_type,
+                              p_type, p_type, p_type, p_type, p_type,
+                              Kokkos::Impl::ALL_t>
+            sv_adapter_type;
+        sv_adapter_type common_subview(dst, src, Kokkos::ALL, ext1, ext2, ext3,
+                                       ext4, ext5, ext6, Kokkos::ALL);
+        view_copy(common_subview.dst_sub, common_subview.src_sub);
       } else {
-        p_type ext1(0,std::min(dst.extent(1),src.extent(1)));
-        p_type ext2(0,std::min(dst.extent(2),src.extent(2)));
-        p_type ext3(0,std::min(dst.extent(3),src.extent(3)));
-        p_type ext4(0,std::min(dst.extent(4),src.extent(4)));
-        p_type ext5(0,std::min(dst.extent(5),src.extent(5)));
-        p_type ext6(0,std::min(dst.extent(6),src.extent(6)));
-        p_type ext7(0,std::min(dst.extent(7),src.extent(7)));
-        typedef CommonSubview<DstType,SrcType,8,Kokkos::Impl::ALL_t,
-                              p_type,p_type,p_type,p_type,p_type,p_type,
-                              p_type> sv_adapter_type;
-        sv_adapter_type common_subview(dst,src,Kokkos::ALL,
-                                       ext1,ext2,ext3,ext4,ext5,ext6,
-                                       ext7);
-        view_copy(common_subview.dst_sub,common_subview.src_sub);
+        p_type ext1(0, std::min(dst.extent(1), src.extent(1)));
+        p_type ext2(0, std::min(dst.extent(2), src.extent(2)));
+        p_type ext3(0, std::min(dst.extent(3), src.extent(3)));
+        p_type ext4(0, std::min(dst.extent(4), src.extent(4)));
+        p_type ext5(0, std::min(dst.extent(5), src.extent(5)));
+        p_type ext6(0, std::min(dst.extent(6), src.extent(6)));
+        p_type ext7(0, std::min(dst.extent(7), src.extent(7)));
+        typedef CommonSubview<DstType, SrcType, 8, Kokkos::Impl::ALL_t, p_type,
+                              p_type, p_type, p_type, p_type, p_type, p_type>
+            sv_adapter_type;
+        sv_adapter_type common_subview(dst, src, Kokkos::ALL, ext1, ext2, ext3,
+                                       ext4, ext5, ext6, ext7);
+        view_copy(common_subview.dst_sub, common_subview.src_sub);
       }
     } else {
-      if(dst.extent(7) == src.extent(7)) {
-        p_type ext0(0,std::min(dst.extent(0),src.extent(0)));
-        p_type ext1(0,std::min(dst.extent(1),src.extent(1)));
-        p_type ext2(0,std::min(dst.extent(2),src.extent(2)));
-        p_type ext3(0,std::min(dst.extent(3),src.extent(3)));
-        p_type ext4(0,std::min(dst.extent(4),src.extent(4)));
-        p_type ext5(0,std::min(dst.extent(5),src.extent(5)));
-        p_type ext6(0,std::min(dst.extent(6),src.extent(6)));
-        typedef CommonSubview<DstType,SrcType,8,p_type,
-                              p_type,p_type,p_type,p_type,p_type,p_type,
-                              Kokkos::Impl::ALL_t> sv_adapter_type;
-        sv_adapter_type common_subview(dst,src,ext0,
-                                       ext1,ext2,ext3,ext4,ext5,ext6,
-                                       Kokkos::ALL);
-        view_copy(common_subview.dst_sub,common_subview.src_sub);
+      if (dst.extent(7) == src.extent(7)) {
+        p_type ext0(0, std::min(dst.extent(0), src.extent(0)));
+        p_type ext1(0, std::min(dst.extent(1), src.extent(1)));
+        p_type ext2(0, std::min(dst.extent(2), src.extent(2)));
+        p_type ext3(0, std::min(dst.extent(3), src.extent(3)));
+        p_type ext4(0, std::min(dst.extent(4), src.extent(4)));
+        p_type ext5(0, std::min(dst.extent(5), src.extent(5)));
+        p_type ext6(0, std::min(dst.extent(6), src.extent(6)));
+        typedef CommonSubview<DstType, SrcType, 8, p_type, p_type, p_type,
+                              p_type, p_type, p_type, p_type,
+                              Kokkos::Impl::ALL_t>
+            sv_adapter_type;
+        sv_adapter_type common_subview(dst, src, ext0, ext1, ext2, ext3, ext4,
+                                       ext5, ext6, Kokkos::ALL);
+        view_copy(common_subview.dst_sub, common_subview.src_sub);
       } else {
-        p_type ext0(0,std::min(dst.extent(0),src.extent(0)));
-        p_type ext1(0,std::min(dst.extent(1),src.extent(1)));
-        p_type ext2(0,std::min(dst.extent(2),src.extent(2)));
-        p_type ext3(0,std::min(dst.extent(3),src.extent(3)));
-        p_type ext4(0,std::min(dst.extent(4),src.extent(4)));
-        p_type ext5(0,std::min(dst.extent(5),src.extent(5)));
-        p_type ext6(0,std::min(dst.extent(6),src.extent(6)));
-        p_type ext7(0,std::min(dst.extent(7),src.extent(7)));
-        typedef CommonSubview<DstType,SrcType,8,p_type,
-                              p_type,p_type,p_type,p_type,p_type,p_type,
-                              p_type> sv_adapter_type;
-        sv_adapter_type common_subview(dst,src,ext0,
-                                       ext1,ext2,ext3,ext4,ext5,ext6,
-                                       ext7);
-        view_copy(common_subview.dst_sub,common_subview.src_sub);
+        p_type ext0(0, std::min(dst.extent(0), src.extent(0)));
+        p_type ext1(0, std::min(dst.extent(1), src.extent(1)));
+        p_type ext2(0, std::min(dst.extent(2), src.extent(2)));
+        p_type ext3(0, std::min(dst.extent(3), src.extent(3)));
+        p_type ext4(0, std::min(dst.extent(4), src.extent(4)));
+        p_type ext5(0, std::min(dst.extent(5), src.extent(5)));
+        p_type ext6(0, std::min(dst.extent(6), src.extent(6)));
+        p_type ext7(0, std::min(dst.extent(7), src.extent(7)));
+        typedef CommonSubview<DstType, SrcType, 8, p_type, p_type, p_type,
+                              p_type, p_type, p_type, p_type, p_type>
+            sv_adapter_type;
+        sv_adapter_type common_subview(dst, src, ext0, ext1, ext2, ext3, ext4,
+                                       ext5, ext6, ext7);
+        view_copy(common_subview.dst_sub, common_subview.src_sub);
       }
     }
   }
 };
 
-}
+}  // namespace Impl
 
 /** \brief  Deep copy a value from Host memory into a view.  */
-template< class DT , class ... DP >
-inline
-void deep_copy
-  ( const View<DT,DP...> & dst
-  , typename ViewTraits<DT,DP...>::const_value_type & value
-  , typename std::enable_if<
-    std::is_same< typename ViewTraits<DT,DP...>::specialize , void >::value
-    >::type * = 0 )
-{
-  typedef View<DT,DP...> ViewType;
-  if(dst.data() == NULL ) {
+template <class DT, class... DP>
+inline void deep_copy(
+    const View<DT, DP...>& dst,
+    typename ViewTraits<DT, DP...>::const_value_type& value,
+    typename std::enable_if<std::is_same<
+        typename ViewTraits<DT, DP...>::specialize, void>::value>::type* = 0) {
+  typedef View<DT, DP...> ViewType;
+
+#if defined(KOKKOS_ENABLE_PROFILING)
+  if (Kokkos::Profiling::profileLibraryLoaded()) {
+    Kokkos::Profiling::beginDeepCopy(
+        Kokkos::Profiling::SpaceHandle(
+            typename ViewType::memory_space().name()),
+        dst.label(), dst.data(),
+        Kokkos::Profiling::SpaceHandle(Kokkos::HostSpace().name()), "Scalar",
+        &value, dst.span() * sizeof(typename ViewType::value_type));
+  }
+#endif
+
+  if (dst.data() == NULL) {
     Kokkos::fence();
+#if defined(KOKKOS_ENABLE_PROFILING)
+    if (Kokkos::Profiling::profileLibraryLoaded()) {
+      Kokkos::Profiling::endDeepCopy();
+    }
+#endif
     return;
   }
 
   Kokkos::fence();
-  static_assert(
-    std::is_same< typename ViewType::non_const_value_type ,
-                  typename ViewType::value_type >::value
-    , "deep_copy requires non-const type" );
+  static_assert(std::is_same<typename ViewType::non_const_value_type,
+                             typename ViewType::value_type>::value,
+                "deep_copy requires non-const type");
 
-  // If contigous we can simply do a 1D flat loop
-  if(dst.span_is_contiguous()) {
-    typedef Kokkos::View<typename ViewType::value_type*,Kokkos::LayoutRight,
+  // If contiguous we can simply do a 1D flat loop
+  if (dst.span_is_contiguous()) {
+    typedef Kokkos::View<
+        typename ViewType::value_type*, Kokkos::LayoutRight,
         Kokkos::Device<typename ViewType::execution_space,
-                       typename std::conditional<ViewType::Rank==0,
-                                      typename ViewType::memory_space,Kokkos::AnonymousSpace
-                                >::type>,
-        Kokkos::MemoryTraits<0> >
-     ViewTypeFlat;
+                       typename std::conditional<
+                           ViewType::Rank == 0, typename ViewType::memory_space,
+                           Kokkos::AnonymousSpace>::type>,
+        Kokkos::MemoryTraits<0>>
+        ViewTypeFlat;
 
-    ViewTypeFlat dst_flat(dst.data(),dst.size());
-    if(dst.span() < std::numeric_limits<int>::max()) {
-      Kokkos::Impl::ViewFill< ViewTypeFlat , Kokkos::LayoutRight, typename ViewType::execution_space, ViewTypeFlat::Rank, int >( dst_flat , value );
+    ViewTypeFlat dst_flat(dst.data(), dst.size());
+    if (dst.span() < static_cast<size_t>(std::numeric_limits<int>::max())) {
+      Kokkos::Impl::ViewFill<ViewTypeFlat, Kokkos::LayoutRight,
+                             typename ViewType::execution_space,
+                             ViewTypeFlat::Rank, int>(dst_flat, value);
     } else
-      Kokkos::Impl::ViewFill< ViewTypeFlat , Kokkos::LayoutRight, typename ViewType::execution_space, ViewTypeFlat::Rank, int64_t >( dst_flat , value );
+      Kokkos::Impl::ViewFill<ViewTypeFlat, Kokkos::LayoutRight,
+                             typename ViewType::execution_space,
+                             ViewTypeFlat::Rank, int64_t>(dst_flat, value);
     Kokkos::fence();
+#if defined(KOKKOS_ENABLE_PROFILING)
+    if (Kokkos::Profiling::profileLibraryLoaded()) {
+      Kokkos::Profiling::endDeepCopy();
+    }
+#endif
     return;
   }
 
   // Figure out iteration order to do the ViewFill
-  int64_t strides[ViewType::Rank+1];
+  int64_t strides[ViewType::Rank + 1];
   dst.stride(strides);
   Kokkos::Iterate iterate;
-  if        ( std::is_same<typename ViewType::array_layout,Kokkos::LayoutRight>::value ) {
+  if (std::is_same<typename ViewType::array_layout,
+                   Kokkos::LayoutRight>::value) {
     iterate = Kokkos::Iterate::Right;
-  } else if ( std::is_same<typename ViewType::array_layout,Kokkos::LayoutLeft>::value ) {
+  } else if (std::is_same<typename ViewType::array_layout,
+                          Kokkos::LayoutLeft>::value) {
     iterate = Kokkos::Iterate::Left;
-  } else if ( std::is_same<typename ViewType::array_layout,Kokkos::LayoutStride>::value ) {
-    if( strides[0] > strides[ViewType::Rank>0?ViewType::Rank-1:0] )
+  } else if (std::is_same<typename ViewType::array_layout,
+                          Kokkos::LayoutStride>::value) {
+    if (strides[0] > strides[ViewType::Rank > 0 ? ViewType::Rank - 1 : 0])
       iterate = Kokkos::Iterate::Right;
     else
       iterate = Kokkos::Iterate::Left;
   } else {
-    if( std::is_same<typename ViewType::execution_space::array_layout, Kokkos::LayoutRight>::value )
+    if (std::is_same<typename ViewType::execution_space::array_layout,
+                     Kokkos::LayoutRight>::value)
       iterate = Kokkos::Iterate::Right;
     else
       iterate = Kokkos::Iterate::Left;
   }
 
-  // Lets call the right ViewFill functor based on integer space needed and iteration type
-  typedef typename std::conditional<ViewType::Rank==0,
-                      typename ViewType::uniform_runtime_type,
-                      typename ViewType::uniform_runtime_nomemspace_type>::type ViewTypeUniform;
-  if(dst.span() > std::numeric_limits<int>::max()) {
-    if(iterate == Kokkos::Iterate::Right)
-      Kokkos::Impl::ViewFill< ViewTypeUniform, Kokkos::LayoutRight, typename ViewType::execution_space, ViewType::Rank, int64_t >( dst , value );
+  // Lets call the right ViewFill functor based on integer space needed and
+  // iteration type
+  typedef typename std::conditional<
+      ViewType::Rank == 0, typename ViewType::uniform_runtime_type,
+      typename ViewType::uniform_runtime_nomemspace_type>::type ViewTypeUniform;
+  if (dst.span() > static_cast<size_t>(std::numeric_limits<int>::max())) {
+    if (iterate == Kokkos::Iterate::Right)
+      Kokkos::Impl::ViewFill<ViewTypeUniform, Kokkos::LayoutRight,
+                             typename ViewType::execution_space, ViewType::Rank,
+                             int64_t>(dst, value);
     else
-      Kokkos::Impl::ViewFill< ViewTypeUniform, Kokkos::LayoutLeft, typename ViewType::execution_space, ViewType::Rank, int64_t >( dst , value );
+      Kokkos::Impl::ViewFill<ViewTypeUniform, Kokkos::LayoutLeft,
+                             typename ViewType::execution_space, ViewType::Rank,
+                             int64_t>(dst, value);
   } else {
-    if(iterate == Kokkos::Iterate::Right)
-      Kokkos::Impl::ViewFill< ViewTypeUniform, Kokkos::LayoutRight, typename ViewType::execution_space, ViewType::Rank, int >( dst , value );
+    if (iterate == Kokkos::Iterate::Right)
+      Kokkos::Impl::ViewFill<ViewTypeUniform, Kokkos::LayoutRight,
+                             typename ViewType::execution_space, ViewType::Rank,
+                             int>(dst, value);
     else
-      Kokkos::Impl::ViewFill< ViewTypeUniform, Kokkos::LayoutLeft, typename ViewType::execution_space, ViewType::Rank, int >( dst , value );
+      Kokkos::Impl::ViewFill<ViewTypeUniform, Kokkos::LayoutLeft,
+                             typename ViewType::execution_space, ViewType::Rank,
+                             int>(dst, value);
   }
   Kokkos::fence();
+
+#if defined(KOKKOS_ENABLE_PROFILING)
+  if (Kokkos::Profiling::profileLibraryLoaded()) {
+    Kokkos::Profiling::endDeepCopy();
+  }
+#endif
 }
 
 /** \brief  Deep copy into a value in Host memory from a view.  */
-template< class ST , class ... SP >
-inline
-void deep_copy
-  ( typename ViewTraits<ST,SP...>::non_const_value_type & dst
-  , const View<ST,SP...> & src
-  , typename std::enable_if<
-    std::is_same< typename ViewTraits<ST,SP...>::specialize , void >::value
-    >::type * = 0 )
-{
-  static_assert( ViewTraits<ST,SP...>::rank == 0
-               , "ERROR: Non-rank-zero view in deep_copy( value , View )" );
+template <class ST, class... SP>
+inline void deep_copy(
+    typename ViewTraits<ST, SP...>::non_const_value_type& dst,
+    const View<ST, SP...>& src,
+    typename std::enable_if<std::is_same<
+        typename ViewTraits<ST, SP...>::specialize, void>::value>::type* = 0) {
+  typedef ViewTraits<ST, SP...> src_traits;
+  typedef typename src_traits::memory_space src_memory_space;
 
-  if(src.data() == NULL) {
+  static_assert(src_traits::rank == 0,
+                "ERROR: Non-rank-zero view in deep_copy( value , View )");
+
+#if defined(KOKKOS_ENABLE_PROFILING)
+  if (Kokkos::Profiling::profileLibraryLoaded()) {
+    Kokkos::Profiling::beginDeepCopy(
+        Kokkos::Profiling::SpaceHandle(Kokkos::HostSpace().name()), "Scalar",
+        &dst, Kokkos::Profiling::SpaceHandle(src_memory_space().name()),
+        src.label(), src.data(),
+        src.span() * sizeof(typename src_traits::value_type));
+  }
+#endif
+
+  if (src.data() == NULL) {
     Kokkos::fence();
+#if defined(KOKKOS_ENABLE_PROFILING)
+    if (Kokkos::Profiling::profileLibraryLoaded()) {
+      Kokkos::Profiling::endDeepCopy();
+    }
+#endif
     return;
   }
 
-  typedef ViewTraits<ST,SP...>               src_traits ;
-  typedef typename src_traits::memory_space  src_memory_space ;
-  Kokkos::Impl::DeepCopy< HostSpace , src_memory_space >( & dst , src.data() , sizeof(ST) );
+  Kokkos::Impl::DeepCopy<HostSpace, src_memory_space>(&dst, src.data(),
+                                                      sizeof(ST));
+#if defined(KOKKOS_ENABLE_PROFILING)
+  if (Kokkos::Profiling::profileLibraryLoaded()) {
+    Kokkos::Profiling::endDeepCopy();
+  }
+#endif
 }
 
 //----------------------------------------------------------------------------
 /** \brief  A deep copy between views of compatible type, and rank zero.  */
-template< class DT , class ... DP , class ST , class ... SP >
-inline
-void deep_copy
-  ( const View<DT,DP...> & dst
-  , const View<ST,SP...> & src
-  , typename std::enable_if<(
-    std::is_same< typename ViewTraits<DT,DP...>::specialize , void >::value &&
-    std::is_same< typename ViewTraits<ST,SP...>::specialize , void >::value &&
-    ( unsigned(ViewTraits<DT,DP...>::rank) == unsigned(0) &&
-      unsigned(ViewTraits<ST,SP...>::rank) == unsigned(0) )
-  )>::type * = 0 )
-{
-  static_assert(
-    std::is_same< typename ViewTraits<DT,DP...>::value_type ,
-                  typename ViewTraits<ST,SP...>::non_const_value_type >::value
-    , "deep_copy requires matching non-const destination type" );
+template <class DT, class... DP, class ST, class... SP>
+inline void deep_copy(
+    const View<DT, DP...>& dst, const View<ST, SP...>& src,
+    typename std::enable_if<(
+        std::is_same<typename ViewTraits<DT, DP...>::specialize, void>::value &&
+        std::is_same<typename ViewTraits<ST, SP...>::specialize, void>::value &&
+        (unsigned(ViewTraits<DT, DP...>::rank) == unsigned(0) &&
+         unsigned(ViewTraits<ST, SP...>::rank) == unsigned(0)))>::type* = 0) {
+  typedef View<DT, DP...> dst_type;
+  typedef View<ST, SP...> src_type;
 
-  if(dst.data() == NULL && src.data() == NULL) {
+  typedef typename dst_type::value_type value_type;
+  typedef typename dst_type::memory_space dst_memory_space;
+  typedef typename src_type::memory_space src_memory_space;
+
+  static_assert(std::is_same<typename dst_type::value_type,
+                             typename src_type::non_const_value_type>::value,
+                "deep_copy requires matching non-const destination type");
+
+#if defined(KOKKOS_ENABLE_PROFILING)
+  if (Kokkos::Profiling::profileLibraryLoaded()) {
+    Kokkos::Profiling::beginDeepCopy(
+        Kokkos::Profiling::SpaceHandle(dst_memory_space().name()), dst.label(),
+        dst.data(), Kokkos::Profiling::SpaceHandle(src_memory_space().name()),
+        src.label(), src.data(),
+        src.span() * sizeof(typename dst_type::value_type));
+  }
+#endif
+
+  if (dst.data() == NULL && src.data() == NULL) {
     Kokkos::fence();
+#if defined(KOKKOS_ENABLE_PROFILING)
+    if (Kokkos::Profiling::profileLibraryLoaded()) {
+      Kokkos::Profiling::endDeepCopy();
+    }
+#endif
     return;
   }
 
-  typedef View<DT,DP...>  dst_type ;
-  typedef View<ST,SP...>  src_type ;
-
-  typedef typename dst_type::value_type    value_type ;
-  typedef typename dst_type::memory_space  dst_memory_space ;
-  typedef typename src_type::memory_space  src_memory_space ;
-
   Kokkos::fence();
-  if ( dst.data() != src.data() ) {
-    Kokkos::Impl::DeepCopy< dst_memory_space , src_memory_space >( dst.data() , src.data() , sizeof(value_type) );
+  if (dst.data() != src.data()) {
+    Kokkos::Impl::DeepCopy<dst_memory_space, src_memory_space>(
+        dst.data(), src.data(), sizeof(value_type));
     Kokkos::fence();
   }
+#if defined(KOKKOS_ENABLE_PROFILING)
+  if (Kokkos::Profiling::profileLibraryLoaded()) {
+    Kokkos::Profiling::endDeepCopy();
+  }
+#endif
 }
 
 //----------------------------------------------------------------------------
-/** \brief  A deep copy between views of the default specialization, compatible type,
- *          same non-zero rank, same contiguous layout.
+/** \brief  A deep copy between views of the default specialization, compatible
+ * type, same non-zero rank, same contiguous layout.
  */
-template< class DT , class ... DP , class ST , class ... SP >
-inline
-void deep_copy
-  ( const View<DT,DP...> & dst
-  , const View<ST,SP...> & src
-  , typename std::enable_if<(
-    std::is_same< typename ViewTraits<DT,DP...>::specialize , void >::value &&
-    std::is_same< typename ViewTraits<ST,SP...>::specialize , void >::value &&
-    ( unsigned(ViewTraits<DT,DP...>::rank) != 0 ||
-      unsigned(ViewTraits<ST,SP...>::rank) != 0 )
-  )>::type * = 0 )
-{
-  typedef View<DT,DP...>  dst_type ;
-  typedef View<ST,SP...>  src_type ;
+template <class DT, class... DP, class ST, class... SP>
+inline void deep_copy(
+    const View<DT, DP...>& dst, const View<ST, SP...>& src,
+    typename std::enable_if<(
+        std::is_same<typename ViewTraits<DT, DP...>::specialize, void>::value &&
+        std::is_same<typename ViewTraits<ST, SP...>::specialize, void>::value &&
+        (unsigned(ViewTraits<DT, DP...>::rank) != 0 ||
+         unsigned(ViewTraits<ST, SP...>::rank) != 0))>::type* = 0) {
+  typedef View<DT, DP...> dst_type;
+  typedef View<ST, SP...> src_type;
+  typedef typename dst_type::execution_space dst_execution_space;
+  typedef typename src_type::execution_space src_execution_space;
+  typedef typename dst_type::memory_space dst_memory_space;
+  typedef typename src_type::memory_space src_memory_space;
+  typedef typename dst_type::value_type dst_value_type;
+  typedef typename src_type::value_type src_value_type;
 
-  static_assert(
-    std::is_same< typename dst_type::value_type ,
-                  typename dst_type::non_const_value_type >::value
-    , "deep_copy requires non-const destination type" );
+  static_assert(std::is_same<typename dst_type::value_type,
+                             typename dst_type::non_const_value_type>::value,
+                "deep_copy requires non-const destination type");
 
-  static_assert(
-    ( unsigned(dst_type::rank) ==
-      unsigned(src_type::rank) )
-    , "deep_copy requires Views of equal rank" );
+  static_assert((unsigned(dst_type::rank) == unsigned(src_type::rank)),
+                "deep_copy requires Views of equal rank");
 
+#if defined(KOKKOS_ENABLE_PROFILING)
+  if (Kokkos::Profiling::profileLibraryLoaded()) {
+    Kokkos::Profiling::beginDeepCopy(
+        Kokkos::Profiling::SpaceHandle(dst_memory_space().name()), dst.label(),
+        dst.data(), Kokkos::Profiling::SpaceHandle(src_memory_space().name()),
+        src.label(), src.data(),
+        src.span() * sizeof(typename dst_type::value_type));
+  }
+#endif
 
-  typedef typename dst_type::execution_space  dst_execution_space ;
-  typedef typename src_type::execution_space  src_execution_space ;
-  typedef typename dst_type::memory_space     dst_memory_space ;
-  typedef typename src_type::memory_space     src_memory_space ;
-  typedef typename dst_type::value_type       dst_value_type ;
-  typedef typename src_type::value_type       src_value_type ;
-  if(dst.data() == NULL || src.data() == NULL) {
+  if (dst.data() == NULL || src.data() == NULL) {
 #ifdef KOKKOS_ENABLE_DEPRECATED_CODE
     // do nothing
 #else
     // throw if dimension mismatch
-    if ( (src.extent(0) != dst.extent(0)) ||
-         (src.extent(1) != dst.extent(1)) ||
-         (src.extent(2) != dst.extent(2)) ||
-         (src.extent(3) != dst.extent(3)) ||
-         (src.extent(4) != dst.extent(4)) ||
-         (src.extent(5) != dst.extent(5)) ||
-         (src.extent(6) != dst.extent(6)) ||
-         (src.extent(7) != dst.extent(7))
-       ) {
-      std::string message("Deprecation Error: Kokkos::deep_copy extents of views don't match: ");
-      message += dst.label(); message += "(";
-      for(int r = 0; r<dst_type::Rank-1; r++)
-        { message+= std::to_string(dst.extent(r)); message += ","; }
-      message+= std::to_string(dst.extent(dst_type::Rank-1)); message += ") ";
-      message += src.label(); message += "(";
-      for(int r = 0; r<src_type::Rank-1; r++)
-        { message+= std::to_string(src.extent(r)); message += ","; }
-      message+= std::to_string(src.extent(src_type::Rank-1)); message += ") ";
+    if ((src.extent(0) != dst.extent(0)) || (src.extent(1) != dst.extent(1)) ||
+        (src.extent(2) != dst.extent(2)) || (src.extent(3) != dst.extent(3)) ||
+        (src.extent(4) != dst.extent(4)) || (src.extent(5) != dst.extent(5)) ||
+        (src.extent(6) != dst.extent(6)) || (src.extent(7) != dst.extent(7))) {
+      std::string message(
+          "Deprecation Error: Kokkos::deep_copy extents of views don't "
+          "match: ");
+      message += dst.label();
+      message += "(";
+      for (int r = 0; r < dst_type::Rank - 1; r++) {
+        message += std::to_string(dst.extent(r));
+        message += ",";
+      }
+      message += std::to_string(dst.extent(dst_type::Rank - 1));
+      message += ") ";
+      message += src.label();
+      message += "(";
+      for (int r = 0; r < src_type::Rank - 1; r++) {
+        message += std::to_string(src.extent(r));
+        message += ",";
+      }
+      message += std::to_string(src.extent(src_type::Rank - 1));
+      message += ") ";
 
       Kokkos::Impl::throw_runtime_exception(message);
     }
 #endif
     Kokkos::fence();
+#if defined(KOKKOS_ENABLE_PROFILING)
+    if (Kokkos::Profiling::profileLibraryLoaded()) {
+      Kokkos::Profiling::endDeepCopy();
+    }
+#endif
     return;
   }
 
-  enum { DstExecCanAccessSrc =
-   Kokkos::Impl::SpaceAccessibility< dst_execution_space , src_memory_space >::accessible };
+  enum {
+    DstExecCanAccessSrc =
+        Kokkos::Impl::SpaceAccessibility<dst_execution_space,
+                                         src_memory_space>::accessible
+  };
 
-  enum { SrcExecCanAccessDst =
-   Kokkos::Impl::SpaceAccessibility< src_execution_space , dst_memory_space >::accessible };
+  enum {
+    SrcExecCanAccessDst =
+        Kokkos::Impl::SpaceAccessibility<src_execution_space,
+                                         dst_memory_space>::accessible
+  };
 
   // Checking for Overlapping Views.
   dst_value_type* dst_start = dst.data();
   dst_value_type* dst_end   = dst.data() + dst.span();
   src_value_type* src_start = src.data();
   src_value_type* src_end   = src.data() + src.span();
-  if( ((std::ptrdiff_t)dst_start == (std::ptrdiff_t)src_start) &&
-      ((std::ptrdiff_t)dst_end   == (std::ptrdiff_t)src_end)   &&
-       (dst.span_is_contiguous() && src.span_is_contiguous()) ) {
+  if (((std::ptrdiff_t)dst_start == (std::ptrdiff_t)src_start) &&
+      ((std::ptrdiff_t)dst_end == (std::ptrdiff_t)src_end) &&
+      (dst.span_is_contiguous() && src.span_is_contiguous())) {
     Kokkos::fence();
+#if defined(KOKKOS_ENABLE_PROFILING)
+    if (Kokkos::Profiling::profileLibraryLoaded()) {
+      Kokkos::Profiling::endDeepCopy();
+    }
+#endif
     return;
   }
 
-  if( ( ( (std::ptrdiff_t)dst_start < (std::ptrdiff_t)src_end ) && ( (std::ptrdiff_t)dst_end > (std::ptrdiff_t)src_start ) ) &&
-      ( ( dst.span_is_contiguous() && src.span_is_contiguous() ))) {
+  if ((((std::ptrdiff_t)dst_start < (std::ptrdiff_t)src_end) &&
+       ((std::ptrdiff_t)dst_end > (std::ptrdiff_t)src_start)) &&
+      ((dst.span_is_contiguous() && src.span_is_contiguous()))) {
     std::string message("Error: Kokkos::deep_copy of overlapping views: ");
-    message += dst.label(); message += "(";
-    message += std::to_string((std::ptrdiff_t)dst_start); message += ",";
-    message += std::to_string((std::ptrdiff_t)dst_end); message += ") ";
-    message += src.label(); message += "(";
-    message += std::to_string((std::ptrdiff_t)src_start); message += ",";
-    message += std::to_string((std::ptrdiff_t)src_end); message += ") ";
+    message += dst.label();
+    message += "(";
+    message += std::to_string((std::ptrdiff_t)dst_start);
+    message += ",";
+    message += std::to_string((std::ptrdiff_t)dst_end);
+    message += ") ";
+    message += src.label();
+    message += "(";
+    message += std::to_string((std::ptrdiff_t)src_start);
+    message += ",";
+    message += std::to_string((std::ptrdiff_t)src_end);
+    message += ") ";
     Kokkos::Impl::throw_runtime_exception(message);
   }
 
   // Check for same extents
-  if ( (src.extent(0) != dst.extent(0)) ||
-       (src.extent(1) != dst.extent(1)) ||
-       (src.extent(2) != dst.extent(2)) ||
-       (src.extent(3) != dst.extent(3)) ||
-       (src.extent(4) != dst.extent(4)) ||
-       (src.extent(5) != dst.extent(5)) ||
-       (src.extent(6) != dst.extent(6)) ||
-       (src.extent(7) != dst.extent(7))
-     ) {
+  if ((src.extent(0) != dst.extent(0)) || (src.extent(1) != dst.extent(1)) ||
+      (src.extent(2) != dst.extent(2)) || (src.extent(3) != dst.extent(3)) ||
+      (src.extent(4) != dst.extent(4)) || (src.extent(5) != dst.extent(5)) ||
+      (src.extent(6) != dst.extent(6)) || (src.extent(7) != dst.extent(7))) {
 #ifdef KOKKOS_ENABLE_DEPRECATED_CODE
     Kokkos::fence();
-    if ( DstExecCanAccessSrc ) {
-      // Copying data between views in accessible memory spaces and either non-contiguous or incompatible shape.
-      Kokkos::Impl::ViewRemap< dst_type , src_type >( dst , src );
-    }
-    else if ( SrcExecCanAccessDst ) {
-      // Copying data between views in accessible memory spaces and either non-contiguous or incompatible shape.
-      Kokkos::Impl::ViewRemap< dst_type , src_type , src_execution_space >( dst , src );
-    }
-    else {
-      Kokkos::Impl::throw_runtime_exception("deep_copy given views that would require a temporary allocation");
+    if (DstExecCanAccessSrc) {
+      // Copying data between views in accessible memory spaces and either
+      // non-contiguous or incompatible shape.
+      Kokkos::Impl::ViewRemap<dst_type, src_type>(dst, src);
+    } else if (SrcExecCanAccessDst) {
+      // Copying data between views in accessible memory spaces and either
+      // non-contiguous or incompatible shape.
+      Kokkos::Impl::ViewRemap<dst_type, src_type, src_execution_space>(dst,
+                                                                       src);
+    } else {
+      Kokkos::Impl::throw_runtime_exception(
+          "deep_copy given views that would require a temporary allocation");
     }
     Kokkos::fence();
+#if defined(KOKKOS_ENABLE_PROFILING)
+    if (Kokkos::Profiling::profileLibraryLoaded()) {
+      Kokkos::Profiling::endDeepCopy();
+    }
+#endif
     return;
 #else
-    std::string message("Deprecation Error: Kokkos::deep_copy extents of views don't match: ");
-    message += dst.label(); message += "(";
-    for(int r = 0; r<dst_type::Rank-1; r++)
-      { message+= std::to_string(dst.extent(r)); message += ","; }
-    message+= std::to_string(dst.extent(dst_type::Rank-1)); message += ") ";
-    message += src.label(); message += "(";
-    for(int r = 0; r<src_type::Rank-1; r++)
-      { message+= std::to_string(src.extent(r)); message += ","; }
-    message+= std::to_string(src.extent(src_type::Rank-1)); message += ") ";
+    std::string message(
+        "Deprecation Error: Kokkos::deep_copy extents of views don't match: ");
+    message += dst.label();
+    message += "(";
+    for (int r = 0; r < dst_type::Rank - 1; r++) {
+      message += std::to_string(dst.extent(r));
+      message += ",";
+    }
+    message += std::to_string(dst.extent(dst_type::Rank - 1));
+    message += ") ";
+    message += src.label();
+    message += "(";
+    for (int r = 0; r < src_type::Rank - 1; r++) {
+      message += std::to_string(src.extent(r));
+      message += ",";
+    }
+    message += std::to_string(src.extent(src_type::Rank - 1));
+    message += ") ";
 
     Kokkos::Impl::throw_runtime_exception(message);
 #endif
   }
 
-  // If same type, equal layout, equal dimensions, equal span, and contiguous memory then can byte-wise copy
+  // If same type, equal layout, equal dimensions, equal span, and contiguous
+  // memory then can byte-wise copy
 
-  if ( std::is_same< typename dst_type::value_type ,
-                     typename src_type::non_const_value_type >::value &&
-       (
-         std::is_same< typename dst_type::array_layout ,
-                       typename src_type::array_layout >::value
-         ||
-         ( dst_type::rank == 1 &&
-           src_type::rank == 1 )
-       ) &&
-       dst.span_is_contiguous() &&
-       src.span_is_contiguous() &&
-       ((dst_type::rank < 1) || (dst.stride_0() == src.stride_0()))  &&
-       ((dst_type::rank < 2) || (dst.stride_1() == src.stride_1())) &&
-       ((dst_type::rank < 3) || (dst.stride_2() == src.stride_2())) &&
-       ((dst_type::rank < 4) || (dst.stride_3() == src.stride_3())) &&
-       ((dst_type::rank < 5) || (dst.stride_4() == src.stride_4())) &&
-       ((dst_type::rank < 6) || (dst.stride_5() == src.stride_5())) &&
-       ((dst_type::rank < 7) || (dst.stride_6() == src.stride_6())) &&
-       ((dst_type::rank < 8) || (dst.stride_7() == src.stride_7()))
-    ) {
+  if (std::is_same<typename dst_type::value_type,
+                   typename src_type::non_const_value_type>::value &&
+      (std::is_same<typename dst_type::array_layout,
+                    typename src_type::array_layout>::value ||
+       (dst_type::rank == 1 && src_type::rank == 1)) &&
+      dst.span_is_contiguous() && src.span_is_contiguous() &&
+      ((dst_type::rank < 1) || (dst.stride_0() == src.stride_0())) &&
+      ((dst_type::rank < 2) || (dst.stride_1() == src.stride_1())) &&
+      ((dst_type::rank < 3) || (dst.stride_2() == src.stride_2())) &&
+      ((dst_type::rank < 4) || (dst.stride_3() == src.stride_3())) &&
+      ((dst_type::rank < 5) || (dst.stride_4() == src.stride_4())) &&
+      ((dst_type::rank < 6) || (dst.stride_5() == src.stride_5())) &&
+      ((dst_type::rank < 7) || (dst.stride_6() == src.stride_6())) &&
+      ((dst_type::rank < 8) || (dst.stride_7() == src.stride_7()))) {
     const size_t nbytes = sizeof(typename dst_type::value_type) * dst.span();
     Kokkos::fence();
-    if((void*)dst.data()!=(void*)src.data()) {
-      Kokkos::Impl::DeepCopy< dst_memory_space , src_memory_space >
-        ( dst.data() , src.data() , nbytes );
+    if ((void*)dst.data() != (void*)src.data()) {
+      Kokkos::Impl::DeepCopy<dst_memory_space, src_memory_space>(
+          dst.data(), src.data(), nbytes);
     }
     Kokkos::fence();
   } else {
@@ -1536,779 +1839,779 @@ void deep_copy
     Impl::view_copy(dst, src);
     Kokkos::fence();
   }
+#if defined(KOKKOS_ENABLE_PROFILING)
+  if (Kokkos::Profiling::profileLibraryLoaded()) {
+    Kokkos::Profiling::endDeepCopy();
+  }
+#endif
 }
 
 //----------------------------------------------------------------------------
 //----------------------------------------------------------------------------
 namespace Experimental {
-/** \brief  A local deep copy between views of the default specialization, compatible type,
- *          same non-zero rank.
+/** \brief  A local deep copy between views of the default specialization,
+ * compatible type, same non-zero rank.
  */
-template< class TeamType, class DT , class ... DP , class ST , class ... SP >
-void KOKKOS_INLINE_FUNCTION local_deep_copy_contiguous(const TeamType& team, const View<DT,DP...> & dst, const View<ST,SP...> & src) {
-    Kokkos::parallel_for(Kokkos::TeamThreadRange(team, src.span()), [&] (const int& i) {
-        dst.data()[i] = src.data()[i];
-    });
+template <class TeamType, class DT, class... DP, class ST, class... SP>
+void KOKKOS_INLINE_FUNCTION
+local_deep_copy_contiguous(const TeamType& team, const View<DT, DP...>& dst,
+                           const View<ST, SP...>& src) {
+  Kokkos::parallel_for(Kokkos::TeamThreadRange(team, src.span()),
+                       [&](const int& i) { dst.data()[i] = src.data()[i]; });
 }
 //----------------------------------------------------------------------------
-template< class DT , class ... DP , class ST , class ... SP >
-void KOKKOS_INLINE_FUNCTION local_deep_copy_contiguous(const View<DT,DP...> & dst, const View<ST,SP...> & src) {
-    
-    for(size_t i=0;i<src.span();++i) {
-        dst.data()[i] = src.data()[i];
-    }
+template <class DT, class... DP, class ST, class... SP>
+void KOKKOS_INLINE_FUNCTION local_deep_copy_contiguous(
+    const View<DT, DP...>& dst, const View<ST, SP...>& src) {
+  for (size_t i = 0; i < src.span(); ++i) {
+    dst.data()[i] = src.data()[i];
+  }
 }
 //----------------------------------------------------------------------------
-template< class TeamType, class DT , class ... DP , class ST , class ... SP >
-void KOKKOS_INLINE_FUNCTION local_deep_copy (const TeamType& team, const View<DT,DP...> & dst, 
-                                                                   const View<ST,SP...> & src,
-                                                                   typename std::enable_if<( unsigned(ViewTraits<DT,DP...>::rank) == 1 && 
-                                                                                             unsigned(ViewTraits<ST,SP...>::rank) == 1
-                                                                                           )>::type * = 0 )
-{
-    if( dst.data() == nullptr ) {
-        return;
-    }
+template <class TeamType, class DT, class... DP, class ST, class... SP>
+void KOKKOS_INLINE_FUNCTION local_deep_copy(
+    const TeamType& team, const View<DT, DP...>& dst,
+    const View<ST, SP...>& src,
+    typename std::enable_if<(unsigned(ViewTraits<DT, DP...>::rank) == 1 &&
+                             unsigned(ViewTraits<ST, SP...>::rank) ==
+                                 1)>::type* = 0) {
+  if (dst.data() == nullptr) {
+    return;
+  }
 
-    const size_t N = dst.extent(0);
+  const size_t N = dst.extent(0);
 
+  team.team_barrier();
+  Kokkos::parallel_for(Kokkos::TeamThreadRange(team, N),
+                       [&](const int& i) { dst(i) = src(i); });
+  team.team_barrier();
+}
+//----------------------------------------------------------------------------
+template <class TeamType, class DT, class... DP, class ST, class... SP>
+void KOKKOS_INLINE_FUNCTION local_deep_copy(
+    const TeamType& team, const View<DT, DP...>& dst,
+    const View<ST, SP...>& src,
+    typename std::enable_if<(unsigned(ViewTraits<DT, DP...>::rank) == 2 &&
+                             unsigned(ViewTraits<ST, SP...>::rank) ==
+                                 2)>::type* = 0) {
+  if (dst.data() == nullptr) {
+    return;
+  }
+
+  const size_t N = dst.extent(0) * dst.extent(1);
+
+  if (dst.span_is_contiguous() && src.span_is_contiguous()) {
     team.team_barrier();
-    Kokkos::parallel_for(Kokkos::TeamThreadRange(team, N), [&] (const int& i) {
-        dst(i) = src(i);
+    local_deep_copy_contiguous(team, dst, src);
+    team.team_barrier();
+  } else {
+    team.team_barrier();
+    Kokkos::parallel_for(Kokkos::TeamThreadRange(team, N), [&](const int& i) {
+      int i0      = i % dst.extent(0);
+      int i1      = i / dst.extent(0);
+      dst(i0, i1) = src(i0, i1);
     });
     team.team_barrier();
+  }
 }
 //----------------------------------------------------------------------------
-template< class TeamType, class DT , class ... DP , class ST , class ... SP >
-void KOKKOS_INLINE_FUNCTION local_deep_copy (const TeamType& team, const View<DT,DP...> & dst, 
-                                                                   const View<ST,SP...> & src,
-                                                                   typename std::enable_if<( unsigned(ViewTraits<DT,DP...>::rank) == 2 && 
-                                                                                             unsigned(ViewTraits<ST,SP...>::rank) == 2
-                                                                                           )>::type * = 0 )
-{
-    if( dst.data() == nullptr ) {
-        return;
-    }
+template <class TeamType, class DT, class... DP, class ST, class... SP>
+void KOKKOS_INLINE_FUNCTION local_deep_copy(
+    const TeamType& team, const View<DT, DP...>& dst,
+    const View<ST, SP...>& src,
+    typename std::enable_if<(unsigned(ViewTraits<DT, DP...>::rank) == 3 &&
+                             unsigned(ViewTraits<ST, SP...>::rank) ==
+                                 3)>::type* = 0) {
+  if (dst.data() == nullptr) {
+    return;
+  }
 
-    const size_t N = dst.extent(0)*dst.extent(1);
+  const size_t N = dst.extent(0) * dst.extent(1) * dst.extent(2);
 
-    if ( dst.span_is_contiguous() && src.span_is_contiguous() ) {
-        team.team_barrier();
-        local_deep_copy_contiguous(team,dst,src);
-        team.team_barrier();
-    } else {
-        team.team_barrier();
-        Kokkos::parallel_for(Kokkos::TeamThreadRange(team, N), [&] (const int& i) {
-            int i0 = i%dst.extent(0);
-            int i1 = i/dst.extent(0);
-            dst(i0,i1) = src(i0,i1);
-        });
-        team.team_barrier();
-    }
+  if (dst.span_is_contiguous() && src.span_is_contiguous()) {
+    team.team_barrier();
+    local_deep_copy_contiguous(team, dst, src);
+    team.team_barrier();
+  } else {
+    team.team_barrier();
+    Kokkos::parallel_for(Kokkos::TeamThreadRange(team, N), [&](const int& i) {
+      int i0          = i % dst.extent(0);
+      int itmp        = i / dst.extent(0);
+      int i1          = itmp % dst.extent(1);
+      int i2          = itmp / dst.extent(1);
+      dst(i0, i1, i2) = src(i0, i1, i2);
+    });
+    team.team_barrier();
+  }
 }
 //----------------------------------------------------------------------------
-template< class TeamType, class DT , class ... DP , class ST , class ... SP >
-void KOKKOS_INLINE_FUNCTION local_deep_copy (const TeamType& team, const View<DT,DP...> & dst, 
-                                                                   const View<ST,SP...> & src,
-                                                                   typename std::enable_if<( unsigned(ViewTraits<DT,DP...>::rank) == 3 && 
-                                                                                             unsigned(ViewTraits<ST,SP...>::rank) == 3
-                                                                                           )>::type * = 0 )
-{
-    if( dst.data() == nullptr ) {
-        return;
-    }
+template <class TeamType, class DT, class... DP, class ST, class... SP>
+void KOKKOS_INLINE_FUNCTION local_deep_copy(
+    const TeamType& team, const View<DT, DP...>& dst,
+    const View<ST, SP...>& src,
+    typename std::enable_if<(unsigned(ViewTraits<DT, DP...>::rank) == 4 &&
+                             unsigned(ViewTraits<ST, SP...>::rank) ==
+                                 4)>::type* = 0) {
+  if (dst.data() == nullptr) {
+    return;
+  }
 
-    const size_t N = dst.extent(0)*dst.extent(1)*dst.extent(2);
+  const size_t N =
+      dst.extent(0) * dst.extent(1) * dst.extent(2) * dst.extent(3);
 
-    if ( dst.span_is_contiguous() && src.span_is_contiguous() ) {
-        team.team_barrier();
-        local_deep_copy_contiguous(team,dst,src);
-        team.team_barrier();
-    } else {
-        team.team_barrier();
-        Kokkos::parallel_for(Kokkos::TeamThreadRange(team, N), [&] (const int& i) {
-            int i0   = i%dst.extent(0);
-            int itmp = i/dst.extent(0);
-            int i1   = itmp%dst.extent(1);
-            int i2   = itmp/dst.extent(1);
-            dst(i0,i1,i2) = src(i0,i1,i2);
-        });
-        team.team_barrier();
-    }
+  if (dst.span_is_contiguous() && src.span_is_contiguous()) {
+    team.team_barrier();
+    local_deep_copy_contiguous(team, dst, src);
+    team.team_barrier();
+  } else {
+    team.team_barrier();
+    Kokkos::parallel_for(Kokkos::TeamThreadRange(team, N), [&](const int& i) {
+      int i0              = i % dst.extent(0);
+      int itmp            = i / dst.extent(0);
+      int i1              = itmp % dst.extent(1);
+      itmp                = itmp / dst.extent(1);
+      int i2              = itmp % dst.extent(2);
+      int i3              = itmp / dst.extent(2);
+      dst(i0, i1, i2, i3) = src(i0, i1, i2, i3);
+    });
+    team.team_barrier();
+  }
 }
 //----------------------------------------------------------------------------
-template< class TeamType, class DT , class ... DP , class ST , class ... SP >
-void KOKKOS_INLINE_FUNCTION local_deep_copy (const TeamType& team, const View<DT,DP...> & dst, 
-                                                                   const View<ST,SP...> & src,
-                                                                   typename std::enable_if<( unsigned(ViewTraits<DT,DP...>::rank) == 4 && 
-                                                                                             unsigned(ViewTraits<ST,SP...>::rank) == 4
-                                                                                           )>::type * = 0 )
-{
-    if( dst.data() == nullptr ) {
-        return;
-    }
+template <class TeamType, class DT, class... DP, class ST, class... SP>
+void KOKKOS_INLINE_FUNCTION local_deep_copy(
+    const TeamType& team, const View<DT, DP...>& dst,
+    const View<ST, SP...>& src,
+    typename std::enable_if<(unsigned(ViewTraits<DT, DP...>::rank) == 5 &&
+                             unsigned(ViewTraits<ST, SP...>::rank) ==
+                                 5)>::type* = 0) {
+  if (dst.data() == nullptr) {
+    return;
+  }
 
-    const size_t N = dst.extent(0)*dst.extent(1)*dst.extent(2)*dst.extent(3);
+  const size_t N = dst.extent(0) * dst.extent(1) * dst.extent(2) *
+                   dst.extent(3) * dst.extent(4);
 
-    if ( dst.span_is_contiguous() && src.span_is_contiguous() ) {
-        team.team_barrier();
-        local_deep_copy_contiguous(team,dst,src);
-        team.team_barrier();
-    } else {
-        team.team_barrier();
-        Kokkos::parallel_for(Kokkos::TeamThreadRange(team, N), [&] (const int& i) {
-            int i0   = i%dst.extent(0);
-            int itmp = i/dst.extent(0);
-            int i1   = itmp%dst.extent(1);
-                itmp = itmp/dst.extent(1);
-            int i2   = itmp%dst.extent(2);
-            int i3   = itmp/dst.extent(2);
-            dst(i0,i1,i2,i3) = src(i0,i1,i2,i3);
-        });
-        team.team_barrier();
-    }
+  if (dst.span_is_contiguous() && src.span_is_contiguous()) {
+    team.team_barrier();
+    local_deep_copy_contiguous(team, dst, src);
+    team.team_barrier();
+  } else {
+    team.team_barrier();
+    Kokkos::parallel_for(Kokkos::TeamThreadRange(team, N), [&](const int& i) {
+      int i0                  = i % dst.extent(0);
+      int itmp                = i / dst.extent(0);
+      int i1                  = itmp % dst.extent(1);
+      itmp                    = itmp / dst.extent(1);
+      int i2                  = itmp % dst.extent(2);
+      itmp                    = itmp / dst.extent(2);
+      int i3                  = itmp % dst.extent(3);
+      int i4                  = itmp / dst.extent(3);
+      dst(i0, i1, i2, i3, i4) = src(i0, i1, i2, i3, i4);
+    });
+    team.team_barrier();
+  }
 }
 //----------------------------------------------------------------------------
-template< class TeamType, class DT , class ... DP , class ST , class ... SP >
-void KOKKOS_INLINE_FUNCTION local_deep_copy (const TeamType& team, const View<DT,DP...> & dst, 
-                                                                   const View<ST,SP...> & src,
-                                                                   typename std::enable_if<( unsigned(ViewTraits<DT,DP...>::rank) == 5 && 
-                                                                                             unsigned(ViewTraits<ST,SP...>::rank) == 5
-                                                                                           )>::type * = 0 )
-{
-    if( dst.data() == nullptr ) {
-        return;
-    }
+template <class TeamType, class DT, class... DP, class ST, class... SP>
+void KOKKOS_INLINE_FUNCTION local_deep_copy(
+    const TeamType& team, const View<DT, DP...>& dst,
+    const View<ST, SP...>& src,
+    typename std::enable_if<(unsigned(ViewTraits<DT, DP...>::rank) == 6 &&
+                             unsigned(ViewTraits<ST, SP...>::rank) ==
+                                 6)>::type* = 0) {
+  if (dst.data() == nullptr) {
+    return;
+  }
 
-    const size_t N = dst.extent(0)*dst.extent(1)*dst.extent(2)*dst.extent(3)*dst.extent(4);
+  const size_t N = dst.extent(0) * dst.extent(1) * dst.extent(2) *
+                   dst.extent(3) * dst.extent(4) * dst.extent(5);
 
-    if ( dst.span_is_contiguous() && src.span_is_contiguous() ) {
-        team.team_barrier();
-        local_deep_copy_contiguous(team,dst,src);
-        team.team_barrier();
-    } else {
-        team.team_barrier();
-        Kokkos::parallel_for(Kokkos::TeamThreadRange(team, N), [&] (const int& i) {
-            int i0   = i%dst.extent(0);
-            int itmp = i/dst.extent(0);
-            int i1   = itmp%dst.extent(1);
-                itmp = itmp/dst.extent(1);
-            int i2   = itmp%dst.extent(2);
-                itmp = itmp/dst.extent(2);
-            int i3   = itmp%dst.extent(3);
-            int i4   = itmp/dst.extent(3);
-            dst(i0,i1,i2,i3,i4) = src(i0,i1,i2,i3,i4);
-        });
-        team.team_barrier();
-    }
+  if (dst.span_is_contiguous() && src.span_is_contiguous()) {
+    team.team_barrier();
+    local_deep_copy_contiguous(team, dst, src);
+    team.team_barrier();
+  } else {
+    team.team_barrier();
+    Kokkos::parallel_for(Kokkos::TeamThreadRange(team, N), [&](const int& i) {
+      int i0                      = i % dst.extent(0);
+      int itmp                    = i / dst.extent(0);
+      int i1                      = itmp % dst.extent(1);
+      itmp                        = itmp / dst.extent(1);
+      int i2                      = itmp % dst.extent(2);
+      itmp                        = itmp / dst.extent(2);
+      int i3                      = itmp % dst.extent(3);
+      itmp                        = itmp / dst.extent(3);
+      int i4                      = itmp % dst.extent(4);
+      int i5                      = itmp / dst.extent(4);
+      dst(i0, i1, i2, i3, i4, i5) = src(i0, i1, i2, i3, i4, i5);
+    });
+    team.team_barrier();
+  }
 }
 //----------------------------------------------------------------------------
-template< class TeamType, class DT , class ... DP , class ST , class ... SP >
-void KOKKOS_INLINE_FUNCTION local_deep_copy (const TeamType& team, const View<DT,DP...> & dst, 
-                                                                   const View<ST,SP...> & src,
-                                                                   typename std::enable_if<( unsigned(ViewTraits<DT,DP...>::rank) == 6 && 
-                                                                                             unsigned(ViewTraits<ST,SP...>::rank) == 6
-                                                                                           )>::type * = 0 )
-{
-    if( dst.data() == nullptr ) {
-        return;
-    }
+template <class TeamType, class DT, class... DP, class ST, class... SP>
+void KOKKOS_INLINE_FUNCTION local_deep_copy(
+    const TeamType& team, const View<DT, DP...>& dst,
+    const View<ST, SP...>& src,
+    typename std::enable_if<(unsigned(ViewTraits<DT, DP...>::rank) == 7 &&
+                             unsigned(ViewTraits<ST, SP...>::rank) ==
+                                 7)>::type* = 0) {
+  if (dst.data() == nullptr) {
+    return;
+  }
 
-    const size_t N = dst.extent(0)*dst.extent(1)*dst.extent(2)*dst.extent(3)*dst.extent(4)*dst.extent(5);
+  const size_t N = dst.extent(0) * dst.extent(1) * dst.extent(2) *
+                   dst.extent(3) * dst.extent(4) * dst.extent(5) *
+                   dst.extent(6);
 
-    if ( dst.span_is_contiguous() && src.span_is_contiguous() ) {
-        team.team_barrier();
-        local_deep_copy_contiguous(team,dst,src);
-        team.team_barrier();
-    } else {
-        team.team_barrier();
-        Kokkos::parallel_for(Kokkos::TeamThreadRange(team, N), [&] (const int& i) {
-            int i0   = i%dst.extent(0);
-            int itmp = i/dst.extent(0);
-            int i1   = itmp%dst.extent(1);
-                itmp = itmp/dst.extent(1);
-            int i2   = itmp%dst.extent(2);
-                itmp = itmp/dst.extent(2);
-            int i3   = itmp%dst.extent(3);
-                itmp = itmp/dst.extent(3);
-            int i4   = itmp%dst.extent(4);
-            int i5   = itmp/dst.extent(4);
-            dst(i0,i1,i2,i3,i4,i5) = src(i0,i1,i2,i3,i4,i5);
-        });
-        team.team_barrier();
-    }
+  if (dst.span_is_contiguous() && src.span_is_contiguous()) {
+    team.team_barrier();
+    local_deep_copy_contiguous(team, dst, src);
+    team.team_barrier();
+  } else {
+    team.team_barrier();
+    Kokkos::parallel_for(Kokkos::TeamThreadRange(team, N), [&](const int& i) {
+      int i0                          = i % dst.extent(0);
+      int itmp                        = i / dst.extent(0);
+      int i1                          = itmp % dst.extent(1);
+      itmp                            = itmp / dst.extent(1);
+      int i2                          = itmp % dst.extent(2);
+      itmp                            = itmp / dst.extent(2);
+      int i3                          = itmp % dst.extent(3);
+      itmp                            = itmp / dst.extent(3);
+      int i4                          = itmp % dst.extent(4);
+      itmp                            = itmp / dst.extent(4);
+      int i5                          = itmp % dst.extent(5);
+      int i6                          = itmp / dst.extent(5);
+      dst(i0, i1, i2, i3, i4, i5, i6) = src(i0, i1, i2, i3, i4, i5, i6);
+    });
+    team.team_barrier();
+  }
 }
 //----------------------------------------------------------------------------
-template< class TeamType, class DT , class ... DP , class ST , class ... SP >
-void KOKKOS_INLINE_FUNCTION local_deep_copy (const TeamType& team, const View<DT,DP...> & dst, 
-                                                                   const View<ST,SP...> & src,
-                                                                   typename std::enable_if<( unsigned(ViewTraits<DT,DP...>::rank) == 7 && 
-                                                                                             unsigned(ViewTraits<ST,SP...>::rank) == 7
-                                                                                           )>::type * = 0 )
-{
-    if( dst.data() == nullptr ) {
-        return;
-    }
+template <class DT, class... DP, class ST, class... SP>
+void KOKKOS_INLINE_FUNCTION local_deep_copy(
+    const View<DT, DP...>& dst, const View<ST, SP...>& src,
+    typename std::enable_if<(unsigned(ViewTraits<DT, DP...>::rank) == 1 &&
+                             unsigned(ViewTraits<ST, SP...>::rank) ==
+                                 1)>::type* = 0) {
+  if (dst.data() == nullptr) {
+    return;
+  }
 
-    const size_t N = dst.extent(0)*dst.extent(1)*dst.extent(2)*dst.extent(3)*dst.extent(4)*dst.extent(5)*dst.extent(6);
+  const size_t N = dst.extent(0);
 
-    if ( dst.span_is_contiguous() && src.span_is_contiguous() ) {
-        team.team_barrier();
-        local_deep_copy_contiguous(team,dst,src);
-        team.team_barrier();
-    } else {
-        team.team_barrier();
-        Kokkos::parallel_for(Kokkos::TeamThreadRange(team, N), [&] (const int& i) {
-            int i0   = i%dst.extent(0);
-            int itmp = i/dst.extent(0);
-            int i1   = itmp%dst.extent(1);
-                itmp = itmp/dst.extent(1);
-            int i2   = itmp%dst.extent(2);
-                itmp = itmp/dst.extent(2);
-            int i3   = itmp%dst.extent(3);
-                itmp = itmp/dst.extent(3);
-            int i4   = itmp%dst.extent(4);
-                itmp = itmp/dst.extent(4);
-            int i5   = itmp%dst.extent(5);
-            int i6   = itmp/dst.extent(5);
-            dst(i0,i1,i2,i3,i4,i5,i6) = src(i0,i1,i2,i3,i4,i5,i6);
-        });
-        team.team_barrier();
-    }
+  for (size_t i = 0; i < N; ++i) {
+    dst(i) = src(i);
+  }
 }
 //----------------------------------------------------------------------------
-template< class DT , class ... DP , class ST , class ... SP >
-void KOKKOS_INLINE_FUNCTION local_deep_copy (const View<DT,DP...> & dst,  
-                                             const View<ST,SP...> & src,
-                                             typename std::enable_if<( unsigned(ViewTraits<DT,DP...>::rank) == 1 && 
-                                                                       unsigned(ViewTraits<ST,SP...>::rank) == 1
-                                                                     )>::type * = 0 )
-{
-    if( dst.data() == nullptr ) {
-        return;
-    }
+template <class DT, class... DP, class ST, class... SP>
+void KOKKOS_INLINE_FUNCTION local_deep_copy(
+    const View<DT, DP...>& dst, const View<ST, SP...>& src,
+    typename std::enable_if<(unsigned(ViewTraits<DT, DP...>::rank) == 2 &&
+                             unsigned(ViewTraits<ST, SP...>::rank) ==
+                                 2)>::type* = 0) {
+  if (dst.data() == nullptr) {
+    return;
+  }
 
-    const size_t N = dst.extent(0);
-
-    
-    for(size_t i=0;i<N;++i){
-        dst(i) = src(i);
-    }
+  if (dst.span_is_contiguous() && src.span_is_contiguous()) {
+    local_deep_copy_contiguous(dst, src);
+  } else {
+    for (size_t i0 = 0; i0 < dst.extent(0); ++i0)
+      for (size_t i1 = 0; i1 < dst.extent(1); ++i1) dst(i0, i1) = src(i0, i1);
+  }
 }
 //----------------------------------------------------------------------------
-template< class DT , class ... DP , class ST , class ... SP >
-void KOKKOS_INLINE_FUNCTION local_deep_copy (const View<DT,DP...> & dst,  
-                                             const View<ST,SP...> & src,
-                                             typename std::enable_if<( unsigned(ViewTraits<DT,DP...>::rank) == 2 && 
-                                                                       unsigned(ViewTraits<ST,SP...>::rank) == 2
-                                                                     )>::type * = 0 )
-{
-    if( dst.data() == nullptr ) {
-        return;
-    }
+template <class DT, class... DP, class ST, class... SP>
+void KOKKOS_INLINE_FUNCTION local_deep_copy(
+    const View<DT, DP...>& dst, const View<ST, SP...>& src,
+    typename std::enable_if<(unsigned(ViewTraits<DT, DP...>::rank) == 3 &&
+                             unsigned(ViewTraits<ST, SP...>::rank) ==
+                                 3)>::type* = 0) {
+  if (dst.data() == nullptr) {
+    return;
+  }
 
-    if ( dst.span_is_contiguous() && src.span_is_contiguous() ) {
-        local_deep_copy_contiguous(dst,src);
-    } else {
-        
-        for(size_t i0=0;i0<dst.extent(0);++i0)
-            for(size_t i1=0;i1<dst.extent(1);++i1)
-                dst(i0,i1) = src(i0,i1);
-    }
+  if (dst.span_is_contiguous() && src.span_is_contiguous()) {
+    local_deep_copy_contiguous(dst, src);
+  } else {
+    for (size_t i0 = 0; i0 < dst.extent(0); ++i0)
+      for (size_t i1 = 0; i1 < dst.extent(1); ++i1)
+        for (size_t i2 = 0; i2 < dst.extent(2); ++i2)
+          dst(i0, i1, i2) = src(i0, i1, i2);
+  }
 }
 //----------------------------------------------------------------------------
-template< class DT , class ... DP , class ST , class ... SP >
-void KOKKOS_INLINE_FUNCTION local_deep_copy (const View<DT,DP...> & dst,  
-                                             const View<ST,SP...> & src,
-                                             typename std::enable_if<( unsigned(ViewTraits<DT,DP...>::rank) == 3 && 
-                                                                       unsigned(ViewTraits<ST,SP...>::rank) == 3
-                                                                     )>::type * = 0 )
-{
-    if( dst.data() == nullptr ) {
-        return;
-    }
+template <class DT, class... DP, class ST, class... SP>
+void KOKKOS_INLINE_FUNCTION local_deep_copy(
+    const View<DT, DP...>& dst, const View<ST, SP...>& src,
+    typename std::enable_if<(unsigned(ViewTraits<DT, DP...>::rank) == 4 &&
+                             unsigned(ViewTraits<ST, SP...>::rank) ==
+                                 4)>::type* = 0) {
+  if (dst.data() == nullptr) {
+    return;
+  }
 
-    if ( dst.span_is_contiguous() && src.span_is_contiguous() ) {
-        local_deep_copy_contiguous(dst,src);
-    } else {
-        
-        for(size_t i0=0;i0<dst.extent(0);++i0)
-            for(size_t i1=0;i1<dst.extent(1);++i1)
-                for(size_t i2=0;i2<dst.extent(2);++i2)
-                    dst(i0,i1,i2) = src(i0,i1,i2);
-    }
+  if (dst.span_is_contiguous() && src.span_is_contiguous()) {
+    local_deep_copy_contiguous(dst, src);
+  } else {
+    for (size_t i0 = 0; i0 < dst.extent(0); ++i0)
+      for (size_t i1 = 0; i1 < dst.extent(1); ++i1)
+        for (size_t i2 = 0; i2 < dst.extent(2); ++i2)
+          for (size_t i3 = 0; i3 < dst.extent(3); ++i3)
+            dst(i0, i1, i2, i3) = src(i0, i1, i2, i3);
+  }
 }
 //----------------------------------------------------------------------------
-template< class DT , class ... DP , class ST , class ... SP >
-void KOKKOS_INLINE_FUNCTION local_deep_copy (const View<DT,DP...> & dst,  
-                                             const View<ST,SP...> & src,
-                                             typename std::enable_if<( unsigned(ViewTraits<DT,DP...>::rank) == 4 && 
-                                                                       unsigned(ViewTraits<ST,SP...>::rank) == 4
-                                                                     )>::type * = 0 )
-{
-    if( dst.data() == nullptr ) {
-        return;
-    }
+template <class DT, class... DP, class ST, class... SP>
+void KOKKOS_INLINE_FUNCTION local_deep_copy(
+    const View<DT, DP...>& dst, const View<ST, SP...>& src,
+    typename std::enable_if<(unsigned(ViewTraits<DT, DP...>::rank) == 5 &&
+                             unsigned(ViewTraits<ST, SP...>::rank) ==
+                                 5)>::type* = 0) {
+  if (dst.data() == nullptr) {
+    return;
+  }
 
-    if ( dst.span_is_contiguous() && src.span_is_contiguous() ) {
-        local_deep_copy_contiguous(dst,src);
-    } else {
-        
-        for(size_t i0=0;i0<dst.extent(0);++i0)
-            for(size_t i1=0;i1<dst.extent(1);++i1)
-                for(size_t i2=0;i2<dst.extent(2);++i2)
-                    for(size_t i3=0;i3<dst.extent(3);++i3)
-                        dst(i0,i1,i2,i3) = src(i0,i1,i2,i3);
-    }
+  if (dst.span_is_contiguous() && src.span_is_contiguous()) {
+    local_deep_copy_contiguous(dst, src);
+  } else {
+    for (size_t i0 = 0; i0 < dst.extent(0); ++i0)
+      for (size_t i1 = 0; i1 < dst.extent(1); ++i1)
+        for (size_t i2 = 0; i2 < dst.extent(2); ++i2)
+          for (size_t i3 = 0; i3 < dst.extent(3); ++i3)
+            for (size_t i4 = 0; i4 < dst.extent(4); ++i4)
+              dst(i0, i1, i2, i3, i4) = src(i0, i1, i2, i3, i4);
+  }
 }
 //----------------------------------------------------------------------------
-template< class DT , class ... DP , class ST , class ... SP >
-void KOKKOS_INLINE_FUNCTION local_deep_copy (const View<DT,DP...> & dst,  
-                                             const View<ST,SP...> & src,
-                                             typename std::enable_if<( unsigned(ViewTraits<DT,DP...>::rank) == 5 && 
-                                                                       unsigned(ViewTraits<ST,SP...>::rank) == 5
-                                                                     )>::type * = 0 )
-{
-    if( dst.data() == nullptr ) {
-        return;
-    }
+template <class DT, class... DP, class ST, class... SP>
+void KOKKOS_INLINE_FUNCTION local_deep_copy(
+    const View<DT, DP...>& dst, const View<ST, SP...>& src,
+    typename std::enable_if<(unsigned(ViewTraits<DT, DP...>::rank) == 6 &&
+                             unsigned(ViewTraits<ST, SP...>::rank) ==
+                                 6)>::type* = 0) {
+  if (dst.data() == nullptr) {
+    return;
+  }
 
-    if ( dst.span_is_contiguous() && src.span_is_contiguous() ) {
-        local_deep_copy_contiguous(dst,src);
-    } else {
-        
-        for(size_t i0=0;i0<dst.extent(0);++i0)
-            for(size_t i1=0;i1<dst.extent(1);++i1)
-                for(size_t i2=0;i2<dst.extent(2);++i2)
-                    for(size_t i3=0;i3<dst.extent(3);++i3)
-                        for(size_t i4=0;i4<dst.extent(4);++i4)
-                            dst(i0,i1,i2,i3,i4) = src(i0,i1,i2,i3,i4);
-    }
+  if (dst.span_is_contiguous() && src.span_is_contiguous()) {
+    local_deep_copy_contiguous(dst, src);
+  } else {
+    for (size_t i0 = 0; i0 < dst.extent(0); ++i0)
+      for (size_t i1 = 0; i1 < dst.extent(1); ++i1)
+        for (size_t i2 = 0; i2 < dst.extent(2); ++i2)
+          for (size_t i3 = 0; i3 < dst.extent(3); ++i3)
+            for (size_t i4 = 0; i4 < dst.extent(4); ++i4)
+              for (size_t i5 = 0; i5 < dst.extent(5); ++i5)
+                dst(i0, i1, i2, i3, i4, i5) = src(i0, i1, i2, i3, i4, i5);
+  }
 }
 //----------------------------------------------------------------------------
-template< class DT , class ... DP , class ST , class ... SP >
-void KOKKOS_INLINE_FUNCTION local_deep_copy (const View<DT,DP...> & dst,  
-                                             const View<ST,SP...> & src,
-                                             typename std::enable_if<( unsigned(ViewTraits<DT,DP...>::rank) == 6 && 
-                                                                        unsigned(ViewTraits<ST,SP...>::rank) == 6
-                                                                     )>::type * = 0 )
-{
-    if( dst.data() == nullptr ) {
-        return;
-    }
+template <class DT, class... DP, class ST, class... SP>
+void KOKKOS_INLINE_FUNCTION local_deep_copy(
+    const View<DT, DP...>& dst, const View<ST, SP...>& src,
+    typename std::enable_if<(unsigned(ViewTraits<DT, DP...>::rank) == 7 &&
+                             unsigned(ViewTraits<ST, SP...>::rank) ==
+                                 7)>::type* = 0) {
+  if (dst.data() == nullptr) {
+    return;
+  }
 
-    if ( dst.span_is_contiguous() && src.span_is_contiguous() ) {
-        local_deep_copy_contiguous(dst,src);
-    } else {
-        
-        for(size_t i0=0;i0<dst.extent(0);++i0)
-            for(size_t i1=0;i1<dst.extent(1);++i1)
-                for(size_t i2=0;i2<dst.extent(2);++i2)
-                    for(size_t i3=0;i3<dst.extent(3);++i3)
-                        for(size_t i4=0;i4<dst.extent(4);++i4)
-                            for(size_t i5=0;i5<dst.extent(5);++i5)
-                                dst(i0,i1,i2,i3,i4,i5) = src(i0,i1,i2,i3,i4,i5);
-    }
-}
-//----------------------------------------------------------------------------
-template< class DT , class ... DP , class ST , class ... SP >
-void KOKKOS_INLINE_FUNCTION local_deep_copy (const View<DT,DP...> & dst,  
-                                             const View<ST,SP...> & src,
-                                             typename std::enable_if<( unsigned(ViewTraits<DT,DP...>::rank) == 7 && 
-                                                                       unsigned(ViewTraits<ST,SP...>::rank) == 7
-                                                                     )>::type * = 0 )
-{
-    if( dst.data() == nullptr ) {
-        return;
-    }
-
-    if ( dst.span_is_contiguous() && src.span_is_contiguous() ) {
-        local_deep_copy_contiguous(dst,src);
-    } else {
-        
-        for(size_t i0=0;i0<dst.extent(0);++i0)
-            for(size_t i1=0;i1<dst.extent(1);++i1)
-                for(size_t i2=0;i2<dst.extent(2);++i2)
-                    for(size_t i3=0;i3<dst.extent(3);++i3)
-                        for(size_t i4=0;i4<dst.extent(4);++i4)
-                            for(size_t i5=0;i5<dst.extent(5);++i5)
-                                for(size_t i6=0;i6<dst.extent(6);++i6)
-                                    dst(i0,i1,i2,i3,i4,i5,i6) = src(i0,i1,i2,i3,i4,i5,i6);
-    }
+  if (dst.span_is_contiguous() && src.span_is_contiguous()) {
+    local_deep_copy_contiguous(dst, src);
+  } else {
+    for (size_t i0 = 0; i0 < dst.extent(0); ++i0)
+      for (size_t i1 = 0; i1 < dst.extent(1); ++i1)
+        for (size_t i2 = 0; i2 < dst.extent(2); ++i2)
+          for (size_t i3 = 0; i3 < dst.extent(3); ++i3)
+            for (size_t i4 = 0; i4 < dst.extent(4); ++i4)
+              for (size_t i5 = 0; i5 < dst.extent(5); ++i5)
+                for (size_t i6 = 0; i6 < dst.extent(6); ++i6)
+                  dst(i0, i1, i2, i3, i4, i5, i6) =
+                      src(i0, i1, i2, i3, i4, i5, i6);
+  }
 }
 //----------------------------------------------------------------------------
 //----------------------------------------------------------------------------
 /** \brief  Deep copy a value into a view.  */
-template< class TeamType, class DT , class ... DP >
-void KOKKOS_INLINE_FUNCTION local_deep_copy_contiguous(const TeamType& team, const View<DT,DP...> & dst, typename ViewTraits<DT,DP...>::const_value_type & value) {
-    Kokkos::parallel_for(Kokkos::TeamThreadRange(team, dst.span()), [&] (const int& i) {
-        dst.data()[i] = value;
-    });
+template <class TeamType, class DT, class... DP>
+void KOKKOS_INLINE_FUNCTION local_deep_copy_contiguous(
+    const TeamType& team, const View<DT, DP...>& dst,
+    typename ViewTraits<DT, DP...>::const_value_type& value) {
+  Kokkos::parallel_for(Kokkos::TeamThreadRange(team, dst.span()),
+                       [&](const int& i) { dst.data()[i] = value; });
 }
 //----------------------------------------------------------------------------
-template< class DT , class ... DP >
-void KOKKOS_INLINE_FUNCTION local_deep_copy_contiguous(const View<DT,DP...> & dst, typename ViewTraits<DT,DP...>::const_value_type & value) {
-    
-    for(size_t i=0;i<dst.span();++i) {
-        dst.data()[i] = value;
-    }
+template <class DT, class... DP>
+void KOKKOS_INLINE_FUNCTION local_deep_copy_contiguous(
+    const View<DT, DP...>& dst,
+    typename ViewTraits<DT, DP...>::const_value_type& value) {
+  for (size_t i = 0; i < dst.span(); ++i) {
+    dst.data()[i] = value;
+  }
 }
 //----------------------------------------------------------------------------
-template< class TeamType, class DT , class ... DP >
-void KOKKOS_INLINE_FUNCTION local_deep_copy (const TeamType& team, const View<DT,DP...> & dst, 
-                                                                   typename ViewTraits<DT,DP...>::const_value_type & value,
-                                                                   typename std::enable_if<( unsigned(ViewTraits<DT,DP...>::rank) == 1 )>::type * = 0 )
-{
-     if( dst.data() == nullptr ) {
-        return;
-    }
+template <class TeamType, class DT, class... DP>
+void KOKKOS_INLINE_FUNCTION local_deep_copy(
+    const TeamType& team, const View<DT, DP...>& dst,
+    typename ViewTraits<DT, DP...>::const_value_type& value,
+    typename std::enable_if<(unsigned(ViewTraits<DT, DP...>::rank) ==
+                             1)>::type* = 0) {
+  if (dst.data() == nullptr) {
+    return;
+  }
 
-    const size_t N = dst.extent(0);
+  const size_t N = dst.extent(0);
 
+  team.team_barrier();
+  Kokkos::parallel_for(Kokkos::TeamThreadRange(team, N),
+                       [&](const int& i) { dst(i) = value; });
+  team.team_barrier();
+}
+//----------------------------------------------------------------------------
+template <class TeamType, class DT, class... DP>
+void KOKKOS_INLINE_FUNCTION local_deep_copy(
+    const TeamType& team, const View<DT, DP...>& dst,
+    typename ViewTraits<DT, DP...>::const_value_type& value,
+    typename std::enable_if<(unsigned(ViewTraits<DT, DP...>::rank) ==
+                             2)>::type* = 0) {
+  if (dst.data() == nullptr) {
+    return;
+  }
+
+  const size_t N = dst.extent(0) * dst.extent(1);
+
+  if (dst.span_is_contiguous()) {
     team.team_barrier();
-    Kokkos::parallel_for(Kokkos::TeamThreadRange(team, N), [&] (const int& i) {
-        dst(i) =  value;
+    local_deep_copy_contiguous(team, dst, value);
+    team.team_barrier();
+  } else {
+    team.team_barrier();
+    Kokkos::parallel_for(Kokkos::TeamThreadRange(team, N), [&](const int& i) {
+      int i0      = i % dst.extent(0);
+      int i1      = i / dst.extent(0);
+      dst(i0, i1) = value;
     });
     team.team_barrier();
+  }
 }
 //----------------------------------------------------------------------------
-template< class TeamType, class DT , class ... DP >
-void KOKKOS_INLINE_FUNCTION local_deep_copy (const TeamType& team, const View<DT,DP...> & dst, 
-                                                                   typename ViewTraits<DT,DP...>::const_value_type & value,
-                                                                   typename std::enable_if<( unsigned(ViewTraits<DT,DP...>::rank) == 2 )>::type * = 0 )
-{
-    if( dst.data() == nullptr ) {
-        return;
-    }
+template <class TeamType, class DT, class... DP>
+void KOKKOS_INLINE_FUNCTION local_deep_copy(
+    const TeamType& team, const View<DT, DP...>& dst,
+    typename ViewTraits<DT, DP...>::const_value_type& value,
+    typename std::enable_if<(unsigned(ViewTraits<DT, DP...>::rank) ==
+                             3)>::type* = 0) {
+  if (dst.data() == nullptr) {
+    return;
+  }
 
-    const size_t N = dst.extent(0)*dst.extent(1);
+  const size_t N = dst.extent(0) * dst.extent(1) * dst.extent(2);
 
-    if ( dst.span_is_contiguous() ) {
-        team.team_barrier();
-        local_deep_copy_contiguous(team,dst,value);
-        team.team_barrier();
-    } else {
-        team.team_barrier();    
-        Kokkos::parallel_for(Kokkos::TeamThreadRange(team, N), [&] (const int& i) {
-            int i0 = i%dst.extent(0);
-            int i1 = i/dst.extent(0);
-            dst(i0,i1) =  value;
-        });
-        team.team_barrier();
-    }
+  if (dst.span_is_contiguous()) {
+    team.team_barrier();
+    local_deep_copy_contiguous(team, dst, value);
+    team.team_barrier();
+  } else {
+    team.team_barrier();
+    Kokkos::parallel_for(Kokkos::TeamThreadRange(team, N), [&](const int& i) {
+      int i0          = i % dst.extent(0);
+      int itmp        = i / dst.extent(0);
+      int i1          = itmp % dst.extent(1);
+      int i2          = itmp / dst.extent(1);
+      dst(i0, i1, i2) = value;
+    });
+    team.team_barrier();
+  }
 }
 //----------------------------------------------------------------------------
-template< class TeamType, class DT , class ... DP >
-void KOKKOS_INLINE_FUNCTION local_deep_copy (const TeamType& team, const View<DT,DP...> & dst, 
-                                                                   typename ViewTraits<DT,DP...>::const_value_type & value,
-                                                                   typename std::enable_if<( unsigned(ViewTraits<DT,DP...>::rank) == 3 )>::type * = 0 )
-{
-    if( dst.data() == nullptr ) {
-        return;
-    }
+template <class TeamType, class DT, class... DP>
+void KOKKOS_INLINE_FUNCTION local_deep_copy(
+    const TeamType& team, const View<DT, DP...>& dst,
+    typename ViewTraits<DT, DP...>::const_value_type& value,
+    typename std::enable_if<(unsigned(ViewTraits<DT, DP...>::rank) ==
+                             4)>::type* = 0) {
+  if (dst.data() == nullptr) {
+    return;
+  }
 
-    const size_t N = dst.extent(0)*dst.extent(1)*dst.extent(2);
+  const size_t N =
+      dst.extent(0) * dst.extent(1) * dst.extent(2) * dst.extent(3);
 
-    if ( dst.span_is_contiguous() ) {
-        team.team_barrier();
-        local_deep_copy_contiguous(team,dst,value);
-        team.team_barrier();
-    } else {
-        team.team_barrier();    
-        Kokkos::parallel_for(Kokkos::TeamThreadRange(team, N), [&] (const int& i) {
-            int i0   = i%dst.extent(0);
-            int itmp = i/dst.extent(0);
-            int i1   = itmp%dst.extent(1);
-            int i2   = itmp/dst.extent(1);
-            dst(i0,i1,i2) =  value;
-        });
-        team.team_barrier();
-    }
+  if (dst.span_is_contiguous()) {
+    team.team_barrier();
+    local_deep_copy_contiguous(team, dst, value);
+    team.team_barrier();
+  } else {
+    team.team_barrier();
+    Kokkos::parallel_for(Kokkos::TeamThreadRange(team, N), [&](const int& i) {
+      int i0              = i % dst.extent(0);
+      int itmp            = i / dst.extent(0);
+      int i1              = itmp % dst.extent(1);
+      itmp                = itmp / dst.extent(1);
+      int i2              = itmp % dst.extent(2);
+      int i3              = itmp / dst.extent(2);
+      dst(i0, i1, i2, i3) = value;
+    });
+    team.team_barrier();
+  }
 }
 //----------------------------------------------------------------------------
-template< class TeamType, class DT , class ... DP >
-void KOKKOS_INLINE_FUNCTION local_deep_copy (const TeamType& team, const View<DT,DP...> & dst, 
-                                                                   typename ViewTraits<DT,DP...>::const_value_type & value,
-                                                                   typename std::enable_if<( unsigned(ViewTraits<DT,DP...>::rank) == 4 )>::type * = 0 )
-{
-    if( dst.data() == nullptr ) {
-        return;
-    }
+template <class TeamType, class DT, class... DP>
+void KOKKOS_INLINE_FUNCTION local_deep_copy(
+    const TeamType& team, const View<DT, DP...>& dst,
+    typename ViewTraits<DT, DP...>::const_value_type& value,
+    typename std::enable_if<(unsigned(ViewTraits<DT, DP...>::rank) ==
+                             5)>::type* = 0) {
+  if (dst.data() == nullptr) {
+    return;
+  }
 
-    const size_t N = dst.extent(0)*dst.extent(1)*dst.extent(2)*dst.extent(3);
+  const size_t N = dst.extent(0) * dst.extent(1) * dst.extent(2) *
+                   dst.extent(3) * dst.extent(4);
 
-    if ( dst.span_is_contiguous() ) {
-        team.team_barrier();
-        local_deep_copy_contiguous(team,dst,value);
-        team.team_barrier();
-    } else {
-        team.team_barrier();    
-        Kokkos::parallel_for(Kokkos::TeamThreadRange(team, N), [&] (const int& i) {
-            int i0   = i%dst.extent(0);
-            int itmp = i/dst.extent(0);
-            int i1   = itmp%dst.extent(1);
-                itmp = itmp/dst.extent(1);
-            int i2   = itmp%dst.extent(2);
-            int i3   = itmp/dst.extent(2);
-            dst(i0,i1,i2,i3) =  value;
-        });
-        team.team_barrier();
-    }
+  if (dst.span_is_contiguous()) {
+    team.team_barrier();
+    local_deep_copy_contiguous(team, dst, value);
+    team.team_barrier();
+  } else {
+    team.team_barrier();
+    Kokkos::parallel_for(Kokkos::TeamThreadRange(team, N), [&](const int& i) {
+      int i0                  = i % dst.extent(0);
+      int itmp                = i / dst.extent(0);
+      int i1                  = itmp % dst.extent(1);
+      itmp                    = itmp / dst.extent(1);
+      int i2                  = itmp % dst.extent(2);
+      itmp                    = itmp / dst.extent(2);
+      int i3                  = itmp % dst.extent(3);
+      int i4                  = itmp / dst.extent(3);
+      dst(i0, i1, i2, i3, i4) = value;
+    });
+    team.team_barrier();
+  }
 }
 //----------------------------------------------------------------------------
-template< class TeamType, class DT , class ... DP >
-void KOKKOS_INLINE_FUNCTION local_deep_copy (const TeamType& team, const View<DT,DP...> & dst, 
-                                                                   typename ViewTraits<DT,DP...>::const_value_type & value,
-                                                                   typename std::enable_if<( unsigned(ViewTraits<DT,DP...>::rank) == 5 )>::type * = 0 )
-{
-    if( dst.data() == nullptr ) {
-        return;
-    }
+template <class TeamType, class DT, class... DP>
+void KOKKOS_INLINE_FUNCTION local_deep_copy(
+    const TeamType& team, const View<DT, DP...>& dst,
+    typename ViewTraits<DT, DP...>::const_value_type& value,
+    typename std::enable_if<(unsigned(ViewTraits<DT, DP...>::rank) ==
+                             6)>::type* = 0) {
+  if (dst.data() == nullptr) {
+    return;
+  }
 
-    const size_t N = dst.extent(0)*dst.extent(1)*dst.extent(2)*dst.extent(3)*dst.extent(4);
+  const size_t N = dst.extent(0) * dst.extent(1) * dst.extent(2) *
+                   dst.extent(3) * dst.extent(4) * dst.extent(5);
 
-    if ( dst.span_is_contiguous() ) {
-        team.team_barrier();
-        local_deep_copy_contiguous(team,dst,value);
-        team.team_barrier();
-    } else {
-        team.team_barrier();    
-        Kokkos::parallel_for(Kokkos::TeamThreadRange(team, N), [&] (const int& i) {
-            int i0   = i%dst.extent(0);
-            int itmp = i/dst.extent(0);
-            int i1   = itmp%dst.extent(1);
-                itmp = itmp/dst.extent(1);
-            int i2   = itmp%dst.extent(2);
-                itmp = itmp/dst.extent(2);
-            int i3   = itmp%dst.extent(3);
-            int i4   = itmp/dst.extent(3);
-            dst(i0,i1,i2,i3,i4) =  value;
-        });
-        team.team_barrier();
-    }
+  if (dst.span_is_contiguous()) {
+    team.team_barrier();
+    local_deep_copy_contiguous(team, dst, value);
+    team.team_barrier();
+  } else {
+    team.team_barrier();
+    Kokkos::parallel_for(Kokkos::TeamThreadRange(team, N), [&](const int& i) {
+      int i0                      = i % dst.extent(0);
+      int itmp                    = i / dst.extent(0);
+      int i1                      = itmp % dst.extent(1);
+      itmp                        = itmp / dst.extent(1);
+      int i2                      = itmp % dst.extent(2);
+      itmp                        = itmp / dst.extent(2);
+      int i3                      = itmp % dst.extent(3);
+      itmp                        = itmp / dst.extent(3);
+      int i4                      = itmp % dst.extent(4);
+      int i5                      = itmp / dst.extent(4);
+      dst(i0, i1, i2, i3, i4, i5) = value;
+    });
+    team.team_barrier();
+  }
 }
 //----------------------------------------------------------------------------
-template< class TeamType, class DT , class ... DP >
-void KOKKOS_INLINE_FUNCTION local_deep_copy (const TeamType& team, const View<DT,DP...> & dst, 
-                                                                   typename ViewTraits<DT,DP...>::const_value_type & value,
-                                                                   typename std::enable_if<( unsigned(ViewTraits<DT,DP...>::rank) == 6 )>::type * = 0 )
-{
-    if( dst.data() == nullptr ) {
-        return;
-    }
+template <class TeamType, class DT, class... DP>
+void KOKKOS_INLINE_FUNCTION local_deep_copy(
+    const TeamType& team, const View<DT, DP...>& dst,
+    typename ViewTraits<DT, DP...>::const_value_type& value,
+    typename std::enable_if<(unsigned(ViewTraits<DT, DP...>::rank) ==
+                             7)>::type* = 0) {
+  if (dst.data() == nullptr) {
+    return;
+  }
 
-    const size_t N = dst.extent(0)*dst.extent(1)*dst.extent(2)*dst.extent(3)*dst.extent(4)*dst.extent(5);
+  const size_t N = dst.extent(0) * dst.extent(1) * dst.extent(2) *
+                   dst.extent(3) * dst.extent(4) * dst.extent(5) *
+                   dst.extent(6);
 
-    if ( dst.span_is_contiguous() ) {
-        team.team_barrier();
-        local_deep_copy_contiguous(team,dst,value);
-        team.team_barrier();
-    } else {
-        team.team_barrier();    
-        Kokkos::parallel_for(Kokkos::TeamThreadRange(team, N), [&] (const int& i) {
-            int i0   = i%dst.extent(0);
-            int itmp = i/dst.extent(0);
-            int i1   = itmp%dst.extent(1);
-                itmp = itmp/dst.extent(1);
-            int i2   = itmp%dst.extent(2);
-                itmp = itmp/dst.extent(2);
-            int i3   = itmp%dst.extent(3);
-                itmp = itmp/dst.extent(3);
-            int i4   = itmp%dst.extent(4);
-            int i5   = itmp/dst.extent(4);
-            dst(i0,i1,i2,i3,i4,i5) =  value;
-        });
-        team.team_barrier();
-    }
+  if (dst.span_is_contiguous()) {
+    team.team_barrier();
+    local_deep_copy_contiguous(team, dst, value);
+    team.team_barrier();
+  } else {
+    team.team_barrier();
+    Kokkos::parallel_for(Kokkos::TeamThreadRange(team, N), [&](const int& i) {
+      int i0                          = i % dst.extent(0);
+      int itmp                        = i / dst.extent(0);
+      int i1                          = itmp % dst.extent(1);
+      itmp                            = itmp / dst.extent(1);
+      int i2                          = itmp % dst.extent(2);
+      itmp                            = itmp / dst.extent(2);
+      int i3                          = itmp % dst.extent(3);
+      itmp                            = itmp / dst.extent(3);
+      int i4                          = itmp % dst.extent(4);
+      itmp                            = itmp / dst.extent(4);
+      int i5                          = itmp % dst.extent(5);
+      int i6                          = itmp / dst.extent(5);
+      dst(i0, i1, i2, i3, i4, i5, i6) = value;
+    });
+    team.team_barrier();
+  }
 }
 //----------------------------------------------------------------------------
-template< class TeamType, class DT , class ... DP >
-void KOKKOS_INLINE_FUNCTION local_deep_copy (const TeamType& team, const View<DT,DP...> & dst, 
-                                                                   typename ViewTraits<DT,DP...>::const_value_type & value,
-                                                                   typename std::enable_if<( unsigned(ViewTraits<DT,DP...>::rank) == 7 )>::type * = 0 )
-{
-    if( dst.data() == nullptr ) {
-        return;
-    }
+template <class DT, class... DP>
+void KOKKOS_INLINE_FUNCTION local_deep_copy(
+    const View<DT, DP...>& dst,
+    typename ViewTraits<DT, DP...>::const_value_type& value,
+    typename std::enable_if<(unsigned(ViewTraits<DT, DP...>::rank) ==
+                             1)>::type* = 0) {
+  if (dst.data() == nullptr) {
+    return;
+  }
 
-    const size_t N = dst.extent(0)*dst.extent(1)*dst.extent(2)*dst.extent(3)*dst.extent(4)*dst.extent(5)*dst.extent(6);
+  const size_t N = dst.extent(0);
 
-    if ( dst.span_is_contiguous() ) {
-        team.team_barrier();
-        local_deep_copy_contiguous(team,dst,value);
-        team.team_barrier();
-    } else {
-        team.team_barrier();    
-        Kokkos::parallel_for(Kokkos::TeamThreadRange(team, N), [&] (const int& i) {
-            int i0   = i%dst.extent(0);
-            int itmp = i/dst.extent(0);
-            int i1   = itmp%dst.extent(1);
-                itmp = itmp/dst.extent(1);
-            int i2   = itmp%dst.extent(2);
-                itmp = itmp/dst.extent(2);
-            int i3   = itmp%dst.extent(3);
-                itmp = itmp/dst.extent(3);
-            int i4   = itmp%dst.extent(4);
-                itmp = itmp/dst.extent(4);
-            int i5   = itmp%dst.extent(5);
-            int i6   = itmp/dst.extent(5);
-            dst(i0,i1,i2,i3,i4,i5,i6) =  value;
-        });
-        team.team_barrier();
-    }
+  for (size_t i = 0; i < N; ++i) {
+    dst(i) = value;
+  }
 }
 //----------------------------------------------------------------------------
-template< class DT , class ... DP >
-void KOKKOS_INLINE_FUNCTION local_deep_copy (const View<DT,DP...> & dst,  
-                                             typename ViewTraits<DT,DP...>::const_value_type & value,
-                                             typename std::enable_if<( unsigned(ViewTraits<DT,DP...>::rank) == 1
-                                                                     )>::type * = 0 )
-{
-    if( dst.data() == nullptr ) {
-        return;
-    }
+template <class DT, class... DP>
+void KOKKOS_INLINE_FUNCTION local_deep_copy(
+    const View<DT, DP...>& dst,
+    typename ViewTraits<DT, DP...>::const_value_type& value,
+    typename std::enable_if<(unsigned(ViewTraits<DT, DP...>::rank) ==
+                             2)>::type* = 0) {
+  if (dst.data() == nullptr) {
+    return;
+  }
 
-    const size_t N = dst.extent(0);
-
-    
-    for(size_t i=0;i<N;++i){
-        dst(i) = value;
-    }
+  if (dst.span_is_contiguous()) {
+    local_deep_copy_contiguous(dst, value);
+  } else {
+    for (size_t i0 = 0; i0 < dst.extent(0); ++i0)
+      for (size_t i1 = 0; i1 < dst.extent(1); ++i1) dst(i0, i1) = value;
+  }
 }
 //----------------------------------------------------------------------------
-template< class DT , class ... DP >
-void KOKKOS_INLINE_FUNCTION local_deep_copy (const View<DT,DP...> & dst,  
-                                             typename ViewTraits<DT,DP...>::const_value_type & value,
-                                             typename std::enable_if<( unsigned(ViewTraits<DT,DP...>::rank) == 2
-                                                                     )>::type * = 0 )
-{
-    if( dst.data() == nullptr ) {
-        return;
-    }
+template <class DT, class... DP>
+void KOKKOS_INLINE_FUNCTION local_deep_copy(
+    const View<DT, DP...>& dst,
+    typename ViewTraits<DT, DP...>::const_value_type& value,
+    typename std::enable_if<(unsigned(ViewTraits<DT, DP...>::rank) ==
+                             3)>::type* = 0) {
+  if (dst.data() == nullptr) {
+    return;
+  }
 
-    if ( dst.span_is_contiguous() ) {
-        local_deep_copy_contiguous(dst,value);
-    } else {
-        
-        for(size_t i0=0;i0<dst.extent(0);++i0)
-            for(size_t i1=0;i1<dst.extent(1);++i1)
-                dst(i0,i1) = value;
-    }
+  if (dst.span_is_contiguous()) {
+    local_deep_copy_contiguous(dst, value);
+  } else {
+    for (size_t i0 = 0; i0 < dst.extent(0); ++i0)
+      for (size_t i1 = 0; i1 < dst.extent(1); ++i1)
+        for (size_t i2 = 0; i2 < dst.extent(2); ++i2) dst(i0, i1, i2) = value;
+  }
 }
 //----------------------------------------------------------------------------
-template< class DT , class ... DP >
-void KOKKOS_INLINE_FUNCTION local_deep_copy (const View<DT,DP...> & dst,  
-                                             typename ViewTraits<DT,DP...>::const_value_type & value,
-                                             typename std::enable_if<( unsigned(ViewTraits<DT,DP...>::rank) == 3
-                                                                     )>::type * = 0 )
-{
-    if( dst.data() == nullptr ) {
-        return;
-    }
+template <class DT, class... DP>
+void KOKKOS_INLINE_FUNCTION local_deep_copy(
+    const View<DT, DP...>& dst,
+    typename ViewTraits<DT, DP...>::const_value_type& value,
+    typename std::enable_if<(unsigned(ViewTraits<DT, DP...>::rank) ==
+                             4)>::type* = 0) {
+  if (dst.data() == nullptr) {
+    return;
+  }
 
-    if ( dst.span_is_contiguous() ) {
-        local_deep_copy_contiguous(dst,value);
-    } else {
-        
-        for(size_t i0=0;i0<dst.extent(0);++i0)
-            for(size_t i1=0;i1<dst.extent(1);++i1)
-                for(size_t i2=0;i2<dst.extent(2);++i2)
-                    dst(i0,i1,i2) = value;
-    }
+  if (dst.span_is_contiguous()) {
+    local_deep_copy_contiguous(dst, value);
+  } else {
+    for (size_t i0 = 0; i0 < dst.extent(0); ++i0)
+      for (size_t i1 = 0; i1 < dst.extent(1); ++i1)
+        for (size_t i2 = 0; i2 < dst.extent(2); ++i2)
+          for (size_t i3 = 0; i3 < dst.extent(3); ++i3)
+            dst(i0, i1, i2, i3) = value;
+  }
 }
 //----------------------------------------------------------------------------
-template< class DT , class ... DP >
-void KOKKOS_INLINE_FUNCTION local_deep_copy (const View<DT,DP...> & dst,
-                                             typename ViewTraits<DT,DP...>::const_value_type & value,
-                                             typename std::enable_if<( unsigned(ViewTraits<DT,DP...>::rank) == 4
-                                                                     )>::type * = 0 )
-{
-    if( dst.data() == nullptr ) {
-        return;
-    }
+template <class DT, class... DP>
+void KOKKOS_INLINE_FUNCTION local_deep_copy(
+    const View<DT, DP...>& dst,
+    typename ViewTraits<DT, DP...>::const_value_type& value,
+    typename std::enable_if<(unsigned(ViewTraits<DT, DP...>::rank) ==
+                             5)>::type* = 0) {
+  if (dst.data() == nullptr) {
+    return;
+  }
 
-    if ( dst.span_is_contiguous() ) {
-        local_deep_copy_contiguous(dst,value);
-    } else {
-        
-        for(size_t i0=0;i0<dst.extent(0);++i0)
-            for(size_t i1=0;i1<dst.extent(1);++i1)
-                for(size_t i2=0;i2<dst.extent(2);++i2)
-                    for(size_t i3=0;i3<dst.extent(3);++i3)
-                        dst(i0,i1,i2,i3) = value;
-    }
+  if (dst.span_is_contiguous()) {
+    local_deep_copy_contiguous(dst, value);
+  } else {
+    for (size_t i0 = 0; i0 < dst.extent(0); ++i0)
+      for (size_t i1 = 0; i1 < dst.extent(1); ++i1)
+        for (size_t i2 = 0; i2 < dst.extent(2); ++i2)
+          for (size_t i3 = 0; i3 < dst.extent(3); ++i3)
+            for (size_t i4 = 0; i4 < dst.extent(4); ++i4)
+              dst(i0, i1, i2, i3, i4) = value;
+  }
 }
 //----------------------------------------------------------------------------
-template< class DT , class ... DP >
-void KOKKOS_INLINE_FUNCTION local_deep_copy (const View<DT,DP...> & dst,
-                                             typename ViewTraits<DT,DP...>::const_value_type & value,
-                                             typename std::enable_if<( unsigned(ViewTraits<DT,DP...>::rank) == 5
-                                                                     )>::type * = 0 )
-{
-    if( dst.data() == nullptr ) {
-        return;
-    }
+template <class DT, class... DP>
+void KOKKOS_INLINE_FUNCTION local_deep_copy(
+    const View<DT, DP...>& dst,
+    typename ViewTraits<DT, DP...>::const_value_type& value,
+    typename std::enable_if<(unsigned(ViewTraits<DT, DP...>::rank) ==
+                             6)>::type* = 0) {
+  if (dst.data() == nullptr) {
+    return;
+  }
 
-    if ( dst.span_is_contiguous() ) {
-        local_deep_copy_contiguous(dst,value);
-    } else {
-        
-        for(size_t i0=0;i0<dst.extent(0);++i0)
-            for(size_t i1=0;i1<dst.extent(1);++i1)
-                for(size_t i2=0;i2<dst.extent(2);++i2)
-                    for(size_t i3=0;i3<dst.extent(3);++i3)
-                        for(size_t i4=0;i4<dst.extent(4);++i4)
-                            dst(i0,i1,i2,i3,i4) = value;
-    }
+  if (dst.span_is_contiguous()) {
+    local_deep_copy_contiguous(dst, value);
+  } else {
+    for (size_t i0 = 0; i0 < dst.extent(0); ++i0)
+      for (size_t i1 = 0; i1 < dst.extent(1); ++i1)
+        for (size_t i2 = 0; i2 < dst.extent(2); ++i2)
+          for (size_t i3 = 0; i3 < dst.extent(3); ++i3)
+            for (size_t i4 = 0; i4 < dst.extent(4); ++i4)
+              for (size_t i5 = 0; i5 < dst.extent(5); ++i5)
+                dst(i0, i1, i2, i3, i4, i5) = value;
+  }
 }
 //----------------------------------------------------------------------------
-template< class DT , class ... DP >
-void KOKKOS_INLINE_FUNCTION local_deep_copy (const View<DT,DP...> & dst,
-                                             typename ViewTraits<DT,DP...>::const_value_type & value,
-                                             typename std::enable_if<( unsigned(ViewTraits<DT,DP...>::rank) == 6
-                                                                     )>::type * = 0 )
-{
-    if( dst.data() == nullptr ) {
-        return;
-    }
+template <class DT, class... DP>
+void KOKKOS_INLINE_FUNCTION local_deep_copy(
+    const View<DT, DP...>& dst,
+    typename ViewTraits<DT, DP...>::const_value_type& value,
+    typename std::enable_if<(unsigned(ViewTraits<DT, DP...>::rank) ==
+                             7)>::type* = 0) {
+  if (dst.data() == nullptr) {
+    return;
+  }
 
-    if ( dst.span_is_contiguous() ) {
-        local_deep_copy_contiguous(dst,value);
-    } else {
-        
-        for(size_t i0=0;i0<dst.extent(0);++i0)
-            for(size_t i1=0;i1<dst.extent(1);++i1)
-                for(size_t i2=0;i2<dst.extent(2);++i2)
-                    for(size_t i3=0;i3<dst.extent(3);++i3)
-                        for(size_t i4=0;i4<dst.extent(4);++i4)
-                            for(size_t i5=0;i5<dst.extent(5);++i5)
-                                dst(i0,i1,i2,i3,i4,i5) = value;
-    }
-}
-//----------------------------------------------------------------------------
-template< class DT , class ... DP >
-void KOKKOS_INLINE_FUNCTION local_deep_copy (const View<DT,DP...> & dst,
-                                             typename ViewTraits<DT,DP...>::const_value_type & value,
-                                             typename std::enable_if<( unsigned(ViewTraits<DT,DP...>::rank) == 7
-                                                                     )>::type * = 0 )
-{
-    if( dst.data() == nullptr ) {
-        return;
-    }
-
-    if ( dst.span_is_contiguous() ) {
-        local_deep_copy_contiguous(dst,value);
-    } else {
-        
-        for(size_t i0=0;i0<dst.extent(0);++i0)
-            for(size_t i1=0;i1<dst.extent(1);++i1)
-                for(size_t i2=0;i2<dst.extent(2);++i2)
-                    for(size_t i3=0;i3<dst.extent(3);++i3)
-                        for(size_t i4=0;i4<dst.extent(4);++i4)
-                            for(size_t i5=0;i5<dst.extent(5);++i5)
-                                for(size_t i6=0;i6<dst.extent(6);++i6)
-                                    dst(i0,i1,i2,i3,i4,i5,i6) = value;
-    }
+  if (dst.span_is_contiguous()) {
+    local_deep_copy_contiguous(dst, value);
+  } else {
+    for (size_t i0 = 0; i0 < dst.extent(0); ++i0)
+      for (size_t i1 = 0; i1 < dst.extent(1); ++i1)
+        for (size_t i2 = 0; i2 < dst.extent(2); ++i2)
+          for (size_t i3 = 0; i3 < dst.extent(3); ++i3)
+            for (size_t i4 = 0; i4 < dst.extent(4); ++i4)
+              for (size_t i5 = 0; i5 < dst.extent(5); ++i5)
+                for (size_t i6 = 0; i6 < dst.extent(6); ++i6)
+                  dst(i0, i1, i2, i3, i4, i5, i6) = value;
+  }
 }
 } /* namespace Experimental */
 } /* namespace Kokkos */
@@ -2319,261 +2622,334 @@ void KOKKOS_INLINE_FUNCTION local_deep_copy (const View<DT,DP...> & dst,
 namespace Kokkos {
 
 /** \brief  Deep copy a value from Host memory into a view.  */
-template< class ExecSpace ,class DT , class ... DP >
-inline
-void deep_copy
-  ( const ExecSpace &
-  , const View<DT,DP...> & dst
-  , typename ViewTraits<DT,DP...>::const_value_type & value
-  , typename std::enable_if<
-    Kokkos::Impl::is_execution_space< ExecSpace >::value &&
-    std::is_same< typename ViewTraits<DT,DP...>::specialize , void >::value
-    >::type * = 0 )
-{
-  static_assert(
-    std::is_same< typename ViewTraits<DT,DP...>::non_const_value_type ,
-                  typename ViewTraits<DT,DP...>::value_type >::value
-    , "deep_copy requires non-const type" );
-
+template <class ExecSpace, class DT, class... DP>
+inline void deep_copy(
+    const ExecSpace&, const View<DT, DP...>& dst,
+    typename ViewTraits<DT, DP...>::const_value_type& value,
+    typename std::enable_if<
+        Kokkos::Impl::is_execution_space<ExecSpace>::value &&
+        std::is_same<typename ViewTraits<DT, DP...>::specialize,
+                     void>::value>::type* = 0) {
+  typedef ViewTraits<DT, DP...> dst_traits;
+  typedef typename dst_traits::memory_space dst_memory_space;
+  static_assert(std::is_same<typename dst_traits::non_const_value_type,
+                             typename dst_traits::value_type>::value,
+                "deep_copy requires non-const type");
+#if defined(KOKKOS_ENABLE_PROFILING)
+  if (Kokkos::Profiling::profileLibraryLoaded()) {
+    Kokkos::Profiling::beginDeepCopy(
+        Kokkos::Profiling::SpaceHandle(dst_memory_space().name()), dst.label(),
+        dst.data(), Kokkos::Profiling::SpaceHandle(Kokkos::HostSpace().name()),
+        "(none)", &value, dst.span() * sizeof(typename dst_traits::value_type));
+  }
+#endif
   ExecSpace().fence();
-  typedef typename View<DT,DP...>::uniform_runtime_nomemspace_type ViewTypeUniform;
-  Kokkos::Impl::ViewFill< ViewTypeUniform >( dst , value );
+  typedef
+      typename View<DT, DP...>::uniform_runtime_nomemspace_type ViewTypeUniform;
+  Kokkos::Impl::ViewFill<ViewTypeUniform>(dst, value);
   ExecSpace().fence();
+#if defined(KOKKOS_ENABLE_PROFILING)
+  if (Kokkos::Profiling::profileLibraryLoaded()) {
+    Kokkos::Profiling::endDeepCopy();
+  }
+#endif
 }
 
 /** \brief  Deep copy into a value in Host memory from a view.  */
-template< class ExecSpace , class ST , class ... SP >
-inline
-void deep_copy
-  ( const ExecSpace & exec_space
-  , typename ViewTraits<ST,SP...>::non_const_value_type & dst
-  , const View<ST,SP...> & src
-  , typename std::enable_if<
-    Kokkos::Impl::is_execution_space< ExecSpace >::value &&
-    std::is_same< typename ViewTraits<ST,SP...>::specialize , void >::value
-    >::type * = 0 )
-{
-  static_assert( ViewTraits<ST,SP...>::rank == 0
-               , "ERROR: Non-rank-zero view in deep_copy( value , View )" );
+template <class ExecSpace, class ST, class... SP>
+inline void deep_copy(
+    const ExecSpace& exec_space,
+    typename ViewTraits<ST, SP...>::non_const_value_type& dst,
+    const View<ST, SP...>& src,
+    typename std::enable_if<
+        Kokkos::Impl::is_execution_space<ExecSpace>::value &&
+        std::is_same<typename ViewTraits<ST, SP...>::specialize,
+                     void>::value>::type* = 0) {
+  typedef ViewTraits<ST, SP...> src_traits;
+  typedef typename src_traits::memory_space src_memory_space;
+  static_assert(src_traits::rank == 0,
+                "ERROR: Non-rank-zero view in deep_copy( value , View )");
+#if defined(KOKKOS_ENABLE_PROFILING)
+  if (Kokkos::Profiling::profileLibraryLoaded()) {
+    Kokkos::Profiling::beginDeepCopy(
+        Kokkos::Profiling::SpaceHandle(Kokkos::HostSpace().name()), "(none)",
+        &dst, Kokkos::Profiling::SpaceHandle(src_memory_space().name()),
+        src.label(), src.data(), sizeof(ST));
+  }
+#endif
 
-  if(src.data() == NULL) {
+  if (src.data() == NULL) {
     exec_space.fence();
+#if defined(KOKKOS_ENABLE_PROFILING)
+    if (Kokkos::Profiling::profileLibraryLoaded()) {
+      Kokkos::Profiling::endDeepCopy();
+    }
+#endif
     return;
   }
 
-  typedef ViewTraits<ST,SP...>               src_traits ;
-  typedef typename src_traits::memory_space  src_memory_space ;
-  Kokkos::Impl::DeepCopy< HostSpace , src_memory_space , ExecSpace >
-    ( exec_space , & dst , src.data() , sizeof(ST) );
+  Kokkos::Impl::DeepCopy<HostSpace, src_memory_space, ExecSpace>(
+      exec_space, &dst, src.data(), sizeof(ST));
+#if defined(KOKKOS_ENABLE_PROFILING)
+  if (Kokkos::Profiling::profileLibraryLoaded()) {
+    Kokkos::Profiling::endDeepCopy();
+  }
+#endif
 }
 
 //----------------------------------------------------------------------------
 /** \brief  A deep copy between views of compatible type, and rank zero.  */
-template< class ExecSpace , class DT , class ... DP , class ST , class ... SP >
-inline
-void deep_copy
-  ( const ExecSpace & exec_space
-  , const View<DT,DP...> & dst
-  , const View<ST,SP...> & src
-  , typename std::enable_if<(
-    Kokkos::Impl::is_execution_space< ExecSpace >::value &&
-    std::is_same< typename ViewTraits<DT,DP...>::specialize , void >::value &&
-    std::is_same< typename ViewTraits<ST,SP...>::specialize , void >::value &&
-    ( unsigned(ViewTraits<DT,DP...>::rank) == unsigned(0) &&
-      unsigned(ViewTraits<ST,SP...>::rank) == unsigned(0) )
-  )>::type * = 0 )
-{
-  static_assert(
-    std::is_same< typename ViewTraits<DT,DP...>::value_type ,
-                  typename ViewTraits<ST,SP...>::non_const_value_type >::value
-    , "deep_copy requires matching non-const destination type" );
+template <class ExecSpace, class DT, class... DP, class ST, class... SP>
+inline void deep_copy(
+    const ExecSpace& exec_space, const View<DT, DP...>& dst,
+    const View<ST, SP...>& src,
+    typename std::enable_if<(
+        Kokkos::Impl::is_execution_space<ExecSpace>::value &&
+        std::is_same<typename ViewTraits<DT, DP...>::specialize, void>::value &&
+        std::is_same<typename ViewTraits<ST, SP...>::specialize, void>::value &&
+        (unsigned(ViewTraits<DT, DP...>::rank) == unsigned(0) &&
+         unsigned(ViewTraits<ST, SP...>::rank) == unsigned(0)))>::type* = 0) {
+  typedef ViewTraits<ST, SP...> src_traits;
+  typedef ViewTraits<DT, DP...> dst_traits;
 
-  typedef View<DT,DP...>  dst_type ;
-  typedef View<ST,SP...>  src_type ;
+  typedef typename src_traits::memory_space src_memory_space;
+  typedef typename dst_traits::memory_space dst_memory_space;
+  static_assert(std::is_same<typename dst_traits::value_type,
+                             typename src_traits::non_const_value_type>::value,
+                "deep_copy requires matching non-const destination type");
 
-  typedef typename dst_type::value_type    value_type ;
-  typedef typename dst_type::memory_space  dst_memory_space ;
-  typedef typename src_type::memory_space  src_memory_space ;
-  if(dst.data() == NULL && src.data() == NULL) {
+#if defined(KOKKOS_ENABLE_PROFILING)
+  if (Kokkos::Profiling::profileLibraryLoaded()) {
+    Kokkos::Profiling::beginDeepCopy(
+        Kokkos::Profiling::SpaceHandle(dst_memory_space().name()), dst.label(),
+        dst.data(), Kokkos::Profiling::SpaceHandle(src_memory_space().name()),
+        src.label(), src.data(), sizeof(DT));
+  }
+#endif
+
+  if (dst.data() == NULL && src.data() == NULL) {
     exec_space.fence();
+#if defined(KOKKOS_ENABLE_PROFILING)
+    if (Kokkos::Profiling::profileLibraryLoaded()) {
+      Kokkos::Profiling::endDeepCopy();
+    }
+#endif
     return;
   }
 
   exec_space.fence();
-  if ( dst.data() != src.data() ) {
-    Kokkos::Impl::DeepCopy< dst_memory_space , src_memory_space , ExecSpace >
-      ( exec_space , dst.data() , src.data() , sizeof(value_type) );
+  if (dst.data() != src.data()) {
+    Kokkos::Impl::DeepCopy<dst_memory_space, src_memory_space, ExecSpace>(
+        exec_space, dst.data(), src.data(),
+        sizeof(typename dst_traits::value_type));
   }
   exec_space.fence();
+#if defined(KOKKOS_ENABLE_PROFILING)
+  if (Kokkos::Profiling::profileLibraryLoaded()) {
+    Kokkos::Profiling::endDeepCopy();
+  }
+#endif
 }
 
 //----------------------------------------------------------------------------
-/** \brief  A deep copy between views of the default specialization, compatible type,
- *          same non-zero rank
+/** \brief  A deep copy between views of the default specialization, compatible
+ * type, same non-zero rank
  */
-template< class ExecSpace , class DT, class ... DP, class ST, class ... SP >
-inline
-void deep_copy
-  ( const ExecSpace & exec_space
-  , const View<DT,DP...> & dst
-  , const View<ST,SP...> & src
-  , typename std::enable_if<(
-    Kokkos::Impl::is_execution_space< ExecSpace >::value &&
-    std::is_same< typename ViewTraits<DT,DP...>::specialize , void >::value &&
-    std::is_same< typename ViewTraits<ST,SP...>::specialize , void >::value &&
-    ( unsigned(ViewTraits<DT,DP...>::rank) != 0 ||
-      unsigned(ViewTraits<ST,SP...>::rank) != 0 )
-  )>::type * = 0 )
-{
-  typedef View<DT,DP...>  dst_type ;
-  typedef View<ST,SP...>  src_type ;
+template <class ExecSpace, class DT, class... DP, class ST, class... SP>
+inline void deep_copy(
+    const ExecSpace& exec_space, const View<DT, DP...>& dst,
+    const View<ST, SP...>& src,
+    typename std::enable_if<(
+        Kokkos::Impl::is_execution_space<ExecSpace>::value &&
+        std::is_same<typename ViewTraits<DT, DP...>::specialize, void>::value &&
+        std::is_same<typename ViewTraits<ST, SP...>::specialize, void>::value &&
+        (unsigned(ViewTraits<DT, DP...>::rank) != 0 ||
+         unsigned(ViewTraits<ST, SP...>::rank) != 0))>::type* = 0) {
+  typedef View<DT, DP...> dst_type;
+  typedef View<ST, SP...> src_type;
 
-  static_assert(
-    std::is_same< typename dst_type::value_type ,
-                  typename dst_type::non_const_value_type >::value
-    , "deep_copy requires non-const destination type" );
+  static_assert(std::is_same<typename dst_type::value_type,
+                             typename dst_type::non_const_value_type>::value,
+                "deep_copy requires non-const destination type");
 
-  static_assert(
-    ( unsigned(dst_type::rank) ==
-      unsigned(src_type::rank) )
-    , "deep_copy requires Views of equal rank" );
+  static_assert((unsigned(dst_type::rank) == unsigned(src_type::rank)),
+                "deep_copy requires Views of equal rank");
 
-  typedef typename dst_type::execution_space  dst_execution_space ;
-  typedef typename src_type::execution_space  src_execution_space ;
-  typedef typename dst_type::memory_space     dst_memory_space ;
-  typedef typename src_type::memory_space     src_memory_space ;
-  typedef typename dst_type::value_type       dst_value_type ;
-  typedef typename src_type::value_type       src_value_type ;
+  typedef typename dst_type::execution_space dst_execution_space;
+  typedef typename src_type::execution_space src_execution_space;
+  typedef typename dst_type::memory_space dst_memory_space;
+  typedef typename src_type::memory_space src_memory_space;
+  typedef typename dst_type::value_type dst_value_type;
+  typedef typename src_type::value_type src_value_type;
 
-  if(dst.data() == NULL || src.data() == NULL) {
+#if defined(KOKKOS_ENABLE_PROFILING)
+  if (Kokkos::Profiling::profileLibraryLoaded()) {
+    Kokkos::Profiling::beginDeepCopy(
+        Kokkos::Profiling::SpaceHandle(dst_memory_space().name()), dst.label(),
+        dst.data(), Kokkos::Profiling::SpaceHandle(src_memory_space().name()),
+        src.label(), src.data(), dst.span() * sizeof(dst_value_type));
+  }
+#endif
+
+  if (dst.data() == NULL || src.data() == NULL) {
 #ifdef KOKKOS_ENABLE_DEPRECATED_CODE
     // do nothing
 #else
     // throw if dimension mismatch
-    if ( (src.extent(0) != dst.extent(0)) ||
-         (src.extent(1) != dst.extent(1)) ||
-         (src.extent(2) != dst.extent(2)) ||
-         (src.extent(3) != dst.extent(3)) ||
-         (src.extent(4) != dst.extent(4)) ||
-         (src.extent(5) != dst.extent(5)) ||
-         (src.extent(6) != dst.extent(6)) ||
-         (src.extent(7) != dst.extent(7))
-       ) {
-      std::string message("Deprecation Error: Kokkos::deep_copy extents of views don't match: ");
-      message += dst.label(); message += "(";
-      for(int r = 0; r<dst_type::Rank-1; r++)
-        { message+= std::to_string(dst.extent(r)); message += ","; }
-      message+= std::to_string(dst.extent(dst_type::Rank-1)); message += ") ";
-      message += src.label(); message += "(";
-      for(int r = 0; r<src_type::Rank-1; r++)
-        { message+= std::to_string(src.extent(r)); message += ","; }
-      message+= std::to_string(src.extent(src_type::Rank-1)); message += ") ";
+    if ((src.extent(0) != dst.extent(0)) || (src.extent(1) != dst.extent(1)) ||
+        (src.extent(2) != dst.extent(2)) || (src.extent(3) != dst.extent(3)) ||
+        (src.extent(4) != dst.extent(4)) || (src.extent(5) != dst.extent(5)) ||
+        (src.extent(6) != dst.extent(6)) || (src.extent(7) != dst.extent(7))) {
+      std::string message(
+          "Deprecation Error: Kokkos::deep_copy extents of views don't "
+          "match: ");
+      message += dst.label();
+      message += "(";
+      for (int r = 0; r < dst_type::Rank - 1; r++) {
+        message += std::to_string(dst.extent(r));
+        message += ",";
+      }
+      message += std::to_string(dst.extent(dst_type::Rank - 1));
+      message += ") ";
+      message += src.label();
+      message += "(";
+      for (int r = 0; r < src_type::Rank - 1; r++) {
+        message += std::to_string(src.extent(r));
+        message += ",";
+      }
+      message += std::to_string(src.extent(src_type::Rank - 1));
+      message += ") ";
 
       Kokkos::Impl::throw_runtime_exception(message);
     }
 #endif
     exec_space.fence();
+#if defined(KOKKOS_ENABLE_PROFILING)
+    if (Kokkos::Profiling::profileLibraryLoaded()) {
+      Kokkos::Profiling::endDeepCopy();
+    }
+#endif
     return;
   }
 
-  enum { ExecCanAccessSrcDst =
-      Kokkos::Impl::SpaceAccessibility< ExecSpace , dst_memory_space >::accessible &&
-      Kokkos::Impl::SpaceAccessibility< ExecSpace , src_memory_space >::accessible
+  enum {
+    ExecCanAccessSrcDst =
+        Kokkos::Impl::SpaceAccessibility<ExecSpace,
+                                         dst_memory_space>::accessible &&
+        Kokkos::Impl::SpaceAccessibility<ExecSpace,
+                                         src_memory_space>::accessible
+  };
+  enum {
+    DstExecCanAccessSrc =
+        Kokkos::Impl::SpaceAccessibility<dst_execution_space,
+                                         src_memory_space>::accessible
   };
-  enum { DstExecCanAccessSrc =
-   Kokkos::Impl::SpaceAccessibility< dst_execution_space , src_memory_space >::accessible };
 
-  enum { SrcExecCanAccessDst =
-   Kokkos::Impl::SpaceAccessibility< src_execution_space , dst_memory_space >::accessible };
+  enum {
+    SrcExecCanAccessDst =
+        Kokkos::Impl::SpaceAccessibility<src_execution_space,
+                                         dst_memory_space>::accessible
+  };
 
   // Checking for Overlapping Views.
   dst_value_type* dst_start = dst.data();
   dst_value_type* dst_end   = dst.data() + dst.span();
   src_value_type* src_start = src.data();
   src_value_type* src_end   = src.data() + src.span();
-  if( ( ( (std::ptrdiff_t)dst_start < (std::ptrdiff_t)src_end ) && ( (std::ptrdiff_t)dst_end > (std::ptrdiff_t)src_start ) ) &&
-      ( ( dst.span_is_contiguous() && src.span_is_contiguous() ))) {
+  if ((((std::ptrdiff_t)dst_start < (std::ptrdiff_t)src_end) &&
+       ((std::ptrdiff_t)dst_end > (std::ptrdiff_t)src_start)) &&
+      ((dst.span_is_contiguous() && src.span_is_contiguous()))) {
     std::string message("Error: Kokkos::deep_copy of overlapping views: ");
-    message += dst.label(); message += "(";
-    message += std::to_string((std::ptrdiff_t)dst_start); message += ",";
-    message += std::to_string((std::ptrdiff_t)dst_end); message += ") ";
-    message += src.label(); message += "(";
-    message += std::to_string((std::ptrdiff_t)src_start); message += ",";
-    message += std::to_string((std::ptrdiff_t)src_end); message += ") ";
+    message += dst.label();
+    message += "(";
+    message += std::to_string((std::ptrdiff_t)dst_start);
+    message += ",";
+    message += std::to_string((std::ptrdiff_t)dst_end);
+    message += ") ";
+    message += src.label();
+    message += "(";
+    message += std::to_string((std::ptrdiff_t)src_start);
+    message += ",";
+    message += std::to_string((std::ptrdiff_t)src_end);
+    message += ") ";
     Kokkos::Impl::throw_runtime_exception(message);
   }
 
   // Check for same extents
-  if ( (src.extent(0) != dst.extent(0)) ||
-       (src.extent(1) != dst.extent(1)) ||
-       (src.extent(2) != dst.extent(2)) ||
-       (src.extent(3) != dst.extent(3)) ||
-       (src.extent(4) != dst.extent(4)) ||
-       (src.extent(5) != dst.extent(5)) ||
-       (src.extent(6) != dst.extent(6)) ||
-       (src.extent(7) != dst.extent(7))
-     ) {
+  if ((src.extent(0) != dst.extent(0)) || (src.extent(1) != dst.extent(1)) ||
+      (src.extent(2) != dst.extent(2)) || (src.extent(3) != dst.extent(3)) ||
+      (src.extent(4) != dst.extent(4)) || (src.extent(5) != dst.extent(5)) ||
+      (src.extent(6) != dst.extent(6)) || (src.extent(7) != dst.extent(7))) {
 #ifdef KOKKOS_ENABLE_DEPRECATED_CODE
     exec_space.fence();
-    if ( ExecCanAccessSrcDst ) {
-      Kokkos::Impl::ViewRemap< dst_type , src_type , ExecSpace >( dst , src );
-    }
-    else if ( DstExecCanAccessSrc ) {
-      // Copying data between views in accessible memory spaces and either non-contiguous or incompatible shape.
-      Kokkos::Impl::ViewRemap< dst_type , src_type >( dst , src );
-    }
-    else if ( SrcExecCanAccessDst ) {
-      // Copying data between views in accessible memory spaces and either non-contiguous or incompatible shape.
-      Kokkos::Impl::ViewRemap< dst_type , src_type , src_execution_space >( dst , src );
-    }
-    else {
-      Kokkos::Impl::throw_runtime_exception("deep_copy given views that would require a temporary allocation");
+    if (ExecCanAccessSrcDst) {
+      Kokkos::Impl::ViewRemap<dst_type, src_type, ExecSpace>(dst, src);
+    } else if (DstExecCanAccessSrc) {
+      // Copying data between views in accessible memory spaces and either
+      // non-contiguous or incompatible shape.
+      Kokkos::Impl::ViewRemap<dst_type, src_type>(dst, src);
+    } else if (SrcExecCanAccessDst) {
+      // Copying data between views in accessible memory spaces and either
+      // non-contiguous or incompatible shape.
+      Kokkos::Impl::ViewRemap<dst_type, src_type, src_execution_space>(dst,
+                                                                       src);
+    } else {
+      Kokkos::Impl::throw_runtime_exception(
+          "deep_copy given views that would require a temporary allocation");
     }
     exec_space.fence();
+#if defined(KOKKOS_ENABLE_PROFILING)
+    if (Kokkos::Profiling::profileLibraryLoaded()) {
+      Kokkos::Profiling::endDeepCopy();
+    }
+#endif
     return;
 #else
-    std::string message("Deprecation Error: Kokkos::deep_copy extents of views don't match: ");
-    message += dst.label(); message += "(";
-    for(int r = 0; r<dst_type::Rank-1; r++)
-      { message+= std::to_string(dst.extent(r)); message += ","; }
-    message+= std::to_string(dst.extent(dst_type::Rank-1)); message += ") ";
-    message += src.label(); message += "(";
-    for(int r = 0; r<src_type::Rank-1; r++)
-      { message+= std::to_string(src.extent(r)); message += ","; }
-    message+= std::to_string(src.extent(src_type::Rank-1)); message += ") ";
+    std::string message(
+        "Deprecation Error: Kokkos::deep_copy extents of views don't match: ");
+    message += dst.label();
+    message += "(";
+    for (int r = 0; r < dst_type::Rank - 1; r++) {
+      message += std::to_string(dst.extent(r));
+      message += ",";
+    }
+    message += std::to_string(dst.extent(dst_type::Rank - 1));
+    message += ") ";
+    message += src.label();
+    message += "(";
+    for (int r = 0; r < src_type::Rank - 1; r++) {
+      message += std::to_string(src.extent(r));
+      message += ",";
+    }
+    message += std::to_string(src.extent(src_type::Rank - 1));
+    message += ") ";
 
     Kokkos::Impl::throw_runtime_exception(message);
 #endif
   }
 
-  // If same type, equal layout, equal dimensions, equal span, and contiguous memory then can byte-wise copy
-
-  if ( std::is_same< typename dst_type::value_type ,
-                     typename src_type::non_const_value_type >::value &&
-       (
-         std::is_same< typename dst_type::array_layout ,
-                       typename src_type::array_layout >::value
-         ||
-         ( dst_type::rank == 1 &&
-           src_type::rank == 1 )
-       ) &&
-       dst.span_is_contiguous() &&
-       src.span_is_contiguous() &&
-       ((dst_type::rank < 1) || (dst.stride_0() == src.stride_0()))  &&
-       ((dst_type::rank < 2) || (dst.stride_1() == src.stride_1())) &&
-       ((dst_type::rank < 3) || (dst.stride_2() == src.stride_2())) &&
-       ((dst_type::rank < 4) || (dst.stride_3() == src.stride_3())) &&
-       ((dst_type::rank < 5) || (dst.stride_4() == src.stride_4())) &&
-       ((dst_type::rank < 6) || (dst.stride_5() == src.stride_5())) &&
-       ((dst_type::rank < 7) || (dst.stride_6() == src.stride_6())) &&
-       ((dst_type::rank < 8) || (dst.stride_7() == src.stride_7()))
-    ) {
+  // If same type, equal layout, equal dimensions, equal span, and contiguous
+  // memory then can byte-wise copy
 
+  if (std::is_same<typename dst_type::value_type,
+                   typename src_type::non_const_value_type>::value &&
+      (std::is_same<typename dst_type::array_layout,
+                    typename src_type::array_layout>::value ||
+       (dst_type::rank == 1 && src_type::rank == 1)) &&
+      dst.span_is_contiguous() && src.span_is_contiguous() &&
+      ((dst_type::rank < 1) || (dst.stride_0() == src.stride_0())) &&
+      ((dst_type::rank < 2) || (dst.stride_1() == src.stride_1())) &&
+      ((dst_type::rank < 3) || (dst.stride_2() == src.stride_2())) &&
+      ((dst_type::rank < 4) || (dst.stride_3() == src.stride_3())) &&
+      ((dst_type::rank < 5) || (dst.stride_4() == src.stride_4())) &&
+      ((dst_type::rank < 6) || (dst.stride_5() == src.stride_5())) &&
+      ((dst_type::rank < 7) || (dst.stride_6() == src.stride_6())) &&
+      ((dst_type::rank < 8) || (dst.stride_7() == src.stride_7()))) {
     const size_t nbytes = sizeof(typename dst_type::value_type) * dst.span();
     exec_space.fence();
-    if((void*)dst.data() != (void*)src.data()) {
-      Kokkos::Impl::DeepCopy< dst_memory_space , src_memory_space , ExecSpace >
-        ( exec_space , dst.data() , src.data() , nbytes );
+    if ((void*)dst.data() != (void*)src.data()) {
+      Kokkos::Impl::DeepCopy<dst_memory_space, src_memory_space, ExecSpace>(
+          exec_space, dst.data(), src.data(), nbytes);
     }
     exec_space.fence();
   } else {
@@ -2581,6 +2957,11 @@ void deep_copy
     Impl::view_copy(dst, src);
     exec_space.fence();
   }
+#if defined(KOKKOS_ENABLE_PROFILING)
+  if (Kokkos::Profiling::profileLibraryLoaded()) {
+    Kokkos::Profiling::endDeepCopy();
+  }
+#endif
 }
 
 } /* namespace Kokkos */
@@ -2590,90 +2971,82 @@ void deep_copy
 
 namespace Kokkos {
 
-/** \brief  Resize a view with copying old data to new data at the corresponding indices. */
-template< class T , class ... P >
-inline
-typename std::enable_if<
-  std::is_same<typename Kokkos::View<T,P...>::array_layout,Kokkos::LayoutLeft>::value ||
-  std::is_same<typename Kokkos::View<T,P...>::array_layout,Kokkos::LayoutRight>::value
->::type
-resize( Kokkos::View<T,P...> & v ,
-             const size_t n0 = KOKKOS_IMPL_CTOR_DEFAULT_ARG ,
-             const size_t n1 = KOKKOS_IMPL_CTOR_DEFAULT_ARG ,
-             const size_t n2 = KOKKOS_IMPL_CTOR_DEFAULT_ARG ,
-             const size_t n3 = KOKKOS_IMPL_CTOR_DEFAULT_ARG ,
-             const size_t n4 = KOKKOS_IMPL_CTOR_DEFAULT_ARG ,
-             const size_t n5 = KOKKOS_IMPL_CTOR_DEFAULT_ARG ,
-             const size_t n6 = KOKKOS_IMPL_CTOR_DEFAULT_ARG ,
-             const size_t n7 = KOKKOS_IMPL_CTOR_DEFAULT_ARG )
-{
-  typedef Kokkos::View<T,P...>  view_type ;
+/** \brief  Resize a view with copying old data to new data at the corresponding
+ * indices. */
+template <class T, class... P>
+inline typename std::enable_if<
+    std::is_same<typename Kokkos::View<T, P...>::array_layout,
+                 Kokkos::LayoutLeft>::value ||
+    std::is_same<typename Kokkos::View<T, P...>::array_layout,
+                 Kokkos::LayoutRight>::value>::type
+resize(Kokkos::View<T, P...>& v, const size_t n0 = KOKKOS_IMPL_CTOR_DEFAULT_ARG,
+       const size_t n1 = KOKKOS_IMPL_CTOR_DEFAULT_ARG,
+       const size_t n2 = KOKKOS_IMPL_CTOR_DEFAULT_ARG,
+       const size_t n3 = KOKKOS_IMPL_CTOR_DEFAULT_ARG,
+       const size_t n4 = KOKKOS_IMPL_CTOR_DEFAULT_ARG,
+       const size_t n5 = KOKKOS_IMPL_CTOR_DEFAULT_ARG,
+       const size_t n6 = KOKKOS_IMPL_CTOR_DEFAULT_ARG,
+       const size_t n7 = KOKKOS_IMPL_CTOR_DEFAULT_ARG) {
+  typedef Kokkos::View<T, P...> view_type;
 
-  static_assert( Kokkos::ViewTraits<T,P...>::is_managed , "Can only resize managed views" );
+  static_assert(Kokkos::ViewTraits<T, P...>::is_managed,
+                "Can only resize managed views");
 
   // Fix #904 by checking dimensions before actually resizing.
   //
   // Rank is known at compile time, so hopefully the compiler will
   // remove branches that are compile-time false.  The upcoming "if
   // constexpr" language feature would make this certain.
-  if (view_type::Rank == 1 &&
-      n0 == static_cast<size_t> (v.extent(0))) {
+  if (view_type::Rank == 1 && n0 == static_cast<size_t>(v.extent(0))) {
     return;
   }
-  if (view_type::Rank == 2 &&
-      n0 == static_cast<size_t> (v.extent(0)) &&
-      n1 == static_cast<size_t> (v.extent(1))) {
+  if (view_type::Rank == 2 && n0 == static_cast<size_t>(v.extent(0)) &&
+      n1 == static_cast<size_t>(v.extent(1))) {
     return;
   }
-  if (view_type::Rank == 3 &&
-      n0 == static_cast<size_t> (v.extent(0)) &&
-      n1 == static_cast<size_t> (v.extent(1)) &&
-      n2 == static_cast<size_t> (v.extent(2))) {
+  if (view_type::Rank == 3 && n0 == static_cast<size_t>(v.extent(0)) &&
+      n1 == static_cast<size_t>(v.extent(1)) &&
+      n2 == static_cast<size_t>(v.extent(2))) {
     return;
   }
-  if (view_type::Rank == 4 &&
-      n0 == static_cast<size_t> (v.extent(0)) &&
-      n1 == static_cast<size_t> (v.extent(1)) &&
-      n2 == static_cast<size_t> (v.extent(2)) &&
-      n3 == static_cast<size_t> (v.extent(3))) {
+  if (view_type::Rank == 4 && n0 == static_cast<size_t>(v.extent(0)) &&
+      n1 == static_cast<size_t>(v.extent(1)) &&
+      n2 == static_cast<size_t>(v.extent(2)) &&
+      n3 == static_cast<size_t>(v.extent(3))) {
     return;
   }
-  if (view_type::Rank == 5 &&
-      n0 == static_cast<size_t> (v.extent(0)) &&
-      n1 == static_cast<size_t> (v.extent(1)) &&
-      n2 == static_cast<size_t> (v.extent(2)) &&
-      n3 == static_cast<size_t> (v.extent(3)) &&
-      n4 == static_cast<size_t> (v.extent(4))) {
+  if (view_type::Rank == 5 && n0 == static_cast<size_t>(v.extent(0)) &&
+      n1 == static_cast<size_t>(v.extent(1)) &&
+      n2 == static_cast<size_t>(v.extent(2)) &&
+      n3 == static_cast<size_t>(v.extent(3)) &&
+      n4 == static_cast<size_t>(v.extent(4))) {
     return;
   }
-  if (view_type::Rank == 6 &&
-      n0 == static_cast<size_t> (v.extent(0)) &&
-      n1 == static_cast<size_t> (v.extent(1)) &&
-      n2 == static_cast<size_t> (v.extent(2)) &&
-      n3 == static_cast<size_t> (v.extent(3)) &&
-      n4 == static_cast<size_t> (v.extent(4)) &&
-      n5 == static_cast<size_t> (v.extent(5))) {
+  if (view_type::Rank == 6 && n0 == static_cast<size_t>(v.extent(0)) &&
+      n1 == static_cast<size_t>(v.extent(1)) &&
+      n2 == static_cast<size_t>(v.extent(2)) &&
+      n3 == static_cast<size_t>(v.extent(3)) &&
+      n4 == static_cast<size_t>(v.extent(4)) &&
+      n5 == static_cast<size_t>(v.extent(5))) {
     return;
   }
-  if (view_type::Rank == 7 &&
-      n0 == static_cast<size_t> (v.extent(0)) &&
-      n1 == static_cast<size_t> (v.extent(1)) &&
-      n2 == static_cast<size_t> (v.extent(2)) &&
-      n3 == static_cast<size_t> (v.extent(3)) &&
-      n4 == static_cast<size_t> (v.extent(4)) &&
-      n5 == static_cast<size_t> (v.extent(5)) &&
-      n6 == static_cast<size_t> (v.extent(6))) {
+  if (view_type::Rank == 7 && n0 == static_cast<size_t>(v.extent(0)) &&
+      n1 == static_cast<size_t>(v.extent(1)) &&
+      n2 == static_cast<size_t>(v.extent(2)) &&
+      n3 == static_cast<size_t>(v.extent(3)) &&
+      n4 == static_cast<size_t>(v.extent(4)) &&
+      n5 == static_cast<size_t>(v.extent(5)) &&
+      n6 == static_cast<size_t>(v.extent(6))) {
     return;
   }
-  if (view_type::Rank == 8 &&
-      n0 == static_cast<size_t> (v.extent(0)) &&
-      n1 == static_cast<size_t> (v.extent(1)) &&
-      n2 == static_cast<size_t> (v.extent(2)) &&
-      n3 == static_cast<size_t> (v.extent(3)) &&
-      n4 == static_cast<size_t> (v.extent(4)) &&
-      n5 == static_cast<size_t> (v.extent(5)) &&
-      n6 == static_cast<size_t> (v.extent(6)) &&
-      n7 == static_cast<size_t> (v.extent(7))) {
+  if (view_type::Rank == 8 && n0 == static_cast<size_t>(v.extent(0)) &&
+      n1 == static_cast<size_t>(v.extent(1)) &&
+      n2 == static_cast<size_t>(v.extent(2)) &&
+      n3 == static_cast<size_t>(v.extent(3)) &&
+      n4 == static_cast<size_t>(v.extent(4)) &&
+      n5 == static_cast<size_t>(v.extent(5)) &&
+      n6 == static_cast<size_t>(v.extent(6)) &&
+      n7 == static_cast<size_t>(v.extent(7))) {
     return;
   }
   // If Kokkos ever supports Views of rank > 8, the above code won't
@@ -2687,71 +3060,169 @@ resize( Kokkos::View<T,P...> & v ,
   // reallocates if any of the dimensions change, even if the old View
   // has enough space.
 
-  view_type v_resized( v.label(), n0, n1, n2, n3, n4, n5, n6, n7 );
+  view_type v_resized(v.label(), n0, n1, n2, n3, n4, n5, n6, n7);
 
-  Kokkos::Impl::ViewRemap< view_type , view_type >( v_resized , v );
+  Kokkos::Impl::ViewRemap<view_type, view_type>(v_resized, v);
 
-  v = v_resized ;
+  v = v_resized;
 }
 
-/** \brief  Resize a view with copying old data to new data at the corresponding indices. */
-template< class T , class ... P >
-inline
-void resize(       Kokkos::View<T,P...> & v ,
-    const typename Kokkos::View<T,P...>::array_layout & layout)
-{
-  typedef Kokkos::View<T,P...>  view_type ;
+/** \brief  Resize a view with copying old data to new data at the corresponding
+ * indices. */
+template <class I, class T, class... P>
+inline typename std::enable_if<
+    std::is_same<typename Kokkos::View<T, P...>::array_layout,
+                 Kokkos::LayoutLeft>::value ||
+    std::is_same<typename Kokkos::View<T, P...>::array_layout,
+                 Kokkos::LayoutRight>::value>::type
+resize(const I& arg_prop, Kokkos::View<T, P...>& v,
+       const size_t n0 = KOKKOS_IMPL_CTOR_DEFAULT_ARG,
+       const size_t n1 = KOKKOS_IMPL_CTOR_DEFAULT_ARG,
+       const size_t n2 = KOKKOS_IMPL_CTOR_DEFAULT_ARG,
+       const size_t n3 = KOKKOS_IMPL_CTOR_DEFAULT_ARG,
+       const size_t n4 = KOKKOS_IMPL_CTOR_DEFAULT_ARG,
+       const size_t n5 = KOKKOS_IMPL_CTOR_DEFAULT_ARG,
+       const size_t n6 = KOKKOS_IMPL_CTOR_DEFAULT_ARG,
+       const size_t n7 = KOKKOS_IMPL_CTOR_DEFAULT_ARG) {
+  typedef Kokkos::View<T, P...> view_type;
 
-  static_assert( Kokkos::ViewTraits<T,P...>::is_managed , "Can only resize managed views" );
+  static_assert(Kokkos::ViewTraits<T, P...>::is_managed,
+                "Can only resize managed views");
 
-  view_type v_resized( v.label(), layout );
+  // Fix #904 by checking dimensions before actually resizing.
+  //
+  // Rank is known at compile time, so hopefully the compiler will
+  // remove branches that are compile-time false.  The upcoming "if
+  // constexpr" language feature would make this certain.
+  if (view_type::Rank == 1 && n0 == static_cast<size_t>(v.extent(0))) {
+    return;
+  }
+  if (view_type::Rank == 2 && n0 == static_cast<size_t>(v.extent(0)) &&
+      n1 == static_cast<size_t>(v.extent(1))) {
+    return;
+  }
+  if (view_type::Rank == 3 && n0 == static_cast<size_t>(v.extent(0)) &&
+      n1 == static_cast<size_t>(v.extent(1)) &&
+      n2 == static_cast<size_t>(v.extent(2))) {
+    return;
+  }
+  if (view_type::Rank == 4 && n0 == static_cast<size_t>(v.extent(0)) &&
+      n1 == static_cast<size_t>(v.extent(1)) &&
+      n2 == static_cast<size_t>(v.extent(2)) &&
+      n3 == static_cast<size_t>(v.extent(3))) {
+    return;
+  }
+  if (view_type::Rank == 5 && n0 == static_cast<size_t>(v.extent(0)) &&
+      n1 == static_cast<size_t>(v.extent(1)) &&
+      n2 == static_cast<size_t>(v.extent(2)) &&
+      n3 == static_cast<size_t>(v.extent(3)) &&
+      n4 == static_cast<size_t>(v.extent(4))) {
+    return;
+  }
+  if (view_type::Rank == 6 && n0 == static_cast<size_t>(v.extent(0)) &&
+      n1 == static_cast<size_t>(v.extent(1)) &&
+      n2 == static_cast<size_t>(v.extent(2)) &&
+      n3 == static_cast<size_t>(v.extent(3)) &&
+      n4 == static_cast<size_t>(v.extent(4)) &&
+      n5 == static_cast<size_t>(v.extent(5))) {
+    return;
+  }
+  if (view_type::Rank == 7 && n0 == static_cast<size_t>(v.extent(0)) &&
+      n1 == static_cast<size_t>(v.extent(1)) &&
+      n2 == static_cast<size_t>(v.extent(2)) &&
+      n3 == static_cast<size_t>(v.extent(3)) &&
+      n4 == static_cast<size_t>(v.extent(4)) &&
+      n5 == static_cast<size_t>(v.extent(5)) &&
+      n6 == static_cast<size_t>(v.extent(6))) {
+    return;
+  }
+  if (view_type::Rank == 8 && n0 == static_cast<size_t>(v.extent(0)) &&
+      n1 == static_cast<size_t>(v.extent(1)) &&
+      n2 == static_cast<size_t>(v.extent(2)) &&
+      n3 == static_cast<size_t>(v.extent(3)) &&
+      n4 == static_cast<size_t>(v.extent(4)) &&
+      n5 == static_cast<size_t>(v.extent(5)) &&
+      n6 == static_cast<size_t>(v.extent(6)) &&
+      n7 == static_cast<size_t>(v.extent(7))) {
+    return;
+  }
+  // If Kokkos ever supports Views of rank > 8, the above code won't
+  // be incorrect, because avoiding reallocation in resize() is just
+  // an optimization.
 
-  Kokkos::Impl::ViewRemap< view_type , view_type >( v_resized , v );
+  // TODO (mfh 27 Jun 2017) If the old View has enough space but just
+  // different dimensions (e.g., if the product of the dimensions,
+  // including extra space for alignment, will not change), then
+  // consider just reusing storage.  For now, Kokkos always
+  // reallocates if any of the dimensions change, even if the old View
+  // has enough space.
 
-  v = v_resized ;
+  view_type v_resized(view_alloc(v.label(), std::forward<const I>(arg_prop)),
+                      n0, n1, n2, n3, n4, n5, n6, n7);
+
+  Kokkos::Impl::ViewRemap<view_type, view_type>(v_resized, v);
+
+  v = v_resized;
+}
+
+/** \brief  Resize a view with copying old data to new data at the corresponding
+ * indices. */
+template <class T, class... P>
+inline void resize(Kokkos::View<T, P...>& v,
+                   const typename Kokkos::View<T, P...>::array_layout& layout) {
+  typedef Kokkos::View<T, P...> view_type;
+
+  static_assert(Kokkos::ViewTraits<T, P...>::is_managed,
+                "Can only resize managed views");
+
+  view_type v_resized(v.label(), layout);
+
+  Kokkos::Impl::ViewRemap<view_type, view_type>(v_resized, v);
+
+  v = v_resized;
 }
 
 /** \brief  Resize a view with discarding old data. */
-template< class T , class ... P >
-inline
-typename std::enable_if<
-  std::is_same<typename Kokkos::View<T,P...>::array_layout,Kokkos::LayoutLeft>::value ||
-  std::is_same<typename Kokkos::View<T,P...>::array_layout,Kokkos::LayoutRight>::value
->::type
-realloc( Kokkos::View<T,P...> & v ,
-              const size_t n0 = KOKKOS_IMPL_CTOR_DEFAULT_ARG ,
-              const size_t n1 = KOKKOS_IMPL_CTOR_DEFAULT_ARG ,
-              const size_t n2 = KOKKOS_IMPL_CTOR_DEFAULT_ARG ,
-              const size_t n3 = KOKKOS_IMPL_CTOR_DEFAULT_ARG ,
-              const size_t n4 = KOKKOS_IMPL_CTOR_DEFAULT_ARG ,
-              const size_t n5 = KOKKOS_IMPL_CTOR_DEFAULT_ARG ,
-              const size_t n6 = KOKKOS_IMPL_CTOR_DEFAULT_ARG ,
-              const size_t n7 = KOKKOS_IMPL_CTOR_DEFAULT_ARG )
-{
-  typedef Kokkos::View<T,P...>  view_type ;
+template <class T, class... P>
+inline typename std::enable_if<
+    std::is_same<typename Kokkos::View<T, P...>::array_layout,
+                 Kokkos::LayoutLeft>::value ||
+    std::is_same<typename Kokkos::View<T, P...>::array_layout,
+                 Kokkos::LayoutRight>::value>::type
+realloc(Kokkos::View<T, P...>& v,
+        const size_t n0 = KOKKOS_IMPL_CTOR_DEFAULT_ARG,
+        const size_t n1 = KOKKOS_IMPL_CTOR_DEFAULT_ARG,
+        const size_t n2 = KOKKOS_IMPL_CTOR_DEFAULT_ARG,
+        const size_t n3 = KOKKOS_IMPL_CTOR_DEFAULT_ARG,
+        const size_t n4 = KOKKOS_IMPL_CTOR_DEFAULT_ARG,
+        const size_t n5 = KOKKOS_IMPL_CTOR_DEFAULT_ARG,
+        const size_t n6 = KOKKOS_IMPL_CTOR_DEFAULT_ARG,
+        const size_t n7 = KOKKOS_IMPL_CTOR_DEFAULT_ARG) {
+  typedef Kokkos::View<T, P...> view_type;
 
-  static_assert( Kokkos::ViewTraits<T,P...>::is_managed , "Can only realloc managed views" );
+  static_assert(Kokkos::ViewTraits<T, P...>::is_managed,
+                "Can only realloc managed views");
 
   const std::string label = v.label();
 
-  v = view_type(); // Deallocate first, if the only view to allocation
-  v = view_type( label, n0, n1, n2, n3, n4, n5, n6, n7 );
+  v = view_type();  // Deallocate first, if the only view to allocation
+  v = view_type(label, n0, n1, n2, n3, n4, n5, n6, n7);
 }
 
 /** \brief  Resize a view with discarding old data. */
-template< class T , class ... P >
-inline
-void realloc(      Kokkos::View<T,P...> & v ,
-    const typename Kokkos::View<T,P...>::array_layout & layout)
-{
-  typedef Kokkos::View<T,P...>  view_type ;
+template <class T, class... P>
+inline void realloc(
+    Kokkos::View<T, P...>& v,
+    const typename Kokkos::View<T, P...>::array_layout& layout) {
+  typedef Kokkos::View<T, P...> view_type;
 
-  static_assert( Kokkos::ViewTraits<T,P...>::is_managed , "Can only realloc managed views" );
+  static_assert(Kokkos::ViewTraits<T, P...>::is_managed,
+                "Can only realloc managed views");
 
   const std::string label = v.label();
 
-  v = view_type(); // Deallocate first, if the only view to allocation
-  v = view_type( label, layout );
+  v = view_type();  // Deallocate first, if the only view to allocation
+  v = view_type(label, layout);
 }
 } /* namespace Kokkos */
 
@@ -2762,94 +3233,99 @@ namespace Kokkos {
 namespace Impl {
 
 // Deduce Mirror Types
-template<class Space, class T, class ... P>
+template <class Space, class T, class... P>
 struct MirrorViewType {
   // The incoming view_type
-  typedef typename Kokkos::View<T,P...> src_view_type;
+  typedef typename Kokkos::View<T, P...> src_view_type;
   // The memory space for the mirror view
   typedef typename Space::memory_space memory_space;
   // Check whether it is the same memory space
-  enum { is_same_memspace = std::is_same<memory_space,typename src_view_type::memory_space>::value };
+  enum {
+    is_same_memspace =
+        std::is_same<memory_space, typename src_view_type::memory_space>::value
+  };
   // The array_layout
   typedef typename src_view_type::array_layout array_layout;
-  // The data type (we probably want it non-const since otherwise we can't even deep_copy to it.
+  // The data type (we probably want it non-const since otherwise we can't even
+  // deep_copy to it.
   typedef typename src_view_type::non_const_data_type data_type;
   // The destination view type if it is not the same memory space
-  typedef Kokkos::View<data_type,array_layout,Space> dest_view_type;
+  typedef Kokkos::View<data_type, array_layout, Space> dest_view_type;
   // If it is the same memory_space return the existsing view_type
   // This will also keep the unmanaged trait if necessary
-  typedef typename std::conditional<is_same_memspace,src_view_type,dest_view_type>::type view_type;
+  typedef typename std::conditional<is_same_memspace, src_view_type,
+                                    dest_view_type>::type view_type;
 };
 
-template<class Space, class T, class ... P>
+template <class Space, class T, class... P>
 struct MirrorType {
   // The incoming view_type
-  typedef typename Kokkos::View<T,P...> src_view_type;
+  typedef typename Kokkos::View<T, P...> src_view_type;
   // The memory space for the mirror view
   typedef typename Space::memory_space memory_space;
   // Check whether it is the same memory space
-  enum { is_same_memspace = std::is_same<memory_space,typename src_view_type::memory_space>::value };
+  enum {
+    is_same_memspace =
+        std::is_same<memory_space, typename src_view_type::memory_space>::value
+  };
   // The array_layout
   typedef typename src_view_type::array_layout array_layout;
-  // The data type (we probably want it non-const since otherwise we can't even deep_copy to it.
+  // The data type (we probably want it non-const since otherwise we can't even
+  // deep_copy to it.
   typedef typename src_view_type::non_const_data_type data_type;
   // The destination view type if it is not the same memory space
-  typedef Kokkos::View<data_type,array_layout,Space> view_type;
+  typedef Kokkos::View<data_type, array_layout, Space> view_type;
 };
 
-}
+}  // namespace Impl
 
-template< class T , class ... P >
-inline
-typename Kokkos::View<T,P...>::HostMirror
-create_mirror( const Kokkos::View<T,P...> & src
-             , typename std::enable_if<
-                 std::is_same< typename ViewTraits<T,P...>::specialize , void >::value &&
-                 ! std::is_same< typename Kokkos::ViewTraits<T,P...>::array_layout
-                               , Kokkos::LayoutStride >::value
-               >::type * = 0
-             )
-{
-  typedef View<T,P...>                   src_type ;
-  typedef typename src_type::HostMirror  dst_type ;
+template <class T, class... P>
+inline typename Kokkos::View<T, P...>::HostMirror create_mirror(
+    const Kokkos::View<T, P...>& src,
+    typename std::enable_if<
+        std::is_same<typename ViewTraits<T, P...>::specialize, void>::value &&
+        !std::is_same<typename Kokkos::ViewTraits<T, P...>::array_layout,
+                      Kokkos::LayoutStride>::value>::type* = 0) {
+  typedef View<T, P...> src_type;
+  typedef typename src_type::HostMirror dst_type;
 
-  return dst_type( std::string( src.label() ).append("_mirror")
+  return dst_type(std::string(src.label()).append("_mirror")
 #ifdef KOKKOS_ENABLE_DEPRECATED_CODE
-                   , src.extent(0)
-                   , src.extent(1)
-                   , src.extent(2)
-                   , src.extent(3)
-                   , src.extent(4)
-                   , src.extent(5)
-                   , src.extent(6)
-                   , src.extent(7) );
+                      ,
+                  src.extent(0), src.extent(1), src.extent(2), src.extent(3),
+                  src.extent(4), src.extent(5), src.extent(6), src.extent(7));
 #else
-                 , src.rank_dynamic > 0 ? src.extent(0): KOKKOS_IMPL_CTOR_DEFAULT_ARG
-                 , src.rank_dynamic > 1 ? src.extent(1): KOKKOS_IMPL_CTOR_DEFAULT_ARG
-                 , src.rank_dynamic > 2 ? src.extent(2): KOKKOS_IMPL_CTOR_DEFAULT_ARG
-                 , src.rank_dynamic > 3 ? src.extent(3): KOKKOS_IMPL_CTOR_DEFAULT_ARG
-                 , src.rank_dynamic > 4 ? src.extent(4): KOKKOS_IMPL_CTOR_DEFAULT_ARG
-                 , src.rank_dynamic > 5 ? src.extent(5): KOKKOS_IMPL_CTOR_DEFAULT_ARG
-                 , src.rank_dynamic > 6 ? src.extent(6): KOKKOS_IMPL_CTOR_DEFAULT_ARG
-                 , src.rank_dynamic > 7 ? src.extent(7): KOKKOS_IMPL_CTOR_DEFAULT_ARG );
+                      ,
+                  src.rank_dynamic > 0 ? src.extent(0)
+                                       : KOKKOS_IMPL_CTOR_DEFAULT_ARG,
+                  src.rank_dynamic > 1 ? src.extent(1)
+                                       : KOKKOS_IMPL_CTOR_DEFAULT_ARG,
+                  src.rank_dynamic > 2 ? src.extent(2)
+                                       : KOKKOS_IMPL_CTOR_DEFAULT_ARG,
+                  src.rank_dynamic > 3 ? src.extent(3)
+                                       : KOKKOS_IMPL_CTOR_DEFAULT_ARG,
+                  src.rank_dynamic > 4 ? src.extent(4)
+                                       : KOKKOS_IMPL_CTOR_DEFAULT_ARG,
+                  src.rank_dynamic > 5 ? src.extent(5)
+                                       : KOKKOS_IMPL_CTOR_DEFAULT_ARG,
+                  src.rank_dynamic > 6 ? src.extent(6)
+                                       : KOKKOS_IMPL_CTOR_DEFAULT_ARG,
+                  src.rank_dynamic > 7 ? src.extent(7)
+                                       : KOKKOS_IMPL_CTOR_DEFAULT_ARG);
 #endif
 }
 
-template< class T , class ... P >
-inline
-typename Kokkos::View<T,P...>::HostMirror
-create_mirror( const Kokkos::View<T,P...> & src
-             , typename std::enable_if<
-                 std::is_same< typename ViewTraits<T,P...>::specialize , void >::value &&
-                 std::is_same< typename Kokkos::ViewTraits<T,P...>::array_layout
-                             , Kokkos::LayoutStride >::value
-               >::type * = 0
-             )
-{
-  typedef View<T,P...>                   src_type ;
-  typedef typename src_type::HostMirror  dst_type ;
+template <class T, class... P>
+inline typename Kokkos::View<T, P...>::HostMirror create_mirror(
+    const Kokkos::View<T, P...>& src,
+    typename std::enable_if<
+        std::is_same<typename ViewTraits<T, P...>::specialize, void>::value &&
+        std::is_same<typename Kokkos::ViewTraits<T, P...>::array_layout,
+                     Kokkos::LayoutStride>::value>::type* = 0) {
+  typedef View<T, P...> src_type;
+  typedef typename src_type::HostMirror dst_type;
 
-  Kokkos::LayoutStride layout ;
+  Kokkos::LayoutStride layout;
 
   layout.dimension[0] = src.extent(0);
   layout.dimension[1] = src.extent(1);
@@ -2869,117 +3345,119 @@ create_mirror( const Kokkos::View<T,P...> & src
   layout.stride[6] = src.stride_6();
   layout.stride[7] = src.stride_7();
 
-  return dst_type( std::string( src.label() ).append("_mirror") , layout );
+  return dst_type(std::string(src.label()).append("_mirror"), layout);
 }
 
-
 // Create a mirror in a new space (specialization for different space)
-template<class Space, class T, class ... P>
-typename Impl::MirrorType<Space,T,P ...>::view_type
-create_mirror(const Space& , const Kokkos::View<T,P...> & src
-             , typename std::enable_if<
-                 std::is_same< typename ViewTraits<T,P...>::specialize , void >::value
-               >::type * = 0) {
-  return typename Impl::MirrorType<Space,T,P ...>::view_type(src.label(),src.layout());
+template <class Space, class T, class... P>
+typename Impl::MirrorType<Space, T, P...>::view_type create_mirror(
+    const Space&, const Kokkos::View<T, P...>& src,
+    typename std::enable_if<std::is_same<
+        typename ViewTraits<T, P...>::specialize, void>::value>::type* = 0) {
+  return typename Impl::MirrorType<Space, T, P...>::view_type(src.label(),
+                                                              src.layout());
 }
 
-template< class T , class ... P >
-inline
-typename Kokkos::View<T,P...>::HostMirror
-create_mirror_view( const Kokkos::View<T,P...> & src
-                  , typename std::enable_if<(
-                      std::is_same< typename Kokkos::View<T,P...>::memory_space
-                                  , typename Kokkos::View<T,P...>::HostMirror::memory_space
-                                  >::value
-                      &&
-                      std::is_same< typename Kokkos::View<T,P...>::data_type
-                                  , typename Kokkos::View<T,P...>::HostMirror::data_type
-                                  >::value
-                    )>::type * = 0
-                  )
-{
-  return src ;
+template <class T, class... P>
+inline typename Kokkos::View<T, P...>::HostMirror create_mirror_view(
+    const Kokkos::View<T, P...>& src,
+    typename std::enable_if<
+        (std::is_same<
+             typename Kokkos::View<T, P...>::memory_space,
+             typename Kokkos::View<T, P...>::HostMirror::memory_space>::value &&
+         std::is_same<typename Kokkos::View<T, P...>::data_type,
+                      typename Kokkos::View<T, P...>::HostMirror::data_type>::
+             value)>::type* = 0) {
+  return src;
 }
 
-template< class T , class ... P >
-inline
-typename Kokkos::View<T,P...>::HostMirror
-create_mirror_view( const Kokkos::View<T,P...> & src
-                  , typename std::enable_if< ! (
-                      std::is_same< typename Kokkos::View<T,P...>::memory_space
-                                  , typename Kokkos::View<T,P...>::HostMirror::memory_space
-                                  >::value
-                      &&
-                      std::is_same< typename Kokkos::View<T,P...>::data_type
-                                  , typename Kokkos::View<T,P...>::HostMirror::data_type
-                                  >::value
-                    )>::type * = 0
-                  )
-{
-  return Kokkos::create_mirror( src );
+template <class T, class... P>
+inline typename Kokkos::View<T, P...>::HostMirror create_mirror_view(
+    const Kokkos::View<T, P...>& src,
+    typename std::enable_if<!(
+        std::is_same<
+            typename Kokkos::View<T, P...>::memory_space,
+            typename Kokkos::View<T, P...>::HostMirror::memory_space>::value &&
+        std::is_same<typename Kokkos::View<T, P...>::data_type,
+                     typename Kokkos::View<T, P...>::HostMirror::data_type>::
+            value)>::type* = 0) {
+  return Kokkos::create_mirror(src);
 }
 
 // Create a mirror view in a new space (specialization for same space)
-template<class Space, class T, class ... P>
-typename Impl::MirrorViewType<Space,T,P ...>::view_type
-create_mirror_view(const Space& , const Kokkos::View<T,P...> & src
-  , typename std::enable_if<Impl::MirrorViewType<Space,T,P ...>::is_same_memspace>::type* = 0 ) {
+template <class Space, class T, class... P>
+typename Impl::MirrorViewType<Space, T, P...>::view_type create_mirror_view(
+    const Space&, const Kokkos::View<T, P...>& src,
+    typename std::enable_if<
+        Impl::MirrorViewType<Space, T, P...>::is_same_memspace>::type* = 0) {
   return src;
 }
 
 // Create a mirror view in a new space (specialization for different space)
-template<class Space, class T, class ... P>
-typename Impl::MirrorViewType<Space,T,P ...>::view_type
-create_mirror_view(const Space& , const Kokkos::View<T,P...> & src
-  , typename std::enable_if<!Impl::MirrorViewType<Space,T,P ...>::is_same_memspace>::type* = 0 ) {
-  return typename Impl::MirrorViewType<Space,T,P ...>::view_type(src.label(),src.layout());
+template <class Space, class T, class... P>
+typename Impl::MirrorViewType<Space, T, P...>::view_type create_mirror_view(
+    const Space&, const Kokkos::View<T, P...>& src,
+    typename std::enable_if<
+        !Impl::MirrorViewType<Space, T, P...>::is_same_memspace>::type* = 0) {
+  return typename Impl::MirrorViewType<Space, T, P...>::view_type(src.label(),
+                                                                  src.layout());
 }
 
-// Create a mirror view and deep_copy in a new space (specialization for same space)
-template<class Space, class T, class ... P>
-typename Impl::MirrorViewType<Space,T,P ...>::view_type
-create_mirror_view_and_copy(const Space& , const Kokkos::View<T,P...> & src
-  , std::string const& name = ""
-  , typename std::enable_if<Impl::MirrorViewType<Space,T,P ...>::is_same_memspace>::type* = 0 ) {
+// Create a mirror view and deep_copy in a new space (specialization for same
+// space)
+template <class Space, class T, class... P>
+typename Impl::MirrorViewType<Space, T, P...>::view_type
+create_mirror_view_and_copy(
+    const Space&, const Kokkos::View<T, P...>& src,
+    std::string const& name = "",
+    typename std::enable_if<
+        Impl::MirrorViewType<Space, T, P...>::is_same_memspace>::type* = 0) {
   (void)name;
   return src;
 }
 
-// Create a mirror view and deep_copy in a new space (specialization for different space)
-template<class Space, class T, class ... P>
-typename Impl::MirrorViewType<Space,T,P ...>::view_type
-create_mirror_view_and_copy(const Space& , const Kokkos::View<T,P...> & src
-  , std::string const& name = ""
-  , typename std::enable_if<!Impl::MirrorViewType<Space,T,P ...>::is_same_memspace>::type* = 0 ) {
-  using Mirror = typename Impl::MirrorViewType<Space,T,P ...>::view_type;
+// Create a mirror view and deep_copy in a new space (specialization for
+// different space)
+template <class Space, class T, class... P>
+typename Impl::MirrorViewType<Space, T, P...>::view_type
+create_mirror_view_and_copy(
+    const Space&, const Kokkos::View<T, P...>& src,
+    std::string const& name = "",
+    typename std::enable_if<
+        !Impl::MirrorViewType<Space, T, P...>::is_same_memspace>::type* = 0) {
+  using Mirror      = typename Impl::MirrorViewType<Space, T, P...>::view_type;
   std::string label = name.empty() ? src.label() : name;
   auto mirror = Mirror(ViewAllocateWithoutInitializing(label), src.layout());
   deep_copy(mirror, src);
   return mirror;
 }
-    
-// Create a mirror view in a new space without initializing (specialization for same space)
-template<class Space, class T, class ... P>
-typename Impl::MirrorViewType<Space,T,P ...>::view_type
-create_mirror_view(const Space& , const Kokkos::View<T,P...> & src
-  , Kokkos::Impl::WithoutInitializing_t
-  , typename std::enable_if<Impl::MirrorViewType<Space,T,P ...>::is_same_memspace>::type* = 0 ) {
+
+// Create a mirror view in a new space without initializing (specialization for
+// same space)
+template <class Space, class T, class... P>
+typename Impl::MirrorViewType<Space, T, P...>::view_type create_mirror_view(
+    const Space&, const Kokkos::View<T, P...>& src,
+    Kokkos::Impl::WithoutInitializing_t,
+    typename std::enable_if<
+        Impl::MirrorViewType<Space, T, P...>::is_same_memspace>::type* = 0) {
   return src;
 }
-    
-// Create a mirror view in a new space without initializing (specialization for different space)
-template<class Space, class T, class ... P>
-typename Impl::MirrorViewType<Space,T,P ...>::view_type
-create_mirror_view(const Space& , const Kokkos::View<T,P...> & src
-  , Kokkos::Impl::WithoutInitializing_t
-  , typename std::enable_if<!Impl::MirrorViewType<Space,T,P ...>::is_same_memspace>::type* = 0 ) {
-  using Mirror = typename Impl::MirrorViewType<Space,T,P ...>::view_type;
-  return Mirror(Kokkos::ViewAllocateWithoutInitializing(src.label()), src.layout());
+
+// Create a mirror view in a new space without initializing (specialization for
+// different space)
+template <class Space, class T, class... P>
+typename Impl::MirrorViewType<Space, T, P...>::view_type create_mirror_view(
+    const Space&, const Kokkos::View<T, P...>& src,
+    Kokkos::Impl::WithoutInitializing_t,
+    typename std::enable_if<
+        !Impl::MirrorViewType<Space, T, P...>::is_same_memspace>::type* = 0) {
+  using Mirror = typename Impl::MirrorViewType<Space, T, P...>::view_type;
+  return Mirror(Kokkos::ViewAllocateWithoutInitializing(src.label()),
+                src.layout());
 }
 
 } /* namespace Kokkos */
 
-
 //----------------------------------------------------------------------------
 //----------------------------------------------------------------------------
 
diff --git a/lib/kokkos/core/src/Kokkos_Core.hpp b/lib/kokkos/core/src/Kokkos_Core.hpp
index 9fbba0abfa..7661efeca7 100644
--- a/lib/kokkos/core/src/Kokkos_Core.hpp
+++ b/lib/kokkos/core/src/Kokkos_Core.hpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -49,11 +50,11 @@
 
 #include <Kokkos_Core_fwd.hpp>
 
-#if defined( KOKKOS_ENABLE_SERIAL )
+#if defined(KOKKOS_ENABLE_SERIAL)
 #include <Kokkos_Serial.hpp>
 #endif
 
-#if defined( KOKKOS_ENABLE_OPENMP )
+#if defined(KOKKOS_ENABLE_OPENMP)
 #include <Kokkos_OpenMP.hpp>
 #endif
 
@@ -62,23 +63,23 @@
 #include <Kokkos_OpenMPTargetSpace.hpp>
 //#endif
 
-#if defined( KOKKOS_ENABLE_QTHREADS )
+#if defined(KOKKOS_ENABLE_QTHREADS)
 #include <Kokkos_Qthreads.hpp>
 #endif
 
-#if defined( KOKKOS_ENABLE_HPX )
+#if defined(KOKKOS_ENABLE_HPX)
 #include <Kokkos_HPX.hpp>
 #endif
 
-#if defined( KOKKOS_ENABLE_THREADS )
+#if defined(KOKKOS_ENABLE_THREADS)
 #include <Kokkos_Threads.hpp>
 #endif
 
-#if defined( KOKKOS_ENABLE_CUDA )
+#if defined(KOKKOS_ENABLE_CUDA)
 #include <Kokkos_Cuda.hpp>
 #endif
 
-#if defined( KOKKOS_ENABLE_ROCM )
+#if defined(KOKKOS_ENABLE_ROCM)
 #include <Kokkos_ROCm.hpp>
 #endif
 
@@ -111,18 +112,13 @@ struct InitArguments {
   int skip_device;
   bool disable_warnings;
 
-  InitArguments( int nt = -1
-               , int nn = -1
-               , int dv = -1
-               , bool dw = false
-               )
-    : num_threads{ nt }
-    , num_numa{ nn }
-    , device_id{ dv }
-    , ndevices{ -1 }
-    , skip_device{ 9999 }
-    , disable_warnings{ dw }
-  {}
+  InitArguments(int nt = -1, int nn = -1, int dv = -1, bool dw = false)
+      : num_threads{nt},
+        num_numa{nn},
+        device_id{dv},
+        ndevices{-1},
+        skip_device{9999},
+        disable_warnings{dw} {}
 };
 
 void initialize(int& narg, char* arg[]);
@@ -164,9 +160,9 @@ void finalize_all();
 void fence();
 
 /** \brief Print "Bill of Materials" */
-void print_configuration( std::ostream & , const bool detail = false );
+void print_configuration(std::ostream&, const bool detail = false);
 
-} // namespace Kokkos
+}  // namespace Kokkos
 
 //----------------------------------------------------------------------------
 //----------------------------------------------------------------------------
@@ -177,92 +173,80 @@ namespace Kokkos {
  * The allocation is tracked in Kokkos memory tracking system, so
  * leaked memory can be identified.
  */
-template< class Space = typename Kokkos::DefaultExecutionSpace::memory_space >
-inline
-void * kokkos_malloc( const std::string & arg_alloc_label
-                    , const size_t arg_alloc_size )
-{
-  typedef typename Space::memory_space MemorySpace ;
-  return Impl::SharedAllocationRecord< MemorySpace >::
-    allocate_tracked( MemorySpace() , arg_alloc_label , arg_alloc_size );
+template <class Space = typename Kokkos::DefaultExecutionSpace::memory_space>
+inline void* kokkos_malloc(const std::string& arg_alloc_label,
+                           const size_t arg_alloc_size) {
+  typedef typename Space::memory_space MemorySpace;
+  return Impl::SharedAllocationRecord<MemorySpace>::allocate_tracked(
+      MemorySpace(), arg_alloc_label, arg_alloc_size);
 }
 
-template< class Space = typename Kokkos::DefaultExecutionSpace::memory_space >
-inline
-void * kokkos_malloc( const size_t arg_alloc_size )
-{
-  typedef typename Space::memory_space MemorySpace ;
-  return Impl::SharedAllocationRecord< MemorySpace >::
-    allocate_tracked( MemorySpace() , "no-label" , arg_alloc_size );
+template <class Space = typename Kokkos::DefaultExecutionSpace::memory_space>
+inline void* kokkos_malloc(const size_t arg_alloc_size) {
+  typedef typename Space::memory_space MemorySpace;
+  return Impl::SharedAllocationRecord<MemorySpace>::allocate_tracked(
+      MemorySpace(), "no-label", arg_alloc_size);
 }
 
-template< class Space = typename Kokkos::DefaultExecutionSpace::memory_space >
-inline
-void kokkos_free( void * arg_alloc )
-{
-  typedef typename Space::memory_space MemorySpace ;
-  return Impl::SharedAllocationRecord< MemorySpace >::
-    deallocate_tracked( arg_alloc );
+template <class Space = typename Kokkos::DefaultExecutionSpace::memory_space>
+inline void kokkos_free(void* arg_alloc) {
+  typedef typename Space::memory_space MemorySpace;
+  return Impl::SharedAllocationRecord<MemorySpace>::deallocate_tracked(
+      arg_alloc);
 }
 
-template< class Space = typename Kokkos::DefaultExecutionSpace::memory_space >
-inline
-void * kokkos_realloc( void * arg_alloc , const size_t arg_alloc_size )
-{
-  typedef typename Space::memory_space MemorySpace ;
-  return Impl::SharedAllocationRecord< MemorySpace >::
-    reallocate_tracked( arg_alloc , arg_alloc_size );
+template <class Space = typename Kokkos::DefaultExecutionSpace::memory_space>
+inline void* kokkos_realloc(void* arg_alloc, const size_t arg_alloc_size) {
+  typedef typename Space::memory_space MemorySpace;
+  return Impl::SharedAllocationRecord<MemorySpace>::reallocate_tracked(
+      arg_alloc, arg_alloc_size);
 }
 
-} // namespace Kokkos
+}  // namespace Kokkos
 
 namespace Kokkos {
 
 /** \brief  ScopeGuard
- *  Some user scope issues have been identified with some Kokkos::finalize calls;
- *  ScopeGuard aims to correct these issues.
+ *  Some user scope issues have been identified with some Kokkos::finalize
+ * calls; ScopeGuard aims to correct these issues.
  *
- *  Two requirements for ScopeGuard: 
- *     if Kokkos::is_initialized() in the constructor, don't call Kokkos::initialize or Kokkos::finalize
- *     it is not copyable or assignable
+ *  Two requirements for ScopeGuard:
+ *     if Kokkos::is_initialized() in the constructor, don't call
+ * Kokkos::initialize or Kokkos::finalize it is not copyable or assignable
  */
 
 class ScopeGuard {
-public:
-  ScopeGuard ( int& narg, char* arg[] )
-  {
-    sg_init = false; 
-    if ( ! Kokkos::is_initialized() ) { 
-      initialize( narg, arg );
+ public:
+  ScopeGuard(int& narg, char* arg[]) {
+    sg_init = false;
+    if (!Kokkos::is_initialized()) {
+      initialize(narg, arg);
       sg_init = true;
     }
   }
 
-  ScopeGuard ( const InitArguments& args = InitArguments() )
-  {
-    sg_init = false; 
-    if ( ! Kokkos::is_initialized() ) { 
-      initialize( args );
+  ScopeGuard(const InitArguments& args = InitArguments()) {
+    sg_init = false;
+    if (!Kokkos::is_initialized()) {
+      initialize(args);
       sg_init = true;
     }
   }
 
-  ~ScopeGuard( )
-  {
-    if ( Kokkos::is_initialized() && sg_init) { 
-      finalize(); 
+  ~ScopeGuard() {
+    if (Kokkos::is_initialized() && sg_init) {
+      finalize();
     }
   }
 
-//private:
-  bool sg_init;    
-
-  ScopeGuard& operator=( const ScopeGuard& ) = delete;
-  ScopeGuard( const ScopeGuard& ) = delete;
+  // private:
+  bool sg_init;
 
+  ScopeGuard& operator=(const ScopeGuard&) = delete;
+  ScopeGuard(const ScopeGuard&)            = delete;
 };
 
-} // namespace Kokkos
+}  // namespace Kokkos
 
 #include <Kokkos_Crs.hpp>
 #include <Kokkos_WorkGraphPolicy.hpp>
@@ -271,4 +255,3 @@ public:
 //----------------------------------------------------------------------------
 
 #endif
-
diff --git a/lib/kokkos/core/src/Kokkos_Core_fwd.hpp b/lib/kokkos/core/src/Kokkos_Core_fwd.hpp
index 55c6a5494a..5b89dc51ca 100644
--- a/lib/kokkos/core/src/Kokkos_Core_fwd.hpp
+++ b/lib/kokkos/core/src/Kokkos_Core_fwd.hpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -57,8 +58,8 @@
 //----------------------------------------------------------------------------
 // Have assumed a 64bit build (8byte pointers) throughout the code base.
 
-static_assert( sizeof(void*) == 8
-             , "Kokkos assumes 64-bit build; i.e., 8-byte pointers" );
+static_assert(sizeof(void *) == 8,
+              "Kokkos assumes 64-bit build; i.e., 8-byte pointers");
 
 //----------------------------------------------------------------------------
 
@@ -66,133 +67,137 @@ namespace Kokkos {
 
 struct AUTO_t {
   KOKKOS_INLINE_FUNCTION
-  constexpr const AUTO_t & operator()() const { return *this; }
+  constexpr const AUTO_t &operator()() const { return *this; }
 };
 
 namespace {
-/**\brief Token to indicate that a parameter's value is to be automatically selected */
+/**\brief Token to indicate that a parameter's value is to be automatically
+ * selected */
 constexpr AUTO_t AUTO = Kokkos::AUTO_t();
-}
+}  // namespace
 
 struct InvalidType {};
 
-} // namespace Kokkos
+}  // namespace Kokkos
 
 //----------------------------------------------------------------------------
 // Forward declarations for class inter-relationships
 
 namespace Kokkos {
 
-class HostSpace; ///< Memory space for main process and CPU execution spaces
+class HostSpace;  ///< Memory space for main process and CPU execution spaces
 class AnonymousSpace;
 
 #ifdef KOKKOS_ENABLE_HBWSPACE
 namespace Experimental {
-class HBWSpace; /// Memory space for hbw_malloc from memkind (e.g. for KNL processor)
+class HBWSpace;  /// Memory space for hbw_malloc from memkind (e.g. for KNL
+                 /// processor)
 }
 #endif
 
-#if defined( KOKKOS_ENABLE_SERIAL )
-class Serial;    ///< Execution space main process on CPU.
+#if defined(KOKKOS_ENABLE_SERIAL)
+class Serial;  ///< Execution space main process on CPU.
 #endif
 
-#if defined( KOKKOS_ENABLE_QTHREADS )
+#if defined(KOKKOS_ENABLE_QTHREADS)
 class Qthreads;  ///< Execution space with Qthreads back-end.
 #endif
 
-#if defined( KOKKOS_ENABLE_HPX )
+#if defined(KOKKOS_ENABLE_HPX)
 namespace Experimental {
 class HPX;  ///< Execution space with HPX back-end.
 }
 #endif
 
-#if defined( KOKKOS_ENABLE_THREADS )
-class Threads;   ///< Execution space with pthreads back-end.
+#if defined(KOKKOS_ENABLE_THREADS)
+class Threads;  ///< Execution space with pthreads back-end.
 #endif
 
-#if defined( KOKKOS_ENABLE_OPENMP )
-class OpenMP;    ///< OpenMP execution space.
+#if defined(KOKKOS_ENABLE_OPENMP)
+class OpenMP;  ///< OpenMP execution space.
 #endif
 
-#if defined( KOKKOS_ENABLE_OPENMPTARGET )
+#if defined(KOKKOS_ENABLE_OPENMPTARGET)
 namespace Experimental {
-class OpenMPTarget;    ///< OpenMPTarget execution space.
+class OpenMPTarget;  ///< OpenMPTarget execution space.
 class OpenMPTargetSpace;
-}
+}  // namespace Experimental
 #endif
 
-
-#if defined( KOKKOS_ENABLE_CUDA )
+#if defined(KOKKOS_ENABLE_CUDA)
 class CudaSpace;            ///< Memory space on Cuda GPU
 class CudaUVMSpace;         ///< Memory space on Cuda GPU with UVM
 class CudaHostPinnedSpace;  ///< Memory space on Host accessible to Cuda GPU
 class Cuda;                 ///< Execution space for Cuda GPU
 #endif
 
-#if defined( KOKKOS_ENABLE_ROCM )
+#if defined(KOKKOS_ENABLE_ROCM)
 namespace Experimental {
-class ROCmSpace ;            ///< Memory space on ROCm GPU
-class ROCm ;                 ///< Execution space for ROCm GPU
-}
+class ROCmSpace;  ///< Memory space on ROCm GPU
+class ROCm;       ///< Execution space for ROCm GPU
+}  // namespace Experimental
 #endif
 
-template<class ExecutionSpace, class MemorySpace>
+template <class ExecutionSpace, class MemorySpace>
 struct Device;
 
-} // namespace Kokkos
+}  // namespace Kokkos
 
 //----------------------------------------------------------------------------
 // Set the default execution space.
 
 /// Define Kokkos::DefaultExecutionSpace as per configuration option
 /// or chosen from the enabled execution spaces in the following order:
-/// Kokkos::Cuda, Kokkos::Experimental::OpenMPTarget, Kokkos::OpenMP, Kokkos::Threads, Kokkos::Serial
+/// Kokkos::Cuda, Kokkos::Experimental::OpenMPTarget, Kokkos::OpenMP,
+/// Kokkos::Threads, Kokkos::Serial
 
 namespace Kokkos {
 
-#if   defined( KOKKOS_ENABLE_DEFAULT_DEVICE_TYPE_CUDA )
-  typedef Cuda DefaultExecutionSpace;
-#elif defined ( KOKKOS_ENABLE_DEFAULT_DEVICE_TYPE_OPENMPTARGET )
-  typedef Experimental::OpenMPTarget DefaultExecutionSpace ;
-#elif defined ( KOKKOS_ENABLE_DEFAULT_DEVICE_TYPE_ROCM )
-  typedef Experimental::ROCm DefaultExecutionSpace ;
-#elif defined( KOKKOS_ENABLE_DEFAULT_DEVICE_TYPE_OPENMP )
-  typedef OpenMP DefaultExecutionSpace;
-#elif defined( KOKKOS_ENABLE_DEFAULT_DEVICE_TYPE_THREADS )
-  typedef Threads DefaultExecutionSpace;
+#if defined(KOKKOS_ENABLE_DEFAULT_DEVICE_TYPE_CUDA)
+typedef Cuda DefaultExecutionSpace;
+#elif defined(KOKKOS_ENABLE_DEFAULT_DEVICE_TYPE_OPENMPTARGET)
+typedef Experimental::OpenMPTarget DefaultExecutionSpace;
+#elif defined(KOKKOS_ENABLE_DEFAULT_DEVICE_TYPE_ROCM)
+typedef Experimental::ROCm DefaultExecutionSpace;
+#elif defined(KOKKOS_ENABLE_DEFAULT_DEVICE_TYPE_OPENMP)
+typedef OpenMP DefaultExecutionSpace;
+#elif defined(KOKKOS_ENABLE_DEFAULT_DEVICE_TYPE_THREADS)
+typedef Threads DefaultExecutionSpace;
 //#elif defined( KOKKOS_ENABLE_DEFAULT_DEVICE_TYPE_QTHREADS )
 //  typedef Qthreads DefaultExecutionSpace;
-#elif defined( KOKKOS_ENABLE_DEFAULT_DEVICE_TYPE_HPX )
-  typedef Kokkos::Experimental::HPX DefaultExecutionSpace;
-#elif defined( KOKKOS_ENABLE_DEFAULT_DEVICE_TYPE_SERIAL )
-  typedef Serial DefaultExecutionSpace;
+#elif defined(KOKKOS_ENABLE_DEFAULT_DEVICE_TYPE_HPX)
+typedef Kokkos::Experimental::HPX DefaultExecutionSpace;
+#elif defined(KOKKOS_ENABLE_DEFAULT_DEVICE_TYPE_SERIAL)
+typedef Serial DefaultExecutionSpace;
 #else
-#  error "At least one of the following execution spaces must be defined in order to use Kokkos: Kokkos::Cuda, Kokkos::Experimental::OpenMPTarget, Kokkos::OpenMP, Kokkos::Threads, Kokkos::Qthreads, or Kokkos::Serial."
+#error \
+    "At least one of the following execution spaces must be defined in order to use Kokkos: Kokkos::Cuda, Kokkos::Experimental::OpenMPTarget, Kokkos::OpenMP, Kokkos::Threads, Kokkos::Qthreads, or Kokkos::Serial."
 #endif
 
-#if defined( KOKKOS_ENABLE_DEFAULT_DEVICE_TYPE_OPENMP )
-  typedef OpenMP DefaultHostExecutionSpace;
-#elif defined( KOKKOS_ENABLE_DEFAULT_DEVICE_TYPE_THREADS )
-  typedef Threads DefaultHostExecutionSpace;
+#if defined(KOKKOS_ENABLE_DEFAULT_DEVICE_TYPE_OPENMP)
+typedef OpenMP DefaultHostExecutionSpace;
+#elif defined(KOKKOS_ENABLE_DEFAULT_DEVICE_TYPE_THREADS)
+typedef Threads DefaultHostExecutionSpace;
 //#elif defined( KOKKOS_ENABLE_DEFAULT_DEVICE_TYPE_QTHREADS )
 //  typedef Qthreads DefaultHostExecutionSpace;
-#elif defined( KOKKOS_ENABLE_DEFAULT_DEVICE_TYPE_SERIAL )
-  typedef Serial DefaultHostExecutionSpace;
-#elif defined( KOKKOS_ENABLE_OPENMP )
-  typedef OpenMP DefaultHostExecutionSpace;
-#elif defined( KOKKOS_ENABLE_THREADS )
-  typedef Threads DefaultHostExecutionSpace;
+#elif defined(KOKKOS_ENABLE_DEFAULT_DEVICE_TYPE_SERIAL)
+typedef Serial DefaultHostExecutionSpace;
+#elif defined(KOKKOS_ENABLE_OPENMP)
+typedef OpenMP DefaultHostExecutionSpace;
+#elif defined(KOKKOS_ENABLE_THREADS)
+typedef Threads DefaultHostExecutionSpace;
 //#elif defined( KOKKOS_ENABLE_QTHREADS )
 //  typedef Qthreads DefaultHostExecutionSpace;
-#elif defined( KOKKOS_ENABLE_HPX )
-  typedef Kokkos::Experimental::HPX DefaultHostExecutionSpace;
-#elif defined( KOKKOS_ENABLE_SERIAL )
-  typedef Serial DefaultHostExecutionSpace;
+#elif defined(KOKKOS_ENABLE_HPX)
+typedef Kokkos::Experimental::HPX DefaultHostExecutionSpace;
+#elif defined(KOKKOS_ENABLE_SERIAL)
+typedef Serial DefaultHostExecutionSpace;
 #else
-#  error "At least one of the following execution spaces must be defined in order to use Kokkos: Kokkos::OpenMP, Kokkos::Threads, Kokkos::Qthreads, or Kokkos::Serial."
+#error \
+    "At least one of the following execution spaces must be defined in order to use Kokkos: Kokkos::OpenMP, Kokkos::Threads, Kokkos::Qthreads, or Kokkos::Serial."
 #endif
 
-} // namespace Kokkos
+}  // namespace Kokkos
 
 //----------------------------------------------------------------------------
 // Detect the active execution space and define its memory space.
@@ -203,44 +208,44 @@ namespace Kokkos {
 
 namespace Impl {
 
-#if defined( KOKKOS_ACTIVE_EXECUTION_MEMORY_SPACE_CUDA ) && defined( KOKKOS_ENABLE_CUDA )
-typedef Kokkos::CudaSpace  ActiveExecutionMemorySpace;
-#elif defined( KOKKOS_ACTIVE_EXECUTION_MEMORY_SPACE_ROCM_GPU )
-typedef Kokkos::HostSpace  ActiveExecutionMemorySpace ;
-#elif defined( KOKKOS_ACTIVE_EXECUTION_MEMORY_SPACE_HOST )
-typedef Kokkos::HostSpace  ActiveExecutionMemorySpace;
+#if defined(KOKKOS_ACTIVE_EXECUTION_MEMORY_SPACE_CUDA) && \
+    defined(KOKKOS_ENABLE_CUDA)
+typedef Kokkos::CudaSpace ActiveExecutionMemorySpace;
+#elif defined(KOKKOS_ACTIVE_EXECUTION_MEMORY_SPACE_ROCM_GPU)
+typedef Kokkos::HostSpace ActiveExecutionMemorySpace;
+#elif defined(KOKKOS_ACTIVE_EXECUTION_MEMORY_SPACE_HOST)
+typedef Kokkos::HostSpace ActiveExecutionMemorySpace;
 #else
 typedef void ActiveExecutionMemorySpace;
 #endif
 
-template< class ActiveSpace, class MemorySpace >
+template <class ActiveSpace, class MemorySpace>
 struct VerifyExecutionCanAccessMemorySpace {
-  enum {value = 0};
+  enum { value = 0 };
 };
 
-template< class Space >
-struct VerifyExecutionCanAccessMemorySpace< Space, Space >
-{
-  enum {value = 1};
+template <class Space>
+struct VerifyExecutionCanAccessMemorySpace<Space, Space> {
+  enum { value = 1 };
   KOKKOS_INLINE_FUNCTION static void verify(void) {}
   KOKKOS_INLINE_FUNCTION static void verify(const void *) {}
 };
-} // namespace Impl
+}  // namespace Impl
 
-} // namespace Kokkos
+}  // namespace Kokkos
 
-#define KOKKOS_RESTRICT_EXECUTION_TO_DATA( DATA_SPACE, DATA_PTR ) \
+#define KOKKOS_RESTRICT_EXECUTION_TO_DATA(DATA_SPACE, DATA_PTR) \
+  Kokkos::Impl::VerifyExecutionCanAccessMemorySpace<            \
+      Kokkos::Impl::ActiveExecutionMemorySpace, DATA_SPACE>::verify(DATA_PTR)
+
+#define KOKKOS_RESTRICT_EXECUTION_TO_(DATA_SPACE)    \
   Kokkos::Impl::VerifyExecutionCanAccessMemorySpace< \
-    Kokkos::Impl::ActiveExecutionMemorySpace, DATA_SPACE >::verify( DATA_PTR )
-
-#define KOKKOS_RESTRICT_EXECUTION_TO_( DATA_SPACE ) \
-  Kokkos::Impl::VerifyExecutionCanAccessMemorySpace< \
-    Kokkos::Impl::ActiveExecutionMemorySpace, DATA_SPACE >::verify()
+      Kokkos::Impl::ActiveExecutionMemorySpace, DATA_SPACE>::verify()
 
 //----------------------------------------------------------------------------
 
 namespace Kokkos {
-  void fence();
+void fence();
 }
 
 //----------------------------------------------------------------------------
@@ -249,29 +254,33 @@ namespace Kokkos {
 
 namespace Impl {
 
-template< class DstSpace, class SrcSpace, class ExecutionSpace = typename DstSpace::execution_space >
+template <class DstSpace, class SrcSpace,
+          class ExecutionSpace = typename DstSpace::execution_space>
 struct DeepCopy;
 
-template<class ViewType, class Layout, class ExecSpace, int Rank, typename iType>
+template <class ViewType, class Layout, class ExecSpace, int Rank,
+          typename iType>
 struct ViewFillETIAvail;
 
-template<class ViewType, class Layout = typename ViewType::array_layout,
-         class ExecSpace = typename ViewType::execution_space, int Rank = ViewType::Rank, typename iType = int64_t,
-         bool EtiAvail = ViewFillETIAvail<ViewType,Layout,ExecSpace,Rank,iType>::value>
+template <class ViewType, class Layout = typename ViewType::array_layout,
+          class ExecSpace = typename ViewType::execution_space,
+          int Rank = ViewType::Rank, typename iType = int64_t,
+          bool EtiAvail =
+              ViewFillETIAvail<ViewType, Layout, ExecSpace, Rank, iType>::value>
 struct ViewFill;
 
-template<class ViewTypeA,class ViewTypeB, class Layout, class ExecSpace, int Rank, typename iType>
+template <class ViewTypeA, class ViewTypeB, class Layout, class ExecSpace,
+          int Rank, typename iType>
 struct ViewCopyETIAvail;
 
-template<class ViewTypeA,class ViewTypeB, class Layout, class ExecSpace, int Rank, typename iType,
-         bool EtiAvail = ViewCopyETIAvail<ViewTypeA,ViewTypeB,Layout,ExecSpace,Rank,iType>::value>
+template <class ViewTypeA, class ViewTypeB, class Layout, class ExecSpace,
+          int Rank, typename iType,
+          bool EtiAvail = ViewCopyETIAvail<ViewTypeA, ViewTypeB, Layout,
+                                           ExecSpace, Rank, iType>::value>
 struct ViewCopy;
 
-template< class Functor
-        , class Policy
-        , class EnableFunctor = void
-        , class EnablePolicy = void
-        >
+template <class Functor, class Policy, class EnableFunctor = void,
+          class EnablePolicy = void>
 struct FunctorPolicyExecutionSpace;
 
 //----------------------------------------------------------------------------
@@ -281,18 +290,20 @@ struct FunctorPolicyExecutionSpace;
 ///
 /// This is an implementation detail of parallel_for.  Users should
 /// skip this and go directly to the nonmember function parallel_for.
-template< class FunctorType, class ExecPolicy, class ExecutionSpace =
-          typename Impl::FunctorPolicyExecutionSpace< FunctorType, ExecPolicy >::execution_space
-        > class ParallelFor;
+template <class FunctorType, class ExecPolicy,
+          class ExecutionSpace = typename Impl::FunctorPolicyExecutionSpace<
+              FunctorType, ExecPolicy>::execution_space>
+class ParallelFor;
 
 /// \class ParallelReduce
 /// \brief Implementation detail of parallel_reduce.
 ///
 /// This is an implementation detail of parallel_reduce.  Users should
 /// skip this and go directly to the nonmember function parallel_reduce.
-template< class FunctorType, class ExecPolicy, class ReducerType = InvalidType, class ExecutionSpace =
-          typename Impl::FunctorPolicyExecutionSpace< FunctorType, ExecPolicy >::execution_space
-        > class ParallelReduce;
+template <class FunctorType, class ExecPolicy, class ReducerType = InvalidType,
+          class ExecutionSpace = typename Impl::FunctorPolicyExecutionSpace<
+              FunctorType, ExecPolicy>::execution_space>
+class ParallelReduce;
 
 /// \class ParallelScan
 /// \brief Implementation detail of parallel_scan.
@@ -300,56 +311,71 @@ template< class FunctorType, class ExecPolicy, class ReducerType = InvalidType,
 /// This is an implementation detail of parallel_scan.  Users should
 /// skip this and go directly to the documentation of the nonmember
 /// template function Kokkos::parallel_scan.
-template< class FunctorType, class ExecPolicy, class ExecutionSapce =
-          typename Impl::FunctorPolicyExecutionSpace< FunctorType, ExecPolicy >::execution_space
-        > class ParallelScan;
+template <class FunctorType, class ExecPolicy,
+          class ExecutionSapce = typename Impl::FunctorPolicyExecutionSpace<
+              FunctorType, ExecPolicy>::execution_space>
+class ParallelScan;
 
-template< class FunctorType, class ExecPolicy, class ReturnType = InvalidType, class ExecutionSapce =
-          typename Impl::FunctorPolicyExecutionSpace< FunctorType, ExecPolicy >::execution_space
-        > class ParallelScanWithTotal;
+template <class FunctorType, class ExecPolicy, class ReturnType = InvalidType,
+          class ExecutionSapce = typename Impl::FunctorPolicyExecutionSpace<
+              FunctorType, ExecPolicy>::execution_space>
+class ParallelScanWithTotal;
 
-} // namespace Impl
+}  // namespace Impl
 
-template<class ScalarType , class Space = HostSpace> struct Sum;
-template<class ScalarType , class Space = HostSpace> struct Prod;
-template<class ScalarType , class Space = HostSpace> struct Min;
-template<class ScalarType , class Space = HostSpace> struct Max;
-template<class ScalarType , class Space = HostSpace> struct MinMax;
-template<class ScalarType , class Index, class Space = HostSpace> struct MinLoc;
-template<class ScalarType , class Index, class Space = HostSpace> struct MaxLoc;
-template<class ScalarType , class Index, class Space = HostSpace> struct MinMaxLoc;
-template<class ScalarType , class Space = HostSpace> struct BAnd;
-template<class ScalarType , class Space = HostSpace> struct BOr;
-template<class ScalarType , class Space = HostSpace> struct LAnd;
-template<class ScalarType , class Space = HostSpace> struct LOr;
+template <class ScalarType, class Space = HostSpace>
+struct Sum;
+template <class ScalarType, class Space = HostSpace>
+struct Prod;
+template <class ScalarType, class Space = HostSpace>
+struct Min;
+template <class ScalarType, class Space = HostSpace>
+struct Max;
+template <class ScalarType, class Space = HostSpace>
+struct MinMax;
+template <class ScalarType, class Index, class Space = HostSpace>
+struct MinLoc;
+template <class ScalarType, class Index, class Space = HostSpace>
+struct MaxLoc;
+template <class ScalarType, class Index, class Space = HostSpace>
+struct MinMaxLoc;
+template <class ScalarType, class Space = HostSpace>
+struct BAnd;
+template <class ScalarType, class Space = HostSpace>
+struct BOr;
+template <class ScalarType, class Space = HostSpace>
+struct LAnd;
+template <class ScalarType, class Space = HostSpace>
+struct LOr;
 
-
-} // namespace Kokkos
+}  // namespace Kokkos
 #ifdef KOKKOS_ENABLE_DEPRECATED_CODE
-namespace Kokkos{
-  template<class ScalarType> struct MinMaxScalar;
-  template<class ScalarType, class Index> struct MinMaxLocScalar;
-  template<class ScalarType, class Index> struct ValLocScalar;
+namespace Kokkos {
+template <class ScalarType>
+struct MinMaxScalar;
+template <class ScalarType, class Index>
+struct MinMaxLocScalar;
+template <class ScalarType, class Index>
+struct ValLocScalar;
 
-  namespace Experimental {
-    using Kokkos::Sum;
-    using Kokkos::Prod;
-    using Kokkos::Min;
-    using Kokkos::Max;
-    using Kokkos::MinMax;
-    using Kokkos::MinLoc;
-    using Kokkos::MaxLoc;
-    using Kokkos::MinMaxLoc;
-    using Kokkos::BAnd;
-    using Kokkos::BOr;
-    using Kokkos::LAnd;
-    using Kokkos::LOr;
-    using Kokkos::MinMaxScalar;
-    using Kokkos::MinMaxLocScalar;
-    using Kokkos::ValLocScalar;
-  }
-}
+namespace Experimental {
+using Kokkos::BAnd;
+using Kokkos::BOr;
+using Kokkos::LAnd;
+using Kokkos::LOr;
+using Kokkos::Max;
+using Kokkos::MaxLoc;
+using Kokkos::Min;
+using Kokkos::MinLoc;
+using Kokkos::MinMax;
+using Kokkos::MinMaxLoc;
+using Kokkos::MinMaxLocScalar;
+using Kokkos::MinMaxScalar;
+using Kokkos::Prod;
+using Kokkos::Sum;
+using Kokkos::ValLocScalar;
+}  // namespace Experimental
+}  // namespace Kokkos
 #endif
 
 #endif /* #ifndef KOKKOS_CORE_FWD_HPP */
-
diff --git a/lib/kokkos/core/src/Kokkos_Crs.hpp b/lib/kokkos/core/src/Kokkos_Crs.hpp
index 8412ced921..f57863263b 100644
--- a/lib/kokkos/core/src/Kokkos_Crs.hpp
+++ b/lib/kokkos/core/src/Kokkos_Crs.hpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -76,26 +77,27 @@ namespace Kokkos {
 /// <li> <tt> entries( entry ,            i2 , i3 , ... ); </tt> </li>
 /// <li> <tt> entries( row_map[i0] + i1 , i2 , i3 , ... ); </tt> </li>
 /// </ul>
-template< class DataType,
-          class Arg1Type,
-          class Arg2Type = void,
-          typename SizeType = typename ViewTraits<DataType*, Arg1Type, Arg2Type, void >::size_type>
+template <class DataType, class Arg1Type, class Arg2Type = void,
+          typename SizeType = typename ViewTraits<DataType*, Arg1Type, Arg2Type,
+                                                  void>::size_type>
 class Crs {
-protected:
+ protected:
   typedef ViewTraits<DataType*, Arg1Type, Arg2Type, void> traits;
 
-public:
-  typedef DataType                                            data_type;
-  typedef typename traits::array_layout                       array_layout;
-  typedef typename traits::execution_space                    execution_space;
-  typedef typename traits::memory_space                       memory_space;
-  typedef typename traits::device_type                        device_type;
-  typedef SizeType                                            size_type;
+ public:
+  typedef DataType data_type;
+  typedef typename traits::array_layout array_layout;
+  typedef typename traits::execution_space execution_space;
+  typedef typename traits::memory_space memory_space;
+  typedef typename traits::device_type device_type;
+  typedef SizeType size_type;
 
-  typedef Crs< DataType , Arg1Type , Arg2Type , SizeType > staticcrsgraph_type;
-  typedef Crs< DataType , array_layout , typename traits::host_mirror_space , SizeType > HostMirror;
-  typedef View<size_type* , array_layout, device_type> row_map_type;
-  typedef View<DataType*  , array_layout, device_type> entries_type;
+  typedef Crs<DataType, Arg1Type, Arg2Type, SizeType> staticcrsgraph_type;
+  typedef Crs<DataType, array_layout, typename traits::host_mirror_space,
+              SizeType>
+      HostMirror;
+  typedef View<size_type*, array_layout, device_type> row_map_type;
+  typedef View<DataType*, array_layout, device_type> entries_type;
 
   row_map_type row_map;
   entries_type entries;
@@ -103,62 +105,49 @@ public:
   /*
    * Default Constructors, operators and destructor
    */
-  KOKKOS_FUNCTION Crs() = default;
-  KOKKOS_FUNCTION Crs(Crs const &) = default;
-  KOKKOS_FUNCTION Crs(Crs &&) = default;
-  KOKKOS_FUNCTION Crs& operator=(Crs const &) = default;
-  KOKKOS_FUNCTION Crs& operator=(Crs &&) = default;
-  KOKKOS_FUNCTION ~Crs() = default;
+  KOKKOS_FUNCTION Crs()           = default;
+  KOKKOS_FUNCTION Crs(Crs const&) = default;
+  KOKKOS_FUNCTION Crs(Crs&&)      = default;
+  KOKKOS_FUNCTION Crs& operator=(Crs const&) = default;
+  KOKKOS_FUNCTION Crs& operator=(Crs&&) = default;
+  KOKKOS_FUNCTION ~Crs()                = default;
 
   /** \brief Assign to a view of the rhs array.
    *         If the old view is the last view
    *         then allocated memory is deallocated.
    */
-  template<class EntriesType, class RowMapType>
-  KOKKOS_INLINE_FUNCTION
-  Crs(const RowMapType& row_map_, const EntriesType& entries_) 
-     : row_map(row_map_), entries(entries_)
-  {
-  }
+  template <class EntriesType, class RowMapType>
+  KOKKOS_INLINE_FUNCTION Crs(const RowMapType& row_map_,
+                             const EntriesType& entries_)
+      : row_map(row_map_), entries(entries_) {}
 
   /**  \brief  Return number of rows in the graph
    */
   KOKKOS_INLINE_FUNCTION
   size_type numRows() const {
-    return (row_map.extent(0) != 0) ?
-      row_map.extent(0) - static_cast<size_type> (1) :
-      static_cast<size_type> (0);
+    return (row_map.extent(0) != 0)
+               ? row_map.extent(0) - static_cast<size_type>(1)
+               : static_cast<size_type>(0);
   }
 };
 
 /*--------------------------------------------------------------------------*/
 
-template< class OutCounts,
-          class DataType,
-          class Arg1Type,
-          class Arg2Type,
+template <class OutCounts, class DataType, class Arg1Type, class Arg2Type,
           class SizeType>
 void get_crs_transpose_counts(
-    OutCounts& out,
-    Crs<DataType, Arg1Type, Arg2Type, SizeType> const& in,
+    OutCounts& out, Crs<DataType, Arg1Type, Arg2Type, SizeType> const& in,
     std::string const& name = "transpose_counts");
 
-template< class OutCounts,
-          class InCrs>
+template <class OutCounts, class InCrs>
 typename OutCounts::value_type get_crs_row_map_from_counts(
-    OutCounts& out,
-    InCrs const& in,
-    std::string const& name = "row_map");
+    OutCounts& out, InCrs const& in, std::string const& name = "row_map");
 
-template< class DataType,
-          class Arg1Type,
-          class Arg2Type,
-          class SizeType>
-void transpose_crs(
-    Crs<DataType, Arg1Type, Arg2Type, SizeType>& out,
-    Crs<DataType, Arg1Type, Arg2Type, SizeType> const& in);
+template <class DataType, class Arg1Type, class Arg2Type, class SizeType>
+void transpose_crs(Crs<DataType, Arg1Type, Arg2Type, SizeType>& out,
+                   Crs<DataType, Arg1Type, Arg2Type, SizeType> const& in);
 
-} // namespace Kokkos
+}  // namespace Kokkos
 
 /*--------------------------------------------------------------------------*/
 
@@ -171,21 +160,22 @@ template <class InCrs, class OutCounts>
 class GetCrsTransposeCounts {
  public:
   using execution_space = typename InCrs::execution_space;
-  using self_type = GetCrsTransposeCounts<InCrs, OutCounts>;
-  using index_type = typename InCrs::size_type;
+  using self_type       = GetCrsTransposeCounts<InCrs, OutCounts>;
+  using index_type      = typename InCrs::size_type;
+
  private:
   InCrs in;
   OutCounts out;
+
  public:
   KOKKOS_INLINE_FUNCTION
-  void operator()(index_type i) const {
-    atomic_increment( &out[in.entries(i)] );
-  }
-  GetCrsTransposeCounts(InCrs const& arg_in, OutCounts const& arg_out):
-    in(arg_in),out(arg_out) {
-    using policy_type = RangePolicy<index_type, execution_space>;
+  void operator()(index_type i) const { atomic_increment(&out[in.entries(i)]); }
+  GetCrsTransposeCounts(InCrs const& arg_in, OutCounts const& arg_out)
+      : in(arg_in), out(arg_out) {
+    using policy_type  = RangePolicy<index_type, execution_space>;
     using closure_type = Kokkos::Impl::ParallelFor<self_type, policy_type>;
-    const closure_type closure(*this, policy_type(0, index_type(in.entries.size())));
+    const closure_type closure(*this,
+                               policy_type(0, index_type(in.entries.size())));
     closure.execute();
     execution_space().fence();
   }
@@ -195,13 +185,15 @@ template <class InCounts, class OutRowMap>
 class CrsRowMapFromCounts {
  public:
   using execution_space = typename InCounts::execution_space;
-  using value_type = typename OutRowMap::value_type;
-  using index_type = typename InCounts::size_type;
+  using value_type      = typename OutRowMap::value_type;
+  using index_type      = typename InCounts::size_type;
   using last_value_type = Kokkos::View<value_type, execution_space>;
+
  private:
   InCounts m_in;
   OutRowMap m_out;
   last_value_type m_last_value;
+
  public:
   KOKKOS_INLINE_FUNCTION
   void operator()(index_type i, value_type& update, bool final_pass) const {
@@ -209,22 +201,22 @@ class CrsRowMapFromCounts {
       update += m_in(i);
       if (final_pass) m_out(i + 1) = update;
     } else if (final_pass) {
-      m_out(0) = 0;
+      m_out(0)       = 0;
       m_last_value() = update;
     }
   }
   KOKKOS_INLINE_FUNCTION
   void init(value_type& update) const { update = 0; }
   KOKKOS_INLINE_FUNCTION
-  void join(volatile value_type& update, const volatile value_type& input) const {
+  void join(volatile value_type& update,
+            const volatile value_type& input) const {
     update += input;
   }
   using self_type = CrsRowMapFromCounts<InCounts, OutRowMap>;
-  CrsRowMapFromCounts(InCounts const& arg_in, OutRowMap const& arg_out):
-    m_in(arg_in), m_out(arg_out), m_last_value("last_value") {
-  }
+  CrsRowMapFromCounts(InCounts const& arg_in, OutRowMap const& arg_out)
+      : m_in(arg_in), m_out(arg_out), m_last_value("last_value") {}
   value_type execute() {
-    using policy_type = RangePolicy<index_type, execution_space>;
+    using policy_type  = RangePolicy<index_type, execution_space>;
     using closure_type = Kokkos::Impl::ParallelScan<self_type, policy_type>;
     closure_type closure(*this, policy_type(0, m_in.size() + 1));
     closure.execute();
@@ -238,31 +230,32 @@ template <class InCrs, class OutCrs>
 class FillCrsTransposeEntries {
  public:
   using execution_space = typename InCrs::execution_space;
-  using memory_space = typename InCrs::memory_space;
-  using value_type = typename OutCrs::entries_type::value_type;
-  using index_type = typename InCrs::size_type;
+  using memory_space    = typename InCrs::memory_space;
+  using value_type      = typename OutCrs::entries_type::value_type;
+  using index_type      = typename InCrs::size_type;
+
  private:
   using counters_type = View<index_type*, memory_space>;
   InCrs in;
   OutCrs out;
   counters_type counters;
+
  public:
   KOKKOS_INLINE_FUNCTION
   void operator()(index_type i) const {
     auto begin = in.row_map(i);
-    auto end = in.row_map(i + 1);
+    auto end   = in.row_map(i + 1);
     for (auto j = begin; j < end; ++j) {
-      auto ti = in.entries(j);
-      auto tbegin = out.row_map(ti);
-      auto tj = atomic_fetch_add( &counters(ti), 1 );
-      out.entries( tbegin + tj ) = i;
+      auto ti                  = in.entries(j);
+      auto tbegin              = out.row_map(ti);
+      auto tj                  = atomic_fetch_add(&counters(ti), 1);
+      out.entries(tbegin + tj) = i;
     }
   }
   using self_type = FillCrsTransposeEntries<InCrs, OutCrs>;
-  FillCrsTransposeEntries(InCrs const& arg_in, OutCrs const& arg_out):
-    in(arg_in),out(arg_out),
-    counters("counters", arg_out.numRows()) {
-    using policy_type = RangePolicy<index_type, execution_space>;
+  FillCrsTransposeEntries(InCrs const& arg_in, OutCrs const& arg_out)
+      : in(arg_in), out(arg_out), counters("counters", arg_out.numRows()) {
+    using policy_type  = RangePolicy<index_type, execution_space>;
     using closure_type = Kokkos::Impl::ParallelFor<self_type, policy_type>;
     const closure_type closure(*this, policy_type(0, index_type(in.numRows())));
     closure.execute();
@@ -270,7 +263,8 @@ class FillCrsTransposeEntries {
   }
 };
 
-}} // namespace Kokkos::Impl
+}  // namespace Impl
+}  // namespace Kokkos
 
 /*--------------------------------------------------------------------------*/
 
@@ -278,66 +272,51 @@ class FillCrsTransposeEntries {
 
 namespace Kokkos {
 
-template< class OutCounts,
-          class DataType,
-          class Arg1Type,
-          class Arg2Type,
+template <class OutCounts, class DataType, class Arg1Type, class Arg2Type,
           class SizeType>
 void get_crs_transpose_counts(
-    OutCounts& out,
-    Crs<DataType, Arg1Type, Arg2Type, SizeType> const& in,
+    OutCounts& out, Crs<DataType, Arg1Type, Arg2Type, SizeType> const& in,
     std::string const& name) {
   using InCrs = Crs<DataType, Arg1Type, Arg2Type, SizeType>;
-  out = OutCounts(name, in.numRows());
+  out         = OutCounts(name, in.numRows());
   Kokkos::Impl::GetCrsTransposeCounts<InCrs, OutCounts> functor(in, out);
 }
 
-template< class OutRowMap,
-          class InCounts>
+template <class OutRowMap, class InCounts>
 typename OutRowMap::value_type get_crs_row_map_from_counts(
-    OutRowMap& out,
-    InCounts const& in,
-    std::string const& name) {
+    OutRowMap& out, InCounts const& in, std::string const& name) {
   out = OutRowMap(ViewAllocateWithoutInitializing(name), in.size() + 1);
   Kokkos::Impl::CrsRowMapFromCounts<InCounts, OutRowMap> functor(in, out);
   return functor.execute();
 }
 
-template< class DataType,
-          class Arg1Type,
-          class Arg2Type,
-          class SizeType>
-void transpose_crs(
-    Crs<DataType, Arg1Type, Arg2Type, SizeType>& out,
-    Crs<DataType, Arg1Type, Arg2Type, SizeType> const& in)
-{
-  typedef Crs<DataType, Arg1Type, Arg2Type, SizeType> crs_type ;
-  typedef typename crs_type::memory_space             memory_space ;
-  typedef View<SizeType*, memory_space>               counts_type ;
+template <class DataType, class Arg1Type, class Arg2Type, class SizeType>
+void transpose_crs(Crs<DataType, Arg1Type, Arg2Type, SizeType>& out,
+                   Crs<DataType, Arg1Type, Arg2Type, SizeType> const& in) {
+  typedef Crs<DataType, Arg1Type, Arg2Type, SizeType> crs_type;
+  typedef typename crs_type::memory_space memory_space;
+  typedef View<SizeType*, memory_space> counts_type;
   {
-  counts_type counts;
-  Kokkos::get_crs_transpose_counts(counts, in);
-  Kokkos::get_crs_row_map_from_counts(out.row_map, counts,
-      "tranpose_row_map");
+    counts_type counts;
+    Kokkos::get_crs_transpose_counts(counts, in);
+    Kokkos::get_crs_row_map_from_counts(out.row_map, counts,
+                                        "tranpose_row_map");
   }
   out.entries = decltype(out.entries)("transpose_entries", in.entries.size());
-  Kokkos::Impl::
-    FillCrsTransposeEntries<crs_type, crs_type> entries_functor(in, out);
+  Kokkos::Impl::FillCrsTransposeEntries<crs_type, crs_type> entries_functor(
+      in, out);
 }
 
-template< class CrsType,
-          class Functor,
+template <class CrsType, class Functor,
           class ExecutionSpace = typename CrsType::execution_space>
 struct CountAndFillBase;
 
-template< class CrsType,
-          class Functor,
-          class ExecutionSpace>
+template <class CrsType, class Functor, class ExecutionSpace>
 struct CountAndFillBase {
-  using data_type = typename CrsType::size_type;
-  using size_type = typename CrsType::size_type;
+  using data_type    = typename CrsType::size_type;
+  using size_type    = typename CrsType::size_type;
   using row_map_type = typename CrsType::row_map_type;
-  using counts_type = row_map_type;
+  using counts_type  = row_map_type;
   CrsType m_crs;
   Functor m_functor;
   counts_type m_counts;
@@ -348,30 +327,26 @@ struct CountAndFillBase {
   struct Fill {};
   inline void operator()(Fill, size_type i) const {
     auto j = m_crs.row_map(i);
-    /* we don't want to access entries(entries.size()), even if its just to get its
-       address and never use it.
-       this can happen when row (i) is empty and all rows after it are also empty.
-       we could compare to row_map(i + 1), but that is a read from global memory,
-       whereas dimension_0() should be part of the View in registers (or constant memory) */
-    data_type* fill =
-      (j == static_cast<decltype(j)>(m_crs.entries.extent(0))) ?
-      nullptr : (&(m_crs.entries(j)));
+    /* we don't want to access entries(entries.size()), even if its just to get
+       its address and never use it. this can happen when row (i) is empty and
+       all rows after it are also empty. we could compare to row_map(i + 1), but
+       that is a read from global memory, whereas dimension_0() should be part
+       of the View in registers (or constant memory) */
+    data_type* fill = (j == static_cast<decltype(j)>(m_crs.entries.extent(0)))
+                          ? nullptr
+                          : (&(m_crs.entries(j)));
     m_functor(i, fill);
   }
-  CountAndFillBase(CrsType& crs, Functor const& f):
-    m_crs(crs),
-    m_functor(f)
-  {}
+  CountAndFillBase(CrsType& crs, Functor const& f) : m_crs(crs), m_functor(f) {}
 };
 
-#if defined( KOKKOS_ENABLE_CUDA )
-template< class CrsType,
-          class Functor>
+#if defined(KOKKOS_ENABLE_CUDA)
+template <class CrsType, class Functor>
 struct CountAndFillBase<CrsType, Functor, Kokkos::Cuda> {
-  using data_type = typename CrsType::size_type;
-  using size_type = typename CrsType::size_type;
+  using data_type    = typename CrsType::size_type;
+  using size_type    = typename CrsType::size_type;
   using row_map_type = typename CrsType::row_map_type;
-  using counts_type = row_map_type;
+  using counts_type  = row_map_type;
   CrsType m_crs;
   Functor m_functor;
   counts_type m_counts;
@@ -382,70 +357,62 @@ struct CountAndFillBase<CrsType, Functor, Kokkos::Cuda> {
   struct Fill {};
   __device__ inline void operator()(Fill, size_type i) const {
     auto j = m_crs.row_map(i);
-    /* we don't want to access entries(entries.size()), even if its just to get its
-       address and never use it.
-       this can happen when row (i) is empty and all rows after it are also empty.
-       we could compare to row_map(i + 1), but that is a read from global memory,
-       whereas dimension_0() should be part of the View in registers (or constant memory) */
-    data_type* fill =
-      (j == static_cast<decltype(j)>(m_crs.entries.extent(0))) ?
-      nullptr : (&(m_crs.entries(j)));
+    /* we don't want to access entries(entries.size()), even if its just to get
+       its address and never use it. this can happen when row (i) is empty and
+       all rows after it are also empty. we could compare to row_map(i + 1), but
+       that is a read from global memory, whereas dimension_0() should be part
+       of the View in registers (or constant memory) */
+    data_type* fill = (j == static_cast<decltype(j)>(m_crs.entries.extent(0)))
+                          ? nullptr
+                          : (&(m_crs.entries(j)));
     m_functor(i, fill);
   }
-  CountAndFillBase(CrsType& crs, Functor const& f):
-    m_crs(crs),
-    m_functor(f)
-  {}
+  CountAndFillBase(CrsType& crs, Functor const& f) : m_crs(crs), m_functor(f) {}
 };
 #endif
 
-template< class CrsType,
-          class Functor>
+template <class CrsType, class Functor>
 struct CountAndFill : public CountAndFillBase<CrsType, Functor> {
   using base_type = CountAndFillBase<CrsType, Functor>;
-  using typename base_type::data_type;
-  using typename base_type::size_type;
-  using typename base_type::counts_type;
   using typename base_type::Count;
+  using typename base_type::counts_type;
+  using typename base_type::data_type;
   using typename base_type::Fill;
+  using typename base_type::size_type;
   using entries_type = typename CrsType::entries_type;
-  using self_type = CountAndFill<CrsType, Functor>;
-  CountAndFill(CrsType& crs, size_type nrows, Functor const& f):
-    base_type(crs, f)
-  {
+  using self_type    = CountAndFill<CrsType, Functor>;
+  CountAndFill(CrsType& crs, size_type nrows, Functor const& f)
+      : base_type(crs, f) {
     using execution_space = typename CrsType::execution_space;
-    this->m_counts = counts_type("counts", nrows);
+    this->m_counts        = counts_type("counts", nrows);
     {
-    using count_policy_type = RangePolicy<size_type, execution_space, Count>;
-    using count_closure_type =
-      Kokkos::Impl::ParallelFor<self_type, count_policy_type>;
-    const count_closure_type closure(*this, count_policy_type(0, nrows));
-    closure.execute();
+      using count_policy_type = RangePolicy<size_type, execution_space, Count>;
+      using count_closure_type =
+          Kokkos::Impl::ParallelFor<self_type, count_policy_type>;
+      const count_closure_type closure(*this, count_policy_type(0, nrows));
+      closure.execute();
     }
-    auto nentries = Kokkos::
-      get_crs_row_map_from_counts(this->m_crs.row_map, this->m_counts);
+    auto nentries  = Kokkos::get_crs_row_map_from_counts(this->m_crs.row_map,
+                                                        this->m_counts);
     this->m_counts = counts_type();
     this->m_crs.entries = entries_type("entries", nentries);
     {
-    using fill_policy_type = RangePolicy<size_type, execution_space, Fill>;
-    using fill_closure_type =
-      Kokkos::Impl::ParallelFor<self_type, fill_policy_type>;
-    const fill_closure_type closure(*this, fill_policy_type(0, nrows));
-    closure.execute();
+      using fill_policy_type = RangePolicy<size_type, execution_space, Fill>;
+      using fill_closure_type =
+          Kokkos::Impl::ParallelFor<self_type, fill_policy_type>;
+      const fill_closure_type closure(*this, fill_policy_type(0, nrows));
+      closure.execute();
     }
     crs = this->m_crs;
   }
 };
 
-template< class CrsType,
-          class Functor>
-void count_and_fill_crs(
-    CrsType& crs,
-    typename CrsType::size_type nrows,
-    Functor const& f) {
+template <class CrsType, class Functor>
+void count_and_fill_crs(CrsType& crs, typename CrsType::size_type nrows,
+                        Functor const& f) {
   Kokkos::CountAndFill<CrsType, Functor>(crs, nrows, f);
 }
 
-} // namespace Kokkos
+}  // namespace Kokkos
 
 #endif /* #define KOKKOS_CRS_HPP */
diff --git a/lib/kokkos/core/src/Kokkos_Cuda.hpp b/lib/kokkos/core/src/Kokkos_Cuda.hpp
index 4eb8ab4d4b..ad62ecf383 100644
--- a/lib/kokkos/core/src/Kokkos_Cuda.hpp
+++ b/lib/kokkos/core/src/Kokkos_Cuda.hpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -45,7 +46,7 @@
 #define KOKKOS_CUDA_HPP
 
 #include <Kokkos_Macros.hpp>
-#if defined( KOKKOS_ENABLE_CUDA )
+#if defined(KOKKOS_ENABLE_CUDA)
 
 #include <Kokkos_Core_fwd.hpp>
 
@@ -62,37 +63,45 @@
 #include <Kokkos_MemoryTraits.hpp>
 #include <impl/Kokkos_Tags.hpp>
 
-
 /*--------------------------------------------------------------------------*/
 
 namespace Kokkos {
 namespace Impl {
-class CudaExec ;
-class CudaInternal ;
-} // namespace Impl
-} // namespace Kokkos
+class CudaExec;
+class CudaInternal;
+}  // namespace Impl
+}  // namespace Kokkos
 
 /*--------------------------------------------------------------------------*/
 
 namespace Kokkos {
 
 namespace Impl {
-  namespace Experimental {
-    enum class CudaLaunchMechanism:unsigned{Default=0,ConstantMemory=1,GlobalMemory=2,LocalMemory=4};
+namespace Experimental {
+enum class CudaLaunchMechanism : unsigned {
+  Default        = 0,
+  ConstantMemory = 1,
+  GlobalMemory   = 2,
+  LocalMemory    = 4
+};
 
-    constexpr inline CudaLaunchMechanism operator | (CudaLaunchMechanism p1, CudaLaunchMechanism p2) {
-      return static_cast<CudaLaunchMechanism>(static_cast<unsigned>(p1) |  static_cast<unsigned>(p2));
-    }
-    constexpr inline CudaLaunchMechanism operator & (CudaLaunchMechanism p1, CudaLaunchMechanism p2) {
-      return static_cast<CudaLaunchMechanism>(static_cast<unsigned>(p1) &  static_cast<unsigned>(p2));
-    }
-
-    template<CudaLaunchMechanism l>
-    struct CudaDispatchProperties {
-      CudaLaunchMechanism launch_mechanism = l;
-    };
-  }
+constexpr inline CudaLaunchMechanism operator|(CudaLaunchMechanism p1,
+                                               CudaLaunchMechanism p2) {
+  return static_cast<CudaLaunchMechanism>(static_cast<unsigned>(p1) |
+                                          static_cast<unsigned>(p2));
 }
+constexpr inline CudaLaunchMechanism operator&(CudaLaunchMechanism p1,
+                                               CudaLaunchMechanism p2) {
+  return static_cast<CudaLaunchMechanism>(static_cast<unsigned>(p1) &
+                                          static_cast<unsigned>(p2));
+}
+
+template <CudaLaunchMechanism l>
+struct CudaDispatchProperties {
+  CudaLaunchMechanism launch_mechanism = l;
+};
+}  // namespace Experimental
+}  // namespace Impl
 /// \class Cuda
 /// \brief Kokkos Execution Space that uses CUDA to run on GPUs.
 ///
@@ -104,32 +113,32 @@ namespace Impl {
 /// sequentially.  The Cuda execution space uses NVIDIA's CUDA programming
 /// model to execute kernels in parallel on GPUs.
 class Cuda {
-public:
+ public:
   //! \name Type declarations that all Kokkos execution spaces must provide.
   //@{
 
   //! Tag this class as a kokkos execution space
-  typedef Cuda                  execution_space ;
+  typedef Cuda execution_space;
 
-#if defined( KOKKOS_ENABLE_CUDA_UVM )
+#if defined(KOKKOS_ENABLE_CUDA_UVM)
   //! This execution space's preferred memory space.
-  typedef CudaUVMSpace          memory_space ;
+  typedef CudaUVMSpace memory_space;
 #else
   //! This execution space's preferred memory space.
-  typedef CudaSpace             memory_space ;
+  typedef CudaSpace memory_space;
 #endif
 
   //! This execution space preferred device_type
-  typedef Kokkos::Device<execution_space,memory_space> device_type;
+  typedef Kokkos::Device<execution_space, memory_space> device_type;
 
   //! The size_type best suited for this execution space.
-  typedef memory_space::size_type  size_type ;
+  typedef memory_space::size_type size_type;
 
   //! This execution space's preferred array layout.
-  typedef LayoutLeft            array_layout ;
+  typedef LayoutLeft array_layout;
 
   //!
-  typedef ScratchMemorySpace< Cuda >  scratch_memory_space ;
+  typedef ScratchMemorySpace<Cuda> scratch_memory_space;
 
   //@}
   //--------------------------------------------------
@@ -139,7 +148,7 @@ public:
   /// \brief True if and only if this method is being called in a
   ///   thread-parallel function.
   KOKKOS_INLINE_FUNCTION static int in_parallel() {
-#if defined( __CUDA_ARCH__ )
+#if defined(__CUDA_ARCH__)
     return true;
 #else
     return false;
@@ -174,17 +183,17 @@ public:
   /// device have completed.
   static void impl_static_fence();
 
-  #ifdef KOKKOS_ENABLE_DEPRECATED_CODE
+#ifdef KOKKOS_ENABLE_DEPRECATED_CODE
   static void fence();
-  #else
+#else
   void fence() const;
-  #endif
+#endif
 
   /** \brief  Return the maximum amount of concurrency.  */
   static int concurrency();
 
   //! Print configuration information to the given output stream.
-  static void print_configuration( std::ostream & , const bool detail = false );
+  static void print_configuration(std::ostream&, const bool detail = false);
 
   //@}
   //--------------------------------------------------
@@ -195,10 +204,10 @@ public:
 
   Cuda();
 
-  Cuda( Cuda && ) = default ;
-  Cuda( const Cuda & ) = default ;
-  Cuda & operator = ( Cuda && ) = default ;
-  Cuda & operator = ( const Cuda & ) = default ;
+  Cuda(Cuda&&)      = default;
+  Cuda(const Cuda&) = default;
+  Cuda& operator=(Cuda&&) = default;
+  Cuda& operator=(const Cuda&) = default;
 
   Cuda(cudaStream_t stream);
 
@@ -207,9 +216,9 @@ public:
   //@{
 
   struct SelectDevice {
-    int cuda_device_id ;
+    int cuda_device_id;
     SelectDevice() : cuda_device_id(0) {}
-    explicit SelectDevice( int id ) : cuda_device_id( id ) {}
+    explicit SelectDevice(int id) : cuda_device_id(id) {}
   };
 
 #ifdef KOKKOS_ENABLE_DEPRECATED_CODE
@@ -220,8 +229,8 @@ public:
   static int is_initialized();
 
   //! Initialize, telling the CUDA run-time library which device to use.
-  static void initialize( const SelectDevice = SelectDevice()
-                        , const size_t num_instances = 1 );
+  static void initialize(const SelectDevice         = SelectDevice(),
+                         const size_t num_instances = 1);
 #else
   //! Free any resources being consumed by the device.
   static void impl_finalize();
@@ -230,8 +239,8 @@ public:
   static int impl_is_initialized();
 
   //! Initialize, telling the CUDA run-time library which device to use.
-  static void impl_initialize( const SelectDevice = SelectDevice()
-                        , const size_t num_instances = 1 );
+  static void impl_initialize(const SelectDevice         = SelectDevice(),
+                              const size_t num_instances = 1);
 #endif
 
   /// \brief Cuda device architecture of the selected device.
@@ -248,20 +257,22 @@ public:
   static std::vector<unsigned> detect_device_arch();
 
   cudaStream_t cuda_stream() const;
-  int          cuda_device() const;
+  int cuda_device() const;
 
   //@}
   //--------------------------------------------------------------------------
 
   static const char* name();
 
-  inline Impl::CudaInternal* impl_internal_space_instance() const { return m_space_instance; }
-private:
+  inline Impl::CudaInternal* impl_internal_space_instance() const {
+    return m_space_instance;
+  }
 
+ private:
   Impl::CudaInternal* m_space_instance;
 };
 
-} // namespace Kokkos
+}  // namespace Kokkos
 
 /*--------------------------------------------------------------------------*/
 /*--------------------------------------------------------------------------*/
@@ -269,18 +280,15 @@ private:
 namespace Kokkos {
 namespace Impl {
 
-template<>
-struct MemorySpaceAccess
-  < Kokkos::CudaSpace
-  , Kokkos::Cuda::scratch_memory_space
-  >
-{
+template <>
+struct MemorySpaceAccess<Kokkos::CudaSpace,
+                         Kokkos::Cuda::scratch_memory_space> {
   enum { assignable = false };
   enum { accessible = true };
-  enum { deepcopy   = false };
+  enum { deepcopy = false };
 };
 
-#if defined( KOKKOS_ENABLE_CUDA_UVM )
+#if defined(KOKKOS_ENABLE_CUDA_UVM)
 
 // If forcing use of UVM everywhere
 // then must assume that CudaUVMSpace
@@ -288,44 +296,34 @@ struct MemorySpaceAccess
 // This will fail when a strange host-side execution space
 // that defines CudaUVMSpace as its preferredmemory space.
 
-template<>
-struct MemorySpaceAccess
-  < Kokkos::CudaUVMSpace
-  , Kokkos::Cuda::scratch_memory_space
-  >
-{
+template <>
+struct MemorySpaceAccess<Kokkos::CudaUVMSpace,
+                         Kokkos::Cuda::scratch_memory_space> {
   enum { assignable = false };
   enum { accessible = true };
-  enum { deepcopy   = false };
+  enum { deepcopy = false };
 };
 
 #endif
 
-
-template<>
-struct VerifyExecutionCanAccessMemorySpace
-  < Kokkos::CudaSpace
-  , Kokkos::Cuda::scratch_memory_space
-  >
-{
+template <>
+struct VerifyExecutionCanAccessMemorySpace<Kokkos::CudaSpace,
+                                           Kokkos::Cuda::scratch_memory_space> {
   enum { value = true };
-  KOKKOS_INLINE_FUNCTION static void verify( void ) { }
-  KOKKOS_INLINE_FUNCTION static void verify( const void * ) { }
+  KOKKOS_INLINE_FUNCTION static void verify(void) {}
+  KOKKOS_INLINE_FUNCTION static void verify(const void*) {}
 };
 
-template<>
-struct VerifyExecutionCanAccessMemorySpace
-  < Kokkos::HostSpace
-  , Kokkos::Cuda::scratch_memory_space
-  >
-{
+template <>
+struct VerifyExecutionCanAccessMemorySpace<Kokkos::HostSpace,
+                                           Kokkos::Cuda::scratch_memory_space> {
   enum { value = false };
-  inline static void verify( void ) { CudaSpace::access_error(); }
-  inline static void verify( const void * p ) { CudaSpace::access_error(p); }
+  inline static void verify(void) { CudaSpace::access_error(); }
+  inline static void verify(const void* p) { CudaSpace::access_error(p); }
 };
 
-} // namespace Impl
-} // namespace Kokkos
+}  // namespace Impl
+}  // namespace Kokkos
 
 /*--------------------------------------------------------------------------*/
 /*--------------------------------------------------------------------------*/
@@ -343,4 +341,3 @@ struct VerifyExecutionCanAccessMemorySpace
 
 #endif /* #if defined( KOKKOS_ENABLE_CUDA ) */
 #endif /* #ifndef KOKKOS_CUDA_HPP */
-
diff --git a/lib/kokkos/core/src/Kokkos_CudaSpace.hpp b/lib/kokkos/core/src/Kokkos_CudaSpace.hpp
index 7925619511..34db47f1c0 100644
--- a/lib/kokkos/core/src/Kokkos_CudaSpace.hpp
+++ b/lib/kokkos/core/src/Kokkos_CudaSpace.hpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -45,7 +46,7 @@
 #define KOKKOS_CUDASPACE_HPP
 
 #include <Kokkos_Macros.hpp>
-#if defined( KOKKOS_ENABLE_CUDA )
+#if defined(KOKKOS_ENABLE_CUDA)
 
 #include <Kokkos_Core_fwd.hpp>
 
@@ -57,6 +58,11 @@
 
 #include <Cuda/Kokkos_Cuda_abort.hpp>
 
+#ifdef KOKKOS_IMPL_DEBUG_CUDA_PIN_UVM_TO_HOST
+extern "C" bool kokkos_impl_cuda_pin_uvm_to_host();
+extern "C" void kokkos_impl_cuda_set_pin_uvm_to_host(bool);
+#endif
+
 /*--------------------------------------------------------------------------*/
 
 namespace Kokkos {
@@ -64,30 +70,28 @@ namespace Kokkos {
 /** \brief  Cuda on-device memory management */
 
 class CudaSpace {
-public:
-
+ public:
   //! Tag this class as a kokkos memory space
-  typedef CudaSpace             memory_space ;
-  typedef Kokkos::Cuda          execution_space ;
-  typedef Kokkos::Device<execution_space,memory_space> device_type;
+  typedef CudaSpace memory_space;
+  typedef Kokkos::Cuda execution_space;
+  typedef Kokkos::Device<execution_space, memory_space> device_type;
 
-  typedef unsigned int          size_type ;
+  typedef unsigned int size_type;
 
   /*--------------------------------*/
 
   CudaSpace();
-  CudaSpace( CudaSpace && rhs ) = default ;
-  CudaSpace( const CudaSpace & rhs ) = default ;
-  CudaSpace & operator = ( CudaSpace && rhs ) = default ;
-  CudaSpace & operator = ( const CudaSpace & rhs ) = default ;
-  ~CudaSpace() = default ;
+  CudaSpace(CudaSpace&& rhs)      = default;
+  CudaSpace(const CudaSpace& rhs) = default;
+  CudaSpace& operator=(CudaSpace&& rhs) = default;
+  CudaSpace& operator=(const CudaSpace& rhs) = default;
+  ~CudaSpace()                               = default;
 
   /**\brief  Allocate untracked memory in the cuda space */
-  void * allocate( const size_t arg_alloc_size ) const ;
+  void* allocate(const size_t arg_alloc_size) const;
 
   /**\brief  Deallocate untracked memory in the cuda space */
-  void deallocate( void * const arg_alloc_ptr
-                 , const size_t arg_alloc_size ) const ;
+  void deallocate(void* const arg_alloc_ptr, const size_t arg_alloc_size) const;
 
   /**\brief Return Name of the MemorySpace */
   static constexpr const char* name() { return m_name; }
@@ -95,14 +99,13 @@ public:
   /*--------------------------------*/
   /** \brief  Error reporting for HostSpace attempt to access CudaSpace */
   static void access_error();
-  static void access_error( const void * const );
+  static void access_error(const void* const);
 
-private:
-
-  int  m_device ; ///< Which Cuda device
+ private:
+  int m_device;  ///< Which Cuda device
 
   static constexpr const char* m_name = "Cuda";
-  friend class Kokkos::Impl::SharedAllocationRecord< Kokkos::CudaSpace , void > ;
+  friend class Kokkos::Impl::SharedAllocationRecord<Kokkos::CudaSpace, void>;
 };
 
 namespace Impl {
@@ -123,10 +126,11 @@ void init_lock_arrays_cuda_space();
 /// If the array is not yet allocated it will do so.
 int* atomic_lock_array_cuda_space_ptr(bool deallocate = false);
 
-/// \brief Retrieve the pointer to the scratch array for team and thread private global memory.
+/// \brief Retrieve the pointer to the scratch array for team and thread private
+/// global memory.
 ///
 /// Team and Thread private scratch allocations in
-/// global memory are aquired via locks.
+/// global memory are acquired via locks.
 /// This function retrieves the lock array pointer.
 /// If the array is not yet allocated it will do so.
 int* scratch_lock_array_cuda_space_ptr(bool deallocate = false);
@@ -138,8 +142,8 @@ int* scratch_lock_array_cuda_space_ptr(bool deallocate = false);
 /// This function retrieves the lock array pointer.
 /// If the array is not yet allocated it will do so.
 int* threadid_lock_array_cuda_space_ptr(bool deallocate = false);
-}
-} // namespace Kokkos
+}  // namespace Impl
+}  // namespace Kokkos
 
 /*--------------------------------------------------------------------------*/
 /*--------------------------------------------------------------------------*/
@@ -150,54 +154,56 @@ namespace Kokkos {
  *          through Cuda's unified virtual memory (UVM) runtime.
  */
 class CudaUVMSpace {
-public:
-
+ public:
   //! Tag this class as a kokkos memory space
-  typedef CudaUVMSpace          memory_space ;
-  typedef Cuda                  execution_space ;
-  typedef Kokkos::Device<execution_space,memory_space> device_type;
-  typedef unsigned int          size_type ;
+  typedef CudaUVMSpace memory_space;
+  typedef Cuda execution_space;
+  typedef Kokkos::Device<execution_space, memory_space> device_type;
+  typedef unsigned int size_type;
 
   /** \brief  If UVM capability is available */
   static bool available();
 
-
   /*--------------------------------*/
   /** \brief  CudaUVMSpace specific routine */
   static int number_of_allocations();
 
   /*--------------------------------*/
 
-
   /*--------------------------------*/
 
   CudaUVMSpace();
-  CudaUVMSpace( CudaUVMSpace && rhs ) = default ;
-  CudaUVMSpace( const CudaUVMSpace & rhs ) = default ;
-  CudaUVMSpace & operator = ( CudaUVMSpace && rhs ) = default ;
-  CudaUVMSpace & operator = ( const CudaUVMSpace & rhs ) = default ;
-  ~CudaUVMSpace() = default ;
+  CudaUVMSpace(CudaUVMSpace&& rhs)      = default;
+  CudaUVMSpace(const CudaUVMSpace& rhs) = default;
+  CudaUVMSpace& operator=(CudaUVMSpace&& rhs) = default;
+  CudaUVMSpace& operator=(const CudaUVMSpace& rhs) = default;
+  ~CudaUVMSpace()                                  = default;
 
   /**\brief  Allocate untracked memory in the cuda space */
-  void * allocate( const size_t arg_alloc_size ) const ;
+  void* allocate(const size_t arg_alloc_size) const;
 
   /**\brief  Deallocate untracked memory in the cuda space */
-  void deallocate( void * const arg_alloc_ptr
-                 , const size_t arg_alloc_size ) const ;
+  void deallocate(void* const arg_alloc_ptr, const size_t arg_alloc_size) const;
 
   /**\brief Return Name of the MemorySpace */
   static constexpr const char* name() { return m_name; }
 
+#ifdef KOKKOS_IMPL_DEBUG_CUDA_PIN_UVM_TO_HOST
+  static bool cuda_pin_uvm_to_host();
+  static void cuda_set_pin_uvm_to_host(bool val);
+#endif
   /*--------------------------------*/
 
-private:
-  int  m_device ; ///< Which Cuda device
+ private:
+  int m_device;  ///< Which Cuda device
 
+#ifdef KOKKOS_IMPL_DEBUG_CUDA_PIN_UVM_TO_HOST
+  static bool kokkos_impl_cuda_pin_uvm_to_host_v;
+#endif
   static constexpr const char* m_name = "CudaUVM";
-
 };
 
-} // namespace Kokkos
+}  // namespace Kokkos
 
 /*--------------------------------------------------------------------------*/
 /*--------------------------------------------------------------------------*/
@@ -208,42 +214,39 @@ namespace Kokkos {
  *          through Cuda's host-pinned memory allocation.
  */
 class CudaHostPinnedSpace {
-public:
-
+ public:
   //! Tag this class as a kokkos memory space
   /** \brief  Memory is in HostSpace so use the HostSpace::execution_space */
-  typedef HostSpace::execution_space  execution_space ;
-  typedef CudaHostPinnedSpace         memory_space ;
-  typedef Kokkos::Device<execution_space,memory_space> device_type;
-  typedef unsigned int                size_type ;
+  typedef HostSpace::execution_space execution_space;
+  typedef CudaHostPinnedSpace memory_space;
+  typedef Kokkos::Device<execution_space, memory_space> device_type;
+  typedef unsigned int size_type;
 
   /*--------------------------------*/
 
   CudaHostPinnedSpace();
-  CudaHostPinnedSpace( CudaHostPinnedSpace && rhs ) = default ;
-  CudaHostPinnedSpace( const CudaHostPinnedSpace & rhs ) = default ;
-  CudaHostPinnedSpace & operator = ( CudaHostPinnedSpace && rhs ) = default ;
-  CudaHostPinnedSpace & operator = ( const CudaHostPinnedSpace & rhs ) = default ;
-  ~CudaHostPinnedSpace() = default ;
+  CudaHostPinnedSpace(CudaHostPinnedSpace&& rhs)      = default;
+  CudaHostPinnedSpace(const CudaHostPinnedSpace& rhs) = default;
+  CudaHostPinnedSpace& operator=(CudaHostPinnedSpace&& rhs) = default;
+  CudaHostPinnedSpace& operator=(const CudaHostPinnedSpace& rhs) = default;
+  ~CudaHostPinnedSpace()                                         = default;
 
   /**\brief  Allocate untracked memory in the space */
-  void * allocate( const size_t arg_alloc_size ) const ;
+  void* allocate(const size_t arg_alloc_size) const;
 
   /**\brief  Deallocate untracked memory in the space */
-  void deallocate( void * const arg_alloc_ptr
-                 , const size_t arg_alloc_size ) const ;
+  void deallocate(void* const arg_alloc_ptr, const size_t arg_alloc_size) const;
 
   /**\brief Return Name of the MemorySpace */
   static constexpr const char* name() { return m_name; }
 
-private:
-
+ private:
   static constexpr const char* m_name = "CudaHostPinned";
 
   /*--------------------------------*/
 };
 
-} // namespace Kokkos
+}  // namespace Kokkos
 
 /*--------------------------------------------------------------------------*/
 /*--------------------------------------------------------------------------*/
@@ -251,119 +254,126 @@ private:
 namespace Kokkos {
 namespace Impl {
 
-static_assert( Kokkos::Impl::MemorySpaceAccess< Kokkos::CudaSpace , Kokkos::CudaSpace >::assignable , "" );
-static_assert( Kokkos::Impl::MemorySpaceAccess< Kokkos::CudaUVMSpace , Kokkos::CudaUVMSpace >::assignable , "" );
-static_assert( Kokkos::Impl::MemorySpaceAccess< Kokkos::CudaHostPinnedSpace , Kokkos::CudaHostPinnedSpace >::assignable , "" );
+static_assert(Kokkos::Impl::MemorySpaceAccess<Kokkos::CudaSpace,
+                                              Kokkos::CudaSpace>::assignable,
+              "");
+static_assert(Kokkos::Impl::MemorySpaceAccess<Kokkos::CudaUVMSpace,
+                                              Kokkos::CudaUVMSpace>::assignable,
+              "");
+static_assert(
+    Kokkos::Impl::MemorySpaceAccess<Kokkos::CudaHostPinnedSpace,
+                                    Kokkos::CudaHostPinnedSpace>::assignable,
+    "");
 
 //----------------------------------------
 
-template<>
-struct MemorySpaceAccess< Kokkos::HostSpace , Kokkos::CudaSpace > {
+template <>
+struct MemorySpaceAccess<Kokkos::HostSpace, Kokkos::CudaSpace> {
   enum { assignable = false };
   enum { accessible = false };
-  enum { deepcopy   = true };
+  enum { deepcopy = true };
 };
 
-template<>
-struct MemorySpaceAccess< Kokkos::HostSpace , Kokkos::CudaUVMSpace > {
+template <>
+struct MemorySpaceAccess<Kokkos::HostSpace, Kokkos::CudaUVMSpace> {
   // HostSpace::execution_space != CudaUVMSpace::execution_space
   enum { assignable = false };
   enum { accessible = true };
-  enum { deepcopy   = true };
+  enum { deepcopy = true };
 };
 
-template<>
-struct MemorySpaceAccess< Kokkos::HostSpace , Kokkos::CudaHostPinnedSpace > {
+template <>
+struct MemorySpaceAccess<Kokkos::HostSpace, Kokkos::CudaHostPinnedSpace> {
   // HostSpace::execution_space == CudaHostPinnedSpace::execution_space
   enum { assignable = true };
   enum { accessible = true };
-  enum { deepcopy   = true };
+  enum { deepcopy = true };
 };
 
 //----------------------------------------
 
-template<>
-struct MemorySpaceAccess< Kokkos::CudaSpace , Kokkos::HostSpace > {
+template <>
+struct MemorySpaceAccess<Kokkos::CudaSpace, Kokkos::HostSpace> {
   enum { assignable = false };
   enum { accessible = false };
-  enum { deepcopy   = true };
+  enum { deepcopy = true };
 };
 
-template<>
-struct MemorySpaceAccess< Kokkos::CudaSpace , Kokkos::CudaUVMSpace > {
+template <>
+struct MemorySpaceAccess<Kokkos::CudaSpace, Kokkos::CudaUVMSpace> {
   // CudaSpace::execution_space == CudaUVMSpace::execution_space
   enum { assignable = true };
   enum { accessible = true };
-  enum { deepcopy   = true };
+  enum { deepcopy = true };
 };
 
-template<>
-struct MemorySpaceAccess< Kokkos::CudaSpace , Kokkos::CudaHostPinnedSpace > {
+template <>
+struct MemorySpaceAccess<Kokkos::CudaSpace, Kokkos::CudaHostPinnedSpace> {
   // CudaSpace::execution_space != CudaHostPinnedSpace::execution_space
   enum { assignable = false };
-  enum { accessible = true }; // CudaSpace::execution_space
-  enum { deepcopy   = true };
+  enum { accessible = true };  // CudaSpace::execution_space
+  enum { deepcopy = true };
 };
 
 //----------------------------------------
 // CudaUVMSpace::execution_space == Cuda
 // CudaUVMSpace accessible to both Cuda and Host
 
-template<>
-struct MemorySpaceAccess< Kokkos::CudaUVMSpace , Kokkos::HostSpace > {
+template <>
+struct MemorySpaceAccess<Kokkos::CudaUVMSpace, Kokkos::HostSpace> {
   enum { assignable = false };
-  enum { accessible = false }; // Cuda cannot access HostSpace
-  enum { deepcopy   = true };
+  enum { accessible = false };  // Cuda cannot access HostSpace
+  enum { deepcopy = true };
 };
 
-template<>
-struct MemorySpaceAccess< Kokkos::CudaUVMSpace , Kokkos::CudaSpace > {
+template <>
+struct MemorySpaceAccess<Kokkos::CudaUVMSpace, Kokkos::CudaSpace> {
   // CudaUVMSpace::execution_space == CudaSpace::execution_space
   // Can access CudaUVMSpace from Host but cannot access CudaSpace from Host
   enum { assignable = false };
 
   // CudaUVMSpace::execution_space can access CudaSpace
   enum { accessible = true };
-  enum { deepcopy   = true };
+  enum { deepcopy = true };
 };
 
-template<>
-struct MemorySpaceAccess< Kokkos::CudaUVMSpace , Kokkos::CudaHostPinnedSpace > {
+template <>
+struct MemorySpaceAccess<Kokkos::CudaUVMSpace, Kokkos::CudaHostPinnedSpace> {
   // CudaUVMSpace::execution_space != CudaHostPinnedSpace::execution_space
   enum { assignable = false };
-  enum { accessible = true }; // CudaUVMSpace::execution_space
-  enum { deepcopy   = true };
+  enum { accessible = true };  // CudaUVMSpace::execution_space
+  enum { deepcopy = true };
 };
 
-
 //----------------------------------------
 // CudaHostPinnedSpace::execution_space == HostSpace::execution_space
 // CudaHostPinnedSpace accessible to both Cuda and Host
 
-template<>
-struct MemorySpaceAccess< Kokkos::CudaHostPinnedSpace , Kokkos::HostSpace > {
-  enum { assignable = false }; // Cannot access from Cuda
-  enum { accessible = true };  // CudaHostPinnedSpace::execution_space
-  enum { deepcopy   = true };
+template <>
+struct MemorySpaceAccess<Kokkos::CudaHostPinnedSpace, Kokkos::HostSpace> {
+  enum { assignable = false };  // Cannot access from Cuda
+  enum { accessible = true };   // CudaHostPinnedSpace::execution_space
+  enum { deepcopy = true };
 };
 
-template<>
-struct MemorySpaceAccess< Kokkos::CudaHostPinnedSpace , Kokkos::CudaSpace > {
-  enum { assignable = false }; // Cannot access from Host
+template <>
+struct MemorySpaceAccess<Kokkos::CudaHostPinnedSpace, Kokkos::CudaSpace> {
+  enum { assignable = false };  // Cannot access from Host
   enum { accessible = false };
-  enum { deepcopy   = true };
+  enum { deepcopy = true };
 };
 
-template<>
-struct MemorySpaceAccess< Kokkos::CudaHostPinnedSpace , Kokkos::CudaUVMSpace > {
-  enum { assignable = false }; // different execution_space
-  enum { accessible = true };  // same accessibility
-  enum { deepcopy   = true };
+template <>
+struct MemorySpaceAccess<Kokkos::CudaHostPinnedSpace, Kokkos::CudaUVMSpace> {
+  enum { assignable = false };  // different execution_space
+  enum { accessible = true };   // same accessibility
+  enum { deepcopy = true };
 };
 
 //----------------------------------------
 
-}} // namespace Kokkos::Impl
+}  // namespace Impl
+}  // namespace Kokkos
 
 /*--------------------------------------------------------------------------*/
 /*--------------------------------------------------------------------------*/
@@ -371,247 +381,223 @@ struct MemorySpaceAccess< Kokkos::CudaHostPinnedSpace , Kokkos::CudaUVMSpace > {
 namespace Kokkos {
 namespace Impl {
 
-void DeepCopyAsyncCuda( void * dst , const void * src , size_t n);
+void DeepCopyAsyncCuda(void* dst, const void* src, size_t n);
 
-template<> struct DeepCopy< CudaSpace , CudaSpace , Cuda>
-{
-  DeepCopy( void * dst , const void * src , size_t );
-  DeepCopy( const Cuda & , void * dst , const void * src , size_t );
+template <>
+struct DeepCopy<CudaSpace, CudaSpace, Cuda> {
+  DeepCopy(void* dst, const void* src, size_t);
+  DeepCopy(const Cuda&, void* dst, const void* src, size_t);
 };
 
-template<> struct DeepCopy< CudaSpace , HostSpace , Cuda >
-{
-  DeepCopy( void * dst , const void * src , size_t );
-  DeepCopy( const Cuda & , void * dst , const void * src , size_t );
+template <>
+struct DeepCopy<CudaSpace, HostSpace, Cuda> {
+  DeepCopy(void* dst, const void* src, size_t);
+  DeepCopy(const Cuda&, void* dst, const void* src, size_t);
 };
 
-template<> struct DeepCopy< HostSpace , CudaSpace , Cuda >
-{
-  DeepCopy( void * dst , const void * src , size_t );
-  DeepCopy( const Cuda & , void * dst , const void * src , size_t );
+template <>
+struct DeepCopy<HostSpace, CudaSpace, Cuda> {
+  DeepCopy(void* dst, const void* src, size_t);
+  DeepCopy(const Cuda&, void* dst, const void* src, size_t);
 };
 
-template<class ExecutionSpace> struct DeepCopy< CudaSpace , CudaSpace , ExecutionSpace >
-{
-  inline
-  DeepCopy( void * dst , const void * src , size_t n )
-  { (void) DeepCopy< CudaSpace , CudaSpace , Cuda >( dst , src , n ); }
+template <class ExecutionSpace>
+struct DeepCopy<CudaSpace, CudaSpace, ExecutionSpace> {
+  inline DeepCopy(void* dst, const void* src, size_t n) {
+    (void)DeepCopy<CudaSpace, CudaSpace, Cuda>(dst, src, n);
+  }
 
-  inline
-  DeepCopy( const ExecutionSpace& exec, void * dst , const void * src , size_t n )
-  {
+  inline DeepCopy(const ExecutionSpace& exec, void* dst, const void* src,
+                  size_t n) {
     exec.fence();
-    DeepCopyAsyncCuda (dst,src,n);
+    DeepCopyAsyncCuda(dst, src, n);
   }
 };
 
-template<class ExecutionSpace> struct DeepCopy< CudaSpace , HostSpace , ExecutionSpace >
-{
-  inline
-  DeepCopy( void * dst , const void * src , size_t n )
-  { (void) DeepCopy< CudaSpace , HostSpace , Cuda>( dst , src , n ); }
+template <class ExecutionSpace>
+struct DeepCopy<CudaSpace, HostSpace, ExecutionSpace> {
+  inline DeepCopy(void* dst, const void* src, size_t n) {
+    (void)DeepCopy<CudaSpace, HostSpace, Cuda>(dst, src, n);
+  }
 
-  inline
-  DeepCopy( const ExecutionSpace& exec, void * dst , const void * src , size_t n )
-  {
+  inline DeepCopy(const ExecutionSpace& exec, void* dst, const void* src,
+                  size_t n) {
     exec.fence();
-    DeepCopyAsyncCuda (dst,src,n);
+    DeepCopyAsyncCuda(dst, src, n);
   }
 };
 
-template<class ExecutionSpace>
-struct DeepCopy< HostSpace , CudaSpace , ExecutionSpace >
-{
-  inline
-  DeepCopy( void * dst , const void * src , size_t n )
-  { (void) DeepCopy< HostSpace , CudaSpace , Cuda >( dst , src , n ); }
+template <class ExecutionSpace>
+struct DeepCopy<HostSpace, CudaSpace, ExecutionSpace> {
+  inline DeepCopy(void* dst, const void* src, size_t n) {
+    (void)DeepCopy<HostSpace, CudaSpace, Cuda>(dst, src, n);
+  }
 
-  inline
-  DeepCopy( const ExecutionSpace& exec, void * dst , const void * src , size_t n )
-  {
+  inline DeepCopy(const ExecutionSpace& exec, void* dst, const void* src,
+                  size_t n) {
     exec.fence();
-    DeepCopyAsyncCuda (dst,src,n);
+    DeepCopyAsyncCuda(dst, src, n);
   }
 };
 
-template<class ExecutionSpace>
-struct DeepCopy< CudaSpace , CudaUVMSpace , ExecutionSpace >
-{
-  inline
-  DeepCopy( void * dst , const void * src , size_t n )
-  { (void) DeepCopy< CudaSpace , CudaSpace , Cuda >( dst , src , n ); }
+template <class ExecutionSpace>
+struct DeepCopy<CudaSpace, CudaUVMSpace, ExecutionSpace> {
+  inline DeepCopy(void* dst, const void* src, size_t n) {
+    (void)DeepCopy<CudaSpace, CudaSpace, Cuda>(dst, src, n);
+  }
 
-  inline
-  DeepCopy( const ExecutionSpace& exec, void * dst , const void * src , size_t n )
-  {
+  inline DeepCopy(const ExecutionSpace& exec, void* dst, const void* src,
+                  size_t n) {
     exec.fence();
-    DeepCopyAsyncCuda (dst,src,n);
+    DeepCopyAsyncCuda(dst, src, n);
   }
 };
 
-template<class ExecutionSpace>
-struct DeepCopy< CudaSpace , CudaHostPinnedSpace , ExecutionSpace>
-{
-  inline
-  DeepCopy( void * dst , const void * src , size_t n )
-  { (void) DeepCopy< CudaSpace , HostSpace , Cuda >( dst , src , n ); }
+template <class ExecutionSpace>
+struct DeepCopy<CudaSpace, CudaHostPinnedSpace, ExecutionSpace> {
+  inline DeepCopy(void* dst, const void* src, size_t n) {
+    (void)DeepCopy<CudaSpace, HostSpace, Cuda>(dst, src, n);
+  }
 
-  inline
-  DeepCopy( const ExecutionSpace& exec, void * dst , const void * src , size_t n )
-  {
+  inline DeepCopy(const ExecutionSpace& exec, void* dst, const void* src,
+                  size_t n) {
     exec.fence();
-    DeepCopyAsyncCuda (dst,src,n);
+    DeepCopyAsyncCuda(dst, src, n);
   }
 };
 
+template <class ExecutionSpace>
+struct DeepCopy<CudaUVMSpace, CudaSpace, ExecutionSpace> {
+  inline DeepCopy(void* dst, const void* src, size_t n) {
+    (void)DeepCopy<CudaSpace, CudaSpace, Cuda>(dst, src, n);
+  }
 
-template<class ExecutionSpace>
-struct DeepCopy< CudaUVMSpace , CudaSpace , ExecutionSpace>
-{
-  inline
-  DeepCopy( void * dst , const void * src , size_t n )
-  { (void) DeepCopy< CudaSpace , CudaSpace , Cuda >( dst , src , n ); }
-
-  inline
-  DeepCopy( const ExecutionSpace& exec, void * dst , const void * src , size_t n )
-  {
+  inline DeepCopy(const ExecutionSpace& exec, void* dst, const void* src,
+                  size_t n) {
     exec.fence();
-    DeepCopyAsyncCuda (dst,src,n);
+    DeepCopyAsyncCuda(dst, src, n);
   }
 };
 
-template<class ExecutionSpace>
-struct DeepCopy< CudaUVMSpace , CudaUVMSpace , ExecutionSpace>
-{
-  inline
-  DeepCopy( void * dst , const void * src , size_t n )
-  { (void) DeepCopy< CudaSpace , CudaSpace , Cuda >( dst , src , n ); }
+template <class ExecutionSpace>
+struct DeepCopy<CudaUVMSpace, CudaUVMSpace, ExecutionSpace> {
+  inline DeepCopy(void* dst, const void* src, size_t n) {
+    (void)DeepCopy<CudaSpace, CudaSpace, Cuda>(dst, src, n);
+  }
 
-  inline
-  DeepCopy( const ExecutionSpace& exec, void * dst , const void * src , size_t n )
-  {
+  inline DeepCopy(const ExecutionSpace& exec, void* dst, const void* src,
+                  size_t n) {
     exec.fence();
-    DeepCopyAsyncCuda (dst,src,n);
+    DeepCopyAsyncCuda(dst, src, n);
   }
 };
 
-template<class ExecutionSpace>
-struct DeepCopy< CudaUVMSpace , CudaHostPinnedSpace , ExecutionSpace>
-{
-  inline
-  DeepCopy( void * dst , const void * src , size_t n )
-  { (void) DeepCopy< CudaSpace , HostSpace , Cuda >( dst , src , n ); }
+template <class ExecutionSpace>
+struct DeepCopy<CudaUVMSpace, CudaHostPinnedSpace, ExecutionSpace> {
+  inline DeepCopy(void* dst, const void* src, size_t n) {
+    (void)DeepCopy<CudaSpace, HostSpace, Cuda>(dst, src, n);
+  }
 
-  inline
-  DeepCopy( const ExecutionSpace& exec, void * dst , const void * src , size_t n )
-  {
+  inline DeepCopy(const ExecutionSpace& exec, void* dst, const void* src,
+                  size_t n) {
     exec.fence();
-    DeepCopyAsyncCuda (dst,src,n);
+    DeepCopyAsyncCuda(dst, src, n);
   }
 };
 
-template<class ExecutionSpace> struct DeepCopy< CudaUVMSpace , HostSpace , ExecutionSpace >
-{
-  inline
-  DeepCopy( void * dst , const void * src , size_t n )
-  { (void) DeepCopy< CudaSpace , HostSpace , Cuda >( dst , src , n ); }
+template <class ExecutionSpace>
+struct DeepCopy<CudaUVMSpace, HostSpace, ExecutionSpace> {
+  inline DeepCopy(void* dst, const void* src, size_t n) {
+    (void)DeepCopy<CudaSpace, HostSpace, Cuda>(dst, src, n);
+  }
 
-  inline
-  DeepCopy( const ExecutionSpace& exec, void * dst , const void * src , size_t n )
-  {
+  inline DeepCopy(const ExecutionSpace& exec, void* dst, const void* src,
+                  size_t n) {
     exec.fence();
-    DeepCopyAsyncCuda (dst,src,n);
+    DeepCopyAsyncCuda(dst, src, n);
   }
 };
 
+template <class ExecutionSpace>
+struct DeepCopy<CudaHostPinnedSpace, CudaSpace, ExecutionSpace> {
+  inline DeepCopy(void* dst, const void* src, size_t n) {
+    (void)DeepCopy<HostSpace, CudaSpace, Cuda>(dst, src, n);
+  }
 
-template<class ExecutionSpace> struct DeepCopy< CudaHostPinnedSpace , CudaSpace , ExecutionSpace >
-{
-  inline
-  DeepCopy( void * dst , const void * src , size_t n )
-  { (void) DeepCopy< HostSpace , CudaSpace , Cuda >( dst , src , n ); }
-
-  inline
-  DeepCopy( const ExecutionSpace& exec, void * dst , const void * src , size_t n )
-  {
+  inline DeepCopy(const ExecutionSpace& exec, void* dst, const void* src,
+                  size_t n) {
     exec.fence();
-    DeepCopyAsyncCuda (dst,src,n);
+    DeepCopyAsyncCuda(dst, src, n);
   }
 };
 
-template<class ExecutionSpace> struct DeepCopy< CudaHostPinnedSpace , CudaUVMSpace , ExecutionSpace >
-{
-  inline
-  DeepCopy( void * dst , const void * src , size_t n )
-  { (void) DeepCopy< HostSpace , CudaSpace , Cuda >( dst , src , n ); }
+template <class ExecutionSpace>
+struct DeepCopy<CudaHostPinnedSpace, CudaUVMSpace, ExecutionSpace> {
+  inline DeepCopy(void* dst, const void* src, size_t n) {
+    (void)DeepCopy<HostSpace, CudaSpace, Cuda>(dst, src, n);
+  }
 
-  inline
-  DeepCopy( const ExecutionSpace& exec, void * dst , const void * src , size_t n )
-  {
+  inline DeepCopy(const ExecutionSpace& exec, void* dst, const void* src,
+                  size_t n) {
     exec.fence();
-    DeepCopyAsyncCuda (dst,src,n);
+    DeepCopyAsyncCuda(dst, src, n);
   }
 };
 
-template<class ExecutionSpace> struct DeepCopy< CudaHostPinnedSpace , CudaHostPinnedSpace , ExecutionSpace >
-{
-  inline
-  DeepCopy( void * dst , const void * src , size_t n )
-  { (void) DeepCopy< HostSpace , HostSpace , Cuda >( dst , src , n ); }
+template <class ExecutionSpace>
+struct DeepCopy<CudaHostPinnedSpace, CudaHostPinnedSpace, ExecutionSpace> {
+  inline DeepCopy(void* dst, const void* src, size_t n) {
+    (void)DeepCopy<HostSpace, HostSpace, Cuda>(dst, src, n);
+  }
 
-  inline
-  DeepCopy( const ExecutionSpace& exec, void * dst , const void * src , size_t n )
-  {
+  inline DeepCopy(const ExecutionSpace& exec, void* dst, const void* src,
+                  size_t n) {
     exec.fence();
-    DeepCopyAsyncCuda (dst,src,n);
+    DeepCopyAsyncCuda(dst, src, n);
   }
 };
 
-template<class ExecutionSpace> struct DeepCopy< CudaHostPinnedSpace , HostSpace , ExecutionSpace >
-{
-  inline
-  DeepCopy( void * dst , const void * src , size_t n )
-  { (void) DeepCopy< HostSpace , HostSpace , Cuda >( dst , src , n ); }
+template <class ExecutionSpace>
+struct DeepCopy<CudaHostPinnedSpace, HostSpace, ExecutionSpace> {
+  inline DeepCopy(void* dst, const void* src, size_t n) {
+    (void)DeepCopy<HostSpace, HostSpace, Cuda>(dst, src, n);
+  }
 
-  inline
-  DeepCopy( const ExecutionSpace& exec, void * dst , const void * src , size_t n )
-  {
+  inline DeepCopy(const ExecutionSpace& exec, void* dst, const void* src,
+                  size_t n) {
     exec.fence();
-    DeepCopyAsyncCuda (dst,src,n);
+    DeepCopyAsyncCuda(dst, src, n);
   }
 };
 
+template <class ExecutionSpace>
+struct DeepCopy<HostSpace, CudaUVMSpace, ExecutionSpace> {
+  inline DeepCopy(void* dst, const void* src, size_t n) {
+    (void)DeepCopy<HostSpace, CudaSpace, Cuda>(dst, src, n);
+  }
 
-template<class ExecutionSpace> struct DeepCopy< HostSpace , CudaUVMSpace , ExecutionSpace >
-{
-  inline
-  DeepCopy( void * dst , const void * src , size_t n )
-  { (void) DeepCopy< HostSpace , CudaSpace , Cuda >( dst , src , n ); }
-
-  inline
-  DeepCopy( const ExecutionSpace& exec, void * dst , const void * src , size_t n )
-  {
+  inline DeepCopy(const ExecutionSpace& exec, void* dst, const void* src,
+                  size_t n) {
     exec.fence();
-    DeepCopyAsyncCuda (dst,src,n);
+    DeepCopyAsyncCuda(dst, src, n);
   }
 };
 
-template<class ExecutionSpace> struct DeepCopy< HostSpace , CudaHostPinnedSpace , ExecutionSpace >
-{
-  inline
-  DeepCopy( void * dst , const void * src , size_t n )
-  { (void) DeepCopy< HostSpace , HostSpace , Cuda >( dst , src , n ); }
+template <class ExecutionSpace>
+struct DeepCopy<HostSpace, CudaHostPinnedSpace, ExecutionSpace> {
+  inline DeepCopy(void* dst, const void* src, size_t n) {
+    (void)DeepCopy<HostSpace, HostSpace, Cuda>(dst, src, n);
+  }
 
-  inline
-  DeepCopy( const ExecutionSpace& exec, void * dst , const void * src , size_t n )
-  {
+  inline DeepCopy(const ExecutionSpace& exec, void* dst, const void* src,
+                  size_t n) {
     exec.fence();
-    DeepCopyAsyncCuda (dst,src,n);
+    DeepCopyAsyncCuda(dst, src, n);
   }
 };
 
-} // namespace Impl
-} // namespace Kokkos
+}  // namespace Impl
+}  // namespace Kokkos
 
 //----------------------------------------------------------------------------
 //----------------------------------------------------------------------------
@@ -620,79 +606,83 @@ namespace Kokkos {
 namespace Impl {
 
 /** Running in CudaSpace attempting to access HostSpace: error */
-template<>
-struct VerifyExecutionCanAccessMemorySpace< Kokkos::CudaSpace , Kokkos::HostSpace >
-{
+template <>
+struct VerifyExecutionCanAccessMemorySpace<Kokkos::CudaSpace,
+                                           Kokkos::HostSpace> {
   enum { value = false };
-  KOKKOS_INLINE_FUNCTION static void verify( void )
-    { Kokkos::abort("Cuda code attempted to access HostSpace memory"); }
+  KOKKOS_INLINE_FUNCTION static void verify(void) {
+    Kokkos::abort("Cuda code attempted to access HostSpace memory");
+  }
 
-  KOKKOS_INLINE_FUNCTION static void verify( const void * )
-    { Kokkos::abort("Cuda code attempted to access HostSpace memory"); }
+  KOKKOS_INLINE_FUNCTION static void verify(const void*) {
+    Kokkos::abort("Cuda code attempted to access HostSpace memory");
+  }
 };
 
 /** Running in CudaSpace accessing CudaUVMSpace: ok */
-template<>
-struct VerifyExecutionCanAccessMemorySpace< Kokkos::CudaSpace , Kokkos::CudaUVMSpace >
-{
+template <>
+struct VerifyExecutionCanAccessMemorySpace<Kokkos::CudaSpace,
+                                           Kokkos::CudaUVMSpace> {
   enum { value = true };
-  KOKKOS_INLINE_FUNCTION static void verify( void ) { }
-  KOKKOS_INLINE_FUNCTION static void verify( const void * ) { }
+  KOKKOS_INLINE_FUNCTION static void verify(void) {}
+  KOKKOS_INLINE_FUNCTION static void verify(const void*) {}
 };
 
 /** Running in CudaSpace accessing CudaHostPinnedSpace: ok */
-template<>
-struct VerifyExecutionCanAccessMemorySpace< Kokkos::CudaSpace , Kokkos::CudaHostPinnedSpace >
-{
+template <>
+struct VerifyExecutionCanAccessMemorySpace<Kokkos::CudaSpace,
+                                           Kokkos::CudaHostPinnedSpace> {
   enum { value = true };
-  KOKKOS_INLINE_FUNCTION static void verify( void ) { }
-  KOKKOS_INLINE_FUNCTION static void verify( const void * ) { }
+  KOKKOS_INLINE_FUNCTION static void verify(void) {}
+  KOKKOS_INLINE_FUNCTION static void verify(const void*) {}
 };
 
 /** Running in CudaSpace attempting to access an unknown space: error */
-template< class OtherSpace >
+template <class OtherSpace>
 struct VerifyExecutionCanAccessMemorySpace<
-  typename enable_if< ! is_same<Kokkos::CudaSpace,OtherSpace>::value , Kokkos::CudaSpace >::type ,
-  OtherSpace >
-{
+    typename enable_if<!is_same<Kokkos::CudaSpace, OtherSpace>::value,
+                       Kokkos::CudaSpace>::type,
+    OtherSpace> {
   enum { value = false };
-  KOKKOS_INLINE_FUNCTION static void verify( void )
-    { Kokkos::abort("Cuda code attempted to access unknown Space memory"); }
+  KOKKOS_INLINE_FUNCTION static void verify(void) {
+    Kokkos::abort("Cuda code attempted to access unknown Space memory");
+  }
 
-  KOKKOS_INLINE_FUNCTION static void verify( const void * )
-    { Kokkos::abort("Cuda code attempted to access unknown Space memory"); }
+  KOKKOS_INLINE_FUNCTION static void verify(const void*) {
+    Kokkos::abort("Cuda code attempted to access unknown Space memory");
+  }
 };
 
 //----------------------------------------------------------------------------
 /** Running in HostSpace attempting to access CudaSpace */
-template<>
-struct VerifyExecutionCanAccessMemorySpace< Kokkos::HostSpace , Kokkos::CudaSpace >
-{
+template <>
+struct VerifyExecutionCanAccessMemorySpace<Kokkos::HostSpace,
+                                           Kokkos::CudaSpace> {
   enum { value = false };
-  inline static void verify( void ) { CudaSpace::access_error(); }
-  inline static void verify( const void * p ) { CudaSpace::access_error(p); }
+  inline static void verify(void) { CudaSpace::access_error(); }
+  inline static void verify(const void* p) { CudaSpace::access_error(p); }
 };
 
 /** Running in HostSpace accessing CudaUVMSpace is OK */
-template<>
-struct VerifyExecutionCanAccessMemorySpace< Kokkos::HostSpace , Kokkos::CudaUVMSpace >
-{
+template <>
+struct VerifyExecutionCanAccessMemorySpace<Kokkos::HostSpace,
+                                           Kokkos::CudaUVMSpace> {
   enum { value = true };
-  inline static void verify( void ) { }
-  inline static void verify( const void * ) { }
+  inline static void verify(void) {}
+  inline static void verify(const void*) {}
 };
 
 /** Running in HostSpace accessing CudaHostPinnedSpace is OK */
-template<>
-struct VerifyExecutionCanAccessMemorySpace< Kokkos::HostSpace , Kokkos::CudaHostPinnedSpace >
-{
+template <>
+struct VerifyExecutionCanAccessMemorySpace<Kokkos::HostSpace,
+                                           Kokkos::CudaHostPinnedSpace> {
   enum { value = true };
-  KOKKOS_INLINE_FUNCTION static void verify( void ) {}
-  KOKKOS_INLINE_FUNCTION static void verify( const void * ) {}
+  KOKKOS_INLINE_FUNCTION static void verify(void) {}
+  KOKKOS_INLINE_FUNCTION static void verify(const void*) {}
 };
 
-} // namespace Impl
-} // namespace Kokkos
+}  // namespace Impl
+}  // namespace Kokkos
 
 //----------------------------------------------------------------------------
 //----------------------------------------------------------------------------
@@ -700,248 +690,214 @@ struct VerifyExecutionCanAccessMemorySpace< Kokkos::HostSpace , Kokkos::CudaHost
 namespace Kokkos {
 namespace Impl {
 
-template<>
-class SharedAllocationRecord< Kokkos::CudaSpace , void >
-  : public SharedAllocationRecord< void , void >
-{
-private:
+template <>
+class SharedAllocationRecord<Kokkos::CudaSpace, void>
+    : public SharedAllocationRecord<void, void> {
+ private:
+  friend class SharedAllocationRecord<Kokkos::CudaUVMSpace, void>;
 
-  friend class SharedAllocationRecord< Kokkos::CudaUVMSpace , void > ;
+  typedef SharedAllocationRecord<void, void> RecordBase;
 
-  typedef SharedAllocationRecord< void , void >  RecordBase ;
+  SharedAllocationRecord(const SharedAllocationRecord&) = delete;
+  SharedAllocationRecord& operator=(const SharedAllocationRecord&) = delete;
 
-  SharedAllocationRecord( const SharedAllocationRecord & ) = delete ;
-  SharedAllocationRecord & operator = ( const SharedAllocationRecord & ) = delete ;
+  static void deallocate(RecordBase*);
 
-  static void deallocate( RecordBase * );
-
-  static ::cudaTextureObject_t
-  attach_texture_object( const unsigned sizeof_alias
-                       , void * const   alloc_ptr
-                       , const size_t   alloc_size );
+  static ::cudaTextureObject_t attach_texture_object(
+      const unsigned sizeof_alias, void* const alloc_ptr,
+      const size_t alloc_size);
 
 #ifdef KOKKOS_DEBUG
-  static RecordBase s_root_record ;
+  static RecordBase s_root_record;
 #endif
 
-  ::cudaTextureObject_t   m_tex_obj ;
-  const Kokkos::CudaSpace m_space ;
-
-protected:
+  ::cudaTextureObject_t m_tex_obj;
+  const Kokkos::CudaSpace m_space;
 
+ protected:
   ~SharedAllocationRecord();
   SharedAllocationRecord() : RecordBase(), m_tex_obj(0), m_space() {}
 
-  SharedAllocationRecord( const Kokkos::CudaSpace        & arg_space
-                        , const std::string              & arg_label
-                        , const size_t                     arg_alloc_size
-                        , const RecordBase::function_type  arg_dealloc = & deallocate
-                        );
+  SharedAllocationRecord(
+      const Kokkos::CudaSpace& arg_space, const std::string& arg_label,
+      const size_t arg_alloc_size,
+      const RecordBase::function_type arg_dealloc = &deallocate);
 
-public:
+ public:
+  std::string get_label() const;
 
-  std::string get_label() const ;
-
-  static SharedAllocationRecord * allocate( const Kokkos::CudaSpace &  arg_space
-                                          , const std::string       &  arg_label
-                                          , const size_t               arg_alloc_size );
+  static SharedAllocationRecord* allocate(const Kokkos::CudaSpace& arg_space,
+                                          const std::string& arg_label,
+                                          const size_t arg_alloc_size);
 
   /**\brief  Allocate tracked memory in the space */
-  static
-  void * allocate_tracked( const Kokkos::CudaSpace & arg_space
-                         , const std::string & arg_label
-                         , const size_t arg_alloc_size );
+  static void* allocate_tracked(const Kokkos::CudaSpace& arg_space,
+                                const std::string& arg_label,
+                                const size_t arg_alloc_size);
 
   /**\brief  Reallocate tracked memory in the space */
-  static
-  void * reallocate_tracked( void * const arg_alloc_ptr
-                           , const size_t arg_alloc_size );
+  static void* reallocate_tracked(void* const arg_alloc_ptr,
+                                  const size_t arg_alloc_size);
 
   /**\brief  Deallocate tracked memory in the space */
-  static
-  void deallocate_tracked( void * const arg_alloc_ptr );
+  static void deallocate_tracked(void* const arg_alloc_ptr);
 
-  static SharedAllocationRecord * get_record( void * arg_alloc_ptr );
+  static SharedAllocationRecord* get_record(void* arg_alloc_ptr);
 
-  template< typename AliasType >
-  inline
-  ::cudaTextureObject_t attach_texture_object()
-    {
-      static_assert( ( std::is_same< AliasType , int >::value ||
-                       std::is_same< AliasType , ::int2 >::value ||
-                       std::is_same< AliasType , ::int4 >::value )
-                   , "Cuda texture fetch only supported for alias types of int, ::int2, or ::int4" );
+  template <typename AliasType>
+  inline ::cudaTextureObject_t attach_texture_object() {
+    static_assert((std::is_same<AliasType, int>::value ||
+                   std::is_same<AliasType, ::int2>::value ||
+                   std::is_same<AliasType, ::int4>::value),
+                  "Cuda texture fetch only supported for alias types of int, "
+                  "::int2, or ::int4");
 
-      if ( m_tex_obj == 0 ) {
-        m_tex_obj = attach_texture_object( sizeof(AliasType)
-                                         , (void*) RecordBase::m_alloc_ptr
-                                         , RecordBase::m_alloc_size );
-      }
-
-      return m_tex_obj ;
+    if (m_tex_obj == 0) {
+      m_tex_obj = attach_texture_object(sizeof(AliasType),
+                                        (void*)RecordBase::m_alloc_ptr,
+                                        RecordBase::m_alloc_size);
     }
 
-  template< typename AliasType >
-  inline
-  int attach_texture_object_offset( const AliasType * const ptr )
-    {
-      // Texture object is attached to the entire allocation range
-      return ptr - reinterpret_cast<AliasType*>( RecordBase::m_alloc_ptr );
-    }
+    return m_tex_obj;
+  }
 
-  static void print_records( std::ostream & , const Kokkos::CudaSpace & , bool detail = false );
+  template <typename AliasType>
+  inline int attach_texture_object_offset(const AliasType* const ptr) {
+    // Texture object is attached to the entire allocation range
+    return ptr - reinterpret_cast<AliasType*>(RecordBase::m_alloc_ptr);
+  }
+
+  static void print_records(std::ostream&, const Kokkos::CudaSpace&,
+                            bool detail = false);
 };
 
+template <>
+class SharedAllocationRecord<Kokkos::CudaUVMSpace, void>
+    : public SharedAllocationRecord<void, void> {
+ private:
+  typedef SharedAllocationRecord<void, void> RecordBase;
 
-template<>
-class SharedAllocationRecord< Kokkos::CudaUVMSpace , void >
-  : public SharedAllocationRecord< void , void >
-{
-private:
+  SharedAllocationRecord(const SharedAllocationRecord&) = delete;
+  SharedAllocationRecord& operator=(const SharedAllocationRecord&) = delete;
 
-  typedef SharedAllocationRecord< void , void >  RecordBase ;
+  static void deallocate(RecordBase*);
 
-  SharedAllocationRecord( const SharedAllocationRecord & ) = delete ;
-  SharedAllocationRecord & operator = ( const SharedAllocationRecord & ) = delete ;
+  static RecordBase s_root_record;
 
-  static void deallocate( RecordBase * );
-
-  static RecordBase s_root_record ;
-
-  ::cudaTextureObject_t      m_tex_obj ;
-  const Kokkos::CudaUVMSpace m_space ;
-
-protected:
+  ::cudaTextureObject_t m_tex_obj;
+  const Kokkos::CudaUVMSpace m_space;
 
+ protected:
   ~SharedAllocationRecord();
   SharedAllocationRecord() : RecordBase(), m_tex_obj(0), m_space() {}
 
-  SharedAllocationRecord( const Kokkos::CudaUVMSpace     & arg_space
-                        , const std::string              & arg_label
-                        , const size_t                     arg_alloc_size
-                        , const RecordBase::function_type  arg_dealloc = & deallocate
-                        );
+  SharedAllocationRecord(
+      const Kokkos::CudaUVMSpace& arg_space, const std::string& arg_label,
+      const size_t arg_alloc_size,
+      const RecordBase::function_type arg_dealloc = &deallocate);
 
-public:
+ public:
+  std::string get_label() const;
 
-  std::string get_label() const ;
-
-  static SharedAllocationRecord * allocate( const Kokkos::CudaUVMSpace &  arg_space
-                                          , const std::string          &  arg_label
-                                          , const size_t                  arg_alloc_size
-                                          );
+  static SharedAllocationRecord* allocate(const Kokkos::CudaUVMSpace& arg_space,
+                                          const std::string& arg_label,
+                                          const size_t arg_alloc_size);
 
   /**\brief  Allocate tracked memory in the space */
-  static
-  void * allocate_tracked( const Kokkos::CudaUVMSpace & arg_space
-                         , const std::string & arg_label
-                         , const size_t arg_alloc_size );
+  static void* allocate_tracked(const Kokkos::CudaUVMSpace& arg_space,
+                                const std::string& arg_label,
+                                const size_t arg_alloc_size);
 
   /**\brief  Reallocate tracked memory in the space */
-  static
-  void * reallocate_tracked( void * const arg_alloc_ptr
-                           , const size_t arg_alloc_size );
+  static void* reallocate_tracked(void* const arg_alloc_ptr,
+                                  const size_t arg_alloc_size);
 
   /**\brief  Deallocate tracked memory in the space */
-  static
-  void deallocate_tracked( void * const arg_alloc_ptr );
+  static void deallocate_tracked(void* const arg_alloc_ptr);
 
-  static SharedAllocationRecord * get_record( void * arg_alloc_ptr );
+  static SharedAllocationRecord* get_record(void* arg_alloc_ptr);
 
+  template <typename AliasType>
+  inline ::cudaTextureObject_t attach_texture_object() {
+    static_assert((std::is_same<AliasType, int>::value ||
+                   std::is_same<AliasType, ::int2>::value ||
+                   std::is_same<AliasType, ::int4>::value),
+                  "Cuda texture fetch only supported for alias types of int, "
+                  "::int2, or ::int4");
 
-  template< typename AliasType >
-  inline
-  ::cudaTextureObject_t attach_texture_object()
-    {
-      static_assert( ( std::is_same< AliasType , int >::value ||
-                       std::is_same< AliasType , ::int2 >::value ||
-                       std::is_same< AliasType , ::int4 >::value )
-                   , "Cuda texture fetch only supported for alias types of int, ::int2, or ::int4" );
-
-      if ( m_tex_obj == 0 ) {
-        m_tex_obj = SharedAllocationRecord< Kokkos::CudaSpace , void >::
-          attach_texture_object( sizeof(AliasType)
-                               , (void*) RecordBase::m_alloc_ptr
-                               , RecordBase::m_alloc_size );
-      }
-
-      return m_tex_obj ;
+    if (m_tex_obj == 0) {
+      m_tex_obj = SharedAllocationRecord<Kokkos::CudaSpace, void>::
+          attach_texture_object(sizeof(AliasType),
+                                (void*)RecordBase::m_alloc_ptr,
+                                RecordBase::m_alloc_size);
     }
 
-  template< typename AliasType >
-  inline
-  int attach_texture_object_offset( const AliasType * const ptr )
-    {
-      // Texture object is attached to the entire allocation range
-      return ptr - reinterpret_cast<AliasType*>( RecordBase::m_alloc_ptr );
-    }
+    return m_tex_obj;
+  }
 
-  static void print_records( std::ostream & , const Kokkos::CudaUVMSpace & , bool detail = false );
+  template <typename AliasType>
+  inline int attach_texture_object_offset(const AliasType* const ptr) {
+    // Texture object is attached to the entire allocation range
+    return ptr - reinterpret_cast<AliasType*>(RecordBase::m_alloc_ptr);
+  }
+
+  static void print_records(std::ostream&, const Kokkos::CudaUVMSpace&,
+                            bool detail = false);
 };
 
-template<>
-class SharedAllocationRecord< Kokkos::CudaHostPinnedSpace , void >
-  : public SharedAllocationRecord< void , void >
-{
-private:
+template <>
+class SharedAllocationRecord<Kokkos::CudaHostPinnedSpace, void>
+    : public SharedAllocationRecord<void, void> {
+ private:
+  typedef SharedAllocationRecord<void, void> RecordBase;
 
-  typedef SharedAllocationRecord< void , void >  RecordBase ;
+  SharedAllocationRecord(const SharedAllocationRecord&) = delete;
+  SharedAllocationRecord& operator=(const SharedAllocationRecord&) = delete;
 
-  SharedAllocationRecord( const SharedAllocationRecord & ) = delete ;
-  SharedAllocationRecord & operator = ( const SharedAllocationRecord & ) = delete ;
+  static void deallocate(RecordBase*);
 
-  static void deallocate( RecordBase * );
+  static RecordBase s_root_record;
 
-  static RecordBase s_root_record ;
-
-  const Kokkos::CudaHostPinnedSpace m_space ;
-
-protected:
+  const Kokkos::CudaHostPinnedSpace m_space;
 
+ protected:
   ~SharedAllocationRecord();
   SharedAllocationRecord() : RecordBase(), m_space() {}
 
-  SharedAllocationRecord( const Kokkos::CudaHostPinnedSpace     & arg_space
-                        , const std::string              & arg_label
-                        , const size_t                     arg_alloc_size
-                        , const RecordBase::function_type  arg_dealloc = & deallocate
-                        );
+  SharedAllocationRecord(
+      const Kokkos::CudaHostPinnedSpace& arg_space,
+      const std::string& arg_label, const size_t arg_alloc_size,
+      const RecordBase::function_type arg_dealloc = &deallocate);
 
-public:
+ public:
+  std::string get_label() const;
 
-  std::string get_label() const ;
-
-  static SharedAllocationRecord * allocate( const Kokkos::CudaHostPinnedSpace &  arg_space
-                                          , const std::string          &  arg_label
-                                          , const size_t                  arg_alloc_size
-                                          );
+  static SharedAllocationRecord* allocate(
+      const Kokkos::CudaHostPinnedSpace& arg_space,
+      const std::string& arg_label, const size_t arg_alloc_size);
   /**\brief  Allocate tracked memory in the space */
-  static
-  void * allocate_tracked( const Kokkos::CudaHostPinnedSpace & arg_space
-                         , const std::string & arg_label
-                         , const size_t arg_alloc_size );
+  static void* allocate_tracked(const Kokkos::CudaHostPinnedSpace& arg_space,
+                                const std::string& arg_label,
+                                const size_t arg_alloc_size);
 
   /**\brief  Reallocate tracked memory in the space */
-  static
-  void * reallocate_tracked( void * const arg_alloc_ptr
-                           , const size_t arg_alloc_size );
+  static void* reallocate_tracked(void* const arg_alloc_ptr,
+                                  const size_t arg_alloc_size);
 
   /**\brief  Deallocate tracked memory in the space */
-  static
-  void deallocate_tracked( void * const arg_alloc_ptr );
+  static void deallocate_tracked(void* const arg_alloc_ptr);
 
+  static SharedAllocationRecord* get_record(void* arg_alloc_ptr);
 
-  static SharedAllocationRecord * get_record( void * arg_alloc_ptr );
-
-  static void print_records( std::ostream & , const Kokkos::CudaHostPinnedSpace & , bool detail = false );
+  static void print_records(std::ostream&, const Kokkos::CudaHostPinnedSpace&,
+                            bool detail = false);
 };
 
-} // namespace Impl
-} // namespace Kokkos
+}  // namespace Impl
+}  // namespace Kokkos
 
 //----------------------------------------------------------------------------
 //----------------------------------------------------------------------------
 
 #endif /* #if defined( KOKKOS_ENABLE_CUDA ) */
 #endif /* #define KOKKOS_CUDASPACE_HPP */
-
diff --git a/lib/kokkos/core/src/Kokkos_ExecPolicy.hpp b/lib/kokkos/core/src/Kokkos_ExecPolicy.hpp
index 5c85850fda..bf3a134b64 100644
--- a/lib/kokkos/core/src/Kokkos_ExecPolicy.hpp
+++ b/lib/kokkos/core/src/Kokkos_ExecPolicy.hpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -53,7 +54,7 @@
 #include <iostream>
 #if defined(KOKKOS_ENABLE_PROFILING)
 #include <typeinfo>
-#endif // KOKKOS_ENABLE_PROFILING
+#endif  // KOKKOS_ENABLE_PROFILING
 
 //----------------------------------------------------------------------------
 
@@ -65,7 +66,7 @@ struct ParallelReduceTag {};
 
 struct ChunkSize {
   int value;
-  ChunkSize(int value_):value(value_) {}
+  ChunkSize(int value_) : value(value_) {}
 };
 
 /** \brief  Execution policy for work over a range of an integral type.
@@ -89,210 +90,192 @@ struct ChunkSize {
  *
  *  Blocking is the granularity of partitioning the range among threads.
  */
-template<class ... Properties>
-class RangePolicy
-  : public Impl::PolicyTraits<Properties ... >
-{
-public:
-  typedef Impl::PolicyTraits<Properties ... > traits;
-private:
+template <class... Properties>
+class RangePolicy : public Impl::PolicyTraits<Properties...> {
+ public:
+  typedef Impl::PolicyTraits<Properties...> traits;
 
-  typename traits::execution_space m_space ;
-  typename traits::index_type  m_begin ;
-  typename traits::index_type  m_end ;
-  typename traits::index_type  m_granularity ;
-  typename traits::index_type  m_granularity_mask ;
+ private:
+  typename traits::execution_space m_space;
+  typename traits::index_type m_begin;
+  typename traits::index_type m_end;
+  typename traits::index_type m_granularity;
+  typename traits::index_type m_granularity_mask;
 
-  template<class ... OtherProperties>
+  template <class... OtherProperties>
   friend class RangePolicy;
 
-public:
+ public:
   //! Tag this class as an execution policy
   typedef RangePolicy execution_policy;
-  typedef typename traits::index_type member_type ;
+  typedef typename traits::index_type member_type;
   typedef typename traits::index_type index_type;
 
-  KOKKOS_INLINE_FUNCTION const typename traits::execution_space & space() const { return m_space ; }
-  KOKKOS_INLINE_FUNCTION member_type begin() const { return m_begin ; }
-  KOKKOS_INLINE_FUNCTION member_type end()   const { return m_end ; }
+  KOKKOS_INLINE_FUNCTION const typename traits::execution_space& space() const {
+    return m_space;
+  }
+  KOKKOS_INLINE_FUNCTION member_type begin() const { return m_begin; }
+  KOKKOS_INLINE_FUNCTION member_type end() const { return m_end; }
 
-  //TODO: find a better workaround for Clangs weird instantiation order
-  // This thing is here because of an instantiation error, where the RangePolicy is inserted into FunctorValue Traits, which
-  // tries decltype on the operator. It tries to do this even though the first argument of parallel for clearly doesn't match.
+  // TODO: find a better workaround for Clangs weird instantiation order
+  // This thing is here because of an instantiation error, where the RangePolicy
+  // is inserted into FunctorValue Traits, which tries decltype on the operator.
+  // It tries to do this even though the first argument of parallel for clearly
+  // doesn't match.
   void operator()(const int&) const {}
 
   RangePolicy(const RangePolicy&) = default;
-  RangePolicy(RangePolicy&&) = default;
+  RangePolicy(RangePolicy&&)      = default;
 
-  template<class ... OtherProperties>
+  template <class... OtherProperties>
   RangePolicy(const RangePolicy<OtherProperties...> p) {
-    m_space = p.m_space;
-    m_begin = p.m_begin;
-    m_end = p.m_end;
-    m_granularity = p.m_granularity;
+    m_space            = p.m_space;
+    m_begin            = p.m_begin;
+    m_end              = p.m_end;
+    m_granularity      = p.m_granularity;
     m_granularity_mask = p.m_granularity_mask;
   }
 
   inline RangePolicy() : m_space(), m_begin(0), m_end(0) {}
 
   /** \brief  Total range */
-  inline
-  RangePolicy( const typename traits::execution_space & work_space
-             , const member_type work_begin
-             , const member_type work_end
-             )
-    : m_space( work_space )
-    , m_begin( work_begin < work_end ? work_begin : 0 )
-    , m_end(   work_begin < work_end ? work_end : 0 )
-    , m_granularity(0)
-    , m_granularity_mask(0)
-    {
-      set_auto_chunk_size();
-    }
-
-  /** \brief  Total range */
-  inline
-  RangePolicy( const member_type work_begin
-             , const member_type work_end
-             )
-    : RangePolicy( typename traits::execution_space()
-                 , work_begin , work_end )
-    {
-      set_auto_chunk_size();
-    }
-
-  /** \brief  Total range */
-  template<class ... Args>
-  inline
-  RangePolicy( const typename traits::execution_space & work_space
-             , const member_type work_begin
-             , const member_type work_end
-             , Args ... args
-             )
-    : m_space( work_space )
-    , m_begin( work_begin < work_end ? work_begin : 0 )
-    , m_end(   work_begin < work_end ? work_end : 0 )
-    , m_granularity(0)
-    , m_granularity_mask(0)
-    {
-      set_auto_chunk_size();
-      set(args...);
-    }
-
-  /** \brief  Total range */
-  template<class ... Args>
-  inline
-  RangePolicy( const member_type work_begin
-             , const member_type work_end
-             , Args ... args
-             )
-    : RangePolicy( typename traits::execution_space()
-                 , work_begin , work_end )
-    {
-      set_auto_chunk_size();
-      set(args...);
-    }
-
-private:
-  inline void set() {}
-
-public:
-  template<class ... Args>
-  inline void set(Args ...) {
-    static_assert( 0 == sizeof...(Args), "Kokkos::RangePolicy: unhandled constructor arguments encountered.");
+  inline RangePolicy(const typename traits::execution_space& work_space,
+                     const member_type work_begin, const member_type work_end)
+      : m_space(work_space),
+        m_begin(work_begin < work_end ? work_begin : 0),
+        m_end(work_begin < work_end ? work_end : 0),
+        m_granularity(0),
+        m_granularity_mask(0) {
+    set_auto_chunk_size();
   }
 
-  template<class ... Args>
-  inline void set(const ChunkSize& chunksize, Args ... args) {
-    m_granularity = chunksize.value;
+  /** \brief  Total range */
+  inline RangePolicy(const member_type work_begin, const member_type work_end)
+      : RangePolicy(typename traits::execution_space(), work_begin, work_end) {
+    set_auto_chunk_size();
+  }
+
+  /** \brief  Total range */
+  template <class... Args>
+  inline RangePolicy(const typename traits::execution_space& work_space,
+                     const member_type work_begin, const member_type work_end,
+                     Args... args)
+      : m_space(work_space),
+        m_begin(work_begin < work_end ? work_begin : 0),
+        m_end(work_begin < work_end ? work_end : 0),
+        m_granularity(0),
+        m_granularity_mask(0) {
+    set_auto_chunk_size();
+    set(args...);
+  }
+
+  /** \brief  Total range */
+  template <class... Args>
+  inline RangePolicy(const member_type work_begin, const member_type work_end,
+                     Args... args)
+      : RangePolicy(typename traits::execution_space(), work_begin, work_end) {
+    set_auto_chunk_size();
+    set(args...);
+  }
+
+ private:
+  inline void set() {}
+
+ public:
+  template <class... Args>
+  inline void set(Args...) {
+    static_assert(
+        0 == sizeof...(Args),
+        "Kokkos::RangePolicy: unhandled constructor arguments encountered.");
+  }
+
+  template <class... Args>
+  inline void set(const ChunkSize& chunksize, Args... args) {
+    m_granularity      = chunksize.value;
     m_granularity_mask = m_granularity - 1;
   }
 
-public:
+ public:
   /** \brief return chunk_size */
-  inline member_type chunk_size() const {
-    return m_granularity;
-  }
+  inline member_type chunk_size() const { return m_granularity; }
 
   /** \brief set chunk_size to a discrete value*/
   inline RangePolicy set_chunk_size(int chunk_size_) const {
-    RangePolicy p = *this;
-    p.m_granularity = chunk_size_;
+    RangePolicy p        = *this;
+    p.m_granularity      = chunk_size_;
     p.m_granularity_mask = p.m_granularity - 1;
     return p;
   }
 
-private:
+ private:
   /** \brief finalize chunk_size if it was set to AUTO*/
   inline void set_auto_chunk_size() {
+    typename traits::index_type concurrency =
+        traits::execution_space::concurrency();
+    if (concurrency == 0) concurrency = 1;
 
-   typename traits::index_type concurrency = traits::execution_space::concurrency();
-   if( concurrency==0 ) concurrency=1;
+    if (m_granularity > 0) {
+      if (!Impl::is_integral_power_of_two(m_granularity))
+        Kokkos::abort("RangePolicy blocking granularity must be power of two");
+    }
 
-   if(m_granularity > 0) {
-     if(!Impl::is_integral_power_of_two( m_granularity ))
-       Kokkos::abort("RangePolicy blocking granularity must be power of two" );
-   }
-
-   member_type new_chunk_size = 1;
-   while(new_chunk_size*100*concurrency < m_end-m_begin)
-     new_chunk_size *= 2;
-   if(new_chunk_size < 128) {
-     new_chunk_size = 1;
-     while( (new_chunk_size*40*concurrency < m_end-m_begin ) && (new_chunk_size<128) )
-       new_chunk_size*=2;
-   }
-   m_granularity = new_chunk_size;
-   m_granularity_mask = m_granularity - 1;
+    member_type new_chunk_size = 1;
+    while (new_chunk_size * 100 * concurrency < m_end - m_begin)
+      new_chunk_size *= 2;
+    if (new_chunk_size < 128) {
+      new_chunk_size = 1;
+      while ((new_chunk_size * 40 * concurrency < m_end - m_begin) &&
+             (new_chunk_size < 128))
+        new_chunk_size *= 2;
+    }
+    m_granularity      = new_chunk_size;
+    m_granularity_mask = m_granularity - 1;
   }
 
-public:
+ public:
   /** \brief  Subrange for a partition's rank and size.
    *
    *  Typically used to partition a range over a group of threads.
    */
   struct WorkRange {
-    typedef typename RangePolicy::work_tag     work_tag ;
-    typedef typename RangePolicy::member_type  member_type ;
+    typedef typename RangePolicy::work_tag work_tag;
+    typedef typename RangePolicy::member_type member_type;
 
-    KOKKOS_INLINE_FUNCTION member_type begin() const { return m_begin ; }
-    KOKKOS_INLINE_FUNCTION member_type end()   const { return m_end ; }
+    KOKKOS_INLINE_FUNCTION member_type begin() const { return m_begin; }
+    KOKKOS_INLINE_FUNCTION member_type end() const { return m_end; }
 
     /** \brief  Subrange for a partition's rank and size.
      *
      *  Typically used to partition a range over a group of threads.
      */
     KOKKOS_INLINE_FUNCTION
-    WorkRange( const RangePolicy & range
-             , const int part_rank
-             , const int part_size
-             )
-      : m_begin(0), m_end(0)
-      {
-        if ( part_size ) {
+    WorkRange(const RangePolicy& range, const int part_rank,
+              const int part_size)
+        : m_begin(0), m_end(0) {
+      if (part_size) {
+        // Split evenly among partitions, then round up to the granularity.
+        const member_type work_part =
+            ((((range.end() - range.begin()) + (part_size - 1)) / part_size) +
+             range.m_granularity_mask) &
+            ~member_type(range.m_granularity_mask);
 
-          // Split evenly among partitions, then round up to the granularity.
-          const member_type work_part =
-            ( ( ( ( range.end() - range.begin() ) + ( part_size - 1 ) ) / part_size )
-              + range.m_granularity_mask ) & ~member_type(range.m_granularity_mask);
+        m_begin = range.begin() + work_part * part_rank;
+        m_end   = m_begin + work_part;
 
-          m_begin = range.begin() + work_part * part_rank ;
-          m_end   = m_begin       + work_part ;
-
-          if ( range.end() < m_begin ) m_begin = range.end() ;
-          if ( range.end() < m_end )   m_end   = range.end() ;
-        }
+        if (range.end() < m_begin) m_begin = range.end();
+        if (range.end() < m_end) m_end = range.end();
       }
+    }
 
-  private:
-    member_type m_begin ;
-    member_type m_end ;
+   private:
+    member_type m_begin;
+    member_type m_end;
     WorkRange();
-    WorkRange & operator = ( const WorkRange & );
+    WorkRange& operator=(const WorkRange&);
   };
 };
 
-} // namespace Kokkos
+}  // namespace Kokkos
 
 //----------------------------------------------------------------------------
 //----------------------------------------------------------------------------
@@ -301,13 +284,12 @@ namespace Kokkos {
 
 namespace Impl {
 
-template< class ExecSpace, class ... Properties>
-class TeamPolicyInternal: public Impl::PolicyTraits<Properties ... > {
-private:
-  typedef Impl::PolicyTraits<Properties ... > traits;
+template <class ExecSpace, class... Properties>
+class TeamPolicyInternal : public Impl::PolicyTraits<Properties...> {
+ private:
+  typedef Impl::PolicyTraits<Properties...> traits;
 
-public:
-  
+ public:
   typedef typename traits::index_type index_type;
 
   //----------------------------------------
@@ -321,8 +303,8 @@ public:
    *  With multi-operator functors it cannot be determined
    *  which operator will be called.
    */
-  template< class FunctorType >
-  static int team_size_max( const FunctorType & );
+  template <class FunctorType>
+  static int team_size_max(const FunctorType&);
 
   /** \brief  Query recommended team size for a given functor.
    *
@@ -334,48 +316,56 @@ public:
    *  With multi-operator functors it cannot be determined
    *  which operator will be called.
    */
-  template< class FunctorType >
-  static int team_size_recommended( const FunctorType & );
+  template <class FunctorType>
+  static int team_size_recommended(const FunctorType&);
 
-  template< class FunctorType >
-  static int team_size_recommended( const FunctorType & , const int&);
+  template <class FunctorType>
+  static int team_size_recommended(const FunctorType&, const int&);
 
-  template<class FunctorType>
-  int team_size_recommended( const FunctorType & functor , const int vector_length);
+  template <class FunctorType>
+  int team_size_recommended(const FunctorType& functor,
+                            const int vector_length);
 
   //----------------------------------------
   /** \brief  Construct policy with the given instance of the execution space */
-  TeamPolicyInternal( const typename traits::execution_space & , int league_size_request , int team_size_request , int vector_length_request = 1 );
+  TeamPolicyInternal(const typename traits::execution_space&,
+                     int league_size_request, int team_size_request,
+                     int vector_length_request = 1);
 
-  TeamPolicyInternal( const typename traits::execution_space & , int league_size_request , const Kokkos::AUTO_t & , int vector_length_request = 1 );
+  TeamPolicyInternal(const typename traits::execution_space&,
+                     int league_size_request, const Kokkos::AUTO_t&,
+                     int vector_length_request = 1);
 
-  /** \brief  Construct policy with the default instance of the execution space */
-  TeamPolicyInternal( int league_size_request , int team_size_request , int vector_length_request = 1 );
+  /** \brief  Construct policy with the default instance of the execution space
+   */
+  TeamPolicyInternal(int league_size_request, int team_size_request,
+                     int vector_length_request = 1);
 
-  TeamPolicyInternal( int league_size_request , const Kokkos::AUTO_t & , int vector_length_request = 1 );
+  TeamPolicyInternal(int league_size_request, const Kokkos::AUTO_t&,
+                     int vector_length_request = 1);
 
-/*  TeamPolicyInternal( int league_size_request , int team_size_request );
+  /*  TeamPolicyInternal( int league_size_request , int team_size_request );
 
-  TeamPolicyInternal( int league_size_request , const Kokkos::AUTO_t & );*/
+    TeamPolicyInternal( int league_size_request , const Kokkos::AUTO_t & );*/
 
   /** \brief  The actual league size (number of teams) of the policy.
    *
    *  This may be smaller than the requested league size due to limitations
    *  of the execution space.
    */
-  KOKKOS_INLINE_FUNCTION int league_size() const ;
+  KOKKOS_INLINE_FUNCTION int league_size() const;
 
   /** \brief  The actual team size (number of threads per team) of the policy.
    *
    *  This may be smaller than the requested team size due to limitations
    *  of the execution space.
    */
-  KOKKOS_INLINE_FUNCTION int team_size() const ;
+  KOKKOS_INLINE_FUNCTION int team_size() const;
 
-  inline typename traits::index_type chunk_size() const ;
+  inline typename traits::index_type chunk_size() const;
 
 #ifdef KOKKOS_ENABLE_DEPRECATED_CODE
-  inline TeamPolicyInternal set_chunk_size(int chunk_size) const ;
+  inline TeamPolicyInternal set_chunk_size(int chunk_size) const;
 #else
   inline TeamPolicyInternal& set_chunk_size(int chunk_size);
 #endif
@@ -384,39 +374,38 @@ public:
    *          each member of the execution policy.
    */
   struct member_type {
-
     /** \brief  Handle to the currently executing team shared scratch memory */
     KOKKOS_INLINE_FUNCTION
-    typename traits::execution_space::scratch_memory_space team_shmem() const ;
+    typename traits::execution_space::scratch_memory_space team_shmem() const;
 
     /** \brief  Rank of this team within the league of teams */
-    KOKKOS_INLINE_FUNCTION int league_rank() const ;
+    KOKKOS_INLINE_FUNCTION int league_rank() const;
 
     /** \brief  Number of teams in the league */
-    KOKKOS_INLINE_FUNCTION int league_size() const ;
+    KOKKOS_INLINE_FUNCTION int league_size() const;
 
     /** \brief  Rank of this thread within this team */
-    KOKKOS_INLINE_FUNCTION int team_rank() const ;
+    KOKKOS_INLINE_FUNCTION int team_rank() const;
 
     /** \brief  Number of threads in this team */
-    KOKKOS_INLINE_FUNCTION int team_size() const ;
+    KOKKOS_INLINE_FUNCTION int team_size() const;
 
     /** \brief  Barrier among the threads of this team */
-    KOKKOS_INLINE_FUNCTION void team_barrier() const ;
+    KOKKOS_INLINE_FUNCTION void team_barrier() const;
 
-    /** \brief  Intra-team reduction. Returns join of all values of the team members. */
-    template< class JoinOp >
-    KOKKOS_INLINE_FUNCTION
-    typename JoinOp::value_type team_reduce( const typename JoinOp::value_type
-                                           , const JoinOp & ) const ;
+    /** \brief  Intra-team reduction. Returns join of all values of the team
+     * members. */
+    template <class JoinOp>
+    KOKKOS_INLINE_FUNCTION typename JoinOp::value_type team_reduce(
+        const typename JoinOp::value_type, const JoinOp&) const;
 
     /** \brief  Intra-team exclusive prefix sum with team_rank() ordering.
      *
      *  The highest rank thread can compute the reduction total as
      *    reduction_total = dev.team_scan( value ) + value ;
      */
-    template< typename Type >
-    KOKKOS_INLINE_FUNCTION Type team_scan( const Type & value ) const ;
+    template <typename Type>
+    KOKKOS_INLINE_FUNCTION Type team_scan(const Type& value) const;
 
     /** \brief  Intra-team exclusive prefix sum with team_rank() ordering
      *          with intra-team non-deterministic ordering accumulation.
@@ -427,44 +416,52 @@ public:
      *  As such the base value for each team's scan operation is similarly
      *  non-deterministic.
      */
-    template< typename Type >
-    KOKKOS_INLINE_FUNCTION Type team_scan( const Type & value , Type * const global_accum ) const ;
+    template <typename Type>
+    KOKKOS_INLINE_FUNCTION Type team_scan(const Type& value,
+                                          Type* const global_accum) const;
   };
 };
 
+struct PerTeamValue {
+  int value;
+  PerTeamValue(int arg);
+};
 
-  struct PerTeamValue {
-    int value;
-    PerTeamValue(int arg);
-  };
+struct PerThreadValue {
+  int value;
+  PerThreadValue(int arg);
+};
 
-  struct PerThreadValue {
-    int value;
-    PerThreadValue(int arg);
-  };
-
-  template<class iType, class ... Args>
-  struct ExtractVectorLength {
-    static inline iType value(typename std::enable_if<std::is_integral<iType>::value,iType>::type val, Args...) {
-      return val;
-    }
-    static inline typename std::enable_if<!std::is_integral<iType>::value,int>::type value(typename std::enable_if<!std::is_integral<iType>::value,iType>::type, Args...) {
-      return 1;
-    }
-  };
-
-  template<class iType, class ... Args>
-  inline typename std::enable_if<std::is_integral<iType>::value,iType>::type extract_vector_length(iType val, Args...) {
+template <class iType, class... Args>
+struct ExtractVectorLength {
+  static inline iType value(
+      typename std::enable_if<std::is_integral<iType>::value, iType>::type val,
+      Args...) {
     return val;
   }
-
-  template<class iType, class ... Args>
-  inline typename std::enable_if<!std::is_integral<iType>::value,int>::type extract_vector_length(iType, Args...) {
+  static inline
+      typename std::enable_if<!std::is_integral<iType>::value, int>::type
+      value(
+          typename std::enable_if<!std::is_integral<iType>::value, iType>::type,
+          Args...) {
     return 1;
   }
+};
 
+template <class iType, class... Args>
+inline typename std::enable_if<std::is_integral<iType>::value, iType>::type
+extract_vector_length(iType val, Args...) {
+  return val;
 }
 
+template <class iType, class... Args>
+inline typename std::enable_if<!std::is_integral<iType>::value, int>::type
+extract_vector_length(iType, Args...) {
+  return 1;
+}
+
+}  // namespace Impl
+
 Impl::PerTeamValue PerTeam(const int& arg);
 Impl::PerThreadValue PerThread(const int& arg);
 
@@ -474,38 +471,41 @@ struct ScratchRequest {
   int per_team;
   int per_thread;
 
-  inline
-  ScratchRequest(const int& level_, const Impl::PerTeamValue& team_value) {
-    level = level_;
-    per_team = team_value.value;
+  inline ScratchRequest(const int& level_,
+                        const Impl::PerTeamValue& team_value) {
+    level      = level_;
+    per_team   = team_value.value;
     per_thread = 0;
   }
 
-  inline
-  ScratchRequest(const int& level_, const Impl::PerThreadValue& thread_value) {
-    level = level_;
-    per_team = 0;
-    per_thread = thread_value.value;;
+  inline ScratchRequest(const int& level_,
+                        const Impl::PerThreadValue& thread_value) {
+    level      = level_;
+    per_team   = 0;
+    per_thread = thread_value.value;
+    ;
   }
 
-  inline
-  ScratchRequest(const int& level_, const Impl::PerTeamValue& team_value, const Impl::PerThreadValue& thread_value) {
-    level = level_;
-    per_team = team_value.value;
-    per_thread = thread_value.value;;
+  inline ScratchRequest(const int& level_, const Impl::PerTeamValue& team_value,
+                        const Impl::PerThreadValue& thread_value) {
+    level      = level_;
+    per_team   = team_value.value;
+    per_thread = thread_value.value;
+    ;
   }
 
-  inline
-  ScratchRequest(const int& level_, const Impl::PerThreadValue& thread_value, const Impl::PerTeamValue& team_value) {
-    level = level_;
-    per_team = team_value.value;
-    per_thread = thread_value.value;;
+  inline ScratchRequest(const int& level_,
+                        const Impl::PerThreadValue& thread_value,
+                        const Impl::PerTeamValue& team_value) {
+    level      = level_;
+    per_team   = team_value.value;
+    per_thread = thread_value.value;
+    ;
   }
-
 };
 
-
-/** \brief  Execution policy for parallel work over a league of teams of threads.
+/** \brief  Execution policy for parallel work over a league of teams of
+ * threads.
  *
  *  The work functor is called for each thread of each team such that
  *  the team's member threads are guaranteed to be concurrent.
@@ -522,162 +522,197 @@ struct ScratchRequest {
  *  be omitted.
  *
  *  Possible Template arguments and their default values:
- *    ExecutionSpace (DefaultExecutionSpace): where to execute code. Must be enabled.
- *    WorkTag (none): Tag which is used as the first argument for the functor operator.
- *    Schedule<Type> (Schedule<Static>): Scheduling Policy (Dynamic, or Static).
- *    IndexType<Type> (IndexType<ExecutionSpace::size_type>: Integer Index type used to iterate over the Index space.
+ *    ExecutionSpace (DefaultExecutionSpace): where to execute code. Must be
+ * enabled. WorkTag (none): Tag which is used as the first argument for the
+ * functor operator. Schedule<Type> (Schedule<Static>): Scheduling Policy
+ * (Dynamic, or Static). IndexType<Type> (IndexType<ExecutionSpace::size_type>:
+ * Integer Index type used to iterate over the Index space.
  *    LaunchBounds<unsigned,unsigned> Launch Bounds for CUDA compilation,
  *    default of LaunchBounds<0,0> indicates no launch bounds specified.
  */
-template< class ... Properties>
-class TeamPolicy: public
-  Impl::TeamPolicyInternal<
-     typename Impl::PolicyTraits<Properties ... >::execution_space,
-     Properties ...> {
+template <class... Properties>
+class TeamPolicy
+    : public Impl::TeamPolicyInternal<
+          typename Impl::PolicyTraits<Properties...>::execution_space,
+          Properties...> {
   typedef Impl::TeamPolicyInternal<
-       typename Impl::PolicyTraits<Properties ... >::execution_space,
-       Properties ...> internal_policy;
+      typename Impl::PolicyTraits<Properties...>::execution_space,
+      Properties...>
+      internal_policy;
 
-  template<class ... OtherProperties>
+  template <class... OtherProperties>
   friend class TeamPolicy;
 
-public:
-  typedef Impl::PolicyTraits<Properties ... > traits;
+ public:
+  typedef Impl::PolicyTraits<Properties...> traits;
 
   typedef TeamPolicy execution_policy;
 
-  TeamPolicy& operator = (const TeamPolicy&) = default;
+  TeamPolicy& operator=(const TeamPolicy&) = default;
 
   /** \brief  Construct policy with the given instance of the execution space */
-  TeamPolicy( const typename traits::execution_space & space_ , int league_size_request , int team_size_request , int vector_length_request = 1 )
-    : internal_policy(space_,league_size_request,team_size_request, vector_length_request) {first_arg = false;}
+  TeamPolicy(const typename traits::execution_space& space_,
+             int league_size_request, int team_size_request,
+             int vector_length_request = 1)
+      : internal_policy(space_, league_size_request, team_size_request,
+                        vector_length_request) {
+    first_arg = false;
+  }
 
-  TeamPolicy( const typename traits::execution_space & space_, int league_size_request , const Kokkos::AUTO_t & , int vector_length_request = 1 )
-    : internal_policy(space_,league_size_request,Kokkos::AUTO(), vector_length_request) {first_arg = false;}
+  TeamPolicy(const typename traits::execution_space& space_,
+             int league_size_request, const Kokkos::AUTO_t&,
+             int vector_length_request = 1)
+      : internal_policy(space_, league_size_request, Kokkos::AUTO(),
+                        vector_length_request) {
+    first_arg = false;
+  }
 
-  /** \brief  Construct policy with the default instance of the execution space */
-  TeamPolicy( int league_size_request , int team_size_request , int vector_length_request = 1 )
-    : internal_policy(league_size_request,team_size_request, vector_length_request) {first_arg = false;}
+  /** \brief  Construct policy with the default instance of the execution space
+   */
+  TeamPolicy(int league_size_request, int team_size_request,
+             int vector_length_request = 1)
+      : internal_policy(league_size_request, team_size_request,
+                        vector_length_request) {
+    first_arg = false;
+  }
 
-  TeamPolicy( int league_size_request , const Kokkos::AUTO_t & , int vector_length_request = 1 )
-    : internal_policy(league_size_request,Kokkos::AUTO(), vector_length_request) {first_arg = false;}
+  TeamPolicy(int league_size_request, const Kokkos::AUTO_t&,
+             int vector_length_request = 1)
+      : internal_policy(league_size_request, Kokkos::AUTO(),
+                        vector_length_request) {
+    first_arg = false;
+  }
 
 #ifdef KOKKOS_ENABLE_DEPRECATED_CODE
   /** \brief  Construct policy with the given instance of the execution space */
-  template<class ... Args>
-  TeamPolicy( const typename traits::execution_space & , int league_size_request , int team_size_request , int vector_length_request,
-              Args ... args)
-    : internal_policy(typename traits::execution_space(),league_size_request,team_size_request, vector_length_request) {
+  template <class... Args>
+  TeamPolicy(const typename traits::execution_space&, int league_size_request,
+             int team_size_request, int vector_length_request, Args... args)
+      : internal_policy(typename traits::execution_space(), league_size_request,
+                        team_size_request, vector_length_request) {
     first_arg = false;
     set(args...);
   }
 
-  template<class ... Args>
-  TeamPolicy( const typename traits::execution_space & , int league_size_request , const Kokkos::AUTO_t & , int vector_length_request ,
-              Args ... args)
-    : internal_policy(typename traits::execution_space(),league_size_request,Kokkos::AUTO(), vector_length_request) {
+  template <class... Args>
+  TeamPolicy(const typename traits::execution_space&, int league_size_request,
+             const Kokkos::AUTO_t&, int vector_length_request, Args... args)
+      : internal_policy(typename traits::execution_space(), league_size_request,
+                        Kokkos::AUTO(), vector_length_request) {
     first_arg = false;
     set(args...);
   }
 
-  /** \brief  Construct policy with the default instance of the execution space */
-  template<class ... Args>
-  TeamPolicy( int league_size_request , int team_size_request , int vector_length_request ,
-              Args ... args)
-    : internal_policy(league_size_request,team_size_request, vector_length_request) {
+  /** \brief  Construct policy with the default instance of the execution space
+   */
+  template <class... Args>
+  TeamPolicy(int league_size_request, int team_size_request,
+             int vector_length_request, Args... args)
+      : internal_policy(league_size_request, team_size_request,
+                        vector_length_request) {
     first_arg = false;
     set(args...);
   }
 
-  template<class ... Args>
-  TeamPolicy( int league_size_request , const Kokkos::AUTO_t & , int vector_length_request ,
-              Args ... args)
-    : internal_policy(league_size_request,Kokkos::AUTO(), vector_length_request) {
+  template <class... Args>
+  TeamPolicy(int league_size_request, const Kokkos::AUTO_t&,
+             int vector_length_request, Args... args)
+      : internal_policy(league_size_request, Kokkos::AUTO(),
+                        vector_length_request) {
     first_arg = false;
     set(args...);
   }
 
   /** \brief  Construct policy with the given instance of the execution space */
-  template<class ... Args>
-  TeamPolicy( const typename traits::execution_space & , int league_size_request , int team_size_request ,
-              Args ... args)
-    : internal_policy(typename traits::execution_space(),league_size_request,team_size_request,
-                      Kokkos::Impl::extract_vector_length<Args...>(args...)) {
+  template <class... Args>
+  TeamPolicy(const typename traits::execution_space&, int league_size_request,
+             int team_size_request, Args... args)
+      : internal_policy(typename traits::execution_space(), league_size_request,
+                        team_size_request,
+                        Kokkos::Impl::extract_vector_length<Args...>(args...)) {
     first_arg = true;
     set(args...);
   }
 
-  template<class ... Args>
-  TeamPolicy( const typename traits::execution_space & , int league_size_request , const Kokkos::AUTO_t & ,
-              Args ... args)
-    : internal_policy(typename traits::execution_space(),league_size_request,Kokkos::AUTO(),
-                      Kokkos::Impl::extract_vector_length<Args...>(args...)) {
+  template <class... Args>
+  TeamPolicy(const typename traits::execution_space&, int league_size_request,
+             const Kokkos::AUTO_t&, Args... args)
+      : internal_policy(typename traits::execution_space(), league_size_request,
+                        Kokkos::AUTO(),
+                        Kokkos::Impl::extract_vector_length<Args...>(args...)) {
     first_arg = true;
     set(args...);
   }
 
-  /** \brief  Construct policy with the default instance of the execution space */
-  template<class ... Args>
-  TeamPolicy( int league_size_request , int team_size_request ,
-              Args ... args)
-    : internal_policy(league_size_request,team_size_request,
-                      Kokkos::Impl::extract_vector_length<Args...>(args...)) {
+  /** \brief  Construct policy with the default instance of the execution space
+   */
+  template <class... Args>
+  TeamPolicy(int league_size_request, int team_size_request, Args... args)
+      : internal_policy(league_size_request, team_size_request,
+                        Kokkos::Impl::extract_vector_length<Args...>(args...)) {
     first_arg = true;
     set(args...);
   }
 
-  template<class ... Args>
-  TeamPolicy( int league_size_request , const Kokkos::AUTO_t & ,
-              Args ... args)
-    : internal_policy(league_size_request,Kokkos::AUTO(),
-                      Kokkos::Impl::extract_vector_length<Args...>(args...)) {
+  template <class... Args>
+  TeamPolicy(int league_size_request, const Kokkos::AUTO_t&, Args... args)
+      : internal_policy(league_size_request, Kokkos::AUTO(),
+                        Kokkos::Impl::extract_vector_length<Args...>(args...)) {
     first_arg = true;
     set(args...);
   }
 #endif
 
-  template<class ... OtherProperties>
-  TeamPolicy(const TeamPolicy<OtherProperties...> p):internal_policy(p) {
+  template <class... OtherProperties>
+  TeamPolicy(const TeamPolicy<OtherProperties...> p) : internal_policy(p) {
     first_arg = p.first_arg;
   }
 
-private:
+ private:
   bool first_arg;
-  TeamPolicy(const internal_policy& p):internal_policy(p) {first_arg = false;}
+  TeamPolicy(const internal_policy& p) : internal_policy(p) {
+    first_arg = false;
+  }
 
 #ifdef KOKKOS_ENABLE_DEPRECATED_CODE
   inline void set() {}
 #endif
 
-public:
+ public:
 #ifdef KOKKOS_ENABLE_DEPRECATED_CODE
-  template<class ... Args>
-  inline void set(Args ...) {
-    static_assert( 0 == sizeof...(Args), "Kokkos::TeamPolicy: unhandled constructor arguments encountered.");
+  template <class... Args>
+  inline void set(Args...) {
+    static_assert(
+        0 == sizeof...(Args),
+        "Kokkos::TeamPolicy: unhandled constructor arguments encountered.");
   }
 
-  template<class iType, class ... Args>
-  inline typename std::enable_if<std::is_integral<iType>::value>::type set(iType, Args ... args) {
-    if(first_arg) {
+  template <class iType, class... Args>
+  inline typename std::enable_if<std::is_integral<iType>::value>::type set(
+      iType, Args... args) {
+    if (first_arg) {
       first_arg = false;
       set(args...);
     } else {
       first_arg = false;
-      Kokkos::Impl::throw_runtime_exception("Kokkos::TeamPolicy: integer argument to constructor in illegal place.");
+      Kokkos::Impl::throw_runtime_exception(
+          "Kokkos::TeamPolicy: integer argument to constructor in illegal "
+          "place.");
     }
   }
 
-  template<class ... Args>
-  inline void set(const ChunkSize& chunksize, Args ... args) {
+  template <class... Args>
+  inline void set(const ChunkSize& chunksize, Args... args) {
     first_arg = false;
     internal_policy::internal_set_chunk_size(chunksize.value);
     set(args...);
   }
 
-  template<class ... Args>
-  inline void set(const ScratchRequest& scr_request, Args ... args) {
+  template <class... Args>
+  inline void set(const ScratchRequest& scr_request, Args... args) {
     first_arg = false;
-    internal_policy::internal_set_scratch_size(scr_request.level,Impl::PerTeamValue(scr_request.per_team),
+    internal_policy::internal_set_scratch_size(
+        scr_request.level, Impl::PerTeamValue(scr_request.per_team),
         Impl::PerThreadValue(scr_request.per_thread));
     set(args...);
   }
@@ -686,267 +721,287 @@ public:
     return TeamPolicy(internal_policy::set_chunk_size(chunk));
   }
 
-  inline TeamPolicy set_scratch_size(const int& level, const Impl::PerTeamValue& per_team) const {
-    return TeamPolicy(internal_policy::set_scratch_size(level,per_team));
+  inline TeamPolicy set_scratch_size(const int& level,
+                                     const Impl::PerTeamValue& per_team) const {
+    return TeamPolicy(internal_policy::set_scratch_size(level, per_team));
   }
-  inline TeamPolicy set_scratch_size(const int& level, const Impl::PerThreadValue& per_thread) const {
-    return TeamPolicy(internal_policy::set_scratch_size(level,per_thread));
+  inline TeamPolicy set_scratch_size(
+      const int& level, const Impl::PerThreadValue& per_thread) const {
+    return TeamPolicy(internal_policy::set_scratch_size(level, per_thread));
   }
-  inline TeamPolicy set_scratch_size(const int& level, const Impl::PerTeamValue& per_team, const Impl::PerThreadValue& per_thread) const {
-    return TeamPolicy(internal_policy::set_scratch_size(level, per_team, per_thread));
+  inline TeamPolicy set_scratch_size(
+      const int& level, const Impl::PerTeamValue& per_team,
+      const Impl::PerThreadValue& per_thread) const {
+    return TeamPolicy(
+        internal_policy::set_scratch_size(level, per_team, per_thread));
   }
-  inline TeamPolicy set_scratch_size(const int& level, const Impl::PerThreadValue& per_thread, const Impl::PerTeamValue& per_team) const {
-    return TeamPolicy(internal_policy::set_scratch_size(level, per_team, per_thread));
+  inline TeamPolicy set_scratch_size(const int& level,
+                                     const Impl::PerThreadValue& per_thread,
+                                     const Impl::PerTeamValue& per_team) const {
+    return TeamPolicy(
+        internal_policy::set_scratch_size(level, per_team, per_thread));
   }
 
 #else
   inline TeamPolicy& set_chunk_size(int chunk) {
-    static_assert(std::is_same<decltype(internal_policy::set_chunk_size(chunk)), internal_policy&>::value, "internal set_chunk_size should return a reference");
+    static_assert(std::is_same<decltype(internal_policy::set_chunk_size(chunk)),
+                               internal_policy&>::value,
+                  "internal set_chunk_size should return a reference");
     return static_cast<TeamPolicy&>(internal_policy::set_chunk_size(chunk));
   }
 
-  inline TeamPolicy& set_scratch_size(const int& level, const Impl::PerTeamValue& per_team) {
-    static_assert(std::is_same<decltype(internal_policy::set_scratch_size(level,per_team)), internal_policy&>::value, "internal set_chunk_size should return a reference");
-    return static_cast<TeamPolicy&>(internal_policy::set_scratch_size(level,per_team));
+  inline TeamPolicy& set_scratch_size(const int& level,
+                                      const Impl::PerTeamValue& per_team) {
+    static_assert(std::is_same<decltype(internal_policy::set_scratch_size(
+                                   level, per_team)),
+                               internal_policy&>::value,
+                  "internal set_chunk_size should return a reference");
+    return static_cast<TeamPolicy&>(
+        internal_policy::set_scratch_size(level, per_team));
   }
-  inline TeamPolicy& set_scratch_size(const int& level, const Impl::PerThreadValue& per_thread) {
-    return static_cast<TeamPolicy&>(internal_policy::set_scratch_size(level,per_thread));
+  inline TeamPolicy& set_scratch_size(const int& level,
+                                      const Impl::PerThreadValue& per_thread) {
+    return static_cast<TeamPolicy&>(
+        internal_policy::set_scratch_size(level, per_thread));
   }
-  inline TeamPolicy& set_scratch_size(const int& level, const Impl::PerTeamValue& per_team, const Impl::PerThreadValue& per_thread) {
-    return static_cast<TeamPolicy&>(internal_policy::set_scratch_size(level, per_team, per_thread));
+  inline TeamPolicy& set_scratch_size(const int& level,
+                                      const Impl::PerTeamValue& per_team,
+                                      const Impl::PerThreadValue& per_thread) {
+    return static_cast<TeamPolicy&>(
+        internal_policy::set_scratch_size(level, per_team, per_thread));
   }
-  inline TeamPolicy& set_scratch_size(const int& level, const Impl::PerThreadValue& per_thread, const Impl::PerTeamValue& per_team) {
-    return static_cast<TeamPolicy&>(internal_policy::set_scratch_size(level, per_team, per_thread));
+  inline TeamPolicy& set_scratch_size(const int& level,
+                                      const Impl::PerThreadValue& per_thread,
+                                      const Impl::PerTeamValue& per_team) {
+    return static_cast<TeamPolicy&>(
+        internal_policy::set_scratch_size(level, per_team, per_thread));
   }
 #endif
-
 };
 
 namespace Impl {
 
-template<typename iType, class TeamMemberType>
+template <typename iType, class TeamMemberType>
 struct TeamThreadRangeBoundariesStruct {
-private:
+ private:
+  KOKKOS_INLINE_FUNCTION static iType ibegin(const iType& arg_begin,
+                                             const iType& arg_end,
+                                             const iType& arg_rank,
+                                             const iType& arg_size) {
+    return arg_begin +
+           ((arg_end - arg_begin + arg_size - 1) / arg_size) * arg_rank;
+  }
 
-  KOKKOS_INLINE_FUNCTION static
-  iType ibegin( const iType & arg_begin
-              , const iType & arg_end
-              , const iType & arg_rank
-              , const iType & arg_size
-              )
-    {
-      return arg_begin + ( ( arg_end - arg_begin + arg_size - 1 ) / arg_size ) * arg_rank ;
-    }
-
-  KOKKOS_INLINE_FUNCTION static
-  iType iend( const iType & arg_begin
-            , const iType & arg_end
-            , const iType & arg_rank
-            , const iType & arg_size
-            )
-    {
-      const iType end_ = arg_begin + ( ( arg_end - arg_begin + arg_size - 1 ) / arg_size ) * ( arg_rank + 1 );
-      return end_ < arg_end ? end_ : arg_end ;
-    }
-
-public:
+  KOKKOS_INLINE_FUNCTION static iType iend(const iType& arg_begin,
+                                           const iType& arg_end,
+                                           const iType& arg_rank,
+                                           const iType& arg_size) {
+    const iType end_ =
+        arg_begin +
+        ((arg_end - arg_begin + arg_size - 1) / arg_size) * (arg_rank + 1);
+    return end_ < arg_end ? end_ : arg_end;
+  }
 
+ public:
   typedef iType index_type;
   const iType start;
   const iType end;
-  enum {increment = 1};
+  enum { increment = 1 };
   const TeamMemberType& thread;
 
   KOKKOS_INLINE_FUNCTION
-  TeamThreadRangeBoundariesStruct( const TeamMemberType& arg_thread
-                                 , const iType& arg_end
-                                 )
-    : start( ibegin( 0 , arg_end , arg_thread.team_rank() , arg_thread.team_size() ) )
-    , end(   iend(   0 , arg_end , arg_thread.team_rank() , arg_thread.team_size() ) )
-    , thread( arg_thread )
-    {}
+  TeamThreadRangeBoundariesStruct(const TeamMemberType& arg_thread,
+                                  const iType& arg_end)
+      : start(
+            ibegin(0, arg_end, arg_thread.team_rank(), arg_thread.team_size())),
+        end(iend(0, arg_end, arg_thread.team_rank(), arg_thread.team_size())),
+        thread(arg_thread) {}
 
   KOKKOS_INLINE_FUNCTION
-  TeamThreadRangeBoundariesStruct( const TeamMemberType& arg_thread
-                                , const iType& arg_begin
-                                , const iType& arg_end
-                                )
-    : start( ibegin( arg_begin , arg_end , arg_thread.team_rank() , arg_thread.team_size() ) )
-    , end(   iend(   arg_begin , arg_end , arg_thread.team_rank() , arg_thread.team_size() ) )
-    , thread( arg_thread )
-    {}
+  TeamThreadRangeBoundariesStruct(const TeamMemberType& arg_thread,
+                                  const iType& arg_begin, const iType& arg_end)
+      : start(ibegin(arg_begin, arg_end, arg_thread.team_rank(),
+                     arg_thread.team_size())),
+        end(iend(arg_begin, arg_end, arg_thread.team_rank(),
+                 arg_thread.team_size())),
+        thread(arg_thread) {}
 };
 
-template<typename iType, class TeamMemberType>
+template <typename iType, class TeamMemberType>
 struct TeamVectorRangeBoundariesStruct {
-private:
+ private:
+  KOKKOS_INLINE_FUNCTION static iType ibegin(const iType& arg_begin,
+                                             const iType& arg_end,
+                                             const iType& arg_rank,
+                                             const iType& arg_size) {
+    return arg_begin +
+           ((arg_end - arg_begin + arg_size - 1) / arg_size) * arg_rank;
+  }
 
-  KOKKOS_INLINE_FUNCTION static
-  iType ibegin( const iType & arg_begin
-              , const iType & arg_end
-              , const iType & arg_rank
-              , const iType & arg_size
-              )
-    {
-      return arg_begin + ( ( arg_end - arg_begin + arg_size - 1 ) / arg_size ) * arg_rank ;
-    }
-
-  KOKKOS_INLINE_FUNCTION static
-  iType iend( const iType & arg_begin
-            , const iType & arg_end
-            , const iType & arg_rank
-            , const iType & arg_size
-            )
-    {
-      const iType end_ = arg_begin + ( ( arg_end - arg_begin + arg_size - 1 ) / arg_size ) * ( arg_rank + 1 );
-      return end_ < arg_end ? end_ : arg_end ;
-    }
-
-public:
+  KOKKOS_INLINE_FUNCTION static iType iend(const iType& arg_begin,
+                                           const iType& arg_end,
+                                           const iType& arg_rank,
+                                           const iType& arg_size) {
+    const iType end_ =
+        arg_begin +
+        ((arg_end - arg_begin + arg_size - 1) / arg_size) * (arg_rank + 1);
+    return end_ < arg_end ? end_ : arg_end;
+  }
 
+ public:
   typedef iType index_type;
   const iType start;
   const iType end;
-  enum {increment = 1};
+  enum { increment = 1 };
   const TeamMemberType& thread;
 
   KOKKOS_INLINE_FUNCTION
-  TeamVectorRangeBoundariesStruct( const TeamMemberType& arg_thread
-                                 , const iType& arg_end
-                                 )
-    : start( ibegin( 0 , arg_end , arg_thread.team_rank() , arg_thread.team_size() ) )
-    , end(   iend(   0 , arg_end , arg_thread.team_rank() , arg_thread.team_size() ) )
-    , thread( arg_thread )
-    {}
+  TeamVectorRangeBoundariesStruct(const TeamMemberType& arg_thread,
+                                  const iType& arg_end)
+      : start(
+            ibegin(0, arg_end, arg_thread.team_rank(), arg_thread.team_size())),
+        end(iend(0, arg_end, arg_thread.team_rank(), arg_thread.team_size())),
+        thread(arg_thread) {}
 
   KOKKOS_INLINE_FUNCTION
-  TeamVectorRangeBoundariesStruct( const TeamMemberType& arg_thread
-                                , const iType& arg_begin
-                                , const iType& arg_end
-                                )
-    : start( ibegin( arg_begin , arg_end , arg_thread.team_rank() , arg_thread.team_size() ) )
-    , end(   iend(   arg_begin , arg_end , arg_thread.team_rank() , arg_thread.team_size() ) )
-    , thread( arg_thread )
-    {}
+  TeamVectorRangeBoundariesStruct(const TeamMemberType& arg_thread,
+                                  const iType& arg_begin, const iType& arg_end)
+      : start(ibegin(arg_begin, arg_end, arg_thread.team_rank(),
+                     arg_thread.team_size())),
+        end(iend(arg_begin, arg_end, arg_thread.team_rank(),
+                 arg_thread.team_size())),
+        thread(arg_thread) {}
 };
 
-template<typename iType, class TeamMemberType>
+template <typename iType, class TeamMemberType>
 struct ThreadVectorRangeBoundariesStruct {
   typedef iType index_type;
   const index_type start;
   const index_type end;
-  enum {increment = 1};
+  enum { increment = 1 };
 
   KOKKOS_INLINE_FUNCTION
-  constexpr ThreadVectorRangeBoundariesStruct ( const TeamMemberType, const index_type& count ) noexcept 
-  : start( static_cast<index_type>(0) )
-  , end( count ) {}
+  constexpr ThreadVectorRangeBoundariesStruct(const TeamMemberType,
+                                              const index_type& count) noexcept
+      : start(static_cast<index_type>(0)), end(count) {}
 
   KOKKOS_INLINE_FUNCTION
-  constexpr ThreadVectorRangeBoundariesStruct ( const index_type& count ) noexcept
-  : start( static_cast<index_type>(0) )
-  , end( count ) {}
+  constexpr ThreadVectorRangeBoundariesStruct(const index_type& count) noexcept
+      : start(static_cast<index_type>(0)), end(count) {}
 
   KOKKOS_INLINE_FUNCTION
-  constexpr ThreadVectorRangeBoundariesStruct ( const TeamMemberType, const index_type& arg_begin, const index_type& arg_end ) noexcept 
-  : start( static_cast<index_type>(arg_begin) )
-  , end( arg_end ) {}
+  constexpr ThreadVectorRangeBoundariesStruct(
+      const TeamMemberType, const index_type& arg_begin,
+      const index_type& arg_end) noexcept
+      : start(static_cast<index_type>(arg_begin)), end(arg_end) {}
 
   KOKKOS_INLINE_FUNCTION
-  constexpr ThreadVectorRangeBoundariesStruct ( const index_type& arg_begin, const index_type& arg_end ) noexcept
-  : start( static_cast<index_type>(arg_begin) )
-  , end( arg_end ) {}
+  constexpr ThreadVectorRangeBoundariesStruct(
+      const index_type& arg_begin, const index_type& arg_end) noexcept
+      : start(static_cast<index_type>(arg_begin)), end(arg_end) {}
 };
 
-template<class TeamMemberType>
+template <class TeamMemberType>
 struct ThreadSingleStruct {
   const TeamMemberType& team_member;
   KOKKOS_INLINE_FUNCTION
-  ThreadSingleStruct( const TeamMemberType& team_member_ ) : team_member( team_member_ ) {}
+  ThreadSingleStruct(const TeamMemberType& team_member_)
+      : team_member(team_member_) {}
 };
 
-template<class TeamMemberType>
+template <class TeamMemberType>
 struct VectorSingleStruct {
   const TeamMemberType& team_member;
   KOKKOS_INLINE_FUNCTION
-  VectorSingleStruct( const TeamMemberType& team_member_ ) : team_member( team_member_ ) {}
+  VectorSingleStruct(const TeamMemberType& team_member_)
+      : team_member(team_member_) {}
 };
 
-} // namespace Impl
+}  // namespace Impl
 
 /** \brief  Execution policy for parallel work over a threads within a team.
  *
- *  The range is split over all threads in a team. The Mapping scheme depends on the architecture.
- *  This policy is used together with a parallel pattern as a nested layer within a kernel launched
- *  with the TeamPolicy. This variant expects a single count. So the range is (0,count].
+ *  The range is split over all threads in a team. The Mapping scheme depends on
+ * the architecture. This policy is used together with a parallel pattern as a
+ * nested layer within a kernel launched with the TeamPolicy. This variant
+ * expects a single count. So the range is (0,count].
  */
-template<typename iType, class TeamMemberType, class _never_use_this_overload>
+template <typename iType, class TeamMemberType, class _never_use_this_overload>
 KOKKOS_INLINE_FUNCTION_DELETED
-Impl::TeamThreadRangeBoundariesStruct<iType,TeamMemberType>
-TeamThreadRange( const TeamMemberType&, const iType& count ) = delete;
+    Impl::TeamThreadRangeBoundariesStruct<iType, TeamMemberType>
+    TeamThreadRange(const TeamMemberType&, const iType& count) = delete;
 
 /** \brief  Execution policy for parallel work over a threads within a team.
  *
- *  The range is split over all threads in a team. The Mapping scheme depends on the architecture.
- *  This policy is used together with a parallel pattern as a nested layer within a kernel launched
- *  with the TeamPolicy. This variant expects a begin and end. So the range is (begin,end].
+ *  The range is split over all threads in a team. The Mapping scheme depends on
+ * the architecture. This policy is used together with a parallel pattern as a
+ * nested layer within a kernel launched with the TeamPolicy. This variant
+ * expects a begin and end. So the range is (begin,end].
  */
-template<typename iType1, typename iType2, class TeamMemberType, class _never_use_this_overload>
-KOKKOS_INLINE_FUNCTION_DELETED
-Impl::TeamThreadRangeBoundariesStruct<typename std::common_type<iType1, iType2>::type, TeamMemberType>
-TeamThreadRange( const TeamMemberType&, const iType1& begin, const iType2& end ) = delete;
+template <typename iType1, typename iType2, class TeamMemberType,
+          class _never_use_this_overload>
+KOKKOS_INLINE_FUNCTION_DELETED Impl::TeamThreadRangeBoundariesStruct<
+    typename std::common_type<iType1, iType2>::type, TeamMemberType>
+TeamThreadRange(const TeamMemberType&, const iType1& begin,
+                const iType2& end) = delete;
 
 /** \brief  Execution policy for parallel work over a threads within a team.
  *
- *  The range is split over all threads in a team. The Mapping scheme depends on the architecture.
- *  This policy is used together with a parallel pattern as a nested layer within a kernel launched
- *  with the TeamPolicy. This variant expects a single count. So the range is (0,count].
+ *  The range is split over all threads in a team. The Mapping scheme depends on
+ * the architecture. This policy is used together with a parallel pattern as a
+ * nested layer within a kernel launched with the TeamPolicy. This variant
+ * expects a single count. So the range is (0,count].
  */
-template<typename iType, class TeamMemberType, class _never_use_this_overload>
+template <typename iType, class TeamMemberType, class _never_use_this_overload>
 KOKKOS_INLINE_FUNCTION_DELETED
-Impl::TeamThreadRangeBoundariesStruct<iType,TeamMemberType>
-TeamVectorRange( const TeamMemberType&, const iType& count ) = delete;
+    Impl::TeamThreadRangeBoundariesStruct<iType, TeamMemberType>
+    TeamVectorRange(const TeamMemberType&, const iType& count) = delete;
 
 /** \brief  Execution policy for parallel work over a threads within a team.
  *
- *  The range is split over all threads in a team. The Mapping scheme depends on the architecture.
- *  This policy is used together with a parallel pattern as a nested layer within a kernel launched
- *  with the TeamPolicy. This variant expects a begin and end. So the range is (begin,end].
+ *  The range is split over all threads in a team. The Mapping scheme depends on
+ * the architecture. This policy is used together with a parallel pattern as a
+ * nested layer within a kernel launched with the TeamPolicy. This variant
+ * expects a begin and end. So the range is (begin,end].
  */
-template<typename iType1, typename iType2, class TeamMemberType, class _never_use_this_overload>
-KOKKOS_INLINE_FUNCTION_DELETED
-Impl::TeamThreadRangeBoundariesStruct<typename std::common_type<iType1, iType2>::type, TeamMemberType>
-TeamVectorRange( const TeamMemberType&, const iType1& begin, const iType2& end ) = delete;
+template <typename iType1, typename iType2, class TeamMemberType,
+          class _never_use_this_overload>
+KOKKOS_INLINE_FUNCTION_DELETED Impl::TeamThreadRangeBoundariesStruct<
+    typename std::common_type<iType1, iType2>::type, TeamMemberType>
+TeamVectorRange(const TeamMemberType&, const iType1& begin,
+                const iType2& end) = delete;
 
 /** \brief  Execution policy for a vector parallel loop.
  *
- *  The range is split over all vector lanes in a thread. The Mapping scheme depends on the architecture.
- *  This policy is used together with a parallel pattern as a nested layer within a kernel launched
- *  with the TeamPolicy. This variant expects a single count. So the range is (0,count].
+ *  The range is split over all vector lanes in a thread. The Mapping scheme
+ * depends on the architecture. This policy is used together with a parallel
+ * pattern as a nested layer within a kernel launched with the TeamPolicy. This
+ * variant expects a single count. So the range is (0,count].
  */
-template<typename iType, class TeamMemberType, class _never_use_this_overload>
+template <typename iType, class TeamMemberType, class _never_use_this_overload>
 KOKKOS_INLINE_FUNCTION_DELETED
-Impl::ThreadVectorRangeBoundariesStruct<iType,TeamMemberType>
-ThreadVectorRange( const TeamMemberType&, const iType& count ) = delete;
+    Impl::ThreadVectorRangeBoundariesStruct<iType, TeamMemberType>
+    ThreadVectorRange(const TeamMemberType&, const iType& count) = delete;
 
-template<typename iType, class TeamMemberType, class _never_use_this_overload>
+template <typename iType, class TeamMemberType, class _never_use_this_overload>
 KOKKOS_INLINE_FUNCTION_DELETED
-Impl::ThreadVectorRangeBoundariesStruct<iType,TeamMemberType>
-ThreadVectorRange( const TeamMemberType&, const iType& arg_begin, const iType& arg_end ) = delete;
+    Impl::ThreadVectorRangeBoundariesStruct<iType, TeamMemberType>
+    ThreadVectorRange(const TeamMemberType&, const iType& arg_begin,
+                      const iType& arg_end) = delete;
 
 #if defined(KOKKOS_ENABLE_PROFILING)
 namespace Impl {
 
-template<typename FunctorType, typename TagType,
-  bool HasTag = !std::is_same<TagType, void>::value >
+template <typename FunctorType, typename TagType,
+          bool HasTag = !std::is_same<TagType, void>::value>
 struct ParallelConstructName;
 
-template<typename FunctorType, typename TagType>
+template <typename FunctorType, typename TagType>
 struct ParallelConstructName<FunctorType, TagType, true> {
-  ParallelConstructName(std::string const& label):label_ref(label) {
+  ParallelConstructName(std::string const& label) : label_ref(label) {
     if (label.empty()) {
       default_name = std::string(typeid(FunctorType).name()) + "/" +
-        typeid(TagType).name();
+                     typeid(TagType).name();
     }
   }
   std::string const& get() {
@@ -956,9 +1011,9 @@ struct ParallelConstructName<FunctorType, TagType, true> {
   std::string default_name;
 };
 
-template<typename FunctorType, typename TagType>
+template <typename FunctorType, typename TagType>
 struct ParallelConstructName<FunctorType, TagType, false> {
-  ParallelConstructName(std::string const& label):label_ref(label) {
+  ParallelConstructName(std::string const& label) : label_ref(label) {
     if (label.empty()) {
       default_name = std::string(typeid(FunctorType).name());
     }
@@ -970,49 +1025,54 @@ struct ParallelConstructName<FunctorType, TagType, false> {
   std::string default_name;
 };
 
-} // namespace Impl
+}  // namespace Impl
 #endif /* defined KOKKOS_ENABLE_PROFILING */
 
-} // namespace Kokkos
+}  // namespace Kokkos
 
 namespace Kokkos {
 namespace Experimental {
 
 namespace Impl {
-  template<class Property,class Policy>
-  struct PolicyPropertyAdaptor;
+template <class Property, class Policy>
+struct PolicyPropertyAdaptor;
 
-  template<unsigned long P, class ... Properties>
-  struct PolicyPropertyAdaptor<WorkItemProperty::ImplWorkItemProperty<P>,RangePolicy<Properties...>> {
-    typedef RangePolicy<Properties...> policy_in_t;
-    typedef RangePolicy<typename policy_in_t::traits::execution_space,
-                        typename policy_in_t::traits::schedule_type,
-                        typename policy_in_t::traits::work_tag,
-                        typename policy_in_t::traits::index_type,
-                        typename policy_in_t::traits::iteration_pattern,
-                        typename policy_in_t::traits::launch_bounds,
-                        WorkItemProperty::ImplWorkItemProperty<P>> policy_out_t;
-  };
+template <unsigned long P, class... Properties>
+struct PolicyPropertyAdaptor<WorkItemProperty::ImplWorkItemProperty<P>,
+                             RangePolicy<Properties...>> {
+  typedef RangePolicy<Properties...> policy_in_t;
+  typedef RangePolicy<typename policy_in_t::traits::execution_space,
+                      typename policy_in_t::traits::schedule_type,
+                      typename policy_in_t::traits::work_tag,
+                      typename policy_in_t::traits::index_type,
+                      typename policy_in_t::traits::iteration_pattern,
+                      typename policy_in_t::traits::launch_bounds,
+                      WorkItemProperty::ImplWorkItemProperty<P>>
+      policy_out_t;
+};
 
-  template<unsigned long P, class ... Properties>
-  struct PolicyPropertyAdaptor<WorkItemProperty::ImplWorkItemProperty<P>,TeamPolicy<Properties...>> {
-    typedef TeamPolicy<Properties...> policy_in_t;
-    typedef TeamPolicy<typename policy_in_t::traits::execution_space,
-                        typename policy_in_t::traits::schedule_type,
-                        typename policy_in_t::traits::work_tag,
-                        typename policy_in_t::traits::index_type,
-                        typename policy_in_t::traits::iteration_pattern,
-                        typename policy_in_t::traits::launch_bounds,
-                        WorkItemProperty::ImplWorkItemProperty<P>> policy_out_t;
-  };
+template <unsigned long P, class... Properties>
+struct PolicyPropertyAdaptor<WorkItemProperty::ImplWorkItemProperty<P>,
+                             TeamPolicy<Properties...>> {
+  typedef TeamPolicy<Properties...> policy_in_t;
+  typedef TeamPolicy<typename policy_in_t::traits::execution_space,
+                     typename policy_in_t::traits::schedule_type,
+                     typename policy_in_t::traits::work_tag,
+                     typename policy_in_t::traits::index_type,
+                     typename policy_in_t::traits::iteration_pattern,
+                     typename policy_in_t::traits::launch_bounds,
+                     WorkItemProperty::ImplWorkItemProperty<P>>
+      policy_out_t;
+};
+}  // namespace Impl
+
+template <class PolicyType, unsigned long P>
+constexpr typename Impl::PolicyPropertyAdaptor<
+    WorkItemProperty::ImplWorkItemProperty<P>, PolicyType>::policy_out_t
+require(const PolicyType p, WorkItemProperty::ImplWorkItemProperty<P>) {
+  return typename Impl::PolicyPropertyAdaptor<
+      WorkItemProperty::ImplWorkItemProperty<P>, PolicyType>::policy_out_t(p);
 }
-
-template<class PolicyType,unsigned long P>
-constexpr typename Impl::PolicyPropertyAdaptor<WorkItemProperty::ImplWorkItemProperty<P>,PolicyType>::policy_out_t
-  require(const PolicyType p, WorkItemProperty::ImplWorkItemProperty<P>){
-    return typename Impl::PolicyPropertyAdaptor<WorkItemProperty::ImplWorkItemProperty<P>,PolicyType>::policy_out_t(p);
-}
-} //Experimental
-} //Kokkos
+}  // namespace Experimental
+}  // namespace Kokkos
 #endif /* #define KOKKOS_EXECPOLICY_HPP */
-
diff --git a/lib/kokkos/core/src/Kokkos_Extents.hpp b/lib/kokkos/core/src/Kokkos_Extents.hpp
index c8b9110485..2e07e8b76b 100644
--- a/lib/kokkos/core/src/Kokkos_Extents.hpp
+++ b/lib/kokkos/core/src/Kokkos_Extents.hpp
@@ -2,10 +2,10 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
+//                        Kokkos v. 3.0
 //              Copyright (2019) Sandia Corporation
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +23,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -60,9 +60,7 @@ template <class Exts, ptrdiff_t NewExtent>
 struct PrependExtent;
 
 template <ptrdiff_t... Exts, ptrdiff_t NewExtent>
-struct PrependExtent<
-  Extents<Exts...>, NewExtent
-> {
+struct PrependExtent<Extents<Exts...>, NewExtent> {
   using type = Extents<NewExtent, Exts...>;
 };
 
@@ -70,117 +68,101 @@ template <class Exts, ptrdiff_t NewExtent>
 struct AppendExtent;
 
 template <ptrdiff_t... Exts, ptrdiff_t NewExtent>
-struct AppendExtent<
-  Extents<Exts...>, NewExtent
-> {
+struct AppendExtent<Extents<Exts...>, NewExtent> {
   using type = Extents<Exts..., NewExtent>;
 };
 
-} // end namespace Experimental
+}  // end namespace Experimental
 
 namespace Impl {
 
 namespace _parse_view_extents_impl {
 
 template <class T>
-struct _all_remaining_extents_dynamic : std::true_type { };
+struct _all_remaining_extents_dynamic : std::true_type {};
 
 template <class T>
-struct _all_remaining_extents_dynamic<T*>
-  : _all_remaining_extents_dynamic<T>
-{ };
+struct _all_remaining_extents_dynamic<T*> : _all_remaining_extents_dynamic<T> {
+};
 
 template <class T, unsigned N>
-struct _all_remaining_extents_dynamic<T[N]>
-  : std::false_type
-{ };
+struct _all_remaining_extents_dynamic<T[N]> : std::false_type {};
 
-template <class T, class Result, class=void>
+template <class T, class Result, class = void>
 struct _parse_impl {
   using type = Result;
 };
 
-// We have to treat the case of int**[x] specially, since it *doesn't* go backwards
+// We have to treat the case of int**[x] specially, since it *doesn't* go
+// backwards
 template <class T, ptrdiff_t... ExtentSpec>
 struct _parse_impl<
-  T*, Experimental::Extents<ExtentSpec...>,
-  typename std::enable_if<_all_remaining_extents_dynamic<T>::value>::type
->
-  : _parse_impl<
-      T, Experimental::Extents<Experimental::dynamic_extent, ExtentSpec...>
-    >
-{ };
+    T*, Experimental::Extents<ExtentSpec...>,
+    typename std::enable_if<_all_remaining_extents_dynamic<T>::value>::type>
+    : _parse_impl<T, Experimental::Extents<Experimental::dynamic_extent,
+                                           ExtentSpec...>> {};
 
 // int*(*[x])[y] should still work also (meaning int[][x][][y])
 template <class T, ptrdiff_t... ExtentSpec>
-struct _parse_impl<
-  T*, Experimental::Extents<ExtentSpec...>,
-  typename std::enable_if<not _all_remaining_extents_dynamic<T>::value>::type
->
-{
+struct _parse_impl<T*, Experimental::Extents<ExtentSpec...>,
+                   typename std::enable_if<
+                       not _all_remaining_extents_dynamic<T>::value>::type> {
   using _next = Kokkos::Experimental::AppendExtent<
-    typename _parse_impl<T, Experimental::Extents<ExtentSpec...>, void>::type,
-    Experimental::dynamic_extent
-  >;
+      typename _parse_impl<T, Experimental::Extents<ExtentSpec...>, void>::type,
+      Experimental::dynamic_extent>;
   using type = typename _next::type;
 };
 
 template <class T, ptrdiff_t... ExtentSpec, unsigned N>
-struct _parse_impl<
-  T[N], Experimental::Extents<ExtentSpec...>, void
->
-  : _parse_impl<
-      T, Experimental::Extents<ExtentSpec..., ptrdiff_t(N)> // TODO @pedantic this could be a narrowing cast
-    >
-{ };
+struct _parse_impl<T[N], Experimental::Extents<ExtentSpec...>, void>
+    : _parse_impl<T, Experimental::Extents<ExtentSpec...,
+                                           ptrdiff_t(N)>  // TODO @pedantic this
+                                                          // could be a
+                                                          // narrowing cast
+                  > {};
 
-} // end namespace _parse_view_extents_impl
+}  // end namespace _parse_view_extents_impl
 
 template <class DataType>
 struct ParseViewExtents {
-  using type =
-    typename _parse_view_extents_impl
-      ::_parse_impl<DataType, Experimental::Extents<>>::type;
+  using type = typename _parse_view_extents_impl ::_parse_impl<
+      DataType, Experimental::Extents<>>::type;
 };
 
 template <class ValueType, ptrdiff_t Ext>
-struct ApplyExtent
-{
+struct ApplyExtent {
   using type = ValueType[Ext];
 };
 
 template <class ValueType>
-struct ApplyExtent<ValueType, Experimental::dynamic_extent>
-{
+struct ApplyExtent<ValueType, Experimental::dynamic_extent> {
   using type = ValueType*;
 };
 
 template <class ValueType, unsigned N, ptrdiff_t Ext>
-struct ApplyExtent<ValueType[N], Ext>
-{
+struct ApplyExtent<ValueType[N], Ext> {
   using type = typename ApplyExtent<ValueType, Ext>::type[N];
 };
 
 template <class ValueType, ptrdiff_t Ext>
-struct ApplyExtent<ValueType*, Ext>
-{
-  using type = ValueType*[Ext];
+struct ApplyExtent<ValueType*, Ext> {
+  using type = ValueType * [Ext];
 };
 
 template <class ValueType>
-struct ApplyExtent<ValueType*, Experimental::dynamic_extent>
-{
-  using type = typename ApplyExtent<ValueType, Experimental::dynamic_extent>::type*;
+struct ApplyExtent<ValueType*, Experimental::dynamic_extent> {
+  using type =
+      typename ApplyExtent<ValueType, Experimental::dynamic_extent>::type*;
 };
 
 template <class ValueType, unsigned N>
-struct ApplyExtent<ValueType[N], Experimental::dynamic_extent>
-{
-  using type = typename ApplyExtent<ValueType, Experimental::dynamic_extent>::type[N];
+struct ApplyExtent<ValueType[N], Experimental::dynamic_extent> {
+  using type =
+      typename ApplyExtent<ValueType, Experimental::dynamic_extent>::type[N];
 };
 
-} // end namespace Impl
+}  // end namespace Impl
 
-} // end namespace Kokkos
+}  // end namespace Kokkos
 
-#endif //KOKKOS_KOKKOS_EXTENTS_HPP
+#endif  // KOKKOS_KOKKOS_EXTENTS_HPP
diff --git a/lib/kokkos/core/src/Kokkos_Future.hpp b/lib/kokkos/core/src/Kokkos_Future.hpp
index 665ce71cf5..15a5d39aad 100644
--- a/lib/kokkos/core/src/Kokkos_Future.hpp
+++ b/lib/kokkos/core/src/Kokkos_Future.hpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -47,7 +48,7 @@
 //----------------------------------------------------------------------------
 
 #include <Kokkos_Macros.hpp>
-#if defined( KOKKOS_ENABLE_TASKDAG )
+#if defined(KOKKOS_ENABLE_TASKDAG)
 
 #include <Kokkos_Core_fwd.hpp>
 #include <Kokkos_TaskScheduler_fwd.hpp>
@@ -58,7 +59,7 @@
 #include <impl/Kokkos_TaskBase.hpp>
 #include <Kokkos_Atomic.hpp>
 
-#include <Kokkos_Concepts.hpp> // is_space
+#include <Kokkos_Concepts.hpp>  // is_space
 
 //----------------------------------------------------------------------------
 //----------------------------------------------------------------------------
@@ -66,202 +67,165 @@
 namespace Kokkos {
 
 // For now, hack this in as a partial specialization
-// TODO @tasking @cleanup Make this the "normal" class template and make the old code the specialization
+// TODO @tasking @cleanup Make this the "normal" class template and make the old
+// code the specialization
 template <typename ValueType, typename ExecutionSpace, typename QueueType>
-class BasicFuture<ValueType, SimpleTaskScheduler<ExecutionSpace, QueueType>>
-{
-public:
-
-  using value_type = ValueType;
+class BasicFuture<ValueType, SimpleTaskScheduler<ExecutionSpace, QueueType>> {
+ public:
+  using value_type      = ValueType;
   using execution_space = ExecutionSpace;
-  using scheduler_type = SimpleTaskScheduler<ExecutionSpace, QueueType>;
-  using queue_type = typename scheduler_type::task_queue_type;
-
-
-private:
+  using scheduler_type  = SimpleTaskScheduler<ExecutionSpace, QueueType>;
+  using queue_type      = typename scheduler_type::task_queue_type;
 
+ private:
   template <class, class>
   friend class SimpleTaskScheduler;
   template <class, class>
   friend class BasicFuture;
 
-  using task_base_type = typename scheduler_type::task_base_type;
+  using task_base_type  = typename scheduler_type::task_base_type;
   using task_queue_type = typename scheduler_type::task_queue_type;
 
   using task_queue_traits = typename scheduler_type::task_queue_traits;
-  using task_scheduling_info_type = typename scheduler_type::task_scheduling_info_type;
+  using task_scheduling_info_type =
+      typename scheduler_type::task_scheduling_info_type;
 
-  using result_storage_type =
-    Impl::TaskResultStorage<
+  using result_storage_type = Impl::TaskResultStorage<
       ValueType,
-      Impl::SchedulingInfoStorage<
-        Impl::RunnableTaskBase<task_queue_traits>,
-        task_scheduling_info_type
-      >
-    >;
-
-
+      Impl::SchedulingInfoStorage<Impl::RunnableTaskBase<task_queue_traits>,
+                                  task_scheduling_info_type>>;
 
   OwningRawPtr<task_base_type> m_task = nullptr;
 
   KOKKOS_INLINE_FUNCTION
-  explicit
-  BasicFuture(task_base_type* task)
-    : m_task(task)
-  {
+  explicit BasicFuture(task_base_type* task) : m_task(task) {
     // Note: reference count starts at 2 to account for initial increment
-    // TODO @tasking @minor DSH verify reference count here and/or encapsulate starting reference count closer to here
+    // TODO @tasking @minor DSH verify reference count here and/or encapsulate
+    // starting reference count closer to here
   }
 
-public:
+ public:
+  KOKKOS_INLINE_FUNCTION
+  BasicFuture() noexcept : m_task(nullptr) {}
 
   KOKKOS_INLINE_FUNCTION
-  BasicFuture() noexcept : m_task(nullptr) { }
-
-  KOKKOS_INLINE_FUNCTION
-  BasicFuture(BasicFuture&& rhs) noexcept
-    : m_task(std::move(rhs.m_task))
-  {
+  BasicFuture(BasicFuture&& rhs) noexcept : m_task(std::move(rhs.m_task)) {
     rhs.m_task = nullptr;
   }
 
   KOKKOS_INLINE_FUNCTION
   BasicFuture(BasicFuture const& rhs)
-  //  : m_task(rhs.m_task)
-    : m_task(nullptr)
-  {
+      //  : m_task(rhs.m_task)
+      : m_task(nullptr) {
     *static_cast<task_base_type* volatile*>(&m_task) = rhs.m_task;
-    if(m_task) m_task->increment_reference_count();
+    if (m_task) m_task->increment_reference_count();
   }
 
   KOKKOS_INLINE_FUNCTION
-  BasicFuture& operator=(BasicFuture&& rhs) noexcept
-  {
-    if(m_task != rhs.m_task) {
+  BasicFuture& operator=(BasicFuture&& rhs) noexcept {
+    if (m_task != rhs.m_task) {
       clear();
-      //m_task = std::move(rhs.m_task);
+      // m_task = std::move(rhs.m_task);
       *static_cast<task_base_type* volatile*>(&m_task) = rhs.m_task;
       // rhs.m_task reference count is unchanged, since this is a move
-    }
-    else {
+    } else {
       // They're the same, but this is a move, so 1 fewer references now
       rhs.clear();
     }
     rhs.m_task = nullptr;
-    return *this ;
+    return *this;
   }
 
   KOKKOS_INLINE_FUNCTION
-  BasicFuture& operator=(BasicFuture const& rhs)
-  {
-    if(m_task != rhs.m_task) {
+  BasicFuture& operator=(BasicFuture const& rhs) {
+    if (m_task != rhs.m_task) {
       clear();
-      //m_task = rhs.m_task;
+      // m_task = rhs.m_task;
       *static_cast<task_base_type* volatile*>(&m_task) = rhs.m_task;
     }
-    if(m_task != nullptr) { m_task->increment_reference_count(); }
+    if (m_task != nullptr) {
+      m_task->increment_reference_count();
+    }
     return *this;
   }
 
   //----------------------------------------
 
   template <class T, class S>
-  KOKKOS_INLINE_FUNCTION
-  BasicFuture(BasicFuture<T, S>&& rhs) noexcept // NOLINT(google-explicit-constructor)
-    : m_task(std::move(rhs.m_task))
-  {
-    static_assert(
-      std::is_same<scheduler_type, void>::value ||
-        std::is_same<scheduler_type, S>::value,
-      "Moved Futures must have the same scheduler"
-    );
+  KOKKOS_INLINE_FUNCTION BasicFuture(
+      BasicFuture<T, S>&& rhs) noexcept  // NOLINT(google-explicit-constructor)
+      : m_task(std::move(rhs.m_task)) {
+    static_assert(std::is_same<scheduler_type, void>::value ||
+                      std::is_same<scheduler_type, S>::value,
+                  "Moved Futures must have the same scheduler");
 
-    static_assert(
-      std::is_same<value_type, void>::value ||
-        std::is_same<value_type, T>::value,
-      "Moved Futures must have the same value_type"
-    );
+    static_assert(std::is_same<value_type, void>::value ||
+                      std::is_same<value_type, T>::value,
+                  "Moved Futures must have the same value_type");
 
     // reference counts are unchanged, since this is a move
     rhs.m_task = nullptr;
   }
 
   template <class T, class S>
-  KOKKOS_INLINE_FUNCTION
-  BasicFuture(BasicFuture<T, S> const& rhs) // NOLINT(google-explicit-constructor)
-    //: m_task(rhs.m_task)
-    : m_task(nullptr)
-  {
-    static_assert(
-      std::is_same<scheduler_type, void>::value ||
-        std::is_same<scheduler_type, S>::value,
-      "Copied Futures must have the same scheduler"
-    );
+  KOKKOS_INLINE_FUNCTION BasicFuture(
+      BasicFuture<T, S> const& rhs)  // NOLINT(google-explicit-constructor)
+                                     //: m_task(rhs.m_task)
+      : m_task(nullptr) {
+    static_assert(std::is_same<scheduler_type, void>::value ||
+                      std::is_same<scheduler_type, S>::value,
+                  "Copied Futures must have the same scheduler");
 
-    static_assert(
-      std::is_same<value_type, void>::value ||
-        std::is_same<value_type, T>::value,
-      "Copied Futures must have the same value_type"
-    );
+    static_assert(std::is_same<value_type, void>::value ||
+                      std::is_same<value_type, T>::value,
+                  "Copied Futures must have the same value_type");
 
     *static_cast<task_base_type* volatile*>(&m_task) = rhs.m_task;
-    if(m_task) m_task->increment_reference_count();
+    if (m_task) m_task->increment_reference_count();
   }
 
   template <class T, class S>
-  KOKKOS_INLINE_FUNCTION
-  BasicFuture&
-  operator=(BasicFuture<T, S> const& rhs)
-  {
-    static_assert(
-      std::is_same<scheduler_type, void>::value ||
-        std::is_same<scheduler_type, S>::value,
-      "Assigned Futures must have the same scheduler"
-    );
+  KOKKOS_INLINE_FUNCTION BasicFuture& operator=(BasicFuture<T, S> const& rhs) {
+    static_assert(std::is_same<scheduler_type, void>::value ||
+                      std::is_same<scheduler_type, S>::value,
+                  "Assigned Futures must have the same scheduler");
 
-    static_assert(
-      std::is_same<value_type, void>::value ||
-        std::is_same<value_type, T>::value,
-      "Assigned Futures must have the same value_type"
-    );
+    static_assert(std::is_same<value_type, void>::value ||
+                      std::is_same<value_type, T>::value,
+                  "Assigned Futures must have the same value_type");
 
-    if(m_task != rhs.m_task) {
+    if (m_task != rhs.m_task) {
       clear();
-      //m_task = rhs.m_task;
+      // m_task = rhs.m_task;
       *static_cast<task_base_type* volatile*>(&m_task) = rhs.m_task;
-      if(m_task != nullptr) { m_task->increment_reference_count(); }
+      if (m_task != nullptr) {
+        m_task->increment_reference_count();
+      }
     }
     return *this;
   }
 
-  template<class T, class S>
-  KOKKOS_INLINE_FUNCTION
-  BasicFuture& operator=(BasicFuture<T, S>&& rhs)
-  {
-    static_assert(
-      std::is_same<scheduler_type, void>::value ||
-        std::is_same<scheduler_type, S>::value,
-      "Assigned Futures must have the same scheduler"
-    );
+  template <class T, class S>
+  KOKKOS_INLINE_FUNCTION BasicFuture& operator=(BasicFuture<T, S>&& rhs) {
+    static_assert(std::is_same<scheduler_type, void>::value ||
+                      std::is_same<scheduler_type, S>::value,
+                  "Assigned Futures must have the same scheduler");
 
-    static_assert(
-      std::is_same<value_type, void>::value ||
-        std::is_same<value_type, T>::value,
-      "Assigned Futures must have the same value_type"
-    );
+    static_assert(std::is_same<value_type, void>::value ||
+                      std::is_same<value_type, T>::value,
+                  "Assigned Futures must have the same value_type");
 
-    if(m_task != rhs.m_task) {
+    if (m_task != rhs.m_task) {
       clear();
-      //m_task = std::move(rhs.m_task);
+      // m_task = std::move(rhs.m_task);
       *static_cast<task_base_type* volatile*>(&m_task) = rhs.m_task;
       // rhs.m_task reference count is unchanged, since this is a move
-    }
-    else {
+    } else {
       // They're the same, but this is a move, so 1 fewer references now
       rhs.clear();
     }
     rhs.m_task = nullptr;
-    return *this ;
+    return *this;
   }
 
   KOKKOS_INLINE_FUNCTION
@@ -271,22 +235,19 @@ public:
 
   KOKKOS_INLINE_FUNCTION
   void clear() noexcept {
-    if(m_task) {
+    if (m_task) {
       bool should_delete = m_task->decrement_and_check_reference_count();
-      if(should_delete) {
+      if (should_delete) {
         static_cast<task_queue_type*>(m_task->ready_queue_base_ptr())
-          ->deallocate(std::move(*m_task));
+            ->deallocate(std::move(*m_task));
       }
     }
-    //m_task = nullptr;
+    // m_task = nullptr;
     *static_cast<task_base_type* volatile*>(&m_task) = nullptr;
   }
 
   KOKKOS_INLINE_FUNCTION
-  bool is_null() const noexcept {
-    return m_task == nullptr;
-  }
-
+  bool is_null() const noexcept { return m_task == nullptr; }
 
   KOKKOS_INLINE_FUNCTION
   bool is_ready() const noexcept {
@@ -294,14 +255,11 @@ public:
   }
 
   KOKKOS_INLINE_FUNCTION
-  const typename Impl::TaskResult< ValueType >::reference_type
-  get() const
-  {
+  const typename Impl::TaskResult<ValueType>::reference_type get() const {
     KOKKOS_EXPECTS(is_ready());
     return static_cast<result_storage_type*>(m_task)->value_reference();
-    //return Impl::TaskResult<ValueType>::get(m_task);
+    // return Impl::TaskResult<ValueType>::get(m_task);
   }
-
 };
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -310,57 +268,57 @@ public:
 
 template <typename ValueType, typename Scheduler>
 class BasicFuture {
-private:
-
-  template< typename , typename > friend class BasicTaskScheduler ;
-  template< typename , typename > friend class BasicFuture ;
-  friend class Impl::TaskBase ;
-  template< typename , typename , typename > friend class Impl::Task ;
-
+ private:
+  template <typename, typename>
+  friend class BasicTaskScheduler;
+  template <typename, typename>
+  friend class BasicFuture;
+  friend class Impl::TaskBase;
+  template <typename, typename, typename>
+  friend class Impl::Task;
 
   //----------------------------------------
 
-public:
-
+ public:
   //----------------------------------------
 
-  using scheduler_type = Scheduler;
-  using queue_type = typename scheduler_type::queue_type;
+  using scheduler_type  = Scheduler;
+  using queue_type      = typename scheduler_type::queue_type;
   using execution_space = typename scheduler_type::execution_space;
-  using value_type = ValueType;
+  using value_type      = ValueType;
 
   //----------------------------------------
 
-private:
+ private:
+  //----------------------------------------
+
+  using task_base = Impl::TaskBase;
+
+  task_base* m_task;
+
+  KOKKOS_INLINE_FUNCTION explicit BasicFuture(task_base* task) : m_task(0) {
+    if (task) queue_type::assign(&m_task, task);
+  }
 
   //----------------------------------------
 
-  using task_base  = Impl::TaskBase;
-
-  task_base * m_task ;
-
-  KOKKOS_INLINE_FUNCTION explicit
-  BasicFuture( task_base * task ) : m_task(0)
-  { if ( task ) queue_type::assign( & m_task , task ); }
-
+ public:
   //----------------------------------------
 
-public:
+  KOKKOS_INLINE_FUNCTION
+  bool is_null() const { return 0 == m_task; }
+
+  KOKKOS_INLINE_FUNCTION
+  int reference_count() const {
+    return 0 != m_task ? m_task->reference_count() : 0;
+  }
 
   //----------------------------------------
 
   KOKKOS_INLINE_FUNCTION
-  bool is_null() const { return 0 == m_task ; }
-
-  KOKKOS_INLINE_FUNCTION
-  int reference_count() const
-  { return 0 != m_task ? m_task->reference_count() : 0 ; }
-
-  //----------------------------------------
-
-  KOKKOS_INLINE_FUNCTION
-  void clear()
-  { if ( m_task ) queue_type::assign( & m_task , (task_base*)0 ); }
+  void clear() {
+    if (m_task) queue_type::assign(&m_task, (task_base*)0);
+  }
 
   //----------------------------------------
 
@@ -370,141 +328,121 @@ public:
   //----------------------------------------
 
   KOKKOS_INLINE_FUNCTION
-  BasicFuture() noexcept : m_task(nullptr) { }
+  BasicFuture() noexcept : m_task(nullptr) {}
 
   KOKKOS_INLINE_FUNCTION
-  BasicFuture( BasicFuture && rhs ) noexcept
-    : m_task( rhs.m_task )
-  {
+  BasicFuture(BasicFuture&& rhs) noexcept : m_task(rhs.m_task) {
     rhs.m_task = 0;
   }
 
   KOKKOS_INLINE_FUNCTION
-  BasicFuture( const BasicFuture & rhs )
-    : m_task(0)
-  { if ( rhs.m_task ) queue_type::assign( & m_task , rhs.m_task ); }
-
-  KOKKOS_INLINE_FUNCTION
-  BasicFuture& operator=(BasicFuture&& rhs) noexcept
-  {
-    clear();
-    m_task = rhs.m_task ;
-    rhs.m_task = 0 ;
-    return *this ;
+  BasicFuture(const BasicFuture& rhs) : m_task(0) {
+    if (rhs.m_task) queue_type::assign(&m_task, rhs.m_task);
   }
 
   KOKKOS_INLINE_FUNCTION
-  BasicFuture& operator=(BasicFuture const& rhs)
-  {
-    if ( m_task || rhs.m_task ) queue_type::assign( & m_task , rhs.m_task );
-    return *this ;
+  BasicFuture& operator=(BasicFuture&& rhs) noexcept {
+    clear();
+    m_task     = rhs.m_task;
+    rhs.m_task = 0;
+    return *this;
+  }
+
+  KOKKOS_INLINE_FUNCTION
+  BasicFuture& operator=(BasicFuture const& rhs) {
+    if (m_task || rhs.m_task) queue_type::assign(&m_task, rhs.m_task);
+    return *this;
   }
 
   //----------------------------------------
 
   template <class T, class S>
-  KOKKOS_INLINE_FUNCTION
-  BasicFuture(BasicFuture<T, S>&& rhs) noexcept // NOLINT(google-explicit-constructor)
-    : m_task( rhs.m_task )
-  {
-    static_assert
-      ( std::is_same<scheduler_type, void>::value ||
-          std::is_same<scheduler_type, S>::value
-        , "Assigned Futures must have the same scheduler" );
+  KOKKOS_INLINE_FUNCTION BasicFuture(
+      BasicFuture<T, S>&& rhs) noexcept  // NOLINT(google-explicit-constructor)
+      : m_task(rhs.m_task) {
+    static_assert(std::is_same<scheduler_type, void>::value ||
+                      std::is_same<scheduler_type, S>::value,
+                  "Assigned Futures must have the same scheduler");
 
-    static_assert
-      ( std::is_same< value_type , void >::value ||
-          std::is_same<value_type, T>::value
-        , "Assigned Futures must have the same value_type" );
+    static_assert(std::is_same<value_type, void>::value ||
+                      std::is_same<value_type, T>::value,
+                  "Assigned Futures must have the same value_type");
 
-    rhs.m_task = 0 ;
+    rhs.m_task = 0;
   }
 
   template <class T, class S>
-  KOKKOS_INLINE_FUNCTION
-  BasicFuture(BasicFuture<T, S> const& rhs) // NOLINT(google-explicit-constructor)
-    : m_task(nullptr)
-  {
-    static_assert
-      ( std::is_same<scheduler_type, void>::value ||
-          std::is_same<scheduler_type, S>::value
-        , "Assigned Futures must have the same scheduler" );
+  KOKKOS_INLINE_FUNCTION BasicFuture(
+      BasicFuture<T, S> const& rhs)  // NOLINT(google-explicit-constructor)
+      : m_task(nullptr) {
+    static_assert(std::is_same<scheduler_type, void>::value ||
+                      std::is_same<scheduler_type, S>::value,
+                  "Assigned Futures must have the same scheduler");
 
-    static_assert
-      ( std::is_same< value_type , void >::value ||
-          std::is_same<value_type, T>::value
-        , "Assigned Futures must have the same value_type" );
+    static_assert(std::is_same<value_type, void>::value ||
+                      std::is_same<value_type, T>::value,
+                  "Assigned Futures must have the same value_type");
 
-    if ( rhs.m_task ) queue_type::assign( & m_task , rhs.m_task );
+    if (rhs.m_task) queue_type::assign(&m_task, rhs.m_task);
   }
 
   template <class T, class S>
-  KOKKOS_INLINE_FUNCTION
-  BasicFuture&
-  operator=(BasicFuture<T, S> const& rhs)
-  {
-    static_assert
-      ( std::is_same<scheduler_type, void>::value ||
-          std::is_same<scheduler_type, S>::value
-        , "Assigned Futures must have the same scheduler" );
+  KOKKOS_INLINE_FUNCTION BasicFuture& operator=(BasicFuture<T, S> const& rhs) {
+    static_assert(std::is_same<scheduler_type, void>::value ||
+                      std::is_same<scheduler_type, S>::value,
+                  "Assigned Futures must have the same scheduler");
 
-    static_assert
-      ( std::is_same< value_type , void >::value ||
-          std::is_same<value_type, T>::value
-        , "Assigned Futures must have the same value_type" );
+    static_assert(std::is_same<value_type, void>::value ||
+                      std::is_same<value_type, T>::value,
+                  "Assigned Futures must have the same value_type");
 
-    if ( m_task || rhs.m_task ) queue_type::assign( & m_task , rhs.m_task );
-    return *this ;
+    if (m_task || rhs.m_task) queue_type::assign(&m_task, rhs.m_task);
+    return *this;
   }
 
-  template<class T, class S>
-  KOKKOS_INLINE_FUNCTION
-  BasicFuture& operator=(BasicFuture<T, S>&& rhs)
-  {
-    static_assert
-      ( std::is_same<scheduler_type, void>::value ||
-          std::is_same<scheduler_type, S>::value
-        , "Assigned Futures must have the same scheduler" );
+  template <class T, class S>
+  KOKKOS_INLINE_FUNCTION BasicFuture& operator=(BasicFuture<T, S>&& rhs) {
+    static_assert(std::is_same<scheduler_type, void>::value ||
+                      std::is_same<scheduler_type, S>::value,
+                  "Assigned Futures must have the same scheduler");
 
-    static_assert
-      ( std::is_same< value_type , void >::value ||
-          std::is_same<value_type, T>::value
-        , "Assigned Futures must have the same value_type" );
+    static_assert(std::is_same<value_type, void>::value ||
+                      std::is_same<value_type, T>::value,
+                  "Assigned Futures must have the same value_type");
 
     clear();
-    m_task = rhs.m_task ;
-    rhs.m_task = 0 ;
-    return *this ;
+    m_task     = rhs.m_task;
+    rhs.m_task = 0;
+    return *this;
   }
 
   //----------------------------------------
 
   KOKKOS_INLINE_FUNCTION
-  int is_ready() const noexcept
-  { return ( 0 == m_task ) || ( ((task_base*) task_base::LockTag) == m_task->m_wait ); }
+  int is_ready() const noexcept {
+    return (0 == m_task) ||
+           (((task_base*)task_base::LockTag) == m_task->m_wait);
+  }
 
   KOKKOS_INLINE_FUNCTION
-  const typename Impl::TaskResult< ValueType >::reference_type
-  get() const
-  {
-    if ( 0 == m_task ) {
-      Kokkos::abort( "Kokkos:::Future::get ERROR: is_null()");
+  const typename Impl::TaskResult<ValueType>::reference_type get() const {
+    if (0 == m_task) {
+      Kokkos::abort("Kokkos:::Future::get ERROR: is_null()");
     }
-    return Impl::TaskResult< ValueType >::get( m_task );
+    return Impl::TaskResult<ValueType>::get(m_task);
   }
 };
 
 // Is a Future with the given execution space
-template< typename , typename ExecSpace = void >
+template <typename, typename ExecSpace = void>
 struct is_future : public std::false_type {};
 
-template<typename ValueType, typename Scheduler, typename ExecSpace>
+template <typename ValueType, typename Scheduler, typename ExecSpace>
 struct is_future<BasicFuture<ValueType, Scheduler>, ExecSpace>
-  : std::integral_constant<bool,
-      std::is_same<ExecSpace, typename Scheduler::execution_space>::value
-      || std::is_void<ExecSpace>::value
-    >
-{};
+    : std::integral_constant<
+          bool,
+          std::is_same<ExecSpace, typename Scheduler::execution_space>::value ||
+              std::is_void<ExecSpace>::value> {};
 
 ////////////////////////////////////////////////////////////////////////////////
 // END OLD CODE
@@ -514,39 +452,32 @@ namespace Impl {
 
 template <class Arg1, class Arg2>
 class ResolveFutureArgOrder {
-private:
+ private:
   enum { Arg1_is_space = Kokkos::is_space<Arg1>::value };
   enum { Arg2_is_space = Kokkos::is_space<Arg2>::value };
   enum { Arg1_is_value = !Arg1_is_space && !std::is_same<Arg1, void>::value };
   enum { Arg2_is_value = !Arg2_is_space && !std::is_same<Arg2, void>::value };
 
-  static_assert(
-    ! ( Arg1_is_space && Arg2_is_space ),
-    "Future cannot be given two spaces"
-  );
+  static_assert(!(Arg1_is_space && Arg2_is_space),
+                "Future cannot be given two spaces");
 
-  static_assert(
-    ! ( Arg1_is_value && Arg2_is_value ),
-    "Future cannot be given two value types"
-  );
+  static_assert(!(Arg1_is_value && Arg2_is_value),
+                "Future cannot be given two value types");
 
-  using value_type =
-    typename std::conditional<Arg1_is_value, Arg1,
-      typename std::conditional<Arg2_is_value, Arg2, void>::type
-    >::type;
+  using value_type = typename std::conditional<
+      Arg1_is_value, Arg1,
+      typename std::conditional<Arg2_is_value, Arg2, void>::type>::type;
 
-  using execution_space =
-    typename std::conditional<Arg1_is_space, Arg1,
-      typename std::conditional<Arg2_is_space, Arg2, void>::type
-    >::type::execution_space;
-
-public:
+  using execution_space = typename std::conditional<
+      Arg1_is_space, Arg1,
+      typename std::conditional<Arg2_is_space, Arg2,
+                                void>::type>::type::execution_space;
 
+ public:
   using type = BasicFuture<value_type, TaskScheduler<execution_space>>;
-
 };
 
-} // end namespace Impl
+}  // end namespace Impl
 
 /**
  *
@@ -558,7 +489,7 @@ public:
 template <class Arg1 = void, class Arg2 = void>
 using Future = typename Impl::ResolveFutureArgOrder<Arg1, Arg2>::type;
 
-} // namespace Kokkos
+}  // namespace Kokkos
 
 //----------------------------------------------------------------------------
 //----------------------------------------------------------------------------
diff --git a/lib/kokkos/core/src/Kokkos_HBWSpace.hpp b/lib/kokkos/core/src/Kokkos_HBWSpace.hpp
index bb5519a0c0..c1f03f8962 100644
--- a/lib/kokkos/core/src/Kokkos_HBWSpace.hpp
+++ b/lib/kokkos/core/src/Kokkos_HBWSpace.hpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -63,26 +64,26 @@ namespace Impl {
 /// This function initializes the locks to zero (unset).
 void init_lock_array_hbw_space();
 
-/// \brief Aquire a lock for the address
+/// \brief Acquire a lock for the address
 ///
-/// This function tries to aquire the lock for the hash value derived
-/// from the provided ptr. If the lock is successfully aquired the
+/// This function tries to acquire the lock for the hash value derived
+/// from the provided ptr. If the lock is successfully acquired the
 /// function returns true. Otherwise it returns false.
-bool lock_address_hbw_space( void* ptr );
+bool lock_address_hbw_space(void* ptr);
 
 /// \brief Release lock for the address
 ///
 /// This function releases the lock for the hash value derived
 /// from the provided ptr. This function should only be called
-/// after previously successfully aquiring a lock with
+/// after previously successfully acquiring a lock with
 /// lock_address.
-void unlock_address_hbw_space( void* ptr );
+void unlock_address_hbw_space(void* ptr);
 
-} // namespace Impl
+}  // namespace Impl
 
-} // namespace Experimental
+}  // namespace Experimental
 
-} // namespace Kokkos
+}  // namespace Kokkos
 
 namespace Kokkos {
 
@@ -94,10 +95,10 @@ namespace Experimental {
 /// HBWSpace is a memory space that governs host memory.  "Host"
 /// memory means the usual CPU-accessible memory.
 class HBWSpace {
-public:
+ public:
   //! Tag this class as a kokkos memory space
-  typedef HBWSpace  memory_space;
-  typedef size_t     size_type;
+  typedef HBWSpace memory_space;
+  typedef size_t size_type;
 
   /// \typedef execution_space
   /// \brief Default execution space for this memory space.
@@ -105,59 +106,64 @@ public:
   /// Every memory space has a default execution space.  This is
   /// useful for things like initializing a View (which happens in
   /// parallel using the View's default execution space).
-#if defined( KOKKOS_ENABLE_DEFAULT_DEVICE_TYPE_OPENMP )
-  typedef Kokkos::OpenMP    execution_space;
-#elif defined( KOKKOS_ENABLE_DEFAULT_DEVICE_TYPE_THREADS )
-  typedef Kokkos::Threads   execution_space;
+#if defined(KOKKOS_ENABLE_DEFAULT_DEVICE_TYPE_OPENMP)
+  typedef Kokkos::OpenMP execution_space;
+#elif defined(KOKKOS_ENABLE_DEFAULT_DEVICE_TYPE_THREADS)
+  typedef Kokkos::Threads execution_space;
 //#elif defined( KOKKOS_ENABLE_DEFAULT_DEVICE_TYPE_QTHREADS )
 //  typedef Kokkos::Qthreads  execution_space;
-#elif defined( KOKKOS_ENABLE_OPENMP )
-  typedef Kokkos::OpenMP    execution_space;
-#elif defined( KOKKOS_ENABLE_THREADS )
-  typedef Kokkos::Threads   execution_space;
+#elif defined(KOKKOS_ENABLE_OPENMP)
+  typedef Kokkos::OpenMP execution_space;
+#elif defined(KOKKOS_ENABLE_THREADS)
+  typedef Kokkos::Threads execution_space;
 //#elif defined( KOKKOS_ENABLE_QTHREADS )
 //  typedef Kokkos::Qthreads  execution_space;
-#elif defined( KOKKOS_ENABLE_SERIAL )
-  typedef Kokkos::Serial    execution_space;
+#elif defined(KOKKOS_ENABLE_SERIAL)
+  typedef Kokkos::Serial execution_space;
 #else
-#  error "At least one of the following host execution spaces must be defined: Kokkos::OpenMP, Kokkos::Threads, Kokkos::Qhreads, or Kokkos::Serial.  You might be seeing this message if you disabled the Kokkos::Serial device explicitly using the Kokkos_ENABLE_Serial:BOOL=OFF CMake option, but did not enable any of the other host execution space devices."
+#error \
+    "At least one of the following host execution spaces must be defined: Kokkos::OpenMP, Kokkos::Threads, Kokkos::Qhreads, or Kokkos::Serial.  You might be seeing this message if you disabled the Kokkos::Serial device explicitly using the Kokkos_ENABLE_Serial:BOOL=OFF CMake option, but did not enable any of the other host execution space devices."
 #endif
 
   //! This memory space preferred device_type
-  typedef Kokkos::Device< execution_space, memory_space > device_type;
+  typedef Kokkos::Device<execution_space, memory_space> device_type;
 
   /**\brief  Default memory space instance */
   HBWSpace();
-  HBWSpace( const HBWSpace & rhs ) = default;
-  HBWSpace & operator = ( const HBWSpace & ) = default;
-  ~HBWSpace() = default;
+  HBWSpace(const HBWSpace& rhs) = default;
+  HBWSpace& operator=(const HBWSpace&) = default;
+  ~HBWSpace()                          = default;
 
-  /**\brief  Non-default memory space instance to choose allocation mechansim, if available */
+  /**\brief  Non-default memory space instance to choose allocation mechansim,
+   * if available */
 
-  enum AllocationMechanism { STD_MALLOC, POSIX_MEMALIGN, POSIX_MMAP, INTEL_MM_ALLOC };
+  enum AllocationMechanism {
+    STD_MALLOC,
+    POSIX_MEMALIGN,
+    POSIX_MMAP,
+    INTEL_MM_ALLOC
+  };
 
-  explicit
-  HBWSpace( const AllocationMechanism & );
+  explicit HBWSpace(const AllocationMechanism&);
 
   /**\brief  Allocate untracked memory in the space */
-  void * allocate( const size_t arg_alloc_size ) const;
+  void* allocate(const size_t arg_alloc_size) const;
 
   /**\brief  Deallocate untracked memory in the space */
-  void deallocate( void * const arg_alloc_ptr
-                 , const size_t arg_alloc_size ) const;
+  void deallocate(void* const arg_alloc_ptr, const size_t arg_alloc_size) const;
 
   /**\brief Return Name of the MemorySpace */
   static constexpr const char* name() { return "HBW"; }
 
-private:
-
-  AllocationMechanism  m_alloc_mech;
-  friend class Kokkos::Impl::SharedAllocationRecord< Kokkos::Experimental::HBWSpace, void >;
+ private:
+  AllocationMechanism m_alloc_mech;
+  friend class Kokkos::Impl::SharedAllocationRecord<
+      Kokkos::Experimental::HBWSpace, void>;
 };
 
-} // namespace Experimental
+}  // namespace Experimental
 
-} // namespace Kokkos
+}  // namespace Kokkos
 
 //----------------------------------------------------------------------------
 
@@ -165,20 +171,18 @@ namespace Kokkos {
 
 namespace Impl {
 
-template<>
-class SharedAllocationRecord< Kokkos::Experimental::HBWSpace, void >
-  : public SharedAllocationRecord< void, void >
-{
-private:
-
+template <>
+class SharedAllocationRecord<Kokkos::Experimental::HBWSpace, void>
+    : public SharedAllocationRecord<void, void> {
+ private:
   friend Kokkos::Experimental::HBWSpace;
 
-  typedef SharedAllocationRecord< void, void >  RecordBase;
+  typedef SharedAllocationRecord<void, void> RecordBase;
 
-  SharedAllocationRecord( const SharedAllocationRecord & ) = delete;
-  SharedAllocationRecord & operator = ( const SharedAllocationRecord & ) = delete;
+  SharedAllocationRecord(const SharedAllocationRecord&) = delete;
+  SharedAllocationRecord& operator=(const SharedAllocationRecord&) = delete;
 
-  static void deallocate( RecordBase * );
+  static void deallocate(RecordBase*);
 
 #ifdef KOKKOS_DEBUG
   /**\brief  Root record for tracked allocations from this HBWSpace instance */
@@ -187,61 +191,52 @@ private:
 
   const Kokkos::Experimental::HBWSpace m_space;
 
-protected:
-
+ protected:
   ~SharedAllocationRecord();
   SharedAllocationRecord() = default;
 
-  SharedAllocationRecord( const Kokkos::Experimental::HBWSpace & arg_space
-                        , const std::string                    & arg_label
-                        , const size_t                           arg_alloc_size
-                        , const RecordBase::function_type        arg_dealloc = & deallocate
-                        );
+  SharedAllocationRecord(
+      const Kokkos::Experimental::HBWSpace& arg_space,
+      const std::string& arg_label, const size_t arg_alloc_size,
+      const RecordBase::function_type arg_dealloc = &deallocate);
 
-public:
+ public:
+  inline std::string get_label() const {
+    return std::string(RecordBase::head()->m_label);
+  }
 
-  inline
-  std::string get_label() const
-    {
-      return std::string( RecordBase::head()->m_label );
-    }
-
-  KOKKOS_INLINE_FUNCTION static
-  SharedAllocationRecord * allocate( const Kokkos::Experimental::HBWSpace & arg_space
-                                   , const std::string                    & arg_label
-                                   , const size_t                           arg_alloc_size
-                                   )
-    {
-#if defined( KOKKOS_ACTIVE_EXECUTION_MEMORY_SPACE_HOST )
-      return new SharedAllocationRecord( arg_space, arg_label, arg_alloc_size );
+  KOKKOS_INLINE_FUNCTION static SharedAllocationRecord* allocate(
+      const Kokkos::Experimental::HBWSpace& arg_space,
+      const std::string& arg_label, const size_t arg_alloc_size) {
+#if defined(KOKKOS_ACTIVE_EXECUTION_MEMORY_SPACE_HOST)
+    return new SharedAllocationRecord(arg_space, arg_label, arg_alloc_size);
 #else
-      return (SharedAllocationRecord *) 0;
+    return (SharedAllocationRecord*)0;
 #endif
-    }
+  }
 
   /**\brief  Allocate tracked memory in the space */
-  static
-  void * allocate_tracked( const Kokkos::Experimental::HBWSpace & arg_space
-                         , const std::string                    & arg_label
-                         , const size_t                           arg_alloc_size );
+  static void* allocate_tracked(const Kokkos::Experimental::HBWSpace& arg_space,
+                                const std::string& arg_label,
+                                const size_t arg_alloc_size);
 
   /**\brief  Reallocate tracked memory in the space */
-  static
-  void * reallocate_tracked( void * const arg_alloc_ptr
-                           , const size_t arg_alloc_size );
+  static void* reallocate_tracked(void* const arg_alloc_ptr,
+                                  const size_t arg_alloc_size);
 
   /**\brief  Deallocate tracked memory in the space */
-  static
-  void deallocate_tracked( void * const arg_alloc_ptr );
+  static void deallocate_tracked(void* const arg_alloc_ptr);
 
-  static SharedAllocationRecord * get_record( void * arg_alloc_ptr );
+  static SharedAllocationRecord* get_record(void* arg_alloc_ptr);
 
-  static void print_records( std::ostream &, const Kokkos::Experimental::HBWSpace &, bool detail = false );
+  static void print_records(std::ostream&,
+                            const Kokkos::Experimental::HBWSpace&,
+                            bool detail = false);
 };
 
-} // namespace Impl
+}  // namespace Impl
 
-} // namespace Kokkos
+}  // namespace Kokkos
 
 //----------------------------------------------------------------------------
 
@@ -249,25 +244,28 @@ namespace Kokkos {
 
 namespace Impl {
 
-static_assert( Kokkos::Impl::MemorySpaceAccess< Kokkos::Experimental::HBWSpace, Kokkos::Experimental::HBWSpace >::assignable, "" );
+static_assert(
+    Kokkos::Impl::MemorySpaceAccess<Kokkos::Experimental::HBWSpace,
+                                    Kokkos::Experimental::HBWSpace>::assignable,
+    "");
 
-template<>
-struct MemorySpaceAccess< Kokkos::HostSpace, Kokkos::Experimental::HBWSpace > {
+template <>
+struct MemorySpaceAccess<Kokkos::HostSpace, Kokkos::Experimental::HBWSpace> {
   enum { assignable = true };
   enum { accessible = true };
-  enum { deepcopy   = true };
+  enum { deepcopy = true };
 };
 
-template<>
-struct MemorySpaceAccess< Kokkos::Experimental::HBWSpace, Kokkos::HostSpace > {
+template <>
+struct MemorySpaceAccess<Kokkos::Experimental::HBWSpace, Kokkos::HostSpace> {
   enum { assignable = false };
   enum { accessible = true };
-  enum { deepcopy   = true };
+  enum { deepcopy = true };
 };
 
-} // namespace Impl
+}  // namespace Impl
 
-} // namespace Kokkos
+}  // namespace Kokkos
 
 //----------------------------------------------------------------------------
 
@@ -275,70 +273,64 @@ namespace Kokkos {
 
 namespace Impl {
 
-template< class ExecutionSpace >
-struct DeepCopy< Experimental::HBWSpace, Experimental::HBWSpace, ExecutionSpace > {
-  DeepCopy( void * dst, const void * src, size_t n ) {
-    memcpy( dst, src, n );
-  }
+template <class ExecutionSpace>
+struct DeepCopy<Kokkos::Experimental::HBWSpace, Kokkos::Experimental::HBWSpace,
+                ExecutionSpace> {
+  DeepCopy(void* dst, const void* src, size_t n) { memcpy(dst, src, n); }
 
-  DeepCopy( const ExecutionSpace& exec, void * dst, const void * src, size_t n ) {
+  DeepCopy(const ExecutionSpace& exec, void* dst, const void* src, size_t n) {
     exec.fence();
-    memcpy( dst, src, n );
+    memcpy(dst, src, n);
   }
 };
 
-template< class ExecutionSpace >
-struct DeepCopy< HostSpace, Experimental::HBWSpace, ExecutionSpace > {
-  DeepCopy( void * dst, const void * src, size_t n ) {
-    memcpy( dst, src, n );
-  }
+template <class ExecutionSpace>
+struct DeepCopy<HostSpace, Kokkos::Experimental::HBWSpace, ExecutionSpace> {
+  DeepCopy(void* dst, const void* src, size_t n) { memcpy(dst, src, n); }
 
-  DeepCopy( const ExecutionSpace& exec, void * dst, const void * src, size_t n ) {
+  DeepCopy(const ExecutionSpace& exec, void* dst, const void* src, size_t n) {
     exec.fence();
-    memcpy( dst, src, n );
+    memcpy(dst, src, n);
   }
 };
 
-template< class ExecutionSpace >
-struct DeepCopy< Experimental::HBWSpace, HostSpace, ExecutionSpace > {
-  DeepCopy( void * dst, const void * src, size_t n ) {
-    memcpy( dst, src, n );
-  }
+template <class ExecutionSpace>
+struct DeepCopy<Kokkos::Experimental::HBWSpace, HostSpace, ExecutionSpace> {
+  DeepCopy(void* dst, const void* src, size_t n) { memcpy(dst, src, n); }
 
-  DeepCopy( const ExecutionSpace& exec, void * dst, const void * src, size_t n ) {
+  DeepCopy(const ExecutionSpace& exec, void* dst, const void* src, size_t n) {
     exec.fence();
-    memcpy( dst, src, n );
+    memcpy(dst, src, n);
   }
 };
 
-} // namespace Impl
+}  // namespace Impl
 
-} // namespace Kokkos
+}  // namespace Kokkos
 
 namespace Kokkos {
 
 namespace Impl {
 
-template<>
-struct VerifyExecutionCanAccessMemorySpace< Kokkos::HostSpace, Kokkos::Experimental::HBWSpace >
-{
+template <>
+struct VerifyExecutionCanAccessMemorySpace<Kokkos::HostSpace,
+                                           Kokkos::Experimental::HBWSpace> {
   enum { value = true };
-  inline static void verify( void ) { }
-  inline static void verify( const void * ) { }
+  inline static void verify(void) {}
+  inline static void verify(const void*) {}
 };
 
-template<>
-struct VerifyExecutionCanAccessMemorySpace< Kokkos::Experimental::HBWSpace, Kokkos::HostSpace >
-{
+template <>
+struct VerifyExecutionCanAccessMemorySpace<Kokkos::Experimental::HBWSpace,
+                                           Kokkos::HostSpace> {
   enum { value = true };
-  inline static void verify( void ) { }
-  inline static void verify( const void * ) { }
+  inline static void verify(void) {}
+  inline static void verify(const void*) {}
 };
 
-} // namespace Impl
+}  // namespace Impl
 
-} // namespace Kokkos
+}  // namespace Kokkos
 
 #endif
-#endif // #define KOKKOS_HBWSPACE_HPP
-
+#endif  // #define KOKKOS_HBWSPACE_HPP
diff --git a/lib/kokkos/core/src/Kokkos_HPX.hpp b/lib/kokkos/core/src/Kokkos_HPX.hpp
index 79a2b74da4..46101c824f 100644
--- a/lib/kokkos/core/src/Kokkos_HPX.hpp
+++ b/lib/kokkos/core/src/Kokkos_HPX.hpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -57,6 +58,7 @@
 #include <Kokkos_HBWSpace.hpp>
 #endif
 
+#include <HPX/Kokkos_HPX_ChunkedRoundRobinExecutor.hpp>
 #include <Kokkos_HostSpace.hpp>
 #include <Kokkos_Layout.hpp>
 #include <Kokkos_MemoryTraits.hpp>
@@ -74,7 +76,7 @@
 #include <hpx/apply.hpp>
 #include <hpx/hpx_start.hpp>
 #include <hpx/lcos/local/barrier.hpp>
-#include <hpx/lcos/local/counting_semaphore.hpp>
+#include <hpx/lcos/local/latch.hpp>
 #include <hpx/parallel/algorithms/for_loop.hpp>
 #include <hpx/parallel/algorithms/reduce.hpp>
 #include <hpx/parallel/executors/static_chunk_size.hpp>
@@ -97,6 +99,7 @@
 // - 1: The manual way. This way is more verbose and does not take advantage of
 //      e.g. parallel::for_loop in HPX but it is significantly faster in many
 //      benchmarks.
+// - 2: Like 1, but spawn tasks using for_loop and a custom executor.
 //
 // In the long run 0 should be the preferred implementation, but until HPX is
 // improved 1 will be the default.
@@ -104,7 +107,7 @@
 #define KOKKOS_HPX_IMPLEMENTATION 1
 #endif
 
-#if (KOKKOS_HPX_IMPLEMENTATION < 0) || (KOKKOS_HPX_IMPLEMENTATION > 1)
+#if (KOKKOS_HPX_IMPLEMENTATION < 0) || (KOKKOS_HPX_IMPLEMENTATION > 2)
 #error "You have chosen an invalid value for KOKKOS_HPX_IMPLEMENTATION"
 #endif
 
@@ -123,9 +126,11 @@ class thread_buffer {
            m_cache_line_size;
   }
 
-public:
+ public:
   thread_buffer()
-      : m_num_threads(0), m_size_per_thread(0), m_size_total(0),
+      : m_num_threads(0),
+        m_size_per_thread(0),
+        m_size_total(0),
         m_data(nullptr) {}
   thread_buffer(const std::size_t num_threads,
                 const std::size_t size_per_thread) {
@@ -134,13 +139,13 @@ public:
   ~thread_buffer() { delete[] m_data; }
 
   thread_buffer(const thread_buffer &) = delete;
-  thread_buffer(thread_buffer &&) = delete;
+  thread_buffer(thread_buffer &&)      = delete;
   thread_buffer &operator=(const thread_buffer &) = delete;
   thread_buffer &operator=(thread_buffer) = delete;
 
   void resize(const std::size_t num_threads,
               const std::size_t size_per_thread) {
-    m_num_threads = num_threads;
+    m_num_threads     = num_threads;
     m_size_per_thread = size_per_thread;
 
     pad_to_cache_line(m_size_per_thread);
@@ -149,7 +154,7 @@ public:
 
     if (m_size_total < size_total_new) {
       delete[] m_data;
-      m_data = new char[size_total_new];
+      m_data       = new char[size_total_new];
       m_size_total = size_total_new;
     }
   }
@@ -165,23 +170,23 @@ public:
   std::size_t size_per_thread() const noexcept { return m_size_per_thread; }
   std::size_t size_total() const noexcept { return m_size_total; }
 };
-} // namespace Impl
+}  // namespace Impl
 
 namespace Experimental {
 class HPX {
-private:
+ private:
   static bool m_hpx_initialized;
   static Kokkos::Impl::thread_buffer m_buffer;
 #if defined(KOKKOS_ENABLE_HPX_ASYNC_DISPATCH)
   static hpx::future<void> m_future;
 #endif
 
-public:
-  using execution_space = HPX;
-  using memory_space = HostSpace;
-  using device_type = Kokkos::Device<execution_space, memory_space>;
-  using array_layout = LayoutRight;
-  using size_type = memory_space::size_type;
+ public:
+  using execution_space      = HPX;
+  using memory_space         = HostSpace;
+  using device_type          = Kokkos::Device<execution_space, memory_space>;
+  using array_layout         = LayoutRight;
+  using size_type            = memory_space::size_type;
   using scratch_memory_space = ScratchMemorySpace<HPX>;
 
   HPX() noexcept {}
@@ -192,26 +197,20 @@ public:
 
   static bool in_parallel(HPX const & = HPX()) noexcept { return false; }
   static void impl_static_fence(HPX const & = HPX())
-  #if defined(KOKKOS_ENABLE_HPX_ASYNC_DISPATCH)
-    {
-      if (hpx::threads::get_self_ptr() == nullptr) {
-        hpx::threads::run_as_hpx_thread([]() { impl_get_future().wait(); });
-      } else {
-        impl_get_future().wait();
-      }
+#if defined(KOKKOS_ENABLE_HPX_ASYNC_DISPATCH)
+  {
+    if (hpx::threads::get_self_ptr() == nullptr) {
+      hpx::threads::run_as_hpx_thread([]() { impl_get_future().wait(); });
+    } else {
+      impl_get_future().wait();
     }
-  #else
-        noexcept {
-    }
-  #endif
-
-  #ifdef KOKKOS_ENABLE_DEPRECATED_CODE
-  static void fence(HPX const & = HPX()) {
-  #else
-  void fence() const {
-  #endif
-    impl_static_fence();
   }
+#else
+      noexcept {
+  }
+#endif
+
+  void fence() const { impl_static_fence(); }
 
   static bool is_asynchronous(HPX const & = HPX()) noexcept {
 #if defined(KOKKOS_ENABLE_HPX_ASYNC_DISPATCH)
@@ -222,8 +221,9 @@ public:
   }
 
   static std::vector<HPX> partition(...) {
-    Kokkos::abort("Kokkos::Experimental::HPX::partition_master: can't partition an HPX "
-                  "instance\n");
+    Kokkos::abort(
+        "Kokkos::Experimental::HPX::partition_master: can't partition an HPX "
+        "instance\n");
     return std::vector<HPX>();
   }
 
@@ -231,8 +231,9 @@ public:
   static void partition_master(F const &f, int requested_num_partitions = 0,
                                int requested_partition_size = 0) {
     if (requested_num_partitions > 1) {
-      Kokkos::abort("Kokkos::Experimental::HPX::partition_master: can't partition an "
-                    "HPX instance\n");
+      Kokkos::abort(
+          "Kokkos::Experimental::HPX::partition_master: can't partition an "
+          "HPX instance\n");
     }
   }
 
@@ -287,13 +288,14 @@ public:
   static Kokkos::Impl::thread_buffer &impl_get_buffer() noexcept {
     return m_buffer;
   }
+
 #if defined(KOKKOS_ENABLE_HPX_ASYNC_DISPATCH)
   static hpx::future<void> &impl_get_future() noexcept { return m_future; }
 #endif
 
   static constexpr const char *name() noexcept { return "HPX"; }
 };
-} // namespace Experimental
+}  // namespace Experimental
 
 namespace Impl {
 template <typename Closure>
@@ -302,15 +304,15 @@ inline void dispatch_execute_task(Closure *closure) {
   if (hpx::threads::get_self_ptr() == nullptr) {
     hpx::threads::run_as_hpx_thread([closure]() {
       hpx::future<void> &fut = Kokkos::Experimental::HPX::impl_get_future();
-      Closure closure_copy = *closure;
-      fut = fut.then([closure_copy](hpx::future<void> &&) {
+      Closure closure_copy   = *closure;
+      fut                    = fut.then([closure_copy](hpx::future<void> &&) {
         closure_copy.execute_task();
       });
     });
   } else {
     hpx::future<void> &fut = Kokkos::Experimental::HPX::impl_get_future();
-    Closure closure_copy = *closure;
-    fut = fut.then(
+    Closure closure_copy   = *closure;
+    fut                    = fut.then(
         [closure_copy](hpx::future<void> &&) { closure_copy.execute_task(); });
   }
 #else
@@ -321,8 +323,8 @@ inline void dispatch_execute_task(Closure *closure) {
   }
 #endif
 }
-} // namespace Impl
-} // namespace Kokkos
+}  // namespace Impl
+}  // namespace Kokkos
 
 namespace Kokkos {
 namespace Impl {
@@ -342,15 +344,16 @@ struct VerifyExecutionCanAccessMemorySpace<
   inline static void verify(void) {}
   inline static void verify(const void *) {}
 };
-} // namespace Impl
-} // namespace Kokkos
+}  // namespace Impl
+}  // namespace Kokkos
 
 namespace Kokkos {
 namespace Experimental {
-template <> class UniqueToken<HPX, UniqueTokenScope::Instance> {
-public:
+template <>
+class UniqueToken<HPX, UniqueTokenScope::Instance> {
+ public:
   using execution_space = HPX;
-  using size_type = int;
+  using size_type       = int;
   UniqueToken(execution_space const & = execution_space()) noexcept {}
 
   // NOTE: Currently this assumes that there is no oversubscription.
@@ -361,10 +364,11 @@ public:
   void release(int) const noexcept {}
 };
 
-template <> class UniqueToken<HPX, UniqueTokenScope::Global> {
-public:
+template <>
+class UniqueToken<HPX, UniqueTokenScope::Global> {
+ public:
   using execution_space = HPX;
-  using size_type = int;
+  using size_type       = int;
   UniqueToken(execution_space const & = execution_space()) noexcept {}
 
   // NOTE: Currently this assumes that there is no oversubscription.
@@ -374,28 +378,27 @@ public:
   int acquire() const noexcept { return HPX::impl_hardware_thread_id(); }
   void release(int) const noexcept {}
 };
-} // namespace Experimental
-} // namespace Kokkos
+}  // namespace Experimental
+}  // namespace Kokkos
 
 namespace Kokkos {
 namespace Impl {
 
 struct HPXTeamMember {
-public:
+ public:
   using execution_space = Kokkos::Experimental::HPX;
   using scratch_memory_space =
       Kokkos::ScratchMemorySpace<Kokkos::Experimental::HPX>;
 
-private:
+ private:
   scratch_memory_space m_team_shared;
-  std::size_t m_team_shared_size;
 
   int m_league_size;
   int m_league_rank;
   int m_team_size;
   int m_team_rank;
 
-public:
+ public:
   KOKKOS_INLINE_FUNCTION
   const scratch_memory_space &team_shmem() const {
     return m_team_shared.set_team_thread_mode(0, 1, 0);
@@ -423,14 +426,15 @@ public:
   KOKKOS_INLINE_FUNCTION int team_size() const noexcept { return m_team_size; }
 
   template <class... Properties>
-  constexpr KOKKOS_INLINE_FUNCTION
-  HPXTeamMember(const TeamPolicyInternal<Kokkos::Experimental::HPX,
-                                         Properties...> &policy,
-                const int team_rank, const int league_rank, void *scratch,
-                int scratch_size) noexcept
+  constexpr KOKKOS_INLINE_FUNCTION HPXTeamMember(
+      const TeamPolicyInternal<Kokkos::Experimental::HPX, Properties...>
+          &policy,
+      const int team_rank, const int league_rank, void *scratch,
+      int scratch_size) noexcept
       : m_team_shared(scratch, scratch_size, scratch, scratch_size),
-        m_team_shared_size(scratch_size), m_league_size(policy.league_size()),
-        m_league_rank(league_rank), m_team_size(policy.team_size()),
+        m_league_size(policy.league_size()),
+        m_league_rank(league_rank),
+        m_team_size(policy.team_size()),
         m_team_rank(team_rank) {}
 
   KOKKOS_INLINE_FUNCTION
@@ -482,7 +486,7 @@ class TeamPolicyInternal<Kokkos::Experimental::HPX, Properties...>
   std::size_t m_thread_scratch_size[2];
   int m_chunk_size;
 
-public:
+ public:
   using member_type = HPXTeamMember;
 
   // NOTE: Max size is 1 for simplicity. In most cases more than 1 is not
@@ -511,21 +515,35 @@ public:
   int team_size_max(const FunctorType &, const ParallelReduceTag &) const {
     return 1;
   }
+
+  template <class FunctorType, class ReducerType>
+  int team_size_max(const FunctorType &, const ReducerType &,
+                    const ParallelReduceTag &) const {
+    return 1;
+  }
+
   template <class FunctorType>
   int team_size_recommended(const FunctorType &, const ParallelForTag &) const {
     return 1;
   }
+
   template <class FunctorType>
   int team_size_recommended(const FunctorType &,
                             const ParallelReduceTag &) const {
     return 1;
   }
 
-private:
+  template <class FunctorType, class ReducerType>
+  int team_size_recommended(const FunctorType &, const ReducerType &,
+                            const ParallelReduceTag &) const {
+    return 1;
+  }
+
+ private:
   inline void init(const int league_size_request, const int team_size_request) {
-    m_league_size = league_size_request;
-    const int max_team_size = 1; // TODO: Can't use team_size_max(...) because
-                                 // it requires a functor as argument.
+    m_league_size           = league_size_request;
+    const int max_team_size = 1;  // TODO: Can't use team_size_max(...) because
+                                  // it requires a functor as argument.
     m_team_size =
         team_size_request > max_team_size ? max_team_size : team_size_request;
 
@@ -551,7 +569,7 @@ private:
     }
   }
 
-public:
+ public:
   inline int team_size() const { return m_team_size; }
   inline int league_size() const { return m_league_size; }
 
@@ -563,26 +581,32 @@ public:
            team_size_ * m_thread_scratch_size[level];
   }
 
-public:
+  inline static int scratch_size_max(int level) {
+    return (level == 0 ? 1024 * 32 :  // Roughly L1 size
+                20 * 1024 * 1024);    // Limit to keep compatibility with CUDA
+  }
+
+ public:
   template <class ExecSpace, class... OtherProperties>
   friend class TeamPolicyInternal;
 
   template <class... OtherProperties>
-  TeamPolicyInternal(
-      const TeamPolicyInternal<Kokkos::Experimental::HPX, OtherProperties...> &p) {
-    m_league_size = p.m_league_size;
-    m_team_size = p.m_team_size;
-    m_team_scratch_size[0] = p.m_team_scratch_size[0];
+  TeamPolicyInternal(const TeamPolicyInternal<Kokkos::Experimental::HPX,
+                                              OtherProperties...> &p) {
+    m_league_size            = p.m_league_size;
+    m_team_size              = p.m_team_size;
+    m_team_scratch_size[0]   = p.m_team_scratch_size[0];
     m_thread_scratch_size[0] = p.m_thread_scratch_size[0];
-    m_team_scratch_size[1] = p.m_team_scratch_size[1];
+    m_team_scratch_size[1]   = p.m_team_scratch_size[1];
     m_thread_scratch_size[1] = p.m_thread_scratch_size[1];
-    m_chunk_size = p.m_chunk_size;
+    m_chunk_size             = p.m_chunk_size;
   }
 
   TeamPolicyInternal(const typename traits::execution_space &,
                      int league_size_request, int team_size_request,
                      int /* vector_length_request */ = 1)
-      : m_team_scratch_size{0, 0}, m_thread_scratch_size{0, 0},
+      : m_team_scratch_size{0, 0},
+        m_thread_scratch_size{0, 0},
         m_chunk_size(0) {
     init(league_size_request, team_size_request);
   }
@@ -591,14 +615,16 @@ public:
                      int league_size_request,
                      const Kokkos::AUTO_t &team_size_request,
                      int /* vector_length_request */ = 1)
-      : m_team_scratch_size{0, 0}, m_thread_scratch_size{0, 0},
+      : m_team_scratch_size{0, 0},
+        m_thread_scratch_size{0, 0},
         m_chunk_size(0) {
     init(league_size_request, 1);
   }
 
   TeamPolicyInternal(int league_size_request, int team_size_request,
                      int /* vector_length_request */ = 1)
-      : m_team_scratch_size{0, 0}, m_thread_scratch_size{0, 0},
+      : m_team_scratch_size{0, 0},
+        m_thread_scratch_size{0, 0},
         m_chunk_size(0) {
     init(league_size_request, team_size_request);
   }
@@ -606,15 +632,16 @@ public:
   TeamPolicyInternal(int league_size_request,
                      const Kokkos::AUTO_t &team_size_request,
                      int /* vector_length_request */ = 1)
-      : m_team_scratch_size{0, 0}, m_thread_scratch_size{0, 0},
+      : m_team_scratch_size{0, 0},
+        m_thread_scratch_size{0, 0},
         m_chunk_size(0) {
     init(league_size_request, 1);
   }
 
   inline int chunk_size() const { return m_chunk_size; }
 
-  inline TeamPolicyInternal &
-  set_chunk_size(typename traits::index_type chunk_size_) {
+  inline TeamPolicyInternal &set_chunk_size(
+      typename traits::index_type chunk_size_) {
     m_chunk_size = chunk_size_;
     return *this;
   }
@@ -625,22 +652,22 @@ public:
     return *this;
   }
 
-  inline TeamPolicyInternal &
-  set_scratch_size(const int &level, const PerThreadValue &per_thread) {
+  inline TeamPolicyInternal &set_scratch_size(
+      const int &level, const PerThreadValue &per_thread) {
     m_thread_scratch_size[level] = per_thread.value;
     return *this;
   }
 
-  inline TeamPolicyInternal &
-  set_scratch_size(const int &level, const PerTeamValue &per_team,
-                   const PerThreadValue &per_thread) {
-    m_team_scratch_size[level] = per_team.value;
+  inline TeamPolicyInternal &set_scratch_size(
+      const int &level, const PerTeamValue &per_team,
+      const PerThreadValue &per_thread) {
+    m_team_scratch_size[level]   = per_team.value;
     m_thread_scratch_size[level] = per_thread.value;
     return *this;
   }
 };
-} // namespace Impl
-} // namespace Kokkos
+}  // namespace Impl
+}  // namespace Kokkos
 
 namespace Kokkos {
 namespace Impl {
@@ -648,11 +675,11 @@ namespace Impl {
 template <class FunctorType, class... Traits>
 class ParallelFor<FunctorType, Kokkos::RangePolicy<Traits...>,
                   Kokkos::Experimental::HPX> {
-private:
-  using Policy = Kokkos::RangePolicy<Traits...>;
-  using WorkTag = typename Policy::work_tag;
+ private:
+  using Policy    = Kokkos::RangePolicy<Traits...>;
+  using WorkTag   = typename Policy::work_tag;
   using WorkRange = typename Policy::WorkRange;
-  using Member = typename Policy::member_type;
+  using Member    = typename Policy::member_type;
 
   const FunctorType m_functor;
   const Policy m_policy;
@@ -689,7 +716,7 @@ private:
     }
   }
 
-public:
+ public:
   void execute() const { Kokkos::Impl::dispatch_execute_task(this); }
 
   void execute_task() const {
@@ -705,25 +732,44 @@ public:
 
 #elif KOKKOS_HPX_IMPLEMENTATION == 1
     using hpx::apply;
-    using hpx::lcos::local::counting_semaphore;
+    using hpx::lcos::local::latch;
 
-    counting_semaphore sem(0);
-    std::size_t num_tasks = 0;
+    const int num_tasks =
+        (m_policy.end() - m_policy.begin() + m_policy.chunk_size() - 1) /
+        m_policy.chunk_size();
+    latch num_tasks_remaining(num_tasks);
+    ChunkedRoundRobinExecutor exec(num_tasks);
 
     for (Member i_begin = m_policy.begin(); i_begin < m_policy.end();
          i_begin += m_policy.chunk_size()) {
-      apply([this, &sem, i_begin]() {
+      apply(exec, [this, &num_tasks_remaining, i_begin]() {
         const Member i_end =
             (std::min)(i_begin + m_policy.chunk_size(), m_policy.end());
         execute_functor_range<WorkTag>(m_functor, i_begin, i_end);
 
-        sem.signal(1);
+        num_tasks_remaining.count_down(1);
       });
-
-      ++num_tasks;
     }
 
-    sem.wait(num_tasks);
+    num_tasks_remaining.wait();
+
+#elif KOKKOS_HPX_IMPLEMENTATION == 2
+    using hpx::parallel::for_loop_strided;
+    using hpx::parallel::execution::par;
+    using hpx::parallel::execution::static_chunk_size;
+
+    const int num_tasks =
+        (m_policy.end() - m_policy.begin() + m_policy.chunk_size() - 1) /
+        m_policy.chunk_size();
+    ChunkedRoundRobinExecutor exec(num_tasks);
+
+    for_loop_strided(
+        par.on(exec).with(static_chunk_size(1)), m_policy.begin(),
+        m_policy.end(), m_policy.chunk_size(), [this](const Member i_begin) {
+          const Member i_end =
+              (std::min)(i_begin + m_policy.chunk_size(), m_policy.end());
+          execute_functor_range<WorkTag>(m_functor, i_begin, i_end);
+        });
 #endif
   }
 
@@ -734,12 +780,12 @@ public:
 template <class FunctorType, class... Traits>
 class ParallelFor<FunctorType, Kokkos::MDRangePolicy<Traits...>,
                   Kokkos::Experimental::HPX> {
-private:
+ private:
   using MDRangePolicy = Kokkos::MDRangePolicy<Traits...>;
-  using Policy = typename MDRangePolicy::impl_range_policy;
-  using WorkTag = typename MDRangePolicy::work_tag;
-  using WorkRange = typename Policy::WorkRange;
-  using Member = typename Policy::member_type;
+  using Policy        = typename MDRangePolicy::impl_range_policy;
+  using WorkTag       = typename MDRangePolicy::work_tag;
+  using WorkRange     = typename Policy::WorkRange;
+  using Member        = typename Policy::member_type;
   using iterate_type =
       typename Kokkos::Impl::HostIterateTile<MDRangePolicy, FunctorType,
                                              WorkTag, void>;
@@ -748,7 +794,7 @@ private:
   const MDRangePolicy m_mdr_policy;
   const Policy m_policy;
 
-public:
+ public:
   void execute() const { dispatch_execute_task(this); }
 
   inline void execute_task() const {
@@ -764,47 +810,69 @@ public:
 
 #elif KOKKOS_HPX_IMPLEMENTATION == 1
     using hpx::apply;
-    using hpx::lcos::local::counting_semaphore;
+    using hpx::lcos::local::latch;
 
-    counting_semaphore sem(0);
-    std::size_t num_tasks = 0;
+    const int num_tasks =
+        (m_policy.end() - m_policy.begin() + m_policy.chunk_size() - 1) /
+        m_policy.chunk_size();
+    latch num_tasks_remaining(num_tasks);
+    ChunkedRoundRobinExecutor exec(num_tasks);
 
     for (Member i_begin = m_policy.begin(); i_begin < m_policy.end();
          i_begin += m_policy.chunk_size()) {
-      apply([this, &sem, i_begin]() {
+      apply(exec, [this, &num_tasks_remaining, i_begin]() {
         const Member i_end =
             (std::min)(i_begin + m_policy.chunk_size(), m_policy.end());
         for (Member i = i_begin; i < i_end; ++i) {
           iterate_type(m_mdr_policy, m_functor)(i);
         }
 
-        sem.signal(1);
+        num_tasks_remaining.count_down(1);
       });
-
-      ++num_tasks;
     }
 
-    sem.wait(num_tasks);
+    num_tasks_remaining.wait();
+
+#elif KOKKOS_HPX_IMPLEMENTATION == 2
+    using hpx::parallel::for_loop_strided;
+    using hpx::parallel::execution::par;
+    using hpx::parallel::execution::static_chunk_size;
+
+    const int num_tasks =
+        (m_policy.end() - m_policy.begin() + m_policy.chunk_size() - 1) /
+        m_policy.chunk_size();
+    ChunkedRoundRobinExecutor exec(num_tasks);
+
+    for_loop_strided(
+        par.on(exec).with(static_chunk_size(1)), m_policy.begin(),
+        m_policy.end(), m_policy.chunk_size(), [this](const Member i_begin) {
+          const Member i_end =
+              (std::min)(i_begin + m_policy.chunk_size(), m_policy.end());
+          for (Member i = i_begin; i < i_end; ++i) {
+            iterate_type(m_mdr_policy, m_functor)(i);
+          }
+        });
 #endif
   }
 
   inline ParallelFor(const FunctorType &arg_functor, MDRangePolicy arg_policy)
-      : m_functor(arg_functor), m_mdr_policy(arg_policy),
+      : m_functor(arg_functor),
+        m_mdr_policy(arg_policy),
         m_policy(Policy(0, m_mdr_policy.m_num_tiles).set_chunk_size(1)) {}
 };
-} // namespace Impl
-} // namespace Kokkos
+}  // namespace Impl
+}  // namespace Kokkos
 
 namespace Kokkos {
 namespace Impl {
 template <class FunctorType, class ReducerType, class... Traits>
 class ParallelReduce<FunctorType, Kokkos::RangePolicy<Traits...>, ReducerType,
                      Kokkos::Experimental::HPX> {
-private:
-  using Policy = Kokkos::RangePolicy<Traits...>;
-  using WorkTag = typename Policy::work_tag;
+ private:
+  using Policy    = Kokkos::RangePolicy<Traits...>;
+  using WorkTag   = typename Policy::work_tag;
   using WorkRange = typename Policy::WorkRange;
-  using Member = typename Policy::member_type;
+  using Member    = typename Policy::member_type;
   using Analysis =
       FunctorAnalysis<FunctorPatternInterface::REDUCE, Policy, FunctorType>;
   using ReducerConditional =
@@ -814,11 +882,11 @@ private:
   using WorkTagFwd =
       typename Kokkos::Impl::if_c<std::is_same<InvalidType, ReducerType>::value,
                                   WorkTag, void>::type;
-  using ValueInit = Kokkos::Impl::FunctorValueInit<ReducerTypeFwd, WorkTagFwd>;
-  using ValueJoin = Kokkos::Impl::FunctorValueJoin<ReducerTypeFwd, WorkTagFwd>;
-  using ValueOps = Kokkos::Impl::FunctorValueOps<ReducerTypeFwd, WorkTagFwd>;
+  using ValueInit  = Kokkos::Impl::FunctorValueInit<ReducerTypeFwd, WorkTagFwd>;
+  using ValueJoin  = Kokkos::Impl::FunctorValueJoin<ReducerTypeFwd, WorkTagFwd>;
+  using ValueOps   = Kokkos::Impl::FunctorValueOps<ReducerTypeFwd, WorkTagFwd>;
   using value_type = typename Analysis::value_type;
-  using pointer_type = typename Analysis::pointer_type;
+  using pointer_type   = typename Analysis::pointer_type;
   using reference_type = typename Analysis::reference_type;
 
   const FunctorType m_functor;
@@ -866,11 +934,11 @@ private:
   }
 
   class value_type_wrapper {
-  private:
+   private:
     std::size_t m_value_size;
     char *m_value_buffer;
 
-  public:
+   public:
     value_type_wrapper() : m_value_size(0), m_value_buffer(nullptr) {}
 
     value_type_wrapper(const std::size_t value_size)
@@ -880,7 +948,7 @@ private:
         : m_value_size(0), m_value_buffer(nullptr) {
       if (this != &other) {
         m_value_buffer = new char[other.m_value_size];
-        m_value_size = other.m_value_size;
+        m_value_size   = other.m_value_size;
 
         std::copy(other.m_value_buffer, other.m_value_buffer + m_value_size,
                   m_value_buffer);
@@ -893,10 +961,10 @@ private:
         : m_value_size(0), m_value_buffer(nullptr) {
       if (this != &other) {
         m_value_buffer = other.m_value_buffer;
-        m_value_size = other.m_value_size;
+        m_value_size   = other.m_value_size;
 
         other.m_value_buffer = nullptr;
-        other.m_value_size = 0;
+        other.m_value_size   = 0;
       }
     }
 
@@ -904,7 +972,7 @@ private:
       if (this != &other) {
         delete[] m_value_buffer;
         m_value_buffer = new char[other.m_value_size];
-        m_value_size = other.m_value_size;
+        m_value_size   = other.m_value_size;
 
         std::copy(other.m_value_buffer, other.m_value_buffer + m_value_size,
                   m_value_buffer);
@@ -917,10 +985,10 @@ private:
       if (this != &other) {
         delete[] m_value_buffer;
         m_value_buffer = other.m_value_buffer;
-        m_value_size = other.m_value_size;
+        m_value_size   = other.m_value_size;
 
         other.m_value_buffer = nullptr;
-        other.m_value_size = 0;
+        other.m_value_size   = 0;
       }
 
       return *this;
@@ -936,26 +1004,21 @@ private:
     }
   };
 
-public:
-  void execute() const {
-    dispatch_execute_task(this);
-  }
+ public:
+  void execute() const { dispatch_execute_task(this); }
 
   inline void execute_task() const {
-    const int num_worker_threads = Kokkos::Experimental::HPX::concurrency();
-
-    std::size_t value_size =
+    const std::size_t value_size =
         Analysis::value_size(ReducerConditional::select(m_functor, m_reducer));
 
-    using hpx::parallel::for_loop;
-    using hpx::parallel::execution::par;
-
 #if KOKKOS_HPX_IMPLEMENTATION == 0
     // NOTE: This version makes the most use of HPX functionality, but
     // requires the struct value_type_wrapper to handle different
     // reference_types. It is also significantly slower than the version
     // below due to not reusing the buffer used by other functions.
+    using hpx::parallel::for_loop;
     using hpx::parallel::reduction;
+    using hpx::parallel::execution::par;
     using hpx::parallel::execution::static_chunk_size;
 
     value_type_wrapper final_value(value_size);
@@ -983,37 +1046,99 @@ public:
     pointer_type final_value_ptr = final_value.pointer();
 
 #elif KOKKOS_HPX_IMPLEMENTATION == 1
+    const int num_worker_threads = Kokkos::Experimental::HPX::concurrency();
+
     thread_buffer &buffer = Kokkos::Experimental::HPX::impl_get_buffer();
     buffer.resize(num_worker_threads, value_size);
 
-    for_loop(par, 0, num_worker_threads, [this, &buffer](std::size_t t) {
-      ValueInit::init(ReducerConditional::select(m_functor, m_reducer),
-                      reinterpret_cast<pointer_type>(buffer.get(t)));
-    });
-
     using hpx::apply;
-    using hpx::lcos::local::counting_semaphore;
+    using hpx::lcos::local::latch;
 
-    counting_semaphore sem(0);
-    std::size_t num_tasks = 0;
+    {
+      latch num_tasks_remaining(num_worker_threads);
+      ChunkedRoundRobinExecutor exec(num_worker_threads);
+
+      for (int t = 0; t < num_worker_threads; ++t) {
+        apply(exec, [this, &num_tasks_remaining, &buffer, t]() {
+          ValueInit::init(ReducerConditional::select(m_functor, m_reducer),
+                          reinterpret_cast<pointer_type>(buffer.get(t)));
+
+          num_tasks_remaining.count_down(1);
+        });
+      }
+
+      num_tasks_remaining.wait();
+    }
+
+    const int num_tasks =
+        (m_policy.end() - m_policy.begin() + m_policy.chunk_size() - 1) /
+        m_policy.chunk_size();
+    latch num_tasks_remaining(num_tasks);
+    ChunkedRoundRobinExecutor exec(num_tasks);
 
     for (Member i_begin = m_policy.begin(); i_begin < m_policy.end();
          i_begin += m_policy.chunk_size()) {
-      apply([this, &buffer, &sem, i_begin]() {
+      apply(exec, [this, &num_tasks_remaining, &buffer, i_begin]() {
         reference_type update =
-            ValueOps::reference(reinterpret_cast<pointer_type>(
-                buffer.get(Kokkos::Experimental::HPX::impl_hardware_thread_id())));
+            ValueOps::reference(reinterpret_cast<pointer_type>(buffer.get(
+                Kokkos::Experimental::HPX::impl_hardware_thread_id())));
         const Member i_end =
             (std::min)(i_begin + m_policy.chunk_size(), m_policy.end());
         execute_functor_range<WorkTag>(update, i_begin, i_end);
 
-        sem.signal(1);
+        num_tasks_remaining.count_down(1);
       });
-
-      ++num_tasks;
     }
 
-    sem.wait(num_tasks);
+    num_tasks_remaining.wait();
+
+    for (int i = 1; i < num_worker_threads; ++i) {
+      ValueJoin::join(ReducerConditional::select(m_functor, m_reducer),
+                      reinterpret_cast<pointer_type>(buffer.get(0)),
+                      reinterpret_cast<pointer_type>(buffer.get(i)));
+    }
+
+    pointer_type final_value_ptr =
+        reinterpret_cast<pointer_type>(buffer.get(0));
+
+#elif KOKKOS_HPX_IMPLEMENTATION == 2
+    const int num_worker_threads = Kokkos::Experimental::HPX::concurrency();
+
+    thread_buffer &buffer = Kokkos::Experimental::HPX::impl_get_buffer();
+    buffer.resize(num_worker_threads, value_size);
+
+    using hpx::parallel::for_loop;
+    using hpx::parallel::for_loop_strided;
+    using hpx::parallel::execution::par;
+    using hpx::parallel::execution::static_chunk_size;
+
+    {
+      ChunkedRoundRobinExecutor exec(num_worker_threads);
+
+      for_loop(par.on(exec).with(static_chunk_size(1)), std::size_t(0),
+               num_worker_threads, [this, &buffer](const std::size_t t) {
+                 ValueInit::init(
+                     ReducerConditional::select(m_functor, m_reducer),
+                     reinterpret_cast<pointer_type>(buffer.get(t)));
+               });
+    }
+
+    const int num_tasks =
+        (m_policy.end() - m_policy.begin() + m_policy.chunk_size() - 1) /
+        m_policy.chunk_size();
+    ChunkedRoundRobinExecutor exec(num_tasks);
+
+    for_loop_strided(
+        par.on(exec).with(static_chunk_size(1)), m_policy.begin(),
+        m_policy.end(), m_policy.chunk_size(),
+        [this, &buffer](const Member i_begin) {
+          reference_type update =
+              ValueOps::reference(reinterpret_cast<pointer_type>(buffer.get(
+                  Kokkos::Experimental::HPX::impl_hardware_thread_id())));
+          const Member i_end =
+              (std::min)(i_begin + m_policy.chunk_size(), m_policy.end());
+          execute_functor_range<WorkTag>(update, i_begin, i_end);
+        });
 
     for (int i = 1; i < num_worker_threads; ++i) {
       ValueJoin::join(ReducerConditional::select(m_functor, m_reducer),
@@ -1045,13 +1170,17 @@ public:
       typename std::enable_if<Kokkos::is_view<ViewType>::value &&
                                   !Kokkos::is_reducer_type<ReducerType>::value,
                               void *>::type = NULL)
-      : m_functor(arg_functor), m_policy(arg_policy), m_reducer(InvalidType()),
+      : m_functor(arg_functor),
+        m_policy(arg_policy),
+        m_reducer(InvalidType()),
         m_result_ptr(arg_view.data()),
         m_force_synchronous(!arg_view.impl_track().has_record()) {}
 
   inline ParallelReduce(const FunctorType &arg_functor, Policy arg_policy,
                         const ReducerType &reducer)
-      : m_functor(arg_functor), m_policy(arg_policy), m_reducer(reducer),
+      : m_functor(arg_functor),
+        m_policy(arg_policy),
+        m_reducer(reducer),
         m_result_ptr(reducer.view().data()),
         m_force_synchronous(!reducer.view().impl_track().has_record()) {}
 };
@@ -1059,13 +1188,13 @@ public:
 template <class FunctorType, class ReducerType, class... Traits>
 class ParallelReduce<FunctorType, Kokkos::MDRangePolicy<Traits...>, ReducerType,
                      Kokkos::Experimental::HPX> {
-private:
+ private:
   using MDRangePolicy = Kokkos::MDRangePolicy<Traits...>;
-  using Policy = typename MDRangePolicy::impl_range_policy;
-  using WorkTag = typename MDRangePolicy::work_tag;
-  using WorkRange = typename Policy::WorkRange;
-  using Member = typename Policy::member_type;
-  using Analysis = FunctorAnalysis<FunctorPatternInterface::REDUCE,
+  using Policy        = typename MDRangePolicy::impl_range_policy;
+  using WorkTag       = typename MDRangePolicy::work_tag;
+  using WorkRange     = typename Policy::WorkRange;
+  using Member        = typename Policy::member_type;
+  using Analysis      = FunctorAnalysis<FunctorPatternInterface::REDUCE,
                                    MDRangePolicy, FunctorType>;
   using ReducerConditional =
       Kokkos::Impl::if_c<std::is_same<InvalidType, ReducerType>::value,
@@ -1076,9 +1205,9 @@ private:
                                   WorkTag, void>::type;
   using ValueInit = Kokkos::Impl::FunctorValueInit<ReducerTypeFwd, WorkTagFwd>;
   using ValueJoin = Kokkos::Impl::FunctorValueJoin<ReducerTypeFwd, WorkTagFwd>;
-  using ValueOps = Kokkos::Impl::FunctorValueOps<ReducerTypeFwd, WorkTagFwd>;
-  using pointer_type = typename Analysis::pointer_type;
-  using value_type = typename Analysis::value_type;
+  using ValueOps  = Kokkos::Impl::FunctorValueOps<ReducerTypeFwd, WorkTagFwd>;
+  using pointer_type   = typename Analysis::pointer_type;
+  using value_type     = typename Analysis::value_type;
   using reference_type = typename Analysis::reference_type;
   using iterate_type =
       typename Kokkos::Impl::HostIterateTile<MDRangePolicy, FunctorType,
@@ -1092,10 +1221,8 @@ private:
 
   bool m_force_synchronous;
 
-public:
-  void execute() const {
-    dispatch_execute_task(this);
-  }
+ public:
+  void execute() const { dispatch_execute_task(this); }
 
   inline void execute_task() const {
     const int num_worker_threads = Kokkos::Experimental::HPX::concurrency();
@@ -1105,17 +1232,16 @@ public:
     thread_buffer &buffer = Kokkos::Experimental::HPX::impl_get_buffer();
     buffer.resize(num_worker_threads, value_size);
 
+#if KOKKOS_HPX_IMPLEMENTATION == 0
     using hpx::parallel::for_loop;
     using hpx::parallel::execution::par;
+    using hpx::parallel::execution::static_chunk_size;
 
     for_loop(par, 0, num_worker_threads, [this, &buffer](std::size_t t) {
       ValueInit::init(ReducerConditional::select(m_functor, m_reducer),
                       reinterpret_cast<pointer_type>(buffer.get(t)));
     });
 
-#if KOKKOS_HPX_IMPLEMENTATION == 0
-    using hpx::parallel::execution::static_chunk_size;
-
     for_loop(par.with(static_chunk_size(m_policy.chunk_size())),
              m_policy.begin(), m_policy.end(), [this, &buffer](const Member i) {
                reference_type update = ValueOps::reference(
@@ -1126,17 +1252,36 @@ public:
 
 #elif KOKKOS_HPX_IMPLEMENTATION == 1
     using hpx::apply;
-    using hpx::lcos::local::counting_semaphore;
+    using hpx::lcos::local::latch;
 
-    counting_semaphore sem(0);
-    std::size_t num_tasks = 0;
+    {
+      latch num_tasks_remaining(num_worker_threads);
+      ChunkedRoundRobinExecutor exec(num_worker_threads);
+
+      for (int t = 0; t < num_worker_threads; ++t) {
+        apply(exec, [this, &buffer, &num_tasks_remaining, t]() {
+          ValueInit::init(ReducerConditional::select(m_functor, m_reducer),
+                          reinterpret_cast<pointer_type>(buffer.get(t)));
+
+          num_tasks_remaining.count_down(1);
+        });
+      }
+
+      num_tasks_remaining.wait();
+    }
+
+    const int num_tasks =
+        (m_policy.end() - m_policy.begin() + m_policy.chunk_size() - 1) /
+        m_policy.chunk_size();
+    latch num_tasks_remaining(num_tasks);
+    ChunkedRoundRobinExecutor exec(num_tasks);
 
     for (Member i_begin = m_policy.begin(); i_begin < m_policy.end();
          i_begin += m_policy.chunk_size()) {
-      apply([this, &buffer, &sem, i_begin]() {
+      apply(exec, [this, &num_tasks_remaining, &buffer, i_begin]() {
         reference_type update =
-            ValueOps::reference(reinterpret_cast<pointer_type>(
-                buffer.get(Kokkos::Experimental::HPX::impl_hardware_thread_id())));
+            ValueOps::reference(reinterpret_cast<pointer_type>(buffer.get(
+                Kokkos::Experimental::HPX::impl_hardware_thread_id())));
         const Member i_end =
             (std::min)(i_begin + m_policy.chunk_size(), m_policy.end());
 
@@ -1144,13 +1289,48 @@ public:
           iterate_type(m_mdr_policy, m_functor, update)(i);
         }
 
-        sem.signal(1);
+        num_tasks_remaining.count_down(1);
       });
-
-      ++num_tasks;
     }
 
-    sem.wait(num_tasks);
+    num_tasks_remaining.wait();
+
+#elif KOKKOS_HPX_IMPLEMENTATION == 2
+    using hpx::parallel::for_loop;
+    using hpx::parallel::for_loop_strided;
+    using hpx::parallel::execution::par;
+    using hpx::parallel::execution::static_chunk_size;
+
+    {
+      ChunkedRoundRobinExecutor exec(num_worker_threads);
+
+      for_loop(par.on(exec).with(static_chunk_size(1)), std::size_t(0),
+               num_worker_threads, [this, &buffer](const std::size_t t) {
+                 ValueInit::init(
+                     ReducerConditional::select(m_functor, m_reducer),
+                     reinterpret_cast<pointer_type>(buffer.get(t)));
+               });
+    }
+
+    const int num_tasks =
+        (m_policy.end() - m_policy.begin() + m_policy.chunk_size() - 1) /
+        m_policy.chunk_size();
+    ChunkedRoundRobinExecutor exec(num_tasks);
+
+    for_loop_strided(
+        par.on(exec).with(static_chunk_size(1)), m_policy.begin(),
+        m_policy.end(), m_policy.chunk_size(),
+        [this, &buffer](const Member i_begin) {
+          reference_type update =
+              ValueOps::reference(reinterpret_cast<pointer_type>(buffer.get(
+                  Kokkos::Experimental::HPX::impl_hardware_thread_id())));
+          const Member i_end =
+              (std::min)(i_begin + m_policy.chunk_size(), m_policy.end());
+
+          for (Member i = i_begin; i < i_end; ++i) {
+            iterate_type(m_mdr_policy, m_functor, update)(i);
+          }
+        });
 #endif
 
     for (int i = 1; i < num_worker_threads; ++i) {
@@ -1180,20 +1360,24 @@ public:
       typename std::enable_if<Kokkos::is_view<ViewType>::value &&
                                   !Kokkos::is_reducer_type<ReducerType>::value,
                               void *>::type = NULL)
-      : m_functor(arg_functor), m_mdr_policy(arg_policy),
+      : m_functor(arg_functor),
+        m_mdr_policy(arg_policy),
         m_policy(Policy(0, m_mdr_policy.m_num_tiles).set_chunk_size(1)),
-        m_reducer(InvalidType()), m_result_ptr(arg_view.data()),
+        m_reducer(InvalidType()),
+        m_result_ptr(arg_view.data()),
         m_force_synchronous(!arg_view.impl_track().has_record()) {}
 
   inline ParallelReduce(const FunctorType &arg_functor,
                         MDRangePolicy arg_policy, const ReducerType &reducer)
-      : m_functor(arg_functor), m_mdr_policy(arg_policy),
+      : m_functor(arg_functor),
+        m_mdr_policy(arg_policy),
         m_policy(Policy(0, m_mdr_policy.m_num_tiles).set_chunk_size(1)),
-        m_reducer(reducer), m_result_ptr(reducer.view().data()),
+        m_reducer(reducer),
+        m_result_ptr(reducer.view().data()),
         m_force_synchronous(!reducer.view().impl_track().has_record()) {}
 };
-} // namespace Impl
-} // namespace Kokkos
+}  // namespace Impl
+}  // namespace Kokkos
 
 namespace Kokkos {
 namespace Impl {
@@ -1201,19 +1385,19 @@ namespace Impl {
 template <class FunctorType, class... Traits>
 class ParallelScan<FunctorType, Kokkos::RangePolicy<Traits...>,
                    Kokkos::Experimental::HPX> {
-private:
-  using Policy = Kokkos::RangePolicy<Traits...>;
-  using WorkTag = typename Policy::work_tag;
+ private:
+  using Policy    = Kokkos::RangePolicy<Traits...>;
+  using WorkTag   = typename Policy::work_tag;
   using WorkRange = typename Policy::WorkRange;
-  using Member = typename Policy::member_type;
+  using Member    = typename Policy::member_type;
   using Analysis =
       FunctorAnalysis<FunctorPatternInterface::SCAN, Policy, FunctorType>;
-  using ValueInit = Kokkos::Impl::FunctorValueInit<FunctorType, WorkTag>;
-  using ValueJoin = Kokkos::Impl::FunctorValueJoin<FunctorType, WorkTag>;
-  using ValueOps = Kokkos::Impl::FunctorValueOps<FunctorType, WorkTag>;
-  using pointer_type = typename Analysis::pointer_type;
+  using ValueInit      = Kokkos::Impl::FunctorValueInit<FunctorType, WorkTag>;
+  using ValueJoin      = Kokkos::Impl::FunctorValueJoin<FunctorType, WorkTag>;
+  using ValueOps       = Kokkos::Impl::FunctorValueOps<FunctorType, WorkTag>;
+  using pointer_type   = typename Analysis::pointer_type;
   using reference_type = typename Analysis::reference_type;
-  using value_type = typename Analysis::value_type;
+  using value_type     = typename Analysis::value_type;
 
   const FunctorType m_functor;
   const Policy m_policy;
@@ -1241,64 +1425,70 @@ private:
     }
   }
 
-public:
+ public:
   void execute() const { dispatch_execute_task(this); }
 
   inline void execute_task() const {
     const int num_worker_threads = Kokkos::Experimental::HPX::concurrency();
-    const int value_count = Analysis::value_count(m_functor);
+    const int value_count        = Analysis::value_count(m_functor);
     const std::size_t value_size = Analysis::value_size(m_functor);
 
     thread_buffer &buffer = Kokkos::Experimental::HPX::impl_get_buffer();
     buffer.resize(num_worker_threads, 2 * value_size);
 
+    using hpx::apply;
     using hpx::lcos::local::barrier;
-    using hpx::parallel::for_loop;
-    using hpx::parallel::execution::par;
-    using hpx::parallel::execution::static_chunk_size;
+    using hpx::lcos::local::latch;
 
     barrier bar(num_worker_threads);
+    latch num_tasks_remaining(num_worker_threads);
+    ChunkedRoundRobinExecutor exec(num_worker_threads);
 
-    for_loop(par.with(static_chunk_size(1)), 0, num_worker_threads,
-             [this, &buffer, &bar, num_worker_threads, value_count,
-              value_size](std::size_t const t) {
-               reference_type update_sum = ValueInit::init(
-                   m_functor, reinterpret_cast<pointer_type>(buffer.get(t)));
+    for (int t = 0; t < num_worker_threads; ++t) {
+      apply(exec, [this, &bar, &buffer, &num_tasks_remaining,
+                   num_worker_threads, value_count, value_size, t]() {
+        reference_type update_sum = ValueInit::init(
+            m_functor, reinterpret_cast<pointer_type>(buffer.get(t)));
 
-               const WorkRange range(m_policy, t, num_worker_threads);
-               execute_functor_range<WorkTag>(m_functor, range.begin(),
-                                              range.end(), update_sum, false);
+        const WorkRange range(m_policy, t, num_worker_threads);
+        execute_functor_range<WorkTag>(m_functor, range.begin(), range.end(),
+                                       update_sum, false);
 
-               bar.wait();
+        bar.wait();
 
-               if (t == 0) {
-                 ValueInit::init(m_functor, reinterpret_cast<pointer_type>(
-                                                buffer.get(0) + value_size));
+        if (t == 0) {
+          ValueInit::init(m_functor, reinterpret_cast<pointer_type>(
+                                         buffer.get(0) + value_size));
 
-                 for (int i = 1; i < num_worker_threads; ++i) {
-                   pointer_type ptr_1_prev =
-                       reinterpret_cast<pointer_type>(buffer.get(i - 1));
-                   pointer_type ptr_2_prev = reinterpret_cast<pointer_type>(
-                       buffer.get(i - 1) + value_size);
-                   pointer_type ptr_2 = reinterpret_cast<pointer_type>(
-                       buffer.get(i) + value_size);
+          for (int i = 1; i < num_worker_threads; ++i) {
+            pointer_type ptr_1_prev =
+                reinterpret_cast<pointer_type>(buffer.get(i - 1));
+            pointer_type ptr_2_prev =
+                reinterpret_cast<pointer_type>(buffer.get(i - 1) + value_size);
+            pointer_type ptr_2 =
+                reinterpret_cast<pointer_type>(buffer.get(i) + value_size);
 
-                   for (int j = 0; j < value_count; ++j) {
-                     ptr_2[j] = ptr_2_prev[j];
-                   }
+            for (int j = 0; j < value_count; ++j) {
+              ptr_2[j] = ptr_2_prev[j];
+            }
 
-                   ValueJoin::join(m_functor, ptr_2, ptr_1_prev);
-                 }
-               }
+            ValueJoin::join(m_functor, ptr_2, ptr_1_prev);
+          }
+        }
 
-               bar.wait();
+        bar.wait();
 
-               reference_type update_base = ValueOps::reference(
-                   reinterpret_cast<pointer_type>(buffer.get(t) + value_size));
+        reference_type update_base = ValueOps::reference(
+            reinterpret_cast<pointer_type>(buffer.get(t) + value_size));
 
-               execute_functor_range<WorkTag>(m_functor, range.begin(),
-                                              range.end(), update_base, true);
-             });
+        execute_functor_range<WorkTag>(m_functor, range.begin(), range.end(),
+                                       update_base, true);
+
+        num_tasks_remaining.count_down(1);
+      });
+    }
+
+    num_tasks_remaining.wait();
   }
 
   inline ParallelScan(const FunctorType &arg_functor, const Policy &arg_policy)
@@ -1308,19 +1498,19 @@ public:
 template <class FunctorType, class ReturnType, class... Traits>
 class ParallelScanWithTotal<FunctorType, Kokkos::RangePolicy<Traits...>,
                             ReturnType, Kokkos::Experimental::HPX> {
-private:
-  using Policy = Kokkos::RangePolicy<Traits...>;
-  using WorkTag = typename Policy::work_tag;
+ private:
+  using Policy    = Kokkos::RangePolicy<Traits...>;
+  using WorkTag   = typename Policy::work_tag;
   using WorkRange = typename Policy::WorkRange;
-  using Member = typename Policy::member_type;
+  using Member    = typename Policy::member_type;
   using Analysis =
       FunctorAnalysis<FunctorPatternInterface::SCAN, Policy, FunctorType>;
-  using ValueInit = Kokkos::Impl::FunctorValueInit<FunctorType, WorkTag>;
-  using ValueJoin = Kokkos::Impl::FunctorValueJoin<FunctorType, WorkTag>;
-  using ValueOps = Kokkos::Impl::FunctorValueOps<FunctorType, WorkTag>;
-  using pointer_type = typename Analysis::pointer_type;
+  using ValueInit      = Kokkos::Impl::FunctorValueInit<FunctorType, WorkTag>;
+  using ValueJoin      = Kokkos::Impl::FunctorValueJoin<FunctorType, WorkTag>;
+  using ValueOps       = Kokkos::Impl::FunctorValueOps<FunctorType, WorkTag>;
+  using pointer_type   = typename Analysis::pointer_type;
   using reference_type = typename Analysis::reference_type;
-  using value_type = typename Analysis::value_type;
+  using value_type     = typename Analysis::value_type;
 
   const FunctorType m_functor;
   const Policy m_policy;
@@ -1349,88 +1539,95 @@ private:
     }
   }
 
-public:
+ public:
   void execute() const { dispatch_execute_task(this); }
 
   inline void execute_task() const {
     const int num_worker_threads = Kokkos::Experimental::HPX::concurrency();
-    const int value_count = Analysis::value_count(m_functor);
+    const int value_count        = Analysis::value_count(m_functor);
     const std::size_t value_size = Analysis::value_size(m_functor);
 
     thread_buffer &buffer = Kokkos::Experimental::HPX::impl_get_buffer();
     buffer.resize(num_worker_threads, 2 * value_size);
 
+    using hpx::apply;
     using hpx::lcos::local::barrier;
-    using hpx::parallel::for_loop;
-    using hpx::parallel::execution::par;
-    using hpx::parallel::execution::static_chunk_size;
+    using hpx::lcos::local::latch;
 
     barrier bar(num_worker_threads);
+    latch num_tasks_remaining(num_worker_threads);
+    ChunkedRoundRobinExecutor exec(num_worker_threads);
 
-    for_loop(par.with(static_chunk_size(1)), 0, num_worker_threads,
-             [this, &buffer, &bar, num_worker_threads, value_count,
-              value_size](std::size_t const t) {
-               reference_type update_sum = ValueInit::init(
-                   m_functor, reinterpret_cast<pointer_type>(buffer.get(t)));
+    for (int t = 0; t < num_worker_threads; ++t) {
+      apply(exec, [this, &bar, &buffer, &num_tasks_remaining,
+                   num_worker_threads, value_count, value_size, t]() {
+        reference_type update_sum = ValueInit::init(
+            m_functor, reinterpret_cast<pointer_type>(buffer.get(t)));
 
-               const WorkRange range(m_policy, t, num_worker_threads);
-               execute_functor_range<WorkTag>(m_functor, range.begin(),
-                                              range.end(), update_sum, false);
+        const WorkRange range(m_policy, t, num_worker_threads);
+        execute_functor_range<WorkTag>(m_functor, range.begin(), range.end(),
+                                       update_sum, false);
 
-               bar.wait();
+        bar.wait();
 
-               if (t == 0) {
-                 ValueInit::init(m_functor, reinterpret_cast<pointer_type>(
-                                                buffer.get(0) + value_size));
+        if (t == 0) {
+          ValueInit::init(m_functor, reinterpret_cast<pointer_type>(
+                                         buffer.get(0) + value_size));
 
-                 for (int i = 1; i < num_worker_threads; ++i) {
-                   pointer_type ptr_1_prev =
-                       reinterpret_cast<pointer_type>(buffer.get(i - 1));
-                   pointer_type ptr_2_prev = reinterpret_cast<pointer_type>(
-                       buffer.get(i - 1) + value_size);
-                   pointer_type ptr_2 = reinterpret_cast<pointer_type>(
-                       buffer.get(i) + value_size);
+          for (int i = 1; i < num_worker_threads; ++i) {
+            pointer_type ptr_1_prev =
+                reinterpret_cast<pointer_type>(buffer.get(i - 1));
+            pointer_type ptr_2_prev =
+                reinterpret_cast<pointer_type>(buffer.get(i - 1) + value_size);
+            pointer_type ptr_2 =
+                reinterpret_cast<pointer_type>(buffer.get(i) + value_size);
 
-                   for (int j = 0; j < value_count; ++j) {
-                     ptr_2[j] = ptr_2_prev[j];
-                   }
+            for (int j = 0; j < value_count; ++j) {
+              ptr_2[j] = ptr_2_prev[j];
+            }
 
-                   ValueJoin::join(m_functor, ptr_2, ptr_1_prev);
-                 }
-               }
+            ValueJoin::join(m_functor, ptr_2, ptr_1_prev);
+          }
+        }
 
-               bar.wait();
+        bar.wait();
 
-               reference_type update_base = ValueOps::reference(
-                   reinterpret_cast<pointer_type>(buffer.get(t) + value_size));
+        reference_type update_base = ValueOps::reference(
+            reinterpret_cast<pointer_type>(buffer.get(t) + value_size));
 
-               execute_functor_range<WorkTag>(m_functor, range.begin(),
-                                              range.end(), update_base, true);
+        execute_functor_range<WorkTag>(m_functor, range.begin(), range.end(),
+                                       update_base, true);
 
-               if (t == std::size_t(num_worker_threads - 1)) {
-                 m_returnvalue = update_base;
-               }
-             });
+        if (t == num_worker_threads - 1) {
+          m_returnvalue = update_base;
+        }
+
+        num_tasks_remaining.count_down(1);
+      });
+    }
+
+    num_tasks_remaining.wait();
   }
 
   inline ParallelScanWithTotal(const FunctorType &arg_functor,
                                const Policy &arg_policy,
                                ReturnType &arg_returnvalue)
-      : m_functor(arg_functor), m_policy(arg_policy),
+      : m_functor(arg_functor),
+        m_policy(arg_policy),
         m_returnvalue(arg_returnvalue) {}
 };
-} // namespace Impl
-} // namespace Kokkos
+}  // namespace Impl
+}  // namespace Kokkos
 
 namespace Kokkos {
 namespace Impl {
 template <class FunctorType, class... Properties>
 class ParallelFor<FunctorType, Kokkos::TeamPolicy<Properties...>,
                   Kokkos::Experimental::HPX> {
-private:
-  using Policy = TeamPolicyInternal<Kokkos::Experimental::HPX, Properties...>;
+ private:
+  using Policy  = TeamPolicyInternal<Kokkos::Experimental::HPX, Properties...>;
   using WorkTag = typename Policy::work_tag;
-  using Member = typename Policy::member_type;
+  using Member  = typename Policy::member_type;
   using memory_space = Kokkos::HostSpace;
 
   const FunctorType m_functor;
@@ -1485,7 +1682,7 @@ private:
     }
   }
 
-public:
+ public:
   void execute() const { dispatch_execute_task(this); }
 
   inline void execute_task() const {
@@ -1499,42 +1696,66 @@ public:
     using hpx::parallel::execution::par;
     using hpx::parallel::execution::static_chunk_size;
 
-    for_loop(par.with(static_chunk_size(m_policy.chunk_size())), 0,
-             m_policy.league_size(), [this, &buffer](const int league_rank) {
-               execute_functor<WorkTag>(
-                   m_functor, m_policy, league_rank,
-                   buffer.get(Kokkos::Experimental::HPX::impl_hardware_thread_id()),
-                   m_shared);
-             });
+    for_loop(
+        par.with(static_chunk_size(m_policy.chunk_size())), 0,
+        m_policy.league_size(), [this, &buffer](const int league_rank) {
+          execute_functor<WorkTag>(
+              m_functor, m_policy, league_rank,
+              buffer.get(Kokkos::Experimental::HPX::impl_hardware_thread_id()),
+              m_shared);
+        });
 
 #elif KOKKOS_HPX_IMPLEMENTATION == 1
     using hpx::apply;
-    using hpx::lcos::local::counting_semaphore;
+    using hpx::lcos::local::latch;
 
-    counting_semaphore sem(0);
-    std::size_t num_tasks = 0;
+    const int num_tasks = (m_policy.league_size() + m_policy.chunk_size() - 1) /
+                          m_policy.chunk_size();
+    latch num_tasks_remaining(num_tasks);
+    ChunkedRoundRobinExecutor exec(num_tasks);
 
     for (int league_rank_begin = 0; league_rank_begin < m_policy.league_size();
          league_rank_begin += m_policy.chunk_size()) {
-      apply([this, &buffer, &sem, league_rank_begin]() {
+      apply(exec, [this, &buffer, &num_tasks_remaining, league_rank_begin]() {
         const int league_rank_end = (std::min)(
             league_rank_begin + m_policy.chunk_size(), m_policy.league_size());
         execute_functor_range<WorkTag>(
             m_functor, m_policy, league_rank_begin, league_rank_end,
-            buffer.get(Kokkos::Experimental::HPX::impl_hardware_thread_id()), m_shared);
+            buffer.get(Kokkos::Experimental::HPX::impl_hardware_thread_id()),
+            m_shared);
 
-        sem.signal(1);
+        num_tasks_remaining.count_down(1);
       });
-
-      ++num_tasks;
     }
 
-    sem.wait(num_tasks);
+    num_tasks_remaining.wait();
+
+#elif KOKKOS_HPX_IMPLEMENTATION == 2
+    using hpx::parallel::for_loop_strided;
+    using hpx::parallel::execution::par;
+    using hpx::parallel::execution::static_chunk_size;
+
+    const int num_tasks = (m_policy.league_size() + m_policy.chunk_size() - 1) /
+                          m_policy.chunk_size();
+    ChunkedRoundRobinExecutor exec(num_tasks);
+
+    for_loop_strided(
+        par.on(exec).with(static_chunk_size(1)), 0, m_policy.league_size(),
+        m_policy.chunk_size(), [this, &buffer](const int league_rank_begin) {
+          const int league_rank_end =
+              (std::min)(league_rank_begin + m_policy.chunk_size(),
+                         m_policy.league_size());
+          execute_functor_range<WorkTag>(
+              m_functor, m_policy, league_rank_begin, league_rank_end,
+              buffer.get(Kokkos::Experimental::HPX::impl_hardware_thread_id()),
+              m_shared);
+        });
 #endif
   }
 
   ParallelFor(const FunctorType &arg_functor, const Policy &arg_policy)
-      : m_functor(arg_functor), m_policy(arg_policy),
+      : m_functor(arg_functor),
+        m_policy(arg_policy),
         m_league(arg_policy.league_size()),
         m_shared(arg_policy.scratch_size(0) + arg_policy.scratch_size(1) +
                  FunctorTeamShmemSize<FunctorType>::value(
@@ -1544,11 +1765,11 @@ public:
 template <class FunctorType, class ReducerType, class... Properties>
 class ParallelReduce<FunctorType, Kokkos::TeamPolicy<Properties...>,
                      ReducerType, Kokkos::Experimental::HPX> {
-private:
+ private:
   using Policy = TeamPolicyInternal<Kokkos::Experimental::HPX, Properties...>;
   using Analysis =
       FunctorAnalysis<FunctorPatternInterface::REDUCE, Policy, FunctorType>;
-  using Member = typename Policy::member_type;
+  using Member  = typename Policy::member_type;
   using WorkTag = typename Policy::work_tag;
   using ReducerConditional =
       Kokkos::Impl::if_c<std::is_same<InvalidType, ReducerType>::value,
@@ -1559,10 +1780,10 @@ private:
                                   WorkTag, void>::type;
   using ValueInit = Kokkos::Impl::FunctorValueInit<ReducerTypeFwd, WorkTagFwd>;
   using ValueJoin = Kokkos::Impl::FunctorValueJoin<ReducerTypeFwd, WorkTagFwd>;
-  using ValueOps = Kokkos::Impl::FunctorValueOps<ReducerTypeFwd, WorkTagFwd>;
-  using pointer_type = typename Analysis::pointer_type;
+  using ValueOps  = Kokkos::Impl::FunctorValueOps<ReducerTypeFwd, WorkTagFwd>;
+  using pointer_type   = typename Analysis::pointer_type;
   using reference_type = typename Analysis::reference_type;
-  using value_type = typename Analysis::value_type;
+  using value_type     = typename Analysis::value_type;
 
   const FunctorType m_functor;
   const int m_league;
@@ -1628,10 +1849,8 @@ private:
     }
   }
 
-public:
-  void execute() const {
-    dispatch_execute_task(this);
-  }
+ public:
+  void execute() const { dispatch_execute_task(this); }
 
   inline void execute_task() const {
     const int num_worker_threads = Kokkos::Experimental::HPX::concurrency();
@@ -1641,15 +1860,15 @@ public:
     thread_buffer &buffer = Kokkos::Experimental::HPX::impl_get_buffer();
     buffer.resize(num_worker_threads, value_size + m_shared);
 
+#if KOKKOS_HPX_IMPLEMENTATION == 0
     using hpx::parallel::for_loop;
     using hpx::parallel::execution::par;
 
-    for_loop(par, 0, num_worker_threads, [this, &buffer](std::size_t t) {
+    for_loop(par, 0, num_worker_threads, [this, &buffer](const std::size_t t) {
       ValueInit::init(ReducerConditional::select(m_functor, m_reducer),
                       reinterpret_cast<pointer_type>(buffer.get(t)));
     });
 
-#if KOKKOS_HPX_IMPLEMENTATION == 0
     using hpx::parallel::execution::static_chunk_size;
 
     hpx::parallel::for_loop(
@@ -1667,14 +1886,33 @@ public:
 
 #elif KOKKOS_HPX_IMPLEMENTATION == 1
     using hpx::apply;
-    using hpx::lcos::local::counting_semaphore;
+    using hpx::lcos::local::latch;
 
-    counting_semaphore sem(0);
-    std::size_t num_tasks = 0;
+    {
+      latch num_tasks_remaining(num_worker_threads);
+      ChunkedRoundRobinExecutor exec(num_worker_threads);
+
+      for (int t = 0; t < num_worker_threads; ++t) {
+        apply(exec, [this, &buffer, &num_tasks_remaining, t]() {
+          ValueInit::init(ReducerConditional::select(m_functor, m_reducer),
+                          reinterpret_cast<pointer_type>(buffer.get(t)));
+
+          num_tasks_remaining.count_down(1);
+        });
+      }
+
+      num_tasks_remaining.wait();
+    }
+
+    const int num_tasks = (m_policy.league_size() + m_policy.chunk_size() - 1) /
+                          m_policy.chunk_size();
+    latch num_tasks_remaining(num_tasks);
+    ChunkedRoundRobinExecutor exec(num_tasks);
 
     for (int league_rank_begin = 0; league_rank_begin < m_policy.league_size();
          league_rank_begin += m_policy.chunk_size()) {
-      apply([this, &buffer, &sem, league_rank_begin, value_size]() {
+      apply(exec, [this, &buffer, &num_tasks_remaining, league_rank_begin,
+                   value_size]() {
         std::size_t t = Kokkos::Experimental::HPX::impl_hardware_thread_id();
         reference_type update =
             ValueOps::reference(reinterpret_cast<pointer_type>(buffer.get(t)));
@@ -1684,13 +1922,47 @@ public:
             m_functor, m_policy, league_rank_begin, league_rank_end,
             buffer.get(t) + value_size, m_shared, update);
 
-        sem.signal(1);
+        num_tasks_remaining.count_down(1);
       });
-
-      ++num_tasks;
     }
 
-    sem.wait(num_tasks);
+    num_tasks_remaining.wait();
+
+#elif KOKKOS_HPX_IMPLEMENTATION == 2
+    using hpx::parallel::for_loop;
+    using hpx::parallel::for_loop_strided;
+    using hpx::parallel::execution::par;
+    using hpx::parallel::execution::static_chunk_size;
+
+    {
+      ChunkedRoundRobinExecutor exec(num_worker_threads);
+
+      for_loop(par.on(exec).with(static_chunk_size(1)), 0, num_worker_threads,
+               [this, &buffer](std::size_t const t) {
+                 ValueInit::init(
+                     ReducerConditional::select(m_functor, m_reducer),
+                     reinterpret_cast<pointer_type>(buffer.get(t)));
+               });
+    }
+
+    const int num_tasks = (m_policy.league_size() + m_policy.chunk_size() - 1) /
+                          m_policy.chunk_size();
+    ChunkedRoundRobinExecutor exec(num_tasks);
+
+    for_loop_strided(
+        par.on(exec).with(static_chunk_size(1)), 0, m_policy.league_size(),
+        m_policy.chunk_size(),
+        [this, &buffer, value_size](int const league_rank_begin) {
+          std::size_t t = Kokkos::Experimental::HPX::impl_hardware_thread_id();
+          reference_type update = ValueOps::reference(
+              reinterpret_cast<pointer_type>(buffer.get(t)));
+          const int league_rank_end =
+              (std::min)(league_rank_begin + m_policy.chunk_size(),
+                         m_policy.league_size());
+          execute_functor_range<WorkTag>(
+              m_functor, m_policy, league_rank_begin, league_rank_end,
+              buffer.get(t) + value_size, m_shared, update);
+        });
 #endif
 
     const pointer_type ptr = reinterpret_cast<pointer_type>(buffer.get(0));
@@ -1719,8 +1991,10 @@ public:
       typename std::enable_if<Kokkos::is_view<ViewType>::value &&
                                   !Kokkos::is_reducer_type<ReducerType>::value,
                               void *>::type = NULL)
-      : m_functor(arg_functor), m_league(arg_policy.league_size()),
-        m_policy(arg_policy), m_reducer(InvalidType()),
+      : m_functor(arg_functor),
+        m_league(arg_policy.league_size()),
+        m_policy(arg_policy),
+        m_reducer(InvalidType()),
         m_result_ptr(arg_result.data()),
         m_shared(arg_policy.scratch_size(0) + arg_policy.scratch_size(1) +
                  FunctorTeamShmemSize<FunctorType>::value(
@@ -1729,16 +2003,18 @@ public:
 
   inline ParallelReduce(const FunctorType &arg_functor, Policy arg_policy,
                         const ReducerType &reducer)
-      : m_functor(arg_functor), m_league(arg_policy.league_size()),
-        m_policy(arg_policy), m_reducer(reducer),
+      : m_functor(arg_functor),
+        m_league(arg_policy.league_size()),
+        m_policy(arg_policy),
+        m_reducer(reducer),
         m_result_ptr(reducer.view().data()),
         m_shared(arg_policy.scratch_size(0) + arg_policy.scratch_size(1) +
                  FunctorTeamShmemSize<FunctorType>::value(
                      arg_functor, arg_policy.team_size())),
         m_force_synchronous(!reducer.view().impl_track().has_record()) {}
 };
-} // namespace Impl
-} // namespace Kokkos
+}  // namespace Impl
+}  // namespace Kokkos
 
 namespace Kokkos {
 
@@ -1796,14 +2072,14 @@ KOKKOS_INLINE_FUNCTION
 }
 
 KOKKOS_INLINE_FUNCTION
-Impl::ThreadSingleStruct<Impl::HPXTeamMember>
-PerTeam(const Impl::HPXTeamMember &thread) {
+Impl::ThreadSingleStruct<Impl::HPXTeamMember> PerTeam(
+    const Impl::HPXTeamMember &thread) {
   return Impl::ThreadSingleStruct<Impl::HPXTeamMember>(thread);
 }
 
 KOKKOS_INLINE_FUNCTION
-Impl::VectorSingleStruct<Impl::HPXTeamMember>
-PerThread(const Impl::HPXTeamMember &thread) {
+Impl::VectorSingleStruct<Impl::HPXTeamMember> PerThread(
+    const Impl::HPXTeamMember &thread) {
   return Impl::VectorSingleStruct<Impl::HPXTeamMember>(thread);
 }
 
@@ -1950,7 +2226,7 @@ KOKKOS_INLINE_FUNCTION void parallel_scan(
         &loop_boundaries,
     const FunctorType &lambda) {
   using ValueTraits = Kokkos::Impl::FunctorValueTraits<FunctorType, void>;
-  using value_type = typename ValueTraits::value_type;
+  using value_type  = typename ValueTraits::value_type;
 
   value_type scan_val = value_type();
 
@@ -1964,34 +2240,34 @@ KOKKOS_INLINE_FUNCTION void parallel_scan(
 }
 
 template <class FunctorType>
-KOKKOS_INLINE_FUNCTION void
-single(const Impl::VectorSingleStruct<Impl::HPXTeamMember> &single_struct,
-       const FunctorType &lambda) {
+KOKKOS_INLINE_FUNCTION void single(
+    const Impl::VectorSingleStruct<Impl::HPXTeamMember> &single_struct,
+    const FunctorType &lambda) {
   lambda();
 }
 
 template <class FunctorType>
-KOKKOS_INLINE_FUNCTION void
-single(const Impl::ThreadSingleStruct<Impl::HPXTeamMember> &single_struct,
-       const FunctorType &lambda) {
+KOKKOS_INLINE_FUNCTION void single(
+    const Impl::ThreadSingleStruct<Impl::HPXTeamMember> &single_struct,
+    const FunctorType &lambda) {
   lambda();
 }
 
 template <class FunctorType, class ValueType>
-KOKKOS_INLINE_FUNCTION void
-single(const Impl::VectorSingleStruct<Impl::HPXTeamMember> &single_struct,
-       const FunctorType &lambda, ValueType &val) {
+KOKKOS_INLINE_FUNCTION void single(
+    const Impl::VectorSingleStruct<Impl::HPXTeamMember> &single_struct,
+    const FunctorType &lambda, ValueType &val) {
   lambda(val);
 }
 
 template <class FunctorType, class ValueType>
-KOKKOS_INLINE_FUNCTION void
-single(const Impl::ThreadSingleStruct<Impl::HPXTeamMember> &single_struct,
-       const FunctorType &lambda, ValueType &val) {
+KOKKOS_INLINE_FUNCTION void single(
+    const Impl::ThreadSingleStruct<Impl::HPXTeamMember> &single_struct,
+    const FunctorType &lambda, ValueType &val) {
   lambda(val);
 }
 
-} // namespace Kokkos
+}  // namespace Kokkos
 
 #include <HPX/Kokkos_HPX_Task.hpp>
 
diff --git a/lib/kokkos/core/src/Kokkos_HostSpace.hpp b/lib/kokkos/core/src/Kokkos_HostSpace.hpp
index 921ba0df34..c1b842c1c4 100644
--- a/lib/kokkos/core/src/Kokkos_HostSpace.hpp
+++ b/lib/kokkos/core/src/Kokkos_HostSpace.hpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -73,10 +74,10 @@ namespace Impl {
 /// This function initializes the locks to zero (unset).
 void init_lock_array_host_space();
 
-/// \brief Aquire a lock for the address
+/// \brief Acquire a lock for the address
 ///
-/// This function tries to aquire the lock for the hash value derived
-/// from the provided ptr. If the lock is successfully aquired the
+/// This function tries to acquire the lock for the hash value derived
+/// from the provided ptr. If the lock is successfully acquired the
 /// function returns true. Otherwise it returns false.
 bool lock_address_host_space(void* ptr);
 
@@ -84,13 +85,13 @@ bool lock_address_host_space(void* ptr);
 ///
 /// This function releases the lock for the hash value derived
 /// from the provided ptr. This function should only be called
-/// after previously successfully aquiring a lock with
+/// after previously successfully acquiring a lock with
 /// lock_address.
-void unlock_address_host_space( void* ptr );
+void unlock_address_host_space(void* ptr);
 
-} // namespace Impl
+}  // namespace Impl
 
-} // namespace Kokkos
+}  // namespace Kokkos
 
 namespace Kokkos {
 
@@ -100,10 +101,10 @@ namespace Kokkos {
 /// HostSpace is a memory space that governs host memory.  "Host"
 /// memory means the usual CPU-accessible memory.
 class HostSpace {
-public:
+ public:
   //! Tag this class as a kokkos memory space
-  typedef HostSpace  memory_space;
-  typedef size_t     size_type;
+  typedef HostSpace memory_space;
+  typedef size_t size_type;
 
   /// \typedef execution_space
   /// \brief Default execution space for this memory space.
@@ -111,63 +112,68 @@ public:
   /// Every memory space has a default execution space.  This is
   /// useful for things like initializing a View (which happens in
   /// parallel using the View's default execution space).
-#if defined( KOKKOS_ENABLE_DEFAULT_DEVICE_TYPE_OPENMP )
-  typedef Kokkos::OpenMP    execution_space;
-#elif defined( KOKKOS_ENABLE_DEFAULT_DEVICE_TYPE_THREADS )
-  typedef Kokkos::Threads   execution_space;
-#elif defined( KOKKOS_ENABLE_DEFAULT_DEVICE_TYPE_HPX )
+#if defined(KOKKOS_ENABLE_DEFAULT_DEVICE_TYPE_OPENMP)
+  typedef Kokkos::OpenMP execution_space;
+#elif defined(KOKKOS_ENABLE_DEFAULT_DEVICE_TYPE_THREADS)
+  typedef Kokkos::Threads execution_space;
+#elif defined(KOKKOS_ENABLE_DEFAULT_DEVICE_TYPE_HPX)
   typedef Kokkos::Experimental::HPX execution_space;
 //#elif defined( KOKKOS_ENABLE_DEFAULT_DEVICE_TYPE_QTHREADS )
 //  typedef Kokkos::Qthreads  execution_space;
-#elif defined( KOKKOS_ENABLE_OPENMP )
-  typedef Kokkos::OpenMP    execution_space;
-#elif defined( KOKKOS_ENABLE_THREADS )
-  typedef Kokkos::Threads   execution_space;
+#elif defined(KOKKOS_ENABLE_OPENMP)
+  typedef Kokkos::OpenMP execution_space;
+#elif defined(KOKKOS_ENABLE_THREADS)
+  typedef Kokkos::Threads execution_space;
 //#elif defined( KOKKOS_ENABLE_QTHREADS )
 //  typedef Kokkos::Qthreads  execution_space;
-#elif defined( KOKKOS_ENABLE_HPX )
+#elif defined(KOKKOS_ENABLE_HPX)
   typedef Kokkos::Experimental::HPX execution_space;
-#elif defined( KOKKOS_ENABLE_SERIAL )
-  typedef Kokkos::Serial    execution_space;
+#elif defined(KOKKOS_ENABLE_SERIAL)
+  typedef Kokkos::Serial execution_space;
 #else
-#  error "At least one of the following host execution spaces must be defined: Kokkos::OpenMP, Kokkos::Threads, Kokkos::Qthreads, or Kokkos::Serial.  You might be seeing this message if you disabled the Kokkos::Serial device explicitly using the Kokkos_ENABLE_Serial:BOOL=OFF CMake option, but did not enable any of the other host execution space devices."
+#error \
+    "At least one of the following host execution spaces must be defined: Kokkos::OpenMP, Kokkos::Threads, Kokkos::Qthreads, or Kokkos::Serial.  You might be seeing this message if you disabled the Kokkos::Serial device explicitly using the Kokkos_ENABLE_Serial:BOOL=OFF CMake option, but did not enable any of the other host execution space devices."
 #endif
 
   //! This memory space preferred device_type
-  typedef Kokkos::Device< execution_space, memory_space > device_type;
+  typedef Kokkos::Device<execution_space, memory_space> device_type;
 
   /**\brief  Default memory space instance */
   HostSpace();
-  HostSpace( HostSpace && rhs ) = default;
-  HostSpace( const HostSpace & rhs ) = default;
-  HostSpace & operator = ( HostSpace && ) = default;
-  HostSpace & operator = ( const HostSpace & ) = default;
-  ~HostSpace() = default;
+  HostSpace(HostSpace&& rhs)      = default;
+  HostSpace(const HostSpace& rhs) = default;
+  HostSpace& operator=(HostSpace&&) = default;
+  HostSpace& operator=(const HostSpace&) = default;
+  ~HostSpace()                           = default;
 
-  /**\brief  Non-default memory space instance to choose allocation mechansim, if available */
+  /**\brief  Non-default memory space instance to choose allocation mechansim,
+   * if available */
 
-  enum AllocationMechanism { STD_MALLOC, POSIX_MEMALIGN, POSIX_MMAP, INTEL_MM_ALLOC };
+  enum AllocationMechanism {
+    STD_MALLOC,
+    POSIX_MEMALIGN,
+    POSIX_MMAP,
+    INTEL_MM_ALLOC
+  };
 
-  explicit
-  HostSpace( const AllocationMechanism & );
+  explicit HostSpace(const AllocationMechanism&);
 
   /**\brief  Allocate untracked memory in the space */
-  void * allocate( const size_t arg_alloc_size ) const;
+  void* allocate(const size_t arg_alloc_size) const;
 
   /**\brief  Deallocate untracked memory in the space */
-  void deallocate( void * const arg_alloc_ptr
-                 , const size_t arg_alloc_size ) const;
+  void deallocate(void* const arg_alloc_ptr, const size_t arg_alloc_size) const;
 
   /**\brief Return Name of the MemorySpace */
   static constexpr const char* name() { return m_name; }
 
-private:
-  AllocationMechanism  m_alloc_mech;
+ private:
+  AllocationMechanism m_alloc_mech;
   static constexpr const char* m_name = "Host";
-  friend class Kokkos::Impl::SharedAllocationRecord< Kokkos::HostSpace, void >;
+  friend class Kokkos::Impl::SharedAllocationRecord<Kokkos::HostSpace, void>;
 };
 
-} // namespace Kokkos
+}  // namespace Kokkos
 
 //----------------------------------------------------------------------------
 
@@ -175,38 +181,45 @@ namespace Kokkos {
 
 namespace Impl {
 
-static_assert( Kokkos::Impl::MemorySpaceAccess< Kokkos::HostSpace, Kokkos::HostSpace >::assignable, "" );
+static_assert(Kokkos::Impl::MemorySpaceAccess<Kokkos::HostSpace,
+                                              Kokkos::HostSpace>::assignable,
+              "");
 
-template< typename S >
+template <typename S>
 struct HostMirror {
-private:
+ private:
   // If input execution space can access HostSpace then keep it.
   // Example: Kokkos::OpenMP can access, Kokkos::Cuda cannot
-  enum { keep_exe = Kokkos::Impl::MemorySpaceAccess
-                      < typename S::execution_space::memory_space, Kokkos::HostSpace >::accessible };
+  enum {
+    keep_exe = Kokkos::Impl::MemorySpaceAccess<
+        typename S::execution_space::memory_space,
+        Kokkos::HostSpace>::accessible
+  };
 
   // If HostSpace can access memory space then keep it.
   // Example:  Cannot access Kokkos::CudaSpace, can access Kokkos::CudaUVMSpace
-  enum { keep_mem = Kokkos::Impl::MemorySpaceAccess
-                      < Kokkos::HostSpace, typename S::memory_space >::accessible };
+  enum {
+    keep_mem =
+        Kokkos::Impl::MemorySpaceAccess<Kokkos::HostSpace,
+                                        typename S::memory_space>::accessible
+  };
 
-public:
-
-  typedef typename std::conditional
-    < keep_exe && keep_mem /* Can keep whole space */
-    , S
-    , typename std::conditional
-        < keep_mem /* Can keep memory space, use default Host execution space */
-        , Kokkos::Device< Kokkos::HostSpace::execution_space
-                        , typename S::memory_space >
-        , Kokkos::HostSpace
-        >::type
-    >::type  Space;
+ public:
+  typedef typename std::conditional<
+      keep_exe && keep_mem /* Can keep whole space */
+      ,
+      S,
+      typename std::conditional<
+          keep_mem /* Can keep memory space, use default Host execution space */
+          ,
+          Kokkos::Device<Kokkos::HostSpace::execution_space,
+                         typename S::memory_space>,
+          Kokkos::HostSpace>::type>::type Space;
 };
 
-} // namespace Impl
+}  // namespace Impl
 
-} // namespace Kokkos
+}  // namespace Kokkos
 
 //----------------------------------------------------------------------------
 
@@ -214,19 +227,18 @@ namespace Kokkos {
 
 namespace Impl {
 
-template<>
-class SharedAllocationRecord< Kokkos::HostSpace, void >
-  : public SharedAllocationRecord< void, void >
-{
-private:
+template <>
+class SharedAllocationRecord<Kokkos::HostSpace, void>
+    : public SharedAllocationRecord<void, void> {
+ private:
   friend Kokkos::HostSpace;
 
-  typedef SharedAllocationRecord< void, void >  RecordBase;
+  typedef SharedAllocationRecord<void, void> RecordBase;
 
-  SharedAllocationRecord( const SharedAllocationRecord & ) = delete;
-  SharedAllocationRecord & operator = ( const SharedAllocationRecord & ) = delete;
+  SharedAllocationRecord(const SharedAllocationRecord&) = delete;
+  SharedAllocationRecord& operator=(const SharedAllocationRecord&) = delete;
 
-  static void deallocate( RecordBase * );
+  static void deallocate(RecordBase*);
 
 #ifdef KOKKOS_DEBUG
   /**\brief  Root record for tracked allocations from this HostSpace instance */
@@ -235,61 +247,51 @@ private:
 
   const Kokkos::HostSpace m_space;
 
-protected:
+ protected:
   ~SharedAllocationRecord();
   SharedAllocationRecord() = default;
 
-  SharedAllocationRecord( const Kokkos::HostSpace        & arg_space
-                        , const std::string              & arg_label
-                        , const size_t                     arg_alloc_size
-                        , const RecordBase::function_type  arg_dealloc = & deallocate
-                        );
+  SharedAllocationRecord(
+      const Kokkos::HostSpace& arg_space, const std::string& arg_label,
+      const size_t arg_alloc_size,
+      const RecordBase::function_type arg_dealloc = &deallocate);
 
-public:
-
-  inline
-  std::string get_label() const
-  {
-    return std::string( RecordBase::head()->m_label );
+ public:
+  inline std::string get_label() const {
+    return std::string(RecordBase::head()->m_label);
   }
 
-  KOKKOS_INLINE_FUNCTION static
-  SharedAllocationRecord * allocate( const Kokkos::HostSpace &  arg_space
-                                   , const std::string       &  arg_label
-                                   , const size_t               arg_alloc_size
-                                   )
-  {
-#if defined( KOKKOS_ACTIVE_EXECUTION_MEMORY_SPACE_HOST )
-    return new SharedAllocationRecord( arg_space, arg_label, arg_alloc_size );
+  KOKKOS_INLINE_FUNCTION static SharedAllocationRecord* allocate(
+      const Kokkos::HostSpace& arg_space, const std::string& arg_label,
+      const size_t arg_alloc_size) {
+#if defined(KOKKOS_ACTIVE_EXECUTION_MEMORY_SPACE_HOST)
+    return new SharedAllocationRecord(arg_space, arg_label, arg_alloc_size);
 #else
-    return (SharedAllocationRecord *) 0;
+    return (SharedAllocationRecord*)0;
 #endif
   }
 
-
   /**\brief  Allocate tracked memory in the space */
-  static
-  void * allocate_tracked( const Kokkos::HostSpace & arg_space
-                         , const std::string & arg_label
-                         , const size_t arg_alloc_size );
+  static void* allocate_tracked(const Kokkos::HostSpace& arg_space,
+                                const std::string& arg_label,
+                                const size_t arg_alloc_size);
 
   /**\brief  Reallocate tracked memory in the space */
-  static
-  void * reallocate_tracked( void * const arg_alloc_ptr
-                           , const size_t arg_alloc_size );
+  static void* reallocate_tracked(void* const arg_alloc_ptr,
+                                  const size_t arg_alloc_size);
 
   /**\brief  Deallocate tracked memory in the space */
-  static
-  void deallocate_tracked( void * const arg_alloc_ptr );
+  static void deallocate_tracked(void* const arg_alloc_ptr);
 
-  static SharedAllocationRecord * get_record( void * arg_alloc_ptr );
+  static SharedAllocationRecord* get_record(void* arg_alloc_ptr);
 
-  static void print_records( std::ostream &, const Kokkos::HostSpace &, bool detail = false );
+  static void print_records(std::ostream&, const Kokkos::HostSpace&,
+                            bool detail = false);
 };
 
-} // namespace Impl
+}  // namespace Impl
 
-} // namespace Kokkos
+}  // namespace Kokkos
 
 //----------------------------------------------------------------------------
 
@@ -297,24 +299,21 @@ namespace Kokkos {
 
 namespace Impl {
 
-#define PAR_DEEP_COPY_USE_MEMCPY
-
-template< class ExecutionSpace >
-struct DeepCopy< HostSpace, HostSpace, ExecutionSpace > {
-  DeepCopy( void * dst, const void * src, size_t n ) {
-    hostspace_parallel_deepcopy(dst,src,n);
+template <class ExecutionSpace>
+struct DeepCopy<HostSpace, HostSpace, ExecutionSpace> {
+  DeepCopy(void* dst, const void* src, size_t n) {
+    hostspace_parallel_deepcopy(dst, src, n);
   }
 
-  DeepCopy( const ExecutionSpace& exec, void * dst, const void * src, size_t n ) {
+  DeepCopy(const ExecutionSpace& exec, void* dst, const void* src, size_t n) {
     exec.fence();
-    hostspace_parallel_deepcopy(dst,src,n);
+    hostspace_parallel_deepcopy(dst, src, n);
     exec.fence();
   }
 };
 
-} // namespace Impl
+}  // namespace Impl
 
-} // namespace Kokkos
-
-#endif // #define KOKKOS_HOSTSPACE_HPP
+}  // namespace Kokkos
 
+#endif  // #define KOKKOS_HOSTSPACE_HPP
diff --git a/lib/kokkos/core/src/Kokkos_Layout.hpp b/lib/kokkos/core/src/Kokkos_Layout.hpp
index 6f423d545f..d34bdb9150 100644
--- a/lib/kokkos/core/src/Kokkos_Layout.hpp
+++ b/lib/kokkos/core/src/Kokkos_Layout.hpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -72,22 +73,22 @@ enum { ARRAY_LAYOUT_MAX_RANK = 8 };
 /// major."
 struct LayoutLeft {
   //! Tag this class as a kokkos array layout
-  typedef LayoutLeft array_layout ;
+  typedef LayoutLeft array_layout;
 
-  size_t dimension[ ARRAY_LAYOUT_MAX_RANK ];
+  size_t dimension[ARRAY_LAYOUT_MAX_RANK];
 
   enum { is_extent_constructible = true };
 
-  LayoutLeft( LayoutLeft const & ) = default ;
-  LayoutLeft( LayoutLeft && ) = default ;
-  LayoutLeft & operator = ( LayoutLeft const & ) = default ;
-  LayoutLeft & operator = ( LayoutLeft && ) = default ;
+  LayoutLeft(LayoutLeft const&) = default;
+  LayoutLeft(LayoutLeft&&)      = default;
+  LayoutLeft& operator=(LayoutLeft const&) = default;
+  LayoutLeft& operator=(LayoutLeft&&) = default;
 
   KOKKOS_INLINE_FUNCTION
-  explicit constexpr
-  LayoutLeft( size_t N0 = 0 , size_t N1 = 0 , size_t N2 = 0 , size_t N3 = 0
-            , size_t N4 = 0 , size_t N5 = 0 , size_t N6 = 0 , size_t N7 = 0 )
-    : dimension { N0 , N1 , N2 , N3 , N4 , N5 , N6 , N7 } {}
+  explicit constexpr LayoutLeft(size_t N0 = 0, size_t N1 = 0, size_t N2 = 0,
+                                size_t N3 = 0, size_t N4 = 0, size_t N5 = 0,
+                                size_t N6 = 0, size_t N7 = 0)
+      : dimension{N0, N1, N2, N3, N4, N5, N6, N7} {}
 };
 
 //----------------------------------------------------------------------------
@@ -106,22 +107,22 @@ struct LayoutLeft {
 /// two-dimensional array, "layout right" is also called "row major."
 struct LayoutRight {
   //! Tag this class as a kokkos array layout
-  typedef LayoutRight array_layout ;
+  typedef LayoutRight array_layout;
 
-  size_t dimension[ ARRAY_LAYOUT_MAX_RANK ];
+  size_t dimension[ARRAY_LAYOUT_MAX_RANK];
 
   enum { is_extent_constructible = true };
 
-  LayoutRight( LayoutRight const & ) = default ;
-  LayoutRight( LayoutRight && ) = default ;
-  LayoutRight & operator = ( LayoutRight const & ) = default ;
-  LayoutRight & operator = ( LayoutRight && ) = default ;
+  LayoutRight(LayoutRight const&) = default;
+  LayoutRight(LayoutRight&&)      = default;
+  LayoutRight& operator=(LayoutRight const&) = default;
+  LayoutRight& operator=(LayoutRight&&) = default;
 
   KOKKOS_INLINE_FUNCTION
-  explicit constexpr
-  LayoutRight( size_t N0 = 0 , size_t N1 = 0 , size_t N2 = 0 , size_t N3 = 0
-             , size_t N4 = 0 , size_t N5 = 0 , size_t N6 = 0 , size_t N7 = 0 )
-    : dimension { N0 , N1 , N2 , N3 , N4 , N5 , N6 , N7 } {}
+  explicit constexpr LayoutRight(size_t N0 = 0, size_t N1 = 0, size_t N2 = 0,
+                                 size_t N3 = 0, size_t N4 = 0, size_t N5 = 0,
+                                 size_t N6 = 0, size_t N7 = 0)
+      : dimension{N0, N1, N2, N3, N4, N5, N6, N7} {}
 };
 
 //----------------------------------------------------------------------------
@@ -129,19 +130,18 @@ struct LayoutRight {
 /// \brief  Memory layout tag indicated arbitrarily strided
 ///         multi-index mapping into contiguous memory.
 struct LayoutStride {
-
   //! Tag this class as a kokkos array layout
-  typedef LayoutStride array_layout ;
+  typedef LayoutStride array_layout;
 
-  size_t dimension[ ARRAY_LAYOUT_MAX_RANK ] ;
-  size_t stride[ ARRAY_LAYOUT_MAX_RANK ] ;
+  size_t dimension[ARRAY_LAYOUT_MAX_RANK];
+  size_t stride[ARRAY_LAYOUT_MAX_RANK];
 
   enum { is_extent_constructible = false };
 
-  LayoutStride( LayoutStride const & ) = default ;
-  LayoutStride( LayoutStride && ) = default ;
-  LayoutStride & operator = ( LayoutStride const & ) = default ;
-  LayoutStride & operator = ( LayoutStride && ) = default ;
+  LayoutStride(LayoutStride const&) = default;
+  LayoutStride(LayoutStride&&)      = default;
+  LayoutStride& operator=(LayoutStride const&) = default;
+  LayoutStride& operator=(LayoutStride&&) = default;
 
   /** \brief  Compute strides from ordered dimensions.
    *
@@ -150,47 +150,40 @@ struct LayoutStride {
    *  Order = {0,1,2,...} is LayoutLeft
    *  Order = {...,2,1,0} is LayoutRight
    */
-  template< typename iTypeOrder , typename iTypeDimen >
-  KOKKOS_INLINE_FUNCTION static
-  LayoutStride order_dimensions( int const rank
-                               , iTypeOrder const * const order
-                               , iTypeDimen const * const dimen )
-    {
-      LayoutStride tmp ;
-      // Verify valid rank order:
-      int check_input = ARRAY_LAYOUT_MAX_RANK < rank ? 0 : int( 1 << rank ) - 1 ;
-      for ( int r = 0 ; r < ARRAY_LAYOUT_MAX_RANK ; ++r ) {
-        tmp.dimension[r] = 0 ;
-        tmp.stride[r]    = 0 ;
-      }
-      for ( int r = 0 ; r < rank ; ++r ) {
-        check_input &= ~int( 1 << order[r] );
-      }
-      if ( 0 == check_input ) {
-        size_t n = 1 ;
-        for ( int r = 0 ; r < rank ; ++r ) {
-          tmp.stride[ order[r] ] = n ;
-          n *= ( dimen[order[r]] );
-          tmp.dimension[r] = dimen[r];
-        }
-      }
-      return tmp ;
+  template <typename iTypeOrder, typename iTypeDimen>
+  KOKKOS_INLINE_FUNCTION static LayoutStride order_dimensions(
+      int const rank, iTypeOrder const* const order,
+      iTypeDimen const* const dimen) {
+    LayoutStride tmp;
+    // Verify valid rank order:
+    int check_input = ARRAY_LAYOUT_MAX_RANK < rank ? 0 : int(1 << rank) - 1;
+    for (int r = 0; r < ARRAY_LAYOUT_MAX_RANK; ++r) {
+      tmp.dimension[r] = 0;
+      tmp.stride[r]    = 0;
     }
+    for (int r = 0; r < rank; ++r) {
+      check_input &= ~int(1 << order[r]);
+    }
+    if (0 == check_input) {
+      size_t n = 1;
+      for (int r = 0; r < rank; ++r) {
+        tmp.stride[order[r]] = n;
+        n *= (dimen[order[r]]);
+        tmp.dimension[r] = dimen[r];
+      }
+    }
+    return tmp;
+  }
 
   KOKKOS_INLINE_FUNCTION
-  explicit constexpr
-  LayoutStride( size_t N0 = 0 , size_t S0 = 0
-              , size_t N1 = 0 , size_t S1 = 0
-              , size_t N2 = 0 , size_t S2 = 0
-              , size_t N3 = 0 , size_t S3 = 0
-              , size_t N4 = 0 , size_t S4 = 0
-              , size_t N5 = 0 , size_t S5 = 0
-              , size_t N6 = 0 , size_t S6 = 0
-              , size_t N7 = 0 , size_t S7 = 0
-              )
-    : dimension { N0 , N1 , N2 , N3 , N4 , N5 , N6 , N7 }
-    , stride    { S0 , S1 , S2 , S3 , S4 , S5 , S6 , S7 }
-    {}
+  explicit constexpr LayoutStride(size_t N0 = 0, size_t S0 = 0, size_t N1 = 0,
+                                  size_t S1 = 0, size_t N2 = 0, size_t S2 = 0,
+                                  size_t N3 = 0, size_t S3 = 0, size_t N4 = 0,
+                                  size_t S4 = 0, size_t N5 = 0, size_t S5 = 0,
+                                  size_t N6 = 0, size_t S6 = 0, size_t N7 = 0,
+                                  size_t S7 = 0)
+      : dimension{N0, N1, N2, N3, N4, N5, N6, N7}, stride{S0, S1, S2, S3,
+                                                          S4, S5, S6, S7} {}
 };
 
 // ==========================================================================
@@ -213,81 +206,81 @@ struct LayoutStride {
 /// compile-time constants.  This speeds up index calculations.  If
 /// both tile dimensions are powers of two, Kokkos can optimize
 /// further.
-template < unsigned ArgN0 , unsigned ArgN1 ,
-           bool IsPowerOfTwo = ( Impl::is_integral_power_of_two(ArgN0) &&
-                                 Impl::is_integral_power_of_two(ArgN1) )
-         >
+template <unsigned ArgN0, unsigned ArgN1,
+          bool IsPowerOfTwo = (Impl::is_integral_power_of_two(ArgN0) &&
+                               Impl::is_integral_power_of_two(ArgN1))>
 struct LayoutTileLeft {
-
-  static_assert( Impl::is_integral_power_of_two(ArgN0) &&
-                 Impl::is_integral_power_of_two(ArgN1)
-               , "LayoutTileLeft must be given power-of-two tile dimensions" );
+  static_assert(Impl::is_integral_power_of_two(ArgN0) &&
+                    Impl::is_integral_power_of_two(ArgN1),
+                "LayoutTileLeft must be given power-of-two tile dimensions");
 
   //! Tag this class as a kokkos array layout
-  typedef LayoutTileLeft<ArgN0,ArgN1,IsPowerOfTwo> array_layout ;
+  typedef LayoutTileLeft<ArgN0, ArgN1, IsPowerOfTwo> array_layout;
 
   enum { N0 = ArgN0 };
   enum { N1 = ArgN1 };
 
-  size_t dimension[ ARRAY_LAYOUT_MAX_RANK ] ;
+  size_t dimension[ARRAY_LAYOUT_MAX_RANK];
 
   enum { is_extent_constructible = true };
 
-  LayoutTileLeft( LayoutTileLeft const & ) = default ;
-  LayoutTileLeft( LayoutTileLeft && ) = default ;
-  LayoutTileLeft & operator = ( LayoutTileLeft const & ) = default ;
-  LayoutTileLeft & operator = ( LayoutTileLeft && ) = default ;
+  LayoutTileLeft(LayoutTileLeft const&) = default;
+  LayoutTileLeft(LayoutTileLeft&&)      = default;
+  LayoutTileLeft& operator=(LayoutTileLeft const&) = default;
+  LayoutTileLeft& operator=(LayoutTileLeft&&) = default;
 
   KOKKOS_INLINE_FUNCTION
-  explicit constexpr
-  LayoutTileLeft( size_t argN0 = 0 , size_t argN1 = 0 , size_t argN2 = 0 , size_t argN3 = 0
-                , size_t argN4 = 0 , size_t argN5 = 0 , size_t argN6 = 0 , size_t argN7 = 0
-                )
-    : dimension { argN0 , argN1 , argN2 , argN3 , argN4 , argN5 , argN6 , argN7 } {}
+  explicit constexpr LayoutTileLeft(size_t argN0 = 0, size_t argN1 = 0,
+                                    size_t argN2 = 0, size_t argN3 = 0,
+                                    size_t argN4 = 0, size_t argN5 = 0,
+                                    size_t argN6 = 0, size_t argN7 = 0)
+      : dimension{argN0, argN1, argN2, argN3, argN4, argN5, argN6, argN7} {}
 };
 
-#endif   // KOKKOS_ENABLE_DEPRECATED_CODE
+#endif  // KOKKOS_ENABLE_DEPRECATED_CODE
 // ===================================================================================
 
 //////////////////////////////////////////////////////////////////////////////////////
 
-enum class Iterate
-{
+enum class Iterate {
   Default,
-  Left,    // Left indices stride fastest
-  Right   // Right indices stride fastest
+  Left,  // Left indices stride fastest
+  Right  // Right indices stride fastest
 };
 
 // To check for LayoutTiled
-// This is to hide extra compile-time 'identifier' info within the LayoutTiled class by not relying on template specialization to include the ArgN*'s
-template < typename LayoutTiledCheck, class Enable = void >
+// This is to hide extra compile-time 'identifier' info within the LayoutTiled
+// class by not relying on template specialization to include the ArgN*'s
+template <typename LayoutTiledCheck, class Enable = void>
 struct is_layouttiled : std::false_type {};
 
 #ifndef KOKKOS_ENABLE_DEPRECATED_CODE
-template < typename LayoutTiledCheck >
-struct is_layouttiled< LayoutTiledCheck, typename std::enable_if<LayoutTiledCheck::is_array_layout_tiled>::type > : std::true_type {};
+template <typename LayoutTiledCheck>
+struct is_layouttiled<
+    LayoutTiledCheck,
+    typename std::enable_if<LayoutTiledCheck::is_array_layout_tiled>::type>
+    : std::true_type {};
 
 namespace Experimental {
 
 /// LayoutTiled
 // Must have Rank >= 2
-template < Kokkos::Iterate OuterP, Kokkos::Iterate InnerP,
-           unsigned ArgN0 , unsigned ArgN1 , unsigned ArgN2 = 0,  unsigned ArgN3 = 0,  unsigned ArgN4 = 0,  unsigned ArgN5 = 0,  unsigned ArgN6 = 0,  unsigned ArgN7 = 0, 
-           bool IsPowerOfTwo = 
-           ( Kokkos::Impl::is_integral_power_of_two(ArgN0) &&
-               Kokkos::Impl::is_integral_power_of_two(ArgN1) &&
-             (Kokkos::Impl::is_integral_power_of_two(ArgN2) || (ArgN2 == 0) ) &&
-             (Kokkos::Impl::is_integral_power_of_two(ArgN3) || (ArgN3 == 0) ) &&
-             (Kokkos::Impl::is_integral_power_of_two(ArgN4) || (ArgN4 == 0) ) &&
-             (Kokkos::Impl::is_integral_power_of_two(ArgN5) || (ArgN5 == 0) ) &&
-             (Kokkos::Impl::is_integral_power_of_two(ArgN6) || (ArgN6 == 0) ) &&
-             (Kokkos::Impl::is_integral_power_of_two(ArgN7) || (ArgN7 == 0) )
-           )
-         >
+template <
+    Kokkos::Iterate OuterP, Kokkos::Iterate InnerP, unsigned ArgN0,
+    unsigned ArgN1, unsigned ArgN2 = 0, unsigned ArgN3 = 0, unsigned ArgN4 = 0,
+    unsigned ArgN5 = 0, unsigned ArgN6 = 0, unsigned ArgN7 = 0,
+    bool IsPowerOfTwo =
+        (Kokkos::Impl::is_integral_power_of_two(ArgN0) &&
+         Kokkos::Impl::is_integral_power_of_two(ArgN1) &&
+         (Kokkos::Impl::is_integral_power_of_two(ArgN2) || (ArgN2 == 0)) &&
+         (Kokkos::Impl::is_integral_power_of_two(ArgN3) || (ArgN3 == 0)) &&
+         (Kokkos::Impl::is_integral_power_of_two(ArgN4) || (ArgN4 == 0)) &&
+         (Kokkos::Impl::is_integral_power_of_two(ArgN5) || (ArgN5 == 0)) &&
+         (Kokkos::Impl::is_integral_power_of_two(ArgN6) || (ArgN6 == 0)) &&
+         (Kokkos::Impl::is_integral_power_of_two(ArgN7) || (ArgN7 == 0)))>
 struct LayoutTiled {
-
-  static_assert( IsPowerOfTwo
-               , "LayoutTiled must be given power-of-two tile dimensions" );
+  static_assert(IsPowerOfTwo,
+                "LayoutTiled must be given power-of-two tile dimensions");
 
 #if 0
   static_assert( (Impl::is_integral_power_of_two(ArgN0) ) &&
@@ -301,7 +294,9 @@ struct LayoutTiled {
                , "LayoutTiled must be given power-of-two tile dimensions" );
 #endif
 
-  typedef LayoutTiled<OuterP, InnerP, ArgN0, ArgN1, ArgN2, ArgN3, ArgN4, ArgN5, ArgN6, ArgN7, IsPowerOfTwo> array_layout ;
+  typedef LayoutTiled<OuterP, InnerP, ArgN0, ArgN1, ArgN2, ArgN3, ArgN4, ArgN5,
+                      ArgN6, ArgN7, IsPowerOfTwo>
+      array_layout;
   static constexpr Iterate outer_pattern = OuterP;
   static constexpr Iterate inner_pattern = InnerP;
 
@@ -314,79 +309,93 @@ struct LayoutTiled {
   enum { N6 = ArgN6 };
   enum { N7 = ArgN7 };
 
-  size_t dimension[ ARRAY_LAYOUT_MAX_RANK ] ;
+  size_t dimension[ARRAY_LAYOUT_MAX_RANK];
 
   enum { is_extent_constructible = true };
 
-  LayoutTiled( LayoutTiled const & ) = default ;
-  LayoutTiled( LayoutTiled && ) = default ;
-  LayoutTiled & operator = ( LayoutTiled const & ) = default ;
-  LayoutTiled & operator = ( LayoutTiled && ) = default ;
+  LayoutTiled(LayoutTiled const&) = default;
+  LayoutTiled(LayoutTiled&&)      = default;
+  LayoutTiled& operator=(LayoutTiled const&) = default;
+  LayoutTiled& operator=(LayoutTiled&&) = default;
 
   KOKKOS_INLINE_FUNCTION
-  explicit constexpr
-  LayoutTiled( size_t argN0 = 0 , size_t argN1 = 0 , size_t argN2 = 0 , size_t argN3 = 0
-                , size_t argN4 = 0 , size_t argN5 = 0 , size_t argN6 = 0 , size_t argN7 = 0
-                )
-    : dimension { argN0 , argN1 , argN2 , argN3 , argN4 , argN5 , argN6 , argN7 } {}
+  explicit constexpr LayoutTiled(size_t argN0 = 0, size_t argN1 = 0,
+                                 size_t argN2 = 0, size_t argN3 = 0,
+                                 size_t argN4 = 0, size_t argN5 = 0,
+                                 size_t argN6 = 0, size_t argN7 = 0)
+      : dimension{argN0, argN1, argN2, argN3, argN4, argN5, argN6, argN7} {}
 };
 
-} // namespace Experimental
+}  // namespace Experimental
 #endif
 
-
 // For use with view_copy
-template < typename ... Layout >
+template <typename... Layout>
 struct layout_iterate_type_selector {
-  static const Kokkos::Iterate outer_iteration_pattern = Kokkos::Iterate::Default ;
-  static const Kokkos::Iterate inner_iteration_pattern = Kokkos::Iterate::Default ;
+  static const Kokkos::Iterate outer_iteration_pattern =
+      Kokkos::Iterate::Default;
+  static const Kokkos::Iterate inner_iteration_pattern =
+      Kokkos::Iterate::Default;
 };
 
 template <>
-struct layout_iterate_type_selector< Kokkos::LayoutRight > {
-  static const Kokkos::Iterate outer_iteration_pattern = Kokkos::Iterate::Right ;
-  static const Kokkos::Iterate inner_iteration_pattern = Kokkos::Iterate::Right ;
+struct layout_iterate_type_selector<Kokkos::LayoutRight> {
+  static const Kokkos::Iterate outer_iteration_pattern = Kokkos::Iterate::Right;
+  static const Kokkos::Iterate inner_iteration_pattern = Kokkos::Iterate::Right;
 };
 
 template <>
-struct layout_iterate_type_selector< Kokkos::LayoutLeft > {
-  static const Kokkos::Iterate outer_iteration_pattern = Kokkos::Iterate::Left ;
-  static const Kokkos::Iterate inner_iteration_pattern = Kokkos::Iterate::Left ;
+struct layout_iterate_type_selector<Kokkos::LayoutLeft> {
+  static const Kokkos::Iterate outer_iteration_pattern = Kokkos::Iterate::Left;
+  static const Kokkos::Iterate inner_iteration_pattern = Kokkos::Iterate::Left;
 };
 
 template <>
-struct layout_iterate_type_selector< Kokkos::LayoutStride > {
-  static const Kokkos::Iterate outer_iteration_pattern = Kokkos::Iterate::Default ;
-  static const Kokkos::Iterate inner_iteration_pattern = Kokkos::Iterate::Default ;
+struct layout_iterate_type_selector<Kokkos::LayoutStride> {
+  static const Kokkos::Iterate outer_iteration_pattern =
+      Kokkos::Iterate::Default;
+  static const Kokkos::Iterate inner_iteration_pattern =
+      Kokkos::Iterate::Default;
 };
 
 #ifndef KOKKOS_ENABLE_DEPRECATED_CODE
-template < unsigned ArgN0 , unsigned ArgN1 , unsigned ArgN2 ,  unsigned ArgN3 ,  unsigned ArgN4 ,  unsigned ArgN5 ,  unsigned ArgN6 ,  unsigned ArgN7 >
-struct layout_iterate_type_selector< Kokkos::Experimental::LayoutTiled<Kokkos::Iterate::Left, Kokkos::Iterate::Left, ArgN0, ArgN1, ArgN2, ArgN3, ArgN4, ArgN5, ArgN6, ArgN7, true> > {
-  static const Kokkos::Iterate outer_iteration_pattern = Kokkos::Iterate::Left ;
-  static const Kokkos::Iterate inner_iteration_pattern = Kokkos::Iterate::Left ;
+template <unsigned ArgN0, unsigned ArgN1, unsigned ArgN2, unsigned ArgN3,
+          unsigned ArgN4, unsigned ArgN5, unsigned ArgN6, unsigned ArgN7>
+struct layout_iterate_type_selector<Kokkos::Experimental::LayoutTiled<
+    Kokkos::Iterate::Left, Kokkos::Iterate::Left, ArgN0, ArgN1, ArgN2, ArgN3,
+    ArgN4, ArgN5, ArgN6, ArgN7, true> > {
+  static const Kokkos::Iterate outer_iteration_pattern = Kokkos::Iterate::Left;
+  static const Kokkos::Iterate inner_iteration_pattern = Kokkos::Iterate::Left;
 };
 
-template < unsigned ArgN0 , unsigned ArgN1 , unsigned ArgN2 ,  unsigned ArgN3 ,  unsigned ArgN4 ,  unsigned ArgN5 ,  unsigned ArgN6 ,  unsigned ArgN7 >
-struct layout_iterate_type_selector< Kokkos::Experimental::LayoutTiled<Kokkos::Iterate::Right, Kokkos::Iterate::Left, ArgN0, ArgN1, ArgN2, ArgN3, ArgN4, ArgN5, ArgN6, ArgN7, true> > {
-  static const Kokkos::Iterate outer_iteration_pattern = Kokkos::Iterate::Right ;
-  static const Kokkos::Iterate inner_iteration_pattern = Kokkos::Iterate::Left ;
+template <unsigned ArgN0, unsigned ArgN1, unsigned ArgN2, unsigned ArgN3,
+          unsigned ArgN4, unsigned ArgN5, unsigned ArgN6, unsigned ArgN7>
+struct layout_iterate_type_selector<Kokkos::Experimental::LayoutTiled<
+    Kokkos::Iterate::Right, Kokkos::Iterate::Left, ArgN0, ArgN1, ArgN2, ArgN3,
+    ArgN4, ArgN5, ArgN6, ArgN7, true> > {
+  static const Kokkos::Iterate outer_iteration_pattern = Kokkos::Iterate::Right;
+  static const Kokkos::Iterate inner_iteration_pattern = Kokkos::Iterate::Left;
 };
 
-template < unsigned ArgN0 , unsigned ArgN1 , unsigned ArgN2 ,  unsigned ArgN3 ,  unsigned ArgN4 ,  unsigned ArgN5 ,  unsigned ArgN6 ,  unsigned ArgN7 >
-struct layout_iterate_type_selector< Kokkos::Experimental::LayoutTiled<Kokkos::Iterate::Left, Kokkos::Iterate::Right, ArgN0, ArgN1, ArgN2, ArgN3, ArgN4, ArgN5, ArgN6, ArgN7, true> > {
-  static const Kokkos::Iterate outer_iteration_pattern = Kokkos::Iterate::Left ;
-  static const Kokkos::Iterate inner_iteration_pattern = Kokkos::Iterate::Right ;
+template <unsigned ArgN0, unsigned ArgN1, unsigned ArgN2, unsigned ArgN3,
+          unsigned ArgN4, unsigned ArgN5, unsigned ArgN6, unsigned ArgN7>
+struct layout_iterate_type_selector<Kokkos::Experimental::LayoutTiled<
+    Kokkos::Iterate::Left, Kokkos::Iterate::Right, ArgN0, ArgN1, ArgN2, ArgN3,
+    ArgN4, ArgN5, ArgN6, ArgN7, true> > {
+  static const Kokkos::Iterate outer_iteration_pattern = Kokkos::Iterate::Left;
+  static const Kokkos::Iterate inner_iteration_pattern = Kokkos::Iterate::Right;
 };
 
-template < unsigned ArgN0 , unsigned ArgN1 , unsigned ArgN2 ,  unsigned ArgN3 ,  unsigned ArgN4 ,  unsigned ArgN5 ,  unsigned ArgN6 ,  unsigned ArgN7 >
-struct layout_iterate_type_selector< Kokkos::Experimental::LayoutTiled<Kokkos::Iterate::Right, Kokkos::Iterate::Right, ArgN0, ArgN1, ArgN2, ArgN3, ArgN4, ArgN5, ArgN6, ArgN7, true> > {
-  static const Kokkos::Iterate outer_iteration_pattern = Kokkos::Iterate::Right ;
-  static const Kokkos::Iterate inner_iteration_pattern = Kokkos::Iterate::Right ;
+template <unsigned ArgN0, unsigned ArgN1, unsigned ArgN2, unsigned ArgN3,
+          unsigned ArgN4, unsigned ArgN5, unsigned ArgN6, unsigned ArgN7>
+struct layout_iterate_type_selector<Kokkos::Experimental::LayoutTiled<
+    Kokkos::Iterate::Right, Kokkos::Iterate::Right, ArgN0, ArgN1, ArgN2, ArgN3,
+    ArgN4, ArgN5, ArgN6, ArgN7, true> > {
+  static const Kokkos::Iterate outer_iteration_pattern = Kokkos::Iterate::Right;
+  static const Kokkos::Iterate inner_iteration_pattern = Kokkos::Iterate::Right;
 };
 #endif
 
-} // namespace Kokkos
-
-#endif // #ifndef KOKKOS_LAYOUT_HPP
+}  // namespace Kokkos
 
+#endif  // #ifndef KOKKOS_LAYOUT_HPP
diff --git a/lib/kokkos/core/src/Kokkos_Macros.hpp b/lib/kokkos/core/src/Kokkos_Macros.hpp
index 6b8ae02f82..5649d12e97 100644
--- a/lib/kokkos/core/src/Kokkos_Macros.hpp
+++ b/lib/kokkos/core/src/Kokkos_Macros.hpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -52,15 +53,16 @@
  *  KOKKOS_ENABLE_QTHREADS            Kokkos::Qthreads execution space
  *  KOKKOS_ENABLE_HPX                 Kokkos::Experimental::HPX execution space
  *  KOKKOS_ENABLE_OPENMP              Kokkos::OpenMP execution space
- *  KOKKOS_ENABLE_OPENMPTARGET        Kokkos::Experimental::OpenMPTarget execution space
- *  KOKKOS_ENABLE_HWLOC               HWLOC library is available.
+ *  KOKKOS_ENABLE_OPENMPTARGET        Kokkos::Experimental::OpenMPTarget
+ * execution space KOKKOS_ENABLE_HWLOC               HWLOC library is available.
  *  KOKKOS_ENABLE_DEBUG_BOUNDS_CHECK  Insert array bounds checks, is expensive!
- *  KOKKOS_ENABLE_MPI                 Negotiate MPI/execution space interactions.
- *  KOKKOS_ENABLE_CUDA_UVM            Use CUDA UVM for Cuda memory space.
+ *  KOKKOS_ENABLE_MPI                 Negotiate MPI/execution space
+ * interactions. KOKKOS_ENABLE_CUDA_UVM            Use CUDA UVM for Cuda memory
+ * space.
  */
 
 #ifndef KOKKOS_DONT_INCLUDE_CORE_CONFIG_H
-  #include <KokkosCore_config.h>
+#include <KokkosCore_config.h>
 #endif
 
 #include <impl/Kokkos_OldMacros.hpp>
@@ -97,449 +99,461 @@
 
 //----------------------------------------------------------------------------
 
-#if defined(KOKKOS_ENABLE_SERIAL) || defined(KOKKOS_ENABLE_THREADS) || \
+#if defined(KOKKOS_ENABLE_SERIAL) || defined(KOKKOS_ENABLE_THREADS) ||  \
     defined(KOKKOS_ENABLE_OPENMP) || defined(KOKKOS_ENABLE_QTHREADS) || \
-    defined(KOKKOS_ENABLE_HPX) || \
-    defined(KOKKOS_ENABLE_ROCM) || defined(KOKKOS_ENABLE_OPENMPTARGET)
-  #define KOKKOS_INTERNAL_ENABLE_NON_CUDA_BACKEND
+    defined(KOKKOS_ENABLE_HPX) || defined(KOKKOS_ENABLE_ROCM) ||        \
+    defined(KOKKOS_ENABLE_OPENMPTARGET)
+#define KOKKOS_INTERNAL_ENABLE_NON_CUDA_BACKEND
 #endif
 
-#if !defined(KOKKOS_ENABLE_THREADS) && !defined(KOKKOS_ENABLE_CUDA) && \
+#if !defined(KOKKOS_ENABLE_THREADS) && !defined(KOKKOS_ENABLE_CUDA) &&    \
     !defined(KOKKOS_ENABLE_OPENMP) && !defined(KOKKOS_ENABLE_QTHREADS) && \
-    !defined(KOKKOS_ENABLE_HPX) && \
-    !defined(KOKKOS_ENABLE_ROCM) && !defined(KOKKOS_ENABLE_OPENMPTARGET)
-  #define KOKKOS_INTERNAL_NOT_PARALLEL
+    !defined(KOKKOS_ENABLE_HPX) && !defined(KOKKOS_ENABLE_ROCM) &&        \
+    !defined(KOKKOS_ENABLE_OPENMPTARGET)
+#define KOKKOS_INTERNAL_NOT_PARALLEL
 #endif
 
 #define KOKKOS_ENABLE_CXX11_DISPATCH_LAMBDA
 
-#if defined( KOKKOS_ENABLE_CUDA ) && defined( __CUDACC__ )
-  // Compiling with a CUDA compiler.
-  //
-  //  Include <cuda.h> to pick up the CUDA_VERSION macro defined as:
-  //    CUDA_VERSION = ( MAJOR_VERSION * 1000 ) + ( MINOR_VERSION * 10 )
-  //
-  //  When generating device code the __CUDA_ARCH__ macro is defined as:
-  //    __CUDA_ARCH__ = ( MAJOR_CAPABILITY * 100 ) + ( MINOR_CAPABILITY * 10 )
+#if defined(KOKKOS_ENABLE_CUDA) && defined(__CUDACC__)
+// Compiling with a CUDA compiler.
+//
+//  Include <cuda.h> to pick up the CUDA_VERSION macro defined as:
+//    CUDA_VERSION = ( MAJOR_VERSION * 1000 ) + ( MINOR_VERSION * 10 )
+//
+//  When generating device code the __CUDA_ARCH__ macro is defined as:
+//    __CUDA_ARCH__ = ( MAJOR_CAPABILITY * 100 ) + ( MINOR_CAPABILITY * 10 )
 
-  #include <cuda_runtime.h>
-  #include <cuda.h>
+#include <cuda_runtime.h>
+#include <cuda.h>
 
-  #if !defined( CUDA_VERSION )
-    #error "#include <cuda.h> did not define CUDA_VERSION."
-  #endif
+#if !defined(CUDA_VERSION)
+#error "#include <cuda.h> did not define CUDA_VERSION."
+#endif
 
-  #if ( CUDA_VERSION < 7000 )
-    // CUDA supports C++11 in device code starting with version 7.0.
-    // This includes auto type and device code internal lambdas.
-    #error "Cuda version 7.0 or greater required."
-  #endif
+#if (CUDA_VERSION < 7000)
+// CUDA supports C++11 in device code starting with version 7.0.
+// This includes auto type and device code internal lambdas.
+#error "Cuda version 7.0 or greater required."
+#endif
 
-  #if defined( __CUDA_ARCH__ ) && ( __CUDA_ARCH__ < 300 )
-    // Compiling with CUDA compiler for device code.
-    #error "Cuda device capability >= 3.0 is required."
-  #endif
+#if defined(__CUDA_ARCH__) && (__CUDA_ARCH__ < 300)
+// Compiling with CUDA compiler for device code.
+#error "Cuda device capability >= 3.0 is required."
+#endif
 
-  #ifdef KOKKOS_ENABLE_CUDA_LAMBDA
-    #if ( CUDA_VERSION < 7050 )
-      // CUDA supports C++11 lambdas generated in host code to be given
-      // to the device starting with version 7.5. But the release candidate (7.5.6)
-      // still identifies as 7.0.
-      #error "Cuda version 7.5 or greater required for host-to-device Lambda support."
-    #endif
+#ifdef KOKKOS_ENABLE_CUDA_LAMBDA
+#if (CUDA_VERSION < 7050)
+// CUDA supports C++11 lambdas generated in host code to be given
+// to the device starting with version 7.5. But the release candidate (7.5.6)
+// still identifies as 7.0.
+#error "Cuda version 7.5 or greater required for host-to-device Lambda support."
+#endif
 
-    #if ( CUDA_VERSION < 8000 ) && defined( __NVCC__ )
-      #define KOKKOS_LAMBDA [=]__device__
-      #if defined( KOKKOS_INTERNAL_ENABLE_NON_CUDA_BACKEND )
-        #undef KOKKOS_ENABLE_CXX11_DISPATCH_LAMBDA
-      #endif
-    #else
-      #define KOKKOS_LAMBDA [=]__host__ __device__
+#if (CUDA_VERSION < 8000) && defined(__NVCC__)
+#define KOKKOS_LAMBDA [=] __device__
+#if defined(KOKKOS_INTERNAL_ENABLE_NON_CUDA_BACKEND)
+#undef KOKKOS_ENABLE_CXX11_DISPATCH_LAMBDA
+#endif
+#else
+#define KOKKOS_LAMBDA [=] __host__ __device__
 
-      #if defined( KOKKOS_ENABLE_CXX17 ) || defined( KOKKOS_ENABLE_CXX20 )
-        #define KOKKOS_CLASS_LAMBDA        [=,*this] __host__ __device__
-      #endif
-    #endif
+#if defined(KOKKOS_ENABLE_CXX17) || defined(KOKKOS_ENABLE_CXX20)
+#define KOKKOS_CLASS_LAMBDA [ =, *this ] __host__ __device__
+#endif
+#endif
 
-    #if defined( __NVCC__ )
-      #define KOKKOS_IMPL_NEED_FUNCTOR_WRAPPER
-    #endif
-  #else // !defined(KOKKOS_ENABLE_CUDA_LAMBDA)
-    #undef KOKKOS_ENABLE_CXX11_DISPATCH_LAMBDA
-  #endif // !defined(KOKKOS_ENABLE_CUDA_LAMBDA)
+#if defined(__NVCC__)
+#define KOKKOS_IMPL_NEED_FUNCTOR_WRAPPER
+#endif
+#else  // !defined(KOKKOS_ENABLE_CUDA_LAMBDA)
+#undef KOKKOS_ENABLE_CXX11_DISPATCH_LAMBDA
+#endif  // !defined(KOKKOS_ENABLE_CUDA_LAMBDA)
 
-  #if ( 9000 <= CUDA_VERSION ) && ( CUDA_VERSION < 10000 )
-    // CUDA 9 introduced an incorrect warning,
-    // see https://github.com/kokkos/kokkos/issues/1470
-    #define KOKKOS_CUDA_9_DEFAULTED_BUG_WORKAROUND
-  #endif
+#if (9000 <= CUDA_VERSION) && (CUDA_VERSION < 10000)
+// CUDA 9 introduced an incorrect warning,
+// see https://github.com/kokkos/kokkos/issues/1470
+#define KOKKOS_CUDA_9_DEFAULTED_BUG_WORKAROUND
+#endif
 
-  #if ( 10000 > CUDA_VERSION )
-    #define KOKKOS_ENABLE_PRE_CUDA_10_DEPRECATION_API
-  #endif
+#if (10000 > CUDA_VERSION)
+#define KOKKOS_ENABLE_PRE_CUDA_10_DEPRECATION_API
+#endif
 
-  #if defined(__CUDA_ARCH__) && (__CUDA_ARCH__ >= 700)
-    // PTX atomics with memory order semantics are only available on volta and later
-    #if !defined(KOKKOS_DISABLE_CUDA_ASM)
-      #if !defined(KOKKOS_ENABLE_CUDA_ASM)
-        #define KOKKOS_ENABLE_CUDA_ASM
-        #if !defined(KOKKOS_DISABLE_CUDA_ASM_ATOMICS)
-          #define KOKKOS_ENABLE_CUDA_ASM_ATOMICS
-        #endif
-      #endif
-    #endif
-  #endif
-
-
-#endif // #if defined( KOKKOS_ENABLE_CUDA ) && defined( __CUDACC__ )
+#if defined(__CUDA_ARCH__) && (__CUDA_ARCH__ >= 700)
+// PTX atomics with memory order semantics are only available on volta and later
+#if !defined(KOKKOS_DISABLE_CUDA_ASM)
+#if !defined(KOKKOS_ENABLE_CUDA_ASM)
+#define KOKKOS_ENABLE_CUDA_ASM
+#if !defined(KOKKOS_DISABLE_CUDA_ASM_ATOMICS)
+#define KOKKOS_ENABLE_CUDA_ASM_ATOMICS
+#endif
+#endif
+#endif
+#endif
 
+#endif  // #if defined( KOKKOS_ENABLE_CUDA ) && defined( __CUDACC__ )
 
 //----------------------------------------------------------------------------
 // Mapping compiler built-ins to KOKKOS_COMPILER_*** macros
 
-#if defined( __NVCC__ )
-  // NVIDIA compiler is being used.
-  // Code is parsed and separated into host and device code.
-  // Host code is compiled again with another compiler.
-  // Device code is compile to 'ptx'.
-  #define KOKKOS_COMPILER_NVCC __NVCC__
-#endif // #if defined( __NVCC__ )
+#if defined(__NVCC__)
+// NVIDIA compiler is being used.
+// Code is parsed and separated into host and device code.
+// Host code is compiled again with another compiler.
+// Device code is compile to 'ptx'.
+#define KOKKOS_COMPILER_NVCC __NVCC__
+#endif  // #if defined( __NVCC__ )
 
-#if !defined( KOKKOS_LAMBDA )
-  #define KOKKOS_LAMBDA [=]
+#if !defined(KOKKOS_LAMBDA)
+#define KOKKOS_LAMBDA [=]
 #endif
 
-#if (defined( KOKKOS_ENABLE_CXX17 ) || defined( KOKKOS_ENABLE_CXX20) )&& !defined( KOKKOS_CLASS_LAMBDA )
-  #define KOKKOS_CLASS_LAMBDA [=,*this]
+#if (defined(KOKKOS_ENABLE_CXX17) || defined(KOKKOS_ENABLE_CXX20)) && \
+    !defined(KOKKOS_CLASS_LAMBDA)
+#define KOKKOS_CLASS_LAMBDA [ =, *this ]
 #endif
 
 //#if !defined( __CUDA_ARCH__ ) // Not compiling Cuda code to 'ptx'.
 
 // Intel compiler for host code.
 
-#if defined( __INTEL_COMPILER )
-  #define KOKKOS_COMPILER_INTEL __INTEL_COMPILER
-#elif defined( __ICC )
-  // Old define
-  #define KOKKOS_COMPILER_INTEL __ICC
-#elif defined( __ECC )
-  // Very old define
-  #define KOKKOS_COMPILER_INTEL __ECC
+#if defined(__INTEL_COMPILER)
+#define KOKKOS_COMPILER_INTEL __INTEL_COMPILER
+#elif defined(__ICC)
+// Old define
+#define KOKKOS_COMPILER_INTEL __ICC
+#elif defined(__ECC)
+// Very old define
+#define KOKKOS_COMPILER_INTEL __ECC
 #endif
 
 // CRAY compiler for host code
-#if defined( _CRAYC )
-  #define KOKKOS_COMPILER_CRAYC _CRAYC
+#if defined(_CRAYC)
+#define KOKKOS_COMPILER_CRAYC _CRAYC
 #endif
 
-#if defined( __IBMCPP__ )
-  // IBM C++
-  #define KOKKOS_COMPILER_IBM __IBMCPP__
-#elif defined( __IBMC__ )
-  #define KOKKOS_COMPILER_IBM __IBMC__
+#if defined(__IBMCPP__)
+// IBM C++
+#define KOKKOS_COMPILER_IBM __IBMCPP__
+#elif defined(__IBMC__)
+#define KOKKOS_COMPILER_IBM __IBMC__
 #endif
 
-#if defined( __APPLE_CC__ )
-  #define KOKKOS_COMPILER_APPLECC __APPLE_CC__
+#if defined(__APPLE_CC__)
+#define KOKKOS_COMPILER_APPLECC __APPLE_CC__
 #endif
 
-#if defined( __clang__ ) && !defined( KOKKOS_COMPILER_INTEL )
-  #define KOKKOS_COMPILER_CLANG __clang_major__*100+__clang_minor__*10+__clang_patchlevel__
+#if defined(__clang__) && !defined(KOKKOS_COMPILER_INTEL)
+#define KOKKOS_COMPILER_CLANG \
+  __clang_major__ * 100 + __clang_minor__ * 10 + __clang_patchlevel__
 #endif
 
-#if !defined( __clang__ ) && !defined( KOKKOS_COMPILER_INTEL ) &&defined( __GNUC__ )
-  #define KOKKOS_COMPILER_GNU __GNUC__*100+__GNUC_MINOR__*10+__GNUC_PATCHLEVEL__
+#if !defined(__clang__) && !defined(KOKKOS_COMPILER_INTEL) && defined(__GNUC__)
+#define KOKKOS_COMPILER_GNU \
+  __GNUC__ * 100 + __GNUC_MINOR__ * 10 + __GNUC_PATCHLEVEL__
 
-  #if ( 472 > KOKKOS_COMPILER_GNU )
-    #error "Compiling with GCC version earlier than 4.7.2 is not supported."
-  #endif
+#if (472 > KOKKOS_COMPILER_GNU)
+#error "Compiling with GCC version earlier than 4.7.2 is not supported."
+#endif
 #endif
 
-#if defined( __PGIC__ )
-  #define KOKKOS_COMPILER_PGI __PGIC__*100+__PGIC_MINOR__*10+__PGIC_PATCHLEVEL__
+#if defined(__PGIC__)
+#define KOKKOS_COMPILER_PGI \
+  __PGIC__ * 100 + __PGIC_MINOR__ * 10 + __PGIC_PATCHLEVEL__
 
-  #if ( 1540 > KOKKOS_COMPILER_PGI )
-    #error "Compiling with PGI version earlier than 15.4 is not supported."
-  #endif
+#if (1540 > KOKKOS_COMPILER_PGI)
+#error "Compiling with PGI version earlier than 15.4 is not supported."
+#endif
 #endif
 
 //#endif // #if !defined( __CUDA_ARCH__ )
 //----------------------------------------------------------------------------
 // Language info: C++, CUDA, OPENMP
 
-#if defined( KOKKOS_ENABLE_CUDA )
-  // Compiling Cuda code to 'ptx'
+#if defined(KOKKOS_ENABLE_CUDA)
+// Compiling Cuda code to 'ptx'
 
-  #define KOKKOS_FORCEINLINE_FUNCTION  __device__  __host__  __forceinline__
-  #define KOKKOS_INLINE_FUNCTION       __device__  __host__  inline
-  #define KOKKOS_FUNCTION              __device__  __host__
-  #if defined( KOKKOS_COMPILER_NVCC )
-    #define KOKKOS_INLINE_FUNCTION_DELETED inline
-  #else
-    #define KOKKOS_INLINE_FUNCTION_DELETED __device__  __host__  inline
-  #endif
-#endif // #if defined( __CUDA_ARCH__ )
+#define KOKKOS_FORCEINLINE_FUNCTION __device__ __host__ __forceinline__
+#define KOKKOS_IMPL_FORCEINLINE __forceinline__
+#define KOKKOS_INLINE_FUNCTION __device__ __host__ inline
+#define KOKKOS_FUNCTION __device__ __host__
+#if defined(KOKKOS_COMPILER_NVCC)
+#define KOKKOS_INLINE_FUNCTION_DELETED inline
+#else
+#define KOKKOS_INLINE_FUNCTION_DELETED __device__ __host__ inline
+#endif
+#endif  // #if defined( __CUDA_ARCH__ )
 
-#if defined( KOKKOS_ENABLE_ROCM ) && defined( __HCC__ )
+#if defined(KOKKOS_ENABLE_ROCM) && defined(__HCC__)
 
-  #define KOKKOS_FORCEINLINE_FUNCTION  __attribute__((amp,cpu)) inline
-  #define KOKKOS_INLINE_FUNCTION       __attribute__((amp,cpu)) inline
-  #define KOKKOS_FUNCTION              __attribute__((amp,cpu))
-  #define KOKKOS_LAMBDA                [=] __attribute__((amp,cpu))
+#define KOKKOS_FORCEINLINE_FUNCTION __attribute__((amp, cpu)) inline
+#define KOKKOS_INLINE_FUNCTION __attribute__((amp, cpu)) inline
+#define KOKKOS_FUNCTION __attribute__((amp, cpu))
+#define KOKKOS_LAMBDA [=] __attribute__((amp, cpu))
 #endif
 
-#if defined( _OPENMP )
-  //  Compiling with OpenMP.
-  //  The value of _OPENMP is an integer value YYYYMM
-  //  where YYYY and MM are the year and month designation
-  //  of the supported OpenMP API version.
-#endif // #if defined( _OPENMP )
+#if defined(_OPENMP)
+//  Compiling with OpenMP.
+//  The value of _OPENMP is an integer value YYYYMM
+//  where YYYY and MM are the year and month designation
+//  of the supported OpenMP API version.
+#endif  // #if defined( _OPENMP )
 
 //----------------------------------------------------------------------------
 // Intel compiler macros
 
-#if defined( KOKKOS_COMPILER_INTEL )
-  #define KOKKOS_ENABLE_PRAGMA_UNROLL 1
-  #define KOKKOS_ENABLE_PRAGMA_LOOPCOUNT 1
-  #define KOKKOS_ENABLE_PRAGMA_VECTOR 1
-  #if ( 1800 > KOKKOS_COMPILER_INTEL )
-    #define KOKKOS_ENABLE_PRAGMA_SIMD 1
-  #endif
+#if defined(KOKKOS_COMPILER_INTEL)
+#define KOKKOS_ENABLE_PRAGMA_UNROLL 1
+#define KOKKOS_ENABLE_PRAGMA_LOOPCOUNT 1
+#define KOKKOS_ENABLE_PRAGMA_VECTOR 1
+#if (1800 > KOKKOS_COMPILER_INTEL)
+#define KOKKOS_ENABLE_PRAGMA_SIMD 1
+#endif
 
-  #if ( __INTEL_COMPILER > 1400 )
-    #define KOKKOS_ENABLE_PRAGMA_IVDEP 1
-  #endif
+#if (__INTEL_COMPILER > 1400)
+#define KOKKOS_ENABLE_PRAGMA_IVDEP 1
+#endif
 
-  #if ! defined( KOKKOS_MEMORY_ALIGNMENT )
-    #define KOKKOS_MEMORY_ALIGNMENT 64
-  #endif
+#if !defined(KOKKOS_MEMORY_ALIGNMENT)
+#define KOKKOS_MEMORY_ALIGNMENT 64
+#endif
 
-  #define KOKKOS_RESTRICT __restrict__
+#define KOKKOS_RESTRICT __restrict__
 
-  #ifndef KOKKOS_IMPL_ALIGN_PTR
-    #define KOKKOS_IMPL_ALIGN_PTR(size) __attribute__((align_value(size)))
-  #endif
+#ifndef KOKKOS_IMPL_ALIGN_PTR
+#define KOKKOS_IMPL_ALIGN_PTR(size) __attribute__((align_value(size)))
+#endif
 
-  #if ( 1400 > KOKKOS_COMPILER_INTEL )
-    #if ( 1300 > KOKKOS_COMPILER_INTEL )
-      #error "Compiling with Intel version earlier than 13.0 is not supported. Official minimal version is 14.0."
-    #else
-      #warning "Compiling with Intel version 13.x probably works but is not officially supported. Official minimal version is 14.0."
-    #endif
-  #endif
+#if (1400 > KOKKOS_COMPILER_INTEL)
+#if (1300 > KOKKOS_COMPILER_INTEL)
+#error \
+    "Compiling with Intel version earlier than 13.0 is not supported. Official minimal version is 14.0."
+#else
+#warning \
+    "Compiling with Intel version 13.x probably works but is not officially supported. Official minimal version is 14.0."
+#endif
+#endif
 
-  #if !defined( KOKKOS_ENABLE_ASM ) && !defined( _WIN32 )
-    #define KOKKOS_ENABLE_ASM 1
-  #endif
+#if !defined(KOKKOS_ENABLE_ASM) && !defined(_WIN32)
+#define KOKKOS_ENABLE_ASM 1
+#endif
 
-  #if !defined( KOKKOS_FORCEINLINE_FUNCTION )
-    #if !defined( _WIN32 )
-      #define KOKKOS_FORCEINLINE_FUNCTION  inline __attribute__((always_inline))
-    #else
-      #define KOKKOS_FORCEINLINE_FUNCTION inline
-    #endif
-  #endif
+#if !defined(KOKKOS_FORCEINLINE_FUNCTION)
+#if !defined(_WIN32)
+#define KOKKOS_FORCEINLINE_FUNCTION inline __attribute__((always_inline))
+#define KOKKOS_IMPL_FORCEINLINE __attribute__((always_inline))
+#else
+#define KOKKOS_FORCEINLINE_FUNCTION inline
+#endif
+#endif
 
-  #if defined( KOKKOS_ARCH_AVX512MIC )
-      #define KOKKOS_ENABLE_RFO_PREFETCH 1
-      #if (KOKKOS_COMPILER_INTEL < 1800) && !defined(KOKKOS_KNL_USE_ASM_WORKAROUND)
-        #define KOKKOS_KNL_USE_ASM_WORKAROUND 1
-      #endif
-  #endif
+#if defined(KOKKOS_ARCH_AVX512MIC)
+#define KOKKOS_ENABLE_RFO_PREFETCH 1
+#if (KOKKOS_COMPILER_INTEL < 1800) && !defined(KOKKOS_KNL_USE_ASM_WORKAROUND)
+#define KOKKOS_KNL_USE_ASM_WORKAROUND 1
+#endif
+#endif
 
-  #if defined( __MIC__ )
-    // Compiling for Xeon Phi
-  #endif
+#if defined(__MIC__)
+// Compiling for Xeon Phi
+#endif
 #endif
 
 //----------------------------------------------------------------------------
 // Cray compiler macros
 
-#if defined( KOKKOS_COMPILER_CRAYC )
+#if defined(KOKKOS_COMPILER_CRAYC)
 #endif
 
 //----------------------------------------------------------------------------
 // IBM Compiler macros
 
-#if defined( KOKKOS_COMPILER_IBM )
-  #define KOKKOS_ENABLE_PRAGMA_UNROLL 1
-  //#define KOKKOS_ENABLE_PRAGMA_IVDEP 1
-  //#define KOKKOS_ENABLE_PRAGMA_LOOPCOUNT 1
-  //#define KOKKOS_ENABLE_PRAGMA_VECTOR 1
-  //#define KOKKOS_ENABLE_PRAGMA_SIMD 1
+#if defined(KOKKOS_COMPILER_IBM)
+#define KOKKOS_ENABLE_PRAGMA_UNROLL 1
+//#define KOKKOS_ENABLE_PRAGMA_IVDEP 1
+//#define KOKKOS_ENABLE_PRAGMA_LOOPCOUNT 1
+//#define KOKKOS_ENABLE_PRAGMA_VECTOR 1
+//#define KOKKOS_ENABLE_PRAGMA_SIMD 1
 
-  #if ! defined( KOKKOS_ENABLE_ASM )
-    #define KOKKOS_ENABLE_ASM 1
-  #endif
+#if !defined(KOKKOS_ENABLE_ASM)
+#define KOKKOS_ENABLE_ASM 1
+#endif
 #endif
 
 //----------------------------------------------------------------------------
 // CLANG compiler macros
 
-#if defined( KOKKOS_COMPILER_CLANG )
-  //#define KOKKOS_ENABLE_PRAGMA_UNROLL 1
-  //#define KOKKOS_ENABLE_PRAGMA_IVDEP 1
-  //#define KOKKOS_ENABLE_PRAGMA_LOOPCOUNT 1
-  //#define KOKKOS_ENABLE_PRAGMA_VECTOR 1
-  //#define KOKKOS_ENABLE_PRAGMA_SIMD 1
+#if defined(KOKKOS_COMPILER_CLANG)
+//#define KOKKOS_ENABLE_PRAGMA_UNROLL 1
+//#define KOKKOS_ENABLE_PRAGMA_IVDEP 1
+//#define KOKKOS_ENABLE_PRAGMA_LOOPCOUNT 1
+//#define KOKKOS_ENABLE_PRAGMA_VECTOR 1
+//#define KOKKOS_ENABLE_PRAGMA_SIMD 1
 
-  #if !defined( KOKKOS_FORCEINLINE_FUNCTION )
-    #define KOKKOS_FORCEINLINE_FUNCTION  inline __attribute__((always_inline))
-  #endif
+#if !defined(KOKKOS_FORCEINLINE_FUNCTION)
+#define KOKKOS_FORCEINLINE_FUNCTION inline __attribute__((always_inline))
+#define KOKKOS_IMPL_FORCEINLINE __attribute__((always_inline))
+#endif
 
-  #if !defined( KOKKOS_IMPL_ALIGN_PTR )
-    #define KOKKOS_IMPL_ALIGN_PTR(size) __attribute__((aligned(size)))
-  #endif
+#if !defined(KOKKOS_IMPL_ALIGN_PTR)
+#define KOKKOS_IMPL_ALIGN_PTR(size) __attribute__((aligned(size)))
+#endif
 
 #endif
 
 //----------------------------------------------------------------------------
 // GNU Compiler macros
 
-#if defined( KOKKOS_COMPILER_GNU )
-  //#define KOKKOS_ENABLE_PRAGMA_UNROLL 1
-  //#define KOKKOS_ENABLE_PRAGMA_IVDEP 1
-  //#define KOKKOS_ENABLE_PRAGMA_LOOPCOUNT 1
-  //#define KOKKOS_ENABLE_PRAGMA_VECTOR 1
-  //#define KOKKOS_ENABLE_PRAGMA_SIMD 1
+#if defined(KOKKOS_COMPILER_GNU)
+//#define KOKKOS_ENABLE_PRAGMA_UNROLL 1
+//#define KOKKOS_ENABLE_PRAGMA_IVDEP 1
+//#define KOKKOS_ENABLE_PRAGMA_LOOPCOUNT 1
+//#define KOKKOS_ENABLE_PRAGMA_VECTOR 1
+//#define KOKKOS_ENABLE_PRAGMA_SIMD 1
 
-  #if defined( KOKKOS_ARCH_AVX512MIC )
-      #define KOKKOS_ENABLE_RFO_PREFETCH 1
-  #endif
+#if defined(KOKKOS_ARCH_AVX512MIC)
+#define KOKKOS_ENABLE_RFO_PREFETCH 1
+#endif
 
-  #if !defined( KOKKOS_FORCEINLINE_FUNCTION )
-    #define KOKKOS_FORCEINLINE_FUNCTION inline __attribute__((always_inline))
-  #endif
+#if !defined(KOKKOS_FORCEINLINE_FUNCTION)
+#define KOKKOS_FORCEINLINE_FUNCTION inline __attribute__((always_inline))
+#define KOKKOS_IMPL_FORCEINLINE __attribute__((always_inline))
+#endif
 
-  #define KOKKOS_RESTRICT __restrict__
+#define KOKKOS_RESTRICT __restrict__
 
-  #if !defined( KOKKOS_ENABLE_ASM ) && !defined( __PGIC__ ) && \
-      ( defined( __amd64 ) || defined( __amd64__ ) || \
-        defined( __x86_64 ) || defined( __x86_64__ ) || \
-	defined(__PPC64__) )
-    #define KOKKOS_ENABLE_ASM 1
-  #endif
+#if !defined(KOKKOS_ENABLE_ASM) && !defined(__PGIC__) &&            \
+    (defined(__amd64) || defined(__amd64__) || defined(__x86_64) || \
+     defined(__x86_64__) || defined(__PPC64__))
+#define KOKKOS_ENABLE_ASM 1
+#endif
 #endif
 
 //----------------------------------------------------------------------------
 
-#if defined( KOKKOS_COMPILER_PGI )
-  #define KOKKOS_ENABLE_PRAGMA_UNROLL 1
-  #define KOKKOS_ENABLE_PRAGMA_IVDEP 1
-  //#define KOKKOS_ENABLE_PRAGMA_LOOPCOUNT 1
-  #define KOKKOS_ENABLE_PRAGMA_VECTOR 1
-  //#define KOKKOS_ENABLE_PRAGMA_SIMD 1
+#if defined(KOKKOS_COMPILER_PGI)
+#define KOKKOS_ENABLE_PRAGMA_UNROLL 1
+#define KOKKOS_ENABLE_PRAGMA_IVDEP 1
+//#define KOKKOS_ENABLE_PRAGMA_LOOPCOUNT 1
+#define KOKKOS_ENABLE_PRAGMA_VECTOR 1
+//#define KOKKOS_ENABLE_PRAGMA_SIMD 1
 #endif
 
 //----------------------------------------------------------------------------
 
-#if defined( KOKKOS_COMPILER_NVCC )
-  #if defined( __CUDA_ARCH__ )
-    #define KOKKOS_ENABLE_PRAGMA_UNROLL 1
-  #endif
+#if defined(KOKKOS_COMPILER_NVCC)
+#if defined(__CUDA_ARCH__)
+#define KOKKOS_ENABLE_PRAGMA_UNROLL 1
+#endif
 #endif
 
 //----------------------------------------------------------------------------
 // Define function marking macros if compiler specific macros are undefined:
 
-#if !defined( KOKKOS_FORCEINLINE_FUNCTION )
-  define KOKKOS_FORCEINLINE_FUNCTION  inline
+#if !defined(KOKKOS_FORCEINLINE_FUNCTION)
+#define KOKKOS_FORCEINLINE_FUNCTION inline
 #endif
 
-#if !defined( KOKKOS_INLINE_FUNCTION )
-  #define KOKKOS_INLINE_FUNCTION  inline
+#if !defined(KOKKOS_IMPL_FORCEINLINE)
+#define KOKKOS_IMPL_FORCEINLINE inline
 #endif
 
-#if !defined( KOKKOS_FUNCTION )
-  #define KOKKOS_FUNCTION /**/
+#if !defined(KOKKOS_INLINE_FUNCTION)
+#define KOKKOS_INLINE_FUNCTION inline
 #endif
 
-#if !defined( KOKKOS_INLINE_FUNCTION_DELETED )
-  #define KOKKOS_INLINE_FUNCTION_DELETED inline
+#if !defined(KOKKOS_FUNCTION)
+#define KOKKOS_FUNCTION /**/
+#endif
+
+#if !defined(KOKKOS_INLINE_FUNCTION_DELETED)
+#define KOKKOS_INLINE_FUNCTION_DELETED inline
 #endif
 //----------------------------------------------------------------------------
 // Define empty macro for restrict if necessary:
 
-#if !defined( KOKKOS_RESTRICT )
-  #define KOKKOS_RESTRICT
+#if !defined(KOKKOS_RESTRICT)
+#define KOKKOS_RESTRICT
 #endif
 
 //----------------------------------------------------------------------------
 // Define Macro for alignment:
 
-#if ! defined( KOKKOS_MEMORY_ALIGNMENT )
-  #define KOKKOS_MEMORY_ALIGNMENT 64
+#if !defined(KOKKOS_MEMORY_ALIGNMENT)
+#define KOKKOS_MEMORY_ALIGNMENT 64
 #endif
 
-#if ! defined( KOKKOS_MEMORY_ALIGNMENT_THRESHOLD )
-  #define KOKKOS_MEMORY_ALIGNMENT_THRESHOLD 1
+#if !defined(KOKKOS_MEMORY_ALIGNMENT_THRESHOLD)
+#define KOKKOS_MEMORY_ALIGNMENT_THRESHOLD 1
 #endif
 
-#if !defined( KOKKOS_IMPL_ALIGN_PTR )
-  #define KOKKOS_IMPL_ALIGN_PTR(size) /* */
+#if !defined(KOKKOS_IMPL_ALIGN_PTR)
+#define KOKKOS_IMPL_ALIGN_PTR(size) /* */
 #endif
 
 //----------------------------------------------------------------------------
 // Determine the default execution space for parallel dispatch.
 // There is zero or one default execution space specified.
 
-#if 1 < ( ( defined( KOKKOS_ENABLE_DEFAULT_DEVICE_TYPE_CUDA ) ? 1 : 0 ) + \
-          ( defined( KOKKOS_ENABLE_DEFAULT_DEVICE_TYPE_ROCM ) ? 1 : 0 ) + \
-          ( defined( KOKKOS_ENABLE_DEFAULT_DEVICE_TYPE_OPENMPTARGET ) ? 1 : 0 ) + \
-          ( defined( KOKKOS_ENABLE_DEFAULT_DEVICE_TYPE_OPENMP ) ? 1 : 0 ) + \
-          ( defined( KOKKOS_ENABLE_DEFAULT_DEVICE_TYPE_THREADS ) ? 1 : 0 ) + \
-          ( defined( KOKKOS_ENABLE_DEFAULT_DEVICE_TYPE_QTHREADS ) ? 1 : 0 ) + \
-          ( defined( KOKKOS_ENABLE_DEFAULT_DEVICE_TYPE_HPX ) ? 1 : 0 ) + \
-          ( defined( KOKKOS_ENABLE_DEFAULT_DEVICE_TYPE_SERIAL ) ? 1 : 0 ) )
-  #error "More than one KOKKOS_ENABLE_DEFAULT_DEVICE_TYPE_* specified."
+#if 1 < ((defined(KOKKOS_ENABLE_DEFAULT_DEVICE_TYPE_CUDA) ? 1 : 0) +         \
+         (defined(KOKKOS_ENABLE_DEFAULT_DEVICE_TYPE_ROCM) ? 1 : 0) +         \
+         (defined(KOKKOS_ENABLE_DEFAULT_DEVICE_TYPE_OPENMPTARGET) ? 1 : 0) + \
+         (defined(KOKKOS_ENABLE_DEFAULT_DEVICE_TYPE_OPENMP) ? 1 : 0) +       \
+         (defined(KOKKOS_ENABLE_DEFAULT_DEVICE_TYPE_THREADS) ? 1 : 0) +      \
+         (defined(KOKKOS_ENABLE_DEFAULT_DEVICE_TYPE_QTHREADS) ? 1 : 0) +     \
+         (defined(KOKKOS_ENABLE_DEFAULT_DEVICE_TYPE_HPX) ? 1 : 0) +          \
+         (defined(KOKKOS_ENABLE_DEFAULT_DEVICE_TYPE_SERIAL) ? 1 : 0))
+#error "More than one KOKKOS_ENABLE_DEFAULT_DEVICE_TYPE_* specified."
 #endif
 
 // If default is not specified then chose from enabled execution spaces.
 // Priority: CUDA, OPENMP, THREADS, QTHREADS, HPX, SERIAL
-#if   defined( KOKKOS_ENABLE_DEFAULT_DEVICE_TYPE_CUDA )
-#elif defined( KOKKOS_ENABLE_DEFAULT_DEVICE_TYPE_ROCM )
-#elif defined( KOKKOS_ENABLE_DEFAULT_DEVICE_TYPE_OPENMPTARGET )
-#elif defined( KOKKOS_ENABLE_DEFAULT_DEVICE_TYPE_OPENMP )
-#elif defined( KOKKOS_ENABLE_DEFAULT_DEVICE_TYPE_THREADS )
+#if defined(KOKKOS_ENABLE_DEFAULT_DEVICE_TYPE_CUDA)
+#elif defined(KOKKOS_ENABLE_DEFAULT_DEVICE_TYPE_ROCM)
+#elif defined(KOKKOS_ENABLE_DEFAULT_DEVICE_TYPE_OPENMPTARGET)
+#elif defined(KOKKOS_ENABLE_DEFAULT_DEVICE_TYPE_OPENMP)
+#elif defined(KOKKOS_ENABLE_DEFAULT_DEVICE_TYPE_THREADS)
 //#elif defined( KOKKOS_ENABLE_DEFAULT_DEVICE_TYPE_QTHREADS )
-#elif defined( KOKKOS_ENABLE_DEFAULT_DEVICE_TYPE_HPX )
-#elif defined( KOKKOS_ENABLE_DEFAULT_DEVICE_TYPE_SERIAL )
-#elif defined( KOKKOS_ENABLE_CUDA )
-  #define KOKKOS_ENABLE_DEFAULT_DEVICE_TYPE_CUDA
-#elif defined( KOKKOS_ENABLE_ROCM )
-  #define KOKKOS_ENABLE_DEFAULT_DEVICE_TYPE_ROCM
-#elif defined( KOKKOS_ENABLE_OPENMPTARGET )
-  #define KOKKOS_ENABLE_DEFAULT_DEVICE_TYPE_OPENMPTARGET
-#elif defined( KOKKOS_ENABLE_OPENMP )
-  #define KOKKOS_ENABLE_DEFAULT_DEVICE_TYPE_OPENMP
-#elif defined( KOKKOS_ENABLE_THREADS )
-  #define KOKKOS_ENABLE_DEFAULT_DEVICE_TYPE_THREADS
+#elif defined(KOKKOS_ENABLE_DEFAULT_DEVICE_TYPE_HPX)
+#elif defined(KOKKOS_ENABLE_DEFAULT_DEVICE_TYPE_SERIAL)
+#elif defined(KOKKOS_ENABLE_CUDA)
+#define KOKKOS_ENABLE_DEFAULT_DEVICE_TYPE_CUDA
+#elif defined(KOKKOS_ENABLE_ROCM)
+#define KOKKOS_ENABLE_DEFAULT_DEVICE_TYPE_ROCM
+#elif defined(KOKKOS_ENABLE_OPENMPTARGET)
+#define KOKKOS_ENABLE_DEFAULT_DEVICE_TYPE_OPENMPTARGET
+#elif defined(KOKKOS_ENABLE_OPENMP)
+#define KOKKOS_ENABLE_DEFAULT_DEVICE_TYPE_OPENMP
+#elif defined(KOKKOS_ENABLE_THREADS)
+#define KOKKOS_ENABLE_DEFAULT_DEVICE_TYPE_THREADS
 //#elif defined( KOKKOS_ENABLE_QTHREADS )
 //  #define KOKKOS_ENABLE_DEFAULT_DEVICE_TYPE_QTHREADS
-#elif defined( KOKKOS_ENABLE_HPX )
-  #define KOKKOS_ENABLE_DEFAULT_DEVICE_TYPE_HPX
+#elif defined(KOKKOS_ENABLE_HPX)
+#define KOKKOS_ENABLE_DEFAULT_DEVICE_TYPE_HPX
 #else
-  #define KOKKOS_ENABLE_DEFAULT_DEVICE_TYPE_SERIAL
+#define KOKKOS_ENABLE_DEFAULT_DEVICE_TYPE_SERIAL
 #endif
 
 //----------------------------------------------------------------------------
 // Determine for what space the code is being compiled:
 
-#if defined( __CUDACC__ ) && defined( __CUDA_ARCH__ ) && defined( KOKKOS_ENABLE_CUDA )
-  #define KOKKOS_ACTIVE_EXECUTION_MEMORY_SPACE_CUDA
-#elif   defined( __HCC__ ) && defined( __HCC_ACCELERATOR__ ) && defined( KOKKOS_ENABLE_ROCM )
-  #define KOKKOS_ACTIVE_EXECUTION_MEMORY_SPACE_ROCM_GPU
+#if defined(__CUDACC__) && defined(__CUDA_ARCH__) && defined(KOKKOS_ENABLE_CUDA)
+#define KOKKOS_ACTIVE_EXECUTION_MEMORY_SPACE_CUDA
+#elif defined(__HCC__) && defined(__HCC_ACCELERATOR__) && \
+    defined(KOKKOS_ENABLE_ROCM)
+#define KOKKOS_ACTIVE_EXECUTION_MEMORY_SPACE_ROCM_GPU
 #else
-  #define KOKKOS_ACTIVE_EXECUTION_MEMORY_SPACE_HOST
+#define KOKKOS_ACTIVE_EXECUTION_MEMORY_SPACE_HOST
 #endif
 
 //----------------------------------------------------------------------------
 
-#if ( defined( _POSIX_C_SOURCE ) && _POSIX_C_SOURCE >= 200112L ) || \
-    ( defined( _XOPEN_SOURCE )   && _XOPEN_SOURCE   >= 600 )
-  #if defined( KOKKOS_ENABLE_PERFORMANCE_POSIX_MEMALIGN )
-    #define KOKKOS_ENABLE_POSIX_MEMALIGN 1
-  #endif
+#if (defined(_POSIX_C_SOURCE) && _POSIX_C_SOURCE >= 200112L) || \
+    (defined(_XOPEN_SOURCE) && _XOPEN_SOURCE >= 600)
+#if defined(KOKKOS_ENABLE_PERFORMANCE_POSIX_MEMALIGN)
+#define KOKKOS_ENABLE_POSIX_MEMALIGN 1
+#endif
 #endif
 
 //----------------------------------------------------------------------------
@@ -547,53 +561,65 @@
 // and use relocateable device code to enable the task policy.
 // nvcc relocatable device code option: --relocatable-device-code=true
 
-#if ( defined( KOKKOS_ENABLE_CUDA ) )
-  #if ( 8000 <= CUDA_VERSION ) && defined( KOKKOS_ENABLE_CUDA_RELOCATABLE_DEVICE_CODE )
-  #define KOKKOS_ENABLE_TASKDAG
-  #endif
+#if (defined(KOKKOS_ENABLE_CUDA))
+#if (8000 <= CUDA_VERSION) && \
+    defined(KOKKOS_ENABLE_CUDA_RELOCATABLE_DEVICE_CODE)
+#define KOKKOS_ENABLE_TASKDAG
+#endif
 #else
-  #define KOKKOS_ENABLE_TASKDAG
+#define KOKKOS_ENABLE_TASKDAG
 #endif
 
-
-#if defined ( KOKKOS_ENABLE_CUDA )
-  #if ( 9000 <= CUDA_VERSION )
-  #define KOKKOS_IMPL_CUDA_VERSION_9_WORKAROUND
-  #if ( __CUDA_ARCH__ )
-    #define KOKKOS_IMPL_CUDA_SYNCWARP_NEEDS_MASK
-  #endif
-  #endif
+#if defined(KOKKOS_ENABLE_CUDA)
+#if (9000 <= CUDA_VERSION)
+#define KOKKOS_IMPL_CUDA_VERSION_9_WORKAROUND
+#if (__CUDA_ARCH__)
+#define KOKKOS_IMPL_CUDA_SYNCWARP_NEEDS_MASK
+#endif
+#endif
 #endif
 
 #define KOKKOS_INVALID_INDEX (~std::size_t(0))
 
 #ifdef KOKKOS_ENABLE_DEPRECATED_CODE
-  #define KOKKOS_IMPL_CTOR_DEFAULT_ARG 0
+#define KOKKOS_IMPL_CTOR_DEFAULT_ARG 0
 #else
-  #define KOKKOS_IMPL_CTOR_DEFAULT_ARG KOKKOS_INVALID_INDEX
+#define KOKKOS_IMPL_CTOR_DEFAULT_ARG KOKKOS_INVALID_INDEX
 #endif
 
-#if (defined(KOKKOS_ENABLE_CXX14) || defined(KOKKOS_ENABLE_CXX17) || defined(KOKKOS_ENABLE_CXX20))
-  #define KOKKOS_CONSTEXPR_14 constexpr
-  #define KOKKOS_DEPRECATED [[deprecated]]
-  #define KOKKOS_DEPRECATED_TRAILING_ATTRIBUTE
+#if (defined(KOKKOS_ENABLE_CXX14) || defined(KOKKOS_ENABLE_CXX17) || \
+     defined(KOKKOS_ENABLE_CXX20))
+#define KOKKOS_CONSTEXPR_14 constexpr
+#define KOKKOS_DEPRECATED [[deprecated]]
+#define KOKKOS_DEPRECATED_TRAILING_ATTRIBUTE
 #else
-  #define KOKKOS_CONSTEXPR_14
-  #if defined(KOKKOS_COMPILER_GNU) || defined(KOKKOS_COMPILER_CLANG)
-    #define KOKKOS_DEPRECATED
-    #define KOKKOS_DEPRECATED_TRAILING_ATTRIBUTE __attribute__ ((deprecated))
-  #else
-    #define KOKKOS_DEPRECATED
-    #define KOKKOS_DEPRECATED_TRAILING_ATTRIBUTE
-  #endif
+#define KOKKOS_CONSTEXPR_14
+#if defined(KOKKOS_COMPILER_GNU) || defined(KOKKOS_COMPILER_CLANG)
+#define KOKKOS_DEPRECATED
+#define KOKKOS_DEPRECATED_TRAILING_ATTRIBUTE __attribute__((deprecated))
+#else
+#define KOKKOS_DEPRECATED
+#define KOKKOS_DEPRECATED_TRAILING_ATTRIBUTE
+#endif
 #endif
-
 
 // DJS 05/28/2019: Bugfix: Issue 2155
-// Use KOKKOS_ENABLE_CUDA_LDG_INTRINSIC to avoid memory leak in RandomAccess View
+// Use KOKKOS_ENABLE_CUDA_LDG_INTRINSIC to avoid memory leak in RandomAccess
+// View
 #if defined(KOKKOS_ENABLE_CUDA) && !defined(KOKKOS_ENABLE_CUDA_LDG_INTRINSIC)
- #define KOKKOS_ENABLE_CUDA_LDG_INTRINSIC
+#define KOKKOS_ENABLE_CUDA_LDG_INTRINSIC
 #endif
 
-#endif // #ifndef KOKKOS_MACROS_HPP
+#if defined(KOKKOS_ENABLE_CXX17) || defined(KOKKOS_ENABLE_CXX20)
+#define KOKKOS_ATTRIBUTE_NODISCARD [[nodiscard]]
+#else
+#define KOKKOS_ATTRIBUTE_NODISCARD
+#endif
 
+#if defined(KOKKOS_COMPILER_GNU) || defined(KOKKOS_COMPILER_CLANG) || \
+    defined(KOKKOS_COMPILER_INTEL) || defined(KOKKOS_COMPILER_PGI)
+#define KOKKOS_IMPL_ENABLE_STACKTRACE
+#define KOKKOS_IMPL_ENABLE_CXXABI
+#endif
+
+#endif  // #ifndef KOKKOS_MACROS_HPP
diff --git a/lib/kokkos/core/src/Kokkos_MasterLock.hpp b/lib/kokkos/core/src/Kokkos_MasterLock.hpp
index 2db22d2fdd..3c45e131a0 100644
--- a/lib/kokkos/core/src/Kokkos_MasterLock.hpp
+++ b/lib/kokkos/core/src/Kokkos_MasterLock.hpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -46,7 +47,8 @@
 
 #include <Kokkos_Macros.hpp>
 
-namespace Kokkos { namespace Experimental {
+namespace Kokkos {
+namespace Experimental {
 
 // my be used to coordinate work between master instances
 // SHOULD NOT be used within a parallel algorithm
@@ -67,7 +69,7 @@ namespace Kokkos { namespace Experimental {
 template <typename ExecutionSpace>
 class MasterLock;
 
-}} // namespace Kokkos::Experimental
-
-#endif //KOKKOS_MASTER_LOCK_HPP
+}  // namespace Experimental
+}  // namespace Kokkos
 
+#endif  // KOKKOS_MASTER_LOCK_HPP
diff --git a/lib/kokkos/core/src/Kokkos_MemoryPool.hpp b/lib/kokkos/core/src/Kokkos_MemoryPool.hpp
index 365db2baec..5228f36612 100644
--- a/lib/kokkos/core/src/Kokkos_MemoryPool.hpp
+++ b/lib/kokkos/core/src/Kokkos_MemoryPool.hpp
@@ -1,13 +1,14 @@
 /*
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -36,7 +37,7 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 */
@@ -55,37 +56,34 @@ namespace Kokkos {
 namespace Impl {
 /* Report violation of size constraints:
  *   min_block_alloc_size <= max_block_alloc_size
- *   max_block_alloc_size <= min_superblock_size 
+ *   max_block_alloc_size <= min_superblock_size
  *   min_superblock_size  <= max_superblock_size
  *   min_superblock_size  <= min_total_alloc_size
- *   min_superblock_size  <= min_block_alloc_size * 
+ *   min_superblock_size  <= min_block_alloc_size *
  *                           max_block_per_superblock
  */
-void memory_pool_bounds_verification
-  ( size_t min_block_alloc_size
-  , size_t max_block_alloc_size
-  , size_t min_superblock_size
-  , size_t max_superblock_size
-  , size_t max_block_per_superblock
-  , size_t min_total_alloc_size
-  );
-}
-}
+void memory_pool_bounds_verification(size_t min_block_alloc_size,
+                                     size_t max_block_alloc_size,
+                                     size_t min_superblock_size,
+                                     size_t max_superblock_size,
+                                     size_t max_block_per_superblock,
+                                     size_t min_total_alloc_size);
+}  // namespace Impl
+}  // namespace Kokkos
 
 namespace Kokkos {
 
-template< typename DeviceType >
+template <typename DeviceType>
 class MemoryPool {
-private:
+ private:
+  typedef typename Kokkos::Impl::concurrent_bitset CB;
 
-  typedef typename Kokkos::Impl::concurrent_bitset CB ;
-
-  enum : uint32_t { bits_per_int_lg2  = CB::bits_per_int_lg2 };
-  enum : uint32_t { state_shift       = CB::state_shift };
-  enum : uint32_t { state_used_mask   = CB::state_used_mask };
+  enum : uint32_t { bits_per_int_lg2 = CB::bits_per_int_lg2 };
+  enum : uint32_t { state_shift = CB::state_shift };
+  enum : uint32_t { state_used_mask = CB::state_used_mask };
   enum : uint32_t { state_header_mask = CB::state_header_mask };
   enum : uint32_t { max_bit_count_lg2 = CB::max_bit_count_lg2 };
-  enum : uint32_t { max_bit_count     = CB::max_bit_count };
+  enum : uint32_t { max_bit_count = CB::max_bit_count };
 
   enum : uint32_t { HINT_PER_BLOCK_SIZE = 2 };
 
@@ -109,231 +107,219 @@ private:
    *  Thus A_block_size < B_block_size  <=>  A_block_state > B_block_state
    */
 
-  typedef typename DeviceType::memory_space base_memory_space ;
+  typedef typename DeviceType::memory_space base_memory_space;
 
-  enum { accessible =
-           Kokkos::Impl::MemorySpaceAccess< Kokkos::HostSpace 
-                                          , base_memory_space >::accessible };
+  enum {
+    accessible = Kokkos::Impl::MemorySpaceAccess<Kokkos::HostSpace,
+                                                 base_memory_space>::accessible
+  };
 
-  typedef Kokkos::Impl::SharedAllocationTracker Tracker ;
-  typedef Kokkos::Impl::SharedAllocationRecord
-    < base_memory_space >  Record ;
+  typedef Kokkos::Impl::SharedAllocationTracker Tracker;
+  typedef Kokkos::Impl::SharedAllocationRecord<base_memory_space> Record;
 
-  Tracker    m_tracker ;
-  uint32_t * m_sb_state_array ;
-  uint32_t   m_sb_state_size ;
-  uint32_t   m_sb_size_lg2 ;
-  uint32_t   m_max_block_size_lg2 ;
-  uint32_t   m_min_block_size_lg2 ;
-  int32_t    m_sb_count ;
-  int32_t    m_hint_offset ;   // Offset to K * #block_size array of hints
-  int32_t    m_data_offset ;   // Offset to 0th superblock data
-  int32_t    m_unused_padding ;
-
-public:
+  Tracker m_tracker;
+  uint32_t *m_sb_state_array;
+  uint32_t m_sb_state_size;
+  uint32_t m_sb_size_lg2;
+  uint32_t m_max_block_size_lg2;
+  uint32_t m_min_block_size_lg2;
+  int32_t m_sb_count;
+  int32_t m_hint_offset;  // Offset to K * #block_size array of hints
+  int32_t m_data_offset;  // Offset to 0th superblock data
+  int32_t m_unused_padding;
 
+ public:
   using memory_space = typename DeviceType::memory_space;
 
   /**\brief  The maximum size of a superblock and block */
-  enum : uint32_t { max_superblock_size      = 1LU << 31 /* 2 gigabytes */ };
+  enum : uint32_t { max_superblock_size = 1LU << 31 /* 2 gigabytes */ };
   enum : uint32_t { max_block_per_superblock = max_bit_count };
 
   //--------------------------------------------------------------------------
 
   KOKKOS_INLINE_FUNCTION
-  bool operator==(MemoryPool const& other) const
-    { return m_sb_state_array == other.m_sb_state_array; }
+  bool operator==(MemoryPool const &other) const {
+    return m_sb_state_array == other.m_sb_state_array;
+  }
 
   KOKKOS_INLINE_FUNCTION
-  size_t capacity() const noexcept
-    { return size_t(m_sb_count) << m_sb_size_lg2 ; }
+  size_t capacity() const noexcept {
+    return size_t(m_sb_count) << m_sb_size_lg2;
+  }
 
   KOKKOS_INLINE_FUNCTION
-  size_t min_block_size() const noexcept
-    { return ( 1LU << m_min_block_size_lg2 ); }
+  size_t min_block_size() const noexcept {
+    return (1LU << m_min_block_size_lg2);
+  }
 
   KOKKOS_INLINE_FUNCTION
-  size_t max_block_size() const noexcept
-    { return ( 1LU << m_max_block_size_lg2 ); }
+  size_t max_block_size() const noexcept {
+    return (1LU << m_max_block_size_lg2);
+  }
 
   struct usage_statistics {
-    size_t capacity_bytes ;       ///<  Capacity in bytes
-    size_t superblock_bytes ;     ///<  Superblock size in bytes
-    size_t max_block_bytes ;      ///<  Maximum block size in bytes
-    size_t min_block_bytes ;      ///<  Minimum block size in bytes
-    size_t capacity_superblocks ; ///<  Number of superblocks
-    size_t consumed_superblocks ; ///<  Superblocks assigned to allocations
-    size_t consumed_blocks ;  ///<  Number of allocations
-    size_t consumed_bytes ;   ///<  Bytes allocated
-    size_t reserved_blocks ;  ///<  Unallocated blocks in assigned superblocks
-    size_t reserved_bytes ;   ///<  Unallocated bytes in assigned superblocks
+    size_t capacity_bytes;        ///<  Capacity in bytes
+    size_t superblock_bytes;      ///<  Superblock size in bytes
+    size_t max_block_bytes;       ///<  Maximum block size in bytes
+    size_t min_block_bytes;       ///<  Minimum block size in bytes
+    size_t capacity_superblocks;  ///<  Number of superblocks
+    size_t consumed_superblocks;  ///<  Superblocks assigned to allocations
+    size_t consumed_blocks;       ///<  Number of allocations
+    size_t consumed_bytes;        ///<  Bytes allocated
+    size_t reserved_blocks;  ///<  Unallocated blocks in assigned superblocks
+    size_t reserved_bytes;   ///<  Unallocated bytes in assigned superblocks
   };
 
-  void get_usage_statistics( usage_statistics & stats ) const
-    {
-      Kokkos::HostSpace host ;
+  void get_usage_statistics(usage_statistics &stats) const {
+    Kokkos::HostSpace host;
 
-      const size_t alloc_size = m_hint_offset * sizeof(uint32_t);
+    const size_t alloc_size = m_hint_offset * sizeof(uint32_t);
 
-      uint32_t * const sb_state_array = 
-        accessible ? m_sb_state_array : (uint32_t *) host.allocate(alloc_size);
+    uint32_t *const sb_state_array =
+        accessible ? m_sb_state_array : (uint32_t *)host.allocate(alloc_size);
 
-      if ( ! accessible ) {
-        Kokkos::Impl::DeepCopy< Kokkos::HostSpace , base_memory_space >
-          ( sb_state_array , m_sb_state_array , alloc_size );
-      }
+    if (!accessible) {
+      Kokkos::Impl::DeepCopy<Kokkos::HostSpace, base_memory_space>(
+          sb_state_array, m_sb_state_array, alloc_size);
+    }
 
-      stats.superblock_bytes = ( 1LU << m_sb_size_lg2 );
-      stats.max_block_bytes  = ( 1LU << m_max_block_size_lg2 );
-      stats.min_block_bytes  = ( 1LU << m_min_block_size_lg2 );
-      stats.capacity_bytes   = stats.superblock_bytes * m_sb_count ;
-      stats.capacity_superblocks = m_sb_count ;
-      stats.consumed_superblocks = 0 ;
-      stats.consumed_blocks = 0 ;
-      stats.consumed_bytes  = 0 ;
-      stats.reserved_blocks = 0 ;
-      stats.reserved_bytes  = 0 ;
+    stats.superblock_bytes     = (1LU << m_sb_size_lg2);
+    stats.max_block_bytes      = (1LU << m_max_block_size_lg2);
+    stats.min_block_bytes      = (1LU << m_min_block_size_lg2);
+    stats.capacity_bytes       = stats.superblock_bytes * m_sb_count;
+    stats.capacity_superblocks = m_sb_count;
+    stats.consumed_superblocks = 0;
+    stats.consumed_blocks      = 0;
+    stats.consumed_bytes       = 0;
+    stats.reserved_blocks      = 0;
+    stats.reserved_bytes       = 0;
 
-      const uint32_t * sb_state_ptr = sb_state_array ;
+    const uint32_t *sb_state_ptr = sb_state_array;
 
-      for ( int32_t i = 0 ; i < m_sb_count
-          ; ++i , sb_state_ptr += m_sb_state_size ) {
+    for (int32_t i = 0; i < m_sb_count; ++i, sb_state_ptr += m_sb_state_size) {
+      const uint32_t block_count_lg2 = (*sb_state_ptr) >> state_shift;
 
-        const uint32_t block_count_lg2 = (*sb_state_ptr) >> state_shift ;
+      if (block_count_lg2) {
+        const uint32_t block_count    = 1u << block_count_lg2;
+        const uint32_t block_size_lg2 = m_sb_size_lg2 - block_count_lg2;
+        const uint32_t block_size     = 1u << block_size_lg2;
+        const uint32_t block_used     = (*sb_state_ptr) & state_used_mask;
 
-        if ( block_count_lg2 ) {
-          const uint32_t block_count    = 1u << block_count_lg2 ;
-          const uint32_t block_size_lg2 = m_sb_size_lg2 - block_count_lg2 ;
-          const uint32_t block_size     = 1u << block_size_lg2 ;
-          const uint32_t block_used     = (*sb_state_ptr) & state_used_mask ;
-
-          stats.consumed_superblocks++ ;
-          stats.consumed_blocks += block_used ;
-          stats.consumed_bytes  += block_used * block_size ;
-          stats.reserved_blocks += block_count - block_used ;
-          stats.reserved_bytes  += (block_count - block_used ) * block_size ;
-        }
-      }
-
-      if ( ! accessible ) {
-        host.deallocate( sb_state_array, alloc_size );
+        stats.consumed_superblocks++;
+        stats.consumed_blocks += block_used;
+        stats.consumed_bytes += block_used * block_size;
+        stats.reserved_blocks += block_count - block_used;
+        stats.reserved_bytes += (block_count - block_used) * block_size;
       }
     }
 
-  void print_state( std::ostream & s ) const
-    {
-      Kokkos::HostSpace host ;
+    if (!accessible) {
+      host.deallocate(sb_state_array, alloc_size);
+    }
+  }
 
-      const size_t alloc_size = m_hint_offset * sizeof(uint32_t);
+  void print_state(std::ostream &s) const {
+    Kokkos::HostSpace host;
 
-      uint32_t * const sb_state_array = 
-        accessible ? m_sb_state_array : (uint32_t *) host.allocate(alloc_size);
+    const size_t alloc_size = m_hint_offset * sizeof(uint32_t);
 
-      if ( ! accessible ) {
-        Kokkos::Impl::DeepCopy< Kokkos::HostSpace , base_memory_space >
-          ( sb_state_array , m_sb_state_array , alloc_size );
-      }
+    uint32_t *const sb_state_array =
+        accessible ? m_sb_state_array : (uint32_t *)host.allocate(alloc_size);
 
-      const uint32_t * sb_state_ptr = sb_state_array ;
+    if (!accessible) {
+      Kokkos::Impl::DeepCopy<Kokkos::HostSpace, base_memory_space>(
+          sb_state_array, m_sb_state_array, alloc_size);
+    }
 
-      s << "pool_size(" << ( size_t(m_sb_count) << m_sb_size_lg2 ) << ")"
-        << " superblock_size(" << ( 1LU << m_sb_size_lg2 ) << ")" << std::endl ;
+    const uint32_t *sb_state_ptr = sb_state_array;
 
-      for ( int32_t i = 0 ; i < m_sb_count
-          ; ++i , sb_state_ptr += m_sb_state_size ) {
+    s << "pool_size(" << (size_t(m_sb_count) << m_sb_size_lg2) << ")"
+      << " superblock_size(" << (1LU << m_sb_size_lg2) << ")" << std::endl;
 
-        if ( *sb_state_ptr ) {
+    for (int32_t i = 0; i < m_sb_count; ++i, sb_state_ptr += m_sb_state_size) {
+      if (*sb_state_ptr) {
+        const uint32_t block_count_lg2 = (*sb_state_ptr) >> state_shift;
+        const uint32_t block_size_lg2  = m_sb_size_lg2 - block_count_lg2;
+        const uint32_t block_count     = 1u << block_count_lg2;
+        const uint32_t block_used      = (*sb_state_ptr) & state_used_mask;
 
-          const uint32_t block_count_lg2 = (*sb_state_ptr) >> state_shift ;
-          const uint32_t block_size_lg2  = m_sb_size_lg2 - block_count_lg2 ;
-          const uint32_t block_count     = 1u << block_count_lg2 ;
-          const uint32_t block_used      = (*sb_state_ptr) & state_used_mask ;
-
-          s << "Superblock[ " << i << " / " << m_sb_count << " ] {"
-            << " block_size(" << ( 1 << block_size_lg2 ) << ")"
-            << " block_count( " << block_used
-            << " / " << block_count  << " )"
-            << std::endl ;
-        }
-      }
-
-      if ( ! accessible ) {
-        host.deallocate( sb_state_array, alloc_size );
+        s << "Superblock[ " << i << " / " << m_sb_count << " ] {"
+          << " block_size(" << (1 << block_size_lg2) << ")"
+          << " block_count( " << block_used << " / " << block_count << " )"
+          << std::endl;
       }
     }
 
+    if (!accessible) {
+      host.deallocate(sb_state_array, alloc_size);
+    }
+  }
+
   //--------------------------------------------------------------------------
 
 #ifdef KOKKOS_CUDA_9_DEFAULTED_BUG_WORKAROUND
-  KOKKOS_INLINE_FUNCTION MemoryPool( MemoryPool && rhs )
-    : m_tracker(std::move(rhs.m_tracker))
-    , m_sb_state_array(std::move(rhs.m_sb_state_array))
-    , m_sb_state_size(std::move(rhs.m_sb_state_size))
-    , m_sb_size_lg2(std::move(rhs.m_sb_size_lg2))
-    , m_max_block_size_lg2(std::move(rhs.m_max_block_size_lg2))
-    , m_min_block_size_lg2(std::move(rhs.m_min_block_size_lg2))
-    , m_sb_count(std::move(rhs.m_sb_count))
-    , m_hint_offset(std::move(rhs.m_hint_offset))
-    , m_data_offset(std::move(rhs.m_data_offset))
-  {
-  }
-  KOKKOS_INLINE_FUNCTION MemoryPool( const MemoryPool & rhs )
-    : m_tracker(rhs.m_tracker)
-    , m_sb_state_array(rhs.m_sb_state_array)
-    , m_sb_state_size(rhs.m_sb_state_size)
-    , m_sb_size_lg2(rhs.m_sb_size_lg2)
-    , m_max_block_size_lg2(rhs.m_max_block_size_lg2)
-    , m_min_block_size_lg2(rhs.m_min_block_size_lg2)
-    , m_sb_count(rhs.m_sb_count)
-    , m_hint_offset(rhs.m_hint_offset)
-    , m_data_offset(rhs.m_data_offset)
-  {
-  }
-  KOKKOS_INLINE_FUNCTION MemoryPool & operator = ( MemoryPool && rhs )
-  {
-    m_tracker = std::move(rhs.m_tracker);
-    m_sb_state_array = std::move(rhs.m_sb_state_array);
-    m_sb_state_size = std::move(rhs.m_sb_state_size);
-    m_sb_size_lg2 = std::move(rhs.m_sb_size_lg2);
+  KOKKOS_INLINE_FUNCTION MemoryPool(MemoryPool &&rhs)
+      : m_tracker(std::move(rhs.m_tracker)),
+        m_sb_state_array(std::move(rhs.m_sb_state_array)),
+        m_sb_state_size(std::move(rhs.m_sb_state_size)),
+        m_sb_size_lg2(std::move(rhs.m_sb_size_lg2)),
+        m_max_block_size_lg2(std::move(rhs.m_max_block_size_lg2)),
+        m_min_block_size_lg2(std::move(rhs.m_min_block_size_lg2)),
+        m_sb_count(std::move(rhs.m_sb_count)),
+        m_hint_offset(std::move(rhs.m_hint_offset)),
+        m_data_offset(std::move(rhs.m_data_offset)) {}
+  KOKKOS_INLINE_FUNCTION MemoryPool(const MemoryPool &rhs)
+      : m_tracker(rhs.m_tracker),
+        m_sb_state_array(rhs.m_sb_state_array),
+        m_sb_state_size(rhs.m_sb_state_size),
+        m_sb_size_lg2(rhs.m_sb_size_lg2),
+        m_max_block_size_lg2(rhs.m_max_block_size_lg2),
+        m_min_block_size_lg2(rhs.m_min_block_size_lg2),
+        m_sb_count(rhs.m_sb_count),
+        m_hint_offset(rhs.m_hint_offset),
+        m_data_offset(rhs.m_data_offset) {}
+  KOKKOS_INLINE_FUNCTION MemoryPool &operator=(MemoryPool &&rhs) {
+    m_tracker            = std::move(rhs.m_tracker);
+    m_sb_state_array     = std::move(rhs.m_sb_state_array);
+    m_sb_state_size      = std::move(rhs.m_sb_state_size);
+    m_sb_size_lg2        = std::move(rhs.m_sb_size_lg2);
     m_max_block_size_lg2 = std::move(rhs.m_max_block_size_lg2);
     m_min_block_size_lg2 = std::move(rhs.m_min_block_size_lg2);
-    m_sb_count = std::move(rhs.m_sb_count);
-    m_hint_offset = std::move(rhs.m_hint_offset);
-    m_data_offset = std::move(rhs.m_data_offset);
+    m_sb_count           = std::move(rhs.m_sb_count);
+    m_hint_offset        = std::move(rhs.m_hint_offset);
+    m_data_offset        = std::move(rhs.m_data_offset);
     return *this;
   }
-  KOKKOS_INLINE_FUNCTION MemoryPool & operator = ( const MemoryPool & rhs )
-  {
-    m_tracker = rhs.m_tracker;
-    m_sb_state_array = rhs.m_sb_state_array;
-    m_sb_state_size = rhs.m_sb_state_size;
-    m_sb_size_lg2 = rhs.m_sb_size_lg2;
+  KOKKOS_INLINE_FUNCTION MemoryPool &operator=(const MemoryPool &rhs) {
+    m_tracker            = rhs.m_tracker;
+    m_sb_state_array     = rhs.m_sb_state_array;
+    m_sb_state_size      = rhs.m_sb_state_size;
+    m_sb_size_lg2        = rhs.m_sb_size_lg2;
     m_max_block_size_lg2 = rhs.m_max_block_size_lg2;
     m_min_block_size_lg2 = rhs.m_min_block_size_lg2;
-    m_sb_count = rhs.m_sb_count;
-    m_hint_offset = rhs.m_hint_offset;
-    m_data_offset = rhs.m_data_offset;
+    m_sb_count           = rhs.m_sb_count;
+    m_hint_offset        = rhs.m_hint_offset;
+    m_data_offset        = rhs.m_data_offset;
     return *this;
   }
 #else
-  KOKKOS_INLINE_FUNCTION MemoryPool( MemoryPool && ) = default ;
-  KOKKOS_INLINE_FUNCTION MemoryPool( const MemoryPool & ) = default ;
-  KOKKOS_INLINE_FUNCTION MemoryPool & operator = ( MemoryPool && ) = default ;
-  KOKKOS_INLINE_FUNCTION MemoryPool & operator = ( const MemoryPool & ) = default ;
+  KOKKOS_INLINE_FUNCTION MemoryPool(MemoryPool &&)      = default;
+  KOKKOS_INLINE_FUNCTION MemoryPool(const MemoryPool &) = default;
+  KOKKOS_INLINE_FUNCTION MemoryPool &operator=(MemoryPool &&) = default;
+  KOKKOS_INLINE_FUNCTION MemoryPool &operator=(const MemoryPool &) = default;
 #endif
 
   KOKKOS_INLINE_FUNCTION MemoryPool()
-    : m_tracker()
-    , m_sb_state_array(0)
-    , m_sb_state_size(0)
-    , m_sb_size_lg2(0)
-    , m_max_block_size_lg2(0)
-    , m_min_block_size_lg2(0)
-    , m_sb_count(0)
-    , m_hint_offset(0)
-    , m_data_offset(0)
-    , m_unused_padding(0)
-    {}
+      : m_tracker(),
+        m_sb_state_array(0),
+        m_sb_state_size(0),
+        m_sb_size_lg2(0),
+        m_max_block_size_lg2(0),
+        m_min_block_size_lg2(0),
+        m_sb_count(0),
+        m_hint_offset(0),
+        m_data_offset(0),
+        m_unused_padding(0) {}
 
   /**\brief  Allocate a memory pool from 'memspace'.
    *
@@ -349,221 +335,199 @@ public:
    *  is also a power-of-two.  These roundings are made to enable
    *  significant runtime performance improvements.
    */
-  MemoryPool( const base_memory_space & memspace
-            , const size_t min_total_alloc_size
-            , size_t min_block_alloc_size = 0
-            , size_t max_block_alloc_size = 0
-            , size_t min_superblock_size  = 0
-            )
-    : m_tracker()
-    , m_sb_state_array(0)
-    , m_sb_state_size(0)
-    , m_sb_size_lg2(0)
-    , m_max_block_size_lg2(0)
-    , m_min_block_size_lg2(0)
-    , m_sb_count(0)
-    , m_hint_offset(0)
-    , m_data_offset(0)
-    , m_unused_padding(0)
-    {
-      const uint32_t int_align_lg2   = 3 ; /* align as int[8] */
-      const uint32_t int_align_mask  = ( 1u << int_align_lg2 ) - 1 ;
-      const uint32_t default_min_block_size       = 1u << 6  ; /* 64 bytes */
-      const uint32_t default_max_block_size       = 1u << 12 ;/* 4k bytes */
-      const uint32_t default_min_superblock_size  = 1u << 20 ;/* 1M bytes */
+  MemoryPool(const base_memory_space &memspace,
+             const size_t min_total_alloc_size, size_t min_block_alloc_size = 0,
+             size_t max_block_alloc_size = 0, size_t min_superblock_size = 0)
+      : m_tracker(),
+        m_sb_state_array(0),
+        m_sb_state_size(0),
+        m_sb_size_lg2(0),
+        m_max_block_size_lg2(0),
+        m_min_block_size_lg2(0),
+        m_sb_count(0),
+        m_hint_offset(0),
+        m_data_offset(0),
+        m_unused_padding(0) {
+    const uint32_t int_align_lg2               = 3; /* align as int[8] */
+    const uint32_t int_align_mask              = (1u << int_align_lg2) - 1;
+    const uint32_t default_min_block_size      = 1u << 6;  /* 64 bytes */
+    const uint32_t default_max_block_size      = 1u << 12; /* 4k bytes */
+    const uint32_t default_min_superblock_size = 1u << 20; /* 1M bytes */
 
-      //--------------------------------------------------
-      // Default block and superblock sizes:
+    //--------------------------------------------------
+    // Default block and superblock sizes:
 
-      if ( 0 == min_block_alloc_size ) {
-        // Default all sizes:
+    if (0 == min_block_alloc_size) {
+      // Default all sizes:
 
-        min_superblock_size =
-          std::min( size_t(default_min_superblock_size)
-                  , min_total_alloc_size );
+      min_superblock_size =
+          std::min(size_t(default_min_superblock_size), min_total_alloc_size);
 
-        min_block_alloc_size =
-          std::min( size_t(default_min_block_size)
-                  , min_superblock_size );
+      min_block_alloc_size =
+          std::min(size_t(default_min_block_size), min_superblock_size);
 
-        max_block_alloc_size =
-          std::min( size_t(default_max_block_size)
-                  , min_superblock_size );
-      }
-      else if ( 0 == min_superblock_size ) {
+      max_block_alloc_size =
+          std::min(size_t(default_max_block_size), min_superblock_size);
+    } else if (0 == min_superblock_size) {
+      // Choose superblock size as minimum of:
+      //   max_block_per_superblock * min_block_size
+      //   max_superblock_size
+      //   min_total_alloc_size
 
-        // Choose superblock size as minimum of:
-        //   max_block_per_superblock * min_block_size
-        //   max_superblock_size
-        //   min_total_alloc_size
+      const size_t max_superblock =
+          min_block_alloc_size * max_block_per_superblock;
 
-        const size_t max_superblock =
-          min_block_alloc_size * max_block_per_superblock ;
+      min_superblock_size =
+          std::min(max_superblock,
+                   std::min(size_t(max_superblock_size), min_total_alloc_size));
+    }
 
-        min_superblock_size =
-          std::min( max_superblock ,
-          std::min( size_t(max_superblock_size)
-                  , min_total_alloc_size ) );
-      }
+    if (0 == max_block_alloc_size) {
+      max_block_alloc_size = min_superblock_size;
+    }
 
-      if ( 0 == max_block_alloc_size ) {
-        max_block_alloc_size = min_superblock_size ;
-      }
+    //--------------------------------------------------
 
-      //--------------------------------------------------
+    /* Enforce size constraints:
+     *   min_block_alloc_size <= max_block_alloc_size
+     *   max_block_alloc_size <= min_superblock_size
+     *   min_superblock_size  <= max_superblock_size
+     *   min_superblock_size  <= min_total_alloc_size
+     *   min_superblock_size  <= min_block_alloc_size *
+     *                           max_block_per_superblock
+     */
 
-      /* Enforce size constraints:
-       *   min_block_alloc_size <= max_block_alloc_size
-       *   max_block_alloc_size <= min_superblock_size 
-       *   min_superblock_size  <= max_superblock_size
-       *   min_superblock_size  <= min_total_alloc_size
-       *   min_superblock_size  <= min_block_alloc_size * 
-       *                           max_block_per_superblock
-       */
+    Kokkos::Impl::memory_pool_bounds_verification(
+        min_block_alloc_size, max_block_alloc_size, min_superblock_size,
+        max_superblock_size, max_block_per_superblock, min_total_alloc_size);
 
-      Kokkos::Impl::memory_pool_bounds_verification
-        ( min_block_alloc_size
-        , max_block_alloc_size
-        , min_superblock_size
-        , max_superblock_size
-        , max_block_per_superblock
-        , min_total_alloc_size
-        );
+    //--------------------------------------------------
+    // Block and superblock size is power of two:
+    // Maximum value is 'max_superblock_size'
 
-      //--------------------------------------------------
-      // Block and superblock size is power of two:
-      // Maximum value is 'max_superblock_size'
-
-      m_min_block_size_lg2 =
+    m_min_block_size_lg2 =
         Kokkos::Impl::integral_power_of_two_that_contains(min_block_alloc_size);
 
-      m_max_block_size_lg2 =
+    m_max_block_size_lg2 =
         Kokkos::Impl::integral_power_of_two_that_contains(max_block_alloc_size);
-  
-      m_sb_size_lg2 =
+
+    m_sb_size_lg2 =
         Kokkos::Impl::integral_power_of_two_that_contains(min_superblock_size);
 
-      {
-        // number of superblocks is multiple of superblock size that
-        // can hold min_total_alloc_size.
+    {
+      // number of superblocks is multiple of superblock size that
+      // can hold min_total_alloc_size.
 
-        const uint64_t sb_size_mask = ( 1LU << m_sb_size_lg2 ) - 1 ;
+      const uint64_t sb_size_mask = (1LU << m_sb_size_lg2) - 1;
 
-        m_sb_count = ( min_total_alloc_size + sb_size_mask ) >> m_sb_size_lg2 ;
-      }
+      m_sb_count = (min_total_alloc_size + sb_size_mask) >> m_sb_size_lg2;
+    }
 
-      {
-        // Any superblock can be assigned to the smallest size block
-        // Size the block bitset to maximum number of blocks
+    {
+      // Any superblock can be assigned to the smallest size block
+      // Size the block bitset to maximum number of blocks
 
-        const uint32_t max_block_count_lg2 =
-          m_sb_size_lg2 - m_min_block_size_lg2 ;
+      const uint32_t max_block_count_lg2 = m_sb_size_lg2 - m_min_block_size_lg2;
 
-        m_sb_state_size =
-          ( CB::buffer_bound_lg2( max_block_count_lg2 ) + int_align_mask ) & ~int_align_mask ;
-      }
+      m_sb_state_size =
+          (CB::buffer_bound_lg2(max_block_count_lg2) + int_align_mask) &
+          ~int_align_mask;
+    }
 
-      // Array of all superblock states
+    // Array of all superblock states
 
-      const size_t all_sb_state_size =
-        ( m_sb_count * m_sb_state_size + int_align_mask ) & ~int_align_mask ;
+    const size_t all_sb_state_size =
+        (m_sb_count * m_sb_state_size + int_align_mask) & ~int_align_mask;
 
-      // Number of block sizes
+    // Number of block sizes
 
-      const int32_t number_block_sizes =
-         1 + m_max_block_size_lg2 - m_min_block_size_lg2 ;
+    const int32_t number_block_sizes =
+        1 + m_max_block_size_lg2 - m_min_block_size_lg2;
 
-      // Array length for possible block sizes
-      // Hint array is one uint32_t per block size
+    // Array length for possible block sizes
+    // Hint array is one uint32_t per block size
 
-      const int32_t block_size_array_size =
-        ( number_block_sizes + int_align_mask ) & ~int_align_mask ;
+    const int32_t block_size_array_size =
+        (number_block_sizes + int_align_mask) & ~int_align_mask;
 
-      m_hint_offset = all_sb_state_size ;
-      m_data_offset = m_hint_offset +
-                      block_size_array_size * HINT_PER_BLOCK_SIZE ;
+    m_hint_offset = all_sb_state_size;
+    m_data_offset = m_hint_offset + block_size_array_size * HINT_PER_BLOCK_SIZE;
 
-      // Allocation:
+    // Allocation:
 
-      const size_t header_size = m_data_offset * sizeof(uint32_t);
-      const size_t alloc_size  = header_size +
-                                 ( size_t(m_sb_count) << m_sb_size_lg2 );
+    const size_t header_size = m_data_offset * sizeof(uint32_t);
+    const size_t alloc_size =
+        header_size + (size_t(m_sb_count) << m_sb_size_lg2);
 
-      Record * rec = Record::allocate( memspace , "MemoryPool" , alloc_size );
+    Record *rec = Record::allocate(memspace, "MemoryPool", alloc_size);
 
-      m_tracker.assign_allocated_record_to_uninitialized( rec );
+    m_tracker.assign_allocated_record_to_uninitialized(rec);
 
-      m_sb_state_array = (uint32_t *) rec->data();
+    m_sb_state_array = (uint32_t *)rec->data();
 
-      Kokkos::HostSpace host ;
+    Kokkos::HostSpace host;
 
-      uint32_t * const sb_state_array = 
-        accessible ? m_sb_state_array
-                   : (uint32_t *) host.allocate(header_size);
+    uint32_t *const sb_state_array =
+        accessible ? m_sb_state_array : (uint32_t *)host.allocate(header_size);
 
-      for ( int32_t i = 0 ; i < m_data_offset ; ++i ) sb_state_array[i] = 0 ;
+    for (int32_t i = 0; i < m_data_offset; ++i) sb_state_array[i] = 0;
 
-      // Initial assignment of empty superblocks to block sizes:
+    // Initial assignment of empty superblocks to block sizes:
 
-      for ( int32_t i = 0 ; i < number_block_sizes ; ++i ) {
-        const uint32_t block_size_lg2  = i + m_min_block_size_lg2 ;
-        const uint32_t block_count_lg2 = m_sb_size_lg2 - block_size_lg2 ;
-        const uint32_t block_state     = block_count_lg2 << state_shift ;
-        const uint32_t hint_begin = m_hint_offset + i * HINT_PER_BLOCK_SIZE ;
+    for (int32_t i = 0; i < number_block_sizes; ++i) {
+      const uint32_t block_size_lg2  = i + m_min_block_size_lg2;
+      const uint32_t block_count_lg2 = m_sb_size_lg2 - block_size_lg2;
+      const uint32_t block_state     = block_count_lg2 << state_shift;
+      const uint32_t hint_begin      = m_hint_offset + i * HINT_PER_BLOCK_SIZE;
 
-        // for block size index 'i':
-        //   sb_id_hint  = sb_state_array[ hint_begin ];
-        //   sb_id_begin = sb_state_array[ hint_begin + 1 ];
+      // for block size index 'i':
+      //   sb_id_hint  = sb_state_array[ hint_begin ];
+      //   sb_id_begin = sb_state_array[ hint_begin + 1 ];
 
-        const int32_t jbeg = ( i * m_sb_count ) / number_block_sizes ;
-        const int32_t jend = ( ( i + 1 ) * m_sb_count ) / number_block_sizes ;
+      const int32_t jbeg = (i * m_sb_count) / number_block_sizes;
+      const int32_t jend = ((i + 1) * m_sb_count) / number_block_sizes;
 
-        sb_state_array[ hint_begin ] = uint32_t(jbeg);
-        sb_state_array[ hint_begin + 1 ] = uint32_t(jbeg);
+      sb_state_array[hint_begin]     = uint32_t(jbeg);
+      sb_state_array[hint_begin + 1] = uint32_t(jbeg);
 
-        for ( int32_t j = jbeg ; j < jend ; ++j ) {
-          sb_state_array[ j * m_sb_state_size ] = block_state ;
-        }
-      }
-
-      // Write out initialized state:
-
-      if ( ! accessible ) {
-        Kokkos::Impl::DeepCopy< base_memory_space , Kokkos::HostSpace >
-          ( m_sb_state_array , sb_state_array , header_size );
-
-        host.deallocate( sb_state_array, header_size );
-      }
-      else {
-        Kokkos::memory_fence();
+      for (int32_t j = jbeg; j < jend; ++j) {
+        sb_state_array[j * m_sb_state_size] = block_state;
       }
     }
 
+    // Write out initialized state:
+
+    if (!accessible) {
+      Kokkos::Impl::DeepCopy<base_memory_space, Kokkos::HostSpace>(
+          m_sb_state_array, sb_state_array, header_size);
+
+      host.deallocate(sb_state_array, header_size);
+    } else {
+      Kokkos::memory_fence();
+    }
+  }
+
   //--------------------------------------------------------------------------
 
-private:
-
+ private:
   /* Given a size 'n' get the block size in which it can be allocated.
    * Restrict lower bound to minimum block size.
    */
   KOKKOS_FORCEINLINE_FUNCTION
-  uint32_t get_block_size_lg2( uint32_t n ) const noexcept
-    {
-      const unsigned i = Kokkos::Impl::integral_power_of_two_that_contains( n );
+  uint32_t get_block_size_lg2(uint32_t n) const noexcept {
+    const unsigned i = Kokkos::Impl::integral_power_of_two_that_contains(n);
 
-      return i < m_min_block_size_lg2 ? m_min_block_size_lg2 : i ;
-    }
-
-public:
+    return i < m_min_block_size_lg2 ? m_min_block_size_lg2 : i;
+  }
 
+ public:
   /* Return 0 for invalid block size */
   KOKKOS_INLINE_FUNCTION
-  uint32_t allocate_block_size( uint64_t alloc_size ) const noexcept
-    {
-      return alloc_size <= (1UL << m_max_block_size_lg2)
-           ? ( 1UL << get_block_size_lg2( uint32_t(alloc_size) ) )
-           : 0 ;
-    }
+  uint32_t allocate_block_size(uint64_t alloc_size) const noexcept {
+    return alloc_size <= (1UL << m_max_block_size_lg2)
+               ? (1UL << get_block_size_lg2(uint32_t(alloc_size)))
+               : 0;
+  }
 
   //--------------------------------------------------------------------------
   /**\brief  Allocate a block of memory that is at least 'alloc_size'
@@ -576,105 +540,98 @@ public:
    *  The allocation attempt will try up to 'attempt_limit' times.
    */
   KOKKOS_FUNCTION
-  void * allocate( size_t alloc_size
-                 , int32_t attempt_limit = 1 ) const noexcept
-    {
-      if ( size_t(1LU << m_max_block_size_lg2) < alloc_size ) {
-        Kokkos::abort("Kokkos MemoryPool allocation request exceeded specified maximum allocation size");
-      }
+  void *allocate(size_t alloc_size, int32_t attempt_limit = 1) const noexcept {
+    if (size_t(1LU << m_max_block_size_lg2) < alloc_size) {
+      Kokkos::abort(
+          "Kokkos MemoryPool allocation request exceeded specified maximum "
+          "allocation size");
+    }
 
-      if ( 0 == alloc_size ) return (void*) 0 ;
+    if (0 == alloc_size) return (void *)0;
 
-      void * p = 0 ;
+    void *p = 0;
 
-      const uint32_t block_size_lg2 = get_block_size_lg2( alloc_size );
+    const uint32_t block_size_lg2 = get_block_size_lg2(alloc_size);
 
-      // Allocation will fit within a superblock
-      // that has block sizes ( 1 << block_size_lg2 )
+    // Allocation will fit within a superblock
+    // that has block sizes ( 1 << block_size_lg2 )
 
-      const uint32_t block_count_lg2 = m_sb_size_lg2 - block_size_lg2 ;
-      const uint32_t block_state     = block_count_lg2 << state_shift ;
-      const uint32_t block_count     = 1u << block_count_lg2 ;
+    const uint32_t block_count_lg2 = m_sb_size_lg2 - block_size_lg2;
+    const uint32_t block_state     = block_count_lg2 << state_shift;
+    const uint32_t block_count     = 1u << block_count_lg2;
 
-      // Superblock hints for this block size:
-      //   hint_sb_id_ptr[0] is the dynamically changing hint
-      //   hint_sb_id_ptr[1] is the static start point
+    // Superblock hints for this block size:
+    //   hint_sb_id_ptr[0] is the dynamically changing hint
+    //   hint_sb_id_ptr[1] is the static start point
 
-      volatile uint32_t * const hint_sb_id_ptr
-        = m_sb_state_array     /* memory pool state array */
-        + m_hint_offset        /* offset to hint portion of array */
-        + HINT_PER_BLOCK_SIZE  /* number of hints per block size */
-          * ( block_size_lg2 - m_min_block_size_lg2 ); /* block size id */
+    volatile uint32_t *const hint_sb_id_ptr =
+        m_sb_state_array      /* memory pool state array */
+        + m_hint_offset       /* offset to hint portion of array */
+        + HINT_PER_BLOCK_SIZE /* number of hints per block size */
+              * (block_size_lg2 - m_min_block_size_lg2); /* block size id */
 
-      const int32_t sb_id_begin = int32_t( hint_sb_id_ptr[1] );
+    const int32_t sb_id_begin = int32_t(hint_sb_id_ptr[1]);
 
-      // Fast query clock register 'tic' to pseudo-randomize
-      // the guess for which block within a superblock should
-      // be claimed.  If not available then a search occurs.
+    // Fast query clock register 'tic' to pseudo-randomize
+    // the guess for which block within a superblock should
+    // be claimed.  If not available then a search occurs.
 
-      const uint32_t block_id_hint =
-        (uint32_t)( Kokkos::Impl::clock_tic()
-#if defined( KOKKOS_ACTIVE_EXECUTION_MEMORY_SPACE_CUDA )
-        // Spread out potentially concurrent access
-        // by threads within a warp or thread block.
-        + ( threadIdx.x + blockDim.x * threadIdx.y )
+    const uint32_t block_id_hint =
+        (uint32_t)(Kokkos::Impl::clock_tic()
+#if defined(KOKKOS_ACTIVE_EXECUTION_MEMORY_SPACE_CUDA)
+                   // Spread out potentially concurrent access
+                   // by threads within a warp or thread block.
+                   + (threadIdx.x + blockDim.x * threadIdx.y)
 #endif
         );
 
-      // expected state of superblock for allocation
-      uint32_t sb_state = block_state ;
+    // expected state of superblock for allocation
+    uint32_t sb_state = block_state;
 
-      int32_t sb_id = -1 ;
+    int32_t sb_id = -1;
 
-      volatile uint32_t * sb_state_array = 0 ;
+    volatile uint32_t *sb_state_array = 0;
 
-      while ( attempt_limit ) {
+    while (attempt_limit) {
+      int32_t hint_sb_id = -1;
 
-        int32_t hint_sb_id = -1 ;
+      if (sb_id < 0) {
+        // No superblock specified, try the hint for this block size
 
-        if ( sb_id < 0 ) {
+        sb_id = hint_sb_id = int32_t(*hint_sb_id_ptr);
 
-          // No superblock specified, try the hint for this block size
+        sb_state_array = m_sb_state_array + (sb_id * m_sb_state_size);
+      }
 
-          sb_id = hint_sb_id = int32_t( *hint_sb_id_ptr );
+      // Require:
+      //   0 <= sb_id
+      //   sb_state_array == m_sb_state_array + m_sb_state_size * sb_id
 
-          sb_state_array = m_sb_state_array + ( sb_id * m_sb_state_size );
-        }
+      if (sb_state == (state_header_mask & *sb_state_array)) {
+        // This superblock state is as expected, for the moment.
+        // Attempt to claim a bit.  The attempt updates the state
+        // so have already made sure the state header is as expected.
 
-        // Require:
-        //   0 <= sb_id
-        //   sb_state_array == m_sb_state_array + m_sb_state_size * sb_id
+        const uint32_t count_lg2 = sb_state >> state_shift;
+        const uint32_t mask      = (1u << count_lg2) - 1;
 
-        if ( sb_state == ( state_header_mask & *sb_state_array ) ) {
+        const Kokkos::pair<int, int> result = CB::acquire_bounded_lg2(
+            sb_state_array, count_lg2, block_id_hint & mask, sb_state);
 
-          // This superblock state is as expected, for the moment.
-          // Attempt to claim a bit.  The attempt updates the state
-          // so have already made sure the state header is as expected.
+        // If result.first < 0 then failed to acquire
+        // due to either full or buffer was wrong state.
+        // Could be wrong state if a deallocation raced the
+        // superblock to empty before the acquire could succeed.
 
-          const uint32_t count_lg2 = sb_state >> state_shift ;
-          const uint32_t mask      = ( 1u << count_lg2 ) - 1 ;
+        if (0 <= result.first) {  // acquired a bit
 
-          const Kokkos::pair<int,int> result =
-            CB::acquire_bounded_lg2( sb_state_array
-                                   , count_lg2
-                                   , block_id_hint & mask
-                                   , sb_state
-                                   );
+          const uint32_t size_lg2 = m_sb_size_lg2 - count_lg2;
 
-          // If result.first < 0 then failed to acquire
-          // due to either full or buffer was wrong state.
-          // Could be wrong state if a deallocation raced the
-          // superblock to empty before the acquire could succeed.
+          // Set the allocated block pointer
 
-          if ( 0 <= result.first ) { // acquired a bit
-
-            const uint32_t size_lg2 = m_sb_size_lg2 - count_lg2 ;
-
-            // Set the allocated block pointer
-
-            p = ((char*)( m_sb_state_array + m_data_offset ))
-              + ( uint64_t(sb_id) << m_sb_size_lg2 ) // superblock memory
-              + ( uint64_t(result.first) << size_lg2 ); // block memory
+          p = ((char *)(m_sb_state_array + m_data_offset)) +
+              (uint64_t(sb_id) << m_sb_size_lg2)       // superblock memory
+              + (uint64_t(result.first) << size_lg2);  // block memory
 
 #if 0
   printf( "  MemoryPool(0x%lx) pointer(0x%lx) allocate(%lu) sb_id(%d) sb_state(0x%x) block_size(%d) block_capacity(%d) block_id(%d) block_claimed(%d)\n"
@@ -689,146 +646,133 @@ public:
         , result.second );
 #endif
 
-            break ; // Success
-          }
+          break;  // Success
         }
-        //------------------------------------------------------------------
-        //  Arrive here if failed to acquire a block.
-        //  Must find a new superblock.
+      }
+      //------------------------------------------------------------------
+      //  Arrive here if failed to acquire a block.
+      //  Must find a new superblock.
 
-        //  Start searching at designated index for this block size.
-        //  Look for superblock that, in preferential order,
-        //  1) part-full superblock of this block size
-        //  2) empty superblock to claim for this block size
-        //  3) part-full superblock of the next larger block size
+      //  Start searching at designated index for this block size.
+      //  Look for superblock that, in preferential order,
+      //  1) part-full superblock of this block size
+      //  2) empty superblock to claim for this block size
+      //  3) part-full superblock of the next larger block size
 
-        sb_state = block_state ; // Expect to find the desired state
-        sb_id = -1 ;
+      sb_state = block_state;  // Expect to find the desired state
+      sb_id    = -1;
 
-        bool update_hint = false ;
-        int32_t sb_id_empty = -1 ;
-        int32_t sb_id_large = -1 ;
-        uint32_t sb_state_large = 0 ;
+      bool update_hint        = false;
+      int32_t sb_id_empty     = -1;
+      int32_t sb_id_large     = -1;
+      uint32_t sb_state_large = 0;
 
-        sb_state_array = m_sb_state_array + sb_id_begin * m_sb_state_size ;
+      sb_state_array = m_sb_state_array + sb_id_begin * m_sb_state_size;
 
-        for ( int32_t i = 0 , id = sb_id_begin ; i < m_sb_count ; ++i ) {
+      for (int32_t i = 0, id = sb_id_begin; i < m_sb_count; ++i) {
+        //  Query state of the candidate superblock.
+        //  Note that the state may change at any moment
+        //  as concurrent allocations and deallocations occur.
 
-          //  Query state of the candidate superblock.
-          //  Note that the state may change at any moment
-          //  as concurrent allocations and deallocations occur.
-          
-          const uint32_t full_state = *sb_state_array ;
-          const uint32_t used       = full_state & state_used_mask ;
-          const uint32_t state      = full_state & state_header_mask ;
+        const uint32_t full_state = *sb_state_array;
+        const uint32_t used       = full_state & state_used_mask;
+        const uint32_t state      = full_state & state_header_mask;
 
-          if ( state == block_state ) {
+        if (state == block_state) {
+          //  Superblock is assigned to this block size
 
-            //  Superblock is assigned to this block size
+          if (used < block_count) {
+            // There is room to allocate one block
 
-            if ( used < block_count ) {
+            sb_id = id;
 
-              // There is room to allocate one block
+            // Is there room to allocate more than one block?
 
-              sb_id = id ;
+            update_hint = used + 1 < block_count;
 
-              // Is there room to allocate more than one block?
-
-              update_hint = used + 1 < block_count ;
-
-              break ;
-            }
+            break;
           }
-          else if ( 0 == used ) {
+        } else if (0 == used) {
+          // Superblock is empty
 
-            // Superblock is empty
+          if (-1 == sb_id_empty) {
+            // Superblock is not assigned to this block size
+            // and is the first empty superblock encountered.
+            // Save this id to use if a partfull superblock is not found.
 
-            if ( -1 == sb_id_empty ) {
-
-              // Superblock is not assigned to this block size
-              // and is the first empty superblock encountered.
-              // Save this id to use if a partfull superblock is not found.
-
-              sb_id_empty = id ;
-            }
-          }
-          else if ( ( -1 == sb_id_empty /* have not found an empty */ ) &&
-                    ( -1 == sb_id_large /* have not found a larger */ ) &&
-                    ( state < block_state /* a larger block */ ) &&
-                    // is not full:
-                    ( used < ( 1u << ( state >> state_shift ) ) ) ) {
-            //  First superblock encountered that is
-            //  larger than this block size and
-            //  has room for an allocation.
-            //  Save this id to use of partfull or empty superblock not found
-            sb_id_large    = id ;
-            sb_state_large = state ;
-          }
-
-          // Iterate around the superblock array:
-
-          if ( ++id < m_sb_count ) {
-            sb_state_array += m_sb_state_size ;
-          }
-          else {
-            id = 0 ;
-            sb_state_array = m_sb_state_array ;
+            sb_id_empty = id;
           }
+        } else if ((-1 == sb_id_empty /* have not found an empty */) &&
+                   (-1 == sb_id_large /* have not found a larger */) &&
+                   (state < block_state /* a larger block */) &&
+                   // is not full:
+                   (used < (1u << (state >> state_shift)))) {
+          //  First superblock encountered that is
+          //  larger than this block size and
+          //  has room for an allocation.
+          //  Save this id to use of partfull or empty superblock not found
+          sb_id_large    = id;
+          sb_state_large = state;
         }
 
- // printf("  search m_sb_count(%d) sb_id(%d) sb_id_empty(%d) sb_id_large(%d)\n" , m_sb_count , sb_id , sb_id_empty , sb_id_large);
+        // Iterate around the superblock array:
 
-        if ( sb_id < 0 ) {
-
-          //  Did not find a partfull superblock for this block size.
-
-          if ( 0 <= sb_id_empty ) {
-
-            //  Found first empty superblock following designated superblock
-            //  Attempt to claim it for this block size.
-            //  If the claim fails assume that another thread claimed it
-            //  for this block size and try to use it anyway,
-            //  but do not update hint.
-
-            sb_id = sb_id_empty ;
-
-            sb_state_array = m_sb_state_array + ( sb_id * m_sb_state_size );
-
-            //  If successfully changed assignment of empty superblock 'sb_id'
-            //  to this block_size then update the hint.
-
-            const uint32_t state_empty = state_header_mask & *sb_state_array ;
-
-            // If this thread claims the empty block then update the hint
-            update_hint =
-              state_empty ==
-                Kokkos::atomic_compare_exchange
-                  (sb_state_array,state_empty,block_state);
-          }
-          else if ( 0 <= sb_id_large ) {
-
-            // Found a larger superblock with space available
-
-            sb_id    = sb_id_large ;
-            sb_state = sb_state_large ;
-
-            sb_state_array = m_sb_state_array + ( sb_id * m_sb_state_size );
-          }
-          else {
-            // Did not find a potentially usable superblock
-            --attempt_limit ;
-          }
+        if (++id < m_sb_count) {
+          sb_state_array += m_sb_state_size;
+        } else {
+          id             = 0;
+          sb_state_array = m_sb_state_array;
         }
+      }
 
-        if ( update_hint ) {
-          Kokkos::atomic_compare_exchange
-            ( hint_sb_id_ptr , uint32_t(hint_sb_id) , uint32_t(sb_id) );
+      // printf("  search m_sb_count(%d) sb_id(%d) sb_id_empty(%d)
+      // sb_id_large(%d)\n" , m_sb_count , sb_id , sb_id_empty , sb_id_large);
+
+      if (sb_id < 0) {
+        //  Did not find a partfull superblock for this block size.
+
+        if (0 <= sb_id_empty) {
+          //  Found first empty superblock following designated superblock
+          //  Attempt to claim it for this block size.
+          //  If the claim fails assume that another thread claimed it
+          //  for this block size and try to use it anyway,
+          //  but do not update hint.
+
+          sb_id = sb_id_empty;
+
+          sb_state_array = m_sb_state_array + (sb_id * m_sb_state_size);
+
+          //  If successfully changed assignment of empty superblock 'sb_id'
+          //  to this block_size then update the hint.
+
+          const uint32_t state_empty = state_header_mask & *sb_state_array;
+
+          // If this thread claims the empty block then update the hint
+          update_hint =
+              state_empty == Kokkos::atomic_compare_exchange(
+                                 sb_state_array, state_empty, block_state);
+        } else if (0 <= sb_id_large) {
+          // Found a larger superblock with space available
+
+          sb_id    = sb_id_large;
+          sb_state = sb_state_large;
+
+          sb_state_array = m_sb_state_array + (sb_id * m_sb_state_size);
+        } else {
+          // Did not find a potentially usable superblock
+          --attempt_limit;
         }
-      } // end allocation attempt loop
-      //--------------------------------------------------------------------
+      }
 
-      return p ;
-    }
+      if (update_hint) {
+        Kokkos::atomic_compare_exchange(hint_sb_id_ptr, uint32_t(hint_sb_id),
+                                        uint32_t(sb_id));
+      }
+    }  // end allocation attempt loop
+    //--------------------------------------------------------------------
+
+    return p;
+  }
   // end allocate
   //--------------------------------------------------------------------------
 
@@ -839,47 +783,43 @@ public:
    *  For now the alloc_size is ignored.
    */
   KOKKOS_INLINE_FUNCTION
-  void deallocate( void * p , size_t /* alloc_size */ ) const noexcept
-    {
-      if ( 0 == p ) return ;
+  void deallocate(void *p, size_t /* alloc_size */) const noexcept {
+    if (0 == p) return;
 
-      // Determine which superblock and block
-      const ptrdiff_t d =
-        ((char*)p) - ((char*)( m_sb_state_array + m_data_offset ));
+    // Determine which superblock and block
+    const ptrdiff_t d =
+        ((char *)p) - ((char *)(m_sb_state_array + m_data_offset));
 
-      // Verify contained within the memory pool's superblocks:
-      const int ok_contains =
-        ( 0 <= d ) && ( size_t(d) < ( size_t(m_sb_count) << m_sb_size_lg2 ) );
+    // Verify contained within the memory pool's superblocks:
+    const int ok_contains =
+        (0 <= d) && (size_t(d) < (size_t(m_sb_count) << m_sb_size_lg2));
 
-      int ok_block_aligned = 0 ;
-      int ok_dealloc_once  = 0 ;
+    int ok_block_aligned = 0;
+    int ok_dealloc_once  = 0;
 
-      if ( ok_contains ) {
+    if (ok_contains) {
+      const int sb_id = d >> m_sb_size_lg2;
 
-        const int sb_id = d >> m_sb_size_lg2 ;
+      // State array for the superblock.
+      volatile uint32_t *const sb_state_array =
+          m_sb_state_array + (sb_id * m_sb_state_size);
 
-        // State array for the superblock.
-        volatile uint32_t * const sb_state_array =
-          m_sb_state_array + ( sb_id * m_sb_state_size );
+      const uint32_t block_state = (*sb_state_array) & state_header_mask;
+      const uint32_t block_size_lg2 =
+          m_sb_size_lg2 - (block_state >> state_shift);
 
-        const uint32_t block_state    = (*sb_state_array) & state_header_mask ;
-        const uint32_t block_size_lg2 =
-          m_sb_size_lg2 - ( block_state >> state_shift );
+      ok_block_aligned = 0 == (d & ((1UL << block_size_lg2) - 1));
 
-        ok_block_aligned = 0 == ( d & ( ( 1UL << block_size_lg2 ) - 1 ) );
+      if (ok_block_aligned) {
+        // Map address to block's bit
+        // mask into superblock and then shift down for block index
 
-        if ( ok_block_aligned ) {
+        const uint32_t bit =
+            (d & (ptrdiff_t(1LU << m_sb_size_lg2) - 1)) >> block_size_lg2;
 
-          // Map address to block's bit
-          // mask into superblock and then shift down for block index
+        const int result = CB::release(sb_state_array, bit, block_state);
 
-          const uint32_t bit =
-            ( d & ( ptrdiff_t( 1LU << m_sb_size_lg2 ) - 1 ) ) >> block_size_lg2 ;
-
-          const int result =
-            CB::release( sb_state_array , bit , block_state );
-
-          ok_dealloc_once = 0 <= result ;
+        ok_dealloc_once = 0 <= result;
 
 #if 0
   printf( "  MemoryPool(0x%lx) pointer(0x%lx) deallocate sb_id(%d) block_size(%d) block_capacity(%d) block_id(%d) block_claimed(%d)\n"
@@ -891,10 +831,10 @@ public:
         , bit
         , result );
 #endif
-        }
       }
+    }
 
-      if ( ! ok_contains || ! ok_block_aligned || ! ok_dealloc_once ) {
+    if (!ok_contains || !ok_block_aligned || !ok_dealloc_once) {
 #if 0
   printf( "  MemoryPool(0x%lx) pointer(0x%lx) deallocate ok_contains(%d) ok_block_aligned(%d) ok_dealloc_once(%d)\n"
         , (uintptr_t)m_sb_state_array
@@ -903,44 +843,40 @@ public:
         , int(ok_block_aligned)
         , int(ok_dealloc_once) );
 #endif
-        Kokkos::abort("Kokkos MemoryPool::deallocate given erroneous pointer");
-      }
+      Kokkos::abort("Kokkos MemoryPool::deallocate given erroneous pointer");
     }
+  }
   // end deallocate
   //--------------------------------------------------------------------------
 
   KOKKOS_INLINE_FUNCTION
-  int number_of_superblocks() const noexcept { return m_sb_count ; }
+  int number_of_superblocks() const noexcept { return m_sb_count; }
 
   KOKKOS_INLINE_FUNCTION
-  void superblock_state( int sb_id
-                       , int & block_size
-                       , int & block_count_capacity
-                       , int & block_count_used ) const noexcept
-    {
-      block_size           = 0 ;
-      block_count_capacity = 0 ;
-      block_count_used     = 0 ;
+  void superblock_state(int sb_id, int &block_size, int &block_count_capacity,
+                        int &block_count_used) const noexcept {
+    block_size           = 0;
+    block_count_capacity = 0;
+    block_count_used     = 0;
 
-      if ( Kokkos::Impl::MemorySpaceAccess
-             < Kokkos::Impl::ActiveExecutionMemorySpace
-             , base_memory_space >::accessible ) {
-       // Can access the state array
-       
-        const uint32_t state =
-          ((uint32_t volatile *)m_sb_state_array)[sb_id*m_sb_state_size];
+    if (Kokkos::Impl::MemorySpaceAccess<
+            Kokkos::Impl::ActiveExecutionMemorySpace,
+            base_memory_space>::accessible) {
+      // Can access the state array
 
-        const uint32_t block_count_lg2 = state >> state_shift ;
-        const uint32_t block_used      = state & state_used_mask ;
+      const uint32_t state =
+          ((uint32_t volatile *)m_sb_state_array)[sb_id * m_sb_state_size];
 
-        block_size           = 1LU << ( m_sb_size_lg2 - block_count_lg2 );
-        block_count_capacity = 1LU << block_count_lg2 ;
-        block_count_used     = block_used ;
-      }
+      const uint32_t block_count_lg2 = state >> state_shift;
+      const uint32_t block_used      = state & state_used_mask;
+
+      block_size           = 1LU << (m_sb_size_lg2 - block_count_lg2);
+      block_count_capacity = 1LU << block_count_lg2;
+      block_count_used     = block_used;
     }
+  }
 };
 
-} // namespace Kokkos 
+}  // namespace Kokkos
 
 #endif /* #ifndef KOKKOS_MEMORYPOOL_HPP */
-
diff --git a/lib/kokkos/core/src/Kokkos_MemoryTraits.hpp b/lib/kokkos/core/src/Kokkos_MemoryTraits.hpp
index 509ac6499e..75d3d40144 100644
--- a/lib/kokkos/core/src/Kokkos_MemoryTraits.hpp
+++ b/lib/kokkos/core/src/Kokkos_MemoryTraits.hpp
@@ -1,13 +1,14 @@
 /*
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -36,7 +37,7 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 */
@@ -59,53 +60,64 @@ namespace Kokkos {
  *  A zero value is the default for a View, indicating that none of
  *  these traits are present.
  */
-enum MemoryTraitsFlags
-  { Unmanaged  = 0x01
-  , RandomAccess = 0x02
-  , Atomic = 0x04
-  , Restrict = 0x08
-  , Aligned = 0x10
-  };
-
-template < unsigned T >
-struct MemoryTraits {
-  //! Tag this class as a kokkos memory traits:
-  typedef MemoryTraits memory_traits ;
-#ifdef KOKKOS_ENABLE_DEPRECATED_CODE
-  enum : bool { Unmanaged    = (unsigned(0) != (T & unsigned(Kokkos::Unmanaged))) };
-  enum : bool { RandomAccess = (unsigned(0) != (T & unsigned(Kokkos::RandomAccess))) };
-  enum : bool { Atomic       = (unsigned(0) != (T & unsigned(Kokkos::Atomic))) };
-  enum : bool { Restrict     = (unsigned(0) != (T & unsigned(Kokkos::Restrict))) };
-  enum : bool { Aligned      = (unsigned(0) != (T & unsigned(Kokkos::Aligned))) };
-#endif
-  enum : bool { is_unmanaged    = (unsigned(0) != (T & unsigned(Kokkos::Unmanaged))) };
-  enum : bool { is_random_access = (unsigned(0) != (T & unsigned(Kokkos::RandomAccess))) };
-  enum : bool { is_atomic       = (unsigned(0) != (T & unsigned(Kokkos::Atomic))) };
-  enum : bool { is_restrict     = (unsigned(0) != (T & unsigned(Kokkos::Restrict))) };
-  enum : bool { is_aligned      = (unsigned(0) != (T & unsigned(Kokkos::Aligned))) };
+enum MemoryTraitsFlags {
+  Unmanaged    = 0x01,
+  RandomAccess = 0x02,
+  Atomic       = 0x04,
+  Restrict     = 0x08,
+  Aligned      = 0x10
 };
 
-} // namespace Kokkos
+template <unsigned T>
+struct MemoryTraits {
+  //! Tag this class as a kokkos memory traits:
+  typedef MemoryTraits memory_traits;
+#ifdef KOKKOS_ENABLE_DEPRECATED_CODE
+  enum : bool {
+    Unmanaged = (unsigned(0) != (T & unsigned(Kokkos::Unmanaged)))
+  };
+  enum : bool {
+    RandomAccess = (unsigned(0) != (T & unsigned(Kokkos::RandomAccess)))
+  };
+  enum : bool { Atomic = (unsigned(0) != (T & unsigned(Kokkos::Atomic))) };
+  enum : bool { Restrict = (unsigned(0) != (T & unsigned(Kokkos::Restrict))) };
+  enum : bool { Aligned = (unsigned(0) != (T & unsigned(Kokkos::Aligned))) };
+#endif
+  enum : bool {
+    is_unmanaged = (unsigned(0) != (T & unsigned(Kokkos::Unmanaged)))
+  };
+  enum : bool {
+    is_random_access = (unsigned(0) != (T & unsigned(Kokkos::RandomAccess)))
+  };
+  enum : bool { is_atomic = (unsigned(0) != (T & unsigned(Kokkos::Atomic))) };
+  enum : bool {
+    is_restrict = (unsigned(0) != (T & unsigned(Kokkos::Restrict)))
+  };
+  enum : bool { is_aligned = (unsigned(0) != (T & unsigned(Kokkos::Aligned))) };
+};
+
+}  // namespace Kokkos
 
 //----------------------------------------------------------------------------
 
 namespace Kokkos {
 
-typedef Kokkos::MemoryTraits<0> MemoryManaged ;
-typedef Kokkos::MemoryTraits< Kokkos::Unmanaged > MemoryUnmanaged ;
-typedef Kokkos::MemoryTraits< Kokkos::Unmanaged | Kokkos::RandomAccess > MemoryRandomAccess ;
+typedef Kokkos::MemoryTraits<0> MemoryManaged;
+typedef Kokkos::MemoryTraits<Kokkos::Unmanaged> MemoryUnmanaged;
+typedef Kokkos::MemoryTraits<Kokkos::Unmanaged | Kokkos::RandomAccess>
+    MemoryRandomAccess;
 
-} // namespace Kokkos
+}  // namespace Kokkos
 
 //----------------------------------------------------------------------------
 
 namespace Kokkos {
 namespace Impl {
 
-static_assert(
-  ( 0 < int(KOKKOS_MEMORY_ALIGNMENT) ) &&
-  ( 0 == ( int(KOKKOS_MEMORY_ALIGNMENT) & (int(KOKKOS_MEMORY_ALIGNMENT)-1))) ,
-  "KOKKOS_MEMORY_ALIGNMENT must be a power of two" );
+static_assert((0 < int(KOKKOS_MEMORY_ALIGNMENT)) &&
+                  (0 == (int(KOKKOS_MEMORY_ALIGNMENT) &
+                         (int(KOKKOS_MEMORY_ALIGNMENT) - 1))),
+              "KOKKOS_MEMORY_ALIGNMENT must be a power of two");
 
 /** \brief Memory alignment settings
  *
@@ -113,13 +125,12 @@ static_assert(
  *  Enable compatibility of views from different devices with static stride.
  *  Use compiler flag to enable overwrites.
  */
-enum : unsigned
-  { MEMORY_ALIGNMENT           = KOKKOS_MEMORY_ALIGNMENT
-  , MEMORY_ALIGNMENT_THRESHOLD = KOKKOS_MEMORY_ALIGNMENT_THRESHOLD
-  };
+enum : unsigned {
+  MEMORY_ALIGNMENT           = KOKKOS_MEMORY_ALIGNMENT,
+  MEMORY_ALIGNMENT_THRESHOLD = KOKKOS_MEMORY_ALIGNMENT_THRESHOLD
+};
 
-} //namespace Impl
-} // namespace Kokkos
+}  // namespace Impl
+}  // namespace Kokkos
 
 #endif /* #ifndef KOKKOS_MEMORYTRAITS_HPP */
-
diff --git a/lib/kokkos/core/src/Kokkos_NumericTraits.hpp b/lib/kokkos/core/src/Kokkos_NumericTraits.hpp
index baac782545..666bb33266 100644
--- a/lib/kokkos/core/src/Kokkos_NumericTraits.hpp
+++ b/lib/kokkos/core/src/Kokkos_NumericTraits.hpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -44,176 +45,347 @@
 #ifndef KOKKOS_NUMERICTRAITS_HPP
 #define KOKKOS_NUMERICTRAITS_HPP
 
-#include<climits>
-#include<cfloat>
+#include <climits>
+#include <cfloat>
 
 namespace Kokkos {
 
-template<class T>
+template <class T>
 struct reduction_identity; /*{
   KOKKOS_FORCEINLINE_FUNCTION constexpr static T sum() { return T(); }  // 0
   KOKKOS_FORCEINLINE_FUNCTION constexpr static T prod()  // 1
-    { static_assert( false, "Missing specialization of Kokkos::reduction_identity for custom prod reduction type"); return T(); }
+    { static_assert( false, "Missing specialization of
+Kokkos::reduction_identity for custom prod reduction type"); return T(); }
   KOKKOS_FORCEINLINE_FUNCTION constexpr static T max()   // minimum value
-    { static_assert( false, "Missing specialization of Kokkos::reduction_identity for custom max reduction type"); return T(); }
+    { static_assert( false, "Missing specialization of
+Kokkos::reduction_identity for custom max reduction type"); return T(); }
   KOKKOS_FORCEINLINE_FUNCTION constexpr static T min()   // maximum value
-    { static_assert( false, "Missing specialization of Kokkos::reduction_identity for custom min reduction type"); return T(); }
-  KOKKOS_FORCEINLINE_FUNCTION constexpr static T bor()   // 0, only for integer type
-    { static_assert( false, "Missing specialization of Kokkos::reduction_identity for custom bor reduction type"); return T(); }
-  KOKKOS_FORCEINLINE_FUNCTION constexpr static T band()  // !0, only for integer type
-    { static_assert( false, "Missing specialization of Kokkos::reduction_identity for custom band reduction type"); return T(); }
-  KOKKOS_FORCEINLINE_FUNCTION constexpr static T lor()   // 0, only for integer type
-    { static_assert( false, "Missing specialization of Kokkos::reduction_identity for custom lor reduction type"); return T(); }
-  KOKKOS_FORCEINLINE_FUNCTION constexpr static T land()  // !0, only for integer type
-    { static_assert( false, "Missing specialization of Kokkos::reduction_identity for custom land reduction type"); return T(); }
+    { static_assert( false, "Missing specialization of
+Kokkos::reduction_identity for custom min reduction type"); return T(); }
+  KOKKOS_FORCEINLINE_FUNCTION constexpr static T bor()   // 0, only for integer
+type { static_assert( false, "Missing specialization of
+Kokkos::reduction_identity for custom bor reduction type"); return T(); }
+  KOKKOS_FORCEINLINE_FUNCTION constexpr static T band()  // !0, only for integer
+type { static_assert( false, "Missing specialization of
+Kokkos::reduction_identity for custom band reduction type"); return T(); }
+  KOKKOS_FORCEINLINE_FUNCTION constexpr static T lor()   // 0, only for integer
+type { static_assert( false, "Missing specialization of
+Kokkos::reduction_identity for custom lor reduction type"); return T(); }
+  KOKKOS_FORCEINLINE_FUNCTION constexpr static T land()  // !0, only for integer
+type { static_assert( false, "Missing specialization of
+Kokkos::reduction_identity for custom land reduction type"); return T(); }
 };*/
 
-template<>
+template <>
 struct reduction_identity<signed char> {
-  KOKKOS_FORCEINLINE_FUNCTION constexpr static signed char sum()  {return static_cast<signed char>(0);}
-  KOKKOS_FORCEINLINE_FUNCTION constexpr static signed char prod() {return static_cast<signed char>(1);}
-  KOKKOS_FORCEINLINE_FUNCTION constexpr static signed char max()  {return SCHAR_MIN;}
-  KOKKOS_FORCEINLINE_FUNCTION constexpr static signed char min()  {return SCHAR_MAX;}
-  KOKKOS_FORCEINLINE_FUNCTION constexpr static signed char bor()  {return static_cast<signed char>(0x0);}
-  KOKKOS_FORCEINLINE_FUNCTION constexpr static signed char band() {return ~static_cast<signed char>(0x0);}
-  KOKKOS_FORCEINLINE_FUNCTION constexpr static signed char lor()  {return static_cast<signed char>(0);}
-  KOKKOS_FORCEINLINE_FUNCTION constexpr static signed char land() {return static_cast<signed char>(1);}
+  KOKKOS_FORCEINLINE_FUNCTION constexpr static signed char sum() {
+    return static_cast<signed char>(0);
+  }
+  KOKKOS_FORCEINLINE_FUNCTION constexpr static signed char prod() {
+    return static_cast<signed char>(1);
+  }
+  KOKKOS_FORCEINLINE_FUNCTION constexpr static signed char max() {
+    return SCHAR_MIN;
+  }
+  KOKKOS_FORCEINLINE_FUNCTION constexpr static signed char min() {
+    return SCHAR_MAX;
+  }
+  KOKKOS_FORCEINLINE_FUNCTION constexpr static signed char bor() {
+    return static_cast<signed char>(0x0);
+  }
+  KOKKOS_FORCEINLINE_FUNCTION constexpr static signed char band() {
+    return ~static_cast<signed char>(0x0);
+  }
+  KOKKOS_FORCEINLINE_FUNCTION constexpr static signed char lor() {
+    return static_cast<signed char>(0);
+  }
+  KOKKOS_FORCEINLINE_FUNCTION constexpr static signed char land() {
+    return static_cast<signed char>(1);
+  }
 };
 
-template<>
+template <>
 struct reduction_identity<short> {
-  KOKKOS_FORCEINLINE_FUNCTION constexpr static short sum()  {return static_cast<short>(0);}
-  KOKKOS_FORCEINLINE_FUNCTION constexpr static short prod() {return static_cast<short>(1);}
-  KOKKOS_FORCEINLINE_FUNCTION constexpr static short max()  {return SHRT_MIN;}
-  KOKKOS_FORCEINLINE_FUNCTION constexpr static short min()  {return SHRT_MAX;}
-  KOKKOS_FORCEINLINE_FUNCTION constexpr static short bor()  {return static_cast<short>(0x0);}
-  KOKKOS_FORCEINLINE_FUNCTION constexpr static short band() {return ~static_cast<short>(0x0);}
-  KOKKOS_FORCEINLINE_FUNCTION constexpr static short lor()  {return static_cast<short>(0);}
-  KOKKOS_FORCEINLINE_FUNCTION constexpr static short land() {return static_cast<short>(1);}
+  KOKKOS_FORCEINLINE_FUNCTION constexpr static short sum() {
+    return static_cast<short>(0);
+  }
+  KOKKOS_FORCEINLINE_FUNCTION constexpr static short prod() {
+    return static_cast<short>(1);
+  }
+  KOKKOS_FORCEINLINE_FUNCTION constexpr static short max() { return SHRT_MIN; }
+  KOKKOS_FORCEINLINE_FUNCTION constexpr static short min() { return SHRT_MAX; }
+  KOKKOS_FORCEINLINE_FUNCTION constexpr static short bor() {
+    return static_cast<short>(0x0);
+  }
+  KOKKOS_FORCEINLINE_FUNCTION constexpr static short band() {
+    return ~static_cast<short>(0x0);
+  }
+  KOKKOS_FORCEINLINE_FUNCTION constexpr static short lor() {
+    return static_cast<short>(0);
+  }
+  KOKKOS_FORCEINLINE_FUNCTION constexpr static short land() {
+    return static_cast<short>(1);
+  }
 };
 
-template<>
+template <>
 struct reduction_identity<int> {
-  KOKKOS_FORCEINLINE_FUNCTION constexpr static int sum()  {return static_cast<int>(0);}
-  KOKKOS_FORCEINLINE_FUNCTION constexpr static int prod() {return static_cast<int>(1);}
-  KOKKOS_FORCEINLINE_FUNCTION constexpr static int max()  {return INT_MIN;}
-  KOKKOS_FORCEINLINE_FUNCTION constexpr static int min()  {return INT_MAX;}
-  KOKKOS_FORCEINLINE_FUNCTION constexpr static int bor()  {return static_cast<int>(0x0);}
-  KOKKOS_FORCEINLINE_FUNCTION constexpr static int band() {return ~static_cast<int>(0x0);}
-  KOKKOS_FORCEINLINE_FUNCTION constexpr static int lor()  {return static_cast<int>(0);}
-  KOKKOS_FORCEINLINE_FUNCTION constexpr static int land() {return static_cast<int>(1);}
+  KOKKOS_FORCEINLINE_FUNCTION constexpr static int sum() {
+    return static_cast<int>(0);
+  }
+  KOKKOS_FORCEINLINE_FUNCTION constexpr static int prod() {
+    return static_cast<int>(1);
+  }
+  KOKKOS_FORCEINLINE_FUNCTION constexpr static int max() { return INT_MIN; }
+  KOKKOS_FORCEINLINE_FUNCTION constexpr static int min() { return INT_MAX; }
+  KOKKOS_FORCEINLINE_FUNCTION constexpr static int bor() {
+    return static_cast<int>(0x0);
+  }
+  KOKKOS_FORCEINLINE_FUNCTION constexpr static int band() {
+    return ~static_cast<int>(0x0);
+  }
+  KOKKOS_FORCEINLINE_FUNCTION constexpr static int lor() {
+    return static_cast<int>(0);
+  }
+  KOKKOS_FORCEINLINE_FUNCTION constexpr static int land() {
+    return static_cast<int>(1);
+  }
 };
 
-template<>
+template <>
 struct reduction_identity<long> {
-  KOKKOS_FORCEINLINE_FUNCTION constexpr static long sum()  {return static_cast<long>(0);}
-  KOKKOS_FORCEINLINE_FUNCTION constexpr static long prod() {return static_cast<long>(1);}
-  KOKKOS_FORCEINLINE_FUNCTION constexpr static long max()  {return LLONG_MIN;}
-  KOKKOS_FORCEINLINE_FUNCTION constexpr static long min()  {return LLONG_MAX;}
-  KOKKOS_FORCEINLINE_FUNCTION constexpr static long bor()  {return static_cast<long>(0x0);}
-  KOKKOS_FORCEINLINE_FUNCTION constexpr static long band() {return ~static_cast<long>(0x0);}
-  KOKKOS_FORCEINLINE_FUNCTION constexpr static long lor()  {return static_cast<long>(0);}
-  KOKKOS_FORCEINLINE_FUNCTION constexpr static long land() {return static_cast<long>(1);}
+  KOKKOS_FORCEINLINE_FUNCTION constexpr static long sum() {
+    return static_cast<long>(0);
+  }
+  KOKKOS_FORCEINLINE_FUNCTION constexpr static long prod() {
+    return static_cast<long>(1);
+  }
+  KOKKOS_FORCEINLINE_FUNCTION constexpr static long max() { return LLONG_MIN; }
+  KOKKOS_FORCEINLINE_FUNCTION constexpr static long min() { return LLONG_MAX; }
+  KOKKOS_FORCEINLINE_FUNCTION constexpr static long bor() {
+    return static_cast<long>(0x0);
+  }
+  KOKKOS_FORCEINLINE_FUNCTION constexpr static long band() {
+    return ~static_cast<long>(0x0);
+  }
+  KOKKOS_FORCEINLINE_FUNCTION constexpr static long lor() {
+    return static_cast<long>(0);
+  }
+  KOKKOS_FORCEINLINE_FUNCTION constexpr static long land() {
+    return static_cast<long>(1);
+  }
 };
 
-template<>
+template <>
 struct reduction_identity<long long> {
-  KOKKOS_FORCEINLINE_FUNCTION constexpr static long long sum()  {return static_cast<long long>(0);}
-  KOKKOS_FORCEINLINE_FUNCTION constexpr static long long prod() {return static_cast<long long>(1);}
-  KOKKOS_FORCEINLINE_FUNCTION constexpr static long long max()  {return LLONG_MIN;}
-  KOKKOS_FORCEINLINE_FUNCTION constexpr static long long min()  {return LLONG_MAX;}
-  KOKKOS_FORCEINLINE_FUNCTION constexpr static long long bor()  {return static_cast<long long>(0x0);}
-  KOKKOS_FORCEINLINE_FUNCTION constexpr static long long band() {return ~static_cast<long long>(0x0);}
-  KOKKOS_FORCEINLINE_FUNCTION constexpr static long long lor()  {return static_cast<long long>(0);}
-  KOKKOS_FORCEINLINE_FUNCTION constexpr static long long land() {return static_cast<long long>(1);}
+  KOKKOS_FORCEINLINE_FUNCTION constexpr static long long sum() {
+    return static_cast<long long>(0);
+  }
+  KOKKOS_FORCEINLINE_FUNCTION constexpr static long long prod() {
+    return static_cast<long long>(1);
+  }
+  KOKKOS_FORCEINLINE_FUNCTION constexpr static long long max() {
+    return LLONG_MIN;
+  }
+  KOKKOS_FORCEINLINE_FUNCTION constexpr static long long min() {
+    return LLONG_MAX;
+  }
+  KOKKOS_FORCEINLINE_FUNCTION constexpr static long long bor() {
+    return static_cast<long long>(0x0);
+  }
+  KOKKOS_FORCEINLINE_FUNCTION constexpr static long long band() {
+    return ~static_cast<long long>(0x0);
+  }
+  KOKKOS_FORCEINLINE_FUNCTION constexpr static long long lor() {
+    return static_cast<long long>(0);
+  }
+  KOKKOS_FORCEINLINE_FUNCTION constexpr static long long land() {
+    return static_cast<long long>(1);
+  }
 };
 
-template<>
+template <>
 struct reduction_identity<unsigned char> {
-  KOKKOS_FORCEINLINE_FUNCTION constexpr static unsigned char sum()  {return static_cast<unsigned char>(0);}
-  KOKKOS_FORCEINLINE_FUNCTION constexpr static unsigned char prod() {return static_cast<unsigned char>(1);}
-  KOKKOS_FORCEINLINE_FUNCTION constexpr static unsigned char max()  {return static_cast<unsigned char>(0);}
-  KOKKOS_FORCEINLINE_FUNCTION constexpr static unsigned char min()  {return UCHAR_MAX;}
-  KOKKOS_FORCEINLINE_FUNCTION constexpr static unsigned char bor()  {return static_cast<unsigned char>(0x0);}
-  KOKKOS_FORCEINLINE_FUNCTION constexpr static unsigned char band() {return ~static_cast<unsigned char>(0x0);}
-  KOKKOS_FORCEINLINE_FUNCTION constexpr static unsigned char lor()  {return static_cast<unsigned char>(0);}
-  KOKKOS_FORCEINLINE_FUNCTION constexpr static unsigned char land() {return static_cast<unsigned char>(1);}
+  KOKKOS_FORCEINLINE_FUNCTION constexpr static unsigned char sum() {
+    return static_cast<unsigned char>(0);
+  }
+  KOKKOS_FORCEINLINE_FUNCTION constexpr static unsigned char prod() {
+    return static_cast<unsigned char>(1);
+  }
+  KOKKOS_FORCEINLINE_FUNCTION constexpr static unsigned char max() {
+    return static_cast<unsigned char>(0);
+  }
+  KOKKOS_FORCEINLINE_FUNCTION constexpr static unsigned char min() {
+    return UCHAR_MAX;
+  }
+  KOKKOS_FORCEINLINE_FUNCTION constexpr static unsigned char bor() {
+    return static_cast<unsigned char>(0x0);
+  }
+  KOKKOS_FORCEINLINE_FUNCTION constexpr static unsigned char band() {
+    return ~static_cast<unsigned char>(0x0);
+  }
+  KOKKOS_FORCEINLINE_FUNCTION constexpr static unsigned char lor() {
+    return static_cast<unsigned char>(0);
+  }
+  KOKKOS_FORCEINLINE_FUNCTION constexpr static unsigned char land() {
+    return static_cast<unsigned char>(1);
+  }
 };
 
-template<>
+template <>
 struct reduction_identity<unsigned short> {
-  KOKKOS_FORCEINLINE_FUNCTION constexpr static unsigned short sum()  {return static_cast<unsigned short>(0);}
-  KOKKOS_FORCEINLINE_FUNCTION constexpr static unsigned short prod() {return static_cast<unsigned short>(1);}
-  KOKKOS_FORCEINLINE_FUNCTION constexpr static unsigned short max()  {return static_cast<unsigned short>(0);}
-  KOKKOS_FORCEINLINE_FUNCTION constexpr static unsigned short min()  {return USHRT_MAX;}
-  KOKKOS_FORCEINLINE_FUNCTION constexpr static unsigned short bor()  {return static_cast<unsigned short>(0x0);}
-  KOKKOS_FORCEINLINE_FUNCTION constexpr static unsigned short band() {return ~static_cast<unsigned short>(0x0);}
-  KOKKOS_FORCEINLINE_FUNCTION constexpr static unsigned short lor()  {return static_cast<unsigned short>(0);}
-  KOKKOS_FORCEINLINE_FUNCTION constexpr static unsigned short land() {return static_cast<unsigned short>(1);}
+  KOKKOS_FORCEINLINE_FUNCTION constexpr static unsigned short sum() {
+    return static_cast<unsigned short>(0);
+  }
+  KOKKOS_FORCEINLINE_FUNCTION constexpr static unsigned short prod() {
+    return static_cast<unsigned short>(1);
+  }
+  KOKKOS_FORCEINLINE_FUNCTION constexpr static unsigned short max() {
+    return static_cast<unsigned short>(0);
+  }
+  KOKKOS_FORCEINLINE_FUNCTION constexpr static unsigned short min() {
+    return USHRT_MAX;
+  }
+  KOKKOS_FORCEINLINE_FUNCTION constexpr static unsigned short bor() {
+    return static_cast<unsigned short>(0x0);
+  }
+  KOKKOS_FORCEINLINE_FUNCTION constexpr static unsigned short band() {
+    return ~static_cast<unsigned short>(0x0);
+  }
+  KOKKOS_FORCEINLINE_FUNCTION constexpr static unsigned short lor() {
+    return static_cast<unsigned short>(0);
+  }
+  KOKKOS_FORCEINLINE_FUNCTION constexpr static unsigned short land() {
+    return static_cast<unsigned short>(1);
+  }
 };
 
-template<>
+template <>
 struct reduction_identity<unsigned int> {
-  KOKKOS_FORCEINLINE_FUNCTION constexpr static unsigned int sum()  {return static_cast<unsigned int>(0);}
-  KOKKOS_FORCEINLINE_FUNCTION constexpr static unsigned int prod() {return static_cast<unsigned int>(1);}
-  KOKKOS_FORCEINLINE_FUNCTION constexpr static unsigned int max()  {return static_cast<unsigned int>(0);}
-  KOKKOS_FORCEINLINE_FUNCTION constexpr static unsigned int min()  {return UINT_MAX;}
-  KOKKOS_FORCEINLINE_FUNCTION constexpr static unsigned int bor()  {return static_cast<unsigned int>(0x0);}
-  KOKKOS_FORCEINLINE_FUNCTION constexpr static unsigned int band() {return ~static_cast<unsigned int>(0x0);}
-  KOKKOS_FORCEINLINE_FUNCTION constexpr static unsigned int lor()  {return static_cast<unsigned int>(0);}
-  KOKKOS_FORCEINLINE_FUNCTION constexpr static unsigned int land() {return static_cast<unsigned int>(1);}
+  KOKKOS_FORCEINLINE_FUNCTION constexpr static unsigned int sum() {
+    return static_cast<unsigned int>(0);
+  }
+  KOKKOS_FORCEINLINE_FUNCTION constexpr static unsigned int prod() {
+    return static_cast<unsigned int>(1);
+  }
+  KOKKOS_FORCEINLINE_FUNCTION constexpr static unsigned int max() {
+    return static_cast<unsigned int>(0);
+  }
+  KOKKOS_FORCEINLINE_FUNCTION constexpr static unsigned int min() {
+    return UINT_MAX;
+  }
+  KOKKOS_FORCEINLINE_FUNCTION constexpr static unsigned int bor() {
+    return static_cast<unsigned int>(0x0);
+  }
+  KOKKOS_FORCEINLINE_FUNCTION constexpr static unsigned int band() {
+    return ~static_cast<unsigned int>(0x0);
+  }
+  KOKKOS_FORCEINLINE_FUNCTION constexpr static unsigned int lor() {
+    return static_cast<unsigned int>(0);
+  }
+  KOKKOS_FORCEINLINE_FUNCTION constexpr static unsigned int land() {
+    return static_cast<unsigned int>(1);
+  }
 };
 
-template<>
+template <>
 struct reduction_identity<unsigned long> {
-  KOKKOS_FORCEINLINE_FUNCTION constexpr static unsigned long sum()  {return static_cast<unsigned long>(0);}
-  KOKKOS_FORCEINLINE_FUNCTION constexpr static unsigned long prod() {return static_cast<unsigned long>(1);}
-  KOKKOS_FORCEINLINE_FUNCTION constexpr static unsigned long max()  {return static_cast<unsigned long>(0);}
-  KOKKOS_FORCEINLINE_FUNCTION constexpr static unsigned long min()  {return ULONG_MAX;}
-  KOKKOS_FORCEINLINE_FUNCTION constexpr static unsigned long bor()  {return static_cast<unsigned long>(0x0);}
-  KOKKOS_FORCEINLINE_FUNCTION constexpr static unsigned long band() {return ~static_cast<unsigned long>(0x0);}
-  KOKKOS_FORCEINLINE_FUNCTION constexpr static unsigned long lor()  {return static_cast<unsigned long>(0);}
-  KOKKOS_FORCEINLINE_FUNCTION constexpr static unsigned long land() {return static_cast<unsigned long>(1);}
+  KOKKOS_FORCEINLINE_FUNCTION constexpr static unsigned long sum() {
+    return static_cast<unsigned long>(0);
+  }
+  KOKKOS_FORCEINLINE_FUNCTION constexpr static unsigned long prod() {
+    return static_cast<unsigned long>(1);
+  }
+  KOKKOS_FORCEINLINE_FUNCTION constexpr static unsigned long max() {
+    return static_cast<unsigned long>(0);
+  }
+  KOKKOS_FORCEINLINE_FUNCTION constexpr static unsigned long min() {
+    return ULONG_MAX;
+  }
+  KOKKOS_FORCEINLINE_FUNCTION constexpr static unsigned long bor() {
+    return static_cast<unsigned long>(0x0);
+  }
+  KOKKOS_FORCEINLINE_FUNCTION constexpr static unsigned long band() {
+    return ~static_cast<unsigned long>(0x0);
+  }
+  KOKKOS_FORCEINLINE_FUNCTION constexpr static unsigned long lor() {
+    return static_cast<unsigned long>(0);
+  }
+  KOKKOS_FORCEINLINE_FUNCTION constexpr static unsigned long land() {
+    return static_cast<unsigned long>(1);
+  }
 };
 
-template<>
+template <>
 struct reduction_identity<unsigned long long> {
-  KOKKOS_FORCEINLINE_FUNCTION constexpr static unsigned long long sum()  {return static_cast<unsigned long long>(0);}
-  KOKKOS_FORCEINLINE_FUNCTION constexpr static unsigned long long prod() {return static_cast<unsigned long long>(1);}
-  KOKKOS_FORCEINLINE_FUNCTION constexpr static unsigned long long max()  {return static_cast<unsigned long long>(0);}
-  KOKKOS_FORCEINLINE_FUNCTION constexpr static unsigned long long min()  {return ULLONG_MAX;}
-  KOKKOS_FORCEINLINE_FUNCTION constexpr static unsigned long long bor()  {return static_cast<unsigned long long>(0x0);}
-  KOKKOS_FORCEINLINE_FUNCTION constexpr static unsigned long long band() {return ~static_cast<unsigned long long>(0x0);}
-  KOKKOS_FORCEINLINE_FUNCTION constexpr static unsigned long long lor()  {return static_cast<unsigned long long>(0);}
-  KOKKOS_FORCEINLINE_FUNCTION constexpr static unsigned long long land() {return static_cast<unsigned long long>(1);}
+  KOKKOS_FORCEINLINE_FUNCTION constexpr static unsigned long long sum() {
+    return static_cast<unsigned long long>(0);
+  }
+  KOKKOS_FORCEINLINE_FUNCTION constexpr static unsigned long long prod() {
+    return static_cast<unsigned long long>(1);
+  }
+  KOKKOS_FORCEINLINE_FUNCTION constexpr static unsigned long long max() {
+    return static_cast<unsigned long long>(0);
+  }
+  KOKKOS_FORCEINLINE_FUNCTION constexpr static unsigned long long min() {
+    return ULLONG_MAX;
+  }
+  KOKKOS_FORCEINLINE_FUNCTION constexpr static unsigned long long bor() {
+    return static_cast<unsigned long long>(0x0);
+  }
+  KOKKOS_FORCEINLINE_FUNCTION constexpr static unsigned long long band() {
+    return ~static_cast<unsigned long long>(0x0);
+  }
+  KOKKOS_FORCEINLINE_FUNCTION constexpr static unsigned long long lor() {
+    return static_cast<unsigned long long>(0);
+  }
+  KOKKOS_FORCEINLINE_FUNCTION constexpr static unsigned long long land() {
+    return static_cast<unsigned long long>(1);
+  }
 };
 
-template<>
+template <>
 struct reduction_identity<float> {
-  KOKKOS_FORCEINLINE_FUNCTION constexpr static float sum()  {return static_cast<float>(0.0f);}
-  KOKKOS_FORCEINLINE_FUNCTION constexpr static float prod() {return static_cast<float>(1.0f);}
-  KOKKOS_FORCEINLINE_FUNCTION constexpr static float max()  {return -FLT_MAX;}
-  KOKKOS_FORCEINLINE_FUNCTION constexpr static float min()  {return FLT_MAX;}
+  KOKKOS_FORCEINLINE_FUNCTION constexpr static float sum() {
+    return static_cast<float>(0.0f);
+  }
+  KOKKOS_FORCEINLINE_FUNCTION constexpr static float prod() {
+    return static_cast<float>(1.0f);
+  }
+  KOKKOS_FORCEINLINE_FUNCTION constexpr static float max() { return -FLT_MAX; }
+  KOKKOS_FORCEINLINE_FUNCTION constexpr static float min() { return FLT_MAX; }
 };
 
-template<>
+template <>
 struct reduction_identity<double> {
-  KOKKOS_FORCEINLINE_FUNCTION constexpr static double sum()  {return static_cast<double>(0.0);}
-  KOKKOS_FORCEINLINE_FUNCTION constexpr static double prod() {return static_cast<double>(1.0);}
-  KOKKOS_FORCEINLINE_FUNCTION constexpr static double max()  {return -DBL_MAX;}
-  KOKKOS_FORCEINLINE_FUNCTION constexpr static double min()  {return DBL_MAX;}
+  KOKKOS_FORCEINLINE_FUNCTION constexpr static double sum() {
+    return static_cast<double>(0.0);
+  }
+  KOKKOS_FORCEINLINE_FUNCTION constexpr static double prod() {
+    return static_cast<double>(1.0);
+  }
+  KOKKOS_FORCEINLINE_FUNCTION constexpr static double max() { return -DBL_MAX; }
+  KOKKOS_FORCEINLINE_FUNCTION constexpr static double min() { return DBL_MAX; }
 };
 
-#if !defined( KOKKOS_ACTIVE_EXECUTION_MEMORY_SPACE_CUDA )
-template<>
+#if !defined(KOKKOS_ACTIVE_EXECUTION_MEMORY_SPACE_CUDA)
+template <>
 struct reduction_identity<long double> {
-  KOKKOS_FORCEINLINE_FUNCTION constexpr static long double sum()  {return static_cast<long double>(0.0);}
-  KOKKOS_FORCEINLINE_FUNCTION constexpr static long double prod() {return static_cast<long double>(1.0);}
-  KOKKOS_FORCEINLINE_FUNCTION constexpr static long double max()  {return -LDBL_MAX;}
-  KOKKOS_FORCEINLINE_FUNCTION constexpr static long double min()  {return LDBL_MAX;}
+  KOKKOS_FORCEINLINE_FUNCTION constexpr static long double sum() {
+    return static_cast<long double>(0.0);
+  }
+  KOKKOS_FORCEINLINE_FUNCTION constexpr static long double prod() {
+    return static_cast<long double>(1.0);
+  }
+  KOKKOS_FORCEINLINE_FUNCTION constexpr static long double max() {
+    return -LDBL_MAX;
+  }
+  KOKKOS_FORCEINLINE_FUNCTION constexpr static long double min() {
+    return LDBL_MAX;
+  }
 };
 #endif
 
-}
+}  // namespace Kokkos
 
 #endif
diff --git a/lib/kokkos/core/src/Kokkos_OpenMP.hpp b/lib/kokkos/core/src/Kokkos_OpenMP.hpp
index 6ee8f08dc8..3955c06156 100644
--- a/lib/kokkos/core/src/Kokkos_OpenMP.hpp
+++ b/lib/kokkos/core/src/Kokkos_OpenMP.hpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -45,7 +46,7 @@
 #define KOKKOS_OPENMP_HPP
 
 #include <Kokkos_Macros.hpp>
-#if defined( KOKKOS_ENABLE_OPENMP)
+#if defined(KOKKOS_ENABLE_OPENMP)
 
 #include <Kokkos_Core_fwd.hpp>
 
@@ -76,53 +77,48 @@ class OpenMPExec;
 /// \class OpenMP
 /// \brief Kokkos device for multicore processors in the host memory space.
 class OpenMP {
-public:
+ public:
   //! Tag this class as a kokkos execution space
   using execution_space = OpenMP;
 
   using memory_space =
-  #ifdef KOKKOS_ENABLE_HBWSPACE
-    Experimental::HBWSpace;
-  #else
-    HostSpace;
-  #endif
+#ifdef KOKKOS_ENABLE_HBWSPACE
+      Experimental::HBWSpace;
+#else
+      HostSpace;
+#endif
 
   //! This execution space preferred device_type
-  using device_type          = Kokkos::Device< execution_space, memory_space >;
+  using device_type          = Kokkos::Device<execution_space, memory_space>;
   using array_layout         = LayoutRight;
   using size_type            = memory_space::size_type;
-  using scratch_memory_space = ScratchMemorySpace< OpenMP >;
+  using scratch_memory_space = ScratchMemorySpace<OpenMP>;
 
   /// \brief Get a handle to the default execution space instance
-  inline
-  OpenMP() noexcept;
+  inline OpenMP() noexcept;
 
   /// \brief Print configuration information to the given output stream.
-  static void print_configuration( std::ostream & , const bool verbose = false );
+  static void print_configuration(std::ostream&, const bool verbose = false);
 
   /// \brief is the instance running a parallel algorithm
-  inline
-  static bool in_parallel( OpenMP const& = OpenMP() ) noexcept;
+  inline static bool in_parallel(OpenMP const& = OpenMP()) noexcept;
 
   /// \brief Wait until all dispatched functors complete on the given instance
   ///
   ///  This is a no-op on OpenMP
-  static void impl_static_fence( OpenMP const& = OpenMP() ) noexcept;
+  static void impl_static_fence(OpenMP const& = OpenMP()) noexcept;
 
-  #ifdef KOKKOS_ENABLE_DEPRECATED_CODE
-  static void fence( OpenMP const& = OpenMP() ) noexcept;
-  #else
+#ifdef KOKKOS_ENABLE_DEPRECATED_CODE
+  static void fence(OpenMP const& = OpenMP()) noexcept;
+#else
   void fence() const;
-  #endif
-
+#endif
 
   /// \brief Does the given instance return immediately after launching
   /// a parallel algorithm
   ///
   /// This always returns false on OpenMP
-  inline
-  static bool is_asynchronous( OpenMP const& = OpenMP() ) noexcept;
-
+  inline static bool is_asynchronous(OpenMP const& = OpenMP()) noexcept;
 
   /// \brief Partition the default instance into new instances without creating
   ///  new masters
@@ -137,24 +133,22 @@ public:
   /// This is a no-op on OpenMP since a non default instance cannot be created
   static OpenMP create_instance(...);
 
-  /// \brief Partition the default instance and call 'f' on each new 'master' thread
+  /// \brief Partition the default instance and call 'f' on each new 'master'
+  /// thread
   ///
   /// Func is a functor with the following signiture
   ///   void( int partition_id, int num_partitions )
   template <typename F>
-  static void partition_master( F const& f
-                              , int requested_num_partitions = 0
-                              , int requested_partition_size = 0
-                              );
+  static void partition_master(F const& f, int requested_num_partitions = 0,
+                               int requested_partition_size = 0);
 
   // use UniqueToken
   static int concurrency();
 
 #ifdef KOKKOS_ENABLE_DEPRECATED_CODE
   /// \brief Initialize the default execution space
-  static void initialize( int thread_count,
-                          int use_numa_count,
-                          int use_cores_per_numa = 0);
+  static void initialize(int thread_count, int use_numa_count,
+                         int use_cores_per_numa = 0);
 
   /// \brief Initialize the default execution space
   ///
@@ -166,66 +160,62 @@ public:
   /// if ( thread_count > 0 )
   ///   then force openmp to use the given number of threads and change
   ///   the default number of threads
-  static void initialize( int thread_count = -1 );
+  static void initialize(int thread_count = -1);
 
-  /// \brief is the default execution space initialized for current 'master' thread
+  /// \brief is the default execution space initialized for current 'master'
+  /// thread
   static bool is_initialized() noexcept;
 
   /// \brief Free any resources being consumed by the default execution space
   static void finalize();
 
-  inline
-  static int thread_pool_size() noexcept;
+  inline static int thread_pool_size() noexcept;
 
   /** \brief  The rank of the executing thread in this thread pool */
   KOKKOS_INLINE_FUNCTION
   static int thread_pool_rank() noexcept;
 
-  inline
-  static int thread_pool_size( int depth );
+  inline static int thread_pool_size(int depth);
 
-  static void sleep() {};
-  static void wake() {};
+  static void sleep(){};
+  static void wake(){};
 
   // Using omp_get_max_threads(); is problematic
   // On Intel (essentially an initial call to the OpenMP runtime
   // without a parallel region before will set a process mask for a single core
-  // The runtime will than bind threads for a parallel region to other cores on the
-  // entering the first parallel region and make the process mask the aggregate of
-  // the thread masks. The intend seems to be to make serial code run fast, if you
-  // compile with OpenMP enabled but don't actually use parallel regions or so
-  // static int omp_max_threads = omp_get_max_threads();
+  // The runtime will than bind threads for a parallel region to other cores on
+  // the entering the first parallel region and make the process mask the
+  // aggregate of the thread masks. The intend seems to be to make serial code
+  // run fast, if you compile with OpenMP enabled but don't actually use
+  // parallel regions or so static int omp_max_threads = omp_get_max_threads();
   static int get_current_max_threads() noexcept;
 
   // use UniqueToken
-  inline
-  static int max_hardware_threads() noexcept;
+  inline static int max_hardware_threads() noexcept;
 
   // use UniqueToken
   KOKKOS_INLINE_FUNCTION
   static int hardware_thread_id() noexcept;
 #else
-  static void impl_initialize( int thread_count = -1 );
+  static void impl_initialize(int thread_count = -1);
 
-  /// \brief is the default execution space initialized for current 'master' thread
+  /// \brief is the default execution space initialized for current 'master'
+  /// thread
   static bool impl_is_initialized() noexcept;
 
   /// \brief Free any resources being consumed by the default execution space
   static void impl_finalize();
 
-  inline
-  static int impl_thread_pool_size() noexcept;
+  inline static int impl_thread_pool_size() noexcept;
 
   /** \brief  The rank of the executing thread in this thread pool */
   KOKKOS_INLINE_FUNCTION
   static int impl_thread_pool_rank() noexcept;
 
-  inline
-  static int impl_thread_pool_size( int depth );
+  inline static int impl_thread_pool_size(int depth);
 
   // use UniqueToken
-  inline
-  static int impl_max_hardware_threads() noexcept;
+  inline static int impl_max_hardware_threads() noexcept;
 
   // use UniqueToken
   KOKKOS_INLINE_FUNCTION
@@ -237,7 +227,7 @@ public:
   static constexpr const char* name() noexcept { return "OpenMP"; }
 };
 
-} // namespace Kokkos
+}  // namespace Kokkos
 
 /*--------------------------------------------------------------------------*/
 /*--------------------------------------------------------------------------*/
@@ -245,30 +235,24 @@ public:
 namespace Kokkos {
 namespace Impl {
 
-template<>
-struct MemorySpaceAccess
-  < Kokkos::OpenMP::memory_space
-  , Kokkos::OpenMP::scratch_memory_space
-  >
-{
+template <>
+struct MemorySpaceAccess<Kokkos::OpenMP::memory_space,
+                         Kokkos::OpenMP::scratch_memory_space> {
   enum { assignable = false };
   enum { accessible = true };
-  enum { deepcopy   = false };
+  enum { deepcopy = false };
 };
 
-template<>
-struct VerifyExecutionCanAccessMemorySpace
-  < Kokkos::OpenMP::memory_space
-  , Kokkos::OpenMP::scratch_memory_space
-  >
-{
+template <>
+struct VerifyExecutionCanAccessMemorySpace<
+    Kokkos::OpenMP::memory_space, Kokkos::OpenMP::scratch_memory_space> {
   enum { value = true };
-  inline static void verify( void ) { }
-  inline static void verify( const void * ) { }
+  inline static void verify(void) {}
+  inline static void verify(const void*) {}
 };
 
-} // namespace Impl
-} // namespace Kokkos
+}  // namespace Impl
+}  // namespace Kokkos
 
 /*--------------------------------------------------------------------------*/
 /*--------------------------------------------------------------------------*/
@@ -283,4 +267,3 @@ struct VerifyExecutionCanAccessMemorySpace
 
 #endif /* #if defined( KOKKOS_ENABLE_OPENMP ) && defined( _OPENMP ) */
 #endif /* #ifndef KOKKOS_OPENMP_HPP */
-
diff --git a/lib/kokkos/core/src/Kokkos_OpenMPTarget.hpp b/lib/kokkos/core/src/Kokkos_OpenMPTarget.hpp
index e2dd249ff7..9706751f9c 100644
--- a/lib/kokkos/core/src/Kokkos_OpenMPTarget.hpp
+++ b/lib/kokkos/core/src/Kokkos_OpenMPTarget.hpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -46,7 +47,7 @@
 
 #include <Kokkos_Core_fwd.hpp>
 
-#if defined( KOKKOS_ENABLE_OPENMPTARGET ) && defined( _OPENMP )
+#if defined(KOKKOS_ENABLE_OPENMPTARGET) && defined(_OPENMP)
 
 #include <omp.h>
 
@@ -67,21 +68,21 @@ namespace Experimental {
 /// \class OpenMPTarget
 /// \brief Kokkos device for multicore processors in the host memory space.
 class OpenMPTarget {
-public:
+ public:
   //------------------------------------
   //! \name Type declarations that all Kokkos devices must provide.
   //@{
 
   //! Tag this class as a kokkos execution space
-  typedef OpenMPTarget                execution_space ;
-  typedef OpenMPTargetSpace           memory_space ;
+  typedef OpenMPTarget execution_space;
+  typedef OpenMPTargetSpace memory_space;
   //! This execution space preferred device_type
-  typedef Kokkos::Device<execution_space,memory_space> device_type;
+  typedef Kokkos::Device<execution_space, memory_space> device_type;
 
-  typedef LayoutLeft           array_layout ;
-  typedef memory_space::size_type  size_type ;
+  typedef LayoutLeft array_layout;
+  typedef memory_space::size_type size_type;
 
-  typedef ScratchMemorySpace< OpenMPTarget > scratch_memory_space ;
+  typedef ScratchMemorySpace<OpenMPTarget> scratch_memory_space;
 
   //@}
   //------------------------------------
@@ -96,11 +97,12 @@ public:
   /** \brief Wake the device from the 'sleep' state. A noop for OpenMPTarget. */
   static bool wake();
 
-  /** \brief Wait until all dispatched functors complete. A noop for OpenMPTarget. */
+  /** \brief Wait until all dispatched functors complete. A noop for
+   * OpenMPTarget. */
   static void fence() {}
 
   /// \brief Print configuration information to the given output stream.
-  static void print_configuration( std::ostream & , const bool detail = false );
+  static void print_configuration(std::ostream&, const bool detail = false);
 
   /// \brief Free any resources being consumed by the device.
   static void finalize();
@@ -114,9 +116,8 @@ public:
    *  2) Allocate a HostThread for each OpenMPTarget thread to hold its
    *     topology and fan in/out data.
    */
-  static void initialize( unsigned thread_count = 0 ,
-                          unsigned use_numa_count = 0 ,
-                          unsigned use_cores_per_numa = 0 );
+  static void initialize(unsigned thread_count = 0, unsigned use_numa_count = 0,
+                         unsigned use_cores_per_numa = 0);
 
   static int is_initialized();
 
@@ -125,14 +126,16 @@ public:
 
   //@}
   //------------------------------------
-  /** \brief  This execution space has a topological thread pool which can be queried.
+  /** \brief  This execution space has a topological thread pool which can be
+   * queried.
    *
-   *  All threads within a pool have a common memory space for which they are cache coherent.
-   *    depth = 0  gives the number of threads in the whole pool.
-   *    depth = 1  gives the number of threads in a NUMA region, typically sharing L3 cache.
-   *    depth = 2  gives the number of threads at the finest granularity, typically sharing L1 cache.
+   *  All threads within a pool have a common memory space for which they are
+   * cache coherent. depth = 0  gives the number of threads in the whole pool.
+   *    depth = 1  gives the number of threads in a NUMA region, typically
+   * sharing L3 cache. depth = 2  gives the number of threads at the finest
+   * granularity, typically sharing L1 cache.
    */
-  inline static int thread_pool_size( int depth = 0 );
+  inline static int thread_pool_size(int depth = 0);
 
   /** \brief  The rank of the executing thread in this thread pool */
   KOKKOS_INLINE_FUNCTION static int thread_pool_rank();
@@ -141,15 +144,17 @@ public:
 
   inline static unsigned max_hardware_threads() { return thread_pool_size(0); }
 
-  KOKKOS_INLINE_FUNCTION static
-  unsigned hardware_thread_id() { return thread_pool_rank(); }
+  KOKKOS_INLINE_FUNCTION static unsigned hardware_thread_id() {
+    return thread_pool_rank();
+  }
 
   static const char* name();
-private:
+
+ private:
   static bool m_is_initialized;
 };
-} // namespace Experimental
-} // namespace Kokkos
+}  // namespace Experimental
+}  // namespace Kokkos
 
 /*--------------------------------------------------------------------------*/
 /*--------------------------------------------------------------------------*/
@@ -157,19 +162,17 @@ private:
 namespace Kokkos {
 namespace Impl {
 
-template<>
-struct VerifyExecutionCanAccessMemorySpace
-  < Kokkos::Experimental::OpenMPTarget::memory_space
-  , Kokkos::Experimental::OpenMPTarget::scratch_memory_space
-  >
-{
+template <>
+struct VerifyExecutionCanAccessMemorySpace<
+    Kokkos::Experimental::OpenMPTarget::memory_space,
+    Kokkos::Experimental::OpenMPTarget::scratch_memory_space> {
   enum { value = true };
-  inline static void verify( void ) { }
-  inline static void verify( const void * ) { }
+  inline static void verify(void) {}
+  inline static void verify(const void*) {}
 };
 
-} // namespace Impl
-} // namespace Kokkos
+}  // namespace Impl
+}  // namespace Kokkos
 
 /*--------------------------------------------------------------------------*/
 /*--------------------------------------------------------------------------*/
@@ -182,5 +185,3 @@ struct VerifyExecutionCanAccessMemorySpace
 
 #endif /* #if defined( KOKKOS_ENABLE_OPENMPTARGET ) && defined( _OPENMP ) */
 #endif /* #ifndef KOKKOS_OPENMPTARGET_HPP */
-
-
diff --git a/lib/kokkos/core/src/Kokkos_OpenMPTargetSpace.hpp b/lib/kokkos/core/src/Kokkos_OpenMPTargetSpace.hpp
index f2491900ff..eef5893be5 100644
--- a/lib/kokkos/core/src/Kokkos_OpenMPTargetSpace.hpp
+++ b/lib/kokkos/core/src/Kokkos_OpenMPTargetSpace.hpp
@@ -1,13 +1,14 @@
 /*
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -36,7 +37,7 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 */
@@ -66,25 +67,25 @@ namespace Impl {
 /// where the hash value is derived from the address of the
 /// object for which an atomic operation is performed.
 /// This function initializes the locks to zero (unset).
-//void init_lock_array_host_space();
+// void init_lock_array_host_space();
 
-/// \brief Aquire a lock for the address
+/// \brief Acquire a lock for the address
 ///
-/// This function tries to aquire the lock for the hash value derived
-/// from the provided ptr. If the lock is successfully aquired the
+/// This function tries to acquire the lock for the hash value derived
+/// from the provided ptr. If the lock is successfully acquired the
 /// function returns true. Otherwise it returns false.
-//bool lock_address_host_space(void* ptr);
+// bool lock_address_host_space(void* ptr);
 
 /// \brief Release lock for the address
 ///
 /// This function releases the lock for the hash value derived
 /// from the provided ptr. This function should only be called
-/// after previously successfully aquiring a lock with
+/// after previously successfully acquiring a lock with
 /// lock_address.
-//void unlock_address_host_space(void* ptr);
+// void unlock_address_host_space(void* ptr);
 
-} // namespace Impl
-} // namespace Kokkos
+}  // namespace Impl
+}  // namespace Kokkos
 
 namespace Kokkos {
 namespace Experimental {
@@ -95,11 +96,10 @@ namespace Experimental {
 /// OpenMPTargetSpace is a memory space that governs host memory.  "Host"
 /// memory means the usual CPU-accessible memory.
 class OpenMPTargetSpace {
-public:
-
+ public:
   //! Tag this class as a kokkos memory space
-  typedef OpenMPTargetSpace  memory_space ;
-  typedef size_t     size_type ;
+  typedef OpenMPTargetSpace memory_space;
+  typedef size_t size_type;
 
   /// \typedef execution_space
   /// \brief Default execution space for this memory space.
@@ -107,34 +107,33 @@ public:
   /// Every memory space has a default execution space.  This is
   /// useful for things like initializing a View (which happens in
   /// parallel using the View's default execution space).
-  typedef Kokkos::Experimental::OpenMPTarget   execution_space ;
+  typedef Kokkos::Experimental::OpenMPTarget execution_space;
 
   //! This memory space preferred device_type
-  typedef Kokkos::Device<execution_space,memory_space> device_type;
+  typedef Kokkos::Device<execution_space, memory_space> device_type;
 
   /*--------------------------------*/
 
   /**\brief  Default memory space instance */
   OpenMPTargetSpace();
-  OpenMPTargetSpace( OpenMPTargetSpace && rhs ) = default ;
-  OpenMPTargetSpace( const OpenMPTargetSpace & rhs ) = default ;
-  OpenMPTargetSpace & operator = ( OpenMPTargetSpace && ) = default ;
-  OpenMPTargetSpace & operator = ( const OpenMPTargetSpace & ) = default ;
-  ~OpenMPTargetSpace() = default ;
+  OpenMPTargetSpace(OpenMPTargetSpace&& rhs)      = default;
+  OpenMPTargetSpace(const OpenMPTargetSpace& rhs) = default;
+  OpenMPTargetSpace& operator=(OpenMPTargetSpace&&) = default;
+  OpenMPTargetSpace& operator=(const OpenMPTargetSpace&) = default;
+  ~OpenMPTargetSpace()                                   = default;
 
   /**\brief  Allocate untracked memory in the space */
-  void * allocate( const size_t arg_alloc_size ) const ;
+  void* allocate(const size_t arg_alloc_size) const;
 
   /**\brief  Deallocate untracked memory in the space */
-  void deallocate( void * const arg_alloc_ptr 
-                 , const size_t arg_alloc_size ) const ;
+  void deallocate(void* const arg_alloc_ptr, const size_t arg_alloc_size) const;
 
-private:
-
-  friend class Kokkos::Impl::SharedAllocationRecord< Kokkos::Experimental::OpenMPTargetSpace , void > ;
+ private:
+  friend class Kokkos::Impl::SharedAllocationRecord<
+      Kokkos::Experimental::OpenMPTargetSpace, void>;
 };
-} // namespace Experimental
-} // namespace Kokkos
+}  // namespace Experimental
+}  // namespace Kokkos
 
 //----------------------------------------------------------------------------
 //----------------------------------------------------------------------------
@@ -142,70 +141,62 @@ private:
 namespace Kokkos {
 namespace Impl {
 
-template<>
-class SharedAllocationRecord< Kokkos::Experimental::OpenMPTargetSpace , void >
-  : public SharedAllocationRecord< void , void >
-{
-private:
+template <>
+class SharedAllocationRecord<Kokkos::Experimental::OpenMPTargetSpace, void>
+    : public SharedAllocationRecord<void, void> {
+ private:
+  friend Kokkos::Experimental::OpenMPTargetSpace;
 
-  friend Kokkos::Experimental::OpenMPTargetSpace ;
+  typedef SharedAllocationRecord<void, void> RecordBase;
 
-  typedef SharedAllocationRecord< void , void >  RecordBase ;
+  SharedAllocationRecord(const SharedAllocationRecord&) = delete;
+  SharedAllocationRecord& operator=(const SharedAllocationRecord&) = delete;
 
-  SharedAllocationRecord( const SharedAllocationRecord & ) = delete ;
-  SharedAllocationRecord & operator = ( const SharedAllocationRecord & ) = delete ;
+  static void deallocate(RecordBase*);
 
-  static void deallocate( RecordBase * );
+  /**\brief  Root record for tracked allocations from this OpenMPTargetSpace
+   * instance */
+  static RecordBase s_root_record;
 
-  /**\brief  Root record for tracked allocations from this OpenMPTargetSpace instance */
-  static RecordBase s_root_record ;
-
-  const Kokkos::Experimental::OpenMPTargetSpace m_space ;
-
-protected:
+  const Kokkos::Experimental::OpenMPTargetSpace m_space;
 
+ protected:
   ~SharedAllocationRecord();
-  SharedAllocationRecord() = default ;
+  SharedAllocationRecord() = default;
 
-  SharedAllocationRecord( const Kokkos::Experimental::OpenMPTargetSpace        & arg_space
-                        , const std::string              & arg_label
-                        , const size_t                     arg_alloc_size
-                        , const RecordBase::function_type  arg_dealloc = & deallocate
-                        );
-
-public:
+  SharedAllocationRecord(
+      const Kokkos::Experimental::OpenMPTargetSpace& arg_space,
+      const std::string& arg_label, const size_t arg_alloc_size,
+      const RecordBase::function_type arg_dealloc = &deallocate);
 
+ public:
   std::string get_label() const;
 
-  KOKKOS_INLINE_FUNCTION static
-  SharedAllocationRecord * allocate( const Kokkos::Experimental::OpenMPTargetSpace &  arg_space
-                                   , const std::string       &  arg_label
-                                   , const size_t               arg_alloc_size
-                                   );
+  KOKKOS_INLINE_FUNCTION static SharedAllocationRecord* allocate(
+      const Kokkos::Experimental::OpenMPTargetSpace& arg_space,
+      const std::string& arg_label, const size_t arg_alloc_size);
 
   /**\brief  Allocate tracked memory in the space */
-  static
-  void * allocate_tracked( const Kokkos::Experimental::OpenMPTargetSpace & arg_space
-                         , const std::string & arg_label
-                         , const size_t arg_alloc_size );
+  static void* allocate_tracked(
+      const Kokkos::Experimental::OpenMPTargetSpace& arg_space,
+      const std::string& arg_label, const size_t arg_alloc_size);
 
   /**\brief  Reallocate tracked memory in the space */
-  static
-  void * reallocate_tracked( void * const arg_alloc_ptr
-                           , const size_t arg_alloc_size );
+  static void* reallocate_tracked(void* const arg_alloc_ptr,
+                                  const size_t arg_alloc_size);
 
   /**\brief  Deallocate tracked memory in the space */
-  static
-  void deallocate_tracked( void * const arg_alloc_ptr );
+  static void deallocate_tracked(void* const arg_alloc_ptr);
 
+  static SharedAllocationRecord* get_record(void* arg_alloc_ptr);
 
-  static SharedAllocationRecord * get_record( void * arg_alloc_ptr );
-
-  static void print_records( std::ostream & , const Kokkos::Experimental::OpenMPTargetSpace & , bool detail = false );
+  static void print_records(std::ostream&,
+                            const Kokkos::Experimental::OpenMPTargetSpace&,
+                            bool detail = false);
 };
 
-} // namespace Impl
-} // namespace Kokkos
+}  // namespace Impl
+}  // namespace Kokkos
 
 //----------------------------------------------------------------------------
 //----------------------------------------------------------------------------
@@ -213,53 +204,59 @@ public:
 namespace Kokkos {
 namespace Impl {
 
-//TODO: implement all possible deep_copies
-template<class ExecutionSpace>
-struct DeepCopy<Kokkos::Experimental::OpenMPTargetSpace,Kokkos::Experimental::OpenMPTargetSpace,ExecutionSpace> {
-  DeepCopy( void * dst , const void * src , size_t n ) {
-    omp_target_memcpy( dst , const_cast<void*> (src) , n, 0, 0, omp_get_default_device(), omp_get_default_device());
+// TODO: implement all possible deep_copies
+template <class ExecutionSpace>
+struct DeepCopy<Kokkos::Experimental::OpenMPTargetSpace,
+                Kokkos::Experimental::OpenMPTargetSpace, ExecutionSpace> {
+  DeepCopy(void* dst, const void* src, size_t n) {
+    omp_target_memcpy(dst, const_cast<void*>(src), n, 0, 0,
+                      omp_get_default_device(), omp_get_default_device());
   }
-  DeepCopy( const ExecutionSpace& exec, void * dst , const void * src , size_t n ) {
+  DeepCopy(const ExecutionSpace& exec, void* dst, const void* src, size_t n) {
     exec.fence();
-    omp_target_memcpy( dst , const_cast<void*> (src) , n, 0, 0, omp_get_default_device(), omp_get_default_device());
+    omp_target_memcpy(dst, const_cast<void*>(src), n, 0, 0,
+                      omp_get_default_device(), omp_get_default_device());
   }
 };
 
-
-template<class ExecutionSpace>
-struct DeepCopy<Kokkos::Experimental::OpenMPTargetSpace,HostSpace,ExecutionSpace> {
-  DeepCopy( void * dst , const void * src , size_t n ) {
-    omp_target_memcpy( dst , const_cast<void*> (src) , n, 0, 0, omp_get_default_device(), omp_get_initial_device());
+template <class ExecutionSpace>
+struct DeepCopy<Kokkos::Experimental::OpenMPTargetSpace, HostSpace,
+                ExecutionSpace> {
+  DeepCopy(void* dst, const void* src, size_t n) {
+    omp_target_memcpy(dst, const_cast<void*>(src), n, 0, 0,
+                      omp_get_default_device(), omp_get_initial_device());
   }
-  DeepCopy( const ExecutionSpace& exec, void * dst , const void * src , size_t n ) {
+  DeepCopy(const ExecutionSpace& exec, void* dst, const void* src, size_t n) {
     exec.fence();
-    omp_target_memcpy( dst , const_cast<void*> (src) , n, 0, 0, omp_get_default_device(), omp_get_initial_device());
+    omp_target_memcpy(dst, const_cast<void*>(src), n, 0, 0,
+                      omp_get_default_device(), omp_get_initial_device());
   }
 };
 
-template<class ExecutionSpace>
-struct DeepCopy<HostSpace,Kokkos::Experimental::OpenMPTargetSpace,ExecutionSpace> {
-  DeepCopy( void * dst , const void * src , size_t n ) {
-    omp_target_memcpy( dst , const_cast<void*> (src) , n, 0, 0, omp_get_initial_device(), omp_get_default_device());
+template <class ExecutionSpace>
+struct DeepCopy<HostSpace, Kokkos::Experimental::OpenMPTargetSpace,
+                ExecutionSpace> {
+  DeepCopy(void* dst, const void* src, size_t n) {
+    omp_target_memcpy(dst, const_cast<void*>(src), n, 0, 0,
+                      omp_get_initial_device(), omp_get_default_device());
   }
-  DeepCopy( const ExecutionSpace& exec, void * dst , const void * src , size_t n ) {
+  DeepCopy(const ExecutionSpace& exec, void* dst, const void* src, size_t n) {
     exec.fence();
-    omp_target_memcpy( dst , const_cast<void*> (src) , n, 0, 0, omp_get_initial_device(), omp_get_default_device());
+    omp_target_memcpy(dst, const_cast<void*>(src), n, 0, 0,
+                      omp_get_initial_device(), omp_get_default_device());
   }
 };
 
-
-template<>
-struct VerifyExecutionCanAccessMemorySpace< Kokkos::HostSpace , Kokkos::Experimental::OpenMPTargetSpace >
-{
+template <>
+struct VerifyExecutionCanAccessMemorySpace<
+    Kokkos::HostSpace, Kokkos::Experimental::OpenMPTargetSpace> {
   enum { value = false };
-  inline static void verify( void ) { }
-  inline static void verify( const void * ) { }
+  inline static void verify(void) {}
+  inline static void verify(const void*) {}
 };
 
-} // namespace Impl
-} // namespace Kokkos
+}  // namespace Impl
+}  // namespace Kokkos
 
 #endif
 #endif /* #define KOKKOS_OPENMPTARGETSPACE_HPP */
-
diff --git a/lib/kokkos/core/src/Kokkos_Pair.hpp b/lib/kokkos/core/src/Kokkos_Pair.hpp
index ab0ab8152a..ee9797b4b3 100644
--- a/lib/kokkos/core/src/Kokkos_Pair.hpp
+++ b/lib/kokkos/core/src/Kokkos_Pair.hpp
@@ -1,10 +1,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -22,10 +23,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -61,15 +62,14 @@ namespace Kokkos {
 /// implements the same interface as std::pair, but can be used on a
 /// CUDA device as well as on the host.
 template <class T1, class T2>
-struct pair
-{
+struct pair {
   //! The first template parameter of this class.
   typedef T1 first_type;
   //! The second template parameter of this class.
   typedef T2 second_type;
 
   //! The first element of the pair.
-  first_type  first;
+  first_type first;
   //! The second element of the pair.
   second_type second;
 
@@ -80,54 +80,48 @@ struct pair
   /// public.
   KOKKOS_FORCEINLINE_FUNCTION constexpr
 #ifdef KOKKOS_CUDA_9_DEFAULTED_BUG_WORKAROUND
-  pair() : first(), second() {}
+      pair()
+      : first(), second() {
+  }
 #else
-  pair() = default;
+      pair() = default;
 #endif
 
   /// \brief Constructor that takes both elements of the pair.
   ///
   /// This calls the copy constructors of T1 and T2.  It won't compile
   /// if those copy constructors are not defined and public.
-  KOKKOS_FORCEINLINE_FUNCTION constexpr
-  pair(first_type const& f, second_type const& s)
-    : first(f), second(s)
-  {}
+  KOKKOS_FORCEINLINE_FUNCTION constexpr pair(first_type const& f,
+                                             second_type const& s)
+      : first(f), second(s) {}
 
   /// \brief Copy constructor.
   ///
   /// This calls the copy constructors of T1 and T2.  It won't compile
   /// if those copy constructors are not defined and public.
   template <class U, class V>
-  KOKKOS_FORCEINLINE_FUNCTION constexpr
-  pair( const pair<U,V> &p)
-    : first(p.first), second(p.second)
-  {}
+  KOKKOS_FORCEINLINE_FUNCTION constexpr pair(const pair<U, V>& p)
+      : first(p.first), second(p.second) {}
 
   /// \brief Copy constructor.
   ///
   /// This calls the copy constructors of T1 and T2.  It won't compile
   /// if those copy constructors are not defined and public.
   template <class U, class V>
-  KOKKOS_FORCEINLINE_FUNCTION constexpr
-  pair( const volatile pair<U,V> &p)
-    : first(p.first), second(p.second)
-  {}
+  KOKKOS_FORCEINLINE_FUNCTION constexpr pair(const volatile pair<U, V>& p)
+      : first(p.first), second(p.second) {}
 
   /// \brief Assignment operator.
   ///
   /// This calls the assignment operators of T1 and T2.  It won't
   /// compile if the assignment operators are not defined and public.
   template <class U, class V>
-  KOKKOS_FORCEINLINE_FUNCTION
-  pair<T1, T2> & operator=(const pair<U,V> &p)
-  {
-    first = p.first;
+  KOKKOS_FORCEINLINE_FUNCTION pair<T1, T2>& operator=(const pair<U, V>& p) {
+    first  = p.first;
     second = p.second;
     return *this;
   }
 
-
   /// \brief Assignment operator, for volatile <tt>*this</tt>.
   ///
   /// \param p [in] Input; right-hand side of the assignment.
@@ -140,10 +134,9 @@ struct pair
   /// practice, this means that you should not chain assignments with
   /// volatile lvalues.
   template <class U, class V>
-  KOKKOS_FORCEINLINE_FUNCTION
-  void operator=(const volatile pair<U,V> &p) volatile
-  {
-    first = p.first;
+  KOKKOS_FORCEINLINE_FUNCTION void operator=(
+      const volatile pair<U, V>& p) volatile {
+    first  = p.first;
     second = p.second;
     // We deliberately do not return anything here.  See explanation
     // in public documentation above.
@@ -151,9 +144,7 @@ struct pair
 
   // from std::pair<U,V>
   template <class U, class V>
-  pair( const std::pair<U,V> &p)
-    : first(p.first), second(p.second)
-  {}
+  pair(const std::pair<U, V>& p) : first(p.first), second(p.second) {}
 
   /// \brief Return the std::pair version of this object.
   ///
@@ -164,20 +155,20 @@ struct pair
   /// \note This is not a conversion operator, since defining a
   ///   conversion operator made the relational operators have
   ///   ambiguous definitions.
-  std::pair<T1,T2> to_std_pair() const
-  { return std::make_pair(first,second); }
+  std::pair<T1, T2> to_std_pair() const {
+    return std::make_pair(first, second);
+  }
 };
 
 template <class T1, class T2>
-struct pair<T1&, T2&>
-{
+struct pair<T1&, T2&> {
   //! The first template parameter of this class.
   typedef T1& first_type;
   //! The second template parameter of this class.
   typedef T2& second_type;
 
   //! The first element of the pair.
-  first_type  first;
+  first_type first;
   //! The second element of the pair.
   second_type second;
 
@@ -185,36 +176,29 @@ struct pair<T1&, T2&>
   ///
   /// This calls the copy constructors of T1 and T2.  It won't compile
   /// if those copy constructors are not defined and public.
-  KOKKOS_FORCEINLINE_FUNCTION constexpr
-  pair(first_type f, second_type s)
-    : first(f), second(s)
-  {}
+  KOKKOS_FORCEINLINE_FUNCTION constexpr pair(first_type f, second_type s)
+      : first(f), second(s) {}
 
   /// \brief Copy constructor.
   ///
   /// This calls the copy constructors of T1 and T2.  It won't compile
   /// if those copy constructors are not defined and public.
   template <class U, class V>
-  KOKKOS_FORCEINLINE_FUNCTION constexpr
-  pair( const pair<U,V> &p)
-    : first(p.first), second(p.second)
-  {}
+  KOKKOS_FORCEINLINE_FUNCTION constexpr pair(const pair<U, V>& p)
+      : first(p.first), second(p.second) {}
 
   // from std::pair<U,V>
   template <class U, class V>
-  pair( const std::pair<U,V> &p)
-    : first(p.first), second(p.second)
-  {}
+  pair(const std::pair<U, V>& p) : first(p.first), second(p.second) {}
 
   /// \brief Assignment operator.
   ///
   /// This calls the assignment operators of T1 and T2.  It won't
   /// compile if the assignment operators are not defined and public.
   template <class U, class V>
-  KOKKOS_FORCEINLINE_FUNCTION
-  pair<first_type, second_type> & operator=(const pair<U,V> &p)
-  {
-    first = p.first;
+  KOKKOS_FORCEINLINE_FUNCTION pair<first_type, second_type>& operator=(
+      const pair<U, V>& p) {
+    first  = p.first;
     second = p.second;
     return *this;
   }
@@ -228,20 +212,20 @@ struct pair<T1&, T2&>
   /// \note This is not a conversion operator, since defining a
   ///   conversion operator made the relational operators have
   ///   ambiguous definitions.
-  std::pair<T1,T2> to_std_pair() const
-  { return std::make_pair(first,second); }
+  std::pair<T1, T2> to_std_pair() const {
+    return std::make_pair(first, second);
+  }
 };
 
 template <class T1, class T2>
-struct pair<T1, T2&>
-{
+struct pair<T1, T2&> {
   //! The first template parameter of this class.
-  typedef T1  first_type;
+  typedef T1 first_type;
   //! The second template parameter of this class.
   typedef T2& second_type;
 
   //! The first element of the pair.
-  first_type  first;
+  first_type first;
   //! The second element of the pair.
   second_type second;
 
@@ -249,36 +233,29 @@ struct pair<T1, T2&>
   ///
   /// This calls the copy constructors of T1 and T2.  It won't compile
   /// if those copy constructors are not defined and public.
-  KOKKOS_FORCEINLINE_FUNCTION constexpr
-  pair(first_type const& f, second_type s)
-    : first(f), second(s)
-  {}
+  KOKKOS_FORCEINLINE_FUNCTION constexpr pair(first_type const& f, second_type s)
+      : first(f), second(s) {}
 
   /// \brief Copy constructor.
   ///
   /// This calls the copy constructors of T1 and T2.  It won't compile
   /// if those copy constructors are not defined and public.
   template <class U, class V>
-  KOKKOS_FORCEINLINE_FUNCTION constexpr
-  pair( const pair<U,V> &p)
-    : first(p.first), second(p.second)
-  {}
+  KOKKOS_FORCEINLINE_FUNCTION constexpr pair(const pair<U, V>& p)
+      : first(p.first), second(p.second) {}
 
   // from std::pair<U,V>
   template <class U, class V>
-  pair( const std::pair<U,V> &p)
-    : first(p.first), second(p.second)
-  {}
+  pair(const std::pair<U, V>& p) : first(p.first), second(p.second) {}
 
   /// \brief Assignment operator.
   ///
   /// This calls the assignment operators of T1 and T2.  It won't
   /// compile if the assignment operators are not defined and public.
   template <class U, class V>
-  KOKKOS_FORCEINLINE_FUNCTION
-  pair<first_type, second_type> & operator=(const pair<U,V> &p)
-  {
-    first = p.first;
+  KOKKOS_FORCEINLINE_FUNCTION pair<first_type, second_type>& operator=(
+      const pair<U, V>& p) {
+    first  = p.first;
     second = p.second;
     return *this;
   }
@@ -292,20 +269,20 @@ struct pair<T1, T2&>
   /// \note This is not a conversion operator, since defining a
   ///   conversion operator made the relational operators have
   ///   ambiguous definitions.
-  std::pair<T1,T2> to_std_pair() const
-  { return std::make_pair(first,second); }
+  std::pair<T1, T2> to_std_pair() const {
+    return std::make_pair(first, second);
+  }
 };
 
 template <class T1, class T2>
-struct pair<T1&, T2>
-{
+struct pair<T1&, T2> {
   //! The first template parameter of this class.
-  typedef T1&  first_type;
+  typedef T1& first_type;
   //! The second template parameter of this class.
   typedef T2 second_type;
 
   //! The first element of the pair.
-  first_type  first;
+  first_type first;
   //! The second element of the pair.
   second_type second;
 
@@ -313,36 +290,29 @@ struct pair<T1&, T2>
   ///
   /// This calls the copy constructors of T1 and T2.  It won't compile
   /// if those copy constructors are not defined and public.
-  KOKKOS_FORCEINLINE_FUNCTION constexpr
-  pair(first_type f, second_type const& s)
-    : first(f), second(s)
-  {}
+  KOKKOS_FORCEINLINE_FUNCTION constexpr pair(first_type f, second_type const& s)
+      : first(f), second(s) {}
 
   /// \brief Copy constructor.
   ///
   /// This calls the copy constructors of T1 and T2.  It won't compile
   /// if those copy constructors are not defined and public.
   template <class U, class V>
-  KOKKOS_FORCEINLINE_FUNCTION constexpr
-  pair( const pair<U,V> &p)
-    : first(p.first), second(p.second)
-  {}
+  KOKKOS_FORCEINLINE_FUNCTION constexpr pair(const pair<U, V>& p)
+      : first(p.first), second(p.second) {}
 
   // from std::pair<U,V>
   template <class U, class V>
-  pair( const std::pair<U,V> &p)
-    : first(p.first), second(p.second)
-  {}
+  pair(const std::pair<U, V>& p) : first(p.first), second(p.second) {}
 
   /// \brief Assignment operator.
   ///
   /// This calls the assignment operators of T1 and T2.  It won't
   /// compile if the assignment operators are not defined and public.
   template <class U, class V>
-  KOKKOS_FORCEINLINE_FUNCTION
-  pair<first_type, second_type> & operator=(const pair<U,V> &p)
-  {
-    first = p.first;
+  KOKKOS_FORCEINLINE_FUNCTION pair<first_type, second_type>& operator=(
+      const pair<U, V>& p) {
+    first  = p.first;
     second = p.second;
     return *this;
   }
@@ -356,54 +326,62 @@ struct pair<T1&, T2>
   /// \note This is not a conversion operator, since defining a
   ///   conversion operator made the relational operators have
   ///   ambiguous definitions.
-  std::pair<T1,T2> to_std_pair() const
-  { return std::make_pair(first,second); }
+  std::pair<T1, T2> to_std_pair() const {
+    return std::make_pair(first, second);
+  }
 };
 
 //! Equality operator for Kokkos::pair.
 template <class T1, class T2>
-KOKKOS_FORCEINLINE_FUNCTION
-bool operator== (const pair<T1,T2>& lhs, const pair<T1,T2>& rhs)
-{ return lhs.first==rhs.first && lhs.second==rhs.second; }
+KOKKOS_FORCEINLINE_FUNCTION bool operator==(const pair<T1, T2>& lhs,
+                                            const pair<T1, T2>& rhs) {
+  return lhs.first == rhs.first && lhs.second == rhs.second;
+}
 
 //! Inequality operator for Kokkos::pair.
 template <class T1, class T2>
-KOKKOS_FORCEINLINE_FUNCTION constexpr
-bool operator!= (const pair<T1,T2>& lhs, const pair<T1,T2>& rhs)
-{ return !(lhs==rhs); }
+KOKKOS_FORCEINLINE_FUNCTION constexpr bool operator!=(const pair<T1, T2>& lhs,
+                                                      const pair<T1, T2>& rhs) {
+  return !(lhs == rhs);
+}
 
 //! Less-than operator for Kokkos::pair.
 template <class T1, class T2>
-KOKKOS_FORCEINLINE_FUNCTION constexpr
-bool operator<  (const pair<T1,T2>& lhs, const pair<T1,T2>& rhs)
-{ return lhs.first<rhs.first || (!(rhs.first<lhs.first) && lhs.second<rhs.second); }
+KOKKOS_FORCEINLINE_FUNCTION constexpr bool operator<(const pair<T1, T2>& lhs,
+                                                     const pair<T1, T2>& rhs) {
+  return lhs.first < rhs.first ||
+         (!(rhs.first < lhs.first) && lhs.second < rhs.second);
+}
 
 //! Less-than-or-equal-to operator for Kokkos::pair.
 template <class T1, class T2>
-KOKKOS_FORCEINLINE_FUNCTION constexpr
-bool operator<= (const pair<T1,T2>& lhs, const pair<T1,T2>& rhs)
-{ return !(rhs<lhs); }
+KOKKOS_FORCEINLINE_FUNCTION constexpr bool operator<=(const pair<T1, T2>& lhs,
+                                                      const pair<T1, T2>& rhs) {
+  return !(rhs < lhs);
+}
 
 //! Greater-than operator for Kokkos::pair.
 template <class T1, class T2>
-KOKKOS_FORCEINLINE_FUNCTION constexpr
-bool operator>  (const pair<T1,T2>& lhs, const pair<T1,T2>& rhs)
-{ return rhs<lhs; }
+KOKKOS_FORCEINLINE_FUNCTION constexpr bool operator>(const pair<T1, T2>& lhs,
+                                                     const pair<T1, T2>& rhs) {
+  return rhs < lhs;
+}
 
 //! Greater-than-or-equal-to operator for Kokkos::pair.
 template <class T1, class T2>
-KOKKOS_FORCEINLINE_FUNCTION constexpr
-bool operator>= (const pair<T1,T2>& lhs, const pair<T1,T2>& rhs)
-{ return !(lhs<rhs); }
+KOKKOS_FORCEINLINE_FUNCTION constexpr bool operator>=(const pair<T1, T2>& lhs,
+                                                      const pair<T1, T2>& rhs) {
+  return !(lhs < rhs);
+}
 
 /// \brief Return a new pair.
 ///
 /// This is a "nonmember constructor" for Kokkos::pair.  It works just
 /// like std::make_pair.
-template <class T1,class T2>
-KOKKOS_FORCEINLINE_FUNCTION constexpr
-pair<T1,T2> make_pair (T1 x, T2 y)
-{ return ( pair<T1,T2>(x,y) ); }
+template <class T1, class T2>
+KOKKOS_FORCEINLINE_FUNCTION constexpr pair<T1, T2> make_pair(T1 x, T2 y) {
+  return (pair<T1, T2>(x, y));
+}
 
 /// \brief Return a pair of references to the input arguments.
 ///
@@ -444,51 +422,44 @@ pair<T1,T2> make_pair (T1 x, T2 y)
 /// element of the pair.  The latter could be significant if one or
 /// both elements of the pair are more substantial objects than \c int
 /// or \c bool.
-template <class T1,class T2>
-KOKKOS_FORCEINLINE_FUNCTION
-pair<T1 &,T2 &> tie (T1 & x, T2 & y)
-{ return ( pair<T1 &,T2 &>(x,y) ); }
+template <class T1, class T2>
+KOKKOS_FORCEINLINE_FUNCTION pair<T1&, T2&> tie(T1& x, T2& y) {
+  return (pair<T1&, T2&>(x, y));
+}
 
 //
 // Specialization of Kokkos::pair for a \c void second argument.  This
 // is not actually a "pair"; it only contains one element, the first.
 //
 template <class T1>
-struct pair<T1,void>
-{
+struct pair<T1, void> {
   typedef T1 first_type;
   typedef void second_type;
 
-  first_type  first;
+  first_type first;
   enum { second = 0 };
 
   KOKKOS_FORCEINLINE_FUNCTION constexpr
 #ifdef KOKKOS_CUDA_9_DEFAULTED_BUG_WORKAROUND
-  pair() : first() {}
+      pair()
+      : first() {
+  }
 #else
-  pair() = default;
+      pair() = default;
 #endif
 
-  KOKKOS_FORCEINLINE_FUNCTION constexpr
-  pair(const first_type & f)
-    : first(f)
-  {}
+  KOKKOS_FORCEINLINE_FUNCTION constexpr pair(const first_type& f) : first(f) {}
 
-  KOKKOS_FORCEINLINE_FUNCTION constexpr
-  pair(const first_type & f, int)
-    : first(f)
-  {}
+  KOKKOS_FORCEINLINE_FUNCTION constexpr pair(const first_type& f, int)
+      : first(f) {}
 
   template <class U>
-  KOKKOS_FORCEINLINE_FUNCTION constexpr
-  pair( const pair<U,void> &p)
-    : first(p.first)
-  {}
+  KOKKOS_FORCEINLINE_FUNCTION constexpr pair(const pair<U, void>& p)
+      : first(p.first) {}
 
   template <class U>
-  KOKKOS_FORCEINLINE_FUNCTION
-  pair<T1, void> & operator=(const pair<U,void> &p)
-  {
+  KOKKOS_FORCEINLINE_FUNCTION pair<T1, void>& operator=(
+      const pair<U, void>& p) {
     first = p.first;
     return *this;
   }
@@ -499,46 +470,52 @@ struct pair<T1,void>
 //
 
 template <class T1>
-KOKKOS_FORCEINLINE_FUNCTION constexpr
-bool operator== (const pair<T1,void>& lhs, const pair<T1,void>& rhs)
-{ return lhs.first==rhs.first; }
+KOKKOS_FORCEINLINE_FUNCTION constexpr bool operator==(
+    const pair<T1, void>& lhs, const pair<T1, void>& rhs) {
+  return lhs.first == rhs.first;
+}
 
 template <class T1>
-KOKKOS_FORCEINLINE_FUNCTION constexpr
-bool operator!= (const pair<T1,void>& lhs, const pair<T1,void>& rhs)
-{ return !(lhs==rhs); }
+KOKKOS_FORCEINLINE_FUNCTION constexpr bool operator!=(
+    const pair<T1, void>& lhs, const pair<T1, void>& rhs) {
+  return !(lhs == rhs);
+}
 
 template <class T1>
-KOKKOS_FORCEINLINE_FUNCTION constexpr
-bool operator<  (const pair<T1,void>& lhs, const pair<T1,void>& rhs)
-{ return lhs.first<rhs.first; }
+KOKKOS_FORCEINLINE_FUNCTION constexpr bool operator<(
+    const pair<T1, void>& lhs, const pair<T1, void>& rhs) {
+  return lhs.first < rhs.first;
+}
 
 template <class T1>
-KOKKOS_FORCEINLINE_FUNCTION constexpr
-bool operator<= (const pair<T1,void>& lhs, const pair<T1,void>& rhs)
-{ return !(rhs<lhs); }
+KOKKOS_FORCEINLINE_FUNCTION constexpr bool operator<=(
+    const pair<T1, void>& lhs, const pair<T1, void>& rhs) {
+  return !(rhs < lhs);
+}
 
 template <class T1>
-KOKKOS_FORCEINLINE_FUNCTION constexpr
-bool operator>  (const pair<T1,void>& lhs, const pair<T1,void>& rhs)
-{ return rhs<lhs; }
+KOKKOS_FORCEINLINE_FUNCTION constexpr bool operator>(
+    const pair<T1, void>& lhs, const pair<T1, void>& rhs) {
+  return rhs < lhs;
+}
 
 template <class T1>
-KOKKOS_FORCEINLINE_FUNCTION constexpr
-bool operator>= (const pair<T1,void>& lhs, const pair<T1,void>& rhs)
-{ return !(lhs<rhs); }
-
+KOKKOS_FORCEINLINE_FUNCTION constexpr bool operator>=(
+    const pair<T1, void>& lhs, const pair<T1, void>& rhs) {
+  return !(lhs < rhs);
+}
 
 namespace Impl {
 
-template <class T> struct is_pair_like : std::false_type { };
-template <class T, class U> struct is_pair_like<Kokkos::pair<T, U>> : std::true_type { };
-template <class T, class U> struct is_pair_like<std::pair<T, U>> : std::true_type { };
+template <class T>
+struct is_pair_like : std::false_type {};
+template <class T, class U>
+struct is_pair_like<Kokkos::pair<T, U>> : std::true_type {};
+template <class T, class U>
+struct is_pair_like<std::pair<T, U>> : std::true_type {};
 
-} // end namespace Impl
+}  // end namespace Impl
 
-} // namespace Kokkos
-
-
-#endif //KOKKOS_PAIR_HPP
+}  // namespace Kokkos
 
+#endif  // KOKKOS_PAIR_HPP
diff --git a/lib/kokkos/core/src/Kokkos_Parallel.hpp b/lib/kokkos/core/src/Kokkos_Parallel.hpp
index 09dcf60b11..7277ce287a 100644
--- a/lib/kokkos/core/src/Kokkos_Parallel.hpp
+++ b/lib/kokkos/core/src/Kokkos_Parallel.hpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -63,7 +64,7 @@
 #include <impl/Kokkos_FunctorAdapter.hpp>
 
 #ifdef KOKKOS_DEBUG
-#include<iostream>
+#include <iostream>
 #endif
 
 //----------------------------------------------------------------------------
@@ -80,67 +81,52 @@ namespace Impl {
  *  else if  the Functor has a device_type use that for backward compatibility
  *  else     use the default
  */
-template< class Functor
-        , class Policy
-        , class EnableFunctor
-        , class EnablePolicy
-        >
+template <class Functor, class Policy, class EnableFunctor, class EnablePolicy>
 struct FunctorPolicyExecutionSpace {
-  typedef Kokkos::DefaultExecutionSpace execution_space ;
+  typedef Kokkos::DefaultExecutionSpace execution_space;
 };
 
-template< class Functor , class Policy >
-struct FunctorPolicyExecutionSpace
-  < Functor , Policy
-  , typename enable_if_type< typename Functor::device_type     >::type
-  , typename enable_if_type< typename Policy ::execution_space >::type
-  >
-{
-  typedef typename Policy ::execution_space execution_space ;
+template <class Functor, class Policy>
+struct FunctorPolicyExecutionSpace<
+    Functor, Policy,
+    typename enable_if_type<typename Functor::device_type>::type,
+    typename enable_if_type<typename Policy ::execution_space>::type> {
+  typedef typename Policy ::execution_space execution_space;
 };
 
-template< class Functor , class Policy >
-struct FunctorPolicyExecutionSpace
-  < Functor , Policy
-  , typename enable_if_type< typename Functor::execution_space >::type
-  , typename enable_if_type< typename Policy ::execution_space >::type
-  >
-{
-  typedef typename Policy ::execution_space execution_space ;
+template <class Functor, class Policy>
+struct FunctorPolicyExecutionSpace<
+    Functor, Policy,
+    typename enable_if_type<typename Functor::execution_space>::type,
+    typename enable_if_type<typename Policy ::execution_space>::type> {
+  typedef typename Policy ::execution_space execution_space;
 };
 
-template< class Functor , class Policy , class EnableFunctor >
-struct FunctorPolicyExecutionSpace
-  < Functor , Policy
-  , EnableFunctor
-  , typename enable_if_type< typename Policy::execution_space >::type
-  >
-{
-  typedef typename Policy ::execution_space execution_space ;
+template <class Functor, class Policy, class EnableFunctor>
+struct FunctorPolicyExecutionSpace<
+    Functor, Policy, EnableFunctor,
+    typename enable_if_type<typename Policy::execution_space>::type> {
+  typedef typename Policy ::execution_space execution_space;
 };
 
-template< class Functor , class Policy , class EnablePolicy >
-struct FunctorPolicyExecutionSpace
-  < Functor , Policy
-  , typename enable_if_type< typename Functor::device_type >::type
-  , EnablePolicy
-  >
-{
-  typedef typename Functor::device_type execution_space ;
+template <class Functor, class Policy, class EnablePolicy>
+struct FunctorPolicyExecutionSpace<
+    Functor, Policy,
+    typename enable_if_type<typename Functor::device_type>::type,
+    EnablePolicy> {
+  typedef typename Functor::device_type execution_space;
 };
 
-template< class Functor , class Policy , class EnablePolicy >
-struct FunctorPolicyExecutionSpace
-  < Functor , Policy
-  , typename enable_if_type< typename Functor::execution_space >::type
-  , EnablePolicy
-  >
-{
-  typedef typename Functor::execution_space execution_space ;
+template <class Functor, class Policy, class EnablePolicy>
+struct FunctorPolicyExecutionSpace<
+    Functor, Policy,
+    typename enable_if_type<typename Functor::execution_space>::type,
+    EnablePolicy> {
+  typedef typename Functor::execution_space execution_space;
 };
 
-} // namespace Impl
-} // namespace Kokkos
+}  // namespace Impl
+}  // namespace Kokkos
 
 //----------------------------------------------------------------------------
 //----------------------------------------------------------------------------
@@ -168,89 +154,82 @@ namespace Kokkos {
  * This compares to a single iteration \c iwork of a \c for loop.
  * If \c execution_space is not defined DefaultExecutionSpace will be used.
  */
-template< class ExecPolicy , class FunctorType >
-inline
-void parallel_for( const ExecPolicy  & policy
-                 , const FunctorType & functor
-                 , const std::string& str = ""
-                 , typename Impl::enable_if< Kokkos::Impl::is_execution_policy< ExecPolicy >::value >::type * = 0
-                 )
-{
+template <class ExecPolicy, class FunctorType>
+inline void parallel_for(
+    const ExecPolicy& policy, const FunctorType& functor,
+    const std::string& str = "",
+    typename Impl::enable_if<
+        Kokkos::Impl::is_execution_policy<ExecPolicy>::value>::type* = 0) {
 #if defined(KOKKOS_ENABLE_PROFILING)
   uint64_t kpID = 0;
-  if(Kokkos::Profiling::profileLibraryLoaded()) {
-    Kokkos::Impl::ParallelConstructName<FunctorType, typename ExecPolicy::work_tag> name(str);
+  if (Kokkos::Profiling::profileLibraryLoaded()) {
+    Kokkos::Impl::ParallelConstructName<FunctorType,
+                                        typename ExecPolicy::work_tag>
+        name(str);
     Kokkos::Profiling::beginParallelFor(name.get(), 0, &kpID);
   }
 #endif
 
-    Kokkos::Impl::shared_allocation_tracking_disable();
-    Impl::ParallelFor< FunctorType , ExecPolicy > closure( functor , policy );
-    Kokkos::Impl::shared_allocation_tracking_enable();
+  Kokkos::Impl::shared_allocation_tracking_disable();
+  Impl::ParallelFor<FunctorType, ExecPolicy> closure(functor, policy);
+  Kokkos::Impl::shared_allocation_tracking_enable();
 
-   closure.execute();
+  closure.execute();
 
 #if defined(KOKKOS_ENABLE_PROFILING)
-  if(Kokkos::Profiling::profileLibraryLoaded()) {
+  if (Kokkos::Profiling::profileLibraryLoaded()) {
     Kokkos::Profiling::endParallelFor(kpID);
   }
 #endif
 }
 
-template< class FunctorType >
-inline
-void parallel_for( const size_t        work_count
-                 , const FunctorType & functor
-                 , const std::string& str = ""
-                 )
-{
-  typedef typename
-    Impl::FunctorPolicyExecutionSpace< FunctorType , void >::execution_space
-      execution_space ;
-  typedef RangePolicy< execution_space > policy ;
+template <class FunctorType>
+inline void parallel_for(const size_t work_count, const FunctorType& functor,
+                         const std::string& str = "") {
+  typedef typename Impl::FunctorPolicyExecutionSpace<
+      FunctorType, void>::execution_space execution_space;
+  typedef RangePolicy<execution_space> policy;
 
 #if defined(KOKKOS_ENABLE_PROFILING)
   uint64_t kpID = 0;
-  if(Kokkos::Profiling::profileLibraryLoaded()) {
+  if (Kokkos::Profiling::profileLibraryLoaded()) {
     Kokkos::Impl::ParallelConstructName<FunctorType, void> name(str);
     Kokkos::Profiling::beginParallelFor(name.get(), 0, &kpID);
   }
 #endif
 
   Kokkos::Impl::shared_allocation_tracking_disable();
-  Impl::ParallelFor< FunctorType , policy > closure( functor , policy(0,work_count) );
+  Impl::ParallelFor<FunctorType, policy> closure(functor,
+                                                 policy(0, work_count));
   Kokkos::Impl::shared_allocation_tracking_enable();
 
   closure.execute();
 
 #if defined(KOKKOS_ENABLE_PROFILING)
-     if(Kokkos::Profiling::profileLibraryLoaded()) {
-	Kokkos::Profiling::endParallelFor(kpID);
-     }
+  if (Kokkos::Profiling::profileLibraryLoaded()) {
+    Kokkos::Profiling::endParallelFor(kpID);
+  }
 #endif
 }
 
-template< class ExecPolicy , class FunctorType >
-inline
-void parallel_for( const std::string & str
-                 , const ExecPolicy  & policy
-                 , const FunctorType & functor )
-{
-  #if KOKKOS_ENABLE_DEBUG_PRINT_KERNEL_NAMES
+template <class ExecPolicy, class FunctorType>
+inline void parallel_for(const std::string& str, const ExecPolicy& policy,
+                         const FunctorType& functor) {
+#if KOKKOS_ENABLE_DEBUG_PRINT_KERNEL_NAMES
   Kokkos::fence();
   std::cout << "KOKKOS_DEBUG Start parallel_for kernel: " << str << std::endl;
-  #endif
+#endif
 
-  ::Kokkos::parallel_for(policy,functor,str);
+  ::Kokkos::parallel_for(policy, functor, str);
 
-  #if KOKKOS_ENABLE_DEBUG_PRINT_KERNEL_NAMES
+#if KOKKOS_ENABLE_DEBUG_PRINT_KERNEL_NAMES
   Kokkos::fence();
   std::cout << "KOKKOS_DEBUG End   parallel_for kernel: " << str << std::endl;
-  #endif
-  (void) str;
+#endif
+  (void)str;
 }
 
-}
+}  // namespace Kokkos
 
 #include <Kokkos_Parallel_Reduce.hpp>
 //----------------------------------------------------------------------------
@@ -291,9 +270,9 @@ namespace Kokkos {
 ///   // operator() or join().
 ///   typedef PodType value_type;
 ///
-///   void operator () (const ExecPolicy::member_type & i, value_type& update, const bool final_pass) const;
-///   void init (value_type& update) const;
-///   void join (volatile value_type& update, volatile const value_type& input) const
+///   void operator () (const ExecPolicy::member_type & i, value_type& update,
+///   const bool final_pass) const; void init (value_type& update) const; void
+///   join (volatile value_type& update, volatile const value_type& input) const
 /// };
 /// \endcode
 ///
@@ -310,9 +289,11 @@ namespace Kokkos {
 ///   typedef typename SpaceType::size_type size_type;
 ///
 ///   InclScanFunctor( Kokkos::View<value_type*, execution_space> x
-///                  , Kokkos::View<value_type*, execution_space> y ) : m_x(x), m_y(y) {}
+///                  , Kokkos::View<value_type*, execution_space> y ) : m_x(x),
+///                  m_y(y) {}
 ///
-///   void operator () (const size_type i, value_type& update, const bool final_pass) const {
+///   void operator () (const size_type i, value_type& update, const bool
+///   final_pass) const {
 ///     update += m_x(i);
 ///     if (final_pass) {
 ///       m_y(i) = update;
@@ -321,7 +302,8 @@ namespace Kokkos {
 ///   void init (value_type& update) const {
 ///     update = 0;
 ///   }
-///   void join (volatile value_type& update, volatile const value_type& input) const {
+///   void join (volatile value_type& update, volatile const value_type& input)
+///   const {
 ///     update += input;
 ///   }
 ///
@@ -347,7 +329,8 @@ namespace Kokkos {
 ///
 ///   ExclScanFunctor (Kokkos::View<value_type*, execution_space> x) : x_ (x) {}
 ///
-///   void operator () (const size_type i, value_type& update, const bool final_pass) const {
+///   void operator () (const size_type i, value_type& update, const bool
+///   final_pass) const {
 ///     const value_type x_i = x_(i);
 ///     if (final_pass) {
 ///       x_(i) = update;
@@ -357,7 +340,8 @@ namespace Kokkos {
 ///   void init (value_type& update) const {
 ///     update = 0;
 ///   }
-///   void join (volatile value_type& update, volatile const value_type& input) const {
+///   void join (volatile value_type& update, volatile const value_type& input)
+///   const {
 ///     update += input;
 ///   }
 ///
@@ -385,10 +369,12 @@ namespace Kokkos {
 ///   // If x has length zero, then lastIndex_ won't be used anyway.
 ///   OffsetScanFunctor( Kokkos::View<value_type*, execution_space> x
 ///                    , Kokkos::View<value_type*, execution_space> y )
-///      : m_x(x), m_y(y), last_index_ (x.dimension_0 () == 0 ? 0 : x.dimension_0 () - 1)
+///      : m_x(x), m_y(y), last_index_ (x.dimension_0 () == 0 ? 0 :
+///      x.dimension_0 () - 1)
 ///   {}
 ///
-///   void operator () (const size_type i, int& update, const bool final_pass) const {
+///   void operator () (const size_type i, int& update, const bool final_pass)
+///   const {
 ///     if (final_pass) {
 ///       m_y(i) = update;
 ///     }
@@ -396,12 +382,13 @@ namespace Kokkos {
 ///     // The last entry of m_y gets the final sum.
 ///     if (final_pass && i == last_index_) {
 ///       m_y(i+1) = update;
-//i/     }
+// i/     }
 ///   }
 ///   void init (value_type& update) const {
 ///     update = 0;
 ///   }
-///   void join (volatile value_type& update, volatile const value_type& input) const {
+///   void join (volatile value_type& update, volatile const value_type& input)
+///   const {
 ///     update += input;
 ///   }
 ///
@@ -412,181 +399,164 @@ namespace Kokkos {
 /// };
 /// \endcode
 ///
-template< class ExecutionPolicy , class FunctorType >
-inline
-void parallel_scan( const ExecutionPolicy & policy
-                  , const FunctorType     & functor
-                  , const std::string& str = ""
-                  , typename Impl::enable_if< Kokkos::Impl::is_execution_policy< ExecutionPolicy >::value >::type * = 0
-                  )
-{
+template <class ExecutionPolicy, class FunctorType>
+inline void parallel_scan(
+    const ExecutionPolicy& policy, const FunctorType& functor,
+    const std::string& str = "",
+    typename Impl::enable_if<
+        Kokkos::Impl::is_execution_policy<ExecutionPolicy>::value>::type* = 0) {
 #if defined(KOKKOS_ENABLE_PROFILING)
   uint64_t kpID = 0;
-  if(Kokkos::Profiling::profileLibraryLoaded()) {
-    Kokkos::Impl::ParallelConstructName<FunctorType, typename ExecutionPolicy::work_tag> name(str);
+  if (Kokkos::Profiling::profileLibraryLoaded()) {
+    Kokkos::Impl::ParallelConstructName<FunctorType,
+                                        typename ExecutionPolicy::work_tag>
+        name(str);
     Kokkos::Profiling::beginParallelScan(name.get(), 0, &kpID);
   }
 #endif
 
   Kokkos::Impl::shared_allocation_tracking_disable();
-  Impl::ParallelScan< FunctorType , ExecutionPolicy > closure( functor , policy );
+  Impl::ParallelScan<FunctorType, ExecutionPolicy> closure(functor, policy);
   Kokkos::Impl::shared_allocation_tracking_enable();
-  
+
   closure.execute();
 
 #if defined(KOKKOS_ENABLE_PROFILING)
-  if(Kokkos::Profiling::profileLibraryLoaded()) {
+  if (Kokkos::Profiling::profileLibraryLoaded()) {
     Kokkos::Profiling::endParallelScan(kpID);
   }
 #endif
-
 }
 
-template< class FunctorType >
-inline
-void parallel_scan( const size_t        work_count
-                  , const FunctorType & functor
-                  , const std::string& str = "" )
-{
-  typedef typename
-    Kokkos::Impl::FunctorPolicyExecutionSpace< FunctorType , void >::execution_space
-      execution_space ;
+template <class FunctorType>
+inline void parallel_scan(const size_t work_count, const FunctorType& functor,
+                          const std::string& str = "") {
+  typedef typename Kokkos::Impl::FunctorPolicyExecutionSpace<
+      FunctorType, void>::execution_space execution_space;
 
-  typedef Kokkos::RangePolicy< execution_space > policy ;
+  typedef Kokkos::RangePolicy<execution_space> policy;
 
 #if defined(KOKKOS_ENABLE_PROFILING)
   uint64_t kpID = 0;
-  if(Kokkos::Profiling::profileLibraryLoaded()) {
+  if (Kokkos::Profiling::profileLibraryLoaded()) {
     Kokkos::Impl::ParallelConstructName<FunctorType, void> name(str);
     Kokkos::Profiling::beginParallelScan(name.get(), 0, &kpID);
   }
 #endif
 
   Kokkos::Impl::shared_allocation_tracking_disable();
-  Impl::ParallelScan< FunctorType , policy > closure( functor , policy(0,work_count) );
+  Impl::ParallelScan<FunctorType, policy> closure(functor,
+                                                  policy(0, work_count));
   Kokkos::Impl::shared_allocation_tracking_enable();
-  
+
   closure.execute();
 
 #if defined(KOKKOS_ENABLE_PROFILING)
-  if(Kokkos::Profiling::profileLibraryLoaded()) {
+  if (Kokkos::Profiling::profileLibraryLoaded()) {
     Kokkos::Profiling::endParallelScan(kpID);
   }
 #endif
-
 }
 
-template< class ExecutionPolicy , class FunctorType >
-inline
-void parallel_scan( const std::string& str
-                  , const ExecutionPolicy & policy
-                  , const FunctorType     & functor)
-{
-  #if KOKKOS_ENABLE_DEBUG_PRINT_KERNEL_NAMES
+template <class ExecutionPolicy, class FunctorType>
+inline void parallel_scan(const std::string& str, const ExecutionPolicy& policy,
+                          const FunctorType& functor) {
+#if KOKKOS_ENABLE_DEBUG_PRINT_KERNEL_NAMES
   Kokkos::fence();
   std::cout << "KOKKOS_DEBUG Start parallel_scan kernel: " << str << std::endl;
-  #endif
-  
-  ::Kokkos::parallel_scan(policy,functor,str);
+#endif
 
-  #if KOKKOS_ENABLE_DEBUG_PRINT_KERNEL_NAMES
+  ::Kokkos::parallel_scan(policy, functor, str);
+
+#if KOKKOS_ENABLE_DEBUG_PRINT_KERNEL_NAMES
   Kokkos::fence();
   std::cout << "KOKKOS_DEBUG End parallel_scan kernel: " << str << std::endl;
-  #endif
-  (void) str;
+#endif
+  (void)str;
 }
 
-
-template< class ExecutionPolicy , class FunctorType, class ReturnType >
-inline
-void parallel_scan( const ExecutionPolicy & policy
-                  , const FunctorType     & functor
-                  , ReturnType            & return_value
-                  , const std::string& str = ""
-                  , typename Impl::enable_if< Kokkos::Impl::is_execution_policy< ExecutionPolicy >::value >::type * = 0
-                  )
-{
+template <class ExecutionPolicy, class FunctorType, class ReturnType>
+inline void parallel_scan(
+    const ExecutionPolicy& policy, const FunctorType& functor,
+    ReturnType& return_value, const std::string& str = "",
+    typename Impl::enable_if<
+        Kokkos::Impl::is_execution_policy<ExecutionPolicy>::value>::type* = 0) {
 #if defined(KOKKOS_ENABLE_PROFILING)
   uint64_t kpID = 0;
-  if(Kokkos::Profiling::profileLibraryLoaded()) {
-    Kokkos::Impl::ParallelConstructName<FunctorType, typename ExecutionPolicy::work_tag> name(str);
+  if (Kokkos::Profiling::profileLibraryLoaded()) {
+    Kokkos::Impl::ParallelConstructName<FunctorType,
+                                        typename ExecutionPolicy::work_tag>
+        name(str);
     Kokkos::Profiling::beginParallelScan(name.get(), 0, &kpID);
   }
 #endif
 
   Kokkos::Impl::shared_allocation_tracking_disable();
-  Impl::ParallelScanWithTotal< FunctorType , ExecutionPolicy, ReturnType > closure( functor, policy, return_value );
+  Impl::ParallelScanWithTotal<FunctorType, ExecutionPolicy, ReturnType> closure(
+      functor, policy, return_value);
   Kokkos::Impl::shared_allocation_tracking_enable();
-  
+
   closure.execute();
 
 #if defined(KOKKOS_ENABLE_PROFILING)
-  if(Kokkos::Profiling::profileLibraryLoaded()) {
+  if (Kokkos::Profiling::profileLibraryLoaded()) {
     Kokkos::Profiling::endParallelScan(kpID);
   }
 #endif
   Kokkos::fence();
 }
 
-template< class FunctorType, class ReturnType >
-inline
-void parallel_scan( const size_t        work_count
-                  , const FunctorType & functor
-                  , ReturnType        & return_value
-                  , const std::string & str = "" )
-{
-  typedef typename
-    Kokkos::Impl::FunctorPolicyExecutionSpace< FunctorType , void >::execution_space
-      execution_space ;
+template <class FunctorType, class ReturnType>
+inline void parallel_scan(const size_t work_count, const FunctorType& functor,
+                          ReturnType& return_value,
+                          const std::string& str = "") {
+  typedef typename Kokkos::Impl::FunctorPolicyExecutionSpace<
+      FunctorType, void>::execution_space execution_space;
 
-  typedef Kokkos::RangePolicy< execution_space > policy ;
+  typedef Kokkos::RangePolicy<execution_space> policy;
 
 #if defined(KOKKOS_ENABLE_PROFILING)
   uint64_t kpID = 0;
-  if(Kokkos::Profiling::profileLibraryLoaded()) {
+  if (Kokkos::Profiling::profileLibraryLoaded()) {
     Kokkos::Impl::ParallelConstructName<FunctorType, void> name(str);
     Kokkos::Profiling::beginParallelScan(name.get(), 0, &kpID);
   }
 #endif
 
   Kokkos::Impl::shared_allocation_tracking_disable();
-  Impl::ParallelScanWithTotal< FunctorType, policy, ReturnType > closure( functor, policy(0,work_count), return_value );
+  Impl::ParallelScanWithTotal<FunctorType, policy, ReturnType> closure(
+      functor, policy(0, work_count), return_value);
   Kokkos::Impl::shared_allocation_tracking_enable();
- 
+
   closure.execute();
 
 #if defined(KOKKOS_ENABLE_PROFILING)
-  if(Kokkos::Profiling::profileLibraryLoaded()) {
+  if (Kokkos::Profiling::profileLibraryLoaded()) {
     Kokkos::Profiling::endParallelScan(kpID);
   }
 #endif
   Kokkos::fence();
 }
 
-template< class ExecutionPolicy, class FunctorType, class ReturnType >
-inline
-void parallel_scan( const std::string& str
-                  , const ExecutionPolicy & policy
-                  , const FunctorType     & functor
-                  , ReturnType            & return_value)
-{
-  #if KOKKOS_ENABLE_DEBUG_PRINT_KERNEL_NAMES
+template <class ExecutionPolicy, class FunctorType, class ReturnType>
+inline void parallel_scan(const std::string& str, const ExecutionPolicy& policy,
+                          const FunctorType& functor,
+                          ReturnType& return_value) {
+#if KOKKOS_ENABLE_DEBUG_PRINT_KERNEL_NAMES
   Kokkos::fence();
   std::cout << "KOKKOS_DEBUG Start parallel_scan kernel: " << str << std::endl;
-  #endif
-  
-  ::Kokkos::parallel_scan(policy,functor,return_value,str);
+#endif
 
-  #if KOKKOS_ENABLE_DEBUG_PRINT_KERNEL_NAMES
+  ::Kokkos::parallel_scan(policy, functor, return_value, str);
+
+#if KOKKOS_ENABLE_DEBUG_PRINT_KERNEL_NAMES
   Kokkos::fence();
   std::cout << "KOKKOS_DEBUG End parallel_scan kernel: " << str << std::endl;
-  #endif
-  (void) str;
+#endif
+  (void)str;
 }
 
-
-
-} // namespace Kokkos
+}  // namespace Kokkos
 
 //----------------------------------------------------------------------------
 //----------------------------------------------------------------------------
@@ -594,29 +564,35 @@ void parallel_scan( const std::string& str
 namespace Kokkos {
 namespace Impl {
 
-template< class FunctorType , class Enable = void >
-struct FunctorTeamShmemSize
-{
-  KOKKOS_INLINE_FUNCTION static size_t value( const FunctorType & , int ) { return 0 ; }
+template <class FunctorType, class Enable = void>
+struct FunctorTeamShmemSize {
+  KOKKOS_INLINE_FUNCTION static size_t value(const FunctorType&, int) {
+    return 0;
+  }
 };
 
-template< class FunctorType >
-struct FunctorTeamShmemSize< FunctorType , typename Impl::enable_if< 0 < sizeof( & FunctorType::team_shmem_size ) >::type >
-{
-  static inline size_t value( const FunctorType & f , int team_size ) { return f.team_shmem_size( team_size ) ; }
+template <class FunctorType>
+struct FunctorTeamShmemSize<
+    FunctorType,
+    typename Impl::enable_if<0 < sizeof(&FunctorType::team_shmem_size)>::type> {
+  static inline size_t value(const FunctorType& f, int team_size) {
+    return f.team_shmem_size(team_size);
+  }
 };
 
-template< class FunctorType >
-struct FunctorTeamShmemSize< FunctorType , typename Impl::enable_if< 0 < sizeof( & FunctorType::shmem_size ) >::type >
-{
-  static inline size_t value( const FunctorType & f , int team_size ) { return f.shmem_size( team_size ) ; }
+template <class FunctorType>
+struct FunctorTeamShmemSize<
+    FunctorType,
+    typename Impl::enable_if<0 < sizeof(&FunctorType::shmem_size)>::type> {
+  static inline size_t value(const FunctorType& f, int team_size) {
+    return f.shmem_size(team_size);
+  }
 };
 
-} // namespace Impl
-} // namespace Kokkos
+}  // namespace Impl
+}  // namespace Kokkos
 
 //----------------------------------------------------------------------------
 //----------------------------------------------------------------------------
 
 #endif /* KOKKOS_PARALLEL_HPP */
-
diff --git a/lib/kokkos/core/src/Kokkos_Parallel_Reduce.hpp b/lib/kokkos/core/src/Kokkos_Parallel_Reduce.hpp
index 36bc6e4153..dbd33860fb 100644
--- a/lib/kokkos/core/src/Kokkos_Parallel_Reduce.hpp
+++ b/lib/kokkos/core/src/Kokkos_Parallel_Reduce.hpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -48,46 +49,43 @@
 
 namespace Kokkos {
 
-template<class T, class Enable = void>
+template <class T, class Enable = void>
 struct is_reducer_type {
   enum { value = 0 };
 };
 
-
-template<class T>
-struct is_reducer_type<T,typename std::enable_if<
-                       std::is_same<typename std::remove_cv<T>::type,
-                                    typename std::remove_cv<typename T::reducer>::type>::value
-                      >::type> {
+template <class T>
+struct is_reducer_type<
+    T, typename std::enable_if<std::is_same<
+           typename std::remove_cv<T>::type,
+           typename std::remove_cv<typename T::reducer>::type>::value>::type> {
   enum { value = 1 };
 };
 
-template<class Scalar, class Space>
+template <class Scalar, class Space>
 struct Sum {
-public:
-  //Required
+ public:
+  // Required
   typedef Sum reducer;
   typedef typename std::remove_cv<Scalar>::type value_type;
 
   typedef Kokkos::View<value_type, Space> result_view_type;
 
-private:
+ private:
   result_view_type value;
   bool references_scalar_v;
 
-public:
+ public:
+  KOKKOS_INLINE_FUNCTION
+  Sum(value_type& value_) : value(&value_), references_scalar_v(true) {}
 
   KOKKOS_INLINE_FUNCTION
-  Sum(value_type& value_): value(&value_),references_scalar_v(true) {}
+  Sum(const result_view_type& value_)
+      : value(value_), references_scalar_v(false) {}
 
+  // Required
   KOKKOS_INLINE_FUNCTION
-  Sum(const result_view_type& value_): value(value_),references_scalar_v(false) {}
-
-  //Required
-  KOKKOS_INLINE_FUNCTION
-  void join(value_type& dest, const value_type& src)  const {
-    dest += src;
-  }
+  void join(value_type& dest, const value_type& src) const { dest += src; }
 
   KOKKOS_INLINE_FUNCTION
   void join(volatile value_type& dest, const volatile value_type& src) const {
@@ -95,52 +93,44 @@ public:
   }
 
   KOKKOS_INLINE_FUNCTION
-  void init( value_type& val)  const {
+  void init(value_type& val) const {
     val = reduction_identity<value_type>::sum();
   }
 
   KOKKOS_INLINE_FUNCTION
-  value_type& reference() const {
-    return *value.data();
-  }
+  value_type& reference() const { return *value.data(); }
 
   KOKKOS_INLINE_FUNCTION
-  result_view_type view() const {
-    return value;
-  }
+  result_view_type view() const { return value; }
 
   KOKKOS_INLINE_FUNCTION
-  bool references_scalar() const {
-    return references_scalar_v;
-  }
+  bool references_scalar() const { return references_scalar_v; }
 };
 
-template<class Scalar, class Space>
+template <class Scalar, class Space>
 struct Prod {
-public:
-  //Required
+ public:
+  // Required
   typedef Prod reducer;
   typedef typename std::remove_cv<Scalar>::type value_type;
 
   typedef Kokkos::View<value_type, Space> result_view_type;
 
-private:
+ private:
   result_view_type value;
   bool references_scalar_v;
 
-public:
+ public:
+  KOKKOS_INLINE_FUNCTION
+  Prod(value_type& value_) : value(&value_), references_scalar_v(true) {}
 
   KOKKOS_INLINE_FUNCTION
-  Prod(value_type& value_): value(&value_),references_scalar_v(true) {}
+  Prod(const result_view_type& value_)
+      : value(value_), references_scalar_v(false) {}
 
+  // Required
   KOKKOS_INLINE_FUNCTION
-  Prod(const result_view_type& value_): value(value_),references_scalar_v(false) {}
-
-  //Required
-  KOKKOS_INLINE_FUNCTION
-  void join(value_type& dest, const value_type& src)  const {
-    dest *= src;
-  }
+  void join(value_type& dest, const value_type& src) const { dest *= src; }
 
   KOKKOS_INLINE_FUNCTION
   void join(volatile value_type& dest, const volatile value_type& src) const {
@@ -148,160 +138,138 @@ public:
   }
 
   KOKKOS_INLINE_FUNCTION
-  void init( value_type& val)  const {
+  void init(value_type& val) const {
     val = reduction_identity<value_type>::prod();
   }
 
   KOKKOS_INLINE_FUNCTION
-  value_type& reference() const {
-    return *value.data();
-  }
+  value_type& reference() const { return *value.data(); }
 
   KOKKOS_INLINE_FUNCTION
-  result_view_type view() const {
-    return value;
-  }
+  result_view_type view() const { return value; }
 
   KOKKOS_INLINE_FUNCTION
-  bool references_scalar() const {
-    return references_scalar_v;
-  }
+  bool references_scalar() const { return references_scalar_v; }
 };
 
-template<class Scalar, class Space>
+template <class Scalar, class Space>
 struct Min {
-public:
-  //Required
+ public:
+  // Required
   typedef Min reducer;
   typedef typename std::remove_cv<Scalar>::type value_type;
 
   typedef Kokkos::View<value_type, Space> result_view_type;
 
-private:
+ private:
   result_view_type value;
   bool references_scalar_v;
 
-public:
+ public:
+  KOKKOS_INLINE_FUNCTION
+  Min(value_type& value_) : value(&value_), references_scalar_v(true) {}
 
   KOKKOS_INLINE_FUNCTION
-  Min(value_type& value_): value(&value_),references_scalar_v(true) {}
+  Min(const result_view_type& value_)
+      : value(value_), references_scalar_v(false) {}
 
+  // Required
   KOKKOS_INLINE_FUNCTION
-  Min(const result_view_type& value_): value(value_),references_scalar_v(false) {}
-
-  //Required
-  KOKKOS_INLINE_FUNCTION
-  void join(value_type& dest, const value_type& src)  const {
-    if ( src < dest )
-      dest = src;
+  void join(value_type& dest, const value_type& src) const {
+    if (src < dest) dest = src;
   }
 
   KOKKOS_INLINE_FUNCTION
   void join(volatile value_type& dest, const volatile value_type& src) const {
-    if ( src < dest )
-      dest = src;
+    if (src < dest) dest = src;
   }
 
   KOKKOS_INLINE_FUNCTION
-  void init( value_type& val)  const {
+  void init(value_type& val) const {
     val = reduction_identity<value_type>::min();
   }
 
   KOKKOS_INLINE_FUNCTION
-  value_type& reference() const {
-    return *value.data();
-  }
+  value_type& reference() const { return *value.data(); }
 
   KOKKOS_INLINE_FUNCTION
-  result_view_type view() const {
-    return value;
-  }
+  result_view_type view() const { return value; }
 
   KOKKOS_INLINE_FUNCTION
-  bool references_scalar() const {
-    return references_scalar_v;
-  }
+  bool references_scalar() const { return references_scalar_v; }
 };
 
-template<class Scalar, class Space>
+template <class Scalar, class Space>
 struct Max {
-public:
-  //Required
+ public:
+  // Required
   typedef Max reducer;
   typedef typename std::remove_cv<Scalar>::type value_type;
 
   typedef Kokkos::View<value_type, Space> result_view_type;
 
-private:
+ private:
   result_view_type value;
   bool references_scalar_v;
 
-public:
+ public:
+  KOKKOS_INLINE_FUNCTION
+  Max(value_type& value_) : value(&value_), references_scalar_v(true) {}
 
   KOKKOS_INLINE_FUNCTION
-  Max(value_type& value_): value(&value_),references_scalar_v(true) {}
+  Max(const result_view_type& value_)
+      : value(value_), references_scalar_v(false) {}
 
+  // Required
   KOKKOS_INLINE_FUNCTION
-  Max(const result_view_type& value_): value(value_),references_scalar_v(false) {}
-
-  //Required
-  KOKKOS_INLINE_FUNCTION
-  void join(value_type& dest, const value_type& src)  const {
-    if ( src > dest )
-      dest = src;
+  void join(value_type& dest, const value_type& src) const {
+    if (src > dest) dest = src;
   }
 
   KOKKOS_INLINE_FUNCTION
   void join(volatile value_type& dest, const volatile value_type& src) const {
-    if ( src > dest )
-      dest = src;
+    if (src > dest) dest = src;
   }
 
-  //Required
+  // Required
   KOKKOS_INLINE_FUNCTION
-  void init( value_type& val)  const {
+  void init(value_type& val) const {
     val = reduction_identity<value_type>::max();
   }
 
   KOKKOS_INLINE_FUNCTION
-  value_type& reference() const {
-    return *value.data();
-  }
+  value_type& reference() const { return *value.data(); }
 
   KOKKOS_INLINE_FUNCTION
-  result_view_type view() const {
-    return value;
-  }
+  result_view_type view() const { return value; }
 
   KOKKOS_INLINE_FUNCTION
-  bool references_scalar() const {
-    return references_scalar_v;
-  }
+  bool references_scalar() const { return references_scalar_v; }
 };
 
-template<class Scalar, class Space>
+template <class Scalar, class Space>
 struct LAnd {
-public:
-  //Required
+ public:
+  // Required
   typedef LAnd reducer;
   typedef typename std::remove_cv<Scalar>::type value_type;
 
   typedef Kokkos::View<value_type, Space> result_view_type;
 
-private:
+ private:
   result_view_type value;
   bool references_scalar_v;
 
-public:
+ public:
+  KOKKOS_INLINE_FUNCTION
+  LAnd(value_type& value_) : value(&value_), references_scalar_v(true) {}
 
   KOKKOS_INLINE_FUNCTION
-  LAnd(value_type& value_): value(&value_),references_scalar_v(true) {}
+  LAnd(const result_view_type& value_)
+      : value(value_), references_scalar_v(false) {}
 
   KOKKOS_INLINE_FUNCTION
-  LAnd(const result_view_type& value_): value(value_),references_scalar_v(false) {}
-
-  KOKKOS_INLINE_FUNCTION
-  void join(value_type& dest, const value_type& src)  const {
+  void join(value_type& dest, const value_type& src) const {
     dest = dest && src;
   }
 
@@ -311,50 +279,44 @@ public:
   }
 
   KOKKOS_INLINE_FUNCTION
-  void init( value_type& val)  const {
+  void init(value_type& val) const {
     val = reduction_identity<value_type>::land();
   }
 
   KOKKOS_INLINE_FUNCTION
-  value_type& reference() const {
-    return *value.data();
-  }
+  value_type& reference() const { return *value.data(); }
 
   KOKKOS_INLINE_FUNCTION
-  result_view_type view() const {
-    return value;
-  }
+  result_view_type view() const { return value; }
 
   KOKKOS_INLINE_FUNCTION
-  bool references_scalar() const {
-    return references_scalar_v;
-  }
+  bool references_scalar() const { return references_scalar_v; }
 };
 
-template<class Scalar, class Space>
+template <class Scalar, class Space>
 struct LOr {
-public:
-  //Required
+ public:
+  // Required
   typedef LOr reducer;
   typedef typename std::remove_cv<Scalar>::type value_type;
 
   typedef Kokkos::View<value_type, Space> result_view_type;
 
-private:
+ private:
   result_view_type value;
   bool references_scalar_v;
 
-public:
+ public:
+  KOKKOS_INLINE_FUNCTION
+  LOr(value_type& value_) : value(&value_), references_scalar_v(true) {}
 
   KOKKOS_INLINE_FUNCTION
-  LOr(value_type& value_): value(&value_),references_scalar_v(true) {}
+  LOr(const result_view_type& value_)
+      : value(value_), references_scalar_v(false) {}
 
+  // Required
   KOKKOS_INLINE_FUNCTION
-  LOr(const result_view_type& value_): value(value_),references_scalar_v(false) {}
-
-  //Required
-  KOKKOS_INLINE_FUNCTION
-  void join(value_type& dest, const value_type& src)  const {
+  void join(value_type& dest, const value_type& src) const {
     dest = dest || src;
   }
 
@@ -364,51 +326,45 @@ public:
   }
 
   KOKKOS_INLINE_FUNCTION
-  void init( value_type& val)  const {
+  void init(value_type& val) const {
     val = reduction_identity<value_type>::lor();
   }
 
   KOKKOS_INLINE_FUNCTION
-  value_type& reference() const {
-    return *value.data();
-  }
+  value_type& reference() const { return *value.data(); }
 
   KOKKOS_INLINE_FUNCTION
-  result_view_type view() const {
-    return value;
-  }
+  result_view_type view() const { return value; }
 
   KOKKOS_INLINE_FUNCTION
-  bool references_scalar() const {
-    return references_scalar_v;
-  }
+  bool references_scalar() const { return references_scalar_v; }
 };
 
-template<class Scalar, class Space>
+template <class Scalar, class Space>
 struct BAnd {
-public:
-  //Required
+ public:
+  // Required
   typedef BAnd reducer;
   typedef typename std::remove_cv<Scalar>::type value_type;
 
   typedef Kokkos::View<value_type, Space> result_view_type;
 
-private:
+ private:
   result_view_type value;
   bool references_scalar_v;
 
-public:
+ public:
+  KOKKOS_INLINE_FUNCTION
+  BAnd(value_type& value_) : value(&value_), references_scalar_v(true) {}
 
   KOKKOS_INLINE_FUNCTION
-  BAnd(value_type& value_): value(&value_),references_scalar_v(true) {}
+  BAnd(const result_view_type& value_)
+      : value(value_), references_scalar_v(false) {}
 
+  // Required
   KOKKOS_INLINE_FUNCTION
-  BAnd(const result_view_type& value_): value(value_),references_scalar_v(false) {}
-
-  //Required
-  KOKKOS_INLINE_FUNCTION
-  void join(value_type& dest, const value_type& src)  const {
-      dest = dest & src;
+  void join(value_type& dest, const value_type& src) const {
+    dest = dest & src;
   }
 
   KOKKOS_INLINE_FUNCTION
@@ -417,51 +373,45 @@ public:
   }
 
   KOKKOS_INLINE_FUNCTION
-  void init( value_type& val)  const {
+  void init(value_type& val) const {
     val = reduction_identity<value_type>::band();
   }
 
   KOKKOS_INLINE_FUNCTION
-  value_type& reference() const {
-    return *value.data();
-  }
+  value_type& reference() const { return *value.data(); }
 
   KOKKOS_INLINE_FUNCTION
-  result_view_type view() const {
-    return value;
-  }
+  result_view_type view() const { return value; }
 
   KOKKOS_INLINE_FUNCTION
-  bool references_scalar() const {
-    return references_scalar_v;
-  }
+  bool references_scalar() const { return references_scalar_v; }
 };
 
-template<class Scalar, class Space>
+template <class Scalar, class Space>
 struct BOr {
-public:
-  //Required
+ public:
+  // Required
   typedef BOr reducer;
   typedef typename std::remove_cv<Scalar>::type value_type;
 
   typedef Kokkos::View<value_type, Space> result_view_type;
 
-private:
+ private:
   result_view_type value;
   bool references_scalar_v;
 
-public:
+ public:
+  KOKKOS_INLINE_FUNCTION
+  BOr(value_type& value_) : value(&value_), references_scalar_v(true) {}
 
   KOKKOS_INLINE_FUNCTION
-  BOr(value_type& value_): value(&value_),references_scalar_v(true) {}
+  BOr(const result_view_type& value_)
+      : value(value_), references_scalar_v(false) {}
 
+  // Required
   KOKKOS_INLINE_FUNCTION
-  BOr(const result_view_type& value_): value(value_),references_scalar_v(false) {}
-
-  //Required
-  KOKKOS_INLINE_FUNCTION
-  void join(value_type& dest, const value_type& src)  const {
-      dest = dest | src;
+  void join(value_type& dest, const value_type& src) const {
+    dest = dest | src;
   }
 
   KOKKOS_INLINE_FUNCTION
@@ -470,256 +420,229 @@ public:
   }
 
   KOKKOS_INLINE_FUNCTION
-  void init( value_type& val)  const {
+  void init(value_type& val) const {
     val = reduction_identity<value_type>::bor();
   }
 
   KOKKOS_INLINE_FUNCTION
-  value_type& reference() const {
-    return *value.data();
-  }
+  value_type& reference() const { return *value.data(); }
 
   KOKKOS_INLINE_FUNCTION
-  result_view_type view() const {
-    return value;
-  }
+  result_view_type view() const { return value; }
 
   KOKKOS_INLINE_FUNCTION
-  bool references_scalar() const {
-    return references_scalar_v;
-  }
+  bool references_scalar() const { return references_scalar_v; }
 };
 
-template<class Scalar, class Index>
+template <class Scalar, class Index>
 struct ValLocScalar {
   Scalar val;
   Index loc;
 
   KOKKOS_INLINE_FUNCTION
-  void operator = (const ValLocScalar& rhs) {
+  void operator=(const ValLocScalar& rhs) {
     val = rhs.val;
     loc = rhs.loc;
   }
 
   KOKKOS_INLINE_FUNCTION
-  void operator = (const volatile ValLocScalar& rhs) volatile {
+  void operator=(const volatile ValLocScalar& rhs) volatile {
     val = rhs.val;
     loc = rhs.loc;
   }
 };
 
-template<class Scalar, class Index, class Space>
+template <class Scalar, class Index, class Space>
 struct MinLoc {
-private:
+ private:
   typedef typename std::remove_cv<Scalar>::type scalar_type;
   typedef typename std::remove_cv<Index>::type index_type;
 
-public:
-  //Required
+ public:
+  // Required
   typedef MinLoc reducer;
-  typedef ValLocScalar<scalar_type,index_type> value_type;
+  typedef ValLocScalar<scalar_type, index_type> value_type;
 
   typedef Kokkos::View<value_type, Space> result_view_type;
 
-private:
+ private:
   result_view_type value;
   bool references_scalar_v;
 
-public:
+ public:
+  KOKKOS_INLINE_FUNCTION
+  MinLoc(value_type& value_) : value(&value_), references_scalar_v(true) {}
 
   KOKKOS_INLINE_FUNCTION
-  MinLoc(value_type& value_): value(&value_),references_scalar_v(true) {}
+  MinLoc(const result_view_type& value_)
+      : value(value_), references_scalar_v(false) {}
 
+  // Required
   KOKKOS_INLINE_FUNCTION
-  MinLoc(const result_view_type& value_): value(value_),references_scalar_v(false) {}
-
-
-  //Required
-  KOKKOS_INLINE_FUNCTION
-  void join(value_type& dest, const value_type& src)  const {
-    if ( src.val < dest.val )
-      dest = src;
+  void join(value_type& dest, const value_type& src) const {
+    if (src.val < dest.val) dest = src;
   }
 
   KOKKOS_INLINE_FUNCTION
   void join(volatile value_type& dest, const volatile value_type& src) const {
-    if ( src.val < dest.val )
-      dest = src;
+    if (src.val < dest.val) dest = src;
   }
 
   KOKKOS_INLINE_FUNCTION
-  void init( value_type& val)  const {
+  void init(value_type& val) const {
     val.val = reduction_identity<scalar_type>::min();
     val.loc = reduction_identity<index_type>::min();
   }
 
   KOKKOS_INLINE_FUNCTION
-  value_type& reference() const {
-    return *value.data();
-  }
+  value_type& reference() const { return *value.data(); }
 
   KOKKOS_INLINE_FUNCTION
-  result_view_type view() const {
-    return value;
-  }
+  result_view_type view() const { return value; }
 
   KOKKOS_INLINE_FUNCTION
-  bool references_scalar() const {
-    return references_scalar_v;
-  }
+  bool references_scalar() const { return references_scalar_v; }
 };
 
-template<class Scalar, class Index, class Space>
+template <class Scalar, class Index, class Space>
 struct MaxLoc {
-private:
+ private:
   typedef typename std::remove_cv<Scalar>::type scalar_type;
   typedef typename std::remove_cv<Index>::type index_type;
 
-public:
-  //Required
+ public:
+  // Required
   typedef MaxLoc reducer;
-  typedef ValLocScalar<scalar_type,index_type> value_type;
+  typedef ValLocScalar<scalar_type, index_type> value_type;
 
   typedef Kokkos::View<value_type, Space> result_view_type;
 
-private:
+ private:
   result_view_type value;
   bool references_scalar_v;
 
-public:
+ public:
+  KOKKOS_INLINE_FUNCTION
+  MaxLoc(value_type& value_) : value(&value_), references_scalar_v(true) {}
 
   KOKKOS_INLINE_FUNCTION
-  MaxLoc(value_type& value_): value(&value_),references_scalar_v(true) {}
+  MaxLoc(const result_view_type& value_)
+      : value(value_), references_scalar_v(false) {}
 
+  // Required
   KOKKOS_INLINE_FUNCTION
-  MaxLoc(const result_view_type& value_): value(value_),references_scalar_v(false) {}
-
-  //Required
-  KOKKOS_INLINE_FUNCTION
-  void join(value_type& dest, const value_type& src)  const {
-    if ( src.val > dest.val )
-      dest = src;
+  void join(value_type& dest, const value_type& src) const {
+    if (src.val > dest.val) dest = src;
   }
 
   KOKKOS_INLINE_FUNCTION
   void join(volatile value_type& dest, const volatile value_type& src) const {
-    if ( src.val > dest.val )
-      dest = src;
+    if (src.val > dest.val) dest = src;
   }
 
   KOKKOS_INLINE_FUNCTION
-  void init( value_type& val)  const {
-    val.val = reduction_identity<scalar_type>::max();;
+  void init(value_type& val) const {
+    val.val = reduction_identity<scalar_type>::max();
+    ;
     val.loc = reduction_identity<index_type>::min();
   }
 
   KOKKOS_INLINE_FUNCTION
-  value_type& reference() const {
-    return *value.data();
-  }
+  value_type& reference() const { return *value.data(); }
 
   KOKKOS_INLINE_FUNCTION
-  result_view_type view() const {
-    return value;
-  }
+  result_view_type view() const { return value; }
 
   KOKKOS_INLINE_FUNCTION
-  bool references_scalar() const {
-    return references_scalar_v;
-  }
+  bool references_scalar() const { return references_scalar_v; }
 };
 
-template<class Scalar>
+template <class Scalar>
 struct MinMaxScalar {
-  Scalar min_val,max_val;
+  Scalar min_val, max_val;
 
   KOKKOS_INLINE_FUNCTION
-  void operator = (const MinMaxScalar& rhs) {
+  void operator=(const MinMaxScalar& rhs) {
     min_val = rhs.min_val;
     max_val = rhs.max_val;
   }
 
   KOKKOS_INLINE_FUNCTION
-  void operator = (const volatile MinMaxScalar& rhs) volatile {
+  void operator=(const volatile MinMaxScalar& rhs) volatile {
     min_val = rhs.min_val;
     max_val = rhs.max_val;
   }
 };
 
-template<class Scalar, class Space>
+template <class Scalar, class Space>
 struct MinMax {
-private:
+ private:
   typedef typename std::remove_cv<Scalar>::type scalar_type;
 
-public:
-  //Required
+ public:
+  // Required
   typedef MinMax reducer;
   typedef MinMaxScalar<scalar_type> value_type;
 
   typedef Kokkos::View<value_type, Space> result_view_type;
 
-private:
+ private:
   result_view_type value;
   bool references_scalar_v;
 
-public:
+ public:
+  KOKKOS_INLINE_FUNCTION
+  MinMax(value_type& value_) : value(&value_), references_scalar_v(true) {}
 
   KOKKOS_INLINE_FUNCTION
-  MinMax(value_type& value_): value(&value_),references_scalar_v(true) {}
+  MinMax(const result_view_type& value_)
+      : value(value_), references_scalar_v(false) {}
 
+  // Required
   KOKKOS_INLINE_FUNCTION
-  MinMax(const result_view_type& value_): value(value_),references_scalar_v(false) {}
-
-  //Required
-  KOKKOS_INLINE_FUNCTION
-  void join(value_type& dest, const value_type& src)  const {
-    if ( src.min_val < dest.min_val ) {
+  void join(value_type& dest, const value_type& src) const {
+    if (src.min_val < dest.min_val) {
       dest.min_val = src.min_val;
     }
-    if ( src.max_val > dest.max_val ) {
+    if (src.max_val > dest.max_val) {
       dest.max_val = src.max_val;
     }
   }
 
   KOKKOS_INLINE_FUNCTION
   void join(volatile value_type& dest, const volatile value_type& src) const {
-    if ( src.min_val < dest.min_val ) {
+    if (src.min_val < dest.min_val) {
       dest.min_val = src.min_val;
     }
-    if ( src.max_val > dest.max_val ) {
+    if (src.max_val > dest.max_val) {
       dest.max_val = src.max_val;
     }
   }
 
   KOKKOS_INLINE_FUNCTION
-  void init( value_type& val)  const {
-    val.max_val = reduction_identity<scalar_type>::max();;
+  void init(value_type& val) const {
+    val.max_val = reduction_identity<scalar_type>::max();
+    ;
     val.min_val = reduction_identity<scalar_type>::min();
   }
 
   KOKKOS_INLINE_FUNCTION
-  value_type& reference() const {
-    return *value.data();
-  }
+  value_type& reference() const { return *value.data(); }
 
   KOKKOS_INLINE_FUNCTION
-  result_view_type view() const {
-    return value;
-  }
+  result_view_type view() const { return value; }
 
   KOKKOS_INLINE_FUNCTION
-  bool references_scalar() const {
-    return references_scalar_v;
-  }
+  bool references_scalar() const { return references_scalar_v; }
 };
 
-template<class Scalar, class Index>
+template <class Scalar, class Index>
 struct MinMaxLocScalar {
-  Scalar min_val,max_val;
-  Index min_loc,max_loc;
+  Scalar min_val, max_val;
+  Index min_loc, max_loc;
 
   KOKKOS_INLINE_FUNCTION
-  void operator = (const MinMaxLocScalar& rhs) {
+  void operator=(const MinMaxLocScalar& rhs) {
     min_val = rhs.min_val;
     min_loc = rhs.min_loc;
     max_val = rhs.max_val;
@@ -727,7 +650,7 @@ struct MinMaxLocScalar {
   }
 
   KOKKOS_INLINE_FUNCTION
-  void operator = (const volatile MinMaxLocScalar& rhs) volatile {
+  void operator=(const volatile MinMaxLocScalar& rhs) volatile {
     min_val = rhs.min_val;
     min_loc = rhs.min_loc;
     max_val = rhs.max_val;
@@ -735,39 +658,39 @@ struct MinMaxLocScalar {
   }
 };
 
-template<class Scalar, class Index, class Space>
+template <class Scalar, class Index, class Space>
 struct MinMaxLoc {
-private:
+ private:
   typedef typename std::remove_cv<Scalar>::type scalar_type;
   typedef typename std::remove_cv<Index>::type index_type;
 
-public:
-  //Required
+ public:
+  // Required
   typedef MinMaxLoc reducer;
-  typedef MinMaxLocScalar<scalar_type,index_type> value_type;
+  typedef MinMaxLocScalar<scalar_type, index_type> value_type;
 
   typedef Kokkos::View<value_type, Space> result_view_type;
 
-private:
+ private:
   result_view_type value;
   bool references_scalar_v;
 
-public:
+ public:
+  KOKKOS_INLINE_FUNCTION
+  MinMaxLoc(value_type& value_) : value(&value_), references_scalar_v(true) {}
 
   KOKKOS_INLINE_FUNCTION
-  MinMaxLoc(value_type& value_): value(&value_),references_scalar_v(true) {}
+  MinMaxLoc(const result_view_type& value_)
+      : value(value_), references_scalar_v(false) {}
 
+  // Required
   KOKKOS_INLINE_FUNCTION
-  MinMaxLoc(const result_view_type& value_): value(value_),references_scalar_v(false) {}
-
-  //Required
-  KOKKOS_INLINE_FUNCTION
-  void join(value_type& dest, const value_type& src)  const {
-    if ( src.min_val < dest.min_val ) {
+  void join(value_type& dest, const value_type& src) const {
+    if (src.min_val < dest.min_val) {
       dest.min_val = src.min_val;
       dest.min_loc = src.min_loc;
     }
-    if ( src.max_val > dest.max_val ) {
+    if (src.max_val > dest.max_val) {
       dest.max_val = src.max_val;
       dest.max_loc = src.max_loc;
     }
@@ -775,71 +698,68 @@ public:
 
   KOKKOS_INLINE_FUNCTION
   void join(volatile value_type& dest, const volatile value_type& src) const {
-    if ( src.min_val < dest.min_val ) {
+    if (src.min_val < dest.min_val) {
       dest.min_val = src.min_val;
       dest.min_loc = src.min_loc;
     }
-    if ( src.max_val > dest.max_val ) {
+    if (src.max_val > dest.max_val) {
       dest.max_val = src.max_val;
       dest.max_loc = src.max_loc;
     }
   }
 
   KOKKOS_INLINE_FUNCTION
-  void init( value_type& val)  const {
-    val.max_val = reduction_identity<scalar_type>::max();;
+  void init(value_type& val) const {
+    val.max_val = reduction_identity<scalar_type>::max();
+    ;
     val.min_val = reduction_identity<scalar_type>::min();
     val.max_loc = reduction_identity<index_type>::min();
     val.min_loc = reduction_identity<index_type>::min();
   }
 
   KOKKOS_INLINE_FUNCTION
-  value_type& reference() const {
-    return *value.data();
-  }
+  value_type& reference() const { return *value.data(); }
 
   KOKKOS_INLINE_FUNCTION
-  result_view_type view() const {
-    return value;
-  }
+  result_view_type view() const { return value; }
 
   KOKKOS_INLINE_FUNCTION
-  bool references_scalar() const {
-    return references_scalar_v;
-  }
+  bool references_scalar() const { return references_scalar_v; }
 };
-}
-namespace Kokkos{
+}  // namespace Kokkos
+namespace Kokkos {
 namespace Impl {
 
-template< class T, class ReturnType , class ValueTraits>
+template <class T, class ReturnType, class ValueTraits>
 struct ParallelReduceReturnValue;
 
-template< class ReturnType , class FunctorType >
-struct ParallelReduceReturnValue<typename std::enable_if<Kokkos::is_view<ReturnType>::value>::type, ReturnType, FunctorType> {
+template <class ReturnType, class FunctorType>
+struct ParallelReduceReturnValue<
+    typename std::enable_if<Kokkos::is_view<ReturnType>::value>::type,
+    ReturnType, FunctorType> {
   typedef ReturnType return_type;
   typedef InvalidType reducer_type;
 
   typedef typename return_type::value_type value_type_scalar;
   typedef typename return_type::value_type* const value_type_array;
 
-  typedef typename if_c<return_type::rank==0,value_type_scalar,value_type_array>::type value_type;
+  typedef typename if_c<return_type::rank == 0, value_type_scalar,
+                        value_type_array>::type value_type;
 
   static return_type& return_value(ReturnType& return_val, const FunctorType&) {
     return return_val;
   }
 };
 
-template< class ReturnType , class FunctorType>
-struct ParallelReduceReturnValue<typename std::enable_if<
-                                   !Kokkos::is_view<ReturnType>::value &&
-                                  (!std::is_array<ReturnType>::value && !std::is_pointer<ReturnType>::value) &&
-                                   !Kokkos::is_reducer_type<ReturnType>::value
-                                 >::type, ReturnType, FunctorType> {
-  typedef Kokkos::View<  ReturnType
-                       , Kokkos::HostSpace
-                       , Kokkos::MemoryUnmanaged
-      > return_type;
+template <class ReturnType, class FunctorType>
+struct ParallelReduceReturnValue<
+    typename std::enable_if<!Kokkos::is_view<ReturnType>::value &&
+                            (!std::is_array<ReturnType>::value &&
+                             !std::is_pointer<ReturnType>::value) &&
+                            !Kokkos::is_reducer_type<ReturnType>::value>::type,
+    ReturnType, FunctorType> {
+  typedef Kokkos::View<ReturnType, Kokkos::HostSpace, Kokkos::MemoryUnmanaged>
+      return_type;
 
   typedef InvalidType reducer_type;
 
@@ -850,14 +770,14 @@ struct ParallelReduceReturnValue<typename std::enable_if<
   }
 };
 
-template< class ReturnType , class FunctorType>
-struct ParallelReduceReturnValue<typename std::enable_if<
-                                  (is_array<ReturnType>::value || std::is_pointer<ReturnType>::value)
-                                >::type, ReturnType, FunctorType> {
-  typedef Kokkos::View<  typename std::remove_const<ReturnType>::type
-                       , Kokkos::HostSpace
-                       , Kokkos::MemoryUnmanaged
-      > return_type;
+template <class ReturnType, class FunctorType>
+struct ParallelReduceReturnValue<
+    typename std::enable_if<(is_array<ReturnType>::value ||
+                             std::is_pointer<ReturnType>::value)>::type,
+    ReturnType, FunctorType> {
+  typedef Kokkos::View<typename std::remove_const<ReturnType>::type,
+                       Kokkos::HostSpace, Kokkos::MemoryUnmanaged>
+      return_type;
 
   typedef InvalidType reducer_type;
 
@@ -866,150 +786,154 @@ struct ParallelReduceReturnValue<typename std::enable_if<
   static return_type return_value(ReturnType& return_val,
                                   const FunctorType& functor) {
 #ifdef KOKKOS_ENABLE_DEPRECATED_CODE
-    return return_type(return_val,functor.value_count);
+    return return_type(return_val, functor.value_count);
 #else
-    if ( is_array<ReturnType>::value )
+    if (is_array<ReturnType>::value)
       return return_type(return_val);
     else
-      return return_type(return_val,functor.value_count);
+      return return_type(return_val, functor.value_count);
 #endif
   }
 };
 
-template< class ReturnType , class FunctorType>
-struct ParallelReduceReturnValue<typename std::enable_if<
-                                   Kokkos::is_reducer_type<ReturnType>::value
-                                >::type, ReturnType, FunctorType> {
+template <class ReturnType, class FunctorType>
+struct ParallelReduceReturnValue<
+    typename std::enable_if<Kokkos::is_reducer_type<ReturnType>::value>::type,
+    ReturnType, FunctorType> {
   typedef ReturnType return_type;
   typedef ReturnType reducer_type;
   typedef typename return_type::value_type value_type;
 
-  static return_type return_value(ReturnType& return_val,
-                                  const FunctorType&) {
+  static return_type return_value(ReturnType& return_val, const FunctorType&) {
     return return_val;
   }
 };
 
-template< class T, class ReturnType , class FunctorType>
+template <class T, class ReturnType, class FunctorType>
 struct ParallelReducePolicyType;
 
-template< class PolicyType , class FunctorType >
-struct ParallelReducePolicyType<typename std::enable_if<Kokkos::Impl::is_execution_policy<PolicyType>::value>::type, PolicyType,FunctorType> {
-
+template <class PolicyType, class FunctorType>
+struct ParallelReducePolicyType<
+    typename std::enable_if<
+        Kokkos::Impl::is_execution_policy<PolicyType>::value>::type,
+    PolicyType, FunctorType> {
   typedef PolicyType policy_type;
-  static PolicyType policy(const PolicyType& policy_) {
-    return policy_;
-  }
+  static PolicyType policy(const PolicyType& policy_) { return policy_; }
 };
 
-template< class PolicyType , class FunctorType >
-struct ParallelReducePolicyType<typename std::enable_if<std::is_integral<PolicyType>::value>::type, PolicyType,FunctorType> {
-  typedef typename
-    Impl::FunctorPolicyExecutionSpace< FunctorType , void >::execution_space
-      execution_space ;
+template <class PolicyType, class FunctorType>
+struct ParallelReducePolicyType<
+    typename std::enable_if<std::is_integral<PolicyType>::value>::type,
+    PolicyType, FunctorType> {
+  typedef typename Impl::FunctorPolicyExecutionSpace<
+      FunctorType, void>::execution_space execution_space;
 
   typedef Kokkos::RangePolicy<execution_space> policy_type;
 
   static policy_type policy(const PolicyType& policy_) {
-    return policy_type(0,policy_);
+    return policy_type(0, policy_);
   }
 };
 
+template <class FunctorType, class ExecPolicy, class ValueType,
+          class ExecutionSpace>
+struct ParallelReduceFunctorType {
+  typedef FunctorType functor_type;
+  static const functor_type& functor(const functor_type& functor) {
+    return functor;
+  }
+};
 
-  template< class FunctorType, class ExecPolicy, class ValueType, class ExecutionSpace>
-  struct ParallelReduceFunctorType {
-    typedef FunctorType functor_type;
-    static const functor_type& functor(const functor_type& functor) {
-      return functor;
+template <class PolicyType, class FunctorType, class ReturnType>
+struct ParallelReduceAdaptor {
+  typedef Impl::ParallelReduceReturnValue<void, ReturnType, FunctorType>
+      return_value_adapter;
+#ifdef KOKKOS_IMPL_NEED_FUNCTOR_WRAPPER
+  typedef Impl::ParallelReduceFunctorType<
+      FunctorType, PolicyType, typename return_value_adapter::value_type,
+      typename PolicyType::execution_space>
+      functor_adaptor;
+#endif
+  static inline void execute(const std::string& label, const PolicyType& policy,
+                             const FunctorType& functor,
+                             ReturnType& return_value) {
+#if defined(KOKKOS_ENABLE_PROFILING)
+    uint64_t kpID = 0;
+    if (Kokkos::Profiling::profileLibraryLoaded()) {
+      Kokkos::Impl::ParallelConstructName<FunctorType,
+                                          typename PolicyType::work_tag>
+          name(label);
+      Kokkos::Profiling::beginParallelReduce(name.get(), 0, &kpID);
     }
-  };
+#endif
 
-  template< class PolicyType, class FunctorType, class ReturnType >
-  struct ParallelReduceAdaptor {
-    typedef Impl::ParallelReduceReturnValue<void,ReturnType,FunctorType> return_value_adapter;
-    #ifdef KOKKOS_IMPL_NEED_FUNCTOR_WRAPPER
-    typedef Impl::ParallelReduceFunctorType<FunctorType,PolicyType,
-                                            typename return_value_adapter::value_type,
-                                            typename PolicyType::execution_space> functor_adaptor;
-    #endif
-    static inline
-    void execute(const std::string& label,
-        const PolicyType& policy,
-        const FunctorType& functor,
-        ReturnType& return_value) {
-          #if defined(KOKKOS_ENABLE_PROFILING)
-          uint64_t kpID = 0;
-          if(Kokkos::Profiling::profileLibraryLoaded()) {
-            Kokkos::Impl::ParallelConstructName<FunctorType, typename PolicyType::work_tag> name(label);
-            Kokkos::Profiling::beginParallelReduce(name.get(), 0, &kpID);
-          }
-          #endif
+    Kokkos::Impl::shared_allocation_tracking_disable();
+#ifdef KOKKOS_IMPL_NEED_FUNCTOR_WRAPPER
+    Impl::ParallelReduce<typename functor_adaptor::functor_type, PolicyType,
+                         typename return_value_adapter::reducer_type>
+        closure(functor_adaptor::functor(functor), policy,
+                return_value_adapter::return_value(return_value, functor));
+#else
+    Impl::ParallelReduce<FunctorType, PolicyType,
+                         typename return_value_adapter::reducer_type>
+        closure(functor, policy,
+                return_value_adapter::return_value(return_value, functor));
+#endif
+    Kokkos::Impl::shared_allocation_tracking_enable();
+    closure.execute();
 
-          Kokkos::Impl::shared_allocation_tracking_disable();
-          #ifdef KOKKOS_IMPL_NEED_FUNCTOR_WRAPPER
-          Impl::ParallelReduce<typename functor_adaptor::functor_type, PolicyType, typename return_value_adapter::reducer_type >
-             closure(functor_adaptor::functor(functor),
-                     policy,
-                     return_value_adapter::return_value(return_value,functor));
-          #else
-          Impl::ParallelReduce<FunctorType, PolicyType, typename return_value_adapter::reducer_type >
-             closure(functor,
-                     policy,
-                     return_value_adapter::return_value(return_value,functor));
-          #endif
-          Kokkos::Impl::shared_allocation_tracking_enable();
-          closure.execute();
-
-          #if defined(KOKKOS_ENABLE_PROFILING)
-          if(Kokkos::Profiling::profileLibraryLoaded()) {
-            Kokkos::Profiling::endParallelReduce(kpID);
-          }
-          #endif
-        }
-
-  };
-}
+#if defined(KOKKOS_ENABLE_PROFILING)
+    if (Kokkos::Profiling::profileLibraryLoaded()) {
+      Kokkos::Profiling::endParallelReduce(kpID);
+    }
+#endif
+  }
+};
+}  // namespace Impl
 
 //----------------------------------------------------------------------------
 
 /*! \fn void parallel_reduce(label,policy,functor,return_argument)
     \brief Perform a parallel reduction.
-    \param label An optional Label giving the call name. Must be able to construct a std::string from the argument.
-    \param policy A Kokkos Execution Policy, such as an integer, a RangePolicy or a TeamPolicy.
-    \param functor A functor with a reduction operator, and optional init, join and final functions.
-    \param return_argument A return argument which can be a scalar, a View, or a ReducerStruct. This argument can be left out if the functor has a final function.
+    \param label An optional Label giving the call name. Must be able to
+   construct a std::string from the argument. \param policy A Kokkos Execution
+   Policy, such as an integer, a RangePolicy or a TeamPolicy. \param functor A
+   functor with a reduction operator, and optional init, join and final
+   functions. \param return_argument A return argument which can be a scalar, a
+   View, or a ReducerStruct. This argument can be left out if the functor has a
+   final function.
 */
 
 // Parallel Reduce Blocking behavior
 
 namespace Impl {
 template <typename T>
-  struct ReducerHasTestReferenceFunction
-  {
-    template <typename E> static std::true_type test_func( decltype(&E::references_scalar) ) ;
-    template <typename E> static std::false_type test_func(...);
+struct ReducerHasTestReferenceFunction {
+  template <typename E>
+  static std::true_type test_func(decltype(&E::references_scalar));
+  template <typename E>
+  static std::false_type test_func(...);
 
-    enum { value = std::is_same<std::true_type,decltype(test_func<T>(0))>::value };
+  enum {
+    value = std::is_same<std::true_type, decltype(test_func<T>(0))>::value
   };
+};
 
-  template<class T, bool is_reducer =  ReducerHasTestReferenceFunction<T>::value>
-  struct ParallelReduceFence {
-    static void fence(const T&) {
-      Kokkos::fence();
-    }
-  };
-  template<class ... Args>
-  struct ParallelReduceFence<View<Args...>, false> {
-    static void fence(const View<Args...>) {};
-  };
-  template<class T>
-  struct ParallelReduceFence<T,true> {
-    static void fence(const T& reducer) {
-      if(reducer.references_scalar())
-        Kokkos::fence();
-    }
-  };
-}
+template <class T, bool is_reducer = ReducerHasTestReferenceFunction<T>::value>
+struct ParallelReduceFence {
+  static void fence(const T&) { Kokkos::fence(); }
+};
+template <class... Args>
+struct ParallelReduceFence<View<Args...>, false> {
+  static void fence(const View<Args...>){};
+};
+template <class T>
+struct ParallelReduceFence<T, true> {
+  static void fence(const T& reducer) {
+    if (reducer.references_scalar()) Kokkos::fence();
+  }
+};
+}  // namespace Impl
 
 /** \brief  Parallel reduction
  *
@@ -1033,16 +957,12 @@ template <typename T>
  *  };
  * \endcode
  *
- * Example of a parallel_reduce functor for an array of POD (plain old data) values:
- * \code
- *  class FunctorType { // For array of POD value
- *  public:
- *    typedef    ...     execution_space ;
- *    typedef <podType>  value_type[] ;
- *    void operator()( <intType> , <podType> update[] ) const ;
- *    void init( <podType> update[] ) const ;
- *    void join( volatile       <podType> update[] ,
- *               volatile const <podType> input[] ) const ;
+ * Example of a parallel_reduce functor for an array of POD (plain old data)
+ * values: \code class FunctorType { // For array of POD value public: typedef
+ * ...     execution_space ; typedef <podType>  value_type[] ; void operator()(
+ * <intType> , <podType> update[] ) const ; void init( <podType> update[] )
+ * const ; void join( volatile       <podType> update[] , volatile const
+ * <podType> input[] ) const ;
  *
  *    typedef true_type has_final ;
  *    void final( <podType> update[] ) const ;
@@ -1052,226 +972,223 @@ template <typename T>
 
 // ReturnValue is scalar or array: take by reference
 
-template< class PolicyType, class FunctorType, class ReturnType >
-inline
-void parallel_reduce(const std::string& label,
-                     const PolicyType& policy,
-                     const FunctorType& functor,
-                     ReturnType& return_value,
-                     typename Impl::enable_if<
-                       Kokkos::Impl::is_execution_policy<PolicyType>::value
-                     >::type * = 0) {
-  Impl::ParallelReduceAdaptor<PolicyType,FunctorType,ReturnType>::execute(label,policy,functor,return_value);
+template <class PolicyType, class FunctorType, class ReturnType>
+inline void parallel_reduce(
+    const std::string& label, const PolicyType& policy,
+    const FunctorType& functor, ReturnType& return_value,
+    typename Impl::enable_if<
+        Kokkos::Impl::is_execution_policy<PolicyType>::value>::type* = 0) {
+  Impl::ParallelReduceAdaptor<PolicyType, FunctorType, ReturnType>::execute(
+      label, policy, functor, return_value);
   Impl::ParallelReduceFence<ReturnType>::fence(return_value);
 }
 
-template< class PolicyType, class FunctorType, class ReturnType >
-inline
-void parallel_reduce(const PolicyType& policy,
-                     const FunctorType& functor,
-                     ReturnType& return_value,
-                     typename Impl::enable_if<
-                       Kokkos::Impl::is_execution_policy<PolicyType>::value
-                     >::type * = 0) {
-  Impl::ParallelReduceAdaptor<PolicyType,FunctorType,ReturnType>::execute("",policy,functor,return_value);
+template <class PolicyType, class FunctorType, class ReturnType>
+inline void parallel_reduce(
+    const PolicyType& policy, const FunctorType& functor,
+    ReturnType& return_value,
+    typename Impl::enable_if<
+        Kokkos::Impl::is_execution_policy<PolicyType>::value>::type* = 0) {
+  Impl::ParallelReduceAdaptor<PolicyType, FunctorType, ReturnType>::execute(
+      "", policy, functor, return_value);
   Impl::ParallelReduceFence<ReturnType>::fence(return_value);
 }
 
-template< class FunctorType, class ReturnType >
-inline
-void parallel_reduce(const size_t& policy,
-                     const FunctorType& functor,
-                     ReturnType& return_value) {
-  typedef typename Impl::ParallelReducePolicyType<void,size_t,FunctorType>::policy_type policy_type;
-  Impl::ParallelReduceAdaptor<policy_type,FunctorType,ReturnType>::execute("",policy_type(0,policy),functor,return_value);
+template <class FunctorType, class ReturnType>
+inline void parallel_reduce(const size_t& policy, const FunctorType& functor,
+                            ReturnType& return_value) {
+  typedef typename Impl::ParallelReducePolicyType<
+      void, size_t, FunctorType>::policy_type policy_type;
+  Impl::ParallelReduceAdaptor<policy_type, FunctorType, ReturnType>::execute(
+      "", policy_type(0, policy), functor, return_value);
   Impl::ParallelReduceFence<ReturnType>::fence(return_value);
 }
 
-template< class FunctorType, class ReturnType >
-inline
-void parallel_reduce(const std::string& label,
-                     const size_t& policy,
-                     const FunctorType& functor,
-                     ReturnType& return_value) {
-  typedef typename Impl::ParallelReducePolicyType<void,size_t,FunctorType>::policy_type policy_type;
-  Impl::ParallelReduceAdaptor<policy_type,FunctorType,ReturnType>::execute(label,policy_type(0,policy),functor,return_value);
+template <class FunctorType, class ReturnType>
+inline void parallel_reduce(const std::string& label, const size_t& policy,
+                            const FunctorType& functor,
+                            ReturnType& return_value) {
+  typedef typename Impl::ParallelReducePolicyType<
+      void, size_t, FunctorType>::policy_type policy_type;
+  Impl::ParallelReduceAdaptor<policy_type, FunctorType, ReturnType>::execute(
+      label, policy_type(0, policy), functor, return_value);
   Impl::ParallelReduceFence<ReturnType>::fence(return_value);
 }
 
 // ReturnValue as View or Reducer: take by copy to allow for inline construction
 
-template< class PolicyType, class FunctorType, class ReturnType >
-inline
-void parallel_reduce(const std::string& label,
-                     const PolicyType& policy,
-                     const FunctorType& functor,
-                     const ReturnType& return_value,
-                     typename Impl::enable_if<
-                       Kokkos::Impl::is_execution_policy<PolicyType>::value
-                     >::type * = 0) {
+template <class PolicyType, class FunctorType, class ReturnType>
+inline void parallel_reduce(
+    const std::string& label, const PolicyType& policy,
+    const FunctorType& functor, const ReturnType& return_value,
+    typename Impl::enable_if<
+        Kokkos::Impl::is_execution_policy<PolicyType>::value>::type* = 0) {
   ReturnType return_value_impl = return_value;
-  Impl::ParallelReduceAdaptor<PolicyType,FunctorType,ReturnType>::execute(label,policy,functor,return_value_impl);
+  Impl::ParallelReduceAdaptor<PolicyType, FunctorType, ReturnType>::execute(
+      label, policy, functor, return_value_impl);
   Impl::ParallelReduceFence<ReturnType>::fence(return_value);
 }
 
-template< class PolicyType, class FunctorType, class ReturnType >
-inline
-void parallel_reduce(const PolicyType& policy,
-                     const FunctorType& functor,
-                     const ReturnType& return_value,
-                     typename Impl::enable_if<
-                       Kokkos::Impl::is_execution_policy<PolicyType>::value
-                     >::type * = 0) {
+template <class PolicyType, class FunctorType, class ReturnType>
+inline void parallel_reduce(
+    const PolicyType& policy, const FunctorType& functor,
+    const ReturnType& return_value,
+    typename Impl::enable_if<
+        Kokkos::Impl::is_execution_policy<PolicyType>::value>::type* = 0) {
   ReturnType return_value_impl = return_value;
-  Impl::ParallelReduceAdaptor<PolicyType,FunctorType,ReturnType>::execute("",policy,functor,return_value_impl);
+  Impl::ParallelReduceAdaptor<PolicyType, FunctorType, ReturnType>::execute(
+      "", policy, functor, return_value_impl);
   Impl::ParallelReduceFence<ReturnType>::fence(return_value);
 }
 
-template< class FunctorType, class ReturnType >
-inline
-void parallel_reduce(const size_t& policy,
-                     const FunctorType& functor,
-                     const ReturnType& return_value) {
-  typedef typename Impl::ParallelReducePolicyType<void,size_t,FunctorType>::policy_type policy_type;
+template <class FunctorType, class ReturnType>
+inline void parallel_reduce(const size_t& policy, const FunctorType& functor,
+                            const ReturnType& return_value) {
+  typedef typename Impl::ParallelReducePolicyType<
+      void, size_t, FunctorType>::policy_type policy_type;
   ReturnType return_value_impl = return_value;
-  Impl::ParallelReduceAdaptor<policy_type,FunctorType,ReturnType>::execute("",policy_type(0,policy),functor,return_value_impl);
+  Impl::ParallelReduceAdaptor<policy_type, FunctorType, ReturnType>::execute(
+      "", policy_type(0, policy), functor, return_value_impl);
   Impl::ParallelReduceFence<ReturnType>::fence(return_value);
 }
 
-template< class FunctorType, class ReturnType >
-inline
-void parallel_reduce(const std::string& label,
-                     const size_t& policy,
-                     const FunctorType& functor,
-                     const ReturnType& return_value) {
-  typedef typename Impl::ParallelReducePolicyType<void,size_t,FunctorType>::policy_type policy_type;
+template <class FunctorType, class ReturnType>
+inline void parallel_reduce(const std::string& label, const size_t& policy,
+                            const FunctorType& functor,
+                            const ReturnType& return_value) {
+  typedef typename Impl::ParallelReducePolicyType<
+      void, size_t, FunctorType>::policy_type policy_type;
   ReturnType return_value_impl = return_value;
-  Impl::ParallelReduceAdaptor<policy_type,FunctorType,ReturnType>::execute(label,policy_type(0,policy),functor,return_value_impl);
+  Impl::ParallelReduceAdaptor<policy_type, FunctorType, ReturnType>::execute(
+      label, policy_type(0, policy), functor, return_value_impl);
   Impl::ParallelReduceFence<ReturnType>::fence(return_value);
 }
 
 // No Return Argument
 
-template< class PolicyType, class FunctorType>
-inline
-void parallel_reduce(const std::string& label,
-                     const PolicyType& policy,
-                     const FunctorType& functor,
-                     typename Impl::enable_if<
-                       Kokkos::Impl::is_execution_policy<PolicyType>::value
-                     >::type * = 0) {
-  typedef Kokkos::Impl::FunctorValueTraits< FunctorType , void >  ValueTraits ;
-  typedef typename Kokkos::Impl::if_c< (ValueTraits::StaticValueSize != 0)
-                                     , typename ValueTraits::value_type
-                                     , typename ValueTraits::pointer_type
-                                     >::type value_type ;
+template <class PolicyType, class FunctorType>
+inline void parallel_reduce(
+    const std::string& label, const PolicyType& policy,
+    const FunctorType& functor,
+    typename Impl::enable_if<
+        Kokkos::Impl::is_execution_policy<PolicyType>::value>::type* = 0) {
+  typedef Kokkos::Impl::FunctorValueTraits<FunctorType, void> ValueTraits;
+  typedef typename Kokkos::Impl::if_c<
+      (ValueTraits::StaticValueSize != 0), typename ValueTraits::value_type,
+      typename ValueTraits::pointer_type>::type value_type;
 
-  static_assert(Impl::FunctorAnalysis<Impl::FunctorPatternInterface::REDUCE,PolicyType,FunctorType>::
-                 has_final_member_function,"Calling parallel_reduce without either return value or final function.");
+  static_assert(
+      Impl::FunctorAnalysis<Impl::FunctorPatternInterface::REDUCE, PolicyType,
+                            FunctorType>::has_final_member_function,
+      "Calling parallel_reduce without either return value or final function.");
 
-  typedef Kokkos::View< value_type
-              , Kokkos::HostSpace
-              , Kokkos::MemoryUnmanaged
-              > result_view_type;
-  result_view_type result_view ;
+  typedef Kokkos::View<value_type, Kokkos::HostSpace, Kokkos::MemoryUnmanaged>
+      result_view_type;
+  result_view_type result_view;
 
-  Impl::ParallelReduceAdaptor<PolicyType,FunctorType,result_view_type>::execute(label,policy,functor,result_view);
+  Impl::ParallelReduceAdaptor<PolicyType, FunctorType,
+                              result_view_type>::execute(label, policy, functor,
+                                                         result_view);
 }
 
-template< class PolicyType, class FunctorType >
-inline
-void parallel_reduce(const PolicyType& policy,
-                     const FunctorType& functor,
-                     typename Impl::enable_if<
-                       Kokkos::Impl::is_execution_policy<PolicyType>::value
-                     >::type * = 0) {
-  typedef Kokkos::Impl::FunctorValueTraits< FunctorType , void >  ValueTraits ;
-  typedef typename Kokkos::Impl::if_c< (ValueTraits::StaticValueSize != 0)
-                                     , typename ValueTraits::value_type
-                                     , typename ValueTraits::pointer_type
-                                     >::type value_type ;
+template <class PolicyType, class FunctorType>
+inline void parallel_reduce(
+    const PolicyType& policy, const FunctorType& functor,
+    typename Impl::enable_if<
+        Kokkos::Impl::is_execution_policy<PolicyType>::value>::type* = 0) {
+  typedef Kokkos::Impl::FunctorValueTraits<FunctorType, void> ValueTraits;
+  typedef typename Kokkos::Impl::if_c<
+      (ValueTraits::StaticValueSize != 0), typename ValueTraits::value_type,
+      typename ValueTraits::pointer_type>::type value_type;
 
-  static_assert(Impl::FunctorAnalysis<Impl::FunctorPatternInterface::REDUCE,PolicyType,FunctorType>::
-                 has_final_member_function,"Calling parallel_reduce without either return value or final function.");
+  static_assert(
+      Impl::FunctorAnalysis<Impl::FunctorPatternInterface::REDUCE, PolicyType,
+                            FunctorType>::has_final_member_function,
+      "Calling parallel_reduce without either return value or final function.");
 
-  typedef Kokkos::View< value_type
-              , Kokkos::HostSpace
-              , Kokkos::MemoryUnmanaged
-              > result_view_type;
-  result_view_type result_view ;
+  typedef Kokkos::View<value_type, Kokkos::HostSpace, Kokkos::MemoryUnmanaged>
+      result_view_type;
+  result_view_type result_view;
 
-  Impl::ParallelReduceAdaptor<PolicyType,FunctorType,result_view_type>::execute("",policy,functor,result_view);
+  Impl::ParallelReduceAdaptor<PolicyType, FunctorType,
+                              result_view_type>::execute("", policy, functor,
+                                                         result_view);
 }
 
-template< class FunctorType >
-inline
-void parallel_reduce(const size_t& policy,
-                     const FunctorType& functor) {
-  typedef typename Impl::ParallelReducePolicyType<void,size_t,FunctorType>::policy_type policy_type;
-  typedef Kokkos::Impl::FunctorValueTraits< FunctorType , void >  ValueTraits ;
-  typedef typename Kokkos::Impl::if_c< (ValueTraits::StaticValueSize != 0)
-                                     , typename ValueTraits::value_type
-                                     , typename ValueTraits::pointer_type
-                                     >::type value_type ;
+template <class FunctorType>
+inline void parallel_reduce(const size_t& policy, const FunctorType& functor) {
+  typedef typename Impl::ParallelReducePolicyType<
+      void, size_t, FunctorType>::policy_type policy_type;
+  typedef Kokkos::Impl::FunctorValueTraits<FunctorType, void> ValueTraits;
+  typedef typename Kokkos::Impl::if_c<
+      (ValueTraits::StaticValueSize != 0), typename ValueTraits::value_type,
+      typename ValueTraits::pointer_type>::type value_type;
 
-  static_assert(Impl::FunctorAnalysis<Impl::FunctorPatternInterface::REDUCE,RangePolicy<>,FunctorType>::
-                 has_final_member_function,"Calling parallel_reduce without either return value or final function.");
+  static_assert(
+      Impl::FunctorAnalysis<Impl::FunctorPatternInterface::REDUCE,
+                            RangePolicy<>,
+                            FunctorType>::has_final_member_function,
+      "Calling parallel_reduce without either return value or final function.");
 
-  typedef Kokkos::View< value_type
-              , Kokkos::HostSpace
-              , Kokkos::MemoryUnmanaged
-              > result_view_type;
-  result_view_type result_view ;
+  typedef Kokkos::View<value_type, Kokkos::HostSpace, Kokkos::MemoryUnmanaged>
+      result_view_type;
+  result_view_type result_view;
 
-  Impl::ParallelReduceAdaptor<policy_type,FunctorType,result_view_type>::execute("",policy_type(0,policy),functor,result_view);
+  Impl::ParallelReduceAdaptor<policy_type, FunctorType,
+                              result_view_type>::execute("",
+                                                         policy_type(0, policy),
+                                                         functor, result_view);
 }
 
-template< class FunctorType>
-inline
-void parallel_reduce(const std::string& label,
-                     const size_t& policy,
-                     const FunctorType& functor) {
-  typedef typename Impl::ParallelReducePolicyType<void,size_t,FunctorType>::policy_type policy_type;
-  typedef Kokkos::Impl::FunctorValueTraits< FunctorType , void >  ValueTraits ;
-  typedef typename Kokkos::Impl::if_c< (ValueTraits::StaticValueSize != 0)
-                                     , typename ValueTraits::value_type
-                                     , typename ValueTraits::pointer_type
-                                     >::type value_type ;
+template <class FunctorType>
+inline void parallel_reduce(const std::string& label, const size_t& policy,
+                            const FunctorType& functor) {
+  typedef typename Impl::ParallelReducePolicyType<
+      void, size_t, FunctorType>::policy_type policy_type;
+  typedef Kokkos::Impl::FunctorValueTraits<FunctorType, void> ValueTraits;
+  typedef typename Kokkos::Impl::if_c<
+      (ValueTraits::StaticValueSize != 0), typename ValueTraits::value_type,
+      typename ValueTraits::pointer_type>::type value_type;
 
-  static_assert(Impl::FunctorAnalysis<Impl::FunctorPatternInterface::REDUCE,RangePolicy<>,FunctorType>::
-                 has_final_member_function,"Calling parallel_reduce without either return value or final function.");
+  static_assert(
+      Impl::FunctorAnalysis<Impl::FunctorPatternInterface::REDUCE,
+                            RangePolicy<>,
+                            FunctorType>::has_final_member_function,
+      "Calling parallel_reduce without either return value or final function.");
 
-  typedef Kokkos::View< value_type
-              , Kokkos::HostSpace
-              , Kokkos::MemoryUnmanaged
-              > result_view_type;
-  result_view_type result_view ;
+  typedef Kokkos::View<value_type, Kokkos::HostSpace, Kokkos::MemoryUnmanaged>
+      result_view_type;
+  result_view_type result_view;
 
-  Impl::ParallelReduceAdaptor<policy_type,FunctorType,result_view_type>::execute(label,policy_type(0,policy),functor,result_view);
+  Impl::ParallelReduceAdaptor<policy_type, FunctorType,
+                              result_view_type>::execute(label,
+                                                         policy_type(0, policy),
+                                                         functor, result_view);
 }
 
-} //namespace Kokkos
+}  // namespace Kokkos
 
 #ifdef KOKKOS_ENABLE_DEPRECATED_CODE
-//backwards compatiblity for Kokkos::Experimental reducers
-namespace Kokkos { namespace Experimental {
-using Kokkos::Sum;
-using Kokkos::Prod;
-using Kokkos::Min;
-using Kokkos::Max;
-using Kokkos::LAnd;
-using Kokkos::LOr;
+// backwards compatibility for Kokkos::Experimental reducers
+namespace Kokkos {
+namespace Experimental {
 using Kokkos::BAnd;
 using Kokkos::BOr;
-using Kokkos::ValLocScalar;
-using Kokkos::MinLoc;
+using Kokkos::LAnd;
+using Kokkos::LOr;
+using Kokkos::Max;
 using Kokkos::MaxLoc;
-using Kokkos::MinMaxScalar;
+using Kokkos::Min;
+using Kokkos::MinLoc;
 using Kokkos::MinMax;
-using Kokkos::MinMaxLocScalar;
 using Kokkos::MinMaxLoc;
-}} //namespace Kokkos::Experimental
+using Kokkos::MinMaxLocScalar;
+using Kokkos::MinMaxScalar;
+using Kokkos::Prod;
+using Kokkos::Sum;
+using Kokkos::ValLocScalar;
+}  // namespace Experimental
+}  // namespace Kokkos
 #endif
 
-#endif // KOKKOS_PARALLEL_REDUCE_HPP
-
+#endif  // KOKKOS_PARALLEL_REDUCE_HPP
diff --git a/lib/kokkos/core/src/Kokkos_PointerOwnership.hpp b/lib/kokkos/core/src/Kokkos_PointerOwnership.hpp
index be76ec3def..f1f168c38f 100644
--- a/lib/kokkos/core/src/Kokkos_PointerOwnership.hpp
+++ b/lib/kokkos/core/src/Kokkos_PointerOwnership.hpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -63,12 +64,9 @@ using OwningRawPtr = T*;
 template <class T>
 using ObservingRawPtr = T*;
 
-} // end namespace Kokkos
+}  // end namespace Kokkos
 
 //----------------------------------------------------------------------------
 //----------------------------------------------------------------------------
 
-
-
 #endif /* #ifndef KOKKOS_IMPL_POINTEROWNERSHIP_HPP */
-
diff --git a/lib/kokkos/core/src/Kokkos_Profiling_ProfileSection.hpp b/lib/kokkos/core/src/Kokkos_Profiling_ProfileSection.hpp
index b3fd3af70b..3c667f4432 100644
--- a/lib/kokkos/core/src/Kokkos_Profiling_ProfileSection.hpp
+++ b/lib/kokkos/core/src/Kokkos_Profiling_ProfileSection.hpp
@@ -1,45 +1,46 @@
 /*
- //@HEADER
- // ************************************************************************
- //
- //                        Kokkos v. 2.0
- //              Copyright (2014) Sandia Corporation
- //
- // Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
- // the U.S. Government retains certain rights in this software.
- //
- // 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 Corporation nor the names of the
- // contributors may be used to endorse or promote products derived from
- // this software without specific prior written permission.
- //
- // THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "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 SANDIA CORPORATION OR THE
- // 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.
- //
- // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
- //
- // ************************************************************************
- //@HEADER
- */
+//@HEADER
+// ************************************************************************
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
+// the U.S. Government retains certain rights in this software.
+//
+// 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 Corporation nor the names of the
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 NTESS OR THE
+// 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.
+//
+// Questions? Contact Christian R. Trott (crtrott@sandia.gov)
+//
+// ************************************************************************
+//@HEADER
+*/
 
 #ifndef KOKKOSP_PROFILE_SECTION_HPP
 #define KOKKOSP_PROFILE_SECTION_HPP
@@ -53,59 +54,51 @@ namespace Kokkos {
 namespace Profiling {
 
 class ProfilingSection {
+ public:
+  ProfilingSection(const std::string& sectionName) : secName(sectionName) {
+#if defined(KOKKOS_ENABLE_PROFILING)
+    if (Kokkos::Profiling::profileLibraryLoaded()) {
+      Kokkos::Profiling::createProfileSection(secName, &secID);
+    }
+#else
+    secID = 0;
+#endif
+  }
 
-public:
-	ProfilingSection(const std::string& sectionName) :
-		secName(sectionName) {
+  void start() {
+#if defined(KOKKOS_ENABLE_PROFILING)
+    if (Kokkos::Profiling::profileLibraryLoaded()) {
+      Kokkos::Profiling::startSection(secID);
+    }
+#endif
+  }
 
-		#if defined( KOKKOS_ENABLE_PROFILING )
-			if(Kokkos::Profiling::profileLibraryLoaded()) {
-				Kokkos::Profiling::createProfileSection(secName, &secID);
-			}
-		#else
-			secID = 0;
-		#endif
-	}
-	
-	void start() {
-		#if defined( KOKKOS_ENABLE_PROFILING )
-			if(Kokkos::Profiling::profileLibraryLoaded()) {
-				Kokkos::Profiling::startSection(secID);
-			}
-		#endif
-	}
-	
-	void stop() {
-		#if defined( KOKKOS_ENABLE_PROFILING )
-			if(Kokkos::Profiling::profileLibraryLoaded()) {
-				Kokkos::Profiling::stopSection(secID);
-			}
-		#endif
-	}
-	
-	~ProfilingSection() {
-		#if defined( KOKKOS_ENABLE_PROFILING )
-			if(Kokkos::Profiling::profileLibraryLoaded()) {
-				Kokkos::Profiling::destroyProfileSection(secID);
-			}
-		#endif
-	}
-	
-	std::string getName() {
-		return secName;
-	}
-	
-	uint32_t getSectionID() {
-		return secID;
-	}
-	
-protected:
-	const std::string secName;
-	uint32_t secID;
+  void stop() {
+#if defined(KOKKOS_ENABLE_PROFILING)
+    if (Kokkos::Profiling::profileLibraryLoaded()) {
+      Kokkos::Profiling::stopSection(secID);
+    }
+#endif
+  }
 
+  ~ProfilingSection() {
+#if defined(KOKKOS_ENABLE_PROFILING)
+    if (Kokkos::Profiling::profileLibraryLoaded()) {
+      Kokkos::Profiling::destroyProfileSection(secID);
+    }
+#endif
+  }
+
+  std::string getName() { return secName; }
+
+  uint32_t getSectionID() { return secID; }
+
+ protected:
+  const std::string secName;
+  uint32_t secID;
 };
 
-}
-}
+}  // namespace Profiling
+}  // namespace Kokkos
 
-#endif
\ No newline at end of file
+#endif
diff --git a/lib/kokkos/core/src/Kokkos_Qthreads.hpp b/lib/kokkos/core/src/Kokkos_Qthreads.hpp
index 16702f8647..e10bd48593 100644
--- a/lib/kokkos/core/src/Kokkos_Qthreads.hpp
+++ b/lib/kokkos/core/src/Kokkos_Qthreads.hpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -45,7 +46,7 @@
 #define KOKKOS_QTHREADS_HPP
 
 #include <Kokkos_Macros.hpp>
-#if defined( KOKKOS_ENABLE_QTHREADS )
+#if defined(KOKKOS_ENABLE_QTHREADS)
 
 #include <Kokkos_Core_fwd.hpp>
 
@@ -76,9 +77,9 @@ namespace Impl {
 
 class QthreadsExec;
 
-} // namespace Impl
+}  // namespace Impl
 
-} // namespace Kokkos
+}  // namespace Kokkos
 
 /*--------------------------------------------------------------------------*/
 
@@ -86,26 +87,26 @@ namespace Kokkos {
 
 /** \brief  Execution space supported by Qthreads */
 class Qthreads {
-public:
+ public:
   //! \name Type declarations that all Kokkos devices must provide.
   //@{
 
   //! Tag this class as an execution space
-  typedef Qthreads                 execution_space;
-  typedef Kokkos::HostSpace        memory_space;
+  typedef Qthreads execution_space;
+  typedef Kokkos::HostSpace memory_space;
   //! This execution space preferred device_type
-  typedef Kokkos::Device< execution_space, memory_space > device_type;
+  typedef Kokkos::Device<execution_space, memory_space> device_type;
 
-  typedef Kokkos::LayoutRight      array_layout;
-  typedef memory_space::size_type  size_type;
+  typedef Kokkos::LayoutRight array_layout;
+  typedef memory_space::size_type size_type;
 
-  typedef ScratchMemorySpace< Qthreads > scratch_memory_space;
+  typedef ScratchMemorySpace<Qthreads> scratch_memory_space;
 
   //@}
   /*------------------------------------------------------------------------*/
 
   /** \brief  Initialization will construct one or more instances */
-  static Qthreads & instance( int = 0 );
+  static Qthreads& instance(int = 0);
 
   /** \brief  Set the execution space to a "sleep" state.
    *
@@ -143,11 +144,11 @@ public:
   /** \brief  Return maximum amount of concurrency */
   static int concurrency();
 
-  static void initialize( int thread_count );
+  static void initialize(int thread_count);
   static void finalize();
 
   /** \brief Print configuration information to the given output stream. */
-  static void print_configuration( std::ostream &, const bool detail = false );
+  static void print_configuration(std::ostream&, const bool detail = false);
 
   int shepherd_size() const;
   int shepherd_worker_size() const;
@@ -155,7 +156,7 @@ public:
   static const char* name();
 };
 
-} // namespace Kokkos
+}  // namespace Kokkos
 
 /*--------------------------------------------------------------------------*/
 
@@ -163,39 +164,33 @@ namespace Kokkos {
 
 namespace Impl {
 
-template<>
-struct MemorySpaceAccess
-  < Kokkos::Qthreads::memory_space
-  , Kokkos::Qthreads::scratch_memory_space
-  >
-{
+template <>
+struct MemorySpaceAccess<Kokkos::Qthreads::memory_space,
+                         Kokkos::Qthreads::scratch_memory_space> {
   enum { assignable = false };
   enum { accessible = true };
-  enum { deepcopy   = false };
+  enum { deepcopy = false };
 };
 
-template<>
-struct VerifyExecutionCanAccessMemorySpace
-  < Kokkos::Qthreads::memory_space
-  , Kokkos::Qthreads::scratch_memory_space
-  >
-{
+template <>
+struct VerifyExecutionCanAccessMemorySpace<
+    Kokkos::Qthreads::memory_space, Kokkos::Qthreads::scratch_memory_space> {
   enum { value = true };
-  inline static void verify( void ) {}
-  inline static void verify( const void * ) {}
+  inline static void verify(void) {}
+  inline static void verify(const void*) {}
 };
 
-} // namespace Impl
+}  // namespace Impl
 
-} // namespace Kokkos
+}  // namespace Kokkos
 
 /*--------------------------------------------------------------------------*/
 
 #include <Qthreads/Kokkos_QthreadsExec.hpp>
 #include <Qthreads/Kokkos_Qthreads_Parallel.hpp>
-//#include <Qthreads/Kokkos_Qthreads_Task.hpp> // Uncomment when Tasking working.
-//#include <Qthreads/Kokkos_Qthreads_TaskQueue.hpp> // Uncomment when Tasking working.
-
-#endif // #define KOKKOS_ENABLE_QTHREADS
-#endif // #define KOKKOS_QTHREADS_HPP
+//#include <Qthreads/Kokkos_Qthreads_Task.hpp> // Uncomment when Tasking
+// working. #include <Qthreads/Kokkos_Qthreads_TaskQueue.hpp> // Uncomment when
+// Tasking working.
 
+#endif  // #define KOKKOS_ENABLE_QTHREADS
+#endif  // #define KOKKOS_QTHREADS_HPP
diff --git a/lib/kokkos/core/src/Kokkos_ROCm.hpp b/lib/kokkos/core/src/Kokkos_ROCm.hpp
index 96207e73c6..57113452b8 100644
--- a/lib/kokkos/core/src/Kokkos_ROCm.hpp
+++ b/lib/kokkos/core/src/Kokkos_ROCm.hpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -46,12 +47,12 @@
 
 #include <Kokkos_Core_fwd.hpp>
 
-#if defined( KOKKOS_ENABLE_ROCM )
+#if defined(KOKKOS_ENABLE_ROCM)
 
 class dim3 {
-public:
-int x,y,z;
-dim3(int _x, int _y, int _z):x(_x),y(_y),z(_z) {};
+ public:
+  int x, y, z;
+  dim3(int _x, int _y, int _z) : x(_x), y(_y), z(_z){};
 };
 
 #include <ROCm/hc_math_std.hpp>
@@ -74,9 +75,9 @@ dim3(int _x, int _y, int _z):x(_x),y(_y),z(_z) {};
 #include <hc_am.hpp>
 #include <amp_math.h>
 
-#if defined( __HCC_ACCELERATOR__ )
+#if defined(__HCC_ACCELERATOR__)
 
-using namespace ::Concurrency::precise_math ;
+using namespace ::Concurrency::precise_math;
 
 #endif
 
@@ -84,9 +85,9 @@ using namespace ::Concurrency::precise_math ;
 
 namespace Kokkos {
 namespace Impl {
-class ROCmExec ;
-} // namespace Impl
-} // namespace Kokkos
+class ROCmExec;
+}  // namespace Impl
+}  // namespace Kokkos
 
 /*--------------------------------------------------------------------------*/
 
@@ -95,30 +96,29 @@ namespace Experimental {
 /// \class ROCm
 /// \brief Kokkos device for multicore processors in the host memory space.
 class ROCm {
-public:
+ public:
   //------------------------------------
   //! \name Type declarations that all Kokkos devices must provide.
   //@{
 
   //! Tag this class as a kokkos execution space
-  typedef ROCm                  execution_space ;
-  typedef ROCmSpace             memory_space ;
-  typedef Kokkos::Device<execution_space,memory_space> device_type;
+  typedef ROCm execution_space;
+  typedef ROCmSpace memory_space;
+  typedef Kokkos::Device<execution_space, memory_space> device_type;
 
-  typedef LayoutLeft            array_layout ;
-  typedef HostSpace::size_type  size_type ;
+  typedef LayoutLeft array_layout;
+  typedef HostSpace::size_type size_type;
 
-  typedef ScratchMemorySpace< ROCm > scratch_memory_space ;
+  typedef ScratchMemorySpace<ROCm> scratch_memory_space;
 
   ~ROCm() {}
   ROCm();
-//  explicit ROCm( const int instance_id );
-
-  ROCm( ROCm && ) = default ;
-  ROCm( const ROCm & ) = default ;
-  ROCm & operator = ( ROCm && ) = default ;
-  ROCm & operator = ( const ROCm & ) = default ;
+  //  explicit ROCm( const int instance_id );
 
+  ROCm(ROCm&&)      = default;
+  ROCm(const ROCm&) = default;
+  ROCm& operator=(ROCm&&) = default;
+  ROCm& operator=(const ROCm&) = default;
 
   //@}
   //------------------------------------
@@ -126,7 +126,7 @@ public:
   //@{
 
   KOKKOS_INLINE_FUNCTION static int in_parallel() {
-#if defined( __HCC_ACCELERATOR__ )
+#if defined(__HCC_ACCELERATOR__)
     return true;
 #else
     return false;
@@ -134,122 +134,109 @@ public:
   }
 
   /** \brief  Set the device in a "sleep" state. */
-  static bool sleep() ;
+  static bool sleep();
 
   /** \brief Wake the device from the 'sleep' state. A noop for OpenMP. */
-  static bool wake() ;
+  static bool wake();
 
   /** \brief Wait until all dispatched functors complete. A noop for OpenMP. */
   static void impl_static_fence();
 
-  #ifdef KOKKOS_ENABLE_DEPRECATED_CODE
+#ifdef KOKKOS_ENABLE_DEPRECATED_CODE
   static void fence();
-  #else
+#else
   void fence() const;
-  #endif
-
+#endif
 
   /// \brief Print configuration information to the given output stream.
-  static void print_configuration( std::ostream & , const bool detail = false );
+  static void print_configuration(std::ostream&, const bool detail = false);
 
   /// \brief Free any resources being consumed by the device.
-  static void finalize() ;
+  static void finalize();
 
   /** \brief  Initialize the device.
    *
    */
   struct SelectDevice {
-    int rocm_device_id ;
+    int rocm_device_id;
     SelectDevice() : rocm_device_id(1) {}
-    explicit SelectDevice( int id ) : rocm_device_id( id+1 ) {}
+    explicit SelectDevice(int id) : rocm_device_id(id + 1) {}
   };
 
-  int          rocm_device() const { return m_device ; }
-  bool         isAPU();
-  bool         isAPU(int device);
+  int rocm_device() const { return m_device; }
+  bool isAPU();
+  bool isAPU(int device);
 
-  static void initialize( const SelectDevice = SelectDevice());
+  static void initialize(const SelectDevice = SelectDevice());
 
   static int is_initialized();
 
-//  static size_type device_arch();
+  //  static size_type device_arch();
 
-//  static size_type detect_device_count();
+  //  static size_type detect_device_count();
 
-
-  static int concurrency() ;
+  static int concurrency();
   static const char* name();
-private:
-  int          m_device ;
 
+ private:
+  int m_device;
 };
-}
-} // namespace Kokkos
+}  // namespace Experimental
+}  // namespace Kokkos
 
 namespace Kokkos {
 namespace Impl {
 
-template<>
-struct MemorySpaceAccess
-  < Kokkos::Experimental::ROCmSpace
-  , Kokkos::Experimental::ROCm::scratch_memory_space
-  >
-{
+template <>
+struct MemorySpaceAccess<Kokkos::Experimental::ROCmSpace,
+                         Kokkos::Experimental::ROCm::scratch_memory_space> {
   enum { assignable = false };
   enum { accessible = true };
-  enum { deepcopy   = false };
+  enum { deepcopy = false };
 };
 
-template<>
-struct VerifyExecutionCanAccessMemorySpace
-  < Kokkos::Experimental::ROCm::memory_space
-  , Kokkos::Experimental::ROCm::scratch_memory_space
-  >
-{
+template <>
+struct VerifyExecutionCanAccessMemorySpace<
+    Kokkos::Experimental::ROCm::memory_space,
+    Kokkos::Experimental::ROCm::scratch_memory_space> {
   enum { value = true };
-  KOKKOS_INLINE_FUNCTION static void verify( void ) { }
-  KOKKOS_INLINE_FUNCTION static void verify( const void * ) { }
+  KOKKOS_INLINE_FUNCTION static void verify(void) {}
+  KOKKOS_INLINE_FUNCTION static void verify(const void*) {}
 };
 
-template<>
-struct VerifyExecutionCanAccessMemorySpace
-  < Kokkos::HostSpace
-  , Kokkos::Experimental::ROCm::scratch_memory_space
-  >
-{
+template <>
+struct VerifyExecutionCanAccessMemorySpace<
+    Kokkos::HostSpace, Kokkos::Experimental::ROCm::scratch_memory_space> {
   enum { value = false };
-  inline static void verify( void ) { Kokkos::Experimental::ROCmSpace::access_error(); }
-  inline static void verify( const void * p ) { Kokkos::Experimental::ROCmSpace::access_error(p); }
+  inline static void verify(void) {
+    Kokkos::Experimental::ROCmSpace::access_error();
+  }
+  inline static void verify(const void* p) {
+    Kokkos::Experimental::ROCmSpace::access_error(p);
+  }
 };
 
-} // namespace Experimental
-} // namespace Kokkos
-
-
-
-
+}  // namespace Impl
+}  // namespace Kokkos
 
 #define threadIdx_x (hc_get_workitem_id(0))
 #define threadIdx_y (hc_get_workitem_id(1))
 #define threadIdx_z (hc_get_workitem_id(2))
 
-#define blockIdx_x  (hc_get_group_id(0))
-#define blockIdx_y  (hc_get_group_id(1))
-#define blockIdx_z  (hc_get_group_id(2))
+#define blockIdx_x (hc_get_group_id(0))
+#define blockIdx_y (hc_get_group_id(1))
+#define blockIdx_z (hc_get_group_id(2))
 
-#define blockDim_x  (hc_get_group_size(0))
-#define blockDim_y  (hc_get_group_size(1))
-#define blockDim_z  (hc_get_group_size(2))
-
-#define gridDim_x   (hc_get_num_groups(0))
-#define gridDim_y   (hc_get_num_groups(1))
-#define gridDim_z   (hc_get_num_groups(2))
+#define blockDim_x (hc_get_group_size(0))
+#define blockDim_y (hc_get_group_size(1))
+#define blockDim_z (hc_get_group_size(2))
 
+#define gridDim_x (hc_get_num_groups(0))
+#define gridDim_y (hc_get_num_groups(1))
+#define gridDim_z (hc_get_num_groups(2))
 
 #include <ROCm/Kokkos_ROCm_Parallel.hpp>
 #include <ROCm/Kokkos_ROCm_Task.hpp>
 
 #endif
 #endif
-
-
diff --git a/lib/kokkos/core/src/Kokkos_ROCmSpace.hpp b/lib/kokkos/core/src/Kokkos_ROCmSpace.hpp
index f50104e1fe..df13a7c2aa 100644
--- a/lib/kokkos/core/src/Kokkos_ROCmSpace.hpp
+++ b/lib/kokkos/core/src/Kokkos_ROCmSpace.hpp
@@ -1,13 +1,14 @@
 /*
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -36,7 +37,7 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 */
@@ -46,7 +47,7 @@
 
 #include <Kokkos_Core_fwd.hpp>
 
-#if defined( KOKKOS_ENABLE_ROCM )
+#if defined(KOKKOS_ENABLE_ROCM)
 
 #include <iosfwd>
 #include <typeinfo>
@@ -54,7 +55,6 @@
 
 #include <Kokkos_HostSpace.hpp>
 
-
 /*--------------------------------------------------------------------------*/
 
 namespace Kokkos {
@@ -62,30 +62,28 @@ namespace Experimental {
 /** \brief  ROCm on-device memory management */
 
 class ROCmSpace {
-public:
-
+ public:
   //! Tag this class as a kokkos memory space
-  typedef ROCmSpace             memory_space ;
-  typedef Kokkos::Experimental::ROCm          execution_space ;
-  typedef Kokkos::Device<execution_space,memory_space> device_type;
+  typedef ROCmSpace memory_space;
+  typedef Kokkos::Experimental::ROCm execution_space;
+  typedef Kokkos::Device<execution_space, memory_space> device_type;
 
-  typedef unsigned int          size_type ;
+  typedef unsigned int size_type;
 
   /*--------------------------------*/
 
   ROCmSpace();
-  ROCmSpace( ROCmSpace && rhs ) = default ;
-  ROCmSpace( const ROCmSpace & rhs ) = default ;
-  ROCmSpace & operator = ( ROCmSpace && rhs ) = default ;
-  ROCmSpace & operator = ( const ROCmSpace & rhs ) = default ;
-  ~ROCmSpace() = default ;
+  ROCmSpace(ROCmSpace&& rhs)      = default;
+  ROCmSpace(const ROCmSpace& rhs) = default;
+  ROCmSpace& operator=(ROCmSpace&& rhs) = default;
+  ROCmSpace& operator=(const ROCmSpace& rhs) = default;
+  ~ROCmSpace()                               = default;
 
   /**\brief  Allocate untracked memory in the rocm space */
-  void * allocate( const size_t arg_alloc_size ) const ;
+  void* allocate(const size_t arg_alloc_size) const;
 
   /**\brief  Deallocate untracked memory in the rocm space */
-  void deallocate( void * const arg_alloc_ptr
-                 , const size_t arg_alloc_size ) const ;
+  void deallocate(void* const arg_alloc_ptr, const size_t arg_alloc_size) const;
 
   /**\brief Return Name of the MemorySpace */
   static constexpr const char* name() { return m_name; };
@@ -93,23 +91,23 @@ public:
   /*--------------------------------*/
   /** \brief  Error reporting for HostSpace attempt to access ROCmSpace */
   static void access_error();
-  static void access_error( const void * const );
+  static void access_error(const void* const);
 
-private:
-
-  int  m_device ; ///< Which ROCm device
+ private:
+  int m_device;  ///< Which ROCm device
 
   static constexpr const char* m_name = "ROCm";
-  friend class Kokkos::Impl::SharedAllocationRecord< Kokkos::Experimental::ROCmSpace , void > ;
+  friend class Kokkos::Impl::SharedAllocationRecord<
+      Kokkos::Experimental::ROCmSpace, void>;
 };
 
-} // namespace Experimental
+}  // namespace Experimental
 
 namespace Impl {
 
-void * rocm_device_allocate(int);
-void * rocm_hostpinned_allocate(int);
-void rocm_device_free(void * );
+void* rocm_device_allocate(int);
+void* rocm_hostpinned_allocate(int);
+void rocm_device_free(void*);
 
 /// \brief Initialize lock array for arbitrary size atomics.
 ///
@@ -128,10 +126,11 @@ void init_lock_arrays_rocm_space();
 /// If the array is not yet allocated it will do so.
 int* atomic_lock_array_rocm_space_ptr(bool deallocate = false);
 
-/// \brief Retrieve the pointer to the scratch array for team and thread private global memory.
+/// \brief Retrieve the pointer to the scratch array for team and thread private
+/// global memory.
 ///
 /// Team and Thread private scratch allocations in
-/// global memory are aquired via locks.
+/// global memory are acquired via locks.
 /// This function retrieves the lock array pointer.
 /// If the array is not yet allocated it will do so.
 int* scratch_lock_array_rocm_space_ptr(bool deallocate = false);
@@ -143,55 +142,51 @@ int* scratch_lock_array_rocm_space_ptr(bool deallocate = false);
 /// This function retrieves the lock array pointer.
 /// If the array is not yet allocated it will do so.
 int* threadid_lock_array_rocm_space_ptr(bool deallocate = false);
-}
-} // namespace Kokkos
+}  // namespace Impl
+}  // namespace Kokkos
 
 /*--------------------------------------------------------------------------*/
 /*--------------------------------------------------------------------------*/
 
-
 namespace Kokkos {
 namespace Experimental {
 /** \brief  Host memory that is accessible to ROCm execution space
  *          through ROCm's host-pinned memory allocation.
  */
 class ROCmHostPinnedSpace {
-public:
-
+ public:
   //! Tag this class as a kokkos memory space
   /** \brief  Memory is in HostSpace so use the HostSpace::execution_space */
-  typedef HostSpace::execution_space  execution_space ;
-  typedef ROCmHostPinnedSpace         memory_space ;
-  typedef Kokkos::Device<execution_space,memory_space> device_type;
-  typedef unsigned int                size_type ;
+  typedef HostSpace::execution_space execution_space;
+  typedef ROCmHostPinnedSpace memory_space;
+  typedef Kokkos::Device<execution_space, memory_space> device_type;
+  typedef unsigned int size_type;
 
   /*--------------------------------*/
 
   ROCmHostPinnedSpace();
-  ROCmHostPinnedSpace( ROCmHostPinnedSpace && rhs ) = default ;
-  ROCmHostPinnedSpace( const ROCmHostPinnedSpace & rhs ) = default ;
-  ROCmHostPinnedSpace & operator = ( ROCmHostPinnedSpace && rhs ) = default ;
-  ROCmHostPinnedSpace & operator = ( const ROCmHostPinnedSpace & rhs ) = default ;
-  ~ROCmHostPinnedSpace() = default ;
+  ROCmHostPinnedSpace(ROCmHostPinnedSpace&& rhs)      = default;
+  ROCmHostPinnedSpace(const ROCmHostPinnedSpace& rhs) = default;
+  ROCmHostPinnedSpace& operator=(ROCmHostPinnedSpace&& rhs) = default;
+  ROCmHostPinnedSpace& operator=(const ROCmHostPinnedSpace& rhs) = default;
+  ~ROCmHostPinnedSpace()                                         = default;
 
   /**\brief  Allocate untracked memory in the space */
-  void * allocate( const size_t arg_alloc_size ) const ;
+  void* allocate(const size_t arg_alloc_size) const;
 
   /**\brief  Deallocate untracked memory in the space */
-  void deallocate( void * const arg_alloc_ptr
-                 , const size_t arg_alloc_size ) const ;
+  void deallocate(void* const arg_alloc_ptr, const size_t arg_alloc_size) const;
 
   /**\brief Return Name of the MemorySpace */
   static constexpr const char* name() { return m_name; };
 
-private:
-
+ private:
   static constexpr const char* m_name = "ROCmHostPinned";
 
   /*--------------------------------*/
 };
-} // namespace Experimental
-} // namespace Kokkos
+}  // namespace Experimental
+}  // namespace Kokkos
 
 /*--------------------------------------------------------------------------*/
 /*--------------------------------------------------------------------------*/
@@ -199,65 +194,71 @@ private:
 namespace Kokkos {
 namespace Impl {
 
-static_assert( Kokkos::Impl::MemorySpaceAccess< Kokkos::Experimental::ROCmSpace , Kokkos::Experimental::ROCmSpace >::assignable , "" );
+static_assert(Kokkos::Impl::MemorySpaceAccess<
+                  Kokkos::Experimental::ROCmSpace,
+                  Kokkos::Experimental::ROCmSpace>::assignable,
+              "");
 
 //----------------------------------------
 
-template<>
-struct MemorySpaceAccess< Kokkos::HostSpace , Kokkos::Experimental::ROCmSpace > {
+template <>
+struct MemorySpaceAccess<Kokkos::HostSpace, Kokkos::Experimental::ROCmSpace> {
   enum { assignable = false };
   enum { accessible = false };
-  enum { deepcopy   = true };
+  enum { deepcopy = true };
 };
 
-template<>
-struct MemorySpaceAccess< Kokkos::HostSpace , Kokkos::Experimental::ROCmHostPinnedSpace > {
+template <>
+struct MemorySpaceAccess<Kokkos::HostSpace,
+                         Kokkos::Experimental::ROCmHostPinnedSpace> {
   // HostSpace::execution_space == ROCmHostPinnedSpace::execution_space
   enum { assignable = true };
   enum { accessible = true };
-  enum { deepcopy   = true };
+  enum { deepcopy = true };
 };
 
 //----------------------------------------
 
-template<>
-struct MemorySpaceAccess< Kokkos::Experimental::ROCmSpace , Kokkos::HostSpace > {
+template <>
+struct MemorySpaceAccess<Kokkos::Experimental::ROCmSpace, Kokkos::HostSpace> {
   enum { assignable = false };
   enum { accessible = false };
-  enum { deepcopy   = true };
+  enum { deepcopy = true };
 };
 
-template<>
-struct MemorySpaceAccess< Kokkos::Experimental::ROCmSpace , Kokkos::Experimental::ROCmHostPinnedSpace > {
+template <>
+struct MemorySpaceAccess<Kokkos::Experimental::ROCmSpace,
+                         Kokkos::Experimental::ROCmHostPinnedSpace> {
   // ROCmSpace::execution_space != ROCmHostPinnedSpace::execution_space
   enum { assignable = false };
-  enum { accessible = true }; // ROCmSpace::execution_space
-  enum { deepcopy   = true };
+  enum { accessible = true };  // ROCmSpace::execution_space
+  enum { deepcopy = true };
 };
 
-
 //----------------------------------------
 // ROCmHostPinnedSpace::execution_space == HostSpace::execution_space
 // ROCmHostPinnedSpace accessible to both ROCm and Host
 
-template<>
-struct MemorySpaceAccess< Kokkos::Experimental::ROCmHostPinnedSpace , Kokkos::HostSpace > {
-  enum { assignable = false }; // Cannot access from ROCm
-  enum { accessible = true };  // ROCmHostPinnedSpace::execution_space
-  enum { deepcopy   = true };
+template <>
+struct MemorySpaceAccess<Kokkos::Experimental::ROCmHostPinnedSpace,
+                         Kokkos::HostSpace> {
+  enum { assignable = false };  // Cannot access from ROCm
+  enum { accessible = true };   // ROCmHostPinnedSpace::execution_space
+  enum { deepcopy = true };
 };
 
-template<>
-struct MemorySpaceAccess< Kokkos::Experimental::ROCmHostPinnedSpace , Kokkos::Experimental::ROCmSpace > {
-  enum { assignable = false }; // Cannot access from Host
+template <>
+struct MemorySpaceAccess<Kokkos::Experimental::ROCmHostPinnedSpace,
+                         Kokkos::Experimental::ROCmSpace> {
+  enum { assignable = false };  // Cannot access from Host
   enum { accessible = false };
-  enum { deepcopy   = true };
+  enum { deepcopy = true };
 };
 
-};
+};  // namespace Impl
 //----------------------------------------
 
-} // namespace Kokkos::Impl
+}  // namespace Kokkos
 
 /*--------------------------------------------------------------------------*/
 /*--------------------------------------------------------------------------*/
@@ -265,171 +266,187 @@ struct MemorySpaceAccess< Kokkos::Experimental::ROCmHostPinnedSpace , Kokkos::Ex
 namespace Kokkos {
 namespace Impl {
 
-hc::completion_future DeepCopyAsyncROCm( void * dst , const void * src , size_t n);
+hc::completion_future DeepCopyAsyncROCm(void* dst, const void* src, size_t n);
 
-template<> struct DeepCopy< Kokkos::Experimental::ROCmSpace , Kokkos::Experimental::ROCmSpace , Kokkos::Experimental::ROCm>
-{
-  DeepCopy( void * dst , const void * src , size_t );
-  DeepCopy( const Kokkos::Experimental::ROCm & , void * dst , const void * src , size_t );
+template <>
+struct DeepCopy<Kokkos::Experimental::ROCmSpace,
+                Kokkos::Experimental::ROCmSpace, Kokkos::Experimental::ROCm> {
+  DeepCopy(void* dst, const void* src, size_t);
+  DeepCopy(const Kokkos::Experimental::ROCm&, void* dst, const void* src,
+           size_t);
 };
 
-template<> struct DeepCopy< Kokkos::Experimental::ROCmSpace , HostSpace , Kokkos::Experimental::ROCm >
-{
-  DeepCopy( void * dst , const void * src , size_t );
-  DeepCopy( const Kokkos::Experimental::ROCm & , void * dst , const void * src , size_t );
+template <>
+struct DeepCopy<Kokkos::Experimental::ROCmSpace, HostSpace,
+                Kokkos::Experimental::ROCm> {
+  DeepCopy(void* dst, const void* src, size_t);
+  DeepCopy(const Kokkos::Experimental::ROCm&, void* dst, const void* src,
+           size_t);
 };
 
-template<> struct DeepCopy< HostSpace , Kokkos::Experimental::ROCmSpace , Kokkos::Experimental::ROCm >
-{
-  DeepCopy( void * dst , const void * src , size_t );
-  DeepCopy( const Kokkos::Experimental::ROCm & , void * dst , const void * src , size_t );
+template <>
+struct DeepCopy<HostSpace, Kokkos::Experimental::ROCmSpace,
+                Kokkos::Experimental::ROCm> {
+  DeepCopy(void* dst, const void* src, size_t);
+  DeepCopy(const Kokkos::Experimental::ROCm&, void* dst, const void* src,
+           size_t);
 };
 
-template<class ExecutionSpace> struct DeepCopy< Kokkos::Experimental::ROCmSpace , Kokkos::Experimental::ROCmSpace , ExecutionSpace >
-{
-  inline
-  DeepCopy( void * dst , const void * src , size_t n )
-  { (void) DeepCopy< Kokkos::Experimental::ROCmSpace , Kokkos::Experimental::ROCmSpace , Kokkos::Experimental::ROCm >( dst , src , n ); }
+template <class ExecutionSpace>
+struct DeepCopy<Kokkos::Experimental::ROCmSpace,
+                Kokkos::Experimental::ROCmSpace, ExecutionSpace> {
+  inline DeepCopy(void* dst, const void* src, size_t n) {
+    (void)DeepCopy<Kokkos::Experimental::ROCmSpace,
+                   Kokkos::Experimental::ROCmSpace, Kokkos::Experimental::ROCm>(
+        dst, src, n);
+  }
 
-  inline
-  DeepCopy( const ExecutionSpace& exec, void * dst , const void * src , size_t n )
-  {
+  inline DeepCopy(const ExecutionSpace& exec, void* dst, const void* src,
+                  size_t n) {
     exec.fence();
-    hc::completion_future fut = DeepCopyAsyncROCm (dst,src,n);
+    hc::completion_future fut = DeepCopyAsyncROCm(dst, src, n);
     fut.wait();
-//    DeepCopy (dst,src,n);
+    //    DeepCopy (dst,src,n);
   }
 };
 
-template<class ExecutionSpace> struct DeepCopy< Kokkos::Experimental::ROCmSpace , HostSpace , ExecutionSpace >
-{
-  inline
-  DeepCopy( void * dst , const void * src , size_t n )
-  { (void) DeepCopy< Kokkos::Experimental::ROCmSpace , HostSpace , Kokkos::Experimental::ROCm>( dst , src , n ); }
+template <class ExecutionSpace>
+struct DeepCopy<Kokkos::Experimental::ROCmSpace, HostSpace, ExecutionSpace> {
+  inline DeepCopy(void* dst, const void* src, size_t n) {
+    (void)DeepCopy<Kokkos::Experimental::ROCmSpace, HostSpace,
+                   Kokkos::Experimental::ROCm>(dst, src, n);
+  }
 
-  inline
-  DeepCopy( const ExecutionSpace& exec, void * dst , const void * src , size_t n )
-  {
+  inline DeepCopy(const ExecutionSpace& exec, void* dst, const void* src,
+                  size_t n) {
     exec.fence();
-    DeepCopy (dst,src,n);
+    DeepCopy(dst, src, n);
   }
 };
 
-template<class ExecutionSpace>
-struct DeepCopy< HostSpace , Kokkos::Experimental::ROCmSpace , ExecutionSpace >
-{
-  inline
-  DeepCopy( void * dst , const void * src , size_t n )
-  { (void) DeepCopy< HostSpace , Kokkos::Experimental::ROCmSpace , Kokkos::Experimental::ROCm >( dst , src , n ); }
+template <class ExecutionSpace>
+struct DeepCopy<HostSpace, Kokkos::Experimental::ROCmSpace, ExecutionSpace> {
+  inline DeepCopy(void* dst, const void* src, size_t n) {
+    (void)DeepCopy<HostSpace, Kokkos::Experimental::ROCmSpace,
+                   Kokkos::Experimental::ROCm>(dst, src, n);
+  }
 
-  inline
-  DeepCopy( const ExecutionSpace& exec, void * dst , const void * src , size_t n )
-  {
+  inline DeepCopy(const ExecutionSpace& exec, void* dst, const void* src,
+                  size_t n) {
     exec.fence();
-    DeepCopy (dst,src,n);
+    DeepCopy(dst, src, n);
   }
 };
 
-template<> struct DeepCopy< Kokkos::Experimental::ROCmHostPinnedSpace , Kokkos::Experimental::ROCmHostPinnedSpace , Kokkos::Experimental::ROCm>
-{
-  DeepCopy( void * dst , const void * src , size_t );
-  DeepCopy( const Kokkos::Experimental::ROCm & , void * dst , const void * src , size_t );
+template <>
+struct DeepCopy<Kokkos::Experimental::ROCmHostPinnedSpace,
+                Kokkos::Experimental::ROCmHostPinnedSpace,
+                Kokkos::Experimental::ROCm> {
+  DeepCopy(void* dst, const void* src, size_t);
+  DeepCopy(const Kokkos::Experimental::ROCm&, void* dst, const void* src,
+           size_t);
 };
 
-template<> struct DeepCopy< Kokkos::Experimental::ROCmHostPinnedSpace , HostSpace , Kokkos::Experimental::ROCm >
-{
-  DeepCopy( void * dst , const void * src , size_t );
-  DeepCopy( const Kokkos::Experimental::ROCm & , void * dst , const void * src , size_t );
+template <>
+struct DeepCopy<Kokkos::Experimental::ROCmHostPinnedSpace, HostSpace,
+                Kokkos::Experimental::ROCm> {
+  DeepCopy(void* dst, const void* src, size_t);
+  DeepCopy(const Kokkos::Experimental::ROCm&, void* dst, const void* src,
+           size_t);
 };
 
-template<> struct DeepCopy< HostSpace , Kokkos::Experimental::ROCmHostPinnedSpace , Kokkos::Experimental::ROCm >
-{
-  DeepCopy( void * dst , const void * src , size_t );
-  DeepCopy( const Kokkos::Experimental::ROCm & , void * dst , const void * src , size_t );
+template <>
+struct DeepCopy<HostSpace, Kokkos::Experimental::ROCmHostPinnedSpace,
+                Kokkos::Experimental::ROCm> {
+  DeepCopy(void* dst, const void* src, size_t);
+  DeepCopy(const Kokkos::Experimental::ROCm&, void* dst, const void* src,
+           size_t);
 };
 
-template<class ExecutionSpace>
-struct DeepCopy< Kokkos::Experimental::ROCmSpace , Kokkos::Experimental::ROCmHostPinnedSpace , ExecutionSpace>
-{
-  inline
-  DeepCopy( void * dst , const void * src , size_t n )
-  { (void) DeepCopy< Kokkos::Experimental::ROCmSpace , HostSpace , Kokkos::Experimental::ROCm >( dst , src , n ); }
+template <class ExecutionSpace>
+struct DeepCopy<Kokkos::Experimental::ROCmSpace,
+                Kokkos::Experimental::ROCmHostPinnedSpace, ExecutionSpace> {
+  inline DeepCopy(void* dst, const void* src, size_t n) {
+    (void)DeepCopy<Kokkos::Experimental::ROCmSpace, HostSpace,
+                   Kokkos::Experimental::ROCm>(dst, src, n);
+  }
 
-  inline
-  DeepCopy( const ExecutionSpace& exec, void * dst , const void * src , size_t n )
-  {
+  inline DeepCopy(const ExecutionSpace& exec, void* dst, const void* src,
+                  size_t n) {
     exec.fence();
-    hc::completion_future fut = DeepCopyAsyncROCm (dst,src,n);
+    hc::completion_future fut = DeepCopyAsyncROCm(dst, src, n);
     fut.wait();
-//    DeepCopyROCm (dst,src,n);
+    //    DeepCopyROCm (dst,src,n);
   }
 };
 
-template<class ExecutionSpace> struct DeepCopy< Kokkos::Experimental::ROCmHostPinnedSpace , Kokkos::Experimental::ROCmSpace , ExecutionSpace >
-{
-  inline
-  DeepCopy( void * dst , const void * src , size_t n )
-  { (void) DeepCopy< HostSpace , Kokkos::Experimental::ROCmSpace , Kokkos::Experimental::ROCm >( dst , src , n ); }
+template <class ExecutionSpace>
+struct DeepCopy<Kokkos::Experimental::ROCmHostPinnedSpace,
+                Kokkos::Experimental::ROCmSpace, ExecutionSpace> {
+  inline DeepCopy(void* dst, const void* src, size_t n) {
+    (void)DeepCopy<HostSpace, Kokkos::Experimental::ROCmSpace,
+                   Kokkos::Experimental::ROCm>(dst, src, n);
+  }
 
-  inline
-  DeepCopy( const ExecutionSpace& exec, void * dst , const void * src , size_t n )
-  {
+  inline DeepCopy(const ExecutionSpace& exec, void* dst, const void* src,
+                  size_t n) {
     exec.fence();
-    hc::completion_future fut = DeepCopyAsyncROCm (dst,src,n);
+    hc::completion_future fut = DeepCopyAsyncROCm(dst, src, n);
     fut.wait();
-//    DeepCopyROCm (dst,src,n);
+    //    DeepCopyROCm (dst,src,n);
   }
 };
 
+template <class ExecutionSpace>
+struct DeepCopy<Kokkos::Experimental::ROCmHostPinnedSpace,
+                Kokkos::Experimental::ROCmHostPinnedSpace, ExecutionSpace> {
+  inline DeepCopy(void* dst, const void* src, size_t n) {
+    (void)DeepCopy<Kokkos::Experimental::ROCmHostPinnedSpace,
+                   Kokkos::Experimental::ROCmHostPinnedSpace,
+                   Kokkos::Experimental::ROCm>(dst, src, n);
+  }
 
-
-template<class ExecutionSpace> struct DeepCopy< Kokkos::Experimental::ROCmHostPinnedSpace , Kokkos::Experimental::ROCmHostPinnedSpace , ExecutionSpace >
-{
-  inline
-  DeepCopy( void * dst , const void * src , size_t n )
-  { (void) DeepCopy< Kokkos::Experimental::ROCmHostPinnedSpace , Kokkos::Experimental::ROCmHostPinnedSpace , Kokkos::Experimental::ROCm >( dst , src , n ); }
-
-  inline
-  DeepCopy( const ExecutionSpace& exec, void * dst , const void * src , size_t n )
-  {
+  inline DeepCopy(const ExecutionSpace& exec, void* dst, const void* src,
+                  size_t n) {
     exec.fence();
-//    hc::completion_future fut = DeepCopyAsyncROCm (dst,src,n);
-//    fut.wait();
-//    DeepCopyAsyncROCm (dst,src,n);
-    DeepCopy (dst,src,n);
+    //    hc::completion_future fut = DeepCopyAsyncROCm (dst,src,n);
+    //    fut.wait();
+    //    DeepCopyAsyncROCm (dst,src,n);
+    DeepCopy(dst, src, n);
   }
 };
 
-template<class ExecutionSpace> struct DeepCopy< Kokkos::Experimental::ROCmHostPinnedSpace , HostSpace , ExecutionSpace >
-{
-  inline
-  DeepCopy( void * dst , const void * src , size_t n )
-  { (void) DeepCopy< Kokkos::Experimental::ROCmHostPinnedSpace , HostSpace , Kokkos::Experimental::ROCm>( dst , src , n ); }
+template <class ExecutionSpace>
+struct DeepCopy<Kokkos::Experimental::ROCmHostPinnedSpace, HostSpace,
+                ExecutionSpace> {
+  inline DeepCopy(void* dst, const void* src, size_t n) {
+    (void)DeepCopy<Kokkos::Experimental::ROCmHostPinnedSpace, HostSpace,
+                   Kokkos::Experimental::ROCm>(dst, src, n);
+  }
 
-  inline
-  DeepCopy( const ExecutionSpace& exec, void * dst , const void * src , size_t n )
-  {
+  inline DeepCopy(const ExecutionSpace& exec, void* dst, const void* src,
+                  size_t n) {
     exec.fence();
-    DeepCopy (dst,src,n);
+    DeepCopy(dst, src, n);
   }
 };
 
-template<class ExecutionSpace>
-struct DeepCopy< HostSpace , Kokkos::Experimental::ROCmHostPinnedSpace , ExecutionSpace >
-{
-  inline
-  DeepCopy( void * dst , const void * src , size_t n )
-  { (void) DeepCopy< HostSpace , Kokkos::Experimental::ROCmHostPinnedSpace , Kokkos::Experimental::ROCm >( dst , src , n ); }
+template <class ExecutionSpace>
+struct DeepCopy<HostSpace, Kokkos::Experimental::ROCmHostPinnedSpace,
+                ExecutionSpace> {
+  inline DeepCopy(void* dst, const void* src, size_t n) {
+    (void)DeepCopy<HostSpace, Kokkos::Experimental::ROCmHostPinnedSpace,
+                   Kokkos::Experimental::ROCm>(dst, src, n);
+  }
 
-  inline
-  DeepCopy( const ExecutionSpace& exec, void * dst , const void * src , size_t n )
-  {
+  inline DeepCopy(const ExecutionSpace& exec, void* dst, const void* src,
+                  size_t n) {
     exec.fence();
-    DeepCopy (dst,src,n);
+    DeepCopy(dst, src, n);
   }
 };
-} // namespace Impl
-} // namespace Kokkos
+}  // namespace Impl
+}  // namespace Kokkos
 
 //----------------------------------------------------------------------------
 //----------------------------------------------------------------------------
@@ -438,60 +455,70 @@ namespace Kokkos {
 namespace Impl {
 
 /** Running in ROCmSpace attempting to access HostSpace: error */
-template<>
-struct VerifyExecutionCanAccessMemorySpace< Kokkos::Experimental::ROCmSpace , Kokkos::HostSpace >
-{
+template <>
+struct VerifyExecutionCanAccessMemorySpace<Kokkos::Experimental::ROCmSpace,
+                                           Kokkos::HostSpace> {
   enum { value = false };
-  KOKKOS_INLINE_FUNCTION static void verify( void )
-    { Kokkos::abort("ROCm code attempted to access HostSpace memory"); }
+  KOKKOS_INLINE_FUNCTION static void verify(void) {
+    Kokkos::abort("ROCm code attempted to access HostSpace memory");
+  }
 
-  KOKKOS_INLINE_FUNCTION static void verify( const void * )
-    { Kokkos::abort("ROCm code attempted to access HostSpace memory"); }
+  KOKKOS_INLINE_FUNCTION static void verify(const void*) {
+    Kokkos::abort("ROCm code attempted to access HostSpace memory");
+  }
 };
 
 /** Running in ROCmSpace accessing ROCmHostPinnedSpace: ok */
-template<>
-struct VerifyExecutionCanAccessMemorySpace< Kokkos::Experimental::ROCmSpace , Kokkos::Experimental::ROCmHostPinnedSpace >
-{
+template <>
+struct VerifyExecutionCanAccessMemorySpace<
+    Kokkos::Experimental::ROCmSpace,
+    Kokkos::Experimental::ROCmHostPinnedSpace> {
   enum { value = true };
-  KOKKOS_INLINE_FUNCTION static void verify( void ) { }
-  KOKKOS_INLINE_FUNCTION static void verify( const void * ) { }
+  KOKKOS_INLINE_FUNCTION static void verify(void) {}
+  KOKKOS_INLINE_FUNCTION static void verify(const void*) {}
 };
 
 /** Running in ROCmSpace attempting to access an unknown space: error */
-template< class OtherSpace >
+template <class OtherSpace>
 struct VerifyExecutionCanAccessMemorySpace<
-  typename enable_if< ! is_same<Kokkos::Experimental::ROCmSpace,OtherSpace>::value , Kokkos::Experimental::ROCmSpace >::type ,
-  OtherSpace >
-{
+    typename enable_if<
+        !is_same<Kokkos::Experimental::ROCmSpace, OtherSpace>::value,
+        Kokkos::Experimental::ROCmSpace>::type,
+    OtherSpace> {
   enum { value = false };
-  KOKKOS_INLINE_FUNCTION static void verify( void )
-    { Kokkos::abort("ROCm code attempted to access unknown Space memory"); }
+  KOKKOS_INLINE_FUNCTION static void verify(void) {
+    Kokkos::abort("ROCm code attempted to access unknown Space memory");
+  }
 
-  KOKKOS_INLINE_FUNCTION static void verify( const void * )
-    { Kokkos::abort("ROCm code attempted to access unknown Space memory"); }
+  KOKKOS_INLINE_FUNCTION static void verify(const void*) {
+    Kokkos::abort("ROCm code attempted to access unknown Space memory");
+  }
 };
 
 //----------------------------------------------------------------------------
 /** Running in HostSpace attempting to access ROCmSpace */
-template<>
-struct VerifyExecutionCanAccessMemorySpace< Kokkos::HostSpace , Kokkos::Experimental::ROCmSpace >
-{
+template <>
+struct VerifyExecutionCanAccessMemorySpace<Kokkos::HostSpace,
+                                           Kokkos::Experimental::ROCmSpace> {
   enum { value = false };
-  inline static void verify( void ) { Kokkos::Experimental::ROCmSpace::access_error(); }
-  inline static void verify( const void * p ) { Kokkos::Experimental::ROCmSpace::access_error(p); }
+  inline static void verify(void) {
+    Kokkos::Experimental::ROCmSpace::access_error();
+  }
+  inline static void verify(const void* p) {
+    Kokkos::Experimental::ROCmSpace::access_error(p);
+  }
 };
 
 /** Running in HostSpace accessing ROCmHostPinnedSpace is OK */
-template<>
-struct VerifyExecutionCanAccessMemorySpace< Kokkos::HostSpace , Kokkos::Experimental::ROCmHostPinnedSpace >
-{
+template <>
+struct VerifyExecutionCanAccessMemorySpace<
+    Kokkos::HostSpace, Kokkos::Experimental::ROCmHostPinnedSpace> {
   enum { value = true };
-  KOKKOS_INLINE_FUNCTION static void verify( void ) {}
-  KOKKOS_INLINE_FUNCTION static void verify( const void * ) {}
+  KOKKOS_INLINE_FUNCTION static void verify(void) {}
+  KOKKOS_INLINE_FUNCTION static void verify(const void*) {}
 };
-} // namespace Impl
-} // namespace Kokkos
+}  // namespace Impl
+}  // namespace Kokkos
 
 //----------------------------------------------------------------------------
 //----------------------------------------------------------------------------
@@ -499,128 +526,112 @@ struct VerifyExecutionCanAccessMemorySpace< Kokkos::HostSpace , Kokkos::Experime
 namespace Kokkos {
 namespace Impl {
 
-template<>
-class SharedAllocationRecord< Kokkos::Experimental::ROCmSpace , void >
-  : public SharedAllocationRecord< void , void >
-{
-private:
+template <>
+class SharedAllocationRecord<Kokkos::Experimental::ROCmSpace, void>
+    : public SharedAllocationRecord<void, void> {
+ private:
+  typedef SharedAllocationRecord<void, void> RecordBase;
 
+  SharedAllocationRecord(const SharedAllocationRecord&) = delete;
+  SharedAllocationRecord& operator=(const SharedAllocationRecord&) = delete;
 
-  typedef SharedAllocationRecord< void , void >  RecordBase ;
-
-  SharedAllocationRecord( const SharedAllocationRecord & ) = delete ;
-  SharedAllocationRecord & operator = ( const SharedAllocationRecord & ) = delete ;
-
-  static void deallocate( RecordBase * );
+  static void deallocate(RecordBase*);
 
 #ifdef KOKKOS_DEBUG
-  static RecordBase s_root_record ;
+  static RecordBase s_root_record;
 #endif
 
-  const Kokkos::Experimental::ROCmSpace m_space ;
-
-protected:
+  const Kokkos::Experimental::ROCmSpace m_space;
 
+ protected:
   ~SharedAllocationRecord();
 
-  SharedAllocationRecord( const Kokkos::Experimental::ROCmSpace        & arg_space
-                        , const std::string              & arg_label
-                        , const size_t                     arg_alloc_size
-                        , const RecordBase::function_type  arg_dealloc = & deallocate
-                        );
+  SharedAllocationRecord(
+      const Kokkos::Experimental::ROCmSpace& arg_space,
+      const std::string& arg_label, const size_t arg_alloc_size,
+      const RecordBase::function_type arg_dealloc = &deallocate);
 
-public:
+ public:
+  std::string get_label() const;
 
-  std::string get_label() const ;
-
-  static SharedAllocationRecord * allocate( const Kokkos::Experimental::ROCmSpace &  arg_space
-                                          , const std::string       &  arg_label
-                                          , const size_t               arg_alloc_size );
+  static SharedAllocationRecord* allocate(
+      const Kokkos::Experimental::ROCmSpace& arg_space,
+      const std::string& arg_label, const size_t arg_alloc_size);
 
   /**\brief  Allocate tracked memory in the space */
-  static
-  void * allocate_tracked( const Kokkos::Experimental::ROCmSpace & arg_space
-                         , const std::string & arg_label
-                         , const size_t arg_alloc_size );
+  static void* allocate_tracked(
+      const Kokkos::Experimental::ROCmSpace& arg_space,
+      const std::string& arg_label, const size_t arg_alloc_size);
 
   /**\brief  Reallocate tracked memory in the space */
-  static
-  void * reallocate_tracked( void * const arg_alloc_ptr
-                           , const size_t arg_alloc_size );
+  static void* reallocate_tracked(void* const arg_alloc_ptr,
+                                  const size_t arg_alloc_size);
 
   /**\brief  Deallocate tracked memory in the space */
-  static
-  void deallocate_tracked( void * const arg_alloc_ptr );
+  static void deallocate_tracked(void* const arg_alloc_ptr);
 
-  static SharedAllocationRecord * get_record( void * arg_alloc_ptr );
+  static SharedAllocationRecord* get_record(void* arg_alloc_ptr);
 
-  static void print_records( std::ostream & , const Kokkos::Experimental::ROCmSpace & , bool detail = false );
+  static void print_records(std::ostream&,
+                            const Kokkos::Experimental::ROCmSpace&,
+                            bool detail = false);
 };
 
-template<>
-class SharedAllocationRecord< Kokkos::Experimental::ROCmHostPinnedSpace , void >
-  : public SharedAllocationRecord< void , void >
-{
-private:
+template <>
+class SharedAllocationRecord<Kokkos::Experimental::ROCmHostPinnedSpace, void>
+    : public SharedAllocationRecord<void, void> {
+ private:
+  typedef SharedAllocationRecord<void, void> RecordBase;
 
-  typedef SharedAllocationRecord< void , void >  RecordBase ;
+  SharedAllocationRecord(const SharedAllocationRecord&) = delete;
+  SharedAllocationRecord& operator=(const SharedAllocationRecord&) = delete;
 
-  SharedAllocationRecord( const SharedAllocationRecord & ) = delete ;
-  SharedAllocationRecord & operator = ( const SharedAllocationRecord & ) = delete ;
-
-  static void deallocate( RecordBase * );
+  static void deallocate(RecordBase*);
 
 #ifdef KOKKOS_DEBUG
-  static RecordBase s_root_record ;
+  static RecordBase s_root_record;
 #endif
 
-  const Kokkos::Experimental::ROCmHostPinnedSpace m_space ;
-
-protected:
+  const Kokkos::Experimental::ROCmHostPinnedSpace m_space;
 
+ protected:
   ~SharedAllocationRecord();
   SharedAllocationRecord() : RecordBase(), m_space() {}
 
-  SharedAllocationRecord( const Kokkos::Experimental::ROCmHostPinnedSpace     & arg_space
-                        , const std::string              & arg_label
-                        , const size_t                     arg_alloc_size
-                        , const RecordBase::function_type  arg_dealloc = & deallocate
-                        );
+  SharedAllocationRecord(
+      const Kokkos::Experimental::ROCmHostPinnedSpace& arg_space,
+      const std::string& arg_label, const size_t arg_alloc_size,
+      const RecordBase::function_type arg_dealloc = &deallocate);
 
-public:
+ public:
+  std::string get_label() const;
 
-  std::string get_label() const ;
-
-  static SharedAllocationRecord * allocate( const Kokkos::Experimental::ROCmHostPinnedSpace &  arg_space
-                                          , const std::string          &  arg_label
-                                          , const size_t                  arg_alloc_size
-                                          );
+  static SharedAllocationRecord* allocate(
+      const Kokkos::Experimental::ROCmHostPinnedSpace& arg_space,
+      const std::string& arg_label, const size_t arg_alloc_size);
   /**\brief  Allocate tracked memory in the space */
-  static
-  void * allocate_tracked( const Kokkos::Experimental::ROCmHostPinnedSpace & arg_space
-                         , const std::string & arg_label
-                         , const size_t arg_alloc_size );
+  static void* allocate_tracked(
+      const Kokkos::Experimental::ROCmHostPinnedSpace& arg_space,
+      const std::string& arg_label, const size_t arg_alloc_size);
 
   /**\brief  Reallocate tracked memory in the space */
-  static
-  void * reallocate_tracked( void * const arg_alloc_ptr
-                           , const size_t arg_alloc_size );
+  static void* reallocate_tracked(void* const arg_alloc_ptr,
+                                  const size_t arg_alloc_size);
 
   /**\brief  Deallocate tracked memory in the space */
-  static
-  void deallocate_tracked( void * const arg_alloc_ptr );
+  static void deallocate_tracked(void* const arg_alloc_ptr);
 
+  static SharedAllocationRecord* get_record(void* arg_alloc_ptr);
 
-  static SharedAllocationRecord * get_record( void * arg_alloc_ptr );
-
-  static void print_records( std::ostream & , const Kokkos::Experimental::ROCmHostPinnedSpace & , bool detail = false );
+  static void print_records(std::ostream&,
+                            const Kokkos::Experimental::ROCmHostPinnedSpace&,
+                            bool detail = false);
 };
-} // namespace Impl
-} // namespace Kokkos
+}  // namespace Impl
+}  // namespace Kokkos
 
 //----------------------------------------------------------------------------
 //----------------------------------------------------------------------------
 
 #endif /* #if defined( KOKKOS_ENABLE_ROCM ) */
 #endif /* #define KOKKOS_ROCMSPACE_HPP */
-
diff --git a/lib/kokkos/core/src/Kokkos_ScratchSpace.hpp b/lib/kokkos/core/src/Kokkos_ScratchSpace.hpp
index 86d803ccc9..c2337f08a1 100644
--- a/lib/kokkos/core/src/Kokkos_ScratchSpace.hpp
+++ b/lib/kokkos/core/src/Kokkos_ScratchSpace.hpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -55,158 +56,157 @@ namespace Kokkos {
 /** \brief  Scratch memory space associated with an execution space.
  *
  */
-template< class ExecSpace >
+template <class ExecSpace>
 class ScratchMemorySpace {
-  static_assert (is_execution_space<ExecSpace>::value,"Instantiating ScratchMemorySpace on non-execution-space type.");
-public:
+  static_assert(
+      is_execution_space<ExecSpace>::value,
+      "Instantiating ScratchMemorySpace on non-execution-space type.");
 
+ public:
   // Alignment of memory chunks returned by 'get'
   // must be a power of two
   enum { ALIGN = 8 };
 
-private:
-
-  mutable char * m_iter_L0 ;
-  char *         m_end_L0 ;
-  mutable char * m_iter_L1 ;
-  char *         m_end_L1 ;
-
+ private:
+  mutable char* m_iter_L0;
+  char* m_end_L0;
+  mutable char* m_iter_L1;
+  char* m_end_L1;
 
   mutable int m_multiplier;
   mutable int m_offset;
   mutable int m_default_level;
 
   ScratchMemorySpace();
-  ScratchMemorySpace & operator = ( const ScratchMemorySpace & );
+  ScratchMemorySpace& operator=(const ScratchMemorySpace&);
 
-  enum { MASK = ALIGN - 1 }; // Alignment used by View::shmem_size
-
-public:
+  enum { MASK = ALIGN - 1 };  // Alignment used by View::shmem_size
 
+ public:
   //! Tag this class as a memory space
-  typedef ScratchMemorySpace                memory_space ;
-  typedef ExecSpace                         execution_space ;
+  typedef ScratchMemorySpace memory_space;
+  typedef ExecSpace execution_space;
   //! This execution space preferred device_type
-  typedef Kokkos::Device<execution_space,memory_space> device_type;
+  typedef Kokkos::Device<execution_space, memory_space> device_type;
 
-  typedef typename ExecSpace::array_layout  array_layout ;
-  typedef typename ExecSpace::size_type     size_type ;
+  typedef typename ExecSpace::array_layout array_layout;
+  typedef typename ExecSpace::size_type size_type;
 
-  template< typename IntType >
-  KOKKOS_INLINE_FUNCTION static
-  IntType align( const IntType & size )
-    { return ( size + MASK ) & ~MASK ; }
+  template <typename IntType>
+  KOKKOS_INLINE_FUNCTION static IntType align(const IntType& size) {
+    return (size + MASK) & ~MASK;
+  }
 
-  template< typename IntType >
-  KOKKOS_INLINE_FUNCTION
-  void* get_shmem (const IntType& size, int level = -1) const {
-    if(level == -1)
-      level = m_default_level;
-    if(level == 0) {
-      void* tmp = m_iter_L0 + m_offset * align (size);
-      if (m_end_L0 < (m_iter_L0 += align (size) * m_multiplier)) {
-        m_iter_L0 -= align (size) * m_multiplier; // put it back like it was
-        #ifdef KOKKOS_DEBUG
+  template <typename IntType>
+  KOKKOS_INLINE_FUNCTION void* get_shmem(const IntType& size,
+                                         int level = -1) const {
+    if (level == -1) level = m_default_level;
+    if (level == 0) {
+      void* tmp = m_iter_L0 + m_offset * align(size);
+      if (m_end_L0 < (m_iter_L0 += align(size) * m_multiplier)) {
+        m_iter_L0 -= align(size) * m_multiplier;  // put it back like it was
+#ifdef KOKKOS_DEBUG
         // mfh 23 Jun 2015: printf call consumes 25 registers
         // in a CUDA build, so only print in debug mode.  The
         // function still returns NULL if not enough memory.
-        printf ("ScratchMemorySpace<...>::get_shmem: Failed to allocate "
-                "%ld byte(s); remaining capacity is %ld byte(s)\n", long(size),
-                long(m_end_L0-m_iter_L0));
-        #endif // KOKKOS_DEBUG
+        printf(
+            "ScratchMemorySpace<...>::get_shmem: Failed to allocate "
+            "%ld byte(s); remaining capacity is %ld byte(s)\n",
+            long(size), long(m_end_L0 - m_iter_L0));
+#endif  // KOKKOS_DEBUG
         tmp = 0;
       }
       return tmp;
     } else {
-      void* tmp = m_iter_L1 + m_offset * align (size);
-      if (m_end_L1 < (m_iter_L1 += align (size) * m_multiplier)) {
-        m_iter_L1 -= align (size) * m_multiplier; // put it back like it was
-        #ifdef KOKKOS_DEBUG
+      void* tmp = m_iter_L1 + m_offset * align(size);
+      if (m_end_L1 < (m_iter_L1 += align(size) * m_multiplier)) {
+        m_iter_L1 -= align(size) * m_multiplier;  // put it back like it was
+#ifdef KOKKOS_DEBUG
         // mfh 23 Jun 2015: printf call consumes 25 registers
         // in a CUDA build, so only print in debug mode.  The
         // function still returns NULL if not enough memory.
-        printf ("ScratchMemorySpace<...>::get_shmem: Failed to allocate "
-                "%ld byte(s); remaining capacity is %ld byte(s)\n", long(size),
-                long(m_end_L1-m_iter_L1));
-        #endif // KOKKOS_DEBUG
+        printf(
+            "ScratchMemorySpace<...>::get_shmem: Failed to allocate "
+            "%ld byte(s); remaining capacity is %ld byte(s)\n",
+            long(size), long(m_end_L1 - m_iter_L1));
+#endif  // KOKKOS_DEBUG
         tmp = 0;
       }
       return tmp;
-
     }
   }
 
-
   KOKKOS_INLINE_FUNCTION
-  void* get_shmem_aligned (const ptrdiff_t size, const ptrdiff_t alignment, int level = -1) const {
-    if(level == -1)
-      level = m_default_level;
-    if(level == 0) {
-
-      char* previous = m_iter_L0;
-      const ptrdiff_t missalign = size_t(m_iter_L0)%alignment;
-      if(missalign) m_iter_L0 += alignment-missalign;
+  void* get_shmem_aligned(const ptrdiff_t size, const ptrdiff_t alignment,
+                          int level = -1) const {
+    if (level == -1) level = m_default_level;
+    if (level == 0) {
+      char* previous            = m_iter_L0;
+      const ptrdiff_t missalign = size_t(m_iter_L0) % alignment;
+      if (missalign) m_iter_L0 += alignment - missalign;
 
       void* tmp = m_iter_L0 + m_offset * size;
       if (m_end_L0 < (m_iter_L0 += size * m_multiplier)) {
-        m_iter_L0 = previous; // put it back like it was
-        #ifdef KOKKOS_DEBUG
+        m_iter_L0 = previous;  // put it back like it was
+#ifdef KOKKOS_DEBUG
         // mfh 23 Jun 2015: printf call consumes 25 registers
         // in a CUDA build, so only print in debug mode.  The
         // function still returns NULL if not enough memory.
-        printf ("ScratchMemorySpace<...>::get_shmem: Failed to allocate "
-                "%ld byte(s); remaining capacity is %ld byte(s)\n", long(size),
-                long(m_end_L0-m_iter_L0));
-        #endif // KOKKOS_DEBUG
+        printf(
+            "ScratchMemorySpace<...>::get_shmem: Failed to allocate "
+            "%ld byte(s); remaining capacity is %ld byte(s)\n",
+            long(size), long(m_end_L0 - m_iter_L0));
+#endif  // KOKKOS_DEBUG
         tmp = 0;
       }
       return tmp;
     } else {
-
-      char* previous = m_iter_L1;
-      const ptrdiff_t missalign =  size_t(m_iter_L1)%alignment;
-      if(missalign) m_iter_L1 += alignment-missalign;
+      char* previous            = m_iter_L1;
+      const ptrdiff_t missalign = size_t(m_iter_L1) % alignment;
+      if (missalign) m_iter_L1 += alignment - missalign;
 
       void* tmp = m_iter_L1 + m_offset * size;
       if (m_end_L1 < (m_iter_L1 += size * m_multiplier)) {
-        m_iter_L1 = previous; // put it back like it was
-        #ifdef KOKKOS_DEBUG
+        m_iter_L1 = previous;  // put it back like it was
+#ifdef KOKKOS_DEBUG
         // mfh 23 Jun 2015: printf call consumes 25 registers
         // in a CUDA build, so only print in debug mode.  The
         // function still returns NULL if not enough memory.
-        printf ("ScratchMemorySpace<...>::get_shmem: Failed to allocate "
-                "%ld byte(s); remaining capacity is %ld byte(s)\n", long(size),
-                long(m_end_L1-m_iter_L1));
-        #endif // KOKKOS_DEBUG
+        printf(
+            "ScratchMemorySpace<...>::get_shmem: Failed to allocate "
+            "%ld byte(s); remaining capacity is %ld byte(s)\n",
+            long(size), long(m_end_L1 - m_iter_L1));
+#endif  // KOKKOS_DEBUG
         tmp = 0;
       }
       return tmp;
-
     }
   }
 
-  template< typename IntType >
-  KOKKOS_INLINE_FUNCTION
-  ScratchMemorySpace( void * ptr_L0 , const IntType & size_L0 , void * ptr_L1 = NULL , const IntType & size_L1 = 0)
-    : m_iter_L0( (char *) ptr_L0 )
-    , m_end_L0(  m_iter_L0 + size_L0 )
-    , m_iter_L1( (char *) ptr_L1 )
-    , m_end_L1(  m_iter_L1 + size_L1 )
-    , m_multiplier( 1 )
-    , m_offset( 0 )
-    , m_default_level( 0 )
-    {}
+  template <typename IntType>
+  KOKKOS_INLINE_FUNCTION ScratchMemorySpace(void* ptr_L0,
+                                            const IntType& size_L0,
+                                            void* ptr_L1           = NULL,
+                                            const IntType& size_L1 = 0)
+      : m_iter_L0((char*)ptr_L0),
+        m_end_L0(m_iter_L0 + size_L0),
+        m_iter_L1((char*)ptr_L1),
+        m_end_L1(m_iter_L1 + size_L1),
+        m_multiplier(1),
+        m_offset(0),
+        m_default_level(0) {}
 
   KOKKOS_INLINE_FUNCTION
-  const ScratchMemorySpace& set_team_thread_mode(const int& level, const int& multiplier, const int& offset) const {
+  const ScratchMemorySpace& set_team_thread_mode(const int& level,
+                                                 const int& multiplier,
+                                                 const int& offset) const {
     m_default_level = level;
-    m_multiplier = multiplier;
-    m_offset = offset;
+    m_multiplier    = multiplier;
+    m_offset        = offset;
     return *this;
   }
 };
 
-} // namespace Kokkos
+}  // namespace Kokkos
 
 #endif /* #ifndef KOKKOS_SCRATCHSPACE_HPP */
-
diff --git a/lib/kokkos/core/src/Kokkos_Serial.hpp b/lib/kokkos/core/src/Kokkos_Serial.hpp
index 5821b0c0c5..e30598be21 100644
--- a/lib/kokkos/core/src/Kokkos_Serial.hpp
+++ b/lib/kokkos/core/src/Kokkos_Serial.hpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -48,7 +49,7 @@
 #define KOKKOS_SERIAL_HPP
 
 #include <Kokkos_Macros.hpp>
-#if defined( KOKKOS_ENABLE_SERIAL )
+#if defined(KOKKOS_ENABLE_SERIAL)
 
 #include <cstddef>
 #include <iosfwd>
@@ -83,24 +84,24 @@ namespace Kokkos {
 /// threads, or if you want to explore different combinations of MPI
 /// and shared-memory parallel programming models.
 class Serial {
-public:
+ public:
   //! \name Type declarations that all Kokkos devices must provide.
   //@{
 
   //! Tag this class as an execution space:
-  typedef Serial                execution_space ;
+  typedef Serial execution_space;
   //! The size_type typedef best suited for this device.
-  typedef HostSpace::size_type  size_type ;
+  typedef HostSpace::size_type size_type;
   //! This device's preferred memory space.
-  typedef HostSpace             memory_space ;
+  typedef HostSpace memory_space;
   //! This execution space preferred device_type
-  typedef Kokkos::Device<execution_space,memory_space> device_type;
+  typedef Kokkos::Device<execution_space, memory_space> device_type;
 
   //! This device's preferred array layout.
-  typedef LayoutRight           array_layout ;
+  typedef LayoutRight array_layout;
 
   /// \brief  Scratch memory space
-  typedef ScratchMemorySpace< Kokkos::Serial >  scratch_memory_space ;
+  typedef ScratchMemorySpace<Kokkos::Serial> scratch_memory_space;
 
   //@}
 
@@ -110,7 +111,7 @@ public:
   /// For the Serial device, this method <i>always</i> returns false,
   /// because parallel_for or parallel_reduce with the Serial device
   /// always execute sequentially.
-  inline static int in_parallel() { return false ; }
+  inline static int in_parallel() { return false; }
 
   /// \brief Wait until all dispatched functors complete.
   ///
@@ -120,26 +121,27 @@ public:
   /// device have completed.
   static void impl_static_fence() {}
 
-  #ifdef KOKKOS_ENABLE_DEPRECATED_CODE
+#ifdef KOKKOS_ENABLE_DEPRECATED_CODE
   static void fence() {}
-  #else
+#else
   void fence() const {}
-  #endif
+#endif
 
   /** \brief  Return the maximum amount of concurrency.  */
-  static int concurrency() {return 1;}
+  static int concurrency() { return 1; }
 
   //! Print configuration information to the given output stream.
-  static void print_configuration( std::ostream & , const bool /* detail */ = false ) {}
+  static void print_configuration(std::ostream&,
+                                  const bool /* detail */ = false) {}
 
 #ifdef KOKKOS_ENABLE_DEPRECATED_CODE
   static bool sleep();
   static bool wake();
 
-  static void initialize( unsigned threads_count = 1 ,
-                          unsigned use_numa_count = 0 ,
-                          unsigned use_cores_per_numa = 0 ,
-                          bool allow_asynchronous_threadpool = false);
+  static void initialize(unsigned threads_count             = 1,
+                         unsigned use_numa_count            = 0,
+                         unsigned use_cores_per_numa        = 0,
+                         bool allow_asynchronous_threadpool = false);
 
   static bool is_initialized();
 
@@ -148,12 +150,14 @@ public:
 
   //--------------------------------------------------------------------------
 
-  inline static int thread_pool_size( int = 0 ) { return 1 ; }
-  KOKKOS_INLINE_FUNCTION static int thread_pool_rank() { return 0 ; }
+  inline static int thread_pool_size(int = 0) { return 1; }
+  KOKKOS_INLINE_FUNCTION static int thread_pool_rank() { return 0; }
 
   //--------------------------------------------------------------------------
 
-  KOKKOS_INLINE_FUNCTION static unsigned hardware_thread_id() { return thread_pool_rank(); }
+  KOKKOS_INLINE_FUNCTION static unsigned hardware_thread_id() {
+    return thread_pool_rank();
+  }
   inline static unsigned max_hardware_threads() { return thread_pool_size(0); }
 #else
   static void impl_initialize();
@@ -165,20 +169,24 @@ public:
 
   //--------------------------------------------------------------------------
 
-  inline static int impl_thread_pool_size( int = 0 ) { return 1 ; }
-  KOKKOS_INLINE_FUNCTION static int impl_thread_pool_rank() { return 0 ; }
+  inline static int impl_thread_pool_size(int = 0) { return 1; }
+  KOKKOS_INLINE_FUNCTION static int impl_thread_pool_rank() { return 0; }
 
   //--------------------------------------------------------------------------
 
-  KOKKOS_INLINE_FUNCTION static unsigned impl_hardware_thread_id() { return impl_thread_pool_rank(); }
-  inline static unsigned impl_max_hardware_threads() { return impl_thread_pool_size(0); }
+  KOKKOS_INLINE_FUNCTION static unsigned impl_hardware_thread_id() {
+    return impl_thread_pool_rank();
+  }
+  inline static unsigned impl_max_hardware_threads() {
+    return impl_thread_pool_size(0);
+  }
 #endif
 
   static const char* name();
   //--------------------------------------------------------------------------
 };
 
-} // namespace Kokkos
+}  // namespace Kokkos
 
 /*--------------------------------------------------------------------------*/
 /*--------------------------------------------------------------------------*/
@@ -186,30 +194,24 @@ public:
 namespace Kokkos {
 namespace Impl {
 
-template<>
-struct MemorySpaceAccess
-  < Kokkos::Serial::memory_space
-  , Kokkos::Serial::scratch_memory_space
-  >
-{
+template <>
+struct MemorySpaceAccess<Kokkos::Serial::memory_space,
+                         Kokkos::Serial::scratch_memory_space> {
   enum { assignable = false };
   enum { accessible = true };
-  enum { deepcopy   = false };
+  enum { deepcopy = false };
 };
 
-template<>
-struct VerifyExecutionCanAccessMemorySpace
-  < Kokkos::Serial::memory_space
-  , Kokkos::Serial::scratch_memory_space
-  >
-{
+template <>
+struct VerifyExecutionCanAccessMemorySpace<
+    Kokkos::Serial::memory_space, Kokkos::Serial::scratch_memory_space> {
   enum { value = true };
-  inline static void verify( void ) { }
-  inline static void verify( const void * ) { }
+  inline static void verify(void) {}
+  inline static void verify(const void*) {}
 };
 
-} // namespace Impl
-} // namespace Kokkos
+}  // namespace Impl
+}  // namespace Kokkos
 
 /*--------------------------------------------------------------------------*/
 /*--------------------------------------------------------------------------*/
@@ -218,247 +220,294 @@ namespace Kokkos {
 namespace Impl {
 
 // Resize thread team data scratch memory
-void serial_resize_thread_team_data( size_t pool_reduce_bytes
-                                   , size_t team_reduce_bytes
-                                   , size_t team_shared_bytes
-                                   , size_t thread_local_bytes );
+void serial_resize_thread_team_data(size_t pool_reduce_bytes,
+                                    size_t team_reduce_bytes,
+                                    size_t team_shared_bytes,
+                                    size_t thread_local_bytes);
 
-HostThreadTeamData * serial_get_thread_team_data();
+HostThreadTeamData* serial_get_thread_team_data();
 
 } /* namespace Impl */
 } /* namespace Kokkos */
 
-
 namespace Kokkos {
 namespace Impl {
 
 /*
  * < Kokkos::Serial , WorkArgTag >
- * < WorkArgTag , Impl::enable_if< std::is_same< Kokkos::Serial , Kokkos::DefaultExecutionSpace >::value >::type >
+ * < WorkArgTag , Impl::enable_if< std::is_same< Kokkos::Serial ,
+ * Kokkos::DefaultExecutionSpace >::value >::type >
  *
  */
-template< class ... Properties >
-class TeamPolicyInternal< Kokkos::Serial , Properties ... >:public PolicyTraits<Properties...>
-{
-private:
-
-  size_t m_team_scratch_size[2] ;
-  size_t m_thread_scratch_size[2] ;
-  int    m_league_size ;
-  int    m_chunk_size;
-
-public:
+template <class... Properties>
+class TeamPolicyInternal<Kokkos::Serial, Properties...>
+    : public PolicyTraits<Properties...> {
+ private:
+  size_t m_team_scratch_size[2];
+  size_t m_thread_scratch_size[2];
+  int m_league_size;
+  int m_chunk_size;
 
+ public:
   //! Tag this class as a kokkos execution policy
-  typedef TeamPolicyInternal      execution_policy ;
+  typedef TeamPolicyInternal execution_policy;
 
-  typedef PolicyTraits<Properties ... > traits;
+  typedef PolicyTraits<Properties...> traits;
 
   //! Execution space of this execution policy:
-  typedef Kokkos::Serial  execution_space ;
+  typedef Kokkos::Serial execution_space;
 
-  TeamPolicyInternal& operator = (const TeamPolicyInternal& p) {
-    m_league_size = p.m_league_size;
-    m_team_scratch_size[0] = p.m_team_scratch_size[0];
+  TeamPolicyInternal& operator=(const TeamPolicyInternal& p) {
+    m_league_size            = p.m_league_size;
+    m_team_scratch_size[0]   = p.m_team_scratch_size[0];
     m_thread_scratch_size[0] = p.m_thread_scratch_size[0];
-    m_team_scratch_size[1] = p.m_team_scratch_size[1];
+    m_team_scratch_size[1]   = p.m_team_scratch_size[1];
     m_thread_scratch_size[1] = p.m_thread_scratch_size[1];
-    m_chunk_size = p.m_chunk_size;
+    m_chunk_size             = p.m_chunk_size;
     return *this;
   }
 
-  template<class ExecSpace, class ... OtherProperties >
+  template <class ExecSpace, class... OtherProperties>
   friend class TeamPolicyInternal;
 
-  template< class ... OtherProperties >
-  TeamPolicyInternal(const TeamPolicyInternal<Kokkos::Serial,OtherProperties...>& p) {
-    m_league_size = p.m_league_size;
-    m_team_scratch_size[0] = p.m_team_scratch_size[0];
+  template <class... OtherProperties>
+  TeamPolicyInternal(
+      const TeamPolicyInternal<Kokkos::Serial, OtherProperties...>& p) {
+    m_league_size            = p.m_league_size;
+    m_team_scratch_size[0]   = p.m_team_scratch_size[0];
     m_thread_scratch_size[0] = p.m_thread_scratch_size[0];
-    m_team_scratch_size[1] = p.m_team_scratch_size[1];
+    m_team_scratch_size[1]   = p.m_team_scratch_size[1];
     m_thread_scratch_size[1] = p.m_thread_scratch_size[1];
-    m_chunk_size = p.m_chunk_size;
+    m_chunk_size             = p.m_chunk_size;
   }
 
-
   //----------------------------------------
 #ifdef KOKKOS_ENABLE_DEPRECATED_CODE
-  template< class FunctorType >
-  static
-  int team_size_max( const FunctorType & ) { return 1 ; }
+  template <class FunctorType>
+  static int team_size_max(const FunctorType&) {
+    return 1;
+  }
 
-  template< class FunctorType >
-  static
-  int team_size_recommended( const FunctorType & ) { return 1 ; }
+  template <class FunctorType>
+  static int team_size_recommended(const FunctorType&) {
+    return 1;
+  }
 
-  template< class FunctorType >
-  static
-  int team_size_recommended( const FunctorType & , const int& ) { return 1 ; }
+  template <class FunctorType>
+  static int team_size_recommended(const FunctorType&, const int&) {
+    return 1;
+  }
 #endif
 
-  template<class FunctorType>
-  int team_size_max( const FunctorType&, const ParallelForTag& ) const { return 1 ; }
-  template<class FunctorType>
-  int team_size_max( const FunctorType&, const ParallelReduceTag& ) const { return 1 ; }
-  template<class FunctorType>
-  int team_size_recommended( const FunctorType&, const ParallelForTag& ) const { return 1 ; }
-  template<class FunctorType>
-  int team_size_recommended( const FunctorType&, const ParallelReduceTag& ) const { return 1 ; }
+  template <class FunctorType>
+  int team_size_max(const FunctorType&, const ParallelForTag&) const {
+    return 1;
+  }
+  template <class FunctorType>
+  int team_size_max(const FunctorType&, const ParallelReduceTag&) const {
+    return 1;
+  }
+  template <class FunctorType, class ReducerType>
+  int team_size_max(const FunctorType&, const ReducerType&,
+                    const ParallelReduceTag&) const {
+    return 1;
+  }
+  template <class FunctorType>
+  int team_size_recommended(const FunctorType&, const ParallelForTag&) const {
+    return 1;
+  }
+  template <class FunctorType>
+  int team_size_recommended(const FunctorType&,
+                            const ParallelReduceTag&) const {
+    return 1;
+  }
+  template <class FunctorType, class ReducerType>
+  int team_size_recommended(const FunctorType&, const ReducerType&,
+                            const ParallelReduceTag&) const {
+    return 1;
+  }
 
   //----------------------------------------
 
-  inline int team_size() const { return 1 ; }
-  inline int league_size() const { return m_league_size ; }
-  inline size_t scratch_size(const int& level, int = 0) const { return m_team_scratch_size[level] + m_thread_scratch_size[level]; }
+  inline int team_size() const { return 1; }
+  inline int league_size() const { return m_league_size; }
+  inline size_t scratch_size(const int& level, int = 0) const {
+    return m_team_scratch_size[level] + m_thread_scratch_size[level];
+  }
 
-  inline static
-  int vector_length_max()
-    { return 1024; } // Use arbitrary large number, is meant as a vectorizable length
+  inline static int vector_length_max() {
+    return 1024;
+  }  // Use arbitrary large number, is meant as a vectorizable length
 
-  inline static
-  int scratch_size_max(int level)
-  { return (level==0?
-        1024*32:
-        20*1024*1024);
+  inline static int scratch_size_max(int level) {
+    return (level == 0 ? 1024 * 32 : 20 * 1024 * 1024);
   }
   /** \brief  Specify league size, request team size */
-  TeamPolicyInternal( const execution_space &
-            , int league_size_request
+  TeamPolicyInternal(const execution_space&, int league_size_request
 #ifndef KOKKOS_ENABLE_DEPRECATED_CODE
-            , int team_size_request
+                     ,
+                     int team_size_request
 #else
-            , int /* team_size_request */
+                     ,
+                     int /* team_size_request */
 #endif
-            , int /* vector_length_request */ = 1 )
-    : m_team_scratch_size { 0 , 0 }
-    , m_thread_scratch_size { 0 , 0 }
-    , m_league_size( league_size_request )
-    , m_chunk_size ( 32 )
-    {
-      #ifndef KOKKOS_ENABLE_DEPRECATED_CODE
-      if(team_size_request > 1) Kokkos::abort("Kokkos::abort: Requested Team Size is too large!");
-      #endif
-    }
-
-  TeamPolicyInternal( const execution_space &
-            , int league_size_request
-            , const Kokkos::AUTO_t & /* team_size_request */
-            , int /* vector_length_request */ = 1 )
-    : m_team_scratch_size { 0 , 0 }
-    , m_thread_scratch_size { 0 , 0 }
-    , m_league_size( league_size_request )
-    , m_chunk_size ( 32 )
-    {}
-
-  TeamPolicyInternal( int league_size_request
+                     ,
+                     int /* vector_length_request */ = 1)
+      : m_team_scratch_size{0, 0},
+        m_thread_scratch_size{0, 0},
+        m_league_size(league_size_request),
+        m_chunk_size(32) {
 #ifndef KOKKOS_ENABLE_DEPRECATED_CODE
-            , int team_size_request
-#else
-            , int /* team_size_request */
+    if (team_size_request > 1)
+      Kokkos::abort("Kokkos::abort: Requested Team Size is too large!");
 #endif
-            , int /* vector_length_request */ = 1 )
-    : m_team_scratch_size { 0 , 0 }
-    , m_thread_scratch_size { 0 , 0 }
-    , m_league_size( league_size_request )
-    , m_chunk_size ( 32 )
-    {
-      #ifndef KOKKOS_ENABLE_DEPRECATED_CODE
-      if(team_size_request > 1) Kokkos::abort("Kokkos::abort: Requested Team Size is too large!");
-      #endif
-    }
+  }
 
-  TeamPolicyInternal( int league_size_request
-            , const Kokkos::AUTO_t & /* team_size_request */
-            , int /* vector_length_request */ = 1 )
-    : m_team_scratch_size { 0 , 0 }
-    , m_thread_scratch_size { 0 , 0 }
-    , m_league_size( league_size_request )
-    , m_chunk_size ( 32 )
-    {}
+  TeamPolicyInternal(const execution_space&, int league_size_request,
+                     const Kokkos::AUTO_t& /* team_size_request */
+                     ,
+                     int /* vector_length_request */ = 1)
+      : m_team_scratch_size{0, 0},
+        m_thread_scratch_size{0, 0},
+        m_league_size(league_size_request),
+        m_chunk_size(32) {}
 
-  inline int chunk_size() const { return m_chunk_size ; }
+  TeamPolicyInternal(int league_size_request
+#ifndef KOKKOS_ENABLE_DEPRECATED_CODE
+                     ,
+                     int team_size_request
+#else
+                     ,
+                     int /* team_size_request */
+#endif
+                     ,
+                     int /* vector_length_request */ = 1)
+      : m_team_scratch_size{0, 0},
+        m_thread_scratch_size{0, 0},
+        m_league_size(league_size_request),
+        m_chunk_size(32) {
+#ifndef KOKKOS_ENABLE_DEPRECATED_CODE
+    if (team_size_request > 1)
+      Kokkos::abort("Kokkos::abort: Requested Team Size is too large!");
+#endif
+  }
+
+  TeamPolicyInternal(int league_size_request,
+                     const Kokkos::AUTO_t& /* team_size_request */
+                     ,
+                     int /* vector_length_request */ = 1)
+      : m_team_scratch_size{0, 0},
+        m_thread_scratch_size{0, 0},
+        m_league_size(league_size_request),
+        m_chunk_size(32) {}
+
+  inline int chunk_size() const { return m_chunk_size; }
 
 #ifdef KOKKOS_ENABLE_DEPRECATED_CODE
   /** \brief set chunk_size to a discrete value*/
-  inline TeamPolicyInternal set_chunk_size(typename traits::index_type chunk_size_) const {
+  inline TeamPolicyInternal set_chunk_size(
+      typename traits::index_type chunk_size_) const {
     TeamPolicyInternal p = *this;
-    p.m_chunk_size = chunk_size_;
+    p.m_chunk_size       = chunk_size_;
     return p;
   }
 
-  /** \brief set per team scratch size for a specific level of the scratch hierarchy */
-  inline TeamPolicyInternal set_scratch_size(const int& level, const PerTeamValue& per_team) const {
-    TeamPolicyInternal p = *this;
+  /** \brief set per team scratch size for a specific level of the scratch
+   * hierarchy */
+  inline TeamPolicyInternal set_scratch_size(
+      const int& level, const PerTeamValue& per_team) const {
+    TeamPolicyInternal p         = *this;
     p.m_team_scratch_size[level] = per_team.value;
     return p;
   }
 
-  /** \brief set per thread scratch size for a specific level of the scratch hierarchy */
-  inline TeamPolicyInternal set_scratch_size(const int& level, const PerThreadValue& per_thread) const {
-    TeamPolicyInternal p = *this;
+  /** \brief set per thread scratch size for a specific level of the scratch
+   * hierarchy */
+  inline TeamPolicyInternal set_scratch_size(
+      const int& level, const PerThreadValue& per_thread) const {
+    TeamPolicyInternal p           = *this;
     p.m_thread_scratch_size[level] = per_thread.value;
     return p;
   }
 
-  /** \brief set per thread and per team scratch size for a specific level of the scratch hierarchy */
-  inline TeamPolicyInternal set_scratch_size(const int& level, const PerTeamValue& per_team, const PerThreadValue& per_thread) const {
-    TeamPolicyInternal p = *this;
-    p.m_team_scratch_size[level] = per_team.value;
+  /** \brief set per thread and per team scratch size for a specific level of
+   * the scratch hierarchy */
+  inline TeamPolicyInternal set_scratch_size(
+      const int& level, const PerTeamValue& per_team,
+      const PerThreadValue& per_thread) const {
+    TeamPolicyInternal p           = *this;
+    p.m_team_scratch_size[level]   = per_team.value;
     p.m_thread_scratch_size[level] = per_thread.value;
     return p;
   }
 #else
   /** \brief set chunk_size to a discrete value*/
-  inline TeamPolicyInternal& set_chunk_size(typename traits::index_type chunk_size_) {
+  inline TeamPolicyInternal& set_chunk_size(
+      typename traits::index_type chunk_size_) {
     m_chunk_size = chunk_size_;
     return *this;
   }
 
-  /** \brief set per team scratch size for a specific level of the scratch hierarchy */
-  inline TeamPolicyInternal& set_scratch_size(const int& level, const PerTeamValue& per_team) {
+  /** \brief set per team scratch size for a specific level of the scratch
+   * hierarchy */
+  inline TeamPolicyInternal& set_scratch_size(const int& level,
+                                              const PerTeamValue& per_team) {
     m_team_scratch_size[level] = per_team.value;
     return *this;
   }
 
-  /** \brief set per thread scratch size for a specific level of the scratch hierarchy */
-  inline TeamPolicyInternal& set_scratch_size(const int& level, const PerThreadValue& per_thread) {
+  /** \brief set per thread scratch size for a specific level of the scratch
+   * hierarchy */
+  inline TeamPolicyInternal& set_scratch_size(
+      const int& level, const PerThreadValue& per_thread) {
     m_thread_scratch_size[level] = per_thread.value;
     return *this;
   }
 
-  /** \brief set per thread and per team scratch size for a specific level of the scratch hierarchy */
-  inline TeamPolicyInternal& set_scratch_size(const int& level, const PerTeamValue& per_team, const PerThreadValue& per_thread) {
-    m_team_scratch_size[level] = per_team.value;
+  /** \brief set per thread and per team scratch size for a specific level of
+   * the scratch hierarchy */
+  inline TeamPolicyInternal& set_scratch_size(
+      const int& level, const PerTeamValue& per_team,
+      const PerThreadValue& per_thread) {
+    m_team_scratch_size[level]   = per_team.value;
     m_thread_scratch_size[level] = per_thread.value;
     return *this;
   }
 #endif
 
-  typedef Impl::HostThreadTeamMember< Kokkos::Serial >  member_type ;
+  typedef Impl::HostThreadTeamMember<Kokkos::Serial> member_type;
 
-protected:
+ protected:
 #ifdef KOKKOS_ENABLE_DEPRECATED_CODE
   /** \brief set chunk_size to a discrete value*/
-  inline TeamPolicyInternal internal_set_chunk_size(typename traits::index_type chunk_size_) {
+  inline TeamPolicyInternal internal_set_chunk_size(
+      typename traits::index_type chunk_size_) {
     m_chunk_size = chunk_size_;
     return *this;
   }
 
-  /** \brief set per team scratch size for a specific level of the scratch hierarchy */
-  inline TeamPolicyInternal internal_set_scratch_size(const int& level, const PerTeamValue& per_team) {
+  /** \brief set per team scratch size for a specific level of the scratch
+   * hierarchy */
+  inline TeamPolicyInternal internal_set_scratch_size(
+      const int& level, const PerTeamValue& per_team) {
     m_team_scratch_size[level] = per_team.value;
     return *this;
   }
 
-  /** \brief set per thread scratch size for a specific level of the scratch hierarchy */
-  inline TeamPolicyInternal internal_set_scratch_size(const int& level, const PerThreadValue& per_thread) {
+  /** \brief set per thread scratch size for a specific level of the scratch
+   * hierarchy */
+  inline TeamPolicyInternal internal_set_scratch_size(
+      const int& level, const PerThreadValue& per_thread) {
     m_thread_scratch_size[level] = per_thread.value;
     return *this;
   }
 
-  /** \brief set per thread and per team scratch size for a specific level of the scratch hierarchy */
-  inline TeamPolicyInternal internal_set_scratch_size(const int& level, const PerTeamValue& per_team, const PerThreadValue& per_thread) {
-    m_team_scratch_size[level] = per_team.value;
+  /** \brief set per thread and per team scratch size for a specific level of
+   * the scratch hierarchy */
+  inline TeamPolicyInternal internal_set_scratch_size(
+      const int& level, const PerTeamValue& per_team,
+      const PerThreadValue& per_thread) {
+    m_team_scratch_size[level]   = per_team.value;
     m_thread_scratch_size[level] = per_thread.value;
     return *this;
   }
@@ -474,339 +523,280 @@ protected:
 namespace Kokkos {
 namespace Impl {
 
-template< class FunctorType , class ... Traits >
-class ParallelFor< FunctorType ,
-                   Kokkos::RangePolicy< Traits ... > ,
-                   Kokkos::Serial
-                 >
-{
-private:
+template <class FunctorType, class... Traits>
+class ParallelFor<FunctorType, Kokkos::RangePolicy<Traits...>, Kokkos::Serial> {
+ private:
+  typedef Kokkos::RangePolicy<Traits...> Policy;
 
-  typedef Kokkos::RangePolicy< Traits ... > Policy ;
+  const FunctorType m_functor;
+  const Policy m_policy;
 
-  const FunctorType m_functor ;
-  const Policy      m_policy ;
-
-  template< class TagType >
-  typename std::enable_if< std::is_same< TagType , void >::value >::type
-  exec() const
-    {
-      const typename Policy::member_type e = m_policy.end();
-      for ( typename Policy::member_type i = m_policy.begin() ; i < e ; ++i ) {
-        m_functor( i );
-      }
+  template <class TagType>
+  typename std::enable_if<std::is_same<TagType, void>::value>::type exec()
+      const {
+    const typename Policy::member_type e = m_policy.end();
+    for (typename Policy::member_type i = m_policy.begin(); i < e; ++i) {
+      m_functor(i);
     }
+  }
 
-  template< class TagType >
-  typename std::enable_if< ! std::is_same< TagType , void >::value >::type
-  exec() const
-    {
-      const TagType t{} ;
-      const typename Policy::member_type e = m_policy.end();
-      for ( typename Policy::member_type i = m_policy.begin() ; i < e ; ++i ) {
-        m_functor( t , i );
-      }
+  template <class TagType>
+  typename std::enable_if<!std::is_same<TagType, void>::value>::type exec()
+      const {
+    const TagType t{};
+    const typename Policy::member_type e = m_policy.end();
+    for (typename Policy::member_type i = m_policy.begin(); i < e; ++i) {
+      m_functor(t, i);
     }
+  }
 
-public:
+ public:
+  inline void execute() const {
+    this->template exec<typename Policy::work_tag>();
+  }
 
-  inline
-  void execute() const
-    { this-> template exec< typename Policy::work_tag >(); }
-
-  inline
-  ParallelFor( const FunctorType & arg_functor
-             , const Policy      & arg_policy )
-    : m_functor( arg_functor )
-    , m_policy(  arg_policy )
-    {}
+  inline ParallelFor(const FunctorType& arg_functor, const Policy& arg_policy)
+      : m_functor(arg_functor), m_policy(arg_policy) {}
 };
 
 /*--------------------------------------------------------------------------*/
 
-template< class FunctorType , class ReducerType , class ... Traits >
-class ParallelReduce< FunctorType
-                    , Kokkos::RangePolicy< Traits ... >
-                    , ReducerType
-                    , Kokkos::Serial
-                    >
-{
-private:
+template <class FunctorType, class ReducerType, class... Traits>
+class ParallelReduce<FunctorType, Kokkos::RangePolicy<Traits...>, ReducerType,
+                     Kokkos::Serial> {
+ private:
+  typedef Kokkos::RangePolicy<Traits...> Policy;
+  typedef typename Policy::work_tag WorkTag;
 
-  typedef Kokkos::RangePolicy< Traits ... > Policy ;
-  typedef typename Policy::work_tag                                  WorkTag ;
-
-  typedef Kokkos::Impl::if_c< std::is_same<InvalidType,ReducerType>::value, FunctorType, ReducerType> ReducerConditional;
+  typedef Kokkos::Impl::if_c<std::is_same<InvalidType, ReducerType>::value,
+                             FunctorType, ReducerType>
+      ReducerConditional;
 
   typedef typename ReducerConditional::type ReducerTypeFwd;
-  typedef typename Kokkos::Impl::if_c< std::is_same<InvalidType,ReducerType>::value, WorkTag, void>::type WorkTagFwd;
+  typedef
+      typename Kokkos::Impl::if_c<std::is_same<InvalidType, ReducerType>::value,
+                                  WorkTag, void>::type WorkTagFwd;
 
-  typedef FunctorAnalysis< FunctorPatternInterface::REDUCE , Policy , FunctorType > Analysis ;
+  typedef FunctorAnalysis<FunctorPatternInterface::REDUCE, Policy, FunctorType>
+      Analysis;
 
-  typedef Kokkos::Impl::FunctorValueInit<   ReducerTypeFwd , WorkTagFwd >  ValueInit ;
+  typedef Kokkos::Impl::FunctorValueInit<ReducerTypeFwd, WorkTagFwd> ValueInit;
 
-  typedef typename Analysis::pointer_type    pointer_type ;
-  typedef typename Analysis::reference_type  reference_type ;
+  typedef typename Analysis::pointer_type pointer_type;
+  typedef typename Analysis::reference_type reference_type;
 
-  const FunctorType   m_functor ;
-  const Policy        m_policy ;
-  const ReducerType   m_reducer ;
-  const pointer_type  m_result_ptr ;
+  const FunctorType m_functor;
+  const Policy m_policy;
+  const ReducerType m_reducer;
+  const pointer_type m_result_ptr;
 
-  template< class TagType >
-  inline
-  typename std::enable_if< std::is_same< TagType , void >::value >::type
-  exec( reference_type update ) const
-    {
-      const typename Policy::member_type e = m_policy.end();
-      for ( typename Policy::member_type i = m_policy.begin() ; i < e ; ++i ) {
-        m_functor( i , update );
-      }
+  template <class TagType>
+  inline typename std::enable_if<std::is_same<TagType, void>::value>::type exec(
+      reference_type update) const {
+    const typename Policy::member_type e = m_policy.end();
+    for (typename Policy::member_type i = m_policy.begin(); i < e; ++i) {
+      m_functor(i, update);
     }
+  }
 
-  template< class TagType >
-  inline
-  typename std::enable_if< ! std::is_same< TagType , void >::value >::type
-  exec( reference_type update ) const
-    {
-      const TagType t{} ;
+  template <class TagType>
+  inline typename std::enable_if<!std::is_same<TagType, void>::value>::type
+  exec(reference_type update) const {
+    const TagType t{};
 
-      const typename Policy::member_type e = m_policy.end();
-      for ( typename Policy::member_type i = m_policy.begin() ; i < e ; ++i ) {
-        m_functor( t , i , update );
-      }
+    const typename Policy::member_type e = m_policy.end();
+    for (typename Policy::member_type i = m_policy.begin(); i < e; ++i) {
+      m_functor(t, i, update);
     }
+  }
 
-public:
+ public:
+  inline void execute() const {
+    const size_t pool_reduce_size =
+        Analysis::value_size(ReducerConditional::select(m_functor, m_reducer));
+    const size_t team_reduce_size  = 0;  // Never shrinks
+    const size_t team_shared_size  = 0;  // Never shrinks
+    const size_t thread_local_size = 0;  // Never shrinks
 
-  inline
-  void execute() const
-    {
-      const size_t pool_reduce_size =
-        Analysis::value_size( ReducerConditional::select(m_functor , m_reducer) );
-      const size_t team_reduce_size  = 0 ; // Never shrinks
-      const size_t team_shared_size  = 0 ; // Never shrinks
-      const size_t thread_local_size = 0 ; // Never shrinks
+    serial_resize_thread_team_data(pool_reduce_size, team_reduce_size,
+                                   team_shared_size, thread_local_size);
 
-      serial_resize_thread_team_data( pool_reduce_size
-                                    , team_reduce_size
-                                    , team_shared_size
-                                    , thread_local_size );
+    HostThreadTeamData& data = *serial_get_thread_team_data();
 
-      HostThreadTeamData & data = *serial_get_thread_team_data();
-
-      pointer_type ptr =
+    pointer_type ptr =
         m_result_ptr ? m_result_ptr : pointer_type(data.pool_reduce_local());
 
-      reference_type update =
-        ValueInit::init(  ReducerConditional::select(m_functor , m_reducer) , ptr );
+    reference_type update =
+        ValueInit::init(ReducerConditional::select(m_functor, m_reducer), ptr);
 
-      this-> template exec< WorkTag >( update );
+    this->template exec<WorkTag>(update);
 
-      Kokkos::Impl::FunctorFinal< ReducerTypeFwd , WorkTagFwd >::
-        final(  ReducerConditional::select(m_functor , m_reducer) , ptr );
-    }
+    Kokkos::Impl::FunctorFinal<ReducerTypeFwd, WorkTagFwd>::final(
+        ReducerConditional::select(m_functor, m_reducer), ptr);
+  }
 
-  template< class HostViewType >
-  ParallelReduce( const FunctorType  & arg_functor ,
-                  const Policy       & arg_policy ,
-                  const HostViewType & arg_result_view ,
-                  typename std::enable_if<
-                               Kokkos::is_view< HostViewType >::value &&
-                              !Kokkos::is_reducer_type<ReducerType>::value
-                  ,void*>::type = NULL)
-    : m_functor( arg_functor )
-    , m_policy( arg_policy )
-    , m_reducer( InvalidType() )
-    , m_result_ptr( arg_result_view.data() )
-    {
-      static_assert( Kokkos::is_view< HostViewType >::value
-        , "Kokkos::Serial reduce result must be a View" );
+  template <class HostViewType>
+  ParallelReduce(
+      const FunctorType& arg_functor, const Policy& arg_policy,
+      const HostViewType& arg_result_view,
+      typename std::enable_if<Kokkos::is_view<HostViewType>::value &&
+                                  !Kokkos::is_reducer_type<ReducerType>::value,
+                              void*>::type = NULL)
+      : m_functor(arg_functor),
+        m_policy(arg_policy),
+        m_reducer(InvalidType()),
+        m_result_ptr(arg_result_view.data()) {
+    static_assert(Kokkos::is_view<HostViewType>::value,
+                  "Kokkos::Serial reduce result must be a View");
 
-      static_assert( std::is_same< typename HostViewType::memory_space , HostSpace >::value
-        , "Kokkos::Serial reduce result must be a View in HostSpace" );
-    }
+    static_assert(
+        std::is_same<typename HostViewType::memory_space, HostSpace>::value,
+        "Kokkos::Serial reduce result must be a View in HostSpace");
+  }
 
-  inline
-  ParallelReduce( const FunctorType & arg_functor
-                , Policy       arg_policy
-                , const ReducerType& reducer )
-    : m_functor( arg_functor )
-    , m_policy(  arg_policy )
-    , m_reducer( reducer )
-    , m_result_ptr(  reducer.view().data() )
-    {
-      /*static_assert( std::is_same< typename ViewType::memory_space
-                                      , Kokkos::HostSpace >::value
-        , "Reduction result on Kokkos::OpenMP must be a Kokkos::View in HostSpace" );*/
-    }
-};
-
-
-/*--------------------------------------------------------------------------*/
-
-template< class FunctorType , class ... Traits >
-class ParallelScan< FunctorType
-                  , Kokkos::RangePolicy< Traits ... >
-                  , Kokkos::Serial
-                  >
-{
-private:
-
-  typedef Kokkos::RangePolicy< Traits ... > Policy ;
-  typedef typename Policy::work_tag                                  WorkTag ;
-
-  typedef FunctorAnalysis< FunctorPatternInterface::SCAN , Policy , FunctorType > Analysis ;
-
-  typedef Kokkos::Impl::FunctorValueInit<   FunctorType , WorkTag >  ValueInit ;
-
-  typedef typename Analysis::pointer_type    pointer_type ;
-  typedef typename Analysis::reference_type  reference_type ;
-
-  const FunctorType   m_functor ;
-  const Policy        m_policy ;
-
-  template< class TagType >
-  inline
-  typename std::enable_if< std::is_same< TagType , void >::value >::type
-  exec( reference_type update ) const
-    {
-      const typename Policy::member_type e = m_policy.end();
-      for ( typename Policy::member_type i = m_policy.begin() ; i < e ; ++i ) {
-        m_functor( i , update , true );
-      }
-    }
-
-  template< class TagType >
-  inline
-  typename std::enable_if< ! std::is_same< TagType , void >::value >::type
-  exec( reference_type update ) const
-    {
-      const TagType t{} ;
-      const typename Policy::member_type e = m_policy.end();
-      for ( typename Policy::member_type i = m_policy.begin() ; i < e ; ++i ) {
-        m_functor( t , i , update , true );
-      }
-    }
-
-public:
-
-  inline
-  void execute() const
-    {
-      const size_t pool_reduce_size = Analysis::value_size( m_functor );
-      const size_t team_reduce_size  = 0 ; // Never shrinks
-      const size_t team_shared_size  = 0 ; // Never shrinks
-      const size_t thread_local_size = 0 ; // Never shrinks
-
-      serial_resize_thread_team_data( pool_reduce_size
-                                    , team_reduce_size
-                                    , team_shared_size
-                                    , thread_local_size );
-
-      HostThreadTeamData & data = *serial_get_thread_team_data();
-
-      reference_type update =
-        ValueInit::init( m_functor , pointer_type(data.pool_reduce_local()) );
-
-      this-> template exec< WorkTag >( update );
-    }
-
-  inline
-  ParallelScan( const FunctorType & arg_functor
-              , const Policy      & arg_policy
-              )
-    : m_functor( arg_functor )
-    , m_policy(  arg_policy )
-    {}
+  inline ParallelReduce(const FunctorType& arg_functor, Policy arg_policy,
+                        const ReducerType& reducer)
+      : m_functor(arg_functor),
+        m_policy(arg_policy),
+        m_reducer(reducer),
+        m_result_ptr(reducer.view().data()) {
+    /*static_assert( std::is_same< typename ViewType::memory_space
+                                    , Kokkos::HostSpace >::value
+      , "Reduction result on Kokkos::OpenMP must be a Kokkos::View in HostSpace"
+      );*/
+  }
 };
 
 /*--------------------------------------------------------------------------*/
-template< class FunctorType , class ReturnType, class ... Traits >
-class ParallelScanWithTotal< FunctorType
-                           , Kokkos::RangePolicy< Traits ... >
-                           , ReturnType
-                           , Kokkos::Serial
-                           >
-{
-private:
 
-  typedef Kokkos::RangePolicy< Traits ... > Policy ;
-  typedef typename Policy::work_tag                                  WorkTag ;
+template <class FunctorType, class... Traits>
+class ParallelScan<FunctorType, Kokkos::RangePolicy<Traits...>,
+                   Kokkos::Serial> {
+ private:
+  typedef Kokkos::RangePolicy<Traits...> Policy;
+  typedef typename Policy::work_tag WorkTag;
 
-  typedef FunctorAnalysis< FunctorPatternInterface::SCAN , Policy , FunctorType > Analysis ;
+  typedef FunctorAnalysis<FunctorPatternInterface::SCAN, Policy, FunctorType>
+      Analysis;
 
-  typedef Kokkos::Impl::FunctorValueInit<   FunctorType , WorkTag >  ValueInit ;
+  typedef Kokkos::Impl::FunctorValueInit<FunctorType, WorkTag> ValueInit;
 
-  typedef typename Analysis::pointer_type    pointer_type ;
-  typedef typename Analysis::reference_type  reference_type ;
+  typedef typename Analysis::pointer_type pointer_type;
+  typedef typename Analysis::reference_type reference_type;
 
-  const FunctorType   m_functor ;
-  const Policy        m_policy ;
-  ReturnType & m_returnvalue;
+  const FunctorType m_functor;
+  const Policy m_policy;
 
-  template< class TagType >
-  inline
-  typename std::enable_if< std::is_same< TagType , void >::value >::type
-  exec( reference_type update ) const
-    {
-      const typename Policy::member_type e = m_policy.end();
-      for ( typename Policy::member_type i = m_policy.begin() ; i < e ; ++i ) {
-        m_functor( i , update , true );
-      }
+  template <class TagType>
+  inline typename std::enable_if<std::is_same<TagType, void>::value>::type exec(
+      reference_type update) const {
+    const typename Policy::member_type e = m_policy.end();
+    for (typename Policy::member_type i = m_policy.begin(); i < e; ++i) {
+      m_functor(i, update, true);
     }
+  }
 
-  template< class TagType >
-  inline
-  typename std::enable_if< ! std::is_same< TagType , void >::value >::type
-  exec( reference_type update ) const
-    {
-      const TagType t{} ;
-      const typename Policy::member_type e = m_policy.end();
-      for ( typename Policy::member_type i = m_policy.begin() ; i < e ; ++i ) {
-        m_functor( t , i , update , true );
-      }
+  template <class TagType>
+  inline typename std::enable_if<!std::is_same<TagType, void>::value>::type
+  exec(reference_type update) const {
+    const TagType t{};
+    const typename Policy::member_type e = m_policy.end();
+    for (typename Policy::member_type i = m_policy.begin(); i < e; ++i) {
+      m_functor(t, i, update, true);
     }
+  }
 
-public:
+ public:
+  inline void execute() const {
+    const size_t pool_reduce_size  = Analysis::value_size(m_functor);
+    const size_t team_reduce_size  = 0;  // Never shrinks
+    const size_t team_shared_size  = 0;  // Never shrinks
+    const size_t thread_local_size = 0;  // Never shrinks
 
-  inline
-  void execute()
-    {
-      const size_t pool_reduce_size = Analysis::value_size( m_functor );
-      const size_t team_reduce_size  = 0 ; // Never shrinks
-      const size_t team_shared_size  = 0 ; // Never shrinks
-      const size_t thread_local_size = 0 ; // Never shrinks
+    serial_resize_thread_team_data(pool_reduce_size, team_reduce_size,
+                                   team_shared_size, thread_local_size);
 
-     serial_resize_thread_team_data( pool_reduce_size
-                                    , team_reduce_size
-                                    , team_shared_size
-                                    , thread_local_size );
+    HostThreadTeamData& data = *serial_get_thread_team_data();
 
-      HostThreadTeamData & data = *serial_get_thread_team_data();
+    reference_type update =
+        ValueInit::init(m_functor, pointer_type(data.pool_reduce_local()));
 
-      reference_type update =
-        ValueInit::init( m_functor , pointer_type(data.pool_reduce_local()) );
+    this->template exec<WorkTag>(update);
+  }
 
-      this-> template exec< WorkTag >( update );
-
-      m_returnvalue = update;
-    }
-
-  inline
-  ParallelScanWithTotal( const FunctorType & arg_functor
-                       , const Policy      & arg_policy
-                       , ReturnType        & arg_returnvalue
-                       )
-    : m_functor( arg_functor )
-    , m_policy(  arg_policy )
-    , m_returnvalue(  arg_returnvalue )
-    {}
+  inline ParallelScan(const FunctorType& arg_functor, const Policy& arg_policy)
+      : m_functor(arg_functor), m_policy(arg_policy) {}
 };
 
-} // namespace Impl
-} // namespace Kokkos
+/*--------------------------------------------------------------------------*/
+template <class FunctorType, class ReturnType, class... Traits>
+class ParallelScanWithTotal<FunctorType, Kokkos::RangePolicy<Traits...>,
+                            ReturnType, Kokkos::Serial> {
+ private:
+  typedef Kokkos::RangePolicy<Traits...> Policy;
+  typedef typename Policy::work_tag WorkTag;
 
+  typedef FunctorAnalysis<FunctorPatternInterface::SCAN, Policy, FunctorType>
+      Analysis;
+
+  typedef Kokkos::Impl::FunctorValueInit<FunctorType, WorkTag> ValueInit;
+
+  typedef typename Analysis::pointer_type pointer_type;
+  typedef typename Analysis::reference_type reference_type;
+
+  const FunctorType m_functor;
+  const Policy m_policy;
+  ReturnType& m_returnvalue;
+
+  template <class TagType>
+  inline typename std::enable_if<std::is_same<TagType, void>::value>::type exec(
+      reference_type update) const {
+    const typename Policy::member_type e = m_policy.end();
+    for (typename Policy::member_type i = m_policy.begin(); i < e; ++i) {
+      m_functor(i, update, true);
+    }
+  }
+
+  template <class TagType>
+  inline typename std::enable_if<!std::is_same<TagType, void>::value>::type
+  exec(reference_type update) const {
+    const TagType t{};
+    const typename Policy::member_type e = m_policy.end();
+    for (typename Policy::member_type i = m_policy.begin(); i < e; ++i) {
+      m_functor(t, i, update, true);
+    }
+  }
+
+ public:
+  inline void execute() {
+    const size_t pool_reduce_size  = Analysis::value_size(m_functor);
+    const size_t team_reduce_size  = 0;  // Never shrinks
+    const size_t team_shared_size  = 0;  // Never shrinks
+    const size_t thread_local_size = 0;  // Never shrinks
+
+    serial_resize_thread_team_data(pool_reduce_size, team_reduce_size,
+                                   team_shared_size, thread_local_size);
+
+    HostThreadTeamData& data = *serial_get_thread_team_data();
+
+    reference_type update =
+        ValueInit::init(m_functor, pointer_type(data.pool_reduce_local()));
+
+    this->template exec<WorkTag>(update);
+
+    m_returnvalue = update;
+  }
+
+  inline ParallelScanWithTotal(const FunctorType& arg_functor,
+                               const Policy& arg_policy,
+                               ReturnType& arg_returnvalue)
+      : m_functor(arg_functor),
+        m_policy(arg_policy),
+        m_returnvalue(arg_returnvalue) {}
+};
+
+}  // namespace Impl
+}  // namespace Kokkos
 
 /*--------------------------------------------------------------------------*/
 /*--------------------------------------------------------------------------*/
@@ -815,169 +805,143 @@ public:
 namespace Kokkos {
 namespace Impl {
 
-template< class FunctorType , class ... Traits >
-class ParallelFor< FunctorType ,
-                   Kokkos::MDRangePolicy< Traits ... > ,
-                   Kokkos::Serial
-                 >
-{
-private:
+template <class FunctorType, class... Traits>
+class ParallelFor<FunctorType, Kokkos::MDRangePolicy<Traits...>,
+                  Kokkos::Serial> {
+ private:
+  typedef Kokkos::MDRangePolicy<Traits...> MDRangePolicy;
+  typedef typename MDRangePolicy::impl_range_policy Policy;
 
-  typedef Kokkos::MDRangePolicy< Traits ... > MDRangePolicy ;
-  typedef typename MDRangePolicy::impl_range_policy Policy ;
+  typedef typename Kokkos::Impl::HostIterateTile<
+      MDRangePolicy, FunctorType, typename MDRangePolicy::work_tag, void>
+      iterate_type;
 
-  typedef typename Kokkos::Impl::HostIterateTile< MDRangePolicy, FunctorType, typename MDRangePolicy::work_tag, void > iterate_type;
+  const FunctorType m_functor;
+  const MDRangePolicy m_mdr_policy;
+  const Policy m_policy;
 
-  const FunctorType   m_functor ;
-  const MDRangePolicy m_mdr_policy ;
-  const Policy        m_policy ;
-
-  void
-  exec() const
-    {
-      const typename Policy::member_type e = m_policy.end();
-      for ( typename Policy::member_type i = m_policy.begin() ; i < e ; ++i ) {
-        iterate_type( m_mdr_policy, m_functor )( i );
-      }
+  void exec() const {
+    const typename Policy::member_type e = m_policy.end();
+    for (typename Policy::member_type i = m_policy.begin(); i < e; ++i) {
+      iterate_type(m_mdr_policy, m_functor)(i);
     }
+  }
 
-public:
+ public:
+  inline void execute() const { this->exec(); }
 
-  inline
-  void execute() const
-    { this->exec(); }
-
-  inline
-  ParallelFor( const FunctorType   & arg_functor
-             , const MDRangePolicy & arg_policy )
-    : m_functor( arg_functor )
-    , m_mdr_policy(  arg_policy )
-    , m_policy( Policy(0, m_mdr_policy.m_num_tiles).set_chunk_size(1) )
-    {}
+  inline ParallelFor(const FunctorType& arg_functor,
+                     const MDRangePolicy& arg_policy)
+      : m_functor(arg_functor),
+        m_mdr_policy(arg_policy),
+        m_policy(Policy(0, m_mdr_policy.m_num_tiles).set_chunk_size(1)) {}
 };
 
+template <class FunctorType, class ReducerType, class... Traits>
+class ParallelReduce<FunctorType, Kokkos::MDRangePolicy<Traits...>, ReducerType,
+                     Kokkos::Serial> {
+ private:
+  typedef Kokkos::MDRangePolicy<Traits...> MDRangePolicy;
+  typedef typename MDRangePolicy::impl_range_policy Policy;
 
-template< class FunctorType , class ReducerType , class ... Traits >
-class ParallelReduce< FunctorType
-                    , Kokkos::MDRangePolicy< Traits ... >
-                    , ReducerType
-                    , Kokkos::Serial
-                    >
-{
-private:
+  typedef typename MDRangePolicy::work_tag WorkTag;
 
-  typedef Kokkos::MDRangePolicy< Traits ... > MDRangePolicy ;
-  typedef typename MDRangePolicy::impl_range_policy Policy ;
-
-  typedef typename MDRangePolicy::work_tag                                  WorkTag ;
-
-  typedef Kokkos::Impl::if_c< std::is_same<InvalidType,ReducerType>::value, FunctorType, ReducerType> ReducerConditional;
+  typedef Kokkos::Impl::if_c<std::is_same<InvalidType, ReducerType>::value,
+                             FunctorType, ReducerType>
+      ReducerConditional;
   typedef typename ReducerConditional::type ReducerTypeFwd;
-  typedef typename Kokkos::Impl::if_c< std::is_same<InvalidType,ReducerType>::value, WorkTag, void>::type WorkTagFwd;
+  typedef
+      typename Kokkos::Impl::if_c<std::is_same<InvalidType, ReducerType>::value,
+                                  WorkTag, void>::type WorkTagFwd;
 
-  typedef FunctorAnalysis< FunctorPatternInterface::REDUCE , MDRangePolicy , FunctorType > Analysis ;
+  typedef FunctorAnalysis<FunctorPatternInterface::REDUCE, MDRangePolicy,
+                          FunctorType>
+      Analysis;
 
-  typedef Kokkos::Impl::FunctorValueInit<   ReducerTypeFwd , WorkTagFwd >  ValueInit ;
+  typedef Kokkos::Impl::FunctorValueInit<ReducerTypeFwd, WorkTagFwd> ValueInit;
 
-  typedef typename Analysis::pointer_type    pointer_type ;
-  typedef typename Analysis::value_type      value_type ;
-  typedef typename Analysis::reference_type  reference_type ;
+  typedef typename Analysis::pointer_type pointer_type;
+  typedef typename Analysis::value_type value_type;
+  typedef typename Analysis::reference_type reference_type;
 
+  using iterate_type =
+      typename Kokkos::Impl::HostIterateTile<MDRangePolicy, FunctorType,
+                                             WorkTag, reference_type>;
 
-  using iterate_type = typename Kokkos::Impl::HostIterateTile< MDRangePolicy
-                                                             , FunctorType
-                                                             , WorkTag
-                                                             , reference_type
-                                                             >;
+  const FunctorType m_functor;
+  const MDRangePolicy m_mdr_policy;
+  const Policy m_policy;
+  const ReducerType m_reducer;
+  const pointer_type m_result_ptr;
 
-
-  const FunctorType   m_functor ;
-  const MDRangePolicy m_mdr_policy ;
-  const Policy        m_policy ;
-  const ReducerType   m_reducer ;
-  const pointer_type  m_result_ptr ;
-
-  inline
-  void
-  exec( reference_type update ) const
-    {
-      const typename Policy::member_type e = m_policy.end();
-      for ( typename Policy::member_type i = m_policy.begin() ; i < e ; ++i ) {
-        iterate_type( m_mdr_policy, m_functor, update )( i );
-      }
+  inline void exec(reference_type update) const {
+    const typename Policy::member_type e = m_policy.end();
+    for (typename Policy::member_type i = m_policy.begin(); i < e; ++i) {
+      iterate_type(m_mdr_policy, m_functor, update)(i);
     }
+  }
 
-public:
+ public:
+  inline void execute() const {
+    const size_t pool_reduce_size =
+        Analysis::value_size(ReducerConditional::select(m_functor, m_reducer));
+    const size_t team_reduce_size  = 0;  // Never shrinks
+    const size_t team_shared_size  = 0;  // Never shrinks
+    const size_t thread_local_size = 0;  // Never shrinks
 
-  inline
-  void execute() const
-    {
-      const size_t pool_reduce_size =
-        Analysis::value_size( ReducerConditional::select(m_functor , m_reducer) );
-      const size_t team_reduce_size  = 0 ; // Never shrinks
-      const size_t team_shared_size  = 0 ; // Never shrinks
-      const size_t thread_local_size = 0 ; // Never shrinks
+    serial_resize_thread_team_data(pool_reduce_size, team_reduce_size,
+                                   team_shared_size, thread_local_size);
 
-      serial_resize_thread_team_data( pool_reduce_size
-                                    , team_reduce_size
-                                    , team_shared_size
-                                    , thread_local_size );
+    HostThreadTeamData& data = *serial_get_thread_team_data();
 
-      HostThreadTeamData & data = *serial_get_thread_team_data();
-
-      pointer_type ptr =
+    pointer_type ptr =
         m_result_ptr ? m_result_ptr : pointer_type(data.pool_reduce_local());
 
-      reference_type update =
-        ValueInit::init(  ReducerConditional::select(m_functor , m_reducer) , ptr );
+    reference_type update =
+        ValueInit::init(ReducerConditional::select(m_functor, m_reducer), ptr);
 
-      this-> exec( update );
+    this->exec(update);
 
-      Kokkos::Impl::FunctorFinal< ReducerTypeFwd , WorkTagFwd >::
-        final(  ReducerConditional::select(m_functor , m_reducer) , ptr );
-    }
+    Kokkos::Impl::FunctorFinal<ReducerTypeFwd, WorkTagFwd>::final(
+        ReducerConditional::select(m_functor, m_reducer), ptr);
+  }
 
-  template< class HostViewType >
-  ParallelReduce( const FunctorType  & arg_functor ,
-                  const MDRangePolicy       & arg_policy ,
-                  const HostViewType & arg_result_view ,
-                  typename std::enable_if<
-                               Kokkos::is_view< HostViewType >::value &&
-                              !Kokkos::is_reducer_type<ReducerType>::value
-                  ,void*>::type = NULL)
-    : m_functor( arg_functor )
-    , m_mdr_policy( arg_policy )
-    , m_policy( Policy(0, m_mdr_policy.m_num_tiles).set_chunk_size(1) )
-    , m_reducer( InvalidType() )
-    , m_result_ptr( arg_result_view.data() )
-    {
-      static_assert( Kokkos::is_view< HostViewType >::value
-        , "Kokkos::Serial reduce result must be a View" );
+  template <class HostViewType>
+  ParallelReduce(
+      const FunctorType& arg_functor, const MDRangePolicy& arg_policy,
+      const HostViewType& arg_result_view,
+      typename std::enable_if<Kokkos::is_view<HostViewType>::value &&
+                                  !Kokkos::is_reducer_type<ReducerType>::value,
+                              void*>::type = NULL)
+      : m_functor(arg_functor),
+        m_mdr_policy(arg_policy),
+        m_policy(Policy(0, m_mdr_policy.m_num_tiles).set_chunk_size(1)),
+        m_reducer(InvalidType()),
+        m_result_ptr(arg_result_view.data()) {
+    static_assert(Kokkos::is_view<HostViewType>::value,
+                  "Kokkos::Serial reduce result must be a View");
 
-      static_assert( std::is_same< typename HostViewType::memory_space , HostSpace >::value
-        , "Kokkos::Serial reduce result must be a View in HostSpace" );
-    }
+    static_assert(
+        std::is_same<typename HostViewType::memory_space, HostSpace>::value,
+        "Kokkos::Serial reduce result must be a View in HostSpace");
+  }
 
-  inline
-  ParallelReduce( const FunctorType & arg_functor
-                , MDRangePolicy       arg_policy
-                , const ReducerType& reducer )
-    : m_functor( arg_functor )
-    , m_mdr_policy(  arg_policy )
-    , m_policy( Policy(0, m_mdr_policy.m_num_tiles).set_chunk_size(1) )
-    , m_reducer( reducer )
-    , m_result_ptr(  reducer.view().data() )
-    {
-      /*static_assert( std::is_same< typename ViewType::memory_space
-                                      , Kokkos::HostSpace >::value
-        , "Reduction result on Kokkos::OpenMP must be a Kokkos::View in HostSpace" );*/
-    }
+  inline ParallelReduce(const FunctorType& arg_functor,
+                        MDRangePolicy arg_policy, const ReducerType& reducer)
+      : m_functor(arg_functor),
+        m_mdr_policy(arg_policy),
+        m_policy(Policy(0, m_mdr_policy.m_num_tiles).set_chunk_size(1)),
+        m_reducer(reducer),
+        m_result_ptr(reducer.view().data()) {
+    /*static_assert( std::is_same< typename ViewType::memory_space
+                                    , Kokkos::HostSpace >::value
+      , "Reduction result on Kokkos::OpenMP must be a Kokkos::View in HostSpace"
+      );*/
+  }
 };
 
-
-
-} // namespace Impl
-} // namespace Kokkos
+}  // namespace Impl
+}  // namespace Kokkos
 
 /*--------------------------------------------------------------------------*/
 /*--------------------------------------------------------------------------*/
@@ -986,225 +950,193 @@ public:
 namespace Kokkos {
 namespace Impl {
 
-template< class FunctorType , class ... Properties >
-class ParallelFor< FunctorType
-                 , Kokkos::TeamPolicy< Properties ... >
-                 , Kokkos::Serial
-                 >
-{
-private:
-
+template <class FunctorType, class... Properties>
+class ParallelFor<FunctorType, Kokkos::TeamPolicy<Properties...>,
+                  Kokkos::Serial> {
+ private:
   enum { TEAM_REDUCE_SIZE = 512 };
 
-  typedef TeamPolicyInternal< Kokkos::Serial , Properties ...> Policy ;
-  typedef typename Policy::member_type                       Member ;
+  typedef TeamPolicyInternal<Kokkos::Serial, Properties...> Policy;
+  typedef typename Policy::member_type Member;
 
-  const FunctorType  m_functor ;
-  const int          m_league ;
-  const int          m_shared ;
+  const FunctorType m_functor;
+  const int m_league;
+  const int m_shared;
 
-  template< class TagType >
-  inline
-  typename std::enable_if< std::is_same< TagType , void >::value >::type
-  exec( HostThreadTeamData & data ) const
-    {
-      for ( int ileague = 0 ; ileague < m_league ; ++ileague ) {
-        m_functor( Member(data,ileague,m_league) );
-      }
+  template <class TagType>
+  inline typename std::enable_if<std::is_same<TagType, void>::value>::type exec(
+      HostThreadTeamData& data) const {
+    for (int ileague = 0; ileague < m_league; ++ileague) {
+      m_functor(Member(data, ileague, m_league));
     }
-
-  template< class TagType >
-  inline
-  typename std::enable_if< ! std::is_same< TagType , void >::value >::type
-  exec( HostThreadTeamData & data ) const
-    {
-      const TagType t{} ;
-      for ( int ileague = 0 ; ileague < m_league ; ++ileague ) {
-        m_functor( t , Member(data,ileague,m_league) );
-      }
-    }
-
-public:
-
-  inline
-  void execute() const
-    {
-      const size_t pool_reduce_size  = 0 ; // Never shrinks
-      const size_t team_reduce_size  = TEAM_REDUCE_SIZE ;
-      const size_t team_shared_size  = m_shared ;
-      const size_t thread_local_size = 0 ; // Never shrinks
-
-      serial_resize_thread_team_data( pool_reduce_size
-                                    , team_reduce_size
-                                    , team_shared_size
-                                    , thread_local_size );
-
-      HostThreadTeamData & data = *serial_get_thread_team_data();
-
-      this->template exec< typename Policy::work_tag >( data );
-    }
-
-  ParallelFor( const FunctorType & arg_functor
-             , const Policy      & arg_policy )
-    : m_functor( arg_functor )
-    , m_league(  arg_policy.league_size() )
-    , m_shared( arg_policy.scratch_size(0) +
-                arg_policy.scratch_size(1) +
-                FunctorTeamShmemSize< FunctorType >::value( arg_functor , 1 ) )
-    { }
-};
-
-/*--------------------------------------------------------------------------*/
-
-template< class FunctorType , class ReducerType , class ... Properties >
-class ParallelReduce< FunctorType
-                    , Kokkos::TeamPolicy< Properties ... >
-                    , ReducerType
-                    , Kokkos::Serial
-                    >
-{
-private:
-
-  enum { TEAM_REDUCE_SIZE = 512 };
-
-  typedef TeamPolicyInternal< Kokkos::Serial, Properties ... > Policy ;
-
-  typedef FunctorAnalysis< FunctorPatternInterface::REDUCE , Policy , FunctorType > Analysis ;
-
-  typedef typename Policy::member_type                       Member ;
-  typedef typename Policy::work_tag                          WorkTag ;
-
-  typedef Kokkos::Impl::if_c< std::is_same<InvalidType,ReducerType>::value, FunctorType, ReducerType> ReducerConditional;
-  typedef typename ReducerConditional::type ReducerTypeFwd;
-  typedef typename Kokkos::Impl::if_c< std::is_same<InvalidType,ReducerType>::value, WorkTag, void>::type WorkTagFwd;
-
-  typedef Kokkos::Impl::FunctorValueInit<   ReducerTypeFwd , WorkTagFwd >  ValueInit ;
-
-  typedef typename Analysis::pointer_type    pointer_type ;
-  typedef typename Analysis::reference_type  reference_type ;
-
-  const FunctorType  m_functor ;
-  const int          m_league ;
-  const ReducerType  m_reducer ;
-        pointer_type m_result_ptr ;
-  const int          m_shared ;
-
-  template< class TagType >
-  inline
-  typename std::enable_if< std::is_same< TagType , void >::value >::type
-  exec( HostThreadTeamData & data , reference_type update ) const
-    {
-      for ( int ileague = 0 ; ileague < m_league ; ++ileague ) {
-        m_functor( Member(data,ileague,m_league) , update );
-      }
-    }
-
-  template< class TagType >
-  inline
-  typename std::enable_if< ! std::is_same< TagType , void >::value >::type
-  exec( HostThreadTeamData & data , reference_type update ) const
-    {
-      const TagType t{} ;
-
-      for ( int ileague = 0 ; ileague < m_league ; ++ileague ) {
-        m_functor( t , Member(data,ileague,m_league) , update );
-      }
-    }
-
-public:
-
-  inline
-  void execute() const
-    {
-      const size_t pool_reduce_size  =
-        Analysis::value_size( ReducerConditional::select(m_functor, m_reducer));
-
-      const size_t team_reduce_size  = TEAM_REDUCE_SIZE ;
-      const size_t team_shared_size  = m_shared ;
-      const size_t thread_local_size = 0 ; // Never shrinks
-
-      serial_resize_thread_team_data( pool_reduce_size
-                                    , team_reduce_size
-                                    , team_shared_size
-                                    , thread_local_size );
-
-
-      HostThreadTeamData & data = *serial_get_thread_team_data();
-
-      pointer_type ptr =
-        m_result_ptr ? m_result_ptr : pointer_type(data.pool_reduce_local());
-
-      reference_type update =
-        ValueInit::init( ReducerConditional::select(m_functor , m_reducer) , ptr );
-
-      this-> template exec< WorkTag >( data , update );
-
-      Kokkos::Impl::FunctorFinal< ReducerTypeFwd , WorkTagFwd >::
-        final(  ReducerConditional::select(m_functor , m_reducer) , ptr );
-    }
-
-  template< class ViewType >
-  ParallelReduce( const FunctorType  & arg_functor
-                , const Policy       & arg_policy
-                , const ViewType     & arg_result ,
-                typename std::enable_if<
-                  Kokkos::is_view< ViewType >::value &&
-                  !Kokkos::is_reducer_type<ReducerType>::value
-                  ,void*>::type = NULL)
-    : m_functor( arg_functor )
-    , m_league( arg_policy.league_size() )
-    , m_reducer( InvalidType() )
-    , m_result_ptr( arg_result.data() )
-    , m_shared( arg_policy.scratch_size(0) +
-                arg_policy.scratch_size(1) +
-                FunctorTeamShmemSize< FunctorType >::value( m_functor , 1 ) )
-    {
-      static_assert( Kokkos::is_view< ViewType >::value
-        , "Reduction result on Kokkos::Serial must be a Kokkos::View" );
-
-      static_assert( std::is_same< typename ViewType::memory_space
-                                      , Kokkos::HostSpace >::value
-        , "Reduction result on Kokkos::Serial must be a Kokkos::View in HostSpace" );
-    }
-
-  inline
-  ParallelReduce( const FunctorType & arg_functor
-                , Policy       arg_policy
-                , const ReducerType& reducer )
-    : m_functor( arg_functor )
-    , m_league(  arg_policy.league_size() )
-    , m_reducer( reducer )
-    , m_result_ptr(  reducer.view().data() )
-    , m_shared( arg_policy.scratch_size(0) +
-                arg_policy.scratch_size(1) +
-                FunctorTeamShmemSize< FunctorType >::value( arg_functor , 1 ) )
-  {
-  /*static_assert( std::is_same< typename ViewType::memory_space
-                          , Kokkos::HostSpace >::value
-  , "Reduction result on Kokkos::OpenMP must be a Kokkos::View in HostSpace" );*/
   }
 
+  template <class TagType>
+  inline typename std::enable_if<!std::is_same<TagType, void>::value>::type
+  exec(HostThreadTeamData& data) const {
+    const TagType t{};
+    for (int ileague = 0; ileague < m_league; ++ileague) {
+      m_functor(t, Member(data, ileague, m_league));
+    }
+  }
+
+ public:
+  inline void execute() const {
+    const size_t pool_reduce_size  = 0;  // Never shrinks
+    const size_t team_reduce_size  = TEAM_REDUCE_SIZE;
+    const size_t team_shared_size  = m_shared;
+    const size_t thread_local_size = 0;  // Never shrinks
+
+    serial_resize_thread_team_data(pool_reduce_size, team_reduce_size,
+                                   team_shared_size, thread_local_size);
+
+    HostThreadTeamData& data = *serial_get_thread_team_data();
+
+    this->template exec<typename Policy::work_tag>(data);
+  }
+
+  ParallelFor(const FunctorType& arg_functor, const Policy& arg_policy)
+      : m_functor(arg_functor),
+        m_league(arg_policy.league_size()),
+        m_shared(arg_policy.scratch_size(0) + arg_policy.scratch_size(1) +
+                 FunctorTeamShmemSize<FunctorType>::value(arg_functor, 1)) {}
 };
 
-} // namespace Impl
-} // namespace Kokkos
+/*--------------------------------------------------------------------------*/
+
+template <class FunctorType, class ReducerType, class... Properties>
+class ParallelReduce<FunctorType, Kokkos::TeamPolicy<Properties...>,
+                     ReducerType, Kokkos::Serial> {
+ private:
+  enum { TEAM_REDUCE_SIZE = 512 };
+
+  typedef TeamPolicyInternal<Kokkos::Serial, Properties...> Policy;
+
+  typedef FunctorAnalysis<FunctorPatternInterface::REDUCE, Policy, FunctorType>
+      Analysis;
+
+  typedef typename Policy::member_type Member;
+  typedef typename Policy::work_tag WorkTag;
+
+  typedef Kokkos::Impl::if_c<std::is_same<InvalidType, ReducerType>::value,
+                             FunctorType, ReducerType>
+      ReducerConditional;
+  typedef typename ReducerConditional::type ReducerTypeFwd;
+  typedef
+      typename Kokkos::Impl::if_c<std::is_same<InvalidType, ReducerType>::value,
+                                  WorkTag, void>::type WorkTagFwd;
+
+  typedef Kokkos::Impl::FunctorValueInit<ReducerTypeFwd, WorkTagFwd> ValueInit;
+
+  typedef typename Analysis::pointer_type pointer_type;
+  typedef typename Analysis::reference_type reference_type;
+
+  const FunctorType m_functor;
+  const int m_league;
+  const ReducerType m_reducer;
+  pointer_type m_result_ptr;
+  const int m_shared;
+
+  template <class TagType>
+  inline typename std::enable_if<std::is_same<TagType, void>::value>::type exec(
+      HostThreadTeamData& data, reference_type update) const {
+    for (int ileague = 0; ileague < m_league; ++ileague) {
+      m_functor(Member(data, ileague, m_league), update);
+    }
+  }
+
+  template <class TagType>
+  inline typename std::enable_if<!std::is_same<TagType, void>::value>::type
+  exec(HostThreadTeamData& data, reference_type update) const {
+    const TagType t{};
+
+    for (int ileague = 0; ileague < m_league; ++ileague) {
+      m_functor(t, Member(data, ileague, m_league), update);
+    }
+  }
+
+ public:
+  inline void execute() const {
+    const size_t pool_reduce_size =
+        Analysis::value_size(ReducerConditional::select(m_functor, m_reducer));
+
+    const size_t team_reduce_size  = TEAM_REDUCE_SIZE;
+    const size_t team_shared_size  = m_shared;
+    const size_t thread_local_size = 0;  // Never shrinks
+
+    serial_resize_thread_team_data(pool_reduce_size, team_reduce_size,
+                                   team_shared_size, thread_local_size);
+
+    HostThreadTeamData& data = *serial_get_thread_team_data();
+
+    pointer_type ptr =
+        m_result_ptr ? m_result_ptr : pointer_type(data.pool_reduce_local());
+
+    reference_type update =
+        ValueInit::init(ReducerConditional::select(m_functor, m_reducer), ptr);
+
+    this->template exec<WorkTag>(data, update);
+
+    Kokkos::Impl::FunctorFinal<ReducerTypeFwd, WorkTagFwd>::final(
+        ReducerConditional::select(m_functor, m_reducer), ptr);
+  }
+
+  template <class ViewType>
+  ParallelReduce(
+      const FunctorType& arg_functor, const Policy& arg_policy,
+      const ViewType& arg_result,
+      typename std::enable_if<Kokkos::is_view<ViewType>::value &&
+                                  !Kokkos::is_reducer_type<ReducerType>::value,
+                              void*>::type = NULL)
+      : m_functor(arg_functor),
+        m_league(arg_policy.league_size()),
+        m_reducer(InvalidType()),
+        m_result_ptr(arg_result.data()),
+        m_shared(arg_policy.scratch_size(0) + arg_policy.scratch_size(1) +
+                 FunctorTeamShmemSize<FunctorType>::value(m_functor, 1)) {
+    static_assert(Kokkos::is_view<ViewType>::value,
+                  "Reduction result on Kokkos::Serial must be a Kokkos::View");
+
+    static_assert(
+        std::is_same<typename ViewType::memory_space, Kokkos::HostSpace>::value,
+        "Reduction result on Kokkos::Serial must be a Kokkos::View in "
+        "HostSpace");
+  }
+
+  inline ParallelReduce(const FunctorType& arg_functor, Policy arg_policy,
+                        const ReducerType& reducer)
+      : m_functor(arg_functor),
+        m_league(arg_policy.league_size()),
+        m_reducer(reducer),
+        m_result_ptr(reducer.view().data()),
+        m_shared(arg_policy.scratch_size(0) + arg_policy.scratch_size(1) +
+                 FunctorTeamShmemSize<FunctorType>::value(arg_functor, 1)) {
+    /*static_assert( std::is_same< typename ViewType::memory_space
+                            , Kokkos::HostSpace >::value
+    , "Reduction result on Kokkos::OpenMP must be a Kokkos::View in HostSpace"
+    );*/
+  }
+};
+
+}  // namespace Impl
+}  // namespace Kokkos
 
 /*--------------------------------------------------------------------------*/
 /*--------------------------------------------------------------------------*/
 
-namespace Kokkos { namespace Experimental {
+namespace Kokkos {
+namespace Experimental {
 
-template<>
-class UniqueToken< Serial, UniqueTokenScope::Instance>
-{
-public:
+template <>
+class UniqueToken<Serial, UniqueTokenScope::Instance> {
+ public:
   using execution_space = Serial;
   using size_type       = int;
 
   /// \brief create object size for concurrency on the given instance
   ///
   /// This object should not be shared between instances
-  UniqueToken( execution_space const& = execution_space() ) noexcept {}
+  UniqueToken(execution_space const& = execution_space()) noexcept {}
 
   /// \brief upper bound for acquired values, i.e. 0 <= value < size()
   KOKKOS_INLINE_FUNCTION
@@ -1212,24 +1144,23 @@ public:
 
   /// \brief acquire value such that 0 <= value < size()
   KOKKOS_INLINE_FUNCTION
-  int acquire() const  noexcept { return 0; }
+  int acquire() const noexcept { return 0; }
 
   /// \brief release a value acquired by generate
   KOKKOS_INLINE_FUNCTION
-  void release( int ) const noexcept {}
+  void release(int) const noexcept {}
 };
 
-template<>
-class UniqueToken< Serial, UniqueTokenScope::Global>
-{
-public:
+template <>
+class UniqueToken<Serial, UniqueTokenScope::Global> {
+ public:
   using execution_space = Serial;
   using size_type       = int;
 
   /// \brief create object size for concurrency on the given instance
   ///
   /// This object should not be shared between instances
-  UniqueToken( execution_space const& = execution_space() ) noexcept {}
+  UniqueToken(execution_space const& = execution_space()) noexcept {}
 
   /// \brief upper bound for acquired values, i.e. 0 <= value < size()
   KOKKOS_INLINE_FUNCTION
@@ -1237,17 +1168,17 @@ public:
 
   /// \brief acquire value such that 0 <= value < size()
   KOKKOS_INLINE_FUNCTION
-  int acquire() const  noexcept { return 0; }
+  int acquire() const noexcept { return 0; }
 
   /// \brief release a value acquired by generate
   KOKKOS_INLINE_FUNCTION
-  void release( int ) const noexcept {}
+  void release(int) const noexcept {}
 };
 
-}} // namespace Kokkos::Experimental
+}  // namespace Experimental
+}  // namespace Kokkos
 
 #include <impl/Kokkos_Serial_Task.hpp>
 
-#endif // defined( KOKKOS_ENABLE_SERIAL )
-#endif /* #define KOKKOS_SERIAL_HPP */
-
+#endif  // defined( KOKKOS_ENABLE_SERIAL )
+#endif  /* #define KOKKOS_SERIAL_HPP */
diff --git a/lib/kokkos/core/src/Kokkos_TaskPolicy.hpp b/lib/kokkos/core/src/Kokkos_TaskPolicy.hpp
index 00bceec2b5..91e079a0e7 100644
--- a/lib/kokkos/core/src/Kokkos_TaskPolicy.hpp
+++ b/lib/kokkos/core/src/Kokkos_TaskPolicy.hpp
@@ -1,13 +1,14 @@
 /*
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -36,7 +37,7 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 */
@@ -44,4 +45,3 @@
 // For backward compatibility:
 
 #include <Kokkos_TaskScheduler.hpp>
-
diff --git a/lib/kokkos/core/src/Kokkos_TaskScheduler.hpp b/lib/kokkos/core/src/Kokkos_TaskScheduler.hpp
index 1c3d58af08..4a78d6aca1 100644
--- a/lib/kokkos/core/src/Kokkos_TaskScheduler.hpp
+++ b/lib/kokkos/core/src/Kokkos_TaskScheduler.hpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -47,7 +48,7 @@
 //----------------------------------------------------------------------------
 
 #include <Kokkos_Macros.hpp>
-#if defined( KOKKOS_ENABLE_TASKDAG )
+#if defined(KOKKOS_ENABLE_TASKDAG)
 
 #include <Kokkos_Core_fwd.hpp>
 #include <Kokkos_TaskScheduler_fwd.hpp>
@@ -74,36 +75,33 @@ namespace Impl {
 template <class, class>
 class TaskExec;
 
-} // end namespace Impl
+}  // end namespace Impl
 
-
-template<class ExecSpace, class QueueType>
-class BasicTaskScheduler : public Impl::TaskSchedulerBase
-{
-public:
-
-  using scheduler_type = BasicTaskScheduler;
-  using execution_space = ExecSpace;
-  using queue_type = QueueType;
-  using memory_space = typename queue_type::memory_space;
-  using memory_pool = typename queue_type::memory_pool;
-  using specialization = Impl::TaskQueueSpecialization<BasicTaskScheduler>;
-  using member_type = typename specialization::member_type;
+template <class ExecSpace, class QueueType>
+class BasicTaskScheduler : public Impl::TaskSchedulerBase {
+ public:
+  using scheduler_type      = BasicTaskScheduler;
+  using execution_space     = ExecSpace;
+  using queue_type          = QueueType;
+  using memory_space        = typename queue_type::memory_space;
+  using memory_pool         = typename queue_type::memory_pool;
+  using specialization      = Impl::TaskQueueSpecialization<BasicTaskScheduler>;
+  using member_type         = typename specialization::member_type;
   using team_scheduler_type = BasicTaskScheduler;
   template <class Functor>
-  using runnable_task_type = Impl::Task<scheduler_type, typename Functor::value_type, Functor>;
+  using runnable_task_type =
+      Impl::Task<scheduler_type, typename Functor::value_type, Functor>;
   template <class ValueType>
   using future_type = Kokkos::BasicFuture<ValueType, BasicTaskScheduler>;
   template <class FunctorType>
   using future_type_for_functor = future_type<typename FunctorType::value_type>;
 
-private:
-
-  using track_type = Kokkos::Impl::SharedAllocationTracker ;
+ private:
+  using track_type = Kokkos::Impl::SharedAllocationTracker;
   using task_base  = Impl::TaskBase;
 
   track_type m_track;
-  queue_type * m_queue;
+  queue_type* m_queue;
 
   //----------------------------------------
 
@@ -121,17 +119,12 @@ private:
   //----------------------------------------
 
   KOKKOS_INLINE_FUNCTION
-  BasicTaskScheduler(
-    track_type arg_track,
-    queue_type* arg_queue
-  )
-    : m_track(std::move(arg_track)),
-      m_queue(std::move(arg_queue))
-  { }
+  BasicTaskScheduler(track_type arg_track, queue_type* arg_queue)
+      : m_track(std::move(arg_track)), m_queue(std::move(arg_queue)) {}
 
   KOKKOS_INLINE_FUNCTION
   team_scheduler_type get_team_scheduler(int team_rank) const {
-    return { m_track, &m_queue->get_team_queue(team_rank) };
+    return {m_track, &m_queue->get_team_queue(team_rank)};
   }
 
   //----------------------------------------
@@ -140,25 +133,23 @@ private:
   static constexpr task_base* _get_task_ptr(std::nullptr_t) { return nullptr; }
 
   template <class ValueType>
-  KOKKOS_INLINE_FUNCTION
-  static constexpr task_base* _get_task_ptr(future_type<ValueType>&& f)
-  {
+  KOKKOS_INLINE_FUNCTION static constexpr task_base* _get_task_ptr(
+      future_type<ValueType>&& f) {
     return f.m_task;
   }
 
-  template< int TaskEnum , typename DepTaskType , typename FunctorType >
+  template <int TaskEnum, typename DepTaskType, typename FunctorType>
   KOKKOS_FUNCTION
-  Kokkos::BasicFuture<typename FunctorType::value_type, scheduler_type>
-  _spawn_impl(
-    DepTaskType* arg_predecessor_task,
-    TaskPriority arg_priority,
-    typename task_base::function_type arg_function,
-    typename task_base::destroy_type arg_destroy,
-    FunctorType&& arg_functor
-  )
-  {
-    using functor_future_type = future_type_for_functor<typename std::decay<FunctorType>::type>;
-    using task_type = Impl::Task<BasicTaskScheduler, typename functor_future_type::value_type, FunctorType>;
+      Kokkos::BasicFuture<typename FunctorType::value_type, scheduler_type>
+      _spawn_impl(DepTaskType* arg_predecessor_task, TaskPriority arg_priority,
+                  typename task_base::function_type arg_function,
+                  typename task_base::destroy_type arg_destroy,
+                  FunctorType&& arg_functor) {
+    using functor_future_type =
+        future_type_for_functor<typename std::decay<FunctorType>::type>;
+    using task_type =
+        Impl::Task<BasicTaskScheduler, typename functor_future_type::value_type,
+                   FunctorType>;
 
     //----------------------------------------
     // Give single-thread back-ends an opportunity to clear
@@ -169,25 +160,25 @@ private:
 
     //----------------------------------------
 
-    functor_future_type f ;
+    functor_future_type f;
 
     // Allocate task from memory pool
 
     const size_t alloc_size =
-      m_queue->template spawn_allocation_size< FunctorType >();
+        m_queue->template spawn_allocation_size<FunctorType>();
 
     void* task_storage = m_queue->allocate(alloc_size);
 
     if (task_storage) {
-
       // Placement new construction
       // Reference count starts at two:
       //   +1 for the matching decrement when task is complete
       //   +1 for the future
-      f.m_task = new (task_storage) task_type( std::forward<FunctorType>(arg_functor) );
+      f.m_task =
+          new (task_storage) task_type(std::forward<FunctorType>(arg_functor));
 
-      f.m_task->m_apply      = arg_function;
-      //f.m_task->m_destroy    = arg_destroy;
+      f.m_task->m_apply = arg_function;
+      // f.m_task->m_destroy    = arg_destroy;
       f.m_task->m_queue      = m_queue;
       f.m_task->m_next       = arg_predecessor_task;
       f.m_task->m_ref_count  = 2;
@@ -202,81 +193,70 @@ private:
       // reference count does not need to be incremented for
       // the assignment.
 
-      m_queue->schedule_runnable( f.m_task );
+      m_queue->schedule_runnable(f.m_task);
       // This task may be updated or executed at any moment,
       // even during the call to 'schedule'.
     }
 
     return f;
-
   }
 
-public:
-
-
+ public:
   KOKKOS_INLINE_FUNCTION
   BasicTaskScheduler() : m_track(), m_queue(0) {}
 
   KOKKOS_INLINE_FUNCTION
-  BasicTaskScheduler( BasicTaskScheduler && rhs ) noexcept
-    : m_track(rhs.m_track),  // probably should be a move, but this is deprecated code anyway
-      m_queue(std::move(rhs.m_queue))
-  { }
+  BasicTaskScheduler(BasicTaskScheduler&& rhs) noexcept
+      : m_track(rhs.m_track),  // probably should be a move, but this is
+                               // deprecated code anyway
+        m_queue(std::move(rhs.m_queue)) {}
 
   KOKKOS_INLINE_FUNCTION
-  BasicTaskScheduler( BasicTaskScheduler const & rhs )
-    : m_track(rhs.m_track),
-      m_queue(rhs.m_queue)
-  { }
+  BasicTaskScheduler(BasicTaskScheduler const& rhs)
+      : m_track(rhs.m_track), m_queue(rhs.m_queue) {}
 
   KOKKOS_INLINE_FUNCTION
-  BasicTaskScheduler& operator=(BasicTaskScheduler&& rhs) noexcept
-  {
-    m_track = rhs.m_track;  // probably should be a move, but this is deprecated code anyway
+  BasicTaskScheduler& operator=(BasicTaskScheduler&& rhs) noexcept {
+    m_track = rhs.m_track;  // probably should be a move, but this is deprecated
+                            // code anyway
     m_queue = std::move(rhs.m_queue);
     return *this;
   }
 
   KOKKOS_INLINE_FUNCTION
-  BasicTaskScheduler& operator=(BasicTaskScheduler const& rhs)
-  {
+  BasicTaskScheduler& operator=(BasicTaskScheduler const& rhs) {
     m_track = rhs.m_track;
     m_queue = rhs.m_queue;
     return *this;
   }
 
-  explicit BasicTaskScheduler(memory_pool const & arg_memory_pool) noexcept
-    : m_track(), m_queue(0)
-    {
-      typedef Kokkos::Impl::SharedAllocationRecord
-        < memory_space , typename queue_type::Destroy >
-          record_type ;
+  explicit BasicTaskScheduler(memory_pool const& arg_memory_pool) noexcept
+      : m_track(), m_queue(0) {
+    typedef Kokkos::Impl::SharedAllocationRecord<memory_space,
+                                                 typename queue_type::Destroy>
+        record_type;
 
-      record_type * record =
-        record_type::allocate( memory_space()
-                             , "TaskQueue"
-                             , sizeof(queue_type)
-                             );
+    record_type* record =
+        record_type::allocate(memory_space(), "TaskQueue", sizeof(queue_type));
 
-      m_queue = new( record->data() ) queue_type( arg_memory_pool );
+    m_queue = new (record->data()) queue_type(arg_memory_pool);
 
-      record->m_destroy.m_queue = m_queue ;
+    record->m_destroy.m_queue = m_queue;
 
-      m_track.assign_allocated_record_to_uninitialized( record );
-    }
+    m_track.assign_allocated_record_to_uninitialized(record);
+  }
 
-  BasicTaskScheduler( memory_space const & arg_memory_space
-               , size_t const mempool_capacity
-               , unsigned const mempool_min_block_size  // = 1u << 6
-               , unsigned const mempool_max_block_size  // = 1u << 10
-               , unsigned const mempool_superblock_size // = 1u << 12
-               )
-    : BasicTaskScheduler( memory_pool( arg_memory_space
-                                , mempool_capacity
-                                , mempool_min_block_size
-                                , mempool_max_block_size
-                                , mempool_superblock_size ) )
-    {}
+  BasicTaskScheduler(memory_space const& arg_memory_space,
+                     size_t const mempool_capacity,
+                     unsigned const mempool_min_block_size  // = 1u << 6
+                     ,
+                     unsigned const mempool_max_block_size  // = 1u << 10
+                     ,
+                     unsigned const mempool_superblock_size  // = 1u << 12
+                     )
+      : BasicTaskScheduler(memory_pool(
+            arg_memory_space, mempool_capacity, mempool_min_block_size,
+            mempool_max_block_size, mempool_superblock_size)) {}
 
   //----------------------------------------
 
@@ -287,104 +267,89 @@ public:
   }
 
   KOKKOS_INLINE_FUNCTION
-  memory_pool * memory() const noexcept
-    { return m_queue ? &( m_queue->m_memory ) : (memory_pool*) 0 ; }
+  memory_pool* memory() const noexcept {
+    return m_queue ? &(m_queue->m_memory) : (memory_pool*)0;
+  }
 
   //----------------------------------------
   /**\brief  Allocation size for a spawned task */
-  template< typename FunctorType >
-  KOKKOS_FUNCTION
-  size_t spawn_allocation_size() const
-    { return m_queue->template spawn_allocation_size< FunctorType >(); }
+  template <typename FunctorType>
+  KOKKOS_FUNCTION size_t spawn_allocation_size() const {
+    return m_queue->template spawn_allocation_size<FunctorType>();
+  }
 
   /**\brief  Allocation size for a when_all aggregate */
   KOKKOS_FUNCTION
-  size_t when_all_allocation_size( int narg ) const
-    { return m_queue->when_all_allocation_size( narg ); }
-
+  size_t when_all_allocation_size(int narg) const {
+    return m_queue->when_all_allocation_size(narg);
+  }
 
   //----------------------------------------
 
   template <int TaskEnum, typename DepFutureType, typename FunctorType>
-  KOKKOS_FUNCTION static
-  Kokkos::BasicFuture<typename FunctorType::value_type, scheduler_type>
-  spawn(
-    Impl::TaskPolicyWithScheduler<TaskEnum, scheduler_type, DepFutureType>&& arg_policy,
-    typename task_base::function_type arg_function,
-    typename task_base::destroy_type arg_destroy,
-    FunctorType&& arg_functor
-  )
-  {
-    return std::move(arg_policy.scheduler()).template _spawn_impl<TaskEnum>(
-      _get_task_ptr(std::move(arg_policy.predecessor())),
-      arg_policy.priority(),
-      arg_function,
-      arg_destroy,
-      std::forward<FunctorType>(arg_functor)
-    );
+  KOKKOS_FUNCTION static Kokkos::BasicFuture<typename FunctorType::value_type,
+                                             scheduler_type>
+  spawn(Impl::TaskPolicyWithScheduler<TaskEnum, scheduler_type, DepFutureType>&&
+            arg_policy,
+        typename task_base::function_type arg_function,
+        typename task_base::destroy_type arg_destroy,
+        FunctorType&& arg_functor) {
+    return std::move(arg_policy.scheduler())
+        .template _spawn_impl<TaskEnum>(
+            _get_task_ptr(std::move(arg_policy.predecessor())),
+            arg_policy.priority(), arg_function, arg_destroy,
+            std::forward<FunctorType>(arg_functor));
   }
 
   template <int TaskEnum, typename DepFutureType, typename FunctorType>
   KOKKOS_FUNCTION
-  future_type_for_functor<typename std::decay<FunctorType>::type>
-  spawn(
-    Impl::TaskPolicyWithPredecessor<TaskEnum, DepFutureType>&& arg_policy,
-    FunctorType&& arg_functor
-  )
-  {
+      future_type_for_functor<typename std::decay<FunctorType>::type>
+      spawn(
+          Impl::TaskPolicyWithPredecessor<TaskEnum, DepFutureType>&& arg_policy,
+          FunctorType&& arg_functor) {
     using task_type = runnable_task_type<FunctorType>;
     typename task_type::function_type const ptr = task_type::apply;
     typename task_type::destroy_type const dtor = task_type::destroy;
 
     return _spawn_impl<TaskEnum>(
-      _get_task_ptr(std::move(arg_policy).predecessor()),
-      arg_policy.priority(),
-      ptr, dtor,
-      std::forward<FunctorType>(arg_functor)
-    );
+        _get_task_ptr(std::move(arg_policy).predecessor()),
+        arg_policy.priority(), ptr, dtor,
+        std::forward<FunctorType>(arg_functor));
   }
 
-  template<typename FunctorType, typename ValueType, typename Scheduler>
-  KOKKOS_FUNCTION static
-  void
-  respawn(
-    FunctorType* arg_self,
-    BasicFuture<ValueType,Scheduler> const & arg_dependence,
-    TaskPriority  const & arg_priority
-  ) {
+  template <typename FunctorType, typename ValueType, typename Scheduler>
+  KOKKOS_FUNCTION static void respawn(
+      FunctorType* arg_self,
+      BasicFuture<ValueType, Scheduler> const& arg_dependence,
+      TaskPriority const& arg_priority) {
     // Precondition: task is in Executing state
 
-    using value_type  = typename FunctorType::value_type ;
-    using task_type = Impl::Task<BasicTaskScheduler, value_type, FunctorType>;
+    using value_type = typename FunctorType::value_type;
+    using task_type  = Impl::Task<BasicTaskScheduler, value_type, FunctorType>;
 
-    task_type * const task = static_cast< task_type * >( arg_self );
+    task_type* const task = static_cast<task_type*>(arg_self);
 
     task->m_priority = static_cast<int>(arg_priority);
 
-    task->add_dependence( arg_dependence.m_task );
+    task->add_dependence(arg_dependence.m_task);
 
     // Postcondition: task is in Executing-Respawn state
   }
 
-  template< typename FunctorType >
-  KOKKOS_FUNCTION static
-  void
-  respawn(
-    FunctorType* arg_self,
-    BasicTaskScheduler const &,
-    TaskPriority  const & arg_priority
-  )
-  {
+  template <typename FunctorType>
+  KOKKOS_FUNCTION static void respawn(FunctorType* arg_self,
+                                      BasicTaskScheduler const&,
+                                      TaskPriority const& arg_priority) {
     // Precondition: task is in Executing state
 
     using value_type = typename FunctorType::value_type;
-    using task_type = Impl::Task<BasicTaskScheduler, value_type, FunctorType>;
+    using task_type  = Impl::Task<BasicTaskScheduler, value_type, FunctorType>;
 
-    task_type * const task = static_cast< task_type * >( arg_self );
+    task_type* const task = static_cast<task_type*>(arg_self);
 
     task->m_priority = static_cast<int>(arg_priority);
 
-    task->add_dependence( (task_base*) 0 );
+    task->add_dependence((task_base*)0);
 
     // Postcondition: task is in Executing-Respawn state
   }
@@ -393,162 +358,153 @@ public:
   /**\brief  Return a future that is complete
    *         when all input futures are complete.
    */
-  template<typename ValueType>
-  KOKKOS_FUNCTION
-  BasicFuture< void, scheduler_type >
-  when_all(BasicFuture<ValueType, BasicTaskScheduler> const arg[], int narg)
-  {
-
-    future_type<void> f ;
-
-    if ( narg ) {
+  template <typename ValueType>
+  KOKKOS_FUNCTION BasicFuture<void, scheduler_type> when_all(
+      BasicFuture<ValueType, BasicTaskScheduler> const arg[], int narg) {
+    future_type<void> f;
 
+    if (narg) {
       queue_type* q = m_queue;
 
-      //BasicTaskScheduler const* scheduler_ptr = nullptr;
+      // BasicTaskScheduler const* scheduler_ptr = nullptr;
 
-      for ( int i = 0 ; i < narg ; ++i ) {
-        task_base * const t = arg[i].m_task ;
-        if ( nullptr != t ) {
+      for (int i = 0; i < narg; ++i) {
+        task_base* const t = arg[i].m_task;
+        if (nullptr != t) {
           // Increment reference count to track subsequent assignment.
-          Kokkos::atomic_increment( &(t->m_ref_count) );
-          if(q != static_cast< queue_type const* >(t->m_queue)) {
-            Kokkos::abort("Kokkos when_all Futures must be in the same scheduler" );
+          Kokkos::atomic_increment(&(t->m_ref_count));
+          if (q != static_cast<queue_type const*>(t->m_queue)) {
+            Kokkos::abort(
+                "Kokkos when_all Futures must be in the same scheduler");
           }
         }
       }
 
-      if ( q != 0 ) { // this should probably handle the queue == 0 case, but this is deprecated code anyway
+      if (q != 0) {  // this should probably handle the queue == 0 case, but
+                     // this is deprecated code anyway
 
-        size_t const alloc_size = q->when_all_allocation_size( narg );
+        size_t const alloc_size = q->when_all_allocation_size(narg);
 
-        f.m_task =
-          reinterpret_cast< task_base * >( q->allocate( alloc_size ) );
-        //f.m_scheduler = *scheduler_ptr;
-
-        if ( f.m_task ) {
+        f.m_task = reinterpret_cast<task_base*>(q->allocate(alloc_size));
+        // f.m_scheduler = *scheduler_ptr;
 
+        if (f.m_task) {
           // Reference count starts at two:
           // +1 to match decrement when task completes
           // +1 for the future
 
-          new( f.m_task ) task_base();
+          new (f.m_task) task_base();
 
-          f.m_task->m_queue = q;
-          f.m_task->m_ref_count = 2 ;
+          f.m_task->m_queue      = q;
+          f.m_task->m_ref_count  = 2;
           f.m_task->m_alloc_size = static_cast<int32_t>(alloc_size);
-          f.m_task->m_dep_count = narg ;
-          f.m_task->m_task_type = task_base::Aggregate ;
+          f.m_task->m_dep_count  = narg;
+          f.m_task->m_task_type  = task_base::Aggregate;
 
           // Assign dependences, reference counts were already incremented
 
-          task_base * volatile * const dep =
-            f.m_task->aggregate_dependences();
+          task_base* volatile* const dep = f.m_task->aggregate_dependences();
 
-          for ( int i = 0 ; i < narg ; ++i ) { dep[i] = arg[i].m_task ; }
+          for (int i = 0; i < narg; ++i) {
+            dep[i] = arg[i].m_task;
+          }
 
           Kokkos::memory_fence();
 
-          q->schedule_aggregate( f.m_task );
+          q->schedule_aggregate(f.m_task);
           // this when_all may be processed at any moment
         }
       }
     }
 
-    return f ;
+    return f;
   }
 
-  template < class F >
-  KOKKOS_FUNCTION
-  BasicFuture< void, scheduler_type >
-  when_all( int narg , F const func )
-    {
-      using input_type  = decltype( func(0) );
+  template <class F>
+  KOKKOS_FUNCTION BasicFuture<void, scheduler_type> when_all(int narg,
+                                                             F const func) {
+    using input_type = decltype(func(0));
 
-      static_assert( is_future< input_type >::value
-                   , "Functor must return a Kokkos::Future" );
+    static_assert(is_future<input_type>::value,
+                  "Functor must return a Kokkos::Future");
 
-      future_type<void> f ;
+    future_type<void> f;
 
-      if ( 0 == narg ) return f ;
+    if (0 == narg) return f;
 
-      size_t const alloc_size = m_queue->when_all_allocation_size( narg );
+    size_t const alloc_size = m_queue->when_all_allocation_size(narg);
 
-      f.m_task =
-        reinterpret_cast< task_base * >( m_queue->allocate( alloc_size ) );
+    f.m_task = reinterpret_cast<task_base*>(m_queue->allocate(alloc_size));
 
-      if ( f.m_task ) {
+    if (f.m_task) {
+      // Reference count starts at two:
+      // +1 to match decrement when task completes
+      // +1 for the future
 
-        // Reference count starts at two:
-        // +1 to match decrement when task completes
-        // +1 for the future
+      new (f.m_task) task_base();
+      // f.m_scheduler = *this;
 
-        new( f.m_task ) task_base();
-        //f.m_scheduler = *this;
+      // f.m_task->m_scheduler = &f.m_scheduler;
+      f.m_task->m_queue      = m_queue;
+      f.m_task->m_ref_count  = 2;
+      f.m_task->m_alloc_size = static_cast<int32_t>(alloc_size);
+      f.m_task->m_dep_count  = narg;
+      f.m_task->m_task_type  = task_base::Aggregate;
+      // f.m_task->m_apply = nullptr;
+      // f.m_task->m_destroy = nullptr;
 
-        //f.m_task->m_scheduler = &f.m_scheduler;
-        f.m_task->m_queue = m_queue;
-        f.m_task->m_ref_count = 2 ;
-        f.m_task->m_alloc_size = static_cast<int32_t>(alloc_size);
-        f.m_task->m_dep_count = narg ;
-        f.m_task->m_task_type = task_base::Aggregate ;
-        //f.m_task->m_apply = nullptr;
-        //f.m_task->m_destroy = nullptr;
+      // Assign dependences, reference counts were already incremented
 
-        // Assign dependences, reference counts were already incremented
+      task_base* volatile* const dep = f.m_task->aggregate_dependences();
 
-        task_base * volatile * const dep =
-          f.m_task->aggregate_dependences();
-
-        for ( int i = 0 ; i < narg ; ++i ) {
-          const input_type arg_f = func(i);
-          if ( 0 != arg_f.m_task ) {
-
-            // Not scheduled, so task scheduler is not yet set
-            //if ( m_queue != static_cast< BasicTaskScheduler const * >( arg_f.m_task->m_scheduler )->m_queue ) {
-            //  Kokkos::abort("Kokkos when_all Futures must be in the same scheduler" );
-            //}
-            // Increment reference count to track subsequent assignment.
-            Kokkos::atomic_increment( &(arg_f.m_task->m_ref_count) );
-            dep[i] = arg_f.m_task ;
-          }
+      for (int i = 0; i < narg; ++i) {
+        const input_type arg_f = func(i);
+        if (0 != arg_f.m_task) {
+          // Not scheduled, so task scheduler is not yet set
+          // if ( m_queue != static_cast< BasicTaskScheduler const * >(
+          // arg_f.m_task->m_scheduler )->m_queue ) {
+          //  Kokkos::abort("Kokkos when_all Futures must be in the same
+          //  scheduler" );
+          //}
+          // Increment reference count to track subsequent assignment.
+          Kokkos::atomic_increment(&(arg_f.m_task->m_ref_count));
+          dep[i] = arg_f.m_task;
         }
-
-        Kokkos::memory_fence();
-
-        m_queue->schedule_aggregate( f.m_task );
-        // this when_all may be processed at any moment
       }
-      return f ;
+
+      Kokkos::memory_fence();
+
+      m_queue->schedule_aggregate(f.m_task);
+      // this when_all may be processed at any moment
     }
+    return f;
+  }
 
   //----------------------------------------
 
   KOKKOS_INLINE_FUNCTION
-  int allocation_capacity() const noexcept
-    { return m_queue->m_memory.capacity(); }
+  int allocation_capacity() const noexcept {
+    return m_queue->m_memory.capacity();
+  }
 
   KOKKOS_INLINE_FUNCTION
-  int allocated_task_count() const noexcept
-    { return m_queue->m_count_alloc ; }
+  int allocated_task_count() const noexcept { return m_queue->m_count_alloc; }
 
   KOKKOS_INLINE_FUNCTION
-  int allocated_task_count_max() const noexcept
-    { return m_queue->m_max_alloc ; }
+  int allocated_task_count_max() const noexcept { return m_queue->m_max_alloc; }
 
   KOKKOS_INLINE_FUNCTION
-  long allocated_task_count_accum() const noexcept
-    { return m_queue->m_accum_alloc ; }
+  long allocated_task_count_accum() const noexcept {
+    return m_queue->m_accum_alloc;
+  }
 
   //----------------------------------------
 
-  template<class S, class Q>
-  friend
-  void wait(Kokkos::BasicTaskScheduler<S, Q> const&);
-
+  template <class S, class Q>
+  friend void wait(Kokkos::BasicTaskScheduler<S, Q> const&);
 };
 
-} // namespace Kokkos
+}  // namespace Kokkos
 
 //----------------------------------------------------------------------------
 //----------------------------------------------------------------------------
@@ -559,121 +515,77 @@ namespace Kokkos {
 // Construct a TaskTeam execution policy
 
 template <class T, class Scheduler>
-Impl::TaskPolicyWithPredecessor<
-  Impl::TaskType::TaskTeam,
-  Kokkos::BasicFuture<T, Scheduler>
->
-KOKKOS_INLINE_FUNCTION
-TaskTeam(
-  Kokkos::BasicFuture<T, Scheduler> arg_future,
-  TaskPriority arg_priority = TaskPriority::Regular
-)
-{
-  return { std::move(arg_future), arg_priority };
+Impl::TaskPolicyWithPredecessor<Impl::TaskType::TaskTeam,
+                                Kokkos::BasicFuture<T, Scheduler> >
+    KOKKOS_INLINE_FUNCTION
+    TaskTeam(Kokkos::BasicFuture<T, Scheduler> arg_future,
+             TaskPriority arg_priority = TaskPriority::Regular) {
+  return {std::move(arg_future), arg_priority};
 }
 
 template <class Scheduler>
-Impl::TaskPolicyWithScheduler<
-  Impl::TaskType::TaskTeam, Scheduler
->
-KOKKOS_INLINE_FUNCTION
-TaskTeam(
-  Scheduler arg_scheduler,
-  typename std::enable_if<
-    Kokkos::is_scheduler<Scheduler>::value,
-    TaskPriority
-  >::type arg_priority = TaskPriority::Regular
-)
-{
-  return { std::move(arg_scheduler), arg_priority };
+Impl::TaskPolicyWithScheduler<Impl::TaskType::TaskTeam, Scheduler>
+    KOKKOS_INLINE_FUNCTION
+    TaskTeam(Scheduler arg_scheduler,
+             typename std::enable_if<Kokkos::is_scheduler<Scheduler>::value,
+                                     TaskPriority>::type arg_priority =
+                 TaskPriority::Regular) {
+  return {std::move(arg_scheduler), arg_priority};
 }
 
-template<
-  class Scheduler,
-  class PredecessorFuture
->
-Impl::TaskPolicyWithScheduler<
-  Kokkos::Impl::TaskType::TaskTeam,
-  Scheduler,
-  PredecessorFuture
->
-KOKKOS_INLINE_FUNCTION
-TaskTeam(
-  Scheduler arg_scheduler,
-  PredecessorFuture arg_future,
-  typename std::enable_if<
-    Kokkos::is_scheduler<Scheduler>::value
-      && Kokkos::is_future<PredecessorFuture>::value,
-    TaskPriority
-  >::type arg_priority = TaskPriority::Regular
-)
-{
-  static_assert(
-    std::is_same<typename PredecessorFuture::scheduler_type, Scheduler>::value,
-    "Can't create a task policy from a scheduler and a future from a different scheduler"
-  );
+template <class Scheduler, class PredecessorFuture>
+Impl::TaskPolicyWithScheduler<Kokkos::Impl::TaskType::TaskTeam, Scheduler,
+                              PredecessorFuture>
+    KOKKOS_INLINE_FUNCTION TaskTeam(
+        Scheduler arg_scheduler, PredecessorFuture arg_future,
+        typename std::enable_if<Kokkos::is_scheduler<Scheduler>::value &&
+                                    Kokkos::is_future<PredecessorFuture>::value,
+                                TaskPriority>::type arg_priority =
+            TaskPriority::Regular) {
+  static_assert(std::is_same<typename PredecessorFuture::scheduler_type,
+                             Scheduler>::value,
+                "Can't create a task policy from a scheduler and a future from "
+                "a different scheduler");
 
-  return { std::move(arg_scheduler), std::move(arg_future), arg_priority };
+  return {std::move(arg_scheduler), std::move(arg_future), arg_priority};
 }
 
 // Construct a TaskSingle execution policy
 
 template <class T, class Scheduler>
-Impl::TaskPolicyWithPredecessor<
-  Impl::TaskType::TaskSingle,
-  Kokkos::BasicFuture<T, Scheduler>
->
-KOKKOS_INLINE_FUNCTION
-TaskSingle(
-  Kokkos::BasicFuture<T, Scheduler> arg_future,
-  TaskPriority arg_priority = TaskPriority::Regular
-)
-{
-  return { std::move(arg_future), arg_priority };
+Impl::TaskPolicyWithPredecessor<Impl::TaskType::TaskSingle,
+                                Kokkos::BasicFuture<T, Scheduler> >
+    KOKKOS_INLINE_FUNCTION
+    TaskSingle(Kokkos::BasicFuture<T, Scheduler> arg_future,
+               TaskPriority arg_priority = TaskPriority::Regular) {
+  return {std::move(arg_future), arg_priority};
 }
 
 template <class Scheduler>
-Impl::TaskPolicyWithScheduler<
-  Impl::TaskType::TaskSingle, Scheduler
->
-KOKKOS_INLINE_FUNCTION
-TaskSingle(
-  Scheduler arg_scheduler,
-  typename std::enable_if<
-    Kokkos::is_scheduler<Scheduler>::value,
-    TaskPriority
-  >::type arg_priority = TaskPriority::Regular
-)
-{
-  return { std::move(arg_scheduler), arg_priority };
+Impl::TaskPolicyWithScheduler<Impl::TaskType::TaskSingle, Scheduler>
+    KOKKOS_INLINE_FUNCTION
+    TaskSingle(Scheduler arg_scheduler,
+               typename std::enable_if<Kokkos::is_scheduler<Scheduler>::value,
+                                       TaskPriority>::type arg_priority =
+                   TaskPriority::Regular) {
+  return {std::move(arg_scheduler), arg_priority};
 }
 
-template<
-  class Scheduler,
-  class PredecessorFuture
->
-Impl::TaskPolicyWithScheduler<
-  Kokkos::Impl::TaskType::TaskSingle,
-  Scheduler,
-  PredecessorFuture
->
-KOKKOS_INLINE_FUNCTION
-TaskSingle(
-  Scheduler arg_scheduler,
-  PredecessorFuture arg_future,
-  typename std::enable_if<
-    Kokkos::is_scheduler<Scheduler>::value
-      && Kokkos::is_future<PredecessorFuture>::value,
-    TaskPriority
-  >::type arg_priority = TaskPriority::Regular
-)
-{
-  static_assert(
-    std::is_same<typename PredecessorFuture::scheduler_type, Scheduler>::value,
-    "Can't create a task policy from a scheduler and a future from a different scheduler"
-  );
+template <class Scheduler, class PredecessorFuture>
+Impl::TaskPolicyWithScheduler<Kokkos::Impl::TaskType::TaskSingle, Scheduler,
+                              PredecessorFuture>
+    KOKKOS_INLINE_FUNCTION TaskSingle(
+        Scheduler arg_scheduler, PredecessorFuture arg_future,
+        typename std::enable_if<Kokkos::is_scheduler<Scheduler>::value &&
+                                    Kokkos::is_future<PredecessorFuture>::value,
+                                TaskPriority>::type arg_priority =
+            TaskPriority::Regular) {
+  static_assert(std::is_same<typename PredecessorFuture::scheduler_type,
+                             Scheduler>::value,
+                "Can't create a task policy from a scheduler and a future from "
+                "a different scheduler");
 
-  return { std::move(arg_scheduler), std::move(arg_future), arg_priority };
+  return {std::move(arg_scheduler), std::move(arg_future), arg_priority};
 }
 
 //----------------------------------------------------------------------------
@@ -684,31 +596,30 @@ TaskSingle(
  *  2) With scheduler or dependence
  *  3) High, Normal, or Low priority
  */
-template<int TaskEnum, typename Scheduler, typename DepFutureType, typename FunctorType>
-typename Scheduler::template future_type_for_functor<typename std::decay<FunctorType>::type>
-host_spawn(
-  Impl::TaskPolicyWithScheduler<TaskEnum, Scheduler, DepFutureType> arg_policy,
-  FunctorType&& arg_functor
-) {
+template <int TaskEnum, typename Scheduler, typename DepFutureType,
+          typename FunctorType>
+typename Scheduler::template future_type_for_functor<
+    typename std::decay<FunctorType>::type>
+host_spawn(Impl::TaskPolicyWithScheduler<TaskEnum, Scheduler, DepFutureType>
+               arg_policy,
+           FunctorType&& arg_functor) {
   using scheduler_type = Scheduler;
   using task_type =
-    typename scheduler_type::template runnable_task_type<FunctorType>;
+      typename scheduler_type::template runnable_task_type<FunctorType>;
 
-  static_assert(
-    TaskEnum == Impl::TaskType::TaskTeam || TaskEnum == Impl::TaskType::TaskSingle,
-    "Kokkos host_spawn requires TaskTeam or TaskSingle"
-  );
+  static_assert(TaskEnum == Impl::TaskType::TaskTeam ||
+                    TaskEnum == Impl::TaskType::TaskSingle,
+                "Kokkos host_spawn requires TaskTeam or TaskSingle");
 
   // May be spawning a Cuda task, must use the specialization
   // to query on-device function pointer.
   typename task_type::function_type ptr;
   typename task_type::destroy_type dtor;
-  Kokkos::Impl::TaskQueueSpecialization< scheduler_type >::
-    template get_function_pointer< task_type >(ptr, dtor);
+  Kokkos::Impl::TaskQueueSpecialization<
+      scheduler_type>::template get_function_pointer<task_type>(ptr, dtor);
 
-  return scheduler_type::spawn(
-    std::move(arg_policy), ptr, dtor, std::forward<FunctorType>(arg_functor)
-  );
+  return scheduler_type::spawn(std::move(arg_policy), ptr, dtor,
+                               std::forward<FunctorType>(arg_functor));
 }
 
 /**\brief  A task spawns a task with options
@@ -717,38 +628,38 @@ host_spawn(
  *  2) With scheduler or dependence
  *  3) High, Normal, or Low priority
  */
-template<int TaskEnum, typename Scheduler, typename DepFutureType, typename FunctorType>
-typename Scheduler::template future_type_for_functor<typename std::decay<FunctorType>::type>
-KOKKOS_INLINE_FUNCTION
-task_spawn(
-  Impl::TaskPolicyWithScheduler<TaskEnum, Scheduler, DepFutureType> arg_policy,
-  FunctorType&& arg_functor
-)
-{
+template <int TaskEnum, typename Scheduler, typename DepFutureType,
+          typename FunctorType>
+typename Scheduler::template future_type_for_functor<
+    typename std::decay<FunctorType>::type>
+    KOKKOS_INLINE_FUNCTION
+    task_spawn(Impl::TaskPolicyWithScheduler<TaskEnum, Scheduler, DepFutureType>
+                   arg_policy,
+               FunctorType&& arg_functor) {
   using scheduler_type = Scheduler;
 
   using task_type =
-    typename scheduler_type::template runnable_task_type<FunctorType>;
+      typename scheduler_type::template runnable_task_type<FunctorType>;
 
- #if defined( KOKKOS_ACTIVE_EXECUTION_MEMORY_SPACE_HOST ) && \
-     defined( KOKKOS_ENABLE_CUDA )
+#if defined(KOKKOS_ACTIVE_EXECUTION_MEMORY_SPACE_HOST) && \
+    defined(KOKKOS_ENABLE_CUDA)
 
-   static_assert( ! std::is_same< Kokkos::Cuda , typename Scheduler::execution_space >::value
-                , "Error calling Kokkos::task_spawn for Cuda space within Host code" );
+  // This doesn't work with clang cuda
+  // static_assert(
+  //    !std::is_same<Kokkos::Cuda, typename Scheduler::execution_space>::value,
+  //    "Error calling Kokkos::task_spawn for Cuda space within Host code");
 
- #endif
+#endif
 
-  static_assert(
-    TaskEnum == Impl::TaskType::TaskTeam || TaskEnum == Impl::TaskType::TaskSingle,
-    "Kokkos task_spawn requires TaskTeam or TaskSingle"
-  );
+  static_assert(TaskEnum == Impl::TaskType::TaskTeam ||
+                    TaskEnum == Impl::TaskType::TaskSingle,
+                "Kokkos task_spawn requires TaskTeam or TaskSingle");
 
-  typename task_type::function_type const ptr = task_type::apply ;
-  typename task_type::destroy_type const dtor = task_type::destroy ;
+  typename task_type::function_type const ptr = task_type::apply;
+  typename task_type::destroy_type const dtor = task_type::destroy;
 
   return scheduler_type::spawn(std::move(arg_policy), ptr, dtor,
-    std::forward<FunctorType>(arg_functor)
-  );
+                               std::forward<FunctorType>(arg_functor));
 }
 
 /**\brief  A task respawns itself with options
@@ -756,29 +667,22 @@ task_spawn(
  *  1) With scheduler or dependence
  *  2) High, Normal, or Low priority
  */
-template< typename FunctorType , typename T >
-void
-KOKKOS_INLINE_FUNCTION
-respawn( FunctorType         * arg_self
-       , T             const & arg
-       , TaskPriority  const & arg_priority = TaskPriority::Regular
-       )
-{
-  static_assert( Kokkos::is_future<T>::value ||
-                 Kokkos::is_scheduler<T>::value
-               , "Kokkos respawn argument must be Future or TaskScheduler" );
+template <typename FunctorType, typename T>
+void KOKKOS_INLINE_FUNCTION
+respawn(FunctorType* arg_self, T const& arg,
+        TaskPriority const& arg_priority = TaskPriority::Regular) {
+  static_assert(Kokkos::is_future<T>::value || Kokkos::is_scheduler<T>::value,
+                "Kokkos respawn argument must be Future or TaskScheduler");
 
-  T::scheduler_type::respawn(
-    arg_self , arg , arg_priority
-  );
+  T::scheduler_type::respawn(arg_self, arg, arg_priority);
 }
 
 //----------------------------------------------------------------------------
 
-//template<typename ValueType, typename Scheduler>
-//KOKKOS_INLINE_FUNCTION
-//BasicFuture<void, Scheduler>
-//when_all(BasicFuture<ValueType, Scheduler> const arg[], int narg)
+// template<typename ValueType, typename Scheduler>
+// KOKKOS_INLINE_FUNCTION
+// BasicFuture<void, Scheduler>
+// when_all(BasicFuture<ValueType, Scheduler> const arg[], int narg)
 //{
 //  return BasicFuture<void, Scheduler>::scheduler_type::when_all(arg, narg);
 //}
@@ -786,16 +690,14 @@ respawn( FunctorType         * arg_self
 //----------------------------------------------------------------------------
 // Wait for all runnable tasks to complete
 
-template<class ExecSpace, class QueueType>
-inline
-void wait(BasicTaskScheduler<ExecSpace, QueueType> const& scheduler)
-{
+template <class ExecSpace, class QueueType>
+inline void wait(BasicTaskScheduler<ExecSpace, QueueType> const& scheduler) {
   using scheduler_type = BasicTaskScheduler<ExecSpace, QueueType>;
   scheduler_type::specialization::execute(scheduler);
-  //scheduler.m_queue->execute();
+  // scheduler.m_queue->execute();
 }
 
-} // namespace Kokkos
+}  // namespace Kokkos
 
 //----------------------------------------------------------------------------
 //----------------------------------------------------------------------------
@@ -806,4 +708,3 @@ void wait(BasicTaskScheduler<ExecSpace, QueueType> const& scheduler)
 
 #endif /* #if defined( KOKKOS_ENABLE_TASKDAG ) */
 #endif /* #ifndef KOKKOS_TASKSCHEDULER_HPP */
-
diff --git a/lib/kokkos/core/src/Kokkos_TaskScheduler_fwd.hpp b/lib/kokkos/core/src/Kokkos_TaskScheduler_fwd.hpp
index 79d502c729..c5f880775d 100644
--- a/lib/kokkos/core/src/Kokkos_TaskScheduler_fwd.hpp
+++ b/lib/kokkos/core/src/Kokkos_TaskScheduler_fwd.hpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -47,7 +48,7 @@
 //----------------------------------------------------------------------------
 
 #include <Kokkos_Macros.hpp>
-#if defined( KOKKOS_ENABLE_TASKDAG )
+#if defined(KOKKOS_ENABLE_TASKDAG)
 
 #include <Kokkos_Core_fwd.hpp>
 //----------------------------------------------------------------------------
@@ -65,22 +66,20 @@ class SimpleTaskScheduler;
 template <class Space, class Queue>
 class BasicTaskScheduler;
 
-template< typename Space >
+template <typename Space>
 struct is_scheduler : public std::false_type {};
 
-template<class Space, class Queue>
-struct is_scheduler<BasicTaskScheduler<Space, Queue>> : public std::true_type {};
-
-template<class Space, class Queue>
-struct is_scheduler<SimpleTaskScheduler<Space, Queue>> : public std::true_type {};
-
-enum class TaskPriority : int {
-  High = 0,
-  Regular = 1,
-  Low = 2
+template <class Space, class Queue>
+struct is_scheduler<BasicTaskScheduler<Space, Queue>> : public std::true_type {
 };
 
-} // namespace Kokkos
+template <class Space, class Queue>
+struct is_scheduler<SimpleTaskScheduler<Space, Queue>> : public std::true_type {
+};
+
+enum class TaskPriority : int { High = 0, Regular = 1, Low = 2 };
+
+}  // namespace Kokkos
 
 //----------------------------------------------------------------------------
 
@@ -110,140 +109,124 @@ class TaskBase;
  *      : TaskBase< Space , void , void >
  *      { ... };
  */
-template< typename Space , typename ResultType , typename FunctorType >
+template <typename Space, typename ResultType, typename FunctorType>
 class Task;
 
 class TaskQueueBase;
 
-template< typename Space, typename MemorySpace>
+template <typename Space, typename MemorySpace>
 class TaskQueue;
 
-template< typename ExecSpace, typename MemorySpace>
+template <typename ExecSpace, typename MemorySpace>
 class TaskQueueMultiple;
 
-template<
-  typename ExecSpace, typename MemSpace, typename TaskQueueTraits,
-  class MemoryPool = Kokkos::MemoryPool<Kokkos::Device<ExecSpace, MemSpace>>
->
+template <typename ExecSpace, typename MemSpace, typename TaskQueueTraits,
+          class MemoryPool =
+              Kokkos::MemoryPool<Kokkos::Device<ExecSpace, MemSpace>>>
 class SingleTaskQueue;
 
-template< typename ExecSpace, typename MemSpace, typename TaskQueueTraits, class MemoryPool>
+template <typename ExecSpace, typename MemSpace, typename TaskQueueTraits,
+          class MemoryPool>
 class MultipleTaskQueue;
 
 struct TaskQueueTraitsLockBased;
 
-template <size_t CircularBufferSize=64>
+template <size_t CircularBufferSize = 64>
 struct TaskQueueTraitsChaseLev;
 
-template< typename ResultType >
+template <typename ResultType>
 struct TaskResult;
 
 struct TaskSchedulerBase;
 
 template <class ExecSpace>
-struct default_tasking_memory_space_for_execution_space
-{
+struct default_tasking_memory_space_for_execution_space {
   using type = typename ExecSpace::memory_space;
 };
 
-#if defined( KOKKOS_ENABLE_CUDA )
+#if defined(KOKKOS_ENABLE_CUDA)
 template <>
-struct default_tasking_memory_space_for_execution_space<Kokkos::Cuda>
-{
+struct default_tasking_memory_space_for_execution_space<Kokkos::Cuda> {
   using type = Kokkos::CudaUVMSpace;
 };
 #endif
 
 template <class ExecSpace>
 using default_tasking_memory_space_for_execution_space_t =
-  typename default_tasking_memory_space_for_execution_space<ExecSpace>::type;
+    typename default_tasking_memory_space_for_execution_space<ExecSpace>::type;
 
-} // namespace Impl
-} // namespace Kokkos
+}  // namespace Impl
+}  // namespace Kokkos
 
 //----------------------------------------------------------------------------
 
 namespace Kokkos {
 
-template< typename Space >
+template <typename Space>
 using DeprecatedTaskScheduler = BasicTaskScheduler<
-  Space,
-  Impl::TaskQueue<Space, Impl::default_tasking_memory_space_for_execution_space_t<Space>>
->;
+    Space,
+    Impl::TaskQueue<
+        Space,
+        Impl::default_tasking_memory_space_for_execution_space_t<Space>>>;
 
-template< typename Space >
+template <typename Space>
 using DeprecatedTaskSchedulerMultiple = BasicTaskScheduler<
-  Space,
-  Impl::TaskQueueMultiple<Space, Impl::default_tasking_memory_space_for_execution_space_t<Space>>
->;
+    Space,
+    Impl::TaskQueueMultiple<
+        Space,
+        Impl::default_tasking_memory_space_for_execution_space_t<Space>>>;
 
-template< typename Space >
+template <typename Space>
 using TaskScheduler = SimpleTaskScheduler<
-  Space,
-  Impl::SingleTaskQueue<
     Space,
-    Impl::default_tasking_memory_space_for_execution_space_t<Space>,
-    Impl::TaskQueueTraitsLockBased
-  >
->;
+    Impl::SingleTaskQueue<
+        Space, Impl::default_tasking_memory_space_for_execution_space_t<Space>,
+        Impl::TaskQueueTraitsLockBased>>;
 
-template< typename Space >
+template <typename Space>
 using TaskSchedulerMultiple = SimpleTaskScheduler<
-  Space,
-  Impl::MultipleTaskQueue<
     Space,
-    Impl::default_tasking_memory_space_for_execution_space_t<Space>,
-    Impl::TaskQueueTraitsLockBased,
-    Kokkos::MemoryPool<
-      Kokkos::Device<
-        Space,
-        Impl::default_tasking_memory_space_for_execution_space_t<Space>
-      >
-    >
-  >
->;
+    Impl::MultipleTaskQueue<
+        Space, Impl::default_tasking_memory_space_for_execution_space_t<Space>,
+        Impl::TaskQueueTraitsLockBased,
+        Kokkos::MemoryPool<Kokkos::Device<
+            Space,
+            Impl::default_tasking_memory_space_for_execution_space_t<Space>>>>>;
 
-template< typename Space >
+template <typename Space>
 using ChaseLevTaskScheduler = SimpleTaskScheduler<
-  Space,
-  Impl::MultipleTaskQueue<
     Space,
-    Impl::default_tasking_memory_space_for_execution_space_t<Space>,
-    Impl::TaskQueueTraitsChaseLev<>,
-    Kokkos::MemoryPool<
-      Kokkos::Device<
-        Space,
-        Impl::default_tasking_memory_space_for_execution_space_t<Space>
-      >
-    >
-  >
->;
+    Impl::MultipleTaskQueue<
+        Space, Impl::default_tasking_memory_space_for_execution_space_t<Space>,
+        Impl::TaskQueueTraitsChaseLev<>,
+        Kokkos::MemoryPool<Kokkos::Device<
+            Space,
+            Impl::default_tasking_memory_space_for_execution_space_t<Space>>>>>;
 
-template<class Space, class QueueType>
+template <class Space, class QueueType>
 void wait(BasicTaskScheduler<Space, QueueType> const&);
 
 namespace Impl {
 
-struct TaskSchedulerBase { };
+struct TaskSchedulerBase {};
 
-class TaskQueueBase { };
+class TaskQueueBase {};
 
-template <typename Scheduler, typename EnableIfConstraint=void>
-class TaskQueueSpecializationConstrained { };
+template <typename Scheduler, typename EnableIfConstraint = void>
+class TaskQueueSpecializationConstrained {};
 
 template <typename Scheduler>
-struct TaskQueueSpecialization : TaskQueueSpecializationConstrained<Scheduler> { };
+struct TaskQueueSpecialization : TaskQueueSpecializationConstrained<Scheduler> {
+};
 
 template <int, typename>
 struct TaskPolicyData;
 
+}  // end namespace Impl
 
-} // end namespace Impl
-
-} // namespace Kokkos
+}  // namespace Kokkos
 
 //----------------------------------------------------------------------------
 
 #endif /* #if defined( KOKKOS_ENABLE_TASKDAG ) */
 #endif /* #ifndef KOKKOS_TASKSCHEDULER_FWD_HPP */
-
diff --git a/lib/kokkos/core/src/Kokkos_Threads.hpp b/lib/kokkos/core/src/Kokkos_Threads.hpp
index 03dab1acaf..d44042b062 100644
--- a/lib/kokkos/core/src/Kokkos_Threads.hpp
+++ b/lib/kokkos/core/src/Kokkos_Threads.hpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -45,7 +46,7 @@
 #define KOKKOS_THREADS_HPP
 
 #include <Kokkos_Macros.hpp>
-#if defined( KOKKOS_ENABLE_THREADS )
+#if defined(KOKKOS_ENABLE_THREADS)
 
 #include <Kokkos_Core_fwd.hpp>
 
@@ -61,9 +62,9 @@
 
 namespace Kokkos {
 namespace Impl {
-class ThreadsExec ;
-} // namespace Impl
-} // namespace Kokkos
+class ThreadsExec;
+}  // namespace Impl
+}  // namespace Kokkos
 
 /*--------------------------------------------------------------------------*/
 
@@ -71,21 +72,20 @@ namespace Kokkos {
 
 /** \brief  Execution space for a pool of Pthreads or C11 threads on a CPU. */
 class Threads {
-public:
+ public:
   //! \name Type declarations that all Kokkos devices must provide.
   //@{
   //! Tag this class as a kokkos execution space
-  typedef Threads                  execution_space ;
-  typedef Kokkos::HostSpace        memory_space ;
+  typedef Threads execution_space;
+  typedef Kokkos::HostSpace memory_space;
 
   //! This execution space preferred device_type
-  typedef Kokkos::Device<execution_space,memory_space> device_type;
+  typedef Kokkos::Device<execution_space, memory_space> device_type;
 
-  typedef Kokkos::LayoutRight      array_layout ;
-  typedef memory_space::size_type  size_type ;
-
-  typedef ScratchMemorySpace< Threads >  scratch_memory_space ;
+  typedef Kokkos::LayoutRight array_layout;
+  typedef memory_space::size_type size_type;
 
+  typedef ScratchMemorySpace<Threads> scratch_memory_space;
 
   //@}
   /*------------------------------------------------------------------------*/
@@ -97,7 +97,7 @@ public:
   static int in_parallel();
 
   /// \brief Print configuration information to the given output stream.
-  static void print_configuration( std::ostream & , const bool detail = false );
+  static void print_configuration(std::ostream&, const bool detail = false);
 
   /// \brief Wait until all dispatched functors complete.
   ///
@@ -107,11 +107,11 @@ public:
   /// device have completed.
   static void impl_static_fence();
 
-  #ifdef KOKKOS_ENABLE_DEPRECATED_CODE
+#ifdef KOKKOS_ENABLE_DEPRECATED_CODE
   static void fence();
-  #else
+#else
   void fence() const;
-  #endif
+#endif
 
   /** \brief  Return the maximum amount of concurrency.  */
   static int concurrency();
@@ -123,26 +123,28 @@ public:
 
   static void finalize();
 
-  static void initialize( unsigned threads_count = 0 ,
-                          unsigned use_numa_count = 0 ,
-                          unsigned use_cores_per_numa = 0 ,
-                          bool allow_asynchronous_threadpool = false );
+  static void initialize(unsigned threads_count             = 0,
+                         unsigned use_numa_count            = 0,
+                         unsigned use_cores_per_numa        = 0,
+                         bool allow_asynchronous_threadpool = false);
 
   static int is_initialized();
 
-  static Threads & instance( int = 0 );
+  static Threads& instance(int = 0);
 
   //----------------------------------------
 
-  static int thread_pool_size( int depth = 0 );
-#if defined( KOKKOS_ACTIVE_EXECUTION_MEMORY_SPACE_HOST )
+  static int thread_pool_size(int depth = 0);
+#if defined(KOKKOS_ACTIVE_EXECUTION_MEMORY_SPACE_HOST)
   static int thread_pool_rank();
 #else
-  KOKKOS_INLINE_FUNCTION static int thread_pool_rank() { return 0 ; }
+  KOKKOS_INLINE_FUNCTION static int thread_pool_rank() { return 0; }
 #endif
 
   inline static unsigned max_hardware_threads() { return thread_pool_size(0); }
-  KOKKOS_INLINE_FUNCTION static unsigned hardware_thread_id() { return thread_pool_rank(); }
+  KOKKOS_INLINE_FUNCTION static unsigned hardware_thread_id() {
+    return thread_pool_rank();
+  }
 #else
   /// \brief Free any resources being consumed by the device.
   ///
@@ -172,26 +174,30 @@ public:
    *  If the 'use_' arguments are not supplied the hwloc is queried
    *  to use all available cores.
    */
-  static void impl_initialize( unsigned threads_count = 0 ,
-                          unsigned use_numa_count = 0 ,
-                          unsigned use_cores_per_numa = 0 ,
-                          bool allow_asynchronous_threadpool = false );
+  static void impl_initialize(unsigned threads_count             = 0,
+                              unsigned use_numa_count            = 0,
+                              unsigned use_cores_per_numa        = 0,
+                              bool allow_asynchronous_threadpool = false);
 
   static int impl_is_initialized();
 
-  static Threads & impl_instance( int = 0 );
+  static Threads& impl_instance(int = 0);
 
   //----------------------------------------
 
-  static int impl_thread_pool_size( int depth = 0 );
-#if defined( KOKKOS_ACTIVE_EXECUTION_MEMORY_SPACE_HOST )
+  static int impl_thread_pool_size(int depth = 0);
+#if defined(KOKKOS_ACTIVE_EXECUTION_MEMORY_SPACE_HOST)
   static int impl_thread_pool_rank();
 #else
-  KOKKOS_INLINE_FUNCTION static int impl_thread_pool_rank() { return 0 ; }
+  KOKKOS_INLINE_FUNCTION static int impl_thread_pool_rank() { return 0; }
 #endif
 
-  inline static unsigned impl_max_hardware_threads() { return impl_thread_pool_size(0); }
-  KOKKOS_INLINE_FUNCTION static unsigned impl_hardware_thread_id() { return impl_thread_pool_rank(); }
+  inline static unsigned impl_max_hardware_threads() {
+    return impl_thread_pool_size(0);
+  }
+  KOKKOS_INLINE_FUNCTION static unsigned impl_hardware_thread_id() {
+    return impl_thread_pool_rank();
+  }
 #endif
 
   static const char* name();
@@ -199,37 +205,31 @@ public:
   //----------------------------------------
 };
 
-} // namespace Kokkos
+}  // namespace Kokkos
 
 /*--------------------------------------------------------------------------*/
 
 namespace Kokkos {
 namespace Impl {
 
-template<>
-struct MemorySpaceAccess
-  < Kokkos::Threads::memory_space
-  , Kokkos::Threads::scratch_memory_space
-  >
-{
+template <>
+struct MemorySpaceAccess<Kokkos::Threads::memory_space,
+                         Kokkos::Threads::scratch_memory_space> {
   enum { assignable = false };
   enum { accessible = true };
-  enum { deepcopy   = false };
+  enum { deepcopy = false };
 };
 
-template<>
-struct VerifyExecutionCanAccessMemorySpace
-  < Kokkos::Threads::memory_space
-  , Kokkos::Threads::scratch_memory_space
-  >
-{
+template <>
+struct VerifyExecutionCanAccessMemorySpace<
+    Kokkos::Threads::memory_space, Kokkos::Threads::scratch_memory_space> {
   enum { value = true };
-  inline static void verify( void ) { }
-  inline static void verify( const void * ) { }
+  inline static void verify(void) {}
+  inline static void verify(const void*) {}
 };
 
-} // namespace Impl
-} // namespace Kokkos
+}  // namespace Impl
+}  // namespace Kokkos
 
 /*--------------------------------------------------------------------------*/
 
@@ -246,4 +246,3 @@ struct VerifyExecutionCanAccessMemorySpace
 
 #endif /* #if defined( KOKKOS_ENABLE_THREADS ) */
 #endif /* #define KOKKOS_THREADS_HPP */
-
diff --git a/lib/kokkos/core/src/Kokkos_Timer.hpp b/lib/kokkos/core/src/Kokkos_Timer.hpp
index eb869fd1b0..117f097f66 100644
--- a/lib/kokkos/core/src/Kokkos_Timer.hpp
+++ b/lib/kokkos/core/src/Kokkos_Timer.hpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -51,33 +52,27 @@ namespace Kokkos {
 /** \brief  Time since construction */
 
 class Timer {
-private:
+ private:
   std::chrono::high_resolution_clock::time_point m_old;
-  Timer( const Timer & );
-  Timer & operator = ( const Timer & );
-public:
+  Timer(const Timer&);
+  Timer& operator=(const Timer&);
 
-  inline
-  void reset() {
-    m_old = std::chrono::high_resolution_clock::now();
-  }
+ public:
+  inline void reset() { m_old = std::chrono::high_resolution_clock::now(); }
 
-  inline
-  ~Timer() {}
+  inline ~Timer() {}
 
-  inline
-  Timer() { reset(); }
+  inline Timer() { reset(); }
 
-  inline
-  double seconds() const
-  {
+  inline double seconds() const {
     std::chrono::high_resolution_clock::time_point m_new =
         std::chrono::high_resolution_clock::now();
-    return std::chrono::duration_cast<std::chrono::duration<double>>(m_new - m_old).count();
+    return std::chrono::duration_cast<std::chrono::duration<double>>(m_new -
+                                                                     m_old)
+        .count();
   }
 };
 
-} // namespace Kokkos
+}  // namespace Kokkos
 
 #endif /* #ifndef KOKKOS_TIMER_HPP */
-
diff --git a/lib/kokkos/core/src/Kokkos_UniqueToken.hpp b/lib/kokkos/core/src/Kokkos_UniqueToken.hpp
index d89542631d..523ccad948 100644
--- a/lib/kokkos/core/src/Kokkos_UniqueToken.hpp
+++ b/lib/kokkos/core/src/Kokkos_UniqueToken.hpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -46,43 +47,42 @@
 
 #include <Kokkos_Macros.hpp>
 
-namespace Kokkos { namespace Experimental {
+namespace Kokkos {
+namespace Experimental {
 
-enum class UniqueTokenScope : int
-{
-  Instance,
-  Global
-};
+enum class UniqueTokenScope : int { Instance, Global };
 
-/// \brief class to generate unique ids base on the required amount of concurrency
+/// \brief class to generate unique ids base on the required amount of
+/// concurrency
 ///
 /// This object should behave like a ref-counted object, so that when the last
 /// instance is destroy resources are free if needed
-template <typename ExecutionSpace, UniqueTokenScope = UniqueTokenScope::Instance >
-class UniqueToken
-{
-public:
+template <typename ExecutionSpace,
+          UniqueTokenScope = UniqueTokenScope::Instance>
+class UniqueToken {
+ public:
   using execution_space = ExecutionSpace;
   using size_type       = typename execution_space::size_type;
 
   /// \brief create object size for concurrency on the given instance
   ///
   /// This object should not be shared between instances
-  UniqueToken( execution_space const& = execution_space() );
+  UniqueToken(execution_space const& = execution_space());
 
   /// \brief upper bound for acquired values, i.e. 0 <= value < size()
   KOKKOS_INLINE_FUNCTION
-  size_type size() const ;
+  size_type size() const;
 
   /// \brief acquire value such that 0 <= value < size()
   KOKKOS_INLINE_FUNCTION
-  size_type acquire() const ;
+  size_type acquire() const;
 
   /// \brief release a value acquired by generate
   KOKKOS_INLINE_FUNCTION
-  void release( size_type ) const ;
+  void release(size_type) const;
 };
 
-}} // namespace Kokkos::Experimental
+}  // namespace Experimental
+}  // namespace Kokkos
 
-#endif //KOKKOS_UNIQUE_TOKEN_HPP
+#endif  // KOKKOS_UNIQUE_TOKEN_HPP
diff --git a/lib/kokkos/core/src/Kokkos_Vectorization.hpp b/lib/kokkos/core/src/Kokkos_Vectorization.hpp
index f5b6cad4b7..2604538b1c 100644
--- a/lib/kokkos/core/src/Kokkos_Vectorization.hpp
+++ b/lib/kokkos/core/src/Kokkos_Vectorization.hpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -46,9 +47,8 @@
 #ifndef KOKKOS_VECTORIZATION_HPP
 #define KOKKOS_VECTORIZATION_HPP
 
-#if defined( KOKKOS_ENABLE_CUDA )
+#if defined(KOKKOS_ENABLE_CUDA)
 #include <Cuda/Kokkos_Cuda_Vectorization.hpp>
 #endif
 
 #endif
-
diff --git a/lib/kokkos/core/src/Kokkos_View.hpp b/lib/kokkos/core/src/Kokkos_View.hpp
index 3fe8e6f067..6610bb842b 100644
--- a/lib/kokkos/core/src/Kokkos_View.hpp
+++ b/lib/kokkos/core/src/Kokkos_View.hpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -64,122 +65,88 @@
 namespace Kokkos {
 namespace Impl {
 
-template< class DataType >
-struct ViewArrayAnalysis ;
+template <class DataType>
+struct ViewArrayAnalysis;
 
-template< class DataType , class ArrayLayout
-        , typename ValueType =
-          typename ViewArrayAnalysis< DataType >::non_const_value_type
-        >
-struct ViewDataAnalysis ;
+template <class DataType, class ArrayLayout,
+          typename ValueType =
+              typename ViewArrayAnalysis<DataType>::non_const_value_type>
+struct ViewDataAnalysis;
 
-template< class , class ... >
+template <class, class...>
 class ViewMapping {
-  public:
+ public:
   enum { is_assignable_data_type = false };
   enum { is_assignable = false };
 };
 
-
-
 template <typename IntType>
-KOKKOS_INLINE_FUNCTION
-std::size_t count_valid_integers(const IntType i0,
-                            const IntType i1,
-                            const IntType i2,
-                            const IntType i3,
-                            const IntType i4,
-                            const IntType i5,
-                            const IntType i6,
-                            const IntType i7 ){
-  static_assert(std::is_integral<IntType>::value, "count_valid_integers() must have integer arguments.");
-
-  return ( i0 !=KOKKOS_INVALID_INDEX ) + ( i1 !=KOKKOS_INVALID_INDEX ) + ( i2 !=KOKKOS_INVALID_INDEX ) +
-      ( i3 !=KOKKOS_INVALID_INDEX ) + ( i4 !=KOKKOS_INVALID_INDEX ) + ( i5 !=KOKKOS_INVALID_INDEX ) +
-      ( i6 !=KOKKOS_INVALID_INDEX ) + ( i7 !=KOKKOS_INVALID_INDEX );
-
+KOKKOS_INLINE_FUNCTION std::size_t count_valid_integers(
+    const IntType i0, const IntType i1, const IntType i2, const IntType i3,
+    const IntType i4, const IntType i5, const IntType i6, const IntType i7) {
+  static_assert(std::is_integral<IntType>::value,
+                "count_valid_integers() must have integer arguments.");
 
+  return (i0 != KOKKOS_INVALID_INDEX) + (i1 != KOKKOS_INVALID_INDEX) +
+         (i2 != KOKKOS_INVALID_INDEX) + (i3 != KOKKOS_INVALID_INDEX) +
+         (i4 != KOKKOS_INVALID_INDEX) + (i5 != KOKKOS_INVALID_INDEX) +
+         (i6 != KOKKOS_INVALID_INDEX) + (i7 != KOKKOS_INVALID_INDEX);
 }
 
 #ifndef KOKKOS_ENABLE_DEPRECATED_CODE
 KOKKOS_INLINE_FUNCTION
-void runtime_check_rank_device(const size_t dyn_rank,
-                        const bool is_void_spec,
-                        const size_t i0,
-                        const size_t i1,
-                        const size_t i2,
-                        const size_t i3,
-                        const size_t i4,
-                        const size_t i5,
-                        const size_t i6,
-                        const size_t i7 ){
-
-  if ( is_void_spec ) {
-    const size_t num_passed_args = count_valid_integers(i0, i1, i2, i3,
-        i4, i5, i6, i7);
-
-    if ( num_passed_args != dyn_rank && is_void_spec ) {
-
-      Kokkos::abort("Number of arguments passed to Kokkos::View() constructor must match the dynamic rank of the view.") ;
+void runtime_check_rank_device(const size_t dyn_rank, const bool is_void_spec,
+                               const size_t i0, const size_t i1,
+                               const size_t i2, const size_t i3,
+                               const size_t i4, const size_t i5,
+                               const size_t i6, const size_t i7) {
+  if (is_void_spec) {
+    const size_t num_passed_args =
+        count_valid_integers(i0, i1, i2, i3, i4, i5, i6, i7);
 
+    if (num_passed_args != dyn_rank && is_void_spec) {
+      Kokkos::abort(
+          "Number of arguments passed to Kokkos::View() constructor must match "
+          "the dynamic rank of the view.");
     }
   }
 }
 #else
 KOKKOS_INLINE_FUNCTION
-void runtime_check_rank_device(const size_t ,
-                        const bool ,
-                        const size_t ,
-                        const size_t ,
-                        const size_t ,
-                        const size_t ,
-                        const size_t ,
-                        const size_t ,
-                        const size_t ,
-                        const size_t  ){
-
-}
+void runtime_check_rank_device(const size_t, const bool, const size_t,
+                               const size_t, const size_t, const size_t,
+                               const size_t, const size_t, const size_t,
+                               const size_t) {}
 #endif
 
 #ifdef KOKKOS_ACTIVE_EXECUTION_MEMORY_SPACE_HOST
 #ifndef KOKKOS_ENABLE_DEPRECATED_CODE
 KOKKOS_INLINE_FUNCTION
-void runtime_check_rank_host(const size_t dyn_rank,
-                        const bool is_void_spec,
-                        const size_t i0,
-                        const size_t i1,
-                        const size_t i2,
-                        const size_t i3,
-                        const size_t i4,
-                        const size_t i5,
-                        const size_t i6,
-                        const size_t i7, const std::string & label ){
+void runtime_check_rank_host(const size_t dyn_rank, const bool is_void_spec,
+                             const size_t i0, const size_t i1, const size_t i2,
+                             const size_t i3, const size_t i4, const size_t i5,
+                             const size_t i6, const size_t i7,
+                             const std::string& label) {
+  if (is_void_spec) {
+    const size_t num_passed_args =
+        count_valid_integers(i0, i1, i2, i3, i4, i5, i6, i7);
 
-
-  if ( is_void_spec ) {
-    const size_t num_passed_args = count_valid_integers(i0, i1, i2, i3,
-        i4, i5, i6, i7);
-
-    if ( num_passed_args != dyn_rank ) {
-
-      const std::string message = "Constructor for Kokkos View '" + label + "' has mismatched number of arguments. Number of arguments = "
-        + std::to_string(num_passed_args) + " but dynamic rank = " + std::to_string(dyn_rank) + " \n";
-      Kokkos::abort(message.c_str()) ;
+    if (num_passed_args != dyn_rank) {
+      const std::string message =
+          "Constructor for Kokkos View '" + label +
+          "' has mismatched number of arguments. Number of arguments = " +
+          std::to_string(num_passed_args) +
+          " but dynamic rank = " + std::to_string(dyn_rank) + " \n";
+      Kokkos::abort(message.c_str());
     }
   }
 }
 #else
 KOKKOS_INLINE_FUNCTION
-void runtime_check_rank_host(const size_t ,
-                        const bool ,
-                        const size_t ,
-                        const size_t ,
-                        const size_t ,
-                        const size_t ,
-                        const size_t ,
-                        const size_t ,
-                        const size_t ,
-                        const size_t , const std::string &){}
+void runtime_check_rank_host(const size_t, const bool, const size_t,
+                             const size_t, const size_t, const size_t,
+                             const size_t, const size_t, const size_t,
+                             const size_t, const std::string&) {}
 #endif
 #endif
 
@@ -189,10 +156,10 @@ void runtime_check_rank_host(const size_t ,
 // Class to provide a uniform type
 namespace Kokkos {
 namespace Impl {
-  template< class ViewType , int Traits = 0 >
-  struct ViewUniformType;
-}
+template <class ViewType, int Traits = 0>
+struct ViewUniformType;
 }
+}  // namespace Kokkos
 
 //----------------------------------------------------------------------------
 //----------------------------------------------------------------------------
@@ -216,183 +183,183 @@ namespace Kokkos {
  *   - View< DataType , MemoryTraits >
  */
 
-template< class DataType , class ... Properties >
-struct ViewTraits ;
+template <class DataType, class... Properties>
+struct ViewTraits;
 
-template<>
-struct ViewTraits< void >
-{
-  typedef void  execution_space ;
-  typedef void  memory_space ;
-  typedef void  HostMirrorSpace ;
-  typedef void  array_layout ;
-  typedef void  memory_traits ;
-  typedef void  specialize ;
+template <>
+struct ViewTraits<void> {
+  typedef void execution_space;
+  typedef void memory_space;
+  typedef void HostMirrorSpace;
+  typedef void array_layout;
+  typedef void memory_traits;
+  typedef void specialize;
 };
 
-template< class ... Prop >
-struct ViewTraits< void , void , Prop ... >
-{
+template <class... Prop>
+struct ViewTraits<void, void, Prop...> {
   // Ignore an extraneous 'void'
-  typedef typename ViewTraits<void,Prop...>::execution_space  execution_space ;
-  typedef typename ViewTraits<void,Prop...>::memory_space     memory_space ;
-  typedef typename ViewTraits<void,Prop...>::HostMirrorSpace  HostMirrorSpace ;
-  typedef typename ViewTraits<void,Prop...>::array_layout     array_layout ;
-  typedef typename ViewTraits<void,Prop...>::memory_traits    memory_traits ;
-  typedef typename ViewTraits<void,Prop...>::specialize       specialize ;
+  typedef typename ViewTraits<void, Prop...>::execution_space execution_space;
+  typedef typename ViewTraits<void, Prop...>::memory_space memory_space;
+  typedef typename ViewTraits<void, Prop...>::HostMirrorSpace HostMirrorSpace;
+  typedef typename ViewTraits<void, Prop...>::array_layout array_layout;
+  typedef typename ViewTraits<void, Prop...>::memory_traits memory_traits;
+  typedef typename ViewTraits<void, Prop...>::specialize specialize;
 };
 
-template< class ArrayLayout , class ... Prop >
-struct ViewTraits< typename std::enable_if< Kokkos::Impl::is_array_layout<ArrayLayout>::value >::type , ArrayLayout , Prop ... >
-{
+template <class ArrayLayout, class... Prop>
+struct ViewTraits<typename std::enable_if<
+                      Kokkos::Impl::is_array_layout<ArrayLayout>::value>::type,
+                  ArrayLayout, Prop...> {
   // Specify layout, keep subsequent space and memory traits arguments
 
-  typedef typename ViewTraits<void,Prop...>::execution_space  execution_space ;
-  typedef typename ViewTraits<void,Prop...>::memory_space     memory_space ;
-  typedef typename ViewTraits<void,Prop...>::HostMirrorSpace  HostMirrorSpace ;
-  typedef          ArrayLayout                                array_layout ;
-  typedef typename ViewTraits<void,Prop...>::memory_traits    memory_traits ;
-  typedef typename ViewTraits<void,Prop...>::specialize       specialize ;
+  typedef typename ViewTraits<void, Prop...>::execution_space execution_space;
+  typedef typename ViewTraits<void, Prop...>::memory_space memory_space;
+  typedef typename ViewTraits<void, Prop...>::HostMirrorSpace HostMirrorSpace;
+  typedef ArrayLayout array_layout;
+  typedef typename ViewTraits<void, Prop...>::memory_traits memory_traits;
+  typedef typename ViewTraits<void, Prop...>::specialize specialize;
 };
 
-template< class Space , class ... Prop >
-struct ViewTraits< typename std::enable_if< Kokkos::Impl::is_space<Space>::value >::type , Space , Prop ... >
-{
+template <class Space, class... Prop>
+struct ViewTraits<
+    typename std::enable_if<Kokkos::Impl::is_space<Space>::value>::type, Space,
+    Prop...> {
   // Specify Space, memory traits should be the only subsequent argument.
 
-  static_assert( std::is_same< typename ViewTraits<void,Prop...>::execution_space , void >::value &&
-                 std::is_same< typename ViewTraits<void,Prop...>::memory_space    , void >::value &&
-                 std::is_same< typename ViewTraits<void,Prop...>::HostMirrorSpace , void >::value &&
-                 std::is_same< typename ViewTraits<void,Prop...>::array_layout    , void >::value
-               , "Only one View Execution or Memory Space template argument" );
+  static_assert(
+      std::is_same<typename ViewTraits<void, Prop...>::execution_space,
+                   void>::value &&
+          std::is_same<typename ViewTraits<void, Prop...>::memory_space,
+                       void>::value &&
+          std::is_same<typename ViewTraits<void, Prop...>::HostMirrorSpace,
+                       void>::value &&
+          std::is_same<typename ViewTraits<void, Prop...>::array_layout,
+                       void>::value,
+      "Only one View Execution or Memory Space template argument");
 
-  typedef typename Space::execution_space                   execution_space ;
-  typedef typename Space::memory_space                      memory_space ;
-  typedef typename Kokkos::Impl::HostMirror< Space >::Space HostMirrorSpace ;
-  typedef typename execution_space::array_layout            array_layout ;
-  typedef typename ViewTraits<void,Prop...>::memory_traits  memory_traits ;
-  typedef typename ViewTraits<void,Prop...>::specialize       specialize ;
+  typedef typename Space::execution_space execution_space;
+  typedef typename Space::memory_space memory_space;
+  typedef typename Kokkos::Impl::HostMirror<Space>::Space::memory_space
+      HostMirrorSpace;
+  typedef typename execution_space::array_layout array_layout;
+  typedef typename ViewTraits<void, Prop...>::memory_traits memory_traits;
+  typedef typename ViewTraits<void, Prop...>::specialize specialize;
 };
 
-template< class MemoryTraits , class ... Prop >
-struct ViewTraits< typename std::enable_if< Kokkos::Impl::is_memory_traits<MemoryTraits>::value >::type , MemoryTraits , Prop ... >
-{
+template <class MemoryTraits, class... Prop>
+struct ViewTraits<typename std::enable_if<Kokkos::Impl::is_memory_traits<
+                      MemoryTraits>::value>::type,
+                  MemoryTraits, Prop...> {
   // Specify memory trait, should not be any subsequent arguments
 
-  static_assert( std::is_same< typename ViewTraits<void,Prop...>::execution_space , void >::value &&
-                 std::is_same< typename ViewTraits<void,Prop...>::memory_space    , void >::value &&
-                 std::is_same< typename ViewTraits<void,Prop...>::array_layout    , void >::value &&
-                 std::is_same< typename ViewTraits<void,Prop...>::memory_traits   , void >::value
-               , "MemoryTrait is the final optional template argument for a View" );
+  static_assert(
+      std::is_same<typename ViewTraits<void, Prop...>::execution_space,
+                   void>::value &&
+          std::is_same<typename ViewTraits<void, Prop...>::memory_space,
+                       void>::value &&
+          std::is_same<typename ViewTraits<void, Prop...>::array_layout,
+                       void>::value &&
+          std::is_same<typename ViewTraits<void, Prop...>::memory_traits,
+                       void>::value,
+      "MemoryTrait is the final optional template argument for a View");
 
-  typedef void          execution_space ;
-  typedef void          memory_space ;
-  typedef void          HostMirrorSpace ;
-  typedef void          array_layout ;
-  typedef MemoryTraits  memory_traits ;
-  typedef void          specialize ;
+  typedef void execution_space;
+  typedef void memory_space;
+  typedef void HostMirrorSpace;
+  typedef void array_layout;
+  typedef MemoryTraits memory_traits;
+  typedef void specialize;
 };
 
-
-template< class DataType , class ... Properties >
+template <class DataType, class... Properties>
 struct ViewTraits {
-private:
-
+ private:
   // Unpack the properties arguments
-  typedef ViewTraits< void , Properties ... >  prop ;
+  typedef ViewTraits<void, Properties...> prop;
 
-  typedef typename
-    std::conditional< ! std::is_same< typename prop::execution_space , void >::value
-                    , typename prop::execution_space
-                    , Kokkos::DefaultExecutionSpace
-                    >::type
-      ExecutionSpace ;
+  typedef typename std::conditional<
+      !std::is_same<typename prop::execution_space, void>::value,
+      typename prop::execution_space, Kokkos::DefaultExecutionSpace>::type
+      ExecutionSpace;
 
-  typedef typename
-    std::conditional< ! std::is_same< typename prop::memory_space , void >::value
-                    , typename prop::memory_space
-                    , typename ExecutionSpace::memory_space
-                    >::type
-      MemorySpace ;
+  typedef typename std::conditional<
+      !std::is_same<typename prop::memory_space, void>::value,
+      typename prop::memory_space, typename ExecutionSpace::memory_space>::type
+      MemorySpace;
 
-  typedef typename
-    std::conditional< ! std::is_same< typename prop::array_layout , void >::value
-                    , typename prop::array_layout
-                    , typename ExecutionSpace::array_layout
-                    >::type
-      ArrayLayout ;
+  typedef typename std::conditional<
+      !std::is_same<typename prop::array_layout, void>::value,
+      typename prop::array_layout, typename ExecutionSpace::array_layout>::type
+      ArrayLayout;
 
-  typedef typename
-    std::conditional
-      < ! std::is_same< typename prop::HostMirrorSpace , void >::value
-      , typename prop::HostMirrorSpace
-      , typename Kokkos::Impl::HostMirror< ExecutionSpace >::Space
-      >::type
-      HostMirrorSpace ;
+  typedef typename std::conditional<
+      !std::is_same<typename prop::HostMirrorSpace, void>::value,
+      typename prop::HostMirrorSpace,
+      typename Kokkos::Impl::HostMirror<ExecutionSpace>::Space>::type
+      HostMirrorSpace;
 
-  typedef typename
-    std::conditional< ! std::is_same< typename prop::memory_traits , void >::value
-                    , typename prop::memory_traits
-                    , typename Kokkos::MemoryManaged
-                    >::type
-      MemoryTraits ;
+  typedef typename std::conditional<
+      !std::is_same<typename prop::memory_traits, void>::value,
+      typename prop::memory_traits, typename Kokkos::MemoryManaged>::type
+      MemoryTraits;
 
   // Analyze data type's properties,
   // May be specialized based upon the layout and value type
-  typedef Kokkos::Impl::ViewDataAnalysis< DataType , ArrayLayout > data_analysis ;
-
-public:
+  typedef Kokkos::Impl::ViewDataAnalysis<DataType, ArrayLayout> data_analysis;
 
+ public:
   //------------------------------------
   // Data type traits:
 
-  typedef typename data_analysis::type            data_type ;
-  typedef typename data_analysis::const_type      const_data_type ;
-  typedef typename data_analysis::non_const_type  non_const_data_type ;
+  typedef typename data_analysis::type data_type;
+  typedef typename data_analysis::const_type const_data_type;
+  typedef typename data_analysis::non_const_type non_const_data_type;
 
   //------------------------------------
   // Compatible array of trivial type traits:
 
-  typedef typename data_analysis::scalar_array_type            scalar_array_type ;
-  typedef typename data_analysis::const_scalar_array_type      const_scalar_array_type ;
-  typedef typename data_analysis::non_const_scalar_array_type  non_const_scalar_array_type ;
+  typedef typename data_analysis::scalar_array_type scalar_array_type;
+  typedef
+      typename data_analysis::const_scalar_array_type const_scalar_array_type;
+  typedef typename data_analysis::non_const_scalar_array_type
+      non_const_scalar_array_type;
 
   //------------------------------------
   // Value type traits:
 
-  typedef typename data_analysis::value_type            value_type ;
-  typedef typename data_analysis::const_value_type      const_value_type ;
-  typedef typename data_analysis::non_const_value_type  non_const_value_type ;
+  typedef typename data_analysis::value_type value_type;
+  typedef typename data_analysis::const_value_type const_value_type;
+  typedef typename data_analysis::non_const_value_type non_const_value_type;
 
   //------------------------------------
   // Mapping traits:
 
-  typedef ArrayLayout                         array_layout ;
-  typedef typename data_analysis::dimension   dimension ;
+  typedef ArrayLayout array_layout;
+  typedef typename data_analysis::dimension dimension;
 
   typedef typename std::conditional<
-                      std::is_same<typename data_analysis::specialize,void>::value
-                      ,typename prop::specialize
-                      ,typename data_analysis::specialize>::type
-                   specialize ; /* mapping specialization tag */
+      std::is_same<typename data_analysis::specialize, void>::value,
+      typename prop::specialize, typename data_analysis::specialize>::type
+      specialize; /* mapping specialization tag */
 
-  enum { rank         = dimension::rank };
+  enum { rank = dimension::rank };
   enum { rank_dynamic = dimension::rank_dynamic };
 
   //------------------------------------
   // Execution space, memory space, memory access traits, and host mirror space.
 
-  typedef ExecutionSpace                              execution_space ;
-  typedef MemorySpace                                 memory_space ;
-  typedef Kokkos::Device<ExecutionSpace,MemorySpace>  device_type ;
-  typedef MemoryTraits                                memory_traits ;
-  typedef HostMirrorSpace                             host_mirror_space ;
+  typedef ExecutionSpace execution_space;
+  typedef MemorySpace memory_space;
+  typedef Kokkos::Device<ExecutionSpace, MemorySpace> device_type;
+  typedef MemoryTraits memory_traits;
+  typedef HostMirrorSpace host_mirror_space;
 
-  typedef typename MemorySpace::size_type  size_type ;
+  typedef typename MemorySpace::size_type size_type;
 
-  enum { is_hostspace      = std::is_same< MemorySpace , HostSpace >::value };
-  enum { is_managed        = MemoryTraits::is_unmanaged    == 0 };
-  enum { is_random_access  = MemoryTraits::is_random_access == 1 };
+  enum { is_hostspace = std::is_same<MemorySpace, HostSpace>::value };
+  enum { is_managed = MemoryTraits::is_unmanaged == 0 };
+  enum { is_random_access = MemoryTraits::is_random_access == 1 };
 
   //------------------------------------
 };
@@ -450,7 +417,8 @@ public:
  *
  * \section Kokkos_View_MT MemoryTraits discussion
  *
- * \subsection Kokkos_View_MT_Interp MemoryTraits interpretation depends on Space
+ * \subsection Kokkos_View_MT_Interp MemoryTraits interpretation depends on
+ * Space
  *
  * Some \c MemoryTraits options may have different interpretations for
  * different \c Space types.  For example, with the Cuda device,
@@ -479,8 +447,8 @@ public:
  * }
  * \endcode
  */
-template< class DataType , class ... Properties >
-class View ;
+template <class DataType, class... Properties>
+class View;
 
 } /* namespace Kokkos */
 
@@ -497,16 +465,15 @@ namespace Kokkos {
 
 namespace {
 
-constexpr Kokkos::Impl::ALL_t
-  ALL = Kokkos::Impl::ALL_t();
+constexpr Kokkos::Impl::ALL_t ALL = Kokkos::Impl::ALL_t();
 
-constexpr Kokkos::Impl::WithoutInitializing_t
-  WithoutInitializing = Kokkos::Impl::WithoutInitializing_t();
+constexpr Kokkos::Impl::WithoutInitializing_t WithoutInitializing =
+    Kokkos::Impl::WithoutInitializing_t();
 
-constexpr Kokkos::Impl::AllowPadding_t
-  AllowPadding        = Kokkos::Impl::AllowPadding_t();
+constexpr Kokkos::Impl::AllowPadding_t AllowPadding =
+    Kokkos::Impl::AllowPadding_t();
 
-}
+}  // namespace
 
 /** \brief  Create View allocation parameter bundle from argument list.
  *
@@ -515,39 +482,34 @@ constexpr Kokkos::Impl::AllowPadding_t
  *    2) memory space instance of the View::memory_space type
  *    3) execution space instance compatible with the View::memory_space
  *    4) Kokkos::WithoutInitializing to bypass initialization
- *    4) Kokkos::AllowPadding to allow allocation to pad dimensions for memory alignment
+ *    4) Kokkos::AllowPadding to allow allocation to pad dimensions for memory
+ * alignment
  */
-template< class ... Args >
-inline
-Impl::ViewCtorProp< typename Impl::ViewCtorProp< void , Args >::type ... >
-view_alloc( Args const & ... args )
-{
-  typedef
-    Impl::ViewCtorProp< typename Impl::ViewCtorProp< void , Args >::type ... >
-      return_type ;
+template <class... Args>
+inline Impl::ViewCtorProp<typename Impl::ViewCtorProp<void, Args>::type...>
+view_alloc(Args const&... args) {
+  typedef Impl::ViewCtorProp<typename Impl::ViewCtorProp<void, Args>::type...>
+      return_type;
 
-  static_assert( ! return_type::has_pointer
-               , "Cannot give pointer-to-memory for view allocation" );
+  static_assert(!return_type::has_pointer,
+                "Cannot give pointer-to-memory for view allocation");
 
-  return return_type( args... );
+  return return_type(args...);
 }
 
-template< class ... Args >
+template <class... Args>
 KOKKOS_INLINE_FUNCTION
-Impl::ViewCtorProp< typename Impl::ViewCtorProp< void , Args >::type ... >
-view_wrap( Args const & ... args )
-{
-  typedef
-    Impl::ViewCtorProp< typename Impl::ViewCtorProp< void , Args >::type ... >
-      return_type ;
+    Impl::ViewCtorProp<typename Impl::ViewCtorProp<void, Args>::type...>
+    view_wrap(Args const&... args) {
+  typedef Impl::ViewCtorProp<typename Impl::ViewCtorProp<void, Args>::type...>
+      return_type;
 
-  static_assert( ! return_type::has_memory_space &&
-                 ! return_type::has_execution_space &&
-                 ! return_type::has_label &&
-                 return_type::has_pointer
-               , "Must only give pointer-to-memory for view wrapping" );
+  static_assert(!return_type::has_memory_space &&
+                    !return_type::has_execution_space &&
+                    !return_type::has_label && return_type::has_pointer,
+                "Must only give pointer-to-memory for view wrapping");
 
-  return return_type( args... );
+  return return_type(args...);
 }
 
 } /* namespace Kokkos */
@@ -557,113 +519,120 @@ view_wrap( Args const & ... args )
 
 namespace Kokkos {
 
-template< class DataType , class ... Properties >
-class View ;
+template <class DataType, class... Properties>
+class View;
 
-template< class > struct is_view : public std::false_type {};
+template <class>
+struct is_view : public std::false_type {};
 
-template< class D, class ... P >
-struct is_view< View<D,P...> > : public std::true_type {};
+template <class D, class... P>
+struct is_view<View<D, P...>> : public std::true_type {};
 
-template< class D, class ... P >
-struct is_view< const View<D,P...> > : public std::true_type {};
+template <class D, class... P>
+struct is_view<const View<D, P...>> : public std::true_type {};
 
-template< class DataType , class ... Properties >
-class View : public ViewTraits< DataType , Properties ... > {
-private:
+template <class DataType, class... Properties>
+class View : public ViewTraits<DataType, Properties...> {
+ private:
+  template <class, class...>
+  friend class View;
+  template <class, class...>
+  friend class Kokkos::Impl::ViewMapping;
 
-  template< class , class ... > friend class View ;
-  template< class , class ... > friend class Kokkos::Impl::ViewMapping ;
+ public:
+  typedef ViewTraits<DataType, Properties...> traits;
 
-public:
+ private:
+  typedef Kokkos::Impl::ViewMapping<traits, typename traits::specialize>
+      map_type;
+  typedef Kokkos::Impl::SharedAllocationTracker track_type;
 
-  typedef ViewTraits< DataType , Properties ... > traits ;
-
-private:
-
-  typedef Kokkos::Impl::ViewMapping< traits , typename traits::specialize > map_type ;
-  typedef Kokkos::Impl::SharedAllocationTracker      track_type ;
-
-  track_type  m_track ;
-  map_type    m_map ;
-
-public:
+  track_type m_track;
+  map_type m_map;
 
+ public:
   //----------------------------------------
   /** \brief  Compatible view of array of scalar types */
-  typedef View< typename traits::scalar_array_type ,
-                typename traits::array_layout ,
-                typename traits::device_type ,
-                typename traits::memory_traits >
-    array_type ;
+  typedef View<typename traits::scalar_array_type,
+               typename traits::array_layout, typename traits::device_type,
+               typename traits::memory_traits>
+      array_type;
 
   /** \brief  Compatible view of const data type */
-  typedef View< typename traits::const_data_type ,
-                typename traits::array_layout ,
-                typename traits::device_type ,
-                typename traits::memory_traits >
-    const_type ;
+  typedef View<typename traits::const_data_type, typename traits::array_layout,
+               typename traits::device_type, typename traits::memory_traits>
+      const_type;
 
   /** \brief  Compatible view of non-const data type */
-  typedef View< typename traits::non_const_data_type ,
-                typename traits::array_layout ,
-                typename traits::device_type ,
-                typename traits::memory_traits >
-    non_const_type ;
+  typedef View<typename traits::non_const_data_type,
+               typename traits::array_layout, typename traits::device_type,
+               typename traits::memory_traits>
+      non_const_type;
 
   /** \brief  Compatible HostMirror view */
-  typedef View< typename traits::non_const_data_type ,
-                typename traits::array_layout ,
-                typename traits::host_mirror_space >
-    HostMirror ;
+  typedef View<typename traits::non_const_data_type,
+               typename traits::array_layout,
+               Device<DefaultHostExecutionSpace,
+                      typename traits::host_mirror_space::memory_space>>
+      HostMirror;
 
   /** \brief  Compatible HostMirror view */
-  typedef View< typename traits::non_const_data_type ,
-                typename traits::array_layout ,
-                typename traits::host_mirror_space >
-    host_mirror_type ;
+  typedef View<typename traits::non_const_data_type,
+               typename traits::array_layout,
+               typename traits::host_mirror_space>
+      host_mirror_type;
 
   /** \brief Unified types */
-  typedef typename Impl::ViewUniformType<View,0>::type uniform_type;
-  typedef typename Impl::ViewUniformType<View,0>::const_type uniform_const_type;
-  typedef typename Impl::ViewUniformType<View,0>::runtime_type uniform_runtime_type;
-  typedef typename Impl::ViewUniformType<View,0>::runtime_const_type uniform_runtime_const_type;
-  typedef typename Impl::ViewUniformType<View,0>::nomemspace_type uniform_nomemspace_type;
-  typedef typename Impl::ViewUniformType<View,0>::const_nomemspace_type uniform_const_nomemspace_type;
-  typedef typename Impl::ViewUniformType<View,0>::runtime_nomemspace_type uniform_runtime_nomemspace_type;
-  typedef typename Impl::ViewUniformType<View,0>::runtime_const_nomemspace_type uniform_runtime_const_nomemspace_type;
+  typedef typename Impl::ViewUniformType<View, 0>::type uniform_type;
+  typedef
+      typename Impl::ViewUniformType<View, 0>::const_type uniform_const_type;
+  typedef typename Impl::ViewUniformType<View, 0>::runtime_type
+      uniform_runtime_type;
+  typedef typename Impl::ViewUniformType<View, 0>::runtime_const_type
+      uniform_runtime_const_type;
+  typedef typename Impl::ViewUniformType<View, 0>::nomemspace_type
+      uniform_nomemspace_type;
+  typedef typename Impl::ViewUniformType<View, 0>::const_nomemspace_type
+      uniform_const_nomemspace_type;
+  typedef typename Impl::ViewUniformType<View, 0>::runtime_nomemspace_type
+      uniform_runtime_nomemspace_type;
+  typedef typename Impl::ViewUniformType<View, 0>::runtime_const_nomemspace_type
+      uniform_runtime_const_nomemspace_type;
 
   //----------------------------------------
   // Domain rank and extents
 
   enum { Rank = map_type::Rank };
 
- /** \brief rank() to be implemented
-  */
-  //KOKKOS_INLINE_FUNCTION
-  //static
-  //constexpr unsigned rank() { return map_type::Rank; }
+  /** \brief rank() to be implemented
+   */
+  // KOKKOS_INLINE_FUNCTION
+  // static
+  // constexpr unsigned rank() { return map_type::Rank; }
 
-  template< typename iType >
+  template <typename iType>
   KOKKOS_INLINE_FUNCTION constexpr
-  typename std::enable_if< std::is_integral<iType>::value , size_t >::type
-  extent( const iType & r ) const noexcept
-    { return m_map.extent(r); }
+      typename std::enable_if<std::is_integral<iType>::value, size_t>::type
+      extent(const iType& r) const noexcept {
+    return m_map.extent(r);
+  }
 
-  static KOKKOS_INLINE_FUNCTION constexpr
-  size_t
-  static_extent( const unsigned r ) noexcept
-    { return map_type::static_extent(r); }
+  static KOKKOS_INLINE_FUNCTION constexpr size_t static_extent(
+      const unsigned r) noexcept {
+    return map_type::static_extent(r);
+  }
 
-  template< typename iType >
+  template <typename iType>
   KOKKOS_INLINE_FUNCTION constexpr
-  typename std::enable_if< std::is_integral<iType>::value , int >::type
-  extent_int( const iType & r ) const noexcept
-    { return static_cast<int>(m_map.extent(r)); }
+      typename std::enable_if<std::is_integral<iType>::value, int>::type
+      extent_int(const iType& r) const noexcept {
+    return static_cast<int>(m_map.extent(r));
+  }
 
-  KOKKOS_INLINE_FUNCTION constexpr
-  typename traits::array_layout layout() const
-    { return m_map.layout(); }
+  KOKKOS_INLINE_FUNCTION constexpr typename traits::array_layout layout()
+      const {
+    return m_map.layout();
+  }
 
   //----------------------------------------
   /*  Deprecate all 'dimension' functions in favor of
@@ -672,80 +641,134 @@ public:
 
 #ifdef KOKKOS_ENABLE_DEPRECATED_CODE
 
-  template< typename iType >
+  template <typename iType>
   KOKKOS_INLINE_FUNCTION constexpr
-  typename std::enable_if< std::is_integral<iType>::value , size_t >::type
-  dimension( const iType & r ) const { return extent( r ); }
+      typename std::enable_if<std::is_integral<iType>::value, size_t>::type
+      dimension(const iType& r) const {
+    return extent(r);
+  }
 
-  KOKKOS_INLINE_FUNCTION constexpr size_t dimension_0() const { return m_map.dimension_0(); }
-  KOKKOS_INLINE_FUNCTION constexpr size_t dimension_1() const { return m_map.dimension_1(); }
-  KOKKOS_INLINE_FUNCTION constexpr size_t dimension_2() const { return m_map.dimension_2(); }
-  KOKKOS_INLINE_FUNCTION constexpr size_t dimension_3() const { return m_map.dimension_3(); }
-  KOKKOS_INLINE_FUNCTION constexpr size_t dimension_4() const { return m_map.dimension_4(); }
-  KOKKOS_INLINE_FUNCTION constexpr size_t dimension_5() const { return m_map.dimension_5(); }
-  KOKKOS_INLINE_FUNCTION constexpr size_t dimension_6() const { return m_map.dimension_6(); }
-  KOKKOS_INLINE_FUNCTION constexpr size_t dimension_7() const { return m_map.dimension_7(); }
+  KOKKOS_INLINE_FUNCTION constexpr size_t dimension_0() const {
+    return m_map.dimension_0();
+  }
+  KOKKOS_INLINE_FUNCTION constexpr size_t dimension_1() const {
+    return m_map.dimension_1();
+  }
+  KOKKOS_INLINE_FUNCTION constexpr size_t dimension_2() const {
+    return m_map.dimension_2();
+  }
+  KOKKOS_INLINE_FUNCTION constexpr size_t dimension_3() const {
+    return m_map.dimension_3();
+  }
+  KOKKOS_INLINE_FUNCTION constexpr size_t dimension_4() const {
+    return m_map.dimension_4();
+  }
+  KOKKOS_INLINE_FUNCTION constexpr size_t dimension_5() const {
+    return m_map.dimension_5();
+  }
+  KOKKOS_INLINE_FUNCTION constexpr size_t dimension_6() const {
+    return m_map.dimension_6();
+  }
+  KOKKOS_INLINE_FUNCTION constexpr size_t dimension_7() const {
+    return m_map.dimension_7();
+  }
 
 #endif
 
   //----------------------------------------
 
-  KOKKOS_INLINE_FUNCTION constexpr size_t size() const { return m_map.dimension_0() *
-                                                                m_map.dimension_1() *
-                                                                m_map.dimension_2() *
-                                                                m_map.dimension_3() *
-                                                                m_map.dimension_4() *
-                                                                m_map.dimension_5() *
-                                                                m_map.dimension_6() *
-                                                                m_map.dimension_7(); }
-
-  KOKKOS_INLINE_FUNCTION constexpr size_t stride_0() const { return m_map.stride_0(); }
-  KOKKOS_INLINE_FUNCTION constexpr size_t stride_1() const { return m_map.stride_1(); }
-  KOKKOS_INLINE_FUNCTION constexpr size_t stride_2() const { return m_map.stride_2(); }
-  KOKKOS_INLINE_FUNCTION constexpr size_t stride_3() const { return m_map.stride_3(); }
-  KOKKOS_INLINE_FUNCTION constexpr size_t stride_4() const { return m_map.stride_4(); }
-  KOKKOS_INLINE_FUNCTION constexpr size_t stride_5() const { return m_map.stride_5(); }
-  KOKKOS_INLINE_FUNCTION constexpr size_t stride_6() const { return m_map.stride_6(); }
-  KOKKOS_INLINE_FUNCTION constexpr size_t stride_7() const { return m_map.stride_7(); }
-
-  template< typename iType >
-  KOKKOS_INLINE_FUNCTION constexpr
-  typename std::enable_if< std::is_integral<iType>::value , size_t >::type
-  stride(iType r) const {
-    return (r == 0 ? m_map.stride_0() :
-           (r == 1 ? m_map.stride_1() :
-           (r == 2 ? m_map.stride_2() :
-           (r == 3 ? m_map.stride_3() :
-           (r == 4 ? m_map.stride_4() :
-           (r == 5 ? m_map.stride_5() :
-           (r == 6 ? m_map.stride_6() :
-                     m_map.stride_7())))))));
+  KOKKOS_INLINE_FUNCTION constexpr size_t size() const {
+    return m_map.dimension_0() * m_map.dimension_1() * m_map.dimension_2() *
+           m_map.dimension_3() * m_map.dimension_4() * m_map.dimension_5() *
+           m_map.dimension_6() * m_map.dimension_7();
   }
 
-  template< typename iType >
-  KOKKOS_INLINE_FUNCTION void stride( iType * const s ) const { m_map.stride(s); }
+  KOKKOS_INLINE_FUNCTION constexpr size_t stride_0() const {
+    return m_map.stride_0();
+  }
+  KOKKOS_INLINE_FUNCTION constexpr size_t stride_1() const {
+    return m_map.stride_1();
+  }
+  KOKKOS_INLINE_FUNCTION constexpr size_t stride_2() const {
+    return m_map.stride_2();
+  }
+  KOKKOS_INLINE_FUNCTION constexpr size_t stride_3() const {
+    return m_map.stride_3();
+  }
+  KOKKOS_INLINE_FUNCTION constexpr size_t stride_4() const {
+    return m_map.stride_4();
+  }
+  KOKKOS_INLINE_FUNCTION constexpr size_t stride_5() const {
+    return m_map.stride_5();
+  }
+  KOKKOS_INLINE_FUNCTION constexpr size_t stride_6() const {
+    return m_map.stride_6();
+  }
+  KOKKOS_INLINE_FUNCTION constexpr size_t stride_7() const {
+    return m_map.stride_7();
+  }
+
+  template <typename iType>
+  KOKKOS_INLINE_FUNCTION constexpr
+      typename std::enable_if<std::is_integral<iType>::value, size_t>::type
+      stride(iType r) const {
+    return (
+        r == 0
+            ? m_map.stride_0()
+            : (r == 1
+                   ? m_map.stride_1()
+                   : (r == 2
+                          ? m_map.stride_2()
+                          : (r == 3
+                                 ? m_map.stride_3()
+                                 : (r == 4
+                                        ? m_map.stride_4()
+                                        : (r == 5
+                                               ? m_map.stride_5()
+                                               : (r == 6
+                                                      ? m_map.stride_6()
+                                                      : m_map.stride_7())))))));
+  }
+
+  template <typename iType>
+  KOKKOS_INLINE_FUNCTION void stride(iType* const s) const {
+    m_map.stride(s);
+  }
 
   //----------------------------------------
   // Range span is the span which contains all members.
 
-  typedef typename map_type::reference_type  reference_type ;
-  typedef typename map_type::pointer_type    pointer_type ;
+  typedef typename map_type::reference_type reference_type;
+  typedef typename map_type::pointer_type pointer_type;
 
-  enum { reference_type_is_lvalue_reference = std::is_lvalue_reference< reference_type >::value };
+  enum {
+    reference_type_is_lvalue_reference =
+        std::is_lvalue_reference<reference_type>::value
+  };
 
   KOKKOS_INLINE_FUNCTION constexpr size_t span() const { return m_map.span(); }
 #ifdef KOKKOS_ENABLE_DEPRECATED_CODE
   // Deprecated, use 'span()' instead
-  KOKKOS_INLINE_FUNCTION constexpr size_t capacity() const { return m_map.span(); }
+  KOKKOS_INLINE_FUNCTION constexpr size_t capacity() const {
+    return m_map.span();
+  }
 #endif
-  KOKKOS_INLINE_FUNCTION bool span_is_contiguous() const { return m_map.span_is_contiguous(); }
-  KOKKOS_INLINE_FUNCTION constexpr pointer_type data() const { return m_map.data(); }
+  KOKKOS_INLINE_FUNCTION bool span_is_contiguous() const {
+    return m_map.span_is_contiguous();
+  }
+  KOKKOS_INLINE_FUNCTION constexpr pointer_type data() const {
+    return m_map.data();
+  }
 
 #ifdef KOKKOS_ENABLE_DEPRECATED_CODE
   // Deprecated, use 'span_is_contigous()' instead
-  KOKKOS_INLINE_FUNCTION constexpr bool   is_contiguous() const { return m_map.span_is_contiguous(); }
+  KOKKOS_INLINE_FUNCTION constexpr bool is_contiguous() const {
+    return m_map.span_is_contiguous();
+  }
   // Deprecated, use 'data()' instead
-  KOKKOS_INLINE_FUNCTION constexpr pointer_type ptr_on_device() const { return m_map.data(); }
+  KOKKOS_INLINE_FUNCTION constexpr pointer_type ptr_on_device() const {
+    return m_map.data();
+  }
 #endif
 
   //----------------------------------------
@@ -753,1215 +776,946 @@ public:
 
 #ifdef KOKKOS_ENABLE_DEPRECATED_CODE
   KOKKOS_INLINE_FUNCTION
-  const Kokkos::Impl::ViewMapping< traits , typename traits::specialize > &
-  implementation_map() const { return m_map ; }
+  const Kokkos::Impl::ViewMapping<traits, typename traits::specialize>&
+  implementation_map() const {
+    return m_map;
+  }
 #endif
   KOKKOS_INLINE_FUNCTION
-  const Kokkos::Impl::ViewMapping< traits , typename traits::specialize > &
-  impl_map() const { return m_map ; }
+  const Kokkos::Impl::ViewMapping<traits, typename traits::specialize>&
+  impl_map() const {
+    return m_map;
+  }
   KOKKOS_INLINE_FUNCTION
-  const Kokkos::Impl::SharedAllocationTracker &
-  impl_track() const { return m_track ; }
+  const Kokkos::Impl::SharedAllocationTracker& impl_track() const {
+    return m_track;
+  }
   //----------------------------------------
 
-private:
-
+ private:
   enum {
-    is_layout_left = std::is_same< typename traits::array_layout
-                                  , Kokkos::LayoutLeft >::value ,
+    is_layout_left =
+        std::is_same<typename traits::array_layout, Kokkos::LayoutLeft>::value,
 
-    is_layout_right = std::is_same< typename traits::array_layout
-                                  , Kokkos::LayoutRight >::value ,
+    is_layout_right =
+        std::is_same<typename traits::array_layout, Kokkos::LayoutRight>::value,
 
-    is_layout_stride = std::is_same< typename traits::array_layout
-                                   , Kokkos::LayoutStride >::value ,
+    is_layout_stride = std::is_same<typename traits::array_layout,
+                                    Kokkos::LayoutStride>::value,
 
-    is_default_map =
-      std::is_same< typename traits::specialize , void >::value &&
-      ( is_layout_left || is_layout_right || is_layout_stride )
+    is_default_map = std::is_same<typename traits::specialize, void>::value &&
+                     (is_layout_left || is_layout_right || is_layout_stride)
   };
 
-  template< class Space , bool = Kokkos::Impl::MemorySpaceAccess< Space , typename traits::memory_space >::accessible > struct verify_space
-    { KOKKOS_FORCEINLINE_FUNCTION static void check() {} };
+  template <class Space, bool = Kokkos::Impl::MemorySpaceAccess<
+                             Space, typename traits::memory_space>::accessible>
+  struct verify_space {
+    KOKKOS_FORCEINLINE_FUNCTION static void check() {}
+  };
 
-  template< class Space > struct verify_space<Space,false>
-    { KOKKOS_FORCEINLINE_FUNCTION static void check()
-        { Kokkos::abort("Kokkos::View ERROR: attempt to access inaccessible memory space"); };
+  template <class Space>
+  struct verify_space<Space, false> {
+    KOKKOS_FORCEINLINE_FUNCTION static void check() {
+      Kokkos::abort(
+          "Kokkos::View ERROR: attempt to access inaccessible memory space");
     };
+  };
 
-#if defined( KOKKOS_ENABLE_DEBUG_BOUNDS_CHECK )
+#if defined(KOKKOS_ENABLE_DEBUG_BOUNDS_CHECK)
 
-#define KOKKOS_IMPL_VIEW_OPERATOR_VERIFY( ARG ) \
-  View::template verify_space< Kokkos::Impl::ActiveExecutionMemorySpace >::check(); \
-  Kokkos::Impl::view_verify_operator_bounds< typename traits::memory_space > ARG ;
+#define KOKKOS_IMPL_VIEW_OPERATOR_VERIFY(ARG)             \
+  View::template verify_space<                            \
+      Kokkos::Impl::ActiveExecutionMemorySpace>::check(); \
+  Kokkos::Impl::view_verify_operator_bounds<typename traits::memory_space> ARG;
 
 #else
 
-#define KOKKOS_IMPL_VIEW_OPERATOR_VERIFY( ARG ) \
-  View::template verify_space< Kokkos::Impl::ActiveExecutionMemorySpace >::check();
+#define KOKKOS_IMPL_VIEW_OPERATOR_VERIFY(ARG) \
+  View::template verify_space<                \
+      Kokkos::Impl::ActiveExecutionMemorySpace>::check();
 
 #endif
 
-public:
+ public:
 #ifdef KOKKOS_ENABLE_DEPRECATED_CODE
-   template< class ... Args >
-   KOKKOS_FORCEINLINE_FUNCTION
-   typename std::enable_if<( Kokkos::Impl::are_integral<Args...>::value
-                             && ( 0 == Rank )
-                           ), reference_type >::type
-   operator()( Args ... args ) const
-     {
-       KOKKOS_IMPL_VIEW_OPERATOR_VERIFY( (m_track,m_map,args...) )
-       return m_map.reference();
-     }
+  template <class... Args>
+  KOKKOS_FORCEINLINE_FUNCTION
+      typename std::enable_if<(Kokkos::Impl::are_integral<Args...>::value &&
+                               (0 == Rank)),
+                              reference_type>::type
+      operator()(Args... args) const {
+    KOKKOS_IMPL_VIEW_OPERATOR_VERIFY((m_track, m_map, args...))
+    return m_map.reference();
+  }
 
-   template< typename I0
-              , class ... Args>
-   KOKKOS_FORCEINLINE_FUNCTION
-   typename std::enable_if<
-     ( Kokkos::Impl::are_integral<I0,Args...>::value
-       && ( 1 == Rank )
-       && ! is_default_map
-     ), reference_type >::type
-   operator()( const I0 & i0,
-               Args ... args) const
-     {
-       KOKKOS_IMPL_VIEW_OPERATOR_VERIFY( (m_track,m_map,i0,args...) )
-       return m_map.reference(i0);
-     }
+  template <typename I0, class... Args>
+  KOKKOS_FORCEINLINE_FUNCTION
+      typename std::enable_if<(Kokkos::Impl::are_integral<I0, Args...>::value &&
+                               (1 == Rank) && !is_default_map),
+                              reference_type>::type
+      operator()(const I0& i0, Args... args) const {
+    KOKKOS_IMPL_VIEW_OPERATOR_VERIFY((m_track, m_map, i0, args...))
+    return m_map.reference(i0);
+  }
 
-   template< typename I0
-           , class ... Args >
-   KOKKOS_FORCEINLINE_FUNCTION
-   typename std::enable_if<
-     ( Kokkos::Impl::are_integral<I0,Args...>::value
-       && ( 1 == Rank )
-       && is_default_map
-       && ! is_layout_stride
-     ), reference_type >::type
-   operator()( const I0 & i0
-             , Args ... args ) const
-     {
-       KOKKOS_IMPL_VIEW_OPERATOR_VERIFY( (m_track,m_map,i0,args...) )
-       return m_map.m_impl_handle[ i0 ];
-     }
+  template <typename I0, class... Args>
+  KOKKOS_FORCEINLINE_FUNCTION
+      typename std::enable_if<(Kokkos::Impl::are_integral<I0, Args...>::value &&
+                               (1 == Rank) && is_default_map &&
+                               !is_layout_stride),
+                              reference_type>::type
+      operator()(const I0& i0, Args... args) const {
+    KOKKOS_IMPL_VIEW_OPERATOR_VERIFY((m_track, m_map, i0, args...))
+    return m_map.m_impl_handle[i0];
+  }
 
-   template< typename I0
-           , class ... Args >
-   KOKKOS_FORCEINLINE_FUNCTION
-   typename std::enable_if<
-     ( Kokkos::Impl::are_integral<I0,Args...>::value
-       && ( 1 == Rank )
-       && is_default_map
-       && is_layout_stride
-     ), reference_type >::type
-   operator()( const I0 & i0
-             , Args ... args ) const
-     {
-       KOKKOS_IMPL_VIEW_OPERATOR_VERIFY( (m_track,m_map,i0,args...) )
-       return m_map.m_impl_handle[ m_map.m_impl_offset.m_stride.S0 * i0 ];
-     }
+  template <typename I0, class... Args>
+  KOKKOS_FORCEINLINE_FUNCTION
+      typename std::enable_if<(Kokkos::Impl::are_integral<I0, Args...>::value &&
+                               (1 == Rank) && is_default_map &&
+                               is_layout_stride),
+                              reference_type>::type
+      operator()(const I0& i0, Args... args) const {
+    KOKKOS_IMPL_VIEW_OPERATOR_VERIFY((m_track, m_map, i0, args...))
+    return m_map.m_impl_handle[m_map.m_impl_offset.m_stride.S0 * i0];
+  }
 
-   //------------------------------
-     // Rank 1 operator[]
-
-     template< typename I0 >
-     KOKKOS_FORCEINLINE_FUNCTION
-     typename std::enable_if<
-       ( Kokkos::Impl::are_integral<I0>::value
-         && ( 1 == Rank )
-         && ! is_default_map
-       ), reference_type >::type
-     operator[]( const I0 & i0 ) const
-       {
-         KOKKOS_IMPL_VIEW_OPERATOR_VERIFY( (m_track,m_map,i0) )
-         return m_map.reference(i0);
-       }
-
-    template< typename I0 >
-     KOKKOS_FORCEINLINE_FUNCTION
-     typename std::enable_if<
-       ( Kokkos::Impl::are_integral<I0>::value
-         && ( 1 == Rank )
-         && is_default_map
-         && ! is_layout_stride
-       ), reference_type >::type
-     operator[]( const I0 & i0 ) const
-       {
-         KOKKOS_IMPL_VIEW_OPERATOR_VERIFY( (m_track,m_map,i0) )
-         return m_map.m_impl_handle[ i0 ];
-       }
-
-     template< typename I0 >
-     KOKKOS_FORCEINLINE_FUNCTION
-     typename std::enable_if<
-       ( Kokkos::Impl::are_integral<I0>::value
-         && ( 1 == Rank )
-         && is_default_map
-         && is_layout_stride
-       ), reference_type >::type
-     operator[]( const I0 & i0 ) const
-       {
-         KOKKOS_IMPL_VIEW_OPERATOR_VERIFY( (m_track,m_map,i0) )
-         return m_map.m_impl_handle[ m_map.m_impl_offset.m_stride.S0 * i0 ];
-       }
-
-   template< typename I0 , typename I1
-           , class ... Args >
-   KOKKOS_FORCEINLINE_FUNCTION
-   typename std::enable_if<
-     ( Kokkos::Impl::are_integral<I0,I1,Args...>::value
-       && ( 2 == Rank )
-       && ! is_default_map
-     ), reference_type >::type
-   operator()( const I0 & i0 , const I1 & i1
-             , Args ... args ) const
-     {
-       KOKKOS_IMPL_VIEW_OPERATOR_VERIFY( (m_track,m_map,i0,i1,args...) )
-       return m_map.reference(i0,i1);
-     }
-
-   template< typename I0 , typename I1
-           , class ... Args >
-   KOKKOS_FORCEINLINE_FUNCTION
-   typename std::enable_if<
-     ( Kokkos::Impl::are_integral<I0,I1,Args...>::value
-       && ( 2 == Rank )
-       && is_default_map
-       && is_layout_left && ( traits::rank_dynamic == 0 )
-     ), reference_type >::type
-   operator()( const I0 & i0 , const I1 & i1
-             , Args ... args ) const
-     {
-       KOKKOS_IMPL_VIEW_OPERATOR_VERIFY( (m_track,m_map,i0,i1,args...) )
-       return m_map.m_impl_handle[ i0 + m_map.m_impl_offset.m_dim.N0 * i1 ];
-     }
-
-   template< typename I0 , typename I1
-           , class ... Args >
-   KOKKOS_FORCEINLINE_FUNCTION
-   typename std::enable_if<
-     ( Kokkos::Impl::are_integral<I0,I1,Args...>::value
-       && ( 2 == Rank )
-       && is_default_map
-       && is_layout_left && ( traits::rank_dynamic != 0 )
-     ), reference_type >::type
-   operator()( const I0 & i0 , const I1 & i1
-             , Args ... args ) const
-     {
-       KOKKOS_IMPL_VIEW_OPERATOR_VERIFY( (m_track,m_map,i0,i1,args...) )
-       return m_map.m_impl_handle[ i0 + m_map.m_impl_offset.m_stride * i1 ];
-     }
-
-   template< typename I0 , typename I1
-           , class ... Args >
-   KOKKOS_FORCEINLINE_FUNCTION
-   typename std::enable_if<
-     ( Kokkos::Impl::are_integral<I0,I1,Args...>::value
-       && ( 2 == Rank )
-       && is_default_map
-       && is_layout_right && ( traits::rank_dynamic == 0 )
-     ), reference_type >::type
-   operator()( const I0 & i0 , const I1 & i1
-             , Args ... args ) const
-     {
-       KOKKOS_IMPL_VIEW_OPERATOR_VERIFY( (m_track,m_map,i0,i1,args...) )
-       return m_map.m_impl_handle[ i1 + m_map.m_impl_offset.m_dim.N1 * i0 ];
-     }
-
-   template< typename I0 , typename I1
-           , class ... Args >
-   KOKKOS_FORCEINLINE_FUNCTION
-   typename std::enable_if<
-     ( Kokkos::Impl::are_integral<I0,I1,Args...>::value
-       && ( 2 == Rank )
-       && is_default_map
-       && is_layout_right && ( traits::rank_dynamic != 0 )
-     ), reference_type >::type
-   operator()( const I0 & i0 , const I1 & i1
-             , Args ... args ) const
-     {
-       KOKKOS_IMPL_VIEW_OPERATOR_VERIFY( (m_track,m_map,i0,i1,args...) )
-       return m_map.m_impl_handle[ i1 + m_map.m_impl_offset.m_stride * i0 ];
-     }
-
-   template< typename I0 , typename I1
-           , class ... Args >
-   KOKKOS_FORCEINLINE_FUNCTION
-   typename std::enable_if<
-     ( Kokkos::Impl::are_integral<I0,I1,Args...>::value
-       && ( 2 == Rank )
-       && is_default_map
-       && is_layout_stride
-     ), reference_type >::type
-   operator()( const I0 & i0 , const I1 & i1
-             , Args ... args ) const
-     {
-       KOKKOS_IMPL_VIEW_OPERATOR_VERIFY( (m_track,m_map,i0,i1,args...) )
-       return m_map.m_impl_handle[ i0 * m_map.m_impl_offset.m_stride.S0 +
-                              i1 * m_map.m_impl_offset.m_stride.S1 ];
-     }
-
-   //------------------------------
-   // Rank 3
-
-   template< typename I0 , typename I1 , typename I2
-           , class ... Args >
-   KOKKOS_FORCEINLINE_FUNCTION
-   typename std::enable_if<
-     ( Kokkos::Impl::are_integral<I0,I1,I2,Args...>::value
-       && ( 3 == Rank )
-       && is_default_map
-     ), reference_type >::type
-   operator()( const I0 & i0 , const I1 & i1 , const I2 & i2
-             , Args ... args ) const
-     {
-       KOKKOS_IMPL_VIEW_OPERATOR_VERIFY( (m_track,m_map,i0,i1,i2,args...) )
-       return m_map.m_impl_handle[ m_map.m_impl_offset(i0,i1,i2) ];
-     }
-
-   template< typename I0 , typename I1 , typename I2
-           , class ... Args >
-   KOKKOS_FORCEINLINE_FUNCTION
-   typename std::enable_if<
-     ( Kokkos::Impl::are_integral<I0,I1,I2,Args...>::value
-       && ( 3 == Rank )
-       && ! is_default_map
-     ), reference_type >::type
-   operator()( const I0 & i0 , const I1 & i1 , const I2 & i2
-             , Args ... args ) const
-     {
-       KOKKOS_IMPL_VIEW_OPERATOR_VERIFY( (m_track,m_map,i0,i1,i2,args...) )
-       return m_map.reference(i0,i1,i2);
-     }
-
-   //------------------------------
-   // Rank 4
-
- template< typename I0 , typename I1 , typename I2 , typename I3
-           , class ... Args >
-   KOKKOS_FORCEINLINE_FUNCTION
-   typename std::enable_if<
-     ( Kokkos::Impl::are_integral<I0,I1,I2,I3,Args...>::value
-       && ( 4 == Rank )
-       && is_default_map
-     ), reference_type >::type
-   operator()( const I0 & i0 , const I1 & i1 , const I2 & i2 , const I3 & i3
-             , Args ... args ) const
-     {
-       KOKKOS_IMPL_VIEW_OPERATOR_VERIFY( (m_track,m_map,i0,i1,i2,i3,args...) )
-       return m_map.m_impl_handle[ m_map.m_impl_offset(i0,i1,i2,i3) ];
-     }
-
-   template< typename I0 , typename I1 , typename I2 , typename I3
-           , class ... Args >
-   KOKKOS_FORCEINLINE_FUNCTION
-   typename std::enable_if<
-     ( Kokkos::Impl::are_integral<I0,I1,I2,I3,Args...>::value
-       && ( 4 == Rank )
-       && ! is_default_map
-     ), reference_type >::type
-   operator()( const I0 & i0 , const I1 & i1 , const I2 & i2 , const I3 & i3
-             , Args ... args ) const
-     {
-       KOKKOS_IMPL_VIEW_OPERATOR_VERIFY( (m_track,m_map,i0,i1,i2,i3,args...) )
-       return m_map.reference(i0,i1,i2,i3);
-     }
-
-   //------------------------------
-   // Rank 5
-
-   template< typename I0 , typename I1 , typename I2 , typename I3
-           , typename I4
-           , class ... Args >
-   KOKKOS_FORCEINLINE_FUNCTION
-   typename std::enable_if<
-     ( Kokkos::Impl::are_integral<I0,I1,I2,I3,I4,Args...>::value
-       && ( 5 == Rank )
-       && is_default_map
-     ), reference_type >::type
-   operator()( const I0 & i0 , const I1 & i1 , const I2 & i2 , const I3 & i3
-             , const I4 & i4
-             , Args ... args ) const
-     {
-       KOKKOS_IMPL_VIEW_OPERATOR_VERIFY( (m_track,m_map,i0,i1,i2,i3,i4,args...) )
-       return m_map.m_impl_handle[ m_map.m_impl_offset(i0,i1,i2,i3,i4) ];
-     }
-
-   template< typename I0 , typename I1 , typename I2 , typename I3
-           , typename I4
-           , class ... Args >
-   KOKKOS_FORCEINLINE_FUNCTION
-   typename std::enable_if<
-     ( Kokkos::Impl::are_integral<I0,I1,I2,I3,I4,Args...>::value
-       && ( 5 == Rank )
-       && ! is_default_map
-     ), reference_type >::type
-   operator()( const I0 & i0 , const I1 & i1 , const I2 & i2 , const I3 & i3
-             , const I4 & i4
-             , Args ... args ) const
-     {
-       KOKKOS_IMPL_VIEW_OPERATOR_VERIFY( (m_track,m_map,i0,i1,i2,i3,i4,args...) )
-       return m_map.reference(i0,i1,i2,i3,i4);
-     }
-
-   //------------------------------
-   // Rank 6
-
-   template< typename I0 , typename I1 , typename I2 , typename I3
-           , typename I4 , typename I5
-           , class ... Args >
-   KOKKOS_FORCEINLINE_FUNCTION
-   typename std::enable_if<
-     ( Kokkos::Impl::are_integral<I0,I1,I2,I3,I4,I5,Args...>::value
-       && ( 6 == Rank )
-       && is_default_map
-     ), reference_type >::type
-   operator()( const I0 & i0 , const I1 & i1 , const I2 & i2 , const I3 & i3
-             , const I4 & i4 , const I5 & i5
-             , Args ... args ) const
-     {
-       KOKKOS_IMPL_VIEW_OPERATOR_VERIFY( (m_track,m_map,i0,i1,i2,i3,i4,i5,args...) )
-       return m_map.m_impl_handle[ m_map.m_impl_offset(i0,i1,i2,i3,i4,i5) ];
-     }
-
-   template< typename I0 , typename I1 , typename I2 , typename I3
-           , typename I4 , typename I5
-           , class ... Args >
-   KOKKOS_FORCEINLINE_FUNCTION
-   typename std::enable_if<
-     ( Kokkos::Impl::are_integral<I0,I1,I2,I3,I4,I5,Args...>::value
-       && ( 6 == Rank )
-       && ! is_default_map
-     ), reference_type >::type
-   operator()( const I0 & i0 , const I1 & i1 , const I2 & i2 , const I3 & i3
-             , const I4 & i4 , const I5 & i5
-             , Args ... args ) const
-     {
-       KOKKOS_IMPL_VIEW_OPERATOR_VERIFY( (m_track,m_map,i0,i1,i2,i3,i4,i5,args...) )
-       return m_map.reference(i0,i1,i2,i3,i4,i5);
-     }
-
-   //------------------------------
-   // Rank 7
-
-   template< typename I0 , typename I1 , typename I2 , typename I3
-           , typename I4 , typename I5 , typename I6
-           , class ... Args >
-   KOKKOS_FORCEINLINE_FUNCTION
-   typename std::enable_if<
-     ( Kokkos::Impl::are_integral<I0,I1,I2,I3,I4,I5,I6,Args...>::value
-       && ( 7 == Rank )
-       && is_default_map
-     ), reference_type >::type
-   operator()( const I0 & i0 , const I1 & i1 , const I2 & i2 , const I3 & i3
-             , const I4 & i4 , const I5 & i5 , const I6 & i6
-             , Args ... args ) const
-     {
-       KOKKOS_IMPL_VIEW_OPERATOR_VERIFY( (m_track,m_map,i0,i1,i2,i3,i4,i5,i6,args...) )
-       return m_map.m_impl_handle[ m_map.m_impl_offset(i0,i1,i2,i3,i4,i5,i6) ];
-     }
-
-   template< typename I0 , typename I1 , typename I2 , typename I3
-           , typename I4 , typename I5 , typename I6
-           , class ... Args >
-   KOKKOS_FORCEINLINE_FUNCTION
-   typename std::enable_if<
-     ( Kokkos::Impl::are_integral<I0,I1,I2,I3,I4,I5,I6,Args...>::value
-       && ( 7 == Rank )
-       && ! is_default_map
-     ), reference_type >::type
-   operator()( const I0 & i0 , const I1 & i1 , const I2 & i2 , const I3 & i3
-             , const I4 & i4 , const I5 & i5 , const I6 & i6
-             , Args ... args ) const
-     {
-       KOKKOS_IMPL_VIEW_OPERATOR_VERIFY( (m_track,m_map,i0,i1,i2,i3,i4,i5,i6,args...) )
-       return m_map.reference(i0,i1,i2,i3,i4,i5,i6);
-     }
-
-   //------------------------------
-   // Rank 8
-
-   template< typename I0 , typename I1 , typename I2 , typename I3
-           , typename I4 , typename I5 , typename I6 , typename I7
-           , class ... Args >
-   KOKKOS_FORCEINLINE_FUNCTION
-   typename std::enable_if<
-     ( Kokkos::Impl::are_integral<I0,I1,I2,I3,I4,I5,I6,I7,Args...>::value
-       && ( 8 == Rank )
-       && is_default_map
-     ), reference_type >::type
-   operator()( const I0 & i0 , const I1 & i1 , const I2 & i2 , const I3 & i3
-             , const I4 & i4 , const I5 & i5 , const I6 & i6 , const I7 & i7
-             , Args ... args ) const
-     {
-       KOKKOS_IMPL_VIEW_OPERATOR_VERIFY( (m_track,m_map,i0,i1,i2,i3,i4,i5,i6,i7,args...) )
-       return m_map.m_impl_handle[ m_map.m_impl_offset(i0,i1,i2,i3,i4,i5,i6,i7) ];
-     }
-
-   template< typename I0 , typename I1 , typename I2 , typename I3
-           , typename I4 , typename I5 , typename I6 , typename I7
-           , class ... Args >
-   KOKKOS_FORCEINLINE_FUNCTION
-   typename std::enable_if<
-     ( Kokkos::Impl::are_integral<I0,I1,I2,I3,I4,I5,I6,I7,Args...>::value
-       && ( 8 == Rank )
-       && ! is_default_map
-     ), reference_type >::type
-   operator()( const I0 & i0 , const I1 & i1 , const I2 & i2 , const I3 & i3
-             , const I4 & i4 , const I5 & i5 , const I6 & i6 , const I7 & i7
-             , Args ... args ) const
-     {
-       KOKKOS_IMPL_VIEW_OPERATOR_VERIFY( (m_track,m_map,i0,i1,i2,i3,i4,i5,i6,i7,args...) )
-       return m_map.reference(i0,i1,i2,i3,i4,i5,i6,i7);
-     }
-
-
-  #else
   //------------------------------
-  // Rank 0 operator()
+  // Rank 1 operator[]
 
- KOKKOS_FORCEINLINE_FUNCTION
-  reference_type
-  operator()() const
-    {
-      return m_map.reference();
-    }
-  //------------------------------
-  // Rank 1 operator()
-
-
-  template< typename I0>
+  template <typename I0>
   KOKKOS_FORCEINLINE_FUNCTION
-  typename std::enable_if<
-    ( Kokkos::Impl::are_integral<I0>::value
-      && ( 1 == Rank )
-      && ! is_default_map
-    ), reference_type >::type
-  operator()( const I0 & i0) const
-    {
-      KOKKOS_IMPL_VIEW_OPERATOR_VERIFY( (m_track,m_map,i0) )
-      return m_map.reference(i0);
-    }
+      typename std::enable_if<(Kokkos::Impl::are_integral<I0>::value &&
+                               (1 == Rank) && !is_default_map),
+                              reference_type>::type
+      operator[](const I0& i0) const {
+    KOKKOS_IMPL_VIEW_OPERATOR_VERIFY((m_track, m_map, i0))
+    return m_map.reference(i0);
+  }
 
-  template< typename I0>
+  template <typename I0>
   KOKKOS_FORCEINLINE_FUNCTION
-  typename std::enable_if<
-    ( Kokkos::Impl::are_integral<I0>::value
-      && ( 1 == Rank )
-      && is_default_map
-      && ! is_layout_stride
-    ), reference_type >::type
-  operator()( const I0 & i0 ) const
-    {
-      KOKKOS_IMPL_VIEW_OPERATOR_VERIFY( (m_track,m_map,i0) )
-      return m_map.m_impl_handle[ i0 ];
-    }
+      typename std::enable_if<(Kokkos::Impl::are_integral<I0>::value &&
+                               (1 == Rank) && is_default_map &&
+                               !is_layout_stride),
+                              reference_type>::type
+      operator[](const I0& i0) const {
+    KOKKOS_IMPL_VIEW_OPERATOR_VERIFY((m_track, m_map, i0))
+    return m_map.m_impl_handle[i0];
+  }
 
-  template< typename I0 >
+  template <typename I0>
   KOKKOS_FORCEINLINE_FUNCTION
-  typename std::enable_if<
-    ( Kokkos::Impl::are_integral<I0>::value
-      && ( 1 == Rank )
-      && is_default_map
-      && is_layout_stride
-    ), reference_type >::type
-  operator()( const I0 & i0) const
-    {
-      KOKKOS_IMPL_VIEW_OPERATOR_VERIFY( (m_track,m_map,i0) )
-      return m_map.m_impl_handle[ m_map.m_impl_offset.m_stride.S0 * i0 ];
-    }
-  //------------------------------
-    // Rank 1 operator[]
+      typename std::enable_if<(Kokkos::Impl::are_integral<I0>::value &&
+                               (1 == Rank) && is_default_map &&
+                               is_layout_stride),
+                              reference_type>::type
+      operator[](const I0& i0) const {
+    KOKKOS_IMPL_VIEW_OPERATOR_VERIFY((m_track, m_map, i0))
+    return m_map.m_impl_handle[m_map.m_impl_offset.m_stride.S0 * i0];
+  }
 
-    template< typename I0 >
-    KOKKOS_FORCEINLINE_FUNCTION
-    typename std::enable_if<
-      ( Kokkos::Impl::are_integral<I0>::value
-        && ( 1 == Rank )
-        && ! is_default_map
-      ), reference_type >::type
-    operator[]( const I0 & i0 ) const
-      {
-        KOKKOS_IMPL_VIEW_OPERATOR_VERIFY( (m_track,m_map,i0) )
-        return m_map.reference(i0);
-      }
+  template <typename I0, typename I1, class... Args>
+  KOKKOS_FORCEINLINE_FUNCTION typename std::enable_if<
+      (Kokkos::Impl::are_integral<I0, I1, Args...>::value && (2 == Rank) &&
+       !is_default_map),
+      reference_type>::type
+  operator()(const I0& i0, const I1& i1, Args... args) const {
+    KOKKOS_IMPL_VIEW_OPERATOR_VERIFY((m_track, m_map, i0, i1, args...))
+    return m_map.reference(i0, i1);
+  }
 
-    template< typename I0 >
-    KOKKOS_FORCEINLINE_FUNCTION
-    typename std::enable_if<
-      ( Kokkos::Impl::are_integral<I0>::value
-        && ( 1 == Rank )
-        && is_default_map
-        && ! is_layout_stride
-      ), reference_type >::type
-    operator[]( const I0 & i0 ) const
-      {
-        KOKKOS_IMPL_VIEW_OPERATOR_VERIFY( (m_track,m_map,i0) )
-        return m_map.m_impl_handle[ i0 ];
-      }
+  template <typename I0, typename I1, class... Args>
+  KOKKOS_FORCEINLINE_FUNCTION typename std::enable_if<
+      (Kokkos::Impl::are_integral<I0, I1, Args...>::value && (2 == Rank) &&
+       is_default_map && is_layout_left && (traits::rank_dynamic == 0)),
+      reference_type>::type
+  operator()(const I0& i0, const I1& i1, Args... args) const {
+    KOKKOS_IMPL_VIEW_OPERATOR_VERIFY((m_track, m_map, i0, i1, args...))
+    return m_map.m_impl_handle[i0 + m_map.m_impl_offset.m_dim.N0 * i1];
+  }
 
-    template< typename I0 >
-    KOKKOS_FORCEINLINE_FUNCTION
-    typename std::enable_if<
-      ( Kokkos::Impl::are_integral<I0>::value
-        && ( 1 == Rank )
-        && is_default_map
-        && is_layout_stride
-      ), reference_type >::type
-    operator[]( const I0 & i0 ) const
-      {
-        KOKKOS_IMPL_VIEW_OPERATOR_VERIFY( (m_track,m_map,i0) )
-        return m_map.m_impl_handle[ m_map.m_impl_offset.m_stride.S0 * i0 ];
-      }
+  template <typename I0, typename I1, class... Args>
+  KOKKOS_FORCEINLINE_FUNCTION typename std::enable_if<
+      (Kokkos::Impl::are_integral<I0, I1, Args...>::value && (2 == Rank) &&
+       is_default_map && is_layout_left && (traits::rank_dynamic != 0)),
+      reference_type>::type
+  operator()(const I0& i0, const I1& i1, Args... args) const {
+    KOKKOS_IMPL_VIEW_OPERATOR_VERIFY((m_track, m_map, i0, i1, args...))
+    return m_map.m_impl_handle[i0 + m_map.m_impl_offset.m_stride * i1];
+  }
 
+  template <typename I0, typename I1, class... Args>
+  KOKKOS_FORCEINLINE_FUNCTION typename std::enable_if<
+      (Kokkos::Impl::are_integral<I0, I1, Args...>::value && (2 == Rank) &&
+       is_default_map && is_layout_right && (traits::rank_dynamic == 0)),
+      reference_type>::type
+  operator()(const I0& i0, const I1& i1, Args... args) const {
+    KOKKOS_IMPL_VIEW_OPERATOR_VERIFY((m_track, m_map, i0, i1, args...))
+    return m_map.m_impl_handle[i1 + m_map.m_impl_offset.m_dim.N1 * i0];
+  }
 
-    //------------------------------
-  // Rank 2
+  template <typename I0, typename I1, class... Args>
+  KOKKOS_FORCEINLINE_FUNCTION typename std::enable_if<
+      (Kokkos::Impl::are_integral<I0, I1, Args...>::value && (2 == Rank) &&
+       is_default_map && is_layout_right && (traits::rank_dynamic != 0)),
+      reference_type>::type
+  operator()(const I0& i0, const I1& i1, Args... args) const {
+    KOKKOS_IMPL_VIEW_OPERATOR_VERIFY((m_track, m_map, i0, i1, args...))
+    return m_map.m_impl_handle[i1 + m_map.m_impl_offset.m_stride * i0];
+  }
 
-  template< typename I0 , typename I1 >
-  KOKKOS_FORCEINLINE_FUNCTION
-  typename std::enable_if<
-    ( Kokkos::Impl::are_integral<I0,I1>::value
-      && ( 2 == Rank )
-      && ! is_default_map
-    ), reference_type >::type
-  operator()( const I0 & i0 , const I1 & i1) const
-    {
-      KOKKOS_IMPL_VIEW_OPERATOR_VERIFY( (m_track,m_map,i0,i1) )
-      return m_map.reference(i0,i1);
-    }
-
-  template< typename I0 , typename I1 >
-  KOKKOS_FORCEINLINE_FUNCTION
-  typename std::enable_if<
-    ( Kokkos::Impl::are_integral<I0,I1>::value
-      && ( 2 == Rank )
-      && is_default_map
-      && is_layout_left && ( traits::rank_dynamic == 0 )
-    ), reference_type >::type
-  operator()( const I0 & i0 , const I1 & i1) const
-    {
-      KOKKOS_IMPL_VIEW_OPERATOR_VERIFY( (m_track,m_map,i0,i1) )
-      return m_map.m_impl_handle[ i0 + m_map.m_impl_offset.m_dim.N0 * i1 ];
-    }
-
-  template< typename I0 , typename I1>
-  KOKKOS_FORCEINLINE_FUNCTION
-  typename std::enable_if<
-    ( Kokkos::Impl::are_integral<I0,I1>::value
-      && ( 2 == Rank )
-      && is_default_map
-      && is_layout_left && ( traits::rank_dynamic != 0 )
-    ), reference_type >::type
-  operator()( const I0 & i0 , const I1 & i1) const
-    {
-      KOKKOS_IMPL_VIEW_OPERATOR_VERIFY( (m_track,m_map,i0,i1) )
-      return m_map.m_impl_handle[ i0 + m_map.m_impl_offset.m_stride * i1 ];
-    }
-
-  template< typename I0 , typename I1 >
-  KOKKOS_FORCEINLINE_FUNCTION
-  typename std::enable_if<
-    ( Kokkos::Impl::are_integral<I0,I1>::value
-      && ( 2 == Rank )
-      && is_default_map
-      && is_layout_right && ( traits::rank_dynamic == 0 )
-    ), reference_type >::type
-  operator()( const I0 & i0 , const I1 & i1 ) const
-    {
-      KOKKOS_IMPL_VIEW_OPERATOR_VERIFY( (m_track,m_map,i0,i1) )
-      return m_map.m_impl_handle[ i1 + m_map.m_impl_offset.m_dim.N1 * i0 ];
-    }
-
-  template< typename I0 , typename I1 >
-  KOKKOS_FORCEINLINE_FUNCTION
-  typename std::enable_if<
-    ( Kokkos::Impl::are_integral<I0,I1>::value
-      && ( 2 == Rank )
-      && is_default_map
-      && is_layout_right && ( traits::rank_dynamic != 0 )
-    ), reference_type >::type
-  operator()( const I0 & i0 , const I1 & i1 ) const
-    {
-      KOKKOS_IMPL_VIEW_OPERATOR_VERIFY( (m_track,m_map,i0,i1) )
-      return m_map.m_impl_handle[ i1 + m_map.m_impl_offset.m_stride * i0 ];
-    }
-
-  template< typename I0 , typename I1>
-  KOKKOS_FORCEINLINE_FUNCTION
-  typename std::enable_if<
-    ( Kokkos::Impl::are_integral<I0,I1>::value
-      && ( 2 == Rank )
-      && is_default_map
-      && is_layout_stride
-    ), reference_type >::type
-  operator()( const I0 & i0 , const I1 & i1 ) const
-    {
-      KOKKOS_IMPL_VIEW_OPERATOR_VERIFY( (m_track,m_map,i0,i1) )
-      return m_map.m_impl_handle[ i0 * m_map.m_impl_offset.m_stride.S0 +
-                             i1 * m_map.m_impl_offset.m_stride.S1 ];
-    }
+  template <typename I0, typename I1, class... Args>
+  KOKKOS_FORCEINLINE_FUNCTION typename std::enable_if<
+      (Kokkos::Impl::are_integral<I0, I1, Args...>::value && (2 == Rank) &&
+       is_default_map && is_layout_stride),
+      reference_type>::type
+  operator()(const I0& i0, const I1& i1, Args... args) const {
+    KOKKOS_IMPL_VIEW_OPERATOR_VERIFY((m_track, m_map, i0, i1, args...))
+    return m_map.m_impl_handle[i0 * m_map.m_impl_offset.m_stride.S0 +
+                               i1 * m_map.m_impl_offset.m_stride.S1];
+  }
 
   //------------------------------
   // Rank 3
 
-  template< typename I0 , typename I1 , typename I2 >
-  KOKKOS_FORCEINLINE_FUNCTION
-  typename std::enable_if<
-    ( Kokkos::Impl::are_integral<I0,I1,I2>::value
-      && ( 3 == Rank )
-      && is_default_map
-    ), reference_type >::type
-  operator()( const I0 & i0 , const I1 & i1 , const I2 & i2) const
-    {
-      KOKKOS_IMPL_VIEW_OPERATOR_VERIFY( (m_track,m_map,i0,i1,i2) )
-      return m_map.m_impl_handle[ m_map.m_impl_offset(i0,i1,i2) ];
-    }
+  template <typename I0, typename I1, typename I2, class... Args>
+  KOKKOS_FORCEINLINE_FUNCTION typename std::enable_if<
+      (Kokkos::Impl::are_integral<I0, I1, I2, Args...>::value && (3 == Rank) &&
+       is_default_map),
+      reference_type>::type
+  operator()(const I0& i0, const I1& i1, const I2& i2, Args... args) const {
+    KOKKOS_IMPL_VIEW_OPERATOR_VERIFY((m_track, m_map, i0, i1, i2, args...))
+    return m_map.m_impl_handle[m_map.m_impl_offset(i0, i1, i2)];
+  }
 
-  template< typename I0 , typename I1 , typename I2>
-  KOKKOS_FORCEINLINE_FUNCTION
-  typename std::enable_if<
-    ( Kokkos::Impl::are_integral<I0,I1,I2>::value
-      && ( 3 == Rank )
-      && ! is_default_map
-    ), reference_type >::type
-  operator()( const I0 & i0 , const I1 & i1 , const I2 & i2) const
-    {
-      KOKKOS_IMPL_VIEW_OPERATOR_VERIFY( (m_track,m_map,i0,i1,i2) )
-      return m_map.reference(i0,i1,i2);
-    }
+  template <typename I0, typename I1, typename I2, class... Args>
+  KOKKOS_FORCEINLINE_FUNCTION typename std::enable_if<
+      (Kokkos::Impl::are_integral<I0, I1, I2, Args...>::value && (3 == Rank) &&
+       !is_default_map),
+      reference_type>::type
+  operator()(const I0& i0, const I1& i1, const I2& i2, Args... args) const {
+    KOKKOS_IMPL_VIEW_OPERATOR_VERIFY((m_track, m_map, i0, i1, i2, args...))
+    return m_map.reference(i0, i1, i2);
+  }
 
   //------------------------------
   // Rank 4
 
-  template< typename I0 , typename I1 , typename I2 , typename I3>
-  KOKKOS_FORCEINLINE_FUNCTION
-  typename std::enable_if<
-    ( Kokkos::Impl::are_integral<I0,I1,I2,I3>::value
-      && ( 4 == Rank )
-      && is_default_map
-    ), reference_type >::type
-  operator()( const I0 & i0 , const I1 & i1 , const I2 & i2 , const I3 & i3) const
-    {
-      KOKKOS_IMPL_VIEW_OPERATOR_VERIFY( (m_track,m_map,i0,i1,i2,i3) )
-      return m_map.m_impl_handle[ m_map.m_impl_offset(i0,i1,i2,i3) ];
-    }
+  template <typename I0, typename I1, typename I2, typename I3, class... Args>
+  KOKKOS_FORCEINLINE_FUNCTION typename std::enable_if<
+      (Kokkos::Impl::are_integral<I0, I1, I2, I3, Args...>::value &&
+       (4 == Rank) && is_default_map),
+      reference_type>::type
+  operator()(const I0& i0, const I1& i1, const I2& i2, const I3& i3,
+             Args... args) const {
+    KOKKOS_IMPL_VIEW_OPERATOR_VERIFY((m_track, m_map, i0, i1, i2, i3, args...))
+    return m_map.m_impl_handle[m_map.m_impl_offset(i0, i1, i2, i3)];
+  }
 
-  template< typename I0 , typename I1 , typename I2 , typename I3 >
-  KOKKOS_FORCEINLINE_FUNCTION
-  typename std::enable_if<
-    ( Kokkos::Impl::are_integral<I0,I1,I2,I3>::value
-      && ( 4 == Rank )
-      && ! is_default_map
-    ), reference_type >::type
-  operator()( const I0 & i0 , const I1 & i1 , const I2 & i2 , const I3 & i3) const
-    {
-      KOKKOS_IMPL_VIEW_OPERATOR_VERIFY( (m_track,m_map,i0,i1,i2,i3) )
-      return m_map.reference(i0,i1,i2,i3);
-    }
+  template <typename I0, typename I1, typename I2, typename I3, class... Args>
+  KOKKOS_FORCEINLINE_FUNCTION typename std::enable_if<
+      (Kokkos::Impl::are_integral<I0, I1, I2, I3, Args...>::value &&
+       (4 == Rank) && !is_default_map),
+      reference_type>::type
+  operator()(const I0& i0, const I1& i1, const I2& i2, const I3& i3,
+             Args... args) const {
+    KOKKOS_IMPL_VIEW_OPERATOR_VERIFY((m_track, m_map, i0, i1, i2, i3, args...))
+    return m_map.reference(i0, i1, i2, i3);
+  }
 
   //------------------------------
   // Rank 5
 
-  template< typename I0 , typename I1 , typename I2 , typename I3
-          , typename I4>
-  KOKKOS_FORCEINLINE_FUNCTION
-  typename std::enable_if<
-    ( Kokkos::Impl::are_integral<I0,I1,I2,I3,I4>::value
-      && ( 5 == Rank )
-      && is_default_map
-    ), reference_type >::type
-  operator()( const I0 & i0 , const I1 & i1 , const I2 & i2 , const I3 & i3
-            , const I4 & i4 ) const
-    {
-      KOKKOS_IMPL_VIEW_OPERATOR_VERIFY( (m_track,m_map,i0,i1,i2,i3,i4) )
-      return m_map.m_impl_handle[ m_map.m_impl_offset(i0,i1,i2,i3,i4) ];
-    }
+  template <typename I0, typename I1, typename I2, typename I3, typename I4,
+            class... Args>
+  KOKKOS_FORCEINLINE_FUNCTION typename std::enable_if<
+      (Kokkos::Impl::are_integral<I0, I1, I2, I3, I4, Args...>::value &&
+       (5 == Rank) && is_default_map),
+      reference_type>::type
+  operator()(const I0& i0, const I1& i1, const I2& i2, const I3& i3,
+             const I4& i4, Args... args) const {
+    KOKKOS_IMPL_VIEW_OPERATOR_VERIFY(
+        (m_track, m_map, i0, i1, i2, i3, i4, args...))
+    return m_map.m_impl_handle[m_map.m_impl_offset(i0, i1, i2, i3, i4)];
+  }
 
-  template< typename I0 , typename I1 , typename I2 , typename I3
-          , typename I4>
-  KOKKOS_FORCEINLINE_FUNCTION
-  typename std::enable_if<
-    ( Kokkos::Impl::are_integral<I0,I1,I2,I3,I4>::value
-      && ( 5 == Rank )
-      && ! is_default_map
-    ), reference_type >::type
-  operator()( const I0 & i0 , const I1 & i1 , const I2 & i2 , const I3 & i3
-            , const I4 & i4) const
-    {
-      KOKKOS_IMPL_VIEW_OPERATOR_VERIFY( (m_track,m_map,i0,i1,i2,i3,i4) )
-      return m_map.reference(i0,i1,i2,i3,i4);
-    }
+  template <typename I0, typename I1, typename I2, typename I3, typename I4,
+            class... Args>
+  KOKKOS_FORCEINLINE_FUNCTION typename std::enable_if<
+      (Kokkos::Impl::are_integral<I0, I1, I2, I3, I4, Args...>::value &&
+       (5 == Rank) && !is_default_map),
+      reference_type>::type
+  operator()(const I0& i0, const I1& i1, const I2& i2, const I3& i3,
+             const I4& i4, Args... args) const {
+    KOKKOS_IMPL_VIEW_OPERATOR_VERIFY(
+        (m_track, m_map, i0, i1, i2, i3, i4, args...))
+    return m_map.reference(i0, i1, i2, i3, i4);
+  }
 
   //------------------------------
   // Rank 6
 
-  template< typename I0 , typename I1 , typename I2 , typename I3
-          , typename I4 , typename I5 >
-  KOKKOS_FORCEINLINE_FUNCTION
-  typename std::enable_if<
-    ( Kokkos::Impl::are_integral<I0,I1,I2,I3,I4,I5>::value
-      && ( 6 == Rank )
-      && is_default_map
-    ), reference_type >::type
-  operator()( const I0 & i0 , const I1 & i1 , const I2 & i2 , const I3 & i3
-            , const I4 & i4 , const I5 & i5 ) const
-    {
-      KOKKOS_IMPL_VIEW_OPERATOR_VERIFY( (m_track,m_map,i0,i1,i2,i3,i4,i5) )
-      return m_map.m_impl_handle[ m_map.m_impl_offset(i0,i1,i2,i3,i4,i5) ];
-    }
+  template <typename I0, typename I1, typename I2, typename I3, typename I4,
+            typename I5, class... Args>
+  KOKKOS_FORCEINLINE_FUNCTION typename std::enable_if<
+      (Kokkos::Impl::are_integral<I0, I1, I2, I3, I4, I5, Args...>::value &&
+       (6 == Rank) && is_default_map),
+      reference_type>::type
+  operator()(const I0& i0, const I1& i1, const I2& i2, const I3& i3,
+             const I4& i4, const I5& i5, Args... args) const {
+    KOKKOS_IMPL_VIEW_OPERATOR_VERIFY(
+        (m_track, m_map, i0, i1, i2, i3, i4, i5, args...))
+    return m_map.m_impl_handle[m_map.m_impl_offset(i0, i1, i2, i3, i4, i5)];
+  }
 
-  template< typename I0 , typename I1 , typename I2 , typename I3
-          , typename I4 , typename I5>
-  KOKKOS_FORCEINLINE_FUNCTION
-  typename std::enable_if<
-    ( Kokkos::Impl::are_integral<I0,I1,I2,I3,I4,I5>::value
-      && ( 6 == Rank )
-      && ! is_default_map
-    ), reference_type >::type
-  operator()( const I0 & i0 , const I1 & i1 , const I2 & i2 , const I3 & i3
-            , const I4 & i4 , const I5 & i5) const
-    {
-      KOKKOS_IMPL_VIEW_OPERATOR_VERIFY( (m_track,m_map,i0,i1,i2,i3,i4,i5) )
-      return m_map.reference(i0,i1,i2,i3,i4,i5);
-    }
+  template <typename I0, typename I1, typename I2, typename I3, typename I4,
+            typename I5, class... Args>
+  KOKKOS_FORCEINLINE_FUNCTION typename std::enable_if<
+      (Kokkos::Impl::are_integral<I0, I1, I2, I3, I4, I5, Args...>::value &&
+       (6 == Rank) && !is_default_map),
+      reference_type>::type
+  operator()(const I0& i0, const I1& i1, const I2& i2, const I3& i3,
+             const I4& i4, const I5& i5, Args... args) const {
+    KOKKOS_IMPL_VIEW_OPERATOR_VERIFY(
+        (m_track, m_map, i0, i1, i2, i3, i4, i5, args...))
+    return m_map.reference(i0, i1, i2, i3, i4, i5);
+  }
 
   //------------------------------
   // Rank 7
 
-  template< typename I0 , typename I1 , typename I2 , typename I3
-          , typename I4 , typename I5 , typename I6>
-  KOKKOS_FORCEINLINE_FUNCTION
-  typename std::enable_if<
-    ( Kokkos::Impl::are_integral<I0,I1,I2,I3,I4,I5,I6>::value
-      && ( 7 == Rank )
-      && is_default_map
-    ), reference_type >::type
-  operator()( const I0 & i0 , const I1 & i1 , const I2 & i2 , const I3 & i3
-            , const I4 & i4 , const I5 & i5 , const I6 & i6) const
-    {
-      KOKKOS_IMPL_VIEW_OPERATOR_VERIFY( (m_track,m_map,i0,i1,i2,i3,i4,i5,i6) )
-      return m_map.m_impl_handle[ m_map.m_impl_offset(i0,i1,i2,i3,i4,i5,i6) ];
-    }
+  template <typename I0, typename I1, typename I2, typename I3, typename I4,
+            typename I5, typename I6, class... Args>
+  KOKKOS_FORCEINLINE_FUNCTION typename std::enable_if<
+      (Kokkos::Impl::are_integral<I0, I1, I2, I3, I4, I5, I6, Args...>::value &&
+       (7 == Rank) && is_default_map),
+      reference_type>::type
+  operator()(const I0& i0, const I1& i1, const I2& i2, const I3& i3,
+             const I4& i4, const I5& i5, const I6& i6, Args... args) const {
+    KOKKOS_IMPL_VIEW_OPERATOR_VERIFY(
+        (m_track, m_map, i0, i1, i2, i3, i4, i5, i6, args...))
+    return m_map.m_impl_handle[m_map.m_impl_offset(i0, i1, i2, i3, i4, i5, i6)];
+  }
 
-  template< typename I0 , typename I1 , typename I2 , typename I3
-          , typename I4 , typename I5 , typename I6 >
-  KOKKOS_FORCEINLINE_FUNCTION
-  typename std::enable_if<
-    ( Kokkos::Impl::are_integral<I0,I1,I2,I3,I4,I5,I6>::value
-      && ( 7 == Rank )
-      && ! is_default_map
-    ), reference_type >::type
-  operator()( const I0 & i0 , const I1 & i1 , const I2 & i2 , const I3 & i3
-            , const I4 & i4 , const I5 & i5 , const I6 & i6) const
-    {
-      KOKKOS_IMPL_VIEW_OPERATOR_VERIFY( (m_track,m_map,i0,i1,i2,i3,i4,i5,i6) )
-      return m_map.reference(i0,i1,i2,i3,i4,i5,i6);
-    }
+  template <typename I0, typename I1, typename I2, typename I3, typename I4,
+            typename I5, typename I6, class... Args>
+  KOKKOS_FORCEINLINE_FUNCTION typename std::enable_if<
+      (Kokkos::Impl::are_integral<I0, I1, I2, I3, I4, I5, I6, Args...>::value &&
+       (7 == Rank) && !is_default_map),
+      reference_type>::type
+  operator()(const I0& i0, const I1& i1, const I2& i2, const I3& i3,
+             const I4& i4, const I5& i5, const I6& i6, Args... args) const {
+    KOKKOS_IMPL_VIEW_OPERATOR_VERIFY(
+        (m_track, m_map, i0, i1, i2, i3, i4, i5, i6, args...))
+    return m_map.reference(i0, i1, i2, i3, i4, i5, i6);
+  }
 
   //------------------------------
   // Rank 8
 
-  template< typename I0 , typename I1 , typename I2 , typename I3
-          , typename I4 , typename I5 , typename I6 , typename I7 >
-  KOKKOS_FORCEINLINE_FUNCTION
-  typename std::enable_if<
-    ( Kokkos::Impl::are_integral<I0,I1,I2,I3,I4,I5,I6,I7>::value
-      && ( 8 == Rank )
-      && is_default_map
-    ), reference_type >::type
-  operator()( const I0 & i0 , const I1 & i1 , const I2 & i2 , const I3 & i3
-            , const I4 & i4 , const I5 & i5 , const I6 & i6 , const I7 & i7) const
-    {
-      KOKKOS_IMPL_VIEW_OPERATOR_VERIFY( (m_track,m_map,i0,i1,i2,i3,i4,i5,i6,i7) )
-      return m_map.m_impl_handle[ m_map.m_impl_offset(i0,i1,i2,i3,i4,i5,i6,i7) ];
-    }
+  template <typename I0, typename I1, typename I2, typename I3, typename I4,
+            typename I5, typename I6, typename I7, class... Args>
+  KOKKOS_FORCEINLINE_FUNCTION typename std::enable_if<
+      (Kokkos::Impl::are_integral<I0, I1, I2, I3, I4, I5, I6, I7,
+                                  Args...>::value &&
+       (8 == Rank) && is_default_map),
+      reference_type>::type
+  operator()(const I0& i0, const I1& i1, const I2& i2, const I3& i3,
+             const I4& i4, const I5& i5, const I6& i6, const I7& i7,
+             Args... args) const {
+    KOKKOS_IMPL_VIEW_OPERATOR_VERIFY(
+        (m_track, m_map, i0, i1, i2, i3, i4, i5, i6, i7, args...))
+    return m_map
+        .m_impl_handle[m_map.m_impl_offset(i0, i1, i2, i3, i4, i5, i6, i7)];
+  }
+
+  template <typename I0, typename I1, typename I2, typename I3, typename I4,
+            typename I5, typename I6, typename I7, class... Args>
+  KOKKOS_FORCEINLINE_FUNCTION typename std::enable_if<
+      (Kokkos::Impl::are_integral<I0, I1, I2, I3, I4, I5, I6, I7,
+                                  Args...>::value &&
+       (8 == Rank) && !is_default_map),
+      reference_type>::type
+  operator()(const I0& i0, const I1& i1, const I2& i2, const I3& i3,
+             const I4& i4, const I5& i5, const I6& i6, const I7& i7,
+             Args... args) const {
+    KOKKOS_IMPL_VIEW_OPERATOR_VERIFY(
+        (m_track, m_map, i0, i1, i2, i3, i4, i5, i6, i7, args...))
+    return m_map.reference(i0, i1, i2, i3, i4, i5, i6, i7);
+  }
+
+#else
+  //------------------------------
+  // Rank 0 operator()
 
-  template< typename I0 , typename I1 , typename I2 , typename I3
-          , typename I4 , typename I5 , typename I6 , typename I7>
   KOKKOS_FORCEINLINE_FUNCTION
-  typename std::enable_if<
-    ( Kokkos::Impl::are_integral<I0,I1,I2,I3,I4,I5,I6,I7>::value
-      && ( 8 == Rank )
-      && ! is_default_map
-    ), reference_type >::type
-  operator()( const I0 & i0 , const I1 & i1 , const I2 & i2 , const I3 & i3
-            , const I4 & i4 , const I5 & i5 , const I6 & i6 , const I7 & i7 ) const
-    {
-      KOKKOS_IMPL_VIEW_OPERATOR_VERIFY( (m_track,m_map,i0,i1,i2,i3,i4,i5,i6,i7) )
-      return m_map.reference(i0,i1,i2,i3,i4,i5,i6,i7);
-    }
+  reference_type operator()() const { return m_map.reference(); }
+  //------------------------------
+  // Rank 1 operator()
+
+  template <typename I0>
+  KOKKOS_FORCEINLINE_FUNCTION
+      typename std::enable_if<(Kokkos::Impl::are_integral<I0>::value &&
+                               (1 == Rank) && !is_default_map),
+                              reference_type>::type
+      operator()(const I0& i0) const {
+    KOKKOS_IMPL_VIEW_OPERATOR_VERIFY((m_track, m_map, i0))
+    return m_map.reference(i0);
+  }
+
+  template <typename I0>
+  KOKKOS_FORCEINLINE_FUNCTION
+      typename std::enable_if<(Kokkos::Impl::are_integral<I0>::value &&
+                               (1 == Rank) && is_default_map &&
+                               !is_layout_stride),
+                              reference_type>::type
+      operator()(const I0& i0) const {
+    KOKKOS_IMPL_VIEW_OPERATOR_VERIFY((m_track, m_map, i0))
+    return m_map.m_impl_handle[i0];
+  }
+
+  template <typename I0>
+  KOKKOS_FORCEINLINE_FUNCTION
+      typename std::enable_if<(Kokkos::Impl::are_integral<I0>::value &&
+                               (1 == Rank) && is_default_map &&
+                               is_layout_stride),
+                              reference_type>::type
+      operator()(const I0& i0) const {
+    KOKKOS_IMPL_VIEW_OPERATOR_VERIFY((m_track, m_map, i0))
+    return m_map.m_impl_handle[m_map.m_impl_offset.m_stride.S0 * i0];
+  }
+  //------------------------------
+  // Rank 1 operator[]
+
+  template <typename I0>
+  KOKKOS_FORCEINLINE_FUNCTION
+      typename std::enable_if<(Kokkos::Impl::are_integral<I0>::value &&
+                               (1 == Rank) && !is_default_map),
+                              reference_type>::type
+      operator[](const I0& i0) const {
+    KOKKOS_IMPL_VIEW_OPERATOR_VERIFY((m_track, m_map, i0))
+    return m_map.reference(i0);
+  }
+
+  template <typename I0>
+  KOKKOS_FORCEINLINE_FUNCTION
+      typename std::enable_if<(Kokkos::Impl::are_integral<I0>::value &&
+                               (1 == Rank) && is_default_map &&
+                               !is_layout_stride),
+                              reference_type>::type
+      operator[](const I0& i0) const {
+    KOKKOS_IMPL_VIEW_OPERATOR_VERIFY((m_track, m_map, i0))
+    return m_map.m_impl_handle[i0];
+  }
+
+  template <typename I0>
+  KOKKOS_FORCEINLINE_FUNCTION
+      typename std::enable_if<(Kokkos::Impl::are_integral<I0>::value &&
+                               (1 == Rank) && is_default_map &&
+                               is_layout_stride),
+                              reference_type>::type
+      operator[](const I0& i0) const {
+    KOKKOS_IMPL_VIEW_OPERATOR_VERIFY((m_track, m_map, i0))
+    return m_map.m_impl_handle[m_map.m_impl_offset.m_stride.S0 * i0];
+  }
+
+  //------------------------------
+  // Rank 2
+
+  template <typename I0, typename I1>
+  KOKKOS_FORCEINLINE_FUNCTION
+      typename std::enable_if<(Kokkos::Impl::are_integral<I0, I1>::value &&
+                               (2 == Rank) && !is_default_map),
+                              reference_type>::type
+      operator()(const I0& i0, const I1& i1) const {
+    KOKKOS_IMPL_VIEW_OPERATOR_VERIFY((m_track, m_map, i0, i1))
+    return m_map.reference(i0, i1);
+  }
+
+  template <typename I0, typename I1>
+  KOKKOS_FORCEINLINE_FUNCTION
+      typename std::enable_if<(Kokkos::Impl::are_integral<I0, I1>::value &&
+                               (2 == Rank) && is_default_map &&
+                               is_layout_left && (traits::rank_dynamic == 0)),
+                              reference_type>::type
+      operator()(const I0& i0, const I1& i1) const {
+    KOKKOS_IMPL_VIEW_OPERATOR_VERIFY((m_track, m_map, i0, i1))
+    return m_map.m_impl_handle[i0 + m_map.m_impl_offset.m_dim.N0 * i1];
+  }
+
+  template <typename I0, typename I1>
+  KOKKOS_FORCEINLINE_FUNCTION
+      typename std::enable_if<(Kokkos::Impl::are_integral<I0, I1>::value &&
+                               (2 == Rank) && is_default_map &&
+                               is_layout_left && (traits::rank_dynamic != 0)),
+                              reference_type>::type
+      operator()(const I0& i0, const I1& i1) const {
+    KOKKOS_IMPL_VIEW_OPERATOR_VERIFY((m_track, m_map, i0, i1))
+    return m_map.m_impl_handle[i0 + m_map.m_impl_offset.m_stride * i1];
+  }
+
+  template <typename I0, typename I1>
+  KOKKOS_FORCEINLINE_FUNCTION
+      typename std::enable_if<(Kokkos::Impl::are_integral<I0, I1>::value &&
+                               (2 == Rank) && is_default_map &&
+                               is_layout_right && (traits::rank_dynamic == 0)),
+                              reference_type>::type
+      operator()(const I0& i0, const I1& i1) const {
+    KOKKOS_IMPL_VIEW_OPERATOR_VERIFY((m_track, m_map, i0, i1))
+    return m_map.m_impl_handle[i1 + m_map.m_impl_offset.m_dim.N1 * i0];
+  }
+
+  template <typename I0, typename I1>
+  KOKKOS_FORCEINLINE_FUNCTION
+      typename std::enable_if<(Kokkos::Impl::are_integral<I0, I1>::value &&
+                               (2 == Rank) && is_default_map &&
+                               is_layout_right && (traits::rank_dynamic != 0)),
+                              reference_type>::type
+      operator()(const I0& i0, const I1& i1) const {
+    KOKKOS_IMPL_VIEW_OPERATOR_VERIFY((m_track, m_map, i0, i1))
+    return m_map.m_impl_handle[i1 + m_map.m_impl_offset.m_stride * i0];
+  }
+
+  template <typename I0, typename I1>
+  KOKKOS_FORCEINLINE_FUNCTION
+      typename std::enable_if<(Kokkos::Impl::are_integral<I0, I1>::value &&
+                               (2 == Rank) && is_default_map &&
+                               is_layout_stride),
+                              reference_type>::type
+      operator()(const I0& i0, const I1& i1) const {
+    KOKKOS_IMPL_VIEW_OPERATOR_VERIFY((m_track, m_map, i0, i1))
+    return m_map.m_impl_handle[i0 * m_map.m_impl_offset.m_stride.S0 +
+                               i1 * m_map.m_impl_offset.m_stride.S1];
+  }
+
+  //------------------------------
+  // Rank 3
+
+  template <typename I0, typename I1, typename I2>
+  KOKKOS_FORCEINLINE_FUNCTION
+      typename std::enable_if<(Kokkos::Impl::are_integral<I0, I1, I2>::value &&
+                               (3 == Rank) && is_default_map),
+                              reference_type>::type
+      operator()(const I0& i0, const I1& i1, const I2& i2) const {
+    KOKKOS_IMPL_VIEW_OPERATOR_VERIFY((m_track, m_map, i0, i1, i2))
+    return m_map.m_impl_handle[m_map.m_impl_offset(i0, i1, i2)];
+  }
+
+  template <typename I0, typename I1, typename I2>
+  KOKKOS_FORCEINLINE_FUNCTION
+      typename std::enable_if<(Kokkos::Impl::are_integral<I0, I1, I2>::value &&
+                               (3 == Rank) && !is_default_map),
+                              reference_type>::type
+      operator()(const I0& i0, const I1& i1, const I2& i2) const {
+    KOKKOS_IMPL_VIEW_OPERATOR_VERIFY((m_track, m_map, i0, i1, i2))
+    return m_map.reference(i0, i1, i2);
+  }
+
+  //------------------------------
+  // Rank 4
+
+  template <typename I0, typename I1, typename I2, typename I3>
+  KOKKOS_FORCEINLINE_FUNCTION typename std::enable_if<
+      (Kokkos::Impl::are_integral<I0, I1, I2, I3>::value && (4 == Rank) &&
+       is_default_map),
+      reference_type>::type
+  operator()(const I0& i0, const I1& i1, const I2& i2, const I3& i3) const {
+    KOKKOS_IMPL_VIEW_OPERATOR_VERIFY((m_track, m_map, i0, i1, i2, i3))
+    return m_map.m_impl_handle[m_map.m_impl_offset(i0, i1, i2, i3)];
+  }
+
+  template <typename I0, typename I1, typename I2, typename I3>
+  KOKKOS_FORCEINLINE_FUNCTION typename std::enable_if<
+      (Kokkos::Impl::are_integral<I0, I1, I2, I3>::value && (4 == Rank) &&
+       !is_default_map),
+      reference_type>::type
+  operator()(const I0& i0, const I1& i1, const I2& i2, const I3& i3) const {
+    KOKKOS_IMPL_VIEW_OPERATOR_VERIFY((m_track, m_map, i0, i1, i2, i3))
+    return m_map.reference(i0, i1, i2, i3);
+  }
+
+  //------------------------------
+  // Rank 5
+
+  template <typename I0, typename I1, typename I2, typename I3, typename I4>
+  KOKKOS_FORCEINLINE_FUNCTION typename std::enable_if<
+      (Kokkos::Impl::are_integral<I0, I1, I2, I3, I4>::value && (5 == Rank) &&
+       is_default_map),
+      reference_type>::type
+  operator()(const I0& i0, const I1& i1, const I2& i2, const I3& i3,
+             const I4& i4) const {
+    KOKKOS_IMPL_VIEW_OPERATOR_VERIFY((m_track, m_map, i0, i1, i2, i3, i4))
+    return m_map.m_impl_handle[m_map.m_impl_offset(i0, i1, i2, i3, i4)];
+  }
+
+  template <typename I0, typename I1, typename I2, typename I3, typename I4>
+  KOKKOS_FORCEINLINE_FUNCTION typename std::enable_if<
+      (Kokkos::Impl::are_integral<I0, I1, I2, I3, I4>::value && (5 == Rank) &&
+       !is_default_map),
+      reference_type>::type
+  operator()(const I0& i0, const I1& i1, const I2& i2, const I3& i3,
+             const I4& i4) const {
+    KOKKOS_IMPL_VIEW_OPERATOR_VERIFY((m_track, m_map, i0, i1, i2, i3, i4))
+    return m_map.reference(i0, i1, i2, i3, i4);
+  }
+
+  //------------------------------
+  // Rank 6
+
+  template <typename I0, typename I1, typename I2, typename I3, typename I4,
+            typename I5>
+  KOKKOS_FORCEINLINE_FUNCTION typename std::enable_if<
+      (Kokkos::Impl::are_integral<I0, I1, I2, I3, I4, I5>::value &&
+       (6 == Rank) && is_default_map),
+      reference_type>::type
+  operator()(const I0& i0, const I1& i1, const I2& i2, const I3& i3,
+             const I4& i4, const I5& i5) const {
+    KOKKOS_IMPL_VIEW_OPERATOR_VERIFY((m_track, m_map, i0, i1, i2, i3, i4, i5))
+    return m_map.m_impl_handle[m_map.m_impl_offset(i0, i1, i2, i3, i4, i5)];
+  }
+
+  template <typename I0, typename I1, typename I2, typename I3, typename I4,
+            typename I5>
+  KOKKOS_FORCEINLINE_FUNCTION typename std::enable_if<
+      (Kokkos::Impl::are_integral<I0, I1, I2, I3, I4, I5>::value &&
+       (6 == Rank) && !is_default_map),
+      reference_type>::type
+  operator()(const I0& i0, const I1& i1, const I2& i2, const I3& i3,
+             const I4& i4, const I5& i5) const {
+    KOKKOS_IMPL_VIEW_OPERATOR_VERIFY((m_track, m_map, i0, i1, i2, i3, i4, i5))
+    return m_map.reference(i0, i1, i2, i3, i4, i5);
+  }
+
+  //------------------------------
+  // Rank 7
+
+  template <typename I0, typename I1, typename I2, typename I3, typename I4,
+            typename I5, typename I6>
+  KOKKOS_FORCEINLINE_FUNCTION typename std::enable_if<
+      (Kokkos::Impl::are_integral<I0, I1, I2, I3, I4, I5, I6>::value &&
+       (7 == Rank) && is_default_map),
+      reference_type>::type
+  operator()(const I0& i0, const I1& i1, const I2& i2, const I3& i3,
+             const I4& i4, const I5& i5, const I6& i6) const {
+    KOKKOS_IMPL_VIEW_OPERATOR_VERIFY(
+        (m_track, m_map, i0, i1, i2, i3, i4, i5, i6))
+    return m_map.m_impl_handle[m_map.m_impl_offset(i0, i1, i2, i3, i4, i5, i6)];
+  }
+
+  template <typename I0, typename I1, typename I2, typename I3, typename I4,
+            typename I5, typename I6>
+  KOKKOS_FORCEINLINE_FUNCTION typename std::enable_if<
+      (Kokkos::Impl::are_integral<I0, I1, I2, I3, I4, I5, I6>::value &&
+       (7 == Rank) && !is_default_map),
+      reference_type>::type
+  operator()(const I0& i0, const I1& i1, const I2& i2, const I3& i3,
+             const I4& i4, const I5& i5, const I6& i6) const {
+    KOKKOS_IMPL_VIEW_OPERATOR_VERIFY(
+        (m_track, m_map, i0, i1, i2, i3, i4, i5, i6))
+    return m_map.reference(i0, i1, i2, i3, i4, i5, i6);
+  }
+
+  //------------------------------
+  // Rank 8
+
+  template <typename I0, typename I1, typename I2, typename I3, typename I4,
+            typename I5, typename I6, typename I7>
+  KOKKOS_FORCEINLINE_FUNCTION typename std::enable_if<
+      (Kokkos::Impl::are_integral<I0, I1, I2, I3, I4, I5, I6, I7>::value &&
+       (8 == Rank) && is_default_map),
+      reference_type>::type
+  operator()(const I0& i0, const I1& i1, const I2& i2, const I3& i3,
+             const I4& i4, const I5& i5, const I6& i6, const I7& i7) const {
+    KOKKOS_IMPL_VIEW_OPERATOR_VERIFY(
+        (m_track, m_map, i0, i1, i2, i3, i4, i5, i6, i7))
+    return m_map
+        .m_impl_handle[m_map.m_impl_offset(i0, i1, i2, i3, i4, i5, i6, i7)];
+  }
+
+  template <typename I0, typename I1, typename I2, typename I3, typename I4,
+            typename I5, typename I6, typename I7>
+  KOKKOS_FORCEINLINE_FUNCTION typename std::enable_if<
+      (Kokkos::Impl::are_integral<I0, I1, I2, I3, I4, I5, I6, I7>::value &&
+       (8 == Rank) && !is_default_map),
+      reference_type>::type
+  operator()(const I0& i0, const I1& i1, const I2& i2, const I3& i3,
+             const I4& i4, const I5& i5, const I6& i6, const I7& i7) const {
+    KOKKOS_IMPL_VIEW_OPERATOR_VERIFY(
+        (m_track, m_map, i0, i1, i2, i3, i4, i5, i6, i7))
+    return m_map.reference(i0, i1, i2, i3, i4, i5, i6, i7);
+  }
 
 #endif
-  template< class ... Args >
+  template <class... Args>
   KOKKOS_FORCEINLINE_FUNCTION
-  typename std::enable_if<( Kokkos::Impl::are_integral<Args...>::value
-                            && ( 0 == Rank )
-                          ), reference_type >::type
-  access( Args ... args ) const
-    {
-      KOKKOS_IMPL_VIEW_OPERATOR_VERIFY( (m_track,m_map,args...) )
-      return m_map.reference();
-    }
+      typename std::enable_if<(Kokkos::Impl::are_integral<Args...>::value &&
+                               (0 == Rank)),
+                              reference_type>::type
+      access(Args... args) const {
+    KOKKOS_IMPL_VIEW_OPERATOR_VERIFY((m_track, m_map, args...))
+    return m_map.reference();
+  }
 
-   template< typename I0
-               , class ... Args>
-    KOKKOS_FORCEINLINE_FUNCTION
-    typename std::enable_if<
-      ( Kokkos::Impl::are_integral<I0,Args...>::value
-        && ( 1 == Rank )
-        && ! is_default_map
-      ), reference_type >::type
-    access( const I0 & i0,
-                Args ... args) const
-      {
-        KOKKOS_IMPL_VIEW_OPERATOR_VERIFY( (m_track,m_map,i0,args...) )
-        return m_map.reference(i0);
-      }
+  template <typename I0, class... Args>
+  KOKKOS_FORCEINLINE_FUNCTION
+      typename std::enable_if<(Kokkos::Impl::are_integral<I0, Args...>::value &&
+                               (1 == Rank) && !is_default_map),
+                              reference_type>::type
+      access(const I0& i0, Args... args) const {
+    KOKKOS_IMPL_VIEW_OPERATOR_VERIFY((m_track, m_map, i0, args...))
+    return m_map.reference(i0);
+  }
 
-   template< typename I0
-           , class ... Args >
-   KOKKOS_FORCEINLINE_FUNCTION
-   typename std::enable_if<
-     ( Kokkos::Impl::are_integral<I0,Args...>::value
-       && ( 1 == Rank )
-       && is_default_map
-       && ! is_layout_stride
-     ), reference_type >::type
-   access( const I0 & i0
-             , Args ... args ) const
-     {
-       KOKKOS_IMPL_VIEW_OPERATOR_VERIFY( (m_track,m_map,i0,args...) )
-       return m_map.m_impl_handle[ i0 ];
-     }
+  template <typename I0, class... Args>
+  KOKKOS_FORCEINLINE_FUNCTION
+      typename std::enable_if<(Kokkos::Impl::are_integral<I0, Args...>::value &&
+                               (1 == Rank) && is_default_map &&
+                               !is_layout_stride),
+                              reference_type>::type
+      access(const I0& i0, Args... args) const {
+    KOKKOS_IMPL_VIEW_OPERATOR_VERIFY((m_track, m_map, i0, args...))
+    return m_map.m_impl_handle[i0];
+  }
 
-   template< typename I0
-           , class ... Args >
-   KOKKOS_FORCEINLINE_FUNCTION
-   typename std::enable_if<
-     ( Kokkos::Impl::are_integral<I0,Args...>::value
-       && ( 1 == Rank )
-       && is_default_map
-       && is_layout_stride
-     ), reference_type >::type
-   access( const I0 & i0
-             , Args ... args ) const
-     {
-       KOKKOS_IMPL_VIEW_OPERATOR_VERIFY( (m_track,m_map,i0,args...) )
-       return m_map.m_impl_handle[ m_map.m_impl_offset.m_stride.S0 * i0 ];
-     }
+  template <typename I0, class... Args>
+  KOKKOS_FORCEINLINE_FUNCTION
+      typename std::enable_if<(Kokkos::Impl::are_integral<I0, Args...>::value &&
+                               (1 == Rank) && is_default_map &&
+                               is_layout_stride),
+                              reference_type>::type
+      access(const I0& i0, Args... args) const {
+    KOKKOS_IMPL_VIEW_OPERATOR_VERIFY((m_track, m_map, i0, args...))
+    return m_map.m_impl_handle[m_map.m_impl_offset.m_stride.S0 * i0];
+  }
 
-   template< typename I0 , typename I1
-           , class ... Args >
-   KOKKOS_FORCEINLINE_FUNCTION
-   typename std::enable_if<
-     ( Kokkos::Impl::are_integral<I0,I1,Args...>::value
-       && ( 2 == Rank )
-       && ! is_default_map
-     ), reference_type >::type
-   access( const I0 & i0 , const I1 & i1
-             , Args ... args ) const
-     {
-       KOKKOS_IMPL_VIEW_OPERATOR_VERIFY( (m_track,m_map,i0,i1,args...) )
-       return m_map.reference(i0,i1);
-     }
+  template <typename I0, typename I1, class... Args>
+  KOKKOS_FORCEINLINE_FUNCTION typename std::enable_if<
+      (Kokkos::Impl::are_integral<I0, I1, Args...>::value && (2 == Rank) &&
+       !is_default_map),
+      reference_type>::type
+  access(const I0& i0, const I1& i1, Args... args) const {
+    KOKKOS_IMPL_VIEW_OPERATOR_VERIFY((m_track, m_map, i0, i1, args...))
+    return m_map.reference(i0, i1);
+  }
 
-   template< typename I0 , typename I1
-           , class ... Args >
-   KOKKOS_FORCEINLINE_FUNCTION
-   typename std::enable_if<
-     ( Kokkos::Impl::are_integral<I0,I1,Args...>::value
-       && ( 2 == Rank )
-       && is_default_map
-       && is_layout_left && ( traits::rank_dynamic == 0 )
-     ), reference_type >::type
-   access( const I0 & i0 , const I1 & i1
-             , Args ... args ) const
-     {
-       KOKKOS_IMPL_VIEW_OPERATOR_VERIFY( (m_track,m_map,i0,i1,args...) )
-       return m_map.m_impl_handle[ i0 + m_map.m_impl_offset.m_dim.N0 * i1 ];
-     }
+  template <typename I0, typename I1, class... Args>
+  KOKKOS_FORCEINLINE_FUNCTION typename std::enable_if<
+      (Kokkos::Impl::are_integral<I0, I1, Args...>::value && (2 == Rank) &&
+       is_default_map && is_layout_left && (traits::rank_dynamic == 0)),
+      reference_type>::type
+  access(const I0& i0, const I1& i1, Args... args) const {
+    KOKKOS_IMPL_VIEW_OPERATOR_VERIFY((m_track, m_map, i0, i1, args...))
+    return m_map.m_impl_handle[i0 + m_map.m_impl_offset.m_dim.N0 * i1];
+  }
 
-   template< typename I0 , typename I1
-           , class ... Args >
-   KOKKOS_FORCEINLINE_FUNCTION
-   typename std::enable_if<
-     ( Kokkos::Impl::are_integral<I0,I1,Args...>::value
-       && ( 2 == Rank )
-       && is_default_map
-       && is_layout_left && ( traits::rank_dynamic != 0 )
-     ), reference_type >::type
-   access( const I0 & i0 , const I1 & i1
-             , Args ... args ) const
-     {
-       KOKKOS_IMPL_VIEW_OPERATOR_VERIFY( (m_track,m_map,i0,i1,args...) )
-       return m_map.m_impl_handle[ i0 + m_map.m_impl_offset.m_stride * i1 ];
-     }
+  template <typename I0, typename I1, class... Args>
+  KOKKOS_FORCEINLINE_FUNCTION typename std::enable_if<
+      (Kokkos::Impl::are_integral<I0, I1, Args...>::value && (2 == Rank) &&
+       is_default_map && is_layout_left && (traits::rank_dynamic != 0)),
+      reference_type>::type
+  access(const I0& i0, const I1& i1, Args... args) const {
+    KOKKOS_IMPL_VIEW_OPERATOR_VERIFY((m_track, m_map, i0, i1, args...))
+    return m_map.m_impl_handle[i0 + m_map.m_impl_offset.m_stride * i1];
+  }
 
-   template< typename I0 , typename I1
-           , class ... Args >
-   KOKKOS_FORCEINLINE_FUNCTION
-   typename std::enable_if<
-     ( Kokkos::Impl::are_integral<I0,I1,Args...>::value
-       && ( 2 == Rank )
-       && is_default_map
-       && is_layout_right && ( traits::rank_dynamic == 0 )
-     ), reference_type >::type
-   access( const I0 & i0 , const I1 & i1
-             , Args ... args ) const
-     {
-       KOKKOS_IMPL_VIEW_OPERATOR_VERIFY( (m_track,m_map,i0,i1,args...) )
-       return m_map.m_impl_handle[ i1 + m_map.m_impl_offset.m_dim.N1 * i0 ];
-     }
+  template <typename I0, typename I1, class... Args>
+  KOKKOS_FORCEINLINE_FUNCTION typename std::enable_if<
+      (Kokkos::Impl::are_integral<I0, I1, Args...>::value && (2 == Rank) &&
+       is_default_map && is_layout_right && (traits::rank_dynamic == 0)),
+      reference_type>::type
+  access(const I0& i0, const I1& i1, Args... args) const {
+    KOKKOS_IMPL_VIEW_OPERATOR_VERIFY((m_track, m_map, i0, i1, args...))
+    return m_map.m_impl_handle[i1 + m_map.m_impl_offset.m_dim.N1 * i0];
+  }
 
-   template< typename I0 , typename I1
-           , class ... Args >
-   KOKKOS_FORCEINLINE_FUNCTION
-   typename std::enable_if<
-     ( Kokkos::Impl::are_integral<I0,I1,Args...>::value
-       && ( 2 == Rank )
-       && is_default_map
-       && is_layout_right && ( traits::rank_dynamic != 0 )
-     ), reference_type >::type
-   access( const I0 & i0 , const I1 & i1
-             , Args ... args ) const
-     {
-       KOKKOS_IMPL_VIEW_OPERATOR_VERIFY( (m_track,m_map,i0,i1,args...) )
-       return m_map.m_impl_handle[ i1 + m_map.m_impl_offset.m_stride * i0 ];
-     }
+  template <typename I0, typename I1, class... Args>
+  KOKKOS_FORCEINLINE_FUNCTION typename std::enable_if<
+      (Kokkos::Impl::are_integral<I0, I1, Args...>::value && (2 == Rank) &&
+       is_default_map && is_layout_right && (traits::rank_dynamic != 0)),
+      reference_type>::type
+  access(const I0& i0, const I1& i1, Args... args) const {
+    KOKKOS_IMPL_VIEW_OPERATOR_VERIFY((m_track, m_map, i0, i1, args...))
+    return m_map.m_impl_handle[i1 + m_map.m_impl_offset.m_stride * i0];
+  }
 
-   template< typename I0 , typename I1
-           , class ... Args >
-   KOKKOS_FORCEINLINE_FUNCTION
-   typename std::enable_if<
-     ( Kokkos::Impl::are_integral<I0,I1,Args...>::value
-       && ( 2 == Rank )
-       && is_default_map
-       && is_layout_stride
-     ), reference_type >::type
-   access( const I0 & i0 , const I1 & i1
-             , Args ... args ) const
-     {
-       KOKKOS_IMPL_VIEW_OPERATOR_VERIFY( (m_track,m_map,i0,i1,args...) )
-       return m_map.m_impl_handle[ i0 * m_map.m_impl_offset.m_stride.S0 +
-                              i1 * m_map.m_impl_offset.m_stride.S1 ];
-     }
+  template <typename I0, typename I1, class... Args>
+  KOKKOS_FORCEINLINE_FUNCTION typename std::enable_if<
+      (Kokkos::Impl::are_integral<I0, I1, Args...>::value && (2 == Rank) &&
+       is_default_map && is_layout_stride),
+      reference_type>::type
+  access(const I0& i0, const I1& i1, Args... args) const {
+    KOKKOS_IMPL_VIEW_OPERATOR_VERIFY((m_track, m_map, i0, i1, args...))
+    return m_map.m_impl_handle[i0 * m_map.m_impl_offset.m_stride.S0 +
+                               i1 * m_map.m_impl_offset.m_stride.S1];
+  }
 
-   //------------------------------
-   // Rank 3
+  //------------------------------
+  // Rank 3
 
-   template< typename I0 , typename I1 , typename I2
-           , class ... Args >
-   KOKKOS_FORCEINLINE_FUNCTION
-   typename std::enable_if<
-     ( Kokkos::Impl::are_integral<I0,I1,I2,Args...>::value
-       && ( 3 == Rank )
-       && is_default_map
-     ), reference_type >::type
-   access( const I0 & i0 , const I1 & i1 , const I2 & i2
-             , Args ... args ) const
-     {
-       KOKKOS_IMPL_VIEW_OPERATOR_VERIFY( (m_track,m_map,i0,i1,i2,args...) )
-       return m_map.m_impl_handle[ m_map.m_impl_offset(i0,i1,i2) ];
-     }
+  template <typename I0, typename I1, typename I2, class... Args>
+  KOKKOS_FORCEINLINE_FUNCTION typename std::enable_if<
+      (Kokkos::Impl::are_integral<I0, I1, I2, Args...>::value && (3 == Rank) &&
+       is_default_map),
+      reference_type>::type
+  access(const I0& i0, const I1& i1, const I2& i2, Args... args) const {
+    KOKKOS_IMPL_VIEW_OPERATOR_VERIFY((m_track, m_map, i0, i1, i2, args...))
+    return m_map.m_impl_handle[m_map.m_impl_offset(i0, i1, i2)];
+  }
 
-   template< typename I0 , typename I1 , typename I2
-           , class ... Args >
-   KOKKOS_FORCEINLINE_FUNCTION
-   typename std::enable_if<
-     ( Kokkos::Impl::are_integral<I0,I1,I2,Args...>::value
-       && ( 3 == Rank )
-       && ! is_default_map
-     ), reference_type >::type
-   access( const I0 & i0 , const I1 & i1 , const I2 & i2
-             , Args ... args ) const
-     {
-       KOKKOS_IMPL_VIEW_OPERATOR_VERIFY( (m_track,m_map,i0,i1,i2,args...) )
-       return m_map.reference(i0,i1,i2);
-     }
+  template <typename I0, typename I1, typename I2, class... Args>
+  KOKKOS_FORCEINLINE_FUNCTION typename std::enable_if<
+      (Kokkos::Impl::are_integral<I0, I1, I2, Args...>::value && (3 == Rank) &&
+       !is_default_map),
+      reference_type>::type
+  access(const I0& i0, const I1& i1, const I2& i2, Args... args) const {
+    KOKKOS_IMPL_VIEW_OPERATOR_VERIFY((m_track, m_map, i0, i1, i2, args...))
+    return m_map.reference(i0, i1, i2);
+  }
 
-   //------------------------------
-   // Rank 4
+  //------------------------------
+  // Rank 4
 
-   template< typename I0 , typename I1 , typename I2 , typename I3
-           , class ... Args >
-   KOKKOS_FORCEINLINE_FUNCTION
-   typename std::enable_if<
-     ( Kokkos::Impl::are_integral<I0,I1,I2,I3,Args...>::value
-       && ( 4 == Rank )
-       && is_default_map
-     ), reference_type >::type
-   access( const I0 & i0 , const I1 & i1 , const I2 & i2 , const I3 & i3
-             , Args ... args ) const
-     {
-       KOKKOS_IMPL_VIEW_OPERATOR_VERIFY( (m_track,m_map,i0,i1,i2,i3,args...) )
-       return m_map.m_impl_handle[ m_map.m_impl_offset(i0,i1,i2,i3) ];
-     }
+  template <typename I0, typename I1, typename I2, typename I3, class... Args>
+  KOKKOS_FORCEINLINE_FUNCTION typename std::enable_if<
+      (Kokkos::Impl::are_integral<I0, I1, I2, I3, Args...>::value &&
+       (4 == Rank) && is_default_map),
+      reference_type>::type
+  access(const I0& i0, const I1& i1, const I2& i2, const I3& i3,
+         Args... args) const {
+    KOKKOS_IMPL_VIEW_OPERATOR_VERIFY((m_track, m_map, i0, i1, i2, i3, args...))
+    return m_map.m_impl_handle[m_map.m_impl_offset(i0, i1, i2, i3)];
+  }
 
-   template< typename I0 , typename I1 , typename I2 , typename I3
-           , class ... Args >
-   KOKKOS_FORCEINLINE_FUNCTION
-   typename std::enable_if<
-     ( Kokkos::Impl::are_integral<I0,I1,I2,I3,Args...>::value
-       && ( 4 == Rank )
-       && ! is_default_map
-     ), reference_type >::type
-   access( const I0 & i0 , const I1 & i1 , const I2 & i2 , const I3 & i3
-             , Args ... args ) const
-     {
-       KOKKOS_IMPL_VIEW_OPERATOR_VERIFY( (m_track,m_map,i0,i1,i2,i3,args...) )
-       return m_map.reference(i0,i1,i2,i3);
-     }
+  template <typename I0, typename I1, typename I2, typename I3, class... Args>
+  KOKKOS_FORCEINLINE_FUNCTION typename std::enable_if<
+      (Kokkos::Impl::are_integral<I0, I1, I2, I3, Args...>::value &&
+       (4 == Rank) && !is_default_map),
+      reference_type>::type
+  access(const I0& i0, const I1& i1, const I2& i2, const I3& i3,
+         Args... args) const {
+    KOKKOS_IMPL_VIEW_OPERATOR_VERIFY((m_track, m_map, i0, i1, i2, i3, args...))
+    return m_map.reference(i0, i1, i2, i3);
+  }
 
-   //------------------------------
-   // Rank 5
+  //------------------------------
+  // Rank 5
 
-   template< typename I0 , typename I1 , typename I2 , typename I3
-           , typename I4
-           , class ... Args >
-   KOKKOS_FORCEINLINE_FUNCTION
-   typename std::enable_if<
-     ( Kokkos::Impl::are_integral<I0,I1,I2,I3,I4,Args...>::value
-       && ( 5 == Rank )
-       && is_default_map
-     ), reference_type >::type
-   access( const I0 & i0 , const I1 & i1 , const I2 & i2 , const I3 & i3
-             , const I4 & i4
-             , Args ... args ) const
-     {
-       KOKKOS_IMPL_VIEW_OPERATOR_VERIFY( (m_track,m_map,i0,i1,i2,i3,i4,args...) )
-       return m_map.m_impl_handle[ m_map.m_impl_offset(i0,i1,i2,i3,i4) ];
-     }
+  template <typename I0, typename I1, typename I2, typename I3, typename I4,
+            class... Args>
+  KOKKOS_FORCEINLINE_FUNCTION typename std::enable_if<
+      (Kokkos::Impl::are_integral<I0, I1, I2, I3, I4, Args...>::value &&
+       (5 == Rank) && is_default_map),
+      reference_type>::type
+  access(const I0& i0, const I1& i1, const I2& i2, const I3& i3, const I4& i4,
+         Args... args) const {
+    KOKKOS_IMPL_VIEW_OPERATOR_VERIFY(
+        (m_track, m_map, i0, i1, i2, i3, i4, args...))
+    return m_map.m_impl_handle[m_map.m_impl_offset(i0, i1, i2, i3, i4)];
+  }
 
-   template< typename I0 , typename I1 , typename I2 , typename I3
-           , typename I4
-           , class ... Args >
-   KOKKOS_FORCEINLINE_FUNCTION
-   typename std::enable_if<
-     ( Kokkos::Impl::are_integral<I0,I1,I2,I3,I4,Args...>::value
-       && ( 5 == Rank )
-       && ! is_default_map
-     ), reference_type >::type
-   access( const I0 & i0 , const I1 & i1 , const I2 & i2 , const I3 & i3
-             , const I4 & i4
-             , Args ... args ) const
-     {
-       KOKKOS_IMPL_VIEW_OPERATOR_VERIFY( (m_track,m_map,i0,i1,i2,i3,i4,args...) )
-       return m_map.reference(i0,i1,i2,i3,i4);
-     }
+  template <typename I0, typename I1, typename I2, typename I3, typename I4,
+            class... Args>
+  KOKKOS_FORCEINLINE_FUNCTION typename std::enable_if<
+      (Kokkos::Impl::are_integral<I0, I1, I2, I3, I4, Args...>::value &&
+       (5 == Rank) && !is_default_map),
+      reference_type>::type
+  access(const I0& i0, const I1& i1, const I2& i2, const I3& i3, const I4& i4,
+         Args... args) const {
+    KOKKOS_IMPL_VIEW_OPERATOR_VERIFY(
+        (m_track, m_map, i0, i1, i2, i3, i4, args...))
+    return m_map.reference(i0, i1, i2, i3, i4);
+  }
 
-   //------------------------------
-   // Rank 6
+  //------------------------------
+  // Rank 6
 
-   template< typename I0 , typename I1 , typename I2 , typename I3
-           , typename I4 , typename I5
-           , class ... Args >
-   KOKKOS_FORCEINLINE_FUNCTION
-   typename std::enable_if<
-     ( Kokkos::Impl::are_integral<I0,I1,I2,I3,I4,I5,Args...>::value
-       && ( 6 == Rank )
-       && is_default_map
-     ), reference_type >::type
-   access( const I0 & i0 , const I1 & i1 , const I2 & i2 , const I3 & i3
-             , const I4 & i4 , const I5 & i5
-             , Args ... args ) const
-     {
-       KOKKOS_IMPL_VIEW_OPERATOR_VERIFY( (m_track,m_map,i0,i1,i2,i3,i4,i5,args...) )
-       return m_map.m_impl_handle[ m_map.m_impl_offset(i0,i1,i2,i3,i4,i5) ];
-     }
+  template <typename I0, typename I1, typename I2, typename I3, typename I4,
+            typename I5, class... Args>
+  KOKKOS_FORCEINLINE_FUNCTION typename std::enable_if<
+      (Kokkos::Impl::are_integral<I0, I1, I2, I3, I4, I5, Args...>::value &&
+       (6 == Rank) && is_default_map),
+      reference_type>::type
+  access(const I0& i0, const I1& i1, const I2& i2, const I3& i3, const I4& i4,
+         const I5& i5, Args... args) const {
+    KOKKOS_IMPL_VIEW_OPERATOR_VERIFY(
+        (m_track, m_map, i0, i1, i2, i3, i4, i5, args...))
+    return m_map.m_impl_handle[m_map.m_impl_offset(i0, i1, i2, i3, i4, i5)];
+  }
 
-   template< typename I0 , typename I1 , typename I2 , typename I3
-           , typename I4 , typename I5
-           , class ... Args >
-   KOKKOS_FORCEINLINE_FUNCTION
-   typename std::enable_if<
-     ( Kokkos::Impl::are_integral<I0,I1,I2,I3,I4,I5,Args...>::value
-       && ( 6 == Rank )
-       && ! is_default_map
-     ), reference_type >::type
-   access( const I0 & i0 , const I1 & i1 , const I2 & i2 , const I3 & i3
-             , const I4 & i4 , const I5 & i5
-             , Args ... args ) const
-     {
-       KOKKOS_IMPL_VIEW_OPERATOR_VERIFY( (m_track,m_map,i0,i1,i2,i3,i4,i5,args...) )
-       return m_map.reference(i0,i1,i2,i3,i4,i5);
-     }
+  template <typename I0, typename I1, typename I2, typename I3, typename I4,
+            typename I5, class... Args>
+  KOKKOS_FORCEINLINE_FUNCTION typename std::enable_if<
+      (Kokkos::Impl::are_integral<I0, I1, I2, I3, I4, I5, Args...>::value &&
+       (6 == Rank) && !is_default_map),
+      reference_type>::type
+  access(const I0& i0, const I1& i1, const I2& i2, const I3& i3, const I4& i4,
+         const I5& i5, Args... args) const {
+    KOKKOS_IMPL_VIEW_OPERATOR_VERIFY(
+        (m_track, m_map, i0, i1, i2, i3, i4, i5, args...))
+    return m_map.reference(i0, i1, i2, i3, i4, i5);
+  }
 
-   //------------------------------
-   // Rank 7
+  //------------------------------
+  // Rank 7
 
-   template< typename I0 , typename I1 , typename I2 , typename I3
-           , typename I4 , typename I5 , typename I6
-           , class ... Args >
-   KOKKOS_FORCEINLINE_FUNCTION
-   typename std::enable_if<
-     ( Kokkos::Impl::are_integral<I0,I1,I2,I3,I4,I5,I6,Args...>::value
-       && ( 7 == Rank )
-       && is_default_map
-     ), reference_type >::type
-   access( const I0 & i0 , const I1 & i1 , const I2 & i2 , const I3 & i3
-             , const I4 & i4 , const I5 & i5 , const I6 & i6
-             , Args ... args ) const
-     {
-       KOKKOS_IMPL_VIEW_OPERATOR_VERIFY( (m_track,m_map,i0,i1,i2,i3,i4,i5,i6,args...) )
-       return m_map.m_impl_handle[ m_map.m_impl_offset(i0,i1,i2,i3,i4,i5,i6) ];
-     }
+  template <typename I0, typename I1, typename I2, typename I3, typename I4,
+            typename I5, typename I6, class... Args>
+  KOKKOS_FORCEINLINE_FUNCTION typename std::enable_if<
+      (Kokkos::Impl::are_integral<I0, I1, I2, I3, I4, I5, I6, Args...>::value &&
+       (7 == Rank) && is_default_map),
+      reference_type>::type
+  access(const I0& i0, const I1& i1, const I2& i2, const I3& i3, const I4& i4,
+         const I5& i5, const I6& i6, Args... args) const {
+    KOKKOS_IMPL_VIEW_OPERATOR_VERIFY(
+        (m_track, m_map, i0, i1, i2, i3, i4, i5, i6, args...))
+    return m_map.m_impl_handle[m_map.m_impl_offset(i0, i1, i2, i3, i4, i5, i6)];
+  }
 
-   template< typename I0 , typename I1 , typename I2 , typename I3
-           , typename I4 , typename I5 , typename I6
-           , class ... Args >
-   KOKKOS_FORCEINLINE_FUNCTION
-   typename std::enable_if<
-     ( Kokkos::Impl::are_integral<I0,I1,I2,I3,I4,I5,I6,Args...>::value
-       && ( 7 == Rank )
-       && ! is_default_map
-     ), reference_type >::type
-   access( const I0 & i0 , const I1 & i1 , const I2 & i2 , const I3 & i3
-             , const I4 & i4 , const I5 & i5 , const I6 & i6
-             , Args ... args ) const
-     {
-       KOKKOS_IMPL_VIEW_OPERATOR_VERIFY( (m_track,m_map,i0,i1,i2,i3,i4,i5,i6,args...) )
-       return m_map.reference(i0,i1,i2,i3,i4,i5,i6);
-     }
+  template <typename I0, typename I1, typename I2, typename I3, typename I4,
+            typename I5, typename I6, class... Args>
+  KOKKOS_FORCEINLINE_FUNCTION typename std::enable_if<
+      (Kokkos::Impl::are_integral<I0, I1, I2, I3, I4, I5, I6, Args...>::value &&
+       (7 == Rank) && !is_default_map),
+      reference_type>::type
+  access(const I0& i0, const I1& i1, const I2& i2, const I3& i3, const I4& i4,
+         const I5& i5, const I6& i6, Args... args) const {
+    KOKKOS_IMPL_VIEW_OPERATOR_VERIFY(
+        (m_track, m_map, i0, i1, i2, i3, i4, i5, i6, args...))
+    return m_map.reference(i0, i1, i2, i3, i4, i5, i6);
+  }
 
-   //------------------------------
-   // Rank 8
+  //------------------------------
+  // Rank 8
 
-   template< typename I0 , typename I1 , typename I2 , typename I3
-           , typename I4 , typename I5 , typename I6 , typename I7
-           , class ... Args >
-   KOKKOS_FORCEINLINE_FUNCTION
-   typename std::enable_if<
-     ( Kokkos::Impl::are_integral<I0,I1,I2,I3,I4,I5,I6,I7,Args...>::value
-       && ( 8 == Rank )
-       && is_default_map
-     ), reference_type >::type
-   access( const I0 & i0 , const I1 & i1 , const I2 & i2 , const I3 & i3
-             , const I4 & i4 , const I5 & i5 , const I6 & i6 , const I7 & i7
-             , Args ... args ) const
-     {
-       KOKKOS_IMPL_VIEW_OPERATOR_VERIFY( (m_track,m_map,i0,i1,i2,i3,i4,i5,i6,i7,args...) )
-       return m_map.m_impl_handle[ m_map.m_impl_offset(i0,i1,i2,i3,i4,i5,i6,i7) ];
-     }
-
-   template< typename I0 , typename I1 , typename I2 , typename I3
-           , typename I4 , typename I5 , typename I6 , typename I7
-           , class ... Args >
-   KOKKOS_FORCEINLINE_FUNCTION
-   typename std::enable_if<
-     ( Kokkos::Impl::are_integral<I0,I1,I2,I3,I4,I5,I6,I7,Args...>::value
-       && ( 8 == Rank )
-       && ! is_default_map
-     ), reference_type >::type
-   access( const I0 & i0 , const I1 & i1 , const I2 & i2 , const I3 & i3
-             , const I4 & i4 , const I5 & i5 , const I6 & i6 , const I7 & i7
-             , Args ... args ) const
-     {
-       KOKKOS_IMPL_VIEW_OPERATOR_VERIFY( (m_track,m_map,i0,i1,i2,i3,i4,i5,i6,i7,args...) )
-       return m_map.reference(i0,i1,i2,i3,i4,i5,i6,i7);
-     }
+  template <typename I0, typename I1, typename I2, typename I3, typename I4,
+            typename I5, typename I6, typename I7, class... Args>
+  KOKKOS_FORCEINLINE_FUNCTION typename std::enable_if<
+      (Kokkos::Impl::are_integral<I0, I1, I2, I3, I4, I5, I6, I7,
+                                  Args...>::value &&
+       (8 == Rank) && is_default_map),
+      reference_type>::type
+  access(const I0& i0, const I1& i1, const I2& i2, const I3& i3, const I4& i4,
+         const I5& i5, const I6& i6, const I7& i7, Args... args) const {
+    KOKKOS_IMPL_VIEW_OPERATOR_VERIFY(
+        (m_track, m_map, i0, i1, i2, i3, i4, i5, i6, i7, args...))
+    return m_map
+        .m_impl_handle[m_map.m_impl_offset(i0, i1, i2, i3, i4, i5, i6, i7)];
+  }
 
+  template <typename I0, typename I1, typename I2, typename I3, typename I4,
+            typename I5, typename I6, typename I7, class... Args>
+  KOKKOS_FORCEINLINE_FUNCTION typename std::enable_if<
+      (Kokkos::Impl::are_integral<I0, I1, I2, I3, I4, I5, I6, I7,
+                                  Args...>::value &&
+       (8 == Rank) && !is_default_map),
+      reference_type>::type
+  access(const I0& i0, const I1& i1, const I2& i2, const I3& i3, const I4& i4,
+         const I5& i5, const I6& i6, const I7& i7, Args... args) const {
+    KOKKOS_IMPL_VIEW_OPERATOR_VERIFY(
+        (m_track, m_map, i0, i1, i2, i3, i4, i5, i6, i7, args...))
+    return m_map.reference(i0, i1, i2, i3, i4, i5, i6, i7);
+  }
 
 #undef KOKKOS_IMPL_VIEW_OPERATOR_VERIFY
 
@@ -1975,546 +1729,522 @@ public:
   View() : m_track(), m_map() {}
 
   KOKKOS_INLINE_FUNCTION
-  View( const View & rhs ) : m_track( rhs.m_track, traits::is_managed ), m_map( rhs.m_map ) {}
+  View(const View& rhs)
+      : m_track(rhs.m_track, traits::is_managed), m_map(rhs.m_map) {}
 
   KOKKOS_INLINE_FUNCTION
-  View( View && rhs ) : m_track( std::move(rhs.m_track) ), m_map( std::move(rhs.m_map) ) {}
+  View(View&& rhs)
+      : m_track(std::move(rhs.m_track)), m_map(std::move(rhs.m_map)) {}
 
   KOKKOS_INLINE_FUNCTION
-  View & operator = ( const View & rhs ) { m_track = rhs.m_track ; m_map = rhs.m_map ; return *this ; }
+  View& operator=(const View& rhs) {
+    m_track = rhs.m_track;
+    m_map   = rhs.m_map;
+    return *this;
+  }
 
   KOKKOS_INLINE_FUNCTION
-  View & operator = ( View && rhs ) { m_track = std::move(rhs.m_track) ; m_map = std::move(rhs.m_map) ; return *this ; }
-
-
+  View& operator=(View&& rhs) {
+    m_track = std::move(rhs.m_track);
+    m_map   = std::move(rhs.m_map);
+    return *this;
+  }
 
   //----------------------------------------
   // Compatible view copy constructor and assignment
   // may assign unmanaged from managed.
 
-  template< class RT , class ... RP >
-  KOKKOS_INLINE_FUNCTION
-  View( const View<RT,RP...> & rhs,
-        typename std::enable_if<Kokkos::Impl::ViewMapping<
-        traits , typename View<RT,RP...>::traits , typename traits::specialize >::is_assignable_data_type>::type* = 0
-     )
-    : m_track( rhs.m_track , traits::is_managed )
-    , m_map()
-    {
-      typedef typename View<RT,RP...>::traits  SrcTraits ;
-      typedef Kokkos::Impl::ViewMapping< traits , SrcTraits , typename traits::specialize >  Mapping ;
-      static_assert( Mapping::is_assignable , "Incompatible View copy construction" );
-      Mapping::assign( m_map , rhs.m_map , rhs.m_track );
-    }
+  template <class RT, class... RP>
+  KOKKOS_INLINE_FUNCTION View(
+      const View<RT, RP...>& rhs,
+      typename std::enable_if<Kokkos::Impl::ViewMapping<
+          traits, typename View<RT, RP...>::traits,
+          typename traits::specialize>::is_assignable_data_type>::type* = 0)
+      : m_track(rhs.m_track, traits::is_managed), m_map() {
+    typedef typename View<RT, RP...>::traits SrcTraits;
+    typedef Kokkos::Impl::ViewMapping<traits, SrcTraits,
+                                      typename traits::specialize>
+        Mapping;
+    static_assert(Mapping::is_assignable,
+                  "Incompatible View copy construction");
+    Mapping::assign(m_map, rhs.m_map, rhs.m_track);
+  }
 
-  template< class RT , class ... RP >
-  KOKKOS_INLINE_FUNCTION
-  typename std::enable_if<Kokkos::Impl::ViewMapping<
-     traits , typename View<RT,RP...>::traits , typename traits::specialize >::is_assignable_data_type,
-     View>::type & operator = ( const View<RT,RP...> & rhs )
-    {
-      typedef typename View<RT,RP...>::traits  SrcTraits ;
-      typedef Kokkos::Impl::ViewMapping< traits , SrcTraits , typename traits::specialize >  Mapping ;
-      static_assert( Mapping::is_assignable , "Incompatible View copy assignment" );
-      Mapping::assign( m_map , rhs.m_map , rhs.m_track );
-      m_track.assign( rhs.m_track , traits::is_managed );
-      return *this ;
-    }
+  template <class RT, class... RP>
+  KOKKOS_INLINE_FUNCTION typename std::enable_if<
+      Kokkos::Impl::ViewMapping<
+          traits, typename View<RT, RP...>::traits,
+          typename traits::specialize>::is_assignable_data_type,
+      View>::type&
+  operator=(const View<RT, RP...>& rhs) {
+    typedef typename View<RT, RP...>::traits SrcTraits;
+    typedef Kokkos::Impl::ViewMapping<traits, SrcTraits,
+                                      typename traits::specialize>
+        Mapping;
+    static_assert(Mapping::is_assignable, "Incompatible View copy assignment");
+    Mapping::assign(m_map, rhs.m_map, rhs.m_track);
+    m_track.assign(rhs.m_track, traits::is_managed);
+    return *this;
+  }
 
   //----------------------------------------
   // Compatible subview constructor
   // may assign unmanaged from managed.
 
-  template< class RT , class ... RP , class Arg0 , class ... Args >
-  KOKKOS_INLINE_FUNCTION
-  View( const View< RT , RP... > & src_view
-      , const Arg0 arg0 , Args ... args )
-    : m_track( src_view.m_track , traits::is_managed )
-    , m_map()
-    {
-      typedef View< RT , RP... > SrcType ;
+  template <class RT, class... RP, class Arg0, class... Args>
+  KOKKOS_INLINE_FUNCTION View(const View<RT, RP...>& src_view, const Arg0 arg0,
+                              Args... args)
+      : m_track(src_view.m_track, traits::is_managed), m_map() {
+    typedef View<RT, RP...> SrcType;
 
-      typedef Kokkos::Impl::ViewMapping
-        < void /* deduce destination view type from source view traits */
-        , typename SrcType::traits
-        , Arg0 , Args... > Mapping ;
+    typedef Kokkos::Impl::ViewMapping<void /* deduce destination view type from
+                                              source view traits */
+                                      ,
+                                      typename SrcType::traits, Arg0, Args...>
+        Mapping;
 
-      typedef typename Mapping::type DstType ;
+    typedef typename Mapping::type DstType;
 
-      static_assert( Kokkos::Impl::ViewMapping< traits , typename DstType::traits , typename traits::specialize >::is_assignable
-        , "Subview construction requires compatible view and subview arguments" );
+    static_assert(
+        Kokkos::Impl::ViewMapping<traits, typename DstType::traits,
+                                  typename traits::specialize>::is_assignable,
+        "Subview construction requires compatible view and subview arguments");
 
-      Mapping::assign( m_map, src_view.m_map, arg0 , args... );
-    }
+    Mapping::assign(m_map, src_view.m_map, arg0, args...);
+  }
 
   //----------------------------------------
   // Allocation tracking properties
 
   KOKKOS_INLINE_FUNCTION
-  int use_count() const
-    { return m_track.use_count(); }
+  int use_count() const { return m_track.use_count(); }
 
-  inline
-  const std::string label() const
-    { return m_track.template get_label< typename traits::memory_space >(); }
+  inline const std::string label() const {
+    return m_track.template get_label<typename traits::memory_space>();
+  }
 
   //----------------------------------------
   // Allocation according to allocation properties and array layout
 
-  template< class ... P >
-  explicit inline
-  View( const Impl::ViewCtorProp< P ... > & arg_prop
-      , typename std::enable_if< ! Impl::ViewCtorProp< P... >::has_pointer
-                               , typename traits::array_layout
-                               >::type const & arg_layout
-      )
-    : m_track()
-    , m_map()
-    {
-      // Append layout and spaces if not input
-      typedef Impl::ViewCtorProp< P ... > alloc_prop_input ;
+  template <class... P>
+  explicit inline View(
+      const Impl::ViewCtorProp<P...>& arg_prop,
+      typename std::enable_if<!Impl::ViewCtorProp<P...>::has_pointer,
+                              typename traits::array_layout>::type const&
+          arg_layout)
+      : m_track(), m_map() {
+    // Append layout and spaces if not input
+    typedef Impl::ViewCtorProp<P...> alloc_prop_input;
 
-      // use 'std::integral_constant<unsigned,I>' for non-types
-      // to avoid duplicate class error.
-      typedef Impl::ViewCtorProp
-        < P ...
-        , typename std::conditional
-            < alloc_prop_input::has_label
-            , std::integral_constant<unsigned,0>
-            , typename std::string
-            >::type
-        , typename std::conditional
-            < alloc_prop_input::has_memory_space
-            , std::integral_constant<unsigned,1>
-            , typename traits::device_type::memory_space
-            >::type
-        , typename std::conditional
-            < alloc_prop_input::has_execution_space
-            , std::integral_constant<unsigned,2>
-            , typename traits::device_type::execution_space
-            >::type
-        > alloc_prop ;
+    // use 'std::integral_constant<unsigned,I>' for non-types
+    // to avoid duplicate class error.
+    typedef Impl::ViewCtorProp<
+        P...,
+        typename std::conditional<alloc_prop_input::has_label,
+                                  std::integral_constant<unsigned, 0>,
+                                  typename std::string>::type,
+        typename std::conditional<
+            alloc_prop_input::has_memory_space,
+            std::integral_constant<unsigned, 1>,
+            typename traits::device_type::memory_space>::type,
+        typename std::conditional<
+            alloc_prop_input::has_execution_space,
+            std::integral_constant<unsigned, 2>,
+            typename traits::device_type::execution_space>::type>
+        alloc_prop;
 
-      static_assert( traits::is_managed
-                   , "View allocation constructor requires managed memory" );
+    static_assert(traits::is_managed,
+                  "View allocation constructor requires managed memory");
 
-      if ( alloc_prop::initialize &&
+    if (alloc_prop::initialize &&
 #ifdef KOKKOS_ENABLE_DEPRECATED_CODE
-           ! alloc_prop::execution_space::is_initialized()
+        !alloc_prop::execution_space::is_initialized()
 #else
-           ! alloc_prop::execution_space::impl_is_initialized()
+        !alloc_prop::execution_space::impl_is_initialized()
 #endif
-           ) {
-        // If initializing view data then
-        // the execution space must be initialized.
-        Kokkos::Impl::throw_runtime_exception("Constructing View and initializing data with uninitialized execution space");
-      }
-
-      // Copy the input allocation properties with possibly defaulted properties
-      alloc_prop prop_copy( arg_prop );
-
-//------------------------------------------------------------
-#if defined( KOKKOS_ENABLE_CUDA )
-      // If allocating in CudaUVMSpace must fence before and after
-      // the allocation to protect against possible concurrent access
-      // on the CPU and the GPU.
-      // Fence using the trait's executon space (which will be Kokkos::Cuda)
-      // to avoid incomplete type errors from usng Kokkos::Cuda directly.
-      if ( std::is_same< Kokkos::CudaUVMSpace , typename traits::device_type::memory_space >::value ) {
-        typename traits::device_type::memory_space::execution_space().fence();
-      }
-#endif
-//------------------------------------------------------------
-
-      Kokkos::Impl::SharedAllocationRecord<> *
-        record = m_map.allocate_shared( prop_copy , arg_layout );
-
-//------------------------------------------------------------
-#if defined( KOKKOS_ENABLE_CUDA )
-      if ( std::is_same< Kokkos::CudaUVMSpace , typename traits::device_type::memory_space >::value ) {
-        typename traits::device_type::memory_space::execution_space().fence();
-      }
-#endif
-//------------------------------------------------------------
-
-      // Setup and initialization complete, start tracking
-      m_track.assign_allocated_record_to_uninitialized( record );
+    ) {
+      // If initializing view data then
+      // the execution space must be initialized.
+      Kokkos::Impl::throw_runtime_exception(
+          "Constructing View and initializing data with uninitialized "
+          "execution space");
     }
 
+    // Copy the input allocation properties with possibly defaulted properties
+    alloc_prop prop_copy(arg_prop);
+
+//------------------------------------------------------------
+#if defined(KOKKOS_ENABLE_CUDA)
+    // If allocating in CudaUVMSpace must fence before and after
+    // the allocation to protect against possible concurrent access
+    // on the CPU and the GPU.
+    // Fence using the trait's executon space (which will be Kokkos::Cuda)
+    // to avoid incomplete type errors from usng Kokkos::Cuda directly.
+    if (std::is_same<Kokkos::CudaUVMSpace,
+                     typename traits::device_type::memory_space>::value) {
+      typename traits::device_type::memory_space::execution_space().fence();
+    }
+#endif
+    //------------------------------------------------------------
+
+    Kokkos::Impl::SharedAllocationRecord<>* record =
+        m_map.allocate_shared(prop_copy, arg_layout);
+
+//------------------------------------------------------------
+#if defined(KOKKOS_ENABLE_CUDA)
+    if (std::is_same<Kokkos::CudaUVMSpace,
+                     typename traits::device_type::memory_space>::value) {
+      typename traits::device_type::memory_space::execution_space().fence();
+    }
+#endif
+    //------------------------------------------------------------
+
+    // Setup and initialization complete, start tracking
+    m_track.assign_allocated_record_to_uninitialized(record);
+  }
+
   KOKKOS_INLINE_FUNCTION
-  void assign_data( pointer_type arg_data )
-    {
-      m_track.clear();
-      m_map.assign_data( arg_data );
-    }
+  void assign_data(pointer_type arg_data) {
+    m_track.clear();
+    m_map.assign_data(arg_data);
+  }
 
   // Wrap memory according to properties and array layout
-  template< class ... P >
-  explicit KOKKOS_INLINE_FUNCTION
-  View( const Impl::ViewCtorProp< P ... > & arg_prop
-      , typename std::enable_if< Impl::ViewCtorProp< P... >::has_pointer
-                               , typename traits::array_layout
-                               >::type const & arg_layout
-      )
-    : m_track() // No memory tracking
-    , m_map( arg_prop , arg_layout )
-    {
-      static_assert(
-        std::is_same< pointer_type
-                    , typename Impl::ViewCtorProp< P... >::pointer_type
-                    >::value ,
-        "Constructing View to wrap user memory must supply matching pointer type" );
-    }
+  template <class... P>
+  explicit KOKKOS_INLINE_FUNCTION View(
+      const Impl::ViewCtorProp<P...>& arg_prop,
+      typename std::enable_if<Impl::ViewCtorProp<P...>::has_pointer,
+                              typename traits::array_layout>::type const&
+          arg_layout)
+      : m_track()  // No memory tracking
+        ,
+        m_map(arg_prop, arg_layout) {
+    static_assert(
+        std::is_same<pointer_type,
+                     typename Impl::ViewCtorProp<P...>::pointer_type>::value,
+        "Constructing View to wrap user memory must supply matching pointer "
+        "type");
+  }
 
   // Simple dimension-only layout
-  template< class ... P >
-  explicit inline
-  View( const Impl::ViewCtorProp< P ... > & arg_prop
-      , typename std::enable_if< ! Impl::ViewCtorProp< P... >::has_pointer
-                               , size_t
-                               >::type const arg_N0 = KOKKOS_IMPL_CTOR_DEFAULT_ARG
-      , const size_t arg_N1 = KOKKOS_IMPL_CTOR_DEFAULT_ARG
-      , const size_t arg_N2 = KOKKOS_IMPL_CTOR_DEFAULT_ARG
-      , const size_t arg_N3 = KOKKOS_IMPL_CTOR_DEFAULT_ARG
-      , const size_t arg_N4 = KOKKOS_IMPL_CTOR_DEFAULT_ARG
-      , const size_t arg_N5 = KOKKOS_IMPL_CTOR_DEFAULT_ARG
-      , const size_t arg_N6 = KOKKOS_IMPL_CTOR_DEFAULT_ARG
-      , const size_t arg_N7 = KOKKOS_IMPL_CTOR_DEFAULT_ARG
-      )
-    : View( arg_prop
-          , typename traits::array_layout
-              ( arg_N0 , arg_N1 , arg_N2 , arg_N3
-              , arg_N4 , arg_N5 , arg_N6 , arg_N7 )
-          )
-    {
+  template <class... P>
+  explicit inline View(
+      const Impl::ViewCtorProp<P...>& arg_prop,
+      typename std::enable_if<!Impl::ViewCtorProp<P...>::has_pointer,
+                              size_t>::type const arg_N0 =
+          KOKKOS_IMPL_CTOR_DEFAULT_ARG,
+      const size_t arg_N1 = KOKKOS_IMPL_CTOR_DEFAULT_ARG,
+      const size_t arg_N2 = KOKKOS_IMPL_CTOR_DEFAULT_ARG,
+      const size_t arg_N3 = KOKKOS_IMPL_CTOR_DEFAULT_ARG,
+      const size_t arg_N4 = KOKKOS_IMPL_CTOR_DEFAULT_ARG,
+      const size_t arg_N5 = KOKKOS_IMPL_CTOR_DEFAULT_ARG,
+      const size_t arg_N6 = KOKKOS_IMPL_CTOR_DEFAULT_ARG,
+      const size_t arg_N7 = KOKKOS_IMPL_CTOR_DEFAULT_ARG)
+      : View(arg_prop,
+             typename traits::array_layout(arg_N0, arg_N1, arg_N2, arg_N3,
+                                           arg_N4, arg_N5, arg_N6, arg_N7)) {
 #ifdef KOKKOS_ACTIVE_EXECUTION_MEMORY_SPACE_HOST
-    Impl::runtime_check_rank_host(traits::rank_dynamic, std::is_same<typename traits::specialize,void>::value, arg_N0, arg_N1, arg_N2, arg_N3,
-                             arg_N4, arg_N5, arg_N6, arg_N7, label());
+    Impl::runtime_check_rank_host(
+        traits::rank_dynamic,
+        std::is_same<typename traits::specialize, void>::value, arg_N0, arg_N1,
+        arg_N2, arg_N3, arg_N4, arg_N5, arg_N6, arg_N7, label());
 #else
-    Impl::runtime_check_rank_device(traits::rank_dynamic, std::is_same<typename traits::specialize,void>::value, arg_N0, arg_N1, arg_N2, arg_N3,
-                             arg_N4, arg_N5, arg_N6, arg_N7);
+    Impl::runtime_check_rank_device(
+        traits::rank_dynamic,
+        std::is_same<typename traits::specialize, void>::value, arg_N0, arg_N1,
+        arg_N2, arg_N3, arg_N4, arg_N5, arg_N6, arg_N7);
 
 #endif
+  }
 
-    }
-
-  template< class ... P >
-  explicit KOKKOS_INLINE_FUNCTION
-  View( const Impl::ViewCtorProp< P ... > & arg_prop
-      , typename std::enable_if< Impl::ViewCtorProp< P... >::has_pointer
-                               , size_t
-                               >::type const arg_N0 = KOKKOS_IMPL_CTOR_DEFAULT_ARG
-      , const size_t arg_N1 = KOKKOS_IMPL_CTOR_DEFAULT_ARG
-      , const size_t arg_N2 = KOKKOS_IMPL_CTOR_DEFAULT_ARG
-      , const size_t arg_N3 = KOKKOS_IMPL_CTOR_DEFAULT_ARG
-      , const size_t arg_N4 = KOKKOS_IMPL_CTOR_DEFAULT_ARG
-      , const size_t arg_N5 = KOKKOS_IMPL_CTOR_DEFAULT_ARG
-      , const size_t arg_N6 = KOKKOS_IMPL_CTOR_DEFAULT_ARG
-      , const size_t arg_N7 = KOKKOS_IMPL_CTOR_DEFAULT_ARG
-      )
-    : View( arg_prop
-          , typename traits::array_layout
-              ( arg_N0 , arg_N1 , arg_N2 , arg_N3
-              , arg_N4 , arg_N5 , arg_N6 , arg_N7 )
-          )
-    {
+  template <class... P>
+  explicit KOKKOS_INLINE_FUNCTION View(
+      const Impl::ViewCtorProp<P...>& arg_prop,
+      typename std::enable_if<Impl::ViewCtorProp<P...>::has_pointer,
+                              size_t>::type const arg_N0 =
+          KOKKOS_IMPL_CTOR_DEFAULT_ARG,
+      const size_t arg_N1 = KOKKOS_IMPL_CTOR_DEFAULT_ARG,
+      const size_t arg_N2 = KOKKOS_IMPL_CTOR_DEFAULT_ARG,
+      const size_t arg_N3 = KOKKOS_IMPL_CTOR_DEFAULT_ARG,
+      const size_t arg_N4 = KOKKOS_IMPL_CTOR_DEFAULT_ARG,
+      const size_t arg_N5 = KOKKOS_IMPL_CTOR_DEFAULT_ARG,
+      const size_t arg_N6 = KOKKOS_IMPL_CTOR_DEFAULT_ARG,
+      const size_t arg_N7 = KOKKOS_IMPL_CTOR_DEFAULT_ARG)
+      : View(arg_prop,
+             typename traits::array_layout(arg_N0, arg_N1, arg_N2, arg_N3,
+                                           arg_N4, arg_N5, arg_N6, arg_N7)) {
 #ifdef KOKKOS_ACTIVE_EXECUTION_MEMORY_SPACE_HOST
-    Impl::runtime_check_rank_host(traits::rank_dynamic, std::is_same<typename traits::specialize,void>::value, arg_N0, arg_N1, arg_N2, arg_N3,
-                             arg_N4, arg_N5, arg_N6, arg_N7, label());
+    Impl::runtime_check_rank_host(
+        traits::rank_dynamic,
+        std::is_same<typename traits::specialize, void>::value, arg_N0, arg_N1,
+        arg_N2, arg_N3, arg_N4, arg_N5, arg_N6, arg_N7, label());
 #else
-    Impl::runtime_check_rank_device(traits::rank_dynamic, std::is_same<typename traits::specialize,void>::value, arg_N0, arg_N1, arg_N2, arg_N3,
-                             arg_N4, arg_N5, arg_N6, arg_N7);
+    Impl::runtime_check_rank_device(
+        traits::rank_dynamic,
+        std::is_same<typename traits::specialize, void>::value, arg_N0, arg_N1,
+        arg_N2, arg_N3, arg_N4, arg_N5, arg_N6, arg_N7);
 
 #endif
-
-    }
+  }
 
   // Allocate with label and layout
-  template< typename Label >
-  explicit inline
-  View( const Label & arg_label
-      , typename std::enable_if<
-          Kokkos::Impl::is_view_label<Label>::value ,
-          typename traits::array_layout >::type const & arg_layout
-      )
-    : View( Impl::ViewCtorProp< std::string >( arg_label ) , arg_layout )
-    {}
+  template <typename Label>
+  explicit inline View(
+      const Label& arg_label,
+      typename std::enable_if<Kokkos::Impl::is_view_label<Label>::value,
+                              typename traits::array_layout>::type const&
+          arg_layout)
+      : View(Impl::ViewCtorProp<std::string>(arg_label), arg_layout) {}
 
   // Allocate label and layout, must disambiguate from subview constructor.
-  template< typename Label >
-  explicit inline
-  View( const Label & arg_label
-      , typename std::enable_if<
-          Kokkos::Impl::is_view_label<Label>::value ,
-        const size_t >::type arg_N0 = KOKKOS_IMPL_CTOR_DEFAULT_ARG
-      , const size_t arg_N1 = KOKKOS_IMPL_CTOR_DEFAULT_ARG
-      , const size_t arg_N2 = KOKKOS_IMPL_CTOR_DEFAULT_ARG
-      , const size_t arg_N3 = KOKKOS_IMPL_CTOR_DEFAULT_ARG
-      , const size_t arg_N4 = KOKKOS_IMPL_CTOR_DEFAULT_ARG
-      , const size_t arg_N5 = KOKKOS_IMPL_CTOR_DEFAULT_ARG
-      , const size_t arg_N6 = KOKKOS_IMPL_CTOR_DEFAULT_ARG
-      , const size_t arg_N7 = KOKKOS_IMPL_CTOR_DEFAULT_ARG
-      )
-    : View( Impl::ViewCtorProp< std::string >( arg_label )
-          , typename traits::array_layout
-              ( arg_N0 , arg_N1 , arg_N2 , arg_N3
-              , arg_N4 , arg_N5 , arg_N6 , arg_N7 )
-          )
-    {
-      static_assert ( traits::array_layout::is_extent_constructible , "Layout is not extent constructible. A layout object should be passed too.\n" );
-	  
+  template <typename Label>
+  explicit inline View(
+      const Label& arg_label,
+      typename std::enable_if<Kokkos::Impl::is_view_label<Label>::value,
+                              const size_t>::type arg_N0 =
+          KOKKOS_IMPL_CTOR_DEFAULT_ARG,
+      const size_t arg_N1 = KOKKOS_IMPL_CTOR_DEFAULT_ARG,
+      const size_t arg_N2 = KOKKOS_IMPL_CTOR_DEFAULT_ARG,
+      const size_t arg_N3 = KOKKOS_IMPL_CTOR_DEFAULT_ARG,
+      const size_t arg_N4 = KOKKOS_IMPL_CTOR_DEFAULT_ARG,
+      const size_t arg_N5 = KOKKOS_IMPL_CTOR_DEFAULT_ARG,
+      const size_t arg_N6 = KOKKOS_IMPL_CTOR_DEFAULT_ARG,
+      const size_t arg_N7 = KOKKOS_IMPL_CTOR_DEFAULT_ARG)
+      : View(Impl::ViewCtorProp<std::string>(arg_label),
+             typename traits::array_layout(arg_N0, arg_N1, arg_N2, arg_N3,
+                                           arg_N4, arg_N5, arg_N6, arg_N7)) {
+    static_assert(traits::array_layout::is_extent_constructible,
+                  "Layout is not extent constructible. A layout object should "
+                  "be passed too.\n");
+
 #ifdef KOKKOS_ACTIVE_EXECUTION_MEMORY_SPACE_HOST
-    Impl::runtime_check_rank_host(traits::rank_dynamic, std::is_same<typename traits::specialize,void>::value, arg_N0, arg_N1, arg_N2, arg_N3,
-                             arg_N4, arg_N5, arg_N6, arg_N7, label());
+    Impl::runtime_check_rank_host(
+        traits::rank_dynamic,
+        std::is_same<typename traits::specialize, void>::value, arg_N0, arg_N1,
+        arg_N2, arg_N3, arg_N4, arg_N5, arg_N6, arg_N7, label());
 #else
-    Impl::runtime_check_rank_device(traits::rank_dynamic, std::is_same<typename traits::specialize,void>::value, arg_N0, arg_N1, arg_N2, arg_N3,
-                             arg_N4, arg_N5, arg_N6, arg_N7);
+    Impl::runtime_check_rank_device(
+        traits::rank_dynamic,
+        std::is_same<typename traits::specialize, void>::value, arg_N0, arg_N1,
+        arg_N2, arg_N3, arg_N4, arg_N5, arg_N6, arg_N7);
 
 #endif
-
-
-
-    }
+  }
 
   // For backward compatibility
-  explicit inline
-  View( const ViewAllocateWithoutInitializing & arg_prop
-      , const typename traits::array_layout & arg_layout
-      )
-    : View( Impl::ViewCtorProp< std::string , Kokkos::Impl::WithoutInitializing_t >( arg_prop.label , Kokkos::WithoutInitializing )
-          , arg_layout
-          )
-    {}
+  explicit inline View(const ViewAllocateWithoutInitializing& arg_prop,
+                       const typename traits::array_layout& arg_layout)
+      : View(Impl::ViewCtorProp<std::string,
+                                Kokkos::Impl::WithoutInitializing_t>(
+                 arg_prop.label, Kokkos::WithoutInitializing),
+             arg_layout) {}
 
-  explicit inline
-  View( const ViewAllocateWithoutInitializing & arg_prop
-      , const size_t arg_N0 = KOKKOS_IMPL_CTOR_DEFAULT_ARG
-      , const size_t arg_N1 = KOKKOS_IMPL_CTOR_DEFAULT_ARG
-      , const size_t arg_N2 = KOKKOS_IMPL_CTOR_DEFAULT_ARG
-      , const size_t arg_N3 = KOKKOS_IMPL_CTOR_DEFAULT_ARG
-      , const size_t arg_N4 = KOKKOS_IMPL_CTOR_DEFAULT_ARG
-      , const size_t arg_N5 = KOKKOS_IMPL_CTOR_DEFAULT_ARG
-      , const size_t arg_N6 = KOKKOS_IMPL_CTOR_DEFAULT_ARG
-      , const size_t arg_N7 = KOKKOS_IMPL_CTOR_DEFAULT_ARG
-      )
-    : View( Impl::ViewCtorProp< std::string , Kokkos::Impl::WithoutInitializing_t >( arg_prop.label , Kokkos::WithoutInitializing )
-          , typename traits::array_layout
-              ( arg_N0 , arg_N1 , arg_N2 , arg_N3
-              , arg_N4 , arg_N5 , arg_N6 , arg_N7 )
-          )
-    {
+  explicit inline View(const ViewAllocateWithoutInitializing& arg_prop,
+                       const size_t arg_N0 = KOKKOS_IMPL_CTOR_DEFAULT_ARG,
+                       const size_t arg_N1 = KOKKOS_IMPL_CTOR_DEFAULT_ARG,
+                       const size_t arg_N2 = KOKKOS_IMPL_CTOR_DEFAULT_ARG,
+                       const size_t arg_N3 = KOKKOS_IMPL_CTOR_DEFAULT_ARG,
+                       const size_t arg_N4 = KOKKOS_IMPL_CTOR_DEFAULT_ARG,
+                       const size_t arg_N5 = KOKKOS_IMPL_CTOR_DEFAULT_ARG,
+                       const size_t arg_N6 = KOKKOS_IMPL_CTOR_DEFAULT_ARG,
+                       const size_t arg_N7 = KOKKOS_IMPL_CTOR_DEFAULT_ARG)
+      : View(Impl::ViewCtorProp<std::string,
+                                Kokkos::Impl::WithoutInitializing_t>(
+                 arg_prop.label, Kokkos::WithoutInitializing),
+             typename traits::array_layout(arg_N0, arg_N1, arg_N2, arg_N3,
+                                           arg_N4, arg_N5, arg_N6, arg_N7)) {
 #ifdef KOKKOS_ACTIVE_EXECUTION_MEMORY_SPACE_HOST
-    Impl::runtime_check_rank_host(traits::rank_dynamic, std::is_same<typename traits::specialize,void>::value, arg_N0, arg_N1, arg_N2, arg_N3,
-                             arg_N4, arg_N5, arg_N6, arg_N7, label());
+    Impl::runtime_check_rank_host(
+        traits::rank_dynamic,
+        std::is_same<typename traits::specialize, void>::value, arg_N0, arg_N1,
+        arg_N2, arg_N3, arg_N4, arg_N5, arg_N6, arg_N7, label());
 #else
-    Impl::runtime_check_rank_device(traits::rank_dynamic, std::is_same<typename traits::specialize,void>::value, arg_N0, arg_N1, arg_N2, arg_N3,
-                             arg_N4, arg_N5, arg_N6, arg_N7);
+    Impl::runtime_check_rank_device(
+        traits::rank_dynamic,
+        std::is_same<typename traits::specialize, void>::value, arg_N0, arg_N1,
+        arg_N2, arg_N3, arg_N4, arg_N5, arg_N6, arg_N7);
 
 #endif
-
-    }
+  }
   template <class Traits>
-  KOKKOS_INLINE_FUNCTION
-  View( const track_type & track,  const Kokkos::Impl::ViewMapping< Traits , typename Traits::specialize >  &map ) :
-  m_track(track), m_map()
-  {
-    typedef Kokkos::Impl::ViewMapping< traits , Traits , typename traits::specialize >  Mapping ;
-    static_assert( Mapping::is_assignable , "Incompatible View copy construction" );
-    Mapping::assign( m_map , map , track );
+  KOKKOS_INLINE_FUNCTION View(
+      const track_type& track,
+      const Kokkos::Impl::ViewMapping<Traits, typename Traits::specialize>& map)
+      : m_track(track), m_map() {
+    typedef Kokkos::Impl::ViewMapping<traits, Traits,
+                                      typename traits::specialize>
+        Mapping;
+    static_assert(Mapping::is_assignable,
+                  "Incompatible View copy construction");
+    Mapping::assign(m_map, map, track);
   }
 
   //----------------------------------------
   // Memory span required to wrap these dimensions.
   static constexpr size_t required_allocation_size(
-                                       const size_t arg_N0 = 0
-                                     , const size_t arg_N1 = 0
-                                     , const size_t arg_N2 = 0
-                                     , const size_t arg_N3 = 0
-                                     , const size_t arg_N4 = 0
-                                     , const size_t arg_N5 = 0
-                                     , const size_t arg_N6 = 0
-                                     , const size_t arg_N7 = 0
-                                     )
-    {
-      return map_type::memory_span(
-        typename traits::array_layout
-          ( arg_N0 , arg_N1 , arg_N2 , arg_N3
-          , arg_N4 , arg_N5 , arg_N6 , arg_N7 ) );
-    }
+      const size_t arg_N0 = 0, const size_t arg_N1 = 0, const size_t arg_N2 = 0,
+      const size_t arg_N3 = 0, const size_t arg_N4 = 0, const size_t arg_N5 = 0,
+      const size_t arg_N6 = 0, const size_t arg_N7 = 0) {
+    return map_type::memory_span(typename traits::array_layout(
+        arg_N0, arg_N1, arg_N2, arg_N3, arg_N4, arg_N5, arg_N6, arg_N7));
+  }
 
-  explicit KOKKOS_INLINE_FUNCTION
-  View( pointer_type arg_ptr
-      , const size_t arg_N0 = KOKKOS_IMPL_CTOR_DEFAULT_ARG
-      , const size_t arg_N1 = KOKKOS_IMPL_CTOR_DEFAULT_ARG
-      , const size_t arg_N2 = KOKKOS_IMPL_CTOR_DEFAULT_ARG
-      , const size_t arg_N3 = KOKKOS_IMPL_CTOR_DEFAULT_ARG
-      , const size_t arg_N4 = KOKKOS_IMPL_CTOR_DEFAULT_ARG
-      , const size_t arg_N5 = KOKKOS_IMPL_CTOR_DEFAULT_ARG
-      , const size_t arg_N6 = KOKKOS_IMPL_CTOR_DEFAULT_ARG
-      , const size_t arg_N7 = KOKKOS_IMPL_CTOR_DEFAULT_ARG
-      )
-    : View( Impl::ViewCtorProp<pointer_type>(arg_ptr)
-          , typename traits::array_layout
-             ( arg_N0 , arg_N1 , arg_N2 , arg_N3
-             , arg_N4 , arg_N5 , arg_N6 , arg_N7 )
-          )
-    {
+  explicit KOKKOS_INLINE_FUNCTION View(
+      pointer_type arg_ptr, const size_t arg_N0 = KOKKOS_IMPL_CTOR_DEFAULT_ARG,
+      const size_t arg_N1 = KOKKOS_IMPL_CTOR_DEFAULT_ARG,
+      const size_t arg_N2 = KOKKOS_IMPL_CTOR_DEFAULT_ARG,
+      const size_t arg_N3 = KOKKOS_IMPL_CTOR_DEFAULT_ARG,
+      const size_t arg_N4 = KOKKOS_IMPL_CTOR_DEFAULT_ARG,
+      const size_t arg_N5 = KOKKOS_IMPL_CTOR_DEFAULT_ARG,
+      const size_t arg_N6 = KOKKOS_IMPL_CTOR_DEFAULT_ARG,
+      const size_t arg_N7 = KOKKOS_IMPL_CTOR_DEFAULT_ARG)
+      : View(Impl::ViewCtorProp<pointer_type>(arg_ptr),
+             typename traits::array_layout(arg_N0, arg_N1, arg_N2, arg_N3,
+                                           arg_N4, arg_N5, arg_N6, arg_N7)) {
 #ifdef KOKKOS_ACTIVE_EXECUTION_MEMORY_SPACE_HOST
-    Impl::runtime_check_rank_host(traits::rank_dynamic, std::is_same<typename traits::specialize,void>::value, arg_N0, arg_N1, arg_N2, arg_N3,
-                             arg_N4, arg_N5, arg_N6, arg_N7, label());
+    Impl::runtime_check_rank_host(
+        traits::rank_dynamic,
+        std::is_same<typename traits::specialize, void>::value, arg_N0, arg_N1,
+        arg_N2, arg_N3, arg_N4, arg_N5, arg_N6, arg_N7, label());
 #else
-    Impl::runtime_check_rank_device(traits::rank_dynamic, std::is_same<typename traits::specialize,void>::value, arg_N0, arg_N1, arg_N2, arg_N3,
-                             arg_N4, arg_N5, arg_N6, arg_N7);
+    Impl::runtime_check_rank_device(
+        traits::rank_dynamic,
+        std::is_same<typename traits::specialize, void>::value, arg_N0, arg_N1,
+        arg_N2, arg_N3, arg_N4, arg_N5, arg_N6, arg_N7);
 
 #endif
-    }
+  }
 
-  explicit KOKKOS_INLINE_FUNCTION
-  View( pointer_type arg_ptr
-      , const typename traits::array_layout & arg_layout
-      )
-    : View( Impl::ViewCtorProp<pointer_type>(arg_ptr) , arg_layout )
-    {
-
-    }
+  explicit KOKKOS_INLINE_FUNCTION View(
+      pointer_type arg_ptr, const typename traits::array_layout& arg_layout)
+      : View(Impl::ViewCtorProp<pointer_type>(arg_ptr), arg_layout) {}
 
   //----------------------------------------
   // Shared scratch memory constructor
 
-  static inline
-  size_t
-  shmem_size( const size_t arg_N0 = KOKKOS_INVALID_INDEX,
-              const size_t arg_N1 = KOKKOS_INVALID_INDEX,
-              const size_t arg_N2 = KOKKOS_INVALID_INDEX,
-              const size_t arg_N3 = KOKKOS_INVALID_INDEX,
-              const size_t arg_N4 = KOKKOS_INVALID_INDEX,
-              const size_t arg_N5 = KOKKOS_INVALID_INDEX,
-              const size_t arg_N6 = KOKKOS_INVALID_INDEX,
-              const size_t arg_N7 = KOKKOS_INVALID_INDEX )
-  {
-    if ( is_layout_stride ) {
-      Kokkos::abort( "Kokkos::View::shmem_size(extents...) doesn't work with LayoutStride. Pass a LayoutStride object instead" );
+  static inline size_t shmem_size(const size_t arg_N0 = KOKKOS_INVALID_INDEX,
+                                  const size_t arg_N1 = KOKKOS_INVALID_INDEX,
+                                  const size_t arg_N2 = KOKKOS_INVALID_INDEX,
+                                  const size_t arg_N3 = KOKKOS_INVALID_INDEX,
+                                  const size_t arg_N4 = KOKKOS_INVALID_INDEX,
+                                  const size_t arg_N5 = KOKKOS_INVALID_INDEX,
+                                  const size_t arg_N6 = KOKKOS_INVALID_INDEX,
+                                  const size_t arg_N7 = KOKKOS_INVALID_INDEX) {
+    if (is_layout_stride) {
+      Kokkos::abort(
+          "Kokkos::View::shmem_size(extents...) doesn't work with "
+          "LayoutStride. Pass a LayoutStride object instead");
     }
-    const size_t num_passed_args = Impl::count_valid_integers(arg_N0, arg_N1, arg_N2, arg_N3,
-                                                              arg_N4, arg_N5, arg_N6, arg_N7);
+    const size_t num_passed_args = Impl::count_valid_integers(
+        arg_N0, arg_N1, arg_N2, arg_N3, arg_N4, arg_N5, arg_N6, arg_N7);
 
-    if ( std::is_same<typename traits::specialize,void>::value && num_passed_args != traits::rank_dynamic ) {
-      Kokkos::abort( "Kokkos::View::shmem_size() rank_dynamic != number of arguments.\n" );
+    if (std::is_same<typename traits::specialize, void>::value &&
+        num_passed_args != traits::rank_dynamic) {
+      Kokkos::abort(
+          "Kokkos::View::shmem_size() rank_dynamic != number of arguments.\n");
     }
 
-    return View::shmem_size(
-           typename traits::array_layout
-            ( arg_N0 , arg_N1 , arg_N2 , arg_N3
-            , arg_N4 , arg_N5 , arg_N6 , arg_N7 ) );
+    return View::shmem_size(typename traits::array_layout(
+        arg_N0, arg_N1, arg_N2, arg_N3, arg_N4, arg_N5, arg_N6, arg_N7));
   }
 
-  static inline
-  size_t shmem_size( typename traits::array_layout const& arg_layout )
-  {
-    return map_type::memory_span( arg_layout )+sizeof(typename traits::value_type);
+  static inline size_t shmem_size(
+      typename traits::array_layout const& arg_layout) {
+    return map_type::memory_span(arg_layout) +
+           sizeof(typename traits::value_type);
   }
 
-  explicit KOKKOS_INLINE_FUNCTION
-  View( const typename traits::execution_space::scratch_memory_space & arg_space
-      , const typename traits::array_layout & arg_layout )
-    : View( Impl::ViewCtorProp<pointer_type>(
-              reinterpret_cast<pointer_type>(
-                arg_space.get_shmem_aligned( map_type::memory_span( arg_layout ), sizeof(typename traits::value_type) ) ) )
-         , arg_layout )
-    {}
-
-  explicit KOKKOS_INLINE_FUNCTION
-  View( const typename traits::execution_space::scratch_memory_space & arg_space
-      , const size_t arg_N0 = KOKKOS_IMPL_CTOR_DEFAULT_ARG
-      , const size_t arg_N1 = KOKKOS_IMPL_CTOR_DEFAULT_ARG
-      , const size_t arg_N2 = KOKKOS_IMPL_CTOR_DEFAULT_ARG
-      , const size_t arg_N3 = KOKKOS_IMPL_CTOR_DEFAULT_ARG
-      , const size_t arg_N4 = KOKKOS_IMPL_CTOR_DEFAULT_ARG
-      , const size_t arg_N5 = KOKKOS_IMPL_CTOR_DEFAULT_ARG
-      , const size_t arg_N6 = KOKKOS_IMPL_CTOR_DEFAULT_ARG
-      , const size_t arg_N7 = KOKKOS_IMPL_CTOR_DEFAULT_ARG )
-    : View( Impl::ViewCtorProp<pointer_type>(
-              reinterpret_cast<pointer_type>(
-                arg_space.get_shmem_aligned(
-                  map_type::memory_span(
-                    typename traits::array_layout
-                     ( arg_N0 , arg_N1 , arg_N2 , arg_N3
-                     , arg_N4 , arg_N5 , arg_N6 , arg_N7 ) ), sizeof(typename traits::value_type) ) ) )
-          , typename traits::array_layout
-             ( arg_N0 , arg_N1 , arg_N2 , arg_N3
-             , arg_N4 , arg_N5 , arg_N6 , arg_N7 )
-       )
-    {
+  explicit KOKKOS_INLINE_FUNCTION View(
+      const typename traits::execution_space::scratch_memory_space& arg_space,
+      const typename traits::array_layout& arg_layout)
+      : View(Impl::ViewCtorProp<pointer_type>(
+                 reinterpret_cast<pointer_type>(arg_space.get_shmem_aligned(
+                     map_type::memory_span(arg_layout),
+                     sizeof(typename traits::value_type)))),
+             arg_layout) {}
 
+  explicit KOKKOS_INLINE_FUNCTION View(
+      const typename traits::execution_space::scratch_memory_space& arg_space,
+      const size_t arg_N0 = KOKKOS_IMPL_CTOR_DEFAULT_ARG,
+      const size_t arg_N1 = KOKKOS_IMPL_CTOR_DEFAULT_ARG,
+      const size_t arg_N2 = KOKKOS_IMPL_CTOR_DEFAULT_ARG,
+      const size_t arg_N3 = KOKKOS_IMPL_CTOR_DEFAULT_ARG,
+      const size_t arg_N4 = KOKKOS_IMPL_CTOR_DEFAULT_ARG,
+      const size_t arg_N5 = KOKKOS_IMPL_CTOR_DEFAULT_ARG,
+      const size_t arg_N6 = KOKKOS_IMPL_CTOR_DEFAULT_ARG,
+      const size_t arg_N7 = KOKKOS_IMPL_CTOR_DEFAULT_ARG)
+      : View(Impl::ViewCtorProp<pointer_type>(
+                 reinterpret_cast<pointer_type>(arg_space.get_shmem_aligned(
+                     map_type::memory_span(typename traits::array_layout(
+                         arg_N0, arg_N1, arg_N2, arg_N3, arg_N4, arg_N5, arg_N6,
+                         arg_N7)),
+                     sizeof(typename traits::value_type)))),
+             typename traits::array_layout(arg_N0, arg_N1, arg_N2, arg_N3,
+                                           arg_N4, arg_N5, arg_N6, arg_N7)) {
 #ifdef KOKKOS_ACTIVE_EXECUTION_MEMORY_SPACE_HOST
-    Impl::runtime_check_rank_host(traits::rank_dynamic, std::is_same<typename traits::specialize,void>::value, arg_N0, arg_N1, arg_N2, arg_N3,
-                             arg_N4, arg_N5, arg_N6, arg_N7, label());
+    Impl::runtime_check_rank_host(
+        traits::rank_dynamic,
+        std::is_same<typename traits::specialize, void>::value, arg_N0, arg_N1,
+        arg_N2, arg_N3, arg_N4, arg_N5, arg_N6, arg_N7, label());
 #else
-    Impl::runtime_check_rank_device(traits::rank_dynamic, std::is_same<typename traits::specialize,void>::value, arg_N0, arg_N1, arg_N2, arg_N3,
-                             arg_N4, arg_N5, arg_N6, arg_N7);
+    Impl::runtime_check_rank_device(
+        traits::rank_dynamic,
+        std::is_same<typename traits::specialize, void>::value, arg_N0, arg_N1,
+        arg_N2, arg_N3, arg_N4, arg_N5, arg_N6, arg_N7);
 
 #endif
-    }
+  }
 };
 
-
- /** \brief Temporary free function rank()
-  *         until rank() is implemented
-  *         in the View
-  */
-  template < typename D , class ... P >
-  KOKKOS_INLINE_FUNCTION
-  constexpr unsigned rank( const View<D , P...> & V ) { return V.Rank; } //Temporary until added to view
+/** \brief Temporary free function rank()
+ *         until rank() is implemented
+ *         in the View
+ */
+template <typename D, class... P>
+KOKKOS_INLINE_FUNCTION constexpr unsigned rank(const View<D, P...>& V) {
+  return V.Rank;
+}  // Temporary until added to view
 
 //----------------------------------------------------------------------------
 //----------------------------------------------------------------------------
 
-template< class V , class ... Args >
+template <class V, class... Args>
 using Subview =
-  typename Kokkos::Impl::ViewMapping
-    < void /* deduce subview type from source view traits */
-    , typename V::traits
-    , Args ...
-    >::type ;
+    typename Kokkos::Impl::ViewMapping<void /* deduce subview type from source
+                                               view traits */
+                                       ,
+                                       typename V::traits, Args...>::type;
 
-template< class D, class ... P , class ... Args >
+template <class D, class... P, class... Args>
 KOKKOS_INLINE_FUNCTION
-typename Kokkos::Impl::ViewMapping
-  < void /* deduce subview type from source view traits */
-  , ViewTraits< D , P... >
-  , Args ...
-  >::type
-subview( const View< D, P... > & src , Args ... args )
-{
-  static_assert( View< D , P... >::Rank == sizeof...(Args) ,
-    "subview requires one argument for each source View rank" );
+    typename Kokkos::Impl::ViewMapping<void /* deduce subview type from source
+                                               view traits */
+                                       ,
+                                       ViewTraits<D, P...>, Args...>::type
+    subview(const View<D, P...>& src, Args... args) {
+  static_assert(View<D, P...>::Rank == sizeof...(Args),
+                "subview requires one argument for each source View rank");
 
-  return typename
-    Kokkos::Impl::ViewMapping
-      < void /* deduce subview type from source view traits */
-      , ViewTraits< D , P ... >
-      , Args ... >::type( src , args ... );
+  return typename Kokkos::Impl::ViewMapping<
+      void /* deduce subview type from source view traits */
+      ,
+      ViewTraits<D, P...>, Args...>::type(src, args...);
 }
 
-template< class MemoryTraits , class D, class ... P , class ... Args >
-KOKKOS_INLINE_FUNCTION
-typename Kokkos::Impl::ViewMapping
-  < void /* deduce subview type from source view traits */
-  , ViewTraits< D , P... >
-  , Args ...
-  >::template apply< MemoryTraits >::type
-subview( const View< D, P... > & src , Args ... args )
-{
-  static_assert( View< D , P... >::Rank == sizeof...(Args) ,
-    "subview requires one argument for each source View rank" );
+template <class MemoryTraits, class D, class... P, class... Args>
+KOKKOS_INLINE_FUNCTION typename Kokkos::Impl::ViewMapping<
+    void /* deduce subview type from source view traits */
+    ,
+    ViewTraits<D, P...>, Args...>::template apply<MemoryTraits>::type
+subview(const View<D, P...>& src, Args... args) {
+  static_assert(View<D, P...>::Rank == sizeof...(Args),
+                "subview requires one argument for each source View rank");
 
-  return typename
-    Kokkos::Impl::ViewMapping
-      < void /* deduce subview type from source view traits */
-      , ViewTraits< D , P ... >
-      , Args ... >
-      ::template apply< MemoryTraits >
-      ::type( src , args ... );
+  return typename Kokkos::Impl::ViewMapping<
+      void /* deduce subview type from source view traits */
+      ,
+      ViewTraits<D, P...>,
+      Args...>::template apply<MemoryTraits>::type(src, args...);
 }
 
 } /* namespace Kokkos */
@@ -2524,41 +2254,31 @@ subview( const View< D, P... > & src , Args ... args )
 
 namespace Kokkos {
 
-template< class LT , class ... LP , class RT , class ... RP >
-KOKKOS_INLINE_FUNCTION
-bool operator == ( const View<LT,LP...> & lhs ,
-                   const View<RT,RP...> & rhs )
-{
+template <class LT, class... LP, class RT, class... RP>
+KOKKOS_INLINE_FUNCTION bool operator==(const View<LT, LP...>& lhs,
+                                       const View<RT, RP...>& rhs) {
   // Same data, layout, dimensions
-  typedef ViewTraits<LT,LP...>  lhs_traits ;
-  typedef ViewTraits<RT,RP...>  rhs_traits ;
+  typedef ViewTraits<LT, LP...> lhs_traits;
+  typedef ViewTraits<RT, RP...> rhs_traits;
 
-  return
-    std::is_same< typename lhs_traits::const_value_type ,
-                  typename rhs_traits::const_value_type >::value &&
-    std::is_same< typename lhs_traits::array_layout ,
-                  typename rhs_traits::array_layout >::value &&
-    std::is_same< typename lhs_traits::memory_space ,
-                  typename rhs_traits::memory_space >::value &&
-    unsigned(lhs_traits::rank) == unsigned(rhs_traits::rank) &&
-    lhs.data()        == rhs.data() &&
-    lhs.span()        == rhs.span() &&
-    lhs.extent(0) == rhs.extent(0) &&
-    lhs.extent(1) == rhs.extent(1) &&
-    lhs.extent(2) == rhs.extent(2) &&
-    lhs.extent(3) == rhs.extent(3) &&
-    lhs.extent(4) == rhs.extent(4) &&
-    lhs.extent(5) == rhs.extent(5) &&
-    lhs.extent(6) == rhs.extent(6) &&
-    lhs.extent(7) == rhs.extent(7);
+  return std::is_same<typename lhs_traits::const_value_type,
+                      typename rhs_traits::const_value_type>::value &&
+         std::is_same<typename lhs_traits::array_layout,
+                      typename rhs_traits::array_layout>::value &&
+         std::is_same<typename lhs_traits::memory_space,
+                      typename rhs_traits::memory_space>::value &&
+         unsigned(lhs_traits::rank) == unsigned(rhs_traits::rank) &&
+         lhs.data() == rhs.data() && lhs.span() == rhs.span() &&
+         lhs.extent(0) == rhs.extent(0) && lhs.extent(1) == rhs.extent(1) &&
+         lhs.extent(2) == rhs.extent(2) && lhs.extent(3) == rhs.extent(3) &&
+         lhs.extent(4) == rhs.extent(4) && lhs.extent(5) == rhs.extent(5) &&
+         lhs.extent(6) == rhs.extent(6) && lhs.extent(7) == rhs.extent(7);
 }
 
-template< class LT , class ... LP , class RT , class ... RP >
-KOKKOS_INLINE_FUNCTION
-bool operator != ( const View<LT,LP...> & lhs ,
-                   const View<RT,RP...> & rhs )
-{
-  return ! ( operator==(lhs,rhs) );
+template <class LT, class... LP, class RT, class... RP>
+KOKKOS_INLINE_FUNCTION bool operator!=(const View<LT, LP...>& lhs,
+                                       const View<RT, RP...>& rhs) {
+  return !(operator==(lhs, rhs));
 }
 
 } /* namespace Kokkos */
@@ -2569,13 +2289,13 @@ bool operator != ( const View<LT,LP...> & lhs ,
 namespace Kokkos {
 namespace Impl {
 
-inline
-void shared_allocation_tracking_disable()
-{ Kokkos::Impl::SharedAllocationRecord<void,void>::tracking_disable(); }
+inline void shared_allocation_tracking_disable() {
+  Kokkos::Impl::SharedAllocationRecord<void, void>::tracking_disable();
+}
 
-inline
-void shared_allocation_tracking_enable()
-{ Kokkos::Impl::SharedAllocationRecord<void,void>::tracking_enable(); }
+inline void shared_allocation_tracking_enable() {
+  Kokkos::Impl::SharedAllocationRecord<void, void>::tracking_enable();
+}
 
 } /* namespace Impl */
 } /* namespace Kokkos */
@@ -2583,60 +2303,53 @@ void shared_allocation_tracking_enable()
 //----------------------------------------------------------------------------
 //----------------------------------------------------------------------------
 
-namespace Kokkos { namespace Impl {
+namespace Kokkos {
+namespace Impl {
 
-template < class Specialize, typename A, typename B >
+template <class Specialize, typename A, typename B>
 struct CommonViewValueType;
 
-template < typename A, typename B >
-struct CommonViewValueType< void, A, B >
-{
-  using value_type = typename std::common_type< A , B >::type;
+template <typename A, typename B>
+struct CommonViewValueType<void, A, B> {
+  using value_type = typename std::common_type<A, B>::type;
 };
 
-
-template < class Specialize, class ValueType >
+template <class Specialize, class ValueType>
 struct CommonViewAllocProp;
 
-template < class ValueType >
-struct CommonViewAllocProp< void, ValueType >
-{
-  using value_type = ValueType;
+template <class ValueType>
+struct CommonViewAllocProp<void, ValueType> {
+  using value_type        = ValueType;
   using scalar_array_type = ValueType;
 
-  template < class ... Views >
-  KOKKOS_INLINE_FUNCTION
-  CommonViewAllocProp( const Views & ... ) {}
+  template <class... Views>
+  KOKKOS_INLINE_FUNCTION CommonViewAllocProp(const Views&...) {}
 };
 
-
-template < class ... Views >
+template <class... Views>
 struct DeduceCommonViewAllocProp;
 
 // Base case must provide types for:
 // 1. specialize  2. value_type  3. is_view  4. prop_type
-template < class FirstView >
-struct DeduceCommonViewAllocProp< FirstView >
-{
+template <class FirstView>
+struct DeduceCommonViewAllocProp<FirstView> {
   using specialize = typename FirstView::traits::specialize;
 
   using value_type = typename FirstView::traits::value_type;
 
-  enum : bool { is_view = is_view< FirstView >::value };
+  enum : bool { is_view = is_view<FirstView>::value };
 
-  using prop_type = CommonViewAllocProp< specialize, value_type >;
+  using prop_type = CommonViewAllocProp<specialize, value_type>;
 };
 
-
-template < class FirstView, class ... NextViews >
-struct DeduceCommonViewAllocProp< FirstView, NextViews... >
-{
-  using NextTraits = DeduceCommonViewAllocProp< NextViews... >;
+template <class FirstView, class... NextViews>
+struct DeduceCommonViewAllocProp<FirstView, NextViews...> {
+  using NextTraits = DeduceCommonViewAllocProp<NextViews...>;
 
   using first_specialize = typename FirstView::traits::specialize;
   using first_value_type = typename FirstView::traits::value_type;
 
-  enum : bool { first_is_view = is_view< FirstView >::value };
+  enum : bool { first_is_view = is_view<FirstView>::value };
 
   using next_specialize = typename NextTraits::specialize;
   using next_value_type = typename NextTraits::value_type;
@@ -2646,47 +2359,48 @@ struct DeduceCommonViewAllocProp< FirstView, NextViews... >
   // common types
 
   // determine specialize type
-  // if first and next specialize differ, but are not the same specialize, error out
-  static_assert( !(!std::is_same< first_specialize, next_specialize >::value && !std::is_same< first_specialize, void>::value && !std::is_same< void, next_specialize >::value)  , "Kokkos DeduceCommonViewAllocProp ERROR: Only one non-void specialize trait allowed" );
+  // if first and next specialize differ, but are not the same specialize, error
+  // out
+  static_assert(!(!std::is_same<first_specialize, next_specialize>::value &&
+                  !std::is_same<first_specialize, void>::value &&
+                  !std::is_same<void, next_specialize>::value),
+                "Kokkos DeduceCommonViewAllocProp ERROR: Only one non-void "
+                "specialize trait allowed");
 
   // otherwise choose non-void specialize if either/both are non-void
-  using specialize = typename std::conditional< std::is_same< first_specialize, next_specialize >::value
-                                              , first_specialize
-                                              , typename std::conditional< ( std::is_same< first_specialize, void >::value
-                                                                             && !std::is_same< next_specialize, void >::value)
-                                                                           , next_specialize
-                                                                           , first_specialize
-                                                                         >::type
-                                               >::type;
+  using specialize = typename std::conditional<
+      std::is_same<first_specialize, next_specialize>::value, first_specialize,
+      typename std::conditional<(std::is_same<first_specialize, void>::value &&
+                                 !std::is_same<next_specialize, void>::value),
+                                next_specialize, first_specialize>::type>::type;
 
-  using value_type = typename CommonViewValueType< specialize, first_value_type, next_value_type >::value_type;
+  using value_type = typename CommonViewValueType<specialize, first_value_type,
+                                                  next_value_type>::value_type;
 
   enum : bool { is_view = (first_is_view && next_is_view) };
 
-  using prop_type = CommonViewAllocProp< specialize, value_type >;
+  using prop_type = CommonViewAllocProp<specialize, value_type>;
 };
 
-} // end namespace Impl
+}  // end namespace Impl
 
-template < class ... Views >
-using DeducedCommonPropsType = typename Impl::DeduceCommonViewAllocProp<Views...>::prop_type ;
+template <class... Views>
+using DeducedCommonPropsType =
+    typename Impl::DeduceCommonViewAllocProp<Views...>::prop_type;
 
 // User function
-template < class ... Views >
-KOKKOS_INLINE_FUNCTION
-DeducedCommonPropsType<Views...> 
-common_view_alloc_prop( Views const & ... views )
-{
-  return DeducedCommonPropsType<Views...>( views... );
+template <class... Views>
+KOKKOS_INLINE_FUNCTION DeducedCommonPropsType<Views...> common_view_alloc_prop(
+    Views const&... views) {
+  return DeducedCommonPropsType<Views...>(views...);
 }
 
-} // namespace Kokkos
-
+}  // namespace Kokkos
 
 namespace Kokkos {
 namespace Impl {
 
-using Kokkos::is_view ;
+using Kokkos::is_view;
 
 } /* namespace Impl */
 } /* namespace Kokkos */
@@ -2698,4 +2412,3 @@ using Kokkos::is_view ;
 //----------------------------------------------------------------------------
 
 #endif /* #ifndef KOKKOS_VIEW_HPP */
-
diff --git a/lib/kokkos/core/src/Kokkos_WorkGraphPolicy.hpp b/lib/kokkos/core/src/Kokkos_WorkGraphPolicy.hpp
index dd5e29a400..26df7e03a2 100644
--- a/lib/kokkos/core/src/Kokkos_WorkGraphPolicy.hpp
+++ b/lib/kokkos/core/src/Kokkos_WorkGraphPolicy.hpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -47,34 +48,33 @@
 namespace Kokkos {
 namespace Impl {
 
-template< class functor_type , class execution_space, class ... policy_args >
+template <class functor_type, class execution_space, class... policy_args>
 class WorkGraphExec;
 
-}} // namespace Kokkos::Impl
+}
+}  // namespace Kokkos
 
 namespace Kokkos {
 
-template< class ... Properties >
-class WorkGraphPolicy: public Kokkos::Impl::PolicyTraits<Properties ... >
-{
-public:
-
-  using execution_policy = WorkGraphPolicy<Properties ... >;
-  using self_type       = WorkGraphPolicy<Properties ... >;
-  using traits          = Kokkos::Impl::PolicyTraits<Properties ... >;
-  using index_type      = typename traits::index_type;
-  using member_type     = index_type;
-  using execution_space = typename traits::execution_space;
-  using memory_space    = typename execution_space::memory_space;
-  using graph_type      = Kokkos::Crs<index_type,execution_space,void,index_type>;
+template <class... Properties>
+class WorkGraphPolicy : public Kokkos::Impl::PolicyTraits<Properties...> {
+ public:
+  using execution_policy = WorkGraphPolicy<Properties...>;
+  using self_type        = WorkGraphPolicy<Properties...>;
+  using traits           = Kokkos::Impl::PolicyTraits<Properties...>;
+  using index_type       = typename traits::index_type;
+  using member_type      = index_type;
+  using execution_space  = typename traits::execution_space;
+  using memory_space     = typename execution_space::memory_space;
+  using graph_type = Kokkos::Crs<index_type, execution_space, void, index_type>;
 
   enum : std::int32_t {
-    END_TOKEN       = -1 ,
-    BEGIN_TOKEN     = -2 ,
-    COMPLETED_TOKEN = -3 };
-
-private:
+    END_TOKEN       = -1,
+    BEGIN_TOKEN     = -2,
+    COMPLETED_TOKEN = -3
+  };
 
+ private:
   using ints_type = Kokkos::View<std::int32_t*, memory_space>;
 
   // Let N = m_graph.numRows(), the total work
@@ -83,30 +83,27 @@ private:
   // m_queue[2*N .. 2*N+2] = the ready queue hints
 
   graph_type const m_graph;
-  ints_type        m_queue ;
+  ints_type m_queue;
 
   KOKKOS_INLINE_FUNCTION
-  void push_work( const std::int32_t w ) const noexcept
-    {
-      const std::int32_t N = m_graph.numRows();
+  void push_work(const std::int32_t w) const noexcept {
+    const std::int32_t N = m_graph.numRows();
 
-      std::int32_t volatile * const ready_queue = & m_queue[0] ;
-      std::int32_t volatile * const end_hint    = & m_queue[2*N+1] ;
+    std::int32_t volatile* const ready_queue = &m_queue[0];
+    std::int32_t volatile* const end_hint    = &m_queue[2 * N + 1];
 
-      // Push work to end of queue
-      const std::int32_t j = atomic_fetch_add( end_hint , 1 );
+    // Push work to end of queue
+    const std::int32_t j = atomic_fetch_add(end_hint, 1);
 
-      if ( ( N <= j ) ||
-           ( END_TOKEN != atomic_exchange(ready_queue+j,w) ) ) {
-        // ERROR: past the end of queue or did not replace END_TOKEN
-        Kokkos::abort("WorkGraphPolicy push_work error");
-      }
-
-      memory_fence();
+    if ((N <= j) || (END_TOKEN != atomic_exchange(ready_queue + j, w))) {
+      // ERROR: past the end of queue or did not replace END_TOKEN
+      Kokkos::abort("WorkGraphPolicy push_work error");
     }
 
-public:
+    memory_fence();
+  }
 
+ public:
   /**\brief  Attempt to pop the work item at the head of the queue.
    *
    *  Find entry 'i' such that
@@ -119,60 +116,59 @@ public:
    *    return END_TOKEN
    *  else
    *    return COMPLETED_TOKEN
-   *  
+   *
    */
   KOKKOS_INLINE_FUNCTION
-  std::int32_t pop_work() const noexcept
-    {
-      const std::int32_t N = m_graph.numRows();
+  std::int32_t pop_work() const noexcept {
+    const std::int32_t N = m_graph.numRows();
 
-      std::int32_t volatile * const ready_queue = & m_queue[0] ;
-      std::int32_t volatile * const begin_hint  = & m_queue[2*N] ;
+    std::int32_t volatile* const ready_queue = &m_queue[0];
+    std::int32_t volatile* const begin_hint  = &m_queue[2 * N];
 
-      // begin hint is guaranteed to be less than or equal to
-      // actual begin location in the queue.
+    // begin hint is guaranteed to be less than or equal to
+    // actual begin location in the queue.
 
-      for ( std::int32_t i = *begin_hint ; i < N ; ++i ) {
+    for (std::int32_t i = *begin_hint; i < N; ++i) {
+      const std::int32_t w = ready_queue[i];
 
-        const std::int32_t w = ready_queue[i] ;
-
-        if ( w == END_TOKEN ) { return END_TOKEN ; }
-
-        if ( ( w != BEGIN_TOKEN ) &&
-             ( w == atomic_compare_exchange(ready_queue+i,w,(std::int32_t)BEGIN_TOKEN) ) ) {
-          // Attempt to claim ready work index succeeded,
-          // update the hint and return work index
-          atomic_increment( begin_hint );
-          return w ;
-        }
-        // arrive here when ready_queue[i] == BEGIN_TOKEN
+      if (w == END_TOKEN) {
+        return END_TOKEN;
       }
 
-      return COMPLETED_TOKEN ;
+      if ((w != BEGIN_TOKEN) &&
+          (w == atomic_compare_exchange(ready_queue + i, w,
+                                        (std::int32_t)BEGIN_TOKEN))) {
+        // Attempt to claim ready work index succeeded,
+        // update the hint and return work index
+        atomic_increment(begin_hint);
+        return w;
+      }
+      // arrive here when ready_queue[i] == BEGIN_TOKEN
     }
 
+    return COMPLETED_TOKEN;
+  }
 
   KOKKOS_INLINE_FUNCTION
-  void completed_work( std::int32_t w ) const noexcept
-    {
-      Kokkos::memory_fence();
+  void completed_work(std::int32_t w) const noexcept {
+    Kokkos::memory_fence();
 
-      // Make sure the completed work function's memory accesses are flushed.
+    // Make sure the completed work function's memory accesses are flushed.
 
-      const std::int32_t N = m_graph.numRows();
+    const std::int32_t N = m_graph.numRows();
 
-      std::int32_t volatile * const count_queue = & m_queue[N] ;
+    std::int32_t volatile* const count_queue = &m_queue[N];
 
-      const std::int32_t B = m_graph.row_map(w);
-      const std::int32_t E = m_graph.row_map(w+1);
+    const std::int32_t B = m_graph.row_map(w);
+    const std::int32_t E = m_graph.row_map(w + 1);
 
-      for ( std::int32_t i = B ; i < E ; ++i ) {
-        const std::int32_t j = m_graph.entries(i);
-        if ( 1 == atomic_fetch_add(count_queue+j,-1) ) {
-          push_work(j);
-        }
+    for (std::int32_t i = B; i < E; ++i) {
+      const std::int32_t j = m_graph.entries(i);
+      if (1 == atomic_fetch_add(count_queue + j, -1)) {
+        push_work(j);
       }
     }
+  }
 
   struct TagInit {};
   struct TagCount {};
@@ -185,59 +181,55 @@ public:
    *  m_queue[2*N..2*N+1] = 0, begin/end hints for ready queue
    */
   KOKKOS_INLINE_FUNCTION
-  void operator()( const TagInit , int i ) const noexcept
-    { m_queue[i] = i < m_graph.numRows() ? END_TOKEN : 0 ; }
+  void operator()(const TagInit, int i) const noexcept {
+    m_queue[i] = i < m_graph.numRows() ? END_TOKEN : 0;
+  }
 
   KOKKOS_INLINE_FUNCTION
-  void operator()( const TagCount , int i ) const noexcept
-    {
-      std::int32_t volatile * const count_queue =
-        & m_queue[ m_graph.numRows() ] ;
+  void operator()(const TagCount, int i) const noexcept {
+    std::int32_t volatile* const count_queue = &m_queue[m_graph.numRows()];
 
-      atomic_increment( count_queue + m_graph.entries[i] );
-    }
+    atomic_increment(count_queue + m_graph.entries[i]);
+  }
 
   KOKKOS_INLINE_FUNCTION
-  void operator()( const TagReady , int w ) const noexcept
-    {
-      std::int32_t const * const count_queue =
-        & m_queue[ m_graph.numRows() ] ;
+  void operator()(const TagReady, int w) const noexcept {
+    std::int32_t const* const count_queue = &m_queue[m_graph.numRows()];
 
-      if ( 0 == count_queue[w] ) push_work(w);
-    }
+    if (0 == count_queue[w]) push_work(w);
+  }
 
-  WorkGraphPolicy( const graph_type & arg_graph )
-    : m_graph(arg_graph)
-    , m_queue( view_alloc( "queue" , WithoutInitializing )
-             , arg_graph.numRows() * 2 + 2 )
-  {
-    { // Initialize
-      using policy_type = RangePolicy<std::int32_t, execution_space, TagInit>;
+  WorkGraphPolicy(const graph_type& arg_graph)
+      : m_graph(arg_graph),
+        m_queue(view_alloc("queue", WithoutInitializing),
+                arg_graph.numRows() * 2 + 2) {
+    {  // Initialize
+      using policy_type  = RangePolicy<std::int32_t, execution_space, TagInit>;
       using closure_type = Kokkos::Impl::ParallelFor<self_type, policy_type>;
       const closure_type closure(*this, policy_type(0, m_queue.size()));
       closure.execute();
       execution_space().fence();
     }
 
-    { // execute-after counts
-      using policy_type = RangePolicy<std::int32_t, execution_space, TagCount>;
+    {  // execute-after counts
+      using policy_type  = RangePolicy<std::int32_t, execution_space, TagCount>;
       using closure_type = Kokkos::Impl::ParallelFor<self_type, policy_type>;
-      const closure_type closure(*this,policy_type(0,m_graph.entries.size()));
+      const closure_type closure(*this, policy_type(0, m_graph.entries.size()));
       closure.execute();
       execution_space().fence();
     }
 
-    { // Scheduling ready tasks
-      using policy_type = RangePolicy<std::int32_t, execution_space, TagReady>;
+    {  // Scheduling ready tasks
+      using policy_type  = RangePolicy<std::int32_t, execution_space, TagReady>;
       using closure_type = Kokkos::Impl::ParallelFor<self_type, policy_type>;
-      const closure_type closure(*this,policy_type(0,m_graph.numRows()));
+      const closure_type closure(*this, policy_type(0, m_graph.numRows()));
       closure.execute();
       execution_space().fence();
     }
   }
 };
 
-} // namespace Kokkos
+}  // namespace Kokkos
 
 #ifdef KOKKOS_ENABLE_SERIAL
 #include "impl/Kokkos_Serial_WorkGraphPolicy.hpp"
diff --git a/lib/kokkos/core/src/Kokkos_hwloc.hpp b/lib/kokkos/core/src/Kokkos_hwloc.hpp
index 064e5816a5..f343ef80b4 100644
--- a/lib/kokkos/core/src/Kokkos_hwloc.hpp
+++ b/lib/kokkos/core/src/Kokkos_hwloc.hpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -77,7 +78,8 @@ unsigned get_available_numa_count();
  */
 unsigned get_available_cores_per_numa();
 
-/** \brief  Query number of available "hard" threads per core; i.e., hyperthreads */
+/** \brief  Query number of available "hard" threads per core; i.e.,
+ * hyperthreads */
 unsigned get_available_threads_per_core();
 
 } /* namespace hwloc */
@@ -99,12 +101,10 @@ namespace hwloc {
  * Return 0 if asynchronous,
  * Return 1 if synchronous and threads_coord[0] is process core
  */
-unsigned thread_mapping( const char * const label ,
-                         const bool allow_async ,
-                         unsigned & thread_count ,
-                         unsigned & use_numa_count ,
-                         unsigned & use_cores_per_numa ,
-                         std::pair<unsigned,unsigned> threads_coord[] );
+unsigned thread_mapping(const char* const label, const bool allow_async,
+                        unsigned& thread_count, unsigned& use_numa_count,
+                        unsigned& use_cores_per_numa,
+                        std::pair<unsigned, unsigned> threads_coord[]);
 
 /** \brief  Query core-coordinate of the current thread
  *          with respect to the core_topology.
@@ -115,11 +115,10 @@ unsigned thread_mapping( const char * const label ,
  *  core_coordinate.first  < core_topology.first
  *  core_coordinate.second < core_topology.second
  */
-std::pair<unsigned,unsigned> get_this_thread_coordinate();
+std::pair<unsigned, unsigned> get_this_thread_coordinate();
 
 /** \brief  Bind the current thread to a core. */
-bool bind_this_thread( const std::pair<unsigned,unsigned> );
-
+bool bind_this_thread(const std::pair<unsigned, unsigned>);
 
 /** \brief Can hwloc bind threads? */
 bool can_bind_threads();
@@ -128,8 +127,8 @@ bool can_bind_threads();
  *          Set that entry to (~0,~0) and return the index.
  *          If binding fails return ~0.
  */
-unsigned bind_this_thread( const unsigned               coordinate_count ,
-                           std::pair<unsigned,unsigned> coordinate[] );
+unsigned bind_this_thread(const unsigned coordinate_count,
+                          std::pair<unsigned, unsigned> coordinate[]);
 
 /** \brief  Unbind the current thread back to the original process binding */
 bool unbind_this_thread();
@@ -141,4 +140,3 @@ bool unbind_this_thread();
 //----------------------------------------------------------------------------
 
 #endif /* #define KOKKOS_HWLOC_HPP */
-
diff --git a/lib/kokkos/core/src/Makefile b/lib/kokkos/core/src/Makefile
deleted file mode 100644
index ae8dc17510..0000000000
--- a/lib/kokkos/core/src/Makefile
+++ /dev/null
@@ -1,117 +0,0 @@
-ifndef KOKKOS_PATH
-  MAKEFILE_PATH := $(abspath $(lastword $(MAKEFILE_LIST)))
-  KOKKOS_PATH = $(subst Makefile,,$(MAKEFILE_PATH))../..
-endif
-
-PREFIX ?= /usr/local/lib/kokkos
-
-default: build-lib
-
-ifneq (,$(findstring Cuda,$(KOKKOS_DEVICES)))
-  CXX ?= $(KOKKOS_PATH)/bin/nvcc_wrapper
-else
-  CXX ?= g++
-endif
-
-CXXFLAGS ?= -O3
-LINK ?= $(CXX)
-LDFLAGS ?=
-CP = cp
-
-include $(KOKKOS_PATH)/Makefile.kokkos
-include $(KOKKOS_PATH)/core/src/Makefile.generate_header_lists
-include $(KOKKOS_PATH)/core/src/Makefile.generate_build_files
-
-CONDITIONAL_COPIES =
-
-ifeq ($(KOKKOS_INTERNAL_USE_CUDA), 1)
-  CONDITIONAL_COPIES += copy-cuda
-endif
-
-ifeq ($(KOKKOS_INTERNAL_USE_PTHREADS), 1)
-  CONDITIONAL_COPIES += copy-threads
-endif
-
-ifeq ($(KOKKOS_INTERNAL_USE_QTHREADS), 1)
-  CONDITIONAL_COPIES += copy-qthreads
-endif
-
-ifeq ($(KOKKOS_INTERNAL_USE_OPENMP), 1)
-  CONDITIONAL_COPIES += copy-openmp
-endif
-
-ifeq ($(KOKKOS_INTERNAL_USE_HPX), 1)
-  CONDITIONAL_COPIES += copy-hpx
-endif
-
-ifeq ($(KOKKOS_INTERNAL_USE_ROCM), 1)
-  CONDITIONAL_COPIES += copy-rocm
-endif
-
-ifeq ($(KOKKOS_OS),CYGWIN)
-  COPY_FLAG = -u
-endif
-ifeq ($(KOKKOS_OS),Linux)
-  COPY_FLAG = -u
-endif
-ifeq ($(KOKKOS_OS),Darwin)
-  COPY_FLAG = 
-  # If Homebrew coreutils is installed, its cp will have the -u option
-  ifneq ("$(wildcard /usr/local/opt/coreutils/libexec/gnubin/cp)","")
-    CP = /usr/local/opt/coreutils/libexec/gnubin/cp
-    COPY_FLAG = -u
-  endif
-endif
-
-ifeq ($(KOKKOS_DEBUG),"no")
-  KOKKOS_DEBUG_CMAKE = OFF
-else
-  KOKKOS_DEBUG_CMAKE = ON
-endif
-
-build-lib: $(KOKKOS_LINK_DEPENDS)
-
-mkdir:
-	mkdir -p $(PREFIX)
-	mkdir -p $(PREFIX)/bin
-	mkdir -p $(PREFIX)/include
-	mkdir -p $(PREFIX)/lib
-	mkdir -p $(PREFIX)/lib/pkgconfig
-	mkdir -p $(PREFIX)/include/impl
-
-copy-cuda: mkdir
-	mkdir -p $(PREFIX)/include/Cuda
-	$(CP) $(COPY_FLAG) $(KOKKOS_HEADERS_CUDA) $(PREFIX)/include/Cuda
-
-copy-threads: mkdir
-	mkdir -p $(PREFIX)/include/Threads
-	$(CP) $(COPY_FLAG) $(KOKKOS_HEADERS_THREADS) $(PREFIX)/include/Threads
-
-copy-qthreads: mkdir
-	mkdir -p $(PREFIX)/include/Qthreads
-	$(CP) $(COPY_FLAG) $(KOKKOS_HEADERS_QTHREADS) $(PREFIX)/include/Qthreads
-
-copy-openmp: mkdir
-	mkdir -p $(PREFIX)/include/OpenMP
-	$(CP) $(COPY_FLAG) $(KOKKOS_HEADERS_OPENMP) $(PREFIX)/include/OpenMP
-
-copy-hpx: mkdir
-	mkdir -p $(PREFIX)/include/HPX
-	$(CP) $(COPY_FLAG) $(KOKKOS_HEADERS_HPX) $(PREFIX)/include/HPX
-
-copy-rocm: mkdir
-	mkdir -p $(PREFIX)/include/ROCm
-	$(CP) $(COPY_FLAG) $(KOKKOS_HEADERS_ROCM) $(PREFIX)/include/ROCm
-
-install: mkdir $(CONDITIONAL_COPIES) build-lib generate_build_settings
-	$(CP) $(COPY_FLAG) $(NVCC_WRAPPER) $(PREFIX)/bin
-	$(CP) $(COPY_FLAG) $(KOKKOS_HEADERS_INCLUDE) $(PREFIX)/include
-	$(CP) $(COPY_FLAG) $(KOKKOS_HEADERS_INCLUDE_IMPL) $(PREFIX)/include/impl
-	$(CP) $(COPY_FLAG) $(KOKKOS_MAKEFILE)  $(PREFIX)
-	$(CP) $(COPY_FLAG) $(KOKKOS_CMAKEFILE)  $(PREFIX)
-	$(CP) $(COPY_FLAG) $(KOKKOS_PKGCONFIG)  $(PREFIX)/lib/pkgconfig
-	$(CP) $(COPY_FLAG) libkokkos.a $(PREFIX)/lib
-	$(CP) $(COPY_FLAG) $(KOKKOS_CONFIG_HEADER) $(PREFIX)/include
-
-clean: kokkos-clean
-	rm -f $(KOKKOS_MAKEFILE) $(KOKKOS_CMAKEFILE) $(KOKKOS_PKGCONFIG) 
diff --git a/lib/kokkos/core/src/Makefile.generate_build_files b/lib/kokkos/core/src/Makefile.generate_build_files
deleted file mode 100644
index 651b9d5fe9..0000000000
--- a/lib/kokkos/core/src/Makefile.generate_build_files
+++ /dev/null
@@ -1,125 +0,0 @@
-# This file is responsible for generating files which will be used 
-# by build system (make and cmake) in scenarios where the kokkos library
-# gets installed before building the app 
-
-# These files are generated by this makefile
-KOKKOS_MAKEFILE=Makefile.kokkos
-KOKKOS_CMAKEFILE=kokkos_generated_settings.cmake
-KOKKOS_PKGCONFIG=kokkos.pc
-
-ifeq ($(KOKKOS_DEBUG),"no")
-  KOKKOS_DEBUG_CMAKE = OFF
-else
-  KOKKOS_DEBUG_CMAKE = ON
-endif
-
-# Functions for generating makefile and cmake file
-# In calling these routines, do not put space after ,
-# e.g., $(call kokkos_append_var,KOKKOS_PATH,$(PREFIX))
-kokkos_append_makefile = echo $1 >> $(KOKKOS_MAKEFILE)
-kokkos_append_cmakefile = echo $1 >> $(KOKKOS_CMAKEFILE)
-
-kokkos_setvar_cmakefile = echo set\($1 $2\) >> $(KOKKOS_CMAKEFILE)
-kokkos_setlist_cmakefile = echo set\($1 \"$2\"\) >> $(KOKKOS_CMAKEFILE)
-
-kokkos_appendvar_makefile = echo $1 = $($(1)) >> $(KOKKOS_MAKEFILE)
-kokkos_appendvar2_makefile = echo $1 ?= $($(1)) >> $(KOKKOS_MAKEFILE)
-kokkos_appendvar_cmakefile = echo set\($1 $($(1)) CACHE $2 FORCE\) >> $(KOKKOS_CMAKEFILE)
-kokkos_appendval_makefile = echo $1 = $2 >> $(KOKKOS_MAKEFILE)
-kokkos_appendval_cmakefile = echo set\($1 $2 CACHE $3 FORCE\) >> $(KOKKOS_CMAKEFILE)
-kokkos_append_gmakevar_cmakefile = echo set\(KOKKOS_GMAKE_$(1:KOKKOS_%=%) \"$($(1))\" CACHE $2 FORCE\) >> $(KOKKOS_CMAKEFILE)
-
-kokkos_append_string = $(call kokkos_append_makefile,$1); $(call kokkos_append_cmakefile,$1)
-kokkos_append_var = $(call kokkos_appendvar_makefile,$1); $(call kokkos_appendvar_cmakefile,$1,$2)
-kokkos_append_var2 = $(call kokkos_appendvar2_makefile,$1); $(call kokkos_appendvar_cmakefile,$1,$2)
-kokkos_append_varval = $(call kokkos_appendval_makefile,$1,$2); $(call kokkos_appendval_cmakefile,$1,$2,$3)
-
-kokkos_fixup_sed_impl = sed \
-		-e 's|$(KOKKOS_PATH)/core/src|$(PREFIX)/include|g' \
-		-e 's|$(KOKKOS_PATH)/containers/src|$(PREFIX)/include|g' \
-		-e 's|$(KOKKOS_PATH)/algorithms/src|$(PREFIX)/include|g' \
-		-e 's|-L$(PWD)|-L$(PREFIX)/lib|g' \
-		-e 's|= libkokkos.a|= $(PREFIX)/lib/libkokkos.a|g' \
-		-e 's|= $(KOKKOS_CONFIG_HEADER)|= $(PREFIX)/include/$(KOKKOS_CONFIG_HEADER)|g' $1 \
-		> $1.tmp && mv -f $1.tmp $1
-
-$(KOKKOS_PKGCONFIG): $(KOKKOS_PATH)/core/src/$(KOKKOS_PKGCONFIG).in
-	@sed -e 's|@CMAKE_INSTALL_PREFIX@|$(PREFIX)|g' \
-	    -e 's|@KOKKOS_CXXFLAGS@|$(patsubst -I%,,$(KOKKOS_CXXFLAGS))|g' \
-	    -e 's|@KOKKOS_EXTRA_LIBS_LIST@|$(KOKKOS_EXTRA_LIBS)|g' \
-	    -e 's|@KOKKOS_LINK_FLAGS@|$(KOKKOS_LINK_FLAGS)|g' \
-	     $< > $@
-
-kokkos_fixup_sed = $(call kokkos_fixup_sed_impl,$(KOKKOS_MAKEFILE)); $(call kokkos_fixup_sed_impl,$(KOKKOS_CMAKEFILE))
-
-#This function should be used for variables whose values are different in GNU Make versus CMake,
-#especially lists which are delimited by commas in one case and semicolons in another
-kokkos_append_gmakevar = $(call kokkos_appendvar_makefile,$1); $(call kokkos_append_gmakevar_cmakefile,$1,$2)
-
-generate_build_settings: $(KOKKOS_CONFIG_HEADER) $(KOKKOS_PKGCONFIG)
-	@rm -f $(KOKKOS_MAKEFILE)
-	@rm -f $(KOKKOS_CMAKEFILE)
-	@$(call kokkos_append_string, "#Global Settings used to generate this library")
-	@$(call kokkos_append_varval,KOKKOS_PATH,$(KOKKOS_INSTALL_PATH),'FILEPATH "Kokkos installation path"')
-	@$(call kokkos_append_gmakevar,KOKKOS_DEVICES,'STRING "Kokkos devices list"')
-	@$(call kokkos_append_gmakevar,KOKKOS_ARCH,'STRING "Kokkos architecture flags"')
-	@$(call kokkos_appendvar_makefile,KOKKOS_DEBUG)
-	@$(call kokkos_appendvar_cmakefile,KOKKOS_DEBUG_CMAKE,'BOOL "Kokkos debug enabled ?"')
-	@$(call kokkos_append_gmakevar,KOKKOS_USE_TPLS,'STRING "Kokkos templates list"')
-	@$(call kokkos_append_var,KOKKOS_CXX_STANDARD,'STRING "Kokkos C++ standard"')
-	@$(call kokkos_append_gmakevar,KOKKOS_OPTIONS,'STRING "Kokkos options"')
-	@$(call kokkos_append_gmakevar,KOKKOS_CUDA_OPTIONS,'STRING "Kokkos Cuda options"')
-	@$(call kokkos_append_gmakevar,KOKKOS_TPL_INCLUDE_DIRS,'STRING "Kokkos TPL include directories"')
-	@$(call kokkos_append_gmakevar,KOKKOS_TPL_LIBRARY_DIRS,'STRING "Kokkos TPL library directories"')
-	@$(call kokkos_append_gmakevar,KOKKOS_TPL_LIBRARY_NAMES,'STRING "Kokkos TPL library names"')
-	@$(call kokkos_appendvar2,CXX,'KOKKOS C++ Compiler')
-	@$(call kokkos_append_cmakefile,"if(NOT DEFINED ENV{NVCC_WRAPPER})")
-	@$(call kokkos_append_var2,NVCC_WRAPPER,'FILEPATH "Path to command nvcc_wrapper"')
-	@$(call kokkos_append_cmakefile,"else()")
-	@$(call kokkos_append_cmakefile,'  set(NVCC_WRAPPER $$ENV{NVCC_WRAPPER} CACHE FILEPATH "Path to command nvcc_wrapper")')
-	@$(call kokkos_append_cmakefile,"endif()")
-	@$(call kokkos_append_string,"")
-	@$(call kokkos_append_string,"#Source and Header files of Kokkos relative to KOKKOS_PATH")
-	@$(call kokkos_append_var,KOKKOS_HEADERS,'STRING "Kokkos headers list"')
-	@$(call kokkos_append_var,KOKKOS_HEADERS_IMPL,'STRING "Kokkos headers impl list"')
-	@$(call kokkos_append_var,KOKKOS_HEADERS_CUDA,'STRING "Kokkos headers Cuda list"')
-	@$(call kokkos_append_var,KOKKOS_HEADERS_OPENMP,'STRING "Kokkos headers OpenMP list"')
-	@$(call kokkos_append_var,KOKKOS_HEADERS_HPX,'STRING "Kokkos headers HPX list"')
-	@$(call kokkos_append_var,KOKKOS_HEADERS_ROCM,'STRING "Kokkos headers ROCm list"')
-	@$(call kokkos_append_var,KOKKOS_HEADERS_THREADS,'STRING "Kokkos headers Threads list"')
-	@$(call kokkos_append_var,KOKKOS_HEADERS_QTHREADS,'STRING "Kokkos headers QThreads list"')
-	@$(call kokkos_append_string,"")
-	@$(call kokkos_append_string,"#Variables used in application Makefiles")
-	@$(call kokkos_append_var,KOKKOS_OS,'STRING ""')  # This was not in original cmake gen
-	@$(call kokkos_append_var,KOKKOS_CPP_DEPENDS,'STRING ""')
-	@$(call kokkos_append_var,KOKKOS_LINK_DEPENDS,'STRING ""')
-	@$(call kokkos_append_var,KOKKOS_CXXFLAGS,'STRING ""')
-	@$(call kokkos_append_var,KOKKOS_CPPFLAGS,'STRING ""')
-	@$(call kokkos_append_var,KOKKOS_LDFLAGS,'STRING ""')
-	@$(call kokkos_append_var,KOKKOS_CXXLDFLAGS,'STRING ""')
-	@$(call kokkos_append_var,KOKKOS_LIBS,'STRING ""')
-	@$(call kokkos_append_var,KOKKOS_EXTRA_LIBS,'STRING ""')
-	@$(call kokkos_append_var,KOKKOS_LINK_FLAGS,'STRING "extra flags to the link step (e.g. OpenMP)"')
-	@$(call kokkos_append_string,"")
-	@$(call kokkos_append_string,"#Internal settings which need to propagated for Kokkos examples")
-	@$(call kokkos_append_var,KOKKOS_INTERNAL_USE_CUDA,'STRING ""')
-	@$(call kokkos_append_var,KOKKOS_INTERNAL_USE_OPENMP,'STRING ""')
-	@$(call kokkos_append_var,KOKKOS_INTERNAL_USE_HPX,'STRING ""')
-	@$(call kokkos_append_var,KOKKOS_INTERNAL_USE_PTHREADS,'STRING ""')
-	@$(call kokkos_append_var,KOKKOS_INTERNAL_USE_SERIAL,'STRING ""')
-	@$(call kokkos_append_var,KOKKOS_INTERNAL_USE_ROCM,'STRING ""')
-	@$(call kokkos_append_var,KOKKOS_INTERNAL_USE_HPX,'STRING ""')
-	@$(call kokkos_append_var,KOKKOS_INTERNAL_USE_QTHREADS,'STRING ""') # Not in original cmake gen
-	@$(call kokkos_append_cmakefile "mark_as_advanced(KOKKOS_HEADERS KOKKOS_SRC KOKKOS_INTERNAL_USE_CUDA KOKKOS_INTERNAL_USE_OPENMP KOKKOS_INTERNAL_USE_HPX KOKKOS_INTERNAL_USE_PTHREADS KOKKOS_INTERNAL_USE_SERIAL)")
-	@$(call kokkos_append_makefile,"")
-	@$(call kokkos_append_makefile,"#Fake kokkos-clean target")
-	@$(call kokkos_append_makefile,"kokkos-clean:")
-	@$(call kokkos_append_makefile,"")
-	@$(call kokkos_fixup_sed)
-	@$(call kokkos_append_var,KOKKOS_SRC,'STRING "Kokkos source list"')
-	@$(call kokkos_setvar_cmakefile,KOKKOS_CXX_FLAGS,$(KOKKOS_CXXFLAGS))
-	@$(call kokkos_setvar_cmakefile,KOKKOS_CPP_FLAGS,$(KOKKOS_CPPFLAGS))
-	@$(call kokkos_setvar_cmakefile,KOKKOS_LD_FLAGS,$(KOKKOS_LDFLAGS))
-	@$(call kokkos_setlist_cmakefile,KOKKOS_LIBS_LIST,$(KOKKOS_LIBS))
-	@$(call kokkos_setlist_cmakefile,KOKKOS_EXTRA_LIBS_LIST,$(KOKKOS_EXTRA_LIBS))
-	@$(call kokkos_setvar_cmakefile,KOKKOS_LINK_FLAGS,$(KOKKOS_LINK_FLAGS))
diff --git a/lib/kokkos/core/src/Makefile.generate_header_lists b/lib/kokkos/core/src/Makefile.generate_header_lists
deleted file mode 100644
index afbefb3806..0000000000
--- a/lib/kokkos/core/src/Makefile.generate_header_lists
+++ /dev/null
@@ -1,32 +0,0 @@
-# Build a List of Header Files
-
-KOKKOS_HEADERS_INCLUDE       = $(wildcard $(KOKKOS_PATH)/core/src/*.hpp)
-KOKKOS_HEADERS_INCLUDE_IMPL  = $(wildcard $(KOKKOS_PATH)/core/src/impl/*.hpp)
-KOKKOS_HEADERS_INCLUDE      += $(wildcard $(KOKKOS_PATH)/containers/src/*.hpp)
-KOKKOS_HEADERS_INCLUDE_IMPL += $(wildcard $(KOKKOS_PATH)/containers/src/impl/*.hpp)
-KOKKOS_HEADERS_INCLUDE      += $(wildcard $(KOKKOS_PATH)/algorithms/src/*.hpp)
-
-ifeq ($(KOKKOS_INTERNAL_USE_CUDA), 1)
-  KOKKOS_HEADERS_CUDA += $(wildcard $(KOKKOS_PATH)/core/src/Cuda/*.hpp)
-endif
-
-ifeq ($(KOKKOS_INTERNAL_USE_PTHREADS), 1)
-  KOKKOS_HEADERS_THREADS += $(wildcard $(KOKKOS_PATH)/core/src/Threads/*.hpp)
-endif
-
-ifeq ($(KOKKOS_INTERNAL_USE_QTHREADS), 1)
-  KOKKOS_HEADERS_QTHREADS += $(wildcard $(KOKKOS_PATH)/core/src/Qthreads/*.hpp)
-endif
-
-ifeq ($(KOKKOS_INTERNAL_USE_OPENMP), 1)
-  KOKKOS_HEADERS_OPENMP += $(wildcard $(KOKKOS_PATH)/core/src/OpenMP/*.hpp)
-endif
-
-ifeq ($(KOKKOS_INTERNAL_USE_HPX), 1)
-  KOKKOS_HEADERS_HPX += $(wildcard $(KOKKOS_PATH)/core/src/HPX/*.hpp)
-endif
-
-ifeq ($(KOKKOS_INTERNAL_USE_ROCM), 1)
-  KOKKOS_HEADERS_ROCM += $(wildcard $(KOKKOS_PATH)/core/src/ROCm/*.hpp)
-endif
-
diff --git a/lib/kokkos/core/src/OpenMP/Kokkos_OpenMP_Exec.cpp b/lib/kokkos/core/src/OpenMP/Kokkos_OpenMP_Exec.cpp
index 1946c10741..d152fd62dc 100644
--- a/lib/kokkos/core/src/OpenMP/Kokkos_OpenMP_Exec.cpp
+++ b/lib/kokkos/core/src/OpenMP/Kokkos_OpenMP_Exec.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -42,7 +43,7 @@
 */
 
 #include <Kokkos_Macros.hpp>
-#if defined( KOKKOS_ENABLE_OPENMP )
+#if defined(KOKKOS_ENABLE_OPENMP)
 
 #include <cstdio>
 #include <cstdlib>
@@ -57,30 +58,25 @@
 #include <impl/Kokkos_CPUDiscovery.hpp>
 #include <impl/Kokkos_Profiling_Interface.hpp>
 
-
 namespace Kokkos {
 namespace Impl {
 
 int g_openmp_hardware_max_threads = 1;
 
-__thread int t_openmp_hardware_id = 0;
-__thread Impl::OpenMPExec * t_openmp_instance = nullptr;
+__thread int t_openmp_hardware_id            = 0;
+__thread Impl::OpenMPExec *t_openmp_instance = nullptr;
 
-void OpenMPExec::validate_partition( const int nthreads
-                                   , int & num_partitions
-                                   , int & partition_size
-                                  )
-{
+void OpenMPExec::validate_partition(const int nthreads, int &num_partitions,
+                                    int &partition_size) {
   if (nthreads == 1) {
     num_partitions = 1;
     partition_size = 1;
-  }
-  else if( num_partitions < 1 && partition_size < 1) {
+  } else if (num_partitions < 1 && partition_size < 1) {
     int idle = nthreads;
-    for (int np = 2; np <= nthreads ; ++np) {
-      for (int ps = 1; ps <= nthreads/np; ++ps) {
-        if (nthreads - np*ps < idle) {
-          idle = nthreads - np*ps;
+    for (int np = 2; np <= nthreads; ++np) {
+      for (int ps = 1; ps <= nthreads / np; ++ps) {
+        if (nthreads - np * ps < idle) {
+          idle           = nthreads - np * ps;
           num_partitions = np;
           partition_size = ps;
         }
@@ -89,34 +85,28 @@ void OpenMPExec::validate_partition( const int nthreads
         }
       }
     }
-  }
-  else if( num_partitions < 1 && partition_size > 0 ) {
-    if ( partition_size <= nthreads ) {
+  } else if (num_partitions < 1 && partition_size > 0) {
+    if (partition_size <= nthreads) {
       num_partitions = nthreads / partition_size;
-    }
-    else {
+    } else {
       num_partitions = 1;
       partition_size = nthreads;
     }
-  }
-  else if( num_partitions > 0 && partition_size < 1 ) {
-    if ( num_partitions <= nthreads ) {
+  } else if (num_partitions > 0 && partition_size < 1) {
+    if (num_partitions <= nthreads) {
       partition_size = nthreads / num_partitions;
-    }
-    else {
+    } else {
       num_partitions = nthreads;
       partition_size = 1;
     }
-  }
-  else if ( num_partitions * partition_size > nthreads ) {
-    int idle = nthreads;
+  } else if (num_partitions * partition_size > nthreads) {
+    int idle     = nthreads;
     const int NP = num_partitions;
     const int PS = partition_size;
     for (int np = NP; np > 0; --np) {
       for (int ps = PS; ps > 0; --ps) {
-        if (  (np*ps <= nthreads)
-           && (nthreads - np*ps < idle) ) {
-          idle = nthreads - np*ps;
+        if ((np * ps <= nthreads) && (nthreads - np * ps < idle)) {
+          idle           = nthreads - np * ps;
           num_partitions = np;
           partition_size = ps;
         }
@@ -126,22 +116,18 @@ void OpenMPExec::validate_partition( const int nthreads
       }
     }
   }
-
 }
 
-void OpenMPExec::verify_is_master( const char * const label )
-{
-  if ( !t_openmp_instance )
-  {
-    std::string msg( label );
-    msg.append( " ERROR: in parallel or not initialized" );
-    Kokkos::Impl::throw_runtime_exception( msg );
+void OpenMPExec::verify_is_master(const char *const label) {
+  if (!t_openmp_instance) {
+    std::string msg(label);
+    msg.append(" ERROR: in parallel or not initialized");
+    Kokkos::Impl::throw_runtime_exception(msg);
   }
 }
 
-
-} // namespace Impl
-} // namespace Kokkos
+}  // namespace Impl
+}  // namespace Kokkos
 
 //----------------------------------------------------------------------------
 //----------------------------------------------------------------------------
@@ -149,109 +135,113 @@ void OpenMPExec::verify_is_master( const char * const label )
 namespace Kokkos {
 namespace Impl {
 
-void OpenMPExec::clear_thread_data()
-{
+void OpenMPExec::clear_thread_data() {
   const size_t member_bytes =
-    sizeof(int64_t) *
-    HostThreadTeamData::align_to_int64( sizeof(HostThreadTeamData) );
+      sizeof(int64_t) *
+      HostThreadTeamData::align_to_int64(sizeof(HostThreadTeamData));
 
   const int old_alloc_bytes =
-    m_pool[0] ? ( member_bytes + m_pool[0]->scratch_bytes() ) : 0 ;
+      m_pool[0] ? (member_bytes + m_pool[0]->scratch_bytes()) : 0;
 
-  OpenMP::memory_space space ;
+  OpenMP::memory_space space;
 
-  #pragma omp parallel num_threads( m_pool_size )
+#pragma omp parallel num_threads(m_pool_size)
   {
     const int rank = omp_get_thread_num();
 
-    if ( 0 != m_pool[rank] ) {
-
+    if (0 != m_pool[rank]) {
       m_pool[rank]->disband_pool();
 
-      space.deallocate( m_pool[rank] , old_alloc_bytes );
+      space.deallocate(m_pool[rank], old_alloc_bytes);
 
-      m_pool[rank] = 0 ;
+      m_pool[rank] = 0;
     }
   }
-/* END #pragma omp parallel */
+  /* END #pragma omp parallel */
 }
 
-void OpenMPExec::resize_thread_data( size_t pool_reduce_bytes
-                                   , size_t team_reduce_bytes
-                                   , size_t team_shared_bytes
-                                   , size_t thread_local_bytes )
-{
+void OpenMPExec::resize_thread_data(size_t pool_reduce_bytes,
+                                    size_t team_reduce_bytes,
+                                    size_t team_shared_bytes,
+                                    size_t thread_local_bytes) {
   const size_t member_bytes =
-    sizeof(int64_t) *
-    HostThreadTeamData::align_to_int64( sizeof(HostThreadTeamData) );
+      sizeof(int64_t) *
+      HostThreadTeamData::align_to_int64(sizeof(HostThreadTeamData));
 
-  HostThreadTeamData * root = m_pool[0] ;
+  HostThreadTeamData *root = m_pool[0];
 
-  const size_t old_pool_reduce  = root ? root->pool_reduce_bytes() : 0 ;
-  const size_t old_team_reduce  = root ? root->team_reduce_bytes() : 0 ;
-  const size_t old_team_shared  = root ? root->team_shared_bytes() : 0 ;
-  const size_t old_thread_local = root ? root->thread_local_bytes() : 0 ;
-  const size_t old_alloc_bytes  = root ? ( member_bytes + root->scratch_bytes() ) : 0 ;
+  const size_t old_pool_reduce  = root ? root->pool_reduce_bytes() : 0;
+  const size_t old_team_reduce  = root ? root->team_reduce_bytes() : 0;
+  const size_t old_team_shared  = root ? root->team_shared_bytes() : 0;
+  const size_t old_thread_local = root ? root->thread_local_bytes() : 0;
+  const size_t old_alloc_bytes =
+      root ? (member_bytes + root->scratch_bytes()) : 0;
 
   // Allocate if any of the old allocation is tool small:
 
-  const bool allocate = ( old_pool_reduce  < pool_reduce_bytes ) ||
-                        ( old_team_reduce  < team_reduce_bytes ) ||
-                        ( old_team_shared  < team_shared_bytes ) ||
-                        ( old_thread_local < thread_local_bytes );
+  const bool allocate = (old_pool_reduce < pool_reduce_bytes) ||
+                        (old_team_reduce < team_reduce_bytes) ||
+                        (old_team_shared < team_shared_bytes) ||
+                        (old_thread_local < thread_local_bytes);
 
-  if ( allocate ) {
-
-    if ( pool_reduce_bytes < old_pool_reduce ) { pool_reduce_bytes = old_pool_reduce ; }
-    if ( team_reduce_bytes < old_team_reduce ) { team_reduce_bytes = old_team_reduce ; }
-    if ( team_shared_bytes < old_team_shared ) { team_shared_bytes = old_team_shared ; }
-    if ( thread_local_bytes < old_thread_local ) { thread_local_bytes = old_thread_local ; }
+  if (allocate) {
+    if (pool_reduce_bytes < old_pool_reduce) {
+      pool_reduce_bytes = old_pool_reduce;
+    }
+    if (team_reduce_bytes < old_team_reduce) {
+      team_reduce_bytes = old_team_reduce;
+    }
+    if (team_shared_bytes < old_team_shared) {
+      team_shared_bytes = old_team_shared;
+    }
+    if (thread_local_bytes < old_thread_local) {
+      thread_local_bytes = old_thread_local;
+    }
 
     const size_t alloc_bytes =
-      member_bytes +
-      HostThreadTeamData::scratch_size( pool_reduce_bytes
-                                      , team_reduce_bytes
-                                      , team_shared_bytes
-                                      , thread_local_bytes );
+        member_bytes +
+        HostThreadTeamData::scratch_size(pool_reduce_bytes, team_reduce_bytes,
+                                         team_shared_bytes, thread_local_bytes);
 
-    OpenMP::memory_space space ;
+    OpenMP::memory_space space;
 
     memory_fence();
 
-    #pragma omp parallel num_threads(m_pool_size)
+#pragma omp parallel num_threads(m_pool_size)
     {
       const int rank = omp_get_thread_num();
 
-      if ( 0 != m_pool[rank] ) {
-
+      if (0 != m_pool[rank]) {
         m_pool[rank]->disband_pool();
 
-        space.deallocate( m_pool[rank] , old_alloc_bytes );
+        space.deallocate(m_pool[rank], old_alloc_bytes);
       }
 
-      void * const ptr = space.allocate( alloc_bytes );
+      void *ptr = nullptr;
+      try {
+        ptr = space.allocate(alloc_bytes);
+      } catch (
+          Kokkos::Experimental::RawMemoryAllocationFailure const &failure) {
+        // For now, just rethrow the error message the existing way
+        Kokkos::Impl::throw_runtime_exception(failure.get_error_message());
+      }
 
-      m_pool[ rank ] = new( ptr ) HostThreadTeamData();
+      m_pool[rank] = new (ptr) HostThreadTeamData();
 
-      m_pool[ rank ]->
-        scratch_assign( ((char *)ptr) + member_bytes
-                      , alloc_bytes
-                      , pool_reduce_bytes
-                      , team_reduce_bytes
-                      , team_shared_bytes
-                      , thread_local_bytes
-                      );
+      m_pool[rank]->scratch_assign(((char *)ptr) + member_bytes, alloc_bytes,
+                                   pool_reduce_bytes, team_reduce_bytes,
+                                   team_shared_bytes, thread_local_bytes);
 
       memory_fence();
     }
-/* END #pragma omp parallel */
+    /* END #pragma omp parallel */
 
-    HostThreadTeamData::organize_pool( m_pool , m_pool_size );
+    HostThreadTeamData::organize_pool(m_pool, m_pool_size);
   }
 }
 
-} // namespace Impl
-} // namespace Kokkos
+}  // namespace Impl
+}  // namespace Kokkos
 
 //----------------------------------------------------------------------------
 //----------------------------------------------------------------------------
@@ -269,46 +259,49 @@ int OpenMP::impl_get_current_max_threads() noexcept
   // Using omp_get_max_threads(); is problematic in conjunction with
   // Hwloc on Intel (essentially an initial call to the OpenMP runtime
   // without a parallel region before will set a process mask for a single core
-  // The runtime will than bind threads for a parallel region to other cores on the
-  // entering the first parallel region and make the process mask the aggregate of
-  // the thread masks. The intend seems to be to make serial code run fast, if you
-  // compile with OpenMP enabled but don't actually use parallel regions or so
-  // static int omp_max_threads = omp_get_max_threads();
+  // The runtime will than bind threads for a parallel region to other cores on
+  // the entering the first parallel region and make the process mask the
+  // aggregate of the thread masks. The intend seems to be to make serial code
+  // run fast, if you compile with OpenMP enabled but don't actually use
+  // parallel regions or so static int omp_max_threads = omp_get_max_threads();
 
   int count = 0;
-  #pragma omp parallel
+#pragma omp parallel
   {
-    #pragma omp atomic
-     ++count;
+#pragma omp atomic
+    ++count;
   }
   return count;
 }
 
 #ifdef KOKKOS_ENABLE_DEPRECATED_CODE
-void OpenMP::initialize( int thread_count )
+void OpenMP::initialize(int thread_count)
 #else
-void OpenMP::impl_initialize( int thread_count )
+void OpenMP::impl_initialize(int thread_count)
 #endif
 {
-  if ( omp_in_parallel() ) {
+  if (omp_in_parallel()) {
     std::string msg("Kokkos::OpenMP::initialize ERROR : in parallel");
     Kokkos::Impl::throw_runtime_exception(msg);
   }
 
-  if ( Impl::t_openmp_instance )
-  {
+  if (Impl::t_openmp_instance) {
     finalize();
   }
 
   {
-    if ( Kokkos::show_warnings() && nullptr == std::getenv("OMP_PROC_BIND") ) {
-      printf("Kokkos::OpenMP::initialize WARNING: OMP_PROC_BIND environment variable not set\n");
-      printf("  In general, for best performance with OpenMP 4.0 or better set OMP_PROC_BIND=spread and OMP_PLACES=threads\n");
+    if (Kokkos::show_warnings() && nullptr == std::getenv("OMP_PROC_BIND")) {
+      printf(
+          "Kokkos::OpenMP::initialize WARNING: OMP_PROC_BIND environment "
+          "variable not set\n");
+      printf(
+          "  In general, for best performance with OpenMP 4.0 or better set "
+          "OMP_PROC_BIND=spread and OMP_PLACES=threads\n");
       printf("  For best performance with OpenMP 3.1 set OMP_PROC_BIND=true\n");
       printf("  For unit testing set OMP_PROC_BIND=false\n");
     }
 
-    OpenMP::memory_space space ;
+    OpenMP::memory_space space;
 
     // Before any other call to OMP query the maximum number of threads
     // and save the value for re-initialization unit testing.
@@ -321,72 +314,87 @@ void OpenMP::impl_initialize( int thread_count )
 
     int process_num_threads = Impl::g_openmp_hardware_max_threads;
 
-    if ( Kokkos::hwloc::available() ) {
-      process_num_threads = Kokkos::hwloc::get_available_numa_count()
-                          * Kokkos::hwloc::get_available_cores_per_numa()
-                          * Kokkos::hwloc::get_available_threads_per_core();
+    if (Kokkos::hwloc::available()) {
+      process_num_threads = Kokkos::hwloc::get_available_numa_count() *
+                            Kokkos::hwloc::get_available_cores_per_numa() *
+                            Kokkos::hwloc::get_available_threads_per_core();
     }
 
     // if thread_count  < 0, use g_openmp_hardware_max_threads;
-    // if thread_count == 0, set g_openmp_hardware_max_threads to process_num_threads
-    // if thread_count  > 0, set g_openmp_hardware_max_threads to thread_count
-    if (thread_count < 0 ) {
+    // if thread_count == 0, set g_openmp_hardware_max_threads to
+    // process_num_threads if thread_count  > 0, set
+    // g_openmp_hardware_max_threads to thread_count
+    if (thread_count < 0) {
       thread_count = Impl::g_openmp_hardware_max_threads;
-    }
-    else if( thread_count == 0 && Impl::g_openmp_hardware_max_threads != process_num_threads ) {
+    } else if (thread_count == 0 &&
+               Impl::g_openmp_hardware_max_threads != process_num_threads) {
       Impl::g_openmp_hardware_max_threads = process_num_threads;
       omp_set_num_threads(Impl::g_openmp_hardware_max_threads);
-    }
-    else {
-      if( Kokkos::show_warnings() && thread_count > process_num_threads ) {
-        printf( "Kokkos::OpenMP::initialize WARNING: You are likely oversubscribing your CPU cores.\n");
-        printf( "  process threads available : %3d,  requested thread : %3d\n", process_num_threads, thread_count );
+    } else {
+      if (Kokkos::show_warnings() && thread_count > process_num_threads) {
+        printf(
+            "Kokkos::OpenMP::initialize WARNING: You are likely "
+            "oversubscribing your CPU cores.\n");
+        printf("  process threads available : %3d,  requested thread : %3d\n",
+               process_num_threads, thread_count);
       }
       Impl::g_openmp_hardware_max_threads = thread_count;
       omp_set_num_threads(Impl::g_openmp_hardware_max_threads);
     }
 
-    // setup thread local
-    #pragma omp parallel num_threads(Impl::g_openmp_hardware_max_threads)
+// setup thread local
+#pragma omp parallel num_threads(Impl::g_openmp_hardware_max_threads)
     {
-      Impl::t_openmp_instance = nullptr;
+      Impl::t_openmp_instance    = nullptr;
       Impl::t_openmp_hardware_id = omp_get_thread_num();
-      Impl::SharedAllocationRecord< void, void >::tracking_enable();
+      Impl::SharedAllocationRecord<void, void>::tracking_enable();
     }
 
-    void * const ptr = space.allocate( sizeof(Impl::OpenMPExec) );
+    void *ptr = nullptr;
+    try {
+      ptr = space.allocate(sizeof(Impl::OpenMPExec));
+    } catch (Kokkos::Experimental::RawMemoryAllocationFailure const &f) {
+      // For now, just rethrow the error message the existing way
+      Kokkos::Impl::throw_runtime_exception(f.get_error_message());
+    }
 
-    Impl::t_openmp_instance = new (ptr) Impl::OpenMPExec( Impl::g_openmp_hardware_max_threads );
+    Impl::t_openmp_instance =
+        new (ptr) Impl::OpenMPExec(Impl::g_openmp_hardware_max_threads);
 
     // New, unified host thread team data:
     {
-      size_t pool_reduce_bytes  =   32 * thread_count ;
-      size_t team_reduce_bytes  =   32 * thread_count ;
-      size_t team_shared_bytes  = 1024 * thread_count ;
-      size_t thread_local_bytes = 1024 ;
+      size_t pool_reduce_bytes  = 32 * thread_count;
+      size_t team_reduce_bytes  = 32 * thread_count;
+      size_t team_shared_bytes  = 1024 * thread_count;
+      size_t thread_local_bytes = 1024;
 
-      Impl::t_openmp_instance->resize_thread_data( pool_reduce_bytes
-                                                 , team_reduce_bytes
-                                                 , team_shared_bytes
-                                                 , thread_local_bytes
-                                                 );
+      Impl::t_openmp_instance->resize_thread_data(
+          pool_reduce_bytes, team_reduce_bytes, team_shared_bytes,
+          thread_local_bytes);
     }
   }
 
-
   // Check for over-subscription
-  if( Kokkos::show_warnings() && (Impl::mpi_ranks_per_node() * long(thread_count) > Impl::processors_per_node()) ) {
-    std::cerr << "Kokkos::OpenMP::initialize WARNING: You are likely oversubscribing your CPU cores." << std::endl;
-    std::cerr << "                                    Detected: " << Impl::processors_per_node() << " cores per node." << std::endl;
-    std::cerr << "                                    Detected: " << Impl::mpi_ranks_per_node() << " MPI_ranks per node." << std::endl;
-    std::cerr << "                                    Requested: " << thread_count << " threads per process." << std::endl;
+  if (Kokkos::show_warnings() &&
+      (Impl::mpi_ranks_per_node() * long(thread_count) >
+       Impl::processors_per_node())) {
+    std::cerr << "Kokkos::OpenMP::initialize WARNING: You are likely "
+                 "oversubscribing your CPU cores."
+              << std::endl;
+    std::cerr << "                                    Detected: "
+              << Impl::processors_per_node() << " cores per node." << std::endl;
+    std::cerr << "                                    Detected: "
+              << Impl::mpi_ranks_per_node() << " MPI_ranks per node."
+              << std::endl;
+    std::cerr << "                                    Requested: "
+              << thread_count << " threads per process." << std::endl;
   }
   // Init the array for used for arbitrarily sized atomics
   Impl::init_lock_array_host_space();
 
-  #if defined(KOKKOS_ENABLE_DEPRECATED_CODE) && defined(KOKKOS_ENABLE_PROFILING)
+#if defined(KOKKOS_ENABLE_DEPRECATED_CODE) && defined(KOKKOS_ENABLE_PROFILING)
   Kokkos::Profiling::initialize();
-  #endif
+#endif
 }
 
 //----------------------------------------------------------------------------
@@ -397,80 +405,72 @@ void OpenMP::finalize()
 void OpenMP::impl_finalize()
 #endif
 {
-  if ( omp_in_parallel() )
-  {
+  if (omp_in_parallel()) {
     std::string msg("Kokkos::OpenMP::finalize ERROR ");
-    if( !Impl::t_openmp_instance ) msg.append(": not initialized");
-    if( omp_in_parallel() ) msg.append(": in parallel");
+    if (!Impl::t_openmp_instance) msg.append(": not initialized");
+    if (omp_in_parallel()) msg.append(": in parallel");
     Kokkos::Impl::throw_runtime_exception(msg);
   }
 
-  if ( Impl::t_openmp_instance ) {
+  if (Impl::t_openmp_instance) {
     // Silence Cuda Warning
-    const int nthreads = Impl::t_openmp_instance->m_pool_size <= Impl::g_openmp_hardware_max_threads
-                       ? Impl::g_openmp_hardware_max_threads
-                       : Impl::t_openmp_instance->m_pool_size;
-    (void) nthreads;
+    const int nthreads = Impl::t_openmp_instance->m_pool_size <=
+                                 Impl::g_openmp_hardware_max_threads
+                             ? Impl::g_openmp_hardware_max_threads
+                             : Impl::t_openmp_instance->m_pool_size;
+    (void)nthreads;
 
-    using Exec = Impl::OpenMPExec;
-    Exec * instance = Impl::t_openmp_instance;
+    using Exec     = Impl::OpenMPExec;
+    Exec *instance = Impl::t_openmp_instance;
     instance->~Exec();
 
     OpenMP::memory_space space;
-    space.deallocate( instance, sizeof(Exec) );
+    space.deallocate(instance, sizeof(Exec));
 
-    #pragma omp parallel num_threads(nthreads)
+#pragma omp parallel num_threads(nthreads)
     {
       Impl::t_openmp_hardware_id = 0;
       Impl::t_openmp_instance    = nullptr;
-      Impl::SharedAllocationRecord< void, void >::tracking_disable();
+      Impl::SharedAllocationRecord<void, void>::tracking_disable();
     }
 
     // allow main thread to track
-    Impl::SharedAllocationRecord< void, void >::tracking_enable();
+    Impl::SharedAllocationRecord<void, void>::tracking_enable();
 
     Impl::g_openmp_hardware_max_threads = 1;
   }
 
-  #if defined(KOKKOS_ENABLE_PROFILING)
-    Kokkos::Profiling::finalize();
-  #endif
+#if defined(KOKKOS_ENABLE_PROFILING)
+  Kokkos::Profiling::finalize();
+#endif
 }
 
 //----------------------------------------------------------------------------
 
-void OpenMP::print_configuration( std::ostream & s , const bool verbose )
-{
-  s << "Kokkos::OpenMP" ;
+void OpenMP::print_configuration(std::ostream &s, const bool verbose) {
+  s << "Kokkos::OpenMP";
 
-  const bool is_initialized =  Impl::t_openmp_instance != nullptr;
+  const bool is_initialized = Impl::t_openmp_instance != nullptr;
 
-  if ( is_initialized ) {
-    Impl::OpenMPExec::verify_is_master( "OpenMP::print_configuration" );
+  if (is_initialized) {
+    Impl::OpenMPExec::verify_is_master("OpenMP::print_configuration");
 
     const int numa_count      = 1;
     const int core_per_numa   = Impl::g_openmp_hardware_max_threads;
     const int thread_per_core = 1;
 
-    s << " thread_pool_topology[ " << numa_count
-      << " x " << core_per_numa
-      << " x " << thread_per_core
-      << " ]"
-      << std::endl ;
-  }
-  else {
-    s << " not initialized" << std::endl ;
+    s << " thread_pool_topology[ " << numa_count << " x " << core_per_numa
+      << " x " << thread_per_core << " ]" << std::endl;
+  } else {
+    s << " not initialized" << std::endl;
   }
 }
 
-std::vector<OpenMP> OpenMP::partition(...)
-{ return std::vector<OpenMP>(1); }
+std::vector<OpenMP> OpenMP::partition(...) { return std::vector<OpenMP>(1); }
 
 OpenMP OpenMP::create_instance(...) { return OpenMP(); }
 
-int OpenMP::concurrency() {
-  return Impl::g_openmp_hardware_max_threads;
-}
+int OpenMP::concurrency() { return Impl::g_openmp_hardware_max_threads; }
 
 #ifndef KOKKOS_ENABLE_DEPRECATED_CODE
 void OpenMP::fence() const {}
@@ -478,16 +478,14 @@ void OpenMP::fence() const {}
 
 #ifdef KOKKOS_ENABLE_DEPRECATED_CODE
 
-void OpenMP::initialize( int thread_count , int, int )
-{
+void OpenMP::initialize(int thread_count, int, int) {
   initialize(thread_count);
 }
 
 #endif
 
-} // namespace Kokkos
+}  // namespace Kokkos
 
 #else
 void KOKKOS_CORE_SRC_OPENMP_EXEC_PREVENT_LINK_ERROR() {}
-#endif //KOKKOS_ENABLE_OPENMP
-
+#endif  // KOKKOS_ENABLE_OPENMP
diff --git a/lib/kokkos/core/src/OpenMP/Kokkos_OpenMP_Exec.hpp b/lib/kokkos/core/src/OpenMP/Kokkos_OpenMP_Exec.hpp
index 5178199ac2..6a8773a58f 100644
--- a/lib/kokkos/core/src/OpenMP/Kokkos_OpenMP_Exec.hpp
+++ b/lib/kokkos/core/src/OpenMP/Kokkos_OpenMP_Exec.hpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -45,10 +46,11 @@
 #define KOKKOS_OPENMPEXEC_HPP
 
 #include <Kokkos_Macros.hpp>
-#if defined( KOKKOS_ENABLE_OPENMP )
+#if defined(KOKKOS_ENABLE_OPENMP)
 
 #if !defined(_OPENMP) && !defined(__CUDA_ARCH__)
-#error "You enabled Kokkos OpenMP support without enabling OpenMP in the compiler!"
+#error \
+    "You enabled Kokkos OpenMP support without enabling OpenMP in the compiler!"
 #endif
 
 #include <Kokkos_OpenMP.hpp>
@@ -69,105 +71,95 @@
 //----------------------------------------------------------------------------
 //----------------------------------------------------------------------------
 
-namespace Kokkos { namespace Impl {
+namespace Kokkos {
+namespace Impl {
 
 class OpenMPExec;
 
 extern int g_openmp_hardware_max_threads;
 
 extern __thread int t_openmp_hardware_id;
-extern __thread OpenMPExec * t_openmp_instance;
+extern __thread OpenMPExec* t_openmp_instance;
 
 //----------------------------------------------------------------------------
 /** \brief  Data for OpenMP thread execution */
 
 class OpenMPExec {
-public:
-
-  friend class Kokkos::OpenMP ;
+ public:
+  friend class Kokkos::OpenMP;
 
   enum { MAX_THREAD_COUNT = 512 };
 
   void clear_thread_data();
 
-  static void validate_partition( const int nthreads
-                                , int & num_partitions
-                                , int & partition_size
-                                );
+  static void validate_partition(const int nthreads, int& num_partitions,
+                                 int& partition_size);
 
-private:
-  OpenMPExec( int arg_pool_size )
-    : m_pool_size{ arg_pool_size }
-    , m_level{ omp_get_level() }
-    , m_pool()
-  {}
+ private:
+  OpenMPExec(int arg_pool_size)
+      : m_pool_size{arg_pool_size}, m_level{omp_get_level()}, m_pool() {}
 
-  ~OpenMPExec()
-  {
-    clear_thread_data();
-  }
+  ~OpenMPExec() { clear_thread_data(); }
 
   int m_pool_size;
   int m_level;
 
-  HostThreadTeamData * m_pool[ MAX_THREAD_COUNT ];
+  HostThreadTeamData* m_pool[MAX_THREAD_COUNT];
 
-public:
+ public:
+  static void verify_is_master(const char* const);
 
-  static void verify_is_master( const char * const );
+  void resize_thread_data(size_t pool_reduce_bytes, size_t team_reduce_bytes,
+                          size_t team_shared_bytes, size_t thread_local_bytes);
 
-  void resize_thread_data( size_t pool_reduce_bytes
-                         , size_t team_reduce_bytes
-                         , size_t team_shared_bytes
-                         , size_t thread_local_bytes );
+  inline HostThreadTeamData* get_thread_data() const noexcept {
+    return m_pool[m_level == omp_get_level() ? 0 : omp_get_thread_num()];
+  }
 
-  inline
-  HostThreadTeamData * get_thread_data() const noexcept
-  { return m_pool[ m_level == omp_get_level() ? 0 : omp_get_thread_num() ]; }
-
-  inline
-  HostThreadTeamData * get_thread_data( int i ) const noexcept
-  { return m_pool[i]; }
+  inline HostThreadTeamData* get_thread_data(int i) const noexcept {
+    return m_pool[i];
+  }
 };
 
-}} // namespace Kokkos::Impl
+}  // namespace Impl
+}  // namespace Kokkos
 
 //----------------------------------------------------------------------------
 //----------------------------------------------------------------------------
 
 namespace Kokkos {
 
-inline OpenMP::OpenMP() noexcept
-{}
+inline OpenMP::OpenMP() noexcept {}
 
 inline
 #ifdef KOKKOS_ENABLE_DEPRECATED_CODE
-bool OpenMP::is_initialized() noexcept
+    bool
+    OpenMP::is_initialized() noexcept
 #else
-bool OpenMP::impl_is_initialized() noexcept
+    bool
+    OpenMP::impl_is_initialized() noexcept
 #endif
-{ return Impl::t_openmp_instance != nullptr; }
-
-inline
-bool OpenMP::in_parallel( OpenMP const& ) noexcept
 {
-  //t_openmp_instance is only non-null on a master thread
-  return   !Impl::t_openmp_instance
-         || Impl::t_openmp_instance->m_level < omp_get_level()
-         ;
+  return Impl::t_openmp_instance != nullptr;
+}
+
+inline bool OpenMP::in_parallel(OpenMP const&) noexcept {
+  // t_openmp_instance is only non-null on a master thread
+  return !Impl::t_openmp_instance ||
+         Impl::t_openmp_instance->m_level < omp_get_level();
 }
 
 inline
 #ifdef KOKKOS_ENABLE_DEPRECATED_CODE
-int OpenMP::thread_pool_size() noexcept
+    int
+    OpenMP::thread_pool_size() noexcept
 #else
-int OpenMP::impl_thread_pool_size() noexcept
+    int
+    OpenMP::impl_thread_pool_size() noexcept
 #endif
 {
-  return   OpenMP::in_parallel()
-         ? omp_get_num_threads()
-         : Impl::t_openmp_instance->m_pool_size
-         ;
+  return OpenMP::in_parallel() ? omp_get_num_threads()
+                               : Impl::t_openmp_instance->m_pool_size;
 }
 
 KOKKOS_INLINE_FUNCTION
@@ -177,199 +169,192 @@ int OpenMP::thread_pool_rank() noexcept
 int OpenMP::impl_thread_pool_rank() noexcept
 #endif
 {
-#if defined( KOKKOS_ACTIVE_EXECUTION_MEMORY_SPACE_HOST )
+#if defined(KOKKOS_ACTIVE_EXECUTION_MEMORY_SPACE_HOST)
   return Impl::t_openmp_instance ? 0 : omp_get_thread_num();
 #else
-  return -1 ;
+  return -1;
 #endif
 }
 
-inline
-void OpenMP::impl_static_fence( OpenMP const& instance ) noexcept {}
+inline void OpenMP::impl_static_fence(OpenMP const& instance) noexcept {}
 
 #ifdef KOKKOS_ENABLE_DEPRECATED_CODE
-inline
-void OpenMP::fence( OpenMP const& instance ) noexcept {}
+inline void OpenMP::fence(OpenMP const& instance) noexcept {}
 #endif
 
-inline
-bool OpenMP::is_asynchronous( OpenMP const& instance ) noexcept
-{ return false; }
+inline bool OpenMP::is_asynchronous(OpenMP const& instance) noexcept {
+  return false;
+}
 
 template <typename F>
-void OpenMP::partition_master( F const& f
-                             , int num_partitions
-                             , int partition_size
-                             )
-{
+void OpenMP::partition_master(F const& f, int num_partitions,
+                              int partition_size) {
   if (omp_get_nested()) {
     using Exec = Impl::OpenMPExec;
 
-    Exec * prev_instance = Impl::t_openmp_instance;
+    Exec* prev_instance = Impl::t_openmp_instance;
 
-    Exec::validate_partition( prev_instance->m_pool_size, num_partitions, partition_size );
+    Exec::validate_partition(prev_instance->m_pool_size, num_partitions,
+                             partition_size);
 
     OpenMP::memory_space space;
 
-    #pragma omp parallel num_threads(num_partitions)
+#pragma omp parallel num_threads(num_partitions)
     {
-      void * const ptr = space.allocate( sizeof(Exec) );
+      void* ptr = nullptr;
+      try {
+        ptr = space.allocate(sizeof(Exec));
+      } catch (
+          Kokkos::Experimental::RawMemoryAllocationFailure const& failure) {
+        // For now, just rethrow the error message the existing way
+        Kokkos::Impl::throw_runtime_exception(failure.get_error_message());
+      }
 
-      Impl::t_openmp_instance = new (ptr) Exec( partition_size );
+      Impl::t_openmp_instance = new (ptr) Exec(partition_size);
 
-      size_t pool_reduce_bytes  =   32 * partition_size ;
-      size_t team_reduce_bytes  =   32 * partition_size ;
-      size_t team_shared_bytes  = 1024 * partition_size ;
-      size_t thread_local_bytes = 1024 ;
+      size_t pool_reduce_bytes  = 32 * partition_size;
+      size_t team_reduce_bytes  = 32 * partition_size;
+      size_t team_shared_bytes  = 1024 * partition_size;
+      size_t thread_local_bytes = 1024;
 
-      Impl::t_openmp_instance->resize_thread_data( pool_reduce_bytes
-                                                 , team_reduce_bytes
-                                                 , team_shared_bytes
-                                                 , thread_local_bytes
-                                                 );
+      Impl::t_openmp_instance->resize_thread_data(
+          pool_reduce_bytes, team_reduce_bytes, team_shared_bytes,
+          thread_local_bytes);
 
       omp_set_num_threads(partition_size);
-      f( omp_get_thread_num(), omp_get_num_threads() );
+      f(omp_get_thread_num(), omp_get_num_threads());
 
       Impl::t_openmp_instance->~Exec();
-      space.deallocate( Impl::t_openmp_instance, sizeof(Exec) );
+      space.deallocate(Impl::t_openmp_instance, sizeof(Exec));
       Impl::t_openmp_instance = nullptr;
     }
 
-    Impl::t_openmp_instance  = prev_instance;
-  }
-  else {
+    Impl::t_openmp_instance = prev_instance;
+  } else {
     // nested openmp not enabled
-    f(0,1);
+    f(0, 1);
   }
 }
 
-
 namespace Experimental {
 
-template<>
-class MasterLock<OpenMP>
-{
-public:
-  void lock()     { omp_set_lock( &m_lock );   }
-  void unlock()   { omp_unset_lock( &m_lock ); }
-  bool try_lock() { return static_cast<bool>(omp_test_lock( &m_lock )); }
+template <>
+class MasterLock<OpenMP> {
+ public:
+  void lock() { omp_set_lock(&m_lock); }
+  void unlock() { omp_unset_lock(&m_lock); }
+  bool try_lock() { return static_cast<bool>(omp_test_lock(&m_lock)); }
 
-  MasterLock()  { omp_init_lock( &m_lock ); }
-  ~MasterLock() { omp_destroy_lock( &m_lock ); }
+  MasterLock() { omp_init_lock(&m_lock); }
+  ~MasterLock() { omp_destroy_lock(&m_lock); }
 
-  MasterLock( MasterLock const& ) = delete;
-  MasterLock( MasterLock && )     = delete;
-  MasterLock & operator=( MasterLock const& ) = delete;
-  MasterLock & operator=( MasterLock && )     = delete;
+  MasterLock(MasterLock const&) = delete;
+  MasterLock(MasterLock&&)      = delete;
+  MasterLock& operator=(MasterLock const&) = delete;
+  MasterLock& operator=(MasterLock&&) = delete;
 
-private:
+ private:
   omp_lock_t m_lock;
-
 };
 
-template<>
-class UniqueToken< OpenMP, UniqueTokenScope::Instance>
-{
-public:
+template <>
+class UniqueToken<OpenMP, UniqueTokenScope::Instance> {
+ public:
   using execution_space = OpenMP;
   using size_type       = int;
 
   /// \brief create object size for concurrency on the given instance
   ///
   /// This object should not be shared between instances
-  UniqueToken( execution_space const& = execution_space() ) noexcept {}
+  UniqueToken(execution_space const& = execution_space()) noexcept {}
 
   /// \brief upper bound for acquired values, i.e. 0 <= value < size()
   KOKKOS_INLINE_FUNCTION
-  int size() const noexcept
-    {
-#if defined( KOKKOS_ACTIVE_EXECUTION_MEMORY_SPACE_HOST )
-#if defined( KOKKOS_ENABLE_DEPRECATED_CODE )
-      return Kokkos::OpenMP::thread_pool_size();
+  int size() const noexcept {
+#if defined(KOKKOS_ACTIVE_EXECUTION_MEMORY_SPACE_HOST)
+#if defined(KOKKOS_ENABLE_DEPRECATED_CODE)
+    return Kokkos::OpenMP::thread_pool_size();
 #else
-      return Kokkos::OpenMP::impl_thread_pool_size();
+    return Kokkos::OpenMP::impl_thread_pool_size();
 #endif
 #else
-      return 0 ;
+    return 0;
 #endif
-    }
+  }
 
   /// \brief acquire value such that 0 <= value < size()
   KOKKOS_INLINE_FUNCTION
-  int acquire() const  noexcept
-    {
-#if defined( KOKKOS_ACTIVE_EXECUTION_MEMORY_SPACE_HOST )
-#if defined( KOKKOS_ENABLE_DEPRECATED_CODE )
-      return Kokkos::OpenMP::thread_pool_rank();
+  int acquire() const noexcept {
+#if defined(KOKKOS_ACTIVE_EXECUTION_MEMORY_SPACE_HOST)
+#if defined(KOKKOS_ENABLE_DEPRECATED_CODE)
+    return Kokkos::OpenMP::thread_pool_rank();
 #else
-      return Kokkos::OpenMP::impl_thread_pool_rank();
+    return Kokkos::OpenMP::impl_thread_pool_rank();
 #endif
 #else
-      return 0 ;
+    return 0;
 #endif
-    }
+  }
 
   /// \brief release a value acquired by generate
   KOKKOS_INLINE_FUNCTION
-  void release( int ) const noexcept {}
+  void release(int) const noexcept {}
 };
 
-template<>
-class UniqueToken< OpenMP, UniqueTokenScope::Global>
-{
-public:
+template <>
+class UniqueToken<OpenMP, UniqueTokenScope::Global> {
+ public:
   using execution_space = OpenMP;
   using size_type       = int;
 
   /// \brief create object size for concurrency on the given instance
   ///
   /// This object should not be shared between instances
-  UniqueToken( execution_space const& = execution_space() ) noexcept {}
+  UniqueToken(execution_space const& = execution_space()) noexcept {}
 
   /// \brief upper bound for acquired values, i.e. 0 <= value < size()
   KOKKOS_INLINE_FUNCTION
-  int size() const noexcept
-    {
-      #if defined( KOKKOS_ACTIVE_EXECUTION_MEMORY_SPACE_HOST )
-      return Kokkos::Impl::g_openmp_hardware_max_threads ;
-      #else
-      return 0 ;
-      #endif
-    }
+  int size() const noexcept {
+#if defined(KOKKOS_ACTIVE_EXECUTION_MEMORY_SPACE_HOST)
+    return Kokkos::Impl::g_openmp_hardware_max_threads;
+#else
+    return 0;
+#endif
+  }
 
   /// \brief acquire value such that 0 <= value < size()
   KOKKOS_INLINE_FUNCTION
-  int acquire() const noexcept
-    {
-      #if defined( KOKKOS_ACTIVE_EXECUTION_MEMORY_SPACE_HOST )
-      return Kokkos::Impl::t_openmp_hardware_id ;
-      #else
-      return 0 ;
-      #endif
-    }
+  int acquire() const noexcept {
+#if defined(KOKKOS_ACTIVE_EXECUTION_MEMORY_SPACE_HOST)
+    return Kokkos::Impl::t_openmp_hardware_id;
+#else
+    return 0;
+#endif
+  }
 
   /// \brief release a value acquired by generate
   KOKKOS_INLINE_FUNCTION
-  void release( int ) const noexcept {}
+  void release(int) const noexcept {}
 };
 
-} // namespace Experimental
+}  // namespace Experimental
 
 inline
 #ifdef KOKKOS_ENABLE_DEPRECATED_CODE
-int OpenMP::thread_pool_size( int depth )
+    int
+    OpenMP::thread_pool_size(int depth)
 #else
-int OpenMP::impl_thread_pool_size( int depth )
+    int
+    OpenMP::impl_thread_pool_size(int depth)
 #endif
 {
   return depth < 2
 #ifdef KOKKOS_ENABLE_DEPRECATED_CODE
-         ? thread_pool_size()
+             ? thread_pool_size()
 #else
-         ? impl_thread_pool_size()
+             ? impl_thread_pool_size()
 #endif
-         : 1;
+             : 1;
 }
 
 KOKKOS_INLINE_FUNCTION
@@ -379,25 +364,26 @@ int OpenMP::hardware_thread_id() noexcept
 int OpenMP::impl_hardware_thread_id() noexcept
 #endif
 {
-#if defined( KOKKOS_ACTIVE_EXECUTION_MEMORY_SPACE_HOST )
+#if defined(KOKKOS_ACTIVE_EXECUTION_MEMORY_SPACE_HOST)
   return Impl::t_openmp_hardware_id;
 #else
-  return -1 ;
+  return -1;
 #endif
 }
 
 inline
 #ifdef KOKKOS_ENABLE_DEPRECATED_CODE
-int OpenMP::max_hardware_threads() noexcept
+    int
+    OpenMP::max_hardware_threads() noexcept
 #else
-int OpenMP::impl_max_hardware_threads() noexcept
+    int
+    OpenMP::impl_max_hardware_threads() noexcept
 #endif
 {
   return Impl::g_openmp_hardware_max_threads;
 }
 
-} // namespace Kokkos
+}  // namespace Kokkos
 
 #endif
 #endif /* #ifndef KOKKOS_OPENMPEXEC_HPP */
-
diff --git a/lib/kokkos/core/src/OpenMP/Kokkos_OpenMP_Parallel.hpp b/lib/kokkos/core/src/OpenMP/Kokkos_OpenMP_Parallel.hpp
index ae6b49f650..5442119e73 100644
--- a/lib/kokkos/core/src/OpenMP/Kokkos_OpenMP_Parallel.hpp
+++ b/lib/kokkos/core/src/OpenMP/Kokkos_OpenMP_Parallel.hpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -45,7 +46,7 @@
 #define KOKKOS_OPENMP_PARALLEL_HPP
 
 #include <Kokkos_Macros.hpp>
-#if defined( KOKKOS_ENABLE_OPENMP )
+#if defined(KOKKOS_ENABLE_OPENMP)
 
 #include <omp.h>
 #include <iostream>
@@ -60,218 +61,187 @@
 namespace Kokkos {
 namespace Impl {
 
-template< class FunctorType , class ... Traits >
-class ParallelFor< FunctorType
-                 , Kokkos::RangePolicy< Traits ... >
-                 , Kokkos::OpenMP
-                 >
-{
-private:
+template <class FunctorType, class... Traits>
+class ParallelFor<FunctorType, Kokkos::RangePolicy<Traits...>, Kokkos::OpenMP> {
+ private:
+  typedef Kokkos::RangePolicy<Traits...> Policy;
+  typedef typename Policy::work_tag WorkTag;
+  typedef typename Policy::WorkRange WorkRange;
+  typedef typename Policy::member_type Member;
 
-  typedef Kokkos::RangePolicy< Traits ...  > Policy ;
-  typedef typename Policy::work_tag     WorkTag ;
-  typedef typename Policy::WorkRange    WorkRange ;
-  typedef typename Policy::member_type  Member ;
+  OpenMPExec* m_instance;
+  const FunctorType m_functor;
+  const Policy m_policy;
 
-        OpenMPExec   * m_instance ;
-  const FunctorType    m_functor ;
-  const Policy         m_policy ;
-
-  template< class TagType >
+  template <class TagType>
   inline static
-  typename std::enable_if< std::is_same< TagType , void >::value >::type
-  exec_range( const FunctorType & functor
-            , const Member ibeg , const Member iend )
-    {
-      #ifdef KOKKOS_ENABLE_AGGRESSIVE_VECTORIZATION
-      #ifdef KOKKOS_ENABLE_PRAGMA_IVDEP
-      #pragma ivdep
-      #endif
-      #endif
-      for ( Member iwork = ibeg ; iwork < iend ; ++iwork ) {
-        functor( iwork );
-      }
+      typename std::enable_if<std::is_same<TagType, void>::value>::type
+      exec_range(const FunctorType& functor, const Member ibeg,
+                 const Member iend) {
+#ifdef KOKKOS_ENABLE_AGGRESSIVE_VECTORIZATION
+#ifdef KOKKOS_ENABLE_PRAGMA_IVDEP
+#pragma ivdep
+#endif
+#endif
+    for (Member iwork = ibeg; iwork < iend; ++iwork) {
+      functor(iwork);
     }
+  }
 
-  template< class TagType >
+  template <class TagType>
   inline static
-  typename std::enable_if< ! std::is_same< TagType , void >::value >::type
-  exec_range( const FunctorType & functor
-            , const Member ibeg , const Member iend )
-    {
-      const TagType t{} ;
-      #ifdef KOKKOS_ENABLE_AGGRESSIVE_VECTORIZATION
-      #ifdef KOKKOS_ENABLE_PRAGMA_IVDEP
-      #pragma ivdep
-      #endif
-      #endif
-      for ( Member iwork = ibeg ; iwork < iend ; ++iwork ) {
-        functor( t , iwork );
-      }
+      typename std::enable_if<!std::is_same<TagType, void>::value>::type
+      exec_range(const FunctorType& functor, const Member ibeg,
+                 const Member iend) {
+    const TagType t{};
+#ifdef KOKKOS_ENABLE_AGGRESSIVE_VECTORIZATION
+#ifdef KOKKOS_ENABLE_PRAGMA_IVDEP
+#pragma ivdep
+#endif
+#endif
+    for (Member iwork = ibeg; iwork < iend; ++iwork) {
+      functor(t, iwork);
     }
+  }
 
-public:
-
-  inline void execute() const
-  {
-    enum { is_dynamic = std::is_same< typename Policy::schedule_type::type
-         , Kokkos::Dynamic >::value
-         };
-
-    if ( OpenMP::in_parallel() ) {
-      exec_range< WorkTag >( m_functor
-                           , m_policy.begin()
-                           , m_policy.end() );
-    }
-    else {
+ public:
+  inline void execute() const {
+    enum {
+      is_dynamic = std::is_same<typename Policy::schedule_type::type,
+                                Kokkos::Dynamic>::value
+    };
 
+    if (OpenMP::in_parallel()) {
+      exec_range<WorkTag>(m_functor, m_policy.begin(), m_policy.end());
+    } else {
       OpenMPExec::verify_is_master("Kokkos::OpenMP parallel_for");
 
 #ifdef KOKKOS_ENABLE_DEPRECATED_CODE
-      #pragma omp parallel num_threads(OpenMP::thread_pool_size())
+#pragma omp parallel num_threads(OpenMP::thread_pool_size())
 #else
-      #pragma omp parallel num_threads(OpenMP::impl_thread_pool_size())
+#pragma omp parallel num_threads(OpenMP::impl_thread_pool_size())
 #endif
       {
-        HostThreadTeamData & data = *(m_instance->get_thread_data());
+        HostThreadTeamData& data = *(m_instance->get_thread_data());
 
-        data.set_work_partition( m_policy.end() - m_policy.begin()
-            , m_policy.chunk_size() );
+        data.set_work_partition(m_policy.end() - m_policy.begin(),
+                                m_policy.chunk_size());
 
-        if ( is_dynamic ) {
+        if (is_dynamic) {
           // Make sure work partition is set before stealing
-          if ( data.pool_rendezvous() ) data.pool_rendezvous_release();
+          if (data.pool_rendezvous()) data.pool_rendezvous_release();
         }
 
-        std::pair<int64_t,int64_t> range(0,0);
+        std::pair<int64_t, int64_t> range(0, 0);
 
         do {
-
           range = is_dynamic ? data.get_work_stealing_chunk()
                              : data.get_work_partition();
 
-          ParallelFor::template
-            exec_range< WorkTag >( m_functor
-                , range.first  + m_policy.begin()
-                , range.second + m_policy.begin() );
+          ParallelFor::template exec_range<WorkTag>(
+              m_functor, range.first + m_policy.begin(),
+              range.second + m_policy.begin());
 
-        } while ( is_dynamic && 0 <= range.first );
+        } while (is_dynamic && 0 <= range.first);
       }
     }
   }
 
-  inline
-  ParallelFor( const FunctorType & arg_functor
-             , Policy arg_policy )
-    : m_instance( t_openmp_instance )
-    , m_functor( arg_functor )
-    , m_policy(  arg_policy )
-    {}
+  inline ParallelFor(const FunctorType& arg_functor, Policy arg_policy)
+      : m_instance(t_openmp_instance),
+        m_functor(arg_functor),
+        m_policy(arg_policy) {}
 };
 
-
 // MDRangePolicy impl
-template< class FunctorType , class ... Traits >
-class ParallelFor< FunctorType
-                 , Kokkos::MDRangePolicy< Traits ... >
-                 , Kokkos::OpenMP
-                 >
-{
-private:
+template <class FunctorType, class... Traits>
+class ParallelFor<FunctorType, Kokkos::MDRangePolicy<Traits...>,
+                  Kokkos::OpenMP> {
+ private:
+  typedef Kokkos::MDRangePolicy<Traits...> MDRangePolicy;
+  typedef typename MDRangePolicy::impl_range_policy Policy;
+  typedef typename MDRangePolicy::work_tag WorkTag;
 
-  typedef Kokkos::MDRangePolicy< Traits ... > MDRangePolicy ;
-  typedef typename MDRangePolicy::impl_range_policy         Policy ;
-  typedef typename MDRangePolicy::work_tag                  WorkTag ;
+  typedef typename Policy::WorkRange WorkRange;
+  typedef typename Policy::member_type Member;
 
-  typedef typename Policy::WorkRange    WorkRange ;
-  typedef typename Policy::member_type  Member ;
+  typedef typename Kokkos::Impl::HostIterateTile<
+      MDRangePolicy, FunctorType, typename MDRangePolicy::work_tag, void>
+      iterate_type;
 
-  typedef typename Kokkos::Impl::HostIterateTile< MDRangePolicy, FunctorType, typename MDRangePolicy::work_tag, void > iterate_type;
+  OpenMPExec* m_instance;
+  const FunctorType m_functor;
+  const MDRangePolicy m_mdr_policy;
+  const Policy m_policy;  // construct as RangePolicy( 0, num_tiles
+                          // ).set_chunk_size(1) in ctor
 
-        OpenMPExec   * m_instance ;
-  const FunctorType   m_functor ;
-  const MDRangePolicy m_mdr_policy ;
-  const Policy        m_policy ;  // construct as RangePolicy( 0, num_tiles ).set_chunk_size(1) in ctor
-
-  inline static
-  void
-  exec_range( const MDRangePolicy & mdr_policy
-            , const FunctorType & functor
-            , const Member ibeg , const Member iend )
-    {
-      #ifdef KOKKOS_ENABLE_AGGRESSIVE_VECTORIZATION
-      #ifdef KOKKOS_ENABLE_PRAGMA_IVDEP
-      #pragma ivdep
-      #endif
-      #endif
-      for ( Member iwork = ibeg ; iwork < iend ; ++iwork ) {
-        iterate_type( mdr_policy, functor )( iwork );
-      }
+  inline static void exec_range(const MDRangePolicy& mdr_policy,
+                                const FunctorType& functor, const Member ibeg,
+                                const Member iend) {
+#ifdef KOKKOS_ENABLE_AGGRESSIVE_VECTORIZATION
+#ifdef KOKKOS_ENABLE_PRAGMA_IVDEP
+#pragma ivdep
+#endif
+#endif
+    for (Member iwork = ibeg; iwork < iend; ++iwork) {
+      iterate_type(mdr_policy, functor)(iwork);
     }
+  }
 
-public:
-
-  inline void execute() const
-  {
-      enum { is_dynamic = std::is_same< typename Policy::schedule_type::type
-                                      , Kokkos::Dynamic >::value };
-
-    if ( OpenMP::in_parallel() ) {
-      ParallelFor::exec_range ( m_mdr_policy
-                              , m_functor
-                              , m_policy.begin()
-                              , m_policy.end() );
-    }
-    else {
+ public:
+  inline void execute() const {
+    enum {
+      is_dynamic = std::is_same<typename Policy::schedule_type::type,
+                                Kokkos::Dynamic>::value
+    };
 
+    if (OpenMP::in_parallel()) {
+      ParallelFor::exec_range(m_mdr_policy, m_functor, m_policy.begin(),
+                              m_policy.end());
+    } else {
       OpenMPExec::verify_is_master("Kokkos::OpenMP parallel_for");
 
 #ifdef KOKKOS_ENABLE_DEPRECATED_CODE
-      #pragma omp parallel num_threads(OpenMP::thread_pool_size())
+#pragma omp parallel num_threads(OpenMP::thread_pool_size())
 #else
-      #pragma omp parallel num_threads(OpenMP::impl_thread_pool_size())
+#pragma omp parallel num_threads(OpenMP::impl_thread_pool_size())
 #endif
       {
-        HostThreadTeamData & data = *(m_instance->get_thread_data());
+        HostThreadTeamData& data = *(m_instance->get_thread_data());
 
-        data.set_work_partition( m_policy.end() - m_policy.begin()
-                               , m_policy.chunk_size() );
+        data.set_work_partition(m_policy.end() - m_policy.begin(),
+                                m_policy.chunk_size());
 
-        if ( is_dynamic ) {
+        if (is_dynamic) {
           // Make sure work partition is set before stealing
-          if ( data.pool_rendezvous() ) data.pool_rendezvous_release();
+          if (data.pool_rendezvous()) data.pool_rendezvous_release();
         }
 
-        std::pair<int64_t,int64_t> range(0,0);
+        std::pair<int64_t, int64_t> range(0, 0);
 
         do {
-
           range = is_dynamic ? data.get_work_stealing_chunk()
                              : data.get_work_partition();
 
-          ParallelFor::exec_range( m_mdr_policy
-                                 , m_functor
-                                 , range.first  + m_policy.begin()
-                                 , range.second + m_policy.begin() );
+          ParallelFor::exec_range(m_mdr_policy, m_functor,
+                                  range.first + m_policy.begin(),
+                                  range.second + m_policy.begin());
 
-        } while ( is_dynamic && 0 <= range.first );
+        } while (is_dynamic && 0 <= range.first);
       }
       // END #pragma omp parallel
     }
   }
 
-  inline
-  ParallelFor( const FunctorType & arg_functor
-             , MDRangePolicy arg_policy )
-    : m_instance( t_openmp_instance )
-    , m_functor( arg_functor )
-    , m_mdr_policy( arg_policy )
-    , m_policy( Policy(0, m_mdr_policy.m_num_tiles).set_chunk_size(1) )
-    {}
+  inline ParallelFor(const FunctorType& arg_functor, MDRangePolicy arg_policy)
+      : m_instance(t_openmp_instance),
+        m_functor(arg_functor),
+        m_mdr_policy(arg_policy),
+        m_policy(Policy(0, m_mdr_policy.m_num_tiles).set_chunk_size(1)) {}
 };
 
-} // namespace Impl
-} // namespace Kokkos
+}  // namespace Impl
+}  // namespace Kokkos
 
 //----------------------------------------------------------------------------
 //----------------------------------------------------------------------------
@@ -279,1019 +249,935 @@ public:
 namespace Kokkos {
 namespace Impl {
 
-template< class FunctorType , class ReducerType, class ... Traits >
-class ParallelReduce< FunctorType
-                    , Kokkos::RangePolicy< Traits ...>
-                    , ReducerType
-                    , Kokkos::OpenMP
-                    >
-{
-private:
+template <class FunctorType, class ReducerType, class... Traits>
+class ParallelReduce<FunctorType, Kokkos::RangePolicy<Traits...>, ReducerType,
+                     Kokkos::OpenMP> {
+ private:
+  typedef Kokkos::RangePolicy<Traits...> Policy;
 
-  typedef Kokkos::RangePolicy< Traits ... > Policy ;
+  typedef typename Policy::work_tag WorkTag;
+  typedef typename Policy::WorkRange WorkRange;
+  typedef typename Policy::member_type Member;
 
-  typedef typename Policy::work_tag     WorkTag ;
-  typedef typename Policy::WorkRange    WorkRange ;
-  typedef typename Policy::member_type  Member ;
+  typedef FunctorAnalysis<FunctorPatternInterface::REDUCE, Policy, FunctorType>
+      Analysis;
 
-  typedef FunctorAnalysis< FunctorPatternInterface::REDUCE , Policy , FunctorType > Analysis ;
-
-  typedef Kokkos::Impl::if_c< std::is_same<InvalidType,ReducerType>::value, FunctorType, ReducerType> ReducerConditional;
+  typedef Kokkos::Impl::if_c<std::is_same<InvalidType, ReducerType>::value,
+                             FunctorType, ReducerType>
+      ReducerConditional;
   typedef typename ReducerConditional::type ReducerTypeFwd;
-  typedef typename Kokkos::Impl::if_c< std::is_same<InvalidType,ReducerType>::value, WorkTag, void>::type WorkTagFwd;
+  typedef
+      typename Kokkos::Impl::if_c<std::is_same<InvalidType, ReducerType>::value,
+                                  WorkTag, void>::type WorkTagFwd;
 
   // Static Assert WorkTag void if ReducerType not InvalidType
 
-  typedef Kokkos::Impl::FunctorValueInit<   ReducerTypeFwd, WorkTagFwd > ValueInit ;
-  typedef Kokkos::Impl::FunctorValueJoin<   ReducerTypeFwd, WorkTagFwd > ValueJoin ;
+  typedef Kokkos::Impl::FunctorValueInit<ReducerTypeFwd, WorkTagFwd> ValueInit;
+  typedef Kokkos::Impl::FunctorValueJoin<ReducerTypeFwd, WorkTagFwd> ValueJoin;
 
-  typedef typename Analysis::pointer_type    pointer_type ;
-  typedef typename Analysis::reference_type  reference_type ;
+  typedef typename Analysis::pointer_type pointer_type;
+  typedef typename Analysis::reference_type reference_type;
 
-        OpenMPExec   * m_instance;
-  const FunctorType    m_functor;
-  const Policy         m_policy;
-  const ReducerType    m_reducer;
-  const pointer_type   m_result_ptr;
+  OpenMPExec* m_instance;
+  const FunctorType m_functor;
+  const Policy m_policy;
+  const ReducerType m_reducer;
+  const pointer_type m_result_ptr;
 
-  template< class TagType >
+  template <class TagType>
   inline static
-  typename std::enable_if< std::is_same< TagType , void >::value >::type
-  exec_range( const FunctorType & functor
-            , const Member ibeg , const Member iend
-            , reference_type update )
-    {
-      for ( Member iwork = ibeg ; iwork < iend ; ++iwork ) {
-        functor( iwork , update );
-      }
+      typename std::enable_if<std::is_same<TagType, void>::value>::type
+      exec_range(const FunctorType& functor, const Member ibeg,
+                 const Member iend, reference_type update) {
+    for (Member iwork = ibeg; iwork < iend; ++iwork) {
+      functor(iwork, update);
     }
-
-  template< class TagType >
-  inline static
-  typename std::enable_if< ! std::is_same< TagType , void >::value >::type
-  exec_range( const FunctorType & functor
-            , const Member ibeg , const Member iend
-            , reference_type update )
-    {
-      const TagType t{} ;
-      for ( Member iwork = ibeg ; iwork < iend ; ++iwork ) {
-        functor( t , iwork , update );
-      }
-    }
-
-public:
-
-  inline void execute() const
-    {
-      enum { is_dynamic = std::is_same< typename Policy::schedule_type::type
-                                      , Kokkos::Dynamic >::value };
-
-      OpenMPExec::verify_is_master("Kokkos::OpenMP parallel_reduce");
-
-      const size_t pool_reduce_bytes =
-        Analysis::value_size( ReducerConditional::select(m_functor, m_reducer));
-
-      m_instance->resize_thread_data( pool_reduce_bytes
-                                    , 0 // team_reduce_bytes
-                                    , 0 // team_shared_bytes
-                                    , 0 // thread_local_bytes
-                                    );
-
-#ifdef KOKKOS_ENABLE_DEPRECATED_CODE
-      const int pool_size = OpenMP::thread_pool_size();
-#else
-      const int pool_size = OpenMP::impl_thread_pool_size();
-#endif
-      #pragma omp parallel num_threads(pool_size)
-      {
-        HostThreadTeamData & data = *(m_instance->get_thread_data());
-
-        data.set_work_partition( m_policy.end() - m_policy.begin()
-                               , m_policy.chunk_size() );
-
-        if ( is_dynamic ) {
-          // Make sure work partition is set before stealing
-          if ( data.pool_rendezvous() ) data.pool_rendezvous_release();
-        }
-
-        reference_type update =
-          ValueInit::init( ReducerConditional::select(m_functor , m_reducer)
-                         , data.pool_reduce_local() );
-
-        std::pair<int64_t,int64_t> range(0,0);
-
-        do {
-
-          range = is_dynamic ? data.get_work_stealing_chunk()
-                             : data.get_work_partition();
-
-          ParallelReduce::template
-            exec_range< WorkTag >( m_functor
-                                 , range.first  + m_policy.begin()
-                                 , range.second + m_policy.begin()
-                                 , update );
-
-        } while ( is_dynamic && 0 <= range.first );
-      }
-
-      // Reduction:
-
-      const pointer_type ptr = pointer_type( m_instance->get_thread_data(0)->pool_reduce_local() );
-
-      for ( int i = 1 ; i < pool_size ; ++i ) {
-        ValueJoin::join( ReducerConditional::select(m_functor , m_reducer)
-                       , ptr
-                       , m_instance->get_thread_data(i)->pool_reduce_local() );
-      }
-
-      Kokkos::Impl::FunctorFinal<  ReducerTypeFwd , WorkTagFwd >::final( ReducerConditional::select(m_functor , m_reducer) , ptr );
-
-      if ( m_result_ptr ) {
-        const int n = Analysis::value_count( ReducerConditional::select(m_functor , m_reducer) );
-
-        for ( int j = 0 ; j < n ; ++j ) { m_result_ptr[j] = ptr[j] ; }
-      }
-    }
-
-  //----------------------------------------
-
-  template< class ViewType >
-  inline
-  ParallelReduce( const FunctorType & arg_functor
-                , Policy       arg_policy
-                , const ViewType    & arg_view
-                , typename std::enable_if<
-                           Kokkos::is_view< ViewType >::value &&
-                           !Kokkos::is_reducer_type<ReducerType>::value
-                  ,void*>::type = NULL)
-    : m_instance( t_openmp_instance )
-    , m_functor( arg_functor )
-    , m_policy(  arg_policy )
-    , m_reducer( InvalidType() )
-    , m_result_ptr(  arg_view.data() )
-    {
-      /*static_assert( std::is_same< typename ViewType::memory_space
-                                      , Kokkos::HostSpace >::value
-        , "Reduction result on Kokkos::OpenMP must be a Kokkos::View in HostSpace" );*/
-    }
-
-  inline
-  ParallelReduce( const FunctorType & arg_functor
-                , Policy       arg_policy
-                , const ReducerType& reducer )
-    : m_instance( t_openmp_instance )
-    , m_functor( arg_functor )
-    , m_policy(  arg_policy )
-    , m_reducer( reducer )
-    , m_result_ptr(  reducer.view().data() )
-    {
-      /*static_assert( std::is_same< typename ViewType::memory_space
-                                      , Kokkos::HostSpace >::value
-        , "Reduction result on Kokkos::OpenMP must be a Kokkos::View in HostSpace" );*/
-    }
-
-};
-
-
-// MDRangePolicy impl
-template< class FunctorType , class ReducerType, class ... Traits >
-class ParallelReduce< FunctorType
-                    , Kokkos::MDRangePolicy< Traits ...>
-                    , ReducerType
-                    , Kokkos::OpenMP
-                    >
-{
-private:
-
-  typedef Kokkos::MDRangePolicy< Traits ... > MDRangePolicy ;
-  typedef typename MDRangePolicy::impl_range_policy         Policy ;
-
-  typedef typename MDRangePolicy::work_tag                  WorkTag ;
-  typedef typename Policy::WorkRange                        WorkRange ;
-  typedef typename Policy::member_type                      Member ;
-
-  typedef FunctorAnalysis< FunctorPatternInterface::REDUCE , MDRangePolicy , FunctorType > Analysis ;
-
-  typedef Kokkos::Impl::if_c< std::is_same<InvalidType,ReducerType>::value, FunctorType, ReducerType> ReducerConditional;
-  typedef typename ReducerConditional::type ReducerTypeFwd;
-  typedef typename Kokkos::Impl::if_c< std::is_same<InvalidType,ReducerType>::value, WorkTag, void>::type WorkTagFwd;
-
-  typedef Kokkos::Impl::FunctorValueInit<   ReducerTypeFwd, WorkTagFwd > ValueInit ;
-  typedef Kokkos::Impl::FunctorValueJoin<   ReducerTypeFwd, WorkTagFwd > ValueJoin ;
-
-  typedef typename Analysis::pointer_type    pointer_type ;
-  typedef typename Analysis::value_type      value_type ;
-  typedef typename Analysis::reference_type  reference_type ;
-
-  using iterate_type = typename Kokkos::Impl::HostIterateTile< MDRangePolicy
-                                                             , FunctorType
-                                                             , WorkTag
-                                                             , reference_type
-                                                             >;
-
-        OpenMPExec   * m_instance ;
-  const FunctorType   m_functor ;
-  const MDRangePolicy m_mdr_policy ;
-  const Policy        m_policy ;     // construct as RangePolicy( 0, num_tiles ).set_chunk_size(1) in ctor
-  const ReducerType   m_reducer ;
-  const pointer_type  m_result_ptr ;
-
-  inline static
-  void
-  exec_range( const MDRangePolicy & mdr_policy
-            , const FunctorType & functor
-            , const Member ibeg , const Member iend
-            , reference_type update )
-    {
-      for ( Member iwork = ibeg ; iwork < iend ; ++iwork ) {
-        iterate_type( mdr_policy, functor, update )( iwork );
-      }
-    }
-
-public:
-
-  inline void execute() const
-    {
-      enum { is_dynamic = std::is_same< typename Policy::schedule_type::type
-                                      , Kokkos::Dynamic >::value };
-
-      OpenMPExec::verify_is_master("Kokkos::OpenMP parallel_reduce");
-
-      const size_t pool_reduce_bytes =
-        Analysis::value_size( ReducerConditional::select(m_functor, m_reducer));
-
-      m_instance->resize_thread_data( pool_reduce_bytes
-                                    , 0 // team_reduce_bytes
-                                    , 0 // team_shared_bytes
-                                    , 0 // thread_local_bytes
-                                    );
-
-#ifdef KOKKOS_ENABLE_DEPRECATED_CODE
-      const int pool_size = OpenMP::thread_pool_size();
-#else
-      const int pool_size = OpenMP::impl_thread_pool_size();
-#endif
-      #pragma omp parallel num_threads(pool_size)
-      {
-        HostThreadTeamData & data = *(m_instance->get_thread_data());
-
-        data.set_work_partition( m_policy.end() - m_policy.begin()
-                               , m_policy.chunk_size() );
-
-        if ( is_dynamic ) {
-          // Make sure work partition is set before stealing
-          if ( data.pool_rendezvous() ) data.pool_rendezvous_release();
-        }
-
-        reference_type update =
-          ValueInit::init( ReducerConditional::select(m_functor , m_reducer)
-                         , data.pool_reduce_local() );
-
-        std::pair<int64_t,int64_t> range(0,0);
-
-        do {
-
-          range = is_dynamic ? data.get_work_stealing_chunk()
-                             : data.get_work_partition();
-
-          ParallelReduce::exec_range ( m_mdr_policy, m_functor
-                                     , range.first  + m_policy.begin()
-                                     , range.second + m_policy.begin()
-                                     , update );
-
-        } while ( is_dynamic && 0 <= range.first );
-      }
-// END #pragma omp parallel
-
-      // Reduction:
-
-      const pointer_type ptr = pointer_type( m_instance->get_thread_data(0)->pool_reduce_local() );
-
-      for ( int i = 1 ; i < pool_size ; ++i ) {
-        ValueJoin::join( ReducerConditional::select(m_functor , m_reducer)
-                       , ptr
-                       , m_instance->get_thread_data(i)->pool_reduce_local() );
-      }
-
-      Kokkos::Impl::FunctorFinal<  ReducerTypeFwd , WorkTagFwd >::final( ReducerConditional::select(m_functor , m_reducer) , ptr );
-
-      if ( m_result_ptr ) {
-        const int n = Analysis::value_count( ReducerConditional::select(m_functor , m_reducer) );
-
-        for ( int j = 0 ; j < n ; ++j ) { m_result_ptr[j] = ptr[j] ; }
-      }
-    }
-
-  //----------------------------------------
-
-  template< class ViewType >
-  inline
-  ParallelReduce( const FunctorType & arg_functor
-                , MDRangePolicy       arg_policy
-                , const ViewType    & arg_view
-                , typename std::enable_if<
-                           Kokkos::is_view< ViewType >::value &&
-                           !Kokkos::is_reducer_type<ReducerType>::value
-                  ,void*>::type = NULL)
-    : m_instance( t_openmp_instance )
-    , m_functor( arg_functor )
-    , m_mdr_policy(  arg_policy )
-    , m_policy( Policy(0, m_mdr_policy.m_num_tiles).set_chunk_size(1) )
-    , m_reducer( InvalidType() )
-    , m_result_ptr(  arg_view.data() )
-    {
-      /*static_assert( std::is_same< typename ViewType::memory_space
-                                      , Kokkos::HostSpace >::value
-        , "Reduction result on Kokkos::OpenMP must be a Kokkos::View in HostSpace" );*/
-    }
-
-  inline
-  ParallelReduce( const FunctorType & arg_functor
-                , MDRangePolicy       arg_policy
-                , const ReducerType& reducer )
-    : m_instance( t_openmp_instance )
-    , m_functor( arg_functor )
-    , m_mdr_policy(  arg_policy )
-    , m_policy( Policy(0, m_mdr_policy.m_num_tiles).set_chunk_size(1) )
-    , m_reducer( reducer )
-    , m_result_ptr(  reducer.view().data() )
-    {
-      /*static_assert( std::is_same< typename ViewType::memory_space
-                                      , Kokkos::HostSpace >::value
-        , "Reduction result on Kokkos::OpenMP must be a Kokkos::View in HostSpace" );*/
-    }
-
-};
-
-} // namespace Impl
-} // namespace Kokkos
-
-//----------------------------------------------------------------------------
-//----------------------------------------------------------------------------
-
-namespace Kokkos {
-namespace Impl {
-
-template< class FunctorType , class ... Traits >
-class ParallelScan< FunctorType
-                  , Kokkos::RangePolicy< Traits ... >
-                  , Kokkos::OpenMP
-                  >
-{
-private:
-
-  typedef Kokkos::RangePolicy< Traits ... > Policy ;
-
-  typedef FunctorAnalysis< FunctorPatternInterface::SCAN , Policy , FunctorType > Analysis ;
-
-  typedef typename Policy::work_tag     WorkTag ;
-  typedef typename Policy::WorkRange    WorkRange ;
-  typedef typename Policy::member_type  Member ;
-
-  typedef Kokkos::Impl::FunctorValueInit<   FunctorType, WorkTag > ValueInit ;
-  typedef Kokkos::Impl::FunctorValueJoin<   FunctorType, WorkTag > ValueJoin ;
-  typedef Kokkos::Impl::FunctorValueOps<    FunctorType, WorkTag > ValueOps ;
-
-  typedef typename Analysis::pointer_type    pointer_type ;
-  typedef typename Analysis::reference_type  reference_type ;
-
-        OpenMPExec   * m_instance;
-  const FunctorType    m_functor;
-  const Policy         m_policy;
-
-  template< class TagType >
-  inline static
-  typename std::enable_if< std::is_same< TagType , void >::value >::type
-  exec_range( const FunctorType & functor
-            , const Member ibeg , const Member iend
-            , reference_type update , const bool final )
-    {
-      for ( Member iwork = ibeg ; iwork < iend ; ++iwork ) {
-        functor( iwork , update , final );
-      }
-    }
-
-  template< class TagType >
-  inline static
-  typename std::enable_if< ! std::is_same< TagType , void >::value >::type
-  exec_range( const FunctorType & functor
-            , const Member ibeg , const Member iend
-            , reference_type update , const bool final )
-    {
-      const TagType t{} ;
-      for ( Member iwork = ibeg ; iwork < iend ; ++iwork ) {
-        functor( t , iwork , update , final );
-      }
-    }
-
-public:
-
-  inline
-  void execute() const
-    {
-      OpenMPExec::verify_is_master("Kokkos::OpenMP parallel_scan");
-
-      const int    value_count       = Analysis::value_count( m_functor );
-      const size_t pool_reduce_bytes = 2 * Analysis::value_size( m_functor );
-
-      m_instance->resize_thread_data( pool_reduce_bytes
-                                    , 0 // team_reduce_bytes
-                                    , 0 // team_shared_bytes
-                                    , 0 // thread_local_bytes
-                                    );
-
-#ifdef KOKKOS_ENABLE_DEPRECATED_CODE
-      #pragma omp parallel num_threads(OpenMP::thread_pool_size())
-#else
-      #pragma omp parallel num_threads(OpenMP::impl_thread_pool_size())
-#endif
-      {
-        HostThreadTeamData & data = *(m_instance->get_thread_data());
-
-        const WorkRange range( m_policy, omp_get_thread_num(), omp_get_num_threads() );
-
-        reference_type update_sum =
-          ValueInit::init( m_functor , data.pool_reduce_local() );
-
-        ParallelScan::template exec_range< WorkTag >
-          ( m_functor , range.begin() , range.end() , update_sum , false );
-
-        if ( data.pool_rendezvous() ) {
-
-          pointer_type ptr_prev = 0 ;
-
-          const int n = omp_get_num_threads();
-
-          for ( int i = 0 ; i < n ; ++i ) {
-
-            pointer_type ptr = (pointer_type)
-              data.pool_member(i)->pool_reduce_local();
-
-            if ( i ) {
-              for ( int j = 0 ; j < value_count ; ++j ) {
-                ptr[j+value_count] = ptr_prev[j+value_count] ;
-              }
-              ValueJoin::join( m_functor , ptr + value_count , ptr_prev );
-            }
-            else {
-              ValueInit::init( m_functor , ptr + value_count );
-            }
-
-            ptr_prev = ptr ;
-          }
-
-          data.pool_rendezvous_release();
-        }
-
-        reference_type update_base =
-          ValueOps::reference
-            ( ((pointer_type)data.pool_reduce_local()) + value_count );
-
-        ParallelScan::template exec_range< WorkTag >
-          ( m_functor , range.begin() , range.end() , update_base , true );
-      }
-
-    }
-
-  //----------------------------------------
-
-  inline
-  ParallelScan( const FunctorType & arg_functor
-              , const Policy      & arg_policy )
-    : m_instance( t_openmp_instance )
-    , m_functor( arg_functor )
-    , m_policy(  arg_policy )
-  {}
-
-  //----------------------------------------
-};
-  
-template< class FunctorType, class ReturnType, class ... Traits >
-class ParallelScanWithTotal< FunctorType
-                           , Kokkos::RangePolicy< Traits ... >
-                           , ReturnType
-                           , Kokkos::OpenMP
-                           >
-{
-private:
-
-  typedef Kokkos::RangePolicy< Traits ... > Policy ;
-
-  typedef FunctorAnalysis< FunctorPatternInterface::SCAN , Policy , FunctorType > Analysis ;
-
-  typedef typename Policy::work_tag     WorkTag ;
-  typedef typename Policy::WorkRange    WorkRange ;
-  typedef typename Policy::member_type  Member ;
-
-  typedef Kokkos::Impl::FunctorValueInit<   FunctorType, WorkTag > ValueInit ;
-  typedef Kokkos::Impl::FunctorValueJoin<   FunctorType, WorkTag > ValueJoin ;
-  typedef Kokkos::Impl::FunctorValueOps<    FunctorType, WorkTag > ValueOps ;
-
-  typedef typename Analysis::pointer_type    pointer_type ;
-  typedef typename Analysis::reference_type  reference_type ;
-
-        OpenMPExec   * m_instance;
-  const FunctorType    m_functor;
-  const Policy         m_policy;
-        ReturnType   & m_returnvalue;
-
-  template< class TagType >
-  inline static
-  typename std::enable_if< std::is_same< TagType , void >::value >::type
-  exec_range( const FunctorType & functor
-            , const Member ibeg , const Member iend
-            , reference_type update , const bool final )
-    {
-      for ( Member iwork = ibeg ; iwork < iend ; ++iwork ) {
-        functor( iwork , update , final );
-      }
-    }
-
-  template< class TagType >
-  inline static
-  typename std::enable_if< ! std::is_same< TagType , void >::value >::type
-  exec_range( const FunctorType & functor
-            , const Member ibeg , const Member iend
-            , reference_type update , const bool final )
-    {
-      const TagType t{} ;
-      for ( Member iwork = ibeg ; iwork < iend ; ++iwork ) {
-        functor( t , iwork , update , final );
-      }
-    }
-
-public:
-
-  inline
-  void execute() const
-    {
-      OpenMPExec::verify_is_master("Kokkos::OpenMP parallel_scan");
-
-      const int    value_count       = Analysis::value_count( m_functor );
-      const size_t pool_reduce_bytes = 2 * Analysis::value_size( m_functor );
-
-      m_instance->resize_thread_data( pool_reduce_bytes
-                                    , 0 // team_reduce_bytes
-                                    , 0 // team_shared_bytes
-                                    , 0 // thread_local_bytes
-                                    );
-
-#ifdef KOKKOS_ENABLE_DEPRECATED_CODE
-      #pragma omp parallel num_threads(OpenMP::thread_pool_size())
-#else
-      #pragma omp parallel num_threads(OpenMP::impl_thread_pool_size())
-#endif
-      {
-        HostThreadTeamData & data = *(m_instance->get_thread_data());
-
-        const WorkRange range( m_policy, omp_get_thread_num(), omp_get_num_threads() );
-        reference_type update_sum =
-          ValueInit::init( m_functor , data.pool_reduce_local() );
-
-        ParallelScanWithTotal::template exec_range< WorkTag >
-          ( m_functor , range.begin() , range.end() , update_sum , false );
-
-        if ( data.pool_rendezvous() ) {
-
-          pointer_type ptr_prev = 0 ;
-
-          const int n = omp_get_num_threads();
-
-          for ( int i = 0 ; i < n ; ++i ) {
-
-            pointer_type ptr = (pointer_type)
-              data.pool_member(i)->pool_reduce_local();
-
-            if ( i ) {
-              for ( int j = 0 ; j < value_count ; ++j ) {
-                ptr[j+value_count] = ptr_prev[j+value_count] ;
-              }
-              ValueJoin::join( m_functor , ptr + value_count , ptr_prev );
-            }
-            else {
-              ValueInit::init( m_functor , ptr + value_count );
-            }
-
-            ptr_prev = ptr ;
-          }
-
-          data.pool_rendezvous_release();
-        }
-
-        reference_type update_base =
-          ValueOps::reference
-            ( ((pointer_type)data.pool_reduce_local()) + value_count );
-
-        ParallelScanWithTotal::template exec_range< WorkTag >
-          ( m_functor , range.begin() , range.end() , update_base , true );
-
-        if (omp_get_thread_num()==omp_get_num_threads()-1) {
-          m_returnvalue = update_base;
-        }
-      }
-
-    }
-
-  //----------------------------------------
-
-  inline
-  ParallelScanWithTotal( const FunctorType & arg_functor
-                       , const Policy      & arg_policy
-                       , ReturnType        & arg_returnvalue )
-    : m_instance( t_openmp_instance )
-    , m_functor( arg_functor )
-    , m_policy(  arg_policy )
-    , m_returnvalue(  arg_returnvalue )
-  {}
-
-  //----------------------------------------
-};
-
-} // namespace Impl
-} // namespace Kokkos
-
-//----------------------------------------------------------------------------
-//----------------------------------------------------------------------------
-
-namespace Kokkos {
-namespace Impl {
-
-template< class FunctorType , class ... Properties >
-class ParallelFor< FunctorType
-                 , Kokkos::TeamPolicy< Properties ... >
-                 , Kokkos::OpenMP
-                 >
-{
-private:
-
-  enum { TEAM_REDUCE_SIZE = 512 };
-
-  typedef Kokkos::Impl::TeamPolicyInternal< Kokkos::OpenMP, Properties ... > Policy ;
-  typedef typename Policy::work_tag             WorkTag ;
-  typedef typename Policy::schedule_type::type  SchedTag ;
-  typedef typename Policy::member_type          Member ;
-
-        OpenMPExec   * m_instance;
-  const FunctorType    m_functor;
-  const Policy         m_policy;
-  const int            m_shmem_size;
-
-  template< class TagType >
-  inline static
-  typename std::enable_if< ( std::is_same< TagType , void >::value ) >::type
-  exec_team( const FunctorType & functor
-           , HostThreadTeamData & data
-           , const int league_rank_begin
-           , const int league_rank_end
-           , const int league_size )
-    {
-      for ( int r = league_rank_begin ; r < league_rank_end ; ) {
-
-        functor( Member( data, r , league_size ) );
-
-        if ( ++r < league_rank_end ) {
-          // Don't allow team members to lap one another
-          // so that they don't overwrite shared memory.
-          if ( data.team_rendezvous() ) { data.team_rendezvous_release(); }
-        }
-      }
-    }
-
-
-  template< class TagType >
-  inline static
-  typename std::enable_if< ( ! std::is_same< TagType , void >::value ) >::type
-  exec_team( const FunctorType & functor
-           , HostThreadTeamData & data
-           , const int league_rank_begin
-           , const int league_rank_end
-           , const int league_size )
-    {
-      const TagType t{};
-
-      for ( int r = league_rank_begin ; r < league_rank_end ; ) {
-
-        functor( t , Member( data, r , league_size ) );
-
-        if ( ++r < league_rank_end ) {
-          // Don't allow team members to lap one another
-          // so that they don't overwrite shared memory.
-          if ( data.team_rendezvous() ) { data.team_rendezvous_release(); }
-        }
-      }
-    }
-
-public:
-
-  inline
-  void execute() const
-    {
-      enum { is_dynamic = std::is_same< SchedTag , Kokkos::Dynamic >::value };
-
-      OpenMPExec::verify_is_master("Kokkos::OpenMP parallel_for");
-
-      const size_t pool_reduce_size = 0 ; // Never shrinks
-      const size_t team_reduce_size = TEAM_REDUCE_SIZE * m_policy.team_size();
-      const size_t team_shared_size = m_shmem_size + m_policy.scratch_size(1);
-      const size_t thread_local_size = 0 ; // Never shrinks
-
-      m_instance->resize_thread_data( pool_reduce_size
-                                    , team_reduce_size
-                                    , team_shared_size
-                                    , thread_local_size );
-
-#ifdef KOKKOS_ENABLE_DEPRECATED_CODE
-      #pragma omp parallel num_threads(OpenMP::thread_pool_size())
-#else
-      #pragma omp parallel num_threads(OpenMP::impl_thread_pool_size())
-#endif
-      {
-        HostThreadTeamData & data = *(m_instance->get_thread_data());
-
-        const int active = data.organize_team( m_policy.team_size() );
-
-        if ( active ) {
-          data.set_work_partition( m_policy.league_size()
-                                 , ( 0 < m_policy.chunk_size()
-                                   ? m_policy.chunk_size()
-                                   : m_policy.team_iter() ) );
-        }
-
-        if ( is_dynamic ) {
-          // Must synchronize to make sure each team has set its
-          // partition before begining the work stealing loop.
-          if ( data.pool_rendezvous() ) data.pool_rendezvous_release();
-        }
-
-        if ( active ) {
-
-          std::pair<int64_t,int64_t> range(0,0);
-
-          do {
-
-            range = is_dynamic ? data.get_work_stealing_chunk()
-                               : data.get_work_partition();
-
-            ParallelFor::template exec_team< WorkTag >
-              ( m_functor , data
-              , range.first , range.second , m_policy.league_size() );
-
-          } while ( is_dynamic && 0 <= range.first );
-        }
-
-        data.disband_team();
-      }
-    }
-
-
-  inline
-  ParallelFor( const FunctorType & arg_functor ,
-               const Policy      & arg_policy )
-    : m_instance( t_openmp_instance )
-    , m_functor( arg_functor )
-    , m_policy(  arg_policy )
-    , m_shmem_size( arg_policy.scratch_size(0) +
-                    arg_policy.scratch_size(1) +
-                    FunctorTeamShmemSize< FunctorType >
-                      ::value( arg_functor , arg_policy.team_size() ) )
-    {}
-};
-
-//----------------------------------------------------------------------------
-
-template< class FunctorType , class ReducerType, class ... Properties >
-class ParallelReduce< FunctorType
-                    , Kokkos::TeamPolicy< Properties ... >
-                    , ReducerType
-                    , Kokkos::OpenMP
-                    >
-{
-private:
-
-  enum { TEAM_REDUCE_SIZE = 512 };
-
-  typedef Kokkos::Impl::TeamPolicyInternal< Kokkos::OpenMP, Properties ... >         Policy ;
-
-  typedef FunctorAnalysis< FunctorPatternInterface::REDUCE , Policy , FunctorType > Analysis ;
-
-  typedef typename Policy::work_tag             WorkTag ;
-  typedef typename Policy::schedule_type::type  SchedTag ;
-  typedef typename Policy::member_type          Member ;
-
-  typedef Kokkos::Impl::if_c< std::is_same<InvalidType,ReducerType>::value
-                            , FunctorType, ReducerType> ReducerConditional;
-
-  typedef typename ReducerConditional::type ReducerTypeFwd;
-  typedef typename Kokkos::Impl::if_c< std::is_same<InvalidType,ReducerType>::value, WorkTag, void>::type WorkTagFwd;
-
-  typedef Kokkos::Impl::FunctorValueInit<   ReducerTypeFwd , WorkTagFwd >  ValueInit ;
-  typedef Kokkos::Impl::FunctorValueJoin<   ReducerTypeFwd , WorkTagFwd >  ValueJoin ;
-
-  typedef typename Analysis::pointer_type    pointer_type ;
-  typedef typename Analysis::reference_type  reference_type ;
-
-        OpenMPExec   * m_instance;
-  const FunctorType    m_functor;
-  const Policy         m_policy;
-  const ReducerType    m_reducer;
-  const pointer_type   m_result_ptr;
-  const int            m_shmem_size;
-
-  template< class TagType >
-  inline static
-  typename std::enable_if< ( std::is_same< TagType , void >::value ) >::type
-  exec_team( const FunctorType & functor
-           , HostThreadTeamData & data
-           , reference_type     & update
-           , const int league_rank_begin
-           , const int league_rank_end
-           , const int league_size )
-    {
-      for ( int r = league_rank_begin ; r < league_rank_end ; ) {
-
-        functor( Member( data, r , league_size ) , update );
-
-        if ( ++r < league_rank_end ) {
-          // Don't allow team members to lap one another
-          // so that they don't overwrite shared memory.
-          if ( data.team_rendezvous() ) { data.team_rendezvous_release(); }
-        }
-      }
-    }
-
-
-  template< class TagType >
-  inline static
-  typename std::enable_if< ( ! std::is_same< TagType , void >::value ) >::type
-  exec_team( const FunctorType & functor
-           , HostThreadTeamData & data
-           , reference_type     & update
-           , const int league_rank_begin
-           , const int league_rank_end
-           , const int league_size )
-    {
-      const TagType t{};
-
-      for ( int r = league_rank_begin ; r < league_rank_end ; ) {
-
-        functor( t , Member( data, r , league_size ) , update );
-
-        if ( ++r < league_rank_end ) {
-          // Don't allow team members to lap one another
-          // so that they don't overwrite shared memory.
-          if ( data.team_rendezvous() ) { data.team_rendezvous_release(); }
-        }
-      }
-    }
-
-public:
-
-  inline
-  void execute() const
-    {
-      enum { is_dynamic = std::is_same< SchedTag , Kokkos::Dynamic >::value };
-
-      OpenMPExec::verify_is_master("Kokkos::OpenMP parallel_reduce");
-
-      const size_t pool_reduce_size =
-        Analysis::value_size( ReducerConditional::select(m_functor, m_reducer));
-
-      const size_t team_reduce_size = TEAM_REDUCE_SIZE * m_policy.team_size();
-      const size_t team_shared_size = m_shmem_size + m_policy.scratch_size(1);
-      const size_t thread_local_size = 0 ; // Never shrinks
-
-      m_instance->resize_thread_data( pool_reduce_size
-                                    , team_reduce_size
-                                    , team_shared_size
-                                    , thread_local_size );
-
-#ifdef KOKKOS_ENABLE_DEPRECATED_CODE
-      const int pool_size = OpenMP::thread_pool_size();
-#else
-      const int pool_size = OpenMP::impl_thread_pool_size();
-#endif
-      #pragma omp parallel num_threads(pool_size)
-      {
-        HostThreadTeamData & data = *(m_instance->get_thread_data());
-
-        const int active = data.organize_team( m_policy.team_size() );
-
-        if ( active ) {
-          data.set_work_partition( m_policy.league_size()
-                                 , ( 0 < m_policy.chunk_size()
-                                   ? m_policy.chunk_size()
-                                   : m_policy.team_iter() ) );
-        }
-
-        if ( is_dynamic ) {
-          // Must synchronize to make sure each team has set its
-          // partition before begining the work stealing loop.
-          if ( data.pool_rendezvous() ) data.pool_rendezvous_release();
-        }
-
-        if ( active ) {
-          reference_type update =
-            ValueInit::init( ReducerConditional::select(m_functor , m_reducer)
-                           , data.pool_reduce_local() );
-
-          std::pair<int64_t,int64_t> range(0,0);
-
-          do {
-
-            range = is_dynamic ? data.get_work_stealing_chunk()
-                               : data.get_work_partition();
-
-            ParallelReduce::template exec_team< WorkTag >
-              ( m_functor , data , update
-              , range.first , range.second , m_policy.league_size() );
-
-          } while ( is_dynamic && 0 <= range.first );
-        } else {
-          ValueInit::init( ReducerConditional::select(m_functor , m_reducer)
-                           , data.pool_reduce_local() );
-        }
-
-        data.disband_team();
-
-        //  This thread has updated 'pool_reduce_local()' with its
-        //  contributions to the reduction.  The parallel region is
-        //  about to terminate and the master thread will load and
-        //  reduce each 'pool_reduce_local()' contribution.
-        //  Must 'memory_fence()' to guarantee that storing the update to
-        //  'pool_reduce_local()' will complete before this thread
-        //  exits the parallel region.
-
-        memory_fence();
-      }
-
-      // Reduction:
-
-      const pointer_type ptr = pointer_type( m_instance->get_thread_data(0)->pool_reduce_local() );
-
-      for ( int i = 1 ; i < pool_size ; ++i ) {
-        ValueJoin::join( ReducerConditional::select(m_functor , m_reducer)
-                       , ptr
-                       , m_instance->get_thread_data(i)->pool_reduce_local() );
-      }
-
-      Kokkos::Impl::FunctorFinal<  ReducerTypeFwd , WorkTagFwd >::final( ReducerConditional::select(m_functor , m_reducer) , ptr );
-
-      if ( m_result_ptr ) {
-        const int n = Analysis::value_count( ReducerConditional::select(m_functor , m_reducer) );
-
-        for ( int j = 0 ; j < n ; ++j ) { m_result_ptr[j] = ptr[j] ; }
-      }
-    }
-
-  //----------------------------------------
-
-  template< class ViewType >
-  inline
-  ParallelReduce( const FunctorType  & arg_functor ,
-                  const Policy       & arg_policy ,
-                  const ViewType     & arg_result ,
-                  typename std::enable_if<
-                    Kokkos::is_view< ViewType >::value &&
-                    !Kokkos::is_reducer_type<ReducerType>::value
-                    ,void*>::type = NULL)
-    : m_instance( t_openmp_instance )
-    , m_functor( arg_functor )
-    , m_policy(  arg_policy )
-    , m_reducer( InvalidType() )
-    , m_result_ptr( arg_result.data() )
-    , m_shmem_size( arg_policy.scratch_size(0) +
-                    arg_policy.scratch_size(1) +
-                    FunctorTeamShmemSize< FunctorType >
-                      ::value( arg_functor , arg_policy.team_size() ) )
-    {}
-
-  inline
-  ParallelReduce( const FunctorType & arg_functor
-    , Policy       arg_policy
-    , const ReducerType& reducer )
-  : m_instance( t_openmp_instance )
-  , m_functor( arg_functor )
-  , m_policy(  arg_policy )
-  , m_reducer( reducer )
-  , m_result_ptr(  reducer.view().data() )
-  , m_shmem_size( arg_policy.scratch_size(0) +
-                  arg_policy.scratch_size(1) +
-                  FunctorTeamShmemSize< FunctorType >
-                    ::value( arg_functor , arg_policy.team_size() ) )
-  {
-  /*static_assert( std::is_same< typename ViewType::memory_space
-                          , Kokkos::HostSpace >::value
-  , "Reduction result on Kokkos::OpenMP must be a Kokkos::View in HostSpace" );*/
   }
 
+  template <class TagType>
+  inline static
+      typename std::enable_if<!std::is_same<TagType, void>::value>::type
+      exec_range(const FunctorType& functor, const Member ibeg,
+                 const Member iend, reference_type update) {
+    const TagType t{};
+    for (Member iwork = ibeg; iwork < iend; ++iwork) {
+      functor(t, iwork, update);
+    }
+  }
+
+ public:
+  inline void execute() const {
+    enum {
+      is_dynamic = std::is_same<typename Policy::schedule_type::type,
+                                Kokkos::Dynamic>::value
+    };
+
+    OpenMPExec::verify_is_master("Kokkos::OpenMP parallel_reduce");
+
+    const size_t pool_reduce_bytes =
+        Analysis::value_size(ReducerConditional::select(m_functor, m_reducer));
+
+    m_instance->resize_thread_data(pool_reduce_bytes, 0  // team_reduce_bytes
+                                   ,
+                                   0  // team_shared_bytes
+                                   ,
+                                   0  // thread_local_bytes
+    );
+
+#ifdef KOKKOS_ENABLE_DEPRECATED_CODE
+    const int pool_size = OpenMP::thread_pool_size();
+#else
+    const int pool_size = OpenMP::impl_thread_pool_size();
+#endif
+#pragma omp parallel num_threads(pool_size)
+    {
+      HostThreadTeamData& data = *(m_instance->get_thread_data());
+
+      data.set_work_partition(m_policy.end() - m_policy.begin(),
+                              m_policy.chunk_size());
+
+      if (is_dynamic) {
+        // Make sure work partition is set before stealing
+        if (data.pool_rendezvous()) data.pool_rendezvous_release();
+      }
+
+      reference_type update =
+          ValueInit::init(ReducerConditional::select(m_functor, m_reducer),
+                          data.pool_reduce_local());
+
+      std::pair<int64_t, int64_t> range(0, 0);
+
+      do {
+        range = is_dynamic ? data.get_work_stealing_chunk()
+                           : data.get_work_partition();
+
+        ParallelReduce::template exec_range<WorkTag>(
+            m_functor, range.first + m_policy.begin(),
+            range.second + m_policy.begin(), update);
+
+      } while (is_dynamic && 0 <= range.first);
+    }
+
+    // Reduction:
+
+    const pointer_type ptr =
+        pointer_type(m_instance->get_thread_data(0)->pool_reduce_local());
+
+    for (int i = 1; i < pool_size; ++i) {
+      ValueJoin::join(ReducerConditional::select(m_functor, m_reducer), ptr,
+                      m_instance->get_thread_data(i)->pool_reduce_local());
+    }
+
+    Kokkos::Impl::FunctorFinal<ReducerTypeFwd, WorkTagFwd>::final(
+        ReducerConditional::select(m_functor, m_reducer), ptr);
+
+    if (m_result_ptr) {
+      const int n = Analysis::value_count(
+          ReducerConditional::select(m_functor, m_reducer));
+
+      for (int j = 0; j < n; ++j) {
+        m_result_ptr[j] = ptr[j];
+      }
+    }
+  }
+
+  //----------------------------------------
+
+  template <class ViewType>
+  inline ParallelReduce(
+      const FunctorType& arg_functor, Policy arg_policy,
+      const ViewType& arg_view,
+      typename std::enable_if<Kokkos::is_view<ViewType>::value &&
+                                  !Kokkos::is_reducer_type<ReducerType>::value,
+                              void*>::type = NULL)
+      : m_instance(t_openmp_instance),
+        m_functor(arg_functor),
+        m_policy(arg_policy),
+        m_reducer(InvalidType()),
+        m_result_ptr(arg_view.data()) {
+    /*static_assert( std::is_same< typename ViewType::memory_space
+                                    , Kokkos::HostSpace >::value
+      , "Reduction result on Kokkos::OpenMP must be a Kokkos::View in HostSpace"
+      );*/
+  }
+
+  inline ParallelReduce(const FunctorType& arg_functor, Policy arg_policy,
+                        const ReducerType& reducer)
+      : m_instance(t_openmp_instance),
+        m_functor(arg_functor),
+        m_policy(arg_policy),
+        m_reducer(reducer),
+        m_result_ptr(reducer.view().data()) {
+    /*static_assert( std::is_same< typename ViewType::memory_space
+                                    , Kokkos::HostSpace >::value
+      , "Reduction result on Kokkos::OpenMP must be a Kokkos::View in HostSpace"
+      );*/
+  }
 };
 
-} // namespace Impl
-} // namespace Kokkos
+// MDRangePolicy impl
+template <class FunctorType, class ReducerType, class... Traits>
+class ParallelReduce<FunctorType, Kokkos::MDRangePolicy<Traits...>, ReducerType,
+                     Kokkos::OpenMP> {
+ private:
+  typedef Kokkos::MDRangePolicy<Traits...> MDRangePolicy;
+  typedef typename MDRangePolicy::impl_range_policy Policy;
+
+  typedef typename MDRangePolicy::work_tag WorkTag;
+  typedef typename Policy::WorkRange WorkRange;
+  typedef typename Policy::member_type Member;
+
+  typedef FunctorAnalysis<FunctorPatternInterface::REDUCE, MDRangePolicy,
+                          FunctorType>
+      Analysis;
+
+  typedef Kokkos::Impl::if_c<std::is_same<InvalidType, ReducerType>::value,
+                             FunctorType, ReducerType>
+      ReducerConditional;
+  typedef typename ReducerConditional::type ReducerTypeFwd;
+  typedef
+      typename Kokkos::Impl::if_c<std::is_same<InvalidType, ReducerType>::value,
+                                  WorkTag, void>::type WorkTagFwd;
+
+  typedef Kokkos::Impl::FunctorValueInit<ReducerTypeFwd, WorkTagFwd> ValueInit;
+  typedef Kokkos::Impl::FunctorValueJoin<ReducerTypeFwd, WorkTagFwd> ValueJoin;
+
+  typedef typename Analysis::pointer_type pointer_type;
+  typedef typename Analysis::value_type value_type;
+  typedef typename Analysis::reference_type reference_type;
+
+  using iterate_type =
+      typename Kokkos::Impl::HostIterateTile<MDRangePolicy, FunctorType,
+                                             WorkTag, reference_type>;
+
+  OpenMPExec* m_instance;
+  const FunctorType m_functor;
+  const MDRangePolicy m_mdr_policy;
+  const Policy m_policy;  // construct as RangePolicy( 0, num_tiles
+                          // ).set_chunk_size(1) in ctor
+  const ReducerType m_reducer;
+  const pointer_type m_result_ptr;
+
+  inline static void exec_range(const MDRangePolicy& mdr_policy,
+                                const FunctorType& functor, const Member ibeg,
+                                const Member iend, reference_type update) {
+    for (Member iwork = ibeg; iwork < iend; ++iwork) {
+      iterate_type(mdr_policy, functor, update)(iwork);
+    }
+  }
+
+ public:
+  inline void execute() const {
+    enum {
+      is_dynamic = std::is_same<typename Policy::schedule_type::type,
+                                Kokkos::Dynamic>::value
+    };
+
+    OpenMPExec::verify_is_master("Kokkos::OpenMP parallel_reduce");
+
+    const size_t pool_reduce_bytes =
+        Analysis::value_size(ReducerConditional::select(m_functor, m_reducer));
+
+    m_instance->resize_thread_data(pool_reduce_bytes, 0  // team_reduce_bytes
+                                   ,
+                                   0  // team_shared_bytes
+                                   ,
+                                   0  // thread_local_bytes
+    );
+
+#ifdef KOKKOS_ENABLE_DEPRECATED_CODE
+    const int pool_size = OpenMP::thread_pool_size();
+#else
+    const int pool_size = OpenMP::impl_thread_pool_size();
+#endif
+#pragma omp parallel num_threads(pool_size)
+    {
+      HostThreadTeamData& data = *(m_instance->get_thread_data());
+
+      data.set_work_partition(m_policy.end() - m_policy.begin(),
+                              m_policy.chunk_size());
+
+      if (is_dynamic) {
+        // Make sure work partition is set before stealing
+        if (data.pool_rendezvous()) data.pool_rendezvous_release();
+      }
+
+      reference_type update =
+          ValueInit::init(ReducerConditional::select(m_functor, m_reducer),
+                          data.pool_reduce_local());
+
+      std::pair<int64_t, int64_t> range(0, 0);
+
+      do {
+        range = is_dynamic ? data.get_work_stealing_chunk()
+                           : data.get_work_partition();
+
+        ParallelReduce::exec_range(m_mdr_policy, m_functor,
+                                   range.first + m_policy.begin(),
+                                   range.second + m_policy.begin(), update);
+
+      } while (is_dynamic && 0 <= range.first);
+    }
+    // END #pragma omp parallel
+
+    // Reduction:
+
+    const pointer_type ptr =
+        pointer_type(m_instance->get_thread_data(0)->pool_reduce_local());
+
+    for (int i = 1; i < pool_size; ++i) {
+      ValueJoin::join(ReducerConditional::select(m_functor, m_reducer), ptr,
+                      m_instance->get_thread_data(i)->pool_reduce_local());
+    }
+
+    Kokkos::Impl::FunctorFinal<ReducerTypeFwd, WorkTagFwd>::final(
+        ReducerConditional::select(m_functor, m_reducer), ptr);
+
+    if (m_result_ptr) {
+      const int n = Analysis::value_count(
+          ReducerConditional::select(m_functor, m_reducer));
+
+      for (int j = 0; j < n; ++j) {
+        m_result_ptr[j] = ptr[j];
+      }
+    }
+  }
+
+  //----------------------------------------
+
+  template <class ViewType>
+  inline ParallelReduce(
+      const FunctorType& arg_functor, MDRangePolicy arg_policy,
+      const ViewType& arg_view,
+      typename std::enable_if<Kokkos::is_view<ViewType>::value &&
+                                  !Kokkos::is_reducer_type<ReducerType>::value,
+                              void*>::type = NULL)
+      : m_instance(t_openmp_instance),
+        m_functor(arg_functor),
+        m_mdr_policy(arg_policy),
+        m_policy(Policy(0, m_mdr_policy.m_num_tiles).set_chunk_size(1)),
+        m_reducer(InvalidType()),
+        m_result_ptr(arg_view.data()) {
+    /*static_assert( std::is_same< typename ViewType::memory_space
+                                    , Kokkos::HostSpace >::value
+      , "Reduction result on Kokkos::OpenMP must be a Kokkos::View in HostSpace"
+      );*/
+  }
+
+  inline ParallelReduce(const FunctorType& arg_functor,
+                        MDRangePolicy arg_policy, const ReducerType& reducer)
+      : m_instance(t_openmp_instance),
+        m_functor(arg_functor),
+        m_mdr_policy(arg_policy),
+        m_policy(Policy(0, m_mdr_policy.m_num_tiles).set_chunk_size(1)),
+        m_reducer(reducer),
+        m_result_ptr(reducer.view().data()) {
+    /*static_assert( std::is_same< typename ViewType::memory_space
+                                    , Kokkos::HostSpace >::value
+      , "Reduction result on Kokkos::OpenMP must be a Kokkos::View in HostSpace"
+      );*/
+  }
+};
+
+}  // namespace Impl
+}  // namespace Kokkos
+
+//----------------------------------------------------------------------------
+//----------------------------------------------------------------------------
+
+namespace Kokkos {
+namespace Impl {
+
+template <class FunctorType, class... Traits>
+class ParallelScan<FunctorType, Kokkos::RangePolicy<Traits...>,
+                   Kokkos::OpenMP> {
+ private:
+  typedef Kokkos::RangePolicy<Traits...> Policy;
+
+  typedef FunctorAnalysis<FunctorPatternInterface::SCAN, Policy, FunctorType>
+      Analysis;
+
+  typedef typename Policy::work_tag WorkTag;
+  typedef typename Policy::WorkRange WorkRange;
+  typedef typename Policy::member_type Member;
+
+  typedef Kokkos::Impl::FunctorValueInit<FunctorType, WorkTag> ValueInit;
+  typedef Kokkos::Impl::FunctorValueJoin<FunctorType, WorkTag> ValueJoin;
+  typedef Kokkos::Impl::FunctorValueOps<FunctorType, WorkTag> ValueOps;
+
+  typedef typename Analysis::pointer_type pointer_type;
+  typedef typename Analysis::reference_type reference_type;
+
+  OpenMPExec* m_instance;
+  const FunctorType m_functor;
+  const Policy m_policy;
+
+  template <class TagType>
+  inline static
+      typename std::enable_if<std::is_same<TagType, void>::value>::type
+      exec_range(const FunctorType& functor, const Member ibeg,
+                 const Member iend, reference_type update, const bool final) {
+    for (Member iwork = ibeg; iwork < iend; ++iwork) {
+      functor(iwork, update, final);
+    }
+  }
+
+  template <class TagType>
+  inline static
+      typename std::enable_if<!std::is_same<TagType, void>::value>::type
+      exec_range(const FunctorType& functor, const Member ibeg,
+                 const Member iend, reference_type update, const bool final) {
+    const TagType t{};
+    for (Member iwork = ibeg; iwork < iend; ++iwork) {
+      functor(t, iwork, update, final);
+    }
+  }
+
+ public:
+  inline void execute() const {
+    OpenMPExec::verify_is_master("Kokkos::OpenMP parallel_scan");
+
+    const int value_count          = Analysis::value_count(m_functor);
+    const size_t pool_reduce_bytes = 2 * Analysis::value_size(m_functor);
+
+    m_instance->resize_thread_data(pool_reduce_bytes, 0  // team_reduce_bytes
+                                   ,
+                                   0  // team_shared_bytes
+                                   ,
+                                   0  // thread_local_bytes
+    );
+
+#ifdef KOKKOS_ENABLE_DEPRECATED_CODE
+#pragma omp parallel num_threads(OpenMP::thread_pool_size())
+#else
+#pragma omp parallel num_threads(OpenMP::impl_thread_pool_size())
+#endif
+    {
+      HostThreadTeamData& data = *(m_instance->get_thread_data());
+
+      const WorkRange range(m_policy, omp_get_thread_num(),
+                            omp_get_num_threads());
+
+      reference_type update_sum =
+          ValueInit::init(m_functor, data.pool_reduce_local());
+
+      ParallelScan::template exec_range<WorkTag>(
+          m_functor, range.begin(), range.end(), update_sum, false);
+
+      if (data.pool_rendezvous()) {
+        pointer_type ptr_prev = 0;
+
+        const int n = omp_get_num_threads();
+
+        for (int i = 0; i < n; ++i) {
+          pointer_type ptr =
+              (pointer_type)data.pool_member(i)->pool_reduce_local();
+
+          if (i) {
+            for (int j = 0; j < value_count; ++j) {
+              ptr[j + value_count] = ptr_prev[j + value_count];
+            }
+            ValueJoin::join(m_functor, ptr + value_count, ptr_prev);
+          } else {
+            ValueInit::init(m_functor, ptr + value_count);
+          }
+
+          ptr_prev = ptr;
+        }
+
+        data.pool_rendezvous_release();
+      }
+
+      reference_type update_base = ValueOps::reference(
+          ((pointer_type)data.pool_reduce_local()) + value_count);
+
+      ParallelScan::template exec_range<WorkTag>(
+          m_functor, range.begin(), range.end(), update_base, true);
+    }
+  }
+
+  //----------------------------------------
+
+  inline ParallelScan(const FunctorType& arg_functor, const Policy& arg_policy)
+      : m_instance(t_openmp_instance),
+        m_functor(arg_functor),
+        m_policy(arg_policy) {}
+
+  //----------------------------------------
+};
+
+template <class FunctorType, class ReturnType, class... Traits>
+class ParallelScanWithTotal<FunctorType, Kokkos::RangePolicy<Traits...>,
+                            ReturnType, Kokkos::OpenMP> {
+ private:
+  typedef Kokkos::RangePolicy<Traits...> Policy;
+
+  typedef FunctorAnalysis<FunctorPatternInterface::SCAN, Policy, FunctorType>
+      Analysis;
+
+  typedef typename Policy::work_tag WorkTag;
+  typedef typename Policy::WorkRange WorkRange;
+  typedef typename Policy::member_type Member;
+
+  typedef Kokkos::Impl::FunctorValueInit<FunctorType, WorkTag> ValueInit;
+  typedef Kokkos::Impl::FunctorValueJoin<FunctorType, WorkTag> ValueJoin;
+  typedef Kokkos::Impl::FunctorValueOps<FunctorType, WorkTag> ValueOps;
+
+  typedef typename Analysis::pointer_type pointer_type;
+  typedef typename Analysis::reference_type reference_type;
+
+  OpenMPExec* m_instance;
+  const FunctorType m_functor;
+  const Policy m_policy;
+  ReturnType& m_returnvalue;
+
+  template <class TagType>
+  inline static
+      typename std::enable_if<std::is_same<TagType, void>::value>::type
+      exec_range(const FunctorType& functor, const Member ibeg,
+                 const Member iend, reference_type update, const bool final) {
+    for (Member iwork = ibeg; iwork < iend; ++iwork) {
+      functor(iwork, update, final);
+    }
+  }
+
+  template <class TagType>
+  inline static
+      typename std::enable_if<!std::is_same<TagType, void>::value>::type
+      exec_range(const FunctorType& functor, const Member ibeg,
+                 const Member iend, reference_type update, const bool final) {
+    const TagType t{};
+    for (Member iwork = ibeg; iwork < iend; ++iwork) {
+      functor(t, iwork, update, final);
+    }
+  }
+
+ public:
+  inline void execute() const {
+    OpenMPExec::verify_is_master("Kokkos::OpenMP parallel_scan");
+
+    const int value_count          = Analysis::value_count(m_functor);
+    const size_t pool_reduce_bytes = 2 * Analysis::value_size(m_functor);
+
+    m_instance->resize_thread_data(pool_reduce_bytes, 0  // team_reduce_bytes
+                                   ,
+                                   0  // team_shared_bytes
+                                   ,
+                                   0  // thread_local_bytes
+    );
+
+#ifdef KOKKOS_ENABLE_DEPRECATED_CODE
+#pragma omp parallel num_threads(OpenMP::thread_pool_size())
+#else
+#pragma omp parallel num_threads(OpenMP::impl_thread_pool_size())
+#endif
+    {
+      HostThreadTeamData& data = *(m_instance->get_thread_data());
+
+      const WorkRange range(m_policy, omp_get_thread_num(),
+                            omp_get_num_threads());
+      reference_type update_sum =
+          ValueInit::init(m_functor, data.pool_reduce_local());
+
+      ParallelScanWithTotal::template exec_range<WorkTag>(
+          m_functor, range.begin(), range.end(), update_sum, false);
+
+      if (data.pool_rendezvous()) {
+        pointer_type ptr_prev = 0;
+
+        const int n = omp_get_num_threads();
+
+        for (int i = 0; i < n; ++i) {
+          pointer_type ptr =
+              (pointer_type)data.pool_member(i)->pool_reduce_local();
+
+          if (i) {
+            for (int j = 0; j < value_count; ++j) {
+              ptr[j + value_count] = ptr_prev[j + value_count];
+            }
+            ValueJoin::join(m_functor, ptr + value_count, ptr_prev);
+          } else {
+            ValueInit::init(m_functor, ptr + value_count);
+          }
+
+          ptr_prev = ptr;
+        }
+
+        data.pool_rendezvous_release();
+      }
+
+      reference_type update_base = ValueOps::reference(
+          ((pointer_type)data.pool_reduce_local()) + value_count);
+
+      ParallelScanWithTotal::template exec_range<WorkTag>(
+          m_functor, range.begin(), range.end(), update_base, true);
+
+      if (omp_get_thread_num() == omp_get_num_threads() - 1) {
+        m_returnvalue = update_base;
+      }
+    }
+  }
+
+  //----------------------------------------
+
+  inline ParallelScanWithTotal(const FunctorType& arg_functor,
+                               const Policy& arg_policy,
+                               ReturnType& arg_returnvalue)
+      : m_instance(t_openmp_instance),
+        m_functor(arg_functor),
+        m_policy(arg_policy),
+        m_returnvalue(arg_returnvalue) {}
+
+  //----------------------------------------
+};
+
+}  // namespace Impl
+}  // namespace Kokkos
+
+//----------------------------------------------------------------------------
+//----------------------------------------------------------------------------
+
+namespace Kokkos {
+namespace Impl {
+
+template <class FunctorType, class... Properties>
+class ParallelFor<FunctorType, Kokkos::TeamPolicy<Properties...>,
+                  Kokkos::OpenMP> {
+ private:
+  enum { TEAM_REDUCE_SIZE = 512 };
+
+  typedef Kokkos::Impl::TeamPolicyInternal<Kokkos::OpenMP, Properties...>
+      Policy;
+  typedef typename Policy::work_tag WorkTag;
+  typedef typename Policy::schedule_type::type SchedTag;
+  typedef typename Policy::member_type Member;
+
+  OpenMPExec* m_instance;
+  const FunctorType m_functor;
+  const Policy m_policy;
+  const int m_shmem_size;
+
+  template <class TagType>
+  inline static
+      typename std::enable_if<(std::is_same<TagType, void>::value)>::type
+      exec_team(const FunctorType& functor, HostThreadTeamData& data,
+                const int league_rank_begin, const int league_rank_end,
+                const int league_size) {
+    for (int r = league_rank_begin; r < league_rank_end;) {
+      functor(Member(data, r, league_size));
+
+      if (++r < league_rank_end) {
+        // Don't allow team members to lap one another
+        // so that they don't overwrite shared memory.
+        if (data.team_rendezvous()) {
+          data.team_rendezvous_release();
+        }
+      }
+    }
+  }
+
+  template <class TagType>
+  inline static
+      typename std::enable_if<(!std::is_same<TagType, void>::value)>::type
+      exec_team(const FunctorType& functor, HostThreadTeamData& data,
+                const int league_rank_begin, const int league_rank_end,
+                const int league_size) {
+    const TagType t{};
+
+    for (int r = league_rank_begin; r < league_rank_end;) {
+      functor(t, Member(data, r, league_size));
+
+      if (++r < league_rank_end) {
+        // Don't allow team members to lap one another
+        // so that they don't overwrite shared memory.
+        if (data.team_rendezvous()) {
+          data.team_rendezvous_release();
+        }
+      }
+    }
+  }
+
+ public:
+  inline void execute() const {
+    enum { is_dynamic = std::is_same<SchedTag, Kokkos::Dynamic>::value };
+
+    OpenMPExec::verify_is_master("Kokkos::OpenMP parallel_for");
+
+    const size_t pool_reduce_size  = 0;  // Never shrinks
+    const size_t team_reduce_size  = TEAM_REDUCE_SIZE * m_policy.team_size();
+    const size_t team_shared_size  = m_shmem_size + m_policy.scratch_size(1);
+    const size_t thread_local_size = 0;  // Never shrinks
+
+    m_instance->resize_thread_data(pool_reduce_size, team_reduce_size,
+                                   team_shared_size, thread_local_size);
+
+#ifdef KOKKOS_ENABLE_DEPRECATED_CODE
+#pragma omp parallel num_threads(OpenMP::thread_pool_size())
+#else
+#pragma omp parallel num_threads(OpenMP::impl_thread_pool_size())
+#endif
+    {
+      HostThreadTeamData& data = *(m_instance->get_thread_data());
+
+      const int active = data.organize_team(m_policy.team_size());
+
+      if (active) {
+        data.set_work_partition(
+            m_policy.league_size(),
+            (0 < m_policy.chunk_size() ? m_policy.chunk_size()
+                                       : m_policy.team_iter()));
+      }
+
+      if (is_dynamic) {
+        // Must synchronize to make sure each team has set its
+        // partition before beginning the work stealing loop.
+        if (data.pool_rendezvous()) data.pool_rendezvous_release();
+      }
+
+      if (active) {
+        std::pair<int64_t, int64_t> range(0, 0);
+
+        do {
+          range = is_dynamic ? data.get_work_stealing_chunk()
+                             : data.get_work_partition();
+
+          ParallelFor::template exec_team<WorkTag>(m_functor, data, range.first,
+                                                   range.second,
+                                                   m_policy.league_size());
+
+        } while (is_dynamic && 0 <= range.first);
+      }
+
+      data.disband_team();
+    }
+  }
+
+  inline ParallelFor(const FunctorType& arg_functor, const Policy& arg_policy)
+      : m_instance(t_openmp_instance),
+        m_functor(arg_functor),
+        m_policy(arg_policy),
+        m_shmem_size(arg_policy.scratch_size(0) + arg_policy.scratch_size(1) +
+                     FunctorTeamShmemSize<FunctorType>::value(
+                         arg_functor, arg_policy.team_size())) {}
+};
+
+//----------------------------------------------------------------------------
+
+template <class FunctorType, class ReducerType, class... Properties>
+class ParallelReduce<FunctorType, Kokkos::TeamPolicy<Properties...>,
+                     ReducerType, Kokkos::OpenMP> {
+ private:
+  enum { TEAM_REDUCE_SIZE = 512 };
+
+  typedef Kokkos::Impl::TeamPolicyInternal<Kokkos::OpenMP, Properties...>
+      Policy;
+
+  typedef FunctorAnalysis<FunctorPatternInterface::REDUCE, Policy, FunctorType>
+      Analysis;
+
+  typedef typename Policy::work_tag WorkTag;
+  typedef typename Policy::schedule_type::type SchedTag;
+  typedef typename Policy::member_type Member;
+
+  typedef Kokkos::Impl::if_c<std::is_same<InvalidType, ReducerType>::value,
+                             FunctorType, ReducerType>
+      ReducerConditional;
+
+  typedef typename ReducerConditional::type ReducerTypeFwd;
+  typedef
+      typename Kokkos::Impl::if_c<std::is_same<InvalidType, ReducerType>::value,
+                                  WorkTag, void>::type WorkTagFwd;
+
+  typedef Kokkos::Impl::FunctorValueInit<ReducerTypeFwd, WorkTagFwd> ValueInit;
+  typedef Kokkos::Impl::FunctorValueJoin<ReducerTypeFwd, WorkTagFwd> ValueJoin;
+
+  typedef typename Analysis::pointer_type pointer_type;
+  typedef typename Analysis::reference_type reference_type;
+
+  OpenMPExec* m_instance;
+  const FunctorType m_functor;
+  const Policy m_policy;
+  const ReducerType m_reducer;
+  const pointer_type m_result_ptr;
+  const int m_shmem_size;
+
+  template <class TagType>
+  inline static
+      typename std::enable_if<(std::is_same<TagType, void>::value)>::type
+      exec_team(const FunctorType& functor, HostThreadTeamData& data,
+                reference_type& update, const int league_rank_begin,
+                const int league_rank_end, const int league_size) {
+    for (int r = league_rank_begin; r < league_rank_end;) {
+      functor(Member(data, r, league_size), update);
+
+      if (++r < league_rank_end) {
+        // Don't allow team members to lap one another
+        // so that they don't overwrite shared memory.
+        if (data.team_rendezvous()) {
+          data.team_rendezvous_release();
+        }
+      }
+    }
+  }
+
+  template <class TagType>
+  inline static
+      typename std::enable_if<(!std::is_same<TagType, void>::value)>::type
+      exec_team(const FunctorType& functor, HostThreadTeamData& data,
+                reference_type& update, const int league_rank_begin,
+                const int league_rank_end, const int league_size) {
+    const TagType t{};
+
+    for (int r = league_rank_begin; r < league_rank_end;) {
+      functor(t, Member(data, r, league_size), update);
+
+      if (++r < league_rank_end) {
+        // Don't allow team members to lap one another
+        // so that they don't overwrite shared memory.
+        if (data.team_rendezvous()) {
+          data.team_rendezvous_release();
+        }
+      }
+    }
+  }
+
+ public:
+  inline void execute() const {
+    enum { is_dynamic = std::is_same<SchedTag, Kokkos::Dynamic>::value };
+
+    OpenMPExec::verify_is_master("Kokkos::OpenMP parallel_reduce");
+
+    const size_t pool_reduce_size =
+        Analysis::value_size(ReducerConditional::select(m_functor, m_reducer));
+
+    const size_t team_reduce_size  = TEAM_REDUCE_SIZE * m_policy.team_size();
+    const size_t team_shared_size  = m_shmem_size + m_policy.scratch_size(1);
+    const size_t thread_local_size = 0;  // Never shrinks
+
+    m_instance->resize_thread_data(pool_reduce_size, team_reduce_size,
+                                   team_shared_size, thread_local_size);
+
+#ifdef KOKKOS_ENABLE_DEPRECATED_CODE
+    const int pool_size = OpenMP::thread_pool_size();
+#else
+    const int pool_size = OpenMP::impl_thread_pool_size();
+#endif
+#pragma omp parallel num_threads(pool_size)
+    {
+      HostThreadTeamData& data = *(m_instance->get_thread_data());
+
+      const int active = data.organize_team(m_policy.team_size());
+
+      if (active) {
+        data.set_work_partition(
+            m_policy.league_size(),
+            (0 < m_policy.chunk_size() ? m_policy.chunk_size()
+                                       : m_policy.team_iter()));
+      }
+
+      if (is_dynamic) {
+        // Must synchronize to make sure each team has set its
+        // partition before beginning the work stealing loop.
+        if (data.pool_rendezvous()) data.pool_rendezvous_release();
+      }
+
+      if (active) {
+        reference_type update =
+            ValueInit::init(ReducerConditional::select(m_functor, m_reducer),
+                            data.pool_reduce_local());
+
+        std::pair<int64_t, int64_t> range(0, 0);
+
+        do {
+          range = is_dynamic ? data.get_work_stealing_chunk()
+                             : data.get_work_partition();
+
+          ParallelReduce::template exec_team<WorkTag>(m_functor, data, update,
+                                                      range.first, range.second,
+                                                      m_policy.league_size());
+
+        } while (is_dynamic && 0 <= range.first);
+      } else {
+        ValueInit::init(ReducerConditional::select(m_functor, m_reducer),
+                        data.pool_reduce_local());
+      }
+
+      data.disband_team();
+
+      //  This thread has updated 'pool_reduce_local()' with its
+      //  contributions to the reduction.  The parallel region is
+      //  about to terminate and the master thread will load and
+      //  reduce each 'pool_reduce_local()' contribution.
+      //  Must 'memory_fence()' to guarantee that storing the update to
+      //  'pool_reduce_local()' will complete before this thread
+      //  exits the parallel region.
+
+      memory_fence();
+    }
+
+    // Reduction:
+
+    const pointer_type ptr =
+        pointer_type(m_instance->get_thread_data(0)->pool_reduce_local());
+
+    for (int i = 1; i < pool_size; ++i) {
+      ValueJoin::join(ReducerConditional::select(m_functor, m_reducer), ptr,
+                      m_instance->get_thread_data(i)->pool_reduce_local());
+    }
+
+    Kokkos::Impl::FunctorFinal<ReducerTypeFwd, WorkTagFwd>::final(
+        ReducerConditional::select(m_functor, m_reducer), ptr);
+
+    if (m_result_ptr) {
+      const int n = Analysis::value_count(
+          ReducerConditional::select(m_functor, m_reducer));
+
+      for (int j = 0; j < n; ++j) {
+        m_result_ptr[j] = ptr[j];
+      }
+    }
+  }
+
+  //----------------------------------------
+
+  template <class ViewType>
+  inline ParallelReduce(
+      const FunctorType& arg_functor, const Policy& arg_policy,
+      const ViewType& arg_result,
+      typename std::enable_if<Kokkos::is_view<ViewType>::value &&
+                                  !Kokkos::is_reducer_type<ReducerType>::value,
+                              void*>::type = NULL)
+      : m_instance(t_openmp_instance),
+        m_functor(arg_functor),
+        m_policy(arg_policy),
+        m_reducer(InvalidType()),
+        m_result_ptr(arg_result.data()),
+        m_shmem_size(arg_policy.scratch_size(0) + arg_policy.scratch_size(1) +
+                     FunctorTeamShmemSize<FunctorType>::value(
+                         arg_functor, arg_policy.team_size())) {}
+
+  inline ParallelReduce(const FunctorType& arg_functor, Policy arg_policy,
+                        const ReducerType& reducer)
+      : m_instance(t_openmp_instance),
+        m_functor(arg_functor),
+        m_policy(arg_policy),
+        m_reducer(reducer),
+        m_result_ptr(reducer.view().data()),
+        m_shmem_size(arg_policy.scratch_size(0) + arg_policy.scratch_size(1) +
+                     FunctorTeamShmemSize<FunctorType>::value(
+                         arg_functor, arg_policy.team_size())) {
+    /*static_assert( std::is_same< typename ViewType::memory_space
+                            , Kokkos::HostSpace >::value
+    , "Reduction result on Kokkos::OpenMP must be a Kokkos::View in HostSpace"
+    );*/
+  }
+};
+
+}  // namespace Impl
+}  // namespace Kokkos
 
 //----------------------------------------------------------------------------
 //----------------------------------------------------------------------------
 
 #endif
 #endif /* KOKKOS_OPENMP_PARALLEL_HPP */
-
diff --git a/lib/kokkos/core/src/OpenMP/Kokkos_OpenMP_Task.cpp b/lib/kokkos/core/src/OpenMP/Kokkos_OpenMP_Task.cpp
index 3b1c187c6d..f7338819af 100644
--- a/lib/kokkos/core/src/OpenMP/Kokkos_OpenMP_Task.cpp
+++ b/lib/kokkos/core/src/OpenMP/Kokkos_OpenMP_Task.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -42,7 +43,7 @@
 */
 
 #include <Kokkos_Macros.hpp>
-#if defined( KOKKOS_ENABLE_OPENMP ) && defined( KOKKOS_ENABLE_TASKDAG )
+#if defined(KOKKOS_ENABLE_OPENMP) && defined(KOKKOS_ENABLE_TASKDAG)
 
 #include <Kokkos_Core.hpp>
 
@@ -57,50 +58,53 @@
 namespace Kokkos {
 namespace Impl {
 
-template class TaskQueue< Kokkos::OpenMP, typename Kokkos::OpenMP::memory_space > ;
+template class TaskQueue<Kokkos::OpenMP, typename Kokkos::OpenMP::memory_space>;
 
-HostThreadTeamData& HostThreadTeamDataSingleton::singleton()
-{
+HostThreadTeamData& HostThreadTeamDataSingleton::singleton() {
   static HostThreadTeamDataSingleton s;
   return s;
 }
 
 HostThreadTeamDataSingleton::HostThreadTeamDataSingleton()
-  : HostThreadTeamData()
-{
-  Kokkos::OpenMP::memory_space space ;
-  const size_t num_pool_reduce_bytes  =   32 ;
-  const size_t num_team_reduce_bytes  =   32 ;
-  const size_t num_team_shared_bytes  = 1024 ;
-  const size_t num_thread_local_bytes = 1024 ;
-  const size_t alloc_bytes =
-    HostThreadTeamData::scratch_size( num_pool_reduce_bytes
-      , num_team_reduce_bytes
-      , num_team_shared_bytes
-      , num_thread_local_bytes );
+    : HostThreadTeamData() {
+  Kokkos::OpenMP::memory_space space;
+  const size_t num_pool_reduce_bytes  = 32;
+  const size_t num_team_reduce_bytes  = 32;
+  const size_t num_team_shared_bytes  = 1024;
+  const size_t num_thread_local_bytes = 1024;
+  const size_t alloc_bytes            = HostThreadTeamData::scratch_size(
+      num_pool_reduce_bytes, num_team_reduce_bytes, num_team_shared_bytes,
+      num_thread_local_bytes);
 
-  HostThreadTeamData::scratch_assign
-    ( space.allocate( alloc_bytes )
-      , alloc_bytes
-      , num_pool_reduce_bytes
-      , num_team_reduce_bytes
-      , num_team_shared_bytes
-      , num_thread_local_bytes );
+  void* ptr = nullptr;
+  try {
+    ptr = space.allocate(alloc_bytes);
+  } catch (Kokkos::Experimental::RawMemoryAllocationFailure const& f) {
+    // For now, just rethrow the error message with a note
+    // Note that this could, in turn, trigger an out of memory exception,
+    // but it's pretty unlikely, so we won't worry about it for now.
+    // TODO reasonable error message when `std::string` causes OOM error
+    Kokkos::Impl::throw_runtime_exception(
+        std::string("Failure to allocate scratch memory:  ") +
+        f.get_error_message());
+  }
+
+  HostThreadTeamData::scratch_assign(
+      ptr, alloc_bytes, num_pool_reduce_bytes, num_team_reduce_bytes,
+      num_team_shared_bytes, num_thread_local_bytes);
 }
 
-HostThreadTeamDataSingleton::~HostThreadTeamDataSingleton()
-{
-  Kokkos::OpenMP::memory_space space ;
-  space.deallocate(
-    HostThreadTeamData::scratch_buffer(),
-    static_cast<size_t>(HostThreadTeamData::scratch_bytes())
-  );
+HostThreadTeamDataSingleton::~HostThreadTeamDataSingleton() {
+  Kokkos::OpenMP::memory_space space;
+  space.deallocate(HostThreadTeamData::scratch_buffer(),
+                   static_cast<size_t>(HostThreadTeamData::scratch_bytes()));
 }
 
-}} /* namespace Kokkos::Impl */
+}  // namespace Impl
+}  // namespace Kokkos
 
 //----------------------------------------------------------------------------
 #else
 void KOKKOS_CORE_SRC_OPENMP_KOKKOS_OPENMP_TASK_PREVENT_LINK_ERROR() {}
-#endif /* #if defined( KOKKOS_ENABLE_OPENMP ) && defined( KOKKOS_ENABLE_TASKDAG ) */
-
+#endif /* #if defined( KOKKOS_ENABLE_OPENMP ) && defined( \
+          KOKKOS_ENABLE_TASKDAG ) */
diff --git a/lib/kokkos/core/src/OpenMP/Kokkos_OpenMP_Task.hpp b/lib/kokkos/core/src/OpenMP/Kokkos_OpenMP_Task.hpp
index 4029c015b3..0cbdfbbdaa 100644
--- a/lib/kokkos/core/src/OpenMP/Kokkos_OpenMP_Task.hpp
+++ b/lib/kokkos/core/src/OpenMP/Kokkos_OpenMP_Task.hpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -45,7 +46,7 @@
 #define KOKKOS_IMPL_OPENMP_TASK_HPP
 
 #include <Kokkos_Macros.hpp>
-#if defined( KOKKOS_ENABLE_OPENMP ) && defined( KOKKOS_ENABLE_TASKDAG )
+#if defined(KOKKOS_ENABLE_OPENMP) && defined(KOKKOS_ENABLE_TASKDAG)
 
 #include <Kokkos_TaskScheduler_fwd.hpp>
 
@@ -62,75 +63,68 @@ namespace Kokkos {
 namespace Impl {
 
 class HostThreadTeamDataSingleton : private HostThreadTeamData {
-private:
-
+ private:
   HostThreadTeamDataSingleton();
   ~HostThreadTeamDataSingleton();
 
-public:
-
-  static HostThreadTeamData & singleton();
-
+ public:
+  static HostThreadTeamData& singleton();
 };
 
 // Hack this as a partial specialization for now
-// TODO @tasking @cleanup DSH Make this the general class template and make the old code the partial specialization
+// TODO @tasking @cleanup DSH Make this the general class template and make the
+// old code the partial specialization
 template <class QueueType>
-class TaskQueueSpecialization<
-  SimpleTaskScheduler<Kokkos::OpenMP, QueueType>
->
-{
-public:
-
+class TaskQueueSpecialization<SimpleTaskScheduler<Kokkos::OpenMP, QueueType> > {
+ public:
   using execution_space = Kokkos::OpenMP;
-  using scheduler_type = SimpleTaskScheduler<Kokkos::OpenMP, QueueType>;
-  using member_type = TaskTeamMemberAdapter<
-    Kokkos::Impl::HostThreadTeamMember<execution_space>,
-    scheduler_type
-  >;
+  using scheduler_type  = SimpleTaskScheduler<Kokkos::OpenMP, QueueType>;
+  using member_type =
+      TaskTeamMemberAdapter<Kokkos::Impl::HostThreadTeamMember<execution_space>,
+                            scheduler_type>;
   using memory_space = Kokkos::HostSpace;
 
   enum : int { max_league_size = HostThreadTeamData::max_pool_members };
 
   // Must provide task queue execution function
-  static void execute(scheduler_type const& scheduler)
-  {
+  static void execute(scheduler_type const& scheduler) {
     using task_base_type = typename scheduler_type::task_base_type;
 
-    // Unused; ChaseLev queue still needs worker ID even in single case (so we need to use
-    // the thread data from inside of the parallel region.  Team size is fixed at 1 for now
-    // anyway
-    //HostThreadTeamData& team_data_single = HostThreadTeamDataSingleton::singleton();
+    // Unused; ChaseLev queue still needs worker ID even in single case (so we
+    // need to use the thread data from inside of the parallel region.  Team
+    // size is fixed at 1 for now anyway
+    // HostThreadTeamData& team_data_single =
+    // HostThreadTeamDataSingleton::singleton();
 
-    // TODO @tasking @generalization DSH use scheduler.get_execution_space().impl() (or something like that) instead of the thread-local variable
+    // TODO @tasking @generalization DSH use
+    // scheduler.get_execution_space().impl() (or something like that) instead
+    // of the thread-local variable
     Impl::OpenMPExec* instance = t_openmp_instance;
     const int pool_size = get_max_team_count(scheduler.get_execution_space());
 
     // TODO @tasking @new_feature DSH allow team sizes other than 1
-    const int team_size = 1;  // Threads per core
-    instance->resize_thread_data(
-      0, /* global reduce buffer */
-      512 * team_size, /* team reduce buffer */
-      0, /* team shared buffer */
-      0 /* thread local buffer */
+    const int team_size = 1;                      // Threads per core
+    instance->resize_thread_data(0,               /* global reduce buffer */
+                                 512 * team_size, /* team reduce buffer */
+                                 0,               /* team shared buffer */
+                                 0                /* thread local buffer */
     );
     assert(pool_size % team_size == 0);
 
     auto& queue = scheduler.queue();
 
-    //queue.initialize_team_queues(pool_size / team_size);
+    // queue.initialize_team_queues(pool_size / team_size);
 
-    #pragma omp parallel num_threads(pool_size)
+#pragma omp parallel num_threads(pool_size)
     {
-      Impl::HostThreadTeamData & self = *(instance->get_thread_data());
+      Impl::HostThreadTeamData& self = *(instance->get_thread_data());
 
       // Organizing threads into a team performs a barrier across the
       // entire pool to insure proper initialization of the team
       // rendezvous mechanism before a team rendezvous can be performed.
 
       // organize_team() returns true if this is an active team member
-      if(self.organize_team(team_size)) {
-
+      if (self.organize_team(team_size)) {
         member_type single_exec(scheduler, self);
         member_type team_exec(scheduler, self);
 
@@ -138,68 +132,56 @@ public:
 
         auto current_task = OptionalRef<task_base_type>(nullptr);
 
-        while(not queue.is_done()) {
-
+        while (not queue.is_done()) {
           // Each team lead attempts to acquire either a thread team task
           // or a single thread task for the team.
-          if(team_exec.team_rank() == 0) {
-
+          if (team_exec.team_rank() == 0) {
             // loop while both:
             //   - the queue is not done
             //   - the most recently popped task is a single task or empty
-            while(not queue.is_done()) {
+            while (not queue.is_done()) {
+              current_task =
+                  queue.pop_ready_task(team_scheduler.team_scheduler_info());
 
-              current_task = queue.pop_ready_task(team_scheduler.team_scheduler_info());
-
-              if(current_task) {
-
-                if(current_task->is_team_runnable()) {
+              if (current_task) {
+                if (current_task->is_team_runnable()) {
                   // break out of the team leader loop to run the team task
                   break;
-                }
-                else {
+                } else {
                   KOKKOS_ASSERT(current_task->is_single_runnable());
                   current_task->as_runnable_task().run(single_exec);
                   // Respawns are handled in the complete function
-                  queue.complete(
-                    (*std::move(current_task)).as_runnable_task(),
-                    team_scheduler.team_scheduler_info()
-                  );
+                  queue.complete((*std::move(current_task)).as_runnable_task(),
+                                 team_scheduler.team_scheduler_info());
                 }
 
-              } // end if current_task is not null
+              }  // end if current_task is not null
 
               current_task = nullptr;
 
-            } // end team leader loop
-
+            }  // end team leader loop
           }
 
           // Otherwise, make sure everyone in the team has the same task
           team_exec.team_broadcast(current_task, 0);
 
-          if(current_task) {
+          if (current_task) {
             KOKKOS_ASSERT(current_task->is_team_runnable());
             current_task->as_runnable_task().run(team_exec);
 
-            if(team_exec.team_rank() == 0) {
+            if (team_exec.team_rank() == 0) {
               // Respawns are handled in the complete function
-              queue.complete(
-                (*std::move(current_task)).as_runnable_task(),
-                team_scheduler.team_scheduler_info()
-              );
+              queue.complete((*std::move(current_task)).as_runnable_task(),
+                             team_scheduler.team_scheduler_info());
             }
-
           }
-
         }
       }
       self.disband_team();
-    } // end pragma omp parallel
+    }  // end pragma omp parallel
   }
 
-  static uint32_t
-  get_max_team_count(execution_space const& espace) {
+  static uint32_t get_max_team_count(execution_space const& espace) {
 #ifdef KOKKOS_ENABLE_DEPRECATED_CODE
     return static_cast<uint32_t>(espace.thread_pool_size());
 #else
@@ -207,109 +189,100 @@ public:
 #endif
   }
 
-  // TODO @tasking @optimization DSH specialize this for trivially destructible types
+  // TODO @tasking @optimization DSH specialize this for trivially destructible
+  // types
   template <typename TaskType>
-  static void
-  get_function_pointer(
-    typename TaskType::function_type& ptr,
-    typename TaskType::destroy_type& dtor
-  ) {
-    ptr = TaskType::apply;
+  static void get_function_pointer(typename TaskType::function_type& ptr,
+                                   typename TaskType::destroy_type& dtor) {
+    ptr  = TaskType::apply;
     dtor = TaskType::destroy;
   }
 };
 
-
-template<class Scheduler>
+template <class Scheduler>
 class TaskQueueSpecializationConstrained<
-  Scheduler,
-  typename std::enable_if<
-    std::is_same<typename Scheduler::execution_space, Kokkos::OpenMP>::value
-  >::type
->
-{
-public:
-
+    Scheduler,
+    typename std::enable_if<std::is_same<typename Scheduler::execution_space,
+                                         Kokkos::OpenMP>::value>::type> {
+ public:
   using execution_space = Kokkos::OpenMP;
-  using scheduler_type = Scheduler;
-  using member_type = TaskTeamMemberAdapter<
-    Kokkos::Impl::HostThreadTeamMember<execution_space>,
-    scheduler_type
-  >;
-  using memory_space = Kokkos::HostSpace ;
+  using scheduler_type  = Scheduler;
+  using member_type =
+      TaskTeamMemberAdapter<Kokkos::Impl::HostThreadTeamMember<execution_space>,
+                            scheduler_type>;
+  using memory_space = Kokkos::HostSpace;
 
   enum : int { max_league_size = HostThreadTeamData::max_pool_members };
 
-  static
-  void iff_single_thread_recursive_execute( scheduler_type const& scheduler ) {
+  static void iff_single_thread_recursive_execute(
+      scheduler_type const& scheduler) {
     using task_base_type = typename scheduler_type::task_base;
-    using queue_type = typename scheduler_type::queue_type;
+    using queue_type     = typename scheduler_type::queue_type;
 
 #ifdef KOKKOS_ENABLE_DEPRECATED_CODE
-    if ( 1 == OpenMP::thread_pool_size() )
+    if (1 == OpenMP::thread_pool_size())
 #else
-    if ( 1 == OpenMP::impl_thread_pool_size() )
+    if (1 == OpenMP::impl_thread_pool_size())
 #endif
     {
 
-      task_base_type * const end = (task_base_type *) task_base_type::EndTag ;
+      task_base_type* const end = (task_base_type*)task_base_type::EndTag;
 
-      HostThreadTeamData & team_data_single =
-        HostThreadTeamDataSingleton::singleton();
+      HostThreadTeamData& team_data_single =
+          HostThreadTeamDataSingleton::singleton();
 
-      member_type single_exec( scheduler, team_data_single );
+      member_type single_exec(scheduler, team_data_single);
 
-      task_base_type * task = end ;
+      task_base_type* task = end;
 
       do {
-
-        task = end ;
+        task = end;
 
         // Loop by priority and then type
-        for ( int i = 0 ; i < queue_type::NumQueue && end == task ; ++i ) {
-          for ( int j = 0 ; j < 2 && end == task ; ++j ) {
-            task = queue_type::pop_ready_task( & scheduler.m_queue->m_ready[i][j] );
+        for (int i = 0; i < queue_type::NumQueue && end == task; ++i) {
+          for (int j = 0; j < 2 && end == task; ++j) {
+            task =
+                queue_type::pop_ready_task(&scheduler.m_queue->m_ready[i][j]);
           }
         }
 
-        if ( end == task ) break ;
+        if (end == task) break;
 
-        (*task->m_apply)( task , & single_exec );
+        (*task->m_apply)(task, &single_exec);
 
-        scheduler.m_queue->complete( task );
+        scheduler.m_queue->complete(task);
 
-      } while(1);
+      } while (1);
     }
-
   }
 
   // Must provide task queue execution function
-  static void execute(scheduler_type const& scheduler)
-  {
+  static void execute(scheduler_type const& scheduler) {
     using task_base_type = typename scheduler_type::task_base;
-    using queue_type = typename scheduler_type::queue_type;
+    using queue_type     = typename scheduler_type::queue_type;
 
-    static task_base_type * const end =
-      (task_base_type *) task_base_type::EndTag ;
+    static task_base_type* const end = (task_base_type*)task_base_type::EndTag;
 
     constexpr task_base_type* no_more_tasks_sentinel = nullptr;
 
+    HostThreadTeamData& team_data_single =
+        HostThreadTeamDataSingleton::singleton();
 
-    HostThreadTeamData & team_data_single =
-      HostThreadTeamDataSingleton::singleton();
-
-    Impl::OpenMPExec * instance = t_openmp_instance;
+    Impl::OpenMPExec* instance = t_openmp_instance;
 #ifdef KOKKOS_ENABLE_DEPRECATED_CODE
     const int pool_size = OpenMP::thread_pool_size();
 #else
     const int pool_size = OpenMP::impl_thread_pool_size();
 #endif
 
-    const int team_size = 1;  // Threads per core
-    instance->resize_thread_data( 0 /* global reduce buffer */
-      , 512 * team_size /* team reduce buffer */
-      , 0 /* team shared buffer */
-      , 0 /* thread local buffer */
+    const int team_size = 1;       // Threads per core
+    instance->resize_thread_data(0 /* global reduce buffer */
+                                 ,
+                                 512 * team_size /* team reduce buffer */
+                                 ,
+                                 0 /* team shared buffer */
+                                 ,
+                                 0 /* thread local buffer */
     );
     assert(pool_size % team_size == 0);
     auto& queue = scheduler.queue();
@@ -317,15 +290,14 @@ public:
 
 #pragma omp parallel num_threads(pool_size)
     {
-      Impl::HostThreadTeamData & self = *(instance->get_thread_data());
+      Impl::HostThreadTeamData& self = *(instance->get_thread_data());
 
       // Organizing threads into a team performs a barrier across the
       // entire pool to insure proper initialization of the team
       // rendezvous mechanism before a team rendezvous can be performed.
 
       // organize_team() returns true if this is an active team member
-      if ( self.organize_team( team_size ) ) {
-
+      if (self.organize_team(team_size)) {
         member_type single_exec(scheduler, team_data_single);
         member_type team_exec(scheduler, self);
 
@@ -333,108 +305,100 @@ public:
 
         // Loop until all queues are empty and no tasks in flight
 
-        task_base_type * task = no_more_tasks_sentinel;
-
+        task_base_type* task = no_more_tasks_sentinel;
 
         do {
           // Each team lead attempts to acquire either a thread team task
           // or a single thread task for the team.
 
-          if ( 0 == team_exec.team_rank() ) {
-
-            bool leader_loop = false ;
+          if (0 == team_exec.team_rank()) {
+            bool leader_loop = false;
 
             do {
-
-              if ( task != no_more_tasks_sentinel && task != end ) {
+              if (task != no_more_tasks_sentinel && task != end) {
                 // team member #0 completes the previously executed task,
                 // completion may delete the task
-                team_queue.complete( task );
+                team_queue.complete(task);
               }
 
               // If 0 == m_ready_count then set task = 0
 
-              if( *((volatile int *) & team_queue.m_ready_count) > 0 ) {
+              if (*((volatile int*)&team_queue.m_ready_count) > 0) {
                 task = end;
                 // Attempt to acquire a task
                 // Loop by priority and then type
-                for ( int i = 0 ; i < queue_type::NumQueue && end == task ; ++i ) {
-                  for ( int j = 0 ; j < 2 && end == task ; ++j ) {
-                    task = queue_type::pop_ready_task( & team_queue.m_ready[i][j] );
+                for (int i = 0; i < queue_type::NumQueue && end == task; ++i) {
+                  for (int j = 0; j < 2 && end == task; ++j) {
+                    task =
+                        queue_type::pop_ready_task(&team_queue.m_ready[i][j]);
                   }
                 }
-              }
-              else {
+              } else {
                 // returns nullptr if and only if all other queues have a ready
                 // count of 0 also. Otherwise, returns a task from another queue
                 // or `end` if one couldn't be popped
                 task = team_queue.attempt_to_steal_task();
-                #if 0
+#if 0
                 if(task != no_more_tasks_sentinel && task != end) {
                   std::printf("task stolen on rank %d\n", team_exec.league_rank());
                 }
-                #endif
+#endif
               }
 
               // If still tasks are still executing
               // and no task could be acquired
               // then continue this leader loop
-              if(task == end) {
+              if (task == end) {
                 // this means that the ready task count was not zero, but we
                 // couldn't pop a task (because, for instance, someone else
                 // got there before us
                 leader_loop = true;
-              }
-              else if ( ( task != no_more_tasks_sentinel ) &&
-                ( task_base_type::TaskSingle == task->m_task_type ) ) {
-
+              } else if ((task != no_more_tasks_sentinel) &&
+                         (task_base_type::TaskSingle == task->m_task_type)) {
                 // if a single thread task then execute now
 
                 (*task->m_apply)(task, &single_exec);
 
                 leader_loop = true;
-              }
-              else {
+              } else {
                 leader_loop = false;
               }
-            } while ( leader_loop );
+            } while (leader_loop);
           }
 
           // Team lead either found 0 == m_ready_count or a team task
           // Team lead broadcast acquired task:
 
-          team_exec.team_broadcast( task , 0);
+          team_exec.team_broadcast(task, 0);
 
-          if ( task != no_more_tasks_sentinel ) { // Thread Team Task
+          if (task != no_more_tasks_sentinel) {  // Thread Team Task
 
-            (*task->m_apply)( task , & team_exec );
+            (*task->m_apply)(task, &team_exec);
 
             // The m_apply function performs a barrier
           }
-        } while( task != no_more_tasks_sentinel );
+        } while (task != no_more_tasks_sentinel);
       }
       self.disband_team();
-    } // end pragma omp parallel
+    }  // end pragma omp parallel
   }
 
-  template< typename TaskType >
-  static void
-  get_function_pointer(
-    typename TaskType::function_type& ptr,
-    typename TaskType::destroy_type& dtor
-  ) { 
-    ptr = TaskType::apply;
+  template <typename TaskType>
+  static void get_function_pointer(typename TaskType::function_type& ptr,
+                                   typename TaskType::destroy_type& dtor) {
+    ptr  = TaskType::apply;
     dtor = TaskType::destroy;
   }
 };
 
-extern template class TaskQueue< Kokkos::OpenMP, typename Kokkos::OpenMP::memory_space > ;
+extern template class TaskQueue<Kokkos::OpenMP,
+                                typename Kokkos::OpenMP::memory_space>;
 
-}} /* namespace Kokkos::Impl */
+}  // namespace Impl
+}  // namespace Kokkos
 
 //----------------------------------------------------------------------------
 //----------------------------------------------------------------------------
 
 #endif /* #if defined( KOKKOS_ENABLE_TASKDAG ) */
 #endif /* #ifndef KOKKOS_IMPL_OPENMP_TASK_HPP */
-
diff --git a/lib/kokkos/core/src/OpenMP/Kokkos_OpenMP_Team.hpp b/lib/kokkos/core/src/OpenMP/Kokkos_OpenMP_Team.hpp
index 38b062bdc0..39fd5ae033 100644
--- a/lib/kokkos/core/src/OpenMP/Kokkos_OpenMP_Team.hpp
+++ b/lib/kokkos/core/src/OpenMP/Kokkos_OpenMP_Team.hpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -45,350 +46,381 @@
 #define KOKKOS_OPENMP_TEAM_HPP
 
 #include <Kokkos_Macros.hpp>
-#if defined( KOKKOS_ENABLE_OPENMP )
+#if defined(KOKKOS_ENABLE_OPENMP)
 
 #include <OpenMP/Kokkos_OpenMP_Exec.hpp>
 
-namespace Kokkos { namespace Impl {
-
-template< class ... Properties >
-class TeamPolicyInternal< Kokkos::OpenMP, Properties ... >: public PolicyTraits<Properties ...>
-{
-public:
+namespace Kokkos {
+namespace Impl {
 
+template <class... Properties>
+class TeamPolicyInternal<Kokkos::OpenMP, Properties...>
+    : public PolicyTraits<Properties...> {
+ public:
   //! Tag this class as a kokkos execution policy
-  typedef TeamPolicyInternal      execution_policy ;
+  typedef TeamPolicyInternal execution_policy;
 
-  typedef PolicyTraits<Properties ... > traits;
+  typedef PolicyTraits<Properties...> traits;
 
-  TeamPolicyInternal& operator = (const TeamPolicyInternal& p) {
-    m_league_size = p.m_league_size;
-    m_team_size = p.m_team_size;
-    m_team_alloc = p.m_team_alloc;
-    m_team_iter = p.m_team_iter;
-    m_team_scratch_size[0] = p.m_team_scratch_size[0];
+  TeamPolicyInternal& operator=(const TeamPolicyInternal& p) {
+    m_league_size            = p.m_league_size;
+    m_team_size              = p.m_team_size;
+    m_team_alloc             = p.m_team_alloc;
+    m_team_iter              = p.m_team_iter;
+    m_team_scratch_size[0]   = p.m_team_scratch_size[0];
     m_thread_scratch_size[0] = p.m_thread_scratch_size[0];
-    m_team_scratch_size[1] = p.m_team_scratch_size[1];
+    m_team_scratch_size[1]   = p.m_team_scratch_size[1];
     m_thread_scratch_size[1] = p.m_thread_scratch_size[1];
-    m_chunk_size = p.m_chunk_size;
+    m_chunk_size             = p.m_chunk_size;
     return *this;
   }
 
-  template<class ExecSpace, class ... OtherProperties >
+  template <class ExecSpace, class... OtherProperties>
   friend class TeamPolicyInternal;
 
-  template< class ... OtherProperties >
-  TeamPolicyInternal(const TeamPolicyInternal<Kokkos::OpenMP,OtherProperties...>& p) {
-    m_league_size = p.m_league_size;
-    m_team_size = p.m_team_size;
-    m_team_alloc = p.m_team_alloc;
-    m_team_iter = p.m_team_iter;
-    m_team_scratch_size[0] = p.m_team_scratch_size[0];
+  template <class... OtherProperties>
+  TeamPolicyInternal(
+      const TeamPolicyInternal<Kokkos::OpenMP, OtherProperties...>& p) {
+    m_league_size            = p.m_league_size;
+    m_team_size              = p.m_team_size;
+    m_team_alloc             = p.m_team_alloc;
+    m_team_iter              = p.m_team_iter;
+    m_team_scratch_size[0]   = p.m_team_scratch_size[0];
     m_thread_scratch_size[0] = p.m_thread_scratch_size[0];
-    m_team_scratch_size[1] = p.m_team_scratch_size[1];
+    m_team_scratch_size[1]   = p.m_team_scratch_size[1];
     m_thread_scratch_size[1] = p.m_thread_scratch_size[1];
-    m_chunk_size = p.m_chunk_size;
+    m_chunk_size             = p.m_chunk_size;
   }
   //----------------------------------------
 
 #ifdef KOKKOS_ENABLE_DEPRECATED_CODE
-  template< class FunctorType >
-  inline static
-  int team_size_max( const FunctorType & ) {
-    int pool_size = traits::execution_space::thread_pool_size(1);
-    int max_host_team_size =  Impl::HostThreadTeamData::max_team_members;
-    return pool_size<max_host_team_size?pool_size:max_host_team_size;
+  template <class FunctorType>
+  inline static int team_size_max(const FunctorType&) {
+    int pool_size          = traits::execution_space::thread_pool_size(1);
+    int max_host_team_size = Impl::HostThreadTeamData::max_team_members;
+    return pool_size < max_host_team_size ? pool_size : max_host_team_size;
   }
 
-  template< class FunctorType >
-  inline static
-  int team_size_recommended( const FunctorType & )
-  {
+  template <class FunctorType>
+  inline static int team_size_recommended(const FunctorType&) {
     return traits::execution_space::thread_pool_size(2);
   }
 
-  template< class FunctorType >
-  inline static
-  int team_size_recommended( const FunctorType &, const int& )
-  {
+  template <class FunctorType>
+  inline static int team_size_recommended(const FunctorType&, const int&) {
     return traits::execution_space::thread_pool_size(2);
   }
 #endif
 
-  template<class FunctorType>
-  int team_size_max( const FunctorType&, const ParallelForTag& ) const {
+  template <class FunctorType>
+  int team_size_max(const FunctorType&, const ParallelForTag&) const {
 #ifdef KOKKOS_ENABLE_DEPRECATED_CODE
     int pool_size = traits::execution_space::thread_pool_size(1);
 #else
     int pool_size = traits::execution_space::impl_thread_pool_size(1);
 #endif
-    int max_host_team_size =  Impl::HostThreadTeamData::max_team_members;
-    return pool_size<max_host_team_size?pool_size:max_host_team_size;
+    int max_host_team_size = Impl::HostThreadTeamData::max_team_members;
+    return pool_size < max_host_team_size ? pool_size : max_host_team_size;
   }
-  template<class FunctorType>
-  int team_size_max( const FunctorType&, const ParallelReduceTag& ) const {
+  template <class FunctorType>
+  int team_size_max(const FunctorType&, const ParallelReduceTag&) const {
 #ifdef KOKKOS_ENABLE_DEPRECATED_CODE
     int pool_size = traits::execution_space::thread_pool_size(1);
 #else
     int pool_size = traits::execution_space::impl_thread_pool_size(1);
 #endif
-    int max_host_team_size =  Impl::HostThreadTeamData::max_team_members;
-    return pool_size<max_host_team_size?pool_size:max_host_team_size;
+    int max_host_team_size = Impl::HostThreadTeamData::max_team_members;
+    return pool_size < max_host_team_size ? pool_size : max_host_team_size;
   }
-  template<class FunctorType>
-  int team_size_recommended( const FunctorType&, const ParallelForTag& ) const {
+  template <class FunctorType, class ReducerType>
+  inline int team_size_max(const FunctorType& f, const ReducerType&,
+                           const ParallelReduceTag& t) const {
+    return team_size_max(f, t);
+  }
+  template <class FunctorType>
+  int team_size_recommended(const FunctorType&, const ParallelForTag&) const {
 #ifdef KOKKOS_ENABLE_DEPRECATED_CODE
     return traits::execution_space::thread_pool_size(2);
 #else
     return traits::execution_space::impl_thread_pool_size(2);
 #endif
   }
-  template<class FunctorType>
-  int team_size_recommended( const FunctorType&, const ParallelReduceTag& ) const {
+  template <class FunctorType>
+  int team_size_recommended(const FunctorType&,
+                            const ParallelReduceTag&) const {
 #ifdef KOKKOS_ENABLE_DEPRECATED_CODE
     return traits::execution_space::thread_pool_size(2);
 #else
     return traits::execution_space::impl_thread_pool_size(2);
 #endif
   }
+  template <class FunctorType, class ReducerType>
+  inline int team_size_recommended(const FunctorType& f, const ReducerType&,
+                                   const ParallelReduceTag& t) const {
+    return team_size_recommended(f, t);
+  }
 
+  inline static int vector_length_max() {
+    return 1024;
+  }  // Use arbitrary large number, is meant as a vectorizable length
 
-  inline static
-  int vector_length_max()
-    { return 1024; } // Use arbitrary large number, is meant as a vectorizable length
-
-  inline static
-  int scratch_size_max(int level)
-    { return (level==0?
-        1024*32: // Roughly L1 size
-        20*1024*1024); // Limit to keep compatibility with CUDA
-    }
+  inline static int scratch_size_max(int level) {
+    return (level == 0 ? 1024 * 32 :  // Roughly L1 size
+                20 * 1024 * 1024);    // Limit to keep compatibility with CUDA
+  }
 
   //----------------------------------------
 
-private:
-
-  int m_league_size ;
-  int m_team_size ;
-  int m_team_alloc ;
-  int m_team_iter ;
+ private:
+  int m_league_size;
+  int m_team_size;
+  int m_team_alloc;
+  int m_team_iter;
 
   size_t m_team_scratch_size[2];
   size_t m_thread_scratch_size[2];
 
   int m_chunk_size;
 
-  inline void init( const int league_size_request
-                  , const int team_size_request )
-    {
+  inline void init(const int league_size_request, const int team_size_request) {
 #ifdef KOKKOS_ENABLE_DEPRECATED_CODE
-      const int pool_size  = traits::execution_space::thread_pool_size(0);
-      const int team_grain = traits::execution_space::thread_pool_size(2);
+    const int pool_size  = traits::execution_space::thread_pool_size(0);
+    const int team_grain = traits::execution_space::thread_pool_size(2);
 #else
-      const int pool_size  = traits::execution_space::impl_thread_pool_size(0);
-      const int team_grain = traits::execution_space::impl_thread_pool_size(2);
+    const int pool_size  = traits::execution_space::impl_thread_pool_size(0);
+    const int team_grain = traits::execution_space::impl_thread_pool_size(2);
 #endif
-      const int max_host_team_size =  Impl::HostThreadTeamData::max_team_members;
-      const int team_max   = ((pool_size < max_host_team_size) ? pool_size : max_host_team_size);
+    const int max_host_team_size = Impl::HostThreadTeamData::max_team_members;
+    const int team_max =
+        ((pool_size < max_host_team_size) ? pool_size : max_host_team_size);
 
-      m_league_size = league_size_request ;
+    m_league_size = league_size_request;
 
-      #ifndef KOKKOS_ENABLE_DEPRECATED_CODE
-      if(team_size_request > team_max) Kokkos::abort("Kokkos::abort: Requested Team Size is too large!");
-      #endif
-      m_team_size = team_size_request < team_max ?
-                    team_size_request : team_max ;
+#ifndef KOKKOS_ENABLE_DEPRECATED_CODE
+    if (team_size_request > team_max)
+      Kokkos::abort("Kokkos::abort: Requested Team Size is too large!");
+#endif
+    m_team_size = team_size_request < team_max ? team_size_request : team_max;
 
-      // Round team size up to a multiple of 'team_gain'
-      const int team_size_grain = team_grain * ( ( m_team_size + team_grain - 1 ) / team_grain );
-      const int team_count      = pool_size / team_size_grain ;
+    // Round team size up to a multiple of 'team_gain'
+    const int team_size_grain =
+        team_grain * ((m_team_size + team_grain - 1) / team_grain);
+    const int team_count = pool_size / team_size_grain;
 
-      // Constraint : pool_size = m_team_alloc * team_count
-      m_team_alloc = pool_size / team_count ;
+    // Constraint : pool_size = m_team_alloc * team_count
+    m_team_alloc = pool_size / team_count;
 
-      // Maxumum number of iterations each team will take:
-      m_team_iter  = ( m_league_size + team_count - 1 ) / team_count ;
+    // Maxumum number of iterations each team will take:
+    m_team_iter = (m_league_size + team_count - 1) / team_count;
 
-      set_auto_chunk_size();
-    }
+    set_auto_chunk_size();
+  }
 
-public:
-
-  inline int team_size()   const { return m_team_size ; }
-  inline int league_size() const { return m_league_size ; }
+ public:
+  inline int team_size() const { return m_team_size; }
+  inline int league_size() const { return m_league_size; }
 
   inline size_t scratch_size(const int& level, int team_size_ = -1) const {
-    if(team_size_ < 0) team_size_ = m_team_size;
-    return m_team_scratch_size[level] + team_size_*m_thread_scratch_size[level] ;
+    if (team_size_ < 0) team_size_ = m_team_size;
+    return m_team_scratch_size[level] +
+           team_size_ * m_thread_scratch_size[level];
   }
 
   /** \brief  Specify league size, request team size */
-  TeamPolicyInternal( const typename traits::execution_space &
-            , int league_size_request
-            , int team_size_request
-            , int /* vector_length_request */ = 1 )
-            : m_team_scratch_size { 0 , 0 }
-            , m_thread_scratch_size { 0 , 0 }
-            , m_chunk_size(0)
-    { init( league_size_request , team_size_request ); }
+  TeamPolicyInternal(const typename traits::execution_space&,
+                     int league_size_request, int team_size_request,
+                     int /* vector_length_request */ = 1)
+      : m_team_scratch_size{0, 0},
+        m_thread_scratch_size{0, 0},
+        m_chunk_size(0) {
+    init(league_size_request, team_size_request);
+  }
 
-  TeamPolicyInternal( const typename traits::execution_space &
-            , int league_size_request
-            , const Kokkos::AUTO_t & /* team_size_request */
-            , int /* vector_length_request */ = 1)
-            : m_team_scratch_size { 0 , 0 }
-            , m_thread_scratch_size { 0 , 0 }
-            , m_chunk_size(0)
+  TeamPolicyInternal(const typename traits::execution_space&,
+                     int league_size_request,
+                     const Kokkos::AUTO_t& /* team_size_request */
+                     ,
+                     int /* vector_length_request */ = 1)
+      : m_team_scratch_size{0, 0},
+        m_thread_scratch_size{0, 0},
+        m_chunk_size(0)
 #ifdef KOKKOS_ENABLE_DEPRECATED_CODE
-    { init( league_size_request , traits::execution_space::thread_pool_size(2) ); }
-#else
-    { init( league_size_request , traits::execution_space::impl_thread_pool_size(2) ); }
-#endif
-
-  TeamPolicyInternal( int league_size_request
-            , int team_size_request
-            , int /* vector_length_request */ = 1 )
-            : m_team_scratch_size { 0 , 0 }
-            , m_thread_scratch_size { 0 , 0 }
-            , m_chunk_size(0)
-    { init( league_size_request , team_size_request ); }
-
-  TeamPolicyInternal( int league_size_request
-            , const Kokkos::AUTO_t & /* team_size_request */
-            , int /* vector_length_request */ = 1 )
-            : m_team_scratch_size { 0 , 0 }
-            , m_thread_scratch_size { 0 , 0 }
-            , m_chunk_size(0)
   {
-    init( league_size_request ,
-#ifdef KOKKOS_ENABLE_DEPRECATED_CODE
-        traits::execution_space::thread_pool_size(2)
+    init(league_size_request, traits::execution_space::thread_pool_size(2));
+  }
 #else
-        traits::execution_space::impl_thread_pool_size(2)
+  {
+    init(league_size_request,
+         traits::execution_space::impl_thread_pool_size(2));
+  }
 #endif
-        );
+
+  TeamPolicyInternal(int league_size_request, int team_size_request,
+                     int /* vector_length_request */ = 1)
+      : m_team_scratch_size{0, 0},
+        m_thread_scratch_size{0, 0},
+        m_chunk_size(0) {
+    init(league_size_request, team_size_request);
   }
 
-  inline int team_alloc() const { return m_team_alloc ; }
-  inline int team_iter()  const { return m_team_iter ; }
+  TeamPolicyInternal(int league_size_request,
+                     const Kokkos::AUTO_t& /* team_size_request */
+                     ,
+                     int /* vector_length_request */ = 1)
+      : m_team_scratch_size{0, 0},
+        m_thread_scratch_size{0, 0},
+        m_chunk_size(0) {
+    init(league_size_request,
+#ifdef KOKKOS_ENABLE_DEPRECATED_CODE
+         traits::execution_space::thread_pool_size(2)
+#else
+         traits::execution_space::impl_thread_pool_size(2)
+#endif
+    );
+  }
 
-  inline int chunk_size() const { return m_chunk_size ; }
+  inline int team_alloc() const { return m_team_alloc; }
+  inline int team_iter() const { return m_team_iter; }
+
+  inline int chunk_size() const { return m_chunk_size; }
 
 #ifdef KOKKOS_ENABLE_DEPRECATED_CODE
   /** \brief set chunk_size to a discrete value*/
-  inline TeamPolicyInternal set_chunk_size(typename traits::index_type chunk_size_) const {
+  inline TeamPolicyInternal set_chunk_size(
+      typename traits::index_type chunk_size_) const {
     TeamPolicyInternal p = *this;
-    p.m_chunk_size = chunk_size_;
+    p.m_chunk_size       = chunk_size_;
     return p;
   }
 
-  inline TeamPolicyInternal set_scratch_size(const int& level, const PerTeamValue& per_team) const {
-    TeamPolicyInternal p = *this;
+  inline TeamPolicyInternal set_scratch_size(
+      const int& level, const PerTeamValue& per_team) const {
+    TeamPolicyInternal p         = *this;
     p.m_team_scratch_size[level] = per_team.value;
     return p;
   }
 
-  inline TeamPolicyInternal set_scratch_size(const int& level, const PerThreadValue& per_thread) const {
-    TeamPolicyInternal p = *this;
+  inline TeamPolicyInternal set_scratch_size(
+      const int& level, const PerThreadValue& per_thread) const {
+    TeamPolicyInternal p           = *this;
     p.m_thread_scratch_size[level] = per_thread.value;
     return p;
   }
 
-  inline TeamPolicyInternal set_scratch_size(const int& level, const PerTeamValue& per_team, const PerThreadValue& per_thread) const {
-    TeamPolicyInternal p = *this;
-    p.m_team_scratch_size[level] = per_team.value;
+  inline TeamPolicyInternal set_scratch_size(
+      const int& level, const PerTeamValue& per_team,
+      const PerThreadValue& per_thread) const {
+    TeamPolicyInternal p           = *this;
+    p.m_team_scratch_size[level]   = per_team.value;
     p.m_thread_scratch_size[level] = per_thread.value;
     return p;
   }
 #else
   /** \brief set chunk_size to a discrete value*/
-  inline TeamPolicyInternal& set_chunk_size(typename traits::index_type chunk_size_) {
+  inline TeamPolicyInternal& set_chunk_size(
+      typename traits::index_type chunk_size_) {
     m_chunk_size = chunk_size_;
     return *this;
   }
 
-  /** \brief set per team scratch size for a specific level of the scratch hierarchy */
-  inline TeamPolicyInternal& set_scratch_size(const int& level, const PerTeamValue& per_team) {
+  /** \brief set per team scratch size for a specific level of the scratch
+   * hierarchy */
+  inline TeamPolicyInternal& set_scratch_size(const int& level,
+                                              const PerTeamValue& per_team) {
     m_team_scratch_size[level] = per_team.value;
     return *this;
   }
 
-  /** \brief set per thread scratch size for a specific level of the scratch hierarchy */
-  inline TeamPolicyInternal& set_scratch_size(const int& level, const PerThreadValue& per_thread) {
+  /** \brief set per thread scratch size for a specific level of the scratch
+   * hierarchy */
+  inline TeamPolicyInternal& set_scratch_size(
+      const int& level, const PerThreadValue& per_thread) {
     m_thread_scratch_size[level] = per_thread.value;
     return *this;
   }
 
-  /** \brief set per thread and per team scratch size for a specific level of the scratch hierarchy */
-  inline TeamPolicyInternal& set_scratch_size(const int& level, const PerTeamValue& per_team, const PerThreadValue& per_thread) {
+  /** \brief set per thread and per team scratch size for a specific level of
+   * the scratch hierarchy */
+  inline TeamPolicyInternal& set_scratch_size(
+      const int& level, const PerTeamValue& per_team,
+      const PerThreadValue& per_thread) {
     m_team_scratch_size[level] = per_team.value;
     m_thread_scratch_size[level] = per_thread.value;
     return *this;
   }
 #endif
 
-protected:
+ protected:
 #ifdef KOKKOS_ENABLE_DEPRECATED_CODE
   /** \brief set chunk_size to a discrete value*/
-  inline TeamPolicyInternal internal_set_chunk_size(typename traits::index_type chunk_size_) {
+  inline TeamPolicyInternal internal_set_chunk_size(
+      typename traits::index_type chunk_size_) {
     m_chunk_size = chunk_size_;
     return *this;
   }
 
-  /** \brief set per team scratch size for a specific level of the scratch hierarchy */
-  inline TeamPolicyInternal internal_set_scratch_size(const int& level, const PerTeamValue& per_team) {
+  /** \brief set per team scratch size for a specific level of the scratch
+   * hierarchy */
+  inline TeamPolicyInternal internal_set_scratch_size(
+      const int& level, const PerTeamValue& per_team) {
     m_team_scratch_size[level] = per_team.value;
     return *this;
   }
 
-  /** \brief set per thread scratch size for a specific level of the scratch hierarchy */
-  inline TeamPolicyInternal internal_set_scratch_size(const int& level, const PerThreadValue& per_thread) {
+  /** \brief set per thread scratch size for a specific level of the scratch
+   * hierarchy */
+  inline TeamPolicyInternal internal_set_scratch_size(
+      const int& level, const PerThreadValue& per_thread) {
     m_thread_scratch_size[level] = per_thread.value;
     return *this;
   }
 
-  /** \brief set per thread and per team scratch size for a specific level of the scratch hierarchy */
-  inline TeamPolicyInternal internal_set_scratch_size(const int& level, const PerTeamValue& per_team, const PerThreadValue& per_thread) {
-    m_team_scratch_size[level] = per_team.value;
+  /** \brief set per thread and per team scratch size for a specific level of
+   * the scratch hierarchy */
+  inline TeamPolicyInternal internal_set_scratch_size(
+      const int& level, const PerTeamValue& per_team,
+      const PerThreadValue& per_thread) {
+    m_team_scratch_size[level]   = per_team.value;
     m_thread_scratch_size[level] = per_thread.value;
     return *this;
   }
 #endif
 
-private:
+ private:
   /** \brief finalize chunk_size if it was set to AUTO*/
   inline void set_auto_chunk_size() {
-
 #ifdef KOKKOS_ENABLE_DEPRECATED_CODE
-    int concurrency = traits::execution_space::thread_pool_size(0)/m_team_alloc;
+    int concurrency =
+        traits::execution_space::thread_pool_size(0) / m_team_alloc;
 #else
-    int concurrency = traits::execution_space::impl_thread_pool_size(0)/m_team_alloc;
+    int concurrency =
+        traits::execution_space::impl_thread_pool_size(0) / m_team_alloc;
 #endif
-    if( concurrency==0 ) concurrency=1;
+    if (concurrency == 0) concurrency = 1;
 
-    if(m_chunk_size > 0) {
-      if(!Impl::is_integral_power_of_two( m_chunk_size ))
-        Kokkos::abort("TeamPolicy blocking granularity must be power of two" );
+    if (m_chunk_size > 0) {
+      if (!Impl::is_integral_power_of_two(m_chunk_size))
+        Kokkos::abort("TeamPolicy blocking granularity must be power of two");
     }
 
     int new_chunk_size = 1;
-    while(new_chunk_size*100*concurrency < m_league_size)
+    while (new_chunk_size * 100 * concurrency < m_league_size)
       new_chunk_size *= 2;
-    if(new_chunk_size < 128) {
+    if (new_chunk_size < 128) {
       new_chunk_size = 1;
-      while( (new_chunk_size*40*concurrency < m_league_size ) && (new_chunk_size<128) )
-        new_chunk_size*=2;
+      while ((new_chunk_size * 40 * concurrency < m_league_size) &&
+             (new_chunk_size < 128))
+        new_chunk_size *= 2;
     }
     m_chunk_size = new_chunk_size;
   }
 
-public:
-  typedef Impl::HostThreadTeamMember< Kokkos::OpenMP > member_type ;
+ public:
+  typedef Impl::HostThreadTeamMember<Kokkos::OpenMP> member_type;
 };
 
-}} // namespace Kokkos::Impl
+}  // namespace Impl
+}  // namespace Kokkos
 
 #endif
 #endif /* KOKKOS_OPENMP_TEAM_HPP */
-
-
diff --git a/lib/kokkos/core/src/OpenMP/Kokkos_OpenMP_ViewCopyETIAvail.hpp b/lib/kokkos/core/src/OpenMP/Kokkos_OpenMP_ViewCopyETIAvail.hpp
index 2663b99dfb..7bcd515f4c 100644
--- a/lib/kokkos/core/src/OpenMP/Kokkos_OpenMP_ViewCopyETIAvail.hpp
+++ b/lib/kokkos/core/src/OpenMP/Kokkos_OpenMP_ViewCopyETIAvail.hpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -48,10 +49,9 @@ namespace Kokkos {
 namespace Impl {
 #define KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE Kokkos::OpenMP
 
-#include<eti/common/Kokkos_ViewFillCopyETIAvail_Macros.hpp>
+#include <eti/common/Kokkos_ViewFillCopyETIAvail_Macros.hpp>
 
 #undef KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
 #endif
-
diff --git a/lib/kokkos/core/src/OpenMP/Kokkos_OpenMP_ViewCopyETIDecl.hpp b/lib/kokkos/core/src/OpenMP/Kokkos_OpenMP_ViewCopyETIDecl.hpp
index 960fb138f4..b5254e1275 100644
--- a/lib/kokkos/core/src/OpenMP/Kokkos_OpenMP_ViewCopyETIDecl.hpp
+++ b/lib/kokkos/core/src/OpenMP/Kokkos_OpenMP_ViewCopyETIDecl.hpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -48,10 +49,9 @@ namespace Kokkos {
 namespace Impl {
 #define KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE Kokkos::OpenMP
 
-#include<eti/common/Kokkos_ViewFillCopyETIDecl_Macros.hpp>
+#include <eti/common/Kokkos_ViewFillCopyETIDecl_Macros.hpp>
 
 #undef KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
 #endif
-
diff --git a/lib/kokkos/core/src/OpenMP/Kokkos_OpenMP_WorkGraphPolicy.hpp b/lib/kokkos/core/src/OpenMP/Kokkos_OpenMP_WorkGraphPolicy.hpp
index 0742575cb8..4ff1486c68 100644
--- a/lib/kokkos/core/src/OpenMP/Kokkos_OpenMP_WorkGraphPolicy.hpp
+++ b/lib/kokkos/core/src/OpenMP/Kokkos_OpenMP_WorkGraphPolicy.hpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -47,63 +48,54 @@
 namespace Kokkos {
 namespace Impl {
 
-template< class FunctorType , class ... Traits >
-class ParallelFor< FunctorType ,
-                   Kokkos::WorkGraphPolicy< Traits ... > ,
-                   Kokkos::OpenMP
-                 >
-{
-private:
+template <class FunctorType, class... Traits>
+class ParallelFor<FunctorType, Kokkos::WorkGraphPolicy<Traits...>,
+                  Kokkos::OpenMP> {
+ private:
+  typedef Kokkos::WorkGraphPolicy<Traits...> Policy;
 
-  typedef Kokkos::WorkGraphPolicy< Traits ... > Policy ;
+  Policy m_policy;
+  FunctorType m_functor;
 
-  Policy       m_policy ;
-  FunctorType  m_functor ;
+  template <class TagType>
+  typename std::enable_if<std::is_same<TagType, void>::value>::type exec_one(
+      const std::int32_t w) const noexcept {
+    m_functor(w);
+  }
 
-  template< class TagType >
-  typename std::enable_if< std::is_same< TagType , void >::value >::type
-  exec_one( const std::int32_t w ) const noexcept
-    { m_functor( w ); }
+  template <class TagType>
+  typename std::enable_if<!std::is_same<TagType, void>::value>::type exec_one(
+      const std::int32_t w) const noexcept {
+    const TagType t{};
+    m_functor(t, w);
+  }
 
-  template< class TagType >
-  typename std::enable_if< ! std::is_same< TagType , void >::value >::type
-  exec_one( const std::int32_t w ) const noexcept
-    { const TagType t{} ; m_functor( t , w ); }
-
-public:
-
-  inline
-  void execute()
-  {
+ public:
+  inline void execute() {
 #ifdef KOKKOS_ENABLE_DEPRECATED_CODE
-    #pragma omp parallel num_threads(OpenMP::thread_pool_size())
+#pragma omp parallel num_threads(OpenMP::thread_pool_size())
 #else
-    #pragma omp parallel num_threads(OpenMP::impl_thread_pool_size())
+#pragma omp parallel num_threads(OpenMP::impl_thread_pool_size())
 #endif
     {
       // Spin until COMPLETED_TOKEN.
       // END_TOKEN indicates no work is currently available.
 
-      for ( std::int32_t w = Policy::END_TOKEN ;
-            Policy::COMPLETED_TOKEN != ( w = m_policy.pop_work() ) ; ) {
-        if ( Policy::END_TOKEN != w ) {
-          exec_one< typename Policy::work_tag >( w );
+      for (std::int32_t w = Policy::END_TOKEN;
+           Policy::COMPLETED_TOKEN != (w = m_policy.pop_work());) {
+        if (Policy::END_TOKEN != w) {
+          exec_one<typename Policy::work_tag>(w);
           m_policy.completed_work(w);
         }
       }
     }
   }
 
-  inline
-  ParallelFor( const FunctorType & arg_functor
-             , const Policy      & arg_policy )
-    : m_policy( arg_policy )
-    , m_functor( arg_functor )
-  {}
+  inline ParallelFor(const FunctorType& arg_functor, const Policy& arg_policy)
+      : m_policy(arg_policy), m_functor(arg_functor) {}
 };
 
-} // namespace Impl
-} // namespace Kokkos
+}  // namespace Impl
+}  // namespace Kokkos
 
 #endif /* #define KOKKOS_OPENMP_WORKGRAPHPOLICY_HPP */
-
diff --git a/lib/kokkos/core/src/OpenMPTarget/Kokkos_OpenMPTargetSpace.cpp b/lib/kokkos/core/src/OpenMPTarget/Kokkos_OpenMPTargetSpace.cpp
index c7d4defad2..2dd038dce7 100644
--- a/lib/kokkos/core/src/OpenMPTarget/Kokkos_OpenMPTargetSpace.cpp
+++ b/lib/kokkos/core/src/OpenMPTarget/Kokkos_OpenMPTargetSpace.cpp
@@ -1,13 +1,14 @@
 /*
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -36,7 +37,7 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 */
@@ -62,36 +63,30 @@
 //----------------------------------------------------------------------------
 //----------------------------------------------------------------------------
 
-
 namespace Kokkos {
 namespace Experimental {
 /* Default allocation mechanism */
-OpenMPTargetSpace::OpenMPTargetSpace()
-{}
+OpenMPTargetSpace::OpenMPTargetSpace() {}
 
-void * OpenMPTargetSpace::allocate( const size_t arg_alloc_size ) const
-{
-  static_assert( sizeof(void*) == sizeof(uintptr_t)
-               , "Error sizeof(void*) != sizeof(uintptr_t)" );
+void *OpenMPTargetSpace::allocate(const size_t arg_alloc_size) const {
+  static_assert(sizeof(void *) == sizeof(uintptr_t),
+                "Error sizeof(void*) != sizeof(uintptr_t)");
 
-  void * ptr;
-  
-  ptr = omp_target_alloc( arg_alloc_size, omp_get_default_device());
+  void *ptr;
+
+  ptr = omp_target_alloc(arg_alloc_size, omp_get_default_device());
 
   return ptr;
 }
 
-
-void OpenMPTargetSpace::deallocate( void * const arg_alloc_ptr , const size_t arg_alloc_size ) const
-{
-  if ( arg_alloc_ptr ) {
-
-      omp_target_free( arg_alloc_ptr , omp_get_default_device() );
-
+void OpenMPTargetSpace::deallocate(void *const arg_alloc_ptr,
+                                   const size_t arg_alloc_size) const {
+  if (arg_alloc_ptr) {
+    omp_target_free(arg_alloc_ptr, omp_get_default_device());
   }
 }
-} // namespace Experimental
-} // namespace Kokkos
+}  // namespace Experimental
+}  // namespace Kokkos
 
 //----------------------------------------------------------------------------
 //----------------------------------------------------------------------------
@@ -100,146 +95,145 @@ namespace Kokkos {
 namespace Impl {
 
 #ifdef KOKKOS_DEBUG
-SharedAllocationRecord< void , void >
-SharedAllocationRecord< Kokkos::Experimental::OpenMPTargetSpace , void >::s_root_record ;
+SharedAllocationRecord<void, void> SharedAllocationRecord<
+    Kokkos::Experimental::OpenMPTargetSpace, void>::s_root_record;
 #endif
 
-SharedAllocationRecord< Kokkos::Experimental::OpenMPTargetSpace , void >::
-~SharedAllocationRecord()
-{
-  m_space.deallocate( SharedAllocationRecord< void , void >::m_alloc_ptr
-                    , SharedAllocationRecord< void , void >::m_alloc_size
-                    );
+SharedAllocationRecord<Kokkos::Experimental::OpenMPTargetSpace,
+                       void>::~SharedAllocationRecord() {
+  m_space.deallocate(SharedAllocationRecord<void, void>::m_alloc_ptr,
+                     SharedAllocationRecord<void, void>::m_alloc_size);
 }
 
-//TODO: Implement deep copy back see CudaSpace 
-std::string
-SharedAllocationRecord< Kokkos::Experimental::OpenMPTargetSpace , void >::get_label() const {
+// TODO: Implement deep copy back see CudaSpace
+std::string SharedAllocationRecord<Kokkos::Experimental::OpenMPTargetSpace,
+                                   void>::get_label() const {
   return std::string("OpenMPTargetAllocation");
 }
 
-SharedAllocationRecord< Kokkos::Experimental::OpenMPTargetSpace , void >* 
-SharedAllocationRecord< Kokkos::Experimental::OpenMPTargetSpace , void >::
-allocate( const Kokkos::Experimental::OpenMPTargetSpace & arg_space,
-          const std::string               & arg_label ,
-          const size_t                      arg_alloc_size) {
-  return new SharedAllocationRecord< Kokkos::Experimental::OpenMPTargetSpace , void >(arg_space,arg_label,arg_alloc_size);
+SharedAllocationRecord<Kokkos::Experimental::OpenMPTargetSpace, void> *
+SharedAllocationRecord<Kokkos::Experimental::OpenMPTargetSpace, void>::allocate(
+    const Kokkos::Experimental::OpenMPTargetSpace &arg_space,
+    const std::string &arg_label, const size_t arg_alloc_size) {
+  return new SharedAllocationRecord<Kokkos::Experimental::OpenMPTargetSpace,
+                                    void>(arg_space, arg_label, arg_alloc_size);
 }
 
-void
-SharedAllocationRecord< Kokkos::Experimental::OpenMPTargetSpace , void >::
-deallocate( SharedAllocationRecord<void, void> * arg_rec )
-{
-  delete static_cast<SharedAllocationRecord*>(arg_rec);
+void SharedAllocationRecord<Kokkos::Experimental::OpenMPTargetSpace,
+                            void>::deallocate(SharedAllocationRecord<void, void>
+                                                  *arg_rec) {
+  delete static_cast<SharedAllocationRecord *>(arg_rec);
 }
 
-SharedAllocationRecord< Kokkos::Experimental::OpenMPTargetSpace , void >::
-SharedAllocationRecord( const Kokkos::Experimental::OpenMPTargetSpace & arg_space
-                      , const std::string       & arg_label
-                      , const size_t              arg_alloc_size
-                      , const SharedAllocationRecord< void , void >::function_type arg_dealloc
-                      )
-  // Pass through allocated [ SharedAllocationHeader , user_memory ]
-  // Pass through deallocation function
-  : SharedAllocationRecord< void , void >
-      (
+SharedAllocationRecord<Kokkos::Experimental::OpenMPTargetSpace, void>::
+    SharedAllocationRecord(
+        const Kokkos::Experimental::OpenMPTargetSpace &arg_space,
+        const std::string &arg_label, const size_t arg_alloc_size,
+        const SharedAllocationRecord<void, void>::function_type arg_dealloc)
+    // Pass through allocated [ SharedAllocationHeader , user_memory ]
+    // Pass through deallocation function
+    : SharedAllocationRecord<void, void>(
 #ifdef KOKKOS_DEBUG
-        & SharedAllocationRecord< Kokkos::Experimental::OpenMPTargetSpace , void >::s_root_record,
+          &SharedAllocationRecord<Kokkos::Experimental::OpenMPTargetSpace,
+                                  void>::s_root_record,
 #endif
-        reinterpret_cast<SharedAllocationHeader*>( arg_space.allocate( sizeof(SharedAllocationHeader) + arg_alloc_size ) )
-      , sizeof(SharedAllocationHeader) + arg_alloc_size
-      , arg_dealloc
-      )
-  , m_space( arg_space )
-{
+          reinterpret_cast<SharedAllocationHeader *>(arg_space.allocate(
+              sizeof(SharedAllocationHeader) + arg_alloc_size)),
+          sizeof(SharedAllocationHeader) + arg_alloc_size, arg_dealloc),
+      m_space(arg_space) {
   SharedAllocationHeader header;
 
-  header.m_record = static_cast< SharedAllocationRecord< void , void > * >( this );
+  header.m_record = static_cast<SharedAllocationRecord<void, void> *>(this);
 
-  strncpy( header.m_label
-          , arg_label.c_str()
-          , SharedAllocationHeader::maximum_label_length
-          );
+  strncpy(header.m_label, arg_label.c_str(),
+          SharedAllocationHeader::maximum_label_length);
   // Set last element zero, in case c_str is too long
-  header.m_label[SharedAllocationHeader::maximum_label_length - 1] = (char) 0; 
-  //TODO DeepCopy
+  header.m_label[SharedAllocationHeader::maximum_label_length - 1] = (char)0;
+  // TODO DeepCopy
   // DeepCopy
-
 }
 
 //----------------------------------------------------------------------------
 
-void * SharedAllocationRecord< Kokkos::Experimental::OpenMPTargetSpace , void >::
-allocate_tracked( const Kokkos::Experimental::OpenMPTargetSpace & arg_space
-                , const std::string & arg_alloc_label 
-                , const size_t arg_alloc_size )
-{
-  if ( ! arg_alloc_size ) return (void *) 0 ;
+void *SharedAllocationRecord<Kokkos::Experimental::OpenMPTargetSpace, void>::
+    allocate_tracked(const Kokkos::Experimental::OpenMPTargetSpace &arg_space,
+                     const std::string &arg_alloc_label,
+                     const size_t arg_alloc_size) {
+  if (!arg_alloc_size) return (void *)0;
 
-  SharedAllocationRecord * const r =
-    allocate( arg_space , arg_alloc_label , arg_alloc_size );
+  SharedAllocationRecord *const r =
+      allocate(arg_space, arg_alloc_label, arg_alloc_size);
 
-  RecordBase::increment( r );
+  RecordBase::increment(r);
 
   return r->data();
 }
 
-void SharedAllocationRecord< Kokkos::Experimental::OpenMPTargetSpace , void >::
-deallocate_tracked( void * const arg_alloc_ptr )
-{
-  if ( arg_alloc_ptr != 0 ) {
-    SharedAllocationRecord * const r = get_record( arg_alloc_ptr );
+void SharedAllocationRecord<Kokkos::Experimental::OpenMPTargetSpace,
+                            void>::deallocate_tracked(void *const
+                                                          arg_alloc_ptr) {
+  if (arg_alloc_ptr != 0) {
+    SharedAllocationRecord *const r = get_record(arg_alloc_ptr);
 
-    RecordBase::decrement( r );
+    RecordBase::decrement(r);
   }
 }
 
-void * SharedAllocationRecord< Kokkos::Experimental::OpenMPTargetSpace , void >::
-reallocate_tracked( void * const arg_alloc_ptr
-                  , const size_t arg_alloc_size )
-{
-  SharedAllocationRecord * const r_old = get_record( arg_alloc_ptr );
-  SharedAllocationRecord * const r_new = allocate( r_old->m_space , r_old->get_label() , arg_alloc_size );
+void *SharedAllocationRecord<Kokkos::Experimental::OpenMPTargetSpace, void>::
+    reallocate_tracked(void *const arg_alloc_ptr, const size_t arg_alloc_size) {
+  SharedAllocationRecord *const r_old = get_record(arg_alloc_ptr);
+  SharedAllocationRecord *const r_new =
+      allocate(r_old->m_space, r_old->get_label(), arg_alloc_size);
 
-  //Kokkos::Impl::DeepCopy<OpenMPTargetSpace,OpenMPTargetSpace>( r_new->data() , r_old->data()
-  //                                           , std::min( r_old->size() , r_new->size() ) );
+  // Kokkos::Impl::DeepCopy<OpenMPTargetSpace,OpenMPTargetSpace>( r_new->data()
+  // , r_old->data()
+  //                                           , std::min( r_old->size() ,
+  //                                           r_new->size() ) );
 
-  RecordBase::increment( r_new );
-  RecordBase::decrement( r_old );
+  RecordBase::increment(r_new);
+  RecordBase::decrement(r_old);
 
   return r_new->data();
 }
 
-SharedAllocationRecord< Kokkos::Experimental::OpenMPTargetSpace , void > *
-SharedAllocationRecord< Kokkos::Experimental::OpenMPTargetSpace , void >::get_record( void * alloc_ptr )
-{
-  typedef SharedAllocationHeader  Header ;
-  typedef SharedAllocationRecord< Kokkos::Experimental::OpenMPTargetSpace , void >  RecordHost ;
+SharedAllocationRecord<Kokkos::Experimental::OpenMPTargetSpace, void>
+    *SharedAllocationRecord<Kokkos::Experimental::OpenMPTargetSpace,
+                            void>::get_record(void *alloc_ptr) {
+  typedef SharedAllocationHeader Header;
+  typedef SharedAllocationRecord<Kokkos::Experimental::OpenMPTargetSpace, void>
+      RecordHost;
 
-  SharedAllocationHeader const * const head   = alloc_ptr ? Header::get_header( alloc_ptr ) : (SharedAllocationHeader *)0 ;
-  RecordHost                   * const record = head ? static_cast< RecordHost * >( head->m_record ) : (RecordHost *) 0 ;
+  SharedAllocationHeader const *const head =
+      alloc_ptr ? Header::get_header(alloc_ptr) : (SharedAllocationHeader *)0;
+  RecordHost *const record =
+      head ? static_cast<RecordHost *>(head->m_record) : (RecordHost *)0;
 
-  if ( ! alloc_ptr || record->m_alloc_ptr != head ) {
-    Kokkos::Impl::throw_runtime_exception( std::string("Kokkos::Experimental::Impl::SharedAllocationRecord< Kokkos::Experimental::OpenMPTargetSpace , void >::get_record ERROR" ) );
+  if (!alloc_ptr || record->m_alloc_ptr != head) {
+    Kokkos::Impl::throw_runtime_exception(std::string(
+        "Kokkos::Experimental::Impl::SharedAllocationRecord< "
+        "Kokkos::Experimental::OpenMPTargetSpace , void >::get_record ERROR"));
   }
 
-  return record ;
+  return record;
 }
 
 // Iterate records to print orphaned memory ...
-void SharedAllocationRecord< Kokkos::Experimental::OpenMPTargetSpace , void >::
-print_records( std::ostream & s , const Kokkos::Experimental::OpenMPTargetSpace & space , bool detail )
-{
+void SharedAllocationRecord<Kokkos::Experimental::OpenMPTargetSpace, void>::
+    print_records(std::ostream &s,
+                  const Kokkos::Experimental::OpenMPTargetSpace &space,
+                  bool detail) {
 #ifdef KOKKOS_DEBUG
-  SharedAllocationRecord< void , void >::print_host_accessible_records( s , "OpenMPTargetSpace" , & s_root_record , detail );
+  SharedAllocationRecord<void, void>::print_host_accessible_records(
+      s, "OpenMPTargetSpace", &s_root_record, detail);
 #else
-  throw_runtime_exception("SharedAllocationRecord<OpenMPTargetSpace>::print_records"
+  throw_runtime_exception(
+      "SharedAllocationRecord<OpenMPTargetSpace>::print_records"
       " only works with KOKKOS_DEBUG enabled");
 #endif
 }
 
-} // namespace Impl
-} // namespace Kokkos
+}  // namespace Impl
+}  // namespace Kokkos
 
 /*--------------------------------------------------------------------------*/
 /*--------------------------------------------------------------------------*/
@@ -247,41 +241,35 @@ print_records( std::ostream & s , const Kokkos::Experimental::OpenMPTargetSpace
 namespace Kokkos {
 namespace Impl {
 
-template< class >
-struct ViewOperatorBoundsErrorAbort ;
+template <class>
+struct ViewOperatorBoundsErrorAbort;
 
-template<>
-struct ViewOperatorBoundsErrorAbort< Kokkos::Experimental::OpenMPTargetSpace > {
- static void apply( const size_t rank
-                  , const size_t n0 , const size_t n1
-                  , const size_t n2 , const size_t n3
-                  , const size_t n4 , const size_t n5
-                  , const size_t n6 , const size_t n7
-                  , const size_t i0 , const size_t i1
-                  , const size_t i2 , const size_t i3
-                  , const size_t i4 , const size_t i5
-                  , const size_t i6 , const size_t i7 );
+template <>
+struct ViewOperatorBoundsErrorAbort<Kokkos::Experimental::OpenMPTargetSpace> {
+  static void apply(const size_t rank, const size_t n0, const size_t n1,
+                    const size_t n2, const size_t n3, const size_t n4,
+                    const size_t n5, const size_t n6, const size_t n7,
+                    const size_t i0, const size_t i1, const size_t i2,
+                    const size_t i3, const size_t i4, const size_t i5,
+                    const size_t i6, const size_t i7);
 };
 
-void ViewOperatorBoundsErrorAbort< Kokkos::Experimental::OpenMPTargetSpace >::
-apply( const size_t rank
-     , const size_t n0 , const size_t n1
-     , const size_t n2 , const size_t n3
-     , const size_t n4 , const size_t n5
-     , const size_t n6 , const size_t n7
-     , const size_t i0 , const size_t i1
-     , const size_t i2 , const size_t i3
-     , const size_t i4 , const size_t i5
-     , const size_t i6 , const size_t i7 )
-{
-  printf( "View operator bounds error : rank(%lu) dim(%lu,%lu,%lu,%lu,%lu,%lu,%lu,%lu) index(%lu,%lu,%lu,%lu,%lu,%lu,%lu,%lu)"
-          , rank , n0 , n1 , n2 , n3 , n4 , n5 , n6 , n7
-                 , i0 , i1 , i2 , i3 , i4 , i5 , i6 , i7 );
-  //Kokkos::Impl::throw_runtime_exception( buffer );
+void ViewOperatorBoundsErrorAbort<Kokkos::Experimental::OpenMPTargetSpace>::
+    apply(const size_t rank, const size_t n0, const size_t n1, const size_t n2,
+          const size_t n3, const size_t n4, const size_t n5, const size_t n6,
+          const size_t n7, const size_t i0, const size_t i1, const size_t i2,
+          const size_t i3, const size_t i4, const size_t i5, const size_t i6,
+          const size_t i7) {
+  printf(
+      "View operator bounds error : rank(%lu) "
+      "dim(%lu,%lu,%lu,%lu,%lu,%lu,%lu,%lu) "
+      "index(%lu,%lu,%lu,%lu,%lu,%lu,%lu,%lu)",
+      rank, n0, n1, n2, n3, n4, n5, n6, n7, i0, i1, i2, i3, i4, i5, i6, i7);
+  // Kokkos::Impl::throw_runtime_exception( buffer );
 }
 
-} // namespace Impl
-} // namespace Kokkos
+}  // namespace Impl
+}  // namespace Kokkos
 
 /*--------------------------------------------------------------------------*/
 /*--------------------------------------------------------------------------*/
@@ -303,14 +291,14 @@ void init_lock_array_host_space() {
 
 bool lock_address_host_space(void* ptr) {
   return 0 == atomic_compare_exchange( &HOST_SPACE_ATOMIC_LOCKS[
-      (( size_t(ptr) >> 2 ) & HOST_SPACE_ATOMIC_MASK) ^ HOST_SPACE_ATOMIC_XOR_MASK] ,
-                                  0 , 1);
+      (( size_t(ptr) >> 2 ) & HOST_SPACE_ATOMIC_MASK) ^
+HOST_SPACE_ATOMIC_XOR_MASK] , 0 , 1);
 }
 
 void unlock_address_host_space(void* ptr) {
    atomic_exchange( &HOST_SPACE_ATOMIC_LOCKS[
-      (( size_t(ptr) >> 2 ) & HOST_SPACE_ATOMIC_MASK) ^ HOST_SPACE_ATOMIC_XOR_MASK] ,
-                    0);
+      (( size_t(ptr) >> 2 ) & HOST_SPACE_ATOMIC_MASK) ^
+HOST_SPACE_ATOMIC_XOR_MASK] , 0);
 }
 
 }
diff --git a/lib/kokkos/core/src/OpenMPTarget/Kokkos_OpenMPTarget_Exec.cpp b/lib/kokkos/core/src/OpenMPTarget/Kokkos_OpenMPTarget_Exec.cpp
index 2fa2f1382c..140a4cb88e 100644
--- a/lib/kokkos/core/src/OpenMPTarget/Kokkos_OpenMPTarget_Exec.cpp
+++ b/lib/kokkos/core/src/OpenMPTarget/Kokkos_OpenMPTarget_Exec.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -60,13 +61,13 @@ namespace {
 KOKKOS_INLINE_FUNCTION
 int kokkos_omp_in_parallel();
 
-int kokkos_omp_in_critical_region = ( Kokkos::HostSpace::register_in_parallel( kokkos_omp_in_parallel ) , 0 );
+int kokkos_omp_in_critical_region =
+    (Kokkos::HostSpace::register_in_parallel(kokkos_omp_in_parallel), 0);
 
 KOKKOS_INLINE_FUNCTION
-int kokkos_omp_in_parallel()
-{
+int kokkos_omp_in_parallel() {
 #ifndef __CUDA_ARCH__
-  return omp_in_parallel() && ! kokkos_omp_in_critical_region ;
+  return omp_in_parallel() && !kokkos_omp_in_critical_region;
 #else
   return 0;
 #endif
@@ -74,84 +75,81 @@ int kokkos_omp_in_parallel()
 
 bool s_using_hwloc = false;
 
-} // namespace
-} // namespace Impl
-} // namespace Kokkos
-
+}  // namespace
+}  // namespace Impl
+}  // namespace Kokkos
 
 namespace Kokkos {
 namespace Experimental {
 bool OpenMPTarget::m_is_initialized = false;
 }
-}
+}  // namespace Kokkos
 
 namespace Kokkos {
 namespace Impl {
 
+// int OpenMPTargetExec::m_map_rank[ OpenMPTargetExec::MAX_THREAD_COUNT ] = { 0
+// };
 
-//int OpenMPTargetExec::m_map_rank[ OpenMPTargetExec::MAX_THREAD_COUNT ] = { 0 };
+// int OpenMPTargetExec::m_pool_topo[ 4 ] = { 0 };
 
-//int OpenMPTargetExec::m_pool_topo[ 4 ] = { 0 };
+// OpenMPTargetExec * OpenMPTargetExec::m_pool[
+// OpenMPTargetExec::MAX_THREAD_COUNT ] = { 0 };
 
-//OpenMPTargetExec * OpenMPTargetExec::m_pool[ OpenMPTargetExec::MAX_THREAD_COUNT ] = { 0 };
-
-void OpenMPTargetExec::verify_is_process( const char * const label )
-{
-  if ( omp_in_parallel() ) {
-    std::string msg( label );
-    msg.append( " ERROR: in parallel" );
-    Kokkos::Impl::throw_runtime_exception( msg );
+void OpenMPTargetExec::verify_is_process(const char* const label) {
+  if (omp_in_parallel()) {
+    std::string msg(label);
+    msg.append(" ERROR: in parallel");
+    Kokkos::Impl::throw_runtime_exception(msg);
   }
 }
 
-void OpenMPTargetExec::verify_initialized( const char * const label )
-{
-  if ( 0 == Kokkos::Experimental::OpenMPTarget::is_initialized() ) {
-    std::string msg( label );
-    msg.append( " ERROR: not initialized" );
-    Kokkos::Impl::throw_runtime_exception( msg );
+void OpenMPTargetExec::verify_initialized(const char* const label) {
+  if (0 == Kokkos::Experimental::OpenMPTarget::is_initialized()) {
+    std::string msg(label);
+    msg.append(" ERROR: not initialized");
+    Kokkos::Impl::throw_runtime_exception(msg);
   }
 
-  if ( omp_get_max_threads() != Kokkos::Experimental::OpenMPTarget::thread_pool_size(0) ) {
-    std::string msg( label );
-    msg.append( " ERROR: Initialized but threads modified inappropriately" );
-    Kokkos::Impl::throw_runtime_exception( msg );
+  if (omp_get_max_threads() !=
+      Kokkos::Experimental::OpenMPTarget::thread_pool_size(0)) {
+    std::string msg(label);
+    msg.append(" ERROR: Initialized but threads modified inappropriately");
+    Kokkos::Impl::throw_runtime_exception(msg);
   }
-
 }
 
-void*    OpenMPTargetExec::m_scratch_ptr  = NULL;
+void* OpenMPTargetExec::m_scratch_ptr    = NULL;
 int64_t OpenMPTargetExec::m_scratch_size = 0;
 
-void OpenMPTargetExec::clear_scratch()
-{
+void OpenMPTargetExec::clear_scratch() {
   Kokkos::Experimental::OpenMPTargetSpace space;
-  space.deallocate(m_scratch_ptr,m_scratch_size);
-  m_scratch_ptr = NULL;
+  space.deallocate(m_scratch_ptr, m_scratch_size);
+  m_scratch_ptr  = NULL;
   m_scratch_size = NULL;
 }
 
 void* OpenMPTargetExec::get_scratch_ptr() { return m_scratch_ptr; }
 
-void OpenMPTargetExec::resize_scratch( int64_t reduce_bytes , 
-                                       int64_t team_reduce_bytes, 
-                                       int64_t team_shared_bytes, int64_t thread_local_bytes) 
-{
+void OpenMPTargetExec::resize_scratch(int64_t reduce_bytes,
+                                      int64_t team_reduce_bytes,
+                                      int64_t team_shared_bytes,
+                                      int64_t thread_local_bytes) {
   Kokkos::Experimental::OpenMPTargetSpace space;
-  uint64_t total_size = MAX_ACTIVE_TEAMS * reduce_bytes +            // Inter Team Reduction  
-                        MAX_ACTIVE_TEAMS * team_reduce_bytes  +    // Intra Team Reduction
-                        MAX_ACTIVE_TEAMS * team_shared_bytes +       // Team Local Scratch
-                        MAX_ACTIVE_THREADS * thread_local_bytes;     // Thread Private Scratch
+  uint64_t total_size =
+      MAX_ACTIVE_TEAMS * reduce_bytes +         // Inter Team Reduction
+      MAX_ACTIVE_TEAMS * team_reduce_bytes +    // Intra Team Reduction
+      MAX_ACTIVE_TEAMS * team_shared_bytes +    // Team Local Scratch
+      MAX_ACTIVE_THREADS * thread_local_bytes;  // Thread Private Scratch
 
-  if( total_size > m_scratch_size ) {
-    space.deallocate(m_scratch_ptr,m_scratch_size);
+  if (total_size > m_scratch_size) {
+    space.deallocate(m_scratch_ptr, m_scratch_size);
     m_scratch_size = total_size;
-    m_scratch_ptr = space.allocate(total_size);
+    m_scratch_ptr  = space.allocate(total_size);
   }
-
 }
-} // namespace Impl
-} // namespace Kokkos
+}  // namespace Impl
+}  // namespace Kokkos
 
 //----------------------------------------------------------------------------
 //----------------------------------------------------------------------------
@@ -160,114 +158,115 @@ namespace Kokkos {
 namespace Experimental {
 //----------------------------------------------------------------------------
 
-int OpenMPTarget::is_initialized()
-{ return m_is_initialized; }// != Impl::OpenMPTargetExec::m_pool[0]; }
+int OpenMPTarget::is_initialized() {
+  return m_is_initialized;
+}  // != Impl::OpenMPTargetExec::m_pool[0]; }
 
-void OpenMPTarget::initialize( unsigned thread_count ,
-                         unsigned use_numa_count ,
-                         unsigned use_cores_per_numa )
-{
+void OpenMPTarget::initialize(unsigned thread_count, unsigned use_numa_count,
+                              unsigned use_cores_per_numa) {
   // Before any other call to OMP query the maximum number of threads
   // and save the value for re-initialization unit testing.
 
-
   // Init the array for used for arbitrarily sized atomics
   Kokkos::Impl::init_lock_array_host_space();
 
-  #ifdef KOKKOS_ENABLE_PROFILING
-    Kokkos::Profiling::initialize();
-  #endif
+#ifdef KOKKOS_ENABLE_PROFILING
+  Kokkos::Profiling::initialize();
+#endif
   m_is_initialized = true;
 }
 
 //----------------------------------------------------------------------------
 
-void OpenMPTarget::finalize()
-{
-  Kokkos::Impl::OpenMPTargetExec::verify_initialized( "OpenMPTarget::finalize" );
-  Kokkos::Impl::OpenMPTargetExec::verify_is_process( "OpenMPTarget::finalize" );
+void OpenMPTarget::finalize() {
+  Kokkos::Impl::OpenMPTargetExec::verify_initialized("OpenMPTarget::finalize");
+  Kokkos::Impl::OpenMPTargetExec::verify_is_process("OpenMPTarget::finalize");
 
   m_is_initialized = false;
 
   omp_set_num_threads(1);
 
-  if ( Kokkos::Impl::s_using_hwloc && Kokkos::hwloc::can_bind_threads() ) {
+  if (Kokkos::Impl::s_using_hwloc && Kokkos::hwloc::can_bind_threads()) {
     hwloc::unbind_this_thread();
   }
 
-  #ifdef KOKKOS_ENABLE_PROFILING
-    Kokkos::Profiling::finalize();
-  #endif
+#ifdef KOKKOS_ENABLE_PROFILING
+  Kokkos::Profiling::finalize();
+#endif
 }
 
 //----------------------------------------------------------------------------
 
-void OpenMPTarget::print_configuration( std::ostream & s , const bool detail )
-{
-  Kokkos::Impl::OpenMPTargetExec::verify_is_process( "OpenMPTarget::print_configuration" );
-/*
-  s << "Kokkos::Experimental::OpenMPTarget" ;
+void OpenMPTarget::print_configuration(std::ostream& s, const bool detail) {
+  Kokkos::Impl::OpenMPTargetExec::verify_is_process(
+      "OpenMPTarget::print_configuration");
+  /*
+    s << "Kokkos::Experimental::OpenMPTarget" ;
 
-#if defined( KOKKOS_ENABLE_OPENMPTARGET )
-  s << " KOKKOS_ENABLE_OPENMPTARGET" ;
-#endif
-#if defined( KOKKOS_ENABLE_HWLOC )
+  #if defined( KOKKOS_ENABLE_OPENMPTARGET )
+    s << " KOKKOS_ENABLE_OPENMPTARGET" ;
+  #endif
+  #if defined( KOKKOS_ENABLE_HWLOC )
 
-  const unsigned numa_count_       = Kokkos::hwloc::get_available_numa_count();
-  const unsigned cores_per_numa   = Kokkos::hwloc::get_available_cores_per_numa();
-  const unsigned threads_per_core = Kokkos::hwloc::get_available_threads_per_core();
+    const unsigned numa_count_       =
+  Kokkos::hwloc::get_available_numa_count(); const unsigned cores_per_numa   =
+  Kokkos::hwloc::get_available_cores_per_numa(); const unsigned threads_per_core
+  = Kokkos::hwloc::get_available_threads_per_core();
 
-  s << " hwloc[" << numa_count_ << "x" << cores_per_numa << "x" << threads_per_core << "]"
-    << " hwloc_binding_" << ( Impl::s_using_hwloc ? "enabled" : "disabled" )
-    ;
-#endif
+    s << " hwloc[" << numa_count_ << "x" << cores_per_numa << "x" <<
+  threads_per_core << "]"
+      << " hwloc_binding_" << ( Impl::s_using_hwloc ? "enabled" : "disabled" )
+      ;
+  #endif
 
-  const bool is_initialized = 0 != Impl::OpenMPTargetExec::m_pool[0] ;
+    const bool is_initialized = 0 != Impl::OpenMPTargetExec::m_pool[0] ;
 
-  if ( is_initialized ) {
-    const int numa_count      = Kokkos::Impl::OpenMPTargetExec::m_pool_topo[0] / Kokkos::Impl::OpenMPTargetExec::m_pool_topo[1] ;
-    const int core_per_numa   = Kokkos::Impl::OpenMPTargetExec::m_pool_topo[1] / Kokkos::Impl::OpenMPTargetExec::m_pool_topo[2] ;
-    const int thread_per_core = Kokkos::Impl::OpenMPTargetExec::m_pool_topo[2] ;
+    if ( is_initialized ) {
+      const int numa_count      = Kokkos::Impl::OpenMPTargetExec::m_pool_topo[0]
+  / Kokkos::Impl::OpenMPTargetExec::m_pool_topo[1] ; const int core_per_numa   =
+  Kokkos::Impl::OpenMPTargetExec::m_pool_topo[1] /
+  Kokkos::Impl::OpenMPTargetExec::m_pool_topo[2] ; const int thread_per_core =
+  Kokkos::Impl::OpenMPTargetExec::m_pool_topo[2] ;
 
-    s << " thread_pool_topology[ " << numa_count
-      << " x " << core_per_numa
-      << " x " << thread_per_core
-      << " ]"
-      << std::endl ;
+      s << " thread_pool_topology[ " << numa_count
+        << " x " << core_per_numa
+        << " x " << thread_per_core
+        << " ]"
+        << std::endl ;
 
-    if ( detail ) {
-      std::vector< std::pair<unsigned,unsigned> > coord( Kokkos::Impl::OpenMPTargetExec::m_pool_topo[0] );
+      if ( detail ) {
+        std::vector< std::pair<unsigned,unsigned> > coord(
+  Kokkos::Impl::OpenMPTargetExec::m_pool_topo[0] );
 
-#pragma omp parallel
-      {
-#pragma omp critical
+  #pragma omp parallel
         {
-          coord[ omp_get_thread_num() ] = hwloc::get_this_thread_coordinate();
+  #pragma omp critical
+          {
+            coord[ omp_get_thread_num() ] = hwloc::get_this_thread_coordinate();
+          }
+  // END #pragma omp critical
         }
-// END #pragma omp critical 
-      }
-// END #pragma omp parallel 
+  // END #pragma omp parallel
 
-      for ( unsigned i = 0 ; i < coord.size() ; ++i ) {
-        s << "  thread omp_rank[" << i << "]"
-          << " kokkos_rank[" << Impl::OpenMPTargetExec::m_map_rank[ i ] << "]"
-          << " hwloc_coord[" << coord[i].first << "." << coord[i].second << "]"
-          << std::endl ;
+        for ( unsigned i = 0 ; i < coord.size() ; ++i ) {
+          s << "  thread omp_rank[" << i << "]"
+            << " kokkos_rank[" << Impl::OpenMPTargetExec::m_map_rank[ i ] << "]"
+            << " hwloc_coord[" << coord[i].first << "." << coord[i].second <<
+  "]"
+            << std::endl ;
+        }
       }
     }
-  }
-  else {
-    s << " not initialized" << std::endl ;
-  }
-*/
+    else {
+      s << " not initialized" << std::endl ;
+    }
+  */
 }
 
-int OpenMPTarget::concurrency() {
-  return thread_pool_size(0);
-}
+int OpenMPTarget::concurrency() { return thread_pool_size(0); }
 
 const char* OpenMPTarget::name() { return "OpenMPTarget"; }
-} // namespace Experimental
-} // namespace Kokkos
+}  // namespace Experimental
+}  // namespace Kokkos
 
-#endif //KOKKOS_ENABLE_OPENMPTARGET
+#endif  // KOKKOS_ENABLE_OPENMPTARGET
diff --git a/lib/kokkos/core/src/OpenMPTarget/Kokkos_OpenMPTarget_Exec.hpp b/lib/kokkos/core/src/OpenMPTarget/Kokkos_OpenMPTarget_Exec.hpp
index d57ddbcc5c..c9d8543eab 100644
--- a/lib/kokkos/core/src/OpenMPTarget/Kokkos_OpenMPTarget_Exec.hpp
+++ b/lib/kokkos/core/src/OpenMPTarget/Kokkos_OpenMPTarget_Exec.hpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -57,29 +58,30 @@ namespace Impl {
 //----------------------------------------------------------------------------
 /** \brief  Data for OpenMPTarget thread execution */
 
-
 class OpenMPTargetExec {
-public:
-  enum { MAX_ACTIVE_THREADS = 256*8*56*4 };
-  enum { MAX_ACTIVE_TEAMS = MAX_ACTIVE_THREADS/32 };
+ public:
+  enum { MAX_ACTIVE_THREADS = 256 * 8 * 56 * 4 };
+  enum { MAX_ACTIVE_TEAMS = MAX_ACTIVE_THREADS / 32 };
 
-private:
+ private:
   static void* scratch_ptr;
 
-public:
-  static void verify_is_process( const char * const );
-  static void verify_initialized( const char * const );
+ public:
+  static void verify_is_process(const char* const);
+  static void verify_initialized(const char* const);
 
   static void* get_scratch_ptr();
   static void clear_scratch();
-  static void resize_scratch( int64_t reduce_bytes , int64_t team_reduce_bytes, int64_t team_shared_bytes, int64_t thread_local_bytes );
+  static void resize_scratch(int64_t reduce_bytes, int64_t team_reduce_bytes,
+                             int64_t team_shared_bytes,
+                             int64_t thread_local_bytes);
 
   static void* m_scratch_ptr;
   static int64_t m_scratch_size;
 };
 
-} // namespace Impl
-} // namespace Kokkos
+}  // namespace Impl
+}  // namespace Kokkos
 
 //----------------------------------------------------------------------------
 //----------------------------------------------------------------------------
@@ -88,25 +90,24 @@ namespace Kokkos {
 namespace Impl {
 
 class OpenMPTargetExecTeamMember {
-public:
-
+ public:
   enum { TEAM_REDUCE_SIZE = 512 };
 
   /** \brief  Thread states for team synchronization */
-  enum { Active = 0 , Rendezvous = 1 };
+  enum { Active = 0, Rendezvous = 1 };
 
-  typedef Kokkos::Experimental::OpenMPTarget                         execution_space ;
-  typedef execution_space::scratch_memory_space  scratch_memory_space ;
+  typedef Kokkos::Experimental::OpenMPTarget execution_space;
+  typedef execution_space::scratch_memory_space scratch_memory_space;
 
-  scratch_memory_space  m_team_shared ;
-  int                   m_team_scratch_size[2] ;
-  int                   m_team_rank ;
-  int                   m_team_size ;
-  int                   m_league_rank ;
-  int                   m_league_size ;
-  int                   m_vector_length ;
-  int                   m_vector_lane ;
-  void* 		m_glb_scratch ;
+  scratch_memory_space m_team_shared;
+  int m_team_scratch_size[2];
+  int m_team_rank;
+  int m_team_size;
+  int m_league_rank;
+  int m_league_size;
+  int m_vector_length;
+  int m_vector_lane;
+  void* m_glb_scratch;
 
   /*
   // Fan-in team threads, root of the fan-in which does not block returns true
@@ -114,7 +115,8 @@ public:
   bool team_fan_in() const
     {
       memory_fence();
-      for ( int n = 1 , j ; ( ( j = m_team_rank_rev + n ) < m_team_size ) && ! ( m_team_rank_rev & n ) ; n <<= 1 ) {
+      for ( int n = 1 , j ; ( ( j = m_team_rank_rev + n ) < m_team_size ) && ! (
+  m_team_rank_rev & n ) ; n <<= 1 ) {
 
         m_exec.pool_rev( m_team_base_rev + j )->state_wait( Active );
       }
@@ -132,92 +134,91 @@ public:
   void team_fan_out() const
     {
       memory_fence();
-      for ( int n = 1 , j ; ( ( j = m_team_rank_rev + n ) < m_team_size ) && ! ( m_team_rank_rev & n ) ; n <<= 1 ) {
-        m_exec.pool_rev( m_team_base_rev + j )->state_set( Active );
-        memory_fence();
+      for ( int n = 1 , j ; ( ( j = m_team_rank_rev + n ) < m_team_size ) && ! (
+  m_team_rank_rev & n ) ; n <<= 1 ) { m_exec.pool_rev( m_team_base_rev + j
+  )->state_set( Active ); memory_fence();
       }
     }
   */
-public:
-
+ public:
   KOKKOS_INLINE_FUNCTION
-  const execution_space::scratch_memory_space& team_shmem() const
-    { return m_team_shared.set_team_thread_mode(0,1,0) ; }
-
-  KOKKOS_INLINE_FUNCTION
-  const execution_space::scratch_memory_space& team_scratch(int) const
-    { return m_team_shared.set_team_thread_mode(0,1,0) ; }
-
-  KOKKOS_INLINE_FUNCTION
-  const execution_space::scratch_memory_space& thread_scratch(int) const
-    { return m_team_shared.set_team_thread_mode(0,team_size(),team_rank()) ; }
-
-  KOKKOS_INLINE_FUNCTION int league_rank() const { return m_league_rank ; }
-  KOKKOS_INLINE_FUNCTION int league_size() const { return m_league_size ; }
-  KOKKOS_INLINE_FUNCTION int team_rank() const { return m_team_rank ; }
-  KOKKOS_INLINE_FUNCTION int team_size() const { return m_team_size ; }
-
-  KOKKOS_INLINE_FUNCTION void team_barrier() const
-    {
-      #pragma omp barrier
-    }
-
-  template<class ValueType>
-  KOKKOS_INLINE_FUNCTION
-  void team_broadcast(ValueType& value, const int& thread_id) const
-  {
-/*#if ! defined( KOKKOS_ACTIVE_EXECUTION_MEMORY_SPACE_HOST )
-    { }
-#else
-    // Make sure there is enough scratch space:
-    typedef typename if_c< sizeof(ValueType) < TEAM_REDUCE_SIZE
-                         , ValueType , void >::type type ;
-
-    type * const local_value = ((type*) m_exec.scratch_thread());
-    if(team_rank() == thread_id)
-      *local_value = value;
-    memory_fence();
-    team_barrier();
-    value = *local_value;
-#endif*/
+  const execution_space::scratch_memory_space& team_shmem() const {
+    return m_team_shared.set_team_thread_mode(0, 1, 0);
   }
 
-  template< class ValueType, class JoinOp >
-  KOKKOS_INLINE_FUNCTION ValueType
-    team_reduce( const ValueType & value
-               , const JoinOp & op_in ) const {
+  KOKKOS_INLINE_FUNCTION
+  const execution_space::scratch_memory_space& team_scratch(int) const {
+    return m_team_shared.set_team_thread_mode(0, 1, 0);
+  }
 
-      #pragma omp barrier
+  KOKKOS_INLINE_FUNCTION
+  const execution_space::scratch_memory_space& thread_scratch(int) const {
+    return m_team_shared.set_team_thread_mode(0, team_size(), team_rank());
+  }
 
-      typedef ValueType value_type;
-      const JoinLambdaAdapter<value_type,JoinOp> op(op_in);
+  KOKKOS_INLINE_FUNCTION int league_rank() const { return m_league_rank; }
+  KOKKOS_INLINE_FUNCTION int league_size() const { return m_league_size; }
+  KOKKOS_INLINE_FUNCTION int team_rank() const { return m_team_rank; }
+  KOKKOS_INLINE_FUNCTION int team_size() const { return m_team_size; }
 
-      // Make sure there is enough scratch space:
-      typedef typename if_c< sizeof(value_type) < TEAM_REDUCE_SIZE
-                           , value_type , void >::type type ;
+  KOKKOS_INLINE_FUNCTION void team_barrier() const {
+#pragma omp barrier
+  }
 
-      const int n_values = TEAM_REDUCE_SIZE/sizeof(value_type);
-      type * team_scratch = (type*) ((char*)m_glb_scratch + TEAM_REDUCE_SIZE*omp_get_team_num());
-      for(int i = m_team_rank; i < n_values; i+= m_team_size) {
-        team_scratch[i] = value_type();
-      }
+  template <class ValueType>
+  KOKKOS_INLINE_FUNCTION void team_broadcast(ValueType& value,
+                                             const int& thread_id) const {
+    /*#if ! defined( KOKKOS_ACTIVE_EXECUTION_MEMORY_SPACE_HOST )
+        { }
+    #else
+        // Make sure there is enough scratch space:
+        typedef typename if_c< sizeof(ValueType) < TEAM_REDUCE_SIZE
+                             , ValueType , void >::type type ;
 
-      #pragma omp barrier
+        type * const local_value = ((type*) m_exec.scratch_thread());
+        if(team_rank() == thread_id)
+          *local_value = value;
+        memory_fence();
+        team_barrier();
+        value = *local_value;
+    #endif*/
+  }
 
-      for(int k=0; k<m_team_size; k+=n_values) {
-        if((k <= m_team_rank) && (k+n_values > m_team_rank))
-          team_scratch[m_team_rank%n_values]+=value;
-        #pragma omp barrier
-      }
+  template <class ValueType, class JoinOp>
+  KOKKOS_INLINE_FUNCTION ValueType team_reduce(const ValueType& value,
+                                               const JoinOp& op_in) const {
+#pragma omp barrier
 
-      for(int d = 1; d<n_values;d*=2) {
-        if((m_team_rank+d<n_values) && (m_team_rank%(2*d)==0)) {
-          team_scratch[m_team_rank] += team_scratch[m_team_rank+d];
-        }
-        #pragma omp barrier
-      }
-      return team_scratch[0];
+    typedef ValueType value_type;
+    const JoinLambdaAdapter<value_type, JoinOp> op(op_in);
+
+    // Make sure there is enough scratch space:
+    typedef typename if_c<sizeof(value_type) < TEAM_REDUCE_SIZE, value_type,
+                          void>::type type;
+
+    const int n_values = TEAM_REDUCE_SIZE / sizeof(value_type);
+    type* team_scratch =
+        (type*)((char*)m_glb_scratch + TEAM_REDUCE_SIZE * omp_get_team_num());
+    for (int i = m_team_rank; i < n_values; i += m_team_size) {
+      team_scratch[i] = value_type();
     }
+
+#pragma omp barrier
+
+    for (int k = 0; k < m_team_size; k += n_values) {
+      if ((k <= m_team_rank) && (k + n_values > m_team_rank))
+        team_scratch[m_team_rank % n_values] += value;
+#pragma omp barrier
+    }
+
+    for (int d = 1; d < n_values; d *= 2) {
+      if ((m_team_rank + d < n_values) && (m_team_rank % (2 * d) == 0)) {
+        team_scratch[m_team_rank] += team_scratch[m_team_rank + d];
+      }
+#pragma omp barrier
+    }
+    return team_scratch[0];
+  }
   /** \brief  Intra-team exclusive prefix sum with team_rank() ordering
    *          with intra-team non-deterministic ordering accumulation.
    *
@@ -227,11 +228,12 @@ public:
    *  As such the base value for each team's scan operation is similarly
    *  non-deterministic.
    */
-  template< typename ArgType >
-  KOKKOS_INLINE_FUNCTION ArgType team_scan( const ArgType & value , ArgType * const global_accum ) const
-    {
+  template <typename ArgType>
+  KOKKOS_INLINE_FUNCTION ArgType team_scan(const ArgType& value,
+                                           ArgType* const global_accum) const {
     /*  // Make sure there is enough scratch space:
-      typedef typename if_c< sizeof(ArgType) < TEAM_REDUCE_SIZE , ArgType , void >::type type ;
+      typedef typename if_c< sizeof(ArgType) < TEAM_REDUCE_SIZE , ArgType , void
+      >::type type ;
 
       volatile type * const work_value  = ((type*) m_exec.scratch_thread());
 
@@ -240,7 +242,8 @@ public:
       memory_fence();
 
       if ( team_fan_in() ) {
-        // The last thread to synchronize returns true, all other threads wait for team_fan_out()
+        // The last thread to synchronize returns true, all other threads wait
+      for team_fan_out()
         // m_team_base[0]                 == highest ranking team member
         // m_team_base[ m_team_size - 1 ] == lowest ranking team member
         //
@@ -251,17 +254,16 @@ public:
 
         if ( global_accum ) {
           for ( int i = m_team_size ; i-- ; ) {
-            type & val = *((type*) m_exec.pool_rev( m_team_base_rev + i )->scratch_thread());
-            accum += val ;
+            type & val = *((type*) m_exec.pool_rev( m_team_base_rev + i
+      )->scratch_thread()); accum += val ;
           }
           accum = atomic_fetch_add( global_accum , accum );
         }
 
         for ( int i = m_team_size ; i-- ; ) {
-          type & val = *((type*) m_exec.pool_rev( m_team_base_rev + i )->scratch_thread());
-          const type offset = accum ;
-          accum += val ;
-          val = offset ;
+          type & val = *((type*) m_exec.pool_rev( m_team_base_rev + i
+      )->scratch_thread()); const type offset = accum ; accum += val ; val =
+      offset ;
         }
 
         memory_fence();
@@ -270,284 +272,301 @@ public:
       team_fan_out();
 
       return *work_value ;*/
-      return ArgType();
-    }
+    return ArgType();
+  }
 
   /** \brief  Intra-team exclusive prefix sum with team_rank() ordering.
    *
    *  The highest rank thread can compute the reduction total as
    *    reduction_total = dev.team_scan( value ) + value ;
    */
-  template< typename Type >
-  KOKKOS_INLINE_FUNCTION Type team_scan( const Type & value ) const
-    { return this-> template team_scan<Type>( value , 0 ); }
+  template <typename Type>
+  KOKKOS_INLINE_FUNCTION Type team_scan(const Type& value) const {
+    return this->template team_scan<Type>(value, 0);
+  }
 
   //----------------------------------------
   // Private for the driver
 
-private:
+ private:
+  typedef execution_space::scratch_memory_space space;
 
-  typedef execution_space::scratch_memory_space space ;
+ public:
+  inline OpenMPTargetExecTeamMember(
+      const int league_rank, const int league_size, const int team_size,
+      const int vector_length  // const TeamPolicyInternal< OpenMPTarget,
+                               // Properties ...> & team
+      ,
+      void* const glb_scratch, const int shmem_size_L1, const int shmem_size_L2)
+      : m_team_shared(0, 0),
+        m_team_scratch_size{shmem_size_L1, shmem_size_L2},
+        m_team_rank(0),
+        m_vector_length(vector_length),
+        m_team_size(team_size),
+        m_league_rank(league_rank),
+        m_league_size(league_size),
+        m_glb_scratch(glb_scratch) {
+    const int omp_tid = omp_get_thread_num();
+    m_league_rank     = league_rank;
+    m_team_rank       = omp_tid / m_vector_length;
+    m_vector_lane     = omp_tid % m_vector_length;
+  }
 
-public:
-
-  inline
-  OpenMPTargetExecTeamMember( const int league_rank, const int league_size, const int team_size, const int vector_length //const TeamPolicyInternal< OpenMPTarget, Properties ...> & team
-                      , void* const glb_scratch
-                      , const int shmem_size_L1
-                      , const int shmem_size_L2
-                      )
-    : m_team_shared(0,0)
-    , m_team_scratch_size{ shmem_size_L1 , shmem_size_L2 }
-    , m_team_rank(0)
-    , m_vector_length( vector_length )
-    , m_team_size( team_size )
-    , m_league_rank( league_rank )
-    , m_league_size( league_size )
-    , m_glb_scratch( glb_scratch )
-    {
-      const int omp_tid = omp_get_thread_num();
-      m_league_rank = league_rank;
-      m_team_rank = omp_tid/m_vector_length;
-      m_vector_lane = omp_tid%m_vector_length;
-    }
-
-  static inline int team_reduce_size() { return TEAM_REDUCE_SIZE ; }
+  static inline int team_reduce_size() { return TEAM_REDUCE_SIZE; }
 };
 
-
-
-template< class ... Properties >
-class TeamPolicyInternal< Kokkos::Experimental::OpenMPTarget, Properties ... >: public PolicyTraits<Properties ...>
-{
-public:
-
+template <class... Properties>
+class TeamPolicyInternal<Kokkos::Experimental::OpenMPTarget, Properties...>
+    : public PolicyTraits<Properties...> {
+ public:
   //! Tag this class as a kokkos execution policy
-  typedef TeamPolicyInternal      execution_policy ;
+  typedef TeamPolicyInternal execution_policy;
 
-  typedef PolicyTraits<Properties ... > traits;
+  typedef PolicyTraits<Properties...> traits;
 
-  TeamPolicyInternal& operator = (const TeamPolicyInternal& p) {
-    m_league_size = p.m_league_size;
-    m_team_size = p.m_team_size;
-    m_vector_length = p.m_vector_length;
-    m_team_alloc = p.m_team_alloc;
-    m_team_iter = p.m_team_iter;
-    m_team_scratch_size[0] = p.m_team_scratch_size[0];
+  TeamPolicyInternal& operator=(const TeamPolicyInternal& p) {
+    m_league_size            = p.m_league_size;
+    m_team_size              = p.m_team_size;
+    m_vector_length          = p.m_vector_length;
+    m_team_alloc             = p.m_team_alloc;
+    m_team_iter              = p.m_team_iter;
+    m_team_scratch_size[0]   = p.m_team_scratch_size[0];
     m_thread_scratch_size[0] = p.m_thread_scratch_size[0];
-    m_team_scratch_size[1] = p.m_team_scratch_size[1];
+    m_team_scratch_size[1]   = p.m_team_scratch_size[1];
     m_thread_scratch_size[1] = p.m_thread_scratch_size[1];
-    m_chunk_size = p.m_chunk_size;
+    m_chunk_size             = p.m_chunk_size;
     return *this;
   }
 
   //----------------------------------------
 
-  template< class FunctorType >
-  inline static
-  int team_size_max( const FunctorType & )
-    { return 1024; }
+  template <class FunctorType>
+  inline static int team_size_max(const FunctorType&) {
+    return 1024;
+  }
 
-  template< class FunctorType >
-  inline static
-  int team_size_recommended( const FunctorType & )
-    { return 256; }
+  template <class FunctorType>
+  inline static int team_size_recommended(const FunctorType&) {
+    return 256;
+  }
 
-  template< class FunctorType >
-  inline static
-  int team_size_recommended( const FunctorType &, const int& vector_length)
-    { return 256/vector_length; }
+  template <class FunctorType>
+  inline static int team_size_recommended(const FunctorType&,
+                                          const int& vector_length) {
+    return 256 / vector_length;
+  }
 
   //----------------------------------------
 
-private:
-
-  int m_league_size ;
-  int m_team_size ;
+ private:
+  int m_league_size;
+  int m_team_size;
   int m_vector_length;
-  int m_team_alloc ;
-  int m_team_iter ;
+  int m_team_alloc;
+  int m_team_iter;
 
   size_t m_team_scratch_size[2];
   size_t m_thread_scratch_size[2];
 
   int m_chunk_size;
 
-  inline void init( const int league_size_request
-                  , const int team_size_request
-                  , const int vector_length_request )
-    {
-      m_league_size = league_size_request ;
+  inline void init(const int league_size_request, const int team_size_request,
+                   const int vector_length_request) {
+    m_league_size = league_size_request;
 
-      m_team_size = team_size_request;
+    m_team_size = team_size_request;
 
-      m_vector_length = vector_length_request;
+    m_vector_length = vector_length_request;
 
-      set_auto_chunk_size();
-    }
+    set_auto_chunk_size();
+  }
 
-public:
-
-  inline int vector_length() const { return m_vector_length ; }
-  inline int team_size()   const { return m_team_size ; }
-  inline int league_size() const { return m_league_size ; }
+ public:
+  inline int vector_length() const { return m_vector_length; }
+  inline int team_size() const { return m_team_size; }
+  inline int league_size() const { return m_league_size; }
   inline size_t scratch_size(const int& level, int team_size_ = -1) const {
-    if(team_size_ < 0)
-      team_size_ = m_team_size;
-    return m_team_scratch_size[level] + team_size_*m_thread_scratch_size[level] ;
+    if (team_size_ < 0) team_size_ = m_team_size;
+    return m_team_scratch_size[level] +
+           team_size_ * m_thread_scratch_size[level];
   }
 
   /** \brief  Specify league size, request team size */
-  TeamPolicyInternal( typename traits::execution_space &
-            , int league_size_request
-            , int team_size_request
-            , int vector_length_request = 1 )
-            : m_team_scratch_size { 0 , 0 }
-            , m_thread_scratch_size { 0 , 0 }
-            , m_chunk_size(0)
-    { init( league_size_request , team_size_request , vector_length_request); }
+  TeamPolicyInternal(typename traits::execution_space&, int league_size_request,
+                     int team_size_request, int vector_length_request = 1)
+      : m_team_scratch_size{0, 0},
+        m_thread_scratch_size{0, 0},
+        m_chunk_size(0) {
+    init(league_size_request, team_size_request, vector_length_request);
+  }
 
-  TeamPolicyInternal( typename traits::execution_space &
-            , int league_size_request
-            , const Kokkos::AUTO_t & /* team_size_request */
-            , int vector_length_request = 1)
-            : m_team_scratch_size { 0 , 0 }
-            , m_thread_scratch_size { 0 , 0 }
-            , m_chunk_size(0)
-    { init( league_size_request , 256/vector_length_request , vector_length_request ); }
+  TeamPolicyInternal(typename traits::execution_space&, int league_size_request,
+                     const Kokkos::AUTO_t& /* team_size_request */
+                     ,
+                     int vector_length_request = 1)
+      : m_team_scratch_size{0, 0},
+        m_thread_scratch_size{0, 0},
+        m_chunk_size(0) {
+    init(league_size_request, 256 / vector_length_request,
+         vector_length_request);
+  }
 
-  TeamPolicyInternal( int league_size_request
-            , int team_size_request
-            , int vector_length_request = 1 )
-            : m_team_scratch_size { 0 , 0 }
-            , m_thread_scratch_size { 0 , 0 }
-            , m_chunk_size(0)
-    { init( league_size_request , team_size_request , vector_length_request); }
+  TeamPolicyInternal(int league_size_request, int team_size_request,
+                     int vector_length_request = 1)
+      : m_team_scratch_size{0, 0},
+        m_thread_scratch_size{0, 0},
+        m_chunk_size(0) {
+    init(league_size_request, team_size_request, vector_length_request);
+  }
 
-  TeamPolicyInternal( int league_size_request
-            , const Kokkos::AUTO_t & /* team_size_request */
-            , int vector_length_request = 1 )
-            : m_team_scratch_size { 0 , 0 }
-            , m_thread_scratch_size { 0 , 0 }
-            , m_chunk_size(0)
-    { init( league_size_request , 256/vector_length_request , vector_length_request ); }
+  TeamPolicyInternal(int league_size_request,
+                     const Kokkos::AUTO_t& /* team_size_request */
+                     ,
+                     int vector_length_request = 1)
+      : m_team_scratch_size{0, 0},
+        m_thread_scratch_size{0, 0},
+        m_chunk_size(0) {
+    init(league_size_request, 256 / vector_length_request,
+         vector_length_request);
+  }
 
-  inline int team_alloc() const { return m_team_alloc ; }
-  inline int team_iter()  const { return m_team_iter ; }
+  inline int team_alloc() const { return m_team_alloc; }
+  inline int team_iter() const { return m_team_iter; }
 
-  inline int chunk_size() const { return m_chunk_size ; }
+  inline int chunk_size() const { return m_chunk_size; }
 
 #ifdef KOKKOS_ENABLE_DEPRECATED_CODE
   /** \brief set chunk_size to a discrete value*/
-  inline TeamPolicyInternal set_chunk_size(typename traits::index_type chunk_size_) const {
+  inline TeamPolicyInternal set_chunk_size(
+      typename traits::index_type chunk_size_) const {
     TeamPolicyInternal p = *this;
-    p.m_chunk_size = chunk_size_;
+    p.m_chunk_size       = chunk_size_;
     return p;
   }
 
-  inline TeamPolicyInternal set_scratch_size(const int& level, const PerTeamValue& per_team) const {
-    TeamPolicyInternal p = *this;
+  inline TeamPolicyInternal set_scratch_size(
+      const int& level, const PerTeamValue& per_team) const {
+    TeamPolicyInternal p         = *this;
     p.m_team_scratch_size[level] = per_team.value;
     return p;
   }
 
-  inline TeamPolicyInternal set_scratch_size(const int& level, const PerThreadValue& per_thread) const {
-    TeamPolicyInternal p = *this;
+  inline TeamPolicyInternal set_scratch_size(
+      const int& level, const PerThreadValue& per_thread) const {
+    TeamPolicyInternal p           = *this;
     p.m_thread_scratch_size[level] = per_thread.value;
     return p;
   }
 
-  inline TeamPolicyInternal set_scratch_size(const int& level, const PerTeamValue& per_team, const PerThreadValue& per_thread) const {
-    TeamPolicyInternal p = *this;
-    p.m_team_scratch_size[level] = per_team.value;
+  inline TeamPolicyInternal set_scratch_size(
+      const int& level, const PerTeamValue& per_team,
+      const PerThreadValue& per_thread) const {
+    TeamPolicyInternal p           = *this;
+    p.m_team_scratch_size[level]   = per_team.value;
     p.m_thread_scratch_size[level] = per_thread.value;
     return p;
   }
 #else
   /** \brief set chunk_size to a discrete value*/
-  inline TeamPolicyInternal& set_chunk_size(typename traits::index_type chunk_size_) {
+  inline TeamPolicyInternal& set_chunk_size(
+      typename traits::index_type chunk_size_) {
     m_chunk_size = chunk_size_;
     return *this;
   }
 
-  /** \brief set per team scratch size for a specific level of the scratch hierarchy */
-  inline TeamPolicyInternal& set_scratch_size(const int& level, const PerTeamValue& per_team) {
+  /** \brief set per team scratch size for a specific level of the scratch
+   * hierarchy */
+  inline TeamPolicyInternal& set_scratch_size(const int& level,
+                                              const PerTeamValue& per_team) {
     m_team_scratch_size[level] = per_team.value;
     return *this;
   }
 
-  /** \brief set per thread scratch size for a specific level of the scratch hierarchy */
-  inline TeamPolicyInternal& set_scratch_size(const int& level, const PerThreadValue& per_thread) {
+  /** \brief set per thread scratch size for a specific level of the scratch
+   * hierarchy */
+  inline TeamPolicyInternal& set_scratch_size(
+      const int& level, const PerThreadValue& per_thread) {
     m_thread_scratch_size[level] = per_thread.value;
     return *this;
   }
 
-  /** \brief set per thread and per team scratch size for a specific level of the scratch hierarchy */
-  inline TeamPolicyInternal& set_scratch_size(const int& level, const PerTeamValue& per_team, const PerThreadValue& per_thread) {
-    m_team_scratch_size[level] = per_team.value;
+  /** \brief set per thread and per team scratch size for a specific level of
+   * the scratch hierarchy */
+  inline TeamPolicyInternal& set_scratch_size(
+      const int& level, const PerTeamValue& per_team,
+      const PerThreadValue& per_thread) {
+    m_team_scratch_size[level]   = per_team.value;
     m_thread_scratch_size[level] = per_thread.value;
     return *this;
   }
 #endif
 
-protected:
+ protected:
 #ifdef KOKKOS_ENABLE_DEPRECATED_CODE
   /** \brief set chunk_size to a discrete value*/
-  inline TeamPolicyInternal internal_set_chunk_size(typename traits::index_type chunk_size_) {
+  inline TeamPolicyInternal internal_set_chunk_size(
+      typename traits::index_type chunk_size_) {
     m_chunk_size = chunk_size_;
     return *this;
   }
 
-  /** \brief set per team scratch size for a specific level of the scratch hierarchy */
-  inline TeamPolicyInternal internal_set_scratch_size(const int& level, const PerTeamValue& per_team) {
+  /** \brief set per team scratch size for a specific level of the scratch
+   * hierarchy */
+  inline TeamPolicyInternal internal_set_scratch_size(
+      const int& level, const PerTeamValue& per_team) {
     m_team_scratch_size[level] = per_team.value;
     return *this;
   }
 
-  /** \brief set per thread scratch size for a specific level of the scratch hierarchy */
-  inline TeamPolicyInternal internal_set_scratch_size(const int& level, const PerThreadValue& per_thread) {
+  /** \brief set per thread scratch size for a specific level of the scratch
+   * hierarchy */
+  inline TeamPolicyInternal internal_set_scratch_size(
+      const int& level, const PerThreadValue& per_thread) {
     m_thread_scratch_size[level] = per_thread.value;
     return *this;
   }
 
-  /** \brief set per thread and per team scratch size for a specific level of the scratch hierarchy */
-  inline TeamPolicyInternal internal_set_scratch_size(const int& level, const PerTeamValue& per_team, const PerThreadValue& per_thread) {
-    m_team_scratch_size[level] = per_team.value;
+  /** \brief set per thread and per team scratch size for a specific level of
+   * the scratch hierarchy */
+  inline TeamPolicyInternal internal_set_scratch_size(
+      const int& level, const PerTeamValue& per_team,
+      const PerThreadValue& per_thread) {
+    m_team_scratch_size[level]   = per_team.value;
     m_thread_scratch_size[level] = per_thread.value;
     return *this;
   }
 #endif
 
-private:
+ private:
   /** \brief finalize chunk_size if it was set to AUTO*/
   inline void set_auto_chunk_size() {
+    int concurrency =
+        traits::execution_space::thread_pool_size(0) / m_team_alloc;
+    if (concurrency == 0) concurrency = 1;
 
-    int concurrency = traits::execution_space::thread_pool_size(0)/m_team_alloc;
-    if( concurrency==0 ) concurrency=1;
-
-    if(m_chunk_size > 0) {
-      if(!Impl::is_integral_power_of_two( m_chunk_size ))
-        Kokkos::abort("TeamPolicy blocking granularity must be power of two" );
+    if (m_chunk_size > 0) {
+      if (!Impl::is_integral_power_of_two(m_chunk_size))
+        Kokkos::abort("TeamPolicy blocking granularity must be power of two");
     }
 
     int new_chunk_size = 1;
-    while(new_chunk_size*100*concurrency < m_league_size)
+    while (new_chunk_size * 100 * concurrency < m_league_size)
       new_chunk_size *= 2;
-    if(new_chunk_size < 128) {
+    if (new_chunk_size < 128) {
       new_chunk_size = 1;
-      while( (new_chunk_size*40*concurrency < m_league_size ) && (new_chunk_size<128) )
-        new_chunk_size*=2;
+      while ((new_chunk_size * 40 * concurrency < m_league_size) &&
+             (new_chunk_size < 128))
+        new_chunk_size *= 2;
     }
     m_chunk_size = new_chunk_size;
   }
 
-public:
-  typedef Impl::OpenMPTargetExecTeamMember member_type ;
+ public:
+  typedef Impl::OpenMPTargetExecTeamMember member_type;
 };
-} // namespace Impl
+}  // namespace Impl
 
-
-} // namespace Kokkos
+}  // namespace Kokkos
 
 //----------------------------------------------------------------------------
 //----------------------------------------------------------------------------
@@ -555,235 +574,268 @@ public:
 namespace Kokkos {
 namespace Experimental {
 
-inline
-int OpenMPTarget::thread_pool_size( int depth )
-{
-  //return Impl::OpenMPTargetExec::pool_size(depth);
+inline int OpenMPTarget::thread_pool_size(int depth) {
+  // return Impl::OpenMPTargetExec::pool_size(depth);
   return omp_get_max_threads();
 }
 
 KOKKOS_INLINE_FUNCTION
-int OpenMPTarget::thread_pool_rank()
-{
-  return omp_get_thread_num();
-}
-
-} // namespace Experimental
-} // namespace Kokkos
+int OpenMPTarget::thread_pool_rank() { return omp_get_thread_num(); }
 
+}  // namespace Experimental
+}  // namespace Kokkos
 
 namespace Kokkos {
 
-template<typename iType>
-KOKKOS_INLINE_FUNCTION
-Impl::TeamThreadRangeBoundariesStruct<iType,Impl::OpenMPTargetExecTeamMember>
-  TeamThreadRange(const Impl::OpenMPTargetExecTeamMember& thread, const iType& count) {
-  return Impl::TeamThreadRangeBoundariesStruct<iType,Impl::OpenMPTargetExecTeamMember>(thread,count);
+template <typename iType>
+KOKKOS_INLINE_FUNCTION Impl::TeamThreadRangeBoundariesStruct<
+    iType, Impl::OpenMPTargetExecTeamMember>
+TeamThreadRange(const Impl::OpenMPTargetExecTeamMember& thread,
+                const iType& count) {
+  return Impl::TeamThreadRangeBoundariesStruct<
+      iType, Impl::OpenMPTargetExecTeamMember>(thread, count);
 }
 
-template<typename iType>
-KOKKOS_INLINE_FUNCTION
-Impl::TeamThreadRangeBoundariesStruct<iType,Impl::OpenMPTargetExecTeamMember>
-  TeamThreadRange(const Impl::OpenMPTargetExecTeamMember& thread, const iType& begin, const iType& end) {
-  return Impl::TeamThreadRangeBoundariesStruct<iType,Impl::OpenMPTargetExecTeamMember>(thread,begin,end);
+template <typename iType>
+KOKKOS_INLINE_FUNCTION Impl::TeamThreadRangeBoundariesStruct<
+    iType, Impl::OpenMPTargetExecTeamMember>
+TeamThreadRange(const Impl::OpenMPTargetExecTeamMember& thread,
+                const iType& begin, const iType& end) {
+  return Impl::TeamThreadRangeBoundariesStruct<
+      iType, Impl::OpenMPTargetExecTeamMember>(thread, begin, end);
 }
 
-template<typename iType>
-KOKKOS_INLINE_FUNCTION
-Impl::ThreadVectorRangeBoundariesStruct<iType,Impl::OpenMPTargetExecTeamMember >
-  ThreadVectorRange(const Impl::OpenMPTargetExecTeamMember& thread, const iType& count) {
-  return Impl::ThreadVectorRangeBoundariesStruct<iType,Impl::OpenMPTargetExecTeamMember >(thread,count);
+template <typename iType>
+KOKKOS_INLINE_FUNCTION Impl::ThreadVectorRangeBoundariesStruct<
+    iType, Impl::OpenMPTargetExecTeamMember>
+ThreadVectorRange(const Impl::OpenMPTargetExecTeamMember& thread,
+                  const iType& count) {
+  return Impl::ThreadVectorRangeBoundariesStruct<
+      iType, Impl::OpenMPTargetExecTeamMember>(thread, count);
 }
 
-template<typename iType>
-KOKKOS_INLINE_FUNCTION
-Impl::ThreadVectorRangeBoundariesStruct<iType,Impl::OpenMPTargetExecTeamMember >
-  ThreadVectorRange(const Impl::OpenMPTargetExecTeamMember& thread, const iType& arg_begin, const iType& arg_end) {
-  return Impl::ThreadVectorRangeBoundariesStruct<iType,Impl::OpenMPTargetExecTeamMember >(thread,arg_begin,arg_end);
+template <typename iType>
+KOKKOS_INLINE_FUNCTION Impl::ThreadVectorRangeBoundariesStruct<
+    iType, Impl::OpenMPTargetExecTeamMember>
+ThreadVectorRange(const Impl::OpenMPTargetExecTeamMember& thread,
+                  const iType& arg_begin, const iType& arg_end) {
+  return Impl::ThreadVectorRangeBoundariesStruct<
+      iType, Impl::OpenMPTargetExecTeamMember>(thread, arg_begin, arg_end);
 }
 
 KOKKOS_INLINE_FUNCTION
-Impl::ThreadSingleStruct<Impl::OpenMPTargetExecTeamMember> PerTeam(const Impl::OpenMPTargetExecTeamMember& thread) {
+Impl::ThreadSingleStruct<Impl::OpenMPTargetExecTeamMember> PerTeam(
+    const Impl::OpenMPTargetExecTeamMember& thread) {
   return Impl::ThreadSingleStruct<Impl::OpenMPTargetExecTeamMember>(thread);
 }
 
 KOKKOS_INLINE_FUNCTION
-Impl::VectorSingleStruct<Impl::OpenMPTargetExecTeamMember> PerThread(const Impl::OpenMPTargetExecTeamMember& thread) {
+Impl::VectorSingleStruct<Impl::OpenMPTargetExecTeamMember> PerThread(
+    const Impl::OpenMPTargetExecTeamMember& thread) {
   return Impl::VectorSingleStruct<Impl::OpenMPTargetExecTeamMember>(thread);
 }
-} // namespace Kokkos
+}  // namespace Kokkos
 
 namespace Kokkos {
 
-  /** \brief  Inter-thread parallel_for. Executes lambda(iType i) for each i=0..N-1.
-   *
-   * The range i=0..N-1 is mapped to all threads of the the calling thread team.
-   * This functionality requires C++11 support.*/
-template<typename iType, class Lambda>
-KOKKOS_INLINE_FUNCTION
-void parallel_for(const Impl::TeamThreadRangeBoundariesStruct<iType,Impl::OpenMPTargetExecTeamMember>& loop_boundaries, const Lambda& lambda) {
-  for( iType i = loop_boundaries.start; i < loop_boundaries.end; i+=loop_boundaries.increment)
+/** \brief  Inter-thread parallel_for. Executes lambda(iType i) for each
+ * i=0..N-1.
+ *
+ * The range i=0..N-1 is mapped to all threads of the the calling thread team.
+ * This functionality requires C++11 support.*/
+template <typename iType, class Lambda>
+KOKKOS_INLINE_FUNCTION void parallel_for(
+    const Impl::TeamThreadRangeBoundariesStruct<
+        iType, Impl::OpenMPTargetExecTeamMember>& loop_boundaries,
+    const Lambda& lambda) {
+  for (iType i = loop_boundaries.start; i < loop_boundaries.end;
+       i += loop_boundaries.increment)
     lambda(i);
 }
 
-/** \brief  Inter-thread vector parallel_reduce. Executes lambda(iType i, ValueType & val) for each i=0..N-1.
+/** \brief  Inter-thread vector parallel_reduce. Executes lambda(iType i,
+ * ValueType & val) for each i=0..N-1.
  *
- * The range i=0..N-1 is mapped to all threads of the the calling thread team and a summation of
- * val is performed and put into result. This functionality requires C++11 support.*/
-template< typename iType, class Lambda, typename ValueType >
-KOKKOS_INLINE_FUNCTION
-void parallel_reduce(const Impl::TeamThreadRangeBoundariesStruct<iType,Impl::OpenMPTargetExecTeamMember>& loop_boundaries,
-                     const Lambda & lambda, ValueType& result) {
-
+ * The range i=0..N-1 is mapped to all threads of the the calling thread team
+ * and a summation of val is performed and put into result. This functionality
+ * requires C++11 support.*/
+template <typename iType, class Lambda, typename ValueType>
+KOKKOS_INLINE_FUNCTION void parallel_reduce(
+    const Impl::TeamThreadRangeBoundariesStruct<
+        iType, Impl::OpenMPTargetExecTeamMember>& loop_boundaries,
+    const Lambda& lambda, ValueType& result) {
   result = ValueType();
 
-  for( iType i = loop_boundaries.start; i < loop_boundaries.end; i+=loop_boundaries.increment) {
+  for (iType i = loop_boundaries.start; i < loop_boundaries.end;
+       i += loop_boundaries.increment) {
     ValueType tmp = ValueType();
-    lambda(i,tmp);
-    result+=tmp;
+    lambda(i, tmp);
+    result += tmp;
   }
 
-  //result = loop_boundaries.thread.team_reduce(result,Impl::JoinAdd<ValueType>());
+  // result =
+  // loop_boundaries.thread.team_reduce(result,Impl::JoinAdd<ValueType>());
 }
 
-/** \brief  Intra-thread vector parallel_reduce. Executes lambda(iType i, ValueType & val) for each i=0..N-1.
+/** \brief  Intra-thread vector parallel_reduce. Executes lambda(iType i,
+ * ValueType & val) for each i=0..N-1.
  *
- * The range i=0..N-1 is mapped to all vector lanes of the the calling thread and a reduction of
- * val is performed using JoinType(ValueType& val, const ValueType& update) and put into init_result.
- * The input value of init_result is used as initializer for temporary variables of ValueType. Therefore
- * the input value should be the neutral element with respect to the join operation (e.g. '0 for +-' or
- * '1 for *'). This functionality requires C++11 support.*/
-template< typename iType, class Lambda, typename ValueType, class JoinType >
-KOKKOS_INLINE_FUNCTION
-void parallel_reduce(const Impl::TeamThreadRangeBoundariesStruct<iType,Impl::OpenMPTargetExecTeamMember>& loop_boundaries,
-                     const Lambda & lambda, const JoinType& join, ValueType& init_result) {
-
+ * The range i=0..N-1 is mapped to all vector lanes of the the calling thread
+ * and a reduction of val is performed using JoinType(ValueType& val, const
+ * ValueType& update) and put into init_result. The input value of init_result
+ * is used as initializer for temporary variables of ValueType. Therefore the
+ * input value should be the neutral element with respect to the join operation
+ * (e.g. '0 for +-' or '1 for *'). This functionality requires C++11 support.*/
+template <typename iType, class Lambda, typename ValueType, class JoinType>
+KOKKOS_INLINE_FUNCTION void parallel_reduce(
+    const Impl::TeamThreadRangeBoundariesStruct<
+        iType, Impl::OpenMPTargetExecTeamMember>& loop_boundaries,
+    const Lambda& lambda, const JoinType& join, ValueType& init_result) {
   ValueType result = init_result;
 
-  for( iType i = loop_boundaries.start; i < loop_boundaries.end; i+=loop_boundaries.increment) {
+  for (iType i = loop_boundaries.start; i < loop_boundaries.end;
+       i += loop_boundaries.increment) {
     ValueType tmp = ValueType();
-    lambda(i,tmp);
-    join(result,tmp);
+    lambda(i, tmp);
+    join(result, tmp);
   }
 
-  //init_result = loop_boundaries.thread.team_reduce(result,join);
+  // init_result = loop_boundaries.thread.team_reduce(result,join);
 }
 
-} //namespace Kokkos
-
+}  // namespace Kokkos
 
 namespace Kokkos {
-/** \brief  Intra-thread vector parallel_for. Executes lambda(iType i) for each i=0..N-1.
+/** \brief  Intra-thread vector parallel_for. Executes lambda(iType i) for each
+ * i=0..N-1.
  *
  * The range i=0..N-1 is mapped to all vector lanes of the the calling thread.
  * This functionality requires C++11 support.*/
-template<typename iType, class Lambda>
-KOKKOS_INLINE_FUNCTION
-void parallel_for(const Impl::ThreadVectorRangeBoundariesStruct<iType,Impl::OpenMPTargetExecTeamMember >&
-    loop_boundaries, const Lambda& lambda) {
-  for( iType i = loop_boundaries.start; i < loop_boundaries.end; i+=loop_boundaries.increment)
+template <typename iType, class Lambda>
+KOKKOS_INLINE_FUNCTION void parallel_for(
+    const Impl::ThreadVectorRangeBoundariesStruct<
+        iType, Impl::OpenMPTargetExecTeamMember>& loop_boundaries,
+    const Lambda& lambda) {
+  for (iType i = loop_boundaries.start; i < loop_boundaries.end;
+       i += loop_boundaries.increment)
     lambda(i);
 }
 
-/** \brief  Intra-thread vector parallel_reduce. Executes lambda(iType i, ValueType & val) for each i=0..N-1.
+/** \brief  Intra-thread vector parallel_reduce. Executes lambda(iType i,
+ * ValueType & val) for each i=0..N-1.
  *
- * The range i=0..N-1 is mapped to all vector lanes of the the calling thread and a summation of
- * val is performed and put into result. This functionality requires C++11 support.*/
-template< typename iType, class Lambda, typename ValueType >
-KOKKOS_INLINE_FUNCTION
-void parallel_reduce(const Impl::ThreadVectorRangeBoundariesStruct<iType,Impl::OpenMPTargetExecTeamMember >&
-      loop_boundaries, const Lambda & lambda, ValueType& result) {
+ * The range i=0..N-1 is mapped to all vector lanes of the the calling thread
+ * and a summation of val is performed and put into result. This functionality
+ * requires C++11 support.*/
+template <typename iType, class Lambda, typename ValueType>
+KOKKOS_INLINE_FUNCTION void parallel_reduce(
+    const Impl::ThreadVectorRangeBoundariesStruct<
+        iType, Impl::OpenMPTargetExecTeamMember>& loop_boundaries,
+    const Lambda& lambda, ValueType& result) {
   result = ValueType();
-  for( iType i = loop_boundaries.start; i < loop_boundaries.end; i+=loop_boundaries.increment) {
+  for (iType i = loop_boundaries.start; i < loop_boundaries.end;
+       i += loop_boundaries.increment) {
     ValueType tmp = ValueType();
-    lambda(i,tmp);
-    result+=tmp;
+    lambda(i, tmp);
+    result += tmp;
   }
 }
 
-/** \brief  Intra-thread vector parallel_reduce. Executes lambda(iType i, ValueType & val) for each i=0..N-1.
+/** \brief  Intra-thread vector parallel_reduce. Executes lambda(iType i,
+ * ValueType & val) for each i=0..N-1.
  *
- * The range i=0..N-1 is mapped to all vector lanes of the the calling thread and a reduction of
- * val is performed using JoinType(ValueType& val, const ValueType& update) and put into init_result.
- * The input value of init_result is used as initializer for temporary variables of ValueType. Therefore
- * the input value should be the neutral element with respect to the join operation (e.g. '0 for +-' or
- * '1 for *'). This functionality requires C++11 support.*/
-template< typename iType, class Lambda, typename ValueType, class JoinType >
-KOKKOS_INLINE_FUNCTION
-void parallel_reduce(const Impl::ThreadVectorRangeBoundariesStruct<iType,Impl::OpenMPTargetExecTeamMember >&
-      loop_boundaries, const Lambda & lambda, const JoinType& join, ValueType& init_result) {
-
+ * The range i=0..N-1 is mapped to all vector lanes of the the calling thread
+ * and a reduction of val is performed using JoinType(ValueType& val, const
+ * ValueType& update) and put into init_result. The input value of init_result
+ * is used as initializer for temporary variables of ValueType. Therefore the
+ * input value should be the neutral element with respect to the join operation
+ * (e.g. '0 for +-' or '1 for *'). This functionality requires C++11 support.*/
+template <typename iType, class Lambda, typename ValueType, class JoinType>
+KOKKOS_INLINE_FUNCTION void parallel_reduce(
+    const Impl::ThreadVectorRangeBoundariesStruct<
+        iType, Impl::OpenMPTargetExecTeamMember>& loop_boundaries,
+    const Lambda& lambda, const JoinType& join, ValueType& init_result) {
   ValueType result = init_result;
 #ifdef KOKKOS_ENABLE_PRAGMA_IVDEP
 #pragma ivdep
 #endif
-  for( iType i = loop_boundaries.start; i < loop_boundaries.end; i+=loop_boundaries.increment) {
+  for (iType i = loop_boundaries.start; i < loop_boundaries.end;
+       i += loop_boundaries.increment) {
     ValueType tmp = ValueType();
-    lambda(i,tmp);
-    join(result,tmp);
+    lambda(i, tmp);
+    join(result, tmp);
   }
   init_result = result;
 }
 
-/** \brief  Intra-thread vector parallel exclusive prefix sum. Executes lambda(iType i, ValueType & val, bool final)
- *          for each i=0..N-1.
+/** \brief  Intra-thread vector parallel exclusive prefix sum. Executes
+ * lambda(iType i, ValueType & val, bool final) for each i=0..N-1.
  *
- * The range i=0..N-1 is mapped to all vector lanes in the thread and a scan operation is performed.
- * Depending on the target execution space the operator might be called twice: once with final=false
- * and once with final=true. When final==true val contains the prefix sum value. The contribution of this
- * "i" needs to be added to val no matter whether final==true or not. In a serial execution
- * (i.e. team_size==1) the operator is only called once with final==true. Scan_val will be set
- * to the final sum value over all vector lanes.
- * This functionality requires C++11 support.*/
-template< typename iType, class FunctorType >
-KOKKOS_INLINE_FUNCTION
-void parallel_scan(const Impl::ThreadVectorRangeBoundariesStruct<iType,Impl::OpenMPTargetExecTeamMember >&
-      loop_boundaries, const FunctorType & lambda) {
-
-  typedef Kokkos::Impl::FunctorValueTraits< FunctorType , void > ValueTraits ;
-  typedef typename ValueTraits::value_type value_type ;
+ * The range i=0..N-1 is mapped to all vector lanes in the thread and a scan
+ * operation is performed. Depending on the target execution space the operator
+ * might be called twice: once with final=false and once with final=true. When
+ * final==true val contains the prefix sum value. The contribution of this "i"
+ * needs to be added to val no matter whether final==true or not. In a serial
+ * execution (i.e. team_size==1) the operator is only called once with
+ * final==true. Scan_val will be set to the final sum value over all vector
+ * lanes. This functionality requires C++11 support.*/
+template <typename iType, class FunctorType>
+KOKKOS_INLINE_FUNCTION void parallel_scan(
+    const Impl::ThreadVectorRangeBoundariesStruct<
+        iType, Impl::OpenMPTargetExecTeamMember>& loop_boundaries,
+    const FunctorType& lambda) {
+  typedef Kokkos::Impl::FunctorValueTraits<FunctorType, void> ValueTraits;
+  typedef typename ValueTraits::value_type value_type;
 
   value_type scan_val = value_type();
 
 #ifdef KOKKOS_ENABLE_PRAGMA_IVDEP
 #pragma ivdep
 #endif
-  for( iType i = loop_boundaries.start; i < loop_boundaries.end; i+=loop_boundaries.increment) {
-    lambda(i,scan_val,true);
+  for (iType i = loop_boundaries.start; i < loop_boundaries.end;
+       i += loop_boundaries.increment) {
+    lambda(i, scan_val, true);
   }
 }
 
-} // namespace Kokkos
+}  // namespace Kokkos
 
 namespace Kokkos {
 
-template<class FunctorType>
-KOKKOS_INLINE_FUNCTION
-void single(const Impl::VectorSingleStruct<Impl::OpenMPTargetExecTeamMember>& single_struct, const FunctorType& lambda) {
+template <class FunctorType>
+KOKKOS_INLINE_FUNCTION void single(
+    const Impl::VectorSingleStruct<Impl::OpenMPTargetExecTeamMember>&
+        single_struct,
+    const FunctorType& lambda) {
   lambda();
 }
 
-template<class FunctorType>
-KOKKOS_INLINE_FUNCTION
-void single(const Impl::ThreadSingleStruct<Impl::OpenMPTargetExecTeamMember>& single_struct, const FunctorType& lambda) {
-  if(single_struct.team_member.team_rank()==0) lambda();
+template <class FunctorType>
+KOKKOS_INLINE_FUNCTION void single(
+    const Impl::ThreadSingleStruct<Impl::OpenMPTargetExecTeamMember>&
+        single_struct,
+    const FunctorType& lambda) {
+  if (single_struct.team_member.team_rank() == 0) lambda();
 }
 
-template<class FunctorType, class ValueType>
-KOKKOS_INLINE_FUNCTION
-void single(const Impl::VectorSingleStruct<Impl::OpenMPTargetExecTeamMember>& single_struct, const FunctorType& lambda, ValueType& val) {
+template <class FunctorType, class ValueType>
+KOKKOS_INLINE_FUNCTION void single(
+    const Impl::VectorSingleStruct<Impl::OpenMPTargetExecTeamMember>&
+        single_struct,
+    const FunctorType& lambda, ValueType& val) {
   lambda(val);
 }
 
-template<class FunctorType, class ValueType>
-KOKKOS_INLINE_FUNCTION
-void single(const Impl::ThreadSingleStruct<Impl::OpenMPTargetExecTeamMember>& single_struct, const FunctorType& lambda, ValueType& val) {
-  if(single_struct.team_member.team_rank()==0) {
+template <class FunctorType, class ValueType>
+KOKKOS_INLINE_FUNCTION void single(
+    const Impl::ThreadSingleStruct<Impl::OpenMPTargetExecTeamMember>&
+        single_struct,
+    const FunctorType& lambda, ValueType& val) {
+  if (single_struct.team_member.team_rank() == 0) {
     lambda(val);
   }
-  single_struct.team_member.team_broadcast(val,0);
-}
+  single_struct.team_member.team_broadcast(val, 0);
 }
+}  // namespace Kokkos
 
 #endif /* #ifndef KOKKOS_OPENMPTARGETEXEC_HPP */
-
diff --git a/lib/kokkos/core/src/OpenMPTarget/Kokkos_OpenMPTarget_Parallel.hpp b/lib/kokkos/core/src/OpenMPTarget/Kokkos_OpenMPTarget_Parallel.hpp
index c93a88606d..2252cf0372 100644
--- a/lib/kokkos/core/src/OpenMPTarget/Kokkos_OpenMPTarget_Parallel.hpp
+++ b/lib/kokkos/core/src/OpenMPTarget/Kokkos_OpenMPTarget_Parallel.hpp
@@ -1,13 +1,14 @@
 /*
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -36,7 +37,7 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 */
@@ -56,70 +57,57 @@
 namespace Kokkos {
 namespace Impl {
 
-template< class FunctorType , class ... Traits >
-class ParallelFor< FunctorType
-                 , Kokkos::RangePolicy< Traits ... >
-                 , Kokkos::Experimental::OpenMPTarget 
-                 >
-{
-private:
+template <class FunctorType, class... Traits>
+class ParallelFor<FunctorType, Kokkos::RangePolicy<Traits...>,
+                  Kokkos::Experimental::OpenMPTarget> {
+ private:
+  typedef Kokkos::RangePolicy<Traits...> Policy;
+  typedef typename Policy::work_tag WorkTag;
+  typedef typename Policy::WorkRange WorkRange;
+  typedef typename Policy::member_type Member;
 
-  typedef Kokkos::RangePolicy< Traits ...  > Policy ;
-  typedef typename Policy::work_tag     WorkTag ;
-  typedef typename Policy::WorkRange    WorkRange ;
-  typedef typename Policy::member_type  Member ;
+  const FunctorType m_functor;
+  const Policy m_policy;
 
-  const FunctorType m_functor ;
-  const Policy      m_policy ;
+ public:
+  inline void execute() const { execute_impl<WorkTag>(); }
 
+  template <class TagType>
+  inline typename std::enable_if<std::is_same<TagType, void>::value>::type
+  execute_impl() const {
+    OpenMPTargetExec::verify_is_process(
+        "Kokkos::Experimental::OpenMPTarget parallel_for");
+    OpenMPTargetExec::verify_initialized(
+        "Kokkos::Experimental::OpenMPTarget parallel_for");
+    const typename Policy::member_type begin = m_policy.begin();
+    const typename Policy::member_type end   = m_policy.end();
 
-public:
-
-  inline void execute() const {
-    execute_impl<WorkTag>();
+#pragma omp target teams distribute parallel for map(to : this->m_functor)
+    for (int i = begin; i < end; i++) m_functor(i);
   }
 
-  template< class TagType >
-  inline
-  typename std::enable_if< std::is_same< TagType , void >::value >::type
-  execute_impl() const
-    {
-      OpenMPTargetExec::verify_is_process("Kokkos::Experimental::OpenMPTarget parallel_for");
-      OpenMPTargetExec::verify_initialized("Kokkos::Experimental::OpenMPTarget parallel_for");
-      const typename Policy::member_type begin = m_policy.begin();
-      const typename Policy::member_type end = m_policy.end();
-      
-      #pragma omp target teams distribute parallel for map(to:this->m_functor)
-      for(int i=begin; i<end; i++)
-        m_functor(i);
-    }
+  template <class TagType>
+  inline typename std::enable_if<!std::is_same<TagType, void>::value>::type
+  execute_impl() const {
+    OpenMPTargetExec::verify_is_process(
+        "Kokkos::Experimental::OpenMPTarget parallel_for");
+    OpenMPTargetExec::verify_initialized(
+        "Kokkos::Experimental::OpenMPTarget parallel_for");
+    const typename Policy::member_type begin = m_policy.begin();
+    const typename Policy::member_type end   = m_policy.end();
 
+#pragma omp target teams distribute parallel for num_threads(128) \
+    map(to                                                        \
+        : this->m_functor)
+    for (int i = begin; i < end; i++) m_functor(TagType(), i);
+  }
 
-  template< class TagType >
-  inline
-  typename std::enable_if< ! std::is_same< TagType , void >::value >::type
-  execute_impl() const
-    {
-      OpenMPTargetExec::verify_is_process("Kokkos::Experimental::OpenMPTarget parallel_for");
-      OpenMPTargetExec::verify_initialized("Kokkos::Experimental::OpenMPTarget parallel_for");
-      const typename Policy::member_type begin = m_policy.begin();
-      const typename Policy::member_type end = m_policy.end();
-
-      #pragma omp target teams distribute parallel for num_threads(128) map(to:this->m_functor)
-      for(int i=begin; i<end; i++)
-        m_functor(TagType(),i);
-    }
-
-  inline
-  ParallelFor( const FunctorType & arg_functor
-             , Policy arg_policy )
-    : m_functor( arg_functor )
-    , m_policy(  arg_policy )
-    {}
+  inline ParallelFor(const FunctorType& arg_functor, Policy arg_policy)
+      : m_functor(arg_functor), m_policy(arg_policy) {}
 };
 
-} // namespace Impl
-} // namespace Kokkos
+}  // namespace Impl
+}  // namespace Kokkos
 
 //----------------------------------------------------------------------------
 //----------------------------------------------------------------------------
@@ -127,78 +115,88 @@ public:
 namespace Kokkos {
 namespace Impl {
 
-template<class FunctorType, class PolicyType, class ReducerType, class PointerType, class ValueType, int FunctorHasJoin, int UseReducerType>
+template <class FunctorType, class PolicyType, class ReducerType,
+          class PointerType, class ValueType, int FunctorHasJoin,
+          int UseReducerType>
 struct ParallelReduceSpecialize {
-  static inline void execute(const FunctorType& f, const PolicyType& p , PointerType result_ptr) {
-    printf("Error: Invalid Specialization %i %i\n",FunctorHasJoin,UseReducerType);
+  static inline void execute(const FunctorType& f, const PolicyType& p,
+                             PointerType result_ptr) {
+    printf("Error: Invalid Specialization %i %i\n", FunctorHasJoin,
+           UseReducerType);
   }
 };
 
-template<class FunctorType, class ReducerType, class PointerType, class ValueType, class ... PolicyArgs>
-struct ParallelReduceSpecialize<FunctorType, Kokkos::RangePolicy<PolicyArgs...>, ReducerType, PointerType, ValueType, 0,0> {
+template <class FunctorType, class ReducerType, class PointerType,
+          class ValueType, class... PolicyArgs>
+struct ParallelReduceSpecialize<FunctorType, Kokkos::RangePolicy<PolicyArgs...>,
+                                ReducerType, PointerType, ValueType, 0, 0> {
   typedef Kokkos::RangePolicy<PolicyArgs...> PolicyType;
-  template< class TagType >
+  template <class TagType>
   inline static
-  typename std::enable_if< std::is_same< TagType , void >::value >::type
-  execute_impl(const FunctorType& f, const PolicyType& p, PointerType result_ptr)
-    {
-      OpenMPTargetExec::verify_is_process("Kokkos::Experimental::OpenMPTarget parallel_for");
-      OpenMPTargetExec::verify_initialized("Kokkos::Experimental::OpenMPTarget parallel_for");
-      const typename PolicyType::member_type begin = p.begin();
-      const typename PolicyType::member_type end = p.end();
-      
-      ValueType result = ValueType();
-      #pragma omp target teams distribute parallel for num_teams(512) map(to:f) map(tofrom:result) reduction(+: result)
-      for(int i=begin; i<end; i++)
-        f(i,result);
+      typename std::enable_if<std::is_same<TagType, void>::value>::type
+      execute_impl(const FunctorType& f, const PolicyType& p,
+                   PointerType result_ptr) {
+    OpenMPTargetExec::verify_is_process(
+        "Kokkos::Experimental::OpenMPTarget parallel_for");
+    OpenMPTargetExec::verify_initialized(
+        "Kokkos::Experimental::OpenMPTarget parallel_for");
+    const typename PolicyType::member_type begin = p.begin();
+    const typename PolicyType::member_type end   = p.end();
 
-      *result_ptr=result;
-    }
+    ValueType result = ValueType();
+#pragma omp target teams distribute parallel for num_teams(512) map(to:f) map(tofrom:result) reduction(+: result)
+    for (int i = begin; i < end; i++) f(i, result);
 
+    *result_ptr = result;
+  }
 
-  template< class TagType >
+  template <class TagType>
   inline static
-  typename std::enable_if< ! std::is_same< TagType , void >::value >::type
-  execute_impl(const FunctorType& f, const PolicyType& p, PointerType result_ptr)
-    {
-      OpenMPTargetExec::verify_is_process("Kokkos::Experimental::OpenMPTarget parallel_for");
-      OpenMPTargetExec::verify_initialized("Kokkos::Experimental::OpenMPTarget parallel_for");
-      const typename PolicyType::member_type begin = p.begin();
-      const typename PolicyType::member_type end = p.end();
+      typename std::enable_if<!std::is_same<TagType, void>::value>::type
+      execute_impl(const FunctorType& f, const PolicyType& p,
+                   PointerType result_ptr) {
+    OpenMPTargetExec::verify_is_process(
+        "Kokkos::Experimental::OpenMPTarget parallel_for");
+    OpenMPTargetExec::verify_initialized(
+        "Kokkos::Experimental::OpenMPTarget parallel_for");
+    const typename PolicyType::member_type begin = p.begin();
+    const typename PolicyType::member_type end   = p.end();
 
-      ValueType result = ValueType();
-      #pragma omp target teams distribute parallel for num_teams(512) map(to:f) map(tofrom: result) reduction(+: result)
-      for(int i=begin; i<end; i++)
-        f(TagType(),i,result);
-      
-      *result_ptr=result;
-    }
+    ValueType result = ValueType();
+#pragma omp target teams distribute parallel for num_teams(512) map(to:f) map(tofrom: result) reduction(+: result)
+    for (int i = begin; i < end; i++) f(TagType(), i, result);
 
+    *result_ptr = result;
+  }
 
-    inline static
-    void execute(const FunctorType& f, const PolicyType& p, PointerType ptr) {
-      execute_impl<typename PolicyType::work_tag>(f,p,ptr);
-    }
+  inline static void execute(const FunctorType& f, const PolicyType& p,
+                             PointerType ptr) {
+    execute_impl<typename PolicyType::work_tag>(f, p, ptr);
+  }
 };
 /*
-template<class FunctorType, class PolicyType, class ReducerType, class PointerType, class ValueType>
-struct ParallelReduceSpecialize<FunctorType, PolicyType, ReducerType, PointerType, ValueType, 0,1> {
+template<class FunctorType, class PolicyType, class ReducerType, class
+PointerType, class ValueType> struct ParallelReduceSpecialize<FunctorType,
+PolicyType, ReducerType, PointerType, ValueType, 0,1> {
 
-  #pragma omp declare reduction(custom: ValueType : ReducerType::join(omp_out, omp_in)) initializer ( ReducerType::init(omp_priv) )
+  #pragma omp declare reduction(custom: ValueType : ReducerType::join(omp_out,
+omp_in)) initializer ( ReducerType::init(omp_priv) )
 
   template< class TagType >
   inline static
   typename std::enable_if< std::is_same< TagType , void >::value >::type
-  execute_impl(const FunctorType& f, const PolicyType& p, PointerType result_ptr)
+  execute_impl(const FunctorType& f, const PolicyType& p, PointerType
+result_ptr)
     {
-      OpenMPTargetExec::verify_is_process("Kokkos::Experimental::OpenMPTarget parallel_for");
-      OpenMPTargetExec::verify_initialized("Kokkos::Experimental::OpenMPTarget parallel_for");
-      const typename PolicyType::member_type begin = p.begin();
-      const typename PolicyType::member_type end = p.end();
+      OpenMPTargetExec::verify_is_process("Kokkos::Experimental::OpenMPTarget
+parallel_for");
+      OpenMPTargetExec::verify_initialized("Kokkos::Experimental::OpenMPTarget
+parallel_for"); const typename PolicyType::member_type begin = p.begin(); const
+typename PolicyType::member_type end = p.end();
 
       ValueType result = ValueType();
-      #pragma omp target teams distribute parallel for num_teams(512) map(to:f) map(tofrom:result) reduction(custom: result)
-      for(int i=begin; i<end; i++)
+      #pragma omp target teams distribute parallel for num_teams(512) map(to:f)
+map(tofrom:result) reduction(custom: result) for(int i=begin; i<end; i++)
         f(i,result);
 
       *result_ptr=result;
@@ -208,16 +206,18 @@ struct ParallelReduceSpecialize<FunctorType, PolicyType, ReducerType, PointerTyp
   template< class TagType >
   inline static
   typename std::enable_if< ! std::is_same< TagType , void >::value >::type
-  execute_impl(const FunctorType& f, const PolicyType& p, PointerType result_ptr)
+  execute_impl(const FunctorType& f, const PolicyType& p, PointerType
+result_ptr)
     {
-      OpenMPTargetExec::verify_is_process("Kokkos::Experimental::OpenMPTarget parallel_for");
-      OpenMPTargetExec::verify_initialized("Kokkos::Experimental::OpenMPTarget parallel_for");
-      const typename PolicyType::member_type begin = p.begin();
-      const typename PolicyType::member_type end = p.end();
+      OpenMPTargetExec::verify_is_process("Kokkos::Experimental::OpenMPTarget
+parallel_for");
+      OpenMPTargetExec::verify_initialized("Kokkos::Experimental::OpenMPTarget
+parallel_for"); const typename PolicyType::member_type begin = p.begin(); const
+typename PolicyType::member_type end = p.end();
 
       ValueType result = ValueType();
-      #pragma omp target teams distribute parallel for num_teams(512) map(to:f) map(tofrom: result) reduction(custom: result)
-      for(int i=begin; i<end; i++)
+      #pragma omp target teams distribute parallel for num_teams(512) map(to:f)
+map(tofrom: result) reduction(custom: result) for(int i=begin; i<end; i++)
         f(TagType(),i,result);
 
       *result_ptr=result;
@@ -231,86 +231,84 @@ struct ParallelReduceSpecialize<FunctorType, PolicyType, ReducerType, PointerTyp
 };
 */
 
-template< class FunctorType , class ReducerType, class ... Traits >
-class ParallelReduce< FunctorType
-                    , Kokkos::RangePolicy< Traits ...>
-                    , ReducerType
-                    , Kokkos::Experimental::OpenMPTarget
-                    >
-{
-private:
+template <class FunctorType, class ReducerType, class... Traits>
+class ParallelReduce<FunctorType, Kokkos::RangePolicy<Traits...>, ReducerType,
+                     Kokkos::Experimental::OpenMPTarget> {
+ private:
+  typedef Kokkos::RangePolicy<Traits...> Policy;
 
-  typedef Kokkos::RangePolicy< Traits ... > Policy ;
+  typedef typename Policy::work_tag WorkTag;
+  typedef typename Policy::WorkRange WorkRange;
+  typedef typename Policy::member_type Member;
 
-  typedef typename Policy::work_tag     WorkTag ;
-  typedef typename Policy::WorkRange    WorkRange ;
-  typedef typename Policy::member_type  Member ;
-
-  typedef Kokkos::Impl::if_c< std::is_same<InvalidType,ReducerType>::value, FunctorType, ReducerType> ReducerConditional;
+  typedef Kokkos::Impl::if_c<std::is_same<InvalidType, ReducerType>::value,
+                             FunctorType, ReducerType>
+      ReducerConditional;
   typedef typename ReducerConditional::type ReducerTypeFwd;
-  typedef typename Kokkos::Impl::if_c< std::is_same<InvalidType,ReducerType>::value, WorkTag, void>::type WorkTagFwd;
+  typedef
+      typename Kokkos::Impl::if_c<std::is_same<InvalidType, ReducerType>::value,
+                                  WorkTag, void>::type WorkTagFwd;
 
   // Static Assert WorkTag void if ReducerType not InvalidType
 
-  typedef Kokkos::Impl::FunctorValueTraits< ReducerTypeFwd , WorkTagFwd > ValueTraits ;
-  typedef Kokkos::Impl::FunctorValueInit<   ReducerTypeFwd , WorkTagFwd > ValueInit ;
-  typedef Kokkos::Impl::FunctorValueJoin<   ReducerTypeFwd , WorkTagFwd > ValueJoin ;
+  typedef Kokkos::Impl::FunctorValueTraits<ReducerTypeFwd, WorkTagFwd>
+      ValueTraits;
+  typedef Kokkos::Impl::FunctorValueInit<ReducerTypeFwd, WorkTagFwd> ValueInit;
+  typedef Kokkos::Impl::FunctorValueJoin<ReducerTypeFwd, WorkTagFwd> ValueJoin;
 
-  enum {HasJoin = ReduceFunctorHasJoin<FunctorType>::value };
-  enum {UseReducer = is_reducer_type<ReducerType>::value };
+  enum { HasJoin = ReduceFunctorHasJoin<FunctorType>::value };
+  enum { UseReducer = is_reducer_type<ReducerType>::value };
 
-  typedef typename ValueTraits::pointer_type    pointer_type ;
-  typedef typename ValueTraits::reference_type  reference_type ;
-  
-  typedef ParallelReduceSpecialize<FunctorType,Policy,ReducerType,pointer_type,typename ValueTraits::value_type,HasJoin,UseReducer> ParForSpecialize;
+  typedef typename ValueTraits::pointer_type pointer_type;
+  typedef typename ValueTraits::reference_type reference_type;
 
-  const FunctorType   m_functor ;
-  const Policy        m_policy ;
-  const ReducerType   m_reducer ;
-  const pointer_type  m_result_ptr ;
+  typedef ParallelReduceSpecialize<
+      FunctorType, Policy, ReducerType, pointer_type,
+      typename ValueTraits::value_type, HasJoin, UseReducer>
+      ParForSpecialize;
 
-public: 
+  const FunctorType m_functor;
+  const Policy m_policy;
+  const ReducerType m_reducer;
+  const pointer_type m_result_ptr;
+
+ public:
   inline void execute() const {
-    ParForSpecialize::execute(m_functor,m_policy,m_result_ptr);    
+    ParForSpecialize::execute(m_functor, m_policy, m_result_ptr);
   }
 
-  template< class ViewType >
-  inline
-  ParallelReduce( const FunctorType & arg_functor
-                , Policy       arg_policy
-                , const ViewType    & arg_result_view
-                , typename std::enable_if<
-                           Kokkos::is_view< ViewType >::value &&
-                           !Kokkos::is_reducer_type<ReducerType>::value
-                  ,void*>::type = NULL)
-    : m_functor( arg_functor )
-    , m_policy(  arg_policy )
-    , m_reducer( InvalidType() )
-    , m_result_ptr(  arg_result_view.data() )
-    {
-      /*static_assert( std::is_same< typename ViewType::memory_space
-                                      , Kokkos::HostSpace >::value
-        , "Reduction result on Kokkos::Experimental::OpenMPTarget must be a Kokkos::View in HostSpace" );*/
-    }
-
-  inline
-  ParallelReduce( const FunctorType & arg_functor
-                , Policy       arg_policy
-                , const ReducerType& reducer )
-    : m_functor( arg_functor )
-    , m_policy(  arg_policy )
-    , m_reducer( reducer )
-    , m_result_ptr(  reducer.result_view().data() )
-    {
-      /*static_assert( std::is_same< typename ViewType::memory_space
-                                      , Kokkos::HostSpace >::value
-        , "Reduction result on Kokkos::Experimental::OpenMPTarget must be a Kokkos::View in HostSpace" );*/
-    }
+  template <class ViewType>
+  inline ParallelReduce(
+      const FunctorType& arg_functor, Policy arg_policy,
+      const ViewType& arg_result_view,
+      typename std::enable_if<Kokkos::is_view<ViewType>::value &&
+                                  !Kokkos::is_reducer_type<ReducerType>::value,
+                              void*>::type = NULL)
+      : m_functor(arg_functor),
+        m_policy(arg_policy),
+        m_reducer(InvalidType()),
+        m_result_ptr(arg_result_view.data()) {
+    /*static_assert( std::is_same< typename ViewType::memory_space
+                                    , Kokkos::HostSpace >::value
+      , "Reduction result on Kokkos::Experimental::OpenMPTarget must be a
+      Kokkos::View in HostSpace" );*/
+  }
 
+  inline ParallelReduce(const FunctorType& arg_functor, Policy arg_policy,
+                        const ReducerType& reducer)
+      : m_functor(arg_functor),
+        m_policy(arg_policy),
+        m_reducer(reducer),
+        m_result_ptr(reducer.result_view().data()) {
+    /*static_assert( std::is_same< typename ViewType::memory_space
+                                    , Kokkos::HostSpace >::value
+      , "Reduction result on Kokkos::Experimental::OpenMPTarget must be a
+      Kokkos::View in HostSpace" );*/
+  }
 };
 
-} // namespace Impl
-} // namespace Kokkos
+}  // namespace Impl
+}  // namespace Kokkos
 
 //----------------------------------------------------------------------------
 //----------------------------------------------------------------------------
@@ -318,136 +316,129 @@ public:
 namespace Kokkos {
 namespace Impl {
 
-template< class FunctorType , class ... Traits >
-class ParallelScan< FunctorType
-                  , Kokkos::RangePolicy< Traits ... >
-                  , Kokkos::Experimental::OpenMPTarget
-                  >
-{
-private:
+template <class FunctorType, class... Traits>
+class ParallelScan<FunctorType, Kokkos::RangePolicy<Traits...>,
+                   Kokkos::Experimental::OpenMPTarget> {
+ private:
+  typedef Kokkos::RangePolicy<Traits...> Policy;
 
-  typedef Kokkos::RangePolicy< Traits ... > Policy ;
+  typedef typename Policy::work_tag WorkTag;
+  typedef typename Policy::WorkRange WorkRange;
+  typedef typename Policy::member_type Member;
 
-  typedef typename Policy::work_tag     WorkTag ;
-  typedef typename Policy::WorkRange    WorkRange ;
-  typedef typename Policy::member_type  Member ;
+  typedef Kokkos::Impl::FunctorValueTraits<FunctorType, WorkTag> ValueTraits;
+  typedef Kokkos::Impl::FunctorValueInit<FunctorType, WorkTag> ValueInit;
+  typedef Kokkos::Impl::FunctorValueJoin<FunctorType, WorkTag> ValueJoin;
+  typedef Kokkos::Impl::FunctorValueOps<FunctorType, WorkTag> ValueOps;
 
-  typedef Kokkos::Impl::FunctorValueTraits< FunctorType, WorkTag > ValueTraits ;
-  typedef Kokkos::Impl::FunctorValueInit<   FunctorType, WorkTag > ValueInit ;
-  typedef Kokkos::Impl::FunctorValueJoin<   FunctorType, WorkTag > ValueJoin ;
-  typedef Kokkos::Impl::FunctorValueOps<    FunctorType, WorkTag > ValueOps ;
+  typedef typename ValueTraits::pointer_type pointer_type;
+  typedef typename ValueTraits::reference_type reference_type;
 
-  typedef typename ValueTraits::pointer_type    pointer_type ;
-  typedef typename ValueTraits::reference_type  reference_type ;
-
-  const FunctorType   m_functor ;
-  const Policy        m_policy ;
-/*
-  template< class TagType >
-  inline static
-  typename std::enable_if< std::is_same< TagType , void >::value >::type
-  exec_range( const FunctorType & functor
-            , const Member ibeg , const Member iend
-            , reference_type update , const bool final )
-    {
-      #ifdef KOKKOS_OPT_RANGE_AGGRESSIVE_VECTORIZATION
-      #ifdef KOKKOS_ENABLE_PRAGMA_IVDEP
-      #pragma ivdep
-      #endif
-      #endif
-      for ( Member iwork = ibeg ; iwork < iend ; ++iwork ) {
-        functor( iwork , update , final );
-      }
-    }
-
-  template< class TagType >
-  inline static
-  typename std::enable_if< ! std::is_same< TagType , void >::value >::type
-  exec_range( const FunctorType & functor
-            , const Member ibeg , const Member iend
-            , reference_type update , const bool final )
-    {
-      const TagType t{} ;
-      #ifdef KOKKOS_OPT_RANGE_AGGRESSIVE_VECTORIZATION
-      #ifdef KOKKOS_ENABLE_PRAGMA_IVDEP
-      #pragma ivdep
-      #endif
-      #endif
-      for ( Member iwork = ibeg ; iwork < iend ; ++iwork ) {
-        functor( t , iwork , update , final );
-      }
-    }
-*/
-public:
-
-  inline
-  void execute() const
-    {
-/*      OpenMPTargetExec::verify_is_process("Kokkos::Experimental::OpenMPTarget parallel_scan");
-      OpenMPTargetExec::verify_initialized("Kokkos::Experimental::OpenMPTarget parallel_scan");
-
-      OpenMPTargetExec::resize_scratch( 2 * ValueTraits::value_size( m_functor ) , 0 );
-
-#pragma omp parallel
+  const FunctorType m_functor;
+  const Policy m_policy;
+  /*
+    template< class TagType >
+    inline static
+    typename std::enable_if< std::is_same< TagType , void >::value >::type
+    exec_range( const FunctorType & functor
+              , const Member ibeg , const Member iend
+              , reference_type update , const bool final )
       {
-        OpenMPTargetExec & exec = * OpenMPTargetExec::get_thread_omp();
-        const WorkRange range( m_policy, exec.pool_rank(), exec.pool_size() );
-        const pointer_type ptr =
-          pointer_type( exec.scratch_reduce() ) +
-          ValueTraits::value_count( m_functor );
-        ParallelScan::template exec_range< WorkTag >
-          ( m_functor , range.begin() , range.end()
-          , ValueInit::init( m_functor , ptr ) , false );
-      }
-
-      {
-        const unsigned thread_count = OpenMPTargetExec::pool_size();
-        const unsigned value_count  = ValueTraits::value_count( m_functor );
-
-        pointer_type ptr_prev = 0 ;
-
-        for ( unsigned rank_rev = thread_count ; rank_rev-- ; ) {
-
-          pointer_type ptr = pointer_type( OpenMPTargetExec::pool_rev(rank_rev)->scratch_reduce() );
-
-          if ( ptr_prev ) {
-            for ( unsigned i = 0 ; i < value_count ; ++i ) { ptr[i] = ptr_prev[ i + value_count ] ; }
-            ValueJoin::join( m_functor , ptr + value_count , ptr );
-          }
-          else {
-            ValueInit::init( m_functor , ptr );
-          }
-
-          ptr_prev = ptr ;
+        #ifdef KOKKOS_OPT_RANGE_AGGRESSIVE_VECTORIZATION
+        #ifdef KOKKOS_ENABLE_PRAGMA_IVDEP
+        #pragma ivdep
+        #endif
+        #endif
+        for ( Member iwork = ibeg ; iwork < iend ; ++iwork ) {
+          functor( iwork , update , final );
         }
       }
 
-#pragma omp parallel
+    template< class TagType >
+    inline static
+    typename std::enable_if< ! std::is_same< TagType , void >::value >::type
+    exec_range( const FunctorType & functor
+              , const Member ibeg , const Member iend
+              , reference_type update , const bool final )
       {
-        OpenMPTargetExec & exec = * OpenMPTargetExec::get_thread_omp();
-        const WorkRange range( m_policy, exec.pool_rank(), exec.pool_size() );
-        const pointer_type ptr = pointer_type( exec.scratch_reduce() );
-        ParallelScan::template exec_range< WorkTag >
-          ( m_functor , range.begin() , range.end()
-          , ValueOps::reference( ptr ) , true );
+        const TagType t{} ;
+        #ifdef KOKKOS_OPT_RANGE_AGGRESSIVE_VECTORIZATION
+        #ifdef KOKKOS_ENABLE_PRAGMA_IVDEP
+        #pragma ivdep
+        #endif
+        #endif
+        for ( Member iwork = ibeg ; iwork < iend ; ++iwork ) {
+          functor( t , iwork , update , final );
+        }
       }
-*/
-    }
+  */
+ public:
+  inline void execute() const {
+    /*      OpenMPTargetExec::verify_is_process("Kokkos::Experimental::OpenMPTarget
+    parallel_scan");
+          OpenMPTargetExec::verify_initialized("Kokkos::Experimental::OpenMPTarget
+    parallel_scan");
+
+          OpenMPTargetExec::resize_scratch( 2 * ValueTraits::value_size(
+    m_functor ) , 0 );
+
+    #pragma omp parallel
+          {
+            OpenMPTargetExec & exec = * OpenMPTargetExec::get_thread_omp();
+            const WorkRange range( m_policy, exec.pool_rank(), exec.pool_size()
+    ); const pointer_type ptr = pointer_type( exec.scratch_reduce() ) +
+              ValueTraits::value_count( m_functor );
+            ParallelScan::template exec_range< WorkTag >
+              ( m_functor , range.begin() , range.end()
+              , ValueInit::init( m_functor , ptr ) , false );
+          }
+
+          {
+            const unsigned thread_count = OpenMPTargetExec::pool_size();
+            const unsigned value_count  = ValueTraits::value_count( m_functor );
+
+            pointer_type ptr_prev = 0 ;
+
+            for ( unsigned rank_rev = thread_count ; rank_rev-- ; ) {
+
+              pointer_type ptr = pointer_type(
+    OpenMPTargetExec::pool_rev(rank_rev)->scratch_reduce() );
+
+              if ( ptr_prev ) {
+                for ( unsigned i = 0 ; i < value_count ; ++i ) { ptr[i] =
+    ptr_prev[ i + value_count ] ; } ValueJoin::join( m_functor , ptr +
+    value_count , ptr );
+              }
+              else {
+                ValueInit::init( m_functor , ptr );
+              }
+
+              ptr_prev = ptr ;
+            }
+          }
+
+    #pragma omp parallel
+          {
+            OpenMPTargetExec & exec = * OpenMPTargetExec::get_thread_omp();
+            const WorkRange range( m_policy, exec.pool_rank(), exec.pool_size()
+    ); const pointer_type ptr = pointer_type( exec.scratch_reduce() );
+            ParallelScan::template exec_range< WorkTag >
+              ( m_functor , range.begin() , range.end()
+              , ValueOps::reference( ptr ) , true );
+          }
+    */
+  }
 
   //----------------------------------------
 
-  inline
-  ParallelScan( const FunctorType & arg_functor
-              , const Policy      & arg_policy )
-    : m_functor( arg_functor )
-    , m_policy(  arg_policy )
-  {}
+  inline ParallelScan(const FunctorType& arg_functor, const Policy& arg_policy)
+      : m_functor(arg_functor), m_policy(arg_policy) {}
 
   //----------------------------------------
 };
 
-} // namespace Impl
-} // namespace Kokkos
+}  // namespace Impl
+}  // namespace Kokkos
 
 //----------------------------------------------------------------------------
 //----------------------------------------------------------------------------
@@ -455,315 +446,340 @@ public:
 namespace Kokkos {
 namespace Impl {
 
-template< class FunctorType , class ... Properties >
-class ParallelFor< FunctorType
-                 , Kokkos::TeamPolicy< Properties ... >
-                 , Kokkos::Experimental::OpenMPTarget
-                 >
-{
-private:
+template <class FunctorType, class... Properties>
+class ParallelFor<FunctorType, Kokkos::TeamPolicy<Properties...>,
+                  Kokkos::Experimental::OpenMPTarget> {
+ private:
+  typedef Kokkos::Impl::TeamPolicyInternal<Kokkos::Experimental::OpenMPTarget,
+                                           Properties...>
+      Policy;
+  typedef typename Policy::work_tag WorkTag;
+  typedef typename Policy::member_type Member;
 
-  typedef Kokkos::Impl::TeamPolicyInternal< Kokkos::Experimental::OpenMPTarget, Properties ... > Policy ;
-  typedef typename Policy::work_tag     WorkTag ;
-  typedef typename Policy::member_type  Member ;
-
-  const FunctorType  m_functor ;
-  const Policy       m_policy ;
-  const int          m_shmem_size ;
-
-public:
+  const FunctorType m_functor;
+  const Policy m_policy;
+  const int m_shmem_size;
 
+ public:
   inline void execute() const {
-    OpenMPTargetExec::verify_is_process("Kokkos::Experimental::OpenMPTarget parallel_for");
-    OpenMPTargetExec::verify_initialized("Kokkos::Experimental::OpenMPTarget parallel_for");
+    OpenMPTargetExec::verify_is_process(
+        "Kokkos::Experimental::OpenMPTarget parallel_for");
+    OpenMPTargetExec::verify_initialized(
+        "Kokkos::Experimental::OpenMPTarget parallel_for");
     execute_impl<WorkTag>();
   }
 
-private:
-  template< class TagType >
-  inline
-  typename std::enable_if< std::is_same< TagType , void >::value >::type
-  execute_impl() const
-    {
-      OpenMPTargetExec::verify_is_process("Kokkos::Experimental::OpenMPTarget parallel_for");
-      OpenMPTargetExec::verify_initialized("Kokkos::Experimental::OpenMPTarget parallel_for");
-      const int league_size = m_policy.league_size();
-      const int team_size = m_policy.team_size();
-      const int vector_length = m_policy.vector_length();
-      const int nteams = OpenMPTargetExec::MAX_ACTIVE_TEAMS<league_size?OpenMPTargetExec::MAX_ACTIVE_TEAMS:league_size;
+ private:
+  template <class TagType>
+  inline typename std::enable_if<std::is_same<TagType, void>::value>::type
+  execute_impl() const {
+    OpenMPTargetExec::verify_is_process(
+        "Kokkos::Experimental::OpenMPTarget parallel_for");
+    OpenMPTargetExec::verify_initialized(
+        "Kokkos::Experimental::OpenMPTarget parallel_for");
+    const int league_size   = m_policy.league_size();
+    const int team_size     = m_policy.team_size();
+    const int vector_length = m_policy.vector_length();
+    const int nteams        = OpenMPTargetExec::MAX_ACTIVE_TEAMS < league_size
+                           ? OpenMPTargetExec::MAX_ACTIVE_TEAMS
+                           : league_size;
 
-      OpenMPTargetExec::resize_scratch(0,Policy::member_type::TEAM_REDUCE_SIZE,0,0);
-      void* scratch_ptr = OpenMPTargetExec::get_scratch_ptr();
+    OpenMPTargetExec::resize_scratch(0, Policy::member_type::TEAM_REDUCE_SIZE,
+                                     0, 0);
+    void* scratch_ptr = OpenMPTargetExec::get_scratch_ptr();
 
-      #pragma omp target teams distribute parallel for num_teams(league_size) num_threads(team_size*vector_length) schedule(static,1) \
-          map(to:this->m_functor,scratch_ptr) 
-      for(int i=0 ; i<league_size*team_size*vector_length ; i++) {
-        typename Policy::member_type team(i/(team_size*vector_length),league_size,team_size,vector_length, scratch_ptr, 0,0);
-        m_functor(team);
-      }
+#pragma omp target teams distribute parallel for num_teams(league_size) \
+    num_threads(team_size* vector_length) schedule(static, 1)           \
+        map(to                                                          \
+            : this->m_functor, scratch_ptr)
+    for (int i = 0; i < league_size * team_size * vector_length; i++) {
+      typename Policy::member_type team(i / (team_size * vector_length),
+                                        league_size, team_size, vector_length,
+                                        scratch_ptr, 0, 0);
+      m_functor(team);
     }
+  }
 
+  template <class TagType>
+  inline typename std::enable_if<!std::is_same<TagType, void>::value>::type
+  execute_impl() const {
+    OpenMPTargetExec::verify_is_process(
+        "Kokkos::Experimental::OpenMPTarget parallel_for");
+    OpenMPTargetExec::verify_initialized(
+        "Kokkos::Experimental::OpenMPTarget parallel_for");
+    const int league_size   = m_policy.league_size();
+    const int team_size     = m_policy.team_size();
+    const int vector_length = m_policy.vector_length();
+    const int nteams        = OpenMPTargetExec::MAX_ACTIVE_TEAMS < league_size
+                           ? OpenMPTargetExec::MAX_ACTIVE_TEAMS
+                           : league_size;
 
-  template< class TagType >
-  inline
-  typename std::enable_if< ! std::is_same< TagType , void >::value >::type
-  execute_impl() const
-    {
-      OpenMPTargetExec::verify_is_process("Kokkos::Experimental::OpenMPTarget parallel_for");
-      OpenMPTargetExec::verify_initialized("Kokkos::Experimental::OpenMPTarget parallel_for");
-      const int league_size = m_policy.league_size();
-      const int team_size = m_policy.team_size();
-      const int vector_length = m_policy.vector_length();
-      const int nteams = OpenMPTargetExec::MAX_ACTIVE_TEAMS<league_size?OpenMPTargetExec::MAX_ACTIVE_TEAMS:league_size;
-
-      OpenMPTargetExec::resize_scratch(0,Policy::member_type::TEAM_REDUCE_SIZE,0,0);
-      void* scratch_ptr = OpenMPTargetExec::get_scratch_ptr();
-      #pragma omp target teams distribute parallel for num_teams(league_size) num_threads(team_size*vector_length) schedule(static,1) \
-         map(to:this->m_functor,scratch_ptr)
-      for(int i=0 ; i<league_size ; i++) {
-        typename Policy::member_type team(i/(team_size*vector_length),league_size,team_size,vector_length, scratch_ptr, 0,0);
-        m_functor(TagType(), team);
-      }
+    OpenMPTargetExec::resize_scratch(0, Policy::member_type::TEAM_REDUCE_SIZE,
+                                     0, 0);
+    void* scratch_ptr = OpenMPTargetExec::get_scratch_ptr();
+#pragma omp target teams distribute parallel for num_teams(league_size) \
+    num_threads(team_size* vector_length) schedule(static, 1)           \
+        map(to                                                          \
+            : this->m_functor, scratch_ptr)
+    for (int i = 0; i < league_size; i++) {
+      typename Policy::member_type team(i / (team_size * vector_length),
+                                        league_size, team_size, vector_length,
+                                        scratch_ptr, 0, 0);
+      m_functor(TagType(), team);
     }
+  }
 
-public:
-
-  inline
-  ParallelFor( const FunctorType & arg_functor ,
-               const Policy      & arg_policy )
-    : m_functor( arg_functor )
-    , m_policy(  arg_policy )
-    , m_shmem_size( arg_policy.scratch_size(0) + arg_policy.scratch_size(1) + FunctorTeamShmemSize< FunctorType >::value( arg_functor , arg_policy.team_size() ) )
-    {}
+ public:
+  inline ParallelFor(const FunctorType& arg_functor, const Policy& arg_policy)
+      : m_functor(arg_functor),
+        m_policy(arg_policy),
+        m_shmem_size(arg_policy.scratch_size(0) + arg_policy.scratch_size(1) +
+                     FunctorTeamShmemSize<FunctorType>::value(
+                         arg_functor, arg_policy.team_size())) {}
 };
 
-template<class FunctorType, class ReducerType, class PointerType, class ValueType, class ... PolicyArgs>
-struct ParallelReduceSpecialize<FunctorType, TeamPolicyInternal<PolicyArgs...>, ReducerType, PointerType, ValueType, 0,0> {
+template <class FunctorType, class ReducerType, class PointerType,
+          class ValueType, class... PolicyArgs>
+struct ParallelReduceSpecialize<FunctorType, TeamPolicyInternal<PolicyArgs...>,
+                                ReducerType, PointerType, ValueType, 0, 0> {
   typedef TeamPolicyInternal<PolicyArgs...> PolicyType;
 
-  template< class TagType >
+  template <class TagType>
   inline static
-  typename std::enable_if< std::is_same< TagType , void >::value >::type
-  execute_impl(const FunctorType& f, const PolicyType& p, PointerType result_ptr)
-    {
-      OpenMPTargetExec::verify_is_process("Kokkos::Experimental::OpenMPTarget parallel_for");
-      OpenMPTargetExec::verify_initialized("Kokkos::Experimental::OpenMPTarget parallel_for");
-      
-      const int league_size = p.league_size();
-      const int team_size = p.team_size();
-      const int vector_length = p.vector_length();
-      const int nteams = OpenMPTargetExec::MAX_ACTIVE_TEAMS<league_size?OpenMPTargetExec::MAX_ACTIVE_TEAMS:league_size;
-      
-      OpenMPTargetExec::resize_scratch(0,PolicyType::member_type::TEAM_REDUCE_SIZE,0,0);
-      void* scratch_ptr = OpenMPTargetExec::get_scratch_ptr(); 
+      typename std::enable_if<std::is_same<TagType, void>::value>::type
+      execute_impl(const FunctorType& f, const PolicyType& p,
+                   PointerType result_ptr) {
+    OpenMPTargetExec::verify_is_process(
+        "Kokkos::Experimental::OpenMPTarget parallel_for");
+    OpenMPTargetExec::verify_initialized(
+        "Kokkos::Experimental::OpenMPTarget parallel_for");
 
-      ValueType result = ValueType();
-      #pragma omp target teams distribute parallel for num_teams(nteams) num_threads(team_size*vector_length) \
+    const int league_size   = p.league_size();
+    const int team_size     = p.team_size();
+    const int vector_length = p.vector_length();
+    const int nteams        = OpenMPTargetExec::MAX_ACTIVE_TEAMS < league_size
+                           ? OpenMPTargetExec::MAX_ACTIVE_TEAMS
+                           : league_size;
+
+    OpenMPTargetExec::resize_scratch(
+        0, PolicyType::member_type::TEAM_REDUCE_SIZE, 0, 0);
+    void* scratch_ptr = OpenMPTargetExec::get_scratch_ptr();
+
+    ValueType result = ValueType();
+#pragma omp target teams distribute parallel for num_teams(nteams) num_threads(team_size*vector_length) \
          map(to:f,scratch_ptr) map(tofrom:result) reduction(+: result) schedule(static,1)
-      for(int i=0 ; i<league_size*team_size*vector_length ; i++) {
-        typename PolicyType::member_type team(i/(team_size*vector_length),league_size,team_size,vector_length, scratch_ptr, 0,0);
-        f(team,result);
-        if(team.m_vector_lane!=0) result = 0;
-      }
-
-      *result_ptr=result;
+    for (int i = 0; i < league_size * team_size * vector_length; i++) {
+      typename PolicyType::member_type team(i / (team_size * vector_length),
+                                            league_size, team_size,
+                                            vector_length, scratch_ptr, 0, 0);
+      f(team, result);
+      if (team.m_vector_lane != 0) result = 0;
     }
 
+    *result_ptr = result;
+  }
 
-  template< class TagType >
+  template <class TagType>
   inline static
-  typename std::enable_if< ! std::is_same< TagType , void >::value >::type
-  execute_impl(const FunctorType& f, const PolicyType& p, PointerType result_ptr)
-    {
-      OpenMPTargetExec::verify_is_process("Kokkos::Experimental::OpenMPTarget parallel_for");
-      OpenMPTargetExec::verify_initialized("Kokkos::Experimental::OpenMPTarget parallel_for");
+      typename std::enable_if<!std::is_same<TagType, void>::value>::type
+      execute_impl(const FunctorType& f, const PolicyType& p,
+                   PointerType result_ptr) {
+    OpenMPTargetExec::verify_is_process(
+        "Kokkos::Experimental::OpenMPTarget parallel_for");
+    OpenMPTargetExec::verify_initialized(
+        "Kokkos::Experimental::OpenMPTarget parallel_for");
 
-      const int league_size = p.league_size();
-      const int team_size = p.team_size();
-      const int vector_length = p.vector_length();
-      const int nteams = OpenMPTargetExec::MAX_ACTIVE_TEAMS<league_size?OpenMPTargetExec::MAX_ACTIVE_TEAMS:league_size;
+    const int league_size   = p.league_size();
+    const int team_size     = p.team_size();
+    const int vector_length = p.vector_length();
+    const int nteams        = OpenMPTargetExec::MAX_ACTIVE_TEAMS < league_size
+                           ? OpenMPTargetExec::MAX_ACTIVE_TEAMS
+                           : league_size;
 
-      OpenMPTargetExec::resize_scratch(0,PolicyType::member_type::TEAM_REDUCE_SIZE,0,0);
-      void* scratch_ptr = OpenMPTargetExec::get_scratch_ptr();
+    OpenMPTargetExec::resize_scratch(
+        0, PolicyType::member_type::TEAM_REDUCE_SIZE, 0, 0);
+    void* scratch_ptr = OpenMPTargetExec::get_scratch_ptr();
 
-      ValueType result = ValueType();
-      #pragma omp target teams distribute parallel for num_teams(nteams) num_threads(team_size*vector_length) \
+    ValueType result = ValueType();
+#pragma omp target teams distribute parallel for num_teams(nteams) num_threads(team_size*vector_length) \
          map(to:f,scratch_ptr) map(tofrom:result) reduction(+: result) schedule(static,1)
-      for(int i=0 ; i<league_size*team_size*vector_length ; i++) {
-        typename PolicyType::member_type team(i/(team_size*vector_length),league_size,team_size,vector_length, scratch_ptr, 0,0);
-        f(TagType(),team,result);
-        if(team.vector_lane!=0) result = 0;
-      }
-      *result_ptr=result;
+    for (int i = 0; i < league_size * team_size * vector_length; i++) {
+      typename PolicyType::member_type team(i / (team_size * vector_length),
+                                            league_size, team_size,
+                                            vector_length, scratch_ptr, 0, 0);
+      f(TagType(), team, result);
+      if (team.vector_lane != 0) result = 0;
     }
+    *result_ptr = result;
+  }
 
-
-    inline static
-    void execute(const FunctorType& f, const PolicyType& p, PointerType ptr) {
-      execute_impl<typename PolicyType::work_tag>(f,p,ptr);
-    }
+  inline static void execute(const FunctorType& f, const PolicyType& p,
+                             PointerType ptr) {
+    execute_impl<typename PolicyType::work_tag>(f, p, ptr);
+  }
 };
 
+template <class FunctorType, class ReducerType, class... Properties>
+class ParallelReduce<FunctorType, Kokkos::TeamPolicy<Properties...>,
+                     ReducerType, Kokkos::Experimental::OpenMPTarget> {
+ private:
+  typedef Kokkos::Impl::TeamPolicyInternal<Kokkos::Experimental::OpenMPTarget,
+                                           Properties...>
+      Policy;
 
-template< class FunctorType , class ReducerType, class ... Properties >
-class ParallelReduce< FunctorType
-                    , Kokkos::TeamPolicy< Properties ... >
-                    , ReducerType
-                    , Kokkos::Experimental::OpenMPTarget
-                    >
-{
-private:
+  typedef typename Policy::work_tag WorkTag;
+  typedef typename Policy::member_type Member;
 
-  typedef Kokkos::Impl::TeamPolicyInternal< Kokkos::Experimental::OpenMPTarget, Properties ... >         Policy ;
-
-  typedef typename Policy::work_tag     WorkTag ;
-  typedef typename Policy::member_type  Member ;
-
-  typedef Kokkos::Impl::if_c< std::is_same<InvalidType,ReducerType>::value, FunctorType, ReducerType> ReducerConditional;
+  typedef Kokkos::Impl::if_c<std::is_same<InvalidType, ReducerType>::value,
+                             FunctorType, ReducerType>
+      ReducerConditional;
   typedef typename ReducerConditional::type ReducerTypeFwd;
-  typedef typename Kokkos::Impl::if_c< std::is_same<InvalidType,ReducerType>::value, WorkTag, void>::type WorkTagFwd;
+  typedef
+      typename Kokkos::Impl::if_c<std::is_same<InvalidType, ReducerType>::value,
+                                  WorkTag, void>::type WorkTagFwd;
 
-  typedef Kokkos::Impl::FunctorValueTraits< ReducerTypeFwd , WorkTagFwd >  ValueTraits ;
-  typedef Kokkos::Impl::FunctorValueInit<   ReducerTypeFwd , WorkTagFwd >  ValueInit ;
-  typedef Kokkos::Impl::FunctorValueJoin<   ReducerTypeFwd , WorkTagFwd >  ValueJoin ;
+  typedef Kokkos::Impl::FunctorValueTraits<ReducerTypeFwd, WorkTagFwd>
+      ValueTraits;
+  typedef Kokkos::Impl::FunctorValueInit<ReducerTypeFwd, WorkTagFwd> ValueInit;
+  typedef Kokkos::Impl::FunctorValueJoin<ReducerTypeFwd, WorkTagFwd> ValueJoin;
 
-  typedef typename ValueTraits::pointer_type    pointer_type ;
-  typedef typename ValueTraits::reference_type  reference_type ;
-  typedef typename ValueTraits::value_type      value_type ;
+  typedef typename ValueTraits::pointer_type pointer_type;
+  typedef typename ValueTraits::reference_type reference_type;
+  typedef typename ValueTraits::value_type value_type;
 
-  enum {HasJoin = ReduceFunctorHasJoin<FunctorType>::value };
-  enum {UseReducer = is_reducer_type<ReducerType>::value };
+  enum { HasJoin = ReduceFunctorHasJoin<FunctorType>::value };
+  enum { UseReducer = is_reducer_type<ReducerType>::value };
 
-  typedef ParallelReduceSpecialize<FunctorType,Policy,ReducerType,pointer_type,typename ValueTraits::value_type,HasJoin,UseReducer> ParForSpecialize;
+  typedef ParallelReduceSpecialize<
+      FunctorType, Policy, ReducerType, pointer_type,
+      typename ValueTraits::value_type, HasJoin, UseReducer>
+      ParForSpecialize;
 
-  const FunctorType  m_functor ;
-  const Policy       m_policy ;
-  const ReducerType  m_reducer ;
-  const pointer_type m_result_ptr ;
-  const int          m_shmem_size ;
+  const FunctorType m_functor;
+  const Policy m_policy;
+  const ReducerType m_reducer;
+  const pointer_type m_result_ptr;
+  const int m_shmem_size;
 
-public:
-
-  inline
-  void execute() const {
-    ParForSpecialize::execute(m_functor,m_policy,m_result_ptr);   
+ public:
+  inline void execute() const {
+    ParForSpecialize::execute(m_functor, m_policy, m_result_ptr);
   }
 
-  template< class ViewType >
-  inline
-  ParallelReduce( const FunctorType  & arg_functor ,
-                  const Policy       & arg_policy ,
-                  const ViewType     & arg_result ,
-                  typename std::enable_if<
-                    Kokkos::is_view< ViewType >::value &&
-                    !Kokkos::is_reducer_type<ReducerType>::value
-                    ,void*>::type = NULL)
-    : m_functor( arg_functor )
-    , m_policy(  arg_policy )
-    , m_reducer( InvalidType() )
-    , m_result_ptr( arg_result.ptr_on_device() )
-    , m_shmem_size( arg_policy.scratch_size(0) + arg_policy.scratch_size(1) + FunctorTeamShmemSize< FunctorType >::value( arg_functor , arg_policy.team_size() ) )
-    {}
+  template <class ViewType>
+  inline ParallelReduce(
+      const FunctorType& arg_functor, const Policy& arg_policy,
+      const ViewType& arg_result,
+      typename std::enable_if<Kokkos::is_view<ViewType>::value &&
+                                  !Kokkos::is_reducer_type<ReducerType>::value,
+                              void*>::type = NULL)
+      : m_functor(arg_functor),
+        m_policy(arg_policy),
+        m_reducer(InvalidType()),
+        m_result_ptr(arg_result.ptr_on_device()),
+        m_shmem_size(arg_policy.scratch_size(0) + arg_policy.scratch_size(1) +
+                     FunctorTeamShmemSize<FunctorType>::value(
+                         arg_functor, arg_policy.team_size())) {}
 
-  inline
-  ParallelReduce( const FunctorType & arg_functor
-    , Policy       arg_policy
-    , const ReducerType& reducer )
-  : m_functor( arg_functor )
-  , m_policy(  arg_policy )
-  , m_reducer( reducer )
-  , m_result_ptr(  reducer.result_view().data() )
-  , m_shmem_size( arg_policy.scratch_size(0) + arg_policy.scratch_size(1) + FunctorTeamShmemSize< FunctorType >::value( arg_functor , arg_policy.team_size() ) )
-  {
-  /*static_assert( std::is_same< typename ViewType::memory_space
-                          , Kokkos::HostSpace >::value
-  , "Reduction result on Kokkos::Experimental::OpenMPTarget must be a Kokkos::View in HostSpace" );*/
+  inline ParallelReduce(const FunctorType& arg_functor, Policy arg_policy,
+                        const ReducerType& reducer)
+      : m_functor(arg_functor),
+        m_policy(arg_policy),
+        m_reducer(reducer),
+        m_result_ptr(reducer.result_view().data()),
+        m_shmem_size(arg_policy.scratch_size(0) + arg_policy.scratch_size(1) +
+                     FunctorTeamShmemSize<FunctorType>::value(
+                         arg_functor, arg_policy.team_size())) {
+    /*static_assert( std::is_same< typename ViewType::memory_space
+                            , Kokkos::HostSpace >::value
+    , "Reduction result on Kokkos::Experimental::OpenMPTarget must be a
+    Kokkos::View in HostSpace" );*/
   }
-
 };
 
-} // namespace Impl
-} // namespace Kokkos
-
+}  // namespace Impl
+}  // namespace Kokkos
 
 namespace Kokkos {
 namespace Impl {
 
-  template<typename iType>
-  struct TeamThreadRangeBoundariesStruct<iType,OpenMPTargetExecTeamMember> {
-    typedef iType index_type;
-    const iType start;
-    const iType end;
-    const iType increment;
+template <typename iType>
+struct TeamThreadRangeBoundariesStruct<iType, OpenMPTargetExecTeamMember> {
+  typedef iType index_type;
+  const iType start;
+  const iType end;
+  const iType increment;
 
-    inline
-    TeamThreadRangeBoundariesStruct (const OpenMPTargetExecTeamMember& thread_, iType count):
-      start( thread_.team_rank() ),
-      end( count ),
-      increment( thread_.team_size() )
-    {}
-    inline
-    TeamThreadRangeBoundariesStruct (const OpenMPTargetExecTeamMember& thread_, iType begin_, iType end_):
-      start( begin_+thread_.team_rank() ),
-      end( end_ ),
-      increment( thread_.team_size() )
-    {}
-  };
+  inline TeamThreadRangeBoundariesStruct(
+      const OpenMPTargetExecTeamMember& thread_, iType count)
+      : start(thread_.team_rank()),
+        end(count),
+        increment(thread_.team_size()) {}
+  inline TeamThreadRangeBoundariesStruct(
+      const OpenMPTargetExecTeamMember& thread_, iType begin_, iType end_)
+      : start(begin_ + thread_.team_rank()),
+        end(end_),
+        increment(thread_.team_size()) {}
+};
 
-  template<typename iType>
-  struct ThreadVectorRangeBoundariesStruct<iType,OpenMPTargetExecTeamMember> {
-    typedef iType index_type;
-    const index_type start;
-    const index_type end;
-    const index_type increment;
+template <typename iType>
+struct ThreadVectorRangeBoundariesStruct<iType, OpenMPTargetExecTeamMember> {
+  typedef iType index_type;
+  const index_type start;
+  const index_type end;
+  const index_type increment;
 
-    inline
-    ThreadVectorRangeBoundariesStruct (const OpenMPTargetExecTeamMember& thread_, index_type count):
-      start( thread_.m_vector_lane ),
-      end( count ),
-      increment( thread_.m_vector_length )
-    {}
-    inline
-    ThreadVectorRangeBoundariesStruct (const OpenMPTargetExecTeamMember& thread_, index_type begin_, index_type end_):
-      start( begin_+thread_.m_vector_lane ),
-      end( end_ ),
-      increment( thread_.m_vector_length )
-    {}
-  };
-
-  template<typename iType>
-  KOKKOS_INLINE_FUNCTION
-  Impl::TeamThreadRangeBoundariesStruct<iType,Impl::OpenMPTargetExecTeamMember>
-    TeamThreadRange(const Impl::OpenMPTargetExecTeamMember& thread, iType count) {
-    return Impl::TeamThreadRangeBoundariesStruct<iType,Impl::OpenMPTargetExecTeamMember>(thread,count);
-  }
-  
-  template<typename iType>
-  KOKKOS_INLINE_FUNCTION
-  Impl::TeamThreadRangeBoundariesStruct<iType,Impl::OpenMPTargetExecTeamMember>
-    TeamThreadRange(const Impl::OpenMPTargetExecTeamMember& thread, iType begin, iType end) {
-    return Impl::TeamThreadRangeBoundariesStruct<iType,Impl::OpenMPTargetExecTeamMember>(thread,begin,end);
-  }
-
-  template<typename iType>
-  KOKKOS_INLINE_FUNCTION
-  Impl::ThreadVectorRangeBoundariesStruct<iType,Impl::OpenMPTargetExecTeamMember >
-    ThreadVectorRange(const Impl::OpenMPTargetExecTeamMember& thread, iType count) {
-    return Impl::ThreadVectorRangeBoundariesStruct<iType,Impl::OpenMPTargetExecTeamMember >(thread,count);
-  }
-
-  template<typename iType>
-  KOKKOS_INLINE_FUNCTION
-  Impl::ThreadVectorRangeBoundariesStruct<iType,Impl::OpenMPTargetExecTeamMember>
-    ThreadVectorRange(const Impl::OpenMPTargetExecTeamMember& thread, iType begin, iType end) {
-    return Impl::ThreadVectorRangeBoundariesStruct<iType,Impl::OpenMPTargetExecTeamMember>(thread,begin,end);
-  }
+  inline ThreadVectorRangeBoundariesStruct(
+      const OpenMPTargetExecTeamMember& thread_, index_type count)
+      : start(thread_.m_vector_lane),
+        end(count),
+        increment(thread_.m_vector_length) {}
+  inline ThreadVectorRangeBoundariesStruct(
+      const OpenMPTargetExecTeamMember& thread_, index_type begin_,
+      index_type end_)
+      : start(begin_ + thread_.m_vector_lane),
+        end(end_),
+        increment(thread_.m_vector_length) {}
+};
 
+template <typename iType>
+KOKKOS_INLINE_FUNCTION Impl::TeamThreadRangeBoundariesStruct<
+    iType, Impl::OpenMPTargetExecTeamMember>
+TeamThreadRange(const Impl::OpenMPTargetExecTeamMember& thread, iType count) {
+  return Impl::TeamThreadRangeBoundariesStruct<
+      iType, Impl::OpenMPTargetExecTeamMember>(thread, count);
 }
 
+template <typename iType>
+KOKKOS_INLINE_FUNCTION Impl::TeamThreadRangeBoundariesStruct<
+    iType, Impl::OpenMPTargetExecTeamMember>
+TeamThreadRange(const Impl::OpenMPTargetExecTeamMember& thread, iType begin,
+                iType end) {
+  return Impl::TeamThreadRangeBoundariesStruct<
+      iType, Impl::OpenMPTargetExecTeamMember>(thread, begin, end);
 }
+
+template <typename iType>
+KOKKOS_INLINE_FUNCTION Impl::ThreadVectorRangeBoundariesStruct<
+    iType, Impl::OpenMPTargetExecTeamMember>
+ThreadVectorRange(const Impl::OpenMPTargetExecTeamMember& thread, iType count) {
+  return Impl::ThreadVectorRangeBoundariesStruct<
+      iType, Impl::OpenMPTargetExecTeamMember>(thread, count);
+}
+
+template <typename iType>
+KOKKOS_INLINE_FUNCTION Impl::ThreadVectorRangeBoundariesStruct<
+    iType, Impl::OpenMPTargetExecTeamMember>
+ThreadVectorRange(const Impl::OpenMPTargetExecTeamMember& thread, iType begin,
+                  iType end) {
+  return Impl::ThreadVectorRangeBoundariesStruct<
+      iType, Impl::OpenMPTargetExecTeamMember>(thread, begin, end);
+}
+
+}  // namespace Impl
+
+}  // namespace Kokkos
 //----------------------------------------------------------------------------
 //----------------------------------------------------------------------------
 
 #endif /* KOKKOS_OPENMPTARGET_PARALLEL_HPP */
-
diff --git a/lib/kokkos/core/src/OpenMPTarget/Kokkos_OpenMPTarget_Task.cpp b/lib/kokkos/core/src/OpenMPTarget/Kokkos_OpenMPTarget_Task.cpp
index dfd45486ef..be924ffa61 100644
--- a/lib/kokkos/core/src/OpenMPTarget/Kokkos_OpenMPTarget_Task.cpp
+++ b/lib/kokkos/core/src/OpenMPTarget/Kokkos_OpenMPTarget_Task.cpp
@@ -1,13 +1,14 @@
 /*
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -36,14 +37,14 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 */
 
 #include <Kokkos_Core.hpp>
 
-#if defined( KOKKOS_ENABLE_OPENMPTARGET ) && defined( KOKKOS_ENABLE_TASKPOLICY )
+#if defined(KOKKOS_ENABLE_OPENMPTARGET) && defined(KOKKOS_ENABLE_TASKPOLICY)
 
 #include <impl/Kokkos_TaskQueue_impl.hpp>
 
@@ -53,56 +54,51 @@
 namespace Kokkos {
 namespace Impl {
 
-template class TaskQueue< Kokkos::Experimental::OpenMPTarget > ;
+template class TaskQueue<Kokkos::Experimental::OpenMPTarget>;
 
 //----------------------------------------------------------------------------
 
-TaskExec< Kokkos::Experimental::OpenMPTarget >::
-TaskExec()
-  : m_self_exec( 0 )
-  , m_team_exec( 0 )
-  , m_sync_mask( 0 )
-  , m_sync_value( 0 )
-  , m_sync_step( 0 )
-  , m_group_rank( 0 )
-  , m_team_rank( 0 )
-  , m_team_size( 1 )
-{
-}
+TaskExec<Kokkos::Experimental::OpenMPTarget>::TaskExec()
+    : m_self_exec(0),
+      m_team_exec(0),
+      m_sync_mask(0),
+      m_sync_value(0),
+      m_sync_step(0),
+      m_group_rank(0),
+      m_team_rank(0),
+      m_team_size(1) {}
 
-TaskExec< Kokkos::Experimental::OpenMPTarget >::
-TaskExec( Kokkos::Impl::OpenMPTargetExec & arg_exec , int const arg_team_size )
-  : m_self_exec( & arg_exec )
-  , m_team_exec( arg_exec.pool_rev(arg_exec.pool_rank_rev() / arg_team_size) )
-  , m_sync_mask( 0 )
-  , m_sync_value( 0 )
-  , m_sync_step( 0 )
-  , m_group_rank( arg_exec.pool_rank_rev() / arg_team_size )
-  , m_team_rank(  arg_exec.pool_rank_rev() % arg_team_size )
-  , m_team_size(  arg_team_size )
-{
+TaskExec<Kokkos::Experimental::OpenMPTarget>::TaskExec(
+    Kokkos::Impl::OpenMPTargetExec &arg_exec, int const arg_team_size)
+    : m_self_exec(&arg_exec),
+      m_team_exec(arg_exec.pool_rev(arg_exec.pool_rank_rev() / arg_team_size)),
+      m_sync_mask(0),
+      m_sync_value(0),
+      m_sync_step(0),
+      m_group_rank(arg_exec.pool_rank_rev() / arg_team_size),
+      m_team_rank(arg_exec.pool_rank_rev() % arg_team_size),
+      m_team_size(arg_team_size) {
   // This team spans
   //    m_self_exec->pool_rev( team_size * group_rank )
   //    m_self_exec->pool_rev( team_size * ( group_rank + 1 ) - 1 )
 
-  int64_t volatile * const sync = (int64_t *) m_self_exec->scratch_reduce();
+  int64_t volatile *const sync = (int64_t *)m_self_exec->scratch_reduce();
 
-  sync[0] = int64_t(0) ;
-  sync[1] = int64_t(0) ;
+  sync[0] = int64_t(0);
+  sync[1] = int64_t(0);
 
-  for ( int i = 0 ; i < m_team_size ; ++i ) {
-    m_sync_value |= int64_t(1) << (8*i);
-    m_sync_mask  |= int64_t(3) << (8*i);
+  for (int i = 0; i < m_team_size; ++i) {
+    m_sync_value |= int64_t(1) << (8 * i);
+    m_sync_mask |= int64_t(3) << (8 * i);
   }
 
   Kokkos::memory_fence();
 }
 
-#if defined( KOKKOS_ACTIVE_EXECUTION_MEMORY_SPACE_HOST )
+#if defined(KOKKOS_ACTIVE_EXECUTION_MEMORY_SPACE_HOST)
 
-void TaskExec< Kokkos::Experimental::OpenMPTarget >::team_barrier_impl() const
-{
-  if ( m_team_exec->scratch_reduce_size() < int(2 * sizeof(int64_t)) ) {
+void TaskExec<Kokkos::Experimental::OpenMPTarget>::team_barrier_impl() const {
+  if (m_team_exec->scratch_reduce_size() < int(2 * sizeof(int64_t))) {
     Kokkos::abort("TaskQueue<OpenMPTarget> scratch_reduce memory too small");
   }
 
@@ -110,12 +106,11 @@ void TaskExec< Kokkos::Experimental::OpenMPTarget >::team_barrier_impl() const
   // Alternate memory locations between barriers to avoid a sequence
   // of barriers overtaking one another.
 
-  int64_t volatile * const sync =
-    ((int64_t *) m_team_exec->scratch_reduce()) + ( m_sync_step & 0x01 );
+  int64_t volatile *const sync =
+      ((int64_t *)m_team_exec->scratch_reduce()) + (m_sync_step & 0x01);
 
   // This team member sets one byte within the sync variable
-  int8_t volatile * const sync_self =
-   ((int8_t *) sync) + m_team_rank ;
+  int8_t volatile *const sync_self = ((int8_t *)sync) + m_team_rank;
 
 #if 0
 fprintf( stdout
@@ -129,9 +124,10 @@ fprintf( stdout
 fflush(stdout);
 #endif
 
-  *sync_self = int8_t( m_sync_value & 0x03 ); // signal arrival
+  *sync_self = int8_t(m_sync_value & 0x03);  // signal arrival
 
-  while ( m_sync_value != *sync ); // wait for team to arrive
+  while (m_sync_value != *sync)
+    ;  // wait for team to arrive
 
 #if 0
 fprintf( stdout
@@ -145,11 +141,11 @@ fprintf( stdout
 fflush(stdout);
 #endif
 
-  ++m_sync_step ;
+  ++m_sync_step;
 
-  if ( 0 == ( 0x01 & m_sync_step ) ) { // Every other step
-    m_sync_value ^= m_sync_mask ;
-    if ( 1000 < m_sync_step ) m_sync_step = 0 ;
+  if (0 == (0x01 & m_sync_step)) {  // Every other step
+    m_sync_value ^= m_sync_mask;
+    if (1000 < m_sync_step) m_sync_step = 0;
   }
 }
 
@@ -157,36 +153,35 @@ fflush(stdout);
 
 //----------------------------------------------------------------------------
 
-void TaskQueueSpecialization< Kokkos::Experimental::OpenMPTarget >::execute
-  ( TaskQueue< Kokkos::Experimental::OpenMPTarget > * const queue )
-{
-  using execution_space = Kokkos::Experimental::OpenMPTarget ;
-  using queue_type      = TaskQueue< execution_space > ;
-  using task_root_type  = TaskBase< execution_space , void , void > ;
-  using PoolExec        = Kokkos::Impl::OpenMPTargetExec ;
-  using Member          = TaskExec< execution_space > ;
+void TaskQueueSpecialization<Kokkos::Experimental::OpenMPTarget>::execute(
+    TaskQueue<Kokkos::Experimental::OpenMPTarget> *const queue) {
+  using execution_space = Kokkos::Experimental::OpenMPTarget;
+  using queue_type      = TaskQueue<execution_space>;
+  using task_root_type  = TaskBase<execution_space, void, void>;
+  using PoolExec        = Kokkos::Impl::OpenMPTargetExec;
+  using Member          = TaskExec<execution_space>;
 
-  task_root_type * const end = (task_root_type *) task_root_type::EndTag ;
+  task_root_type *const end = (task_root_type *)task_root_type::EndTag;
 
   // Required:  team_size <= 8
 
-  const int team_size = PoolExec::pool_size(2); // Threads per core
+  const int team_size = PoolExec::pool_size(2);  // Threads per core
   // const int team_size = PoolExec::pool_size(1); // Threads per NUMA
 
-  if ( 8 < team_size ) {
+  if (8 < team_size) {
     Kokkos::abort("TaskQueue<OpenMPTarget> unsupported team size");
   }
 
 #pragma omp parallel
   {
-    PoolExec & self = *PoolExec::get_thread_omp();
+    PoolExec &self = *PoolExec::get_thread_omp();
 
-    Member single_exec ;
-    Member team_exec( self , team_size );
+    Member single_exec;
+    Member team_exec(self, team_size);
 
     // Team shared memory
-    task_root_type * volatile * const task_shared =
-      (task_root_type **) team_exec.m_team_exec->scratch_thread();
+    task_root_type *volatile *const task_shared =
+        (task_root_type **)team_exec.m_team_exec->scratch_thread();
 
 // Barrier across entire OpenMPTarget thread pool to insure initialization
 #pragma omp barrier
@@ -194,29 +189,26 @@ void TaskQueueSpecialization< Kokkos::Experimental::OpenMPTarget >::execute
     // Loop until all queues are empty and no tasks in flight
 
     do {
-
-      task_root_type * task = 0 ;
+      task_root_type *task = 0;
 
       // Each team lead attempts to acquire either a thread team task
       // or a single thread task for the team.
 
-      if ( 0 == team_exec.team_rank() ) {
-
-        task = 0 < *((volatile int *) & queue->m_ready_count) ? end : 0 ;
+      if (0 == team_exec.team_rank()) {
+        task = 0 < *((volatile int *)&queue->m_ready_count) ? end : 0;
 
         // Loop by priority and then type
-        for ( int i = 0 ; i < queue_type::NumQueue && end == task ; ++i ) {
-          for ( int j = 0 ; j < 2 && end == task ; ++j ) {
-            task = queue_type::pop_task( & queue->m_ready[i][j] );
+        for (int i = 0; i < queue_type::NumQueue && end == task; ++i) {
+          for (int j = 0; j < 2 && end == task; ++j) {
+            task = queue_type::pop_task(&queue->m_ready[i][j]);
           }
         }
       }
 
       // Team lead broadcast acquired task to team members:
 
-      if ( 1 < team_exec.team_size() ) {
-
-        if ( 0 == team_exec.team_rank() ) *task_shared = task ;
+      if (1 < team_exec.team_size()) {
+        if (0 == team_exec.team_rank()) *task_shared = task;
 
         // Fence to be sure task_shared is stored before the barrier
         Kokkos::memory_fence();
@@ -227,7 +219,7 @@ void TaskQueueSpecialization< Kokkos::Experimental::OpenMPTarget >::execute
         // Fence to be sure task_shared is stored
         Kokkos::memory_fence();
 
-        task = *task_shared ;
+        task = *task_shared;
       }
 
 #if 0
@@ -241,33 +233,30 @@ fprintf( stdout
 fflush(stdout);
 #endif
 
-      if ( 0 == task ) break ; // 0 == m_ready_count
+      if (0 == task) break;  // 0 == m_ready_count
 
-      if ( end == task ) {
+      if (end == task) {
         // All team members wait for whole team to reach this statement.
         // Is necessary to prevent task_shared from being updated
         // before it is read by all threads.
         team_exec.team_barrier();
-      }
-      else if ( task_root_type::TaskTeam == task->m_task_type ) {
+      } else if (task_root_type::TaskTeam == task->m_task_type) {
         // Thread Team Task
-        (*task->m_apply)( task , & team_exec );
+        (*task->m_apply)(task, &team_exec);
 
         // The m_apply function performs a barrier
 
-        if ( 0 == team_exec.team_rank() ) {
+        if (0 == team_exec.team_rank()) {
           // team member #0 completes the task, which may delete the task
-          queue->complete( task ); 
+          queue->complete(task);
         }
-      }
-      else {
+      } else {
         // Single Thread Task
 
-        if ( 0 == team_exec.team_rank() ) {
+        if (0 == team_exec.team_rank()) {
+          (*task->m_apply)(task, &single_exec);
 
-          (*task->m_apply)( task , & single_exec );
-
-          queue->complete( task ); 
+          queue->complete(task);
         }
 
         // All team members wait for whole team to reach this statement.
@@ -276,54 +265,50 @@ fflush(stdout);
         // before it is read by all threads.
         team_exec.team_barrier();
       }
-    } while(1);
+    } while (1);
   }
-// END #pragma omp parallel
-
+  // END #pragma omp parallel
 }
 
-void TaskQueueSpecialization< Kokkos::Experimental::OpenMPTarget >::
-  iff_single_thread_recursive_execute
-    ( TaskQueue< Kokkos::Experimental::OpenMPTarget > * const queue )
-{
-  using execution_space = Kokkos::Experimental::OpenMPTarget ;
-  using queue_type      = TaskQueue< execution_space > ;
-  using task_root_type  = TaskBase< execution_space , void , void > ;
-  using Member          = TaskExec< execution_space > ;
+void TaskQueueSpecialization<Kokkos::Experimental::OpenMPTarget>::
+    iff_single_thread_recursive_execute(
+        TaskQueue<Kokkos::Experimental::OpenMPTarget> *const queue) {
+  using execution_space = Kokkos::Experimental::OpenMPTarget;
+  using queue_type      = TaskQueue<execution_space>;
+  using task_root_type  = TaskBase<execution_space, void, void>;
+  using Member          = TaskExec<execution_space>;
 
-  if ( 1 == omp_get_num_threads() ) {
+  if (1 == omp_get_num_threads()) {
+    task_root_type *const end = (task_root_type *)task_root_type::EndTag;
 
-    task_root_type * const end = (task_root_type *) task_root_type::EndTag ;
+    Member single_exec;
 
-    Member single_exec ;
-
-    task_root_type * task = end ;
+    task_root_type *task = end;
 
     do {
-
-      task = end ;
+      task = end;
 
       // Loop by priority and then type
-      for ( int i = 0 ; i < queue_type::NumQueue && end == task ; ++i ) {
-        for ( int j = 0 ; j < 2 && end == task ; ++j ) {
-          task = queue_type::pop_task( & queue->m_ready[i][j] );
+      for (int i = 0; i < queue_type::NumQueue && end == task; ++i) {
+        for (int j = 0; j < 2 && end == task; ++j) {
+          task = queue_type::pop_task(&queue->m_ready[i][j]);
         }
       }
 
-      if ( end == task ) break ;
+      if (end == task) break;
 
-      (*task->m_apply)( task , & single_exec );
+      (*task->m_apply)(task, &single_exec);
 
-      queue->complete( task ); 
+      queue->complete(task);
 
-    } while(1);
+    } while (1);
   }
 }
 
-}} /* namespace Kokkos::Impl */
+}  // namespace Impl
+}  // namespace Kokkos
 
 //----------------------------------------------------------------------------
 
-#endif /* #if defined( KOKKOS_ENABLE_OPENMPTARGET ) && defined( KOKKOS_ENABLE_TASKPOLICY ) */
-
-
+#endif /* #if defined( KOKKOS_ENABLE_OPENMPTARGET ) && defined( \
+          KOKKOS_ENABLE_TASKPOLICY ) */
diff --git a/lib/kokkos/core/src/OpenMPTarget/Kokkos_OpenMPTarget_Task.hpp b/lib/kokkos/core/src/OpenMPTarget/Kokkos_OpenMPTarget_Task.hpp
index fe9ac4abb4..a40ec19e79 100644
--- a/lib/kokkos/core/src/OpenMPTarget/Kokkos_OpenMPTarget_Task.hpp
+++ b/lib/kokkos/core/src/OpenMPTarget/Kokkos_OpenMPTarget_Task.hpp
@@ -1,13 +1,14 @@
 /*
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -36,7 +37,7 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 */
@@ -44,7 +45,7 @@
 #ifndef KOKKOS_IMPL_OPENMP_TASK_HPP
 #define KOKKOS_IMPL_OPENMP_TASK_HPP
 
-#if defined( KOKKOS_ENABLE_TASKPOLICY )
+#if defined(KOKKOS_ENABLE_TASKPOLICY)
 
 //----------------------------------------------------------------------------
 //----------------------------------------------------------------------------
@@ -52,161 +53,156 @@
 namespace Kokkos {
 namespace Impl {
 
-template<>
-class TaskQueueSpecialization< Kokkos::Experimental::OpenMPTarget >
-{
-public:
-
-  using execution_space = Kokkos::Experimental::OpenMPTarget ;
-  using queue_type      = Kokkos::Impl::TaskQueue< execution_space > ;
-  using task_base_type  = Kokkos::Impl::TaskBase< execution_space , void , void > ;
+template <>
+class TaskQueueSpecialization<Kokkos::Experimental::OpenMPTarget> {
+ public:
+  using execution_space = Kokkos::Experimental::OpenMPTarget;
+  using queue_type      = Kokkos::Impl::TaskQueue<execution_space>;
+  using task_base_type  = Kokkos::Impl::TaskBase<execution_space, void, void>;
 
   // Must specify memory space
-  using memory_space = Kokkos::HostSpace ;
+  using memory_space = Kokkos::HostSpace;
 
-  static
-  void iff_single_thread_recursive_execute( queue_type * const );
+  static void iff_single_thread_recursive_execute(queue_type* const);
 
   // Must provide task queue execution function
-  static void execute( queue_type * const );
+  static void execute(queue_type* const);
 
   // Must provide mechanism to set function pointer in
   // execution space from the host process.
-  template< typename FunctorType >
-  static
-  void proc_set_apply( task_base_type::function_type * ptr )
-    {
-      using TaskType = TaskBase< Kokkos::Experimental::OpenMPTarget
-                               , typename FunctorType::value_type
-                               , FunctorType
-                               > ;
-       *ptr = TaskType::apply ;
-    }
+  template <typename FunctorType>
+  static void proc_set_apply(task_base_type::function_type* ptr) {
+    using TaskType = TaskBase<Kokkos::Experimental::OpenMPTarget,
+                              typename FunctorType::value_type, FunctorType>;
+    *ptr           = TaskType::apply;
+  }
 };
 
-extern template class TaskQueue< Kokkos::Experimental::OpenMPTarget > ;
+extern template class TaskQueue<Kokkos::Experimental::OpenMPTarget>;
 
 //----------------------------------------------------------------------------
 
-template<>
-class TaskExec< Kokkos::Experimental::OpenMPTarget >
-{
-private:
+template <>
+class TaskExec<Kokkos::Experimental::OpenMPTarget> {
+ private:
+  TaskExec(TaskExec&&)      = delete;
+  TaskExec(TaskExec const&) = delete;
+  TaskExec& operator=(TaskExec&&) = delete;
+  TaskExec& operator=(TaskExec const&) = delete;
 
-  TaskExec( TaskExec && ) = delete ;
-  TaskExec( TaskExec const & ) = delete ;
-  TaskExec & operator = ( TaskExec && ) = delete ;
-  TaskExec & operator = ( TaskExec const & ) = delete ;
+  using PoolExec = Kokkos::Impl::OpenMPTargetExec;
 
+  friend class Kokkos::Impl::TaskQueue<Kokkos::Experimental::OpenMPTarget>;
+  friend class Kokkos::Impl::TaskQueueSpecialization<
+      Kokkos::Experimental::OpenMPTarget>;
 
-  using PoolExec = Kokkos::Impl::OpenMPTargetExec ;
-
-  friend class Kokkos::Impl::TaskQueue< Kokkos::Experimental::OpenMPTarget > ;
-  friend class Kokkos::Impl::TaskQueueSpecialization< Kokkos::Experimental::OpenMPTarget > ;
-
-  PoolExec * const m_self_exec ;  ///< This thread's thread pool data structure 
-  PoolExec * const m_team_exec ;  ///< Team thread's thread pool data structure
-  int64_t          m_sync_mask ;
-  int64_t mutable  m_sync_value ;
-  int     mutable  m_sync_step ;
-  int              m_group_rank ; ///< Which "team" subset of thread pool
-  int              m_team_rank ;  ///< Which thread within a team
-  int              m_team_size ;
+  PoolExec* const m_self_exec;  ///< This thread's thread pool data structure
+  PoolExec* const m_team_exec;  ///< Team thread's thread pool data structure
+  int64_t m_sync_mask;
+  int64_t mutable m_sync_value;
+  int mutable m_sync_step;
+  int m_group_rank;  ///< Which "team" subset of thread pool
+  int m_team_rank;   ///< Which thread within a team
+  int m_team_size;
 
   TaskExec();
-  TaskExec( PoolExec & arg_exec , int arg_team_size );
+  TaskExec(PoolExec& arg_exec, int arg_team_size);
 
-  void team_barrier_impl() const ;
+  void team_barrier_impl() const;
 
-public:
+ public:
+#if defined(KOKKOS_ACTIVE_EXECUTION_MEMORY_SPACE_HOST)
+  void* team_shared() const {
+    return m_team_exec ? m_team_exec->scratch_thread() : (void*)0;
+  }
 
-#if defined( KOKKOS_ACTIVE_EXECUTION_MEMORY_SPACE_HOST )
-  void * team_shared() const
-    { return m_team_exec ? m_team_exec->scratch_thread() : (void*) 0 ; }
-
-  int team_shared_size() const
-    { return m_team_exec ? m_team_exec->scratch_thread_size() : 0 ; }
+  int team_shared_size() const {
+    return m_team_exec ? m_team_exec->scratch_thread_size() : 0;
+  }
 
   /**\brief  Whole team enters this function call
    *         before any teeam member returns from
    *         this function call.
    */
-  void team_barrier() const { if ( 1 < m_team_size ) team_barrier_impl(); }
+  void team_barrier() const {
+    if (1 < m_team_size) team_barrier_impl();
+  }
 #else
   KOKKOS_INLINE_FUNCTION void team_barrier() const {}
-  KOKKOS_INLINE_FUNCTION void * team_shared() const { return 0 ; }
-  KOKKOS_INLINE_FUNCTION int team_shared_size() const { return 0 ; }
+  KOKKOS_INLINE_FUNCTION void* team_shared() const { return 0; }
+  KOKKOS_INLINE_FUNCTION int team_shared_size() const { return 0; }
 #endif
 
   KOKKOS_INLINE_FUNCTION
-  int team_rank() const { return m_team_rank ; }
+  int team_rank() const { return m_team_rank; }
 
   KOKKOS_INLINE_FUNCTION
-  int team_size() const { return m_team_size ; }
+  int team_size() const { return m_team_size; }
 };
 
-}} /* namespace Kokkos::Impl */
+}  // namespace Impl
+}  // namespace Kokkos
 
 //----------------------------------------------------------------------------
 //----------------------------------------------------------------------------
 
 namespace Kokkos {
 
-template<typename iType>
-KOKKOS_INLINE_FUNCTION
-Impl::TeamThreadRangeBoundariesStruct<iType,Impl::TaskExec< Kokkos::Experimental::OpenMPTarget > >
-TeamThreadRange
-  ( Impl::TaskExec< Kokkos::Experimental::OpenMPTarget > & thread
-  , const iType & count )
-{
-  return Impl::TeamThreadRangeBoundariesStruct<iType,Impl::TaskExec< Kokkos::Experimental::OpenMPTarget > >(thread,count);
+template <typename iType>
+KOKKOS_INLINE_FUNCTION Impl::TeamThreadRangeBoundariesStruct<
+    iType, Impl::TaskExec<Kokkos::Experimental::OpenMPTarget> >
+TeamThreadRange(Impl::TaskExec<Kokkos::Experimental::OpenMPTarget>& thread,
+                const iType& count) {
+  return Impl::TeamThreadRangeBoundariesStruct<
+      iType, Impl::TaskExec<Kokkos::Experimental::OpenMPTarget> >(thread,
+                                                                  count);
 }
 
-template<typename iType>
-KOKKOS_INLINE_FUNCTION
-Impl::TeamThreadRangeBoundariesStruct<iType,Impl:: TaskExec< Kokkos::Experimental::OpenMPTarget > >
-TeamThreadRange
-  ( Impl:: TaskExec< Kokkos::Experimental::OpenMPTarget > & thread
-  , const iType & start
-  , const iType & end )
-{
-  return Impl::TeamThreadRangeBoundariesStruct<iType,Impl:: TaskExec< Kokkos::Experimental::OpenMPTarget > >(thread,start,end);
+template <typename iType>
+KOKKOS_INLINE_FUNCTION Impl::TeamThreadRangeBoundariesStruct<
+    iType, Impl::TaskExec<Kokkos::Experimental::OpenMPTarget> >
+TeamThreadRange(Impl::TaskExec<Kokkos::Experimental::OpenMPTarget>& thread,
+                const iType& start, const iType& end) {
+  return Impl::TeamThreadRangeBoundariesStruct<
+      iType, Impl::TaskExec<Kokkos::Experimental::OpenMPTarget> >(thread, start,
+                                                                  end);
 }
 
-/** \brief  Inter-thread parallel_for. Executes lambda(iType i) for each i=0..N-1.
+/** \brief  Inter-thread parallel_for. Executes lambda(iType i) for each
+ * i=0..N-1.
  *
  * The range i=0..N-1 is mapped to all threads of the the calling thread team.
  * This functionality requires C++11 support.
-*/
-template<typename iType, class Lambda>
-KOKKOS_INLINE_FUNCTION
-void parallel_for
-  ( const Impl::TeamThreadRangeBoundariesStruct<iType,Impl:: TaskExec< Kokkos::Experimental::OpenMPTarget > >& loop_boundaries
-  , const Lambda& lambda
-  )
-{
-  for( iType i = loop_boundaries.start; i < loop_boundaries.end; i+=loop_boundaries.increment) {
+ */
+template <typename iType, class Lambda>
+KOKKOS_INLINE_FUNCTION void parallel_for(
+    const Impl::TeamThreadRangeBoundariesStruct<
+        iType, Impl::TaskExec<Kokkos::Experimental::OpenMPTarget> >&
+        loop_boundaries,
+    const Lambda& lambda) {
+  for (iType i = loop_boundaries.start; i < loop_boundaries.end;
+       i += loop_boundaries.increment) {
     lambda(i);
   }
 }
 
-template<typename iType, class Lambda, typename ValueType>
-KOKKOS_INLINE_FUNCTION
-void parallel_reduce
-  ( const Impl::TeamThreadRangeBoundariesStruct<iType,Impl:: TaskExec< Kokkos::Experimental::OpenMPTarget > >& loop_boundaries
-  , const Lambda& lambda
-  , ValueType& initialized_result)
-{
-  int team_rank = loop_boundaries.thread.team_rank(); // member num within the team
+template <typename iType, class Lambda, typename ValueType>
+KOKKOS_INLINE_FUNCTION void parallel_reduce(
+    const Impl::TeamThreadRangeBoundariesStruct<
+        iType, Impl::TaskExec<Kokkos::Experimental::OpenMPTarget> >&
+        loop_boundaries,
+    const Lambda& lambda, ValueType& initialized_result) {
+  int team_rank =
+      loop_boundaries.thread.team_rank();  // member num within the team
   ValueType result = initialized_result;
 
-  for( iType i = loop_boundaries.start; i < loop_boundaries.end; i+=loop_boundaries.increment) {
+  for (iType i = loop_boundaries.start; i < loop_boundaries.end;
+       i += loop_boundaries.increment) {
     lambda(i, result);
   }
 
-  if ( 1 < loop_boundaries.thread.team_size() ) {
-
-    ValueType *shared = (ValueType*) loop_boundaries.thread.team_shared();
+  if (1 < loop_boundaries.thread.team_size()) {
+    ValueType* shared = (ValueType*)loop_boundaries.thread.team_shared();
 
     loop_boundaries.thread.team_barrier();
     shared[team_rank] = result;
@@ -224,29 +220,28 @@ void parallel_reduce
 
     // broadcast result
     initialized_result = shared[0];
-  }
-  else {
-    initialized_result = result ;
+  } else {
+    initialized_result = result;
   }
 }
 
-template< typename iType, class Lambda, typename ValueType, class JoinType >
-KOKKOS_INLINE_FUNCTION
-void parallel_reduce
-  (const Impl::TeamThreadRangeBoundariesStruct<iType,Impl::TaskExec< Kokkos::Experimental::OpenMPTarget > >& loop_boundaries,
-   const Lambda & lambda,
-   const JoinType & join,
-   ValueType& initialized_result)
-{
-  int team_rank = loop_boundaries.thread.team_rank(); // member num within the team
+template <typename iType, class Lambda, typename ValueType, class JoinType>
+KOKKOS_INLINE_FUNCTION void parallel_reduce(
+    const Impl::TeamThreadRangeBoundariesStruct<
+        iType, Impl::TaskExec<Kokkos::Experimental::OpenMPTarget> >&
+        loop_boundaries,
+    const Lambda& lambda, const JoinType& join, ValueType& initialized_result) {
+  int team_rank =
+      loop_boundaries.thread.team_rank();  // member num within the team
   ValueType result = initialized_result;
 
-  for( iType i = loop_boundaries.start; i < loop_boundaries.end; i+=loop_boundaries.increment) {
+  for (iType i = loop_boundaries.start; i < loop_boundaries.end;
+       i += loop_boundaries.increment) {
     lambda(i, result);
   }
 
-  if ( 1 < loop_boundaries.thread.team_size() ) {
-    ValueType *shared = (ValueType*) loop_boundaries.thread.team_shared();
+  if (1 < loop_boundaries.thread.team_size()) {
+    ValueType* shared = (ValueType*)loop_boundaries.thread.team_shared();
 
     loop_boundaries.thread.team_barrier();
     shared[team_rank] = result;
@@ -264,51 +259,48 @@ void parallel_reduce
 
     // broadcast result
     initialized_result = shared[0];
-  }
-  else {
-    initialized_result = result ;
+  } else {
+    initialized_result = result;
   }
 }
 
 // placeholder for future function
-template< typename iType, class Lambda, typename ValueType >
-KOKKOS_INLINE_FUNCTION
-void parallel_reduce
-  (const Impl::ThreadVectorRangeBoundariesStruct<iType,Impl::TaskExec< Kokkos::Experimental::OpenMPTarget > >& loop_boundaries,
-   const Lambda & lambda,
-   ValueType& initialized_result)
-{
-}
+template <typename iType, class Lambda, typename ValueType>
+KOKKOS_INLINE_FUNCTION void parallel_reduce(
+    const Impl::ThreadVectorRangeBoundariesStruct<
+        iType, Impl::TaskExec<Kokkos::Experimental::OpenMPTarget> >&
+        loop_boundaries,
+    const Lambda& lambda, ValueType& initialized_result) {}
 
 // placeholder for future function
-template< typename iType, class Lambda, typename ValueType, class JoinType >
-KOKKOS_INLINE_FUNCTION
-void parallel_reduce
-  (const Impl::ThreadVectorRangeBoundariesStruct<iType,Impl::TaskExec< Kokkos::Experimental::OpenMPTarget > >& loop_boundaries,
-   const Lambda & lambda,
-   const JoinType & join,
-   ValueType& initialized_result)
-{
+template <typename iType, class Lambda, typename ValueType, class JoinType>
+KOKKOS_INLINE_FUNCTION void parallel_reduce(
+    const Impl::ThreadVectorRangeBoundariesStruct<
+        iType, Impl::TaskExec<Kokkos::Experimental::OpenMPTarget> >&
+        loop_boundaries,
+    const Lambda& lambda, const JoinType& join, ValueType& initialized_result) {
 }
 
-template< typename ValueType, typename iType, class Lambda >
-KOKKOS_INLINE_FUNCTION
-void parallel_scan
-  (const Impl::TeamThreadRangeBoundariesStruct<iType,Impl::TaskExec< Kokkos::Experimental::OpenMPTarget > >& loop_boundaries,
-   const Lambda & lambda)
-{
-  ValueType accum = 0 ;
+template <typename ValueType, typename iType, class Lambda>
+KOKKOS_INLINE_FUNCTION void parallel_scan(
+    const Impl::TeamThreadRangeBoundariesStruct<
+        iType, Impl::TaskExec<Kokkos::Experimental::OpenMPTarget> >&
+        loop_boundaries,
+    const Lambda& lambda) {
+  ValueType accum = 0;
   ValueType val, local_total;
-  ValueType *shared = (ValueType*) loop_boundaries.thread.team_shared();
-  int team_size = loop_boundaries.thread.team_size();
-  int team_rank = loop_boundaries.thread.team_rank(); // member num within the team
+  ValueType* shared = (ValueType*)loop_boundaries.thread.team_shared();
+  int team_size     = loop_boundaries.thread.team_size();
+  int team_rank =
+      loop_boundaries.thread.team_rank();  // member num within the team
 
   // Intra-member scan
-  for( iType i = loop_boundaries.start; i < loop_boundaries.end; i+=loop_boundaries.increment) {
+  for (iType i = loop_boundaries.start; i < loop_boundaries.end;
+       i += loop_boundaries.increment) {
     local_total = 0;
-    lambda(i,local_total,false);
+    lambda(i, local_total, false);
     val = accum;
-    lambda(i,val,true);
+    lambda(i, val, true);
     accum += local_total;
   }
 
@@ -317,34 +309,35 @@ void parallel_scan
 
   // Member 0 do scan on accumulated totals
   if (team_rank == 0) {
-    for( iType i = 1; i < team_size; i+=1) {
-      shared[i] += shared[i-1];
+    for (iType i = 1; i < team_size; i += 1) {
+      shared[i] += shared[i - 1];
     }
-    accum = 0; // Member 0 set accum to 0 in preparation for inter-member scan
+    accum = 0;  // Member 0 set accum to 0 in preparation for inter-member scan
   }
 
   loop_boundaries.thread.team_barrier();
 
   // Inter-member scan adding in accumulated totals
-  if (team_rank != 0) { accum = shared[team_rank-1]; }
-  for( iType i = loop_boundaries.start; i < loop_boundaries.end; i+=loop_boundaries.increment) {
+  if (team_rank != 0) {
+    accum = shared[team_rank - 1];
+  }
+  for (iType i = loop_boundaries.start; i < loop_boundaries.end;
+       i += loop_boundaries.increment) {
     local_total = 0;
-    lambda(i,local_total,false);
+    lambda(i, local_total, false);
     val = accum;
-    lambda(i,val,true);
+    lambda(i, val, true);
     accum += local_total;
   }
 }
 
 // placeholder for future function
-template< typename iType, class Lambda, typename ValueType >
-KOKKOS_INLINE_FUNCTION
-void parallel_scan
-  (const Impl::ThreadVectorRangeBoundariesStruct<iType,Impl::TaskExec< Kokkos::Experimental::OpenMPTarget > >& loop_boundaries,
-   const Lambda & lambda)
-{
-}
-
+template <typename iType, class Lambda, typename ValueType>
+KOKKOS_INLINE_FUNCTION void parallel_scan(
+    const Impl::ThreadVectorRangeBoundariesStruct<
+        iType, Impl::TaskExec<Kokkos::Experimental::OpenMPTarget> >&
+        loop_boundaries,
+    const Lambda& lambda) {}
 
 } /* namespace Kokkos */
 
@@ -353,4 +346,3 @@ void parallel_scan
 
 #endif /* #if defined( KOKKOS_ENABLE_TASKPOLICY ) */
 #endif /* #ifndef KOKKOS_IMPL_OPENMP_TASK_HPP */
-
diff --git a/lib/kokkos/core/src/Qthreads/Kokkos_QthreadsExec.cpp b/lib/kokkos/core/src/Qthreads/Kokkos_QthreadsExec.cpp
index b37a4c63b9..4372f3ce80 100644
--- a/lib/kokkos/core/src/Qthreads/Kokkos_QthreadsExec.cpp
+++ b/lib/kokkos/core/src/Qthreads/Kokkos_QthreadsExec.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -42,7 +43,7 @@
 */
 
 #include <Kokkos_Macros.hpp>
-#if defined( KOKKOS_ENABLE_QTHREADS )
+#if defined(KOKKOS_ENABLE_QTHREADS)
 
 #include <Kokkos_Core_fwd.hpp>
 
@@ -76,92 +77,88 @@ enum { MAXIMUM_QTHREADS_WORKERS = 1024 };
  *  for faster fan-in / fan-out lookups
  *  [ n - 1, n - 2, ..., 0 ]
  */
-QthreadsExec * s_exec[ MAXIMUM_QTHREADS_WORKERS ];
+QthreadsExec *s_exec[MAXIMUM_QTHREADS_WORKERS];
 
-int  s_number_shepherds            = 0;
-int  s_number_workers_per_shepherd = 0;
-int  s_number_workers              = 0;
+int s_number_shepherds            = 0;
+int s_number_workers_per_shepherd = 0;
+int s_number_workers              = 0;
 
-inline
-QthreadsExec ** worker_exec()
-{
-  return s_exec + s_number_workers - ( qthread_shep() * s_number_workers_per_shepherd + qthread_worker_local( NULL ) + 1 );
+inline QthreadsExec **worker_exec() {
+  return s_exec + s_number_workers -
+         (qthread_shep() * s_number_workers_per_shepherd +
+          qthread_worker_local(NULL) + 1);
 }
 
-const int s_base_size = QthreadsExec::align_alloc( sizeof(QthreadsExec) );
+const int s_base_size = QthreadsExec::align_alloc(sizeof(QthreadsExec));
 
 int s_worker_reduce_end   = 0;  // End of worker reduction memory.
 int s_worker_shared_end   = 0;  // Total of worker scratch memory.
 int s_worker_shared_begin = 0;  // Beginning of worker shared memory.
 
-QthreadsExecFunctionPointer volatile s_active_function     = 0;
-const void                * volatile s_active_function_arg = 0;
+QthreadsExecFunctionPointer volatile s_active_function = 0;
+const void *volatile s_active_function_arg             = 0;
 
-} // namespace
+}  // namespace
 
-} // namespace Impl
+}  // namespace Impl
 
-} // namespace Kokkos
+}  // namespace Kokkos
 
 //----------------------------------------------------------------------------
 
 namespace Kokkos {
 
-int Qthreads::is_initialized()
-{
-  return Impl::s_number_workers != 0;
-}
+int Qthreads::is_initialized() { return Impl::s_number_workers != 0; }
 
-int Qthreads::concurrency()
-{
-  return Impl::s_number_workers_per_shepherd;
-}
+int Qthreads::concurrency() { return Impl::s_number_workers_per_shepherd; }
 
-int Qthreads::in_parallel()
-{
-  return Impl::s_active_function != 0;
-}
+int Qthreads::in_parallel() { return Impl::s_active_function != 0; }
 
-void Qthreads::initialize( int thread_count )
-{
+void Qthreads::initialize(int thread_count) {
   // Environment variable: QTHREAD_NUM_SHEPHERDS
   // Environment variable: QTHREAD_NUM_WORKERS_PER_SHEP
   // Environment variable: QTHREAD_HWPAR
 
   {
     char buffer[256];
-    snprintf( buffer, sizeof(buffer), "QTHREAD_HWPAR=%d", thread_count );
-    putenv( buffer );
+    snprintf(buffer, sizeof(buffer), "QTHREAD_HWPAR=%d", thread_count);
+    putenv(buffer);
   }
 
-  const bool ok_init = ( QTHREAD_SUCCESS == qthread_initialize() ) &&
-                       ( thread_count    == qthread_num_shepherds() * qthread_num_workers_local( NO_SHEPHERD ) ) &&
-                       ( thread_count    == qthread_num_workers() );
+  const bool ok_init =
+      (QTHREAD_SUCCESS == qthread_initialize()) &&
+      (thread_count ==
+       qthread_num_shepherds() * qthread_num_workers_local(NO_SHEPHERD)) &&
+      (thread_count == qthread_num_workers());
 
   bool ok_symmetry = true;
 
-  if ( ok_init ) {
-    Impl::s_number_shepherds            = qthread_num_shepherds();
-    Impl::s_number_workers_per_shepherd = qthread_num_workers_local( NO_SHEPHERD );
-    Impl::s_number_workers              = Impl::s_number_shepherds * Impl::s_number_workers_per_shepherd;
+  if (ok_init) {
+    Impl::s_number_shepherds = qthread_num_shepherds();
+    Impl::s_number_workers_per_shepherd =
+        qthread_num_workers_local(NO_SHEPHERD);
+    Impl::s_number_workers =
+        Impl::s_number_shepherds * Impl::s_number_workers_per_shepherd;
 
-    for ( int i = 0; ok_symmetry && i < Impl::s_number_shepherds; ++i ) {
-      ok_symmetry = ( Impl::s_number_workers_per_shepherd == qthread_num_workers_local( i ) );
+    for (int i = 0; ok_symmetry && i < Impl::s_number_shepherds; ++i) {
+      ok_symmetry =
+          (Impl::s_number_workers_per_shepherd == qthread_num_workers_local(i));
     }
   }
 
-  if ( ! ok_init || ! ok_symmetry ) {
+  if (!ok_init || !ok_symmetry) {
     std::ostringstream msg;
 
     msg << "Kokkos::Qthreads::initialize(" << thread_count << ") FAILED";
     msg << " : qthread_num_shepherds = " << qthread_num_shepherds();
-    msg << " : qthread_num_workers_per_shepherd = " << qthread_num_workers_local( NO_SHEPHERD );
+    msg << " : qthread_num_workers_per_shepherd = "
+        << qthread_num_workers_local(NO_SHEPHERD);
     msg << " : qthread_num_workers = " << qthread_num_workers();
 
-    if ( ! ok_symmetry ) {
+    if (!ok_symmetry) {
       msg << " : qthread_num_workers_local = {";
-      for ( int i = 0; i < Impl::s_number_shepherds; ++i ) {
-        msg << " " << qthread_num_workers_local( i );
+      for (int i = 0; i < Impl::s_number_shepherds; ++i) {
+        msg << " " << qthread_num_workers_local(i);
       }
       msg << " }";
     }
@@ -170,23 +167,23 @@ void Qthreads::initialize( int thread_count )
     Impl::s_number_shepherds            = 0;
     Impl::s_number_workers_per_shepherd = 0;
 
-    if ( ok_init ) { qthread_finalize(); }
+    if (ok_init) {
+      qthread_finalize();
+    }
 
-    Kokkos::Impl::throw_runtime_exception( msg.str() );
+    Kokkos::Impl::throw_runtime_exception(msg.str());
   }
 
-  Impl::QthreadsExec::resize_worker_scratch( 256, 256 );
+  Impl::QthreadsExec::resize_worker_scratch(256, 256);
 
   // Init the array for used for arbitrarily sized atomics.
   Impl::init_lock_array_host_space();
-
 }
 
-void Qthreads::finalize()
-{
+void Qthreads::finalize() {
   Impl::QthreadsExec::clear_workers();
 
-  if ( Impl::s_number_workers ) {
+  if (Impl::s_number_workers) {
     qthread_finalize();
   }
 
@@ -195,30 +192,29 @@ void Qthreads::finalize()
   Impl::s_number_workers_per_shepherd = 0;
 }
 
-void Qthreads::print_configuration( std::ostream & s, const bool detail )
-{
+void Qthreads::print_configuration(std::ostream &s, const bool detail) {
   s << "Kokkos::Qthreads {"
     << " num_shepherds(" << Impl::s_number_shepherds << ")"
-    << " num_workers_per_shepherd(" << Impl::s_number_workers_per_shepherd << ")"
+    << " num_workers_per_shepherd(" << Impl::s_number_workers_per_shepherd
+    << ")"
     << " }" << std::endl;
 }
 
-Qthreads & Qthreads::instance( int )
-{
+Qthreads &Qthreads::instance(int) {
   static Qthreads q;
   return q;
 }
 
-void Qthreads::fence()
-{
-}
+void Qthreads::fence() {}
 
 int Qthreads::shepherd_size() const { return Impl::s_number_shepherds; }
-int Qthreads::shepherd_worker_size() const { return Impl::s_number_workers_per_shepherd; }
+int Qthreads::shepherd_worker_size() const {
+  return Impl::s_number_workers_per_shepherd;
+}
 
-const char* Qthreads::name() { return "Qthreads"; }
+const char *Qthreads::name() { return "Qthreads"; }
 
-} // namespace Kokkos
+}  // namespace Kokkos
 
 //----------------------------------------------------------------------------
 
@@ -228,108 +224,110 @@ namespace Impl {
 
 namespace {
 
-aligned_t driver_exec_all( void * arg )
-{
-  QthreadsExec & exec = **worker_exec();
+aligned_t driver_exec_all(void *arg) {
+  QthreadsExec &exec = **worker_exec();
 
-  (*s_active_function)( exec, s_active_function_arg );
+  (*s_active_function)(exec, s_active_function_arg);
 
-/*
-  fprintf( stdout
-         , "QthreadsExec driver worker(%d:%d) shepherd(%d:%d) shepherd_worker(%d:%d) done\n"
-         , exec.worker_rank()
-         , exec.worker_size()
-         , exec.shepherd_rank()
-         , exec.shepherd_size()
-         , exec.shepherd_worker_rank()
-         , exec.shepherd_worker_size()
-         );
-  fflush(stdout);
-*/
+  /*
+    fprintf( stdout
+           , "QthreadsExec driver worker(%d:%d) shepherd(%d:%d)
+    shepherd_worker(%d:%d) done\n" , exec.worker_rank() , exec.worker_size() ,
+    exec.shepherd_rank() , exec.shepherd_size() , exec.shepherd_worker_rank() ,
+    exec.shepherd_worker_size()
+           );
+    fflush(stdout);
+  */
 
   return 0;
 }
 
-aligned_t driver_resize_worker_scratch( void * arg )
-{
+aligned_t driver_resize_worker_scratch(void *arg) {
   static volatile int lock_begin = 0;
   static volatile int lock_end   = 0;
 
-  QthreadsExec ** const exec = worker_exec();
+  QthreadsExec **const exec = worker_exec();
 
   //----------------------------------------
   // Serialize allocation for thread safety.
 
-  while ( ! atomic_compare_exchange_strong( & lock_begin, 0, 1 ) ); // Spin wait to claim lock.
+  while (!atomic_compare_exchange_strong(&lock_begin, 0, 1))
+    ;  // Spin wait to claim lock.
 
   const bool ok = 0 == *exec;
 
-  if ( ok ) { *exec = (QthreadsExec *) malloc( s_base_size + s_worker_shared_end ); }
+  if (ok) {
+    *exec = (QthreadsExec *)malloc(s_base_size + s_worker_shared_end);
+  }
 
-  lock_begin = 0; // Release lock.
+  lock_begin = 0;  // Release lock.
 
-  if ( ok ) { new( *exec ) QthreadsExec(); }
+  if (ok) {
+    new (*exec) QthreadsExec();
+  }
 
   //----------------------------------------
   // Wait for all calls to complete to insure that each worker has executed.
 
-  if ( s_number_workers == 1 + atomic_fetch_add( & lock_end, 1 ) ) { lock_end = 0; }
+  if (s_number_workers == 1 + atomic_fetch_add(&lock_end, 1)) {
+    lock_end = 0;
+  }
 
-  while ( lock_end );
+  while (lock_end)
+    ;
 
-/*
-  fprintf( stdout
-         , "QthreadsExec resize worker(%d:%d) shepherd(%d:%d) shepherd_worker(%d:%d) done\n"
-         , (**exec).worker_rank()
-         , (**exec).worker_size()
-         , (**exec).shepherd_rank()
-         , (**exec).shepherd_size()
-         , (**exec).shepherd_worker_rank()
-         , (**exec).shepherd_worker_size()
-         );
-  fflush(stdout);
-*/
+  /*
+    fprintf( stdout
+           , "QthreadsExec resize worker(%d:%d) shepherd(%d:%d)
+    shepherd_worker(%d:%d) done\n" , (**exec).worker_rank() ,
+    (**exec).worker_size() , (**exec).shepherd_rank() , (**exec).shepherd_size()
+           , (**exec).shepherd_worker_rank()
+           , (**exec).shepherd_worker_size()
+           );
+    fflush(stdout);
+  */
 
   //----------------------------------------
 
-  if ( ! ok ) {
-    fprintf( stderr, "Kokkos::QthreadsExec resize failed\n" );
-    fflush( stderr );
+  if (!ok) {
+    fprintf(stderr, "Kokkos::QthreadsExec resize failed\n");
+    fflush(stderr);
   }
 
   return 0;
 }
 
-void verify_is_process( const char * const label, bool not_active = false )
-{
-  const bool not_process = 0 != qthread_shep() || 0 != qthread_worker_local( NULL );
-  const bool is_active   = not_active && ( s_active_function || s_active_function_arg );
+void verify_is_process(const char *const label, bool not_active = false) {
+  const bool not_process =
+      0 != qthread_shep() || 0 != qthread_worker_local(NULL);
+  const bool is_active =
+      not_active && (s_active_function || s_active_function_arg);
 
-  if ( not_process || is_active ) {
-    std::string msg( label );
-    msg.append( " : FAILED" );
-    if ( not_process ) msg.append(" : not called by main process");
-    if ( is_active )   msg.append(" : parallel execution in progress");
-    Kokkos::Impl::throw_runtime_exception( msg );
+  if (not_process || is_active) {
+    std::string msg(label);
+    msg.append(" : FAILED");
+    if (not_process) msg.append(" : not called by main process");
+    if (is_active) msg.append(" : parallel execution in progress");
+    Kokkos::Impl::throw_runtime_exception(msg);
   }
 }
 
-} // namespace
+}  // namespace
 
-int QthreadsExec::worker_per_shepherd()
-{
+int QthreadsExec::worker_per_shepherd() {
   return s_number_workers_per_shepherd;
 }
 
-QthreadsExec::QthreadsExec()
-{
+QthreadsExec::QthreadsExec() {
   const int shepherd_rank        = qthread_shep();
-  const int shepherd_worker_rank = qthread_worker_local( NULL );
-  const int worker_rank          = shepherd_rank * s_number_workers_per_shepherd + shepherd_worker_rank;
+  const int shepherd_worker_rank = qthread_worker_local(NULL);
+  const int worker_rank =
+      shepherd_rank * s_number_workers_per_shepherd + shepherd_worker_rank;
 
-  m_worker_base          = s_exec;
-  m_shepherd_base        = s_exec + s_number_workers_per_shepherd * ( ( s_number_shepherds - ( shepherd_rank + 1 ) ) );
-  m_scratch_alloc        = ( (unsigned char *) this ) + s_base_size;
+  m_worker_base   = s_exec;
+  m_shepherd_base = s_exec + s_number_workers_per_shepherd *
+                                 ((s_number_shepherds - (shepherd_rank + 1)));
+  m_scratch_alloc        = ((unsigned char *)this) + s_base_size;
   m_reduce_end           = s_worker_reduce_end;
   m_shepherd_rank        = shepherd_rank;
   m_shepherd_size        = s_number_shepherds;
@@ -340,37 +338,34 @@ QthreadsExec::QthreadsExec()
   m_worker_state         = QthreadsExec::Active;
 }
 
-void QthreadsExec::clear_workers()
-{
-  for ( int iwork = 0; iwork < s_number_workers; ++iwork ) {
-    QthreadsExec * const exec = s_exec[iwork];
-    s_exec[iwork] = 0;
-    free( exec );
+void QthreadsExec::clear_workers() {
+  for (int iwork = 0; iwork < s_number_workers; ++iwork) {
+    QthreadsExec *const exec = s_exec[iwork];
+    s_exec[iwork]            = 0;
+    free(exec);
   }
 }
 
-void QthreadsExec::shared_reset( Qthreads::scratch_memory_space & space )
-{
-  new( & space )
-    Qthreads::scratch_memory_space(
-      ((unsigned char *) (**m_shepherd_base).m_scratch_alloc ) + s_worker_shared_begin,
-      s_worker_shared_end - s_worker_shared_begin
-    );
+void QthreadsExec::shared_reset(Qthreads::scratch_memory_space &space) {
+  new (&space) Qthreads::scratch_memory_space(
+      ((unsigned char *)(**m_shepherd_base).m_scratch_alloc) +
+          s_worker_shared_begin,
+      s_worker_shared_end - s_worker_shared_begin);
 }
 
-void QthreadsExec::resize_worker_scratch( const int reduce_size, const int shared_size )
-{
-  const int exec_all_reduce_alloc = align_alloc( reduce_size );
-  const int shepherd_scan_alloc   = align_alloc( 8 );
-  const int shepherd_shared_end   = exec_all_reduce_alloc + shepherd_scan_alloc + align_alloc( shared_size );
+void QthreadsExec::resize_worker_scratch(const int reduce_size,
+                                         const int shared_size) {
+  const int exec_all_reduce_alloc = align_alloc(reduce_size);
+  const int shepherd_scan_alloc   = align_alloc(8);
+  const int shepherd_shared_end =
+      exec_all_reduce_alloc + shepherd_scan_alloc + align_alloc(shared_size);
 
-  if ( s_worker_reduce_end < exec_all_reduce_alloc ||
-       s_worker_shared_end < shepherd_shared_end ) {
-
-/*
-  fprintf( stdout, "QthreadsExec::resize\n");
-  fflush(stdout);
-*/
+  if (s_worker_reduce_end < exec_all_reduce_alloc ||
+      s_worker_shared_end < shepherd_shared_end) {
+    /*
+      fprintf( stdout, "QthreadsExec::resize\n");
+      fflush(stdout);
+    */
 
     // Clear current worker memory before allocating new worker memory.
     clear_workers();
@@ -393,51 +388,62 @@ void QthreadsExec::resize_worker_scratch( const int reduce_size, const int share
     }
 #else
     // If this function is used before the 'qthreads.task_policy' unit test,
-    // the 'qthreads.task_policy' unit test fails with a seg-fault within libqthread.so.
-    for ( int jshep = 0; jshep < s_number_shepherds; ++jshep ) {
-      const int num_clone = jshep != main_shep ? s_number_workers_per_shepherd : s_number_workers_per_shepherd - 1;
+    // the 'qthreads.task_policy' unit test fails with a seg-fault within
+    // libqthread.so.
+    for (int jshep = 0; jshep < s_number_shepherds; ++jshep) {
+      const int num_clone = jshep != main_shep
+                                ? s_number_workers_per_shepherd
+                                : s_number_workers_per_shepherd - 1;
 
-      if ( num_clone ) {
-        const int ret = qthread_fork_clones_to_local_priority
-          ( driver_resize_worker_scratch   // Function
-          , NULL                           // Function data block
-          , NULL                           // Pointer to return value feb
-          , jshep                          // Shepherd number
-          , num_clone - 1                  // Number of instances - 1
-          );
+      if (num_clone) {
+        const int ret = qthread_fork_clones_to_local_priority(
+            driver_resize_worker_scratch  // Function
+            ,
+            NULL  // Function data block
+            ,
+            NULL  // Pointer to return value feb
+            ,
+            jshep  // Shepherd number
+            ,
+            num_clone - 1  // Number of instances - 1
+        );
 
-        assert( ret == QTHREAD_SUCCESS );
+        assert(ret == QTHREAD_SUCCESS);
       }
     }
 #endif
 
-    driver_resize_worker_scratch( NULL );
+    driver_resize_worker_scratch(NULL);
 
     // Verify all workers allocated.
 
     bool ok = true;
-    for ( int iwork = 0; ok && iwork < s_number_workers; ++iwork ) { ok = 0 != s_exec[iwork]; }
+    for (int iwork = 0; ok && iwork < s_number_workers; ++iwork) {
+      ok = 0 != s_exec[iwork];
+    }
 
-    if ( ! ok ) {
+    if (!ok) {
       std::ostringstream msg;
       msg << "Kokkos::Impl::QthreadsExec::resize : FAILED for workers {";
-      for ( int iwork = 0; iwork < s_number_workers; ++iwork ) {
-         if ( 0 == s_exec[iwork] ) { msg << " " << ( s_number_workers - ( iwork + 1 ) ); }
+      for (int iwork = 0; iwork < s_number_workers; ++iwork) {
+        if (0 == s_exec[iwork]) {
+          msg << " " << (s_number_workers - (iwork + 1));
+        }
       }
       msg << " }";
-      Kokkos::Impl::throw_runtime_exception( msg.str() );
+      Kokkos::Impl::throw_runtime_exception(msg.str());
     }
   }
 }
 
-void QthreadsExec::exec_all( Qthreads &, QthreadsExecFunctionPointer func, const void * arg )
-{
-  verify_is_process("QthreadsExec::exec_all(...)",true);
+void QthreadsExec::exec_all(Qthreads &, QthreadsExecFunctionPointer func,
+                            const void *arg) {
+  verify_is_process("QthreadsExec::exec_all(...)", true);
 
-/*
-  fprintf( stdout, "QthreadsExec::exec_all\n");
-  fflush(stdout);
-*/
+  /*
+    fprintf( stdout, "QthreadsExec::exec_all\n");
+    fflush(stdout);
+  */
 
   s_active_function     = func;
   s_active_function_arg = arg;
@@ -454,72 +460,76 @@ void QthreadsExec::exec_all( Qthreads &, QthreadsExecFunctionPointer func, const
   }
 #else
   // If this function is used before the 'qthreads.task_policy' unit test,
-  // the 'qthreads.task_policy' unit test fails with a seg-fault within libqthread.so.
-  for ( int jshep = 0; jshep < s_number_shepherds; ++jshep ) {
-    const int num_clone = jshep != main_shep ? s_number_workers_per_shepherd : s_number_workers_per_shepherd - 1;
+  // the 'qthreads.task_policy' unit test fails with a seg-fault within
+  // libqthread.so.
+  for (int jshep = 0; jshep < s_number_shepherds; ++jshep) {
+    const int num_clone = jshep != main_shep
+                              ? s_number_workers_per_shepherd
+                              : s_number_workers_per_shepherd - 1;
 
-    if ( num_clone ) {
-      const int ret = qthread_fork_clones_to_local_priority
-        ( driver_exec_all   // Function
-        , NULL              // Function data block
-        , NULL              // Pointer to return value feb
-        , jshep             // Shepherd number
-        , num_clone - 1     // Number of instances - 1
-        );
+    if (num_clone) {
+      const int ret = qthread_fork_clones_to_local_priority(
+          driver_exec_all  // Function
+          ,
+          NULL  // Function data block
+          ,
+          NULL  // Pointer to return value feb
+          ,
+          jshep  // Shepherd number
+          ,
+          num_clone - 1  // Number of instances - 1
+      );
 
       assert(ret == QTHREAD_SUCCESS);
     }
   }
 #endif
 
-  driver_exec_all( NULL );
+  driver_exec_all(NULL);
 
   s_active_function     = 0;
   s_active_function_arg = 0;
 }
 
-void * QthreadsExec::exec_all_reduce_result()
-{
+void *QthreadsExec::exec_all_reduce_result() {
   return s_exec[0]->m_scratch_alloc;
 }
 
-} // namespace Impl
+}  // namespace Impl
 
-} // namespace Kokkos
+}  // namespace Kokkos
 
 namespace Kokkos {
 
 namespace Impl {
 
 QthreadsTeamPolicyMember::QthreadsTeamPolicyMember()
-  : m_exec( **worker_exec() )
-  , m_team_shared( 0, 0 )
-  , m_team_size( 1 )
-  , m_team_rank( 0 )
-  , m_league_size( 1 )
-  , m_league_end( 1 )
-  , m_league_rank( 0 )
-{
-  m_exec.shared_reset( m_team_shared );
+    : m_exec(**worker_exec()),
+      m_team_shared(0, 0),
+      m_team_size(1),
+      m_team_rank(0),
+      m_league_size(1),
+      m_league_end(1),
+      m_league_rank(0) {
+  m_exec.shared_reset(m_team_shared);
 }
 
-QthreadsTeamPolicyMember::QthreadsTeamPolicyMember( const QthreadsTeamPolicyMember::TaskTeam & )
-  : m_exec( **worker_exec() )
-  , m_team_shared( 0, 0 )
-  , m_team_size( s_number_workers_per_shepherd )
-  , m_team_rank( m_exec.shepherd_worker_rank() )
-  , m_league_size( 1 )
-  , m_league_end( 1 )
-  , m_league_rank( 0 )
-{
-  m_exec.shared_reset( m_team_shared );
+QthreadsTeamPolicyMember::QthreadsTeamPolicyMember(
+    const QthreadsTeamPolicyMember::TaskTeam &)
+    : m_exec(**worker_exec()),
+      m_team_shared(0, 0),
+      m_team_size(s_number_workers_per_shepherd),
+      m_team_rank(m_exec.shepherd_worker_rank()),
+      m_league_size(1),
+      m_league_end(1),
+      m_league_rank(0) {
+  m_exec.shared_reset(m_team_shared);
 }
 
-} // namespace Impl
+}  // namespace Impl
 
-} // namespace Kokkos
+}  // namespace Kokkos
 
 #else
 void KOKKOS_SRC_QTHREADS_EXEC_PREVENT_LINK_ERROR() {}
-#endif // #if defined( KOKKOS_ENABLE_QTHREADS )
-
+#endif  // #if defined( KOKKOS_ENABLE_QTHREADS )
diff --git a/lib/kokkos/core/src/Qthreads/Kokkos_QthreadsExec.hpp b/lib/kokkos/core/src/Qthreads/Kokkos_QthreadsExec.hpp
index b2a3ebe414..aa0fd73a4a 100644
--- a/lib/kokkos/core/src/Qthreads/Kokkos_QthreadsExec.hpp
+++ b/lib/kokkos/core/src/Qthreads/Kokkos_QthreadsExec.hpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -45,7 +46,7 @@
 #define KOKKOS_QTHREADSEXEC_HPP
 
 #include <Kokkos_Macros.hpp>
-#if defined( KOKKOS_ENABLE_QTHREADS )
+#if defined(KOKKOS_ENABLE_QTHREADS)
 
 #include <impl/Kokkos_Spinwait.hpp>
 
@@ -57,299 +58,308 @@ namespace Impl {
 
 class QthreadsExec;
 
-typedef void (*QthreadsExecFunctionPointer)( QthreadsExec &, const void * );
+typedef void (*QthreadsExecFunctionPointer)(QthreadsExec &, const void *);
 
 class QthreadsExec {
-private:
+ private:
   enum { Inactive = 0, Active = 1 };
 
-  const QthreadsExec * const * m_worker_base;
-  const QthreadsExec * const * m_shepherd_base;
+  const QthreadsExec *const *m_worker_base;
+  const QthreadsExec *const *m_shepherd_base;
 
-  void  * m_scratch_alloc;  ///< Scratch memory [ reduce, team, shared ]
-  int     m_reduce_end;     ///< End of scratch reduction memory
+  void *m_scratch_alloc;  ///< Scratch memory [ reduce, team, shared ]
+  int m_reduce_end;       ///< End of scratch reduction memory
 
-  int     m_shepherd_rank;
-  int     m_shepherd_size;
+  int m_shepherd_rank;
+  int m_shepherd_size;
 
-  int     m_shepherd_worker_rank;
-  int     m_shepherd_worker_size;
+  int m_shepherd_worker_rank;
+  int m_shepherd_worker_size;
 
   /*
-   *  m_worker_rank = m_shepherd_rank * m_shepherd_worker_size + m_shepherd_worker_rank
-   *  m_worker_size = m_shepherd_size * m_shepherd_worker_size
+   *  m_worker_rank = m_shepherd_rank * m_shepherd_worker_size +
+   * m_shepherd_worker_rank m_worker_size = m_shepherd_size *
+   * m_shepherd_worker_size
    */
-  int     m_worker_rank;
-  int     m_worker_size;
+  int m_worker_rank;
+  int m_worker_size;
 
   int mutable volatile m_worker_state;
 
   friend class Kokkos::Qthreads;
 
   ~QthreadsExec();
-  QthreadsExec( const QthreadsExec & );
-  QthreadsExec & operator = ( const QthreadsExec & );
+  QthreadsExec(const QthreadsExec &);
+  QthreadsExec &operator=(const QthreadsExec &);
 
-public:
+ public:
   QthreadsExec();
 
   /** Execute the input function on all available Qthreads workers. */
-  static void exec_all( Qthreads &, QthreadsExecFunctionPointer, const void * );
+  static void exec_all(Qthreads &, QthreadsExecFunctionPointer, const void *);
 
   /** Barrier across all workers participating in the 'exec_all'. */
-  void exec_all_barrier() const
-  {
-    const int rev_rank = m_worker_size - ( m_worker_rank + 1 );
+  void exec_all_barrier() const {
+    const int rev_rank = m_worker_size - (m_worker_rank + 1);
 
     int n, j;
 
-    for ( n = 1; ( ! ( rev_rank & n ) ) && ( ( j = rev_rank + n ) < m_worker_size ); n <<= 1 ) {
-      Impl::spinwait_while_equal( m_worker_base[j]->m_worker_state, QthreadsExec::Active );
+    for (n = 1; (!(rev_rank & n)) && ((j = rev_rank + n) < m_worker_size);
+         n <<= 1) {
+      Impl::spinwait_while_equal(m_worker_base[j]->m_worker_state,
+                                 QthreadsExec::Active);
     }
 
-    if ( rev_rank ) {
+    if (rev_rank) {
       m_worker_state = QthreadsExec::Inactive;
-      Impl::spinwait_while_equal( m_worker_state, QthreadsExec::Inactive );
+      Impl::spinwait_while_equal(m_worker_state, QthreadsExec::Inactive);
     }
 
-    for ( n = 1; ( ! ( rev_rank & n ) ) && ( ( j = rev_rank + n ) < m_worker_size ); n <<= 1 ) {
+    for (n = 1; (!(rev_rank & n)) && ((j = rev_rank + n) < m_worker_size);
+         n <<= 1) {
       m_worker_base[j]->m_worker_state = QthreadsExec::Active;
     }
   }
 
   /** Barrier across workers within the shepherd with rank < team_rank. */
-  void shepherd_barrier( const int team_size ) const
-  {
-    if ( m_shepherd_worker_rank < team_size ) {
-
-      const int rev_rank = team_size - ( m_shepherd_worker_rank + 1 );
+  void shepherd_barrier(const int team_size) const {
+    if (m_shepherd_worker_rank < team_size) {
+      const int rev_rank = team_size - (m_shepherd_worker_rank + 1);
 
       int n, j;
 
-      for ( n = 1; ( ! ( rev_rank & n ) ) && ( ( j = rev_rank + n ) < team_size ); n <<= 1 ) {
-        Impl::spinwait_while_equal( m_shepherd_base[j]->m_worker_state, QthreadsExec::Active );
+      for (n = 1; (!(rev_rank & n)) && ((j = rev_rank + n) < team_size);
+           n <<= 1) {
+        Impl::spinwait_while_equal(m_shepherd_base[j]->m_worker_state,
+                                   QthreadsExec::Active);
       }
 
-      if ( rev_rank ) {
+      if (rev_rank) {
         m_worker_state = QthreadsExec::Inactive;
-        Impl::spinwait_while_equal( m_worker_state, QthreadsExec::Inactive );
+        Impl::spinwait_while_equal(m_worker_state, QthreadsExec::Inactive);
       }
 
-      for ( n = 1; ( ! ( rev_rank & n ) ) && ( ( j = rev_rank + n ) < team_size ); n <<= 1 ) {
+      for (n = 1; (!(rev_rank & n)) && ((j = rev_rank + n) < team_size);
+           n <<= 1) {
         m_shepherd_base[j]->m_worker_state = QthreadsExec::Active;
       }
     }
   }
 
   /** Reduce across all workers participating in the 'exec_all'. */
-  template< class FunctorType, class ReducerType, class ArgTag >
-  inline
-  void exec_all_reduce( const FunctorType & func, const ReducerType & reduce ) const
-  {
-    typedef Kokkos::Impl::if_c< std::is_same<InvalidType, ReducerType>::value, FunctorType, ReducerType > ReducerConditional;
+  template <class FunctorType, class ReducerType, class ArgTag>
+  inline void exec_all_reduce(const FunctorType &func,
+                              const ReducerType &reduce) const {
+    typedef Kokkos::Impl::if_c<std::is_same<InvalidType, ReducerType>::value,
+                               FunctorType, ReducerType>
+        ReducerConditional;
     typedef typename ReducerConditional::type ReducerTypeFwd;
-    typedef Kokkos::Impl::FunctorValueJoin< ReducerTypeFwd, ArgTag > ValueJoin;
+    typedef Kokkos::Impl::FunctorValueJoin<ReducerTypeFwd, ArgTag> ValueJoin;
 
-    const int rev_rank = m_worker_size - ( m_worker_rank + 1 );
+    const int rev_rank = m_worker_size - (m_worker_rank + 1);
 
     int n, j;
 
-    for ( n = 1; ( ! ( rev_rank & n ) ) && ( ( j = rev_rank + n ) < m_worker_size ); n <<= 1 ) {
-      const QthreadsExec & fan = *m_worker_base[j];
+    for (n = 1; (!(rev_rank & n)) && ((j = rev_rank + n) < m_worker_size);
+         n <<= 1) {
+      const QthreadsExec &fan = *m_worker_base[j];
 
-      Impl::spinwait_while_equal( fan.m_worker_state, QthreadsExec::Active );
+      Impl::spinwait_while_equal(fan.m_worker_state, QthreadsExec::Active);
 
-      ValueJoin::join( ReducerConditional::select( func, reduce ), m_scratch_alloc, fan.m_scratch_alloc );
+      ValueJoin::join(ReducerConditional::select(func, reduce), m_scratch_alloc,
+                      fan.m_scratch_alloc);
     }
 
-    if ( rev_rank ) {
+    if (rev_rank) {
       m_worker_state = QthreadsExec::Inactive;
-      Impl::spinwait_while_equal( m_worker_state, QthreadsExec::Inactive );
+      Impl::spinwait_while_equal(m_worker_state, QthreadsExec::Inactive);
     }
 
-    for ( n = 1; ( ! ( rev_rank & n ) ) && ( ( j = rev_rank + n ) < m_worker_size ); n <<= 1 ) {
+    for (n = 1; (!(rev_rank & n)) && ((j = rev_rank + n) < m_worker_size);
+         n <<= 1) {
       m_worker_base[j]->m_worker_state = QthreadsExec::Active;
     }
   }
 
   /** Scan across all workers participating in the 'exec_all'. */
-  template< class FunctorType, class ArgTag >
-  inline
-  void exec_all_scan( const FunctorType & func ) const
-  {
-    typedef Kokkos::Impl::FunctorValueInit< FunctorType, ArgTag > ValueInit;
-    typedef Kokkos::Impl::FunctorValueJoin< FunctorType, ArgTag > ValueJoin;
-    typedef Kokkos::Impl::FunctorValueOps<  FunctorType, ArgTag > ValueOps;
+  template <class FunctorType, class ArgTag>
+  inline void exec_all_scan(const FunctorType &func) const {
+    typedef Kokkos::Impl::FunctorValueInit<FunctorType, ArgTag> ValueInit;
+    typedef Kokkos::Impl::FunctorValueJoin<FunctorType, ArgTag> ValueJoin;
+    typedef Kokkos::Impl::FunctorValueOps<FunctorType, ArgTag> ValueOps;
 
-    const int rev_rank = m_worker_size - ( m_worker_rank + 1 );
+    const int rev_rank = m_worker_size - (m_worker_rank + 1);
 
     int n, j;
 
-    for ( n = 1; ( ! ( rev_rank & n ) ) && ( ( j = rev_rank + n ) < m_worker_size ); n <<= 1 ) {
-      Impl::spinwait_while_equal( m_worker_base[j]->m_worker_state, QthreadsExec::Active );
+    for (n = 1; (!(rev_rank & n)) && ((j = rev_rank + n) < m_worker_size);
+         n <<= 1) {
+      Impl::spinwait_while_equal(m_worker_base[j]->m_worker_state,
+                                 QthreadsExec::Active);
     }
 
-    if ( rev_rank ) {
+    if (rev_rank) {
       m_worker_state = QthreadsExec::Inactive;
-      Impl::spinwait_while_equal( m_worker_state, QthreadsExec::Inactive );
-    }
-    else {
+      Impl::spinwait_while_equal(m_worker_state, QthreadsExec::Inactive);
+    } else {
       // Root thread scans across values before releasing threads.
       // Worker data is in reverse order, so m_worker_base[0] is the
       // highest ranking thread.
 
       // Copy from lower ranking to higher ranking worker.
-      for ( int i = 1; i < m_worker_size; ++i ) {
-        ValueOps::copy( func
-                      , m_worker_base[i-1]->m_scratch_alloc
-                      , m_worker_base[i]->m_scratch_alloc
-                      );
+      for (int i = 1; i < m_worker_size; ++i) {
+        ValueOps::copy(func, m_worker_base[i - 1]->m_scratch_alloc,
+                       m_worker_base[i]->m_scratch_alloc);
       }
 
-      ValueInit::init( func, m_worker_base[m_worker_size-1]->m_scratch_alloc );
+      ValueInit::init(func, m_worker_base[m_worker_size - 1]->m_scratch_alloc);
 
       // Join from lower ranking to higher ranking worker.
-      // Value at m_worker_base[n-1] is zero so skip adding it to m_worker_base[n-2].
-      for ( int i = m_worker_size - 1; --i > 0; ) {
-        ValueJoin::join( func, m_worker_base[i-1]->m_scratch_alloc, m_worker_base[i]->m_scratch_alloc );
+      // Value at m_worker_base[n-1] is zero so skip adding it to
+      // m_worker_base[n-2].
+      for (int i = m_worker_size - 1; --i > 0;) {
+        ValueJoin::join(func, m_worker_base[i - 1]->m_scratch_alloc,
+                        m_worker_base[i]->m_scratch_alloc);
       }
     }
 
-    for ( n = 1; ( ! ( rev_rank & n ) ) && ( ( j = rev_rank + n ) < m_worker_size ); n <<= 1 ) {
+    for (n = 1; (!(rev_rank & n)) && ((j = rev_rank + n) < m_worker_size);
+         n <<= 1) {
       m_worker_base[j]->m_worker_state = QthreadsExec::Active;
     }
   }
 
   //----------------------------------------
 
-  template< class Type >
-  inline
-  volatile Type * shepherd_team_scratch_value() const
-  { return (volatile Type*)( ( (unsigned char *) m_scratch_alloc ) + m_reduce_end ); }
+  template <class Type>
+  inline volatile Type *shepherd_team_scratch_value() const {
+    return (volatile Type *)(((unsigned char *)m_scratch_alloc) + m_reduce_end);
+  }
 
-  template< class Type >
-  inline
-  void shepherd_broadcast( Type & value, const int team_size, const int team_rank ) const
-  {
-    if ( m_shepherd_base ) {
-      Type * const shared_value = m_shepherd_base[0]->shepherd_team_scratch_value<Type>();
-      if ( m_shepherd_worker_rank == team_rank ) { *shared_value = value; }
+  template <class Type>
+  inline void shepherd_broadcast(Type &value, const int team_size,
+                                 const int team_rank) const {
+    if (m_shepherd_base) {
+      Type *const shared_value =
+          m_shepherd_base[0]->shepherd_team_scratch_value<Type>();
+      if (m_shepherd_worker_rank == team_rank) {
+        *shared_value = value;
+      }
       memory_fence();
-      shepherd_barrier( team_size );
+      shepherd_barrier(team_size);
       value = *shared_value;
     }
   }
 
-  template< class Type >
-  inline
-  Type shepherd_reduce( const int team_size, const Type & value ) const
-  {
-    volatile Type * const shared_value = shepherd_team_scratch_value<Type>();
-    *shared_value = value;
-//    *shepherd_team_scratch_value<Type>() = value;
+  template <class Type>
+  inline Type shepherd_reduce(const int team_size, const Type &value) const {
+    volatile Type *const shared_value = shepherd_team_scratch_value<Type>();
+    *shared_value                     = value;
+    //    *shepherd_team_scratch_value<Type>() = value;
 
     memory_fence();
 
-    const int rev_rank = team_size - ( m_shepherd_worker_rank + 1 );
+    const int rev_rank = team_size - (m_shepherd_worker_rank + 1);
 
     int n, j;
 
-    for ( n = 1; ( ! ( rev_rank & n ) ) && ( ( j = rev_rank + n ) < team_size ); n <<= 1 ) {
-      Impl::spinwait_while_equal( m_shepherd_base[j]->m_worker_state, QthreadsExec::Active );
+    for (n = 1; (!(rev_rank & n)) && ((j = rev_rank + n) < team_size);
+         n <<= 1) {
+      Impl::spinwait_while_equal(m_shepherd_base[j]->m_worker_state,
+                                 QthreadsExec::Active);
     }
 
-    if ( rev_rank ) {
+    if (rev_rank) {
       m_worker_state = QthreadsExec::Inactive;
-      Impl::spinwait_while_equal( m_worker_state, QthreadsExec::Inactive );
-    }
-    else {
-      Type & accum = *m_shepherd_base[0]->shepherd_team_scratch_value<Type>();
-      for ( int i = 1; i < n; ++i ) {
+      Impl::spinwait_while_equal(m_worker_state, QthreadsExec::Inactive);
+    } else {
+      Type &accum = *m_shepherd_base[0]->shepherd_team_scratch_value<Type>();
+      for (int i = 1; i < n; ++i) {
         accum += *m_shepherd_base[i]->shepherd_team_scratch_value<Type>();
       }
-      for ( int i = 1; i < n; ++i ) {
+      for (int i = 1; i < n; ++i) {
         *m_shepherd_base[i]->shepherd_team_scratch_value<Type>() = accum;
       }
 
       memory_fence();
     }
 
-    for ( n = 1; ( ! ( rev_rank & n ) ) && ( ( j = rev_rank + n ) < team_size ); n <<= 1 ) {
+    for (n = 1; (!(rev_rank & n)) && ((j = rev_rank + n) < team_size);
+         n <<= 1) {
       m_shepherd_base[j]->m_worker_state = QthreadsExec::Active;
     }
 
     return *shepherd_team_scratch_value<Type>();
   }
 
-  template< class JoinOp >
-  inline
-  typename JoinOp::value_type
-  shepherd_reduce( const int team_size
-                 , const typename JoinOp::value_type & value
-                 , const JoinOp & op ) const
-  {
+  template <class JoinOp>
+  inline typename JoinOp::value_type shepherd_reduce(
+      const int team_size, const typename JoinOp::value_type &value,
+      const JoinOp &op) const {
     typedef typename JoinOp::value_type Type;
 
-    volatile Type * const shared_value = shepherd_team_scratch_value<Type>();
-    *shared_value = value;
-//    *shepherd_team_scratch_value<Type>() = value;
+    volatile Type *const shared_value = shepherd_team_scratch_value<Type>();
+    *shared_value                     = value;
+    //    *shepherd_team_scratch_value<Type>() = value;
 
     memory_fence();
 
-    const int rev_rank = team_size - ( m_shepherd_worker_rank + 1 );
+    const int rev_rank = team_size - (m_shepherd_worker_rank + 1);
 
     int n, j;
 
-    for ( n = 1; ( ! ( rev_rank & n ) ) && ( ( j = rev_rank + n ) < team_size ); n <<= 1 ) {
-      Impl::spinwait_while_equal( m_shepherd_base[j]->m_worker_state, QthreadsExec::Active );
+    for (n = 1; (!(rev_rank & n)) && ((j = rev_rank + n) < team_size);
+         n <<= 1) {
+      Impl::spinwait_while_equal(m_shepherd_base[j]->m_worker_state,
+                                 QthreadsExec::Active);
     }
 
-    if ( rev_rank ) {
+    if (rev_rank) {
       m_worker_state = QthreadsExec::Inactive;
-      Impl::spinwait_while_equal( m_worker_state, QthreadsExec::Inactive );
-    }
-    else {
-      volatile Type & accum = *m_shepherd_base[0]->shepherd_team_scratch_value<Type>();
-      for ( int i = 1; i < team_size; ++i ) {
-        op.join( accum, *m_shepherd_base[i]->shepherd_team_scratch_value<Type>() );
+      Impl::spinwait_while_equal(m_worker_state, QthreadsExec::Inactive);
+    } else {
+      volatile Type &accum =
+          *m_shepherd_base[0]->shepherd_team_scratch_value<Type>();
+      for (int i = 1; i < team_size; ++i) {
+        op.join(accum,
+                *m_shepherd_base[i]->shepherd_team_scratch_value<Type>());
       }
-      for ( int i = 1; i < team_size; ++i ) {
+      for (int i = 1; i < team_size; ++i) {
         *m_shepherd_base[i]->shepherd_team_scratch_value<Type>() = accum;
       }
 
       memory_fence();
     }
 
-    for ( n = 1; ( ! ( rev_rank & n ) ) && ( ( j = rev_rank + n ) < team_size ); n <<= 1 ) {
+    for (n = 1; (!(rev_rank & n)) && ((j = rev_rank + n) < team_size);
+         n <<= 1) {
       m_shepherd_base[j]->m_worker_state = QthreadsExec::Active;
     }
 
     return *shepherd_team_scratch_value<Type>();
   }
 
-  template< class Type >
-  inline
-  Type shepherd_scan( const int team_size
-                    , const Type & value
-                    ,       Type * const global_value = 0 ) const
-  {
+  template <class Type>
+  inline Type shepherd_scan(const int team_size, const Type &value,
+                            Type *const global_value = 0) const {
     *shepherd_team_scratch_value<Type>() = value;
 
     memory_fence();
 
-    const int rev_rank = team_size - ( m_shepherd_worker_rank + 1 );
+    const int rev_rank = team_size - (m_shepherd_worker_rank + 1);
 
     int n, j;
 
-    for ( n = 1; ( ! ( rev_rank & n ) ) && ( ( j = rev_rank + n ) < team_size ); n <<= 1 ) {
-      Impl::spinwait_while_equal( m_shepherd_base[j]->m_worker_state, QthreadsExec::Active );
+    for (n = 1; (!(rev_rank & n)) && ((j = rev_rank + n) < team_size);
+         n <<= 1) {
+      Impl::spinwait_while_equal(m_shepherd_base[j]->m_worker_state,
+                                 QthreadsExec::Active);
     }
 
-    if ( rev_rank ) {
+    if (rev_rank) {
       m_worker_state = QthreadsExec::Inactive;
-      Impl::spinwait_while_equal( m_worker_state, QthreadsExec::Inactive );
-    }
-    else {
+      Impl::spinwait_while_equal(m_worker_state, QthreadsExec::Inactive);
+    } else {
       // Root thread scans across values before releasing threads.
       // Worker data is in reverse order, so m_shepherd_base[0] is the
       // highest ranking thread.
@@ -357,24 +367,27 @@ public:
       // Copy from lower ranking to higher ranking worker.
 
       Type accum = *m_shepherd_base[0]->shepherd_team_scratch_value<Type>();
-      for ( int i = 1; i < team_size; ++i ) {
-        const Type tmp = *m_shepherd_base[i]->shepherd_team_scratch_value<Type>();
+      for (int i = 1; i < team_size; ++i) {
+        const Type tmp =
+            *m_shepherd_base[i]->shepherd_team_scratch_value<Type>();
         accum += tmp;
-        *m_shepherd_base[i-1]->shepherd_team_scratch_value<Type>() = tmp;
+        *m_shepherd_base[i - 1]->shepherd_team_scratch_value<Type>() = tmp;
       }
 
-      *m_shepherd_base[team_size-1]->shepherd_team_scratch_value<Type>() =
-        global_value ? atomic_fetch_add( global_value, accum ) : 0;
+      *m_shepherd_base[team_size - 1]->shepherd_team_scratch_value<Type>() =
+          global_value ? atomic_fetch_add(global_value, accum) : 0;
 
       // Join from lower ranking to higher ranking worker.
-      for ( int i = team_size; --i; ) {
-        *m_shepherd_base[i-1]->shepherd_team_scratch_value<Type>() += *m_shepherd_base[i]->shepherd_team_scratch_value<Type>();
+      for (int i = team_size; --i;) {
+        *m_shepherd_base[i - 1]->shepherd_team_scratch_value<Type>() +=
+            *m_shepherd_base[i]->shepherd_team_scratch_value<Type>();
       }
 
       memory_fence();
     }
 
-    for ( n = 1; ( ! ( rev_rank & n ) ) && ( ( j = rev_rank + n ) < team_size ); n <<= 1 ) {
+    for (n = 1; (!(rev_rank & n)) && ((j = rev_rank + n) < team_size);
+         n <<= 1) {
       m_shepherd_base[j]->m_worker_state = QthreadsExec::Active;
     }
 
@@ -383,21 +396,20 @@ public:
 
   //----------------------------------------
 
-  static inline
-  int align_alloc( int size )
-  {
+  static inline int align_alloc(int size) {
     enum { ALLOC_GRAIN = 1 << 6 /* power of two, 64bytes */ };
     enum { ALLOC_GRAIN_MASK = ALLOC_GRAIN - 1 };
-    return ( size + ALLOC_GRAIN_MASK ) & ~ALLOC_GRAIN_MASK;
+    return (size + ALLOC_GRAIN_MASK) & ~ALLOC_GRAIN_MASK;
   }
 
-  void shared_reset( Qthreads::scratch_memory_space & );
+  void shared_reset(Qthreads::scratch_memory_space &);
 
-  void * exec_all_reduce_value() const { return m_scratch_alloc; }
+  void *exec_all_reduce_value() const { return m_scratch_alloc; }
 
-  static void * exec_all_reduce_result();
+  static void *exec_all_reduce_result();
 
-  static void resize_worker_scratch( const int reduce_size, const int shared_size );
+  static void resize_worker_scratch(const int reduce_size,
+                                    const int shared_size);
   static void clear_workers();
 
   //----------------------------------------
@@ -412,9 +424,9 @@ public:
   static int worker_per_shepherd();
 };
 
-} // namespace Impl
+}  // namespace Impl
 
-} // namespace Kokkos
+}  // namespace Kokkos
 
 //----------------------------------------------------------------------------
 
@@ -423,21 +435,21 @@ namespace Kokkos {
 namespace Impl {
 
 class QthreadsTeamPolicyMember {
-private:
-  typedef Kokkos::Qthreads                       execution_space;
-  typedef execution_space::scratch_memory_space  scratch_memory_space;
+ private:
+  typedef Kokkos::Qthreads execution_space;
+  typedef execution_space::scratch_memory_space scratch_memory_space;
 
-  Impl::QthreadsExec   & m_exec;
-  scratch_memory_space   m_team_shared;
-  const int              m_team_size;
-  const int              m_team_rank;
-  const int              m_league_size;
-  const int              m_league_end;
-        int              m_league_rank;
+  Impl::QthreadsExec &m_exec;
+  scratch_memory_space m_team_shared;
+  const int m_team_size;
+  const int m_team_rank;
+  const int m_league_size;
+  const int m_league_end;
+  int m_league_rank;
 
-public:
+ public:
   KOKKOS_INLINE_FUNCTION
-  const scratch_memory_space & team_shmem() const { return m_team_shared; }
+  const scratch_memory_space &team_shmem() const { return m_team_shared; }
 
   KOKKOS_INLINE_FUNCTION int league_rank() const { return m_league_rank; }
   KOKKOS_INLINE_FUNCTION int league_size() const { return m_league_size; }
@@ -445,36 +457,50 @@ public:
   KOKKOS_INLINE_FUNCTION int team_size() const { return m_team_size; }
 
   KOKKOS_INLINE_FUNCTION void team_barrier() const
-#if ! defined( KOKKOS_ACTIVE_EXECUTION_MEMORY_SPACE_HOST )
-  {}
+#if !defined(KOKKOS_ACTIVE_EXECUTION_MEMORY_SPACE_HOST)
+  {
+  }
 #else
-  { m_exec.shepherd_barrier( m_team_size ); }
+  {
+    m_exec.shepherd_barrier(m_team_size);
+  }
 #endif
 
-  template< typename Type >
-  KOKKOS_INLINE_FUNCTION Type team_broadcast( const Type & value, int rank ) const
-#if ! defined( KOKKOS_ACTIVE_EXECUTION_MEMORY_SPACE_HOST )
-  { return Type(); }
+  template <typename Type>
+  KOKKOS_INLINE_FUNCTION Type team_broadcast(const Type &value, int rank) const
+#if !defined(KOKKOS_ACTIVE_EXECUTION_MEMORY_SPACE_HOST)
+  {
+    return Type();
+  }
 #else
-  { return m_exec.template shepherd_broadcast<Type>( value, m_team_size, rank ); }
+  {
+    return m_exec.template shepherd_broadcast<Type>(value, m_team_size, rank);
+  }
 #endif
 
-  template< typename Type >
-  KOKKOS_INLINE_FUNCTION Type team_reduce( const Type & value ) const
-#if ! defined( KOKKOS_ACTIVE_EXECUTION_MEMORY_SPACE_HOST )
-  { return Type(); }
+  template <typename Type>
+  KOKKOS_INLINE_FUNCTION Type team_reduce(const Type &value) const
+#if !defined(KOKKOS_ACTIVE_EXECUTION_MEMORY_SPACE_HOST)
+  {
+    return Type();
+  }
 #else
-  { return m_exec.template shepherd_reduce<Type>( m_team_size, value ); }
+  {
+    return m_exec.template shepherd_reduce<Type>(m_team_size, value);
+  }
 #endif
 
-  template< typename JoinOp >
-  KOKKOS_INLINE_FUNCTION typename JoinOp::value_type
-  team_reduce( const typename JoinOp::value_type & value
-             , const JoinOp & op ) const
-#if ! defined( KOKKOS_ACTIVE_EXECUTION_MEMORY_SPACE_HOST )
-  { return typename JoinOp::value_type(); }
+  template <typename JoinOp>
+  KOKKOS_INLINE_FUNCTION typename JoinOp::value_type team_reduce(
+      const typename JoinOp::value_type &value, const JoinOp &op) const
+#if !defined(KOKKOS_ACTIVE_EXECUTION_MEMORY_SPACE_HOST)
+  {
+    return typename JoinOp::value_type();
+  }
 #else
-  { return m_exec.template shepherd_reduce<JoinOp>( m_team_size, value, op ); }
+  {
+    return m_exec.template shepherd_reduce<JoinOp>(m_team_size, value, op);
+  }
 #endif
 
   /** \brief  Intra-team exclusive prefix sum with team_rank() ordering.
@@ -482,12 +508,16 @@ public:
    *  The highest rank thread can compute the reduction total as
    *    reduction_total = dev.team_scan( value ) + value;
    */
-  template< typename Type >
-  KOKKOS_INLINE_FUNCTION Type team_scan( const Type & value ) const
-#if ! defined( KOKKOS_ACTIVE_EXECUTION_MEMORY_SPACE_HOST )
-  { return Type(); }
+  template <typename Type>
+  KOKKOS_INLINE_FUNCTION Type team_scan(const Type &value) const
+#if !defined(KOKKOS_ACTIVE_EXECUTION_MEMORY_SPACE_HOST)
+  {
+    return Type();
+  }
 #else
-  { return m_exec.template shepherd_scan<Type>( m_team_size, value ); }
+  {
+    return m_exec.template shepherd_scan<Type>(m_team_size, value);
+  }
 #endif
 
   /** \brief  Intra-team exclusive prefix sum with team_rank() ordering
@@ -498,12 +528,18 @@ public:
    *  the league's teams is non-deterministic.  As such the base value for each
    *  team's scan operation is similarly non-deterministic.
    */
-  template< typename Type >
-  KOKKOS_INLINE_FUNCTION Type team_scan( const Type & value, Type * const global_accum ) const
-#if ! defined( KOKKOS_ACTIVE_EXECUTION_MEMORY_SPACE_HOST )
-  { return Type(); }
+  template <typename Type>
+  KOKKOS_INLINE_FUNCTION Type team_scan(const Type &value,
+                                        Type *const global_accum) const
+#if !defined(KOKKOS_ACTIVE_EXECUTION_MEMORY_SPACE_HOST)
+  {
+    return Type();
+  }
 #else
-  { return m_exec.template shepherd_scan<Type>( m_team_size, value, global_accum ); }
+  {
+    return m_exec.template shepherd_scan<Type>(m_team_size, value,
+                                               global_accum);
+  }
 #endif
 
   //----------------------------------------
@@ -512,120 +548,127 @@ public:
   struct TaskTeam {};
 
   QthreadsTeamPolicyMember();
-  explicit QthreadsTeamPolicyMember( const TaskTeam & );
+  explicit QthreadsTeamPolicyMember(const TaskTeam &);
 
   //----------------------------------------
-  // Private for the driver ( for ( member_type i( exec, team ); i; i.next_team() ) { ... }
+  // Private for the driver ( for ( member_type i( exec, team ); i;
+  // i.next_team() ) { ... }
 
   // Initialize.
-  template< class ... Properties >
-  QthreadsTeamPolicyMember( Impl::QthreadsExec & exec
-                          , const Kokkos::Impl::TeamPolicyInternal< Qthreads, Properties... > & team )
-    : m_exec( exec )
-    , m_team_shared( 0, 0 )
-    , m_team_size( team.m_team_size )
-    , m_team_rank( exec.shepherd_worker_rank() )
-    , m_league_size( team.m_league_size )
-    , m_league_end( team.m_league_size - team.m_shepherd_iter * ( exec.shepherd_size() - ( exec.shepherd_rank() + 1 ) ) )
-    , m_league_rank( m_league_end > team.m_shepherd_iter ? m_league_end - team.m_shepherd_iter : 0 )
-  {
-    m_exec.shared_reset( m_team_shared );
+  template <class... Properties>
+  QthreadsTeamPolicyMember(
+      Impl::QthreadsExec &exec,
+      const Kokkos::Impl::TeamPolicyInternal<Qthreads, Properties...> &team)
+      : m_exec(exec),
+        m_team_shared(0, 0),
+        m_team_size(team.m_team_size),
+        m_team_rank(exec.shepherd_worker_rank()),
+        m_league_size(team.m_league_size),
+        m_league_end(team.m_league_size -
+                     team.m_shepherd_iter *
+                         (exec.shepherd_size() - (exec.shepherd_rank() + 1))),
+        m_league_rank(m_league_end > team.m_shepherd_iter
+                          ? m_league_end - team.m_shepherd_iter
+                          : 0) {
+    m_exec.shared_reset(m_team_shared);
   }
 
   // Continue.
-  operator bool () const { return m_league_rank < m_league_end; }
+  operator bool() const { return m_league_rank < m_league_end; }
 
   // Iterate.
-  void next_team() { ++m_league_rank; m_exec.shared_reset( m_team_shared ); }
+  void next_team() {
+    ++m_league_rank;
+    m_exec.shared_reset(m_team_shared);
+  }
 };
 
-template< class ... Properties >
-class TeamPolicyInternal< Kokkos::Qthreads, Properties ... >
-  : public PolicyTraits< Properties... >
-{
-private:
+template <class... Properties>
+class TeamPolicyInternal<Kokkos::Qthreads, Properties...>
+    : public PolicyTraits<Properties...> {
+ private:
   const int m_league_size;
   const int m_team_size;
   const int m_shepherd_iter;
 
-public:
+ public:
   //! Tag this class as a kokkos execution policy.
-  typedef TeamPolicyInternal              execution_policy;
-  typedef Qthreads                        execution_space;
-  typedef PolicyTraits< Properties ... >  traits;
+  typedef TeamPolicyInternal execution_policy;
+  typedef Qthreads execution_space;
+  typedef PolicyTraits<Properties...> traits;
 
   //----------------------------------------
 
-  template< class FunctorType >
-  inline static
-  int team_size_max( const FunctorType & )
-  { return Qthreads::instance().shepherd_worker_size(); }
+  template <class FunctorType>
+  inline static int team_size_max(const FunctorType &) {
+    return Qthreads::instance().shepherd_worker_size();
+  }
 
-  template< class FunctorType >
-  static int team_size_recommended( const FunctorType & f )
-  { return team_size_max( f ); }
+  template <class FunctorType>
+  static int team_size_recommended(const FunctorType &f) {
+    return team_size_max(f);
+  }
 
-  template< class FunctorType >
-  inline static
-  int team_size_recommended( const FunctorType & f, const int& )
-  { return team_size_max( f ); }
+  template <class FunctorType>
+  inline static int team_size_recommended(const FunctorType &f, const int &) {
+    return team_size_max(f);
+  }
 
   //----------------------------------------
 
-  inline int team_size()   const { return m_team_size; }
+  inline int team_size() const { return m_team_size; }
   inline int league_size() const { return m_league_size; }
 
   // One active team per shepherd.
-  TeamPolicyInternal( Kokkos::Qthreads & q
-                    , const int league_size
-                    , const int team_size
-                    , const int /* vector_length */ = 0
-                    )
-    : m_league_size( league_size )
-    , m_team_size( team_size < q.shepherd_worker_size()
-                 ? team_size : q.shepherd_worker_size() )
-    , m_shepherd_iter( ( league_size + q.shepherd_size() - 1 ) / q.shepherd_size() )
-  {}
+  TeamPolicyInternal(Kokkos::Qthreads &q, const int league_size,
+                     const int team_size, const int /* vector_length */ = 0)
+      : m_league_size(league_size),
+        m_team_size(team_size < q.shepherd_worker_size()
+                        ? team_size
+                        : q.shepherd_worker_size()),
+        m_shepherd_iter((league_size + q.shepherd_size() - 1) /
+                        q.shepherd_size()) {}
 
   // TODO: Make sure this is correct.
   // One active team per shepherd.
-  TeamPolicyInternal( Kokkos::Qthreads & q
-                    , const int league_size
-                    , const Kokkos::AUTO_t & /* team_size_request */
-                    , const int /* vector_length */ = 0
-                    )
-    : m_league_size( league_size )
-    , m_team_size( q.shepherd_worker_size() )
-    , m_shepherd_iter( ( league_size + q.shepherd_size() - 1 ) / q.shepherd_size() )
-  {}
+  TeamPolicyInternal(Kokkos::Qthreads &q, const int league_size,
+                     const Kokkos::AUTO_t & /* team_size_request */
+                     ,
+                     const int /* vector_length */ = 0)
+      : m_league_size(league_size),
+        m_team_size(q.shepherd_worker_size()),
+        m_shepherd_iter((league_size + q.shepherd_size() - 1) /
+                        q.shepherd_size()) {}
 
   // One active team per shepherd.
-  TeamPolicyInternal( const int league_size
-                    , const int team_size
-                    , const int /* vector_length */ = 0
-                    )
-    : m_league_size( league_size )
-    , m_team_size( team_size < Qthreads::instance().shepherd_worker_size()
-                 ? team_size : Qthreads::instance().shepherd_worker_size() )
-    , m_shepherd_iter( ( league_size + Qthreads::instance().shepherd_size() - 1 ) / Qthreads::instance().shepherd_size() )
-  {}
+  TeamPolicyInternal(const int league_size, const int team_size,
+                     const int /* vector_length */ = 0)
+      : m_league_size(league_size),
+        m_team_size(team_size < Qthreads::instance().shepherd_worker_size()
+                        ? team_size
+                        : Qthreads::instance().shepherd_worker_size()),
+        m_shepherd_iter(
+            (league_size + Qthreads::instance().shepherd_size() - 1) /
+            Qthreads::instance().shepherd_size()) {}
 
   // TODO: Make sure this is correct.
   // One active team per shepherd.
-  TeamPolicyInternal( const int league_size
-                    , const Kokkos::AUTO_t & /* team_size_request */
-                    , const int /* vector_length */ = 0
-                    )
-    : m_league_size( league_size )
-    , m_team_size( Qthreads::instance().shepherd_worker_size() )
-    , m_shepherd_iter( ( league_size + Qthreads::instance().shepherd_size() - 1 ) / Qthreads::instance().shepherd_size() )
-  {}
+  TeamPolicyInternal(const int league_size,
+                     const Kokkos::AUTO_t & /* team_size_request */
+                     ,
+                     const int /* vector_length */ = 0)
+      : m_league_size(league_size),
+        m_team_size(Qthreads::instance().shepherd_worker_size()),
+        m_shepherd_iter(
+            (league_size + Qthreads::instance().shepherd_size() - 1) /
+            Qthreads::instance().shepherd_size()) {}
 
   // TODO: Doesn't do anything yet.  Fix this.
   /** \brief set chunk_size to a discrete value*/
-  inline TeamPolicyInternal set_chunk_size(typename traits::index_type chunk_size_) const {
+  inline TeamPolicyInternal set_chunk_size(
+      typename traits::index_type chunk_size_) const {
     TeamPolicyInternal p = *this;
-//    p.m_chunk_size = chunk_size_;
+    //    p.m_chunk_size = chunk_size_;
     return p;
   }
 
@@ -634,12 +677,11 @@ public:
   friend class Impl::QthreadsTeamPolicyMember;
 };
 
-} // namespace Impl
+}  // namespace Impl
 
-} // namespace Kokkos
+}  // namespace Kokkos
 
 //----------------------------------------------------------------------------
 
 #endif
-#endif // #define KOKKOS_QTHREADSEXEC_HPP
-
+#endif  // #define KOKKOS_QTHREADSEXEC_HPP
diff --git a/lib/kokkos/core/src/Qthreads/Kokkos_Qthreads_Parallel.hpp b/lib/kokkos/core/src/Qthreads/Kokkos_Qthreads_Parallel.hpp
index 7b1b63befe..8611818e27 100644
--- a/lib/kokkos/core/src/Qthreads/Kokkos_Qthreads_Parallel.hpp
+++ b/lib/kokkos/core/src/Qthreads/Kokkos_Qthreads_Parallel.hpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -45,7 +46,7 @@
 #define KOKKOS_QTHREADS_PARALLEL_HPP
 
 #include <Kokkos_Macros.hpp>
-#if defined( KOKKOS_ENABLE_QTHREADS )
+#if defined(KOKKOS_ENABLE_QTHREADS)
 
 #include <vector>
 
@@ -62,679 +63,691 @@ namespace Impl {
 
 //----------------------------------------------------------------------------
 
-template< class FunctorType , class ... Traits >
-class ParallelFor< FunctorType
-                 , Kokkos::RangePolicy< Traits ... >
-                 , Kokkos::Qthreads
-                 >
-{
-private:
+template <class FunctorType, class... Traits>
+class ParallelFor<FunctorType, Kokkos::RangePolicy<Traits...>,
+                  Kokkos::Qthreads> {
+ private:
+  typedef Kokkos::RangePolicy<Traits...> Policy;
 
-  typedef Kokkos::RangePolicy< Traits ... >  Policy ;
+  typedef typename Policy::work_tag WorkTag;
+  typedef typename Policy::member_type Member;
+  typedef typename Policy::WorkRange WorkRange;
 
-  typedef typename Policy::work_tag     WorkTag ;
-  typedef typename Policy::member_type  Member ;
-  typedef typename Policy::WorkRange    WorkRange ;
+  const FunctorType m_functor;
+  const Policy m_policy;
 
-  const FunctorType  m_functor ;
-  const Policy       m_policy ;
-
-  template< class TagType >
+  template <class TagType>
   inline static
-  typename std::enable_if< std::is_same< TagType , void >::value >::type
-  exec_range( const FunctorType & functor , const Member ibeg , const Member iend )
-    {
-      for ( Member i = ibeg ; i < iend ; ++i ) {
-        functor( i );
-      }
+      typename std::enable_if<std::is_same<TagType, void>::value>::type
+      exec_range(const FunctorType& functor, const Member ibeg,
+                 const Member iend) {
+    for (Member i = ibeg; i < iend; ++i) {
+      functor(i);
     }
+  }
 
-  template< class TagType >
+  template <class TagType>
   inline static
-  typename std::enable_if< ! std::is_same< TagType , void >::value >::type
-  exec_range( const FunctorType & functor , const Member ibeg , const Member iend )
-    {
-      const TagType t{} ;
-      for ( Member i = ibeg ; i < iend ; ++i ) {
-        functor( t , i );
-      }
+      typename std::enable_if<!std::is_same<TagType, void>::value>::type
+      exec_range(const FunctorType& functor, const Member ibeg,
+                 const Member iend) {
+    const TagType t{};
+    for (Member i = ibeg; i < iend; ++i) {
+      functor(t, i);
     }
+  }
 
   // Function is called once by every concurrent thread.
-  static void exec( QthreadsExec & exec , const void * arg )
-  {
-    const ParallelFor & self = * ((const ParallelFor *) arg );
+  static void exec(QthreadsExec& exec, const void* arg) {
+    const ParallelFor& self = *((const ParallelFor*)arg);
 
-    const WorkRange range( self.m_policy, exec.worker_rank(), exec.worker_size() );
+    const WorkRange range(self.m_policy, exec.worker_rank(),
+                          exec.worker_size());
 
-    ParallelFor::template exec_range< WorkTag > ( self.m_functor , range.begin() , range.end() );
+    ParallelFor::template exec_range<WorkTag>(self.m_functor, range.begin(),
+                                              range.end());
 
     // All threads wait for completion.
     exec.exec_all_barrier();
   }
 
-public:
+ public:
+  inline void execute() const {
+    Impl::QthreadsExec::exec_all(Qthreads::instance(), &ParallelFor::exec,
+                                 this);
+  }
 
-  inline
-  void execute() const
-    {
-      Impl::QthreadsExec::exec_all( Qthreads::instance() , & ParallelFor::exec , this );
-
-    }
-
-  ParallelFor( const FunctorType & arg_functor
-             , const Policy      & arg_policy
-             )
-    : m_functor( arg_functor )
-    , m_policy(  arg_policy )
-    { }
+  ParallelFor(const FunctorType& arg_functor, const Policy& arg_policy)
+      : m_functor(arg_functor), m_policy(arg_policy) {}
 };
 
 //----------------------------------------------------------------------------
 
-template< class FunctorType , class ReducerType , class ... Traits >
-class ParallelReduce< FunctorType
-                    , Kokkos::RangePolicy< Traits ... >
-                    , ReducerType
-                    , Kokkos::Qthreads
-                    >
-{
-private:
+template <class FunctorType, class ReducerType, class... Traits>
+class ParallelReduce<FunctorType, Kokkos::RangePolicy<Traits...>, ReducerType,
+                     Kokkos::Qthreads> {
+ private:
+  typedef Kokkos::RangePolicy<Traits...> Policy;
 
-  typedef Kokkos::RangePolicy< Traits ... >  Policy ;
+  typedef typename Policy::work_tag WorkTag;
+  typedef typename Policy::WorkRange WorkRange;
+  typedef typename Policy::member_type Member;
 
-  typedef typename Policy::work_tag     WorkTag ;
-  typedef typename Policy::WorkRange    WorkRange ;
-  typedef typename Policy::member_type  Member ;
-
-  typedef Kokkos::Impl::if_c< std::is_same<InvalidType, ReducerType>::value, FunctorType, ReducerType > ReducerConditional;
+  typedef Kokkos::Impl::if_c<std::is_same<InvalidType, ReducerType>::value,
+                             FunctorType, ReducerType>
+      ReducerConditional;
   typedef typename ReducerConditional::type ReducerTypeFwd;
-  typedef typename Kokkos::Impl::if_c< std::is_same<InvalidType, ReducerType>::value, WorkTag, void >::type WorkTagFwd;
+  typedef
+      typename Kokkos::Impl::if_c<std::is_same<InvalidType, ReducerType>::value,
+                                  WorkTag, void>::type WorkTagFwd;
 
   // Static Assert WorkTag void if ReducerType not InvalidType
 
-  typedef Kokkos::Impl::FunctorValueTraits< ReducerTypeFwd , WorkTagFwd > ValueTraits ;
-  typedef Kokkos::Impl::FunctorValueInit<   ReducerTypeFwd , WorkTagFwd > ValueInit ;
+  typedef Kokkos::Impl::FunctorValueTraits<ReducerTypeFwd, WorkTagFwd>
+      ValueTraits;
+  typedef Kokkos::Impl::FunctorValueInit<ReducerTypeFwd, WorkTagFwd> ValueInit;
 
-  typedef typename ValueTraits::pointer_type    pointer_type ;
-  typedef typename ValueTraits::reference_type  reference_type ;
+  typedef typename ValueTraits::pointer_type pointer_type;
+  typedef typename ValueTraits::reference_type reference_type;
 
-  const FunctorType   m_functor ;
-  const Policy        m_policy ;
-  const ReducerType   m_reducer ;
-  const pointer_type  m_result_ptr ;
+  const FunctorType m_functor;
+  const Policy m_policy;
+  const ReducerType m_reducer;
+  const pointer_type m_result_ptr;
 
-  template< class TagType >
+  template <class TagType>
   inline static
-  typename std::enable_if< std::is_same< TagType , void >::value >::type
-  exec_range( const FunctorType & functor
-            , const Member ibeg , const Member iend
-            , reference_type update )
-    {
-      for ( Member i = ibeg ; i < iend ; ++i ) {
-        functor( i , update );
-      }
+      typename std::enable_if<std::is_same<TagType, void>::value>::type
+      exec_range(const FunctorType& functor, const Member ibeg,
+                 const Member iend, reference_type update) {
+    for (Member i = ibeg; i < iend; ++i) {
+      functor(i, update);
     }
-
-  template< class TagType >
-  inline static
-  typename std::enable_if< ! std::is_same< TagType , void >::value >::type
-  exec_range( const FunctorType & functor
-            , const Member ibeg , const Member iend
-            , reference_type update )
-    {
-      const TagType t{} ;
-      for ( Member i = ibeg ; i < iend ; ++i ) {
-        functor( t , i , update );
-      }
-    }
-
-  static void exec( QthreadsExec & exec , const void * arg )
-  {
-    const ParallelReduce & self = * ((const ParallelReduce *) arg );
-
-    const WorkRange range( self.m_policy, exec.worker_rank(), exec.worker_size() );
-
-    ParallelReduce::template exec_range< WorkTag >(
-      self.m_functor, range.begin(), range.end(),
-      ValueInit::init( ReducerConditional::select(self.m_functor , self.m_reducer)
-                     , exec.exec_all_reduce_value() ) );
-
-    exec.template exec_all_reduce< FunctorType, ReducerType, WorkTag >( self.m_functor, self.m_reducer );
   }
 
-public:
+  template <class TagType>
+  inline static
+      typename std::enable_if<!std::is_same<TagType, void>::value>::type
+      exec_range(const FunctorType& functor, const Member ibeg,
+                 const Member iend, reference_type update) {
+    const TagType t{};
+    for (Member i = ibeg; i < iend; ++i) {
+      functor(t, i, update);
+    }
+  }
 
-  inline
-  void execute() const
-    {
-      QthreadsExec::resize_worker_scratch( ValueTraits::value_size( ReducerConditional::select(m_functor , m_reducer) ) , 0 );
-      Impl::QthreadsExec::exec_all( Qthreads::instance() , & ParallelReduce::exec , this );
+  static void exec(QthreadsExec& exec, const void* arg) {
+    const ParallelReduce& self = *((const ParallelReduce*)arg);
 
-      const pointer_type data = (pointer_type) QthreadsExec::exec_all_reduce_result();
+    const WorkRange range(self.m_policy, exec.worker_rank(),
+                          exec.worker_size());
 
-      Kokkos::Impl::FunctorFinal< ReducerTypeFwd , WorkTagFwd >::final( ReducerConditional::select(m_functor , m_reducer) , data );
+    ParallelReduce::template exec_range<WorkTag>(
+        self.m_functor, range.begin(), range.end(),
+        ValueInit::init(
+            ReducerConditional::select(self.m_functor, self.m_reducer),
+            exec.exec_all_reduce_value()));
 
-      if ( m_result_ptr ) {
-        const unsigned n = ValueTraits::value_count( ReducerConditional::select(m_functor , m_reducer) );
-        for ( unsigned i = 0 ; i < n ; ++i ) { m_result_ptr[i] = data[i]; }
+    exec.template exec_all_reduce<FunctorType, ReducerType, WorkTag>(
+        self.m_functor, self.m_reducer);
+  }
+
+ public:
+  inline void execute() const {
+    QthreadsExec::resize_worker_scratch(
+        ValueTraits::value_size(
+            ReducerConditional::select(m_functor, m_reducer)),
+        0);
+    Impl::QthreadsExec::exec_all(Qthreads::instance(), &ParallelReduce::exec,
+                                 this);
+
+    const pointer_type data =
+        (pointer_type)QthreadsExec::exec_all_reduce_result();
+
+    Kokkos::Impl::FunctorFinal<ReducerTypeFwd, WorkTagFwd>::final(
+        ReducerConditional::select(m_functor, m_reducer), data);
+
+    if (m_result_ptr) {
+      const unsigned n = ValueTraits::value_count(
+          ReducerConditional::select(m_functor, m_reducer));
+      for (unsigned i = 0; i < n; ++i) {
+        m_result_ptr[i] = data[i];
       }
     }
+  }
 
-  template< class ViewType >
-  ParallelReduce( const FunctorType  & arg_functor
-                , const Policy       & arg_policy
-                , const ViewType & arg_result_view
-                , typename std::enable_if<Kokkos::is_view< ViewType >::value &&
-                                          !Kokkos::is_reducer_type< ReducerType >::value
-                                          , void*>::type = NULL)
-    : m_functor( arg_functor )
-    , m_policy( arg_policy )
-    , m_reducer( InvalidType() )
-    , m_result_ptr( arg_result_view.data() )
-    { }
+  template <class ViewType>
+  ParallelReduce(
+      const FunctorType& arg_functor, const Policy& arg_policy,
+      const ViewType& arg_result_view,
+      typename std::enable_if<Kokkos::is_view<ViewType>::value &&
+                                  !Kokkos::is_reducer_type<ReducerType>::value,
+                              void*>::type = NULL)
+      : m_functor(arg_functor),
+        m_policy(arg_policy),
+        m_reducer(InvalidType()),
+        m_result_ptr(arg_result_view.data()) {}
 
-  ParallelReduce( const FunctorType & arg_functor
-                , Policy       arg_policy
-                , const ReducerType& reducer )
-    : m_functor( arg_functor )
-    , m_policy( arg_policy )
-    , m_reducer( reducer )
-    , m_result_ptr( reducer.result_view().data() )
-    { }
+  ParallelReduce(const FunctorType& arg_functor, Policy arg_policy,
+                 const ReducerType& reducer)
+      : m_functor(arg_functor),
+        m_policy(arg_policy),
+        m_reducer(reducer),
+        m_result_ptr(reducer.result_view().data()) {}
 };
 
 //----------------------------------------------------------------------------
 
-template< class FunctorType , class ... Properties >
-class ParallelFor< FunctorType
-                 , TeamPolicy< Properties ... >
-                 , Kokkos::Qthreads >
-{
-private:
+template <class FunctorType, class... Properties>
+class ParallelFor<FunctorType, TeamPolicy<Properties...>, Kokkos::Qthreads> {
+ private:
+  typedef Kokkos::Impl::TeamPolicyInternal<Kokkos::Qthreads, Properties...>
+      Policy;
+  typedef typename Policy::member_type Member;
+  typedef typename Policy::work_tag WorkTag;
 
-  typedef Kokkos::Impl::TeamPolicyInternal< Kokkos::Qthreads , Properties ... > Policy ;
-  typedef typename Policy::member_type  Member ;
-  typedef typename Policy::work_tag     WorkTag ;
+  const FunctorType m_functor;
+  const Policy m_policy;
 
-  const FunctorType  m_functor ;
-  const Policy       m_policy ;
-
-  template< class TagType >
+  template <class TagType>
   inline static
-  typename std::enable_if< std::is_same< TagType , void >::value >::type
-  exec_team( const FunctorType & functor , Member member )
-    {
-      while ( member ) {
-        functor( member );
-        member.team_barrier();
-        member.next_team();
-      }
+      typename std::enable_if<std::is_same<TagType, void>::value>::type
+      exec_team(const FunctorType& functor, Member member) {
+    while (member) {
+      functor(member);
+      member.team_barrier();
+      member.next_team();
     }
+  }
 
-  template< class TagType >
+  template <class TagType>
   inline static
-  typename std::enable_if< ! std::is_same< TagType , void >::value >::type
-  exec_team( const FunctorType & functor , Member member )
-    {
-      const TagType t{} ;
-      while ( member ) {
-        functor( t , member );
-        member.team_barrier();
-        member.next_team();
-      }
+      typename std::enable_if<!std::is_same<TagType, void>::value>::type
+      exec_team(const FunctorType& functor, Member member) {
+    const TagType t{};
+    while (member) {
+      functor(t, member);
+      member.team_barrier();
+      member.next_team();
     }
+  }
 
-  static void exec( QthreadsExec & exec , const void * arg )
-  {
-    const ParallelFor & self = * ((const ParallelFor *) arg );
+  static void exec(QthreadsExec& exec, const void* arg) {
+    const ParallelFor& self = *((const ParallelFor*)arg);
 
-    ParallelFor::template exec_team< WorkTag >
-      ( self.m_functor , Member( exec , self.m_policy ) );
+    ParallelFor::template exec_team<WorkTag>(self.m_functor,
+                                             Member(exec, self.m_policy));
 
     exec.exec_all_barrier();
   }
 
-public:
-
-  inline
-  void execute() const
-    {
-      QthreadsExec::resize_worker_scratch
-        ( /* reduction   memory */ 0
-        , /* team shared memory */ FunctorTeamShmemSize< FunctorType >::value( m_functor , m_policy.team_size() ) );
-      Impl::QthreadsExec::exec_all( Qthreads::instance() , & ParallelFor::exec , this );
-    }
-
-  ParallelFor( const FunctorType & arg_functor ,
-               const Policy      & arg_policy )
-    : m_functor( arg_functor )
-    , m_policy( arg_policy )
-    { }
-};
-
-//----------------------------------------------------------------------------
-
-template< class FunctorType , class ReducerType , class ... Properties >
-class ParallelReduce< FunctorType
-                    , TeamPolicy< Properties... >
-                    , ReducerType
-                    , Kokkos::Qthreads
-                    >
-{
-private:
-
-  typedef Kokkos::Impl::TeamPolicyInternal< Kokkos::Qthreads , Properties ... > Policy ;
-
-  typedef typename Policy::work_tag     WorkTag ;
-  typedef typename Policy::member_type  Member ;
-
-  typedef Kokkos::Impl::if_c< std::is_same<InvalidType,ReducerType>::value, FunctorType, ReducerType> ReducerConditional;
-  typedef typename ReducerConditional::type ReducerTypeFwd;
-  typedef typename Kokkos::Impl::if_c< std::is_same<InvalidType, ReducerType>::value, WorkTag, void >::type WorkTagFwd;
-
-  typedef Kokkos::Impl::FunctorValueTraits< ReducerTypeFwd , WorkTagFwd >  ValueTraits ;
-  typedef Kokkos::Impl::FunctorValueInit<   ReducerTypeFwd , WorkTagFwd >  ValueInit ;
-
-  typedef typename ValueTraits::pointer_type    pointer_type ;
-  typedef typename ValueTraits::reference_type  reference_type ;
-
-  const FunctorType  m_functor ;
-  const Policy       m_policy ;
-  const ReducerType  m_reducer ;
-  const pointer_type m_result_ptr ;
-
-  template< class TagType >
-  inline static
-  typename std::enable_if< std::is_same< TagType , void >::value >::type
-  exec_team( const FunctorType & functor , Member member , reference_type update )
-    {
-      while ( member ) {
-        functor( member , update );
-        member.team_barrier();
-        member.next_team();
-      }
-    }
-
-  template< class TagType >
-  inline static
-  typename std::enable_if< ! std::is_same< TagType , void >::value >::type
-  exec_team( const FunctorType & functor , Member member , reference_type update )
-    {
-      const TagType t{} ;
-      while ( member ) {
-        functor( t , member , update );
-        member.team_barrier();
-        member.next_team();
-      }
-    }
-
-  static void exec( QthreadsExec & exec , const void * arg )
-  {
-    const ParallelReduce & self = * ((const ParallelReduce *) arg );
-
-    ParallelReduce::template exec_team< WorkTag >
-      ( self.m_functor
-      , Member( exec , self.m_policy )
-      , ValueInit::init( ReducerConditional::select( self.m_functor , self.m_reducer )
-                       , exec.exec_all_reduce_value() ) );
-
-    exec.template exec_all_reduce< FunctorType, ReducerType, WorkTag >( self.m_functor, self.m_reducer );
+ public:
+  inline void execute() const {
+    QthreadsExec::resize_worker_scratch(
+        /* reduction   memory */ 0,
+        /* team shared memory */ FunctorTeamShmemSize<FunctorType>::value(
+            m_functor, m_policy.team_size()));
+    Impl::QthreadsExec::exec_all(Qthreads::instance(), &ParallelFor::exec,
+                                 this);
   }
 
-public:
+  ParallelFor(const FunctorType& arg_functor, const Policy& arg_policy)
+      : m_functor(arg_functor), m_policy(arg_policy) {}
+};
 
-  inline
-  void execute() const
-    {
-      QthreadsExec::resize_worker_scratch
-        ( /* reduction   memory */ ValueTraits::value_size( ReducerConditional::select(m_functor , m_reducer) )
-        , /* team shared memory */ FunctorTeamShmemSize< FunctorType >::value( m_functor , m_policy.team_size() ) );
+//----------------------------------------------------------------------------
 
-      Impl::QthreadsExec::exec_all( Qthreads::instance() , & ParallelReduce::exec , this );
+template <class FunctorType, class ReducerType, class... Properties>
+class ParallelReduce<FunctorType, TeamPolicy<Properties...>, ReducerType,
+                     Kokkos::Qthreads> {
+ private:
+  typedef Kokkos::Impl::TeamPolicyInternal<Kokkos::Qthreads, Properties...>
+      Policy;
 
-      const pointer_type data = (pointer_type) QthreadsExec::exec_all_reduce_result();
+  typedef typename Policy::work_tag WorkTag;
+  typedef typename Policy::member_type Member;
 
-      Kokkos::Impl::FunctorFinal< ReducerTypeFwd , WorkTagFwd >::final( ReducerConditional::select(m_functor , m_reducer), data );
+  typedef Kokkos::Impl::if_c<std::is_same<InvalidType, ReducerType>::value,
+                             FunctorType, ReducerType>
+      ReducerConditional;
+  typedef typename ReducerConditional::type ReducerTypeFwd;
+  typedef
+      typename Kokkos::Impl::if_c<std::is_same<InvalidType, ReducerType>::value,
+                                  WorkTag, void>::type WorkTagFwd;
 
-      if ( m_result_ptr ) {
-        const unsigned n = ValueTraits::value_count( ReducerConditional::select(m_functor , m_reducer) );
-        for ( unsigned i = 0 ; i < n ; ++i ) { m_result_ptr[i] = data[i]; }
+  typedef Kokkos::Impl::FunctorValueTraits<ReducerTypeFwd, WorkTagFwd>
+      ValueTraits;
+  typedef Kokkos::Impl::FunctorValueInit<ReducerTypeFwd, WorkTagFwd> ValueInit;
+
+  typedef typename ValueTraits::pointer_type pointer_type;
+  typedef typename ValueTraits::reference_type reference_type;
+
+  const FunctorType m_functor;
+  const Policy m_policy;
+  const ReducerType m_reducer;
+  const pointer_type m_result_ptr;
+
+  template <class TagType>
+  inline static
+      typename std::enable_if<std::is_same<TagType, void>::value>::type
+      exec_team(const FunctorType& functor, Member member,
+                reference_type update) {
+    while (member) {
+      functor(member, update);
+      member.team_barrier();
+      member.next_team();
+    }
+  }
+
+  template <class TagType>
+  inline static
+      typename std::enable_if<!std::is_same<TagType, void>::value>::type
+      exec_team(const FunctorType& functor, Member member,
+                reference_type update) {
+    const TagType t{};
+    while (member) {
+      functor(t, member, update);
+      member.team_barrier();
+      member.next_team();
+    }
+  }
+
+  static void exec(QthreadsExec& exec, const void* arg) {
+    const ParallelReduce& self = *((const ParallelReduce*)arg);
+
+    ParallelReduce::template exec_team<WorkTag>(
+        self.m_functor, Member(exec, self.m_policy),
+        ValueInit::init(
+            ReducerConditional::select(self.m_functor, self.m_reducer),
+            exec.exec_all_reduce_value()));
+
+    exec.template exec_all_reduce<FunctorType, ReducerType, WorkTag>(
+        self.m_functor, self.m_reducer);
+  }
+
+ public:
+  inline void execute() const {
+    QthreadsExec::resize_worker_scratch(
+        /* reduction   memory */ ValueTraits::value_size(
+            ReducerConditional::select(m_functor, m_reducer)),
+        /* team shared memory */ FunctorTeamShmemSize<FunctorType>::value(
+            m_functor, m_policy.team_size()));
+
+    Impl::QthreadsExec::exec_all(Qthreads::instance(), &ParallelReduce::exec,
+                                 this);
+
+    const pointer_type data =
+        (pointer_type)QthreadsExec::exec_all_reduce_result();
+
+    Kokkos::Impl::FunctorFinal<ReducerTypeFwd, WorkTagFwd>::final(
+        ReducerConditional::select(m_functor, m_reducer), data);
+
+    if (m_result_ptr) {
+      const unsigned n = ValueTraits::value_count(
+          ReducerConditional::select(m_functor, m_reducer));
+      for (unsigned i = 0; i < n; ++i) {
+        m_result_ptr[i] = data[i];
       }
     }
+  }
 
-  template< class ViewType >
-  ParallelReduce( const FunctorType & arg_functor
-                , const Policy      & arg_policy
-                , const ViewType    & arg_result
-                , typename std::enable_if<Kokkos::is_view< ViewType >::value &&
-                                          !Kokkos::is_reducer_type< ReducerType >::value
-                                          , void*>::type = NULL)
-    : m_functor( arg_functor )
-    , m_policy( arg_policy )
-    , m_reducer( InvalidType() )
-    , m_result_ptr( arg_result.ptr_on_device() )
-    { }
+  template <class ViewType>
+  ParallelReduce(
+      const FunctorType& arg_functor, const Policy& arg_policy,
+      const ViewType& arg_result,
+      typename std::enable_if<Kokkos::is_view<ViewType>::value &&
+                                  !Kokkos::is_reducer_type<ReducerType>::value,
+                              void*>::type = NULL)
+      : m_functor(arg_functor),
+        m_policy(arg_policy),
+        m_reducer(InvalidType()),
+        m_result_ptr(arg_result.ptr_on_device()) {}
 
-  inline
-  ParallelReduce( const FunctorType & arg_functor
-                , Policy       arg_policy
-                , const ReducerType& reducer )
-  : m_functor( arg_functor )
-  , m_policy( arg_policy )
-  , m_reducer( reducer )
-  , m_result_ptr( reducer.result_view().data() )
-  { }
+  inline ParallelReduce(const FunctorType& arg_functor, Policy arg_policy,
+                        const ReducerType& reducer)
+      : m_functor(arg_functor),
+        m_policy(arg_policy),
+        m_reducer(reducer),
+        m_result_ptr(reducer.result_view().data()) {}
 };
 
 //----------------------------------------------------------------------------
 //----------------------------------------------------------------------------
 
-template< class FunctorType , class ... Traits >
-class ParallelScan< FunctorType
-                  , Kokkos::RangePolicy< Traits ... >
-                  , Kokkos::Qthreads
-                  >
-{
-private:
+template <class FunctorType, class... Traits>
+class ParallelScan<FunctorType, Kokkos::RangePolicy<Traits...>,
+                   Kokkos::Qthreads> {
+ private:
+  typedef Kokkos::RangePolicy<Traits...> Policy;
 
-  typedef Kokkos::RangePolicy< Traits ... >  Policy ;
+  typedef typename Policy::work_tag WorkTag;
+  typedef typename Policy::WorkRange WorkRange;
+  typedef typename Policy::member_type Member;
 
-  typedef typename Policy::work_tag     WorkTag ;
-  typedef typename Policy::WorkRange    WorkRange ;
-  typedef typename Policy::member_type  Member ;
+  typedef Kokkos::Impl::FunctorValueTraits<FunctorType, WorkTag> ValueTraits;
+  typedef Kokkos::Impl::FunctorValueInit<FunctorType, WorkTag> ValueInit;
 
-  typedef Kokkos::Impl::FunctorValueTraits< FunctorType, WorkTag > ValueTraits ;
-  typedef Kokkos::Impl::FunctorValueInit<   FunctorType, WorkTag > ValueInit ;
+  typedef typename ValueTraits::pointer_type pointer_type;
+  typedef typename ValueTraits::reference_type reference_type;
 
-  typedef typename ValueTraits::pointer_type    pointer_type ;
-  typedef typename ValueTraits::reference_type  reference_type ;
+  const FunctorType m_functor;
+  const Policy m_policy;
 
-  const FunctorType  m_functor ;
-  const Policy       m_policy ;
-
-  template< class TagType >
+  template <class TagType>
   inline static
-  typename std::enable_if< std::is_same< TagType , void >::value >::type
-  exec_range( const FunctorType & functor
-            , const Member ibeg , const Member iend
-            , reference_type update , const bool final )
-    {
-      for ( Member i = ibeg ; i < iend ; ++i ) {
-        functor( i , update , final );
-      }
+      typename std::enable_if<std::is_same<TagType, void>::value>::type
+      exec_range(const FunctorType& functor, const Member ibeg,
+                 const Member iend, reference_type update, const bool final) {
+    for (Member i = ibeg; i < iend; ++i) {
+      functor(i, update, final);
     }
+  }
 
-  template< class TagType >
+  template <class TagType>
   inline static
-  typename std::enable_if< ! std::is_same< TagType , void >::value >::type
-  exec_range( const FunctorType & functor
-            , const Member ibeg , const Member iend
-            , reference_type update , const bool final )
-    {
-      const TagType t{} ;
-      for ( Member i = ibeg ; i < iend ; ++i ) {
-        functor( t , i , update , final );
-      }
+      typename std::enable_if<!std::is_same<TagType, void>::value>::type
+      exec_range(const FunctorType& functor, const Member ibeg,
+                 const Member iend, reference_type update, const bool final) {
+    const TagType t{};
+    for (Member i = ibeg; i < iend; ++i) {
+      functor(t, i, update, final);
     }
+  }
 
-  static void exec( QthreadsExec & exec , const void * arg )
-  {
-    const ParallelScan & self = * ((const ParallelScan *) arg );
+  static void exec(QthreadsExec& exec, const void* arg) {
+    const ParallelScan& self = *((const ParallelScan*)arg);
 
-    const WorkRange range( self.m_policy , exec.worker_rank() , exec.worker_size() );
+    const WorkRange range(self.m_policy, exec.worker_rank(),
+                          exec.worker_size());
 
     // Initialize thread-local value
-    reference_type update = ValueInit::init( self.m_functor , exec.exec_all_reduce_value() );
+    reference_type update =
+        ValueInit::init(self.m_functor, exec.exec_all_reduce_value());
 
-    ParallelScan::template exec_range< WorkTag >( self.m_functor, range.begin() , range.end() , update , false );
+    ParallelScan::template exec_range<WorkTag>(self.m_functor, range.begin(),
+                                               range.end(), update, false);
 
-    exec.template exec_all_scan< FunctorType , typename Policy::work_tag >( self.m_functor );
+    exec.template exec_all_scan<FunctorType, typename Policy::work_tag>(
+        self.m_functor);
 
-    ParallelScan::template exec_range< WorkTag >( self.m_functor , range.begin() , range.end() , update , true );
+    ParallelScan::template exec_range<WorkTag>(self.m_functor, range.begin(),
+                                               range.end(), update, true);
 
     exec.exec_all_barrier();
   }
 
-public:
+ public:
+  inline void execute() const {
+    QthreadsExec::resize_worker_scratch(ValueTraits::value_size(m_functor), 0);
+    Impl::QthreadsExec::exec_all(Qthreads::instance(), &ParallelScan::exec,
+                                 this);
+  }
 
-  inline
-  void execute() const
-    {
-      QthreadsExec::resize_worker_scratch( ValueTraits::value_size( m_functor ) , 0 );
-      Impl::QthreadsExec::exec_all( Qthreads::instance() , & ParallelScan::exec , this );
-    }
-
-  ParallelScan( const FunctorType & arg_functor
-              , const Policy      & arg_policy
-              )
-    : m_functor( arg_functor )
-    , m_policy( arg_policy )
-    {
-    }
+  ParallelScan(const FunctorType& arg_functor, const Policy& arg_policy)
+      : m_functor(arg_functor), m_policy(arg_policy) {}
 };
 
-} // namespace Impl
+}  // namespace Impl
 
-} // namespace Kokkos
+}  // namespace Kokkos
 
 //----------------------------------------------------------------------------
 //----------------------------------------------------------------------------
 
 namespace Kokkos {
 
-template< typename iType >
+template <typename iType>
 KOKKOS_INLINE_FUNCTION
-Impl::TeamThreadRangeBoundariesStruct< iType, Impl::QthreadsTeamPolicyMember >
-TeamThreadRange( const Impl::QthreadsTeamPolicyMember& thread, const iType& count )
-{
-  return Impl::TeamThreadRangeBoundariesStruct< iType, Impl::QthreadsTeamPolicyMember >( thread, count );
+    Impl::TeamThreadRangeBoundariesStruct<iType, Impl::QthreadsTeamPolicyMember>
+    TeamThreadRange(const Impl::QthreadsTeamPolicyMember& thread,
+                    const iType& count) {
+  return Impl::TeamThreadRangeBoundariesStruct<iType,
+                                               Impl::QthreadsTeamPolicyMember>(
+      thread, count);
 }
 
-template< typename iType1, typename iType2 >
-KOKKOS_INLINE_FUNCTION
-Impl::TeamThreadRangeBoundariesStruct< typename std::common_type< iType1, iType2 >::type,
-                                       Impl::QthreadsTeamPolicyMember >
-TeamThreadRange( const Impl::QthreadsTeamPolicyMember& thread, const iType1 & begin, const iType2 & end )
-{
-  typedef typename std::common_type< iType1, iType2 >::type iType;
-  return Impl::TeamThreadRangeBoundariesStruct< iType, Impl::QthreadsTeamPolicyMember >( thread, iType(begin), iType(end) );
+template <typename iType1, typename iType2>
+KOKKOS_INLINE_FUNCTION Impl::TeamThreadRangeBoundariesStruct<
+    typename std::common_type<iType1, iType2>::type,
+    Impl::QthreadsTeamPolicyMember>
+TeamThreadRange(const Impl::QthreadsTeamPolicyMember& thread,
+                const iType1& begin, const iType2& end) {
+  typedef typename std::common_type<iType1, iType2>::type iType;
+  return Impl::TeamThreadRangeBoundariesStruct<iType,
+                                               Impl::QthreadsTeamPolicyMember>(
+      thread, iType(begin), iType(end));
 }
 
-template<typename iType>
-KOKKOS_INLINE_FUNCTION
-Impl::ThreadVectorRangeBoundariesStruct<iType,Impl::QthreadsTeamPolicyMember >
-  ThreadVectorRange(const Impl::QthreadsTeamPolicyMember& thread, const iType& count) {
-  return Impl::ThreadVectorRangeBoundariesStruct<iType,Impl::QthreadsTeamPolicyMember >(thread,count);
+template <typename iType>
+KOKKOS_INLINE_FUNCTION Impl::ThreadVectorRangeBoundariesStruct<
+    iType, Impl::QthreadsTeamPolicyMember>
+ThreadVectorRange(const Impl::QthreadsTeamPolicyMember& thread,
+                  const iType& count) {
+  return Impl::ThreadVectorRangeBoundariesStruct<
+      iType, Impl::QthreadsTeamPolicyMember>(thread, count);
 }
 
-template<typename iType>
-KOKKOS_INLINE_FUNCTION
-Impl::ThreadVectorRangeBoundariesStruct<iType,Impl::QthreadsTeamPolicyMember >
-  ThreadVectorRange(const Impl::QthreadsTeamPolicyMember& thread, const iType& arg_begin, const iType& arg_end) {
-  return Impl::ThreadVectorRangeBoundariesStruct<iType,Impl::QthreadsTeamPolicyMember >(thread,arg_begin,arg_end);
+template <typename iType>
+KOKKOS_INLINE_FUNCTION Impl::ThreadVectorRangeBoundariesStruct<
+    iType, Impl::QthreadsTeamPolicyMember>
+ThreadVectorRange(const Impl::QthreadsTeamPolicyMember& thread,
+                  const iType& arg_begin, const iType& arg_end) {
+  return Impl::ThreadVectorRangeBoundariesStruct<
+      iType, Impl::QthreadsTeamPolicyMember>(thread, arg_begin, arg_end);
 }
 
 KOKKOS_INLINE_FUNCTION
-Impl::ThreadSingleStruct<Impl::QthreadsTeamPolicyMember> PerTeam(const Impl::QthreadsTeamPolicyMember& thread) {
+Impl::ThreadSingleStruct<Impl::QthreadsTeamPolicyMember> PerTeam(
+    const Impl::QthreadsTeamPolicyMember& thread) {
   return Impl::ThreadSingleStruct<Impl::QthreadsTeamPolicyMember>(thread);
 }
 
 KOKKOS_INLINE_FUNCTION
-Impl::VectorSingleStruct<Impl::QthreadsTeamPolicyMember> PerThread(const Impl::QthreadsTeamPolicyMember& thread) {
+Impl::VectorSingleStruct<Impl::QthreadsTeamPolicyMember> PerThread(
+    const Impl::QthreadsTeamPolicyMember& thread) {
   return Impl::VectorSingleStruct<Impl::QthreadsTeamPolicyMember>(thread);
 }
 
-/** \brief  Inter-thread parallel_for. Executes lambda(iType i) for each i=0..N-1.
+/** \brief  Inter-thread parallel_for. Executes lambda(iType i) for each
+ * i=0..N-1.
  *
  * The range i=0..N-1 is mapped to all threads of the the calling thread team.
  * This functionality requires C++11 support.*/
-template<typename iType, class Lambda>
-KOKKOS_INLINE_FUNCTION
-void parallel_for(const Impl::TeamThreadRangeBoundariesStruct<iType,Impl::QthreadsTeamPolicyMember>& loop_boundaries, const Lambda& lambda) {
-  for( iType i = loop_boundaries.start; i < loop_boundaries.end; i+=loop_boundaries.increment)
+template <typename iType, class Lambda>
+KOKKOS_INLINE_FUNCTION void parallel_for(
+    const Impl::TeamThreadRangeBoundariesStruct<
+        iType, Impl::QthreadsTeamPolicyMember>& loop_boundaries,
+    const Lambda& lambda) {
+  for (iType i = loop_boundaries.start; i < loop_boundaries.end;
+       i += loop_boundaries.increment)
     lambda(i);
 }
 
-/** \brief  Inter-thread vector parallel_reduce. Executes lambda(iType i, ValueType & val) for each i=0..N-1.
+/** \brief  Inter-thread vector parallel_reduce. Executes lambda(iType i,
+ * ValueType & val) for each i=0..N-1.
  *
- * The range i=0..N-1 is mapped to all threads of the the calling thread team and a summation of
- * val is performed and put into result. This functionality requires C++11 support.*/
-template< typename iType, class Lambda, typename ValueType >
-KOKKOS_INLINE_FUNCTION
-void parallel_reduce(const Impl::TeamThreadRangeBoundariesStruct<iType,Impl::QthreadsTeamPolicyMember>& loop_boundaries,
-                     const Lambda & lambda, ValueType& result) {
-
+ * The range i=0..N-1 is mapped to all threads of the the calling thread team
+ * and a summation of val is performed and put into result. This functionality
+ * requires C++11 support.*/
+template <typename iType, class Lambda, typename ValueType>
+KOKKOS_INLINE_FUNCTION void parallel_reduce(
+    const Impl::TeamThreadRangeBoundariesStruct<
+        iType, Impl::QthreadsTeamPolicyMember>& loop_boundaries,
+    const Lambda& lambda, ValueType& result) {
   result = ValueType();
 
-  for( iType i = loop_boundaries.start; i < loop_boundaries.end; i+=loop_boundaries.increment) {
+  for (iType i = loop_boundaries.start; i < loop_boundaries.end;
+       i += loop_boundaries.increment) {
     ValueType tmp = ValueType();
-    lambda(i,tmp);
-    result+=tmp;
+    lambda(i, tmp);
+    result += tmp;
   }
 
-  result = loop_boundaries.thread.team_reduce(result,Impl::JoinAdd<ValueType>());
+  result =
+      loop_boundaries.thread.team_reduce(result, Impl::JoinAdd<ValueType>());
 }
 
-
-/** \brief  Intra-thread vector parallel_reduce. Executes lambda(iType i, ValueType & val) for each i=0..N-1.
+/** \brief  Intra-thread vector parallel_reduce. Executes lambda(iType i,
+ * ValueType & val) for each i=0..N-1.
  *
- * The range i=0..N-1 is mapped to all vector lanes of the the calling thread and a reduction of
- * val is performed using JoinType(ValueType& val, const ValueType& update) and put into init_result.
- * The input value of init_result is used as initializer for temporary variables of ValueType. Therefore
- * the input value should be the neutral element with respect to the join operation (e.g. '0 for +-' or
- * '1 for *'). This functionality requires C++11 support.*/
-template< typename iType, class Lambda, typename ValueType, class JoinType >
-KOKKOS_INLINE_FUNCTION
-void parallel_reduce(const Impl::TeamThreadRangeBoundariesStruct<iType,Impl::QthreadsTeamPolicyMember>& loop_boundaries,
-                     const Lambda & lambda, const JoinType& join, ValueType& init_result) {
-
+ * The range i=0..N-1 is mapped to all vector lanes of the the calling thread
+ * and a reduction of val is performed using JoinType(ValueType& val, const
+ * ValueType& update) and put into init_result. The input value of init_result
+ * is used as initializer for temporary variables of ValueType. Therefore the
+ * input value should be the neutral element with respect to the join operation
+ * (e.g. '0 for +-' or '1 for *'). This functionality requires C++11 support.*/
+template <typename iType, class Lambda, typename ValueType, class JoinType>
+KOKKOS_INLINE_FUNCTION void parallel_reduce(
+    const Impl::TeamThreadRangeBoundariesStruct<
+        iType, Impl::QthreadsTeamPolicyMember>& loop_boundaries,
+    const Lambda& lambda, const JoinType& join, ValueType& init_result) {
   ValueType result = init_result;
 
-  for( iType i = loop_boundaries.start; i < loop_boundaries.end; i+=loop_boundaries.increment) {
+  for (iType i = loop_boundaries.start; i < loop_boundaries.end;
+       i += loop_boundaries.increment) {
     ValueType tmp = ValueType();
-    lambda(i,tmp);
-    join(result,tmp);
+    lambda(i, tmp);
+    join(result, tmp);
   }
 
-  init_result = loop_boundaries.thread.team_reduce(result,Impl::JoinLambdaAdapter<ValueType,JoinType>(join));
+  init_result = loop_boundaries.thread.team_reduce(
+      result, Impl::JoinLambdaAdapter<ValueType, JoinType>(join));
 }
 
-/** \brief  Intra-thread vector parallel_for. Executes lambda(iType i) for each i=0..N-1.
+/** \brief  Intra-thread vector parallel_for. Executes lambda(iType i) for each
+ * i=0..N-1.
  *
  * The range i=0..N-1 is mapped to all vector lanes of the the calling thread.
  * This functionality requires C++11 support.*/
-template<typename iType, class Lambda>
-KOKKOS_INLINE_FUNCTION
-void parallel_for(const Impl::ThreadVectorRangeBoundariesStruct<iType,Impl::QthreadsTeamPolicyMember >&
-    loop_boundaries, const Lambda& lambda) {
-  #ifdef KOKKOS_ENABLE_PRAGMA_IVDEP
-  #pragma ivdep
-  #endif
-  for( iType i = loop_boundaries.start; i < loop_boundaries.end; i+=loop_boundaries.increment)
+template <typename iType, class Lambda>
+KOKKOS_INLINE_FUNCTION void parallel_for(
+    const Impl::ThreadVectorRangeBoundariesStruct<
+        iType, Impl::QthreadsTeamPolicyMember>& loop_boundaries,
+    const Lambda& lambda) {
+#ifdef KOKKOS_ENABLE_PRAGMA_IVDEP
+#pragma ivdep
+#endif
+  for (iType i = loop_boundaries.start; i < loop_boundaries.end;
+       i += loop_boundaries.increment)
     lambda(i);
 }
 
-/** \brief  Intra-thread vector parallel_reduce. Executes lambda(iType i, ValueType & val) for each i=0..N-1.
+/** \brief  Intra-thread vector parallel_reduce. Executes lambda(iType i,
+ * ValueType & val) for each i=0..N-1.
  *
- * The range i=0..N-1 is mapped to all vector lanes of the the calling thread and a summation of
- * val is performed and put into result. This functionality requires C++11 support.*/
-template< typename iType, class Lambda, typename ValueType >
-KOKKOS_INLINE_FUNCTION
-void parallel_reduce(const Impl::ThreadVectorRangeBoundariesStruct<iType,Impl::QthreadsTeamPolicyMember >&
-      loop_boundaries, const Lambda & lambda, ValueType& result) {
+ * The range i=0..N-1 is mapped to all vector lanes of the the calling thread
+ * and a summation of val is performed and put into result. This functionality
+ * requires C++11 support.*/
+template <typename iType, class Lambda, typename ValueType>
+KOKKOS_INLINE_FUNCTION void parallel_reduce(
+    const Impl::ThreadVectorRangeBoundariesStruct<
+        iType, Impl::QthreadsTeamPolicyMember>& loop_boundaries,
+    const Lambda& lambda, ValueType& result) {
   result = ValueType();
 #ifdef KOKKOS_ENABLE_PRAGMA_IVDEP
 #pragma ivdep
 #endif
-  for( iType i = loop_boundaries.start; i < loop_boundaries.end; i+=loop_boundaries.increment) {
+  for (iType i = loop_boundaries.start; i < loop_boundaries.end;
+       i += loop_boundaries.increment) {
     ValueType tmp = ValueType();
-    lambda(i,tmp);
-    result+=tmp;
+    lambda(i, tmp);
+    result += tmp;
   }
 }
 
-/** \brief  Intra-thread vector parallel_reduce. Executes lambda(iType i, ValueType & val) for each i=0..N-1.
+/** \brief  Intra-thread vector parallel_reduce. Executes lambda(iType i,
+ * ValueType & val) for each i=0..N-1.
  *
- * The range i=0..N-1 is mapped to all vector lanes of the the calling thread and a reduction of
- * val is performed using JoinType(ValueType& val, const ValueType& update) and put into init_result.
- * The input value of init_result is used as initializer for temporary variables of ValueType. Therefore
- * the input value should be the neutral element with respect to the join operation (e.g. '0 for +-' or
- * '1 for *'). This functionality requires C++11 support.*/
-template< typename iType, class Lambda, typename ValueType, class JoinType >
-KOKKOS_INLINE_FUNCTION
-void parallel_reduce(const Impl::ThreadVectorRangeBoundariesStruct<iType,Impl::QthreadsTeamPolicyMember >&
-      loop_boundaries, const Lambda & lambda, const JoinType& join, ValueType& init_result) {
-
+ * The range i=0..N-1 is mapped to all vector lanes of the the calling thread
+ * and a reduction of val is performed using JoinType(ValueType& val, const
+ * ValueType& update) and put into init_result. The input value of init_result
+ * is used as initializer for temporary variables of ValueType. Therefore the
+ * input value should be the neutral element with respect to the join operation
+ * (e.g. '0 for +-' or '1 for *'). This functionality requires C++11 support.*/
+template <typename iType, class Lambda, typename ValueType, class JoinType>
+KOKKOS_INLINE_FUNCTION void parallel_reduce(
+    const Impl::ThreadVectorRangeBoundariesStruct<
+        iType, Impl::QthreadsTeamPolicyMember>& loop_boundaries,
+    const Lambda& lambda, const JoinType& join, ValueType& init_result) {
   ValueType result = init_result;
 #ifdef KOKKOS_ENABLE_PRAGMA_IVDEP
 #pragma ivdep
 #endif
-  for( iType i = loop_boundaries.start; i < loop_boundaries.end; i+=loop_boundaries.increment) {
+  for (iType i = loop_boundaries.start; i < loop_boundaries.end;
+       i += loop_boundaries.increment) {
     ValueType tmp = ValueType();
-    lambda(i,tmp);
-    join(result,tmp);
+    lambda(i, tmp);
+    join(result, tmp);
   }
   init_result = result;
 }
 
-/** \brief  Intra-thread vector parallel exclusive prefix sum. Executes lambda(iType i, ValueType & val, bool final)
- *          for each i=0..N-1.
+/** \brief  Intra-thread vector parallel exclusive prefix sum. Executes
+ * lambda(iType i, ValueType & val, bool final) for each i=0..N-1.
  *
- * The range i=0..N-1 is mapped to all vector lanes in the thread and a scan operation is performed.
- * Depending on the target execution space the operator might be called twice: once with final=false
- * and once with final=true. When final==true val contains the prefix sum value. The contribution of this
- * "i" needs to be added to val no matter whether final==true or not. In a serial execution
- * (i.e. team_size==1) the operator is only called once with final==true. Scan_val will be set
- * to the final sum value over all vector lanes.
- * This functionality requires C++11 support.*/
-template< typename iType, class FunctorType >
-KOKKOS_INLINE_FUNCTION
-void parallel_scan(const Impl::ThreadVectorRangeBoundariesStruct<iType,Impl::QthreadsTeamPolicyMember >&
-      loop_boundaries, const FunctorType & lambda) {
-
-  typedef Kokkos::Impl::FunctorValueTraits< FunctorType , void > ValueTraits ;
-  typedef typename ValueTraits::value_type value_type ;
+ * The range i=0..N-1 is mapped to all vector lanes in the thread and a scan
+ * operation is performed. Depending on the target execution space the operator
+ * might be called twice: once with final=false and once with final=true. When
+ * final==true val contains the prefix sum value. The contribution of this "i"
+ * needs to be added to val no matter whether final==true or not. In a serial
+ * execution (i.e. team_size==1) the operator is only called once with
+ * final==true. Scan_val will be set to the final sum value over all vector
+ * lanes. This functionality requires C++11 support.*/
+template <typename iType, class FunctorType>
+KOKKOS_INLINE_FUNCTION void parallel_scan(
+    const Impl::ThreadVectorRangeBoundariesStruct<
+        iType, Impl::QthreadsTeamPolicyMember>& loop_boundaries,
+    const FunctorType& lambda) {
+  typedef Kokkos::Impl::FunctorValueTraits<FunctorType, void> ValueTraits;
+  typedef typename ValueTraits::value_type value_type;
 
   value_type scan_val = value_type();
 
 #ifdef KOKKOS_ENABLE_PRAGMA_IVDEP
 #pragma ivdep
 #endif
-  for( iType i = loop_boundaries.start; i < loop_boundaries.end; i+=loop_boundaries.increment) {
-    lambda(i,scan_val,true);
+  for (iType i = loop_boundaries.start; i < loop_boundaries.end;
+       i += loop_boundaries.increment) {
+    lambda(i, scan_val, true);
   }
 }
 
-template<class FunctorType>
-KOKKOS_INLINE_FUNCTION
-void single(const Impl::VectorSingleStruct<Impl::QthreadsTeamPolicyMember>& single_struct, const FunctorType& lambda) {
+template <class FunctorType>
+KOKKOS_INLINE_FUNCTION void single(
+    const Impl::VectorSingleStruct<Impl::QthreadsTeamPolicyMember>&
+        single_struct,
+    const FunctorType& lambda) {
   lambda();
 }
 
-template<class FunctorType>
-KOKKOS_INLINE_FUNCTION
-void single(const Impl::ThreadSingleStruct<Impl::QthreadsTeamPolicyMember>& single_struct, const FunctorType& lambda) {
-  if(single_struct.team_member.team_rank()==0) lambda();
+template <class FunctorType>
+KOKKOS_INLINE_FUNCTION void single(
+    const Impl::ThreadSingleStruct<Impl::QthreadsTeamPolicyMember>&
+        single_struct,
+    const FunctorType& lambda) {
+  if (single_struct.team_member.team_rank() == 0) lambda();
 }
 
-template<class FunctorType, class ValueType>
-KOKKOS_INLINE_FUNCTION
-void single(const Impl::VectorSingleStruct<Impl::QthreadsTeamPolicyMember>& single_struct, const FunctorType& lambda, ValueType& val) {
+template <class FunctorType, class ValueType>
+KOKKOS_INLINE_FUNCTION void single(
+    const Impl::VectorSingleStruct<Impl::QthreadsTeamPolicyMember>&
+        single_struct,
+    const FunctorType& lambda, ValueType& val) {
   lambda(val);
 }
 
-template<class FunctorType, class ValueType>
-KOKKOS_INLINE_FUNCTION
-void single(const Impl::ThreadSingleStruct<Impl::QthreadsTeamPolicyMember>& single_struct, const FunctorType& lambda, ValueType& val) {
-  if(single_struct.team_member.team_rank()==0) {
+template <class FunctorType, class ValueType>
+KOKKOS_INLINE_FUNCTION void single(
+    const Impl::ThreadSingleStruct<Impl::QthreadsTeamPolicyMember>&
+        single_struct,
+    const FunctorType& lambda, ValueType& val) {
+  if (single_struct.team_member.team_rank() == 0) {
     lambda(val);
   }
-  single_struct.team_member.team_broadcast(val,0);
+  single_struct.team_member.team_broadcast(val, 0);
 }
 
-} // namespace Kokkos
+}  // namespace Kokkos
 
 #endif
 #endif /* #define KOKKOS_QTHREADS_PARALLEL_HPP */
-
diff --git a/lib/kokkos/core/src/Qthreads/Kokkos_Qthreads_Task.cpp b/lib/kokkos/core/src/Qthreads/Kokkos_Qthreads_Task.cpp
index 52f57f5e45..b3a903494a 100644
--- a/lib/kokkos/core/src/Qthreads/Kokkos_Qthreads_Task.cpp
+++ b/lib/kokkos/core/src/Qthreads/Kokkos_Qthreads_Task.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -42,7 +43,7 @@
 */
 
 #include <Kokkos_Macros.hpp>
-#if defined( KOKKOS_ENABLE_QTHREADS ) && defined( KOKKOS_ENABLE_TASKPOLICY )
+#if defined(KOKKOS_ENABLE_QTHREADS) && defined(KOKKOS_ENABLE_TASKPOLICY)
 
 #include <Kokkos_Core.hpp>
 #include <impl/Kokkos_TaskQueue_impl.hpp>
@@ -53,56 +54,52 @@
 namespace Kokkos {
 namespace Impl {
 
-template class TaskQueue< Kokkos::Qthreads > ;
+template class TaskQueue<Kokkos::Qthreads>;
 
 //----------------------------------------------------------------------------
 
-TaskExec< Kokkos::Qthreads >::TaskExec()
-  : m_self_exec( 0 ),
-    m_team_exec( 0 ),
-    m_sync_mask( 0 ),
-    m_sync_value( 0 ),
-    m_sync_step( 0 ),
-    m_group_rank( 0 ),
-    m_team_rank( 0 ),
-    m_team_size( 1 )
-{}
+TaskExec<Kokkos::Qthreads>::TaskExec()
+    : m_self_exec(0),
+      m_team_exec(0),
+      m_sync_mask(0),
+      m_sync_value(0),
+      m_sync_step(0),
+      m_group_rank(0),
+      m_team_rank(0),
+      m_team_size(1) {}
 
-TaskExec< Kokkos::Qthreads >::
-TaskExec( Kokkos::Impl::QthreadsExec & arg_exec, int const arg_team_size )
-  : m_self_exec( & arg_exec ),
-    m_team_exec( arg_exec.pool_rev(arg_exec.pool_rank_rev() / arg_team_size) ),
-    m_sync_mask( 0 ),
-    m_sync_value( 0 ),
-    m_sync_step( 0 ),
-    m_group_rank( arg_exec.pool_rank_rev() / arg_team_size ),
-    m_team_rank( arg_exec.pool_rank_rev() % arg_team_size ),
-    m_team_size( arg_team_size )
-{
+TaskExec<Kokkos::Qthreads>::TaskExec(Kokkos::Impl::QthreadsExec &arg_exec,
+                                     int const arg_team_size)
+    : m_self_exec(&arg_exec),
+      m_team_exec(arg_exec.pool_rev(arg_exec.pool_rank_rev() / arg_team_size)),
+      m_sync_mask(0),
+      m_sync_value(0),
+      m_sync_step(0),
+      m_group_rank(arg_exec.pool_rank_rev() / arg_team_size),
+      m_team_rank(arg_exec.pool_rank_rev() % arg_team_size),
+      m_team_size(arg_team_size) {
   // This team spans
   //    m_self_exec->pool_rev( team_size * group_rank )
   //    m_self_exec->pool_rev( team_size * ( group_rank + 1 ) - 1 )
 
-  int64_t volatile * const sync = (int64_t *) m_self_exec->scratch_reduce();
+  int64_t volatile *const sync = (int64_t *)m_self_exec->scratch_reduce();
 
-  sync[0] = int64_t(0) ;
-  sync[1] = int64_t(0) ;
+  sync[0] = int64_t(0);
+  sync[1] = int64_t(0);
 
-  for ( int i = 0 ; i < m_team_size ; ++i ) {
-    m_sync_value |= int64_t(1) << (8*i);
-    m_sync_mask  |= int64_t(3) << (8*i);
+  for (int i = 0; i < m_team_size; ++i) {
+    m_sync_value |= int64_t(1) << (8 * i);
+    m_sync_mask |= int64_t(3) << (8 * i);
   }
 
   Kokkos::memory_fence();
 }
 
-#if defined( KOKKOS_ACTIVE_EXECUTION_MEMORY_SPACE_HOST )
+#if defined(KOKKOS_ACTIVE_EXECUTION_MEMORY_SPACE_HOST)
 
-void TaskExec< Kokkos::Qthreads >::team_barrier() const
-{
-  if ( 1 < m_team_size ) {
-
-    if ( m_team_exec->scratch_reduce_size() < int(2 * sizeof(int64_t)) ) {
+void TaskExec<Kokkos::Qthreads>::team_barrier() const {
+  if (1 < m_team_size) {
+    if (m_team_exec->scratch_reduce_size() < int(2 * sizeof(int64_t))) {
       Kokkos::abort("TaskQueue<Qthreads> scratch_reduce memory too small");
     }
 
@@ -110,12 +107,11 @@ void TaskExec< Kokkos::Qthreads >::team_barrier() const
     // Alternate memory locations between barriers to avoid a sequence
     // of barriers overtaking one another.
 
-    int64_t volatile * const sync =
-      ((int64_t *) m_team_exec->scratch_reduce()) + ( m_sync_step & 0x01 );
+    int64_t volatile *const sync =
+        ((int64_t *)m_team_exec->scratch_reduce()) + (m_sync_step & 0x01);
 
     // This team member sets one byte within the sync variable
-    int8_t volatile * const sync_self =
-     ((int8_t *) sync) + m_team_rank ;
+    int8_t volatile *const sync_self = ((int8_t *)sync) + m_team_rank;
 
 #if 0
 fprintf( stdout,
@@ -129,9 +125,10 @@ fprintf( stdout,
 fflush(stdout);
 #endif
 
-    *sync_self = int8_t( m_sync_value & 0x03 ); // signal arrival
+    *sync_self = int8_t(m_sync_value & 0x03);  // signal arrival
 
-    while ( m_sync_value != *sync ); // wait for team to arrive
+    while (m_sync_value != *sync)
+      ;  // wait for team to arrive
 
 #if 0
 fprintf( stdout,
@@ -145,11 +142,11 @@ fprintf( stdout,
 fflush(stdout);
 #endif
 
-    ++m_sync_step ;
+    ++m_sync_step;
 
-    if ( 0 == ( 0x01 & m_sync_step ) ) { // Every other step
-      m_sync_value ^= m_sync_mask ;
-      if ( 1000 < m_sync_step ) m_sync_step = 0 ;
+    if (0 == (0x01 & m_sync_step)) {  // Every other step
+      m_sync_value ^= m_sync_mask;
+      if (1000 < m_sync_step) m_sync_step = 0;
     }
   }
 }
@@ -158,36 +155,35 @@ fflush(stdout);
 
 //----------------------------------------------------------------------------
 
-void TaskQueueSpecialization< Kokkos::Qthreads >::execute
-  ( TaskQueue< Kokkos::Qthreads > * const queue )
-{
-  using execution_space = Kokkos::Qthreads ;
-  using queue_type      = TaskQueue< execution_space > ;
-  using task_root_type  = TaskBase< execution_space, void, void > ;
-  using PoolExec        = Kokkos::Impl::QthreadsExec ;
-  using Member          = TaskExec< execution_space > ;
+void TaskQueueSpecialization<Kokkos::Qthreads>::execute(
+    TaskQueue<Kokkos::Qthreads> *const queue) {
+  using execution_space = Kokkos::Qthreads;
+  using queue_type      = TaskQueue<execution_space>;
+  using task_root_type  = TaskBase<execution_space, void, void>;
+  using PoolExec        = Kokkos::Impl::QthreadsExec;
+  using Member          = TaskExec<execution_space>;
 
-  task_root_type * const end = (task_root_type *) task_root_type::EndTag ;
+  task_root_type *const end = (task_root_type *)task_root_type::EndTag;
 
   // Required:  team_size <= 8
 
-  const int team_size = PoolExec::pool_size(2); // Threads per core
+  const int team_size = PoolExec::pool_size(2);  // Threads per core
   // const int team_size = PoolExec::pool_size(1); // Threads per NUMA
 
-  if ( 8 < team_size ) {
+  if (8 < team_size) {
     Kokkos::abort("TaskQueue<Qthreads> unsupported team size");
   }
 
 #pragma omp parallel
   {
-    PoolExec & self = *PoolExec::get_thread_omp();
+    PoolExec &self = *PoolExec::get_thread_omp();
 
-    Member single_exec ;
-    Member team_exec( self, team_size );
+    Member single_exec;
+    Member team_exec(self, team_size);
 
     // Team shared memory
-    task_root_type * volatile * const task_shared =
-      (task_root_type **) team_exec.m_team_exec->scratch_thread();
+    task_root_type *volatile *const task_shared =
+        (task_root_type **)team_exec.m_team_exec->scratch_thread();
 
 // Barrier across entire Qthreads thread pool to insure initialization
 #pragma omp barrier
@@ -195,23 +191,21 @@ void TaskQueueSpecialization< Kokkos::Qthreads >::execute
     // Loop until all queues are empty and no tasks in flight
 
     do {
-
       // Each team lead attempts to acquire either a thread team task
       // or collection of single thread tasks for the team.
 
-      if ( 0 == team_exec.team_rank() ) {
-
-        task_root_type * tmp =
-          0 < *((volatile int *) & queue->m_ready_count) ? end : 0 ;
+      if (0 == team_exec.team_rank()) {
+        task_root_type *tmp =
+            0 < *((volatile int *)&queue->m_ready_count) ? end : 0;
 
         // Loop by priority and then type
-        for ( int i = 0 ; i < queue_type::NumQueue && end == tmp ; ++i ) {
-          for ( int j = 0 ; j < 2 && end == tmp ; ++j ) {
-            tmp = queue_type::pop_task( & queue->m_ready[i][j] );
+        for (int i = 0; i < queue_type::NumQueue && end == tmp; ++i) {
+          for (int j = 0; j < 2 && end == tmp; ++j) {
+            tmp = queue_type::pop_task(&queue->m_ready[i][j]);
           }
         }
 
-        *task_shared = tmp ;
+        *task_shared = tmp;
 
         // Fence to be sure shared_task_array is stored
         Kokkos::memory_fence();
@@ -222,7 +216,7 @@ void TaskQueueSpecialization< Kokkos::Qthreads >::execute
 
       Kokkos::memory_fence();
 
-      task_root_type * const task = *task_shared ;
+      task_root_type *const task = *task_shared;
 
 #if 0
 fprintf( stdout,
@@ -235,30 +229,27 @@ fprintf( stdout,
 fflush(stdout);
 #endif
 
-      if ( 0 == task ) break ; // 0 == m_ready_count
+      if (0 == task) break;  // 0 == m_ready_count
 
-      if ( end == task ) {
+      if (end == task) {
         team_exec.team_barrier();
-      }
-      else if ( task_root_type::TaskTeam == task->m_task_type ) {
+      } else if (task_root_type::TaskTeam == task->m_task_type) {
         // Thread Team Task
-        (*task->m_apply)( task, & team_exec );
+        (*task->m_apply)(task, &team_exec);
 
         // The m_apply function performs a barrier
 
-        if ( 0 == team_exec.team_rank() ) {
+        if (0 == team_exec.team_rank()) {
           // team member #0 completes the task, which may delete the task
-          queue->complete( task );
+          queue->complete(task);
         }
-      }
-      else {
+      } else {
         // Single Thread Task
 
-        if ( 0 == team_exec.team_rank() ) {
+        if (0 == team_exec.team_rank()) {
+          (*task->m_apply)(task, &single_exec);
 
-          (*task->m_apply)( task, & single_exec );
-
-          queue->complete( task );
+          queue->complete(task);
         }
 
         // All team members wait for whole team to reach this statement.
@@ -267,54 +258,51 @@ fflush(stdout);
         // before it is read by all threads.
         team_exec.team_barrier();
       }
-    } while(1);
+    } while (1);
   }
-// END #pragma omp parallel
-
+  // END #pragma omp parallel
 }
 
-void TaskQueueSpecialization< Kokkos::Qthreads >::
-  iff_single_thread_recursive_execute
-    ( TaskQueue< Kokkos::Qthreads > * const queue )
-{
-  using execution_space = Kokkos::Qthreads ;
-  using queue_type      = TaskQueue< execution_space > ;
-  using task_root_type  = TaskBase< execution_space, void, void > ;
-  using Member          = TaskExec< execution_space > ;
+void TaskQueueSpecialization<Kokkos::Qthreads>::
+    iff_single_thread_recursive_execute(
+        TaskQueue<Kokkos::Qthreads> *const queue) {
+  using execution_space = Kokkos::Qthreads;
+  using queue_type      = TaskQueue<execution_space>;
+  using task_root_type  = TaskBase<execution_space, void, void>;
+  using Member          = TaskExec<execution_space>;
 
-  if ( 1 == omp_get_num_threads() ) {
+  if (1 == omp_get_num_threads()) {
+    task_root_type *const end = (task_root_type *)task_root_type::EndTag;
 
-    task_root_type * const end = (task_root_type *) task_root_type::EndTag ;
+    Member single_exec;
 
-    Member single_exec ;
-
-    task_root_type * task = end ;
+    task_root_type *task = end;
 
     do {
-
-      task = end ;
+      task = end;
 
       // Loop by priority and then type
-      for ( int i = 0 ; i < queue_type::NumQueue && end == task ; ++i ) {
-        for ( int j = 0 ; j < 2 && end == task ; ++j ) {
-          task = queue_type::pop_task( & queue->m_ready[i][j] );
+      for (int i = 0; i < queue_type::NumQueue && end == task; ++i) {
+        for (int j = 0; j < 2 && end == task; ++j) {
+          task = queue_type::pop_task(&queue->m_ready[i][j]);
         }
       }
 
-      if ( end == task ) break ;
+      if (end == task) break;
 
-      (*task->m_apply)( task, & single_exec );
+      (*task->m_apply)(task, &single_exec);
 
-      queue->complete( task );
+      queue->complete(task);
 
-    } while(1);
+    } while (1);
   }
 }
 
-}} /* namespace Kokkos::Impl */
+}  // namespace Impl
+}  // namespace Kokkos
 
 //----------------------------------------------------------------------------
 #else
 void KOKKOS_SRC_QTHREADS_TASK_PREVENT_LINK_ERROR() {}
-#endif /* #if defined( KOKKOS_ENABLE_QTHREADS ) && defined( KOKKOS_ENABLE_TASKPOLICY ) */
-
+#endif /* #if defined( KOKKOS_ENABLE_QTHREADS ) && defined( \
+          KOKKOS_ENABLE_TASKPOLICY ) */
diff --git a/lib/kokkos/core/src/Qthreads/Kokkos_Qthreads_Task.hpp b/lib/kokkos/core/src/Qthreads/Kokkos_Qthreads_Task.hpp
index 35fc659977..1b2c3d3855 100644
--- a/lib/kokkos/core/src/Qthreads/Kokkos_Qthreads_Task.hpp
+++ b/lib/kokkos/core/src/Qthreads/Kokkos_Qthreads_Task.hpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -45,7 +46,7 @@
 #define KOKKOS_IMPL_QTHREADS_TASK_HPP
 
 #include <Kokkos_Macros.hpp>
-#if defined( KOKKOS_ENABLE_QTHREADS ) && defined( KOKKOS_ENABLE_TASKPOLICY )
+#if defined(KOKKOS_ENABLE_QTHREADS) && defined(KOKKOS_ENABLE_TASKPOLICY)
 
 //----------------------------------------------------------------------------
 //----------------------------------------------------------------------------
@@ -53,98 +54,90 @@
 namespace Kokkos {
 namespace Impl {
 
-template<>
-class TaskQueueSpecialization< Kokkos::Qthreads >
-{
-public:
-
-  using execution_space = Kokkos::Qthreads ;
-  using queue_type      = Kokkos::Impl::TaskQueue< execution_space > ;
-  using task_base_type  = Kokkos::Impl::TaskBase< execution_space, void, void > ;
+template <>
+class TaskQueueSpecialization<Kokkos::Qthreads> {
+ public:
+  using execution_space = Kokkos::Qthreads;
+  using queue_type      = Kokkos::Impl::TaskQueue<execution_space>;
+  using task_base_type  = Kokkos::Impl::TaskBase<execution_space, void, void>;
 
   // Must specify memory space
-  using memory_space = Kokkos::HostSpace ;
+  using memory_space = Kokkos::HostSpace;
 
-  static
-  void iff_single_thread_recursive_execute( queue_type * const );
+  static void iff_single_thread_recursive_execute(queue_type* const);
 
   // Must provide task queue execution function
-  static void execute( queue_type * const );
+  static void execute(queue_type* const);
 
   // Must provide mechanism to set function pointer in
   // execution space from the host process.
-  template< typename FunctorType >
-  static
-  void proc_set_apply( task_base_type::function_type * ptr )
-    {
-      using TaskType = TaskBase< execution_space,
-                                 typename FunctorType::value_type,
-                                 FunctorType
-                               > ;
-       *ptr = TaskType::apply ;
-    }
+  template <typename FunctorType>
+  static void proc_set_apply(task_base_type::function_type* ptr) {
+    using TaskType = TaskBase<execution_space, typename FunctorType::value_type,
+                              FunctorType>;
+    *ptr           = TaskType::apply;
+  }
 };
 
-extern template class TaskQueue< Kokkos::Qthreads > ;
+extern template class TaskQueue<Kokkos::Qthreads>;
 
 //----------------------------------------------------------------------------
 
-template<>
-class TaskExec< Kokkos::Qthreads >
-{
-private:
+template <>
+class TaskExec<Kokkos::Qthreads> {
+ private:
+  TaskExec(TaskExec&&)      = delete;
+  TaskExec(TaskExec const&) = delete;
+  TaskExec& operator=(TaskExec&&) = delete;
+  TaskExec& operator=(TaskExec const&) = delete;
 
-  TaskExec( TaskExec && ) = delete ;
-  TaskExec( TaskExec const & ) = delete ;
-  TaskExec & operator = ( TaskExec && ) = delete ;
-  TaskExec & operator = ( TaskExec const & ) = delete ;
+  using PoolExec = Kokkos::Impl::QthreadsExec;
 
+  friend class Kokkos::Impl::TaskQueue<Kokkos::Qthreads>;
+  friend class Kokkos::Impl::TaskQueueSpecialization<Kokkos::Qthreads>;
 
-  using PoolExec = Kokkos::Impl::QthreadsExec ;
-
-  friend class Kokkos::Impl::TaskQueue< Kokkos::Qthreads > ;
-  friend class Kokkos::Impl::TaskQueueSpecialization< Kokkos::Qthreads > ;
-
-  PoolExec * const m_self_exec ;  ///< This thread's thread pool data structure
-  PoolExec * const m_team_exec ;  ///< Team thread's thread pool data structure
-  int64_t          m_sync_mask ;
-  int64_t mutable  m_sync_value ;
-  int     mutable  m_sync_step ;
-  int              m_group_rank ; ///< Which "team" subset of thread pool
-  int              m_team_rank ;  ///< Which thread within a team
-  int              m_team_size ;
+  PoolExec* const m_self_exec;  ///< This thread's thread pool data structure
+  PoolExec* const m_team_exec;  ///< Team thread's thread pool data structure
+  int64_t m_sync_mask;
+  int64_t mutable m_sync_value;
+  int mutable m_sync_step;
+  int m_group_rank;  ///< Which "team" subset of thread pool
+  int m_team_rank;   ///< Which thread within a team
+  int m_team_size;
 
   TaskExec();
-  TaskExec( PoolExec & arg_exec, int arg_team_size );
+  TaskExec(PoolExec& arg_exec, int arg_team_size);
 
-public:
+ public:
+#if defined(KOKKOS_ACTIVE_EXECUTION_MEMORY_SPACE_HOST)
+  void* team_shared() const {
+    return m_team_exec ? m_team_exec->scratch_thread() : (void*)0;
+  }
 
-#if defined( KOKKOS_ACTIVE_EXECUTION_MEMORY_SPACE_HOST )
-  void * team_shared() const
-    { return m_team_exec ? m_team_exec->scratch_thread() : (void*) 0 ; }
-
-  int team_shared_size() const
-    { return m_team_exec ? m_team_exec->scratch_thread_size() : 0 ; }
+  int team_shared_size() const {
+    return m_team_exec ? m_team_exec->scratch_thread_size() : 0;
+  }
 
   /**\brief  Whole team enters this function call
    *         before any teeam member returns from
    *         this function call.
    */
-  void team_barrier() const ;
+  void team_barrier() const;
 #else
   KOKKOS_INLINE_FUNCTION void team_barrier() const {}
-  KOKKOS_INLINE_FUNCTION void * team_shared() const { return 0 ; }
-  KOKKOS_INLINE_FUNCTION int team_shared_size() const { return 0 ; }
+  KOKKOS_INLINE_FUNCTION void* team_shared() const { return 0; }
+  KOKKOS_INLINE_FUNCTION int team_shared_size() const { return 0; }
 #endif
 
   KOKKOS_INLINE_FUNCTION
-  int team_rank() const { return m_team_rank ; }
+  int team_rank() const { return m_team_rank; }
 
   KOKKOS_INLINE_FUNCTION
-  int team_size() const { return m_team_size ; }
+  int team_size() const { return m_team_size; }
 };
 
-}} /* namespace Kokkos::Impl */
+}  // namespace Impl
+}  // namespace Kokkos
 
 //----------------------------------------------------------------------------
 //----------------------------------------------------------------------------
@@ -154,4 +147,3 @@ public:
 
 #endif /* #if defined( KOKKOS_ENABLE_TASKPOLICY ) */
 #endif /* #ifndef KOKKOS_IMPL_QTHREADS_TASK_HPP */
-
diff --git a/lib/kokkos/core/src/Qthreads/Kokkos_Qthreads_TaskQueue.hpp b/lib/kokkos/core/src/Qthreads/Kokkos_Qthreads_TaskQueue.hpp
index 96d88af79f..b9b6dd86e4 100644
--- a/lib/kokkos/core/src/Qthreads/Kokkos_Qthreads_TaskQueue.hpp
+++ b/lib/kokkos/core/src/Qthreads/Kokkos_Qthreads_TaskQueue.hpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -45,7 +46,7 @@
 #define KOKKOS_QTHREADS_TASKQUEUE_HPP
 
 #include <Kokkos_Macros.hpp>
-#if defined( KOKKOS_ENABLE_QTHREADS ) && defined( KOKKOS_ENABLE_TASKPOLICY )
+#if defined(KOKKOS_ENABLE_QTHREADS) && defined(KOKKOS_ENABLE_TASKPOLICY)
 
 //----------------------------------------------------------------------------
 //----------------------------------------------------------------------------
@@ -57,56 +58,54 @@ namespace Impl {
  *
  *  Task execution is handled here directly for the Qthread implementation.
  */
-template<>
-class TaskQueue< Kokkos::Qthread > {
-private:
+template <>
+class TaskQueue<Kokkos::Qthread> {
+ private:
+  using execution_space = Kokkos::Qthread;
+  using memory_space    = Kokkos::HostSpace using device_type =
+      Kokkos::Device<execution_space, memory_space>;
+  using memory_pool    = Kokkos::MemoryPool<device_type>;
+  using task_root_type = Kokkos::Impl::TaskBase<execution_space, void, void>;
 
-  using execution_space = Kokkos::Qthread ;
-  using memory_space    = Kokkos::HostSpace
-  using device_type     = Kokkos::Device< execution_space, memory_space > ;
-  using memory_pool     = Kokkos::MemoryPool< device_type > ;
-  using task_root_type  = Kokkos::Impl::TaskBase< execution_space, void, void > ;
-
-  friend class Kokkos::TaskScheduler< execution_space > ;
+  friend class Kokkos::TaskScheduler<execution_space>;
 
   struct Destroy {
-    TaskQueue * m_queue ;
+    TaskQueue* m_queue;
     void destroy_shared_allocation();
   };
 
   //----------------------------------------
 
-  enum : int { TASK_STATE_NULL         =  0,  ///<  Does not exist
-               TASK_STATE_CONSTRUCTING =  1,  ///<  Is under construction
-               TASK_STATE_WAITING      =  2,  ///<  Is waiting for execution
-               TASK_STATE_EXECUTING    =  4,  ///<  Is executing
-               TASK_STATE_RESPAWN      =  8,  ///<  Requested respawn
-               TASK_STATE_COMPLETE     = 16   ///<  Execution is complete
-             };
+  enum : int {
+    TASK_STATE_NULL         = 0,  ///<  Does not exist
+    TASK_STATE_CONSTRUCTING = 1,  ///<  Is under construction
+    TASK_STATE_WAITING      = 2,  ///<  Is waiting for execution
+    TASK_STATE_EXECUTING    = 4,  ///<  Is executing
+    TASK_STATE_RESPAWN      = 8,  ///<  Requested respawn
+    TASK_STATE_COMPLETE     = 16  ///<  Execution is complete
+  };
 
   // Queue is organized as [ priority ][ type ]
 
-  memory_pool  m_memory ;
-  unsigned     m_team_size ;   // Number of threads in a team
-  long         m_accum_alloc ; // Accumulated number of allocations
-  int          m_count_alloc ; // Current number of allocations
-  int          m_max_alloc ;   // Maximum number of allocations
-  int          m_ready_count ; // Number of ready or executing
+  memory_pool m_memory;
+  unsigned m_team_size;  // Number of threads in a team
+  long m_accum_alloc;    // Accumulated number of allocations
+  int m_count_alloc;     // Current number of allocations
+  int m_max_alloc;       // Maximum number of allocations
+  int m_ready_count;     // Number of ready or executing
 
   //----------------------------------------
 
   ~TaskQueue();
-  TaskQueue() = delete ;
-  TaskQueue( TaskQueue && ) = delete ;
-  TaskQueue( TaskQueue const & ) = delete ;
-  TaskQueue & operator = ( TaskQueue && ) = delete ;
-  TaskQueue & operator = ( TaskQueue const & ) = delete ;
+  TaskQueue()                 = delete;
+  TaskQueue(TaskQueue&&)      = delete;
+  TaskQueue(TaskQueue const&) = delete;
+  TaskQueue& operator=(TaskQueue&&) = delete;
+  TaskQueue& operator=(TaskQueue const&) = delete;
 
-  TaskQueue
-    ( const memory_space & arg_space,
-      unsigned const arg_memory_pool_capacity,
-      unsigned const arg_memory_pool_superblock_capacity_log2
-    );
+  TaskQueue(const memory_space& arg_space,
+            unsigned const arg_memory_pool_capacity,
+            unsigned const arg_memory_pool_superblock_capacity_log2);
 
   // Schedule a task
   //   Precondition:
@@ -115,7 +114,7 @@ private:
   //   Postcondition:
   //     task->m_next is linked list membership
   KOKKOS_FUNCTION
-  void schedule( task_root_type * const );
+  void schedule(task_root_type* const);
 
   // Reschedule a task
   //   Precondition:
@@ -125,7 +124,7 @@ private:
   //     task is in Executing-Respawn state
   //     task->m_next == 0 (no dependence)
   KOKKOS_FUNCTION
-  void reschedule( task_root_type * );
+  void reschedule(task_root_type*);
 
   // Complete a task
   //   Precondition:
@@ -136,35 +135,31 @@ private:
   //     task->m_wait == LockTag  =>  task is complete
   //     task->m_wait != LockTag  =>  task is waiting
   KOKKOS_FUNCTION
-  void complete( task_root_type * );
-
-public:
+  void complete(task_root_type*);
 
+ public:
   // If and only if the execution space is a single thread
   // then execute ready tasks.
   KOKKOS_INLINE_FUNCTION
-  void iff_single_thread_recursive_execute()
-    {
-#if defined( KOKKOS_ACTIVE_EXECUTION_MEMORY_SPACE_HOST )
-      specialization::iff_single_thread_recursive_execute( this );
+  void iff_single_thread_recursive_execute() {
+#if defined(KOKKOS_ACTIVE_EXECUTION_MEMORY_SPACE_HOST)
+    specialization::iff_single_thread_recursive_execute(this);
 #endif
-    }
+  }
 
-  void execute() { specialization::execute( this ); }
+  void execute() { specialization::execute(this); }
 
-  template< typename FunctorType >
-  void proc_set_apply( typename task_root_type::function_type * ptr )
-    {
-      specialization::template proc_set_apply< FunctorType >( ptr );
-    }
+  template <typename FunctorType>
+  void proc_set_apply(typename task_root_type::function_type* ptr) {
+    specialization::template proc_set_apply<FunctorType>(ptr);
+  }
 
   // Assign task pointer with reference counting of assigned tasks
-  template< typename LV, typename RV >
-  KOKKOS_FUNCTION static
-  void assign( TaskBase< execution_space, LV, void > ** const lhs,
-               TaskBase< execution_space, RV, void > *  const rhs )
-    {
-      using task_lhs = TaskBase< execution_space, LV, void > ;
+  template <typename LV, typename RV>
+  KOKKOS_FUNCTION static void assign(
+      TaskBase<execution_space, LV, void>** const lhs,
+      TaskBase<execution_space, RV, void>* const rhs) {
+    using task_lhs = TaskBase<execution_space, LV, void>;
 #if 0
   {
     printf( "assign( 0x%lx { 0x%lx %d %d }, 0x%lx { 0x%lx %d %d } )\n",
@@ -181,39 +176,40 @@ public:
   }
 #endif
 
-      if ( *lhs )
-      {
-        const int count = Kokkos::atomic_fetch_add( &((*lhs)->m_ref_count), -1 );
+    if (*lhs) {
+      const int count = Kokkos::atomic_fetch_add(&((*lhs)->m_ref_count), -1);
 
-        if ( ( 1 == count ) && ( (*lhs)->m_state == TASK_STATE_COMPLETE ) ) {
-          // Reference count is zero and task is complete, deallocate.
-          (*lhs)->m_queue->deallocate( *lhs, (*lhs)->m_alloc_size );
-        }
-        else if ( count <= 1 ) {
-          Kokkos::abort("TaskScheduler task has negative reference count or is incomplete" );
-        }
-
-        // GEM: Should I check that there are no dependences here?  Can the state
-        //      be set to complete while there are still dependences?
+      if ((1 == count) && ((*lhs)->m_state == TASK_STATE_COMPLETE)) {
+        // Reference count is zero and task is complete, deallocate.
+        (*lhs)->m_queue->deallocate(*lhs, (*lhs)->m_alloc_size);
+      } else if (count <= 1) {
+        Kokkos::abort(
+            "TaskScheduler task has negative reference count or is incomplete");
       }
 
-      if ( rhs ) { Kokkos::atomic_fetch_add( &(rhs->m_ref_count), 1 ); }
-
-      // Force write of *lhs
-
-      *static_cast< task_lhs * volatile * >(lhs) = rhs ;
-
-      Kokkos::memory_fence();
+      // GEM: Should I check that there are no dependences here?  Can the state
+      //      be set to complete while there are still dependences?
     }
 
-  KOKKOS_FUNCTION
-  size_t allocate_block_size( size_t n ); ///< Actual block size allocated
+    if (rhs) {
+      Kokkos::atomic_fetch_add(&(rhs->m_ref_count), 1);
+    }
+
+    // Force write of *lhs
+
+    *static_cast<task_lhs* volatile*>(lhs) = rhs;
+
+    Kokkos::memory_fence();
+  }
 
   KOKKOS_FUNCTION
-  void * allocate( size_t n ); ///< Allocate from the memory pool
+  size_t allocate_block_size(size_t n);  ///< Actual block size allocated
 
   KOKKOS_FUNCTION
-  void deallocate( void * p, size_t n ); ///< Deallocate to the memory pool
+  void* allocate(size_t n);  ///< Allocate from the memory pool
+
+  KOKKOS_FUNCTION
+  void deallocate(void* p, size_t n);  ///< Deallocate to the memory pool
 };
 
 } /* namespace Impl */
@@ -225,90 +221,91 @@ public:
 namespace Kokkos {
 namespace Impl {
 
-template<>
-class TaskBase< Kokkos::Qthread, void, void >
-{
-public:
+template <>
+class TaskBase<Kokkos::Qthread, void, void> {
+ public:
+  enum : int16_t {
+    TaskTeam   = TaskBase<void, void, void>::TaskTeam,
+    TaskSingle = TaskBase<void, void, void>::TaskSingle,
+    Aggregate  = TaskBase<void, void, void>::Aggregate
+  };
 
-  enum : int16_t   { TaskTeam   = TaskBase< void, void, void >::TaskTeam,
-                     TaskSingle = TaskBase< void, void, void >::TaskSingle,
-                     Aggregate  = TaskBase< void, void, void >::Aggregate };
+  enum : uintptr_t {
+    LockTag = TaskBase<void, void, void>::LockTag,
+    EndTag  = TaskBase<void, void, void>::EndTag
+  };
 
-  enum : uintptr_t { LockTag = TaskBase< void, void, void >::LockTag,
-                     EndTag  = TaskBase< void, void, void >::EndTag };
+  using execution_space = Kokkos::Qthread;
+  using queue_type      = TaskQueue<execution_space>;
 
-  using execution_space = Kokkos::Qthread ;
-  using queue_type      = TaskQueue< execution_space > ;
+  template <typename>
+  friend class Kokkos::TaskScheduler;
 
-  template< typename > friend class Kokkos::TaskScheduler ;
-
-  typedef void (* function_type) ( TaskBase *, void * );
+  typedef void (*function_type)(TaskBase*, void*);
 
   // sizeof(TaskBase) == 48
 
-  function_type  m_apply ;       ///< Apply function pointer
-  queue_type   * m_queue ;       ///< Queue in which this task resides
-  TaskBase     * m_dep ;         ///< Dependence
-  int32_t        m_ref_count ;   ///< Reference count
-  int32_t        m_alloc_size ;  ///< Allocation size
-  int32_t        m_dep_count ;   ///< Aggregate's number of dependences
-  int16_t        m_task_type ;   ///< Type of task
-  int16_t        m_priority ;    ///< Priority of runnable task
-  aligned_t      m_qfeb ;        ///< Qthread full/empty bit
-  int            m_state ;       ///< State of the task
+  function_type m_apply;  ///< Apply function pointer
+  queue_type* m_queue;    ///< Queue in which this task resides
+  TaskBase* m_dep;        ///< Dependence
+  int32_t m_ref_count;    ///< Reference count
+  int32_t m_alloc_size;   ///< Allocation size
+  int32_t m_dep_count;    ///< Aggregate's number of dependences
+  int16_t m_task_type;    ///< Type of task
+  int16_t m_priority;     ///< Priority of runnable task
+  aligned_t m_qfeb;       ///< Qthread full/empty bit
+  int m_state;            ///< State of the task
 
-  TaskBase( TaskBase && ) = delete ;
-  TaskBase( const TaskBase & ) = delete ;
-  TaskBase & operator = ( TaskBase && ) = delete ;
-  TaskBase & operator = ( const TaskBase & ) = delete ;
+  TaskBase(TaskBase&&)      = delete;
+  TaskBase(const TaskBase&) = delete;
+  TaskBase& operator=(TaskBase&&) = delete;
+  TaskBase& operator=(const TaskBase&) = delete;
 
-  KOKKOS_INLINE_FUNCTION ~TaskBase() = default ;
+  KOKKOS_INLINE_FUNCTION ~TaskBase() = default;
 
   KOKKOS_INLINE_FUNCTION
   constexpr TaskBase() noexcept
-    : m_apply(0),
-      m_queue(0),
-      m_dep(0),
-      m_ref_count(0),
-      m_alloc_size(0),
-      m_dep_count(0),
-      m_task_type( TaskSingle ),
-      m_priority( 1 /* TaskRegularPriority */ ),
-      m_qfeb(0),
-      m_state( queue_type::TASK_STATE_CONSTRUCTING )
-    {
-      qthread_empty( & m_qfeb ); // Set to full when complete
-    }
+      : m_apply(0),
+        m_queue(0),
+        m_dep(0),
+        m_ref_count(0),
+        m_alloc_size(0),
+        m_dep_count(0),
+        m_task_type(TaskSingle),
+        m_priority(1 /* TaskRegularPriority */),
+        m_qfeb(0),
+        m_state(queue_type::TASK_STATE_CONSTRUCTING) {
+    qthread_empty(&m_qfeb);  // Set to full when complete
+  }
 
   //----------------------------------------
 
-  static aligned_t qthread_func( void * arg );
+  static aligned_t qthread_func(void* arg);
 
   KOKKOS_INLINE_FUNCTION
-  TaskBase ** aggregate_dependences()
-    { return reinterpret_cast<TaskBase**>( this + 1 ); }
+  TaskBase** aggregate_dependences() {
+    return reinterpret_cast<TaskBase**>(this + 1);
+  }
 
   KOKKOS_INLINE_FUNCTION
-  void requested_respawn()
-    { return m_state == queue_type::TASK_STATE_RESPAWN; }
+  void requested_respawn() { return m_state == queue_type::TASK_STATE_RESPAWN; }
 
   KOKKOS_INLINE_FUNCTION
-  void add_dependence( TaskBase* dep )
-    {
-      // Assign dependence to m_dep.  It will be processed in the subsequent
-      // call to schedule.  Error if the dependence is reset.
-      if ( 0 != Kokkos::atomic_exchange( & m_dep, dep ) ) {
-        Kokkos::abort("TaskScheduler ERROR: resetting task dependence");
-      }
-
-      if ( 0 != dep ) {
-        // The future may be destroyed upon returning from this call
-        // so increment reference count to track this assignment.
-        Kokkos::atomic_fetch_add( &(dep->m_ref_count), 1 );
-      }
+  void add_dependence(TaskBase* dep) {
+    // Assign dependence to m_dep.  It will be processed in the subsequent
+    // call to schedule.  Error if the dependence is reset.
+    if (0 != Kokkos::atomic_exchange(&m_dep, dep)) {
+      Kokkos::abort("TaskScheduler ERROR: resetting task dependence");
     }
 
-  using get_return_type = void ;
+    if (0 != dep) {
+      // The future may be destroyed upon returning from this call
+      // so increment reference count to track this assignment.
+      Kokkos::atomic_fetch_add(&(dep->m_ref_count), 1);
+    }
+  }
+
+  using get_return_type = void;
 
   KOKKOS_INLINE_FUNCTION
   get_return_type get() const {}
@@ -320,6 +317,5 @@ public:
 //----------------------------------------------------------------------------
 //----------------------------------------------------------------------------
 
-#endif /* #if defined( KOKKOS_ENABLE_TASKPOLICY ) */
-#endif // KOKKOS_QTHREADS_TASKQUEUE_HPP
-
+#endif  /* #if defined( KOKKOS_ENABLE_TASKPOLICY ) */
+#endif  // KOKKOS_QTHREADS_TASKQUEUE_HPP
diff --git a/lib/kokkos/core/src/Qthreads/Kokkos_Qthreads_TaskQueue_impl.hpp b/lib/kokkos/core/src/Qthreads/Kokkos_Qthreads_TaskQueue_impl.hpp
index 152546fadc..7a91103ae7 100644
--- a/lib/kokkos/core/src/Qthreads/Kokkos_Qthreads_TaskQueue_impl.hpp
+++ b/lib/kokkos/core/src/Qthreads/Kokkos_Qthreads_TaskQueue_impl.hpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -45,91 +46,79 @@
 #define KOKKOS_QTHREADS_TASKQUEUE_IMPL_HPP
 
 #include <Kokkos_Macros.hpp>
-#if defined( KOKKOS_ENABLE_QTHREADS ) && defined( KOKKOS_ENABLE_TASKPOLICY )
+#if defined(KOKKOS_ENABLE_QTHREADS) && defined(KOKKOS_ENABLE_TASKPOLICY)
 
 namespace Kokkos {
 namespace Impl {
 
 //----------------------------------------------------------------------------
 
-template< typename ExecSpace >
-void TaskQueue< ExecSpace >::Destroy::destroy_shared_allocation()
-{
+template <typename ExecSpace>
+void TaskQueue<ExecSpace>::Destroy::destroy_shared_allocation() {
   m_queue->~TaskQueue();
 }
 
 //----------------------------------------------------------------------------
 
-template< typename ExecSpace >
-TaskQueue< ExecSpace >::TaskQueue
-  ( const TaskQueue< ExecSpace >::memory_space & arg_space,
+template <typename ExecSpace>
+TaskQueue<ExecSpace>::TaskQueue(
+    const TaskQueue<ExecSpace>::memory_space &arg_space,
     unsigned const arg_memory_pool_capacity,
-    unsigned const arg_memory_pool_superblock_capacity_log2 )
-  : m_memory( arg_space,
-              arg_memory_pool_capacity,
-              arg_memory_pool_superblock_capacity_log2 )
-    m_team_size( unsigned( qthread_num_workers_local(NO_SHEPHERD) ) ),
-    m_accum_alloc(0),
-    m_count_alloc(0),
-    m_max_alloc(0),
-    m_ready_count(0)
-{}
+    unsigned const arg_memory_pool_superblock_capacity_log2)
+    : m_memory(arg_space, arg_memory_pool_capacity,
+               arg_memory_pool_superblock_capacity_log2)
+          m_team_size(unsigned(qthread_num_workers_local(NO_SHEPHERD))),
+      m_accum_alloc(0),
+      m_count_alloc(0),
+      m_max_alloc(0),
+      m_ready_count(0) {}
 
 //----------------------------------------------------------------------------
 
-template< typename ExecSpace >
-TaskQueue< ExecSpace >::~TaskQueue()
-{
+template <typename ExecSpace>
+TaskQueue<ExecSpace>::~TaskQueue() {
   // Verify that ready count is zero.
-  if ( 0 != m_ready_count ) {
+  if (0 != m_ready_count) {
     Kokkos::abort("TaskQueue::~TaskQueue ERROR: has ready or executing tasks");
   }
 }
 
 //----------------------------------------------------------------------------
 
-template< typename ExecSpace >
-KOKKOS_FUNCTION
-size_t TaskQueue< ExecSpace >::allocate_block_size( size_t n )
-{
-  return m_memory.allocate_block_size( n );
+template <typename ExecSpace>
+KOKKOS_FUNCTION size_t TaskQueue<ExecSpace>::allocate_block_size(size_t n) {
+  return m_memory.allocate_block_size(n);
 }
 
 //----------------------------------------------------------------------------
 
-template< typename ExecSpace >
-KOKKOS_FUNCTION
-void * TaskQueue< ExecSpace >::allocate( size_t n )
-{
-  void * const p = m_memory.allocate(n);
+template <typename ExecSpace>
+KOKKOS_FUNCTION void *TaskQueue<ExecSpace>::allocate(size_t n) {
+  void *const p = m_memory.allocate(n);
 
-  if ( p ) {
-    Kokkos::atomic_increment( & m_accum_alloc );
-    Kokkos::atomic_increment( & m_count_alloc );
+  if (p) {
+    Kokkos::atomic_increment(&m_accum_alloc);
+    Kokkos::atomic_increment(&m_count_alloc);
 
-    if ( m_max_alloc < m_count_alloc ) m_max_alloc = m_count_alloc ;
+    if (m_max_alloc < m_count_alloc) m_max_alloc = m_count_alloc;
   }
 
-  return p ;
+  return p;
 }
 
 //----------------------------------------------------------------------------
 
-template< typename ExecSpace >
-KOKKOS_FUNCTION
-void TaskQueue< ExecSpace >::deallocate( void * p, size_t n )
-{
-  m_memory.deallocate( p, n );
-  Kokkos::atomic_decrement( & m_count_alloc );
+template <typename ExecSpace>
+KOKKOS_FUNCTION void TaskQueue<ExecSpace>::deallocate(void *p, size_t n) {
+  m_memory.deallocate(p, n);
+  Kokkos::atomic_decrement(&m_count_alloc);
 }
 
 //----------------------------------------------------------------------------
 
-template< typename ExecSpace >
-KOKKOS_FUNCTION
-void TaskQueue< ExecSpace >::schedule
-  ( TaskQueue< ExecSpace >::task_root_type * const task )
-{
+template <typename ExecSpace>
+KOKKOS_FUNCTION void TaskQueue<ExecSpace>::schedule(
+    TaskQueue<ExecSpace>::task_root_type *const task) {
 #if 0
   printf( "schedule( 0x%lx { %d %d %d }\n",
           uintptr_t(task),
@@ -139,22 +128,23 @@ void TaskQueue< ExecSpace >::schedule
 #endif
 
   // The task has been constructed and is waiting to be executed.
-  task->m_state = TASK_STATE_WAITING ;
+  task->m_state = TASK_STATE_WAITING;
 
-  if ( task->m_task_type != task_root_type::Aggregate ) {
+  if (task->m_task_type != task_root_type::Aggregate) {
     // Scheduling a single or team task.
 
     // Increment active task count before spawning.
-    Kokkos::atomic_increment( m_ready_count );
+    Kokkos::atomic_increment(m_ready_count);
 
-    if ( task->m_dep == 0 ) {
+    if (task->m_dep == 0) {
       // Schedule a task with no dependences.
 
-      if ( task_root_type::TaskTeam == task->m_task_type && m_team_size > 1 ) {
-        // If more than one shepherd spawn on a shepherd other than this shepherd
+      if (task_root_type::TaskTeam == task->m_task_type && m_team_size > 1) {
+        // If more than one shepherd spawn on a shepherd other than this
+        // shepherd
         const int num_shepherd  = qthread_num_shepherds();
         const int this_shepherd = qthread_shep();
-        int spawn_shepherd      = ( this_shepherd + 1 ) % num_shepherd ;
+        int spawn_shepherd      = (this_shepherd + 1) % num_shepherd;
 
 #if 0
         fprintf( stdout,
@@ -169,46 +159,37 @@ void TaskQueue< ExecSpace >::schedule
 #endif
 
         qthread_spawn_cloneable(
-          & task_root_type::qthread_func,
-          task,
-          0,
-          NULL,
-          0, // no depenedences
-          0, // dependences array
-          spawn_shepherd,
-          unsigned( QTHREAD_SPAWN_SIMPLE | QTHREAD_SPAWN_LOCAL_PRIORITY ),
-          m_team_size - 1
-        );
-      }
-      else {
+            &task_root_type::qthread_func, task, 0, NULL,
+            0,  // no depenedences
+            0,  // dependences array
+            spawn_shepherd,
+            unsigned(QTHREAD_SPAWN_SIMPLE | QTHREAD_SPAWN_LOCAL_PRIORITY),
+            m_team_size - 1);
+      } else {
         qthread_spawn(
-          & task_root_type::qthread_func,
-          task,
-          0,
-          NULL,
-          0, // no depenedences
-          0, // dependences array
-          NO_SHEPHERD,
-          QTHREAD_SPAWN_SIMPLE /* allows optimization for non-blocking task */
+            &task_root_type::qthread_func, task, 0, NULL,
+            0,  // no depenedences
+            0,  // dependences array
+            NO_SHEPHERD,
+            QTHREAD_SPAWN_SIMPLE /* allows optimization for non-blocking task */
         );
       }
-    }
-    else if ( task->m_dep->m_task_type != task_root_type::Aggregate )
-    // Malloc the precondition array to pass to qthread_spawn().  For
-    // non-aggregate tasks, it is a single pointer since there are no
-    // dependences.  Qthreads will eventually free this allocation so memory will
-    // not be leaked. Is malloc thread-safe?  Should this call be guarded?  The
-    // memory can't be allocated from the pool allocator because Qthreads frees
-    // it using free().
-    aligned_t ** qprecon = (aligned_t **) malloc( sizeof(aligned_t *) );
+    } else if (task->m_dep->m_task_type != task_root_type::Aggregate)
+      // Malloc the precondition array to pass to qthread_spawn().  For
+      // non-aggregate tasks, it is a single pointer since there are no
+      // dependences.  Qthreads will eventually free this allocation so memory
+      // will not be leaked. Is malloc thread-safe?  Should this call be
+      // guarded?  The memory can't be allocated from the pool allocator because
+      // Qthreads frees it using free().
+      aligned_t **qprecon = (aligned_t **)malloc(sizeof(aligned_t *));
 
-    *qprecon = reinterpret_cast<aligned_t *>( uintptr_t(m_dep_size) );
+    *qprecon = reinterpret_cast<aligned_t *>(uintptr_t(m_dep_size));
 
-    if ( task->m_task_type == task_root_type::TaskTeam && m_team_size > 1) {
+    if (task->m_task_type == task_root_type::TaskTeam && m_team_size > 1) {
       // If more than one shepherd spawn on a shepherd other than this shepherd
       const int num_shepherd  = qthread_num_shepherds();
       const int this_shepherd = qthread_shep();
-      int spawn_shepherd      = ( this_shepherd + 1 ) % num_shepherd ;
+      int spawn_shepherd      = (this_shepherd + 1) % num_shepherd;
 
 #if 0
   fprintf( stdout,
@@ -223,41 +204,29 @@ void TaskQueue< ExecSpace >::schedule
 #endif
 
       qthread_spawn_cloneable(
-        & Task::qthread_func,
-        this,
-        0,
-        NULL,
-        m_dep_size,
-        qprecon, /* dependences */
-        spawn_shepherd,
-        unsigned( QTHREAD_SPAWN_SIMPLE | QTHREAD_SPAWN_LOCAL_PRIORITY ),
-        m_team_size - 1
-      );
-    }
-    else {
+          &Task::qthread_func, this, 0, NULL, m_dep_size,
+          qprecon, /* dependences */
+          spawn_shepherd,
+          unsigned(QTHREAD_SPAWN_SIMPLE | QTHREAD_SPAWN_LOCAL_PRIORITY),
+          m_team_size - 1);
+    } else {
       qthread_spawn(
-        & Task::qthread_func, /* function */
-        this,                 /* function argument */
-        0,
-        NULL,
-        m_dep_size,
-        qprecon, /* dependences */
-        NO_SHEPHERD,
-        QTHREAD_SPAWN_SIMPLE /* allows optimization for non-blocking task */
+          &Task::qthread_func,          /* function */
+          this,                         /* function argument */
+          0, NULL, m_dep_size, qprecon, /* dependences */
+          NO_SHEPHERD,
+          QTHREAD_SPAWN_SIMPLE /* allows optimization for non-blocking task */
       );
     }
-  }
-  else {
+  } else {
     // GEM: How do I handle an aggregate (when_all) task?
   }
 }
 
 //----------------------------------------------------------------------------
 
-template< typename ExecSpace >
-KOKKOS_FUNCTION
-void TaskQueue< ExecSpace >::reschedule( task_root_type * task )
-{
+template <typename ExecSpace>
+KOKKOS_FUNCTION void TaskQueue<ExecSpace>::reschedule(task_root_type *task) {
   // Precondition:
   //   task is in Executing state
   //   task->m_next == LockTag
@@ -266,27 +235,25 @@ void TaskQueue< ExecSpace >::reschedule( task_root_type * task )
   //   task is in Executing-Respawn state
   //   task->m_next == 0 (no dependence)
 
-  task_root_type * const zero = (task_root_type *) 0 ;
-  task_root_type * const lock = (task_root_type *) task_root_type::LockTag ;
+  task_root_type *const zero = (task_root_type *)0;
+  task_root_type *const lock = (task_root_type *)task_root_type::LockTag;
 
-  if ( lock != Kokkos::atomic_exchange( & task->m_next, zero ) ) {
+  if (lock != Kokkos::atomic_exchange(&task->m_next, zero)) {
     Kokkos::abort("TaskScheduler::respawn ERROR: already respawned");
   }
 }
 
 //----------------------------------------------------------------------------
 
-template< typename ExecSpace >
-KOKKOS_FUNCTION
-void TaskQueue< ExecSpace >::complete
-  ( TaskQueue< ExecSpace >::task_root_type * task )
-{
+template <typename ExecSpace>
+KOKKOS_FUNCTION void TaskQueue<ExecSpace>::complete(
+    TaskQueue<ExecSpace>::task_root_type *task) {
   // Complete a runnable task that has finished executing
   // or a when_all task when all of its dependeneces are complete.
 
-  task_root_type * const zero = (task_root_type *) 0 ;
-  task_root_type * const lock = (task_root_type *) task_root_type::LockTag ;
-  task_root_type * const end  = (task_root_type *) task_root_type::EndTag ;
+  task_root_type *const zero = (task_root_type *)0;
+  task_root_type *const lock = (task_root_type *)task_root_type::LockTag;
+  task_root_type *const end  = (task_root_type *)task_root_type::EndTag;
 
 #if 0
   printf( "complete( 0x%lx { 0x%lx 0x%lx %d %d %d }\n",
@@ -300,15 +267,15 @@ void TaskQueue< ExecSpace >::complete
   fflush( stdout );
 #endif
 
-  const bool runnable = task_root_type::Aggregate != task->m_task_type ;
+  const bool runnable = task_root_type::Aggregate != task->m_task_type;
 
   //----------------------------------------
 
-  if ( runnable && lock != task->m_next ) {
+  if (runnable && lock != task->m_next) {
     // Is a runnable task has finished executing and requested respawn.
     // Schedule the task for subsequent execution.
 
-    schedule( task );
+    schedule(task);
   }
   //----------------------------------------
   else {
@@ -323,73 +290,67 @@ void TaskQueue< ExecSpace >::complete
     // Stop other tasks from adding themselves to this task's wait queue
     // by locking the head of this task's wait queue.
 
-    task_root_type * x = Kokkos::atomic_exchange( & task->m_wait, lock );
-
-    if ( x != (task_root_type *) lock ) {
+    task_root_type *x = Kokkos::atomic_exchange(&task->m_wait, lock);
 
+    if (x != (task_root_type *)lock) {
       // This thread has transitioned this 'task' to complete.
       // 'task' is no longer in a queue and is not executing
       // so decrement the reference count from 'task's creation.
       // If no other references to this 'task' then it will be deleted.
 
-      TaskQueue::assign( & task, zero );
+      TaskQueue::assign(&task, zero);
 
       // This thread has exclusive access to the wait list so
       // the concurrency-safe pop_task function is not needed.
       // Schedule the tasks that have been waiting on the input 'task',
       // which may have been deleted.
 
-      while ( x != end ) {
-
+      while (x != end) {
         // Set x->m_next = zero  <=  no dependence
 
-        task_root_type * const next =
-          (task_root_type *) Kokkos::atomic_exchange( & x->m_next, zero );
+        task_root_type *const next =
+            (task_root_type *)Kokkos::atomic_exchange(&x->m_next, zero);
 
-        schedule( x );
+        schedule(x);
 
-        x = next ;
+        x = next;
       }
     }
   }
 
-  if ( runnable ) {
+  if (runnable) {
     // A runnable task was popped from a ready queue and executed.
     // If respawned into a ready queue then the ready count was incremented
     // so decrement whether respawned or not.
-    Kokkos::atomic_decrement( & m_ready_count );
+    Kokkos::atomic_decrement(&m_ready_count);
   }
 }
 
 //----------------------------------------------------------------------------
 
-template<>
-aligned_t
-TaskBase< Kokkos::Qthreads, void, void >::qthread_func( void * arg )
-{
-  using execution_space = Kokkos::Qthreads ;
-  using task_root_type  = TaskBase< execution_space , void , void > ;
+template <>
+aligned_t TaskBase<Kokkos::Qthreads, void, void>::qthread_func(void *arg) {
+  using execution_space = Kokkos::Qthreads;
+  using task_root_type  = TaskBase<execution_space, void, void>;
   using Member          = Kokkos::Impl::QthreadsTeamPolicyMember;
 
-  task_root_type * const task = reinterpret_cast< task_root_type * >( arg );
+  task_root_type *const task = reinterpret_cast<task_root_type *>(arg);
 
   // First member of the team change state to executing.
   // Use compare-exchange to avoid race condition with a respawn.
-  Kokkos::atomic_compare_exchange_strong( & task->m_state,
-                                          queue_type::TASK_STATE_WAITING,
-                                          queue_type::TASK_STATE_EXECUTING
-                                        );
+  Kokkos::atomic_compare_exchange_strong(&task->m_state,
+                                         queue_type::TASK_STATE_WAITING,
+                                         queue_type::TASK_STATE_EXECUTING);
 
-  if ( task_root_type::TaskTeam == task->m_task_type )
-  {
-    if ( 1 < task->m_queue->m_team_size ) {
+  if (task_root_type::TaskTeam == task->m_task_type) {
+    if (1 < task->m_queue->m_team_size) {
       // Team task with team size of more than 1.
-      Member::TaskTeam task_team_tag ;
+      Member::TaskTeam task_team_tag;
 
       // Initialize team size and rank with shephered info
-      Member member( task_team_tag );
+      Member member(task_team_tag);
 
-      (*task->m_apply)( task , & member );
+      (*task->m_apply)(task, &member);
 
 #if 0
       fprintf( stdout,
@@ -404,18 +365,16 @@ TaskBase< Kokkos::Qthreads, void, void >::qthread_func( void * arg )
 #endif
 
       member.team_barrier();
-      if ( member.team_rank() == 0 ) task->closeout();
+      if (member.team_rank() == 0) task->closeout();
       member.team_barrier();
-    }
-    else {
+    } else {
       // Team task with team size of 1.
-      Member member ;
-      (*task->m_apply)( task , & member );
+      Member member;
+      (*task->m_apply)(task, &member);
       task->closeout();
     }
-  }
-  else {
-    (*task->m_apply)( task );
+  } else {
+    (*task->m_apply)(task);
     task->closeout();
   }
 
@@ -429,13 +388,11 @@ fprintf( stdout
 fflush(stdout);
 #endif
 
-  return 0 ;
+  return 0;
 }
 
 } /* namespace Impl */
 } /* namespace Kokkos */
 
-
-#endif /* #if defined( KOKKOS_ENABLE_TASKPOLICY ) */
-#endif // KOKKOS_QTHREADS_TASKQUEUE_IMPL_HPP
-
+#endif  /* #if defined( KOKKOS_ENABLE_TASKPOLICY ) */
+#endif  // KOKKOS_QTHREADS_TASKQUEUE_IMPL_HPP
diff --git a/lib/kokkos/core/src/ROCm/KokkosExp_ROCm_IterateTile_Refactor.hpp b/lib/kokkos/core/src/ROCm/KokkosExp_ROCm_IterateTile_Refactor.hpp
index 0d66d016cb..608c2ea9f7 100644
--- a/lib/kokkos/core/src/ROCm/KokkosExp_ROCm_IterateTile_Refactor.hpp
+++ b/lib/kokkos/core/src/ROCm/KokkosExp_ROCm_IterateTile_Refactor.hpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -45,7 +46,7 @@
 #define KOKKOS_ROCM_EXP_ITERATE_TILE_REFACTOR_HPP
 
 #include <Kokkos_Macros.hpp>
-#if defined( __HCC__ ) && defined( KOKKOS_ENABLE_ROCM )
+#if defined(__HCC__) && defined(KOKKOS_ENABLE_ROCM)
 
 #include <iostream>
 #include <algorithm>
@@ -55,67 +56,69 @@
 
 // #include<ROCm/Kokkos_ROCmExec.hpp>
 // Including the file above leads to following type of errors:
-// /home/ndellin/kokkos/core/src/ROCm/Kokkos_ROCmExec.hpp(84): error: incomplete type is not allowed
-// use existing Kokkos functionality, e.g. max blocks, once resolved
+// /home/ndellin/kokkos/core/src/ROCm/Kokkos_ROCmExec.hpp(84): error: incomplete
+// type is not allowed use existing Kokkos functionality, e.g. max blocks, once
+// resolved
 
 #if defined(KOKKOS_ENABLE_PROFILING)
 #include <impl/Kokkos_Profiling_Interface.hpp>
 #include <typeinfo>
 #endif
 
-
 #define threadIdx_x (hc_get_workitem_id(0))
 #define threadIdx_y (hc_get_workitem_id(1))
 #define threadIdx_z (hc_get_workitem_id(2))
 
-#define blockIdx_x  (hc_get_group_id(0))
-#define blockIdx_y  (hc_get_group_id(1))
-#define blockIdx_z  (hc_get_group_id(2))
+#define blockIdx_x (hc_get_group_id(0))
+#define blockIdx_y (hc_get_group_id(1))
+#define blockIdx_z (hc_get_group_id(2))
 
-#define blockDim_x  (hc_get_group_size(0))
-#define blockDim_y  (hc_get_group_size(1))
-#define blockDim_z  (hc_get_group_size(2))
+#define blockDim_x (hc_get_group_size(0))
+#define blockDim_y (hc_get_group_size(1))
+#define blockDim_z (hc_get_group_size(2))
 
-#define gridDim_x   (hc_get_num_groups(0))
-#define gridDim_y   (hc_get_num_groups(1))
-#define gridDim_z   (hc_get_num_groups(2))
+#define gridDim_x (hc_get_num_groups(0))
+#define gridDim_y (hc_get_num_groups(1))
+#define gridDim_z (hc_get_num_groups(2))
 
-
-namespace Kokkos { namespace Impl {
+namespace Kokkos {
+namespace Impl {
 
 namespace Refactor {
 
 // ------------------------------------------------------------------ //
 // ParallelFor iteration pattern
-template< int N , typename RP , typename Functor , typename Tag >
+template <int N, typename RP, typename Functor, typename Tag>
 struct DeviceIterateTile;
 
-//Rank 2
+// Rank 2
 // Specializations for void tag type
-template< typename RP , typename Functor >
-struct DeviceIterateTile<2,RP,Functor,void >
-{
+template <typename RP, typename Functor>
+struct DeviceIterateTile<2, RP, Functor, void> {
   using index_type = typename RP::index_type;
 
-  [[hc]]
-  DeviceIterateTile( const RP & rp_ , const Functor & f_ )
-  : m_rp(rp_)
-  , m_func(f_)
-  {}
+  [[hc]] DeviceIterateTile(const RP& rp_, const Functor& f_)
+      : m_rp(rp_), m_func(f_) {}
 
   KOKKOS_INLINE_FUNCTION
-  void exec_range() const
-  {
+  void exec_range() const {
     // LL
     if (RP::inner_direction == RP::Left) {
-      for ( index_type tile_id1 = (index_type)blockIdx_y; tile_id1 < m_rp.m_tile_end[1]; tile_id1 += gridDim_y ) {
-        const index_type offset_1 = tile_id1*m_rp.m_tile[1] + (index_type)threadIdx_y + (index_type)m_rp.m_lower[1];
-        if ( offset_1 < m_rp.m_upper[1] && (index_type)threadIdx_y < m_rp.m_tile[1] ) {
-
-          for ( index_type tile_id0 = (index_type)blockIdx_x; tile_id0 < m_rp.m_tile_end[0]; tile_id0 += gridDim_x ) {
-            const index_type offset_0 = tile_id0*m_rp.m_tile[0] + (index_type)threadIdx_x + (index_type)m_rp.m_lower[0];
-            if ( offset_0 < m_rp.m_upper[0] && (index_type)threadIdx_x < m_rp.m_tile[0] ) {
-              m_func(offset_0 , offset_1);
+      for (index_type tile_id1 = (index_type)blockIdx_y;
+           tile_id1 < m_rp.m_tile_end[1]; tile_id1 += gridDim_y) {
+        const index_type offset_1 = tile_id1 * m_rp.m_tile[1] +
+                                    (index_type)threadIdx_y +
+                                    (index_type)m_rp.m_lower[1];
+        if (offset_1 < m_rp.m_upper[1] &&
+            (index_type)threadIdx_y < m_rp.m_tile[1]) {
+          for (index_type tile_id0 = (index_type)blockIdx_x;
+               tile_id0 < m_rp.m_tile_end[0]; tile_id0 += gridDim_x) {
+            const index_type offset_0 = tile_id0 * m_rp.m_tile[0] +
+                                        (index_type)threadIdx_x +
+                                        (index_type)m_rp.m_lower[0];
+            if (offset_0 < m_rp.m_upper[0] &&
+                (index_type)threadIdx_x < m_rp.m_tile[0]) {
+              m_func(offset_0, offset_1);
             }
           }
         }
@@ -123,108 +126,127 @@ struct DeviceIterateTile<2,RP,Functor,void >
     }
     // LR
     else {
-      for ( index_type tile_id0 = (index_type)blockIdx_x; tile_id0 < m_rp.m_tile_end[0]; tile_id0 += gridDim_x ) {
-        const index_type offset_0 = tile_id0*m_rp.m_tile[0] + (index_type)threadIdx_x + (index_type)m_rp.m_lower[0];
-        if ( offset_0 < m_rp.m_upper[0] && (index_type)threadIdx_x < m_rp.m_tile[0] ) {
-
-          for ( index_type tile_id1 = (index_type)blockIdx_y; tile_id1 < m_rp.m_tile_end[1]; tile_id1 += gridDim_y ) {
-            const index_type offset_1 = tile_id1*m_rp.m_tile[1] + (index_type)threadIdx_y + (index_type)m_rp.m_lower[1];
-            if ( offset_1 < m_rp.m_upper[1] && (index_type)threadIdx_y < m_rp.m_tile[1] ) {
-              m_func(offset_0 , offset_1);
+      for (index_type tile_id0 = (index_type)blockIdx_x;
+           tile_id0 < m_rp.m_tile_end[0]; tile_id0 += gridDim_x) {
+        const index_type offset_0 = tile_id0 * m_rp.m_tile[0] +
+                                    (index_type)threadIdx_x +
+                                    (index_type)m_rp.m_lower[0];
+        if (offset_0 < m_rp.m_upper[0] &&
+            (index_type)threadIdx_x < m_rp.m_tile[0]) {
+          for (index_type tile_id1 = (index_type)blockIdx_y;
+               tile_id1 < m_rp.m_tile_end[1]; tile_id1 += gridDim_y) {
+            const index_type offset_1 = tile_id1 * m_rp.m_tile[1] +
+                                        (index_type)threadIdx_y +
+                                        (index_type)m_rp.m_lower[1];
+            if (offset_1 < m_rp.m_upper[1] &&
+                (index_type)threadIdx_y < m_rp.m_tile[1]) {
+              m_func(offset_0, offset_1);
             }
           }
         }
       }
     }
-  } //end exec_range
+  }  // end exec_range
 
-private:
-  const RP & m_rp;
-  const Functor & m_func;
+ private:
+  const RP& m_rp;
+  const Functor& m_func;
 };
 
 // Specializations for tag type
-template< typename RP , typename Functor , typename Tag >
-struct DeviceIterateTile<2,RP,Functor,Tag>
-{
+template <typename RP, typename Functor, typename Tag>
+struct DeviceIterateTile<2, RP, Functor, Tag> {
   using index_type = typename RP::index_type;
 
   KOKKOS_INLINE_FUNCTION
-  DeviceIterateTile( const RP & rp_ , const Functor & f_ )
-  : m_rp(rp_)
-  , m_func(f_)
-  {}
+  DeviceIterateTile(const RP& rp_, const Functor& f_) : m_rp(rp_), m_func(f_) {}
 
   KOKKOS_INLINE_FUNCTION
-  void exec_range() const
-  {
+  void exec_range() const {
     if (RP::inner_direction == RP::Left) {
       // Loop over size maxnumblocks until full range covered
-      for ( index_type tile_id1 = (index_type)blockIdx_y; tile_id1 < m_rp.m_tile_end[1]; tile_id1 += gridDim_y ) {
-        const index_type offset_1 = tile_id1*m_rp.m_tile[1] + (index_type)threadIdx_y + (index_type)m_rp.m_lower[1];
-        if ( offset_1 < m_rp.m_upper[1] && (index_type)threadIdx_y < m_rp.m_tile[1] ) {
-
-          for ( index_type tile_id0 = (index_type)blockIdx_x; tile_id0 < m_rp.m_tile_end[0]; tile_id0 += gridDim_x ) {
-            const index_type offset_0 = tile_id0*m_rp.m_tile[0] + (index_type)threadIdx_x + (index_type)m_rp.m_lower[0];
-            if ( offset_0 < m_rp.m_upper[0] && (index_type)threadIdx_x < m_rp.m_tile[0] ) {
-              m_func(Tag(), offset_0 , offset_1);
+      for (index_type tile_id1 = (index_type)blockIdx_y;
+           tile_id1 < m_rp.m_tile_end[1]; tile_id1 += gridDim_y) {
+        const index_type offset_1 = tile_id1 * m_rp.m_tile[1] +
+                                    (index_type)threadIdx_y +
+                                    (index_type)m_rp.m_lower[1];
+        if (offset_1 < m_rp.m_upper[1] &&
+            (index_type)threadIdx_y < m_rp.m_tile[1]) {
+          for (index_type tile_id0 = (index_type)blockIdx_x;
+               tile_id0 < m_rp.m_tile_end[0]; tile_id0 += gridDim_x) {
+            const index_type offset_0 = tile_id0 * m_rp.m_tile[0] +
+                                        (index_type)threadIdx_x +
+                                        (index_type)m_rp.m_lower[0];
+            if (offset_0 < m_rp.m_upper[0] &&
+                (index_type)threadIdx_x < m_rp.m_tile[0]) {
+              m_func(Tag(), offset_0, offset_1);
+            }
+          }
+        }
+      }
+    } else {
+      for (index_type tile_id0 = (index_type)blockIdx_x;
+           tile_id0 < m_rp.m_tile_end[0]; tile_id0 += gridDim_x) {
+        const index_type offset_0 = tile_id0 * m_rp.m_tile[0] +
+                                    (index_type)threadIdx_x +
+                                    (index_type)m_rp.m_lower[0];
+        if (offset_0 < m_rp.m_upper[0] &&
+            (index_type)threadIdx_x < m_rp.m_tile[0]) {
+          for (index_type tile_id1 = (index_type)blockIdx_y;
+               tile_id1 < m_rp.m_tile_end[1]; tile_id1 += gridDim_y) {
+            const index_type offset_1 = tile_id1 * m_rp.m_tile[1] +
+                                        (index_type)threadIdx_y +
+                                        (index_type)m_rp.m_lower[1];
+            if (offset_1 < m_rp.m_upper[1] &&
+                (index_type)threadIdx_y < m_rp.m_tile[1]) {
+              m_func(Tag(), offset_0, offset_1);
             }
           }
         }
       }
     }
-    else {
-      for ( index_type tile_id0 = (index_type)blockIdx_x; tile_id0 < m_rp.m_tile_end[0]; tile_id0 += gridDim_x ) {
-        const index_type offset_0 = tile_id0*m_rp.m_tile[0] + (index_type)threadIdx_x + (index_type)m_rp.m_lower[0];
-        if ( offset_0 < m_rp.m_upper[0] && (index_type)threadIdx_x < m_rp.m_tile[0] ) {
+  }  // end exec_range
 
-          for ( index_type tile_id1 = (index_type)blockIdx_y; tile_id1 < m_rp.m_tile_end[1]; tile_id1 += gridDim_y ) {
-            const index_type offset_1 = tile_id1*m_rp.m_tile[1] + (index_type)threadIdx_y + (index_type)m_rp.m_lower[1];
-            if ( offset_1 < m_rp.m_upper[1] && (index_type)threadIdx_y < m_rp.m_tile[1] ) {
-              m_func(Tag(), offset_0 , offset_1);
-            }
-          }
-        }
-      }
-    }
-  } //end exec_range
-
-private:
-  const RP & m_rp;
-  const Functor & m_func;
+ private:
+  const RP& m_rp;
+  const Functor& m_func;
 };
 
-
-//Rank 3
+// Rank 3
 // Specializations for void tag type
-template< typename RP , typename Functor >
-struct DeviceIterateTile<3,RP,Functor,void >
-{
+template <typename RP, typename Functor>
+struct DeviceIterateTile<3, RP, Functor, void> {
   using index_type = typename RP::index_type;
 
-  [[hc]]
-  DeviceIterateTile( const RP & rp_ , const Functor & f_ )
-  : m_rp(rp_)
-  , m_func(f_)
-  {}
+  [[hc]] DeviceIterateTile(const RP& rp_, const Functor& f_)
+      : m_rp(rp_), m_func(f_) {}
 
   KOKKOS_INLINE_FUNCTION
-  void exec_range() const
-  {
+  void exec_range() const {
     // LL
     if (RP::inner_direction == RP::Left) {
-      for ( index_type tile_id2 = (index_type)blockIdx_z; tile_id2 < m_rp.m_tile_end[2]; tile_id2 += gridDim_z ) {
-        const index_type offset_2 = tile_id2*m_rp.m_tile[2] + (index_type)threadIdx_z + (index_type)m_rp.m_lower[2];
-        if ( offset_2 < m_rp.m_upper[2] && (index_type)threadIdx_z < m_rp.m_tile[2] ) {
-
-          for ( index_type tile_id1 = (index_type)blockIdx_y; tile_id1 < m_rp.m_tile_end[1]; tile_id1 += gridDim_y ) {
-            const index_type offset_1 = tile_id1*m_rp.m_tile[1] + (index_type)threadIdx_y + (index_type)m_rp.m_lower[1];
-            if ( offset_1 < m_rp.m_upper[1] && (index_type)threadIdx_y < m_rp.m_tile[1] ) {
-
-              for ( index_type tile_id0 = (index_type)blockIdx_x; tile_id0 < m_rp.m_tile_end[0]; tile_id0 += gridDim_x ) {
-                const index_type offset_0 = tile_id0*m_rp.m_tile[0] + (index_type)threadIdx_x + (index_type)m_rp.m_lower[0];
-                if ( offset_0 < m_rp.m_upper[0] && (index_type)threadIdx_x < m_rp.m_tile[0] ) {
-                  m_func(offset_0 , offset_1 , offset_2);
+      for (index_type tile_id2 = (index_type)blockIdx_z;
+           tile_id2 < m_rp.m_tile_end[2]; tile_id2 += gridDim_z) {
+        const index_type offset_2 = tile_id2 * m_rp.m_tile[2] +
+                                    (index_type)threadIdx_z +
+                                    (index_type)m_rp.m_lower[2];
+        if (offset_2 < m_rp.m_upper[2] &&
+            (index_type)threadIdx_z < m_rp.m_tile[2]) {
+          for (index_type tile_id1 = (index_type)blockIdx_y;
+               tile_id1 < m_rp.m_tile_end[1]; tile_id1 += gridDim_y) {
+            const index_type offset_1 = tile_id1 * m_rp.m_tile[1] +
+                                        (index_type)threadIdx_y +
+                                        (index_type)m_rp.m_lower[1];
+            if (offset_1 < m_rp.m_upper[1] &&
+                (index_type)threadIdx_y < m_rp.m_tile[1]) {
+              for (index_type tile_id0 = (index_type)blockIdx_x;
+                   tile_id0 < m_rp.m_tile_end[0]; tile_id0 += gridDim_x) {
+                const index_type offset_0 = tile_id0 * m_rp.m_tile[0] +
+                                            (index_type)threadIdx_x +
+                                            (index_type)m_rp.m_lower[0];
+                if (offset_0 < m_rp.m_upper[0] &&
+                    (index_type)threadIdx_x < m_rp.m_tile[0]) {
+                  m_func(offset_0, offset_1, offset_2);
                 }
               }
             }
@@ -234,18 +256,28 @@ struct DeviceIterateTile<3,RP,Functor,void >
     }
     // LR
     else {
-      for ( index_type tile_id0 = (index_type)blockIdx_x; tile_id0 < m_rp.m_tile_end[0]; tile_id0 += gridDim_x ) {
-        const index_type offset_0 = tile_id0*m_rp.m_tile[0] + (index_type)threadIdx_x + (index_type)m_rp.m_lower[0];
-        if ( offset_0 < m_rp.m_upper[0] && (index_type)threadIdx_x < m_rp.m_tile[0] ) {
-
-          for ( index_type tile_id1 = (index_type)blockIdx_y; tile_id1 < m_rp.m_tile_end[1]; tile_id1 += gridDim_y ) {
-            const index_type offset_1 = tile_id1*m_rp.m_tile[1] + (index_type)threadIdx_y + (index_type)m_rp.m_lower[1];
-            if ( offset_1 < m_rp.m_upper[1] && (index_type)threadIdx_y < m_rp.m_tile[1] ) {
-
-              for ( index_type tile_id2 = (index_type)blockIdx_z; tile_id2 < m_rp.m_tile_end[2]; tile_id2 += gridDim_z ) {
-                const index_type offset_2 = tile_id2*m_rp.m_tile[2] + (index_type)threadIdx_z + (index_type)m_rp.m_lower[2];
-                if ( offset_2 < m_rp.m_upper[2] && (index_type)threadIdx_z < m_rp.m_tile[2] ) {
-                  m_func(offset_0 , offset_1 , offset_2);
+      for (index_type tile_id0 = (index_type)blockIdx_x;
+           tile_id0 < m_rp.m_tile_end[0]; tile_id0 += gridDim_x) {
+        const index_type offset_0 = tile_id0 * m_rp.m_tile[0] +
+                                    (index_type)threadIdx_x +
+                                    (index_type)m_rp.m_lower[0];
+        if (offset_0 < m_rp.m_upper[0] &&
+            (index_type)threadIdx_x < m_rp.m_tile[0]) {
+          for (index_type tile_id1 = (index_type)blockIdx_y;
+               tile_id1 < m_rp.m_tile_end[1]; tile_id1 += gridDim_y) {
+            const index_type offset_1 = tile_id1 * m_rp.m_tile[1] +
+                                        (index_type)threadIdx_y +
+                                        (index_type)m_rp.m_lower[1];
+            if (offset_1 < m_rp.m_upper[1] &&
+                (index_type)threadIdx_y < m_rp.m_tile[1]) {
+              for (index_type tile_id2 = (index_type)blockIdx_z;
+                   tile_id2 < m_rp.m_tile_end[2]; tile_id2 += gridDim_z) {
+                const index_type offset_2 = tile_id2 * m_rp.m_tile[2] +
+                                            (index_type)threadIdx_z +
+                                            (index_type)m_rp.m_lower[2];
+                if (offset_2 < m_rp.m_upper[2] &&
+                    (index_type)threadIdx_z < m_rp.m_tile[2]) {
+                  m_func(offset_0, offset_1, offset_2);
                 }
               }
             }
@@ -253,41 +285,75 @@ struct DeviceIterateTile<3,RP,Functor,void >
         }
       }
     }
-  } //end exec_range
+  }  // end exec_range
 
-private:
-  const RP & m_rp;
-  const Functor & m_func;
+ private:
+  const RP& m_rp;
+  const Functor& m_func;
 };
 
 // Specializations for void tag type
-template< typename RP , typename Functor , typename Tag >
-struct DeviceIterateTile<3,RP,Functor,Tag>
-{
+template <typename RP, typename Functor, typename Tag>
+struct DeviceIterateTile<3, RP, Functor, Tag> {
   using index_type = typename RP::index_type;
 
   KOKKOS_INLINE_FUNCTION
-  DeviceIterateTile( const RP & rp_ , const Functor & f_ )
-  : m_rp(rp_)
-  , m_func(f_)
-  {}
+  DeviceIterateTile(const RP& rp_, const Functor& f_) : m_rp(rp_), m_func(f_) {}
 
   KOKKOS_INLINE_FUNCTION
-  void exec_range() const
-  {
+  void exec_range() const {
     if (RP::inner_direction == RP::Left) {
-      for ( index_type tile_id2 = (index_type)blockIdx_z; tile_id2 < m_rp.m_tile_end[2]; tile_id2 += gridDim_z ) {
-        const index_type offset_2 = tile_id2*m_rp.m_tile[2] + (index_type)threadIdx_z + (index_type)m_rp.m_lower[2];
-        if ( offset_2 < m_rp.m_upper[2] && (index_type)threadIdx_z < m_rp.m_tile[2] ) {
-
-          for ( index_type tile_id1 = (index_type)blockIdx_y; tile_id1 < m_rp.m_tile_end[1]; tile_id1 += gridDim_y ) {
-            const index_type offset_1 = tile_id1*m_rp.m_tile[1] + (index_type)threadIdx_y + (index_type)m_rp.m_lower[1];
-            if ( offset_1 < m_rp.m_upper[1] && (index_type)threadIdx_y < m_rp.m_tile[1] ) {
-
-              for ( index_type tile_id0 = (index_type)blockIdx_x; tile_id0 < m_rp.m_tile_end[0]; tile_id0 += gridDim_x ) {
-                const index_type offset_0 = tile_id0*m_rp.m_tile[0] + (index_type)threadIdx_x + (index_type)m_rp.m_lower[0];
-                if ( offset_0 < m_rp.m_upper[0] && (index_type)threadIdx_x < m_rp.m_tile[0] ) {
-                  m_func(Tag(), offset_0 , offset_1 , offset_2);
+      for (index_type tile_id2 = (index_type)blockIdx_z;
+           tile_id2 < m_rp.m_tile_end[2]; tile_id2 += gridDim_z) {
+        const index_type offset_2 = tile_id2 * m_rp.m_tile[2] +
+                                    (index_type)threadIdx_z +
+                                    (index_type)m_rp.m_lower[2];
+        if (offset_2 < m_rp.m_upper[2] &&
+            (index_type)threadIdx_z < m_rp.m_tile[2]) {
+          for (index_type tile_id1 = (index_type)blockIdx_y;
+               tile_id1 < m_rp.m_tile_end[1]; tile_id1 += gridDim_y) {
+            const index_type offset_1 = tile_id1 * m_rp.m_tile[1] +
+                                        (index_type)threadIdx_y +
+                                        (index_type)m_rp.m_lower[1];
+            if (offset_1 < m_rp.m_upper[1] &&
+                (index_type)threadIdx_y < m_rp.m_tile[1]) {
+              for (index_type tile_id0 = (index_type)blockIdx_x;
+                   tile_id0 < m_rp.m_tile_end[0]; tile_id0 += gridDim_x) {
+                const index_type offset_0 = tile_id0 * m_rp.m_tile[0] +
+                                            (index_type)threadIdx_x +
+                                            (index_type)m_rp.m_lower[0];
+                if (offset_0 < m_rp.m_upper[0] &&
+                    (index_type)threadIdx_x < m_rp.m_tile[0]) {
+                  m_func(Tag(), offset_0, offset_1, offset_2);
+                }
+              }
+            }
+          }
+        }
+      }
+    } else {
+      for (index_type tile_id0 = (index_type)blockIdx_x;
+           tile_id0 < m_rp.m_tile_end[0]; tile_id0 += gridDim_x) {
+        const index_type offset_0 = tile_id0 * m_rp.m_tile[0] +
+                                    (index_type)threadIdx_x +
+                                    (index_type)m_rp.m_lower[0];
+        if (offset_0 < m_rp.m_upper[0] &&
+            (index_type)threadIdx_x < m_rp.m_tile[0]) {
+          for (index_type tile_id1 = (index_type)blockIdx_y;
+               tile_id1 < m_rp.m_tile_end[1]; tile_id1 += gridDim_y) {
+            const index_type offset_1 = tile_id1 * m_rp.m_tile[1] +
+                                        (index_type)threadIdx_y +
+                                        (index_type)m_rp.m_lower[1];
+            if (offset_1 < m_rp.m_upper[1] &&
+                (index_type)threadIdx_y < m_rp.m_tile[1]) {
+              for (index_type tile_id2 = (index_type)blockIdx_z;
+                   tile_id2 < m_rp.m_tile_end[2]; tile_id2 += gridDim_z) {
+                const index_type offset_2 = tile_id2 * m_rp.m_tile[2] +
+                                            (index_type)threadIdx_z +
+                                            (index_type)m_rp.m_lower[2];
+                if (offset_2 < m_rp.m_upper[2] &&
+                    (index_type)threadIdx_z < m_rp.m_tile[2]) {
+                  m_func(Tag(), offset_0, offset_1, offset_2);
                 }
               }
             }
@@ -295,84 +361,73 @@ struct DeviceIterateTile<3,RP,Functor,Tag>
         }
       }
     }
-    else {
-      for ( index_type tile_id0 = (index_type)blockIdx_x; tile_id0 < m_rp.m_tile_end[0]; tile_id0 += gridDim_x ) {
-        const index_type offset_0 = tile_id0*m_rp.m_tile[0] + (index_type)threadIdx_x + (index_type)m_rp.m_lower[0];
-        if ( offset_0 < m_rp.m_upper[0] && (index_type)threadIdx_x < m_rp.m_tile[0] ) {
+  }  // end exec_range
 
-          for ( index_type tile_id1 = (index_type)blockIdx_y; tile_id1 < m_rp.m_tile_end[1]; tile_id1 += gridDim_y ) {
-            const index_type offset_1 = tile_id1*m_rp.m_tile[1] + (index_type)threadIdx_y + (index_type)m_rp.m_lower[1];
-            if ( offset_1 < m_rp.m_upper[1] && (index_type)threadIdx_y < m_rp.m_tile[1] ) {
-
-              for ( index_type tile_id2 = (index_type)blockIdx_z; tile_id2 < m_rp.m_tile_end[2]; tile_id2 += gridDim_z ) {
-                const index_type offset_2 = tile_id2*m_rp.m_tile[2] + (index_type)threadIdx_z + (index_type)m_rp.m_lower[2];
-                if ( offset_2 < m_rp.m_upper[2] && (index_type)threadIdx_z < m_rp.m_tile[2] ) {
-                  m_func(Tag(), offset_0 , offset_1 , offset_2);
-                }
-              }
-            }
-          }
-        }
-      }
-    }
-  } //end exec_range
-
-private:
-  const RP & m_rp;
-  const Functor & m_func;
+ private:
+  const RP& m_rp;
+  const Functor& m_func;
 };
 
-
-//Rank 4
+// Rank 4
 // Specializations for void tag type
-template< typename RP , typename Functor >
-struct DeviceIterateTile<4,RP,Functor,void >
-{
+template <typename RP, typename Functor>
+struct DeviceIterateTile<4, RP, Functor, void> {
   using index_type = typename RP::index_type;
 
-  [[hc]]
-  DeviceIterateTile( const RP & rp_ , const Functor & f_ )
-  : m_rp(rp_)
-  , m_func(f_)
-  {}
+  [[hc]] DeviceIterateTile(const RP& rp_, const Functor& f_)
+      : m_rp(rp_), m_func(f_) {}
 
   static constexpr index_type max_blocks = 65535;
-  //static constexpr index_type max_blocks = static_cast<index_type>(Kokkos::Impl::ROCmTraits::UpperBoundGridCount);
+  // static constexpr index_type max_blocks =
+  // static_cast<index_type>(Kokkos::Impl::ROCmTraits::UpperBoundGridCount);
 
   KOKKOS_INLINE_FUNCTION
-  void exec_range() const
-  {
-    //enum { max_blocks = static_cast<index_type>(Kokkos::Impl::ROCmTraits::UpperBoundGridCount) };
-    //const index_type max_blocks = static_cast<index_type>( Kokkos::Impl::rocm_internal_maximum_grid_count() );
+  void exec_range() const {
+    // enum { max_blocks =
+    // static_cast<index_type>(Kokkos::Impl::ROCmTraits::UpperBoundGridCount) };
+    // const index_type max_blocks = static_cast<index_type>(
+    // Kokkos::Impl::rocm_internal_maximum_grid_count() );
     // LL
     if (RP::inner_direction == RP::Left) {
-      const index_type temp0  =  m_rp.m_tile_end[0];
-      const index_type temp1  =  m_rp.m_tile_end[1];
-      const index_type numbl0 = ( temp0 <= max_blocks ? temp0 : max_blocks ) ;
-      const index_type numbl1 = ( temp0*temp1 > max_blocks ? index_type( max_blocks / numbl0 ) :
-          (  temp1 <= max_blocks ? temp1 : max_blocks ) );
+      const index_type temp0  = m_rp.m_tile_end[0];
+      const index_type temp1  = m_rp.m_tile_end[1];
+      const index_type numbl0 = (temp0 <= max_blocks ? temp0 : max_blocks);
+      const index_type numbl1 =
+          (temp0 * temp1 > max_blocks
+               ? index_type(max_blocks / numbl0)
+               : (temp1 <= max_blocks ? temp1 : max_blocks));
 
       const index_type tile_id0 = (index_type)blockIdx_x % numbl0;
       const index_type tile_id1 = (index_type)blockIdx_x / numbl0;
-      const index_type thr_id0 = (index_type)threadIdx_x % m_rp.m_tile[0];
-      const index_type thr_id1 = (index_type)threadIdx_x / m_rp.m_tile[0];
+      const index_type thr_id0  = (index_type)threadIdx_x % m_rp.m_tile[0];
+      const index_type thr_id1  = (index_type)threadIdx_x / m_rp.m_tile[0];
 
-      for ( index_type tile_id3 = (index_type)blockIdx_z; tile_id3 < m_rp.m_tile_end[3]; tile_id3 += gridDim_z ) {
-        const index_type offset_3 = tile_id3*m_rp.m_tile[3] + (index_type)threadIdx_z + (index_type)m_rp.m_lower[3];
-        if ( offset_3 < m_rp.m_upper[3] && (index_type)threadIdx_z < m_rp.m_tile[3] ) {
-
-          for ( index_type tile_id2 = (index_type)blockIdx_y; tile_id2 < m_rp.m_tile_end[2]; tile_id2 += gridDim_y ) {
-            const index_type offset_2 = tile_id2*m_rp.m_tile[2] + (index_type)threadIdx_y + (index_type)m_rp.m_lower[2];
-            if ( offset_2 < m_rp.m_upper[2] && (index_type)threadIdx_y < m_rp.m_tile[2] ) {
-
-              for ( index_type j = tile_id1 ; j < m_rp.m_tile_end[1]; j += numbl1 ) {
-                const index_type offset_1 = j*m_rp.m_tile[1] + thr_id1 + (index_type)m_rp.m_lower[1];
-                if ( offset_1 < m_rp.m_upper[1] && thr_id1 < m_rp.m_tile[1] ) {
-
-                  for ( index_type i = tile_id0 ; i < m_rp.m_tile_end[0]; i += numbl0 ) {
-                    const index_type offset_0 = i*m_rp.m_tile[0] + thr_id0 + (index_type)m_rp.m_lower[0];
-                    if ( offset_0 < m_rp.m_upper[0] && thr_id0 < m_rp.m_tile[0] ) {
-                      m_func(offset_0 , offset_1 , offset_2 , offset_3);
+      for (index_type tile_id3 = (index_type)blockIdx_z;
+           tile_id3 < m_rp.m_tile_end[3]; tile_id3 += gridDim_z) {
+        const index_type offset_3 = tile_id3 * m_rp.m_tile[3] +
+                                    (index_type)threadIdx_z +
+                                    (index_type)m_rp.m_lower[3];
+        if (offset_3 < m_rp.m_upper[3] &&
+            (index_type)threadIdx_z < m_rp.m_tile[3]) {
+          for (index_type tile_id2 = (index_type)blockIdx_y;
+               tile_id2 < m_rp.m_tile_end[2]; tile_id2 += gridDim_y) {
+            const index_type offset_2 = tile_id2 * m_rp.m_tile[2] +
+                                        (index_type)threadIdx_y +
+                                        (index_type)m_rp.m_lower[2];
+            if (offset_2 < m_rp.m_upper[2] &&
+                (index_type)threadIdx_y < m_rp.m_tile[2]) {
+              for (index_type j = tile_id1; j < m_rp.m_tile_end[1];
+                   j += numbl1) {
+                const index_type offset_1 =
+                    j * m_rp.m_tile[1] + thr_id1 + (index_type)m_rp.m_lower[1];
+                if (offset_1 < m_rp.m_upper[1] && thr_id1 < m_rp.m_tile[1]) {
+                  for (index_type i = tile_id0; i < m_rp.m_tile_end[0];
+                       i += numbl0) {
+                    const index_type offset_0 = i * m_rp.m_tile[0] + thr_id0 +
+                                                (index_type)m_rp.m_lower[0];
+                    if (offset_0 < m_rp.m_upper[0] &&
+                        thr_id0 < m_rp.m_tile[0]) {
+                      m_func(offset_0, offset_1, offset_2, offset_3);
                     }
                   }
                 }
@@ -384,33 +439,42 @@ struct DeviceIterateTile<4,RP,Functor,void >
     }
     // LR
     else {
-      const index_type temp0  =  m_rp.m_tile_end[0];
-      const index_type temp1  =  m_rp.m_tile_end[1];
-      const index_type numbl1 = ( temp1 <= max_blocks ? temp1 : max_blocks ) ;
-      const index_type numbl0 = ( temp0*temp1 > max_blocks ? index_type( max_blocks / numbl1 ) :
-          ( temp0 <= max_blocks ? temp0 : max_blocks ) );
+      const index_type temp0  = m_rp.m_tile_end[0];
+      const index_type temp1  = m_rp.m_tile_end[1];
+      const index_type numbl1 = (temp1 <= max_blocks ? temp1 : max_blocks);
+      const index_type numbl0 =
+          (temp0 * temp1 > max_blocks
+               ? index_type(max_blocks / numbl1)
+               : (temp0 <= max_blocks ? temp0 : max_blocks));
 
       const index_type tile_id0 = (index_type)blockIdx_x / numbl1;
       const index_type tile_id1 = (index_type)blockIdx_x % numbl1;
-      const index_type thr_id0 = (index_type)threadIdx_x / m_rp.m_tile[1];
-      const index_type thr_id1 = (index_type)threadIdx_x % m_rp.m_tile[1];
+      const index_type thr_id0  = (index_type)threadIdx_x / m_rp.m_tile[1];
+      const index_type thr_id1  = (index_type)threadIdx_x % m_rp.m_tile[1];
 
-      for ( index_type i = tile_id0; i < m_rp.m_tile_end[0]; i += numbl0 ) {
-        const index_type offset_0 = i*m_rp.m_tile[0] + thr_id0 + (index_type)m_rp.m_lower[0];
-        if ( offset_0 < m_rp.m_upper[0] && thr_id0 < m_rp.m_tile[0] ) {
-
-          for ( index_type j = tile_id1; j < m_rp.m_tile_end[1]; j += numbl1 ) {
-            const index_type offset_1 = j*m_rp.m_tile[1] + thr_id1 + (index_type)m_rp.m_lower[1];
-            if ( offset_1 < m_rp.m_upper[1] && thr_id1 < m_rp.m_tile[1] ) {
-
-              for ( index_type tile_id2 = (index_type)blockIdx_y; tile_id2 < m_rp.m_tile_end[2]; tile_id2 += gridDim_y ) {
-                const index_type offset_2 = tile_id2*m_rp.m_tile[2] + (index_type)threadIdx_y + (index_type)m_rp.m_lower[2];
-                if ( offset_2 < m_rp.m_upper[2] && (index_type)threadIdx_y < m_rp.m_tile[2] ) {
-
-                  for ( index_type tile_id3 = (index_type)blockIdx_z; tile_id3 < m_rp.m_tile_end[3]; tile_id3 += gridDim_z ) {
-                    const index_type offset_3 = tile_id3*m_rp.m_tile[3] + (index_type)threadIdx_z + (index_type)m_rp.m_lower[3];
-                    if ( offset_3 < m_rp.m_upper[3] && (index_type)threadIdx_z < m_rp.m_tile[3] ) {
-                      m_func(offset_0 , offset_1 , offset_2 , offset_3);
+      for (index_type i = tile_id0; i < m_rp.m_tile_end[0]; i += numbl0) {
+        const index_type offset_0 =
+            i * m_rp.m_tile[0] + thr_id0 + (index_type)m_rp.m_lower[0];
+        if (offset_0 < m_rp.m_upper[0] && thr_id0 < m_rp.m_tile[0]) {
+          for (index_type j = tile_id1; j < m_rp.m_tile_end[1]; j += numbl1) {
+            const index_type offset_1 =
+                j * m_rp.m_tile[1] + thr_id1 + (index_type)m_rp.m_lower[1];
+            if (offset_1 < m_rp.m_upper[1] && thr_id1 < m_rp.m_tile[1]) {
+              for (index_type tile_id2 = (index_type)blockIdx_y;
+                   tile_id2 < m_rp.m_tile_end[2]; tile_id2 += gridDim_y) {
+                const index_type offset_2 = tile_id2 * m_rp.m_tile[2] +
+                                            (index_type)threadIdx_y +
+                                            (index_type)m_rp.m_lower[2];
+                if (offset_2 < m_rp.m_upper[2] &&
+                    (index_type)threadIdx_y < m_rp.m_tile[2]) {
+                  for (index_type tile_id3 = (index_type)blockIdx_z;
+                       tile_id3 < m_rp.m_tile_end[3]; tile_id3 += gridDim_z) {
+                    const index_type offset_3 = tile_id3 * m_rp.m_tile[3] +
+                                                (index_type)threadIdx_z +
+                                                (index_type)m_rp.m_lower[3];
+                    if (offset_3 < m_rp.m_upper[3] &&
+                        (index_type)threadIdx_z < m_rp.m_tile[3]) {
+                      m_func(offset_0, offset_1, offset_2, offset_3);
                     }
                   }
                 }
@@ -420,61 +484,71 @@ struct DeviceIterateTile<4,RP,Functor,void >
         }
       }
     }
-  } //end exec_range
+  }  // end exec_range
 
-private:
-  const RP & m_rp;
-  const Functor & m_func;
+ private:
+  const RP& m_rp;
+  const Functor& m_func;
 };
 
 // Specializations for void tag type
-template< typename RP , typename Functor , typename Tag >
-struct DeviceIterateTile<4,RP,Functor,Tag>
-{
+template <typename RP, typename Functor, typename Tag>
+struct DeviceIterateTile<4, RP, Functor, Tag> {
   using index_type = typename RP::index_type;
 
   KOKKOS_INLINE_FUNCTION
-  DeviceIterateTile( const RP & rp_ , const Functor & f_ )
-  : m_rp(rp_)
-  , m_func(f_)
-  {}
+  DeviceIterateTile(const RP& rp_, const Functor& f_) : m_rp(rp_), m_func(f_) {}
 
   static constexpr index_type max_blocks = 65535;
-  //static constexpr index_type max_blocks = static_cast<index_type>(Kokkos::Impl::ROCmTraits::UpperBoundGridCount);
+  // static constexpr index_type max_blocks =
+  // static_cast<index_type>(Kokkos::Impl::ROCmTraits::UpperBoundGridCount);
 
   KOKKOS_INLINE_FUNCTION
-  void exec_range() const
-  {
-    //enum { max_blocks = static_cast<index_type>(Kokkos::Impl::ROCmTraits::UpperBoundGridCount) };
-    //const index_type max_blocks = static_cast<index_type>( Kokkos::Impl::rocm_internal_maximum_grid_count() );
+  void exec_range() const {
+    // enum { max_blocks =
+    // static_cast<index_type>(Kokkos::Impl::ROCmTraits::UpperBoundGridCount) };
+    // const index_type max_blocks = static_cast<index_type>(
+    // Kokkos::Impl::rocm_internal_maximum_grid_count() );
     if (RP::inner_direction == RP::Left) {
-      const index_type temp0  =  m_rp.m_tile_end[0];
-      const index_type temp1  =  m_rp.m_tile_end[1];
-      const index_type numbl0 = ( temp0 <= max_blocks ? temp0 : max_blocks ) ;
-      const index_type numbl1 = ( temp0*temp1 > max_blocks ? index_type( max_blocks / numbl0 ) :
-          (  temp1 <= max_blocks ? temp1 : max_blocks ) );
+      const index_type temp0  = m_rp.m_tile_end[0];
+      const index_type temp1  = m_rp.m_tile_end[1];
+      const index_type numbl0 = (temp0 <= max_blocks ? temp0 : max_blocks);
+      const index_type numbl1 =
+          (temp0 * temp1 > max_blocks
+               ? index_type(max_blocks / numbl0)
+               : (temp1 <= max_blocks ? temp1 : max_blocks));
 
       const index_type tile_id0 = (index_type)blockIdx_x % numbl0;
       const index_type tile_id1 = (index_type)blockIdx_x / numbl0;
-      const index_type thr_id0 = (index_type)threadIdx_x % m_rp.m_tile[0];
-      const index_type thr_id1 = (index_type)threadIdx_x / m_rp.m_tile[0];
+      const index_type thr_id0  = (index_type)threadIdx_x % m_rp.m_tile[0];
+      const index_type thr_id1  = (index_type)threadIdx_x / m_rp.m_tile[0];
 
-      for ( index_type tile_id3 = (index_type)blockIdx_z; tile_id3 < m_rp.m_tile_end[3]; tile_id3 += gridDim_z ) {
-        const index_type offset_3 = tile_id3*m_rp.m_tile[3] + (index_type)threadIdx_z + (index_type)m_rp.m_lower[3];
-        if ( offset_3 < m_rp.m_upper[3] && (index_type)threadIdx_z < m_rp.m_tile[3] ) {
-
-          for ( index_type tile_id2 = (index_type)blockIdx_y; tile_id2 < m_rp.m_tile_end[2]; tile_id2 += gridDim_y ) {
-            const index_type offset_2 = tile_id2*m_rp.m_tile[2] + (index_type)threadIdx_y + (index_type)m_rp.m_lower[2];
-            if ( offset_2 < m_rp.m_upper[2] && (index_type)threadIdx_y < m_rp.m_tile[2] ) {
-
-              for ( index_type j = tile_id1; j < m_rp.m_tile_end[1]; j += numbl1 ) {
-                const index_type offset_1 = j*m_rp.m_tile[1] + thr_id1 + (index_type)m_rp.m_lower[1];
-                if ( offset_1 < m_rp.m_upper[1] && thr_id1 < m_rp.m_tile[1] ) {
-
-                  for ( index_type i = tile_id0; i < m_rp.m_tile_end[0]; i += numbl0 ) {
-                    const index_type offset_0 = i*m_rp.m_tile[0] + thr_id0 + (index_type)m_rp.m_lower[0];
-                    if ( offset_0 < m_rp.m_upper[0] && thr_id0 < m_rp.m_tile[0] ) {
-                      m_func(Tag(), offset_0 , offset_1 , offset_2 , offset_3);
+      for (index_type tile_id3 = (index_type)blockIdx_z;
+           tile_id3 < m_rp.m_tile_end[3]; tile_id3 += gridDim_z) {
+        const index_type offset_3 = tile_id3 * m_rp.m_tile[3] +
+                                    (index_type)threadIdx_z +
+                                    (index_type)m_rp.m_lower[3];
+        if (offset_3 < m_rp.m_upper[3] &&
+            (index_type)threadIdx_z < m_rp.m_tile[3]) {
+          for (index_type tile_id2 = (index_type)blockIdx_y;
+               tile_id2 < m_rp.m_tile_end[2]; tile_id2 += gridDim_y) {
+            const index_type offset_2 = tile_id2 * m_rp.m_tile[2] +
+                                        (index_type)threadIdx_y +
+                                        (index_type)m_rp.m_lower[2];
+            if (offset_2 < m_rp.m_upper[2] &&
+                (index_type)threadIdx_y < m_rp.m_tile[2]) {
+              for (index_type j = tile_id1; j < m_rp.m_tile_end[1];
+                   j += numbl1) {
+                const index_type offset_1 =
+                    j * m_rp.m_tile[1] + thr_id1 + (index_type)m_rp.m_lower[1];
+                if (offset_1 < m_rp.m_upper[1] && thr_id1 < m_rp.m_tile[1]) {
+                  for (index_type i = tile_id0; i < m_rp.m_tile_end[0];
+                       i += numbl0) {
+                    const index_type offset_0 = i * m_rp.m_tile[0] + thr_id0 +
+                                                (index_type)m_rp.m_lower[0];
+                    if (offset_0 < m_rp.m_upper[0] &&
+                        thr_id0 < m_rp.m_tile[0]) {
+                      m_func(Tag(), offset_0, offset_1, offset_2, offset_3);
                     }
                   }
                 }
@@ -483,35 +557,43 @@ struct DeviceIterateTile<4,RP,Functor,Tag>
           }
         }
       }
-    }
-    else {
-      const index_type temp0  =  m_rp.m_tile_end[0];
-      const index_type temp1  =  m_rp.m_tile_end[1];
-      const index_type numbl1 = ( temp1 <= max_blocks ? temp1 : max_blocks ) ;
-      const index_type numbl0 = ( temp0*temp1 > max_blocks ? index_type( max_blocks / numbl1 ) :
-          ( temp0 <= max_blocks ? temp0 : max_blocks ) );
+    } else {
+      const index_type temp0  = m_rp.m_tile_end[0];
+      const index_type temp1  = m_rp.m_tile_end[1];
+      const index_type numbl1 = (temp1 <= max_blocks ? temp1 : max_blocks);
+      const index_type numbl0 =
+          (temp0 * temp1 > max_blocks
+               ? index_type(max_blocks / numbl1)
+               : (temp0 <= max_blocks ? temp0 : max_blocks));
 
       const index_type tile_id0 = (index_type)blockIdx_x / numbl1;
       const index_type tile_id1 = (index_type)blockIdx_x % numbl1;
-      const index_type thr_id0 = (index_type)threadIdx_x / m_rp.m_tile[1];
-      const index_type thr_id1 = (index_type)threadIdx_x % m_rp.m_tile[1];
+      const index_type thr_id0  = (index_type)threadIdx_x / m_rp.m_tile[1];
+      const index_type thr_id1  = (index_type)threadIdx_x % m_rp.m_tile[1];
 
-      for ( index_type i = tile_id0; i < m_rp.m_tile_end[0]; i += numbl0 ) {
-        const index_type offset_0 = i*m_rp.m_tile[0] + thr_id0 + (index_type)m_rp.m_lower[0];
-        if ( offset_0 < m_rp.m_upper[0] && thr_id0 < m_rp.m_tile[0] ) {
-
-          for ( index_type j = tile_id1; j < m_rp.m_tile_end[1]; j += numbl1 ) {
-            const index_type offset_1 = tile_id1*m_rp.m_tile[1] + thr_id1 + (index_type)m_rp.m_lower[1];
-            if ( offset_1 < m_rp.m_upper[1] && thr_id1 < m_rp.m_tile[1] ) {
-
-              for ( index_type tile_id2 = (index_type)blockIdx_y; tile_id2 < m_rp.m_tile_end[2]; tile_id2 += gridDim_y ) {
-                const index_type offset_2 = tile_id2*m_rp.m_tile[2] + (index_type)threadIdx_y + (index_type)m_rp.m_lower[2];
-                if ( offset_2 < m_rp.m_upper[2] && (index_type)threadIdx_y < m_rp.m_tile[2] ) {
-
-                  for ( index_type tile_id3 = (index_type)blockIdx_z; tile_id3 < m_rp.m_tile_end[3]; tile_id3 += gridDim_z ) {
-                    const index_type offset_3 = tile_id3*m_rp.m_tile[3] + (index_type)threadIdx_z + (index_type)m_rp.m_lower[3];
-                    if ( offset_3 < m_rp.m_upper[3] && (index_type)threadIdx_z < m_rp.m_tile[3] ) {
-                      m_func(Tag() , offset_0 , offset_1 , offset_2 , offset_3);
+      for (index_type i = tile_id0; i < m_rp.m_tile_end[0]; i += numbl0) {
+        const index_type offset_0 =
+            i * m_rp.m_tile[0] + thr_id0 + (index_type)m_rp.m_lower[0];
+        if (offset_0 < m_rp.m_upper[0] && thr_id0 < m_rp.m_tile[0]) {
+          for (index_type j = tile_id1; j < m_rp.m_tile_end[1]; j += numbl1) {
+            const index_type offset_1 = tile_id1 * m_rp.m_tile[1] + thr_id1 +
+                                        (index_type)m_rp.m_lower[1];
+            if (offset_1 < m_rp.m_upper[1] && thr_id1 < m_rp.m_tile[1]) {
+              for (index_type tile_id2 = (index_type)blockIdx_y;
+                   tile_id2 < m_rp.m_tile_end[2]; tile_id2 += gridDim_y) {
+                const index_type offset_2 = tile_id2 * m_rp.m_tile[2] +
+                                            (index_type)threadIdx_y +
+                                            (index_type)m_rp.m_lower[2];
+                if (offset_2 < m_rp.m_upper[2] &&
+                    (index_type)threadIdx_y < m_rp.m_tile[2]) {
+                  for (index_type tile_id3 = (index_type)blockIdx_z;
+                       tile_id3 < m_rp.m_tile_end[3]; tile_id3 += gridDim_z) {
+                    const index_type offset_3 = tile_id3 * m_rp.m_tile[3] +
+                                                (index_type)threadIdx_z +
+                                                (index_type)m_rp.m_lower[3];
+                    if (offset_3 < m_rp.m_upper[3] &&
+                        (index_type)threadIdx_z < m_rp.m_tile[3]) {
+                      m_func(Tag(), offset_0, offset_1, offset_2, offset_3);
                     }
                   }
                 }
@@ -521,81 +603,91 @@ struct DeviceIterateTile<4,RP,Functor,Tag>
         }
       }
     }
-  } //end exec_range
+  }  // end exec_range
 
-private:
-  const RP & m_rp;
-  const Functor & m_func;
+ private:
+  const RP& m_rp;
+  const Functor& m_func;
 };
 
-
-//Rank 5
+// Rank 5
 // Specializations for void tag type
-template< typename RP , typename Functor >
-struct DeviceIterateTile<5,RP,Functor,void >
-{
+template <typename RP, typename Functor>
+struct DeviceIterateTile<5, RP, Functor, void> {
   using index_type = typename RP::index_type;
 
-  
-  [[hc]]
-  DeviceIterateTile( const RP & rp_ , const Functor & f_ )
-  : m_rp(rp_)
-  , m_func(f_)
-  {}
+  [[hc]] DeviceIterateTile(const RP& rp_, const Functor& f_)
+      : m_rp(rp_), m_func(f_) {}
 
   static constexpr index_type max_blocks = 65535;
-  //static constexpr index_type max_blocks = static_cast<index_type>(Kokkos::Impl::ROCmTraits::UpperBoundGridCount);
+  // static constexpr index_type max_blocks =
+  // static_cast<index_type>(Kokkos::Impl::ROCmTraits::UpperBoundGridCount);
 
   KOKKOS_INLINE_FUNCTION
-  void exec_range() const
-  {
-    //enum { max_blocks = static_cast<index_type>(Kokkos::Impl::ROCmTraits::UpperBoundGridCount) };
-    //const index_type max_blocks = static_cast<index_type>( Kokkos::Impl::rocm_internal_maximum_grid_count() );
+  void exec_range() const {
+    // enum { max_blocks =
+    // static_cast<index_type>(Kokkos::Impl::ROCmTraits::UpperBoundGridCount) };
+    // const index_type max_blocks = static_cast<index_type>(
+    // Kokkos::Impl::rocm_internal_maximum_grid_count() );
     // LL
     if (RP::inner_direction == RP::Left) {
-
-      index_type temp0  =  m_rp.m_tile_end[0];
-      index_type temp1  =  m_rp.m_tile_end[1];
-      const index_type numbl0 = ( temp0 <= max_blocks ? temp0 : max_blocks ) ;
-      const index_type numbl1 = ( temp0*temp1 > max_blocks ? index_type( max_blocks / numbl0 ) :
-          (  temp1 <= max_blocks ? temp1 : max_blocks ) );
+      index_type temp0        = m_rp.m_tile_end[0];
+      index_type temp1        = m_rp.m_tile_end[1];
+      const index_type numbl0 = (temp0 <= max_blocks ? temp0 : max_blocks);
+      const index_type numbl1 =
+          (temp0 * temp1 > max_blocks
+               ? index_type(max_blocks / numbl0)
+               : (temp1 <= max_blocks ? temp1 : max_blocks));
 
       const index_type tile_id0 = (index_type)blockIdx_x % numbl0;
       const index_type tile_id1 = (index_type)blockIdx_x / numbl0;
-      const index_type thr_id0 = (index_type)threadIdx_x % m_rp.m_tile[0];
-      const index_type thr_id1 = (index_type)threadIdx_x / m_rp.m_tile[0];
+      const index_type thr_id0  = (index_type)threadIdx_x % m_rp.m_tile[0];
+      const index_type thr_id1  = (index_type)threadIdx_x / m_rp.m_tile[0];
 
-      temp0  =  m_rp.m_tile_end[2];
-      temp1  =  m_rp.m_tile_end[3];
-      const index_type numbl2 = ( temp0 <= max_blocks ? temp0 : max_blocks ) ;
-      const index_type numbl3 = ( temp0*temp1 > max_blocks ? index_type( max_blocks / numbl2 ) :
-          (  temp1 <= max_blocks ? temp1 : max_blocks ) );
+      temp0                   = m_rp.m_tile_end[2];
+      temp1                   = m_rp.m_tile_end[3];
+      const index_type numbl2 = (temp0 <= max_blocks ? temp0 : max_blocks);
+      const index_type numbl3 =
+          (temp0 * temp1 > max_blocks
+               ? index_type(max_blocks / numbl2)
+               : (temp1 <= max_blocks ? temp1 : max_blocks));
 
       const index_type tile_id2 = (index_type)blockIdx_y % numbl2;
       const index_type tile_id3 = (index_type)blockIdx_y / numbl2;
-      const index_type thr_id2 = (index_type)threadIdx_y % m_rp.m_tile[2];
-      const index_type thr_id3 = (index_type)threadIdx_y / m_rp.m_tile[2];
+      const index_type thr_id2  = (index_type)threadIdx_y % m_rp.m_tile[2];
+      const index_type thr_id3  = (index_type)threadIdx_y / m_rp.m_tile[2];
 
-      for ( index_type tile_id4 = (index_type)blockIdx_z; tile_id4 < m_rp.m_tile_end[4]; tile_id4 += gridDim_z ) {
-        const index_type offset_4 = tile_id4*m_rp.m_tile[4] + (index_type)threadIdx_z + (index_type)m_rp.m_lower[4];
-        if ( offset_4 < m_rp.m_upper[4] && (index_type)threadIdx_z < m_rp.m_tile[4] ) {
-
-          for ( index_type l = tile_id3; l < m_rp.m_tile_end[3]; l += numbl3 ) {
-            const index_type offset_3 = l*m_rp.m_tile[3] + thr_id3 + (index_type)m_rp.m_lower[3];
-            if ( offset_3 < m_rp.m_upper[3] && thr_id3 < m_rp.m_tile[3] ) {
-
-              for ( index_type k = tile_id2; k < m_rp.m_tile_end[2]; k += numbl2 ) {
-                const index_type offset_2 = k*m_rp.m_tile[2] + thr_id2 + (index_type)m_rp.m_lower[2];
-                if ( offset_2 < m_rp.m_upper[2] && thr_id2 < m_rp.m_tile[2] ) {
-
-                  for ( index_type j = tile_id1 ; j < m_rp.m_tile_end[1]; j += numbl1 ) {
-                    const index_type offset_1 = j*m_rp.m_tile[1] + thr_id1 + (index_type)m_rp.m_lower[1];
-                    if ( offset_1 < m_rp.m_upper[1] && thr_id1 < m_rp.m_tile[1] ) {
-
-                      for ( index_type i = tile_id0 ; i < m_rp.m_tile_end[0]; i += numbl0 ) {
-                        const index_type offset_0 = i*m_rp.m_tile[0] + thr_id0 + (index_type)m_rp.m_lower[0];
-                        if ( offset_0 < m_rp.m_upper[0] && thr_id0 < m_rp.m_tile[0] ) {
-                          m_func(offset_0 , offset_1 , offset_2 , offset_3, offset_4);
+      for (index_type tile_id4 = (index_type)blockIdx_z;
+           tile_id4 < m_rp.m_tile_end[4]; tile_id4 += gridDim_z) {
+        const index_type offset_4 = tile_id4 * m_rp.m_tile[4] +
+                                    (index_type)threadIdx_z +
+                                    (index_type)m_rp.m_lower[4];
+        if (offset_4 < m_rp.m_upper[4] &&
+            (index_type)threadIdx_z < m_rp.m_tile[4]) {
+          for (index_type l = tile_id3; l < m_rp.m_tile_end[3]; l += numbl3) {
+            const index_type offset_3 =
+                l * m_rp.m_tile[3] + thr_id3 + (index_type)m_rp.m_lower[3];
+            if (offset_3 < m_rp.m_upper[3] && thr_id3 < m_rp.m_tile[3]) {
+              for (index_type k = tile_id2; k < m_rp.m_tile_end[2];
+                   k += numbl2) {
+                const index_type offset_2 =
+                    k * m_rp.m_tile[2] + thr_id2 + (index_type)m_rp.m_lower[2];
+                if (offset_2 < m_rp.m_upper[2] && thr_id2 < m_rp.m_tile[2]) {
+                  for (index_type j = tile_id1; j < m_rp.m_tile_end[1];
+                       j += numbl1) {
+                    const index_type offset_1 = j * m_rp.m_tile[1] + thr_id1 +
+                                                (index_type)m_rp.m_lower[1];
+                    if (offset_1 < m_rp.m_upper[1] &&
+                        thr_id1 < m_rp.m_tile[1]) {
+                      for (index_type i = tile_id0; i < m_rp.m_tile_end[0];
+                           i += numbl0) {
+                        const index_type offset_0 = i * m_rp.m_tile[0] +
+                                                    thr_id0 +
+                                                    (index_type)m_rp.m_lower[0];
+                        if (offset_0 < m_rp.m_upper[0] &&
+                            thr_id0 < m_rp.m_tile[0]) {
+                          m_func(offset_0, offset_1, offset_2, offset_3,
+                                 offset_4);
                         }
                       }
                     }
@@ -609,48 +701,61 @@ struct DeviceIterateTile<5,RP,Functor,void >
     }
     // LR
     else {
-      index_type temp0  =  m_rp.m_tile_end[0];
-      index_type temp1  =  m_rp.m_tile_end[1];
-      const index_type numbl1 = ( temp1 <= max_blocks ? temp1 : max_blocks ) ;
-      const index_type numbl0 = ( temp0*temp1 > max_blocks ? index_type( max_blocks / numbl1 ) :
-          ( temp0 <= max_blocks ? temp0 : max_blocks ) );
+      index_type temp0        = m_rp.m_tile_end[0];
+      index_type temp1        = m_rp.m_tile_end[1];
+      const index_type numbl1 = (temp1 <= max_blocks ? temp1 : max_blocks);
+      const index_type numbl0 =
+          (temp0 * temp1 > max_blocks
+               ? index_type(max_blocks / numbl1)
+               : (temp0 <= max_blocks ? temp0 : max_blocks));
 
       const index_type tile_id0 = (index_type)blockIdx_x / numbl1;
       const index_type tile_id1 = (index_type)blockIdx_x % numbl1;
-      const index_type thr_id0 = (index_type)threadIdx_x / m_rp.m_tile[1];
-      const index_type thr_id1 = (index_type)threadIdx_x % m_rp.m_tile[1];
+      const index_type thr_id0  = (index_type)threadIdx_x / m_rp.m_tile[1];
+      const index_type thr_id1  = (index_type)threadIdx_x % m_rp.m_tile[1];
 
-      temp0  =  m_rp.m_tile_end[2];
-      temp1  =  m_rp.m_tile_end[3];
-      const index_type numbl3 = ( temp1 <= max_blocks ? temp1 : max_blocks ) ;
-      const index_type numbl2 = ( temp0*temp1 > max_blocks ? index_type( max_blocks / numbl3 ) :
-          (  temp0 <= max_blocks ? temp0 : max_blocks ) );
+      temp0                   = m_rp.m_tile_end[2];
+      temp1                   = m_rp.m_tile_end[3];
+      const index_type numbl3 = (temp1 <= max_blocks ? temp1 : max_blocks);
+      const index_type numbl2 =
+          (temp0 * temp1 > max_blocks
+               ? index_type(max_blocks / numbl3)
+               : (temp0 <= max_blocks ? temp0 : max_blocks));
 
       const index_type tile_id2 = (index_type)blockIdx_y / numbl3;
       const index_type tile_id3 = (index_type)blockIdx_y % numbl3;
-      const index_type thr_id2 = (index_type)threadIdx_y / m_rp.m_tile[3];
-      const index_type thr_id3 = (index_type)threadIdx_y % m_rp.m_tile[3];
+      const index_type thr_id2  = (index_type)threadIdx_y / m_rp.m_tile[3];
+      const index_type thr_id3  = (index_type)threadIdx_y % m_rp.m_tile[3];
 
-      for ( index_type i = tile_id0; i < m_rp.m_tile_end[0]; i += numbl0 ) {
-        const index_type offset_0 = i*m_rp.m_tile[0] + thr_id0 + (index_type)m_rp.m_lower[0];
-        if ( offset_0 < m_rp.m_upper[0] && thr_id0 < m_rp.m_tile[0] ) {
-
-          for ( index_type j = tile_id1; j < m_rp.m_tile_end[1]; j += numbl1 ) {
-            const index_type offset_1 = j*m_rp.m_tile[1] + thr_id1 + (index_type)m_rp.m_lower[1];
-            if ( offset_1 < m_rp.m_upper[1] && thr_id1 < m_rp.m_tile[1] ) {
-
-              for ( index_type k = tile_id2; k < m_rp.m_tile_end[2]; k += numbl2 ) {
-                const index_type offset_2 = k*m_rp.m_tile[2] + thr_id2 + (index_type)m_rp.m_lower[2];
-                if ( offset_2 < m_rp.m_upper[2] && thr_id2 < m_rp.m_tile[2] ) {
-
-                  for ( index_type l = tile_id3; l < m_rp.m_tile_end[3]; l += numbl3 ) {
-                    const index_type offset_3 = l*m_rp.m_tile[3] + thr_id3 + (index_type)m_rp.m_lower[3];
-                    if ( offset_3 < m_rp.m_upper[3] && thr_id3 < m_rp.m_tile[3] ) {
-
-                      for ( index_type tile_id4 = (index_type)blockIdx_z; tile_id4 < m_rp.m_tile_end[4]; tile_id4 += gridDim_z ) {
-                        const index_type offset_4 = tile_id4*m_rp.m_tile[4] + (index_type)threadIdx_z + (index_type)m_rp.m_lower[4];
-                        if ( offset_4 < m_rp.m_upper[4] && (index_type)threadIdx_z < m_rp.m_tile[4] ) {
-                          m_func(offset_0 , offset_1 , offset_2 , offset_3 , offset_4);
+      for (index_type i = tile_id0; i < m_rp.m_tile_end[0]; i += numbl0) {
+        const index_type offset_0 =
+            i * m_rp.m_tile[0] + thr_id0 + (index_type)m_rp.m_lower[0];
+        if (offset_0 < m_rp.m_upper[0] && thr_id0 < m_rp.m_tile[0]) {
+          for (index_type j = tile_id1; j < m_rp.m_tile_end[1]; j += numbl1) {
+            const index_type offset_1 =
+                j * m_rp.m_tile[1] + thr_id1 + (index_type)m_rp.m_lower[1];
+            if (offset_1 < m_rp.m_upper[1] && thr_id1 < m_rp.m_tile[1]) {
+              for (index_type k = tile_id2; k < m_rp.m_tile_end[2];
+                   k += numbl2) {
+                const index_type offset_2 =
+                    k * m_rp.m_tile[2] + thr_id2 + (index_type)m_rp.m_lower[2];
+                if (offset_2 < m_rp.m_upper[2] && thr_id2 < m_rp.m_tile[2]) {
+                  for (index_type l = tile_id3; l < m_rp.m_tile_end[3];
+                       l += numbl3) {
+                    const index_type offset_3 = l * m_rp.m_tile[3] + thr_id3 +
+                                                (index_type)m_rp.m_lower[3];
+                    if (offset_3 < m_rp.m_upper[3] &&
+                        thr_id3 < m_rp.m_tile[3]) {
+                      for (index_type tile_id4 = (index_type)blockIdx_z;
+                           tile_id4 < m_rp.m_tile_end[4];
+                           tile_id4 += gridDim_z) {
+                        const index_type offset_4 = tile_id4 * m_rp.m_tile[4] +
+                                                    (index_type)threadIdx_z +
+                                                    (index_type)m_rp.m_lower[4];
+                        if (offset_4 < m_rp.m_upper[4] &&
+                            (index_type)threadIdx_z < m_rp.m_tile[4]) {
+                          m_func(offset_0, offset_1, offset_2, offset_3,
+                                 offset_4);
                         }
                       }
                     }
@@ -662,77 +767,90 @@ struct DeviceIterateTile<5,RP,Functor,void >
         }
       }
     }
-  } //end exec_range
+  }  // end exec_range
 
-private:
-  const RP & m_rp;
-  const Functor & m_func;
+ private:
+  const RP& m_rp;
+  const Functor& m_func;
 };
 
 // Specializations for tag type
-template< typename RP , typename Functor , typename Tag >
-struct DeviceIterateTile<5,RP,Functor,Tag>
-{
+template <typename RP, typename Functor, typename Tag>
+struct DeviceIterateTile<5, RP, Functor, Tag> {
   using index_type = typename RP::index_type;
 
   KOKKOS_INLINE_FUNCTION
-  DeviceIterateTile( const RP & rp_ , const Functor & f_ )
-  : m_rp(rp_)
-  , m_func(f_)
-  {}
+  DeviceIterateTile(const RP& rp_, const Functor& f_) : m_rp(rp_), m_func(f_) {}
 
   static constexpr index_type max_blocks = 65535;
-  //static constexpr index_type max_blocks = static_cast<index_type>(Kokkos::Impl::ROCmTraits::UpperBoundGridCount);
+  // static constexpr index_type max_blocks =
+  // static_cast<index_type>(Kokkos::Impl::ROCmTraits::UpperBoundGridCount);
 
   KOKKOS_INLINE_FUNCTION
-  void exec_range() const
-  {
-    //enum { max_blocks = static_cast<index_type>(Kokkos::Impl::ROCmTraits::UpperBoundGridCount) };
-    //const index_type max_blocks = static_cast<index_type>( Kokkos::Impl::rocm_internal_maximum_grid_count() );
+  void exec_range() const {
+    // enum { max_blocks =
+    // static_cast<index_type>(Kokkos::Impl::ROCmTraits::UpperBoundGridCount) };
+    // const index_type max_blocks = static_cast<index_type>(
+    // Kokkos::Impl::rocm_internal_maximum_grid_count() );
     // LL
     if (RP::inner_direction == RP::Left) {
-      index_type temp0  =  m_rp.m_tile_end[0];
-      index_type temp1  =  m_rp.m_tile_end[1];
-      const index_type numbl0 = ( temp0 <= max_blocks ? temp0 : max_blocks ) ;
-      const index_type numbl1 = ( temp0*temp1 > max_blocks ? index_type( max_blocks / numbl0 ) :
-          (  temp1 <= max_blocks ? temp1 : max_blocks ) );
+      index_type temp0        = m_rp.m_tile_end[0];
+      index_type temp1        = m_rp.m_tile_end[1];
+      const index_type numbl0 = (temp0 <= max_blocks ? temp0 : max_blocks);
+      const index_type numbl1 =
+          (temp0 * temp1 > max_blocks
+               ? index_type(max_blocks / numbl0)
+               : (temp1 <= max_blocks ? temp1 : max_blocks));
 
       const index_type tile_id0 = (index_type)blockIdx_x % numbl0;
       const index_type tile_id1 = (index_type)blockIdx_x / numbl0;
-      const index_type thr_id0 = (index_type)threadIdx_x % m_rp.m_tile[0];
-      const index_type thr_id1 = (index_type)threadIdx_x / m_rp.m_tile[0];
+      const index_type thr_id0  = (index_type)threadIdx_x % m_rp.m_tile[0];
+      const index_type thr_id1  = (index_type)threadIdx_x / m_rp.m_tile[0];
 
-      temp0  =  m_rp.m_tile_end[2];
-      temp1  =  m_rp.m_tile_end[3];
-      const index_type numbl2 = ( temp0 <= max_blocks ? temp0 : max_blocks ) ;
-      const index_type numbl3 = ( temp0*temp1 > max_blocks ? index_type( max_blocks / numbl2 ) :
-          (  temp1 <= max_blocks ? temp1 : max_blocks ) );
+      temp0                   = m_rp.m_tile_end[2];
+      temp1                   = m_rp.m_tile_end[3];
+      const index_type numbl2 = (temp0 <= max_blocks ? temp0 : max_blocks);
+      const index_type numbl3 =
+          (temp0 * temp1 > max_blocks
+               ? index_type(max_blocks / numbl2)
+               : (temp1 <= max_blocks ? temp1 : max_blocks));
 
       const index_type tile_id2 = (index_type)blockIdx_y % numbl2;
       const index_type tile_id3 = (index_type)blockIdx_y / numbl2;
-      const index_type thr_id2 = (index_type)threadIdx_y % m_rp.m_tile[2];
-      const index_type thr_id3 = (index_type)threadIdx_y / m_rp.m_tile[2];
+      const index_type thr_id2  = (index_type)threadIdx_y % m_rp.m_tile[2];
+      const index_type thr_id3  = (index_type)threadIdx_y / m_rp.m_tile[2];
 
-      for ( index_type tile_id4 = (index_type)blockIdx_z; tile_id4 < m_rp.m_tile_end[4]; tile_id4 += gridDim_z ) {
-        const index_type offset_4 = tile_id4*m_rp.m_tile[4] + (index_type)threadIdx_z + (index_type)m_rp.m_lower[4];
-        if ( offset_4 < m_rp.m_upper[4] && (index_type)threadIdx_z < m_rp.m_tile[4] ) {
-
-          for ( index_type l = tile_id3; l < m_rp.m_tile_end[3]; l += numbl3 ) {
-            const index_type offset_3 = l*m_rp.m_tile[3] + thr_id3 + (index_type)m_rp.m_lower[3];
-            if ( offset_3 < m_rp.m_upper[3] && thr_id3 < m_rp.m_tile[3] ) {
-
-              for ( index_type k = tile_id2; k < m_rp.m_tile_end[2]; k += numbl2 ) {
-                const index_type offset_2 = k*m_rp.m_tile[2] + thr_id2 + (index_type)m_rp.m_lower[2];
-                if ( offset_2 < m_rp.m_upper[2] && thr_id2 < m_rp.m_tile[2] ) {
-
-                  for ( index_type j = tile_id1 ; j < m_rp.m_tile_end[1]; j += numbl1 ) {
-                    const index_type offset_1 = j*m_rp.m_tile[1] + thr_id1 + (index_type)m_rp.m_lower[1];
-                    if ( offset_1 < m_rp.m_upper[1] && thr_id1 < m_rp.m_tile[1] ) {
-
-                      for ( index_type i = tile_id0 ; i < m_rp.m_tile_end[0]; i += numbl0 ) {
-                        const index_type offset_0 = i*m_rp.m_tile[0] + thr_id0 + (index_type)m_rp.m_lower[0];
-                        if ( offset_0 < m_rp.m_upper[0] && thr_id0 < m_rp.m_tile[0] ) {
-                          m_func(Tag() , offset_0 , offset_1 , offset_2 , offset_3, offset_4);
+      for (index_type tile_id4 = (index_type)blockIdx_z;
+           tile_id4 < m_rp.m_tile_end[4]; tile_id4 += gridDim_z) {
+        const index_type offset_4 = tile_id4 * m_rp.m_tile[4] +
+                                    (index_type)threadIdx_z +
+                                    (index_type)m_rp.m_lower[4];
+        if (offset_4 < m_rp.m_upper[4] &&
+            (index_type)threadIdx_z < m_rp.m_tile[4]) {
+          for (index_type l = tile_id3; l < m_rp.m_tile_end[3]; l += numbl3) {
+            const index_type offset_3 =
+                l * m_rp.m_tile[3] + thr_id3 + (index_type)m_rp.m_lower[3];
+            if (offset_3 < m_rp.m_upper[3] && thr_id3 < m_rp.m_tile[3]) {
+              for (index_type k = tile_id2; k < m_rp.m_tile_end[2];
+                   k += numbl2) {
+                const index_type offset_2 =
+                    k * m_rp.m_tile[2] + thr_id2 + (index_type)m_rp.m_lower[2];
+                if (offset_2 < m_rp.m_upper[2] && thr_id2 < m_rp.m_tile[2]) {
+                  for (index_type j = tile_id1; j < m_rp.m_tile_end[1];
+                       j += numbl1) {
+                    const index_type offset_1 = j * m_rp.m_tile[1] + thr_id1 +
+                                                (index_type)m_rp.m_lower[1];
+                    if (offset_1 < m_rp.m_upper[1] &&
+                        thr_id1 < m_rp.m_tile[1]) {
+                      for (index_type i = tile_id0; i < m_rp.m_tile_end[0];
+                           i += numbl0) {
+                        const index_type offset_0 = i * m_rp.m_tile[0] +
+                                                    thr_id0 +
+                                                    (index_type)m_rp.m_lower[0];
+                        if (offset_0 < m_rp.m_upper[0] &&
+                            thr_id0 < m_rp.m_tile[0]) {
+                          m_func(Tag(), offset_0, offset_1, offset_2, offset_3,
+                                 offset_4);
                         }
                       }
                     }
@@ -746,48 +864,61 @@ struct DeviceIterateTile<5,RP,Functor,Tag>
     }
     // LR
     else {
-      index_type temp0  =  m_rp.m_tile_end[0];
-      index_type temp1  =  m_rp.m_tile_end[1];
-      const index_type numbl1 = ( temp1 <= max_blocks ? temp1 : max_blocks ) ;
-      const index_type numbl0 = ( temp0*temp1 > max_blocks ? index_type( max_blocks / numbl1 ) :
-          ( temp0 <= max_blocks ? temp0 : max_blocks ) );
+      index_type temp0        = m_rp.m_tile_end[0];
+      index_type temp1        = m_rp.m_tile_end[1];
+      const index_type numbl1 = (temp1 <= max_blocks ? temp1 : max_blocks);
+      const index_type numbl0 =
+          (temp0 * temp1 > max_blocks
+               ? index_type(max_blocks / numbl1)
+               : (temp0 <= max_blocks ? temp0 : max_blocks));
 
       const index_type tile_id0 = (index_type)blockIdx_x / numbl1;
       const index_type tile_id1 = (index_type)blockIdx_x % numbl1;
-      const index_type thr_id0 = (index_type)threadIdx_x / m_rp.m_tile[1];
-      const index_type thr_id1 = (index_type)threadIdx_x % m_rp.m_tile[1];
+      const index_type thr_id0  = (index_type)threadIdx_x / m_rp.m_tile[1];
+      const index_type thr_id1  = (index_type)threadIdx_x % m_rp.m_tile[1];
 
-      temp0  =  m_rp.m_tile_end[2];
-      temp1  =  m_rp.m_tile_end[3];
-      const index_type numbl3 = ( temp1 <= max_blocks ? temp1 : max_blocks ) ;
-      const index_type numbl2 = ( temp0*temp1 > max_blocks ? index_type( max_blocks / numbl3 ) :
-          (  temp0 <= max_blocks ? temp0 : max_blocks ) );
+      temp0                   = m_rp.m_tile_end[2];
+      temp1                   = m_rp.m_tile_end[3];
+      const index_type numbl3 = (temp1 <= max_blocks ? temp1 : max_blocks);
+      const index_type numbl2 =
+          (temp0 * temp1 > max_blocks
+               ? index_type(max_blocks / numbl3)
+               : (temp0 <= max_blocks ? temp0 : max_blocks));
 
       const index_type tile_id2 = (index_type)blockIdx_y / numbl3;
       const index_type tile_id3 = (index_type)blockIdx_y % numbl3;
-      const index_type thr_id2 = (index_type)threadIdx_y / m_rp.m_tile[3];
-      const index_type thr_id3 = (index_type)threadIdx_y % m_rp.m_tile[3];
+      const index_type thr_id2  = (index_type)threadIdx_y / m_rp.m_tile[3];
+      const index_type thr_id3  = (index_type)threadIdx_y % m_rp.m_tile[3];
 
-      for ( index_type i = tile_id0; i < m_rp.m_tile_end[0]; i += numbl0 ) {
-        const index_type offset_0 = i*m_rp.m_tile[0] + thr_id0 + (index_type)m_rp.m_lower[0];
-        if ( offset_0 < m_rp.m_upper[0] && thr_id0 < m_rp.m_tile[0] ) {
-
-          for ( index_type j = tile_id1; j < m_rp.m_tile_end[1]; j += numbl1 ) {
-            const index_type offset_1 = j*m_rp.m_tile[1] + thr_id1 + (index_type)m_rp.m_lower[1];
-            if ( offset_1 < m_rp.m_upper[1] && thr_id1 < m_rp.m_tile[1] ) {
-
-              for ( index_type k = tile_id2; k < m_rp.m_tile_end[2]; k += numbl2 ) {
-                const index_type offset_2 = k*m_rp.m_tile[2] + thr_id2 + (index_type)m_rp.m_lower[2];
-                if ( offset_2 < m_rp.m_upper[2] && thr_id2 < m_rp.m_tile[2] ) {
-
-                  for ( index_type l = tile_id3; l < m_rp.m_tile_end[3]; l += numbl3 ) {
-                    const index_type offset_3 = l*m_rp.m_tile[3] + thr_id3 + (index_type)m_rp.m_lower[3];
-                    if ( offset_3 < m_rp.m_upper[3] && thr_id3 < m_rp.m_tile[3] ) {
-
-                      for ( index_type tile_id4 = (index_type)blockIdx_z; tile_id4 < m_rp.m_tile_end[4]; tile_id4 += gridDim_z ) {
-                        const index_type offset_4 = tile_id4*m_rp.m_tile[4] + (index_type)threadIdx_z + (index_type)m_rp.m_lower[4];
-                        if ( offset_4 < m_rp.m_upper[4] && (index_type)threadIdx_z < m_rp.m_tile[4] ) {
-                          m_func(Tag() , offset_0 , offset_1 , offset_2 , offset_3 , offset_4);
+      for (index_type i = tile_id0; i < m_rp.m_tile_end[0]; i += numbl0) {
+        const index_type offset_0 =
+            i * m_rp.m_tile[0] + thr_id0 + (index_type)m_rp.m_lower[0];
+        if (offset_0 < m_rp.m_upper[0] && thr_id0 < m_rp.m_tile[0]) {
+          for (index_type j = tile_id1; j < m_rp.m_tile_end[1]; j += numbl1) {
+            const index_type offset_1 =
+                j * m_rp.m_tile[1] + thr_id1 + (index_type)m_rp.m_lower[1];
+            if (offset_1 < m_rp.m_upper[1] && thr_id1 < m_rp.m_tile[1]) {
+              for (index_type k = tile_id2; k < m_rp.m_tile_end[2];
+                   k += numbl2) {
+                const index_type offset_2 =
+                    k * m_rp.m_tile[2] + thr_id2 + (index_type)m_rp.m_lower[2];
+                if (offset_2 < m_rp.m_upper[2] && thr_id2 < m_rp.m_tile[2]) {
+                  for (index_type l = tile_id3; l < m_rp.m_tile_end[3];
+                       l += numbl3) {
+                    const index_type offset_3 = l * m_rp.m_tile[3] + thr_id3 +
+                                                (index_type)m_rp.m_lower[3];
+                    if (offset_3 < m_rp.m_upper[3] &&
+                        thr_id3 < m_rp.m_tile[3]) {
+                      for (index_type tile_id4 = (index_type)blockIdx_z;
+                           tile_id4 < m_rp.m_tile_end[4];
+                           tile_id4 += gridDim_z) {
+                        const index_type offset_4 = tile_id4 * m_rp.m_tile[4] +
+                                                    (index_type)threadIdx_z +
+                                                    (index_type)m_rp.m_lower[4];
+                        if (offset_4 < m_rp.m_upper[4] &&
+                            (index_type)threadIdx_z < m_rp.m_tile[4]) {
+                          m_func(Tag(), offset_0, offset_1, offset_2, offset_3,
+                                 offset_4);
                         }
                       }
                     }
@@ -799,94 +930,108 @@ struct DeviceIterateTile<5,RP,Functor,Tag>
         }
       }
     }
-  } //end exec_range
+  }  // end exec_range
 
-private:
-  const RP & m_rp;
-  const Functor & m_func;
+ private:
+  const RP& m_rp;
+  const Functor& m_func;
 };
 
-
-//Rank 6
+// Rank 6
 // Specializations for void tag type
-template< typename RP , typename Functor >
-struct DeviceIterateTile<6,RP,Functor,void >
-{
+template <typename RP, typename Functor>
+struct DeviceIterateTile<6, RP, Functor, void> {
   using index_type = typename RP::index_type;
 
-  [[hc]]
-  DeviceIterateTile( const RP & rp_ , const Functor & f_ )
-  : m_rp(rp_)
-  , m_func(f_)
-  {}
+  [[hc]] DeviceIterateTile(const RP& rp_, const Functor& f_)
+      : m_rp(rp_), m_func(f_) {}
 
   static constexpr index_type max_blocks = 65535;
-  //static constexpr index_type max_blocks = static_cast<index_type>(Kokkos::Impl::ROCmTraits::UpperBoundGridCount);
+  // static constexpr index_type max_blocks =
+  // static_cast<index_type>(Kokkos::Impl::ROCmTraits::UpperBoundGridCount);
 
   KOKKOS_INLINE_FUNCTION
-  void exec_range() const
-  {
-    //enum { max_blocks = static_cast<index_type>(Kokkos::Impl::ROCmTraits::UpperBoundGridCount) };
-    //const index_type max_blocks = static_cast<index_type>( Kokkos::Impl::rocm_internal_maximum_grid_count() );
+  void exec_range() const {
+    // enum { max_blocks =
+    // static_cast<index_type>(Kokkos::Impl::ROCmTraits::UpperBoundGridCount) };
+    // const index_type max_blocks = static_cast<index_type>(
+    // Kokkos::Impl::rocm_internal_maximum_grid_count() );
     // LL
     if (RP::inner_direction == RP::Left) {
-      index_type temp0  =  m_rp.m_tile_end[0];
-      index_type temp1  =  m_rp.m_tile_end[1];
-      const index_type numbl0 = ( temp0 <= max_blocks ? temp0 : max_blocks ) ;
-      const index_type numbl1 = ( temp0*temp1 > max_blocks ? index_type( max_blocks / numbl0 ) :
-          (  temp1 <= max_blocks ? temp1 : max_blocks ) );
+      index_type temp0        = m_rp.m_tile_end[0];
+      index_type temp1        = m_rp.m_tile_end[1];
+      const index_type numbl0 = (temp0 <= max_blocks ? temp0 : max_blocks);
+      const index_type numbl1 =
+          (temp0 * temp1 > max_blocks
+               ? index_type(max_blocks / numbl0)
+               : (temp1 <= max_blocks ? temp1 : max_blocks));
 
       const index_type tile_id0 = (index_type)blockIdx_x % numbl0;
       const index_type tile_id1 = (index_type)blockIdx_x / numbl0;
-      const index_type thr_id0 = (index_type)threadIdx_x % m_rp.m_tile[0];
-      const index_type thr_id1 = (index_type)threadIdx_x / m_rp.m_tile[0];
+      const index_type thr_id0  = (index_type)threadIdx_x % m_rp.m_tile[0];
+      const index_type thr_id1  = (index_type)threadIdx_x / m_rp.m_tile[0];
 
-      temp0  =  m_rp.m_tile_end[2];
-      temp1  =  m_rp.m_tile_end[3];
-      const index_type numbl2 = ( temp0 <= max_blocks ? temp0 : max_blocks ) ;
-      const index_type numbl3 = ( temp0*temp1 > max_blocks ? index_type( max_blocks / numbl2 ) :
-          (  temp1 <= max_blocks ? temp1 : max_blocks ) );
+      temp0                   = m_rp.m_tile_end[2];
+      temp1                   = m_rp.m_tile_end[3];
+      const index_type numbl2 = (temp0 <= max_blocks ? temp0 : max_blocks);
+      const index_type numbl3 =
+          (temp0 * temp1 > max_blocks
+               ? index_type(max_blocks / numbl2)
+               : (temp1 <= max_blocks ? temp1 : max_blocks));
 
       const index_type tile_id2 = (index_type)blockIdx_y % numbl2;
       const index_type tile_id3 = (index_type)blockIdx_y / numbl2;
-      const index_type thr_id2 = (index_type)threadIdx_y % m_rp.m_tile[2];
-      const index_type thr_id3 = (index_type)threadIdx_y / m_rp.m_tile[2];
+      const index_type thr_id2  = (index_type)threadIdx_y % m_rp.m_tile[2];
+      const index_type thr_id3  = (index_type)threadIdx_y / m_rp.m_tile[2];
 
-      temp0  =  m_rp.m_tile_end[4];
-      temp1  =  m_rp.m_tile_end[5];
-      const index_type numbl4 = ( temp0 <= max_blocks ? temp0 : max_blocks ) ;
-      const index_type numbl5 = ( temp0*temp1 > max_blocks ? index_type( max_blocks / numbl4 ) :
-          (  temp1 <= max_blocks ? temp1 : max_blocks ) );
+      temp0                   = m_rp.m_tile_end[4];
+      temp1                   = m_rp.m_tile_end[5];
+      const index_type numbl4 = (temp0 <= max_blocks ? temp0 : max_blocks);
+      const index_type numbl5 =
+          (temp0 * temp1 > max_blocks
+               ? index_type(max_blocks / numbl4)
+               : (temp1 <= max_blocks ? temp1 : max_blocks));
 
       const index_type tile_id4 = (index_type)blockIdx_z % numbl4;
       const index_type tile_id5 = (index_type)blockIdx_z / numbl4;
-      const index_type thr_id4 = (index_type)threadIdx_z % m_rp.m_tile[4];
-      const index_type thr_id5 = (index_type)threadIdx_z / m_rp.m_tile[4];
+      const index_type thr_id4  = (index_type)threadIdx_z % m_rp.m_tile[4];
+      const index_type thr_id5  = (index_type)threadIdx_z / m_rp.m_tile[4];
 
-      for ( index_type n = tile_id5; n < m_rp.m_tile_end[5]; n += numbl5 ) {
-        const index_type offset_5 = n*m_rp.m_tile[5] + thr_id5 + (index_type)m_rp.m_lower[5];
-        if ( offset_5 < m_rp.m_upper[5] && thr_id5 < m_rp.m_tile[5] ) {
-
-          for ( index_type m = tile_id4; m < m_rp.m_tile_end[4]; m += numbl4 ) {
-            const index_type offset_4 = m*m_rp.m_tile[4] + thr_id4 + (index_type)m_rp.m_lower[4];
-            if ( offset_4 < m_rp.m_upper[4] && thr_id4 < m_rp.m_tile[4] ) {
-
-              for ( index_type l = tile_id3; l < m_rp.m_tile_end[3]; l += numbl3 ) {
-                const index_type offset_3 = l*m_rp.m_tile[3] + thr_id3 + (index_type)m_rp.m_lower[3];
-                if ( offset_3 < m_rp.m_upper[3] && thr_id3 < m_rp.m_tile[3] ) {
-
-                  for ( index_type k = tile_id2; k < m_rp.m_tile_end[2]; k += numbl2 ) {
-                    const index_type offset_2 = k*m_rp.m_tile[2] + thr_id2 + (index_type)m_rp.m_lower[2];
-                    if ( offset_2 < m_rp.m_upper[2] && thr_id2 < m_rp.m_tile[2] ) {
-
-                      for ( index_type j = tile_id1 ; j < m_rp.m_tile_end[1]; j += numbl1 ) {
-                        const index_type offset_1 = j*m_rp.m_tile[1] + thr_id1 + (index_type)m_rp.m_lower[1];
-                        if ( offset_1 < m_rp.m_upper[1] && thr_id1 < m_rp.m_tile[1] ) {
-
-                          for ( index_type i = tile_id0 ; i < m_rp.m_tile_end[0]; i += numbl0 ) {
-                            const index_type offset_0 = i*m_rp.m_tile[0] + thr_id0 + (index_type)m_rp.m_lower[0];
-                            if ( offset_0 < m_rp.m_upper[0] && thr_id0 < m_rp.m_tile[0] ) {
-                              m_func(offset_0 , offset_1 , offset_2 , offset_3, offset_4, offset_5);
+      for (index_type n = tile_id5; n < m_rp.m_tile_end[5]; n += numbl5) {
+        const index_type offset_5 =
+            n * m_rp.m_tile[5] + thr_id5 + (index_type)m_rp.m_lower[5];
+        if (offset_5 < m_rp.m_upper[5] && thr_id5 < m_rp.m_tile[5]) {
+          for (index_type m = tile_id4; m < m_rp.m_tile_end[4]; m += numbl4) {
+            const index_type offset_4 =
+                m * m_rp.m_tile[4] + thr_id4 + (index_type)m_rp.m_lower[4];
+            if (offset_4 < m_rp.m_upper[4] && thr_id4 < m_rp.m_tile[4]) {
+              for (index_type l = tile_id3; l < m_rp.m_tile_end[3];
+                   l += numbl3) {
+                const index_type offset_3 =
+                    l * m_rp.m_tile[3] + thr_id3 + (index_type)m_rp.m_lower[3];
+                if (offset_3 < m_rp.m_upper[3] && thr_id3 < m_rp.m_tile[3]) {
+                  for (index_type k = tile_id2; k < m_rp.m_tile_end[2];
+                       k += numbl2) {
+                    const index_type offset_2 = k * m_rp.m_tile[2] + thr_id2 +
+                                                (index_type)m_rp.m_lower[2];
+                    if (offset_2 < m_rp.m_upper[2] &&
+                        thr_id2 < m_rp.m_tile[2]) {
+                      for (index_type j = tile_id1; j < m_rp.m_tile_end[1];
+                           j += numbl1) {
+                        const index_type offset_1 = j * m_rp.m_tile[1] +
+                                                    thr_id1 +
+                                                    (index_type)m_rp.m_lower[1];
+                        if (offset_1 < m_rp.m_upper[1] &&
+                            thr_id1 < m_rp.m_tile[1]) {
+                          for (index_type i = tile_id0; i < m_rp.m_tile_end[0];
+                               i += numbl0) {
+                            const index_type offset_0 =
+                                i * m_rp.m_tile[0] + thr_id0 +
+                                (index_type)m_rp.m_lower[0];
+                            if (offset_0 < m_rp.m_upper[0] &&
+                                thr_id0 < m_rp.m_tile[0]) {
+                              m_func(offset_0, offset_1, offset_2, offset_3,
+                                     offset_4, offset_5);
                             }
                           }
                         }
@@ -902,63 +1047,80 @@ struct DeviceIterateTile<6,RP,Functor,void >
     }
     // LR
     else {
-      index_type temp0  =  m_rp.m_tile_end[0];
-      index_type temp1  =  m_rp.m_tile_end[1];
-      const index_type numbl1 = ( temp1 <= max_blocks ? temp1 : max_blocks ) ;
-      const index_type numbl0 = ( temp0*temp1 > max_blocks ? index_type( max_blocks / numbl1 ) :
-          ( temp0 <= max_blocks ? temp0 : max_blocks ) );
+      index_type temp0        = m_rp.m_tile_end[0];
+      index_type temp1        = m_rp.m_tile_end[1];
+      const index_type numbl1 = (temp1 <= max_blocks ? temp1 : max_blocks);
+      const index_type numbl0 =
+          (temp0 * temp1 > max_blocks
+               ? index_type(max_blocks / numbl1)
+               : (temp0 <= max_blocks ? temp0 : max_blocks));
 
       const index_type tile_id0 = (index_type)blockIdx_x / numbl1;
       const index_type tile_id1 = (index_type)blockIdx_x % numbl1;
-      const index_type thr_id0 = (index_type)threadIdx_x / m_rp.m_tile[1];
-      const index_type thr_id1 = (index_type)threadIdx_x % m_rp.m_tile[1];
+      const index_type thr_id0  = (index_type)threadIdx_x / m_rp.m_tile[1];
+      const index_type thr_id1  = (index_type)threadIdx_x % m_rp.m_tile[1];
 
-      temp0  =  m_rp.m_tile_end[2];
-      temp1  =  m_rp.m_tile_end[3];
-      const index_type numbl3 = ( temp1 <= max_blocks ? temp1 : max_blocks ) ;
-      const index_type numbl2 = ( temp0*temp1 > max_blocks ? index_type( max_blocks / numbl3 ) :
-          (  temp0 <= max_blocks ? temp0 : max_blocks ) );
+      temp0                   = m_rp.m_tile_end[2];
+      temp1                   = m_rp.m_tile_end[3];
+      const index_type numbl3 = (temp1 <= max_blocks ? temp1 : max_blocks);
+      const index_type numbl2 =
+          (temp0 * temp1 > max_blocks
+               ? index_type(max_blocks / numbl3)
+               : (temp0 <= max_blocks ? temp0 : max_blocks));
 
       const index_type tile_id2 = (index_type)blockIdx_y / numbl3;
       const index_type tile_id3 = (index_type)blockIdx_y % numbl3;
-      const index_type thr_id2 = (index_type)threadIdx_y / m_rp.m_tile[3];
-      const index_type thr_id3 = (index_type)threadIdx_y % m_rp.m_tile[3];
+      const index_type thr_id2  = (index_type)threadIdx_y / m_rp.m_tile[3];
+      const index_type thr_id3  = (index_type)threadIdx_y % m_rp.m_tile[3];
 
-      temp0  =  m_rp.m_tile_end[4];
-      temp1  =  m_rp.m_tile_end[5];
-      const index_type numbl5 = ( temp1 <= max_blocks ? temp1 : max_blocks ) ;
-      const index_type numbl4 = ( temp0*temp1 > max_blocks ? index_type( max_blocks / numbl5 ) :
-          (  temp0 <= max_blocks ? temp0 : max_blocks ) );
+      temp0                   = m_rp.m_tile_end[4];
+      temp1                   = m_rp.m_tile_end[5];
+      const index_type numbl5 = (temp1 <= max_blocks ? temp1 : max_blocks);
+      const index_type numbl4 =
+          (temp0 * temp1 > max_blocks
+               ? index_type(max_blocks / numbl5)
+               : (temp0 <= max_blocks ? temp0 : max_blocks));
 
       const index_type tile_id4 = (index_type)blockIdx_z / numbl5;
       const index_type tile_id5 = (index_type)blockIdx_z % numbl5;
-      const index_type thr_id4 = (index_type)threadIdx_z / m_rp.m_tile[5];
-      const index_type thr_id5 = (index_type)threadIdx_z % m_rp.m_tile[5];
+      const index_type thr_id4  = (index_type)threadIdx_z / m_rp.m_tile[5];
+      const index_type thr_id5  = (index_type)threadIdx_z % m_rp.m_tile[5];
 
-      for ( index_type i = tile_id0; i < m_rp.m_tile_end[0]; i += numbl0 ) {
-        const index_type offset_0 = i*m_rp.m_tile[0] + thr_id0 + (index_type)m_rp.m_lower[0];
-        if ( offset_0 < m_rp.m_upper[0] && thr_id0 < m_rp.m_tile[0] ) {
-
-          for ( index_type j = tile_id1; j < m_rp.m_tile_end[1]; j += numbl1 ) {
-            const index_type offset_1 = j*m_rp.m_tile[1] + thr_id1 + (index_type)m_rp.m_lower[1];
-            if ( offset_1 < m_rp.m_upper[1] && thr_id1 < m_rp.m_tile[1] ) {
-
-              for ( index_type k = tile_id2; k < m_rp.m_tile_end[2]; k += numbl2 ) {
-                const index_type offset_2 = k*m_rp.m_tile[2] + thr_id2 + (index_type)m_rp.m_lower[2];
-                if ( offset_2 < m_rp.m_upper[2] && thr_id2 < m_rp.m_tile[2] ) {
-
-                  for ( index_type l = tile_id3; l < m_rp.m_tile_end[3]; l += numbl3 ) {
-                    const index_type offset_3 = l*m_rp.m_tile[3] + thr_id3 + (index_type)m_rp.m_lower[3];
-                    if ( offset_3 < m_rp.m_upper[3] && thr_id3 < m_rp.m_tile[3] ) {
-
-                      for ( index_type m = tile_id4; m < m_rp.m_tile_end[4]; m += numbl4 ) {
-                        const index_type offset_4 = m*m_rp.m_tile[4] + thr_id4 + (index_type)m_rp.m_lower[4];
-                        if ( offset_4 < m_rp.m_upper[4] && thr_id4 < m_rp.m_tile[4] ) {
-
-                          for ( index_type n = tile_id5; n < m_rp.m_tile_end[5]; n += numbl5 ) {
-                            const index_type offset_5 = n*m_rp.m_tile[5] + thr_id5 + (index_type)m_rp.m_lower[5];
-                            if ( offset_5 < m_rp.m_upper[5] && thr_id5 < m_rp.m_tile[5] ) {
-                              m_func(offset_0 , offset_1 , offset_2 , offset_3 , offset_4 , offset_5);
+      for (index_type i = tile_id0; i < m_rp.m_tile_end[0]; i += numbl0) {
+        const index_type offset_0 =
+            i * m_rp.m_tile[0] + thr_id0 + (index_type)m_rp.m_lower[0];
+        if (offset_0 < m_rp.m_upper[0] && thr_id0 < m_rp.m_tile[0]) {
+          for (index_type j = tile_id1; j < m_rp.m_tile_end[1]; j += numbl1) {
+            const index_type offset_1 =
+                j * m_rp.m_tile[1] + thr_id1 + (index_type)m_rp.m_lower[1];
+            if (offset_1 < m_rp.m_upper[1] && thr_id1 < m_rp.m_tile[1]) {
+              for (index_type k = tile_id2; k < m_rp.m_tile_end[2];
+                   k += numbl2) {
+                const index_type offset_2 =
+                    k * m_rp.m_tile[2] + thr_id2 + (index_type)m_rp.m_lower[2];
+                if (offset_2 < m_rp.m_upper[2] && thr_id2 < m_rp.m_tile[2]) {
+                  for (index_type l = tile_id3; l < m_rp.m_tile_end[3];
+                       l += numbl3) {
+                    const index_type offset_3 = l * m_rp.m_tile[3] + thr_id3 +
+                                                (index_type)m_rp.m_lower[3];
+                    if (offset_3 < m_rp.m_upper[3] &&
+                        thr_id3 < m_rp.m_tile[3]) {
+                      for (index_type m = tile_id4; m < m_rp.m_tile_end[4];
+                           m += numbl4) {
+                        const index_type offset_4 = m * m_rp.m_tile[4] +
+                                                    thr_id4 +
+                                                    (index_type)m_rp.m_lower[4];
+                        if (offset_4 < m_rp.m_upper[4] &&
+                            thr_id4 < m_rp.m_tile[4]) {
+                          for (index_type n = tile_id5; n < m_rp.m_tile_end[5];
+                               n += numbl5) {
+                            const index_type offset_5 =
+                                n * m_rp.m_tile[5] + thr_id5 +
+                                (index_type)m_rp.m_lower[5];
+                            if (offset_5 < m_rp.m_upper[5] &&
+                                thr_id5 < m_rp.m_tile[5]) {
+                              m_func(offset_0, offset_1, offset_2, offset_3,
+                                     offset_4, offset_5);
                             }
                           }
                         }
@@ -972,92 +1134,107 @@ struct DeviceIterateTile<6,RP,Functor,void >
         }
       }
     }
-  } //end exec_range
+  }  // end exec_range
 
-private:
-  const RP & m_rp;
-  const Functor & m_func;
+ private:
+  const RP& m_rp;
+  const Functor& m_func;
 };
 
 // Specializations for tag type
-template< typename RP , typename Functor , typename Tag >
-struct DeviceIterateTile<6,RP,Functor,Tag>
-{
+template <typename RP, typename Functor, typename Tag>
+struct DeviceIterateTile<6, RP, Functor, Tag> {
   using index_type = typename RP::index_type;
 
   KOKKOS_INLINE_FUNCTION
-  DeviceIterateTile( const RP & rp_ , const Functor & f_ )
-  : m_rp(rp_)
-  , m_func(f_)
-  {}
+  DeviceIterateTile(const RP& rp_, const Functor& f_) : m_rp(rp_), m_func(f_) {}
 
   static constexpr index_type max_blocks = 65535;
-  //static constexpr index_type max_blocks = static_cast<index_type>(Kokkos::Impl::ROCmTraits::UpperBoundGridCount);
+  // static constexpr index_type max_blocks =
+  // static_cast<index_type>(Kokkos::Impl::ROCmTraits::UpperBoundGridCount);
 
   KOKKOS_INLINE_FUNCTION
-  void exec_range() const
-  {
-    //enum { max_blocks = static_cast<index_type>(Kokkos::Impl::ROCmTraits::UpperBoundGridCount) };
-    //const index_type max_blocks = static_cast<index_type>( Kokkos::Impl::rocm_internal_maximum_grid_count() );
+  void exec_range() const {
+    // enum { max_blocks =
+    // static_cast<index_type>(Kokkos::Impl::ROCmTraits::UpperBoundGridCount) };
+    // const index_type max_blocks = static_cast<index_type>(
+    // Kokkos::Impl::rocm_internal_maximum_grid_count() );
     // LL
     if (RP::inner_direction == RP::Left) {
-      index_type temp0  =  m_rp.m_tile_end[0];
-      index_type temp1  =  m_rp.m_tile_end[1];
-      const index_type numbl0 = ( temp0 <= max_blocks ? temp0 : max_blocks ) ;
-      const index_type numbl1 = ( temp0*temp1 > max_blocks ? index_type( max_blocks / numbl0 ) :
-          (  temp1 <= max_blocks ? temp1 : max_blocks ) );
+      index_type temp0        = m_rp.m_tile_end[0];
+      index_type temp1        = m_rp.m_tile_end[1];
+      const index_type numbl0 = (temp0 <= max_blocks ? temp0 : max_blocks);
+      const index_type numbl1 =
+          (temp0 * temp1 > max_blocks
+               ? index_type(max_blocks / numbl0)
+               : (temp1 <= max_blocks ? temp1 : max_blocks));
 
       const index_type tile_id0 = (index_type)blockIdx_x % numbl0;
       const index_type tile_id1 = (index_type)blockIdx_x / numbl0;
-      const index_type thr_id0 = (index_type)threadIdx_x % m_rp.m_tile[0];
-      const index_type thr_id1 = (index_type)threadIdx_x / m_rp.m_tile[0];
+      const index_type thr_id0  = (index_type)threadIdx_x % m_rp.m_tile[0];
+      const index_type thr_id1  = (index_type)threadIdx_x / m_rp.m_tile[0];
 
-      temp0  =  m_rp.m_tile_end[2];
-      temp1  =  m_rp.m_tile_end[3];
-      const index_type numbl2 = ( temp0 <= max_blocks ? temp0 : max_blocks ) ;
-      const index_type numbl3 = ( temp0*temp1 > max_blocks ? index_type( max_blocks / numbl2 ) :
-          (  temp1 <= max_blocks ? temp1 : max_blocks ) );
+      temp0                   = m_rp.m_tile_end[2];
+      temp1                   = m_rp.m_tile_end[3];
+      const index_type numbl2 = (temp0 <= max_blocks ? temp0 : max_blocks);
+      const index_type numbl3 =
+          (temp0 * temp1 > max_blocks
+               ? index_type(max_blocks / numbl2)
+               : (temp1 <= max_blocks ? temp1 : max_blocks));
 
       const index_type tile_id2 = (index_type)blockIdx_y % numbl2;
       const index_type tile_id3 = (index_type)blockIdx_y / numbl2;
-      const index_type thr_id2 = (index_type)threadIdx_y % m_rp.m_tile[2];
-      const index_type thr_id3 = (index_type)threadIdx_y / m_rp.m_tile[2];
+      const index_type thr_id2  = (index_type)threadIdx_y % m_rp.m_tile[2];
+      const index_type thr_id3  = (index_type)threadIdx_y / m_rp.m_tile[2];
 
-      temp0  =  m_rp.m_tile_end[4];
-      temp1  =  m_rp.m_tile_end[5];
-      const index_type numbl4 = ( temp0 <= max_blocks ? temp0 : max_blocks ) ;
-      const index_type numbl5 = ( temp0*temp1 > max_blocks ? index_type( max_blocks / numbl4 ) :
-          (  temp1 <= max_blocks ? temp1 : max_blocks ) );
+      temp0                   = m_rp.m_tile_end[4];
+      temp1                   = m_rp.m_tile_end[5];
+      const index_type numbl4 = (temp0 <= max_blocks ? temp0 : max_blocks);
+      const index_type numbl5 =
+          (temp0 * temp1 > max_blocks
+               ? index_type(max_blocks / numbl4)
+               : (temp1 <= max_blocks ? temp1 : max_blocks));
 
       const index_type tile_id4 = (index_type)blockIdx_z % numbl4;
       const index_type tile_id5 = (index_type)blockIdx_z / numbl4;
-      const index_type thr_id4 = (index_type)threadIdx_z % m_rp.m_tile[4];
-      const index_type thr_id5 = (index_type)threadIdx_z / m_rp.m_tile[4];
+      const index_type thr_id4  = (index_type)threadIdx_z % m_rp.m_tile[4];
+      const index_type thr_id5  = (index_type)threadIdx_z / m_rp.m_tile[4];
 
-      for ( index_type n = tile_id5; n < m_rp.m_tile_end[5]; n += numbl5 ) {
-        const index_type offset_5 = n*m_rp.m_tile[5] + thr_id5 + (index_type)m_rp.m_lower[5];
-        if ( offset_5 < m_rp.m_upper[5] && thr_id5 < m_rp.m_tile[5] ) {
-
-          for ( index_type m = tile_id4; m < m_rp.m_tile_end[4]; m += numbl4 ) {
-            const index_type offset_4 = m*m_rp.m_tile[4] + thr_id4 + (index_type)m_rp.m_lower[4];
-            if ( offset_4 < m_rp.m_upper[4] && thr_id4 < m_rp.m_tile[4] ) {
-
-              for ( index_type l = tile_id3; l < m_rp.m_tile_end[3]; l += numbl3 ) {
-                const index_type offset_3 = l*m_rp.m_tile[3] + thr_id3 + (index_type)m_rp.m_lower[3];
-                if ( offset_3 < m_rp.m_upper[3] && thr_id3 < m_rp.m_tile[3] ) {
-
-                  for ( index_type k = tile_id2; k < m_rp.m_tile_end[2]; k += numbl2 ) {
-                    const index_type offset_2 = k*m_rp.m_tile[2] + thr_id2 + (index_type)m_rp.m_lower[2];
-                    if ( offset_2 < m_rp.m_upper[2] && thr_id2 < m_rp.m_tile[2] ) {
-
-                      for ( index_type j = tile_id1 ; j < m_rp.m_tile_end[1]; j += numbl1 ) {
-                        const index_type offset_1 = j*m_rp.m_tile[1] + thr_id1 + (index_type)m_rp.m_lower[1];
-                        if ( offset_1 < m_rp.m_upper[1] && thr_id1 < m_rp.m_tile[1] ) {
-
-                          for ( index_type i = tile_id0 ; i < m_rp.m_tile_end[0]; i += numbl0 ) {
-                            const index_type offset_0 = i*m_rp.m_tile[0] + thr_id0 + (index_type)m_rp.m_lower[0];
-                            if ( offset_0 < m_rp.m_upper[0] && thr_id0 < m_rp.m_tile[0] ) {
-                              m_func(Tag() , offset_0 , offset_1 , offset_2 , offset_3, offset_4, offset_5);
+      for (index_type n = tile_id5; n < m_rp.m_tile_end[5]; n += numbl5) {
+        const index_type offset_5 =
+            n * m_rp.m_tile[5] + thr_id5 + (index_type)m_rp.m_lower[5];
+        if (offset_5 < m_rp.m_upper[5] && thr_id5 < m_rp.m_tile[5]) {
+          for (index_type m = tile_id4; m < m_rp.m_tile_end[4]; m += numbl4) {
+            const index_type offset_4 =
+                m * m_rp.m_tile[4] + thr_id4 + (index_type)m_rp.m_lower[4];
+            if (offset_4 < m_rp.m_upper[4] && thr_id4 < m_rp.m_tile[4]) {
+              for (index_type l = tile_id3; l < m_rp.m_tile_end[3];
+                   l += numbl3) {
+                const index_type offset_3 =
+                    l * m_rp.m_tile[3] + thr_id3 + (index_type)m_rp.m_lower[3];
+                if (offset_3 < m_rp.m_upper[3] && thr_id3 < m_rp.m_tile[3]) {
+                  for (index_type k = tile_id2; k < m_rp.m_tile_end[2];
+                       k += numbl2) {
+                    const index_type offset_2 = k * m_rp.m_tile[2] + thr_id2 +
+                                                (index_type)m_rp.m_lower[2];
+                    if (offset_2 < m_rp.m_upper[2] &&
+                        thr_id2 < m_rp.m_tile[2]) {
+                      for (index_type j = tile_id1; j < m_rp.m_tile_end[1];
+                           j += numbl1) {
+                        const index_type offset_1 = j * m_rp.m_tile[1] +
+                                                    thr_id1 +
+                                                    (index_type)m_rp.m_lower[1];
+                        if (offset_1 < m_rp.m_upper[1] &&
+                            thr_id1 < m_rp.m_tile[1]) {
+                          for (index_type i = tile_id0; i < m_rp.m_tile_end[0];
+                               i += numbl0) {
+                            const index_type offset_0 =
+                                i * m_rp.m_tile[0] + thr_id0 +
+                                (index_type)m_rp.m_lower[0];
+                            if (offset_0 < m_rp.m_upper[0] &&
+                                thr_id0 < m_rp.m_tile[0]) {
+                              m_func(Tag(), offset_0, offset_1, offset_2,
+                                     offset_3, offset_4, offset_5);
                             }
                           }
                         }
@@ -1073,63 +1250,80 @@ struct DeviceIterateTile<6,RP,Functor,Tag>
     }
     // LR
     else {
-      index_type temp0  =  m_rp.m_tile_end[0];
-      index_type temp1  =  m_rp.m_tile_end[1];
-      const index_type numbl1 = ( temp1 <= max_blocks ? temp1 : max_blocks ) ;
-      const index_type numbl0 = ( temp0*temp1 > max_blocks ? index_type( max_blocks / numbl1 ) :
-          ( temp0 <= max_blocks ? temp0 : max_blocks ) );
+      index_type temp0        = m_rp.m_tile_end[0];
+      index_type temp1        = m_rp.m_tile_end[1];
+      const index_type numbl1 = (temp1 <= max_blocks ? temp1 : max_blocks);
+      const index_type numbl0 =
+          (temp0 * temp1 > max_blocks
+               ? index_type(max_blocks / numbl1)
+               : (temp0 <= max_blocks ? temp0 : max_blocks));
 
       const index_type tile_id0 = (index_type)blockIdx_x / numbl1;
       const index_type tile_id1 = (index_type)blockIdx_x % numbl1;
-      const index_type thr_id0 = (index_type)threadIdx_x / m_rp.m_tile[1];
-      const index_type thr_id1 = (index_type)threadIdx_x % m_rp.m_tile[1];
+      const index_type thr_id0  = (index_type)threadIdx_x / m_rp.m_tile[1];
+      const index_type thr_id1  = (index_type)threadIdx_x % m_rp.m_tile[1];
 
-      temp0  =  m_rp.m_tile_end[2];
-      temp1  =  m_rp.m_tile_end[3];
-      const index_type numbl3 = ( temp1 <= max_blocks ? temp1 : max_blocks ) ;
-      const index_type numbl2 = ( temp0*temp1 > max_blocks ? index_type( max_blocks / numbl3 ) :
-          (  temp0 <= max_blocks ? temp0 : max_blocks ) );
+      temp0                   = m_rp.m_tile_end[2];
+      temp1                   = m_rp.m_tile_end[3];
+      const index_type numbl3 = (temp1 <= max_blocks ? temp1 : max_blocks);
+      const index_type numbl2 =
+          (temp0 * temp1 > max_blocks
+               ? index_type(max_blocks / numbl3)
+               : (temp0 <= max_blocks ? temp0 : max_blocks));
 
       const index_type tile_id2 = (index_type)blockIdx_y / numbl3;
       const index_type tile_id3 = (index_type)blockIdx_y % numbl3;
-      const index_type thr_id2 = (index_type)threadIdx_y / m_rp.m_tile[3];
-      const index_type thr_id3 = (index_type)threadIdx_y % m_rp.m_tile[3];
+      const index_type thr_id2  = (index_type)threadIdx_y / m_rp.m_tile[3];
+      const index_type thr_id3  = (index_type)threadIdx_y % m_rp.m_tile[3];
 
-      temp0  =  m_rp.m_tile_end[4];
-      temp1  =  m_rp.m_tile_end[5];
-      const index_type numbl5 = ( temp1 <= max_blocks ? temp1 : max_blocks ) ;
-      const index_type numbl4 = ( temp0*temp1 > max_blocks ? index_type( max_blocks / numbl5 ) :
-          (  temp0 <= max_blocks ? temp0 : max_blocks ) );
+      temp0                   = m_rp.m_tile_end[4];
+      temp1                   = m_rp.m_tile_end[5];
+      const index_type numbl5 = (temp1 <= max_blocks ? temp1 : max_blocks);
+      const index_type numbl4 =
+          (temp0 * temp1 > max_blocks
+               ? index_type(max_blocks / numbl5)
+               : (temp0 <= max_blocks ? temp0 : max_blocks));
 
       const index_type tile_id4 = (index_type)blockIdx_z / numbl5;
       const index_type tile_id5 = (index_type)blockIdx_z % numbl5;
-      const index_type thr_id4 = (index_type)threadIdx_z / m_rp.m_tile[5];
-      const index_type thr_id5 = (index_type)threadIdx_z % m_rp.m_tile[5];
+      const index_type thr_id4  = (index_type)threadIdx_z / m_rp.m_tile[5];
+      const index_type thr_id5  = (index_type)threadIdx_z % m_rp.m_tile[5];
 
-      for ( index_type i = tile_id0; i < m_rp.m_tile_end[0]; i += numbl0 ) {
-        const index_type offset_0 = i*m_rp.m_tile[0] + thr_id0 + (index_type)m_rp.m_lower[0];
-        if ( offset_0 < m_rp.m_upper[0] && thr_id0 < m_rp.m_tile[0] ) {
-
-          for ( index_type j = tile_id1; j < m_rp.m_tile_end[1]; j += numbl1 ) {
-            const index_type offset_1 = j*m_rp.m_tile[1] + thr_id1 + (index_type)m_rp.m_lower[1];
-            if ( offset_1 < m_rp.m_upper[1] && thr_id1 < m_rp.m_tile[1] ) {
-
-              for ( index_type k = tile_id2; k < m_rp.m_tile_end[2]; k += numbl2 ) {
-                const index_type offset_2 = k*m_rp.m_tile[2] + thr_id2 + (index_type)m_rp.m_lower[2];
-                if ( offset_2 < m_rp.m_upper[2] && thr_id2 < m_rp.m_tile[2] ) {
-
-                  for ( index_type l = tile_id3; l < m_rp.m_tile_end[3]; l += numbl3 ) {
-                    const index_type offset_3 = l*m_rp.m_tile[3] + thr_id3 + (index_type)m_rp.m_lower[3];
-                    if ( offset_3 < m_rp.m_upper[3] && thr_id3 < m_rp.m_tile[3] ) {
-
-                      for ( index_type m = tile_id4; m < m_rp.m_tile_end[4]; m += numbl4 ) {
-                        const index_type offset_4 = m*m_rp.m_tile[4] + thr_id4 + (index_type)m_rp.m_lower[4];
-                        if ( offset_4 < m_rp.m_upper[4] && thr_id4 < m_rp.m_tile[4] ) {
-
-                          for ( index_type n = tile_id5; n < m_rp.m_tile_end[5]; n += numbl5 ) {
-                            const index_type offset_5 = n*m_rp.m_tile[5] + thr_id5 + (index_type)m_rp.m_lower[5];
-                            if ( offset_5 < m_rp.m_upper[5] && thr_id5 < m_rp.m_tile[5] ) {
-                              m_func(Tag() , offset_0 , offset_1 , offset_2 , offset_3 , offset_4 , offset_5);
+      for (index_type i = tile_id0; i < m_rp.m_tile_end[0]; i += numbl0) {
+        const index_type offset_0 =
+            i * m_rp.m_tile[0] + thr_id0 + (index_type)m_rp.m_lower[0];
+        if (offset_0 < m_rp.m_upper[0] && thr_id0 < m_rp.m_tile[0]) {
+          for (index_type j = tile_id1; j < m_rp.m_tile_end[1]; j += numbl1) {
+            const index_type offset_1 =
+                j * m_rp.m_tile[1] + thr_id1 + (index_type)m_rp.m_lower[1];
+            if (offset_1 < m_rp.m_upper[1] && thr_id1 < m_rp.m_tile[1]) {
+              for (index_type k = tile_id2; k < m_rp.m_tile_end[2];
+                   k += numbl2) {
+                const index_type offset_2 =
+                    k * m_rp.m_tile[2] + thr_id2 + (index_type)m_rp.m_lower[2];
+                if (offset_2 < m_rp.m_upper[2] && thr_id2 < m_rp.m_tile[2]) {
+                  for (index_type l = tile_id3; l < m_rp.m_tile_end[3];
+                       l += numbl3) {
+                    const index_type offset_3 = l * m_rp.m_tile[3] + thr_id3 +
+                                                (index_type)m_rp.m_lower[3];
+                    if (offset_3 < m_rp.m_upper[3] &&
+                        thr_id3 < m_rp.m_tile[3]) {
+                      for (index_type m = tile_id4; m < m_rp.m_tile_end[4];
+                           m += numbl4) {
+                        const index_type offset_4 = m * m_rp.m_tile[4] +
+                                                    thr_id4 +
+                                                    (index_type)m_rp.m_lower[4];
+                        if (offset_4 < m_rp.m_upper[4] &&
+                            thr_id4 < m_rp.m_tile[4]) {
+                          for (index_type n = tile_id5; n < m_rp.m_tile_end[5];
+                               n += numbl5) {
+                            const index_type offset_5 =
+                                n * m_rp.m_tile[5] + thr_id5 +
+                                (index_type)m_rp.m_lower[5];
+                            if (offset_5 < m_rp.m_upper[5] &&
+                                thr_id5 < m_rp.m_tile[5]) {
+                              m_func(Tag(), offset_0, offset_1, offset_2,
+                                     offset_3, offset_4, offset_5);
                             }
                           }
                         }
@@ -1143,168 +1337,177 @@ struct DeviceIterateTile<6,RP,Functor,Tag>
         }
       }
     }
-  } //end exec_range
+  }  // end exec_range
 
-private:
-  const RP & m_rp;
-  const Functor & m_func;
+ private:
+  const RP& m_rp;
+  const Functor& m_func;
 };
 
-} // Refactor
+}  // namespace Refactor
 
 // ----------------------------------------------------------------------------------
 
 namespace Reduce {
 
-template < typename T >
-using is_void = std::is_same< T, void >;
+template <typename T>
+using is_void = std::is_same<T, void>;
 
-template < typename T >
-struct is_array_type : std::false_type
-{
+template <typename T>
+struct is_array_type : std::false_type {
   using value_type = T;
 };
 
-template < typename T >
-struct is_array_type< T* > : std::true_type
-{
+template <typename T>
+struct is_array_type<T*> : std::true_type {
   using value_type = T;
 };
 
-template < typename T >
-struct is_array_type< T[] > : std::true_type
-{
+template <typename T>
+struct is_array_type<T[]> : std::true_type {
   using value_type = T;
 };
 
 // ------------------------------------------------------------------ //
-template< int N , typename RP , typename Functor , typename Tag , typename ValueType , typename Enable = void >
+template <int N, typename RP, typename Functor, typename Tag,
+          typename ValueType, typename Enable = void>
 struct DeviceIterateTile;
 
 // ParallelReduce iteration pattern
 // Scalar reductions
 
-// num_blocks = min( num_tiles, max_num_blocks ); //i.e. determined by number of tiles and reduction algorithm constraints
-// extract n-dim tile offsets (i.e. tile's global starting mulit-index) from the tileid = blockid using tile dimensions
-// local indices within a tile extracted from (index_type)threadIdx_x using tile dims, constrained by blocksize
-// combine tile and local id info for multi-dim global ids
+// num_blocks = min( num_tiles, max_num_blocks ); //i.e. determined by number of
+// tiles and reduction algorithm constraints extract n-dim tile offsets (i.e.
+// tile's global starting mulit-index) from the tileid = blockid using tile
+// dimensions local indices within a tile extracted from (index_type)threadIdx_x
+// using tile dims, constrained by blocksize combine tile and local id info for
+// multi-dim global ids
 
 // Pattern:
-// Each block+thread is responsible for a tile+local_id combo (additional when striding by num_blocks)
+// Each block+thread is responsible for a tile+local_id combo (additional when
+// striding by num_blocks)
 // 1. create offset arrays
-// 2. loop over number of tiles, striding by griddim (equal to num tiles, or max num blocks)
+// 2. loop over number of tiles, striding by griddim (equal to num tiles, or max
+// num blocks)
 // 3. temps set for tile_idx and thrd_idx, which will be modified
 // 4. if LL vs LR:
 //      determine tile starting point offsets (multidim)
 //      determine local index offsets (multidim)
 //      concatentate tile offset + local offset for global multi-dim index
-//    if offset withinin range bounds AND local offset within tile bounds, call functor
+//    if offset withinin range bounds AND local offset within tile bounds, call
+//    functor
 
 // ValueType = T
-//Rank 2
+// Rank 2
 // Specializations for void tag type
-template< typename RP , typename Functor , typename ValueType >
-struct DeviceIterateTile<2,RP,Functor,void,ValueType, typename std::enable_if< !is_array_type<ValueType>::value >::type >
-{
+template <typename RP, typename Functor, typename ValueType>
+struct DeviceIterateTile<
+    2, RP, Functor, void, ValueType,
+    typename std::enable_if<!is_array_type<ValueType>::value>::type> {
   using index_type = typename RP::index_type;
 
-  [[hc]]
-  DeviceIterateTile( const RP & rp_ , const Functor & f_ , ValueType & v_)
-  : m_rp(rp_)
-  , m_func(f_)
-  , m_v(v_)
-  {}
+  [[hc]] DeviceIterateTile(const RP& rp_, const Functor& f_, ValueType& v_)
+      : m_rp(rp_), m_func(f_), m_v(v_) {}
 
   KOKKOS_INLINE_FUNCTION
-  void exec_range() const
-  {
-    if ( (index_type)blockIdx_x < m_rp.m_num_tiles && (index_type)threadIdx_y < m_rp.m_prod_tile_dims ) {
-      index_type m_offset[RP::rank]; // tile starting global id offset
-      index_type m_local_offset[RP::rank]; // tile starting global id offset
+  void exec_range() const {
+    if ((index_type)blockIdx_x < m_rp.m_num_tiles &&
+        (index_type)threadIdx_y < m_rp.m_prod_tile_dims) {
+      index_type m_offset[RP::rank];        // tile starting global id offset
+      index_type m_local_offset[RP::rank];  // tile starting global id offset
 
-      for ( index_type tileidx = (index_type)blockIdx_x; tileidx < m_rp.m_num_tiles; tileidx += gridDim_x ) {
-        index_type tile_idx = tileidx; // temp because tile_idx will be modified while determining tile starting point offsets
+      for (index_type tileidx = (index_type)blockIdx_x;
+           tileidx < m_rp.m_num_tiles; tileidx += gridDim_x) {
+        index_type tile_idx =
+            tileidx;  // temp because tile_idx will be modified while
+                      // determining tile starting point offsets
         index_type thrd_idx = (index_type)threadIdx_y;
-        bool in_bounds = true;
+        bool in_bounds      = true;
 
         // LL
         if (RP::inner_direction == RP::Left) {
-          for (int i=0; i<RP::rank; ++i) {
+          for (int i = 0; i < RP::rank; ++i) {
             // Deduce this blocks tile_id
-            m_offset[i] = (tile_idx % m_rp.m_tile_end[i]) * m_rp.m_tile[i] + m_rp.m_lower[i] ;
+            m_offset[i] = (tile_idx % m_rp.m_tile_end[i]) * m_rp.m_tile[i] +
+                          m_rp.m_lower[i];
             tile_idx /= m_rp.m_tile_end[i];
 
             m_local_offset[i] = (thrd_idx % m_rp.m_tile[i]);
             thrd_idx /= m_rp.m_tile[i];
 
             m_offset[i] += m_local_offset[i];
-            if ( !(m_offset[i] < m_rp.m_upper[i] && m_local_offset[i] < m_rp.m_tile[i]) ) {
+            if (!(m_offset[i] < m_rp.m_upper[i] &&
+                  m_local_offset[i] < m_rp.m_tile[i])) {
               in_bounds &= false;
             }
           }
-          if ( in_bounds )
-          {
-            m_func( m_offset[0], m_offset[1], m_v );
+          if (in_bounds) {
+            m_func(m_offset[0], m_offset[1], m_v);
           }
         }
         // LR
         else {
-          for (int i=RP::rank-1; i>=0; --i) {
-            m_offset[i] = (tile_idx % m_rp.m_tile_end[i]) * m_rp.m_tile[i] + m_rp.m_lower[i] ;
+          for (int i = RP::rank - 1; i >= 0; --i) {
+            m_offset[i] = (tile_idx % m_rp.m_tile_end[i]) * m_rp.m_tile[i] +
+                          m_rp.m_lower[i];
             tile_idx /= m_rp.m_tile_end[i];
 
             m_local_offset[i] = (thrd_idx % m_rp.m_tile[i]);
             thrd_idx /= m_rp.m_tile[i];
 
             m_offset[i] += m_local_offset[i];
-            if ( !(m_offset[i] < m_rp.m_upper[i] && m_local_offset[i] < m_rp.m_tile[i]) ) {
+            if (!(m_offset[i] < m_rp.m_upper[i] &&
+                  m_local_offset[i] < m_rp.m_tile[i])) {
               in_bounds &= false;
             }
           }
-          if ( in_bounds )
-          { m_func( m_offset[0], m_offset[1], m_v ); }
+          if (in_bounds) {
+            m_func(m_offset[0], m_offset[1], m_v);
+          }
         }
       }
     }
 
-  } //end exec_range
+  }  // end exec_range
 
-private:
-  const RP & m_rp;
-  const Functor & m_func;
-  ValueType & m_v;
+ private:
+  const RP& m_rp;
+  const Functor& m_func;
+  ValueType& m_v;
 };
 
-
 // Specializations for tag type
-template< typename RP , typename Functor , typename Tag, typename ValueType >
-struct DeviceIterateTile<2,RP,Functor,Tag, ValueType, typename std::enable_if< !is_array_type<ValueType>::value && !is_void< Tag >::value >::type >
-{
+template <typename RP, typename Functor, typename Tag, typename ValueType>
+struct DeviceIterateTile<
+    2, RP, Functor, Tag, ValueType,
+    typename std::enable_if<!is_array_type<ValueType>::value &&
+                            !is_void<Tag>::value>::type> {
   using index_type = typename RP::index_type;
 
   KOKKOS_INLINE_FUNCTION
-  DeviceIterateTile( const RP & rp_ , const Functor & f_ , ValueType & v_)
-  : m_rp(rp_)
-  , m_func(f_)
-  , m_v(v_)
-  {}
+  DeviceIterateTile(const RP& rp_, const Functor& f_, ValueType& v_)
+      : m_rp(rp_), m_func(f_), m_v(v_) {}
 
   KOKKOS_INLINE_FUNCTION
-  void exec_range() const
-  {
-    if ( (index_type)blockIdx_x < m_rp.m_num_tiles && (index_type)threadIdx_y < m_rp.m_prod_tile_dims ) {
-      index_type m_offset[RP::rank]; // tile starting global id offset
-      index_type m_local_offset[RP::rank]; // tile starting global id offset
+  void exec_range() const {
+    if ((index_type)blockIdx_x < m_rp.m_num_tiles &&
+        (index_type)threadIdx_y < m_rp.m_prod_tile_dims) {
+      index_type m_offset[RP::rank];        // tile starting global id offset
+      index_type m_local_offset[RP::rank];  // tile starting global id offset
 
-      for ( index_type tileidx = (index_type)blockIdx_x; tileidx < m_rp.m_num_tiles; tileidx += gridDim_x ) {
-        index_type tile_idx = tileidx; // temp because tile_idx will be modified while determining tile starting point offsets
+      for (index_type tileidx = (index_type)blockIdx_x;
+           tileidx < m_rp.m_num_tiles; tileidx += gridDim_x) {
+        index_type tile_idx =
+            tileidx;  // temp because tile_idx will be modified while
+                      // determining tile starting point offsets
         index_type thrd_idx = (index_type)threadIdx_y;
-        bool in_bounds = true;
+        bool in_bounds      = true;
 
         // LL
         if (RP::inner_direction == RP::Left) {
-          for (int i=0; i<RP::rank; ++i) {
-            m_offset[i] = (tile_idx % m_rp.m_tile_end[i]) * m_rp.m_tile[i] + m_rp.m_lower[i] ;
+          for (int i = 0; i < RP::rank; ++i) {
+            m_offset[i] = (tile_idx % m_rp.m_tile_end[i]) * m_rp.m_tile[i] +
+                          m_rp.m_lower[i];
             tile_idx /= m_rp.m_tile_end[i];
 
             // tile-local indices identified with (index_type)threadIdx_y
@@ -1312,72 +1515,79 @@ struct DeviceIterateTile<2,RP,Functor,Tag, ValueType, typename std::enable_if< !
             thrd_idx /= m_rp.m_tile[i];
 
             m_offset[i] += m_local_offset[i];
-            if ( !(m_offset[i] < m_rp.m_upper[i] && m_local_offset[i] < m_rp.m_tile[i]) ) {
+            if (!(m_offset[i] < m_rp.m_upper[i] &&
+                  m_local_offset[i] < m_rp.m_tile[i])) {
               in_bounds &= false;
             }
           }
-          if ( in_bounds )
-          { m_func( Tag(), m_offset[0], m_offset[1], m_v ); }
+          if (in_bounds) {
+            m_func(Tag(), m_offset[0], m_offset[1], m_v);
+          }
         }
         // LR
         else {
-          for (int i=RP::rank-1; i>=0; --i) {
-            m_offset[i] = (tile_idx % m_rp.m_tile_end[i]) * m_rp.m_tile[i] + m_rp.m_lower[i] ;
+          for (int i = RP::rank - 1; i >= 0; --i) {
+            m_offset[i] = (tile_idx % m_rp.m_tile_end[i]) * m_rp.m_tile[i] +
+                          m_rp.m_lower[i];
             tile_idx /= m_rp.m_tile_end[i];
 
             // tile-local indices identified with (index_type)threadIdx_y
-            m_local_offset[i] = (thrd_idx % m_rp.m_tile[i]); // Move this to first computation, add to m_offset right away
+            m_local_offset[i] =
+                (thrd_idx % m_rp.m_tile[i]);  // Move this to first computation,
+                                              // add to m_offset right away
             thrd_idx /= m_rp.m_tile[i];
 
             m_offset[i] += m_local_offset[i];
-            if ( !(m_offset[i] < m_rp.m_upper[i] && m_local_offset[i] < m_rp.m_tile[i]) ) {
+            if (!(m_offset[i] < m_rp.m_upper[i] &&
+                  m_local_offset[i] < m_rp.m_tile[i])) {
               in_bounds &= false;
             }
           }
-          if ( in_bounds )
-          { m_func( Tag(), m_offset[0], m_offset[1], m_v ); }
+          if (in_bounds) {
+            m_func(Tag(), m_offset[0], m_offset[1], m_v);
+          }
         }
       }
     }
-  } //end exec_range
+  }  // end exec_range
 
-private:
-  const RP & m_rp;
-  const Functor & m_func;
-  ValueType & m_v;
+ private:
+  const RP& m_rp;
+  const Functor& m_func;
+  ValueType& m_v;
 };
 
-
-//Rank 3
+// Rank 3
 // Specializations for void tag type
-template< typename RP , typename Functor , typename ValueType >
-struct DeviceIterateTile<3,RP,Functor,void,ValueType , typename std::enable_if< !is_array_type<ValueType>::value >::type >
-{
+template <typename RP, typename Functor, typename ValueType>
+struct DeviceIterateTile<
+    3, RP, Functor, void, ValueType,
+    typename std::enable_if<!is_array_type<ValueType>::value>::type> {
   using index_type = typename RP::index_type;
 
-  [[hc]]
-  DeviceIterateTile( const RP & rp_ , const Functor & f_ , ValueType & v_)
-  : m_rp(rp_)
-  , m_func(f_)
-  , m_v(v_)
-  {}
+  [[hc]] DeviceIterateTile(const RP& rp_, const Functor& f_, ValueType& v_)
+      : m_rp(rp_), m_func(f_), m_v(v_) {}
 
   KOKKOS_INLINE_FUNCTION
-  void exec_range() const
-  {
-    if ( (index_type)blockIdx_x < m_rp.m_num_tiles && (index_type)threadIdx_y < m_rp.m_prod_tile_dims ) {
-      index_type m_offset[RP::rank]; // tile starting global id offset
-      index_type m_local_offset[RP::rank]; // tile starting global id offset
+  void exec_range() const {
+    if ((index_type)blockIdx_x < m_rp.m_num_tiles &&
+        (index_type)threadIdx_y < m_rp.m_prod_tile_dims) {
+      index_type m_offset[RP::rank];        // tile starting global id offset
+      index_type m_local_offset[RP::rank];  // tile starting global id offset
 
-      for ( index_type tileidx = (index_type)blockIdx_x; tileidx < m_rp.m_num_tiles; tileidx += gridDim_x ) {
-        index_type tile_idx = tileidx; // temp because tile_idx will be modified while determining tile starting point offsets
+      for (index_type tileidx = (index_type)blockIdx_x;
+           tileidx < m_rp.m_num_tiles; tileidx += gridDim_x) {
+        index_type tile_idx =
+            tileidx;  // temp because tile_idx will be modified while
+                      // determining tile starting point offsets
         index_type thrd_idx = (index_type)threadIdx_y;
-        bool in_bounds = true;
+        bool in_bounds      = true;
 
         // LL
         if (RP::inner_direction == RP::Left) {
-          for (int i=0; i<RP::rank; ++i) {
-            m_offset[i] = (tile_idx % m_rp.m_tile_end[i]) * m_rp.m_tile[i] + m_rp.m_lower[i] ;
+          for (int i = 0; i < RP::rank; ++i) {
+            m_offset[i] = (tile_idx % m_rp.m_tile_end[i]) * m_rp.m_tile[i] +
+                          m_rp.m_lower[i];
             tile_idx /= m_rp.m_tile_end[i];
 
             // tile-local indices identified with (index_type)threadIdx_y
@@ -1385,71 +1595,80 @@ struct DeviceIterateTile<3,RP,Functor,void,ValueType , typename std::enable_if<
             thrd_idx /= m_rp.m_tile[i];
 
             m_offset[i] += m_local_offset[i];
-            if ( !(m_offset[i] < m_rp.m_upper[i] && m_local_offset[i] < m_rp.m_tile[i]) ) {
+            if (!(m_offset[i] < m_rp.m_upper[i] &&
+                  m_local_offset[i] < m_rp.m_tile[i])) {
               in_bounds &= false;
             }
           }
-          if ( in_bounds )
-          { m_func( m_offset[0], m_offset[1], m_offset[2], m_v ); }
+          if (in_bounds) {
+            m_func(m_offset[0], m_offset[1], m_offset[2], m_v);
+          }
         }
         // LR
         else {
-          for (int i=RP::rank-1; i>=0; --i) {
-            m_offset[i] = (tile_idx % m_rp.m_tile_end[i]) * m_rp.m_tile[i] + m_rp.m_lower[i] ;
+          for (int i = RP::rank - 1; i >= 0; --i) {
+            m_offset[i] = (tile_idx % m_rp.m_tile_end[i]) * m_rp.m_tile[i] +
+                          m_rp.m_lower[i];
             tile_idx /= m_rp.m_tile_end[i];
 
             // tile-local indices identified with (index_type)threadIdx_y
-            m_local_offset[i] = (thrd_idx % m_rp.m_tile[i]); // Move this to first computation, add to m_offset right away
+            m_local_offset[i] =
+                (thrd_idx % m_rp.m_tile[i]);  // Move this to first computation,
+                                              // add to m_offset right away
             thrd_idx /= m_rp.m_tile[i];
 
             m_offset[i] += m_local_offset[i];
-            if ( !(m_offset[i] < m_rp.m_upper[i] && m_local_offset[i] < m_rp.m_tile[i]) ) {
+            if (!(m_offset[i] < m_rp.m_upper[i] &&
+                  m_local_offset[i] < m_rp.m_tile[i])) {
               in_bounds &= false;
             }
           }
-          if ( in_bounds )
-          { m_func( m_offset[0], m_offset[1], m_offset[2], m_v ); }
+          if (in_bounds) {
+            m_func(m_offset[0], m_offset[1], m_offset[2], m_v);
+          }
         }
       }
     }
-  } //end exec_range
+  }  // end exec_range
 
-private:
-  const RP & m_rp;
-  const Functor & m_func;
-  ValueType & m_v;
+ private:
+  const RP& m_rp;
+  const Functor& m_func;
+  ValueType& m_v;
 };
 
-
 // Specializations for void tag type
-template< typename RP , typename Functor , typename Tag, typename ValueType >
-struct DeviceIterateTile<3,RP,Functor,Tag, ValueType, typename std::enable_if< !is_array_type<ValueType>::value && !is_void< Tag >::value >::type >
-{
+template <typename RP, typename Functor, typename Tag, typename ValueType>
+struct DeviceIterateTile<
+    3, RP, Functor, Tag, ValueType,
+    typename std::enable_if<!is_array_type<ValueType>::value &&
+                            !is_void<Tag>::value>::type> {
   using index_type = typename RP::index_type;
 
   KOKKOS_INLINE_FUNCTION
-  DeviceIterateTile( const RP & rp_ , const Functor & f_ , ValueType & v_)
-  : m_rp(rp_)
-  , m_func(f_)
-  , m_v(v_)
-  {}
+  DeviceIterateTile(const RP& rp_, const Functor& f_, ValueType& v_)
+      : m_rp(rp_), m_func(f_), m_v(v_) {}
 
   KOKKOS_INLINE_FUNCTION
-  void exec_range() const
-  {
-    if ( (index_type)blockIdx_x < m_rp.m_num_tiles && (index_type)threadIdx_y < m_rp.m_prod_tile_dims ) {
-      index_type m_offset[RP::rank]; // tile starting global id offset
-      index_type m_local_offset[RP::rank]; // tile starting global id offset
+  void exec_range() const {
+    if ((index_type)blockIdx_x < m_rp.m_num_tiles &&
+        (index_type)threadIdx_y < m_rp.m_prod_tile_dims) {
+      index_type m_offset[RP::rank];        // tile starting global id offset
+      index_type m_local_offset[RP::rank];  // tile starting global id offset
 
-      for ( index_type tileidx = (index_type)blockIdx_x; tileidx < m_rp.m_num_tiles; tileidx += gridDim_x ) {
-        index_type tile_idx = tileidx; // temp because tile_idx will be modified while determining tile starting point offsets
+      for (index_type tileidx = (index_type)blockIdx_x;
+           tileidx < m_rp.m_num_tiles; tileidx += gridDim_x) {
+        index_type tile_idx =
+            tileidx;  // temp because tile_idx will be modified while
+                      // determining tile starting point offsets
         index_type thrd_idx = (index_type)threadIdx_y;
-        bool in_bounds = true;
+        bool in_bounds      = true;
 
         // LL
         if (RP::inner_direction == RP::Left) {
-          for (int i=0; i<RP::rank; ++i) {
-            m_offset[i] = (tile_idx % m_rp.m_tile_end[i]) * m_rp.m_tile[i] + m_rp.m_lower[i] ;
+          for (int i = 0; i < RP::rank; ++i) {
+            m_offset[i] = (tile_idx % m_rp.m_tile_end[i]) * m_rp.m_tile[i] +
+                          m_rp.m_lower[i];
             tile_idx /= m_rp.m_tile_end[i];
 
             // tile-local indices identified with (index_type)threadIdx_y
@@ -1457,77 +1676,87 @@ struct DeviceIterateTile<3,RP,Functor,Tag, ValueType, typename std::enable_if< !
             thrd_idx /= m_rp.m_tile[i];
 
             m_offset[i] += m_local_offset[i];
-            if ( !(m_offset[i] < m_rp.m_upper[i] && m_local_offset[i] < m_rp.m_tile[i]) ) {
+            if (!(m_offset[i] < m_rp.m_upper[i] &&
+                  m_local_offset[i] < m_rp.m_tile[i])) {
               in_bounds &= false;
             }
           }
-          if ( in_bounds )
-          { m_func( Tag(), m_offset[0], m_offset[1], m_offset[2], m_v ); }
+          if (in_bounds) {
+            m_func(Tag(), m_offset[0], m_offset[1], m_offset[2], m_v);
+          }
         }
         // LR
         else {
-          for (int i=RP::rank-1; i>=0; --i) {
-            m_offset[i] = (tile_idx % m_rp.m_tile_end[i]) * m_rp.m_tile[i] + m_rp.m_lower[i] ;
+          for (int i = RP::rank - 1; i >= 0; --i) {
+            m_offset[i] = (tile_idx % m_rp.m_tile_end[i]) * m_rp.m_tile[i] +
+                          m_rp.m_lower[i];
             tile_idx /= m_rp.m_tile_end[i];
 
             // tile-local indices identified with (index_type)threadIdx_y
-            m_local_offset[i] = (thrd_idx % m_rp.m_tile[i]); // Move this to first computation, add to m_offset right away
+            m_local_offset[i] =
+                (thrd_idx % m_rp.m_tile[i]);  // Move this to first computation,
+                                              // add to m_offset right away
             thrd_idx /= m_rp.m_tile[i];
 
             m_offset[i] += m_local_offset[i];
-            if ( !(m_offset[i] < m_rp.m_upper[i] && m_local_offset[i] < m_rp.m_tile[i]) ) {
+            if (!(m_offset[i] < m_rp.m_upper[i] &&
+                  m_local_offset[i] < m_rp.m_tile[i])) {
               in_bounds &= false;
             }
           }
-          if ( in_bounds )
-          { m_func( Tag(), m_offset[0], m_offset[1], m_offset[2], m_v ); }
+          if (in_bounds) {
+            m_func(Tag(), m_offset[0], m_offset[1], m_offset[2], m_v);
+          }
         }
       }
     }
-  } //end exec_range
+  }  // end exec_range
 
-private:
-  const RP & m_rp;
-  const Functor & m_func;
-  ValueType & m_v;
+ private:
+  const RP& m_rp;
+  const Functor& m_func;
+  ValueType& m_v;
 };
 
-
-//Rank 4
+// Rank 4
 // Specializations for void tag type
-template< typename RP , typename Functor , typename ValueType >
-struct DeviceIterateTile<4,RP,Functor,void,ValueType , typename std::enable_if< !is_array_type<ValueType>::value >::type >
-{
+template <typename RP, typename Functor, typename ValueType>
+struct DeviceIterateTile<
+    4, RP, Functor, void, ValueType,
+    typename std::enable_if<!is_array_type<ValueType>::value>::type> {
   using index_type = typename RP::index_type;
 
-  [[hc]]
-  DeviceIterateTile( const RP & rp_ , const Functor & f_ , ValueType & v_)
-  : m_rp(rp_)
-  , m_func(f_)
-  , m_v(v_)
-  {}
+  [[hc]] DeviceIterateTile(const RP& rp_, const Functor& f_, ValueType& v_)
+      : m_rp(rp_), m_func(f_), m_v(v_) {}
 
   static constexpr index_type max_blocks = 65535;
-  //static constexpr index_type max_blocks = static_cast<index_type>(Kokkos::Impl::ROCmTraits::UpperBoundGridCount);
+  // static constexpr index_type max_blocks =
+  // static_cast<index_type>(Kokkos::Impl::ROCmTraits::UpperBoundGridCount);
 
   KOKKOS_INLINE_FUNCTION
-  void exec_range() const
-  {
-    //enum { max_blocks = static_cast<index_type>(Kokkos::Impl::ROCmTraits::UpperBoundGridCount) };
-    //const index_type max_blocks = static_cast<index_type>( Kokkos::Impl::rocm_internal_maximum_grid_count() );
-    if ( (index_type)blockIdx_x < m_rp.m_num_tiles && (index_type)threadIdx_y < m_rp.m_prod_tile_dims ) {
-      index_type m_offset[RP::rank]; // tile starting global id offset
-      index_type m_local_offset[RP::rank]; // tile starting global id offset
+  void exec_range() const {
+    // enum { max_blocks =
+    // static_cast<index_type>(Kokkos::Impl::ROCmTraits::UpperBoundGridCount) };
+    // const index_type max_blocks = static_cast<index_type>(
+    // Kokkos::Impl::rocm_internal_maximum_grid_count() );
+    if ((index_type)blockIdx_x < m_rp.m_num_tiles &&
+        (index_type)threadIdx_y < m_rp.m_prod_tile_dims) {
+      index_type m_offset[RP::rank];        // tile starting global id offset
+      index_type m_local_offset[RP::rank];  // tile starting global id offset
 
-      for ( index_type tileidx = (index_type)blockIdx_x; tileidx < m_rp.m_num_tiles; tileidx += gridDim_x ) {
-        index_type tile_idx = tileidx; // temp because tile_idx will be modified while determining tile starting point offsets
+      for (index_type tileidx = (index_type)blockIdx_x;
+           tileidx < m_rp.m_num_tiles; tileidx += gridDim_x) {
+        index_type tile_idx =
+            tileidx;  // temp because tile_idx will be modified while
+                      // determining tile starting point offsets
         index_type thrd_idx = (index_type)threadIdx_y;
-        bool in_bounds = true;
+        bool in_bounds      = true;
 
         // LL
         if (RP::inner_direction == RP::Left) {
-          for (int i=0; i<RP::rank; ++i) {
-            m_offset[i] = (tile_idx % m_rp.m_tile_end[i]) * m_rp.m_tile[i] + m_rp.m_lower[i] ;
+          for (int i = 0; i < RP::rank; ++i) {
+            m_offset[i] = (tile_idx % m_rp.m_tile_end[i]) * m_rp.m_tile[i] +
+                          m_rp.m_lower[i];
             tile_idx /= m_rp.m_tile_end[i];
 
             // tile-local indices identified with (index_type)threadIdx_y
@@ -1535,17 +1764,20 @@ struct DeviceIterateTile<4,RP,Functor,void,ValueType , typename std::enable_if<
             thrd_idx /= m_rp.m_tile[i];
 
             m_offset[i] += m_local_offset[i];
-            if ( !(m_offset[i] < m_rp.m_upper[i] && m_local_offset[i] < m_rp.m_tile[i]) ) {
+            if (!(m_offset[i] < m_rp.m_upper[i] &&
+                  m_local_offset[i] < m_rp.m_tile[i])) {
               in_bounds &= false;
             }
           }
-          if ( in_bounds )
-          { m_func( m_offset[0], m_offset[1], m_offset[2], m_offset[3], m_v ); }
+          if (in_bounds) {
+            m_func(m_offset[0], m_offset[1], m_offset[2], m_offset[3], m_v);
+          }
         }
         // LR
         else {
-          for (int i=RP::rank-1; i>=0; --i) {
-            m_offset[i] = (tile_idx % m_rp.m_tile_end[i]) * m_rp.m_tile[i] + m_rp.m_lower[i] ;
+          for (int i = RP::rank - 1; i >= 0; --i) {
+            m_offset[i] = (tile_idx % m_rp.m_tile_end[i]) * m_rp.m_tile[i] +
+                          m_rp.m_lower[i];
             tile_idx /= m_rp.m_tile_end[i];
 
             // tile-local indices identified with (index_type)threadIdx_y
@@ -1553,58 +1785,65 @@ struct DeviceIterateTile<4,RP,Functor,void,ValueType , typename std::enable_if<
             thrd_idx /= m_rp.m_tile[i];
 
             m_offset[i] += m_local_offset[i];
-            if ( !(m_offset[i] < m_rp.m_upper[i] && m_local_offset[i] < m_rp.m_tile[i]) ) {
+            if (!(m_offset[i] < m_rp.m_upper[i] &&
+                  m_local_offset[i] < m_rp.m_tile[i])) {
               in_bounds &= false;
             }
           }
-          if ( in_bounds )
-          { m_func( m_offset[0], m_offset[1], m_offset[2], m_offset[3], m_v ); }
+          if (in_bounds) {
+            m_func(m_offset[0], m_offset[1], m_offset[2], m_offset[3], m_v);
+          }
         }
       }
     }
-  } //end exec_range
+  }  // end exec_range
 
-private:
-  const RP & m_rp;
-  const Functor & m_func;
-  ValueType & m_v;
+ private:
+  const RP& m_rp;
+  const Functor& m_func;
+  ValueType& m_v;
 };
 
-
 // Specializations for void tag type
-template< typename RP , typename Functor , typename Tag, typename ValueType >
-struct DeviceIterateTile<4,RP,Functor,Tag,ValueType, typename std::enable_if< !is_array_type<ValueType>::value && !is_void< Tag >::value >::type >
-{
+template <typename RP, typename Functor, typename Tag, typename ValueType>
+struct DeviceIterateTile<
+    4, RP, Functor, Tag, ValueType,
+    typename std::enable_if<!is_array_type<ValueType>::value &&
+                            !is_void<Tag>::value>::type> {
   using index_type = typename RP::index_type;
 
   KOKKOS_INLINE_FUNCTION
-  DeviceIterateTile( const RP & rp_ , const Functor & f_ , ValueType & v_)
-  : m_rp(rp_)
-  , m_func(f_)
-  , m_v(v_)
-  {}
+  DeviceIterateTile(const RP& rp_, const Functor& f_, ValueType& v_)
+      : m_rp(rp_), m_func(f_), m_v(v_) {}
 
   static constexpr index_type max_blocks = 65535;
-  //static constexpr index_type max_blocks = static_cast<index_type>(Kokkos::Impl::ROCmTraits::UpperBoundGridCount);
+  // static constexpr index_type max_blocks =
+  // static_cast<index_type>(Kokkos::Impl::ROCmTraits::UpperBoundGridCount);
 
   KOKKOS_INLINE_FUNCTION
-  void exec_range() const
-  {
-    //enum { max_blocks = static_cast<index_type>(Kokkos::Impl::ROCmTraits::UpperBoundGridCount) };
-    //const index_type max_blocks = static_cast<index_type>( Kokkos::Impl::rocm_internal_maximum_grid_count() );
-    if ( (index_type)blockIdx_x < m_rp.m_num_tiles && (index_type)threadIdx_y < m_rp.m_prod_tile_dims ) {
-      index_type m_offset[RP::rank]; // tile starting global id offset
-      index_type m_local_offset[RP::rank]; // tile starting global id offset
+  void exec_range() const {
+    // enum { max_blocks =
+    // static_cast<index_type>(Kokkos::Impl::ROCmTraits::UpperBoundGridCount) };
+    // const index_type max_blocks = static_cast<index_type>(
+    // Kokkos::Impl::rocm_internal_maximum_grid_count() );
+    if ((index_type)blockIdx_x < m_rp.m_num_tiles &&
+        (index_type)threadIdx_y < m_rp.m_prod_tile_dims) {
+      index_type m_offset[RP::rank];        // tile starting global id offset
+      index_type m_local_offset[RP::rank];  // tile starting global id offset
 
-      for ( index_type tileidx = (index_type)blockIdx_x; tileidx < m_rp.m_num_tiles; tileidx += gridDim_x ) {
-        index_type tile_idx = tileidx; // temp because tile_idx will be modified while determining tile starting point offsets
+      for (index_type tileidx = (index_type)blockIdx_x;
+           tileidx < m_rp.m_num_tiles; tileidx += gridDim_x) {
+        index_type tile_idx =
+            tileidx;  // temp because tile_idx will be modified while
+                      // determining tile starting point offsets
         index_type thrd_idx = (index_type)threadIdx_y;
-        bool in_bounds = true;
+        bool in_bounds      = true;
 
         // LL
         if (RP::inner_direction == RP::Left) {
-          for (int i=0; i<RP::rank; ++i) {
-            m_offset[i] = (tile_idx % m_rp.m_tile_end[i]) * m_rp.m_tile[i] + m_rp.m_lower[i] ;
+          for (int i = 0; i < RP::rank; ++i) {
+            m_offset[i] = (tile_idx % m_rp.m_tile_end[i]) * m_rp.m_tile[i] +
+                          m_rp.m_lower[i];
             tile_idx /= m_rp.m_tile_end[i];
 
             // tile-local indices identified with (index_type)threadIdx_y
@@ -1612,17 +1851,21 @@ struct DeviceIterateTile<4,RP,Functor,Tag,ValueType, typename std::enable_if< !i
             thrd_idx /= m_rp.m_tile[i];
 
             m_offset[i] += m_local_offset[i];
-            if ( !(m_offset[i] < m_rp.m_upper[i] && m_local_offset[i] < m_rp.m_tile[i]) ) {
+            if (!(m_offset[i] < m_rp.m_upper[i] &&
+                  m_local_offset[i] < m_rp.m_tile[i])) {
               in_bounds &= false;
             }
           }
-          if ( in_bounds )
-          { m_func( Tag(), m_offset[0], m_offset[1], m_offset[2], m_offset[3], m_v ); }
+          if (in_bounds) {
+            m_func(Tag(), m_offset[0], m_offset[1], m_offset[2], m_offset[3],
+                   m_v);
+          }
         }
         // LR
         else {
-          for (int i=RP::rank-1; i>=0; --i) {
-            m_offset[i] = (tile_idx % m_rp.m_tile_end[i]) * m_rp.m_tile[i] + m_rp.m_lower[i] ;
+          for (int i = RP::rank - 1; i >= 0; --i) {
+            m_offset[i] = (tile_idx % m_rp.m_tile_end[i]) * m_rp.m_tile[i] +
+                          m_rp.m_lower[i];
             tile_idx /= m_rp.m_tile_end[i];
 
             // tile-local indices identified with (index_type)threadIdx_y
@@ -1630,59 +1873,65 @@ struct DeviceIterateTile<4,RP,Functor,Tag,ValueType, typename std::enable_if< !i
             thrd_idx /= m_rp.m_tile[i];
 
             m_offset[i] += m_local_offset[i];
-            if ( !(m_offset[i] < m_rp.m_upper[i] && m_local_offset[i] < m_rp.m_tile[i]) ) {
+            if (!(m_offset[i] < m_rp.m_upper[i] &&
+                  m_local_offset[i] < m_rp.m_tile[i])) {
               in_bounds &= false;
             }
           }
-          if ( in_bounds )
-          { m_func( Tag(), m_offset[0], m_offset[1], m_offset[2], m_offset[3], m_v ); }
+          if (in_bounds) {
+            m_func(Tag(), m_offset[0], m_offset[1], m_offset[2], m_offset[3],
+                   m_v);
+          }
         }
       }
     }
-  } //end exec_range
+  }  // end exec_range
 
-private:
-  const RP & m_rp;
-  const Functor & m_func;
-  ValueType & m_v;
+ private:
+  const RP& m_rp;
+  const Functor& m_func;
+  ValueType& m_v;
 };
 
-
-//Rank 5
+// Rank 5
 // Specializations for void tag type
-template< typename RP , typename Functor , typename ValueType >
-struct DeviceIterateTile<5,RP,Functor,void,ValueType , typename std::enable_if< !is_array_type<ValueType>::value >::type >
-{
+template <typename RP, typename Functor, typename ValueType>
+struct DeviceIterateTile<
+    5, RP, Functor, void, ValueType,
+    typename std::enable_if<!is_array_type<ValueType>::value>::type> {
   using index_type = typename RP::index_type;
 
-  [[hc]]
-  DeviceIterateTile( const RP & rp_ , const Functor & f_ , ValueType & v_)
-  : m_rp(rp_)
-  , m_func(f_)
-  , m_v(v_)
-  {}
+  [[hc]] DeviceIterateTile(const RP& rp_, const Functor& f_, ValueType& v_)
+      : m_rp(rp_), m_func(f_), m_v(v_) {}
 
   static constexpr index_type max_blocks = 65535;
-  //static constexpr index_type max_blocks = static_cast<index_type>(Kokkos::Impl::ROCmTraits::UpperBoundGridCount);
+  // static constexpr index_type max_blocks =
+  // static_cast<index_type>(Kokkos::Impl::ROCmTraits::UpperBoundGridCount);
 
   KOKKOS_INLINE_FUNCTION
-  void exec_range() const
-  {
-    //enum { max_blocks = static_cast<index_type>(Kokkos::Impl::ROCmTraits::UpperBoundGridCount) };
-    //const index_type max_blocks = static_cast<index_type>( Kokkos::Impl::rocm_internal_maximum_grid_count() );
-    if ( (index_type)blockIdx_x < m_rp.m_num_tiles && (index_type)threadIdx_y < m_rp.m_prod_tile_dims ) {
-      index_type m_offset[RP::rank]; // tile starting global id offset
-      index_type m_local_offset[RP::rank]; // tile starting global id offset
+  void exec_range() const {
+    // enum { max_blocks =
+    // static_cast<index_type>(Kokkos::Impl::ROCmTraits::UpperBoundGridCount) };
+    // const index_type max_blocks = static_cast<index_type>(
+    // Kokkos::Impl::rocm_internal_maximum_grid_count() );
+    if ((index_type)blockIdx_x < m_rp.m_num_tiles &&
+        (index_type)threadIdx_y < m_rp.m_prod_tile_dims) {
+      index_type m_offset[RP::rank];        // tile starting global id offset
+      index_type m_local_offset[RP::rank];  // tile starting global id offset
 
-      for ( index_type tileidx = (index_type)blockIdx_x; tileidx < m_rp.m_num_tiles; tileidx += gridDim_x ) {
-        index_type tile_idx = tileidx; // temp because tile_idx will be modified while determining tile starting point offsets
+      for (index_type tileidx = (index_type)blockIdx_x;
+           tileidx < m_rp.m_num_tiles; tileidx += gridDim_x) {
+        index_type tile_idx =
+            tileidx;  // temp because tile_idx will be modified while
+                      // determining tile starting point offsets
         index_type thrd_idx = (index_type)threadIdx_y;
-        bool in_bounds = true;
+        bool in_bounds      = true;
 
         // LL
         if (RP::inner_direction == RP::Left) {
-          for (int i=0; i<RP::rank; ++i) {
-            m_offset[i] = (tile_idx % m_rp.m_tile_end[i]) * m_rp.m_tile[i] + m_rp.m_lower[i] ;
+          for (int i = 0; i < RP::rank; ++i) {
+            m_offset[i] = (tile_idx % m_rp.m_tile_end[i]) * m_rp.m_tile[i] +
+                          m_rp.m_lower[i];
             tile_idx /= m_rp.m_tile_end[i];
 
             // tile-local indices identified with (index_type)threadIdx_y
@@ -1690,17 +1939,21 @@ struct DeviceIterateTile<5,RP,Functor,void,ValueType , typename std::enable_if<
             thrd_idx /= m_rp.m_tile[i];
 
             m_offset[i] += m_local_offset[i];
-            if ( !(m_offset[i] < m_rp.m_upper[i] && m_local_offset[i] < m_rp.m_tile[i]) ) {
+            if (!(m_offset[i] < m_rp.m_upper[i] &&
+                  m_local_offset[i] < m_rp.m_tile[i])) {
               in_bounds &= false;
             }
           }
-          if ( in_bounds )
-          { m_func( m_offset[0], m_offset[1], m_offset[2], m_offset[3], m_offset[4], m_v ); }
+          if (in_bounds) {
+            m_func(m_offset[0], m_offset[1], m_offset[2], m_offset[3],
+                   m_offset[4], m_v);
+          }
         }
         // LR
         else {
-          for (int i=RP::rank-1; i>=0; --i) {
-            m_offset[i] = (tile_idx % m_rp.m_tile_end[i]) * m_rp.m_tile[i] + m_rp.m_lower[i] ;
+          for (int i = RP::rank - 1; i >= 0; --i) {
+            m_offset[i] = (tile_idx % m_rp.m_tile_end[i]) * m_rp.m_tile[i] +
+                          m_rp.m_lower[i];
             tile_idx /= m_rp.m_tile_end[i];
 
             // tile-local indices identified with (index_type)threadIdx_y
@@ -1708,58 +1961,65 @@ struct DeviceIterateTile<5,RP,Functor,void,ValueType , typename std::enable_if<
             thrd_idx /= m_rp.m_tile[i];
 
             m_offset[i] += m_local_offset[i];
-            if ( !(m_offset[i] < m_rp.m_upper[i] && m_local_offset[i] < m_rp.m_tile[i]) ) {
+            if (!(m_offset[i] < m_rp.m_upper[i] &&
+                  m_local_offset[i] < m_rp.m_tile[i])) {
               in_bounds &= false;
             }
           }
-          if ( in_bounds )
-          { m_func( m_offset[0], m_offset[1], m_offset[2], m_offset[3], m_offset[4], m_v ); }
+          if (in_bounds) {
+            m_func(m_offset[0], m_offset[1], m_offset[2], m_offset[3],
+                   m_offset[4], m_v);
+          }
         }
       }
     }
-  } //end exec_range
+  }  // end exec_range
 
-private:
-  const RP & m_rp;
-  const Functor & m_func;
-  ValueType & m_v;
+ private:
+  const RP& m_rp;
+  const Functor& m_func;
+  ValueType& m_v;
 };
 
-
 // Specializations for tag type
-template< typename RP , typename Functor , typename Tag, typename ValueType >
-struct DeviceIterateTile<5,RP,Functor,Tag,ValueType, typename std::enable_if< !is_array_type<ValueType>::value && !is_void< Tag >::value >::type >
-{
+template <typename RP, typename Functor, typename Tag, typename ValueType>
+struct DeviceIterateTile<
+    5, RP, Functor, Tag, ValueType,
+    typename std::enable_if<!is_array_type<ValueType>::value &&
+                            !is_void<Tag>::value>::type> {
   using index_type = typename RP::index_type;
 
-  [[hc]]
-  DeviceIterateTile( const RP & rp_ , const Functor & f_ , ValueType & v_)
-  : m_rp(rp_)
-  , m_func(f_)
-  , m_v(v_)
-  {}
+  [[hc]] DeviceIterateTile(const RP& rp_, const Functor& f_, ValueType& v_)
+      : m_rp(rp_), m_func(f_), m_v(v_) {}
 
   static constexpr index_type max_blocks = 65535;
-  //static constexpr index_type max_blocks = static_cast<index_type>(Kokkos::Impl::ROCmTraits::UpperBoundGridCount);
+  // static constexpr index_type max_blocks =
+  // static_cast<index_type>(Kokkos::Impl::ROCmTraits::UpperBoundGridCount);
 
   KOKKOS_INLINE_FUNCTION
-  void exec_range() const
-  {
-    //enum { max_blocks = static_cast<index_type>(Kokkos::Impl::ROCmTraits::UpperBoundGridCount) };
-    //const index_type max_blocks = static_cast<index_type>( Kokkos::Impl::rocm_internal_maximum_grid_count() );
-    if ( (index_type)blockIdx_x < m_rp.m_num_tiles && (index_type)threadIdx_y < m_rp.m_prod_tile_dims ) {
-      index_type m_offset[RP::rank]; // tile starting global id offset
-      index_type m_local_offset[RP::rank]; // tile starting global id offset
+  void exec_range() const {
+    // enum { max_blocks =
+    // static_cast<index_type>(Kokkos::Impl::ROCmTraits::UpperBoundGridCount) };
+    // const index_type max_blocks = static_cast<index_type>(
+    // Kokkos::Impl::rocm_internal_maximum_grid_count() );
+    if ((index_type)blockIdx_x < m_rp.m_num_tiles &&
+        (index_type)threadIdx_y < m_rp.m_prod_tile_dims) {
+      index_type m_offset[RP::rank];        // tile starting global id offset
+      index_type m_local_offset[RP::rank];  // tile starting global id offset
 
-      for ( index_type tileidx = (index_type)blockIdx_x; tileidx < m_rp.m_num_tiles; tileidx += gridDim_x ) {
-        index_type tile_idx = tileidx; // temp because tile_idx will be modified while determining tile starting point offsets
+      for (index_type tileidx = (index_type)blockIdx_x;
+           tileidx < m_rp.m_num_tiles; tileidx += gridDim_x) {
+        index_type tile_idx =
+            tileidx;  // temp because tile_idx will be modified while
+                      // determining tile starting point offsets
         index_type thrd_idx = (index_type)threadIdx_y;
-        bool in_bounds = true;
+        bool in_bounds      = true;
 
         // LL
         if (RP::inner_direction == RP::Left) {
-          for (int i=0; i<RP::rank; ++i) {
-            m_offset[i] = (tile_idx % m_rp.m_tile_end[i]) * m_rp.m_tile[i] + m_rp.m_lower[i] ;
+          for (int i = 0; i < RP::rank; ++i) {
+            m_offset[i] = (tile_idx % m_rp.m_tile_end[i]) * m_rp.m_tile[i] +
+                          m_rp.m_lower[i];
             tile_idx /= m_rp.m_tile_end[i];
 
             // tile-local indices identified with (index_type)threadIdx_y
@@ -1767,17 +2027,21 @@ struct DeviceIterateTile<5,RP,Functor,Tag,ValueType, typename std::enable_if< !i
             thrd_idx /= m_rp.m_tile[i];
 
             m_offset[i] += m_local_offset[i];
-            if ( !(m_offset[i] < m_rp.m_upper[i] && m_local_offset[i] < m_rp.m_tile[i]) ) {
+            if (!(m_offset[i] < m_rp.m_upper[i] &&
+                  m_local_offset[i] < m_rp.m_tile[i])) {
               in_bounds &= false;
             }
           }
-          if ( in_bounds )
-          { m_func( Tag(), m_offset[0], m_offset[1], m_offset[2], m_offset[3], m_offset[4], m_v ); }
+          if (in_bounds) {
+            m_func(Tag(), m_offset[0], m_offset[1], m_offset[2], m_offset[3],
+                   m_offset[4], m_v);
+          }
         }
         // LR
         else {
-          for (int i=RP::rank-1; i>=0; --i) {
-            m_offset[i] = (tile_idx % m_rp.m_tile_end[i]) * m_rp.m_tile[i] + m_rp.m_lower[i] ;
+          for (int i = RP::rank - 1; i >= 0; --i) {
+            m_offset[i] = (tile_idx % m_rp.m_tile_end[i]) * m_rp.m_tile[i] +
+                          m_rp.m_lower[i];
             tile_idx /= m_rp.m_tile_end[i];
 
             // tile-local indices identified with (index_type)threadIdx_y
@@ -1785,59 +2049,65 @@ struct DeviceIterateTile<5,RP,Functor,Tag,ValueType, typename std::enable_if< !i
             thrd_idx /= m_rp.m_tile[i];
 
             m_offset[i] += m_local_offset[i];
-            if ( !(m_offset[i] < m_rp.m_upper[i] && m_local_offset[i] < m_rp.m_tile[i]) ) {
+            if (!(m_offset[i] < m_rp.m_upper[i] &&
+                  m_local_offset[i] < m_rp.m_tile[i])) {
               in_bounds &= false;
             }
           }
-          if ( in_bounds )
-          { m_func( Tag(), m_offset[0], m_offset[1], m_offset[2], m_offset[3], m_offset[4], m_v ); }
+          if (in_bounds) {
+            m_func(Tag(), m_offset[0], m_offset[1], m_offset[2], m_offset[3],
+                   m_offset[4], m_v);
+          }
         }
       }
     }
-  } //end exec_range
+  }  // end exec_range
 
-private:
-  const RP & m_rp;
-  const Functor & m_func;
-  ValueType & m_v;
+ private:
+  const RP& m_rp;
+  const Functor& m_func;
+  ValueType& m_v;
 };
 
-
-//Rank 6
+// Rank 6
 // Specializations for void tag type
-template< typename RP , typename Functor , typename ValueType >
-struct DeviceIterateTile<6,RP,Functor,void,ValueType , typename std::enable_if< !is_array_type<ValueType>::value >::type >
-{
+template <typename RP, typename Functor, typename ValueType>
+struct DeviceIterateTile<
+    6, RP, Functor, void, ValueType,
+    typename std::enable_if<!is_array_type<ValueType>::value>::type> {
   using index_type = typename RP::index_type;
 
-  [[hc]]
-  DeviceIterateTile( const RP & rp_ , const Functor & f_ , ValueType & v_)
-  : m_rp(rp_)
-  , m_func(f_)
-  , m_v(v_)
-  {}
+  [[hc]] DeviceIterateTile(const RP& rp_, const Functor& f_, ValueType& v_)
+      : m_rp(rp_), m_func(f_), m_v(v_) {}
 
   static constexpr index_type max_blocks = 65535;
-  //static constexpr index_type max_blocks = static_cast<index_type>(Kokkos::Impl::ROCmTraits::UpperBoundGridCount);
+  // static constexpr index_type max_blocks =
+  // static_cast<index_type>(Kokkos::Impl::ROCmTraits::UpperBoundGridCount);
 
   KOKKOS_INLINE_FUNCTION
-  void exec_range() const
-  {
-    //enum { max_blocks = static_cast<index_type>(Kokkos::Impl::ROCmTraits::UpperBoundGridCount) };
-    //const index_type max_blocks = static_cast<index_type>( Kokkos::Impl::rocm_internal_maximum_grid_count() );
-    if ( (index_type)blockIdx_x < m_rp.m_num_tiles && (index_type)threadIdx_y < m_rp.m_prod_tile_dims ) {
-      index_type m_offset[RP::rank]; // tile starting global id offset
-      index_type m_local_offset[RP::rank]; // tile starting global id offset
+  void exec_range() const {
+    // enum { max_blocks =
+    // static_cast<index_type>(Kokkos::Impl::ROCmTraits::UpperBoundGridCount) };
+    // const index_type max_blocks = static_cast<index_type>(
+    // Kokkos::Impl::rocm_internal_maximum_grid_count() );
+    if ((index_type)blockIdx_x < m_rp.m_num_tiles &&
+        (index_type)threadIdx_y < m_rp.m_prod_tile_dims) {
+      index_type m_offset[RP::rank];        // tile starting global id offset
+      index_type m_local_offset[RP::rank];  // tile starting global id offset
 
-      for ( index_type tileidx = (index_type)blockIdx_x; tileidx < m_rp.m_num_tiles; tileidx += gridDim_x ) {
-        index_type tile_idx = tileidx; // temp because tile_idx will be modified while determining tile starting point offsets
+      for (index_type tileidx = (index_type)blockIdx_x;
+           tileidx < m_rp.m_num_tiles; tileidx += gridDim_x) {
+        index_type tile_idx =
+            tileidx;  // temp because tile_idx will be modified while
+                      // determining tile starting point offsets
         index_type thrd_idx = (index_type)threadIdx_y;
-        bool in_bounds = true;
+        bool in_bounds      = true;
 
         // LL
         if (RP::inner_direction == RP::Left) {
-          for (int i=0; i<RP::rank; ++i) {
-            m_offset[i] = (tile_idx % m_rp.m_tile_end[i]) * m_rp.m_tile[i] + m_rp.m_lower[i] ;
+          for (int i = 0; i < RP::rank; ++i) {
+            m_offset[i] = (tile_idx % m_rp.m_tile_end[i]) * m_rp.m_tile[i] +
+                          m_rp.m_lower[i];
             tile_idx /= m_rp.m_tile_end[i];
 
             // tile-local indices identified with (index_type)threadIdx_y
@@ -1845,17 +2115,21 @@ struct DeviceIterateTile<6,RP,Functor,void,ValueType , typename std::enable_if<
             thrd_idx /= m_rp.m_tile[i];
 
             m_offset[i] += m_local_offset[i];
-            if ( !(m_offset[i] < m_rp.m_upper[i] && m_local_offset[i] < m_rp.m_tile[i]) ) {
+            if (!(m_offset[i] < m_rp.m_upper[i] &&
+                  m_local_offset[i] < m_rp.m_tile[i])) {
               in_bounds &= false;
             }
           }
-          if ( in_bounds )
-          { m_func( m_offset[0], m_offset[1], m_offset[2], m_offset[3], m_offset[4], m_offset[5], m_v ); }
+          if (in_bounds) {
+            m_func(m_offset[0], m_offset[1], m_offset[2], m_offset[3],
+                   m_offset[4], m_offset[5], m_v);
+          }
         }
         // LR
         else {
-          for (int i=RP::rank-1; i>=0; --i) {
-            m_offset[i] = (tile_idx % m_rp.m_tile_end[i]) * m_rp.m_tile[i] + m_rp.m_lower[i] ;
+          for (int i = RP::rank - 1; i >= 0; --i) {
+            m_offset[i] = (tile_idx % m_rp.m_tile_end[i]) * m_rp.m_tile[i] +
+                          m_rp.m_lower[i];
             tile_idx /= m_rp.m_tile_end[i];
 
             // tile-local indices identified with (index_type)threadIdx_y
@@ -1863,58 +2137,65 @@ struct DeviceIterateTile<6,RP,Functor,void,ValueType , typename std::enable_if<
             thrd_idx /= m_rp.m_tile[i];
 
             m_offset[i] += m_local_offset[i];
-            if ( !(m_offset[i] < m_rp.m_upper[i] && m_local_offset[i] < m_rp.m_tile[i]) ) {
+            if (!(m_offset[i] < m_rp.m_upper[i] &&
+                  m_local_offset[i] < m_rp.m_tile[i])) {
               in_bounds &= false;
             }
           }
-          if ( in_bounds )
-          { m_func( m_offset[0], m_offset[1], m_offset[2], m_offset[3], m_offset[4], m_offset[5], m_v ); }
+          if (in_bounds) {
+            m_func(m_offset[0], m_offset[1], m_offset[2], m_offset[3],
+                   m_offset[4], m_offset[5], m_v);
+          }
         }
       }
     }
-  } //end exec_range
+  }  // end exec_range
 
-private:
-  const RP & m_rp;
-  const Functor & m_func;
-  ValueType & m_v;
+ private:
+  const RP& m_rp;
+  const Functor& m_func;
+  ValueType& m_v;
 };
 
-
 // Specializations for tag type
-template< typename RP , typename Functor , typename Tag, typename ValueType >
-struct DeviceIterateTile<6,RP,Functor,Tag,ValueType, typename std::enable_if< !is_array_type<ValueType>::value && !is_void< Tag >::value >::type >
-{
+template <typename RP, typename Functor, typename Tag, typename ValueType>
+struct DeviceIterateTile<
+    6, RP, Functor, Tag, ValueType,
+    typename std::enable_if<!is_array_type<ValueType>::value &&
+                            !is_void<Tag>::value>::type> {
   using index_type = typename RP::index_type;
 
-  [[hc]]
-  DeviceIterateTile( const RP & rp_ , const Functor & f_ , ValueType & v_)
-  : m_rp(rp_)
-  , m_func(f_)
-  , m_v(v_)
-  {}
+  [[hc]] DeviceIterateTile(const RP& rp_, const Functor& f_, ValueType& v_)
+      : m_rp(rp_), m_func(f_), m_v(v_) {}
 
   static constexpr index_type max_blocks = 65535;
-  //static constexpr index_type max_blocks = static_cast<index_type>(Kokkos::Impl::ROCmTraits::UpperBoundGridCount);
+  // static constexpr index_type max_blocks =
+  // static_cast<index_type>(Kokkos::Impl::ROCmTraits::UpperBoundGridCount);
 
   KOKKOS_INLINE_FUNCTION
-  void exec_range() const
-  {
-    //enum { max_blocks = static_cast<index_type>(Kokkos::Impl::ROCmTraits::UpperBoundGridCount) };
-    //const index_type max_blocks = static_cast<index_type>( Kokkos::Impl::rocm_internal_maximum_grid_count() );
-    if ( (index_type)blockIdx_x < m_rp.m_num_tiles && (index_type)threadIdx_y < m_rp.m_prod_tile_dims ) {
-      index_type m_offset[RP::rank]; // tile starting global id offset
-      index_type m_local_offset[RP::rank]; // tile starting global id offset
+  void exec_range() const {
+    // enum { max_blocks =
+    // static_cast<index_type>(Kokkos::Impl::ROCmTraits::UpperBoundGridCount) };
+    // const index_type max_blocks = static_cast<index_type>(
+    // Kokkos::Impl::rocm_internal_maximum_grid_count() );
+    if ((index_type)blockIdx_x < m_rp.m_num_tiles &&
+        (index_type)threadIdx_y < m_rp.m_prod_tile_dims) {
+      index_type m_offset[RP::rank];        // tile starting global id offset
+      index_type m_local_offset[RP::rank];  // tile starting global id offset
 
-      for ( index_type tileidx = (index_type)blockIdx_x; tileidx < m_rp.m_num_tiles; tileidx += gridDim_x ) {
-        index_type tile_idx = tileidx; // temp because tile_idx will be modified while determining tile starting point offsets
+      for (index_type tileidx = (index_type)blockIdx_x;
+           tileidx < m_rp.m_num_tiles; tileidx += gridDim_x) {
+        index_type tile_idx =
+            tileidx;  // temp because tile_idx will be modified while
+                      // determining tile starting point offsets
         index_type thrd_idx = (index_type)threadIdx_y;
-        bool in_bounds = true;
+        bool in_bounds      = true;
 
         // LL
         if (RP::inner_direction == RP::Left) {
-          for (int i=0; i<RP::rank; ++i) {
-            m_offset[i] = (tile_idx % m_rp.m_tile_end[i]) * m_rp.m_tile[i] + m_rp.m_lower[i] ;
+          for (int i = 0; i < RP::rank; ++i) {
+            m_offset[i] = (tile_idx % m_rp.m_tile_end[i]) * m_rp.m_tile[i] +
+                          m_rp.m_lower[i];
             tile_idx /= m_rp.m_tile_end[i];
 
             // tile-local indices identified with (index_type)threadIdx_y
@@ -1922,17 +2203,21 @@ struct DeviceIterateTile<6,RP,Functor,Tag,ValueType, typename std::enable_if< !i
             thrd_idx /= m_rp.m_tile[i];
 
             m_offset[i] += m_local_offset[i];
-            if ( !(m_offset[i] < m_rp.m_upper[i] && m_local_offset[i] < m_rp.m_tile[i]) ) {
+            if (!(m_offset[i] < m_rp.m_upper[i] &&
+                  m_local_offset[i] < m_rp.m_tile[i])) {
               in_bounds &= false;
             }
           }
-          if ( in_bounds )
-          { m_func( Tag(), m_offset[0], m_offset[1], m_offset[2], m_offset[3], m_offset[4], m_offset[5], m_v ); }
+          if (in_bounds) {
+            m_func(Tag(), m_offset[0], m_offset[1], m_offset[2], m_offset[3],
+                   m_offset[4], m_offset[5], m_v);
+          }
         }
         // LR
         else {
-          for (int i=RP::rank-1; i>=0; --i) {
-            m_offset[i] = (tile_idx % m_rp.m_tile_end[i]) * m_rp.m_tile[i] + m_rp.m_lower[i] ;
+          for (int i = RP::rank - 1; i >= 0; --i) {
+            m_offset[i] = (tile_idx % m_rp.m_tile_end[i]) * m_rp.m_tile[i] +
+                          m_rp.m_lower[i];
             tile_idx /= m_rp.m_tile_end[i];
 
             // tile-local indices identified with (index_type)threadIdx_y
@@ -1940,130 +2225,140 @@ struct DeviceIterateTile<6,RP,Functor,Tag,ValueType, typename std::enable_if< !i
             thrd_idx /= m_rp.m_tile[i];
 
             m_offset[i] += m_local_offset[i];
-            if ( !(m_offset[i] < m_rp.m_upper[i] && m_local_offset[i] < m_rp.m_tile[i]) ) {
+            if (!(m_offset[i] < m_rp.m_upper[i] &&
+                  m_local_offset[i] < m_rp.m_tile[i])) {
               in_bounds &= false;
             }
           }
-          if ( in_bounds )
-          { m_func( Tag(), m_offset[0], m_offset[1], m_offset[2], m_offset[3], m_offset[4], m_offset[5], m_v ); }
+          if (in_bounds) {
+            m_func(Tag(), m_offset[0], m_offset[1], m_offset[2], m_offset[3],
+                   m_offset[4], m_offset[5], m_v);
+          }
         }
       }
     }
-  } //end exec_range
+  }  // end exec_range
 
-private:
-  const RP & m_rp;
-  const Functor & m_func;
-  ValueType & m_v;
+ private:
+  const RP& m_rp;
+  const Functor& m_func;
+  ValueType& m_v;
 };
 
-
 // ValueType = T[], T*
-//Rank 2
+// Rank 2
 // Specializations for void tag type
-template< typename RP , typename Functor , typename ValueType >
-struct DeviceIterateTile<2,RP,Functor,void,ValueType, typename std::enable_if< is_array_type<ValueType>::value >::type >
-{
+template <typename RP, typename Functor, typename ValueType>
+struct DeviceIterateTile<
+    2, RP, Functor, void, ValueType,
+    typename std::enable_if<is_array_type<ValueType>::value>::type> {
   using index_type = typename RP::index_type;
-  using value_type = typename is_array_type< ValueType >::value_type;
+  using value_type = typename is_array_type<ValueType>::value_type;
 
-  [[hc]]
-  DeviceIterateTile( const RP & rp_ , const Functor & f_ , value_type* v_)
-  : m_rp(rp_)
-  , m_func(f_)
-  , m_v(v_)
-  {}
+  [[hc]] DeviceIterateTile(const RP& rp_, const Functor& f_, value_type* v_)
+      : m_rp(rp_), m_func(f_), m_v(v_) {}
 
   KOKKOS_INLINE_FUNCTION
-  void exec_range() const
-  {
-    if ( (index_type)blockIdx_x < m_rp.m_num_tiles && (index_type)threadIdx_y < m_rp.m_prod_tile_dims ) {
-      index_type m_offset[RP::rank]; // tile starting global id offset
-      index_type m_local_offset[RP::rank]; // tile starting global id offset
+  void exec_range() const {
+    if ((index_type)blockIdx_x < m_rp.m_num_tiles &&
+        (index_type)threadIdx_y < m_rp.m_prod_tile_dims) {
+      index_type m_offset[RP::rank];        // tile starting global id offset
+      index_type m_local_offset[RP::rank];  // tile starting global id offset
 
-      for ( index_type tileidx = (index_type)blockIdx_x; tileidx < m_rp.m_num_tiles; tileidx += gridDim_x ) {
-        index_type tile_idx = tileidx; // temp because tile_idx will be modified while determining tile starting point offsets
+      for (index_type tileidx = (index_type)blockIdx_x;
+           tileidx < m_rp.m_num_tiles; tileidx += gridDim_x) {
+        index_type tile_idx =
+            tileidx;  // temp because tile_idx will be modified while
+                      // determining tile starting point offsets
         index_type thrd_idx = (index_type)threadIdx_y;
-        bool in_bounds = true;
+        bool in_bounds      = true;
 
         // LL
         if (RP::inner_direction == RP::Left) {
-          for (int i=0; i<RP::rank; ++i) {
-            m_offset[i] = (tile_idx % m_rp.m_tile_end[i]) * m_rp.m_tile[i] + m_rp.m_lower[i] ;
+          for (int i = 0; i < RP::rank; ++i) {
+            m_offset[i] = (tile_idx % m_rp.m_tile_end[i]) * m_rp.m_tile[i] +
+                          m_rp.m_lower[i];
             tile_idx /= m_rp.m_tile_end[i];
 
             m_local_offset[i] = (thrd_idx % m_rp.m_tile[i]);
             thrd_idx /= m_rp.m_tile[i];
 
             m_offset[i] += m_local_offset[i];
-            if ( !(m_offset[i] < m_rp.m_upper[i] && m_local_offset[i] < m_rp.m_tile[i]) ) {
+            if (!(m_offset[i] < m_rp.m_upper[i] &&
+                  m_local_offset[i] < m_rp.m_tile[i])) {
               in_bounds &= false;
             }
           }
-          if ( in_bounds )
-          {
-            m_func( m_offset[0], m_offset[1], m_v );
+          if (in_bounds) {
+            m_func(m_offset[0], m_offset[1], m_v);
           }
         }
         // LR
         else {
-          for (int i=RP::rank-1; i>=0; --i) {
-            m_offset[i] = (tile_idx % m_rp.m_tile_end[i]) * m_rp.m_tile[i] + m_rp.m_lower[i] ;
+          for (int i = RP::rank - 1; i >= 0; --i) {
+            m_offset[i] = (tile_idx % m_rp.m_tile_end[i]) * m_rp.m_tile[i] +
+                          m_rp.m_lower[i];
             tile_idx /= m_rp.m_tile_end[i];
 
             // tile-local indices identified with (index_type)threadIdx_y
-            m_local_offset[i] = (thrd_idx % m_rp.m_tile[i]); // Move this to first computation, add to m_offset right away
+            m_local_offset[i] =
+                (thrd_idx % m_rp.m_tile[i]);  // Move this to first computation,
+                                              // add to m_offset right away
             thrd_idx /= m_rp.m_tile[i];
 
             m_offset[i] += m_local_offset[i];
-            if ( !(m_offset[i] < m_rp.m_upper[i] && m_local_offset[i] < m_rp.m_tile[i]) ) {
+            if (!(m_offset[i] < m_rp.m_upper[i] &&
+                  m_local_offset[i] < m_rp.m_tile[i])) {
               in_bounds &= false;
             }
           }
-          if ( in_bounds )
-          { m_func( m_offset[0], m_offset[1], m_v ); }
+          if (in_bounds) {
+            m_func(m_offset[0], m_offset[1], m_v);
+          }
         }
       }
     }
-  } //end exec_range
+  }  // end exec_range
 
-private:
-  const RP & m_rp;
-  const Functor & m_func;
+ private:
+  const RP& m_rp;
+  const Functor& m_func;
   value_type* m_v;
 };
 
-
 // Specializations for tag type
-template< typename RP , typename Functor , typename Tag, typename ValueType >
-struct DeviceIterateTile<2,RP,Functor,Tag, ValueType, typename std::enable_if< is_array_type<ValueType>::value && !is_void< Tag >::value >::type >
-{
+template <typename RP, typename Functor, typename Tag, typename ValueType>
+struct DeviceIterateTile<
+    2, RP, Functor, Tag, ValueType,
+    typename std::enable_if<is_array_type<ValueType>::value &&
+                            !is_void<Tag>::value>::type> {
   using index_type = typename RP::index_type;
-  using value_type = typename is_array_type< ValueType >::value_type;
+  using value_type = typename is_array_type<ValueType>::value_type;
 
   KOKKOS_INLINE_FUNCTION
-  DeviceIterateTile( const RP & rp_ , const Functor & f_ , value_type* v_)
-  : m_rp(rp_)
-  , m_func(f_)
-  , m_v(v_)
-  {}
+  DeviceIterateTile(const RP& rp_, const Functor& f_, value_type* v_)
+      : m_rp(rp_), m_func(f_), m_v(v_) {}
 
   KOKKOS_INLINE_FUNCTION
-  void exec_range() const
-  {
-    if ( (index_type)blockIdx_x < m_rp.m_num_tiles && (index_type)threadIdx_y < m_rp.m_prod_tile_dims ) {
-      index_type m_offset[RP::rank]; // tile starting global id offset
-      index_type m_local_offset[RP::rank]; // tile starting global id offset
+  void exec_range() const {
+    if ((index_type)blockIdx_x < m_rp.m_num_tiles &&
+        (index_type)threadIdx_y < m_rp.m_prod_tile_dims) {
+      index_type m_offset[RP::rank];        // tile starting global id offset
+      index_type m_local_offset[RP::rank];  // tile starting global id offset
 
-      for ( index_type tileidx = (index_type)blockIdx_x; tileidx < m_rp.m_num_tiles; tileidx += gridDim_x ) {
-        index_type tile_idx = tileidx; // temp because tile_idx will be modified while determining tile starting point offsets
+      for (index_type tileidx = (index_type)blockIdx_x;
+           tileidx < m_rp.m_num_tiles; tileidx += gridDim_x) {
+        index_type tile_idx =
+            tileidx;  // temp because tile_idx will be modified while
+                      // determining tile starting point offsets
         index_type thrd_idx = (index_type)threadIdx_y;
-        bool in_bounds = true;
+        bool in_bounds      = true;
 
         // LL
         if (RP::inner_direction == RP::Left) {
-          for (int i=0; i<RP::rank; ++i) {
-            m_offset[i] = (tile_idx % m_rp.m_tile_end[i]) * m_rp.m_tile[i] + m_rp.m_lower[i] ;
+          for (int i = 0; i < RP::rank; ++i) {
+            m_offset[i] = (tile_idx % m_rp.m_tile_end[i]) * m_rp.m_tile[i] +
+                          m_rp.m_lower[i];
             tile_idx /= m_rp.m_tile_end[i];
 
             // tile-local indices identified with (index_type)threadIdx_y
@@ -2071,17 +2366,20 @@ struct DeviceIterateTile<2,RP,Functor,Tag, ValueType, typename std::enable_if< i
             thrd_idx /= m_rp.m_tile[i];
 
             m_offset[i] += m_local_offset[i];
-            if ( !(m_offset[i] < m_rp.m_upper[i] && m_local_offset[i] < m_rp.m_tile[i]) ) {
+            if (!(m_offset[i] < m_rp.m_upper[i] &&
+                  m_local_offset[i] < m_rp.m_tile[i])) {
               in_bounds &= false;
             }
           }
-          if ( in_bounds )
-          { m_func( Tag(), m_offset[0], m_offset[1], m_v ); }
+          if (in_bounds) {
+            m_func(Tag(), m_offset[0], m_offset[1], m_v);
+          }
         }
         // LR
         else {
-          for (int i=RP::rank-1; i>=0; --i) {
-            m_offset[i] = (tile_idx % m_rp.m_tile_end[i]) * m_rp.m_tile[i] + m_rp.m_lower[i] ;
+          for (int i = RP::rank - 1; i >= 0; --i) {
+            m_offset[i] = (tile_idx % m_rp.m_tile_end[i]) * m_rp.m_tile[i] +
+                          m_rp.m_lower[i];
             tile_idx /= m_rp.m_tile_end[i];
 
             // tile-local indices identified with (index_type)threadIdx_y
@@ -2089,128 +2387,142 @@ struct DeviceIterateTile<2,RP,Functor,Tag, ValueType, typename std::enable_if< i
             thrd_idx /= m_rp.m_tile[i];
 
             m_offset[i] += m_local_offset[i];
-            if ( !(m_offset[i] < m_rp.m_upper[i] && m_local_offset[i] < m_rp.m_tile[i]) ) {
+            if (!(m_offset[i] < m_rp.m_upper[i] &&
+                  m_local_offset[i] < m_rp.m_tile[i])) {
               in_bounds &= false;
             }
           }
-          if ( in_bounds )
-          { m_func( Tag(), m_offset[0], m_offset[1], m_v ); }
+          if (in_bounds) {
+            m_func(Tag(), m_offset[0], m_offset[1], m_v);
+          }
         }
-      } //end for loop over num_tiles - product of tiles in each direction
+      }  // end for loop over num_tiles - product of tiles in each direction
     }
-  } //end exec_range
+  }  // end exec_range
 
-private:
-  const RP & m_rp;
-  const Functor & m_func;
+ private:
+  const RP& m_rp;
+  const Functor& m_func;
   value_type* m_v;
 };
 
-
-//Rank 3
+// Rank 3
 // Specializations for void tag type
-template< typename RP , typename Functor , typename ValueType >
-struct DeviceIterateTile<3,RP,Functor,void,ValueType , typename std::enable_if< is_array_type<ValueType>::value >::type >
-{
+template <typename RP, typename Functor, typename ValueType>
+struct DeviceIterateTile<
+    3, RP, Functor, void, ValueType,
+    typename std::enable_if<is_array_type<ValueType>::value>::type> {
   using index_type = typename RP::index_type;
-  using value_type = typename is_array_type< ValueType >::value_type;
+  using value_type = typename is_array_type<ValueType>::value_type;
 
   KOKKOS_INLINE_FUNCTION
-  DeviceIterateTile( const RP & rp_ , const Functor & f_ , value_type* v_)
-  : m_rp(rp_)
-  , m_func(f_)
-  , m_v(v_)
-  {}
+  DeviceIterateTile(const RP& rp_, const Functor& f_, value_type* v_)
+      : m_rp(rp_), m_func(f_), m_v(v_) {}
 
   KOKKOS_INLINE_FUNCTION
-  void exec_range() const
-  {
-    if ( (index_type)blockIdx_x < m_rp.m_num_tiles && (index_type)threadIdx_y < m_rp.m_prod_tile_dims ) {
-      index_type m_offset[RP::rank]; // tile starting global id offset
-      index_type m_local_offset[RP::rank]; // tile starting global id offset
+  void exec_range() const {
+    if ((index_type)blockIdx_x < m_rp.m_num_tiles &&
+        (index_type)threadIdx_y < m_rp.m_prod_tile_dims) {
+      index_type m_offset[RP::rank];        // tile starting global id offset
+      index_type m_local_offset[RP::rank];  // tile starting global id offset
 
-      for ( index_type tileidx = (index_type)blockIdx_x; tileidx < m_rp.m_num_tiles; tileidx += gridDim_x ) {
-        index_type tile_idx = tileidx; // temp because tile_idx will be modified while determining tile starting point offsets
+      for (index_type tileidx = (index_type)blockIdx_x;
+           tileidx < m_rp.m_num_tiles; tileidx += gridDim_x) {
+        index_type tile_idx =
+            tileidx;  // temp because tile_idx will be modified while
+                      // determining tile starting point offsets
         index_type thrd_idx = (index_type)threadIdx_y;
-        bool in_bounds = true;
+        bool in_bounds      = true;
 
         // LL
         if (RP::inner_direction == RP::Left) {
-          for (int i=0; i<RP::rank; ++i) {
-            m_offset[i] = (tile_idx % m_rp.m_tile_end[i]) * m_rp.m_tile[i] + m_rp.m_lower[i] ;
+          for (int i = 0; i < RP::rank; ++i) {
+            m_offset[i] = (tile_idx % m_rp.m_tile_end[i]) * m_rp.m_tile[i] +
+                          m_rp.m_lower[i];
             tile_idx /= m_rp.m_tile_end[i];
 
             // tile-local indices identified with (index_type)threadIdx_y
-            m_local_offset[i] = (thrd_idx % m_rp.m_tile[i]); // Move this to first computation, add to m_offset right away
+            m_local_offset[i] =
+                (thrd_idx % m_rp.m_tile[i]);  // Move this to first computation,
+                                              // add to m_offset right away
             thrd_idx /= m_rp.m_tile[i];
 
             m_offset[i] += m_local_offset[i];
-            if ( !(m_offset[i] < m_rp.m_upper[i] && m_local_offset[i] < m_rp.m_tile[i]) ) {
+            if (!(m_offset[i] < m_rp.m_upper[i] &&
+                  m_local_offset[i] < m_rp.m_tile[i])) {
               in_bounds &= false;
             }
           }
-          if ( in_bounds )
-          { m_func( m_offset[0], m_offset[1], m_offset[2], m_v ); }
+          if (in_bounds) {
+            m_func(m_offset[0], m_offset[1], m_offset[2], m_v);
+          }
         }
         // LR
         else {
-          for (int i=RP::rank-1; i>=0; --i) {
-            m_offset[i] = (tile_idx % m_rp.m_tile_end[i]) * m_rp.m_tile[i] + m_rp.m_lower[i] ;
+          for (int i = RP::rank - 1; i >= 0; --i) {
+            m_offset[i] = (tile_idx % m_rp.m_tile_end[i]) * m_rp.m_tile[i] +
+                          m_rp.m_lower[i];
             tile_idx /= m_rp.m_tile_end[i];
 
             // tile-local indices identified with (index_type)threadIdx_y
-            m_local_offset[i] = (thrd_idx % m_rp.m_tile[i]); // Move this to first computation, add to m_offset right away
+            m_local_offset[i] =
+                (thrd_idx % m_rp.m_tile[i]);  // Move this to first computation,
+                                              // add to m_offset right away
             thrd_idx /= m_rp.m_tile[i];
 
             m_offset[i] += m_local_offset[i];
-            if ( !(m_offset[i] < m_rp.m_upper[i] && m_local_offset[i] < m_rp.m_tile[i]) ) {
+            if (!(m_offset[i] < m_rp.m_upper[i] &&
+                  m_local_offset[i] < m_rp.m_tile[i])) {
               in_bounds &= false;
             }
           }
-          if ( in_bounds )
-          { m_func( m_offset[0], m_offset[1], m_offset[2], m_v ); }
+          if (in_bounds) {
+            m_func(m_offset[0], m_offset[1], m_offset[2], m_v);
+          }
         }
       }
     }
-  } //end exec_range
+  }  // end exec_range
 
-private:
-  const RP & m_rp;
-  const Functor & m_func;
+ private:
+  const RP& m_rp;
+  const Functor& m_func;
   value_type* m_v;
 };
 
-
 // Specializations for void tag type
-template< typename RP , typename Functor , typename Tag, typename ValueType >
-struct DeviceIterateTile<3,RP,Functor,Tag, ValueType, typename std::enable_if< is_array_type<ValueType>::value && !is_void< Tag >::value >::type >
-{
+template <typename RP, typename Functor, typename Tag, typename ValueType>
+struct DeviceIterateTile<
+    3, RP, Functor, Tag, ValueType,
+    typename std::enable_if<is_array_type<ValueType>::value &&
+                            !is_void<Tag>::value>::type> {
   using index_type = typename RP::index_type;
-  using value_type = typename is_array_type< ValueType >::value_type;
+  using value_type = typename is_array_type<ValueType>::value_type;
 
   KOKKOS_INLINE_FUNCTION
-  DeviceIterateTile( const RP & rp_ , const Functor & f_ , value_type* v_)
-  : m_rp(rp_)
-  , m_func(f_)
-  , m_v(v_)
-  {}
+  DeviceIterateTile(const RP& rp_, const Functor& f_, value_type* v_)
+      : m_rp(rp_), m_func(f_), m_v(v_) {}
 
   KOKKOS_INLINE_FUNCTION
-  void exec_range() const
-  {
-    if ( (index_type)blockIdx_x < m_rp.m_num_tiles && (index_type)threadIdx_y < m_rp.m_prod_tile_dims ) {
-      index_type m_offset[RP::rank]; // tile starting global id offset
-      index_type m_local_offset[RP::rank]; // tile starting global id offset
+  void exec_range() const {
+    if ((index_type)blockIdx_x < m_rp.m_num_tiles &&
+        (index_type)threadIdx_y < m_rp.m_prod_tile_dims) {
+      index_type m_offset[RP::rank];        // tile starting global id offset
+      index_type m_local_offset[RP::rank];  // tile starting global id offset
 
-      for ( index_type tileidx = (index_type)blockIdx_x; tileidx < m_rp.m_num_tiles; tileidx += gridDim_x ) {
-        index_type tile_idx = tileidx; // temp because tile_idx will be modified while determining tile starting point offsets
+      for (index_type tileidx = (index_type)blockIdx_x;
+           tileidx < m_rp.m_num_tiles; tileidx += gridDim_x) {
+        index_type tile_idx =
+            tileidx;  // temp because tile_idx will be modified while
+                      // determining tile starting point offsets
         index_type thrd_idx = (index_type)threadIdx_y;
-        bool in_bounds = true;
+        bool in_bounds      = true;
 
         // LL
         if (RP::inner_direction == RP::Left) {
-          for (int i=0; i<RP::rank; ++i) {
-            m_offset[i] = (tile_idx % m_rp.m_tile_end[i]) * m_rp.m_tile[i] + m_rp.m_lower[i] ;
+          for (int i = 0; i < RP::rank; ++i) {
+            m_offset[i] = (tile_idx % m_rp.m_tile_end[i]) * m_rp.m_tile[i] +
+                          m_rp.m_lower[i];
             tile_idx /= m_rp.m_tile_end[i];
 
             // tile-local indices identified with (index_type)threadIdx_y
@@ -2218,17 +2530,20 @@ struct DeviceIterateTile<3,RP,Functor,Tag, ValueType, typename std::enable_if< i
             thrd_idx /= m_rp.m_tile[i];
 
             m_offset[i] += m_local_offset[i];
-            if ( !(m_offset[i] < m_rp.m_upper[i] && m_local_offset[i] < m_rp.m_tile[i]) ) {
+            if (!(m_offset[i] < m_rp.m_upper[i] &&
+                  m_local_offset[i] < m_rp.m_tile[i])) {
               in_bounds &= false;
             }
           }
-          if ( in_bounds )
-          { m_func( Tag(), m_offset[0], m_offset[1], m_offset[2], m_v ); }
+          if (in_bounds) {
+            m_func(Tag(), m_offset[0], m_offset[1], m_offset[2], m_v);
+          }
         }
         // LR
         else {
-          for (int i=RP::rank-1; i>=0; --i) {
-            m_offset[i] = (tile_idx % m_rp.m_tile_end[i]) * m_rp.m_tile[i] + m_rp.m_lower[i] ;
+          for (int i = RP::rank - 1; i >= 0; --i) {
+            m_offset[i] = (tile_idx % m_rp.m_tile_end[i]) * m_rp.m_tile[i] +
+                          m_rp.m_lower[i];
             tile_idx /= m_rp.m_tile_end[i];
 
             // tile-local indices identified with (index_type)threadIdx_y
@@ -2236,60 +2551,66 @@ struct DeviceIterateTile<3,RP,Functor,Tag, ValueType, typename std::enable_if< i
             thrd_idx /= m_rp.m_tile[i];
 
             m_offset[i] += m_local_offset[i];
-            if ( !(m_offset[i] < m_rp.m_upper[i] && m_local_offset[i] < m_rp.m_tile[i]) ) {
+            if (!(m_offset[i] < m_rp.m_upper[i] &&
+                  m_local_offset[i] < m_rp.m_tile[i])) {
               in_bounds &= false;
             }
           }
-          if ( in_bounds )
-          { m_func( Tag(), m_offset[0], m_offset[1], m_offset[2], m_v ); }
+          if (in_bounds) {
+            m_func(Tag(), m_offset[0], m_offset[1], m_offset[2], m_v);
+          }
         }
       }
     }
-  } //end exec_range
+  }  // end exec_range
 
-private:
-  const RP & m_rp;
-  const Functor & m_func;
+ private:
+  const RP& m_rp;
+  const Functor& m_func;
   value_type* m_v;
 };
 
-
-//Rank 4
+// Rank 4
 // Specializations for void tag type
-template< typename RP , typename Functor , typename ValueType >
-struct DeviceIterateTile<4,RP,Functor,void,ValueType , typename std::enable_if< is_array_type<ValueType>::value >::type >
-{
+template <typename RP, typename Functor, typename ValueType>
+struct DeviceIterateTile<
+    4, RP, Functor, void, ValueType,
+    typename std::enable_if<is_array_type<ValueType>::value>::type> {
   using index_type = typename RP::index_type;
-  using value_type = typename is_array_type< ValueType >::value_type;
+  using value_type = typename is_array_type<ValueType>::value_type;
 
   KOKKOS_INLINE_FUNCTION
-  DeviceIterateTile( const RP & rp_ , const Functor & f_ , value_type* v_)
-  : m_rp(rp_)
-  , m_func(f_)
-  , m_v(v_)
-  {}
+  DeviceIterateTile(const RP& rp_, const Functor& f_, value_type* v_)
+      : m_rp(rp_), m_func(f_), m_v(v_) {}
 
   static constexpr index_type max_blocks = 65535;
-  //static constexpr index_type max_blocks = static_cast<index_type>(Kokkos::Impl::ROCmTraits::UpperBoundGridCount);
+  // static constexpr index_type max_blocks =
+  // static_cast<index_type>(Kokkos::Impl::ROCmTraits::UpperBoundGridCount);
 
   KOKKOS_INLINE_FUNCTION
-  void exec_range() const
-  {
-    //enum { max_blocks = static_cast<index_type>(Kokkos::Impl::ROCmTraits::UpperBoundGridCount) };
-    //const index_type max_blocks = static_cast<index_type>( Kokkos::Impl::rocm_internal_maximum_grid_count() );
-    if ( (index_type)blockIdx_x < m_rp.m_num_tiles && (index_type)threadIdx_y < m_rp.m_prod_tile_dims ) {
-      index_type m_offset[RP::rank]; // tile starting global id offset
-      index_type m_local_offset[RP::rank]; // tile starting global id offset
+  void exec_range() const {
+    // enum { max_blocks =
+    // static_cast<index_type>(Kokkos::Impl::ROCmTraits::UpperBoundGridCount) };
+    // const index_type max_blocks = static_cast<index_type>(
+    // Kokkos::Impl::rocm_internal_maximum_grid_count() );
+    if ((index_type)blockIdx_x < m_rp.m_num_tiles &&
+        (index_type)threadIdx_y < m_rp.m_prod_tile_dims) {
+      index_type m_offset[RP::rank];        // tile starting global id offset
+      index_type m_local_offset[RP::rank];  // tile starting global id offset
 
-      for ( index_type tileidx = (index_type)blockIdx_x; tileidx < m_rp.m_num_tiles; tileidx += gridDim_x ) {
-        index_type tile_idx = tileidx; // temp because tile_idx will be modified while determining tile starting point offsets
+      for (index_type tileidx = (index_type)blockIdx_x;
+           tileidx < m_rp.m_num_tiles; tileidx += gridDim_x) {
+        index_type tile_idx =
+            tileidx;  // temp because tile_idx will be modified while
+                      // determining tile starting point offsets
         index_type thrd_idx = (index_type)threadIdx_y;
-        bool in_bounds = true;
+        bool in_bounds      = true;
 
         // LL
         if (RP::inner_direction == RP::Left) {
-          for (int i=0; i<RP::rank; ++i) {
-            m_offset[i] = (tile_idx % m_rp.m_tile_end[i]) * m_rp.m_tile[i] + m_rp.m_lower[i] ;
+          for (int i = 0; i < RP::rank; ++i) {
+            m_offset[i] = (tile_idx % m_rp.m_tile_end[i]) * m_rp.m_tile[i] +
+                          m_rp.m_lower[i];
             tile_idx /= m_rp.m_tile_end[i];
 
             // tile-local indices identified with (index_type)threadIdx_y
@@ -2297,17 +2618,20 @@ struct DeviceIterateTile<4,RP,Functor,void,ValueType , typename std::enable_if<
             thrd_idx /= m_rp.m_tile[i];
 
             m_offset[i] += m_local_offset[i];
-            if ( !(m_offset[i] < m_rp.m_upper[i] && m_local_offset[i] < m_rp.m_tile[i]) ) {
+            if (!(m_offset[i] < m_rp.m_upper[i] &&
+                  m_local_offset[i] < m_rp.m_tile[i])) {
               in_bounds &= false;
             }
           }
-          if ( in_bounds )
-          { m_func( m_offset[0], m_offset[1], m_offset[2], m_offset[3], m_v ); }
+          if (in_bounds) {
+            m_func(m_offset[0], m_offset[1], m_offset[2], m_offset[3], m_v);
+          }
         }
         // LR
         else {
-          for (int i=RP::rank-1; i>=0; --i) {
-            m_offset[i] = (tile_idx % m_rp.m_tile_end[i]) * m_rp.m_tile[i] + m_rp.m_lower[i] ;
+          for (int i = RP::rank - 1; i >= 0; --i) {
+            m_offset[i] = (tile_idx % m_rp.m_tile_end[i]) * m_rp.m_tile[i] +
+                          m_rp.m_lower[i];
             tile_idx /= m_rp.m_tile_end[i];
 
             // tile-local indices identified with (index_type)threadIdx_y
@@ -2315,59 +2639,66 @@ struct DeviceIterateTile<4,RP,Functor,void,ValueType , typename std::enable_if<
             thrd_idx /= m_rp.m_tile[i];
 
             m_offset[i] += m_local_offset[i];
-            if ( !(m_offset[i] < m_rp.m_upper[i] && m_local_offset[i] < m_rp.m_tile[i]) ) {
+            if (!(m_offset[i] < m_rp.m_upper[i] &&
+                  m_local_offset[i] < m_rp.m_tile[i])) {
               in_bounds &= false;
             }
           }
-          if ( in_bounds )
-          { m_func( m_offset[0], m_offset[1], m_offset[2], m_offset[3], m_v ); }
+          if (in_bounds) {
+            m_func(m_offset[0], m_offset[1], m_offset[2], m_offset[3], m_v);
+          }
         }
       }
     }
-  } //end exec_range
+  }  // end exec_range
 
-private:
-  const RP & m_rp;
-  const Functor & m_func;
+ private:
+  const RP& m_rp;
+  const Functor& m_func;
   value_type* m_v;
 };
 
-
 // Specializations for void tag type
-template< typename RP , typename Functor , typename Tag, typename ValueType >
-struct DeviceIterateTile<4,RP,Functor,Tag,ValueType, typename std::enable_if< is_array_type<ValueType>::value && !is_void< Tag >::value >::type >
-{
+template <typename RP, typename Functor, typename Tag, typename ValueType>
+struct DeviceIterateTile<
+    4, RP, Functor, Tag, ValueType,
+    typename std::enable_if<is_array_type<ValueType>::value &&
+                            !is_void<Tag>::value>::type> {
   using index_type = typename RP::index_type;
-  using value_type = typename is_array_type< ValueType >::value_type;
+  using value_type = typename is_array_type<ValueType>::value_type;
 
   KOKKOS_INLINE_FUNCTION
-  DeviceIterateTile( const RP & rp_ , const Functor & f_ , value_type* v_)
-  : m_rp(rp_)
-  , m_func(f_)
-  , m_v(v_)
-  {}
+  DeviceIterateTile(const RP& rp_, const Functor& f_, value_type* v_)
+      : m_rp(rp_), m_func(f_), m_v(v_) {}
 
   static constexpr index_type max_blocks = 65535;
-  //static constexpr index_type max_blocks = static_cast<index_type>(Kokkos::Impl::ROCmTraits::UpperBoundGridCount);
+  // static constexpr index_type max_blocks =
+  // static_cast<index_type>(Kokkos::Impl::ROCmTraits::UpperBoundGridCount);
 
   KOKKOS_INLINE_FUNCTION
-  void exec_range() const
-  {
-    //enum { max_blocks = static_cast<index_type>(Kokkos::Impl::ROCmTraits::UpperBoundGridCount) };
-    //const index_type max_blocks = static_cast<index_type>( Kokkos::Impl::rocm_internal_maximum_grid_count() );
-    if ( (index_type)blockIdx_x < m_rp.m_num_tiles && (index_type)threadIdx_y < m_rp.m_prod_tile_dims ) {
-      index_type m_offset[RP::rank]; // tile starting global id offset
-      index_type m_local_offset[RP::rank]; // tile starting global id offset
+  void exec_range() const {
+    // enum { max_blocks =
+    // static_cast<index_type>(Kokkos::Impl::ROCmTraits::UpperBoundGridCount) };
+    // const index_type max_blocks = static_cast<index_type>(
+    // Kokkos::Impl::rocm_internal_maximum_grid_count() );
+    if ((index_type)blockIdx_x < m_rp.m_num_tiles &&
+        (index_type)threadIdx_y < m_rp.m_prod_tile_dims) {
+      index_type m_offset[RP::rank];        // tile starting global id offset
+      index_type m_local_offset[RP::rank];  // tile starting global id offset
 
-      for ( index_type tileidx = (index_type)blockIdx_x; tileidx < m_rp.m_num_tiles; tileidx += gridDim_x ) {
-        index_type tile_idx = tileidx; // temp because tile_idx will be modified while determining tile starting point offsets
+      for (index_type tileidx = (index_type)blockIdx_x;
+           tileidx < m_rp.m_num_tiles; tileidx += gridDim_x) {
+        index_type tile_idx =
+            tileidx;  // temp because tile_idx will be modified while
+                      // determining tile starting point offsets
         index_type thrd_idx = (index_type)threadIdx_y;
-        bool in_bounds = true;
+        bool in_bounds      = true;
 
         // LL
         if (RP::inner_direction == RP::Left) {
-          for (int i=0; i<RP::rank; ++i) {
-            m_offset[i] = (tile_idx % m_rp.m_tile_end[i]) * m_rp.m_tile[i] + m_rp.m_lower[i] ;
+          for (int i = 0; i < RP::rank; ++i) {
+            m_offset[i] = (tile_idx % m_rp.m_tile_end[i]) * m_rp.m_tile[i] +
+                          m_rp.m_lower[i];
             tile_idx /= m_rp.m_tile_end[i];
 
             // tile-local indices identified with (index_type)threadIdx_y
@@ -2375,17 +2706,21 @@ struct DeviceIterateTile<4,RP,Functor,Tag,ValueType, typename std::enable_if< is
             thrd_idx /= m_rp.m_tile[i];
 
             m_offset[i] += m_local_offset[i];
-            if ( !(m_offset[i] < m_rp.m_upper[i] && m_local_offset[i] < m_rp.m_tile[i]) ) {
+            if (!(m_offset[i] < m_rp.m_upper[i] &&
+                  m_local_offset[i] < m_rp.m_tile[i])) {
               in_bounds &= false;
             }
           }
-          if ( in_bounds )
-          { m_func( Tag(), m_offset[0], m_offset[1], m_offset[2], m_offset[3], m_v ); }
+          if (in_bounds) {
+            m_func(Tag(), m_offset[0], m_offset[1], m_offset[2], m_offset[3],
+                   m_v);
+          }
         }
         // LR
         else {
-          for (int i=RP::rank-1; i>=0; --i) {
-            m_offset[i] = (tile_idx % m_rp.m_tile_end[i]) * m_rp.m_tile[i] + m_rp.m_lower[i] ;
+          for (int i = RP::rank - 1; i >= 0; --i) {
+            m_offset[i] = (tile_idx % m_rp.m_tile_end[i]) * m_rp.m_tile[i] +
+                          m_rp.m_lower[i];
             tile_idx /= m_rp.m_tile_end[i];
 
             // tile-local indices identified with (index_type)threadIdx_y
@@ -2393,60 +2728,67 @@ struct DeviceIterateTile<4,RP,Functor,Tag,ValueType, typename std::enable_if< is
             thrd_idx /= m_rp.m_tile[i];
 
             m_offset[i] += m_local_offset[i];
-            if ( !(m_offset[i] < m_rp.m_upper[i] && m_local_offset[i] < m_rp.m_tile[i]) ) {
+            if (!(m_offset[i] < m_rp.m_upper[i] &&
+                  m_local_offset[i] < m_rp.m_tile[i])) {
               in_bounds &= false;
             }
           }
-          if ( in_bounds )
-          { m_func( Tag(), m_offset[0], m_offset[1], m_offset[2], m_offset[3], m_v ); }
+          if (in_bounds) {
+            m_func(Tag(), m_offset[0], m_offset[1], m_offset[2], m_offset[3],
+                   m_v);
+          }
         }
       }
     }
-  } //end exec_range
+  }  // end exec_range
 
-private:
-  const RP & m_rp;
-  const Functor & m_func;
+ private:
+  const RP& m_rp;
+  const Functor& m_func;
   value_type* m_v;
 };
 
-
-//Rank 5
+// Rank 5
 // Specializations for void tag type
-template< typename RP , typename Functor , typename ValueType >
-struct DeviceIterateTile<5,RP,Functor,void,ValueType , typename std::enable_if< is_array_type<ValueType>::value >::type >
-{
+template <typename RP, typename Functor, typename ValueType>
+struct DeviceIterateTile<
+    5, RP, Functor, void, ValueType,
+    typename std::enable_if<is_array_type<ValueType>::value>::type> {
   using index_type = typename RP::index_type;
-  using value_type = typename is_array_type< ValueType >::value_type;
+  using value_type = typename is_array_type<ValueType>::value_type;
 
   KOKKOS_INLINE_FUNCTION
-  DeviceIterateTile( const RP & rp_ , const Functor & f_ , value_type* v_)
-  : m_rp(rp_)
-  , m_func(f_)
-  , m_v(v_)
-  {}
+  DeviceIterateTile(const RP& rp_, const Functor& f_, value_type* v_)
+      : m_rp(rp_), m_func(f_), m_v(v_) {}
 
   static constexpr index_type max_blocks = 65535;
-  //static constexpr index_type max_blocks = static_cast<index_type>(Kokkos::Impl::ROCmTraits::UpperBoundGridCount);
+  // static constexpr index_type max_blocks =
+  // static_cast<index_type>(Kokkos::Impl::ROCmTraits::UpperBoundGridCount);
 
   KOKKOS_INLINE_FUNCTION
-  void exec_range() const
-  {
-    //enum { max_blocks = static_cast<index_type>(Kokkos::Impl::ROCmTraits::UpperBoundGridCount) };
-    //const index_type max_blocks = static_cast<index_type>( Kokkos::Impl::rocm_internal_maximum_grid_count() );
-    if ( (index_type)blockIdx_x < m_rp.m_num_tiles && (index_type)threadIdx_y < m_rp.m_prod_tile_dims ) {
-      index_type m_offset[RP::rank]; // tile starting global id offset
-      index_type m_local_offset[RP::rank]; // tile starting global id offset
+  void exec_range() const {
+    // enum { max_blocks =
+    // static_cast<index_type>(Kokkos::Impl::ROCmTraits::UpperBoundGridCount) };
+    // const index_type max_blocks = static_cast<index_type>(
+    // Kokkos::Impl::rocm_internal_maximum_grid_count() );
+    if ((index_type)blockIdx_x < m_rp.m_num_tiles &&
+        (index_type)threadIdx_y < m_rp.m_prod_tile_dims) {
+      index_type m_offset[RP::rank];        // tile starting global id offset
+      index_type m_local_offset[RP::rank];  // tile starting global id offset
 
-      for ( index_type tileidx = (index_type)blockIdx_x; tileidx < m_rp.m_num_tiles; tileidx += gridDim_x ) {
-        index_type tile_idx = tileidx; // temp because tile_idx will be modified while determining tile starting point offsets
+      for (index_type tileidx = (index_type)blockIdx_x;
+           tileidx < m_rp.m_num_tiles; tileidx += gridDim_x) {
+        index_type tile_idx =
+            tileidx;  // temp because tile_idx will be modified while
+                      // determining tile starting point offsets
         index_type thrd_idx = (index_type)threadIdx_y;
-        bool in_bounds = true;
+        bool in_bounds      = true;
 
         // LL
         if (RP::inner_direction == RP::Left) {
-          for (int i=0; i<RP::rank; ++i) {
-            m_offset[i] = (tile_idx % m_rp.m_tile_end[i]) * m_rp.m_tile[i] + m_rp.m_lower[i] ;
+          for (int i = 0; i < RP::rank; ++i) {
+            m_offset[i] = (tile_idx % m_rp.m_tile_end[i]) * m_rp.m_tile[i] +
+                          m_rp.m_lower[i];
             tile_idx /= m_rp.m_tile_end[i];
 
             // tile-local indices identified with (index_type)threadIdx_y
@@ -2454,17 +2796,21 @@ struct DeviceIterateTile<5,RP,Functor,void,ValueType , typename std::enable_if<
             thrd_idx /= m_rp.m_tile[i];
 
             m_offset[i] += m_local_offset[i];
-            if ( !(m_offset[i] < m_rp.m_upper[i] && m_local_offset[i] < m_rp.m_tile[i]) ) {
+            if (!(m_offset[i] < m_rp.m_upper[i] &&
+                  m_local_offset[i] < m_rp.m_tile[i])) {
               in_bounds &= false;
             }
           }
-          if ( in_bounds )
-          { m_func( m_offset[0], m_offset[1], m_offset[2], m_offset[3], m_offset[4], m_v ); }
+          if (in_bounds) {
+            m_func(m_offset[0], m_offset[1], m_offset[2], m_offset[3],
+                   m_offset[4], m_v);
+          }
         }
         // LR
         else {
-          for (int i=RP::rank-1; i>=0; --i) {
-            m_offset[i] = (tile_idx % m_rp.m_tile_end[i]) * m_rp.m_tile[i] + m_rp.m_lower[i] ;
+          for (int i = RP::rank - 1; i >= 0; --i) {
+            m_offset[i] = (tile_idx % m_rp.m_tile_end[i]) * m_rp.m_tile[i] +
+                          m_rp.m_lower[i];
             tile_idx /= m_rp.m_tile_end[i];
 
             // tile-local indices identified with (index_type)threadIdx_y
@@ -2472,59 +2818,67 @@ struct DeviceIterateTile<5,RP,Functor,void,ValueType , typename std::enable_if<
             thrd_idx /= m_rp.m_tile[i];
 
             m_offset[i] += m_local_offset[i];
-            if ( !(m_offset[i] < m_rp.m_upper[i] && m_local_offset[i] < m_rp.m_tile[i]) ) {
+            if (!(m_offset[i] < m_rp.m_upper[i] &&
+                  m_local_offset[i] < m_rp.m_tile[i])) {
               in_bounds &= false;
             }
           }
-          if ( in_bounds )
-          { m_func( m_offset[0], m_offset[1], m_offset[2], m_offset[3], m_offset[4], m_v ); }
+          if (in_bounds) {
+            m_func(m_offset[0], m_offset[1], m_offset[2], m_offset[3],
+                   m_offset[4], m_v);
+          }
         }
       }
     }
-  } //end exec_range
+  }  // end exec_range
 
-private:
-  const RP & m_rp;
-  const Functor & m_func;
+ private:
+  const RP& m_rp;
+  const Functor& m_func;
   value_type* m_v;
 };
 
-
 // Specializations for tag type
-template< typename RP , typename Functor , typename Tag, typename ValueType >
-struct DeviceIterateTile<5,RP,Functor,Tag,ValueType, typename std::enable_if< is_array_type<ValueType>::value && !is_void< Tag >::value >::type >
-{
+template <typename RP, typename Functor, typename Tag, typename ValueType>
+struct DeviceIterateTile<
+    5, RP, Functor, Tag, ValueType,
+    typename std::enable_if<is_array_type<ValueType>::value &&
+                            !is_void<Tag>::value>::type> {
   using index_type = typename RP::index_type;
-  using value_type = typename is_array_type< ValueType >::value_type;
+  using value_type = typename is_array_type<ValueType>::value_type;
 
   KOKKOS_INLINE_FUNCTION
-  DeviceIterateTile( const RP & rp_ , const Functor & f_ , value_type* v_)
-  : m_rp(rp_)
-  , m_func(f_)
-  , m_v(v_)
-  {}
+  DeviceIterateTile(const RP& rp_, const Functor& f_, value_type* v_)
+      : m_rp(rp_), m_func(f_), m_v(v_) {}
 
   static constexpr index_type max_blocks = 65535;
-  //static constexpr index_type max_blocks = static_cast<index_type>(Kokkos::Impl::ROCmTraits::UpperBoundGridCount);
+  // static constexpr index_type max_blocks =
+  // static_cast<index_type>(Kokkos::Impl::ROCmTraits::UpperBoundGridCount);
 
   KOKKOS_INLINE_FUNCTION
-  void exec_range() const
-  {
-    //enum { max_blocks = static_cast<index_type>(Kokkos::Impl::ROCmTraits::UpperBoundGridCount) };
-    //const index_type max_blocks = static_cast<index_type>( Kokkos::Impl::rocm_internal_maximum_grid_count() );
-    if ( (index_type)blockIdx_x < m_rp.m_num_tiles && (index_type)threadIdx_y < m_rp.m_prod_tile_dims ) {
-      index_type m_offset[RP::rank]; // tile starting global id offset
-      index_type m_local_offset[RP::rank]; // tile starting global id offset
+  void exec_range() const {
+    // enum { max_blocks =
+    // static_cast<index_type>(Kokkos::Impl::ROCmTraits::UpperBoundGridCount) };
+    // const index_type max_blocks = static_cast<index_type>(
+    // Kokkos::Impl::rocm_internal_maximum_grid_count() );
+    if ((index_type)blockIdx_x < m_rp.m_num_tiles &&
+        (index_type)threadIdx_y < m_rp.m_prod_tile_dims) {
+      index_type m_offset[RP::rank];        // tile starting global id offset
+      index_type m_local_offset[RP::rank];  // tile starting global id offset
 
-      for ( index_type tileidx = (index_type)blockIdx_x; tileidx < m_rp.m_num_tiles; tileidx += gridDim_x ) {
-        index_type tile_idx = tileidx; // temp because tile_idx will be modified while determining tile starting point offsets
+      for (index_type tileidx = (index_type)blockIdx_x;
+           tileidx < m_rp.m_num_tiles; tileidx += gridDim_x) {
+        index_type tile_idx =
+            tileidx;  // temp because tile_idx will be modified while
+                      // determining tile starting point offsets
         index_type thrd_idx = (index_type)threadIdx_y;
-        bool in_bounds = true;
+        bool in_bounds      = true;
 
         // LL
         if (RP::inner_direction == RP::Left) {
-          for (int i=0; i<RP::rank; ++i) {
-            m_offset[i] = (tile_idx % m_rp.m_tile_end[i]) * m_rp.m_tile[i] + m_rp.m_lower[i] ;
+          for (int i = 0; i < RP::rank; ++i) {
+            m_offset[i] = (tile_idx % m_rp.m_tile_end[i]) * m_rp.m_tile[i] +
+                          m_rp.m_lower[i];
             tile_idx /= m_rp.m_tile_end[i];
 
             // tile-local indices identified with (index_type)threadIdx_y
@@ -2532,17 +2886,21 @@ struct DeviceIterateTile<5,RP,Functor,Tag,ValueType, typename std::enable_if< is
             thrd_idx /= m_rp.m_tile[i];
 
             m_offset[i] += m_local_offset[i];
-            if ( !(m_offset[i] < m_rp.m_upper[i] && m_local_offset[i] < m_rp.m_tile[i]) ) {
+            if (!(m_offset[i] < m_rp.m_upper[i] &&
+                  m_local_offset[i] < m_rp.m_tile[i])) {
               in_bounds &= false;
             }
           }
-          if ( in_bounds )
-          { m_func( Tag(), m_offset[0], m_offset[1], m_offset[2], m_offset[3], m_offset[4], m_v ); }
+          if (in_bounds) {
+            m_func(Tag(), m_offset[0], m_offset[1], m_offset[2], m_offset[3],
+                   m_offset[4], m_v);
+          }
         }
         // LR
         else {
-          for (int i=RP::rank-1; i>=0; --i) {
-            m_offset[i] = (tile_idx % m_rp.m_tile_end[i]) * m_rp.m_tile[i] + m_rp.m_lower[i] ;
+          for (int i = RP::rank - 1; i >= 0; --i) {
+            m_offset[i] = (tile_idx % m_rp.m_tile_end[i]) * m_rp.m_tile[i] +
+                          m_rp.m_lower[i];
             tile_idx /= m_rp.m_tile_end[i];
 
             // tile-local indices identified with (index_type)threadIdx_y
@@ -2550,60 +2908,67 @@ struct DeviceIterateTile<5,RP,Functor,Tag,ValueType, typename std::enable_if< is
             thrd_idx /= m_rp.m_tile[i];
 
             m_offset[i] += m_local_offset[i];
-            if ( !(m_offset[i] < m_rp.m_upper[i] && m_local_offset[i] < m_rp.m_tile[i]) ) {
+            if (!(m_offset[i] < m_rp.m_upper[i] &&
+                  m_local_offset[i] < m_rp.m_tile[i])) {
               in_bounds &= false;
             }
           }
-          if ( in_bounds )
-          { m_func( Tag(), m_offset[0], m_offset[1], m_offset[2], m_offset[3], m_offset[4], m_v ); }
+          if (in_bounds) {
+            m_func(Tag(), m_offset[0], m_offset[1], m_offset[2], m_offset[3],
+                   m_offset[4], m_v);
+          }
         }
       }
     }
-  } //end exec_range
+  }  // end exec_range
 
-private:
-  const RP & m_rp;
-  const Functor & m_func;
+ private:
+  const RP& m_rp;
+  const Functor& m_func;
   value_type* m_v;
 };
 
-
-//Rank 6
+// Rank 6
 // Specializations for void tag type
-template< typename RP , typename Functor , typename ValueType >
-struct DeviceIterateTile<6,RP,Functor,void,ValueType , typename std::enable_if< is_array_type<ValueType>::value >::type >
-{
+template <typename RP, typename Functor, typename ValueType>
+struct DeviceIterateTile<
+    6, RP, Functor, void, ValueType,
+    typename std::enable_if<is_array_type<ValueType>::value>::type> {
   using index_type = typename RP::index_type;
-  using value_type = typename is_array_type< ValueType >::value_type;
+  using value_type = typename is_array_type<ValueType>::value_type;
 
   KOKKOS_INLINE_FUNCTION
-  DeviceIterateTile( const RP & rp_ , const Functor & f_ , value_type* v_)
-  : m_rp(rp_)
-  , m_func(f_)
-  , m_v(v_)
-  {}
+  DeviceIterateTile(const RP& rp_, const Functor& f_, value_type* v_)
+      : m_rp(rp_), m_func(f_), m_v(v_) {}
 
   static constexpr index_type max_blocks = 65535;
-  //static constexpr index_type max_blocks = static_cast<index_type>(Kokkos::Impl::ROCmTraits::UpperBoundGridCount);
+  // static constexpr index_type max_blocks =
+  // static_cast<index_type>(Kokkos::Impl::ROCmTraits::UpperBoundGridCount);
 
   KOKKOS_INLINE_FUNCTION
-  void exec_range() const
-  {
-    //enum { max_blocks = static_cast<index_type>(Kokkos::Impl::ROCmTraits::UpperBoundGridCount) };
-    //const index_type max_blocks = static_cast<index_type>( Kokkos::Impl::rocm_internal_maximum_grid_count() );
-    if ( (index_type)blockIdx_x < m_rp.m_num_tiles && (index_type)threadIdx_y < m_rp.m_prod_tile_dims ) {
-      index_type m_offset[RP::rank]; // tile starting global id offset
-      index_type m_local_offset[RP::rank]; // tile starting global id offset
+  void exec_range() const {
+    // enum { max_blocks =
+    // static_cast<index_type>(Kokkos::Impl::ROCmTraits::UpperBoundGridCount) };
+    // const index_type max_blocks = static_cast<index_type>(
+    // Kokkos::Impl::rocm_internal_maximum_grid_count() );
+    if ((index_type)blockIdx_x < m_rp.m_num_tiles &&
+        (index_type)threadIdx_y < m_rp.m_prod_tile_dims) {
+      index_type m_offset[RP::rank];        // tile starting global id offset
+      index_type m_local_offset[RP::rank];  // tile starting global id offset
 
-      for ( index_type tileidx = (index_type)blockIdx_x; tileidx < m_rp.m_num_tiles; tileidx += gridDim_x ) {
-        index_type tile_idx = tileidx; // temp because tile_idx will be modified while determining tile starting point offsets
+      for (index_type tileidx = (index_type)blockIdx_x;
+           tileidx < m_rp.m_num_tiles; tileidx += gridDim_x) {
+        index_type tile_idx =
+            tileidx;  // temp because tile_idx will be modified while
+                      // determining tile starting point offsets
         index_type thrd_idx = (index_type)threadIdx_y;
-        bool in_bounds = true;
+        bool in_bounds      = true;
 
         // LL
         if (RP::inner_direction == RP::Left) {
-          for (int i=0; i<RP::rank; ++i) {
-            m_offset[i] = (tile_idx % m_rp.m_tile_end[i]) * m_rp.m_tile[i] + m_rp.m_lower[i] ;
+          for (int i = 0; i < RP::rank; ++i) {
+            m_offset[i] = (tile_idx % m_rp.m_tile_end[i]) * m_rp.m_tile[i] +
+                          m_rp.m_lower[i];
             tile_idx /= m_rp.m_tile_end[i];
 
             // tile-local indices identified with (index_type)threadIdx_y
@@ -2611,17 +2976,21 @@ struct DeviceIterateTile<6,RP,Functor,void,ValueType , typename std::enable_if<
             thrd_idx /= m_rp.m_tile[i];
 
             m_offset[i] += m_local_offset[i];
-            if ( !(m_offset[i] < m_rp.m_upper[i] && m_local_offset[i] < m_rp.m_tile[i]) ) {
+            if (!(m_offset[i] < m_rp.m_upper[i] &&
+                  m_local_offset[i] < m_rp.m_tile[i])) {
               in_bounds &= false;
             }
           }
-          if ( in_bounds )
-          { m_func( m_offset[0], m_offset[1], m_offset[2], m_offset[3], m_offset[4], m_offset[5], m_v ); }
+          if (in_bounds) {
+            m_func(m_offset[0], m_offset[1], m_offset[2], m_offset[3],
+                   m_offset[4], m_offset[5], m_v);
+          }
         }
         // LR
         else {
-          for (int i=RP::rank-1; i>=0; --i) {
-            m_offset[i] = (tile_idx % m_rp.m_tile_end[i]) * m_rp.m_tile[i] + m_rp.m_lower[i] ;
+          for (int i = RP::rank - 1; i >= 0; --i) {
+            m_offset[i] = (tile_idx % m_rp.m_tile_end[i]) * m_rp.m_tile[i] +
+                          m_rp.m_lower[i];
             tile_idx /= m_rp.m_tile_end[i];
 
             // tile-local indices identified with (index_type)threadIdx_y
@@ -2629,59 +2998,67 @@ struct DeviceIterateTile<6,RP,Functor,void,ValueType , typename std::enable_if<
             thrd_idx /= m_rp.m_tile[i];
 
             m_offset[i] += m_local_offset[i];
-            if ( !(m_offset[i] < m_rp.m_upper[i] && m_local_offset[i] < m_rp.m_tile[i]) ) {
+            if (!(m_offset[i] < m_rp.m_upper[i] &&
+                  m_local_offset[i] < m_rp.m_tile[i])) {
               in_bounds &= false;
             }
           }
-          if ( in_bounds )
-          { m_func( m_offset[0], m_offset[1], m_offset[2], m_offset[3], m_offset[4], m_offset[5], m_v ); }
+          if (in_bounds) {
+            m_func(m_offset[0], m_offset[1], m_offset[2], m_offset[3],
+                   m_offset[4], m_offset[5], m_v);
+          }
         }
       }
     }
-  } //end exec_range
+  }  // end exec_range
 
-private:
-  const RP & m_rp;
-  const Functor & m_func;
+ private:
+  const RP& m_rp;
+  const Functor& m_func;
   value_type* m_v;
 };
 
-
 // Specializations for tag type
-template< typename RP , typename Functor , typename Tag, typename ValueType >
-struct DeviceIterateTile<6,RP,Functor,Tag,ValueType, typename std::enable_if< is_array_type<ValueType>::value && !is_void< Tag >::value >::type >
-{
+template <typename RP, typename Functor, typename Tag, typename ValueType>
+struct DeviceIterateTile<
+    6, RP, Functor, Tag, ValueType,
+    typename std::enable_if<is_array_type<ValueType>::value &&
+                            !is_void<Tag>::value>::type> {
   using index_type = typename RP::index_type;
-  using value_type = typename is_array_type< ValueType >::value_type;
+  using value_type = typename is_array_type<ValueType>::value_type;
 
   KOKKOS_INLINE_FUNCTION
-  DeviceIterateTile( const RP & rp_ , const Functor & f_ , value_type* v_)
-  : m_rp(rp_)
-  , m_func(f_)
-  , m_v(v_)
-  {}
+  DeviceIterateTile(const RP& rp_, const Functor& f_, value_type* v_)
+      : m_rp(rp_), m_func(f_), m_v(v_) {}
 
   static constexpr index_type max_blocks = 65535;
-  //static constexpr index_type max_blocks = static_cast<index_type>(Kokkos::Impl::ROCmTraits::UpperBoundGridCount);
+  // static constexpr index_type max_blocks =
+  // static_cast<index_type>(Kokkos::Impl::ROCmTraits::UpperBoundGridCount);
 
   KOKKOS_INLINE_FUNCTION
-  void exec_range() const
-  {
-    //enum { max_blocks = static_cast<index_type>(Kokkos::Impl::ROCmTraits::UpperBoundGridCount) };
-    //const index_type max_blocks = static_cast<index_type>( Kokkos::Impl::rocm_internal_maximum_grid_count() );
-    if ( (index_type)blockIdx_x < m_rp.m_num_tiles && (index_type)threadIdx_y < m_rp.m_prod_tile_dims ) {
-      index_type m_offset[RP::rank]; // tile starting global id offset
-      index_type m_local_offset[RP::rank]; // tile starting global id offset
+  void exec_range() const {
+    // enum { max_blocks =
+    // static_cast<index_type>(Kokkos::Impl::ROCmTraits::UpperBoundGridCount) };
+    // const index_type max_blocks = static_cast<index_type>(
+    // Kokkos::Impl::rocm_internal_maximum_grid_count() );
+    if ((index_type)blockIdx_x < m_rp.m_num_tiles &&
+        (index_type)threadIdx_y < m_rp.m_prod_tile_dims) {
+      index_type m_offset[RP::rank];        // tile starting global id offset
+      index_type m_local_offset[RP::rank];  // tile starting global id offset
 
-      for ( index_type tileidx = (index_type)blockIdx_x; tileidx < m_rp.m_num_tiles; tileidx += gridDim_x ) {
-        index_type tile_idx = tileidx; // temp because tile_idx will be modified while determining tile starting point offsets
+      for (index_type tileidx = (index_type)blockIdx_x;
+           tileidx < m_rp.m_num_tiles; tileidx += gridDim_x) {
+        index_type tile_idx =
+            tileidx;  // temp because tile_idx will be modified while
+                      // determining tile starting point offsets
         index_type thrd_idx = (index_type)threadIdx_y;
-        bool in_bounds = true;
+        bool in_bounds      = true;
 
         // LL
         if (RP::inner_direction == RP::Left) {
-          for (int i=0; i<RP::rank; ++i) {
-            m_offset[i] = (tile_idx % m_rp.m_tile_end[i]) * m_rp.m_tile[i] + m_rp.m_lower[i] ;
+          for (int i = 0; i < RP::rank; ++i) {
+            m_offset[i] = (tile_idx % m_rp.m_tile_end[i]) * m_rp.m_tile[i] +
+                          m_rp.m_lower[i];
             tile_idx /= m_rp.m_tile_end[i];
 
             // tile-local indices identified with (index_type)threadIdx_y
@@ -2689,17 +3066,21 @@ struct DeviceIterateTile<6,RP,Functor,Tag,ValueType, typename std::enable_if< is
             thrd_idx /= m_rp.m_tile[i];
 
             m_offset[i] += m_local_offset[i];
-            if ( !(m_offset[i] < m_rp.m_upper[i] && m_local_offset[i] < m_rp.m_tile[i]) ) {
+            if (!(m_offset[i] < m_rp.m_upper[i] &&
+                  m_local_offset[i] < m_rp.m_tile[i])) {
               in_bounds &= false;
             }
           }
-          if ( in_bounds )
-          { m_func( Tag(), m_offset[0], m_offset[1], m_offset[2], m_offset[3], m_offset[4], m_offset[5], m_v ); }
+          if (in_bounds) {
+            m_func(Tag(), m_offset[0], m_offset[1], m_offset[2], m_offset[3],
+                   m_offset[4], m_offset[5], m_v);
+          }
         }
         // LR
         else {
-          for (int i=RP::rank-1; i>=0; --i) {
-            m_offset[i] = (tile_idx % m_rp.m_tile_end[i]) * m_rp.m_tile[i] + m_rp.m_lower[i] ;
+          for (int i = RP::rank - 1; i >= 0; --i) {
+            m_offset[i] = (tile_idx % m_rp.m_tile_end[i]) * m_rp.m_tile[i] +
+                          m_rp.m_lower[i];
             tile_idx /= m_rp.m_tile_end[i];
 
             // tile-local indices identified with (index_type)threadIdx_y
@@ -2707,28 +3088,32 @@ struct DeviceIterateTile<6,RP,Functor,Tag,ValueType, typename std::enable_if< is
             thrd_idx /= m_rp.m_tile[i];
 
             m_offset[i] += m_local_offset[i];
-            if ( !(m_offset[i] < m_rp.m_upper[i] && m_local_offset[i] < m_rp.m_tile[i]) ) {
+            if (!(m_offset[i] < m_rp.m_upper[i] &&
+                  m_local_offset[i] < m_rp.m_tile[i])) {
               in_bounds &= false;
             }
           }
-          if ( in_bounds )
-          { m_func( Tag(), m_offset[0], m_offset[1], m_offset[2], m_offset[3], m_offset[4], m_offset[5], m_v ); }
+          if (in_bounds) {
+            m_func(Tag(), m_offset[0], m_offset[1], m_offset[2], m_offset[3],
+                   m_offset[4], m_offset[5], m_v);
+          }
         }
       }
     }
-  } //end exec_range
+  }  // end exec_range
 
-private:
-  const RP & m_rp;
-  const Functor & m_func;
+ private:
+  const RP& m_rp;
+  const Functor& m_func;
   value_type* m_v;
 };
 
-} // Reduce
+}  // namespace Reduce
 
 // ----------------------------------------------------------------------------------
 
-} } //end namespace Kokkos::Impl
+}  // namespace Impl
+}  // namespace Kokkos
 #undef threadIdx_x
 #undef threadIdx_y
 #undef threadIdx_z
@@ -2745,6 +3130,5 @@ private:
 #undef gridDim_y
 #undef gridDim_z
 
-
 #endif
 #endif
diff --git a/lib/kokkos/core/src/ROCm/Kokkos_ROCm_Atomic.hpp b/lib/kokkos/core/src/ROCm/Kokkos_ROCm_Atomic.hpp
index db7527701d..484269f21f 100644
--- a/lib/kokkos/core/src/ROCm/Kokkos_ROCm_Atomic.hpp
+++ b/lib/kokkos/core/src/ROCm/Kokkos_ROCm_Atomic.hpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -46,449 +47,488 @@
 
 #ifdef KOKKOS_ENABLE_ROCM_ATOMICS
 namespace Kokkos {
-  //ROCm can do:
-  //Types int/unsigned int
-  //variants: atomic_exchange/compare_exchange/fetch_add/fetch_sub/fetch_max/fetch_min/fetch_and/fetch_or/fetch_xor/fetch_inc/fetch_dec 
+// ROCm can do:
+// Types int/unsigned int
+// variants:
+// atomic_exchange/compare_exchange/fetch_add/fetch_sub/fetch_max/fetch_min/fetch_and/fetch_or/fetch_xor/fetch_inc/fetch_dec
 
+KOKKOS_INLINE_FUNCTION
+int atomic_exchange(int* dest, const int& val) {
+  return hc::atomic_exchange_int(dest, val);
+}
 
-  KOKKOS_INLINE_FUNCTION
-  int atomic_exchange(int* dest, const int& val) {
-    return hc::atomic_exchange_int(dest, val);
-  }
+KOKKOS_INLINE_FUNCTION
+unsigned int atomic_exchange(unsigned int* dest, const unsigned int& val) {
+  return hc::atomic_exchange_unsigned(dest, val);
+}
 
-  KOKKOS_INLINE_FUNCTION
-  unsigned int atomic_exchange(unsigned int* dest, const unsigned int& val) {
-    return hc::atomic_exchange_unsigned(dest, val);
-  }
+KOKKOS_INLINE_FUNCTION
+int64_t atomic_exchange(int64_t* dest, const int64_t& val) {
+  return (int64_t)hc::atomic_exchange_uint64((uint64_t*)dest,
+                                             (const uint64_t&)val);
+}
 
-  KOKKOS_INLINE_FUNCTION
-  int64_t atomic_exchange(int64_t* dest, const int64_t& val) {
-    return (int64_t)hc::atomic_exchange_uint64((uint64_t*)dest, (const uint64_t&)val);
-  }
+KOKKOS_INLINE_FUNCTION
+uint64_t atomic_exchange(uint64_t* dest, const uint64_t& val) {
+  return hc::atomic_exchange_uint64(dest, val);
+}
 
-  KOKKOS_INLINE_FUNCTION
-  uint64_t atomic_exchange(uint64_t* dest, const uint64_t& val) {
-    return hc::atomic_exchange_uint64(dest, val);
-  }
+KOKKOS_INLINE_FUNCTION
+long long atomic_exchange(long long* dest, const long long& val) {
+  return (long long)hc::atomic_exchange_uint64((uint64_t*)dest,
+                                               (const uint64_t&)val);
+}
 
-  KOKKOS_INLINE_FUNCTION
-  long long atomic_exchange(long long* dest, const long long& val) {
-    return (long long)hc::atomic_exchange_uint64((uint64_t*)dest, (const uint64_t&)val);
-  }
+KOKKOS_INLINE_FUNCTION
+unsigned long long atomic_exchange(unsigned long long* dest,
+                                   const unsigned long long& val) {
+  return (unsigned long long)hc::atomic_exchange_uint64((uint64_t*)dest,
+                                                        (const uint64_t&)val);
+}
 
-  KOKKOS_INLINE_FUNCTION
-  unsigned long long atomic_exchange(unsigned long long* dest, const unsigned long long& val) {
-    return (unsigned long long)hc::atomic_exchange_uint64((uint64_t*)dest, (const uint64_t&)val);
-  }
+KOKKOS_INLINE_FUNCTION
+float atomic_exchange(float* dest, const float& val) {
+  union U {
+    int i;
+    float f;
+    KOKKOS_INLINE_FUNCTION U(){};
+  } idest, ival;
+  idest.f = *dest;
+  ival.f  = val;
+  idest.i = hc::atomic_exchange_int((int*)dest, ival.i);
+  return idest.f;
+}
 
-  KOKKOS_INLINE_FUNCTION
-  float atomic_exchange(float* dest, const float& val) {
-    union U {
-      int i ;
-      float f ;
-      KOKKOS_INLINE_FUNCTION U() {};
-    } idest,ival;
-    idest.f = *dest;
-    ival.f = val;
-    idest.i = hc::atomic_exchange_int((int*)dest, ival.i);
-    return idest.f;
-  }
+KOKKOS_INLINE_FUNCTION
+double atomic_exchange(double* dest, const double& val) {
+  union U {
+    uint64_t i;
+    double d;
+    KOKKOS_INLINE_FUNCTION U(){};
+  } idest, ival;
+  idest.d = *dest;
+  ival.d  = val;
+  idest.i = hc::atomic_exchange_uint64((uint64_t*)dest, ival.i);
+  return idest.d;
+}
 
-  KOKKOS_INLINE_FUNCTION
-  double atomic_exchange(double* dest, const double& val) {
-    union U {
-      uint64_t i ;
-      double d ;
-      KOKKOS_INLINE_FUNCTION U() {};
-    } idest,ival;
-    idest.d = *dest;
-    ival.d = val;
-    idest.i = hc::atomic_exchange_uint64((uint64_t*)dest, ival.i);
-    return idest.d;
-  }
+KOKKOS_INLINE_FUNCTION
+int atomic_compare_exchange(int* dest, int compare, const int& val);
 
-  KOKKOS_INLINE_FUNCTION
-  int atomic_compare_exchange(int* dest, int compare, const int& val);
+KOKKOS_INLINE_FUNCTION
+int64_t atomic_compare_exchange(int64_t* dest, int64_t compare,
+                                const int64_t& val);
 
-  KOKKOS_INLINE_FUNCTION
-  int64_t atomic_compare_exchange(int64_t* dest, int64_t compare, const int64_t& val);
+template <class T>
+KOKKOS_INLINE_FUNCTION T atomic_exchange(
+    T* dest,
+    typename std::enable_if<sizeof(T) == sizeof(int), const T&>::type val) {
+  union U {
+    int i;
+    T t;
+    KOKKOS_INLINE_FUNCTION U(){};
+  } assume, oldval, newval;
 
-  template<class T>
-  KOKKOS_INLINE_FUNCTION
-  T atomic_exchange(T* dest, typename std::enable_if<sizeof(T) == sizeof(int), const T&>::type val) {
-    union U {
-      int i ;
-      T t ;
-      KOKKOS_INLINE_FUNCTION U() {};
-    } assume , oldval , newval ;
+  oldval.t = *dest;
+  assume.i = oldval.i;
+  newval.t = val;
+  atomic_compare_exchange((int*)(dest), assume.i, newval.i);
 
-    oldval.t = *dest ;
-    assume.i = oldval.i ;
-    newval.t = val ;
-    atomic_compare_exchange( (int*)(dest) , assume.i, newval.i );
+  return oldval.t;
+}
 
-    return oldval.t ;    
-  }
+template <class T>
+KOKKOS_INLINE_FUNCTION T atomic_exchange(
+    T* dest, typename std::enable_if<sizeof(T) != sizeof(int) &&
+                                         sizeof(T) == sizeof(int64_t),
+                                     const T&>::type val) {
+  union U {
+    uint64_t i;
+    T t;
+    KOKKOS_INLINE_FUNCTION U(){};
+  } assume, oldval, newval;
 
-  template<class T>
-  KOKKOS_INLINE_FUNCTION
-  T atomic_exchange(T* dest, typename std::enable_if<sizeof(T) != sizeof(int) && sizeof(T) == sizeof(int64_t), const T&>::type val) {
-    union U {
-      uint64_t i ;
-      T t ;
-      KOKKOS_INLINE_FUNCTION U() {};
-    } assume , oldval , newval ;
+  oldval.t = *dest;
 
-    oldval.t = *dest ;
+  assume.i = oldval.i;
+  newval.t = val;
+  atomic_compare_exchange((int64_t*)(dest), assume.i, newval.i);
 
-    assume.i = oldval.i ;
-    newval.t = val ;
-    atomic_compare_exchange( (int64_t*)(dest) , assume.i, newval.i );
+  return oldval.t;
+}
 
-    return oldval.t ;    
-  }
- 
-  template<class T>
-  KOKKOS_INLINE_FUNCTION
-  T atomic_exchange(T* dest, typename std::enable_if<sizeof(T) != sizeof(int) && sizeof(T) != sizeof(int64_t), const T&>::type val) {
-    return val;
-  }
+template <class T>
+KOKKOS_INLINE_FUNCTION T atomic_exchange(
+    T* dest, typename std::enable_if<sizeof(T) != sizeof(int) &&
+                                         sizeof(T) != sizeof(int64_t),
+                                     const T&>::type val) {
+  return val;
+}
 
-  KOKKOS_INLINE_FUNCTION
-  int atomic_compare_exchange(int* dest, int compare, const int& val) {
-    return hc::atomic_compare_exchange_int(dest, compare, val);
-  }
+KOKKOS_INLINE_FUNCTION
+int atomic_compare_exchange(int* dest, int compare, const int& val) {
+  return hc::atomic_compare_exchange_int(dest, compare, val);
+}
 
-  KOKKOS_INLINE_FUNCTION
-  unsigned int atomic_compare_exchange(unsigned int* dest, unsigned int compare, const unsigned int& val) {
-    return hc::atomic_compare_exchange_unsigned(dest, compare, val);
-  }
+KOKKOS_INLINE_FUNCTION
+unsigned int atomic_compare_exchange(unsigned int* dest, unsigned int compare,
+                                     const unsigned int& val) {
+  return hc::atomic_compare_exchange_unsigned(dest, compare, val);
+}
 
-  KOKKOS_INLINE_FUNCTION
-  int64_t atomic_compare_exchange(int64_t* dest, int64_t compare, const int64_t& val) {
-    return (int64_t) hc::atomic_compare_exchange_uint64((uint64_t*)dest, (uint64_t)compare, (const uint64_t&)val);
-  }
+KOKKOS_INLINE_FUNCTION
+int64_t atomic_compare_exchange(int64_t* dest, int64_t compare,
+                                const int64_t& val) {
+  return (int64_t)hc::atomic_compare_exchange_uint64(
+      (uint64_t*)dest, (uint64_t)compare, (const uint64_t&)val);
+}
 
-  KOKKOS_INLINE_FUNCTION
-  uint64_t atomic_compare_exchange(uint64_t* dest, uint64_t compare, const uint64_t& val) {
-    return hc::atomic_compare_exchange_uint64(dest, compare, val);
-  }
+KOKKOS_INLINE_FUNCTION
+uint64_t atomic_compare_exchange(uint64_t* dest, uint64_t compare,
+                                 const uint64_t& val) {
+  return hc::atomic_compare_exchange_uint64(dest, compare, val);
+}
 
-  KOKKOS_INLINE_FUNCTION
-  long long atomic_compare_exchange(long long* dest, long long compare, const long long& val) {
-    return (long long)hc::atomic_compare_exchange_uint64((uint64_t*)(dest), (uint64_t)(compare), (const uint64_t&)(val));
-  }
+KOKKOS_INLINE_FUNCTION
+long long atomic_compare_exchange(long long* dest, long long compare,
+                                  const long long& val) {
+  return (long long)hc::atomic_compare_exchange_uint64(
+      (uint64_t*)(dest), (uint64_t)(compare), (const uint64_t&)(val));
+}
 
-  KOKKOS_INLINE_FUNCTION
-  float atomic_compare_exchange(float* dest, float compare, const float& val) {
-    union U {
-      int i ;
-      float f ;
-      KOKKOS_INLINE_FUNCTION U() {};
-    } idest,icompare,ival;
-    idest.f = *dest;
-    icompare.f = compare;
-    ival.f = val;
-    idest.i = hc::atomic_compare_exchange_int(reinterpret_cast<int*>(dest), icompare.i, ival.i);
-    return idest.f;
-  }
+KOKKOS_INLINE_FUNCTION
+float atomic_compare_exchange(float* dest, float compare, const float& val) {
+  union U {
+    int i;
+    float f;
+    KOKKOS_INLINE_FUNCTION U(){};
+  } idest, icompare, ival;
+  idest.f    = *dest;
+  icompare.f = compare;
+  ival.f     = val;
+  idest.i    = hc::atomic_compare_exchange_int(reinterpret_cast<int*>(dest),
+                                            icompare.i, ival.i);
+  return idest.f;
+}
 
-  KOKKOS_INLINE_FUNCTION
-  double atomic_compare_exchange(double* dest, double compare, const double& val) {
-    union U {
-      uint64_t i ;
-      double d ;
-      KOKKOS_INLINE_FUNCTION U() {};
-    } idest,icompare,ival;
-    idest.d = *dest;
-    icompare.d = compare;
-    ival.d = val;
-    idest.i = hc::atomic_compare_exchange_uint64(reinterpret_cast<uint64_t*>(dest), icompare.i, ival.i);
-    return idest.d;
-  }
+KOKKOS_INLINE_FUNCTION
+double atomic_compare_exchange(double* dest, double compare,
+                               const double& val) {
+  union U {
+    uint64_t i;
+    double d;
+    KOKKOS_INLINE_FUNCTION U(){};
+  } idest, icompare, ival;
+  idest.d    = *dest;
+  icompare.d = compare;
+  ival.d     = val;
+  idest.i    = hc::atomic_compare_exchange_uint64(
+      reinterpret_cast<uint64_t*>(dest), icompare.i, ival.i);
+  return idest.d;
+}
 
-  template<class T>
-  KOKKOS_INLINE_FUNCTION
-  T atomic_compare_exchange(volatile T* dest, T compare, typename std::enable_if<sizeof(T) == sizeof(int), const T&>::type val) {
-    union U {
-      int i ;
-      T f ;
-      KOKKOS_INLINE_FUNCTION U() {};
-    } idest,icompare,ival;
-    idest.f = *dest;
-    icompare.f = compare;
-    ival.f = val;
-    idest.i = hc::atomic_compare_exchange_int((int*)(dest), icompare.i, ival.i);
-    return idest.f;
-  }
+template <class T>
+KOKKOS_INLINE_FUNCTION T atomic_compare_exchange(
+    volatile T* dest, T compare,
+    typename std::enable_if<sizeof(T) == sizeof(int), const T&>::type val) {
+  union U {
+    int i;
+    T f;
+    KOKKOS_INLINE_FUNCTION U(){};
+  } idest, icompare, ival;
+  idest.f    = *dest;
+  icompare.f = compare;
+  ival.f     = val;
+  idest.i = hc::atomic_compare_exchange_int((int*)(dest), icompare.i, ival.i);
+  return idest.f;
+}
 
-  template<class T>
-  KOKKOS_INLINE_FUNCTION
-  T atomic_compare_exchange(volatile T* dest, T compare, typename std::enable_if<sizeof(T) == sizeof(int64_t), const T&>::type val) {
-    union U {
-      uint64_t i ;
-      T f ;
-      KOKKOS_INLINE_FUNCTION U() {};
-    } idest,icompare,ival;
-    idest.f = *dest;
-    icompare.f = compare;
-    ival.f = val;
-    idest.i = hc::atomic_compare_exchange_uint64((uint64_t*)(dest), icompare.i, ival.i);
-    return idest.f;
-  }
+template <class T>
+KOKKOS_INLINE_FUNCTION T atomic_compare_exchange(
+    volatile T* dest, T compare,
+    typename std::enable_if<sizeof(T) == sizeof(int64_t), const T&>::type val) {
+  union U {
+    uint64_t i;
+    T f;
+    KOKKOS_INLINE_FUNCTION U(){};
+  } idest, icompare, ival;
+  idest.f    = *dest;
+  icompare.f = compare;
+  ival.f     = val;
+  idest.i =
+      hc::atomic_compare_exchange_uint64((uint64_t*)(dest), icompare.i, ival.i);
+  return idest.f;
+}
 
-  template<class T>
-  KOKKOS_INLINE_FUNCTION
-  T atomic_compare_exchange(volatile T* dest, T compare, typename std::enable_if<(sizeof(T) != sizeof(int32_t)) && (sizeof(T) != sizeof(int64_t)), const T&>::type val) {
-    return val;
-  }
+template <class T>
+KOKKOS_INLINE_FUNCTION T atomic_compare_exchange(
+    volatile T* dest, T compare,
+    typename std::enable_if<(sizeof(T) != sizeof(int32_t)) &&
+                                (sizeof(T) != sizeof(int64_t)),
+                            const T&>::type val) {
+  return val;
+}
 
-  KOKKOS_INLINE_FUNCTION
-  int atomic_fetch_add (volatile int * dest, const int& val) {
-    return hc::atomic_fetch_add((int *)dest, val);
-  }
-  
-  KOKKOS_INLINE_FUNCTION
-  unsigned int atomic_fetch_add(unsigned int* dest, const unsigned int& val) {
-    return hc::atomic_fetch_add(dest, val);
-  }
+KOKKOS_INLINE_FUNCTION
+int atomic_fetch_add(volatile int* dest, const int& val) {
+  return hc::atomic_fetch_add((int*)dest, val);
+}
 
-  KOKKOS_INLINE_FUNCTION
-  unsigned long atomic_fetch_add(volatile unsigned long* dest, const unsigned long& val) {
-    return (unsigned long)hc::atomic_fetch_add((uint64_t *)dest, (const uint64_t)val);
-  }
+KOKKOS_INLINE_FUNCTION
+unsigned int atomic_fetch_add(unsigned int* dest, const unsigned int& val) {
+  return hc::atomic_fetch_add(dest, val);
+}
 
-  KOKKOS_INLINE_FUNCTION
-  int64_t atomic_fetch_add(volatile int64_t* dest, const int64_t& val) {
-    return (int64_t)hc::atomic_fetch_add((uint64_t *)dest, (const uint64_t&)val);
-  }
+KOKKOS_INLINE_FUNCTION
+unsigned long atomic_fetch_add(volatile unsigned long* dest,
+                               const unsigned long& val) {
+  return (unsigned long)hc::atomic_fetch_add((uint64_t*)dest,
+                                             (const uint64_t)val);
+}
 
-  KOKKOS_INLINE_FUNCTION
-  char atomic_fetch_add(volatile char * dest, const char& val) {
-    unsigned int oldval,newval,assume;
-    oldval = *(int *)dest ;
+KOKKOS_INLINE_FUNCTION
+int64_t atomic_fetch_add(volatile int64_t* dest, const int64_t& val) {
+  return (int64_t)hc::atomic_fetch_add((uint64_t*)dest, (const uint64_t&)val);
+}
 
-    do {
-      assume = oldval ;
-      newval = assume&0x7fffff00 + ((assume&0xff)+val)&0xff ;
-      oldval = hc::atomic_compare_exchange_unsigned((unsigned int*)dest, assume,newval);
-    } while ( assume != oldval );
+KOKKOS_INLINE_FUNCTION
+char atomic_fetch_add(volatile char* dest, const char& val) {
+  unsigned int oldval, newval, assume;
+  oldval = *(int*)dest;
 
-    return oldval ;    
-  }
+  do {
+    assume = oldval;
+    newval = assume & 0x7fffff00 + ((assume & 0xff) + val) & 0xff;
+    oldval = hc::atomic_compare_exchange_unsigned((unsigned int*)dest, assume,
+                                                  newval);
+  } while (assume != oldval);
 
+  return oldval;
+}
 
-  KOKKOS_INLINE_FUNCTION
-  short atomic_fetch_add(volatile short * dest, const short& val) {
-    unsigned int oldval,newval,assume;
-    oldval = *(int *)dest ;
+KOKKOS_INLINE_FUNCTION
+short atomic_fetch_add(volatile short* dest, const short& val) {
+  unsigned int oldval, newval, assume;
+  oldval = *(int*)dest;
 
-    do {
-      assume = oldval ;
-      newval = assume&0x7fff0000 + ((assume&0xffff)+val)&0xffff ;
-      oldval = hc::atomic_compare_exchange_unsigned((unsigned int*)dest, assume,newval);
-    } while ( assume != oldval );
+  do {
+    assume = oldval;
+    newval = assume & 0x7fff0000 + ((assume & 0xffff) + val) & 0xffff;
+    oldval = hc::atomic_compare_exchange_unsigned((unsigned int*)dest, assume,
+                                                  newval);
+  } while (assume != oldval);
 
-    return oldval ;    
-  }
+  return oldval;
+}
 
-  KOKKOS_INLINE_FUNCTION
-  long long atomic_fetch_add(volatile long long * dest, const long long& val) {
-    return (long long)hc::atomic_fetch_add((uint64_t*)dest, (const uint64_t&)val);
-  }
+KOKKOS_INLINE_FUNCTION
+long long atomic_fetch_add(volatile long long* dest, const long long& val) {
+  return (long long)hc::atomic_fetch_add((uint64_t*)dest, (const uint64_t&)val);
+}
 
+KOKKOS_INLINE_FUNCTION
+int atomic_fetch_sub(volatile int* dest, const int& val) {
+  return hc::atomic_fetch_sub((int*)dest, val);
+}
 
+KOKKOS_INLINE_FUNCTION
+unsigned int atomic_fetch_sub(volatile unsigned int* dest,
+                              const unsigned int& val) {
+  return hc::atomic_fetch_sub((unsigned int*)dest, val);
+}
 
-  KOKKOS_INLINE_FUNCTION
-  int atomic_fetch_sub (volatile int * dest, const int& val) {
-    return hc::atomic_fetch_sub((int *)dest, val);
-  }
-  
-  KOKKOS_INLINE_FUNCTION
-  unsigned int atomic_fetch_sub(volatile unsigned int* dest, const unsigned int& val) {
-    return hc::atomic_fetch_sub((unsigned int *)dest, val);
-  }
+KOKKOS_INLINE_FUNCTION
+int64_t atomic_fetch_sub(int64_t* dest, const int64_t& val) {
+  return (int64_t)hc::atomic_fetch_add((uint64_t*)dest, -(const uint64_t&)val);
+  //    return (int64_t)hc::atomic_fetch_sub_uint64((uint64_t*)dest, (const
+  //    uint64_t&)val);
+}
 
-  KOKKOS_INLINE_FUNCTION
-  int64_t atomic_fetch_sub(int64_t* dest, const int64_t& val) {
-    return (int64_t)hc::atomic_fetch_add((uint64_t *)dest, -(const uint64_t&)val);
-//    return (int64_t)hc::atomic_fetch_sub_uint64((uint64_t*)dest, (const uint64_t&)val);
-  }
-  
-  KOKKOS_INLINE_FUNCTION
-  char atomic_fetch_sub(volatile char * dest, const char& val) {
-    unsigned int oldval,newval,assume;
-    oldval = *(int *)dest ;
+KOKKOS_INLINE_FUNCTION
+char atomic_fetch_sub(volatile char* dest, const char& val) {
+  unsigned int oldval, newval, assume;
+  oldval = *(int*)dest;
 
-    do {
-      assume = oldval ;
-      newval = assume&0x7fffff00 + ((assume&0xff)-val)&0xff ;
-      oldval = hc::atomic_compare_exchange_unsigned((unsigned int*)dest, assume,newval);
-    } while ( assume != oldval );
+  do {
+    assume = oldval;
+    newval = assume & 0x7fffff00 + ((assume & 0xff) - val) & 0xff;
+    oldval = hc::atomic_compare_exchange_unsigned((unsigned int*)dest, assume,
+                                                  newval);
+  } while (assume != oldval);
 
-    return oldval ;    
-  }
+  return oldval;
+}
 
-  KOKKOS_INLINE_FUNCTION
-  short atomic_fetch_sub(volatile short * dest, const short& val) {
-    unsigned int oldval,newval,assume;
-    oldval = *(int *)dest ;
+KOKKOS_INLINE_FUNCTION
+short atomic_fetch_sub(volatile short* dest, const short& val) {
+  unsigned int oldval, newval, assume;
+  oldval = *(int*)dest;
 
-    do {
-      assume = oldval ;
-      newval = assume&0x7fff0000 + ((assume&0xffff)-val)&0xffff;
-      oldval = hc::atomic_compare_exchange_unsigned((unsigned int*)dest, assume,newval);
-    } while ( assume != oldval );
+  do {
+    assume = oldval;
+    newval = assume & 0x7fff0000 + ((assume & 0xffff) - val) & 0xffff;
+    oldval = hc::atomic_compare_exchange_unsigned((unsigned int*)dest, assume,
+                                                  newval);
+  } while (assume != oldval);
 
-    return oldval ;    
-  }
+  return oldval;
+}
 
-  KOKKOS_INLINE_FUNCTION
-  long long atomic_fetch_sub(volatile long long * dest, const long long& val) {
-    return (long long)hc::atomic_fetch_add((uint64_t*)dest, -(const uint64_t&)val);
-  }
+KOKKOS_INLINE_FUNCTION
+long long atomic_fetch_sub(volatile long long* dest, const long long& val) {
+  return (long long)hc::atomic_fetch_add((uint64_t*)dest,
+                                         -(const uint64_t&)val);
+}
 
-  template<class T>
-  KOKKOS_INLINE_FUNCTION
-  T atomic_fetch_add(volatile T* dest, typename std::enable_if<sizeof(T) == sizeof(int), const T&>::type val) {
-    union U {
-      unsigned int i ;
-      T t ;
-      KOKKOS_INLINE_FUNCTION U() {};
-    } assume , oldval , newval ;
+template <class T>
+KOKKOS_INLINE_FUNCTION T atomic_fetch_add(
+    volatile T* dest,
+    typename std::enable_if<sizeof(T) == sizeof(int), const T&>::type val) {
+  union U {
+    unsigned int i;
+    T t;
+    KOKKOS_INLINE_FUNCTION U(){};
+  } assume, oldval, newval;
 
-    oldval.t = *dest ;
+  oldval.t = *dest;
 
-    do {
-      assume.i = oldval.i ;
-      newval.t = assume.t + val ;
-      oldval.i = atomic_compare_exchange( (unsigned int*)(dest) , assume.i , newval.i );
-    } while ( assume.i != oldval.i );
+  do {
+    assume.i = oldval.i;
+    newval.t = assume.t + val;
+    oldval.i =
+        atomic_compare_exchange((unsigned int*)(dest), assume.i, newval.i);
+  } while (assume.i != oldval.i);
 
-    return oldval.t ;    
-  }
+  return oldval.t;
+}
 
-  template<class T>
-  KOKKOS_INLINE_FUNCTION
-  T atomic_fetch_add(volatile T* dest, typename std::enable_if<sizeof(T) != sizeof(int) && sizeof(T) == sizeof(int64_t), const T&>::type val) {
-    union U {
-      uint64_t i ;
-      T t ;
-      KOKKOS_INLINE_FUNCTION U() {};
-    } assume , oldval , newval ;
+template <class T>
+KOKKOS_INLINE_FUNCTION T atomic_fetch_add(
+    volatile T* dest, typename std::enable_if<sizeof(T) != sizeof(int) &&
+                                                  sizeof(T) == sizeof(int64_t),
+                                              const T&>::type val) {
+  union U {
+    uint64_t i;
+    T t;
+    KOKKOS_INLINE_FUNCTION U(){};
+  } assume, oldval, newval;
 
-    oldval.t = *dest ;
+  oldval.t = *dest;
 
-    do {
-      assume.i = oldval.i ;
-      newval.t = assume.t + val ;
-      oldval.i = atomic_compare_exchange( (uint64_t*)dest , assume.i , newval.i );
-    } while ( assume.i != oldval.i );
+  do {
+    assume.i = oldval.i;
+    newval.t = assume.t + val;
+    oldval.i = atomic_compare_exchange((uint64_t*)dest, assume.i, newval.i);
+  } while (assume.i != oldval.i);
 
-    return oldval.t ;    
-  }
+  return oldval.t;
+}
 
-
-  //WORKAROUND
-  template<class T>
-  KOKKOS_INLINE_FUNCTION
-  T atomic_fetch_add(volatile T* dest, typename std::enable_if<sizeof(T) != sizeof(int) && sizeof(T) != sizeof(int64_t), const T&>::type val) {
-    T return_val;
-    // Do we need to (like in CUDA) handle potential wavefront branching?
-    int done = 0;
-    //unsigned int active = KOKKOS_IMPL_CUDA_BALLOT(1);
-    //unsigned int done_active = 0;
-    //while (active!=done_active) {
-    if(!done) {
-      bool locked = ::Kokkos::Impl::lock_address_rocm_space( (void*) dest );
-      if( locked ) {
-        return_val = *dest;
-        *dest = return_val + val;
-        ::Kokkos::Impl::unlock_address_rocm_space( (void*) dest );
-        done = 1;
-      }
+// WORKAROUND
+template <class T>
+KOKKOS_INLINE_FUNCTION T atomic_fetch_add(
+    volatile T* dest, typename std::enable_if<sizeof(T) != sizeof(int) &&
+                                                  sizeof(T) != sizeof(int64_t),
+                                              const T&>::type val) {
+  T return_val;
+  // Do we need to (like in CUDA) handle potential wavefront branching?
+  int done = 0;
+  // unsigned int active = KOKKOS_IMPL_CUDA_BALLOT(1);
+  // unsigned int done_active = 0;
+  // while (active!=done_active) {
+  if (!done) {
+    bool locked = ::Kokkos::Impl::lock_address_rocm_space((void*)dest);
+    if (locked) {
+      return_val = *dest;
+      *dest      = return_val + val;
+      ::Kokkos::Impl::unlock_address_rocm_space((void*)dest);
+      done = 1;
     }
-    //done_active = KOKKOS_IMPL_CUDA_BALLOT(done);
+  }
+  // done_active = KOKKOS_IMPL_CUDA_BALLOT(done);
   //}
-    return return_val;
-  }
+  return return_val;
+}
 
-  template<class T>
-  KOKKOS_INLINE_FUNCTION
-  T atomic_fetch_sub(volatile T* dest, typename std::enable_if<sizeof(T) == sizeof(int),T>::type val) {
-    union U {
-      int i ;
-      T t ;
-      KOKKOS_INLINE_FUNCTION U() {};
-    } assume , oldval , newval ;
+template <class T>
+KOKKOS_INLINE_FUNCTION T atomic_fetch_sub(
+    volatile T* dest,
+    typename std::enable_if<sizeof(T) == sizeof(int), T>::type val) {
+  union U {
+    int i;
+    T t;
+    KOKKOS_INLINE_FUNCTION U(){};
+  } assume, oldval, newval;
 
-    oldval.t = *dest ;
+  oldval.t = *dest;
 
-    do {
-      assume.i = oldval.i ;
-      newval.t = assume.t - val ;
-      oldval.i = Kokkos::atomic_compare_exchange( (int*)dest , assume.i , newval.i );
-    } while ( assume.i != oldval.i );
+  do {
+    assume.i = oldval.i;
+    newval.t = assume.t - val;
+    oldval.i = Kokkos::atomic_compare_exchange((int*)dest, assume.i, newval.i);
+  } while (assume.i != oldval.i);
 
-    return oldval.t ;
-  }
+  return oldval.t;
+}
 
-  template<class T>
-  KOKKOS_INLINE_FUNCTION
-  T atomic_fetch_sub(volatile T* dest, typename std::enable_if<sizeof(T) != sizeof(int) && sizeof(T) == sizeof(int64_t), const T&>::type val) {
-    union U {
-      int64_t i ;
-      T t ;
-      KOKKOS_INLINE_FUNCTION U() {};
-    } assume , oldval , newval ;
+template <class T>
+KOKKOS_INLINE_FUNCTION T atomic_fetch_sub(
+    volatile T* dest, typename std::enable_if<sizeof(T) != sizeof(int) &&
+                                                  sizeof(T) == sizeof(int64_t),
+                                              const T&>::type val) {
+  union U {
+    int64_t i;
+    T t;
+    KOKKOS_INLINE_FUNCTION U(){};
+  } assume, oldval, newval;
 
-    oldval.t = *dest ;
+  oldval.t = *dest;
 
-    do {
-      assume.i = oldval.i ;
-      newval.t = assume.t - val ;
-      oldval.i = atomic_compare_exchange( (int64_t*)dest , assume.i , newval.i );
-    } while ( assume.i != oldval.i );
+  do {
+    assume.i = oldval.i;
+    newval.t = assume.t - val;
+    oldval.i = atomic_compare_exchange((int64_t*)dest, assume.i, newval.i);
+  } while (assume.i != oldval.i);
 
-    return oldval.t ;    
-  }
+  return oldval.t;
+}
 //  KOKKOS_INLINE_FUNCTION
 //  char atomic_fetch_sub(volatile char * dest, const char& val) {
-  template<class T>
-  KOKKOS_INLINE_FUNCTION
-  T atomic_fetch_sub(volatile T* dest, typename std::enable_if<sizeof(T) == sizeof(char),T>::type val) {
+template <class T>
+KOKKOS_INLINE_FUNCTION T atomic_fetch_sub(
+    volatile T* dest,
+    typename std::enable_if<sizeof(T) == sizeof(char), T>::type val) {
+  unsigned int oldval, newval, assume;
+  oldval = *(int*)dest;
 
-    unsigned int oldval,newval,assume;
-    oldval = *(int *)dest ;
+  do {
+    assume = oldval;
+    newval = assume & 0x7fffff00 + ((assume & 0xff) - val) & 0xff;
+    oldval = hc::atomic_compare_exchange_unsigned((unsigned int*)dest, assume,
+                                                  newval);
+  } while (assume != oldval);
 
-    do {
-      assume = oldval ;
-      newval = assume&0x7fffff00 + ((assume&0xff)-val)&0xff ;
-      oldval = hc::atomic_compare_exchange_unsigned((unsigned int*)dest, assume,newval);
-    } while ( assume != oldval );
-
-    return (T) oldval&0xff ;
-  }
+  return (T)oldval & 0xff;
+}
 
 //  KOKKOS_INLINE_FUNCTION
 //  short atomic_fetch_sub(volatile short * dest, const short& val) {
-  template<class T>
-  KOKKOS_INLINE_FUNCTION
-  T atomic_fetch_sub(volatile T* dest, typename std::enable_if<sizeof(T) == sizeof(short),T>::type val) {
-
-    unsigned int oldval,newval,assume;
-    oldval = *(int *)dest ;
-
-    do {
-      assume = oldval ;
-      newval = assume&0x7fff0000 + ((assume&0xffff)-val)&0xffff;
-      oldval = hc::atomic_compare_exchange_unsigned((unsigned int*)dest, assume,newval);
-    } while ( assume != oldval );
-
-    return (T) oldval&0xffff ;
-  }
-
+template <class T>
+KOKKOS_INLINE_FUNCTION T atomic_fetch_sub(
+    volatile T* dest,
+    typename std::enable_if<sizeof(T) == sizeof(short), T>::type val) {
+  unsigned int oldval, newval, assume;
+  oldval = *(int*)dest;
 
+  do {
+    assume = oldval;
+    newval = assume & 0x7fff0000 + ((assume & 0xffff) - val) & 0xffff;
+    oldval = hc::atomic_compare_exchange_unsigned((unsigned int*)dest, assume,
+                                                  newval);
+  } while (assume != oldval);
 
+  return (T)oldval & 0xffff;
 }
+
+}  // namespace Kokkos
 #endif
diff --git a/lib/kokkos/core/src/ROCm/Kokkos_ROCm_Config.hpp b/lib/kokkos/core/src/ROCm/Kokkos_ROCm_Config.hpp
index 87840bb37b..422e425cfe 100644
--- a/lib/kokkos/core/src/ROCm/Kokkos_ROCm_Config.hpp
+++ b/lib/kokkos/core/src/ROCm/Kokkos_ROCm_Config.hpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
diff --git a/lib/kokkos/core/src/ROCm/Kokkos_ROCm_Exec.cpp b/lib/kokkos/core/src/ROCm/Kokkos_ROCm_Exec.cpp
index b4be18d03b..4c500521b1 100644
--- a/lib/kokkos/core/src/ROCm/Kokkos_ROCm_Exec.cpp
+++ b/lib/kokkos/core/src/ROCm/Kokkos_ROCm_Exec.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -49,56 +50,51 @@
 //#include <ROCm/Kokkos_ROCmExec.hpp>
 #include <hc.hpp>
 
-#define ROCM_SPACE_ATOMIC_MASK      0x1FFFF
-#define ROCM_SPACE_ATOMIC_XOR_MASK  0x15A39
+#define ROCM_SPACE_ATOMIC_MASK 0x1FFFF
+#define ROCM_SPACE_ATOMIC_XOR_MASK 0x15A39
 #define ROCM_CONCURRENCY 20480
 //#define ROCM_CONCURRENCY 81920  # for fiji
 
 namespace Kokkos {
-  static int rocm_space_atomic_locks[ROCM_SPACE_ATOMIC_MASK+1];
-  static int rocm_space_scratch_locks[ROCM_CONCURRENCY];
-  static int rocm_space_threadid_locks[ROCM_CONCURRENCY];
+static int rocm_space_atomic_locks[ROCM_SPACE_ATOMIC_MASK + 1];
+static int rocm_space_scratch_locks[ROCM_CONCURRENCY];
+static int rocm_space_threadid_locks[ROCM_CONCURRENCY];
 namespace Impl {
 // TODO: mimic cuda implemtation, add dgpu capability
 
-  void init_rocm_atomic_lock_array() {
-    static int is_initialized = 0;
-    if(!is_initialized)
-    {
-      for(int i = 0; i < ROCM_SPACE_ATOMIC_MASK+1; i++)
-        rocm_space_atomic_locks[i] = 0;
-      is_initialized = 1;
-    }
-  }
-
-  void init_rocm_scratch_lock_array() {
-    static int is_initialized = 0;
-    if(!is_initialized)
-    {
-      for(int i = 0; i < ROCM_CONCURRENCY; i++)
-        rocm_space_scratch_locks[i] = 0;
-      is_initialized = 1;
-    }
-  }
-
-  void init_rocm_threadid_lock_array() {
-    static int is_initialized = 0;
-    if(!is_initialized)
-    {
-      for(int i = 0; i < ROCM_CONCURRENCY; i++)
-        rocm_space_threadid_locks[i] = 0;
-      is_initialized = 1;
-    }
-  }
-
-  void init_lock_arrays_rocm_space() {
-     init_rocm_atomic_lock_array();
-//     init_rocm_scratch_lock_array();
-//     init_rocm_threadid_lock_array();
+void init_rocm_atomic_lock_array() {
+  static int is_initialized = 0;
+  if (!is_initialized) {
+    for (int i = 0; i < ROCM_SPACE_ATOMIC_MASK + 1; i++)
+      rocm_space_atomic_locks[i] = 0;
+    is_initialized = 1;
   }
 }
 
-} // namespace Kokkos
+void init_rocm_scratch_lock_array() {
+  static int is_initialized = 0;
+  if (!is_initialized) {
+    for (int i = 0; i < ROCM_CONCURRENCY; i++) rocm_space_scratch_locks[i] = 0;
+    is_initialized = 1;
+  }
+}
+
+void init_rocm_threadid_lock_array() {
+  static int is_initialized = 0;
+  if (!is_initialized) {
+    for (int i = 0; i < ROCM_CONCURRENCY; i++) rocm_space_threadid_locks[i] = 0;
+    is_initialized = 1;
+  }
+}
+
+void init_lock_arrays_rocm_space() {
+  init_rocm_atomic_lock_array();
+  //     init_rocm_scratch_lock_array();
+  //     init_rocm_threadid_lock_array();
+}
+}  // namespace Impl
+
+}  // namespace Kokkos
 #if 0
 namespace Kokkos {
 namespace Impl {
diff --git a/lib/kokkos/core/src/ROCm/Kokkos_ROCm_Exec.hpp b/lib/kokkos/core/src/ROCm/Kokkos_ROCm_Exec.hpp
index 3e81883278..5f527a19b3 100644
--- a/lib/kokkos/core/src/ROCm/Kokkos_ROCm_Exec.hpp
+++ b/lib/kokkos/core/src/ROCm/Kokkos_ROCm_Exec.hpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -54,17 +55,17 @@ namespace Kokkos {
 namespace Impl {
 
 struct ROCmTraits {
-// TODO: determine if needed
-  enum { WavefrontSize       = 64  /* 64  */ };
-  enum { WorkgroupSize       = 256 /* 256  */ };
-  enum { WavefrontIndexMask  = 0x003f  /* Mask for wavefrontindex */ };
-  enum { WavefrontIndexShift = 6   /* WavefrontSize == 1 << WavefrontShift */ };
+  // TODO: determine if needed
+  enum { WavefrontSize = 64 /* 64  */ };
+  enum { WorkgroupSize = 256 /* 256  */ };
+  enum { WavefrontIndexMask = 0x003f /* Mask for wavefrontindex */ };
+  enum { WavefrontIndexShift = 6 /* WavefrontSize == 1 << WavefrontShift */ };
 
-  enum { SharedMemoryBanks    = 64      /* GCN */ };
+  enum { SharedMemoryBanks = 64 /* GCN */ };
   enum { SharedMemoryCapacity = 0x10000 /* 64k shared / 16k L1 Cache */ };
-  enum { SharedMemoryUsage    = 0x04000 /* 64k shared / 16k L1 Cache */ };
+  enum { SharedMemoryUsage = 0x04000 /* 64k shared / 16k L1 Cache */ };
 
-  enum { UpperBoundExtentCount    = 4294967295 /* Hard upper bound */ };
+  enum { UpperBoundExtentCount = 4294967295 /* Hard upper bound */ };
 #if 0
   KOKKOS_INLINE_FUNCTION static
   ROCmSpace::size_type wavefront_count( ROCmSpace::size_type i )
@@ -81,69 +82,68 @@ struct ROCmTraits {
 size_t rocm_internal_cu_count();
 size_t rocm_internal_maximum_workgroup_count();
 
-size_t * rocm_internal_scratch_flags( const size_t size );
-size_t * rocm_internal_scratch_space( const size_t size );
+size_t *rocm_internal_scratch_flags(const size_t size);
+size_t *rocm_internal_scratch_space(const size_t size);
 
 // This pointer is the start of dynamic shared memory (LDS).
 // Dynamic is at the end of LDS and it's size must be specified
 // in a tile_block specification at kernel launch time.
-template< typename T >
-KOKKOS_INLINE_FUNCTION
-T * kokkos_impl_rocm_shared_memory()
+template <typename T>
+KOKKOS_INLINE_FUNCTION T *kokkos_impl_rocm_shared_memory()
 //{ return (T*) hc::get_group_segment_base_pointer() ; }
-{ return (T*) hc::get_dynamic_group_segment_base_pointer() ; }
-
-
+{
+  return (T *)hc::get_dynamic_group_segment_base_pointer();
 }
-} // namespace Kokkos
-#define ROCM_SPACE_ATOMIC_MASK      0x1FFFF
-#define ROCM_SPACE_ATOMIC_XOR_MASK  0x15A39
-//int rocm_space_atomic_locks[ROCM_SPACE_ATOMIC_MASK+1];
-extern int
-   *rocm_space_atomic_locks;
+
+}  // namespace Impl
+}  // namespace Kokkos
+#define ROCM_SPACE_ATOMIC_MASK 0x1FFFF
+#define ROCM_SPACE_ATOMIC_XOR_MASK 0x15A39
+// int rocm_space_atomic_locks[ROCM_SPACE_ATOMIC_MASK+1];
+extern int *rocm_space_atomic_locks;
 
 namespace Kokkos {
 namespace Impl {
-  void init_lock_arrays_rocm_space();
+void init_lock_arrays_rocm_space();
 
-  void* rocm_resize_scratch_space(size_t bytes, bool force_shrink = false);
+void *rocm_resize_scratch_space(size_t bytes, bool force_shrink = false);
 
 // TODO: determine if needed
 KOKKOS_INLINE_FUNCTION
-bool lock_address_rocm_space(void* ptr) {
+bool lock_address_rocm_space(void *ptr) {
 #if 0
 return(Kokkos::Impl::lock_address_host_space(ptr));
 #else
   size_t offset = size_t(ptr);
-  offset = offset >> 2;
-  offset = offset & ROCM_SPACE_ATOMIC_MASK;
-  return (0 == hc::atomic_compare_exchange(&rocm_space_atomic_locks[offset],0,1));
+  offset        = offset >> 2;
+  offset        = offset & ROCM_SPACE_ATOMIC_MASK;
+  return (0 ==
+          hc::atomic_compare_exchange(&rocm_space_atomic_locks[offset], 0, 1));
 #endif
 }
 KOKKOS_INLINE_FUNCTION
-void unlock_address_rocm_space(void* ptr) {
+void unlock_address_rocm_space(void *ptr) {
 #if 0
 Kokkos::Impl::unlock_address_host_space(ptr) ;
 #else
   size_t offset = size_t(ptr);
-  offset = offset >> 2;
-  offset = offset & ROCM_SPACE_ATOMIC_MASK;
-  hc::atomic_exchange( &rocm_space_atomic_locks[ offset ], 0);
+  offset        = offset >> 2;
+  offset        = offset & ROCM_SPACE_ATOMIC_MASK;
+  hc::atomic_exchange(&rocm_space_atomic_locks[offset], 0);
 #endif
 }
 
-}
-} // namespace Kokkos
+}  // namespace Impl
+}  // namespace Kokkos
 
 namespace Kokkos {
 namespace Impl {
-//extern 
-//KOKKOS_INLINE_FUNCTION
-//void init_lock_arrays_rocm_space(); 
-
+// extern
+// KOKKOS_INLINE_FUNCTION
+// void init_lock_arrays_rocm_space();
 
 }
-} // namespace Kokkos
+}  // namespace Kokkos
 //#if defined(__HCC_ACCELERATOR__)
 namespace Kokkos {
 namespace Impl {
@@ -184,92 +184,82 @@ static void rocm_parallel_launch_local_memory( const DriverType driver )
   driver();
 }
 */
-template < class DriverType
-         , class LaunchBounds = Kokkos::LaunchBounds<> >
-struct ROCmParallelLaunch ;
+template <class DriverType, class LaunchBounds = Kokkos::LaunchBounds<>>
+struct ROCmParallelLaunch;
 
-template < class DriverType
-         , unsigned int MaxThreadsPerBlock
-         , unsigned int MinBlocksPerSM >
-struct ROCmParallelLaunch< DriverType
-                         , Kokkos::LaunchBounds< MaxThreadsPerBlock
-                                               , MinBlocksPerSM >>
-{
-  inline
-  ROCmParallelLaunch( const DriverType & driver
-                    , const dim3       & grid
-                    , const dim3       & block
-                    , const int      shmem )
-  {
-    if ( grid.x && ( block.x * block.y * block.z ) ) {
-      if ( ROCmTraits::SharedMemoryCapacity < shmem ) {
-        Kokkos::Impl::throw_runtime_exception( std::string("ROCmParallelLaunch FAILED: shared memory request is too large") );
+template <class DriverType, unsigned int MaxThreadsPerBlock,
+          unsigned int MinBlocksPerSM>
+struct ROCmParallelLaunch<
+    DriverType, Kokkos::LaunchBounds<MaxThreadsPerBlock, MinBlocksPerSM>> {
+  inline ROCmParallelLaunch(const DriverType &driver, const dim3 &grid,
+                            const dim3 &block, const int shmem) {
+    if (grid.x && (block.x * block.y * block.z)) {
+      if (ROCmTraits::SharedMemoryCapacity < shmem) {
+        Kokkos::Impl::throw_runtime_exception(std::string(
+            "ROCmParallelLaunch FAILED: shared memory request is too large"));
       }
-      DriverType * rocm_memory_buffer = (DriverType *)
-                                     rocm_device_allocate(sizeof(DriverType));
+      DriverType *rocm_memory_buffer =
+          (DriverType *)rocm_device_allocate(sizeof(DriverType));
       // Copy functor to constant memory on the device
-      Kokkos::Impl::DeepCopy<HostSpace,Kokkos::Experimental::ROCmSpace>
-              ( rocm_memory_buffer , (void *)&driver , sizeof(DriverType) );
+      Kokkos::Impl::DeepCopy<HostSpace, Kokkos::Experimental::ROCmSpace>(
+          rocm_memory_buffer, (void *)&driver, sizeof(DriverType));
 
-//      KOKKOS_ENSURE_ROCM_LOCK_ARRAYS_ON_DEVICE();
+      //      KOKKOS_ENSURE_ROCM_LOCK_ARRAYS_ON_DEVICE();
 
       // Invoke the driver function on the device
-      auto ext = hc::extent<3>(grid.z,grid.y,grid.x);
-      size_t bx = (grid.x > block.x)? block.x : grid.x;
-      size_t by = (grid.y > block.y)? block.y : grid.y;
-      size_t bz = (grid.z > block.z)? block.z : grid.z;
+      auto ext  = hc::extent<3>(grid.z, grid.y, grid.x);
+      size_t bx = (grid.x > block.x) ? block.x : grid.x;
+      size_t by = (grid.y > block.y) ? block.y : grid.y;
+      size_t bz = (grid.z > block.z) ? block.z : grid.z;
 
-      hc::parallel_for_each(ext.tile_with_dynamic(bz,by,bx,shmem), [=](const hc::index<3> & idx) [[hc]]
- 
-      { rocm_memory_buffer->operator()();
-      }).wait();
+      hc::parallel_for_each(
+          ext.tile_with_dynamic(bz, by, bx, shmem), [=](const hc::index<3> &idx)
+                                                        [[hc]]
+
+          { rocm_memory_buffer->operator()(); })
+          .wait();
       rocm_device_free(rocm_memory_buffer);
 
-//#if defined( KOKKOS_ENABLE_DEBUG_BOUNDS_CHECK )
-//      ROCM_SAFE_CALL( rocmGetLastError() );
-//      Kokkos::ROCm().fence();
-//#endif
+      //#if defined( KOKKOS_ENABLE_DEBUG_BOUNDS_CHECK )
+      //      ROCM_SAFE_CALL( rocmGetLastError() );
+      //      Kokkos::ROCm().fence();
+      //#endif
     }
   }
 };
-template < class DriverType >
-struct ROCmParallelLaunch< DriverType
-                         , Kokkos::LaunchBounds<>>
-{
-  inline
-  ROCmParallelLaunch( const DriverType & driver
-                    , const dim3       & grid
-                    , const dim3       & block
-                    , const int          shmem )
-  {
-    if ( grid.x && ( block.x * block.y * block.z ) ) {
-      if ( ROCmTraits::SharedMemoryCapacity < shmem ) {
-        Kokkos::Impl::throw_runtime_exception( std::string("ROCmParallelLaunch FAILED: shared memory request is too large") );
+template <class DriverType>
+struct ROCmParallelLaunch<DriverType, Kokkos::LaunchBounds<>> {
+  inline ROCmParallelLaunch(const DriverType &driver, const dim3 &grid,
+                            const dim3 &block, const int shmem) {
+    if (grid.x && (block.x * block.y * block.z)) {
+      if (ROCmTraits::SharedMemoryCapacity < shmem) {
+        Kokkos::Impl::throw_runtime_exception(std::string(
+            "ROCmParallelLaunch FAILED: shared memory request is too large"));
       }
 
-      DriverType * rocm_memory_buffer = (DriverType *)
-                                     rocm_device_allocate(sizeof(DriverType));
+      DriverType *rocm_memory_buffer =
+          (DriverType *)rocm_device_allocate(sizeof(DriverType));
       // Copy functor to constant memory on the device
-      Kokkos::Impl::DeepCopy<HostSpace,Kokkos::Experimental::ROCmSpace>
-              ( rocm_memory_buffer , (void *)&driver , sizeof(DriverType) );
+      Kokkos::Impl::DeepCopy<HostSpace, Kokkos::Experimental::ROCmSpace>(
+          rocm_memory_buffer, (void *)&driver, sizeof(DriverType));
 
-//      KOKKOS_ENSURE_ROCM_LOCK_ARRAYS_ON_DEVICE();
+      //      KOKKOS_ENSURE_ROCM_LOCK_ARRAYS_ON_DEVICE();
       // Invoke the driver function on the device
-      auto ext = hc::extent<3>(grid.z,grid.y,grid.x);
-      size_t bx = (grid.x > block.x)? block.x : grid.x;
-      size_t by = (grid.y > block.y)? block.y : grid.y;
-      size_t bz = (grid.z > block.z)? block.z : grid.z;
-      hc::parallel_for_each(ext.tile_with_dynamic(bz,by,bx,shmem), [=](const hc::index<3> & idx) [[hc]]
- 
- 
-      { rocm_memory_buffer->operator()();
-      }).wait();
+      auto ext  = hc::extent<3>(grid.z, grid.y, grid.x);
+      size_t bx = (grid.x > block.x) ? block.x : grid.x;
+      size_t by = (grid.y > block.y) ? block.y : grid.y;
+      size_t bz = (grid.z > block.z) ? block.z : grid.z;
+      hc::parallel_for_each(
+          ext.tile_with_dynamic(bz, by, bx, shmem), [=](const hc::index<3> &idx)
+                                                        [[hc]]
+
+          { rocm_memory_buffer->operator()(); })
+          .wait();
       rocm_device_free(rocm_memory_buffer);
     }
   }
 };
-} // namespace Impl
-} // namespace Kokkos
-
+}  // namespace Impl
+}  // namespace Kokkos
 
 #endif /* #ifndef KOKKOS_ROCMEXEC_HPP */
diff --git a/lib/kokkos/core/src/ROCm/Kokkos_ROCm_Impl.cpp b/lib/kokkos/core/src/ROCm/Kokkos_ROCm_Impl.cpp
index 236042ccc2..aedde5b80a 100644
--- a/lib/kokkos/core/src/ROCm/Kokkos_ROCm_Impl.cpp
+++ b/lib/kokkos/core/src/ROCm/Kokkos_ROCm_Impl.cpp
@@ -1,13 +1,14 @@
 /*
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -36,7 +37,7 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 */
@@ -64,12 +65,9 @@
 #include <sstream>
 #include <string>
 
-
-
-//KOKKOS_INLINE_FUNCTION
+// KOKKOS_INLINE_FUNCTION
 // Kokkos::Impl::ROCmLockArraysStruct kokkos_impl_rocm_lock_arrays ;
 
-
 /*--------------------------------------------------------------------------*/
 namespace Kokkos {
 namespace Impl {
@@ -79,7 +77,7 @@ namespace {
 __global__
 void query_rocm_kernel_arch( int * d_arch )
 {
-#if defined( __HCC_ACCELERATOR__ )
+#if defined(__HCC_ACCELERATOR__)
   *d_arch = OCM_ARCH__ ;
 #else
   *d_arch = 0 ;
@@ -110,41 +108,34 @@ bool rocm_launch_blocking()
 #endif
 
 // true device memory allocation, not visible from host
-void * rocm_device_allocate(int size)
-{
-  void * ptr;
+void* rocm_device_allocate(int size) {
+  void* ptr;
   hc::accelerator acc;
-  ptr = hc::am_alloc(size,acc,0);
+  ptr = hc::am_alloc(size, acc, 0);
   return ptr;
 }
 
 // host pinned allocation
 // flag = 1, non-coherent, host resident, but with gpu address space pointer
 // flag = 2, coherent, host resident, but with host address space pointer
-void * rocm_hostpinned_allocate(int size)
-{
-  void * ptr;
+void* rocm_hostpinned_allocate(int size) {
+  void* ptr;
   hc::accelerator acc;
-  ptr = hc::am_alloc(size,acc,2);
+  ptr = hc::am_alloc(size, acc, 2);
   return ptr;
 }
 // same free used by all rocm memory allocations
-void rocm_device_free(void * ptr)
-{
-  hc::am_free(ptr);
-}
-
+void rocm_device_free(void* ptr) { hc::am_free(ptr); }
 
 KOKKOS_INLINE_FUNCTION
-void rocm_device_synchronize()
-{
-   hc::accelerator_view av = hc::accelerator().get_default_view();
-   hc::completion_future fut = av.create_marker();
-   fut.wait();
+void rocm_device_synchronize() {
+  hc::accelerator_view av   = hc::accelerator().get_default_view();
+  hc::completion_future fut = av.create_marker();
+  fut.wait();
 }
 
-void rocm_internal_error_throw( const char * name, const char * file, const int line )
-{
+void rocm_internal_error_throw(const char* name, const char* file,
+                               const int line) {
 #if 0
   std::ostringstream out ;
   out << name << " error( " << rocmGetErrorName(e) << "): " << rocmGetErrorString(e);
@@ -182,310 +173,299 @@ void rocm_internal_error_throw( const char * name, const char * file, const int
 // bool get_supports_cpu_shared_memory()
 // size_t get_max_tile_static_size()
 // unsigned int get_cu_count()
-// bool has_cpu_accessible_am() 
+// bool has_cpu_accessible_am()
 struct rocmDeviceProp {
-   char name[256];
-   char description[256];
-   unsigned int version;
-   int device_type;
-   int device_ordinal;
-   int major;
-   int minor;
-   size_t totalGlobalMem;
-   size_t sharedMemPerWavefront;
-   int WavefrontSize;
-   int WorkgroupSize;
-   int MaxTileCount;
-   int maxThreadsPerWorkgroup;
-   int multiProcessorCount;
-   int canMapHostMemory;
-   bool APU;
+  char name[256];
+  char description[256];
+  unsigned int version;
+  int device_type;
+  int device_ordinal;
+  int major;
+  int minor;
+  size_t totalGlobalMem;
+  size_t sharedMemPerWavefront;
+  int WavefrontSize;
+  int WorkgroupSize;
+  int MaxTileCount;
+  int maxThreadsPerWorkgroup;
+  int multiProcessorCount;
+  int canMapHostMemory;
+  bool APU;
 };
 
+void rocmGetDeviceProperties(struct rocmDeviceProp* devProp, int device) {
+  std::wstring s;
+  int i, n;
+  hc::accelerator acc;
+  std::vector<hc::accelerator> accv = acc.get_all();
 
+  hc::accelerator a = accv[device];
 
-void rocmGetDeviceProperties(struct rocmDeviceProp* devProp, int device)
-{
-   std::wstring s;
-   int i,n;
-   hc::accelerator acc;
-   std::vector<hc::accelerator> accv = acc.get_all() ;
+  s = a.get_device_path();
+  i = 0;
+  for (wchar_t c : s)
+    if ((n = std::wctomb(&devProp->name[i], c)) > 0) i += n;
 
-   hc::accelerator a = accv[device];
+  /* assume a CPU */
+  devProp->version = a.get_version();
+  devProp->major   = a.get_version() >> 16;  // for CPU, these are meaningless
+  devProp->minor   = a.get_version() & 0xff;
+  devProp->device_ordinal = 0;
 
-   s=a.get_device_path();
-   i = 0;
-   for(wchar_t c: s)
-      if((n=std::wctomb(&devProp->name[i],c))>0)
-         i+=n;
+  /* is this an AMD graphics card */
+  if ((devProp->name[0] == 'g') && (devProp->name[1] == 'f') &&
+      (devProp->name[2] == 'x')) {
+    /* for AMD cards, the name has the format gfxMmmO */
 
-   /* assume a CPU */
-   devProp->version = a.get_version();
-   devProp->major = a.get_version()>>16; // for CPU, these are meaningless 
-   devProp->minor = a.get_version()&0xff;
-   devProp->device_ordinal = 0;
+    devProp->device_type = ((devProp->name[3] - 0x30) << 16) +
+                           ((devProp->name[4] - 0x30) << 8) +
+                           (devProp->name[5] - 0x30);
+    devProp->device_ordinal = devProp->name[6] - 0x30;
+    devProp->major          = devProp->name[3] - 0x30;
+    devProp->minor          = devProp->name[5] - 0x30;
+  }
 
-   /* is this an AMD graphics card */
-   if((devProp->name[0]=='g') && (devProp->name[1]=='f') 
-                              && (devProp->name[2]=='x')) {
-   /* for AMD cards, the name has the format gfxMmmO */
-     
-      devProp->device_type    = ((devProp->name[3]-0x30)<<16)
-                              + ((devProp->name[4]-0x30)<<8)
-                              +  (devProp->name[5]-0x30);
-      devProp->device_ordinal = devProp->name[6]-0x30;
-      devProp->major = devProp->name[3]-0x30;
-      devProp->minor = devProp->name[5]-0x30;
-   }
+  s = a.get_description();
+  i = 0;
+  for (wchar_t c : s)
+    if ((n = std::wctomb(&devProp->description[i], c)) > 0) i += n;
+  devProp->totalGlobalMem        = a.get_dedicated_memory();
+  devProp->sharedMemPerWavefront = a.get_max_tile_static_size();
+  devProp->WavefrontSize         = 64;
+  devProp->WorkgroupSize         = 256;  // preferred
+  devProp->MaxTileCount =
+      409600;  // as defined in /opt/rocm/hcc-lc/include/hsa_new.h
+  devProp->maxThreadsPerWorkgroup = 1024;
+  devProp->multiProcessorCount    = a.get_cu_count();
+  devProp->canMapHostMemory       = a.get_supports_cpu_shared_memory();
+  // Kaveri has 64KB L2 per CU, 16KB L1, 64KB Vector Regs/SIMD, or 128
+  // regs/thread GCN has 64KB LDS per CU
 
-   s=a.get_description();
-   i = 0;
-   for(wchar_t c: s)
-      if((n=std::wctomb(&devProp->description[i],c))>0)
-         i+=n;
-   devProp->totalGlobalMem = a.get_dedicated_memory();
-   devProp->sharedMemPerWavefront = a.get_max_tile_static_size();
-   devProp->WavefrontSize = 64;
-   devProp->WorkgroupSize = 256; // preferred
-   devProp->MaxTileCount  = 409600; // as defined in /opt/rocm/hcc-lc/include/hsa_new.h
-   devProp->maxThreadsPerWorkgroup = 1024;
-   devProp->multiProcessorCount = a.get_cu_count();
-   devProp->canMapHostMemory = a.get_supports_cpu_shared_memory();
-// Kaveri has 64KB L2 per CU, 16KB L1, 64KB Vector Regs/SIMD, or 128 regs/thread
-// GCN has 64KB LDS per CU
-
-//Kaveri APU is 7:0:0
-//Carrizo APU is 8:0:1
-   devProp->APU = (((devProp->major==7)&&(devProp->minor==0))|
-                   ((devProp->major==8)&&(devProp->minor==1)))?true:false;
+  // Kaveri APU is 7:0:0
+  // Carrizo APU is 8:0:1
+  devProp->APU = (((devProp->major == 7) && (devProp->minor == 0)) |
+                  ((devProp->major == 8) && (devProp->minor == 1)))
+                     ? true
+                     : false;
 }
 
 namespace {
 
-
-
 class ROCmInternalDevices {
-public:
+ public:
   enum { MAXIMUM_DEVICE_COUNT = 64 };
-  struct rocmDeviceProp  m_rocmProp[ MAXIMUM_DEVICE_COUNT ] ;
-  int                    m_rocmDevCount ;
+  struct rocmDeviceProp m_rocmProp[MAXIMUM_DEVICE_COUNT];
+  int m_rocmDevCount;
 
   ROCmInternalDevices();
 
-  static const ROCmInternalDevices & singleton();
+  static const ROCmInternalDevices& singleton();
 };
 
-ROCmInternalDevices::ROCmInternalDevices()
-{
-   hc::accelerator acc;
-   std::vector<hc::accelerator> accv = acc.get_all() ;
-   m_rocmDevCount = accv.size();
+ROCmInternalDevices::ROCmInternalDevices() {
+  hc::accelerator acc;
+  std::vector<hc::accelerator> accv = acc.get_all();
+  m_rocmDevCount                    = accv.size();
 
-  if(m_rocmDevCount > MAXIMUM_DEVICE_COUNT) {
-    Kokkos::abort("Sorry, you have more GPUs per node than we thought anybody would ever have. Please report this to github.com/kokkos/kokkos.");
+  if (m_rocmDevCount > MAXIMUM_DEVICE_COUNT) {
+    Kokkos::abort(
+        "Sorry, you have more GPUs per node than we thought anybody would ever "
+        "have. Please report this to github.com/kokkos/kokkos.");
   }
-  for ( int i = 0 ; i < m_rocmDevCount ; ++i ) {
-    rocmGetDeviceProperties( m_rocmProp + i , i );
+  for (int i = 0; i < m_rocmDevCount; ++i) {
+    rocmGetDeviceProperties(m_rocmProp + i, i);
   }
 }
 
-const ROCmInternalDevices & ROCmInternalDevices::singleton()
-{
+const ROCmInternalDevices& ROCmInternalDevices::singleton() {
   static ROCmInternalDevices* self = nullptr;
   if (!self) {
     self = new ROCmInternalDevices();
   }
   return *self;
-
 }
 
-}
+}  // namespace
 
 //----------------------------------------------------------------------------
 
 class ROCmInternal {
-private:
+ private:
+  ROCmInternal(const ROCmInternal&);
+  ROCmInternal& operator=(const ROCmInternal&);
 
-  ROCmInternal( const ROCmInternal & );
-  ROCmInternal & operator = ( const ROCmInternal & );
+ public:
+  typedef Kokkos::Experimental::ROCm::size_type size_type;
 
-
-public:
-
-  typedef Kokkos::Experimental::ROCm::size_type size_type ;
-
-  int         m_rocmDev ;
-  int         m_rocmArch ;
-  unsigned    m_multiProcCount ;
-  unsigned    m_maxWorkgroup ;
-  unsigned    m_maxSharedWords ;
-  size_type   m_scratchSpaceCount ;
-  size_type   m_scratchFlagsCount ;
-  size_type * m_scratchSpace ;
-  size_type * m_scratchFlags ;
+  int m_rocmDev;
+  int m_rocmArch;
+  unsigned m_multiProcCount;
+  unsigned m_maxWorkgroup;
+  unsigned m_maxSharedWords;
+  size_type m_scratchSpaceCount;
+  size_type m_scratchFlagsCount;
+  size_type* m_scratchSpace;
+  size_type* m_scratchFlags;
 
   static int was_finalized;
 
-  static ROCmInternal & singleton();
+  static ROCmInternal& singleton();
 
-  int verify_is_initialized( const char * const label ) const ;
+  int verify_is_initialized(const char* const label) const;
 
-  int is_initialized() const
-    { return 0 != m_scratchSpace && 0 != m_scratchFlags ; }
+  int is_initialized() const {
+    return 0 != m_scratchSpace && 0 != m_scratchFlags;
+  }
 
-  void initialize( int rocm_device_id );
+  void initialize(int rocm_device_id);
   void finalize();
 
-  void print_configuration( std::ostream & ) const ;
-
+  void print_configuration(std::ostream&) const;
 
   ~ROCmInternal();
 
   ROCmInternal()
-    : m_rocmDev( -1 )
-    , m_rocmArch( -1 )
-    , m_multiProcCount( 0 )
-    , m_maxWorkgroup( 0 )
-    , m_maxSharedWords( 0 )
-    , m_scratchSpaceCount( 0 )
-    , m_scratchFlagsCount( 0 )
-    , m_scratchSpace( 0 )
-    , m_scratchFlags( 0 )
-    {}
+      : m_rocmDev(-1),
+        m_rocmArch(-1),
+        m_multiProcCount(0),
+        m_maxWorkgroup(0),
+        m_maxSharedWords(0),
+        m_scratchSpaceCount(0),
+        m_scratchFlagsCount(0),
+        m_scratchSpace(0),
+        m_scratchFlags(0) {}
 
-  size_type * scratch_space( const size_type size );
-  size_type * scratch_flags( const size_type size );
+  size_type* scratch_space(const size_type size);
+  size_type* scratch_flags(const size_type size);
 };
 
 int ROCmInternal::was_finalized = 0;
 //----------------------------------------------------------------------------
 
+void ROCmInternal::print_configuration(std::ostream& s) const {
+  const ROCmInternalDevices& dev_info = ROCmInternalDevices::singleton();
 
-void ROCmInternal::print_configuration( std::ostream & s ) const
-{
-  const ROCmInternalDevices & dev_info = ROCmInternalDevices::singleton();
-
-#if defined( KOKKOS_ENABLE_ROCM )
-    s << "macro  KOKKOS_ENABLE_ROCM      : defined" << std::endl ;
+#if defined(KOKKOS_ENABLE_ROCM)
+  s << "macro  KOKKOS_ENABLE_ROCM      : defined" << std::endl;
 #endif
-#if defined( __hcc_version__ )
-    s << "macro  __hcc_version__          = " << __hcc_version__
-      << std::endl ;
+#if defined(__hcc_version__)
+  s << "macro  __hcc_version__          = " << __hcc_version__ << std::endl;
 #endif
 
-  for ( int i = 0 ; i < dev_info.m_rocmDevCount ; ++i ) {
+  for (int i = 0; i < dev_info.m_rocmDevCount; ++i) {
     s << "Kokkos::Experimental::ROCm[ " << i << " ] "
-      << dev_info.m_rocmProp[i].name
-      << " version " << (dev_info.m_rocmProp[i].major) << "." << dev_info.m_rocmProp[i].minor
-      << ", Total Global Memory: " << human_memory_size(dev_info.m_rocmProp[i].totalGlobalMem)
-      << ", Shared Memory per Wavefront: " << human_memory_size(dev_info.m_rocmProp[i].sharedMemPerWavefront);
-    if ( m_rocmDev == i ) s << " : Selected" ;
-    s << std::endl ;
+      << dev_info.m_rocmProp[i].name << " version "
+      << (dev_info.m_rocmProp[i].major) << "." << dev_info.m_rocmProp[i].minor
+      << ", Total Global Memory: "
+      << human_memory_size(dev_info.m_rocmProp[i].totalGlobalMem)
+      << ", Shared Memory per Wavefront: "
+      << human_memory_size(dev_info.m_rocmProp[i].sharedMemPerWavefront);
+    if (m_rocmDev == i) s << " : Selected";
+    s << std::endl;
   }
 }
 
 //----------------------------------------------------------------------------
 
-ROCmInternal::~ROCmInternal()
-{
-  if ( m_scratchSpace ||
-       m_scratchFlags ) {
-    std::cerr << "Kokkos::Experimental::ROCm ERROR: Failed to call Kokkos::Experimental::ROCm::finalize()"
-              << std::endl ;
+ROCmInternal::~ROCmInternal() {
+  if (m_scratchSpace || m_scratchFlags) {
+    std::cerr << "Kokkos::Experimental::ROCm ERROR: Failed to call "
+                 "Kokkos::Experimental::ROCm::finalize()"
+              << std::endl;
     std::cerr.flush();
   }
 
-  m_rocmDev                 = -1 ;
-  m_rocmArch                = -1 ;
-  m_multiProcCount          = 0 ;
-  m_maxWorkgroup            = 0 ;
-  m_maxSharedWords          = 0 ;
-  m_scratchSpaceCount       = 0 ;
-  m_scratchFlagsCount       = 0 ;
-  m_scratchSpace            = 0 ;
-  m_scratchFlags            = 0 ;
+  m_rocmDev           = -1;
+  m_rocmArch          = -1;
+  m_multiProcCount    = 0;
+  m_maxWorkgroup      = 0;
+  m_maxSharedWords    = 0;
+  m_scratchSpaceCount = 0;
+  m_scratchFlagsCount = 0;
+  m_scratchSpace      = 0;
+  m_scratchFlags      = 0;
 }
 
-int ROCmInternal::verify_is_initialized( const char * const label ) const
-{
-  if ( m_rocmDev < 0 ) {
-    std::cerr << "Kokkos::Experimental::ROCm::" << label << " : ERROR device not initialized" << std::endl ;
+int ROCmInternal::verify_is_initialized(const char* const label) const {
+  if (m_rocmDev < 0) {
+    std::cerr << "Kokkos::Experimental::ROCm::" << label
+              << " : ERROR device not initialized" << std::endl;
   }
-  return 0 <= m_rocmDev ;
+  return 0 <= m_rocmDev;
 }
 
-ROCmInternal & ROCmInternal::singleton()
-{
-  static ROCmInternal* self = nullptr ;
+ROCmInternal& ROCmInternal::singleton() {
+  static ROCmInternal* self = nullptr;
   if (!self) {
     self = new ROCmInternal();
   }
-  return *self ;
-
+  return *self;
 }
 
-void ROCmInternal::initialize( int rocm_device_id  )
-{
-  if ( was_finalized ) Kokkos::abort("Calling ROCm::initialize after ROCm::finalize is illegal\n");
+void ROCmInternal::initialize(int rocm_device_id) {
+  if (was_finalized)
+    Kokkos::abort("Calling ROCm::initialize after ROCm::finalize is illegal\n");
 
-  if ( is_initialized() ) return;
+  if (is_initialized()) return;
 
   enum { WordSize = sizeof(size_type) };
 
-  if ( ! HostSpace::execution_space::is_initialized() ) {
-    const std::string msg("ROCm::initialize ERROR : HostSpace::execution_space is not initialized");
-    throw_runtime_exception( msg );
+  if (!HostSpace::execution_space::is_initialized()) {
+    const std::string msg(
+        "ROCm::initialize ERROR : HostSpace::execution_space is not "
+        "initialized");
+    throw_runtime_exception(msg);
   }
 
-  const ROCmInternalDevices & dev_info = ROCmInternalDevices::singleton();
+  const ROCmInternalDevices& dev_info = ROCmInternalDevices::singleton();
 
-  const bool ok_init = 0 == m_scratchSpace || 0 == m_scratchFlags ;
+  const bool ok_init = 0 == m_scratchSpace || 0 == m_scratchFlags;
 
-  const bool ok_id   = 1 <= rocm_device_id &&
-                            rocm_device_id < dev_info.m_rocmDevCount ;
+  const bool ok_id =
+      1 <= rocm_device_id && rocm_device_id < dev_info.m_rocmDevCount;
 
   // Need at least a GPU device
 
-  const bool ok_dev = ok_id &&
-    ( 1 <= dev_info.m_rocmProp[ rocm_device_id ].major &&
-      0 <= dev_info.m_rocmProp[ rocm_device_id ].minor );
-  if ( ok_init && ok_dev ) {
+  const bool ok_dev =
+      ok_id && (1 <= dev_info.m_rocmProp[rocm_device_id].major &&
+                0 <= dev_info.m_rocmProp[rocm_device_id].minor);
+  if (ok_init && ok_dev) {
+    const struct rocmDeviceProp& rocmProp = dev_info.m_rocmProp[rocm_device_id];
 
-    const struct rocmDeviceProp & rocmProp =
-      dev_info.m_rocmProp[ rocm_device_id ];
+    m_rocmDev = rocm_device_id;
 
-    m_rocmDev = rocm_device_id ;
-
-//  rocmSetDevice( m_rocmDev ) );
+    //  rocmSetDevice( m_rocmDev ) );
     Kokkos::Impl::rocm_device_synchronize();
 
-/*
-    // Query what compute capability architecture a kernel executes:
-    m_rocmArch = rocm_kernel_arch();
-    if ( m_rocmArch != rocmProp.major * 100 + rocmProp.minor * 10 ) {
-      std::cerr << "Kokkos::Experimental::ROCm::initialize WARNING: running kernels compiled for compute capability "
-                << ( m_rocmArch / 100 ) << "." << ( ( m_rocmArch % 100 ) / 10 )
-                << " on device with compute capability "
-                << rocmProp.major << "." << rocmProp.minor
-                << " , this will likely reduce potential performance."
-                << std::endl ;
-    }
-*/
+    /*
+        // Query what compute capability architecture a kernel executes:
+        m_rocmArch = rocm_kernel_arch();
+        if ( m_rocmArch != rocmProp.major * 100 + rocmProp.minor * 10 ) {
+          std::cerr << "Kokkos::Experimental::ROCm::initialize WARNING: running
+       kernels compiled for compute capability "
+                    << ( m_rocmArch / 100 ) << "." << ( ( m_rocmArch % 100 ) /
+       10 )
+                    << " on device with compute capability "
+                    << rocmProp.major << "." << rocmProp.minor
+                    << " , this will likely reduce potential performance."
+                    << std::endl ;
+        }
+    */
     // number of multiprocessors
 
-    m_multiProcCount = rocmProp.multiProcessorCount ;
+    m_multiProcCount = rocmProp.multiProcessorCount;
 
     //----------------------------------
     // Maximum number of wavefronts,
     // at most one workgroup per thread in a workgroup for reduction.
 
-
-    m_maxSharedWords = rocmProp.sharedMemPerWavefront/ WordSize ;
+    m_maxSharedWords = rocmProp.sharedMemPerWavefront / WordSize;
 
     //----------------------------------
     // Maximum number of Workgroups:
 
-    m_maxWorkgroup = 5*rocmProp.multiProcessorCount;  //TODO: confirm usage and value
+    m_maxWorkgroup =
+        5 * rocmProp.multiProcessorCount;  // TODO: confirm usage and value
 
     //----------------------------------
     // Multiblock reduction uses scratch flags for counters
@@ -493,186 +473,195 @@ void ROCmInternal::initialize( int rocm_device_id  )
     // Allocate some initial space.  This will grow as needed.
 
     {
-      const unsigned reduce_block_count = m_maxWorkgroup * Impl::ROCmTraits::WorkgroupSize ;
+      const unsigned reduce_block_count =
+          m_maxWorkgroup * Impl::ROCmTraits::WorkgroupSize;
 
-      (void) scratch_flags( reduce_block_count * 2  * sizeof(size_type) );
-      (void) scratch_space( reduce_block_count * 16 * sizeof(size_type) );
+      (void)scratch_flags(reduce_block_count * 2 * sizeof(size_type));
+      (void)scratch_space(reduce_block_count * 16 * sizeof(size_type));
     }
     //----------------------------------
 
-  }
-  else {
+  } else {
+    std::ostringstream msg;
+    msg << "Kokkos::Experimental::ROCm::initialize(" << rocm_device_id
+        << ") FAILED";
 
-    std::ostringstream msg ;
-    msg << "Kokkos::Experimental::ROCm::initialize(" << rocm_device_id << ") FAILED" ;
-
-    if ( ! ok_init ) {
-      msg << " : Already initialized" ;
+    if (!ok_init) {
+      msg << " : Already initialized";
     }
-    if ( ! ok_id ) {
+    if (!ok_id) {
       msg << " : Device identifier out of range "
-          << "[0.." << (dev_info.m_rocmDevCount-1) << "]" ;
-    }
-    else if ( ! ok_dev ) {
-      msg << " : Device " ;
-      msg << dev_info.m_rocmProp[ rocm_device_id ].major ;
-      msg << "." ;
-      msg << dev_info.m_rocmProp[ rocm_device_id ].minor ;
-      msg << " Need at least a GPU" ;
+          << "[0.." << (dev_info.m_rocmDevCount - 1) << "]";
+    } else if (!ok_dev) {
+      msg << " : Device ";
+      msg << dev_info.m_rocmProp[rocm_device_id].major;
+      msg << ".";
+      msg << dev_info.m_rocmProp[rocm_device_id].minor;
+      msg << " Need at least a GPU";
       msg << std::endl;
     }
-    Kokkos::Impl::throw_runtime_exception( msg.str() );
+    Kokkos::Impl::throw_runtime_exception(msg.str());
   }
 
-
   // Init the array for used for arbitrarily sized atomics
   Kokkos::Impl::init_lock_arrays_rocm_space();
 
-//  Kokkos::Impl::ROCmLockArraysStruct locks;
-//  locks.atomic = atomic_lock_array_rocm_space_ptr(false);
-//  locks.scratch = scratch_lock_array_rocm_space_ptr(false);
-//  locks.threadid = threadid_lock_array_rocm_space_ptr(false);
-//  rocmMemcpyToSymbol( kokkos_impl_rocm_lock_arrays , & locks , sizeof(ROCmLockArraysStruct) );
+  //  Kokkos::Impl::ROCmLockArraysStruct locks;
+  //  locks.atomic = atomic_lock_array_rocm_space_ptr(false);
+  //  locks.scratch = scratch_lock_array_rocm_space_ptr(false);
+  //  locks.threadid = threadid_lock_array_rocm_space_ptr(false);
+  //  rocmMemcpyToSymbol( kokkos_impl_rocm_lock_arrays , & locks ,
+  //  sizeof(ROCmLockArraysStruct) );
 }
 
 //----------------------------------------------------------------------------
 
-typedef Kokkos::Experimental::ROCm::size_type ScratchGrain[ Impl::ROCmTraits::WorkgroupSize ] ;
+typedef Kokkos::Experimental::ROCm::size_type
+    ScratchGrain[Impl::ROCmTraits::WorkgroupSize];
 enum { sizeScratchGrain = sizeof(ScratchGrain) };
 
-void rocmMemset(  Kokkos::Experimental::ROCm::size_type * ptr ,  Kokkos::Experimental::ROCm::size_type value , Kokkos::Experimental::ROCm::size_type size)
-{
-char * mptr = (char * ) ptr;
-/*   parallel_for_each(hc::extent<1>(size),
-                    [=, &ptr]
-                    (hc::index<1> idx) __HC__
-   {
-      int i = idx[0];
-      ptr[i] = value;
-   }).wait();*/
+void rocmMemset(Kokkos::Experimental::ROCm::size_type* ptr,
+                Kokkos::Experimental::ROCm::size_type value,
+                Kokkos::Experimental::ROCm::size_type size) {
+  char* mptr = (char*)ptr;
+  /*   parallel_for_each(hc::extent<1>(size),
+                      [=, &ptr]
+                      (hc::index<1> idx) __HC__
+     {
+        int i = idx[0];
+        ptr[i] = value;
+     }).wait();*/
 }
 
-Kokkos::Experimental::ROCm::size_type *
-ROCmInternal::scratch_flags( const Kokkos::Experimental::ROCm::size_type size )
-{
-  if ( verify_is_initialized("scratch_flags") && m_scratchFlagsCount * sizeScratchGrain < size ) {
+Kokkos::Experimental::ROCm::size_type* ROCmInternal::scratch_flags(
+    const Kokkos::Experimental::ROCm::size_type size) {
+  if (verify_is_initialized("scratch_flags") &&
+      m_scratchFlagsCount * sizeScratchGrain < size) {
+    m_scratchFlagsCount = (size + sizeScratchGrain - 1) / sizeScratchGrain;
 
+    typedef Kokkos::Impl::SharedAllocationRecord<
+        Kokkos::Experimental::ROCmSpace, void>
+        Record;
 
-    m_scratchFlagsCount = ( size + sizeScratchGrain - 1 ) / sizeScratchGrain ;
+    Record* const r = Record::allocate(
+        Kokkos::Experimental::ROCmSpace(), "InternalScratchFlags",
+        (sizeScratchGrain * m_scratchFlagsCount));
 
-    typedef Kokkos::Impl::SharedAllocationRecord< Kokkos::Experimental::ROCmSpace , void > Record ;
+    Record::increment(r);
 
-    Record * const r = Record::allocate( Kokkos::Experimental::ROCmSpace()
-                                       , "InternalScratchFlags"
-                                       , ( sizeScratchGrain  * m_scratchFlagsCount ) );
+    m_scratchFlags = reinterpret_cast<size_type*>(r->data());
 
-    Record::increment( r );
-
-    m_scratchFlags = reinterpret_cast<size_type *>( r->data() );
-
-    rocmMemset( m_scratchFlags , 0 , m_scratchFlagsCount * sizeScratchGrain );
+    rocmMemset(m_scratchFlags, 0, m_scratchFlagsCount * sizeScratchGrain);
   }
 
-  return m_scratchFlags ;
+  return m_scratchFlags;
 }
 
-Kokkos::Experimental::ROCm::size_type *
-ROCmInternal::scratch_space( const Kokkos::Experimental::ROCm::size_type size )
-{
-  if ( verify_is_initialized("scratch_space") && m_scratchSpaceCount * sizeScratchGrain < size ) {
+Kokkos::Experimental::ROCm::size_type* ROCmInternal::scratch_space(
+    const Kokkos::Experimental::ROCm::size_type size) {
+  if (verify_is_initialized("scratch_space") &&
+      m_scratchSpaceCount * sizeScratchGrain < size) {
+    m_scratchSpaceCount = (size + sizeScratchGrain - 1) / sizeScratchGrain;
 
-    m_scratchSpaceCount = ( size + sizeScratchGrain - 1 ) / sizeScratchGrain ;
+    typedef Kokkos::Impl::SharedAllocationRecord<
+        Kokkos::Experimental::ROCmSpace, void>
+        Record;
 
-     typedef Kokkos::Impl::SharedAllocationRecord< Kokkos::Experimental::ROCmSpace , void > Record ;
+    static Record* const r = Record::allocate(
+        Kokkos::Experimental::ROCmSpace(), "InternalScratchSpace",
+        (sizeScratchGrain * m_scratchSpaceCount));
 
-     static Record * const r = Record::allocate( Kokkos::Experimental::ROCmSpace()
-                                        , "InternalScratchSpace"
-                                        , ( sizeScratchGrain  * m_scratchSpaceCount ) );
+    Record::increment(r);
 
-     Record::increment( r );
-
-     m_scratchSpace = reinterpret_cast<size_type *>( r->data() );
+    m_scratchSpace = reinterpret_cast<size_type*>(r->data());
   }
 
-  return m_scratchSpace ;
+  return m_scratchSpace;
 }
 
 //----------------------------------------------------------------------------
 
-void ROCmInternal::finalize()
-{
+void ROCmInternal::finalize() {
   Kokkos::Impl::rocm_device_synchronize();
   was_finalized = 1;
-  if ( 0 != m_scratchSpace || 0 != m_scratchFlags ) {
+  if (0 != m_scratchSpace || 0 != m_scratchFlags) {
+    //    atomic_lock_array_rocm_space_ptr(false);
+    //    scratch_lock_array_rocm_space_ptr(false);
+    //    threadid_lock_array_rocm_space_ptr(false);
 
-//    atomic_lock_array_rocm_space_ptr(false);
-//    scratch_lock_array_rocm_space_ptr(false);
-//    threadid_lock_array_rocm_space_ptr(false);
+    typedef Kokkos::Impl::SharedAllocationRecord<
+        Kokkos::Experimental::ROCmSpace>
+        RecordROCm;
+    typedef Kokkos::Impl::SharedAllocationRecord<
+        Kokkos::Experimental::ROCmHostPinnedSpace>
+        RecordHost;
 
-    typedef Kokkos::Impl::SharedAllocationRecord< Kokkos::Experimental::ROCmSpace > RecordROCm ;
-    typedef Kokkos::Impl::SharedAllocationRecord< Kokkos::Experimental::ROCmHostPinnedSpace > RecordHost ;
+    RecordROCm::decrement(RecordROCm::get_record(m_scratchFlags));
+    RecordROCm::decrement(RecordROCm::get_record(m_scratchSpace));
 
-    RecordROCm::decrement( RecordROCm::get_record( m_scratchFlags ) );
-    RecordROCm::decrement( RecordROCm::get_record( m_scratchSpace ) );
-
-    m_rocmDev             = -1 ;
-    m_multiProcCount      = 0 ;
-    m_maxWorkgroup        = 0 ;
-    m_maxSharedWords      = 0 ;
-    m_scratchSpaceCount   = 0 ;
-    m_scratchFlagsCount   = 0 ;
-    m_scratchSpace        = 0 ;
-    m_scratchFlags        = 0 ;
+    m_rocmDev           = -1;
+    m_multiProcCount    = 0;
+    m_maxWorkgroup      = 0;
+    m_maxSharedWords    = 0;
+    m_scratchSpaceCount = 0;
+    m_scratchFlagsCount = 0;
+    m_scratchSpace      = 0;
+    m_scratchFlags      = 0;
   }
 }
 
 //----------------------------------------------------------------------------
 
-Kokkos::Experimental::ROCm::size_type rocm_internal_cu_count()
-{ return ROCmInternal::singleton().m_multiProcCount ; }
+Kokkos::Experimental::ROCm::size_type rocm_internal_cu_count() {
+  return ROCmInternal::singleton().m_multiProcCount;
+}
 
-Kokkos::Experimental::ROCm::size_type rocm_internal_maximum_extent_size()
-{ return ROCmInternal::singleton().m_maxWorkgroup ; }
+Kokkos::Experimental::ROCm::size_type rocm_internal_maximum_extent_size() {
+  return ROCmInternal::singleton().m_maxWorkgroup;
+}
 
-Kokkos::Experimental::ROCm::size_type rocm_internal_maximum_shared_words()
-{ return ROCmInternal::singleton().m_maxSharedWords ; }
+Kokkos::Experimental::ROCm::size_type rocm_internal_maximum_shared_words() {
+  return ROCmInternal::singleton().m_maxSharedWords;
+}
 
-Kokkos::Experimental::ROCm::size_type * rocm_internal_scratch_space( const Kokkos::Experimental::ROCm::size_type size )
-{ return ROCmInternal::singleton().scratch_space( size ); }
+Kokkos::Experimental::ROCm::size_type* rocm_internal_scratch_space(
+    const Kokkos::Experimental::ROCm::size_type size) {
+  return ROCmInternal::singleton().scratch_space(size);
+}
 
-Kokkos::Experimental::ROCm::size_type * rocm_internal_scratch_flags( const Kokkos::Experimental::ROCm::size_type size )
-{ return ROCmInternal::singleton().scratch_flags( size ); }
+Kokkos::Experimental::ROCm::size_type* rocm_internal_scratch_flags(
+    const Kokkos::Experimental::ROCm::size_type size) {
+  return ROCmInternal::singleton().scratch_flags(size);
+}
 
-
-
-} // namespace Impl
-} // namespace Kokkos
+}  // namespace Impl
+}  // namespace Kokkos
 
 //----------------------------------------------------------------------------
 
 namespace Kokkos {
 namespace Experimental {
 
-//ROCm::size_type ROCm::detect_device_count()
+// ROCm::size_type ROCm::detect_device_count()
 //{ return Impl::ROCmInternalDevices::singleton().m_rocmDevCount ; }
 
 int ROCm::concurrency() {
-#if defined(KOKKOS_ARCH_KAVERI) 
-  return 8*64*40;  // 20480 kaveri
+#if defined(KOKKOS_ARCH_KAVERI)
+  return 8 * 64 * 40;  // 20480 kaveri
 #else
-  return 32*8*40;  // 81920 fiji and hawaii
+  return 32 * 8 * 40;  // 81920 fiji and hawaii
 #endif
 }
-int ROCm::is_initialized()
-{ return Kokkos::Impl::ROCmInternal::singleton().is_initialized(); }
+int ROCm::is_initialized() {
+  return Kokkos::Impl::ROCmInternal::singleton().is_initialized();
+}
 
-void ROCm::initialize( const ROCm::SelectDevice config )
-{
-  Kokkos::Impl::ROCmInternal::singleton().initialize( config.rocm_device_id );
+void ROCm::initialize(const ROCm::SelectDevice config) {
+  Kokkos::Impl::ROCmInternal::singleton().initialize(config.rocm_device_id);
 
-  #if defined(KOKKOS_ENABLE_PROFILING)
-    Kokkos::Profiling::initialize();
-  #endif
+#if defined(KOKKOS_ENABLE_PROFILING)
+  Kokkos::Profiling::initialize();
+#endif
 }
 
 #if 0
@@ -696,52 +685,45 @@ ROCm::size_type ROCm::device_arch()
 }
 #endif
 
-void ROCm::finalize()
-{
+void ROCm::finalize() {
   Kokkos::Impl::ROCmInternal::singleton().finalize();
 
-  #if defined(KOKKOS_ENABLE_PROFILING)
-    Kokkos::Profiling::finalize();
-  #endif
+#if defined(KOKKOS_ENABLE_PROFILING)
+  Kokkos::Profiling::finalize();
+#endif
 }
 
-ROCm::ROCm()
-  : m_device( Kokkos::Impl::ROCmInternal::singleton().m_rocmDev )
-{
-  Kokkos::Impl::ROCmInternal::singleton().verify_is_initialized( "ROCm instance constructor" );
+ROCm::ROCm() : m_device(Kokkos::Impl::ROCmInternal::singleton().m_rocmDev) {
+  Kokkos::Impl::ROCmInternal::singleton().verify_is_initialized(
+      "ROCm instance constructor");
 }
 
 bool ROCm::isAPU(int device) {
-  const Kokkos::Impl::ROCmInternalDevices & dev_info = 
-              Kokkos::Impl::ROCmInternalDevices::singleton();
-  return (dev_info.m_rocmProp[device].APU);  
+  const Kokkos::Impl::ROCmInternalDevices& dev_info =
+      Kokkos::Impl::ROCmInternalDevices::singleton();
+  return (dev_info.m_rocmProp[device].APU);
 }
 
-bool ROCm::isAPU() {
-  return ROCm::isAPU(rocm_device());  
-}
+bool ROCm::isAPU() { return ROCm::isAPU(rocm_device()); }
 
-//ROCm::ROCm( const int instance_id )
+// ROCm::ROCm( const int instance_id )
 //  : m_device( Impl::ROCmInternal::singleton().m_rocmDev )
 //{}
 
-void ROCm::print_configuration( std::ostream & s , const bool )
-{ Kokkos::Impl::ROCmInternal::singleton().print_configuration( s ); }
-
-bool ROCm::sleep() { return false ; }
-
-bool ROCm::wake() { return true ; }
-
-void ROCm::fence()
-{
-  Kokkos::Impl::rocm_device_synchronize();
+void ROCm::print_configuration(std::ostream& s, const bool) {
+  Kokkos::Impl::ROCmInternal::singleton().print_configuration(s);
 }
 
+bool ROCm::sleep() { return false; }
+
+bool ROCm::wake() { return true; }
+
+void ROCm::fence() { Kokkos::Impl::rocm_device_synchronize(); }
+
 const char* ROCm::name() { return "ROCm"; }
 
-} // namespace Experimental
-} // namespace Kokkos
+}  // namespace Experimental
+}  // namespace Kokkos
 
-#endif // KOKKOS_ENABLE_ROCM
+#endif  // KOKKOS_ENABLE_ROCM
 //----------------------------------------------------------------------------
-
diff --git a/lib/kokkos/core/src/ROCm/Kokkos_ROCm_Invoke.hpp b/lib/kokkos/core/src/ROCm/Kokkos_ROCm_Invoke.hpp
index b18e5f61f1..989a4aec90 100644
--- a/lib/kokkos/core/src/ROCm/Kokkos_ROCm_Invoke.hpp
+++ b/lib/kokkos/core/src/ROCm/Kokkos_ROCm_Invoke.hpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -44,95 +45,82 @@
 #include <type_traits>
 #include <Kokkos_Macros.hpp>
 
-#if !defined( KOKKOS_ROCM_INVOKE_H )
+#if !defined(KOKKOS_ROCM_INVOKE_H)
 #define KOKKOS_ROCM_INVOKE_H
 
 namespace Kokkos {
 namespace Impl {
 
-template<class Tag, class F, class... Ts, typename std::enable_if<(!std::is_void<Tag>()), int>::type = 0>
-KOKKOS_INLINE_FUNCTION void rocm_invoke(F&& f, Ts&&... xs)
-{
+template <class Tag, class F, class... Ts,
+          typename std::enable_if<(!std::is_void<Tag>()), int>::type = 0>
+KOKKOS_INLINE_FUNCTION void rocm_invoke(F&& f, Ts&&... xs) {
   f(Tag(), static_cast<Ts&&>(xs)...);
 }
 
-template<class Tag, class F, class... Ts, typename std::enable_if<(std::is_void<Tag>()), int>::type = 0>
-KOKKOS_INLINE_FUNCTION void rocm_invoke(F&& f, Ts&&... xs)
-{
+template <class Tag, class F, class... Ts,
+          typename std::enable_if<(std::is_void<Tag>()), int>::type = 0>
+KOKKOS_INLINE_FUNCTION void rocm_invoke(F&& f, Ts&&... xs) {
   f(static_cast<Ts&&>(xs)...);
 }
 
+template <class F, class Tag = void>
+struct rocm_invoke_fn {
+  F* f;
+  rocm_invoke_fn(F& f_) : f(&f_) {}
 
-template<class F, class Tag=void>
-struct rocm_invoke_fn
-{
-    F* f;
-    rocm_invoke_fn(F& f_) : f(&f_)
-    {}
-
-    template<class... Ts>
-    KOKKOS_INLINE_FUNCTION void operator()(Ts&&... xs) const
-    {
-        rocm_invoke<Tag>(*f, static_cast<Ts&&>(xs)...);
-    }
+  template <class... Ts>
+  KOKKOS_INLINE_FUNCTION void operator()(Ts&&... xs) const {
+    rocm_invoke<Tag>(*f, static_cast<Ts&&>(xs)...);
+  }
 };
 
-template<class Tag, class F>
-KOKKOS_INLINE_FUNCTION rocm_invoke_fn<F, Tag> make_rocm_invoke_fn(F& f)
-{
-    return {f};
+template <class Tag, class F>
+KOKKOS_INLINE_FUNCTION rocm_invoke_fn<F, Tag> make_rocm_invoke_fn(F& f) {
+  return {f};
 }
 
-template<class T>
-KOKKOS_INLINE_FUNCTION T& rocm_unwrap(T& x)
-{
-    return x;
+template <class T>
+KOKKOS_INLINE_FUNCTION T& rocm_unwrap(T& x) {
+  return x;
 }
 
-template<class T>
-KOKKOS_INLINE_FUNCTION T& rocm_unwrap(std::reference_wrapper<T> x)
-{
-    return x;
+template <class T>
+KOKKOS_INLINE_FUNCTION T& rocm_unwrap(std::reference_wrapper<T> x) {
+  return x;
 }
 
-template<class F, class T>
-struct rocm_capture_fn
-{
-    F f;
-    T data;
+template <class F, class T>
+struct rocm_capture_fn {
+  F f;
+  T data;
 
-    KOKKOS_INLINE_FUNCTION rocm_capture_fn(F f_, T x) 
-    : f(f_), data(x)
-    {}
+  KOKKOS_INLINE_FUNCTION rocm_capture_fn(F f_, T x) : f(f_), data(x) {}
 
-    template<class... Ts>
-    KOKKOS_INLINE_FUNCTION void operator()(Ts&&... xs) const
-    {
-        f(rocm_unwrap(data), static_cast<Ts&&>(xs)...);
-    }
+  template <class... Ts>
+  KOKKOS_INLINE_FUNCTION void operator()(Ts&&... xs) const {
+    f(rocm_unwrap(data), static_cast<Ts&&>(xs)...);
+  }
 };
 
-template<class F, class T>
-KOKKOS_INLINE_FUNCTION rocm_capture_fn<F, T> rocm_capture(F f, T x)
-{
-    return {f, x};
+template <class F, class T>
+KOKKOS_INLINE_FUNCTION rocm_capture_fn<F, T> rocm_capture(F f, T x) {
+  return {f, x};
 }
 
-template<class F, class T, class U, class... Ts>
-KOKKOS_INLINE_FUNCTION auto rocm_capture(F f, T x, U y, Ts... xs) -> decltype(rocm_capture(rocm_capture(f, x), y, xs...))
-{
-    return rocm_capture(rocm_capture(f, x), y, xs...);
+template <class F, class T, class U, class... Ts>
+KOKKOS_INLINE_FUNCTION auto rocm_capture(F f, T x, U y, Ts... xs)
+    -> decltype(rocm_capture(rocm_capture(f, x), y, xs...)) {
+  return rocm_capture(rocm_capture(f, x), y, xs...);
 }
 
-struct rocm_apply_op
-{
-    template<class F, class... Ts>
-    KOKKOS_INLINE_FUNCTION void operator()(F&& f, Ts&&... xs) const
-    {
-        f(static_cast<Ts&&>(xs)...);
-    }
+struct rocm_apply_op {
+  template <class F, class... Ts>
+  KOKKOS_INLINE_FUNCTION void operator()(F&& f, Ts&&... xs) const {
+    f(static_cast<Ts&&>(xs)...);
+  }
 };
 
-}}
+}  // namespace Impl
+}  // namespace Kokkos
 
 #endif
diff --git a/lib/kokkos/core/src/ROCm/Kokkos_ROCm_Join.hpp b/lib/kokkos/core/src/ROCm/Kokkos_ROCm_Join.hpp
index eccba5119a..8968663c12 100644
--- a/lib/kokkos/core/src/ROCm/Kokkos_ROCm_Join.hpp
+++ b/lib/kokkos/core/src/ROCm/Kokkos_ROCm_Join.hpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -41,32 +42,29 @@
 //@HEADER
 */
 
-#if !defined( KOKKOS_ROCM_JOIN_H )
+#if !defined(KOKKOS_ROCM_JOIN_H)
 #define KOKKOS_ROCM_JOIN_H
 
 namespace Kokkos {
 namespace Impl {
 
-
 // Adaptor to use ValueJoin with standard algorithms
-template<class Joiner, class F>
-struct join_operator
-{
+template <class Joiner, class F>
+struct join_operator {
   const F* fp;
-  template<class T, class U>
-  T operator()(T x, const U& y) const
-  {
+  template <class T, class U>
+  T operator()(T x, const U& y) const {
     Joiner::join(*fp, &x, &y);
     return x;
   }
 };
 
-template<class Joiner, class F>
-join_operator<Joiner, F> make_join_operator(const F& f)
-{
+template <class Joiner, class F>
+join_operator<Joiner, F> make_join_operator(const F& f) {
   return join_operator<Joiner, F>{&f};
 }
 
-}}
+}  // namespace Impl
+}  // namespace Kokkos
 
 #endif
diff --git a/lib/kokkos/core/src/ROCm/Kokkos_ROCm_Parallel.hpp b/lib/kokkos/core/src/ROCm/Kokkos_ROCm_Parallel.hpp
index 48654555b2..4ebcdc6f95 100644
--- a/lib/kokkos/core/src/ROCm/Kokkos_ROCm_Parallel.hpp
+++ b/lib/kokkos/core/src/ROCm/Kokkos_ROCm_Parallel.hpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -51,232 +52,256 @@
 
 #include <KokkosExp_MDRangePolicy.hpp>
 
-
 namespace Kokkos {
 namespace Impl {
 
-struct ROCmTeamMember ;
+struct ROCmTeamMember;
 
-template< class ... Properties >
-class TeamPolicyInternal< Kokkos::Experimental::ROCm, Properties ... >: public PolicyTraits<Properties ...> {
-private:
-  int m_league_size ;
-  int m_team_size ;
-  int m_vector_length ;
-  int m_team_scratch_size[2] ;
-  int m_thread_scratch_size[2] ;
-  int m_chunk_size ;
+template <class... Properties>
+class TeamPolicyInternal<Kokkos::Experimental::ROCm, Properties...>
+    : public PolicyTraits<Properties...> {
+ private:
+  int m_league_size;
+  int m_team_size;
+  int m_vector_length;
+  int m_team_scratch_size[2];
+  int m_thread_scratch_size[2];
+  int m_chunk_size;
 
+ public:
+  using execution_policy = TeamPolicyInternal;
+  using execution_space  = Kokkos::Experimental::ROCm;
+  typedef PolicyTraits<Properties...> traits;
 
-public:
-
-  using execution_policy = TeamPolicyInternal ;
-  using execution_space  = Kokkos::Experimental::ROCm ;
-  typedef PolicyTraits<Properties ... > traits;
-
-  TeamPolicyInternal& operator = (const TeamPolicyInternal& p) {
-    m_league_size = p.m_league_size;
-    m_team_size = p.m_team_size;
-    m_vector_length = p.m_vector_length;
-    m_team_scratch_size[0] = p.m_team_scratch_size[0];
-    m_team_scratch_size[1] = p.m_team_scratch_size[1];
+  TeamPolicyInternal& operator=(const TeamPolicyInternal& p) {
+    m_league_size            = p.m_league_size;
+    m_team_size              = p.m_team_size;
+    m_vector_length          = p.m_vector_length;
+    m_team_scratch_size[0]   = p.m_team_scratch_size[0];
+    m_team_scratch_size[1]   = p.m_team_scratch_size[1];
     m_thread_scratch_size[0] = p.m_thread_scratch_size[0];
     m_thread_scratch_size[1] = p.m_thread_scratch_size[1];
-    m_chunk_size = p.m_chunk_size;
+    m_chunk_size             = p.m_chunk_size;
     return *this;
   }
 
-  template<class ExecSpace, class ... OtherProperties >
+  template <class ExecSpace, class... OtherProperties>
   friend class TeamPolicyInternal;
 
-  template< class ... OtherProperties >
-  TeamPolicyInternal(const TeamPolicyInternal<Kokkos::Experimental::ROCm,OtherProperties...>& p) {
-    m_league_size = p.m_league_size;
-    m_team_size = p.m_team_size;
-    m_vector_length = p.m_vector_length;
-    m_team_scratch_size[0] = p.m_team_scratch_size[0];
-    m_team_scratch_size[1] = p.m_team_scratch_size[1];
+  template <class... OtherProperties>
+  TeamPolicyInternal(const TeamPolicyInternal<Kokkos::Experimental::ROCm,
+                                              OtherProperties...>& p) {
+    m_league_size            = p.m_league_size;
+    m_team_size              = p.m_team_size;
+    m_vector_length          = p.m_vector_length;
+    m_team_scratch_size[0]   = p.m_team_scratch_size[0];
+    m_team_scratch_size[1]   = p.m_team_scratch_size[1];
     m_thread_scratch_size[0] = p.m_thread_scratch_size[0];
     m_thread_scratch_size[1] = p.m_thread_scratch_size[1];
-    m_chunk_size = p.m_chunk_size;
+    m_chunk_size             = p.m_chunk_size;
   }
 
   TeamPolicyInternal()
-    : m_league_size( 0 )
-    , m_team_size( 0 )
-    , m_vector_length( 0 )
-    , m_team_scratch_size {0,0}
-    , m_thread_scratch_size {0,0}
-    , m_chunk_size ( 64 )
-   {}
+      : m_league_size(0),
+        m_team_size(0),
+        m_vector_length(0),
+        m_team_scratch_size{0, 0},
+        m_thread_scratch_size{0, 0},
+        m_chunk_size(64) {}
 
-  TeamPolicyInternal( const int arg_league_size
-            , const int arg_team_size )
-    : m_league_size( arg_league_size ),
-      m_team_size( arg_team_size )
-    , m_team_scratch_size {0,0}
-    , m_thread_scratch_size {0,0}
-    , m_chunk_size ( 64 )
-    {}
+  TeamPolicyInternal(const int arg_league_size, const int arg_team_size)
+      : m_league_size(arg_league_size),
+        m_team_size(arg_team_size),
+        m_team_scratch_size{0, 0},
+        m_thread_scratch_size{0, 0},
+        m_chunk_size(64) {}
 
-  TeamPolicyInternal( const int arg_league_size
-            , const int arg_team_size
-            , const int vector_length_request=1)
-    : m_league_size( arg_league_size ),
-      m_team_size( arg_team_size ),
-      m_vector_length (vector_length_request)
-    , m_team_scratch_size {0,0}
-    , m_thread_scratch_size {0,0}
-    , m_chunk_size ( 64 )
-    {}
+  TeamPolicyInternal(const int arg_league_size, const int arg_team_size,
+                     const int vector_length_request = 1)
+      : m_league_size(arg_league_size),
+        m_team_size(arg_team_size),
+        m_vector_length(vector_length_request),
+        m_team_scratch_size{0, 0},
+        m_thread_scratch_size{0, 0},
+        m_chunk_size(64) {}
 
-  TeamPolicyInternal( const int arg_league_size
-            , const Kokkos::AUTO_t )
-    : m_league_size( arg_league_size ), m_team_size( -1 )
-    , m_team_scratch_size {0,0}
-    , m_thread_scratch_size {0,0}
-    , m_chunk_size ( 64 )
-    {}
+  TeamPolicyInternal(const int arg_league_size, const Kokkos::AUTO_t)
+      : m_league_size(arg_league_size),
+        m_team_size(-1),
+        m_team_scratch_size{0, 0},
+        m_thread_scratch_size{0, 0},
+        m_chunk_size(64) {}
 
-  TeamPolicyInternal( const int arg_league_size
-            , const Kokkos::AUTO_t
-            , const int vector_length_request)
-    : m_league_size( arg_league_size ),
-      m_team_size( -1 ),
-      m_vector_length (vector_length_request)
-    , m_team_scratch_size {0,0}
-    , m_thread_scratch_size {0,0}
-    , m_chunk_size ( 64 )
-    {}
+  TeamPolicyInternal(const int arg_league_size, const Kokkos::AUTO_t,
+                     const int vector_length_request)
+      : m_league_size(arg_league_size),
+        m_team_size(-1),
+        m_vector_length(vector_length_request),
+        m_team_scratch_size{0, 0},
+        m_thread_scratch_size{0, 0},
+        m_chunk_size(64) {}
 
-  inline int chunk_size() const { return m_chunk_size ; }
+  inline int chunk_size() const { return m_chunk_size; }
 
 #ifdef KOKKOS_ENABLE_DEPRECATED_CODE
   /** \brief set chunk_size to a discrete value*/
-  KOKKOS_INLINE_FUNCTION TeamPolicyInternal set_chunk_size(typename traits::index_type chunk_size_) const {
+  KOKKOS_INLINE_FUNCTION TeamPolicyInternal
+  set_chunk_size(typename traits::index_type chunk_size_) const {
     TeamPolicyInternal p = *this;
-    p.m_chunk_size = chunk_size_;
+    p.m_chunk_size       = chunk_size_;
     return p;
   }
 
-  /** \brief set per team scratch size for a specific level of the scratch hierarchy */
-  inline TeamPolicyInternal set_scratch_size(const int& level, const PerTeamValue& per_team) const {
-    TeamPolicyInternal p = *this;
+  /** \brief set per team scratch size for a specific level of the scratch
+   * hierarchy */
+  inline TeamPolicyInternal set_scratch_size(
+      const int& level, const PerTeamValue& per_team) const {
+    TeamPolicyInternal p         = *this;
     p.m_team_scratch_size[level] = per_team.value;
     return p;
   }
 
-  /** \brief set per thread scratch size for a specific level of the scratch hierarchy */
-  inline TeamPolicyInternal set_scratch_size(const int& level, const PerThreadValue& per_thread) const {
-    TeamPolicyInternal p = *this;
+  /** \brief set per thread scratch size for a specific level of the scratch
+   * hierarchy */
+  inline TeamPolicyInternal set_scratch_size(
+      const int& level, const PerThreadValue& per_thread) const {
+    TeamPolicyInternal p           = *this;
     p.m_thread_scratch_size[level] = per_thread.value;
     return p;
   }
 
-  /** \brief set per thread and per team scratch size for a specific level of the scratch hierarchy */
-  inline TeamPolicyInternal set_scratch_size(const int& level, const PerTeamValue& per_team, const PerThreadValue& per_thread) const {
-    TeamPolicyInternal p = *this;
-    p.m_team_scratch_size[level] = per_team.value;
+  /** \brief set per thread and per team scratch size for a specific level of
+   * the scratch hierarchy */
+  inline TeamPolicyInternal set_scratch_size(
+      const int& level, const PerTeamValue& per_team,
+      const PerThreadValue& per_thread) const {
+    TeamPolicyInternal p           = *this;
+    p.m_team_scratch_size[level]   = per_team.value;
     p.m_thread_scratch_size[level] = per_thread.value;
     return p;
   }
 #else
   /** \brief set chunk_size to a discrete value*/
-  inline TeamPolicyInternal& set_chunk_size(typename traits::index_type chunk_size_) {
+  inline TeamPolicyInternal& set_chunk_size(
+      typename traits::index_type chunk_size_) {
     m_chunk_size = chunk_size_;
     return *this;
   }
 
-  /** \brief set per team scratch size for a specific level of the scratch hierarchy */
-  inline TeamPolicyInternal& set_scratch_size(const int& level, const PerTeamValue& per_team) {
+  /** \brief set per team scratch size for a specific level of the scratch
+   * hierarchy */
+  inline TeamPolicyInternal& set_scratch_size(const int& level,
+                                              const PerTeamValue& per_team) {
     m_team_scratch_size[level] = per_team.value;
     return *this;
   }
 
-  /** \brief set per thread scratch size for a specific level of the scratch hierarchy */
-  inline TeamPolicyInternal& set_scratch_size(const int& level, const PerThreadValue& per_thread) {
+  /** \brief set per thread scratch size for a specific level of the scratch
+   * hierarchy */
+  inline TeamPolicyInternal& set_scratch_size(
+      const int& level, const PerThreadValue& per_thread) {
     m_thread_scratch_size[level] = per_thread.value;
     return *this;
   }
 
-  /** \brief set per thread and per team scratch size for a specific level of the scratch hierarchy */
-  inline TeamPolicyInternal& set_scratch_size(const int& level, const PerTeamValue& per_team, const PerThreadValue& per_thread) {
-    m_team_scratch_size[level] = per_team.value;
+  /** \brief set per thread and per team scratch size for a specific level of
+   * the scratch hierarchy */
+  inline TeamPolicyInternal& set_scratch_size(
+      const int& level, const PerTeamValue& per_team,
+      const PerThreadValue& per_thread) {
+    m_team_scratch_size[level]   = per_team.value;
     m_thread_scratch_size[level] = per_thread.value;
     return *this;
   }
 #endif
 
-protected:
+ protected:
 #ifdef KOKKOS_ENABLE_DEPRECATED_CODE
   /** \brief set chunk_size to a discrete value*/
-  inline TeamPolicyInternal internal_set_chunk_size(typename traits::index_type chunk_size_) {
+  inline TeamPolicyInternal internal_set_chunk_size(
+      typename traits::index_type chunk_size_) {
     m_chunk_size = chunk_size_;
     return *this;
   }
 
-  /** \brief set per team scratch size for a specific level of the scratch hierarchy */
-  inline TeamPolicyInternal internal_set_scratch_size(const int& level, const PerTeamValue& per_team) {
+  /** \brief set per team scratch size for a specific level of the scratch
+   * hierarchy */
+  inline TeamPolicyInternal internal_set_scratch_size(
+      const int& level, const PerTeamValue& per_team) {
     m_team_scratch_size[level] = per_team.value;
     return *this;
   }
 
-  /** \brief set per thread scratch size for a specific level of the scratch hierarchy */
-  inline TeamPolicyInternal internal_set_scratch_size(const int& level, const PerThreadValue& per_thread) {
+  /** \brief set per thread scratch size for a specific level of the scratch
+   * hierarchy */
+  inline TeamPolicyInternal internal_set_scratch_size(
+      const int& level, const PerThreadValue& per_thread) {
     m_thread_scratch_size[level] = per_thread.value;
     return *this;
   }
 
-  /** \brief set per thread and per team scratch size for a specific level of the scratch hierarchy */
-  inline TeamPolicyInternal internal_set_scratch_size(const int& level, const PerTeamValue& per_team, const PerThreadValue& per_thread) {
-    m_team_scratch_size[level] = per_team.value;
+  /** \brief set per thread and per team scratch size for a specific level of
+   * the scratch hierarchy */
+  inline TeamPolicyInternal internal_set_scratch_size(
+      const int& level, const PerTeamValue& per_team,
+      const PerThreadValue& per_thread) {
+    m_team_scratch_size[level]   = per_team.value;
     m_thread_scratch_size[level] = per_thread.value;
     return *this;
   }
 #endif
 
-public:
-// TODO:  evaluate proper team_size_max requirements
-  template< class Functor_Type>
-  KOKKOS_INLINE_FUNCTION static
-  int team_size_max( const Functor_Type & functor)
-  {
-    typedef typename Kokkos::Impl::FunctorValueTraits<Functor_Type, typename traits::work_tag>::value_type value_type;
+ public:
+  // TODO:  evaluate proper team_size_max requirements
+  template <class Functor_Type>
+  KOKKOS_INLINE_FUNCTION static int team_size_max(const Functor_Type& functor) {
+    typedef typename Kokkos::Impl::FunctorValueTraits<
+        Functor_Type, typename traits::work_tag>::value_type value_type;
     return team_size_recommended(functor);
-    // return std::min(Kokkos::Impl::get_max_tile_size() / sizeof(value_type), Kokkos::Impl::get_max_tile_thread());
+    // return std::min(Kokkos::Impl::get_max_tile_size() / sizeof(value_type),
+    // Kokkos::Impl::get_max_tile_thread());
   }
 
-  template< class Functor_Type>
-  KOKKOS_INLINE_FUNCTION static int team_size_recommended(const Functor_Type & functor)
-  { return Kokkos::Impl::get_tile_size<typename Kokkos::Impl::FunctorValueTraits<Functor_Type, typename traits::work_tag>::value_type>(); }
-
-  template< class Functor_Type >
-  KOKKOS_INLINE_FUNCTION static int team_size_recommended(const Functor_Type &functor, const int vector_length)
- {
-   int max = team_size_recommended( functor )/vector_length;
-   if(max < 1) max = 1;
-   return(max);
- }
-
-  template< class FunctorType , class PatternTypeTag>
-  int team_size_max( const FunctorType& functor, PatternTypeTag) {
-    return 256/vector_length();
-  }
-  template< class FunctorType , class PatternTypeTag>
-  int team_size_recommended( const FunctorType& functor, PatternTypeTag) {
-    return 128/vector_length();
+  template <class Functor_Type>
+  KOKKOS_INLINE_FUNCTION static int team_size_recommended(
+      const Functor_Type& functor) {
+    return Kokkos::Impl::get_tile_size<
+        typename Kokkos::Impl::FunctorValueTraits<
+            Functor_Type, typename traits::work_tag>::value_type>();
   }
 
-  template<class F>
-  KOKKOS_INLINE_FUNCTION int team_size(const F& f) const { return (m_team_size > 0) ? m_team_size : team_size_recommended(f); }
-  KOKKOS_INLINE_FUNCTION int team_size() const { return (m_team_size > 0) ? m_team_size : Impl::get_max_tile_thread(); ; }
-  KOKKOS_INLINE_FUNCTION int league_size() const { return m_league_size ; }
+  template <class Functor_Type>
+  KOKKOS_INLINE_FUNCTION static int team_size_recommended(
+      const Functor_Type& functor, const int vector_length) {
+    int max = team_size_recommended(functor) / vector_length;
+    if (max < 1) max = 1;
+    return (max);
+  }
 
+  template <class FunctorType, class PatternTypeTag>
+  int team_size_max(const FunctorType& functor, PatternTypeTag) {
+    return 256 / vector_length();
+  }
+  template <class FunctorType, class PatternTypeTag>
+  int team_size_recommended(const FunctorType& functor, PatternTypeTag) {
+    return 128 / vector_length();
+  }
 
-  inline int vector_length()   const { return m_vector_length ; }
+  template <class F>
+  KOKKOS_INLINE_FUNCTION int team_size(const F& f) const {
+    return (m_team_size > 0) ? m_team_size : team_size_recommended(f);
+  }
+  KOKKOS_INLINE_FUNCTION int team_size() const {
+    return (m_team_size > 0) ? m_team_size : Impl::get_max_tile_thread();
+    ;
+  }
+  KOKKOS_INLINE_FUNCTION int league_size() const { return m_league_size; }
+
+  inline int vector_length() const { return m_vector_length; }
   inline int scratch_size(int level, int team_size_ = -1) const {
-    if(team_size_<0) team_size_ = m_team_size;
-    return m_team_scratch_size[level] + team_size_*m_thread_scratch_size[level];
+    if (team_size_ < 0) team_size_ = m_team_size;
+    return m_team_scratch_size[level] +
+           team_size_ * m_thread_scratch_size[level];
   }
   inline size_t team_scratch_size(int level) const {
     return m_team_scratch_size[level];
@@ -286,330 +311,299 @@ public:
   }
 
   static int scratch_size_max(int level) {
-    return level==0 ? 
-      1024*40 : 1024*1204*20;
+    return level == 0 ? 1024 * 40 : 1024 * 1204 * 20;
   }
 
   typedef Impl::ROCmTeamMember member_type;
 };
 
-  struct ROCmTeamMember {
-    typedef Kokkos::Experimental::ROCm                             execution_space ;
-    typedef Kokkos::ScratchMemorySpace<Kokkos::Experimental::ROCm> scratch_memory_space ;
+struct ROCmTeamMember {
+  typedef Kokkos::Experimental::ROCm execution_space;
+  typedef Kokkos::ScratchMemorySpace<Kokkos::Experimental::ROCm>
+      scratch_memory_space;
 
-    KOKKOS_INLINE_FUNCTION
-    const scratch_memory_space & team_shmem() const 
-      { return m_team_shared.set_team_thread_mode(0,1,0); }
-    KOKKOS_INLINE_FUNCTION
-    const execution_space::scratch_memory_space & team_scratch(const int& level) const
-      { return m_team_shared.set_team_thread_mode(level,1,0) ; }
-    KOKKOS_INLINE_FUNCTION
-    const execution_space::scratch_memory_space & thread_scratch(const int& level) const
-      { return m_team_shared.set_team_thread_mode(level,
-                                             team_size(),
-                                             team_rank()) ; }
-
-
-    /* Rank of this team within the league of teams */
-    KOKKOS_INLINE_FUNCTION int league_rank() const { return m_idx.tile[0]; }
-    /* Number of teams in the league */
-    KOKKOS_INLINE_FUNCTION int league_size() const { return m_league_size; }
-    /* Rank of this thread within this team */
-    KOKKOS_INLINE_FUNCTION int team_rank() const { return m_idx.local[0] / m_vector_length; }
-    /* Rank of this thread within this thread */
-    KOKKOS_INLINE_FUNCTION int vector_rank() const { return m_idx.local[0] % m_vector_length; }
-    KOKKOS_INLINE_FUNCTION int lindex() const { return m_idx.local[0]; }
-    KOKKOS_INLINE_FUNCTION int gindex() const { return m_idx.global[0]; }
-    KOKKOS_INLINE_FUNCTION int tindex() const { return m_idx.tile[0]; }
-    KOKKOS_INLINE_FUNCTION int tile_dim() const { return m_idx.tile_dim[0]; }
-    KOKKOS_INLINE_FUNCTION int team_size() const { return m_team_size; }
-    KOKKOS_INLINE_FUNCTION int vector_length() const { return m_vector_length; }
-
-
-    KOKKOS_INLINE_FUNCTION
-    ROCmTeamMember( const hc::tiled_index< 1 > & arg_idx, int league_size_,int team_size_ )
-      : m_league_size( league_size_ )
-      , m_team_size( team_size_ )
-      , m_team_shared( nullptr, 0 )
-      , m_vector_length( 1 )
-      , m_idx( arg_idx )
-      {}
-
-    KOKKOS_INLINE_FUNCTION
-    ROCmTeamMember( const hc::tiled_index< 1 > & arg_idx, int league_size_,int team_size_, char * shared,  std::size_t shsize, std::size_t scratch_size0, char * scratch_ptr, std::size_t scratch_size1, std::size_t vector_length)
-      : m_league_size( league_size_ )
-      , m_team_size( team_size_ )
-      , m_team_shared( shared +  
-                          arg_idx.tile[0]*(shsize+scratch_size0), 
-                       (shsize+scratch_size0)*league_size_, 
-                       scratch_ptr + arg_idx.tile[0]*scratch_size1, 
-                       scratch_size1*league_size_)
-      , m_vector_length( vector_length )
-      , m_idx( arg_idx )
-      {}
-
-    KOKKOS_INLINE_FUNCTION
-    void team_barrier() const {
-      m_idx.barrier.wait();
-    }
-
-    template<class ValueType>
-    KOKKOS_INLINE_FUNCTION
-    void team_broadcast(const ValueType& value, const int& thread_id ) const 
-    {
-      static_assert(std::is_trivially_default_constructible<ValueType>(), "Only trivial constructible types can be broadcasted");
-      tile_static ValueType local_value;
-      zero_init(local_value);
-      if (this->team_rank() == thread_id) {
-        local_value = value;
-      }
-      this->team_barrier();
-      value = local_value;
-    }
-// Reduce across a team of threads.
-//
-// Each thread has vector_length elements.
-// This reduction is for TeamThreadRange operations, where the range
-// is spread across threads.  Effectively, there are vector_length
-// independent reduction operations.
-// This is different from a reduction across the elements of a thread,
-// which reduces every vector element.
-
-    template< class ValueType, class JoinOp >
-    KOKKOS_INLINE_FUNCTION
-    ValueType team_reduce( const ValueType & value , const JoinOp & op_in) const
-    {
-      typedef JoinLambdaAdapter<ValueType,JoinOp> JoinOpFunctor ;
-      const JoinOpFunctor op(op_in);
-
-      tile_static ValueType buffer[512];
-      const auto local = lindex();
-      const auto team  = team_rank();
-      auto vector_rank = local%m_vector_length;
-      auto thread_base = team*m_vector_length;
-
-      const std::size_t size = next_pow_2(m_team_size+1)/2;
-#if defined(ROCM15)
-      buffer[local] = value;
-#else
-        // ROCM 1.5 handles address spaces better, previous version didn't
-      lds_for(buffer[local], [&](ValueType& x)
-      {
-          x = value;
-      });
-#endif
-      m_idx.barrier.wait();
-
-      for(std::size_t s = 1; s < size; s *= 2)
-      {
-          const std::size_t index = 2 * s * team;
-          if (index < size)
-          {
-#if defined(ROCM15)
-                op.join(buffer[vector_rank+index*m_vector_length],
-                        buffer[vector_rank+(index+s)*m_vector_length]);
-#else
-              lds_for(buffer[vector_rank+index*m_vector_length], [&](ValueType& x)
-              {
-                  lds_for(buffer[vector_rank+(index+s)*m_vector_length],
-                                [&](ValueType& y)
-                  {
-                      op.join(x, y);
-                  });
-              });
-#endif
-          }
-          m_idx.barrier.wait();
-      }
-
-      if (local == 0)
-      {
-          for(int i=size*m_vector_length; i<m_team_size*m_vector_length; i+=m_vector_length)
-#if defined(ROCM15)
-              op.join(buffer[vector_rank], buffer[vector_rank+i]);
-#else
-              lds_for(buffer[vector_rank], [&](ValueType& x)
-              {
-                  lds_for(buffer[vector_rank+i],
-                                [&](ValueType& y)
-                  {
-                      op.join(x, y);
-                  });
-              });
-#endif
-      }
-      m_idx.barrier.wait();
-
-      return buffer[0];
-    }
-
-// Reduce across a team of threads, with a reducer data type
-//
-// Each thread has vector_length elements.
-// This reduction is for TeamThreadRange operations, where the range
-// is spread across threads.  Effectively, there are vector_length
-// independent reduction operations.
-// This is different from a reduction across the elements of a thread,
-// which reduces every vector element.
-
-    template< class ReducerType >
-    KOKKOS_INLINE_FUNCTION
-    typename std::enable_if< is_reducer< ReducerType >::value >::type
-    team_reduce( const ReducerType & reducer) const
-    {
-      typedef typename ReducerType::value_type value_type ;
-
-      tile_static value_type buffer[512];
-      const auto local = lindex();
-      const auto team  = team_rank();
-      auto vector_rank = local%m_vector_length;
-      auto thread_base = team*m_vector_length;
-
-      const std::size_t size = next_pow_2(m_team_size+1)/2;
-#if defined(ROCM15)
-      buffer[local] = reducer.reference();
-#else
-        // ROCM 1.5 handles address spaces better, previous version didn't
-      lds_for(buffer[local], [&](ValueType& x)
-      {
-          x = value;
-      });
-#endif
-      m_idx.barrier.wait();
-
-      for(std::size_t s = 1; s < size; s *= 2)
-      {
-          const std::size_t index = 2 * s * team;
-          if (index < size)
-          {
-#if defined(ROCM15)
-                reducer.join(buffer[vector_rank+index*m_vector_length],
-                        buffer[vector_rank+(index+s)*m_vector_length]);
-#else
-              lds_for(buffer[vector_rank+index*m_vector_length], [&](ValueType& x)
-              {
-                  lds_for(buffer[vector_rank+(index+s)*m_vector_length],
-                                [&](ValueType& y)
-                  {
-                      reducer.join(x, y);
-                  });
-              });
-#endif
-          }
-          m_idx.barrier.wait();
-      }
-
-      if (local == 0)
-      {
-          for(int i=size*m_vector_length; i<m_team_size*m_vector_length; i+=m_vector_length)
-#if defined(ROCM15)
-              reducer.join(buffer[vector_rank], buffer[vector_rank+i]);
-#else
-              lds_for(buffer[vector_rank], [&](ValueType& x)
-              {
-                  lds_for(buffer[vector_rank+i],
-                                [&](ValueType& y)
-                  {
-                      reducer.join(x, y);
-                  });
-              });
-#endif
-      }
-      m_idx.barrier.wait();
-      reducer.reference() = buffer[0];
-    }
-
-    /** \brief  Intra-team vector reduce 
-     *          with intra-team non-deterministic ordering accumulation.
-     *
-     *  The intra-team accumulation value will, at the end of the
-     *  league's parallel execution, be the reduction's total.
-     *  Parallel execution ordering of the league's teams is non-deterministic.
-     *  As such the base value for each team's vector reduce operation is
-     *  similarly non-deterministic.
-     */
-    template< class ValueType, class JoinOp >
-    KOKKOS_INLINE_FUNCTION
-    ValueType thread_reduce( const ValueType & value , const JoinOp & op_in) const
-    {
-      typedef JoinLambdaAdapter<ValueType,JoinOp> JoinOpFunctor ;
-      const JoinOpFunctor op(op_in);
-
-      const auto local = m_idx.local[0];
-      tile_static ValueType buffer[512];
-      const std::size_t size = m_vector_length; //vector length must be power of 2
-      auto vector_rank = local%m_vector_length;
-      auto thread_base = team_rank()*m_vector_length;
-      lds_for(buffer[local], [&](ValueType& x)
-      {
-          x = value;
-      });
-      m_idx.barrier.wait();
-      for(std::size_t s = 1; s < size; s *= 2)
-      {
-          const std::size_t index = 2 * s * vector_rank;
-          if (index < size)
-          {
-#if defined(ROCM15)
-              op.join(buffer[thread_base+index], buffer[thread_base+index+s]);
-#else
-
-              lds_for(buffer[thread_base+index], [&](ValueType& x)
-              {
-                  lds_for(buffer[thread_base+index+s], [&](ValueType& y)
-                  {
-                      op.join(x, y);
-                  });
-              });
-#endif
-          }
-          m_idx.barrier.wait();
-      }
-
-      m_idx.barrier.wait();
-      return buffer[thread_base];
-    }
-
-  template< typename ReducerType >
   KOKKOS_INLINE_FUNCTION
-  typename std::enable_if< is_reducer< ReducerType >::value >::type
-  vector_reduce( ReducerType const & reducer ) const
-    {
-      #ifdef __HCC_ACCELERATOR__
-      if(m_vector_length == 1) return;
+  const scratch_memory_space& team_shmem() const {
+    return m_team_shared.set_team_thread_mode(0, 1, 0);
+  }
+  KOKKOS_INLINE_FUNCTION
+  const execution_space::scratch_memory_space& team_scratch(
+      const int& level) const {
+    return m_team_shared.set_team_thread_mode(level, 1, 0);
+  }
+  KOKKOS_INLINE_FUNCTION
+  const execution_space::scratch_memory_space& thread_scratch(
+      const int& level) const {
+    return m_team_shared.set_team_thread_mode(level, team_size(), team_rank());
+  }
 
-      // Intra vector lane shuffle reduction:
-      typename ReducerType::value_type tmp ( reducer.reference() );
+  /* Rank of this team within the league of teams */
+  KOKKOS_INLINE_FUNCTION int league_rank() const { return m_idx.tile[0]; }
+  /* Number of teams in the league */
+  KOKKOS_INLINE_FUNCTION int league_size() const { return m_league_size; }
+  /* Rank of this thread within this team */
+  KOKKOS_INLINE_FUNCTION int team_rank() const {
+    return m_idx.local[0] / m_vector_length;
+  }
+  /* Rank of this thread within this thread */
+  KOKKOS_INLINE_FUNCTION int vector_rank() const {
+    return m_idx.local[0] % m_vector_length;
+  }
+  KOKKOS_INLINE_FUNCTION int lindex() const { return m_idx.local[0]; }
+  KOKKOS_INLINE_FUNCTION int gindex() const { return m_idx.global[0]; }
+  KOKKOS_INLINE_FUNCTION int tindex() const { return m_idx.tile[0]; }
+  KOKKOS_INLINE_FUNCTION int tile_dim() const { return m_idx.tile_dim[0]; }
+  KOKKOS_INLINE_FUNCTION int team_size() const { return m_team_size; }
+  KOKKOS_INLINE_FUNCTION int vector_length() const { return m_vector_length; }
 
-      for ( int i = m_vector_length ; ( i >>= 1 ) ; ) {
-        reducer.reference() = shfl_down( tmp , i , m_vector_length );
-        if ( (int)vector_rank() < i ) { reducer.join( tmp , reducer.reference() ); }
+  KOKKOS_INLINE_FUNCTION
+  ROCmTeamMember(const hc::tiled_index<1>& arg_idx, int league_size_,
+                 int team_size_)
+      : m_league_size(league_size_),
+        m_team_size(team_size_),
+        m_team_shared(nullptr, 0),
+        m_vector_length(1),
+        m_idx(arg_idx) {}
+
+  KOKKOS_INLINE_FUNCTION
+  ROCmTeamMember(const hc::tiled_index<1>& arg_idx, int league_size_,
+                 int team_size_, char* shared, std::size_t shsize,
+                 std::size_t scratch_size0, char* scratch_ptr,
+                 std::size_t scratch_size1, std::size_t vector_length)
+      : m_league_size(league_size_),
+        m_team_size(team_size_),
+        m_team_shared(shared + arg_idx.tile[0] * (shsize + scratch_size0),
+                      (shsize + scratch_size0) * league_size_,
+                      scratch_ptr + arg_idx.tile[0] * scratch_size1,
+                      scratch_size1 * league_size_),
+        m_vector_length(vector_length),
+        m_idx(arg_idx) {}
+
+  KOKKOS_INLINE_FUNCTION
+  void team_barrier() const { m_idx.barrier.wait(); }
+
+  template <class ValueType>
+  KOKKOS_INLINE_FUNCTION void team_broadcast(const ValueType& value,
+                                             const int& thread_id) const {
+    static_assert(std::is_trivially_default_constructible<ValueType>(),
+                  "Only trivial constructible types can be broadcasted");
+    tile_static ValueType local_value;
+    zero_init(local_value);
+    if (this->team_rank() == thread_id) {
+      local_value = value;
+    }
+    this->team_barrier();
+    value = local_value;
+  }
+  // Reduce across a team of threads.
+  //
+  // Each thread has vector_length elements.
+  // This reduction is for TeamThreadRange operations, where the range
+  // is spread across threads.  Effectively, there are vector_length
+  // independent reduction operations.
+  // This is different from a reduction across the elements of a thread,
+  // which reduces every vector element.
+
+  template <class ValueType, class JoinOp>
+  KOKKOS_INLINE_FUNCTION ValueType team_reduce(const ValueType& value,
+                                               const JoinOp& op_in) const {
+    typedef JoinLambdaAdapter<ValueType, JoinOp> JoinOpFunctor;
+    const JoinOpFunctor op(op_in);
+
+    tile_static ValueType buffer[512];
+    const auto local = lindex();
+    const auto team  = team_rank();
+    auto vector_rank = local % m_vector_length;
+    auto thread_base = team * m_vector_length;
+
+    const std::size_t size = next_pow_2(m_team_size + 1) / 2;
+#if defined(ROCM15)
+    buffer[local] = value;
+#else
+    // ROCM 1.5 handles address spaces better, previous version didn't
+    lds_for(buffer[local], [&](ValueType& x) { x = value; });
+#endif
+    m_idx.barrier.wait();
+
+    for (std::size_t s = 1; s < size; s *= 2) {
+      const std::size_t index = 2 * s * team;
+      if (index < size) {
+#if defined(ROCM15)
+        op.join(buffer[vector_rank + index * m_vector_length],
+                buffer[vector_rank + (index + s) * m_vector_length]);
+#else
+        lds_for(buffer[vector_rank + index * m_vector_length],
+                [&](ValueType& x) {
+                  lds_for(buffer[vector_rank + (index + s) * m_vector_length],
+                          [&](ValueType& y) { op.join(x, y); });
+                });
+#endif
       }
-
-      // Broadcast from root lane to all other lanes.
-      // Cannot use "butterfly" algorithm to avoid the broadcast
-      // because floating point summation is not associative
-      // and thus different threads could have different results.
-
-      reducer.reference() = shfl( tmp , 0 , m_vector_length );
-      #endif
+      m_idx.barrier.wait();
     }
 
+    if (local == 0) {
+      for (int i = size * m_vector_length; i < m_team_size * m_vector_length;
+           i += m_vector_length)
+#if defined(ROCM15)
+        op.join(buffer[vector_rank], buffer[vector_rank + i]);
+#else
+        lds_for(buffer[vector_rank], [&](ValueType& x) {
+          lds_for(buffer[vector_rank + i],
+                  [&](ValueType& y) { op.join(x, y); });
+        });
+#endif
+    }
+    m_idx.barrier.wait();
 
+    return buffer[0];
+  }
 
-    /** \brief  Intra-team exclusive prefix sum with team_rank() ordering
-     *          with intra-team non-deterministic ordering accumulation.
-     *
-     *  The global inter-team accumulation value will, at the end of the
-     *  league's parallel execution, be the scan's total.
-     *  Parallel execution ordering of the league's teams is non-deterministic.
-     *  As such the base value for each team's scan operation is similarly
-     *  non-deterministic.
-     */
-    template< typename Type >
-    KOKKOS_INLINE_FUNCTION Type team_scan( const Type & value , Type * const global_accum = nullptr ) const
-    {
-  #if 0
+  // Reduce across a team of threads, with a reducer data type
+  //
+  // Each thread has vector_length elements.
+  // This reduction is for TeamThreadRange operations, where the range
+  // is spread across threads.  Effectively, there are vector_length
+  // independent reduction operations.
+  // This is different from a reduction across the elements of a thread,
+  // which reduces every vector element.
+
+  template <class ReducerType>
+  KOKKOS_INLINE_FUNCTION
+      typename std::enable_if<is_reducer<ReducerType>::value>::type
+      team_reduce(const ReducerType& reducer) const {
+    typedef typename ReducerType::value_type value_type;
+
+    tile_static value_type buffer[512];
+    const auto local = lindex();
+    const auto team  = team_rank();
+    auto vector_rank = local % m_vector_length;
+    auto thread_base = team * m_vector_length;
+
+    const std::size_t size = next_pow_2(m_team_size + 1) / 2;
+#if defined(ROCM15)
+    buffer[local] = reducer.reference();
+#else
+    // ROCM 1.5 handles address spaces better, previous version didn't
+    lds_for(buffer[local], [&](ValueType& x) { x = value; });
+#endif
+    m_idx.barrier.wait();
+
+    for (std::size_t s = 1; s < size; s *= 2) {
+      const std::size_t index = 2 * s * team;
+      if (index < size) {
+#if defined(ROCM15)
+        reducer.join(buffer[vector_rank + index * m_vector_length],
+                     buffer[vector_rank + (index + s) * m_vector_length]);
+#else
+        lds_for(buffer[vector_rank + index * m_vector_length],
+                [&](ValueType& x) {
+                  lds_for(buffer[vector_rank + (index + s) * m_vector_length],
+                          [&](ValueType& y) { reducer.join(x, y); });
+                });
+#endif
+      }
+      m_idx.barrier.wait();
+    }
+
+    if (local == 0) {
+      for (int i = size * m_vector_length; i < m_team_size * m_vector_length;
+           i += m_vector_length)
+#if defined(ROCM15)
+        reducer.join(buffer[vector_rank], buffer[vector_rank + i]);
+#else
+        lds_for(buffer[vector_rank], [&](ValueType& x) {
+          lds_for(buffer[vector_rank + i],
+                  [&](ValueType& y) { reducer.join(x, y); });
+        });
+#endif
+    }
+    m_idx.barrier.wait();
+    reducer.reference() = buffer[0];
+  }
+
+  /** \brief  Intra-team vector reduce
+   *          with intra-team non-deterministic ordering accumulation.
+   *
+   *  The intra-team accumulation value will, at the end of the
+   *  league's parallel execution, be the reduction's total.
+   *  Parallel execution ordering of the league's teams is non-deterministic.
+   *  As such the base value for each team's vector reduce operation is
+   *  similarly non-deterministic.
+   */
+  template <class ValueType, class JoinOp>
+  KOKKOS_INLINE_FUNCTION ValueType thread_reduce(const ValueType& value,
+                                                 const JoinOp& op_in) const {
+    typedef JoinLambdaAdapter<ValueType, JoinOp> JoinOpFunctor;
+    const JoinOpFunctor op(op_in);
+
+    const auto local = m_idx.local[0];
+    tile_static ValueType buffer[512];
+    const std::size_t size =
+        m_vector_length;  // vector length must be power of 2
+    auto vector_rank = local % m_vector_length;
+    auto thread_base = team_rank() * m_vector_length;
+    lds_for(buffer[local], [&](ValueType& x) { x = value; });
+    m_idx.barrier.wait();
+    for (std::size_t s = 1; s < size; s *= 2) {
+      const std::size_t index = 2 * s * vector_rank;
+      if (index < size) {
+#if defined(ROCM15)
+        op.join(buffer[thread_base + index], buffer[thread_base + index + s]);
+#else
+
+        lds_for(buffer[thread_base + index], [&](ValueType& x) {
+          lds_for(buffer[thread_base + index + s],
+                  [&](ValueType& y) { op.join(x, y); });
+        });
+#endif
+      }
+      m_idx.barrier.wait();
+    }
+
+    m_idx.barrier.wait();
+    return buffer[thread_base];
+  }
+
+  template <typename ReducerType>
+  KOKKOS_INLINE_FUNCTION
+      typename std::enable_if<is_reducer<ReducerType>::value>::type
+      vector_reduce(ReducerType const& reducer) const {
+#ifdef __HCC_ACCELERATOR__
+    if (m_vector_length == 1) return;
+
+    // Intra vector lane shuffle reduction:
+    typename ReducerType::value_type tmp(reducer.reference());
+
+    for (int i = m_vector_length; (i >>= 1);) {
+      reducer.reference() = shfl_down(tmp, i, m_vector_length);
+      if ((int)vector_rank() < i) {
+        reducer.join(tmp, reducer.reference());
+      }
+    }
+
+    // Broadcast from root lane to all other lanes.
+    // Cannot use "butterfly" algorithm to avoid the broadcast
+    // because floating point summation is not associative
+    // and thus different threads could have different results.
+
+    reducer.reference() = shfl(tmp, 0, m_vector_length);
+#endif
+  }
+
+  /** \brief  Intra-team exclusive prefix sum with team_rank() ordering
+   *          with intra-team non-deterministic ordering accumulation.
+   *
+   *  The global inter-team accumulation value will, at the end of the
+   *  league's parallel execution, be the scan's total.
+   *  Parallel execution ordering of the league's teams is non-deterministic.
+   *  As such the base value for each team's scan operation is similarly
+   *  non-deterministic.
+   */
+  template <typename Type>
+  KOKKOS_INLINE_FUNCTION Type
+  team_scan(const Type& value, Type* const global_accum = nullptr) const {
+#if 0
       const auto local = m_idx.local[0];
       const auto last = m_team_size - 1;
       const auto init = 0;
@@ -638,63 +632,57 @@ public:
       m_idx.barrier.wait();
       return buffer[local];
 #else
-      tile_static Type sarray[2][256+1];
-      int lid = m_idx.local[0];
-      int lp1 = lid+1;
+    tile_static Type sarray[2][256 + 1];
+    int lid = m_idx.local[0];
+    int lp1 = lid + 1;
 
-      int toggle = 1;
-      int _toggle = 0;
-      m_idx.barrier.wait();
+    int toggle  = 1;
+    int _toggle = 0;
+    m_idx.barrier.wait();
 
-      if(lid == 0) 
-      {
-         sarray[1][0] = 0;
-         sarray[0][0] = 0;
+    if (lid == 0) {
+      sarray[1][0] = 0;
+      sarray[0][0] = 0;
+    }
+    sarray[1][lp1] = value;
+
+    m_idx.barrier.wait();
+    for (int stride = 1; stride < m_team_size; stride *= 2) {
+      if (lid >= stride) {
+        sarray[_toggle][lp1] =
+            sarray[toggle][lp1] + sarray[toggle][lp1 - stride];
+      } else {
+        sarray[_toggle][lp1] = sarray[toggle][lp1];
       }
-      sarray[1][lp1] = value;
-
+      toggle  = _toggle;
+      _toggle = 1 - toggle;
       m_idx.barrier.wait();
-      for(int stride = 1; stride < m_team_size; stride*=2)
-      {
-         if(lid >= stride)
-         {
-            sarray[_toggle][lp1] =
-                          sarray[toggle][lp1]+sarray[toggle][lp1-stride];
-         }
-         else
-         {
-            sarray[_toggle][lp1] = sarray[toggle][lp1];
-         }
-         toggle = _toggle;
-         _toggle = 1-toggle;
-         m_idx.barrier.wait();
-      }
-
-      if ( global_accum )
-      { 
-         if(m_team_size == lp1)
-         {
-            sarray[toggle][m_team_size] = atomic_fetch_add(global_accum,sarray[toggle][m_team_size]);
-         }
-         m_idx.barrier.wait();
-         sarray[toggle][lid] += sarray[toggle][m_team_size];
-      }
-      m_idx.barrier.wait();
-      return sarray[toggle][lid];
-#endif
     }
 
-  private:
-    int m_league_size ;
-    int m_team_size ;
-    const scratch_memory_space  m_team_shared;
+    if (global_accum) {
+      if (m_team_size == lp1) {
+        sarray[toggle][m_team_size] =
+            atomic_fetch_add(global_accum, sarray[toggle][m_team_size]);
+      }
+      m_idx.barrier.wait();
+      sarray[toggle][lid] += sarray[toggle][m_team_size];
+    }
+    m_idx.barrier.wait();
+    return sarray[toggle][lid];
+#endif
+  }
 
-  public:
-    int m_vector_length;
-    hc::tiled_index<1> m_idx;
-  };
-}
-} // namespace Kokkos
+ private:
+  int m_league_size;
+  int m_team_size;
+  const scratch_memory_space m_team_shared;
+
+ public:
+  int m_vector_length;
+  hc::tiled_index<1> m_idx;
+};
+}  // namespace Impl
+}  // namespace Kokkos
 #include <ROCm/Kokkos_ROCm_ReduceScan.hpp>
 
 namespace Kokkos {
@@ -702,624 +690,582 @@ namespace Impl {
 
 //----------------------------------------------------------------------------
 
-template< class FunctorType , class... Traits >
-class ParallelFor< FunctorType
-                 , Kokkos::RangePolicy< Traits... >, Kokkos::Experimental::ROCm >
-{
-private:
+template <class FunctorType, class... Traits>
+class ParallelFor<FunctorType, Kokkos::RangePolicy<Traits...>,
+                  Kokkos::Experimental::ROCm> {
+ private:
+  typedef Kokkos::RangePolicy<Traits...> Policy;
 
-  typedef Kokkos::RangePolicy< Traits... > Policy ;
-
-public:
-
-  inline
-  ParallelFor( const FunctorType & f
-             , const Policy      & policy )
-    {
-
-
-      const auto len = policy.end()-policy.begin();
-      const auto offset = policy.begin();
-      if(len == 0) return;
-// define a lambda to work around a compiler issue.  The compiler does not
-// properly dereference f inside the pfe.
-auto foo = [=](size_t i){rocm_invoke<typename Policy::work_tag>(f, i);};
+ public:
+  inline ParallelFor(const FunctorType& f, const Policy& policy) {
+    const auto len    = policy.end() - policy.begin();
+    const auto offset = policy.begin();
+    if (len == 0) return;
+    // define a lambda to work around a compiler issue.  The compiler does not
+    // properly dereference f inside the pfe.
+    auto foo = [=](size_t i) { rocm_invoke<typename Policy::work_tag>(f, i); };
 
 #if __hcc_workweek__ > 16600
-      hc::parallel_for_each(hc::extent<1>(len) , [=](const hc::index<1> & idx) [[hc]]  [[hc_max_workgroup_dim(1024,1,1)]]
+    hc::parallel_for_each(
+        hc::extent<1>(len),
+        [=](const hc::index<1>& idx) [[hc]] [[hc_max_workgroup_dim(1024, 1, 1)]]
 #else
-      hc::parallel_for_each(hc::extent<1>(len).tile(256) , [=](const hc::index<1> & idx) [[hc]]
+    hc::parallel_for_each(
+        hc::extent<1>(len).tile(256),
+        [=](const hc::index<1>& idx) [[hc]]
 #endif
-      {
-        if(idx[0]<len)  // workaround for Carrizo (and Fiji?)
-          foo(idx[0] + offset);
-      }).wait();
-
-    }
+        {
+          if (idx[0] < len)  // workaround for Carrizo (and Fiji?)
+            foo(idx[0] + offset);
+        })
+        .wait();
+  }
 
   KOKKOS_INLINE_FUNCTION
   void execute() const {}
-
 };
 
 // MDRangePolicy impl
-template< class FunctorType , class ... Traits >
-class ParallelFor< FunctorType
-                 , Kokkos::MDRangePolicy< Traits ... >
-                 , Kokkos::Experimental::ROCm
-                 >
-{
-private:
-  typedef Kokkos::MDRangePolicy< Traits ...  > Policy ;
+template <class FunctorType, class... Traits>
+class ParallelFor<FunctorType, Kokkos::MDRangePolicy<Traits...>,
+                  Kokkos::Experimental::ROCm> {
+ private:
+  typedef Kokkos::MDRangePolicy<Traits...> Policy;
   using RP = Policy;
   typedef typename Policy::array_index_type array_index_type;
   typedef typename Policy::index_type index_type;
   typedef typename Policy::launch_bounds LaunchBounds;
 
+  const FunctorType m_functor;
+  const Policy m_rp;
 
-  const FunctorType m_functor ;
-  const Policy      m_rp ;
+ public:
+  KOKKOS_INLINE_FUNCTION
+  void operator()(void) const {
+    Kokkos::Impl::Refactor::DeviceIterateTile<Policy::rank, Policy, FunctorType,
+                                              typename Policy::work_tag>(
+        m_rp, m_functor)
+        .exec_range();
+  }
 
-public:
-
-  KOKKOS_INLINE_FUNCTION 
-  void operator()(void) const
-    {
-       Kokkos::Impl::Refactor::DeviceIterateTile<Policy::rank,Policy,FunctorType,typename Policy::work_tag>(m_rp,m_functor).exec_range();
-    }
-
-
-  inline
-  void execute() const
-  {
-    const array_index_type maxblocks = static_cast<array_index_type>(Kokkos::Impl::ROCmTraits::UpperBoundExtentCount);
-    if ( RP::rank == 2 )
-    {
-      const dim3 block( m_rp.m_tile[0] , m_rp.m_tile[1] , 1);
-      const dim3 grid(
-            std::min( m_rp.m_upper[0] - m_rp.m_lower[0] , maxblocks )
-          , std::min( m_rp.m_upper[1] - m_rp.m_lower[1] , maxblocks )
-          , 1 );
-      ROCmParallelLaunch< ParallelFor, LaunchBounds >( *this, grid, block, 0);
-    }
-    else if ( RP::rank == 3 )
-    {
-      const dim3 block( m_rp.m_tile[0] , m_rp.m_tile[1] , m_rp.m_tile[2] );
-      const dim3 grid(
-            std::min( m_rp.m_upper[0] - m_rp.m_lower[0] , maxblocks )
-          , std::min( m_rp.m_upper[1] - m_rp.m_lower[1] , maxblocks )
-          , std::min( m_rp.m_upper[2] - m_rp.m_lower[2] , maxblocks ));
-      ROCmParallelLaunch< ParallelFor, LaunchBounds >( *this, grid, block, 0);
-    }
-    else if ( RP::rank == 4 )
-    {
-      // id0,id1 encoded within threadIdx.x; id2 to threadIdx.y; id3 to threadIdx.z
-      const dim3 block( m_rp.m_tile[0]*m_rp.m_tile[1] , m_rp.m_tile[2] , m_rp.m_tile[3] );
-      const dim3 grid(
-          std::min(  m_rp.m_tile_end[0] * m_rp.m_tile_end[1] *
-              m_rp.m_tile[0] * m_rp.m_tile[1] , maxblocks )
-        , std::min( m_rp.m_upper[2] - m_rp.m_lower[2] , maxblocks )
-        , std::min( m_rp.m_upper[3] - m_rp.m_lower[3] , maxblocks ));
-      ROCmParallelLaunch< ParallelFor, LaunchBounds >( *this, grid, block, 0);
-    }
-    else if ( RP::rank == 5 )
-    {
-      // id0,id1 encoded within threadIdx.x; id2,id3 to threadIdx.y; id4 to threadIdx.z
-      const dim3 block( m_rp.m_tile[0]*m_rp.m_tile[1] , m_rp.m_tile[2]*m_rp.m_tile[3] , m_rp.m_tile[4] );
-      const dim3 grid(
-          std::min(  m_rp.m_tile_end[0] * m_rp.m_tile_end[1] *
-              m_rp.m_tile[0] * m_rp.m_tile[1] , maxblocks )
-        , std::min(  m_rp.m_tile_end[2] * m_rp.m_tile_end[3] *
-              m_rp.m_tile[2] * m_rp.m_tile[3] , maxblocks )
-        , std::min(  m_rp.m_upper[4] - m_rp.m_lower[4] , maxblocks ));
-      ROCmParallelLaunch< ParallelFor, LaunchBounds >( *this, grid, block, 0);
-    }
-    else if ( RP::rank == 6 )
-    {
-      // id0,id1 encoded within threadIdx.x; id2,id3 to threadIdx.y; id4,id5 to threadIdx.z
-      const dim3 block( m_rp.m_tile[0]*m_rp.m_tile[1] , m_rp.m_tile[2]*m_rp.m_tile[3] , m_rp.m_tile[4]*m_rp.m_tile[5] );
-      const dim3 grid(
-          std::min(  m_rp.m_tile_end[0] * m_rp.m_tile_end[1] *
-              m_rp.m_tile[0] * m_rp.m_tile[1] , maxblocks )
-        , std::min(  m_rp.m_tile_end[2] * m_rp.m_tile_end[3] *
-              m_rp.m_tile[2] * m_rp.m_tile[3] , maxblocks )
-        , std::min(  m_rp.m_tile_end[4] * m_rp.m_tile_end[5] *
-              m_rp.m_tile[4] * m_rp.m_tile[5] , maxblocks ));
-      ROCmParallelLaunch< ParallelFor, LaunchBounds >( *this, grid, block, 0);
-    }
-    else
-    {
+  inline void execute() const {
+    const array_index_type maxblocks = static_cast<array_index_type>(
+        Kokkos::Impl::ROCmTraits::UpperBoundExtentCount);
+    if (RP::rank == 2) {
+      const dim3 block(m_rp.m_tile[0], m_rp.m_tile[1], 1);
+      const dim3 grid(std::min(m_rp.m_upper[0] - m_rp.m_lower[0], maxblocks),
+                      std::min(m_rp.m_upper[1] - m_rp.m_lower[1], maxblocks),
+                      1);
+      ROCmParallelLaunch<ParallelFor, LaunchBounds>(*this, grid, block, 0);
+    } else if (RP::rank == 3) {
+      const dim3 block(m_rp.m_tile[0], m_rp.m_tile[1], m_rp.m_tile[2]);
+      const dim3 grid(std::min(m_rp.m_upper[0] - m_rp.m_lower[0], maxblocks),
+                      std::min(m_rp.m_upper[1] - m_rp.m_lower[1], maxblocks),
+                      std::min(m_rp.m_upper[2] - m_rp.m_lower[2], maxblocks));
+      ROCmParallelLaunch<ParallelFor, LaunchBounds>(*this, grid, block, 0);
+    } else if (RP::rank == 4) {
+      // id0,id1 encoded within threadIdx.x; id2 to threadIdx.y; id3 to
+      // threadIdx.z
+      const dim3 block(m_rp.m_tile[0] * m_rp.m_tile[1], m_rp.m_tile[2],
+                       m_rp.m_tile[3]);
+      const dim3 grid(std::min(m_rp.m_tile_end[0] * m_rp.m_tile_end[1] *
+                                   m_rp.m_tile[0] * m_rp.m_tile[1],
+                               maxblocks),
+                      std::min(m_rp.m_upper[2] - m_rp.m_lower[2], maxblocks),
+                      std::min(m_rp.m_upper[3] - m_rp.m_lower[3], maxblocks));
+      ROCmParallelLaunch<ParallelFor, LaunchBounds>(*this, grid, block, 0);
+    } else if (RP::rank == 5) {
+      // id0,id1 encoded within threadIdx.x; id2,id3 to threadIdx.y; id4 to
+      // threadIdx.z
+      const dim3 block(m_rp.m_tile[0] * m_rp.m_tile[1],
+                       m_rp.m_tile[2] * m_rp.m_tile[3], m_rp.m_tile[4]);
+      const dim3 grid(std::min(m_rp.m_tile_end[0] * m_rp.m_tile_end[1] *
+                                   m_rp.m_tile[0] * m_rp.m_tile[1],
+                               maxblocks),
+                      std::min(m_rp.m_tile_end[2] * m_rp.m_tile_end[3] *
+                                   m_rp.m_tile[2] * m_rp.m_tile[3],
+                               maxblocks),
+                      std::min(m_rp.m_upper[4] - m_rp.m_lower[4], maxblocks));
+      ROCmParallelLaunch<ParallelFor, LaunchBounds>(*this, grid, block, 0);
+    } else if (RP::rank == 6) {
+      // id0,id1 encoded within threadIdx.x; id2,id3 to threadIdx.y; id4,id5 to
+      // threadIdx.z
+      const dim3 block(m_rp.m_tile[0] * m_rp.m_tile[1],
+                       m_rp.m_tile[2] * m_rp.m_tile[3],
+                       m_rp.m_tile[4] * m_rp.m_tile[5]);
+      const dim3 grid(std::min(m_rp.m_tile_end[0] * m_rp.m_tile_end[1] *
+                                   m_rp.m_tile[0] * m_rp.m_tile[1],
+                               maxblocks),
+                      std::min(m_rp.m_tile_end[2] * m_rp.m_tile_end[3] *
+                                   m_rp.m_tile[2] * m_rp.m_tile[3],
+                               maxblocks),
+                      std::min(m_rp.m_tile_end[4] * m_rp.m_tile_end[5] *
+                                   m_rp.m_tile[4] * m_rp.m_tile[5],
+                               maxblocks));
+      ROCmParallelLaunch<ParallelFor, LaunchBounds>(*this, grid, block, 0);
+    } else {
       printf("Kokkos::MDRange Error: Exceeded rank bounds with ROCm\n");
       Kokkos::abort("Aborting");
     }
 
-  } //end execute
+  }  // end execute
 
-//  inline
-  ParallelFor( const FunctorType & arg_functor
-             , Policy arg_policy )
-    : m_functor( arg_functor )
-    , m_rp(  arg_policy )
-    {
-}
+  //  inline
+  ParallelFor(const FunctorType& arg_functor, Policy arg_policy)
+      : m_functor(arg_functor), m_rp(arg_policy) {}
 };
 
 //----------------------------------------------------------------------------
 
-template< class F , class... Traits >
-class ParallelFor< F
-                 , Kokkos::TeamPolicy< Traits... >
-                 , Kokkos::Experimental::ROCm >
-{
-  using Policy = Kokkos::Impl::TeamPolicyInternal< Kokkos::Experimental::ROCm, Traits... >;
-  typedef Kokkos::Impl::FunctorValueTraits<F, typename Policy::work_tag> ValueTraits;
+template <class F, class... Traits>
+class ParallelFor<F, Kokkos::TeamPolicy<Traits...>,
+                  Kokkos::Experimental::ROCm> {
+  using Policy =
+      Kokkos::Impl::TeamPolicyInternal<Kokkos::Experimental::ROCm, Traits...>;
+  typedef Kokkos::Impl::FunctorValueTraits<F, typename Policy::work_tag>
+      ValueTraits;
 
-public:
-  inline
-  ParallelFor( const F & f
-             , const Policy      & policy )
-    {
-      const auto league_size  = policy.league_size();
-      const auto team_size    = policy.team_size();
-      const int vector_length = policy.vector_length();
-      const auto total_size   = league_size * team_size * vector_length;
-      const int scratch_size0 = policy.scratch_size(0,team_size);
-      const int scratch_size1 = policy.scratch_size(1,team_size);
+ public:
+  inline ParallelFor(const F& f, const Policy& policy) {
+    const auto league_size  = policy.league_size();
+    const auto team_size    = policy.team_size();
+    const int vector_length = policy.vector_length();
+    const auto total_size   = league_size * team_size * vector_length;
+    const int scratch_size0 = policy.scratch_size(0, team_size);
+    const int scratch_size1 = policy.scratch_size(1, team_size);
 
-      if(total_size == 0) return;
+    if (total_size == 0) return;
 
-      const auto shared_size = FunctorTeamShmemSize< F >::value( f , team_size );
-      char * scratch = NULL;
-      char * shared = (char *)rocm_device_allocate(shared_size * league_size +
-                                                   scratch_size0*league_size);
-      if(0<scratch_size1)
-        scratch = (char *)rocm_device_allocate(scratch_size1*league_size);
+    const auto shared_size = FunctorTeamShmemSize<F>::value(f, team_size);
+    char* scratch          = NULL;
+    char* shared = (char*)rocm_device_allocate(shared_size * league_size +
+                                               scratch_size0 * league_size);
+    if (0 < scratch_size1)
+      scratch = (char*)rocm_device_allocate(scratch_size1 * league_size);
 
-      hc::extent< 1 > flat_extent( total_size );
+    hc::extent<1> flat_extent(total_size);
 
-      hc::tiled_extent< 1 > team_extent = flat_extent.tile(vector_length*team_size);
-      hc::parallel_for_each( team_extent , [=](hc::tiled_index<1> idx) [[hc]]
-      {
-        rocm_invoke<typename Policy::work_tag>(f, typename Policy::member_type(idx, league_size, team_size, shared, shared_size, scratch_size0, scratch, scratch_size1,vector_length));
-      }).wait();
+    hc::tiled_extent<1> team_extent =
+        flat_extent.tile(vector_length * team_size);
+    hc::parallel_for_each(
+        team_extent,
+        [=](hc::tiled_index<1> idx) [[hc]] {
+          rocm_invoke<typename Policy::work_tag>(
+              f, typename Policy::member_type(
+                     idx, league_size, team_size, shared, shared_size,
+                     scratch_size0, scratch, scratch_size1, vector_length));
+        })
+        .wait();
 
-      if(0<scratch_size1)
-        rocm_device_free(scratch);
-      rocm_device_free(shared);
-    }
+    if (0 < scratch_size1) rocm_device_free(scratch);
+    rocm_device_free(shared);
+  }
 
   KOKKOS_INLINE_FUNCTION
   void execute() const {}
-
 };
 
-
 //----------------------------------------------------------------------------
 
-template< class FunctorType , class ReducerType, class... Traits >
-class ParallelReduce<
-  FunctorType , Kokkos::RangePolicy< Traits... >, ReducerType, Kokkos::Experimental::ROCm >
-{
-public:
-
-  typedef Kokkos::RangePolicy< Traits... > Policy ;
+template <class FunctorType, class ReducerType, class... Traits>
+class ParallelReduce<FunctorType, Kokkos::RangePolicy<Traits...>, ReducerType,
+                     Kokkos::Experimental::ROCm> {
+ public:
+  typedef Kokkos::RangePolicy<Traits...> Policy;
 
   // TODO: Use generic lambdas instead
-  struct invoke_fn
-  {
-    template<class F, class... Ts>
-    KOKKOS_INLINE_FUNCTION void operator()(std::size_t size, F&& f, hc::tiled_index<1> idx, tile_desc td, Ts&&... xs) const
-    {
+  struct invoke_fn {
+    template <class F, class... Ts>
+    KOKKOS_INLINE_FUNCTION void operator()(std::size_t size, F&& f,
+                                           hc::tiled_index<1> idx, tile_desc td,
+                                           Ts&&... xs) const {
       auto global = idx.global[0];
       if (global < size) f(idx.global[0], static_cast<Ts&&>(xs)...);
     }
   };
 
-  template< class ViewType >
-  inline
-  ParallelReduce( const FunctorType  & f,
-                  const Policy       & policy,
-                  const ViewType & result_view,
-                  typename std::enable_if<
-                               Kokkos::is_view< ViewType >::value &&
-                              !Kokkos::is_reducer_type<ReducerType>::value
-                  ,void*>::type = NULL)
-    {
-      typedef typename Policy::work_tag Tag;
-      typedef Kokkos::Impl::FunctorValueTraits< FunctorType , Tag > ValueTraits;
-      typedef Kokkos::Impl::FunctorValueInit< FunctorType , Tag > ValueInit;
-      typedef typename ValueTraits::reference_type reference_type;
+  template <class ViewType>
+  inline ParallelReduce(
+      const FunctorType& f, const Policy& policy, const ViewType& result_view,
+      typename std::enable_if<Kokkos::is_view<ViewType>::value &&
+                                  !Kokkos::is_reducer_type<ReducerType>::value,
+                              void*>::type = NULL) {
+    typedef typename Policy::work_tag Tag;
+    typedef Kokkos::Impl::FunctorValueTraits<FunctorType, Tag> ValueTraits;
+    typedef Kokkos::Impl::FunctorValueInit<FunctorType, Tag> ValueInit;
+    typedef typename ValueTraits::reference_type reference_type;
 
-      const auto total_size = policy.end() - policy.begin();
+    const auto total_size = policy.end() - policy.begin();
 
-      if(total_size==0) {
-        if (result_view.data()) {
-           ValueInit::init( f , result_view.data() );
-        }
-        return;
+    if (total_size == 0) {
+      if (result_view.data()) {
+        ValueInit::init(f, result_view.data());
       }
-
-      Kokkos::Impl::reduce_enqueue< Tag >
-        ( total_size 
-        , f
-        , InvalidType{}
-        , rocm_capture(invoke_fn{}, total_size)
-        , result_view.data()
-        , result_view.extent(0)
-        );
+      return;
     }
 
-  inline
-  ParallelReduce( const FunctorType & f,
-                  Policy       policy,
-                  const ReducerType& reducer )
-  {
-      typedef typename Policy::work_tag Tag;
+    Kokkos::Impl::reduce_enqueue<Tag>(
+        total_size, f, InvalidType{}, rocm_capture(invoke_fn{}, total_size),
+        result_view.data(), result_view.extent(0));
+  }
 
-      typedef Kokkos::Impl::if_c< std::is_same<InvalidType,ReducerType>::value,                                   FunctorType, ReducerType> ReducerConditional;
-      typedef typename ReducerConditional::type ReducerTypeFwd;
-      typedef Kokkos::Impl::FunctorValueTraits< FunctorType , Tag > ValueTraits;
-      typedef Kokkos::Impl::FunctorValueInit< ReducerType, Tag > ValueInit ;
+  inline ParallelReduce(const FunctorType& f, Policy policy,
+                        const ReducerType& reducer) {
+    typedef typename Policy::work_tag Tag;
 
-      typedef typename ValueTraits::reference_type reference_type;
+    typedef Kokkos::Impl::if_c<std::is_same<InvalidType, ReducerType>::value,
+                               FunctorType, ReducerType>
+        ReducerConditional;
+    typedef typename ReducerConditional::type ReducerTypeFwd;
+    typedef Kokkos::Impl::FunctorValueTraits<FunctorType, Tag> ValueTraits;
+    typedef Kokkos::Impl::FunctorValueInit<ReducerType, Tag> ValueInit;
 
-      const auto total_size = policy.end() - policy.begin();
+    typedef typename ValueTraits::reference_type reference_type;
 
-      if(total_size==0) {
-        if (reducer.view().data()) {
-           ValueInit::init( ReducerConditional::select(f,reducer), 
-                            reducer.view().data() );
-        }
-        return;
+    const auto total_size = policy.end() - policy.begin();
+
+    if (total_size == 0) {
+      if (reducer.view().data()) {
+        ValueInit::init(ReducerConditional::select(f, reducer),
+                        reducer.view().data());
       }
+      return;
+    }
 
-      Kokkos::Impl::reduce_enqueue< Tag >
-        ( total_size 
-        , f
-        , reducer
-        , rocm_capture(invoke_fn{}, total_size)
-        , reducer.view().data()
-        , reducer.view().extent(0)
-        );
+    Kokkos::Impl::reduce_enqueue<Tag>(
+        total_size, f, reducer, rocm_capture(invoke_fn{}, total_size),
+        reducer.view().data(), reducer.view().extent(0));
   }
 
   KOKKOS_INLINE_FUNCTION
   void execute() const {}
-
 };
 
 //----------------------------------------------------------------------------
 
-template< class FunctorType , class ReducerType, class... Traits >
-class ParallelReduce<
-  FunctorType , Kokkos::MDRangePolicy< Traits... >, ReducerType, Kokkos::Experimental::ROCm >
-{
-private:
-  typedef Kokkos::MDRangePolicy< Traits ...  > Policy ;
+template <class FunctorType, class ReducerType, class... Traits>
+class ParallelReduce<FunctorType, Kokkos::MDRangePolicy<Traits...>, ReducerType,
+                     Kokkos::Experimental::ROCm> {
+ private:
+  typedef Kokkos::MDRangePolicy<Traits...> Policy;
   using RP = Policy;
   typedef typename Policy::array_index_type array_index_type;
   typedef typename Policy::index_type index_type;
-  typedef typename Policy::work_tag     WorkTag ;
-  typedef typename Policy::member_type  Member ;
+  typedef typename Policy::work_tag WorkTag;
+  typedef typename Policy::member_type Member;
   typedef typename Policy::launch_bounds LaunchBounds;
 
-  typedef Kokkos::Impl::if_c< std::is_same<InvalidType,ReducerType>::value, FunctorType, ReducerType> ReducerConditional;
+  typedef Kokkos::Impl::if_c<std::is_same<InvalidType, ReducerType>::value,
+                             FunctorType, ReducerType>
+      ReducerConditional;
   typedef typename ReducerConditional::type ReducerTypeFwd;
-  typedef typename Kokkos::Impl::if_c< std::is_same<InvalidType,ReducerType>::value, WorkTag, void>::type WorkTagFwd;
+  typedef
+      typename Kokkos::Impl::if_c<std::is_same<InvalidType, ReducerType>::value,
+                                  WorkTag, void>::type WorkTagFwd;
 
-  typedef Kokkos::Impl::FunctorValueTraits< ReducerTypeFwd, WorkTagFwd > ValueTraits ;
-  typedef Kokkos::Impl::FunctorValueInit<   ReducerTypeFwd, WorkTagFwd > ValueInit ;
-  typedef Kokkos::Impl::FunctorValueJoin<   ReducerTypeFwd, WorkTagFwd > ValueJoin ;
+  typedef Kokkos::Impl::FunctorValueTraits<ReducerTypeFwd, WorkTagFwd>
+      ValueTraits;
+  typedef Kokkos::Impl::FunctorValueInit<ReducerTypeFwd, WorkTagFwd> ValueInit;
+  typedef Kokkos::Impl::FunctorValueJoin<ReducerTypeFwd, WorkTagFwd> ValueJoin;
 
+ public:
+  typedef typename ValueTraits::pointer_type pointer_type;
+  typedef typename ValueTraits::value_type value_type;
+  typedef typename ValueTraits::reference_type reference_type;
+  typedef FunctorType functor_type;
+  typedef Kokkos::Experimental::ROCm::size_type size_type;
 
-public:
+  // Algorithmic constraints: blockSize is a power of two AND blockDim.y ==
+  // blockDim.z == 1
 
-  typedef typename ValueTraits::pointer_type    pointer_type ;
-  typedef typename ValueTraits::value_type      value_type ;
-  typedef typename ValueTraits::reference_type  reference_type ;
-  typedef FunctorType                           functor_type ;
-  typedef Kokkos::Experimental::ROCm::size_type size_type ;
+  const FunctorType m_functor;
+  const Policy m_policy;  // used for workrange and nwork
+  const ReducerType m_reducer;
+  const pointer_type m_result_ptr;
+  value_type* m_scratch_space;
+  size_type* m_scratch_flags;
 
-  // Algorithmic constraints: blockSize is a power of two AND blockDim.y == blockDim.z == 1
-
-  const FunctorType   m_functor ;
-  const Policy        m_policy ; // used for workrange and nwork
-  const ReducerType   m_reducer ;
-  const pointer_type  m_result_ptr ;
-  value_type *         m_scratch_space ;
-  size_type *         m_scratch_flags ;
-
-  typedef typename Kokkos::Impl::Reduce::DeviceIterateTile<Policy::rank, Policy, FunctorType, typename Policy::work_tag, reference_type> DeviceIteratePattern;
+  typedef typename Kokkos::Impl::Reduce::DeviceIterateTile<
+      Policy::rank, Policy, FunctorType, typename Policy::work_tag,
+      reference_type>
+      DeviceIteratePattern;
 
   KOKKOS_INLINE_FUNCTION
-  void exec_range( reference_type update ) const
-  {
-    Kokkos::Impl::Reduce::DeviceIterateTile<Policy::rank,Policy,FunctorType,typename Policy::work_tag, reference_type>(m_policy, m_functor, update).exec_range();
+  void exec_range(reference_type update) const {
+    Kokkos::Impl::Reduce::DeviceIterateTile<Policy::rank, Policy, FunctorType,
+                                            typename Policy::work_tag,
+                                            reference_type>(m_policy, m_functor,
+                                                            update)
+        .exec_range();
   }
 
+  KOKKOS_INLINE_FUNCTION
+  void operator()(void) const { run(); }
 
   KOKKOS_INLINE_FUNCTION
-  void operator()(void) const
-    {
-       run();
-    }
-
-  KOKKOS_INLINE_FUNCTION
-  void run( ) const
-  {
-    const integral_nonzero_constant< size_type , ValueTraits::StaticValueSize / sizeof(value_type) >
-      word_count( (ValueTraits::value_size( ReducerConditional::select(m_functor , m_reducer) )) / sizeof(value_type) );
-      // pointer to shared data accounts for the reserved space at the start
-      value_type * const shared = kokkos_impl_rocm_shared_memory<value_type>()
-                                 + 2*sizeof(uint64_t); 
+  void run() const {
+    const integral_nonzero_constant<size_type, ValueTraits::StaticValueSize /
+                                                   sizeof(value_type)>
+        word_count((ValueTraits::value_size(
+                       ReducerConditional::select(m_functor, m_reducer))) /
+                   sizeof(value_type));
+    // pointer to shared data accounts for the reserved space at the start
+    value_type* const shared =
+        kokkos_impl_rocm_shared_memory<value_type>() + 2 * sizeof(uint64_t);
 
     {
       reference_type value =
-        ValueInit::init( ReducerConditional::select(m_functor , m_reducer) , shared + threadIdx_y * word_count.value );
-      // Number of blocks is bounded so that the reduction can be limited to two passes.
-      // Each thread block is given an approximately equal amount of work to perform.
-      // Accumulate the values for this block.
-      // The accumulation ordering does not match the final pass, but is arithmatically equivalent.
+          ValueInit::init(ReducerConditional::select(m_functor, m_reducer),
+                          shared + threadIdx_y * word_count.value);
+      // Number of blocks is bounded so that the reduction can be limited to two
+      // passes. Each thread block is given an approximately equal amount of
+      // work to perform. Accumulate the values for this block. The accumulation
+      // ordering does not match the final pass, but is arithmatically
+      // equivalent.
 
-      this-> exec_range( value );
+      this->exec_range(value);
     }
 
     // Reduce with final value at blockDim.y - 1 location.
     // Problem: non power-of-two blockDim
 
-    if ( rocm_single_inter_block_reduce_scan<false,ReducerTypeFwd,WorkTagFwd>(
-           ReducerConditional::select(m_functor , m_reducer) , blockIdx_x ,
-           gridDim_x , shared , m_scratch_space , m_scratch_flags ) ) {
+    if (rocm_single_inter_block_reduce_scan<false, ReducerTypeFwd, WorkTagFwd>(
+            ReducerConditional::select(m_functor, m_reducer), blockIdx_x,
+            gridDim_x, shared, m_scratch_space, m_scratch_flags)) {
+      // This is the final block with the final result at the final threads'
+      // location
+      value_type* const tshared = shared + (blockDim_y - 1) * word_count.value;
+      value_type* const global  = m_scratch_space;
 
-      // This is the final block with the final result at the final threads' location
-      value_type * const tshared = shared + ( blockDim_y - 1 ) * word_count.value ;
-      value_type * const global =  m_scratch_space ;
-
-      if ( threadIdx_y == 0 ) {
-        Kokkos::Impl::FunctorFinal< ReducerTypeFwd , WorkTagFwd >::final( ReducerConditional::select(m_functor , m_reducer) , tshared );
-//        for ( unsigned i = 0 ; i < word_count.value ; i+=blockDim_y ) { global[i] = tshared[i]; }
-        for ( unsigned i = 0 ; i < word_count.value ; i++ ) { global[i] = tshared[i]; }
+      if (threadIdx_y == 0) {
+        Kokkos::Impl::FunctorFinal<ReducerTypeFwd, WorkTagFwd>::final(
+            ReducerConditional::select(m_functor, m_reducer), tshared);
+        //        for ( unsigned i = 0 ; i < word_count.value ; i+=blockDim_y )
+        //        { global[i] = tshared[i]; }
+        for (unsigned i = 0; i < word_count.value; i++) {
+          global[i] = tshared[i];
+        }
       }
     }
   }
 
-
-
   // Determine block size constrained by shared memory:
-  static inline
-  unsigned local_block_size( const FunctorType & f )
-    {
-      unsigned n = ROCmTraits::WavefrontSize * 8 ;
-      while ( n && ROCmTraits::SharedMemoryCapacity < rocm_single_inter_block_reduce_scan_shmem<false,FunctorType,WorkTag>( f , n ) ) { n >>= 1 ; }
-      return n ;
+  static inline unsigned local_block_size(const FunctorType& f) {
+    unsigned n = ROCmTraits::WavefrontSize * 8;
+    while (n &&
+           ROCmTraits::SharedMemoryCapacity <
+               rocm_single_inter_block_reduce_scan_shmem<false, FunctorType,
+                                                         WorkTag>(f, n)) {
+      n >>= 1;
     }
+    return n;
+  }
 
-  inline
-  void execute()
-    {
-      const int nwork = m_policy.m_num_tiles;
-      if ( nwork ) {
-        int block_size = m_policy.m_prod_tile_dims;
-        // CONSTRAINT: Algorithm requires block_size >= product of tile dimensions
-        // Nearest power of two
-        int exponent_pow_two = std::ceil( std::log2((float)block_size) );
-        block_size = 1<<(exponent_pow_two);
+  inline void execute() {
+    const int nwork = m_policy.m_num_tiles;
+    if (nwork) {
+      int block_size = m_policy.m_prod_tile_dims;
+      // CONSTRAINT: Algorithm requires block_size >= product of tile dimensions
+      // Nearest power of two
+      int exponent_pow_two = std::ceil(std::log2((float)block_size));
+      block_size           = 1 << (exponent_pow_two);
 
-        m_scratch_space = (value_type*)rocm_internal_scratch_space( ValueTraits::value_size( ReducerConditional::select(m_functor , m_reducer) ) * block_size*nwork /* block_size == max block_count */ );
-        m_scratch_flags = rocm_internal_scratch_flags( sizeof(size_type) );
-        const dim3 block( 1 , block_size , 1 );
-        // Required grid.x <= block.y
-        const dim3 grid( nwork, block_size ,  1 );
-      const int shmem = rocm_single_inter_block_reduce_scan_shmem<false,FunctorType,WorkTag>( m_functor , block.y );
+      m_scratch_space = (value_type*)rocm_internal_scratch_space(
+          ValueTraits::value_size(
+              ReducerConditional::select(m_functor, m_reducer)) *
+          block_size * nwork /* block_size == max block_count */);
+      m_scratch_flags = rocm_internal_scratch_flags(sizeof(size_type));
+      const dim3 block(1, block_size, 1);
+      // Required grid.x <= block.y
+      const dim3 grid(nwork, block_size, 1);
+      const int shmem =
+          rocm_single_inter_block_reduce_scan_shmem<false, FunctorType,
+                                                    WorkTag>(m_functor,
+                                                             block.y);
 
-      ROCmParallelLaunch< ParallelReduce, LaunchBounds >( *this, grid, block, shmem ); // copy to device and execute
+      ROCmParallelLaunch<ParallelReduce, LaunchBounds>(
+          *this, grid, block, shmem);  // copy to device and execute
 
       ROCM().fence();
 
-      if ( m_result_ptr ) {
-          const int size = ValueTraits::value_size( ReducerConditional::select(m_functor , m_reducer)  );
-          DeepCopy<HostSpace,Kokkos::Experimental::ROCmSpace>( m_result_ptr , m_scratch_space , size );
-      }
-    }
-    else {
       if (m_result_ptr) {
-        ValueInit::init( ReducerConditional::select(m_functor , m_reducer) , m_result_ptr );
+        const int size = ValueTraits::value_size(
+            ReducerConditional::select(m_functor, m_reducer));
+        DeepCopy<HostSpace, Kokkos::Experimental::ROCmSpace>(
+            m_result_ptr, m_scratch_space, size);
+      }
+    } else {
+      if (m_result_ptr) {
+        ValueInit::init(ReducerConditional::select(m_functor, m_reducer),
+                        m_result_ptr);
       }
     }
   }
 
+  template <class HostViewType>
+  ParallelReduce(const FunctorType& arg_functor, const Policy& arg_policy,
+                 const HostViewType& arg_result,
+                 typename std::enable_if<Kokkos::is_view<HostViewType>::value,
+                                         void*>::type = NULL)
+      : m_functor(arg_functor),
+        m_policy(arg_policy),
+        m_reducer(InvalidType()),
+        m_result_ptr(arg_result.data()),
+        m_scratch_space(0),
+        m_scratch_flags(0) {}
 
-  template< class HostViewType >
-  ParallelReduce( const FunctorType  & arg_functor
-                , const Policy       & arg_policy
-                , const HostViewType & arg_result
-                , typename std::enable_if<
-                   Kokkos::is_view< HostViewType >::value
-                ,void*>::type = NULL)
-  : m_functor( arg_functor )
-  , m_policy(  arg_policy )
-  , m_reducer( InvalidType() )
-  , m_result_ptr( arg_result.data() )
-  , m_scratch_space( 0 )
-  , m_scratch_flags( 0 )
-  {}
-
-  ParallelReduce( const FunctorType  & arg_functor
-                , const Policy       & arg_policy
-                , const ReducerType & reducer)
-  : m_functor( arg_functor )
-  , m_policy(  arg_policy )
-  , m_reducer( reducer )
-  , m_result_ptr( reducer.view().data() )
-  , m_scratch_space( 0 )
-  , m_scratch_flags( 0 )
-  {}
-
+  ParallelReduce(const FunctorType& arg_functor, const Policy& arg_policy,
+                 const ReducerType& reducer)
+      : m_functor(arg_functor),
+        m_policy(arg_policy),
+        m_reducer(reducer),
+        m_result_ptr(reducer.view().data()),
+        m_scratch_space(0),
+        m_scratch_flags(0) {}
 };
 //----------------------------------------------------------------------------
 
-template< class FunctorType, class ReducerType, class... Traits >
-class ParallelReduce<
-   FunctorType , Kokkos::TeamPolicy< Traits... >, ReducerType, Kokkos::Experimental::ROCm >
-{
-  using Policy = Kokkos::Impl::TeamPolicyInternal< Kokkos::Experimental::ROCm, Traits... >;
-  typedef Kokkos::Impl::FunctorValueTraits<FunctorType, typename Policy::work_tag> ValueTraits;
+template <class FunctorType, class ReducerType, class... Traits>
+class ParallelReduce<FunctorType, Kokkos::TeamPolicy<Traits...>, ReducerType,
+                     Kokkos::Experimental::ROCm> {
+  using Policy =
+      Kokkos::Impl::TeamPolicyInternal<Kokkos::Experimental::ROCm, Traits...>;
+  typedef Kokkos::Impl::FunctorValueTraits<FunctorType,
+                                           typename Policy::work_tag>
+      ValueTraits;
 
-public:
-
-  struct invoke_fn
-  {
-    template<class Create, class F, class... Ts>
-    KOKKOS_INLINE_FUNCTION void operator()(Create&& create, F&& f, hc::tiled_index<1> idx, tile_desc td, Ts&&... xs) const
-    {
+ public:
+  struct invoke_fn {
+    template <class Create, class F, class... Ts>
+    KOKKOS_INLINE_FUNCTION void operator()(Create&& create, F&& f,
+                                           hc::tiled_index<1> idx, tile_desc td,
+                                           Ts&&... xs) const {
       f(create(idx, td), static_cast<Ts&&>(xs)...);
     }
   };
 
-  template< class ViewType >
-  inline
-  ParallelReduce( const FunctorType  & f,
-                  const Policy       & policy,
-                  const ViewType     & result_view,
-                typename std::enable_if<
-                  Kokkos::is_view< ViewType >::value &&
-                  !Kokkos::is_reducer_type<ReducerType>::value
-                  ,void*>::type = NULL)
-    {
-      const int league_size = policy.league_size();
-      const int team_size = policy.team_size(f);
-      const int vector_length = policy.vector_length();
-      const int scratch_size0 = policy.scratch_size(0,team_size);
-      const int scratch_size1 = policy.scratch_size(1,team_size);
-      const int total_size = league_size * team_size ;
-      
-      typedef Kokkos::Impl::FunctorValueInit< FunctorType, typename Policy::work_tag > ValueInit ;
-      if(total_size==0) {
-        if (result_view.data()) {
-           ValueInit::init( f , result_view.data() );
-        }
-        return;
+  template <class ViewType>
+  inline ParallelReduce(
+      const FunctorType& f, const Policy& policy, const ViewType& result_view,
+      typename std::enable_if<Kokkos::is_view<ViewType>::value &&
+                                  !Kokkos::is_reducer_type<ReducerType>::value,
+                              void*>::type = NULL) {
+    const int league_size   = policy.league_size();
+    const int team_size     = policy.team_size(f);
+    const int vector_length = policy.vector_length();
+    const int scratch_size0 = policy.scratch_size(0, team_size);
+    const int scratch_size1 = policy.scratch_size(1, team_size);
+    const int total_size    = league_size * team_size;
+
+    typedef Kokkos::Impl::FunctorValueInit<FunctorType,
+                                           typename Policy::work_tag>
+        ValueInit;
+    if (total_size == 0) {
+      if (result_view.data()) {
+        ValueInit::init(f, result_view.data());
       }
-
-      const int reduce_size = ValueTraits::value_size( f );
-      const int shared_size = FunctorTeamShmemSize< FunctorType >::value( f , team_size );
-
-      char * shared;
-      char * scratch = NULL;
-
-      shared = (char *)rocm_device_allocate(league_size *
-                             (shared_size + scratch_size0));
-      if(0<scratch_size1)
-        scratch = (char *)rocm_device_allocate(scratch_size1 * league_size);
-
-      auto create_team_member = [=](hc::tiled_index<1> idx, tile_desc td) 
-      { 
-
-        return typename Policy::member_type(idx, league_size, td.team_size, 
-                                          shared, shared_size, scratch_size0,
-                                          scratch, scratch_size1, 
-                                          vector_length); 
-      };
-
-      Kokkos::Impl::reduce_enqueue< typename Policy::work_tag >
-      ( total_size*vector_length
-        , f
-        , InvalidType{}
-        , rocm_capture(invoke_fn{}, create_team_member)
-        , result_view.ptr_on_device()
-        , result_view.dimension_0()
-        , team_size 
-        , vector_length 
-        , shared_size
-      );
-
-      if(0<scratch_size1)
-        rocm_device_free(scratch);
-      rocm_device_free(shared);
+      return;
     }
 
-  inline
-  ParallelReduce( const FunctorType & f,
-                  Policy       policy,
-                  const ReducerType& reducer )
-  {
-    const int league_size = policy.league_size();
-      const int team_size = policy.team_size(f);
-      const int vector_length = policy.vector_length();
-      const int total_size = league_size * team_size;
+    const int reduce_size = ValueTraits::value_size(f);
+    const int shared_size =
+        FunctorTeamShmemSize<FunctorType>::value(f, team_size);
 
-      typedef Kokkos::Impl::FunctorValueInit< ReducerType, typename Policy::work_tag > ValueInit ;
-      typedef Kokkos::Impl::if_c< std::is_same<InvalidType,ReducerType>::value,
-                                   FunctorType, ReducerType> ReducerConditional;
-      if(total_size==0) {
-        if (reducer.view().data()) {
-           ValueInit::init( ReducerConditional::select(f,reducer), 
-                            reducer.view().data() );
-        }
-        return;
+    char* shared;
+    char* scratch = NULL;
+
+    shared = (char*)rocm_device_allocate(league_size *
+                                         (shared_size + scratch_size0));
+    if (0 < scratch_size1)
+      scratch = (char*)rocm_device_allocate(scratch_size1 * league_size);
+
+    auto create_team_member = [=](hc::tiled_index<1> idx, tile_desc td) {
+      return typename Policy::member_type(
+          idx, league_size, td.team_size, shared, shared_size, scratch_size0,
+          scratch, scratch_size1, vector_length);
+    };
+
+    Kokkos::Impl::reduce_enqueue<typename Policy::work_tag>(
+        total_size * vector_length, f, InvalidType{},
+        rocm_capture(invoke_fn{}, create_team_member),
+        result_view.ptr_on_device(), result_view.dimension_0(), team_size,
+        vector_length, shared_size);
+
+    if (0 < scratch_size1) rocm_device_free(scratch);
+    rocm_device_free(shared);
+  }
+
+  inline ParallelReduce(const FunctorType& f, Policy policy,
+                        const ReducerType& reducer) {
+    const int league_size   = policy.league_size();
+    const int team_size     = policy.team_size(f);
+    const int vector_length = policy.vector_length();
+    const int total_size    = league_size * team_size;
+
+    typedef Kokkos::Impl::FunctorValueInit<ReducerType,
+                                           typename Policy::work_tag>
+        ValueInit;
+    typedef Kokkos::Impl::if_c<std::is_same<InvalidType, ReducerType>::value,
+                               FunctorType, ReducerType>
+        ReducerConditional;
+    if (total_size == 0) {
+      if (reducer.view().data()) {
+        ValueInit::init(ReducerConditional::select(f, reducer),
+                        reducer.view().data());
       }
+      return;
+    }
 
-      const int reduce_size = ValueTraits::value_size( f );
-      const int shared_size = FunctorTeamShmemSize< FunctorType >::value( f , team_size );
-      const int scratch_size0 = policy.scratch_size(0,team_size);
-      const int scratch_size1 = policy.scratch_size(1,team_size);
+    const int reduce_size = ValueTraits::value_size(f);
+    const int shared_size =
+        FunctorTeamShmemSize<FunctorType>::value(f, team_size);
+    const int scratch_size0 = policy.scratch_size(0, team_size);
+    const int scratch_size1 = policy.scratch_size(1, team_size);
 
-      char * shared;
-      char * scratch = NULL;
-      shared = (char *)rocm_device_allocate((shared_size + scratch_size0) *
-                                            league_size);
-      if(0<scratch_size1)
-        scratch = (char *)rocm_device_allocate(scratch_size1 * league_size);
+    char* shared;
+    char* scratch = NULL;
+    shared        = (char*)rocm_device_allocate((shared_size + scratch_size0) *
+                                         league_size);
+    if (0 < scratch_size1)
+      scratch = (char*)rocm_device_allocate(scratch_size1 * league_size);
 
-      auto create_team_member = [=](hc::tiled_index<1> idx, tile_desc td) 
-      { 
-        return typename Policy::member_type(idx, league_size, td.tile_size, shared, shared_size, scratch_size0, scratch, scratch_size1, vector_length); 
-      };
+    auto create_team_member = [=](hc::tiled_index<1> idx, tile_desc td) {
+      return typename Policy::member_type(
+          idx, league_size, td.tile_size, shared, shared_size, scratch_size0,
+          scratch, scratch_size1, vector_length);
+    };
 
-      Kokkos::Impl::reduce_enqueue< typename Policy::work_tag >
-      ( league_size
-        , f
-        , reducer
-        , rocm_capture(invoke_fn{}, create_team_member)
-        , reducer.view().data()
-        , reducer.view().extent(0),team_size,vector_length
-        , shared_size
-     );
+    Kokkos::Impl::reduce_enqueue<typename Policy::work_tag>(
+        league_size, f, reducer, rocm_capture(invoke_fn{}, create_team_member),
+        reducer.view().data(), reducer.view().extent(0), team_size,
+        vector_length, shared_size);
 
-      if(0<scratch_size1)
-        rocm_device_free(scratch);
-      rocm_device_free(shared);
+    if (0 < scratch_size1) rocm_device_free(scratch);
+    rocm_device_free(shared);
   }
 
   KOKKOS_INLINE_FUNCTION
   void execute() const {}
-
 };
 
-
-template< class FunctorType , class... Traits >
-class ParallelScan< FunctorType , Kokkos::RangePolicy< Traits... >, Kokkos::Experimental::ROCm >
-{
-private:
-
-  typedef Kokkos::RangePolicy< Traits... > Policy;
+template <class FunctorType, class... Traits>
+class ParallelScan<FunctorType, Kokkos::RangePolicy<Traits...>,
+                   Kokkos::Experimental::ROCm> {
+ private:
+  typedef Kokkos::RangePolicy<Traits...> Policy;
   typedef typename Policy::work_tag Tag;
-  typedef Kokkos::Impl::FunctorValueTraits< FunctorType, Tag>  ValueTraits;
-
-public:
+  typedef Kokkos::Impl::FunctorValueTraits<FunctorType, Tag> ValueTraits;
 
+ public:
   //----------------------------------------
 
-  inline
-  ParallelScan( const FunctorType & f
-              , const Policy      & policy )
-  {
-    const auto len = policy.end()-policy.begin();
+  inline ParallelScan(const FunctorType& f, const Policy& policy) {
+    const auto len = policy.end() - policy.begin();
 
+    if (len == 0) return;
 
-    if(len==0) return;
-
-    scan_enqueue<Tag>(len, f, [](hc::tiled_index<1> idx, int, int) { return idx.global[0]; });
+    scan_enqueue<Tag>(
+        len, f, [](hc::tiled_index<1> idx, int, int) { return idx.global[0]; });
   }
 
   KOKKOS_INLINE_FUNCTION
@@ -1328,31 +1274,26 @@ public:
   //----------------------------------------
 };
 
-template< class FunctorType , class ReturnType , class... Traits >
-class ParallelScanWithTotal< FunctorType , Kokkos::RangePolicy< Traits... >,
-                             ReturnType, Kokkos::Experimental::ROCm >
-{
-private:
-
-  typedef Kokkos::RangePolicy< Traits... > Policy;
+template <class FunctorType, class ReturnType, class... Traits>
+class ParallelScanWithTotal<FunctorType, Kokkos::RangePolicy<Traits...>,
+                            ReturnType, Kokkos::Experimental::ROCm> {
+ private:
+  typedef Kokkos::RangePolicy<Traits...> Policy;
   typedef typename Policy::work_tag Tag;
-  typedef Kokkos::Impl::FunctorValueTraits< FunctorType, Tag>  ValueTraits;
-
-public:
+  typedef Kokkos::Impl::FunctorValueTraits<FunctorType, Tag> ValueTraits;
 
+ public:
   //----------------------------------------
 
-  inline
-  ParallelScanWithTotal( const FunctorType & f
-              , const Policy      & policy 
-              , ReturnType        & arg_returnvalue)
-  {
-    const auto len = policy.end()-policy.begin();
+  inline ParallelScanWithTotal(const FunctorType& f, const Policy& policy,
+                               ReturnType& arg_returnvalue) {
+    const auto len = policy.end() - policy.begin();
 
+    if (len == 0) return;
 
-    if(len==0) return;
-
-    scan_enqueue<Tag,ReturnType>(len, f, arg_returnvalue, [](hc::tiled_index<1> idx, int, int) { return idx.global[0]; });
+    scan_enqueue<Tag, ReturnType>(
+        len, f, arg_returnvalue,
+        [](hc::tiled_index<1> idx, int, int) { return idx.global[0]; });
   }
 
   KOKKOS_INLINE_FUNCTION
@@ -1361,30 +1302,29 @@ public:
   //----------------------------------------
 };
 
-template< class FunctorType , class... Traits>
-class ParallelScan< FunctorType , Kokkos::TeamPolicy< Traits... >, Kokkos::Experimental::ROCm >
-{
-private:
-
-  using Policy = Kokkos::Impl::TeamPolicyInternal< Kokkos::Experimental::ROCm, Traits... >;
+template <class FunctorType, class... Traits>
+class ParallelScan<FunctorType, Kokkos::TeamPolicy<Traits...>,
+                   Kokkos::Experimental::ROCm> {
+ private:
+  using Policy =
+      Kokkos::Impl::TeamPolicyInternal<Kokkos::Experimental::ROCm, Traits...>;
   typedef typename Policy::work_tag Tag;
-  typedef Kokkos::Impl::FunctorValueTraits< FunctorType, Tag>  ValueTraits;
-
-public:
+  typedef Kokkos::Impl::FunctorValueTraits<FunctorType, Tag> ValueTraits;
 
+ public:
   //----------------------------------------
 
-  inline
-  ParallelScan( const FunctorType & f
-              , const Policy      & policy )
-  {
+  inline ParallelScan(const FunctorType& f, const Policy& policy) {
     const auto league_size = policy.league_size();
-    const auto team_size = policy.team_size(f);
-    const auto len  = league_size * team_size;
-      
-    if(len == 0) return;
+    const auto team_size   = policy.team_size(f);
+    const auto len         = league_size * team_size;
 
-    scan_enqueue<Tag>(len, f, [&](hc::tiled_index<1> idx, int n_teams, int n_leagues) { return typename Policy::member_type(idx,n_leagues,n_teams); });
+    if (len == 0) return;
+
+    scan_enqueue<Tag>(
+        len, f, [&](hc::tiled_index<1> idx, int n_teams, int n_leagues) {
+          return typename Policy::member_type(idx, n_leagues, n_teams);
+        });
   }
 
   KOKKOS_INLINE_FUNCTION
@@ -1393,76 +1333,71 @@ public:
   //----------------------------------------
 };
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
 
 namespace Kokkos {
 namespace Impl {
-  template<typename iType>
-  struct TeamThreadRangeBoundariesStruct<iType,ROCmTeamMember> {
-    typedef iType index_type;
-    const iType start;
-    const iType end;
-    const iType increment;
-    const ROCmTeamMember& thread;
+template <typename iType>
+struct TeamThreadRangeBoundariesStruct<iType, ROCmTeamMember> {
+  typedef iType index_type;
+  const iType start;
+  const iType end;
+  const iType increment;
+  const ROCmTeamMember& thread;
 
-#if defined( __HCC_ACCELERATOR__ )
-    KOKKOS_INLINE_FUNCTION
-    TeamThreadRangeBoundariesStruct (const ROCmTeamMember& thread_, const iType& count):
-      start( thread_.team_rank() ),
-      end( count ),
-      increment( thread_.team_size() ),
-      thread(thread_)
-    {}
-    KOKKOS_INLINE_FUNCTION
-    TeamThreadRangeBoundariesStruct (const ROCmTeamMember& thread_,  const iType& begin_, const iType& end_):
-      start( begin_ + thread_.team_rank() ),
-      end( end_ ),
-      increment( thread_.team_size() ),
-      thread(thread_)
-    {}
+#if defined(__HCC_ACCELERATOR__)
+  KOKKOS_INLINE_FUNCTION
+  TeamThreadRangeBoundariesStruct(const ROCmTeamMember& thread_,
+                                  const iType& count)
+      : start(thread_.team_rank()),
+        end(count),
+        increment(thread_.team_size()),
+        thread(thread_) {}
+  KOKKOS_INLINE_FUNCTION
+  TeamThreadRangeBoundariesStruct(const ROCmTeamMember& thread_,
+                                  const iType& begin_, const iType& end_)
+      : start(begin_ + thread_.team_rank()),
+        end(end_),
+        increment(thread_.team_size()),
+        thread(thread_) {}
 #else
-    KOKKOS_INLINE_FUNCTION
-    TeamThreadRangeBoundariesStruct (const ROCmTeamMember& thread_, const iType& count):
-      start( 0 ),
-      end( count ),
-      increment( 1 ),
-      thread(thread_)
-    {}
-    KOKKOS_INLINE_FUNCTION
-    TeamThreadRangeBoundariesStruct (const ROCmTeamMember& thread_,  const iType& begin_, const iType& end_):
-      start( begin_ ),
-      end( end_ ),
-      increment( 1 ),
-      thread(thread_)
-    {}
+  KOKKOS_INLINE_FUNCTION
+  TeamThreadRangeBoundariesStruct(const ROCmTeamMember& thread_,
+                                  const iType& count)
+      : start(0), end(count), increment(1), thread(thread_) {}
+  KOKKOS_INLINE_FUNCTION
+  TeamThreadRangeBoundariesStruct(const ROCmTeamMember& thread_,
+                                  const iType& begin_, const iType& end_)
+      : start(begin_), end(end_), increment(1), thread(thread_) {}
 #endif
-  };
+};
 
-  template<typename iType>
-  struct ThreadVectorRangeBoundariesStruct<iType,ROCmTeamMember> {
-    typedef iType index_type;
-    const index_type start;
-    const index_type end;
-    const index_type increment;
-    const ROCmTeamMember& thread;
+template <typename iType>
+struct ThreadVectorRangeBoundariesStruct<iType, ROCmTeamMember> {
+  typedef iType index_type;
+  const index_type start;
+  const index_type end;
+  const index_type increment;
+  const ROCmTeamMember& thread;
 
-#if defined( __HCC_ACCELERATOR__ )
-    KOKKOS_INLINE_FUNCTION
-    ThreadVectorRangeBoundariesStruct (const ROCmTeamMember& thread_, const index_type& count):
-      start( thread_.lindex()%thread_.vector_length() ),
-      end( count ),
-      increment( thread_.vector_length() ),
-      thread(thread_)
-    {}
+#if defined(__HCC_ACCELERATOR__)
+  KOKKOS_INLINE_FUNCTION
+  ThreadVectorRangeBoundariesStruct(const ROCmTeamMember& thread_,
+                                    const index_type& count)
+      : start(thread_.lindex() % thread_.vector_length()),
+        end(count),
+        increment(thread_.vector_length()),
+        thread(thread_) {}
 
-    KOKKOS_INLINE_FUNCTION
-    ThreadVectorRangeBoundariesStruct (const ROCmTeamMember& thread_, const index_type& arg_begin, const index_type& arg_end):
-      start( arg_begin + thread_.lindex()%thread_.vector_length() ),
-      end( arg_end ),
-      increment( thread_.vector_length() ),
-      thread(thread_)
-    {}
+  KOKKOS_INLINE_FUNCTION
+  ThreadVectorRangeBoundariesStruct(const ROCmTeamMember& thread_,
+                                    const index_type& arg_begin,
+                                    const index_type& arg_end)
+      : start(arg_begin + thread_.lindex() % thread_.vector_length()),
+        end(arg_end),
+        increment(thread_.vector_length()),
+        thread(thread_) {}
 
 //    KOKKOS_INLINE_FUNCTION
 //    ThreadVectorRangeBoundariesStruct (const index_type& count):
@@ -1471,319 +1406,362 @@ namespace Impl {
 //      increment( 1 )
 //    {}
 #else
-    KOKKOS_INLINE_FUNCTION
-    ThreadVectorRangeBoundariesStruct (const ROCmTeamMember& thread_, const index_type& count):
-      start( static_cast<index_type>(0) ),
-      end( count ),
-      increment( static_cast<index_type>(1) ),
-      thread(thread_)
-    {}
-    KOKKOS_INLINE_FUNCTION
-    ThreadVectorRangeBoundariesStruct (const index_type& count):
-      start( static_cast<index_type>(0) ),
-      end( count ),
-      increment( static_cast<index_type>(1) )
-    {}
+  KOKKOS_INLINE_FUNCTION
+  ThreadVectorRangeBoundariesStruct(const ROCmTeamMember& thread_,
+                                    const index_type& count)
+      : start(static_cast<index_type>(0)),
+        end(count),
+        increment(static_cast<index_type>(1)),
+        thread(thread_) {}
+  KOKKOS_INLINE_FUNCTION
+  ThreadVectorRangeBoundariesStruct(const index_type& count)
+      : start(static_cast<index_type>(0)),
+        end(count),
+        increment(static_cast<index_type>(1)) {}
 
-    KOKKOS_INLINE_FUNCTION
-    ThreadVectorRangeBoundariesStruct (const ROCmTeamMember& thread_, const index_type& arg_begin, const index_type& arg_end):
-      start( arg_begin ),
-      end( arg_end ),
-      increment( static_cast<index_type>(1) ),
-      thread(thread_)
-    {}
-    KOKKOS_INLINE_FUNCTION
-    ThreadVectorRangeBoundariesStruct (const index_type& arg_begin, const index_type& arg_end):
-      start( arg_begin ),
-      end( arg_end ),
-      increment( static_cast<index_type>(1) )
-    {}
+  KOKKOS_INLINE_FUNCTION
+  ThreadVectorRangeBoundariesStruct(const ROCmTeamMember& thread_,
+                                    const index_type& arg_begin,
+                                    const index_type& arg_end)
+      : start(arg_begin),
+        end(arg_end),
+        increment(static_cast<index_type>(1)),
+        thread(thread_) {}
+  KOKKOS_INLINE_FUNCTION
+  ThreadVectorRangeBoundariesStruct(const index_type& arg_begin,
+                                    const index_type& arg_end)
+      : start(arg_begin), end(arg_end), increment(static_cast<index_type>(1)) {}
 #endif
-  };
+};
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
 
 namespace Kokkos {
 
-template<typename iType>
+template <typename iType>
 KOKKOS_INLINE_FUNCTION
-Impl::TeamThreadRangeBoundariesStruct<iType,Impl::ROCmTeamMember>
-  TeamThreadRange(const Impl::ROCmTeamMember& thread, iType count) {
-  return Impl::TeamThreadRangeBoundariesStruct<iType,Impl::ROCmTeamMember>(thread,count);
+    Impl::TeamThreadRangeBoundariesStruct<iType, Impl::ROCmTeamMember>
+    TeamThreadRange(const Impl::ROCmTeamMember& thread, iType count) {
+  return Impl::TeamThreadRangeBoundariesStruct<iType, Impl::ROCmTeamMember>(
+      thread, count);
 }
 
-template<typename iType1,typename iType2>
-KOKKOS_INLINE_FUNCTION
-Impl::TeamThreadRangeBoundariesStruct<typename std::common_type< iType1, iType2 >::type,Impl::ROCmTeamMember>
-  TeamThreadRange(const Impl::ROCmTeamMember& thread, iType1 begin, iType2 end) {
-  typedef typename std::common_type< iType1, iType2 >::type iType;
-  return Impl::TeamThreadRangeBoundariesStruct<iType,Impl::ROCmTeamMember>(thread,begin,end);
+template <typename iType1, typename iType2>
+KOKKOS_INLINE_FUNCTION Impl::TeamThreadRangeBoundariesStruct<
+    typename std::common_type<iType1, iType2>::type, Impl::ROCmTeamMember>
+TeamThreadRange(const Impl::ROCmTeamMember& thread, iType1 begin, iType2 end) {
+  typedef typename std::common_type<iType1, iType2>::type iType;
+  return Impl::TeamThreadRangeBoundariesStruct<iType, Impl::ROCmTeamMember>(
+      thread, begin, end);
 }
 
-template<typename iType>
+template <typename iType>
 KOKKOS_INLINE_FUNCTION
-Impl::ThreadVectorRangeBoundariesStruct<iType,Impl::ROCmTeamMember >
-  ThreadVectorRange(const Impl::ROCmTeamMember& thread, iType count) {
-  return Impl::ThreadVectorRangeBoundariesStruct<iType,Impl::ROCmTeamMember >(thread,count);
+    Impl::ThreadVectorRangeBoundariesStruct<iType, Impl::ROCmTeamMember>
+    ThreadVectorRange(const Impl::ROCmTeamMember& thread, iType count) {
+  return Impl::ThreadVectorRangeBoundariesStruct<iType, Impl::ROCmTeamMember>(
+      thread, count);
 }
 
-template<typename iType>
+template <typename iType>
 KOKKOS_INLINE_FUNCTION
-Impl::ThreadVectorRangeBoundariesStruct<iType,Impl::ROCmTeamMember >
-  ThreadVectorRange(const Impl::ROCmTeamMember& thread, iType arg_begin, iType arg_end) {
-  return Impl::ThreadVectorRangeBoundariesStruct<iType,Impl::ROCmTeamMember >(thread,arg_begin,arg_end);
+    Impl::ThreadVectorRangeBoundariesStruct<iType, Impl::ROCmTeamMember>
+    ThreadVectorRange(const Impl::ROCmTeamMember& thread, iType arg_begin,
+                      iType arg_end) {
+  return Impl::ThreadVectorRangeBoundariesStruct<iType, Impl::ROCmTeamMember>(
+      thread, arg_begin, arg_end);
 }
 
 KOKKOS_INLINE_FUNCTION
-Impl::ThreadSingleStruct<Impl::ROCmTeamMember> PerTeam(const Impl::ROCmTeamMember& thread) {
+Impl::ThreadSingleStruct<Impl::ROCmTeamMember> PerTeam(
+    const Impl::ROCmTeamMember& thread) {
   return Impl::ThreadSingleStruct<Impl::ROCmTeamMember>(thread);
 }
 
 KOKKOS_INLINE_FUNCTION
-Impl::VectorSingleStruct<Impl::ROCmTeamMember> PerThread(const Impl::ROCmTeamMember& thread) {
+Impl::VectorSingleStruct<Impl::ROCmTeamMember> PerThread(
+    const Impl::ROCmTeamMember& thread) {
   return Impl::VectorSingleStruct<Impl::ROCmTeamMember>(thread);
 }
 
-template<class FunctorType>
-KOKKOS_INLINE_FUNCTION
-void single(const Impl::VectorSingleStruct<Impl::ROCmTeamMember>& single_struct, const FunctorType& lambda) {
-  if(single_struct.team_member.vector_rank()==0) lambda();
+template <class FunctorType>
+KOKKOS_INLINE_FUNCTION void single(
+    const Impl::VectorSingleStruct<Impl::ROCmTeamMember>& single_struct,
+    const FunctorType& lambda) {
+  if (single_struct.team_member.vector_rank() == 0) lambda();
 }
 
-template<class FunctorType>
-KOKKOS_INLINE_FUNCTION
-void single(const Impl::ThreadSingleStruct<Impl::ROCmTeamMember>& single_struct, const FunctorType& lambda) {
-  if((single_struct.team_member.lindex()==0)) lambda();
+template <class FunctorType>
+KOKKOS_INLINE_FUNCTION void single(
+    const Impl::ThreadSingleStruct<Impl::ROCmTeamMember>& single_struct,
+    const FunctorType& lambda) {
+  if ((single_struct.team_member.lindex() == 0)) lambda();
 }
 
-template<class FunctorType, class ValueType>
-KOKKOS_INLINE_FUNCTION
-void single(const Impl::VectorSingleStruct<Impl::ROCmTeamMember>& single_struct, const FunctorType& lambda, ValueType& val) {
+template <class FunctorType, class ValueType>
+KOKKOS_INLINE_FUNCTION void single(
+    const Impl::VectorSingleStruct<Impl::ROCmTeamMember>& single_struct,
+    const FunctorType& lambda, ValueType& val) {
 #if defined(ROCM15)
   // 1.5 needs this more proper restriction on which work units run
-  if( single_struct.team_member.vector_rank()==0) lambda(val);
-  val = shfl(val,0,single_struct.team_member.vector_length());
+  if (single_struct.team_member.vector_rank() == 0) lambda(val);
+  val = shfl(val, 0, single_struct.team_member.vector_length());
 #else
-  // but older compilers are fine with this (TestTeamVector::Test< Kokkos::Experimental::ROCm >(4))
+  // but older compilers are fine with this (TestTeamVector::Test<
+  // Kokkos::Experimental::ROCm >(4))
   lambda(val);
 #endif
 }
 
-template<class FunctorType, class ValueType>
-KOKKOS_INLINE_FUNCTION
-void single(const Impl::ThreadSingleStruct<Impl::ROCmTeamMember>& single_struct, const FunctorType& lambda, ValueType& val) {
-  if(single_struct.team_member.lindex()==0) lambda(val);
-  single_struct.team_member.team_broadcast(val,0);
+template <class FunctorType, class ValueType>
+KOKKOS_INLINE_FUNCTION void single(
+    const Impl::ThreadSingleStruct<Impl::ROCmTeamMember>& single_struct,
+    const FunctorType& lambda, ValueType& val) {
+  if (single_struct.team_member.lindex() == 0) lambda(val);
+  single_struct.team_member.team_broadcast(val, 0);
 }
 
-}
+}  // namespace Kokkos
 
 namespace Kokkos {
 
-  /** \brief  Inter-thread parallel_for. Executes lambda(iType i) for each i=0..N-1.
-   *
-   * The range i=0..N-1 is mapped to all threads of the the calling thread team.
-   * This functionality requires C++11 support.*/
-template<typename iType, class Lambda>
-KOKKOS_INLINE_FUNCTION
-void parallel_for(const Impl::TeamThreadRangeBoundariesStruct<iType,Impl::ROCmTeamMember>& loop_boundaries, const Lambda& lambda) {
-  for( iType i = loop_boundaries.start; i < loop_boundaries.end; i+=loop_boundaries.increment)
+/** \brief  Inter-thread parallel_for. Executes lambda(iType i) for each
+ * i=0..N-1.
+ *
+ * The range i=0..N-1 is mapped to all threads of the the calling thread team.
+ * This functionality requires C++11 support.*/
+template <typename iType, class Lambda>
+KOKKOS_INLINE_FUNCTION void parallel_for(
+    const Impl::TeamThreadRangeBoundariesStruct<iType, Impl::ROCmTeamMember>&
+        loop_boundaries,
+    const Lambda& lambda) {
+  for (iType i = loop_boundaries.start; i < loop_boundaries.end;
+       i += loop_boundaries.increment)
     lambda(i);
 }
 
-/** \brief  Inter-thread thread range parallel_reduce. Executes lambda(iType i, ValueType & val) for each i=0..N-1.
+/** \brief  Inter-thread thread range parallel_reduce. Executes lambda(iType i,
+ * ValueType & val) for each i=0..N-1.
  *
- * The range i=0..N-1 is mapped to all threads of the the calling thread team and a summation of
- * val is performed and put into result. This functionality requires C++11 support.*/
-template< typename iType, class Lambda, typename ValueType >
+ * The range i=0..N-1 is mapped to all threads of the the calling thread team
+ * and a summation of val is performed and put into result. This functionality
+ * requires C++11 support.*/
+template <typename iType, class Lambda, typename ValueType>
 KOKKOS_INLINE_FUNCTION
-typename std::enable_if< ! Kokkos::is_reducer< ValueType >::value >::type
-parallel_reduce(const Impl::TeamThreadRangeBoundariesStruct<iType,Impl::ROCmTeamMember>& loop_boundaries,
-                     const Lambda & lambda, ValueType& result) {
-
+    typename std::enable_if<!Kokkos::is_reducer<ValueType>::value>::type
+    parallel_reduce(const Impl::TeamThreadRangeBoundariesStruct<
+                        iType, Impl::ROCmTeamMember>& loop_boundaries,
+                    const Lambda& lambda, ValueType& result) {
   Kokkos::Sum<ValueType> reducer(result);
-  reducer.init( reducer.reference() );
+  reducer.init(reducer.reference());
 
-  for( iType i = loop_boundaries.start; i < loop_boundaries.end; i+=loop_boundaries.increment) {
-    lambda(i,reducer.reference());
+  for (iType i = loop_boundaries.start; i < loop_boundaries.end;
+       i += loop_boundaries.increment) {
+    lambda(i, reducer.reference());
   }
   loop_boundaries.thread.team_reduce(reducer);
 }
 
-/** \brief  Inter-thread thread range parallel_reduce. Executes lambda(iType i, ValueType & val) for each i=0..N-1.
+/** \brief  Inter-thread thread range parallel_reduce. Executes lambda(iType i,
+ * ValueType & val) for each i=0..N-1.
  *
- * The range i=0..N-1 is mapped to all threads of the the calling thread team and a summation of
- * val is performed and put into result. This functionality requires C++11 support.*/
-template< typename iType, class Lambda, typename ReducerType >
+ * The range i=0..N-1 is mapped to all threads of the the calling thread team
+ * and a summation of val is performed and put into result. This functionality
+ * requires C++11 support.*/
+template <typename iType, class Lambda, typename ReducerType>
 KOKKOS_INLINE_FUNCTION
-typename std::enable_if< Kokkos::is_reducer< ReducerType >::value >::type
-parallel_reduce(const Impl::TeamThreadRangeBoundariesStruct<iType,Impl::ROCmTeamMember>& loop_boundaries,
-                     const Lambda & lambda, ReducerType const & reducer) {
-  reducer.init( reducer.reference() );
+    typename std::enable_if<Kokkos::is_reducer<ReducerType>::value>::type
+    parallel_reduce(const Impl::TeamThreadRangeBoundariesStruct<
+                        iType, Impl::ROCmTeamMember>& loop_boundaries,
+                    const Lambda& lambda, ReducerType const& reducer) {
+  reducer.init(reducer.reference());
 
-  for( iType i = loop_boundaries.start; i < loop_boundaries.end; i+=loop_boundaries.increment) {
-    lambda(i,reducer.reference());
+  for (iType i = loop_boundaries.start; i < loop_boundaries.end;
+       i += loop_boundaries.increment) {
+    lambda(i, reducer.reference());
   }
   loop_boundaries.thread.team_reduce(reducer);
 }
 
-/** \brief  Intra-thread thread range parallel_reduce. Executes lambda(iType i, ValueType & val) for each i=0..N-1.
+/** \brief  Intra-thread thread range parallel_reduce. Executes lambda(iType i,
+ * ValueType & val) for each i=0..N-1.
  *
- * The range i=0..N-1 is mapped to all vector lanes of the the calling thread and a reduction of
- * val is performed using JoinType(ValueType& val, const ValueType& update) and put into init_result.
- * The input value of init_result is used as initializer for temporary variables of ValueType. Therefore
- * the input value should be the neutral element with respect to the join operation (e.g. '0 for +-' or
- * '1 for *'). This functionality requires C++11 support.*/
-template< typename iType, class Lambda, typename ValueType, class JoinType >
-KOKKOS_INLINE_FUNCTION
-void parallel_reduce(const Impl::TeamThreadRangeBoundariesStruct<iType,Impl::ROCmTeamMember>& loop_boundaries,
-                     const Lambda & lambda, const JoinType& join, ValueType& result) {
-
+ * The range i=0..N-1 is mapped to all vector lanes of the the calling thread
+ * and a reduction of val is performed using JoinType(ValueType& val, const
+ * ValueType& update) and put into init_result. The input value of init_result
+ * is used as initializer for temporary variables of ValueType. Therefore the
+ * input value should be the neutral element with respect to the join operation
+ * (e.g. '0 for +-' or '1 for *'). This functionality requires C++11 support.*/
+template <typename iType, class Lambda, typename ValueType, class JoinType>
+KOKKOS_INLINE_FUNCTION void parallel_reduce(
+    const Impl::TeamThreadRangeBoundariesStruct<iType, Impl::ROCmTeamMember>&
+        loop_boundaries,
+    const Lambda& lambda, const JoinType& join, ValueType& result) {
 #if defined(ROCM15)
   ValueType tmp = result;
   //  Simpler code works with ROCM1.5
-  for( iType i = loop_boundaries.start; i < loop_boundaries.end; i+=loop_boundaries.increment) {
-    lambda(i,tmp);
+  for (iType i = loop_boundaries.start; i < loop_boundaries.end;
+       i += loop_boundaries.increment) {
+    lambda(i, tmp);
   }
-  result = loop_boundaries.thread.team_reduce(tmp,join);
+  result = loop_boundaries.thread.team_reduce(tmp, join);
 #else
   // this workaround freezes up with ROCM1.5, but needed for earlier compilers
-  for( iType i = loop_boundaries.start; i < loop_boundaries.end; i+=loop_boundaries.increment) {
+  for (iType i = loop_boundaries.start; i < loop_boundaries.end;
+       i += loop_boundaries.increment) {
     ValueType tmp = ValueType();
-    lambda(i,tmp);
-    join(result,tmp);
+    lambda(i, tmp);
+    join(result, tmp);
   }
-  result = loop_boundaries.thread.team_reduce(result,join);
+  result = loop_boundaries.thread.team_reduce(result, join);
 #endif
-//  Impl::rocm_intra_workgroup_reduction( loop_boundaries.thread, result,join);
-//  Impl::rocm_inter_workgroup_reduction( loop_boundaries.thread, result,join);
+  //  Impl::rocm_intra_workgroup_reduction( loop_boundaries.thread,
+  //  result,join); Impl::rocm_inter_workgroup_reduction(
+  //  loop_boundaries.thread, result,join);
 }
 
-} //namespace Kokkos
-
+}  // namespace Kokkos
 
 namespace Kokkos {
-/** \brief  Intra-thread vector parallel_for. Executes lambda(iType i) for each i=0..N-1.
+/** \brief  Intra-thread vector parallel_for. Executes lambda(iType i) for each
+ * i=0..N-1.
  *
  * The range i=0..N-1 is mapped to all vector lanes of the the calling thread.
  * This functionality requires C++11 support.*/
-template<typename iType, class Lambda>
-KOKKOS_INLINE_FUNCTION
-void parallel_for(const Impl::ThreadVectorRangeBoundariesStruct<iType,Impl::ROCmTeamMember >&
-    loop_boundaries, const Lambda& lambda) {
-
-  for( iType i = loop_boundaries.start; i < loop_boundaries.end; i+=loop_boundaries.increment)
+template <typename iType, class Lambda>
+KOKKOS_INLINE_FUNCTION void parallel_for(
+    const Impl::ThreadVectorRangeBoundariesStruct<iType, Impl::ROCmTeamMember>&
+        loop_boundaries,
+    const Lambda& lambda) {
+  for (iType i = loop_boundaries.start; i < loop_boundaries.end;
+       i += loop_boundaries.increment)
     lambda(i);
 }
 
-/** \brief  Intra-thread vector parallel_reduce. Executes lambda(iType i, ValueType & val) for each i=0..N-1.
+/** \brief  Intra-thread vector parallel_reduce. Executes lambda(iType i,
+ * ValueType & val) for each i=0..N-1.
  *
- * The range i=0..N-1 is mapped to all vector lanes of the the calling thread and a summation of
- * val is performed and put into result. This functionality requires C++11 support.*/
-template< typename iType, class Lambda, typename ValueType >
+ * The range i=0..N-1 is mapped to all vector lanes of the the calling thread
+ * and a summation of val is performed and put into result. This functionality
+ * requires C++11 support.*/
+template <typename iType, class Lambda, typename ValueType>
 KOKKOS_INLINE_FUNCTION
-typename std::enable_if< !Kokkos::is_reducer< ValueType >::value >::type 
-parallel_reduce(const Impl::ThreadVectorRangeBoundariesStruct<iType,Impl::ROCmTeamMember >&
-      loop_boundaries, const Lambda & lambda, ValueType& result) {
+    typename std::enable_if<!Kokkos::is_reducer<ValueType>::value>::type
+    parallel_reduce(const Impl::ThreadVectorRangeBoundariesStruct<
+                        iType, Impl::ROCmTeamMember>& loop_boundaries,
+                    const Lambda& lambda, ValueType& result) {
   result = ValueType();
 
-  for( iType i = loop_boundaries.start; i < loop_boundaries.end; i+=loop_boundaries.increment) {
+  for (iType i = loop_boundaries.start; i < loop_boundaries.end;
+       i += loop_boundaries.increment) {
     ValueType tmp = ValueType();
-    lambda(i,tmp);
-    result+=tmp;
+    lambda(i, tmp);
+    result += tmp;
   }
-  result = loop_boundaries.thread.thread_reduce(result,Impl::JoinAdd<ValueType>());
+  result =
+      loop_boundaries.thread.thread_reduce(result, Impl::JoinAdd<ValueType>());
 }
 
-/** \brief  Intra-thread vector parallel_reduce. Executes lambda(iType i, ValueType & val) for each i=0..N-1.
+/** \brief  Intra-thread vector parallel_reduce. Executes lambda(iType i,
+ * ValueType & val) for each i=0..N-1.
  *
- * The range i=0..N-1 is mapped to all vector lanes of the the calling thread and a reduction of
- * val is performed using JoinType(ValueType& val, const ValueType& update) and put into init_result.
- * The input value of init_result is used as initializer for temporary variables of ValueType. Therefore
- * the input value should be the neutral element with respect to the join operation (e.g. '0 for +-' or
- * '1 for *'). This functionality requires C++11 support.*/
-template< typename iType, class Lambda, typename ValueType, class JoinType >
-KOKKOS_INLINE_FUNCTION
-void parallel_reduce(const Impl::ThreadVectorRangeBoundariesStruct<iType,Impl::ROCmTeamMember >&
-      loop_boundaries, const Lambda & lambda, const JoinType& join, ValueType& result) {
-
-  for( iType i = loop_boundaries.start; i < loop_boundaries.end; i+=loop_boundaries.increment) {
-    lambda(i,result);  
+ * The range i=0..N-1 is mapped to all vector lanes of the the calling thread
+ * and a reduction of val is performed using JoinType(ValueType& val, const
+ * ValueType& update) and put into init_result. The input value of init_result
+ * is used as initializer for temporary variables of ValueType. Therefore the
+ * input value should be the neutral element with respect to the join operation
+ * (e.g. '0 for +-' or '1 for *'). This functionality requires C++11 support.*/
+template <typename iType, class Lambda, typename ValueType, class JoinType>
+KOKKOS_INLINE_FUNCTION void parallel_reduce(
+    const Impl::ThreadVectorRangeBoundariesStruct<iType, Impl::ROCmTeamMember>&
+        loop_boundaries,
+    const Lambda& lambda, const JoinType& join, ValueType& result) {
+  for (iType i = loop_boundaries.start; i < loop_boundaries.end;
+       i += loop_boundaries.increment) {
+    lambda(i, result);
     loop_boundaries.thread.team_barrier();
   }
-  result = loop_boundaries.thread.thread_reduce(result,join);
+  result = loop_boundaries.thread.thread_reduce(result, join);
 }
 
-
-/** \brief  Intra-thread vector parallel_reduce. Executes lambda(iType i, ValueType & val) for each i=0..N-1.
+/** \brief  Intra-thread vector parallel_reduce. Executes lambda(iType i,
+ * ValueType & val) for each i=0..N-1.
  *
- * The range i=0..N-1 is mapped to all vector lanes of the the calling thread and a summation of
- * val is performed and put into result. This functionality requires C++11 support.*/
-template< typename iType, class Lambda, typename ReducerType >
+ * The range i=0..N-1 is mapped to all vector lanes of the the calling thread
+ * and a summation of val is performed and put into result. This functionality
+ * requires C++11 support.*/
+template <typename iType, class Lambda, typename ReducerType>
 KOKKOS_INLINE_FUNCTION
-typename std::enable_if< Kokkos::is_reducer< ReducerType >::value >::type
-parallel_reduce(const Impl::ThreadVectorRangeBoundariesStruct<iType,Impl::ROCmTeamMember >&
-      loop_boundaries, const Lambda & lambda, ReducerType const & reducer) {
-  reducer.init( reducer.reference() );
+    typename std::enable_if<Kokkos::is_reducer<ReducerType>::value>::type
+    parallel_reduce(const Impl::ThreadVectorRangeBoundariesStruct<
+                        iType, Impl::ROCmTeamMember>& loop_boundaries,
+                    const Lambda& lambda, ReducerType const& reducer) {
+  reducer.init(reducer.reference());
 
-  for( iType i = loop_boundaries.start; i < loop_boundaries.end; i+=loop_boundaries.increment) {
-    lambda(i,reducer.reference());
+  for (iType i = loop_boundaries.start; i < loop_boundaries.end;
+       i += loop_boundaries.increment) {
+    lambda(i, reducer.reference());
   }
   loop_boundaries.thread.vector_reduce(reducer);
 }
-/** \brief  Intra-thread vector parallel_reduce. Executes lambda(iType i, ValueType & val) for each i=0..N-1.
+/** \brief  Intra-thread vector parallel_reduce. Executes lambda(iType i,
+ * ValueType & val) for each i=0..N-1.
  *
- * The range i=0..N-1 is mapped to all vector lanes of the the calling thread and a reduction of
- * val is performed using JoinType(ValueType& val, const ValueType& update) and put into init_result.
- * The input value of init_result is used as initializer for temporary variables of ValueType. Therefore
- * the input value should be the neutral element with respect to the join operation (e.g. '0 for +-' or
- * '1 for *'). This functionality requires C++11 support.*/
-template< typename iType, class Lambda, typename ReducerType, class JoinType >
-KOKKOS_INLINE_FUNCTION
-void parallel_reduce(const Impl::ThreadVectorRangeBoundariesStruct<iType,Impl::ROCmTeamMember >&
-      loop_boundaries, const Lambda & lambda, const JoinType& join, ReducerType const & reducer) {
-
-  for( iType i = loop_boundaries.start; i < loop_boundaries.end; i+=loop_boundaries.increment) {
-    lambda(i,reducer.reference());  
+ * The range i=0..N-1 is mapped to all vector lanes of the the calling thread
+ * and a reduction of val is performed using JoinType(ValueType& val, const
+ * ValueType& update) and put into init_result. The input value of init_result
+ * is used as initializer for temporary variables of ValueType. Therefore the
+ * input value should be the neutral element with respect to the join operation
+ * (e.g. '0 for +-' or '1 for *'). This functionality requires C++11 support.*/
+template <typename iType, class Lambda, typename ReducerType, class JoinType>
+KOKKOS_INLINE_FUNCTION void parallel_reduce(
+    const Impl::ThreadVectorRangeBoundariesStruct<iType, Impl::ROCmTeamMember>&
+        loop_boundaries,
+    const Lambda& lambda, const JoinType& join, ReducerType const& reducer) {
+  for (iType i = loop_boundaries.start; i < loop_boundaries.end;
+       i += loop_boundaries.increment) {
+    lambda(i, reducer.reference());
     loop_boundaries.thread.team_barrier();
   }
-  reducer.reference() = loop_boundaries.thread.thread_reduce(reducer.reference(),join);
+  reducer.reference() =
+      loop_boundaries.thread.thread_reduce(reducer.reference(), join);
 }
 
-/** \brief  Intra-thread vector parallel exclusive prefix sum. Executes lambda(iType i, ValueType & val, bool final)
- *          for each i=0..N-1.
+/** \brief  Intra-thread vector parallel exclusive prefix sum. Executes
+ * lambda(iType i, ValueType & val, bool final) for each i=0..N-1.
  *
- * The range i=0..N-1 is mapped to all vector lanes in the thread and a scan operation is performed.
- * Depending on the target execution space the operator might be called twice: once with final=false
- * and once with final=true. When final==true val contains the prefix sum value. The contribution of this
- * "i" needs to be added to val no matter whether final==true or not. In a serial execution
- * (i.e. team_size==1) the operator is only called once with final==true. Scan_val will be set
- * to the final sum value over all vector lanes.
- * This functionality requires C++11 support.*/
-template< typename iType, class FunctorType >
-KOKKOS_INLINE_FUNCTION
-void parallel_scan(const Impl::ThreadVectorRangeBoundariesStruct<iType,Impl::ROCmTeamMember >&
-      loop_boundaries, const FunctorType & lambda) {
+ * The range i=0..N-1 is mapped to all vector lanes in the thread and a scan
+ * operation is performed. Depending on the target execution space the operator
+ * might be called twice: once with final=false and once with final=true. When
+ * final==true val contains the prefix sum value. The contribution of this "i"
+ * needs to be added to val no matter whether final==true or not. In a serial
+ * execution (i.e. team_size==1) the operator is only called once with
+ * final==true. Scan_val will be set to the final sum value over all vector
+ * lanes. This functionality requires C++11 support.*/
+template <typename iType, class FunctorType>
+KOKKOS_INLINE_FUNCTION void parallel_scan(
+    const Impl::ThreadVectorRangeBoundariesStruct<iType, Impl::ROCmTeamMember>&
+        loop_boundaries,
+    const FunctorType& lambda) {
+  typedef Kokkos::Impl::FunctorValueTraits<FunctorType, void> ValueTraits;
+  typedef typename ValueTraits::value_type value_type;
 
-  typedef Kokkos::Impl::FunctorValueTraits< FunctorType , void > ValueTraits ;
-  typedef typename ValueTraits::value_type value_type ;
-
-  value_type val = value_type();
+  value_type val          = value_type();
   const int vector_length = loop_boundaries.thread.vector_length();
-  const int vector_rank = loop_boundaries.thread.vector_rank();
+  const int vector_rank   = loop_boundaries.thread.vector_rank();
 
-  iType end = ((loop_boundaries.end+vector_length-1)/vector_length) * vector_length;
+  iType end = ((loop_boundaries.end + vector_length - 1) / vector_length) *
+              vector_length;
   value_type accum = value_type();
 
-  for ( int i = vector_rank ; i < end ; i += vector_length ) {
-
-    value_type val = 0 ;
+  for (int i = vector_rank; i < end; i += vector_length) {
+    value_type val = 0;
 
     // First acquire per-lane contributions:
-    if ( i < loop_boundaries.end ) lambda( i , val , false );
+    if (i < loop_boundaries.end) lambda(i, val, false);
 
-    value_type sval = val ;
+    value_type sval = val;
 
     // Bottom up inclusive scan in triangular pattern
     // where each thread is the root of a reduction tree
@@ -1793,23 +1771,24 @@ void parallel_scan(const Impl::ThreadVectorRangeBoundariesStruct<iType,Impl::ROC
     //  [t] += [t-4] if t >= 4
     //  ...
 
-    for ( int j = 1 ; j < vector_length ; j <<= 1 ) {
-      value_type tmp = 0 ;
-      tmp = shfl_up(sval , j , vector_length );
-      if ( j <= vector_rank ) { sval += tmp ; }
+    for (int j = 1; j < vector_length; j <<= 1) {
+      value_type tmp = 0;
+      tmp            = shfl_up(sval, j, vector_length);
+      if (j <= vector_rank) {
+        sval += tmp;
+      }
     }
 
     // Include accumulation and remove value for exclusive scan:
-    val = accum + sval - val ;
+    val = accum + sval - val;
 
     // Provide exclusive scan value:
-    if ( i < loop_boundaries.end ) lambda( i , val , true );
+    if (i < loop_boundaries.end) lambda(i, val, true);
 
     // Accumulate the last value in the inclusive scan:
-    sval = shfl( sval , vector_length-1 , vector_length);
-    accum += sval ;
+    sval = shfl(sval, vector_length - 1, vector_length);
+    accum += sval;
   }
 }
 
-} // namespace Kokkos
-
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/ROCm/Kokkos_ROCm_Reduce.hpp b/lib/kokkos/core/src/ROCm/Kokkos_ROCm_Reduce.hpp
index 0321f3d53f..59a6a0433c 100644
--- a/lib/kokkos/core/src/ROCm/Kokkos_ROCm_Reduce.hpp
+++ b/lib/kokkos/core/src/ROCm/Kokkos_ROCm_Reduce.hpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -45,7 +46,7 @@
 // AMP REDUCE
 //////////////////////////////////////////////////////////////////////////////
 
-#if !defined( KOKKOS_ROCM_AMP_REDUCE_INL )
+#if !defined(KOKKOS_ROCM_AMP_REDUCE_INL)
 #define KOKKOS_ROCM_AMP_REDUCE_INL
 
 #include <iostream>
@@ -62,127 +63,122 @@
 namespace Kokkos {
 namespace Impl {
 
-template<class T>
-T* reduce_value(T* x, std::true_type) [[hc]]
-{
+template <class T>
+T* reduce_value(T* x, std::true_type) [[hc]] {
   return x;
 }
 
-template<class T>
-T& reduce_value(T* x, std::false_type) [[hc]]
-{
+template <class T>
+T& reduce_value(T* x, std::false_type) [[hc]] {
   return *x;
 }
 
 #ifdef KOKKOS_IMPL_ROCM_CLANG_WORKAROUND
-struct always_true
-{
-    template<class... Ts>
-    bool operator()(Ts&&...) const
-    {
-        return true;
-    }
+struct always_true {
+  template <class... Ts>
+  bool operator()(Ts&&...) const {
+    return true;
+  }
 };
 #endif
 
-template< class Tag, class F, class ReducerType, class Invoker, class T >
-void reduce_enqueue(
-  const int szElements,  // size of the extent
-  const F & f,
-  const ReducerType& reducer,
-  Invoker invoke,
-  T * const output_result,
-  int const output_length,
-  const int team_size=64,
-  const int vector_size=1,
-  int const shared_size=0)
-{
-  using namespace hc ;
+template <class Tag, class F, class ReducerType, class Invoker, class T>
+void reduce_enqueue(const int szElements,  // size of the extent
+                    const F& f, const ReducerType& reducer, Invoker invoke,
+                    T* const output_result, int const output_length,
+                    const int team_size = 64, const int vector_size = 1,
+                    int const shared_size = 0) {
+  using namespace hc;
 
-  typedef Kokkos::Impl::if_c< std::is_same<InvalidType,ReducerType>::value, F, ReducerType> ReducerConditional;
+  typedef Kokkos::Impl::if_c<std::is_same<InvalidType, ReducerType>::value, F,
+                             ReducerType>
+      ReducerConditional;
   typedef typename ReducerConditional::type ReducerTypeFwd;
-  typedef typename Kokkos::Impl::if_c< std::is_same<InvalidType, ReducerType>::value, Tag, void >::type TagFwd;
+  typedef
+      typename Kokkos::Impl::if_c<std::is_same<InvalidType, ReducerType>::value,
+                                  Tag, void>::type TagFwd;
 
-  typedef Kokkos::Impl::FunctorValueTraits< ReducerTypeFwd , TagFwd > ValueTraits ;
-  typedef Kokkos::Impl::FunctorValueInit< ReducerTypeFwd , TagFwd >   ValueInit ;
-  typedef Kokkos::Impl::FunctorValueJoin< ReducerTypeFwd , TagFwd >   ValueJoin ;
-  typedef Kokkos::Impl::FunctorFinal< ReducerTypeFwd , TagFwd >       ValueFinal ;
+  typedef Kokkos::Impl::FunctorValueTraits<ReducerTypeFwd, TagFwd> ValueTraits;
+  typedef Kokkos::Impl::FunctorValueInit<ReducerTypeFwd, TagFwd> ValueInit;
+  typedef Kokkos::Impl::FunctorValueJoin<ReducerTypeFwd, TagFwd> ValueJoin;
+  typedef Kokkos::Impl::FunctorFinal<ReducerTypeFwd, TagFwd> ValueFinal;
 
-  typedef typename ValueTraits::pointer_type   pointer_type ;
-  typedef typename ValueTraits::reference_type reference_type ;
+  typedef typename ValueTraits::pointer_type pointer_type;
+  typedef typename ValueTraits::reference_type reference_type;
 
   if (output_length < 1) return;
 
-  const auto td = get_tile_desc<T>(szElements,output_length,team_size,vector_size, shared_size);
+  const auto td = get_tile_desc<T>(szElements, output_length, team_size,
+                                   vector_size, shared_size);
 
   // allocate host and device memory for the results from each team
-  std::vector<T> result_cpu(td.num_tiles*output_length);
-  hc::array<T> result(td.num_tiles*output_length);
+  std::vector<T> result_cpu(td.num_tiles * output_length);
+  hc::array<T> result(td.num_tiles * output_length);
 
-  auto fut = tile_for<T[]>(td, [=,&result](hc::tiled_index<1> t_idx, tile_buffer<T[]> buffer) [[hc]] 
-  {
-      const auto local = t_idx.local[0];
-      const auto global = t_idx.global[0];
-      const auto tile = t_idx.tile[0];
+  auto fut = tile_for<T[]>(
+      td,
+      [ =, &result ](hc::tiled_index<1> t_idx, tile_buffer<T[]> buffer) [[hc]] {
+        const auto local  = t_idx.local[0];
+        const auto global = t_idx.global[0];
+        const auto tile   = t_idx.tile[0];
 
-      buffer.action_at(local, [&](T* state)
-      {
+        buffer.action_at(local, [&](T* state) {
           ValueInit::init(ReducerConditional::select(f, reducer), state);
-          invoke(make_rocm_invoke_fn<Tag>(f), t_idx, td, reduce_value(state, std::is_pointer<reference_type>()));
-      });
-      t_idx.barrier.wait();
+          invoke(make_rocm_invoke_fn<Tag>(f), t_idx, td,
+                 reduce_value(state, std::is_pointer<reference_type>()));
+        });
+        t_idx.barrier.wait();
 
-      for(std::size_t s = 1; s < buffer.size(); s *= 2)
-      {
+        for (std::size_t s = 1; s < buffer.size(); s *= 2) {
           const std::size_t index = 2 * s * local;
-          if (index < buffer.size())
-          {
-              buffer.action_at(index, index + s, [&](T* x, T* y)
-              {
-                  ValueJoin::join(ReducerConditional::select(f, reducer), x, y);
-              });
+          if (index < buffer.size()) {
+            buffer.action_at(index, index + s, [&](T* x, T* y) {
+              ValueJoin::join(ReducerConditional::select(f, reducer), x, y);
+            });
           }
           t_idx.barrier.wait();
-      }
+        }
 
-      // Store the tile result in the global memory.
-      if (local == 0)
-      {
+        // Store the tile result in the global memory.
+        if (local == 0) {
 #ifdef KOKKOS_IMPL_ROCM_CLANG_WORKAROUND
           // Workaround for assigning from LDS memory: std::copy should work
           // directly
-          buffer.action_at(0, [&](T* x)
-          {
+          buffer.action_at(0, [&](T* x) {
 #if ROCM15
-// new ROCM 15 address space changes aren't implemented in std algorithms yet
-              auto * src = reinterpret_cast<char *>(x);
-              auto * dest = reinterpret_cast<char *>(result.data()+tile*output_length);
-              for(int i=0; i<sizeof(T)*output_length;i++) dest[i] = src[i];
+            // new ROCM 15 address space changes aren't implemented in std
+            // algorithms yet
+            auto* src = reinterpret_cast<char*>(x);
+            auto* dest =
+                reinterpret_cast<char*>(result.data() + tile * output_length);
+            for (int i = 0; i < sizeof(T) * output_length; i++)
+              dest[i] = src[i];
 #else
               // Workaround: copy_if used to avoid memmove
               std::copy_if(x, x+output_length, result.data()+tile*output_length, always_true{} );
 #endif
           });
 #else
-          std::copy(buffer, buffer+output_length, result.data()+tile*output_length);
+          std::copy(buffer, buffer + output_length,
+                    result.data() + tile * output_length);
 
 #endif
-      }
-  });
+        }
+      });
   if (output_result != nullptr)
-     ValueInit::init(ReducerConditional::select(f, reducer), output_result);
+    ValueInit::init(ReducerConditional::select(f, reducer), output_result);
   fut.wait();
-  copy(result,result_cpu.data());
+  copy(result, result_cpu.data());
   if (output_result != nullptr) {
-    for(std::size_t i=0;i<td.num_tiles;i++)
-       ValueJoin::join(ReducerConditional::select(f, reducer), output_result, result_cpu.data()+i*output_length);
+    for (std::size_t i = 0; i < td.num_tiles; i++)
+      ValueJoin::join(ReducerConditional::select(f, reducer), output_result,
+                      result_cpu.data() + i * output_length);
 
-    ValueFinal::final( ReducerConditional::select(f, reducer) , output_result );
+    ValueFinal::final(ReducerConditional::select(f, reducer), output_result);
   }
-
 }
 
-}} //end of namespace Kokkos::Impl
+}  // namespace Impl
+}  // namespace Kokkos
 
 #endif /* #if !defined( KOKKOS_ROCM_AMP_REDUCE_INL ) */
-
diff --git a/lib/kokkos/core/src/ROCm/Kokkos_ROCm_ReduceScan.hpp b/lib/kokkos/core/src/ROCm/Kokkos_ROCm_ReduceScan.hpp
index 33efa0d6f0..29694a012c 100644
--- a/lib/kokkos/core/src/ROCm/Kokkos_ROCm_ReduceScan.hpp
+++ b/lib/kokkos/core/src/ROCm/Kokkos_ROCm_ReduceScan.hpp
@@ -1,13 +1,14 @@
 /*
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -36,7 +37,7 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 */
@@ -47,7 +48,7 @@
 #include <Kokkos_Macros.hpp>
 
 /* only compile this file if ROCM is enabled for Kokkos */
-#if defined( __HCC__ ) && defined( KOKKOS_ENABLE_ROCM )
+#if defined(__HCC__) && defined(KOKKOS_ENABLE_ROCM)
 
 //#include <utility>
 
@@ -64,149 +65,138 @@ namespace Impl {
 
 //#if __KALMAR_ACCELERATOR__ == 1
 KOKKOS_INLINE_FUNCTION
-void __syncthreads() [[hc]]
-{
-   amp_barrier(CLK_LOCAL_MEM_FENCE);
-}
-
-#define LT0 ((threadIdx_x+threadIdx_y+threadIdx_z)?0:1)
+void __syncthreads() [[hc]] { amp_barrier(CLK_LOCAL_MEM_FENCE); }
 
+#define LT0 ((threadIdx_x + threadIdx_y + threadIdx_z) ? 0 : 1)
 
 // returns non-zero if and only if predicate is non-zero for all threads
 // note that syncthreads_or uses the first 64 bits of dynamic group memory.
-// this reserved memory must be accounted for everwhere 
+// this reserved memory must be accounted for everwhere
 // that get_dynamic_group_segment_base_pointer is called.
 KOKKOS_INLINE_FUNCTION
-uint64_t __syncthreads_or(uint64_t  pred) 
-{
-  uint64_t *shared_var = (uint64_t *)hc::get_dynamic_group_segment_base_pointer();
-  if(LT0) *shared_var = 0;
+uint64_t __syncthreads_or(uint64_t pred) {
+  uint64_t *shared_var =
+      (uint64_t *)hc::get_dynamic_group_segment_base_pointer();
+  if (LT0) *shared_var = 0;
   amp_barrier(CLK_LOCAL_MEM_FENCE);
 #if __KALMAR_ACCELERATOR__ == 1
-  if (pred) hc::atomic_or_uint64(shared_var,1);
+  if (pred) hc::atomic_or_uint64(shared_var, 1);
 #endif
   amp_barrier(CLK_LOCAL_MEM_FENCE);
   return (*shared_var);
 }
 
 KOKKOS_INLINE_FUNCTION
-void __threadfence() 
-{
-   amp_barrier(CLK_LOCAL_MEM_FENCE | CLK_GLOBAL_MEM_FENCE);
+void __threadfence() {
+  amp_barrier(CLK_LOCAL_MEM_FENCE | CLK_GLOBAL_MEM_FENCE);
 }
 
 KOKKOS_INLINE_FUNCTION
-void __threadfence_block() 
-{
-   amp_barrier(CLK_LOCAL_MEM_FENCE | CLK_GLOBAL_MEM_FENCE);
+void __threadfence_block() {
+  amp_barrier(CLK_LOCAL_MEM_FENCE | CLK_GLOBAL_MEM_FENCE);
 }
 //#endif
 struct ROCm_atomic_CAS {
-    template<class OP>
-    KOKKOS_INLINE_FUNCTION
-    unsigned long operator () (volatile unsigned long * dest, OP &&op){
-       unsigned long read,compare,val;
-       compare = *dest;
-       read = compare;
-       do {
-         compare = read;
-         val = op(compare);
+  template <class OP>
+  KOKKOS_INLINE_FUNCTION unsigned long operator()(volatile unsigned long *dest,
+                                                  OP &&op) {
+    unsigned long read, compare, val;
+    compare = *dest;
+    read    = compare;
+    do {
+      compare = read;
+      val     = op(compare);
 #if __KALMAR_ACCELERATOR__ == 1
-         hc::atomic_compare_exchange((uint64_t *)dest,&read,val);
+      hc::atomic_compare_exchange((uint64_t *)dest, &read, val);
 #endif
-       } while (read != compare);
-       return val;
-    }
+    } while (read != compare);
+    return val;
+  }
 };
 
-  template<class OP>
-  KOKKOS_INLINE_FUNCTION
-  unsigned long atomic_cas_op (volatile unsigned long * dest, OP &&op) {
-    ROCm_atomic_CAS cas_op;
-    return cas_op(dest, std::forward<OP>(op));
-  }
-
-  KOKKOS_INLINE_FUNCTION
-  unsigned long atomicInc (volatile unsigned long * dest, const unsigned long& val) {
-    return atomic_cas_op(dest, [=](unsigned long old){return ((old>=val)?0:(old+1));});
-  }
+template <class OP>
+KOKKOS_INLINE_FUNCTION unsigned long atomic_cas_op(volatile unsigned long *dest,
+                                                   OP &&op) {
+  ROCm_atomic_CAS cas_op;
+  return cas_op(dest, std::forward<OP>(op));
+}
 
+KOKKOS_INLINE_FUNCTION
+unsigned long atomicInc(volatile unsigned long *dest,
+                        const unsigned long &val) {
+  return atomic_cas_op(
+      dest, [=](unsigned long old) { return ((old >= val) ? 0 : (old + 1)); });
+}
 
 //----------------------------------------------------------------------------
 
-template< typename T >
-KOKKOS_INLINE_FUNCTION
-void rocm_shfl( T & out , T const & in , int lane ,
-  typename std::enable_if< sizeof(int) == sizeof(T) , int >::type width )
-{
-  *reinterpret_cast<int*>(&out) =
-    __shfl( *reinterpret_cast<int const *>(&in) , lane , width );
+template <typename T>
+KOKKOS_INLINE_FUNCTION void rocm_shfl(
+    T &out, T const &in, int lane,
+    typename std::enable_if<sizeof(int) == sizeof(T), int>::type width) {
+  *reinterpret_cast<int *>(&out) =
+      __shfl(*reinterpret_cast<int const *>(&in), lane, width);
 }
 
-template< typename T >
-KOKKOS_INLINE_FUNCTION
-void rocm_shfl( T & out , T const & in , int lane ,
-  typename std::enable_if
-    < ( sizeof(int) < sizeof(T) ) && ( 0 == ( sizeof(T) % sizeof(int) ) )
-    , int >::type width )
-{
+template <typename T>
+KOKKOS_INLINE_FUNCTION void rocm_shfl(
+    T &out, T const &in, int lane,
+    typename std::enable_if<(sizeof(int) < sizeof(T)) &&
+                                (0 == (sizeof(T) % sizeof(int))),
+                            int>::type width) {
   enum : int { N = sizeof(T) / sizeof(int) };
 
-  for ( int i = 0 ; i < N ; ++i ) {
-    reinterpret_cast<int*>(&out)[i] =
-      __shfl( reinterpret_cast<int const *>(&in)[i] , lane , width );
+  for (int i = 0; i < N; ++i) {
+    reinterpret_cast<int *>(&out)[i] =
+        __shfl(reinterpret_cast<int const *>(&in)[i], lane, width);
   }
 }
 
 //----------------------------------------------------------------------------
 
-template< typename T >
-KOKKOS_INLINE_FUNCTION
-void rocm_shfl_down( T & out , T const & in , int delta ,
-  typename std::enable_if< sizeof(int) == sizeof(T) , int >::type width )
-{
-  *reinterpret_cast<int*>(&out) =
-    __shfl_down( *reinterpret_cast<int const *>(&in) , delta , width );
+template <typename T>
+KOKKOS_INLINE_FUNCTION void rocm_shfl_down(
+    T &out, T const &in, int delta,
+    typename std::enable_if<sizeof(int) == sizeof(T), int>::type width) {
+  *reinterpret_cast<int *>(&out) =
+      __shfl_down(*reinterpret_cast<int const *>(&in), delta, width);
 }
 
-template< typename T >
-KOKKOS_INLINE_FUNCTION
-void rocm_shfl_down( T & out , T const & in , int delta ,
-  typename std::enable_if
-    < ( sizeof(int) < sizeof(T) ) && ( 0 == ( sizeof(T) % sizeof(int) ) )
-    , int >::type width )
-{
+template <typename T>
+KOKKOS_INLINE_FUNCTION void rocm_shfl_down(
+    T &out, T const &in, int delta,
+    typename std::enable_if<(sizeof(int) < sizeof(T)) &&
+                                (0 == (sizeof(T) % sizeof(int))),
+                            int>::type width) {
   enum : int { N = sizeof(T) / sizeof(int) };
 
-  for ( int i = 0 ; i < N ; ++i ) {
-    reinterpret_cast<int*>(&out)[i] =
-      __shfl_down( reinterpret_cast<int const *>(&in)[i] , delta , width );
+  for (int i = 0; i < N; ++i) {
+    reinterpret_cast<int *>(&out)[i] =
+        __shfl_down(reinterpret_cast<int const *>(&in)[i], delta, width);
   }
 }
 
 //----------------------------------------------------------------------------
 
-template< typename T >
-KOKKOS_INLINE_FUNCTION
-void rocm_shfl_up( T & out , T const & in , int delta ,
-  typename std::enable_if< sizeof(int) == sizeof(T) , int >::type width )
-{
-  *reinterpret_cast<int*>(&out) =
-    __shfl_up( *reinterpret_cast<int const *>(&in) , delta , width );
+template <typename T>
+KOKKOS_INLINE_FUNCTION void rocm_shfl_up(
+    T &out, T const &in, int delta,
+    typename std::enable_if<sizeof(int) == sizeof(T), int>::type width) {
+  *reinterpret_cast<int *>(&out) =
+      __shfl_up(*reinterpret_cast<int const *>(&in), delta, width);
 }
 
-template< typename T >
-KOKKOS_INLINE_FUNCTION
-void rocm_shfl_up( T & out , T const & in , int delta ,
-  typename std::enable_if
-    < ( sizeof(int) < sizeof(T) ) && ( 0 == ( sizeof(T) % sizeof(int) ) )
-    , int >::type width )
-{
+template <typename T>
+KOKKOS_INLINE_FUNCTION void rocm_shfl_up(
+    T &out, T const &in, int delta,
+    typename std::enable_if<(sizeof(int) < sizeof(T)) &&
+                                (0 == (sizeof(T) % sizeof(int))),
+                            int>::type width) {
   enum : int { N = sizeof(T) / sizeof(int) };
 
-  for ( int i = 0 ; i < N ; ++i ) {
-    reinterpret_cast<int*>(&out)[i] =
-      __shfl_up( reinterpret_cast<int const *>(&in)[i] , delta , width );
+  for (int i = 0; i < N; ++i) {
+    reinterpret_cast<int *>(&out)[i] =
+        __shfl_up(reinterpret_cast<int const *>(&in)[i], delta, width);
   }
 }
 #if 0
@@ -290,58 +280,51 @@ void rocm_intra_workgroup_vector_inclusive_scan( ValueType & local )
  *   (c) blockDim.z == 1
  */
 
-template< class ValueType , class JoinOp>
-KOKKOS_INLINE_FUNCTION
-void rocm_intra_workgroup_reduction( const ROCmTeamMember& team, 
-                                       ValueType& result,
-                                       const JoinOp& join) {
-
-  unsigned int shift = 1;
+template <class ValueType, class JoinOp>
+KOKKOS_INLINE_FUNCTION void rocm_intra_workgroup_reduction(
+    const ROCmTeamMember &team, ValueType &result, const JoinOp &join) {
+  unsigned int shift    = 1;
   int max_active_thread = team.team_size();
 
-  //Reduce over values from threads with different team.team_rank()
-  while(team.vector_length() * shift < 32 ) {
-    const ValueType tmp = shfl_down(result, team.vector_length()*shift,32u);
-    //Only join if upper thread is active (this allows non power of two for team.team_size()
-    if(team.team_rank() + shift < max_active_thread)
-      join(result , tmp);
-    shift*=2;
+  // Reduce over values from threads with different team.team_rank()
+  while (team.vector_length() * shift < 32) {
+    const ValueType tmp = shfl_down(result, team.vector_length() * shift, 32u);
+    // Only join if upper thread is active (this allows non power of two for
+    // team.team_size()
+    if (team.team_rank() + shift < max_active_thread) join(result, tmp);
+    shift *= 2;
   }
 
-  result = shfl(result,0,32);
+  result = shfl(result, 0, 32);
 }
 
-template< class ValueType , class JoinOp>
-KOKKOS_INLINE_FUNCTION
-void rocm_inter_workgroup_reduction( const ROCmTeamMember& team,
-                                       ValueType& value,
-                                       const JoinOp& join) {
+template <class ValueType, class JoinOp>
+KOKKOS_INLINE_FUNCTION void rocm_inter_workgroup_reduction(
+    const ROCmTeamMember &team, ValueType &value, const JoinOp &join) {
+#define STEP_WIDTH 4
 
-  #define STEP_WIDTH 4
-  
   tile_static ValueType sh_result[256];
   int max_active_thread = team.team_size();
-  ValueType* result = (ValueType*) & sh_result;
-  const unsigned step = 256 / team.vector_length();
-  unsigned shift = STEP_WIDTH;
-  const int id = team.team_rank()%step==0?team.team_rank()/step:65000;
-  if(id < STEP_WIDTH ) {
+  ValueType *result     = (ValueType *)&sh_result;
+  const unsigned step   = 256 / team.vector_length();
+  unsigned shift        = STEP_WIDTH;
+  const int id = team.team_rank() % step == 0 ? team.team_rank() / step : 65000;
+  if (id < STEP_WIDTH) {
     result[id] = value;
   }
   team.team_barrier();
 
-  while (shift<=max_active_thread/step) {
-    if(shift<=id && shift+STEP_WIDTH>id && team.vector_rank()==0) {
-      join(result[id%STEP_WIDTH],value);
+  while (shift <= max_active_thread / step) {
+    if (shift <= id && shift + STEP_WIDTH > id && team.vector_rank() == 0) {
+      join(result[id % STEP_WIDTH], value);
     }
     team.team_barrier();
-    shift+=STEP_WIDTH;
+    shift += STEP_WIDTH;
   }
 
-
   value = result[0];
-  for(int i = 1; (i*step<max_active_thread) && i<STEP_WIDTH; i++)
-    join(value,result[i]);
+  for (int i = 1; (i * step < max_active_thread) && i < STEP_WIDTH; i++)
+    join(value, result[i]);
 }
 
 #if 0
@@ -454,55 +437,64 @@ bool rocm_inter_block_reduction( ROCmTeamMember& team,
  *   (c) team.vector_length() == blockDim.z == 1
  */
 
-template< bool DoScan , class FunctorType , class ArgTag >
-KOKKOS_INLINE_FUNCTION
-void rocm_intra_block_reduce_scan( const FunctorType & functor ,
-                                   const typename FunctorValueTraits< FunctorType , ArgTag >::pointer_type base_data )
-{
-  typedef FunctorValueTraits< FunctorType , ArgTag >  ValueTraits ;
-  typedef FunctorValueJoin<   FunctorType , ArgTag >  ValueJoin ;
+template <bool DoScan, class FunctorType, class ArgTag>
+KOKKOS_INLINE_FUNCTION void rocm_intra_block_reduce_scan(
+    const FunctorType &functor,
+    const typename FunctorValueTraits<FunctorType, ArgTag>::pointer_type
+        base_data) {
+  typedef FunctorValueTraits<FunctorType, ArgTag> ValueTraits;
+  typedef FunctorValueJoin<FunctorType, ArgTag> ValueJoin;
 
-  typedef typename ValueTraits::pointer_type  pointer_type ;
+  typedef typename ValueTraits::pointer_type pointer_type;
 
-  const unsigned value_count   = ValueTraits::value_count( functor );
-  const unsigned BlockSizeMask = blockDim_y  - 1 ;
+  const unsigned value_count   = ValueTraits::value_count(functor);
+  const unsigned BlockSizeMask = blockDim_y - 1;
 
   // Must have power of two thread count
 
-  if ( BlockSizeMask & blockDim_y ) { Kokkos::abort("ROCm::rocm_intra_block_scan requires power-of-two blockDim"); }
+  if (BlockSizeMask & blockDim_y) {
+    Kokkos::abort("ROCm::rocm_intra_block_scan requires power-of-two blockDim");
+  }
 
-#define BLOCK_REDUCE_STEP( R , TD , S )  \
-  if ( ! (( R & ((1<<(S+1))-1) )|(blockDim_y<(1<<(S+1)))) ) { ValueJoin::join( functor , TD , (TD - (value_count<<S)) ); }
+#define BLOCK_REDUCE_STEP(R, TD, S)                                    \
+  if (!((R & ((1 << (S + 1)) - 1)) | (blockDim_y < (1 << (S + 1))))) { \
+    ValueJoin::join(functor, TD, (TD - (value_count << S)));           \
+  }
 
-#define BLOCK_SCAN_STEP( TD , N , S )  \
-  if ( N == (1<<S) ) { ValueJoin::join( functor , TD , (TD - (value_count<<S))); }
+#define BLOCK_SCAN_STEP(TD, N, S)                            \
+  if (N == (1 << S)) {                                       \
+    ValueJoin::join(functor, TD, (TD - (value_count << S))); \
+  }
 #define KOKKOS_IMPL_ROCM_SYNCWF __threadfence_block()
 
-  const unsigned     rtid_intra = threadIdx_y ^ BlockSizeMask ;
-  const pointer_type tdata_intra = base_data + value_count * threadIdx_y ;
+  const unsigned rtid_intra      = threadIdx_y ^ BlockSizeMask;
+  const pointer_type tdata_intra = base_data + value_count * threadIdx_y;
 
-  { // Intra-workgroup reduction: min blocksize of 64
+  {  // Intra-workgroup reduction: min blocksize of 64
     KOKKOS_IMPL_ROCM_SYNCWF;
-    BLOCK_REDUCE_STEP(rtid_intra,tdata_intra,0)
+    BLOCK_REDUCE_STEP(rtid_intra, tdata_intra, 0)
     KOKKOS_IMPL_ROCM_SYNCWF;
-    BLOCK_REDUCE_STEP(rtid_intra,tdata_intra,1)
+    BLOCK_REDUCE_STEP(rtid_intra, tdata_intra, 1)
     KOKKOS_IMPL_ROCM_SYNCWF;
-    BLOCK_REDUCE_STEP(rtid_intra,tdata_intra,2)
+    BLOCK_REDUCE_STEP(rtid_intra, tdata_intra, 2)
     KOKKOS_IMPL_ROCM_SYNCWF;
-    BLOCK_REDUCE_STEP(rtid_intra,tdata_intra,3)
+    BLOCK_REDUCE_STEP(rtid_intra, tdata_intra, 3)
     KOKKOS_IMPL_ROCM_SYNCWF;
-    BLOCK_REDUCE_STEP(rtid_intra,tdata_intra,4)
+    BLOCK_REDUCE_STEP(rtid_intra, tdata_intra, 4)
     KOKKOS_IMPL_ROCM_SYNCWF;
-    BLOCK_REDUCE_STEP(rtid_intra,tdata_intra,5)
+    BLOCK_REDUCE_STEP(rtid_intra, tdata_intra, 5)
     KOKKOS_IMPL_ROCM_SYNCWF;
   }
 
-  __syncthreads(); // Wait for all workgroups to reduce
+  __syncthreads();  // Wait for all workgroups to reduce
 
-  { // Inter-workgroup reduce-scan by a single workgroup to avoid extra synchronizations
-    if(threadIdx_y < value_count) {
-      for(int i=blockDim_y-65; i>0; i-= 64)
-        ValueJoin::join( functor , base_data + (blockDim_y-1)*value_count + threadIdx_y ,  base_data + i*value_count + threadIdx_y );
+  {  // Inter-workgroup reduce-scan by a single workgroup to avoid extra
+     // synchronizations
+    if (threadIdx_y < value_count) {
+      for (int i = blockDim_y - 65; i > 0; i -= 64)
+        ValueJoin::join(
+            functor, base_data + (blockDim_y - 1) * value_count + threadIdx_y,
+            base_data + i * value_count + threadIdx_y);
     }
     __syncthreads();
 #if 0
@@ -541,24 +533,29 @@ void rocm_intra_block_reduce_scan( const FunctorType & functor ,
 #endif
   }
 
-  __syncthreads(); // Wait for inter-workgroup reduce-scan to complete
+  __syncthreads();  // Wait for inter-workgroup reduce-scan to complete
 
-  if ( DoScan ) {
-    int n = ( rtid_intra &  1 ) ?  1 : (
-            ( rtid_intra &  2 ) ?  2 : (
-            ( rtid_intra &  4 ) ?  4 : (
-            ( rtid_intra &  8 ) ?  8 : (
-            ( rtid_intra & 16 ) ? 16 : (
-            ( rtid_intra & 32 ) ? 32 : 0 )))));
+  if (DoScan) {
+    int n = (rtid_intra & 1)
+                ? 1
+                : ((rtid_intra & 2)
+                       ? 2
+                       : ((rtid_intra & 4)
+                              ? 4
+                              : ((rtid_intra & 8)
+                                     ? 8
+                                     : ((rtid_intra & 16)
+                                            ? 16
+                                            : ((rtid_intra & 32) ? 32 : 0)))));
 
-    if ( ! ( rtid_intra + n < blockDim_y ) ) n = 0 ;
+    if (!(rtid_intra + n < blockDim_y)) n = 0;
 
-//    BLOCK_SCAN_STEP(tdata_intra,n,5) __threadfence_block();
-//    BLOCK_SCAN_STEP(tdata_intra,n,4) __threadfence_block();
-    BLOCK_SCAN_STEP(tdata_intra,n,3) __threadfence_block();
-    BLOCK_SCAN_STEP(tdata_intra,n,2) __threadfence_block();
-    BLOCK_SCAN_STEP(tdata_intra,n,1) __threadfence_block();
-    BLOCK_SCAN_STEP(tdata_intra,n,0) __threadfence_block();
+    //    BLOCK_SCAN_STEP(tdata_intra,n,5) __threadfence_block();
+    //    BLOCK_SCAN_STEP(tdata_intra,n,4) __threadfence_block();
+    BLOCK_SCAN_STEP(tdata_intra, n, 3) __threadfence_block();
+    BLOCK_SCAN_STEP(tdata_intra, n, 2) __threadfence_block();
+    BLOCK_SCAN_STEP(tdata_intra, n, 1) __threadfence_block();
+    BLOCK_SCAN_STEP(tdata_intra, n, 0) __threadfence_block();
   }
 
 #undef BLOCK_SCAN_STEP
@@ -574,104 +571,120 @@ void rocm_intra_block_reduce_scan( const FunctorType & functor ,
  *
  *  Global reduce result is in the last threads' 'shared_data' location.
  */
-using ROCM  = Kokkos::Experimental::ROCm ;
+using ROCM = Kokkos::Experimental::ROCm;
 
-template< bool DoScan , class FunctorType , class ArgTag >
-KOKKOS_INLINE_FUNCTION
-bool rocm_single_inter_block_reduce_scan( const FunctorType     & functor ,
-                                          const ROCM::size_type   block_id ,
-                                          const ROCM::size_type   block_count ,
-                                          typename FunctorValueTraits<FunctorType, ArgTag>::value_type * const shared_data ,
-                                          typename FunctorValueTraits<FunctorType, ArgTag>::value_type * const global_data ,
-                                          ROCM::size_type * const global_flags )
-{
-  typedef ROCM::size_type                  size_type ;
-  typedef FunctorValueTraits< FunctorType , ArgTag >  ValueTraits ;
-  typedef FunctorValueJoin<   FunctorType , ArgTag >  ValueJoin ;
-  typedef FunctorValueInit<   FunctorType , ArgTag >  ValueInit ;
-  typedef FunctorValueOps<    FunctorType , ArgTag >  ValueOps ;
+template <bool DoScan, class FunctorType, class ArgTag>
+KOKKOS_INLINE_FUNCTION bool rocm_single_inter_block_reduce_scan(
+    const FunctorType &functor, const ROCM::size_type block_id,
+    const ROCM::size_type block_count,
+    typename FunctorValueTraits<FunctorType, ArgTag>::value_type
+        *const shared_data,
+    typename FunctorValueTraits<FunctorType, ArgTag>::value_type
+        *const global_data,
+    ROCM::size_type *const global_flags) {
+  typedef ROCM::size_type size_type;
+  typedef FunctorValueTraits<FunctorType, ArgTag> ValueTraits;
+  typedef FunctorValueJoin<FunctorType, ArgTag> ValueJoin;
+  typedef FunctorValueInit<FunctorType, ArgTag> ValueInit;
+  typedef FunctorValueOps<FunctorType, ArgTag> ValueOps;
 
-  typedef typename ValueTraits::pointer_type    pointer_type ;
-  typedef typename ValueTraits::reference_type  reference_type ;
-  typedef typename ValueTraits::value_type      value_type ;
+  typedef typename ValueTraits::pointer_type pointer_type;
+  typedef typename ValueTraits::reference_type reference_type;
+  typedef typename ValueTraits::value_type value_type;
 
   // '__ffs' = position of the least significant bit set to 1.
   // blockDim_y is guaranteed to be a power of two so this
   // is the integral shift value that can replace an integral divide.
   //  const unsigned long BlockSizeShift = __ffs( blockDim_y ) - 1 ;
-  const unsigned long BlockSizeShift = __lastbit_u32_u32( blockDim_y )  ;
-  const unsigned long BlockSizeMask  = blockDim_y - 1 ;
+  const unsigned long BlockSizeShift = __lastbit_u32_u32(blockDim_y);
+  const unsigned long BlockSizeMask  = blockDim_y - 1;
 
   // Must have power of two thread count
-  if ( BlockSizeMask & blockDim_y ) { Kokkos::abort("ROCm::rocm_single_inter_block_reduce_scan requires power-of-two blockDim"); }
+  if (BlockSizeMask & blockDim_y) {
+    Kokkos::abort(
+        "ROCm::rocm_single_inter_block_reduce_scan requires power-of-two "
+        "blockDim");
+  }
 
-  const integral_nonzero_constant< size_type , ValueTraits::StaticValueSize / sizeof(value_type) >
-    word_count( ValueTraits::value_size( functor )/ sizeof(value_type) );
+  const integral_nonzero_constant<size_type, ValueTraits::StaticValueSize /
+                                                 sizeof(value_type)>
+      word_count(ValueTraits::value_size(functor) / sizeof(value_type));
 
   // Reduce the accumulation for the entire block.
-  rocm_intra_block_reduce_scan<false,FunctorType,ArgTag>( functor , pointer_type(shared_data) );
+  rocm_intra_block_reduce_scan<false, FunctorType, ArgTag>(
+      functor, pointer_type(shared_data));
 
   {
     // Write accumulation total to global scratch space.
     // Accumulation total is the last thread's data.
-    value_type * const shared = shared_data +  
-                                   word_count.value * BlockSizeMask ;
-    value_type * const global = global_data + word_count.value * block_id ;
+    value_type *const shared = shared_data + word_count.value * BlockSizeMask;
+    value_type *const global = global_data + word_count.value * block_id;
 
-    for ( int i = int(threadIdx_y) ; i < word_count.value ; i += blockDim_y ) { global[i] = shared[i] ; }
+    for (int i = int(threadIdx_y); i < word_count.value; i += blockDim_y) {
+      global[i] = shared[i];
+    }
   }
 
-  // Contributing blocks note that their contribution has been completed via an atomic-increment flag
-  // If this block is not the last block to contribute to this group then the block is done.
-    
-  const bool is_last_block =
-    !  __syncthreads_or( threadIdx_y ? 0 : ( 1 + atomicInc( global_flags , block_count - 1 ) < block_count ) );
-  if ( is_last_block ) {
+  // Contributing blocks note that their contribution has been completed via an
+  // atomic-increment flag If this block is not the last block to contribute to
+  // this group then the block is done.
 
-    const size_type b = ( long(block_count) * long(threadIdx_y )) >> BlockSizeShift ;
-    const size_type e = ( long(block_count) * long(threadIdx_y + 1 ) ) >> BlockSizeShift ;
+  const bool is_last_block = !__syncthreads_or(
+      threadIdx_y
+          ? 0
+          : (1 + atomicInc(global_flags, block_count - 1) < block_count));
+  if (is_last_block) {
+    const size_type b =
+        (long(block_count) * long(threadIdx_y)) >> BlockSizeShift;
+    const size_type e =
+        (long(block_count) * long(threadIdx_y + 1)) >> BlockSizeShift;
 
     {
-      value_type * const shared_ptr = shared_data + word_count.value * threadIdx_y ;
-      ValueInit::init( functor , shared_ptr );
+      value_type *const shared_ptr =
+          shared_data + word_count.value * threadIdx_y;
+      ValueInit::init(functor, shared_ptr);
 
-
-      for ( size_type i = b ; i < e ; ++i ) {
-        ValueJoin::join( functor , shared_ptr , global_data + word_count.value * i );
+      for (size_type i = b; i < e; ++i) {
+        ValueJoin::join(functor, shared_ptr,
+                        global_data + word_count.value * i);
       }
     }
-    rocm_intra_block_reduce_scan<DoScan,FunctorType,ArgTag>( functor , pointer_type(shared_data) );
+    rocm_intra_block_reduce_scan<DoScan, FunctorType, ArgTag>(
+        functor, pointer_type(shared_data));
 
-    if ( DoScan ) {
-      value_type * const shared_value = shared_data + word_count.value * ( threadIdx_y ? threadIdx_y - 1 : blockDim_y );
+    if (DoScan) {
+      value_type *const shared_value =
+          shared_data +
+          word_count.value * (threadIdx_y ? threadIdx_y - 1 : blockDim_y);
 
-      if ( ! threadIdx_y ) { ValueInit::init( functor , shared_value ); }
+      if (!threadIdx_y) {
+        ValueInit::init(functor, shared_value);
+      }
 
       // Join previous inclusive scan value to each member
-      for ( size_type i = b ; i < e ; ++i ) {
-        value_type * const global_value = global_data + word_count.value * i ;
-        ValueJoin::join( functor , shared_value , global_value );
-        ValueOps ::copy( functor , global_value , shared_value );
+      for (size_type i = b; i < e; ++i) {
+        value_type *const global_value = global_data + word_count.value * i;
+        ValueJoin::join(functor, shared_value, global_value);
+        ValueOps ::copy(functor, global_value, shared_value);
       }
     }
   }
-  return is_last_block ;
+  return is_last_block;
 }
 
 // Size in bytes required for inter block reduce or scan
-template< bool DoScan , class FunctorType , class ArgTag >
-inline
-unsigned rocm_single_inter_block_reduce_scan_shmem( const FunctorType & functor , const unsigned BlockSize )
-{
-  return ( BlockSize + 2 ) * Impl::FunctorValueTraits< FunctorType , ArgTag >::value_size( functor );
+template <bool DoScan, class FunctorType, class ArgTag>
+inline unsigned rocm_single_inter_block_reduce_scan_shmem(
+    const FunctorType &functor, const unsigned BlockSize) {
+  return (BlockSize + 2) *
+         Impl::FunctorValueTraits<FunctorType, ArgTag>::value_size(functor);
 }
 
-} // namespace Impl
-} // namespace Kokkos
+}  // namespace Impl
+}  // namespace Kokkos
 
 //----------------------------------------------------------------------------
 //----------------------------------------------------------------------------
 
 #endif /* #if defined( __ROCMCC__ ) */
 #endif /* KOKKOS_ROCM_REDUCESCAN_HPP */
-
diff --git a/lib/kokkos/core/src/ROCm/Kokkos_ROCm_Scan.hpp b/lib/kokkos/core/src/ROCm/Kokkos_ROCm_Scan.hpp
index f24db42cee..337550b9f8 100644
--- a/lib/kokkos/core/src/ROCm/Kokkos_ROCm_Scan.hpp
+++ b/lib/kokkos/core/src/ROCm/Kokkos_ROCm_Scan.hpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -47,209 +48,203 @@
 namespace Kokkos {
 namespace Impl {
 
-template< class Tag, class F, class TransformIndex>
-void scan_enqueue(
-  const int len,
-  const F & f,
-  TransformIndex transform_index)
-{
-    typedef Kokkos::Impl::FunctorValueTraits< F, Tag>  ValueTraits;
-    typedef Kokkos::Impl::FunctorValueInit<   F, Tag>  ValueInit;
-    typedef Kokkos::Impl::FunctorValueJoin<   F, Tag>  ValueJoin;
-    typedef Kokkos::Impl::FunctorValueOps<    F, Tag>  ValueOps;
+template <class Tag, class F, class TransformIndex>
+void scan_enqueue(const int len, const F& f, TransformIndex transform_index) {
+  typedef Kokkos::Impl::FunctorValueTraits<F, Tag> ValueTraits;
+  typedef Kokkos::Impl::FunctorValueInit<F, Tag> ValueInit;
+  typedef Kokkos::Impl::FunctorValueJoin<F, Tag> ValueJoin;
+  typedef Kokkos::Impl::FunctorValueOps<F, Tag> ValueOps;
 
-    typedef typename ValueTraits::value_type    value_type;
-    typedef typename ValueTraits::pointer_type    pointer_type;
-    typedef typename ValueTraits::reference_type  reference_type;
+  typedef typename ValueTraits::value_type value_type;
+  typedef typename ValueTraits::pointer_type pointer_type;
+  typedef typename ValueTraits::reference_type reference_type;
 
-    const auto td = get_tile_desc<value_type>(len);
-    std::vector<value_type> result_cpu(td.num_tiles);
-    hc::array<value_type> result(td.num_tiles);
-    hc::array<value_type> scratch(len);
+  const auto td = get_tile_desc<value_type>(len);
+  std::vector<value_type> result_cpu(td.num_tiles);
+  hc::array<value_type> result(td.num_tiles);
+  hc::array<value_type> scratch(len);
 
-    tile_for<value_type>(td, [&,f,len,td](hc::tiled_index<1> t_idx, tile_buffer<value_type> buffer) [[hc]] 
-    {
-        const auto local = t_idx.local[0];
+  tile_for<value_type>(
+      td, [&, f, len, td ](hc::tiled_index<1> t_idx,
+                           tile_buffer<value_type> buffer) [[hc]] {
+        const auto local  = t_idx.local[0];
         const auto global = t_idx.global[0];
-        const auto tile = t_idx.tile[0];
+        const auto tile   = t_idx.tile[0];
 
         // Join tile buffer elements
-        const auto join = [&](std::size_t i, std::size_t j)
-        {
-            buffer.action_at(i, j, [&](value_type& x, const value_type& y)
-            {
-                ValueJoin::join(f, &x, &y);
-            });
+        const auto join = [&](std::size_t i, std::size_t j) {
+          buffer.action_at(i, j, [&](value_type& x, const value_type& y) {
+            ValueJoin::join(f, &x, &y);
+          });
         };
 
         // Copy into tile
-        buffer.action_at(local, [&](value_type& state)
-        {
-            ValueInit::init(f, &state);
-            if (global < len) rocm_invoke<Tag>(f, transform_index(t_idx, td.tile_size, td.num_tiles), state, false);
+        buffer.action_at(local, [&](value_type& state) {
+          ValueInit::init(f, &state);
+          if (global < len)
+            rocm_invoke<Tag>(f,
+                             transform_index(t_idx, td.tile_size, td.num_tiles),
+                             state, false);
         });
         t_idx.barrier.wait();
         // Up sweep phase
-        for(std::size_t d=1;d<buffer.size();d*=2)
-        {
-            auto d2 = 2*d;
-            auto i = local*d2;
-            if(i<len)
-            {
-               auto j = i + d - 1;
-               auto k = i + d2 - 1;
+        for (std::size_t d = 1; d < buffer.size(); d *= 2) {
+          auto d2 = 2 * d;
+          auto i  = local * d2;
+          if (i < len) {
+            auto j = i + d - 1;
+            auto k = i + d2 - 1;
 
-               ValueJoin::join(f, &buffer[k], &buffer[j]);
-            }
+            ValueJoin::join(f, &buffer[k], &buffer[j]);
+          }
         }
         t_idx.barrier.wait();
 
-        result[tile] = buffer[buffer.size()-1];
-        buffer[buffer.size()-1] = 0;
+        result[tile]              = buffer[buffer.size() - 1];
+        buffer[buffer.size() - 1] = 0;
         // Down sweep phase
-        for(std::size_t d=buffer.size()/2;d>0;d/=2)
-        {
-            auto d2 = 2*d;
-            auto i = local*d2;
-            if(i<len)
-            {
-               auto j = i + d - 1;
-               auto k = i + d2 - 1;
-               auto t = buffer[k];
+        for (std::size_t d = buffer.size() / 2; d > 0; d /= 2) {
+          auto d2 = 2 * d;
+          auto i  = local * d2;
+          if (i < len) {
+            auto j = i + d - 1;
+            auto k = i + d2 - 1;
+            auto t = buffer[k];
 
-               ValueJoin::join(f, &buffer[k], &buffer[j]);
-               buffer[j] = t;
-            }
-            t_idx.barrier.wait();
+            ValueJoin::join(f, &buffer[k], &buffer[j]);
+            buffer[j] = t;
+          }
+          t_idx.barrier.wait();
         }
         // Copy tiles into global memory
         if (global < len) scratch[global] = buffer[local];
-    }).wait();
-    copy(result,result_cpu.data());
+      })
+      .wait();
+  copy(result, result_cpu.data());
 
-   for(int i=1; i<td.num_tiles; i++)
-      ValueJoin::join(f, &result_cpu[i], &result_cpu[i-1]);
+  for (int i = 1; i < td.num_tiles; i++)
+    ValueJoin::join(f, &result_cpu[i], &result_cpu[i - 1]);
 
-    copy(result_cpu.data(),result);
-    size_t launch_len = (((len - 1) / td.tile_size) + 1) * td.tile_size;
-    hc::parallel_for_each(hc::extent<1>(launch_len).tile(td.tile_size), [&,f,len,td](hc::tiled_index<1> t_idx) [[hc]] 
-    {
+  copy(result_cpu.data(), result);
+  size_t launch_len = (((len - 1) / td.tile_size) + 1) * td.tile_size;
+  hc::parallel_for_each(
+      hc::extent<1>(launch_len).tile(td.tile_size),
+      [&, f, len, td ](hc::tiled_index<1> t_idx) [[hc]] {
         const auto global = t_idx.global[0];
-        const auto tile = t_idx.tile[0];
+        const auto tile   = t_idx.tile[0];
 
-        if (global < len) 
-        {
-            auto final_state = scratch[global];
+        if (global < len) {
+          auto final_state = scratch[global];
 
-            if (tile != 0) ValueJoin::join(f, &final_state, &result[tile-1]);
-            rocm_invoke<Tag>(f, transform_index(t_idx, td.tile_size, td.num_tiles), final_state, true);
+          if (tile != 0) ValueJoin::join(f, &final_state, &result[tile - 1]);
+          rocm_invoke<Tag>(f,
+                           transform_index(t_idx, td.tile_size, td.num_tiles),
+                           final_state, true);
         }
-    }).wait();
+      })
+      .wait();
 }
 
-template< class Tag, class ReturnType, class F, class TransformIndex>
-void scan_enqueue(
-  const int len,
-  const F & f,
-  ReturnType & return_val,
-  TransformIndex transform_index)
-{
-    typedef Kokkos::Impl::FunctorValueTraits< F, Tag>  ValueTraits;
-    typedef Kokkos::Impl::FunctorValueInit<   F, Tag>  ValueInit;
-    typedef Kokkos::Impl::FunctorValueJoin<   F, Tag>  ValueJoin;
-    typedef Kokkos::Impl::FunctorValueOps<    F, Tag>  ValueOps;
+template <class Tag, class ReturnType, class F, class TransformIndex>
+void scan_enqueue(const int len, const F& f, ReturnType& return_val,
+                  TransformIndex transform_index) {
+  typedef Kokkos::Impl::FunctorValueTraits<F, Tag> ValueTraits;
+  typedef Kokkos::Impl::FunctorValueInit<F, Tag> ValueInit;
+  typedef Kokkos::Impl::FunctorValueJoin<F, Tag> ValueJoin;
+  typedef Kokkos::Impl::FunctorValueOps<F, Tag> ValueOps;
 
-    typedef typename ValueTraits::value_type    value_type;
-    typedef typename ValueTraits::pointer_type    pointer_type;
-    typedef typename ValueTraits::reference_type  reference_type;
+  typedef typename ValueTraits::value_type value_type;
+  typedef typename ValueTraits::pointer_type pointer_type;
+  typedef typename ValueTraits::reference_type reference_type;
 
-    const auto td = get_tile_desc<value_type>(len);
-    std::vector<value_type> result_cpu(td.num_tiles);
-    hc::array<value_type> result(td.num_tiles);
-    hc::array<value_type> scratch(len);
-    std::vector<ReturnType> total_cpu(1);
-    hc::array<ReturnType> total(1);
+  const auto td = get_tile_desc<value_type>(len);
+  std::vector<value_type> result_cpu(td.num_tiles);
+  hc::array<value_type> result(td.num_tiles);
+  hc::array<value_type> scratch(len);
+  std::vector<ReturnType> total_cpu(1);
+  hc::array<ReturnType> total(1);
 
-    tile_for<value_type>(td, [&,f,len,td](hc::tiled_index<1> t_idx, tile_buffer<value_type> buffer) [[hc]] 
-    {
-        const auto local = t_idx.local[0];
+  tile_for<value_type>(
+      td, [&, f, len, td ](hc::tiled_index<1> t_idx,
+                           tile_buffer<value_type> buffer) [[hc]] {
+        const auto local  = t_idx.local[0];
         const auto global = t_idx.global[0];
-        const auto tile = t_idx.tile[0];
+        const auto tile   = t_idx.tile[0];
 
         // Join tile buffer elements
-        const auto join = [&](std::size_t i, std::size_t j)
-        {
-            buffer.action_at(i, j, [&](value_type& x, const value_type& y)
-            {
-                ValueJoin::join(f, &x, &y);
-            });
+        const auto join = [&](std::size_t i, std::size_t j) {
+          buffer.action_at(i, j, [&](value_type& x, const value_type& y) {
+            ValueJoin::join(f, &x, &y);
+          });
         };
 
         // Copy into tile
-        buffer.action_at(local, [&](value_type& state)
-        {
-            ValueInit::init(f, &state);
-            if (global < len) rocm_invoke<Tag>(f, transform_index(t_idx, td.tile_size, td.num_tiles), state, false);
+        buffer.action_at(local, [&](value_type& state) {
+          ValueInit::init(f, &state);
+          if (global < len)
+            rocm_invoke<Tag>(f,
+                             transform_index(t_idx, td.tile_size, td.num_tiles),
+                             state, false);
         });
         t_idx.barrier.wait();
         // Up sweep phase
-        for(std::size_t d=1;d<buffer.size();d*=2)
-        {
-            auto d2 = 2*d;
-            auto i = local*d2;
-            if(i<len)
-            {
-               auto j = i + d - 1;
-               auto k = i + d2 - 1;
-               ValueJoin::join(f, &buffer[k], &buffer[j]);
-            }
+        for (std::size_t d = 1; d < buffer.size(); d *= 2) {
+          auto d2 = 2 * d;
+          auto i  = local * d2;
+          if (i < len) {
+            auto j = i + d - 1;
+            auto k = i + d2 - 1;
+            ValueJoin::join(f, &buffer[k], &buffer[j]);
+          }
         }
         t_idx.barrier.wait();
 
-        result[tile] = buffer[buffer.size()-1];
-        buffer[buffer.size()-1] = 0;
+        result[tile]              = buffer[buffer.size() - 1];
+        buffer[buffer.size() - 1] = 0;
         // Down sweep phase
-        for(std::size_t d=buffer.size()/2;d>0;d/=2)
-        {
-            auto d2 = 2*d;
-            auto i = local*d2;
-            if(i<len)
-            {
-               auto j = i + d - 1;
-               auto k = i + d2 - 1;
-               auto t = buffer[k];
-               ValueJoin::join(f, &buffer[k], &buffer[j]);
-               buffer[j] = t;
-            }
-            t_idx.barrier.wait();
+        for (std::size_t d = buffer.size() / 2; d > 0; d /= 2) {
+          auto d2 = 2 * d;
+          auto i  = local * d2;
+          if (i < len) {
+            auto j = i + d - 1;
+            auto k = i + d2 - 1;
+            auto t = buffer[k];
+            ValueJoin::join(f, &buffer[k], &buffer[j]);
+            buffer[j] = t;
+          }
+          t_idx.barrier.wait();
         }
         // Copy tiles into global memory
         if (global < len) scratch[global] = buffer[local];
-    }).wait();
-    copy(result,result_cpu.data());
+      })
+      .wait();
+  copy(result, result_cpu.data());
 
-   for(int i=1; i<td.num_tiles; i++)
-      ValueJoin::join(f, &result_cpu[i], &result_cpu[i-1]);
+  for (int i = 1; i < td.num_tiles; i++)
+    ValueJoin::join(f, &result_cpu[i], &result_cpu[i - 1]);
 
-    copy(result_cpu.data(),result);
-    size_t launch_len = (((len - 1) / td.tile_size) + 1) * td.tile_size;
-    hc::parallel_for_each(hc::extent<1>(launch_len).tile(td.tile_size), [&,f,len,td](hc::tiled_index<1> t_idx) [[hc]] 
-    {
+  copy(result_cpu.data(), result);
+  size_t launch_len = (((len - 1) / td.tile_size) + 1) * td.tile_size;
+  hc::parallel_for_each(
+      hc::extent<1>(launch_len).tile(td.tile_size),
+      [&, f, len, td ](hc::tiled_index<1> t_idx) [[hc]] {
         const auto global = t_idx.global[0];
-        const auto tile = t_idx.tile[0];
+        const auto tile   = t_idx.tile[0];
 
-        if (global < len) 
-        {
-            auto final_state = scratch[global];
+        if (global < len) {
+          auto final_state = scratch[global];
 
-            if (tile != 0) ValueJoin::join(f, &final_state, &result[tile-1]);
-            rocm_invoke<Tag>(f, transform_index(t_idx, td.tile_size, td.num_tiles), final_state, true);
-            if(global==(len-1))  total[0] = final_state;
+          if (tile != 0) ValueJoin::join(f, &final_state, &result[tile - 1]);
+          rocm_invoke<Tag>(f,
+                           transform_index(t_idx, td.tile_size, td.num_tiles),
+                           final_state, true);
+          if (global == (len - 1)) total[0] = final_state;
         }
-    }).wait();
-    copy(total,total_cpu.data());
-    return_val = total_cpu[0];
+      })
+      .wait();
+  copy(total, total_cpu.data());
+  return_val = total_cpu[0];
 }
 
-} // namespace Impl
-} // namespace Kokkos
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/ROCm/Kokkos_ROCm_Space.cpp b/lib/kokkos/core/src/ROCm/Kokkos_ROCm_Space.cpp
index 2fe0c4192d..501567406d 100644
--- a/lib/kokkos/core/src/ROCm/Kokkos_ROCm_Space.cpp
+++ b/lib/kokkos/core/src/ROCm/Kokkos_ROCm_Space.cpp
@@ -1,13 +1,14 @@
 /*
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -36,7 +37,7 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 */
@@ -62,7 +63,6 @@
 #include <impl/Kokkos_Profiling_Interface.hpp>
 #endif
 
-
 /*--------------------------------------------------------------------------*/
 /*--------------------------------------------------------------------------*/
 #define ROCM_SAFE_CALL
@@ -70,123 +70,145 @@ namespace Kokkos {
 namespace Impl {
 using namespace hc;
 
-DeepCopy<Kokkos::Experimental::ROCmSpace,Kokkos::Experimental::ROCmSpace,Kokkos::Experimental::ROCm>::DeepCopy( void * dst , const void * src , size_t n )
-{
-   hc::accelerator acc;
-   hc::accelerator_view av = acc.get_default_view();
-   av.copy( src , dst , n);
+DeepCopy<Kokkos::Experimental::ROCmSpace, Kokkos::Experimental::ROCmSpace,
+         Kokkos::Experimental::ROCm>::DeepCopy(void* dst, const void* src,
+                                               size_t n) {
+  hc::accelerator acc;
+  hc::accelerator_view av = acc.get_default_view();
+  av.copy(src, dst, n);
 }
 
-
-DeepCopy<HostSpace,Kokkos::Experimental::ROCmSpace,Kokkos::Experimental::ROCm>::DeepCopy( void * dst , const void * src , size_t n )
-{
-   hc::accelerator acc;
-   hc::accelerator_view av = acc.get_default_view();
-   av.copy( src , dst , n);
+DeepCopy<HostSpace, Kokkos::Experimental::ROCmSpace,
+         Kokkos::Experimental::ROCm>::DeepCopy(void* dst, const void* src,
+                                               size_t n) {
+  hc::accelerator acc;
+  hc::accelerator_view av = acc.get_default_view();
+  av.copy(src, dst, n);
 }
 
-DeepCopy<Kokkos::Experimental::ROCmSpace,HostSpace,Kokkos::Experimental::ROCm>::DeepCopy( void * dst , const void * src , size_t n )
-{
-   hc::accelerator acc;
-   hc::accelerator_view av = acc.get_default_view();
-   av.copy( src , dst , n);
+DeepCopy<Kokkos::Experimental::ROCmSpace, HostSpace,
+         Kokkos::Experimental::ROCm>::DeepCopy(void* dst, const void* src,
+                                               size_t n) {
+  hc::accelerator acc;
+  hc::accelerator_view av = acc.get_default_view();
+  av.copy(src, dst, n);
 }
 
-DeepCopy<Kokkos::Experimental::ROCmSpace,Kokkos::Experimental::ROCmSpace,Kokkos::Experimental::ROCm>::DeepCopy( const Kokkos::Experimental::ROCm & instance , void * dst , const void * src , size_t n )
-{
-   hc::accelerator acc;
-   hc::accelerator_view av = acc.get_default_view();
-   av.copy( src , dst , n);
+DeepCopy<Kokkos::Experimental::ROCmSpace, Kokkos::Experimental::ROCmSpace,
+         Kokkos::Experimental::ROCm>::DeepCopy(const Kokkos::Experimental::ROCm&
+                                                   instance,
+                                               void* dst, const void* src,
+                                               size_t n) {
+  hc::accelerator acc;
+  hc::accelerator_view av = acc.get_default_view();
+  av.copy(src, dst, n);
 }
 
-DeepCopy<HostSpace,Kokkos::Experimental::ROCmSpace,Kokkos::Experimental::ROCm>::DeepCopy( const Kokkos::Experimental::ROCm & instance , void * dst , const void * src , size_t n )
-{
-   hc::accelerator acc;
-   hc::accelerator_view av = acc.get_default_view();
-   av.copy( src , dst , n);
+DeepCopy<HostSpace, Kokkos::Experimental::ROCmSpace,
+         Kokkos::Experimental::ROCm>::DeepCopy(const Kokkos::Experimental::ROCm&
+                                                   instance,
+                                               void* dst, const void* src,
+                                               size_t n) {
+  hc::accelerator acc;
+  hc::accelerator_view av = acc.get_default_view();
+  av.copy(src, dst, n);
 }
 
-DeepCopy<Kokkos::Experimental::ROCmSpace,HostSpace,Kokkos::Experimental::ROCm>::DeepCopy( const Kokkos::Experimental::ROCm & instance , void * dst , const void * src , size_t n )
-{
-   hc::accelerator acc;
-   hc::accelerator_view av = acc.get_default_view();
-   av.copy( src , dst , n);
+DeepCopy<Kokkos::Experimental::ROCmSpace, HostSpace,
+         Kokkos::Experimental::ROCm>::DeepCopy(const Kokkos::Experimental::ROCm&
+                                                   instance,
+                                               void* dst, const void* src,
+                                               size_t n) {
+  hc::accelerator acc;
+  hc::accelerator_view av = acc.get_default_view();
+  av.copy(src, dst, n);
 }
 
-
-
-DeepCopy<Kokkos::Experimental::ROCmHostPinnedSpace,Kokkos::Experimental::ROCmHostPinnedSpace,Kokkos::Experimental::ROCm>::DeepCopy( void * dst , const void * src , size_t n )
-{
-   hc::accelerator acc;
-   hc::accelerator_view av = acc.get_default_view();
-   av.copy( src , dst , n);
+DeepCopy<Kokkos::Experimental::ROCmHostPinnedSpace,
+         Kokkos::Experimental::ROCmHostPinnedSpace,
+         Kokkos::Experimental::ROCm>::DeepCopy(void* dst, const void* src,
+                                               size_t n) {
+  hc::accelerator acc;
+  hc::accelerator_view av = acc.get_default_view();
+  av.copy(src, dst, n);
 }
 
-
-DeepCopy<HostSpace,Kokkos::Experimental::ROCmHostPinnedSpace,Kokkos::Experimental::ROCm>::DeepCopy( void * dst , const void * src , size_t n )
-{
-   hc::accelerator acc;
-   hc::accelerator_view av = acc.get_default_view();
-   av.copy( src , dst , n);
+DeepCopy<HostSpace, Kokkos::Experimental::ROCmHostPinnedSpace,
+         Kokkos::Experimental::ROCm>::DeepCopy(void* dst, const void* src,
+                                               size_t n) {
+  hc::accelerator acc;
+  hc::accelerator_view av = acc.get_default_view();
+  av.copy(src, dst, n);
 }
 
-DeepCopy<Kokkos::Experimental::ROCmHostPinnedSpace,HostSpace,Kokkos::Experimental::ROCm>::DeepCopy( void * dst , const void * src , size_t n )
-{
-   hc::accelerator acc;
-   hc::accelerator_view av = acc.get_default_view();
-   av.copy( src , dst , n);
+DeepCopy<Kokkos::Experimental::ROCmHostPinnedSpace, HostSpace,
+         Kokkos::Experimental::ROCm>::DeepCopy(void* dst, const void* src,
+                                               size_t n) {
+  hc::accelerator acc;
+  hc::accelerator_view av = acc.get_default_view();
+  av.copy(src, dst, n);
 }
 
-DeepCopy<Kokkos::Experimental::ROCmHostPinnedSpace,Kokkos::Experimental::ROCmHostPinnedSpace,Kokkos::Experimental::ROCm>::DeepCopy( const Kokkos::Experimental::ROCm & instance , void * dst , const void * src , size_t n )
-{
-   hc::accelerator acc;
-   hc::accelerator_view av = acc.get_default_view();
-   av.copy( src , dst , n);
+DeepCopy<Kokkos::Experimental::ROCmHostPinnedSpace,
+         Kokkos::Experimental::ROCmHostPinnedSpace,
+         Kokkos::Experimental::ROCm>::DeepCopy(const Kokkos::Experimental::ROCm&
+                                                   instance,
+                                               void* dst, const void* src,
+                                               size_t n) {
+  hc::accelerator acc;
+  hc::accelerator_view av = acc.get_default_view();
+  av.copy(src, dst, n);
 }
 
-DeepCopy<HostSpace,Kokkos::Experimental::ROCmHostPinnedSpace,Kokkos::Experimental::ROCm>::DeepCopy( const Kokkos::Experimental::ROCm & instance , void * dst , const void * src , size_t n )
-{
-   hc::accelerator acc;
-   hc::accelerator_view av = acc.get_default_view();
-   av.copy( src , dst , n);
+DeepCopy<HostSpace, Kokkos::Experimental::ROCmHostPinnedSpace,
+         Kokkos::Experimental::ROCm>::DeepCopy(const Kokkos::Experimental::ROCm&
+                                                   instance,
+                                               void* dst, const void* src,
+                                               size_t n) {
+  hc::accelerator acc;
+  hc::accelerator_view av = acc.get_default_view();
+  av.copy(src, dst, n);
 }
 
-DeepCopy<Kokkos::Experimental::ROCmHostPinnedSpace,HostSpace,Kokkos::Experimental::ROCm>::DeepCopy( const Kokkos::Experimental::ROCm & instance , void * dst , const void * src , size_t n )
-{
-   hc::accelerator acc;
-   hc::accelerator_view av = acc.get_default_view();
-   av.copy( src , dst , n);
+DeepCopy<Kokkos::Experimental::ROCmHostPinnedSpace, HostSpace,
+         Kokkos::Experimental::ROCm>::DeepCopy(const Kokkos::Experimental::ROCm&
+                                                   instance,
+                                               void* dst, const void* src,
+                                               size_t n) {
+  hc::accelerator acc;
+  hc::accelerator_view av = acc.get_default_view();
+  av.copy(src, dst, n);
 }
 
-
-hc::completion_future DeepCopyAsyncROCm( void * dst , const void * src , size_t n) {
-   hc::accelerator acc;
-   hc::accelerator_view av = acc.get_default_view();
-   return(av.copy_async( src , dst , n));
+hc::completion_future DeepCopyAsyncROCm(void* dst, const void* src, size_t n) {
+  hc::accelerator acc;
+  hc::accelerator_view av = acc.get_default_view();
+  return (av.copy_async(src, dst, n));
 }
 
-} // namespace Impl
-} // namespace Kokkos
+}  // namespace Impl
+}  // namespace Kokkos
 
 /*--------------------------------------------------------------------------*/
 /*--------------------------------------------------------------------------*/
 
-
 namespace Kokkos {
 
-void Experimental::ROCmSpace::access_error()
-{
-  const std::string msg("Kokkos::Experimental::ROCmSpace::access_error attempt to execute Experimental::ROCm function from non-ROCm space" );
-  Kokkos::Impl::throw_runtime_exception( msg );
+void Experimental::ROCmSpace::access_error() {
+  const std::string msg(
+      "Kokkos::Experimental::ROCmSpace::access_error attempt to execute "
+      "Experimental::ROCm function from non-ROCm space");
+  Kokkos::Impl::throw_runtime_exception(msg);
 }
 
-void Experimental::ROCmSpace::access_error( const void * const )
-{
-  const std::string msg("Kokkos::Experimental::ROCmSpace::access_error attempt to execute Experimental::ROCm function from non-ROCm space" );
-  Kokkos::Impl::throw_runtime_exception( msg );
+void Experimental::ROCmSpace::access_error(const void* const) {
+  const std::string msg(
+      "Kokkos::Experimental::ROCmSpace::access_error attempt to execute "
+      "Experimental::ROCm function from non-ROCm space");
+  Kokkos::Impl::throw_runtime_exception(msg);
 }
 
-} // namespace Kokkos
+}  // namespace Kokkos
 
 /*--------------------------------------------------------------------------*/
 /*--------------------------------------------------------------------------*/
@@ -194,39 +216,33 @@ void Experimental::ROCmSpace::access_error( const void * const )
 namespace Kokkos {
 namespace Experimental {
 
-ROCmSpace::ROCmSpace()
-  : m_device( ROCm().rocm_device() )
-{
+ROCmSpace::ROCmSpace() : m_device(ROCm().rocm_device()) {}
+
+ROCmHostPinnedSpace::ROCmHostPinnedSpace() {}
+
+void* ROCmSpace::allocate(const size_t arg_alloc_size) const {
+  void* ptr = Kokkos::Impl::rocm_device_allocate(arg_alloc_size);
+  return ptr;
 }
 
-ROCmHostPinnedSpace::ROCmHostPinnedSpace()
-{
+void* Experimental::ROCmHostPinnedSpace::allocate(
+    const size_t arg_alloc_size) const {
+  void* ptr = Kokkos::Impl::rocm_hostpinned_allocate(arg_alloc_size);
+  return ptr;
 }
 
-void * ROCmSpace::allocate( const size_t arg_alloc_size ) const
-{
-  void * ptr =  Kokkos::Impl::rocm_device_allocate( arg_alloc_size );
-  return ptr ;
-}
-
-void * Experimental::ROCmHostPinnedSpace::allocate( const size_t arg_alloc_size ) const
-{
-  void * ptr =  Kokkos::Impl::rocm_hostpinned_allocate( arg_alloc_size );
-  return ptr ;
-}
-
-void ROCmSpace::deallocate( void * const arg_alloc_ptr , const size_t /* arg_alloc_size */ ) const
-{
+void ROCmSpace::deallocate(void* const arg_alloc_ptr,
+                           const size_t /* arg_alloc_size */) const {
   Kokkos::Impl::rocm_device_free(arg_alloc_ptr);
 }
 
-void Experimental::ROCmHostPinnedSpace::deallocate( void * const arg_alloc_ptr , const size_t /* arg_alloc_size */ ) const
-{
+void Experimental::ROCmHostPinnedSpace::deallocate(
+    void* const arg_alloc_ptr, const size_t /* arg_alloc_size */) const {
   Kokkos::Impl::rocm_device_free(arg_alloc_ptr);
 }
 
-} // namespace Experimental
-} // namespace Kokkos
+}  // namespace Experimental
+}  // namespace Kokkos
 
 //----------------------------------------------------------------------------
 //----------------------------------------------------------------------------
@@ -235,215 +251,196 @@ namespace Kokkos {
 namespace Impl {
 
 #ifdef KOKKOS_DEBUG
-SharedAllocationRecord< void , void >
-SharedAllocationRecord< Kokkos::Experimental::ROCmSpace , void >::s_root_record ;
+SharedAllocationRecord<void, void> SharedAllocationRecord<
+    Kokkos::Experimental::ROCmSpace, void>::s_root_record;
 
-SharedAllocationRecord< void , void >
-SharedAllocationRecord< Kokkos::Experimental::ROCmHostPinnedSpace , void >::s_root_record ;
+SharedAllocationRecord<void, void> SharedAllocationRecord<
+    Kokkos::Experimental::ROCmHostPinnedSpace, void>::s_root_record;
 #endif
 
-std::string
-SharedAllocationRecord< Kokkos::Experimental::ROCmSpace , void >::get_label() const
-{
-  SharedAllocationHeader header ;
+std::string SharedAllocationRecord<Kokkos::Experimental::ROCmSpace,
+                                   void>::get_label() const {
+  SharedAllocationHeader header;
 
-  Kokkos::Impl::DeepCopy< Kokkos::HostSpace , Kokkos::Experimental::ROCmSpace >( & header , RecordBase::head() , sizeof(SharedAllocationHeader) );
+  Kokkos::Impl::DeepCopy<Kokkos::HostSpace, Kokkos::Experimental::ROCmSpace>(
+      &header, RecordBase::head(), sizeof(SharedAllocationHeader));
 
-  return std::string( header.m_label );
+  return std::string(header.m_label);
 }
 
-std::string
-SharedAllocationRecord< Kokkos::Experimental::ROCmHostPinnedSpace , void >::get_label() const
-{
-  return std::string( RecordBase::head()->m_label );
+std::string SharedAllocationRecord<Kokkos::Experimental::ROCmHostPinnedSpace,
+                                   void>::get_label() const {
+  return std::string(RecordBase::head()->m_label);
 }
 
-SharedAllocationRecord< Kokkos::Experimental::ROCmSpace , void > *
-SharedAllocationRecord< Kokkos::Experimental::ROCmSpace , void >::
-allocate( const Kokkos::Experimental::ROCmSpace &  arg_space
-        , const std::string       &  arg_label
-        , const size_t               arg_alloc_size
-        )
-{
-  return new SharedAllocationRecord( arg_space , arg_label , arg_alloc_size );
+SharedAllocationRecord<Kokkos::Experimental::ROCmSpace, void>*
+SharedAllocationRecord<Kokkos::Experimental::ROCmSpace, void>::allocate(
+    const Kokkos::Experimental::ROCmSpace& arg_space,
+    const std::string& arg_label, const size_t arg_alloc_size) {
+  return new SharedAllocationRecord(arg_space, arg_label, arg_alloc_size);
 }
 
-SharedAllocationRecord< Kokkos::Experimental::ROCmHostPinnedSpace , void > *
-SharedAllocationRecord< Kokkos::Experimental::ROCmHostPinnedSpace , void >::
-allocate( const Kokkos::Experimental::ROCmHostPinnedSpace &  arg_space
-        , const std::string                 &  arg_label
-        , const size_t                         arg_alloc_size
-        )
-{
-  return new SharedAllocationRecord( arg_space , arg_label , arg_alloc_size );
+SharedAllocationRecord<Kokkos::Experimental::ROCmHostPinnedSpace, void>*
+SharedAllocationRecord<Kokkos::Experimental::ROCmHostPinnedSpace, void>::
+    allocate(const Kokkos::Experimental::ROCmHostPinnedSpace& arg_space,
+             const std::string& arg_label, const size_t arg_alloc_size) {
+  return new SharedAllocationRecord(arg_space, arg_label, arg_alloc_size);
 }
 
-void
-SharedAllocationRecord< Kokkos::Experimental::ROCmSpace , void >::
-deallocate( SharedAllocationRecord< void , void > * arg_rec )
-{
+void SharedAllocationRecord<Kokkos::Experimental::ROCmSpace, void>::deallocate(
+    SharedAllocationRecord<void, void>* arg_rec) {
   delete static_cast<SharedAllocationRecord*>(arg_rec);
 }
 
-void
-SharedAllocationRecord< Kokkos::Experimental::ROCmHostPinnedSpace , void >::
-deallocate( SharedAllocationRecord< void , void > * arg_rec )
-{
+void SharedAllocationRecord<Kokkos::Experimental::ROCmHostPinnedSpace, void>::
+    deallocate(SharedAllocationRecord<void, void>* arg_rec) {
   delete static_cast<SharedAllocationRecord*>(arg_rec);
 }
 
-SharedAllocationRecord< Kokkos::Experimental::ROCmSpace , void >::
-~SharedAllocationRecord()
-{
-  #if defined(KOKKOS_ENABLE_PROFILING)
-  if(Kokkos::Profiling::profileLibraryLoaded()) {
-
-    SharedAllocationHeader header ;
-    Kokkos::Impl::DeepCopy<Kokkos::Experimental::ROCmSpace,HostSpace>( & header , RecordBase::m_alloc_ptr , sizeof(SharedAllocationHeader) );
+SharedAllocationRecord<Kokkos::Experimental::ROCmSpace,
+                       void>::~SharedAllocationRecord() {
+#if defined(KOKKOS_ENABLE_PROFILING)
+  if (Kokkos::Profiling::profileLibraryLoaded()) {
+    SharedAllocationHeader header;
+    Kokkos::Impl::DeepCopy<Kokkos::Experimental::ROCmSpace, HostSpace>(
+        &header, RecordBase::m_alloc_ptr, sizeof(SharedAllocationHeader));
 
     Kokkos::Profiling::deallocateData(
-      Kokkos::Profiling::SpaceHandle(Kokkos::Experimental::ROCmSpace::name()),header.m_label,
-      data(),size());
+        Kokkos::Profiling::SpaceHandle(Kokkos::Experimental::ROCmSpace::name()),
+        header.m_label, data(), size());
   }
-  #endif
+#endif
 
-  m_space.deallocate( SharedAllocationRecord< void , void >::m_alloc_ptr
-                    , SharedAllocationRecord< void , void >::m_alloc_size
-                    );
+  m_space.deallocate(SharedAllocationRecord<void, void>::m_alloc_ptr,
+                     SharedAllocationRecord<void, void>::m_alloc_size);
 }
 
-SharedAllocationRecord< Kokkos::Experimental::ROCmHostPinnedSpace , void >::
-~SharedAllocationRecord()
-{
-  #if defined(KOKKOS_ENABLE_PROFILING)
-  if(Kokkos::Profiling::profileLibraryLoaded()) {
+SharedAllocationRecord<Kokkos::Experimental::ROCmHostPinnedSpace,
+                       void>::~SharedAllocationRecord() {
+#if defined(KOKKOS_ENABLE_PROFILING)
+  if (Kokkos::Profiling::profileLibraryLoaded()) {
     Kokkos::Profiling::deallocateData(
-      Kokkos::Profiling::SpaceHandle(Kokkos::Experimental::ROCmHostPinnedSpace::name()),RecordBase::m_alloc_ptr->m_label,
-      data(),size());
+        Kokkos::Profiling::SpaceHandle(
+            Kokkos::Experimental::ROCmHostPinnedSpace::name()),
+        RecordBase::m_alloc_ptr->m_label, data(), size());
   }
-  #endif
+#endif
 
-  m_space.deallocate( SharedAllocationRecord< void , void >::m_alloc_ptr
-                    , SharedAllocationRecord< void , void >::m_alloc_size
-                    );
+  m_space.deallocate(SharedAllocationRecord<void, void>::m_alloc_ptr,
+                     SharedAllocationRecord<void, void>::m_alloc_size);
 }
 
-SharedAllocationRecord< Kokkos::Experimental::ROCmSpace , void >::
-SharedAllocationRecord( const Kokkos::Experimental::ROCmSpace & arg_space
-                      , const std::string       & arg_label
-                      , const size_t              arg_alloc_size
-                      , const SharedAllocationRecord< void , void >::function_type arg_dealloc
-                      )
-  // Pass through allocated [ SharedAllocationHeader , user_memory ]
-  // Pass through deallocation function
-  : SharedAllocationRecord< void , void >
-      (
+SharedAllocationRecord<Kokkos::Experimental::ROCmSpace, void>::
+    SharedAllocationRecord(
+        const Kokkos::Experimental::ROCmSpace& arg_space,
+        const std::string& arg_label, const size_t arg_alloc_size,
+        const SharedAllocationRecord<void, void>::function_type arg_dealloc)
+    // Pass through allocated [ SharedAllocationHeader , user_memory ]
+    // Pass through deallocation function
+    : SharedAllocationRecord<void, void>(
 #ifdef KOKKOS_DEBUG
-        & SharedAllocationRecord< Kokkos::Experimental::ROCmSpace , void >::s_root_record,
+          &SharedAllocationRecord<Kokkos::Experimental::ROCmSpace,
+                                  void>::s_root_record,
 #endif
-        reinterpret_cast<SharedAllocationHeader*>( arg_space.allocate( sizeof(SharedAllocationHeader) + arg_alloc_size ) )
-      , sizeof(SharedAllocationHeader) + arg_alloc_size
-      , arg_dealloc
-      )
-  , m_space( arg_space )
-{
-  #if defined(KOKKOS_ENABLE_PROFILING)
-  if(Kokkos::Profiling::profileLibraryLoaded()) {
-    Kokkos::Profiling::allocateData(Kokkos::Profiling::SpaceHandle(arg_space.name()),arg_label,data(),arg_alloc_size);
+          reinterpret_cast<SharedAllocationHeader*>(arg_space.allocate(
+              sizeof(SharedAllocationHeader) + arg_alloc_size)),
+          sizeof(SharedAllocationHeader) + arg_alloc_size, arg_dealloc),
+      m_space(arg_space) {
+#if defined(KOKKOS_ENABLE_PROFILING)
+  if (Kokkos::Profiling::profileLibraryLoaded()) {
+    Kokkos::Profiling::allocateData(
+        Kokkos::Profiling::SpaceHandle(arg_space.name()), arg_label, data(),
+        arg_alloc_size);
   }
-  #endif
+#endif
 
-  SharedAllocationHeader header ;
+  SharedAllocationHeader header;
 
   // Fill in the Header information
-  header.m_record = static_cast< SharedAllocationRecord< void , void > * >( this );
+  header.m_record = static_cast<SharedAllocationRecord<void, void>*>(this);
 
-  strncpy( header.m_label
-          , arg_label.c_str()
-          , SharedAllocationHeader::maximum_label_length
-          );
+  strncpy(header.m_label, arg_label.c_str(),
+          SharedAllocationHeader::maximum_label_length);
   // Set last element zero, in case c_str is too long
-  header.m_label[SharedAllocationHeader::maximum_label_length - 1] = (char) 0;
+  header.m_label[SharedAllocationHeader::maximum_label_length - 1] = (char)0;
 
   // Copy to device memory
-  Kokkos::Impl::DeepCopy<Kokkos::Experimental::ROCmSpace,HostSpace>( RecordBase::m_alloc_ptr , & header , sizeof(SharedAllocationHeader) );
+  Kokkos::Impl::DeepCopy<Kokkos::Experimental::ROCmSpace, HostSpace>(
+      RecordBase::m_alloc_ptr, &header, sizeof(SharedAllocationHeader));
 }
 
-SharedAllocationRecord< Kokkos::Experimental::ROCmHostPinnedSpace , void >::
-SharedAllocationRecord( const Kokkos::Experimental::ROCmHostPinnedSpace & arg_space
-                      , const std::string                 & arg_label
-                      , const size_t                        arg_alloc_size
-                      , const SharedAllocationRecord< void , void >::function_type arg_dealloc
-                      )
-  // Pass through allocated [ SharedAllocationHeader , user_memory ]
-  // Pass through deallocation function
-  : SharedAllocationRecord< void , void >
-      (
+SharedAllocationRecord<Kokkos::Experimental::ROCmHostPinnedSpace, void>::
+    SharedAllocationRecord(
+        const Kokkos::Experimental::ROCmHostPinnedSpace& arg_space,
+        const std::string& arg_label, const size_t arg_alloc_size,
+        const SharedAllocationRecord<void, void>::function_type arg_dealloc)
+    // Pass through allocated [ SharedAllocationHeader , user_memory ]
+    // Pass through deallocation function
+    : SharedAllocationRecord<void, void>(
 #ifdef KOKKOS_DEBUG
-        & SharedAllocationRecord< Kokkos::Experimental::ROCmHostPinnedSpace , void >::s_root_record,
+          &SharedAllocationRecord<Kokkos::Experimental::ROCmHostPinnedSpace,
+                                  void>::s_root_record,
 #endif
-        reinterpret_cast<SharedAllocationHeader*>( arg_space.allocate( sizeof(SharedAllocationHeader) + arg_alloc_size ) )
-      , sizeof(SharedAllocationHeader) + arg_alloc_size
-      , arg_dealloc
-      )
-  , m_space( arg_space )
-{
-  #if defined(KOKKOS_ENABLE_PROFILING)
-  if(Kokkos::Profiling::profileLibraryLoaded()) {
-    Kokkos::Profiling::allocateData(Kokkos::Profiling::SpaceHandle(arg_space.name()),arg_label,data(),arg_alloc_size);
+          reinterpret_cast<SharedAllocationHeader*>(arg_space.allocate(
+              sizeof(SharedAllocationHeader) + arg_alloc_size)),
+          sizeof(SharedAllocationHeader) + arg_alloc_size, arg_dealloc),
+      m_space(arg_space) {
+#if defined(KOKKOS_ENABLE_PROFILING)
+  if (Kokkos::Profiling::profileLibraryLoaded()) {
+    Kokkos::Profiling::allocateData(
+        Kokkos::Profiling::SpaceHandle(arg_space.name()), arg_label, data(),
+        arg_alloc_size);
   }
-  #endif
+#endif
   // Fill in the Header information, directly accessible via host pinned memory
 
-  RecordBase::m_alloc_ptr->m_record = this ;
+  RecordBase::m_alloc_ptr->m_record = this;
 
-  strncpy( RecordBase::m_alloc_ptr->m_label
-          , arg_label.c_str()
-          , SharedAllocationHeader::maximum_label_length
-          );
+  strncpy(RecordBase::m_alloc_ptr->m_label, arg_label.c_str(),
+          SharedAllocationHeader::maximum_label_length);
   // Set last element zero, in case c_str is too long
-  RecordBase::m_alloc_ptr->m_label[SharedAllocationHeader::maximum_label_length - 1] = (char) 0;
+  RecordBase::m_alloc_ptr
+      ->m_label[SharedAllocationHeader::maximum_label_length - 1] = (char)0;
 }
 
 //----------------------------------------------------------------------------
 
-void * SharedAllocationRecord< Kokkos::Experimental::ROCmSpace , void >::
-allocate_tracked( const Kokkos::Experimental::ROCmSpace & arg_space
-                , const std::string & arg_alloc_label
-                , const size_t arg_alloc_size )
-{
-  if ( ! arg_alloc_size ) return (void *) 0 ;
+void* SharedAllocationRecord<Kokkos::Experimental::ROCmSpace, void>::
+    allocate_tracked(const Kokkos::Experimental::ROCmSpace& arg_space,
+                     const std::string& arg_alloc_label,
+                     const size_t arg_alloc_size) {
+  if (!arg_alloc_size) return (void*)0;
 
-  SharedAllocationRecord * const r =
-    allocate( arg_space , arg_alloc_label , arg_alloc_size );
+  SharedAllocationRecord* const r =
+      allocate(arg_space, arg_alloc_label, arg_alloc_size);
 
-  RecordBase::increment( r );
+  RecordBase::increment(r);
 
   return r->data();
 }
 
-void SharedAllocationRecord< Kokkos::Experimental::ROCmSpace , void >::
-deallocate_tracked( void * const arg_alloc_ptr )
-{
-  if ( arg_alloc_ptr != 0 ) {
-    SharedAllocationRecord * const r = get_record( arg_alloc_ptr );
+void SharedAllocationRecord<Kokkos::Experimental::ROCmSpace,
+                            void>::deallocate_tracked(void* const
+                                                          arg_alloc_ptr) {
+  if (arg_alloc_ptr != 0) {
+    SharedAllocationRecord* const r = get_record(arg_alloc_ptr);
 
-    RecordBase::decrement( r );
+    RecordBase::decrement(r);
   }
 }
 
-void * SharedAllocationRecord< Kokkos::Experimental::ROCmSpace , void >::
-reallocate_tracked( void * const arg_alloc_ptr
-                  , const size_t arg_alloc_size )
-{
-  SharedAllocationRecord * const r_old = get_record( arg_alloc_ptr );
-  SharedAllocationRecord * const r_new = allocate( r_old->m_space , r_old->get_label() , arg_alloc_size );
+void* SharedAllocationRecord<Kokkos::Experimental::ROCmSpace, void>::
+    reallocate_tracked(void* const arg_alloc_ptr, const size_t arg_alloc_size) {
+  SharedAllocationRecord* const r_old = get_record(arg_alloc_ptr);
+  SharedAllocationRecord* const r_new =
+      allocate(r_old->m_space, r_old->get_label(), arg_alloc_size);
 
-  Kokkos::Impl::DeepCopy<Kokkos::Experimental::ROCmSpace,Kokkos::Experimental::ROCmSpace>( r_new->data() , r_old->data()
-                                             , std::min( r_old->size() , r_new->size() ) );
+  Kokkos::Impl::DeepCopy<Kokkos::Experimental::ROCmSpace,
+                         Kokkos::Experimental::ROCmSpace>(
+      r_new->data(), r_old->data(), std::min(r_old->size(), r_new->size()));
 
-  RecordBase::increment( r_new );
-  RecordBase::decrement( r_old );
+  RecordBase::increment(r_new);
+  RecordBase::decrement(r_old);
 
   return r_new->data();
 }
@@ -493,32 +490,38 @@ reallocate_tracked( void * const arg_alloc_ptr
 
 //----------------------------------------------------------------------------
 
-SharedAllocationRecord< Kokkos::Experimental::ROCmSpace , void > *
-SharedAllocationRecord< Kokkos::Experimental::ROCmSpace , void >::get_record( void * alloc_ptr )
-{
-  using Header     = SharedAllocationHeader ;
-  using RecordBase = SharedAllocationRecord< void , void > ;
-  using RecordROCm = SharedAllocationRecord< Kokkos::Experimental::ROCmSpace , void > ;
+SharedAllocationRecord<Kokkos::Experimental::ROCmSpace, void>*
+SharedAllocationRecord<Kokkos::Experimental::ROCmSpace, void>::get_record(
+    void* alloc_ptr) {
+  using Header     = SharedAllocationHeader;
+  using RecordBase = SharedAllocationRecord<void, void>;
+  using RecordROCm =
+      SharedAllocationRecord<Kokkos::Experimental::ROCmSpace, void>;
 
   // Copy the header from the allocation
-  Header head ;
+  Header head;
 
-  Header const * const head_rocm = alloc_ptr ? Header::get_header( alloc_ptr ) : (Header*) 0 ;
+  Header const* const head_rocm =
+      alloc_ptr ? Header::get_header(alloc_ptr) : (Header*)0;
 
-  if ( alloc_ptr ) {
-    Kokkos::Impl::DeepCopy<HostSpace,Kokkos::Experimental::ROCmSpace>( & head , head_rocm , sizeof(SharedAllocationHeader) );
+  if (alloc_ptr) {
+    Kokkos::Impl::DeepCopy<HostSpace, Kokkos::Experimental::ROCmSpace>(
+        &head, head_rocm, sizeof(SharedAllocationHeader));
   }
 
-  RecordROCm * const record = alloc_ptr ? static_cast< RecordROCm * >( head.m_record ) : (RecordROCm *) 0 ;
+  RecordROCm* const record =
+      alloc_ptr ? static_cast<RecordROCm*>(head.m_record) : (RecordROCm*)0;
 
-  if ( ! alloc_ptr || record->m_alloc_ptr != head_rocm ) {
-    Kokkos::Impl::throw_runtime_exception( std::string("Kokkos::Impl::SharedAllocationRecord< Kokkos::Experimental::ROCmSpace , void >::get_record ERROR" ) );
+  if (!alloc_ptr || record->m_alloc_ptr != head_rocm) {
+    Kokkos::Impl::throw_runtime_exception(std::string(
+        "Kokkos::Impl::SharedAllocationRecord< Kokkos::Experimental::ROCmSpace "
+        ", void >::get_record ERROR"));
   }
 
-  return record ;
+  return record;
 }
 
-#if  0
+#if 0
 SharedAllocationRecord< Kokkos::Experimental::ROCmHostPinnedSpace , void > *
 SharedAllocationRecord< Kokkos::Experimental::ROCmHostPinnedSpace , void >::get_record( void * alloc_ptr )
 {
@@ -533,92 +536,84 @@ SharedAllocationRecord< Kokkos::Experimental::ROCmHostPinnedSpace , void >::get_
 
   return static_cast< RecordROCm * >( h->m_record );
 }
-#endif 
+#endif
 
 // Iterate records to print orphaned memory ...
-void
-SharedAllocationRecord< Kokkos::Experimental::ROCmSpace , void >::
-print_records( std::ostream & s , const Kokkos::Experimental::ROCmSpace & space , bool detail )
-{
+void SharedAllocationRecord<Kokkos::Experimental::ROCmSpace, void>::
+    print_records(std::ostream& s, const Kokkos::Experimental::ROCmSpace& space,
+                  bool detail) {
 #ifdef KOKKOS_DEBUG
-  SharedAllocationRecord< void , void > * r = & s_root_record ;
+  SharedAllocationRecord<void, void>* r = &s_root_record;
 
-  char buffer[256] ;
+  char buffer[256];
 
-  SharedAllocationHeader head ;
+  SharedAllocationHeader head;
 
-  if ( detail ) {
+  if (detail) {
     do {
-      if ( r->m_alloc_ptr ) {
-        Kokkos::Impl::DeepCopy<HostSpace,Kokkos::Experimental::ROCmSpace>( & head , r->m_alloc_ptr , sizeof(SharedAllocationHeader) );
-      }
-      else {
-        head.m_label[0] = 0 ;
+      if (r->m_alloc_ptr) {
+        Kokkos::Impl::DeepCopy<HostSpace, Kokkos::Experimental::ROCmSpace>(
+            &head, r->m_alloc_ptr, sizeof(SharedAllocationHeader));
+      } else {
+        head.m_label[0] = 0;
       }
 
-      //Formatting dependent on sizeof(uintptr_t)
-      const char * format_string;
+      // Formatting dependent on sizeof(uintptr_t)
+      const char* format_string;
 
-      if (sizeof(uintptr_t) == sizeof(unsigned long)) { 
-        format_string = "ROCm addr( 0x%.12lx ) list( 0x%.12lx 0x%.12lx ) extent[ 0x%.12lx + %.8ld ] count(%d) dealloc(0x%.12lx) %s\n";
-      }
-      else if (sizeof(uintptr_t) == sizeof(unsigned long long)) { 
-        format_string = "ROCm addr( 0x%.12llx ) list( 0x%.12llx 0x%.12llx ) extent[ 0x%.12llx + %.8ld ] count(%d) dealloc(0x%.12llx) %s\n";
+      if (sizeof(uintptr_t) == sizeof(unsigned long)) {
+        format_string =
+            "ROCm addr( 0x%.12lx ) list( 0x%.12lx 0x%.12lx ) extent[ 0x%.12lx "
+            "+ %.8ld ] count(%d) dealloc(0x%.12lx) %s\n";
+      } else if (sizeof(uintptr_t) == sizeof(unsigned long long)) {
+        format_string =
+            "ROCm addr( 0x%.12llx ) list( 0x%.12llx 0x%.12llx ) extent[ "
+            "0x%.12llx + %.8ld ] count(%d) dealloc(0x%.12llx) %s\n";
       }
 
-      snprintf( buffer , 256 
-              , format_string
-              , reinterpret_cast<uintptr_t>( r )
-              , reinterpret_cast<uintptr_t>( r->m_prev )
-              , reinterpret_cast<uintptr_t>( r->m_next )
-              , reinterpret_cast<uintptr_t>( r->m_alloc_ptr )
-              , r->m_alloc_size
-              , r->m_count
-              , reinterpret_cast<uintptr_t>( r->m_dealloc )
-              , head.m_label
-              );
-      std::cout << buffer ;
-      r = r->m_next ;
-    } while ( r != & s_root_record );
-  }
-  else {
+      snprintf(buffer, 256, format_string, reinterpret_cast<uintptr_t>(r),
+               reinterpret_cast<uintptr_t>(r->m_prev),
+               reinterpret_cast<uintptr_t>(r->m_next),
+               reinterpret_cast<uintptr_t>(r->m_alloc_ptr), r->m_alloc_size,
+               r->m_count, reinterpret_cast<uintptr_t>(r->m_dealloc),
+               head.m_label);
+      std::cout << buffer;
+      r = r->m_next;
+    } while (r != &s_root_record);
+  } else {
     do {
-      if ( r->m_alloc_ptr ) {
+      if (r->m_alloc_ptr) {
+        Kokkos::Impl::DeepCopy<HostSpace, Kokkos::Experimental::ROCmSpace>(
+            &head, r->m_alloc_ptr, sizeof(SharedAllocationHeader));
 
-        Kokkos::Impl::DeepCopy<HostSpace,Kokkos::Experimental::ROCmSpace>( & head , r->m_alloc_ptr , sizeof(SharedAllocationHeader) );
+        // Formatting dependent on sizeof(uintptr_t)
+        const char* format_string;
 
-        //Formatting dependent on sizeof(uintptr_t)
-        const char * format_string;
-
-        if (sizeof(uintptr_t) == sizeof(unsigned long)) { 
+        if (sizeof(uintptr_t) == sizeof(unsigned long)) {
           format_string = "ROCm [ 0x%.12lx + %ld ] %s\n";
-        }
-        else if (sizeof(uintptr_t) == sizeof(unsigned long long)) { 
+        } else if (sizeof(uintptr_t) == sizeof(unsigned long long)) {
           format_string = "ROCm [ 0x%.12llx + %ld ] %s\n";
         }
 
-        snprintf( buffer , 256 
-                , format_string
-                , reinterpret_cast< uintptr_t >( r->data() )
-                , r->size()
-                , head.m_label
-                );
+        snprintf(buffer, 256, format_string,
+                 reinterpret_cast<uintptr_t>(r->data()), r->size(),
+                 head.m_label);
+      } else {
+        snprintf(buffer, 256, "ROCm [ 0 + 0 ]\n");
       }
-      else {
-        snprintf( buffer , 256 , "ROCm [ 0 + 0 ]\n" );
-      }
-      std::cout << buffer ;
-      r = r->m_next ;
-    } while ( r != & s_root_record );
+      std::cout << buffer;
+      r = r->m_next;
+    } while (r != &s_root_record);
   }
 #else
-  throw_runtime_exception("Kokkos::Impl::SharedAllocationRecord<ROCmSpace>::print_records"
+  throw_runtime_exception(
+      "Kokkos::Impl::SharedAllocationRecord<ROCmSpace>::print_records"
       " only works with KOKKOS_DEBUG enabled");
 #endif
 }
 
-} // namespace Impl
-} // namespace Kokkos
+}  // namespace Impl
+}  // namespace Kokkos
 
 /*--------------------------------------------------------------------------*/
 /*--------------------------------------------------------------------------*/
@@ -626,26 +621,28 @@ namespace Kokkos {
 namespace {
 
 void* rocm_resize_scratch_space(size_t bytes, bool force_shrink) {
-  static void* ptr = NULL;
+  static void* ptr           = NULL;
   static size_t current_size = 0;
-  if(current_size == 0) {
+  if (current_size == 0) {
     current_size = bytes;
-    ptr = Kokkos::kokkos_malloc<Kokkos::Experimental::ROCmSpace>("ROCmSpace::ScratchMemory",current_size);
+    ptr          = Kokkos::kokkos_malloc<Kokkos::Experimental::ROCmSpace>(
+        "ROCmSpace::ScratchMemory", current_size);
   }
-  if(bytes > current_size) {
+  if (bytes > current_size) {
     current_size = bytes;
-    ptr = Kokkos::kokkos_realloc<Kokkos::Experimental::ROCmSpace>(ptr,current_size);
+    ptr          = Kokkos::kokkos_realloc<Kokkos::Experimental::ROCmSpace>(ptr,
+                                                                  current_size);
   }
-  if((bytes < current_size) && (force_shrink)) {
+  if ((bytes < current_size) && (force_shrink)) {
     current_size = bytes;
     Kokkos::kokkos_free<Kokkos::Experimental::ROCmSpace>(ptr);
-    ptr = Kokkos::kokkos_malloc<Kokkos::Experimental::ROCmSpace>("ROCmSpace::ScratchMemory",current_size);
+    ptr = Kokkos::kokkos_malloc<Kokkos::Experimental::ROCmSpace>(
+        "ROCmSpace::ScratchMemory", current_size);
   }
   return ptr;
 }
 
-}
-}
-
-#endif // KOKKOS_ENABLE_ROCM
+}  // namespace
+}  // namespace Kokkos
 
+#endif  // KOKKOS_ENABLE_ROCM
diff --git a/lib/kokkos/core/src/ROCm/Kokkos_ROCm_Task.cpp b/lib/kokkos/core/src/ROCm/Kokkos_ROCm_Task.cpp
index 894d324834..53966ca934 100644
--- a/lib/kokkos/core/src/ROCm/Kokkos_ROCm_Task.cpp
+++ b/lib/kokkos/core/src/ROCm/Kokkos_ROCm_Task.cpp
@@ -1,13 +1,14 @@
 /*
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -36,14 +37,14 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 */
 
 #include <Kokkos_Core.hpp>
 
-#if defined( KOKKOS_ENABLE_ROCM ) && defined( KOKKOS_ENABLE_TASKDAG )
+#if defined(KOKKOS_ENABLE_ROCM) && defined(KOKKOS_ENABLE_TASKDAG)
 
 #include <impl/Kokkos_TaskQueue_impl.hpp>
 
@@ -53,46 +54,44 @@
 namespace Kokkos {
 namespace Impl {
 
-template class TaskQueue< Kokkos::Experimental::ROCm > ;
-
+template class TaskQueue<Kokkos::Experimental::ROCm>;
 
 //----------------------------------------------------------------------------
 KOKKOS_INLINE_FUNCTION
-void TaskQueueSpecialization< Kokkos::Experimental::ROCm >::driver
-  ( TaskQueueSpecialization< Kokkos::Experimental::ROCm >::queue_type * const queue,
-    hc::tiled_index<3> threadIdx )
-{
-  using Member = TaskExec< Kokkos::Experimental::ROCm > ;
-  using Queue  = TaskQueue< Kokkos::Experimental::ROCm > ;
-  using task_root_type = TaskBase< void , void , void > ;
+void TaskQueueSpecialization<Kokkos::Experimental::ROCm>::driver(
+    TaskQueueSpecialization<Kokkos::Experimental::ROCm>::queue_type
+        *const queue,
+    hc::tiled_index<3> threadIdx) {
+  using Member         = TaskExec<Kokkos::Experimental::ROCm>;
+  using Queue          = TaskQueue<Kokkos::Experimental::ROCm>;
+  using task_root_type = TaskBase<void, void, void>;
 
-  task_root_type * const end = (task_root_type *) task_root_type::EndTag ;
+  task_root_type *const end = (task_root_type *)task_root_type::EndTag;
 
-  Member single_exec( 1, threadIdx );
-  Member team_exec( threadIdx.tile_dim[0], threadIdx );
+  Member single_exec(1, threadIdx);
+  Member team_exec(threadIdx.tile_dim[0], threadIdx);
 
-  const int wavefront_lane = threadIdx.local[0] + threadIdx.local[1]* threadIdx.tile_dim[0] ;
+  const int wavefront_lane =
+      threadIdx.local[0] + threadIdx.local[1] * threadIdx.tile_dim[0];
 
   union {
-    task_root_type * ptr ;
-    int              raw[2] ;
-  } task ;
+    task_root_type *ptr;
+    int raw[2];
+  } task;
 
   // Loop until all queues are empty and no tasks in flight
 
   do {
-
     // Each team lead attempts to acquire either a thread team task
     // or collection of single thread tasks for the team.
 
-    if ( 0 == wavefront_lane ) {
-
-      task.ptr = 0 < *((volatile int *) & queue->m_ready_count) ? end : 0 ;
+    if (0 == wavefront_lane) {
+      task.ptr = 0 < *((volatile int *)&queue->m_ready_count) ? end : 0;
 
       // Loop by priority and then type
-      for ( int i = 0 ; i < Queue::NumQueue && end == task.ptr ; ++i ) {
-        for ( int j = 0 ; j < 2 && end == task.ptr ; ++j ) {
-          task.ptr = Queue::pop_ready_task( & queue->m_ready[i][j] );
+      for (int i = 0; i < Queue::NumQueue && end == task.ptr; ++i) {
+        for (int j = 0; j < 2 && end == task.ptr; ++j) {
+          task.ptr = Queue::pop_ready_task(&queue->m_ready[i][j]);
         }
       }
 
@@ -100,31 +99,29 @@ void TaskQueueSpecialization< Kokkos::Experimental::ROCm >::driver
 printf("TaskQueue<ROCm>::driver(%d,%d) task(%lx)\n",threadIdx.z,blockIdx.x
       , uintptr_t(task.ptr));
 #endif
-
     }
 
     // shuffle broadcast
 
-    task.raw[0] = hc::__shfl( task.raw[0] , 0 );
-    task.raw[1] = hc::__shfl( task.raw[1] , 0 );
+    task.raw[0] = hc::__shfl(task.raw[0], 0);
+    task.raw[1] = hc::__shfl(task.raw[1], 0);
 
-    if ( 0 == task.ptr ) break ; // 0 == queue->m_ready_count
+    if (0 == task.ptr) break;  // 0 == queue->m_ready_count
 
-    if ( end != task.ptr ) {
-      if ( task_root_type::TaskTeam == task.ptr->m_task_type ) {
+    if (end != task.ptr) {
+      if (task_root_type::TaskTeam == task.ptr->m_task_type) {
         // Thread Team Task
-        (*task.ptr->m_apply)( task.ptr , & team_exec );
-      }
-      else if ( 0 == threadIdx.local[1] ) {
+        (*task.ptr->m_apply)(task.ptr, &team_exec);
+      } else if (0 == threadIdx.local[1]) {
         // Single Thread Task
-        (*task.ptr->m_apply)( task.ptr , & single_exec );
+        (*task.ptr->m_apply)(task.ptr, &single_exec);
       }
 
-      if ( 0 == wavefront_lane ) {
-        queue->complete( task.ptr );
+      if (0 == wavefront_lane) {
+        queue->complete(task.ptr);
       }
     }
-  } while(1);
+  } while (1);
 }
 #if 0
 namespace {
@@ -135,21 +132,19 @@ void rocm_task_queue_execute( TaskQueue< Kokkos::Experimental::ROCm > * queue,
 
 }
 #endif
-void TaskQueueSpecialization< Kokkos::Experimental::ROCm >::execute
-  ( TaskQueue< Kokkos::Experimental::ROCm > * const queue )
-{
-  const int workgroups_per_wavefront = 4 ;
-  const int wavefront_size = Kokkos::Impl::ROCmTraits::WavefrontSize ;
-  const int cu_count = Kokkos::Impl::rocm_internal_cu_count();
-//  const dim3 grid( Kokkos::Impl::rocm_internal_cu_count() , 1 , 1 );
-//  const dim3 block( 1 , Kokkos::Impl::ROCmTraits::WorkGroupSize , workgroups_per_wavefront );
-
-
+void TaskQueueSpecialization<Kokkos::Experimental::ROCm>::execute(
+    TaskQueue<Kokkos::Experimental::ROCm> *const queue) {
+  const int workgroups_per_wavefront = 4;
+  const int wavefront_size           = Kokkos::Impl::ROCmTraits::WavefrontSize;
+  const int cu_count                 = Kokkos::Impl::rocm_internal_cu_count();
+  //  const dim3 grid( Kokkos::Impl::rocm_internal_cu_count() , 1 , 1 );
+  //  const dim3 block( 1 , Kokkos::Impl::ROCmTraits::WorkGroupSize ,
+  //  workgroups_per_wavefront );
 
   // Query the stack size, in bytes:
   // If not large enough then set the stack size, in bytes:
 
-// adapted from the cuda code.  TODO: Not at all sure that this is the proper 
+// adapted from the cuda code.  TODO: Not at all sure that this is the proper
 // to map the cuda grid/blocks/3D tiling to HCC
 #if 0
   hc::extent< 3 > flat_extent(  cu_count,
@@ -164,11 +159,10 @@ void TaskQueueSpecialization< Kokkos::Experimental::ROCm >::execute
 #endif
 }
 
-
-}} /* namespace Kokkos::Impl */
+}  // namespace Impl
+}  // namespace Kokkos
 
 //----------------------------------------------------------------------------
 
-#endif /* #if defined( KOKKOS_ENABLE_ROCM ) && defined( KOKKOS_ENABLE_TASKDAG ) */
-
-
+#endif /* #if defined( KOKKOS_ENABLE_ROCM ) && defined( KOKKOS_ENABLE_TASKDAG \
+          ) */
diff --git a/lib/kokkos/core/src/ROCm/Kokkos_ROCm_Task.hpp b/lib/kokkos/core/src/ROCm/Kokkos_ROCm_Task.hpp
index 37c61c691a..5b04e95513 100644
--- a/lib/kokkos/core/src/ROCm/Kokkos_ROCm_Task.hpp
+++ b/lib/kokkos/core/src/ROCm/Kokkos_ROCm_Task.hpp
@@ -1,13 +1,14 @@
 /*
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -36,7 +37,7 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 */
@@ -44,7 +45,7 @@
 #ifndef KOKKOS_IMPL_ROCM_TASK_HPP
 #define KOKKOS_IMPL_ROCM_TASK_HPP
 
-#if defined( KOKKOS_ENABLE_TASKDAG )
+#if defined(KOKKOS_ENABLE_TASKDAG)
 
 #include <ROCm/Kokkos_ROCm_Vectorization.hpp>
 
@@ -54,59 +55,53 @@
 namespace Kokkos {
 namespace Impl {
 
-template< class > class TaskExec ; 
+template <class>
+class TaskExec;
 
-template<>
-class TaskQueueSpecialization< Kokkos::Experimental::ROCm >
-{
-public:
-
-  using execution_space = Kokkos::Experimental::ROCm ;
-  using queue_type      = Kokkos::Impl::TaskQueue< execution_space > ;
-  using task_base_type  = Kokkos::Impl::TaskBase< execution_space , void , void > ;
-  using member_type     = TaskExec< execution_space > ;
+template <>
+class TaskQueueSpecialization<Kokkos::Experimental::ROCm> {
+ public:
+  using execution_space = Kokkos::Experimental::ROCm;
+  using queue_type      = Kokkos::Impl::TaskQueue<execution_space>;
+  using task_base_type  = Kokkos::Impl::TaskBase<execution_space, void, void>;
+  using member_type     = TaskExec<execution_space>;
 
   // Must specify memory space
-  using memory_space = Kokkos::HostSpace ;
+  using memory_space = Kokkos::HostSpace;
 
-  static
-  void iff_single_thread_recursive_execute( queue_type * const ) {}
+  static void iff_single_thread_recursive_execute(queue_type* const) {}
 
   KOKKOS_INLINE_FUNCTION
-  static void driver( queue_type * const, hc::tiled_index<3> );
+  static void driver(queue_type* const, hc::tiled_index<3>);
 
   // Must provide task queue execution function
-  static void execute( queue_type * const );
+  static void execute(queue_type* const);
 
   // Must provide mechanism to set function pointer in
   // execution space from the host process.
-  template< typename FunctorType >
-  static
-  void proc_set_apply( typename TaskBase< Kokkos::Experimental::ROCm
-                               , typename FunctorType::value_type
-                               , FunctorType
-                               >::function_type * ptr )
-    {
-      using TaskType = TaskBase< Kokkos::Experimental::ROCm
-                               , typename FunctorType::value_type
-                               , FunctorType
-                               > ;
-      hc::extent< 1 > flat_extent( 1 );
-      hc::tiled_extent< 1 > team_extent = flat_extent.tile( 1);
+  template <typename FunctorType>
+  static void proc_set_apply(
+      typename TaskBase<Kokkos::Experimental::ROCm,
+                        typename FunctorType::value_type,
+                        FunctorType>::function_type* ptr) {
+    using TaskType = TaskBase<Kokkos::Experimental::ROCm,
+                              typename FunctorType::value_type, FunctorType>;
+    hc::extent<1> flat_extent(1);
+    hc::tiled_extent<1> team_extent = flat_extent.tile(1);
 
-      hc::parallel_for_each( team_extent , [&](hc::tiled_index<1> idx) [[hc]]
-      {
-         *ptr = TaskType::apply ;
-      }).wait();
-    }
+    hc::parallel_for_each(
+        team_extent, [&](hc::tiled_index<1> idx)
+                         [[hc]] { *ptr = TaskType::apply; })
+        .wait();
+  }
 };
 
 /*template<>
-KOKKOS_FUNCTION 
-void TaskQueue<Kokkos::Experimental::ROCm>::decrement( typename TaskQueue<Kokkos::Experimental::ROCm>::task_root_type *
-) {}
+KOKKOS_FUNCTION
+void TaskQueue<Kokkos::Experimental::ROCm>::decrement( typename
+TaskQueue<Kokkos::Experimental::ROCm>::task_root_type * ) {}
 */
-extern template class TaskQueue< Kokkos::Experimental::ROCm > ;
+extern template class TaskQueue<Kokkos::Experimental::ROCm>;
 
 //----------------------------------------------------------------------------
 /**\brief  Impl::TaskExec<ROCm> is the TaskScheduler<ROCm>::member_type
@@ -123,347 +118,331 @@ extern template class TaskQueue< Kokkos::Experimental::ROCm > ;
  *  A single thread task is called by warp lane #0 and the remaining
  *  lanes of the warp are idle.
  */
-template<>
-class TaskExec< Kokkos::Experimental::ROCm >
-{
-private:
+template <>
+class TaskExec<Kokkos::Experimental::ROCm> {
+ private:
+  TaskExec(TaskExec&&)      = delete;
+  TaskExec(TaskExec const&) = delete;
+  TaskExec& operator=(TaskExec&&) = delete;
+  TaskExec& operator=(TaskExec const&) = delete;
 
-  TaskExec( TaskExec && ) = delete ;
-  TaskExec( TaskExec const & ) = delete ;
-  TaskExec & operator = ( TaskExec && ) = delete ;
-  TaskExec & operator = ( TaskExec const & ) = delete ;
+  friend class Kokkos::Impl::TaskQueue<Kokkos::Experimental::ROCm>;
+  friend class Kokkos::Impl::TaskQueueSpecialization<
+      Kokkos::Experimental::ROCm>;
 
+  int m_team_size;
+  hc::tiled_index<3> m_idx;
 
-  friend class Kokkos::Impl::TaskQueue< Kokkos::Experimental::ROCm > ;
-  friend class Kokkos::Impl::TaskQueueSpecialization< Kokkos::Experimental::ROCm > ;
+  //  KOKKOS_INLINE_FUNCTION TaskExec( int arg_team_size )  //TODO: tile_dim[0]
+  //    : m_team_size( arg_team_size ) {}
 
-  int              m_team_size ;
-  hc::tiled_index<3>      m_idx;
+  KOKKOS_INLINE_FUNCTION TaskExec(int arg_team_size, hc::tiled_index<3> tidx)
+      : m_team_size(arg_team_size), m_idx(tidx) {}
 
-//  KOKKOS_INLINE_FUNCTION TaskExec( int arg_team_size )  //TODO: tile_dim[0]
-//    : m_team_size( arg_team_size ) {}
+ public:
+  //      const auto local = t_idx.local[0];
+  //      const auto global = t_idx.global[0];
+  //     const auto tile = t_idx.tile[0];
 
-  KOKKOS_INLINE_FUNCTION TaskExec( int arg_team_size,
-                                   hc::tiled_index<3> tidx)  
-    : m_team_size( arg_team_size),
-      m_idx( tidx ) {}
+  hc::tiled_index<3> idx() const { return m_idx; }
 
-public:
-//      const auto local = t_idx.local[0];
-//      const auto global = t_idx.global[0];
-//     const auto tile = t_idx.tile[0];
-
-  hc::tiled_index<3> idx() const { return m_idx;}
-
-#if defined( __HCC_ACCELERATOR__ )
-  KOKKOS_INLINE_FUNCTION void team_barrier() { /* __threadfence_block(); */ }
-  KOKKOS_INLINE_FUNCTION int  team_rank() const { return m_idx.local[1] ; } // t_idx.tile[0];
-  KOKKOS_INLINE_FUNCTION int  team_size() const { return m_team_size ; }
+#if defined(__HCC_ACCELERATOR__)
+  KOKKOS_INLINE_FUNCTION void team_barrier() { /* __threadfence_block(); */
+  }
+  KOKKOS_INLINE_FUNCTION int team_rank() const {
+    return m_idx.local[1];
+  }  // t_idx.tile[0];
+  KOKKOS_INLINE_FUNCTION int team_size() const { return m_team_size; }
 #else
   KOKKOS_INLINE_FUNCTION void team_barrier() {}
-  KOKKOS_INLINE_FUNCTION int  team_rank() const { return 0 ; }
-  KOKKOS_INLINE_FUNCTION int  team_size() const { return 0 ; }
+  KOKKOS_INLINE_FUNCTION int team_rank() const { return 0; }
+  KOKKOS_INLINE_FUNCTION int team_size() const { return 0; }
 #endif
 };
 
-}} /* namespace Kokkos::Impl */
+}  // namespace Impl
+}  // namespace Kokkos
 
 //----------------------------------------------------------------------------
 //----------------------------------------------------------------------------
 namespace Kokkos {
 
-template<typename iType>
-KOKKOS_INLINE_FUNCTION
-Impl::TeamThreadRangeBoundariesStruct<iType,Impl::TaskExec< Kokkos::Experimental::ROCm > >
-TeamThreadRange
-  ( Impl::TaskExec< Kokkos::Experimental::ROCm > & thread, const iType & count )
-{
-  return Impl::TeamThreadRangeBoundariesStruct<iType,Impl::TaskExec< Kokkos::Experimental::ROCm > >(thread,count);
+template <typename iType>
+KOKKOS_INLINE_FUNCTION Impl::TeamThreadRangeBoundariesStruct<
+    iType, Impl::TaskExec<Kokkos::Experimental::ROCm> >
+TeamThreadRange(Impl::TaskExec<Kokkos::Experimental::ROCm>& thread,
+                const iType& count) {
+  return Impl::TeamThreadRangeBoundariesStruct<
+      iType, Impl::TaskExec<Kokkos::Experimental::ROCm> >(thread, count);
 }
 
-template<typename iType1, typename iType2>
-KOKKOS_INLINE_FUNCTION
-Impl::TeamThreadRangeBoundariesStruct< typename std::common_type< iType1, iType2 >::type,
-                                       Impl::TaskExec< Kokkos::Experimental::ROCm > >
-TeamThreadRange
-  ( Impl:: TaskExec< Kokkos::Experimental::ROCm > & thread, const iType1 & begin, const iType2 & end )
-{
+template <typename iType1, typename iType2>
+KOKKOS_INLINE_FUNCTION Impl::TeamThreadRangeBoundariesStruct<
+    typename std::common_type<iType1, iType2>::type,
+    Impl::TaskExec<Kokkos::Experimental::ROCm> >
+TeamThreadRange(Impl::TaskExec<Kokkos::Experimental::ROCm>& thread,
+                const iType1& begin, const iType2& end) {
   typedef typename std::common_type<iType1, iType2>::type iType;
-  return Impl::TeamThreadRangeBoundariesStruct<iType, Impl::TaskExec< Kokkos::Experimental::ROCm > >(thread, begin, end);
+  return Impl::TeamThreadRangeBoundariesStruct<
+      iType, Impl::TaskExec<Kokkos::Experimental::ROCm> >(thread, begin, end);
 }
 
-template<typename iType>
-KOKKOS_INLINE_FUNCTION
-Impl::ThreadVectorRangeBoundariesStruct<iType,Impl::TaskExec< Kokkos::Experimental::ROCm > >
-ThreadVectorRange
-  ( Impl::TaskExec< Kokkos::Experimental::ROCm > & thread
-  , const iType & count )
-{
-  return Impl::ThreadVectorRangeBoundariesStruct<iType,Impl::TaskExec< Kokkos::Experimental::ROCm > >(thread,count);
+template <typename iType>
+KOKKOS_INLINE_FUNCTION Impl::ThreadVectorRangeBoundariesStruct<
+    iType, Impl::TaskExec<Kokkos::Experimental::ROCm> >
+ThreadVectorRange(Impl::TaskExec<Kokkos::Experimental::ROCm>& thread,
+                  const iType& count) {
+  return Impl::ThreadVectorRangeBoundariesStruct<
+      iType, Impl::TaskExec<Kokkos::Experimental::ROCm> >(thread, count);
 }
 
-template<typename iType>
-KOKKOS_INLINE_FUNCTION
-Impl::ThreadVectorRangeBoundariesStruct<iType,Impl::TaskExec< Kokkos::Experimental::ROCm > >
-ThreadVectorRange
-  ( Impl::TaskExec< Kokkos::Experimental::ROCm > & thread
-  , const iType & arg_begin
-  , const iType & arg_end)
-{
-  return Impl::ThreadVectorRangeBoundariesStruct<iType,Impl::TaskExec< Kokkos::Experimental::ROCm > >(thread,arg_begin,arg_end);
+template <typename iType>
+KOKKOS_INLINE_FUNCTION Impl::ThreadVectorRangeBoundariesStruct<
+    iType, Impl::TaskExec<Kokkos::Experimental::ROCm> >
+ThreadVectorRange(Impl::TaskExec<Kokkos::Experimental::ROCm>& thread,
+                  const iType& arg_begin, const iType& arg_end) {
+  return Impl::ThreadVectorRangeBoundariesStruct<
+      iType, Impl::TaskExec<Kokkos::Experimental::ROCm> >(thread, arg_begin,
+                                                          arg_end);
 }
 
-/** \brief  Inter-thread parallel_for. Executes lambda(iType i) for each i=0..N-1.
+/** \brief  Inter-thread parallel_for. Executes lambda(iType i) for each
+ * i=0..N-1.
  *
  * The range i=0..N-1 is mapped to all threads of the the calling thread team.
  * This functionality requires C++11 support.
-*/
-template<typename iType, class Lambda>
-KOKKOS_INLINE_FUNCTION
-void parallel_for
-  ( const Impl::TeamThreadRangeBoundariesStruct<iType,Impl:: TaskExec< Kokkos::Experimental::ROCm > >& loop_boundaries
-  , const Lambda& lambda
-  )
-{
-  for( iType i = loop_boundaries.start; i < loop_boundaries.end; i+=loop_boundaries.increment) {
+ */
+template <typename iType, class Lambda>
+KOKKOS_INLINE_FUNCTION void parallel_for(
+    const Impl::TeamThreadRangeBoundariesStruct<
+        iType, Impl::TaskExec<Kokkos::Experimental::ROCm> >& loop_boundaries,
+    const Lambda& lambda) {
+  for (iType i = loop_boundaries.start; i < loop_boundaries.end;
+       i += loop_boundaries.increment) {
     lambda(i);
   }
 }
 
 // reduce across corresponding lanes between team members within workgroup
 // assume stride*team_size == workgroup_size
-template< typename ValueType >
-KOKKOS_INLINE_FUNCTION
-void strided_shfl_workgroup_reduction
-  (const ValueType& f(),
-   ValueType& val,
-   int team_size,
-   int stride)
-{
-  for (int lane_delta=(team_size*stride)>>1; lane_delta>=stride; lane_delta>>=1) {
-    f(val, Kokkos::shfl_down(val, lane_delta, team_size*stride));
+template <typename ValueType>
+KOKKOS_INLINE_FUNCTION void strided_shfl_workgroup_reduction(
+    const ValueType& f(), ValueType& val, int team_size, int stride) {
+  for (int lane_delta = (team_size * stride) >> 1; lane_delta >= stride;
+       lane_delta >>= 1) {
+    f(val, Kokkos::shfl_down(val, lane_delta, team_size * stride));
   }
 }
 
-template< typename ValueType, class JoinType >
-KOKKOS_INLINE_FUNCTION
-void strided_shfl_workgroup_reduction
-  (const JoinType& join,
-   ValueType& val,
-   int team_size,
-   int stride)
-{
-  for (int lane_delta=(team_size*stride)>>1; lane_delta>=stride; lane_delta>>=1) {
-    join(val, shfl_down(val, lane_delta, team_size*stride));
+template <typename ValueType, class JoinType>
+KOKKOS_INLINE_FUNCTION void strided_shfl_workgroup_reduction(
+    const JoinType& join, ValueType& val, int team_size, int stride) {
+  for (int lane_delta = (team_size * stride) >> 1; lane_delta >= stride;
+       lane_delta >>= 1) {
+    join(val, shfl_down(val, lane_delta, team_size * stride));
   }
 }
 
 // multiple within-workgroup non-strided reductions
-template< typename ValueType, class JoinType >
-KOKKOS_INLINE_FUNCTION
-void multi_shfl_workgroup_reduction
-  (const JoinType& join,
-   ValueType& val,
-   int vec_length)
-{
-  for (int lane_delta=vec_length>>1; lane_delta; lane_delta>>=1) {
+template <typename ValueType, class JoinType>
+KOKKOS_INLINE_FUNCTION void multi_shfl_workgroup_reduction(const JoinType& join,
+                                                           ValueType& val,
+                                                           int vec_length) {
+  for (int lane_delta = vec_length >> 1; lane_delta; lane_delta >>= 1) {
     join(val, shfl_down(val, lane_delta, vec_length));
   }
 }
 
 // broadcast within workgroup
-template< class ValueType >
-KOKKOS_INLINE_FUNCTION
-ValueType shfl_workgroup_broadcast
-  (ValueType& val,
-   int src_lane,
-   int width)
-{
+template <class ValueType>
+KOKKOS_INLINE_FUNCTION ValueType shfl_workgroup_broadcast(ValueType& val,
+                                                          int src_lane,
+                                                          int width) {
   return shfl(val, src_lane, width);
 }
 
-// all-reduce across corresponding vector lanes between team members within workgroup
-// assume vec_length*team_size == workgroup_size
-// blockDim.x == vec_length == stride
-// blockDim.y == team_size
-// threadIdx.x == position in vec
+// all-reduce across corresponding vector lanes between team members within
+// workgroup assume vec_length*team_size == workgroup_size blockDim.x ==
+// vec_length == stride blockDim.y == team_size threadIdx.x == position in vec
 // threadIdx.y == member number
 
-template<typename iType, class Lambda, typename ValueType>
-KOKKOS_INLINE_FUNCTION
-void parallel_reduce
-  ( const Impl::TeamThreadRangeBoundariesStruct<iType,Impl:: TaskExec< Kokkos::Experimental::ROCm > >& loop_boundaries
-  , const Lambda& lambda
-  , ValueType& initialized_result)
-{
-  int team_rank = loop_boundaries.thread.team_rank(); // member num within the team
-  ValueType result = initialized_result;
+template <typename iType, class Lambda, typename ValueType>
+KOKKOS_INLINE_FUNCTION void parallel_reduce(
+    const Impl::TeamThreadRangeBoundariesStruct<
+        iType, Impl::TaskExec<Kokkos::Experimental::ROCm> >& loop_boundaries,
+    const Lambda& lambda, ValueType& initialized_result) {
+  int team_rank =
+      loop_boundaries.thread.team_rank();  // member num within the team
+  ValueType result       = initialized_result;
   hc::tiled_index<3> idx = loop_boundaries.thread.idx();
 
-  for( iType i = loop_boundaries.start; i < loop_boundaries.end; i+=loop_boundaries.increment) {
+  for (iType i = loop_boundaries.start; i < loop_boundaries.end;
+       i += loop_boundaries.increment) {
     lambda(i, result);
   }
   initialized_result = result;
 
   strided_shfl_workgroup_reduction(
-                          [&] (ValueType& val1, const ValueType& val2) { val1 += val2; },
-                          initialized_result,
-                          loop_boundaries.thread.team_size(),
-                          idx.tile_dim[0]);
-  initialized_result = shfl_workgroup_broadcast<ValueType>( initialized_result, idx.local[0], Impl::ROCmTraits::WavefrontSize );
-
+      [&](ValueType& val1, const ValueType& val2) { val1 += val2; },
+      initialized_result, loop_boundaries.thread.team_size(), idx.tile_dim[0]);
+  initialized_result = shfl_workgroup_broadcast<ValueType>(
+      initialized_result, idx.local[0], Impl::ROCmTraits::WavefrontSize);
 }
 
-template< typename iType, class Lambda, typename ValueType, class JoinType >
-KOKKOS_INLINE_FUNCTION
-void parallel_reduce
-  (const Impl::TeamThreadRangeBoundariesStruct<iType,Impl::TaskExec< Kokkos::Experimental::ROCm > >& loop_boundaries,
-   const Lambda & lambda,
-   const JoinType & join,
-   ValueType& initialized_result)
-{
-   hc::tiled_index<3> idx = loop_boundaries.thread.idx();
-  int team_rank = loop_boundaries.thread.team_rank(); // member num within the team
+template <typename iType, class Lambda, typename ValueType, class JoinType>
+KOKKOS_INLINE_FUNCTION void parallel_reduce(
+    const Impl::TeamThreadRangeBoundariesStruct<
+        iType, Impl::TaskExec<Kokkos::Experimental::ROCm> >& loop_boundaries,
+    const Lambda& lambda, const JoinType& join, ValueType& initialized_result) {
+  hc::tiled_index<3> idx = loop_boundaries.thread.idx();
+  int team_rank =
+      loop_boundaries.thread.team_rank();  // member num within the team
   ValueType result = initialized_result;
 
-  for( iType i = loop_boundaries.start; i < loop_boundaries.end; i+=loop_boundaries.increment) {
+  for (iType i = loop_boundaries.start; i < loop_boundaries.end;
+       i += loop_boundaries.increment) {
     lambda(i, result);
   }
 
   strided_shfl_workgroup_reduction<ValueType, JoinType>(
-                          join,
-                          initialized_result,
-                          loop_boundaries.thread.team_size(),
-                          idx.tile_dim[0]);
-  initialized_result = shfl_workgroup_broadcast<ValueType>( initialized_result, idx.local[0], Impl::ROCmTraits::WavefrontSize );
+      join, initialized_result, loop_boundaries.thread.team_size(),
+      idx.tile_dim[0]);
+  initialized_result = shfl_workgroup_broadcast<ValueType>(
+      initialized_result, idx.local[0], Impl::ROCmTraits::WavefrontSize);
 }
 
 // placeholder for future function
-template< typename iType, class Lambda, typename ValueType >
-KOKKOS_INLINE_FUNCTION
-void parallel_reduce
-  (const Impl::ThreadVectorRangeBoundariesStruct<iType,Impl::TaskExec< Kokkos::Experimental::ROCm > >& loop_boundaries,
-   const Lambda & lambda,
-   ValueType& initialized_result)
-{
-  ValueType result = initialized_result;
+template <typename iType, class Lambda, typename ValueType>
+KOKKOS_INLINE_FUNCTION void parallel_reduce(
+    const Impl::ThreadVectorRangeBoundariesStruct<
+        iType, Impl::TaskExec<Kokkos::Experimental::ROCm> >& loop_boundaries,
+    const Lambda& lambda, ValueType& initialized_result) {
+  ValueType result       = initialized_result;
   hc::tiled_index<3> idx = loop_boundaries.thread.idx();
 
-  for( iType i = loop_boundaries.start; i < loop_boundaries.end; i+=loop_boundaries.increment) {
-    lambda(i,result);
+  for (iType i = loop_boundaries.start; i < loop_boundaries.end;
+       i += loop_boundaries.increment) {
+    lambda(i, result);
   }
 
   initialized_result = result;
 
-  //initialized_result = multi_shfl_workgroup_reduction(
+  // initialized_result = multi_shfl_workgroup_reduction(
   multi_shfl_workgroup_reduction(
-                          [&] (ValueType& val1, const ValueType& val2) { val1 += val2; },
-                          initialized_result,
-                          idx.tile_dim[0]);
-  initialized_result = shfl_workgroup_broadcast<ValueType>( initialized_result, 0, idx.tile_dim[0] );
+      [&](ValueType& val1, const ValueType& val2) { val1 += val2; },
+      initialized_result, idx.tile_dim[0]);
+  initialized_result = shfl_workgroup_broadcast<ValueType>(initialized_result,
+                                                           0, idx.tile_dim[0]);
 }
 
 // placeholder for future function
-template< typename iType, class Lambda, typename ValueType, class JoinType >
-KOKKOS_INLINE_FUNCTION
-void parallel_reduce
-  (const Impl::ThreadVectorRangeBoundariesStruct<iType,Impl::TaskExec< Kokkos::Experimental::ROCm > >& loop_boundaries,
-   const Lambda & lambda,
-   const JoinType & join,
-   ValueType& initialized_result)
-{
+template <typename iType, class Lambda, typename ValueType, class JoinType>
+KOKKOS_INLINE_FUNCTION void parallel_reduce(
+    const Impl::ThreadVectorRangeBoundariesStruct<
+        iType, Impl::TaskExec<Kokkos::Experimental::ROCm> >& loop_boundaries,
+    const Lambda& lambda, const JoinType& join, ValueType& initialized_result) {
   hc::tiled_index<3> idx = loop_boundaries.thread.idx();
-  ValueType result = initialized_result;
-  for( iType i = loop_boundaries.start; i < loop_boundaries.end; i+=loop_boundaries.increment) {
-    lambda(i,result);
+  ValueType result       = initialized_result;
+  for (iType i = loop_boundaries.start; i < loop_boundaries.end;
+       i += loop_boundaries.increment) {
+    lambda(i, result);
   }
   initialized_result = result;
 
-  multi_shfl_workgroup_reduction<ValueType, JoinType>(join, initialized_result, idx.tile_dim[0]);
-  initialized_result = shfl_workgroup_broadcast<ValueType>( initialized_result, 0, idx.tile_dim[0] );
+  multi_shfl_workgroup_reduction<ValueType, JoinType>(join, initialized_result,
+                                                      idx.tile_dim[0]);
+  initialized_result = shfl_workgroup_broadcast<ValueType>(initialized_result,
+                                                           0, idx.tile_dim[0]);
 }
 
-template< typename ValueType, typename iType, class Lambda >
-KOKKOS_INLINE_FUNCTION
-void parallel_scan
-  (const Impl::TeamThreadRangeBoundariesStruct<iType,Impl::TaskExec< Kokkos::Experimental::ROCm > >& loop_boundaries,
-   const Lambda & lambda)
-{
+template <typename ValueType, typename iType, class Lambda>
+KOKKOS_INLINE_FUNCTION void parallel_scan(
+    const Impl::TeamThreadRangeBoundariesStruct<
+        iType, Impl::TaskExec<Kokkos::Experimental::ROCm> >& loop_boundaries,
+    const Lambda& lambda) {
   hc::tiled_index<3> idx = loop_boundaries.thread.idx();
-  ValueType accum = 0 ;
+  ValueType accum        = 0;
   ValueType val, y, local_total;
 
-  for( iType i = loop_boundaries.start; i < loop_boundaries.end; i+=loop_boundaries.increment) {
+  for (iType i = loop_boundaries.start; i < loop_boundaries.end;
+       i += loop_boundaries.increment) {
     val = 0;
-    lambda(i,val,false);
+    lambda(i, val, false);
 
     // intra-idx.tile_dim[0] exclusive scan on 'val'
     // accum = accumulated, sum in total for this iteration
 
     // INCLUSIVE scan
-    for( int offset = idx.tile_dim[0] ; offset < Impl::ROCmTraits::WavefrontSize ; offset <<= 1 ) {
+    for (int offset = idx.tile_dim[0]; offset < Impl::ROCmTraits::WavefrontSize;
+         offset <<= 1) {
       y = shfl_up(val, offset, Impl::ROCmTraits::WavefrontSize);
-      if(idx.local[1]*idx.tile_dim[0] >= offset) { val += y; }
+      if (idx.local[1] * idx.tile_dim[0] >= offset) {
+        val += y;
+      }
     }
 
     // pass accum to all threads
-    local_total = shfl_workgroup_broadcast<ValueType>(val,
-                                            idx.local[0]+Impl::ROCmTraits::WavefrontSize-idx.tile_dim[0],
-                                            Impl::ROCmTraits::WavefrontSize);
+    local_total = shfl_workgroup_broadcast<ValueType>(
+        val, idx.local[0] + Impl::ROCmTraits::WavefrontSize - idx.tile_dim[0],
+        Impl::ROCmTraits::WavefrontSize);
 
     // make EXCLUSIVE scan by shifting values over one
     val = shfl_up(val, idx.tile_dim[0], Impl::ROCmTraits::WavefrontSize);
-    if ( idx.local[1] == 0 ) { val = 0 ; }
+    if (idx.local[1] == 0) {
+      val = 0;
+    }
 
     val += accum;
-    lambda(i,val,true);
+    lambda(i, val, true);
     accum += local_total;
   }
 }
 
 // placeholder for future function
-template< typename iType, class Lambda, typename ValueType >
-KOKKOS_INLINE_FUNCTION
-void parallel_scan
-  (const Impl::ThreadVectorRangeBoundariesStruct<iType,Impl::TaskExec< Kokkos::Experimental::ROCm > >& loop_boundaries,
-   const Lambda & lambda)
-{
+template <typename iType, class Lambda, typename ValueType>
+KOKKOS_INLINE_FUNCTION void parallel_scan(
+    const Impl::ThreadVectorRangeBoundariesStruct<
+        iType, Impl::TaskExec<Kokkos::Experimental::ROCm> >& loop_boundaries,
+    const Lambda& lambda) {
   hc::tiled_index<3> idx = loop_boundaries.thread.idx();
-  ValueType accum = 0 ;
+  ValueType accum        = 0;
   ValueType val, y, local_total;
 
-  for( iType i = loop_boundaries.start; i < loop_boundaries.end; i+=loop_boundaries.increment) {
+  for (iType i = loop_boundaries.start; i < loop_boundaries.end;
+       i += loop_boundaries.increment) {
     val = 0;
-    lambda(i,val,false);
+    lambda(i, val, false);
 
     // intra-idx.tile_dim[0] exclusive scan on 'val'
     // accum = accumulated, sum in total for this iteration
 
     // INCLUSIVE scan
-    for( int offset = 1 ; offset < idx.tile_dim[0] ; offset <<= 1 ) {
+    for (int offset = 1; offset < idx.tile_dim[0]; offset <<= 1) {
       y = shfl_up(val, offset, idx.tile_dim[0]);
-      if(idx.local[0] >= offset) { val += y; }
+      if (idx.local[0] >= offset) {
+        val += y;
+      }
     }
 
     // pass accum to all threads
-    local_total = shfl_workgroup_broadcast<ValueType>(val, idx.tile_dim[0]-1, 
-                                                 idx.tile_dim[0]);
+    local_total = shfl_workgroup_broadcast<ValueType>(val, idx.tile_dim[0] - 1,
+                                                      idx.tile_dim[0]);
 
     // make EXCLUSIVE scan by shifting values over one
     val = shfl_up(val, 1, idx.tile_dim[0]);
-    if ( idx.local[0] == 0 ) { val = 0 ; }
+    if (idx.local[0] == 0) {
+      val = 0;
+    }
 
     val += accum;
-    lambda(i,val,true);
+    lambda(i, val, true);
     accum += local_total;
   }
 }
 
-
 } /* namespace Kokkos */
 //----------------------------------------------------------------------------
 //----------------------------------------------------------------------------
 
 #endif /* #if defined( KOKKOS_ENABLE_TASKDAG ) */
 #endif /* #ifndef KOKKOS_IMPL_ROCM_TASK_HPP */
-
diff --git a/lib/kokkos/core/src/ROCm/Kokkos_ROCm_Tile.hpp b/lib/kokkos/core/src/ROCm/Kokkos_ROCm_Tile.hpp
index b4436ae156..da95064eea 100644
--- a/lib/kokkos/core/src/ROCm/Kokkos_ROCm_Tile.hpp
+++ b/lib/kokkos/core/src/ROCm/Kokkos_ROCm_Tile.hpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -47,14 +48,17 @@
 #include <memory>
 #include <ROCm/Kokkos_ROCm_Config.hpp>
 
-#if !defined( KOKKOS_ROCM_TILE_H )
+#if !defined(KOKKOS_ROCM_TILE_H)
 #define KOKKOS_ROCM_TILE_H
 
 // Macro to abstract out the enable_if craziness
-#define KOKKOS_ROCM_REQUIRES(...) \
-    bool KokkosROCmRequiresBool ## __LINE__ = true, typename std::enable_if<KokkosROCmRequiresBool ## __LINE__ && (__VA_ARGS__), int>::type = 0
+#define KOKKOS_ROCM_REQUIRES(...)                                    \
+  bool KokkosROCmRequiresBool##__LINE__ = true,                      \
+       typename std::enable_if < KokkosROCmRequiresBool##__LINE__ && \
+           (__VA_ARGS__),                                            \
+       int > ::type = 0
 
-// This number uniquely identifies the 1.5 release build.  
+// This number uniquely identifies the 1.5 release build.
 #if __hcc_workweek__ > 17160
 #define ROCM15 1
 #endif
@@ -62,7 +66,7 @@
 namespace Kokkos {
 namespace Impl {
 
-template<class T>
+template <class T>
 
 #if defined(ROCM15)
 using lds_t = T;
@@ -77,55 +81,46 @@ using lds_t = __attribute__((address_space(3))) T;
 // that will operate on address space 3 types
 
 #if defined(ROCM15)
-// 1.5 can't use std::copy et al for LDS access, so we define our own 
+// 1.5 can't use std::copy et al for LDS access, so we define our own
 // set of routines
-template<class I, class O>
-void rcopy(I first, I last, O out) [[hc]]
-{
-    while (first != last) *out++ = *first++;
+template <class I, class O>
+void rcopy(I first, I last, O out) [[hc]] {
+  while (first != last) *out++ = *first++;
 }
-template<class I,class F>
-void rfor_each(I first, I last, F f) [[hc]]
-{
-  for(;first!=last;++first) f(*first);
+template <class I, class F>
+void rfor_each(I first, I last, F f) [[hc]] {
+  for (; first != last; ++first) f(*first);
 }
 
-template<class I,class O,class F>
-void rtransform(I first, I last, O out, F f) [[hc]]
-{
-  while(first!=last) *out++ = f(*first++);
+template <class I, class O, class F>
+void rtransform(I first, I last, O out, F f) [[hc]] {
+  while (first != last) *out++ = f(*first++);
 }
 #endif
 
-
-inline std::size_t get_max_tile_size() KOKKOS_ROCM_TILE_RESTRIC_CPU
-{
-    return hc::accelerator().get_max_tile_static_size() - 1024;
+inline std::size_t get_max_tile_size() KOKKOS_ROCM_TILE_RESTRIC_CPU {
+  return hc::accelerator().get_max_tile_static_size() - 1024;
 }
 
-inline std::size_t get_max_tile_thread() KOKKOS_ROCM_TILE_RESTRIC_CPU
-{
-    return 64;
+inline std::size_t get_max_tile_thread() KOKKOS_ROCM_TILE_RESTRIC_CPU {
+  return 64;
 }
 
-inline int next_pow_2(int x) restrict(cpu, amp)
-{ 
-    --x;
-    x |= x >> 1;
-    x |= x >> 2;
-    x |= x >> 4;
-    x |= x >> 8;
-    x |= x >> 16;
-    return x+1;
+inline int next_pow_2(int x) restrict(cpu, amp) {
+  --x;
+  x |= x >> 1;
+  x |= x >> 2;
+  x |= x >> 4;
+  x |= x >> 8;
+  x |= x >> 16;
+  return x + 1;
 }
 
-template<class T>
-inline std::size_t get_tile_size(std::size_t n = 1,
-                                 std::size_t team = 64, 
-                                 std::size_t vector = 1) 
-                                 KOKKOS_ROCM_TILE_RESTRIC_CPU
-{
-  return team*vector;
+template <class T>
+inline std::size_t get_tile_size(std::size_t n = 1, std::size_t team = 64,
+                                 std::size_t vector = 1)
+    KOKKOS_ROCM_TILE_RESTRIC_CPU {
+  return team * vector;
   /*
     const auto size = sizeof(T) * n;
     const auto group_size = get_max_tile_size();
@@ -140,380 +135,317 @@ inline std::size_t get_tile_size(std::size_t n = 1,
   */
 }
 
-template<class T>
-struct array_view
-{
-    T* x;
-    std::size_t n;
+template <class T>
+struct array_view {
+  T* x;
+  std::size_t n;
 
-    array_view(T* xp, std::size_t np) [[hc]] [[cpu]] 
-    : x(xp), n(np)
-    {}
+  array_view(T* xp, std::size_t np) [[hc]] [[cpu]] : x(xp), n(np) {}
 
-    array_view(T* xp, T* yp) [[hc]] [[cpu]] 
-    : x(xp), n(yp-xp)
-    {}
+  array_view(T* xp, T* yp) [[hc]] [[cpu]] : x(xp), n(yp - xp) {}
 
-    T& operator[](std::size_t i) const [[hc]] [[cpu]]
-    {
-        return x[i];
-    }
+  T& operator[](std::size_t i) const [[hc]] [[cpu]] { return x[i]; }
 
-    std::size_t size() const [[hc]] [[cpu]]
-    {
-        return this->n;
-    }
+  std::size_t size() const [[hc]] [[cpu]] { return this->n; }
 
-    T* data() const [[hc]] [[cpu]]
-    {
-        return x;
-    }
+  T* data() const [[hc]] [[cpu]] { return x; }
 
-    T* begin() const [[hc]] [[cpu]]
-    {
-        return x;
-    }
+  T* begin() const [[hc]] [[cpu]] { return x; }
 
-    T* end() const [[hc]] [[cpu]]
-    {
-        return x+this->size();
-    }
+  T* end() const [[hc]] [[cpu]] { return x + this->size(); }
 };
 
-template<class T>
-struct rocm_char
-{ using type=char; };
+template <class T>
+struct rocm_char {
+  using type = char;
+};
 
-template<class T>
-struct rocm_char<const T>
-: std::add_const<typename rocm_char<T>::type>
-{};
+template <class T>
+struct rocm_char<const T> : std::add_const<typename rocm_char<T>::type> {};
 #if !defined(ROCM15)
 // earlier compilers required explicit address space decorations
-template<class T>
-struct rocm_char<__attribute__((address_space(3))) T>
-{ using type = __attribute__((address_space(3))) typename rocm_char<T>::type; };
+template <class T>
+struct rocm_char<__attribute__((address_space(3))) T> {
+  using type = __attribute__((address_space(3))) typename rocm_char<T>::type;
+};
 
-template<class T>
-struct rocm_char<const __attribute__((address_space(3))) T>
-{ using type = const __attribute__((address_space(3))) typename rocm_char<T>::type; };
+template <class T>
+struct rocm_char<const __attribute__((address_space(3))) T> {
+  using type =
+      const __attribute__((address_space(3))) typename rocm_char<T>::type;
+};
 #endif
 
-template<class T, class Char=typename rocm_char<T>::type>
-Char* rocm_byte_cast(T& x) restrict(cpu, amp)
-{
-    return reinterpret_cast<Char*>(&x);
+template <class T, class Char = typename rocm_char<T>::type>
+Char* rocm_byte_cast(T& x) restrict(cpu, amp) {
+  return reinterpret_cast<Char*>(&x);
 }
 
-template<class T, class U>
-void rocm_raw_assign(T& x, const U& y) restrict(cpu, amp)
-{
-    auto * src = rocm_byte_cast(y);
-    auto * dest = rocm_byte_cast(x);
-#if defined (ROCM15)
-    rcopy(src, src+sizeof(T), dest);
+template <class T, class U>
+void rocm_raw_assign(T& x, const U& y) restrict(cpu, amp) {
+  auto* src  = rocm_byte_cast(y);
+  auto* dest = rocm_byte_cast(x);
+#if defined(ROCM15)
+  rcopy(src, src + sizeof(T), dest);
 #else
-    std::copy(src, src+sizeof(T), dest);
+  std::copy(src, src + sizeof(T), dest);
 #endif
 }
 
-template<class T, class U>
-void rocm_assign_impl(T& x, const U& y, std::true_type) restrict(cpu, amp)
-{
-    rocm_raw_assign(x, y);
+template <class T, class U>
+void rocm_assign_impl(T& x, const U& y, std::true_type) restrict(cpu, amp) {
+  rocm_raw_assign(x, y);
 }
 
-template<class T, class U>
-void rocm_assign_impl(T& x, const U& y, std::false_type) restrict(cpu, amp)
-{
-    x = y;
+template <class T, class U>
+void rocm_assign_impl(T& x, const U& y, std::false_type) restrict(cpu, amp) {
+  x = y;
 }
 
 // Workaround for assigning in and out of LDS memory
-template<class T, class U>
-void rocm_assign(T& x, const U& y) restrict(cpu, amp)
-{
-    rocm_assign_impl(x, y, std::integral_constant<bool, (
-        sizeof(T) == sizeof(U)
-    )>());
+template <class T, class U>
+void rocm_assign(T& x, const U& y) restrict(cpu, amp) {
+  rocm_assign_impl(x, y,
+                   std::integral_constant<bool, (sizeof(T) == sizeof(U))>());
 }
 
 // Compute the address space of tile
-template<class T>
-struct tile_type
-{
-#if defined (ROCM15)
-    typedef T type;
+template <class T>
+struct tile_type {
+#if defined(ROCM15)
+  typedef T type;
 #else
-    typedef __attribute__((address_space(3))) T type;
+  typedef __attribute__((address_space(3))) T type;
 #endif
 };
 
-#if !defined (ROCM15)
-template<class T, class Body>
-void lds_for(__attribute__((address_space(3))) T& value, Body b) [[hc]]
-{
+#if !defined(ROCM15)
+template <class T, class Body>
+void lds_for(__attribute__((address_space(3))) T& value, Body b) [[hc]] {
+  T state = value;
+  b(state);
+  value = state;
+}
+#endif
+
+template <class T, class Body>
+void lds_for(T& value, Body b) [[hc]] {
+  b(value);
+}
+
+constexpr std::size_t get_max_tile_array_size() { return 24; }
+
+template <class Derived, class T>
+struct single_action {
+  template <class Action>
+  void action_at(std::size_t i, Action a) [[hc]] {
+    auto& value = static_cast<Derived&>(*this)[i];
+#ifdef KOKKOS_IMPL_ROCM_CLANG_WORKAROUND
     T state = value;
-    b(state);
+    a(state);
     value = state;
-}
-#endif
-
-template<class T, class Body>
-void lds_for(T& value, Body b) [[hc]]
-{
-    b(value);
-}
-
-
-constexpr std::size_t get_max_tile_array_size()
-{
-    return 24;
-}
-
-template<class Derived, class T>
-struct single_action
-{
-    template<class Action>
-    void action_at(std::size_t i, Action a) [[hc]]
-    {
-        auto& value = static_cast<Derived&>(*this)[i];
-#ifdef KOKKOS_IMPL_ROCM_CLANG_WORKAROUND
-        T state = value;
-        a(state);
-        value = state;
 #else
-        a(value);
+    a(value);
 #endif
-    }
+  }
 
-    template<class Action>
-    void action_at(std::size_t i, std::size_t j, Action a) [[hc]]
-    {
-        static_cast<Derived&>(*this).action_at(i, [&](T& x)
-        {
-            static_cast<Derived&>(*this).action_at(j, [&](T& y)
-            {
-                a(x, y);
-            });
-        });
-    }
+  template <class Action>
+  void action_at(std::size_t i, std::size_t j, Action a) [[hc]] {
+    static_cast<Derived&>(*this).action_at(i, [&](T& x) {
+      static_cast<Derived&>(*this).action_at(j, [&](T& y) { a(x, y); });
+    });
+  }
 };
 
-template<class T>
-struct tile_buffer
-: array_view<typename tile_type<T>::type>, single_action<tile_buffer<T>, T>
-{
-    typedef typename tile_type<T>::type element_type;
-    typedef array_view<element_type> base;
+template <class T>
+struct tile_buffer : array_view<typename tile_type<T>::type>,
+                     single_action<tile_buffer<T>, T> {
+  typedef typename tile_type<T>::type element_type;
+  typedef array_view<element_type> base;
 
-    using base::base;
+  using base::base;
 
-    tile_buffer(element_type* xp, std::size_t np, std::size_t) [[hc]] [[cpu]] 
-    : base(xp, np)
-    {}
+  tile_buffer(element_type* xp, std::size_t np, std::size_t) [[hc]] [[cpu]]
+  : base(xp, np) {}
 
-    tile_buffer(T* xp, T* yp, std::size_t) [[hc]] [[cpu]] 
-    : base(xp, yp)
-    {}
+  tile_buffer(T* xp, T* yp, std::size_t) [[hc]] [[cpu]] : base(xp, yp) {}
 };
 
-template<class T>
-struct tile_buffer<T[]>
-{
-    typedef typename tile_type<T>::type element_type;
-    typedef typename tile_type<char>::type tchar_type;
-    element_type* element_data;
-    std::size_t n, m;
+template <class T>
+struct tile_buffer<T[]> {
+  typedef typename tile_type<T>::type element_type;
+  typedef typename tile_type<char>::type tchar_type;
+  element_type* element_data;
+  std::size_t n, m;
 
-    tile_buffer(element_type* xp, std::size_t np, std::size_t mp) [[hc]] [[cpu]] 
-    : element_data(xp), n(np), m(mp)
-    {}
+  tile_buffer(element_type* xp, std::size_t np, std::size_t mp) [[hc]] [[cpu]]
+  : element_data(xp),
+    n(np),
+    m(mp) {}
 
-    tile_buffer(element_type* xp, element_type* yp, std::size_t mp) [[hc]] [[cpu]] 
-    : element_data(xp), n(yp-xp), m(mp)
-    {}
+  tile_buffer(element_type* xp, element_type* yp, std::size_t mp) [[hc]] [[cpu]]
+  : element_data(xp),
+    n(yp - xp),
+    m(mp) {}
 
-    element_type* operator[](std::size_t i) const [[hc]] [[cpu]]
-    {
-        return element_data+i*m;
-    }
+  element_type* operator[](std::size_t i) const [[hc]] [[cpu]] {
+    return element_data + i * m;
+  }
 
-    template<class Action, class Q = T>
-    typename Impl::enable_if< (sizeof(Q) <= 8) , void >::type
-    action_at(std::size_t i, Action a) [[hc]]
-    {
-        element_type* value = (*this)[i];
-#if defined (ROCM15)
-        a(value);
+  template <class Action, class Q = T>
+  typename Impl::enable_if<(sizeof(Q) <= 8), void>::type action_at(
+      std::size_t i, Action a) [[hc]] {
+    element_type* value = (*this)[i];
+#if defined(ROCM15)
+    a(value);
 #else
 #ifdef KOKKOS_IMPL_ROCM_CLANG_WORKAROUND
-        if (m > get_max_tile_array_size()) return;
-        T state[get_max_tile_array_size()];
-        // std::copy(value, value+m, state);
-        // Workaround for assigning from LDS memory
-        std::transform(value, value+m, state, [](element_type& x)
-        {
-          T result;
-          rocm_assign(result, x);
-          return result;
-        });
-        a(state);
-        std::copy(state, state+m, value);
+    if (m > get_max_tile_array_size()) return;
+    T state[get_max_tile_array_size()];
+    // std::copy(value, value+m, state);
+    // Workaround for assigning from LDS memory
+    std::transform(value, value + m, state, [](element_type& x) {
+      T result;
+      rocm_assign(result, x);
+      return result;
+    });
+    a(state);
+    std::copy(state, state + m, value);
 #endif
 #endif
-    }
+  }
 
-    template<class Action, class Q = T>
-    typename Impl::enable_if< !(sizeof(Q) <= 8) , void >::type
-    action_at(std::size_t i, Action a) [[hc]]
-    {
-        element_type* value = (*this)[i];
-#if defined (ROCM15)
-        a(value);
+  template <class Action, class Q = T>
+  typename Impl::enable_if<!(sizeof(Q) <= 8), void>::type action_at(
+      std::size_t i, Action a) [[hc]] {
+    element_type* value = (*this)[i];
+#if defined(ROCM15)
+    a(value);
 #else
-        if (m > get_max_tile_array_size()) return;
-        T state[get_max_tile_array_size()];
-        // std::copy(value, value+m, state);
-        // Workaround for assigning from LDS memory
-        std::transform(value, value+m, state, [](element_type& x)
-        {
-          T result;
-          rocm_assign(result, x);
-          return result;
-        });
-        a(state);
-        // this workaround required when T is greater than 8 bytes
-        tile_static char tv[64*sizeof(T)];
-        size_t sT = sizeof(T);
-        for (int j = 0; j<sT; j++) tv[i*sT+j] = ((char *)state)[j];
-        for (int j = 0; j<sT; j++) ((tchar_type *)value)[j] = tv[i*sT+j];
+    if (m > get_max_tile_array_size()) return;
+    T state[get_max_tile_array_size()];
+    // std::copy(value, value+m, state);
+    // Workaround for assigning from LDS memory
+    std::transform(value, value + m, state, [](element_type& x) {
+      T result;
+      rocm_assign(result, x);
+      return result;
+    });
+    a(state);
+    // this workaround required when T is greater than 8 bytes
+    tile_static char tv[64 * sizeof(T)];
+    size_t sT = sizeof(T);
+    for (int j = 0; j < sT; j++) tv[i * sT + j] = ((char*)state)[j];
+    for (int j = 0; j < sT; j++) ((tchar_type*)value)[j] = tv[i * sT + j];
 #endif
-    }
+  }
 
-    template<class Action>
-    void action_at(std::size_t i, std::size_t j, Action a) [[hc]]
-    {
-        this->action_at(i, [&](T* x)
-        {
-            this->action_at(j, [&](T* y)
-            {
-                a(x, y);
-            });
-        });
-    }
+  template <class Action>
+  void action_at(std::size_t i, std::size_t j, Action a) [[hc]] {
+    this->action_at(i,
+                    [&](T* x) { this->action_at(j, [&](T* y) { a(x, y); }); });
+  }
 
-    std::size_t size() const [[hc]] [[cpu]]
-    {
-        return this->n;
-    }
+  std::size_t size() const [[hc]] [[cpu]] { return this->n; }
 
-    element_type* data() const [[hc]] [[cpu]]
-    {
-        return element_data;
-    }
+  element_type* data() const [[hc]] [[cpu]] { return element_data; }
 };
 
 // Zero initialize LDS memory
-struct zero_init_f
-{
-    template<class T>
-#if defined (ROCM15)
-    void operator()(T& x, std::size_t=1) const [[hc]]
-    {
-        auto * start = reinterpret_cast<char*>(&x);
-        for(int i=0; i<sizeof(T);i++) start[i] = 0;
-        rocm_raw_assign(x, T());
-    }
+struct zero_init_f {
+  template <class T>
+#if defined(ROCM15)
+  void operator()(T& x, std::size_t = 1) const [[hc]] {
+    auto* start = reinterpret_cast<char*>(&x);
+    for (int i = 0; i < sizeof(T); i++) start[i] = 0;
+    rocm_raw_assign(x, T());
+  }
 #else
-    void operator()(__attribute__((address_space(3))) T& x, std::size_t=1) const [[hc]]
-    {
-        auto * start = reinterpret_cast<__attribute__((address_space(3))) char*>(&x);
-        std::fill(start, start+sizeof(T), 0);
-        rocm_raw_assign(x, T());
-    }
+  void operator()(__attribute__((address_space(3))) T& x, std::size_t = 1) const
+      [[hc]] {
+    auto* start = reinterpret_cast<__attribute__((address_space(3))) char*>(&x);
+    std::fill(start, start + sizeof(T), 0);
+    rocm_raw_assign(x, T());
+  }
 #endif
 
-    template<class T>
-#if defined (ROCM15)
-    void operator()(T* x, std::size_t size) const [[hc]]
-    {
-        rfor_each(x, x+size, *this);
-    }
+  template <class T>
+#if defined(ROCM15)
+  void operator()(T* x, std::size_t size) const [[hc]] {
+    rfor_each(x, x + size, *this);
+  }
 #else
-    void operator()(__attribute__((address_space(3))) T* x, std::size_t size) const [[hc]]
-    {
-        std::for_each(x, x+size, *this);
-    }
+  void operator()(__attribute__((address_space(3))) T* x,
+                  std::size_t size) const [[hc]] {
+    std::for_each(x, x + size, *this);
+  }
 #endif
 };
 
 static constexpr zero_init_f zero_init = {};
 
-struct tile_desc
-{
-    // Number of work items, or size of extent
-    std::size_t elements;
-    // number of threads in team 
-    std::size_t team_size;
-    // vector length of team
-    std::size_t vector_length;
-    // Size of tile
-    std::size_t tile_size;
-    // Size of array
-    std::size_t array_size;
-    // Number of tiles
-    std::size_t num_tiles;
-    // Per team reserved LDS memory, used for reduction
-    std::size_t reduce_size;
-    // Per team shared memory in LDS, this in addition to reduce shared mem
-    std::size_t shared_size;
-    std::size_t size;
+struct tile_desc {
+  // Number of work items, or size of extent
+  std::size_t elements;
+  // number of threads in team
+  std::size_t team_size;
+  // vector length of team
+  std::size_t vector_length;
+  // Size of tile
+  std::size_t tile_size;
+  // Size of array
+  std::size_t array_size;
+  // Number of tiles
+  std::size_t num_tiles;
+  // Per team reserved LDS memory, used for reduction
+  std::size_t reduce_size;
+  // Per team shared memory in LDS, this in addition to reduce shared mem
+  std::size_t shared_size;
+  std::size_t size;
 };
 
-template<class T>
-tile_desc get_tile_desc(std::size_t size, 
-                        std::size_t array_size=1,
-                        std::size_t team_size=64,
-                        std::size_t vector_size=1,
-                        std::size_t shared_size=0)
-{
-    tile_desc result;
-    result.elements = size;
-    result.array_size = array_size;
-    result.vector_length = vector_size;
-    result.team_size = team_size;
-    result.tile_size = get_tile_size<T>(array_size,team_size,vector_size);
-    result.num_tiles = std::ceil(1.0 * size / result.tile_size);
-    result.reduce_size = result.tile_size * sizeof(T) * array_size;
-    result.shared_size = shared_size;
-    result.size = result.tile_size * result.num_tiles;
+template <class T>
+tile_desc get_tile_desc(std::size_t size, std::size_t array_size = 1,
+                        std::size_t team_size = 64, std::size_t vector_size = 1,
+                        std::size_t shared_size = 0) {
+  tile_desc result;
+  result.elements      = size;
+  result.array_size    = array_size;
+  result.vector_length = vector_size;
+  result.team_size     = team_size;
+  result.tile_size     = get_tile_size<T>(array_size, team_size, vector_size);
+  result.num_tiles     = std::ceil(1.0 * size / result.tile_size);
+  result.reduce_size   = result.tile_size * sizeof(T) * array_size;
+  result.shared_size   = shared_size;
+  result.size          = result.tile_size * result.num_tiles;
 
-    return result;
+  return result;
 }
 
-template<class U, class F, class T=typename std::remove_extent<U>::type>
-hc::completion_future tile_for(tile_desc td, F f) 
-{
-    assert(td.array_size <= get_max_tile_array_size() && "Exceed max array size");
-    assert(((td.size % td.tile_size) == 0) && "Tile size must be divisible by extent");
-    auto grid = hc::extent<1>(td.size).tile_with_dynamic(
-                          td.tile_size, td.reduce_size + td.shared_size);
-    // grid.set_dynamic_group_segment_size(td.reduce_size + td.shared_size);
-    return parallel_for_each(grid, [=](hc::tiled_index<1> t_idx) [[hc]] 
-    {
-#if defined (ROCM15)
+template <class U, class F, class T = typename std::remove_extent<U>::type>
+hc::completion_future tile_for(tile_desc td, F f) {
+  assert(td.array_size <= get_max_tile_array_size() && "Exceed max array size");
+  assert(((td.size % td.tile_size) == 0) &&
+         "Tile size must be divisible by extent");
+  auto grid = hc::extent<1>(td.size).tile_with_dynamic(
+      td.tile_size, td.reduce_size + td.shared_size);
+  // grid.set_dynamic_group_segment_size(td.reduce_size + td.shared_size);
+  return parallel_for_each(
+      grid, [=](hc::tiled_index<1> t_idx) [[hc]] {
+#if defined(ROCM15)
         typedef T group_t;
 #else
         typedef __attribute__((address_space(3))) T group_t;
 #endif
-        group_t * buffer = (group_t *)hc::get_dynamic_group_segment_base_pointer();
+        group_t* buffer =
+            (group_t*)hc::get_dynamic_group_segment_base_pointer();
         tile_buffer<U> tb(buffer, td.tile_size, td.array_size);
         zero_init(tb[t_idx.local[0]], td.array_size);
         f(t_idx, tb);
-    });
+      });
 }
 
-}}
+}  // namespace Impl
+}  // namespace Kokkos
 
 #endif
diff --git a/lib/kokkos/core/src/ROCm/Kokkos_ROCm_Vectorization.hpp b/lib/kokkos/core/src/ROCm/Kokkos_ROCm_Vectorization.hpp
index 36f886109c..157c15695b 100644
--- a/lib/kokkos/core/src/ROCm/Kokkos_ROCm_Vectorization.hpp
+++ b/lib/kokkos/core/src/ROCm/Kokkos_ROCm_Vectorization.hpp
@@ -1,13 +1,14 @@
 /*
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -36,7 +37,7 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 */
@@ -62,285 +63,288 @@ using namespace hc;
 // and it controls whether shfl_down() gets called.)
 namespace Impl {
 
-  template< typename Scalar >
-  struct shfl_union {
-    enum {n = sizeof(Scalar)/4};
-    float fval[n];
-    KOKKOS_INLINE_FUNCTION
-    Scalar value() {
-      return *(Scalar*) fval;
+template <typename Scalar>
+struct shfl_union {
+  enum { n = sizeof(Scalar) / 4 };
+  float fval[n];
+  KOKKOS_INLINE_FUNCTION
+  Scalar value() { return *(Scalar*)fval; }
+  KOKKOS_INLINE_FUNCTION
+  void operator=(Scalar& value_) {
+    float* const val_ptr = (float*)&value_;
+    for (int i = 0; i < n; i++) {
+      fval[i] = val_ptr[i];
     }
-    KOKKOS_INLINE_FUNCTION
-    void operator= (Scalar& value_) {
-      float* const val_ptr = (float*) &value_;
-      for(int i=0; i<n ; i++) {
-        fval[i] = val_ptr[i];
-      }
+  }
+  KOKKOS_INLINE_FUNCTION
+  void operator=(const Scalar& value_) {
+    float* const val_ptr = (float*)&value_;
+    for (int i = 0; i < n; i++) {
+      fval[i] = val_ptr[i];
     }
-    KOKKOS_INLINE_FUNCTION
-    void operator= (const Scalar& value_) {
-      float* const val_ptr = (float*) &value_;
-      for(int i=0; i<n ; i++) {
-        fval[i] = val_ptr[i];
-      }
-    }
-
-  };
-}
+  }
+};
+}  // namespace Impl
 
 #ifdef __HCC_ACCELERATOR__
 
-    KOKKOS_INLINE_FUNCTION
-    int __long2loint(const long val ) {
-    union {
-      long l;
-      int i[2];
-    } u;
-      u.l = val;
-      return u.i[0];
-    }
-
-    KOKKOS_INLINE_FUNCTION
-    int __long2hiint(const long val ) {
-    union {
-      long l;
-      int i[2];
-    } u;
-      u.l = val;
-      return u.i[1];
-    }
-
-    KOKKOS_INLINE_FUNCTION
-    int __double2loint(const double val ) {
-    union {
-      double d;
-      int i[2];
-    } u;
-      u.d = val;
-      return u.i[0];
-    }
-
-    KOKKOS_INLINE_FUNCTION
-    int __double2hiint(const double val ) {
-    union {
-      double d;
-      int i[2];
-    } u;
-      u.d = val;
-      return u.i[1];
-    }
-
-    KOKKOS_INLINE_FUNCTION
-    long __hiloint2long(const int hi, const int lo ) {
-    union {
-      long l;
-      int i[2];
-    } u;
-      u.i[0] = lo;
-      u.i[1] = hi;
-      return u.l;
-    }
-
-    KOKKOS_INLINE_FUNCTION
-    double __hiloint2double(const int hi, const int lo ) {
-    union {
-      double d;
-      int i[2];
-    } u;
-      u.i[0] = lo;
-      u.i[1] = hi;
-      return u.d;
-    }
-
-    KOKKOS_INLINE_FUNCTION
-    int shfl(const int &val, const int& srcLane, const int& width ) {
-      return __shfl(val,srcLane,width);
-    }
-
-    KOKKOS_INLINE_FUNCTION
-    float shfl(const float &val, const int& srcLane, const int& width ) {
-      return __shfl(val,srcLane,width);
-    }
-
-    template<typename Scalar>
-    KOKKOS_INLINE_FUNCTION
-    Scalar shfl(const Scalar &val, const int& srcLane, const typename Impl::enable_if< (sizeof(Scalar) == 4) , int >::type& width
-        ) {
-      Scalar tmp1 = val;
-      float tmp = *reinterpret_cast<float*>(&tmp1);
-      tmp = __shfl(tmp,srcLane,width);
-      return *reinterpret_cast<Scalar*>(&tmp);
-    }
-
-    KOKKOS_INLINE_FUNCTION
-    double shfl(const double &val, const int& srcLane, const int& width) {
-      int lo = __double2loint(val);
-      int hi = __double2hiint(val);
-      lo = __shfl(lo,srcLane,width);
-      hi = __shfl(hi,srcLane,width);
-      return __hiloint2double(hi,lo);
-    }
-
-    template<typename Scalar>
-    KOKKOS_INLINE_FUNCTION
-    Scalar shfl(const Scalar &val, const int& srcLane, const typename Impl::enable_if< (sizeof(Scalar) == 8) ,int>::type& width) {
-      int lo = __double2loint(*reinterpret_cast<const double*>(&val));
-      int hi = __double2hiint(*reinterpret_cast<const double*>(&val));
-      lo = __shfl(lo,srcLane,width);
-      hi = __shfl(hi,srcLane,width);
-      const double tmp = __hiloint2double(hi,lo);
-      return *(reinterpret_cast<const Scalar*>(&tmp));
-    }
-
-    template<typename Scalar>
-    KOKKOS_INLINE_FUNCTION
-    Scalar shfl(const Scalar &val, const int& srcLane, const typename Impl::enable_if< (sizeof(Scalar) > 8) ,int>::type& width) {
-      Impl::shfl_union<Scalar> s_val;
-      Impl::shfl_union<Scalar> r_val;
-      s_val = val;
-
-      for(int i = 0; i<s_val.n; i++)
-        r_val.fval[i] = __shfl(s_val.fval[i],srcLane,width);
-      return r_val.value();
-    }
-
-    KOKKOS_INLINE_FUNCTION
-    int shfl_down(const int &val, const int& delta, const int& width) {
-      return __shfl_down(val,delta,width);
-    }
-
-    KOKKOS_INLINE_FUNCTION
-    float shfl_down(const float &val, const int& delta, const int& width) {
-      return __shfl_down(val,delta,width);
-    }
-
-    template<typename Scalar>
-    KOKKOS_INLINE_FUNCTION
-    Scalar shfl_down(const Scalar &val, const int& delta, const typename Impl::enable_if< (sizeof(Scalar) == 4) , int >::type & width) {
-      Scalar tmp1 = val;
-      float tmp = *reinterpret_cast<float*>(&tmp1);
-      tmp = __shfl_down(tmp,delta,width);
-      return *reinterpret_cast<Scalar*>(&tmp);
-    }
-
-    KOKKOS_INLINE_FUNCTION
-    long shfl_down(const long &val, const int& delta, const int& width) {
-      int lo = __long2loint(val);
-      int hi = __long2hiint(val);
-      lo = __shfl_down(lo,delta,width);
-      hi = __shfl_down(hi,delta,width);
-      return __hiloint2long(hi,lo);
-    }
-
-    KOKKOS_INLINE_FUNCTION
-    double shfl_down(const double &val, const int& delta, const int& width) {
-      int lo = __double2loint(val);
-      int hi = __double2hiint(val);
-      lo = __shfl_down(lo,delta,width);
-      hi = __shfl_down(hi,delta,width);
-      return __hiloint2double(hi,lo);
-    }
-
-    template<typename Scalar>
-    KOKKOS_INLINE_FUNCTION
-    Scalar shfl_down(const Scalar &val, const int& delta, const typename Impl::enable_if< (sizeof(Scalar) == 8) , int >::type & width) {
-      int lo = __double2loint(*reinterpret_cast<const double*>(&val));
-      int hi = __double2hiint(*reinterpret_cast<const double*>(&val));
-      lo = __shfl_down(lo,delta,width);
-      hi = __shfl_down(hi,delta,width);
-      const double tmp = __hiloint2double(hi,lo);
-      return *(reinterpret_cast<const Scalar*>(&tmp));
-    }
-
-    template<typename Scalar>
-    KOKKOS_INLINE_FUNCTION
-    Scalar shfl_down(const Scalar &val, const int& delta, const typename Impl::enable_if< (sizeof(Scalar) > 8) , int >::type & width) {
-      Impl::shfl_union<Scalar> s_val;
-      Impl::shfl_union<Scalar> r_val;
-      s_val = val;
-
-      for(int i = 0; i<s_val.n; i++)
-        r_val.fval[i] = __shfl_down(s_val.fval[i],delta,width);
-      return r_val.value();
-    }
-
-    KOKKOS_INLINE_FUNCTION
-    int shfl_up(const int &val, const int& delta, const int& width ) {
-      return __shfl_up(val,delta,width);
-    }
-
-    KOKKOS_INLINE_FUNCTION
-    float shfl_up(const float &val, const int& delta, const int& width ) {
-      return __shfl_up(val,delta,width);
-    }
-
-    template<typename Scalar>
-    KOKKOS_INLINE_FUNCTION
-    Scalar shfl_up(const Scalar &val, const int& delta, const typename Impl::enable_if< (sizeof(Scalar) == 4) , int >::type & width) {
-      Scalar tmp1 = val;
-      float tmp = *reinterpret_cast<float*>(&tmp1);
-      tmp = __shfl_up(tmp,delta,width);
-      return *reinterpret_cast<Scalar*>(&tmp);
-    }
-
-    KOKKOS_INLINE_FUNCTION
-    double shfl_up(const double &val, const int& delta, const int& width ) {
-      int lo = __double2loint(val);
-      int hi = __double2hiint(val);
-      lo = __shfl_up(lo,delta,width);
-      hi = __shfl_up(hi,delta,width);
-      return __hiloint2double(hi,lo);
-    }
-
-    template<typename Scalar>
-    KOKKOS_INLINE_FUNCTION
-    Scalar shfl_up(const Scalar &val, const int& delta, const typename Impl::enable_if< (sizeof(Scalar) == 8) , int >::type & width) {
-      int lo = __double2loint(*reinterpret_cast<const double*>(&val));
-      int hi = __double2hiint(*reinterpret_cast<const double*>(&val));
-      lo = __shfl_up(lo,delta,width);
-      hi = __shfl_up(hi,delta,width);
-      const double tmp = __hiloint2double(hi,lo);
-      return *(reinterpret_cast<const Scalar*>(&tmp));
-    }
-
-    template<typename Scalar>
-    KOKKOS_INLINE_FUNCTION
-    Scalar shfl_up(const Scalar &val, const int& delta, const typename Impl::enable_if< (sizeof(Scalar) > 8) , int >::type & width) {
-      Impl::shfl_union<Scalar> s_val;
-      Impl::shfl_union<Scalar> r_val;
-      s_val = val;
-
-      for(int i = 0; i<s_val.n; i++)
-        r_val.fval[i] = __shfl_up(s_val.fval[i],delta,width);
-      return r_val.value();
-    }
-
-#else
-    template<typename Scalar>
-    inline
-    Scalar shfl(const Scalar &val, const int& srcLane, const int& width) {
-      if(width > 1) Kokkos::abort("Error: calling shfl from a device with CC<8.0.");
-      return val;
-    }
-
-    template<typename Scalar>
-    inline
-    Scalar shfl_down(const Scalar &val, const int& delta, const int& width) {
-      if(width > 1) Kokkos::abort("Error: calling shfl_down from a device with CC<8.0.");
-      return val;
-    }
-
-    template<typename Scalar>
-    inline
-    Scalar shfl_up(const Scalar &val, const int& delta, const int& width) {
-      if(width > 1) Kokkos::abort("Error: calling shfl_down from a device with CC<8.0.");
-      return val;
-    }
-#endif
-
-
-
+KOKKOS_INLINE_FUNCTION
+int __long2loint(const long val) {
+  union {
+    long l;
+    int i[2];
+  } u;
+  u.l = val;
+  return u.i[0];
 }
 
-#endif // KOKKOS_ENABLE_ROCM
+KOKKOS_INLINE_FUNCTION
+int __long2hiint(const long val) {
+  union {
+    long l;
+    int i[2];
+  } u;
+  u.l = val;
+  return u.i[1];
+}
+
+KOKKOS_INLINE_FUNCTION
+int __double2loint(const double val) {
+  union {
+    double d;
+    int i[2];
+  } u;
+  u.d = val;
+  return u.i[0];
+}
+
+KOKKOS_INLINE_FUNCTION
+int __double2hiint(const double val) {
+  union {
+    double d;
+    int i[2];
+  } u;
+  u.d = val;
+  return u.i[1];
+}
+
+KOKKOS_INLINE_FUNCTION
+long __hiloint2long(const int hi, const int lo) {
+  union {
+    long l;
+    int i[2];
+  } u;
+  u.i[0] = lo;
+  u.i[1] = hi;
+  return u.l;
+}
+
+KOKKOS_INLINE_FUNCTION
+double __hiloint2double(const int hi, const int lo) {
+  union {
+    double d;
+    int i[2];
+  } u;
+  u.i[0] = lo;
+  u.i[1] = hi;
+  return u.d;
+}
+
+KOKKOS_INLINE_FUNCTION
+int shfl(const int& val, const int& srcLane, const int& width) {
+  return __shfl(val, srcLane, width);
+}
+
+KOKKOS_INLINE_FUNCTION
+float shfl(const float& val, const int& srcLane, const int& width) {
+  return __shfl(val, srcLane, width);
+}
+
+template <typename Scalar>
+KOKKOS_INLINE_FUNCTION Scalar
+shfl(const Scalar& val, const int& srcLane,
+     const typename Impl::enable_if<(sizeof(Scalar) == 4), int>::type& width) {
+  Scalar tmp1 = val;
+  float tmp   = *reinterpret_cast<float*>(&tmp1);
+  tmp         = __shfl(tmp, srcLane, width);
+  return *reinterpret_cast<Scalar*>(&tmp);
+}
+
+KOKKOS_INLINE_FUNCTION
+double shfl(const double& val, const int& srcLane, const int& width) {
+  int lo = __double2loint(val);
+  int hi = __double2hiint(val);
+  lo     = __shfl(lo, srcLane, width);
+  hi     = __shfl(hi, srcLane, width);
+  return __hiloint2double(hi, lo);
+}
+
+template <typename Scalar>
+KOKKOS_INLINE_FUNCTION Scalar
+shfl(const Scalar& val, const int& srcLane,
+     const typename Impl::enable_if<(sizeof(Scalar) == 8), int>::type& width) {
+  int lo           = __double2loint(*reinterpret_cast<const double*>(&val));
+  int hi           = __double2hiint(*reinterpret_cast<const double*>(&val));
+  lo               = __shfl(lo, srcLane, width);
+  hi               = __shfl(hi, srcLane, width);
+  const double tmp = __hiloint2double(hi, lo);
+  return *(reinterpret_cast<const Scalar*>(&tmp));
+}
+
+template <typename Scalar>
+KOKKOS_INLINE_FUNCTION Scalar
+shfl(const Scalar& val, const int& srcLane,
+     const typename Impl::enable_if<(sizeof(Scalar) > 8), int>::type& width) {
+  Impl::shfl_union<Scalar> s_val;
+  Impl::shfl_union<Scalar> r_val;
+  s_val = val;
+
+  for (int i = 0; i < s_val.n; i++)
+    r_val.fval[i] = __shfl(s_val.fval[i], srcLane, width);
+  return r_val.value();
+}
+
+KOKKOS_INLINE_FUNCTION
+int shfl_down(const int& val, const int& delta, const int& width) {
+  return __shfl_down(val, delta, width);
+}
+
+KOKKOS_INLINE_FUNCTION
+float shfl_down(const float& val, const int& delta, const int& width) {
+  return __shfl_down(val, delta, width);
+}
+
+template <typename Scalar>
+KOKKOS_INLINE_FUNCTION Scalar shfl_down(
+    const Scalar& val, const int& delta,
+    const typename Impl::enable_if<(sizeof(Scalar) == 4), int>::type& width) {
+  Scalar tmp1 = val;
+  float tmp   = *reinterpret_cast<float*>(&tmp1);
+  tmp         = __shfl_down(tmp, delta, width);
+  return *reinterpret_cast<Scalar*>(&tmp);
+}
+
+KOKKOS_INLINE_FUNCTION
+long shfl_down(const long& val, const int& delta, const int& width) {
+  int lo = __long2loint(val);
+  int hi = __long2hiint(val);
+  lo     = __shfl_down(lo, delta, width);
+  hi     = __shfl_down(hi, delta, width);
+  return __hiloint2long(hi, lo);
+}
+
+KOKKOS_INLINE_FUNCTION
+double shfl_down(const double& val, const int& delta, const int& width) {
+  int lo = __double2loint(val);
+  int hi = __double2hiint(val);
+  lo     = __shfl_down(lo, delta, width);
+  hi     = __shfl_down(hi, delta, width);
+  return __hiloint2double(hi, lo);
+}
+
+template <typename Scalar>
+KOKKOS_INLINE_FUNCTION Scalar shfl_down(
+    const Scalar& val, const int& delta,
+    const typename Impl::enable_if<(sizeof(Scalar) == 8), int>::type& width) {
+  int lo           = __double2loint(*reinterpret_cast<const double*>(&val));
+  int hi           = __double2hiint(*reinterpret_cast<const double*>(&val));
+  lo               = __shfl_down(lo, delta, width);
+  hi               = __shfl_down(hi, delta, width);
+  const double tmp = __hiloint2double(hi, lo);
+  return *(reinterpret_cast<const Scalar*>(&tmp));
+}
+
+template <typename Scalar>
+KOKKOS_INLINE_FUNCTION Scalar shfl_down(
+    const Scalar& val, const int& delta,
+    const typename Impl::enable_if<(sizeof(Scalar) > 8), int>::type& width) {
+  Impl::shfl_union<Scalar> s_val;
+  Impl::shfl_union<Scalar> r_val;
+  s_val = val;
+
+  for (int i = 0; i < s_val.n; i++)
+    r_val.fval[i] = __shfl_down(s_val.fval[i], delta, width);
+  return r_val.value();
+}
+
+KOKKOS_INLINE_FUNCTION
+int shfl_up(const int& val, const int& delta, const int& width) {
+  return __shfl_up(val, delta, width);
+}
+
+KOKKOS_INLINE_FUNCTION
+float shfl_up(const float& val, const int& delta, const int& width) {
+  return __shfl_up(val, delta, width);
+}
+
+template <typename Scalar>
+KOKKOS_INLINE_FUNCTION Scalar shfl_up(
+    const Scalar& val, const int& delta,
+    const typename Impl::enable_if<(sizeof(Scalar) == 4), int>::type& width) {
+  Scalar tmp1 = val;
+  float tmp   = *reinterpret_cast<float*>(&tmp1);
+  tmp         = __shfl_up(tmp, delta, width);
+  return *reinterpret_cast<Scalar*>(&tmp);
+}
+
+KOKKOS_INLINE_FUNCTION
+double shfl_up(const double& val, const int& delta, const int& width) {
+  int lo = __double2loint(val);
+  int hi = __double2hiint(val);
+  lo     = __shfl_up(lo, delta, width);
+  hi     = __shfl_up(hi, delta, width);
+  return __hiloint2double(hi, lo);
+}
+
+template <typename Scalar>
+KOKKOS_INLINE_FUNCTION Scalar shfl_up(
+    const Scalar& val, const int& delta,
+    const typename Impl::enable_if<(sizeof(Scalar) == 8), int>::type& width) {
+  int lo           = __double2loint(*reinterpret_cast<const double*>(&val));
+  int hi           = __double2hiint(*reinterpret_cast<const double*>(&val));
+  lo               = __shfl_up(lo, delta, width);
+  hi               = __shfl_up(hi, delta, width);
+  const double tmp = __hiloint2double(hi, lo);
+  return *(reinterpret_cast<const Scalar*>(&tmp));
+}
+
+template <typename Scalar>
+KOKKOS_INLINE_FUNCTION Scalar shfl_up(
+    const Scalar& val, const int& delta,
+    const typename Impl::enable_if<(sizeof(Scalar) > 8), int>::type& width) {
+  Impl::shfl_union<Scalar> s_val;
+  Impl::shfl_union<Scalar> r_val;
+  s_val = val;
+
+  for (int i = 0; i < s_val.n; i++)
+    r_val.fval[i] = __shfl_up(s_val.fval[i], delta, width);
+  return r_val.value();
+}
+
+#else
+template <typename Scalar>
+inline Scalar shfl(const Scalar& val, const int& srcLane, const int& width) {
+  if (width > 1)
+    Kokkos::abort("Error: calling shfl from a device with CC<8.0.");
+  return val;
+}
+
+template <typename Scalar>
+inline Scalar shfl_down(const Scalar& val, const int& delta, const int& width) {
+  if (width > 1)
+    Kokkos::abort("Error: calling shfl_down from a device with CC<8.0.");
+  return val;
+}
+
+template <typename Scalar>
+inline Scalar shfl_up(const Scalar& val, const int& delta, const int& width) {
+  if (width > 1)
+    Kokkos::abort("Error: calling shfl_down from a device with CC<8.0.");
+  return val;
+}
+#endif
+
+}  // namespace Kokkos
+
+#endif  // KOKKOS_ENABLE_ROCM
 #endif
diff --git a/lib/kokkos/core/src/ROCm/Kokkos_ROCm_ViewCopyETIAvail.hpp b/lib/kokkos/core/src/ROCm/Kokkos_ROCm_ViewCopyETIAvail.hpp
index 0f7f399a57..018151b309 100644
--- a/lib/kokkos/core/src/ROCm/Kokkos_ROCm_ViewCopyETIAvail.hpp
+++ b/lib/kokkos/core/src/ROCm/Kokkos_ROCm_ViewCopyETIAvail.hpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -48,10 +49,9 @@ namespace Kokkos {
 namespace Impl {
 #define KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE Kokkos::ROCm
 
-#include<eti/common/Kokkos_ViewFillCopyETIAvail_Macros.hpp>
+#include <eti/common/Kokkos_ViewFillCopyETIAvail_Macros.hpp>
 
 #undef KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
 #endif
-
diff --git a/lib/kokkos/core/src/ROCm/Kokkos_ROCm_ViewCopyETIDecl.hpp b/lib/kokkos/core/src/ROCm/Kokkos_ROCm_ViewCopyETIDecl.hpp
index f7ed4cea8e..db02a49c8a 100644
--- a/lib/kokkos/core/src/ROCm/Kokkos_ROCm_ViewCopyETIDecl.hpp
+++ b/lib/kokkos/core/src/ROCm/Kokkos_ROCm_ViewCopyETIDecl.hpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -48,10 +49,9 @@ namespace Kokkos {
 namespace Impl {
 #define KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE Kokkos::ROCm
 
-#include<eti/common/Kokkos_ViewFillCopyETIDecl_Macros.hpp>
+#include <eti/common/Kokkos_ViewFillCopyETIDecl_Macros.hpp>
 
 #undef KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
 #endif
-
diff --git a/lib/kokkos/core/src/ROCm/hc_math_std.hpp b/lib/kokkos/core/src/ROCm/hc_math_std.hpp
index 56c2e634e4..b637507130 100644
--- a/lib/kokkos/core/src/ROCm/hc_math_std.hpp
+++ b/lib/kokkos/core/src/ROCm/hc_math_std.hpp
@@ -9,225 +9,230 @@
 
 #ifdef __KALMAR_ACCELERATOR__
 
-#define HC_MATH_WRAPPER_1(function, arg1) \
-template<typename T> \
-inline T function(T arg1) __attribute__((hc,cpu)) { \
-  return hc::precise_math::function(arg1); \
-}
+#define HC_MATH_WRAPPER_1(function, arg1)              \
+  template <typename T>                                \
+  inline T function(T arg1) __attribute__((hc, cpu)) { \
+    return hc::precise_math::function(arg1);           \
+  }
 
 #define KALMAR_MATH_WRAPPER_1(function, arg1) HC_MATH_WRAPPER_1(function, arg1)
 
-#define HC_MATH_WRAPPER_FP_OVERLOAD_1(function, arg1) \
-template<typename T> \
-inline \
-typename std::enable_if<std::is_integral<T>::value,HC_IMPLICIT_FLOAT_CONV>::type \
- function(T arg1) __attribute__((hc,cpu)) { \
-  return hc::precise_math::function(static_cast<HC_IMPLICIT_FLOAT_CONV>(arg1)); \
-} \
-template<typename T> \
-inline \
-typename std::enable_if<std::is_floating_point <T>::value,T>::type \
- function(T arg1) __attribute__((hc,cpu)) { \
-  return hc::precise_math::function(arg1); \
-}
+#define HC_MATH_WRAPPER_FP_OVERLOAD_1(function, arg1)                       \
+  template <typename T>                                                     \
+  inline typename std::enable_if<std::is_integral<T>::value,                \
+                                 HC_IMPLICIT_FLOAT_CONV>::type              \
+  function(T arg1) __attribute__((hc, cpu)) {                               \
+    return hc::precise_math::function(                                      \
+        static_cast<HC_IMPLICIT_FLOAT_CONV>(arg1));                         \
+  }                                                                         \
+  template <typename T>                                                     \
+  inline typename std::enable_if<std::is_floating_point<T>::value, T>::type \
+  function(T arg1) __attribute__((hc, cpu)) {                               \
+    return hc::precise_math::function(arg1);                                \
+  }
 
-#define KALMAR_MATH_WRAPPER_FP_OVERLOAD_1(function, arg1) HC_MATH_WRAPPER_FP_OVERLOAD_1(function, arg1) 
+#define KALMAR_MATH_WRAPPER_FP_OVERLOAD_1(function, arg1) \
+  HC_MATH_WRAPPER_FP_OVERLOAD_1(function, arg1)
 
-#define HC_MATH_WRAPPER_2(function, arg1, arg2) \
-template<typename T> \
-inline T function(T arg1, T arg2) __attribute__((hc,cpu)) { \
-  return hc::precise_math::function(arg1, arg2); \
-}
+#define HC_MATH_WRAPPER_2(function, arg1, arg2)                \
+  template <typename T>                                        \
+  inline T function(T arg1, T arg2) __attribute__((hc, cpu)) { \
+    return hc::precise_math::function(arg1, arg2);             \
+  }
 
-#define HC_MATH_ALIAS_2(alias, function, arg1, arg2) \
-template<typename T> \
-inline T alias(T arg1, T arg2) __attribute__((hc,cpu)) { \
-  return hc::precise_math::function(arg1, arg2); \
-}
+#define HC_MATH_ALIAS_2(alias, function, arg1, arg2)        \
+  template <typename T>                                     \
+  inline T alias(T arg1, T arg2) __attribute__((hc, cpu)) { \
+    return hc::precise_math::function(arg1, arg2);          \
+  }
 
-#define HC_MATH_WRAPPER_3(function, arg1, arg2, arg3) \
-template<typename T> \
-inline T function(T arg1, T arg2, T arg3) __attribute__((hc,cpu)) { \
-  return hc::precise_math::function(arg1, arg2, arg3); \
-}
+#define HC_MATH_WRAPPER_3(function, arg1, arg2, arg3)                  \
+  template <typename T>                                                \
+  inline T function(T arg1, T arg2, T arg3) __attribute__((hc, cpu)) { \
+    return hc::precise_math::function(arg1, arg2, arg3);               \
+  }
 
-#define HC_MATH_WRAPPER_TQ(function, arg1) \
-template<typename T, typename Q> \
-inline T function(Q arg1) __attribute__((hc,cpu)) { \
-  return hc::precise_math::function(arg1); \
-}
+#define HC_MATH_WRAPPER_TQ(function, arg1)             \
+  template <typename T, typename Q>                    \
+  inline T function(Q arg1) __attribute__((hc, cpu)) { \
+    return hc::precise_math::function(arg1);           \
+  }
 
-#define HC_MATH_WRAPPER_FP_OVERLOAD_TQ(function, T, arg1) \
-template<typename Q> \
-inline \
-typename std::enable_if<std::is_integral<Q>::value,T>::type \
-function(Q arg1) __attribute__((hc,cpu)) { \
-  return hc::precise_math::function(static_cast<HC_IMPLICIT_FLOAT_CONV>(arg1)); \
-}\
-template<typename Q> \
-inline \
-typename std::enable_if<std::is_floating_point<Q>::value,T>::type \
-function(Q arg1) __attribute__((hc,cpu)) { \
-  return hc::precise_math::function(arg1); \
-}
+#define HC_MATH_WRAPPER_FP_OVERLOAD_TQ(function, T, arg1)                   \
+  template <typename Q>                                                     \
+  inline typename std::enable_if<std::is_integral<Q>::value, T>::type       \
+  function(Q arg1) __attribute__((hc, cpu)) {                               \
+    return hc::precise_math::function(                                      \
+        static_cast<HC_IMPLICIT_FLOAT_CONV>(arg1));                         \
+  }                                                                         \
+  template <typename Q>                                                     \
+  inline typename std::enable_if<std::is_floating_point<Q>::value, T>::type \
+  function(Q arg1) __attribute__((hc, cpu)) {                               \
+    return hc::precise_math::function(arg1);                                \
+  }
 
-#define HC_MATH_WRAPPER_TTQ(function, arg1, arg2) \
-template<typename T, typename Q> \
-inline T function(T arg1, Q arg2) __attribute__((hc,cpu)) { \
-  return hc::precise_math::function(arg1, arg2); \
-}
+#define HC_MATH_WRAPPER_TTQ(function, arg1, arg2)              \
+  template <typename T, typename Q>                            \
+  inline T function(T arg1, Q arg2) __attribute__((hc, cpu)) { \
+    return hc::precise_math::function(arg1, arg2);             \
+  }
 
-#define HC_MATH_WRAPPER_FP_OVERLOAD_TTQ(function, arg1, arg2) \
-template<typename T, typename Q> \
-inline \
-typename std::enable_if<std::is_integral<T>::value||std::is_integral<Q>::value,HC_IMPLICIT_FLOAT_CONV>::type \
-function(T arg1, Q arg2) __attribute__((hc,cpu)) { \
-  return hc::precise_math::function(static_cast<HC_IMPLICIT_FLOAT_CONV>(arg1),static_cast<HC_IMPLICIT_FLOAT_CONV>(arg2)); \
-}\
-template<typename T, typename Q> \
-inline \
-typename std::enable_if<std::is_floating_point<T>::value&&std::is_floating_point<Q>::value,T>::type \
-function(T arg1, Q arg2) __attribute__((hc,cpu)) { \
-  return hc::precise_math::function(arg1,arg2); \
-}
+#define HC_MATH_WRAPPER_FP_OVERLOAD_TTQ(function, arg1, arg2)          \
+  template <typename T, typename Q>                                    \
+  inline typename std::enable_if<std::is_integral<T>::value ||         \
+                                     std::is_integral<Q>::value,       \
+                                 HC_IMPLICIT_FLOAT_CONV>::type         \
+  function(T arg1, Q arg2) __attribute__((hc, cpu)) {                  \
+    return hc::precise_math::function(                                 \
+        static_cast<HC_IMPLICIT_FLOAT_CONV>(arg1),                     \
+        static_cast<HC_IMPLICIT_FLOAT_CONV>(arg2));                    \
+  }                                                                    \
+  template <typename T, typename Q>                                    \
+  inline typename std::enable_if<std::is_floating_point<T>::value &&   \
+                                     std::is_floating_point<Q>::value, \
+                                 T>::type                              \
+  function(T arg1, Q arg2) __attribute__((hc, cpu)) {                  \
+    return hc::precise_math::function(arg1, arg2);                     \
+  }
 
-#define HC_MATH_WRAPPER_TTTQ(function, arg1, arg2, arg3) \
-template<typename T, typename Q> \
-inline T function(T arg1, T arg2, Q arg3) __attribute__((hc,cpu)) { \
-  return hc::precise_math::function(arg1, arg2, arg3); \
-}
+#define HC_MATH_WRAPPER_TTTQ(function, arg1, arg2, arg3)               \
+  template <typename T, typename Q>                                    \
+  inline T function(T arg1, T arg2, Q arg3) __attribute__((hc, cpu)) { \
+    return hc::precise_math::function(arg1, arg2, arg3);               \
+  }
 
-#define HC_MATH_WRAPPER_VTQQ(function, arg1, arg2, arg3) \
-template<typename T, typename Q> \
-inline void function(T arg1, Q arg2, Q arg3) __attribute__((hc,cpu)) { \
-  hc::precise_math::function(arg1, arg2, arg3); \
-}
+#define HC_MATH_WRAPPER_VTQQ(function, arg1, arg2, arg3)                  \
+  template <typename T, typename Q>                                       \
+  inline void function(T arg1, Q arg2, Q arg3) __attribute__((hc, cpu)) { \
+    hc::precise_math::function(arg1, arg2, arg3);                         \
+  }
 
 #else
 
-#define HC_MATH_WRAPPER_1(function, arg1) \
-template<typename T> \
-inline T function(T arg1) __attribute__((hc,cpu)) { \
-  return std::function(arg1); \
-}
+#define HC_MATH_WRAPPER_1(function, arg1)              \
+  template <typename T>                                \
+  inline T function(T arg1) __attribute__((hc, cpu)) { \
+    return std::function(arg1);                        \
+  }
 
-#define KALMAR_MATH_WRAPPER_1(function, arg1) \
-template<typename T> \
-inline T function(T arg1) __attribute__((hc,cpu)) { \
-  return hc::precise_math::function(arg1); \
-}
+#define KALMAR_MATH_WRAPPER_1(function, arg1)          \
+  template <typename T>                                \
+  inline T function(T arg1) __attribute__((hc, cpu)) { \
+    return hc::precise_math::function(arg1);           \
+  }
 
-#define HC_MATH_WRAPPER_FP_OVERLOAD_1(function, arg1) \
-template<typename T> \
-inline \
-typename std::enable_if<std::is_integral<T>::value,HC_IMPLICIT_FLOAT_CONV>::type \
- function(T arg1) __attribute__((hc,cpu)) { \
-  return ::function(static_cast<HC_IMPLICIT_FLOAT_CONV>(arg1)); \
-} \
-template<typename T> \
-inline \
-typename std::enable_if<std::is_floating_point <T>::value,T>::type \
- function(T arg1) __attribute__((hc,cpu)) { \
-  return std::function(arg1); \
-} 
+#define HC_MATH_WRAPPER_FP_OVERLOAD_1(function, arg1)                       \
+  template <typename T>                                                     \
+  inline typename std::enable_if<std::is_integral<T>::value,                \
+                                 HC_IMPLICIT_FLOAT_CONV>::type              \
+  function(T arg1) __attribute__((hc, cpu)) {                               \
+    return ::function(static_cast<HC_IMPLICIT_FLOAT_CONV>(arg1));           \
+  }                                                                         \
+  template <typename T>                                                     \
+  inline typename std::enable_if<std::is_floating_point<T>::value, T>::type \
+  function(T arg1) __attribute__((hc, cpu)) {                               \
+    return std::function(arg1);                                             \
+  }
 
-#define KALMAR_MATH_WRAPPER_FP_OVERLOAD_1(function, arg1) \
-template<typename T> \
-inline \
-typename std::enable_if<std::is_integral<T>::value,HC_IMPLICIT_FLOAT_CONV>::type \
- function(T arg1) __attribute__((hc,cpu)) { \
-  return hc::precise_math::function(static_cast<HC_IMPLICIT_FLOAT_CONV>(arg1)); \
-} \
-template<typename T> \
-inline \
-typename std::enable_if<std::is_floating_point <T>::value,T>::type \
- function(T arg1) __attribute__((hc,cpu)) { \
-  return hc::precise_math::function(arg1); \
-}
+#define KALMAR_MATH_WRAPPER_FP_OVERLOAD_1(function, arg1)                   \
+  template <typename T>                                                     \
+  inline typename std::enable_if<std::is_integral<T>::value,                \
+                                 HC_IMPLICIT_FLOAT_CONV>::type              \
+  function(T arg1) __attribute__((hc, cpu)) {                               \
+    return hc::precise_math::function(                                      \
+        static_cast<HC_IMPLICIT_FLOAT_CONV>(arg1));                         \
+  }                                                                         \
+  template <typename T>                                                     \
+  inline typename std::enable_if<std::is_floating_point<T>::value, T>::type \
+  function(T arg1) __attribute__((hc, cpu)) {                               \
+    return hc::precise_math::function(arg1);                                \
+  }
 
-#define HC_MATH_WRAPPER_2(function, arg1, arg2) \
-template<typename T> \
-inline T function(T arg1, T arg2) __attribute__((hc,cpu)) { \
-  return std::function(arg1, arg2); \
-}
+#define HC_MATH_WRAPPER_2(function, arg1, arg2)                \
+  template <typename T>                                        \
+  inline T function(T arg1, T arg2) __attribute__((hc, cpu)) { \
+    return std::function(arg1, arg2);                          \
+  }
 
-#define HC_MATH_ALIAS_2(alias, function, arg1, arg2) \
-template<typename T> \
-inline T alias(T arg1, T arg2) __attribute__((hc,cpu)) { \
-  return std::function(arg1, arg2); \
-}
+#define HC_MATH_ALIAS_2(alias, function, arg1, arg2)        \
+  template <typename T>                                     \
+  inline T alias(T arg1, T arg2) __attribute__((hc, cpu)) { \
+    return std::function(arg1, arg2);                       \
+  }
 
-#define HC_MATH_WRAPPER_3(function, arg1, arg2, arg3) \
-template<typename T> \
-inline T function(T arg1, T arg2, T arg3) __attribute__((hc,cpu)) { \
-  return std::function(arg1, arg2, arg3); \
-}
+#define HC_MATH_WRAPPER_3(function, arg1, arg2, arg3)                  \
+  template <typename T>                                                \
+  inline T function(T arg1, T arg2, T arg3) __attribute__((hc, cpu)) { \
+    return std::function(arg1, arg2, arg3);                            \
+  }
 
-#define HC_MATH_WRAPPER_TQ(function, arg1) \
-template<typename T, typename Q> \
-inline T function(Q arg1) __attribute__((hc,cpu)) { \
-  return std::function(arg1); \
-}
+#define HC_MATH_WRAPPER_TQ(function, arg1)             \
+  template <typename T, typename Q>                    \
+  inline T function(Q arg1) __attribute__((hc, cpu)) { \
+    return std::function(arg1);                        \
+  }
 
-#define HC_MATH_WRAPPER_FP_OVERLOAD_TQ(function, T, arg1) \
-template<typename Q> \
-inline \
-typename std::enable_if<std::is_integral<Q>::value,T>::type \
-function(Q arg1) __attribute__((hc)) { \
-  return std::function(static_cast<HC_IMPLICIT_FLOAT_CONV>(arg1)); \
-}\
-template<typename Q> \
-inline \
-typename std::enable_if<std::is_floating_point<Q>::value,T>::type \
-function(Q arg1) __attribute__((hc)) { \
-  return std::function(arg1); \
-}
+#define HC_MATH_WRAPPER_FP_OVERLOAD_TQ(function, T, arg1)                   \
+  template <typename Q>                                                     \
+  inline typename std::enable_if<std::is_integral<Q>::value, T>::type       \
+  function(Q arg1) __attribute__((hc)) {                                    \
+    return std::function(static_cast<HC_IMPLICIT_FLOAT_CONV>(arg1));        \
+  }                                                                         \
+  template <typename Q>                                                     \
+  inline typename std::enable_if<std::is_floating_point<Q>::value, T>::type \
+  function(Q arg1) __attribute__((hc)) {                                    \
+    return std::function(arg1);                                             \
+  }
 
-#define HC_MATH_WRAPPER_TTQ(function, arg1, arg2) \
-template<typename T, typename Q> \
-inline T function(T arg1, Q arg2) __attribute__((hc,cpu)) { \
-  return std::function(arg1, arg2); \
-}
+#define HC_MATH_WRAPPER_TTQ(function, arg1, arg2)              \
+  template <typename T, typename Q>                            \
+  inline T function(T arg1, Q arg2) __attribute__((hc, cpu)) { \
+    return std::function(arg1, arg2);                          \
+  }
 
-#define HC_MATH_WRAPPER_FP_OVERLOAD_TTQ(function, arg1, arg2) \
-template<typename T, typename Q> \
-inline \
-typename std::enable_if<std::is_integral<T>::value||std::is_integral<Q>::value,HC_IMPLICIT_FLOAT_CONV>::type \
-function(T arg1, Q arg2) __attribute__((hc,cpu)) { \
-  return std::function(static_cast<HC_IMPLICIT_FLOAT_CONV>(arg1),static_cast<HC_IMPLICIT_FLOAT_CONV>(arg2)); \
-}\
-template<typename T, typename Q> \
-inline \
-typename std::enable_if<std::is_floating_point<T>::value&&std::is_floating_point<Q>::value,T>::type \
-function(T arg1, Q arg2) __attribute__((hc,cpu)) { \
-  return std::function(arg1,arg2); \
-}
+#define HC_MATH_WRAPPER_FP_OVERLOAD_TTQ(function, arg1, arg2)          \
+  template <typename T, typename Q>                                    \
+  inline typename std::enable_if<std::is_integral<T>::value ||         \
+                                     std::is_integral<Q>::value,       \
+                                 HC_IMPLICIT_FLOAT_CONV>::type         \
+  function(T arg1, Q arg2) __attribute__((hc, cpu)) {                  \
+    return std::function(static_cast<HC_IMPLICIT_FLOAT_CONV>(arg1),    \
+                         static_cast<HC_IMPLICIT_FLOAT_CONV>(arg2));   \
+  }                                                                    \
+  template <typename T, typename Q>                                    \
+  inline typename std::enable_if<std::is_floating_point<T>::value &&   \
+                                     std::is_floating_point<Q>::value, \
+                                 T>::type                              \
+  function(T arg1, Q arg2) __attribute__((hc, cpu)) {                  \
+    return std::function(arg1, arg2);                                  \
+  }
 
-#define HC_MATH_WRAPPER_TTTQ(function, arg1, arg2, arg3) \
-template<typename T, typename Q> \
-inline T function(T arg1, T arg2, Q arg3) __attribute__((hc,cpu)) { \
-  return std::function(arg1, arg2, arg3); \
-}
+#define HC_MATH_WRAPPER_TTTQ(function, arg1, arg2, arg3)               \
+  template <typename T, typename Q>                                    \
+  inline T function(T arg1, T arg2, Q arg3) __attribute__((hc, cpu)) { \
+    return std::function(arg1, arg2, arg3);                            \
+  }
 
-#define HC_MATH_WRAPPER_VTQQ(function, arg1, arg2, arg3) \
-template<typename T, typename Q> \
-inline void function(T arg1, Q arg2, Q arg3) __attribute__((hc,cpu)) { \
-  std::function(arg1, arg2, arg3); \
-}
+#define HC_MATH_WRAPPER_VTQQ(function, arg1, arg2, arg3)                  \
+  template <typename T, typename Q>                                       \
+  inline void function(T arg1, Q arg2, Q arg3) __attribute__((hc, cpu)) { \
+    std::function(arg1, arg2, arg3);                                      \
+  }
 
 #endif
 
-
 // override global math functions
 namespace std {
 
-// following math functions are NOT available because they don't have a GPU implementation
+// following math functions are NOT available because they don't have a GPU
+// implementation
 //
 // erfinv
 // erfcinv
 // fpclassify
-// 
-// following math functions are NOT available because they don't have a CPU implementation
+//
+// following math functions are NOT available because they don't have a CPU
+// implementation
 //
 // cospif
 // cospi
@@ -246,7 +251,7 @@ HC_MATH_WRAPPER_FP_OVERLOAD_TQ(isnan, bool, x)
 HC_MATH_WRAPPER_FP_OVERLOAD_TQ(isnormal, bool, x)
 HC_MATH_WRAPPER_TQ(nanf, tagp)
 HC_MATH_WRAPPER_TQ(nan, tagp)
-//HC_MATH_WRAPPER_TQ(signbitf, x)
+// HC_MATH_WRAPPER_TQ(signbitf, x)
 HC_MATH_WRAPPER_TQ(signbit, x)
 HC_MATH_WRAPPER_TTQ(frexpf, x, exp)
 HC_MATH_WRAPPER_TTQ(frexp, x, exp)
@@ -332,9 +337,9 @@ HC_MATH_WRAPPER_FP_OVERLOAD_1(nearbyint, x)
 HC_MATH_WRAPPER_2(nextafterf, x, y)
 HC_MATH_WRAPPER_2(nextafter, x, y)
 HC_MATH_WRAPPER_2(powf, x, y)
-HC_MATH_WRAPPER_FP_OVERLOAD_TTQ(pow,x,y)
-//HC_MATH_WRAPPER_1(rcbrtf, x)
-//HC_MATH_WRAPPER_1(rcbrt, x)
+HC_MATH_WRAPPER_FP_OVERLOAD_TTQ(pow, x, y)
+// HC_MATH_WRAPPER_1(rcbrtf, x)
+// HC_MATH_WRAPPER_1(rcbrt, x)
 HC_MATH_WRAPPER_2(remainderf, x, y)
 HC_MATH_WRAPPER_2(remainder, x, y)
 HC_MATH_WRAPPER_1(roundf, x)
@@ -360,8 +365,7 @@ HC_MATH_WRAPPER_FP_OVERLOAD_1(tanh, x)
 HC_MATH_WRAPPER_1(truncf, x)
 HC_MATH_WRAPPER_FP_OVERLOAD_1(trunc, x)
 
-//HC_MATH_ALIAS_2(min, fmin, x, y)
-//HC_MATH_ALIAS_2(max, fmax, x, y)
-
-} // namespace
+// HC_MATH_ALIAS_2(min, fmin, x, y)
+// HC_MATH_ALIAS_2(max, fmax, x, y)
 
+}  // namespace std
diff --git a/lib/kokkos/core/src/Serial/Kokkos_Serial_ViewCopyETIAvail.hpp b/lib/kokkos/core/src/Serial/Kokkos_Serial_ViewCopyETIAvail.hpp
index 86b71b99c8..f7d18854dc 100644
--- a/lib/kokkos/core/src/Serial/Kokkos_Serial_ViewCopyETIAvail.hpp
+++ b/lib/kokkos/core/src/Serial/Kokkos_Serial_ViewCopyETIAvail.hpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -48,10 +49,9 @@ namespace Kokkos {
 namespace Impl {
 #define KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE Kokkos::Serial
 
-#include<eti/common/Kokkos_ViewFillCopyETIAvail_Macros.hpp>
+#include <eti/common/Kokkos_ViewFillCopyETIAvail_Macros.hpp>
 
 #undef KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
 #endif
-
diff --git a/lib/kokkos/core/src/Serial/Kokkos_Serial_ViewCopyETIDecl.hpp b/lib/kokkos/core/src/Serial/Kokkos_Serial_ViewCopyETIDecl.hpp
index f0322e65c2..1410a7eeac 100644
--- a/lib/kokkos/core/src/Serial/Kokkos_Serial_ViewCopyETIDecl.hpp
+++ b/lib/kokkos/core/src/Serial/Kokkos_Serial_ViewCopyETIDecl.hpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -48,10 +49,9 @@ namespace Kokkos {
 namespace Impl {
 #define KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE Kokkos::Serial
 
-#include<eti/common/Kokkos_ViewFillCopyETIDecl_Macros.hpp>
+#include <eti/common/Kokkos_ViewFillCopyETIDecl_Macros.hpp>
 
 #undef KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
 #endif
-
diff --git a/lib/kokkos/core/src/Threads/Kokkos_ThreadsExec.cpp b/lib/kokkos/core/src/Threads/Kokkos_ThreadsExec.cpp
index 347778f289..d106abf688 100644
--- a/lib/kokkos/core/src/Threads/Kokkos_ThreadsExec.cpp
+++ b/lib/kokkos/core/src/Threads/Kokkos_ThreadsExec.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -41,9 +42,8 @@
 //@HEADER
 */
 
-
 #include <Kokkos_Macros.hpp>
-#if defined( KOKKOS_ENABLE_THREADS )
+#if defined(KOKKOS_ENABLE_THREADS)
 
 #include <cstdint>
 #include <limits>
@@ -57,7 +57,6 @@
 #include <impl/Kokkos_CPUDiscovery.hpp>
 #include <impl/Kokkos_Profiling_Interface.hpp>
 
-
 //----------------------------------------------------------------------------
 //----------------------------------------------------------------------------
 
@@ -65,50 +64,46 @@ namespace Kokkos {
 namespace Impl {
 namespace {
 
-ThreadsExec                  s_threads_process ;
-ThreadsExec                * s_threads_exec[  ThreadsExec::MAX_THREAD_COUNT ] = { 0 };
-pthread_t                    s_threads_pid[   ThreadsExec::MAX_THREAD_COUNT ] = { 0 };
-std::pair<unsigned,unsigned> s_threads_coord[ ThreadsExec::MAX_THREAD_COUNT ];
+ThreadsExec s_threads_process;
+ThreadsExec *s_threads_exec[ThreadsExec::MAX_THREAD_COUNT] = {0};
+pthread_t s_threads_pid[ThreadsExec::MAX_THREAD_COUNT]     = {0};
+std::pair<unsigned, unsigned> s_threads_coord[ThreadsExec::MAX_THREAD_COUNT];
 
-int s_thread_pool_size[3] = { 0 , 0 , 0 };
+int s_thread_pool_size[3] = {0, 0, 0};
 
-unsigned s_current_reduce_size = 0 ;
-unsigned s_current_shared_size = 0 ;
+unsigned s_current_reduce_size = 0;
+unsigned s_current_shared_size = 0;
 
-void (* volatile s_current_function)( ThreadsExec & , const void * );
-const void * volatile s_current_function_arg = 0 ;
+void (*volatile s_current_function)(ThreadsExec &, const void *);
+const void *volatile s_current_function_arg = 0;
 
 struct Sentinel {
-  Sentinel()
-  {}
+  Sentinel() {}
 
-  ~Sentinel()
-  {
-    if ( s_thread_pool_size[0] ||
-         s_thread_pool_size[1] ||
-         s_thread_pool_size[2] ||
-         s_current_reduce_size ||
-         s_current_shared_size ||
-         s_current_function ||
-         s_current_function_arg ||
-         s_threads_exec[0] ) {
-      std::cerr << "ERROR : Process exiting while Kokkos::Threads is still initialized" << std::endl ;
+  ~Sentinel() {
+    if (s_thread_pool_size[0] || s_thread_pool_size[1] ||
+        s_thread_pool_size[2] || s_current_reduce_size ||
+        s_current_shared_size || s_current_function || s_current_function_arg ||
+        s_threads_exec[0]) {
+      std::cerr << "ERROR : Process exiting while Kokkos::Threads is still "
+                   "initialized"
+                << std::endl;
     }
   }
 };
 
-inline
-unsigned fan_size( const unsigned rank , const unsigned size )
-{
-  const unsigned rank_rev = size - ( rank + 1 );
-  unsigned count = 0 ;
-  for ( unsigned n = 1 ; ( rank_rev + n < size ) && ! ( rank_rev & n ) ; n <<= 1 ) { ++count ; }
-  return count ;
+inline unsigned fan_size(const unsigned rank, const unsigned size) {
+  const unsigned rank_rev = size - (rank + 1);
+  unsigned count          = 0;
+  for (unsigned n = 1; (rank_rev + n < size) && !(rank_rev & n); n <<= 1) {
+    ++count;
+  }
+  return count;
 }
 
-} // namespace
-} // namespace Impl
-} // namespace Kokkos
+}  // namespace
+}  // namespace Impl
+}  // namespace Kokkos
 
 //----------------------------------------------------------------------------
 //----------------------------------------------------------------------------
@@ -116,205 +111,196 @@ unsigned fan_size( const unsigned rank , const unsigned size )
 namespace Kokkos {
 namespace Impl {
 
-void execute_function_noop( ThreadsExec & , const void * ) {}
+void execute_function_noop(ThreadsExec &, const void *) {}
 
-void ThreadsExec::driver(void)
-{
-  SharedAllocationRecord< void, void >::tracking_enable();
+void ThreadsExec::driver(void) {
+  SharedAllocationRecord<void, void>::tracking_enable();
 
-  ThreadsExec this_thread ;
+  ThreadsExec this_thread;
 
-  while ( ThreadsExec::Active == this_thread.m_pool_state ) {
-
-    (*s_current_function)( this_thread , s_current_function_arg );
+  while (ThreadsExec::Active == this_thread.m_pool_state) {
+    (*s_current_function)(this_thread, s_current_function_arg);
 
     // Deactivate thread and wait for reactivation
-    this_thread.m_pool_state = ThreadsExec::Inactive ;
+    this_thread.m_pool_state = ThreadsExec::Inactive;
 
-    wait_yield( this_thread.m_pool_state , ThreadsExec::Inactive );
+    wait_yield(this_thread.m_pool_state, ThreadsExec::Inactive);
   }
 }
 
 ThreadsExec::ThreadsExec()
-  : m_pool_base(0)
-  , m_scratch(0)
-  , m_scratch_reduce_end(0)
-  , m_scratch_thread_end(0)
-  , m_numa_rank(0)
-  , m_numa_core_rank(0)
-  , m_pool_rank(0)
-  , m_pool_size(0)
-  , m_pool_fan_size(0)
-  , m_pool_state( ThreadsExec::Terminating )
-{
-  if ( & s_threads_process != this ) {
-
+    : m_pool_base(0),
+      m_scratch(0),
+      m_scratch_reduce_end(0),
+      m_scratch_thread_end(0),
+      m_numa_rank(0),
+      m_numa_core_rank(0),
+      m_pool_rank(0),
+      m_pool_size(0),
+      m_pool_fan_size(0),
+      m_pool_state(ThreadsExec::Terminating) {
+  if (&s_threads_process != this) {
     // A spawned thread
 
-    ThreadsExec * const nil = 0 ;
+    ThreadsExec *const nil = 0;
 
     // Which entry in 's_threads_exec', possibly determined from hwloc binding
-    const int entry = ((size_t)s_current_function_arg) < size_t(s_thread_pool_size[0])
-                    ? ((size_t)s_current_function_arg)
-                    : size_t(Kokkos::hwloc::bind_this_thread( s_thread_pool_size[0] , s_threads_coord ));
+    const int entry =
+        ((size_t)s_current_function_arg) < size_t(s_thread_pool_size[0])
+            ? ((size_t)s_current_function_arg)
+            : size_t(Kokkos::hwloc::bind_this_thread(s_thread_pool_size[0],
+                                                     s_threads_coord));
 
     // Given a good entry set this thread in the 's_threads_exec' array
-    if ( entry < s_thread_pool_size[0] &&
-         nil == atomic_compare_exchange( s_threads_exec + entry , nil , this ) ) {
+    if (entry < s_thread_pool_size[0] &&
+        nil == atomic_compare_exchange(s_threads_exec + entry, nil, this)) {
+      const std::pair<unsigned, unsigned> coord =
+          Kokkos::hwloc::get_this_thread_coordinate();
 
-      const std::pair<unsigned,unsigned> coord = Kokkos::hwloc::get_this_thread_coordinate();
+      m_numa_rank      = coord.first;
+      m_numa_core_rank = coord.second;
+      m_pool_base      = s_threads_exec;
+      m_pool_rank      = s_thread_pool_size[0] - (entry + 1);
+      m_pool_rank_rev  = s_thread_pool_size[0] - (pool_rank() + 1);
+      m_pool_size      = s_thread_pool_size[0];
+      m_pool_fan_size  = fan_size(m_pool_rank, m_pool_size);
+      m_pool_state     = ThreadsExec::Active;
 
-      m_numa_rank       = coord.first ;
-      m_numa_core_rank  = coord.second ;
-      m_pool_base       = s_threads_exec ;
-      m_pool_rank       = s_thread_pool_size[0] - ( entry + 1 );
-      m_pool_rank_rev   = s_thread_pool_size[0] - ( pool_rank() + 1 );
-      m_pool_size       = s_thread_pool_size[0] ;
-      m_pool_fan_size   = fan_size( m_pool_rank , m_pool_size );
-      m_pool_state      = ThreadsExec::Active ;
-
-      s_threads_pid[ m_pool_rank ] = pthread_self();
+      s_threads_pid[m_pool_rank] = pthread_self();
 
       // Inform spawning process that the threads_exec entry has been set.
-      s_threads_process.m_pool_state = ThreadsExec::Active ;
-    }
-    else {
+      s_threads_process.m_pool_state = ThreadsExec::Active;
+    } else {
       // Inform spawning process that the threads_exec entry could not be set.
-      s_threads_process.m_pool_state = ThreadsExec::Terminating ;
+      s_threads_process.m_pool_state = ThreadsExec::Terminating;
     }
-  }
-  else {
+  } else {
     // Enables 'parallel_for' to execute on unitialized Threads device
-    m_pool_rank  = 0 ;
-    m_pool_size  = 1 ;
-    m_pool_state = ThreadsExec::Inactive ;
+    m_pool_rank  = 0;
+    m_pool_size  = 1;
+    m_pool_state = ThreadsExec::Inactive;
 
-    s_threads_pid[ m_pool_rank ] = pthread_self();
+    s_threads_pid[m_pool_rank] = pthread_self();
   }
 }
 
-ThreadsExec::~ThreadsExec()
-{
-  const unsigned entry = m_pool_size - ( m_pool_rank + 1 );
+ThreadsExec::~ThreadsExec() {
+  const unsigned entry = m_pool_size - (m_pool_rank + 1);
 
-  typedef Kokkos::Impl::SharedAllocationRecord< Kokkos::HostSpace , void > Record ;
+  typedef Kokkos::Impl::SharedAllocationRecord<Kokkos::HostSpace, void> Record;
 
-  if ( m_scratch ) {
-    Record * const r = Record::get_record( m_scratch );
+  if (m_scratch) {
+    Record *const r = Record::get_record(m_scratch);
 
-    m_scratch = 0 ;
+    m_scratch = 0;
 
-    Record::decrement( r );
+    Record::decrement(r);
   }
 
-  m_pool_base   = 0 ;
-  m_scratch_reduce_end = 0 ;
-  m_scratch_thread_end = 0 ;
-  m_numa_rank      = 0 ;
-  m_numa_core_rank = 0 ;
-  m_pool_rank      = 0 ;
-  m_pool_size      = 0 ;
-  m_pool_fan_size  = 0 ;
+  m_pool_base          = 0;
+  m_scratch_reduce_end = 0;
+  m_scratch_thread_end = 0;
+  m_numa_rank          = 0;
+  m_numa_core_rank     = 0;
+  m_pool_rank          = 0;
+  m_pool_size          = 0;
+  m_pool_fan_size      = 0;
 
-  m_pool_state  = ThreadsExec::Terminating ;
+  m_pool_state = ThreadsExec::Terminating;
 
-  if ( & s_threads_process != this && entry < MAX_THREAD_COUNT ) {
-    ThreadsExec * const nil = 0 ;
+  if (&s_threads_process != this && entry < MAX_THREAD_COUNT) {
+    ThreadsExec *const nil = 0;
 
-    atomic_compare_exchange( s_threads_exec + entry , this , nil );
+    atomic_compare_exchange(s_threads_exec + entry, this, nil);
 
-    s_threads_process.m_pool_state = ThreadsExec::Terminating ;
+    s_threads_process.m_pool_state = ThreadsExec::Terminating;
   }
 }
 
+int ThreadsExec::get_thread_count() { return s_thread_pool_size[0]; }
 
-int ThreadsExec::get_thread_count()
-{
-  return s_thread_pool_size[0] ;
-}
+ThreadsExec *ThreadsExec::get_thread(const int init_thread_rank) {
+  ThreadsExec *const th =
+      init_thread_rank < s_thread_pool_size[0]
+          ? s_threads_exec[s_thread_pool_size[0] - (init_thread_rank + 1)]
+          : 0;
 
-ThreadsExec * ThreadsExec::get_thread( const int init_thread_rank )
-{
-  ThreadsExec * const th =
-    init_thread_rank < s_thread_pool_size[0]
-    ? s_threads_exec[ s_thread_pool_size[0] - ( init_thread_rank + 1 ) ] : 0 ;
-
-  if ( 0 == th || th->m_pool_rank != init_thread_rank ) {
-    std::ostringstream msg ;
+  if (0 == th || th->m_pool_rank != init_thread_rank) {
+    std::ostringstream msg;
     msg << "Kokkos::Impl::ThreadsExec::get_thread ERROR : "
-        << "thread " << init_thread_rank << " of " << s_thread_pool_size[0] ;
-    if ( 0 == th ) {
-      msg << " does not exist" ;
+        << "thread " << init_thread_rank << " of " << s_thread_pool_size[0];
+    if (0 == th) {
+      msg << " does not exist";
+    } else {
+      msg << " has wrong thread_rank " << th->m_pool_rank;
     }
-    else {
-      msg << " has wrong thread_rank " << th->m_pool_rank ;
-    }
-    Kokkos::Impl::throw_runtime_exception( msg.str() );
+    Kokkos::Impl::throw_runtime_exception(msg.str());
   }
 
-  return th ;
+  return th;
 }
 
 //----------------------------------------------------------------------------
 
-void ThreadsExec::execute_sleep( ThreadsExec & exec , const void * )
-{
+void ThreadsExec::execute_sleep(ThreadsExec &exec, const void *) {
   ThreadsExec::global_lock();
   ThreadsExec::global_unlock();
 
-  const int n = exec.m_pool_fan_size ;
-  const int rank_rev = exec.m_pool_size - ( exec.m_pool_rank + 1 );
+  const int n        = exec.m_pool_fan_size;
+  const int rank_rev = exec.m_pool_size - (exec.m_pool_rank + 1);
 
-  for ( int i = 0 ; i < n ; ++i ) {
-    Impl::spinwait_while_equal<int>( exec.m_pool_base[ rank_rev + (1<<i) ]->m_pool_state , ThreadsExec::Active );
+  for (int i = 0; i < n; ++i) {
+    Impl::spinwait_while_equal<int>(
+        exec.m_pool_base[rank_rev + (1 << i)]->m_pool_state,
+        ThreadsExec::Active);
   }
 
-  exec.m_pool_state = ThreadsExec::Inactive ;
+  exec.m_pool_state = ThreadsExec::Inactive;
 }
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
 
 //----------------------------------------------------------------------------
 
 namespace Kokkos {
 namespace Impl {
 
-void ThreadsExec::verify_is_process( const std::string & name , const bool initialized )
-{
-  if ( ! is_process() ) {
-    std::string msg( name );
-    msg.append( " FAILED : Called by a worker thread, can only be called by the master process." );
-    Kokkos::Impl::throw_runtime_exception( msg );
+void ThreadsExec::verify_is_process(const std::string &name,
+                                    const bool initialized) {
+  if (!is_process()) {
+    std::string msg(name);
+    msg.append(
+        " FAILED : Called by a worker thread, can only be called by the master "
+        "process.");
+    Kokkos::Impl::throw_runtime_exception(msg);
   }
 
-  if ( initialized && 0 == s_thread_pool_size[0] ) {
-    std::string msg( name );
-    msg.append( " FAILED : Threads not initialized." );
-    Kokkos::Impl::throw_runtime_exception( msg );
+  if (initialized && 0 == s_thread_pool_size[0]) {
+    std::string msg(name);
+    msg.append(" FAILED : Threads not initialized.");
+    Kokkos::Impl::throw_runtime_exception(msg);
   }
 }
 
-int ThreadsExec::in_parallel()
-{
+int ThreadsExec::in_parallel() {
   // A thread function is in execution and
   // the function argument is not the special threads process argument and
   // the master process is a worker or is not the master process.
-  return s_current_function &&
-         ( & s_threads_process != s_current_function_arg ) &&
-         ( s_threads_process.m_pool_base || ! is_process() );
+  return s_current_function && (&s_threads_process != s_current_function_arg) &&
+         (s_threads_process.m_pool_base || !is_process());
 }
 
 // Wait for root thread to become inactive
-void ThreadsExec::fence()
-{
-  if ( s_thread_pool_size[0] ) {
+void ThreadsExec::fence() {
+  if (s_thread_pool_size[0]) {
     // Wait for the root thread to complete:
-    Impl::spinwait_while_equal<int>( s_threads_exec[0]->m_pool_state , ThreadsExec::Active );
+    Impl::spinwait_while_equal<int>(s_threads_exec[0]->m_pool_state,
+                                    ThreadsExec::Active);
   }
 
-  s_current_function     = 0 ;
-  s_current_function_arg = 0 ;
+  s_current_function     = 0;
+  s_current_function_arg = 0;
 
   // Make sure function and arguments are cleared before
   // potentially re-activating threads with a subsequent launch.
@@ -322,100 +308,98 @@ void ThreadsExec::fence()
 }
 
 /** \brief  Begin execution of the asynchronous functor */
-void ThreadsExec::start( void (*func)( ThreadsExec & , const void * ) , const void * arg )
-{
-  verify_is_process("ThreadsExec::start" , true );
+void ThreadsExec::start(void (*func)(ThreadsExec &, const void *),
+                        const void *arg) {
+  verify_is_process("ThreadsExec::start", true);
 
-  if ( s_current_function || s_current_function_arg ) {
-    Kokkos::Impl::throw_runtime_exception( std::string( "ThreadsExec::start() FAILED : already executing" ) );
+  if (s_current_function || s_current_function_arg) {
+    Kokkos::Impl::throw_runtime_exception(
+        std::string("ThreadsExec::start() FAILED : already executing"));
   }
 
-  s_current_function     = func ;
-  s_current_function_arg = arg ;
+  s_current_function     = func;
+  s_current_function_arg = arg;
 
   // Make sure function and arguments are written before activating threads.
   memory_fence();
 
   // Activate threads:
-  for ( int i = s_thread_pool_size[0] ; 0 < i-- ; ) {
-    s_threads_exec[i]->m_pool_state = ThreadsExec::Active ;
+  for (int i = s_thread_pool_size[0]; 0 < i--;) {
+    s_threads_exec[i]->m_pool_state = ThreadsExec::Active;
   }
 
-  if ( s_threads_process.m_pool_size ) {
+  if (s_threads_process.m_pool_size) {
     // Master process is the root thread, run it:
-    (*func)( s_threads_process , arg );
-    s_threads_process.m_pool_state = ThreadsExec::Inactive ;
+    (*func)(s_threads_process, arg);
+    s_threads_process.m_pool_state = ThreadsExec::Inactive;
   }
 }
 
 //----------------------------------------------------------------------------
 
-bool ThreadsExec::sleep()
-{
-  verify_is_process("ThreadsExec::sleep", true );
+bool ThreadsExec::sleep() {
+  verify_is_process("ThreadsExec::sleep", true);
 
-  if ( & execute_sleep == s_current_function ) return false ;
+  if (&execute_sleep == s_current_function) return false;
 
   fence();
 
   ThreadsExec::global_lock();
 
-  s_current_function = & execute_sleep ;
+  s_current_function = &execute_sleep;
 
   // Activate threads:
-  for ( unsigned i = s_thread_pool_size[0] ; 0 < i ; ) {
-    s_threads_exec[--i]->m_pool_state = ThreadsExec::Active ;
+  for (unsigned i = s_thread_pool_size[0]; 0 < i;) {
+    s_threads_exec[--i]->m_pool_state = ThreadsExec::Active;
   }
 
-  return true ;
+  return true;
 }
 
-bool ThreadsExec::wake()
-{
-  verify_is_process("ThreadsExec::wake", true );
+bool ThreadsExec::wake() {
+  verify_is_process("ThreadsExec::wake", true);
 
-  if ( & execute_sleep != s_current_function ) return false ;
+  if (&execute_sleep != s_current_function) return false;
 
   ThreadsExec::global_unlock();
 
-  if ( s_threads_process.m_pool_base ) {
-    execute_sleep( s_threads_process , 0 );
-    s_threads_process.m_pool_state = ThreadsExec::Inactive ;
+  if (s_threads_process.m_pool_base) {
+    execute_sleep(s_threads_process, 0);
+    s_threads_process.m_pool_state = ThreadsExec::Inactive;
   }
 
   fence();
 
-  return true ;
+  return true;
 }
 
 //----------------------------------------------------------------------------
 
-void ThreadsExec::execute_serial( void (*func)( ThreadsExec & , const void * ) )
-{
-  s_current_function = func ;
-  s_current_function_arg = & s_threads_process ;
+void ThreadsExec::execute_serial(void (*func)(ThreadsExec &, const void *)) {
+  s_current_function     = func;
+  s_current_function_arg = &s_threads_process;
 
   // Make sure function and arguments are written before activating threads.
   memory_fence();
 
-  const unsigned begin = s_threads_process.m_pool_base ? 1 : 0 ;
+  const unsigned begin = s_threads_process.m_pool_base ? 1 : 0;
 
-  for ( unsigned i = s_thread_pool_size[0] ; begin < i ; ) {
-    ThreadsExec & th = * s_threads_exec[ --i ];
+  for (unsigned i = s_thread_pool_size[0]; begin < i;) {
+    ThreadsExec &th = *s_threads_exec[--i];
 
-    th.m_pool_state = ThreadsExec::Active ;
+    th.m_pool_state = ThreadsExec::Active;
 
-    wait_yield( th.m_pool_state , ThreadsExec::Active );
+    wait_yield(th.m_pool_state, ThreadsExec::Active);
   }
 
-  if ( s_threads_process.m_pool_base ) {
-    s_threads_process.m_pool_state = ThreadsExec::Active ;
-    (*func)( s_threads_process , 0 );
-    s_threads_process.m_pool_state = ThreadsExec::Inactive ;
+  if (s_threads_process.m_pool_base) {
+    s_threads_process.m_pool_state = ThreadsExec::Active;
+    (*func)(s_threads_process, 0);
+    s_threads_process.m_pool_state = ThreadsExec::Inactive;
   }
 
-  s_current_function_arg = 0 ;
-  s_current_function = 0 ;
+  s_current_function_arg = 0;
+  s_current_function     = 0;
 
   // Make sure function and arguments are cleared before proceeding.
   memory_fence();
@@ -423,214 +407,203 @@ void ThreadsExec::execute_serial( void (*func)( ThreadsExec & , const void * ) )
 
 //----------------------------------------------------------------------------
 
-void * ThreadsExec::root_reduce_scratch()
-{
+void *ThreadsExec::root_reduce_scratch() {
   return s_threads_process.reduce_memory();
 }
 
-void ThreadsExec::execute_resize_scratch( ThreadsExec & exec , const void * )
-{
-  typedef Kokkos::Impl::SharedAllocationRecord< Kokkos::HostSpace , void > Record ;
+void ThreadsExec::execute_resize_scratch(ThreadsExec &exec, const void *) {
+  typedef Kokkos::Impl::SharedAllocationRecord<Kokkos::HostSpace, void> Record;
 
-  if ( exec.m_scratch ) {
-    Record * const r = Record::get_record( exec.m_scratch );
+  if (exec.m_scratch) {
+    Record *const r = Record::get_record(exec.m_scratch);
 
-    exec.m_scratch = 0 ;
+    exec.m_scratch = 0;
 
-    Record::decrement( r );
+    Record::decrement(r);
   }
 
-  exec.m_scratch_reduce_end = s_threads_process.m_scratch_reduce_end ;
-  exec.m_scratch_thread_end = s_threads_process.m_scratch_thread_end ;
-
-  if ( s_threads_process.m_scratch_thread_end ) {
+  exec.m_scratch_reduce_end = s_threads_process.m_scratch_reduce_end;
+  exec.m_scratch_thread_end = s_threads_process.m_scratch_thread_end;
 
+  if (s_threads_process.m_scratch_thread_end) {
     // Allocate tracked memory:
     {
-      Record * const r = Record::allocate( Kokkos::HostSpace() , "thread_scratch" , s_threads_process.m_scratch_thread_end );
+      Record *const r =
+          Record::allocate(Kokkos::HostSpace(), "thread_scratch",
+                           s_threads_process.m_scratch_thread_end);
 
-      Record::increment( r );
+      Record::increment(r);
 
       exec.m_scratch = r->data();
     }
 
-    unsigned * ptr = reinterpret_cast<unsigned *>( exec.m_scratch );
+    unsigned *ptr = reinterpret_cast<unsigned *>(exec.m_scratch);
 
-    unsigned * const end = ptr + s_threads_process.m_scratch_thread_end / sizeof(unsigned);
+    unsigned *const end =
+        ptr + s_threads_process.m_scratch_thread_end / sizeof(unsigned);
 
     // touch on this thread
-    while ( ptr < end ) *ptr++ = 0 ;
+    while (ptr < end) *ptr++ = 0;
   }
 }
 
-void * ThreadsExec::resize_scratch( size_t reduce_size , size_t thread_size )
-{
+void *ThreadsExec::resize_scratch(size_t reduce_size, size_t thread_size) {
   enum { ALIGN_MASK = Kokkos::Impl::MEMORY_ALIGNMENT - 1 };
 
   fence();
 
-  const size_t old_reduce_size = s_threads_process.m_scratch_reduce_end ;
-  const size_t old_thread_size = s_threads_process.m_scratch_thread_end - s_threads_process.m_scratch_reduce_end ;
+  const size_t old_reduce_size = s_threads_process.m_scratch_reduce_end;
+  const size_t old_thread_size = s_threads_process.m_scratch_thread_end -
+                                 s_threads_process.m_scratch_reduce_end;
 
-  reduce_size = ( reduce_size + ALIGN_MASK ) & ~ALIGN_MASK ;
-  thread_size = ( thread_size + ALIGN_MASK ) & ~ALIGN_MASK ;
+  reduce_size = (reduce_size + ALIGN_MASK) & ~ALIGN_MASK;
+  thread_size = (thread_size + ALIGN_MASK) & ~ALIGN_MASK;
 
   // Increase size or deallocate completely.
 
-  if ( ( old_reduce_size < reduce_size ) ||
-       ( old_thread_size < thread_size ) ||
-       ( ( reduce_size == 0 && thread_size == 0 ) &&
-         ( old_reduce_size != 0 || old_thread_size != 0 ) ) ) {
+  if ((old_reduce_size < reduce_size) || (old_thread_size < thread_size) ||
+      ((reduce_size == 0 && thread_size == 0) &&
+       (old_reduce_size != 0 || old_thread_size != 0))) {
+    verify_is_process("ThreadsExec::resize_scratch", true);
 
-    verify_is_process( "ThreadsExec::resize_scratch" , true );
+    s_threads_process.m_scratch_reduce_end = reduce_size;
+    s_threads_process.m_scratch_thread_end = reduce_size + thread_size;
 
-    s_threads_process.m_scratch_reduce_end = reduce_size ;
-    s_threads_process.m_scratch_thread_end = reduce_size + thread_size ;
+    execute_serial(&execute_resize_scratch);
 
-    execute_serial( & execute_resize_scratch );
-
-    s_threads_process.m_scratch = s_threads_exec[0]->m_scratch ;
+    s_threads_process.m_scratch = s_threads_exec[0]->m_scratch;
   }
 
-  return s_threads_process.m_scratch ;
+  return s_threads_process.m_scratch;
 }
 
 //----------------------------------------------------------------------------
 
-void ThreadsExec::print_configuration( std::ostream & s , const bool detail )
-{
-  verify_is_process("ThreadsExec::print_configuration",false);
+void ThreadsExec::print_configuration(std::ostream &s, const bool detail) {
+  verify_is_process("ThreadsExec::print_configuration", false);
 
   fence();
 
-  const unsigned numa_count       = Kokkos::hwloc::get_available_numa_count();
-  const unsigned cores_per_numa   = Kokkos::hwloc::get_available_cores_per_numa();
-  const unsigned threads_per_core = Kokkos::hwloc::get_available_threads_per_core();
+  const unsigned numa_count     = Kokkos::hwloc::get_available_numa_count();
+  const unsigned cores_per_numa = Kokkos::hwloc::get_available_cores_per_numa();
+  const unsigned threads_per_core =
+      Kokkos::hwloc::get_available_threads_per_core();
 
   // Forestall compiler warnings for unused variables.
-  (void) numa_count;
-  (void) cores_per_numa;
-  (void) threads_per_core;
+  (void)numa_count;
+  (void)cores_per_numa;
+  (void)threads_per_core;
 
-  s << "Kokkos::Threads" ;
+  s << "Kokkos::Threads";
 
-#if defined( KOKKOS_ENABLE_THREADS )
-  s << " KOKKOS_ENABLE_THREADS" ;
+#if defined(KOKKOS_ENABLE_THREADS)
+  s << " KOKKOS_ENABLE_THREADS";
 #endif
-#if defined( KOKKOS_ENABLE_HWLOC )
-  s << " hwloc[" << numa_count << "x" << cores_per_numa << "x" << threads_per_core << "]" ;
+#if defined(KOKKOS_ENABLE_HWLOC)
+  s << " hwloc[" << numa_count << "x" << cores_per_numa << "x"
+    << threads_per_core << "]";
 #endif
 
-  if ( s_thread_pool_size[0] ) {
+  if (s_thread_pool_size[0]) {
     s << " threads[" << s_thread_pool_size[0] << "]"
       << " threads_per_numa[" << s_thread_pool_size[1] << "]"
-      << " threads_per_core[" << s_thread_pool_size[2] << "]"
-      ;
-    if ( 0 == s_threads_process.m_pool_base ) { s << " Asynchronous" ; }
+      << " threads_per_core[" << s_thread_pool_size[2] << "]";
+    if (0 == s_threads_process.m_pool_base) {
+      s << " Asynchronous";
+    }
     s << " ReduceScratch[" << s_current_reduce_size << "]"
-      << " SharedScratch[" << s_current_shared_size << "]" ;
-    s << std::endl ;
+      << " SharedScratch[" << s_current_shared_size << "]";
+    s << std::endl;
 
-    if ( detail ) {
+    if (detail) {
+      for (int i = 0; i < s_thread_pool_size[0]; ++i) {
+        ThreadsExec *const th = s_threads_exec[i];
 
-      for ( int i = 0 ; i < s_thread_pool_size[0] ; ++i ) {
+        if (th) {
+          const int rank_rev = th->m_pool_size - (th->m_pool_rank + 1);
 
-        ThreadsExec * const th = s_threads_exec[i] ;
+          s << " Thread[ " << th->m_pool_rank << " : " << th->m_numa_rank << "."
+            << th->m_numa_core_rank << " ]";
 
-        if ( th ) {
-
-          const int rank_rev = th->m_pool_size - ( th->m_pool_rank + 1 );
-
-          s << " Thread[ " << th->m_pool_rank << " : "
-            << th->m_numa_rank << "." << th->m_numa_core_rank << " ]" ;
-
-          s << " Fan{" ;
-          for ( int j = 0 ; j < th->m_pool_fan_size ; ++j ) {
-            ThreadsExec * const thfan = th->m_pool_base[rank_rev+(1<<j)] ;
-            s << " [ " << thfan->m_pool_rank << " : "
-              << thfan->m_numa_rank << "." << thfan->m_numa_core_rank << " ]" ;
+          s << " Fan{";
+          for (int j = 0; j < th->m_pool_fan_size; ++j) {
+            ThreadsExec *const thfan = th->m_pool_base[rank_rev + (1 << j)];
+            s << " [ " << thfan->m_pool_rank << " : " << thfan->m_numa_rank
+              << "." << thfan->m_numa_core_rank << " ]";
           }
-          s << " }" ;
+          s << " }";
 
-          if ( th == & s_threads_process ) {
-            s << " is_process" ;
+          if (th == &s_threads_process) {
+            s << " is_process";
           }
         }
-        s << std::endl ;
+        s << std::endl;
       }
     }
-  }
-  else {
-    s << " not initialized" << std::endl ;
+  } else {
+    s << " not initialized" << std::endl;
   }
 }
 
 //----------------------------------------------------------------------------
 
-int ThreadsExec::is_initialized()
-{ return 0 != s_threads_exec[0] ; }
+int ThreadsExec::is_initialized() { return 0 != s_threads_exec[0]; }
 
-void ThreadsExec::initialize
-( unsigned thread_count ,
-  unsigned use_numa_count ,
-  unsigned use_cores_per_numa ,
-  bool allow_asynchronous_threadpool )
-{
-  static const Sentinel sentinel ;
+void ThreadsExec::initialize(unsigned thread_count, unsigned use_numa_count,
+                             unsigned use_cores_per_numa,
+                             bool allow_asynchronous_threadpool) {
+  static const Sentinel sentinel;
 
-  const bool is_initialized = 0 != s_thread_pool_size[0] ;
+  const bool is_initialized = 0 != s_thread_pool_size[0];
 
-  unsigned thread_spawn_failed = 0 ;
+  unsigned thread_spawn_failed = 0;
 
-  for ( int i = 0; i < ThreadsExec::MAX_THREAD_COUNT ; i++)
+  for (int i = 0; i < ThreadsExec::MAX_THREAD_COUNT; i++)
     s_threads_exec[i] = NULL;
 
-  if ( ! is_initialized ) {
-
+  if (!is_initialized) {
     // If thread_count, use_numa_count, or use_cores_per_numa are zero
     // then they will be given default values based upon hwloc detection
     // and allowed asynchronous execution.
 
     const bool hwloc_avail = Kokkos::hwloc::available();
-    const bool hwloc_can_bind = hwloc_avail && Kokkos::hwloc::can_bind_threads();
+    const bool hwloc_can_bind =
+        hwloc_avail && Kokkos::hwloc::can_bind_threads();
 
-    if ( thread_count == 0 ) {
+    if (thread_count == 0) {
       thread_count = hwloc_avail
-      ? Kokkos::hwloc::get_available_numa_count() *
-        Kokkos::hwloc::get_available_cores_per_numa() *
-        Kokkos::hwloc::get_available_threads_per_core()
-      : 1 ;
+                         ? Kokkos::hwloc::get_available_numa_count() *
+                               Kokkos::hwloc::get_available_cores_per_numa() *
+                               Kokkos::hwloc::get_available_threads_per_core()
+                         : 1;
     }
 
-    const unsigned thread_spawn_begin =
-      hwloc::thread_mapping( "Kokkos::Threads::initialize" ,
-                             allow_asynchronous_threadpool ,
-                             thread_count ,
-                             use_numa_count ,
-                             use_cores_per_numa ,
-                             s_threads_coord );
+    const unsigned thread_spawn_begin = hwloc::thread_mapping(
+        "Kokkos::Threads::initialize", allow_asynchronous_threadpool,
+        thread_count, use_numa_count, use_cores_per_numa, s_threads_coord);
 
-    const std::pair<unsigned,unsigned> proc_coord = s_threads_coord[0] ;
+    const std::pair<unsigned, unsigned> proc_coord = s_threads_coord[0];
 
-    if ( thread_spawn_begin ) {
+    if (thread_spawn_begin) {
       // Synchronous with s_threads_coord[0] as the process core
       // Claim entry #0 for binding the process core.
-      s_threads_coord[0] = std::pair<unsigned,unsigned>(~0u,~0u);
+      s_threads_coord[0] = std::pair<unsigned, unsigned>(~0u, ~0u);
     }
 
-    s_thread_pool_size[0] = thread_count ;
-    s_thread_pool_size[1] = s_thread_pool_size[0] / use_numa_count ;
-    s_thread_pool_size[2] = s_thread_pool_size[1] / use_cores_per_numa ;
-    s_current_function = & execute_function_noop ; // Initialization work function
+    s_thread_pool_size[0] = thread_count;
+    s_thread_pool_size[1] = s_thread_pool_size[0] / use_numa_count;
+    s_thread_pool_size[2] = s_thread_pool_size[1] / use_cores_per_numa;
+    s_current_function =
+        &execute_function_noop;  // Initialization work function
 
-    for ( unsigned ith = thread_spawn_begin ; ith < thread_count ; ++ith ) {
-
-      s_threads_process.m_pool_state = ThreadsExec::Inactive ;
+    for (unsigned ith = thread_spawn_begin; ith < thread_count; ++ith) {
+      s_threads_process.m_pool_state = ThreadsExec::Inactive;
 
       // If hwloc available then spawned thread will
       // choose its own entry in 's_threads_coord'
       // otherwise specify the entry.
-      s_current_function_arg = (void*)static_cast<uintptr_t>( hwloc_can_bind ? ~0u : ith );
+      s_current_function_arg =
+          (void *)static_cast<uintptr_t>(hwloc_can_bind ? ~0u : ith);
 
       // Make sure all outstanding memory writes are complete
       // before spawning the new thread.
@@ -638,153 +611,158 @@ void ThreadsExec::initialize
 
       // Spawn thread executing the 'driver()' function.
       // Wait until spawned thread has attempted to initialize.
-      // If spawning and initialization is successfull then
+      // If spawning and initialization is successful then
       // an entry in 's_threads_exec' will be assigned.
-      if ( ThreadsExec::spawn() ) {
-        wait_yield( s_threads_process.m_pool_state , ThreadsExec::Inactive );
+      if (ThreadsExec::spawn()) {
+        wait_yield(s_threads_process.m_pool_state, ThreadsExec::Inactive);
       }
-      if ( s_threads_process.m_pool_state == ThreadsExec::Terminating ) break ;
+      if (s_threads_process.m_pool_state == ThreadsExec::Terminating) break;
     }
 
     // Wait for all spawned threads to deactivate before zeroing the function.
 
-    for ( unsigned ith = thread_spawn_begin ; ith < thread_count ; ++ith ) {
+    for (unsigned ith = thread_spawn_begin; ith < thread_count; ++ith) {
       // Try to protect against cache coherency failure by casting to volatile.
-      ThreadsExec * const th = ((ThreadsExec * volatile *)s_threads_exec)[ith] ;
-      if ( th ) {
-        wait_yield( th->m_pool_state , ThreadsExec::Active );
-      }
-      else {
-        ++thread_spawn_failed ;
+      ThreadsExec *const th = ((ThreadsExec * volatile *)s_threads_exec)[ith];
+      if (th) {
+        wait_yield(th->m_pool_state, ThreadsExec::Active);
+      } else {
+        ++thread_spawn_failed;
       }
     }
 
-    s_current_function     = 0 ;
-    s_current_function_arg = 0 ;
-    s_threads_process.m_pool_state = ThreadsExec::Inactive ;
+    s_current_function             = 0;
+    s_current_function_arg         = 0;
+    s_threads_process.m_pool_state = ThreadsExec::Inactive;
 
     memory_fence();
 
-    if ( ! thread_spawn_failed ) {
-      // Bind process to the core on which it was located before spawning occured
+    if (!thread_spawn_failed) {
+      // Bind process to the core on which it was located before spawning
+      // occurred
       if (hwloc_can_bind) {
-        Kokkos::hwloc::bind_this_thread( proc_coord );
+        Kokkos::hwloc::bind_this_thread(proc_coord);
       }
 
-      if ( thread_spawn_begin ) { // Include process in pool.
-        const std::pair<unsigned,unsigned> coord = Kokkos::hwloc::get_this_thread_coordinate();
+      if (thread_spawn_begin) {  // Include process in pool.
+        const std::pair<unsigned, unsigned> coord =
+            Kokkos::hwloc::get_this_thread_coordinate();
 
-        s_threads_exec[0]                   = & s_threads_process ;
-        s_threads_process.m_numa_rank       = coord.first ;
-        s_threads_process.m_numa_core_rank  = coord.second ;
-        s_threads_process.m_pool_base       = s_threads_exec ;
-        s_threads_process.m_pool_rank       = thread_count - 1 ; // Reversed for scan-compatible reductions
-        s_threads_process.m_pool_size       = thread_count ;
-        s_threads_process.m_pool_fan_size   = fan_size( s_threads_process.m_pool_rank , s_threads_process.m_pool_size );
-        s_threads_pid[ s_threads_process.m_pool_rank ] = pthread_self();
-      }
-      else {
-        s_threads_process.m_pool_base = 0 ;
-        s_threads_process.m_pool_rank = 0 ;
-        s_threads_process.m_pool_size = 0 ;
-        s_threads_process.m_pool_fan_size = 0 ;
+        s_threads_exec[0]                  = &s_threads_process;
+        s_threads_process.m_numa_rank      = coord.first;
+        s_threads_process.m_numa_core_rank = coord.second;
+        s_threads_process.m_pool_base      = s_threads_exec;
+        s_threads_process.m_pool_rank =
+            thread_count - 1;  // Reversed for scan-compatible reductions
+        s_threads_process.m_pool_size     = thread_count;
+        s_threads_process.m_pool_fan_size = fan_size(
+            s_threads_process.m_pool_rank, s_threads_process.m_pool_size);
+        s_threads_pid[s_threads_process.m_pool_rank] = pthread_self();
+      } else {
+        s_threads_process.m_pool_base     = 0;
+        s_threads_process.m_pool_rank     = 0;
+        s_threads_process.m_pool_size     = 0;
+        s_threads_process.m_pool_fan_size = 0;
       }
 
       // Initial allocations:
-      ThreadsExec::resize_scratch( 1024 , 1024 );
-    }
-    else {
-      s_thread_pool_size[0] = 0 ;
-      s_thread_pool_size[1] = 0 ;
-      s_thread_pool_size[2] = 0 ;
+      ThreadsExec::resize_scratch(1024, 1024);
+    } else {
+      s_thread_pool_size[0] = 0;
+      s_thread_pool_size[1] = 0;
+      s_thread_pool_size[2] = 0;
     }
   }
 
-  if ( is_initialized || thread_spawn_failed ) {
+  if (is_initialized || thread_spawn_failed) {
+    std::ostringstream msg;
 
-    std::ostringstream msg ;
+    msg << "Kokkos::Threads::initialize ERROR";
 
-    msg << "Kokkos::Threads::initialize ERROR" ;
-
-    if ( is_initialized ) {
-      msg << " : already initialized" ;
+    if (is_initialized) {
+      msg << " : already initialized";
     }
-    if ( thread_spawn_failed ) {
-      msg << " : failed to spawn " << thread_spawn_failed << " threads" ;
+    if (thread_spawn_failed) {
+      msg << " : failed to spawn " << thread_spawn_failed << " threads";
     }
 
-    Kokkos::Impl::throw_runtime_exception( msg.str() );
+    Kokkos::Impl::throw_runtime_exception(msg.str());
   }
 
   // Check for over-subscription
-  if( Kokkos::show_warnings() && (Impl::mpi_ranks_per_node() * long(thread_count) > Impl::processors_per_node()) ) {
-    std::cerr << "Kokkos::Threads::initialize WARNING: You are likely oversubscribing your CPU cores." << std::endl;
-    std::cerr << "                                    Detected: " << Impl::processors_per_node() << " cores per node." << std::endl;
-    std::cerr << "                                    Detected: " << Impl::mpi_ranks_per_node() << " MPI_ranks per node." << std::endl;
-    std::cerr << "                                    Requested: " << thread_count << " threads per process." << std::endl;
+  if (Kokkos::show_warnings() &&
+      (Impl::mpi_ranks_per_node() * long(thread_count) >
+       Impl::processors_per_node())) {
+    std::cerr << "Kokkos::Threads::initialize WARNING: You are likely "
+                 "oversubscribing your CPU cores."
+              << std::endl;
+    std::cerr << "                                    Detected: "
+              << Impl::processors_per_node() << " cores per node." << std::endl;
+    std::cerr << "                                    Detected: "
+              << Impl::mpi_ranks_per_node() << " MPI_ranks per node."
+              << std::endl;
+    std::cerr << "                                    Requested: "
+              << thread_count << " threads per process." << std::endl;
   }
 
   // Init the array for used for arbitrarily sized atomics
   Impl::init_lock_array_host_space();
 
-  Impl::SharedAllocationRecord< void, void >::tracking_enable();
+  Impl::SharedAllocationRecord<void, void>::tracking_enable();
 
-  #if defined(KOKKOS_ENABLE_DEPRECATED_CODE) && defined(KOKKOS_ENABLE_PROFILING)
-    Kokkos::Profiling::initialize();
-  #endif
+#if defined(KOKKOS_ENABLE_DEPRECATED_CODE) && defined(KOKKOS_ENABLE_PROFILING)
+  Kokkos::Profiling::initialize();
+#endif
 }
 
 //----------------------------------------------------------------------------
 
-void ThreadsExec::finalize()
-{
-  verify_is_process("ThreadsExec::finalize",false);
+void ThreadsExec::finalize() {
+  verify_is_process("ThreadsExec::finalize", false);
 
   fence();
 
-  resize_scratch(0,0);
+  resize_scratch(0, 0);
 
-  const unsigned begin = s_threads_process.m_pool_base ? 1 : 0 ;
+  const unsigned begin = s_threads_process.m_pool_base ? 1 : 0;
 
-  for ( unsigned i = s_thread_pool_size[0] ; begin < i-- ; ) {
+  for (unsigned i = s_thread_pool_size[0]; begin < i--;) {
+    if (s_threads_exec[i]) {
+      s_threads_exec[i]->m_pool_state = ThreadsExec::Terminating;
 
-    if ( s_threads_exec[i] ) {
+      wait_yield(s_threads_process.m_pool_state, ThreadsExec::Inactive);
 
-      s_threads_exec[i]->m_pool_state = ThreadsExec::Terminating ;
-
-      wait_yield( s_threads_process.m_pool_state , ThreadsExec::Inactive );
-
-      s_threads_process.m_pool_state = ThreadsExec::Inactive ;
+      s_threads_process.m_pool_state = ThreadsExec::Inactive;
     }
 
-    s_threads_pid[i] = 0 ;
+    s_threads_pid[i] = 0;
   }
 
-  if ( s_threads_process.m_pool_base ) {
-    ( & s_threads_process )->~ThreadsExec();
-    s_threads_exec[0] = 0 ;
+  if (s_threads_process.m_pool_base) {
+    (&s_threads_process)->~ThreadsExec();
+    s_threads_exec[0] = 0;
   }
 
-  if (Kokkos::hwloc::can_bind_threads() ) {
+  if (Kokkos::hwloc::can_bind_threads()) {
     Kokkos::hwloc::unbind_this_thread();
   }
 
-  s_thread_pool_size[0] = 0 ;
-  s_thread_pool_size[1] = 0 ;
-  s_thread_pool_size[2] = 0 ;
+  s_thread_pool_size[0] = 0;
+  s_thread_pool_size[1] = 0;
+  s_thread_pool_size[2] = 0;
 
   // Reset master thread to run solo.
-  s_threads_process.m_numa_rank       = 0 ;
-  s_threads_process.m_numa_core_rank  = 0 ;
-  s_threads_process.m_pool_base       = 0 ;
-  s_threads_process.m_pool_rank       = 0 ;
-  s_threads_process.m_pool_size       = 1 ;
-  s_threads_process.m_pool_fan_size   = 0 ;
-  s_threads_process.m_pool_state = ThreadsExec::Inactive ;
+  s_threads_process.m_numa_rank      = 0;
+  s_threads_process.m_numa_core_rank = 0;
+  s_threads_process.m_pool_base      = 0;
+  s_threads_process.m_pool_rank      = 0;
+  s_threads_process.m_pool_size      = 1;
+  s_threads_process.m_pool_fan_size  = 0;
+  s_threads_process.m_pool_state     = ThreadsExec::Inactive;
 
-  #if defined(KOKKOS_ENABLE_PROFILING)
-    Kokkos::Profiling::finalize();
-  #endif
+#if defined(KOKKOS_ENABLE_PROFILING)
+  Kokkos::Profiling::finalize();
+#endif
 }
 
 //----------------------------------------------------------------------------
@@ -805,30 +783,29 @@ int Threads::concurrency() {
 #endif
 }
 #ifndef KOKKOS_ENABLE_DEPRECATED_CODE
-void Threads::fence() const
-{ Impl::ThreadsExec::fence() ; }
+void Threads::fence() const { Impl::ThreadsExec::fence(); }
 #endif
 
 #ifdef KOKKOS_ENABLE_DEPRECATED_CODE
-Threads & Threads::instance(int)
+Threads &Threads::instance(int)
 #else
-Threads & Threads::impl_instance(int)
+Threads &Threads::impl_instance(int)
 #endif
 {
-  static Threads t ;
-  return t ;
+  static Threads t;
+  return t;
 }
 
 #ifdef KOKKOS_ENABLE_DEPRECATED_CODE
-int Threads::thread_pool_size( int depth )
+int Threads::thread_pool_size(int depth)
 #else
-int Threads::impl_thread_pool_size( int depth )
+int Threads::impl_thread_pool_size(int depth)
 #endif
 {
   return Impl::s_thread_pool_size[depth];
 }
 
-#if defined( KOKKOS_ACTIVE_EXECUTION_MEMORY_SPACE_HOST )
+#if defined(KOKKOS_ACTIVE_EXECUTION_MEMORY_SPACE_HOST)
 #ifdef KOKKOS_ENABLE_DEPRECATED_CODE
 int Threads::thread_pool_rank()
 #else
@@ -836,13 +813,15 @@ int Threads::impl_thread_pool_rank()
 #endif
 {
   const pthread_t pid = pthread_self();
-  int i = 0;
-  while ( ( i < Impl::s_thread_pool_size[0] ) && ( pid != Impl::s_threads_pid[i] ) ) { ++i ; }
-  return i ;
+  int i               = 0;
+  while ((i < Impl::s_thread_pool_size[0]) && (pid != Impl::s_threads_pid[i])) {
+    ++i;
+  }
+  return i;
 }
 #endif
 
-const char* Threads::name() { return "Threads"; }
+const char *Threads::name() { return "Threads"; }
 } /* namespace Kokkos */
 
 //----------------------------------------------------------------------------
@@ -850,4 +829,3 @@ const char* Threads::name() { return "Threads"; }
 #else
 void KOKKOS_CORE_SRC_THREADS_EXEC_PREVENT_LINK_ERROR() {}
 #endif /* #if defined( KOKKOS_ENABLE_THREADS ) */
-
diff --git a/lib/kokkos/core/src/Threads/Kokkos_ThreadsExec.hpp b/lib/kokkos/core/src/Threads/Kokkos_ThreadsExec.hpp
index 7af9d9e065..1b11f45b72 100644
--- a/lib/kokkos/core/src/Threads/Kokkos_ThreadsExec.hpp
+++ b/lib/kokkos/core/src/Threads/Kokkos_ThreadsExec.hpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -45,7 +46,7 @@
 #define KOKKOS_THREADSEXEC_HPP
 
 #include <Kokkos_Macros.hpp>
-#if defined( KOKKOS_ENABLE_THREADS )
+#if defined(KOKKOS_ENABLE_THREADS)
 
 #include <cstdio>
 
@@ -62,52 +63,55 @@ namespace Kokkos {
 namespace Impl {
 
 class ThreadsExec {
-public:
-
+ public:
   // Fan array has log_2(NT) reduction threads plus 2 scan threads
   // Currently limited to 16k threads.
-  enum { MAX_FAN_COUNT    = 16 };
-  enum { MAX_THREAD_COUNT = 1 << ( MAX_FAN_COUNT - 2 ) };
-  enum { VECTOR_LENGTH    = 8 };
+  enum { MAX_FAN_COUNT = 16 };
+  enum { MAX_THREAD_COUNT = 1 << (MAX_FAN_COUNT - 2) };
+  enum { VECTOR_LENGTH = 8 };
 
   /** \brief States of a worker thread */
-  enum { Terminating ///<  Termination in progress
-       , Inactive    ///<  Exists, waiting for work
-       , Active      ///<  Exists, performing work
-       , Rendezvous  ///<  Exists, waiting in a barrier or reduce
+  enum {
+    Terminating  ///<  Termination in progress
+    ,
+    Inactive  ///<  Exists, waiting for work
+    ,
+    Active  ///<  Exists, performing work
+    ,
+    Rendezvous  ///<  Exists, waiting in a barrier or reduce
 
-       , ScanCompleted
-       , ScanAvailable
-       , ReductionAvailable
-       };
+    ,
+    ScanCompleted,
+    ScanAvailable,
+    ReductionAvailable
+  };
 
-private:
-
-  friend class Kokkos::Threads ;
+ private:
+  friend class Kokkos::Threads;
 
   // Fan-in operations' root is the highest ranking thread
   // to place the 'scan' reduction intermediate values on
   // the threads that need them.
   // For a simple reduction the thread location is arbitrary.
 
-  ThreadsExec * const * m_pool_base ; ///< Base for pool fan-in
+  ThreadsExec *const *m_pool_base;  ///< Base for pool fan-in
 
-  void *        m_scratch ;
-  int           m_scratch_reduce_end ;
-  int           m_scratch_thread_end ;
-  int           m_numa_rank ;
-  int           m_numa_core_rank ;
-  int           m_pool_rank ;
-  int           m_pool_rank_rev ;
-  int           m_pool_size ;
-  int           m_pool_fan_size ;
-  int volatile  m_pool_state ;  ///< State for global synchronizations
+  void *m_scratch;
+  int m_scratch_reduce_end;
+  int m_scratch_thread_end;
+  int m_numa_rank;
+  int m_numa_core_rank;
+  int m_pool_rank;
+  int m_pool_rank_rev;
+  int m_pool_size;
+  int m_pool_fan_size;
+  int volatile m_pool_state;  ///< State for global synchronizations
 
   // Members for dynamic scheduling
   // Which thread am I stealing from currently
   int m_current_steal_target;
   // This thread's owned work_range
-  Kokkos::pair<long,long> m_work_range __attribute__((aligned(16))) ;
+  Kokkos::pair<long, long> m_work_range __attribute__((aligned(16)));
   // Team Offset if one thread determines work_range for others
   long m_team_work_index;
 
@@ -118,471 +122,477 @@ private:
   static void global_unlock();
   static bool spawn();
 
-  static void execute_resize_scratch( ThreadsExec & , const void * );
-  static void execute_sleep(          ThreadsExec & , const void * );
+  static void execute_resize_scratch(ThreadsExec &, const void *);
+  static void execute_sleep(ThreadsExec &, const void *);
 
-  ThreadsExec( const ThreadsExec & );
-  ThreadsExec & operator = ( const ThreadsExec & );
+  ThreadsExec(const ThreadsExec &);
+  ThreadsExec &operator=(const ThreadsExec &);
 
-  static void execute_serial( void (*)( ThreadsExec & , const void * ) );
+  static void execute_serial(void (*)(ThreadsExec &, const void *));
 
-public:
-
-  KOKKOS_INLINE_FUNCTION int pool_size() const { return m_pool_size ; }
-  KOKKOS_INLINE_FUNCTION int pool_rank() const { return m_pool_rank ; }
-  KOKKOS_INLINE_FUNCTION int numa_rank() const { return m_numa_rank ; }
-  KOKKOS_INLINE_FUNCTION int numa_core_rank() const { return m_numa_core_rank ; }
-  inline long team_work_index() const { return m_team_work_index ; }
+ public:
+  KOKKOS_INLINE_FUNCTION int pool_size() const { return m_pool_size; }
+  KOKKOS_INLINE_FUNCTION int pool_rank() const { return m_pool_rank; }
+  KOKKOS_INLINE_FUNCTION int numa_rank() const { return m_numa_rank; }
+  KOKKOS_INLINE_FUNCTION int numa_core_rank() const { return m_numa_core_rank; }
+  inline long team_work_index() const { return m_team_work_index; }
 
   static int get_thread_count();
-  static ThreadsExec * get_thread( const int init_thread_rank );
+  static ThreadsExec *get_thread(const int init_thread_rank);
 
-  inline void * reduce_memory() const { return m_scratch ; }
-  KOKKOS_INLINE_FUNCTION  void * scratch_memory() const
-    { return reinterpret_cast<unsigned char *>(m_scratch) + m_scratch_reduce_end ; }
+  inline void *reduce_memory() const { return m_scratch; }
+  KOKKOS_INLINE_FUNCTION void *scratch_memory() const {
+    return reinterpret_cast<unsigned char *>(m_scratch) + m_scratch_reduce_end;
+  }
 
-  KOKKOS_INLINE_FUNCTION  int volatile & state() { return m_pool_state ; }
-  KOKKOS_INLINE_FUNCTION  ThreadsExec * const * pool_base() const { return m_pool_base ; }
+  KOKKOS_INLINE_FUNCTION int volatile &state() { return m_pool_state; }
+  KOKKOS_INLINE_FUNCTION ThreadsExec *const *pool_base() const {
+    return m_pool_base;
+  }
 
   static void driver(void);
 
   ~ThreadsExec();
   ThreadsExec();
 
-  static void * resize_scratch( size_t reduce_size , size_t thread_size );
+  static void *resize_scratch(size_t reduce_size, size_t thread_size);
 
-  static void * root_reduce_scratch();
+  static void *root_reduce_scratch();
 
   static bool is_process();
 
-  static void verify_is_process( const std::string & , const bool initialized );
+  static void verify_is_process(const std::string &, const bool initialized);
 
   static int is_initialized();
 
-  static void initialize( unsigned thread_count ,
-                          unsigned use_numa_count ,
-                          unsigned use_cores_per_numa ,
-                          bool allow_asynchronous_threadpool );
+  static void initialize(unsigned thread_count, unsigned use_numa_count,
+                         unsigned use_cores_per_numa,
+                         bool allow_asynchronous_threadpool);
 
   static void finalize();
 
   /* Given a requested team size, return valid team size */
-  static unsigned team_size_valid( unsigned );
+  static unsigned team_size_valid(unsigned);
 
-  static void print_configuration( std::ostream & , const bool detail = false );
+  static void print_configuration(std::ostream &, const bool detail = false);
 
   //------------------------------------
 
-  static void wait_yield( volatile int & , const int );
+  static void wait_yield(volatile int &, const int);
 
   //------------------------------------
   // All-thread functions:
 
-  inline
-  int all_reduce( const int value )
-    {
-      // Make sure there is enough scratch space:
-      const int rev_rank = m_pool_size - ( m_pool_rank + 1 );
+  inline int all_reduce(const int value) {
+    // Make sure there is enough scratch space:
+    const int rev_rank = m_pool_size - (m_pool_rank + 1);
 
-      *((volatile int*) reduce_memory()) = value ;
+    *((volatile int *)reduce_memory()) = value;
+
+    memory_fence();
+
+    // Fan-in reduction with highest ranking thread as the root
+    for (int i = 0; i < m_pool_fan_size; ++i) {
+      // Wait: Active -> Rendezvous
+      Impl::spinwait_while_equal<int>(
+          m_pool_base[rev_rank + (1 << i)]->m_pool_state, ThreadsExec::Active);
+    }
+
+    if (rev_rank) {
+      m_pool_state = ThreadsExec::Rendezvous;
+      // Wait: Rendezvous -> Active
+      Impl::spinwait_while_equal<int>(m_pool_state, ThreadsExec::Rendezvous);
+    } else {
+      // Root thread does the reduction and broadcast
+
+      int accum = 0;
+
+      for (int rank = 0; rank < m_pool_size; ++rank) {
+        accum += *((volatile int *)get_thread(rank)->reduce_memory());
+      }
+
+      for (int rank = 0; rank < m_pool_size; ++rank) {
+        *((volatile int *)get_thread(rank)->reduce_memory()) = accum;
+      }
 
       memory_fence();
 
-      // Fan-in reduction with highest ranking thread as the root
-      for ( int i = 0 ; i < m_pool_fan_size ; ++i ) {
-        // Wait: Active -> Rendezvous
-        Impl::spinwait_while_equal<int>( m_pool_base[ rev_rank + (1<<i) ]->m_pool_state , ThreadsExec::Active );
+      for (int rank = 0; rank < m_pool_size; ++rank) {
+        get_thread(rank)->m_pool_state = ThreadsExec::Active;
       }
-
-      if ( rev_rank ) {
-        m_pool_state = ThreadsExec::Rendezvous ;
-        // Wait: Rendezvous -> Active
-        Impl::spinwait_while_equal<int>( m_pool_state , ThreadsExec::Rendezvous );
-      }
-      else {
-        // Root thread does the reduction and broadcast
-
-        int accum = 0 ;
-
-        for ( int rank = 0 ; rank < m_pool_size ; ++rank ) {
-          accum += *((volatile int *) get_thread( rank )->reduce_memory());
-        }
-
-        for ( int rank = 0 ; rank < m_pool_size ; ++rank ) {
-          *((volatile int *) get_thread( rank )->reduce_memory()) = accum ;
-        }
-
-        memory_fence();
-
-        for ( int rank = 0 ; rank < m_pool_size ; ++rank ) {
-          get_thread( rank )->m_pool_state = ThreadsExec::Active ;
-        }
-      }
-
-      return *((volatile int*) reduce_memory());
     }
 
-  inline
-  void barrier( )
-    {
-      // Make sure there is enough scratch space:
-      const int rev_rank = m_pool_size - ( m_pool_rank + 1 );
+    return *((volatile int *)reduce_memory());
+  }
+
+  inline void barrier() {
+    // Make sure there is enough scratch space:
+    const int rev_rank = m_pool_size - (m_pool_rank + 1);
+
+    memory_fence();
+
+    // Fan-in reduction with highest ranking thread as the root
+    for (int i = 0; i < m_pool_fan_size; ++i) {
+      // Wait: Active -> Rendezvous
+      Impl::spinwait_while_equal<int>(
+          m_pool_base[rev_rank + (1 << i)]->m_pool_state, ThreadsExec::Active);
+    }
+
+    if (rev_rank) {
+      m_pool_state = ThreadsExec::Rendezvous;
+      // Wait: Rendezvous -> Active
+      Impl::spinwait_while_equal<int>(m_pool_state, ThreadsExec::Rendezvous);
+    } else {
+      // Root thread does the reduction and broadcast
 
       memory_fence();
 
-      // Fan-in reduction with highest ranking thread as the root
-      for ( int i = 0 ; i < m_pool_fan_size ; ++i ) {
-        // Wait: Active -> Rendezvous
-        Impl::spinwait_while_equal<int>( m_pool_base[ rev_rank + (1<<i) ]->m_pool_state , ThreadsExec::Active );
-      }
-
-      if ( rev_rank ) {
-        m_pool_state = ThreadsExec::Rendezvous ;
-        // Wait: Rendezvous -> Active
-        Impl::spinwait_while_equal<int>( m_pool_state , ThreadsExec::Rendezvous );
-      }
-      else {
-        // Root thread does the reduction and broadcast
-
-        memory_fence();
-
-        for ( int rank = 0 ; rank < m_pool_size ; ++rank ) {
-          get_thread( rank )->m_pool_state = ThreadsExec::Active ;
-        }
+      for (int rank = 0; rank < m_pool_size; ++rank) {
+        get_thread(rank)->m_pool_state = ThreadsExec::Active;
       }
     }
+  }
 
   //------------------------------------
   // All-thread functions:
 
-  template< class FunctorType , class ArgTag >
-  inline
-  void fan_in_reduce( const FunctorType & f ) const
-    {
-      typedef Kokkos::Impl::FunctorValueJoin< FunctorType , ArgTag > Join ;
-      typedef Kokkos::Impl::FunctorFinal<     FunctorType , ArgTag > Final ;
+  template <class FunctorType, class ArgTag>
+  inline void fan_in_reduce(const FunctorType &f) const {
+    typedef Kokkos::Impl::FunctorValueJoin<FunctorType, ArgTag> Join;
+    typedef Kokkos::Impl::FunctorFinal<FunctorType, ArgTag> Final;
 
-      const int rev_rank  = m_pool_size - ( m_pool_rank + 1 );
+    const int rev_rank = m_pool_size - (m_pool_rank + 1);
 
-      for ( int i = 0 ; i < m_pool_fan_size ; ++i ) {
+    for (int i = 0; i < m_pool_fan_size; ++i) {
+      ThreadsExec &fan = *m_pool_base[rev_rank + (1 << i)];
 
-        ThreadsExec & fan = *m_pool_base[ rev_rank + ( 1 << i ) ] ;
+      Impl::spinwait_while_equal<int>(fan.m_pool_state, ThreadsExec::Active);
 
-        Impl::spinwait_while_equal<int>( fan.m_pool_state , ThreadsExec::Active );
-
-        Join::join( f , reduce_memory() , fan.reduce_memory() );
-      }
-
-      if ( ! rev_rank ) {
-        Final::final( f , reduce_memory() );
-      }
-
-      //  This thread has updated 'reduce_memory()' and upon returning
-      //  from this function will set 'm_pool_state' to inactive.
-      //  If this is a non-root thread then setting 'm_pool_state'
-      //  to inactive triggers another thread to exit a spinwait
-      //  and read the 'reduce_memory'.
-      //  Must 'memory_fence()' to guarantee that storing the update to
-      //  'reduce_memory()' will complete before storing the the update to
-      //  'm_pool_state'.
-
-      memory_fence();
+      Join::join(f, reduce_memory(), fan.reduce_memory());
     }
 
-  inline
-  void fan_in() const
-    {
-      const int rev_rank = m_pool_size - ( m_pool_rank + 1 );
-
-      for ( int i = 0 ; i < m_pool_fan_size ; ++i ) {
-        Impl::spinwait_while_equal<int>( m_pool_base[rev_rank+(1<<i)]->m_pool_state , ThreadsExec::Active );
-      }
+    if (!rev_rank) {
+      Final::final(f, reduce_memory());
     }
 
-  template< class FunctorType , class ArgTag >
-  inline
-  void scan_large( const FunctorType & f )
-    {
-      // Sequence of states:
-      //  0) Active             : entry and exit state
-      //  1) ReductionAvailable : reduction value available
-      //  2) ScanAvailable      : inclusive scan value available
-      //  3) Rendezvous         : All threads inclusive scan value are available
-      //  4) ScanCompleted      : exclusive scan value copied
+    //  This thread has updated 'reduce_memory()' and upon returning
+    //  from this function will set 'm_pool_state' to inactive.
+    //  If this is a non-root thread then setting 'm_pool_state'
+    //  to inactive triggers another thread to exit a spinwait
+    //  and read the 'reduce_memory'.
+    //  Must 'memory_fence()' to guarantee that storing the update to
+    //  'reduce_memory()' will complete before storing the the update to
+    //  'm_pool_state'.
 
-      typedef Kokkos::Impl::FunctorValueTraits< FunctorType , ArgTag > Traits ;
-      typedef Kokkos::Impl::FunctorValueJoin<   FunctorType , ArgTag > Join ;
-      typedef Kokkos::Impl::FunctorValueInit<   FunctorType , ArgTag > Init ;
+    memory_fence();
+  }
 
-      typedef typename Traits::value_type scalar_type ;
+  inline void fan_in() const {
+    const int rev_rank = m_pool_size - (m_pool_rank + 1);
 
-      const int      rev_rank = m_pool_size - ( m_pool_rank + 1 );
-      const unsigned count    = Traits::value_count( f );
+    for (int i = 0; i < m_pool_fan_size; ++i) {
+      Impl::spinwait_while_equal<int>(
+          m_pool_base[rev_rank + (1 << i)]->m_pool_state, ThreadsExec::Active);
+    }
+  }
 
-      scalar_type * const work_value = (scalar_type *) reduce_memory();
+  template <class FunctorType, class ArgTag>
+  inline void scan_large(const FunctorType &f) {
+    // Sequence of states:
+    //  0) Active             : entry and exit state
+    //  1) ReductionAvailable : reduction value available
+    //  2) ScanAvailable      : inclusive scan value available
+    //  3) Rendezvous         : All threads inclusive scan value are available
+    //  4) ScanCompleted      : exclusive scan value copied
 
-      //--------------------------------
-      // Fan-in reduction with highest ranking thread as the root
-      for ( int i = 0 ; i < m_pool_fan_size ; ++i ) {
-        ThreadsExec & fan = *m_pool_base[ rev_rank + (1<<i) ];
+    typedef Kokkos::Impl::FunctorValueTraits<FunctorType, ArgTag> Traits;
+    typedef Kokkos::Impl::FunctorValueJoin<FunctorType, ArgTag> Join;
+    typedef Kokkos::Impl::FunctorValueInit<FunctorType, ArgTag> Init;
 
-        // Wait: Active -> ReductionAvailable (or ScanAvailable)
-        Impl::spinwait_while_equal<int>( fan.m_pool_state , ThreadsExec::Active );
-        Join::join( f , work_value , fan.reduce_memory() );
-      }
+    typedef typename Traits::value_type scalar_type;
 
-      // Copy reduction value to scan value before releasing from this phase.
-      for ( unsigned i = 0 ; i < count ; ++i ) { work_value[i+count] = work_value[i] ; }
+    const int rev_rank   = m_pool_size - (m_pool_rank + 1);
+    const unsigned count = Traits::value_count(f);
 
-      if ( rev_rank ) {
+    scalar_type *const work_value = (scalar_type *)reduce_memory();
 
-        // Set: Active -> ReductionAvailable
-        m_pool_state = ThreadsExec::ReductionAvailable ;
+    //--------------------------------
+    // Fan-in reduction with highest ranking thread as the root
+    for (int i = 0; i < m_pool_fan_size; ++i) {
+      ThreadsExec &fan = *m_pool_base[rev_rank + (1 << i)];
 
-        // Wait for contributing threads' scan value to be available.
-        if ( ( 1 << m_pool_fan_size ) < ( m_pool_rank + 1 ) ) {
-          ThreadsExec & th = *m_pool_base[ rev_rank + ( 1 << m_pool_fan_size ) ] ;
+      // Wait: Active -> ReductionAvailable (or ScanAvailable)
+      Impl::spinwait_while_equal<int>(fan.m_pool_state, ThreadsExec::Active);
+      Join::join(f, work_value, fan.reduce_memory());
+    }
 
-          // Wait: Active             -> ReductionAvailable
-          // Wait: ReductionAvailable -> ScanAvailable
-          Impl::spinwait_while_equal<int>( th.m_pool_state , ThreadsExec::Active );
-          Impl::spinwait_while_equal<int>( th.m_pool_state , ThreadsExec::ReductionAvailable );
+    // Copy reduction value to scan value before releasing from this phase.
+    for (unsigned i = 0; i < count; ++i) {
+      work_value[i + count] = work_value[i];
+    }
 
-          Join::join( f , work_value + count , ((scalar_type *)th.reduce_memory()) + count );
-        }
+    if (rev_rank) {
+      // Set: Active -> ReductionAvailable
+      m_pool_state = ThreadsExec::ReductionAvailable;
 
-        // This thread has completed inclusive scan
-        // Set: ReductionAvailable -> ScanAvailable
-        m_pool_state = ThreadsExec::ScanAvailable ;
+      // Wait for contributing threads' scan value to be available.
+      if ((1 << m_pool_fan_size) < (m_pool_rank + 1)) {
+        ThreadsExec &th = *m_pool_base[rev_rank + (1 << m_pool_fan_size)];
 
-        // Wait for all threads to complete inclusive scan
-        // Wait: ScanAvailable -> Rendezvous
-        Impl::spinwait_while_equal<int>( m_pool_state , ThreadsExec::ScanAvailable );
-      }
-
-      //--------------------------------
-
-      for ( int i = 0 ; i < m_pool_fan_size ; ++i ) {
-        ThreadsExec & fan = *m_pool_base[ rev_rank + (1<<i) ];
+        // Wait: Active             -> ReductionAvailable
         // Wait: ReductionAvailable -> ScanAvailable
-        Impl::spinwait_while_equal<int>( fan.m_pool_state , ThreadsExec::ReductionAvailable );
-        // Set: ScanAvailable -> Rendezvous
-        fan.m_pool_state = ThreadsExec::Rendezvous ;
+        Impl::spinwait_while_equal<int>(th.m_pool_state, ThreadsExec::Active);
+        Impl::spinwait_while_equal<int>(th.m_pool_state,
+                                        ThreadsExec::ReductionAvailable);
+
+        Join::join(f, work_value + count,
+                   ((scalar_type *)th.reduce_memory()) + count);
       }
 
-      // All threads have completed the inclusive scan.
-      // All non-root threads are in the Rendezvous state.
-      // Threads are free to overwrite their reduction value.
-      //--------------------------------
+      // This thread has completed inclusive scan
+      // Set: ReductionAvailable -> ScanAvailable
+      m_pool_state = ThreadsExec::ScanAvailable;
 
-      if ( ( rev_rank + 1 ) < m_pool_size ) {
-        // Exclusive scan: copy the previous thread's inclusive scan value
-
-        ThreadsExec & th = *m_pool_base[ rev_rank + 1 ] ; // Not the root thread
-
-        const scalar_type * const src_value = ((scalar_type *)th.reduce_memory()) + count ;
-
-        for ( unsigned j = 0 ; j < count ; ++j ) { work_value[j] = src_value[j]; }
-      }
-      else {
-        (void) Init::init( f , work_value );
-      }
-
-      //--------------------------------
-      // Wait for all threads to copy previous thread's inclusive scan value
-      // Wait for all threads: Rendezvous -> ScanCompleted
-      for ( int i = 0 ; i < m_pool_fan_size ; ++i ) {
-        Impl::spinwait_while_equal<int>( m_pool_base[ rev_rank + (1<<i) ]->m_pool_state , ThreadsExec::Rendezvous );
-      }
-      if ( rev_rank ) {
-        // Set: ScanAvailable -> ScanCompleted
-        m_pool_state = ThreadsExec::ScanCompleted ;
-        // Wait: ScanCompleted -> Active
-        Impl::spinwait_while_equal<int>( m_pool_state , ThreadsExec::ScanCompleted );
-      }
-      // Set: ScanCompleted -> Active
-      for ( int i = 0 ; i < m_pool_fan_size ; ++i ) {
-        m_pool_base[ rev_rank + (1<<i) ]->m_pool_state = ThreadsExec::Active ;
-      }
+      // Wait for all threads to complete inclusive scan
+      // Wait: ScanAvailable -> Rendezvous
+      Impl::spinwait_while_equal<int>(m_pool_state, ThreadsExec::ScanAvailable);
     }
 
-  template< class FunctorType , class ArgTag >
-  inline
-  void scan_small( const FunctorType & f )
-    {
-      typedef Kokkos::Impl::FunctorValueTraits< FunctorType , ArgTag > Traits ;
-      typedef Kokkos::Impl::FunctorValueJoin<   FunctorType , ArgTag > Join ;
-      typedef Kokkos::Impl::FunctorValueInit<   FunctorType , ArgTag > Init ;
+    //--------------------------------
 
-      typedef typename Traits::value_type scalar_type ;
+    for (int i = 0; i < m_pool_fan_size; ++i) {
+      ThreadsExec &fan = *m_pool_base[rev_rank + (1 << i)];
+      // Wait: ReductionAvailable -> ScanAvailable
+      Impl::spinwait_while_equal<int>(fan.m_pool_state,
+                                      ThreadsExec::ReductionAvailable);
+      // Set: ScanAvailable -> Rendezvous
+      fan.m_pool_state = ThreadsExec::Rendezvous;
+    }
 
-      const int      rev_rank = m_pool_size - ( m_pool_rank + 1 );
-      const unsigned count    = Traits::value_count( f );
+    // All threads have completed the inclusive scan.
+    // All non-root threads are in the Rendezvous state.
+    // Threads are free to overwrite their reduction value.
+    //--------------------------------
 
-      scalar_type * const work_value = (scalar_type *) reduce_memory();
+    if ((rev_rank + 1) < m_pool_size) {
+      // Exclusive scan: copy the previous thread's inclusive scan value
 
-      //--------------------------------
-      // Fan-in reduction with highest ranking thread as the root
-      for ( int i = 0 ; i < m_pool_fan_size ; ++i ) {
-        // Wait: Active -> Rendezvous
-        Impl::spinwait_while_equal<int>( m_pool_base[ rev_rank + (1<<i) ]->m_pool_state , ThreadsExec::Active );
+      ThreadsExec &th = *m_pool_base[rev_rank + 1];  // Not the root thread
+
+      const scalar_type *const src_value =
+          ((scalar_type *)th.reduce_memory()) + count;
+
+      for (unsigned j = 0; j < count; ++j) {
+        work_value[j] = src_value[j];
       }
+    } else {
+      (void)Init::init(f, work_value);
+    }
 
-      for ( unsigned i = 0 ; i < count ; ++i ) { work_value[i+count] = work_value[i]; }
+    //--------------------------------
+    // Wait for all threads to copy previous thread's inclusive scan value
+    // Wait for all threads: Rendezvous -> ScanCompleted
+    for (int i = 0; i < m_pool_fan_size; ++i) {
+      Impl::spinwait_while_equal<int>(
+          m_pool_base[rev_rank + (1 << i)]->m_pool_state,
+          ThreadsExec::Rendezvous);
+    }
+    if (rev_rank) {
+      // Set: ScanAvailable -> ScanCompleted
+      m_pool_state = ThreadsExec::ScanCompleted;
+      // Wait: ScanCompleted -> Active
+      Impl::spinwait_while_equal<int>(m_pool_state, ThreadsExec::ScanCompleted);
+    }
+    // Set: ScanCompleted -> Active
+    for (int i = 0; i < m_pool_fan_size; ++i) {
+      m_pool_base[rev_rank + (1 << i)]->m_pool_state = ThreadsExec::Active;
+    }
+  }
 
-      if ( rev_rank ) {
-        m_pool_state = ThreadsExec::Rendezvous ;
-        // Wait: Rendezvous -> Active
-        Impl::spinwait_while_equal<int>( m_pool_state , ThreadsExec::Rendezvous );
-      }
-      else {
-        // Root thread does the thread-scan before releasing threads
+  template <class FunctorType, class ArgTag>
+  inline void scan_small(const FunctorType &f) {
+    typedef Kokkos::Impl::FunctorValueTraits<FunctorType, ArgTag> Traits;
+    typedef Kokkos::Impl::FunctorValueJoin<FunctorType, ArgTag> Join;
+    typedef Kokkos::Impl::FunctorValueInit<FunctorType, ArgTag> Init;
 
-        scalar_type * ptr_prev = 0 ;
+    typedef typename Traits::value_type scalar_type;
 
-        for ( int rank = 0 ; rank < m_pool_size ; ++rank ) {
-          scalar_type * const ptr = (scalar_type *) get_thread( rank )->reduce_memory();
-          if ( rank ) {
-            for ( unsigned i = 0 ; i < count ; ++i ) { ptr[i] = ptr_prev[ i + count ]; }
-            Join::join( f , ptr + count , ptr );
+    const int rev_rank   = m_pool_size - (m_pool_rank + 1);
+    const unsigned count = Traits::value_count(f);
+
+    scalar_type *const work_value = (scalar_type *)reduce_memory();
+
+    //--------------------------------
+    // Fan-in reduction with highest ranking thread as the root
+    for (int i = 0; i < m_pool_fan_size; ++i) {
+      // Wait: Active -> Rendezvous
+      Impl::spinwait_while_equal<int>(
+          m_pool_base[rev_rank + (1 << i)]->m_pool_state, ThreadsExec::Active);
+    }
+
+    for (unsigned i = 0; i < count; ++i) {
+      work_value[i + count] = work_value[i];
+    }
+
+    if (rev_rank) {
+      m_pool_state = ThreadsExec::Rendezvous;
+      // Wait: Rendezvous -> Active
+      Impl::spinwait_while_equal<int>(m_pool_state, ThreadsExec::Rendezvous);
+    } else {
+      // Root thread does the thread-scan before releasing threads
+
+      scalar_type *ptr_prev = 0;
+
+      for (int rank = 0; rank < m_pool_size; ++rank) {
+        scalar_type *const ptr =
+            (scalar_type *)get_thread(rank)->reduce_memory();
+        if (rank) {
+          for (unsigned i = 0; i < count; ++i) {
+            ptr[i] = ptr_prev[i + count];
           }
-          else {
-            (void) Init::init( f , ptr );
-          }
-          ptr_prev = ptr ;
+          Join::join(f, ptr + count, ptr);
+        } else {
+          (void)Init::init(f, ptr);
         }
-      }
-
-      for ( int i = 0 ; i < m_pool_fan_size ; ++i ) {
-        m_pool_base[ rev_rank + (1<<i) ]->m_pool_state = ThreadsExec::Active ;
+        ptr_prev = ptr;
       }
     }
 
+    for (int i = 0; i < m_pool_fan_size; ++i) {
+      m_pool_base[rev_rank + (1 << i)]->m_pool_state = ThreadsExec::Active;
+    }
+  }
+
   //------------------------------------
   /** \brief  Wait for previous asynchronous functor to
    *          complete and release the Threads device.
    *          Acquire the Threads device and start this functor.
    */
-  static void start( void (*)( ThreadsExec & , const void * ) , const void * );
+  static void start(void (*)(ThreadsExec &, const void *), const void *);
 
-  static int  in_parallel();
+  static int in_parallel();
   static void fence();
   static bool sleep();
   static bool wake();
 
   /* Dynamic Scheduling related functionality */
   // Initialize the work range for this thread
-  inline void set_work_range(const long& begin, const long& end, const long& chunk_size) {
-    m_work_range.first = (begin+chunk_size-1)/chunk_size;
-    m_work_range.second = end>0?(end+chunk_size-1)/chunk_size:m_work_range.first;
+  inline void set_work_range(const long &begin, const long &end,
+                             const long &chunk_size) {
+    m_work_range.first = (begin + chunk_size - 1) / chunk_size;
+    m_work_range.second =
+        end > 0 ? (end + chunk_size - 1) / chunk_size : m_work_range.first;
   }
 
   // Claim and index from this thread's range from the beginning
-  inline long get_work_index_begin () {
-    Kokkos::pair<long,long> work_range_new = m_work_range;
-    Kokkos::pair<long,long> work_range_old = work_range_new;
-    if(work_range_old.first>=work_range_old.second)
-      return -1;
+  inline long get_work_index_begin() {
+    Kokkos::pair<long, long> work_range_new = m_work_range;
+    Kokkos::pair<long, long> work_range_old = work_range_new;
+    if (work_range_old.first >= work_range_old.second) return -1;
 
-    work_range_new.first+=1;
+    work_range_new.first += 1;
 
     bool success = false;
-    while(!success) {
-      work_range_new = Kokkos::atomic_compare_exchange(&m_work_range,work_range_old,work_range_new);
-      success = ( (work_range_new == work_range_old) ||
-                  (work_range_new.first>=work_range_new.second));
+    while (!success) {
+      work_range_new = Kokkos::atomic_compare_exchange(
+          &m_work_range, work_range_old, work_range_new);
+      success        = ((work_range_new == work_range_old) ||
+                 (work_range_new.first >= work_range_new.second));
       work_range_old = work_range_new;
-      work_range_new.first+=1;
+      work_range_new.first += 1;
     }
-    if(work_range_old.first<work_range_old.second)
+    if (work_range_old.first < work_range_old.second)
       return work_range_old.first;
     else
       return -1;
   }
 
   // Claim and index from this thread's range from the end
-  inline long get_work_index_end () {
-    Kokkos::pair<long,long> work_range_new = m_work_range;
-    Kokkos::pair<long,long> work_range_old = work_range_new;
-    if(work_range_old.first>=work_range_old.second)
-      return -1;
-    work_range_new.second-=1;
+  inline long get_work_index_end() {
+    Kokkos::pair<long, long> work_range_new = m_work_range;
+    Kokkos::pair<long, long> work_range_old = work_range_new;
+    if (work_range_old.first >= work_range_old.second) return -1;
+    work_range_new.second -= 1;
     bool success = false;
-    while(!success) {
-      work_range_new = Kokkos::atomic_compare_exchange(&m_work_range,work_range_old,work_range_new);
-      success = ( (work_range_new == work_range_old) ||
-                  (work_range_new.first>=work_range_new.second) );
+    while (!success) {
+      work_range_new = Kokkos::atomic_compare_exchange(
+          &m_work_range, work_range_old, work_range_new);
+      success        = ((work_range_new == work_range_old) ||
+                 (work_range_new.first >= work_range_new.second));
       work_range_old = work_range_new;
-      work_range_new.second-=1;
+      work_range_new.second -= 1;
     }
-    if(work_range_old.first<work_range_old.second)
-      return work_range_old.second-1;
+    if (work_range_old.first < work_range_old.second)
+      return work_range_old.second - 1;
     else
       return -1;
   }
 
   // Reset the steal target
   inline void reset_steal_target() {
-    m_current_steal_target = (m_pool_rank+1)%pool_size();
-    m_stealing = false;
+    m_current_steal_target = (m_pool_rank + 1) % pool_size();
+    m_stealing             = false;
   }
 
   // Reset the steal target
   inline void reset_steal_target(int team_size) {
-    m_current_steal_target = (m_pool_rank_rev+team_size);
-    if(m_current_steal_target>=pool_size())
-      m_current_steal_target = 0;//pool_size()-1;
+    m_current_steal_target = (m_pool_rank_rev + team_size);
+    if (m_current_steal_target >= pool_size())
+      m_current_steal_target = 0;  // pool_size()-1;
     m_stealing = false;
   }
 
-  // Get a steal target; start with my-rank + 1 and go round robin, until arriving at this threads rank
-  // Returns -1 fi no active steal target available
+  // Get a steal target; start with my-rank + 1 and go round robin, until
+  // arriving at this threads rank Returns -1 fi no active steal target
+  // available
   inline int get_steal_target() {
-    while(( m_pool_base[m_current_steal_target]->m_work_range.second <=
-            m_pool_base[m_current_steal_target]->m_work_range.first  ) &&
-          (m_current_steal_target!=m_pool_rank) ) {
-      m_current_steal_target = (m_current_steal_target+1)%pool_size();
+    while ((m_pool_base[m_current_steal_target]->m_work_range.second <=
+            m_pool_base[m_current_steal_target]->m_work_range.first) &&
+           (m_current_steal_target != m_pool_rank)) {
+      m_current_steal_target = (m_current_steal_target + 1) % pool_size();
     }
-    if(m_current_steal_target == m_pool_rank)
+    if (m_current_steal_target == m_pool_rank)
       return -1;
     else
       return m_current_steal_target;
   }
 
   inline int get_steal_target(int team_size) {
-
-    while(( m_pool_base[m_current_steal_target]->m_work_range.second <=
-            m_pool_base[m_current_steal_target]->m_work_range.first  ) &&
-          (m_current_steal_target!=m_pool_rank_rev) ) {
-      if(m_current_steal_target + team_size < pool_size())
-        m_current_steal_target = (m_current_steal_target+team_size);
+    while ((m_pool_base[m_current_steal_target]->m_work_range.second <=
+            m_pool_base[m_current_steal_target]->m_work_range.first) &&
+           (m_current_steal_target != m_pool_rank_rev)) {
+      if (m_current_steal_target + team_size < pool_size())
+        m_current_steal_target = (m_current_steal_target + team_size);
       else
         m_current_steal_target = 0;
     }
 
-    if(m_current_steal_target == m_pool_rank_rev)
+    if (m_current_steal_target == m_pool_rank_rev)
       return -1;
     else
       return m_current_steal_target;
   }
 
-  inline long steal_work_index (int team_size = 0) {
+  inline long steal_work_index(int team_size = 0) {
     long index = -1;
-    int steal_target = team_size>0?get_steal_target(team_size):get_steal_target();
-    while ( (steal_target != -1) && (index == -1)) {
+    int steal_target =
+        team_size > 0 ? get_steal_target(team_size) : get_steal_target();
+    while ((steal_target != -1) && (index == -1)) {
       index = m_pool_base[steal_target]->get_work_index_end();
-      if(index == -1)
-        steal_target = team_size>0?get_steal_target(team_size):get_steal_target();
+      if (index == -1)
+        steal_target =
+            team_size > 0 ? get_steal_target(team_size) : get_steal_target();
     }
     return index;
   }
 
-  // Get a work index. Claim from owned range until its exhausted, then steal from other thread
-  inline long get_work_index (int team_size = 0) {
+  // Get a work index. Claim from owned range until its exhausted, then steal
+  // from other thread
+  inline long get_work_index(int team_size = 0) {
     long work_index = -1;
-    if(!m_stealing) work_index = get_work_index_begin();
+    if (!m_stealing) work_index = get_work_index_begin();
 
-    if( work_index == -1) {
+    if (work_index == -1) {
       memory_fence();
       m_stealing = true;
       work_index = steal_work_index(team_size);
@@ -592,7 +602,6 @@ public:
     memory_fence();
     return work_index;
   }
-
 };
 
 } /* namespace Impl */
@@ -603,15 +612,16 @@ public:
 
 namespace Kokkos {
 
-inline int Threads::in_parallel()
-{ return Impl::ThreadsExec::in_parallel(); }
+inline int Threads::in_parallel() { return Impl::ThreadsExec::in_parallel(); }
 
 #ifdef KOKKOS_ENABLE_DEPRECATED_CODE
-inline int Threads::is_initialized()
-{ return Impl::ThreadsExec::is_initialized(); }
+inline int Threads::is_initialized() {
+  return Impl::ThreadsExec::is_initialized();
+}
 #else
-inline int Threads::impl_is_initialized()
-{ return Impl::ThreadsExec::is_initialized(); }
+inline int Threads::impl_is_initialized() {
+  return Impl::ThreadsExec::is_initialized();
+}
 #endif
 
 #ifdef KOKKOS_ENABLE_DEPRECATED_CODE
@@ -619,12 +629,11 @@ inline void Threads::initialize(
 #else
 inline void Threads::impl_initialize(
 #endif
-  unsigned threads_count ,
-  unsigned use_numa_count ,
-  unsigned use_cores_per_numa ,
-  bool allow_asynchronous_threadpool )
-{
-  Impl::ThreadsExec::initialize( threads_count , use_numa_count , use_cores_per_numa , allow_asynchronous_threadpool );
+    unsigned threads_count, unsigned use_numa_count,
+    unsigned use_cores_per_numa, bool allow_asynchronous_threadpool) {
+  Impl::ThreadsExec::initialize(threads_count, use_numa_count,
+                                use_cores_per_numa,
+                                allow_asynchronous_threadpool);
 }
 
 #ifdef KOKKOS_ENABLE_DEPRECATED_CODE
@@ -636,24 +645,19 @@ inline void Threads::impl_finalize()
   Impl::ThreadsExec::finalize();
 }
 
-inline void Threads::print_configuration( std::ostream & s , const bool detail )
-{
-  Impl::ThreadsExec::print_configuration( s , detail );
+inline void Threads::print_configuration(std::ostream &s, const bool detail) {
+  Impl::ThreadsExec::print_configuration(s, detail);
 }
 
 #ifdef KOKKOS_ENABLE_DEPRECATED_CODE
-inline bool Threads::sleep()
-{ return Impl::ThreadsExec::sleep() ; }
+inline bool Threads::sleep() { return Impl::ThreadsExec::sleep(); }
 
-inline bool Threads::wake()
-{ return Impl::ThreadsExec::wake() ; }
+inline bool Threads::wake() { return Impl::ThreadsExec::wake(); }
 #endif
 
-inline void Threads::impl_static_fence()
-{ Impl::ThreadsExec::fence() ; }
+inline void Threads::impl_static_fence() { Impl::ThreadsExec::fence(); }
 #ifdef KOKKOS_ENABLE_DEPRECATED_CODE
-inline void Threads::fence()
-{ Impl::ThreadsExec::fence() ; }
+inline void Threads::fence() { Impl::ThreadsExec::fence(); }
 #endif
 
 } /* namespace Kokkos */
@@ -661,76 +665,97 @@ inline void Threads::fence()
 //----------------------------------------------------------------------------
 //----------------------------------------------------------------------------
 
-namespace Kokkos { namespace Experimental {
+namespace Kokkos {
+namespace Experimental {
 
-template<>
-class UniqueToken< Threads, UniqueTokenScope::Instance>
-{
-public:
+template <>
+class UniqueToken<Threads, UniqueTokenScope::Instance> {
+ public:
   using execution_space = Threads;
   using size_type       = int;
 
   /// \brief create object size for concurrency on the given instance
   ///
   /// This object should not be shared between instances
-  UniqueToken( execution_space const& = execution_space() ) noexcept {}
+  UniqueToken(execution_space const & = execution_space()) noexcept {}
 
   /// \brief upper bound for acquired values, i.e. 0 <= value < size()
   inline
 #ifdef KOKKOS_ENABLE_DEPRECATED_CODE
-  int size() const noexcept { return Threads::thread_pool_size(); }
+      int
+      size() const noexcept {
+    return Threads::thread_pool_size();
+  }
 #else
-  int size() const noexcept { return Threads::impl_thread_pool_size(); }
+      int
+      size() const noexcept {
+    return Threads::impl_thread_pool_size();
+  }
 #endif
 
   /// \brief acquire value such that 0 <= value < size()
   inline
 #ifdef KOKKOS_ENABLE_DEPRECATED_CODE
-  int acquire() const  noexcept { return Threads::thread_pool_rank(); }
+      int
+      acquire() const noexcept {
+    return Threads::thread_pool_rank();
+  }
 #else
-  int acquire() const  noexcept { return Threads::impl_thread_pool_rank(); }
+      int
+      acquire() const noexcept {
+    return Threads::impl_thread_pool_rank();
+  }
 #endif
 
   /// \brief release a value acquired by generate
-  inline
-  void release( int ) const noexcept {}
+  inline void release(int) const noexcept {}
 };
 
-template<>
-class UniqueToken< Threads, UniqueTokenScope::Global>
-{
-public:
+template <>
+class UniqueToken<Threads, UniqueTokenScope::Global> {
+ public:
   using execution_space = Threads;
   using size_type       = int;
 
   /// \brief create object size for concurrency on the given instance
   ///
   /// This object should not be shared between instances
-  UniqueToken( execution_space const& = execution_space() ) noexcept {}
+  UniqueToken(execution_space const & = execution_space()) noexcept {}
 
   /// \brief upper bound for acquired values, i.e. 0 <= value < size()
   inline
 #ifdef KOKKOS_ENABLE_DEPRECATED_CODE
-  int size() const noexcept { return Threads::thread_pool_size(); }
+      int
+      size() const noexcept {
+    return Threads::thread_pool_size();
+  }
 #else
-  int size() const noexcept { return Threads::impl_thread_pool_size(); }
+      int
+      size() const noexcept {
+    return Threads::impl_thread_pool_size();
+  }
 #endif
 
   /// \brief acquire value such that 0 <= value < size()
   inline
 #ifdef KOKKOS_ENABLE_DEPRECATED_CODE
-  int acquire() const  noexcept { return Threads::thread_pool_rank(); }
+      int
+      acquire() const noexcept {
+    return Threads::thread_pool_rank();
+  }
 #else
-  int acquire() const  noexcept { return Threads::impl_thread_pool_rank(); }
+      int
+      acquire() const noexcept {
+    return Threads::impl_thread_pool_rank();
+  }
 #endif
   /// \brief release a value acquired by generate
-  inline
-  void release( int ) const noexcept {}
+  inline void release(int) const noexcept {}
 };
 
-}} // namespace Kokkos::Experimental
+}  // namespace Experimental
+}  // namespace Kokkos
 //----------------------------------------------------------------------------
 //----------------------------------------------------------------------------
 #endif
 #endif /* #define KOKKOS_THREADSEXEC_HPP */
-
diff --git a/lib/kokkos/core/src/Threads/Kokkos_ThreadsExec_base.cpp b/lib/kokkos/core/src/Threads/Kokkos_ThreadsExec_base.cpp
index f6443e146d..ed7b884a87 100644
--- a/lib/kokkos/core/src/Threads/Kokkos_ThreadsExec_base.cpp
+++ b/lib/kokkos/core/src/Threads/Kokkos_ThreadsExec_base.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -41,9 +42,8 @@
 //@HEADER
 */
 
-
 #include <Kokkos_Macros.hpp>
-#if defined( KOKKOS_ENABLE_THREADS )
+#if defined(KOKKOS_ENABLE_THREADS)
 
 #include <Kokkos_Core_fwd.hpp>
 /* Standard 'C' Linux libraries */
@@ -52,7 +52,7 @@
 #include <sched.h>
 #include <errno.h>
 
-/* Standard C++ libaries */
+/* Standard C++ libraries */
 
 #include <cstdlib>
 #include <string>
@@ -67,90 +67,84 @@ namespace Kokkos {
 namespace Impl {
 namespace {
 
-pthread_mutex_t host_internal_pthread_mutex = PTHREAD_MUTEX_INITIALIZER ;
+pthread_mutex_t host_internal_pthread_mutex = PTHREAD_MUTEX_INITIALIZER;
 
 // Pthreads compatible driver.
 // Recovery from an exception would require constant intra-thread health
 // verification; which would negatively impact runtime.  As such simply
 // abort the process.
 
-void * internal_pthread_driver( void * )
-{
+void* internal_pthread_driver(void*) {
   try {
     ThreadsExec::driver();
-  }
-  catch( const std::exception & x ) {
-    std::cerr << "Exception thrown from worker thread: " << x.what() << std::endl ;
+  } catch (const std::exception& x) {
+    std::cerr << "Exception thrown from worker thread: " << x.what()
+              << std::endl;
+    std::cerr.flush();
+    std::abort();
+  } catch (...) {
+    std::cerr << "Exception thrown from worker thread" << std::endl;
     std::cerr.flush();
     std::abort();
   }
-  catch( ... ) {
-    std::cerr << "Exception thrown from worker thread" << std::endl ;
-    std::cerr.flush();
-    std::abort();
-  }
-  return NULL ;
+  return NULL;
 }
 
-} // namespace
+}  // namespace
 
 //----------------------------------------------------------------------------
 // Spawn a thread
 
-bool ThreadsExec::spawn()
-{
-  bool result = false ;
+bool ThreadsExec::spawn() {
+  bool result = false;
 
-  pthread_attr_t attr ;
+  pthread_attr_t attr;
 
-  if ( 0 == pthread_attr_init( & attr ) ||
-       0 == pthread_attr_setscope(       & attr, PTHREAD_SCOPE_SYSTEM ) ||
-       0 == pthread_attr_setdetachstate( & attr, PTHREAD_CREATE_DETACHED ) ) {
+  if (0 == pthread_attr_init(&attr) ||
+      0 == pthread_attr_setscope(&attr, PTHREAD_SCOPE_SYSTEM) ||
+      0 == pthread_attr_setdetachstate(&attr, PTHREAD_CREATE_DETACHED)) {
+    pthread_t pt;
 
-    pthread_t pt ;
-
-    result = 0 == pthread_create( & pt, & attr, internal_pthread_driver, 0 );
+    result = 0 == pthread_create(&pt, &attr, internal_pthread_driver, 0);
   }
 
-  pthread_attr_destroy( & attr );
+  pthread_attr_destroy(&attr);
 
-  return result ;
+  return result;
 }
 
 //----------------------------------------------------------------------------
 
-bool ThreadsExec::is_process()
-{
+bool ThreadsExec::is_process() {
   static const pthread_t master_pid = pthread_self();
 
-  return pthread_equal( master_pid , pthread_self() );
+  return pthread_equal(master_pid, pthread_self());
 }
 
-void ThreadsExec::global_lock()
-{
-  pthread_mutex_lock( & host_internal_pthread_mutex );
+void ThreadsExec::global_lock() {
+  pthread_mutex_lock(&host_internal_pthread_mutex);
 }
 
-void ThreadsExec::global_unlock()
-{
-  pthread_mutex_unlock( & host_internal_pthread_mutex );
+void ThreadsExec::global_unlock() {
+  pthread_mutex_unlock(&host_internal_pthread_mutex);
 }
 
 //----------------------------------------------------------------------------
 
-void ThreadsExec::wait_yield( volatile int & flag , const int value )
-{
-  while ( value == flag ) { sched_yield(); }
+void ThreadsExec::wait_yield(volatile int& flag, const int value) {
+  while (value == flag) {
+    sched_yield();
+  }
 }
 
-} // namespace Impl
-} // namespace Kokkos
+}  // namespace Impl
+}  // namespace Kokkos
 
 /* end #if defined( KOKKOS_ENABLE_THREADS ) */
 //----------------------------------------------------------------------------
 //----------------------------------------------------------------------------
 
-#elif defined( KOKKOS_ENABLE_WINTHREAD )
+#elif defined(KOKKOS_ENABLE_WINTHREAD)
 
 #include <Kokkos_Core_fwd.hpp>
 
@@ -159,7 +153,7 @@ void ThreadsExec::wait_yield( volatile int & flag , const int value )
 #include <windows.h>
 #include <process.h>
 
-/* Standard C++ libaries */
+/* Standard C++ libraries */
 
 #include <cstdlib>
 #include <string>
@@ -175,43 +169,40 @@ namespace Kokkos {
 namespace Impl {
 namespace {
 
-unsigned WINAPI internal_winthread_driver( void * arg )
-{
+unsigned WINAPI internal_winthread_driver(void* arg) {
   ThreadsExec::driver();
 
-  return 0 ;
+  return 0;
 }
 
 class ThreadLockWindows {
-private:
-  CRITICAL_SECTION  m_handle ;
+ private:
+  CRITICAL_SECTION m_handle;
 
-  ~ThreadLockWindows()
-  { DeleteCriticalSection( & m_handle ); }
+  ~ThreadLockWindows() { DeleteCriticalSection(&m_handle); }
 
   ThreadLockWindows();
-  { InitializeCriticalSection( & m_handle ); }
+  { InitializeCriticalSection(&m_handle); }
 
-  ThreadLockWindows( const ThreadLockWindows & );
-  ThreadLockWindows & operator = ( const ThreadLockWindows & );
+  ThreadLockWindows(const ThreadLockWindows&);
+  ThreadLockWindows& operator=(const ThreadLockWindows&);
 
-public:
+ public:
+  static ThreadLockWindows& singleton();
 
-  static ThreadLockWindows & singleton();
+  void lock() { EnterCriticalSection(&m_handle); }
 
-  void lock()
-  { EnterCriticalSection( & m_handle ); }
-
-  void unlock()
-  { LeaveCriticalSection( & m_handle ); }
+  void unlock() { LeaveCriticalSection(&m_handle); }
 };
 
-ThreadLockWindows & ThreadLockWindows::singleton()
-{ static ThreadLockWindows self ; return self ; }
+ThreadLockWindows& ThreadLockWindows::singleton() {
+  static ThreadLockWindows self;
+  return self;
+}
 
-} // namespace <>
-} // namespace Kokkos
-} // namespace Impl
+}  // namespace
+}  // namespace Impl
+}  // namespace Kokkos
 
 //----------------------------------------------------------------------------
 //----------------------------------------------------------------------------
@@ -221,33 +212,30 @@ namespace Impl {
 
 // Spawn this thread
 
-bool ThreadsExec::spawn()
-{
-  unsigned Win32ThreadID = 0 ;
+bool ThreadsExec::spawn() {
+  unsigned Win32ThreadID = 0;
 
   HANDLE handle =
-    _beginthreadex(0,0,internal_winthread_driver,0,0, & Win32ThreadID );
+      _beginthreadex(0, 0, internal_winthread_driver, 0, 0, &Win32ThreadID);
 
-  return ! handle ;
+  return !handle;
 }
 
-bool ThreadsExec::is_process() { return true ; }
+bool ThreadsExec::is_process() { return true; }
 
-void ThreadsExec::global_lock()
-{ ThreadLockWindows::singleton().lock(); }
+void ThreadsExec::global_lock() { ThreadLockWindows::singleton().lock(); }
 
-void ThreadsExec::global_unlock()
-{ ThreadLockWindows::singleton().unlock(); }
+void ThreadsExec::global_unlock() { ThreadLockWindows::singleton().unlock(); }
 
-void ThreadsExec::wait_yield( volatile int & flag , const int value ) {}
-{
-  while ( value == flag ) { Sleep(0); }
+void ThreadsExec::wait_yield(volatile int& flag, const int value){} {
+  while (value == flag) {
+    Sleep(0);
+  }
 }
 
-} // namespace Impl
-} // namespace Kokkos
+}  // namespace Impl
+}  // namespace Kokkos
 
 #else
 void KOKKOS_CORE_SRC_THREADS_EXEC_BASE_PREVENT_LINK_ERROR() {}
 #endif /* end #elif defined( KOKKOS_ENABLE_WINTHREAD ) */
-
diff --git a/lib/kokkos/core/src/Threads/Kokkos_ThreadsTeam.hpp b/lib/kokkos/core/src/Threads/Kokkos_ThreadsTeam.hpp
index 9d6c0fa8cf..2cd9d73b2a 100644
--- a/lib/kokkos/core/src/Threads/Kokkos_ThreadsTeam.hpp
+++ b/lib/kokkos/core/src/Threads/Kokkos_ThreadsTeam.hpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -45,7 +46,7 @@
 #define KOKKOS_THREADSTEAM_HPP
 
 #include <Kokkos_Macros.hpp>
-#if defined( KOKKOS_ENABLE_THREADS )
+#if defined(KOKKOS_ENABLE_THREADS)
 
 #include <cstdio>
 
@@ -63,114 +64,120 @@ namespace Impl {
 
 //----------------------------------------------------------------------------
 
-template< class > struct ThreadsExecAdapter ;
+template <class>
+struct ThreadsExecAdapter;
 
 //----------------------------------------------------------------------------
 
 class ThreadsExecTeamMember {
-private:
-
+ private:
   enum { TEAM_REDUCE_SIZE = 512 };
 
-public:
-  typedef Kokkos::Threads execution_space ;
-  typedef execution_space::scratch_memory_space scratch_memory_space ;
+ public:
+  typedef Kokkos::Threads execution_space;
+  typedef execution_space::scratch_memory_space scratch_memory_space;
 
-private:
-  typedef execution_space::scratch_memory_space space ;
-  ThreadsExec * const   m_exec ;
-  ThreadsExec * const * m_team_base ; ///< Base for team fan-in
-  space                 m_team_shared ;
-  int                   m_team_shared_size ;
-  int                   m_team_size ;
-  int                   m_team_rank ;
-  int                   m_team_rank_rev ;
-  int                   m_league_size ;
-  int                   m_league_end ;
-  int                   m_league_rank ;
+ private:
+  typedef execution_space::scratch_memory_space space;
+  ThreadsExec* const m_exec;
+  ThreadsExec* const* m_team_base;  ///< Base for team fan-in
+  space m_team_shared;
+  int m_team_shared_size;
+  int m_team_size;
+  int m_team_rank;
+  int m_team_rank_rev;
+  int m_league_size;
+  int m_league_end;
+  int m_league_rank;
 
-  int                   m_chunk_size;
-  int                   m_league_chunk_end;
+  int m_chunk_size;
+  int m_league_chunk_end;
 
-  int                   m_invalid_thread;
-  int                   m_team_alloc;
+  int m_invalid_thread;
+  int m_team_alloc;
 
-  inline
-  void set_team_shared()
-    { new( & m_team_shared ) space( ((char *) (*m_team_base)->scratch_memory()) + TEAM_REDUCE_SIZE , m_team_shared_size ); }
-
-public:
+  inline void set_team_shared() {
+    new (&m_team_shared)
+        space(((char*)(*m_team_base)->scratch_memory()) + TEAM_REDUCE_SIZE,
+              m_team_shared_size);
+  }
 
+ public:
   // Fan-in and wait until the matching fan-out is called.
   // The root thread which does not wait will return true.
   // All other threads will return false during the fan-out.
-  KOKKOS_INLINE_FUNCTION bool team_fan_in() const
-    {
-      int n , j ;
+  KOKKOS_INLINE_FUNCTION bool team_fan_in() const {
+    int n, j;
 
-      // Wait for fan-in threads
-      for ( n = 1 ; ( ! ( m_team_rank_rev & n ) ) && ( ( j = m_team_rank_rev + n ) < m_team_size ) ; n <<= 1 ) {
-        Impl::spinwait_while_equal<int>( m_team_base[j]->state() , ThreadsExec::Active );
-      }
-
-      // If not root then wait for release
-      if ( m_team_rank_rev ) {
-        m_exec->state() = ThreadsExec::Rendezvous ;
-        Impl::spinwait_while_equal<int>( m_exec->state() , ThreadsExec::Rendezvous );
-      }
-
-      return ! m_team_rank_rev ;
+    // Wait for fan-in threads
+    for (n = 1;
+         (!(m_team_rank_rev & n)) && ((j = m_team_rank_rev + n) < m_team_size);
+         n <<= 1) {
+      Impl::spinwait_while_equal<int>(m_team_base[j]->state(),
+                                      ThreadsExec::Active);
     }
 
-  KOKKOS_INLINE_FUNCTION void team_fan_out() const
-    {
-      int n , j ;
-      for ( n = 1 ; ( ! ( m_team_rank_rev & n ) ) && ( ( j = m_team_rank_rev + n ) < m_team_size ) ; n <<= 1 ) {
-        m_team_base[j]->state() = ThreadsExec::Active ;
-      }
+    // If not root then wait for release
+    if (m_team_rank_rev) {
+      m_exec->state() = ThreadsExec::Rendezvous;
+      Impl::spinwait_while_equal<int>(m_exec->state(), ThreadsExec::Rendezvous);
     }
 
-public:
+    return !m_team_rank_rev;
+  }
 
-  KOKKOS_INLINE_FUNCTION static int team_reduce_size() { return TEAM_REDUCE_SIZE ; }
-
-  KOKKOS_INLINE_FUNCTION
-  const execution_space::scratch_memory_space & team_shmem() const
-    { return m_team_shared.set_team_thread_mode(0,1,0) ; }
-
-  KOKKOS_INLINE_FUNCTION
-  const execution_space::scratch_memory_space & team_scratch(int) const
-    { return m_team_shared.set_team_thread_mode(0,1,0) ; }
-
-  KOKKOS_INLINE_FUNCTION
-  const execution_space::scratch_memory_space & thread_scratch(int) const
-    { return m_team_shared.set_team_thread_mode(0,team_size(),team_rank()) ; }
-
-  KOKKOS_INLINE_FUNCTION int league_rank() const { return m_league_rank ; }
-  KOKKOS_INLINE_FUNCTION int league_size() const { return m_league_size ; }
-  KOKKOS_INLINE_FUNCTION int team_rank() const { return m_team_rank ; }
-  KOKKOS_INLINE_FUNCTION int team_size() const { return m_team_size ; }
-
-  KOKKOS_INLINE_FUNCTION void team_barrier() const
-    {
-      team_fan_in();
-      team_fan_out();
+  KOKKOS_INLINE_FUNCTION void team_fan_out() const {
+    int n, j;
+    for (n = 1;
+         (!(m_team_rank_rev & n)) && ((j = m_team_rank_rev + n) < m_team_size);
+         n <<= 1) {
+      m_team_base[j]->state() = ThreadsExec::Active;
     }
+  }
+
+ public:
+  KOKKOS_INLINE_FUNCTION static int team_reduce_size() {
+    return TEAM_REDUCE_SIZE;
+  }
 
-  template<class ValueType>
   KOKKOS_INLINE_FUNCTION
-  void team_broadcast(ValueType& value, const int& thread_id) const
-  {
-#if ! defined( KOKKOS_ACTIVE_EXECUTION_MEMORY_SPACE_HOST )
-    { }
+  const execution_space::scratch_memory_space& team_shmem() const {
+    return m_team_shared.set_team_thread_mode(0, 1, 0);
+  }
+
+  KOKKOS_INLINE_FUNCTION
+  const execution_space::scratch_memory_space& team_scratch(int) const {
+    return m_team_shared.set_team_thread_mode(0, 1, 0);
+  }
+
+  KOKKOS_INLINE_FUNCTION
+  const execution_space::scratch_memory_space& thread_scratch(int) const {
+    return m_team_shared.set_team_thread_mode(0, team_size(), team_rank());
+  }
+
+  KOKKOS_INLINE_FUNCTION int league_rank() const { return m_league_rank; }
+  KOKKOS_INLINE_FUNCTION int league_size() const { return m_league_size; }
+  KOKKOS_INLINE_FUNCTION int team_rank() const { return m_team_rank; }
+  KOKKOS_INLINE_FUNCTION int team_size() const { return m_team_size; }
+
+  KOKKOS_INLINE_FUNCTION void team_barrier() const {
+    team_fan_in();
+    team_fan_out();
+  }
+
+  template <class ValueType>
+  KOKKOS_INLINE_FUNCTION void team_broadcast(ValueType& value,
+                                             const int& thread_id) const {
+#if !defined(KOKKOS_ACTIVE_EXECUTION_MEMORY_SPACE_HOST)
+    {}
 #else
     // Make sure there is enough scratch space:
-    typedef typename if_c< sizeof(ValueType) < TEAM_REDUCE_SIZE
-                         , ValueType , void >::type type ;
+    typedef typename if_c<sizeof(ValueType) < TEAM_REDUCE_SIZE, ValueType,
+                          void>::type type;
 
-    if ( m_team_base ) {
-      type * const local_value = ((type*) m_team_base[0]->scratch_memory());
-      if(team_rank() == thread_id) *local_value = value;
+    if (m_team_base) {
+      type* const local_value = ((type*)m_team_base[0]->scratch_memory());
+      if (team_rank() == thread_id) *local_value = value;
       memory_fence();
       team_barrier();
       value = *local_value;
@@ -178,115 +185,121 @@ public:
 #endif
   }
 
-  template<class Closure, class ValueType>
-  KOKKOS_INLINE_FUNCTION
-  void team_broadcast(Closure const & f, ValueType& value, const int& thread_id) const
-  {
-#if ! defined( KOKKOS_ACTIVE_EXECUTION_MEMORY_SPACE_HOST )
-    { }
+  template <class Closure, class ValueType>
+  KOKKOS_INLINE_FUNCTION void team_broadcast(Closure const& f, ValueType& value,
+                                             const int& thread_id) const {
+#if !defined(KOKKOS_ACTIVE_EXECUTION_MEMORY_SPACE_HOST)
+    {}
 #else
     // Make sure there is enough scratch space:
-    typedef typename if_c< sizeof(ValueType) < TEAM_REDUCE_SIZE
-                         , ValueType , void >::type type ;
-    f( value );
-    if ( m_team_base ) {
-      type * const local_value = ((type*) m_team_base[0]->scratch_memory());
-      if(team_rank() == thread_id) *local_value = value;
+    typedef typename if_c<sizeof(ValueType) < TEAM_REDUCE_SIZE, ValueType,
+                          void>::type type;
+    f(value);
+    if (m_team_base) {
+      type* const local_value = ((type*)m_team_base[0]->scratch_memory());
+      if (team_rank() == thread_id) *local_value = value;
       memory_fence();
       team_barrier();
       value = *local_value;
     }
 #endif
   }
-  
-  template< typename Type >
+
+  template <typename Type>
   KOKKOS_INLINE_FUNCTION
-  typename std::enable_if< !Kokkos::is_reducer< Type >::value , Type>::type
-  team_reduce( const Type & value ) const
-#if ! defined( KOKKOS_ACTIVE_EXECUTION_MEMORY_SPACE_HOST )
-    { return Type(); }
+      typename std::enable_if<!Kokkos::is_reducer<Type>::value, Type>::type
+      team_reduce(const Type& value) const
+#if !defined(KOKKOS_ACTIVE_EXECUTION_MEMORY_SPACE_HOST)
+  {
+    return Type();
+  }
 #else
-    {
-      // Make sure there is enough scratch space:
-      typedef typename if_c< sizeof(Type) < TEAM_REDUCE_SIZE , Type , void >::type type ;
+  {
+    // Make sure there is enough scratch space:
+    typedef
+        typename if_c<sizeof(Type) < TEAM_REDUCE_SIZE, Type, void>::type type;
 
-      if ( 0 == m_exec ) return value ;
+    if (0 == m_exec) return value;
 
-      *((volatile type*) m_exec->scratch_memory() ) = value ;
+    *((volatile type*)m_exec->scratch_memory()) = value;
 
-      memory_fence();
+    memory_fence();
 
-      type & accum = *((type *) m_team_base[0]->scratch_memory() );
+    type& accum = *((type*)m_team_base[0]->scratch_memory());
 
-      if ( team_fan_in() ) {
-        for ( int i = 1 ; i < m_team_size ; ++i ) {
-          accum += *((type *) m_team_base[i]->scratch_memory() );
-        }
-        memory_fence();
+    if (team_fan_in()) {
+      for (int i = 1; i < m_team_size; ++i) {
+        accum += *((type*)m_team_base[i]->scratch_memory());
       }
-
-      team_fan_out();
-
-      return accum ;
+      memory_fence();
     }
+
+    team_fan_out();
+
+    return accum;
+  }
 #endif
 
-    template< typename ReducerType >
-    KOKKOS_INLINE_FUNCTION
-    typename std::enable_if< is_reducer< ReducerType >::value >::type
-    team_reduce( ReducerType const & reducer ) const noexcept
-    { team_reduce(reducer,reducer.reference()); }
+  template <typename ReducerType>
+  KOKKOS_INLINE_FUNCTION
+      typename std::enable_if<is_reducer<ReducerType>::value>::type
+      team_reduce(ReducerType const& reducer) const noexcept {
+    team_reduce(reducer, reducer.reference());
+  }
 
-    template< typename ReducerType >
-    KOKKOS_INLINE_FUNCTION
-    typename std::enable_if< Kokkos::is_reducer< ReducerType >::value >::type
-  #if ! defined( KOKKOS_ACTIVE_EXECUTION_MEMORY_SPACE_HOST )
-    team_reduce( const ReducerType &, const typename ReducerType::value_type ) const
-      {}
-  #else
-    team_reduce( const ReducerType & reducer, const typename ReducerType::value_type contribution  ) const
-    {
-      typedef typename ReducerType::value_type value_type;
-      // Make sure there is enough scratch space:
-      typedef typename if_c< sizeof(value_type) < TEAM_REDUCE_SIZE
-                           , value_type , void >::type type ;
+  template <typename ReducerType>
+  KOKKOS_INLINE_FUNCTION
+      typename std::enable_if<Kokkos::is_reducer<ReducerType>::value>::type
+#if !defined(KOKKOS_ACTIVE_EXECUTION_MEMORY_SPACE_HOST)
+      team_reduce(const ReducerType&,
+                  const typename ReducerType::value_type) const {
+  }
+#else
+      team_reduce(const ReducerType& reducer,
+                  const typename ReducerType::value_type contribution) const {
+    typedef typename ReducerType::value_type value_type;
+    // Make sure there is enough scratch space:
+    typedef typename if_c<sizeof(value_type) < TEAM_REDUCE_SIZE, value_type,
+                          void>::type type;
 
-      if ( 0 == m_exec ) return ;
+    if (0 == m_exec) return;
 
-      type * const local_value = ((type*) m_exec->scratch_memory());
+    type* const local_value = ((type*)m_exec->scratch_memory());
 
-      // Set this thread's contribution
-      *local_value = contribution ;
+    // Set this thread's contribution
+    *local_value = contribution;
 
-      // Fence to make sure the base team member has access:
-      memory_fence();
+    // Fence to make sure the base team member has access:
+    memory_fence();
 
-      if ( team_fan_in() ) {
-        // The last thread to synchronize returns true, all other threads wait for team_fan_out()
-        type * const team_value = ((type*) m_team_base[0]->scratch_memory());
+    if (team_fan_in()) {
+      // The last thread to synchronize returns true, all other threads wait for
+      // team_fan_out()
+      type* const team_value = ((type*)m_team_base[0]->scratch_memory());
 
-        // Join to the team value:
-        for ( int i = 1 ; i < m_team_size ; ++i ) {
-          reducer.join( *team_value , *((type*) m_team_base[i]->scratch_memory()) );
-        }
-
-        // Team base thread may "lap" member threads so copy out to their local value.
-        for ( int i = 1 ; i < m_team_size ; ++i ) {
-          *((type*) m_team_base[i]->scratch_memory()) = *team_value ;
-        }
-
-        // Fence to make sure all team members have access
-        memory_fence();
+      // Join to the team value:
+      for (int i = 1; i < m_team_size; ++i) {
+        reducer.join(*team_value, *((type*)m_team_base[i]->scratch_memory()));
       }
 
-      team_fan_out();
+      // Team base thread may "lap" member threads so copy out to their local
+      // value.
+      for (int i = 1; i < m_team_size; ++i) {
+        *((type*)m_team_base[i]->scratch_memory()) = *team_value;
+      }
 
-      // Value was changed by the team base
-      reducer.reference() = *((type volatile const *) local_value);
+      // Fence to make sure all team members have access
+      memory_fence();
     }
-  #endif
 
-   /** \brief  Intra-team exclusive prefix sum with team_rank() ordering
+    team_fan_out();
+
+    // Value was changed by the team base
+    reducer.reference() = *((type volatile const*)local_value);
+  }
+#endif
+
+  /** \brief  Intra-team exclusive prefix sum with team_rank() ordering
    *          with intra-team non-deterministic ordering accumulation.
    *
    *  The global inter-team accumulation value will, at the end of the
@@ -295,55 +308,60 @@ public:
    *  As such the base value for each team's scan operation is similarly
    *  non-deterministic.
    */
-  template< typename ArgType >
-  KOKKOS_INLINE_FUNCTION ArgType team_scan( const ArgType & value , ArgType * const global_accum ) const
-#if ! defined( KOKKOS_ACTIVE_EXECUTION_MEMORY_SPACE_HOST )
-    { return ArgType(); }
+  template <typename ArgType>
+  KOKKOS_INLINE_FUNCTION ArgType team_scan(const ArgType& value,
+                                           ArgType* const global_accum) const
+#if !defined(KOKKOS_ACTIVE_EXECUTION_MEMORY_SPACE_HOST)
+  {
+    return ArgType();
+  }
 #else
-    {
-      // Make sure there is enough scratch space:
-      typedef typename if_c< sizeof(ArgType) < TEAM_REDUCE_SIZE , ArgType , void >::type type ;
+  {
+    // Make sure there is enough scratch space:
+    typedef
+        typename if_c<sizeof(ArgType) < TEAM_REDUCE_SIZE, ArgType, void>::type
+            type;
 
-      if ( 0 == m_exec ) return type(0);
+    if (0 == m_exec) return type(0);
 
-      volatile type * const work_value  = ((type*) m_exec->scratch_memory());
+    volatile type* const work_value = ((type*)m_exec->scratch_memory());
 
-      *work_value = value ;
+    *work_value = value;
 
-      memory_fence();
+    memory_fence();
 
-      if ( team_fan_in() ) {
-        // The last thread to synchronize returns true, all other threads wait for team_fan_out()
-        // m_team_base[0]                 == highest ranking team member
-        // m_team_base[ m_team_size - 1 ] == lowest ranking team member
-        //
-        // 1) copy from lower to higher rank, initialize lowest rank to zero
-        // 2) prefix sum from lowest to highest rank, skipping lowest rank
+    if (team_fan_in()) {
+      // The last thread to synchronize returns true, all other threads wait for
+      // team_fan_out() m_team_base[0]                 == highest ranking team
+      // member m_team_base[ m_team_size - 1 ] == lowest ranking team member
+      //
+      // 1) copy from lower to higher rank, initialize lowest rank to zero
+      // 2) prefix sum from lowest to highest rank, skipping lowest rank
 
-        type accum = 0 ;
+      type accum = 0;
 
-        if ( global_accum ) {
-          for ( int i = m_team_size ; i-- ; ) {
-            type & val = *((type*) m_team_base[i]->scratch_memory());
-            accum += val ;
-          }
-          accum = atomic_fetch_add( global_accum , accum );
+      if (global_accum) {
+        for (int i = m_team_size; i--;) {
+          type& val = *((type*)m_team_base[i]->scratch_memory());
+          accum += val;
         }
-
-        for ( int i = m_team_size ; i-- ; ) {
-          type & val = *((type*) m_team_base[i]->scratch_memory());
-          const type offset = accum ;
-          accum += val ;
-          val = offset ;
-        }
-
-        memory_fence();
+        accum = atomic_fetch_add(global_accum, accum);
       }
 
-      team_fan_out();
+      for (int i = m_team_size; i--;) {
+        type& val = *((type*)m_team_base[i]->scratch_memory());
+        const type offset = accum;
+        accum += val;
+        val = offset;
+      }
 
-      return *work_value ;
+      memory_fence();
     }
+
+    team_fan_out();
+
+    return *work_value;
+  }
 #endif
 
   /** \brief  Intra-team exclusive prefix sum with team_rank() ordering.
@@ -351,154 +369,124 @@ public:
    *  The highest rank thread can compute the reduction total as
    *    reduction_total = dev.team_scan( value ) + value ;
    */
-  template< typename ArgType >
-  KOKKOS_INLINE_FUNCTION ArgType team_scan( const ArgType & value ) const
-    { return this-> template team_scan<ArgType>( value , 0 ); }
-
+  template <typename ArgType>
+  KOKKOS_INLINE_FUNCTION ArgType team_scan(const ArgType& value) const {
+    return this->template team_scan<ArgType>(value, 0);
+  }
 
   //----------------------------------------
   // Private for the driver
 
-  template< class ... Properties >
-  ThreadsExecTeamMember( Impl::ThreadsExec * exec
-                       , const TeamPolicyInternal< Kokkos::Threads , Properties ... > & team
-                       , const int shared_size )
-    : m_exec( exec )
-    , m_team_base(0)
-    , m_team_shared(0,0)
-    , m_team_shared_size( shared_size )
-    , m_team_size(team.team_size())
-    , m_team_rank(0)
-    , m_team_rank_rev(0)
-    , m_league_size(0)
-    , m_league_end(0)
-    , m_league_rank(0)
-    , m_chunk_size( team.chunk_size() )
-    , m_league_chunk_end(0)
-    , m_team_alloc( team.team_alloc())
-   {
-      if ( team.league_size() ) {
-        // Execution is using device-team interface:
+  template <class... Properties>
+  ThreadsExecTeamMember(
+      Impl::ThreadsExec* exec,
+      const TeamPolicyInternal<Kokkos::Threads, Properties...>& team,
+      const int shared_size)
+      : m_exec(exec),
+        m_team_base(0),
+        m_team_shared(0, 0),
+        m_team_shared_size(shared_size),
+        m_team_size(team.team_size()),
+        m_team_rank(0),
+        m_team_rank_rev(0),
+        m_league_size(0),
+        m_league_end(0),
+        m_league_rank(0),
+        m_chunk_size(team.chunk_size()),
+        m_league_chunk_end(0),
+        m_team_alloc(team.team_alloc()) {
+    if (team.league_size()) {
+      // Execution is using device-team interface:
 
-        const int pool_rank_rev = m_exec->pool_size() - ( m_exec->pool_rank() + 1 );
-        const int team_rank_rev = pool_rank_rev % team.team_alloc();
-        const size_t pool_league_size     = m_exec->pool_size() / team.team_alloc() ;
-        const size_t pool_league_rank_rev = pool_rank_rev / team.team_alloc() ;
-        if(pool_league_rank_rev >= pool_league_size) {
-          m_invalid_thread = 1;
-          return;
-        }
-        const size_t pool_league_rank     = pool_league_size - ( pool_league_rank_rev + 1 );
-
-        const int pool_num_teams       = m_exec->pool_size()/team.team_alloc();
-        const int chunk_size           = team.chunk_size()>0?team.chunk_size():team.team_iter();
-        const int chunks_per_team      = ( team.league_size() + chunk_size*pool_num_teams-1 ) / (chunk_size*pool_num_teams);
-              int league_iter_end      = team.league_size() - pool_league_rank_rev * chunks_per_team * chunk_size;
-              int league_iter_begin    = league_iter_end - chunks_per_team * chunk_size;
-        if (league_iter_begin < 0)     league_iter_begin = 0;
-        if (league_iter_end>team.league_size()) league_iter_end = team.league_size();
-
-        if ((team.team_alloc()>m_team_size)?
-            (team_rank_rev >= m_team_size):
-            (m_exec->pool_size() - pool_num_teams*m_team_size > m_exec->pool_rank())
-           )
-          m_invalid_thread = 1;
-        else
-          m_invalid_thread = 0;
-
-        // May be using fewer threads per team than a multiple of threads per core,
-        // some threads will idle.
-
-        if ( team_rank_rev < team.team_size() && !m_invalid_thread) {
-
-          m_team_base        = m_exec->pool_base() + team.team_alloc() * pool_league_rank_rev ;
-          m_team_size        = team.team_size() ;
-          m_team_rank        = team.team_size() - ( team_rank_rev + 1 );
-          m_team_rank_rev    = team_rank_rev ;
-          m_league_size      = team.league_size();
-
-          m_league_rank      = ( team.league_size() *  pool_league_rank    ) / pool_league_size ;
-          m_league_end       = ( team.league_size() * (pool_league_rank+1) ) / pool_league_size ;
-
-          set_team_shared();
-        }
-
-        if ( (m_team_rank_rev == 0) && (m_invalid_thread == 0) ) {
-          m_exec->set_work_range(m_league_rank,m_league_end,m_chunk_size);
-          m_exec->reset_steal_target(m_team_size);
-        }
-        if(std::is_same<typename TeamPolicyInternal<Kokkos::Threads, Properties ...>::schedule_type::type,Kokkos::Dynamic>::value) {
-          m_exec->barrier();
-        }
+      const int pool_rank_rev = m_exec->pool_size() - (m_exec->pool_rank() + 1);
+      const int team_rank_rev = pool_rank_rev % team.team_alloc();
+      const size_t pool_league_size = m_exec->pool_size() / team.team_alloc();
+      const size_t pool_league_rank_rev = pool_rank_rev / team.team_alloc();
+      if (pool_league_rank_rev >= pool_league_size) {
+        m_invalid_thread = 1;
+        return;
       }
+      const size_t pool_league_rank =
+          pool_league_size - (pool_league_rank_rev + 1);
+
+      const int pool_num_teams = m_exec->pool_size() / team.team_alloc();
+      const int chunk_size =
+          team.chunk_size() > 0 ? team.chunk_size() : team.team_iter();
+      const int chunks_per_team =
+          (team.league_size() + chunk_size * pool_num_teams - 1) /
+          (chunk_size * pool_num_teams);
+      int league_iter_end = team.league_size() -
+                            pool_league_rank_rev * chunks_per_team * chunk_size;
+      int league_iter_begin = league_iter_end - chunks_per_team * chunk_size;
+      if (league_iter_begin < 0) league_iter_begin = 0;
+      if (league_iter_end > team.league_size())
+        league_iter_end = team.league_size();
+
+      if ((team.team_alloc() > m_team_size)
+              ? (team_rank_rev >= m_team_size)
+              : (m_exec->pool_size() - pool_num_teams * m_team_size >
+                 m_exec->pool_rank()))
+        m_invalid_thread = 1;
       else
-      { m_invalid_thread = 1; }
-    }
+        m_invalid_thread = 0;
 
-  ThreadsExecTeamMember()
-    : m_exec(0)
-    , m_team_base(0)
-    , m_team_shared(0,0)
-    , m_team_shared_size(0)
-    , m_team_size(1)
-    , m_team_rank(0)
-    , m_team_rank_rev(0)
-    , m_league_size(1)
-    , m_league_end(0)
-    , m_league_rank(0)
-    , m_chunk_size(0)
-    , m_league_chunk_end(0)
-    , m_invalid_thread(0)
-    , m_team_alloc(0)
-    {}
+      // May be using fewer threads per team than a multiple of threads per
+      // core, some threads will idle.
 
-  inline
-  ThreadsExec & threads_exec_team_base() const { return m_team_base ? **m_team_base : *m_exec ; }
+      if (team_rank_rev < team.team_size() && !m_invalid_thread) {
+        m_team_base =
+            m_exec->pool_base() + team.team_alloc() * pool_league_rank_rev;
+        m_team_size     = team.team_size();
+        m_team_rank     = team.team_size() - (team_rank_rev + 1);
+        m_team_rank_rev = team_rank_rev;
+        m_league_size   = team.league_size();
 
-  bool valid_static() const
-    { return m_league_rank < m_league_end ; }
+        m_league_rank =
+            (team.league_size() * pool_league_rank) / pool_league_size;
+        m_league_end =
+            (team.league_size() * (pool_league_rank + 1)) / pool_league_size;
 
-  void next_static()
-    {
-      if ( m_league_rank < m_league_end ) {
-        // Make sure all stores are complete before entering the barrier
-        memory_fence();
-        team_barrier();
         set_team_shared();
       }
-      m_league_rank++;
+
+      if ((m_team_rank_rev == 0) && (m_invalid_thread == 0)) {
+        m_exec->set_work_range(m_league_rank, m_league_end, m_chunk_size);
+        m_exec->reset_steal_target(m_team_size);
+      }
+      if (std::is_same<typename TeamPolicyInternal<
+                           Kokkos::Threads, Properties...>::schedule_type::type,
+                       Kokkos::Dynamic>::value) {
+        m_exec->barrier();
+      }
+    } else {
+      m_invalid_thread = 1;
     }
-
-  bool valid_dynamic() {
-
-    if(m_invalid_thread)
-      return false;
-    if ((m_league_rank < m_league_chunk_end) && (m_league_rank < m_league_size)) {
-      return true;
-    }
-
-    if (  m_team_rank_rev == 0 ) {
-      m_team_base[0]->get_work_index(m_team_alloc);
-    }
-    team_barrier();
-
-    long work_index = m_team_base[0]->team_work_index();
-
-    m_league_rank = work_index * m_chunk_size;
-    m_league_chunk_end = (work_index +1 ) * m_chunk_size;
-
-    if(m_league_chunk_end > m_league_size) m_league_chunk_end = m_league_size;
-
-    if((m_league_rank>=0) && (m_league_rank < m_league_chunk_end))
-      return true;
-    return false;
   }
 
-  void next_dynamic() {
-    if(m_invalid_thread)
-      return;
+  ThreadsExecTeamMember()
+      : m_exec(0),
+        m_team_base(0),
+        m_team_shared(0, 0),
+        m_team_shared_size(0),
+        m_team_size(1),
+        m_team_rank(0),
+        m_team_rank_rev(0),
+        m_league_size(1),
+        m_league_end(0),
+        m_league_rank(0),
+        m_chunk_size(0),
+        m_league_chunk_end(0),
+        m_invalid_thread(0),
+        m_team_alloc(0) {}
 
-    if ( m_league_rank < m_league_chunk_end ) {
+  inline ThreadsExec& threads_exec_team_base() const {
+    return m_team_base ? **m_team_base : *m_exec;
+  }
+
+  bool valid_static() const { return m_league_rank < m_league_end; }
+
+  void next_static() {
+    if (m_league_rank < m_league_end) {
       // Make sure all stores are complete before entering the barrier
       memory_fence();
       team_barrier();
@@ -507,16 +495,49 @@ public:
     m_league_rank++;
   }
 
-  void set_league_shmem( const int arg_league_rank
-                       , const int arg_league_size
-                       , const int arg_shmem_size
-                       )
-    {
-      m_league_rank = arg_league_rank ;
-      m_league_size = arg_league_size ;
-      m_team_shared_size = arg_shmem_size ;
+  bool valid_dynamic() {
+    if (m_invalid_thread) return false;
+    if ((m_league_rank < m_league_chunk_end) &&
+        (m_league_rank < m_league_size)) {
+      return true;
+    }
+
+    if (m_team_rank_rev == 0) {
+      m_team_base[0]->get_work_index(m_team_alloc);
+    }
+    team_barrier();
+
+    long work_index = m_team_base[0]->team_work_index();
+
+    m_league_rank      = work_index * m_chunk_size;
+    m_league_chunk_end = (work_index + 1) * m_chunk_size;
+
+    if (m_league_chunk_end > m_league_size) m_league_chunk_end = m_league_size;
+
+    if ((m_league_rank >= 0) && (m_league_rank < m_league_chunk_end))
+      return true;
+    return false;
+  }
+
+  void next_dynamic() {
+    if (m_invalid_thread) return;
+
+    if (m_league_rank < m_league_chunk_end) {
+      // Make sure all stores are complete before entering the barrier
+      memory_fence();
+      team_barrier();
       set_team_shared();
     }
+    m_league_rank++;
+  }
+
+  void set_league_shmem(const int arg_league_rank, const int arg_league_size,
+                        const int arg_shmem_size) {
+    m_league_rank      = arg_league_rank;
+    m_league_size      = arg_league_size;
+    m_team_shared_size = arg_shmem_size;
+    set_team_shared();
+  }
 };
 
 } /* namespace Impl */
@@ -527,586 +548,656 @@ public:
 
 namespace Kokkos {
 namespace Impl {
-template< class ... Properties >
-class TeamPolicyInternal< Kokkos::Threads , Properties ... >: public PolicyTraits<Properties ...>
-{
-private:
-
-  int m_league_size ;
-  int m_team_size ;
-  int m_team_alloc ;
-  int m_team_iter ;
+template <class... Properties>
+class TeamPolicyInternal<Kokkos::Threads, Properties...>
+    : public PolicyTraits<Properties...> {
+ private:
+  int m_league_size;
+  int m_team_size;
+  int m_team_alloc;
+  int m_team_iter;
 
   size_t m_team_scratch_size[2];
   size_t m_thread_scratch_size[2];
 
   int m_chunk_size;
 
-  inline
-  void init( const int league_size_request
-           , const int team_size_request )
-   {
+  inline void init(const int league_size_request, const int team_size_request) {
 #ifdef KOKKOS_ENABLE_DEPRECATED_CODE
-      const int pool_size  = traits::execution_space::thread_pool_size(0);
+    const int pool_size = traits::execution_space::thread_pool_size(0);
 #else
-      const int pool_size  = traits::execution_space::impl_thread_pool_size(0);
+    const int pool_size = traits::execution_space::impl_thread_pool_size(0);
 #endif
-      const int max_host_team_size =  Impl::HostThreadTeamData::max_team_members;
-      const int team_max   = pool_size<max_host_team_size?pool_size:max_host_team_size;
+    const int max_host_team_size = Impl::HostThreadTeamData::max_team_members;
+    const int team_max =
+        pool_size < max_host_team_size ? pool_size : max_host_team_size;
 #ifdef KOKKOS_ENABLE_DEPRECATED_CODE
-      const int team_grain = traits::execution_space::thread_pool_size(2);
+    const int team_grain = traits::execution_space::thread_pool_size(2);
 #else
-      const int team_grain = traits::execution_space::impl_thread_pool_size(2);
+    const int team_grain = traits::execution_space::impl_thread_pool_size(2);
 #endif
 
-      m_league_size = league_size_request ;
+    m_league_size = league_size_request;
 
-      #ifndef KOKKOS_ENABLE_DEPRECATED_CODE
-      if(team_size_request > team_max) Kokkos::abort("Kokkos::abort: Requested Team Size is too large!");
-      #endif
+#ifndef KOKKOS_ENABLE_DEPRECATED_CODE
+    if (team_size_request > team_max)
+      Kokkos::abort("Kokkos::abort: Requested Team Size is too large!");
+#endif
 
-      m_team_size = team_size_request < team_max ?
-                    team_size_request : team_max ;
+    m_team_size = team_size_request < team_max ? team_size_request : team_max;
 
-      // Round team size up to a multiple of 'team_gain'
-      const int team_size_grain = team_grain * ( ( m_team_size + team_grain - 1 ) / team_grain );
-      const int team_count      = pool_size / team_size_grain ;
+    // Round team size up to a multiple of 'team_gain'
+    const int team_size_grain =
+        team_grain * ((m_team_size + team_grain - 1) / team_grain);
+    const int team_count = pool_size / team_size_grain;
 
-      // Constraint : pool_size = m_team_alloc * team_count
-      m_team_alloc = pool_size / team_count ;
+    // Constraint : pool_size = m_team_alloc * team_count
+    m_team_alloc = pool_size / team_count;
 
-      // Maxumum number of iterations each team will take:
-      m_team_iter  = ( m_league_size + team_count - 1 ) / team_count ;
+    // Maxumum number of iterations each team will take:
+    m_team_iter = (m_league_size + team_count - 1) / team_count;
 
-      set_auto_chunk_size();
-   }
-
-
-public:
+    set_auto_chunk_size();
+  }
 
+ public:
   //! Tag this class as a kokkos execution policy
   //! Tag this class as a kokkos execution policy
-  typedef TeamPolicyInternal      execution_policy ;
+  typedef TeamPolicyInternal execution_policy;
 
-  typedef PolicyTraits<Properties ... > traits;
+  typedef PolicyTraits<Properties...> traits;
 
-  TeamPolicyInternal& operator = (const TeamPolicyInternal& p) {
-    m_league_size = p.m_league_size;
-    m_team_size = p.m_team_size;
-    m_team_alloc = p.m_team_alloc;
-    m_team_iter = p.m_team_iter;
-    m_team_scratch_size[0] = p.m_team_scratch_size[0];
+  TeamPolicyInternal& operator=(const TeamPolicyInternal& p) {
+    m_league_size            = p.m_league_size;
+    m_team_size              = p.m_team_size;
+    m_team_alloc             = p.m_team_alloc;
+    m_team_iter              = p.m_team_iter;
+    m_team_scratch_size[0]   = p.m_team_scratch_size[0];
     m_thread_scratch_size[0] = p.m_thread_scratch_size[0];
-    m_team_scratch_size[1] = p.m_team_scratch_size[1];
+    m_team_scratch_size[1]   = p.m_team_scratch_size[1];
     m_thread_scratch_size[1] = p.m_thread_scratch_size[1];
-    m_chunk_size = p.m_chunk_size;
+    m_chunk_size             = p.m_chunk_size;
     return *this;
   }
 
-  template<class ExecSpace, class ... OtherProperties >
+  template <class ExecSpace, class... OtherProperties>
   friend class TeamPolicyInternal;
 
-  template< class ... OtherProperties >
-  TeamPolicyInternal(const TeamPolicyInternal<Kokkos::Threads,OtherProperties...>& p) {
-    m_league_size = p.m_league_size;
-    m_team_size = p.m_team_size;
-    m_team_alloc = p.m_team_alloc;
-    m_team_iter = p.m_team_iter;
-    m_team_scratch_size[0] = p.m_team_scratch_size[0];
+  template <class... OtherProperties>
+  TeamPolicyInternal(
+      const TeamPolicyInternal<Kokkos::Threads, OtherProperties...>& p) {
+    m_league_size            = p.m_league_size;
+    m_team_size              = p.m_team_size;
+    m_team_alloc             = p.m_team_alloc;
+    m_team_iter              = p.m_team_iter;
+    m_team_scratch_size[0]   = p.m_team_scratch_size[0];
     m_thread_scratch_size[0] = p.m_thread_scratch_size[0];
-    m_team_scratch_size[1] = p.m_team_scratch_size[1];
+    m_team_scratch_size[1]   = p.m_team_scratch_size[1];
     m_thread_scratch_size[1] = p.m_thread_scratch_size[1];
-    m_chunk_size = p.m_chunk_size;
+    m_chunk_size             = p.m_chunk_size;
   }
 
   //----------------------------------------
 
 #ifdef KOKKOS_ENABLE_DEPRECATED_CODE
-  template< class FunctorType >
-  inline static
-  int team_size_max( const FunctorType & ) {
-    int pool_size = traits::execution_space::thread_pool_size(1);
-    int max_host_team_size =  Impl::HostThreadTeamData::max_team_members;
-    return pool_size<max_host_team_size?pool_size:max_host_team_size;
+  template <class FunctorType>
+  inline static int team_size_max(const FunctorType&) {
+    int pool_size          = traits::execution_space::thread_pool_size(1);
+    int max_host_team_size = Impl::HostThreadTeamData::max_team_members;
+    return pool_size < max_host_team_size ? pool_size : max_host_team_size;
   }
 
-  template< class FunctorType >
-  inline static
-  int team_size_recommended( const FunctorType & )
-  {
+  template <class FunctorType>
+  inline static int team_size_recommended(const FunctorType&) {
     return traits::execution_space::thread_pool_size(2);
   }
 
-  template< class FunctorType >
-  inline static
-  int team_size_recommended( const FunctorType &, const int& )
-  {
+  template <class FunctorType>
+  inline static int team_size_recommended(const FunctorType&, const int&) {
     return traits::execution_space::thread_pool_size(2);
   }
 #endif
 
-  template<class FunctorType>
-  int team_size_max( const FunctorType&, const ParallelForTag& ) const {
+  template <class FunctorType>
+  int team_size_max(const FunctorType&, const ParallelForTag&) const {
 #ifdef KOKKOS_ENABLE_DEPRECATED_CODE
     int pool_size = traits::execution_space::thread_pool_size(1);
 #else
     int pool_size = traits::execution_space::impl_thread_pool_size(1);
 #endif
-    int max_host_team_size =  Impl::HostThreadTeamData::max_team_members;
-    return pool_size<max_host_team_size?pool_size:max_host_team_size;
+    int max_host_team_size = Impl::HostThreadTeamData::max_team_members;
+    return pool_size < max_host_team_size ? pool_size : max_host_team_size;
   }
-  template<class FunctorType>
-  int team_size_max( const FunctorType&, const ParallelReduceTag& ) const {
+  template <class FunctorType>
+  int team_size_max(const FunctorType&, const ParallelReduceTag&) const {
 #ifdef KOKKOS_ENABLE_DEPRECATED_CODE
     int pool_size = traits::execution_space::thread_pool_size(1);
 #else
     int pool_size = traits::execution_space::impl_thread_pool_size(1);
 #endif
-    int max_host_team_size =  Impl::HostThreadTeamData::max_team_members;
-    return pool_size<max_host_team_size?pool_size:max_host_team_size;
+    int max_host_team_size = Impl::HostThreadTeamData::max_team_members;
+    return pool_size < max_host_team_size ? pool_size : max_host_team_size;
   }
-  template<class FunctorType>
-  int team_size_recommended( const FunctorType&, const ParallelForTag& ) const {
+  template <class FunctorType, class ReducerType>
+  inline int team_size_max(const FunctorType& f, const ReducerType&,
+                           const ParallelReduceTag& t) const {
+    return team_size_max(f, t);
+  }
+  template <class FunctorType>
+  int team_size_recommended(const FunctorType&, const ParallelForTag&) const {
 #ifdef KOKKOS_ENABLE_DEPRECATED_CODE
     return traits::execution_space::thread_pool_size(2);
 #else
     return traits::execution_space::impl_thread_pool_size(2);
 #endif
   }
-  template<class FunctorType>
-  int team_size_recommended( const FunctorType&, const ParallelReduceTag& ) const {
+  template <class FunctorType>
+  int team_size_recommended(const FunctorType&,
+                            const ParallelReduceTag&) const {
 #ifdef KOKKOS_ENABLE_DEPRECATED_CODE
     return traits::execution_space::thread_pool_size(2);
 #else
     return traits::execution_space::impl_thread_pool_size(2);
 #endif
   }
+  template <class FunctorType, class ReducerType>
+  inline int team_size_recommended(const FunctorType& f, const ReducerType&,
+                                   const ParallelReduceTag& t) const {
+    return team_size_recommended(f, t);
+  }
 
+  inline static int vector_length_max() {
+    return 1024;
+  }  // Use arbitrary large number, is meant as a vectorizable length
 
-  inline static
-  int vector_length_max()
-    { return 1024; } // Use arbitrary large number, is meant as a vectorizable length
-
-  inline static
-  int scratch_size_max(int level)
-    { return (level==0?
-        1024*32: // Roughly L1 size
-        20*1024*1024); // Limit to keep compatibility with CUDA
-    }
+  inline static int scratch_size_max(int level) {
+    return (level == 0 ? 1024 * 32 :  // Roughly L1 size
+                20 * 1024 * 1024);    // Limit to keep compatibility with CUDA
+  }
 
   //----------------------------------------
 
-  inline int team_size() const { return m_team_size ; }
-  inline int team_alloc() const { return m_team_alloc ; }
-  inline int league_size() const { return m_league_size ; }
-  inline size_t scratch_size(const int& level, int team_size_ = -1 ) const {
-    if(team_size_ < 0)
-      team_size_ = m_team_size;
-    return m_team_scratch_size[level] + team_size_*m_thread_scratch_size[level] ;
+  inline int team_size() const { return m_team_size; }
+  inline int team_alloc() const { return m_team_alloc; }
+  inline int league_size() const { return m_league_size; }
+  inline size_t scratch_size(const int& level, int team_size_ = -1) const {
+    if (team_size_ < 0) team_size_ = m_team_size;
+    return m_team_scratch_size[level] +
+           team_size_ * m_thread_scratch_size[level];
   }
 
-  inline int team_iter() const { return m_team_iter ; }
+  inline int team_iter() const { return m_team_iter; }
 
   /** \brief  Specify league size, request team size */
-  TeamPolicyInternal( const typename traits::execution_space &
-            , int league_size_request
-            , int team_size_request
-            , int vector_length_request = 1 )
-    : m_league_size(0)
-    , m_team_size(0)
-    , m_team_alloc(0)
-    , m_team_scratch_size { 0 , 0 }
-    , m_thread_scratch_size { 0 , 0 }
-    , m_chunk_size(0)
-    { init(league_size_request,team_size_request); (void) vector_length_request; }
+  TeamPolicyInternal(const typename traits::execution_space&,
+                     int league_size_request, int team_size_request,
+                     int vector_length_request = 1)
+      : m_league_size(0),
+        m_team_size(0),
+        m_team_alloc(0),
+        m_team_scratch_size{0, 0},
+        m_thread_scratch_size{0, 0},
+        m_chunk_size(0) {
+    init(league_size_request, team_size_request);
+    (void)vector_length_request;
+  }
 
   /** \brief  Specify league size, request team size */
-  TeamPolicyInternal( const typename traits::execution_space &
-            , int league_size_request
-            , const Kokkos::AUTO_t & /* team_size_request */
-            , int /* vector_length_request */ = 1 )
-    : m_league_size(0)
-    , m_team_size(0)
-    , m_team_alloc(0)
-    , m_team_scratch_size { 0 , 0 }
-    , m_thread_scratch_size { 0 , 0 }
-    , m_chunk_size(0)
+  TeamPolicyInternal(const typename traits::execution_space&,
+                     int league_size_request,
+                     const Kokkos::AUTO_t& /* team_size_request */
+                     ,
+                     int /* vector_length_request */ = 1)
+      : m_league_size(0),
+        m_team_size(0),
+        m_team_alloc(0),
+        m_team_scratch_size{0, 0},
+        m_thread_scratch_size{0, 0},
+        m_chunk_size(0)
 #ifdef KOKKOS_ENABLE_DEPRECATED_CODE
-    { init(league_size_request,traits::execution_space::thread_pool_size(2)); }
+  {
+    init(league_size_request, traits::execution_space::thread_pool_size(2));
+  }
 #else
-    { init(league_size_request,traits::execution_space::impl_thread_pool_size(2)); }
+  {
+    init(league_size_request,
+         traits::execution_space::impl_thread_pool_size(2));
+  }
 #endif
 
-  TeamPolicyInternal( int league_size_request
-            , int team_size_request
-            , int /* vector_length_request */ = 1 )
-    : m_league_size(0)
-    , m_team_size(0)
-    , m_team_alloc(0)
-    , m_team_scratch_size { 0 , 0 }
-    , m_thread_scratch_size { 0 , 0 }
-    , m_chunk_size(0)
-    { init(league_size_request,team_size_request); }
+  TeamPolicyInternal(int league_size_request, int team_size_request,
+                     int /* vector_length_request */ = 1)
+      : m_league_size(0),
+        m_team_size(0),
+        m_team_alloc(0),
+        m_team_scratch_size{0, 0},
+        m_thread_scratch_size{0, 0},
+        m_chunk_size(0) {
+    init(league_size_request, team_size_request);
+  }
 
-  TeamPolicyInternal( int league_size_request
-            , const Kokkos::AUTO_t & /* team_size_request */
-            , int /* vector_length_request */ = 1 )
-    : m_league_size(0)
-    , m_team_size(0)
-    , m_team_alloc(0)
-    , m_team_scratch_size { 0 , 0 }
-    , m_thread_scratch_size { 0 , 0 }
-    , m_chunk_size(0)
+  TeamPolicyInternal(int league_size_request,
+                     const Kokkos::AUTO_t& /* team_size_request */
+                     ,
+                     int /* vector_length_request */ = 1)
+      : m_league_size(0),
+        m_team_size(0),
+        m_team_alloc(0),
+        m_team_scratch_size{0, 0},
+        m_thread_scratch_size{0, 0},
+        m_chunk_size(0)
 #ifdef KOKKOS_ENABLE_DEPRECATED_CODE
-    { init(league_size_request,traits::execution_space::thread_pool_size(2)); }
+  {
+    init(league_size_request, traits::execution_space::thread_pool_size(2));
+  }
 #else
-    { init(league_size_request,traits::execution_space::impl_thread_pool_size(2)); }
+  {
+    init(league_size_request,
+         traits::execution_space::impl_thread_pool_size(2));
+  }
 #endif
-  inline int chunk_size() const { return m_chunk_size ; }
+  inline int chunk_size() const { return m_chunk_size; }
 
 #ifdef KOKKOS_ENABLE_DEPRECATED_CODE
   /** \brief set chunk_size to a discrete value*/
-  inline TeamPolicyInternal set_chunk_size(typename traits::index_type chunk_size_) const {
+  inline TeamPolicyInternal set_chunk_size(
+      typename traits::index_type chunk_size_) const {
     TeamPolicyInternal p = *this;
-    p.m_chunk_size = chunk_size_;
+    p.m_chunk_size       = chunk_size_;
     return p;
   }
 
-  /** \brief set per team scratch size for a specific level of the scratch hierarchy */
-  inline TeamPolicyInternal set_scratch_size(const int& level, const PerTeamValue& per_team) const {
-    TeamPolicyInternal p = *this;
+  /** \brief set per team scratch size for a specific level of the scratch
+   * hierarchy */
+  inline TeamPolicyInternal set_scratch_size(
+      const int& level, const PerTeamValue& per_team) const {
+    TeamPolicyInternal p         = *this;
     p.m_team_scratch_size[level] = per_team.value;
     return p;
   }
 
-  /** \brief set per thread scratch size for a specific level of the scratch hierarchy */
-  inline TeamPolicyInternal set_scratch_size(const int& level, const PerThreadValue& per_thread) const {
-    TeamPolicyInternal p = *this;
+  /** \brief set per thread scratch size for a specific level of the scratch
+   * hierarchy */
+  inline TeamPolicyInternal set_scratch_size(
+      const int& level, const PerThreadValue& per_thread) const {
+    TeamPolicyInternal p           = *this;
     p.m_thread_scratch_size[level] = per_thread.value;
     return p;
   }
 
-  /** \brief set per thread and per team scratch size for a specific level of the scratch hierarchy */
-  inline TeamPolicyInternal set_scratch_size(const int& level, const PerTeamValue& per_team, const PerThreadValue& per_thread) const {
-    TeamPolicyInternal p = *this;
-    p.m_team_scratch_size[level] = per_team.value;
+  /** \brief set per thread and per team scratch size for a specific level of
+   * the scratch hierarchy */
+  inline TeamPolicyInternal set_scratch_size(
+      const int& level, const PerTeamValue& per_team,
+      const PerThreadValue& per_thread) const {
+    TeamPolicyInternal p           = *this;
+    p.m_team_scratch_size[level]   = per_team.value;
     p.m_thread_scratch_size[level] = per_thread.value;
     return p;
   }
 #else
   /** \brief set chunk_size to a discrete value*/
-  inline TeamPolicyInternal& set_chunk_size(typename traits::index_type chunk_size_) {
+  inline TeamPolicyInternal& set_chunk_size(
+      typename traits::index_type chunk_size_) {
     m_chunk_size = chunk_size_;
     return *this;
   }
 
-  /** \brief set per team scratch size for a specific level of the scratch hierarchy */
-  inline TeamPolicyInternal& set_scratch_size(const int& level, const PerTeamValue& per_team) {
+  /** \brief set per team scratch size for a specific level of the scratch
+   * hierarchy */
+  inline TeamPolicyInternal& set_scratch_size(const int& level,
+                                              const PerTeamValue& per_team) {
     m_team_scratch_size[level] = per_team.value;
     return *this;
   }
 
-  /** \brief set per thread scratch size for a specific level of the scratch hierarchy */
-  inline TeamPolicyInternal& set_scratch_size(const int& level, const PerThreadValue& per_thread) {
+  /** \brief set per thread scratch size for a specific level of the scratch
+   * hierarchy */
+  inline TeamPolicyInternal& set_scratch_size(
+      const int& level, const PerThreadValue& per_thread) {
     m_thread_scratch_size[level] = per_thread.value;
     return *this;
   }
 
-  /** \brief set per thread and per team scratch size for a specific level of the scratch hierarchy */
-  inline TeamPolicyInternal& set_scratch_size(const int& level, const PerTeamValue& per_team, const PerThreadValue& per_thread) {
+  /** \brief set per thread and per team scratch size for a specific level of
+   * the scratch hierarchy */
+  inline TeamPolicyInternal& set_scratch_size(
+      const int& level, const PerTeamValue& per_team,
+      const PerThreadValue& per_thread) {
     m_team_scratch_size[level] = per_team.value;
     m_thread_scratch_size[level] = per_thread.value;
     return *this;
   }
 #endif
 
-protected:
+ protected:
 #ifdef KOKKOS_ENABLE_DEPRECATED_CODE
   /** \brief set chunk_size to a discrete value*/
-  inline TeamPolicyInternal internal_set_chunk_size(typename traits::index_type chunk_size_) {
+  inline TeamPolicyInternal internal_set_chunk_size(
+      typename traits::index_type chunk_size_) {
     m_chunk_size = chunk_size_;
     return *this;
   }
 
-  /** \brief set per team scratch size for a specific level of the scratch hierarchy */
-  inline TeamPolicyInternal internal_set_scratch_size(const int& level, const PerTeamValue& per_team) {
+  /** \brief set per team scratch size for a specific level of the scratch
+   * hierarchy */
+  inline TeamPolicyInternal internal_set_scratch_size(
+      const int& level, const PerTeamValue& per_team) {
     m_team_scratch_size[level] = per_team.value;
     return *this;
   }
 
-  /** \brief set per thread scratch size for a specific level of the scratch hierarchy */
-  inline TeamPolicyInternal internal_set_scratch_size(const int& level, const PerThreadValue& per_thread) {
+  /** \brief set per thread scratch size for a specific level of the scratch
+   * hierarchy */
+  inline TeamPolicyInternal internal_set_scratch_size(
+      const int& level, const PerThreadValue& per_thread) {
     m_thread_scratch_size[level] = per_thread.value;
     return *this;
   }
 
-  /** \brief set per thread and per team scratch size for a specific level of the scratch hierarchy */
-  inline TeamPolicyInternal internal_set_scratch_size(const int& level, const PerTeamValue& per_team, const PerThreadValue& per_thread) {
-    m_team_scratch_size[level] = per_team.value;
+  /** \brief set per thread and per team scratch size for a specific level of
+   * the scratch hierarchy */
+  inline TeamPolicyInternal internal_set_scratch_size(
+      const int& level, const PerTeamValue& per_team,
+      const PerThreadValue& per_thread) {
+    m_team_scratch_size[level]   = per_team.value;
     m_thread_scratch_size[level] = per_thread.value;
     return *this;
   }
 #endif
 
-private:
+ private:
   /** \brief finalize chunk_size if it was set to AUTO*/
   inline void set_auto_chunk_size() {
+    int concurrency = traits::execution_space::concurrency() / m_team_alloc;
+    if (concurrency == 0) concurrency = 1;
 
-    int concurrency = traits::execution_space::concurrency()/m_team_alloc;
-    if( concurrency==0 ) concurrency=1;
-
-    if(m_chunk_size > 0) {
-      if(!Impl::is_integral_power_of_two( m_chunk_size ))
-        Kokkos::abort("TeamPolicy blocking granularity must be power of two" );
+    if (m_chunk_size > 0) {
+      if (!Impl::is_integral_power_of_two(m_chunk_size))
+        Kokkos::abort("TeamPolicy blocking granularity must be power of two");
     }
 
     int new_chunk_size = 1;
-    while(new_chunk_size*100*concurrency < m_league_size)
+    while (new_chunk_size * 100 * concurrency < m_league_size)
       new_chunk_size *= 2;
-    if(new_chunk_size < 128) {
+    if (new_chunk_size < 128) {
       new_chunk_size = 1;
-      while( (new_chunk_size*40*concurrency < m_league_size ) && (new_chunk_size<128) )
-        new_chunk_size*=2;
+      while ((new_chunk_size * 40 * concurrency < m_league_size) &&
+             (new_chunk_size < 128))
+        new_chunk_size *= 2;
     }
     m_chunk_size = new_chunk_size;
   }
 
-public:
+ public:
+  typedef Impl::ThreadsExecTeamMember member_type;
 
-  typedef Impl::ThreadsExecTeamMember member_type ;
-
-  friend class Impl::ThreadsExecTeamMember ;
+  friend class Impl::ThreadsExecTeamMember;
 };
 
 } /*namespace Impl */
 } /* namespace Kokkos */
 
-
 namespace Kokkos {
 
-template< typename iType >
+template <typename iType>
 KOKKOS_INLINE_FUNCTION
-Impl::TeamThreadRangeBoundariesStruct< iType, Impl::ThreadsExecTeamMember >
-TeamThreadRange( const Impl::ThreadsExecTeamMember& thread, const iType& count )
-{
-  return Impl::TeamThreadRangeBoundariesStruct< iType, Impl::ThreadsExecTeamMember >( thread, count );
+    Impl::TeamThreadRangeBoundariesStruct<iType, Impl::ThreadsExecTeamMember>
+    TeamThreadRange(const Impl::ThreadsExecTeamMember& thread,
+                    const iType& count) {
+  return Impl::TeamThreadRangeBoundariesStruct<iType,
+                                               Impl::ThreadsExecTeamMember>(
+      thread, count);
 }
 
-template< typename iType1, typename iType2 >
-KOKKOS_INLINE_FUNCTION
-Impl::TeamThreadRangeBoundariesStruct< typename std::common_type< iType1, iType2 >::type,
-                                       Impl::ThreadsExecTeamMember>
-TeamThreadRange( const Impl::ThreadsExecTeamMember& thread, const iType1 & begin, const iType2 & end )
-{
-  typedef typename std::common_type< iType1, iType2 >::type iType;
-  return Impl::TeamThreadRangeBoundariesStruct< iType, Impl::ThreadsExecTeamMember >( thread, iType(begin), iType(end) );
+template <typename iType1, typename iType2>
+KOKKOS_INLINE_FUNCTION Impl::TeamThreadRangeBoundariesStruct<
+    typename std::common_type<iType1, iType2>::type,
+    Impl::ThreadsExecTeamMember>
+TeamThreadRange(const Impl::ThreadsExecTeamMember& thread, const iType1& begin,
+                const iType2& end) {
+  typedef typename std::common_type<iType1, iType2>::type iType;
+  return Impl::TeamThreadRangeBoundariesStruct<iType,
+                                               Impl::ThreadsExecTeamMember>(
+      thread, iType(begin), iType(end));
 }
 
-template< typename iType >
+template <typename iType>
 KOKKOS_INLINE_FUNCTION
-Impl::TeamThreadRangeBoundariesStruct< iType, Impl::ThreadsExecTeamMember >
-TeamVectorRange( const Impl::ThreadsExecTeamMember& thread, const iType& count )
-{
-  return Impl::TeamThreadRangeBoundariesStruct< iType, Impl::ThreadsExecTeamMember >( thread, count );
+    Impl::TeamThreadRangeBoundariesStruct<iType, Impl::ThreadsExecTeamMember>
+    TeamVectorRange(const Impl::ThreadsExecTeamMember& thread,
+                    const iType& count) {
+  return Impl::TeamThreadRangeBoundariesStruct<iType,
+                                               Impl::ThreadsExecTeamMember>(
+      thread, count);
 }
 
-template< typename iType1, typename iType2 >
-KOKKOS_INLINE_FUNCTION
-Impl::TeamThreadRangeBoundariesStruct< typename std::common_type< iType1, iType2 >::type,
-                                       Impl::ThreadsExecTeamMember>
-TeamVectorRange( const Impl::ThreadsExecTeamMember& thread, const iType1 & begin, const iType2 & end )
-{
-  typedef typename std::common_type< iType1, iType2 >::type iType;
-  return Impl::TeamThreadRangeBoundariesStruct< iType, Impl::ThreadsExecTeamMember >( thread, iType(begin), iType(end) );
+template <typename iType1, typename iType2>
+KOKKOS_INLINE_FUNCTION Impl::TeamThreadRangeBoundariesStruct<
+    typename std::common_type<iType1, iType2>::type,
+    Impl::ThreadsExecTeamMember>
+TeamVectorRange(const Impl::ThreadsExecTeamMember& thread, const iType1& begin,
+                const iType2& end) {
+  typedef typename std::common_type<iType1, iType2>::type iType;
+  return Impl::TeamThreadRangeBoundariesStruct<iType,
+                                               Impl::ThreadsExecTeamMember>(
+      thread, iType(begin), iType(end));
 }
 
-template<typename iType>
+template <typename iType>
 KOKKOS_INLINE_FUNCTION
-Impl::ThreadVectorRangeBoundariesStruct<iType,Impl::ThreadsExecTeamMember >
-  ThreadVectorRange(const Impl::ThreadsExecTeamMember& thread, const iType& count) {
-  return Impl::ThreadVectorRangeBoundariesStruct<iType,Impl::ThreadsExecTeamMember >(thread,count);
+    Impl::ThreadVectorRangeBoundariesStruct<iType, Impl::ThreadsExecTeamMember>
+    ThreadVectorRange(const Impl::ThreadsExecTeamMember& thread,
+                      const iType& count) {
+  return Impl::ThreadVectorRangeBoundariesStruct<iType,
+                                                 Impl::ThreadsExecTeamMember>(
+      thread, count);
 }
 
-template<typename iType>
+template <typename iType>
 KOKKOS_INLINE_FUNCTION
-Impl::ThreadVectorRangeBoundariesStruct<iType,Impl::ThreadsExecTeamMember >
-  ThreadVectorRange(const Impl::ThreadsExecTeamMember& thread, const iType& arg_begin, const iType& arg_end) {
-  return Impl::ThreadVectorRangeBoundariesStruct<iType,Impl::ThreadsExecTeamMember >(thread,arg_begin,arg_end);
+    Impl::ThreadVectorRangeBoundariesStruct<iType, Impl::ThreadsExecTeamMember>
+    ThreadVectorRange(const Impl::ThreadsExecTeamMember& thread,
+                      const iType& arg_begin, const iType& arg_end) {
+  return Impl::ThreadVectorRangeBoundariesStruct<iType,
+                                                 Impl::ThreadsExecTeamMember>(
+      thread, arg_begin, arg_end);
 }
 
-
 KOKKOS_INLINE_FUNCTION
-Impl::ThreadSingleStruct<Impl::ThreadsExecTeamMember> PerTeam(const Impl::ThreadsExecTeamMember& thread) {
+Impl::ThreadSingleStruct<Impl::ThreadsExecTeamMember> PerTeam(
+    const Impl::ThreadsExecTeamMember& thread) {
   return Impl::ThreadSingleStruct<Impl::ThreadsExecTeamMember>(thread);
 }
 
 KOKKOS_INLINE_FUNCTION
-Impl::VectorSingleStruct<Impl::ThreadsExecTeamMember> PerThread(const Impl::ThreadsExecTeamMember& thread) {
+Impl::VectorSingleStruct<Impl::ThreadsExecTeamMember> PerThread(
+    const Impl::ThreadsExecTeamMember& thread) {
   return Impl::VectorSingleStruct<Impl::ThreadsExecTeamMember>(thread);
 }
-} // namespace Kokkos
+}  // namespace Kokkos
 
 namespace Kokkos {
 
-  /** \brief  Inter-thread parallel_for. Executes lambda(iType i) for each i=0..N-1.
-   *
-   * The range i=0..N-1 is mapped to all threads of the the calling thread team.
-   * This functionality requires C++11 support.*/
-template<typename iType, class Lambda>
-KOKKOS_INLINE_FUNCTION
-void parallel_for(const Impl::TeamThreadRangeBoundariesStruct<iType,Impl::ThreadsExecTeamMember>& loop_boundaries, const Lambda& lambda) {
-  for( iType i = loop_boundaries.start; i < loop_boundaries.end; i+=loop_boundaries.increment)
+/** \brief  Inter-thread parallel_for. Executes lambda(iType i) for each
+ * i=0..N-1.
+ *
+ * The range i=0..N-1 is mapped to all threads of the the calling thread team.
+ * This functionality requires C++11 support.*/
+template <typename iType, class Lambda>
+KOKKOS_INLINE_FUNCTION void parallel_for(
+    const Impl::TeamThreadRangeBoundariesStruct<
+        iType, Impl::ThreadsExecTeamMember>& loop_boundaries,
+    const Lambda& lambda) {
+  for (iType i = loop_boundaries.start; i < loop_boundaries.end;
+       i += loop_boundaries.increment)
     lambda(i);
 }
 
-/** \brief  Inter-thread vector parallel_reduce. Executes lambda(iType i, ValueType & val) for each i=0..N-1.
+/** \brief  Inter-thread vector parallel_reduce. Executes lambda(iType i,
+ * ValueType & val) for each i=0..N-1.
  *
- * The range i=0..N-1 is mapped to all threads of the the calling thread team and a summation of
- * val is performed and put into result. This functionality requires C++11 support.*/
-template< typename iType, class Lambda, typename ValueType >
+ * The range i=0..N-1 is mapped to all threads of the the calling thread team
+ * and a summation of val is performed and put into result. This functionality
+ * requires C++11 support.*/
+template <typename iType, class Lambda, typename ValueType>
 KOKKOS_INLINE_FUNCTION
-typename std::enable_if< !Kokkos::is_reducer< ValueType >::value >::type
-parallel_reduce(const Impl::TeamThreadRangeBoundariesStruct<iType,Impl::ThreadsExecTeamMember>& loop_boundaries,
-                     const Lambda & lambda, ValueType& result) {
-
+    typename std::enable_if<!Kokkos::is_reducer<ValueType>::value>::type
+    parallel_reduce(const Impl::TeamThreadRangeBoundariesStruct<
+                        iType, Impl::ThreadsExecTeamMember>& loop_boundaries,
+                    const Lambda& lambda, ValueType& result) {
   ValueType intermediate;
   Sum<ValueType> sum(intermediate);
   sum.init(intermediate);
 
-  for( iType i = loop_boundaries.start; i < loop_boundaries.end; i+=loop_boundaries.increment) {
+  for (iType i = loop_boundaries.start; i < loop_boundaries.end;
+       i += loop_boundaries.increment) {
     ValueType tmp = ValueType();
-    lambda(i,tmp);
-    intermediate+=tmp;
+    lambda(i, tmp);
+    intermediate += tmp;
   }
 
-  loop_boundaries.thread.team_reduce(sum,intermediate);
+  loop_boundaries.thread.team_reduce(sum, intermediate);
   result = sum.reference();
 }
 
-template< typename iType, class Lambda, typename ReducerType >
+template <typename iType, class Lambda, typename ReducerType>
 KOKKOS_INLINE_FUNCTION
-typename std::enable_if< Kokkos::is_reducer< ReducerType >::value >::type
-parallel_reduce(const Impl::TeamThreadRangeBoundariesStruct<iType,Impl::ThreadsExecTeamMember>& loop_boundaries,
-                     const Lambda & lambda, const ReducerType& reducer) {
-
+    typename std::enable_if<Kokkos::is_reducer<ReducerType>::value>::type
+    parallel_reduce(const Impl::TeamThreadRangeBoundariesStruct<
+                        iType, Impl::ThreadsExecTeamMember>& loop_boundaries,
+                    const Lambda& lambda, const ReducerType& reducer) {
   typename ReducerType::value_type value;
   reducer.init(value);
 
-  for( iType i = loop_boundaries.start; i < loop_boundaries.end; i+=loop_boundaries.increment) {
-    lambda(i,value);
+  for (iType i = loop_boundaries.start; i < loop_boundaries.end;
+       i += loop_boundaries.increment) {
+    lambda(i, value);
   }
 
-  loop_boundaries.thread.team_reduce(reducer,value);
+  loop_boundaries.thread.team_reduce(reducer, value);
 }
 
-} //namespace Kokkos
-
+}  // namespace Kokkos
 
 namespace Kokkos {
-/** \brief  Intra-thread vector parallel_for. Executes lambda(iType i) for each i=0..N-1.
+/** \brief  Intra-thread vector parallel_for. Executes lambda(iType i) for each
+ * i=0..N-1.
  *
  * The range i=0..N-1 is mapped to all vector lanes of the the calling thread.
  * This functionality requires C++11 support.*/
-template<typename iType, class Lambda>
-KOKKOS_INLINE_FUNCTION
-void parallel_for(const Impl::ThreadVectorRangeBoundariesStruct<iType,Impl::ThreadsExecTeamMember >&
-    loop_boundaries, const Lambda& lambda) {
-  #ifdef KOKKOS_ENABLE_PRAGMA_IVDEP
-  #pragma ivdep
-  #endif
-  for( iType i = loop_boundaries.start; i < loop_boundaries.end; i+=loop_boundaries.increment)
+template <typename iType, class Lambda>
+KOKKOS_INLINE_FUNCTION void parallel_for(
+    const Impl::ThreadVectorRangeBoundariesStruct<
+        iType, Impl::ThreadsExecTeamMember>& loop_boundaries,
+    const Lambda& lambda) {
+#ifdef KOKKOS_ENABLE_PRAGMA_IVDEP
+#pragma ivdep
+#endif
+  for (iType i = loop_boundaries.start; i < loop_boundaries.end;
+       i += loop_boundaries.increment)
     lambda(i);
 }
 
-/** \brief  Intra-thread vector parallel_reduce. Executes lambda(iType i, ValueType & val) for each i=0..N-1.
+/** \brief  Intra-thread vector parallel_reduce. Executes lambda(iType i,
+ * ValueType & val) for each i=0..N-1.
  *
- * The range i=0..N-1 is mapped to all vector lanes of the the calling thread and a summation of
- * val is performed and put into result. This functionality requires C++11 support.*/
-template< typename iType, class Lambda, typename ValueType >
+ * The range i=0..N-1 is mapped to all vector lanes of the the calling thread
+ * and a summation of val is performed and put into result. This functionality
+ * requires C++11 support.*/
+template <typename iType, class Lambda, typename ValueType>
 KOKKOS_INLINE_FUNCTION
-typename std::enable_if< !Kokkos::is_reducer< ValueType >::value >::type
-parallel_reduce(const Impl::ThreadVectorRangeBoundariesStruct<iType,Impl::ThreadsExecTeamMember >&
-      loop_boundaries, const Lambda & lambda, ValueType& result) {
+    typename std::enable_if<!Kokkos::is_reducer<ValueType>::value>::type
+    parallel_reduce(const Impl::ThreadVectorRangeBoundariesStruct<
+                        iType, Impl::ThreadsExecTeamMember>& loop_boundaries,
+                    const Lambda& lambda, ValueType& result) {
   result = ValueType();
-  for( iType i = loop_boundaries.start; i < loop_boundaries.end; i+=loop_boundaries.increment) {
-    lambda(i,result);
+  for (iType i = loop_boundaries.start; i < loop_boundaries.end;
+       i += loop_boundaries.increment) {
+    lambda(i, result);
   }
 }
 
-template< typename iType, class Lambda, typename ReducerType >
+template <typename iType, class Lambda, typename ReducerType>
 KOKKOS_INLINE_FUNCTION
-typename std::enable_if< Kokkos::is_reducer< ReducerType >::value >::type
-parallel_reduce(const Impl::ThreadVectorRangeBoundariesStruct<iType,Impl::ThreadsExecTeamMember >&
-      loop_boundaries, const Lambda & lambda, const ReducerType& reducer) {
+    typename std::enable_if<Kokkos::is_reducer<ReducerType>::value>::type
+    parallel_reduce(const Impl::ThreadVectorRangeBoundariesStruct<
+                        iType, Impl::ThreadsExecTeamMember>& loop_boundaries,
+                    const Lambda& lambda, const ReducerType& reducer) {
   reducer.init(reducer.reference());
-  for( iType i = loop_boundaries.start; i < loop_boundaries.end; i+=loop_boundaries.increment) {
-    lambda(i,reducer.reference());
+  for (iType i = loop_boundaries.start; i < loop_boundaries.end;
+       i += loop_boundaries.increment) {
+    lambda(i, reducer.reference());
   }
 }
 
-
-/** \brief  Intra-thread vector parallel exclusive prefix sum. Executes lambda(iType i, ValueType & val, bool final)
- *          for each i=0..N-1.
+/** \brief  Intra-thread vector parallel exclusive prefix sum. Executes
+ * lambda(iType i, ValueType & val, bool final) for each i=0..N-1.
  *
- * The range i=0..N-1 is mapped to all vector lanes in the thread and a scan operation is performed.
- * Depending on the target execution space the operator might be called twice: once with final=false
- * and once with final=true. When final==true val contains the prefix sum value. The contribution of this
- * "i" needs to be added to val no matter whether final==true or not. In a serial execution
- * (i.e. team_size==1) the operator is only called once with final==true. Scan_val will be set
- * to the final sum value over all vector lanes.
- * This functionality requires C++11 support.*/
-template< typename iType, class FunctorType >
-KOKKOS_INLINE_FUNCTION
-void parallel_scan(const Impl::ThreadVectorRangeBoundariesStruct<iType,Impl::ThreadsExecTeamMember >&
-      loop_boundaries, const FunctorType & lambda) {
-
-  typedef Kokkos::Impl::FunctorValueTraits< FunctorType , void > ValueTraits ;
-  typedef typename ValueTraits::value_type value_type ;
+ * The range i=0..N-1 is mapped to all vector lanes in the thread and a scan
+ * operation is performed. Depending on the target execution space the operator
+ * might be called twice: once with final=false and once with final=true. When
+ * final==true val contains the prefix sum value. The contribution of this "i"
+ * needs to be added to val no matter whether final==true or not. In a serial
+ * execution (i.e. team_size==1) the operator is only called once with
+ * final==true. Scan_val will be set to the final sum value over all vector
+ * lanes. This functionality requires C++11 support.*/
+template <typename iType, class FunctorType>
+KOKKOS_INLINE_FUNCTION void parallel_scan(
+    const Impl::ThreadVectorRangeBoundariesStruct<
+        iType, Impl::ThreadsExecTeamMember>& loop_boundaries,
+    const FunctorType& lambda) {
+  typedef Kokkos::Impl::FunctorValueTraits<FunctorType, void> ValueTraits;
+  typedef typename ValueTraits::value_type value_type;
 
   value_type scan_val = value_type();
 
 #ifdef KOKKOS_ENABLE_PRAGMA_IVDEP
 #pragma ivdep
 #endif
-  for( iType i = loop_boundaries.start; i < loop_boundaries.end; i+=loop_boundaries.increment) {
-    lambda(i,scan_val,true);
+  for (iType i = loop_boundaries.start; i < loop_boundaries.end;
+       i += loop_boundaries.increment) {
+    lambda(i, scan_val, true);
   }
 }
 
-} // namespace Kokkos
+}  // namespace Kokkos
 
 namespace Kokkos {
 
-template<class FunctorType>
-KOKKOS_INLINE_FUNCTION
-void single(const Impl::VectorSingleStruct<Impl::ThreadsExecTeamMember>& single_struct, const FunctorType& lambda) {
+template <class FunctorType>
+KOKKOS_INLINE_FUNCTION void single(
+    const Impl::VectorSingleStruct<Impl::ThreadsExecTeamMember>& single_struct,
+    const FunctorType& lambda) {
   lambda();
 }
 
-template<class FunctorType>
-KOKKOS_INLINE_FUNCTION
-void single(const Impl::ThreadSingleStruct<Impl::ThreadsExecTeamMember>& single_struct, const FunctorType& lambda) {
-  if(single_struct.team_member.team_rank()==0) lambda();
+template <class FunctorType>
+KOKKOS_INLINE_FUNCTION void single(
+    const Impl::ThreadSingleStruct<Impl::ThreadsExecTeamMember>& single_struct,
+    const FunctorType& lambda) {
+  if (single_struct.team_member.team_rank() == 0) lambda();
 }
 
-template<class FunctorType, class ValueType>
-KOKKOS_INLINE_FUNCTION
-void single(const Impl::VectorSingleStruct<Impl::ThreadsExecTeamMember>& single_struct, const FunctorType& lambda, ValueType& val) {
+template <class FunctorType, class ValueType>
+KOKKOS_INLINE_FUNCTION void single(
+    const Impl::VectorSingleStruct<Impl::ThreadsExecTeamMember>& single_struct,
+    const FunctorType& lambda, ValueType& val) {
   lambda(val);
 }
 
-template<class FunctorType, class ValueType>
-KOKKOS_INLINE_FUNCTION
-void single(const Impl::ThreadSingleStruct<Impl::ThreadsExecTeamMember>& single_struct, const FunctorType& lambda, ValueType& val) {
-  if(single_struct.team_member.team_rank()==0) {
+template <class FunctorType, class ValueType>
+KOKKOS_INLINE_FUNCTION void single(
+    const Impl::ThreadSingleStruct<Impl::ThreadsExecTeamMember>& single_struct,
+    const FunctorType& lambda, ValueType& val) {
+  if (single_struct.team_member.team_rank() == 0) {
     lambda(val);
   }
-  single_struct.team_member.team_broadcast(val,0);
-}
+  single_struct.team_member.team_broadcast(val, 0);
 }
+}  // namespace Kokkos
 
 //----------------------------------------------------------------------------
 //----------------------------------------------------------------------------
 #endif
 #endif /* #define KOKKOS_THREADSTEAM_HPP */
-
diff --git a/lib/kokkos/core/src/Threads/Kokkos_Threads_Parallel.hpp b/lib/kokkos/core/src/Threads/Kokkos_Threads_Parallel.hpp
index 022a5fc188..f45830cb24 100644
--- a/lib/kokkos/core/src/Threads/Kokkos_Threads_Parallel.hpp
+++ b/lib/kokkos/core/src/Threads/Kokkos_Threads_Parallel.hpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -45,7 +46,7 @@
 #define KOKKOS_THREADS_PARALLEL_HPP
 
 #include <Kokkos_Macros.hpp>
-#if defined( KOKKOS_ENABLE_THREADS )
+#if defined(KOKKOS_ENABLE_THREADS)
 
 #include <vector>
 #include <iostream>
@@ -65,760 +66,736 @@ namespace Impl {
 //----------------------------------------------------------------------------
 /* ParallelFor Kokkos::Threads with RangePolicy */
 
-template< class FunctorType , class ... Traits >
-class ParallelFor< FunctorType
-                 , Kokkos::RangePolicy< Traits ... >
-                 , Kokkos::Threads
-                 >
-{
-private:
+template <class FunctorType, class... Traits>
+class ParallelFor<FunctorType, Kokkos::RangePolicy<Traits...>,
+                  Kokkos::Threads> {
+ private:
+  typedef Kokkos::RangePolicy<Traits...> Policy;
+  typedef typename Policy::work_tag WorkTag;
+  typedef typename Policy::WorkRange WorkRange;
+  typedef typename Policy::member_type Member;
 
-  typedef Kokkos::RangePolicy< Traits ... > Policy ;
-  typedef typename Policy::work_tag    WorkTag ;
-  typedef typename Policy::WorkRange   WorkRange ;
-  typedef typename Policy::member_type Member ;
+  const FunctorType m_functor;
+  const Policy m_policy;
 
-  const FunctorType  m_functor ;
-  const Policy       m_policy ;
-
-  template< class TagType >
+  template <class TagType>
   inline static
-  typename std::enable_if< std::is_same< TagType , void >::value >::type
-  exec_range( const FunctorType & functor
-            , const Member ibeg , const Member iend )
-    {
-      #if defined( KOKKOS_ENABLE_AGGRESSIVE_VECTORIZATION ) && \
-          defined( KOKKOS_ENABLE_PRAGMA_IVDEP )
-      #pragma ivdep
-      #endif
-      for ( Member i = ibeg ; i < iend ; ++i ) {
-        functor( i );
-      }
+      typename std::enable_if<std::is_same<TagType, void>::value>::type
+      exec_range(const FunctorType &functor, const Member ibeg,
+                 const Member iend) {
+#if defined(KOKKOS_ENABLE_AGGRESSIVE_VECTORIZATION) && \
+    defined(KOKKOS_ENABLE_PRAGMA_IVDEP)
+#pragma ivdep
+#endif
+    for (Member i = ibeg; i < iend; ++i) {
+      functor(i);
     }
-
-  template< class TagType >
-  inline static
-  typename std::enable_if< ! std::is_same< TagType , void >::value >::type
-  exec_range( const FunctorType & functor
-            , const Member ibeg , const Member iend )
-    {
-      const TagType t{} ;
-      #if defined( KOKKOS_ENABLE_AGGRESSIVE_VECTORIZATION ) && \
-          defined( KOKKOS_ENABLE_PRAGMA_IVDEP )
-      #pragma ivdep
-      #endif
-      for ( Member i = ibeg ; i < iend ; ++i ) {
-        functor( t , i );
-      }
-    }
-
-  static void exec( ThreadsExec & exec , const void * arg )
-  {
-    exec_schedule<typename Policy::schedule_type::type>(exec,arg);
   }
 
-  template<class Schedule>
-  static
-  typename std::enable_if< std::is_same<Schedule,Kokkos::Static>::value >::type
-  exec_schedule( ThreadsExec & exec , const void * arg )
-  {
-    const ParallelFor & self = * ((const ParallelFor *) arg );
+  template <class TagType>
+  inline static
+      typename std::enable_if<!std::is_same<TagType, void>::value>::type
+      exec_range(const FunctorType &functor, const Member ibeg,
+                 const Member iend) {
+    const TagType t{};
+#if defined(KOKKOS_ENABLE_AGGRESSIVE_VECTORIZATION) && \
+    defined(KOKKOS_ENABLE_PRAGMA_IVDEP)
+#pragma ivdep
+#endif
+    for (Member i = ibeg; i < iend; ++i) {
+      functor(t, i);
+    }
+  }
 
-    WorkRange range( self.m_policy , exec.pool_rank() , exec.pool_size() );
+  static void exec(ThreadsExec &exec, const void *arg) {
+    exec_schedule<typename Policy::schedule_type::type>(exec, arg);
+  }
 
-    ParallelFor::template exec_range< WorkTag >
-      ( self.m_functor , range.begin() , range.end() );
+  template <class Schedule>
+  static typename std::enable_if<
+      std::is_same<Schedule, Kokkos::Static>::value>::type
+  exec_schedule(ThreadsExec &exec, const void *arg) {
+    const ParallelFor &self = *((const ParallelFor *)arg);
+
+    WorkRange range(self.m_policy, exec.pool_rank(), exec.pool_size());
+
+    ParallelFor::template exec_range<WorkTag>(self.m_functor, range.begin(),
+                                              range.end());
 
     exec.fan_in();
   }
 
-  template<class Schedule>
-  static
-  typename std::enable_if< std::is_same<Schedule,Kokkos::Dynamic>::value >::type
-  exec_schedule( ThreadsExec & exec , const void * arg )
-  {
-    const ParallelFor & self = * ((const ParallelFor *) arg );
+  template <class Schedule>
+  static typename std::enable_if<
+      std::is_same<Schedule, Kokkos::Dynamic>::value>::type
+  exec_schedule(ThreadsExec &exec, const void *arg) {
+    const ParallelFor &self = *((const ParallelFor *)arg);
 
-    WorkRange range( self.m_policy , exec.pool_rank() , exec.pool_size() );
+    WorkRange range(self.m_policy, exec.pool_rank(), exec.pool_size());
 
-    exec.set_work_range(range.begin()-self.m_policy.begin(),range.end()-self.m_policy.begin(),self.m_policy.chunk_size());
+    exec.set_work_range(range.begin() - self.m_policy.begin(),
+                        range.end() - self.m_policy.begin(),
+                        self.m_policy.chunk_size());
     exec.reset_steal_target();
     exec.barrier();
 
     long work_index = exec.get_work_index();
 
-    while(work_index != -1) {
-      const Member begin = static_cast<Member>(work_index) * self.m_policy.chunk_size()+self.m_policy.begin();
-      const Member end = begin + self.m_policy.chunk_size() < self.m_policy.end()?begin+self.m_policy.chunk_size():self.m_policy.end();
-      ParallelFor::template exec_range< WorkTag >
-        ( self.m_functor , begin , end );
+    while (work_index != -1) {
+      const Member begin =
+          static_cast<Member>(work_index) * self.m_policy.chunk_size() +
+          self.m_policy.begin();
+      const Member end =
+          begin + self.m_policy.chunk_size() < self.m_policy.end()
+              ? begin + self.m_policy.chunk_size()
+              : self.m_policy.end();
+      ParallelFor::template exec_range<WorkTag>(self.m_functor, begin, end);
       work_index = exec.get_work_index();
     }
 
     exec.fan_in();
   }
 
-public:
+ public:
+  inline void execute() const {
+    ThreadsExec::start(&ParallelFor::exec, this);
+    ThreadsExec::fence();
+  }
 
-  inline
-  void execute() const
-    {
-      ThreadsExec::start( & ParallelFor::exec , this );
-      ThreadsExec::fence();
-    }
-
-  ParallelFor( const FunctorType & arg_functor
-             , const Policy      & arg_policy )
-    : m_functor( arg_functor )
-    , m_policy( arg_policy )
-    {}
+  ParallelFor(const FunctorType &arg_functor, const Policy &arg_policy)
+      : m_functor(arg_functor), m_policy(arg_policy) {}
 };
 
-
 // MDRangePolicy impl
-template< class FunctorType , class ... Traits >
-class ParallelFor< FunctorType
-                 , Kokkos::MDRangePolicy< Traits ... >
-                 , Kokkos::Threads
-                 >
-{
-private:
-  typedef Kokkos::MDRangePolicy< Traits ... > MDRangePolicy ;
-  typedef typename MDRangePolicy::impl_range_policy         Policy ;
+template <class FunctorType, class... Traits>
+class ParallelFor<FunctorType, Kokkos::MDRangePolicy<Traits...>,
+                  Kokkos::Threads> {
+ private:
+  typedef Kokkos::MDRangePolicy<Traits...> MDRangePolicy;
+  typedef typename MDRangePolicy::impl_range_policy Policy;
 
-  typedef typename MDRangePolicy::work_tag                  WorkTag ;
+  typedef typename MDRangePolicy::work_tag WorkTag;
 
-  typedef typename Policy::WorkRange   WorkRange ;
-  typedef typename Policy::member_type Member ;
+  typedef typename Policy::WorkRange WorkRange;
+  typedef typename Policy::member_type Member;
 
-  typedef typename Kokkos::Impl::HostIterateTile< MDRangePolicy, FunctorType, typename MDRangePolicy::work_tag, void > iterate_type;
+  typedef typename Kokkos::Impl::HostIterateTile<
+      MDRangePolicy, FunctorType, typename MDRangePolicy::work_tag, void>
+      iterate_type;
 
-  const FunctorType   m_functor ;
-  const MDRangePolicy m_mdr_policy ;
-  const Policy        m_policy ;  // construct as RangePolicy( 0, num_tiles ).set_chunk_size(1) in ctor
+  const FunctorType m_functor;
+  const MDRangePolicy m_mdr_policy;
+  const Policy m_policy;  // construct as RangePolicy( 0, num_tiles
+                          // ).set_chunk_size(1) in ctor
 
-  inline static
-  void
-  exec_range( const MDRangePolicy & mdr_policy 
-            , const FunctorType & functor
-            , const Member ibeg , const Member iend )
-    {
-      #if defined( KOKKOS_ENABLE_AGGRESSIVE_VECTORIZATION ) && \
-          defined( KOKKOS_ENABLE_PRAGMA_IVDEP )
-      #pragma ivdep
-      #endif
-      for ( Member i = ibeg ; i < iend ; ++i ) {
-        iterate_type( mdr_policy, functor )( i );
-      }
+  inline static void exec_range(const MDRangePolicy &mdr_policy,
+                                const FunctorType &functor, const Member ibeg,
+                                const Member iend) {
+#if defined(KOKKOS_ENABLE_AGGRESSIVE_VECTORIZATION) && \
+    defined(KOKKOS_ENABLE_PRAGMA_IVDEP)
+#pragma ivdep
+#endif
+    for (Member i = ibeg; i < iend; ++i) {
+      iterate_type(mdr_policy, functor)(i);
     }
-
-  static void exec( ThreadsExec & exec , const void * arg )
-  {
-    exec_schedule<typename Policy::schedule_type::type>(exec,arg);
   }
 
-  template<class Schedule>
-  static
-  typename std::enable_if< std::is_same<Schedule,Kokkos::Static>::value >::type
-  exec_schedule( ThreadsExec & exec , const void * arg )
-  {
-    const ParallelFor & self = * ((const ParallelFor *) arg );
+  static void exec(ThreadsExec &exec, const void *arg) {
+    exec_schedule<typename Policy::schedule_type::type>(exec, arg);
+  }
 
-    WorkRange range( self.m_policy , exec.pool_rank() , exec.pool_size() );
+  template <class Schedule>
+  static typename std::enable_if<
+      std::is_same<Schedule, Kokkos::Static>::value>::type
+  exec_schedule(ThreadsExec &exec, const void *arg) {
+    const ParallelFor &self = *((const ParallelFor *)arg);
 
-    ParallelFor::exec_range
-      ( self.m_mdr_policy, self.m_functor , range.begin() , range.end() );
+    WorkRange range(self.m_policy, exec.pool_rank(), exec.pool_size());
+
+    ParallelFor::exec_range(self.m_mdr_policy, self.m_functor, range.begin(),
+                            range.end());
 
     exec.fan_in();
   }
 
-  template<class Schedule>
-  static
-  typename std::enable_if< std::is_same<Schedule,Kokkos::Dynamic>::value >::type
-  exec_schedule( ThreadsExec & exec , const void * arg )
-  {
-    const ParallelFor & self = * ((const ParallelFor *) arg );
+  template <class Schedule>
+  static typename std::enable_if<
+      std::is_same<Schedule, Kokkos::Dynamic>::value>::type
+  exec_schedule(ThreadsExec &exec, const void *arg) {
+    const ParallelFor &self = *((const ParallelFor *)arg);
 
-    WorkRange range( self.m_policy , exec.pool_rank() , exec.pool_size() );
+    WorkRange range(self.m_policy, exec.pool_rank(), exec.pool_size());
 
-    exec.set_work_range(range.begin(),range.end(),self.m_policy.chunk_size());
+    exec.set_work_range(range.begin(), range.end(), self.m_policy.chunk_size());
     exec.reset_steal_target();
     exec.barrier();
 
     long work_index = exec.get_work_index();
 
-    while(work_index != -1) {
-      const Member begin = static_cast<Member>(work_index) * self.m_policy.chunk_size();
-      const Member end = begin + self.m_policy.chunk_size() < self.m_policy.end()?begin+self.m_policy.chunk_size():self.m_policy.end();
+    while (work_index != -1) {
+      const Member begin =
+          static_cast<Member>(work_index) * self.m_policy.chunk_size();
+      const Member end =
+          begin + self.m_policy.chunk_size() < self.m_policy.end()
+              ? begin + self.m_policy.chunk_size()
+              : self.m_policy.end();
 
-      ParallelFor::exec_range
-        ( self.m_mdr_policy, self.m_functor , begin , end );
+      ParallelFor::exec_range(self.m_mdr_policy, self.m_functor, begin, end);
       work_index = exec.get_work_index();
     }
 
     exec.fan_in();
   }
 
-public:
+ public:
+  inline void execute() const {
+    ThreadsExec::start(&ParallelFor::exec, this);
+    ThreadsExec::fence();
+  }
 
-  inline
-  void execute() const
-    {
-      ThreadsExec::start( & ParallelFor::exec , this );
-      ThreadsExec::fence();
-    }
-
-  ParallelFor( const FunctorType & arg_functor
-             , const MDRangePolicy      & arg_policy )
-    : m_functor( arg_functor )
-    , m_mdr_policy( arg_policy )
-    , m_policy( Policy(0, m_mdr_policy.m_num_tiles).set_chunk_size(1) )
-    {}
+  ParallelFor(const FunctorType &arg_functor, const MDRangePolicy &arg_policy)
+      : m_functor(arg_functor),
+        m_mdr_policy(arg_policy),
+        m_policy(Policy(0, m_mdr_policy.m_num_tiles).set_chunk_size(1)) {}
 };
 
 //----------------------------------------------------------------------------
 /* ParallelFor Kokkos::Threads with TeamPolicy */
 
-template< class FunctorType , class ... Properties >
-class ParallelFor< FunctorType
-                 , Kokkos::TeamPolicy< Properties ... >
-                 , Kokkos::Threads
-                 >
-{
-private:
+template <class FunctorType, class... Properties>
+class ParallelFor<FunctorType, Kokkos::TeamPolicy<Properties...>,
+                  Kokkos::Threads> {
+ private:
+  typedef Kokkos::Impl::TeamPolicyInternal<Kokkos::Threads, Properties...>
+      Policy;
+  typedef typename Policy::work_tag WorkTag;
+  typedef typename Policy::member_type Member;
 
-  typedef Kokkos::Impl::TeamPolicyInternal< Kokkos::Threads, Properties ... >  Policy ;
-  typedef typename Policy::work_tag                    WorkTag ;
-  typedef typename Policy::member_type                 Member ;
+  const FunctorType m_functor;
+  const Policy m_policy;
+  const int m_shared;
 
-  const FunctorType  m_functor ;
-  const Policy       m_policy ;
-  const int          m_shared ;
-
-  template< class TagType , class Schedule>
-  inline static
-  typename std::enable_if< std::is_same< TagType , void >::value
-  && std::is_same<Schedule,Kokkos::Static>::value >::type
-  exec_team( const FunctorType & functor , Member member )
-    {
-      for ( ; member.valid_static() ; member.next_static() ) {
-        functor( member );
-      }
+  template <class TagType, class Schedule>
+  inline static typename std::enable_if<
+      std::is_same<TagType, void>::value &&
+      std::is_same<Schedule, Kokkos::Static>::value>::type
+  exec_team(const FunctorType &functor, Member member) {
+    for (; member.valid_static(); member.next_static()) {
+      functor(member);
     }
+  }
 
-  template< class TagType , class Schedule>
-  inline static
-  typename std::enable_if< ! std::is_same< TagType , void >::value
-  && std::is_same<Schedule,Kokkos::Static>::value >::type
-  exec_team( const FunctorType & functor , Member member )
-    {
-      const TagType t{} ;
-      for ( ; member.valid_static() ; member.next_static() ) {
-        functor( t , member );
-      }
+  template <class TagType, class Schedule>
+  inline static typename std::enable_if<
+      !std::is_same<TagType, void>::value &&
+      std::is_same<Schedule, Kokkos::Static>::value>::type
+  exec_team(const FunctorType &functor, Member member) {
+    const TagType t{};
+    for (; member.valid_static(); member.next_static()) {
+      functor(t, member);
     }
+  }
 
-  template< class TagType , class Schedule>
-  inline static
-  typename std::enable_if< std::is_same< TagType , void >::value
-  && std::is_same<Schedule,Kokkos::Dynamic>::value >::type
-  exec_team( const FunctorType & functor , Member member )
-    {
-
-      for ( ; member.valid_dynamic() ; member.next_dynamic() ) {
-        functor( member );
-      }
+  template <class TagType, class Schedule>
+  inline static typename std::enable_if<
+      std::is_same<TagType, void>::value &&
+      std::is_same<Schedule, Kokkos::Dynamic>::value>::type
+  exec_team(const FunctorType &functor, Member member) {
+    for (; member.valid_dynamic(); member.next_dynamic()) {
+      functor(member);
     }
+  }
 
-  template< class TagType , class Schedule>
-  inline static
-  typename std::enable_if< ! std::is_same< TagType , void >::value
-                          && std::is_same<Schedule,Kokkos::Dynamic>::value >::type
-  exec_team( const FunctorType & functor , Member member )
-    {
-      const TagType t{} ;
-      for ( ; member.valid_dynamic() ; member.next_dynamic() ) {
-        functor( t , member );
-      }
+  template <class TagType, class Schedule>
+  inline static typename std::enable_if<
+      !std::is_same<TagType, void>::value &&
+      std::is_same<Schedule, Kokkos::Dynamic>::value>::type
+  exec_team(const FunctorType &functor, Member member) {
+    const TagType t{};
+    for (; member.valid_dynamic(); member.next_dynamic()) {
+      functor(t, member);
     }
+  }
 
-  static void exec( ThreadsExec & exec , const void * arg )
-  {
-    const ParallelFor & self = * ((const ParallelFor *) arg );
+  static void exec(ThreadsExec &exec, const void *arg) {
+    const ParallelFor &self = *((const ParallelFor *)arg);
 
-    ParallelFor::exec_team< WorkTag , typename Policy::schedule_type::type >
-      ( self.m_functor , Member( & exec , self.m_policy , self.m_shared ) );
+    ParallelFor::exec_team<WorkTag, typename Policy::schedule_type::type>(
+        self.m_functor, Member(&exec, self.m_policy, self.m_shared));
 
     exec.barrier();
     exec.fan_in();
   }
 
-public:
+ public:
+  inline void execute() const {
+    ThreadsExec::resize_scratch(
+        0, Policy::member_type::team_reduce_size() + m_shared);
 
-  inline
-  void execute() const
-    {
-      ThreadsExec::resize_scratch( 0 , Policy::member_type::team_reduce_size() + m_shared );
+    ThreadsExec::start(&ParallelFor::exec, this);
 
-      ThreadsExec::start( & ParallelFor::exec , this );
+    ThreadsExec::fence();
+  }
 
-      ThreadsExec::fence();
-    }
-
-  ParallelFor( const FunctorType & arg_functor
-             , const Policy      & arg_policy )
-    : m_functor( arg_functor )
-    , m_policy(  arg_policy )
-    , m_shared( arg_policy.scratch_size(0) + arg_policy.scratch_size(1) + FunctorTeamShmemSize< FunctorType >::value( arg_functor , arg_policy.team_size() ) )
-    { }
+  ParallelFor(const FunctorType &arg_functor, const Policy &arg_policy)
+      : m_functor(arg_functor),
+        m_policy(arg_policy),
+        m_shared(arg_policy.scratch_size(0) + arg_policy.scratch_size(1) +
+                 FunctorTeamShmemSize<FunctorType>::value(
+                     arg_functor, arg_policy.team_size())) {}
 };
 
 //----------------------------------------------------------------------------
 //----------------------------------------------------------------------------
 /* ParallelReduce with Kokkos::Threads and RangePolicy */
 
-template< class FunctorType , class ReducerType, class ... Traits >
-class ParallelReduce< FunctorType
-                    , Kokkos::RangePolicy< Traits ... >
-                    , ReducerType
-                    , Kokkos::Threads
-                    >
-{
-private:
+template <class FunctorType, class ReducerType, class... Traits>
+class ParallelReduce<FunctorType, Kokkos::RangePolicy<Traits...>, ReducerType,
+                     Kokkos::Threads> {
+ private:
+  typedef Kokkos::RangePolicy<Traits...> Policy;
 
-  typedef Kokkos::RangePolicy< Traits ... > Policy ;
+  typedef typename Policy::work_tag WorkTag;
+  typedef typename Policy::WorkRange WorkRange;
+  typedef typename Policy::member_type Member;
 
-  typedef typename Policy::work_tag    WorkTag ;
-  typedef typename Policy::WorkRange   WorkRange ;
-  typedef typename Policy::member_type Member ;
-
-  typedef Kokkos::Impl::if_c< std::is_same<InvalidType,ReducerType>::value, FunctorType, ReducerType> ReducerConditional;
+  typedef Kokkos::Impl::if_c<std::is_same<InvalidType, ReducerType>::value,
+                             FunctorType, ReducerType>
+      ReducerConditional;
   typedef typename ReducerConditional::type ReducerTypeFwd;
-  typedef typename Kokkos::Impl::if_c< std::is_same<InvalidType,ReducerType>::value, WorkTag, void>::type WorkTagFwd;
+  typedef
+      typename Kokkos::Impl::if_c<std::is_same<InvalidType, ReducerType>::value,
+                                  WorkTag, void>::type WorkTagFwd;
 
-  typedef Kokkos::Impl::FunctorValueTraits< ReducerTypeFwd , WorkTagFwd > ValueTraits ;
-  typedef Kokkos::Impl::FunctorValueInit<   ReducerTypeFwd , WorkTagFwd > ValueInit ;
+  typedef Kokkos::Impl::FunctorValueTraits<ReducerTypeFwd, WorkTagFwd>
+      ValueTraits;
+  typedef Kokkos::Impl::FunctorValueInit<ReducerTypeFwd, WorkTagFwd> ValueInit;
 
-  typedef typename ValueTraits::pointer_type    pointer_type ;
-  typedef typename ValueTraits::reference_type  reference_type ;
+  typedef typename ValueTraits::pointer_type pointer_type;
+  typedef typename ValueTraits::reference_type reference_type;
 
-  const FunctorType  m_functor ;
-  const Policy       m_policy ;
-  const ReducerType   m_reducer ;
-  const pointer_type m_result_ptr ;
+  const FunctorType m_functor;
+  const Policy m_policy;
+  const ReducerType m_reducer;
+  const pointer_type m_result_ptr;
 
-  template< class TagType >
+  template <class TagType>
   inline static
-  typename std::enable_if< std::is_same< TagType , void >::value >::type
-  exec_range( const FunctorType & functor
-            , const Member & ibeg , const Member & iend
-            , reference_type update )
-    {
-      #if defined( KOKKOS_ENABLE_AGGRESSIVE_VECTORIZATION ) && \
-          defined( KOKKOS_ENABLE_PRAGMA_IVDEP )
-      #pragma ivdep
-      #endif
-      for ( Member i = ibeg ; i < iend ; ++i ) {
-        functor( i , update );
-      }
+      typename std::enable_if<std::is_same<TagType, void>::value>::type
+      exec_range(const FunctorType &functor, const Member &ibeg,
+                 const Member &iend, reference_type update) {
+#if defined(KOKKOS_ENABLE_AGGRESSIVE_VECTORIZATION) && \
+    defined(KOKKOS_ENABLE_PRAGMA_IVDEP)
+#pragma ivdep
+#endif
+    for (Member i = ibeg; i < iend; ++i) {
+      functor(i, update);
     }
+  }
 
-  template< class TagType >
+  template <class TagType>
   inline static
-  typename std::enable_if< ! std::is_same< TagType , void >::value >::type
-  exec_range( const FunctorType & functor
-            , const Member & ibeg , const Member & iend
-            , reference_type update )
-    {
-      const TagType t{} ;
-      #if defined( KOKKOS_ENABLE_AGGRESSIVE_VECTORIZATION ) && \
-          defined( KOKKOS_ENABLE_PRAGMA_IVDEP )
-      #pragma ivdep
-      #endif
-      for ( Member i = ibeg ; i < iend ; ++i ) {
-        functor( t , i , update );
-      }
+      typename std::enable_if<!std::is_same<TagType, void>::value>::type
+      exec_range(const FunctorType &functor, const Member &ibeg,
+                 const Member &iend, reference_type update) {
+    const TagType t{};
+#if defined(KOKKOS_ENABLE_AGGRESSIVE_VECTORIZATION) && \
+    defined(KOKKOS_ENABLE_PRAGMA_IVDEP)
+#pragma ivdep
+#endif
+    for (Member i = ibeg; i < iend; ++i) {
+      functor(t, i, update);
     }
+  }
 
-  static void
-  exec( ThreadsExec & exec , const void * arg ) {
+  static void exec(ThreadsExec &exec, const void *arg) {
     exec_schedule<typename Policy::schedule_type::type>(exec, arg);
   }
 
-  template<class Schedule>
-  static
-  typename std::enable_if< std::is_same<Schedule,Kokkos::Static>::value >::type
-  exec_schedule( ThreadsExec & exec , const void * arg )
-  {
-    const ParallelReduce & self = * ((const ParallelReduce *) arg );
-    const WorkRange range( self.m_policy, exec.pool_rank(), exec.pool_size() );
+  template <class Schedule>
+  static typename std::enable_if<
+      std::is_same<Schedule, Kokkos::Static>::value>::type
+  exec_schedule(ThreadsExec &exec, const void *arg) {
+    const ParallelReduce &self = *((const ParallelReduce *)arg);
+    const WorkRange range(self.m_policy, exec.pool_rank(), exec.pool_size());
 
-    ParallelReduce::template exec_range< WorkTag >
-      ( self.m_functor , range.begin() , range.end()
-      , ValueInit::init( ReducerConditional::select(self.m_functor , self.m_reducer) , exec.reduce_memory() ) );
+    ParallelReduce::template exec_range<WorkTag>(
+        self.m_functor, range.begin(), range.end(),
+        ValueInit::init(
+            ReducerConditional::select(self.m_functor, self.m_reducer),
+            exec.reduce_memory()));
 
-    exec.template fan_in_reduce< ReducerTypeFwd , WorkTagFwd >( ReducerConditional::select(self.m_functor , self.m_reducer) );
+    exec.template fan_in_reduce<ReducerTypeFwd, WorkTagFwd>(
+        ReducerConditional::select(self.m_functor, self.m_reducer));
   }
 
-  template<class Schedule>
-  static
-  typename std::enable_if< std::is_same<Schedule,Kokkos::Dynamic>::value >::type
-    exec_schedule( ThreadsExec & exec , const void * arg )
-  {
-    const ParallelReduce & self = * ((const ParallelReduce *) arg );
-    const WorkRange range( self.m_policy, exec.pool_rank(), exec.pool_size() );
+  template <class Schedule>
+  static typename std::enable_if<
+      std::is_same<Schedule, Kokkos::Dynamic>::value>::type
+  exec_schedule(ThreadsExec &exec, const void *arg) {
+    const ParallelReduce &self = *((const ParallelReduce *)arg);
+    const WorkRange range(self.m_policy, exec.pool_rank(), exec.pool_size());
 
-    exec.set_work_range(range.begin()-self.m_policy.begin(),range.end()-self.m_policy.begin(),self.m_policy.chunk_size());
+    exec.set_work_range(range.begin() - self.m_policy.begin(),
+                        range.end() - self.m_policy.begin(),
+                        self.m_policy.chunk_size());
     exec.reset_steal_target();
     exec.barrier();
 
-    long work_index = exec.get_work_index();
-    reference_type update = ValueInit::init( ReducerConditional::select(self.m_functor , self.m_reducer) , exec.reduce_memory() );
-    while(work_index != -1) {
-      const Member begin = static_cast<Member>(work_index) * self.m_policy.chunk_size() + self.m_policy.begin();
-      const Member end = begin + self.m_policy.chunk_size() < self.m_policy.end()?begin+self.m_policy.chunk_size():self.m_policy.end();
-      ParallelReduce::template exec_range< WorkTag >
-        ( self.m_functor , begin , end
-        , update );
+    long work_index       = exec.get_work_index();
+    reference_type update = ValueInit::init(
+        ReducerConditional::select(self.m_functor, self.m_reducer),
+        exec.reduce_memory());
+    while (work_index != -1) {
+      const Member begin =
+          static_cast<Member>(work_index) * self.m_policy.chunk_size() +
+          self.m_policy.begin();
+      const Member end =
+          begin + self.m_policy.chunk_size() < self.m_policy.end()
+              ? begin + self.m_policy.chunk_size()
+              : self.m_policy.end();
+      ParallelReduce::template exec_range<WorkTag>(self.m_functor, begin, end,
+                                                   update);
       work_index = exec.get_work_index();
     }
 
-    exec.template fan_in_reduce< ReducerTypeFwd , WorkTagFwd >( ReducerConditional::select(self.m_functor , self.m_reducer) );
+    exec.template fan_in_reduce<ReducerTypeFwd, WorkTagFwd>(
+        ReducerConditional::select(self.m_functor, self.m_reducer));
   }
 
-public:
+ public:
+  inline void execute() const {
+    ThreadsExec::resize_scratch(
+        ValueTraits::value_size(
+            ReducerConditional::select(m_functor, m_reducer)),
+        0);
 
-  inline
-  void execute() const
-    {
-      ThreadsExec::resize_scratch( ValueTraits::value_size( ReducerConditional::select(m_functor , m_reducer) ) , 0 );
+    ThreadsExec::start(&ParallelReduce::exec, this);
 
-      ThreadsExec::start( & ParallelReduce::exec , this );
+    ThreadsExec::fence();
 
-      ThreadsExec::fence();
+    if (m_result_ptr) {
+      const pointer_type data =
+          (pointer_type)ThreadsExec::root_reduce_scratch();
 
-      if ( m_result_ptr ) {
-
-        const pointer_type data =
-          (pointer_type) ThreadsExec::root_reduce_scratch();
-
-        const unsigned n = ValueTraits::value_count( ReducerConditional::select(m_functor , m_reducer) );
-        for ( unsigned i = 0 ; i < n ; ++i ) { m_result_ptr[i] = data[i]; }
+      const unsigned n = ValueTraits::value_count(
+          ReducerConditional::select(m_functor, m_reducer));
+      for (unsigned i = 0; i < n; ++i) {
+        m_result_ptr[i] = data[i];
       }
     }
+  }
 
-  template< class HostViewType >
-  ParallelReduce( const FunctorType  & arg_functor ,
-                  const Policy       & arg_policy ,
-                  const HostViewType & arg_result_view ,
-                  typename std::enable_if<
-                               Kokkos::is_view< HostViewType >::value &&
-                              !Kokkos::is_reducer_type<ReducerType>::value
-                  ,void*>::type = NULL)
-    : m_functor( arg_functor )
-    , m_policy( arg_policy )
-    , m_reducer( InvalidType() )
-    , m_result_ptr( arg_result_view.data() )
-    {
-      static_assert( Kokkos::is_view< HostViewType >::value
-        , "Kokkos::Threads reduce result must be a View" );
+  template <class HostViewType>
+  ParallelReduce(
+      const FunctorType &arg_functor, const Policy &arg_policy,
+      const HostViewType &arg_result_view,
+      typename std::enable_if<Kokkos::is_view<HostViewType>::value &&
+                                  !Kokkos::is_reducer_type<ReducerType>::value,
+                              void *>::type = NULL)
+      : m_functor(arg_functor),
+        m_policy(arg_policy),
+        m_reducer(InvalidType()),
+        m_result_ptr(arg_result_view.data()) {
+    static_assert(Kokkos::is_view<HostViewType>::value,
+                  "Kokkos::Threads reduce result must be a View");
 
-      static_assert( std::is_same< typename HostViewType::memory_space , HostSpace >::value
-        , "Kokkos::Threads reduce result must be a View in HostSpace" );
-    }
-
-  inline
-  ParallelReduce( const FunctorType & arg_functor
-                , Policy       arg_policy
-                , const ReducerType& reducer )
-    : m_functor( arg_functor )
-    , m_policy(  arg_policy )
-    , m_reducer( reducer )
-    , m_result_ptr(  reducer.view().data() )
-    {
-      /*static_assert( std::is_same< typename ViewType::memory_space
-                                      , Kokkos::HostSpace >::value
-        , "Reduction result on Kokkos::OpenMP must be a Kokkos::View in HostSpace" );*/
-    }
+    static_assert(
+        std::is_same<typename HostViewType::memory_space, HostSpace>::value,
+        "Kokkos::Threads reduce result must be a View in HostSpace");
+  }
 
+  inline ParallelReduce(const FunctorType &arg_functor, Policy arg_policy,
+                        const ReducerType &reducer)
+      : m_functor(arg_functor),
+        m_policy(arg_policy),
+        m_reducer(reducer),
+        m_result_ptr(reducer.view().data()) {
+    /*static_assert( std::is_same< typename ViewType::memory_space
+                                    , Kokkos::HostSpace >::value
+      , "Reduction result on Kokkos::OpenMP must be a Kokkos::View in HostSpace"
+      );*/
+  }
 };
 
-
 // MDRangePolicy impl
-template< class FunctorType , class ReducerType, class ... Traits >
-class ParallelReduce< FunctorType
-                    , Kokkos::MDRangePolicy< Traits ... >
-                    , ReducerType
-                    , Kokkos::Threads
-                    >
-{
-private:
+template <class FunctorType, class ReducerType, class... Traits>
+class ParallelReduce<FunctorType, Kokkos::MDRangePolicy<Traits...>, ReducerType,
+                     Kokkos::Threads> {
+ private:
+  typedef Kokkos::MDRangePolicy<Traits...> MDRangePolicy;
+  typedef typename MDRangePolicy::impl_range_policy Policy;
 
-  typedef Kokkos::MDRangePolicy< Traits ... > MDRangePolicy ;
-  typedef typename MDRangePolicy::impl_range_policy Policy ;
+  typedef typename MDRangePolicy::work_tag WorkTag;
+  typedef typename Policy::WorkRange WorkRange;
+  typedef typename Policy::member_type Member;
 
-  typedef typename MDRangePolicy::work_tag    WorkTag ;
-  typedef typename Policy::WorkRange   WorkRange ;
-  typedef typename Policy::member_type Member ;
-
-  typedef Kokkos::Impl::if_c< std::is_same<InvalidType,ReducerType>::value, FunctorType, ReducerType> ReducerConditional;
+  typedef Kokkos::Impl::if_c<std::is_same<InvalidType, ReducerType>::value,
+                             FunctorType, ReducerType>
+      ReducerConditional;
   typedef typename ReducerConditional::type ReducerTypeFwd;
-  typedef typename Kokkos::Impl::if_c< std::is_same<InvalidType,ReducerType>::value, WorkTag, void>::type WorkTagFwd;
+  typedef
+      typename Kokkos::Impl::if_c<std::is_same<InvalidType, ReducerType>::value,
+                                  WorkTag, void>::type WorkTagFwd;
 
-  typedef Kokkos::Impl::FunctorValueTraits< ReducerTypeFwd , WorkTagFwd > ValueTraits ;
-  typedef Kokkos::Impl::FunctorValueInit<   ReducerTypeFwd , WorkTagFwd > ValueInit ;
+  typedef Kokkos::Impl::FunctorValueTraits<ReducerTypeFwd, WorkTagFwd>
+      ValueTraits;
+  typedef Kokkos::Impl::FunctorValueInit<ReducerTypeFwd, WorkTagFwd> ValueInit;
 
-  typedef typename ValueTraits::pointer_type    pointer_type ;
-  typedef typename ValueTraits::value_type      value_type ;
-  typedef typename ValueTraits::reference_type  reference_type ;
+  typedef typename ValueTraits::pointer_type pointer_type;
+  typedef typename ValueTraits::value_type value_type;
+  typedef typename ValueTraits::reference_type reference_type;
 
-  using iterate_type = typename Kokkos::Impl::HostIterateTile< MDRangePolicy
-                                                                           , FunctorType
-                                                                           , WorkTag
-                                                                           , reference_type
-                                                                           >;
+  using iterate_type =
+      typename Kokkos::Impl::HostIterateTile<MDRangePolicy, FunctorType,
+                                             WorkTag, reference_type>;
 
-  const FunctorType   m_functor ;
-  const MDRangePolicy m_mdr_policy ;
-  const Policy        m_policy ;  // construct as RangePolicy( 0, num_tiles ).set_chunk_size(1) in ctor
-  const ReducerType   m_reducer ;
-  const pointer_type  m_result_ptr ;
+  const FunctorType m_functor;
+  const MDRangePolicy m_mdr_policy;
+  const Policy m_policy;  // construct as RangePolicy( 0, num_tiles
+                          // ).set_chunk_size(1) in ctor
+  const ReducerType m_reducer;
+  const pointer_type m_result_ptr;
 
-  inline static
-  void
-  exec_range( const MDRangePolicy & mdr_policy
-            , const FunctorType & functor
-            , const Member & ibeg , const Member & iend
-            , reference_type update )
-    {
-      #if defined( KOKKOS_ENABLE_AGGRESSIVE_VECTORIZATION ) && \
-          defined( KOKKOS_ENABLE_PRAGMA_IVDEP )
-      #pragma ivdep
-      #endif
-      for ( Member i = ibeg ; i < iend ; ++i ) {
-        iterate_type( mdr_policy, functor, update )( i );
-      }
+  inline static void exec_range(const MDRangePolicy &mdr_policy,
+                                const FunctorType &functor, const Member &ibeg,
+                                const Member &iend, reference_type update) {
+#if defined(KOKKOS_ENABLE_AGGRESSIVE_VECTORIZATION) && \
+    defined(KOKKOS_ENABLE_PRAGMA_IVDEP)
+#pragma ivdep
+#endif
+    for (Member i = ibeg; i < iend; ++i) {
+      iterate_type(mdr_policy, functor, update)(i);
     }
+  }
 
-  static void
-  exec( ThreadsExec & exec , const void * arg ) {
+  static void exec(ThreadsExec &exec, const void *arg) {
     exec_schedule<typename Policy::schedule_type::type>(exec, arg);
   }
 
-  template<class Schedule>
-  static
-  typename std::enable_if< std::is_same<Schedule,Kokkos::Static>::value >::type
-  exec_schedule( ThreadsExec & exec , const void * arg )
-  {
-    const ParallelReduce & self = * ((const ParallelReduce *) arg );
-    const WorkRange range( self.m_policy, exec.pool_rank(), exec.pool_size() );
+  template <class Schedule>
+  static typename std::enable_if<
+      std::is_same<Schedule, Kokkos::Static>::value>::type
+  exec_schedule(ThreadsExec &exec, const void *arg) {
+    const ParallelReduce &self = *((const ParallelReduce *)arg);
+    const WorkRange range(self.m_policy, exec.pool_rank(), exec.pool_size());
 
-    ParallelReduce::exec_range
-      ( self.m_mdr_policy, self.m_functor , range.begin() , range.end()
-      , ValueInit::init( ReducerConditional::select(self.m_functor , self.m_reducer) , exec.reduce_memory() ) );
+    ParallelReduce::exec_range(
+        self.m_mdr_policy, self.m_functor, range.begin(), range.end(),
+        ValueInit::init(
+            ReducerConditional::select(self.m_functor, self.m_reducer),
+            exec.reduce_memory()));
 
-    exec.template fan_in_reduce< ReducerTypeFwd , WorkTagFwd >( ReducerConditional::select(self.m_functor , self.m_reducer) );
+    exec.template fan_in_reduce<ReducerTypeFwd, WorkTagFwd>(
+        ReducerConditional::select(self.m_functor, self.m_reducer));
   }
 
-  template<class Schedule>
-  static
-  typename std::enable_if< std::is_same<Schedule,Kokkos::Dynamic>::value >::type
-    exec_schedule( ThreadsExec & exec , const void * arg )
-  {
-    const ParallelReduce & self = * ((const ParallelReduce *) arg );
-    const WorkRange range( self.m_policy, exec.pool_rank(), exec.pool_size() );
+  template <class Schedule>
+  static typename std::enable_if<
+      std::is_same<Schedule, Kokkos::Dynamic>::value>::type
+  exec_schedule(ThreadsExec &exec, const void *arg) {
+    const ParallelReduce &self = *((const ParallelReduce *)arg);
+    const WorkRange range(self.m_policy, exec.pool_rank(), exec.pool_size());
 
-    exec.set_work_range(range.begin(),range.end(),self.m_policy.chunk_size());
+    exec.set_work_range(range.begin(), range.end(), self.m_policy.chunk_size());
     exec.reset_steal_target();
     exec.barrier();
 
-    long work_index = exec.get_work_index();
-    reference_type update = ValueInit::init( ReducerConditional::select(self.m_functor , self.m_reducer) , exec.reduce_memory() );
-    while(work_index != -1) {
-      const Member begin = static_cast<Member>(work_index) * self.m_policy.chunk_size();
-      const Member end = begin + self.m_policy.chunk_size() < self.m_policy.end()?begin+self.m_policy.chunk_size():self.m_policy.end();
-      ParallelReduce::exec_range
-        ( self.m_mdr_policy, self.m_functor , begin , end
-        , update );
+    long work_index       = exec.get_work_index();
+    reference_type update = ValueInit::init(
+        ReducerConditional::select(self.m_functor, self.m_reducer),
+        exec.reduce_memory());
+    while (work_index != -1) {
+      const Member begin =
+          static_cast<Member>(work_index) * self.m_policy.chunk_size();
+      const Member end =
+          begin + self.m_policy.chunk_size() < self.m_policy.end()
+              ? begin + self.m_policy.chunk_size()
+              : self.m_policy.end();
+      ParallelReduce::exec_range(self.m_mdr_policy, self.m_functor, begin, end,
+                                 update);
       work_index = exec.get_work_index();
     }
 
-    exec.template fan_in_reduce< ReducerTypeFwd , WorkTagFwd >( ReducerConditional::select(self.m_functor , self.m_reducer) );
+    exec.template fan_in_reduce<ReducerTypeFwd, WorkTagFwd>(
+        ReducerConditional::select(self.m_functor, self.m_reducer));
   }
 
-public:
+ public:
+  inline void execute() const {
+    ThreadsExec::resize_scratch(
+        ValueTraits::value_size(
+            ReducerConditional::select(m_functor, m_reducer)),
+        0);
 
-  inline
-  void execute() const
-    {
-      ThreadsExec::resize_scratch( ValueTraits::value_size( ReducerConditional::select(m_functor , m_reducer) ) , 0 );
+    ThreadsExec::start(&ParallelReduce::exec, this);
 
-      ThreadsExec::start( & ParallelReduce::exec , this );
+    ThreadsExec::fence();
 
-      ThreadsExec::fence();
+    if (m_result_ptr) {
+      const pointer_type data =
+          (pointer_type)ThreadsExec::root_reduce_scratch();
 
-      if ( m_result_ptr ) {
-
-        const pointer_type data =
-          (pointer_type) ThreadsExec::root_reduce_scratch();
-
-        const unsigned n = ValueTraits::value_count( ReducerConditional::select(m_functor , m_reducer) );
-        for ( unsigned i = 0 ; i < n ; ++i ) { m_result_ptr[i] = data[i]; }
+      const unsigned n = ValueTraits::value_count(
+          ReducerConditional::select(m_functor, m_reducer));
+      for (unsigned i = 0; i < n; ++i) {
+        m_result_ptr[i] = data[i];
       }
     }
+  }
 
-  template< class HostViewType >
-  ParallelReduce( const FunctorType  & arg_functor ,
-                  const MDRangePolicy       & arg_policy ,
-                  const HostViewType & arg_result_view ,
-                  typename std::enable_if<
-                               Kokkos::is_view< HostViewType >::value &&
-                              !Kokkos::is_reducer_type<ReducerType>::value
-                  ,void*>::type = NULL)
-    : m_functor( arg_functor )
-    , m_mdr_policy( arg_policy )
-    , m_policy( Policy(0, m_mdr_policy.m_num_tiles).set_chunk_size(1) )
-    , m_reducer( InvalidType() )
-    , m_result_ptr( arg_result_view.data() )
-    {
-      static_assert( Kokkos::is_view< HostViewType >::value
-        , "Kokkos::Threads reduce result must be a View" );
+  template <class HostViewType>
+  ParallelReduce(
+      const FunctorType &arg_functor, const MDRangePolicy &arg_policy,
+      const HostViewType &arg_result_view,
+      typename std::enable_if<Kokkos::is_view<HostViewType>::value &&
+                                  !Kokkos::is_reducer_type<ReducerType>::value,
+                              void *>::type = NULL)
+      : m_functor(arg_functor),
+        m_mdr_policy(arg_policy),
+        m_policy(Policy(0, m_mdr_policy.m_num_tiles).set_chunk_size(1)),
+        m_reducer(InvalidType()),
+        m_result_ptr(arg_result_view.data()) {
+    static_assert(Kokkos::is_view<HostViewType>::value,
+                  "Kokkos::Threads reduce result must be a View");
 
-      static_assert( std::is_same< typename HostViewType::memory_space , HostSpace >::value
-        , "Kokkos::Threads reduce result must be a View in HostSpace" );
-    }
-
-  inline
-  ParallelReduce( const FunctorType & arg_functor
-                , MDRangePolicy       arg_policy
-                , const ReducerType& reducer )
-    : m_functor( arg_functor )
-    , m_mdr_policy(  arg_policy )
-    , m_policy( Policy(0, m_mdr_policy.m_num_tiles).set_chunk_size(1) )
-    , m_reducer( reducer )
-    , m_result_ptr(  reducer.view().data() )
-    {
-      /*static_assert( std::is_same< typename ViewType::memory_space
-                                      , Kokkos::HostSpace >::value
-        , "Reduction result on Kokkos::OpenMP must be a Kokkos::View in HostSpace" );*/
-    }
+    static_assert(
+        std::is_same<typename HostViewType::memory_space, HostSpace>::value,
+        "Kokkos::Threads reduce result must be a View in HostSpace");
+  }
 
+  inline ParallelReduce(const FunctorType &arg_functor,
+                        MDRangePolicy arg_policy, const ReducerType &reducer)
+      : m_functor(arg_functor),
+        m_mdr_policy(arg_policy),
+        m_policy(Policy(0, m_mdr_policy.m_num_tiles).set_chunk_size(1)),
+        m_reducer(reducer),
+        m_result_ptr(reducer.view().data()) {
+    /*static_assert( std::is_same< typename ViewType::memory_space
+                                    , Kokkos::HostSpace >::value
+      , "Reduction result on Kokkos::OpenMP must be a Kokkos::View in HostSpace"
+      );*/
+  }
 };
 
-
 //----------------------------------------------------------------------------
 /* ParallelReduce with Kokkos::Threads and TeamPolicy */
 
-template< class FunctorType , class ReducerType, class ... Properties >
-class ParallelReduce< FunctorType
-                    , Kokkos::TeamPolicy< Properties ... >
-                    , ReducerType
-                    , Kokkos::Threads
-                    >
-{
-private:
+template <class FunctorType, class ReducerType, class... Properties>
+class ParallelReduce<FunctorType, Kokkos::TeamPolicy<Properties...>,
+                     ReducerType, Kokkos::Threads> {
+ private:
+  typedef Kokkos::Impl::TeamPolicyInternal<Kokkos::Threads, Properties...>
+      Policy;
+  typedef typename Policy::work_tag WorkTag;
+  typedef typename Policy::member_type Member;
 
-  typedef Kokkos::Impl::TeamPolicyInternal< Kokkos::Threads, Properties ... >              Policy ;
-  typedef typename Policy::work_tag                                WorkTag ;
-  typedef typename Policy::member_type                             Member ;
-
-  typedef Kokkos::Impl::if_c< std::is_same<InvalidType,ReducerType>::value, FunctorType, ReducerType> ReducerConditional;
+  typedef Kokkos::Impl::if_c<std::is_same<InvalidType, ReducerType>::value,
+                             FunctorType, ReducerType>
+      ReducerConditional;
   typedef typename ReducerConditional::type ReducerTypeFwd;
-  typedef typename Kokkos::Impl::if_c< std::is_same<InvalidType,ReducerType>::value, WorkTag, void>::type WorkTagFwd;
+  typedef
+      typename Kokkos::Impl::if_c<std::is_same<InvalidType, ReducerType>::value,
+                                  WorkTag, void>::type WorkTagFwd;
 
-  typedef Kokkos::Impl::FunctorValueTraits< ReducerTypeFwd , WorkTagFwd > ValueTraits ;
-  typedef Kokkos::Impl::FunctorValueInit<   ReducerTypeFwd , WorkTagFwd > ValueInit ;
+  typedef Kokkos::Impl::FunctorValueTraits<ReducerTypeFwd, WorkTagFwd>
+      ValueTraits;
+  typedef Kokkos::Impl::FunctorValueInit<ReducerTypeFwd, WorkTagFwd> ValueInit;
 
-  typedef typename ValueTraits::pointer_type    pointer_type ;
-  typedef typename ValueTraits::reference_type  reference_type ;
+  typedef typename ValueTraits::pointer_type pointer_type;
+  typedef typename ValueTraits::reference_type reference_type;
 
-  const FunctorType  m_functor ;
-  const Policy       m_policy ;
-  const ReducerType  m_reducer ;
-  const pointer_type m_result_ptr ;
-  const int          m_shared ;
+  const FunctorType m_functor;
+  const Policy m_policy;
+  const ReducerType m_reducer;
+  const pointer_type m_result_ptr;
+  const int m_shared;
 
-  template< class TagType >
+  template <class TagType>
   inline static
-  typename std::enable_if< std::is_same< TagType , void >::value >::type
-  exec_team( const FunctorType & functor , Member member , reference_type update )
-    {
-      for ( ; member.valid_static() ; member.next_static() ) {
-        functor( member , update );
-      }
+      typename std::enable_if<std::is_same<TagType, void>::value>::type
+      exec_team(const FunctorType &functor, Member member,
+                reference_type update) {
+    for (; member.valid_static(); member.next_static()) {
+      functor(member, update);
     }
-
-  template< class TagType >
-  inline static
-  typename std::enable_if< ! std::is_same< TagType , void >::value >::type
-  exec_team( const FunctorType & functor , Member member , reference_type update )
-    {
-      const TagType t{} ;
-      for ( ; member.valid_static() ; member.next_static() ) {
-        functor( t , member , update );
-      }
-    }
-
-  static void exec( ThreadsExec & exec , const void * arg )
-  {
-    const ParallelReduce & self = * ((const ParallelReduce *) arg );
-
-    ParallelReduce::template exec_team< WorkTag >
-      ( self.m_functor , Member( & exec , self.m_policy , self.m_shared )
-      , ValueInit::init( ReducerConditional::select(self.m_functor , self.m_reducer) , exec.reduce_memory() ) );
-
-    exec.template fan_in_reduce< ReducerTypeFwd , WorkTagFwd >( ReducerConditional::select(self.m_functor , self.m_reducer) );
   }
 
-public:
+  template <class TagType>
+  inline static
+      typename std::enable_if<!std::is_same<TagType, void>::value>::type
+      exec_team(const FunctorType &functor, Member member,
+                reference_type update) {
+    const TagType t{};
+    for (; member.valid_static(); member.next_static()) {
+      functor(t, member, update);
+    }
+  }
 
-  inline
-  void execute() const
-    {
-      ThreadsExec::resize_scratch( ValueTraits::value_size( ReducerConditional::select(m_functor , m_reducer) ) , Policy::member_type::team_reduce_size() + m_shared );
+  static void exec(ThreadsExec &exec, const void *arg) {
+    const ParallelReduce &self = *((const ParallelReduce *)arg);
 
-      ThreadsExec::start( & ParallelReduce::exec , this );
+    ParallelReduce::template exec_team<WorkTag>(
+        self.m_functor, Member(&exec, self.m_policy, self.m_shared),
+        ValueInit::init(
+            ReducerConditional::select(self.m_functor, self.m_reducer),
+            exec.reduce_memory()));
 
-      ThreadsExec::fence();
+    exec.template fan_in_reduce<ReducerTypeFwd, WorkTagFwd>(
+        ReducerConditional::select(self.m_functor, self.m_reducer));
+  }
 
-      if ( m_result_ptr ) {
+ public:
+  inline void execute() const {
+    ThreadsExec::resize_scratch(
+        ValueTraits::value_size(
+            ReducerConditional::select(m_functor, m_reducer)),
+        Policy::member_type::team_reduce_size() + m_shared);
 
-        const pointer_type data = (pointer_type) ThreadsExec::root_reduce_scratch();
+    ThreadsExec::start(&ParallelReduce::exec, this);
 
-        const unsigned n = ValueTraits::value_count( ReducerConditional::select(m_functor , m_reducer) );
-        for ( unsigned i = 0 ; i < n ; ++i ) { m_result_ptr[i] = data[i]; }
+    ThreadsExec::fence();
+
+    if (m_result_ptr) {
+      const pointer_type data =
+          (pointer_type)ThreadsExec::root_reduce_scratch();
+
+      const unsigned n = ValueTraits::value_count(
+          ReducerConditional::select(m_functor, m_reducer));
+      for (unsigned i = 0; i < n; ++i) {
+        m_result_ptr[i] = data[i];
       }
     }
+  }
 
-  template< class ViewType >
-  inline
-  ParallelReduce( const FunctorType  & arg_functor ,
-                  const Policy       & arg_policy ,
-                  const ViewType     & arg_result ,
-                  typename std::enable_if<
-                    Kokkos::is_view< ViewType >::value &&
-                    !Kokkos::is_reducer_type<ReducerType>::value
-                    ,void*>::type = NULL)
-    : m_functor( arg_functor )
-    , m_policy(  arg_policy )
-    , m_reducer( InvalidType() )
-    , m_result_ptr( arg_result.data() )
-    , m_shared( arg_policy.scratch_size(0) + arg_policy.scratch_size(1) + FunctorTeamShmemSize< FunctorType >::value( arg_functor , arg_policy.team_size() ) )
-    {}
+  template <class ViewType>
+  inline ParallelReduce(
+      const FunctorType &arg_functor, const Policy &arg_policy,
+      const ViewType &arg_result,
+      typename std::enable_if<Kokkos::is_view<ViewType>::value &&
+                                  !Kokkos::is_reducer_type<ReducerType>::value,
+                              void *>::type = NULL)
+      : m_functor(arg_functor),
+        m_policy(arg_policy),
+        m_reducer(InvalidType()),
+        m_result_ptr(arg_result.data()),
+        m_shared(arg_policy.scratch_size(0) + arg_policy.scratch_size(1) +
+                 FunctorTeamShmemSize<FunctorType>::value(
+                     arg_functor, arg_policy.team_size())) {}
 
-  inline
-  ParallelReduce( const FunctorType & arg_functor
-    , Policy       arg_policy
-    , const ReducerType& reducer )
-  : m_functor( arg_functor )
-  , m_policy(  arg_policy )
-  , m_reducer( reducer )
-  , m_result_ptr(  reducer.view().data() )
-  , m_shared( arg_policy.scratch_size(0) + arg_policy.scratch_size(1) + FunctorTeamShmemSize< FunctorType >::value( arg_functor , arg_policy.team_size() ) )
-  {
-  /*static_assert( std::is_same< typename ViewType::memory_space
-                          , Kokkos::HostSpace >::value
-  , "Reduction result on Kokkos::OpenMP must be a Kokkos::View in HostSpace" );*/
+  inline ParallelReduce(const FunctorType &arg_functor, Policy arg_policy,
+                        const ReducerType &reducer)
+      : m_functor(arg_functor),
+        m_policy(arg_policy),
+        m_reducer(reducer),
+        m_result_ptr(reducer.view().data()),
+        m_shared(arg_policy.scratch_size(0) + arg_policy.scratch_size(1) +
+                 FunctorTeamShmemSize<FunctorType>::value(
+                     arg_functor, arg_policy.team_size())) {
+    /*static_assert( std::is_same< typename ViewType::memory_space
+                            , Kokkos::HostSpace >::value
+    , "Reduction result on Kokkos::OpenMP must be a Kokkos::View in HostSpace"
+    );*/
   }
 };
 
@@ -826,204 +803,173 @@ public:
 //----------------------------------------------------------------------------
 /* ParallelScan with Kokkos::Threads and RangePolicy */
 
-template< class FunctorType , class ... Traits >
-class ParallelScan< FunctorType
-                  , Kokkos::RangePolicy< Traits ... >
-                  , Kokkos::Threads
-                  >
-{
-private:
+template <class FunctorType, class... Traits>
+class ParallelScan<FunctorType, Kokkos::RangePolicy<Traits...>,
+                   Kokkos::Threads> {
+ private:
+  typedef Kokkos::RangePolicy<Traits...> Policy;
+  typedef typename Policy::WorkRange WorkRange;
+  typedef typename Policy::work_tag WorkTag;
+  typedef typename Policy::member_type Member;
+  typedef Kokkos::Impl::FunctorValueTraits<FunctorType, WorkTag> ValueTraits;
+  typedef Kokkos::Impl::FunctorValueInit<FunctorType, WorkTag> ValueInit;
 
-  typedef Kokkos::RangePolicy< Traits ... > Policy ;
-  typedef typename Policy::WorkRange                               WorkRange ;
-  typedef typename Policy::work_tag                                WorkTag ;
-  typedef typename Policy::member_type                             Member ;
-  typedef Kokkos::Impl::FunctorValueTraits< FunctorType, WorkTag > ValueTraits ;
-  typedef Kokkos::Impl::FunctorValueInit<   FunctorType, WorkTag > ValueInit ;
+  typedef typename ValueTraits::pointer_type pointer_type;
+  typedef typename ValueTraits::reference_type reference_type;
 
-  typedef typename ValueTraits::pointer_type    pointer_type ;
-  typedef typename ValueTraits::reference_type  reference_type ;
+  const FunctorType m_functor;
+  const Policy m_policy;
 
-  const FunctorType  m_functor ;
-  const Policy       m_policy ;
-
-  template< class TagType >
+  template <class TagType>
   inline static
-  typename std::enable_if< std::is_same< TagType , void >::value >::type
-  exec_range( const FunctorType & functor
-            , const Member & ibeg , const Member & iend
-            , reference_type update , const bool final )
-    {
-      #if defined( KOKKOS_ENABLE_AGGRESSIVE_VECTORIZATION ) && \
-          defined( KOKKOS_ENABLE_PRAGMA_IVDEP )
-      #pragma ivdep
-      #endif
-      for ( Member i = ibeg ; i < iend ; ++i ) {
-        functor( i , update , final );
-      }
+      typename std::enable_if<std::is_same<TagType, void>::value>::type
+      exec_range(const FunctorType &functor, const Member &ibeg,
+                 const Member &iend, reference_type update, const bool final) {
+#if defined(KOKKOS_ENABLE_AGGRESSIVE_VECTORIZATION) && \
+    defined(KOKKOS_ENABLE_PRAGMA_IVDEP)
+#pragma ivdep
+#endif
+    for (Member i = ibeg; i < iend; ++i) {
+      functor(i, update, final);
     }
+  }
 
-  template< class TagType >
+  template <class TagType>
   inline static
-  typename std::enable_if< ! std::is_same< TagType , void >::value >::type
-  exec_range( const FunctorType & functor
-            , const Member & ibeg , const Member & iend
-            , reference_type update , const bool final )
-    {
-      const TagType t{} ;
-      #if defined( KOKKOS_ENABLE_AGGRESSIVE_VECTORIZATION ) && \
-          defined( KOKKOS_ENABLE_PRAGMA_IVDEP )
-      #pragma ivdep
-      #endif
-      for ( Member i = ibeg ; i < iend ; ++i ) {
-        functor( t , i , update , final );
-      }
+      typename std::enable_if<!std::is_same<TagType, void>::value>::type
+      exec_range(const FunctorType &functor, const Member &ibeg,
+                 const Member &iend, reference_type update, const bool final) {
+    const TagType t{};
+#if defined(KOKKOS_ENABLE_AGGRESSIVE_VECTORIZATION) && \
+    defined(KOKKOS_ENABLE_PRAGMA_IVDEP)
+#pragma ivdep
+#endif
+    for (Member i = ibeg; i < iend; ++i) {
+      functor(t, i, update, final);
     }
+  }
 
-  static void exec( ThreadsExec & exec , const void * arg )
-  {
-    const ParallelScan & self = * ((const ParallelScan *) arg );
+  static void exec(ThreadsExec &exec, const void *arg) {
+    const ParallelScan &self = *((const ParallelScan *)arg);
 
-    const WorkRange range( self.m_policy, exec.pool_rank(), exec.pool_size() );
+    const WorkRange range(self.m_policy, exec.pool_rank(), exec.pool_size());
 
     reference_type update =
-      ValueInit::init( self.m_functor , exec.reduce_memory() );
+        ValueInit::init(self.m_functor, exec.reduce_memory());
 
-    ParallelScan::template exec_range< WorkTag >
-      ( self.m_functor , range.begin(), range.end(), update, false );
+    ParallelScan::template exec_range<WorkTag>(self.m_functor, range.begin(),
+                                               range.end(), update, false);
 
     //  exec.template scan_large<FunctorType,WorkTag>( self.m_functor );
-    exec.template scan_small<FunctorType,WorkTag>( self.m_functor );
+    exec.template scan_small<FunctorType, WorkTag>(self.m_functor);
 
-    ParallelScan::template exec_range< WorkTag >
-      ( self.m_functor , range.begin(), range.end(), update, true );
+    ParallelScan::template exec_range<WorkTag>(self.m_functor, range.begin(),
+                                               range.end(), update, true);
 
     exec.fan_in();
   }
 
-public:
+ public:
+  inline void execute() const {
+    ThreadsExec::resize_scratch(2 * ValueTraits::value_size(m_functor), 0);
+    ThreadsExec::start(&ParallelScan::exec, this);
+    ThreadsExec::fence();
+  }
 
-  inline
-  void execute() const
-    {
-      ThreadsExec::resize_scratch( 2 * ValueTraits::value_size( m_functor ) , 0 );
-      ThreadsExec::start( & ParallelScan::exec , this );
-      ThreadsExec::fence();
-    }
-
-  ParallelScan( const FunctorType & arg_functor
-              , const Policy      & arg_policy )
-    : m_functor( arg_functor )
-    , m_policy( arg_policy )
-    { }
+  ParallelScan(const FunctorType &arg_functor, const Policy &arg_policy)
+      : m_functor(arg_functor), m_policy(arg_policy) {}
 };
 
-template< class FunctorType, class ReturnType, class ... Traits >
-class ParallelScanWithTotal< FunctorType
-                           , Kokkos::RangePolicy< Traits ... >
-                           , ReturnType
-                           , Kokkos::Threads
-                           >
-{
-private:
+template <class FunctorType, class ReturnType, class... Traits>
+class ParallelScanWithTotal<FunctorType, Kokkos::RangePolicy<Traits...>,
+                            ReturnType, Kokkos::Threads> {
+ private:
+  typedef Kokkos::RangePolicy<Traits...> Policy;
+  typedef typename Policy::WorkRange WorkRange;
+  typedef typename Policy::work_tag WorkTag;
+  typedef typename Policy::member_type Member;
+  typedef Kokkos::Impl::FunctorValueTraits<FunctorType, WorkTag> ValueTraits;
+  typedef Kokkos::Impl::FunctorValueInit<FunctorType, WorkTag> ValueInit;
 
-  typedef Kokkos::RangePolicy< Traits ... > Policy ;
-  typedef typename Policy::WorkRange                               WorkRange ;
-  typedef typename Policy::work_tag                                WorkTag ;
-  typedef typename Policy::member_type                             Member ;
-  typedef Kokkos::Impl::FunctorValueTraits< FunctorType, WorkTag > ValueTraits ;
-  typedef Kokkos::Impl::FunctorValueInit<   FunctorType, WorkTag > ValueInit ;
+  typedef typename ValueTraits::pointer_type pointer_type;
+  typedef typename ValueTraits::reference_type reference_type;
 
-  typedef typename ValueTraits::pointer_type    pointer_type ;
-  typedef typename ValueTraits::reference_type  reference_type ;
+  const FunctorType m_functor;
+  const Policy m_policy;
+  ReturnType &m_returnvalue;
 
-  const FunctorType  m_functor ;
-  const Policy       m_policy ;
-  ReturnType       & m_returnvalue;
-
-  template< class TagType >
+  template <class TagType>
   inline static
-  typename std::enable_if< std::is_same< TagType , void >::value >::type
-  exec_range( const FunctorType & functor
-            , const Member & ibeg , const Member & iend
-            , reference_type update , const bool final )
-    {
-      #if defined( KOKKOS_ENABLE_AGGRESSIVE_VECTORIZATION ) && \
-          defined( KOKKOS_ENABLE_PRAGMA_IVDEP )
-      #pragma ivdep
-      #endif
-      for ( Member i = ibeg ; i < iend ; ++i ) {
-        functor( i , update , final );
-      }
+      typename std::enable_if<std::is_same<TagType, void>::value>::type
+      exec_range(const FunctorType &functor, const Member &ibeg,
+                 const Member &iend, reference_type update, const bool final) {
+#if defined(KOKKOS_ENABLE_AGGRESSIVE_VECTORIZATION) && \
+    defined(KOKKOS_ENABLE_PRAGMA_IVDEP)
+#pragma ivdep
+#endif
+    for (Member i = ibeg; i < iend; ++i) {
+      functor(i, update, final);
     }
+  }
 
-  template< class TagType >
+  template <class TagType>
   inline static
-  typename std::enable_if< ! std::is_same< TagType , void >::value >::type
-  exec_range( const FunctorType & functor
-            , const Member & ibeg , const Member & iend
-            , reference_type update , const bool final )
-    {
-      const TagType t{} ;
-      #if defined( KOKKOS_ENABLE_AGGRESSIVE_VECTORIZATION ) && \
-          defined( KOKKOS_ENABLE_PRAGMA_IVDEP )
-      #pragma ivdep
-      #endif
-      for ( Member i = ibeg ; i < iend ; ++i ) {
-        functor( t , i , update , final );
-      }
+      typename std::enable_if<!std::is_same<TagType, void>::value>::type
+      exec_range(const FunctorType &functor, const Member &ibeg,
+                 const Member &iend, reference_type update, const bool final) {
+    const TagType t{};
+#if defined(KOKKOS_ENABLE_AGGRESSIVE_VECTORIZATION) && \
+    defined(KOKKOS_ENABLE_PRAGMA_IVDEP)
+#pragma ivdep
+#endif
+    for (Member i = ibeg; i < iend; ++i) {
+      functor(t, i, update, final);
     }
+  }
 
-  static void exec( ThreadsExec & exec , const void * arg )
-  {
-    const ParallelScanWithTotal & self = * ((const ParallelScanWithTotal *) arg );
+  static void exec(ThreadsExec &exec, const void *arg) {
+    const ParallelScanWithTotal &self = *((const ParallelScanWithTotal *)arg);
 
-    const WorkRange range( self.m_policy, exec.pool_rank(), exec.pool_size() );
+    const WorkRange range(self.m_policy, exec.pool_rank(), exec.pool_size());
 
     reference_type update =
-      ValueInit::init( self.m_functor , exec.reduce_memory() );
+        ValueInit::init(self.m_functor, exec.reduce_memory());
 
-    ParallelScanWithTotal::template exec_range< WorkTag >
-      ( self.m_functor , range.begin(), range.end(), update, false );
+    ParallelScanWithTotal::template exec_range<WorkTag>(
+        self.m_functor, range.begin(), range.end(), update, false);
 
     //  exec.template scan_large<FunctorType,WorkTag>( self.m_functor );
-    exec.template scan_small<FunctorType,WorkTag>( self.m_functor );
+    exec.template scan_small<FunctorType, WorkTag>(self.m_functor);
 
-    ParallelScanWithTotal::template exec_range< WorkTag >
-      ( self.m_functor , range.begin(), range.end(), update, true );
+    ParallelScanWithTotal::template exec_range<WorkTag>(
+        self.m_functor, range.begin(), range.end(), update, true);
 
     exec.fan_in();
 
-    if (exec.pool_rank()==exec.pool_size()-1) {
+    if (exec.pool_rank() == exec.pool_size() - 1) {
       self.m_returnvalue = update;
     }
   }
 
-public:
+ public:
+  inline void execute() const {
+    ThreadsExec::resize_scratch(2 * ValueTraits::value_size(m_functor), 0);
+    ThreadsExec::start(&ParallelScanWithTotal::exec, this);
+    ThreadsExec::fence();
+  }
 
-  inline
-  void execute() const
-    {
-      ThreadsExec::resize_scratch( 2 * ValueTraits::value_size( m_functor ) , 0 );
-      ThreadsExec::start( & ParallelScanWithTotal::exec , this );
-      ThreadsExec::fence();
-    }
-
-  ParallelScanWithTotal( const FunctorType & arg_functor
-                       , const Policy      & arg_policy
-                       , ReturnType        & arg_returnvalue )
-    : m_functor( arg_functor )
-    , m_policy( arg_policy )
-    , m_returnvalue(  arg_returnvalue )
-    { }
+  ParallelScanWithTotal(const FunctorType &arg_functor,
+                        const Policy &arg_policy, ReturnType &arg_returnvalue)
+      : m_functor(arg_functor),
+        m_policy(arg_policy),
+        m_returnvalue(arg_returnvalue) {}
 };
 
-} // namespace Impl
-} // namespace Kokkos
+}  // namespace Impl
+}  // namespace Kokkos
 
 //----------------------------------------------------------------------------
 //----------------------------------------------------------------------------
 
 #endif
 #endif /* #define KOKKOS_THREADS_PARALLEL_HPP */
-
diff --git a/lib/kokkos/core/src/Threads/Kokkos_Threads_ViewCopyETIAvail.hpp b/lib/kokkos/core/src/Threads/Kokkos_Threads_ViewCopyETIAvail.hpp
index 051703ebff..c3c416c4cd 100644
--- a/lib/kokkos/core/src/Threads/Kokkos_Threads_ViewCopyETIAvail.hpp
+++ b/lib/kokkos/core/src/Threads/Kokkos_Threads_ViewCopyETIAvail.hpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -48,10 +49,9 @@ namespace Kokkos {
 namespace Impl {
 #define KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE Kokkos::Threads
 
-#include<eti/common/Kokkos_ViewFillCopyETIAvail_Macros.hpp>
+#include <eti/common/Kokkos_ViewFillCopyETIAvail_Macros.hpp>
 
 #undef KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
 #endif
-
diff --git a/lib/kokkos/core/src/Threads/Kokkos_Threads_ViewCopyETIDecl.hpp b/lib/kokkos/core/src/Threads/Kokkos_Threads_ViewCopyETIDecl.hpp
index 8f26b28d6a..eb287c0db7 100644
--- a/lib/kokkos/core/src/Threads/Kokkos_Threads_ViewCopyETIDecl.hpp
+++ b/lib/kokkos/core/src/Threads/Kokkos_Threads_ViewCopyETIDecl.hpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -48,10 +49,9 @@ namespace Kokkos {
 namespace Impl {
 #define KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE Kokkos::Threads
 
-#include<eti/common/Kokkos_ViewFillCopyETIDecl_Macros.hpp>
+#include <eti/common/Kokkos_ViewFillCopyETIDecl_Macros.hpp>
 
 #undef KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
 #endif
-
diff --git a/lib/kokkos/core/src/Threads/Kokkos_Threads_WorkGraphPolicy.hpp b/lib/kokkos/core/src/Threads/Kokkos_Threads_WorkGraphPolicy.hpp
index 934d2db2ca..ec2b1d983f 100644
--- a/lib/kokkos/core/src/Threads/Kokkos_Threads_WorkGraphPolicy.hpp
+++ b/lib/kokkos/core/src/Threads/Kokkos_Threads_WorkGraphPolicy.hpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -47,71 +48,61 @@
 namespace Kokkos {
 namespace Impl {
 
-template< class FunctorType , class ... Traits >
-class ParallelFor< FunctorType ,
-                   Kokkos::WorkGraphPolicy< Traits ... > ,
-                   Kokkos::Threads
-                 >
-{
-private:
+template <class FunctorType, class... Traits>
+class ParallelFor<FunctorType, Kokkos::WorkGraphPolicy<Traits...>,
+                  Kokkos::Threads> {
+ private:
+  typedef Kokkos::WorkGraphPolicy<Traits...> Policy;
 
-  typedef Kokkos::WorkGraphPolicy< Traits ... > Policy ;
+  typedef ParallelFor<FunctorType, Kokkos::WorkGraphPolicy<Traits...>,
+                      Kokkos::Threads>
+      Self;
 
-  typedef ParallelFor<FunctorType,
-                      Kokkos::WorkGraphPolicy<Traits ...>,
-                      Kokkos::Threads> Self ;
+  Policy m_policy;
+  FunctorType m_functor;
 
-  Policy       m_policy ;
-  FunctorType  m_functor ;
+  template <class TagType>
+  typename std::enable_if<std::is_same<TagType, void>::value>::type exec_one(
+      const std::int32_t w) const noexcept {
+    m_functor(w);
+  }
 
-  template< class TagType >
-  typename std::enable_if< std::is_same< TagType , void >::value >::type
-  exec_one( const std::int32_t w ) const noexcept
-    { m_functor( w ); }
+  template <class TagType>
+  typename std::enable_if<!std::is_same<TagType, void>::value>::type exec_one(
+      const std::int32_t w) const noexcept {
+    const TagType t{};
+    m_functor(t, w);
+  }
 
-  template< class TagType >
-  typename std::enable_if< ! std::is_same< TagType , void >::value >::type
-  exec_one( const std::int32_t w ) const noexcept
-    { const TagType t{}; m_functor( t , w ); }
+  inline void exec_one_thread() const noexcept {
+    // Spin until COMPLETED_TOKEN.
+    // END_TOKEN indicates no work is currently available.
 
-  inline void exec_one_thread() const noexcept 
-    {
-      // Spin until COMPLETED_TOKEN.
-      // END_TOKEN indicates no work is currently available.
-      
-      for ( std::int32_t w = Policy::END_TOKEN ;
-            Policy::COMPLETED_TOKEN != ( w = m_policy.pop_work() ) ; ) {
-        if ( Policy::END_TOKEN != w ) {
-          exec_one< typename Policy::work_tag >( w );
-          m_policy.completed_work(w);
-        }
+    for (std::int32_t w = Policy::END_TOKEN;
+         Policy::COMPLETED_TOKEN != (w = m_policy.pop_work());) {
+      if (Policy::END_TOKEN != w) {
+        exec_one<typename Policy::work_tag>(w);
+        m_policy.completed_work(w);
       }
     }
+  }
 
-  static inline void thread_main( ThreadsExec&, const void* arg ) noexcept
-    {
-      const Self& self = *(static_cast<const Self*>(arg));
-      self.exec_one_thread();
-    }
+  static inline void thread_main(ThreadsExec&, const void* arg) noexcept {
+    const Self& self = *(static_cast<const Self*>(arg));
+    self.exec_one_thread();
+  }
 
-public:
-
-  inline
-  void execute()
-  {
-    ThreadsExec::start( & Self::thread_main, this );
+ public:
+  inline void execute() {
+    ThreadsExec::start(&Self::thread_main, this);
     ThreadsExec::fence();
   }
 
-  inline
-  ParallelFor( const FunctorType & arg_functor
-             , const Policy      & arg_policy )
-    : m_policy( arg_policy )
-    , m_functor( arg_functor )
-    {}
+  inline ParallelFor(const FunctorType& arg_functor, const Policy& arg_policy)
+      : m_policy(arg_policy), m_functor(arg_functor) {}
 };
 
-} // namespace Impl
-} // namespace Kokkos
+}  // namespace Impl
+}  // namespace Kokkos
 
 #endif /* #define KOKKOS_THREADS_WORKGRAPHPOLICY_HPP */
diff --git a/lib/kokkos/core/src/dummy.cpp b/lib/kokkos/core/src/dummy.cpp
new file mode 100644
index 0000000000..4f5f14e7d3
--- /dev/null
+++ b/lib/kokkos/core/src/dummy.cpp
@@ -0,0 +1,10 @@
+
+
+namespace Kokkos {
+namespace AvoidCompilerWarnings {
+int dontComplain() {
+  // keep the compiler from complaining about emptiness
+  return 0;
+}
+}  // namespace AvoidCompilerWarnings
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank1.cpp b/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank1.cpp
index 588de9ff87..a72781d8a0 100644
--- a/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank1.cpp
+++ b/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank1.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,18 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*,LayoutLeft,LayoutRight, Cuda,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*,LayoutLeft,LayoutLeft,  Cuda,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*,LayoutLeft,LayoutStride,Cuda,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(double*,LayoutLeft,Cuda,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*, LayoutLeft, LayoutRight, Cuda, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*, LayoutLeft, LayoutLeft, Cuda, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*, LayoutLeft, LayoutStride, Cuda, int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(double*, LayoutLeft, Cuda, int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank2.cpp b/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank2.cpp
index 3ea55b017f..86600a2d38 100644
--- a/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank2.cpp
+++ b/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank2.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,18 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double**,LayoutLeft,LayoutRight, Cuda,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double**,LayoutLeft,LayoutLeft,  Cuda,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double**,LayoutLeft,LayoutStride,Cuda,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(double**,LayoutLeft,Cuda,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double**, LayoutLeft, LayoutRight, Cuda, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double**, LayoutLeft, LayoutLeft, Cuda, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double**, LayoutLeft, LayoutStride, Cuda, int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(double**, LayoutLeft, Cuda, int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank3.cpp b/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank3.cpp
index fc8ff3c0f8..1f4e93ec2b 100644
--- a/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank3.cpp
+++ b/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank3.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,19 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double***,LayoutLeft,LayoutRight, Cuda,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double***,LayoutLeft,LayoutLeft,  Cuda,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double***,LayoutLeft,LayoutStride,Cuda,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(double***,LayoutLeft,Cuda,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double***, LayoutLeft, LayoutRight, Cuda, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double***, LayoutLeft, LayoutLeft, Cuda, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double***, LayoutLeft, LayoutStride, Cuda,
+                              int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(double***, LayoutLeft, Cuda, int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank4.cpp b/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank4.cpp
index 2577ef6ce5..e6d965eb48 100644
--- a/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank4.cpp
+++ b/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank4.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,20 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double****,LayoutLeft,LayoutRight, Cuda,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double****,LayoutLeft,LayoutLeft,  Cuda,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double****,LayoutLeft,LayoutStride,Cuda,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(double****,LayoutLeft,Cuda,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double****, LayoutLeft, LayoutRight, Cuda,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double****, LayoutLeft, LayoutLeft, Cuda, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double****, LayoutLeft, LayoutStride, Cuda,
+                              int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(double****, LayoutLeft, Cuda, int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank5.cpp b/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank5.cpp
index 83fece17a5..5bb1ce76e6 100644
--- a/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank5.cpp
+++ b/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank5.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*****,LayoutLeft,LayoutRight, Cuda,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*****,LayoutLeft,LayoutLeft,  Cuda,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*****,LayoutLeft,LayoutStride,Cuda,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(double*****,LayoutLeft,Cuda,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*****, LayoutLeft, LayoutRight, Cuda,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*****, LayoutLeft, LayoutLeft, Cuda,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*****, LayoutLeft, LayoutStride, Cuda,
+                              int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(double*****, LayoutLeft, Cuda, int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank8.cpp b/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank8.cpp
index 57fbf84a4f..cad6e9b671 100644
--- a/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank8.cpp
+++ b/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank8.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double********,LayoutLeft,LayoutRight, Cuda,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double********,LayoutLeft,LayoutLeft,  Cuda,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double********,LayoutLeft,LayoutStride,Cuda,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(double********,LayoutLeft,Cuda,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double********, LayoutLeft, LayoutRight, Cuda,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double********, LayoutLeft, LayoutLeft, Cuda,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double********, LayoutLeft, LayoutStride, Cuda,
+                              int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(double********, LayoutLeft, Cuda, int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_double_LayoutRight_Rank1.cpp b/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_double_LayoutRight_Rank1.cpp
index 983d4758f8..5c31da459e 100644
--- a/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_double_LayoutRight_Rank1.cpp
+++ b/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_double_LayoutRight_Rank1.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,18 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*,LayoutRight,LayoutRight, Cuda,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*,LayoutRight,LayoutLeft,  Cuda,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*,LayoutRight,LayoutStride,Cuda,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(double*,LayoutRight,Cuda,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*, LayoutRight, LayoutRight, Cuda, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*, LayoutRight, LayoutLeft, Cuda, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*, LayoutRight, LayoutStride, Cuda, int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(double*, LayoutRight, Cuda, int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_double_LayoutRight_Rank2.cpp b/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_double_LayoutRight_Rank2.cpp
index 2c4f36b264..7ef6acb4b1 100644
--- a/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_double_LayoutRight_Rank2.cpp
+++ b/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_double_LayoutRight_Rank2.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,19 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double**,LayoutRight,LayoutRight, Cuda,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double**,LayoutRight,LayoutLeft,  Cuda,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double**,LayoutRight,LayoutStride,Cuda,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(double**,LayoutRight,Cuda,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double**, LayoutRight, LayoutRight, Cuda, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double**, LayoutRight, LayoutLeft, Cuda, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double**, LayoutRight, LayoutStride, Cuda,
+                              int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(double**, LayoutRight, Cuda, int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_double_LayoutRight_Rank3.cpp b/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_double_LayoutRight_Rank3.cpp
index 2942ef69ee..5680b8581c 100644
--- a/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_double_LayoutRight_Rank3.cpp
+++ b/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_double_LayoutRight_Rank3.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,20 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double***,LayoutRight,LayoutRight, Cuda,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double***,LayoutRight,LayoutLeft,  Cuda,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double***,LayoutRight,LayoutStride,Cuda,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(double***,LayoutRight,Cuda,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double***, LayoutRight, LayoutRight, Cuda,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double***, LayoutRight, LayoutLeft, Cuda, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double***, LayoutRight, LayoutStride, Cuda,
+                              int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(double***, LayoutRight, Cuda, int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_double_LayoutRight_Rank4.cpp b/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_double_LayoutRight_Rank4.cpp
index d49c76bf4f..bae1ee8827 100644
--- a/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_double_LayoutRight_Rank4.cpp
+++ b/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_double_LayoutRight_Rank4.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double****,LayoutRight,LayoutRight, Cuda,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double****,LayoutRight,LayoutLeft,  Cuda,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double****,LayoutRight,LayoutStride,Cuda,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(double****,LayoutRight,Cuda,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double****, LayoutRight, LayoutRight, Cuda,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double****, LayoutRight, LayoutLeft, Cuda,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double****, LayoutRight, LayoutStride, Cuda,
+                              int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(double****, LayoutRight, Cuda, int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_double_LayoutRight_Rank5.cpp b/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_double_LayoutRight_Rank5.cpp
index 554e39923e..9ad5912c0b 100644
--- a/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_double_LayoutRight_Rank5.cpp
+++ b/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_double_LayoutRight_Rank5.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*****,LayoutRight,LayoutRight, Cuda,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*****,LayoutRight,LayoutLeft,  Cuda,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*****,LayoutRight,LayoutStride,Cuda,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(double*****,LayoutRight,Cuda,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*****, LayoutRight, LayoutRight, Cuda,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*****, LayoutRight, LayoutLeft, Cuda,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*****, LayoutRight, LayoutStride, Cuda,
+                              int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(double*****, LayoutRight, Cuda, int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_double_LayoutRight_Rank8.cpp b/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_double_LayoutRight_Rank8.cpp
index 48b4f812ab..12806d1c5b 100644
--- a/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_double_LayoutRight_Rank8.cpp
+++ b/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_double_LayoutRight_Rank8.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double********,LayoutRight,LayoutRight, Cuda,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double********,LayoutRight,LayoutLeft,  Cuda,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double********,LayoutRight,LayoutStride,Cuda,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(double********,LayoutRight,Cuda,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double********, LayoutRight, LayoutRight, Cuda,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double********, LayoutRight, LayoutLeft, Cuda,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double********, LayoutRight, LayoutStride, Cuda,
+                              int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(double********, LayoutRight, Cuda, int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_double_LayoutStride_Rank1.cpp b/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_double_LayoutStride_Rank1.cpp
index 30b1fa18ca..0330b205db 100644
--- a/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_double_LayoutStride_Rank1.cpp
+++ b/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_double_LayoutStride_Rank1.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,19 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*,LayoutStride,LayoutRight, Cuda,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*,LayoutStride,LayoutLeft,  Cuda,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*,LayoutStride,LayoutStride,Cuda,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(double*,LayoutStride,Cuda,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*, LayoutStride, LayoutRight, Cuda, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*, LayoutStride, LayoutLeft, Cuda, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*, LayoutStride, LayoutStride, Cuda,
+                              int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(double*, LayoutStride, Cuda, int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_double_LayoutStride_Rank2.cpp b/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_double_LayoutStride_Rank2.cpp
index bb1bcba7cc..10e894125d 100644
--- a/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_double_LayoutStride_Rank2.cpp
+++ b/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_double_LayoutStride_Rank2.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,20 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double**,LayoutStride,LayoutRight, Cuda,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double**,LayoutStride,LayoutLeft,  Cuda,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double**,LayoutStride,LayoutStride,Cuda,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(double**,LayoutStride,Cuda,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double**, LayoutStride, LayoutRight, Cuda,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double**, LayoutStride, LayoutLeft, Cuda, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double**, LayoutStride, LayoutStride, Cuda,
+                              int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(double**, LayoutStride, Cuda, int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_double_LayoutStride_Rank3.cpp b/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_double_LayoutStride_Rank3.cpp
index 9cc20527b5..7cec352662 100644
--- a/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_double_LayoutStride_Rank3.cpp
+++ b/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_double_LayoutStride_Rank3.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double***,LayoutStride,LayoutRight, Cuda,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double***,LayoutStride,LayoutLeft,  Cuda,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double***,LayoutStride,LayoutStride,Cuda,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(double***,LayoutStride,Cuda,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double***, LayoutStride, LayoutRight, Cuda,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double***, LayoutStride, LayoutLeft, Cuda,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double***, LayoutStride, LayoutStride, Cuda,
+                              int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(double***, LayoutStride, Cuda, int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_double_LayoutStride_Rank4.cpp b/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_double_LayoutStride_Rank4.cpp
index 60ee27fdc3..5bb6913cce 100644
--- a/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_double_LayoutStride_Rank4.cpp
+++ b/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_double_LayoutStride_Rank4.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double****,LayoutStride,LayoutRight, Cuda,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double****,LayoutStride,LayoutLeft,  Cuda,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double****,LayoutStride,LayoutStride,Cuda,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(double****,LayoutStride,Cuda,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double****, LayoutStride, LayoutRight, Cuda,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double****, LayoutStride, LayoutLeft, Cuda,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double****, LayoutStride, LayoutStride, Cuda,
+                              int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(double****, LayoutStride, Cuda, int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_double_LayoutStride_Rank5.cpp b/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_double_LayoutStride_Rank5.cpp
index ff53cb5c46..f138a2049a 100644
--- a/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_double_LayoutStride_Rank5.cpp
+++ b/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_double_LayoutStride_Rank5.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*****,LayoutStride,LayoutRight, Cuda,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*****,LayoutStride,LayoutLeft,  Cuda,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*****,LayoutStride,LayoutStride,Cuda,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(double*****,LayoutStride,Cuda,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*****, LayoutStride, LayoutRight, Cuda,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*****, LayoutStride, LayoutLeft, Cuda,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*****, LayoutStride, LayoutStride, Cuda,
+                              int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(double*****, LayoutStride, Cuda, int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_double_LayoutStride_Rank8.cpp b/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_double_LayoutStride_Rank8.cpp
index 3009f69d79..e1901422d1 100644
--- a/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_double_LayoutStride_Rank8.cpp
+++ b/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_double_LayoutStride_Rank8.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double********,LayoutStride,LayoutRight, Cuda,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double********,LayoutStride,LayoutLeft,  Cuda,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double********,LayoutStride,LayoutStride,Cuda,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(double********,LayoutStride,Cuda,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double********, LayoutStride, LayoutRight, Cuda,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double********, LayoutStride, LayoutLeft, Cuda,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double********, LayoutStride, LayoutStride, Cuda,
+                              int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(double********, LayoutStride, Cuda, int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank1.cpp b/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank1.cpp
index 3e4cb08e55..c4a52c2dea 100644
--- a/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank1.cpp
+++ b/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank1.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,18 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*,LayoutLeft,LayoutRight, Cuda,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*,LayoutLeft,LayoutLeft,  Cuda,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*,LayoutLeft,LayoutStride,Cuda,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(float*,LayoutLeft,Cuda,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*, LayoutLeft, LayoutRight, Cuda, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*, LayoutLeft, LayoutLeft, Cuda, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*, LayoutLeft, LayoutStride, Cuda, int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(float*, LayoutLeft, Cuda, int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank2.cpp b/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank2.cpp
index e3bed2fe3a..dab83bfb18 100644
--- a/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank2.cpp
+++ b/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank2.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,18 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float**,LayoutLeft,LayoutRight, Cuda,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float**,LayoutLeft,LayoutLeft,  Cuda,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float**,LayoutLeft,LayoutStride,Cuda,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(float**,LayoutLeft,Cuda,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float**, LayoutLeft, LayoutRight, Cuda, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float**, LayoutLeft, LayoutLeft, Cuda, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float**, LayoutLeft, LayoutStride, Cuda, int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(float**, LayoutLeft, Cuda, int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank3.cpp b/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank3.cpp
index ddcde86c2d..522303b447 100644
--- a/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank3.cpp
+++ b/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank3.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,18 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float***,LayoutLeft,LayoutRight, Cuda,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float***,LayoutLeft,LayoutLeft,  Cuda,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float***,LayoutLeft,LayoutStride,Cuda,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(float***,LayoutLeft,Cuda,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float***, LayoutLeft, LayoutRight, Cuda, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float***, LayoutLeft, LayoutLeft, Cuda, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float***, LayoutLeft, LayoutStride, Cuda, int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(float***, LayoutLeft, Cuda, int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank4.cpp b/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank4.cpp
index ee83ff2979..608b4d4c27 100644
--- a/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank4.cpp
+++ b/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank4.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,19 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float****,LayoutLeft,LayoutRight, Cuda,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float****,LayoutLeft,LayoutLeft,  Cuda,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float****,LayoutLeft,LayoutStride,Cuda,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(float****,LayoutLeft,Cuda,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float****, LayoutLeft, LayoutRight, Cuda, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float****, LayoutLeft, LayoutLeft, Cuda, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float****, LayoutLeft, LayoutStride, Cuda,
+                              int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(float****, LayoutLeft, Cuda, int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank5.cpp b/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank5.cpp
index 448a33a42c..2c33f7facd 100644
--- a/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank5.cpp
+++ b/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank5.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,20 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*****,LayoutLeft,LayoutRight, Cuda,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*****,LayoutLeft,LayoutLeft,  Cuda,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*****,LayoutLeft,LayoutStride,Cuda,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(float*****,LayoutLeft,Cuda,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*****, LayoutLeft, LayoutRight, Cuda,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*****, LayoutLeft, LayoutLeft, Cuda, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*****, LayoutLeft, LayoutStride, Cuda,
+                              int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(float*****, LayoutLeft, Cuda, int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank8.cpp b/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank8.cpp
index 03ee59df50..3ad16222e4 100644
--- a/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank8.cpp
+++ b/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank8.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float********,LayoutLeft,LayoutRight, Cuda,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float********,LayoutLeft,LayoutLeft,  Cuda,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float********,LayoutLeft,LayoutStride,Cuda,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(float********,LayoutLeft,Cuda,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float********, LayoutLeft, LayoutRight, Cuda,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float********, LayoutLeft, LayoutLeft, Cuda,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float********, LayoutLeft, LayoutStride, Cuda,
+                              int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(float********, LayoutLeft, Cuda, int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_float_LayoutRight_Rank1.cpp b/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_float_LayoutRight_Rank1.cpp
index 76feae31fc..47f39d7ae2 100644
--- a/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_float_LayoutRight_Rank1.cpp
+++ b/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_float_LayoutRight_Rank1.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,18 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*,LayoutRight,LayoutRight, Cuda,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*,LayoutRight,LayoutLeft,  Cuda,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*,LayoutRight,LayoutStride,Cuda,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(float*,LayoutRight,Cuda,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*, LayoutRight, LayoutRight, Cuda, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*, LayoutRight, LayoutLeft, Cuda, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*, LayoutRight, LayoutStride, Cuda, int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(float*, LayoutRight, Cuda, int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_float_LayoutRight_Rank2.cpp b/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_float_LayoutRight_Rank2.cpp
index 907fef11ae..bca253b756 100644
--- a/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_float_LayoutRight_Rank2.cpp
+++ b/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_float_LayoutRight_Rank2.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,18 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float**,LayoutRight,LayoutRight, Cuda,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float**,LayoutRight,LayoutLeft,  Cuda,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float**,LayoutRight,LayoutStride,Cuda,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(float**,LayoutRight,Cuda,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float**, LayoutRight, LayoutRight, Cuda, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float**, LayoutRight, LayoutLeft, Cuda, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float**, LayoutRight, LayoutStride, Cuda, int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(float**, LayoutRight, Cuda, int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_float_LayoutRight_Rank3.cpp b/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_float_LayoutRight_Rank3.cpp
index 5a1c9e1941..20fadbd5d8 100644
--- a/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_float_LayoutRight_Rank3.cpp
+++ b/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_float_LayoutRight_Rank3.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,19 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float***,LayoutRight,LayoutRight, Cuda,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float***,LayoutRight,LayoutLeft,  Cuda,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float***,LayoutRight,LayoutStride,Cuda,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(float***,LayoutRight,Cuda,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float***, LayoutRight, LayoutRight, Cuda, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float***, LayoutRight, LayoutLeft, Cuda, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float***, LayoutRight, LayoutStride, Cuda,
+                              int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(float***, LayoutRight, Cuda, int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_float_LayoutRight_Rank4.cpp b/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_float_LayoutRight_Rank4.cpp
index 53dbf6876a..4d4716510e 100644
--- a/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_float_LayoutRight_Rank4.cpp
+++ b/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_float_LayoutRight_Rank4.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,20 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float****,LayoutRight,LayoutRight, Cuda,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float****,LayoutRight,LayoutLeft,  Cuda,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float****,LayoutRight,LayoutStride,Cuda,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(float****,LayoutRight,Cuda,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float****, LayoutRight, LayoutRight, Cuda,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float****, LayoutRight, LayoutLeft, Cuda, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float****, LayoutRight, LayoutStride, Cuda,
+                              int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(float****, LayoutRight, Cuda, int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_float_LayoutRight_Rank5.cpp b/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_float_LayoutRight_Rank5.cpp
index f077fc17bc..42fa2c7b4e 100644
--- a/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_float_LayoutRight_Rank5.cpp
+++ b/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_float_LayoutRight_Rank5.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*****,LayoutRight,LayoutRight, Cuda,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*****,LayoutRight,LayoutLeft,  Cuda,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*****,LayoutRight,LayoutStride,Cuda,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(float*****,LayoutRight,Cuda,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*****, LayoutRight, LayoutRight, Cuda,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*****, LayoutRight, LayoutLeft, Cuda,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*****, LayoutRight, LayoutStride, Cuda,
+                              int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(float*****, LayoutRight, Cuda, int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_float_LayoutRight_Rank8.cpp b/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_float_LayoutRight_Rank8.cpp
index 2b16913edf..a3cd8cc994 100644
--- a/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_float_LayoutRight_Rank8.cpp
+++ b/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_float_LayoutRight_Rank8.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float********,LayoutRight,LayoutRight, Cuda,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float********,LayoutRight,LayoutLeft,  Cuda,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float********,LayoutRight,LayoutStride,Cuda,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(float********,LayoutRight,Cuda,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float********, LayoutRight, LayoutRight, Cuda,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float********, LayoutRight, LayoutLeft, Cuda,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float********, LayoutRight, LayoutStride, Cuda,
+                              int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(float********, LayoutRight, Cuda, int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_float_LayoutStride_Rank1.cpp b/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_float_LayoutStride_Rank1.cpp
index 9af8d5cad8..9efcc720c3 100644
--- a/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_float_LayoutStride_Rank1.cpp
+++ b/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_float_LayoutStride_Rank1.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,18 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*,LayoutStride,LayoutRight, Cuda,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*,LayoutStride,LayoutLeft,  Cuda,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*,LayoutStride,LayoutStride,Cuda,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(float*,LayoutStride,Cuda,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*, LayoutStride, LayoutRight, Cuda, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*, LayoutStride, LayoutLeft, Cuda, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*, LayoutStride, LayoutStride, Cuda, int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(float*, LayoutStride, Cuda, int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_float_LayoutStride_Rank2.cpp b/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_float_LayoutStride_Rank2.cpp
index a8d721ff2a..c34c6a391f 100644
--- a/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_float_LayoutStride_Rank2.cpp
+++ b/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_float_LayoutStride_Rank2.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,19 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float**,LayoutStride,LayoutRight, Cuda,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float**,LayoutStride,LayoutLeft,  Cuda,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float**,LayoutStride,LayoutStride,Cuda,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(float**,LayoutStride,Cuda,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float**, LayoutStride, LayoutRight, Cuda, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float**, LayoutStride, LayoutLeft, Cuda, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float**, LayoutStride, LayoutStride, Cuda,
+                              int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(float**, LayoutStride, Cuda, int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_float_LayoutStride_Rank3.cpp b/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_float_LayoutStride_Rank3.cpp
index 56cc0cc35f..6d7cf16fa5 100644
--- a/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_float_LayoutStride_Rank3.cpp
+++ b/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_float_LayoutStride_Rank3.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,20 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float***,LayoutStride,LayoutRight, Cuda,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float***,LayoutStride,LayoutLeft,  Cuda,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float***,LayoutStride,LayoutStride,Cuda,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(float***,LayoutStride,Cuda,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float***, LayoutStride, LayoutRight, Cuda,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float***, LayoutStride, LayoutLeft, Cuda, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float***, LayoutStride, LayoutStride, Cuda,
+                              int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(float***, LayoutStride, Cuda, int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_float_LayoutStride_Rank4.cpp b/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_float_LayoutStride_Rank4.cpp
index cdba118eaf..ddd65c01a8 100644
--- a/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_float_LayoutStride_Rank4.cpp
+++ b/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_float_LayoutStride_Rank4.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float****,LayoutStride,LayoutRight, Cuda,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float****,LayoutStride,LayoutLeft,  Cuda,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float****,LayoutStride,LayoutStride,Cuda,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(float****,LayoutStride,Cuda,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float****, LayoutStride, LayoutRight, Cuda,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float****, LayoutStride, LayoutLeft, Cuda,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float****, LayoutStride, LayoutStride, Cuda,
+                              int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(float****, LayoutStride, Cuda, int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_float_LayoutStride_Rank5.cpp b/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_float_LayoutStride_Rank5.cpp
index 9e3ddc21c1..ae41d19395 100644
--- a/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_float_LayoutStride_Rank5.cpp
+++ b/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_float_LayoutStride_Rank5.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*****,LayoutStride,LayoutRight, Cuda,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*****,LayoutStride,LayoutLeft,  Cuda,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*****,LayoutStride,LayoutStride,Cuda,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(float*****,LayoutStride,Cuda,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*****, LayoutStride, LayoutRight, Cuda,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*****, LayoutStride, LayoutLeft, Cuda,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*****, LayoutStride, LayoutStride, Cuda,
+                              int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(float*****, LayoutStride, Cuda, int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_float_LayoutStride_Rank8.cpp b/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_float_LayoutStride_Rank8.cpp
index 88dfa48a92..5d349b6990 100644
--- a/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_float_LayoutStride_Rank8.cpp
+++ b/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_float_LayoutStride_Rank8.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float********,LayoutStride,LayoutRight, Cuda,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float********,LayoutStride,LayoutLeft,  Cuda,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float********,LayoutStride,LayoutStride,Cuda,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(float********,LayoutStride,Cuda,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float********, LayoutStride, LayoutRight, Cuda,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float********, LayoutStride, LayoutLeft, Cuda,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float********, LayoutStride, LayoutStride, Cuda,
+                              int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(float********, LayoutStride, Cuda, int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank1.cpp b/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank1.cpp
index ddfbb697aa..c60df37674 100644
--- a/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank1.cpp
+++ b/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank1.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,18 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*,LayoutLeft,LayoutRight, Cuda,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*,LayoutLeft,LayoutLeft,  Cuda,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*,LayoutLeft,LayoutStride,Cuda,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t*,LayoutLeft,Cuda,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*, LayoutLeft, LayoutRight, Cuda, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*, LayoutLeft, LayoutLeft, Cuda, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*, LayoutLeft, LayoutStride, Cuda, int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t*, LayoutLeft, Cuda, int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank2.cpp b/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank2.cpp
index 5ab2169892..cfce1b7916 100644
--- a/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank2.cpp
+++ b/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank2.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,19 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t**,LayoutLeft,LayoutRight, Cuda,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t**,LayoutLeft,LayoutLeft,  Cuda,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t**,LayoutLeft,LayoutStride,Cuda,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t**,LayoutLeft,Cuda,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t**, LayoutLeft, LayoutRight, Cuda, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t**, LayoutLeft, LayoutLeft, Cuda, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t**, LayoutLeft, LayoutStride, Cuda,
+                              int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t**, LayoutLeft, Cuda, int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank3.cpp b/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank3.cpp
index 4b1f40078a..659ef18377 100644
--- a/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank3.cpp
+++ b/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank3.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,20 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t***,LayoutLeft,LayoutRight, Cuda,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t***,LayoutLeft,LayoutLeft,  Cuda,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t***,LayoutLeft,LayoutStride,Cuda,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t***,LayoutLeft,Cuda,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t***, LayoutLeft, LayoutRight, Cuda,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t***, LayoutLeft, LayoutLeft, Cuda, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t***, LayoutLeft, LayoutStride, Cuda,
+                              int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t***, LayoutLeft, Cuda, int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank4.cpp b/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank4.cpp
index e787ea93eb..84eb991853 100644
--- a/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank4.cpp
+++ b/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank4.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t****,LayoutLeft,LayoutRight, Cuda,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t****,LayoutLeft,LayoutLeft,  Cuda,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t****,LayoutLeft,LayoutStride,Cuda,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t****,LayoutLeft,Cuda,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t****, LayoutLeft, LayoutRight, Cuda,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t****, LayoutLeft, LayoutLeft, Cuda,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t****, LayoutLeft, LayoutStride, Cuda,
+                              int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t****, LayoutLeft, Cuda, int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank5.cpp b/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank5.cpp
index 5a64d8b9d7..7f98cebd64 100644
--- a/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank5.cpp
+++ b/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank5.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*****,LayoutLeft,LayoutRight, Cuda,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*****,LayoutLeft,LayoutLeft,  Cuda,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*****,LayoutLeft,LayoutStride,Cuda,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t*****,LayoutLeft,Cuda,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*****, LayoutLeft, LayoutRight, Cuda,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*****, LayoutLeft, LayoutLeft, Cuda,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*****, LayoutLeft, LayoutStride, Cuda,
+                              int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t*****, LayoutLeft, Cuda, int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank8.cpp b/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank8.cpp
index 172ff0cb02..f26ae1e4e1 100644
--- a/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank8.cpp
+++ b/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank8.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t********,LayoutLeft,LayoutRight, Cuda,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t********,LayoutLeft,LayoutLeft,  Cuda,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t********,LayoutLeft,LayoutStride,Cuda,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t********,LayoutLeft,Cuda,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t********, LayoutLeft, LayoutRight, Cuda,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t********, LayoutLeft, LayoutLeft, Cuda,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t********, LayoutLeft, LayoutStride, Cuda,
+                              int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t********, LayoutLeft, Cuda, int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank1.cpp b/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank1.cpp
index e0eabfd1ee..a5167f6fa8 100644
--- a/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank1.cpp
+++ b/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank1.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,19 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*,LayoutRight,LayoutRight, Cuda,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*,LayoutRight,LayoutLeft,  Cuda,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*,LayoutRight,LayoutStride,Cuda,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t*,LayoutRight,Cuda,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*, LayoutRight, LayoutRight, Cuda, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*, LayoutRight, LayoutLeft, Cuda, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*, LayoutRight, LayoutStride, Cuda,
+                              int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t*, LayoutRight, Cuda, int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank2.cpp b/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank2.cpp
index 9c832f1c76..60658f0bd7 100644
--- a/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank2.cpp
+++ b/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank2.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,20 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t**,LayoutRight,LayoutRight, Cuda,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t**,LayoutRight,LayoutLeft,  Cuda,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t**,LayoutRight,LayoutStride,Cuda,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t**,LayoutRight,Cuda,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t**, LayoutRight, LayoutRight, Cuda,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t**, LayoutRight, LayoutLeft, Cuda, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t**, LayoutRight, LayoutStride, Cuda,
+                              int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t**, LayoutRight, Cuda, int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank3.cpp b/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank3.cpp
index a8ef166b8e..f74d41f902 100644
--- a/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank3.cpp
+++ b/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank3.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t***,LayoutRight,LayoutRight, Cuda,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t***,LayoutRight,LayoutLeft,  Cuda,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t***,LayoutRight,LayoutStride,Cuda,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t***,LayoutRight,Cuda,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t***, LayoutRight, LayoutRight, Cuda,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t***, LayoutRight, LayoutLeft, Cuda,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t***, LayoutRight, LayoutStride, Cuda,
+                              int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t***, LayoutRight, Cuda, int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank4.cpp b/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank4.cpp
index b15610071e..0345966748 100644
--- a/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank4.cpp
+++ b/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank4.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t****,LayoutRight,LayoutRight, Cuda,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t****,LayoutRight,LayoutLeft,  Cuda,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t****,LayoutRight,LayoutStride,Cuda,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t****,LayoutRight,Cuda,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t****, LayoutRight, LayoutRight, Cuda,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t****, LayoutRight, LayoutLeft, Cuda,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t****, LayoutRight, LayoutStride, Cuda,
+                              int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t****, LayoutRight, Cuda, int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank5.cpp b/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank5.cpp
index aeb9ba2039..bfbaaaec7a 100644
--- a/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank5.cpp
+++ b/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank5.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*****,LayoutRight,LayoutRight, Cuda,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*****,LayoutRight,LayoutLeft,  Cuda,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*****,LayoutRight,LayoutStride,Cuda,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t*****,LayoutRight,Cuda,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*****, LayoutRight, LayoutRight, Cuda,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*****, LayoutRight, LayoutLeft, Cuda,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*****, LayoutRight, LayoutStride, Cuda,
+                              int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t*****, LayoutRight, Cuda, int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank8.cpp b/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank8.cpp
index 5a17f5f3c8..1be20a18fc 100644
--- a/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank8.cpp
+++ b/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank8.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t********,LayoutRight,LayoutRight, Cuda,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t********,LayoutRight,LayoutLeft,  Cuda,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t********,LayoutRight,LayoutStride,Cuda,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t********,LayoutRight,Cuda,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t********, LayoutRight, LayoutRight, Cuda,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t********, LayoutRight, LayoutLeft, Cuda,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t********, LayoutRight, LayoutStride, Cuda,
+                              int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t********, LayoutRight, Cuda, int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank1.cpp b/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank1.cpp
index cb24225dc7..51394ca352 100644
--- a/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank1.cpp
+++ b/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank1.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,20 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*,LayoutStride,LayoutRight, Cuda,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*,LayoutStride,LayoutLeft,  Cuda,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*,LayoutStride,LayoutStride,Cuda,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t*,LayoutStride,Cuda,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*, LayoutStride, LayoutRight, Cuda,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*, LayoutStride, LayoutLeft, Cuda, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*, LayoutStride, LayoutStride, Cuda,
+                              int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t*, LayoutStride, Cuda, int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank2.cpp b/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank2.cpp
index d0750ee04b..df4ef48e33 100644
--- a/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank2.cpp
+++ b/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank2.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t**,LayoutStride,LayoutRight, Cuda,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t**,LayoutStride,LayoutLeft,  Cuda,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t**,LayoutStride,LayoutStride,Cuda,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t**,LayoutStride,Cuda,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t**, LayoutStride, LayoutRight, Cuda,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t**, LayoutStride, LayoutLeft, Cuda,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t**, LayoutStride, LayoutStride, Cuda,
+                              int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t**, LayoutStride, Cuda, int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank3.cpp b/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank3.cpp
index 2e7bddc68f..83671a7caa 100644
--- a/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank3.cpp
+++ b/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank3.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t***,LayoutStride,LayoutRight, Cuda,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t***,LayoutStride,LayoutLeft,  Cuda,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t***,LayoutStride,LayoutStride,Cuda,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t***,LayoutStride,Cuda,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t***, LayoutStride, LayoutRight, Cuda,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t***, LayoutStride, LayoutLeft, Cuda,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t***, LayoutStride, LayoutStride, Cuda,
+                              int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t***, LayoutStride, Cuda, int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank4.cpp b/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank4.cpp
index 0396b97466..e652e268be 100644
--- a/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank4.cpp
+++ b/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank4.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t****,LayoutStride,LayoutRight, Cuda,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t****,LayoutStride,LayoutLeft,  Cuda,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t****,LayoutStride,LayoutStride,Cuda,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t****,LayoutStride,Cuda,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t****, LayoutStride, LayoutRight, Cuda,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t****, LayoutStride, LayoutLeft, Cuda,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t****, LayoutStride, LayoutStride, Cuda,
+                              int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t****, LayoutStride, Cuda, int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank5.cpp b/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank5.cpp
index f43d9ced14..2b6b50a890 100644
--- a/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank5.cpp
+++ b/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank5.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*****,LayoutStride,LayoutRight, Cuda,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*****,LayoutStride,LayoutLeft,  Cuda,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*****,LayoutStride,LayoutStride,Cuda,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t*****,LayoutStride,Cuda,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*****, LayoutStride, LayoutRight, Cuda,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*****, LayoutStride, LayoutLeft, Cuda,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*****, LayoutStride, LayoutStride, Cuda,
+                              int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t*****, LayoutStride, Cuda, int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank8.cpp b/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank8.cpp
index dd6268bdb1..072569f7ec 100644
--- a/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank8.cpp
+++ b/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank8.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t********,LayoutStride,LayoutRight, Cuda,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t********,LayoutStride,LayoutLeft,  Cuda,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t********,LayoutStride,LayoutStride,Cuda,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t********,LayoutStride,Cuda,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t********, LayoutStride, LayoutRight, Cuda,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t********, LayoutStride, LayoutLeft, Cuda,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t********, LayoutStride, LayoutStride, Cuda,
+                              int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t********, LayoutStride, Cuda, int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank1.cpp b/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank1.cpp
index b46f21eaaf..b2bb00cb89 100644
--- a/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank1.cpp
+++ b/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank1.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,18 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*,LayoutLeft,LayoutRight, Cuda,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*,LayoutLeft,LayoutLeft,  Cuda,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*,LayoutLeft,LayoutStride,Cuda,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int*,LayoutLeft,Cuda,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*, LayoutLeft, LayoutRight, Cuda, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*, LayoutLeft, LayoutLeft, Cuda, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*, LayoutLeft, LayoutStride, Cuda, int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int*, LayoutLeft, Cuda, int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank2.cpp b/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank2.cpp
index 4e4f72de24..39615042ee 100644
--- a/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank2.cpp
+++ b/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank2.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,18 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int**,LayoutLeft,LayoutRight, Cuda,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int**,LayoutLeft,LayoutLeft,  Cuda,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int**,LayoutLeft,LayoutStride,Cuda,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int**,LayoutLeft,Cuda,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int**, LayoutLeft, LayoutRight, Cuda, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int**, LayoutLeft, LayoutLeft, Cuda, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int**, LayoutLeft, LayoutStride, Cuda, int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int**, LayoutLeft, Cuda, int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank3.cpp b/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank3.cpp
index 762be2a5b1..a98a7aad2d 100644
--- a/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank3.cpp
+++ b/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank3.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,18 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int***,LayoutLeft,LayoutRight, Cuda,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int***,LayoutLeft,LayoutLeft,  Cuda,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int***,LayoutLeft,LayoutStride,Cuda,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int***,LayoutLeft,Cuda,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int***, LayoutLeft, LayoutRight, Cuda, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int***, LayoutLeft, LayoutLeft, Cuda, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int***, LayoutLeft, LayoutStride, Cuda, int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int***, LayoutLeft, Cuda, int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank4.cpp b/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank4.cpp
index 7c569e881e..e557600c6c 100644
--- a/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank4.cpp
+++ b/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank4.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,18 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int****,LayoutLeft,LayoutRight, Cuda,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int****,LayoutLeft,LayoutLeft,  Cuda,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int****,LayoutLeft,LayoutStride,Cuda,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int****,LayoutLeft,Cuda,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int****, LayoutLeft, LayoutRight, Cuda, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int****, LayoutLeft, LayoutLeft, Cuda, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int****, LayoutLeft, LayoutStride, Cuda, int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int****, LayoutLeft, Cuda, int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank5.cpp b/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank5.cpp
index 45e08d82c0..0e31670af8 100644
--- a/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank5.cpp
+++ b/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank5.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,18 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*****,LayoutLeft,LayoutRight, Cuda,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*****,LayoutLeft,LayoutLeft,  Cuda,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*****,LayoutLeft,LayoutStride,Cuda,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int*****,LayoutLeft,Cuda,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*****, LayoutLeft, LayoutRight, Cuda, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*****, LayoutLeft, LayoutLeft, Cuda, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*****, LayoutLeft, LayoutStride, Cuda, int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int*****, LayoutLeft, Cuda, int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank8.cpp b/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank8.cpp
index 02eb834284..873bcb274e 100644
--- a/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank8.cpp
+++ b/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank8.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int********,LayoutLeft,LayoutRight, Cuda,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int********,LayoutLeft,LayoutLeft,  Cuda,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int********,LayoutLeft,LayoutStride,Cuda,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int********,LayoutLeft,Cuda,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int********, LayoutLeft, LayoutRight, Cuda,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int********, LayoutLeft, LayoutLeft, Cuda,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int********, LayoutLeft, LayoutStride, Cuda,
+                              int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int********, LayoutLeft, Cuda, int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int_LayoutRight_Rank1.cpp b/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int_LayoutRight_Rank1.cpp
index df7e14fcac..0cb8e8f22f 100644
--- a/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int_LayoutRight_Rank1.cpp
+++ b/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int_LayoutRight_Rank1.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,18 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*,LayoutRight,LayoutRight, Cuda,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*,LayoutRight,LayoutLeft,  Cuda,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*,LayoutRight,LayoutStride,Cuda,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int*,LayoutRight,Cuda,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*, LayoutRight, LayoutRight, Cuda, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*, LayoutRight, LayoutLeft, Cuda, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*, LayoutRight, LayoutStride, Cuda, int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int*, LayoutRight, Cuda, int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int_LayoutRight_Rank2.cpp b/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int_LayoutRight_Rank2.cpp
index c55ee267b3..120fbd4278 100644
--- a/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int_LayoutRight_Rank2.cpp
+++ b/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int_LayoutRight_Rank2.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,18 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int**,LayoutRight,LayoutRight, Cuda,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int**,LayoutRight,LayoutLeft,  Cuda,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int**,LayoutRight,LayoutStride,Cuda,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int**,LayoutRight,Cuda,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int**, LayoutRight, LayoutRight, Cuda, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int**, LayoutRight, LayoutLeft, Cuda, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int**, LayoutRight, LayoutStride, Cuda, int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int**, LayoutRight, Cuda, int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int_LayoutRight_Rank3.cpp b/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int_LayoutRight_Rank3.cpp
index a151eb3373..181c8df8df 100644
--- a/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int_LayoutRight_Rank3.cpp
+++ b/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int_LayoutRight_Rank3.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,18 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int***,LayoutRight,LayoutRight, Cuda,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int***,LayoutRight,LayoutLeft,  Cuda,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int***,LayoutRight,LayoutStride,Cuda,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int***,LayoutRight,Cuda,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int***, LayoutRight, LayoutRight, Cuda, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int***, LayoutRight, LayoutLeft, Cuda, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int***, LayoutRight, LayoutStride, Cuda, int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int***, LayoutRight, Cuda, int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int_LayoutRight_Rank4.cpp b/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int_LayoutRight_Rank4.cpp
index f63ed4acb0..0e7254d25b 100644
--- a/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int_LayoutRight_Rank4.cpp
+++ b/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int_LayoutRight_Rank4.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,18 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int****,LayoutRight,LayoutRight, Cuda,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int****,LayoutRight,LayoutLeft,  Cuda,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int****,LayoutRight,LayoutStride,Cuda,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int****,LayoutRight,Cuda,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int****, LayoutRight, LayoutRight, Cuda, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int****, LayoutRight, LayoutLeft, Cuda, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int****, LayoutRight, LayoutStride, Cuda, int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int****, LayoutRight, Cuda, int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int_LayoutRight_Rank5.cpp b/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int_LayoutRight_Rank5.cpp
index 2d469487dc..e0a383743a 100644
--- a/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int_LayoutRight_Rank5.cpp
+++ b/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int_LayoutRight_Rank5.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,19 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*****,LayoutRight,LayoutRight, Cuda,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*****,LayoutRight,LayoutLeft,  Cuda,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*****,LayoutRight,LayoutStride,Cuda,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int*****,LayoutRight,Cuda,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*****, LayoutRight, LayoutRight, Cuda, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*****, LayoutRight, LayoutLeft, Cuda, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*****, LayoutRight, LayoutStride, Cuda,
+                              int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int*****, LayoutRight, Cuda, int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int_LayoutRight_Rank8.cpp b/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int_LayoutRight_Rank8.cpp
index b38a8c5b66..4bcab3263f 100644
--- a/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int_LayoutRight_Rank8.cpp
+++ b/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int_LayoutRight_Rank8.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int********,LayoutRight,LayoutRight, Cuda,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int********,LayoutRight,LayoutLeft,  Cuda,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int********,LayoutRight,LayoutStride,Cuda,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int********,LayoutRight,Cuda,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int********, LayoutRight, LayoutRight, Cuda,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int********, LayoutRight, LayoutLeft, Cuda,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int********, LayoutRight, LayoutStride, Cuda,
+                              int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int********, LayoutRight, Cuda, int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int_LayoutStride_Rank1.cpp b/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int_LayoutStride_Rank1.cpp
index 1c7418bc76..4fc3ffeac8 100644
--- a/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int_LayoutStride_Rank1.cpp
+++ b/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int_LayoutStride_Rank1.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,18 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*,LayoutStride,LayoutRight, Cuda,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*,LayoutStride,LayoutLeft,  Cuda,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*,LayoutStride,LayoutStride,Cuda,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int*,LayoutStride,Cuda,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*, LayoutStride, LayoutRight, Cuda, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*, LayoutStride, LayoutLeft, Cuda, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*, LayoutStride, LayoutStride, Cuda, int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int*, LayoutStride, Cuda, int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int_LayoutStride_Rank2.cpp b/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int_LayoutStride_Rank2.cpp
index 179c6d0dc3..cf63d330b1 100644
--- a/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int_LayoutStride_Rank2.cpp
+++ b/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int_LayoutStride_Rank2.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,18 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int**,LayoutStride,LayoutRight, Cuda,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int**,LayoutStride,LayoutLeft,  Cuda,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int**,LayoutStride,LayoutStride,Cuda,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int**,LayoutStride,Cuda,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int**, LayoutStride, LayoutRight, Cuda, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int**, LayoutStride, LayoutLeft, Cuda, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int**, LayoutStride, LayoutStride, Cuda, int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int**, LayoutStride, Cuda, int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int_LayoutStride_Rank3.cpp b/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int_LayoutStride_Rank3.cpp
index c3c8600757..e3ec8d7a0e 100644
--- a/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int_LayoutStride_Rank3.cpp
+++ b/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int_LayoutStride_Rank3.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,18 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int***,LayoutStride,LayoutRight, Cuda,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int***,LayoutStride,LayoutLeft,  Cuda,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int***,LayoutStride,LayoutStride,Cuda,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int***,LayoutStride,Cuda,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int***, LayoutStride, LayoutRight, Cuda, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int***, LayoutStride, LayoutLeft, Cuda, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int***, LayoutStride, LayoutStride, Cuda, int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int***, LayoutStride, Cuda, int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int_LayoutStride_Rank4.cpp b/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int_LayoutStride_Rank4.cpp
index 0db8766827..9e8739ba3d 100644
--- a/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int_LayoutStride_Rank4.cpp
+++ b/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int_LayoutStride_Rank4.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,19 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int****,LayoutStride,LayoutRight, Cuda,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int****,LayoutStride,LayoutLeft,  Cuda,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int****,LayoutStride,LayoutStride,Cuda,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int****,LayoutStride,Cuda,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int****, LayoutStride, LayoutRight, Cuda, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int****, LayoutStride, LayoutLeft, Cuda, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int****, LayoutStride, LayoutStride, Cuda,
+                              int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int****, LayoutStride, Cuda, int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int_LayoutStride_Rank5.cpp b/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int_LayoutStride_Rank5.cpp
index cf7a595d92..30a6e366f3 100644
--- a/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int_LayoutStride_Rank5.cpp
+++ b/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int_LayoutStride_Rank5.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,20 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*****,LayoutStride,LayoutRight, Cuda,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*****,LayoutStride,LayoutLeft,  Cuda,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*****,LayoutStride,LayoutStride,Cuda,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int*****,LayoutStride,Cuda,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*****, LayoutStride, LayoutRight, Cuda,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*****, LayoutStride, LayoutLeft, Cuda, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*****, LayoutStride, LayoutStride, Cuda,
+                              int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int*****, LayoutStride, Cuda, int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int_LayoutStride_Rank8.cpp b/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int_LayoutStride_Rank8.cpp
index d92069af55..1d7eedd9ff 100644
--- a/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int_LayoutStride_Rank8.cpp
+++ b/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int_LayoutStride_Rank8.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int********,LayoutStride,LayoutRight, Cuda,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int********,LayoutStride,LayoutLeft,  Cuda,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int********,LayoutStride,LayoutStride,Cuda,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int********,LayoutStride,Cuda,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int********, LayoutStride, LayoutRight, Cuda,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int********, LayoutStride, LayoutLeft, Cuda,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int********, LayoutStride, LayoutStride, Cuda,
+                              int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int********, LayoutStride, Cuda, int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_double_LayoutLeft_Rank1.cpp b/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_double_LayoutLeft_Rank1.cpp
index 648989d4e7..372bc02c3f 100644
--- a/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_double_LayoutLeft_Rank1.cpp
+++ b/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_double_LayoutLeft_Rank1.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,18 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*,LayoutLeft,LayoutRight, Cuda,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*,LayoutLeft,LayoutLeft,  Cuda,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*,LayoutLeft,LayoutStride,Cuda,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(double*,LayoutLeft,Cuda,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*, LayoutLeft, LayoutRight, Cuda, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*, LayoutLeft, LayoutLeft, Cuda, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*, LayoutLeft, LayoutStride, Cuda, int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(double*, LayoutLeft, Cuda, int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_double_LayoutLeft_Rank2.cpp b/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_double_LayoutLeft_Rank2.cpp
index 52e5616179..9c9328f21d 100644
--- a/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_double_LayoutLeft_Rank2.cpp
+++ b/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_double_LayoutLeft_Rank2.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,18 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double**,LayoutLeft,LayoutRight, Cuda,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double**,LayoutLeft,LayoutLeft,  Cuda,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double**,LayoutLeft,LayoutStride,Cuda,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(double**,LayoutLeft,Cuda,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double**, LayoutLeft, LayoutRight, Cuda, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double**, LayoutLeft, LayoutLeft, Cuda, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double**, LayoutLeft, LayoutStride, Cuda, int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(double**, LayoutLeft, Cuda, int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_double_LayoutLeft_Rank3.cpp b/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_double_LayoutLeft_Rank3.cpp
index 25893821ea..86a85d220a 100644
--- a/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_double_LayoutLeft_Rank3.cpp
+++ b/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_double_LayoutLeft_Rank3.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,18 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double***,LayoutLeft,LayoutRight, Cuda,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double***,LayoutLeft,LayoutLeft,  Cuda,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double***,LayoutLeft,LayoutStride,Cuda,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(double***,LayoutLeft,Cuda,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double***, LayoutLeft, LayoutRight, Cuda, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double***, LayoutLeft, LayoutLeft, Cuda, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double***, LayoutLeft, LayoutStride, Cuda, int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(double***, LayoutLeft, Cuda, int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_double_LayoutLeft_Rank4.cpp b/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_double_LayoutLeft_Rank4.cpp
index fb063765be..251bf7dd18 100644
--- a/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_double_LayoutLeft_Rank4.cpp
+++ b/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_double_LayoutLeft_Rank4.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,18 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double****,LayoutLeft,LayoutRight, Cuda,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double****,LayoutLeft,LayoutLeft,  Cuda,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double****,LayoutLeft,LayoutStride,Cuda,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(double****,LayoutLeft,Cuda,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double****, LayoutLeft, LayoutRight, Cuda, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double****, LayoutLeft, LayoutLeft, Cuda, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double****, LayoutLeft, LayoutStride, Cuda, int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(double****, LayoutLeft, Cuda, int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_double_LayoutLeft_Rank5.cpp b/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_double_LayoutLeft_Rank5.cpp
index 7f3d5640a1..f0c0d79391 100644
--- a/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_double_LayoutLeft_Rank5.cpp
+++ b/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_double_LayoutLeft_Rank5.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,18 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*****,LayoutLeft,LayoutRight, Cuda,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*****,LayoutLeft,LayoutLeft,  Cuda,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*****,LayoutLeft,LayoutStride,Cuda,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(double*****,LayoutLeft,Cuda,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*****, LayoutLeft, LayoutRight, Cuda, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*****, LayoutLeft, LayoutLeft, Cuda, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*****, LayoutLeft, LayoutStride, Cuda, int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(double*****, LayoutLeft, Cuda, int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_double_LayoutLeft_Rank8.cpp b/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_double_LayoutLeft_Rank8.cpp
index 944487e6fb..1b094259f8 100644
--- a/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_double_LayoutLeft_Rank8.cpp
+++ b/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_double_LayoutLeft_Rank8.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,20 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double********,LayoutLeft,LayoutRight, Cuda,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double********,LayoutLeft,LayoutLeft,  Cuda,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double********,LayoutLeft,LayoutStride,Cuda,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(double********,LayoutLeft,Cuda,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double********, LayoutLeft, LayoutRight, Cuda,
+                              int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double********, LayoutLeft, LayoutLeft, Cuda, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double********, LayoutLeft, LayoutStride, Cuda,
+                              int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(double********, LayoutLeft, Cuda, int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_double_LayoutRight_Rank1.cpp b/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_double_LayoutRight_Rank1.cpp
index ed279b3e5d..82b8f87fa4 100644
--- a/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_double_LayoutRight_Rank1.cpp
+++ b/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_double_LayoutRight_Rank1.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,18 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*,LayoutRight,LayoutRight, Cuda,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*,LayoutRight,LayoutLeft,  Cuda,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*,LayoutRight,LayoutStride,Cuda,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(double*,LayoutRight,Cuda,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*, LayoutRight, LayoutRight, Cuda, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*, LayoutRight, LayoutLeft, Cuda, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*, LayoutRight, LayoutStride, Cuda, int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(double*, LayoutRight, Cuda, int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_double_LayoutRight_Rank2.cpp b/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_double_LayoutRight_Rank2.cpp
index 9a8a68cb02..daf8a4d1e7 100644
--- a/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_double_LayoutRight_Rank2.cpp
+++ b/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_double_LayoutRight_Rank2.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,18 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double**,LayoutRight,LayoutRight, Cuda,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double**,LayoutRight,LayoutLeft,  Cuda,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double**,LayoutRight,LayoutStride,Cuda,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(double**,LayoutRight,Cuda,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double**, LayoutRight, LayoutRight, Cuda, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double**, LayoutRight, LayoutLeft, Cuda, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double**, LayoutRight, LayoutStride, Cuda, int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(double**, LayoutRight, Cuda, int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_double_LayoutRight_Rank3.cpp b/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_double_LayoutRight_Rank3.cpp
index 29be58695c..bbdd48bfd5 100644
--- a/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_double_LayoutRight_Rank3.cpp
+++ b/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_double_LayoutRight_Rank3.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,18 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double***,LayoutRight,LayoutRight, Cuda,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double***,LayoutRight,LayoutLeft,  Cuda,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double***,LayoutRight,LayoutStride,Cuda,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(double***,LayoutRight,Cuda,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double***, LayoutRight, LayoutRight, Cuda, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double***, LayoutRight, LayoutLeft, Cuda, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double***, LayoutRight, LayoutStride, Cuda, int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(double***, LayoutRight, Cuda, int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_double_LayoutRight_Rank4.cpp b/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_double_LayoutRight_Rank4.cpp
index c8049f36be..093c250d57 100644
--- a/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_double_LayoutRight_Rank4.cpp
+++ b/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_double_LayoutRight_Rank4.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,18 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double****,LayoutRight,LayoutRight, Cuda,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double****,LayoutRight,LayoutLeft,  Cuda,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double****,LayoutRight,LayoutStride,Cuda,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(double****,LayoutRight,Cuda,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double****, LayoutRight, LayoutRight, Cuda, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double****, LayoutRight, LayoutLeft, Cuda, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double****, LayoutRight, LayoutStride, Cuda, int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(double****, LayoutRight, Cuda, int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_double_LayoutRight_Rank5.cpp b/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_double_LayoutRight_Rank5.cpp
index 9ff426d378..c8472757c7 100644
--- a/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_double_LayoutRight_Rank5.cpp
+++ b/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_double_LayoutRight_Rank5.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,18 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*****,LayoutRight,LayoutRight, Cuda,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*****,LayoutRight,LayoutLeft,  Cuda,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*****,LayoutRight,LayoutStride,Cuda,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(double*****,LayoutRight,Cuda,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*****, LayoutRight, LayoutRight, Cuda, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*****, LayoutRight, LayoutLeft, Cuda, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*****, LayoutRight, LayoutStride, Cuda, int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(double*****, LayoutRight, Cuda, int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_double_LayoutRight_Rank8.cpp b/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_double_LayoutRight_Rank8.cpp
index 54d71faa98..f8a9291132 100644
--- a/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_double_LayoutRight_Rank8.cpp
+++ b/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_double_LayoutRight_Rank8.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double********,LayoutRight,LayoutRight, Cuda,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double********,LayoutRight,LayoutLeft,  Cuda,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double********,LayoutRight,LayoutStride,Cuda,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(double********,LayoutRight,Cuda,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double********, LayoutRight, LayoutRight, Cuda,
+                              int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double********, LayoutRight, LayoutLeft, Cuda,
+                              int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double********, LayoutRight, LayoutStride, Cuda,
+                              int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(double********, LayoutRight, Cuda, int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_double_LayoutStride_Rank1.cpp b/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_double_LayoutStride_Rank1.cpp
index b5348d789d..f47423fc1b 100644
--- a/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_double_LayoutStride_Rank1.cpp
+++ b/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_double_LayoutStride_Rank1.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,18 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*,LayoutStride,LayoutRight, Cuda,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*,LayoutStride,LayoutLeft,  Cuda,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*,LayoutStride,LayoutStride,Cuda,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(double*,LayoutStride,Cuda,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*, LayoutStride, LayoutRight, Cuda, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*, LayoutStride, LayoutLeft, Cuda, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*, LayoutStride, LayoutStride, Cuda, int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(double*, LayoutStride, Cuda, int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_double_LayoutStride_Rank2.cpp b/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_double_LayoutStride_Rank2.cpp
index 8f176e035a..f9b8d6dba3 100644
--- a/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_double_LayoutStride_Rank2.cpp
+++ b/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_double_LayoutStride_Rank2.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,18 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double**,LayoutStride,LayoutRight, Cuda,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double**,LayoutStride,LayoutLeft,  Cuda,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double**,LayoutStride,LayoutStride,Cuda,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(double**,LayoutStride,Cuda,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double**, LayoutStride, LayoutRight, Cuda, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double**, LayoutStride, LayoutLeft, Cuda, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double**, LayoutStride, LayoutStride, Cuda, int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(double**, LayoutStride, Cuda, int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_double_LayoutStride_Rank3.cpp b/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_double_LayoutStride_Rank3.cpp
index f3b11f3be3..8dd503b5a8 100644
--- a/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_double_LayoutStride_Rank3.cpp
+++ b/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_double_LayoutStride_Rank3.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,18 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double***,LayoutStride,LayoutRight, Cuda,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double***,LayoutStride,LayoutLeft,  Cuda,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double***,LayoutStride,LayoutStride,Cuda,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(double***,LayoutStride,Cuda,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double***, LayoutStride, LayoutRight, Cuda, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double***, LayoutStride, LayoutLeft, Cuda, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double***, LayoutStride, LayoutStride, Cuda, int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(double***, LayoutStride, Cuda, int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_double_LayoutStride_Rank4.cpp b/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_double_LayoutStride_Rank4.cpp
index bc75c59aa0..f931713455 100644
--- a/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_double_LayoutStride_Rank4.cpp
+++ b/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_double_LayoutStride_Rank4.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,18 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double****,LayoutStride,LayoutRight, Cuda,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double****,LayoutStride,LayoutLeft,  Cuda,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double****,LayoutStride,LayoutStride,Cuda,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(double****,LayoutStride,Cuda,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double****, LayoutStride, LayoutRight, Cuda, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double****, LayoutStride, LayoutLeft, Cuda, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double****, LayoutStride, LayoutStride, Cuda, int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(double****, LayoutStride, Cuda, int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_double_LayoutStride_Rank5.cpp b/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_double_LayoutStride_Rank5.cpp
index ef4ab09758..9105b908b3 100644
--- a/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_double_LayoutStride_Rank5.cpp
+++ b/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_double_LayoutStride_Rank5.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,19 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*****,LayoutStride,LayoutRight, Cuda,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*****,LayoutStride,LayoutLeft,  Cuda,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*****,LayoutStride,LayoutStride,Cuda,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(double*****,LayoutStride,Cuda,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*****, LayoutStride, LayoutRight, Cuda, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*****, LayoutStride, LayoutLeft, Cuda, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*****, LayoutStride, LayoutStride, Cuda,
+                              int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(double*****, LayoutStride, Cuda, int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_double_LayoutStride_Rank8.cpp b/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_double_LayoutStride_Rank8.cpp
index 6b3e5b4f50..6f92bf8f50 100644
--- a/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_double_LayoutStride_Rank8.cpp
+++ b/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_double_LayoutStride_Rank8.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double********,LayoutStride,LayoutRight, Cuda,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double********,LayoutStride,LayoutLeft,  Cuda,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double********,LayoutStride,LayoutStride,Cuda,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(double********,LayoutStride,Cuda,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double********, LayoutStride, LayoutRight, Cuda,
+                              int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double********, LayoutStride, LayoutLeft, Cuda,
+                              int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double********, LayoutStride, LayoutStride, Cuda,
+                              int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(double********, LayoutStride, Cuda, int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_float_LayoutLeft_Rank1.cpp b/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_float_LayoutLeft_Rank1.cpp
index 6fa6134d5f..6538490fe3 100644
--- a/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_float_LayoutLeft_Rank1.cpp
+++ b/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_float_LayoutLeft_Rank1.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,18 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*,LayoutLeft,LayoutRight, Cuda,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*,LayoutLeft,LayoutLeft,  Cuda,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*,LayoutLeft,LayoutStride,Cuda,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(float*,LayoutLeft,Cuda,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*, LayoutLeft, LayoutRight, Cuda, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*, LayoutLeft, LayoutLeft, Cuda, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*, LayoutLeft, LayoutStride, Cuda, int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(float*, LayoutLeft, Cuda, int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_float_LayoutLeft_Rank2.cpp b/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_float_LayoutLeft_Rank2.cpp
index bb868bcd8f..c7a793b3d1 100644
--- a/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_float_LayoutLeft_Rank2.cpp
+++ b/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_float_LayoutLeft_Rank2.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,18 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float**,LayoutLeft,LayoutRight, Cuda,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float**,LayoutLeft,LayoutLeft,  Cuda,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float**,LayoutLeft,LayoutStride,Cuda,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(float**,LayoutLeft,Cuda,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float**, LayoutLeft, LayoutRight, Cuda, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float**, LayoutLeft, LayoutLeft, Cuda, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float**, LayoutLeft, LayoutStride, Cuda, int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(float**, LayoutLeft, Cuda, int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_float_LayoutLeft_Rank3.cpp b/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_float_LayoutLeft_Rank3.cpp
index 9073092dd6..7e5c7b56f0 100644
--- a/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_float_LayoutLeft_Rank3.cpp
+++ b/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_float_LayoutLeft_Rank3.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,18 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float***,LayoutLeft,LayoutRight, Cuda,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float***,LayoutLeft,LayoutLeft,  Cuda,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float***,LayoutLeft,LayoutStride,Cuda,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(float***,LayoutLeft,Cuda,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float***, LayoutLeft, LayoutRight, Cuda, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float***, LayoutLeft, LayoutLeft, Cuda, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float***, LayoutLeft, LayoutStride, Cuda, int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(float***, LayoutLeft, Cuda, int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_float_LayoutLeft_Rank4.cpp b/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_float_LayoutLeft_Rank4.cpp
index a863155fee..dcf7043698 100644
--- a/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_float_LayoutLeft_Rank4.cpp
+++ b/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_float_LayoutLeft_Rank4.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,18 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float****,LayoutLeft,LayoutRight, Cuda,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float****,LayoutLeft,LayoutLeft,  Cuda,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float****,LayoutLeft,LayoutStride,Cuda,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(float****,LayoutLeft,Cuda,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float****, LayoutLeft, LayoutRight, Cuda, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float****, LayoutLeft, LayoutLeft, Cuda, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float****, LayoutLeft, LayoutStride, Cuda, int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(float****, LayoutLeft, Cuda, int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_float_LayoutLeft_Rank5.cpp b/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_float_LayoutLeft_Rank5.cpp
index e7dfece441..3bd6920f41 100644
--- a/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_float_LayoutLeft_Rank5.cpp
+++ b/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_float_LayoutLeft_Rank5.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,18 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*****,LayoutLeft,LayoutRight, Cuda,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*****,LayoutLeft,LayoutLeft,  Cuda,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*****,LayoutLeft,LayoutStride,Cuda,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(float*****,LayoutLeft,Cuda,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*****, LayoutLeft, LayoutRight, Cuda, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*****, LayoutLeft, LayoutLeft, Cuda, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*****, LayoutLeft, LayoutStride, Cuda, int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(float*****, LayoutLeft, Cuda, int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_float_LayoutLeft_Rank8.cpp b/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_float_LayoutLeft_Rank8.cpp
index 29553b1f0c..d75d3f9241 100644
--- a/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_float_LayoutLeft_Rank8.cpp
+++ b/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_float_LayoutLeft_Rank8.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,19 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float********,LayoutLeft,LayoutRight, Cuda,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float********,LayoutLeft,LayoutLeft,  Cuda,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float********,LayoutLeft,LayoutStride,Cuda,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(float********,LayoutLeft,Cuda,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float********, LayoutLeft, LayoutRight, Cuda, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float********, LayoutLeft, LayoutLeft, Cuda, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float********, LayoutLeft, LayoutStride, Cuda,
+                              int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(float********, LayoutLeft, Cuda, int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_float_LayoutRight_Rank1.cpp b/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_float_LayoutRight_Rank1.cpp
index dc0699b9f1..640fd04e96 100644
--- a/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_float_LayoutRight_Rank1.cpp
+++ b/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_float_LayoutRight_Rank1.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,18 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*,LayoutRight,LayoutRight, Cuda,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*,LayoutRight,LayoutLeft,  Cuda,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*,LayoutRight,LayoutStride,Cuda,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(float*,LayoutRight,Cuda,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*, LayoutRight, LayoutRight, Cuda, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*, LayoutRight, LayoutLeft, Cuda, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*, LayoutRight, LayoutStride, Cuda, int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(float*, LayoutRight, Cuda, int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_float_LayoutRight_Rank2.cpp b/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_float_LayoutRight_Rank2.cpp
index 6f1b308e51..b17601cf0a 100644
--- a/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_float_LayoutRight_Rank2.cpp
+++ b/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_float_LayoutRight_Rank2.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,18 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float**,LayoutRight,LayoutRight, Cuda,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float**,LayoutRight,LayoutLeft,  Cuda,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float**,LayoutRight,LayoutStride,Cuda,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(float**,LayoutRight,Cuda,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float**, LayoutRight, LayoutRight, Cuda, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float**, LayoutRight, LayoutLeft, Cuda, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float**, LayoutRight, LayoutStride, Cuda, int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(float**, LayoutRight, Cuda, int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_float_LayoutRight_Rank3.cpp b/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_float_LayoutRight_Rank3.cpp
index 5a80040b89..a039d13f19 100644
--- a/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_float_LayoutRight_Rank3.cpp
+++ b/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_float_LayoutRight_Rank3.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,18 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float***,LayoutRight,LayoutRight, Cuda,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float***,LayoutRight,LayoutLeft,  Cuda,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float***,LayoutRight,LayoutStride,Cuda,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(float***,LayoutRight,Cuda,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float***, LayoutRight, LayoutRight, Cuda, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float***, LayoutRight, LayoutLeft, Cuda, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float***, LayoutRight, LayoutStride, Cuda, int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(float***, LayoutRight, Cuda, int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_float_LayoutRight_Rank4.cpp b/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_float_LayoutRight_Rank4.cpp
index 87721733d4..0f4ac7de1d 100644
--- a/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_float_LayoutRight_Rank4.cpp
+++ b/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_float_LayoutRight_Rank4.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,18 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float****,LayoutRight,LayoutRight, Cuda,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float****,LayoutRight,LayoutLeft,  Cuda,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float****,LayoutRight,LayoutStride,Cuda,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(float****,LayoutRight,Cuda,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float****, LayoutRight, LayoutRight, Cuda, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float****, LayoutRight, LayoutLeft, Cuda, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float****, LayoutRight, LayoutStride, Cuda, int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(float****, LayoutRight, Cuda, int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_float_LayoutRight_Rank5.cpp b/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_float_LayoutRight_Rank5.cpp
index fd3bb36a88..892f51c218 100644
--- a/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_float_LayoutRight_Rank5.cpp
+++ b/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_float_LayoutRight_Rank5.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,18 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*****,LayoutRight,LayoutRight, Cuda,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*****,LayoutRight,LayoutLeft,  Cuda,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*****,LayoutRight,LayoutStride,Cuda,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(float*****,LayoutRight,Cuda,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*****, LayoutRight, LayoutRight, Cuda, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*****, LayoutRight, LayoutLeft, Cuda, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*****, LayoutRight, LayoutStride, Cuda, int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(float*****, LayoutRight, Cuda, int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_float_LayoutRight_Rank8.cpp b/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_float_LayoutRight_Rank8.cpp
index 3fbefed4db..ab96396e6a 100644
--- a/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_float_LayoutRight_Rank8.cpp
+++ b/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_float_LayoutRight_Rank8.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,20 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float********,LayoutRight,LayoutRight, Cuda,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float********,LayoutRight,LayoutLeft,  Cuda,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float********,LayoutRight,LayoutStride,Cuda,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(float********,LayoutRight,Cuda,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float********, LayoutRight, LayoutRight, Cuda,
+                              int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float********, LayoutRight, LayoutLeft, Cuda, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float********, LayoutRight, LayoutStride, Cuda,
+                              int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(float********, LayoutRight, Cuda, int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_float_LayoutStride_Rank1.cpp b/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_float_LayoutStride_Rank1.cpp
index fadb9ac50f..762c1f8f6b 100644
--- a/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_float_LayoutStride_Rank1.cpp
+++ b/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_float_LayoutStride_Rank1.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,18 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*,LayoutStride,LayoutRight, Cuda,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*,LayoutStride,LayoutLeft,  Cuda,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*,LayoutStride,LayoutStride,Cuda,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(float*,LayoutStride,Cuda,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*, LayoutStride, LayoutRight, Cuda, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*, LayoutStride, LayoutLeft, Cuda, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*, LayoutStride, LayoutStride, Cuda, int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(float*, LayoutStride, Cuda, int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_float_LayoutStride_Rank2.cpp b/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_float_LayoutStride_Rank2.cpp
index 7847f72807..63c6bdc8a0 100644
--- a/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_float_LayoutStride_Rank2.cpp
+++ b/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_float_LayoutStride_Rank2.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,18 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float**,LayoutStride,LayoutRight, Cuda,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float**,LayoutStride,LayoutLeft,  Cuda,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float**,LayoutStride,LayoutStride,Cuda,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(float**,LayoutStride,Cuda,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float**, LayoutStride, LayoutRight, Cuda, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float**, LayoutStride, LayoutLeft, Cuda, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float**, LayoutStride, LayoutStride, Cuda, int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(float**, LayoutStride, Cuda, int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_float_LayoutStride_Rank3.cpp b/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_float_LayoutStride_Rank3.cpp
index 2a24638193..5f0dc1f6e2 100644
--- a/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_float_LayoutStride_Rank3.cpp
+++ b/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_float_LayoutStride_Rank3.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,18 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float***,LayoutStride,LayoutRight, Cuda,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float***,LayoutStride,LayoutLeft,  Cuda,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float***,LayoutStride,LayoutStride,Cuda,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(float***,LayoutStride,Cuda,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float***, LayoutStride, LayoutRight, Cuda, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float***, LayoutStride, LayoutLeft, Cuda, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float***, LayoutStride, LayoutStride, Cuda, int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(float***, LayoutStride, Cuda, int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_float_LayoutStride_Rank4.cpp b/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_float_LayoutStride_Rank4.cpp
index 4e675eda16..d3eab4fe88 100644
--- a/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_float_LayoutStride_Rank4.cpp
+++ b/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_float_LayoutStride_Rank4.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,18 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float****,LayoutStride,LayoutRight, Cuda,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float****,LayoutStride,LayoutLeft,  Cuda,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float****,LayoutStride,LayoutStride,Cuda,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(float****,LayoutStride,Cuda,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float****, LayoutStride, LayoutRight, Cuda, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float****, LayoutStride, LayoutLeft, Cuda, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float****, LayoutStride, LayoutStride, Cuda, int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(float****, LayoutStride, Cuda, int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_float_LayoutStride_Rank5.cpp b/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_float_LayoutStride_Rank5.cpp
index 34193e4b1e..36d34aaff2 100644
--- a/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_float_LayoutStride_Rank5.cpp
+++ b/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_float_LayoutStride_Rank5.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,18 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*****,LayoutStride,LayoutRight, Cuda,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*****,LayoutStride,LayoutLeft,  Cuda,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*****,LayoutStride,LayoutStride,Cuda,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(float*****,LayoutStride,Cuda,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*****, LayoutStride, LayoutRight, Cuda, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*****, LayoutStride, LayoutLeft, Cuda, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*****, LayoutStride, LayoutStride, Cuda, int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(float*****, LayoutStride, Cuda, int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_float_LayoutStride_Rank8.cpp b/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_float_LayoutStride_Rank8.cpp
index e21b25cd00..1d9022f380 100644
--- a/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_float_LayoutStride_Rank8.cpp
+++ b/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_float_LayoutStride_Rank8.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float********,LayoutStride,LayoutRight, Cuda,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float********,LayoutStride,LayoutLeft,  Cuda,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float********,LayoutStride,LayoutStride,Cuda,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(float********,LayoutStride,Cuda,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float********, LayoutStride, LayoutRight, Cuda,
+                              int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float********, LayoutStride, LayoutLeft, Cuda,
+                              int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float********, LayoutStride, LayoutStride, Cuda,
+                              int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(float********, LayoutStride, Cuda, int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank1.cpp b/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank1.cpp
index 37ec7cc896..89172d0ef2 100644
--- a/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank1.cpp
+++ b/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank1.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,18 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*,LayoutLeft,LayoutRight, Cuda,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*,LayoutLeft,LayoutLeft,  Cuda,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*,LayoutLeft,LayoutStride,Cuda,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t*,LayoutLeft,Cuda,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*, LayoutLeft, LayoutRight, Cuda, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*, LayoutLeft, LayoutLeft, Cuda, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*, LayoutLeft, LayoutStride, Cuda, int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t*, LayoutLeft, Cuda, int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank2.cpp b/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank2.cpp
index 563bac2c1e..c14394738b 100644
--- a/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank2.cpp
+++ b/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank2.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,18 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t**,LayoutLeft,LayoutRight, Cuda,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t**,LayoutLeft,LayoutLeft,  Cuda,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t**,LayoutLeft,LayoutStride,Cuda,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t**,LayoutLeft,Cuda,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t**, LayoutLeft, LayoutRight, Cuda, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t**, LayoutLeft, LayoutLeft, Cuda, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t**, LayoutLeft, LayoutStride, Cuda, int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t**, LayoutLeft, Cuda, int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank3.cpp b/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank3.cpp
index 1999f0b66f..395dae627a 100644
--- a/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank3.cpp
+++ b/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank3.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,18 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t***,LayoutLeft,LayoutRight, Cuda,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t***,LayoutLeft,LayoutLeft,  Cuda,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t***,LayoutLeft,LayoutStride,Cuda,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t***,LayoutLeft,Cuda,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t***, LayoutLeft, LayoutRight, Cuda, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t***, LayoutLeft, LayoutLeft, Cuda, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t***, LayoutLeft, LayoutStride, Cuda, int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t***, LayoutLeft, Cuda, int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank4.cpp b/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank4.cpp
index abd11745ce..8c192533f5 100644
--- a/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank4.cpp
+++ b/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank4.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,18 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t****,LayoutLeft,LayoutRight, Cuda,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t****,LayoutLeft,LayoutLeft,  Cuda,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t****,LayoutLeft,LayoutStride,Cuda,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t****,LayoutLeft,Cuda,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t****, LayoutLeft, LayoutRight, Cuda, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t****, LayoutLeft, LayoutLeft, Cuda, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t****, LayoutLeft, LayoutStride, Cuda, int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t****, LayoutLeft, Cuda, int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank5.cpp b/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank5.cpp
index c480228d3f..22153b1158 100644
--- a/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank5.cpp
+++ b/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank5.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,18 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*****,LayoutLeft,LayoutRight, Cuda,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*****,LayoutLeft,LayoutLeft,  Cuda,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*****,LayoutLeft,LayoutStride,Cuda,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t*****,LayoutLeft,Cuda,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*****, LayoutLeft, LayoutRight, Cuda, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*****, LayoutLeft, LayoutLeft, Cuda, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*****, LayoutLeft, LayoutStride, Cuda, int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t*****, LayoutLeft, Cuda, int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank8.cpp b/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank8.cpp
index a3c1d0a883..0e5d276872 100644
--- a/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank8.cpp
+++ b/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank8.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t********,LayoutLeft,LayoutRight, Cuda,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t********,LayoutLeft,LayoutLeft,  Cuda,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t********,LayoutLeft,LayoutStride,Cuda,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t********,LayoutLeft,Cuda,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t********, LayoutLeft, LayoutRight, Cuda,
+                              int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t********, LayoutLeft, LayoutLeft, Cuda,
+                              int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t********, LayoutLeft, LayoutStride, Cuda,
+                              int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t********, LayoutLeft, Cuda, int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int64_t_LayoutRight_Rank1.cpp b/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int64_t_LayoutRight_Rank1.cpp
index 0e314b2725..d8b91a00f5 100644
--- a/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int64_t_LayoutRight_Rank1.cpp
+++ b/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int64_t_LayoutRight_Rank1.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,18 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*,LayoutRight,LayoutRight, Cuda,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*,LayoutRight,LayoutLeft,  Cuda,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*,LayoutRight,LayoutStride,Cuda,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t*,LayoutRight,Cuda,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*, LayoutRight, LayoutRight, Cuda, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*, LayoutRight, LayoutLeft, Cuda, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*, LayoutRight, LayoutStride, Cuda, int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t*, LayoutRight, Cuda, int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int64_t_LayoutRight_Rank2.cpp b/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int64_t_LayoutRight_Rank2.cpp
index be5d4747ad..08798db548 100644
--- a/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int64_t_LayoutRight_Rank2.cpp
+++ b/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int64_t_LayoutRight_Rank2.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,18 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t**,LayoutRight,LayoutRight, Cuda,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t**,LayoutRight,LayoutLeft,  Cuda,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t**,LayoutRight,LayoutStride,Cuda,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t**,LayoutRight,Cuda,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t**, LayoutRight, LayoutRight, Cuda, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t**, LayoutRight, LayoutLeft, Cuda, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t**, LayoutRight, LayoutStride, Cuda, int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t**, LayoutRight, Cuda, int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int64_t_LayoutRight_Rank3.cpp b/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int64_t_LayoutRight_Rank3.cpp
index 4e16c4ef3f..f371b9535d 100644
--- a/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int64_t_LayoutRight_Rank3.cpp
+++ b/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int64_t_LayoutRight_Rank3.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,18 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t***,LayoutRight,LayoutRight, Cuda,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t***,LayoutRight,LayoutLeft,  Cuda,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t***,LayoutRight,LayoutStride,Cuda,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t***,LayoutRight,Cuda,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t***, LayoutRight, LayoutRight, Cuda, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t***, LayoutRight, LayoutLeft, Cuda, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t***, LayoutRight, LayoutStride, Cuda, int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t***, LayoutRight, Cuda, int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int64_t_LayoutRight_Rank4.cpp b/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int64_t_LayoutRight_Rank4.cpp
index 41fec603a3..6b29dcd945 100644
--- a/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int64_t_LayoutRight_Rank4.cpp
+++ b/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int64_t_LayoutRight_Rank4.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,18 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t****,LayoutRight,LayoutRight, Cuda,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t****,LayoutRight,LayoutLeft,  Cuda,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t****,LayoutRight,LayoutStride,Cuda,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t****,LayoutRight,Cuda,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t****, LayoutRight, LayoutRight, Cuda, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t****, LayoutRight, LayoutLeft, Cuda, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t****, LayoutRight, LayoutStride, Cuda, int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t****, LayoutRight, Cuda, int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int64_t_LayoutRight_Rank5.cpp b/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int64_t_LayoutRight_Rank5.cpp
index b30e046bee..8deb69b612 100644
--- a/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int64_t_LayoutRight_Rank5.cpp
+++ b/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int64_t_LayoutRight_Rank5.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,19 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*****,LayoutRight,LayoutRight, Cuda,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*****,LayoutRight,LayoutLeft,  Cuda,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*****,LayoutRight,LayoutStride,Cuda,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t*****,LayoutRight,Cuda,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*****, LayoutRight, LayoutRight, Cuda, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*****, LayoutRight, LayoutLeft, Cuda, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*****, LayoutRight, LayoutStride, Cuda,
+                              int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t*****, LayoutRight, Cuda, int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int64_t_LayoutRight_Rank8.cpp b/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int64_t_LayoutRight_Rank8.cpp
index c7178a86f2..fbd4a498c9 100644
--- a/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int64_t_LayoutRight_Rank8.cpp
+++ b/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int64_t_LayoutRight_Rank8.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t********,LayoutRight,LayoutRight, Cuda,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t********,LayoutRight,LayoutLeft,  Cuda,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t********,LayoutRight,LayoutStride,Cuda,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t********,LayoutRight,Cuda,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t********, LayoutRight, LayoutRight, Cuda,
+                              int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t********, LayoutRight, LayoutLeft, Cuda,
+                              int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t********, LayoutRight, LayoutStride, Cuda,
+                              int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t********, LayoutRight, Cuda, int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int64_t_LayoutStride_Rank1.cpp b/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int64_t_LayoutStride_Rank1.cpp
index 4cfac53d82..b3c31de32d 100644
--- a/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int64_t_LayoutStride_Rank1.cpp
+++ b/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int64_t_LayoutStride_Rank1.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,18 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*,LayoutStride,LayoutRight, Cuda,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*,LayoutStride,LayoutLeft,  Cuda,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*,LayoutStride,LayoutStride,Cuda,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t*,LayoutStride,Cuda,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*, LayoutStride, LayoutRight, Cuda, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*, LayoutStride, LayoutLeft, Cuda, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*, LayoutStride, LayoutStride, Cuda, int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t*, LayoutStride, Cuda, int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int64_t_LayoutStride_Rank2.cpp b/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int64_t_LayoutStride_Rank2.cpp
index 857b32d762..6fab291061 100644
--- a/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int64_t_LayoutStride_Rank2.cpp
+++ b/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int64_t_LayoutStride_Rank2.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,18 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t**,LayoutStride,LayoutRight, Cuda,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t**,LayoutStride,LayoutLeft,  Cuda,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t**,LayoutStride,LayoutStride,Cuda,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t**,LayoutStride,Cuda,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t**, LayoutStride, LayoutRight, Cuda, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t**, LayoutStride, LayoutLeft, Cuda, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t**, LayoutStride, LayoutStride, Cuda, int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t**, LayoutStride, Cuda, int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int64_t_LayoutStride_Rank3.cpp b/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int64_t_LayoutStride_Rank3.cpp
index b443f33474..7be7b46627 100644
--- a/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int64_t_LayoutStride_Rank3.cpp
+++ b/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int64_t_LayoutStride_Rank3.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,18 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t***,LayoutStride,LayoutRight, Cuda,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t***,LayoutStride,LayoutLeft,  Cuda,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t***,LayoutStride,LayoutStride,Cuda,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t***,LayoutStride,Cuda,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t***, LayoutStride, LayoutRight, Cuda, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t***, LayoutStride, LayoutLeft, Cuda, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t***, LayoutStride, LayoutStride, Cuda, int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t***, LayoutStride, Cuda, int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int64_t_LayoutStride_Rank4.cpp b/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int64_t_LayoutStride_Rank4.cpp
index c9a2958fe2..9f0f83ba2d 100644
--- a/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int64_t_LayoutStride_Rank4.cpp
+++ b/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int64_t_LayoutStride_Rank4.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,19 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t****,LayoutStride,LayoutRight, Cuda,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t****,LayoutStride,LayoutLeft,  Cuda,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t****,LayoutStride,LayoutStride,Cuda,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t****,LayoutStride,Cuda,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t****, LayoutStride, LayoutRight, Cuda, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t****, LayoutStride, LayoutLeft, Cuda, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t****, LayoutStride, LayoutStride, Cuda,
+                              int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t****, LayoutStride, Cuda, int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int64_t_LayoutStride_Rank5.cpp b/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int64_t_LayoutStride_Rank5.cpp
index daca93e505..7fcc5db031 100644
--- a/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int64_t_LayoutStride_Rank5.cpp
+++ b/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int64_t_LayoutStride_Rank5.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,20 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*****,LayoutStride,LayoutRight, Cuda,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*****,LayoutStride,LayoutLeft,  Cuda,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*****,LayoutStride,LayoutStride,Cuda,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t*****,LayoutStride,Cuda,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*****, LayoutStride, LayoutRight, Cuda,
+                              int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*****, LayoutStride, LayoutLeft, Cuda, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*****, LayoutStride, LayoutStride, Cuda,
+                              int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t*****, LayoutStride, Cuda, int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int64_t_LayoutStride_Rank8.cpp b/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int64_t_LayoutStride_Rank8.cpp
index 2bd0664042..1a7b9933ab 100644
--- a/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int64_t_LayoutStride_Rank8.cpp
+++ b/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int64_t_LayoutStride_Rank8.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t********,LayoutStride,LayoutRight, Cuda,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t********,LayoutStride,LayoutLeft,  Cuda,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t********,LayoutStride,LayoutStride,Cuda,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t********,LayoutStride,Cuda,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t********, LayoutStride, LayoutRight, Cuda,
+                              int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t********, LayoutStride, LayoutLeft, Cuda,
+                              int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t********, LayoutStride, LayoutStride, Cuda,
+                              int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t********, LayoutStride, Cuda, int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int_LayoutLeft_Rank1.cpp b/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int_LayoutLeft_Rank1.cpp
index 90cf69ddea..c89e60595e 100644
--- a/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int_LayoutLeft_Rank1.cpp
+++ b/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int_LayoutLeft_Rank1.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,18 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*,LayoutLeft,LayoutRight, Cuda,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*,LayoutLeft,LayoutLeft,  Cuda,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*,LayoutLeft,LayoutStride,Cuda,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int*,LayoutLeft,Cuda,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*, LayoutLeft, LayoutRight, Cuda, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*, LayoutLeft, LayoutLeft, Cuda, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*, LayoutLeft, LayoutStride, Cuda, int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int*, LayoutLeft, Cuda, int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int_LayoutLeft_Rank2.cpp b/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int_LayoutLeft_Rank2.cpp
index b3e7a6b850..1be8bd0281 100644
--- a/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int_LayoutLeft_Rank2.cpp
+++ b/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int_LayoutLeft_Rank2.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,18 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int**,LayoutLeft,LayoutRight, Cuda,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int**,LayoutLeft,LayoutLeft,  Cuda,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int**,LayoutLeft,LayoutStride,Cuda,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int**,LayoutLeft,Cuda,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int**, LayoutLeft, LayoutRight, Cuda, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int**, LayoutLeft, LayoutLeft, Cuda, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int**, LayoutLeft, LayoutStride, Cuda, int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int**, LayoutLeft, Cuda, int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int_LayoutLeft_Rank3.cpp b/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int_LayoutLeft_Rank3.cpp
index cc07a826fd..0c61d411bb 100644
--- a/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int_LayoutLeft_Rank3.cpp
+++ b/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int_LayoutLeft_Rank3.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,18 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int***,LayoutLeft,LayoutRight, Cuda,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int***,LayoutLeft,LayoutLeft,  Cuda,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int***,LayoutLeft,LayoutStride,Cuda,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int***,LayoutLeft,Cuda,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int***, LayoutLeft, LayoutRight, Cuda, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int***, LayoutLeft, LayoutLeft, Cuda, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int***, LayoutLeft, LayoutStride, Cuda, int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int***, LayoutLeft, Cuda, int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int_LayoutLeft_Rank4.cpp b/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int_LayoutLeft_Rank4.cpp
index 9edad89e4a..c46bc82680 100644
--- a/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int_LayoutLeft_Rank4.cpp
+++ b/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int_LayoutLeft_Rank4.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,18 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int****,LayoutLeft,LayoutRight, Cuda,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int****,LayoutLeft,LayoutLeft,  Cuda,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int****,LayoutLeft,LayoutStride,Cuda,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int****,LayoutLeft,Cuda,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int****, LayoutLeft, LayoutRight, Cuda, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int****, LayoutLeft, LayoutLeft, Cuda, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int****, LayoutLeft, LayoutStride, Cuda, int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int****, LayoutLeft, Cuda, int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int_LayoutLeft_Rank5.cpp b/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int_LayoutLeft_Rank5.cpp
index b0b934b6b4..3f430147ad 100644
--- a/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int_LayoutLeft_Rank5.cpp
+++ b/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int_LayoutLeft_Rank5.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,18 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*****,LayoutLeft,LayoutRight, Cuda,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*****,LayoutLeft,LayoutLeft,  Cuda,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*****,LayoutLeft,LayoutStride,Cuda,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int*****,LayoutLeft,Cuda,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*****, LayoutLeft, LayoutRight, Cuda, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*****, LayoutLeft, LayoutLeft, Cuda, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*****, LayoutLeft, LayoutStride, Cuda, int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int*****, LayoutLeft, Cuda, int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int_LayoutLeft_Rank8.cpp b/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int_LayoutLeft_Rank8.cpp
index 2c018b8cf0..482bf3a6c1 100644
--- a/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int_LayoutLeft_Rank8.cpp
+++ b/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int_LayoutLeft_Rank8.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,18 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int********,LayoutLeft,LayoutRight, Cuda,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int********,LayoutLeft,LayoutLeft,  Cuda,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int********,LayoutLeft,LayoutStride,Cuda,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int********,LayoutLeft,Cuda,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int********, LayoutLeft, LayoutRight, Cuda, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int********, LayoutLeft, LayoutLeft, Cuda, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int********, LayoutLeft, LayoutStride, Cuda, int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int********, LayoutLeft, Cuda, int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int_LayoutRight_Rank1.cpp b/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int_LayoutRight_Rank1.cpp
index 88d0692285..eec32bbc80 100644
--- a/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int_LayoutRight_Rank1.cpp
+++ b/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int_LayoutRight_Rank1.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,18 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*,LayoutRight,LayoutRight, Cuda,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*,LayoutRight,LayoutLeft,  Cuda,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*,LayoutRight,LayoutStride,Cuda,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int*,LayoutRight,Cuda,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*, LayoutRight, LayoutRight, Cuda, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*, LayoutRight, LayoutLeft, Cuda, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*, LayoutRight, LayoutStride, Cuda, int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int*, LayoutRight, Cuda, int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int_LayoutRight_Rank2.cpp b/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int_LayoutRight_Rank2.cpp
index 3b5f73c9e3..9d95e5f9d5 100644
--- a/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int_LayoutRight_Rank2.cpp
+++ b/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int_LayoutRight_Rank2.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,18 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int**,LayoutRight,LayoutRight, Cuda,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int**,LayoutRight,LayoutLeft,  Cuda,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int**,LayoutRight,LayoutStride,Cuda,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int**,LayoutRight,Cuda,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int**, LayoutRight, LayoutRight, Cuda, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int**, LayoutRight, LayoutLeft, Cuda, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int**, LayoutRight, LayoutStride, Cuda, int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int**, LayoutRight, Cuda, int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int_LayoutRight_Rank3.cpp b/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int_LayoutRight_Rank3.cpp
index 85dc163c18..ca86e10ddd 100644
--- a/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int_LayoutRight_Rank3.cpp
+++ b/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int_LayoutRight_Rank3.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,18 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int***,LayoutRight,LayoutRight, Cuda,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int***,LayoutRight,LayoutLeft,  Cuda,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int***,LayoutRight,LayoutStride,Cuda,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int***,LayoutRight,Cuda,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int***, LayoutRight, LayoutRight, Cuda, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int***, LayoutRight, LayoutLeft, Cuda, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int***, LayoutRight, LayoutStride, Cuda, int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int***, LayoutRight, Cuda, int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int_LayoutRight_Rank4.cpp b/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int_LayoutRight_Rank4.cpp
index 0586654b24..3047e380da 100644
--- a/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int_LayoutRight_Rank4.cpp
+++ b/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int_LayoutRight_Rank4.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,18 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int****,LayoutRight,LayoutRight, Cuda,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int****,LayoutRight,LayoutLeft,  Cuda,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int****,LayoutRight,LayoutStride,Cuda,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int****,LayoutRight,Cuda,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int****, LayoutRight, LayoutRight, Cuda, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int****, LayoutRight, LayoutLeft, Cuda, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int****, LayoutRight, LayoutStride, Cuda, int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int****, LayoutRight, Cuda, int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int_LayoutRight_Rank5.cpp b/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int_LayoutRight_Rank5.cpp
index 3a22cc8a9e..3096ab6d3a 100644
--- a/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int_LayoutRight_Rank5.cpp
+++ b/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int_LayoutRight_Rank5.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,18 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*****,LayoutRight,LayoutRight, Cuda,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*****,LayoutRight,LayoutLeft,  Cuda,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*****,LayoutRight,LayoutStride,Cuda,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int*****,LayoutRight,Cuda,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*****, LayoutRight, LayoutRight, Cuda, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*****, LayoutRight, LayoutLeft, Cuda, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*****, LayoutRight, LayoutStride, Cuda, int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int*****, LayoutRight, Cuda, int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int_LayoutRight_Rank8.cpp b/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int_LayoutRight_Rank8.cpp
index 1b7cb634a4..88eacdfe85 100644
--- a/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int_LayoutRight_Rank8.cpp
+++ b/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int_LayoutRight_Rank8.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,18 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int********,LayoutRight,LayoutRight, Cuda,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int********,LayoutRight,LayoutLeft,  Cuda,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int********,LayoutRight,LayoutStride,Cuda,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int********,LayoutRight,Cuda,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int********, LayoutRight, LayoutRight, Cuda, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int********, LayoutRight, LayoutLeft, Cuda, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int********, LayoutRight, LayoutStride, Cuda, int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int********, LayoutRight, Cuda, int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int_LayoutStride_Rank1.cpp b/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int_LayoutStride_Rank1.cpp
index 465f00e6e3..c800698d36 100644
--- a/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int_LayoutStride_Rank1.cpp
+++ b/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int_LayoutStride_Rank1.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,18 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*,LayoutStride,LayoutRight, Cuda,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*,LayoutStride,LayoutLeft,  Cuda,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*,LayoutStride,LayoutStride,Cuda,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int*,LayoutStride,Cuda,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*, LayoutStride, LayoutRight, Cuda, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*, LayoutStride, LayoutLeft, Cuda, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*, LayoutStride, LayoutStride, Cuda, int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int*, LayoutStride, Cuda, int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int_LayoutStride_Rank2.cpp b/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int_LayoutStride_Rank2.cpp
index ce20c681da..b2e2cdad44 100644
--- a/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int_LayoutStride_Rank2.cpp
+++ b/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int_LayoutStride_Rank2.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,18 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int**,LayoutStride,LayoutRight, Cuda,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int**,LayoutStride,LayoutLeft,  Cuda,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int**,LayoutStride,LayoutStride,Cuda,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int**,LayoutStride,Cuda,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int**, LayoutStride, LayoutRight, Cuda, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int**, LayoutStride, LayoutLeft, Cuda, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int**, LayoutStride, LayoutStride, Cuda, int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int**, LayoutStride, Cuda, int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int_LayoutStride_Rank3.cpp b/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int_LayoutStride_Rank3.cpp
index 4534e7dfd8..0dcabb6626 100644
--- a/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int_LayoutStride_Rank3.cpp
+++ b/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int_LayoutStride_Rank3.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,18 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int***,LayoutStride,LayoutRight, Cuda,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int***,LayoutStride,LayoutLeft,  Cuda,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int***,LayoutStride,LayoutStride,Cuda,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int***,LayoutStride,Cuda,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int***, LayoutStride, LayoutRight, Cuda, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int***, LayoutStride, LayoutLeft, Cuda, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int***, LayoutStride, LayoutStride, Cuda, int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int***, LayoutStride, Cuda, int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int_LayoutStride_Rank4.cpp b/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int_LayoutStride_Rank4.cpp
index 334224a633..fd2f9e8589 100644
--- a/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int_LayoutStride_Rank4.cpp
+++ b/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int_LayoutStride_Rank4.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,18 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int****,LayoutStride,LayoutRight, Cuda,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int****,LayoutStride,LayoutLeft,  Cuda,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int****,LayoutStride,LayoutStride,Cuda,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int****,LayoutStride,Cuda,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int****, LayoutStride, LayoutRight, Cuda, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int****, LayoutStride, LayoutLeft, Cuda, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int****, LayoutStride, LayoutStride, Cuda, int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int****, LayoutStride, Cuda, int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int_LayoutStride_Rank5.cpp b/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int_LayoutStride_Rank5.cpp
index 4c1821f074..c7b4b9ff80 100644
--- a/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int_LayoutStride_Rank5.cpp
+++ b/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int_LayoutStride_Rank5.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,18 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*****,LayoutStride,LayoutRight, Cuda,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*****,LayoutStride,LayoutLeft,  Cuda,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*****,LayoutStride,LayoutStride,Cuda,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int*****,LayoutStride,Cuda,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*****, LayoutStride, LayoutRight, Cuda, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*****, LayoutStride, LayoutLeft, Cuda, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*****, LayoutStride, LayoutStride, Cuda, int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int*****, LayoutStride, Cuda, int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int_LayoutStride_Rank8.cpp b/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int_LayoutStride_Rank8.cpp
index a7e1fa0262..c389a15f72 100644
--- a/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int_LayoutStride_Rank8.cpp
+++ b/lib/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int_LayoutStride_Rank8.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,19 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int********,LayoutStride,LayoutRight, Cuda,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int********,LayoutStride,LayoutLeft,  Cuda,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int********,LayoutStride,LayoutStride,Cuda,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int********,LayoutStride,Cuda,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int********, LayoutStride, LayoutRight, Cuda, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int********, LayoutStride, LayoutLeft, Cuda, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int********, LayoutStride, LayoutStride, Cuda,
+                              int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int********, LayoutStride, Cuda, int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank1.cpp b/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank1.cpp
index 905c97c54e..1a9a9bf4f8 100644
--- a/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank1.cpp
+++ b/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank1.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*,LayoutLeft,LayoutRight, Experimental::HPX,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*,LayoutLeft,LayoutLeft,  Experimental::HPX,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*,LayoutLeft,LayoutStride,Experimental::HPX,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(double*,LayoutLeft,Experimental::HPX,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*, LayoutLeft, LayoutRight,
+                              Experimental::HPX, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*, LayoutLeft, LayoutLeft,
+                              Experimental::HPX, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*, LayoutLeft, LayoutStride,
+                              Experimental::HPX, int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(double*, LayoutLeft, Experimental::HPX, int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank2.cpp b/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank2.cpp
index a7632852ce..0996ffda1a 100644
--- a/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank2.cpp
+++ b/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank2.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double**,LayoutLeft,LayoutRight, Experimental::HPX,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double**,LayoutLeft,LayoutLeft,  Experimental::HPX,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double**,LayoutLeft,LayoutStride,Experimental::HPX,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(double**,LayoutLeft,Experimental::HPX,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double**, LayoutLeft, LayoutRight,
+                              Experimental::HPX, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double**, LayoutLeft, LayoutLeft,
+                              Experimental::HPX, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double**, LayoutLeft, LayoutStride,
+                              Experimental::HPX, int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(double**, LayoutLeft, Experimental::HPX, int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank3.cpp b/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank3.cpp
index cff22240cf..08f2651c45 100644
--- a/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank3.cpp
+++ b/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank3.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double***,LayoutLeft,LayoutRight, Experimental::HPX,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double***,LayoutLeft,LayoutLeft,  Experimental::HPX,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double***,LayoutLeft,LayoutStride,Experimental::HPX,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(double***,LayoutLeft,Experimental::HPX,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double***, LayoutLeft, LayoutRight,
+                              Experimental::HPX, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double***, LayoutLeft, LayoutLeft,
+                              Experimental::HPX, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double***, LayoutLeft, LayoutStride,
+                              Experimental::HPX, int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(double***, LayoutLeft, Experimental::HPX, int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank4.cpp b/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank4.cpp
index 2b667c674f..8f5ca31850 100644
--- a/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank4.cpp
+++ b/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank4.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,22 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double****,LayoutLeft,LayoutRight, Experimental::HPX,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double****,LayoutLeft,LayoutLeft,  Experimental::HPX,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double****,LayoutLeft,LayoutStride,Experimental::HPX,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(double****,LayoutLeft,Experimental::HPX,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double****, LayoutLeft, LayoutRight,
+                              Experimental::HPX, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double****, LayoutLeft, LayoutLeft,
+                              Experimental::HPX, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double****, LayoutLeft, LayoutStride,
+                              Experimental::HPX, int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(double****, LayoutLeft, Experimental::HPX,
+                              int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank5.cpp b/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank5.cpp
index cd1a445d81..7e50c2d58b 100644
--- a/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank5.cpp
+++ b/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank5.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,22 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*****,LayoutLeft,LayoutRight, Experimental::HPX,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*****,LayoutLeft,LayoutLeft,  Experimental::HPX,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*****,LayoutLeft,LayoutStride,Experimental::HPX,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(double*****,LayoutLeft,Experimental::HPX,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*****, LayoutLeft, LayoutRight,
+                              Experimental::HPX, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*****, LayoutLeft, LayoutLeft,
+                              Experimental::HPX, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*****, LayoutLeft, LayoutStride,
+                              Experimental::HPX, int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(double*****, LayoutLeft, Experimental::HPX,
+                              int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank8.cpp b/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank8.cpp
index 3d805d5134..5caa76cd55 100644
--- a/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank8.cpp
+++ b/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank8.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,22 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double********,LayoutLeft,LayoutRight, Experimental::HPX,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double********,LayoutLeft,LayoutLeft,  Experimental::HPX,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double********,LayoutLeft,LayoutStride,Experimental::HPX,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(double********,LayoutLeft,Experimental::HPX,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double********, LayoutLeft, LayoutRight,
+                              Experimental::HPX, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double********, LayoutLeft, LayoutLeft,
+                              Experimental::HPX, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double********, LayoutLeft, LayoutStride,
+                              Experimental::HPX, int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(double********, LayoutLeft, Experimental::HPX,
+                              int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_double_LayoutRight_Rank1.cpp b/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_double_LayoutRight_Rank1.cpp
index 3883d581b6..5427e9f274 100644
--- a/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_double_LayoutRight_Rank1.cpp
+++ b/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_double_LayoutRight_Rank1.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*,LayoutRight,LayoutRight, Experimental::HPX,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*,LayoutRight,LayoutLeft,  Experimental::HPX,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*,LayoutRight,LayoutStride,Experimental::HPX,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(double*,LayoutRight,Experimental::HPX,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*, LayoutRight, LayoutRight,
+                              Experimental::HPX, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*, LayoutRight, LayoutLeft,
+                              Experimental::HPX, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*, LayoutRight, LayoutStride,
+                              Experimental::HPX, int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(double*, LayoutRight, Experimental::HPX, int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_double_LayoutRight_Rank2.cpp b/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_double_LayoutRight_Rank2.cpp
index 55f3e200a5..4748550943 100644
--- a/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_double_LayoutRight_Rank2.cpp
+++ b/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_double_LayoutRight_Rank2.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double**,LayoutRight,LayoutRight, Experimental::HPX,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double**,LayoutRight,LayoutLeft,  Experimental::HPX,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double**,LayoutRight,LayoutStride,Experimental::HPX,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(double**,LayoutRight,Experimental::HPX,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double**, LayoutRight, LayoutRight,
+                              Experimental::HPX, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double**, LayoutRight, LayoutLeft,
+                              Experimental::HPX, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double**, LayoutRight, LayoutStride,
+                              Experimental::HPX, int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(double**, LayoutRight, Experimental::HPX, int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_double_LayoutRight_Rank3.cpp b/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_double_LayoutRight_Rank3.cpp
index ed6d57260b..db65f31221 100644
--- a/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_double_LayoutRight_Rank3.cpp
+++ b/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_double_LayoutRight_Rank3.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,22 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double***,LayoutRight,LayoutRight, Experimental::HPX,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double***,LayoutRight,LayoutLeft,  Experimental::HPX,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double***,LayoutRight,LayoutStride,Experimental::HPX,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(double***,LayoutRight,Experimental::HPX,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double***, LayoutRight, LayoutRight,
+                              Experimental::HPX, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double***, LayoutRight, LayoutLeft,
+                              Experimental::HPX, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double***, LayoutRight, LayoutStride,
+                              Experimental::HPX, int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(double***, LayoutRight, Experimental::HPX,
+                              int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_double_LayoutRight_Rank4.cpp b/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_double_LayoutRight_Rank4.cpp
index ed1954e683..da598b4e55 100644
--- a/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_double_LayoutRight_Rank4.cpp
+++ b/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_double_LayoutRight_Rank4.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,22 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double****,LayoutRight,LayoutRight, Experimental::HPX,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double****,LayoutRight,LayoutLeft,  Experimental::HPX,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double****,LayoutRight,LayoutStride,Experimental::HPX,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(double****,LayoutRight,Experimental::HPX,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double****, LayoutRight, LayoutRight,
+                              Experimental::HPX, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double****, LayoutRight, LayoutLeft,
+                              Experimental::HPX, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double****, LayoutRight, LayoutStride,
+                              Experimental::HPX, int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(double****, LayoutRight, Experimental::HPX,
+                              int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_double_LayoutRight_Rank5.cpp b/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_double_LayoutRight_Rank5.cpp
index fb8dadb8d0..8a60373f4a 100644
--- a/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_double_LayoutRight_Rank5.cpp
+++ b/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_double_LayoutRight_Rank5.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,22 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*****,LayoutRight,LayoutRight, Experimental::HPX,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*****,LayoutRight,LayoutLeft,  Experimental::HPX,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*****,LayoutRight,LayoutStride,Experimental::HPX,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(double*****,LayoutRight,Experimental::HPX,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*****, LayoutRight, LayoutRight,
+                              Experimental::HPX, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*****, LayoutRight, LayoutLeft,
+                              Experimental::HPX, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*****, LayoutRight, LayoutStride,
+                              Experimental::HPX, int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(double*****, LayoutRight, Experimental::HPX,
+                              int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_double_LayoutRight_Rank8.cpp b/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_double_LayoutRight_Rank8.cpp
index 16a0ed3e9c..a9531ab8e3 100644
--- a/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_double_LayoutRight_Rank8.cpp
+++ b/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_double_LayoutRight_Rank8.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,22 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double********,LayoutRight,LayoutRight, Experimental::HPX,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double********,LayoutRight,LayoutLeft,  Experimental::HPX,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double********,LayoutRight,LayoutStride,Experimental::HPX,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(double********,LayoutRight,Experimental::HPX,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double********, LayoutRight, LayoutRight,
+                              Experimental::HPX, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double********, LayoutRight, LayoutLeft,
+                              Experimental::HPX, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double********, LayoutRight, LayoutStride,
+                              Experimental::HPX, int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(double********, LayoutRight, Experimental::HPX,
+                              int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_double_LayoutStride_Rank1.cpp b/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_double_LayoutStride_Rank1.cpp
index f846f94a96..66c0506137 100644
--- a/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_double_LayoutStride_Rank1.cpp
+++ b/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_double_LayoutStride_Rank1.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*,LayoutStride,LayoutRight, Experimental::HPX,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*,LayoutStride,LayoutLeft,  Experimental::HPX,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*,LayoutStride,LayoutStride,Experimental::HPX,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(double*,LayoutStride,Experimental::HPX,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*, LayoutStride, LayoutRight,
+                              Experimental::HPX, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*, LayoutStride, LayoutLeft,
+                              Experimental::HPX, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*, LayoutStride, LayoutStride,
+                              Experimental::HPX, int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(double*, LayoutStride, Experimental::HPX, int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_double_LayoutStride_Rank2.cpp b/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_double_LayoutStride_Rank2.cpp
index f4b51a1d78..885b2cc04d 100644
--- a/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_double_LayoutStride_Rank2.cpp
+++ b/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_double_LayoutStride_Rank2.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,22 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double**,LayoutStride,LayoutRight, Experimental::HPX,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double**,LayoutStride,LayoutLeft,  Experimental::HPX,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double**,LayoutStride,LayoutStride,Experimental::HPX,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(double**,LayoutStride,Experimental::HPX,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double**, LayoutStride, LayoutRight,
+                              Experimental::HPX, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double**, LayoutStride, LayoutLeft,
+                              Experimental::HPX, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double**, LayoutStride, LayoutStride,
+                              Experimental::HPX, int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(double**, LayoutStride, Experimental::HPX,
+                              int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_double_LayoutStride_Rank3.cpp b/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_double_LayoutStride_Rank3.cpp
index 622b3119bd..90b19bb66e 100644
--- a/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_double_LayoutStride_Rank3.cpp
+++ b/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_double_LayoutStride_Rank3.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,22 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double***,LayoutStride,LayoutRight, Experimental::HPX,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double***,LayoutStride,LayoutLeft,  Experimental::HPX,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double***,LayoutStride,LayoutStride,Experimental::HPX,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(double***,LayoutStride,Experimental::HPX,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double***, LayoutStride, LayoutRight,
+                              Experimental::HPX, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double***, LayoutStride, LayoutLeft,
+                              Experimental::HPX, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double***, LayoutStride, LayoutStride,
+                              Experimental::HPX, int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(double***, LayoutStride, Experimental::HPX,
+                              int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_double_LayoutStride_Rank4.cpp b/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_double_LayoutStride_Rank4.cpp
index de871103dd..d62dbf0b43 100644
--- a/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_double_LayoutStride_Rank4.cpp
+++ b/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_double_LayoutStride_Rank4.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,22 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double****,LayoutStride,LayoutRight, Experimental::HPX,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double****,LayoutStride,LayoutLeft,  Experimental::HPX,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double****,LayoutStride,LayoutStride,Experimental::HPX,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(double****,LayoutStride,Experimental::HPX,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double****, LayoutStride, LayoutRight,
+                              Experimental::HPX, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double****, LayoutStride, LayoutLeft,
+                              Experimental::HPX, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double****, LayoutStride, LayoutStride,
+                              Experimental::HPX, int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(double****, LayoutStride, Experimental::HPX,
+                              int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_double_LayoutStride_Rank5.cpp b/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_double_LayoutStride_Rank5.cpp
index 720e075aea..2b614aabfc 100644
--- a/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_double_LayoutStride_Rank5.cpp
+++ b/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_double_LayoutStride_Rank5.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,22 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*****,LayoutStride,LayoutRight, Experimental::HPX,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*****,LayoutStride,LayoutLeft,  Experimental::HPX,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*****,LayoutStride,LayoutStride,Experimental::HPX,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(double*****,LayoutStride,Experimental::HPX,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*****, LayoutStride, LayoutRight,
+                              Experimental::HPX, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*****, LayoutStride, LayoutLeft,
+                              Experimental::HPX, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*****, LayoutStride, LayoutStride,
+                              Experimental::HPX, int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(double*****, LayoutStride, Experimental::HPX,
+                              int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_double_LayoutStride_Rank8.cpp b/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_double_LayoutStride_Rank8.cpp
index 4c57c457c2..7a1db773e9 100644
--- a/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_double_LayoutStride_Rank8.cpp
+++ b/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_double_LayoutStride_Rank8.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,22 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double********,LayoutStride,LayoutRight, Experimental::HPX,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double********,LayoutStride,LayoutLeft,  Experimental::HPX,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double********,LayoutStride,LayoutStride,Experimental::HPX,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(double********,LayoutStride,Experimental::HPX,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double********, LayoutStride, LayoutRight,
+                              Experimental::HPX, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double********, LayoutStride, LayoutLeft,
+                              Experimental::HPX, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double********, LayoutStride, LayoutStride,
+                              Experimental::HPX, int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(double********, LayoutStride, Experimental::HPX,
+                              int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank1.cpp b/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank1.cpp
index 5a37da22c4..d6a697d60e 100644
--- a/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank1.cpp
+++ b/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank1.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*,LayoutLeft,LayoutRight, Experimental::HPX,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*,LayoutLeft,LayoutLeft,  Experimental::HPX,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*,LayoutLeft,LayoutStride,Experimental::HPX,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(float*,LayoutLeft,Experimental::HPX,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*, LayoutLeft, LayoutRight,
+                              Experimental::HPX, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*, LayoutLeft, LayoutLeft, Experimental::HPX,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*, LayoutLeft, LayoutStride,
+                              Experimental::HPX, int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(float*, LayoutLeft, Experimental::HPX, int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank2.cpp b/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank2.cpp
index 93a96ee554..4fe8d07b9f 100644
--- a/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank2.cpp
+++ b/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank2.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float**,LayoutLeft,LayoutRight, Experimental::HPX,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float**,LayoutLeft,LayoutLeft,  Experimental::HPX,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float**,LayoutLeft,LayoutStride,Experimental::HPX,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(float**,LayoutLeft,Experimental::HPX,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float**, LayoutLeft, LayoutRight,
+                              Experimental::HPX, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float**, LayoutLeft, LayoutLeft,
+                              Experimental::HPX, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float**, LayoutLeft, LayoutStride,
+                              Experimental::HPX, int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(float**, LayoutLeft, Experimental::HPX, int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank3.cpp b/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank3.cpp
index dcfcc8a0e3..c0d5b19de5 100644
--- a/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank3.cpp
+++ b/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank3.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float***,LayoutLeft,LayoutRight, Experimental::HPX,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float***,LayoutLeft,LayoutLeft,  Experimental::HPX,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float***,LayoutLeft,LayoutStride,Experimental::HPX,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(float***,LayoutLeft,Experimental::HPX,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float***, LayoutLeft, LayoutRight,
+                              Experimental::HPX, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float***, LayoutLeft, LayoutLeft,
+                              Experimental::HPX, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float***, LayoutLeft, LayoutStride,
+                              Experimental::HPX, int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(float***, LayoutLeft, Experimental::HPX, int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank4.cpp b/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank4.cpp
index 7082701282..0c6fbd75bc 100644
--- a/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank4.cpp
+++ b/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank4.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float****,LayoutLeft,LayoutRight, Experimental::HPX,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float****,LayoutLeft,LayoutLeft,  Experimental::HPX,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float****,LayoutLeft,LayoutStride,Experimental::HPX,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(float****,LayoutLeft,Experimental::HPX,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float****, LayoutLeft, LayoutRight,
+                              Experimental::HPX, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float****, LayoutLeft, LayoutLeft,
+                              Experimental::HPX, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float****, LayoutLeft, LayoutStride,
+                              Experimental::HPX, int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(float****, LayoutLeft, Experimental::HPX, int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank5.cpp b/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank5.cpp
index cbbd7c9ef3..379e7e6b77 100644
--- a/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank5.cpp
+++ b/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank5.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,22 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*****,LayoutLeft,LayoutRight, Experimental::HPX,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*****,LayoutLeft,LayoutLeft,  Experimental::HPX,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*****,LayoutLeft,LayoutStride,Experimental::HPX,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(float*****,LayoutLeft,Experimental::HPX,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*****, LayoutLeft, LayoutRight,
+                              Experimental::HPX, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*****, LayoutLeft, LayoutLeft,
+                              Experimental::HPX, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*****, LayoutLeft, LayoutStride,
+                              Experimental::HPX, int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(float*****, LayoutLeft, Experimental::HPX,
+                              int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank8.cpp b/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank8.cpp
index 22d6fc5387..6c62abcd70 100644
--- a/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank8.cpp
+++ b/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank8.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,22 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float********,LayoutLeft,LayoutRight, Experimental::HPX,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float********,LayoutLeft,LayoutLeft,  Experimental::HPX,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float********,LayoutLeft,LayoutStride,Experimental::HPX,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(float********,LayoutLeft,Experimental::HPX,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float********, LayoutLeft, LayoutRight,
+                              Experimental::HPX, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float********, LayoutLeft, LayoutLeft,
+                              Experimental::HPX, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float********, LayoutLeft, LayoutStride,
+                              Experimental::HPX, int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(float********, LayoutLeft, Experimental::HPX,
+                              int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_float_LayoutRight_Rank1.cpp b/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_float_LayoutRight_Rank1.cpp
index d44e95e67e..e5b3c38234 100644
--- a/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_float_LayoutRight_Rank1.cpp
+++ b/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_float_LayoutRight_Rank1.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*,LayoutRight,LayoutRight, Experimental::HPX,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*,LayoutRight,LayoutLeft,  Experimental::HPX,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*,LayoutRight,LayoutStride,Experimental::HPX,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(float*,LayoutRight,Experimental::HPX,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*, LayoutRight, LayoutRight,
+                              Experimental::HPX, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*, LayoutRight, LayoutLeft,
+                              Experimental::HPX, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*, LayoutRight, LayoutStride,
+                              Experimental::HPX, int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(float*, LayoutRight, Experimental::HPX, int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_float_LayoutRight_Rank2.cpp b/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_float_LayoutRight_Rank2.cpp
index ae79919c42..f90485b60d 100644
--- a/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_float_LayoutRight_Rank2.cpp
+++ b/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_float_LayoutRight_Rank2.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float**,LayoutRight,LayoutRight, Experimental::HPX,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float**,LayoutRight,LayoutLeft,  Experimental::HPX,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float**,LayoutRight,LayoutStride,Experimental::HPX,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(float**,LayoutRight,Experimental::HPX,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float**, LayoutRight, LayoutRight,
+                              Experimental::HPX, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float**, LayoutRight, LayoutLeft,
+                              Experimental::HPX, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float**, LayoutRight, LayoutStride,
+                              Experimental::HPX, int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(float**, LayoutRight, Experimental::HPX, int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_float_LayoutRight_Rank3.cpp b/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_float_LayoutRight_Rank3.cpp
index 0c671ad593..7b4ebf21c8 100644
--- a/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_float_LayoutRight_Rank3.cpp
+++ b/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_float_LayoutRight_Rank3.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float***,LayoutRight,LayoutRight, Experimental::HPX,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float***,LayoutRight,LayoutLeft,  Experimental::HPX,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float***,LayoutRight,LayoutStride,Experimental::HPX,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(float***,LayoutRight,Experimental::HPX,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float***, LayoutRight, LayoutRight,
+                              Experimental::HPX, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float***, LayoutRight, LayoutLeft,
+                              Experimental::HPX, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float***, LayoutRight, LayoutStride,
+                              Experimental::HPX, int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(float***, LayoutRight, Experimental::HPX, int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_float_LayoutRight_Rank4.cpp b/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_float_LayoutRight_Rank4.cpp
index 24dd1c8354..35de800a9b 100644
--- a/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_float_LayoutRight_Rank4.cpp
+++ b/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_float_LayoutRight_Rank4.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,22 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float****,LayoutRight,LayoutRight, Experimental::HPX,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float****,LayoutRight,LayoutLeft,  Experimental::HPX,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float****,LayoutRight,LayoutStride,Experimental::HPX,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(float****,LayoutRight,Experimental::HPX,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float****, LayoutRight, LayoutRight,
+                              Experimental::HPX, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float****, LayoutRight, LayoutLeft,
+                              Experimental::HPX, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float****, LayoutRight, LayoutStride,
+                              Experimental::HPX, int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(float****, LayoutRight, Experimental::HPX,
+                              int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_float_LayoutRight_Rank5.cpp b/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_float_LayoutRight_Rank5.cpp
index 6e2de8a02e..7aa6a05d34 100644
--- a/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_float_LayoutRight_Rank5.cpp
+++ b/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_float_LayoutRight_Rank5.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,22 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*****,LayoutRight,LayoutRight, Experimental::HPX,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*****,LayoutRight,LayoutLeft,  Experimental::HPX,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*****,LayoutRight,LayoutStride,Experimental::HPX,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(float*****,LayoutRight,Experimental::HPX,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*****, LayoutRight, LayoutRight,
+                              Experimental::HPX, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*****, LayoutRight, LayoutLeft,
+                              Experimental::HPX, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*****, LayoutRight, LayoutStride,
+                              Experimental::HPX, int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(float*****, LayoutRight, Experimental::HPX,
+                              int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_float_LayoutRight_Rank8.cpp b/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_float_LayoutRight_Rank8.cpp
index 38840ac9e6..f1b95bbc0e 100644
--- a/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_float_LayoutRight_Rank8.cpp
+++ b/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_float_LayoutRight_Rank8.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,22 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float********,LayoutRight,LayoutRight, Experimental::HPX,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float********,LayoutRight,LayoutLeft,  Experimental::HPX,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float********,LayoutRight,LayoutStride,Experimental::HPX,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(float********,LayoutRight,Experimental::HPX,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float********, LayoutRight, LayoutRight,
+                              Experimental::HPX, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float********, LayoutRight, LayoutLeft,
+                              Experimental::HPX, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float********, LayoutRight, LayoutStride,
+                              Experimental::HPX, int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(float********, LayoutRight, Experimental::HPX,
+                              int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_float_LayoutStride_Rank1.cpp b/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_float_LayoutStride_Rank1.cpp
index bcb105628b..884570ac64 100644
--- a/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_float_LayoutStride_Rank1.cpp
+++ b/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_float_LayoutStride_Rank1.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*,LayoutStride,LayoutRight, Experimental::HPX,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*,LayoutStride,LayoutLeft,  Experimental::HPX,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*,LayoutStride,LayoutStride,Experimental::HPX,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(float*,LayoutStride,Experimental::HPX,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*, LayoutStride, LayoutRight,
+                              Experimental::HPX, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*, LayoutStride, LayoutLeft,
+                              Experimental::HPX, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*, LayoutStride, LayoutStride,
+                              Experimental::HPX, int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(float*, LayoutStride, Experimental::HPX, int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_float_LayoutStride_Rank2.cpp b/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_float_LayoutStride_Rank2.cpp
index 8730f92f20..ae73c5dd3c 100644
--- a/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_float_LayoutStride_Rank2.cpp
+++ b/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_float_LayoutStride_Rank2.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float**,LayoutStride,LayoutRight, Experimental::HPX,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float**,LayoutStride,LayoutLeft,  Experimental::HPX,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float**,LayoutStride,LayoutStride,Experimental::HPX,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(float**,LayoutStride,Experimental::HPX,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float**, LayoutStride, LayoutRight,
+                              Experimental::HPX, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float**, LayoutStride, LayoutLeft,
+                              Experimental::HPX, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float**, LayoutStride, LayoutStride,
+                              Experimental::HPX, int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(float**, LayoutStride, Experimental::HPX, int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_float_LayoutStride_Rank3.cpp b/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_float_LayoutStride_Rank3.cpp
index 785996558b..f529807167 100644
--- a/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_float_LayoutStride_Rank3.cpp
+++ b/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_float_LayoutStride_Rank3.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,22 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float***,LayoutStride,LayoutRight, Experimental::HPX,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float***,LayoutStride,LayoutLeft,  Experimental::HPX,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float***,LayoutStride,LayoutStride,Experimental::HPX,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(float***,LayoutStride,Experimental::HPX,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float***, LayoutStride, LayoutRight,
+                              Experimental::HPX, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float***, LayoutStride, LayoutLeft,
+                              Experimental::HPX, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float***, LayoutStride, LayoutStride,
+                              Experimental::HPX, int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(float***, LayoutStride, Experimental::HPX,
+                              int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_float_LayoutStride_Rank4.cpp b/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_float_LayoutStride_Rank4.cpp
index 3ae193ca65..b3ab97ad7f 100644
--- a/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_float_LayoutStride_Rank4.cpp
+++ b/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_float_LayoutStride_Rank4.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,22 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float****,LayoutStride,LayoutRight, Experimental::HPX,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float****,LayoutStride,LayoutLeft,  Experimental::HPX,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float****,LayoutStride,LayoutStride,Experimental::HPX,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(float****,LayoutStride,Experimental::HPX,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float****, LayoutStride, LayoutRight,
+                              Experimental::HPX, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float****, LayoutStride, LayoutLeft,
+                              Experimental::HPX, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float****, LayoutStride, LayoutStride,
+                              Experimental::HPX, int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(float****, LayoutStride, Experimental::HPX,
+                              int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_float_LayoutStride_Rank5.cpp b/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_float_LayoutStride_Rank5.cpp
index 81f91019d6..e5e934e8bf 100644
--- a/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_float_LayoutStride_Rank5.cpp
+++ b/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_float_LayoutStride_Rank5.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,22 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*****,LayoutStride,LayoutRight, Experimental::HPX,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*****,LayoutStride,LayoutLeft,  Experimental::HPX,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*****,LayoutStride,LayoutStride,Experimental::HPX,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(float*****,LayoutStride,Experimental::HPX,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*****, LayoutStride, LayoutRight,
+                              Experimental::HPX, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*****, LayoutStride, LayoutLeft,
+                              Experimental::HPX, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*****, LayoutStride, LayoutStride,
+                              Experimental::HPX, int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(float*****, LayoutStride, Experimental::HPX,
+                              int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_float_LayoutStride_Rank8.cpp b/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_float_LayoutStride_Rank8.cpp
index d34a4870b9..aa1f24ce43 100644
--- a/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_float_LayoutStride_Rank8.cpp
+++ b/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_float_LayoutStride_Rank8.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,22 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float********,LayoutStride,LayoutRight, Experimental::HPX,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float********,LayoutStride,LayoutLeft,  Experimental::HPX,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float********,LayoutStride,LayoutStride,Experimental::HPX,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(float********,LayoutStride,Experimental::HPX,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float********, LayoutStride, LayoutRight,
+                              Experimental::HPX, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float********, LayoutStride, LayoutLeft,
+                              Experimental::HPX, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float********, LayoutStride, LayoutStride,
+                              Experimental::HPX, int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(float********, LayoutStride, Experimental::HPX,
+                              int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank1.cpp b/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank1.cpp
index 0da5ed1770..891aaaa577 100644
--- a/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank1.cpp
+++ b/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank1.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*,LayoutLeft,LayoutRight, Experimental::HPX,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*,LayoutLeft,LayoutLeft,  Experimental::HPX,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*,LayoutLeft,LayoutStride,Experimental::HPX,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t*,LayoutLeft,Experimental::HPX,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*, LayoutLeft, LayoutRight,
+                              Experimental::HPX, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*, LayoutLeft, LayoutLeft,
+                              Experimental::HPX, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*, LayoutLeft, LayoutStride,
+                              Experimental::HPX, int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t*, LayoutLeft, Experimental::HPX, int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank2.cpp b/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank2.cpp
index 444dad079b..d5fc488231 100644
--- a/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank2.cpp
+++ b/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank2.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t**,LayoutLeft,LayoutRight, Experimental::HPX,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t**,LayoutLeft,LayoutLeft,  Experimental::HPX,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t**,LayoutLeft,LayoutStride,Experimental::HPX,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t**,LayoutLeft,Experimental::HPX,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t**, LayoutLeft, LayoutRight,
+                              Experimental::HPX, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t**, LayoutLeft, LayoutLeft,
+                              Experimental::HPX, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t**, LayoutLeft, LayoutStride,
+                              Experimental::HPX, int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t**, LayoutLeft, Experimental::HPX, int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank3.cpp b/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank3.cpp
index 3f36a1d714..baa863a40f 100644
--- a/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank3.cpp
+++ b/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank3.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,22 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t***,LayoutLeft,LayoutRight, Experimental::HPX,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t***,LayoutLeft,LayoutLeft,  Experimental::HPX,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t***,LayoutLeft,LayoutStride,Experimental::HPX,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t***,LayoutLeft,Experimental::HPX,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t***, LayoutLeft, LayoutRight,
+                              Experimental::HPX, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t***, LayoutLeft, LayoutLeft,
+                              Experimental::HPX, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t***, LayoutLeft, LayoutStride,
+                              Experimental::HPX, int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t***, LayoutLeft, Experimental::HPX,
+                              int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank4.cpp b/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank4.cpp
index 51c964b92d..b8936f1bcb 100644
--- a/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank4.cpp
+++ b/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank4.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,22 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t****,LayoutLeft,LayoutRight, Experimental::HPX,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t****,LayoutLeft,LayoutLeft,  Experimental::HPX,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t****,LayoutLeft,LayoutStride,Experimental::HPX,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t****,LayoutLeft,Experimental::HPX,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t****, LayoutLeft, LayoutRight,
+                              Experimental::HPX, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t****, LayoutLeft, LayoutLeft,
+                              Experimental::HPX, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t****, LayoutLeft, LayoutStride,
+                              Experimental::HPX, int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t****, LayoutLeft, Experimental::HPX,
+                              int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank5.cpp b/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank5.cpp
index 1a26522ff5..b5c3138759 100644
--- a/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank5.cpp
+++ b/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank5.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,22 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*****,LayoutLeft,LayoutRight, Experimental::HPX,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*****,LayoutLeft,LayoutLeft,  Experimental::HPX,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*****,LayoutLeft,LayoutStride,Experimental::HPX,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t*****,LayoutLeft,Experimental::HPX,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*****, LayoutLeft, LayoutRight,
+                              Experimental::HPX, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*****, LayoutLeft, LayoutLeft,
+                              Experimental::HPX, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*****, LayoutLeft, LayoutStride,
+                              Experimental::HPX, int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t*****, LayoutLeft, Experimental::HPX,
+                              int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank8.cpp b/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank8.cpp
index 9bd9af3fe3..0c12c5b477 100644
--- a/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank8.cpp
+++ b/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank8.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,22 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t********,LayoutLeft,LayoutRight, Experimental::HPX,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t********,LayoutLeft,LayoutLeft,  Experimental::HPX,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t********,LayoutLeft,LayoutStride,Experimental::HPX,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t********,LayoutLeft,Experimental::HPX,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t********, LayoutLeft, LayoutRight,
+                              Experimental::HPX, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t********, LayoutLeft, LayoutLeft,
+                              Experimental::HPX, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t********, LayoutLeft, LayoutStride,
+                              Experimental::HPX, int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t********, LayoutLeft, Experimental::HPX,
+                              int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank1.cpp b/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank1.cpp
index dd5a325535..8934c4a6e4 100644
--- a/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank1.cpp
+++ b/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank1.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*,LayoutRight,LayoutRight, Experimental::HPX,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*,LayoutRight,LayoutLeft,  Experimental::HPX,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*,LayoutRight,LayoutStride,Experimental::HPX,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t*,LayoutRight,Experimental::HPX,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*, LayoutRight, LayoutRight,
+                              Experimental::HPX, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*, LayoutRight, LayoutLeft,
+                              Experimental::HPX, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*, LayoutRight, LayoutStride,
+                              Experimental::HPX, int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t*, LayoutRight, Experimental::HPX, int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank2.cpp b/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank2.cpp
index 30a44c0a80..9c30460367 100644
--- a/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank2.cpp
+++ b/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank2.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,22 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t**,LayoutRight,LayoutRight, Experimental::HPX,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t**,LayoutRight,LayoutLeft,  Experimental::HPX,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t**,LayoutRight,LayoutStride,Experimental::HPX,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t**,LayoutRight,Experimental::HPX,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t**, LayoutRight, LayoutRight,
+                              Experimental::HPX, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t**, LayoutRight, LayoutLeft,
+                              Experimental::HPX, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t**, LayoutRight, LayoutStride,
+                              Experimental::HPX, int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t**, LayoutRight, Experimental::HPX,
+                              int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank3.cpp b/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank3.cpp
index 0b73280c6e..ae2b1e609f 100644
--- a/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank3.cpp
+++ b/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank3.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,22 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t***,LayoutRight,LayoutRight, Experimental::HPX,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t***,LayoutRight,LayoutLeft,  Experimental::HPX,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t***,LayoutRight,LayoutStride,Experimental::HPX,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t***,LayoutRight,Experimental::HPX,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t***, LayoutRight, LayoutRight,
+                              Experimental::HPX, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t***, LayoutRight, LayoutLeft,
+                              Experimental::HPX, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t***, LayoutRight, LayoutStride,
+                              Experimental::HPX, int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t***, LayoutRight, Experimental::HPX,
+                              int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank4.cpp b/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank4.cpp
index 3997d8ca58..6f721ca789 100644
--- a/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank4.cpp
+++ b/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank4.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,22 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t****,LayoutRight,LayoutRight, Experimental::HPX,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t****,LayoutRight,LayoutLeft,  Experimental::HPX,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t****,LayoutRight,LayoutStride,Experimental::HPX,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t****,LayoutRight,Experimental::HPX,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t****, LayoutRight, LayoutRight,
+                              Experimental::HPX, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t****, LayoutRight, LayoutLeft,
+                              Experimental::HPX, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t****, LayoutRight, LayoutStride,
+                              Experimental::HPX, int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t****, LayoutRight, Experimental::HPX,
+                              int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank5.cpp b/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank5.cpp
index 6cbaa59223..4cca974fb6 100644
--- a/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank5.cpp
+++ b/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank5.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,22 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*****,LayoutRight,LayoutRight, Experimental::HPX,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*****,LayoutRight,LayoutLeft,  Experimental::HPX,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*****,LayoutRight,LayoutStride,Experimental::HPX,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t*****,LayoutRight,Experimental::HPX,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*****, LayoutRight, LayoutRight,
+                              Experimental::HPX, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*****, LayoutRight, LayoutLeft,
+                              Experimental::HPX, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*****, LayoutRight, LayoutStride,
+                              Experimental::HPX, int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t*****, LayoutRight, Experimental::HPX,
+                              int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank8.cpp b/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank8.cpp
index 351001c8d1..747250c590 100644
--- a/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank8.cpp
+++ b/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank8.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,22 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t********,LayoutRight,LayoutRight, Experimental::HPX,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t********,LayoutRight,LayoutLeft,  Experimental::HPX,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t********,LayoutRight,LayoutStride,Experimental::HPX,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t********,LayoutRight,Experimental::HPX,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t********, LayoutRight, LayoutRight,
+                              Experimental::HPX, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t********, LayoutRight, LayoutLeft,
+                              Experimental::HPX, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t********, LayoutRight, LayoutStride,
+                              Experimental::HPX, int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t********, LayoutRight, Experimental::HPX,
+                              int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank1.cpp b/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank1.cpp
index d37e34af30..2bcc9dcaa2 100644
--- a/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank1.cpp
+++ b/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank1.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,22 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*,LayoutStride,LayoutRight, Experimental::HPX,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*,LayoutStride,LayoutLeft,  Experimental::HPX,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*,LayoutStride,LayoutStride,Experimental::HPX,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t*,LayoutStride,Experimental::HPX,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*, LayoutStride, LayoutRight,
+                              Experimental::HPX, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*, LayoutStride, LayoutLeft,
+                              Experimental::HPX, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*, LayoutStride, LayoutStride,
+                              Experimental::HPX, int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t*, LayoutStride, Experimental::HPX,
+                              int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank2.cpp b/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank2.cpp
index 7609d9478f..cf424725b3 100644
--- a/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank2.cpp
+++ b/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank2.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,22 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t**,LayoutStride,LayoutRight, Experimental::HPX,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t**,LayoutStride,LayoutLeft,  Experimental::HPX,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t**,LayoutStride,LayoutStride,Experimental::HPX,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t**,LayoutStride,Experimental::HPX,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t**, LayoutStride, LayoutRight,
+                              Experimental::HPX, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t**, LayoutStride, LayoutLeft,
+                              Experimental::HPX, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t**, LayoutStride, LayoutStride,
+                              Experimental::HPX, int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t**, LayoutStride, Experimental::HPX,
+                              int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank3.cpp b/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank3.cpp
index 30f0c1d882..7c5163c537 100644
--- a/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank3.cpp
+++ b/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank3.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,22 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t***,LayoutStride,LayoutRight, Experimental::HPX,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t***,LayoutStride,LayoutLeft,  Experimental::HPX,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t***,LayoutStride,LayoutStride,Experimental::HPX,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t***,LayoutStride,Experimental::HPX,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t***, LayoutStride, LayoutRight,
+                              Experimental::HPX, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t***, LayoutStride, LayoutLeft,
+                              Experimental::HPX, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t***, LayoutStride, LayoutStride,
+                              Experimental::HPX, int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t***, LayoutStride, Experimental::HPX,
+                              int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank4.cpp b/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank4.cpp
index 4c4109e298..275703c221 100644
--- a/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank4.cpp
+++ b/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank4.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,22 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t****,LayoutStride,LayoutRight, Experimental::HPX,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t****,LayoutStride,LayoutLeft,  Experimental::HPX,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t****,LayoutStride,LayoutStride,Experimental::HPX,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t****,LayoutStride,Experimental::HPX,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t****, LayoutStride, LayoutRight,
+                              Experimental::HPX, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t****, LayoutStride, LayoutLeft,
+                              Experimental::HPX, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t****, LayoutStride, LayoutStride,
+                              Experimental::HPX, int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t****, LayoutStride, Experimental::HPX,
+                              int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank5.cpp b/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank5.cpp
index 189245d352..0b8b6690b6 100644
--- a/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank5.cpp
+++ b/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank5.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,22 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*****,LayoutStride,LayoutRight, Experimental::HPX,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*****,LayoutStride,LayoutLeft,  Experimental::HPX,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*****,LayoutStride,LayoutStride,Experimental::HPX,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t*****,LayoutStride,Experimental::HPX,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*****, LayoutStride, LayoutRight,
+                              Experimental::HPX, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*****, LayoutStride, LayoutLeft,
+                              Experimental::HPX, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*****, LayoutStride, LayoutStride,
+                              Experimental::HPX, int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t*****, LayoutStride, Experimental::HPX,
+                              int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank8.cpp b/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank8.cpp
index 921a8e88c7..dd7cb725e4 100644
--- a/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank8.cpp
+++ b/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank8.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,22 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t********,LayoutStride,LayoutRight, Experimental::HPX,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t********,LayoutStride,LayoutLeft,  Experimental::HPX,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t********,LayoutStride,LayoutStride,Experimental::HPX,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t********,LayoutStride,Experimental::HPX,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t********, LayoutStride, LayoutRight,
+                              Experimental::HPX, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t********, LayoutStride, LayoutLeft,
+                              Experimental::HPX, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t********, LayoutStride, LayoutStride,
+                              Experimental::HPX, int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t********, LayoutStride, Experimental::HPX,
+                              int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank1.cpp b/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank1.cpp
index 7e492aa25f..05694106cf 100644
--- a/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank1.cpp
+++ b/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank1.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*,LayoutLeft,LayoutRight, Experimental::HPX,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*,LayoutLeft,LayoutLeft,  Experimental::HPX,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*,LayoutLeft,LayoutStride,Experimental::HPX,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int*,LayoutLeft,Experimental::HPX,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*, LayoutLeft, LayoutRight, Experimental::HPX,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*, LayoutLeft, LayoutLeft, Experimental::HPX,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*, LayoutLeft, LayoutStride, Experimental::HPX,
+                              int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int*, LayoutLeft, Experimental::HPX, int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank2.cpp b/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank2.cpp
index 13b1a78d7c..ce5e6a2917 100644
--- a/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank2.cpp
+++ b/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank2.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int**,LayoutLeft,LayoutRight, Experimental::HPX,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int**,LayoutLeft,LayoutLeft,  Experimental::HPX,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int**,LayoutLeft,LayoutStride,Experimental::HPX,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int**,LayoutLeft,Experimental::HPX,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int**, LayoutLeft, LayoutRight, Experimental::HPX,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int**, LayoutLeft, LayoutLeft, Experimental::HPX,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int**, LayoutLeft, LayoutStride,
+                              Experimental::HPX, int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int**, LayoutLeft, Experimental::HPX, int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank3.cpp b/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank3.cpp
index 03fa72c21c..baf95fb1f2 100644
--- a/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank3.cpp
+++ b/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank3.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int***,LayoutLeft,LayoutRight, Experimental::HPX,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int***,LayoutLeft,LayoutLeft,  Experimental::HPX,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int***,LayoutLeft,LayoutStride,Experimental::HPX,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int***,LayoutLeft,Experimental::HPX,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int***, LayoutLeft, LayoutRight,
+                              Experimental::HPX, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int***, LayoutLeft, LayoutLeft, Experimental::HPX,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int***, LayoutLeft, LayoutStride,
+                              Experimental::HPX, int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int***, LayoutLeft, Experimental::HPX, int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank4.cpp b/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank4.cpp
index 10a46bcd9d..3638c01003 100644
--- a/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank4.cpp
+++ b/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank4.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int****,LayoutLeft,LayoutRight, Experimental::HPX,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int****,LayoutLeft,LayoutLeft,  Experimental::HPX,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int****,LayoutLeft,LayoutStride,Experimental::HPX,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int****,LayoutLeft,Experimental::HPX,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int****, LayoutLeft, LayoutRight,
+                              Experimental::HPX, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int****, LayoutLeft, LayoutLeft,
+                              Experimental::HPX, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int****, LayoutLeft, LayoutStride,
+                              Experimental::HPX, int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int****, LayoutLeft, Experimental::HPX, int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank5.cpp b/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank5.cpp
index 4c23c7e796..1f964cbddf 100644
--- a/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank5.cpp
+++ b/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank5.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*****,LayoutLeft,LayoutRight, Experimental::HPX,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*****,LayoutLeft,LayoutLeft,  Experimental::HPX,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*****,LayoutLeft,LayoutStride,Experimental::HPX,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int*****,LayoutLeft,Experimental::HPX,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*****, LayoutLeft, LayoutRight,
+                              Experimental::HPX, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*****, LayoutLeft, LayoutLeft,
+                              Experimental::HPX, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*****, LayoutLeft, LayoutStride,
+                              Experimental::HPX, int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int*****, LayoutLeft, Experimental::HPX, int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank8.cpp b/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank8.cpp
index 1bc7ab41f7..bc498b3509 100644
--- a/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank8.cpp
+++ b/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank8.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,22 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int********,LayoutLeft,LayoutRight, Experimental::HPX,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int********,LayoutLeft,LayoutLeft,  Experimental::HPX,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int********,LayoutLeft,LayoutStride,Experimental::HPX,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int********,LayoutLeft,Experimental::HPX,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int********, LayoutLeft, LayoutRight,
+                              Experimental::HPX, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int********, LayoutLeft, LayoutLeft,
+                              Experimental::HPX, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int********, LayoutLeft, LayoutStride,
+                              Experimental::HPX, int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int********, LayoutLeft, Experimental::HPX,
+                              int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int_LayoutRight_Rank1.cpp b/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int_LayoutRight_Rank1.cpp
index 0206838af6..0e97cd97c2 100644
--- a/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int_LayoutRight_Rank1.cpp
+++ b/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int_LayoutRight_Rank1.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*,LayoutRight,LayoutRight, Experimental::HPX,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*,LayoutRight,LayoutLeft,  Experimental::HPX,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*,LayoutRight,LayoutStride,Experimental::HPX,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int*,LayoutRight,Experimental::HPX,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*, LayoutRight, LayoutRight, Experimental::HPX,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*, LayoutRight, LayoutLeft, Experimental::HPX,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*, LayoutRight, LayoutStride,
+                              Experimental::HPX, int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int*, LayoutRight, Experimental::HPX, int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int_LayoutRight_Rank2.cpp b/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int_LayoutRight_Rank2.cpp
index 78b67a4a2a..e21f05bf55 100644
--- a/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int_LayoutRight_Rank2.cpp
+++ b/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int_LayoutRight_Rank2.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int**,LayoutRight,LayoutRight, Experimental::HPX,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int**,LayoutRight,LayoutLeft,  Experimental::HPX,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int**,LayoutRight,LayoutStride,Experimental::HPX,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int**,LayoutRight,Experimental::HPX,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int**, LayoutRight, LayoutRight,
+                              Experimental::HPX, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int**, LayoutRight, LayoutLeft, Experimental::HPX,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int**, LayoutRight, LayoutStride,
+                              Experimental::HPX, int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int**, LayoutRight, Experimental::HPX, int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int_LayoutRight_Rank3.cpp b/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int_LayoutRight_Rank3.cpp
index 564f530d9b..1ccdc6a361 100644
--- a/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int_LayoutRight_Rank3.cpp
+++ b/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int_LayoutRight_Rank3.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int***,LayoutRight,LayoutRight, Experimental::HPX,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int***,LayoutRight,LayoutLeft,  Experimental::HPX,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int***,LayoutRight,LayoutStride,Experimental::HPX,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int***,LayoutRight,Experimental::HPX,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int***, LayoutRight, LayoutRight,
+                              Experimental::HPX, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int***, LayoutRight, LayoutLeft,
+                              Experimental::HPX, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int***, LayoutRight, LayoutStride,
+                              Experimental::HPX, int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int***, LayoutRight, Experimental::HPX, int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int_LayoutRight_Rank4.cpp b/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int_LayoutRight_Rank4.cpp
index b5ae4ae52a..ef1c1f970f 100644
--- a/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int_LayoutRight_Rank4.cpp
+++ b/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int_LayoutRight_Rank4.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int****,LayoutRight,LayoutRight, Experimental::HPX,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int****,LayoutRight,LayoutLeft,  Experimental::HPX,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int****,LayoutRight,LayoutStride,Experimental::HPX,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int****,LayoutRight,Experimental::HPX,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int****, LayoutRight, LayoutRight,
+                              Experimental::HPX, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int****, LayoutRight, LayoutLeft,
+                              Experimental::HPX, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int****, LayoutRight, LayoutStride,
+                              Experimental::HPX, int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int****, LayoutRight, Experimental::HPX, int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int_LayoutRight_Rank5.cpp b/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int_LayoutRight_Rank5.cpp
index b2c91a1aa1..2c993914c6 100644
--- a/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int_LayoutRight_Rank5.cpp
+++ b/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int_LayoutRight_Rank5.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*****,LayoutRight,LayoutRight, Experimental::HPX,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*****,LayoutRight,LayoutLeft,  Experimental::HPX,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*****,LayoutRight,LayoutStride,Experimental::HPX,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int*****,LayoutRight,Experimental::HPX,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*****, LayoutRight, LayoutRight,
+                              Experimental::HPX, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*****, LayoutRight, LayoutLeft,
+                              Experimental::HPX, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*****, LayoutRight, LayoutStride,
+                              Experimental::HPX, int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int*****, LayoutRight, Experimental::HPX, int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int_LayoutRight_Rank8.cpp b/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int_LayoutRight_Rank8.cpp
index 18e3f2b9b9..c4d120b33b 100644
--- a/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int_LayoutRight_Rank8.cpp
+++ b/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int_LayoutRight_Rank8.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,22 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int********,LayoutRight,LayoutRight, Experimental::HPX,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int********,LayoutRight,LayoutLeft,  Experimental::HPX,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int********,LayoutRight,LayoutStride,Experimental::HPX,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int********,LayoutRight,Experimental::HPX,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int********, LayoutRight, LayoutRight,
+                              Experimental::HPX, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int********, LayoutRight, LayoutLeft,
+                              Experimental::HPX, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int********, LayoutRight, LayoutStride,
+                              Experimental::HPX, int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int********, LayoutRight, Experimental::HPX,
+                              int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int_LayoutStride_Rank1.cpp b/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int_LayoutStride_Rank1.cpp
index e3d08c6e38..520013db6a 100644
--- a/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int_LayoutStride_Rank1.cpp
+++ b/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int_LayoutStride_Rank1.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*,LayoutStride,LayoutRight, Experimental::HPX,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*,LayoutStride,LayoutLeft,  Experimental::HPX,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*,LayoutStride,LayoutStride,Experimental::HPX,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int*,LayoutStride,Experimental::HPX,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*, LayoutStride, LayoutRight,
+                              Experimental::HPX, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*, LayoutStride, LayoutLeft, Experimental::HPX,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*, LayoutStride, LayoutStride,
+                              Experimental::HPX, int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int*, LayoutStride, Experimental::HPX, int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int_LayoutStride_Rank2.cpp b/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int_LayoutStride_Rank2.cpp
index 5001fc2781..663110f450 100644
--- a/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int_LayoutStride_Rank2.cpp
+++ b/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int_LayoutStride_Rank2.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int**,LayoutStride,LayoutRight, Experimental::HPX,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int**,LayoutStride,LayoutLeft,  Experimental::HPX,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int**,LayoutStride,LayoutStride,Experimental::HPX,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int**,LayoutStride,Experimental::HPX,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int**, LayoutStride, LayoutRight,
+                              Experimental::HPX, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int**, LayoutStride, LayoutLeft,
+                              Experimental::HPX, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int**, LayoutStride, LayoutStride,
+                              Experimental::HPX, int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int**, LayoutStride, Experimental::HPX, int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int_LayoutStride_Rank3.cpp b/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int_LayoutStride_Rank3.cpp
index fd45308d15..ab18fdebdb 100644
--- a/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int_LayoutStride_Rank3.cpp
+++ b/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int_LayoutStride_Rank3.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int***,LayoutStride,LayoutRight, Experimental::HPX,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int***,LayoutStride,LayoutLeft,  Experimental::HPX,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int***,LayoutStride,LayoutStride,Experimental::HPX,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int***,LayoutStride,Experimental::HPX,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int***, LayoutStride, LayoutRight,
+                              Experimental::HPX, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int***, LayoutStride, LayoutLeft,
+                              Experimental::HPX, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int***, LayoutStride, LayoutStride,
+                              Experimental::HPX, int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int***, LayoutStride, Experimental::HPX, int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int_LayoutStride_Rank4.cpp b/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int_LayoutStride_Rank4.cpp
index d2fca73151..232f088e81 100644
--- a/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int_LayoutStride_Rank4.cpp
+++ b/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int_LayoutStride_Rank4.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int****,LayoutStride,LayoutRight, Experimental::HPX,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int****,LayoutStride,LayoutLeft,  Experimental::HPX,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int****,LayoutStride,LayoutStride,Experimental::HPX,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int****,LayoutStride,Experimental::HPX,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int****, LayoutStride, LayoutRight,
+                              Experimental::HPX, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int****, LayoutStride, LayoutLeft,
+                              Experimental::HPX, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int****, LayoutStride, LayoutStride,
+                              Experimental::HPX, int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int****, LayoutStride, Experimental::HPX, int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int_LayoutStride_Rank5.cpp b/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int_LayoutStride_Rank5.cpp
index c7fafd4aec..5a6331b76b 100644
--- a/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int_LayoutStride_Rank5.cpp
+++ b/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int_LayoutStride_Rank5.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,22 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*****,LayoutStride,LayoutRight, Experimental::HPX,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*****,LayoutStride,LayoutLeft,  Experimental::HPX,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*****,LayoutStride,LayoutStride,Experimental::HPX,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int*****,LayoutStride,Experimental::HPX,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*****, LayoutStride, LayoutRight,
+                              Experimental::HPX, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*****, LayoutStride, LayoutLeft,
+                              Experimental::HPX, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*****, LayoutStride, LayoutStride,
+                              Experimental::HPX, int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int*****, LayoutStride, Experimental::HPX,
+                              int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int_LayoutStride_Rank8.cpp b/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int_LayoutStride_Rank8.cpp
index 046aafa6ad..c3223ee4dc 100644
--- a/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int_LayoutStride_Rank8.cpp
+++ b/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int_LayoutStride_Rank8.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,22 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int********,LayoutStride,LayoutRight, Experimental::HPX,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int********,LayoutStride,LayoutLeft,  Experimental::HPX,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int********,LayoutStride,LayoutStride,Experimental::HPX,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int********,LayoutStride,Experimental::HPX,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int********, LayoutStride, LayoutRight,
+                              Experimental::HPX, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int********, LayoutStride, LayoutLeft,
+                              Experimental::HPX, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int********, LayoutStride, LayoutStride,
+                              Experimental::HPX, int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int********, LayoutStride, Experimental::HPX,
+                              int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_double_LayoutLeft_Rank1.cpp b/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_double_LayoutLeft_Rank1.cpp
index 60f78b7a57..50584929ae 100644
--- a/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_double_LayoutLeft_Rank1.cpp
+++ b/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_double_LayoutLeft_Rank1.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*,LayoutLeft,LayoutRight, Experimental::HPX,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*,LayoutLeft,LayoutLeft,  Experimental::HPX,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*,LayoutLeft,LayoutStride,Experimental::HPX,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(double*,LayoutLeft,Experimental::HPX,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*, LayoutLeft, LayoutRight,
+                              Experimental::HPX, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*, LayoutLeft, LayoutLeft,
+                              Experimental::HPX, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*, LayoutLeft, LayoutStride,
+                              Experimental::HPX, int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(double*, LayoutLeft, Experimental::HPX, int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_double_LayoutLeft_Rank2.cpp b/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_double_LayoutLeft_Rank2.cpp
index 304a5afc0d..281784c6a7 100644
--- a/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_double_LayoutLeft_Rank2.cpp
+++ b/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_double_LayoutLeft_Rank2.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double**,LayoutLeft,LayoutRight, Experimental::HPX,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double**,LayoutLeft,LayoutLeft,  Experimental::HPX,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double**,LayoutLeft,LayoutStride,Experimental::HPX,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(double**,LayoutLeft,Experimental::HPX,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double**, LayoutLeft, LayoutRight,
+                              Experimental::HPX, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double**, LayoutLeft, LayoutLeft,
+                              Experimental::HPX, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double**, LayoutLeft, LayoutStride,
+                              Experimental::HPX, int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(double**, LayoutLeft, Experimental::HPX, int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_double_LayoutLeft_Rank3.cpp b/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_double_LayoutLeft_Rank3.cpp
index 8aeaf8a1f8..8a8220baeb 100644
--- a/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_double_LayoutLeft_Rank3.cpp
+++ b/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_double_LayoutLeft_Rank3.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double***,LayoutLeft,LayoutRight, Experimental::HPX,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double***,LayoutLeft,LayoutLeft,  Experimental::HPX,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double***,LayoutLeft,LayoutStride,Experimental::HPX,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(double***,LayoutLeft,Experimental::HPX,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double***, LayoutLeft, LayoutRight,
+                              Experimental::HPX, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double***, LayoutLeft, LayoutLeft,
+                              Experimental::HPX, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double***, LayoutLeft, LayoutStride,
+                              Experimental::HPX, int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(double***, LayoutLeft, Experimental::HPX, int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_double_LayoutLeft_Rank4.cpp b/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_double_LayoutLeft_Rank4.cpp
index 26ff7aefed..7c5567b049 100644
--- a/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_double_LayoutLeft_Rank4.cpp
+++ b/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_double_LayoutLeft_Rank4.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double****,LayoutLeft,LayoutRight, Experimental::HPX,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double****,LayoutLeft,LayoutLeft,  Experimental::HPX,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double****,LayoutLeft,LayoutStride,Experimental::HPX,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(double****,LayoutLeft,Experimental::HPX,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double****, LayoutLeft, LayoutRight,
+                              Experimental::HPX, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double****, LayoutLeft, LayoutLeft,
+                              Experimental::HPX, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double****, LayoutLeft, LayoutStride,
+                              Experimental::HPX, int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(double****, LayoutLeft, Experimental::HPX, int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_double_LayoutLeft_Rank5.cpp b/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_double_LayoutLeft_Rank5.cpp
index 518d000eea..f2716fef3e 100644
--- a/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_double_LayoutLeft_Rank5.cpp
+++ b/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_double_LayoutLeft_Rank5.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*****,LayoutLeft,LayoutRight, Experimental::HPX,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*****,LayoutLeft,LayoutLeft,  Experimental::HPX,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*****,LayoutLeft,LayoutStride,Experimental::HPX,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(double*****,LayoutLeft,Experimental::HPX,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*****, LayoutLeft, LayoutRight,
+                              Experimental::HPX, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*****, LayoutLeft, LayoutLeft,
+                              Experimental::HPX, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*****, LayoutLeft, LayoutStride,
+                              Experimental::HPX, int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(double*****, LayoutLeft, Experimental::HPX, int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_double_LayoutLeft_Rank8.cpp b/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_double_LayoutLeft_Rank8.cpp
index 36b3b4fab8..db1797304a 100644
--- a/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_double_LayoutLeft_Rank8.cpp
+++ b/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_double_LayoutLeft_Rank8.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,22 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double********,LayoutLeft,LayoutRight, Experimental::HPX,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double********,LayoutLeft,LayoutLeft,  Experimental::HPX,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double********,LayoutLeft,LayoutStride,Experimental::HPX,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(double********,LayoutLeft,Experimental::HPX,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double********, LayoutLeft, LayoutRight,
+                              Experimental::HPX, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double********, LayoutLeft, LayoutLeft,
+                              Experimental::HPX, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double********, LayoutLeft, LayoutStride,
+                              Experimental::HPX, int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(double********, LayoutLeft, Experimental::HPX,
+                              int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_double_LayoutRight_Rank1.cpp b/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_double_LayoutRight_Rank1.cpp
index df5c890a49..5c46468170 100644
--- a/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_double_LayoutRight_Rank1.cpp
+++ b/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_double_LayoutRight_Rank1.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*,LayoutRight,LayoutRight, Experimental::HPX,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*,LayoutRight,LayoutLeft,  Experimental::HPX,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*,LayoutRight,LayoutStride,Experimental::HPX,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(double*,LayoutRight,Experimental::HPX,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*, LayoutRight, LayoutRight,
+                              Experimental::HPX, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*, LayoutRight, LayoutLeft,
+                              Experimental::HPX, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*, LayoutRight, LayoutStride,
+                              Experimental::HPX, int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(double*, LayoutRight, Experimental::HPX, int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_double_LayoutRight_Rank2.cpp b/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_double_LayoutRight_Rank2.cpp
index b120215692..be4e90ccc4 100644
--- a/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_double_LayoutRight_Rank2.cpp
+++ b/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_double_LayoutRight_Rank2.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double**,LayoutRight,LayoutRight, Experimental::HPX,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double**,LayoutRight,LayoutLeft,  Experimental::HPX,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double**,LayoutRight,LayoutStride,Experimental::HPX,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(double**,LayoutRight,Experimental::HPX,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double**, LayoutRight, LayoutRight,
+                              Experimental::HPX, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double**, LayoutRight, LayoutLeft,
+                              Experimental::HPX, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double**, LayoutRight, LayoutStride,
+                              Experimental::HPX, int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(double**, LayoutRight, Experimental::HPX, int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_double_LayoutRight_Rank3.cpp b/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_double_LayoutRight_Rank3.cpp
index 9b5e4c2e5f..17200db10b 100644
--- a/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_double_LayoutRight_Rank3.cpp
+++ b/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_double_LayoutRight_Rank3.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double***,LayoutRight,LayoutRight, Experimental::HPX,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double***,LayoutRight,LayoutLeft,  Experimental::HPX,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double***,LayoutRight,LayoutStride,Experimental::HPX,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(double***,LayoutRight,Experimental::HPX,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double***, LayoutRight, LayoutRight,
+                              Experimental::HPX, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double***, LayoutRight, LayoutLeft,
+                              Experimental::HPX, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double***, LayoutRight, LayoutStride,
+                              Experimental::HPX, int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(double***, LayoutRight, Experimental::HPX, int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_double_LayoutRight_Rank4.cpp b/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_double_LayoutRight_Rank4.cpp
index 74ad489303..89794ad1b9 100644
--- a/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_double_LayoutRight_Rank4.cpp
+++ b/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_double_LayoutRight_Rank4.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double****,LayoutRight,LayoutRight, Experimental::HPX,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double****,LayoutRight,LayoutLeft,  Experimental::HPX,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double****,LayoutRight,LayoutStride,Experimental::HPX,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(double****,LayoutRight,Experimental::HPX,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double****, LayoutRight, LayoutRight,
+                              Experimental::HPX, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double****, LayoutRight, LayoutLeft,
+                              Experimental::HPX, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double****, LayoutRight, LayoutStride,
+                              Experimental::HPX, int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(double****, LayoutRight, Experimental::HPX, int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_double_LayoutRight_Rank5.cpp b/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_double_LayoutRight_Rank5.cpp
index bc9dbc65c1..1771edc874 100644
--- a/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_double_LayoutRight_Rank5.cpp
+++ b/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_double_LayoutRight_Rank5.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*****,LayoutRight,LayoutRight, Experimental::HPX,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*****,LayoutRight,LayoutLeft,  Experimental::HPX,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*****,LayoutRight,LayoutStride,Experimental::HPX,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(double*****,LayoutRight,Experimental::HPX,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*****, LayoutRight, LayoutRight,
+                              Experimental::HPX, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*****, LayoutRight, LayoutLeft,
+                              Experimental::HPX, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*****, LayoutRight, LayoutStride,
+                              Experimental::HPX, int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(double*****, LayoutRight, Experimental::HPX, int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_double_LayoutRight_Rank8.cpp b/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_double_LayoutRight_Rank8.cpp
index fbd98c8011..b118550ac2 100644
--- a/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_double_LayoutRight_Rank8.cpp
+++ b/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_double_LayoutRight_Rank8.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,22 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double********,LayoutRight,LayoutRight, Experimental::HPX,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double********,LayoutRight,LayoutLeft,  Experimental::HPX,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double********,LayoutRight,LayoutStride,Experimental::HPX,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(double********,LayoutRight,Experimental::HPX,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double********, LayoutRight, LayoutRight,
+                              Experimental::HPX, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double********, LayoutRight, LayoutLeft,
+                              Experimental::HPX, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double********, LayoutRight, LayoutStride,
+                              Experimental::HPX, int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(double********, LayoutRight, Experimental::HPX,
+                              int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_double_LayoutStride_Rank1.cpp b/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_double_LayoutStride_Rank1.cpp
index d52c5306d0..8879247640 100644
--- a/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_double_LayoutStride_Rank1.cpp
+++ b/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_double_LayoutStride_Rank1.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*,LayoutStride,LayoutRight, Experimental::HPX,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*,LayoutStride,LayoutLeft,  Experimental::HPX,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*,LayoutStride,LayoutStride,Experimental::HPX,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(double*,LayoutStride,Experimental::HPX,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*, LayoutStride, LayoutRight,
+                              Experimental::HPX, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*, LayoutStride, LayoutLeft,
+                              Experimental::HPX, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*, LayoutStride, LayoutStride,
+                              Experimental::HPX, int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(double*, LayoutStride, Experimental::HPX, int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_double_LayoutStride_Rank2.cpp b/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_double_LayoutStride_Rank2.cpp
index 5cc29daaca..7b078639c7 100644
--- a/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_double_LayoutStride_Rank2.cpp
+++ b/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_double_LayoutStride_Rank2.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double**,LayoutStride,LayoutRight, Experimental::HPX,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double**,LayoutStride,LayoutLeft,  Experimental::HPX,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double**,LayoutStride,LayoutStride,Experimental::HPX,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(double**,LayoutStride,Experimental::HPX,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double**, LayoutStride, LayoutRight,
+                              Experimental::HPX, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double**, LayoutStride, LayoutLeft,
+                              Experimental::HPX, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double**, LayoutStride, LayoutStride,
+                              Experimental::HPX, int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(double**, LayoutStride, Experimental::HPX, int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_double_LayoutStride_Rank3.cpp b/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_double_LayoutStride_Rank3.cpp
index 7e63d80236..2dc3d8b7c3 100644
--- a/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_double_LayoutStride_Rank3.cpp
+++ b/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_double_LayoutStride_Rank3.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double***,LayoutStride,LayoutRight, Experimental::HPX,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double***,LayoutStride,LayoutLeft,  Experimental::HPX,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double***,LayoutStride,LayoutStride,Experimental::HPX,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(double***,LayoutStride,Experimental::HPX,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double***, LayoutStride, LayoutRight,
+                              Experimental::HPX, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double***, LayoutStride, LayoutLeft,
+                              Experimental::HPX, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double***, LayoutStride, LayoutStride,
+                              Experimental::HPX, int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(double***, LayoutStride, Experimental::HPX, int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_double_LayoutStride_Rank4.cpp b/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_double_LayoutStride_Rank4.cpp
index 11447c11b5..c3ff0b2127 100644
--- a/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_double_LayoutStride_Rank4.cpp
+++ b/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_double_LayoutStride_Rank4.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double****,LayoutStride,LayoutRight, Experimental::HPX,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double****,LayoutStride,LayoutLeft,  Experimental::HPX,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double****,LayoutStride,LayoutStride,Experimental::HPX,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(double****,LayoutStride,Experimental::HPX,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double****, LayoutStride, LayoutRight,
+                              Experimental::HPX, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double****, LayoutStride, LayoutLeft,
+                              Experimental::HPX, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double****, LayoutStride, LayoutStride,
+                              Experimental::HPX, int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(double****, LayoutStride, Experimental::HPX, int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_double_LayoutStride_Rank5.cpp b/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_double_LayoutStride_Rank5.cpp
index bafe266044..737fe0d634 100644
--- a/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_double_LayoutStride_Rank5.cpp
+++ b/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_double_LayoutStride_Rank5.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*****,LayoutStride,LayoutRight, Experimental::HPX,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*****,LayoutStride,LayoutLeft,  Experimental::HPX,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*****,LayoutStride,LayoutStride,Experimental::HPX,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(double*****,LayoutStride,Experimental::HPX,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*****, LayoutStride, LayoutRight,
+                              Experimental::HPX, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*****, LayoutStride, LayoutLeft,
+                              Experimental::HPX, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*****, LayoutStride, LayoutStride,
+                              Experimental::HPX, int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(double*****, LayoutStride, Experimental::HPX, int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_double_LayoutStride_Rank8.cpp b/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_double_LayoutStride_Rank8.cpp
index e4ef20c370..176a8a5768 100644
--- a/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_double_LayoutStride_Rank8.cpp
+++ b/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_double_LayoutStride_Rank8.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,22 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double********,LayoutStride,LayoutRight, Experimental::HPX,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double********,LayoutStride,LayoutLeft,  Experimental::HPX,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double********,LayoutStride,LayoutStride,Experimental::HPX,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(double********,LayoutStride,Experimental::HPX,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double********, LayoutStride, LayoutRight,
+                              Experimental::HPX, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double********, LayoutStride, LayoutLeft,
+                              Experimental::HPX, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double********, LayoutStride, LayoutStride,
+                              Experimental::HPX, int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(double********, LayoutStride, Experimental::HPX,
+                              int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_float_LayoutLeft_Rank1.cpp b/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_float_LayoutLeft_Rank1.cpp
index fb00c3bfd3..e967e8d2b3 100644
--- a/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_float_LayoutLeft_Rank1.cpp
+++ b/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_float_LayoutLeft_Rank1.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*,LayoutLeft,LayoutRight, Experimental::HPX,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*,LayoutLeft,LayoutLeft,  Experimental::HPX,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*,LayoutLeft,LayoutStride,Experimental::HPX,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(float*,LayoutLeft,Experimental::HPX,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*, LayoutLeft, LayoutRight,
+                              Experimental::HPX, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*, LayoutLeft, LayoutLeft, Experimental::HPX,
+                              int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*, LayoutLeft, LayoutStride,
+                              Experimental::HPX, int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(float*, LayoutLeft, Experimental::HPX, int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_float_LayoutLeft_Rank2.cpp b/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_float_LayoutLeft_Rank2.cpp
index 12718353e8..80323d7aa2 100644
--- a/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_float_LayoutLeft_Rank2.cpp
+++ b/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_float_LayoutLeft_Rank2.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float**,LayoutLeft,LayoutRight, Experimental::HPX,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float**,LayoutLeft,LayoutLeft,  Experimental::HPX,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float**,LayoutLeft,LayoutStride,Experimental::HPX,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(float**,LayoutLeft,Experimental::HPX,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float**, LayoutLeft, LayoutRight,
+                              Experimental::HPX, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float**, LayoutLeft, LayoutLeft,
+                              Experimental::HPX, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float**, LayoutLeft, LayoutStride,
+                              Experimental::HPX, int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(float**, LayoutLeft, Experimental::HPX, int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_float_LayoutLeft_Rank3.cpp b/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_float_LayoutLeft_Rank3.cpp
index c9ab75062d..f68b9720ba 100644
--- a/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_float_LayoutLeft_Rank3.cpp
+++ b/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_float_LayoutLeft_Rank3.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float***,LayoutLeft,LayoutRight, Experimental::HPX,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float***,LayoutLeft,LayoutLeft,  Experimental::HPX,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float***,LayoutLeft,LayoutStride,Experimental::HPX,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(float***,LayoutLeft,Experimental::HPX,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float***, LayoutLeft, LayoutRight,
+                              Experimental::HPX, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float***, LayoutLeft, LayoutLeft,
+                              Experimental::HPX, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float***, LayoutLeft, LayoutStride,
+                              Experimental::HPX, int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(float***, LayoutLeft, Experimental::HPX, int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_float_LayoutLeft_Rank4.cpp b/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_float_LayoutLeft_Rank4.cpp
index 71380c21a2..2dd7bf7843 100644
--- a/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_float_LayoutLeft_Rank4.cpp
+++ b/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_float_LayoutLeft_Rank4.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float****,LayoutLeft,LayoutRight, Experimental::HPX,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float****,LayoutLeft,LayoutLeft,  Experimental::HPX,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float****,LayoutLeft,LayoutStride,Experimental::HPX,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(float****,LayoutLeft,Experimental::HPX,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float****, LayoutLeft, LayoutRight,
+                              Experimental::HPX, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float****, LayoutLeft, LayoutLeft,
+                              Experimental::HPX, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float****, LayoutLeft, LayoutStride,
+                              Experimental::HPX, int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(float****, LayoutLeft, Experimental::HPX, int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_float_LayoutLeft_Rank5.cpp b/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_float_LayoutLeft_Rank5.cpp
index 9787086a80..c240157692 100644
--- a/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_float_LayoutLeft_Rank5.cpp
+++ b/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_float_LayoutLeft_Rank5.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*****,LayoutLeft,LayoutRight, Experimental::HPX,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*****,LayoutLeft,LayoutLeft,  Experimental::HPX,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*****,LayoutLeft,LayoutStride,Experimental::HPX,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(float*****,LayoutLeft,Experimental::HPX,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*****, LayoutLeft, LayoutRight,
+                              Experimental::HPX, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*****, LayoutLeft, LayoutLeft,
+                              Experimental::HPX, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*****, LayoutLeft, LayoutStride,
+                              Experimental::HPX, int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(float*****, LayoutLeft, Experimental::HPX, int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_float_LayoutLeft_Rank8.cpp b/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_float_LayoutLeft_Rank8.cpp
index 81072d77cb..008eea27c9 100644
--- a/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_float_LayoutLeft_Rank8.cpp
+++ b/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_float_LayoutLeft_Rank8.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float********,LayoutLeft,LayoutRight, Experimental::HPX,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float********,LayoutLeft,LayoutLeft,  Experimental::HPX,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float********,LayoutLeft,LayoutStride,Experimental::HPX,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(float********,LayoutLeft,Experimental::HPX,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float********, LayoutLeft, LayoutRight,
+                              Experimental::HPX, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float********, LayoutLeft, LayoutLeft,
+                              Experimental::HPX, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float********, LayoutLeft, LayoutStride,
+                              Experimental::HPX, int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(float********, LayoutLeft, Experimental::HPX, int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_float_LayoutRight_Rank1.cpp b/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_float_LayoutRight_Rank1.cpp
index 363b05bace..ba10fddcb5 100644
--- a/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_float_LayoutRight_Rank1.cpp
+++ b/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_float_LayoutRight_Rank1.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*,LayoutRight,LayoutRight, Experimental::HPX,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*,LayoutRight,LayoutLeft,  Experimental::HPX,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*,LayoutRight,LayoutStride,Experimental::HPX,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(float*,LayoutRight,Experimental::HPX,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*, LayoutRight, LayoutRight,
+                              Experimental::HPX, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*, LayoutRight, LayoutLeft,
+                              Experimental::HPX, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*, LayoutRight, LayoutStride,
+                              Experimental::HPX, int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(float*, LayoutRight, Experimental::HPX, int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_float_LayoutRight_Rank2.cpp b/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_float_LayoutRight_Rank2.cpp
index ce1bc89e01..0bc5851c11 100644
--- a/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_float_LayoutRight_Rank2.cpp
+++ b/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_float_LayoutRight_Rank2.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float**,LayoutRight,LayoutRight, Experimental::HPX,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float**,LayoutRight,LayoutLeft,  Experimental::HPX,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float**,LayoutRight,LayoutStride,Experimental::HPX,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(float**,LayoutRight,Experimental::HPX,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float**, LayoutRight, LayoutRight,
+                              Experimental::HPX, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float**, LayoutRight, LayoutLeft,
+                              Experimental::HPX, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float**, LayoutRight, LayoutStride,
+                              Experimental::HPX, int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(float**, LayoutRight, Experimental::HPX, int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_float_LayoutRight_Rank3.cpp b/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_float_LayoutRight_Rank3.cpp
index 4af590818c..14c359c093 100644
--- a/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_float_LayoutRight_Rank3.cpp
+++ b/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_float_LayoutRight_Rank3.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float***,LayoutRight,LayoutRight, Experimental::HPX,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float***,LayoutRight,LayoutLeft,  Experimental::HPX,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float***,LayoutRight,LayoutStride,Experimental::HPX,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(float***,LayoutRight,Experimental::HPX,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float***, LayoutRight, LayoutRight,
+                              Experimental::HPX, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float***, LayoutRight, LayoutLeft,
+                              Experimental::HPX, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float***, LayoutRight, LayoutStride,
+                              Experimental::HPX, int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(float***, LayoutRight, Experimental::HPX, int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_float_LayoutRight_Rank4.cpp b/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_float_LayoutRight_Rank4.cpp
index ad399eff76..6672b85ce5 100644
--- a/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_float_LayoutRight_Rank4.cpp
+++ b/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_float_LayoutRight_Rank4.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float****,LayoutRight,LayoutRight, Experimental::HPX,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float****,LayoutRight,LayoutLeft,  Experimental::HPX,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float****,LayoutRight,LayoutStride,Experimental::HPX,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(float****,LayoutRight,Experimental::HPX,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float****, LayoutRight, LayoutRight,
+                              Experimental::HPX, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float****, LayoutRight, LayoutLeft,
+                              Experimental::HPX, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float****, LayoutRight, LayoutStride,
+                              Experimental::HPX, int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(float****, LayoutRight, Experimental::HPX, int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_float_LayoutRight_Rank5.cpp b/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_float_LayoutRight_Rank5.cpp
index 661edef668..1ec2162048 100644
--- a/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_float_LayoutRight_Rank5.cpp
+++ b/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_float_LayoutRight_Rank5.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*****,LayoutRight,LayoutRight, Experimental::HPX,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*****,LayoutRight,LayoutLeft,  Experimental::HPX,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*****,LayoutRight,LayoutStride,Experimental::HPX,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(float*****,LayoutRight,Experimental::HPX,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*****, LayoutRight, LayoutRight,
+                              Experimental::HPX, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*****, LayoutRight, LayoutLeft,
+                              Experimental::HPX, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*****, LayoutRight, LayoutStride,
+                              Experimental::HPX, int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(float*****, LayoutRight, Experimental::HPX, int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_float_LayoutRight_Rank8.cpp b/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_float_LayoutRight_Rank8.cpp
index 48cb4a34b1..1a6f0631b7 100644
--- a/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_float_LayoutRight_Rank8.cpp
+++ b/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_float_LayoutRight_Rank8.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,22 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float********,LayoutRight,LayoutRight, Experimental::HPX,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float********,LayoutRight,LayoutLeft,  Experimental::HPX,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float********,LayoutRight,LayoutStride,Experimental::HPX,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(float********,LayoutRight,Experimental::HPX,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float********, LayoutRight, LayoutRight,
+                              Experimental::HPX, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float********, LayoutRight, LayoutLeft,
+                              Experimental::HPX, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float********, LayoutRight, LayoutStride,
+                              Experimental::HPX, int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(float********, LayoutRight, Experimental::HPX,
+                              int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_float_LayoutStride_Rank1.cpp b/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_float_LayoutStride_Rank1.cpp
index d2f88bb243..5b90d4c7a7 100644
--- a/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_float_LayoutStride_Rank1.cpp
+++ b/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_float_LayoutStride_Rank1.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*,LayoutStride,LayoutRight, Experimental::HPX,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*,LayoutStride,LayoutLeft,  Experimental::HPX,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*,LayoutStride,LayoutStride,Experimental::HPX,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(float*,LayoutStride,Experimental::HPX,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*, LayoutStride, LayoutRight,
+                              Experimental::HPX, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*, LayoutStride, LayoutLeft,
+                              Experimental::HPX, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*, LayoutStride, LayoutStride,
+                              Experimental::HPX, int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(float*, LayoutStride, Experimental::HPX, int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_float_LayoutStride_Rank2.cpp b/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_float_LayoutStride_Rank2.cpp
index 58ce6f1911..3e0e011b0a 100644
--- a/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_float_LayoutStride_Rank2.cpp
+++ b/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_float_LayoutStride_Rank2.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float**,LayoutStride,LayoutRight, Experimental::HPX,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float**,LayoutStride,LayoutLeft,  Experimental::HPX,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float**,LayoutStride,LayoutStride,Experimental::HPX,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(float**,LayoutStride,Experimental::HPX,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float**, LayoutStride, LayoutRight,
+                              Experimental::HPX, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float**, LayoutStride, LayoutLeft,
+                              Experimental::HPX, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float**, LayoutStride, LayoutStride,
+                              Experimental::HPX, int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(float**, LayoutStride, Experimental::HPX, int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_float_LayoutStride_Rank3.cpp b/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_float_LayoutStride_Rank3.cpp
index bc4efab1e4..912cfe66ff 100644
--- a/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_float_LayoutStride_Rank3.cpp
+++ b/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_float_LayoutStride_Rank3.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float***,LayoutStride,LayoutRight, Experimental::HPX,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float***,LayoutStride,LayoutLeft,  Experimental::HPX,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float***,LayoutStride,LayoutStride,Experimental::HPX,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(float***,LayoutStride,Experimental::HPX,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float***, LayoutStride, LayoutRight,
+                              Experimental::HPX, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float***, LayoutStride, LayoutLeft,
+                              Experimental::HPX, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float***, LayoutStride, LayoutStride,
+                              Experimental::HPX, int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(float***, LayoutStride, Experimental::HPX, int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_float_LayoutStride_Rank4.cpp b/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_float_LayoutStride_Rank4.cpp
index 6225cf9720..a2cc70ffac 100644
--- a/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_float_LayoutStride_Rank4.cpp
+++ b/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_float_LayoutStride_Rank4.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float****,LayoutStride,LayoutRight, Experimental::HPX,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float****,LayoutStride,LayoutLeft,  Experimental::HPX,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float****,LayoutStride,LayoutStride,Experimental::HPX,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(float****,LayoutStride,Experimental::HPX,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float****, LayoutStride, LayoutRight,
+                              Experimental::HPX, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float****, LayoutStride, LayoutLeft,
+                              Experimental::HPX, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float****, LayoutStride, LayoutStride,
+                              Experimental::HPX, int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(float****, LayoutStride, Experimental::HPX, int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_float_LayoutStride_Rank5.cpp b/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_float_LayoutStride_Rank5.cpp
index e50472d850..58772e42df 100644
--- a/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_float_LayoutStride_Rank5.cpp
+++ b/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_float_LayoutStride_Rank5.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*****,LayoutStride,LayoutRight, Experimental::HPX,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*****,LayoutStride,LayoutLeft,  Experimental::HPX,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*****,LayoutStride,LayoutStride,Experimental::HPX,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(float*****,LayoutStride,Experimental::HPX,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*****, LayoutStride, LayoutRight,
+                              Experimental::HPX, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*****, LayoutStride, LayoutLeft,
+                              Experimental::HPX, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*****, LayoutStride, LayoutStride,
+                              Experimental::HPX, int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(float*****, LayoutStride, Experimental::HPX, int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_float_LayoutStride_Rank8.cpp b/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_float_LayoutStride_Rank8.cpp
index 5ad427acc5..ce52b3fcfc 100644
--- a/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_float_LayoutStride_Rank8.cpp
+++ b/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_float_LayoutStride_Rank8.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,22 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float********,LayoutStride,LayoutRight, Experimental::HPX,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float********,LayoutStride,LayoutLeft,  Experimental::HPX,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float********,LayoutStride,LayoutStride,Experimental::HPX,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(float********,LayoutStride,Experimental::HPX,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float********, LayoutStride, LayoutRight,
+                              Experimental::HPX, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float********, LayoutStride, LayoutLeft,
+                              Experimental::HPX, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float********, LayoutStride, LayoutStride,
+                              Experimental::HPX, int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(float********, LayoutStride, Experimental::HPX,
+                              int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank1.cpp b/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank1.cpp
index 4ae2437fc8..9baf307d8b 100644
--- a/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank1.cpp
+++ b/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank1.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*,LayoutLeft,LayoutRight, Experimental::HPX,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*,LayoutLeft,LayoutLeft,  Experimental::HPX,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*,LayoutLeft,LayoutStride,Experimental::HPX,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t*,LayoutLeft,Experimental::HPX,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*, LayoutLeft, LayoutRight,
+                              Experimental::HPX, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*, LayoutLeft, LayoutLeft,
+                              Experimental::HPX, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*, LayoutLeft, LayoutStride,
+                              Experimental::HPX, int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t*, LayoutLeft, Experimental::HPX, int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank2.cpp b/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank2.cpp
index 02a2b8e1d9..ffc8e2c520 100644
--- a/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank2.cpp
+++ b/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank2.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t**,LayoutLeft,LayoutRight, Experimental::HPX,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t**,LayoutLeft,LayoutLeft,  Experimental::HPX,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t**,LayoutLeft,LayoutStride,Experimental::HPX,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t**,LayoutLeft,Experimental::HPX,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t**, LayoutLeft, LayoutRight,
+                              Experimental::HPX, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t**, LayoutLeft, LayoutLeft,
+                              Experimental::HPX, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t**, LayoutLeft, LayoutStride,
+                              Experimental::HPX, int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t**, LayoutLeft, Experimental::HPX, int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank3.cpp b/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank3.cpp
index ff693c9b4f..16aec37096 100644
--- a/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank3.cpp
+++ b/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank3.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t***,LayoutLeft,LayoutRight, Experimental::HPX,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t***,LayoutLeft,LayoutLeft,  Experimental::HPX,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t***,LayoutLeft,LayoutStride,Experimental::HPX,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t***,LayoutLeft,Experimental::HPX,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t***, LayoutLeft, LayoutRight,
+                              Experimental::HPX, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t***, LayoutLeft, LayoutLeft,
+                              Experimental::HPX, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t***, LayoutLeft, LayoutStride,
+                              Experimental::HPX, int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t***, LayoutLeft, Experimental::HPX, int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank4.cpp b/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank4.cpp
index d96960d4a7..a2b5e8dff4 100644
--- a/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank4.cpp
+++ b/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank4.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t****,LayoutLeft,LayoutRight, Experimental::HPX,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t****,LayoutLeft,LayoutLeft,  Experimental::HPX,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t****,LayoutLeft,LayoutStride,Experimental::HPX,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t****,LayoutLeft,Experimental::HPX,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t****, LayoutLeft, LayoutRight,
+                              Experimental::HPX, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t****, LayoutLeft, LayoutLeft,
+                              Experimental::HPX, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t****, LayoutLeft, LayoutStride,
+                              Experimental::HPX, int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t****, LayoutLeft, Experimental::HPX, int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank5.cpp b/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank5.cpp
index 05c3ef68eb..f5b7347d38 100644
--- a/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank5.cpp
+++ b/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank5.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*****,LayoutLeft,LayoutRight, Experimental::HPX,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*****,LayoutLeft,LayoutLeft,  Experimental::HPX,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*****,LayoutLeft,LayoutStride,Experimental::HPX,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t*****,LayoutLeft,Experimental::HPX,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*****, LayoutLeft, LayoutRight,
+                              Experimental::HPX, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*****, LayoutLeft, LayoutLeft,
+                              Experimental::HPX, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*****, LayoutLeft, LayoutStride,
+                              Experimental::HPX, int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t*****, LayoutLeft, Experimental::HPX, int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank8.cpp b/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank8.cpp
index d96f47ece0..7646c53722 100644
--- a/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank8.cpp
+++ b/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank8.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,22 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t********,LayoutLeft,LayoutRight, Experimental::HPX,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t********,LayoutLeft,LayoutLeft,  Experimental::HPX,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t********,LayoutLeft,LayoutStride,Experimental::HPX,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t********,LayoutLeft,Experimental::HPX,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t********, LayoutLeft, LayoutRight,
+                              Experimental::HPX, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t********, LayoutLeft, LayoutLeft,
+                              Experimental::HPX, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t********, LayoutLeft, LayoutStride,
+                              Experimental::HPX, int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t********, LayoutLeft, Experimental::HPX,
+                              int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int64_t_LayoutRight_Rank1.cpp b/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int64_t_LayoutRight_Rank1.cpp
index 208933899e..e225e99c56 100644
--- a/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int64_t_LayoutRight_Rank1.cpp
+++ b/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int64_t_LayoutRight_Rank1.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*,LayoutRight,LayoutRight, Experimental::HPX,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*,LayoutRight,LayoutLeft,  Experimental::HPX,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*,LayoutRight,LayoutStride,Experimental::HPX,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t*,LayoutRight,Experimental::HPX,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*, LayoutRight, LayoutRight,
+                              Experimental::HPX, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*, LayoutRight, LayoutLeft,
+                              Experimental::HPX, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*, LayoutRight, LayoutStride,
+                              Experimental::HPX, int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t*, LayoutRight, Experimental::HPX, int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int64_t_LayoutRight_Rank2.cpp b/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int64_t_LayoutRight_Rank2.cpp
index aa7d9b8f15..441e8b63ed 100644
--- a/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int64_t_LayoutRight_Rank2.cpp
+++ b/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int64_t_LayoutRight_Rank2.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t**,LayoutRight,LayoutRight, Experimental::HPX,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t**,LayoutRight,LayoutLeft,  Experimental::HPX,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t**,LayoutRight,LayoutStride,Experimental::HPX,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t**,LayoutRight,Experimental::HPX,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t**, LayoutRight, LayoutRight,
+                              Experimental::HPX, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t**, LayoutRight, LayoutLeft,
+                              Experimental::HPX, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t**, LayoutRight, LayoutStride,
+                              Experimental::HPX, int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t**, LayoutRight, Experimental::HPX, int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int64_t_LayoutRight_Rank3.cpp b/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int64_t_LayoutRight_Rank3.cpp
index e43a1783fd..8e3bdecf1e 100644
--- a/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int64_t_LayoutRight_Rank3.cpp
+++ b/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int64_t_LayoutRight_Rank3.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t***,LayoutRight,LayoutRight, Experimental::HPX,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t***,LayoutRight,LayoutLeft,  Experimental::HPX,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t***,LayoutRight,LayoutStride,Experimental::HPX,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t***,LayoutRight,Experimental::HPX,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t***, LayoutRight, LayoutRight,
+                              Experimental::HPX, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t***, LayoutRight, LayoutLeft,
+                              Experimental::HPX, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t***, LayoutRight, LayoutStride,
+                              Experimental::HPX, int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t***, LayoutRight, Experimental::HPX, int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int64_t_LayoutRight_Rank4.cpp b/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int64_t_LayoutRight_Rank4.cpp
index 6706074819..7662c5a390 100644
--- a/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int64_t_LayoutRight_Rank4.cpp
+++ b/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int64_t_LayoutRight_Rank4.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t****,LayoutRight,LayoutRight, Experimental::HPX,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t****,LayoutRight,LayoutLeft,  Experimental::HPX,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t****,LayoutRight,LayoutStride,Experimental::HPX,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t****,LayoutRight,Experimental::HPX,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t****, LayoutRight, LayoutRight,
+                              Experimental::HPX, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t****, LayoutRight, LayoutLeft,
+                              Experimental::HPX, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t****, LayoutRight, LayoutStride,
+                              Experimental::HPX, int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t****, LayoutRight, Experimental::HPX, int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int64_t_LayoutRight_Rank5.cpp b/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int64_t_LayoutRight_Rank5.cpp
index cd7082dcb3..db8625bd9f 100644
--- a/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int64_t_LayoutRight_Rank5.cpp
+++ b/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int64_t_LayoutRight_Rank5.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*****,LayoutRight,LayoutRight, Experimental::HPX,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*****,LayoutRight,LayoutLeft,  Experimental::HPX,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*****,LayoutRight,LayoutStride,Experimental::HPX,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t*****,LayoutRight,Experimental::HPX,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*****, LayoutRight, LayoutRight,
+                              Experimental::HPX, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*****, LayoutRight, LayoutLeft,
+                              Experimental::HPX, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*****, LayoutRight, LayoutStride,
+                              Experimental::HPX, int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t*****, LayoutRight, Experimental::HPX, int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int64_t_LayoutRight_Rank8.cpp b/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int64_t_LayoutRight_Rank8.cpp
index 8735d58605..5992b136b0 100644
--- a/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int64_t_LayoutRight_Rank8.cpp
+++ b/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int64_t_LayoutRight_Rank8.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,22 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t********,LayoutRight,LayoutRight, Experimental::HPX,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t********,LayoutRight,LayoutLeft,  Experimental::HPX,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t********,LayoutRight,LayoutStride,Experimental::HPX,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t********,LayoutRight,Experimental::HPX,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t********, LayoutRight, LayoutRight,
+                              Experimental::HPX, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t********, LayoutRight, LayoutLeft,
+                              Experimental::HPX, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t********, LayoutRight, LayoutStride,
+                              Experimental::HPX, int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t********, LayoutRight, Experimental::HPX,
+                              int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int64_t_LayoutStride_Rank1.cpp b/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int64_t_LayoutStride_Rank1.cpp
index ec371dcba7..f862aa4df9 100644
--- a/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int64_t_LayoutStride_Rank1.cpp
+++ b/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int64_t_LayoutStride_Rank1.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*,LayoutStride,LayoutRight, Experimental::HPX,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*,LayoutStride,LayoutLeft,  Experimental::HPX,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*,LayoutStride,LayoutStride,Experimental::HPX,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t*,LayoutStride,Experimental::HPX,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*, LayoutStride, LayoutRight,
+                              Experimental::HPX, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*, LayoutStride, LayoutLeft,
+                              Experimental::HPX, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*, LayoutStride, LayoutStride,
+                              Experimental::HPX, int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t*, LayoutStride, Experimental::HPX, int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int64_t_LayoutStride_Rank2.cpp b/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int64_t_LayoutStride_Rank2.cpp
index 354da99794..788c411d33 100644
--- a/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int64_t_LayoutStride_Rank2.cpp
+++ b/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int64_t_LayoutStride_Rank2.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t**,LayoutStride,LayoutRight, Experimental::HPX,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t**,LayoutStride,LayoutLeft,  Experimental::HPX,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t**,LayoutStride,LayoutStride,Experimental::HPX,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t**,LayoutStride,Experimental::HPX,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t**, LayoutStride, LayoutRight,
+                              Experimental::HPX, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t**, LayoutStride, LayoutLeft,
+                              Experimental::HPX, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t**, LayoutStride, LayoutStride,
+                              Experimental::HPX, int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t**, LayoutStride, Experimental::HPX, int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int64_t_LayoutStride_Rank3.cpp b/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int64_t_LayoutStride_Rank3.cpp
index bbc32aba03..0646c93ac4 100644
--- a/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int64_t_LayoutStride_Rank3.cpp
+++ b/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int64_t_LayoutStride_Rank3.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t***,LayoutStride,LayoutRight, Experimental::HPX,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t***,LayoutStride,LayoutLeft,  Experimental::HPX,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t***,LayoutStride,LayoutStride,Experimental::HPX,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t***,LayoutStride,Experimental::HPX,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t***, LayoutStride, LayoutRight,
+                              Experimental::HPX, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t***, LayoutStride, LayoutLeft,
+                              Experimental::HPX, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t***, LayoutStride, LayoutStride,
+                              Experimental::HPX, int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t***, LayoutStride, Experimental::HPX, int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int64_t_LayoutStride_Rank4.cpp b/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int64_t_LayoutStride_Rank4.cpp
index addbbb291a..88299a88ba 100644
--- a/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int64_t_LayoutStride_Rank4.cpp
+++ b/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int64_t_LayoutStride_Rank4.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t****,LayoutStride,LayoutRight, Experimental::HPX,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t****,LayoutStride,LayoutLeft,  Experimental::HPX,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t****,LayoutStride,LayoutStride,Experimental::HPX,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t****,LayoutStride,Experimental::HPX,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t****, LayoutStride, LayoutRight,
+                              Experimental::HPX, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t****, LayoutStride, LayoutLeft,
+                              Experimental::HPX, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t****, LayoutStride, LayoutStride,
+                              Experimental::HPX, int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t****, LayoutStride, Experimental::HPX, int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int64_t_LayoutStride_Rank5.cpp b/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int64_t_LayoutStride_Rank5.cpp
index dbebda1594..aaec87e40c 100644
--- a/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int64_t_LayoutStride_Rank5.cpp
+++ b/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int64_t_LayoutStride_Rank5.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,22 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*****,LayoutStride,LayoutRight, Experimental::HPX,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*****,LayoutStride,LayoutLeft,  Experimental::HPX,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*****,LayoutStride,LayoutStride,Experimental::HPX,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t*****,LayoutStride,Experimental::HPX,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*****, LayoutStride, LayoutRight,
+                              Experimental::HPX, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*****, LayoutStride, LayoutLeft,
+                              Experimental::HPX, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*****, LayoutStride, LayoutStride,
+                              Experimental::HPX, int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t*****, LayoutStride, Experimental::HPX,
+                              int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int64_t_LayoutStride_Rank8.cpp b/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int64_t_LayoutStride_Rank8.cpp
index f8a89b4226..f650c7e4a2 100644
--- a/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int64_t_LayoutStride_Rank8.cpp
+++ b/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int64_t_LayoutStride_Rank8.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,22 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t********,LayoutStride,LayoutRight, Experimental::HPX,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t********,LayoutStride,LayoutLeft,  Experimental::HPX,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t********,LayoutStride,LayoutStride,Experimental::HPX,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t********,LayoutStride,Experimental::HPX,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t********, LayoutStride, LayoutRight,
+                              Experimental::HPX, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t********, LayoutStride, LayoutLeft,
+                              Experimental::HPX, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t********, LayoutStride, LayoutStride,
+                              Experimental::HPX, int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t********, LayoutStride, Experimental::HPX,
+                              int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int_LayoutLeft_Rank1.cpp b/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int_LayoutLeft_Rank1.cpp
index 7f0b9fc346..1cf32f3f52 100644
--- a/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int_LayoutLeft_Rank1.cpp
+++ b/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int_LayoutLeft_Rank1.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*,LayoutLeft,LayoutRight, Experimental::HPX,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*,LayoutLeft,LayoutLeft,  Experimental::HPX,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*,LayoutLeft,LayoutStride,Experimental::HPX,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int*,LayoutLeft,Experimental::HPX,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*, LayoutLeft, LayoutRight, Experimental::HPX,
+                              int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*, LayoutLeft, LayoutLeft, Experimental::HPX,
+                              int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*, LayoutLeft, LayoutStride, Experimental::HPX,
+                              int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int*, LayoutLeft, Experimental::HPX, int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int_LayoutLeft_Rank2.cpp b/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int_LayoutLeft_Rank2.cpp
index 4a31e60a3a..a53f5b304b 100644
--- a/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int_LayoutLeft_Rank2.cpp
+++ b/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int_LayoutLeft_Rank2.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int**,LayoutLeft,LayoutRight, Experimental::HPX,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int**,LayoutLeft,LayoutLeft,  Experimental::HPX,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int**,LayoutLeft,LayoutStride,Experimental::HPX,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int**,LayoutLeft,Experimental::HPX,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int**, LayoutLeft, LayoutRight, Experimental::HPX,
+                              int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int**, LayoutLeft, LayoutLeft, Experimental::HPX,
+                              int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int**, LayoutLeft, LayoutStride,
+                              Experimental::HPX, int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int**, LayoutLeft, Experimental::HPX, int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int_LayoutLeft_Rank3.cpp b/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int_LayoutLeft_Rank3.cpp
index e876da3a6c..a679f816b3 100644
--- a/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int_LayoutLeft_Rank3.cpp
+++ b/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int_LayoutLeft_Rank3.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int***,LayoutLeft,LayoutRight, Experimental::HPX,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int***,LayoutLeft,LayoutLeft,  Experimental::HPX,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int***,LayoutLeft,LayoutStride,Experimental::HPX,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int***,LayoutLeft,Experimental::HPX,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int***, LayoutLeft, LayoutRight,
+                              Experimental::HPX, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int***, LayoutLeft, LayoutLeft, Experimental::HPX,
+                              int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int***, LayoutLeft, LayoutStride,
+                              Experimental::HPX, int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int***, LayoutLeft, Experimental::HPX, int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int_LayoutLeft_Rank4.cpp b/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int_LayoutLeft_Rank4.cpp
index a7ee2c554d..dc2efe8526 100644
--- a/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int_LayoutLeft_Rank4.cpp
+++ b/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int_LayoutLeft_Rank4.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int****,LayoutLeft,LayoutRight, Experimental::HPX,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int****,LayoutLeft,LayoutLeft,  Experimental::HPX,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int****,LayoutLeft,LayoutStride,Experimental::HPX,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int****,LayoutLeft,Experimental::HPX,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int****, LayoutLeft, LayoutRight,
+                              Experimental::HPX, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int****, LayoutLeft, LayoutLeft,
+                              Experimental::HPX, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int****, LayoutLeft, LayoutStride,
+                              Experimental::HPX, int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int****, LayoutLeft, Experimental::HPX, int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int_LayoutLeft_Rank5.cpp b/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int_LayoutLeft_Rank5.cpp
index 4769c235bc..f532d1917b 100644
--- a/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int_LayoutLeft_Rank5.cpp
+++ b/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int_LayoutLeft_Rank5.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*****,LayoutLeft,LayoutRight, Experimental::HPX,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*****,LayoutLeft,LayoutLeft,  Experimental::HPX,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*****,LayoutLeft,LayoutStride,Experimental::HPX,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int*****,LayoutLeft,Experimental::HPX,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*****, LayoutLeft, LayoutRight,
+                              Experimental::HPX, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*****, LayoutLeft, LayoutLeft,
+                              Experimental::HPX, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*****, LayoutLeft, LayoutStride,
+                              Experimental::HPX, int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int*****, LayoutLeft, Experimental::HPX, int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int_LayoutLeft_Rank8.cpp b/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int_LayoutLeft_Rank8.cpp
index 3ac618b5dd..067d7c3415 100644
--- a/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int_LayoutLeft_Rank8.cpp
+++ b/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int_LayoutLeft_Rank8.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int********,LayoutLeft,LayoutRight, Experimental::HPX,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int********,LayoutLeft,LayoutLeft,  Experimental::HPX,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int********,LayoutLeft,LayoutStride,Experimental::HPX,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int********,LayoutLeft,Experimental::HPX,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int********, LayoutLeft, LayoutRight,
+                              Experimental::HPX, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int********, LayoutLeft, LayoutLeft,
+                              Experimental::HPX, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int********, LayoutLeft, LayoutStride,
+                              Experimental::HPX, int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int********, LayoutLeft, Experimental::HPX, int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int_LayoutRight_Rank1.cpp b/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int_LayoutRight_Rank1.cpp
index 825bee722f..fdee4a6f35 100644
--- a/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int_LayoutRight_Rank1.cpp
+++ b/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int_LayoutRight_Rank1.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*,LayoutRight,LayoutRight, Experimental::HPX,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*,LayoutRight,LayoutLeft,  Experimental::HPX,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*,LayoutRight,LayoutStride,Experimental::HPX,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int*,LayoutRight,Experimental::HPX,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*, LayoutRight, LayoutRight, Experimental::HPX,
+                              int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*, LayoutRight, LayoutLeft, Experimental::HPX,
+                              int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*, LayoutRight, LayoutStride,
+                              Experimental::HPX, int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int*, LayoutRight, Experimental::HPX, int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int_LayoutRight_Rank2.cpp b/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int_LayoutRight_Rank2.cpp
index 44e24e57f3..4ee5059611 100644
--- a/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int_LayoutRight_Rank2.cpp
+++ b/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int_LayoutRight_Rank2.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int**,LayoutRight,LayoutRight, Experimental::HPX,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int**,LayoutRight,LayoutLeft,  Experimental::HPX,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int**,LayoutRight,LayoutStride,Experimental::HPX,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int**,LayoutRight,Experimental::HPX,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int**, LayoutRight, LayoutRight,
+                              Experimental::HPX, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int**, LayoutRight, LayoutLeft, Experimental::HPX,
+                              int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int**, LayoutRight, LayoutStride,
+                              Experimental::HPX, int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int**, LayoutRight, Experimental::HPX, int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int_LayoutRight_Rank3.cpp b/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int_LayoutRight_Rank3.cpp
index 0b18c7e5c0..280fd0113e 100644
--- a/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int_LayoutRight_Rank3.cpp
+++ b/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int_LayoutRight_Rank3.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int***,LayoutRight,LayoutRight, Experimental::HPX,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int***,LayoutRight,LayoutLeft,  Experimental::HPX,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int***,LayoutRight,LayoutStride,Experimental::HPX,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int***,LayoutRight,Experimental::HPX,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int***, LayoutRight, LayoutRight,
+                              Experimental::HPX, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int***, LayoutRight, LayoutLeft,
+                              Experimental::HPX, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int***, LayoutRight, LayoutStride,
+                              Experimental::HPX, int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int***, LayoutRight, Experimental::HPX, int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int_LayoutRight_Rank4.cpp b/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int_LayoutRight_Rank4.cpp
index 951d770305..84525a0043 100644
--- a/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int_LayoutRight_Rank4.cpp
+++ b/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int_LayoutRight_Rank4.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int****,LayoutRight,LayoutRight, Experimental::HPX,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int****,LayoutRight,LayoutLeft,  Experimental::HPX,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int****,LayoutRight,LayoutStride,Experimental::HPX,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int****,LayoutRight,Experimental::HPX,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int****, LayoutRight, LayoutRight,
+                              Experimental::HPX, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int****, LayoutRight, LayoutLeft,
+                              Experimental::HPX, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int****, LayoutRight, LayoutStride,
+                              Experimental::HPX, int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int****, LayoutRight, Experimental::HPX, int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int_LayoutRight_Rank5.cpp b/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int_LayoutRight_Rank5.cpp
index a0e80d764d..7ba740043c 100644
--- a/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int_LayoutRight_Rank5.cpp
+++ b/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int_LayoutRight_Rank5.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*****,LayoutRight,LayoutRight, Experimental::HPX,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*****,LayoutRight,LayoutLeft,  Experimental::HPX,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*****,LayoutRight,LayoutStride,Experimental::HPX,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int*****,LayoutRight,Experimental::HPX,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*****, LayoutRight, LayoutRight,
+                              Experimental::HPX, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*****, LayoutRight, LayoutLeft,
+                              Experimental::HPX, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*****, LayoutRight, LayoutStride,
+                              Experimental::HPX, int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int*****, LayoutRight, Experimental::HPX, int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int_LayoutRight_Rank8.cpp b/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int_LayoutRight_Rank8.cpp
index d8cd0155af..4a47549480 100644
--- a/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int_LayoutRight_Rank8.cpp
+++ b/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int_LayoutRight_Rank8.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int********,LayoutRight,LayoutRight, Experimental::HPX,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int********,LayoutRight,LayoutLeft,  Experimental::HPX,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int********,LayoutRight,LayoutStride,Experimental::HPX,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int********,LayoutRight,Experimental::HPX,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int********, LayoutRight, LayoutRight,
+                              Experimental::HPX, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int********, LayoutRight, LayoutLeft,
+                              Experimental::HPX, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int********, LayoutRight, LayoutStride,
+                              Experimental::HPX, int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int********, LayoutRight, Experimental::HPX, int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int_LayoutStride_Rank1.cpp b/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int_LayoutStride_Rank1.cpp
index c4bd8a043a..14773de5db 100644
--- a/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int_LayoutStride_Rank1.cpp
+++ b/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int_LayoutStride_Rank1.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*,LayoutStride,LayoutRight, Experimental::HPX,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*,LayoutStride,LayoutLeft,  Experimental::HPX,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*,LayoutStride,LayoutStride,Experimental::HPX,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int*,LayoutStride,Experimental::HPX,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*, LayoutStride, LayoutRight,
+                              Experimental::HPX, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*, LayoutStride, LayoutLeft, Experimental::HPX,
+                              int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*, LayoutStride, LayoutStride,
+                              Experimental::HPX, int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int*, LayoutStride, Experimental::HPX, int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int_LayoutStride_Rank2.cpp b/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int_LayoutStride_Rank2.cpp
index 566eb71e4d..0f57ae5cb5 100644
--- a/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int_LayoutStride_Rank2.cpp
+++ b/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int_LayoutStride_Rank2.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int**,LayoutStride,LayoutRight, Experimental::HPX,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int**,LayoutStride,LayoutLeft,  Experimental::HPX,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int**,LayoutStride,LayoutStride,Experimental::HPX,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int**,LayoutStride,Experimental::HPX,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int**, LayoutStride, LayoutRight,
+                              Experimental::HPX, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int**, LayoutStride, LayoutLeft,
+                              Experimental::HPX, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int**, LayoutStride, LayoutStride,
+                              Experimental::HPX, int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int**, LayoutStride, Experimental::HPX, int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int_LayoutStride_Rank3.cpp b/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int_LayoutStride_Rank3.cpp
index 4b99a8fd0c..905bb918fc 100644
--- a/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int_LayoutStride_Rank3.cpp
+++ b/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int_LayoutStride_Rank3.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int***,LayoutStride,LayoutRight, Experimental::HPX,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int***,LayoutStride,LayoutLeft,  Experimental::HPX,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int***,LayoutStride,LayoutStride,Experimental::HPX,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int***,LayoutStride,Experimental::HPX,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int***, LayoutStride, LayoutRight,
+                              Experimental::HPX, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int***, LayoutStride, LayoutLeft,
+                              Experimental::HPX, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int***, LayoutStride, LayoutStride,
+                              Experimental::HPX, int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int***, LayoutStride, Experimental::HPX, int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int_LayoutStride_Rank4.cpp b/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int_LayoutStride_Rank4.cpp
index 6cf55bb5b4..30563fe13a 100644
--- a/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int_LayoutStride_Rank4.cpp
+++ b/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int_LayoutStride_Rank4.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int****,LayoutStride,LayoutRight, Experimental::HPX,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int****,LayoutStride,LayoutLeft,  Experimental::HPX,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int****,LayoutStride,LayoutStride,Experimental::HPX,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int****,LayoutStride,Experimental::HPX,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int****, LayoutStride, LayoutRight,
+                              Experimental::HPX, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int****, LayoutStride, LayoutLeft,
+                              Experimental::HPX, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int****, LayoutStride, LayoutStride,
+                              Experimental::HPX, int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int****, LayoutStride, Experimental::HPX, int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int_LayoutStride_Rank5.cpp b/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int_LayoutStride_Rank5.cpp
index 932a322bac..ed0c45b36b 100644
--- a/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int_LayoutStride_Rank5.cpp
+++ b/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int_LayoutStride_Rank5.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*****,LayoutStride,LayoutRight, Experimental::HPX,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*****,LayoutStride,LayoutLeft,  Experimental::HPX,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*****,LayoutStride,LayoutStride,Experimental::HPX,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int*****,LayoutStride,Experimental::HPX,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*****, LayoutStride, LayoutRight,
+                              Experimental::HPX, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*****, LayoutStride, LayoutLeft,
+                              Experimental::HPX, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*****, LayoutStride, LayoutStride,
+                              Experimental::HPX, int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int*****, LayoutStride, Experimental::HPX, int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int_LayoutStride_Rank8.cpp b/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int_LayoutStride_Rank8.cpp
index f46a156a93..1ff4404c9b 100644
--- a/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int_LayoutStride_Rank8.cpp
+++ b/lib/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int_LayoutStride_Rank8.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int********,LayoutStride,LayoutRight, Experimental::HPX,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int********,LayoutStride,LayoutLeft,  Experimental::HPX,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int********,LayoutStride,LayoutStride,Experimental::HPX,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int********,LayoutStride,Experimental::HPX,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int********, LayoutStride, LayoutRight,
+                              Experimental::HPX, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int********, LayoutStride, LayoutLeft,
+                              Experimental::HPX, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int********, LayoutStride, LayoutStride,
+                              Experimental::HPX, int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int********, LayoutStride, Experimental::HPX, int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank1.cpp b/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank1.cpp
index fd441ec0b2..37d812f989 100644
--- a/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank1.cpp
+++ b/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank1.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,19 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*,LayoutLeft,LayoutRight, OpenMP,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*,LayoutLeft,LayoutLeft,  OpenMP,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*,LayoutLeft,LayoutStride,OpenMP,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(double*,LayoutLeft,OpenMP,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*, LayoutLeft, LayoutRight, OpenMP, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*, LayoutLeft, LayoutLeft, OpenMP, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*, LayoutLeft, LayoutStride, OpenMP,
+                              int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(double*, LayoutLeft, OpenMP, int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank2.cpp b/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank2.cpp
index 5add9e1a52..c4ac098abc 100644
--- a/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank2.cpp
+++ b/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank2.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,20 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double**,LayoutLeft,LayoutRight, OpenMP,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double**,LayoutLeft,LayoutLeft,  OpenMP,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double**,LayoutLeft,LayoutStride,OpenMP,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(double**,LayoutLeft,OpenMP,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double**, LayoutLeft, LayoutRight, OpenMP,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double**, LayoutLeft, LayoutLeft, OpenMP, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double**, LayoutLeft, LayoutStride, OpenMP,
+                              int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(double**, LayoutLeft, OpenMP, int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank3.cpp b/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank3.cpp
index 872f7be994..fc7cc30555 100644
--- a/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank3.cpp
+++ b/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank3.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double***,LayoutLeft,LayoutRight, OpenMP,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double***,LayoutLeft,LayoutLeft,  OpenMP,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double***,LayoutLeft,LayoutStride,OpenMP,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(double***,LayoutLeft,OpenMP,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double***, LayoutLeft, LayoutRight, OpenMP,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double***, LayoutLeft, LayoutLeft, OpenMP,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double***, LayoutLeft, LayoutStride, OpenMP,
+                              int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(double***, LayoutLeft, OpenMP, int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank4.cpp b/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank4.cpp
index 7ba7d7754b..f543baf688 100644
--- a/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank4.cpp
+++ b/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank4.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double****,LayoutLeft,LayoutRight, OpenMP,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double****,LayoutLeft,LayoutLeft,  OpenMP,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double****,LayoutLeft,LayoutStride,OpenMP,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(double****,LayoutLeft,OpenMP,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double****, LayoutLeft, LayoutRight, OpenMP,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double****, LayoutLeft, LayoutLeft, OpenMP,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double****, LayoutLeft, LayoutStride, OpenMP,
+                              int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(double****, LayoutLeft, OpenMP, int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank5.cpp b/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank5.cpp
index 26e79debff..6cff58e360 100644
--- a/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank5.cpp
+++ b/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank5.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*****,LayoutLeft,LayoutRight, OpenMP,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*****,LayoutLeft,LayoutLeft,  OpenMP,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*****,LayoutLeft,LayoutStride,OpenMP,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(double*****,LayoutLeft,OpenMP,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*****, LayoutLeft, LayoutRight, OpenMP,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*****, LayoutLeft, LayoutLeft, OpenMP,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*****, LayoutLeft, LayoutStride, OpenMP,
+                              int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(double*****, LayoutLeft, OpenMP, int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank8.cpp b/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank8.cpp
index 74ca13c3d5..30ae7d650b 100644
--- a/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank8.cpp
+++ b/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank8.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double********,LayoutLeft,LayoutRight, OpenMP,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double********,LayoutLeft,LayoutLeft,  OpenMP,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double********,LayoutLeft,LayoutStride,OpenMP,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(double********,LayoutLeft,OpenMP,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double********, LayoutLeft, LayoutRight, OpenMP,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double********, LayoutLeft, LayoutLeft, OpenMP,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double********, LayoutLeft, LayoutStride, OpenMP,
+                              int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(double********, LayoutLeft, OpenMP, int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_double_LayoutRight_Rank1.cpp b/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_double_LayoutRight_Rank1.cpp
index c5d354a5aa..343c09f220 100644
--- a/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_double_LayoutRight_Rank1.cpp
+++ b/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_double_LayoutRight_Rank1.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,20 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*,LayoutRight,LayoutRight, OpenMP,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*,LayoutRight,LayoutLeft,  OpenMP,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*,LayoutRight,LayoutStride,OpenMP,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(double*,LayoutRight,OpenMP,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*, LayoutRight, LayoutRight, OpenMP,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*, LayoutRight, LayoutLeft, OpenMP, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*, LayoutRight, LayoutStride, OpenMP,
+                              int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(double*, LayoutRight, OpenMP, int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_double_LayoutRight_Rank2.cpp b/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_double_LayoutRight_Rank2.cpp
index 6e60cb4778..ffe2971e59 100644
--- a/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_double_LayoutRight_Rank2.cpp
+++ b/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_double_LayoutRight_Rank2.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double**,LayoutRight,LayoutRight, OpenMP,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double**,LayoutRight,LayoutLeft,  OpenMP,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double**,LayoutRight,LayoutStride,OpenMP,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(double**,LayoutRight,OpenMP,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double**, LayoutRight, LayoutRight, OpenMP,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double**, LayoutRight, LayoutLeft, OpenMP,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double**, LayoutRight, LayoutStride, OpenMP,
+                              int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(double**, LayoutRight, OpenMP, int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_double_LayoutRight_Rank3.cpp b/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_double_LayoutRight_Rank3.cpp
index f26b9c3215..0e9a519c15 100644
--- a/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_double_LayoutRight_Rank3.cpp
+++ b/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_double_LayoutRight_Rank3.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double***,LayoutRight,LayoutRight, OpenMP,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double***,LayoutRight,LayoutLeft,  OpenMP,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double***,LayoutRight,LayoutStride,OpenMP,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(double***,LayoutRight,OpenMP,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double***, LayoutRight, LayoutRight, OpenMP,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double***, LayoutRight, LayoutLeft, OpenMP,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double***, LayoutRight, LayoutStride, OpenMP,
+                              int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(double***, LayoutRight, OpenMP, int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_double_LayoutRight_Rank4.cpp b/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_double_LayoutRight_Rank4.cpp
index 6da79e6fbd..cca76dac37 100644
--- a/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_double_LayoutRight_Rank4.cpp
+++ b/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_double_LayoutRight_Rank4.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double****,LayoutRight,LayoutRight, OpenMP,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double****,LayoutRight,LayoutLeft,  OpenMP,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double****,LayoutRight,LayoutStride,OpenMP,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(double****,LayoutRight,OpenMP,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double****, LayoutRight, LayoutRight, OpenMP,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double****, LayoutRight, LayoutLeft, OpenMP,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double****, LayoutRight, LayoutStride, OpenMP,
+                              int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(double****, LayoutRight, OpenMP, int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_double_LayoutRight_Rank5.cpp b/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_double_LayoutRight_Rank5.cpp
index 1b59813380..22a6f0492f 100644
--- a/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_double_LayoutRight_Rank5.cpp
+++ b/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_double_LayoutRight_Rank5.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*****,LayoutRight,LayoutRight, OpenMP,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*****,LayoutRight,LayoutLeft,  OpenMP,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*****,LayoutRight,LayoutStride,OpenMP,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(double*****,LayoutRight,OpenMP,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*****, LayoutRight, LayoutRight, OpenMP,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*****, LayoutRight, LayoutLeft, OpenMP,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*****, LayoutRight, LayoutStride, OpenMP,
+                              int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(double*****, LayoutRight, OpenMP, int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_double_LayoutRight_Rank8.cpp b/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_double_LayoutRight_Rank8.cpp
index dee5e70f5c..32f9b4ec98 100644
--- a/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_double_LayoutRight_Rank8.cpp
+++ b/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_double_LayoutRight_Rank8.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double********,LayoutRight,LayoutRight, OpenMP,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double********,LayoutRight,LayoutLeft,  OpenMP,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double********,LayoutRight,LayoutStride,OpenMP,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(double********,LayoutRight,OpenMP,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double********, LayoutRight, LayoutRight, OpenMP,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double********, LayoutRight, LayoutLeft, OpenMP,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double********, LayoutRight, LayoutStride, OpenMP,
+                              int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(double********, LayoutRight, OpenMP, int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_double_LayoutStride_Rank1.cpp b/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_double_LayoutStride_Rank1.cpp
index a70b77317d..9753469e51 100644
--- a/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_double_LayoutStride_Rank1.cpp
+++ b/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_double_LayoutStride_Rank1.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*,LayoutStride,LayoutRight, OpenMP,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*,LayoutStride,LayoutLeft,  OpenMP,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*,LayoutStride,LayoutStride,OpenMP,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(double*,LayoutStride,OpenMP,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*, LayoutStride, LayoutRight, OpenMP,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*, LayoutStride, LayoutLeft, OpenMP,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*, LayoutStride, LayoutStride, OpenMP,
+                              int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(double*, LayoutStride, OpenMP, int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_double_LayoutStride_Rank2.cpp b/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_double_LayoutStride_Rank2.cpp
index 5672c3bfd4..b0d5a3a7c7 100644
--- a/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_double_LayoutStride_Rank2.cpp
+++ b/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_double_LayoutStride_Rank2.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double**,LayoutStride,LayoutRight, OpenMP,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double**,LayoutStride,LayoutLeft,  OpenMP,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double**,LayoutStride,LayoutStride,OpenMP,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(double**,LayoutStride,OpenMP,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double**, LayoutStride, LayoutRight, OpenMP,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double**, LayoutStride, LayoutLeft, OpenMP,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double**, LayoutStride, LayoutStride, OpenMP,
+                              int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(double**, LayoutStride, OpenMP, int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_double_LayoutStride_Rank3.cpp b/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_double_LayoutStride_Rank3.cpp
index a2fbbbfa99..f1b981eac1 100644
--- a/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_double_LayoutStride_Rank3.cpp
+++ b/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_double_LayoutStride_Rank3.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double***,LayoutStride,LayoutRight, OpenMP,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double***,LayoutStride,LayoutLeft,  OpenMP,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double***,LayoutStride,LayoutStride,OpenMP,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(double***,LayoutStride,OpenMP,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double***, LayoutStride, LayoutRight, OpenMP,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double***, LayoutStride, LayoutLeft, OpenMP,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double***, LayoutStride, LayoutStride, OpenMP,
+                              int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(double***, LayoutStride, OpenMP, int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_double_LayoutStride_Rank4.cpp b/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_double_LayoutStride_Rank4.cpp
index 6c59e0db82..07ebe686a4 100644
--- a/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_double_LayoutStride_Rank4.cpp
+++ b/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_double_LayoutStride_Rank4.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double****,LayoutStride,LayoutRight, OpenMP,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double****,LayoutStride,LayoutLeft,  OpenMP,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double****,LayoutStride,LayoutStride,OpenMP,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(double****,LayoutStride,OpenMP,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double****, LayoutStride, LayoutRight, OpenMP,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double****, LayoutStride, LayoutLeft, OpenMP,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double****, LayoutStride, LayoutStride, OpenMP,
+                              int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(double****, LayoutStride, OpenMP, int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_double_LayoutStride_Rank5.cpp b/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_double_LayoutStride_Rank5.cpp
index a14620f853..1eefbc9b01 100644
--- a/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_double_LayoutStride_Rank5.cpp
+++ b/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_double_LayoutStride_Rank5.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*****,LayoutStride,LayoutRight, OpenMP,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*****,LayoutStride,LayoutLeft,  OpenMP,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*****,LayoutStride,LayoutStride,OpenMP,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(double*****,LayoutStride,OpenMP,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*****, LayoutStride, LayoutRight, OpenMP,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*****, LayoutStride, LayoutLeft, OpenMP,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*****, LayoutStride, LayoutStride, OpenMP,
+                              int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(double*****, LayoutStride, OpenMP, int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_double_LayoutStride_Rank8.cpp b/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_double_LayoutStride_Rank8.cpp
index e5f572bfaa..87a81639eb 100644
--- a/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_double_LayoutStride_Rank8.cpp
+++ b/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_double_LayoutStride_Rank8.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double********,LayoutStride,LayoutRight, OpenMP,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double********,LayoutStride,LayoutLeft,  OpenMP,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double********,LayoutStride,LayoutStride,OpenMP,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(double********,LayoutStride,OpenMP,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double********, LayoutStride, LayoutRight, OpenMP,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double********, LayoutStride, LayoutLeft, OpenMP,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double********, LayoutStride, LayoutStride,
+                              OpenMP, int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(double********, LayoutStride, OpenMP, int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank1.cpp b/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank1.cpp
index ee3e556a9c..401069942e 100644
--- a/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank1.cpp
+++ b/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank1.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,18 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*,LayoutLeft,LayoutRight, OpenMP,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*,LayoutLeft,LayoutLeft,  OpenMP,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*,LayoutLeft,LayoutStride,OpenMP,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(float*,LayoutLeft,OpenMP,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*, LayoutLeft, LayoutRight, OpenMP, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*, LayoutLeft, LayoutLeft, OpenMP, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*, LayoutLeft, LayoutStride, OpenMP, int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(float*, LayoutLeft, OpenMP, int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank2.cpp b/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank2.cpp
index 10e0846382..4e774bec23 100644
--- a/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank2.cpp
+++ b/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank2.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,19 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float**,LayoutLeft,LayoutRight, OpenMP,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float**,LayoutLeft,LayoutLeft,  OpenMP,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float**,LayoutLeft,LayoutStride,OpenMP,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(float**,LayoutLeft,OpenMP,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float**, LayoutLeft, LayoutRight, OpenMP, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float**, LayoutLeft, LayoutLeft, OpenMP, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float**, LayoutLeft, LayoutStride, OpenMP,
+                              int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(float**, LayoutLeft, OpenMP, int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank3.cpp b/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank3.cpp
index 5d607bd85e..1b3343dd23 100644
--- a/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank3.cpp
+++ b/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank3.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,20 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float***,LayoutLeft,LayoutRight, OpenMP,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float***,LayoutLeft,LayoutLeft,  OpenMP,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float***,LayoutLeft,LayoutStride,OpenMP,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(float***,LayoutLeft,OpenMP,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float***, LayoutLeft, LayoutRight, OpenMP,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float***, LayoutLeft, LayoutLeft, OpenMP, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float***, LayoutLeft, LayoutStride, OpenMP,
+                              int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(float***, LayoutLeft, OpenMP, int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank4.cpp b/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank4.cpp
index 07f8f5ede2..ad5421bb5e 100644
--- a/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank4.cpp
+++ b/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank4.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float****,LayoutLeft,LayoutRight, OpenMP,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float****,LayoutLeft,LayoutLeft,  OpenMP,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float****,LayoutLeft,LayoutStride,OpenMP,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(float****,LayoutLeft,OpenMP,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float****, LayoutLeft, LayoutRight, OpenMP,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float****, LayoutLeft, LayoutLeft, OpenMP,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float****, LayoutLeft, LayoutStride, OpenMP,
+                              int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(float****, LayoutLeft, OpenMP, int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank5.cpp b/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank5.cpp
index b0d148aca4..fde4689980 100644
--- a/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank5.cpp
+++ b/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank5.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*****,LayoutLeft,LayoutRight, OpenMP,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*****,LayoutLeft,LayoutLeft,  OpenMP,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*****,LayoutLeft,LayoutStride,OpenMP,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(float*****,LayoutLeft,OpenMP,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*****, LayoutLeft, LayoutRight, OpenMP,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*****, LayoutLeft, LayoutLeft, OpenMP,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*****, LayoutLeft, LayoutStride, OpenMP,
+                              int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(float*****, LayoutLeft, OpenMP, int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank8.cpp b/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank8.cpp
index b49698e1f4..9c1db701cc 100644
--- a/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank8.cpp
+++ b/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank8.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float********,LayoutLeft,LayoutRight, OpenMP,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float********,LayoutLeft,LayoutLeft,  OpenMP,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float********,LayoutLeft,LayoutStride,OpenMP,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(float********,LayoutLeft,OpenMP,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float********, LayoutLeft, LayoutRight, OpenMP,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float********, LayoutLeft, LayoutLeft, OpenMP,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float********, LayoutLeft, LayoutStride, OpenMP,
+                              int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(float********, LayoutLeft, OpenMP, int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_float_LayoutRight_Rank1.cpp b/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_float_LayoutRight_Rank1.cpp
index 2ea80d7c6e..2536abbed4 100644
--- a/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_float_LayoutRight_Rank1.cpp
+++ b/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_float_LayoutRight_Rank1.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,19 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*,LayoutRight,LayoutRight, OpenMP,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*,LayoutRight,LayoutLeft,  OpenMP,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*,LayoutRight,LayoutStride,OpenMP,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(float*,LayoutRight,OpenMP,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*, LayoutRight, LayoutRight, OpenMP, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*, LayoutRight, LayoutLeft, OpenMP, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*, LayoutRight, LayoutStride, OpenMP,
+                              int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(float*, LayoutRight, OpenMP, int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_float_LayoutRight_Rank2.cpp b/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_float_LayoutRight_Rank2.cpp
index a5b05c16ab..8ab48a4f7b 100644
--- a/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_float_LayoutRight_Rank2.cpp
+++ b/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_float_LayoutRight_Rank2.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,20 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float**,LayoutRight,LayoutRight, OpenMP,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float**,LayoutRight,LayoutLeft,  OpenMP,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float**,LayoutRight,LayoutStride,OpenMP,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(float**,LayoutRight,OpenMP,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float**, LayoutRight, LayoutRight, OpenMP,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float**, LayoutRight, LayoutLeft, OpenMP, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float**, LayoutRight, LayoutStride, OpenMP,
+                              int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(float**, LayoutRight, OpenMP, int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_float_LayoutRight_Rank3.cpp b/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_float_LayoutRight_Rank3.cpp
index f1c5ac6bfc..e4f8d40443 100644
--- a/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_float_LayoutRight_Rank3.cpp
+++ b/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_float_LayoutRight_Rank3.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float***,LayoutRight,LayoutRight, OpenMP,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float***,LayoutRight,LayoutLeft,  OpenMP,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float***,LayoutRight,LayoutStride,OpenMP,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(float***,LayoutRight,OpenMP,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float***, LayoutRight, LayoutRight, OpenMP,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float***, LayoutRight, LayoutLeft, OpenMP,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float***, LayoutRight, LayoutStride, OpenMP,
+                              int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(float***, LayoutRight, OpenMP, int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_float_LayoutRight_Rank4.cpp b/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_float_LayoutRight_Rank4.cpp
index 2330d73af0..cd482972a7 100644
--- a/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_float_LayoutRight_Rank4.cpp
+++ b/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_float_LayoutRight_Rank4.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float****,LayoutRight,LayoutRight, OpenMP,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float****,LayoutRight,LayoutLeft,  OpenMP,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float****,LayoutRight,LayoutStride,OpenMP,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(float****,LayoutRight,OpenMP,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float****, LayoutRight, LayoutRight, OpenMP,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float****, LayoutRight, LayoutLeft, OpenMP,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float****, LayoutRight, LayoutStride, OpenMP,
+                              int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(float****, LayoutRight, OpenMP, int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_float_LayoutRight_Rank5.cpp b/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_float_LayoutRight_Rank5.cpp
index 385f83dc38..fa7b6211fd 100644
--- a/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_float_LayoutRight_Rank5.cpp
+++ b/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_float_LayoutRight_Rank5.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*****,LayoutRight,LayoutRight, OpenMP,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*****,LayoutRight,LayoutLeft,  OpenMP,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*****,LayoutRight,LayoutStride,OpenMP,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(float*****,LayoutRight,OpenMP,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*****, LayoutRight, LayoutRight, OpenMP,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*****, LayoutRight, LayoutLeft, OpenMP,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*****, LayoutRight, LayoutStride, OpenMP,
+                              int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(float*****, LayoutRight, OpenMP, int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_float_LayoutRight_Rank8.cpp b/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_float_LayoutRight_Rank8.cpp
index 037fa3e04d..aeb191e8ca 100644
--- a/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_float_LayoutRight_Rank8.cpp
+++ b/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_float_LayoutRight_Rank8.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float********,LayoutRight,LayoutRight, OpenMP,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float********,LayoutRight,LayoutLeft,  OpenMP,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float********,LayoutRight,LayoutStride,OpenMP,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(float********,LayoutRight,OpenMP,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float********, LayoutRight, LayoutRight, OpenMP,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float********, LayoutRight, LayoutLeft, OpenMP,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float********, LayoutRight, LayoutStride, OpenMP,
+                              int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(float********, LayoutRight, OpenMP, int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_float_LayoutStride_Rank1.cpp b/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_float_LayoutStride_Rank1.cpp
index 1d826cba49..94ce1eba0a 100644
--- a/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_float_LayoutStride_Rank1.cpp
+++ b/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_float_LayoutStride_Rank1.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,20 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*,LayoutStride,LayoutRight, OpenMP,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*,LayoutStride,LayoutLeft,  OpenMP,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*,LayoutStride,LayoutStride,OpenMP,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(float*,LayoutStride,OpenMP,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*, LayoutStride, LayoutRight, OpenMP,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*, LayoutStride, LayoutLeft, OpenMP, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*, LayoutStride, LayoutStride, OpenMP,
+                              int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(float*, LayoutStride, OpenMP, int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_float_LayoutStride_Rank2.cpp b/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_float_LayoutStride_Rank2.cpp
index 15bcc2fa45..01c96b436f 100644
--- a/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_float_LayoutStride_Rank2.cpp
+++ b/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_float_LayoutStride_Rank2.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float**,LayoutStride,LayoutRight, OpenMP,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float**,LayoutStride,LayoutLeft,  OpenMP,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float**,LayoutStride,LayoutStride,OpenMP,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(float**,LayoutStride,OpenMP,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float**, LayoutStride, LayoutRight, OpenMP,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float**, LayoutStride, LayoutLeft, OpenMP,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float**, LayoutStride, LayoutStride, OpenMP,
+                              int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(float**, LayoutStride, OpenMP, int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_float_LayoutStride_Rank3.cpp b/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_float_LayoutStride_Rank3.cpp
index 459c413c8d..3067883b2d 100644
--- a/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_float_LayoutStride_Rank3.cpp
+++ b/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_float_LayoutStride_Rank3.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float***,LayoutStride,LayoutRight, OpenMP,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float***,LayoutStride,LayoutLeft,  OpenMP,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float***,LayoutStride,LayoutStride,OpenMP,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(float***,LayoutStride,OpenMP,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float***, LayoutStride, LayoutRight, OpenMP,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float***, LayoutStride, LayoutLeft, OpenMP,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float***, LayoutStride, LayoutStride, OpenMP,
+                              int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(float***, LayoutStride, OpenMP, int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_float_LayoutStride_Rank4.cpp b/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_float_LayoutStride_Rank4.cpp
index 22d8d66083..27ecf522ac 100644
--- a/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_float_LayoutStride_Rank4.cpp
+++ b/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_float_LayoutStride_Rank4.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float****,LayoutStride,LayoutRight, OpenMP,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float****,LayoutStride,LayoutLeft,  OpenMP,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float****,LayoutStride,LayoutStride,OpenMP,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(float****,LayoutStride,OpenMP,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float****, LayoutStride, LayoutRight, OpenMP,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float****, LayoutStride, LayoutLeft, OpenMP,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float****, LayoutStride, LayoutStride, OpenMP,
+                              int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(float****, LayoutStride, OpenMP, int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_float_LayoutStride_Rank5.cpp b/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_float_LayoutStride_Rank5.cpp
index 5a9e00d368..2925cbe447 100644
--- a/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_float_LayoutStride_Rank5.cpp
+++ b/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_float_LayoutStride_Rank5.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*****,LayoutStride,LayoutRight, OpenMP,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*****,LayoutStride,LayoutLeft,  OpenMP,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*****,LayoutStride,LayoutStride,OpenMP,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(float*****,LayoutStride,OpenMP,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*****, LayoutStride, LayoutRight, OpenMP,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*****, LayoutStride, LayoutLeft, OpenMP,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*****, LayoutStride, LayoutStride, OpenMP,
+                              int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(float*****, LayoutStride, OpenMP, int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_float_LayoutStride_Rank8.cpp b/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_float_LayoutStride_Rank8.cpp
index 5ceea42866..72672c5bb3 100644
--- a/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_float_LayoutStride_Rank8.cpp
+++ b/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_float_LayoutStride_Rank8.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float********,LayoutStride,LayoutRight, OpenMP,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float********,LayoutStride,LayoutLeft,  OpenMP,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float********,LayoutStride,LayoutStride,OpenMP,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(float********,LayoutStride,OpenMP,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float********, LayoutStride, LayoutRight, OpenMP,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float********, LayoutStride, LayoutLeft, OpenMP,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float********, LayoutStride, LayoutStride, OpenMP,
+                              int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(float********, LayoutStride, OpenMP, int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank1.cpp b/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank1.cpp
index 142871e3fd..d301592daa 100644
--- a/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank1.cpp
+++ b/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank1.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,20 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*,LayoutLeft,LayoutRight, OpenMP,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*,LayoutLeft,LayoutLeft,  OpenMP,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*,LayoutLeft,LayoutStride,OpenMP,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t*,LayoutLeft,OpenMP,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*, LayoutLeft, LayoutRight, OpenMP,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*, LayoutLeft, LayoutLeft, OpenMP, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*, LayoutLeft, LayoutStride, OpenMP,
+                              int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t*, LayoutLeft, OpenMP, int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank2.cpp b/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank2.cpp
index 0f6aaa9dfd..dca8eeb026 100644
--- a/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank2.cpp
+++ b/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank2.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t**,LayoutLeft,LayoutRight, OpenMP,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t**,LayoutLeft,LayoutLeft,  OpenMP,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t**,LayoutLeft,LayoutStride,OpenMP,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t**,LayoutLeft,OpenMP,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t**, LayoutLeft, LayoutRight, OpenMP,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t**, LayoutLeft, LayoutLeft, OpenMP,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t**, LayoutLeft, LayoutStride, OpenMP,
+                              int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t**, LayoutLeft, OpenMP, int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank3.cpp b/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank3.cpp
index 1e04899caa..832bbc0fef 100644
--- a/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank3.cpp
+++ b/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank3.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t***,LayoutLeft,LayoutRight, OpenMP,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t***,LayoutLeft,LayoutLeft,  OpenMP,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t***,LayoutLeft,LayoutStride,OpenMP,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t***,LayoutLeft,OpenMP,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t***, LayoutLeft, LayoutRight, OpenMP,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t***, LayoutLeft, LayoutLeft, OpenMP,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t***, LayoutLeft, LayoutStride, OpenMP,
+                              int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t***, LayoutLeft, OpenMP, int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank4.cpp b/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank4.cpp
index a5f5bb2442..45f9c22bc1 100644
--- a/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank4.cpp
+++ b/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank4.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t****,LayoutLeft,LayoutRight, OpenMP,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t****,LayoutLeft,LayoutLeft,  OpenMP,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t****,LayoutLeft,LayoutStride,OpenMP,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t****,LayoutLeft,OpenMP,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t****, LayoutLeft, LayoutRight, OpenMP,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t****, LayoutLeft, LayoutLeft, OpenMP,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t****, LayoutLeft, LayoutStride, OpenMP,
+                              int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t****, LayoutLeft, OpenMP, int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank5.cpp b/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank5.cpp
index 2175839952..7c8c5d80b7 100644
--- a/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank5.cpp
+++ b/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank5.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*****,LayoutLeft,LayoutRight, OpenMP,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*****,LayoutLeft,LayoutLeft,  OpenMP,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*****,LayoutLeft,LayoutStride,OpenMP,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t*****,LayoutLeft,OpenMP,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*****, LayoutLeft, LayoutRight, OpenMP,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*****, LayoutLeft, LayoutLeft, OpenMP,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*****, LayoutLeft, LayoutStride, OpenMP,
+                              int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t*****, LayoutLeft, OpenMP, int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank8.cpp b/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank8.cpp
index 9c71a7aa71..2fae74f591 100644
--- a/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank8.cpp
+++ b/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank8.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t********,LayoutLeft,LayoutRight, OpenMP,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t********,LayoutLeft,LayoutLeft,  OpenMP,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t********,LayoutLeft,LayoutStride,OpenMP,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t********,LayoutLeft,OpenMP,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t********, LayoutLeft, LayoutRight, OpenMP,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t********, LayoutLeft, LayoutLeft, OpenMP,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t********, LayoutLeft, LayoutStride, OpenMP,
+                              int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t********, LayoutLeft, OpenMP, int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank1.cpp b/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank1.cpp
index ac55873023..0523a6e286 100644
--- a/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank1.cpp
+++ b/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank1.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*,LayoutRight,LayoutRight, OpenMP,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*,LayoutRight,LayoutLeft,  OpenMP,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*,LayoutRight,LayoutStride,OpenMP,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t*,LayoutRight,OpenMP,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*, LayoutRight, LayoutRight, OpenMP,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*, LayoutRight, LayoutLeft, OpenMP,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*, LayoutRight, LayoutStride, OpenMP,
+                              int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t*, LayoutRight, OpenMP, int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank2.cpp b/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank2.cpp
index 40761d0ee7..24d667d7da 100644
--- a/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank2.cpp
+++ b/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank2.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t**,LayoutRight,LayoutRight, OpenMP,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t**,LayoutRight,LayoutLeft,  OpenMP,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t**,LayoutRight,LayoutStride,OpenMP,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t**,LayoutRight,OpenMP,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t**, LayoutRight, LayoutRight, OpenMP,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t**, LayoutRight, LayoutLeft, OpenMP,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t**, LayoutRight, LayoutStride, OpenMP,
+                              int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t**, LayoutRight, OpenMP, int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank3.cpp b/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank3.cpp
index e3d4243f10..599d8fc04d 100644
--- a/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank3.cpp
+++ b/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank3.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t***,LayoutRight,LayoutRight, OpenMP,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t***,LayoutRight,LayoutLeft,  OpenMP,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t***,LayoutRight,LayoutStride,OpenMP,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t***,LayoutRight,OpenMP,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t***, LayoutRight, LayoutRight, OpenMP,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t***, LayoutRight, LayoutLeft, OpenMP,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t***, LayoutRight, LayoutStride, OpenMP,
+                              int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t***, LayoutRight, OpenMP, int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank4.cpp b/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank4.cpp
index c2fcc2d5c3..2583f8d6e9 100644
--- a/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank4.cpp
+++ b/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank4.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t****,LayoutRight,LayoutRight, OpenMP,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t****,LayoutRight,LayoutLeft,  OpenMP,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t****,LayoutRight,LayoutStride,OpenMP,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t****,LayoutRight,OpenMP,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t****, LayoutRight, LayoutRight, OpenMP,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t****, LayoutRight, LayoutLeft, OpenMP,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t****, LayoutRight, LayoutStride, OpenMP,
+                              int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t****, LayoutRight, OpenMP, int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank5.cpp b/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank5.cpp
index 9b9ad45aeb..d9e1f774bc 100644
--- a/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank5.cpp
+++ b/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank5.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*****,LayoutRight,LayoutRight, OpenMP,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*****,LayoutRight,LayoutLeft,  OpenMP,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*****,LayoutRight,LayoutStride,OpenMP,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t*****,LayoutRight,OpenMP,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*****, LayoutRight, LayoutRight, OpenMP,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*****, LayoutRight, LayoutLeft, OpenMP,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*****, LayoutRight, LayoutStride, OpenMP,
+                              int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t*****, LayoutRight, OpenMP, int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank8.cpp b/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank8.cpp
index e28d0d9cf5..8376f1dd38 100644
--- a/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank8.cpp
+++ b/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank8.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t********,LayoutRight,LayoutRight, OpenMP,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t********,LayoutRight,LayoutLeft,  OpenMP,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t********,LayoutRight,LayoutStride,OpenMP,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t********,LayoutRight,OpenMP,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t********, LayoutRight, LayoutRight, OpenMP,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t********, LayoutRight, LayoutLeft, OpenMP,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t********, LayoutRight, LayoutStride,
+                              OpenMP, int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t********, LayoutRight, OpenMP, int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank1.cpp b/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank1.cpp
index c8f48fb8f8..2b21554c08 100644
--- a/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank1.cpp
+++ b/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank1.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*,LayoutStride,LayoutRight, OpenMP,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*,LayoutStride,LayoutLeft,  OpenMP,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*,LayoutStride,LayoutStride,OpenMP,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t*,LayoutStride,OpenMP,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*, LayoutStride, LayoutRight, OpenMP,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*, LayoutStride, LayoutLeft, OpenMP,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*, LayoutStride, LayoutStride, OpenMP,
+                              int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t*, LayoutStride, OpenMP, int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank2.cpp b/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank2.cpp
index 1c342bdff9..985e0be47c 100644
--- a/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank2.cpp
+++ b/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank2.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t**,LayoutStride,LayoutRight, OpenMP,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t**,LayoutStride,LayoutLeft,  OpenMP,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t**,LayoutStride,LayoutStride,OpenMP,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t**,LayoutStride,OpenMP,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t**, LayoutStride, LayoutRight, OpenMP,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t**, LayoutStride, LayoutLeft, OpenMP,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t**, LayoutStride, LayoutStride, OpenMP,
+                              int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t**, LayoutStride, OpenMP, int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank3.cpp b/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank3.cpp
index c7522a6798..f1e37a5c41 100644
--- a/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank3.cpp
+++ b/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank3.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t***,LayoutStride,LayoutRight, OpenMP,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t***,LayoutStride,LayoutLeft,  OpenMP,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t***,LayoutStride,LayoutStride,OpenMP,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t***,LayoutStride,OpenMP,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t***, LayoutStride, LayoutRight, OpenMP,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t***, LayoutStride, LayoutLeft, OpenMP,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t***, LayoutStride, LayoutStride, OpenMP,
+                              int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t***, LayoutStride, OpenMP, int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank4.cpp b/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank4.cpp
index 5c5edb4029..ea071ac108 100644
--- a/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank4.cpp
+++ b/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank4.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t****,LayoutStride,LayoutRight, OpenMP,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t****,LayoutStride,LayoutLeft,  OpenMP,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t****,LayoutStride,LayoutStride,OpenMP,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t****,LayoutStride,OpenMP,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t****, LayoutStride, LayoutRight, OpenMP,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t****, LayoutStride, LayoutLeft, OpenMP,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t****, LayoutStride, LayoutStride, OpenMP,
+                              int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t****, LayoutStride, OpenMP, int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank5.cpp b/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank5.cpp
index 40668b2772..ea2da28f10 100644
--- a/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank5.cpp
+++ b/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank5.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*****,LayoutStride,LayoutRight, OpenMP,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*****,LayoutStride,LayoutLeft,  OpenMP,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*****,LayoutStride,LayoutStride,OpenMP,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t*****,LayoutStride,OpenMP,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*****, LayoutStride, LayoutRight, OpenMP,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*****, LayoutStride, LayoutLeft, OpenMP,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*****, LayoutStride, LayoutStride, OpenMP,
+                              int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t*****, LayoutStride, OpenMP, int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank8.cpp b/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank8.cpp
index cf68ec98d9..bac3515894 100644
--- a/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank8.cpp
+++ b/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank8.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t********,LayoutStride,LayoutRight, OpenMP,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t********,LayoutStride,LayoutLeft,  OpenMP,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t********,LayoutStride,LayoutStride,OpenMP,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t********,LayoutStride,OpenMP,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t********, LayoutStride, LayoutRight,
+                              OpenMP, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t********, LayoutStride, LayoutLeft, OpenMP,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t********, LayoutStride, LayoutStride,
+                              OpenMP, int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t********, LayoutStride, OpenMP, int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank1.cpp b/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank1.cpp
index 8aec36b637..515812fb99 100644
--- a/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank1.cpp
+++ b/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank1.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,18 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*,LayoutLeft,LayoutRight, OpenMP,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*,LayoutLeft,LayoutLeft,  OpenMP,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*,LayoutLeft,LayoutStride,OpenMP,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int*,LayoutLeft,OpenMP,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*, LayoutLeft, LayoutRight, OpenMP, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*, LayoutLeft, LayoutLeft, OpenMP, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*, LayoutLeft, LayoutStride, OpenMP, int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int*, LayoutLeft, OpenMP, int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank2.cpp b/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank2.cpp
index eadaa8fef1..28ebc3505b 100644
--- a/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank2.cpp
+++ b/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank2.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,18 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int**,LayoutLeft,LayoutRight, OpenMP,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int**,LayoutLeft,LayoutLeft,  OpenMP,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int**,LayoutLeft,LayoutStride,OpenMP,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int**,LayoutLeft,OpenMP,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int**, LayoutLeft, LayoutRight, OpenMP, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int**, LayoutLeft, LayoutLeft, OpenMP, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int**, LayoutLeft, LayoutStride, OpenMP, int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int**, LayoutLeft, OpenMP, int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank3.cpp b/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank3.cpp
index c2568a8355..3bc9254b0e 100644
--- a/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank3.cpp
+++ b/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank3.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,18 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int***,LayoutLeft,LayoutRight, OpenMP,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int***,LayoutLeft,LayoutLeft,  OpenMP,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int***,LayoutLeft,LayoutStride,OpenMP,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int***,LayoutLeft,OpenMP,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int***, LayoutLeft, LayoutRight, OpenMP, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int***, LayoutLeft, LayoutLeft, OpenMP, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int***, LayoutLeft, LayoutStride, OpenMP, int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int***, LayoutLeft, OpenMP, int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank4.cpp b/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank4.cpp
index 7dab740e0e..dcba7deea3 100644
--- a/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank4.cpp
+++ b/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank4.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,19 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int****,LayoutLeft,LayoutRight, OpenMP,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int****,LayoutLeft,LayoutLeft,  OpenMP,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int****,LayoutLeft,LayoutStride,OpenMP,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int****,LayoutLeft,OpenMP,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int****, LayoutLeft, LayoutRight, OpenMP, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int****, LayoutLeft, LayoutLeft, OpenMP, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int****, LayoutLeft, LayoutStride, OpenMP,
+                              int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int****, LayoutLeft, OpenMP, int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank5.cpp b/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank5.cpp
index 1a7da65dac..9aba49991b 100644
--- a/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank5.cpp
+++ b/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank5.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,20 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*****,LayoutLeft,LayoutRight, OpenMP,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*****,LayoutLeft,LayoutLeft,  OpenMP,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*****,LayoutLeft,LayoutStride,OpenMP,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int*****,LayoutLeft,OpenMP,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*****, LayoutLeft, LayoutRight, OpenMP,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*****, LayoutLeft, LayoutLeft, OpenMP, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*****, LayoutLeft, LayoutStride, OpenMP,
+                              int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int*****, LayoutLeft, OpenMP, int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank8.cpp b/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank8.cpp
index 9853c143ef..98d7304444 100644
--- a/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank8.cpp
+++ b/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank8.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int********,LayoutLeft,LayoutRight, OpenMP,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int********,LayoutLeft,LayoutLeft,  OpenMP,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int********,LayoutLeft,LayoutStride,OpenMP,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int********,LayoutLeft,OpenMP,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int********, LayoutLeft, LayoutRight, OpenMP,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int********, LayoutLeft, LayoutLeft, OpenMP,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int********, LayoutLeft, LayoutStride, OpenMP,
+                              int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int********, LayoutLeft, OpenMP, int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int_LayoutRight_Rank1.cpp b/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int_LayoutRight_Rank1.cpp
index 215e893a7c..2179ba6558 100644
--- a/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int_LayoutRight_Rank1.cpp
+++ b/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int_LayoutRight_Rank1.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,18 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*,LayoutRight,LayoutRight, OpenMP,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*,LayoutRight,LayoutLeft,  OpenMP,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*,LayoutRight,LayoutStride,OpenMP,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int*,LayoutRight,OpenMP,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*, LayoutRight, LayoutRight, OpenMP, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*, LayoutRight, LayoutLeft, OpenMP, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*, LayoutRight, LayoutStride, OpenMP, int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int*, LayoutRight, OpenMP, int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int_LayoutRight_Rank2.cpp b/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int_LayoutRight_Rank2.cpp
index 427ab62f3c..b7eed148d8 100644
--- a/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int_LayoutRight_Rank2.cpp
+++ b/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int_LayoutRight_Rank2.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,18 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int**,LayoutRight,LayoutRight, OpenMP,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int**,LayoutRight,LayoutLeft,  OpenMP,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int**,LayoutRight,LayoutStride,OpenMP,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int**,LayoutRight,OpenMP,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int**, LayoutRight, LayoutRight, OpenMP, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int**, LayoutRight, LayoutLeft, OpenMP, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int**, LayoutRight, LayoutStride, OpenMP, int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int**, LayoutRight, OpenMP, int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int_LayoutRight_Rank3.cpp b/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int_LayoutRight_Rank3.cpp
index e90198ced4..58a2783218 100644
--- a/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int_LayoutRight_Rank3.cpp
+++ b/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int_LayoutRight_Rank3.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,19 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int***,LayoutRight,LayoutRight, OpenMP,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int***,LayoutRight,LayoutLeft,  OpenMP,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int***,LayoutRight,LayoutStride,OpenMP,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int***,LayoutRight,OpenMP,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int***, LayoutRight, LayoutRight, OpenMP, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int***, LayoutRight, LayoutLeft, OpenMP, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int***, LayoutRight, LayoutStride, OpenMP,
+                              int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int***, LayoutRight, OpenMP, int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int_LayoutRight_Rank4.cpp b/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int_LayoutRight_Rank4.cpp
index 0d474d03c2..7ed2bd0bd7 100644
--- a/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int_LayoutRight_Rank4.cpp
+++ b/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int_LayoutRight_Rank4.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,20 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int****,LayoutRight,LayoutRight, OpenMP,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int****,LayoutRight,LayoutLeft,  OpenMP,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int****,LayoutRight,LayoutStride,OpenMP,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int****,LayoutRight,OpenMP,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int****, LayoutRight, LayoutRight, OpenMP,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int****, LayoutRight, LayoutLeft, OpenMP, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int****, LayoutRight, LayoutStride, OpenMP,
+                              int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int****, LayoutRight, OpenMP, int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int_LayoutRight_Rank5.cpp b/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int_LayoutRight_Rank5.cpp
index 4415875ab2..0ba5edbc7c 100644
--- a/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int_LayoutRight_Rank5.cpp
+++ b/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int_LayoutRight_Rank5.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*****,LayoutRight,LayoutRight, OpenMP,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*****,LayoutRight,LayoutLeft,  OpenMP,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*****,LayoutRight,LayoutStride,OpenMP,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int*****,LayoutRight,OpenMP,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*****, LayoutRight, LayoutRight, OpenMP,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*****, LayoutRight, LayoutLeft, OpenMP,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*****, LayoutRight, LayoutStride, OpenMP,
+                              int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int*****, LayoutRight, OpenMP, int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int_LayoutRight_Rank8.cpp b/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int_LayoutRight_Rank8.cpp
index 75c5030556..acce37b794 100644
--- a/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int_LayoutRight_Rank8.cpp
+++ b/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int_LayoutRight_Rank8.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int********,LayoutRight,LayoutRight, OpenMP,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int********,LayoutRight,LayoutLeft,  OpenMP,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int********,LayoutRight,LayoutStride,OpenMP,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int********,LayoutRight,OpenMP,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int********, LayoutRight, LayoutRight, OpenMP,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int********, LayoutRight, LayoutLeft, OpenMP,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int********, LayoutRight, LayoutStride, OpenMP,
+                              int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int********, LayoutRight, OpenMP, int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int_LayoutStride_Rank1.cpp b/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int_LayoutStride_Rank1.cpp
index 92f5e2d187..83878113da 100644
--- a/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int_LayoutStride_Rank1.cpp
+++ b/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int_LayoutStride_Rank1.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,18 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*,LayoutStride,LayoutRight, OpenMP,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*,LayoutStride,LayoutLeft,  OpenMP,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*,LayoutStride,LayoutStride,OpenMP,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int*,LayoutStride,OpenMP,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*, LayoutStride, LayoutRight, OpenMP, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*, LayoutStride, LayoutLeft, OpenMP, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*, LayoutStride, LayoutStride, OpenMP, int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int*, LayoutStride, OpenMP, int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int_LayoutStride_Rank2.cpp b/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int_LayoutStride_Rank2.cpp
index f909e7e7de..fbbd5edd28 100644
--- a/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int_LayoutStride_Rank2.cpp
+++ b/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int_LayoutStride_Rank2.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,19 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int**,LayoutStride,LayoutRight, OpenMP,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int**,LayoutStride,LayoutLeft,  OpenMP,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int**,LayoutStride,LayoutStride,OpenMP,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int**,LayoutStride,OpenMP,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int**, LayoutStride, LayoutRight, OpenMP, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int**, LayoutStride, LayoutLeft, OpenMP, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int**, LayoutStride, LayoutStride, OpenMP,
+                              int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int**, LayoutStride, OpenMP, int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int_LayoutStride_Rank3.cpp b/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int_LayoutStride_Rank3.cpp
index 3d981ebd1b..f4b2364f64 100644
--- a/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int_LayoutStride_Rank3.cpp
+++ b/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int_LayoutStride_Rank3.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,20 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int***,LayoutStride,LayoutRight, OpenMP,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int***,LayoutStride,LayoutLeft,  OpenMP,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int***,LayoutStride,LayoutStride,OpenMP,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int***,LayoutStride,OpenMP,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int***, LayoutStride, LayoutRight, OpenMP,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int***, LayoutStride, LayoutLeft, OpenMP, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int***, LayoutStride, LayoutStride, OpenMP,
+                              int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int***, LayoutStride, OpenMP, int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int_LayoutStride_Rank4.cpp b/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int_LayoutStride_Rank4.cpp
index 915c66f679..df6db05a88 100644
--- a/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int_LayoutStride_Rank4.cpp
+++ b/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int_LayoutStride_Rank4.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int****,LayoutStride,LayoutRight, OpenMP,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int****,LayoutStride,LayoutLeft,  OpenMP,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int****,LayoutStride,LayoutStride,OpenMP,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int****,LayoutStride,OpenMP,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int****, LayoutStride, LayoutRight, OpenMP,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int****, LayoutStride, LayoutLeft, OpenMP,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int****, LayoutStride, LayoutStride, OpenMP,
+                              int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int****, LayoutStride, OpenMP, int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int_LayoutStride_Rank5.cpp b/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int_LayoutStride_Rank5.cpp
index b70f09fb1e..14acf8fb29 100644
--- a/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int_LayoutStride_Rank5.cpp
+++ b/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int_LayoutStride_Rank5.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*****,LayoutStride,LayoutRight, OpenMP,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*****,LayoutStride,LayoutLeft,  OpenMP,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*****,LayoutStride,LayoutStride,OpenMP,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int*****,LayoutStride,OpenMP,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*****, LayoutStride, LayoutRight, OpenMP,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*****, LayoutStride, LayoutLeft, OpenMP,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*****, LayoutStride, LayoutStride, OpenMP,
+                              int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int*****, LayoutStride, OpenMP, int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int_LayoutStride_Rank8.cpp b/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int_LayoutStride_Rank8.cpp
index 26f3cef1b6..1984598a27 100644
--- a/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int_LayoutStride_Rank8.cpp
+++ b/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int_LayoutStride_Rank8.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int********,LayoutStride,LayoutRight, OpenMP,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int********,LayoutStride,LayoutLeft,  OpenMP,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int********,LayoutStride,LayoutStride,OpenMP,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int********,LayoutStride,OpenMP,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int********, LayoutStride, LayoutRight, OpenMP,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int********, LayoutStride, LayoutLeft, OpenMP,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int********, LayoutStride, LayoutStride, OpenMP,
+                              int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int********, LayoutStride, OpenMP, int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_double_LayoutLeft_Rank1.cpp b/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_double_LayoutLeft_Rank1.cpp
index 7e6941fb21..9879802650 100644
--- a/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_double_LayoutLeft_Rank1.cpp
+++ b/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_double_LayoutLeft_Rank1.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,18 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*,LayoutLeft,LayoutRight, OpenMP,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*,LayoutLeft,LayoutLeft,  OpenMP,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*,LayoutLeft,LayoutStride,OpenMP,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(double*,LayoutLeft,OpenMP,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*, LayoutLeft, LayoutRight, OpenMP, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*, LayoutLeft, LayoutLeft, OpenMP, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*, LayoutLeft, LayoutStride, OpenMP, int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(double*, LayoutLeft, OpenMP, int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_double_LayoutLeft_Rank2.cpp b/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_double_LayoutLeft_Rank2.cpp
index 827c566ddd..1283f14a69 100644
--- a/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_double_LayoutLeft_Rank2.cpp
+++ b/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_double_LayoutLeft_Rank2.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,18 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double**,LayoutLeft,LayoutRight, OpenMP,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double**,LayoutLeft,LayoutLeft,  OpenMP,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double**,LayoutLeft,LayoutStride,OpenMP,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(double**,LayoutLeft,OpenMP,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double**, LayoutLeft, LayoutRight, OpenMP, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double**, LayoutLeft, LayoutLeft, OpenMP, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double**, LayoutLeft, LayoutStride, OpenMP, int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(double**, LayoutLeft, OpenMP, int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_double_LayoutLeft_Rank3.cpp b/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_double_LayoutLeft_Rank3.cpp
index 5c096e04e8..3addc9913f 100644
--- a/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_double_LayoutLeft_Rank3.cpp
+++ b/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_double_LayoutLeft_Rank3.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,18 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double***,LayoutLeft,LayoutRight, OpenMP,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double***,LayoutLeft,LayoutLeft,  OpenMP,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double***,LayoutLeft,LayoutStride,OpenMP,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(double***,LayoutLeft,OpenMP,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double***, LayoutLeft, LayoutRight, OpenMP, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double***, LayoutLeft, LayoutLeft, OpenMP, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double***, LayoutLeft, LayoutStride, OpenMP, int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(double***, LayoutLeft, OpenMP, int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_double_LayoutLeft_Rank4.cpp b/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_double_LayoutLeft_Rank4.cpp
index adc432d50b..25336a754a 100644
--- a/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_double_LayoutLeft_Rank4.cpp
+++ b/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_double_LayoutLeft_Rank4.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,18 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double****,LayoutLeft,LayoutRight, OpenMP,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double****,LayoutLeft,LayoutLeft,  OpenMP,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double****,LayoutLeft,LayoutStride,OpenMP,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(double****,LayoutLeft,OpenMP,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double****, LayoutLeft, LayoutRight, OpenMP, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double****, LayoutLeft, LayoutLeft, OpenMP, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double****, LayoutLeft, LayoutStride, OpenMP, int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(double****, LayoutLeft, OpenMP, int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_double_LayoutLeft_Rank5.cpp b/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_double_LayoutLeft_Rank5.cpp
index 3b1024f4d8..b4cca86620 100644
--- a/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_double_LayoutLeft_Rank5.cpp
+++ b/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_double_LayoutLeft_Rank5.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,19 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*****,LayoutLeft,LayoutRight, OpenMP,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*****,LayoutLeft,LayoutLeft,  OpenMP,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*****,LayoutLeft,LayoutStride,OpenMP,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(double*****,LayoutLeft,OpenMP,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*****, LayoutLeft, LayoutRight, OpenMP, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*****, LayoutLeft, LayoutLeft, OpenMP, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*****, LayoutLeft, LayoutStride, OpenMP,
+                              int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(double*****, LayoutLeft, OpenMP, int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_double_LayoutLeft_Rank8.cpp b/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_double_LayoutLeft_Rank8.cpp
index d3155f4ec1..ffe81fbff7 100644
--- a/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_double_LayoutLeft_Rank8.cpp
+++ b/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_double_LayoutLeft_Rank8.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double********,LayoutLeft,LayoutRight, OpenMP,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double********,LayoutLeft,LayoutLeft,  OpenMP,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double********,LayoutLeft,LayoutStride,OpenMP,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(double********,LayoutLeft,OpenMP,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double********, LayoutLeft, LayoutRight, OpenMP,
+                              int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double********, LayoutLeft, LayoutLeft, OpenMP,
+                              int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double********, LayoutLeft, LayoutStride, OpenMP,
+                              int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(double********, LayoutLeft, OpenMP, int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_double_LayoutRight_Rank1.cpp b/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_double_LayoutRight_Rank1.cpp
index 3280fd5176..7bb38884bc 100644
--- a/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_double_LayoutRight_Rank1.cpp
+++ b/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_double_LayoutRight_Rank1.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,18 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*,LayoutRight,LayoutRight, OpenMP,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*,LayoutRight,LayoutLeft,  OpenMP,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*,LayoutRight,LayoutStride,OpenMP,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(double*,LayoutRight,OpenMP,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*, LayoutRight, LayoutRight, OpenMP, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*, LayoutRight, LayoutLeft, OpenMP, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*, LayoutRight, LayoutStride, OpenMP, int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(double*, LayoutRight, OpenMP, int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_double_LayoutRight_Rank2.cpp b/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_double_LayoutRight_Rank2.cpp
index 99fde6b9a8..f99f79e4fc 100644
--- a/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_double_LayoutRight_Rank2.cpp
+++ b/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_double_LayoutRight_Rank2.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,18 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double**,LayoutRight,LayoutRight, OpenMP,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double**,LayoutRight,LayoutLeft,  OpenMP,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double**,LayoutRight,LayoutStride,OpenMP,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(double**,LayoutRight,OpenMP,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double**, LayoutRight, LayoutRight, OpenMP, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double**, LayoutRight, LayoutLeft, OpenMP, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double**, LayoutRight, LayoutStride, OpenMP, int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(double**, LayoutRight, OpenMP, int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_double_LayoutRight_Rank3.cpp b/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_double_LayoutRight_Rank3.cpp
index 2fe8423e94..cedc1d9014 100644
--- a/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_double_LayoutRight_Rank3.cpp
+++ b/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_double_LayoutRight_Rank3.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,18 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double***,LayoutRight,LayoutRight, OpenMP,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double***,LayoutRight,LayoutLeft,  OpenMP,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double***,LayoutRight,LayoutStride,OpenMP,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(double***,LayoutRight,OpenMP,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double***, LayoutRight, LayoutRight, OpenMP, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double***, LayoutRight, LayoutLeft, OpenMP, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double***, LayoutRight, LayoutStride, OpenMP, int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(double***, LayoutRight, OpenMP, int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_double_LayoutRight_Rank4.cpp b/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_double_LayoutRight_Rank4.cpp
index 8a71683a76..2e101591d1 100644
--- a/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_double_LayoutRight_Rank4.cpp
+++ b/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_double_LayoutRight_Rank4.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,19 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double****,LayoutRight,LayoutRight, OpenMP,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double****,LayoutRight,LayoutLeft,  OpenMP,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double****,LayoutRight,LayoutStride,OpenMP,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(double****,LayoutRight,OpenMP,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double****, LayoutRight, LayoutRight, OpenMP, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double****, LayoutRight, LayoutLeft, OpenMP, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double****, LayoutRight, LayoutStride, OpenMP,
+                              int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(double****, LayoutRight, OpenMP, int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_double_LayoutRight_Rank5.cpp b/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_double_LayoutRight_Rank5.cpp
index 7d1b1c9852..6451611b6f 100644
--- a/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_double_LayoutRight_Rank5.cpp
+++ b/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_double_LayoutRight_Rank5.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,20 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*****,LayoutRight,LayoutRight, OpenMP,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*****,LayoutRight,LayoutLeft,  OpenMP,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*****,LayoutRight,LayoutStride,OpenMP,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(double*****,LayoutRight,OpenMP,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*****, LayoutRight, LayoutRight, OpenMP,
+                              int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*****, LayoutRight, LayoutLeft, OpenMP, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*****, LayoutRight, LayoutStride, OpenMP,
+                              int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(double*****, LayoutRight, OpenMP, int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_double_LayoutRight_Rank8.cpp b/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_double_LayoutRight_Rank8.cpp
index abe4191dd7..0898be20e1 100644
--- a/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_double_LayoutRight_Rank8.cpp
+++ b/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_double_LayoutRight_Rank8.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double********,LayoutRight,LayoutRight, OpenMP,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double********,LayoutRight,LayoutLeft,  OpenMP,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double********,LayoutRight,LayoutStride,OpenMP,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(double********,LayoutRight,OpenMP,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double********, LayoutRight, LayoutRight, OpenMP,
+                              int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double********, LayoutRight, LayoutLeft, OpenMP,
+                              int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double********, LayoutRight, LayoutStride, OpenMP,
+                              int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(double********, LayoutRight, OpenMP, int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_double_LayoutStride_Rank1.cpp b/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_double_LayoutStride_Rank1.cpp
index 856cfa2970..5dc7d5cdde 100644
--- a/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_double_LayoutStride_Rank1.cpp
+++ b/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_double_LayoutStride_Rank1.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,18 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*,LayoutStride,LayoutRight, OpenMP,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*,LayoutStride,LayoutLeft,  OpenMP,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*,LayoutStride,LayoutStride,OpenMP,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(double*,LayoutStride,OpenMP,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*, LayoutStride, LayoutRight, OpenMP, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*, LayoutStride, LayoutLeft, OpenMP, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*, LayoutStride, LayoutStride, OpenMP, int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(double*, LayoutStride, OpenMP, int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_double_LayoutStride_Rank2.cpp b/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_double_LayoutStride_Rank2.cpp
index ccbde7277a..dc3c00d42f 100644
--- a/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_double_LayoutStride_Rank2.cpp
+++ b/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_double_LayoutStride_Rank2.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,18 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double**,LayoutStride,LayoutRight, OpenMP,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double**,LayoutStride,LayoutLeft,  OpenMP,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double**,LayoutStride,LayoutStride,OpenMP,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(double**,LayoutStride,OpenMP,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double**, LayoutStride, LayoutRight, OpenMP, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double**, LayoutStride, LayoutLeft, OpenMP, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double**, LayoutStride, LayoutStride, OpenMP, int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(double**, LayoutStride, OpenMP, int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_double_LayoutStride_Rank3.cpp b/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_double_LayoutStride_Rank3.cpp
index 02d4b58684..52b94e91e4 100644
--- a/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_double_LayoutStride_Rank3.cpp
+++ b/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_double_LayoutStride_Rank3.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,19 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double***,LayoutStride,LayoutRight, OpenMP,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double***,LayoutStride,LayoutLeft,  OpenMP,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double***,LayoutStride,LayoutStride,OpenMP,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(double***,LayoutStride,OpenMP,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double***, LayoutStride, LayoutRight, OpenMP, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double***, LayoutStride, LayoutLeft, OpenMP, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double***, LayoutStride, LayoutStride, OpenMP,
+                              int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(double***, LayoutStride, OpenMP, int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_double_LayoutStride_Rank4.cpp b/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_double_LayoutStride_Rank4.cpp
index 4d8bd3bf5b..3d1359bbfa 100644
--- a/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_double_LayoutStride_Rank4.cpp
+++ b/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_double_LayoutStride_Rank4.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,20 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double****,LayoutStride,LayoutRight, OpenMP,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double****,LayoutStride,LayoutLeft,  OpenMP,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double****,LayoutStride,LayoutStride,OpenMP,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(double****,LayoutStride,OpenMP,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double****, LayoutStride, LayoutRight, OpenMP,
+                              int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double****, LayoutStride, LayoutLeft, OpenMP, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double****, LayoutStride, LayoutStride, OpenMP,
+                              int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(double****, LayoutStride, OpenMP, int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_double_LayoutStride_Rank5.cpp b/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_double_LayoutStride_Rank5.cpp
index 5725e9e40b..54ac13a756 100644
--- a/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_double_LayoutStride_Rank5.cpp
+++ b/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_double_LayoutStride_Rank5.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*****,LayoutStride,LayoutRight, OpenMP,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*****,LayoutStride,LayoutLeft,  OpenMP,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*****,LayoutStride,LayoutStride,OpenMP,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(double*****,LayoutStride,OpenMP,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*****, LayoutStride, LayoutRight, OpenMP,
+                              int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*****, LayoutStride, LayoutLeft, OpenMP,
+                              int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*****, LayoutStride, LayoutStride, OpenMP,
+                              int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(double*****, LayoutStride, OpenMP, int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_double_LayoutStride_Rank8.cpp b/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_double_LayoutStride_Rank8.cpp
index 0de142dcb9..8a1e508923 100644
--- a/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_double_LayoutStride_Rank8.cpp
+++ b/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_double_LayoutStride_Rank8.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double********,LayoutStride,LayoutRight, OpenMP,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double********,LayoutStride,LayoutLeft,  OpenMP,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double********,LayoutStride,LayoutStride,OpenMP,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(double********,LayoutStride,OpenMP,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double********, LayoutStride, LayoutRight, OpenMP,
+                              int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double********, LayoutStride, LayoutLeft, OpenMP,
+                              int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double********, LayoutStride, LayoutStride,
+                              OpenMP, int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(double********, LayoutStride, OpenMP, int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_float_LayoutLeft_Rank1.cpp b/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_float_LayoutLeft_Rank1.cpp
index 6b9bb2c62f..f585a68331 100644
--- a/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_float_LayoutLeft_Rank1.cpp
+++ b/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_float_LayoutLeft_Rank1.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,18 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*,LayoutLeft,LayoutRight, OpenMP,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*,LayoutLeft,LayoutLeft,  OpenMP,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*,LayoutLeft,LayoutStride,OpenMP,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(float*,LayoutLeft,OpenMP,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*, LayoutLeft, LayoutRight, OpenMP, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*, LayoutLeft, LayoutLeft, OpenMP, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*, LayoutLeft, LayoutStride, OpenMP, int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(float*, LayoutLeft, OpenMP, int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_float_LayoutLeft_Rank2.cpp b/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_float_LayoutLeft_Rank2.cpp
index e3cf04bdad..f3943c7c63 100644
--- a/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_float_LayoutLeft_Rank2.cpp
+++ b/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_float_LayoutLeft_Rank2.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,18 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float**,LayoutLeft,LayoutRight, OpenMP,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float**,LayoutLeft,LayoutLeft,  OpenMP,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float**,LayoutLeft,LayoutStride,OpenMP,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(float**,LayoutLeft,OpenMP,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float**, LayoutLeft, LayoutRight, OpenMP, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float**, LayoutLeft, LayoutLeft, OpenMP, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float**, LayoutLeft, LayoutStride, OpenMP, int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(float**, LayoutLeft, OpenMP, int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_float_LayoutLeft_Rank3.cpp b/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_float_LayoutLeft_Rank3.cpp
index fa809bb923..ab16463a37 100644
--- a/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_float_LayoutLeft_Rank3.cpp
+++ b/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_float_LayoutLeft_Rank3.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,18 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float***,LayoutLeft,LayoutRight, OpenMP,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float***,LayoutLeft,LayoutLeft,  OpenMP,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float***,LayoutLeft,LayoutStride,OpenMP,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(float***,LayoutLeft,OpenMP,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float***, LayoutLeft, LayoutRight, OpenMP, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float***, LayoutLeft, LayoutLeft, OpenMP, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float***, LayoutLeft, LayoutStride, OpenMP, int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(float***, LayoutLeft, OpenMP, int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_float_LayoutLeft_Rank4.cpp b/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_float_LayoutLeft_Rank4.cpp
index c6eb82a2d8..3adbfa6aae 100644
--- a/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_float_LayoutLeft_Rank4.cpp
+++ b/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_float_LayoutLeft_Rank4.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,18 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float****,LayoutLeft,LayoutRight, OpenMP,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float****,LayoutLeft,LayoutLeft,  OpenMP,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float****,LayoutLeft,LayoutStride,OpenMP,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(float****,LayoutLeft,OpenMP,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float****, LayoutLeft, LayoutRight, OpenMP, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float****, LayoutLeft, LayoutLeft, OpenMP, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float****, LayoutLeft, LayoutStride, OpenMP, int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(float****, LayoutLeft, OpenMP, int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_float_LayoutLeft_Rank5.cpp b/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_float_LayoutLeft_Rank5.cpp
index ed7a5a0acc..32e317e02c 100644
--- a/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_float_LayoutLeft_Rank5.cpp
+++ b/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_float_LayoutLeft_Rank5.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,18 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*****,LayoutLeft,LayoutRight, OpenMP,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*****,LayoutLeft,LayoutLeft,  OpenMP,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*****,LayoutLeft,LayoutStride,OpenMP,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(float*****,LayoutLeft,OpenMP,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*****, LayoutLeft, LayoutRight, OpenMP, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*****, LayoutLeft, LayoutLeft, OpenMP, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*****, LayoutLeft, LayoutStride, OpenMP, int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(float*****, LayoutLeft, OpenMP, int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_float_LayoutLeft_Rank8.cpp b/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_float_LayoutLeft_Rank8.cpp
index 93bc0f2382..9a6bf70c92 100644
--- a/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_float_LayoutLeft_Rank8.cpp
+++ b/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_float_LayoutLeft_Rank8.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float********,LayoutLeft,LayoutRight, OpenMP,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float********,LayoutLeft,LayoutLeft,  OpenMP,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float********,LayoutLeft,LayoutStride,OpenMP,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(float********,LayoutLeft,OpenMP,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float********, LayoutLeft, LayoutRight, OpenMP,
+                              int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float********, LayoutLeft, LayoutLeft, OpenMP,
+                              int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float********, LayoutLeft, LayoutStride, OpenMP,
+                              int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(float********, LayoutLeft, OpenMP, int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_float_LayoutRight_Rank1.cpp b/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_float_LayoutRight_Rank1.cpp
index 649b2dfcda..a081f46d43 100644
--- a/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_float_LayoutRight_Rank1.cpp
+++ b/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_float_LayoutRight_Rank1.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,18 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*,LayoutRight,LayoutRight, OpenMP,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*,LayoutRight,LayoutLeft,  OpenMP,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*,LayoutRight,LayoutStride,OpenMP,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(float*,LayoutRight,OpenMP,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*, LayoutRight, LayoutRight, OpenMP, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*, LayoutRight, LayoutLeft, OpenMP, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*, LayoutRight, LayoutStride, OpenMP, int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(float*, LayoutRight, OpenMP, int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_float_LayoutRight_Rank2.cpp b/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_float_LayoutRight_Rank2.cpp
index 0cf7acdc74..7175be7bf9 100644
--- a/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_float_LayoutRight_Rank2.cpp
+++ b/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_float_LayoutRight_Rank2.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,18 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float**,LayoutRight,LayoutRight, OpenMP,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float**,LayoutRight,LayoutLeft,  OpenMP,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float**,LayoutRight,LayoutStride,OpenMP,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(float**,LayoutRight,OpenMP,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float**, LayoutRight, LayoutRight, OpenMP, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float**, LayoutRight, LayoutLeft, OpenMP, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float**, LayoutRight, LayoutStride, OpenMP, int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(float**, LayoutRight, OpenMP, int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_float_LayoutRight_Rank3.cpp b/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_float_LayoutRight_Rank3.cpp
index 8f295b3096..6ad8503302 100644
--- a/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_float_LayoutRight_Rank3.cpp
+++ b/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_float_LayoutRight_Rank3.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,18 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float***,LayoutRight,LayoutRight, OpenMP,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float***,LayoutRight,LayoutLeft,  OpenMP,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float***,LayoutRight,LayoutStride,OpenMP,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(float***,LayoutRight,OpenMP,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float***, LayoutRight, LayoutRight, OpenMP, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float***, LayoutRight, LayoutLeft, OpenMP, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float***, LayoutRight, LayoutStride, OpenMP, int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(float***, LayoutRight, OpenMP, int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_float_LayoutRight_Rank4.cpp b/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_float_LayoutRight_Rank4.cpp
index 1de10ea418..6af17f7c3e 100644
--- a/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_float_LayoutRight_Rank4.cpp
+++ b/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_float_LayoutRight_Rank4.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,18 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float****,LayoutRight,LayoutRight, OpenMP,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float****,LayoutRight,LayoutLeft,  OpenMP,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float****,LayoutRight,LayoutStride,OpenMP,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(float****,LayoutRight,OpenMP,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float****, LayoutRight, LayoutRight, OpenMP, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float****, LayoutRight, LayoutLeft, OpenMP, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float****, LayoutRight, LayoutStride, OpenMP, int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(float****, LayoutRight, OpenMP, int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_float_LayoutRight_Rank5.cpp b/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_float_LayoutRight_Rank5.cpp
index 0836b053eb..269785fa7e 100644
--- a/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_float_LayoutRight_Rank5.cpp
+++ b/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_float_LayoutRight_Rank5.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,19 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*****,LayoutRight,LayoutRight, OpenMP,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*****,LayoutRight,LayoutLeft,  OpenMP,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*****,LayoutRight,LayoutStride,OpenMP,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(float*****,LayoutRight,OpenMP,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*****, LayoutRight, LayoutRight, OpenMP, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*****, LayoutRight, LayoutLeft, OpenMP, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*****, LayoutRight, LayoutStride, OpenMP,
+                              int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(float*****, LayoutRight, OpenMP, int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_float_LayoutRight_Rank8.cpp b/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_float_LayoutRight_Rank8.cpp
index e09f777c45..a3469972de 100644
--- a/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_float_LayoutRight_Rank8.cpp
+++ b/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_float_LayoutRight_Rank8.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float********,LayoutRight,LayoutRight, OpenMP,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float********,LayoutRight,LayoutLeft,  OpenMP,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float********,LayoutRight,LayoutStride,OpenMP,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(float********,LayoutRight,OpenMP,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float********, LayoutRight, LayoutRight, OpenMP,
+                              int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float********, LayoutRight, LayoutLeft, OpenMP,
+                              int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float********, LayoutRight, LayoutStride, OpenMP,
+                              int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(float********, LayoutRight, OpenMP, int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_float_LayoutStride_Rank1.cpp b/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_float_LayoutStride_Rank1.cpp
index d6d00b9ed6..d3064fd97f 100644
--- a/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_float_LayoutStride_Rank1.cpp
+++ b/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_float_LayoutStride_Rank1.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,18 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*,LayoutStride,LayoutRight, OpenMP,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*,LayoutStride,LayoutLeft,  OpenMP,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*,LayoutStride,LayoutStride,OpenMP,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(float*,LayoutStride,OpenMP,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*, LayoutStride, LayoutRight, OpenMP, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*, LayoutStride, LayoutLeft, OpenMP, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*, LayoutStride, LayoutStride, OpenMP, int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(float*, LayoutStride, OpenMP, int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_float_LayoutStride_Rank2.cpp b/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_float_LayoutStride_Rank2.cpp
index f97ec63371..5ae8d47620 100644
--- a/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_float_LayoutStride_Rank2.cpp
+++ b/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_float_LayoutStride_Rank2.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,18 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float**,LayoutStride,LayoutRight, OpenMP,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float**,LayoutStride,LayoutLeft,  OpenMP,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float**,LayoutStride,LayoutStride,OpenMP,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(float**,LayoutStride,OpenMP,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float**, LayoutStride, LayoutRight, OpenMP, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float**, LayoutStride, LayoutLeft, OpenMP, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float**, LayoutStride, LayoutStride, OpenMP, int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(float**, LayoutStride, OpenMP, int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_float_LayoutStride_Rank3.cpp b/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_float_LayoutStride_Rank3.cpp
index 172918f0ee..f7b3a5db87 100644
--- a/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_float_LayoutStride_Rank3.cpp
+++ b/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_float_LayoutStride_Rank3.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,18 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float***,LayoutStride,LayoutRight, OpenMP,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float***,LayoutStride,LayoutLeft,  OpenMP,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float***,LayoutStride,LayoutStride,OpenMP,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(float***,LayoutStride,OpenMP,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float***, LayoutStride, LayoutRight, OpenMP, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float***, LayoutStride, LayoutLeft, OpenMP, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float***, LayoutStride, LayoutStride, OpenMP, int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(float***, LayoutStride, OpenMP, int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_float_LayoutStride_Rank4.cpp b/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_float_LayoutStride_Rank4.cpp
index 7f56ad95ce..d36d2d27c6 100644
--- a/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_float_LayoutStride_Rank4.cpp
+++ b/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_float_LayoutStride_Rank4.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,19 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float****,LayoutStride,LayoutRight, OpenMP,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float****,LayoutStride,LayoutLeft,  OpenMP,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float****,LayoutStride,LayoutStride,OpenMP,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(float****,LayoutStride,OpenMP,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float****, LayoutStride, LayoutRight, OpenMP, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float****, LayoutStride, LayoutLeft, OpenMP, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float****, LayoutStride, LayoutStride, OpenMP,
+                              int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(float****, LayoutStride, OpenMP, int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_float_LayoutStride_Rank5.cpp b/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_float_LayoutStride_Rank5.cpp
index fd389ee1c1..6a88b0b8ea 100644
--- a/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_float_LayoutStride_Rank5.cpp
+++ b/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_float_LayoutStride_Rank5.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,20 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*****,LayoutStride,LayoutRight, OpenMP,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*****,LayoutStride,LayoutLeft,  OpenMP,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*****,LayoutStride,LayoutStride,OpenMP,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(float*****,LayoutStride,OpenMP,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*****, LayoutStride, LayoutRight, OpenMP,
+                              int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*****, LayoutStride, LayoutLeft, OpenMP, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*****, LayoutStride, LayoutStride, OpenMP,
+                              int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(float*****, LayoutStride, OpenMP, int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_float_LayoutStride_Rank8.cpp b/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_float_LayoutStride_Rank8.cpp
index c6faf10cab..ec459f1bbf 100644
--- a/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_float_LayoutStride_Rank8.cpp
+++ b/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_float_LayoutStride_Rank8.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float********,LayoutStride,LayoutRight, OpenMP,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float********,LayoutStride,LayoutLeft,  OpenMP,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float********,LayoutStride,LayoutStride,OpenMP,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(float********,LayoutStride,OpenMP,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float********, LayoutStride, LayoutRight, OpenMP,
+                              int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float********, LayoutStride, LayoutLeft, OpenMP,
+                              int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float********, LayoutStride, LayoutStride, OpenMP,
+                              int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(float********, LayoutStride, OpenMP, int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank1.cpp b/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank1.cpp
index 5e0e09c0a6..6e606008d6 100644
--- a/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank1.cpp
+++ b/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank1.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,18 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*,LayoutLeft,LayoutRight, OpenMP,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*,LayoutLeft,LayoutLeft,  OpenMP,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*,LayoutLeft,LayoutStride,OpenMP,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t*,LayoutLeft,OpenMP,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*, LayoutLeft, LayoutRight, OpenMP, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*, LayoutLeft, LayoutLeft, OpenMP, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*, LayoutLeft, LayoutStride, OpenMP, int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t*, LayoutLeft, OpenMP, int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank2.cpp b/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank2.cpp
index 58ea0ff12f..086e1effe1 100644
--- a/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank2.cpp
+++ b/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank2.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,18 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t**,LayoutLeft,LayoutRight, OpenMP,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t**,LayoutLeft,LayoutLeft,  OpenMP,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t**,LayoutLeft,LayoutStride,OpenMP,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t**,LayoutLeft,OpenMP,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t**, LayoutLeft, LayoutRight, OpenMP, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t**, LayoutLeft, LayoutLeft, OpenMP, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t**, LayoutLeft, LayoutStride, OpenMP, int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t**, LayoutLeft, OpenMP, int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank3.cpp b/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank3.cpp
index a25cfd77b9..8824774867 100644
--- a/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank3.cpp
+++ b/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank3.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,18 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t***,LayoutLeft,LayoutRight, OpenMP,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t***,LayoutLeft,LayoutLeft,  OpenMP,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t***,LayoutLeft,LayoutStride,OpenMP,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t***,LayoutLeft,OpenMP,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t***, LayoutLeft, LayoutRight, OpenMP, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t***, LayoutLeft, LayoutLeft, OpenMP, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t***, LayoutLeft, LayoutStride, OpenMP, int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t***, LayoutLeft, OpenMP, int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank4.cpp b/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank4.cpp
index 1415778510..e32f7504fe 100644
--- a/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank4.cpp
+++ b/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank4.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,19 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t****,LayoutLeft,LayoutRight, OpenMP,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t****,LayoutLeft,LayoutLeft,  OpenMP,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t****,LayoutLeft,LayoutStride,OpenMP,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t****,LayoutLeft,OpenMP,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t****, LayoutLeft, LayoutRight, OpenMP, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t****, LayoutLeft, LayoutLeft, OpenMP, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t****, LayoutLeft, LayoutStride, OpenMP,
+                              int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t****, LayoutLeft, OpenMP, int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank5.cpp b/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank5.cpp
index a00be2024e..d36a5c1be5 100644
--- a/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank5.cpp
+++ b/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank5.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,20 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*****,LayoutLeft,LayoutRight, OpenMP,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*****,LayoutLeft,LayoutLeft,  OpenMP,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*****,LayoutLeft,LayoutStride,OpenMP,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t*****,LayoutLeft,OpenMP,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*****, LayoutLeft, LayoutRight, OpenMP,
+                              int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*****, LayoutLeft, LayoutLeft, OpenMP, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*****, LayoutLeft, LayoutStride, OpenMP,
+                              int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t*****, LayoutLeft, OpenMP, int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank8.cpp b/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank8.cpp
index 14307309e3..3389fed4fa 100644
--- a/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank8.cpp
+++ b/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank8.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t********,LayoutLeft,LayoutRight, OpenMP,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t********,LayoutLeft,LayoutLeft,  OpenMP,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t********,LayoutLeft,LayoutStride,OpenMP,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t********,LayoutLeft,OpenMP,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t********, LayoutLeft, LayoutRight, OpenMP,
+                              int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t********, LayoutLeft, LayoutLeft, OpenMP,
+                              int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t********, LayoutLeft, LayoutStride, OpenMP,
+                              int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t********, LayoutLeft, OpenMP, int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int64_t_LayoutRight_Rank1.cpp b/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int64_t_LayoutRight_Rank1.cpp
index 3dae23a8de..c68d3ed810 100644
--- a/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int64_t_LayoutRight_Rank1.cpp
+++ b/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int64_t_LayoutRight_Rank1.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,18 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*,LayoutRight,LayoutRight, OpenMP,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*,LayoutRight,LayoutLeft,  OpenMP,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*,LayoutRight,LayoutStride,OpenMP,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t*,LayoutRight,OpenMP,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*, LayoutRight, LayoutRight, OpenMP, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*, LayoutRight, LayoutLeft, OpenMP, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*, LayoutRight, LayoutStride, OpenMP, int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t*, LayoutRight, OpenMP, int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int64_t_LayoutRight_Rank2.cpp b/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int64_t_LayoutRight_Rank2.cpp
index 03e5627af3..9fc1b47afd 100644
--- a/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int64_t_LayoutRight_Rank2.cpp
+++ b/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int64_t_LayoutRight_Rank2.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,18 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t**,LayoutRight,LayoutRight, OpenMP,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t**,LayoutRight,LayoutLeft,  OpenMP,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t**,LayoutRight,LayoutStride,OpenMP,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t**,LayoutRight,OpenMP,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t**, LayoutRight, LayoutRight, OpenMP, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t**, LayoutRight, LayoutLeft, OpenMP, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t**, LayoutRight, LayoutStride, OpenMP, int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t**, LayoutRight, OpenMP, int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int64_t_LayoutRight_Rank3.cpp b/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int64_t_LayoutRight_Rank3.cpp
index 471fb8d35a..ed9ed4d63e 100644
--- a/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int64_t_LayoutRight_Rank3.cpp
+++ b/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int64_t_LayoutRight_Rank3.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,19 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t***,LayoutRight,LayoutRight, OpenMP,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t***,LayoutRight,LayoutLeft,  OpenMP,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t***,LayoutRight,LayoutStride,OpenMP,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t***,LayoutRight,OpenMP,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t***, LayoutRight, LayoutRight, OpenMP, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t***, LayoutRight, LayoutLeft, OpenMP, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t***, LayoutRight, LayoutStride, OpenMP,
+                              int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t***, LayoutRight, OpenMP, int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int64_t_LayoutRight_Rank4.cpp b/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int64_t_LayoutRight_Rank4.cpp
index 8b470b8bde..954f9eff6b 100644
--- a/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int64_t_LayoutRight_Rank4.cpp
+++ b/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int64_t_LayoutRight_Rank4.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,20 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t****,LayoutRight,LayoutRight, OpenMP,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t****,LayoutRight,LayoutLeft,  OpenMP,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t****,LayoutRight,LayoutStride,OpenMP,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t****,LayoutRight,OpenMP,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t****, LayoutRight, LayoutRight, OpenMP,
+                              int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t****, LayoutRight, LayoutLeft, OpenMP, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t****, LayoutRight, LayoutStride, OpenMP,
+                              int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t****, LayoutRight, OpenMP, int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int64_t_LayoutRight_Rank5.cpp b/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int64_t_LayoutRight_Rank5.cpp
index cf5b0547d0..46c19786fa 100644
--- a/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int64_t_LayoutRight_Rank5.cpp
+++ b/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int64_t_LayoutRight_Rank5.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*****,LayoutRight,LayoutRight, OpenMP,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*****,LayoutRight,LayoutLeft,  OpenMP,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*****,LayoutRight,LayoutStride,OpenMP,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t*****,LayoutRight,OpenMP,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*****, LayoutRight, LayoutRight, OpenMP,
+                              int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*****, LayoutRight, LayoutLeft, OpenMP,
+                              int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*****, LayoutRight, LayoutStride, OpenMP,
+                              int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t*****, LayoutRight, OpenMP, int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int64_t_LayoutRight_Rank8.cpp b/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int64_t_LayoutRight_Rank8.cpp
index 5615571eee..0fc871882e 100644
--- a/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int64_t_LayoutRight_Rank8.cpp
+++ b/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int64_t_LayoutRight_Rank8.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t********,LayoutRight,LayoutRight, OpenMP,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t********,LayoutRight,LayoutLeft,  OpenMP,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t********,LayoutRight,LayoutStride,OpenMP,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t********,LayoutRight,OpenMP,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t********, LayoutRight, LayoutRight, OpenMP,
+                              int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t********, LayoutRight, LayoutLeft, OpenMP,
+                              int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t********, LayoutRight, LayoutStride,
+                              OpenMP, int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t********, LayoutRight, OpenMP, int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int64_t_LayoutStride_Rank1.cpp b/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int64_t_LayoutStride_Rank1.cpp
index 64867a702f..13739b99b2 100644
--- a/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int64_t_LayoutStride_Rank1.cpp
+++ b/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int64_t_LayoutStride_Rank1.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,18 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*,LayoutStride,LayoutRight, OpenMP,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*,LayoutStride,LayoutLeft,  OpenMP,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*,LayoutStride,LayoutStride,OpenMP,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t*,LayoutStride,OpenMP,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*, LayoutStride, LayoutRight, OpenMP, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*, LayoutStride, LayoutLeft, OpenMP, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*, LayoutStride, LayoutStride, OpenMP, int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t*, LayoutStride, OpenMP, int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int64_t_LayoutStride_Rank2.cpp b/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int64_t_LayoutStride_Rank2.cpp
index 1cd83e48a0..9dec2fe8b9 100644
--- a/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int64_t_LayoutStride_Rank2.cpp
+++ b/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int64_t_LayoutStride_Rank2.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,19 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t**,LayoutStride,LayoutRight, OpenMP,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t**,LayoutStride,LayoutLeft,  OpenMP,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t**,LayoutStride,LayoutStride,OpenMP,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t**,LayoutStride,OpenMP,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t**, LayoutStride, LayoutRight, OpenMP, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t**, LayoutStride, LayoutLeft, OpenMP, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t**, LayoutStride, LayoutStride, OpenMP,
+                              int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t**, LayoutStride, OpenMP, int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int64_t_LayoutStride_Rank3.cpp b/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int64_t_LayoutStride_Rank3.cpp
index 7d701395a7..334da5277f 100644
--- a/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int64_t_LayoutStride_Rank3.cpp
+++ b/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int64_t_LayoutStride_Rank3.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,20 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t***,LayoutStride,LayoutRight, OpenMP,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t***,LayoutStride,LayoutLeft,  OpenMP,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t***,LayoutStride,LayoutStride,OpenMP,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t***,LayoutStride,OpenMP,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t***, LayoutStride, LayoutRight, OpenMP,
+                              int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t***, LayoutStride, LayoutLeft, OpenMP, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t***, LayoutStride, LayoutStride, OpenMP,
+                              int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t***, LayoutStride, OpenMP, int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int64_t_LayoutStride_Rank4.cpp b/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int64_t_LayoutStride_Rank4.cpp
index ccebb6ea8c..05b1921525 100644
--- a/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int64_t_LayoutStride_Rank4.cpp
+++ b/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int64_t_LayoutStride_Rank4.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t****,LayoutStride,LayoutRight, OpenMP,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t****,LayoutStride,LayoutLeft,  OpenMP,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t****,LayoutStride,LayoutStride,OpenMP,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t****,LayoutStride,OpenMP,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t****, LayoutStride, LayoutRight, OpenMP,
+                              int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t****, LayoutStride, LayoutLeft, OpenMP,
+                              int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t****, LayoutStride, LayoutStride, OpenMP,
+                              int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t****, LayoutStride, OpenMP, int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int64_t_LayoutStride_Rank5.cpp b/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int64_t_LayoutStride_Rank5.cpp
index afa9f26a9e..0e57e83f85 100644
--- a/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int64_t_LayoutStride_Rank5.cpp
+++ b/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int64_t_LayoutStride_Rank5.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*****,LayoutStride,LayoutRight, OpenMP,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*****,LayoutStride,LayoutLeft,  OpenMP,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*****,LayoutStride,LayoutStride,OpenMP,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t*****,LayoutStride,OpenMP,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*****, LayoutStride, LayoutRight, OpenMP,
+                              int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*****, LayoutStride, LayoutLeft, OpenMP,
+                              int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*****, LayoutStride, LayoutStride, OpenMP,
+                              int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t*****, LayoutStride, OpenMP, int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int64_t_LayoutStride_Rank8.cpp b/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int64_t_LayoutStride_Rank8.cpp
index e17e861ef4..89d7c45414 100644
--- a/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int64_t_LayoutStride_Rank8.cpp
+++ b/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int64_t_LayoutStride_Rank8.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t********,LayoutStride,LayoutRight, OpenMP,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t********,LayoutStride,LayoutLeft,  OpenMP,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t********,LayoutStride,LayoutStride,OpenMP,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t********,LayoutStride,OpenMP,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t********, LayoutStride, LayoutRight,
+                              OpenMP, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t********, LayoutStride, LayoutLeft, OpenMP,
+                              int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t********, LayoutStride, LayoutStride,
+                              OpenMP, int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t********, LayoutStride, OpenMP, int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int_LayoutLeft_Rank1.cpp b/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int_LayoutLeft_Rank1.cpp
index f8c5254d20..12ad031ee6 100644
--- a/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int_LayoutLeft_Rank1.cpp
+++ b/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int_LayoutLeft_Rank1.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,18 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*,LayoutLeft,LayoutRight, OpenMP,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*,LayoutLeft,LayoutLeft,  OpenMP,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*,LayoutLeft,LayoutStride,OpenMP,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int*,LayoutLeft,OpenMP,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*, LayoutLeft, LayoutRight, OpenMP, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*, LayoutLeft, LayoutLeft, OpenMP, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*, LayoutLeft, LayoutStride, OpenMP, int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int*, LayoutLeft, OpenMP, int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int_LayoutLeft_Rank2.cpp b/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int_LayoutLeft_Rank2.cpp
index bed26e31cc..1b7286cdcd 100644
--- a/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int_LayoutLeft_Rank2.cpp
+++ b/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int_LayoutLeft_Rank2.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,18 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int**,LayoutLeft,LayoutRight, OpenMP,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int**,LayoutLeft,LayoutLeft,  OpenMP,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int**,LayoutLeft,LayoutStride,OpenMP,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int**,LayoutLeft,OpenMP,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int**, LayoutLeft, LayoutRight, OpenMP, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int**, LayoutLeft, LayoutLeft, OpenMP, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int**, LayoutLeft, LayoutStride, OpenMP, int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int**, LayoutLeft, OpenMP, int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int_LayoutLeft_Rank3.cpp b/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int_LayoutLeft_Rank3.cpp
index f65d06df9d..3197555593 100644
--- a/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int_LayoutLeft_Rank3.cpp
+++ b/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int_LayoutLeft_Rank3.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,18 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int***,LayoutLeft,LayoutRight, OpenMP,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int***,LayoutLeft,LayoutLeft,  OpenMP,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int***,LayoutLeft,LayoutStride,OpenMP,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int***,LayoutLeft,OpenMP,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int***, LayoutLeft, LayoutRight, OpenMP, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int***, LayoutLeft, LayoutLeft, OpenMP, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int***, LayoutLeft, LayoutStride, OpenMP, int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int***, LayoutLeft, OpenMP, int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int_LayoutLeft_Rank4.cpp b/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int_LayoutLeft_Rank4.cpp
index e0ee1f83f0..b5f1ddcc57 100644
--- a/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int_LayoutLeft_Rank4.cpp
+++ b/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int_LayoutLeft_Rank4.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,18 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int****,LayoutLeft,LayoutRight, OpenMP,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int****,LayoutLeft,LayoutLeft,  OpenMP,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int****,LayoutLeft,LayoutStride,OpenMP,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int****,LayoutLeft,OpenMP,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int****, LayoutLeft, LayoutRight, OpenMP, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int****, LayoutLeft, LayoutLeft, OpenMP, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int****, LayoutLeft, LayoutStride, OpenMP, int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int****, LayoutLeft, OpenMP, int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int_LayoutLeft_Rank5.cpp b/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int_LayoutLeft_Rank5.cpp
index 90f379b2fb..bb490af704 100644
--- a/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int_LayoutLeft_Rank5.cpp
+++ b/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int_LayoutLeft_Rank5.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,18 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*****,LayoutLeft,LayoutRight, OpenMP,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*****,LayoutLeft,LayoutLeft,  OpenMP,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*****,LayoutLeft,LayoutStride,OpenMP,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int*****,LayoutLeft,OpenMP,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*****, LayoutLeft, LayoutRight, OpenMP, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*****, LayoutLeft, LayoutLeft, OpenMP, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*****, LayoutLeft, LayoutStride, OpenMP, int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int*****, LayoutLeft, OpenMP, int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int_LayoutLeft_Rank8.cpp b/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int_LayoutLeft_Rank8.cpp
index 5b01d5d0aa..483d0ce3cf 100644
--- a/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int_LayoutLeft_Rank8.cpp
+++ b/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int_LayoutLeft_Rank8.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,19 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int********,LayoutLeft,LayoutRight, OpenMP,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int********,LayoutLeft,LayoutLeft,  OpenMP,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int********,LayoutLeft,LayoutStride,OpenMP,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int********,LayoutLeft,OpenMP,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int********, LayoutLeft, LayoutRight, OpenMP, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int********, LayoutLeft, LayoutLeft, OpenMP, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int********, LayoutLeft, LayoutStride, OpenMP,
+                              int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int********, LayoutLeft, OpenMP, int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int_LayoutRight_Rank1.cpp b/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int_LayoutRight_Rank1.cpp
index 174d35f7d5..4f1ae60f42 100644
--- a/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int_LayoutRight_Rank1.cpp
+++ b/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int_LayoutRight_Rank1.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,18 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*,LayoutRight,LayoutRight, OpenMP,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*,LayoutRight,LayoutLeft,  OpenMP,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*,LayoutRight,LayoutStride,OpenMP,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int*,LayoutRight,OpenMP,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*, LayoutRight, LayoutRight, OpenMP, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*, LayoutRight, LayoutLeft, OpenMP, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*, LayoutRight, LayoutStride, OpenMP, int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int*, LayoutRight, OpenMP, int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int_LayoutRight_Rank2.cpp b/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int_LayoutRight_Rank2.cpp
index 89c9df9360..5420e3a449 100644
--- a/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int_LayoutRight_Rank2.cpp
+++ b/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int_LayoutRight_Rank2.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,18 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int**,LayoutRight,LayoutRight, OpenMP,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int**,LayoutRight,LayoutLeft,  OpenMP,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int**,LayoutRight,LayoutStride,OpenMP,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int**,LayoutRight,OpenMP,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int**, LayoutRight, LayoutRight, OpenMP, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int**, LayoutRight, LayoutLeft, OpenMP, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int**, LayoutRight, LayoutStride, OpenMP, int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int**, LayoutRight, OpenMP, int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int_LayoutRight_Rank3.cpp b/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int_LayoutRight_Rank3.cpp
index 153a628179..46269afc22 100644
--- a/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int_LayoutRight_Rank3.cpp
+++ b/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int_LayoutRight_Rank3.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,18 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int***,LayoutRight,LayoutRight, OpenMP,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int***,LayoutRight,LayoutLeft,  OpenMP,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int***,LayoutRight,LayoutStride,OpenMP,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int***,LayoutRight,OpenMP,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int***, LayoutRight, LayoutRight, OpenMP, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int***, LayoutRight, LayoutLeft, OpenMP, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int***, LayoutRight, LayoutStride, OpenMP, int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int***, LayoutRight, OpenMP, int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int_LayoutRight_Rank4.cpp b/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int_LayoutRight_Rank4.cpp
index 685174b367..425220e27f 100644
--- a/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int_LayoutRight_Rank4.cpp
+++ b/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int_LayoutRight_Rank4.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,18 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int****,LayoutRight,LayoutRight, OpenMP,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int****,LayoutRight,LayoutLeft,  OpenMP,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int****,LayoutRight,LayoutStride,OpenMP,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int****,LayoutRight,OpenMP,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int****, LayoutRight, LayoutRight, OpenMP, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int****, LayoutRight, LayoutLeft, OpenMP, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int****, LayoutRight, LayoutStride, OpenMP, int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int****, LayoutRight, OpenMP, int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int_LayoutRight_Rank5.cpp b/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int_LayoutRight_Rank5.cpp
index a4a3881a57..6bc2ed733d 100644
--- a/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int_LayoutRight_Rank5.cpp
+++ b/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int_LayoutRight_Rank5.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,18 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*****,LayoutRight,LayoutRight, OpenMP,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*****,LayoutRight,LayoutLeft,  OpenMP,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*****,LayoutRight,LayoutStride,OpenMP,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int*****,LayoutRight,OpenMP,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*****, LayoutRight, LayoutRight, OpenMP, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*****, LayoutRight, LayoutLeft, OpenMP, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*****, LayoutRight, LayoutStride, OpenMP, int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int*****, LayoutRight, OpenMP, int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int_LayoutRight_Rank8.cpp b/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int_LayoutRight_Rank8.cpp
index f51d133e7a..91cc8c2af2 100644
--- a/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int_LayoutRight_Rank8.cpp
+++ b/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int_LayoutRight_Rank8.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,20 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int********,LayoutRight,LayoutRight, OpenMP,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int********,LayoutRight,LayoutLeft,  OpenMP,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int********,LayoutRight,LayoutStride,OpenMP,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int********,LayoutRight,OpenMP,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int********, LayoutRight, LayoutRight, OpenMP,
+                              int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int********, LayoutRight, LayoutLeft, OpenMP, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int********, LayoutRight, LayoutStride, OpenMP,
+                              int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int********, LayoutRight, OpenMP, int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int_LayoutStride_Rank1.cpp b/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int_LayoutStride_Rank1.cpp
index c3d5027a38..46b97b3133 100644
--- a/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int_LayoutStride_Rank1.cpp
+++ b/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int_LayoutStride_Rank1.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,18 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*,LayoutStride,LayoutRight, OpenMP,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*,LayoutStride,LayoutLeft,  OpenMP,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*,LayoutStride,LayoutStride,OpenMP,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int*,LayoutStride,OpenMP,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*, LayoutStride, LayoutRight, OpenMP, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*, LayoutStride, LayoutLeft, OpenMP, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*, LayoutStride, LayoutStride, OpenMP, int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int*, LayoutStride, OpenMP, int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int_LayoutStride_Rank2.cpp b/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int_LayoutStride_Rank2.cpp
index 0e091389ab..1c6c071e36 100644
--- a/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int_LayoutStride_Rank2.cpp
+++ b/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int_LayoutStride_Rank2.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,18 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int**,LayoutStride,LayoutRight, OpenMP,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int**,LayoutStride,LayoutLeft,  OpenMP,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int**,LayoutStride,LayoutStride,OpenMP,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int**,LayoutStride,OpenMP,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int**, LayoutStride, LayoutRight, OpenMP, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int**, LayoutStride, LayoutLeft, OpenMP, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int**, LayoutStride, LayoutStride, OpenMP, int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int**, LayoutStride, OpenMP, int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int_LayoutStride_Rank3.cpp b/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int_LayoutStride_Rank3.cpp
index 6355e213ae..adb9f1e947 100644
--- a/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int_LayoutStride_Rank3.cpp
+++ b/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int_LayoutStride_Rank3.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,18 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int***,LayoutStride,LayoutRight, OpenMP,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int***,LayoutStride,LayoutLeft,  OpenMP,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int***,LayoutStride,LayoutStride,OpenMP,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int***,LayoutStride,OpenMP,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int***, LayoutStride, LayoutRight, OpenMP, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int***, LayoutStride, LayoutLeft, OpenMP, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int***, LayoutStride, LayoutStride, OpenMP, int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int***, LayoutStride, OpenMP, int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int_LayoutStride_Rank4.cpp b/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int_LayoutStride_Rank4.cpp
index c187cd2e15..5c7fc99179 100644
--- a/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int_LayoutStride_Rank4.cpp
+++ b/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int_LayoutStride_Rank4.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,18 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int****,LayoutStride,LayoutRight, OpenMP,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int****,LayoutStride,LayoutLeft,  OpenMP,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int****,LayoutStride,LayoutStride,OpenMP,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int****,LayoutStride,OpenMP,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int****, LayoutStride, LayoutRight, OpenMP, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int****, LayoutStride, LayoutLeft, OpenMP, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int****, LayoutStride, LayoutStride, OpenMP, int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int****, LayoutStride, OpenMP, int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int_LayoutStride_Rank5.cpp b/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int_LayoutStride_Rank5.cpp
index b5a6879cec..f8605287e2 100644
--- a/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int_LayoutStride_Rank5.cpp
+++ b/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int_LayoutStride_Rank5.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,18 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*****,LayoutStride,LayoutRight, OpenMP,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*****,LayoutStride,LayoutLeft,  OpenMP,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*****,LayoutStride,LayoutStride,OpenMP,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int*****,LayoutStride,OpenMP,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*****, LayoutStride, LayoutRight, OpenMP, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*****, LayoutStride, LayoutLeft, OpenMP, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*****, LayoutStride, LayoutStride, OpenMP, int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int*****, LayoutStride, OpenMP, int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int_LayoutStride_Rank8.cpp b/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int_LayoutStride_Rank8.cpp
index 7ed95bb56f..b47b23c0df 100644
--- a/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int_LayoutStride_Rank8.cpp
+++ b/lib/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int_LayoutStride_Rank8.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int********,LayoutStride,LayoutRight, OpenMP,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int********,LayoutStride,LayoutLeft,  OpenMP,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int********,LayoutStride,LayoutStride,OpenMP,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int********,LayoutStride,OpenMP,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int********, LayoutStride, LayoutRight, OpenMP,
+                              int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int********, LayoutStride, LayoutLeft, OpenMP,
+                              int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int********, LayoutStride, LayoutStride, OpenMP,
+                              int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int********, LayoutStride, OpenMP, int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank1.cpp b/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank1.cpp
index 8a5896ac20..936b24983f 100644
--- a/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank1.cpp
+++ b/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank1.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*,LayoutLeft,LayoutRight, Experimental::ROCm,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*,LayoutLeft,LayoutLeft,  Experimental::ROCm,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*,LayoutLeft,LayoutStride,Experimental::ROCm,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(double*,LayoutLeft,Experimental::ROCm,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*, LayoutLeft, LayoutRight,
+                              Experimental::ROCm, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*, LayoutLeft, LayoutLeft,
+                              Experimental::ROCm, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*, LayoutLeft, LayoutStride,
+                              Experimental::ROCm, int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(double*, LayoutLeft, Experimental::ROCm, int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank2.cpp b/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank2.cpp
index 50bf6e4380..7d83d02279 100644
--- a/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank2.cpp
+++ b/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank2.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double**,LayoutLeft,LayoutRight, Experimental::ROCm,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double**,LayoutLeft,LayoutLeft,  Experimental::ROCm,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double**,LayoutLeft,LayoutStride,Experimental::ROCm,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(double**,LayoutLeft,Experimental::ROCm,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double**, LayoutLeft, LayoutRight,
+                              Experimental::ROCm, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double**, LayoutLeft, LayoutLeft,
+                              Experimental::ROCm, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double**, LayoutLeft, LayoutStride,
+                              Experimental::ROCm, int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(double**, LayoutLeft, Experimental::ROCm, int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank3.cpp b/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank3.cpp
index f33bcdbe08..50b160c452 100644
--- a/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank3.cpp
+++ b/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank3.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,22 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double***,LayoutLeft,LayoutRight, Experimental::ROCm,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double***,LayoutLeft,LayoutLeft,  Experimental::ROCm,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double***,LayoutLeft,LayoutStride,Experimental::ROCm,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(double***,LayoutLeft,Experimental::ROCm,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double***, LayoutLeft, LayoutRight,
+                              Experimental::ROCm, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double***, LayoutLeft, LayoutLeft,
+                              Experimental::ROCm, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double***, LayoutLeft, LayoutStride,
+                              Experimental::ROCm, int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(double***, LayoutLeft, Experimental::ROCm,
+                              int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank4.cpp b/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank4.cpp
index 715bb2bfc9..fa4dccf30b 100644
--- a/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank4.cpp
+++ b/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank4.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,22 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double****,LayoutLeft,LayoutRight, Experimental::ROCm,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double****,LayoutLeft,LayoutLeft,  Experimental::ROCm,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double****,LayoutLeft,LayoutStride,Experimental::ROCm,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(double****,LayoutLeft,Experimental::ROCm,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double****, LayoutLeft, LayoutRight,
+                              Experimental::ROCm, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double****, LayoutLeft, LayoutLeft,
+                              Experimental::ROCm, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double****, LayoutLeft, LayoutStride,
+                              Experimental::ROCm, int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(double****, LayoutLeft, Experimental::ROCm,
+                              int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank5.cpp b/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank5.cpp
index a914551a22..5ed0812c35 100644
--- a/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank5.cpp
+++ b/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank5.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,22 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*****,LayoutLeft,LayoutRight, Experimental::ROCm,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*****,LayoutLeft,LayoutLeft,  Experimental::ROCm,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*****,LayoutLeft,LayoutStride,Experimental::ROCm,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(double*****,LayoutLeft,Experimental::ROCm,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*****, LayoutLeft, LayoutRight,
+                              Experimental::ROCm, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*****, LayoutLeft, LayoutLeft,
+                              Experimental::ROCm, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*****, LayoutLeft, LayoutStride,
+                              Experimental::ROCm, int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(double*****, LayoutLeft, Experimental::ROCm,
+                              int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank8.cpp b/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank8.cpp
index 86a4aa7cfb..9bc2faefe9 100644
--- a/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank8.cpp
+++ b/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank8.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,22 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double********,LayoutLeft,LayoutRight, Experimental::ROCm,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double********,LayoutLeft,LayoutLeft,  Experimental::ROCm,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double********,LayoutLeft,LayoutStride,Experimental::ROCm,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(double********,LayoutLeft,Experimental::ROCm,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double********, LayoutLeft, LayoutRight,
+                              Experimental::ROCm, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double********, LayoutLeft, LayoutLeft,
+                              Experimental::ROCm, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double********, LayoutLeft, LayoutStride,
+                              Experimental::ROCm, int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(double********, LayoutLeft, Experimental::ROCm,
+                              int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_double_LayoutRight_Rank1.cpp b/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_double_LayoutRight_Rank1.cpp
index 470d0b42d7..35a198cb26 100644
--- a/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_double_LayoutRight_Rank1.cpp
+++ b/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_double_LayoutRight_Rank1.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*,LayoutRight,LayoutRight, Experimental::ROCm,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*,LayoutRight,LayoutLeft,  Experimental::ROCm,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*,LayoutRight,LayoutStride,Experimental::ROCm,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(double*,LayoutRight,Experimental::ROCm,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*, LayoutRight, LayoutRight,
+                              Experimental::ROCm, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*, LayoutRight, LayoutLeft,
+                              Experimental::ROCm, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*, LayoutRight, LayoutStride,
+                              Experimental::ROCm, int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(double*, LayoutRight, Experimental::ROCm, int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_double_LayoutRight_Rank2.cpp b/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_double_LayoutRight_Rank2.cpp
index 9285c3104c..a79082c7a6 100644
--- a/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_double_LayoutRight_Rank2.cpp
+++ b/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_double_LayoutRight_Rank2.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,22 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double**,LayoutRight,LayoutRight, Experimental::ROCm,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double**,LayoutRight,LayoutLeft,  Experimental::ROCm,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double**,LayoutRight,LayoutStride,Experimental::ROCm,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(double**,LayoutRight,Experimental::ROCm,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double**, LayoutRight, LayoutRight,
+                              Experimental::ROCm, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double**, LayoutRight, LayoutLeft,
+                              Experimental::ROCm, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double**, LayoutRight, LayoutStride,
+                              Experimental::ROCm, int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(double**, LayoutRight, Experimental::ROCm,
+                              int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_double_LayoutRight_Rank3.cpp b/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_double_LayoutRight_Rank3.cpp
index 782a657281..e344f94247 100644
--- a/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_double_LayoutRight_Rank3.cpp
+++ b/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_double_LayoutRight_Rank3.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,22 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double***,LayoutRight,LayoutRight, Experimental::ROCm,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double***,LayoutRight,LayoutLeft,  Experimental::ROCm,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double***,LayoutRight,LayoutStride,Experimental::ROCm,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(double***,LayoutRight,Experimental::ROCm,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double***, LayoutRight, LayoutRight,
+                              Experimental::ROCm, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double***, LayoutRight, LayoutLeft,
+                              Experimental::ROCm, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double***, LayoutRight, LayoutStride,
+                              Experimental::ROCm, int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(double***, LayoutRight, Experimental::ROCm,
+                              int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_double_LayoutRight_Rank4.cpp b/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_double_LayoutRight_Rank4.cpp
index decb4dbc73..92e4281baa 100644
--- a/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_double_LayoutRight_Rank4.cpp
+++ b/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_double_LayoutRight_Rank4.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,22 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double****,LayoutRight,LayoutRight, Experimental::ROCm,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double****,LayoutRight,LayoutLeft,  Experimental::ROCm,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double****,LayoutRight,LayoutStride,Experimental::ROCm,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(double****,LayoutRight,Experimental::ROCm,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double****, LayoutRight, LayoutRight,
+                              Experimental::ROCm, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double****, LayoutRight, LayoutLeft,
+                              Experimental::ROCm, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double****, LayoutRight, LayoutStride,
+                              Experimental::ROCm, int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(double****, LayoutRight, Experimental::ROCm,
+                              int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_double_LayoutRight_Rank5.cpp b/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_double_LayoutRight_Rank5.cpp
index c793f4d181..c25262075a 100644
--- a/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_double_LayoutRight_Rank5.cpp
+++ b/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_double_LayoutRight_Rank5.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,22 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*****,LayoutRight,LayoutRight, Experimental::ROCm,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*****,LayoutRight,LayoutLeft,  Experimental::ROCm,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*****,LayoutRight,LayoutStride,Experimental::ROCm,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(double*****,LayoutRight,Experimental::ROCm,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*****, LayoutRight, LayoutRight,
+                              Experimental::ROCm, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*****, LayoutRight, LayoutLeft,
+                              Experimental::ROCm, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*****, LayoutRight, LayoutStride,
+                              Experimental::ROCm, int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(double*****, LayoutRight, Experimental::ROCm,
+                              int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_double_LayoutRight_Rank8.cpp b/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_double_LayoutRight_Rank8.cpp
index bbb00e3330..c3ce63ccb0 100644
--- a/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_double_LayoutRight_Rank8.cpp
+++ b/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_double_LayoutRight_Rank8.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,22 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double********,LayoutRight,LayoutRight, Experimental::ROCm,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double********,LayoutRight,LayoutLeft,  Experimental::ROCm,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double********,LayoutRight,LayoutStride,Experimental::ROCm,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(double********,LayoutRight,Experimental::ROCm,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double********, LayoutRight, LayoutRight,
+                              Experimental::ROCm, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double********, LayoutRight, LayoutLeft,
+                              Experimental::ROCm, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double********, LayoutRight, LayoutStride,
+                              Experimental::ROCm, int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(double********, LayoutRight, Experimental::ROCm,
+                              int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_double_LayoutStride_Rank1.cpp b/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_double_LayoutStride_Rank1.cpp
index 0ae86042be..443aaa1172 100644
--- a/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_double_LayoutStride_Rank1.cpp
+++ b/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_double_LayoutStride_Rank1.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,22 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*,LayoutStride,LayoutRight, Experimental::ROCm,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*,LayoutStride,LayoutLeft,  Experimental::ROCm,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*,LayoutStride,LayoutStride,Experimental::ROCm,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(double*,LayoutStride,Experimental::ROCm,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*, LayoutStride, LayoutRight,
+                              Experimental::ROCm, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*, LayoutStride, LayoutLeft,
+                              Experimental::ROCm, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*, LayoutStride, LayoutStride,
+                              Experimental::ROCm, int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(double*, LayoutStride, Experimental::ROCm,
+                              int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_double_LayoutStride_Rank2.cpp b/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_double_LayoutStride_Rank2.cpp
index 1a1b04196b..65d137d62b 100644
--- a/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_double_LayoutStride_Rank2.cpp
+++ b/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_double_LayoutStride_Rank2.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,22 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double**,LayoutStride,LayoutRight, Experimental::ROCm,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double**,LayoutStride,LayoutLeft,  Experimental::ROCm,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double**,LayoutStride,LayoutStride,Experimental::ROCm,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(double**,LayoutStride,Experimental::ROCm,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double**, LayoutStride, LayoutRight,
+                              Experimental::ROCm, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double**, LayoutStride, LayoutLeft,
+                              Experimental::ROCm, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double**, LayoutStride, LayoutStride,
+                              Experimental::ROCm, int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(double**, LayoutStride, Experimental::ROCm,
+                              int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_double_LayoutStride_Rank3.cpp b/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_double_LayoutStride_Rank3.cpp
index e4a1e260d8..50c66d9315 100644
--- a/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_double_LayoutStride_Rank3.cpp
+++ b/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_double_LayoutStride_Rank3.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,22 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double***,LayoutStride,LayoutRight, Experimental::ROCm,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double***,LayoutStride,LayoutLeft,  Experimental::ROCm,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double***,LayoutStride,LayoutStride,Experimental::ROCm,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(double***,LayoutStride,Experimental::ROCm,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double***, LayoutStride, LayoutRight,
+                              Experimental::ROCm, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double***, LayoutStride, LayoutLeft,
+                              Experimental::ROCm, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double***, LayoutStride, LayoutStride,
+                              Experimental::ROCm, int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(double***, LayoutStride, Experimental::ROCm,
+                              int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_double_LayoutStride_Rank4.cpp b/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_double_LayoutStride_Rank4.cpp
index df0c797327..78464445e9 100644
--- a/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_double_LayoutStride_Rank4.cpp
+++ b/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_double_LayoutStride_Rank4.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,22 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double****,LayoutStride,LayoutRight, Experimental::ROCm,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double****,LayoutStride,LayoutLeft,  Experimental::ROCm,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double****,LayoutStride,LayoutStride,Experimental::ROCm,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(double****,LayoutStride,Experimental::ROCm,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double****, LayoutStride, LayoutRight,
+                              Experimental::ROCm, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double****, LayoutStride, LayoutLeft,
+                              Experimental::ROCm, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double****, LayoutStride, LayoutStride,
+                              Experimental::ROCm, int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(double****, LayoutStride, Experimental::ROCm,
+                              int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_double_LayoutStride_Rank5.cpp b/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_double_LayoutStride_Rank5.cpp
index fa29e7ec74..f1085851dd 100644
--- a/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_double_LayoutStride_Rank5.cpp
+++ b/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_double_LayoutStride_Rank5.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,22 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*****,LayoutStride,LayoutRight, Experimental::ROCm,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*****,LayoutStride,LayoutLeft,  Experimental::ROCm,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*****,LayoutStride,LayoutStride,Experimental::ROCm,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(double*****,LayoutStride,Experimental::ROCm,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*****, LayoutStride, LayoutRight,
+                              Experimental::ROCm, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*****, LayoutStride, LayoutLeft,
+                              Experimental::ROCm, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*****, LayoutStride, LayoutStride,
+                              Experimental::ROCm, int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(double*****, LayoutStride, Experimental::ROCm,
+                              int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_double_LayoutStride_Rank8.cpp b/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_double_LayoutStride_Rank8.cpp
index 65b27694ab..090e77d63b 100644
--- a/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_double_LayoutStride_Rank8.cpp
+++ b/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_double_LayoutStride_Rank8.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,22 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double********,LayoutStride,LayoutRight, Experimental::ROCm,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double********,LayoutStride,LayoutLeft,  Experimental::ROCm,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double********,LayoutStride,LayoutStride,Experimental::ROCm,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(double********,LayoutStride,Experimental::ROCm,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double********, LayoutStride, LayoutRight,
+                              Experimental::ROCm, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double********, LayoutStride, LayoutLeft,
+                              Experimental::ROCm, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double********, LayoutStride, LayoutStride,
+                              Experimental::ROCm, int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(double********, LayoutStride, Experimental::ROCm,
+                              int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank1.cpp b/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank1.cpp
index d0738d0429..b82e770ee6 100644
--- a/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank1.cpp
+++ b/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank1.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*,LayoutLeft,LayoutRight, Experimental::ROCm,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*,LayoutLeft,LayoutLeft,  Experimental::ROCm,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*,LayoutLeft,LayoutStride,Experimental::ROCm,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(float*,LayoutLeft,Experimental::ROCm,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*, LayoutLeft, LayoutRight,
+                              Experimental::ROCm, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*, LayoutLeft, LayoutLeft,
+                              Experimental::ROCm, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*, LayoutLeft, LayoutStride,
+                              Experimental::ROCm, int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(float*, LayoutLeft, Experimental::ROCm, int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank2.cpp b/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank2.cpp
index f958ac4ae5..6fbd24842d 100644
--- a/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank2.cpp
+++ b/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank2.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float**,LayoutLeft,LayoutRight, Experimental::ROCm,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float**,LayoutLeft,LayoutLeft,  Experimental::ROCm,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float**,LayoutLeft,LayoutStride,Experimental::ROCm,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(float**,LayoutLeft,Experimental::ROCm,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float**, LayoutLeft, LayoutRight,
+                              Experimental::ROCm, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float**, LayoutLeft, LayoutLeft,
+                              Experimental::ROCm, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float**, LayoutLeft, LayoutStride,
+                              Experimental::ROCm, int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(float**, LayoutLeft, Experimental::ROCm, int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank3.cpp b/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank3.cpp
index e0d7082261..a434fc069f 100644
--- a/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank3.cpp
+++ b/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank3.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float***,LayoutLeft,LayoutRight, Experimental::ROCm,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float***,LayoutLeft,LayoutLeft,  Experimental::ROCm,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float***,LayoutLeft,LayoutStride,Experimental::ROCm,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(float***,LayoutLeft,Experimental::ROCm,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float***, LayoutLeft, LayoutRight,
+                              Experimental::ROCm, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float***, LayoutLeft, LayoutLeft,
+                              Experimental::ROCm, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float***, LayoutLeft, LayoutStride,
+                              Experimental::ROCm, int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(float***, LayoutLeft, Experimental::ROCm, int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank4.cpp b/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank4.cpp
index 893af9e9c7..cf7972a445 100644
--- a/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank4.cpp
+++ b/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank4.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,22 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float****,LayoutLeft,LayoutRight, Experimental::ROCm,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float****,LayoutLeft,LayoutLeft,  Experimental::ROCm,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float****,LayoutLeft,LayoutStride,Experimental::ROCm,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(float****,LayoutLeft,Experimental::ROCm,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float****, LayoutLeft, LayoutRight,
+                              Experimental::ROCm, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float****, LayoutLeft, LayoutLeft,
+                              Experimental::ROCm, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float****, LayoutLeft, LayoutStride,
+                              Experimental::ROCm, int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(float****, LayoutLeft, Experimental::ROCm,
+                              int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank5.cpp b/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank5.cpp
index 23782b3639..724fa978be 100644
--- a/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank5.cpp
+++ b/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank5.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,22 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*****,LayoutLeft,LayoutRight, Experimental::ROCm,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*****,LayoutLeft,LayoutLeft,  Experimental::ROCm,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*****,LayoutLeft,LayoutStride,Experimental::ROCm,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(float*****,LayoutLeft,Experimental::ROCm,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*****, LayoutLeft, LayoutRight,
+                              Experimental::ROCm, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*****, LayoutLeft, LayoutLeft,
+                              Experimental::ROCm, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*****, LayoutLeft, LayoutStride,
+                              Experimental::ROCm, int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(float*****, LayoutLeft, Experimental::ROCm,
+                              int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank8.cpp b/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank8.cpp
index da50bacf93..1910a2024f 100644
--- a/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank8.cpp
+++ b/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank8.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,22 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float********,LayoutLeft,LayoutRight, Experimental::ROCm,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float********,LayoutLeft,LayoutLeft,  Experimental::ROCm,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float********,LayoutLeft,LayoutStride,Experimental::ROCm,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(float********,LayoutLeft,Experimental::ROCm,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float********, LayoutLeft, LayoutRight,
+                              Experimental::ROCm, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float********, LayoutLeft, LayoutLeft,
+                              Experimental::ROCm, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float********, LayoutLeft, LayoutStride,
+                              Experimental::ROCm, int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(float********, LayoutLeft, Experimental::ROCm,
+                              int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_float_LayoutRight_Rank1.cpp b/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_float_LayoutRight_Rank1.cpp
index 392144d00e..9e5bf0fa3e 100644
--- a/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_float_LayoutRight_Rank1.cpp
+++ b/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_float_LayoutRight_Rank1.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*,LayoutRight,LayoutRight, Experimental::ROCm,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*,LayoutRight,LayoutLeft,  Experimental::ROCm,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*,LayoutRight,LayoutStride,Experimental::ROCm,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(float*,LayoutRight,Experimental::ROCm,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*, LayoutRight, LayoutRight,
+                              Experimental::ROCm, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*, LayoutRight, LayoutLeft,
+                              Experimental::ROCm, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*, LayoutRight, LayoutStride,
+                              Experimental::ROCm, int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(float*, LayoutRight, Experimental::ROCm, int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_float_LayoutRight_Rank2.cpp b/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_float_LayoutRight_Rank2.cpp
index 5f6ec7c043..55b67d2999 100644
--- a/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_float_LayoutRight_Rank2.cpp
+++ b/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_float_LayoutRight_Rank2.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float**,LayoutRight,LayoutRight, Experimental::ROCm,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float**,LayoutRight,LayoutLeft,  Experimental::ROCm,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float**,LayoutRight,LayoutStride,Experimental::ROCm,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(float**,LayoutRight,Experimental::ROCm,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float**, LayoutRight, LayoutRight,
+                              Experimental::ROCm, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float**, LayoutRight, LayoutLeft,
+                              Experimental::ROCm, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float**, LayoutRight, LayoutStride,
+                              Experimental::ROCm, int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(float**, LayoutRight, Experimental::ROCm, int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_float_LayoutRight_Rank3.cpp b/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_float_LayoutRight_Rank3.cpp
index e205b3e6f2..1e7cfd2545 100644
--- a/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_float_LayoutRight_Rank3.cpp
+++ b/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_float_LayoutRight_Rank3.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,22 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float***,LayoutRight,LayoutRight, Experimental::ROCm,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float***,LayoutRight,LayoutLeft,  Experimental::ROCm,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float***,LayoutRight,LayoutStride,Experimental::ROCm,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(float***,LayoutRight,Experimental::ROCm,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float***, LayoutRight, LayoutRight,
+                              Experimental::ROCm, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float***, LayoutRight, LayoutLeft,
+                              Experimental::ROCm, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float***, LayoutRight, LayoutStride,
+                              Experimental::ROCm, int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(float***, LayoutRight, Experimental::ROCm,
+                              int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_float_LayoutRight_Rank4.cpp b/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_float_LayoutRight_Rank4.cpp
index b6ab570f41..d374edbd4a 100644
--- a/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_float_LayoutRight_Rank4.cpp
+++ b/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_float_LayoutRight_Rank4.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,22 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float****,LayoutRight,LayoutRight, Experimental::ROCm,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float****,LayoutRight,LayoutLeft,  Experimental::ROCm,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float****,LayoutRight,LayoutStride,Experimental::ROCm,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(float****,LayoutRight,Experimental::ROCm,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float****, LayoutRight, LayoutRight,
+                              Experimental::ROCm, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float****, LayoutRight, LayoutLeft,
+                              Experimental::ROCm, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float****, LayoutRight, LayoutStride,
+                              Experimental::ROCm, int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(float****, LayoutRight, Experimental::ROCm,
+                              int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_float_LayoutRight_Rank5.cpp b/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_float_LayoutRight_Rank5.cpp
index 8a850e859d..7eb20ccaba 100644
--- a/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_float_LayoutRight_Rank5.cpp
+++ b/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_float_LayoutRight_Rank5.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,22 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*****,LayoutRight,LayoutRight, Experimental::ROCm,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*****,LayoutRight,LayoutLeft,  Experimental::ROCm,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*****,LayoutRight,LayoutStride,Experimental::ROCm,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(float*****,LayoutRight,Experimental::ROCm,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*****, LayoutRight, LayoutRight,
+                              Experimental::ROCm, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*****, LayoutRight, LayoutLeft,
+                              Experimental::ROCm, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*****, LayoutRight, LayoutStride,
+                              Experimental::ROCm, int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(float*****, LayoutRight, Experimental::ROCm,
+                              int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_float_LayoutRight_Rank8.cpp b/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_float_LayoutRight_Rank8.cpp
index 6fbd0ff8b1..cd13711178 100644
--- a/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_float_LayoutRight_Rank8.cpp
+++ b/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_float_LayoutRight_Rank8.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,22 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float********,LayoutRight,LayoutRight, Experimental::ROCm,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float********,LayoutRight,LayoutLeft,  Experimental::ROCm,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float********,LayoutRight,LayoutStride,Experimental::ROCm,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(float********,LayoutRight,Experimental::ROCm,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float********, LayoutRight, LayoutRight,
+                              Experimental::ROCm, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float********, LayoutRight, LayoutLeft,
+                              Experimental::ROCm, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float********, LayoutRight, LayoutStride,
+                              Experimental::ROCm, int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(float********, LayoutRight, Experimental::ROCm,
+                              int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_float_LayoutStride_Rank1.cpp b/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_float_LayoutStride_Rank1.cpp
index c6911e3b7a..f36b5353ac 100644
--- a/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_float_LayoutStride_Rank1.cpp
+++ b/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_float_LayoutStride_Rank1.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*,LayoutStride,LayoutRight, Experimental::ROCm,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*,LayoutStride,LayoutLeft,  Experimental::ROCm,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*,LayoutStride,LayoutStride,Experimental::ROCm,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(float*,LayoutStride,Experimental::ROCm,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*, LayoutStride, LayoutRight,
+                              Experimental::ROCm, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*, LayoutStride, LayoutLeft,
+                              Experimental::ROCm, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*, LayoutStride, LayoutStride,
+                              Experimental::ROCm, int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(float*, LayoutStride, Experimental::ROCm, int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_float_LayoutStride_Rank2.cpp b/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_float_LayoutStride_Rank2.cpp
index 214c90b506..afeeae9b3f 100644
--- a/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_float_LayoutStride_Rank2.cpp
+++ b/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_float_LayoutStride_Rank2.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,22 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float**,LayoutStride,LayoutRight, Experimental::ROCm,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float**,LayoutStride,LayoutLeft,  Experimental::ROCm,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float**,LayoutStride,LayoutStride,Experimental::ROCm,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(float**,LayoutStride,Experimental::ROCm,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float**, LayoutStride, LayoutRight,
+                              Experimental::ROCm, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float**, LayoutStride, LayoutLeft,
+                              Experimental::ROCm, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float**, LayoutStride, LayoutStride,
+                              Experimental::ROCm, int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(float**, LayoutStride, Experimental::ROCm,
+                              int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_float_LayoutStride_Rank3.cpp b/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_float_LayoutStride_Rank3.cpp
index f005e67a58..1786596001 100644
--- a/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_float_LayoutStride_Rank3.cpp
+++ b/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_float_LayoutStride_Rank3.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,22 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float***,LayoutStride,LayoutRight, Experimental::ROCm,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float***,LayoutStride,LayoutLeft,  Experimental::ROCm,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float***,LayoutStride,LayoutStride,Experimental::ROCm,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(float***,LayoutStride,Experimental::ROCm,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float***, LayoutStride, LayoutRight,
+                              Experimental::ROCm, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float***, LayoutStride, LayoutLeft,
+                              Experimental::ROCm, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float***, LayoutStride, LayoutStride,
+                              Experimental::ROCm, int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(float***, LayoutStride, Experimental::ROCm,
+                              int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_float_LayoutStride_Rank4.cpp b/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_float_LayoutStride_Rank4.cpp
index e692bb0ad0..2db4dd794d 100644
--- a/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_float_LayoutStride_Rank4.cpp
+++ b/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_float_LayoutStride_Rank4.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,22 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float****,LayoutStride,LayoutRight, Experimental::ROCm,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float****,LayoutStride,LayoutLeft,  Experimental::ROCm,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float****,LayoutStride,LayoutStride,Experimental::ROCm,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(float****,LayoutStride,Experimental::ROCm,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float****, LayoutStride, LayoutRight,
+                              Experimental::ROCm, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float****, LayoutStride, LayoutLeft,
+                              Experimental::ROCm, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float****, LayoutStride, LayoutStride,
+                              Experimental::ROCm, int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(float****, LayoutStride, Experimental::ROCm,
+                              int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_float_LayoutStride_Rank5.cpp b/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_float_LayoutStride_Rank5.cpp
index 1dedd07a11..85ec8fc2d1 100644
--- a/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_float_LayoutStride_Rank5.cpp
+++ b/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_float_LayoutStride_Rank5.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,22 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*****,LayoutStride,LayoutRight, Experimental::ROCm,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*****,LayoutStride,LayoutLeft,  Experimental::ROCm,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*****,LayoutStride,LayoutStride,Experimental::ROCm,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(float*****,LayoutStride,Experimental::ROCm,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*****, LayoutStride, LayoutRight,
+                              Experimental::ROCm, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*****, LayoutStride, LayoutLeft,
+                              Experimental::ROCm, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*****, LayoutStride, LayoutStride,
+                              Experimental::ROCm, int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(float*****, LayoutStride, Experimental::ROCm,
+                              int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_float_LayoutStride_Rank8.cpp b/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_float_LayoutStride_Rank8.cpp
index 600f3fb100..7b9ef4eedb 100644
--- a/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_float_LayoutStride_Rank8.cpp
+++ b/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_float_LayoutStride_Rank8.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,22 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float********,LayoutStride,LayoutRight, Experimental::ROCm,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float********,LayoutStride,LayoutLeft,  Experimental::ROCm,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float********,LayoutStride,LayoutStride,Experimental::ROCm,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(float********,LayoutStride,Experimental::ROCm,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float********, LayoutStride, LayoutRight,
+                              Experimental::ROCm, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float********, LayoutStride, LayoutLeft,
+                              Experimental::ROCm, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float********, LayoutStride, LayoutStride,
+                              Experimental::ROCm, int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(float********, LayoutStride, Experimental::ROCm,
+                              int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank1.cpp b/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank1.cpp
index 3ee2707f0c..0e37d90d7b 100644
--- a/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank1.cpp
+++ b/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank1.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*,LayoutLeft,LayoutRight, Experimental::ROCm,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*,LayoutLeft,LayoutLeft,  Experimental::ROCm,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*,LayoutLeft,LayoutStride,Experimental::ROCm,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t*,LayoutLeft,Experimental::ROCm,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*, LayoutLeft, LayoutRight,
+                              Experimental::ROCm, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*, LayoutLeft, LayoutLeft,
+                              Experimental::ROCm, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*, LayoutLeft, LayoutStride,
+                              Experimental::ROCm, int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t*, LayoutLeft, Experimental::ROCm, int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank2.cpp b/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank2.cpp
index d26d3453e9..aa484fcff0 100644
--- a/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank2.cpp
+++ b/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank2.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,22 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t**,LayoutLeft,LayoutRight, Experimental::ROCm,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t**,LayoutLeft,LayoutLeft,  Experimental::ROCm,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t**,LayoutLeft,LayoutStride,Experimental::ROCm,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t**,LayoutLeft,Experimental::ROCm,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t**, LayoutLeft, LayoutRight,
+                              Experimental::ROCm, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t**, LayoutLeft, LayoutLeft,
+                              Experimental::ROCm, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t**, LayoutLeft, LayoutStride,
+                              Experimental::ROCm, int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t**, LayoutLeft, Experimental::ROCm,
+                              int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank3.cpp b/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank3.cpp
index 444eb7ffdd..94b5ba4707 100644
--- a/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank3.cpp
+++ b/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank3.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,22 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t***,LayoutLeft,LayoutRight, Experimental::ROCm,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t***,LayoutLeft,LayoutLeft,  Experimental::ROCm,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t***,LayoutLeft,LayoutStride,Experimental::ROCm,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t***,LayoutLeft,Experimental::ROCm,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t***, LayoutLeft, LayoutRight,
+                              Experimental::ROCm, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t***, LayoutLeft, LayoutLeft,
+                              Experimental::ROCm, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t***, LayoutLeft, LayoutStride,
+                              Experimental::ROCm, int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t***, LayoutLeft, Experimental::ROCm,
+                              int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank4.cpp b/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank4.cpp
index 2f0cc14dac..f5f88d999e 100644
--- a/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank4.cpp
+++ b/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank4.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,22 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t****,LayoutLeft,LayoutRight, Experimental::ROCm,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t****,LayoutLeft,LayoutLeft,  Experimental::ROCm,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t****,LayoutLeft,LayoutStride,Experimental::ROCm,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t****,LayoutLeft,Experimental::ROCm,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t****, LayoutLeft, LayoutRight,
+                              Experimental::ROCm, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t****, LayoutLeft, LayoutLeft,
+                              Experimental::ROCm, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t****, LayoutLeft, LayoutStride,
+                              Experimental::ROCm, int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t****, LayoutLeft, Experimental::ROCm,
+                              int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank5.cpp b/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank5.cpp
index c36bbc590b..056fccd673 100644
--- a/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank5.cpp
+++ b/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank5.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,22 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*****,LayoutLeft,LayoutRight, Experimental::ROCm,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*****,LayoutLeft,LayoutLeft,  Experimental::ROCm,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*****,LayoutLeft,LayoutStride,Experimental::ROCm,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t*****,LayoutLeft,Experimental::ROCm,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*****, LayoutLeft, LayoutRight,
+                              Experimental::ROCm, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*****, LayoutLeft, LayoutLeft,
+                              Experimental::ROCm, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*****, LayoutLeft, LayoutStride,
+                              Experimental::ROCm, int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t*****, LayoutLeft, Experimental::ROCm,
+                              int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank8.cpp b/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank8.cpp
index 4156f83bf2..00dfe959c5 100644
--- a/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank8.cpp
+++ b/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank8.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,22 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t********,LayoutLeft,LayoutRight, Experimental::ROCm,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t********,LayoutLeft,LayoutLeft,  Experimental::ROCm,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t********,LayoutLeft,LayoutStride,Experimental::ROCm,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t********,LayoutLeft,Experimental::ROCm,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t********, LayoutLeft, LayoutRight,
+                              Experimental::ROCm, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t********, LayoutLeft, LayoutLeft,
+                              Experimental::ROCm, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t********, LayoutLeft, LayoutStride,
+                              Experimental::ROCm, int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t********, LayoutLeft, Experimental::ROCm,
+                              int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank1.cpp b/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank1.cpp
index 401719d459..9d975b184c 100644
--- a/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank1.cpp
+++ b/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank1.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,22 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*,LayoutRight,LayoutRight, Experimental::ROCm,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*,LayoutRight,LayoutLeft,  Experimental::ROCm,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*,LayoutRight,LayoutStride,Experimental::ROCm,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t*,LayoutRight,Experimental::ROCm,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*, LayoutRight, LayoutRight,
+                              Experimental::ROCm, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*, LayoutRight, LayoutLeft,
+                              Experimental::ROCm, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*, LayoutRight, LayoutStride,
+                              Experimental::ROCm, int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t*, LayoutRight, Experimental::ROCm,
+                              int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank2.cpp b/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank2.cpp
index 020fc44ad3..c01f76e9e6 100644
--- a/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank2.cpp
+++ b/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank2.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,22 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t**,LayoutRight,LayoutRight, Experimental::ROCm,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t**,LayoutRight,LayoutLeft,  Experimental::ROCm,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t**,LayoutRight,LayoutStride,Experimental::ROCm,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t**,LayoutRight,Experimental::ROCm,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t**, LayoutRight, LayoutRight,
+                              Experimental::ROCm, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t**, LayoutRight, LayoutLeft,
+                              Experimental::ROCm, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t**, LayoutRight, LayoutStride,
+                              Experimental::ROCm, int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t**, LayoutRight, Experimental::ROCm,
+                              int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank3.cpp b/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank3.cpp
index bfccbde750..5fc0e1cbac 100644
--- a/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank3.cpp
+++ b/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank3.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,22 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t***,LayoutRight,LayoutRight, Experimental::ROCm,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t***,LayoutRight,LayoutLeft,  Experimental::ROCm,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t***,LayoutRight,LayoutStride,Experimental::ROCm,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t***,LayoutRight,Experimental::ROCm,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t***, LayoutRight, LayoutRight,
+                              Experimental::ROCm, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t***, LayoutRight, LayoutLeft,
+                              Experimental::ROCm, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t***, LayoutRight, LayoutStride,
+                              Experimental::ROCm, int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t***, LayoutRight, Experimental::ROCm,
+                              int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank4.cpp b/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank4.cpp
index 5f3db5be34..2124318ad8 100644
--- a/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank4.cpp
+++ b/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank4.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,22 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t****,LayoutRight,LayoutRight, Experimental::ROCm,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t****,LayoutRight,LayoutLeft,  Experimental::ROCm,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t****,LayoutRight,LayoutStride,Experimental::ROCm,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t****,LayoutRight,Experimental::ROCm,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t****, LayoutRight, LayoutRight,
+                              Experimental::ROCm, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t****, LayoutRight, LayoutLeft,
+                              Experimental::ROCm, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t****, LayoutRight, LayoutStride,
+                              Experimental::ROCm, int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t****, LayoutRight, Experimental::ROCm,
+                              int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank5.cpp b/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank5.cpp
index 6ba3d3ff88..1dc1ece2cb 100644
--- a/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank5.cpp
+++ b/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank5.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,22 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*****,LayoutRight,LayoutRight, Experimental::ROCm,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*****,LayoutRight,LayoutLeft,  Experimental::ROCm,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*****,LayoutRight,LayoutStride,Experimental::ROCm,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t*****,LayoutRight,Experimental::ROCm,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*****, LayoutRight, LayoutRight,
+                              Experimental::ROCm, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*****, LayoutRight, LayoutLeft,
+                              Experimental::ROCm, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*****, LayoutRight, LayoutStride,
+                              Experimental::ROCm, int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t*****, LayoutRight, Experimental::ROCm,
+                              int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank8.cpp b/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank8.cpp
index 66e8a5650c..2b49fe1931 100644
--- a/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank8.cpp
+++ b/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank8.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,22 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t********,LayoutRight,LayoutRight, Experimental::ROCm,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t********,LayoutRight,LayoutLeft,  Experimental::ROCm,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t********,LayoutRight,LayoutStride,Experimental::ROCm,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t********,LayoutRight,Experimental::ROCm,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t********, LayoutRight, LayoutRight,
+                              Experimental::ROCm, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t********, LayoutRight, LayoutLeft,
+                              Experimental::ROCm, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t********, LayoutRight, LayoutStride,
+                              Experimental::ROCm, int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t********, LayoutRight, Experimental::ROCm,
+                              int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank1.cpp b/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank1.cpp
index d550c89414..3cc1154673 100644
--- a/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank1.cpp
+++ b/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank1.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,22 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*,LayoutStride,LayoutRight, Experimental::ROCm,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*,LayoutStride,LayoutLeft,  Experimental::ROCm,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*,LayoutStride,LayoutStride,Experimental::ROCm,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t*,LayoutStride,Experimental::ROCm,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*, LayoutStride, LayoutRight,
+                              Experimental::ROCm, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*, LayoutStride, LayoutLeft,
+                              Experimental::ROCm, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*, LayoutStride, LayoutStride,
+                              Experimental::ROCm, int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t*, LayoutStride, Experimental::ROCm,
+                              int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank2.cpp b/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank2.cpp
index 0c39620a3a..56cb22173e 100644
--- a/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank2.cpp
+++ b/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank2.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,22 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t**,LayoutStride,LayoutRight, Experimental::ROCm,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t**,LayoutStride,LayoutLeft,  Experimental::ROCm,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t**,LayoutStride,LayoutStride,Experimental::ROCm,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t**,LayoutStride,Experimental::ROCm,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t**, LayoutStride, LayoutRight,
+                              Experimental::ROCm, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t**, LayoutStride, LayoutLeft,
+                              Experimental::ROCm, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t**, LayoutStride, LayoutStride,
+                              Experimental::ROCm, int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t**, LayoutStride, Experimental::ROCm,
+                              int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank3.cpp b/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank3.cpp
index 6a037cc2ba..96b4198e07 100644
--- a/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank3.cpp
+++ b/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank3.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,22 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t***,LayoutStride,LayoutRight, Experimental::ROCm,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t***,LayoutStride,LayoutLeft,  Experimental::ROCm,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t***,LayoutStride,LayoutStride,Experimental::ROCm,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t***,LayoutStride,Experimental::ROCm,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t***, LayoutStride, LayoutRight,
+                              Experimental::ROCm, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t***, LayoutStride, LayoutLeft,
+                              Experimental::ROCm, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t***, LayoutStride, LayoutStride,
+                              Experimental::ROCm, int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t***, LayoutStride, Experimental::ROCm,
+                              int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank4.cpp b/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank4.cpp
index e921cec7ce..3bf36b1c82 100644
--- a/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank4.cpp
+++ b/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank4.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,22 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t****,LayoutStride,LayoutRight, Experimental::ROCm,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t****,LayoutStride,LayoutLeft,  Experimental::ROCm,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t****,LayoutStride,LayoutStride,Experimental::ROCm,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t****,LayoutStride,Experimental::ROCm,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t****, LayoutStride, LayoutRight,
+                              Experimental::ROCm, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t****, LayoutStride, LayoutLeft,
+                              Experimental::ROCm, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t****, LayoutStride, LayoutStride,
+                              Experimental::ROCm, int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t****, LayoutStride, Experimental::ROCm,
+                              int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank5.cpp b/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank5.cpp
index 1684bdc5a7..689270a64b 100644
--- a/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank5.cpp
+++ b/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank5.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,22 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*****,LayoutStride,LayoutRight, Experimental::ROCm,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*****,LayoutStride,LayoutLeft,  Experimental::ROCm,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*****,LayoutStride,LayoutStride,Experimental::ROCm,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t*****,LayoutStride,Experimental::ROCm,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*****, LayoutStride, LayoutRight,
+                              Experimental::ROCm, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*****, LayoutStride, LayoutLeft,
+                              Experimental::ROCm, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*****, LayoutStride, LayoutStride,
+                              Experimental::ROCm, int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t*****, LayoutStride, Experimental::ROCm,
+                              int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank8.cpp b/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank8.cpp
index ed99f40da3..995b499425 100644
--- a/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank8.cpp
+++ b/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank8.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,22 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t********,LayoutStride,LayoutRight, Experimental::ROCm,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t********,LayoutStride,LayoutLeft,  Experimental::ROCm,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t********,LayoutStride,LayoutStride,Experimental::ROCm,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t********,LayoutStride,Experimental::ROCm,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t********, LayoutStride, LayoutRight,
+                              Experimental::ROCm, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t********, LayoutStride, LayoutLeft,
+                              Experimental::ROCm, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t********, LayoutStride, LayoutStride,
+                              Experimental::ROCm, int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t********, LayoutStride, Experimental::ROCm,
+                              int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank1.cpp b/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank1.cpp
index 4262cbfcd5..e6f2970a64 100644
--- a/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank1.cpp
+++ b/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank1.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*,LayoutLeft,LayoutRight, Experimental::ROCm,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*,LayoutLeft,LayoutLeft,  Experimental::ROCm,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*,LayoutLeft,LayoutStride,Experimental::ROCm,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int*,LayoutLeft,Experimental::ROCm,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*, LayoutLeft, LayoutRight, Experimental::ROCm,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*, LayoutLeft, LayoutLeft, Experimental::ROCm,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*, LayoutLeft, LayoutStride,
+                              Experimental::ROCm, int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int*, LayoutLeft, Experimental::ROCm, int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank2.cpp b/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank2.cpp
index 7251fc34a7..c4602070eb 100644
--- a/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank2.cpp
+++ b/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank2.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int**,LayoutLeft,LayoutRight, Experimental::ROCm,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int**,LayoutLeft,LayoutLeft,  Experimental::ROCm,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int**,LayoutLeft,LayoutStride,Experimental::ROCm,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int**,LayoutLeft,Experimental::ROCm,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int**, LayoutLeft, LayoutRight,
+                              Experimental::ROCm, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int**, LayoutLeft, LayoutLeft, Experimental::ROCm,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int**, LayoutLeft, LayoutStride,
+                              Experimental::ROCm, int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int**, LayoutLeft, Experimental::ROCm, int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank3.cpp b/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank3.cpp
index 4c9c2f6e72..5a52ee9e86 100644
--- a/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank3.cpp
+++ b/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank3.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int***,LayoutLeft,LayoutRight, Experimental::ROCm,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int***,LayoutLeft,LayoutLeft,  Experimental::ROCm,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int***,LayoutLeft,LayoutStride,Experimental::ROCm,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int***,LayoutLeft,Experimental::ROCm,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int***, LayoutLeft, LayoutRight,
+                              Experimental::ROCm, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int***, LayoutLeft, LayoutLeft,
+                              Experimental::ROCm, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int***, LayoutLeft, LayoutStride,
+                              Experimental::ROCm, int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int***, LayoutLeft, Experimental::ROCm, int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank4.cpp b/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank4.cpp
index 6196fc961b..9fe37b2577 100644
--- a/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank4.cpp
+++ b/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank4.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int****,LayoutLeft,LayoutRight, Experimental::ROCm,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int****,LayoutLeft,LayoutLeft,  Experimental::ROCm,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int****,LayoutLeft,LayoutStride,Experimental::ROCm,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int****,LayoutLeft,Experimental::ROCm,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int****, LayoutLeft, LayoutRight,
+                              Experimental::ROCm, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int****, LayoutLeft, LayoutLeft,
+                              Experimental::ROCm, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int****, LayoutLeft, LayoutStride,
+                              Experimental::ROCm, int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int****, LayoutLeft, Experimental::ROCm, int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank5.cpp b/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank5.cpp
index cc1c6d9ab7..81dd98a95f 100644
--- a/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank5.cpp
+++ b/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank5.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*****,LayoutLeft,LayoutRight, Experimental::ROCm,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*****,LayoutLeft,LayoutLeft,  Experimental::ROCm,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*****,LayoutLeft,LayoutStride,Experimental::ROCm,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int*****,LayoutLeft,Experimental::ROCm,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*****, LayoutLeft, LayoutRight,
+                              Experimental::ROCm, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*****, LayoutLeft, LayoutLeft,
+                              Experimental::ROCm, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*****, LayoutLeft, LayoutStride,
+                              Experimental::ROCm, int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int*****, LayoutLeft, Experimental::ROCm, int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank8.cpp b/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank8.cpp
index 6788bc6bdc..1f487edd27 100644
--- a/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank8.cpp
+++ b/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank8.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,22 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int********,LayoutLeft,LayoutRight, Experimental::ROCm,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int********,LayoutLeft,LayoutLeft,  Experimental::ROCm,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int********,LayoutLeft,LayoutStride,Experimental::ROCm,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int********,LayoutLeft,Experimental::ROCm,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int********, LayoutLeft, LayoutRight,
+                              Experimental::ROCm, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int********, LayoutLeft, LayoutLeft,
+                              Experimental::ROCm, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int********, LayoutLeft, LayoutStride,
+                              Experimental::ROCm, int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int********, LayoutLeft, Experimental::ROCm,
+                              int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int_LayoutRight_Rank1.cpp b/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int_LayoutRight_Rank1.cpp
index ddfea93633..0fe78ecbbb 100644
--- a/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int_LayoutRight_Rank1.cpp
+++ b/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int_LayoutRight_Rank1.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*,LayoutRight,LayoutRight, Experimental::ROCm,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*,LayoutRight,LayoutLeft,  Experimental::ROCm,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*,LayoutRight,LayoutStride,Experimental::ROCm,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int*,LayoutRight,Experimental::ROCm,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*, LayoutRight, LayoutRight,
+                              Experimental::ROCm, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*, LayoutRight, LayoutLeft, Experimental::ROCm,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*, LayoutRight, LayoutStride,
+                              Experimental::ROCm, int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int*, LayoutRight, Experimental::ROCm, int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int_LayoutRight_Rank2.cpp b/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int_LayoutRight_Rank2.cpp
index eda5c752ba..710bfc182a 100644
--- a/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int_LayoutRight_Rank2.cpp
+++ b/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int_LayoutRight_Rank2.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int**,LayoutRight,LayoutRight, Experimental::ROCm,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int**,LayoutRight,LayoutLeft,  Experimental::ROCm,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int**,LayoutRight,LayoutStride,Experimental::ROCm,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int**,LayoutRight,Experimental::ROCm,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int**, LayoutRight, LayoutRight,
+                              Experimental::ROCm, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int**, LayoutRight, LayoutLeft,
+                              Experimental::ROCm, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int**, LayoutRight, LayoutStride,
+                              Experimental::ROCm, int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int**, LayoutRight, Experimental::ROCm, int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int_LayoutRight_Rank3.cpp b/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int_LayoutRight_Rank3.cpp
index 67d6df013a..8f4cf975c6 100644
--- a/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int_LayoutRight_Rank3.cpp
+++ b/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int_LayoutRight_Rank3.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int***,LayoutRight,LayoutRight, Experimental::ROCm,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int***,LayoutRight,LayoutLeft,  Experimental::ROCm,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int***,LayoutRight,LayoutStride,Experimental::ROCm,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int***,LayoutRight,Experimental::ROCm,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int***, LayoutRight, LayoutRight,
+                              Experimental::ROCm, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int***, LayoutRight, LayoutLeft,
+                              Experimental::ROCm, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int***, LayoutRight, LayoutStride,
+                              Experimental::ROCm, int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int***, LayoutRight, Experimental::ROCm, int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int_LayoutRight_Rank4.cpp b/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int_LayoutRight_Rank4.cpp
index 91e6732080..fcf444ca88 100644
--- a/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int_LayoutRight_Rank4.cpp
+++ b/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int_LayoutRight_Rank4.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int****,LayoutRight,LayoutRight, Experimental::ROCm,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int****,LayoutRight,LayoutLeft,  Experimental::ROCm,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int****,LayoutRight,LayoutStride,Experimental::ROCm,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int****,LayoutRight,Experimental::ROCm,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int****, LayoutRight, LayoutRight,
+                              Experimental::ROCm, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int****, LayoutRight, LayoutLeft,
+                              Experimental::ROCm, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int****, LayoutRight, LayoutStride,
+                              Experimental::ROCm, int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int****, LayoutRight, Experimental::ROCm, int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int_LayoutRight_Rank5.cpp b/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int_LayoutRight_Rank5.cpp
index 544f73af82..480c135297 100644
--- a/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int_LayoutRight_Rank5.cpp
+++ b/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int_LayoutRight_Rank5.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,22 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*****,LayoutRight,LayoutRight, Experimental::ROCm,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*****,LayoutRight,LayoutLeft,  Experimental::ROCm,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*****,LayoutRight,LayoutStride,Experimental::ROCm,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int*****,LayoutRight,Experimental::ROCm,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*****, LayoutRight, LayoutRight,
+                              Experimental::ROCm, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*****, LayoutRight, LayoutLeft,
+                              Experimental::ROCm, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*****, LayoutRight, LayoutStride,
+                              Experimental::ROCm, int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int*****, LayoutRight, Experimental::ROCm,
+                              int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int_LayoutRight_Rank8.cpp b/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int_LayoutRight_Rank8.cpp
index fb79ffdf69..f09cb89a32 100644
--- a/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int_LayoutRight_Rank8.cpp
+++ b/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int_LayoutRight_Rank8.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,22 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int********,LayoutRight,LayoutRight, Experimental::ROCm,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int********,LayoutRight,LayoutLeft,  Experimental::ROCm,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int********,LayoutRight,LayoutStride,Experimental::ROCm,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int********,LayoutRight,Experimental::ROCm,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int********, LayoutRight, LayoutRight,
+                              Experimental::ROCm, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int********, LayoutRight, LayoutLeft,
+                              Experimental::ROCm, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int********, LayoutRight, LayoutStride,
+                              Experimental::ROCm, int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int********, LayoutRight, Experimental::ROCm,
+                              int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int_LayoutStride_Rank1.cpp b/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int_LayoutStride_Rank1.cpp
index 688402656f..ef36faebd6 100644
--- a/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int_LayoutStride_Rank1.cpp
+++ b/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int_LayoutStride_Rank1.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*,LayoutStride,LayoutRight, Experimental::ROCm,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*,LayoutStride,LayoutLeft,  Experimental::ROCm,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*,LayoutStride,LayoutStride,Experimental::ROCm,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int*,LayoutStride,Experimental::ROCm,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*, LayoutStride, LayoutRight,
+                              Experimental::ROCm, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*, LayoutStride, LayoutLeft,
+                              Experimental::ROCm, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*, LayoutStride, LayoutStride,
+                              Experimental::ROCm, int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int*, LayoutStride, Experimental::ROCm, int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int_LayoutStride_Rank2.cpp b/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int_LayoutStride_Rank2.cpp
index ee1511bdc7..3e35101505 100644
--- a/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int_LayoutStride_Rank2.cpp
+++ b/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int_LayoutStride_Rank2.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int**,LayoutStride,LayoutRight, Experimental::ROCm,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int**,LayoutStride,LayoutLeft,  Experimental::ROCm,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int**,LayoutStride,LayoutStride,Experimental::ROCm,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int**,LayoutStride,Experimental::ROCm,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int**, LayoutStride, LayoutRight,
+                              Experimental::ROCm, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int**, LayoutStride, LayoutLeft,
+                              Experimental::ROCm, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int**, LayoutStride, LayoutStride,
+                              Experimental::ROCm, int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int**, LayoutStride, Experimental::ROCm, int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int_LayoutStride_Rank3.cpp b/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int_LayoutStride_Rank3.cpp
index b2fc38fad8..b12b8bc9fa 100644
--- a/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int_LayoutStride_Rank3.cpp
+++ b/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int_LayoutStride_Rank3.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int***,LayoutStride,LayoutRight, Experimental::ROCm,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int***,LayoutStride,LayoutLeft,  Experimental::ROCm,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int***,LayoutStride,LayoutStride,Experimental::ROCm,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int***,LayoutStride,Experimental::ROCm,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int***, LayoutStride, LayoutRight,
+                              Experimental::ROCm, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int***, LayoutStride, LayoutLeft,
+                              Experimental::ROCm, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int***, LayoutStride, LayoutStride,
+                              Experimental::ROCm, int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int***, LayoutStride, Experimental::ROCm, int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int_LayoutStride_Rank4.cpp b/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int_LayoutStride_Rank4.cpp
index a20ee7ef40..1e2e042763 100644
--- a/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int_LayoutStride_Rank4.cpp
+++ b/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int_LayoutStride_Rank4.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,22 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int****,LayoutStride,LayoutRight, Experimental::ROCm,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int****,LayoutStride,LayoutLeft,  Experimental::ROCm,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int****,LayoutStride,LayoutStride,Experimental::ROCm,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int****,LayoutStride,Experimental::ROCm,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int****, LayoutStride, LayoutRight,
+                              Experimental::ROCm, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int****, LayoutStride, LayoutLeft,
+                              Experimental::ROCm, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int****, LayoutStride, LayoutStride,
+                              Experimental::ROCm, int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int****, LayoutStride, Experimental::ROCm,
+                              int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int_LayoutStride_Rank5.cpp b/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int_LayoutStride_Rank5.cpp
index 2833279865..4539a40871 100644
--- a/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int_LayoutStride_Rank5.cpp
+++ b/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int_LayoutStride_Rank5.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,22 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*****,LayoutStride,LayoutRight, Experimental::ROCm,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*****,LayoutStride,LayoutLeft,  Experimental::ROCm,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*****,LayoutStride,LayoutStride,Experimental::ROCm,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int*****,LayoutStride,Experimental::ROCm,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*****, LayoutStride, LayoutRight,
+                              Experimental::ROCm, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*****, LayoutStride, LayoutLeft,
+                              Experimental::ROCm, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*****, LayoutStride, LayoutStride,
+                              Experimental::ROCm, int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int*****, LayoutStride, Experimental::ROCm,
+                              int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int_LayoutStride_Rank8.cpp b/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int_LayoutStride_Rank8.cpp
index 41c2c27fca..5af78387da 100644
--- a/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int_LayoutStride_Rank8.cpp
+++ b/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int_LayoutStride_Rank8.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,22 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int********,LayoutStride,LayoutRight, Experimental::ROCm,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int********,LayoutStride,LayoutLeft,  Experimental::ROCm,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int********,LayoutStride,LayoutStride,Experimental::ROCm,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int********,LayoutStride,Experimental::ROCm,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int********, LayoutStride, LayoutRight,
+                              Experimental::ROCm, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int********, LayoutStride, LayoutLeft,
+                              Experimental::ROCm, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int********, LayoutStride, LayoutStride,
+                              Experimental::ROCm, int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int********, LayoutStride, Experimental::ROCm,
+                              int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_double_LayoutLeft_Rank1.cpp b/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_double_LayoutLeft_Rank1.cpp
index 9fbb13c5e7..96f5489054 100644
--- a/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_double_LayoutLeft_Rank1.cpp
+++ b/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_double_LayoutLeft_Rank1.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*,LayoutLeft,LayoutRight, Experimental::ROCm,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*,LayoutLeft,LayoutLeft,  Experimental::ROCm,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*,LayoutLeft,LayoutStride,Experimental::ROCm,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(double*,LayoutLeft,Experimental::ROCm,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*, LayoutLeft, LayoutRight,
+                              Experimental::ROCm, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*, LayoutLeft, LayoutLeft,
+                              Experimental::ROCm, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*, LayoutLeft, LayoutStride,
+                              Experimental::ROCm, int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(double*, LayoutLeft, Experimental::ROCm, int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_double_LayoutLeft_Rank2.cpp b/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_double_LayoutLeft_Rank2.cpp
index a1fa3e1636..957741e776 100644
--- a/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_double_LayoutLeft_Rank2.cpp
+++ b/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_double_LayoutLeft_Rank2.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double**,LayoutLeft,LayoutRight, Experimental::ROCm,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double**,LayoutLeft,LayoutLeft,  Experimental::ROCm,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double**,LayoutLeft,LayoutStride,Experimental::ROCm,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(double**,LayoutLeft,Experimental::ROCm,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double**, LayoutLeft, LayoutRight,
+                              Experimental::ROCm, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double**, LayoutLeft, LayoutLeft,
+                              Experimental::ROCm, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double**, LayoutLeft, LayoutStride,
+                              Experimental::ROCm, int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(double**, LayoutLeft, Experimental::ROCm, int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_double_LayoutLeft_Rank3.cpp b/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_double_LayoutLeft_Rank3.cpp
index 256772e9c4..d1c2254dac 100644
--- a/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_double_LayoutLeft_Rank3.cpp
+++ b/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_double_LayoutLeft_Rank3.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double***,LayoutLeft,LayoutRight, Experimental::ROCm,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double***,LayoutLeft,LayoutLeft,  Experimental::ROCm,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double***,LayoutLeft,LayoutStride,Experimental::ROCm,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(double***,LayoutLeft,Experimental::ROCm,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double***, LayoutLeft, LayoutRight,
+                              Experimental::ROCm, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double***, LayoutLeft, LayoutLeft,
+                              Experimental::ROCm, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double***, LayoutLeft, LayoutStride,
+                              Experimental::ROCm, int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(double***, LayoutLeft, Experimental::ROCm, int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_double_LayoutLeft_Rank4.cpp b/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_double_LayoutLeft_Rank4.cpp
index 0cdc69435e..87b95b9434 100644
--- a/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_double_LayoutLeft_Rank4.cpp
+++ b/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_double_LayoutLeft_Rank4.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double****,LayoutLeft,LayoutRight, Experimental::ROCm,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double****,LayoutLeft,LayoutLeft,  Experimental::ROCm,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double****,LayoutLeft,LayoutStride,Experimental::ROCm,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(double****,LayoutLeft,Experimental::ROCm,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double****, LayoutLeft, LayoutRight,
+                              Experimental::ROCm, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double****, LayoutLeft, LayoutLeft,
+                              Experimental::ROCm, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double****, LayoutLeft, LayoutStride,
+                              Experimental::ROCm, int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(double****, LayoutLeft, Experimental::ROCm, int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_double_LayoutLeft_Rank5.cpp b/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_double_LayoutLeft_Rank5.cpp
index 32666461e7..fba1027fc4 100644
--- a/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_double_LayoutLeft_Rank5.cpp
+++ b/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_double_LayoutLeft_Rank5.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*****,LayoutLeft,LayoutRight, Experimental::ROCm,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*****,LayoutLeft,LayoutLeft,  Experimental::ROCm,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*****,LayoutLeft,LayoutStride,Experimental::ROCm,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(double*****,LayoutLeft,Experimental::ROCm,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*****, LayoutLeft, LayoutRight,
+                              Experimental::ROCm, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*****, LayoutLeft, LayoutLeft,
+                              Experimental::ROCm, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*****, LayoutLeft, LayoutStride,
+                              Experimental::ROCm, int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(double*****, LayoutLeft, Experimental::ROCm, int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_double_LayoutLeft_Rank8.cpp b/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_double_LayoutLeft_Rank8.cpp
index 1a98160dc9..bbd762f1d4 100644
--- a/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_double_LayoutLeft_Rank8.cpp
+++ b/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_double_LayoutLeft_Rank8.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,22 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double********,LayoutLeft,LayoutRight, Experimental::ROCm,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double********,LayoutLeft,LayoutLeft,  Experimental::ROCm,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double********,LayoutLeft,LayoutStride,Experimental::ROCm,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(double********,LayoutLeft,Experimental::ROCm,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double********, LayoutLeft, LayoutRight,
+                              Experimental::ROCm, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double********, LayoutLeft, LayoutLeft,
+                              Experimental::ROCm, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double********, LayoutLeft, LayoutStride,
+                              Experimental::ROCm, int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(double********, LayoutLeft, Experimental::ROCm,
+                              int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_double_LayoutRight_Rank1.cpp b/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_double_LayoutRight_Rank1.cpp
index f27329f5b8..ad31e2c030 100644
--- a/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_double_LayoutRight_Rank1.cpp
+++ b/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_double_LayoutRight_Rank1.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*,LayoutRight,LayoutRight, Experimental::ROCm,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*,LayoutRight,LayoutLeft,  Experimental::ROCm,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*,LayoutRight,LayoutStride,Experimental::ROCm,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(double*,LayoutRight,Experimental::ROCm,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*, LayoutRight, LayoutRight,
+                              Experimental::ROCm, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*, LayoutRight, LayoutLeft,
+                              Experimental::ROCm, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*, LayoutRight, LayoutStride,
+                              Experimental::ROCm, int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(double*, LayoutRight, Experimental::ROCm, int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_double_LayoutRight_Rank2.cpp b/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_double_LayoutRight_Rank2.cpp
index ffbfd36a33..bc14bbcee3 100644
--- a/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_double_LayoutRight_Rank2.cpp
+++ b/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_double_LayoutRight_Rank2.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double**,LayoutRight,LayoutRight, Experimental::ROCm,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double**,LayoutRight,LayoutLeft,  Experimental::ROCm,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double**,LayoutRight,LayoutStride,Experimental::ROCm,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(double**,LayoutRight,Experimental::ROCm,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double**, LayoutRight, LayoutRight,
+                              Experimental::ROCm, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double**, LayoutRight, LayoutLeft,
+                              Experimental::ROCm, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double**, LayoutRight, LayoutStride,
+                              Experimental::ROCm, int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(double**, LayoutRight, Experimental::ROCm, int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_double_LayoutRight_Rank3.cpp b/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_double_LayoutRight_Rank3.cpp
index ef2d78d2cf..736781d696 100644
--- a/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_double_LayoutRight_Rank3.cpp
+++ b/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_double_LayoutRight_Rank3.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double***,LayoutRight,LayoutRight, Experimental::ROCm,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double***,LayoutRight,LayoutLeft,  Experimental::ROCm,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double***,LayoutRight,LayoutStride,Experimental::ROCm,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(double***,LayoutRight,Experimental::ROCm,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double***, LayoutRight, LayoutRight,
+                              Experimental::ROCm, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double***, LayoutRight, LayoutLeft,
+                              Experimental::ROCm, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double***, LayoutRight, LayoutStride,
+                              Experimental::ROCm, int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(double***, LayoutRight, Experimental::ROCm, int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_double_LayoutRight_Rank4.cpp b/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_double_LayoutRight_Rank4.cpp
index ac0fc982e6..6b16fbe952 100644
--- a/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_double_LayoutRight_Rank4.cpp
+++ b/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_double_LayoutRight_Rank4.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double****,LayoutRight,LayoutRight, Experimental::ROCm,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double****,LayoutRight,LayoutLeft,  Experimental::ROCm,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double****,LayoutRight,LayoutStride,Experimental::ROCm,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(double****,LayoutRight,Experimental::ROCm,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double****, LayoutRight, LayoutRight,
+                              Experimental::ROCm, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double****, LayoutRight, LayoutLeft,
+                              Experimental::ROCm, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double****, LayoutRight, LayoutStride,
+                              Experimental::ROCm, int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(double****, LayoutRight, Experimental::ROCm, int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_double_LayoutRight_Rank5.cpp b/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_double_LayoutRight_Rank5.cpp
index f35680c080..95ce9c9521 100644
--- a/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_double_LayoutRight_Rank5.cpp
+++ b/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_double_LayoutRight_Rank5.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*****,LayoutRight,LayoutRight, Experimental::ROCm,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*****,LayoutRight,LayoutLeft,  Experimental::ROCm,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*****,LayoutRight,LayoutStride,Experimental::ROCm,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(double*****,LayoutRight,Experimental::ROCm,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*****, LayoutRight, LayoutRight,
+                              Experimental::ROCm, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*****, LayoutRight, LayoutLeft,
+                              Experimental::ROCm, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*****, LayoutRight, LayoutStride,
+                              Experimental::ROCm, int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(double*****, LayoutRight, Experimental::ROCm, int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_double_LayoutRight_Rank8.cpp b/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_double_LayoutRight_Rank8.cpp
index 155e8a9e66..34888c4e4a 100644
--- a/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_double_LayoutRight_Rank8.cpp
+++ b/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_double_LayoutRight_Rank8.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,22 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double********,LayoutRight,LayoutRight, Experimental::ROCm,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double********,LayoutRight,LayoutLeft,  Experimental::ROCm,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double********,LayoutRight,LayoutStride,Experimental::ROCm,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(double********,LayoutRight,Experimental::ROCm,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double********, LayoutRight, LayoutRight,
+                              Experimental::ROCm, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double********, LayoutRight, LayoutLeft,
+                              Experimental::ROCm, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double********, LayoutRight, LayoutStride,
+                              Experimental::ROCm, int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(double********, LayoutRight, Experimental::ROCm,
+                              int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_double_LayoutStride_Rank1.cpp b/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_double_LayoutStride_Rank1.cpp
index 57000ac6d6..eba5f4acd2 100644
--- a/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_double_LayoutStride_Rank1.cpp
+++ b/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_double_LayoutStride_Rank1.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*,LayoutStride,LayoutRight, Experimental::ROCm,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*,LayoutStride,LayoutLeft,  Experimental::ROCm,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*,LayoutStride,LayoutStride,Experimental::ROCm,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(double*,LayoutStride,Experimental::ROCm,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*, LayoutStride, LayoutRight,
+                              Experimental::ROCm, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*, LayoutStride, LayoutLeft,
+                              Experimental::ROCm, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*, LayoutStride, LayoutStride,
+                              Experimental::ROCm, int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(double*, LayoutStride, Experimental::ROCm, int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_double_LayoutStride_Rank2.cpp b/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_double_LayoutStride_Rank2.cpp
index fa5fd8daef..bc3ed4dcab 100644
--- a/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_double_LayoutStride_Rank2.cpp
+++ b/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_double_LayoutStride_Rank2.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double**,LayoutStride,LayoutRight, Experimental::ROCm,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double**,LayoutStride,LayoutLeft,  Experimental::ROCm,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double**,LayoutStride,LayoutStride,Experimental::ROCm,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(double**,LayoutStride,Experimental::ROCm,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double**, LayoutStride, LayoutRight,
+                              Experimental::ROCm, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double**, LayoutStride, LayoutLeft,
+                              Experimental::ROCm, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double**, LayoutStride, LayoutStride,
+                              Experimental::ROCm, int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(double**, LayoutStride, Experimental::ROCm, int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_double_LayoutStride_Rank3.cpp b/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_double_LayoutStride_Rank3.cpp
index 4efaabefc1..f7a669c820 100644
--- a/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_double_LayoutStride_Rank3.cpp
+++ b/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_double_LayoutStride_Rank3.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double***,LayoutStride,LayoutRight, Experimental::ROCm,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double***,LayoutStride,LayoutLeft,  Experimental::ROCm,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double***,LayoutStride,LayoutStride,Experimental::ROCm,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(double***,LayoutStride,Experimental::ROCm,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double***, LayoutStride, LayoutRight,
+                              Experimental::ROCm, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double***, LayoutStride, LayoutLeft,
+                              Experimental::ROCm, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double***, LayoutStride, LayoutStride,
+                              Experimental::ROCm, int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(double***, LayoutStride, Experimental::ROCm, int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_double_LayoutStride_Rank4.cpp b/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_double_LayoutStride_Rank4.cpp
index 30447c85a6..084a97323b 100644
--- a/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_double_LayoutStride_Rank4.cpp
+++ b/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_double_LayoutStride_Rank4.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double****,LayoutStride,LayoutRight, Experimental::ROCm,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double****,LayoutStride,LayoutLeft,  Experimental::ROCm,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double****,LayoutStride,LayoutStride,Experimental::ROCm,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(double****,LayoutStride,Experimental::ROCm,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double****, LayoutStride, LayoutRight,
+                              Experimental::ROCm, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double****, LayoutStride, LayoutLeft,
+                              Experimental::ROCm, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double****, LayoutStride, LayoutStride,
+                              Experimental::ROCm, int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(double****, LayoutStride, Experimental::ROCm, int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_double_LayoutStride_Rank5.cpp b/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_double_LayoutStride_Rank5.cpp
index 06a0437b93..d5e1538ca1 100644
--- a/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_double_LayoutStride_Rank5.cpp
+++ b/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_double_LayoutStride_Rank5.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,22 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*****,LayoutStride,LayoutRight, Experimental::ROCm,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*****,LayoutStride,LayoutLeft,  Experimental::ROCm,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*****,LayoutStride,LayoutStride,Experimental::ROCm,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(double*****,LayoutStride,Experimental::ROCm,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*****, LayoutStride, LayoutRight,
+                              Experimental::ROCm, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*****, LayoutStride, LayoutLeft,
+                              Experimental::ROCm, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*****, LayoutStride, LayoutStride,
+                              Experimental::ROCm, int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(double*****, LayoutStride, Experimental::ROCm,
+                              int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_double_LayoutStride_Rank8.cpp b/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_double_LayoutStride_Rank8.cpp
index dd7e9c3b45..c2ffd740af 100644
--- a/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_double_LayoutStride_Rank8.cpp
+++ b/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_double_LayoutStride_Rank8.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,22 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double********,LayoutStride,LayoutRight, Experimental::ROCm,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double********,LayoutStride,LayoutLeft,  Experimental::ROCm,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double********,LayoutStride,LayoutStride,Experimental::ROCm,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(double********,LayoutStride,Experimental::ROCm,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double********, LayoutStride, LayoutRight,
+                              Experimental::ROCm, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double********, LayoutStride, LayoutLeft,
+                              Experimental::ROCm, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double********, LayoutStride, LayoutStride,
+                              Experimental::ROCm, int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(double********, LayoutStride, Experimental::ROCm,
+                              int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_float_LayoutLeft_Rank1.cpp b/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_float_LayoutLeft_Rank1.cpp
index 57f134c1de..c7560e2eba 100644
--- a/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_float_LayoutLeft_Rank1.cpp
+++ b/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_float_LayoutLeft_Rank1.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*,LayoutLeft,LayoutRight, Experimental::ROCm,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*,LayoutLeft,LayoutLeft,  Experimental::ROCm,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*,LayoutLeft,LayoutStride,Experimental::ROCm,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(float*,LayoutLeft,Experimental::ROCm,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*, LayoutLeft, LayoutRight,
+                              Experimental::ROCm, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*, LayoutLeft, LayoutLeft,
+                              Experimental::ROCm, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*, LayoutLeft, LayoutStride,
+                              Experimental::ROCm, int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(float*, LayoutLeft, Experimental::ROCm, int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_float_LayoutLeft_Rank2.cpp b/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_float_LayoutLeft_Rank2.cpp
index 33fd5597b7..650e368469 100644
--- a/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_float_LayoutLeft_Rank2.cpp
+++ b/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_float_LayoutLeft_Rank2.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float**,LayoutLeft,LayoutRight, Experimental::ROCm,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float**,LayoutLeft,LayoutLeft,  Experimental::ROCm,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float**,LayoutLeft,LayoutStride,Experimental::ROCm,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(float**,LayoutLeft,Experimental::ROCm,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float**, LayoutLeft, LayoutRight,
+                              Experimental::ROCm, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float**, LayoutLeft, LayoutLeft,
+                              Experimental::ROCm, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float**, LayoutLeft, LayoutStride,
+                              Experimental::ROCm, int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(float**, LayoutLeft, Experimental::ROCm, int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_float_LayoutLeft_Rank3.cpp b/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_float_LayoutLeft_Rank3.cpp
index 8e48691d71..19636e8bf7 100644
--- a/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_float_LayoutLeft_Rank3.cpp
+++ b/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_float_LayoutLeft_Rank3.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float***,LayoutLeft,LayoutRight, Experimental::ROCm,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float***,LayoutLeft,LayoutLeft,  Experimental::ROCm,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float***,LayoutLeft,LayoutStride,Experimental::ROCm,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(float***,LayoutLeft,Experimental::ROCm,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float***, LayoutLeft, LayoutRight,
+                              Experimental::ROCm, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float***, LayoutLeft, LayoutLeft,
+                              Experimental::ROCm, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float***, LayoutLeft, LayoutStride,
+                              Experimental::ROCm, int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(float***, LayoutLeft, Experimental::ROCm, int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_float_LayoutLeft_Rank4.cpp b/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_float_LayoutLeft_Rank4.cpp
index 493b7e1f75..2d15ad10e8 100644
--- a/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_float_LayoutLeft_Rank4.cpp
+++ b/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_float_LayoutLeft_Rank4.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float****,LayoutLeft,LayoutRight, Experimental::ROCm,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float****,LayoutLeft,LayoutLeft,  Experimental::ROCm,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float****,LayoutLeft,LayoutStride,Experimental::ROCm,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(float****,LayoutLeft,Experimental::ROCm,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float****, LayoutLeft, LayoutRight,
+                              Experimental::ROCm, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float****, LayoutLeft, LayoutLeft,
+                              Experimental::ROCm, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float****, LayoutLeft, LayoutStride,
+                              Experimental::ROCm, int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(float****, LayoutLeft, Experimental::ROCm, int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_float_LayoutLeft_Rank5.cpp b/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_float_LayoutLeft_Rank5.cpp
index 1d2faee2e0..477b8e44b7 100644
--- a/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_float_LayoutLeft_Rank5.cpp
+++ b/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_float_LayoutLeft_Rank5.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*****,LayoutLeft,LayoutRight, Experimental::ROCm,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*****,LayoutLeft,LayoutLeft,  Experimental::ROCm,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*****,LayoutLeft,LayoutStride,Experimental::ROCm,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(float*****,LayoutLeft,Experimental::ROCm,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*****, LayoutLeft, LayoutRight,
+                              Experimental::ROCm, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*****, LayoutLeft, LayoutLeft,
+                              Experimental::ROCm, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*****, LayoutLeft, LayoutStride,
+                              Experimental::ROCm, int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(float*****, LayoutLeft, Experimental::ROCm, int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_float_LayoutLeft_Rank8.cpp b/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_float_LayoutLeft_Rank8.cpp
index 3bbd3eab30..6f4234e708 100644
--- a/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_float_LayoutLeft_Rank8.cpp
+++ b/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_float_LayoutLeft_Rank8.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,22 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float********,LayoutLeft,LayoutRight, Experimental::ROCm,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float********,LayoutLeft,LayoutLeft,  Experimental::ROCm,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float********,LayoutLeft,LayoutStride,Experimental::ROCm,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(float********,LayoutLeft,Experimental::ROCm,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float********, LayoutLeft, LayoutRight,
+                              Experimental::ROCm, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float********, LayoutLeft, LayoutLeft,
+                              Experimental::ROCm, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float********, LayoutLeft, LayoutStride,
+                              Experimental::ROCm, int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(float********, LayoutLeft, Experimental::ROCm,
+                              int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_float_LayoutRight_Rank1.cpp b/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_float_LayoutRight_Rank1.cpp
index 66ce02ed67..4697b8285d 100644
--- a/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_float_LayoutRight_Rank1.cpp
+++ b/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_float_LayoutRight_Rank1.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*,LayoutRight,LayoutRight, Experimental::ROCm,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*,LayoutRight,LayoutLeft,  Experimental::ROCm,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*,LayoutRight,LayoutStride,Experimental::ROCm,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(float*,LayoutRight,Experimental::ROCm,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*, LayoutRight, LayoutRight,
+                              Experimental::ROCm, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*, LayoutRight, LayoutLeft,
+                              Experimental::ROCm, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*, LayoutRight, LayoutStride,
+                              Experimental::ROCm, int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(float*, LayoutRight, Experimental::ROCm, int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_float_LayoutRight_Rank2.cpp b/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_float_LayoutRight_Rank2.cpp
index f9ae820532..4e15f36512 100644
--- a/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_float_LayoutRight_Rank2.cpp
+++ b/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_float_LayoutRight_Rank2.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float**,LayoutRight,LayoutRight, Experimental::ROCm,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float**,LayoutRight,LayoutLeft,  Experimental::ROCm,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float**,LayoutRight,LayoutStride,Experimental::ROCm,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(float**,LayoutRight,Experimental::ROCm,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float**, LayoutRight, LayoutRight,
+                              Experimental::ROCm, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float**, LayoutRight, LayoutLeft,
+                              Experimental::ROCm, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float**, LayoutRight, LayoutStride,
+                              Experimental::ROCm, int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(float**, LayoutRight, Experimental::ROCm, int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_float_LayoutRight_Rank3.cpp b/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_float_LayoutRight_Rank3.cpp
index f203404c75..4336ff9ed3 100644
--- a/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_float_LayoutRight_Rank3.cpp
+++ b/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_float_LayoutRight_Rank3.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float***,LayoutRight,LayoutRight, Experimental::ROCm,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float***,LayoutRight,LayoutLeft,  Experimental::ROCm,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float***,LayoutRight,LayoutStride,Experimental::ROCm,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(float***,LayoutRight,Experimental::ROCm,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float***, LayoutRight, LayoutRight,
+                              Experimental::ROCm, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float***, LayoutRight, LayoutLeft,
+                              Experimental::ROCm, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float***, LayoutRight, LayoutStride,
+                              Experimental::ROCm, int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(float***, LayoutRight, Experimental::ROCm, int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_float_LayoutRight_Rank4.cpp b/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_float_LayoutRight_Rank4.cpp
index 31ddaa6f19..a93494cb0c 100644
--- a/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_float_LayoutRight_Rank4.cpp
+++ b/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_float_LayoutRight_Rank4.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float****,LayoutRight,LayoutRight, Experimental::ROCm,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float****,LayoutRight,LayoutLeft,  Experimental::ROCm,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float****,LayoutRight,LayoutStride,Experimental::ROCm,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(float****,LayoutRight,Experimental::ROCm,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float****, LayoutRight, LayoutRight,
+                              Experimental::ROCm, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float****, LayoutRight, LayoutLeft,
+                              Experimental::ROCm, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float****, LayoutRight, LayoutStride,
+                              Experimental::ROCm, int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(float****, LayoutRight, Experimental::ROCm, int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_float_LayoutRight_Rank5.cpp b/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_float_LayoutRight_Rank5.cpp
index d68baba448..0d4303e974 100644
--- a/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_float_LayoutRight_Rank5.cpp
+++ b/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_float_LayoutRight_Rank5.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*****,LayoutRight,LayoutRight, Experimental::ROCm,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*****,LayoutRight,LayoutLeft,  Experimental::ROCm,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*****,LayoutRight,LayoutStride,Experimental::ROCm,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(float*****,LayoutRight,Experimental::ROCm,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*****, LayoutRight, LayoutRight,
+                              Experimental::ROCm, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*****, LayoutRight, LayoutLeft,
+                              Experimental::ROCm, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*****, LayoutRight, LayoutStride,
+                              Experimental::ROCm, int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(float*****, LayoutRight, Experimental::ROCm, int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_float_LayoutRight_Rank8.cpp b/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_float_LayoutRight_Rank8.cpp
index bc82eba995..02b7f479f5 100644
--- a/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_float_LayoutRight_Rank8.cpp
+++ b/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_float_LayoutRight_Rank8.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,22 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float********,LayoutRight,LayoutRight, Experimental::ROCm,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float********,LayoutRight,LayoutLeft,  Experimental::ROCm,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float********,LayoutRight,LayoutStride,Experimental::ROCm,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(float********,LayoutRight,Experimental::ROCm,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float********, LayoutRight, LayoutRight,
+                              Experimental::ROCm, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float********, LayoutRight, LayoutLeft,
+                              Experimental::ROCm, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float********, LayoutRight, LayoutStride,
+                              Experimental::ROCm, int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(float********, LayoutRight, Experimental::ROCm,
+                              int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_float_LayoutStride_Rank1.cpp b/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_float_LayoutStride_Rank1.cpp
index 1016443c4e..8af29e6d0f 100644
--- a/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_float_LayoutStride_Rank1.cpp
+++ b/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_float_LayoutStride_Rank1.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*,LayoutStride,LayoutRight, Experimental::ROCm,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*,LayoutStride,LayoutLeft,  Experimental::ROCm,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*,LayoutStride,LayoutStride,Experimental::ROCm,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(float*,LayoutStride,Experimental::ROCm,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*, LayoutStride, LayoutRight,
+                              Experimental::ROCm, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*, LayoutStride, LayoutLeft,
+                              Experimental::ROCm, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*, LayoutStride, LayoutStride,
+                              Experimental::ROCm, int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(float*, LayoutStride, Experimental::ROCm, int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_float_LayoutStride_Rank2.cpp b/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_float_LayoutStride_Rank2.cpp
index 86298d9db3..49787220cb 100644
--- a/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_float_LayoutStride_Rank2.cpp
+++ b/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_float_LayoutStride_Rank2.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float**,LayoutStride,LayoutRight, Experimental::ROCm,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float**,LayoutStride,LayoutLeft,  Experimental::ROCm,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float**,LayoutStride,LayoutStride,Experimental::ROCm,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(float**,LayoutStride,Experimental::ROCm,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float**, LayoutStride, LayoutRight,
+                              Experimental::ROCm, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float**, LayoutStride, LayoutLeft,
+                              Experimental::ROCm, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float**, LayoutStride, LayoutStride,
+                              Experimental::ROCm, int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(float**, LayoutStride, Experimental::ROCm, int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_float_LayoutStride_Rank3.cpp b/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_float_LayoutStride_Rank3.cpp
index 0b47f24fe4..a48d561c93 100644
--- a/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_float_LayoutStride_Rank3.cpp
+++ b/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_float_LayoutStride_Rank3.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float***,LayoutStride,LayoutRight, Experimental::ROCm,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float***,LayoutStride,LayoutLeft,  Experimental::ROCm,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float***,LayoutStride,LayoutStride,Experimental::ROCm,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(float***,LayoutStride,Experimental::ROCm,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float***, LayoutStride, LayoutRight,
+                              Experimental::ROCm, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float***, LayoutStride, LayoutLeft,
+                              Experimental::ROCm, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float***, LayoutStride, LayoutStride,
+                              Experimental::ROCm, int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(float***, LayoutStride, Experimental::ROCm, int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_float_LayoutStride_Rank4.cpp b/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_float_LayoutStride_Rank4.cpp
index f67f0a0d81..f5414d25e7 100644
--- a/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_float_LayoutStride_Rank4.cpp
+++ b/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_float_LayoutStride_Rank4.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float****,LayoutStride,LayoutRight, Experimental::ROCm,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float****,LayoutStride,LayoutLeft,  Experimental::ROCm,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float****,LayoutStride,LayoutStride,Experimental::ROCm,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(float****,LayoutStride,Experimental::ROCm,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float****, LayoutStride, LayoutRight,
+                              Experimental::ROCm, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float****, LayoutStride, LayoutLeft,
+                              Experimental::ROCm, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float****, LayoutStride, LayoutStride,
+                              Experimental::ROCm, int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(float****, LayoutStride, Experimental::ROCm, int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_float_LayoutStride_Rank5.cpp b/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_float_LayoutStride_Rank5.cpp
index fc6fcaf435..aa2e44a1c5 100644
--- a/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_float_LayoutStride_Rank5.cpp
+++ b/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_float_LayoutStride_Rank5.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*****,LayoutStride,LayoutRight, Experimental::ROCm,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*****,LayoutStride,LayoutLeft,  Experimental::ROCm,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*****,LayoutStride,LayoutStride,Experimental::ROCm,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(float*****,LayoutStride,Experimental::ROCm,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*****, LayoutStride, LayoutRight,
+                              Experimental::ROCm, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*****, LayoutStride, LayoutLeft,
+                              Experimental::ROCm, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*****, LayoutStride, LayoutStride,
+                              Experimental::ROCm, int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(float*****, LayoutStride, Experimental::ROCm, int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_float_LayoutStride_Rank8.cpp b/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_float_LayoutStride_Rank8.cpp
index bd557a6b00..02401e5ec0 100644
--- a/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_float_LayoutStride_Rank8.cpp
+++ b/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_float_LayoutStride_Rank8.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,22 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float********,LayoutStride,LayoutRight, Experimental::ROCm,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float********,LayoutStride,LayoutLeft,  Experimental::ROCm,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float********,LayoutStride,LayoutStride,Experimental::ROCm,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(float********,LayoutStride,Experimental::ROCm,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float********, LayoutStride, LayoutRight,
+                              Experimental::ROCm, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float********, LayoutStride, LayoutLeft,
+                              Experimental::ROCm, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float********, LayoutStride, LayoutStride,
+                              Experimental::ROCm, int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(float********, LayoutStride, Experimental::ROCm,
+                              int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank1.cpp b/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank1.cpp
index b33cb48352..dc48d2350c 100644
--- a/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank1.cpp
+++ b/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank1.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*,LayoutLeft,LayoutRight, Experimental::ROCm,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*,LayoutLeft,LayoutLeft,  Experimental::ROCm,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*,LayoutLeft,LayoutStride,Experimental::ROCm,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t*,LayoutLeft,Experimental::ROCm,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*, LayoutLeft, LayoutRight,
+                              Experimental::ROCm, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*, LayoutLeft, LayoutLeft,
+                              Experimental::ROCm, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*, LayoutLeft, LayoutStride,
+                              Experimental::ROCm, int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t*, LayoutLeft, Experimental::ROCm, int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank2.cpp b/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank2.cpp
index 2f908123a7..28be03b8a7 100644
--- a/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank2.cpp
+++ b/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank2.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t**,LayoutLeft,LayoutRight, Experimental::ROCm,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t**,LayoutLeft,LayoutLeft,  Experimental::ROCm,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t**,LayoutLeft,LayoutStride,Experimental::ROCm,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t**,LayoutLeft,Experimental::ROCm,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t**, LayoutLeft, LayoutRight,
+                              Experimental::ROCm, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t**, LayoutLeft, LayoutLeft,
+                              Experimental::ROCm, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t**, LayoutLeft, LayoutStride,
+                              Experimental::ROCm, int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t**, LayoutLeft, Experimental::ROCm, int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank3.cpp b/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank3.cpp
index c9c27a59ac..2974698b45 100644
--- a/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank3.cpp
+++ b/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank3.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t***,LayoutLeft,LayoutRight, Experimental::ROCm,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t***,LayoutLeft,LayoutLeft,  Experimental::ROCm,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t***,LayoutLeft,LayoutStride,Experimental::ROCm,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t***,LayoutLeft,Experimental::ROCm,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t***, LayoutLeft, LayoutRight,
+                              Experimental::ROCm, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t***, LayoutLeft, LayoutLeft,
+                              Experimental::ROCm, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t***, LayoutLeft, LayoutStride,
+                              Experimental::ROCm, int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t***, LayoutLeft, Experimental::ROCm, int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank4.cpp b/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank4.cpp
index 3c417e619c..bf9678b7d2 100644
--- a/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank4.cpp
+++ b/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank4.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t****,LayoutLeft,LayoutRight, Experimental::ROCm,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t****,LayoutLeft,LayoutLeft,  Experimental::ROCm,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t****,LayoutLeft,LayoutStride,Experimental::ROCm,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t****,LayoutLeft,Experimental::ROCm,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t****, LayoutLeft, LayoutRight,
+                              Experimental::ROCm, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t****, LayoutLeft, LayoutLeft,
+                              Experimental::ROCm, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t****, LayoutLeft, LayoutStride,
+                              Experimental::ROCm, int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t****, LayoutLeft, Experimental::ROCm, int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank5.cpp b/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank5.cpp
index 5350bbe8f3..7df511d71d 100644
--- a/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank5.cpp
+++ b/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank5.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*****,LayoutLeft,LayoutRight, Experimental::ROCm,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*****,LayoutLeft,LayoutLeft,  Experimental::ROCm,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*****,LayoutLeft,LayoutStride,Experimental::ROCm,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t*****,LayoutLeft,Experimental::ROCm,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*****, LayoutLeft, LayoutRight,
+                              Experimental::ROCm, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*****, LayoutLeft, LayoutLeft,
+                              Experimental::ROCm, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*****, LayoutLeft, LayoutStride,
+                              Experimental::ROCm, int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t*****, LayoutLeft, Experimental::ROCm, int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank8.cpp b/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank8.cpp
index 557032a06c..8eec6cae19 100644
--- a/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank8.cpp
+++ b/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank8.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,22 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t********,LayoutLeft,LayoutRight, Experimental::ROCm,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t********,LayoutLeft,LayoutLeft,  Experimental::ROCm,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t********,LayoutLeft,LayoutStride,Experimental::ROCm,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t********,LayoutLeft,Experimental::ROCm,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t********, LayoutLeft, LayoutRight,
+                              Experimental::ROCm, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t********, LayoutLeft, LayoutLeft,
+                              Experimental::ROCm, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t********, LayoutLeft, LayoutStride,
+                              Experimental::ROCm, int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t********, LayoutLeft, Experimental::ROCm,
+                              int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int64_t_LayoutRight_Rank1.cpp b/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int64_t_LayoutRight_Rank1.cpp
index f5b651a543..5422bacac4 100644
--- a/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int64_t_LayoutRight_Rank1.cpp
+++ b/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int64_t_LayoutRight_Rank1.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*,LayoutRight,LayoutRight, Experimental::ROCm,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*,LayoutRight,LayoutLeft,  Experimental::ROCm,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*,LayoutRight,LayoutStride,Experimental::ROCm,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t*,LayoutRight,Experimental::ROCm,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*, LayoutRight, LayoutRight,
+                              Experimental::ROCm, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*, LayoutRight, LayoutLeft,
+                              Experimental::ROCm, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*, LayoutRight, LayoutStride,
+                              Experimental::ROCm, int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t*, LayoutRight, Experimental::ROCm, int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int64_t_LayoutRight_Rank2.cpp b/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int64_t_LayoutRight_Rank2.cpp
index f0595f3474..dbb856b8da 100644
--- a/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int64_t_LayoutRight_Rank2.cpp
+++ b/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int64_t_LayoutRight_Rank2.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t**,LayoutRight,LayoutRight, Experimental::ROCm,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t**,LayoutRight,LayoutLeft,  Experimental::ROCm,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t**,LayoutRight,LayoutStride,Experimental::ROCm,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t**,LayoutRight,Experimental::ROCm,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t**, LayoutRight, LayoutRight,
+                              Experimental::ROCm, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t**, LayoutRight, LayoutLeft,
+                              Experimental::ROCm, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t**, LayoutRight, LayoutStride,
+                              Experimental::ROCm, int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t**, LayoutRight, Experimental::ROCm, int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int64_t_LayoutRight_Rank3.cpp b/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int64_t_LayoutRight_Rank3.cpp
index 8b5b3a5e59..3944a4671d 100644
--- a/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int64_t_LayoutRight_Rank3.cpp
+++ b/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int64_t_LayoutRight_Rank3.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t***,LayoutRight,LayoutRight, Experimental::ROCm,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t***,LayoutRight,LayoutLeft,  Experimental::ROCm,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t***,LayoutRight,LayoutStride,Experimental::ROCm,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t***,LayoutRight,Experimental::ROCm,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t***, LayoutRight, LayoutRight,
+                              Experimental::ROCm, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t***, LayoutRight, LayoutLeft,
+                              Experimental::ROCm, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t***, LayoutRight, LayoutStride,
+                              Experimental::ROCm, int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t***, LayoutRight, Experimental::ROCm, int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int64_t_LayoutRight_Rank4.cpp b/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int64_t_LayoutRight_Rank4.cpp
index e12687088d..5f490e1a8e 100644
--- a/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int64_t_LayoutRight_Rank4.cpp
+++ b/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int64_t_LayoutRight_Rank4.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t****,LayoutRight,LayoutRight, Experimental::ROCm,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t****,LayoutRight,LayoutLeft,  Experimental::ROCm,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t****,LayoutRight,LayoutStride,Experimental::ROCm,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t****,LayoutRight,Experimental::ROCm,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t****, LayoutRight, LayoutRight,
+                              Experimental::ROCm, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t****, LayoutRight, LayoutLeft,
+                              Experimental::ROCm, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t****, LayoutRight, LayoutStride,
+                              Experimental::ROCm, int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t****, LayoutRight, Experimental::ROCm, int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int64_t_LayoutRight_Rank5.cpp b/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int64_t_LayoutRight_Rank5.cpp
index 033675f5c9..5c2cf9d561 100644
--- a/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int64_t_LayoutRight_Rank5.cpp
+++ b/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int64_t_LayoutRight_Rank5.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,22 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*****,LayoutRight,LayoutRight, Experimental::ROCm,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*****,LayoutRight,LayoutLeft,  Experimental::ROCm,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*****,LayoutRight,LayoutStride,Experimental::ROCm,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t*****,LayoutRight,Experimental::ROCm,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*****, LayoutRight, LayoutRight,
+                              Experimental::ROCm, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*****, LayoutRight, LayoutLeft,
+                              Experimental::ROCm, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*****, LayoutRight, LayoutStride,
+                              Experimental::ROCm, int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t*****, LayoutRight, Experimental::ROCm,
+                              int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int64_t_LayoutRight_Rank8.cpp b/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int64_t_LayoutRight_Rank8.cpp
index 00f49c8bd7..6ca32499b1 100644
--- a/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int64_t_LayoutRight_Rank8.cpp
+++ b/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int64_t_LayoutRight_Rank8.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,22 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t********,LayoutRight,LayoutRight, Experimental::ROCm,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t********,LayoutRight,LayoutLeft,  Experimental::ROCm,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t********,LayoutRight,LayoutStride,Experimental::ROCm,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t********,LayoutRight,Experimental::ROCm,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t********, LayoutRight, LayoutRight,
+                              Experimental::ROCm, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t********, LayoutRight, LayoutLeft,
+                              Experimental::ROCm, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t********, LayoutRight, LayoutStride,
+                              Experimental::ROCm, int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t********, LayoutRight, Experimental::ROCm,
+                              int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int64_t_LayoutStride_Rank1.cpp b/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int64_t_LayoutStride_Rank1.cpp
index 4fe8781897..9c5d40e18a 100644
--- a/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int64_t_LayoutStride_Rank1.cpp
+++ b/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int64_t_LayoutStride_Rank1.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*,LayoutStride,LayoutRight, Experimental::ROCm,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*,LayoutStride,LayoutLeft,  Experimental::ROCm,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*,LayoutStride,LayoutStride,Experimental::ROCm,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t*,LayoutStride,Experimental::ROCm,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*, LayoutStride, LayoutRight,
+                              Experimental::ROCm, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*, LayoutStride, LayoutLeft,
+                              Experimental::ROCm, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*, LayoutStride, LayoutStride,
+                              Experimental::ROCm, int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t*, LayoutStride, Experimental::ROCm, int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int64_t_LayoutStride_Rank2.cpp b/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int64_t_LayoutStride_Rank2.cpp
index 2a19666c4a..ae111b312b 100644
--- a/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int64_t_LayoutStride_Rank2.cpp
+++ b/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int64_t_LayoutStride_Rank2.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t**,LayoutStride,LayoutRight, Experimental::ROCm,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t**,LayoutStride,LayoutLeft,  Experimental::ROCm,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t**,LayoutStride,LayoutStride,Experimental::ROCm,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t**,LayoutStride,Experimental::ROCm,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t**, LayoutStride, LayoutRight,
+                              Experimental::ROCm, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t**, LayoutStride, LayoutLeft,
+                              Experimental::ROCm, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t**, LayoutStride, LayoutStride,
+                              Experimental::ROCm, int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t**, LayoutStride, Experimental::ROCm, int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int64_t_LayoutStride_Rank3.cpp b/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int64_t_LayoutStride_Rank3.cpp
index 867152b2cb..ce6c8a9fc6 100644
--- a/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int64_t_LayoutStride_Rank3.cpp
+++ b/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int64_t_LayoutStride_Rank3.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t***,LayoutStride,LayoutRight, Experimental::ROCm,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t***,LayoutStride,LayoutLeft,  Experimental::ROCm,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t***,LayoutStride,LayoutStride,Experimental::ROCm,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t***,LayoutStride,Experimental::ROCm,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t***, LayoutStride, LayoutRight,
+                              Experimental::ROCm, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t***, LayoutStride, LayoutLeft,
+                              Experimental::ROCm, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t***, LayoutStride, LayoutStride,
+                              Experimental::ROCm, int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t***, LayoutStride, Experimental::ROCm, int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int64_t_LayoutStride_Rank4.cpp b/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int64_t_LayoutStride_Rank4.cpp
index 52661d731b..d56e9e776e 100644
--- a/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int64_t_LayoutStride_Rank4.cpp
+++ b/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int64_t_LayoutStride_Rank4.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,22 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t****,LayoutStride,LayoutRight, Experimental::ROCm,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t****,LayoutStride,LayoutLeft,  Experimental::ROCm,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t****,LayoutStride,LayoutStride,Experimental::ROCm,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t****,LayoutStride,Experimental::ROCm,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t****, LayoutStride, LayoutRight,
+                              Experimental::ROCm, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t****, LayoutStride, LayoutLeft,
+                              Experimental::ROCm, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t****, LayoutStride, LayoutStride,
+                              Experimental::ROCm, int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t****, LayoutStride, Experimental::ROCm,
+                              int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int64_t_LayoutStride_Rank5.cpp b/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int64_t_LayoutStride_Rank5.cpp
index c5484287f6..e1ab19f5ff 100644
--- a/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int64_t_LayoutStride_Rank5.cpp
+++ b/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int64_t_LayoutStride_Rank5.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,22 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*****,LayoutStride,LayoutRight, Experimental::ROCm,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*****,LayoutStride,LayoutLeft,  Experimental::ROCm,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*****,LayoutStride,LayoutStride,Experimental::ROCm,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t*****,LayoutStride,Experimental::ROCm,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*****, LayoutStride, LayoutRight,
+                              Experimental::ROCm, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*****, LayoutStride, LayoutLeft,
+                              Experimental::ROCm, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*****, LayoutStride, LayoutStride,
+                              Experimental::ROCm, int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t*****, LayoutStride, Experimental::ROCm,
+                              int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int64_t_LayoutStride_Rank8.cpp b/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int64_t_LayoutStride_Rank8.cpp
index 20f399e9a8..083cecc074 100644
--- a/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int64_t_LayoutStride_Rank8.cpp
+++ b/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int64_t_LayoutStride_Rank8.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,22 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t********,LayoutStride,LayoutRight, Experimental::ROCm,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t********,LayoutStride,LayoutLeft,  Experimental::ROCm,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t********,LayoutStride,LayoutStride,Experimental::ROCm,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t********,LayoutStride,Experimental::ROCm,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t********, LayoutStride, LayoutRight,
+                              Experimental::ROCm, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t********, LayoutStride, LayoutLeft,
+                              Experimental::ROCm, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t********, LayoutStride, LayoutStride,
+                              Experimental::ROCm, int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t********, LayoutStride, Experimental::ROCm,
+                              int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int_LayoutLeft_Rank1.cpp b/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int_LayoutLeft_Rank1.cpp
index 5528e87f97..b345f2ac43 100644
--- a/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int_LayoutLeft_Rank1.cpp
+++ b/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int_LayoutLeft_Rank1.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*,LayoutLeft,LayoutRight, Experimental::ROCm,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*,LayoutLeft,LayoutLeft,  Experimental::ROCm,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*,LayoutLeft,LayoutStride,Experimental::ROCm,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int*,LayoutLeft,Experimental::ROCm,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*, LayoutLeft, LayoutRight, Experimental::ROCm,
+                              int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*, LayoutLeft, LayoutLeft, Experimental::ROCm,
+                              int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*, LayoutLeft, LayoutStride,
+                              Experimental::ROCm, int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int*, LayoutLeft, Experimental::ROCm, int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int_LayoutLeft_Rank2.cpp b/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int_LayoutLeft_Rank2.cpp
index f58f20e0d6..7370f284cf 100644
--- a/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int_LayoutLeft_Rank2.cpp
+++ b/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int_LayoutLeft_Rank2.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int**,LayoutLeft,LayoutRight, Experimental::ROCm,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int**,LayoutLeft,LayoutLeft,  Experimental::ROCm,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int**,LayoutLeft,LayoutStride,Experimental::ROCm,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int**,LayoutLeft,Experimental::ROCm,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int**, LayoutLeft, LayoutRight,
+                              Experimental::ROCm, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int**, LayoutLeft, LayoutLeft, Experimental::ROCm,
+                              int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int**, LayoutLeft, LayoutStride,
+                              Experimental::ROCm, int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int**, LayoutLeft, Experimental::ROCm, int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int_LayoutLeft_Rank3.cpp b/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int_LayoutLeft_Rank3.cpp
index 2d1e60f24a..e6892ca01a 100644
--- a/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int_LayoutLeft_Rank3.cpp
+++ b/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int_LayoutLeft_Rank3.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int***,LayoutLeft,LayoutRight, Experimental::ROCm,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int***,LayoutLeft,LayoutLeft,  Experimental::ROCm,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int***,LayoutLeft,LayoutStride,Experimental::ROCm,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int***,LayoutLeft,Experimental::ROCm,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int***, LayoutLeft, LayoutRight,
+                              Experimental::ROCm, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int***, LayoutLeft, LayoutLeft,
+                              Experimental::ROCm, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int***, LayoutLeft, LayoutStride,
+                              Experimental::ROCm, int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int***, LayoutLeft, Experimental::ROCm, int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int_LayoutLeft_Rank4.cpp b/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int_LayoutLeft_Rank4.cpp
index 642fd8995c..1560af198f 100644
--- a/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int_LayoutLeft_Rank4.cpp
+++ b/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int_LayoutLeft_Rank4.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int****,LayoutLeft,LayoutRight, Experimental::ROCm,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int****,LayoutLeft,LayoutLeft,  Experimental::ROCm,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int****,LayoutLeft,LayoutStride,Experimental::ROCm,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int****,LayoutLeft,Experimental::ROCm,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int****, LayoutLeft, LayoutRight,
+                              Experimental::ROCm, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int****, LayoutLeft, LayoutLeft,
+                              Experimental::ROCm, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int****, LayoutLeft, LayoutStride,
+                              Experimental::ROCm, int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int****, LayoutLeft, Experimental::ROCm, int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int_LayoutLeft_Rank5.cpp b/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int_LayoutLeft_Rank5.cpp
index 03b3f6be04..a7322631a2 100644
--- a/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int_LayoutLeft_Rank5.cpp
+++ b/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int_LayoutLeft_Rank5.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*****,LayoutLeft,LayoutRight, Experimental::ROCm,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*****,LayoutLeft,LayoutLeft,  Experimental::ROCm,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*****,LayoutLeft,LayoutStride,Experimental::ROCm,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int*****,LayoutLeft,Experimental::ROCm,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*****, LayoutLeft, LayoutRight,
+                              Experimental::ROCm, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*****, LayoutLeft, LayoutLeft,
+                              Experimental::ROCm, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*****, LayoutLeft, LayoutStride,
+                              Experimental::ROCm, int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int*****, LayoutLeft, Experimental::ROCm, int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int_LayoutLeft_Rank8.cpp b/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int_LayoutLeft_Rank8.cpp
index 5e4724862d..2b5d8178c4 100644
--- a/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int_LayoutLeft_Rank8.cpp
+++ b/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int_LayoutLeft_Rank8.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int********,LayoutLeft,LayoutRight, Experimental::ROCm,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int********,LayoutLeft,LayoutLeft,  Experimental::ROCm,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int********,LayoutLeft,LayoutStride,Experimental::ROCm,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int********,LayoutLeft,Experimental::ROCm,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int********, LayoutLeft, LayoutRight,
+                              Experimental::ROCm, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int********, LayoutLeft, LayoutLeft,
+                              Experimental::ROCm, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int********, LayoutLeft, LayoutStride,
+                              Experimental::ROCm, int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int********, LayoutLeft, Experimental::ROCm, int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int_LayoutRight_Rank1.cpp b/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int_LayoutRight_Rank1.cpp
index b7d79ad994..ed476241ff 100644
--- a/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int_LayoutRight_Rank1.cpp
+++ b/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int_LayoutRight_Rank1.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*,LayoutRight,LayoutRight, Experimental::ROCm,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*,LayoutRight,LayoutLeft,  Experimental::ROCm,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*,LayoutRight,LayoutStride,Experimental::ROCm,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int*,LayoutRight,Experimental::ROCm,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*, LayoutRight, LayoutRight,
+                              Experimental::ROCm, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*, LayoutRight, LayoutLeft, Experimental::ROCm,
+                              int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*, LayoutRight, LayoutStride,
+                              Experimental::ROCm, int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int*, LayoutRight, Experimental::ROCm, int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int_LayoutRight_Rank2.cpp b/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int_LayoutRight_Rank2.cpp
index d30ff0b10b..ee2b6739e0 100644
--- a/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int_LayoutRight_Rank2.cpp
+++ b/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int_LayoutRight_Rank2.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int**,LayoutRight,LayoutRight, Experimental::ROCm,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int**,LayoutRight,LayoutLeft,  Experimental::ROCm,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int**,LayoutRight,LayoutStride,Experimental::ROCm,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int**,LayoutRight,Experimental::ROCm,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int**, LayoutRight, LayoutRight,
+                              Experimental::ROCm, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int**, LayoutRight, LayoutLeft,
+                              Experimental::ROCm, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int**, LayoutRight, LayoutStride,
+                              Experimental::ROCm, int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int**, LayoutRight, Experimental::ROCm, int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int_LayoutRight_Rank3.cpp b/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int_LayoutRight_Rank3.cpp
index ce977b9808..a8b7a8ef15 100644
--- a/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int_LayoutRight_Rank3.cpp
+++ b/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int_LayoutRight_Rank3.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int***,LayoutRight,LayoutRight, Experimental::ROCm,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int***,LayoutRight,LayoutLeft,  Experimental::ROCm,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int***,LayoutRight,LayoutStride,Experimental::ROCm,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int***,LayoutRight,Experimental::ROCm,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int***, LayoutRight, LayoutRight,
+                              Experimental::ROCm, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int***, LayoutRight, LayoutLeft,
+                              Experimental::ROCm, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int***, LayoutRight, LayoutStride,
+                              Experimental::ROCm, int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int***, LayoutRight, Experimental::ROCm, int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int_LayoutRight_Rank4.cpp b/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int_LayoutRight_Rank4.cpp
index 4efb0ce971..e11f9b4433 100644
--- a/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int_LayoutRight_Rank4.cpp
+++ b/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int_LayoutRight_Rank4.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int****,LayoutRight,LayoutRight, Experimental::ROCm,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int****,LayoutRight,LayoutLeft,  Experimental::ROCm,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int****,LayoutRight,LayoutStride,Experimental::ROCm,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int****,LayoutRight,Experimental::ROCm,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int****, LayoutRight, LayoutRight,
+                              Experimental::ROCm, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int****, LayoutRight, LayoutLeft,
+                              Experimental::ROCm, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int****, LayoutRight, LayoutStride,
+                              Experimental::ROCm, int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int****, LayoutRight, Experimental::ROCm, int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int_LayoutRight_Rank5.cpp b/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int_LayoutRight_Rank5.cpp
index 7fb139f08e..0e17bc8c5d 100644
--- a/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int_LayoutRight_Rank5.cpp
+++ b/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int_LayoutRight_Rank5.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*****,LayoutRight,LayoutRight, Experimental::ROCm,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*****,LayoutRight,LayoutLeft,  Experimental::ROCm,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*****,LayoutRight,LayoutStride,Experimental::ROCm,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int*****,LayoutRight,Experimental::ROCm,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*****, LayoutRight, LayoutRight,
+                              Experimental::ROCm, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*****, LayoutRight, LayoutLeft,
+                              Experimental::ROCm, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*****, LayoutRight, LayoutStride,
+                              Experimental::ROCm, int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int*****, LayoutRight, Experimental::ROCm, int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int_LayoutRight_Rank8.cpp b/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int_LayoutRight_Rank8.cpp
index 6e3c193890..a7c9b8585d 100644
--- a/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int_LayoutRight_Rank8.cpp
+++ b/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int_LayoutRight_Rank8.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int********,LayoutRight,LayoutRight, Experimental::ROCm,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int********,LayoutRight,LayoutLeft,  Experimental::ROCm,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int********,LayoutRight,LayoutStride,Experimental::ROCm,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int********,LayoutRight,Experimental::ROCm,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int********, LayoutRight, LayoutRight,
+                              Experimental::ROCm, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int********, LayoutRight, LayoutLeft,
+                              Experimental::ROCm, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int********, LayoutRight, LayoutStride,
+                              Experimental::ROCm, int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int********, LayoutRight, Experimental::ROCm, int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int_LayoutStride_Rank1.cpp b/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int_LayoutStride_Rank1.cpp
index 6eefc12328..88c9569a9f 100644
--- a/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int_LayoutStride_Rank1.cpp
+++ b/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int_LayoutStride_Rank1.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*,LayoutStride,LayoutRight, Experimental::ROCm,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*,LayoutStride,LayoutLeft,  Experimental::ROCm,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*,LayoutStride,LayoutStride,Experimental::ROCm,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int*,LayoutStride,Experimental::ROCm,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*, LayoutStride, LayoutRight,
+                              Experimental::ROCm, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*, LayoutStride, LayoutLeft,
+                              Experimental::ROCm, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*, LayoutStride, LayoutStride,
+                              Experimental::ROCm, int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int*, LayoutStride, Experimental::ROCm, int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int_LayoutStride_Rank2.cpp b/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int_LayoutStride_Rank2.cpp
index b5f8a83c11..62ec94f718 100644
--- a/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int_LayoutStride_Rank2.cpp
+++ b/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int_LayoutStride_Rank2.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int**,LayoutStride,LayoutRight, Experimental::ROCm,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int**,LayoutStride,LayoutLeft,  Experimental::ROCm,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int**,LayoutStride,LayoutStride,Experimental::ROCm,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int**,LayoutStride,Experimental::ROCm,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int**, LayoutStride, LayoutRight,
+                              Experimental::ROCm, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int**, LayoutStride, LayoutLeft,
+                              Experimental::ROCm, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int**, LayoutStride, LayoutStride,
+                              Experimental::ROCm, int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int**, LayoutStride, Experimental::ROCm, int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int_LayoutStride_Rank3.cpp b/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int_LayoutStride_Rank3.cpp
index ed38f742b3..9f86f52008 100644
--- a/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int_LayoutStride_Rank3.cpp
+++ b/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int_LayoutStride_Rank3.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int***,LayoutStride,LayoutRight, Experimental::ROCm,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int***,LayoutStride,LayoutLeft,  Experimental::ROCm,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int***,LayoutStride,LayoutStride,Experimental::ROCm,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int***,LayoutStride,Experimental::ROCm,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int***, LayoutStride, LayoutRight,
+                              Experimental::ROCm, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int***, LayoutStride, LayoutLeft,
+                              Experimental::ROCm, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int***, LayoutStride, LayoutStride,
+                              Experimental::ROCm, int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int***, LayoutStride, Experimental::ROCm, int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int_LayoutStride_Rank4.cpp b/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int_LayoutStride_Rank4.cpp
index c4cf30e7f1..a0762ad585 100644
--- a/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int_LayoutStride_Rank4.cpp
+++ b/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int_LayoutStride_Rank4.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int****,LayoutStride,LayoutRight, Experimental::ROCm,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int****,LayoutStride,LayoutLeft,  Experimental::ROCm,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int****,LayoutStride,LayoutStride,Experimental::ROCm,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int****,LayoutStride,Experimental::ROCm,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int****, LayoutStride, LayoutRight,
+                              Experimental::ROCm, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int****, LayoutStride, LayoutLeft,
+                              Experimental::ROCm, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int****, LayoutStride, LayoutStride,
+                              Experimental::ROCm, int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int****, LayoutStride, Experimental::ROCm, int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int_LayoutStride_Rank5.cpp b/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int_LayoutStride_Rank5.cpp
index a3b3a348b4..a3ffd62644 100644
--- a/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int_LayoutStride_Rank5.cpp
+++ b/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int_LayoutStride_Rank5.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*****,LayoutStride,LayoutRight, Experimental::ROCm,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*****,LayoutStride,LayoutLeft,  Experimental::ROCm,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*****,LayoutStride,LayoutStride,Experimental::ROCm,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int*****,LayoutStride,Experimental::ROCm,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*****, LayoutStride, LayoutRight,
+                              Experimental::ROCm, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*****, LayoutStride, LayoutLeft,
+                              Experimental::ROCm, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*****, LayoutStride, LayoutStride,
+                              Experimental::ROCm, int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int*****, LayoutStride, Experimental::ROCm, int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int_LayoutStride_Rank8.cpp b/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int_LayoutStride_Rank8.cpp
index 7b2183206a..fbd2fca225 100644
--- a/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int_LayoutStride_Rank8.cpp
+++ b/lib/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int_LayoutStride_Rank8.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,22 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int********,LayoutStride,LayoutRight, Experimental::ROCm,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int********,LayoutStride,LayoutLeft,  Experimental::ROCm,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int********,LayoutStride,LayoutStride,Experimental::ROCm,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int********,LayoutStride,Experimental::ROCm,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int********, LayoutStride, LayoutRight,
+                              Experimental::ROCm, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int********, LayoutStride, LayoutLeft,
+                              Experimental::ROCm, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int********, LayoutStride, LayoutStride,
+                              Experimental::ROCm, int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int********, LayoutStride, Experimental::ROCm,
+                              int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank1.cpp b/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank1.cpp
index 48be6a1ece..a749ec859b 100644
--- a/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank1.cpp
+++ b/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank1.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,19 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*,LayoutLeft,LayoutRight, Serial,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*,LayoutLeft,LayoutLeft,  Serial,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*,LayoutLeft,LayoutStride,Serial,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(double*,LayoutLeft,Serial,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*, LayoutLeft, LayoutRight, Serial, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*, LayoutLeft, LayoutLeft, Serial, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*, LayoutLeft, LayoutStride, Serial,
+                              int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(double*, LayoutLeft, Serial, int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank2.cpp b/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank2.cpp
index d383eb051c..7a95f39755 100644
--- a/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank2.cpp
+++ b/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank2.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,20 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double**,LayoutLeft,LayoutRight, Serial,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double**,LayoutLeft,LayoutLeft,  Serial,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double**,LayoutLeft,LayoutStride,Serial,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(double**,LayoutLeft,Serial,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double**, LayoutLeft, LayoutRight, Serial,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double**, LayoutLeft, LayoutLeft, Serial, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double**, LayoutLeft, LayoutStride, Serial,
+                              int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(double**, LayoutLeft, Serial, int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank3.cpp b/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank3.cpp
index db8b11aa39..961b788a85 100644
--- a/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank3.cpp
+++ b/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank3.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double***,LayoutLeft,LayoutRight, Serial,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double***,LayoutLeft,LayoutLeft,  Serial,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double***,LayoutLeft,LayoutStride,Serial,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(double***,LayoutLeft,Serial,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double***, LayoutLeft, LayoutRight, Serial,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double***, LayoutLeft, LayoutLeft, Serial,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double***, LayoutLeft, LayoutStride, Serial,
+                              int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(double***, LayoutLeft, Serial, int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank4.cpp b/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank4.cpp
index 85bf1c9deb..57dbaaf95e 100644
--- a/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank4.cpp
+++ b/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank4.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double****,LayoutLeft,LayoutRight, Serial,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double****,LayoutLeft,LayoutLeft,  Serial,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double****,LayoutLeft,LayoutStride,Serial,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(double****,LayoutLeft,Serial,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double****, LayoutLeft, LayoutRight, Serial,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double****, LayoutLeft, LayoutLeft, Serial,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double****, LayoutLeft, LayoutStride, Serial,
+                              int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(double****, LayoutLeft, Serial, int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank5.cpp b/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank5.cpp
index 089141f203..33b0b87208 100644
--- a/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank5.cpp
+++ b/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank5.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*****,LayoutLeft,LayoutRight, Serial,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*****,LayoutLeft,LayoutLeft,  Serial,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*****,LayoutLeft,LayoutStride,Serial,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(double*****,LayoutLeft,Serial,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*****, LayoutLeft, LayoutRight, Serial,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*****, LayoutLeft, LayoutLeft, Serial,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*****, LayoutLeft, LayoutStride, Serial,
+                              int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(double*****, LayoutLeft, Serial, int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank8.cpp b/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank8.cpp
index 468798c322..6ec8b5f294 100644
--- a/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank8.cpp
+++ b/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank8.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double********,LayoutLeft,LayoutRight, Serial,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double********,LayoutLeft,LayoutLeft,  Serial,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double********,LayoutLeft,LayoutStride,Serial,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(double********,LayoutLeft,Serial,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double********, LayoutLeft, LayoutRight, Serial,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double********, LayoutLeft, LayoutLeft, Serial,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double********, LayoutLeft, LayoutStride, Serial,
+                              int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(double********, LayoutLeft, Serial, int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_double_LayoutRight_Rank1.cpp b/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_double_LayoutRight_Rank1.cpp
index 311af3515f..e4660ae4dc 100644
--- a/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_double_LayoutRight_Rank1.cpp
+++ b/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_double_LayoutRight_Rank1.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,20 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*,LayoutRight,LayoutRight, Serial,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*,LayoutRight,LayoutLeft,  Serial,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*,LayoutRight,LayoutStride,Serial,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(double*,LayoutRight,Serial,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*, LayoutRight, LayoutRight, Serial,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*, LayoutRight, LayoutLeft, Serial, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*, LayoutRight, LayoutStride, Serial,
+                              int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(double*, LayoutRight, Serial, int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_double_LayoutRight_Rank2.cpp b/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_double_LayoutRight_Rank2.cpp
index ccee72a4e9..d77fb3eb13 100644
--- a/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_double_LayoutRight_Rank2.cpp
+++ b/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_double_LayoutRight_Rank2.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double**,LayoutRight,LayoutRight, Serial,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double**,LayoutRight,LayoutLeft,  Serial,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double**,LayoutRight,LayoutStride,Serial,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(double**,LayoutRight,Serial,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double**, LayoutRight, LayoutRight, Serial,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double**, LayoutRight, LayoutLeft, Serial,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double**, LayoutRight, LayoutStride, Serial,
+                              int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(double**, LayoutRight, Serial, int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_double_LayoutRight_Rank3.cpp b/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_double_LayoutRight_Rank3.cpp
index 671855bcc3..c7ae12e854 100644
--- a/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_double_LayoutRight_Rank3.cpp
+++ b/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_double_LayoutRight_Rank3.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double***,LayoutRight,LayoutRight, Serial,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double***,LayoutRight,LayoutLeft,  Serial,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double***,LayoutRight,LayoutStride,Serial,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(double***,LayoutRight,Serial,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double***, LayoutRight, LayoutRight, Serial,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double***, LayoutRight, LayoutLeft, Serial,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double***, LayoutRight, LayoutStride, Serial,
+                              int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(double***, LayoutRight, Serial, int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_double_LayoutRight_Rank4.cpp b/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_double_LayoutRight_Rank4.cpp
index 3d4d81ff9b..7a6ad9b578 100644
--- a/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_double_LayoutRight_Rank4.cpp
+++ b/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_double_LayoutRight_Rank4.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double****,LayoutRight,LayoutRight, Serial,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double****,LayoutRight,LayoutLeft,  Serial,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double****,LayoutRight,LayoutStride,Serial,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(double****,LayoutRight,Serial,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double****, LayoutRight, LayoutRight, Serial,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double****, LayoutRight, LayoutLeft, Serial,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double****, LayoutRight, LayoutStride, Serial,
+                              int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(double****, LayoutRight, Serial, int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_double_LayoutRight_Rank5.cpp b/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_double_LayoutRight_Rank5.cpp
index 7a6a9054b3..bfe375c6b4 100644
--- a/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_double_LayoutRight_Rank5.cpp
+++ b/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_double_LayoutRight_Rank5.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*****,LayoutRight,LayoutRight, Serial,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*****,LayoutRight,LayoutLeft,  Serial,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*****,LayoutRight,LayoutStride,Serial,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(double*****,LayoutRight,Serial,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*****, LayoutRight, LayoutRight, Serial,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*****, LayoutRight, LayoutLeft, Serial,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*****, LayoutRight, LayoutStride, Serial,
+                              int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(double*****, LayoutRight, Serial, int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_double_LayoutRight_Rank8.cpp b/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_double_LayoutRight_Rank8.cpp
index c8adea2d8f..11c0c4a813 100644
--- a/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_double_LayoutRight_Rank8.cpp
+++ b/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_double_LayoutRight_Rank8.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double********,LayoutRight,LayoutRight, Serial,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double********,LayoutRight,LayoutLeft,  Serial,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double********,LayoutRight,LayoutStride,Serial,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(double********,LayoutRight,Serial,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double********, LayoutRight, LayoutRight, Serial,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double********, LayoutRight, LayoutLeft, Serial,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double********, LayoutRight, LayoutStride, Serial,
+                              int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(double********, LayoutRight, Serial, int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_double_LayoutStride_Rank1.cpp b/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_double_LayoutStride_Rank1.cpp
index 11d21a605a..8a73236995 100644
--- a/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_double_LayoutStride_Rank1.cpp
+++ b/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_double_LayoutStride_Rank1.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*,LayoutStride,LayoutRight, Serial,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*,LayoutStride,LayoutLeft,  Serial,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*,LayoutStride,LayoutStride,Serial,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(double*,LayoutStride,Serial,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*, LayoutStride, LayoutRight, Serial,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*, LayoutStride, LayoutLeft, Serial,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*, LayoutStride, LayoutStride, Serial,
+                              int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(double*, LayoutStride, Serial, int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_double_LayoutStride_Rank2.cpp b/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_double_LayoutStride_Rank2.cpp
index 6675cf207b..e2c48e8bb0 100644
--- a/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_double_LayoutStride_Rank2.cpp
+++ b/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_double_LayoutStride_Rank2.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double**,LayoutStride,LayoutRight, Serial,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double**,LayoutStride,LayoutLeft,  Serial,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double**,LayoutStride,LayoutStride,Serial,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(double**,LayoutStride,Serial,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double**, LayoutStride, LayoutRight, Serial,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double**, LayoutStride, LayoutLeft, Serial,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double**, LayoutStride, LayoutStride, Serial,
+                              int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(double**, LayoutStride, Serial, int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_double_LayoutStride_Rank3.cpp b/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_double_LayoutStride_Rank3.cpp
index 11bdfac465..b6a7f488d7 100644
--- a/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_double_LayoutStride_Rank3.cpp
+++ b/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_double_LayoutStride_Rank3.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double***,LayoutStride,LayoutRight, Serial,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double***,LayoutStride,LayoutLeft,  Serial,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double***,LayoutStride,LayoutStride,Serial,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(double***,LayoutStride,Serial,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double***, LayoutStride, LayoutRight, Serial,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double***, LayoutStride, LayoutLeft, Serial,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double***, LayoutStride, LayoutStride, Serial,
+                              int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(double***, LayoutStride, Serial, int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_double_LayoutStride_Rank4.cpp b/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_double_LayoutStride_Rank4.cpp
index a8b9e7ee21..2e3313b6eb 100644
--- a/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_double_LayoutStride_Rank4.cpp
+++ b/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_double_LayoutStride_Rank4.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double****,LayoutStride,LayoutRight, Serial,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double****,LayoutStride,LayoutLeft,  Serial,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double****,LayoutStride,LayoutStride,Serial,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(double****,LayoutStride,Serial,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double****, LayoutStride, LayoutRight, Serial,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double****, LayoutStride, LayoutLeft, Serial,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double****, LayoutStride, LayoutStride, Serial,
+                              int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(double****, LayoutStride, Serial, int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_double_LayoutStride_Rank5.cpp b/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_double_LayoutStride_Rank5.cpp
index 2b71fc5564..dcb760fbf4 100644
--- a/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_double_LayoutStride_Rank5.cpp
+++ b/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_double_LayoutStride_Rank5.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*****,LayoutStride,LayoutRight, Serial,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*****,LayoutStride,LayoutLeft,  Serial,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*****,LayoutStride,LayoutStride,Serial,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(double*****,LayoutStride,Serial,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*****, LayoutStride, LayoutRight, Serial,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*****, LayoutStride, LayoutLeft, Serial,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*****, LayoutStride, LayoutStride, Serial,
+                              int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(double*****, LayoutStride, Serial, int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_double_LayoutStride_Rank8.cpp b/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_double_LayoutStride_Rank8.cpp
index 8e34fd8933..9bd7e80e7e 100644
--- a/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_double_LayoutStride_Rank8.cpp
+++ b/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_double_LayoutStride_Rank8.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double********,LayoutStride,LayoutRight, Serial,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double********,LayoutStride,LayoutLeft,  Serial,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double********,LayoutStride,LayoutStride,Serial,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(double********,LayoutStride,Serial,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double********, LayoutStride, LayoutRight, Serial,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double********, LayoutStride, LayoutLeft, Serial,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double********, LayoutStride, LayoutStride,
+                              Serial, int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(double********, LayoutStride, Serial, int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank1.cpp b/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank1.cpp
index 59dfeccbb0..dedbd50d8e 100644
--- a/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank1.cpp
+++ b/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank1.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,18 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*,LayoutLeft,LayoutRight, Serial,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*,LayoutLeft,LayoutLeft,  Serial,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*,LayoutLeft,LayoutStride,Serial,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(float*,LayoutLeft,Serial,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*, LayoutLeft, LayoutRight, Serial, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*, LayoutLeft, LayoutLeft, Serial, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*, LayoutLeft, LayoutStride, Serial, int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(float*, LayoutLeft, Serial, int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank2.cpp b/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank2.cpp
index 7a4fc05cf2..441d4774cc 100644
--- a/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank2.cpp
+++ b/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank2.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,19 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float**,LayoutLeft,LayoutRight, Serial,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float**,LayoutLeft,LayoutLeft,  Serial,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float**,LayoutLeft,LayoutStride,Serial,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(float**,LayoutLeft,Serial,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float**, LayoutLeft, LayoutRight, Serial, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float**, LayoutLeft, LayoutLeft, Serial, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float**, LayoutLeft, LayoutStride, Serial,
+                              int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(float**, LayoutLeft, Serial, int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank3.cpp b/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank3.cpp
index db50dc09fb..b9013da90a 100644
--- a/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank3.cpp
+++ b/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank3.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,20 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float***,LayoutLeft,LayoutRight, Serial,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float***,LayoutLeft,LayoutLeft,  Serial,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float***,LayoutLeft,LayoutStride,Serial,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(float***,LayoutLeft,Serial,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float***, LayoutLeft, LayoutRight, Serial,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float***, LayoutLeft, LayoutLeft, Serial, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float***, LayoutLeft, LayoutStride, Serial,
+                              int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(float***, LayoutLeft, Serial, int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank4.cpp b/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank4.cpp
index 91c2257acc..0b19e47184 100644
--- a/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank4.cpp
+++ b/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank4.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float****,LayoutLeft,LayoutRight, Serial,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float****,LayoutLeft,LayoutLeft,  Serial,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float****,LayoutLeft,LayoutStride,Serial,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(float****,LayoutLeft,Serial,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float****, LayoutLeft, LayoutRight, Serial,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float****, LayoutLeft, LayoutLeft, Serial,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float****, LayoutLeft, LayoutStride, Serial,
+                              int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(float****, LayoutLeft, Serial, int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank5.cpp b/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank5.cpp
index 5281d949e5..f901648517 100644
--- a/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank5.cpp
+++ b/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank5.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*****,LayoutLeft,LayoutRight, Serial,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*****,LayoutLeft,LayoutLeft,  Serial,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*****,LayoutLeft,LayoutStride,Serial,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(float*****,LayoutLeft,Serial,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*****, LayoutLeft, LayoutRight, Serial,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*****, LayoutLeft, LayoutLeft, Serial,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*****, LayoutLeft, LayoutStride, Serial,
+                              int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(float*****, LayoutLeft, Serial, int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank8.cpp b/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank8.cpp
index 603e5750ae..b8ad2e78bd 100644
--- a/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank8.cpp
+++ b/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank8.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float********,LayoutLeft,LayoutRight, Serial,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float********,LayoutLeft,LayoutLeft,  Serial,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float********,LayoutLeft,LayoutStride,Serial,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(float********,LayoutLeft,Serial,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float********, LayoutLeft, LayoutRight, Serial,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float********, LayoutLeft, LayoutLeft, Serial,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float********, LayoutLeft, LayoutStride, Serial,
+                              int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(float********, LayoutLeft, Serial, int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_float_LayoutRight_Rank1.cpp b/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_float_LayoutRight_Rank1.cpp
index c308bb6034..7bf4b7e77f 100644
--- a/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_float_LayoutRight_Rank1.cpp
+++ b/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_float_LayoutRight_Rank1.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,19 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*,LayoutRight,LayoutRight, Serial,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*,LayoutRight,LayoutLeft,  Serial,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*,LayoutRight,LayoutStride,Serial,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(float*,LayoutRight,Serial,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*, LayoutRight, LayoutRight, Serial, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*, LayoutRight, LayoutLeft, Serial, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*, LayoutRight, LayoutStride, Serial,
+                              int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(float*, LayoutRight, Serial, int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_float_LayoutRight_Rank2.cpp b/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_float_LayoutRight_Rank2.cpp
index 2b78dbe16c..39e4d3bb6e 100644
--- a/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_float_LayoutRight_Rank2.cpp
+++ b/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_float_LayoutRight_Rank2.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,20 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float**,LayoutRight,LayoutRight, Serial,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float**,LayoutRight,LayoutLeft,  Serial,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float**,LayoutRight,LayoutStride,Serial,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(float**,LayoutRight,Serial,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float**, LayoutRight, LayoutRight, Serial,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float**, LayoutRight, LayoutLeft, Serial, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float**, LayoutRight, LayoutStride, Serial,
+                              int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(float**, LayoutRight, Serial, int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_float_LayoutRight_Rank3.cpp b/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_float_LayoutRight_Rank3.cpp
index 46d6a678b9..4d845c8e1a 100644
--- a/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_float_LayoutRight_Rank3.cpp
+++ b/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_float_LayoutRight_Rank3.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float***,LayoutRight,LayoutRight, Serial,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float***,LayoutRight,LayoutLeft,  Serial,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float***,LayoutRight,LayoutStride,Serial,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(float***,LayoutRight,Serial,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float***, LayoutRight, LayoutRight, Serial,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float***, LayoutRight, LayoutLeft, Serial,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float***, LayoutRight, LayoutStride, Serial,
+                              int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(float***, LayoutRight, Serial, int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_float_LayoutRight_Rank4.cpp b/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_float_LayoutRight_Rank4.cpp
index cf4bef6605..b0d8e00fef 100644
--- a/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_float_LayoutRight_Rank4.cpp
+++ b/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_float_LayoutRight_Rank4.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float****,LayoutRight,LayoutRight, Serial,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float****,LayoutRight,LayoutLeft,  Serial,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float****,LayoutRight,LayoutStride,Serial,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(float****,LayoutRight,Serial,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float****, LayoutRight, LayoutRight, Serial,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float****, LayoutRight, LayoutLeft, Serial,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float****, LayoutRight, LayoutStride, Serial,
+                              int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(float****, LayoutRight, Serial, int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_float_LayoutRight_Rank5.cpp b/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_float_LayoutRight_Rank5.cpp
index 9f93cafc7d..a8972610c9 100644
--- a/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_float_LayoutRight_Rank5.cpp
+++ b/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_float_LayoutRight_Rank5.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*****,LayoutRight,LayoutRight, Serial,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*****,LayoutRight,LayoutLeft,  Serial,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*****,LayoutRight,LayoutStride,Serial,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(float*****,LayoutRight,Serial,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*****, LayoutRight, LayoutRight, Serial,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*****, LayoutRight, LayoutLeft, Serial,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*****, LayoutRight, LayoutStride, Serial,
+                              int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(float*****, LayoutRight, Serial, int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_float_LayoutRight_Rank8.cpp b/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_float_LayoutRight_Rank8.cpp
index db4e0f524c..c0db2a928b 100644
--- a/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_float_LayoutRight_Rank8.cpp
+++ b/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_float_LayoutRight_Rank8.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float********,LayoutRight,LayoutRight, Serial,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float********,LayoutRight,LayoutLeft,  Serial,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float********,LayoutRight,LayoutStride,Serial,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(float********,LayoutRight,Serial,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float********, LayoutRight, LayoutRight, Serial,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float********, LayoutRight, LayoutLeft, Serial,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float********, LayoutRight, LayoutStride, Serial,
+                              int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(float********, LayoutRight, Serial, int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_float_LayoutStride_Rank1.cpp b/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_float_LayoutStride_Rank1.cpp
index fcc42ef57d..44ef5f0bab 100644
--- a/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_float_LayoutStride_Rank1.cpp
+++ b/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_float_LayoutStride_Rank1.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,20 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*,LayoutStride,LayoutRight, Serial,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*,LayoutStride,LayoutLeft,  Serial,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*,LayoutStride,LayoutStride,Serial,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(float*,LayoutStride,Serial,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*, LayoutStride, LayoutRight, Serial,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*, LayoutStride, LayoutLeft, Serial, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*, LayoutStride, LayoutStride, Serial,
+                              int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(float*, LayoutStride, Serial, int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_float_LayoutStride_Rank2.cpp b/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_float_LayoutStride_Rank2.cpp
index f244e89e64..39d0b58af3 100644
--- a/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_float_LayoutStride_Rank2.cpp
+++ b/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_float_LayoutStride_Rank2.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float**,LayoutStride,LayoutRight, Serial,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float**,LayoutStride,LayoutLeft,  Serial,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float**,LayoutStride,LayoutStride,Serial,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(float**,LayoutStride,Serial,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float**, LayoutStride, LayoutRight, Serial,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float**, LayoutStride, LayoutLeft, Serial,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float**, LayoutStride, LayoutStride, Serial,
+                              int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(float**, LayoutStride, Serial, int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_float_LayoutStride_Rank3.cpp b/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_float_LayoutStride_Rank3.cpp
index c51bc06148..1d6eb2fd34 100644
--- a/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_float_LayoutStride_Rank3.cpp
+++ b/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_float_LayoutStride_Rank3.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float***,LayoutStride,LayoutRight, Serial,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float***,LayoutStride,LayoutLeft,  Serial,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float***,LayoutStride,LayoutStride,Serial,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(float***,LayoutStride,Serial,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float***, LayoutStride, LayoutRight, Serial,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float***, LayoutStride, LayoutLeft, Serial,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float***, LayoutStride, LayoutStride, Serial,
+                              int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(float***, LayoutStride, Serial, int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_float_LayoutStride_Rank4.cpp b/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_float_LayoutStride_Rank4.cpp
index 7229abc2cf..b38d19b999 100644
--- a/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_float_LayoutStride_Rank4.cpp
+++ b/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_float_LayoutStride_Rank4.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float****,LayoutStride,LayoutRight, Serial,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float****,LayoutStride,LayoutLeft,  Serial,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float****,LayoutStride,LayoutStride,Serial,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(float****,LayoutStride,Serial,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float****, LayoutStride, LayoutRight, Serial,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float****, LayoutStride, LayoutLeft, Serial,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float****, LayoutStride, LayoutStride, Serial,
+                              int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(float****, LayoutStride, Serial, int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_float_LayoutStride_Rank5.cpp b/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_float_LayoutStride_Rank5.cpp
index 37a3a88093..360c6b4117 100644
--- a/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_float_LayoutStride_Rank5.cpp
+++ b/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_float_LayoutStride_Rank5.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*****,LayoutStride,LayoutRight, Serial,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*****,LayoutStride,LayoutLeft,  Serial,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*****,LayoutStride,LayoutStride,Serial,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(float*****,LayoutStride,Serial,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*****, LayoutStride, LayoutRight, Serial,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*****, LayoutStride, LayoutLeft, Serial,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*****, LayoutStride, LayoutStride, Serial,
+                              int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(float*****, LayoutStride, Serial, int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_float_LayoutStride_Rank8.cpp b/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_float_LayoutStride_Rank8.cpp
index ccc8178128..f1f1dcde17 100644
--- a/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_float_LayoutStride_Rank8.cpp
+++ b/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_float_LayoutStride_Rank8.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float********,LayoutStride,LayoutRight, Serial,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float********,LayoutStride,LayoutLeft,  Serial,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float********,LayoutStride,LayoutStride,Serial,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(float********,LayoutStride,Serial,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float********, LayoutStride, LayoutRight, Serial,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float********, LayoutStride, LayoutLeft, Serial,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float********, LayoutStride, LayoutStride, Serial,
+                              int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(float********, LayoutStride, Serial, int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank1.cpp b/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank1.cpp
index 9cb9cb57bb..6cfb563e75 100644
--- a/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank1.cpp
+++ b/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank1.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,20 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*,LayoutLeft,LayoutRight, Serial,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*,LayoutLeft,LayoutLeft,  Serial,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*,LayoutLeft,LayoutStride,Serial,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t*,LayoutLeft,Serial,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*, LayoutLeft, LayoutRight, Serial,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*, LayoutLeft, LayoutLeft, Serial, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*, LayoutLeft, LayoutStride, Serial,
+                              int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t*, LayoutLeft, Serial, int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank2.cpp b/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank2.cpp
index 71b6798756..abe7810be8 100644
--- a/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank2.cpp
+++ b/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank2.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t**,LayoutLeft,LayoutRight, Serial,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t**,LayoutLeft,LayoutLeft,  Serial,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t**,LayoutLeft,LayoutStride,Serial,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t**,LayoutLeft,Serial,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t**, LayoutLeft, LayoutRight, Serial,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t**, LayoutLeft, LayoutLeft, Serial,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t**, LayoutLeft, LayoutStride, Serial,
+                              int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t**, LayoutLeft, Serial, int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank3.cpp b/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank3.cpp
index b44dde3c81..1b6b81e8e4 100644
--- a/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank3.cpp
+++ b/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank3.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t***,LayoutLeft,LayoutRight, Serial,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t***,LayoutLeft,LayoutLeft,  Serial,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t***,LayoutLeft,LayoutStride,Serial,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t***,LayoutLeft,Serial,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t***, LayoutLeft, LayoutRight, Serial,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t***, LayoutLeft, LayoutLeft, Serial,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t***, LayoutLeft, LayoutStride, Serial,
+                              int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t***, LayoutLeft, Serial, int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank4.cpp b/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank4.cpp
index 4e3db8ec6b..7e50ce7cbc 100644
--- a/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank4.cpp
+++ b/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank4.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t****,LayoutLeft,LayoutRight, Serial,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t****,LayoutLeft,LayoutLeft,  Serial,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t****,LayoutLeft,LayoutStride,Serial,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t****,LayoutLeft,Serial,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t****, LayoutLeft, LayoutRight, Serial,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t****, LayoutLeft, LayoutLeft, Serial,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t****, LayoutLeft, LayoutStride, Serial,
+                              int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t****, LayoutLeft, Serial, int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank5.cpp b/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank5.cpp
index c84d55bbe8..ea944ba15f 100644
--- a/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank5.cpp
+++ b/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank5.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*****,LayoutLeft,LayoutRight, Serial,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*****,LayoutLeft,LayoutLeft,  Serial,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*****,LayoutLeft,LayoutStride,Serial,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t*****,LayoutLeft,Serial,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*****, LayoutLeft, LayoutRight, Serial,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*****, LayoutLeft, LayoutLeft, Serial,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*****, LayoutLeft, LayoutStride, Serial,
+                              int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t*****, LayoutLeft, Serial, int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank8.cpp b/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank8.cpp
index 4f981d3d83..d00dd6a335 100644
--- a/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank8.cpp
+++ b/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank8.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t********,LayoutLeft,LayoutRight, Serial,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t********,LayoutLeft,LayoutLeft,  Serial,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t********,LayoutLeft,LayoutStride,Serial,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t********,LayoutLeft,Serial,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t********, LayoutLeft, LayoutRight, Serial,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t********, LayoutLeft, LayoutLeft, Serial,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t********, LayoutLeft, LayoutStride, Serial,
+                              int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t********, LayoutLeft, Serial, int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank1.cpp b/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank1.cpp
index 868d4fa57e..b7cf7d7fce 100644
--- a/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank1.cpp
+++ b/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank1.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*,LayoutRight,LayoutRight, Serial,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*,LayoutRight,LayoutLeft,  Serial,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*,LayoutRight,LayoutStride,Serial,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t*,LayoutRight,Serial,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*, LayoutRight, LayoutRight, Serial,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*, LayoutRight, LayoutLeft, Serial,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*, LayoutRight, LayoutStride, Serial,
+                              int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t*, LayoutRight, Serial, int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank2.cpp b/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank2.cpp
index b3b00569bf..343dfc9658 100644
--- a/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank2.cpp
+++ b/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank2.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t**,LayoutRight,LayoutRight, Serial,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t**,LayoutRight,LayoutLeft,  Serial,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t**,LayoutRight,LayoutStride,Serial,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t**,LayoutRight,Serial,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t**, LayoutRight, LayoutRight, Serial,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t**, LayoutRight, LayoutLeft, Serial,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t**, LayoutRight, LayoutStride, Serial,
+                              int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t**, LayoutRight, Serial, int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank3.cpp b/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank3.cpp
index c1659f2268..44050f1421 100644
--- a/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank3.cpp
+++ b/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank3.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t***,LayoutRight,LayoutRight, Serial,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t***,LayoutRight,LayoutLeft,  Serial,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t***,LayoutRight,LayoutStride,Serial,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t***,LayoutRight,Serial,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t***, LayoutRight, LayoutRight, Serial,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t***, LayoutRight, LayoutLeft, Serial,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t***, LayoutRight, LayoutStride, Serial,
+                              int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t***, LayoutRight, Serial, int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank4.cpp b/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank4.cpp
index 3a9004912a..4ab602bc3b 100644
--- a/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank4.cpp
+++ b/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank4.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t****,LayoutRight,LayoutRight, Serial,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t****,LayoutRight,LayoutLeft,  Serial,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t****,LayoutRight,LayoutStride,Serial,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t****,LayoutRight,Serial,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t****, LayoutRight, LayoutRight, Serial,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t****, LayoutRight, LayoutLeft, Serial,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t****, LayoutRight, LayoutStride, Serial,
+                              int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t****, LayoutRight, Serial, int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank5.cpp b/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank5.cpp
index 0686907b8a..077314b85e 100644
--- a/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank5.cpp
+++ b/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank5.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*****,LayoutRight,LayoutRight, Serial,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*****,LayoutRight,LayoutLeft,  Serial,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*****,LayoutRight,LayoutStride,Serial,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t*****,LayoutRight,Serial,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*****, LayoutRight, LayoutRight, Serial,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*****, LayoutRight, LayoutLeft, Serial,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*****, LayoutRight, LayoutStride, Serial,
+                              int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t*****, LayoutRight, Serial, int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank8.cpp b/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank8.cpp
index 14e22b0301..009d5afcf6 100644
--- a/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank8.cpp
+++ b/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank8.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t********,LayoutRight,LayoutRight, Serial,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t********,LayoutRight,LayoutLeft,  Serial,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t********,LayoutRight,LayoutStride,Serial,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t********,LayoutRight,Serial,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t********, LayoutRight, LayoutRight, Serial,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t********, LayoutRight, LayoutLeft, Serial,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t********, LayoutRight, LayoutStride,
+                              Serial, int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t********, LayoutRight, Serial, int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank1.cpp b/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank1.cpp
index 09996174e3..24a1e61eb3 100644
--- a/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank1.cpp
+++ b/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank1.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*,LayoutStride,LayoutRight, Serial,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*,LayoutStride,LayoutLeft,  Serial,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*,LayoutStride,LayoutStride,Serial,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t*,LayoutStride,Serial,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*, LayoutStride, LayoutRight, Serial,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*, LayoutStride, LayoutLeft, Serial,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*, LayoutStride, LayoutStride, Serial,
+                              int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t*, LayoutStride, Serial, int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank2.cpp b/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank2.cpp
index 0c7d737120..bcf66fb161 100644
--- a/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank2.cpp
+++ b/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank2.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t**,LayoutStride,LayoutRight, Serial,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t**,LayoutStride,LayoutLeft,  Serial,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t**,LayoutStride,LayoutStride,Serial,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t**,LayoutStride,Serial,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t**, LayoutStride, LayoutRight, Serial,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t**, LayoutStride, LayoutLeft, Serial,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t**, LayoutStride, LayoutStride, Serial,
+                              int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t**, LayoutStride, Serial, int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank3.cpp b/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank3.cpp
index 80ea3ba6f1..65c075948f 100644
--- a/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank3.cpp
+++ b/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank3.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t***,LayoutStride,LayoutRight, Serial,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t***,LayoutStride,LayoutLeft,  Serial,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t***,LayoutStride,LayoutStride,Serial,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t***,LayoutStride,Serial,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t***, LayoutStride, LayoutRight, Serial,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t***, LayoutStride, LayoutLeft, Serial,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t***, LayoutStride, LayoutStride, Serial,
+                              int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t***, LayoutStride, Serial, int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank4.cpp b/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank4.cpp
index 5b14ba88d4..e301766022 100644
--- a/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank4.cpp
+++ b/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank4.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t****,LayoutStride,LayoutRight, Serial,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t****,LayoutStride,LayoutLeft,  Serial,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t****,LayoutStride,LayoutStride,Serial,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t****,LayoutStride,Serial,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t****, LayoutStride, LayoutRight, Serial,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t****, LayoutStride, LayoutLeft, Serial,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t****, LayoutStride, LayoutStride, Serial,
+                              int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t****, LayoutStride, Serial, int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank5.cpp b/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank5.cpp
index f1d6b632ce..4ccabe6b3d 100644
--- a/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank5.cpp
+++ b/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank5.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*****,LayoutStride,LayoutRight, Serial,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*****,LayoutStride,LayoutLeft,  Serial,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*****,LayoutStride,LayoutStride,Serial,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t*****,LayoutStride,Serial,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*****, LayoutStride, LayoutRight, Serial,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*****, LayoutStride, LayoutLeft, Serial,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*****, LayoutStride, LayoutStride, Serial,
+                              int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t*****, LayoutStride, Serial, int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank8.cpp b/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank8.cpp
index 083227f7c9..161cf27c49 100644
--- a/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank8.cpp
+++ b/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank8.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t********,LayoutStride,LayoutRight, Serial,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t********,LayoutStride,LayoutLeft,  Serial,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t********,LayoutStride,LayoutStride,Serial,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t********,LayoutStride,Serial,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t********, LayoutStride, LayoutRight,
+                              Serial, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t********, LayoutStride, LayoutLeft, Serial,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t********, LayoutStride, LayoutStride,
+                              Serial, int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t********, LayoutStride, Serial, int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank1.cpp b/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank1.cpp
index d510adaa25..0a0bb54bfd 100644
--- a/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank1.cpp
+++ b/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank1.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,18 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*,LayoutLeft,LayoutRight, Serial,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*,LayoutLeft,LayoutLeft,  Serial,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*,LayoutLeft,LayoutStride,Serial,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int*,LayoutLeft,Serial,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*, LayoutLeft, LayoutRight, Serial, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*, LayoutLeft, LayoutLeft, Serial, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*, LayoutLeft, LayoutStride, Serial, int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int*, LayoutLeft, Serial, int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank2.cpp b/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank2.cpp
index 04b878fb37..745e67b5bf 100644
--- a/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank2.cpp
+++ b/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank2.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,18 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int**,LayoutLeft,LayoutRight, Serial,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int**,LayoutLeft,LayoutLeft,  Serial,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int**,LayoutLeft,LayoutStride,Serial,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int**,LayoutLeft,Serial,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int**, LayoutLeft, LayoutRight, Serial, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int**, LayoutLeft, LayoutLeft, Serial, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int**, LayoutLeft, LayoutStride, Serial, int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int**, LayoutLeft, Serial, int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank3.cpp b/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank3.cpp
index 12c195cf08..40a9d2fe0f 100644
--- a/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank3.cpp
+++ b/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank3.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,18 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int***,LayoutLeft,LayoutRight, Serial,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int***,LayoutLeft,LayoutLeft,  Serial,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int***,LayoutLeft,LayoutStride,Serial,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int***,LayoutLeft,Serial,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int***, LayoutLeft, LayoutRight, Serial, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int***, LayoutLeft, LayoutLeft, Serial, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int***, LayoutLeft, LayoutStride, Serial, int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int***, LayoutLeft, Serial, int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank4.cpp b/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank4.cpp
index 819429dc1b..9436c1d9f7 100644
--- a/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank4.cpp
+++ b/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank4.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,19 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int****,LayoutLeft,LayoutRight, Serial,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int****,LayoutLeft,LayoutLeft,  Serial,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int****,LayoutLeft,LayoutStride,Serial,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int****,LayoutLeft,Serial,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int****, LayoutLeft, LayoutRight, Serial, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int****, LayoutLeft, LayoutLeft, Serial, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int****, LayoutLeft, LayoutStride, Serial,
+                              int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int****, LayoutLeft, Serial, int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank5.cpp b/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank5.cpp
index 564574ab8a..a52db28973 100644
--- a/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank5.cpp
+++ b/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank5.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,20 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*****,LayoutLeft,LayoutRight, Serial,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*****,LayoutLeft,LayoutLeft,  Serial,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*****,LayoutLeft,LayoutStride,Serial,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int*****,LayoutLeft,Serial,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*****, LayoutLeft, LayoutRight, Serial,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*****, LayoutLeft, LayoutLeft, Serial, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*****, LayoutLeft, LayoutStride, Serial,
+                              int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int*****, LayoutLeft, Serial, int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank8.cpp b/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank8.cpp
index be5bca923d..66e8b8f332 100644
--- a/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank8.cpp
+++ b/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank8.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int********,LayoutLeft,LayoutRight, Serial,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int********,LayoutLeft,LayoutLeft,  Serial,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int********,LayoutLeft,LayoutStride,Serial,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int********,LayoutLeft,Serial,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int********, LayoutLeft, LayoutRight, Serial,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int********, LayoutLeft, LayoutLeft, Serial,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int********, LayoutLeft, LayoutStride, Serial,
+                              int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int********, LayoutLeft, Serial, int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int_LayoutRight_Rank1.cpp b/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int_LayoutRight_Rank1.cpp
index a9c1a02f60..9a32d30e2a 100644
--- a/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int_LayoutRight_Rank1.cpp
+++ b/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int_LayoutRight_Rank1.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,18 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*,LayoutRight,LayoutRight, Serial,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*,LayoutRight,LayoutLeft,  Serial,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*,LayoutRight,LayoutStride,Serial,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int*,LayoutRight,Serial,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*, LayoutRight, LayoutRight, Serial, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*, LayoutRight, LayoutLeft, Serial, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*, LayoutRight, LayoutStride, Serial, int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int*, LayoutRight, Serial, int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int_LayoutRight_Rank2.cpp b/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int_LayoutRight_Rank2.cpp
index fa40d68100..1ec25b63b5 100644
--- a/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int_LayoutRight_Rank2.cpp
+++ b/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int_LayoutRight_Rank2.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,18 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int**,LayoutRight,LayoutRight, Serial,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int**,LayoutRight,LayoutLeft,  Serial,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int**,LayoutRight,LayoutStride,Serial,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int**,LayoutRight,Serial,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int**, LayoutRight, LayoutRight, Serial, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int**, LayoutRight, LayoutLeft, Serial, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int**, LayoutRight, LayoutStride, Serial, int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int**, LayoutRight, Serial, int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int_LayoutRight_Rank3.cpp b/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int_LayoutRight_Rank3.cpp
index 8a5106c3ea..0c96adece5 100644
--- a/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int_LayoutRight_Rank3.cpp
+++ b/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int_LayoutRight_Rank3.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,19 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int***,LayoutRight,LayoutRight, Serial,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int***,LayoutRight,LayoutLeft,  Serial,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int***,LayoutRight,LayoutStride,Serial,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int***,LayoutRight,Serial,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int***, LayoutRight, LayoutRight, Serial, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int***, LayoutRight, LayoutLeft, Serial, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int***, LayoutRight, LayoutStride, Serial,
+                              int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int***, LayoutRight, Serial, int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int_LayoutRight_Rank4.cpp b/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int_LayoutRight_Rank4.cpp
index 7953746d44..5771fcf55e 100644
--- a/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int_LayoutRight_Rank4.cpp
+++ b/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int_LayoutRight_Rank4.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,20 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int****,LayoutRight,LayoutRight, Serial,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int****,LayoutRight,LayoutLeft,  Serial,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int****,LayoutRight,LayoutStride,Serial,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int****,LayoutRight,Serial,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int****, LayoutRight, LayoutRight, Serial,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int****, LayoutRight, LayoutLeft, Serial, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int****, LayoutRight, LayoutStride, Serial,
+                              int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int****, LayoutRight, Serial, int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int_LayoutRight_Rank5.cpp b/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int_LayoutRight_Rank5.cpp
index 543470776a..b0b918d782 100644
--- a/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int_LayoutRight_Rank5.cpp
+++ b/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int_LayoutRight_Rank5.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*****,LayoutRight,LayoutRight, Serial,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*****,LayoutRight,LayoutLeft,  Serial,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*****,LayoutRight,LayoutStride,Serial,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int*****,LayoutRight,Serial,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*****, LayoutRight, LayoutRight, Serial,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*****, LayoutRight, LayoutLeft, Serial,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*****, LayoutRight, LayoutStride, Serial,
+                              int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int*****, LayoutRight, Serial, int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int_LayoutRight_Rank8.cpp b/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int_LayoutRight_Rank8.cpp
index 6c2fbd47af..eae13261e9 100644
--- a/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int_LayoutRight_Rank8.cpp
+++ b/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int_LayoutRight_Rank8.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int********,LayoutRight,LayoutRight, Serial,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int********,LayoutRight,LayoutLeft,  Serial,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int********,LayoutRight,LayoutStride,Serial,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int********,LayoutRight,Serial,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int********, LayoutRight, LayoutRight, Serial,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int********, LayoutRight, LayoutLeft, Serial,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int********, LayoutRight, LayoutStride, Serial,
+                              int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int********, LayoutRight, Serial, int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int_LayoutStride_Rank1.cpp b/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int_LayoutStride_Rank1.cpp
index 5cc5b25cf3..7efc50d457 100644
--- a/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int_LayoutStride_Rank1.cpp
+++ b/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int_LayoutStride_Rank1.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,18 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*,LayoutStride,LayoutRight, Serial,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*,LayoutStride,LayoutLeft,  Serial,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*,LayoutStride,LayoutStride,Serial,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int*,LayoutStride,Serial,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*, LayoutStride, LayoutRight, Serial, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*, LayoutStride, LayoutLeft, Serial, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*, LayoutStride, LayoutStride, Serial, int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int*, LayoutStride, Serial, int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int_LayoutStride_Rank2.cpp b/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int_LayoutStride_Rank2.cpp
index 3fd3c7b451..f6b63e9896 100644
--- a/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int_LayoutStride_Rank2.cpp
+++ b/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int_LayoutStride_Rank2.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,19 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int**,LayoutStride,LayoutRight, Serial,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int**,LayoutStride,LayoutLeft,  Serial,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int**,LayoutStride,LayoutStride,Serial,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int**,LayoutStride,Serial,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int**, LayoutStride, LayoutRight, Serial, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int**, LayoutStride, LayoutLeft, Serial, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int**, LayoutStride, LayoutStride, Serial,
+                              int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int**, LayoutStride, Serial, int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int_LayoutStride_Rank3.cpp b/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int_LayoutStride_Rank3.cpp
index efe8630cea..148ed99027 100644
--- a/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int_LayoutStride_Rank3.cpp
+++ b/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int_LayoutStride_Rank3.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,20 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int***,LayoutStride,LayoutRight, Serial,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int***,LayoutStride,LayoutLeft,  Serial,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int***,LayoutStride,LayoutStride,Serial,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int***,LayoutStride,Serial,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int***, LayoutStride, LayoutRight, Serial,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int***, LayoutStride, LayoutLeft, Serial, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int***, LayoutStride, LayoutStride, Serial,
+                              int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int***, LayoutStride, Serial, int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int_LayoutStride_Rank4.cpp b/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int_LayoutStride_Rank4.cpp
index a933af7f51..a9b1b6d409 100644
--- a/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int_LayoutStride_Rank4.cpp
+++ b/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int_LayoutStride_Rank4.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int****,LayoutStride,LayoutRight, Serial,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int****,LayoutStride,LayoutLeft,  Serial,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int****,LayoutStride,LayoutStride,Serial,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int****,LayoutStride,Serial,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int****, LayoutStride, LayoutRight, Serial,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int****, LayoutStride, LayoutLeft, Serial,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int****, LayoutStride, LayoutStride, Serial,
+                              int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int****, LayoutStride, Serial, int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int_LayoutStride_Rank5.cpp b/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int_LayoutStride_Rank5.cpp
index 0eec22f7af..30a20055a1 100644
--- a/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int_LayoutStride_Rank5.cpp
+++ b/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int_LayoutStride_Rank5.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*****,LayoutStride,LayoutRight, Serial,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*****,LayoutStride,LayoutLeft,  Serial,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*****,LayoutStride,LayoutStride,Serial,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int*****,LayoutStride,Serial,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*****, LayoutStride, LayoutRight, Serial,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*****, LayoutStride, LayoutLeft, Serial,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*****, LayoutStride, LayoutStride, Serial,
+                              int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int*****, LayoutStride, Serial, int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int_LayoutStride_Rank8.cpp b/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int_LayoutStride_Rank8.cpp
index 9dcd492b5f..fa42ed37b1 100644
--- a/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int_LayoutStride_Rank8.cpp
+++ b/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int_LayoutStride_Rank8.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int********,LayoutStride,LayoutRight, Serial,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int********,LayoutStride,LayoutLeft,  Serial,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int********,LayoutStride,LayoutStride,Serial,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int********,LayoutStride,Serial,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int********, LayoutStride, LayoutRight, Serial,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int********, LayoutStride, LayoutLeft, Serial,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int********, LayoutStride, LayoutStride, Serial,
+                              int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int********, LayoutStride, Serial, int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_double_LayoutLeft_Rank1.cpp b/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_double_LayoutLeft_Rank1.cpp
index b1f1e2c3b9..07d809a290 100644
--- a/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_double_LayoutLeft_Rank1.cpp
+++ b/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_double_LayoutLeft_Rank1.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,18 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*,LayoutLeft,LayoutRight, Serial,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*,LayoutLeft,LayoutLeft,  Serial,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*,LayoutLeft,LayoutStride,Serial,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(double*,LayoutLeft,Serial,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*, LayoutLeft, LayoutRight, Serial, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*, LayoutLeft, LayoutLeft, Serial, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*, LayoutLeft, LayoutStride, Serial, int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(double*, LayoutLeft, Serial, int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_double_LayoutLeft_Rank2.cpp b/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_double_LayoutLeft_Rank2.cpp
index a1504577bf..e03f4f7966 100644
--- a/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_double_LayoutLeft_Rank2.cpp
+++ b/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_double_LayoutLeft_Rank2.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,18 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double**,LayoutLeft,LayoutRight, Serial,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double**,LayoutLeft,LayoutLeft,  Serial,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double**,LayoutLeft,LayoutStride,Serial,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(double**,LayoutLeft,Serial,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double**, LayoutLeft, LayoutRight, Serial, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double**, LayoutLeft, LayoutLeft, Serial, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double**, LayoutLeft, LayoutStride, Serial, int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(double**, LayoutLeft, Serial, int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_double_LayoutLeft_Rank3.cpp b/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_double_LayoutLeft_Rank3.cpp
index 7fe1d49972..92deaa8a3e 100644
--- a/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_double_LayoutLeft_Rank3.cpp
+++ b/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_double_LayoutLeft_Rank3.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,18 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double***,LayoutLeft,LayoutRight, Serial,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double***,LayoutLeft,LayoutLeft,  Serial,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double***,LayoutLeft,LayoutStride,Serial,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(double***,LayoutLeft,Serial,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double***, LayoutLeft, LayoutRight, Serial, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double***, LayoutLeft, LayoutLeft, Serial, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double***, LayoutLeft, LayoutStride, Serial, int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(double***, LayoutLeft, Serial, int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_double_LayoutLeft_Rank4.cpp b/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_double_LayoutLeft_Rank4.cpp
index c0269b9c0b..ec97ca8c53 100644
--- a/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_double_LayoutLeft_Rank4.cpp
+++ b/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_double_LayoutLeft_Rank4.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,18 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double****,LayoutLeft,LayoutRight, Serial,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double****,LayoutLeft,LayoutLeft,  Serial,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double****,LayoutLeft,LayoutStride,Serial,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(double****,LayoutLeft,Serial,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double****, LayoutLeft, LayoutRight, Serial, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double****, LayoutLeft, LayoutLeft, Serial, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double****, LayoutLeft, LayoutStride, Serial, int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(double****, LayoutLeft, Serial, int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_double_LayoutLeft_Rank5.cpp b/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_double_LayoutLeft_Rank5.cpp
index 2b03ff5809..2693928bd8 100644
--- a/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_double_LayoutLeft_Rank5.cpp
+++ b/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_double_LayoutLeft_Rank5.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,19 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*****,LayoutLeft,LayoutRight, Serial,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*****,LayoutLeft,LayoutLeft,  Serial,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*****,LayoutLeft,LayoutStride,Serial,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(double*****,LayoutLeft,Serial,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*****, LayoutLeft, LayoutRight, Serial, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*****, LayoutLeft, LayoutLeft, Serial, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*****, LayoutLeft, LayoutStride, Serial,
+                              int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(double*****, LayoutLeft, Serial, int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_double_LayoutLeft_Rank8.cpp b/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_double_LayoutLeft_Rank8.cpp
index 360cb28f54..968a400798 100644
--- a/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_double_LayoutLeft_Rank8.cpp
+++ b/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_double_LayoutLeft_Rank8.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double********,LayoutLeft,LayoutRight, Serial,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double********,LayoutLeft,LayoutLeft,  Serial,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double********,LayoutLeft,LayoutStride,Serial,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(double********,LayoutLeft,Serial,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double********, LayoutLeft, LayoutRight, Serial,
+                              int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double********, LayoutLeft, LayoutLeft, Serial,
+                              int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double********, LayoutLeft, LayoutStride, Serial,
+                              int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(double********, LayoutLeft, Serial, int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_double_LayoutRight_Rank1.cpp b/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_double_LayoutRight_Rank1.cpp
index 3eaacb197c..4d7b8bc724 100644
--- a/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_double_LayoutRight_Rank1.cpp
+++ b/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_double_LayoutRight_Rank1.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,18 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*,LayoutRight,LayoutRight, Serial,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*,LayoutRight,LayoutLeft,  Serial,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*,LayoutRight,LayoutStride,Serial,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(double*,LayoutRight,Serial,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*, LayoutRight, LayoutRight, Serial, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*, LayoutRight, LayoutLeft, Serial, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*, LayoutRight, LayoutStride, Serial, int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(double*, LayoutRight, Serial, int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_double_LayoutRight_Rank2.cpp b/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_double_LayoutRight_Rank2.cpp
index b06717d45c..7a97d75c1d 100644
--- a/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_double_LayoutRight_Rank2.cpp
+++ b/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_double_LayoutRight_Rank2.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,18 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double**,LayoutRight,LayoutRight, Serial,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double**,LayoutRight,LayoutLeft,  Serial,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double**,LayoutRight,LayoutStride,Serial,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(double**,LayoutRight,Serial,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double**, LayoutRight, LayoutRight, Serial, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double**, LayoutRight, LayoutLeft, Serial, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double**, LayoutRight, LayoutStride, Serial, int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(double**, LayoutRight, Serial, int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_double_LayoutRight_Rank3.cpp b/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_double_LayoutRight_Rank3.cpp
index 2095454ee1..25d9ee82b9 100644
--- a/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_double_LayoutRight_Rank3.cpp
+++ b/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_double_LayoutRight_Rank3.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,18 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double***,LayoutRight,LayoutRight, Serial,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double***,LayoutRight,LayoutLeft,  Serial,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double***,LayoutRight,LayoutStride,Serial,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(double***,LayoutRight,Serial,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double***, LayoutRight, LayoutRight, Serial, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double***, LayoutRight, LayoutLeft, Serial, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double***, LayoutRight, LayoutStride, Serial, int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(double***, LayoutRight, Serial, int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_double_LayoutRight_Rank4.cpp b/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_double_LayoutRight_Rank4.cpp
index 4261ed2af2..b830d1a017 100644
--- a/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_double_LayoutRight_Rank4.cpp
+++ b/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_double_LayoutRight_Rank4.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,19 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double****,LayoutRight,LayoutRight, Serial,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double****,LayoutRight,LayoutLeft,  Serial,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double****,LayoutRight,LayoutStride,Serial,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(double****,LayoutRight,Serial,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double****, LayoutRight, LayoutRight, Serial, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double****, LayoutRight, LayoutLeft, Serial, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double****, LayoutRight, LayoutStride, Serial,
+                              int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(double****, LayoutRight, Serial, int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_double_LayoutRight_Rank5.cpp b/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_double_LayoutRight_Rank5.cpp
index 021576ae31..40f690b782 100644
--- a/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_double_LayoutRight_Rank5.cpp
+++ b/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_double_LayoutRight_Rank5.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,20 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*****,LayoutRight,LayoutRight, Serial,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*****,LayoutRight,LayoutLeft,  Serial,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*****,LayoutRight,LayoutStride,Serial,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(double*****,LayoutRight,Serial,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*****, LayoutRight, LayoutRight, Serial,
+                              int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*****, LayoutRight, LayoutLeft, Serial, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*****, LayoutRight, LayoutStride, Serial,
+                              int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(double*****, LayoutRight, Serial, int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_double_LayoutRight_Rank8.cpp b/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_double_LayoutRight_Rank8.cpp
index cad50f737f..bf46af97d1 100644
--- a/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_double_LayoutRight_Rank8.cpp
+++ b/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_double_LayoutRight_Rank8.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double********,LayoutRight,LayoutRight, Serial,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double********,LayoutRight,LayoutLeft,  Serial,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double********,LayoutRight,LayoutStride,Serial,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(double********,LayoutRight,Serial,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double********, LayoutRight, LayoutRight, Serial,
+                              int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double********, LayoutRight, LayoutLeft, Serial,
+                              int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double********, LayoutRight, LayoutStride, Serial,
+                              int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(double********, LayoutRight, Serial, int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_double_LayoutStride_Rank1.cpp b/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_double_LayoutStride_Rank1.cpp
index 011b1a3c71..8abd7cc80b 100644
--- a/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_double_LayoutStride_Rank1.cpp
+++ b/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_double_LayoutStride_Rank1.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,18 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*,LayoutStride,LayoutRight, Serial,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*,LayoutStride,LayoutLeft,  Serial,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*,LayoutStride,LayoutStride,Serial,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(double*,LayoutStride,Serial,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*, LayoutStride, LayoutRight, Serial, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*, LayoutStride, LayoutLeft, Serial, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*, LayoutStride, LayoutStride, Serial, int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(double*, LayoutStride, Serial, int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_double_LayoutStride_Rank2.cpp b/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_double_LayoutStride_Rank2.cpp
index 6c5d7b6c2f..e5472cda7a 100644
--- a/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_double_LayoutStride_Rank2.cpp
+++ b/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_double_LayoutStride_Rank2.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,18 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double**,LayoutStride,LayoutRight, Serial,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double**,LayoutStride,LayoutLeft,  Serial,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double**,LayoutStride,LayoutStride,Serial,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(double**,LayoutStride,Serial,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double**, LayoutStride, LayoutRight, Serial, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double**, LayoutStride, LayoutLeft, Serial, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double**, LayoutStride, LayoutStride, Serial, int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(double**, LayoutStride, Serial, int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_double_LayoutStride_Rank3.cpp b/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_double_LayoutStride_Rank3.cpp
index d51b22ad7b..a0c1b4efcd 100644
--- a/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_double_LayoutStride_Rank3.cpp
+++ b/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_double_LayoutStride_Rank3.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,19 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double***,LayoutStride,LayoutRight, Serial,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double***,LayoutStride,LayoutLeft,  Serial,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double***,LayoutStride,LayoutStride,Serial,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(double***,LayoutStride,Serial,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double***, LayoutStride, LayoutRight, Serial, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double***, LayoutStride, LayoutLeft, Serial, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double***, LayoutStride, LayoutStride, Serial,
+                              int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(double***, LayoutStride, Serial, int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_double_LayoutStride_Rank4.cpp b/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_double_LayoutStride_Rank4.cpp
index 3a6431f581..a599845812 100644
--- a/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_double_LayoutStride_Rank4.cpp
+++ b/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_double_LayoutStride_Rank4.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,20 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double****,LayoutStride,LayoutRight, Serial,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double****,LayoutStride,LayoutLeft,  Serial,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double****,LayoutStride,LayoutStride,Serial,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(double****,LayoutStride,Serial,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double****, LayoutStride, LayoutRight, Serial,
+                              int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double****, LayoutStride, LayoutLeft, Serial, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double****, LayoutStride, LayoutStride, Serial,
+                              int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(double****, LayoutStride, Serial, int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_double_LayoutStride_Rank5.cpp b/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_double_LayoutStride_Rank5.cpp
index 5246dcd4e8..b750ca88ca 100644
--- a/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_double_LayoutStride_Rank5.cpp
+++ b/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_double_LayoutStride_Rank5.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*****,LayoutStride,LayoutRight, Serial,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*****,LayoutStride,LayoutLeft,  Serial,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*****,LayoutStride,LayoutStride,Serial,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(double*****,LayoutStride,Serial,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*****, LayoutStride, LayoutRight, Serial,
+                              int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*****, LayoutStride, LayoutLeft, Serial,
+                              int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*****, LayoutStride, LayoutStride, Serial,
+                              int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(double*****, LayoutStride, Serial, int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_double_LayoutStride_Rank8.cpp b/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_double_LayoutStride_Rank8.cpp
index f714207bb6..c1223916b1 100644
--- a/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_double_LayoutStride_Rank8.cpp
+++ b/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_double_LayoutStride_Rank8.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double********,LayoutStride,LayoutRight, Serial,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double********,LayoutStride,LayoutLeft,  Serial,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double********,LayoutStride,LayoutStride,Serial,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(double********,LayoutStride,Serial,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double********, LayoutStride, LayoutRight, Serial,
+                              int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double********, LayoutStride, LayoutLeft, Serial,
+                              int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double********, LayoutStride, LayoutStride,
+                              Serial, int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(double********, LayoutStride, Serial, int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_float_LayoutLeft_Rank1.cpp b/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_float_LayoutLeft_Rank1.cpp
index 31577672e8..453960b508 100644
--- a/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_float_LayoutLeft_Rank1.cpp
+++ b/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_float_LayoutLeft_Rank1.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,18 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*,LayoutLeft,LayoutRight, Serial,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*,LayoutLeft,LayoutLeft,  Serial,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*,LayoutLeft,LayoutStride,Serial,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(float*,LayoutLeft,Serial,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*, LayoutLeft, LayoutRight, Serial, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*, LayoutLeft, LayoutLeft, Serial, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*, LayoutLeft, LayoutStride, Serial, int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(float*, LayoutLeft, Serial, int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_float_LayoutLeft_Rank2.cpp b/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_float_LayoutLeft_Rank2.cpp
index 33279ac418..a1c599c765 100644
--- a/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_float_LayoutLeft_Rank2.cpp
+++ b/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_float_LayoutLeft_Rank2.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,18 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float**,LayoutLeft,LayoutRight, Serial,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float**,LayoutLeft,LayoutLeft,  Serial,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float**,LayoutLeft,LayoutStride,Serial,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(float**,LayoutLeft,Serial,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float**, LayoutLeft, LayoutRight, Serial, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float**, LayoutLeft, LayoutLeft, Serial, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float**, LayoutLeft, LayoutStride, Serial, int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(float**, LayoutLeft, Serial, int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_float_LayoutLeft_Rank3.cpp b/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_float_LayoutLeft_Rank3.cpp
index 32adef28b4..a8f280cf23 100644
--- a/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_float_LayoutLeft_Rank3.cpp
+++ b/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_float_LayoutLeft_Rank3.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,18 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float***,LayoutLeft,LayoutRight, Serial,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float***,LayoutLeft,LayoutLeft,  Serial,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float***,LayoutLeft,LayoutStride,Serial,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(float***,LayoutLeft,Serial,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float***, LayoutLeft, LayoutRight, Serial, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float***, LayoutLeft, LayoutLeft, Serial, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float***, LayoutLeft, LayoutStride, Serial, int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(float***, LayoutLeft, Serial, int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_float_LayoutLeft_Rank4.cpp b/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_float_LayoutLeft_Rank4.cpp
index a9a6cf480d..e9a6a979c3 100644
--- a/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_float_LayoutLeft_Rank4.cpp
+++ b/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_float_LayoutLeft_Rank4.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,18 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float****,LayoutLeft,LayoutRight, Serial,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float****,LayoutLeft,LayoutLeft,  Serial,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float****,LayoutLeft,LayoutStride,Serial,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(float****,LayoutLeft,Serial,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float****, LayoutLeft, LayoutRight, Serial, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float****, LayoutLeft, LayoutLeft, Serial, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float****, LayoutLeft, LayoutStride, Serial, int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(float****, LayoutLeft, Serial, int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_float_LayoutLeft_Rank5.cpp b/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_float_LayoutLeft_Rank5.cpp
index cfe1971332..0cbac14fb6 100644
--- a/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_float_LayoutLeft_Rank5.cpp
+++ b/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_float_LayoutLeft_Rank5.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,18 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*****,LayoutLeft,LayoutRight, Serial,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*****,LayoutLeft,LayoutLeft,  Serial,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*****,LayoutLeft,LayoutStride,Serial,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(float*****,LayoutLeft,Serial,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*****, LayoutLeft, LayoutRight, Serial, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*****, LayoutLeft, LayoutLeft, Serial, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*****, LayoutLeft, LayoutStride, Serial, int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(float*****, LayoutLeft, Serial, int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_float_LayoutLeft_Rank8.cpp b/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_float_LayoutLeft_Rank8.cpp
index 034ecff526..98e182506b 100644
--- a/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_float_LayoutLeft_Rank8.cpp
+++ b/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_float_LayoutLeft_Rank8.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float********,LayoutLeft,LayoutRight, Serial,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float********,LayoutLeft,LayoutLeft,  Serial,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float********,LayoutLeft,LayoutStride,Serial,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(float********,LayoutLeft,Serial,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float********, LayoutLeft, LayoutRight, Serial,
+                              int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float********, LayoutLeft, LayoutLeft, Serial,
+                              int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float********, LayoutLeft, LayoutStride, Serial,
+                              int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(float********, LayoutLeft, Serial, int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_float_LayoutRight_Rank1.cpp b/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_float_LayoutRight_Rank1.cpp
index a96199e6cd..0afd110876 100644
--- a/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_float_LayoutRight_Rank1.cpp
+++ b/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_float_LayoutRight_Rank1.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,18 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*,LayoutRight,LayoutRight, Serial,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*,LayoutRight,LayoutLeft,  Serial,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*,LayoutRight,LayoutStride,Serial,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(float*,LayoutRight,Serial,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*, LayoutRight, LayoutRight, Serial, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*, LayoutRight, LayoutLeft, Serial, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*, LayoutRight, LayoutStride, Serial, int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(float*, LayoutRight, Serial, int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_float_LayoutRight_Rank2.cpp b/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_float_LayoutRight_Rank2.cpp
index 512404ab3f..14a80d9a94 100644
--- a/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_float_LayoutRight_Rank2.cpp
+++ b/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_float_LayoutRight_Rank2.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,18 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float**,LayoutRight,LayoutRight, Serial,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float**,LayoutRight,LayoutLeft,  Serial,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float**,LayoutRight,LayoutStride,Serial,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(float**,LayoutRight,Serial,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float**, LayoutRight, LayoutRight, Serial, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float**, LayoutRight, LayoutLeft, Serial, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float**, LayoutRight, LayoutStride, Serial, int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(float**, LayoutRight, Serial, int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_float_LayoutRight_Rank3.cpp b/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_float_LayoutRight_Rank3.cpp
index 9f51de587a..76516c1927 100644
--- a/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_float_LayoutRight_Rank3.cpp
+++ b/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_float_LayoutRight_Rank3.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,18 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float***,LayoutRight,LayoutRight, Serial,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float***,LayoutRight,LayoutLeft,  Serial,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float***,LayoutRight,LayoutStride,Serial,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(float***,LayoutRight,Serial,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float***, LayoutRight, LayoutRight, Serial, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float***, LayoutRight, LayoutLeft, Serial, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float***, LayoutRight, LayoutStride, Serial, int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(float***, LayoutRight, Serial, int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_float_LayoutRight_Rank4.cpp b/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_float_LayoutRight_Rank4.cpp
index a2bb83cc72..3769ea0aac 100644
--- a/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_float_LayoutRight_Rank4.cpp
+++ b/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_float_LayoutRight_Rank4.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,18 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float****,LayoutRight,LayoutRight, Serial,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float****,LayoutRight,LayoutLeft,  Serial,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float****,LayoutRight,LayoutStride,Serial,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(float****,LayoutRight,Serial,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float****, LayoutRight, LayoutRight, Serial, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float****, LayoutRight, LayoutLeft, Serial, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float****, LayoutRight, LayoutStride, Serial, int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(float****, LayoutRight, Serial, int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_float_LayoutRight_Rank5.cpp b/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_float_LayoutRight_Rank5.cpp
index 11ccdfdb83..106f1b9c67 100644
--- a/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_float_LayoutRight_Rank5.cpp
+++ b/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_float_LayoutRight_Rank5.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,19 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*****,LayoutRight,LayoutRight, Serial,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*****,LayoutRight,LayoutLeft,  Serial,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*****,LayoutRight,LayoutStride,Serial,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(float*****,LayoutRight,Serial,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*****, LayoutRight, LayoutRight, Serial, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*****, LayoutRight, LayoutLeft, Serial, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*****, LayoutRight, LayoutStride, Serial,
+                              int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(float*****, LayoutRight, Serial, int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_float_LayoutRight_Rank8.cpp b/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_float_LayoutRight_Rank8.cpp
index 719b07439b..44a362d82c 100644
--- a/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_float_LayoutRight_Rank8.cpp
+++ b/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_float_LayoutRight_Rank8.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float********,LayoutRight,LayoutRight, Serial,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float********,LayoutRight,LayoutLeft,  Serial,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float********,LayoutRight,LayoutStride,Serial,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(float********,LayoutRight,Serial,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float********, LayoutRight, LayoutRight, Serial,
+                              int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float********, LayoutRight, LayoutLeft, Serial,
+                              int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float********, LayoutRight, LayoutStride, Serial,
+                              int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(float********, LayoutRight, Serial, int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_float_LayoutStride_Rank1.cpp b/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_float_LayoutStride_Rank1.cpp
index 345509e824..5184be6070 100644
--- a/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_float_LayoutStride_Rank1.cpp
+++ b/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_float_LayoutStride_Rank1.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,18 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*,LayoutStride,LayoutRight, Serial,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*,LayoutStride,LayoutLeft,  Serial,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*,LayoutStride,LayoutStride,Serial,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(float*,LayoutStride,Serial,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*, LayoutStride, LayoutRight, Serial, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*, LayoutStride, LayoutLeft, Serial, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*, LayoutStride, LayoutStride, Serial, int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(float*, LayoutStride, Serial, int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_float_LayoutStride_Rank2.cpp b/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_float_LayoutStride_Rank2.cpp
index 7cc933aa5e..50117e94bf 100644
--- a/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_float_LayoutStride_Rank2.cpp
+++ b/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_float_LayoutStride_Rank2.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,18 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float**,LayoutStride,LayoutRight, Serial,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float**,LayoutStride,LayoutLeft,  Serial,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float**,LayoutStride,LayoutStride,Serial,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(float**,LayoutStride,Serial,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float**, LayoutStride, LayoutRight, Serial, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float**, LayoutStride, LayoutLeft, Serial, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float**, LayoutStride, LayoutStride, Serial, int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(float**, LayoutStride, Serial, int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_float_LayoutStride_Rank3.cpp b/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_float_LayoutStride_Rank3.cpp
index 2ced210d48..4ddc4a3e40 100644
--- a/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_float_LayoutStride_Rank3.cpp
+++ b/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_float_LayoutStride_Rank3.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,18 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float***,LayoutStride,LayoutRight, Serial,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float***,LayoutStride,LayoutLeft,  Serial,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float***,LayoutStride,LayoutStride,Serial,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(float***,LayoutStride,Serial,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float***, LayoutStride, LayoutRight, Serial, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float***, LayoutStride, LayoutLeft, Serial, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float***, LayoutStride, LayoutStride, Serial, int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(float***, LayoutStride, Serial, int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_float_LayoutStride_Rank4.cpp b/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_float_LayoutStride_Rank4.cpp
index abec17254a..cf48e0caab 100644
--- a/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_float_LayoutStride_Rank4.cpp
+++ b/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_float_LayoutStride_Rank4.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,19 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float****,LayoutStride,LayoutRight, Serial,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float****,LayoutStride,LayoutLeft,  Serial,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float****,LayoutStride,LayoutStride,Serial,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(float****,LayoutStride,Serial,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float****, LayoutStride, LayoutRight, Serial, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float****, LayoutStride, LayoutLeft, Serial, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float****, LayoutStride, LayoutStride, Serial,
+                              int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(float****, LayoutStride, Serial, int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_float_LayoutStride_Rank5.cpp b/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_float_LayoutStride_Rank5.cpp
index 4dc3b61c63..b1ab7b6667 100644
--- a/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_float_LayoutStride_Rank5.cpp
+++ b/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_float_LayoutStride_Rank5.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,20 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*****,LayoutStride,LayoutRight, Serial,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*****,LayoutStride,LayoutLeft,  Serial,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*****,LayoutStride,LayoutStride,Serial,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(float*****,LayoutStride,Serial,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*****, LayoutStride, LayoutRight, Serial,
+                              int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*****, LayoutStride, LayoutLeft, Serial, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*****, LayoutStride, LayoutStride, Serial,
+                              int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(float*****, LayoutStride, Serial, int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_float_LayoutStride_Rank8.cpp b/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_float_LayoutStride_Rank8.cpp
index 9931e0fe77..02104cfa37 100644
--- a/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_float_LayoutStride_Rank8.cpp
+++ b/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_float_LayoutStride_Rank8.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float********,LayoutStride,LayoutRight, Serial,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float********,LayoutStride,LayoutLeft,  Serial,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float********,LayoutStride,LayoutStride,Serial,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(float********,LayoutStride,Serial,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float********, LayoutStride, LayoutRight, Serial,
+                              int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float********, LayoutStride, LayoutLeft, Serial,
+                              int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float********, LayoutStride, LayoutStride, Serial,
+                              int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(float********, LayoutStride, Serial, int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank1.cpp b/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank1.cpp
index 2e360102f9..81eab82b04 100644
--- a/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank1.cpp
+++ b/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank1.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,18 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*,LayoutLeft,LayoutRight, Serial,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*,LayoutLeft,LayoutLeft,  Serial,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*,LayoutLeft,LayoutStride,Serial,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t*,LayoutLeft,Serial,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*, LayoutLeft, LayoutRight, Serial, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*, LayoutLeft, LayoutLeft, Serial, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*, LayoutLeft, LayoutStride, Serial, int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t*, LayoutLeft, Serial, int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank2.cpp b/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank2.cpp
index 41404ee0cb..d5e45a194d 100644
--- a/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank2.cpp
+++ b/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank2.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,18 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t**,LayoutLeft,LayoutRight, Serial,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t**,LayoutLeft,LayoutLeft,  Serial,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t**,LayoutLeft,LayoutStride,Serial,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t**,LayoutLeft,Serial,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t**, LayoutLeft, LayoutRight, Serial, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t**, LayoutLeft, LayoutLeft, Serial, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t**, LayoutLeft, LayoutStride, Serial, int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t**, LayoutLeft, Serial, int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank3.cpp b/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank3.cpp
index e5d219d040..7cc00391ac 100644
--- a/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank3.cpp
+++ b/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank3.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,18 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t***,LayoutLeft,LayoutRight, Serial,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t***,LayoutLeft,LayoutLeft,  Serial,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t***,LayoutLeft,LayoutStride,Serial,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t***,LayoutLeft,Serial,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t***, LayoutLeft, LayoutRight, Serial, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t***, LayoutLeft, LayoutLeft, Serial, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t***, LayoutLeft, LayoutStride, Serial, int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t***, LayoutLeft, Serial, int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank4.cpp b/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank4.cpp
index a6d97c40ac..70df317f3e 100644
--- a/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank4.cpp
+++ b/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank4.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,19 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t****,LayoutLeft,LayoutRight, Serial,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t****,LayoutLeft,LayoutLeft,  Serial,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t****,LayoutLeft,LayoutStride,Serial,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t****,LayoutLeft,Serial,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t****, LayoutLeft, LayoutRight, Serial, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t****, LayoutLeft, LayoutLeft, Serial, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t****, LayoutLeft, LayoutStride, Serial,
+                              int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t****, LayoutLeft, Serial, int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank5.cpp b/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank5.cpp
index 550e8fb66d..4c6018db78 100644
--- a/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank5.cpp
+++ b/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank5.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,20 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*****,LayoutLeft,LayoutRight, Serial,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*****,LayoutLeft,LayoutLeft,  Serial,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*****,LayoutLeft,LayoutStride,Serial,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t*****,LayoutLeft,Serial,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*****, LayoutLeft, LayoutRight, Serial,
+                              int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*****, LayoutLeft, LayoutLeft, Serial, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*****, LayoutLeft, LayoutStride, Serial,
+                              int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t*****, LayoutLeft, Serial, int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank8.cpp b/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank8.cpp
index d3453f3805..4d48bb32cc 100644
--- a/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank8.cpp
+++ b/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank8.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t********,LayoutLeft,LayoutRight, Serial,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t********,LayoutLeft,LayoutLeft,  Serial,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t********,LayoutLeft,LayoutStride,Serial,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t********,LayoutLeft,Serial,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t********, LayoutLeft, LayoutRight, Serial,
+                              int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t********, LayoutLeft, LayoutLeft, Serial,
+                              int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t********, LayoutLeft, LayoutStride, Serial,
+                              int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t********, LayoutLeft, Serial, int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int64_t_LayoutRight_Rank1.cpp b/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int64_t_LayoutRight_Rank1.cpp
index ea2bc082a9..61b6682ba6 100644
--- a/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int64_t_LayoutRight_Rank1.cpp
+++ b/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int64_t_LayoutRight_Rank1.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,18 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*,LayoutRight,LayoutRight, Serial,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*,LayoutRight,LayoutLeft,  Serial,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*,LayoutRight,LayoutStride,Serial,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t*,LayoutRight,Serial,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*, LayoutRight, LayoutRight, Serial, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*, LayoutRight, LayoutLeft, Serial, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*, LayoutRight, LayoutStride, Serial, int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t*, LayoutRight, Serial, int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int64_t_LayoutRight_Rank2.cpp b/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int64_t_LayoutRight_Rank2.cpp
index 8142149038..dd80db3e20 100644
--- a/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int64_t_LayoutRight_Rank2.cpp
+++ b/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int64_t_LayoutRight_Rank2.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,18 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t**,LayoutRight,LayoutRight, Serial,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t**,LayoutRight,LayoutLeft,  Serial,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t**,LayoutRight,LayoutStride,Serial,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t**,LayoutRight,Serial,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t**, LayoutRight, LayoutRight, Serial, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t**, LayoutRight, LayoutLeft, Serial, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t**, LayoutRight, LayoutStride, Serial, int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t**, LayoutRight, Serial, int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int64_t_LayoutRight_Rank3.cpp b/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int64_t_LayoutRight_Rank3.cpp
index 17eec4e038..bec7b5d952 100644
--- a/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int64_t_LayoutRight_Rank3.cpp
+++ b/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int64_t_LayoutRight_Rank3.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,19 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t***,LayoutRight,LayoutRight, Serial,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t***,LayoutRight,LayoutLeft,  Serial,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t***,LayoutRight,LayoutStride,Serial,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t***,LayoutRight,Serial,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t***, LayoutRight, LayoutRight, Serial, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t***, LayoutRight, LayoutLeft, Serial, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t***, LayoutRight, LayoutStride, Serial,
+                              int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t***, LayoutRight, Serial, int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int64_t_LayoutRight_Rank4.cpp b/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int64_t_LayoutRight_Rank4.cpp
index f36f3c05be..162915fb2b 100644
--- a/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int64_t_LayoutRight_Rank4.cpp
+++ b/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int64_t_LayoutRight_Rank4.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,20 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t****,LayoutRight,LayoutRight, Serial,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t****,LayoutRight,LayoutLeft,  Serial,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t****,LayoutRight,LayoutStride,Serial,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t****,LayoutRight,Serial,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t****, LayoutRight, LayoutRight, Serial,
+                              int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t****, LayoutRight, LayoutLeft, Serial, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t****, LayoutRight, LayoutStride, Serial,
+                              int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t****, LayoutRight, Serial, int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int64_t_LayoutRight_Rank5.cpp b/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int64_t_LayoutRight_Rank5.cpp
index 5548438fdf..5fe93924d8 100644
--- a/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int64_t_LayoutRight_Rank5.cpp
+++ b/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int64_t_LayoutRight_Rank5.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*****,LayoutRight,LayoutRight, Serial,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*****,LayoutRight,LayoutLeft,  Serial,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*****,LayoutRight,LayoutStride,Serial,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t*****,LayoutRight,Serial,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*****, LayoutRight, LayoutRight, Serial,
+                              int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*****, LayoutRight, LayoutLeft, Serial,
+                              int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*****, LayoutRight, LayoutStride, Serial,
+                              int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t*****, LayoutRight, Serial, int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int64_t_LayoutRight_Rank8.cpp b/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int64_t_LayoutRight_Rank8.cpp
index e869d49e5e..284b7c7c03 100644
--- a/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int64_t_LayoutRight_Rank8.cpp
+++ b/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int64_t_LayoutRight_Rank8.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t********,LayoutRight,LayoutRight, Serial,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t********,LayoutRight,LayoutLeft,  Serial,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t********,LayoutRight,LayoutStride,Serial,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t********,LayoutRight,Serial,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t********, LayoutRight, LayoutRight, Serial,
+                              int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t********, LayoutRight, LayoutLeft, Serial,
+                              int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t********, LayoutRight, LayoutStride,
+                              Serial, int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t********, LayoutRight, Serial, int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int64_t_LayoutStride_Rank1.cpp b/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int64_t_LayoutStride_Rank1.cpp
index afc143012d..aea7515480 100644
--- a/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int64_t_LayoutStride_Rank1.cpp
+++ b/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int64_t_LayoutStride_Rank1.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,18 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*,LayoutStride,LayoutRight, Serial,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*,LayoutStride,LayoutLeft,  Serial,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*,LayoutStride,LayoutStride,Serial,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t*,LayoutStride,Serial,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*, LayoutStride, LayoutRight, Serial, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*, LayoutStride, LayoutLeft, Serial, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*, LayoutStride, LayoutStride, Serial, int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t*, LayoutStride, Serial, int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int64_t_LayoutStride_Rank2.cpp b/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int64_t_LayoutStride_Rank2.cpp
index d146b84f0c..310d949ebc 100644
--- a/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int64_t_LayoutStride_Rank2.cpp
+++ b/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int64_t_LayoutStride_Rank2.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,19 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t**,LayoutStride,LayoutRight, Serial,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t**,LayoutStride,LayoutLeft,  Serial,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t**,LayoutStride,LayoutStride,Serial,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t**,LayoutStride,Serial,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t**, LayoutStride, LayoutRight, Serial, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t**, LayoutStride, LayoutLeft, Serial, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t**, LayoutStride, LayoutStride, Serial,
+                              int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t**, LayoutStride, Serial, int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int64_t_LayoutStride_Rank3.cpp b/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int64_t_LayoutStride_Rank3.cpp
index 4d445cf4fb..2caeee72ae 100644
--- a/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int64_t_LayoutStride_Rank3.cpp
+++ b/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int64_t_LayoutStride_Rank3.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,20 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t***,LayoutStride,LayoutRight, Serial,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t***,LayoutStride,LayoutLeft,  Serial,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t***,LayoutStride,LayoutStride,Serial,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t***,LayoutStride,Serial,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t***, LayoutStride, LayoutRight, Serial,
+                              int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t***, LayoutStride, LayoutLeft, Serial, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t***, LayoutStride, LayoutStride, Serial,
+                              int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t***, LayoutStride, Serial, int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int64_t_LayoutStride_Rank4.cpp b/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int64_t_LayoutStride_Rank4.cpp
index ed0c3a2772..b914f59ed6 100644
--- a/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int64_t_LayoutStride_Rank4.cpp
+++ b/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int64_t_LayoutStride_Rank4.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t****,LayoutStride,LayoutRight, Serial,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t****,LayoutStride,LayoutLeft,  Serial,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t****,LayoutStride,LayoutStride,Serial,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t****,LayoutStride,Serial,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t****, LayoutStride, LayoutRight, Serial,
+                              int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t****, LayoutStride, LayoutLeft, Serial,
+                              int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t****, LayoutStride, LayoutStride, Serial,
+                              int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t****, LayoutStride, Serial, int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int64_t_LayoutStride_Rank5.cpp b/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int64_t_LayoutStride_Rank5.cpp
index 0ae90db101..601716c99b 100644
--- a/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int64_t_LayoutStride_Rank5.cpp
+++ b/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int64_t_LayoutStride_Rank5.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*****,LayoutStride,LayoutRight, Serial,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*****,LayoutStride,LayoutLeft,  Serial,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*****,LayoutStride,LayoutStride,Serial,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t*****,LayoutStride,Serial,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*****, LayoutStride, LayoutRight, Serial,
+                              int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*****, LayoutStride, LayoutLeft, Serial,
+                              int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*****, LayoutStride, LayoutStride, Serial,
+                              int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t*****, LayoutStride, Serial, int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int64_t_LayoutStride_Rank8.cpp b/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int64_t_LayoutStride_Rank8.cpp
index 7d2a62d090..2c101a3552 100644
--- a/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int64_t_LayoutStride_Rank8.cpp
+++ b/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int64_t_LayoutStride_Rank8.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t********,LayoutStride,LayoutRight, Serial,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t********,LayoutStride,LayoutLeft,  Serial,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t********,LayoutStride,LayoutStride,Serial,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t********,LayoutStride,Serial,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t********, LayoutStride, LayoutRight,
+                              Serial, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t********, LayoutStride, LayoutLeft, Serial,
+                              int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t********, LayoutStride, LayoutStride,
+                              Serial, int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t********, LayoutStride, Serial, int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int_LayoutLeft_Rank1.cpp b/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int_LayoutLeft_Rank1.cpp
index cca028b411..b69c4263ed 100644
--- a/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int_LayoutLeft_Rank1.cpp
+++ b/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int_LayoutLeft_Rank1.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,18 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*,LayoutLeft,LayoutRight, Serial,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*,LayoutLeft,LayoutLeft,  Serial,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*,LayoutLeft,LayoutStride,Serial,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int*,LayoutLeft,Serial,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*, LayoutLeft, LayoutRight, Serial, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*, LayoutLeft, LayoutLeft, Serial, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*, LayoutLeft, LayoutStride, Serial, int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int*, LayoutLeft, Serial, int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int_LayoutLeft_Rank2.cpp b/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int_LayoutLeft_Rank2.cpp
index 2d1c9078de..ae58660227 100644
--- a/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int_LayoutLeft_Rank2.cpp
+++ b/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int_LayoutLeft_Rank2.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,18 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int**,LayoutLeft,LayoutRight, Serial,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int**,LayoutLeft,LayoutLeft,  Serial,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int**,LayoutLeft,LayoutStride,Serial,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int**,LayoutLeft,Serial,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int**, LayoutLeft, LayoutRight, Serial, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int**, LayoutLeft, LayoutLeft, Serial, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int**, LayoutLeft, LayoutStride, Serial, int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int**, LayoutLeft, Serial, int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int_LayoutLeft_Rank3.cpp b/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int_LayoutLeft_Rank3.cpp
index 4366c3431c..1c66b58446 100644
--- a/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int_LayoutLeft_Rank3.cpp
+++ b/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int_LayoutLeft_Rank3.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,18 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int***,LayoutLeft,LayoutRight, Serial,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int***,LayoutLeft,LayoutLeft,  Serial,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int***,LayoutLeft,LayoutStride,Serial,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int***,LayoutLeft,Serial,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int***, LayoutLeft, LayoutRight, Serial, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int***, LayoutLeft, LayoutLeft, Serial, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int***, LayoutLeft, LayoutStride, Serial, int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int***, LayoutLeft, Serial, int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int_LayoutLeft_Rank4.cpp b/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int_LayoutLeft_Rank4.cpp
index 8fc8c53881..330dc037d0 100644
--- a/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int_LayoutLeft_Rank4.cpp
+++ b/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int_LayoutLeft_Rank4.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,18 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int****,LayoutLeft,LayoutRight, Serial,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int****,LayoutLeft,LayoutLeft,  Serial,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int****,LayoutLeft,LayoutStride,Serial,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int****,LayoutLeft,Serial,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int****, LayoutLeft, LayoutRight, Serial, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int****, LayoutLeft, LayoutLeft, Serial, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int****, LayoutLeft, LayoutStride, Serial, int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int****, LayoutLeft, Serial, int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int_LayoutLeft_Rank5.cpp b/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int_LayoutLeft_Rank5.cpp
index 45cbc9c93b..001a67f146 100644
--- a/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int_LayoutLeft_Rank5.cpp
+++ b/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int_LayoutLeft_Rank5.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,18 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*****,LayoutLeft,LayoutRight, Serial,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*****,LayoutLeft,LayoutLeft,  Serial,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*****,LayoutLeft,LayoutStride,Serial,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int*****,LayoutLeft,Serial,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*****, LayoutLeft, LayoutRight, Serial, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*****, LayoutLeft, LayoutLeft, Serial, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*****, LayoutLeft, LayoutStride, Serial, int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int*****, LayoutLeft, Serial, int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int_LayoutLeft_Rank8.cpp b/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int_LayoutLeft_Rank8.cpp
index 60875bb560..247f5a3116 100644
--- a/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int_LayoutLeft_Rank8.cpp
+++ b/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int_LayoutLeft_Rank8.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,19 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int********,LayoutLeft,LayoutRight, Serial,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int********,LayoutLeft,LayoutLeft,  Serial,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int********,LayoutLeft,LayoutStride,Serial,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int********,LayoutLeft,Serial,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int********, LayoutLeft, LayoutRight, Serial, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int********, LayoutLeft, LayoutLeft, Serial, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int********, LayoutLeft, LayoutStride, Serial,
+                              int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int********, LayoutLeft, Serial, int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int_LayoutRight_Rank1.cpp b/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int_LayoutRight_Rank1.cpp
index edd3685165..3fffcddae5 100644
--- a/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int_LayoutRight_Rank1.cpp
+++ b/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int_LayoutRight_Rank1.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,18 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*,LayoutRight,LayoutRight, Serial,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*,LayoutRight,LayoutLeft,  Serial,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*,LayoutRight,LayoutStride,Serial,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int*,LayoutRight,Serial,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*, LayoutRight, LayoutRight, Serial, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*, LayoutRight, LayoutLeft, Serial, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*, LayoutRight, LayoutStride, Serial, int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int*, LayoutRight, Serial, int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int_LayoutRight_Rank2.cpp b/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int_LayoutRight_Rank2.cpp
index 454443a32d..0df3ae643a 100644
--- a/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int_LayoutRight_Rank2.cpp
+++ b/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int_LayoutRight_Rank2.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,18 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int**,LayoutRight,LayoutRight, Serial,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int**,LayoutRight,LayoutLeft,  Serial,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int**,LayoutRight,LayoutStride,Serial,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int**,LayoutRight,Serial,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int**, LayoutRight, LayoutRight, Serial, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int**, LayoutRight, LayoutLeft, Serial, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int**, LayoutRight, LayoutStride, Serial, int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int**, LayoutRight, Serial, int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int_LayoutRight_Rank3.cpp b/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int_LayoutRight_Rank3.cpp
index eec967657b..64440939ac 100644
--- a/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int_LayoutRight_Rank3.cpp
+++ b/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int_LayoutRight_Rank3.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,18 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int***,LayoutRight,LayoutRight, Serial,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int***,LayoutRight,LayoutLeft,  Serial,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int***,LayoutRight,LayoutStride,Serial,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int***,LayoutRight,Serial,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int***, LayoutRight, LayoutRight, Serial, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int***, LayoutRight, LayoutLeft, Serial, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int***, LayoutRight, LayoutStride, Serial, int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int***, LayoutRight, Serial, int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int_LayoutRight_Rank4.cpp b/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int_LayoutRight_Rank4.cpp
index ad07902efd..9e5ec83642 100644
--- a/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int_LayoutRight_Rank4.cpp
+++ b/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int_LayoutRight_Rank4.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,18 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int****,LayoutRight,LayoutRight, Serial,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int****,LayoutRight,LayoutLeft,  Serial,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int****,LayoutRight,LayoutStride,Serial,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int****,LayoutRight,Serial,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int****, LayoutRight, LayoutRight, Serial, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int****, LayoutRight, LayoutLeft, Serial, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int****, LayoutRight, LayoutStride, Serial, int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int****, LayoutRight, Serial, int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int_LayoutRight_Rank5.cpp b/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int_LayoutRight_Rank5.cpp
index a9fa7d3bd7..f5731068c8 100644
--- a/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int_LayoutRight_Rank5.cpp
+++ b/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int_LayoutRight_Rank5.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,18 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*****,LayoutRight,LayoutRight, Serial,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*****,LayoutRight,LayoutLeft,  Serial,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*****,LayoutRight,LayoutStride,Serial,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int*****,LayoutRight,Serial,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*****, LayoutRight, LayoutRight, Serial, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*****, LayoutRight, LayoutLeft, Serial, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*****, LayoutRight, LayoutStride, Serial, int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int*****, LayoutRight, Serial, int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int_LayoutRight_Rank8.cpp b/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int_LayoutRight_Rank8.cpp
index aba595865c..4f04907c08 100644
--- a/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int_LayoutRight_Rank8.cpp
+++ b/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int_LayoutRight_Rank8.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,20 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int********,LayoutRight,LayoutRight, Serial,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int********,LayoutRight,LayoutLeft,  Serial,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int********,LayoutRight,LayoutStride,Serial,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int********,LayoutRight,Serial,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int********, LayoutRight, LayoutRight, Serial,
+                              int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int********, LayoutRight, LayoutLeft, Serial, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int********, LayoutRight, LayoutStride, Serial,
+                              int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int********, LayoutRight, Serial, int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int_LayoutStride_Rank1.cpp b/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int_LayoutStride_Rank1.cpp
index 030954cfd0..b0b2b83a33 100644
--- a/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int_LayoutStride_Rank1.cpp
+++ b/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int_LayoutStride_Rank1.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,18 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*,LayoutStride,LayoutRight, Serial,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*,LayoutStride,LayoutLeft,  Serial,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*,LayoutStride,LayoutStride,Serial,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int*,LayoutStride,Serial,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*, LayoutStride, LayoutRight, Serial, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*, LayoutStride, LayoutLeft, Serial, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*, LayoutStride, LayoutStride, Serial, int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int*, LayoutStride, Serial, int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int_LayoutStride_Rank2.cpp b/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int_LayoutStride_Rank2.cpp
index 58eb0f8f8e..a10911f330 100644
--- a/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int_LayoutStride_Rank2.cpp
+++ b/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int_LayoutStride_Rank2.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,18 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int**,LayoutStride,LayoutRight, Serial,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int**,LayoutStride,LayoutLeft,  Serial,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int**,LayoutStride,LayoutStride,Serial,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int**,LayoutStride,Serial,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int**, LayoutStride, LayoutRight, Serial, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int**, LayoutStride, LayoutLeft, Serial, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int**, LayoutStride, LayoutStride, Serial, int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int**, LayoutStride, Serial, int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int_LayoutStride_Rank3.cpp b/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int_LayoutStride_Rank3.cpp
index db698ff0c4..566f8e4f9b 100644
--- a/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int_LayoutStride_Rank3.cpp
+++ b/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int_LayoutStride_Rank3.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,18 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int***,LayoutStride,LayoutRight, Serial,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int***,LayoutStride,LayoutLeft,  Serial,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int***,LayoutStride,LayoutStride,Serial,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int***,LayoutStride,Serial,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int***, LayoutStride, LayoutRight, Serial, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int***, LayoutStride, LayoutLeft, Serial, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int***, LayoutStride, LayoutStride, Serial, int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int***, LayoutStride, Serial, int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int_LayoutStride_Rank4.cpp b/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int_LayoutStride_Rank4.cpp
index 0a03729316..e299d3ab7a 100644
--- a/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int_LayoutStride_Rank4.cpp
+++ b/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int_LayoutStride_Rank4.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,18 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int****,LayoutStride,LayoutRight, Serial,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int****,LayoutStride,LayoutLeft,  Serial,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int****,LayoutStride,LayoutStride,Serial,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int****,LayoutStride,Serial,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int****, LayoutStride, LayoutRight, Serial, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int****, LayoutStride, LayoutLeft, Serial, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int****, LayoutStride, LayoutStride, Serial, int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int****, LayoutStride, Serial, int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int_LayoutStride_Rank5.cpp b/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int_LayoutStride_Rank5.cpp
index 54fe3bbaeb..9a191bf546 100644
--- a/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int_LayoutStride_Rank5.cpp
+++ b/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int_LayoutStride_Rank5.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,18 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*****,LayoutStride,LayoutRight, Serial,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*****,LayoutStride,LayoutLeft,  Serial,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*****,LayoutStride,LayoutStride,Serial,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int*****,LayoutStride,Serial,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*****, LayoutStride, LayoutRight, Serial, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*****, LayoutStride, LayoutLeft, Serial, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*****, LayoutStride, LayoutStride, Serial, int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int*****, LayoutStride, Serial, int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int_LayoutStride_Rank8.cpp b/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int_LayoutStride_Rank8.cpp
index 188a6ae90e..d07e1e8d74 100644
--- a/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int_LayoutStride_Rank8.cpp
+++ b/lib/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int_LayoutStride_Rank8.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int********,LayoutStride,LayoutRight, Serial,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int********,LayoutStride,LayoutLeft,  Serial,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int********,LayoutStride,LayoutStride,Serial,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int********,LayoutStride,Serial,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int********, LayoutStride, LayoutRight, Serial,
+                              int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int********, LayoutStride, LayoutLeft, Serial,
+                              int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int********, LayoutStride, LayoutStride, Serial,
+                              int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int********, LayoutStride, Serial, int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank1.cpp b/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank1.cpp
index ea35f6e75e..7c84605ed9 100644
--- a/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank1.cpp
+++ b/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank1.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,20 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*,LayoutLeft,LayoutRight, Threads,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*,LayoutLeft,LayoutLeft,  Threads,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*,LayoutLeft,LayoutStride,Threads,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(double*,LayoutLeft,Threads,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*, LayoutLeft, LayoutRight, Threads,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*, LayoutLeft, LayoutLeft, Threads, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*, LayoutLeft, LayoutStride, Threads,
+                              int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(double*, LayoutLeft, Threads, int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank2.cpp b/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank2.cpp
index 2c3352a4e4..3d7313a54f 100644
--- a/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank2.cpp
+++ b/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank2.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double**,LayoutLeft,LayoutRight, Threads,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double**,LayoutLeft,LayoutLeft,  Threads,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double**,LayoutLeft,LayoutStride,Threads,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(double**,LayoutLeft,Threads,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double**, LayoutLeft, LayoutRight, Threads,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double**, LayoutLeft, LayoutLeft, Threads,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double**, LayoutLeft, LayoutStride, Threads,
+                              int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(double**, LayoutLeft, Threads, int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank3.cpp b/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank3.cpp
index 78a7dadbf1..72895035bb 100644
--- a/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank3.cpp
+++ b/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank3.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double***,LayoutLeft,LayoutRight, Threads,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double***,LayoutLeft,LayoutLeft,  Threads,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double***,LayoutLeft,LayoutStride,Threads,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(double***,LayoutLeft,Threads,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double***, LayoutLeft, LayoutRight, Threads,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double***, LayoutLeft, LayoutLeft, Threads,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double***, LayoutLeft, LayoutStride, Threads,
+                              int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(double***, LayoutLeft, Threads, int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank4.cpp b/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank4.cpp
index 26654052ac..69673d51e0 100644
--- a/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank4.cpp
+++ b/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank4.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double****,LayoutLeft,LayoutRight, Threads,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double****,LayoutLeft,LayoutLeft,  Threads,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double****,LayoutLeft,LayoutStride,Threads,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(double****,LayoutLeft,Threads,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double****, LayoutLeft, LayoutRight, Threads,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double****, LayoutLeft, LayoutLeft, Threads,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double****, LayoutLeft, LayoutStride, Threads,
+                              int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(double****, LayoutLeft, Threads, int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank5.cpp b/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank5.cpp
index cc2bc74616..d1aff7b82f 100644
--- a/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank5.cpp
+++ b/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank5.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*****,LayoutLeft,LayoutRight, Threads,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*****,LayoutLeft,LayoutLeft,  Threads,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*****,LayoutLeft,LayoutStride,Threads,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(double*****,LayoutLeft,Threads,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*****, LayoutLeft, LayoutRight, Threads,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*****, LayoutLeft, LayoutLeft, Threads,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*****, LayoutLeft, LayoutStride, Threads,
+                              int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(double*****, LayoutLeft, Threads, int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank8.cpp b/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank8.cpp
index 547352cbc5..e617e19b44 100644
--- a/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank8.cpp
+++ b/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank8.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double********,LayoutLeft,LayoutRight, Threads,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double********,LayoutLeft,LayoutLeft,  Threads,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double********,LayoutLeft,LayoutStride,Threads,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(double********,LayoutLeft,Threads,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double********, LayoutLeft, LayoutRight, Threads,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double********, LayoutLeft, LayoutLeft, Threads,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double********, LayoutLeft, LayoutStride, Threads,
+                              int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(double********, LayoutLeft, Threads, int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_double_LayoutRight_Rank1.cpp b/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_double_LayoutRight_Rank1.cpp
index c6db34afca..855e99e06b 100644
--- a/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_double_LayoutRight_Rank1.cpp
+++ b/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_double_LayoutRight_Rank1.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*,LayoutRight,LayoutRight, Threads,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*,LayoutRight,LayoutLeft,  Threads,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*,LayoutRight,LayoutStride,Threads,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(double*,LayoutRight,Threads,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*, LayoutRight, LayoutRight, Threads,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*, LayoutRight, LayoutLeft, Threads,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*, LayoutRight, LayoutStride, Threads,
+                              int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(double*, LayoutRight, Threads, int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_double_LayoutRight_Rank2.cpp b/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_double_LayoutRight_Rank2.cpp
index 7e0b8bc5b2..b9ffb82a5d 100644
--- a/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_double_LayoutRight_Rank2.cpp
+++ b/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_double_LayoutRight_Rank2.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double**,LayoutRight,LayoutRight, Threads,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double**,LayoutRight,LayoutLeft,  Threads,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double**,LayoutRight,LayoutStride,Threads,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(double**,LayoutRight,Threads,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double**, LayoutRight, LayoutRight, Threads,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double**, LayoutRight, LayoutLeft, Threads,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double**, LayoutRight, LayoutStride, Threads,
+                              int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(double**, LayoutRight, Threads, int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_double_LayoutRight_Rank3.cpp b/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_double_LayoutRight_Rank3.cpp
index 225d5f3c5d..85a4683974 100644
--- a/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_double_LayoutRight_Rank3.cpp
+++ b/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_double_LayoutRight_Rank3.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double***,LayoutRight,LayoutRight, Threads,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double***,LayoutRight,LayoutLeft,  Threads,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double***,LayoutRight,LayoutStride,Threads,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(double***,LayoutRight,Threads,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double***, LayoutRight, LayoutRight, Threads,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double***, LayoutRight, LayoutLeft, Threads,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double***, LayoutRight, LayoutStride, Threads,
+                              int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(double***, LayoutRight, Threads, int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_double_LayoutRight_Rank4.cpp b/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_double_LayoutRight_Rank4.cpp
index 603c003527..ba658e7b71 100644
--- a/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_double_LayoutRight_Rank4.cpp
+++ b/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_double_LayoutRight_Rank4.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double****,LayoutRight,LayoutRight, Threads,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double****,LayoutRight,LayoutLeft,  Threads,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double****,LayoutRight,LayoutStride,Threads,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(double****,LayoutRight,Threads,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double****, LayoutRight, LayoutRight, Threads,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double****, LayoutRight, LayoutLeft, Threads,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double****, LayoutRight, LayoutStride, Threads,
+                              int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(double****, LayoutRight, Threads, int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_double_LayoutRight_Rank5.cpp b/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_double_LayoutRight_Rank5.cpp
index 47d1dad83f..8d413bcb39 100644
--- a/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_double_LayoutRight_Rank5.cpp
+++ b/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_double_LayoutRight_Rank5.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*****,LayoutRight,LayoutRight, Threads,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*****,LayoutRight,LayoutLeft,  Threads,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*****,LayoutRight,LayoutStride,Threads,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(double*****,LayoutRight,Threads,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*****, LayoutRight, LayoutRight, Threads,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*****, LayoutRight, LayoutLeft, Threads,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*****, LayoutRight, LayoutStride, Threads,
+                              int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(double*****, LayoutRight, Threads, int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_double_LayoutRight_Rank8.cpp b/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_double_LayoutRight_Rank8.cpp
index 29ff44cc7a..8a2a06649f 100644
--- a/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_double_LayoutRight_Rank8.cpp
+++ b/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_double_LayoutRight_Rank8.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double********,LayoutRight,LayoutRight, Threads,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double********,LayoutRight,LayoutLeft,  Threads,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double********,LayoutRight,LayoutStride,Threads,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(double********,LayoutRight,Threads,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double********, LayoutRight, LayoutRight, Threads,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double********, LayoutRight, LayoutLeft, Threads,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double********, LayoutRight, LayoutStride,
+                              Threads, int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(double********, LayoutRight, Threads, int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_double_LayoutStride_Rank1.cpp b/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_double_LayoutStride_Rank1.cpp
index 19e55a4988..3a376b91a9 100644
--- a/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_double_LayoutStride_Rank1.cpp
+++ b/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_double_LayoutStride_Rank1.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*,LayoutStride,LayoutRight, Threads,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*,LayoutStride,LayoutLeft,  Threads,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*,LayoutStride,LayoutStride,Threads,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(double*,LayoutStride,Threads,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*, LayoutStride, LayoutRight, Threads,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*, LayoutStride, LayoutLeft, Threads,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*, LayoutStride, LayoutStride, Threads,
+                              int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(double*, LayoutStride, Threads, int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_double_LayoutStride_Rank2.cpp b/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_double_LayoutStride_Rank2.cpp
index 14d96e05b2..7a3ca29f43 100644
--- a/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_double_LayoutStride_Rank2.cpp
+++ b/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_double_LayoutStride_Rank2.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double**,LayoutStride,LayoutRight, Threads,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double**,LayoutStride,LayoutLeft,  Threads,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double**,LayoutStride,LayoutStride,Threads,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(double**,LayoutStride,Threads,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double**, LayoutStride, LayoutRight, Threads,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double**, LayoutStride, LayoutLeft, Threads,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double**, LayoutStride, LayoutStride, Threads,
+                              int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(double**, LayoutStride, Threads, int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_double_LayoutStride_Rank3.cpp b/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_double_LayoutStride_Rank3.cpp
index 16964ca0de..44bf3df6a6 100644
--- a/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_double_LayoutStride_Rank3.cpp
+++ b/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_double_LayoutStride_Rank3.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double***,LayoutStride,LayoutRight, Threads,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double***,LayoutStride,LayoutLeft,  Threads,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double***,LayoutStride,LayoutStride,Threads,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(double***,LayoutStride,Threads,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double***, LayoutStride, LayoutRight, Threads,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double***, LayoutStride, LayoutLeft, Threads,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double***, LayoutStride, LayoutStride, Threads,
+                              int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(double***, LayoutStride, Threads, int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_double_LayoutStride_Rank4.cpp b/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_double_LayoutStride_Rank4.cpp
index 76f7312e42..943a00325f 100644
--- a/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_double_LayoutStride_Rank4.cpp
+++ b/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_double_LayoutStride_Rank4.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double****,LayoutStride,LayoutRight, Threads,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double****,LayoutStride,LayoutLeft,  Threads,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double****,LayoutStride,LayoutStride,Threads,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(double****,LayoutStride,Threads,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double****, LayoutStride, LayoutRight, Threads,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double****, LayoutStride, LayoutLeft, Threads,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double****, LayoutStride, LayoutStride, Threads,
+                              int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(double****, LayoutStride, Threads, int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_double_LayoutStride_Rank5.cpp b/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_double_LayoutStride_Rank5.cpp
index 03e39ec113..b12da7c5b9 100644
--- a/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_double_LayoutStride_Rank5.cpp
+++ b/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_double_LayoutStride_Rank5.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*****,LayoutStride,LayoutRight, Threads,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*****,LayoutStride,LayoutLeft,  Threads,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*****,LayoutStride,LayoutStride,Threads,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(double*****,LayoutStride,Threads,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*****, LayoutStride, LayoutRight, Threads,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*****, LayoutStride, LayoutLeft, Threads,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*****, LayoutStride, LayoutStride, Threads,
+                              int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(double*****, LayoutStride, Threads, int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_double_LayoutStride_Rank8.cpp b/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_double_LayoutStride_Rank8.cpp
index f90114c841..a859379df6 100644
--- a/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_double_LayoutStride_Rank8.cpp
+++ b/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_double_LayoutStride_Rank8.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double********,LayoutStride,LayoutRight, Threads,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double********,LayoutStride,LayoutLeft,  Threads,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double********,LayoutStride,LayoutStride,Threads,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(double********,LayoutStride,Threads,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double********, LayoutStride, LayoutRight,
+                              Threads, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double********, LayoutStride, LayoutLeft, Threads,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double********, LayoutStride, LayoutStride,
+                              Threads, int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(double********, LayoutStride, Threads, int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank1.cpp b/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank1.cpp
index 206ecb2030..b11ec7758d 100644
--- a/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank1.cpp
+++ b/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank1.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,19 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*,LayoutLeft,LayoutRight, Threads,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*,LayoutLeft,LayoutLeft,  Threads,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*,LayoutLeft,LayoutStride,Threads,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(float*,LayoutLeft,Threads,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*, LayoutLeft, LayoutRight, Threads, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*, LayoutLeft, LayoutLeft, Threads, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*, LayoutLeft, LayoutStride, Threads,
+                              int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(float*, LayoutLeft, Threads, int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank2.cpp b/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank2.cpp
index 7f70db58c6..e7fee1b9e3 100644
--- a/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank2.cpp
+++ b/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank2.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,20 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float**,LayoutLeft,LayoutRight, Threads,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float**,LayoutLeft,LayoutLeft,  Threads,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float**,LayoutLeft,LayoutStride,Threads,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(float**,LayoutLeft,Threads,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float**, LayoutLeft, LayoutRight, Threads,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float**, LayoutLeft, LayoutLeft, Threads, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float**, LayoutLeft, LayoutStride, Threads,
+                              int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(float**, LayoutLeft, Threads, int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank3.cpp b/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank3.cpp
index 01b98c50ff..f82b4a92ba 100644
--- a/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank3.cpp
+++ b/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank3.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float***,LayoutLeft,LayoutRight, Threads,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float***,LayoutLeft,LayoutLeft,  Threads,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float***,LayoutLeft,LayoutStride,Threads,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(float***,LayoutLeft,Threads,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float***, LayoutLeft, LayoutRight, Threads,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float***, LayoutLeft, LayoutLeft, Threads,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float***, LayoutLeft, LayoutStride, Threads,
+                              int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(float***, LayoutLeft, Threads, int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank4.cpp b/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank4.cpp
index b57b537878..3904c4cb03 100644
--- a/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank4.cpp
+++ b/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank4.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float****,LayoutLeft,LayoutRight, Threads,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float****,LayoutLeft,LayoutLeft,  Threads,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float****,LayoutLeft,LayoutStride,Threads,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(float****,LayoutLeft,Threads,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float****, LayoutLeft, LayoutRight, Threads,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float****, LayoutLeft, LayoutLeft, Threads,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float****, LayoutLeft, LayoutStride, Threads,
+                              int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(float****, LayoutLeft, Threads, int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank5.cpp b/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank5.cpp
index 058c517fa7..77d46acfdd 100644
--- a/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank5.cpp
+++ b/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank5.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*****,LayoutLeft,LayoutRight, Threads,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*****,LayoutLeft,LayoutLeft,  Threads,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*****,LayoutLeft,LayoutStride,Threads,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(float*****,LayoutLeft,Threads,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*****, LayoutLeft, LayoutRight, Threads,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*****, LayoutLeft, LayoutLeft, Threads,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*****, LayoutLeft, LayoutStride, Threads,
+                              int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(float*****, LayoutLeft, Threads, int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank8.cpp b/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank8.cpp
index 5603583aee..006fce3cfc 100644
--- a/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank8.cpp
+++ b/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank8.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float********,LayoutLeft,LayoutRight, Threads,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float********,LayoutLeft,LayoutLeft,  Threads,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float********,LayoutLeft,LayoutStride,Threads,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(float********,LayoutLeft,Threads,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float********, LayoutLeft, LayoutRight, Threads,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float********, LayoutLeft, LayoutLeft, Threads,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float********, LayoutLeft, LayoutStride, Threads,
+                              int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(float********, LayoutLeft, Threads, int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_float_LayoutRight_Rank1.cpp b/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_float_LayoutRight_Rank1.cpp
index 66b7237446..91256cd69b 100644
--- a/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_float_LayoutRight_Rank1.cpp
+++ b/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_float_LayoutRight_Rank1.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,20 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*,LayoutRight,LayoutRight, Threads,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*,LayoutRight,LayoutLeft,  Threads,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*,LayoutRight,LayoutStride,Threads,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(float*,LayoutRight,Threads,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*, LayoutRight, LayoutRight, Threads,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*, LayoutRight, LayoutLeft, Threads, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*, LayoutRight, LayoutStride, Threads,
+                              int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(float*, LayoutRight, Threads, int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_float_LayoutRight_Rank2.cpp b/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_float_LayoutRight_Rank2.cpp
index 998f8109af..d29fbfe795 100644
--- a/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_float_LayoutRight_Rank2.cpp
+++ b/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_float_LayoutRight_Rank2.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float**,LayoutRight,LayoutRight, Threads,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float**,LayoutRight,LayoutLeft,  Threads,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float**,LayoutRight,LayoutStride,Threads,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(float**,LayoutRight,Threads,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float**, LayoutRight, LayoutRight, Threads,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float**, LayoutRight, LayoutLeft, Threads,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float**, LayoutRight, LayoutStride, Threads,
+                              int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(float**, LayoutRight, Threads, int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_float_LayoutRight_Rank3.cpp b/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_float_LayoutRight_Rank3.cpp
index 2b806028b9..bdf866f3ba 100644
--- a/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_float_LayoutRight_Rank3.cpp
+++ b/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_float_LayoutRight_Rank3.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float***,LayoutRight,LayoutRight, Threads,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float***,LayoutRight,LayoutLeft,  Threads,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float***,LayoutRight,LayoutStride,Threads,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(float***,LayoutRight,Threads,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float***, LayoutRight, LayoutRight, Threads,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float***, LayoutRight, LayoutLeft, Threads,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float***, LayoutRight, LayoutStride, Threads,
+                              int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(float***, LayoutRight, Threads, int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_float_LayoutRight_Rank4.cpp b/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_float_LayoutRight_Rank4.cpp
index ab2a92c19a..aaa00a6f6d 100644
--- a/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_float_LayoutRight_Rank4.cpp
+++ b/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_float_LayoutRight_Rank4.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float****,LayoutRight,LayoutRight, Threads,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float****,LayoutRight,LayoutLeft,  Threads,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float****,LayoutRight,LayoutStride,Threads,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(float****,LayoutRight,Threads,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float****, LayoutRight, LayoutRight, Threads,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float****, LayoutRight, LayoutLeft, Threads,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float****, LayoutRight, LayoutStride, Threads,
+                              int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(float****, LayoutRight, Threads, int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_float_LayoutRight_Rank5.cpp b/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_float_LayoutRight_Rank5.cpp
index 15c1811331..db2ab88d28 100644
--- a/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_float_LayoutRight_Rank5.cpp
+++ b/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_float_LayoutRight_Rank5.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*****,LayoutRight,LayoutRight, Threads,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*****,LayoutRight,LayoutLeft,  Threads,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*****,LayoutRight,LayoutStride,Threads,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(float*****,LayoutRight,Threads,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*****, LayoutRight, LayoutRight, Threads,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*****, LayoutRight, LayoutLeft, Threads,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*****, LayoutRight, LayoutStride, Threads,
+                              int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(float*****, LayoutRight, Threads, int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_float_LayoutRight_Rank8.cpp b/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_float_LayoutRight_Rank8.cpp
index e8caa6bf5e..3024e4e004 100644
--- a/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_float_LayoutRight_Rank8.cpp
+++ b/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_float_LayoutRight_Rank8.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float********,LayoutRight,LayoutRight, Threads,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float********,LayoutRight,LayoutLeft,  Threads,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float********,LayoutRight,LayoutStride,Threads,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(float********,LayoutRight,Threads,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float********, LayoutRight, LayoutRight, Threads,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float********, LayoutRight, LayoutLeft, Threads,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float********, LayoutRight, LayoutStride, Threads,
+                              int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(float********, LayoutRight, Threads, int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_float_LayoutStride_Rank1.cpp b/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_float_LayoutStride_Rank1.cpp
index 8d2652d31b..e6e66d7bb8 100644
--- a/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_float_LayoutStride_Rank1.cpp
+++ b/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_float_LayoutStride_Rank1.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*,LayoutStride,LayoutRight, Threads,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*,LayoutStride,LayoutLeft,  Threads,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*,LayoutStride,LayoutStride,Threads,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(float*,LayoutStride,Threads,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*, LayoutStride, LayoutRight, Threads,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*, LayoutStride, LayoutLeft, Threads,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*, LayoutStride, LayoutStride, Threads,
+                              int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(float*, LayoutStride, Threads, int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_float_LayoutStride_Rank2.cpp b/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_float_LayoutStride_Rank2.cpp
index 3f24c46337..28ed80254f 100644
--- a/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_float_LayoutStride_Rank2.cpp
+++ b/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_float_LayoutStride_Rank2.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float**,LayoutStride,LayoutRight, Threads,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float**,LayoutStride,LayoutLeft,  Threads,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float**,LayoutStride,LayoutStride,Threads,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(float**,LayoutStride,Threads,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float**, LayoutStride, LayoutRight, Threads,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float**, LayoutStride, LayoutLeft, Threads,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float**, LayoutStride, LayoutStride, Threads,
+                              int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(float**, LayoutStride, Threads, int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_float_LayoutStride_Rank3.cpp b/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_float_LayoutStride_Rank3.cpp
index 07abec16de..4863866aa7 100644
--- a/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_float_LayoutStride_Rank3.cpp
+++ b/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_float_LayoutStride_Rank3.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float***,LayoutStride,LayoutRight, Threads,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float***,LayoutStride,LayoutLeft,  Threads,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float***,LayoutStride,LayoutStride,Threads,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(float***,LayoutStride,Threads,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float***, LayoutStride, LayoutRight, Threads,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float***, LayoutStride, LayoutLeft, Threads,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float***, LayoutStride, LayoutStride, Threads,
+                              int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(float***, LayoutStride, Threads, int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_float_LayoutStride_Rank4.cpp b/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_float_LayoutStride_Rank4.cpp
index 868b86f4b3..e24e9e022a 100644
--- a/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_float_LayoutStride_Rank4.cpp
+++ b/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_float_LayoutStride_Rank4.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float****,LayoutStride,LayoutRight, Threads,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float****,LayoutStride,LayoutLeft,  Threads,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float****,LayoutStride,LayoutStride,Threads,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(float****,LayoutStride,Threads,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float****, LayoutStride, LayoutRight, Threads,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float****, LayoutStride, LayoutLeft, Threads,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float****, LayoutStride, LayoutStride, Threads,
+                              int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(float****, LayoutStride, Threads, int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_float_LayoutStride_Rank5.cpp b/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_float_LayoutStride_Rank5.cpp
index 93fb522f92..047c078bce 100644
--- a/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_float_LayoutStride_Rank5.cpp
+++ b/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_float_LayoutStride_Rank5.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*****,LayoutStride,LayoutRight, Threads,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*****,LayoutStride,LayoutLeft,  Threads,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*****,LayoutStride,LayoutStride,Threads,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(float*****,LayoutStride,Threads,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*****, LayoutStride, LayoutRight, Threads,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*****, LayoutStride, LayoutLeft, Threads,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*****, LayoutStride, LayoutStride, Threads,
+                              int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(float*****, LayoutStride, Threads, int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_float_LayoutStride_Rank8.cpp b/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_float_LayoutStride_Rank8.cpp
index 59e006df81..78c7496b7c 100644
--- a/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_float_LayoutStride_Rank8.cpp
+++ b/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_float_LayoutStride_Rank8.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float********,LayoutStride,LayoutRight, Threads,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float********,LayoutStride,LayoutLeft,  Threads,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float********,LayoutStride,LayoutStride,Threads,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(float********,LayoutStride,Threads,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float********, LayoutStride, LayoutRight, Threads,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float********, LayoutStride, LayoutLeft, Threads,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float********, LayoutStride, LayoutStride,
+                              Threads, int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(float********, LayoutStride, Threads, int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank1.cpp b/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank1.cpp
index 461f88b509..33ee500813 100644
--- a/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank1.cpp
+++ b/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank1.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*,LayoutLeft,LayoutRight, Threads,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*,LayoutLeft,LayoutLeft,  Threads,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*,LayoutLeft,LayoutStride,Threads,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t*,LayoutLeft,Threads,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*, LayoutLeft, LayoutRight, Threads,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*, LayoutLeft, LayoutLeft, Threads,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*, LayoutLeft, LayoutStride, Threads,
+                              int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t*, LayoutLeft, Threads, int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank2.cpp b/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank2.cpp
index 6f728921ed..4c1d4bb58c 100644
--- a/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank2.cpp
+++ b/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank2.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t**,LayoutLeft,LayoutRight, Threads,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t**,LayoutLeft,LayoutLeft,  Threads,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t**,LayoutLeft,LayoutStride,Threads,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t**,LayoutLeft,Threads,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t**, LayoutLeft, LayoutRight, Threads,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t**, LayoutLeft, LayoutLeft, Threads,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t**, LayoutLeft, LayoutStride, Threads,
+                              int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t**, LayoutLeft, Threads, int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank3.cpp b/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank3.cpp
index e80f24eba3..75e4bc4e3e 100644
--- a/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank3.cpp
+++ b/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank3.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t***,LayoutLeft,LayoutRight, Threads,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t***,LayoutLeft,LayoutLeft,  Threads,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t***,LayoutLeft,LayoutStride,Threads,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t***,LayoutLeft,Threads,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t***, LayoutLeft, LayoutRight, Threads,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t***, LayoutLeft, LayoutLeft, Threads,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t***, LayoutLeft, LayoutStride, Threads,
+                              int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t***, LayoutLeft, Threads, int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank4.cpp b/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank4.cpp
index 1d01f9654a..3007a4db6f 100644
--- a/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank4.cpp
+++ b/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank4.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t****,LayoutLeft,LayoutRight, Threads,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t****,LayoutLeft,LayoutLeft,  Threads,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t****,LayoutLeft,LayoutStride,Threads,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t****,LayoutLeft,Threads,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t****, LayoutLeft, LayoutRight, Threads,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t****, LayoutLeft, LayoutLeft, Threads,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t****, LayoutLeft, LayoutStride, Threads,
+                              int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t****, LayoutLeft, Threads, int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank5.cpp b/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank5.cpp
index d39754bb4d..198e54631b 100644
--- a/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank5.cpp
+++ b/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank5.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*****,LayoutLeft,LayoutRight, Threads,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*****,LayoutLeft,LayoutLeft,  Threads,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*****,LayoutLeft,LayoutStride,Threads,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t*****,LayoutLeft,Threads,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*****, LayoutLeft, LayoutRight, Threads,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*****, LayoutLeft, LayoutLeft, Threads,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*****, LayoutLeft, LayoutStride, Threads,
+                              int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t*****, LayoutLeft, Threads, int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank8.cpp b/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank8.cpp
index 8ac534d5fb..c12fa4e7bd 100644
--- a/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank8.cpp
+++ b/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank8.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t********,LayoutLeft,LayoutRight, Threads,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t********,LayoutLeft,LayoutLeft,  Threads,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t********,LayoutLeft,LayoutStride,Threads,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t********,LayoutLeft,Threads,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t********, LayoutLeft, LayoutRight, Threads,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t********, LayoutLeft, LayoutLeft, Threads,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t********, LayoutLeft, LayoutStride,
+                              Threads, int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t********, LayoutLeft, Threads, int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank1.cpp b/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank1.cpp
index 51ecca6631..82f782ce57 100644
--- a/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank1.cpp
+++ b/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank1.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*,LayoutRight,LayoutRight, Threads,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*,LayoutRight,LayoutLeft,  Threads,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*,LayoutRight,LayoutStride,Threads,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t*,LayoutRight,Threads,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*, LayoutRight, LayoutRight, Threads,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*, LayoutRight, LayoutLeft, Threads,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*, LayoutRight, LayoutStride, Threads,
+                              int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t*, LayoutRight, Threads, int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank2.cpp b/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank2.cpp
index 04ff78c52f..d11bf3dd27 100644
--- a/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank2.cpp
+++ b/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank2.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t**,LayoutRight,LayoutRight, Threads,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t**,LayoutRight,LayoutLeft,  Threads,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t**,LayoutRight,LayoutStride,Threads,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t**,LayoutRight,Threads,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t**, LayoutRight, LayoutRight, Threads,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t**, LayoutRight, LayoutLeft, Threads,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t**, LayoutRight, LayoutStride, Threads,
+                              int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t**, LayoutRight, Threads, int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank3.cpp b/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank3.cpp
index 2ab12f2680..53bd8056d0 100644
--- a/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank3.cpp
+++ b/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank3.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t***,LayoutRight,LayoutRight, Threads,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t***,LayoutRight,LayoutLeft,  Threads,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t***,LayoutRight,LayoutStride,Threads,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t***,LayoutRight,Threads,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t***, LayoutRight, LayoutRight, Threads,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t***, LayoutRight, LayoutLeft, Threads,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t***, LayoutRight, LayoutStride, Threads,
+                              int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t***, LayoutRight, Threads, int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank4.cpp b/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank4.cpp
index 8a9c681d8e..44e78041be 100644
--- a/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank4.cpp
+++ b/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank4.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t****,LayoutRight,LayoutRight, Threads,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t****,LayoutRight,LayoutLeft,  Threads,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t****,LayoutRight,LayoutStride,Threads,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t****,LayoutRight,Threads,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t****, LayoutRight, LayoutRight, Threads,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t****, LayoutRight, LayoutLeft, Threads,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t****, LayoutRight, LayoutStride, Threads,
+                              int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t****, LayoutRight, Threads, int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank5.cpp b/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank5.cpp
index d70fcd3e75..6f54702d24 100644
--- a/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank5.cpp
+++ b/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank5.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*****,LayoutRight,LayoutRight, Threads,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*****,LayoutRight,LayoutLeft,  Threads,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*****,LayoutRight,LayoutStride,Threads,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t*****,LayoutRight,Threads,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*****, LayoutRight, LayoutRight, Threads,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*****, LayoutRight, LayoutLeft, Threads,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*****, LayoutRight, LayoutStride, Threads,
+                              int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t*****, LayoutRight, Threads, int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank8.cpp b/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank8.cpp
index ad26488045..141b79110e 100644
--- a/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank8.cpp
+++ b/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank8.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t********,LayoutRight,LayoutRight, Threads,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t********,LayoutRight,LayoutLeft,  Threads,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t********,LayoutRight,LayoutStride,Threads,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t********,LayoutRight,Threads,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t********, LayoutRight, LayoutRight,
+                              Threads, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t********, LayoutRight, LayoutLeft, Threads,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t********, LayoutRight, LayoutStride,
+                              Threads, int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t********, LayoutRight, Threads, int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank1.cpp b/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank1.cpp
index 737a43339e..e23e6092eb 100644
--- a/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank1.cpp
+++ b/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank1.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*,LayoutStride,LayoutRight, Threads,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*,LayoutStride,LayoutLeft,  Threads,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*,LayoutStride,LayoutStride,Threads,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t*,LayoutStride,Threads,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*, LayoutStride, LayoutRight, Threads,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*, LayoutStride, LayoutLeft, Threads,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*, LayoutStride, LayoutStride, Threads,
+                              int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t*, LayoutStride, Threads, int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank2.cpp b/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank2.cpp
index a3ca1138e6..f5db8f744e 100644
--- a/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank2.cpp
+++ b/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank2.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t**,LayoutStride,LayoutRight, Threads,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t**,LayoutStride,LayoutLeft,  Threads,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t**,LayoutStride,LayoutStride,Threads,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t**,LayoutStride,Threads,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t**, LayoutStride, LayoutRight, Threads,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t**, LayoutStride, LayoutLeft, Threads,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t**, LayoutStride, LayoutStride, Threads,
+                              int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t**, LayoutStride, Threads, int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank3.cpp b/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank3.cpp
index 2e7ffe0e82..44ce223183 100644
--- a/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank3.cpp
+++ b/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank3.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t***,LayoutStride,LayoutRight, Threads,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t***,LayoutStride,LayoutLeft,  Threads,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t***,LayoutStride,LayoutStride,Threads,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t***,LayoutStride,Threads,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t***, LayoutStride, LayoutRight, Threads,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t***, LayoutStride, LayoutLeft, Threads,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t***, LayoutStride, LayoutStride, Threads,
+                              int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t***, LayoutStride, Threads, int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank4.cpp b/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank4.cpp
index c42ef59606..55fca11183 100644
--- a/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank4.cpp
+++ b/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank4.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t****,LayoutStride,LayoutRight, Threads,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t****,LayoutStride,LayoutLeft,  Threads,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t****,LayoutStride,LayoutStride,Threads,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t****,LayoutStride,Threads,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t****, LayoutStride, LayoutRight, Threads,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t****, LayoutStride, LayoutLeft, Threads,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t****, LayoutStride, LayoutStride, Threads,
+                              int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t****, LayoutStride, Threads, int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank5.cpp b/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank5.cpp
index 4834750126..31b952913e 100644
--- a/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank5.cpp
+++ b/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank5.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*****,LayoutStride,LayoutRight, Threads,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*****,LayoutStride,LayoutLeft,  Threads,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*****,LayoutStride,LayoutStride,Threads,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t*****,LayoutStride,Threads,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*****, LayoutStride, LayoutRight, Threads,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*****, LayoutStride, LayoutLeft, Threads,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*****, LayoutStride, LayoutStride, Threads,
+                              int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t*****, LayoutStride, Threads, int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank8.cpp b/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank8.cpp
index b5b40bb67c..887bfb4c09 100644
--- a/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank8.cpp
+++ b/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank8.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t********,LayoutStride,LayoutRight, Threads,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t********,LayoutStride,LayoutLeft,  Threads,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t********,LayoutStride,LayoutStride,Threads,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t********,LayoutStride,Threads,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t********, LayoutStride, LayoutRight,
+                              Threads, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t********, LayoutStride, LayoutLeft,
+                              Threads, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t********, LayoutStride, LayoutStride,
+                              Threads, int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t********, LayoutStride, Threads, int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank1.cpp b/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank1.cpp
index b3dddb6bd2..71625e0d81 100644
--- a/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank1.cpp
+++ b/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank1.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,18 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*,LayoutLeft,LayoutRight, Threads,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*,LayoutLeft,LayoutLeft,  Threads,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*,LayoutLeft,LayoutStride,Threads,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int*,LayoutLeft,Threads,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*, LayoutLeft, LayoutRight, Threads, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*, LayoutLeft, LayoutLeft, Threads, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*, LayoutLeft, LayoutStride, Threads, int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int*, LayoutLeft, Threads, int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank2.cpp b/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank2.cpp
index 722de52339..cd045703ff 100644
--- a/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank2.cpp
+++ b/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank2.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,18 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int**,LayoutLeft,LayoutRight, Threads,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int**,LayoutLeft,LayoutLeft,  Threads,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int**,LayoutLeft,LayoutStride,Threads,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int**,LayoutLeft,Threads,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int**, LayoutLeft, LayoutRight, Threads, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int**, LayoutLeft, LayoutLeft, Threads, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int**, LayoutLeft, LayoutStride, Threads, int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int**, LayoutLeft, Threads, int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank3.cpp b/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank3.cpp
index b0871ddcce..abbd0f8429 100644
--- a/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank3.cpp
+++ b/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank3.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,19 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int***,LayoutLeft,LayoutRight, Threads,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int***,LayoutLeft,LayoutLeft,  Threads,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int***,LayoutLeft,LayoutStride,Threads,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int***,LayoutLeft,Threads,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int***, LayoutLeft, LayoutRight, Threads, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int***, LayoutLeft, LayoutLeft, Threads, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int***, LayoutLeft, LayoutStride, Threads,
+                              int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int***, LayoutLeft, Threads, int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank4.cpp b/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank4.cpp
index 53aea25bde..5ac12d8648 100644
--- a/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank4.cpp
+++ b/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank4.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,20 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int****,LayoutLeft,LayoutRight, Threads,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int****,LayoutLeft,LayoutLeft,  Threads,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int****,LayoutLeft,LayoutStride,Threads,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int****,LayoutLeft,Threads,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int****, LayoutLeft, LayoutRight, Threads,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int****, LayoutLeft, LayoutLeft, Threads, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int****, LayoutLeft, LayoutStride, Threads,
+                              int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int****, LayoutLeft, Threads, int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank5.cpp b/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank5.cpp
index d64523e05d..50ed4f48c3 100644
--- a/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank5.cpp
+++ b/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank5.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*****,LayoutLeft,LayoutRight, Threads,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*****,LayoutLeft,LayoutLeft,  Threads,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*****,LayoutLeft,LayoutStride,Threads,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int*****,LayoutLeft,Threads,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*****, LayoutLeft, LayoutRight, Threads,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*****, LayoutLeft, LayoutLeft, Threads,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*****, LayoutLeft, LayoutStride, Threads,
+                              int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int*****, LayoutLeft, Threads, int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank8.cpp b/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank8.cpp
index 1017176577..f83f5faa20 100644
--- a/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank8.cpp
+++ b/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank8.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int********,LayoutLeft,LayoutRight, Threads,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int********,LayoutLeft,LayoutLeft,  Threads,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int********,LayoutLeft,LayoutStride,Threads,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int********,LayoutLeft,Threads,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int********, LayoutLeft, LayoutRight, Threads,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int********, LayoutLeft, LayoutLeft, Threads,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int********, LayoutLeft, LayoutStride, Threads,
+                              int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int********, LayoutLeft, Threads, int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int_LayoutRight_Rank1.cpp b/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int_LayoutRight_Rank1.cpp
index ff400f883b..c99684ef90 100644
--- a/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int_LayoutRight_Rank1.cpp
+++ b/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int_LayoutRight_Rank1.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,18 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*,LayoutRight,LayoutRight, Threads,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*,LayoutRight,LayoutLeft,  Threads,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*,LayoutRight,LayoutStride,Threads,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int*,LayoutRight,Threads,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*, LayoutRight, LayoutRight, Threads, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*, LayoutRight, LayoutLeft, Threads, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*, LayoutRight, LayoutStride, Threads, int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int*, LayoutRight, Threads, int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int_LayoutRight_Rank2.cpp b/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int_LayoutRight_Rank2.cpp
index 686cffe802..c0c1bb9c81 100644
--- a/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int_LayoutRight_Rank2.cpp
+++ b/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int_LayoutRight_Rank2.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,19 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int**,LayoutRight,LayoutRight, Threads,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int**,LayoutRight,LayoutLeft,  Threads,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int**,LayoutRight,LayoutStride,Threads,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int**,LayoutRight,Threads,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int**, LayoutRight, LayoutRight, Threads, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int**, LayoutRight, LayoutLeft, Threads, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int**, LayoutRight, LayoutStride, Threads,
+                              int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int**, LayoutRight, Threads, int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int_LayoutRight_Rank3.cpp b/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int_LayoutRight_Rank3.cpp
index b352f9f52b..cfef96b18a 100644
--- a/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int_LayoutRight_Rank3.cpp
+++ b/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int_LayoutRight_Rank3.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,20 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int***,LayoutRight,LayoutRight, Threads,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int***,LayoutRight,LayoutLeft,  Threads,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int***,LayoutRight,LayoutStride,Threads,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int***,LayoutRight,Threads,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int***, LayoutRight, LayoutRight, Threads,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int***, LayoutRight, LayoutLeft, Threads, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int***, LayoutRight, LayoutStride, Threads,
+                              int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int***, LayoutRight, Threads, int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int_LayoutRight_Rank4.cpp b/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int_LayoutRight_Rank4.cpp
index ea0da13ec7..c16e189352 100644
--- a/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int_LayoutRight_Rank4.cpp
+++ b/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int_LayoutRight_Rank4.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int****,LayoutRight,LayoutRight, Threads,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int****,LayoutRight,LayoutLeft,  Threads,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int****,LayoutRight,LayoutStride,Threads,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int****,LayoutRight,Threads,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int****, LayoutRight, LayoutRight, Threads,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int****, LayoutRight, LayoutLeft, Threads,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int****, LayoutRight, LayoutStride, Threads,
+                              int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int****, LayoutRight, Threads, int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int_LayoutRight_Rank5.cpp b/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int_LayoutRight_Rank5.cpp
index 5420b76cd9..3b404d2411 100644
--- a/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int_LayoutRight_Rank5.cpp
+++ b/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int_LayoutRight_Rank5.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*****,LayoutRight,LayoutRight, Threads,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*****,LayoutRight,LayoutLeft,  Threads,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*****,LayoutRight,LayoutStride,Threads,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int*****,LayoutRight,Threads,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*****, LayoutRight, LayoutRight, Threads,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*****, LayoutRight, LayoutLeft, Threads,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*****, LayoutRight, LayoutStride, Threads,
+                              int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int*****, LayoutRight, Threads, int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int_LayoutRight_Rank8.cpp b/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int_LayoutRight_Rank8.cpp
index 04dc1694c9..21148463c7 100644
--- a/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int_LayoutRight_Rank8.cpp
+++ b/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int_LayoutRight_Rank8.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int********,LayoutRight,LayoutRight, Threads,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int********,LayoutRight,LayoutLeft,  Threads,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int********,LayoutRight,LayoutStride,Threads,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int********,LayoutRight,Threads,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int********, LayoutRight, LayoutRight, Threads,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int********, LayoutRight, LayoutLeft, Threads,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int********, LayoutRight, LayoutStride, Threads,
+                              int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int********, LayoutRight, Threads, int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int_LayoutStride_Rank1.cpp b/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int_LayoutStride_Rank1.cpp
index 40abc5c94a..8d5eed4f8e 100644
--- a/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int_LayoutStride_Rank1.cpp
+++ b/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int_LayoutStride_Rank1.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,19 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*,LayoutStride,LayoutRight, Threads,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*,LayoutStride,LayoutLeft,  Threads,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*,LayoutStride,LayoutStride,Threads,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int*,LayoutStride,Threads,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*, LayoutStride, LayoutRight, Threads, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*, LayoutStride, LayoutLeft, Threads, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*, LayoutStride, LayoutStride, Threads,
+                              int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int*, LayoutStride, Threads, int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int_LayoutStride_Rank2.cpp b/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int_LayoutStride_Rank2.cpp
index 2394bae511..7a590129d5 100644
--- a/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int_LayoutStride_Rank2.cpp
+++ b/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int_LayoutStride_Rank2.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,20 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int**,LayoutStride,LayoutRight, Threads,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int**,LayoutStride,LayoutLeft,  Threads,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int**,LayoutStride,LayoutStride,Threads,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int**,LayoutStride,Threads,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int**, LayoutStride, LayoutRight, Threads,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int**, LayoutStride, LayoutLeft, Threads, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int**, LayoutStride, LayoutStride, Threads,
+                              int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int**, LayoutStride, Threads, int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int_LayoutStride_Rank3.cpp b/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int_LayoutStride_Rank3.cpp
index 6e358f8aff..7ad5bfa4dc 100644
--- a/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int_LayoutStride_Rank3.cpp
+++ b/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int_LayoutStride_Rank3.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int***,LayoutStride,LayoutRight, Threads,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int***,LayoutStride,LayoutLeft,  Threads,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int***,LayoutStride,LayoutStride,Threads,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int***,LayoutStride,Threads,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int***, LayoutStride, LayoutRight, Threads,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int***, LayoutStride, LayoutLeft, Threads,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int***, LayoutStride, LayoutStride, Threads,
+                              int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int***, LayoutStride, Threads, int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int_LayoutStride_Rank4.cpp b/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int_LayoutStride_Rank4.cpp
index 3546134132..be7a7cb21c 100644
--- a/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int_LayoutStride_Rank4.cpp
+++ b/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int_LayoutStride_Rank4.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int****,LayoutStride,LayoutRight, Threads,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int****,LayoutStride,LayoutLeft,  Threads,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int****,LayoutStride,LayoutStride,Threads,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int****,LayoutStride,Threads,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int****, LayoutStride, LayoutRight, Threads,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int****, LayoutStride, LayoutLeft, Threads,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int****, LayoutStride, LayoutStride, Threads,
+                              int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int****, LayoutStride, Threads, int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int_LayoutStride_Rank5.cpp b/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int_LayoutStride_Rank5.cpp
index 89d8b2e029..df2d4b1767 100644
--- a/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int_LayoutStride_Rank5.cpp
+++ b/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int_LayoutStride_Rank5.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*****,LayoutStride,LayoutRight, Threads,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*****,LayoutStride,LayoutLeft,  Threads,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*****,LayoutStride,LayoutStride,Threads,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int*****,LayoutStride,Threads,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*****, LayoutStride, LayoutRight, Threads,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*****, LayoutStride, LayoutLeft, Threads,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*****, LayoutStride, LayoutStride, Threads,
+                              int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int*****, LayoutStride, Threads, int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int_LayoutStride_Rank8.cpp b/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int_LayoutStride_Rank8.cpp
index d42c63b435..29b3cc8ee9 100644
--- a/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int_LayoutStride_Rank8.cpp
+++ b/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int_LayoutStride_Rank8.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int********,LayoutStride,LayoutRight, Threads,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int********,LayoutStride,LayoutLeft,  Threads,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int********,LayoutStride,LayoutStride,Threads,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int********,LayoutStride,Threads,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int********, LayoutStride, LayoutRight, Threads,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int********, LayoutStride, LayoutLeft, Threads,
+                              int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int********, LayoutStride, LayoutStride, Threads,
+                              int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int********, LayoutStride, Threads, int64_t)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_double_LayoutLeft_Rank1.cpp b/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_double_LayoutLeft_Rank1.cpp
index 05b9f222c1..1bbc8c414c 100644
--- a/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_double_LayoutLeft_Rank1.cpp
+++ b/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_double_LayoutLeft_Rank1.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,18 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*,LayoutLeft,LayoutRight, Threads,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*,LayoutLeft,LayoutLeft,  Threads,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*,LayoutLeft,LayoutStride,Threads,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(double*,LayoutLeft,Threads,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*, LayoutLeft, LayoutRight, Threads, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*, LayoutLeft, LayoutLeft, Threads, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*, LayoutLeft, LayoutStride, Threads, int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(double*, LayoutLeft, Threads, int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_double_LayoutLeft_Rank2.cpp b/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_double_LayoutLeft_Rank2.cpp
index ab7415cb66..e04cee2c2a 100644
--- a/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_double_LayoutLeft_Rank2.cpp
+++ b/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_double_LayoutLeft_Rank2.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,18 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double**,LayoutLeft,LayoutRight, Threads,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double**,LayoutLeft,LayoutLeft,  Threads,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double**,LayoutLeft,LayoutStride,Threads,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(double**,LayoutLeft,Threads,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double**, LayoutLeft, LayoutRight, Threads, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double**, LayoutLeft, LayoutLeft, Threads, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double**, LayoutLeft, LayoutStride, Threads, int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(double**, LayoutLeft, Threads, int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_double_LayoutLeft_Rank3.cpp b/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_double_LayoutLeft_Rank3.cpp
index c95759513c..0849086c3a 100644
--- a/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_double_LayoutLeft_Rank3.cpp
+++ b/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_double_LayoutLeft_Rank3.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,18 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double***,LayoutLeft,LayoutRight, Threads,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double***,LayoutLeft,LayoutLeft,  Threads,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double***,LayoutLeft,LayoutStride,Threads,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(double***,LayoutLeft,Threads,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double***, LayoutLeft, LayoutRight, Threads, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double***, LayoutLeft, LayoutLeft, Threads, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double***, LayoutLeft, LayoutStride, Threads, int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(double***, LayoutLeft, Threads, int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_double_LayoutLeft_Rank4.cpp b/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_double_LayoutLeft_Rank4.cpp
index 63c8ce6075..6b50b7ca7d 100644
--- a/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_double_LayoutLeft_Rank4.cpp
+++ b/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_double_LayoutLeft_Rank4.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,19 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double****,LayoutLeft,LayoutRight, Threads,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double****,LayoutLeft,LayoutLeft,  Threads,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double****,LayoutLeft,LayoutStride,Threads,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(double****,LayoutLeft,Threads,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double****, LayoutLeft, LayoutRight, Threads, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double****, LayoutLeft, LayoutLeft, Threads, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double****, LayoutLeft, LayoutStride, Threads,
+                              int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(double****, LayoutLeft, Threads, int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_double_LayoutLeft_Rank5.cpp b/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_double_LayoutLeft_Rank5.cpp
index 95baeff94f..a3592cabac 100644
--- a/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_double_LayoutLeft_Rank5.cpp
+++ b/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_double_LayoutLeft_Rank5.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,20 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*****,LayoutLeft,LayoutRight, Threads,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*****,LayoutLeft,LayoutLeft,  Threads,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*****,LayoutLeft,LayoutStride,Threads,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(double*****,LayoutLeft,Threads,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*****, LayoutLeft, LayoutRight, Threads,
+                              int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*****, LayoutLeft, LayoutLeft, Threads, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*****, LayoutLeft, LayoutStride, Threads,
+                              int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(double*****, LayoutLeft, Threads, int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_double_LayoutLeft_Rank8.cpp b/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_double_LayoutLeft_Rank8.cpp
index 741244a4dc..ce16f2a705 100644
--- a/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_double_LayoutLeft_Rank8.cpp
+++ b/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_double_LayoutLeft_Rank8.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double********,LayoutLeft,LayoutRight, Threads,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double********,LayoutLeft,LayoutLeft,  Threads,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double********,LayoutLeft,LayoutStride,Threads,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(double********,LayoutLeft,Threads,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double********, LayoutLeft, LayoutRight, Threads,
+                              int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double********, LayoutLeft, LayoutLeft, Threads,
+                              int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double********, LayoutLeft, LayoutStride, Threads,
+                              int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(double********, LayoutLeft, Threads, int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_double_LayoutRight_Rank1.cpp b/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_double_LayoutRight_Rank1.cpp
index fb2cc8bfb3..29c6670a87 100644
--- a/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_double_LayoutRight_Rank1.cpp
+++ b/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_double_LayoutRight_Rank1.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,18 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*,LayoutRight,LayoutRight, Threads,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*,LayoutRight,LayoutLeft,  Threads,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*,LayoutRight,LayoutStride,Threads,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(double*,LayoutRight,Threads,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*, LayoutRight, LayoutRight, Threads, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*, LayoutRight, LayoutLeft, Threads, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*, LayoutRight, LayoutStride, Threads, int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(double*, LayoutRight, Threads, int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_double_LayoutRight_Rank2.cpp b/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_double_LayoutRight_Rank2.cpp
index 87e494b678..aa343fcb8d 100644
--- a/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_double_LayoutRight_Rank2.cpp
+++ b/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_double_LayoutRight_Rank2.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,18 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double**,LayoutRight,LayoutRight, Threads,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double**,LayoutRight,LayoutLeft,  Threads,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double**,LayoutRight,LayoutStride,Threads,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(double**,LayoutRight,Threads,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double**, LayoutRight, LayoutRight, Threads, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double**, LayoutRight, LayoutLeft, Threads, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double**, LayoutRight, LayoutStride, Threads, int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(double**, LayoutRight, Threads, int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_double_LayoutRight_Rank3.cpp b/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_double_LayoutRight_Rank3.cpp
index 5e8c405f46..1043a55fd6 100644
--- a/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_double_LayoutRight_Rank3.cpp
+++ b/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_double_LayoutRight_Rank3.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,19 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double***,LayoutRight,LayoutRight, Threads,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double***,LayoutRight,LayoutLeft,  Threads,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double***,LayoutRight,LayoutStride,Threads,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(double***,LayoutRight,Threads,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double***, LayoutRight, LayoutRight, Threads, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double***, LayoutRight, LayoutLeft, Threads, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double***, LayoutRight, LayoutStride, Threads,
+                              int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(double***, LayoutRight, Threads, int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_double_LayoutRight_Rank4.cpp b/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_double_LayoutRight_Rank4.cpp
index 48fb2ac5d0..9f2d095653 100644
--- a/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_double_LayoutRight_Rank4.cpp
+++ b/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_double_LayoutRight_Rank4.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,20 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double****,LayoutRight,LayoutRight, Threads,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double****,LayoutRight,LayoutLeft,  Threads,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double****,LayoutRight,LayoutStride,Threads,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(double****,LayoutRight,Threads,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double****, LayoutRight, LayoutRight, Threads,
+                              int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double****, LayoutRight, LayoutLeft, Threads, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double****, LayoutRight, LayoutStride, Threads,
+                              int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(double****, LayoutRight, Threads, int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_double_LayoutRight_Rank5.cpp b/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_double_LayoutRight_Rank5.cpp
index 3c19840875..02b4d10874 100644
--- a/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_double_LayoutRight_Rank5.cpp
+++ b/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_double_LayoutRight_Rank5.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*****,LayoutRight,LayoutRight, Threads,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*****,LayoutRight,LayoutLeft,  Threads,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*****,LayoutRight,LayoutStride,Threads,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(double*****,LayoutRight,Threads,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*****, LayoutRight, LayoutRight, Threads,
+                              int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*****, LayoutRight, LayoutLeft, Threads,
+                              int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*****, LayoutRight, LayoutStride, Threads,
+                              int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(double*****, LayoutRight, Threads, int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_double_LayoutRight_Rank8.cpp b/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_double_LayoutRight_Rank8.cpp
index 08d49b4dc0..c83fe0bfb9 100644
--- a/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_double_LayoutRight_Rank8.cpp
+++ b/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_double_LayoutRight_Rank8.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double********,LayoutRight,LayoutRight, Threads,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double********,LayoutRight,LayoutLeft,  Threads,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double********,LayoutRight,LayoutStride,Threads,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(double********,LayoutRight,Threads,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double********, LayoutRight, LayoutRight, Threads,
+                              int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double********, LayoutRight, LayoutLeft, Threads,
+                              int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double********, LayoutRight, LayoutStride,
+                              Threads, int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(double********, LayoutRight, Threads, int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_double_LayoutStride_Rank1.cpp b/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_double_LayoutStride_Rank1.cpp
index 27fca5f6ea..d97cb633f9 100644
--- a/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_double_LayoutStride_Rank1.cpp
+++ b/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_double_LayoutStride_Rank1.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,18 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*,LayoutStride,LayoutRight, Threads,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*,LayoutStride,LayoutLeft,  Threads,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*,LayoutStride,LayoutStride,Threads,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(double*,LayoutStride,Threads,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*, LayoutStride, LayoutRight, Threads, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*, LayoutStride, LayoutLeft, Threads, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*, LayoutStride, LayoutStride, Threads, int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(double*, LayoutStride, Threads, int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_double_LayoutStride_Rank2.cpp b/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_double_LayoutStride_Rank2.cpp
index 6a00983582..988dd30917 100644
--- a/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_double_LayoutStride_Rank2.cpp
+++ b/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_double_LayoutStride_Rank2.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,19 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double**,LayoutStride,LayoutRight, Threads,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double**,LayoutStride,LayoutLeft,  Threads,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double**,LayoutStride,LayoutStride,Threads,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(double**,LayoutStride,Threads,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double**, LayoutStride, LayoutRight, Threads, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double**, LayoutStride, LayoutLeft, Threads, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double**, LayoutStride, LayoutStride, Threads,
+                              int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(double**, LayoutStride, Threads, int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_double_LayoutStride_Rank3.cpp b/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_double_LayoutStride_Rank3.cpp
index 8a892efd74..b537f31ec2 100644
--- a/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_double_LayoutStride_Rank3.cpp
+++ b/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_double_LayoutStride_Rank3.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,20 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double***,LayoutStride,LayoutRight, Threads,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double***,LayoutStride,LayoutLeft,  Threads,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double***,LayoutStride,LayoutStride,Threads,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(double***,LayoutStride,Threads,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double***, LayoutStride, LayoutRight, Threads,
+                              int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double***, LayoutStride, LayoutLeft, Threads, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double***, LayoutStride, LayoutStride, Threads,
+                              int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(double***, LayoutStride, Threads, int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_double_LayoutStride_Rank4.cpp b/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_double_LayoutStride_Rank4.cpp
index 0c8f2be52b..4163489a31 100644
--- a/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_double_LayoutStride_Rank4.cpp
+++ b/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_double_LayoutStride_Rank4.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double****,LayoutStride,LayoutRight, Threads,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double****,LayoutStride,LayoutLeft,  Threads,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double****,LayoutStride,LayoutStride,Threads,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(double****,LayoutStride,Threads,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double****, LayoutStride, LayoutRight, Threads,
+                              int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double****, LayoutStride, LayoutLeft, Threads,
+                              int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double****, LayoutStride, LayoutStride, Threads,
+                              int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(double****, LayoutStride, Threads, int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_double_LayoutStride_Rank5.cpp b/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_double_LayoutStride_Rank5.cpp
index ba31d97864..e954a0b037 100644
--- a/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_double_LayoutStride_Rank5.cpp
+++ b/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_double_LayoutStride_Rank5.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*****,LayoutStride,LayoutRight, Threads,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*****,LayoutStride,LayoutLeft,  Threads,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*****,LayoutStride,LayoutStride,Threads,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(double*****,LayoutStride,Threads,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*****, LayoutStride, LayoutRight, Threads,
+                              int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*****, LayoutStride, LayoutLeft, Threads,
+                              int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double*****, LayoutStride, LayoutStride, Threads,
+                              int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(double*****, LayoutStride, Threads, int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_double_LayoutStride_Rank8.cpp b/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_double_LayoutStride_Rank8.cpp
index 3477c02d67..7f56eb8d21 100644
--- a/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_double_LayoutStride_Rank8.cpp
+++ b/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_double_LayoutStride_Rank8.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double********,LayoutStride,LayoutRight, Threads,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double********,LayoutStride,LayoutLeft,  Threads,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(double********,LayoutStride,LayoutStride,Threads,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(double********,LayoutStride,Threads,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double********, LayoutStride, LayoutRight,
+                              Threads, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double********, LayoutStride, LayoutLeft, Threads,
+                              int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(double********, LayoutStride, LayoutStride,
+                              Threads, int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(double********, LayoutStride, Threads, int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_float_LayoutLeft_Rank1.cpp b/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_float_LayoutLeft_Rank1.cpp
index 947e6a1748..be9a665fb9 100644
--- a/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_float_LayoutLeft_Rank1.cpp
+++ b/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_float_LayoutLeft_Rank1.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,18 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*,LayoutLeft,LayoutRight, Threads,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*,LayoutLeft,LayoutLeft,  Threads,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*,LayoutLeft,LayoutStride,Threads,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(float*,LayoutLeft,Threads,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*, LayoutLeft, LayoutRight, Threads, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*, LayoutLeft, LayoutLeft, Threads, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*, LayoutLeft, LayoutStride, Threads, int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(float*, LayoutLeft, Threads, int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_float_LayoutLeft_Rank2.cpp b/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_float_LayoutLeft_Rank2.cpp
index f27415d3bb..c82e8d12a2 100644
--- a/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_float_LayoutLeft_Rank2.cpp
+++ b/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_float_LayoutLeft_Rank2.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,18 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float**,LayoutLeft,LayoutRight, Threads,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float**,LayoutLeft,LayoutLeft,  Threads,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float**,LayoutLeft,LayoutStride,Threads,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(float**,LayoutLeft,Threads,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float**, LayoutLeft, LayoutRight, Threads, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float**, LayoutLeft, LayoutLeft, Threads, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float**, LayoutLeft, LayoutStride, Threads, int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(float**, LayoutLeft, Threads, int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_float_LayoutLeft_Rank3.cpp b/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_float_LayoutLeft_Rank3.cpp
index eafc108eb3..0789ace2e2 100644
--- a/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_float_LayoutLeft_Rank3.cpp
+++ b/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_float_LayoutLeft_Rank3.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,18 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float***,LayoutLeft,LayoutRight, Threads,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float***,LayoutLeft,LayoutLeft,  Threads,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float***,LayoutLeft,LayoutStride,Threads,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(float***,LayoutLeft,Threads,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float***, LayoutLeft, LayoutRight, Threads, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float***, LayoutLeft, LayoutLeft, Threads, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float***, LayoutLeft, LayoutStride, Threads, int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(float***, LayoutLeft, Threads, int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_float_LayoutLeft_Rank4.cpp b/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_float_LayoutLeft_Rank4.cpp
index 8b16ebaaa7..1b9f8a6159 100644
--- a/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_float_LayoutLeft_Rank4.cpp
+++ b/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_float_LayoutLeft_Rank4.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,18 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float****,LayoutLeft,LayoutRight, Threads,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float****,LayoutLeft,LayoutLeft,  Threads,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float****,LayoutLeft,LayoutStride,Threads,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(float****,LayoutLeft,Threads,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float****, LayoutLeft, LayoutRight, Threads, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float****, LayoutLeft, LayoutLeft, Threads, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float****, LayoutLeft, LayoutStride, Threads, int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(float****, LayoutLeft, Threads, int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_float_LayoutLeft_Rank5.cpp b/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_float_LayoutLeft_Rank5.cpp
index c3c9c6dd20..92ae8f9a98 100644
--- a/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_float_LayoutLeft_Rank5.cpp
+++ b/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_float_LayoutLeft_Rank5.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,19 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*****,LayoutLeft,LayoutRight, Threads,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*****,LayoutLeft,LayoutLeft,  Threads,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*****,LayoutLeft,LayoutStride,Threads,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(float*****,LayoutLeft,Threads,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*****, LayoutLeft, LayoutRight, Threads, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*****, LayoutLeft, LayoutLeft, Threads, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*****, LayoutLeft, LayoutStride, Threads,
+                              int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(float*****, LayoutLeft, Threads, int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_float_LayoutLeft_Rank8.cpp b/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_float_LayoutLeft_Rank8.cpp
index e5b2f9ac9c..1cf105fe53 100644
--- a/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_float_LayoutLeft_Rank8.cpp
+++ b/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_float_LayoutLeft_Rank8.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float********,LayoutLeft,LayoutRight, Threads,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float********,LayoutLeft,LayoutLeft,  Threads,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float********,LayoutLeft,LayoutStride,Threads,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(float********,LayoutLeft,Threads,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float********, LayoutLeft, LayoutRight, Threads,
+                              int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float********, LayoutLeft, LayoutLeft, Threads,
+                              int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float********, LayoutLeft, LayoutStride, Threads,
+                              int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(float********, LayoutLeft, Threads, int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_float_LayoutRight_Rank1.cpp b/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_float_LayoutRight_Rank1.cpp
index 37fbf8c49d..24dc52eef4 100644
--- a/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_float_LayoutRight_Rank1.cpp
+++ b/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_float_LayoutRight_Rank1.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,18 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*,LayoutRight,LayoutRight, Threads,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*,LayoutRight,LayoutLeft,  Threads,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*,LayoutRight,LayoutStride,Threads,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(float*,LayoutRight,Threads,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*, LayoutRight, LayoutRight, Threads, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*, LayoutRight, LayoutLeft, Threads, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*, LayoutRight, LayoutStride, Threads, int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(float*, LayoutRight, Threads, int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_float_LayoutRight_Rank2.cpp b/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_float_LayoutRight_Rank2.cpp
index 287fa9b5b0..7e66193302 100644
--- a/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_float_LayoutRight_Rank2.cpp
+++ b/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_float_LayoutRight_Rank2.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,18 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float**,LayoutRight,LayoutRight, Threads,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float**,LayoutRight,LayoutLeft,  Threads,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float**,LayoutRight,LayoutStride,Threads,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(float**,LayoutRight,Threads,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float**, LayoutRight, LayoutRight, Threads, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float**, LayoutRight, LayoutLeft, Threads, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float**, LayoutRight, LayoutStride, Threads, int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(float**, LayoutRight, Threads, int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_float_LayoutRight_Rank3.cpp b/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_float_LayoutRight_Rank3.cpp
index 6741cd57ef..c347f77004 100644
--- a/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_float_LayoutRight_Rank3.cpp
+++ b/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_float_LayoutRight_Rank3.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,18 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float***,LayoutRight,LayoutRight, Threads,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float***,LayoutRight,LayoutLeft,  Threads,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float***,LayoutRight,LayoutStride,Threads,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(float***,LayoutRight,Threads,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float***, LayoutRight, LayoutRight, Threads, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float***, LayoutRight, LayoutLeft, Threads, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float***, LayoutRight, LayoutStride, Threads, int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(float***, LayoutRight, Threads, int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_float_LayoutRight_Rank4.cpp b/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_float_LayoutRight_Rank4.cpp
index e91e990dc3..607eeed51c 100644
--- a/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_float_LayoutRight_Rank4.cpp
+++ b/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_float_LayoutRight_Rank4.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,19 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float****,LayoutRight,LayoutRight, Threads,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float****,LayoutRight,LayoutLeft,  Threads,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float****,LayoutRight,LayoutStride,Threads,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(float****,LayoutRight,Threads,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float****, LayoutRight, LayoutRight, Threads, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float****, LayoutRight, LayoutLeft, Threads, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float****, LayoutRight, LayoutStride, Threads,
+                              int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(float****, LayoutRight, Threads, int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_float_LayoutRight_Rank5.cpp b/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_float_LayoutRight_Rank5.cpp
index d8e3c15c08..86ce1f81ad 100644
--- a/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_float_LayoutRight_Rank5.cpp
+++ b/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_float_LayoutRight_Rank5.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,20 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*****,LayoutRight,LayoutRight, Threads,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*****,LayoutRight,LayoutLeft,  Threads,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*****,LayoutRight,LayoutStride,Threads,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(float*****,LayoutRight,Threads,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*****, LayoutRight, LayoutRight, Threads,
+                              int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*****, LayoutRight, LayoutLeft, Threads, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*****, LayoutRight, LayoutStride, Threads,
+                              int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(float*****, LayoutRight, Threads, int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_float_LayoutRight_Rank8.cpp b/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_float_LayoutRight_Rank8.cpp
index 8f66eca6a7..38edea565b 100644
--- a/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_float_LayoutRight_Rank8.cpp
+++ b/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_float_LayoutRight_Rank8.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float********,LayoutRight,LayoutRight, Threads,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float********,LayoutRight,LayoutLeft,  Threads,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float********,LayoutRight,LayoutStride,Threads,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(float********,LayoutRight,Threads,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float********, LayoutRight, LayoutRight, Threads,
+                              int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float********, LayoutRight, LayoutLeft, Threads,
+                              int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float********, LayoutRight, LayoutStride, Threads,
+                              int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(float********, LayoutRight, Threads, int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_float_LayoutStride_Rank1.cpp b/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_float_LayoutStride_Rank1.cpp
index c345677a04..c11ba480b6 100644
--- a/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_float_LayoutStride_Rank1.cpp
+++ b/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_float_LayoutStride_Rank1.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,18 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*,LayoutStride,LayoutRight, Threads,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*,LayoutStride,LayoutLeft,  Threads,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*,LayoutStride,LayoutStride,Threads,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(float*,LayoutStride,Threads,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*, LayoutStride, LayoutRight, Threads, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*, LayoutStride, LayoutLeft, Threads, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*, LayoutStride, LayoutStride, Threads, int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(float*, LayoutStride, Threads, int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_float_LayoutStride_Rank2.cpp b/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_float_LayoutStride_Rank2.cpp
index 2a0dbbe639..12973de44d 100644
--- a/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_float_LayoutStride_Rank2.cpp
+++ b/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_float_LayoutStride_Rank2.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,18 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float**,LayoutStride,LayoutRight, Threads,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float**,LayoutStride,LayoutLeft,  Threads,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float**,LayoutStride,LayoutStride,Threads,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(float**,LayoutStride,Threads,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float**, LayoutStride, LayoutRight, Threads, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float**, LayoutStride, LayoutLeft, Threads, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float**, LayoutStride, LayoutStride, Threads, int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(float**, LayoutStride, Threads, int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_float_LayoutStride_Rank3.cpp b/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_float_LayoutStride_Rank3.cpp
index 67cafdc50e..57f00f62bf 100644
--- a/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_float_LayoutStride_Rank3.cpp
+++ b/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_float_LayoutStride_Rank3.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,19 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float***,LayoutStride,LayoutRight, Threads,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float***,LayoutStride,LayoutLeft,  Threads,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float***,LayoutStride,LayoutStride,Threads,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(float***,LayoutStride,Threads,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float***, LayoutStride, LayoutRight, Threads, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float***, LayoutStride, LayoutLeft, Threads, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float***, LayoutStride, LayoutStride, Threads,
+                              int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(float***, LayoutStride, Threads, int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_float_LayoutStride_Rank4.cpp b/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_float_LayoutStride_Rank4.cpp
index 7f12f7d1cc..5a73ab7e96 100644
--- a/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_float_LayoutStride_Rank4.cpp
+++ b/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_float_LayoutStride_Rank4.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,20 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float****,LayoutStride,LayoutRight, Threads,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float****,LayoutStride,LayoutLeft,  Threads,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float****,LayoutStride,LayoutStride,Threads,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(float****,LayoutStride,Threads,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float****, LayoutStride, LayoutRight, Threads,
+                              int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float****, LayoutStride, LayoutLeft, Threads, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float****, LayoutStride, LayoutStride, Threads,
+                              int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(float****, LayoutStride, Threads, int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_float_LayoutStride_Rank5.cpp b/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_float_LayoutStride_Rank5.cpp
index 1ef8215ae3..1b928f18f4 100644
--- a/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_float_LayoutStride_Rank5.cpp
+++ b/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_float_LayoutStride_Rank5.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*****,LayoutStride,LayoutRight, Threads,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*****,LayoutStride,LayoutLeft,  Threads,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*****,LayoutStride,LayoutStride,Threads,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(float*****,LayoutStride,Threads,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*****, LayoutStride, LayoutRight, Threads,
+                              int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*****, LayoutStride, LayoutLeft, Threads,
+                              int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float*****, LayoutStride, LayoutStride, Threads,
+                              int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(float*****, LayoutStride, Threads, int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_float_LayoutStride_Rank8.cpp b/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_float_LayoutStride_Rank8.cpp
index 45508096ff..c3b3949d82 100644
--- a/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_float_LayoutStride_Rank8.cpp
+++ b/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_float_LayoutStride_Rank8.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float********,LayoutStride,LayoutRight, Threads,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float********,LayoutStride,LayoutLeft,  Threads,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(float********,LayoutStride,LayoutStride,Threads,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(float********,LayoutStride,Threads,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float********, LayoutStride, LayoutRight, Threads,
+                              int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float********, LayoutStride, LayoutLeft, Threads,
+                              int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(float********, LayoutStride, LayoutStride,
+                              Threads, int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(float********, LayoutStride, Threads, int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank1.cpp b/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank1.cpp
index 46d2ab7648..c9736ad22a 100644
--- a/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank1.cpp
+++ b/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank1.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,18 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*,LayoutLeft,LayoutRight, Threads,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*,LayoutLeft,LayoutLeft,  Threads,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*,LayoutLeft,LayoutStride,Threads,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t*,LayoutLeft,Threads,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*, LayoutLeft, LayoutRight, Threads, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*, LayoutLeft, LayoutLeft, Threads, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*, LayoutLeft, LayoutStride, Threads, int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t*, LayoutLeft, Threads, int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank2.cpp b/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank2.cpp
index 2312aedb36..93d7a16c98 100644
--- a/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank2.cpp
+++ b/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank2.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,18 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t**,LayoutLeft,LayoutRight, Threads,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t**,LayoutLeft,LayoutLeft,  Threads,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t**,LayoutLeft,LayoutStride,Threads,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t**,LayoutLeft,Threads,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t**, LayoutLeft, LayoutRight, Threads, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t**, LayoutLeft, LayoutLeft, Threads, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t**, LayoutLeft, LayoutStride, Threads, int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t**, LayoutLeft, Threads, int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank3.cpp b/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank3.cpp
index 41efbde987..ad9546fa67 100644
--- a/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank3.cpp
+++ b/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank3.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,19 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t***,LayoutLeft,LayoutRight, Threads,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t***,LayoutLeft,LayoutLeft,  Threads,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t***,LayoutLeft,LayoutStride,Threads,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t***,LayoutLeft,Threads,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t***, LayoutLeft, LayoutRight, Threads, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t***, LayoutLeft, LayoutLeft, Threads, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t***, LayoutLeft, LayoutStride, Threads,
+                              int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t***, LayoutLeft, Threads, int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank4.cpp b/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank4.cpp
index 905c50ed1c..a62946d97a 100644
--- a/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank4.cpp
+++ b/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank4.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,20 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t****,LayoutLeft,LayoutRight, Threads,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t****,LayoutLeft,LayoutLeft,  Threads,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t****,LayoutLeft,LayoutStride,Threads,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t****,LayoutLeft,Threads,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t****, LayoutLeft, LayoutRight, Threads,
+                              int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t****, LayoutLeft, LayoutLeft, Threads, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t****, LayoutLeft, LayoutStride, Threads,
+                              int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t****, LayoutLeft, Threads, int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank5.cpp b/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank5.cpp
index a4a1f1498c..20826a0378 100644
--- a/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank5.cpp
+++ b/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank5.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*****,LayoutLeft,LayoutRight, Threads,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*****,LayoutLeft,LayoutLeft,  Threads,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*****,LayoutLeft,LayoutStride,Threads,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t*****,LayoutLeft,Threads,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*****, LayoutLeft, LayoutRight, Threads,
+                              int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*****, LayoutLeft, LayoutLeft, Threads,
+                              int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*****, LayoutLeft, LayoutStride, Threads,
+                              int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t*****, LayoutLeft, Threads, int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank8.cpp b/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank8.cpp
index fe0851893a..9d629f9ff6 100644
--- a/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank8.cpp
+++ b/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank8.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t********,LayoutLeft,LayoutRight, Threads,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t********,LayoutLeft,LayoutLeft,  Threads,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t********,LayoutLeft,LayoutStride,Threads,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t********,LayoutLeft,Threads,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t********, LayoutLeft, LayoutRight, Threads,
+                              int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t********, LayoutLeft, LayoutLeft, Threads,
+                              int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t********, LayoutLeft, LayoutStride,
+                              Threads, int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t********, LayoutLeft, Threads, int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int64_t_LayoutRight_Rank1.cpp b/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int64_t_LayoutRight_Rank1.cpp
index 98ac566612..39a7dbef81 100644
--- a/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int64_t_LayoutRight_Rank1.cpp
+++ b/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int64_t_LayoutRight_Rank1.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,18 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*,LayoutRight,LayoutRight, Threads,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*,LayoutRight,LayoutLeft,  Threads,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*,LayoutRight,LayoutStride,Threads,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t*,LayoutRight,Threads,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*, LayoutRight, LayoutRight, Threads, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*, LayoutRight, LayoutLeft, Threads, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*, LayoutRight, LayoutStride, Threads, int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t*, LayoutRight, Threads, int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int64_t_LayoutRight_Rank2.cpp b/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int64_t_LayoutRight_Rank2.cpp
index 1a105251c3..33bb9f577c 100644
--- a/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int64_t_LayoutRight_Rank2.cpp
+++ b/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int64_t_LayoutRight_Rank2.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,19 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t**,LayoutRight,LayoutRight, Threads,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t**,LayoutRight,LayoutLeft,  Threads,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t**,LayoutRight,LayoutStride,Threads,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t**,LayoutRight,Threads,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t**, LayoutRight, LayoutRight, Threads, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t**, LayoutRight, LayoutLeft, Threads, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t**, LayoutRight, LayoutStride, Threads,
+                              int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t**, LayoutRight, Threads, int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int64_t_LayoutRight_Rank3.cpp b/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int64_t_LayoutRight_Rank3.cpp
index 6d10eba0a9..1d052babb4 100644
--- a/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int64_t_LayoutRight_Rank3.cpp
+++ b/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int64_t_LayoutRight_Rank3.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,20 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t***,LayoutRight,LayoutRight, Threads,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t***,LayoutRight,LayoutLeft,  Threads,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t***,LayoutRight,LayoutStride,Threads,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t***,LayoutRight,Threads,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t***, LayoutRight, LayoutRight, Threads,
+                              int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t***, LayoutRight, LayoutLeft, Threads, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t***, LayoutRight, LayoutStride, Threads,
+                              int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t***, LayoutRight, Threads, int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int64_t_LayoutRight_Rank4.cpp b/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int64_t_LayoutRight_Rank4.cpp
index 89fa00d436..6533f33f56 100644
--- a/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int64_t_LayoutRight_Rank4.cpp
+++ b/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int64_t_LayoutRight_Rank4.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t****,LayoutRight,LayoutRight, Threads,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t****,LayoutRight,LayoutLeft,  Threads,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t****,LayoutRight,LayoutStride,Threads,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t****,LayoutRight,Threads,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t****, LayoutRight, LayoutRight, Threads,
+                              int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t****, LayoutRight, LayoutLeft, Threads,
+                              int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t****, LayoutRight, LayoutStride, Threads,
+                              int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t****, LayoutRight, Threads, int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int64_t_LayoutRight_Rank5.cpp b/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int64_t_LayoutRight_Rank5.cpp
index 048d0da381..a8b7a9615c 100644
--- a/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int64_t_LayoutRight_Rank5.cpp
+++ b/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int64_t_LayoutRight_Rank5.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*****,LayoutRight,LayoutRight, Threads,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*****,LayoutRight,LayoutLeft,  Threads,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*****,LayoutRight,LayoutStride,Threads,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t*****,LayoutRight,Threads,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*****, LayoutRight, LayoutRight, Threads,
+                              int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*****, LayoutRight, LayoutLeft, Threads,
+                              int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*****, LayoutRight, LayoutStride, Threads,
+                              int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t*****, LayoutRight, Threads, int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int64_t_LayoutRight_Rank8.cpp b/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int64_t_LayoutRight_Rank8.cpp
index bb1f381b08..33517ed85c 100644
--- a/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int64_t_LayoutRight_Rank8.cpp
+++ b/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int64_t_LayoutRight_Rank8.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t********,LayoutRight,LayoutRight, Threads,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t********,LayoutRight,LayoutLeft,  Threads,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t********,LayoutRight,LayoutStride,Threads,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t********,LayoutRight,Threads,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t********, LayoutRight, LayoutRight,
+                              Threads, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t********, LayoutRight, LayoutLeft, Threads,
+                              int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t********, LayoutRight, LayoutStride,
+                              Threads, int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t********, LayoutRight, Threads, int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int64_t_LayoutStride_Rank1.cpp b/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int64_t_LayoutStride_Rank1.cpp
index ce59eef8e2..2bd62e5607 100644
--- a/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int64_t_LayoutStride_Rank1.cpp
+++ b/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int64_t_LayoutStride_Rank1.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,19 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*,LayoutStride,LayoutRight, Threads,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*,LayoutStride,LayoutLeft,  Threads,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*,LayoutStride,LayoutStride,Threads,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t*,LayoutStride,Threads,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*, LayoutStride, LayoutRight, Threads, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*, LayoutStride, LayoutLeft, Threads, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*, LayoutStride, LayoutStride, Threads,
+                              int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t*, LayoutStride, Threads, int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int64_t_LayoutStride_Rank2.cpp b/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int64_t_LayoutStride_Rank2.cpp
index ad0179a0e1..fd1bb8862f 100644
--- a/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int64_t_LayoutStride_Rank2.cpp
+++ b/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int64_t_LayoutStride_Rank2.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,20 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t**,LayoutStride,LayoutRight, Threads,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t**,LayoutStride,LayoutLeft,  Threads,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t**,LayoutStride,LayoutStride,Threads,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t**,LayoutStride,Threads,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t**, LayoutStride, LayoutRight, Threads,
+                              int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t**, LayoutStride, LayoutLeft, Threads, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t**, LayoutStride, LayoutStride, Threads,
+                              int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t**, LayoutStride, Threads, int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int64_t_LayoutStride_Rank3.cpp b/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int64_t_LayoutStride_Rank3.cpp
index 6980bc56eb..33a23913e6 100644
--- a/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int64_t_LayoutStride_Rank3.cpp
+++ b/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int64_t_LayoutStride_Rank3.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t***,LayoutStride,LayoutRight, Threads,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t***,LayoutStride,LayoutLeft,  Threads,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t***,LayoutStride,LayoutStride,Threads,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t***,LayoutStride,Threads,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t***, LayoutStride, LayoutRight, Threads,
+                              int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t***, LayoutStride, LayoutLeft, Threads,
+                              int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t***, LayoutStride, LayoutStride, Threads,
+                              int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t***, LayoutStride, Threads, int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int64_t_LayoutStride_Rank4.cpp b/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int64_t_LayoutStride_Rank4.cpp
index 44b6c378a9..1bcab4c130 100644
--- a/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int64_t_LayoutStride_Rank4.cpp
+++ b/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int64_t_LayoutStride_Rank4.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t****,LayoutStride,LayoutRight, Threads,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t****,LayoutStride,LayoutLeft,  Threads,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t****,LayoutStride,LayoutStride,Threads,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t****,LayoutStride,Threads,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t****, LayoutStride, LayoutRight, Threads,
+                              int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t****, LayoutStride, LayoutLeft, Threads,
+                              int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t****, LayoutStride, LayoutStride, Threads,
+                              int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t****, LayoutStride, Threads, int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int64_t_LayoutStride_Rank5.cpp b/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int64_t_LayoutStride_Rank5.cpp
index 0f4c948dd8..0a8d0676d4 100644
--- a/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int64_t_LayoutStride_Rank5.cpp
+++ b/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int64_t_LayoutStride_Rank5.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*****,LayoutStride,LayoutRight, Threads,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*****,LayoutStride,LayoutLeft,  Threads,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*****,LayoutStride,LayoutStride,Threads,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t*****,LayoutStride,Threads,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*****, LayoutStride, LayoutRight, Threads,
+                              int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*****, LayoutStride, LayoutLeft, Threads,
+                              int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t*****, LayoutStride, LayoutStride, Threads,
+                              int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t*****, LayoutStride, Threads, int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int64_t_LayoutStride_Rank8.cpp b/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int64_t_LayoutStride_Rank8.cpp
index 2686b35add..47ccf94a8a 100644
--- a/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int64_t_LayoutStride_Rank8.cpp
+++ b/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int64_t_LayoutStride_Rank8.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t********,LayoutStride,LayoutRight, Threads,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t********,LayoutStride,LayoutLeft,  Threads,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t********,LayoutStride,LayoutStride,Threads,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t********,LayoutStride,Threads,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t********, LayoutStride, LayoutRight,
+                              Threads, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t********, LayoutStride, LayoutLeft,
+                              Threads, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int64_t********, LayoutStride, LayoutStride,
+                              Threads, int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int64_t********, LayoutStride, Threads, int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int_LayoutLeft_Rank1.cpp b/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int_LayoutLeft_Rank1.cpp
index c65e732fc3..acc4187d91 100644
--- a/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int_LayoutLeft_Rank1.cpp
+++ b/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int_LayoutLeft_Rank1.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,18 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*,LayoutLeft,LayoutRight, Threads,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*,LayoutLeft,LayoutLeft,  Threads,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*,LayoutLeft,LayoutStride,Threads,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int*,LayoutLeft,Threads,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*, LayoutLeft, LayoutRight, Threads, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*, LayoutLeft, LayoutLeft, Threads, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*, LayoutLeft, LayoutStride, Threads, int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int*, LayoutLeft, Threads, int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int_LayoutLeft_Rank2.cpp b/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int_LayoutLeft_Rank2.cpp
index d7a0dc0eed..01a0fd28e4 100644
--- a/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int_LayoutLeft_Rank2.cpp
+++ b/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int_LayoutLeft_Rank2.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,18 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int**,LayoutLeft,LayoutRight, Threads,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int**,LayoutLeft,LayoutLeft,  Threads,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int**,LayoutLeft,LayoutStride,Threads,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int**,LayoutLeft,Threads,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int**, LayoutLeft, LayoutRight, Threads, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int**, LayoutLeft, LayoutLeft, Threads, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int**, LayoutLeft, LayoutStride, Threads, int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int**, LayoutLeft, Threads, int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int_LayoutLeft_Rank3.cpp b/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int_LayoutLeft_Rank3.cpp
index 1266e8e020..b31813ca3d 100644
--- a/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int_LayoutLeft_Rank3.cpp
+++ b/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int_LayoutLeft_Rank3.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,18 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int***,LayoutLeft,LayoutRight, Threads,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int***,LayoutLeft,LayoutLeft,  Threads,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int***,LayoutLeft,LayoutStride,Threads,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int***,LayoutLeft,Threads,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int***, LayoutLeft, LayoutRight, Threads, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int***, LayoutLeft, LayoutLeft, Threads, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int***, LayoutLeft, LayoutStride, Threads, int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int***, LayoutLeft, Threads, int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int_LayoutLeft_Rank4.cpp b/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int_LayoutLeft_Rank4.cpp
index 383ad88cff..bf52b9f938 100644
--- a/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int_LayoutLeft_Rank4.cpp
+++ b/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int_LayoutLeft_Rank4.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,18 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int****,LayoutLeft,LayoutRight, Threads,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int****,LayoutLeft,LayoutLeft,  Threads,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int****,LayoutLeft,LayoutStride,Threads,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int****,LayoutLeft,Threads,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int****, LayoutLeft, LayoutRight, Threads, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int****, LayoutLeft, LayoutLeft, Threads, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int****, LayoutLeft, LayoutStride, Threads, int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int****, LayoutLeft, Threads, int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int_LayoutLeft_Rank5.cpp b/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int_LayoutLeft_Rank5.cpp
index 48c2223334..61e5dc06a6 100644
--- a/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int_LayoutLeft_Rank5.cpp
+++ b/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int_LayoutLeft_Rank5.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,18 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*****,LayoutLeft,LayoutRight, Threads,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*****,LayoutLeft,LayoutLeft,  Threads,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*****,LayoutLeft,LayoutStride,Threads,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int*****,LayoutLeft,Threads,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*****, LayoutLeft, LayoutRight, Threads, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*****, LayoutLeft, LayoutLeft, Threads, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*****, LayoutLeft, LayoutStride, Threads, int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int*****, LayoutLeft, Threads, int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int_LayoutLeft_Rank8.cpp b/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int_LayoutLeft_Rank8.cpp
index a508aba68f..cb6906991e 100644
--- a/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int_LayoutLeft_Rank8.cpp
+++ b/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int_LayoutLeft_Rank8.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,20 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int********,LayoutLeft,LayoutRight, Threads,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int********,LayoutLeft,LayoutLeft,  Threads,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int********,LayoutLeft,LayoutStride,Threads,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int********,LayoutLeft,Threads,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int********, LayoutLeft, LayoutRight, Threads,
+                              int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int********, LayoutLeft, LayoutLeft, Threads, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int********, LayoutLeft, LayoutStride, Threads,
+                              int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int********, LayoutLeft, Threads, int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int_LayoutRight_Rank1.cpp b/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int_LayoutRight_Rank1.cpp
index 56d57e61da..b3afb8f5a4 100644
--- a/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int_LayoutRight_Rank1.cpp
+++ b/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int_LayoutRight_Rank1.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,18 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*,LayoutRight,LayoutRight, Threads,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*,LayoutRight,LayoutLeft,  Threads,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*,LayoutRight,LayoutStride,Threads,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int*,LayoutRight,Threads,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*, LayoutRight, LayoutRight, Threads, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*, LayoutRight, LayoutLeft, Threads, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*, LayoutRight, LayoutStride, Threads, int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int*, LayoutRight, Threads, int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int_LayoutRight_Rank2.cpp b/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int_LayoutRight_Rank2.cpp
index 88b5d5585c..f742ae330b 100644
--- a/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int_LayoutRight_Rank2.cpp
+++ b/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int_LayoutRight_Rank2.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,18 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int**,LayoutRight,LayoutRight, Threads,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int**,LayoutRight,LayoutLeft,  Threads,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int**,LayoutRight,LayoutStride,Threads,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int**,LayoutRight,Threads,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int**, LayoutRight, LayoutRight, Threads, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int**, LayoutRight, LayoutLeft, Threads, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int**, LayoutRight, LayoutStride, Threads, int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int**, LayoutRight, Threads, int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int_LayoutRight_Rank3.cpp b/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int_LayoutRight_Rank3.cpp
index b5c9dd119f..44b7724186 100644
--- a/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int_LayoutRight_Rank3.cpp
+++ b/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int_LayoutRight_Rank3.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,18 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int***,LayoutRight,LayoutRight, Threads,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int***,LayoutRight,LayoutLeft,  Threads,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int***,LayoutRight,LayoutStride,Threads,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int***,LayoutRight,Threads,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int***, LayoutRight, LayoutRight, Threads, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int***, LayoutRight, LayoutLeft, Threads, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int***, LayoutRight, LayoutStride, Threads, int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int***, LayoutRight, Threads, int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int_LayoutRight_Rank4.cpp b/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int_LayoutRight_Rank4.cpp
index 19c92e1c16..2a08a72d8a 100644
--- a/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int_LayoutRight_Rank4.cpp
+++ b/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int_LayoutRight_Rank4.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,18 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int****,LayoutRight,LayoutRight, Threads,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int****,LayoutRight,LayoutLeft,  Threads,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int****,LayoutRight,LayoutStride,Threads,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int****,LayoutRight,Threads,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int****, LayoutRight, LayoutRight, Threads, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int****, LayoutRight, LayoutLeft, Threads, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int****, LayoutRight, LayoutStride, Threads, int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int****, LayoutRight, Threads, int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int_LayoutRight_Rank5.cpp b/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int_LayoutRight_Rank5.cpp
index 84cc37d268..5e9bd50d16 100644
--- a/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int_LayoutRight_Rank5.cpp
+++ b/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int_LayoutRight_Rank5.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,18 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*****,LayoutRight,LayoutRight, Threads,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*****,LayoutRight,LayoutLeft,  Threads,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*****,LayoutRight,LayoutStride,Threads,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int*****,LayoutRight,Threads,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*****, LayoutRight, LayoutRight, Threads, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*****, LayoutRight, LayoutLeft, Threads, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*****, LayoutRight, LayoutStride, Threads, int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int*****, LayoutRight, Threads, int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int_LayoutRight_Rank8.cpp b/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int_LayoutRight_Rank8.cpp
index ec08b18762..9d3ebb948a 100644
--- a/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int_LayoutRight_Rank8.cpp
+++ b/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int_LayoutRight_Rank8.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int********,LayoutRight,LayoutRight, Threads,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int********,LayoutRight,LayoutLeft,  Threads,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int********,LayoutRight,LayoutStride,Threads,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int********,LayoutRight,Threads,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int********, LayoutRight, LayoutRight, Threads,
+                              int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int********, LayoutRight, LayoutLeft, Threads,
+                              int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int********, LayoutRight, LayoutStride, Threads,
+                              int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int********, LayoutRight, Threads, int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int_LayoutStride_Rank1.cpp b/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int_LayoutStride_Rank1.cpp
index cf77e86f64..f77e685c77 100644
--- a/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int_LayoutStride_Rank1.cpp
+++ b/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int_LayoutStride_Rank1.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,18 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*,LayoutStride,LayoutRight, Threads,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*,LayoutStride,LayoutLeft,  Threads,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*,LayoutStride,LayoutStride,Threads,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int*,LayoutStride,Threads,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*, LayoutStride, LayoutRight, Threads, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*, LayoutStride, LayoutLeft, Threads, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*, LayoutStride, LayoutStride, Threads, int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int*, LayoutStride, Threads, int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int_LayoutStride_Rank2.cpp b/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int_LayoutStride_Rank2.cpp
index 4fd37b5577..57ae0a1fd5 100644
--- a/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int_LayoutStride_Rank2.cpp
+++ b/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int_LayoutStride_Rank2.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,18 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int**,LayoutStride,LayoutRight, Threads,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int**,LayoutStride,LayoutLeft,  Threads,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int**,LayoutStride,LayoutStride,Threads,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int**,LayoutStride,Threads,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int**, LayoutStride, LayoutRight, Threads, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int**, LayoutStride, LayoutLeft, Threads, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int**, LayoutStride, LayoutStride, Threads, int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int**, LayoutStride, Threads, int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int_LayoutStride_Rank3.cpp b/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int_LayoutStride_Rank3.cpp
index c30658ad76..d86407b2c6 100644
--- a/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int_LayoutStride_Rank3.cpp
+++ b/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int_LayoutStride_Rank3.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,18 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int***,LayoutStride,LayoutRight, Threads,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int***,LayoutStride,LayoutLeft,  Threads,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int***,LayoutStride,LayoutStride,Threads,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int***,LayoutStride,Threads,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int***, LayoutStride, LayoutRight, Threads, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int***, LayoutStride, LayoutLeft, Threads, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int***, LayoutStride, LayoutStride, Threads, int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int***, LayoutStride, Threads, int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int_LayoutStride_Rank4.cpp b/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int_LayoutStride_Rank4.cpp
index b0b644770f..0abf26b478 100644
--- a/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int_LayoutStride_Rank4.cpp
+++ b/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int_LayoutStride_Rank4.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,18 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int****,LayoutStride,LayoutRight, Threads,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int****,LayoutStride,LayoutLeft,  Threads,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int****,LayoutStride,LayoutStride,Threads,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int****,LayoutStride,Threads,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int****, LayoutStride, LayoutRight, Threads, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int****, LayoutStride, LayoutLeft, Threads, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int****, LayoutStride, LayoutStride, Threads, int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int****, LayoutStride, Threads, int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int_LayoutStride_Rank5.cpp b/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int_LayoutStride_Rank5.cpp
index 0a16c7a128..6e8cd9f288 100644
--- a/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int_LayoutStride_Rank5.cpp
+++ b/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int_LayoutStride_Rank5.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,19 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*****,LayoutStride,LayoutRight, Threads,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*****,LayoutStride,LayoutLeft,  Threads,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*****,LayoutStride,LayoutStride,Threads,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int*****,LayoutStride,Threads,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*****, LayoutStride, LayoutRight, Threads, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*****, LayoutStride, LayoutLeft, Threads, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int*****, LayoutStride, LayoutStride, Threads,
+                              int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int*****, LayoutStride, Threads, int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int_LayoutStride_Rank8.cpp b/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int_LayoutStride_Rank8.cpp
index e4fe9e9652..ff91ded36f 100644
--- a/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int_LayoutStride_Rank8.cpp
+++ b/lib/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int_LayoutStride_Rank8.cpp
@@ -1,14 +1,15 @@
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Kokkos is licensed under 3-clause BSD terms of use:
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -37,18 +38,21 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 
 #define KOKKOS_IMPL_COMPILING_LIBRARY true
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int********,LayoutStride,LayoutRight, Threads,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int********,LayoutStride,LayoutLeft,  Threads,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_INST(int********,LayoutStride,LayoutStride,Threads,int)
-KOKKOS_IMPL_VIEWFILL_ETI_INST(int********,LayoutStride,Threads,int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int********, LayoutStride, LayoutRight, Threads,
+                              int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int********, LayoutStride, LayoutLeft, Threads,
+                              int)
+KOKKOS_IMPL_VIEWCOPY_ETI_INST(int********, LayoutStride, LayoutStride, Threads,
+                              int)
+KOKKOS_IMPL_VIEWFILL_ETI_INST(int********, LayoutStride, Threads, int)
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/eti/common/Kokkos_ViewFillCopyETIAvail_Macros.hpp b/lib/kokkos/core/src/eti/common/Kokkos_ViewFillCopyETIAvail_Macros.hpp
index 60f1968e6e..6196dbf355 100644
--- a/lib/kokkos/core/src/eti/common/Kokkos_ViewFillCopyETIAvail_Macros.hpp
+++ b/lib/kokkos/core/src/eti/common/Kokkos_ViewFillCopyETIAvail_Macros.hpp
@@ -1,576 +1,1440 @@
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int*,LayoutLeft,LayoutRight, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int*,LayoutLeft,LayoutLeft,  KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int*,LayoutLeft,LayoutStride,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWFILL_ETI_AVAIL(int*,LayoutLeft, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int**,LayoutLeft,LayoutRight, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int**,LayoutLeft,LayoutLeft,  KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int**,LayoutLeft,LayoutStride,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWFILL_ETI_AVAIL(int**,LayoutLeft, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int***,LayoutLeft,LayoutRight, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int***,LayoutLeft,LayoutLeft,  KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int***,LayoutLeft,LayoutStride,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWFILL_ETI_AVAIL(int***,LayoutLeft, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int****,LayoutLeft,LayoutRight, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int****,LayoutLeft,LayoutLeft,  KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int****,LayoutLeft,LayoutStride,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWFILL_ETI_AVAIL(int****,LayoutLeft, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int*****,LayoutLeft,LayoutRight, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int*****,LayoutLeft,LayoutLeft,  KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int*****,LayoutLeft,LayoutStride,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWFILL_ETI_AVAIL(int*****,LayoutLeft, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int********,LayoutLeft,LayoutRight, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int********,LayoutLeft,LayoutLeft,  KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int********,LayoutLeft,LayoutStride,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWFILL_ETI_AVAIL(int********,LayoutLeft, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int*,LayoutRight,LayoutRight, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int*,LayoutRight,LayoutLeft,  KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int*,LayoutRight,LayoutStride,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWFILL_ETI_AVAIL(int*,LayoutRight, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int**,LayoutRight,LayoutRight, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int**,LayoutRight,LayoutLeft,  KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int**,LayoutRight,LayoutStride,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWFILL_ETI_AVAIL(int**,LayoutRight, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int***,LayoutRight,LayoutRight, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int***,LayoutRight,LayoutLeft,  KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int***,LayoutRight,LayoutStride,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWFILL_ETI_AVAIL(int***,LayoutRight, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int****,LayoutRight,LayoutRight, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int****,LayoutRight,LayoutLeft,  KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int****,LayoutRight,LayoutStride,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWFILL_ETI_AVAIL(int****,LayoutRight, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int*****,LayoutRight,LayoutRight, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int*****,LayoutRight,LayoutLeft,  KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int*****,LayoutRight,LayoutStride,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWFILL_ETI_AVAIL(int*****,LayoutRight, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int********,LayoutRight,LayoutRight, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int********,LayoutRight,LayoutLeft,  KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int********,LayoutRight,LayoutStride,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWFILL_ETI_AVAIL(int********,LayoutRight, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int*,LayoutStride,LayoutRight, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int*,LayoutStride,LayoutLeft,  KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int*,LayoutStride,LayoutStride,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWFILL_ETI_AVAIL(int*,LayoutStride, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int**,LayoutStride,LayoutRight, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int**,LayoutStride,LayoutLeft,  KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int**,LayoutStride,LayoutStride,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWFILL_ETI_AVAIL(int**,LayoutStride, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int***,LayoutStride,LayoutRight, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int***,LayoutStride,LayoutLeft,  KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int***,LayoutStride,LayoutStride,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWFILL_ETI_AVAIL(int***,LayoutStride, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int****,LayoutStride,LayoutRight, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int****,LayoutStride,LayoutLeft,  KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int****,LayoutStride,LayoutStride,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWFILL_ETI_AVAIL(int****,LayoutStride, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int*****,LayoutStride,LayoutRight, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int*****,LayoutStride,LayoutLeft,  KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int*****,LayoutStride,LayoutStride,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWFILL_ETI_AVAIL(int*****,LayoutStride, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int********,LayoutStride,LayoutRight, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int********,LayoutStride,LayoutLeft,  KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int********,LayoutStride,LayoutStride,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWFILL_ETI_AVAIL(int********,LayoutStride, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int*,LayoutLeft,LayoutRight, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int*,LayoutLeft,LayoutLeft,  KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int*,LayoutLeft,LayoutStride,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_AVAIL(int*,LayoutLeft, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int**,LayoutLeft,LayoutRight, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int**,LayoutLeft,LayoutLeft,  KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int**,LayoutLeft,LayoutStride,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_AVAIL(int**,LayoutLeft, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int***,LayoutLeft,LayoutRight, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int***,LayoutLeft,LayoutLeft,  KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int***,LayoutLeft,LayoutStride,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_AVAIL(int***,LayoutLeft, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int****,LayoutLeft,LayoutRight, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int****,LayoutLeft,LayoutLeft,  KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int****,LayoutLeft,LayoutStride,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_AVAIL(int****,LayoutLeft, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int*****,LayoutLeft,LayoutRight, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int*****,LayoutLeft,LayoutLeft,  KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int*****,LayoutLeft,LayoutStride,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_AVAIL(int*****,LayoutLeft, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int********,LayoutLeft,LayoutRight, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int********,LayoutLeft,LayoutLeft,  KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int********,LayoutLeft,LayoutStride,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_AVAIL(int********,LayoutLeft, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int*,LayoutRight,LayoutRight, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int*,LayoutRight,LayoutLeft,  KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int*,LayoutRight,LayoutStride,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_AVAIL(int*,LayoutRight, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int**,LayoutRight,LayoutRight, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int**,LayoutRight,LayoutLeft,  KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int**,LayoutRight,LayoutStride,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_AVAIL(int**,LayoutRight, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int***,LayoutRight,LayoutRight, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int***,LayoutRight,LayoutLeft,  KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int***,LayoutRight,LayoutStride,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_AVAIL(int***,LayoutRight, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int****,LayoutRight,LayoutRight, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int****,LayoutRight,LayoutLeft,  KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int****,LayoutRight,LayoutStride,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_AVAIL(int****,LayoutRight, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int*****,LayoutRight,LayoutRight, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int*****,LayoutRight,LayoutLeft,  KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int*****,LayoutRight,LayoutStride,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_AVAIL(int*****,LayoutRight, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int********,LayoutRight,LayoutRight, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int********,LayoutRight,LayoutLeft,  KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int********,LayoutRight,LayoutStride,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_AVAIL(int********,LayoutRight, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int*,LayoutStride,LayoutRight, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int*,LayoutStride,LayoutLeft,  KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int*,LayoutStride,LayoutStride,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_AVAIL(int*,LayoutStride, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int**,LayoutStride,LayoutRight, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int**,LayoutStride,LayoutLeft,  KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int**,LayoutStride,LayoutStride,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_AVAIL(int**,LayoutStride, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int***,LayoutStride,LayoutRight, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int***,LayoutStride,LayoutLeft,  KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int***,LayoutStride,LayoutStride,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_AVAIL(int***,LayoutStride, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int****,LayoutStride,LayoutRight, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int****,LayoutStride,LayoutLeft,  KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int****,LayoutStride,LayoutStride,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_AVAIL(int****,LayoutStride, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int*****,LayoutStride,LayoutRight, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int*****,LayoutStride,LayoutLeft,  KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int*****,LayoutStride,LayoutStride,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_AVAIL(int*****,LayoutStride, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int********,LayoutStride,LayoutRight, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int********,LayoutStride,LayoutLeft,  KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int********,LayoutStride,LayoutStride,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_AVAIL(int********,LayoutStride, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int64_t*,LayoutLeft,LayoutRight, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int64_t*,LayoutLeft,LayoutLeft,  KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int64_t*,LayoutLeft,LayoutStride,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWFILL_ETI_AVAIL(int64_t*,LayoutLeft, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int64_t**,LayoutLeft,LayoutRight, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int64_t**,LayoutLeft,LayoutLeft,  KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int64_t**,LayoutLeft,LayoutStride,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWFILL_ETI_AVAIL(int64_t**,LayoutLeft, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int64_t***,LayoutLeft,LayoutRight, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int64_t***,LayoutLeft,LayoutLeft,  KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int64_t***,LayoutLeft,LayoutStride,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWFILL_ETI_AVAIL(int64_t***,LayoutLeft, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int64_t****,LayoutLeft,LayoutRight, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int64_t****,LayoutLeft,LayoutLeft,  KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int64_t****,LayoutLeft,LayoutStride,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWFILL_ETI_AVAIL(int64_t****,LayoutLeft, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int64_t*****,LayoutLeft,LayoutRight, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int64_t*****,LayoutLeft,LayoutLeft,  KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int64_t*****,LayoutLeft,LayoutStride,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWFILL_ETI_AVAIL(int64_t*****,LayoutLeft, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int64_t********,LayoutLeft,LayoutRight, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int64_t********,LayoutLeft,LayoutLeft,  KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int64_t********,LayoutLeft,LayoutStride,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWFILL_ETI_AVAIL(int64_t********,LayoutLeft, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int64_t*,LayoutRight,LayoutRight, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int64_t*,LayoutRight,LayoutLeft,  KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int64_t*,LayoutRight,LayoutStride,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWFILL_ETI_AVAIL(int64_t*,LayoutRight, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int64_t**,LayoutRight,LayoutRight, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int64_t**,LayoutRight,LayoutLeft,  KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int64_t**,LayoutRight,LayoutStride,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWFILL_ETI_AVAIL(int64_t**,LayoutRight, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int64_t***,LayoutRight,LayoutRight, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int64_t***,LayoutRight,LayoutLeft,  KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int64_t***,LayoutRight,LayoutStride,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWFILL_ETI_AVAIL(int64_t***,LayoutRight, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int64_t****,LayoutRight,LayoutRight, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int64_t****,LayoutRight,LayoutLeft,  KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int64_t****,LayoutRight,LayoutStride,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWFILL_ETI_AVAIL(int64_t****,LayoutRight, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int64_t*****,LayoutRight,LayoutRight, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int64_t*****,LayoutRight,LayoutLeft,  KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int64_t*****,LayoutRight,LayoutStride,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWFILL_ETI_AVAIL(int64_t*****,LayoutRight, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int64_t********,LayoutRight,LayoutRight, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int64_t********,LayoutRight,LayoutLeft,  KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int64_t********,LayoutRight,LayoutStride,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWFILL_ETI_AVAIL(int64_t********,LayoutRight, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int64_t*,LayoutStride,LayoutRight, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int64_t*,LayoutStride,LayoutLeft,  KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int64_t*,LayoutStride,LayoutStride,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWFILL_ETI_AVAIL(int64_t*,LayoutStride, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int64_t**,LayoutStride,LayoutRight, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int64_t**,LayoutStride,LayoutLeft,  KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int64_t**,LayoutStride,LayoutStride,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWFILL_ETI_AVAIL(int64_t**,LayoutStride, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int64_t***,LayoutStride,LayoutRight, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int64_t***,LayoutStride,LayoutLeft,  KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int64_t***,LayoutStride,LayoutStride,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWFILL_ETI_AVAIL(int64_t***,LayoutStride, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int64_t****,LayoutStride,LayoutRight, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int64_t****,LayoutStride,LayoutLeft,  KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int64_t****,LayoutStride,LayoutStride,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWFILL_ETI_AVAIL(int64_t****,LayoutStride, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int64_t*****,LayoutStride,LayoutRight, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int64_t*****,LayoutStride,LayoutLeft,  KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int64_t*****,LayoutStride,LayoutStride,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWFILL_ETI_AVAIL(int64_t*****,LayoutStride, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int64_t********,LayoutStride,LayoutRight, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int64_t********,LayoutStride,LayoutLeft,  KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int64_t********,LayoutStride,LayoutStride,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWFILL_ETI_AVAIL(int64_t********,LayoutStride, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int64_t*,LayoutLeft,LayoutRight, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int64_t*,LayoutLeft,LayoutLeft,  KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int64_t*,LayoutLeft,LayoutStride,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_AVAIL(int64_t*,LayoutLeft, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int64_t**,LayoutLeft,LayoutRight, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int64_t**,LayoutLeft,LayoutLeft,  KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int64_t**,LayoutLeft,LayoutStride,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_AVAIL(int64_t**,LayoutLeft, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int64_t***,LayoutLeft,LayoutRight, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int64_t***,LayoutLeft,LayoutLeft,  KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int64_t***,LayoutLeft,LayoutStride,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_AVAIL(int64_t***,LayoutLeft, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int64_t****,LayoutLeft,LayoutRight, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int64_t****,LayoutLeft,LayoutLeft,  KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int64_t****,LayoutLeft,LayoutStride,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_AVAIL(int64_t****,LayoutLeft, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int64_t*****,LayoutLeft,LayoutRight, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int64_t*****,LayoutLeft,LayoutLeft,  KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int64_t*****,LayoutLeft,LayoutStride,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_AVAIL(int64_t*****,LayoutLeft, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int64_t********,LayoutLeft,LayoutRight, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int64_t********,LayoutLeft,LayoutLeft,  KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int64_t********,LayoutLeft,LayoutStride,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_AVAIL(int64_t********,LayoutLeft, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int64_t*,LayoutRight,LayoutRight, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int64_t*,LayoutRight,LayoutLeft,  KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int64_t*,LayoutRight,LayoutStride,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_AVAIL(int64_t*,LayoutRight, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int64_t**,LayoutRight,LayoutRight, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int64_t**,LayoutRight,LayoutLeft,  KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int64_t**,LayoutRight,LayoutStride,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_AVAIL(int64_t**,LayoutRight, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int64_t***,LayoutRight,LayoutRight, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int64_t***,LayoutRight,LayoutLeft,  KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int64_t***,LayoutRight,LayoutStride,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_AVAIL(int64_t***,LayoutRight, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int64_t****,LayoutRight,LayoutRight, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int64_t****,LayoutRight,LayoutLeft,  KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int64_t****,LayoutRight,LayoutStride,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_AVAIL(int64_t****,LayoutRight, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int64_t*****,LayoutRight,LayoutRight, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int64_t*****,LayoutRight,LayoutLeft,  KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int64_t*****,LayoutRight,LayoutStride,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_AVAIL(int64_t*****,LayoutRight, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int64_t********,LayoutRight,LayoutRight, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int64_t********,LayoutRight,LayoutLeft,  KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int64_t********,LayoutRight,LayoutStride,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_AVAIL(int64_t********,LayoutRight, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int64_t*,LayoutStride,LayoutRight, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int64_t*,LayoutStride,LayoutLeft,  KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int64_t*,LayoutStride,LayoutStride,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_AVAIL(int64_t*,LayoutStride, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int64_t**,LayoutStride,LayoutRight, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int64_t**,LayoutStride,LayoutLeft,  KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int64_t**,LayoutStride,LayoutStride,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_AVAIL(int64_t**,LayoutStride, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int64_t***,LayoutStride,LayoutRight, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int64_t***,LayoutStride,LayoutLeft,  KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int64_t***,LayoutStride,LayoutStride,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_AVAIL(int64_t***,LayoutStride, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int64_t****,LayoutStride,LayoutRight, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int64_t****,LayoutStride,LayoutLeft,  KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int64_t****,LayoutStride,LayoutStride,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_AVAIL(int64_t****,LayoutStride, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int64_t*****,LayoutStride,LayoutRight, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int64_t*****,LayoutStride,LayoutLeft,  KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int64_t*****,LayoutStride,LayoutStride,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_AVAIL(int64_t*****,LayoutStride, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int64_t********,LayoutStride,LayoutRight, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int64_t********,LayoutStride,LayoutLeft,  KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int64_t********,LayoutStride,LayoutStride,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_AVAIL(int64_t********,LayoutStride, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(float*,LayoutLeft,LayoutRight, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(float*,LayoutLeft,LayoutLeft,  KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(float*,LayoutLeft,LayoutStride,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWFILL_ETI_AVAIL(float*,LayoutLeft, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(float**,LayoutLeft,LayoutRight, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(float**,LayoutLeft,LayoutLeft,  KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(float**,LayoutLeft,LayoutStride,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWFILL_ETI_AVAIL(float**,LayoutLeft, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(float***,LayoutLeft,LayoutRight, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(float***,LayoutLeft,LayoutLeft,  KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(float***,LayoutLeft,LayoutStride,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWFILL_ETI_AVAIL(float***,LayoutLeft, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(float****,LayoutLeft,LayoutRight, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(float****,LayoutLeft,LayoutLeft,  KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(float****,LayoutLeft,LayoutStride,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWFILL_ETI_AVAIL(float****,LayoutLeft, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(float*****,LayoutLeft,LayoutRight, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(float*****,LayoutLeft,LayoutLeft,  KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(float*****,LayoutLeft,LayoutStride,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWFILL_ETI_AVAIL(float*****,LayoutLeft, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(float********,LayoutLeft,LayoutRight, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(float********,LayoutLeft,LayoutLeft,  KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(float********,LayoutLeft,LayoutStride,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWFILL_ETI_AVAIL(float********,LayoutLeft, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(float*,LayoutRight,LayoutRight, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(float*,LayoutRight,LayoutLeft,  KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(float*,LayoutRight,LayoutStride,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWFILL_ETI_AVAIL(float*,LayoutRight, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(float**,LayoutRight,LayoutRight, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(float**,LayoutRight,LayoutLeft,  KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(float**,LayoutRight,LayoutStride,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWFILL_ETI_AVAIL(float**,LayoutRight, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(float***,LayoutRight,LayoutRight, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(float***,LayoutRight,LayoutLeft,  KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(float***,LayoutRight,LayoutStride,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWFILL_ETI_AVAIL(float***,LayoutRight, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(float****,LayoutRight,LayoutRight, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(float****,LayoutRight,LayoutLeft,  KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(float****,LayoutRight,LayoutStride,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWFILL_ETI_AVAIL(float****,LayoutRight, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(float*****,LayoutRight,LayoutRight, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(float*****,LayoutRight,LayoutLeft,  KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(float*****,LayoutRight,LayoutStride,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWFILL_ETI_AVAIL(float*****,LayoutRight, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(float********,LayoutRight,LayoutRight, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(float********,LayoutRight,LayoutLeft,  KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(float********,LayoutRight,LayoutStride,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWFILL_ETI_AVAIL(float********,LayoutRight, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(float*,LayoutStride,LayoutRight, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(float*,LayoutStride,LayoutLeft,  KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(float*,LayoutStride,LayoutStride,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWFILL_ETI_AVAIL(float*,LayoutStride, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(float**,LayoutStride,LayoutRight, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(float**,LayoutStride,LayoutLeft,  KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(float**,LayoutStride,LayoutStride,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWFILL_ETI_AVAIL(float**,LayoutStride, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(float***,LayoutStride,LayoutRight, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(float***,LayoutStride,LayoutLeft,  KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(float***,LayoutStride,LayoutStride,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWFILL_ETI_AVAIL(float***,LayoutStride, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(float****,LayoutStride,LayoutRight, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(float****,LayoutStride,LayoutLeft,  KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(float****,LayoutStride,LayoutStride,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWFILL_ETI_AVAIL(float****,LayoutStride, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(float*****,LayoutStride,LayoutRight, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(float*****,LayoutStride,LayoutLeft,  KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(float*****,LayoutStride,LayoutStride,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWFILL_ETI_AVAIL(float*****,LayoutStride, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(float********,LayoutStride,LayoutRight, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(float********,LayoutStride,LayoutLeft,  KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(float********,LayoutStride,LayoutStride,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWFILL_ETI_AVAIL(float********,LayoutStride, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(float*,LayoutLeft,LayoutRight, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(float*,LayoutLeft,LayoutLeft,  KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(float*,LayoutLeft,LayoutStride,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_AVAIL(float*,LayoutLeft, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(float**,LayoutLeft,LayoutRight, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(float**,LayoutLeft,LayoutLeft,  KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(float**,LayoutLeft,LayoutStride,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_AVAIL(float**,LayoutLeft, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(float***,LayoutLeft,LayoutRight, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(float***,LayoutLeft,LayoutLeft,  KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(float***,LayoutLeft,LayoutStride,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_AVAIL(float***,LayoutLeft, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(float****,LayoutLeft,LayoutRight, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(float****,LayoutLeft,LayoutLeft,  KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(float****,LayoutLeft,LayoutStride,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_AVAIL(float****,LayoutLeft, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(float*****,LayoutLeft,LayoutRight, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(float*****,LayoutLeft,LayoutLeft,  KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(float*****,LayoutLeft,LayoutStride,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_AVAIL(float*****,LayoutLeft, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(float********,LayoutLeft,LayoutRight, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(float********,LayoutLeft,LayoutLeft,  KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(float********,LayoutLeft,LayoutStride,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_AVAIL(float********,LayoutLeft, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(float*,LayoutRight,LayoutRight, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(float*,LayoutRight,LayoutLeft,  KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(float*,LayoutRight,LayoutStride,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_AVAIL(float*,LayoutRight, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(float**,LayoutRight,LayoutRight, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(float**,LayoutRight,LayoutLeft,  KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(float**,LayoutRight,LayoutStride,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_AVAIL(float**,LayoutRight, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(float***,LayoutRight,LayoutRight, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(float***,LayoutRight,LayoutLeft,  KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(float***,LayoutRight,LayoutStride,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_AVAIL(float***,LayoutRight, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(float****,LayoutRight,LayoutRight, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(float****,LayoutRight,LayoutLeft,  KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(float****,LayoutRight,LayoutStride,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_AVAIL(float****,LayoutRight, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(float*****,LayoutRight,LayoutRight, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(float*****,LayoutRight,LayoutLeft,  KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(float*****,LayoutRight,LayoutStride,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_AVAIL(float*****,LayoutRight, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(float********,LayoutRight,LayoutRight, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(float********,LayoutRight,LayoutLeft,  KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(float********,LayoutRight,LayoutStride,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_AVAIL(float********,LayoutRight, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(float*,LayoutStride,LayoutRight, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(float*,LayoutStride,LayoutLeft,  KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(float*,LayoutStride,LayoutStride,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_AVAIL(float*,LayoutStride, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(float**,LayoutStride,LayoutRight, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(float**,LayoutStride,LayoutLeft,  KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(float**,LayoutStride,LayoutStride,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_AVAIL(float**,LayoutStride, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(float***,LayoutStride,LayoutRight, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(float***,LayoutStride,LayoutLeft,  KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(float***,LayoutStride,LayoutStride,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_AVAIL(float***,LayoutStride, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(float****,LayoutStride,LayoutRight, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(float****,LayoutStride,LayoutLeft,  KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(float****,LayoutStride,LayoutStride,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_AVAIL(float****,LayoutStride, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(float*****,LayoutStride,LayoutRight, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(float*****,LayoutStride,LayoutLeft,  KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(float*****,LayoutStride,LayoutStride,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_AVAIL(float*****,LayoutStride, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(float********,LayoutStride,LayoutRight, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(float********,LayoutStride,LayoutLeft,  KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(float********,LayoutStride,LayoutStride,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_AVAIL(float********,LayoutStride, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(double*,LayoutLeft,LayoutRight, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(double*,LayoutLeft,LayoutLeft,  KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(double*,LayoutLeft,LayoutStride,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWFILL_ETI_AVAIL(double*,LayoutLeft, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(double**,LayoutLeft,LayoutRight, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(double**,LayoutLeft,LayoutLeft,  KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(double**,LayoutLeft,LayoutStride,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWFILL_ETI_AVAIL(double**,LayoutLeft, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(double***,LayoutLeft,LayoutRight, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(double***,LayoutLeft,LayoutLeft,  KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(double***,LayoutLeft,LayoutStride,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWFILL_ETI_AVAIL(double***,LayoutLeft, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(double****,LayoutLeft,LayoutRight, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(double****,LayoutLeft,LayoutLeft,  KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(double****,LayoutLeft,LayoutStride,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWFILL_ETI_AVAIL(double****,LayoutLeft, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(double*****,LayoutLeft,LayoutRight, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(double*****,LayoutLeft,LayoutLeft,  KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(double*****,LayoutLeft,LayoutStride,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWFILL_ETI_AVAIL(double*****,LayoutLeft, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(double********,LayoutLeft,LayoutRight, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(double********,LayoutLeft,LayoutLeft,  KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(double********,LayoutLeft,LayoutStride,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWFILL_ETI_AVAIL(double********,LayoutLeft, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(double*,LayoutRight,LayoutRight, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(double*,LayoutRight,LayoutLeft,  KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(double*,LayoutRight,LayoutStride,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWFILL_ETI_AVAIL(double*,LayoutRight, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(double**,LayoutRight,LayoutRight, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(double**,LayoutRight,LayoutLeft,  KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(double**,LayoutRight,LayoutStride,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWFILL_ETI_AVAIL(double**,LayoutRight, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(double***,LayoutRight,LayoutRight, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(double***,LayoutRight,LayoutLeft,  KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(double***,LayoutRight,LayoutStride,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWFILL_ETI_AVAIL(double***,LayoutRight, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(double****,LayoutRight,LayoutRight, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(double****,LayoutRight,LayoutLeft,  KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(double****,LayoutRight,LayoutStride,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWFILL_ETI_AVAIL(double****,LayoutRight, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(double*****,LayoutRight,LayoutRight, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(double*****,LayoutRight,LayoutLeft,  KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(double*****,LayoutRight,LayoutStride,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWFILL_ETI_AVAIL(double*****,LayoutRight, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(double********,LayoutRight,LayoutRight, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(double********,LayoutRight,LayoutLeft,  KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(double********,LayoutRight,LayoutStride,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWFILL_ETI_AVAIL(double********,LayoutRight, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(double*,LayoutStride,LayoutRight, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(double*,LayoutStride,LayoutLeft,  KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(double*,LayoutStride,LayoutStride,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWFILL_ETI_AVAIL(double*,LayoutStride, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(double**,LayoutStride,LayoutRight, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(double**,LayoutStride,LayoutLeft,  KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(double**,LayoutStride,LayoutStride,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWFILL_ETI_AVAIL(double**,LayoutStride, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(double***,LayoutStride,LayoutRight, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(double***,LayoutStride,LayoutLeft,  KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(double***,LayoutStride,LayoutStride,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWFILL_ETI_AVAIL(double***,LayoutStride, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(double****,LayoutStride,LayoutRight, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(double****,LayoutStride,LayoutLeft,  KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(double****,LayoutStride,LayoutStride,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWFILL_ETI_AVAIL(double****,LayoutStride, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(double*****,LayoutStride,LayoutRight, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(double*****,LayoutStride,LayoutLeft,  KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(double*****,LayoutStride,LayoutStride,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWFILL_ETI_AVAIL(double*****,LayoutStride, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(double********,LayoutStride,LayoutRight, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(double********,LayoutStride,LayoutLeft,  KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(double********,LayoutStride,LayoutStride,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWFILL_ETI_AVAIL(double********,LayoutStride, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(double*,LayoutLeft,LayoutRight, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(double*,LayoutLeft,LayoutLeft,  KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(double*,LayoutLeft,LayoutStride,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_AVAIL(double*,LayoutLeft, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(double**,LayoutLeft,LayoutRight, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(double**,LayoutLeft,LayoutLeft,  KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(double**,LayoutLeft,LayoutStride,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_AVAIL(double**,LayoutLeft, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(double***,LayoutLeft,LayoutRight, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(double***,LayoutLeft,LayoutLeft,  KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(double***,LayoutLeft,LayoutStride,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_AVAIL(double***,LayoutLeft, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(double****,LayoutLeft,LayoutRight, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(double****,LayoutLeft,LayoutLeft,  KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(double****,LayoutLeft,LayoutStride,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_AVAIL(double****,LayoutLeft, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(double*****,LayoutLeft,LayoutRight, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(double*****,LayoutLeft,LayoutLeft,  KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(double*****,LayoutLeft,LayoutStride,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_AVAIL(double*****,LayoutLeft, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(double********,LayoutLeft,LayoutRight, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(double********,LayoutLeft,LayoutLeft,  KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(double********,LayoutLeft,LayoutStride,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_AVAIL(double********,LayoutLeft, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(double*,LayoutRight,LayoutRight, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(double*,LayoutRight,LayoutLeft,  KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(double*,LayoutRight,LayoutStride,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_AVAIL(double*,LayoutRight, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(double**,LayoutRight,LayoutRight, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(double**,LayoutRight,LayoutLeft,  KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(double**,LayoutRight,LayoutStride,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_AVAIL(double**,LayoutRight, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(double***,LayoutRight,LayoutRight, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(double***,LayoutRight,LayoutLeft,  KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(double***,LayoutRight,LayoutStride,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_AVAIL(double***,LayoutRight, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(double****,LayoutRight,LayoutRight, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(double****,LayoutRight,LayoutLeft,  KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(double****,LayoutRight,LayoutStride,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_AVAIL(double****,LayoutRight, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(double*****,LayoutRight,LayoutRight, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(double*****,LayoutRight,LayoutLeft,  KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(double*****,LayoutRight,LayoutStride,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_AVAIL(double*****,LayoutRight, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(double********,LayoutRight,LayoutRight, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(double********,LayoutRight,LayoutLeft,  KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(double********,LayoutRight,LayoutStride,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_AVAIL(double********,LayoutRight, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(double*,LayoutStride,LayoutRight, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(double*,LayoutStride,LayoutLeft,  KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(double*,LayoutStride,LayoutStride,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_AVAIL(double*,LayoutStride, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(double**,LayoutStride,LayoutRight, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(double**,LayoutStride,LayoutLeft,  KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(double**,LayoutStride,LayoutStride,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_AVAIL(double**,LayoutStride, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(double***,LayoutStride,LayoutRight, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(double***,LayoutStride,LayoutLeft,  KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(double***,LayoutStride,LayoutStride,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_AVAIL(double***,LayoutStride, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(double****,LayoutStride,LayoutRight, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(double****,LayoutStride,LayoutLeft,  KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(double****,LayoutStride,LayoutStride,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_AVAIL(double****,LayoutStride, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(double*****,LayoutStride,LayoutRight, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(double*****,LayoutStride,LayoutLeft,  KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(double*****,LayoutStride,LayoutStride,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_AVAIL(double*****,LayoutStride, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(double********,LayoutStride,LayoutRight, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(double********,LayoutStride,LayoutLeft,  KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(double********,LayoutStride,LayoutStride,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_AVAIL(double********,LayoutStride, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int*, LayoutLeft, LayoutRight,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int*, LayoutLeft, LayoutLeft,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int*, LayoutLeft, LayoutStride,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWFILL_ETI_AVAIL(int*, LayoutLeft,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int**, LayoutLeft, LayoutRight,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int**, LayoutLeft, LayoutLeft,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int**, LayoutLeft, LayoutStride,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWFILL_ETI_AVAIL(int**, LayoutLeft,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int***, LayoutLeft, LayoutRight,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int***, LayoutLeft, LayoutLeft,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int***, LayoutLeft, LayoutStride,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWFILL_ETI_AVAIL(int***, LayoutLeft,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int****, LayoutLeft, LayoutRight,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int****, LayoutLeft, LayoutLeft,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int****, LayoutLeft, LayoutStride,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWFILL_ETI_AVAIL(int****, LayoutLeft,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int*****, LayoutLeft, LayoutRight,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int*****, LayoutLeft, LayoutLeft,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int*****, LayoutLeft, LayoutStride,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWFILL_ETI_AVAIL(int*****, LayoutLeft,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int********, LayoutLeft, LayoutRight,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int********, LayoutLeft, LayoutLeft,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int********, LayoutLeft, LayoutStride,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWFILL_ETI_AVAIL(int********, LayoutLeft,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int*, LayoutRight, LayoutRight,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int*, LayoutRight, LayoutLeft,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int*, LayoutRight, LayoutStride,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWFILL_ETI_AVAIL(int*, LayoutRight,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int**, LayoutRight, LayoutRight,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int**, LayoutRight, LayoutLeft,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int**, LayoutRight, LayoutStride,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWFILL_ETI_AVAIL(int**, LayoutRight,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int***, LayoutRight, LayoutRight,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int***, LayoutRight, LayoutLeft,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int***, LayoutRight, LayoutStride,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWFILL_ETI_AVAIL(int***, LayoutRight,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int****, LayoutRight, LayoutRight,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int****, LayoutRight, LayoutLeft,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int****, LayoutRight, LayoutStride,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWFILL_ETI_AVAIL(int****, LayoutRight,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int*****, LayoutRight, LayoutRight,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int*****, LayoutRight, LayoutLeft,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int*****, LayoutRight, LayoutStride,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWFILL_ETI_AVAIL(int*****, LayoutRight,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int********, LayoutRight, LayoutRight,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int********, LayoutRight, LayoutLeft,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int********, LayoutRight, LayoutStride,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWFILL_ETI_AVAIL(int********, LayoutRight,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int*, LayoutStride, LayoutRight,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int*, LayoutStride, LayoutLeft,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int*, LayoutStride, LayoutStride,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWFILL_ETI_AVAIL(int*, LayoutStride,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int**, LayoutStride, LayoutRight,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int**, LayoutStride, LayoutLeft,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int**, LayoutStride, LayoutStride,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWFILL_ETI_AVAIL(int**, LayoutStride,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int***, LayoutStride, LayoutRight,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int***, LayoutStride, LayoutLeft,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int***, LayoutStride, LayoutStride,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWFILL_ETI_AVAIL(int***, LayoutStride,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int****, LayoutStride, LayoutRight,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int****, LayoutStride, LayoutLeft,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int****, LayoutStride, LayoutStride,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWFILL_ETI_AVAIL(int****, LayoutStride,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int*****, LayoutStride, LayoutRight,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int*****, LayoutStride, LayoutLeft,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int*****, LayoutStride, LayoutStride,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWFILL_ETI_AVAIL(int*****, LayoutStride,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int********, LayoutStride, LayoutRight,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int********, LayoutStride, LayoutLeft,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int********, LayoutStride, LayoutStride,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWFILL_ETI_AVAIL(int********, LayoutStride,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int*, LayoutLeft, LayoutRight,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,
+                               int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int*, LayoutLeft, LayoutLeft,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,
+                               int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int*, LayoutLeft, LayoutStride,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,
+                               int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_AVAIL(int*, LayoutLeft,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,
+                               int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int**, LayoutLeft, LayoutRight,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,
+                               int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int**, LayoutLeft, LayoutLeft,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,
+                               int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int**, LayoutLeft, LayoutStride,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,
+                               int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_AVAIL(int**, LayoutLeft,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,
+                               int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int***, LayoutLeft, LayoutRight,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,
+                               int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int***, LayoutLeft, LayoutLeft,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,
+                               int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int***, LayoutLeft, LayoutStride,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,
+                               int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_AVAIL(int***, LayoutLeft,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,
+                               int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int****, LayoutLeft, LayoutRight,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,
+                               int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int****, LayoutLeft, LayoutLeft,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,
+                               int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int****, LayoutLeft, LayoutStride,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,
+                               int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_AVAIL(int****, LayoutLeft,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,
+                               int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int*****, LayoutLeft, LayoutRight,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,
+                               int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int*****, LayoutLeft, LayoutLeft,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,
+                               int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int*****, LayoutLeft, LayoutStride,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,
+                               int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_AVAIL(int*****, LayoutLeft,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,
+                               int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int********, LayoutLeft, LayoutRight,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,
+                               int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int********, LayoutLeft, LayoutLeft,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,
+                               int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int********, LayoutLeft, LayoutStride,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,
+                               int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_AVAIL(int********, LayoutLeft,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,
+                               int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int*, LayoutRight, LayoutRight,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,
+                               int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int*, LayoutRight, LayoutLeft,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,
+                               int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int*, LayoutRight, LayoutStride,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,
+                               int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_AVAIL(int*, LayoutRight,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,
+                               int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int**, LayoutRight, LayoutRight,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,
+                               int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int**, LayoutRight, LayoutLeft,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,
+                               int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int**, LayoutRight, LayoutStride,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,
+                               int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_AVAIL(int**, LayoutRight,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,
+                               int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int***, LayoutRight, LayoutRight,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,
+                               int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int***, LayoutRight, LayoutLeft,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,
+                               int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int***, LayoutRight, LayoutStride,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,
+                               int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_AVAIL(int***, LayoutRight,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,
+                               int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int****, LayoutRight, LayoutRight,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,
+                               int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int****, LayoutRight, LayoutLeft,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,
+                               int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int****, LayoutRight, LayoutStride,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,
+                               int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_AVAIL(int****, LayoutRight,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,
+                               int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int*****, LayoutRight, LayoutRight,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,
+                               int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int*****, LayoutRight, LayoutLeft,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,
+                               int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int*****, LayoutRight, LayoutStride,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,
+                               int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_AVAIL(int*****, LayoutRight,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,
+                               int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int********, LayoutRight, LayoutRight,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,
+                               int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int********, LayoutRight, LayoutLeft,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,
+                               int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int********, LayoutRight, LayoutStride,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,
+                               int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_AVAIL(int********, LayoutRight,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,
+                               int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int*, LayoutStride, LayoutRight,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,
+                               int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int*, LayoutStride, LayoutLeft,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,
+                               int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int*, LayoutStride, LayoutStride,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,
+                               int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_AVAIL(int*, LayoutStride,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,
+                               int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int**, LayoutStride, LayoutRight,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,
+                               int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int**, LayoutStride, LayoutLeft,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,
+                               int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int**, LayoutStride, LayoutStride,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,
+                               int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_AVAIL(int**, LayoutStride,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,
+                               int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int***, LayoutStride, LayoutRight,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,
+                               int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int***, LayoutStride, LayoutLeft,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,
+                               int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int***, LayoutStride, LayoutStride,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,
+                               int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_AVAIL(int***, LayoutStride,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,
+                               int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int****, LayoutStride, LayoutRight,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,
+                               int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int****, LayoutStride, LayoutLeft,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,
+                               int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int****, LayoutStride, LayoutStride,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,
+                               int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_AVAIL(int****, LayoutStride,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,
+                               int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int*****, LayoutStride, LayoutRight,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,
+                               int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int*****, LayoutStride, LayoutLeft,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,
+                               int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int*****, LayoutStride, LayoutStride,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,
+                               int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_AVAIL(int*****, LayoutStride,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,
+                               int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int********, LayoutStride, LayoutRight,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,
+                               int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int********, LayoutStride, LayoutLeft,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,
+                               int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int********, LayoutStride, LayoutStride,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,
+                               int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_AVAIL(int********, LayoutStride,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,
+                               int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int64_t*, LayoutLeft, LayoutRight,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int64_t*, LayoutLeft, LayoutLeft,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int64_t*, LayoutLeft, LayoutStride,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWFILL_ETI_AVAIL(int64_t*, LayoutLeft,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int64_t**, LayoutLeft, LayoutRight,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int64_t**, LayoutLeft, LayoutLeft,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int64_t**, LayoutLeft, LayoutStride,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWFILL_ETI_AVAIL(int64_t**, LayoutLeft,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int64_t***, LayoutLeft, LayoutRight,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int64_t***, LayoutLeft, LayoutLeft,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int64_t***, LayoutLeft, LayoutStride,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWFILL_ETI_AVAIL(int64_t***, LayoutLeft,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int64_t****, LayoutLeft, LayoutRight,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int64_t****, LayoutLeft, LayoutLeft,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int64_t****, LayoutLeft, LayoutStride,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWFILL_ETI_AVAIL(int64_t****, LayoutLeft,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int64_t*****, LayoutLeft, LayoutRight,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int64_t*****, LayoutLeft, LayoutLeft,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int64_t*****, LayoutLeft, LayoutStride,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWFILL_ETI_AVAIL(int64_t*****, LayoutLeft,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int64_t********, LayoutLeft, LayoutRight,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int64_t********, LayoutLeft, LayoutLeft,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int64_t********, LayoutLeft, LayoutStride,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWFILL_ETI_AVAIL(int64_t********, LayoutLeft,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int64_t*, LayoutRight, LayoutRight,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int64_t*, LayoutRight, LayoutLeft,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int64_t*, LayoutRight, LayoutStride,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWFILL_ETI_AVAIL(int64_t*, LayoutRight,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int64_t**, LayoutRight, LayoutRight,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int64_t**, LayoutRight, LayoutLeft,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int64_t**, LayoutRight, LayoutStride,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWFILL_ETI_AVAIL(int64_t**, LayoutRight,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int64_t***, LayoutRight, LayoutRight,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int64_t***, LayoutRight, LayoutLeft,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int64_t***, LayoutRight, LayoutStride,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWFILL_ETI_AVAIL(int64_t***, LayoutRight,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int64_t****, LayoutRight, LayoutRight,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int64_t****, LayoutRight, LayoutLeft,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int64_t****, LayoutRight, LayoutStride,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWFILL_ETI_AVAIL(int64_t****, LayoutRight,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int64_t*****, LayoutRight, LayoutRight,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int64_t*****, LayoutRight, LayoutLeft,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int64_t*****, LayoutRight, LayoutStride,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWFILL_ETI_AVAIL(int64_t*****, LayoutRight,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int64_t********, LayoutRight, LayoutRight,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int64_t********, LayoutRight, LayoutLeft,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int64_t********, LayoutRight, LayoutStride,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWFILL_ETI_AVAIL(int64_t********, LayoutRight,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int64_t*, LayoutStride, LayoutRight,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int64_t*, LayoutStride, LayoutLeft,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int64_t*, LayoutStride, LayoutStride,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWFILL_ETI_AVAIL(int64_t*, LayoutStride,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int64_t**, LayoutStride, LayoutRight,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int64_t**, LayoutStride, LayoutLeft,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int64_t**, LayoutStride, LayoutStride,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWFILL_ETI_AVAIL(int64_t**, LayoutStride,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int64_t***, LayoutStride, LayoutRight,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int64_t***, LayoutStride, LayoutLeft,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int64_t***, LayoutStride, LayoutStride,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWFILL_ETI_AVAIL(int64_t***, LayoutStride,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int64_t****, LayoutStride, LayoutRight,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int64_t****, LayoutStride, LayoutLeft,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int64_t****, LayoutStride, LayoutStride,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWFILL_ETI_AVAIL(int64_t****, LayoutStride,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int64_t*****, LayoutStride, LayoutRight,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int64_t*****, LayoutStride, LayoutLeft,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int64_t*****, LayoutStride, LayoutStride,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWFILL_ETI_AVAIL(int64_t*****, LayoutStride,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int64_t********, LayoutStride, LayoutRight,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int64_t********, LayoutStride, LayoutLeft,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int64_t********, LayoutStride, LayoutStride,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWFILL_ETI_AVAIL(int64_t********, LayoutStride,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int64_t*, LayoutLeft, LayoutRight,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,
+                               int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int64_t*, LayoutLeft, LayoutLeft,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,
+                               int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int64_t*, LayoutLeft, LayoutStride,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,
+                               int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_AVAIL(int64_t*, LayoutLeft,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,
+                               int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int64_t**, LayoutLeft, LayoutRight,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,
+                               int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int64_t**, LayoutLeft, LayoutLeft,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,
+                               int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int64_t**, LayoutLeft, LayoutStride,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,
+                               int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_AVAIL(int64_t**, LayoutLeft,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,
+                               int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int64_t***, LayoutLeft, LayoutRight,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,
+                               int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int64_t***, LayoutLeft, LayoutLeft,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,
+                               int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int64_t***, LayoutLeft, LayoutStride,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,
+                               int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_AVAIL(int64_t***, LayoutLeft,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,
+                               int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int64_t****, LayoutLeft, LayoutRight,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,
+                               int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int64_t****, LayoutLeft, LayoutLeft,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,
+                               int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int64_t****, LayoutLeft, LayoutStride,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,
+                               int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_AVAIL(int64_t****, LayoutLeft,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,
+                               int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int64_t*****, LayoutLeft, LayoutRight,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,
+                               int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int64_t*****, LayoutLeft, LayoutLeft,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,
+                               int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int64_t*****, LayoutLeft, LayoutStride,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,
+                               int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_AVAIL(int64_t*****, LayoutLeft,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,
+                               int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int64_t********, LayoutLeft, LayoutRight,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,
+                               int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int64_t********, LayoutLeft, LayoutLeft,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,
+                               int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int64_t********, LayoutLeft, LayoutStride,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,
+                               int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_AVAIL(int64_t********, LayoutLeft,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,
+                               int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int64_t*, LayoutRight, LayoutRight,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,
+                               int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int64_t*, LayoutRight, LayoutLeft,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,
+                               int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int64_t*, LayoutRight, LayoutStride,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,
+                               int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_AVAIL(int64_t*, LayoutRight,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,
+                               int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int64_t**, LayoutRight, LayoutRight,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,
+                               int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int64_t**, LayoutRight, LayoutLeft,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,
+                               int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int64_t**, LayoutRight, LayoutStride,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,
+                               int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_AVAIL(int64_t**, LayoutRight,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,
+                               int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int64_t***, LayoutRight, LayoutRight,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,
+                               int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int64_t***, LayoutRight, LayoutLeft,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,
+                               int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int64_t***, LayoutRight, LayoutStride,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,
+                               int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_AVAIL(int64_t***, LayoutRight,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,
+                               int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int64_t****, LayoutRight, LayoutRight,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,
+                               int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int64_t****, LayoutRight, LayoutLeft,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,
+                               int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int64_t****, LayoutRight, LayoutStride,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,
+                               int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_AVAIL(int64_t****, LayoutRight,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,
+                               int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int64_t*****, LayoutRight, LayoutRight,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,
+                               int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int64_t*****, LayoutRight, LayoutLeft,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,
+                               int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int64_t*****, LayoutRight, LayoutStride,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,
+                               int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_AVAIL(int64_t*****, LayoutRight,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,
+                               int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int64_t********, LayoutRight, LayoutRight,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,
+                               int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int64_t********, LayoutRight, LayoutLeft,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,
+                               int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int64_t********, LayoutRight, LayoutStride,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,
+                               int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_AVAIL(int64_t********, LayoutRight,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,
+                               int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int64_t*, LayoutStride, LayoutRight,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,
+                               int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int64_t*, LayoutStride, LayoutLeft,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,
+                               int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int64_t*, LayoutStride, LayoutStride,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,
+                               int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_AVAIL(int64_t*, LayoutStride,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,
+                               int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int64_t**, LayoutStride, LayoutRight,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,
+                               int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int64_t**, LayoutStride, LayoutLeft,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,
+                               int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int64_t**, LayoutStride, LayoutStride,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,
+                               int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_AVAIL(int64_t**, LayoutStride,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,
+                               int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int64_t***, LayoutStride, LayoutRight,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,
+                               int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int64_t***, LayoutStride, LayoutLeft,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,
+                               int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int64_t***, LayoutStride, LayoutStride,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,
+                               int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_AVAIL(int64_t***, LayoutStride,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,
+                               int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int64_t****, LayoutStride, LayoutRight,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,
+                               int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int64_t****, LayoutStride, LayoutLeft,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,
+                               int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int64_t****, LayoutStride, LayoutStride,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,
+                               int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_AVAIL(int64_t****, LayoutStride,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,
+                               int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int64_t*****, LayoutStride, LayoutRight,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,
+                               int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int64_t*****, LayoutStride, LayoutLeft,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,
+                               int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int64_t*****, LayoutStride, LayoutStride,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,
+                               int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_AVAIL(int64_t*****, LayoutStride,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,
+                               int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int64_t********, LayoutStride, LayoutRight,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,
+                               int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int64_t********, LayoutStride, LayoutLeft,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,
+                               int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(int64_t********, LayoutStride, LayoutStride,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,
+                               int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_AVAIL(int64_t********, LayoutStride,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,
+                               int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(float*, LayoutLeft, LayoutRight,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(float*, LayoutLeft, LayoutLeft,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(float*, LayoutLeft, LayoutStride,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWFILL_ETI_AVAIL(float*, LayoutLeft,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(float**, LayoutLeft, LayoutRight,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(float**, LayoutLeft, LayoutLeft,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(float**, LayoutLeft, LayoutStride,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWFILL_ETI_AVAIL(float**, LayoutLeft,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(float***, LayoutLeft, LayoutRight,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(float***, LayoutLeft, LayoutLeft,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(float***, LayoutLeft, LayoutStride,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWFILL_ETI_AVAIL(float***, LayoutLeft,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(float****, LayoutLeft, LayoutRight,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(float****, LayoutLeft, LayoutLeft,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(float****, LayoutLeft, LayoutStride,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWFILL_ETI_AVAIL(float****, LayoutLeft,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(float*****, LayoutLeft, LayoutRight,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(float*****, LayoutLeft, LayoutLeft,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(float*****, LayoutLeft, LayoutStride,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWFILL_ETI_AVAIL(float*****, LayoutLeft,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(float********, LayoutLeft, LayoutRight,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(float********, LayoutLeft, LayoutLeft,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(float********, LayoutLeft, LayoutStride,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWFILL_ETI_AVAIL(float********, LayoutLeft,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(float*, LayoutRight, LayoutRight,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(float*, LayoutRight, LayoutLeft,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(float*, LayoutRight, LayoutStride,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWFILL_ETI_AVAIL(float*, LayoutRight,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(float**, LayoutRight, LayoutRight,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(float**, LayoutRight, LayoutLeft,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(float**, LayoutRight, LayoutStride,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWFILL_ETI_AVAIL(float**, LayoutRight,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(float***, LayoutRight, LayoutRight,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(float***, LayoutRight, LayoutLeft,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(float***, LayoutRight, LayoutStride,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWFILL_ETI_AVAIL(float***, LayoutRight,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(float****, LayoutRight, LayoutRight,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(float****, LayoutRight, LayoutLeft,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(float****, LayoutRight, LayoutStride,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWFILL_ETI_AVAIL(float****, LayoutRight,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(float*****, LayoutRight, LayoutRight,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(float*****, LayoutRight, LayoutLeft,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(float*****, LayoutRight, LayoutStride,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWFILL_ETI_AVAIL(float*****, LayoutRight,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(float********, LayoutRight, LayoutRight,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(float********, LayoutRight, LayoutLeft,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(float********, LayoutRight, LayoutStride,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWFILL_ETI_AVAIL(float********, LayoutRight,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(float*, LayoutStride, LayoutRight,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(float*, LayoutStride, LayoutLeft,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(float*, LayoutStride, LayoutStride,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWFILL_ETI_AVAIL(float*, LayoutStride,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(float**, LayoutStride, LayoutRight,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(float**, LayoutStride, LayoutLeft,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(float**, LayoutStride, LayoutStride,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWFILL_ETI_AVAIL(float**, LayoutStride,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(float***, LayoutStride, LayoutRight,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(float***, LayoutStride, LayoutLeft,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(float***, LayoutStride, LayoutStride,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWFILL_ETI_AVAIL(float***, LayoutStride,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(float****, LayoutStride, LayoutRight,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(float****, LayoutStride, LayoutLeft,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(float****, LayoutStride, LayoutStride,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWFILL_ETI_AVAIL(float****, LayoutStride,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(float*****, LayoutStride, LayoutRight,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(float*****, LayoutStride, LayoutLeft,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(float*****, LayoutStride, LayoutStride,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWFILL_ETI_AVAIL(float*****, LayoutStride,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(float********, LayoutStride, LayoutRight,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(float********, LayoutStride, LayoutLeft,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(float********, LayoutStride, LayoutStride,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWFILL_ETI_AVAIL(float********, LayoutStride,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(float*, LayoutLeft, LayoutRight,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,
+                               int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(float*, LayoutLeft, LayoutLeft,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,
+                               int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(float*, LayoutLeft, LayoutStride,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,
+                               int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_AVAIL(float*, LayoutLeft,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,
+                               int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(float**, LayoutLeft, LayoutRight,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,
+                               int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(float**, LayoutLeft, LayoutLeft,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,
+                               int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(float**, LayoutLeft, LayoutStride,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,
+                               int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_AVAIL(float**, LayoutLeft,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,
+                               int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(float***, LayoutLeft, LayoutRight,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,
+                               int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(float***, LayoutLeft, LayoutLeft,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,
+                               int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(float***, LayoutLeft, LayoutStride,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,
+                               int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_AVAIL(float***, LayoutLeft,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,
+                               int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(float****, LayoutLeft, LayoutRight,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,
+                               int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(float****, LayoutLeft, LayoutLeft,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,
+                               int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(float****, LayoutLeft, LayoutStride,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,
+                               int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_AVAIL(float****, LayoutLeft,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,
+                               int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(float*****, LayoutLeft, LayoutRight,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,
+                               int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(float*****, LayoutLeft, LayoutLeft,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,
+                               int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(float*****, LayoutLeft, LayoutStride,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,
+                               int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_AVAIL(float*****, LayoutLeft,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,
+                               int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(float********, LayoutLeft, LayoutRight,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,
+                               int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(float********, LayoutLeft, LayoutLeft,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,
+                               int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(float********, LayoutLeft, LayoutStride,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,
+                               int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_AVAIL(float********, LayoutLeft,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,
+                               int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(float*, LayoutRight, LayoutRight,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,
+                               int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(float*, LayoutRight, LayoutLeft,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,
+                               int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(float*, LayoutRight, LayoutStride,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,
+                               int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_AVAIL(float*, LayoutRight,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,
+                               int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(float**, LayoutRight, LayoutRight,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,
+                               int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(float**, LayoutRight, LayoutLeft,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,
+                               int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(float**, LayoutRight, LayoutStride,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,
+                               int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_AVAIL(float**, LayoutRight,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,
+                               int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(float***, LayoutRight, LayoutRight,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,
+                               int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(float***, LayoutRight, LayoutLeft,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,
+                               int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(float***, LayoutRight, LayoutStride,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,
+                               int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_AVAIL(float***, LayoutRight,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,
+                               int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(float****, LayoutRight, LayoutRight,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,
+                               int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(float****, LayoutRight, LayoutLeft,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,
+                               int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(float****, LayoutRight, LayoutStride,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,
+                               int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_AVAIL(float****, LayoutRight,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,
+                               int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(float*****, LayoutRight, LayoutRight,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,
+                               int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(float*****, LayoutRight, LayoutLeft,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,
+                               int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(float*****, LayoutRight, LayoutStride,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,
+                               int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_AVAIL(float*****, LayoutRight,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,
+                               int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(float********, LayoutRight, LayoutRight,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,
+                               int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(float********, LayoutRight, LayoutLeft,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,
+                               int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(float********, LayoutRight, LayoutStride,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,
+                               int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_AVAIL(float********, LayoutRight,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,
+                               int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(float*, LayoutStride, LayoutRight,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,
+                               int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(float*, LayoutStride, LayoutLeft,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,
+                               int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(float*, LayoutStride, LayoutStride,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,
+                               int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_AVAIL(float*, LayoutStride,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,
+                               int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(float**, LayoutStride, LayoutRight,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,
+                               int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(float**, LayoutStride, LayoutLeft,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,
+                               int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(float**, LayoutStride, LayoutStride,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,
+                               int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_AVAIL(float**, LayoutStride,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,
+                               int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(float***, LayoutStride, LayoutRight,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,
+                               int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(float***, LayoutStride, LayoutLeft,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,
+                               int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(float***, LayoutStride, LayoutStride,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,
+                               int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_AVAIL(float***, LayoutStride,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,
+                               int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(float****, LayoutStride, LayoutRight,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,
+                               int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(float****, LayoutStride, LayoutLeft,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,
+                               int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(float****, LayoutStride, LayoutStride,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,
+                               int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_AVAIL(float****, LayoutStride,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,
+                               int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(float*****, LayoutStride, LayoutRight,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,
+                               int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(float*****, LayoutStride, LayoutLeft,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,
+                               int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(float*****, LayoutStride, LayoutStride,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,
+                               int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_AVAIL(float*****, LayoutStride,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,
+                               int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(float********, LayoutStride, LayoutRight,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,
+                               int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(float********, LayoutStride, LayoutLeft,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,
+                               int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(float********, LayoutStride, LayoutStride,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,
+                               int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_AVAIL(float********, LayoutStride,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,
+                               int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(double*, LayoutLeft, LayoutRight,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(double*, LayoutLeft, LayoutLeft,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(double*, LayoutLeft, LayoutStride,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWFILL_ETI_AVAIL(double*, LayoutLeft,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(double**, LayoutLeft, LayoutRight,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(double**, LayoutLeft, LayoutLeft,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(double**, LayoutLeft, LayoutStride,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWFILL_ETI_AVAIL(double**, LayoutLeft,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(double***, LayoutLeft, LayoutRight,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(double***, LayoutLeft, LayoutLeft,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(double***, LayoutLeft, LayoutStride,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWFILL_ETI_AVAIL(double***, LayoutLeft,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(double****, LayoutLeft, LayoutRight,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(double****, LayoutLeft, LayoutLeft,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(double****, LayoutLeft, LayoutStride,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWFILL_ETI_AVAIL(double****, LayoutLeft,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(double*****, LayoutLeft, LayoutRight,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(double*****, LayoutLeft, LayoutLeft,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(double*****, LayoutLeft, LayoutStride,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWFILL_ETI_AVAIL(double*****, LayoutLeft,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(double********, LayoutLeft, LayoutRight,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(double********, LayoutLeft, LayoutLeft,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(double********, LayoutLeft, LayoutStride,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWFILL_ETI_AVAIL(double********, LayoutLeft,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(double*, LayoutRight, LayoutRight,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(double*, LayoutRight, LayoutLeft,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(double*, LayoutRight, LayoutStride,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWFILL_ETI_AVAIL(double*, LayoutRight,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(double**, LayoutRight, LayoutRight,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(double**, LayoutRight, LayoutLeft,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(double**, LayoutRight, LayoutStride,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWFILL_ETI_AVAIL(double**, LayoutRight,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(double***, LayoutRight, LayoutRight,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(double***, LayoutRight, LayoutLeft,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(double***, LayoutRight, LayoutStride,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWFILL_ETI_AVAIL(double***, LayoutRight,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(double****, LayoutRight, LayoutRight,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(double****, LayoutRight, LayoutLeft,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(double****, LayoutRight, LayoutStride,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWFILL_ETI_AVAIL(double****, LayoutRight,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(double*****, LayoutRight, LayoutRight,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(double*****, LayoutRight, LayoutLeft,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(double*****, LayoutRight, LayoutStride,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWFILL_ETI_AVAIL(double*****, LayoutRight,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(double********, LayoutRight, LayoutRight,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(double********, LayoutRight, LayoutLeft,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(double********, LayoutRight, LayoutStride,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWFILL_ETI_AVAIL(double********, LayoutRight,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(double*, LayoutStride, LayoutRight,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(double*, LayoutStride, LayoutLeft,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(double*, LayoutStride, LayoutStride,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWFILL_ETI_AVAIL(double*, LayoutStride,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(double**, LayoutStride, LayoutRight,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(double**, LayoutStride, LayoutLeft,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(double**, LayoutStride, LayoutStride,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWFILL_ETI_AVAIL(double**, LayoutStride,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(double***, LayoutStride, LayoutRight,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(double***, LayoutStride, LayoutLeft,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(double***, LayoutStride, LayoutStride,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWFILL_ETI_AVAIL(double***, LayoutStride,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(double****, LayoutStride, LayoutRight,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(double****, LayoutStride, LayoutLeft,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(double****, LayoutStride, LayoutStride,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWFILL_ETI_AVAIL(double****, LayoutStride,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(double*****, LayoutStride, LayoutRight,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(double*****, LayoutStride, LayoutLeft,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(double*****, LayoutStride, LayoutStride,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWFILL_ETI_AVAIL(double*****, LayoutStride,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(double********, LayoutStride, LayoutRight,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(double********, LayoutStride, LayoutLeft,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(double********, LayoutStride, LayoutStride,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWFILL_ETI_AVAIL(double********, LayoutStride,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(double*, LayoutLeft, LayoutRight,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,
+                               int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(double*, LayoutLeft, LayoutLeft,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,
+                               int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(double*, LayoutLeft, LayoutStride,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,
+                               int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_AVAIL(double*, LayoutLeft,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,
+                               int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(double**, LayoutLeft, LayoutRight,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,
+                               int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(double**, LayoutLeft, LayoutLeft,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,
+                               int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(double**, LayoutLeft, LayoutStride,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,
+                               int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_AVAIL(double**, LayoutLeft,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,
+                               int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(double***, LayoutLeft, LayoutRight,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,
+                               int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(double***, LayoutLeft, LayoutLeft,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,
+                               int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(double***, LayoutLeft, LayoutStride,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,
+                               int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_AVAIL(double***, LayoutLeft,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,
+                               int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(double****, LayoutLeft, LayoutRight,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,
+                               int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(double****, LayoutLeft, LayoutLeft,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,
+                               int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(double****, LayoutLeft, LayoutStride,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,
+                               int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_AVAIL(double****, LayoutLeft,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,
+                               int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(double*****, LayoutLeft, LayoutRight,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,
+                               int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(double*****, LayoutLeft, LayoutLeft,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,
+                               int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(double*****, LayoutLeft, LayoutStride,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,
+                               int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_AVAIL(double*****, LayoutLeft,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,
+                               int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(double********, LayoutLeft, LayoutRight,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,
+                               int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(double********, LayoutLeft, LayoutLeft,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,
+                               int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(double********, LayoutLeft, LayoutStride,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,
+                               int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_AVAIL(double********, LayoutLeft,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,
+                               int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(double*, LayoutRight, LayoutRight,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,
+                               int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(double*, LayoutRight, LayoutLeft,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,
+                               int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(double*, LayoutRight, LayoutStride,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,
+                               int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_AVAIL(double*, LayoutRight,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,
+                               int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(double**, LayoutRight, LayoutRight,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,
+                               int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(double**, LayoutRight, LayoutLeft,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,
+                               int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(double**, LayoutRight, LayoutStride,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,
+                               int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_AVAIL(double**, LayoutRight,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,
+                               int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(double***, LayoutRight, LayoutRight,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,
+                               int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(double***, LayoutRight, LayoutLeft,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,
+                               int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(double***, LayoutRight, LayoutStride,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,
+                               int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_AVAIL(double***, LayoutRight,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,
+                               int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(double****, LayoutRight, LayoutRight,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,
+                               int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(double****, LayoutRight, LayoutLeft,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,
+                               int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(double****, LayoutRight, LayoutStride,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,
+                               int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_AVAIL(double****, LayoutRight,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,
+                               int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(double*****, LayoutRight, LayoutRight,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,
+                               int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(double*****, LayoutRight, LayoutLeft,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,
+                               int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(double*****, LayoutRight, LayoutStride,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,
+                               int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_AVAIL(double*****, LayoutRight,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,
+                               int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(double********, LayoutRight, LayoutRight,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,
+                               int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(double********, LayoutRight, LayoutLeft,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,
+                               int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(double********, LayoutRight, LayoutStride,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,
+                               int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_AVAIL(double********, LayoutRight,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,
+                               int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(double*, LayoutStride, LayoutRight,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,
+                               int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(double*, LayoutStride, LayoutLeft,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,
+                               int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(double*, LayoutStride, LayoutStride,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,
+                               int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_AVAIL(double*, LayoutStride,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,
+                               int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(double**, LayoutStride, LayoutRight,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,
+                               int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(double**, LayoutStride, LayoutLeft,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,
+                               int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(double**, LayoutStride, LayoutStride,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,
+                               int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_AVAIL(double**, LayoutStride,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,
+                               int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(double***, LayoutStride, LayoutRight,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,
+                               int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(double***, LayoutStride, LayoutLeft,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,
+                               int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(double***, LayoutStride, LayoutStride,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,
+                               int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_AVAIL(double***, LayoutStride,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,
+                               int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(double****, LayoutStride, LayoutRight,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,
+                               int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(double****, LayoutStride, LayoutLeft,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,
+                               int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(double****, LayoutStride, LayoutStride,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,
+                               int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_AVAIL(double****, LayoutStride,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,
+                               int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(double*****, LayoutStride, LayoutRight,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,
+                               int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(double*****, LayoutStride, LayoutLeft,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,
+                               int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(double*****, LayoutStride, LayoutStride,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,
+                               int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_AVAIL(double*****, LayoutStride,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,
+                               int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(double********, LayoutStride, LayoutRight,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,
+                               int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(double********, LayoutStride, LayoutLeft,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,
+                               int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(double********, LayoutStride, LayoutStride,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,
+                               int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_AVAIL(double********, LayoutStride,
+                               KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,
+                               int64_t)
diff --git a/lib/kokkos/core/src/eti/common/Kokkos_ViewFillCopyETIDecl_Macros.hpp b/lib/kokkos/core/src/eti/common/Kokkos_ViewFillCopyETIDecl_Macros.hpp
index 6bf5a77204..98d9791eeb 100644
--- a/lib/kokkos/core/src/eti/common/Kokkos_ViewFillCopyETIDecl_Macros.hpp
+++ b/lib/kokkos/core/src/eti/common/Kokkos_ViewFillCopyETIDecl_Macros.hpp
@@ -1,576 +1,1152 @@
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int*,LayoutLeft,LayoutRight, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int*,LayoutLeft,LayoutLeft,  KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int*,LayoutLeft,LayoutStride,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWFILL_ETI_DECL(int*,LayoutLeft,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int**,LayoutLeft,LayoutRight, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int**,LayoutLeft,LayoutLeft,  KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int**,LayoutLeft,LayoutStride,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWFILL_ETI_DECL(int**,LayoutLeft,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int***,LayoutLeft,LayoutRight, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int***,LayoutLeft,LayoutLeft,  KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int***,LayoutLeft,LayoutStride,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWFILL_ETI_DECL(int***,LayoutLeft,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int****,LayoutLeft,LayoutRight, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int****,LayoutLeft,LayoutLeft,  KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int****,LayoutLeft,LayoutStride,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWFILL_ETI_DECL(int****,LayoutLeft,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int*****,LayoutLeft,LayoutRight, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int*****,LayoutLeft,LayoutLeft,  KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int*****,LayoutLeft,LayoutStride,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWFILL_ETI_DECL(int*****,LayoutLeft,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int********,LayoutLeft,LayoutRight, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int********,LayoutLeft,LayoutLeft,  KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int********,LayoutLeft,LayoutStride,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWFILL_ETI_DECL(int********,LayoutLeft,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int*,LayoutRight,LayoutRight, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int*,LayoutRight,LayoutLeft,  KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int*,LayoutRight,LayoutStride,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWFILL_ETI_DECL(int*,LayoutRight,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int**,LayoutRight,LayoutRight, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int**,LayoutRight,LayoutLeft,  KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int**,LayoutRight,LayoutStride,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWFILL_ETI_DECL(int**,LayoutRight,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int***,LayoutRight,LayoutRight, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int***,LayoutRight,LayoutLeft,  KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int***,LayoutRight,LayoutStride,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWFILL_ETI_DECL(int***,LayoutRight,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int****,LayoutRight,LayoutRight, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int****,LayoutRight,LayoutLeft,  KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int****,LayoutRight,LayoutStride,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWFILL_ETI_DECL(int****,LayoutRight,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int*****,LayoutRight,LayoutRight, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int*****,LayoutRight,LayoutLeft,  KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int*****,LayoutRight,LayoutStride,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWFILL_ETI_DECL(int*****,LayoutRight,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int********,LayoutRight,LayoutRight, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int********,LayoutRight,LayoutLeft,  KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int********,LayoutRight,LayoutStride,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWFILL_ETI_DECL(int********,LayoutRight,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int*,LayoutStride,LayoutRight, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int*,LayoutStride,LayoutLeft,  KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int*,LayoutStride,LayoutStride,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWFILL_ETI_DECL(int*,LayoutStride,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int**,LayoutStride,LayoutRight, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int**,LayoutStride,LayoutLeft,  KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int**,LayoutStride,LayoutStride,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWFILL_ETI_DECL(int**,LayoutStride,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int***,LayoutStride,LayoutRight, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int***,LayoutStride,LayoutLeft,  KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int***,LayoutStride,LayoutStride,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWFILL_ETI_DECL(int***,LayoutStride,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int****,LayoutStride,LayoutRight, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int****,LayoutStride,LayoutLeft,  KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int****,LayoutStride,LayoutStride,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWFILL_ETI_DECL(int****,LayoutStride,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int*****,LayoutStride,LayoutRight, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int*****,LayoutStride,LayoutLeft,  KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int*****,LayoutStride,LayoutStride,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWFILL_ETI_DECL(int*****,LayoutStride,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int********,LayoutStride,LayoutRight, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int********,LayoutStride,LayoutLeft,  KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int********,LayoutStride,LayoutStride,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWFILL_ETI_DECL(int********,LayoutStride,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int*,LayoutLeft,LayoutRight, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int*,LayoutLeft,LayoutLeft,  KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int*,LayoutLeft,LayoutStride,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_DECL(int*,LayoutLeft,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int**,LayoutLeft,LayoutRight, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int**,LayoutLeft,LayoutLeft,  KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int**,LayoutLeft,LayoutStride,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_DECL(int**,LayoutLeft,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int***,LayoutLeft,LayoutRight, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int***,LayoutLeft,LayoutLeft,  KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int***,LayoutLeft,LayoutStride,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_DECL(int***,LayoutLeft,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int****,LayoutLeft,LayoutRight, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int****,LayoutLeft,LayoutLeft,  KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int****,LayoutLeft,LayoutStride,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_DECL(int****,LayoutLeft,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int*****,LayoutLeft,LayoutRight, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int*****,LayoutLeft,LayoutLeft,  KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int*****,LayoutLeft,LayoutStride,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_DECL(int*****,LayoutLeft,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int********,LayoutLeft,LayoutRight, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int********,LayoutLeft,LayoutLeft,  KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int********,LayoutLeft,LayoutStride,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_DECL(int********,LayoutLeft,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int*,LayoutRight,LayoutRight, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int*,LayoutRight,LayoutLeft,  KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int*,LayoutRight,LayoutStride,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_DECL(int*,LayoutRight,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int**,LayoutRight,LayoutRight, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int**,LayoutRight,LayoutLeft,  KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int**,LayoutRight,LayoutStride,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_DECL(int**,LayoutRight,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int***,LayoutRight,LayoutRight, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int***,LayoutRight,LayoutLeft,  KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int***,LayoutRight,LayoutStride,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_DECL(int***,LayoutRight,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int****,LayoutRight,LayoutRight, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int****,LayoutRight,LayoutLeft,  KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int****,LayoutRight,LayoutStride,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_DECL(int****,LayoutRight,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int*****,LayoutRight,LayoutRight, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int*****,LayoutRight,LayoutLeft,  KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int*****,LayoutRight,LayoutStride,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_DECL(int*****,LayoutRight,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int********,LayoutRight,LayoutRight, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int********,LayoutRight,LayoutLeft,  KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int********,LayoutRight,LayoutStride,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_DECL(int********,LayoutRight,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int*,LayoutStride,LayoutRight, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int*,LayoutStride,LayoutLeft,  KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int*,LayoutStride,LayoutStride,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_DECL(int*,LayoutStride,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int**,LayoutStride,LayoutRight, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int**,LayoutStride,LayoutLeft,  KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int**,LayoutStride,LayoutStride,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_DECL(int**,LayoutStride,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int***,LayoutStride,LayoutRight, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int***,LayoutStride,LayoutLeft,  KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int***,LayoutStride,LayoutStride,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_DECL(int***,LayoutStride,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int****,LayoutStride,LayoutRight, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int****,LayoutStride,LayoutLeft,  KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int****,LayoutStride,LayoutStride,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_DECL(int****,LayoutStride,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int*****,LayoutStride,LayoutRight, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int*****,LayoutStride,LayoutLeft,  KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int*****,LayoutStride,LayoutStride,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_DECL(int*****,LayoutStride,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int********,LayoutStride,LayoutRight, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int********,LayoutStride,LayoutLeft,  KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int********,LayoutStride,LayoutStride,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_DECL(int********,LayoutStride,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int64_t*,LayoutLeft,LayoutRight, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int64_t*,LayoutLeft,LayoutLeft,  KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int64_t*,LayoutLeft,LayoutStride,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWFILL_ETI_DECL(int64_t*,LayoutLeft,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int64_t**,LayoutLeft,LayoutRight, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int64_t**,LayoutLeft,LayoutLeft,  KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int64_t**,LayoutLeft,LayoutStride,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWFILL_ETI_DECL(int64_t**,LayoutLeft,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int64_t***,LayoutLeft,LayoutRight, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int64_t***,LayoutLeft,LayoutLeft,  KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int64_t***,LayoutLeft,LayoutStride,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWFILL_ETI_DECL(int64_t***,LayoutLeft,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int64_t****,LayoutLeft,LayoutRight, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int64_t****,LayoutLeft,LayoutLeft,  KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int64_t****,LayoutLeft,LayoutStride,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWFILL_ETI_DECL(int64_t****,LayoutLeft,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int64_t*****,LayoutLeft,LayoutRight, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int64_t*****,LayoutLeft,LayoutLeft,  KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int64_t*****,LayoutLeft,LayoutStride,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWFILL_ETI_DECL(int64_t*****,LayoutLeft,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int64_t********,LayoutLeft,LayoutRight, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int64_t********,LayoutLeft,LayoutLeft,  KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int64_t********,LayoutLeft,LayoutStride,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWFILL_ETI_DECL(int64_t********,LayoutLeft,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int64_t*,LayoutRight,LayoutRight, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int64_t*,LayoutRight,LayoutLeft,  KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int64_t*,LayoutRight,LayoutStride,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWFILL_ETI_DECL(int64_t*,LayoutRight,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int64_t**,LayoutRight,LayoutRight, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int64_t**,LayoutRight,LayoutLeft,  KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int64_t**,LayoutRight,LayoutStride,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWFILL_ETI_DECL(int64_t**,LayoutRight,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int64_t***,LayoutRight,LayoutRight, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int64_t***,LayoutRight,LayoutLeft,  KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int64_t***,LayoutRight,LayoutStride,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWFILL_ETI_DECL(int64_t***,LayoutRight,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int64_t****,LayoutRight,LayoutRight, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int64_t****,LayoutRight,LayoutLeft,  KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int64_t****,LayoutRight,LayoutStride,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWFILL_ETI_DECL(int64_t****,LayoutRight,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int64_t*****,LayoutRight,LayoutRight, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int64_t*****,LayoutRight,LayoutLeft,  KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int64_t*****,LayoutRight,LayoutStride,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWFILL_ETI_DECL(int64_t*****,LayoutRight,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int64_t********,LayoutRight,LayoutRight, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int64_t********,LayoutRight,LayoutLeft,  KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int64_t********,LayoutRight,LayoutStride,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWFILL_ETI_DECL(int64_t********,LayoutRight,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int64_t*,LayoutStride,LayoutRight, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int64_t*,LayoutStride,LayoutLeft,  KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int64_t*,LayoutStride,LayoutStride,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWFILL_ETI_DECL(int64_t*,LayoutStride,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int64_t**,LayoutStride,LayoutRight, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int64_t**,LayoutStride,LayoutLeft,  KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int64_t**,LayoutStride,LayoutStride,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWFILL_ETI_DECL(int64_t**,LayoutStride,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int64_t***,LayoutStride,LayoutRight, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int64_t***,LayoutStride,LayoutLeft,  KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int64_t***,LayoutStride,LayoutStride,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWFILL_ETI_DECL(int64_t***,LayoutStride,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int64_t****,LayoutStride,LayoutRight, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int64_t****,LayoutStride,LayoutLeft,  KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int64_t****,LayoutStride,LayoutStride,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWFILL_ETI_DECL(int64_t****,LayoutStride,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int64_t*****,LayoutStride,LayoutRight, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int64_t*****,LayoutStride,LayoutLeft,  KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int64_t*****,LayoutStride,LayoutStride,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWFILL_ETI_DECL(int64_t*****,LayoutStride,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int64_t********,LayoutStride,LayoutRight, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int64_t********,LayoutStride,LayoutLeft,  KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int64_t********,LayoutStride,LayoutStride,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWFILL_ETI_DECL(int64_t********,LayoutStride,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int64_t*,LayoutLeft,LayoutRight, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int64_t*,LayoutLeft,LayoutLeft,  KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int64_t*,LayoutLeft,LayoutStride,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_DECL(int64_t*,LayoutLeft,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int64_t**,LayoutLeft,LayoutRight, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int64_t**,LayoutLeft,LayoutLeft,  KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int64_t**,LayoutLeft,LayoutStride,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_DECL(int64_t**,LayoutLeft,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int64_t***,LayoutLeft,LayoutRight, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int64_t***,LayoutLeft,LayoutLeft,  KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int64_t***,LayoutLeft,LayoutStride,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_DECL(int64_t***,LayoutLeft,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int64_t****,LayoutLeft,LayoutRight, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int64_t****,LayoutLeft,LayoutLeft,  KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int64_t****,LayoutLeft,LayoutStride,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_DECL(int64_t****,LayoutLeft,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int64_t*****,LayoutLeft,LayoutRight, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int64_t*****,LayoutLeft,LayoutLeft,  KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int64_t*****,LayoutLeft,LayoutStride,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_DECL(int64_t*****,LayoutLeft,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int64_t********,LayoutLeft,LayoutRight, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int64_t********,LayoutLeft,LayoutLeft,  KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int64_t********,LayoutLeft,LayoutStride,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_DECL(int64_t********,LayoutLeft,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int64_t*,LayoutRight,LayoutRight, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int64_t*,LayoutRight,LayoutLeft,  KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int64_t*,LayoutRight,LayoutStride,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_DECL(int64_t*,LayoutRight,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int64_t**,LayoutRight,LayoutRight, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int64_t**,LayoutRight,LayoutLeft,  KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int64_t**,LayoutRight,LayoutStride,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_DECL(int64_t**,LayoutRight,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int64_t***,LayoutRight,LayoutRight, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int64_t***,LayoutRight,LayoutLeft,  KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int64_t***,LayoutRight,LayoutStride,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_DECL(int64_t***,LayoutRight,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int64_t****,LayoutRight,LayoutRight, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int64_t****,LayoutRight,LayoutLeft,  KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int64_t****,LayoutRight,LayoutStride,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_DECL(int64_t****,LayoutRight,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int64_t*****,LayoutRight,LayoutRight, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int64_t*****,LayoutRight,LayoutLeft,  KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int64_t*****,LayoutRight,LayoutStride,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_DECL(int64_t*****,LayoutRight,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int64_t********,LayoutRight,LayoutRight, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int64_t********,LayoutRight,LayoutLeft,  KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int64_t********,LayoutRight,LayoutStride,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_DECL(int64_t********,LayoutRight,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int64_t*,LayoutStride,LayoutRight, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int64_t*,LayoutStride,LayoutLeft,  KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int64_t*,LayoutStride,LayoutStride,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_DECL(int64_t*,LayoutStride,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int64_t**,LayoutStride,LayoutRight, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int64_t**,LayoutStride,LayoutLeft,  KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int64_t**,LayoutStride,LayoutStride,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_DECL(int64_t**,LayoutStride,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int64_t***,LayoutStride,LayoutRight, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int64_t***,LayoutStride,LayoutLeft,  KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int64_t***,LayoutStride,LayoutStride,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_DECL(int64_t***,LayoutStride,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int64_t****,LayoutStride,LayoutRight, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int64_t****,LayoutStride,LayoutLeft,  KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int64_t****,LayoutStride,LayoutStride,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_DECL(int64_t****,LayoutStride,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int64_t*****,LayoutStride,LayoutRight, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int64_t*****,LayoutStride,LayoutLeft,  KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int64_t*****,LayoutStride,LayoutStride,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_DECL(int64_t*****,LayoutStride,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int64_t********,LayoutStride,LayoutRight, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int64_t********,LayoutStride,LayoutLeft,  KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int64_t********,LayoutStride,LayoutStride,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_DECL(int64_t********,LayoutStride,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(float*,LayoutLeft,LayoutRight, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(float*,LayoutLeft,LayoutLeft,  KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(float*,LayoutLeft,LayoutStride,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWFILL_ETI_DECL(float*,LayoutLeft,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(float**,LayoutLeft,LayoutRight, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(float**,LayoutLeft,LayoutLeft,  KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(float**,LayoutLeft,LayoutStride,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWFILL_ETI_DECL(float**,LayoutLeft,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(float***,LayoutLeft,LayoutRight, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(float***,LayoutLeft,LayoutLeft,  KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(float***,LayoutLeft,LayoutStride,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWFILL_ETI_DECL(float***,LayoutLeft,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(float****,LayoutLeft,LayoutRight, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(float****,LayoutLeft,LayoutLeft,  KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(float****,LayoutLeft,LayoutStride,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWFILL_ETI_DECL(float****,LayoutLeft,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(float*****,LayoutLeft,LayoutRight, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(float*****,LayoutLeft,LayoutLeft,  KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(float*****,LayoutLeft,LayoutStride,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWFILL_ETI_DECL(float*****,LayoutLeft,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(float********,LayoutLeft,LayoutRight, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(float********,LayoutLeft,LayoutLeft,  KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(float********,LayoutLeft,LayoutStride,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWFILL_ETI_DECL(float********,LayoutLeft,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(float*,LayoutRight,LayoutRight, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(float*,LayoutRight,LayoutLeft,  KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(float*,LayoutRight,LayoutStride,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWFILL_ETI_DECL(float*,LayoutRight,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(float**,LayoutRight,LayoutRight, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(float**,LayoutRight,LayoutLeft,  KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(float**,LayoutRight,LayoutStride,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWFILL_ETI_DECL(float**,LayoutRight,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(float***,LayoutRight,LayoutRight, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(float***,LayoutRight,LayoutLeft,  KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(float***,LayoutRight,LayoutStride,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWFILL_ETI_DECL(float***,LayoutRight,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(float****,LayoutRight,LayoutRight, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(float****,LayoutRight,LayoutLeft,  KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(float****,LayoutRight,LayoutStride,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWFILL_ETI_DECL(float****,LayoutRight,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(float*****,LayoutRight,LayoutRight, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(float*****,LayoutRight,LayoutLeft,  KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(float*****,LayoutRight,LayoutStride,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWFILL_ETI_DECL(float*****,LayoutRight,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(float********,LayoutRight,LayoutRight, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(float********,LayoutRight,LayoutLeft,  KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(float********,LayoutRight,LayoutStride,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWFILL_ETI_DECL(float********,LayoutRight,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(float*,LayoutStride,LayoutRight, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(float*,LayoutStride,LayoutLeft,  KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(float*,LayoutStride,LayoutStride,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWFILL_ETI_DECL(float*,LayoutStride,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(float**,LayoutStride,LayoutRight, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(float**,LayoutStride,LayoutLeft,  KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(float**,LayoutStride,LayoutStride,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWFILL_ETI_DECL(float**,LayoutStride,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(float***,LayoutStride,LayoutRight, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(float***,LayoutStride,LayoutLeft,  KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(float***,LayoutStride,LayoutStride,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWFILL_ETI_DECL(float***,LayoutStride,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(float****,LayoutStride,LayoutRight, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(float****,LayoutStride,LayoutLeft,  KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(float****,LayoutStride,LayoutStride,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWFILL_ETI_DECL(float****,LayoutStride,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(float*****,LayoutStride,LayoutRight, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(float*****,LayoutStride,LayoutLeft,  KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(float*****,LayoutStride,LayoutStride,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWFILL_ETI_DECL(float*****,LayoutStride,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(float********,LayoutStride,LayoutRight, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(float********,LayoutStride,LayoutLeft,  KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(float********,LayoutStride,LayoutStride,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWFILL_ETI_DECL(float********,LayoutStride,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(float*,LayoutLeft,LayoutRight, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(float*,LayoutLeft,LayoutLeft,  KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(float*,LayoutLeft,LayoutStride,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_DECL(float*,LayoutLeft,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(float**,LayoutLeft,LayoutRight, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(float**,LayoutLeft,LayoutLeft,  KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(float**,LayoutLeft,LayoutStride,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_DECL(float**,LayoutLeft,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(float***,LayoutLeft,LayoutRight, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(float***,LayoutLeft,LayoutLeft,  KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(float***,LayoutLeft,LayoutStride,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_DECL(float***,LayoutLeft,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(float****,LayoutLeft,LayoutRight, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(float****,LayoutLeft,LayoutLeft,  KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(float****,LayoutLeft,LayoutStride,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_DECL(float****,LayoutLeft,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(float*****,LayoutLeft,LayoutRight, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(float*****,LayoutLeft,LayoutLeft,  KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(float*****,LayoutLeft,LayoutStride,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_DECL(float*****,LayoutLeft,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(float********,LayoutLeft,LayoutRight, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(float********,LayoutLeft,LayoutLeft,  KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(float********,LayoutLeft,LayoutStride,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_DECL(float********,LayoutLeft,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(float*,LayoutRight,LayoutRight, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(float*,LayoutRight,LayoutLeft,  KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(float*,LayoutRight,LayoutStride,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_DECL(float*,LayoutRight,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(float**,LayoutRight,LayoutRight, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(float**,LayoutRight,LayoutLeft,  KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(float**,LayoutRight,LayoutStride,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_DECL(float**,LayoutRight,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(float***,LayoutRight,LayoutRight, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(float***,LayoutRight,LayoutLeft,  KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(float***,LayoutRight,LayoutStride,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_DECL(float***,LayoutRight,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(float****,LayoutRight,LayoutRight, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(float****,LayoutRight,LayoutLeft,  KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(float****,LayoutRight,LayoutStride,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_DECL(float****,LayoutRight,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(float*****,LayoutRight,LayoutRight, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(float*****,LayoutRight,LayoutLeft,  KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(float*****,LayoutRight,LayoutStride,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_DECL(float*****,LayoutRight,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(float********,LayoutRight,LayoutRight, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(float********,LayoutRight,LayoutLeft,  KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(float********,LayoutRight,LayoutStride,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_DECL(float********,LayoutRight,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(float*,LayoutStride,LayoutRight, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(float*,LayoutStride,LayoutLeft,  KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(float*,LayoutStride,LayoutStride,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_DECL(float*,LayoutStride,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(float**,LayoutStride,LayoutRight, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(float**,LayoutStride,LayoutLeft,  KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(float**,LayoutStride,LayoutStride,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_DECL(float**,LayoutStride,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(float***,LayoutStride,LayoutRight, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(float***,LayoutStride,LayoutLeft,  KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(float***,LayoutStride,LayoutStride,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_DECL(float***,LayoutStride,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(float****,LayoutStride,LayoutRight, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(float****,LayoutStride,LayoutLeft,  KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(float****,LayoutStride,LayoutStride,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_DECL(float****,LayoutStride,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(float*****,LayoutStride,LayoutRight, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(float*****,LayoutStride,LayoutLeft,  KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(float*****,LayoutStride,LayoutStride,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_DECL(float*****,LayoutStride,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(float********,LayoutStride,LayoutRight, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(float********,LayoutStride,LayoutLeft,  KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(float********,LayoutStride,LayoutStride,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_DECL(float********,LayoutStride,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(double*,LayoutLeft,LayoutRight, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(double*,LayoutLeft,LayoutLeft,  KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(double*,LayoutLeft,LayoutStride,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWFILL_ETI_DECL(double*,LayoutLeft,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(double**,LayoutLeft,LayoutRight, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(double**,LayoutLeft,LayoutLeft,  KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(double**,LayoutLeft,LayoutStride,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWFILL_ETI_DECL(double**,LayoutLeft,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(double***,LayoutLeft,LayoutRight, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(double***,LayoutLeft,LayoutLeft,  KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(double***,LayoutLeft,LayoutStride,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWFILL_ETI_DECL(double***,LayoutLeft,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(double****,LayoutLeft,LayoutRight, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(double****,LayoutLeft,LayoutLeft,  KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(double****,LayoutLeft,LayoutStride,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWFILL_ETI_DECL(double****,LayoutLeft,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(double*****,LayoutLeft,LayoutRight, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(double*****,LayoutLeft,LayoutLeft,  KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(double*****,LayoutLeft,LayoutStride,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWFILL_ETI_DECL(double*****,LayoutLeft,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(double********,LayoutLeft,LayoutRight, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(double********,LayoutLeft,LayoutLeft,  KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(double********,LayoutLeft,LayoutStride,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWFILL_ETI_DECL(double********,LayoutLeft,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(double*,LayoutRight,LayoutRight, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(double*,LayoutRight,LayoutLeft,  KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(double*,LayoutRight,LayoutStride,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWFILL_ETI_DECL(double*,LayoutRight,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(double**,LayoutRight,LayoutRight, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(double**,LayoutRight,LayoutLeft,  KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(double**,LayoutRight,LayoutStride,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWFILL_ETI_DECL(double**,LayoutRight,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(double***,LayoutRight,LayoutRight, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(double***,LayoutRight,LayoutLeft,  KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(double***,LayoutRight,LayoutStride,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWFILL_ETI_DECL(double***,LayoutRight,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(double****,LayoutRight,LayoutRight, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(double****,LayoutRight,LayoutLeft,  KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(double****,LayoutRight,LayoutStride,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWFILL_ETI_DECL(double****,LayoutRight,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(double*****,LayoutRight,LayoutRight, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(double*****,LayoutRight,LayoutLeft,  KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(double*****,LayoutRight,LayoutStride,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWFILL_ETI_DECL(double*****,LayoutRight,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(double********,LayoutRight,LayoutRight, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(double********,LayoutRight,LayoutLeft,  KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(double********,LayoutRight,LayoutStride,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWFILL_ETI_DECL(double********,LayoutRight,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(double*,LayoutStride,LayoutRight, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(double*,LayoutStride,LayoutLeft,  KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(double*,LayoutStride,LayoutStride,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWFILL_ETI_DECL(double*,LayoutStride,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(double**,LayoutStride,LayoutRight, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(double**,LayoutStride,LayoutLeft,  KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(double**,LayoutStride,LayoutStride,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWFILL_ETI_DECL(double**,LayoutStride,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(double***,LayoutStride,LayoutRight, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(double***,LayoutStride,LayoutLeft,  KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(double***,LayoutStride,LayoutStride,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWFILL_ETI_DECL(double***,LayoutStride,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(double****,LayoutStride,LayoutRight, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(double****,LayoutStride,LayoutLeft,  KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(double****,LayoutStride,LayoutStride,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWFILL_ETI_DECL(double****,LayoutStride,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(double*****,LayoutStride,LayoutRight, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(double*****,LayoutStride,LayoutLeft,  KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(double*****,LayoutStride,LayoutStride,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWFILL_ETI_DECL(double*****,LayoutStride,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(double********,LayoutStride,LayoutRight, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(double********,LayoutStride,LayoutLeft,  KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(double********,LayoutStride,LayoutStride,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWFILL_ETI_DECL(double********,LayoutStride,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(double*,LayoutLeft,LayoutRight, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(double*,LayoutLeft,LayoutLeft,  KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(double*,LayoutLeft,LayoutStride,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_DECL(double*,LayoutLeft,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(double**,LayoutLeft,LayoutRight, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(double**,LayoutLeft,LayoutLeft,  KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(double**,LayoutLeft,LayoutStride,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_DECL(double**,LayoutLeft,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(double***,LayoutLeft,LayoutRight, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(double***,LayoutLeft,LayoutLeft,  KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(double***,LayoutLeft,LayoutStride,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_DECL(double***,LayoutLeft,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(double****,LayoutLeft,LayoutRight, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(double****,LayoutLeft,LayoutLeft,  KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(double****,LayoutLeft,LayoutStride,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_DECL(double****,LayoutLeft,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(double*****,LayoutLeft,LayoutRight, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(double*****,LayoutLeft,LayoutLeft,  KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(double*****,LayoutLeft,LayoutStride,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_DECL(double*****,LayoutLeft,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(double********,LayoutLeft,LayoutRight, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(double********,LayoutLeft,LayoutLeft,  KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(double********,LayoutLeft,LayoutStride,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_DECL(double********,LayoutLeft,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(double*,LayoutRight,LayoutRight, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(double*,LayoutRight,LayoutLeft,  KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(double*,LayoutRight,LayoutStride,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_DECL(double*,LayoutRight,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(double**,LayoutRight,LayoutRight, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(double**,LayoutRight,LayoutLeft,  KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(double**,LayoutRight,LayoutStride,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_DECL(double**,LayoutRight,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(double***,LayoutRight,LayoutRight, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(double***,LayoutRight,LayoutLeft,  KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(double***,LayoutRight,LayoutStride,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_DECL(double***,LayoutRight,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(double****,LayoutRight,LayoutRight, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(double****,LayoutRight,LayoutLeft,  KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(double****,LayoutRight,LayoutStride,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_DECL(double****,LayoutRight,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(double*****,LayoutRight,LayoutRight, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(double*****,LayoutRight,LayoutLeft,  KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(double*****,LayoutRight,LayoutStride,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_DECL(double*****,LayoutRight,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(double********,LayoutRight,LayoutRight, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(double********,LayoutRight,LayoutLeft,  KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(double********,LayoutRight,LayoutStride,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_DECL(double********,LayoutRight,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(double*,LayoutStride,LayoutRight, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(double*,LayoutStride,LayoutLeft,  KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(double*,LayoutStride,LayoutStride,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_DECL(double*,LayoutStride,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(double**,LayoutStride,LayoutRight, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(double**,LayoutStride,LayoutLeft,  KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(double**,LayoutStride,LayoutStride,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_DECL(double**,LayoutStride,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(double***,LayoutStride,LayoutRight, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(double***,LayoutStride,LayoutLeft,  KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(double***,LayoutStride,LayoutStride,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_DECL(double***,LayoutStride,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(double****,LayoutStride,LayoutRight, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(double****,LayoutStride,LayoutLeft,  KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(double****,LayoutStride,LayoutStride,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_DECL(double****,LayoutStride,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(double*****,LayoutStride,LayoutRight, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(double*****,LayoutStride,LayoutLeft,  KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(double*****,LayoutStride,LayoutStride,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_DECL(double*****,LayoutStride,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(double********,LayoutStride,LayoutRight, KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(double********,LayoutStride,LayoutLeft,  KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWCOPY_ETI_DECL(double********,LayoutStride,LayoutStride,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
-KOKKOS_IMPL_VIEWFILL_ETI_DECL(double********,LayoutStride,KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE,int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int*, LayoutLeft, LayoutRight,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int*, LayoutLeft, LayoutLeft,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int*, LayoutLeft, LayoutStride,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWFILL_ETI_DECL(int*, LayoutLeft,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int**, LayoutLeft, LayoutRight,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int**, LayoutLeft, LayoutLeft,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int**, LayoutLeft, LayoutStride,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWFILL_ETI_DECL(int**, LayoutLeft,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int***, LayoutLeft, LayoutRight,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int***, LayoutLeft, LayoutLeft,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int***, LayoutLeft, LayoutStride,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWFILL_ETI_DECL(int***, LayoutLeft,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int****, LayoutLeft, LayoutRight,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int****, LayoutLeft, LayoutLeft,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int****, LayoutLeft, LayoutStride,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWFILL_ETI_DECL(int****, LayoutLeft,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int*****, LayoutLeft, LayoutRight,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int*****, LayoutLeft, LayoutLeft,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int*****, LayoutLeft, LayoutStride,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWFILL_ETI_DECL(int*****, LayoutLeft,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int********, LayoutLeft, LayoutRight,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int********, LayoutLeft, LayoutLeft,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int********, LayoutLeft, LayoutStride,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWFILL_ETI_DECL(int********, LayoutLeft,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int*, LayoutRight, LayoutRight,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int*, LayoutRight, LayoutLeft,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int*, LayoutRight, LayoutStride,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWFILL_ETI_DECL(int*, LayoutRight,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int**, LayoutRight, LayoutRight,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int**, LayoutRight, LayoutLeft,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int**, LayoutRight, LayoutStride,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWFILL_ETI_DECL(int**, LayoutRight,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int***, LayoutRight, LayoutRight,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int***, LayoutRight, LayoutLeft,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int***, LayoutRight, LayoutStride,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWFILL_ETI_DECL(int***, LayoutRight,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int****, LayoutRight, LayoutRight,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int****, LayoutRight, LayoutLeft,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int****, LayoutRight, LayoutStride,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWFILL_ETI_DECL(int****, LayoutRight,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int*****, LayoutRight, LayoutRight,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int*****, LayoutRight, LayoutLeft,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int*****, LayoutRight, LayoutStride,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWFILL_ETI_DECL(int*****, LayoutRight,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int********, LayoutRight, LayoutRight,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int********, LayoutRight, LayoutLeft,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int********, LayoutRight, LayoutStride,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWFILL_ETI_DECL(int********, LayoutRight,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int*, LayoutStride, LayoutRight,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int*, LayoutStride, LayoutLeft,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int*, LayoutStride, LayoutStride,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWFILL_ETI_DECL(int*, LayoutStride,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int**, LayoutStride, LayoutRight,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int**, LayoutStride, LayoutLeft,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int**, LayoutStride, LayoutStride,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWFILL_ETI_DECL(int**, LayoutStride,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int***, LayoutStride, LayoutRight,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int***, LayoutStride, LayoutLeft,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int***, LayoutStride, LayoutStride,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWFILL_ETI_DECL(int***, LayoutStride,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int****, LayoutStride, LayoutRight,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int****, LayoutStride, LayoutLeft,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int****, LayoutStride, LayoutStride,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWFILL_ETI_DECL(int****, LayoutStride,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int*****, LayoutStride, LayoutRight,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int*****, LayoutStride, LayoutLeft,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int*****, LayoutStride, LayoutStride,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWFILL_ETI_DECL(int*****, LayoutStride,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int********, LayoutStride, LayoutRight,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int********, LayoutStride, LayoutLeft,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int********, LayoutStride, LayoutStride,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWFILL_ETI_DECL(int********, LayoutStride,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int*, LayoutLeft, LayoutRight,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int*, LayoutLeft, LayoutLeft,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int*, LayoutLeft, LayoutStride,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_DECL(int*, LayoutLeft,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int**, LayoutLeft, LayoutRight,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int**, LayoutLeft, LayoutLeft,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int**, LayoutLeft, LayoutStride,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_DECL(int**, LayoutLeft,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int***, LayoutLeft, LayoutRight,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int***, LayoutLeft, LayoutLeft,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int***, LayoutLeft, LayoutStride,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_DECL(int***, LayoutLeft,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int****, LayoutLeft, LayoutRight,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int****, LayoutLeft, LayoutLeft,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int****, LayoutLeft, LayoutStride,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_DECL(int****, LayoutLeft,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int*****, LayoutLeft, LayoutRight,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int*****, LayoutLeft, LayoutLeft,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int*****, LayoutLeft, LayoutStride,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_DECL(int*****, LayoutLeft,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int********, LayoutLeft, LayoutRight,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int********, LayoutLeft, LayoutLeft,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int********, LayoutLeft, LayoutStride,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_DECL(int********, LayoutLeft,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int*, LayoutRight, LayoutRight,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int*, LayoutRight, LayoutLeft,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int*, LayoutRight, LayoutStride,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_DECL(int*, LayoutRight,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int**, LayoutRight, LayoutRight,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int**, LayoutRight, LayoutLeft,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int**, LayoutRight, LayoutStride,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_DECL(int**, LayoutRight,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int***, LayoutRight, LayoutRight,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int***, LayoutRight, LayoutLeft,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int***, LayoutRight, LayoutStride,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_DECL(int***, LayoutRight,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int****, LayoutRight, LayoutRight,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int****, LayoutRight, LayoutLeft,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int****, LayoutRight, LayoutStride,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_DECL(int****, LayoutRight,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int*****, LayoutRight, LayoutRight,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int*****, LayoutRight, LayoutLeft,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int*****, LayoutRight, LayoutStride,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_DECL(int*****, LayoutRight,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int********, LayoutRight, LayoutRight,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int********, LayoutRight, LayoutLeft,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int********, LayoutRight, LayoutStride,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_DECL(int********, LayoutRight,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int*, LayoutStride, LayoutRight,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int*, LayoutStride, LayoutLeft,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int*, LayoutStride, LayoutStride,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_DECL(int*, LayoutStride,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int**, LayoutStride, LayoutRight,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int**, LayoutStride, LayoutLeft,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int**, LayoutStride, LayoutStride,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_DECL(int**, LayoutStride,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int***, LayoutStride, LayoutRight,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int***, LayoutStride, LayoutLeft,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int***, LayoutStride, LayoutStride,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_DECL(int***, LayoutStride,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int****, LayoutStride, LayoutRight,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int****, LayoutStride, LayoutLeft,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int****, LayoutStride, LayoutStride,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_DECL(int****, LayoutStride,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int*****, LayoutStride, LayoutRight,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int*****, LayoutStride, LayoutLeft,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int*****, LayoutStride, LayoutStride,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_DECL(int*****, LayoutStride,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int********, LayoutStride, LayoutRight,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int********, LayoutStride, LayoutLeft,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int********, LayoutStride, LayoutStride,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_DECL(int********, LayoutStride,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int64_t*, LayoutLeft, LayoutRight,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int64_t*, LayoutLeft, LayoutLeft,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int64_t*, LayoutLeft, LayoutStride,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWFILL_ETI_DECL(int64_t*, LayoutLeft,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int64_t**, LayoutLeft, LayoutRight,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int64_t**, LayoutLeft, LayoutLeft,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int64_t**, LayoutLeft, LayoutStride,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWFILL_ETI_DECL(int64_t**, LayoutLeft,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int64_t***, LayoutLeft, LayoutRight,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int64_t***, LayoutLeft, LayoutLeft,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int64_t***, LayoutLeft, LayoutStride,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWFILL_ETI_DECL(int64_t***, LayoutLeft,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int64_t****, LayoutLeft, LayoutRight,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int64_t****, LayoutLeft, LayoutLeft,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int64_t****, LayoutLeft, LayoutStride,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWFILL_ETI_DECL(int64_t****, LayoutLeft,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int64_t*****, LayoutLeft, LayoutRight,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int64_t*****, LayoutLeft, LayoutLeft,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int64_t*****, LayoutLeft, LayoutStride,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWFILL_ETI_DECL(int64_t*****, LayoutLeft,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int64_t********, LayoutLeft, LayoutRight,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int64_t********, LayoutLeft, LayoutLeft,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int64_t********, LayoutLeft, LayoutStride,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWFILL_ETI_DECL(int64_t********, LayoutLeft,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int64_t*, LayoutRight, LayoutRight,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int64_t*, LayoutRight, LayoutLeft,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int64_t*, LayoutRight, LayoutStride,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWFILL_ETI_DECL(int64_t*, LayoutRight,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int64_t**, LayoutRight, LayoutRight,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int64_t**, LayoutRight, LayoutLeft,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int64_t**, LayoutRight, LayoutStride,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWFILL_ETI_DECL(int64_t**, LayoutRight,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int64_t***, LayoutRight, LayoutRight,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int64_t***, LayoutRight, LayoutLeft,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int64_t***, LayoutRight, LayoutStride,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWFILL_ETI_DECL(int64_t***, LayoutRight,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int64_t****, LayoutRight, LayoutRight,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int64_t****, LayoutRight, LayoutLeft,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int64_t****, LayoutRight, LayoutStride,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWFILL_ETI_DECL(int64_t****, LayoutRight,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int64_t*****, LayoutRight, LayoutRight,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int64_t*****, LayoutRight, LayoutLeft,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int64_t*****, LayoutRight, LayoutStride,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWFILL_ETI_DECL(int64_t*****, LayoutRight,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int64_t********, LayoutRight, LayoutRight,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int64_t********, LayoutRight, LayoutLeft,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int64_t********, LayoutRight, LayoutStride,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWFILL_ETI_DECL(int64_t********, LayoutRight,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int64_t*, LayoutStride, LayoutRight,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int64_t*, LayoutStride, LayoutLeft,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int64_t*, LayoutStride, LayoutStride,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWFILL_ETI_DECL(int64_t*, LayoutStride,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int64_t**, LayoutStride, LayoutRight,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int64_t**, LayoutStride, LayoutLeft,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int64_t**, LayoutStride, LayoutStride,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWFILL_ETI_DECL(int64_t**, LayoutStride,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int64_t***, LayoutStride, LayoutRight,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int64_t***, LayoutStride, LayoutLeft,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int64_t***, LayoutStride, LayoutStride,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWFILL_ETI_DECL(int64_t***, LayoutStride,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int64_t****, LayoutStride, LayoutRight,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int64_t****, LayoutStride, LayoutLeft,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int64_t****, LayoutStride, LayoutStride,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWFILL_ETI_DECL(int64_t****, LayoutStride,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int64_t*****, LayoutStride, LayoutRight,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int64_t*****, LayoutStride, LayoutLeft,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int64_t*****, LayoutStride, LayoutStride,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWFILL_ETI_DECL(int64_t*****, LayoutStride,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int64_t********, LayoutStride, LayoutRight,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int64_t********, LayoutStride, LayoutLeft,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int64_t********, LayoutStride, LayoutStride,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWFILL_ETI_DECL(int64_t********, LayoutStride,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int64_t*, LayoutLeft, LayoutRight,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int64_t*, LayoutLeft, LayoutLeft,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int64_t*, LayoutLeft, LayoutStride,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_DECL(int64_t*, LayoutLeft,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int64_t**, LayoutLeft, LayoutRight,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int64_t**, LayoutLeft, LayoutLeft,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int64_t**, LayoutLeft, LayoutStride,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_DECL(int64_t**, LayoutLeft,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int64_t***, LayoutLeft, LayoutRight,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int64_t***, LayoutLeft, LayoutLeft,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int64_t***, LayoutLeft, LayoutStride,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_DECL(int64_t***, LayoutLeft,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int64_t****, LayoutLeft, LayoutRight,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int64_t****, LayoutLeft, LayoutLeft,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int64_t****, LayoutLeft, LayoutStride,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_DECL(int64_t****, LayoutLeft,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int64_t*****, LayoutLeft, LayoutRight,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int64_t*****, LayoutLeft, LayoutLeft,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int64_t*****, LayoutLeft, LayoutStride,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_DECL(int64_t*****, LayoutLeft,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int64_t********, LayoutLeft, LayoutRight,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int64_t********, LayoutLeft, LayoutLeft,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int64_t********, LayoutLeft, LayoutStride,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_DECL(int64_t********, LayoutLeft,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int64_t*, LayoutRight, LayoutRight,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int64_t*, LayoutRight, LayoutLeft,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int64_t*, LayoutRight, LayoutStride,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_DECL(int64_t*, LayoutRight,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int64_t**, LayoutRight, LayoutRight,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int64_t**, LayoutRight, LayoutLeft,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int64_t**, LayoutRight, LayoutStride,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_DECL(int64_t**, LayoutRight,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int64_t***, LayoutRight, LayoutRight,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int64_t***, LayoutRight, LayoutLeft,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int64_t***, LayoutRight, LayoutStride,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_DECL(int64_t***, LayoutRight,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int64_t****, LayoutRight, LayoutRight,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int64_t****, LayoutRight, LayoutLeft,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int64_t****, LayoutRight, LayoutStride,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_DECL(int64_t****, LayoutRight,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int64_t*****, LayoutRight, LayoutRight,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int64_t*****, LayoutRight, LayoutLeft,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int64_t*****, LayoutRight, LayoutStride,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_DECL(int64_t*****, LayoutRight,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int64_t********, LayoutRight, LayoutRight,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int64_t********, LayoutRight, LayoutLeft,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int64_t********, LayoutRight, LayoutStride,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_DECL(int64_t********, LayoutRight,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int64_t*, LayoutStride, LayoutRight,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int64_t*, LayoutStride, LayoutLeft,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int64_t*, LayoutStride, LayoutStride,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_DECL(int64_t*, LayoutStride,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int64_t**, LayoutStride, LayoutRight,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int64_t**, LayoutStride, LayoutLeft,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int64_t**, LayoutStride, LayoutStride,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_DECL(int64_t**, LayoutStride,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int64_t***, LayoutStride, LayoutRight,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int64_t***, LayoutStride, LayoutLeft,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int64_t***, LayoutStride, LayoutStride,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_DECL(int64_t***, LayoutStride,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int64_t****, LayoutStride, LayoutRight,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int64_t****, LayoutStride, LayoutLeft,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int64_t****, LayoutStride, LayoutStride,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_DECL(int64_t****, LayoutStride,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int64_t*****, LayoutStride, LayoutRight,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int64_t*****, LayoutStride, LayoutLeft,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int64_t*****, LayoutStride, LayoutStride,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_DECL(int64_t*****, LayoutStride,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int64_t********, LayoutStride, LayoutRight,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int64_t********, LayoutStride, LayoutLeft,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(int64_t********, LayoutStride, LayoutStride,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_DECL(int64_t********, LayoutStride,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(float*, LayoutLeft, LayoutRight,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(float*, LayoutLeft, LayoutLeft,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(float*, LayoutLeft, LayoutStride,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWFILL_ETI_DECL(float*, LayoutLeft,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(float**, LayoutLeft, LayoutRight,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(float**, LayoutLeft, LayoutLeft,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(float**, LayoutLeft, LayoutStride,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWFILL_ETI_DECL(float**, LayoutLeft,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(float***, LayoutLeft, LayoutRight,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(float***, LayoutLeft, LayoutLeft,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(float***, LayoutLeft, LayoutStride,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWFILL_ETI_DECL(float***, LayoutLeft,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(float****, LayoutLeft, LayoutRight,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(float****, LayoutLeft, LayoutLeft,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(float****, LayoutLeft, LayoutStride,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWFILL_ETI_DECL(float****, LayoutLeft,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(float*****, LayoutLeft, LayoutRight,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(float*****, LayoutLeft, LayoutLeft,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(float*****, LayoutLeft, LayoutStride,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWFILL_ETI_DECL(float*****, LayoutLeft,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(float********, LayoutLeft, LayoutRight,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(float********, LayoutLeft, LayoutLeft,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(float********, LayoutLeft, LayoutStride,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWFILL_ETI_DECL(float********, LayoutLeft,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(float*, LayoutRight, LayoutRight,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(float*, LayoutRight, LayoutLeft,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(float*, LayoutRight, LayoutStride,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWFILL_ETI_DECL(float*, LayoutRight,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(float**, LayoutRight, LayoutRight,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(float**, LayoutRight, LayoutLeft,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(float**, LayoutRight, LayoutStride,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWFILL_ETI_DECL(float**, LayoutRight,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(float***, LayoutRight, LayoutRight,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(float***, LayoutRight, LayoutLeft,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(float***, LayoutRight, LayoutStride,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWFILL_ETI_DECL(float***, LayoutRight,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(float****, LayoutRight, LayoutRight,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(float****, LayoutRight, LayoutLeft,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(float****, LayoutRight, LayoutStride,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWFILL_ETI_DECL(float****, LayoutRight,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(float*****, LayoutRight, LayoutRight,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(float*****, LayoutRight, LayoutLeft,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(float*****, LayoutRight, LayoutStride,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWFILL_ETI_DECL(float*****, LayoutRight,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(float********, LayoutRight, LayoutRight,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(float********, LayoutRight, LayoutLeft,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(float********, LayoutRight, LayoutStride,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWFILL_ETI_DECL(float********, LayoutRight,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(float*, LayoutStride, LayoutRight,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(float*, LayoutStride, LayoutLeft,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(float*, LayoutStride, LayoutStride,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWFILL_ETI_DECL(float*, LayoutStride,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(float**, LayoutStride, LayoutRight,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(float**, LayoutStride, LayoutLeft,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(float**, LayoutStride, LayoutStride,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWFILL_ETI_DECL(float**, LayoutStride,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(float***, LayoutStride, LayoutRight,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(float***, LayoutStride, LayoutLeft,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(float***, LayoutStride, LayoutStride,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWFILL_ETI_DECL(float***, LayoutStride,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(float****, LayoutStride, LayoutRight,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(float****, LayoutStride, LayoutLeft,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(float****, LayoutStride, LayoutStride,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWFILL_ETI_DECL(float****, LayoutStride,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(float*****, LayoutStride, LayoutRight,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(float*****, LayoutStride, LayoutLeft,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(float*****, LayoutStride, LayoutStride,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWFILL_ETI_DECL(float*****, LayoutStride,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(float********, LayoutStride, LayoutRight,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(float********, LayoutStride, LayoutLeft,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(float********, LayoutStride, LayoutStride,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWFILL_ETI_DECL(float********, LayoutStride,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(float*, LayoutLeft, LayoutRight,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(float*, LayoutLeft, LayoutLeft,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(float*, LayoutLeft, LayoutStride,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_DECL(float*, LayoutLeft,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(float**, LayoutLeft, LayoutRight,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(float**, LayoutLeft, LayoutLeft,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(float**, LayoutLeft, LayoutStride,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_DECL(float**, LayoutLeft,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(float***, LayoutLeft, LayoutRight,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(float***, LayoutLeft, LayoutLeft,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(float***, LayoutLeft, LayoutStride,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_DECL(float***, LayoutLeft,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(float****, LayoutLeft, LayoutRight,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(float****, LayoutLeft, LayoutLeft,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(float****, LayoutLeft, LayoutStride,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_DECL(float****, LayoutLeft,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(float*****, LayoutLeft, LayoutRight,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(float*****, LayoutLeft, LayoutLeft,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(float*****, LayoutLeft, LayoutStride,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_DECL(float*****, LayoutLeft,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(float********, LayoutLeft, LayoutRight,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(float********, LayoutLeft, LayoutLeft,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(float********, LayoutLeft, LayoutStride,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_DECL(float********, LayoutLeft,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(float*, LayoutRight, LayoutRight,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(float*, LayoutRight, LayoutLeft,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(float*, LayoutRight, LayoutStride,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_DECL(float*, LayoutRight,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(float**, LayoutRight, LayoutRight,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(float**, LayoutRight, LayoutLeft,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(float**, LayoutRight, LayoutStride,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_DECL(float**, LayoutRight,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(float***, LayoutRight, LayoutRight,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(float***, LayoutRight, LayoutLeft,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(float***, LayoutRight, LayoutStride,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_DECL(float***, LayoutRight,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(float****, LayoutRight, LayoutRight,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(float****, LayoutRight, LayoutLeft,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(float****, LayoutRight, LayoutStride,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_DECL(float****, LayoutRight,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(float*****, LayoutRight, LayoutRight,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(float*****, LayoutRight, LayoutLeft,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(float*****, LayoutRight, LayoutStride,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_DECL(float*****, LayoutRight,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(float********, LayoutRight, LayoutRight,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(float********, LayoutRight, LayoutLeft,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(float********, LayoutRight, LayoutStride,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_DECL(float********, LayoutRight,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(float*, LayoutStride, LayoutRight,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(float*, LayoutStride, LayoutLeft,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(float*, LayoutStride, LayoutStride,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_DECL(float*, LayoutStride,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(float**, LayoutStride, LayoutRight,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(float**, LayoutStride, LayoutLeft,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(float**, LayoutStride, LayoutStride,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_DECL(float**, LayoutStride,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(float***, LayoutStride, LayoutRight,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(float***, LayoutStride, LayoutLeft,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(float***, LayoutStride, LayoutStride,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_DECL(float***, LayoutStride,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(float****, LayoutStride, LayoutRight,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(float****, LayoutStride, LayoutLeft,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(float****, LayoutStride, LayoutStride,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_DECL(float****, LayoutStride,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(float*****, LayoutStride, LayoutRight,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(float*****, LayoutStride, LayoutLeft,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(float*****, LayoutStride, LayoutStride,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_DECL(float*****, LayoutStride,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(float********, LayoutStride, LayoutRight,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(float********, LayoutStride, LayoutLeft,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(float********, LayoutStride, LayoutStride,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_DECL(float********, LayoutStride,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(double*, LayoutLeft, LayoutRight,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(double*, LayoutLeft, LayoutLeft,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(double*, LayoutLeft, LayoutStride,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWFILL_ETI_DECL(double*, LayoutLeft,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(double**, LayoutLeft, LayoutRight,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(double**, LayoutLeft, LayoutLeft,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(double**, LayoutLeft, LayoutStride,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWFILL_ETI_DECL(double**, LayoutLeft,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(double***, LayoutLeft, LayoutRight,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(double***, LayoutLeft, LayoutLeft,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(double***, LayoutLeft, LayoutStride,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWFILL_ETI_DECL(double***, LayoutLeft,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(double****, LayoutLeft, LayoutRight,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(double****, LayoutLeft, LayoutLeft,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(double****, LayoutLeft, LayoutStride,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWFILL_ETI_DECL(double****, LayoutLeft,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(double*****, LayoutLeft, LayoutRight,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(double*****, LayoutLeft, LayoutLeft,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(double*****, LayoutLeft, LayoutStride,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWFILL_ETI_DECL(double*****, LayoutLeft,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(double********, LayoutLeft, LayoutRight,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(double********, LayoutLeft, LayoutLeft,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(double********, LayoutLeft, LayoutStride,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWFILL_ETI_DECL(double********, LayoutLeft,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(double*, LayoutRight, LayoutRight,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(double*, LayoutRight, LayoutLeft,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(double*, LayoutRight, LayoutStride,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWFILL_ETI_DECL(double*, LayoutRight,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(double**, LayoutRight, LayoutRight,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(double**, LayoutRight, LayoutLeft,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(double**, LayoutRight, LayoutStride,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWFILL_ETI_DECL(double**, LayoutRight,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(double***, LayoutRight, LayoutRight,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(double***, LayoutRight, LayoutLeft,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(double***, LayoutRight, LayoutStride,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWFILL_ETI_DECL(double***, LayoutRight,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(double****, LayoutRight, LayoutRight,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(double****, LayoutRight, LayoutLeft,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(double****, LayoutRight, LayoutStride,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWFILL_ETI_DECL(double****, LayoutRight,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(double*****, LayoutRight, LayoutRight,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(double*****, LayoutRight, LayoutLeft,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(double*****, LayoutRight, LayoutStride,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWFILL_ETI_DECL(double*****, LayoutRight,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(double********, LayoutRight, LayoutRight,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(double********, LayoutRight, LayoutLeft,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(double********, LayoutRight, LayoutStride,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWFILL_ETI_DECL(double********, LayoutRight,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(double*, LayoutStride, LayoutRight,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(double*, LayoutStride, LayoutLeft,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(double*, LayoutStride, LayoutStride,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWFILL_ETI_DECL(double*, LayoutStride,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(double**, LayoutStride, LayoutRight,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(double**, LayoutStride, LayoutLeft,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(double**, LayoutStride, LayoutStride,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWFILL_ETI_DECL(double**, LayoutStride,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(double***, LayoutStride, LayoutRight,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(double***, LayoutStride, LayoutLeft,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(double***, LayoutStride, LayoutStride,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWFILL_ETI_DECL(double***, LayoutStride,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(double****, LayoutStride, LayoutRight,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(double****, LayoutStride, LayoutLeft,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(double****, LayoutStride, LayoutStride,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWFILL_ETI_DECL(double****, LayoutStride,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(double*****, LayoutStride, LayoutRight,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(double*****, LayoutStride, LayoutLeft,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(double*****, LayoutStride, LayoutStride,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWFILL_ETI_DECL(double*****, LayoutStride,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(double********, LayoutStride, LayoutRight,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(double********, LayoutStride, LayoutLeft,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(double********, LayoutStride, LayoutStride,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWFILL_ETI_DECL(double********, LayoutStride,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(double*, LayoutLeft, LayoutRight,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(double*, LayoutLeft, LayoutLeft,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(double*, LayoutLeft, LayoutStride,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_DECL(double*, LayoutLeft,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(double**, LayoutLeft, LayoutRight,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(double**, LayoutLeft, LayoutLeft,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(double**, LayoutLeft, LayoutStride,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_DECL(double**, LayoutLeft,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(double***, LayoutLeft, LayoutRight,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(double***, LayoutLeft, LayoutLeft,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(double***, LayoutLeft, LayoutStride,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_DECL(double***, LayoutLeft,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(double****, LayoutLeft, LayoutRight,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(double****, LayoutLeft, LayoutLeft,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(double****, LayoutLeft, LayoutStride,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_DECL(double****, LayoutLeft,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(double*****, LayoutLeft, LayoutRight,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(double*****, LayoutLeft, LayoutLeft,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(double*****, LayoutLeft, LayoutStride,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_DECL(double*****, LayoutLeft,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(double********, LayoutLeft, LayoutRight,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(double********, LayoutLeft, LayoutLeft,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(double********, LayoutLeft, LayoutStride,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_DECL(double********, LayoutLeft,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(double*, LayoutRight, LayoutRight,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(double*, LayoutRight, LayoutLeft,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(double*, LayoutRight, LayoutStride,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_DECL(double*, LayoutRight,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(double**, LayoutRight, LayoutRight,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(double**, LayoutRight, LayoutLeft,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(double**, LayoutRight, LayoutStride,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_DECL(double**, LayoutRight,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(double***, LayoutRight, LayoutRight,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(double***, LayoutRight, LayoutLeft,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(double***, LayoutRight, LayoutStride,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_DECL(double***, LayoutRight,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(double****, LayoutRight, LayoutRight,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(double****, LayoutRight, LayoutLeft,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(double****, LayoutRight, LayoutStride,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_DECL(double****, LayoutRight,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(double*****, LayoutRight, LayoutRight,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(double*****, LayoutRight, LayoutLeft,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(double*****, LayoutRight, LayoutStride,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_DECL(double*****, LayoutRight,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(double********, LayoutRight, LayoutRight,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(double********, LayoutRight, LayoutLeft,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(double********, LayoutRight, LayoutStride,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_DECL(double********, LayoutRight,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(double*, LayoutStride, LayoutRight,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(double*, LayoutStride, LayoutLeft,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(double*, LayoutStride, LayoutStride,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_DECL(double*, LayoutStride,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(double**, LayoutStride, LayoutRight,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(double**, LayoutStride, LayoutLeft,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(double**, LayoutStride, LayoutStride,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_DECL(double**, LayoutStride,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(double***, LayoutStride, LayoutRight,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(double***, LayoutStride, LayoutLeft,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(double***, LayoutStride, LayoutStride,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_DECL(double***, LayoutStride,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(double****, LayoutStride, LayoutRight,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(double****, LayoutStride, LayoutLeft,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(double****, LayoutStride, LayoutStride,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_DECL(double****, LayoutStride,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(double*****, LayoutStride, LayoutRight,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(double*****, LayoutStride, LayoutLeft,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(double*****, LayoutStride, LayoutStride,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_DECL(double*****, LayoutStride,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(double********, LayoutStride, LayoutRight,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(double********, LayoutStride, LayoutLeft,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int64_t)
+KOKKOS_IMPL_VIEWCOPY_ETI_DECL(double********, LayoutStride, LayoutStride,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int64_t)
+KOKKOS_IMPL_VIEWFILL_ETI_DECL(double********, LayoutStride,
+                              KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL_EXECSPACE, int64_t)
diff --git a/lib/kokkos/core/src/impl/CMakeLists.txt b/lib/kokkos/core/src/impl/CMakeLists.txt
index c543194de3..2f6d8e78a3 100644
--- a/lib/kokkos/core/src/impl/CMakeLists.txt
+++ b/lib/kokkos/core/src/impl/CMakeLists.txt
@@ -1,18 +1,18 @@
-
-SET(HEADERS "")
-SET(SOURCES "")
-
-FILE(GLOB HEADERS *.hpp)
-FILE(GLOB SOURCES *.cpp)
-
-TRIBITS_ADD_LIBRARY(
-    kokkoscore_impl
-    NOINSTALLHEADERS ${HEADERS}
-    SOURCES ${SOURCES}
-    DEPLIBS 
-    )
-
-SET(TRILINOS_INCDIR ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR})
-
-INSTALL(FILES ${HEADERS} DESTINATION ${TRILINOS_INCDIR}/impl/)
-
+
+SET(HEADERS "")
+SET(SOURCES "")
+
+FILE(GLOB HEADERS *.hpp)
+FILE(GLOB SOURCES *.cpp)
+
+TRIBITS_ADD_LIBRARY(
+    kokkoscore_impl
+    NOINSTALLHEADERS ${HEADERS}
+    SOURCES ${SOURCES}
+    DEPLIBS 
+    )
+
+SET(TRILINOS_INCDIR ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR})
+
+INSTALL(FILES ${HEADERS} DESTINATION ${TRILINOS_INCDIR}/impl/)
+
diff --git a/lib/kokkos/core/src/impl/KokkosExp_Host_IterateTile.hpp b/lib/kokkos/core/src/impl/KokkosExp_Host_IterateTile.hpp
index f67d378572..09ed79a5fd 100644
--- a/lib/kokkos/core/src/impl/KokkosExp_Host_IterateTile.hpp
+++ b/lib/kokkos/core/src/impl/KokkosExp_Host_IterateTile.hpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -45,91 +46,83 @@
 #define KOKKOS_HOST_EXP_ITERATE_TILE_HPP
 
 #include <Kokkos_Macros.hpp>
-#if defined(KOKKOS_ENABLE_AGGRESSIVE_VECTORIZATION) && defined(KOKKOS_ENABLE_PRAGMA_IVDEP) && !defined(__CUDA_ARCH__)
+#if defined(KOKKOS_ENABLE_AGGRESSIVE_VECTORIZATION) && \
+    defined(KOKKOS_ENABLE_PRAGMA_IVDEP) && !defined(__CUDA_ARCH__)
 #define KOKKOS_MDRANGE_IVDEP
 #endif
 
 #ifdef KOKKOS_MDRANGE_IVDEP
- #define KOKKOS_ENABLE_IVDEP_MDRANGE _Pragma("ivdep")
+#define KOKKOS_ENABLE_IVDEP_MDRANGE _Pragma("ivdep")
 #else
- #define KOKKOS_ENABLE_IVDEP_MDRANGE
+#define KOKKOS_ENABLE_IVDEP_MDRANGE
 #endif
 
 #include <iostream>
 #include <algorithm>
 #include <cstdio>
 
-namespace Kokkos { namespace Impl {
+namespace Kokkos {
+namespace Impl {
 
 // Temporary, for testing new loop macros
 #define KOKKOS_ENABLE_NEW_LOOP_MACROS 1
 
-
-#define LOOP_1L(type, tile) \
+#define LOOP_1L(type, tile)   \
   KOKKOS_ENABLE_IVDEP_MDRANGE \
-  for( type i0=0; i0<static_cast<type>(tile[0]); ++i0)
+  for (type i0 = 0; i0 < static_cast<type>(tile[0]); ++i0)
 
 #define LOOP_2L(type, tile) \
-  for( type i1=0; i1<static_cast<type>(tile[1]); ++i1) \
-  LOOP_1L(type, tile)
+  for (type i1 = 0; i1 < static_cast<type>(tile[1]); ++i1) LOOP_1L(type, tile)
 
 #define LOOP_3L(type, tile) \
-  for( type i2=0; i2<static_cast<type>(tile[2]); ++i2) \
-  LOOP_2L(type, tile)
+  for (type i2 = 0; i2 < static_cast<type>(tile[2]); ++i2) LOOP_2L(type, tile)
 
 #define LOOP_4L(type, tile) \
-  for( type i3=0; i3<static_cast<type>(tile[3]); ++i3) \
-  LOOP_3L(type, tile)
+  for (type i3 = 0; i3 < static_cast<type>(tile[3]); ++i3) LOOP_3L(type, tile)
 
 #define LOOP_5L(type, tile) \
-  for( type i4=0; i4<static_cast<type>(tile[4]); ++i4) \
-  LOOP_4L(type, tile)
+  for (type i4 = 0; i4 < static_cast<type>(tile[4]); ++i4) LOOP_4L(type, tile)
 
 #define LOOP_6L(type, tile) \
-  for( type i5=0; i5<static_cast<type>(tile[5]); ++i5) \
-  LOOP_5L(type, tile)
+  for (type i5 = 0; i5 < static_cast<type>(tile[5]); ++i5) LOOP_5L(type, tile)
 
 #define LOOP_7L(type, tile) \
-  for( type i6=0; i6<static_cast<type>(tile[6]); ++i6) \
-  LOOP_6L(type, tile)
+  for (type i6 = 0; i6 < static_cast<type>(tile[6]); ++i6) LOOP_6L(type, tile)
 
 #define LOOP_8L(type, tile) \
-  for( type i7=0; i7<static_cast<type>(tile[7]); ++i7) \
-  LOOP_7L(type, tile)
+  for (type i7 = 0; i7 < static_cast<type>(tile[7]); ++i7) LOOP_7L(type, tile)
 
-
-#define LOOP_1R(type, tile) \
+#define LOOP_1R(type, tile)   \
   KOKKOS_ENABLE_IVDEP_MDRANGE \
-  for ( type i0=0; i0<static_cast<type>(tile[0]); ++i0 )
+  for (type i0 = 0; i0 < static_cast<type>(tile[0]); ++i0)
 
 #define LOOP_2R(type, tile) \
-  LOOP_1R(type, tile) \
-  for ( type i1=0; i1<static_cast<type>(tile[1]); ++i1 )
+  LOOP_1R(type, tile)       \
+  for (type i1 = 0; i1 < static_cast<type>(tile[1]); ++i1)
 
 #define LOOP_3R(type, tile) \
-  LOOP_2R(type, tile) \
-  for ( type i2=0; i2<static_cast<type>(tile[2]); ++i2 )
+  LOOP_2R(type, tile)       \
+  for (type i2 = 0; i2 < static_cast<type>(tile[2]); ++i2)
 
 #define LOOP_4R(type, tile) \
-  LOOP_3R(type, tile) \
-  for ( type i3=0; i3<static_cast<type>(tile[3]); ++i3 )
+  LOOP_3R(type, tile)       \
+  for (type i3 = 0; i3 < static_cast<type>(tile[3]); ++i3)
 
 #define LOOP_5R(type, tile) \
-  LOOP_4R(type, tile) \
-  for ( type i4=0; i4<static_cast<type>(tile[4]); ++i4 )
+  LOOP_4R(type, tile)       \
+  for (type i4 = 0; i4 < static_cast<type>(tile[4]); ++i4)
 
 #define LOOP_6R(type, tile) \
-  LOOP_5R(type, tile) \
-  for ( type i5=0; i5<static_cast<type>(tile[5]); ++i5 )
+  LOOP_5R(type, tile)       \
+  for (type i5 = 0; i5 < static_cast<type>(tile[5]); ++i5)
 
 #define LOOP_7R(type, tile) \
-  LOOP_6R(type, tile) \
-  for ( type i6=0; i6<static_cast<type>(tile[6]); ++i6 )
+  LOOP_6R(type, tile)       \
+  for (type i6 = 0; i6 < static_cast<type>(tile[6]); ++i6)
 
 #define LOOP_8R(type, tile) \
-  LOOP_7R(type, tile) \
-  for ( type i7=0; i7<static_cast<type>(tile[7]); ++i7 )
-
+  LOOP_7R(type, tile)       \
+  for (type i7 = 0; i7 < static_cast<type>(tile[7]); ++i7)
 
 #define LOOP_ARGS_1 i0 + m_offset[0]
 #define LOOP_ARGS_2 LOOP_ARGS_1, i1 + m_offset[1]
@@ -140,2609 +133,2664 @@ namespace Kokkos { namespace Impl {
 #define LOOP_ARGS_7 LOOP_ARGS_6, i6 + m_offset[6]
 #define LOOP_ARGS_8 LOOP_ARGS_7, i7 + m_offset[7]
 
-
 // New Loop Macros...
 // parallel_for, non-tagged
-#define APPLY( func, ... ) \
-  func( __VA_ARGS__ );
+#define APPLY(func, ...) func(__VA_ARGS__);
 
 // LayoutRight
 // d = 0 to start
-#define LOOP_R_1( func, type, m_offset, extent, d, ... )    \
-  KOKKOS_ENABLE_IVDEP_MDRANGE                            \
-  for( type i0 = (type)0; i0 < static_cast<type>(extent[d]); ++i0) { \
-    APPLY( func, __VA_ARGS__, i0 + m_offset[d] )              \
+#define LOOP_R_1(func, type, m_offset, extent, d, ...)               \
+  KOKKOS_ENABLE_IVDEP_MDRANGE                                        \
+  for (type i0 = (type)0; i0 < static_cast<type>(extent[d]); ++i0) { \
+    APPLY(func, __VA_ARGS__, i0 + m_offset[d])                       \
   }
 
-#define LOOP_R_2( func, type, m_offset, extent, d, ... )             \
-  for( type i1 = (type)0; i1 < static_cast<type>(extent[d]); ++i1) {          \
-    LOOP_R_1( func, type, m_offset, extent, d+1 , __VA_ARGS__, i1 + m_offset[d] ) \
+#define LOOP_R_2(func, type, m_offset, extent, d, ...)               \
+  for (type i1 = (type)0; i1 < static_cast<type>(extent[d]); ++i1) { \
+    LOOP_R_1(func, type, m_offset, extent, d + 1, __VA_ARGS__,       \
+             i1 + m_offset[d])                                       \
   }
 
-#define LOOP_R_3( func, type, m_offset, extent, d, ... )             \
-  for( type i2 = (type)0; i2 < static_cast<type>(extent[d]); ++i2) {          \
-    LOOP_R_2( func, type, m_offset, extent, d+1 , __VA_ARGS__, i2 + m_offset[d] ) \
+#define LOOP_R_3(func, type, m_offset, extent, d, ...)               \
+  for (type i2 = (type)0; i2 < static_cast<type>(extent[d]); ++i2) { \
+    LOOP_R_2(func, type, m_offset, extent, d + 1, __VA_ARGS__,       \
+             i2 + m_offset[d])                                       \
   }
 
-#define LOOP_R_4( func, type, m_offset, extent, d, ... )             \
-  for( type i3 = (type)0; i3 < static_cast<type>(extent[d]); ++i3) {          \
-    LOOP_R_3( func, type, m_offset, extent, d+1 , __VA_ARGS__, i3 + m_offset[d] ) \
+#define LOOP_R_4(func, type, m_offset, extent, d, ...)               \
+  for (type i3 = (type)0; i3 < static_cast<type>(extent[d]); ++i3) { \
+    LOOP_R_3(func, type, m_offset, extent, d + 1, __VA_ARGS__,       \
+             i3 + m_offset[d])                                       \
   }
 
-#define LOOP_R_5( func, type, m_offset, extent, d, ... )             \
-  for( type i4 = (type)0; i4 < static_cast<type>(extent[d]); ++i4) {          \
-    LOOP_R_4( func, type, m_offset, extent, d+1 , __VA_ARGS__, i4 + m_offset[d] ) \
+#define LOOP_R_5(func, type, m_offset, extent, d, ...)               \
+  for (type i4 = (type)0; i4 < static_cast<type>(extent[d]); ++i4) { \
+    LOOP_R_4(func, type, m_offset, extent, d + 1, __VA_ARGS__,       \
+             i4 + m_offset[d])                                       \
   }
 
-#define LOOP_R_6( func, type, m_offset, extent, d, ... )             \
-  for( type i5 = (type)0; i5 < static_cast<type>(extent[d]); ++i5) {          \
-    LOOP_R_5( func, type, m_offset, extent, d+1 , __VA_ARGS__, i5 + m_offset[d] ) \
+#define LOOP_R_6(func, type, m_offset, extent, d, ...)               \
+  for (type i5 = (type)0; i5 < static_cast<type>(extent[d]); ++i5) { \
+    LOOP_R_5(func, type, m_offset, extent, d + 1, __VA_ARGS__,       \
+             i5 + m_offset[d])                                       \
   }
 
-#define LOOP_R_7( func, type, m_offset, extent, d, ... )             \
-  for( type i6 = (type)0; i6 < static_cast<type>(extent[d]); ++i6) {          \
-    LOOP_R_6( func, type, m_offset, extent, d+1 , __VA_ARGS__, i6 + m_offset[d] ) \
+#define LOOP_R_7(func, type, m_offset, extent, d, ...)               \
+  for (type i6 = (type)0; i6 < static_cast<type>(extent[d]); ++i6) { \
+    LOOP_R_6(func, type, m_offset, extent, d + 1, __VA_ARGS__,       \
+             i6 + m_offset[d])                                       \
   }
 
-#define LOOP_R_8( func, type, m_offset, extent, d, ... )             \
-  for( type i7 = (type)0; i7 < static_cast<type>(extent[d]); ++i7) {          \
-    LOOP_R_7( func, type, m_offset, extent, d+1 , __VA_ARGS__, i7 + m_offset[d] ) \
+#define LOOP_R_8(func, type, m_offset, extent, d, ...)               \
+  for (type i7 = (type)0; i7 < static_cast<type>(extent[d]); ++i7) { \
+    LOOP_R_7(func, type, m_offset, extent, d + 1, __VA_ARGS__,       \
+             i7 + m_offset[d])                                       \
   }
 
-//LayoutLeft
+// LayoutLeft
 // d = rank-1 to start
-#define LOOP_L_1( func, type, m_offset, extent, d, ... )    \
-  KOKKOS_ENABLE_IVDEP_MDRANGE                            \
-  for( type i0 = (type)0; i0 < static_cast<type>(extent[d]); ++i0) { \
-    APPLY( func, i0 + m_offset[d] , __VA_ARGS__ )              \
+#define LOOP_L_1(func, type, m_offset, extent, d, ...)               \
+  KOKKOS_ENABLE_IVDEP_MDRANGE                                        \
+  for (type i0 = (type)0; i0 < static_cast<type>(extent[d]); ++i0) { \
+    APPLY(func, i0 + m_offset[d], __VA_ARGS__)                       \
   }
 
-#define LOOP_L_2( func, type, m_offset, extent, d, ... )             \
-  for( type i1 = (type)0; i1 < static_cast<type>(extent[d]); ++i1) {          \
-    LOOP_L_1( func, type, m_offset, extent, d-1, i1 + m_offset[d] , __VA_ARGS__ ) \
+#define LOOP_L_2(func, type, m_offset, extent, d, ...)               \
+  for (type i1 = (type)0; i1 < static_cast<type>(extent[d]); ++i1) { \
+    LOOP_L_1(func, type, m_offset, extent, d - 1, i1 + m_offset[d],  \
+             __VA_ARGS__)                                            \
   }
 
-#define LOOP_L_3( func, type, m_offset, extent, d, ... )             \
-  for( type i2 = (type)0; i2 < static_cast<type>(extent[d]); ++i2) {          \
-    LOOP_L_2( func, type, m_offset, extent, d-1, i2 + m_offset[d] , __VA_ARGS__ ) \
+#define LOOP_L_3(func, type, m_offset, extent, d, ...)               \
+  for (type i2 = (type)0; i2 < static_cast<type>(extent[d]); ++i2) { \
+    LOOP_L_2(func, type, m_offset, extent, d - 1, i2 + m_offset[d],  \
+             __VA_ARGS__)                                            \
   }
 
-#define LOOP_L_4( func, type, m_offset, extent, d, ... )             \
-  for( type i3 = (type)0; i3 < static_cast<type>(extent[d]); ++i3) {          \
-    LOOP_L_3( func, type, m_offset, extent, d-1, i3 + m_offset[d] , __VA_ARGS__ ) \
+#define LOOP_L_4(func, type, m_offset, extent, d, ...)               \
+  for (type i3 = (type)0; i3 < static_cast<type>(extent[d]); ++i3) { \
+    LOOP_L_3(func, type, m_offset, extent, d - 1, i3 + m_offset[d],  \
+             __VA_ARGS__)                                            \
   }
 
-#define LOOP_L_5( func, type, m_offset, extent, d, ... )             \
-  for( type i4 = (type)0; i4 < static_cast<type>(extent[d]); ++i4) {          \
-    LOOP_L_4( func, type, m_offset, extent, d-1, i4 + m_offset[d] , __VA_ARGS__ ) \
+#define LOOP_L_5(func, type, m_offset, extent, d, ...)               \
+  for (type i4 = (type)0; i4 < static_cast<type>(extent[d]); ++i4) { \
+    LOOP_L_4(func, type, m_offset, extent, d - 1, i4 + m_offset[d],  \
+             __VA_ARGS__)                                            \
   }
 
-#define LOOP_L_6( func, type, m_offset, extent, d, ... )             \
-  for( type i5 = (type)0; i5 < static_cast<type>(extent[d]); ++i5) {          \
-    LOOP_L_5( func, type, m_offset, extent, d-1, i5 + m_offset[d] , __VA_ARGS__ ) \
+#define LOOP_L_6(func, type, m_offset, extent, d, ...)               \
+  for (type i5 = (type)0; i5 < static_cast<type>(extent[d]); ++i5) { \
+    LOOP_L_5(func, type, m_offset, extent, d - 1, i5 + m_offset[d],  \
+             __VA_ARGS__)                                            \
   }
 
-#define LOOP_L_7( func, type, m_offset, extent, d, ... )             \
-  for( type i6 = (type)0; i6 < static_cast<type>(extent[d]); ++i6) {          \
-    LOOP_L_6( func, type, m_offset, extent, d-1, i6 + m_offset[d] , __VA_ARGS__ ) \
+#define LOOP_L_7(func, type, m_offset, extent, d, ...)               \
+  for (type i6 = (type)0; i6 < static_cast<type>(extent[d]); ++i6) { \
+    LOOP_L_6(func, type, m_offset, extent, d - 1, i6 + m_offset[d],  \
+             __VA_ARGS__)                                            \
   }
 
-#define LOOP_L_8( func, type, m_offset, extent, d, ... )             \
-  for( type i7 = (type)0; i7 < static_cast<type>(extent[d]); ++i7) {          \
-    LOOP_L_7( func, type, m_offset, extent, d-1, i7 + m_offset[d] , __VA_ARGS__ ) \
+#define LOOP_L_8(func, type, m_offset, extent, d, ...)               \
+  for (type i7 = (type)0; i7 < static_cast<type>(extent[d]); ++i7) { \
+    LOOP_L_7(func, type, m_offset, extent, d - 1, i7 + m_offset[d],  \
+             __VA_ARGS__)                                            \
   }
 
 // Left vs Right
 // TODO: rank not necessary to pass through, can hardcode the values
-#define LOOP_LAYOUT_1( func, type, is_left, m_offset, extent, rank )  \
-  KOKKOS_ENABLE_IVDEP_MDRANGE                            \
-  for( type i0 = (type)0; i0 < static_cast<type>(extent[0]); ++i0) { \
-    APPLY( func, i0 + m_offset[0] )              \
+#define LOOP_LAYOUT_1(func, type, is_left, m_offset, extent, rank)   \
+  KOKKOS_ENABLE_IVDEP_MDRANGE                                        \
+  for (type i0 = (type)0; i0 < static_cast<type>(extent[0]); ++i0) { \
+    APPLY(func, i0 + m_offset[0])                                    \
   }
 
-#define LOOP_LAYOUT_2( func, type, is_left, m_offset, extent, rank )  \
-  if (is_left) { \
-    for( type i1 = (type)0; i1 < static_cast<type>(extent[rank-1]); ++i1) {   \
-      LOOP_L_1( func, type, m_offset, extent, rank-2, i1 + m_offset[rank-1] ) \
-    } \
-  } \
-  else         { \
-    for( type i1 = (type)0; i1 < static_cast<type>(extent[0]); ++i1) { \
-      LOOP_R_1( func, type, m_offset, extent, 1 , i1 + m_offset[0] )   \
-    } \
+#define LOOP_LAYOUT_2(func, type, is_left, m_offset, extent, rank)            \
+  if (is_left) {                                                              \
+    for (type i1 = (type)0; i1 < static_cast<type>(extent[rank - 1]); ++i1) { \
+      LOOP_L_1(func, type, m_offset, extent, rank - 2,                        \
+               i1 + m_offset[rank - 1])                                       \
+    }                                                                         \
+  } else {                                                                    \
+    for (type i1 = (type)0; i1 < static_cast<type>(extent[0]); ++i1) {        \
+      LOOP_R_1(func, type, m_offset, extent, 1, i1 + m_offset[0])             \
+    }                                                                         \
   }
 
-#define LOOP_LAYOUT_3( func, type, is_left, m_offset, extent, rank )  \
-  if (is_left) { \
-    for( type i2 = (type)0; i2 < static_cast<type>(extent[rank-1]); ++i2) {   \
-      LOOP_L_2( func, type, m_offset, extent, rank-2, i2 + m_offset[rank-1] ) \
-    } \
-  } \
-  else         { \
-    for( type i2 = (type)0; i2 < static_cast<type>(extent[0]); ++i2) { \
-      LOOP_R_2( func, type, m_offset, extent, 1 , i2 + m_offset[0] )   \
-    } \
+#define LOOP_LAYOUT_3(func, type, is_left, m_offset, extent, rank)            \
+  if (is_left) {                                                              \
+    for (type i2 = (type)0; i2 < static_cast<type>(extent[rank - 1]); ++i2) { \
+      LOOP_L_2(func, type, m_offset, extent, rank - 2,                        \
+               i2 + m_offset[rank - 1])                                       \
+    }                                                                         \
+  } else {                                                                    \
+    for (type i2 = (type)0; i2 < static_cast<type>(extent[0]); ++i2) {        \
+      LOOP_R_2(func, type, m_offset, extent, 1, i2 + m_offset[0])             \
+    }                                                                         \
   }
 
-#define LOOP_LAYOUT_4( func, type, is_left, m_offset, extent, rank )  \
-  if (is_left) { \
-    for( type i3 = (type)0; i3 < static_cast<type>(extent[rank-1]); ++i3) {   \
-      LOOP_L_3( func, type, m_offset, extent, rank-2, i3 + m_offset[rank-1] ) \
-    } \
-  } \
-  else         { \
-    for( type i3 = (type)0; i3 < static_cast<type>(extent[0]); ++i3) { \
-      LOOP_R_3( func, type, m_offset, extent, 1 , i3 + m_offset[0] )   \
-    } \
+#define LOOP_LAYOUT_4(func, type, is_left, m_offset, extent, rank)            \
+  if (is_left) {                                                              \
+    for (type i3 = (type)0; i3 < static_cast<type>(extent[rank - 1]); ++i3) { \
+      LOOP_L_3(func, type, m_offset, extent, rank - 2,                        \
+               i3 + m_offset[rank - 1])                                       \
+    }                                                                         \
+  } else {                                                                    \
+    for (type i3 = (type)0; i3 < static_cast<type>(extent[0]); ++i3) {        \
+      LOOP_R_3(func, type, m_offset, extent, 1, i3 + m_offset[0])             \
+    }                                                                         \
   }
 
-#define LOOP_LAYOUT_5( func, type, is_left, m_offset, extent, rank )  \
-  if (is_left) { \
-    for( type i4 = (type)0; i4 < static_cast<type>(extent[rank-1]); ++i4) {   \
-      LOOP_L_4( func, type, m_offset, extent, rank-2, i4 + m_offset[rank-1] ) \
-    } \
-  } \
-  else         { \
-    for( type i4 = (type)0; i4 < static_cast<type>(extent[0]); ++i4) { \
-      LOOP_R_4( func, type, m_offset, extent, 1 , i4 + m_offset[0] )   \
-    } \
+#define LOOP_LAYOUT_5(func, type, is_left, m_offset, extent, rank)            \
+  if (is_left) {                                                              \
+    for (type i4 = (type)0; i4 < static_cast<type>(extent[rank - 1]); ++i4) { \
+      LOOP_L_4(func, type, m_offset, extent, rank - 2,                        \
+               i4 + m_offset[rank - 1])                                       \
+    }                                                                         \
+  } else {                                                                    \
+    for (type i4 = (type)0; i4 < static_cast<type>(extent[0]); ++i4) {        \
+      LOOP_R_4(func, type, m_offset, extent, 1, i4 + m_offset[0])             \
+    }                                                                         \
   }
 
-#define LOOP_LAYOUT_6( func, type, is_left, m_offset, extent, rank )  \
-  if (is_left) { \
-    for( type i5 = (type)0; i5 < static_cast<type>(extent[rank-1]); ++i5) {   \
-      LOOP_L_5( func, type, m_offset, extent, rank-2, i5 + m_offset[rank-1] ) \
-    } \
-  } \
-  else         { \
-    for( type i5 = (type)0; i5 < static_cast<type>(extent[0]); ++i5) { \
-      LOOP_R_5( func, type, m_offset, extent, 1 , i5 + m_offset[0] )   \
-    } \
+#define LOOP_LAYOUT_6(func, type, is_left, m_offset, extent, rank)            \
+  if (is_left) {                                                              \
+    for (type i5 = (type)0; i5 < static_cast<type>(extent[rank - 1]); ++i5) { \
+      LOOP_L_5(func, type, m_offset, extent, rank - 2,                        \
+               i5 + m_offset[rank - 1])                                       \
+    }                                                                         \
+  } else {                                                                    \
+    for (type i5 = (type)0; i5 < static_cast<type>(extent[0]); ++i5) {        \
+      LOOP_R_5(func, type, m_offset, extent, 1, i5 + m_offset[0])             \
+    }                                                                         \
   }
 
-#define LOOP_LAYOUT_7( func, type, is_left, m_offset, extent, rank )  \
-  if (is_left) { \
-    for( type i6 = (type)0; i6 < static_cast<type>(extent[rank-1]); ++i6) {   \
-      LOOP_L_6( func, type, m_offset, extent, rank-2, i6 + m_offset[rank-1] ) \
-    } \
-  } \
-  else         { \
-    for( type i6 = (type)0; i6 < static_cast<type>(extent[0]); ++i6) { \
-      LOOP_R_6( func, type, m_offset, extent, 1 , i6 + m_offset[0] )   \
-    } \
+#define LOOP_LAYOUT_7(func, type, is_left, m_offset, extent, rank)            \
+  if (is_left) {                                                              \
+    for (type i6 = (type)0; i6 < static_cast<type>(extent[rank - 1]); ++i6) { \
+      LOOP_L_6(func, type, m_offset, extent, rank - 2,                        \
+               i6 + m_offset[rank - 1])                                       \
+    }                                                                         \
+  } else {                                                                    \
+    for (type i6 = (type)0; i6 < static_cast<type>(extent[0]); ++i6) {        \
+      LOOP_R_6(func, type, m_offset, extent, 1, i6 + m_offset[0])             \
+    }                                                                         \
   }
 
-#define LOOP_LAYOUT_8( func, type, is_left, m_offset, extent, rank )  \
-  if (is_left) { \
-    for( type i7 = (type)0; i7 < static_cast<type>(extent[rank-1]); ++i7) {   \
-      LOOP_L_7( func, type, m_offset, extent, rank-2, i7 + m_offset[rank-1] ) \
-    } \
-  } \
-  else         { \
-    for( type i7 = (type)0; i7 < static_cast<type>(extent[0]); ++i7) { \
-      LOOP_R_7( func, type, m_offset, extent, 1 , i7 + m_offset[0] )   \
-    } \
+#define LOOP_LAYOUT_8(func, type, is_left, m_offset, extent, rank)            \
+  if (is_left) {                                                              \
+    for (type i7 = (type)0; i7 < static_cast<type>(extent[rank - 1]); ++i7) { \
+      LOOP_L_7(func, type, m_offset, extent, rank - 2,                        \
+               i7 + m_offset[rank - 1])                                       \
+    }                                                                         \
+  } else {                                                                    \
+    for (type i7 = (type)0; i7 < static_cast<type>(extent[0]); ++i7) {        \
+      LOOP_R_7(func, type, m_offset, extent, 1, i7 + m_offset[0])             \
+    }                                                                         \
   }
 
 // Partial vs Full Tile
-#define TILE_LOOP_1( func, type, is_left, cond, m_offset, extent_full, extent_partial, rank ) \
-  if (cond) { LOOP_LAYOUT_1( func, type, is_left, m_offset, extent_full, rank ) } \
-  else      { LOOP_LAYOUT_1( func, type, is_left, m_offset, extent_partial, rank ) }
+#define TILE_LOOP_1(func, type, is_left, cond, m_offset, extent_full,  \
+                    extent_partial, rank)                              \
+  if (cond) {                                                          \
+    LOOP_LAYOUT_1(func, type, is_left, m_offset, extent_full, rank)    \
+  } else {                                                             \
+    LOOP_LAYOUT_1(func, type, is_left, m_offset, extent_partial, rank) \
+  }
 
-#define TILE_LOOP_2( func, type, is_left, cond, m_offset, extent_full, extent_partial, rank ) \
-  if (cond) { LOOP_LAYOUT_2( func, type, is_left, m_offset, extent_full, rank ) } \
-  else      { LOOP_LAYOUT_2( func, type, is_left, m_offset, extent_partial, rank ) }
+#define TILE_LOOP_2(func, type, is_left, cond, m_offset, extent_full,  \
+                    extent_partial, rank)                              \
+  if (cond) {                                                          \
+    LOOP_LAYOUT_2(func, type, is_left, m_offset, extent_full, rank)    \
+  } else {                                                             \
+    LOOP_LAYOUT_2(func, type, is_left, m_offset, extent_partial, rank) \
+  }
 
-#define TILE_LOOP_3( func, type, is_left, cond, m_offset, extent_full, extent_partial, rank ) \
-  if (cond) { LOOP_LAYOUT_3( func, type, is_left, m_offset, extent_full, rank ) } \
-  else      { LOOP_LAYOUT_3( func, type, is_left, m_offset, extent_partial, rank ) }
+#define TILE_LOOP_3(func, type, is_left, cond, m_offset, extent_full,  \
+                    extent_partial, rank)                              \
+  if (cond) {                                                          \
+    LOOP_LAYOUT_3(func, type, is_left, m_offset, extent_full, rank)    \
+  } else {                                                             \
+    LOOP_LAYOUT_3(func, type, is_left, m_offset, extent_partial, rank) \
+  }
 
-#define TILE_LOOP_4( func, type, is_left, cond, m_offset, extent_full, extent_partial, rank ) \
-  if (cond) { LOOP_LAYOUT_4( func, type, is_left, m_offset, extent_full, rank ) } \
-  else      { LOOP_LAYOUT_4( func, type, is_left, m_offset, extent_partial, rank ) }
+#define TILE_LOOP_4(func, type, is_left, cond, m_offset, extent_full,  \
+                    extent_partial, rank)                              \
+  if (cond) {                                                          \
+    LOOP_LAYOUT_4(func, type, is_left, m_offset, extent_full, rank)    \
+  } else {                                                             \
+    LOOP_LAYOUT_4(func, type, is_left, m_offset, extent_partial, rank) \
+  }
 
-#define TILE_LOOP_5( func, type, is_left, cond, m_offset, extent_full, extent_partial, rank ) \
-  if (cond) { LOOP_LAYOUT_5( func, type, is_left, m_offset, extent_full, rank ) } \
-  else      { LOOP_LAYOUT_5( func, type, is_left, m_offset, extent_partial, rank ) }
+#define TILE_LOOP_5(func, type, is_left, cond, m_offset, extent_full,  \
+                    extent_partial, rank)                              \
+  if (cond) {                                                          \
+    LOOP_LAYOUT_5(func, type, is_left, m_offset, extent_full, rank)    \
+  } else {                                                             \
+    LOOP_LAYOUT_5(func, type, is_left, m_offset, extent_partial, rank) \
+  }
 
-#define TILE_LOOP_6( func, type, is_left, cond, m_offset, extent_full, extent_partial, rank ) \
-  if (cond) { LOOP_LAYOUT_6( func, type, is_left, m_offset, extent_full, rank ) } \
-  else      { LOOP_LAYOUT_6( func, type, is_left, m_offset, extent_partial, rank ) }
+#define TILE_LOOP_6(func, type, is_left, cond, m_offset, extent_full,  \
+                    extent_partial, rank)                              \
+  if (cond) {                                                          \
+    LOOP_LAYOUT_6(func, type, is_left, m_offset, extent_full, rank)    \
+  } else {                                                             \
+    LOOP_LAYOUT_6(func, type, is_left, m_offset, extent_partial, rank) \
+  }
 
-#define TILE_LOOP_7( func, type, is_left, cond, m_offset, extent_full, extent_partial, rank ) \
-  if (cond) { LOOP_LAYOUT_7( func, type, is_left, m_offset, extent_full, rank ) } \
-  else      { LOOP_LAYOUT_7( func, type, is_left, m_offset, extent_partial, rank ) }
-
-#define TILE_LOOP_8( func, type, is_left, cond, m_offset, extent_full, extent_partial, rank ) \
-  if (cond) { LOOP_LAYOUT_8( func, type, is_left, m_offset, extent_full, rank ) } \
-  else      { LOOP_LAYOUT_8( func, type, is_left, m_offset, extent_partial, rank ) }
+#define TILE_LOOP_7(func, type, is_left, cond, m_offset, extent_full,  \
+                    extent_partial, rank)                              \
+  if (cond) {                                                          \
+    LOOP_LAYOUT_7(func, type, is_left, m_offset, extent_full, rank)    \
+  } else {                                                             \
+    LOOP_LAYOUT_7(func, type, is_left, m_offset, extent_partial, rank) \
+  }
 
+#define TILE_LOOP_8(func, type, is_left, cond, m_offset, extent_full,  \
+                    extent_partial, rank)                              \
+  if (cond) {                                                          \
+    LOOP_LAYOUT_8(func, type, is_left, m_offset, extent_full, rank)    \
+  } else {                                                             \
+    LOOP_LAYOUT_8(func, type, is_left, m_offset, extent_partial, rank) \
+  }
 
 // parallel_reduce, non-tagged
 // Reduction version
-#define APPLY_REDUX( val, func, ... ) \
-  func( __VA_ARGS__, val );
+#define APPLY_REDUX(val, func, ...) func(__VA_ARGS__, val);
 
 // LayoutRight
 // d = 0 to start
-#define LOOP_R_1_REDUX( val, func, type, m_offset, extent, d, ... )    \
-  KOKKOS_ENABLE_IVDEP_MDRANGE                            \
-  for( type i0 = (type)0; i0 < static_cast<type>(extent[d]); ++i0) { \
-    APPLY_REDUX( val, func, __VA_ARGS__, i0 + m_offset[d] )              \
+#define LOOP_R_1_REDUX(val, func, type, m_offset, extent, d, ...)    \
+  KOKKOS_ENABLE_IVDEP_MDRANGE                                        \
+  for (type i0 = (type)0; i0 < static_cast<type>(extent[d]); ++i0) { \
+    APPLY_REDUX(val, func, __VA_ARGS__, i0 + m_offset[d])            \
   }
 
-#define LOOP_R_2_REDUX( val, func, type, m_offset, extent, d, ... )             \
-  for( type i1 = (type)0; i1 < static_cast<type>(extent[d]); ++i1) {          \
-    LOOP_R_1_REDUX( val, func, type, m_offset, extent, d+1 , __VA_ARGS__, i1 + m_offset[d] ) \
+#define LOOP_R_2_REDUX(val, func, type, m_offset, extent, d, ...)         \
+  for (type i1 = (type)0; i1 < static_cast<type>(extent[d]); ++i1) {      \
+    LOOP_R_1_REDUX(val, func, type, m_offset, extent, d + 1, __VA_ARGS__, \
+                   i1 + m_offset[d])                                      \
   }
 
-#define LOOP_R_3_REDUX( val, func, type, m_offset, extent, d, ... )             \
-  for( type i2 = (type)0; i2 < static_cast<type>(extent[d]); ++i2) {          \
-    LOOP_R_2_REDUX( val, func, type, m_offset, extent, d+1 , __VA_ARGS__, i2 + m_offset[d] ) \
+#define LOOP_R_3_REDUX(val, func, type, m_offset, extent, d, ...)         \
+  for (type i2 = (type)0; i2 < static_cast<type>(extent[d]); ++i2) {      \
+    LOOP_R_2_REDUX(val, func, type, m_offset, extent, d + 1, __VA_ARGS__, \
+                   i2 + m_offset[d])                                      \
   }
 
-#define LOOP_R_4_REDUX( val, func, type, m_offset, extent, d, ... )             \
-  for( type i3 = (type)0; i3 < static_cast<type>(extent[d]); ++i3) {          \
-    LOOP_R_3_REDUX( val, func, type, m_offset, extent, d+1 , __VA_ARGS__, i3 + m_offset[d] ) \
+#define LOOP_R_4_REDUX(val, func, type, m_offset, extent, d, ...)         \
+  for (type i3 = (type)0; i3 < static_cast<type>(extent[d]); ++i3) {      \
+    LOOP_R_3_REDUX(val, func, type, m_offset, extent, d + 1, __VA_ARGS__, \
+                   i3 + m_offset[d])                                      \
   }
 
-#define LOOP_R_5_REDUX( val, func, type, m_offset, extent, d, ... )             \
-  for( type i4 = (type)0; i4 < static_cast<type>(extent[d]); ++i4) {          \
-    LOOP_R_4_REDUX( val, func, type, m_offset, extent, d+1 , __VA_ARGS__, i4 + m_offset[d] ) \
+#define LOOP_R_5_REDUX(val, func, type, m_offset, extent, d, ...)         \
+  for (type i4 = (type)0; i4 < static_cast<type>(extent[d]); ++i4) {      \
+    LOOP_R_4_REDUX(val, func, type, m_offset, extent, d + 1, __VA_ARGS__, \
+                   i4 + m_offset[d])                                      \
   }
 
-#define LOOP_R_6_REDUX( val, func, type, m_offset, extent, d, ... )             \
-  for( type i5 = (type)0; i5 < static_cast<type>(extent[d]); ++i5) {          \
-    LOOP_R_5_REDUX( val, func, type, m_offset, extent, d+1 , __VA_ARGS__, i5 + m_offset[d] ) \
+#define LOOP_R_6_REDUX(val, func, type, m_offset, extent, d, ...)         \
+  for (type i5 = (type)0; i5 < static_cast<type>(extent[d]); ++i5) {      \
+    LOOP_R_5_REDUX(val, func, type, m_offset, extent, d + 1, __VA_ARGS__, \
+                   i5 + m_offset[d])                                      \
   }
 
-#define LOOP_R_7_REDUX( val, func, type, m_offset, extent, d, ... )             \
-  for( type i6 = (type)0; i6 < static_cast<type>(extent[d]); ++i6) {          \
-    LOOP_R_6_REDUX( val, func, type, m_offset, extent, d+1 , __VA_ARGS__, i6 + m_offset[d] ) \
+#define LOOP_R_7_REDUX(val, func, type, m_offset, extent, d, ...)         \
+  for (type i6 = (type)0; i6 < static_cast<type>(extent[d]); ++i6) {      \
+    LOOP_R_6_REDUX(val, func, type, m_offset, extent, d + 1, __VA_ARGS__, \
+                   i6 + m_offset[d])                                      \
   }
 
-#define LOOP_R_8_REDUX( val, func, type, m_offset, extent, d, ... )             \
-  for( type i7 = (type)0; i7 < static_cast<type>(extent[d]); ++i7) {          \
-    LOOP_R_7_REDUX( val, func, type, m_offset, extent, d+1 , __VA_ARGS__, i7 + m_offset[d] ) \
+#define LOOP_R_8_REDUX(val, func, type, m_offset, extent, d, ...)         \
+  for (type i7 = (type)0; i7 < static_cast<type>(extent[d]); ++i7) {      \
+    LOOP_R_7_REDUX(val, func, type, m_offset, extent, d + 1, __VA_ARGS__, \
+                   i7 + m_offset[d])                                      \
   }
 
-//LayoutLeft
+// LayoutLeft
 // d = rank-1 to start
-#define LOOP_L_1_REDUX( val, func, type, m_offset, extent, d, ... )    \
-  KOKKOS_ENABLE_IVDEP_MDRANGE                            \
-  for( type i0 = (type)0; i0 < static_cast<type>(extent[d]); ++i0) { \
-    APPLY_REDUX( val, func, i0 + m_offset[d] , __VA_ARGS__ )              \
+#define LOOP_L_1_REDUX(val, func, type, m_offset, extent, d, ...)    \
+  KOKKOS_ENABLE_IVDEP_MDRANGE                                        \
+  for (type i0 = (type)0; i0 < static_cast<type>(extent[d]); ++i0) { \
+    APPLY_REDUX(val, func, i0 + m_offset[d], __VA_ARGS__)            \
   }
 
-#define LOOP_L_2_REDUX( val, func, type, m_offset, extent, d, ... )             \
-  for( type i1 = (type)0; i1 < static_cast<type>(extent[d]); ++i1) {          \
-    LOOP_L_1_REDUX( val, func, type, m_offset, extent, d-1, i1 + m_offset[d] , __VA_ARGS__ ) \
+#define LOOP_L_2_REDUX(val, func, type, m_offset, extent, d, ...)              \
+  for (type i1 = (type)0; i1 < static_cast<type>(extent[d]); ++i1) {           \
+    LOOP_L_1_REDUX(val, func, type, m_offset, extent, d - 1, i1 + m_offset[d], \
+                   __VA_ARGS__)                                                \
   }
 
-#define LOOP_L_3_REDUX( val, func, type, m_offset, extent, d, ... )             \
-  for( type i2 = (type)0; i2 < static_cast<type>(extent[d]); ++i2) {          \
-    LOOP_L_2_REDUX( val, func, type, m_offset, extent, d-1, i2 + m_offset[d] , __VA_ARGS__ ) \
+#define LOOP_L_3_REDUX(val, func, type, m_offset, extent, d, ...)              \
+  for (type i2 = (type)0; i2 < static_cast<type>(extent[d]); ++i2) {           \
+    LOOP_L_2_REDUX(val, func, type, m_offset, extent, d - 1, i2 + m_offset[d], \
+                   __VA_ARGS__)                                                \
   }
 
-#define LOOP_L_4_REDUX( val, func, type, m_offset, extent, d, ... )             \
-  for( type i3 = (type)0; i3 < static_cast<type>(extent[d]); ++i3) {          \
-    LOOP_L_3_REDUX( val, func, type, m_offset, extent, d-1, i3 + m_offset[d] , __VA_ARGS__ ) \
+#define LOOP_L_4_REDUX(val, func, type, m_offset, extent, d, ...)              \
+  for (type i3 = (type)0; i3 < static_cast<type>(extent[d]); ++i3) {           \
+    LOOP_L_3_REDUX(val, func, type, m_offset, extent, d - 1, i3 + m_offset[d], \
+                   __VA_ARGS__)                                                \
   }
 
-#define LOOP_L_5_REDUX( val, func, type, m_offset, extent, d, ... )             \
-  for( type i4 = (type)0; i4 < static_cast<type>(extent[d]); ++i4) {          \
-    LOOP_L_4_REDUX( val, func, type, m_offset, extent, d-1, i4 + m_offset[d] , __VA_ARGS__ ) \
+#define LOOP_L_5_REDUX(val, func, type, m_offset, extent, d, ...)              \
+  for (type i4 = (type)0; i4 < static_cast<type>(extent[d]); ++i4) {           \
+    LOOP_L_4_REDUX(val, func, type, m_offset, extent, d - 1, i4 + m_offset[d], \
+                   __VA_ARGS__)                                                \
   }
 
-#define LOOP_L_6_REDUX( val, func, type, m_offset, extent, d, ... )             \
-  for( type i5 = (type)0; i5 < static_cast<type>(extent[d]); ++i5) {          \
-    LOOP_L_5_REDUX( val, func, type, m_offset, extent, d-1, i5 + m_offset[d] , __VA_ARGS__ ) \
+#define LOOP_L_6_REDUX(val, func, type, m_offset, extent, d, ...)              \
+  for (type i5 = (type)0; i5 < static_cast<type>(extent[d]); ++i5) {           \
+    LOOP_L_5_REDUX(val, func, type, m_offset, extent, d - 1, i5 + m_offset[d], \
+                   __VA_ARGS__)                                                \
   }
 
-#define LOOP_L_7_REDUX( val, func, type, m_offset, extent, d, ... )             \
-  for( type i6 = (type)0; i6 < static_cast<type>(extent[d]); ++i6) {          \
-    LOOP_L_6_REDUX( val, func, type, m_offset, extent, d-1, i6 + m_offset[d] , __VA_ARGS__ ) \
+#define LOOP_L_7_REDUX(val, func, type, m_offset, extent, d, ...)              \
+  for (type i6 = (type)0; i6 < static_cast<type>(extent[d]); ++i6) {           \
+    LOOP_L_6_REDUX(val, func, type, m_offset, extent, d - 1, i6 + m_offset[d], \
+                   __VA_ARGS__)                                                \
   }
 
-#define LOOP_L_8_REDUX( val, func, type, m_offset, extent, d, ... )             \
-  for( type i7 = (type)0; i7 < static_cast<type>(extent[d]); ++i7) {          \
-    LOOP_L_7_REDUX( val, func, type, m_offset, extent, d-1, i7 + m_offset[d] , __VA_ARGS__ ) \
+#define LOOP_L_8_REDUX(val, func, type, m_offset, extent, d, ...)              \
+  for (type i7 = (type)0; i7 < static_cast<type>(extent[d]); ++i7) {           \
+    LOOP_L_7_REDUX(val, func, type, m_offset, extent, d - 1, i7 + m_offset[d], \
+                   __VA_ARGS__)                                                \
   }
 
 // Left vs Right
-#define LOOP_LAYOUT_1_REDUX( val, func, type, is_left, m_offset, extent, rank )  \
-  KOKKOS_ENABLE_IVDEP_MDRANGE                            \
-  for( type i0 = (type)0; i0 < static_cast<type>(extent[0]); ++i0) { \
-    APPLY_REDUX( val, func, i0 + m_offset[0] )              \
+#define LOOP_LAYOUT_1_REDUX(val, func, type, is_left, m_offset, extent, rank) \
+  KOKKOS_ENABLE_IVDEP_MDRANGE                                                 \
+  for (type i0 = (type)0; i0 < static_cast<type>(extent[0]); ++i0) {          \
+    APPLY_REDUX(val, func, i0 + m_offset[0])                                  \
   }
 
-#define LOOP_LAYOUT_2_REDUX( val, func, type, is_left, m_offset, extent, rank )  \
-  if (is_left) { \
-    for( type i1 = (type)0; i1 < static_cast<type>(extent[rank-1]); ++i1) {   \
-      LOOP_L_1_REDUX( val, func, type, m_offset, extent, rank-2, i1 + m_offset[rank-1] ) \
-    } \
-  } \
-  else         { \
-    for( type i1 = (type)0; i1 < static_cast<type>(extent[0]); ++i1) { \
-      LOOP_R_1_REDUX( val, func, type, m_offset, extent, 1 , i1 + m_offset[0] )   \
-    } \
+#define LOOP_LAYOUT_2_REDUX(val, func, type, is_left, m_offset, extent, rank) \
+  if (is_left) {                                                              \
+    for (type i1 = (type)0; i1 < static_cast<type>(extent[rank - 1]); ++i1) { \
+      LOOP_L_1_REDUX(val, func, type, m_offset, extent, rank - 2,             \
+                     i1 + m_offset[rank - 1])                                 \
+    }                                                                         \
+  } else {                                                                    \
+    for (type i1 = (type)0; i1 < static_cast<type>(extent[0]); ++i1) {        \
+      LOOP_R_1_REDUX(val, func, type, m_offset, extent, 1, i1 + m_offset[0])  \
+    }                                                                         \
   }
 
-#define LOOP_LAYOUT_3_REDUX( val, func, type, is_left, m_offset, extent, rank )  \
-  if (is_left) { \
-    for( type i2 = (type)0; i2 < static_cast<type>(extent[rank-1]); ++i2) {   \
-      LOOP_L_2_REDUX( val, func, type, m_offset, extent, rank-2, i2 + m_offset[rank-1] ) \
-    } \
-  } \
-  else         { \
-    for( type i2 = (type)0; i2 < static_cast<type>(extent[0]); ++i2) { \
-      LOOP_R_2_REDUX( val, func, type, m_offset, extent, 1 , i2 + m_offset[0] )   \
-    } \
+#define LOOP_LAYOUT_3_REDUX(val, func, type, is_left, m_offset, extent, rank) \
+  if (is_left) {                                                              \
+    for (type i2 = (type)0; i2 < static_cast<type>(extent[rank - 1]); ++i2) { \
+      LOOP_L_2_REDUX(val, func, type, m_offset, extent, rank - 2,             \
+                     i2 + m_offset[rank - 1])                                 \
+    }                                                                         \
+  } else {                                                                    \
+    for (type i2 = (type)0; i2 < static_cast<type>(extent[0]); ++i2) {        \
+      LOOP_R_2_REDUX(val, func, type, m_offset, extent, 1, i2 + m_offset[0])  \
+    }                                                                         \
   }
 
-#define LOOP_LAYOUT_4_REDUX( val, func, type, is_left, m_offset, extent, rank )  \
-  if (is_left) { \
-    for( type i3 = (type)0; i3 < static_cast<type>(extent[rank-1]); ++i3) {   \
-      LOOP_L_3_REDUX( val, func, type, m_offset, extent, rank-2, i3 + m_offset[rank-1] ) \
-    } \
-  } \
-  else         { \
-    for( type i3 = (type)0; i3 < static_cast<type>(extent[0]); ++i3) { \
-      LOOP_R_3_REDUX( val, func, type, m_offset, extent, 1 , i3 + m_offset[0] )   \
-    } \
+#define LOOP_LAYOUT_4_REDUX(val, func, type, is_left, m_offset, extent, rank) \
+  if (is_left) {                                                              \
+    for (type i3 = (type)0; i3 < static_cast<type>(extent[rank - 1]); ++i3) { \
+      LOOP_L_3_REDUX(val, func, type, m_offset, extent, rank - 2,             \
+                     i3 + m_offset[rank - 1])                                 \
+    }                                                                         \
+  } else {                                                                    \
+    for (type i3 = (type)0; i3 < static_cast<type>(extent[0]); ++i3) {        \
+      LOOP_R_3_REDUX(val, func, type, m_offset, extent, 1, i3 + m_offset[0])  \
+    }                                                                         \
   }
 
-#define LOOP_LAYOUT_5_REDUX( val, func, type, is_left, m_offset, extent, rank )  \
-  if (is_left) { \
-    for( type i4 = (type)0; i4 < static_cast<type>(extent[rank-1]); ++i4) {   \
-      LOOP_L_4_REDUX( val, func, type, m_offset, extent, rank-2, i4 + m_offset[rank-1] ) \
-    } \
-  } \
-  else         { \
-    for( type i4 = (type)0; i4 < static_cast<type>(extent[0]); ++i4) { \
-      LOOP_R_4_REDUX( val, func, type, m_offset, extent, 1 , i4 + m_offset[0] )   \
-    } \
+#define LOOP_LAYOUT_5_REDUX(val, func, type, is_left, m_offset, extent, rank) \
+  if (is_left) {                                                              \
+    for (type i4 = (type)0; i4 < static_cast<type>(extent[rank - 1]); ++i4) { \
+      LOOP_L_4_REDUX(val, func, type, m_offset, extent, rank - 2,             \
+                     i4 + m_offset[rank - 1])                                 \
+    }                                                                         \
+  } else {                                                                    \
+    for (type i4 = (type)0; i4 < static_cast<type>(extent[0]); ++i4) {        \
+      LOOP_R_4_REDUX(val, func, type, m_offset, extent, 1, i4 + m_offset[0])  \
+    }                                                                         \
   }
 
-#define LOOP_LAYOUT_6_REDUX( val, func, type, is_left, m_offset, extent, rank )  \
-  if (is_left) { \
-    for( type i5 = (type)0; i5 < static_cast<type>(extent[rank-1]); ++i5) {   \
-      LOOP_L_5_REDUX( val, func, type, m_offset, extent, rank-2, i5 + m_offset[rank-1] ) \
-    } \
-  } \
-  else         { \
-    for( type i5 = (type)0; i5 < static_cast<type>(extent[0]); ++i5) { \
-      LOOP_R_5_REDUX( val, func, type, m_offset, extent, 1 , i5 + m_offset[0] )   \
-    } \
+#define LOOP_LAYOUT_6_REDUX(val, func, type, is_left, m_offset, extent, rank) \
+  if (is_left) {                                                              \
+    for (type i5 = (type)0; i5 < static_cast<type>(extent[rank - 1]); ++i5) { \
+      LOOP_L_5_REDUX(val, func, type, m_offset, extent, rank - 2,             \
+                     i5 + m_offset[rank - 1])                                 \
+    }                                                                         \
+  } else {                                                                    \
+    for (type i5 = (type)0; i5 < static_cast<type>(extent[0]); ++i5) {        \
+      LOOP_R_5_REDUX(val, func, type, m_offset, extent, 1, i5 + m_offset[0])  \
+    }                                                                         \
   }
 
-#define LOOP_LAYOUT_7_REDUX( val, func, type, is_left, m_offset, extent, rank )  \
-  if (is_left) { \
-    for( type i6 = (type)0; i6 < static_cast<type>(extent[rank-1]); ++i6) {   \
-      LOOP_L_6_REDUX( val, func, type, m_offset, extent, rank-2, i6 + m_offset[rank-1] ) \
-    } \
-  } \
-  else         { \
-    for( type i6 = (type)0; i6 < static_cast<type>(extent[0]); ++i6) { \
-      LOOP_R_6_REDUX( val, func, type, m_offset, extent, 1 , i6 + m_offset[0] )   \
-    } \
+#define LOOP_LAYOUT_7_REDUX(val, func, type, is_left, m_offset, extent, rank) \
+  if (is_left) {                                                              \
+    for (type i6 = (type)0; i6 < static_cast<type>(extent[rank - 1]); ++i6) { \
+      LOOP_L_6_REDUX(val, func, type, m_offset, extent, rank - 2,             \
+                     i6 + m_offset[rank - 1])                                 \
+    }                                                                         \
+  } else {                                                                    \
+    for (type i6 = (type)0; i6 < static_cast<type>(extent[0]); ++i6) {        \
+      LOOP_R_6_REDUX(val, func, type, m_offset, extent, 1, i6 + m_offset[0])  \
+    }                                                                         \
   }
 
-#define LOOP_LAYOUT_8_REDUX( val, func, type, is_left, m_offset, extent, rank )  \
-  if (is_left) { \
-    for( type i7 = (type)0; i7 < static_cast<type>(extent[rank-1]); ++i7) {   \
-      LOOP_L_7_REDUX( val, func, type, m_offset, extent, rank-2, i7 + m_offset[rank-1] ) \
-    } \
-  } \
-  else         { \
-    for( type i7 = (type)0; i7 < static_cast<type>(extent[0]); ++i7) { \
-      LOOP_R_7_REDUX( val, func, type, m_offset, extent, 1 , i7 + m_offset[0] )   \
-    } \
+#define LOOP_LAYOUT_8_REDUX(val, func, type, is_left, m_offset, extent, rank) \
+  if (is_left) {                                                              \
+    for (type i7 = (type)0; i7 < static_cast<type>(extent[rank - 1]); ++i7) { \
+      LOOP_L_7_REDUX(val, func, type, m_offset, extent, rank - 2,             \
+                     i7 + m_offset[rank - 1])                                 \
+    }                                                                         \
+  } else {                                                                    \
+    for (type i7 = (type)0; i7 < static_cast<type>(extent[0]); ++i7) {        \
+      LOOP_R_7_REDUX(val, func, type, m_offset, extent, 1, i7 + m_offset[0])  \
+    }                                                                         \
   }
 
 // Partial vs Full Tile
-#define TILE_LOOP_1_REDUX( val, func, type, is_left, cond, m_offset, extent_full, extent_partial, rank ) \
-  if (cond) { LOOP_LAYOUT_1_REDUX( val, func, type, is_left, m_offset, extent_full, rank ) } \
-  else      { LOOP_LAYOUT_1_REDUX( val, func, type, is_left, m_offset, extent_partial, rank ) }
+#define TILE_LOOP_1_REDUX(val, func, type, is_left, cond, m_offset,            \
+                          extent_full, extent_partial, rank)                   \
+  if (cond) {                                                                  \
+    LOOP_LAYOUT_1_REDUX(val, func, type, is_left, m_offset, extent_full, rank) \
+  } else {                                                                     \
+    LOOP_LAYOUT_1_REDUX(val, func, type, is_left, m_offset, extent_partial,    \
+                        rank)                                                  \
+  }
 
-#define TILE_LOOP_2_REDUX( val, func, type, is_left, cond, m_offset, extent_full, extent_partial, rank ) \
-  if (cond) { LOOP_LAYOUT_2_REDUX( val, func, type, is_left, m_offset, extent_full, rank ) } \
-  else      { LOOP_LAYOUT_2_REDUX( val, func, type, is_left, m_offset, extent_partial, rank ) }
+#define TILE_LOOP_2_REDUX(val, func, type, is_left, cond, m_offset,            \
+                          extent_full, extent_partial, rank)                   \
+  if (cond) {                                                                  \
+    LOOP_LAYOUT_2_REDUX(val, func, type, is_left, m_offset, extent_full, rank) \
+  } else {                                                                     \
+    LOOP_LAYOUT_2_REDUX(val, func, type, is_left, m_offset, extent_partial,    \
+                        rank)                                                  \
+  }
 
-#define TILE_LOOP_3_REDUX( val, func, type, is_left, cond, m_offset, extent_full, extent_partial, rank ) \
-  if (cond) { LOOP_LAYOUT_3_REDUX( val, func, type, is_left, m_offset, extent_full, rank ) } \
-  else      { LOOP_LAYOUT_3_REDUX( val, func, type, is_left, m_offset, extent_partial, rank ) }
+#define TILE_LOOP_3_REDUX(val, func, type, is_left, cond, m_offset,            \
+                          extent_full, extent_partial, rank)                   \
+  if (cond) {                                                                  \
+    LOOP_LAYOUT_3_REDUX(val, func, type, is_left, m_offset, extent_full, rank) \
+  } else {                                                                     \
+    LOOP_LAYOUT_3_REDUX(val, func, type, is_left, m_offset, extent_partial,    \
+                        rank)                                                  \
+  }
 
-#define TILE_LOOP_4_REDUX( val, func, type, is_left, cond, m_offset, extent_full, extent_partial, rank ) \
-  if (cond) { LOOP_LAYOUT_4_REDUX( val, func, type, is_left, m_offset, extent_full, rank ) } \
-  else      { LOOP_LAYOUT_4_REDUX( val, func, type, is_left, m_offset, extent_partial, rank ) }
+#define TILE_LOOP_4_REDUX(val, func, type, is_left, cond, m_offset,            \
+                          extent_full, extent_partial, rank)                   \
+  if (cond) {                                                                  \
+    LOOP_LAYOUT_4_REDUX(val, func, type, is_left, m_offset, extent_full, rank) \
+  } else {                                                                     \
+    LOOP_LAYOUT_4_REDUX(val, func, type, is_left, m_offset, extent_partial,    \
+                        rank)                                                  \
+  }
 
-#define TILE_LOOP_5_REDUX( val, func, type, is_left, cond, m_offset, extent_full, extent_partial, rank ) \
-  if (cond) { LOOP_LAYOUT_5_REDUX( val, func, type, is_left, m_offset, extent_full, rank ) } \
-  else      { LOOP_LAYOUT_5_REDUX( val, func, type, is_left, m_offset, extent_partial, rank ) }
+#define TILE_LOOP_5_REDUX(val, func, type, is_left, cond, m_offset,            \
+                          extent_full, extent_partial, rank)                   \
+  if (cond) {                                                                  \
+    LOOP_LAYOUT_5_REDUX(val, func, type, is_left, m_offset, extent_full, rank) \
+  } else {                                                                     \
+    LOOP_LAYOUT_5_REDUX(val, func, type, is_left, m_offset, extent_partial,    \
+                        rank)                                                  \
+  }
 
-#define TILE_LOOP_6_REDUX( val, func, type, is_left, cond, m_offset, extent_full, extent_partial, rank ) \
-  if (cond) { LOOP_LAYOUT_6_REDUX( val, func, type, is_left, m_offset, extent_full, rank ) } \
-  else      { LOOP_LAYOUT_6_REDUX( val, func, type, is_left, m_offset, extent_partial, rank ) }
+#define TILE_LOOP_6_REDUX(val, func, type, is_left, cond, m_offset,            \
+                          extent_full, extent_partial, rank)                   \
+  if (cond) {                                                                  \
+    LOOP_LAYOUT_6_REDUX(val, func, type, is_left, m_offset, extent_full, rank) \
+  } else {                                                                     \
+    LOOP_LAYOUT_6_REDUX(val, func, type, is_left, m_offset, extent_partial,    \
+                        rank)                                                  \
+  }
 
-#define TILE_LOOP_7_REDUX( val, func, type, is_left, cond, m_offset, extent_full, extent_partial, rank ) \
-  if (cond) { LOOP_LAYOUT_7_REDUX( val, func, type, is_left, m_offset, extent_full, rank ) } \
-  else      { LOOP_LAYOUT_7_REDUX( val, func, type, is_left, m_offset, extent_partial, rank ) }
+#define TILE_LOOP_7_REDUX(val, func, type, is_left, cond, m_offset,            \
+                          extent_full, extent_partial, rank)                   \
+  if (cond) {                                                                  \
+    LOOP_LAYOUT_7_REDUX(val, func, type, is_left, m_offset, extent_full, rank) \
+  } else {                                                                     \
+    LOOP_LAYOUT_7_REDUX(val, func, type, is_left, m_offset, extent_partial,    \
+                        rank)                                                  \
+  }
 
-#define TILE_LOOP_8_REDUX( val, func, type, is_left, cond, m_offset, extent_full, extent_partial, rank ) \
-  if (cond) { LOOP_LAYOUT_8_REDUX( val, func, type, is_left, m_offset, extent_full, rank ) } \
-  else      { LOOP_LAYOUT_8_REDUX( val, func, type, is_left, m_offset, extent_partial, rank ) }
+#define TILE_LOOP_8_REDUX(val, func, type, is_left, cond, m_offset,            \
+                          extent_full, extent_partial, rank)                   \
+  if (cond) {                                                                  \
+    LOOP_LAYOUT_8_REDUX(val, func, type, is_left, m_offset, extent_full, rank) \
+  } else {                                                                     \
+    LOOP_LAYOUT_8_REDUX(val, func, type, is_left, m_offset, extent_partial,    \
+                        rank)                                                  \
+  }
 // end New Loop Macros
 
-
 // tagged macros
-#define TAGGED_APPLY( tag, func, ... ) \
-  func( tag, __VA_ARGS__ );
+#define TAGGED_APPLY(tag, func, ...) func(tag, __VA_ARGS__);
 
 // LayoutRight
 // d = 0 to start
-#define TAGGED_LOOP_R_1( tag, func, type, m_offset, extent, d, ... )    \
-  KOKKOS_ENABLE_IVDEP_MDRANGE                            \
-  for( type i0 = (type)0; i0 < static_cast<type>(extent[d]); ++i0) { \
-    TAGGED_APPLY( tag, func, __VA_ARGS__, i0 + m_offset[d] )              \
+#define TAGGED_LOOP_R_1(tag, func, type, m_offset, extent, d, ...)   \
+  KOKKOS_ENABLE_IVDEP_MDRANGE                                        \
+  for (type i0 = (type)0; i0 < static_cast<type>(extent[d]); ++i0) { \
+    TAGGED_APPLY(tag, func, __VA_ARGS__, i0 + m_offset[d])           \
   }
 
-#define TAGGED_LOOP_R_2( tag, func, type, m_offset, extent, d, ... )             \
-  for( type i1 = (type)0; i1 < static_cast<type>(extent[d]); ++i1) {          \
-    TAGGED_LOOP_R_1( tag, func, type, m_offset, extent, d+1 , __VA_ARGS__, i1 + m_offset[d] ) \
+#define TAGGED_LOOP_R_2(tag, func, type, m_offset, extent, d, ...)         \
+  for (type i1 = (type)0; i1 < static_cast<type>(extent[d]); ++i1) {       \
+    TAGGED_LOOP_R_1(tag, func, type, m_offset, extent, d + 1, __VA_ARGS__, \
+                    i1 + m_offset[d])                                      \
   }
 
-#define TAGGED_LOOP_R_3( tag, func, type, m_offset, extent, d, ... )             \
-  for( type i2 = (type)0; i2 < static_cast<type>(extent[d]); ++i2) {          \
-    TAGGED_LOOP_R_2( tag, func, type, m_offset, extent, d+1 , __VA_ARGS__, i2 + m_offset[d] ) \
+#define TAGGED_LOOP_R_3(tag, func, type, m_offset, extent, d, ...)         \
+  for (type i2 = (type)0; i2 < static_cast<type>(extent[d]); ++i2) {       \
+    TAGGED_LOOP_R_2(tag, func, type, m_offset, extent, d + 1, __VA_ARGS__, \
+                    i2 + m_offset[d])                                      \
   }
 
-#define TAGGED_LOOP_R_4( tag, func, type, m_offset, extent, d, ... )             \
-  for( type i3 = (type)0; i3 < static_cast<type>(extent[d]); ++i3) {          \
-    TAGGED_LOOP_R_3( tag, func, type, m_offset, extent, d+1 , __VA_ARGS__, i3 + m_offset[d] ) \
+#define TAGGED_LOOP_R_4(tag, func, type, m_offset, extent, d, ...)         \
+  for (type i3 = (type)0; i3 < static_cast<type>(extent[d]); ++i3) {       \
+    TAGGED_LOOP_R_3(tag, func, type, m_offset, extent, d + 1, __VA_ARGS__, \
+                    i3 + m_offset[d])                                      \
   }
 
-#define TAGGED_LOOP_R_5( tag, func, type, m_offset, extent, d, ... )             \
-  for( type i4 = (type)0; i4 < static_cast<type>(extent[d]); ++i4) {          \
-    TAGGED_LOOP_R_4( tag, func, type, m_offset, extent, d+1 , __VA_ARGS__, i4 + m_offset[d] ) \
+#define TAGGED_LOOP_R_5(tag, func, type, m_offset, extent, d, ...)         \
+  for (type i4 = (type)0; i4 < static_cast<type>(extent[d]); ++i4) {       \
+    TAGGED_LOOP_R_4(tag, func, type, m_offset, extent, d + 1, __VA_ARGS__, \
+                    i4 + m_offset[d])                                      \
   }
 
-#define TAGGED_LOOP_R_6( tag, func, type, m_offset, extent, d, ... )             \
-  for( type i5 = (type)0; i5 < static_cast<type>(extent[d]); ++i5) {          \
-    TAGGED_LOOP_R_5( tag, func, type, m_offset, extent, d+1 , __VA_ARGS__, i5 + m_offset[d] ) \
+#define TAGGED_LOOP_R_6(tag, func, type, m_offset, extent, d, ...)         \
+  for (type i5 = (type)0; i5 < static_cast<type>(extent[d]); ++i5) {       \
+    TAGGED_LOOP_R_5(tag, func, type, m_offset, extent, d + 1, __VA_ARGS__, \
+                    i5 + m_offset[d])                                      \
   }
 
-#define TAGGED_LOOP_R_7( tag, func, type, m_offset, extent, d, ... )             \
-  for( type i6 = (type)0; i6 < static_cast<type>(extent[d]); ++i6) {          \
-    TAGGED_LOOP_R_6( tag, func, type, m_offset, extent, d+1 , __VA_ARGS__, i6 + m_offset[d] ) \
+#define TAGGED_LOOP_R_7(tag, func, type, m_offset, extent, d, ...)         \
+  for (type i6 = (type)0; i6 < static_cast<type>(extent[d]); ++i6) {       \
+    TAGGED_LOOP_R_6(tag, func, type, m_offset, extent, d + 1, __VA_ARGS__, \
+                    i6 + m_offset[d])                                      \
   }
 
-#define TAGGED_LOOP_R_8( tag, func, type, m_offset, extent, d, ... )             \
-  for( type i7 = (type)0; i7 < static_cast<type>(extent[d]); ++i7) {          \
-    TAGGED_LOOP_R_7( tag, func, type, m_offset, extent, d+1 , __VA_ARGS__, i7 + m_offset[d] ) \
+#define TAGGED_LOOP_R_8(tag, func, type, m_offset, extent, d, ...)         \
+  for (type i7 = (type)0; i7 < static_cast<type>(extent[d]); ++i7) {       \
+    TAGGED_LOOP_R_7(tag, func, type, m_offset, extent, d + 1, __VA_ARGS__, \
+                    i7 + m_offset[d])                                      \
   }
 
-//LayoutLeft
+// LayoutLeft
 // d = rank-1 to start
-#define TAGGED_LOOP_L_1( tag, func, type, m_offset, extent, d, ... )    \
-  KOKKOS_ENABLE_IVDEP_MDRANGE                            \
-  for( type i0 = (type)0; i0 < static_cast<type>(extent[d]); ++i0) { \
-    TAGGED_APPLY( tag, func, i0 + m_offset[d] , __VA_ARGS__ )              \
+#define TAGGED_LOOP_L_1(tag, func, type, m_offset, extent, d, ...)   \
+  KOKKOS_ENABLE_IVDEP_MDRANGE                                        \
+  for (type i0 = (type)0; i0 < static_cast<type>(extent[d]); ++i0) { \
+    TAGGED_APPLY(tag, func, i0 + m_offset[d], __VA_ARGS__)           \
   }
 
-#define TAGGED_LOOP_L_2( tag, func, type, m_offset, extent, d, ... )             \
-  for( type i1 = (type)0; i1 < static_cast<type>(extent[d]); ++i1) {          \
-    TAGGED_LOOP_L_1( tag, func, type, m_offset, extent, d-1, i1 + m_offset[d] , __VA_ARGS__ ) \
+#define TAGGED_LOOP_L_2(tag, func, type, m_offset, extent, d, ...)   \
+  for (type i1 = (type)0; i1 < static_cast<type>(extent[d]); ++i1) { \
+    TAGGED_LOOP_L_1(tag, func, type, m_offset, extent, d - 1,        \
+                    i1 + m_offset[d], __VA_ARGS__)                   \
   }
 
-#define TAGGED_LOOP_L_3( tag, func, type, m_offset, extent, d, ... )             \
-  for( type i2 = (type)0; i2 < static_cast<type>(extent[d]); ++i2) {          \
-    TAGGED_LOOP_L_2( tag, func, type, m_offset, extent, d-1, i2 + m_offset[d] , __VA_ARGS__ ) \
+#define TAGGED_LOOP_L_3(tag, func, type, m_offset, extent, d, ...)   \
+  for (type i2 = (type)0; i2 < static_cast<type>(extent[d]); ++i2) { \
+    TAGGED_LOOP_L_2(tag, func, type, m_offset, extent, d - 1,        \
+                    i2 + m_offset[d], __VA_ARGS__)                   \
   }
 
-#define TAGGED_LOOP_L_4( tag, func, type, m_offset, extent, d, ... )             \
-  for( type i3 = (type)0; i3 < static_cast<type>(extent[d]); ++i3) {          \
-    TAGGED_LOOP_L_3( tag, func, type, m_offset, extent, d-1, i3 + m_offset[d] , __VA_ARGS__ ) \
+#define TAGGED_LOOP_L_4(tag, func, type, m_offset, extent, d, ...)   \
+  for (type i3 = (type)0; i3 < static_cast<type>(extent[d]); ++i3) { \
+    TAGGED_LOOP_L_3(tag, func, type, m_offset, extent, d - 1,        \
+                    i3 + m_offset[d], __VA_ARGS__)                   \
   }
 
-#define TAGGED_LOOP_L_5( tag, func, type, m_offset, extent, d, ... )             \
-  for( type i4 = (type)0; i4 < static_cast<type>(extent[d]); ++i4) {          \
-    TAGGED_LOOP_L_4( tag, func, type, m_offset, extent, d-1, i4 + m_offset[d] , __VA_ARGS__ ) \
+#define TAGGED_LOOP_L_5(tag, func, type, m_offset, extent, d, ...)   \
+  for (type i4 = (type)0; i4 < static_cast<type>(extent[d]); ++i4) { \
+    TAGGED_LOOP_L_4(tag, func, type, m_offset, extent, d - 1,        \
+                    i4 + m_offset[d], __VA_ARGS__)                   \
   }
 
-#define TAGGED_LOOP_L_6( tag, func, type, m_offset, extent, d, ... )             \
-  for( type i5 = (type)0; i5 < static_cast<type>(extent[d]); ++i5) {          \
-    TAGGED_LOOP_L_5( tag, func, type, m_offset, extent, d-1, i5 + m_offset[d] , __VA_ARGS__ ) \
+#define TAGGED_LOOP_L_6(tag, func, type, m_offset, extent, d, ...)   \
+  for (type i5 = (type)0; i5 < static_cast<type>(extent[d]); ++i5) { \
+    TAGGED_LOOP_L_5(tag, func, type, m_offset, extent, d - 1,        \
+                    i5 + m_offset[d], __VA_ARGS__)                   \
   }
 
-#define TAGGED_LOOP_L_7( tag, func, type, m_offset, extent, d, ... )             \
-  for( type i6 = (type)0; i6 < static_cast<type>(extent[d]); ++i6) {          \
-    TAGGED_LOOP_L_6( tag, func, type, m_offset, extent, d-1, i6 + m_offset[d] , __VA_ARGS__ ) \
+#define TAGGED_LOOP_L_7(tag, func, type, m_offset, extent, d, ...)   \
+  for (type i6 = (type)0; i6 < static_cast<type>(extent[d]); ++i6) { \
+    TAGGED_LOOP_L_6(tag, func, type, m_offset, extent, d - 1,        \
+                    i6 + m_offset[d], __VA_ARGS__)                   \
   }
 
-#define TAGGED_LOOP_L_8( tag, func, type, m_offset, extent, d, ... )             \
-  for( type i7 = (type)0; i7 < static_cast<type>(extent[d]); ++i7) {          \
-    TAGGED_LOOP_L_7( tag, func, type, m_offset, extent, d-1, i7 + m_offset[d] , __VA_ARGS__ ) \
+#define TAGGED_LOOP_L_8(tag, func, type, m_offset, extent, d, ...)   \
+  for (type i7 = (type)0; i7 < static_cast<type>(extent[d]); ++i7) { \
+    TAGGED_LOOP_L_7(tag, func, type, m_offset, extent, d - 1,        \
+                    i7 + m_offset[d], __VA_ARGS__)                   \
   }
 
 // Left vs Right
 // TODO: rank not necessary to pass through, can hardcode the values
-#define TAGGED_LOOP_LAYOUT_1( tag, func, type, is_left, m_offset, extent, rank )  \
-  KOKKOS_ENABLE_IVDEP_MDRANGE                            \
-  for( type i0 = (type)0; i0 < static_cast<type>(extent[0]); ++i0) { \
-    TAGGED_APPLY( tag, func, i0 + m_offset[0] )              \
+#define TAGGED_LOOP_LAYOUT_1(tag, func, type, is_left, m_offset, extent, rank) \
+  KOKKOS_ENABLE_IVDEP_MDRANGE                                                  \
+  for (type i0 = (type)0; i0 < static_cast<type>(extent[0]); ++i0) {           \
+    TAGGED_APPLY(tag, func, i0 + m_offset[0])                                  \
   }
 
-#define TAGGED_LOOP_LAYOUT_2( tag, func, type, is_left, m_offset, extent, rank )  \
-  if (is_left) { \
-    for( type i1 = (type)0; i1 < static_cast<type>(extent[rank-1]); ++i1) {   \
-      TAGGED_LOOP_L_1( tag, func, type, m_offset, extent, rank-2, i1 + m_offset[rank-1] ) \
-    } \
-  } \
-  else         { \
-    for( type i1 = (type)0; i1 < static_cast<type>(extent[0]); ++i1) { \
-      TAGGED_LOOP_R_1( tag, func, type, m_offset, extent, 1 , i1 + m_offset[0] )   \
-    } \
+#define TAGGED_LOOP_LAYOUT_2(tag, func, type, is_left, m_offset, extent, rank) \
+  if (is_left) {                                                               \
+    for (type i1 = (type)0; i1 < static_cast<type>(extent[rank - 1]); ++i1) {  \
+      TAGGED_LOOP_L_1(tag, func, type, m_offset, extent, rank - 2,             \
+                      i1 + m_offset[rank - 1])                                 \
+    }                                                                          \
+  } else {                                                                     \
+    for (type i1 = (type)0; i1 < static_cast<type>(extent[0]); ++i1) {         \
+      TAGGED_LOOP_R_1(tag, func, type, m_offset, extent, 1, i1 + m_offset[0])  \
+    }                                                                          \
   }
 
-#define TAGGED_LOOP_LAYOUT_3( tag, func, type, is_left, m_offset, extent, rank )  \
-  if (is_left) { \
-    for( type i2 = (type)0; i2 < static_cast<type>(extent[rank-1]); ++i2) {   \
-      TAGGED_LOOP_L_2( tag, func, type, m_offset, extent, rank-2, i2 + m_offset[rank-1] ) \
-    } \
-  } \
-  else         { \
-    for( type i2 = (type)0; i2 < static_cast<type>(extent[0]); ++i2) { \
-      TAGGED_LOOP_R_2( tag, func, type, m_offset, extent, 1 , i2 + m_offset[0] )   \
-    } \
+#define TAGGED_LOOP_LAYOUT_3(tag, func, type, is_left, m_offset, extent, rank) \
+  if (is_left) {                                                               \
+    for (type i2 = (type)0; i2 < static_cast<type>(extent[rank - 1]); ++i2) {  \
+      TAGGED_LOOP_L_2(tag, func, type, m_offset, extent, rank - 2,             \
+                      i2 + m_offset[rank - 1])                                 \
+    }                                                                          \
+  } else {                                                                     \
+    for (type i2 = (type)0; i2 < static_cast<type>(extent[0]); ++i2) {         \
+      TAGGED_LOOP_R_2(tag, func, type, m_offset, extent, 1, i2 + m_offset[0])  \
+    }                                                                          \
   }
 
-#define TAGGED_LOOP_LAYOUT_4( tag, func, type, is_left, m_offset, extent, rank )  \
-  if (is_left) { \
-    for( type i3 = (type)0; i3 < static_cast<type>(extent[rank-1]); ++i3) {   \
-      TAGGED_LOOP_L_3( tag, func, type, m_offset, extent, rank-2, i3 + m_offset[rank-1] ) \
-    } \
-  } \
-  else         { \
-    for( type i3 = (type)0; i3 < static_cast<type>(extent[0]); ++i3) { \
-      TAGGED_LOOP_R_3( tag, func, type, m_offset, extent, 1 , i3 + m_offset[0] )   \
-    } \
+#define TAGGED_LOOP_LAYOUT_4(tag, func, type, is_left, m_offset, extent, rank) \
+  if (is_left) {                                                               \
+    for (type i3 = (type)0; i3 < static_cast<type>(extent[rank - 1]); ++i3) {  \
+      TAGGED_LOOP_L_3(tag, func, type, m_offset, extent, rank - 2,             \
+                      i3 + m_offset[rank - 1])                                 \
+    }                                                                          \
+  } else {                                                                     \
+    for (type i3 = (type)0; i3 < static_cast<type>(extent[0]); ++i3) {         \
+      TAGGED_LOOP_R_3(tag, func, type, m_offset, extent, 1, i3 + m_offset[0])  \
+    }                                                                          \
   }
 
-#define TAGGED_LOOP_LAYOUT_5( tag, func, type, is_left, m_offset, extent, rank )  \
-  if (is_left) { \
-    for( type i4 = (type)0; i4 < static_cast<type>(extent[rank-1]); ++i4) {   \
-      TAGGED_LOOP_L_4( tag, func, type, m_offset, extent, rank-2, i4 + m_offset[rank-1] ) \
-    } \
-  } \
-  else         { \
-    for( type i4 = (type)0; i4 < static_cast<type>(extent[0]); ++i4) { \
-      TAGGED_LOOP_R_4( tag, func, type, m_offset, extent, 1 , i4 + m_offset[0] )   \
-    } \
+#define TAGGED_LOOP_LAYOUT_5(tag, func, type, is_left, m_offset, extent, rank) \
+  if (is_left) {                                                               \
+    for (type i4 = (type)0; i4 < static_cast<type>(extent[rank - 1]); ++i4) {  \
+      TAGGED_LOOP_L_4(tag, func, type, m_offset, extent, rank - 2,             \
+                      i4 + m_offset[rank - 1])                                 \
+    }                                                                          \
+  } else {                                                                     \
+    for (type i4 = (type)0; i4 < static_cast<type>(extent[0]); ++i4) {         \
+      TAGGED_LOOP_R_4(tag, func, type, m_offset, extent, 1, i4 + m_offset[0])  \
+    }                                                                          \
   }
 
-#define TAGGED_LOOP_LAYOUT_6( tag, func, type, is_left, m_offset, extent, rank )  \
-  if (is_left) { \
-    for( type i5 = (type)0; i5 < static_cast<type>(extent[rank-1]); ++i5) {   \
-      TAGGED_LOOP_L_5( tag, func, type, m_offset, extent, rank-2, i5 + m_offset[rank-1] ) \
-    } \
-  } \
-  else         { \
-    for( type i5 = (type)0; i5 < static_cast<type>(extent[0]); ++i5) { \
-      TAGGED_LOOP_R_5( tag, func, type, m_offset, extent, 1 , i5 + m_offset[0] )   \
-    } \
+#define TAGGED_LOOP_LAYOUT_6(tag, func, type, is_left, m_offset, extent, rank) \
+  if (is_left) {                                                               \
+    for (type i5 = (type)0; i5 < static_cast<type>(extent[rank - 1]); ++i5) {  \
+      TAGGED_LOOP_L_5(tag, func, type, m_offset, extent, rank - 2,             \
+                      i5 + m_offset[rank - 1])                                 \
+    }                                                                          \
+  } else {                                                                     \
+    for (type i5 = (type)0; i5 < static_cast<type>(extent[0]); ++i5) {         \
+      TAGGED_LOOP_R_5(tag, func, type, m_offset, extent, 1, i5 + m_offset[0])  \
+    }                                                                          \
   }
 
-#define TAGGED_LOOP_LAYOUT_7( tag, func, type, is_left, m_offset, extent, rank )  \
-  if (is_left) { \
-    for( type i6 = (type)0; i6 < static_cast<type>(extent[rank-1]); ++i6) {   \
-      TAGGED_LOOP_L_6( tag, func, type, m_offset, extent, rank-2, i6 + m_offset[rank-1] ) \
-    } \
-  } \
-  else         { \
-    for( type i6 = (type)0; i6 < static_cast<type>(extent[0]); ++i6) { \
-      TAGGED_LOOP_R_6( tag, func, type, m_offset, extent, 1 , i6 + m_offset[0] )   \
-    } \
+#define TAGGED_LOOP_LAYOUT_7(tag, func, type, is_left, m_offset, extent, rank) \
+  if (is_left) {                                                               \
+    for (type i6 = (type)0; i6 < static_cast<type>(extent[rank - 1]); ++i6) {  \
+      TAGGED_LOOP_L_6(tag, func, type, m_offset, extent, rank - 2,             \
+                      i6 + m_offset[rank - 1])                                 \
+    }                                                                          \
+  } else {                                                                     \
+    for (type i6 = (type)0; i6 < static_cast<type>(extent[0]); ++i6) {         \
+      TAGGED_LOOP_R_6(tag, func, type, m_offset, extent, 1, i6 + m_offset[0])  \
+    }                                                                          \
   }
 
-#define TAGGED_LOOP_LAYOUT_8( tag, func, type, is_left, m_offset, extent, rank )  \
-  if (is_left) { \
-    for( type i7 = (type)0; i7 < static_cast<type>(extent[rank-1]); ++i7) {   \
-      TAGGED_LOOP_L_7( tag, func, type, m_offset, extent, rank-2, i7 + m_offset[rank-1] ) \
-    } \
-  } \
-  else         { \
-    for( type i7 = (type)0; i7 < static_cast<type>(extent[0]); ++i7) { \
-      TAGGED_LOOP_R_7( tag, func, type, m_offset, extent, 1 , i7 + m_offset[0] )   \
-    } \
+#define TAGGED_LOOP_LAYOUT_8(tag, func, type, is_left, m_offset, extent, rank) \
+  if (is_left) {                                                               \
+    for (type i7 = (type)0; i7 < static_cast<type>(extent[rank - 1]); ++i7) {  \
+      TAGGED_LOOP_L_7(tag, func, type, m_offset, extent, rank - 2,             \
+                      i7 + m_offset[rank - 1])                                 \
+    }                                                                          \
+  } else {                                                                     \
+    for (type i7 = (type)0; i7 < static_cast<type>(extent[0]); ++i7) {         \
+      TAGGED_LOOP_R_7(tag, func, type, m_offset, extent, 1, i7 + m_offset[0])  \
+    }                                                                          \
   }
 
 // Partial vs Full Tile
-#define TAGGED_TILE_LOOP_1( tag, func, type, is_left, cond, m_offset, extent_full, extent_partial, rank ) \
-  if (cond) { TAGGED_LOOP_LAYOUT_1( tag, func, type, is_left, m_offset, extent_full, rank ) } \
-  else      { TAGGED_LOOP_LAYOUT_1( tag, func, type, is_left, m_offset, extent_partial, rank ) }
+#define TAGGED_TILE_LOOP_1(tag, func, type, is_left, cond, m_offset,         \
+                           extent_full, extent_partial, rank)                \
+  if (cond) {                                                                \
+    TAGGED_LOOP_LAYOUT_1(tag, func, type, is_left, m_offset, extent_full,    \
+                         rank)                                               \
+  } else {                                                                   \
+    TAGGED_LOOP_LAYOUT_1(tag, func, type, is_left, m_offset, extent_partial, \
+                         rank)                                               \
+  }
 
-#define TAGGED_TILE_LOOP_2( tag, func, type, is_left, cond, m_offset, extent_full, extent_partial, rank ) \
-  if (cond) { TAGGED_LOOP_LAYOUT_2( tag, func, type, is_left, m_offset, extent_full, rank ) } \
-  else      { TAGGED_LOOP_LAYOUT_2( tag, func, type, is_left, m_offset, extent_partial, rank ) }
+#define TAGGED_TILE_LOOP_2(tag, func, type, is_left, cond, m_offset,         \
+                           extent_full, extent_partial, rank)                \
+  if (cond) {                                                                \
+    TAGGED_LOOP_LAYOUT_2(tag, func, type, is_left, m_offset, extent_full,    \
+                         rank)                                               \
+  } else {                                                                   \
+    TAGGED_LOOP_LAYOUT_2(tag, func, type, is_left, m_offset, extent_partial, \
+                         rank)                                               \
+  }
 
-#define TAGGED_TILE_LOOP_3( tag, func, type, is_left, cond, m_offset, extent_full, extent_partial, rank ) \
-  if (cond) { TAGGED_LOOP_LAYOUT_3( tag, func, type, is_left, m_offset, extent_full, rank ) } \
-  else      { TAGGED_LOOP_LAYOUT_3( tag, func, type, is_left, m_offset, extent_partial, rank ) }
+#define TAGGED_TILE_LOOP_3(tag, func, type, is_left, cond, m_offset,         \
+                           extent_full, extent_partial, rank)                \
+  if (cond) {                                                                \
+    TAGGED_LOOP_LAYOUT_3(tag, func, type, is_left, m_offset, extent_full,    \
+                         rank)                                               \
+  } else {                                                                   \
+    TAGGED_LOOP_LAYOUT_3(tag, func, type, is_left, m_offset, extent_partial, \
+                         rank)                                               \
+  }
 
-#define TAGGED_TILE_LOOP_4( tag, func, type, is_left, cond, m_offset, extent_full, extent_partial, rank ) \
-  if (cond) { TAGGED_LOOP_LAYOUT_4( tag, func, type, is_left, m_offset, extent_full, rank ) } \
-  else      { TAGGED_LOOP_LAYOUT_4( tag, func, type, is_left, m_offset, extent_partial, rank ) }
+#define TAGGED_TILE_LOOP_4(tag, func, type, is_left, cond, m_offset,         \
+                           extent_full, extent_partial, rank)                \
+  if (cond) {                                                                \
+    TAGGED_LOOP_LAYOUT_4(tag, func, type, is_left, m_offset, extent_full,    \
+                         rank)                                               \
+  } else {                                                                   \
+    TAGGED_LOOP_LAYOUT_4(tag, func, type, is_left, m_offset, extent_partial, \
+                         rank)                                               \
+  }
 
-#define TAGGED_TILE_LOOP_5( tag, func, type, is_left, cond, m_offset, extent_full, extent_partial, rank ) \
-  if (cond) { TAGGED_LOOP_LAYOUT_5( tag, func, type, is_left, m_offset, extent_full, rank ) } \
-  else      { TAGGED_LOOP_LAYOUT_5( tag, func, type, is_left, m_offset, extent_partial, rank ) }
+#define TAGGED_TILE_LOOP_5(tag, func, type, is_left, cond, m_offset,         \
+                           extent_full, extent_partial, rank)                \
+  if (cond) {                                                                \
+    TAGGED_LOOP_LAYOUT_5(tag, func, type, is_left, m_offset, extent_full,    \
+                         rank)                                               \
+  } else {                                                                   \
+    TAGGED_LOOP_LAYOUT_5(tag, func, type, is_left, m_offset, extent_partial, \
+                         rank)                                               \
+  }
 
-#define TAGGED_TILE_LOOP_6( tag, func, type, is_left, cond, m_offset, extent_full, extent_partial, rank ) \
-  if (cond) { TAGGED_LOOP_LAYOUT_6( tag, func, type, is_left, m_offset, extent_full, rank ) } \
-  else      { TAGGED_LOOP_LAYOUT_6( tag, func, type, is_left, m_offset, extent_partial, rank ) }
+#define TAGGED_TILE_LOOP_6(tag, func, type, is_left, cond, m_offset,         \
+                           extent_full, extent_partial, rank)                \
+  if (cond) {                                                                \
+    TAGGED_LOOP_LAYOUT_6(tag, func, type, is_left, m_offset, extent_full,    \
+                         rank)                                               \
+  } else {                                                                   \
+    TAGGED_LOOP_LAYOUT_6(tag, func, type, is_left, m_offset, extent_partial, \
+                         rank)                                               \
+  }
 
-#define TAGGED_TILE_LOOP_7( tag, func, type, is_left, cond, m_offset, extent_full, extent_partial, rank ) \
-  if (cond) { TAGGED_LOOP_LAYOUT_7( tag, func, type, is_left, m_offset, extent_full, rank ) } \
-  else      { TAGGED_LOOP_LAYOUT_7( tag, func, type, is_left, m_offset, extent_partial, rank ) }
-
-#define TAGGED_TILE_LOOP_8( tag, func, type, is_left, cond, m_offset, extent_full, extent_partial, rank ) \
-  if (cond) { TAGGED_LOOP_LAYOUT_8( tag, func, type, is_left, m_offset, extent_full, rank ) } \
-  else      { TAGGED_LOOP_LAYOUT_8( tag, func, type, is_left, m_offset, extent_partial, rank ) }
+#define TAGGED_TILE_LOOP_7(tag, func, type, is_left, cond, m_offset,         \
+                           extent_full, extent_partial, rank)                \
+  if (cond) {                                                                \
+    TAGGED_LOOP_LAYOUT_7(tag, func, type, is_left, m_offset, extent_full,    \
+                         rank)                                               \
+  } else {                                                                   \
+    TAGGED_LOOP_LAYOUT_7(tag, func, type, is_left, m_offset, extent_partial, \
+                         rank)                                               \
+  }
 
+#define TAGGED_TILE_LOOP_8(tag, func, type, is_left, cond, m_offset,         \
+                           extent_full, extent_partial, rank)                \
+  if (cond) {                                                                \
+    TAGGED_LOOP_LAYOUT_8(tag, func, type, is_left, m_offset, extent_full,    \
+                         rank)                                               \
+  } else {                                                                   \
+    TAGGED_LOOP_LAYOUT_8(tag, func, type, is_left, m_offset, extent_partial, \
+                         rank)                                               \
+  }
 
 // parallel_reduce, tagged
 // Reduction version
-#define TAGGED_APPLY_REDUX( val, tag, func, ... ) \
-  func( tag, __VA_ARGS__, val );
+#define TAGGED_APPLY_REDUX(val, tag, func, ...) func(tag, __VA_ARGS__, val);
 
 // LayoutRight
 // d = 0 to start
-#define TAGGED_LOOP_R_1_REDUX( val, tag, func, type, m_offset, extent, d, ... )    \
-  KOKKOS_ENABLE_IVDEP_MDRANGE                            \
-  for( type i0 = (type)0; i0 < static_cast<type>(extent[d]); ++i0) { \
-    TAGGED_APPLY_REDUX( val, tag, func, __VA_ARGS__, i0 + m_offset[d] )              \
+#define TAGGED_LOOP_R_1_REDUX(val, tag, func, type, m_offset, extent, d, ...) \
+  KOKKOS_ENABLE_IVDEP_MDRANGE                                                 \
+  for (type i0 = (type)0; i0 < static_cast<type>(extent[d]); ++i0) {          \
+    TAGGED_APPLY_REDUX(val, tag, func, __VA_ARGS__, i0 + m_offset[d])         \
   }
 
-#define TAGGED_LOOP_R_2_REDUX( val, tag, func, type, m_offset, extent, d, ... )             \
-  for( type i1 = (type)0; i1 < static_cast<type>(extent[d]); ++i1) {          \
-    TAGGED_LOOP_R_1_REDUX( val, tag, func, type, m_offset, extent, d+1 , __VA_ARGS__, i1 + m_offset[d] ) \
+#define TAGGED_LOOP_R_2_REDUX(val, tag, func, type, m_offset, extent, d, ...) \
+  for (type i1 = (type)0; i1 < static_cast<type>(extent[d]); ++i1) {          \
+    TAGGED_LOOP_R_1_REDUX(val, tag, func, type, m_offset, extent, d + 1,      \
+                          __VA_ARGS__, i1 + m_offset[d])                      \
   }
 
-#define TAGGED_LOOP_R_3_REDUX( val, tag, func, type, m_offset, extent, d, ... )             \
-  for( type i2 = (type)0; i2 < static_cast<type>(extent[d]); ++i2) {          \
-    TAGGED_LOOP_R_2_REDUX( val, tag, func, type, m_offset, extent, d+1 , __VA_ARGS__, i2 + m_offset[d] ) \
+#define TAGGED_LOOP_R_3_REDUX(val, tag, func, type, m_offset, extent, d, ...) \
+  for (type i2 = (type)0; i2 < static_cast<type>(extent[d]); ++i2) {          \
+    TAGGED_LOOP_R_2_REDUX(val, tag, func, type, m_offset, extent, d + 1,      \
+                          __VA_ARGS__, i2 + m_offset[d])                      \
   }
 
-#define TAGGED_LOOP_R_4_REDUX( val, tag, func, type, m_offset, extent, d, ... )             \
-  for( type i3 = (type)0; i3 < static_cast<type>(extent[d]); ++i3) {          \
-    TAGGED_LOOP_R_3_REDUX( val, tag, func, type, m_offset, extent, d+1 , __VA_ARGS__, i3 + m_offset[d] ) \
+#define TAGGED_LOOP_R_4_REDUX(val, tag, func, type, m_offset, extent, d, ...) \
+  for (type i3 = (type)0; i3 < static_cast<type>(extent[d]); ++i3) {          \
+    TAGGED_LOOP_R_3_REDUX(val, tag, func, type, m_offset, extent, d + 1,      \
+                          __VA_ARGS__, i3 + m_offset[d])                      \
   }
 
-#define TAGGED_LOOP_R_5_REDUX( val, tag, func, type, m_offset, extent, d, ... )             \
-  for( type i4 = (type)0; i4 < static_cast<type>(extent[d]); ++i4) {          \
-    TAGGED_LOOP_R_4_REDUX( val, tag, func, type, m_offset, extent, d+1 , __VA_ARGS__, i4 + m_offset[d] ) \
+#define TAGGED_LOOP_R_5_REDUX(val, tag, func, type, m_offset, extent, d, ...) \
+  for (type i4 = (type)0; i4 < static_cast<type>(extent[d]); ++i4) {          \
+    TAGGED_LOOP_R_4_REDUX(val, tag, func, type, m_offset, extent, d + 1,      \
+                          __VA_ARGS__, i4 + m_offset[d])                      \
   }
 
-#define TAGGED_LOOP_R_6_REDUX( val, tag, func, type, m_offset, extent, d, ... )             \
-  for( type i5 = (type)0; i5 < static_cast<type>(extent[d]); ++i5) {          \
-    TAGGED_LOOP_R_5_REDUX( val, tag, func, type, m_offset, extent, d+1 , __VA_ARGS__, i5 + m_offset[d] ) \
+#define TAGGED_LOOP_R_6_REDUX(val, tag, func, type, m_offset, extent, d, ...) \
+  for (type i5 = (type)0; i5 < static_cast<type>(extent[d]); ++i5) {          \
+    TAGGED_LOOP_R_5_REDUX(val, tag, func, type, m_offset, extent, d + 1,      \
+                          __VA_ARGS__, i5 + m_offset[d])                      \
   }
 
-#define TAGGED_LOOP_R_7_REDUX( val, tag, func, type, m_offset, extent, d, ... )             \
-  for( type i6 = (type)0; i6 < static_cast<type>(extent[d]); ++i6) {          \
-    TAGGED_LOOP_R_6_REDUX( val, tag, func, type, m_offset, extent, d+1 , __VA_ARGS__, i6 + m_offset[d] ) \
+#define TAGGED_LOOP_R_7_REDUX(val, tag, func, type, m_offset, extent, d, ...) \
+  for (type i6 = (type)0; i6 < static_cast<type>(extent[d]); ++i6) {          \
+    TAGGED_LOOP_R_6_REDUX(val, tag, func, type, m_offset, extent, d + 1,      \
+                          __VA_ARGS__, i6 + m_offset[d])                      \
   }
 
-#define TAGGED_LOOP_R_8_REDUX( val, tag, func, type, m_offset, extent, d, ... )             \
-  for( type i7 = (type)0; i7 < static_cast<type>(extent[d]); ++i7) {          \
-    TAGGED_LOOP_R_7_REDUX( val, tag, func, type, m_offset, extent, d+1 , __VA_ARGS__, i7 + m_offset[d] ) \
+#define TAGGED_LOOP_R_8_REDUX(val, tag, func, type, m_offset, extent, d, ...) \
+  for (type i7 = (type)0; i7 < static_cast<type>(extent[d]); ++i7) {          \
+    TAGGED_LOOP_R_7_REDUX(val, tag, func, type, m_offset, extent, d + 1,      \
+                          __VA_ARGS__, i7 + m_offset[d])                      \
   }
 
-//LayoutLeft
+// LayoutLeft
 // d = rank-1 to start
-#define TAGGED_LOOP_L_1_REDUX( val, tag, func, type, m_offset, extent, d, ... )    \
-  KOKKOS_ENABLE_IVDEP_MDRANGE                            \
-  for( type i0 = (type)0; i0 < static_cast<type>(extent[d]); ++i0) { \
-    TAGGED_APPLY_REDUX( val, tag, func, i0 + m_offset[d] , __VA_ARGS__ )              \
+#define TAGGED_LOOP_L_1_REDUX(val, tag, func, type, m_offset, extent, d, ...) \
+  KOKKOS_ENABLE_IVDEP_MDRANGE                                                 \
+  for (type i0 = (type)0; i0 < static_cast<type>(extent[d]); ++i0) {          \
+    TAGGED_APPLY_REDUX(val, tag, func, i0 + m_offset[d], __VA_ARGS__)         \
   }
 
-#define TAGGED_LOOP_L_2_REDUX( val, tag, func, type, m_offset, extent, d, ... )             \
-  for( type i1 = (type)0; i1 < static_cast<type>(extent[d]); ++i1) {          \
-    TAGGED_LOOP_L_1_REDUX( val, tag, func, type, m_offset, extent, d-1, i1 + m_offset[d] , __VA_ARGS__ ) \
+#define TAGGED_LOOP_L_2_REDUX(val, tag, func, type, m_offset, extent, d, ...) \
+  for (type i1 = (type)0; i1 < static_cast<type>(extent[d]); ++i1) {          \
+    TAGGED_LOOP_L_1_REDUX(val, tag, func, type, m_offset, extent, d - 1,      \
+                          i1 + m_offset[d], __VA_ARGS__)                      \
   }
 
-#define TAGGED_LOOP_L_3_REDUX( val, tag, func, type, m_offset, extent, d, ... )             \
-  for( type i2 = (type)0; i2 < static_cast<type>(extent[d]); ++i2) {          \
-    TAGGED_LOOP_L_2_REDUX( val, tag, func, type, m_offset, extent, d-1, i2 + m_offset[d] , __VA_ARGS__ ) \
+#define TAGGED_LOOP_L_3_REDUX(val, tag, func, type, m_offset, extent, d, ...) \
+  for (type i2 = (type)0; i2 < static_cast<type>(extent[d]); ++i2) {          \
+    TAGGED_LOOP_L_2_REDUX(val, tag, func, type, m_offset, extent, d - 1,      \
+                          i2 + m_offset[d], __VA_ARGS__)                      \
   }
 
-#define TAGGED_LOOP_L_4_REDUX( val, tag, func, type, m_offset, extent, d, ... )             \
-  for( type i3 = (type)0; i3 < static_cast<type>(extent[d]); ++i3) {          \
-    TAGGED_LOOP_L_3_REDUX( val, tag, func, type, m_offset, extent, d-1, i3 + m_offset[d] , __VA_ARGS__ ) \
+#define TAGGED_LOOP_L_4_REDUX(val, tag, func, type, m_offset, extent, d, ...) \
+  for (type i3 = (type)0; i3 < static_cast<type>(extent[d]); ++i3) {          \
+    TAGGED_LOOP_L_3_REDUX(val, tag, func, type, m_offset, extent, d - 1,      \
+                          i3 + m_offset[d], __VA_ARGS__)                      \
   }
 
-#define TAGGED_LOOP_L_5_REDUX( val, tag, func, type, m_offset, extent, d, ... )             \
-  for( type i4 = (type)0; i4 < static_cast<type>(extent[d]); ++i4) {          \
-    TAGGED_LOOP_L_4_REDUX( val, tag, func, type, m_offset, extent, d-1, i4 + m_offset[d] , __VA_ARGS__ ) \
+#define TAGGED_LOOP_L_5_REDUX(val, tag, func, type, m_offset, extent, d, ...) \
+  for (type i4 = (type)0; i4 < static_cast<type>(extent[d]); ++i4) {          \
+    TAGGED_LOOP_L_4_REDUX(val, tag, func, type, m_offset, extent, d - 1,      \
+                          i4 + m_offset[d], __VA_ARGS__)                      \
   }
 
-#define TAGGED_LOOP_L_6_REDUX( val, tag, func, type, m_offset, extent, d, ... )             \
-  for( type i5 = (type)0; i5 < static_cast<type>(extent[d]); ++i5) {          \
-    TAGGED_LOOP_L_5_REDUX( val, tag, func, type, m_offset, extent, d-1, i5 + m_offset[d] , __VA_ARGS__ ) \
+#define TAGGED_LOOP_L_6_REDUX(val, tag, func, type, m_offset, extent, d, ...) \
+  for (type i5 = (type)0; i5 < static_cast<type>(extent[d]); ++i5) {          \
+    TAGGED_LOOP_L_5_REDUX(val, tag, func, type, m_offset, extent, d - 1,      \
+                          i5 + m_offset[d], __VA_ARGS__)                      \
   }
 
-#define TAGGED_LOOP_L_7_REDUX( val, tag, func, type, m_offset, extent, d, ... )             \
-  for( type i6 = (type)0; i6 < static_cast<type>(extent[d]); ++i6) {          \
-    TAGGED_LOOP_L_6_REDUX( val, tag, func, type, m_offset, extent, d-1, i6 + m_offset[d] , __VA_ARGS__ ) \
+#define TAGGED_LOOP_L_7_REDUX(val, tag, func, type, m_offset, extent, d, ...) \
+  for (type i6 = (type)0; i6 < static_cast<type>(extent[d]); ++i6) {          \
+    TAGGED_LOOP_L_6_REDUX(val, tag, func, type, m_offset, extent, d - 1,      \
+                          i6 + m_offset[d], __VA_ARGS__)                      \
   }
 
-#define TAGGED_LOOP_L_8_REDUX( val, tag, func, type, m_offset, extent, d, ... )             \
-  for( type i7 = (type)0; i7 < static_cast<type>(extent[d]); ++i7) {          \
-    TAGGED_LOOP_L_7_REDUX( val, tag, func, type, m_offset, extent, d-1, i7 + m_offset[d] , __VA_ARGS__ ) \
+#define TAGGED_LOOP_L_8_REDUX(val, tag, func, type, m_offset, extent, d, ...) \
+  for (type i7 = (type)0; i7 < static_cast<type>(extent[d]); ++i7) {          \
+    TAGGED_LOOP_L_7_REDUX(val, tag, func, type, m_offset, extent, d - 1,      \
+                          i7 + m_offset[d], __VA_ARGS__)                      \
   }
 
 // Left vs Right
-#define TAGGED_LOOP_LAYOUT_1_REDUX( val, tag, func, type, is_left, m_offset, extent, rank )  \
-  KOKKOS_ENABLE_IVDEP_MDRANGE                            \
-  for( type i0 = (type)0; i0 < static_cast<type>(extent[0]); ++i0) { \
-    TAGGED_APPLY_REDUX( val, tag, func, i0 + m_offset[0] )              \
+#define TAGGED_LOOP_LAYOUT_1_REDUX(val, tag, func, type, is_left, m_offset, \
+                                   extent, rank)                            \
+  KOKKOS_ENABLE_IVDEP_MDRANGE                                               \
+  for (type i0 = (type)0; i0 < static_cast<type>(extent[0]); ++i0) {        \
+    TAGGED_APPLY_REDUX(val, tag, func, i0 + m_offset[0])                    \
   }
 
-#define TAGGED_LOOP_LAYOUT_2_REDUX( val, tag, func, type, is_left, m_offset, extent, rank )  \
-  if (is_left) { \
-    for( type i1 = (type)0; i1 < static_cast<type>(extent[rank-1]); ++i1) {   \
-      TAGGED_LOOP_L_1_REDUX( val, tag, func, type, m_offset, extent, rank-2, i1 + m_offset[rank-1] ) \
-    } \
-  } \
-  else         { \
-    for( type i1 = (type)0; i1 < static_cast<type>(extent[0]); ++i1) { \
-      TAGGED_LOOP_R_1_REDUX( val, tag, func, type, m_offset, extent, 1 , i1 + m_offset[0] )   \
-    } \
+#define TAGGED_LOOP_LAYOUT_2_REDUX(val, tag, func, type, is_left, m_offset,   \
+                                   extent, rank)                              \
+  if (is_left) {                                                              \
+    for (type i1 = (type)0; i1 < static_cast<type>(extent[rank - 1]); ++i1) { \
+      TAGGED_LOOP_L_1_REDUX(val, tag, func, type, m_offset, extent, rank - 2, \
+                            i1 + m_offset[rank - 1])                          \
+    }                                                                         \
+  } else {                                                                    \
+    for (type i1 = (type)0; i1 < static_cast<type>(extent[0]); ++i1) {        \
+      TAGGED_LOOP_R_1_REDUX(val, tag, func, type, m_offset, extent, 1,        \
+                            i1 + m_offset[0])                                 \
+    }                                                                         \
   }
 
-#define TAGGED_LOOP_LAYOUT_3_REDUX( val, tag, func, type, is_left, m_offset, extent, rank )  \
-  if (is_left) { \
-    for( type i2 = (type)0; i2 < static_cast<type>(extent[rank-1]); ++i2) {   \
-      TAGGED_LOOP_L_2_REDUX( val, tag, func, type, m_offset, extent, rank-2, i2 + m_offset[rank-1] ) \
-    } \
-  } \
-  else         { \
-    for( type i2 = (type)0; i2 < static_cast<type>(extent[0]); ++i2) { \
-      TAGGED_LOOP_R_2_REDUX( val, tag, func, type, m_offset, extent, 1 , i2 + m_offset[0] )   \
-    } \
+#define TAGGED_LOOP_LAYOUT_3_REDUX(val, tag, func, type, is_left, m_offset,   \
+                                   extent, rank)                              \
+  if (is_left) {                                                              \
+    for (type i2 = (type)0; i2 < static_cast<type>(extent[rank - 1]); ++i2) { \
+      TAGGED_LOOP_L_2_REDUX(val, tag, func, type, m_offset, extent, rank - 2, \
+                            i2 + m_offset[rank - 1])                          \
+    }                                                                         \
+  } else {                                                                    \
+    for (type i2 = (type)0; i2 < static_cast<type>(extent[0]); ++i2) {        \
+      TAGGED_LOOP_R_2_REDUX(val, tag, func, type, m_offset, extent, 1,        \
+                            i2 + m_offset[0])                                 \
+    }                                                                         \
   }
 
-#define TAGGED_LOOP_LAYOUT_4_REDUX( val, tag, func, type, is_left, m_offset, extent, rank )  \
-  if (is_left) { \
-    for( type i3 = (type)0; i3 < static_cast<type>(extent[rank-1]); ++i3) {   \
-      TAGGED_LOOP_L_3_REDUX( val, tag, func, type, m_offset, extent, rank-2, i3 + m_offset[rank-1] ) \
-    } \
-  } \
-  else         { \
-    for( type i3 = (type)0; i3 < static_cast<type>(extent[0]); ++i3) { \
-      TAGGED_LOOP_R_3_REDUX( val, tag, func, type, m_offset, extent, 1 , i3 + m_offset[0] )   \
-    } \
+#define TAGGED_LOOP_LAYOUT_4_REDUX(val, tag, func, type, is_left, m_offset,   \
+                                   extent, rank)                              \
+  if (is_left) {                                                              \
+    for (type i3 = (type)0; i3 < static_cast<type>(extent[rank - 1]); ++i3) { \
+      TAGGED_LOOP_L_3_REDUX(val, tag, func, type, m_offset, extent, rank - 2, \
+                            i3 + m_offset[rank - 1])                          \
+    }                                                                         \
+  } else {                                                                    \
+    for (type i3 = (type)0; i3 < static_cast<type>(extent[0]); ++i3) {        \
+      TAGGED_LOOP_R_3_REDUX(val, tag, func, type, m_offset, extent, 1,        \
+                            i3 + m_offset[0])                                 \
+    }                                                                         \
   }
 
-#define TAGGED_LOOP_LAYOUT_5_REDUX( val, tag, func, type, is_left, m_offset, extent, rank )  \
-  if (is_left) { \
-    for( type i4 = (type)0; i4 < static_cast<type>(extent[rank-1]); ++i4) {   \
-      TAGGED_LOOP_L_4_REDUX( val, tag, func, type, m_offset, extent, rank-2, i4 + m_offset[rank-1] ) \
-    } \
-  } \
-  else         { \
-    for( type i4 = (type)0; i4 < static_cast<type>(extent[0]); ++i4) { \
-      TAGGED_LOOP_R_4_REDUX( val, tag, func, type, m_offset, extent, 1 , i4 + m_offset[0] )   \
-    } \
+#define TAGGED_LOOP_LAYOUT_5_REDUX(val, tag, func, type, is_left, m_offset,   \
+                                   extent, rank)                              \
+  if (is_left) {                                                              \
+    for (type i4 = (type)0; i4 < static_cast<type>(extent[rank - 1]); ++i4) { \
+      TAGGED_LOOP_L_4_REDUX(val, tag, func, type, m_offset, extent, rank - 2, \
+                            i4 + m_offset[rank - 1])                          \
+    }                                                                         \
+  } else {                                                                    \
+    for (type i4 = (type)0; i4 < static_cast<type>(extent[0]); ++i4) {        \
+      TAGGED_LOOP_R_4_REDUX(val, tag, func, type, m_offset, extent, 1,        \
+                            i4 + m_offset[0])                                 \
+    }                                                                         \
   }
 
-#define TAGGED_LOOP_LAYOUT_6_REDUX( val, tag, func, type, is_left, m_offset, extent, rank )  \
-  if (is_left) { \
-    for( type i5 = (type)0; i5 < static_cast<type>(extent[rank-1]); ++i5) {   \
-      TAGGED_LOOP_L_5_REDUX( val, tag, func, type, m_offset, extent, rank-2, i5 + m_offset[rank-1] ) \
-    } \
-  } \
-  else         { \
-    for( type i5 = (type)0; i5 < static_cast<type>(extent[0]); ++i5) { \
-      TAGGED_LOOP_R_5_REDUX( val, tag, func, type, m_offset, extent, 1 , i5 + m_offset[0] )   \
-    } \
+#define TAGGED_LOOP_LAYOUT_6_REDUX(val, tag, func, type, is_left, m_offset,   \
+                                   extent, rank)                              \
+  if (is_left) {                                                              \
+    for (type i5 = (type)0; i5 < static_cast<type>(extent[rank - 1]); ++i5) { \
+      TAGGED_LOOP_L_5_REDUX(val, tag, func, type, m_offset, extent, rank - 2, \
+                            i5 + m_offset[rank - 1])                          \
+    }                                                                         \
+  } else {                                                                    \
+    for (type i5 = (type)0; i5 < static_cast<type>(extent[0]); ++i5) {        \
+      TAGGED_LOOP_R_5_REDUX(val, tag, func, type, m_offset, extent, 1,        \
+                            i5 + m_offset[0])                                 \
+    }                                                                         \
   }
 
-#define TAGGED_LOOP_LAYOUT_7_REDUX( val, tag, func, type, is_left, m_offset, extent, rank )  \
-  if (is_left) { \
-    for( type i6 = (type)0; i6 < static_cast<type>(extent[rank-1]); ++i6) {   \
-      TAGGED_LOOP_L_6_REDUX( val, tag, func, type, m_offset, extent, rank-2, i6 + m_offset[rank-1] ) \
-    } \
-  } \
-  else         { \
-    for( type i6 = (type)0; i6 < static_cast<type>(extent[0]); ++i6) { \
-      TAGGED_LOOP_R_6_REDUX( val, tag, func, type, m_offset, extent, 1 , i6 + m_offset[0] )   \
-    } \
+#define TAGGED_LOOP_LAYOUT_7_REDUX(val, tag, func, type, is_left, m_offset,   \
+                                   extent, rank)                              \
+  if (is_left) {                                                              \
+    for (type i6 = (type)0; i6 < static_cast<type>(extent[rank - 1]); ++i6) { \
+      TAGGED_LOOP_L_6_REDUX(val, tag, func, type, m_offset, extent, rank - 2, \
+                            i6 + m_offset[rank - 1])                          \
+    }                                                                         \
+  } else {                                                                    \
+    for (type i6 = (type)0; i6 < static_cast<type>(extent[0]); ++i6) {        \
+      TAGGED_LOOP_R_6_REDUX(val, tag, func, type, m_offset, extent, 1,        \
+                            i6 + m_offset[0])                                 \
+    }                                                                         \
   }
 
-#define TAGGED_LOOP_LAYOUT_8_REDUX( val, tag, func, type, is_left, m_offset, extent, rank )  \
-  if (is_left) { \
-    for( type i7 = (type)0; i7 < static_cast<type>(extent[rank-1]); ++i7) {   \
-      TAGGED_LOOP_L_7_REDUX( val, tag, func, type, m_offset, extent, rank-2, i7 + m_offset[rank-1] ) \
-    } \
-  } \
-  else         { \
-    for( type i7 = (type)0; i7 < static_cast<type>(extent[0]); ++i7) { \
-      TAGGED_LOOP_R_7_REDUX( val, tag, func, type, m_offset, extent, 1 , i7 + m_offset[0] )   \
-    } \
+#define TAGGED_LOOP_LAYOUT_8_REDUX(val, tag, func, type, is_left, m_offset,   \
+                                   extent, rank)                              \
+  if (is_left) {                                                              \
+    for (type i7 = (type)0; i7 < static_cast<type>(extent[rank - 1]); ++i7) { \
+      TAGGED_LOOP_L_7_REDUX(val, tag, func, type, m_offset, extent, rank - 2, \
+                            i7 + m_offset[rank - 1])                          \
+    }                                                                         \
+  } else {                                                                    \
+    for (type i7 = (type)0; i7 < static_cast<type>(extent[0]); ++i7) {        \
+      TAGGED_LOOP_R_7_REDUX(val, tag, func, type, m_offset, extent, 1,        \
+                            i7 + m_offset[0])                                 \
+    }                                                                         \
   }
 
 // Partial vs Full Tile
-#define TAGGED_TILE_LOOP_1_REDUX( val, tag, func, type, is_left, cond, m_offset, extent_full, extent_partial, rank ) \
-  if (cond) { TAGGED_LOOP_LAYOUT_1_REDUX( val, tag, func, type, is_left, m_offset, extent_full, rank ) } \
-  else      { TAGGED_LOOP_LAYOUT_1_REDUX( val, tag, func, type, is_left, m_offset, extent_partial, rank ) }
+#define TAGGED_TILE_LOOP_1_REDUX(val, tag, func, type, is_left, cond,         \
+                                 m_offset, extent_full, extent_partial, rank) \
+  if (cond) {                                                                 \
+    TAGGED_LOOP_LAYOUT_1_REDUX(val, tag, func, type, is_left, m_offset,       \
+                               extent_full, rank)                             \
+  } else {                                                                    \
+    TAGGED_LOOP_LAYOUT_1_REDUX(val, tag, func, type, is_left, m_offset,       \
+                               extent_partial, rank)                          \
+  }
 
-#define TAGGED_TILE_LOOP_2_REDUX( val, tag, func, type, is_left, cond, m_offset, extent_full, extent_partial, rank ) \
-  if (cond) { TAGGED_LOOP_LAYOUT_2_REDUX( val, tag, func, type, is_left, m_offset, extent_full, rank ) } \
-  else      { TAGGED_LOOP_LAYOUT_2_REDUX( val, tag, func, type, is_left, m_offset, extent_partial, rank ) }
+#define TAGGED_TILE_LOOP_2_REDUX(val, tag, func, type, is_left, cond,         \
+                                 m_offset, extent_full, extent_partial, rank) \
+  if (cond) {                                                                 \
+    TAGGED_LOOP_LAYOUT_2_REDUX(val, tag, func, type, is_left, m_offset,       \
+                               extent_full, rank)                             \
+  } else {                                                                    \
+    TAGGED_LOOP_LAYOUT_2_REDUX(val, tag, func, type, is_left, m_offset,       \
+                               extent_partial, rank)                          \
+  }
 
-#define TAGGED_TILE_LOOP_3_REDUX( val, tag, func, type, is_left, cond, m_offset, extent_full, extent_partial, rank ) \
-  if (cond) { TAGGED_LOOP_LAYOUT_3_REDUX( val, tag, func, type, is_left, m_offset, extent_full, rank ) } \
-  else      { TAGGED_LOOP_LAYOUT_3_REDUX( val, tag, func, type, is_left, m_offset, extent_partial, rank ) }
+#define TAGGED_TILE_LOOP_3_REDUX(val, tag, func, type, is_left, cond,         \
+                                 m_offset, extent_full, extent_partial, rank) \
+  if (cond) {                                                                 \
+    TAGGED_LOOP_LAYOUT_3_REDUX(val, tag, func, type, is_left, m_offset,       \
+                               extent_full, rank)                             \
+  } else {                                                                    \
+    TAGGED_LOOP_LAYOUT_3_REDUX(val, tag, func, type, is_left, m_offset,       \
+                               extent_partial, rank)                          \
+  }
 
-#define TAGGED_TILE_LOOP_4_REDUX( val, tag, func, type, is_left, cond, m_offset, extent_full, extent_partial, rank ) \
-  if (cond) { TAGGED_LOOP_LAYOUT_4_REDUX( val, tag, func, type, is_left, m_offset, extent_full, rank ) } \
-  else      { TAGGED_LOOP_LAYOUT_4_REDUX( val, tag, func, type, is_left, m_offset, extent_partial, rank ) }
+#define TAGGED_TILE_LOOP_4_REDUX(val, tag, func, type, is_left, cond,         \
+                                 m_offset, extent_full, extent_partial, rank) \
+  if (cond) {                                                                 \
+    TAGGED_LOOP_LAYOUT_4_REDUX(val, tag, func, type, is_left, m_offset,       \
+                               extent_full, rank)                             \
+  } else {                                                                    \
+    TAGGED_LOOP_LAYOUT_4_REDUX(val, tag, func, type, is_left, m_offset,       \
+                               extent_partial, rank)                          \
+  }
 
-#define TAGGED_TILE_LOOP_5_REDUX( val, tag, func, type, is_left, cond, m_offset, extent_full, extent_partial, rank ) \
-  if (cond) { TAGGED_LOOP_LAYOUT_5_REDUX( val, tag, func, type, is_left, m_offset, extent_full, rank ) } \
-  else      { TAGGED_LOOP_LAYOUT_5_REDUX( val, tag, func, type, is_left, m_offset, extent_partial, rank ) }
+#define TAGGED_TILE_LOOP_5_REDUX(val, tag, func, type, is_left, cond,         \
+                                 m_offset, extent_full, extent_partial, rank) \
+  if (cond) {                                                                 \
+    TAGGED_LOOP_LAYOUT_5_REDUX(val, tag, func, type, is_left, m_offset,       \
+                               extent_full, rank)                             \
+  } else {                                                                    \
+    TAGGED_LOOP_LAYOUT_5_REDUX(val, tag, func, type, is_left, m_offset,       \
+                               extent_partial, rank)                          \
+  }
 
-#define TAGGED_TILE_LOOP_6_REDUX( val, tag, func, type, is_left, cond, m_offset, extent_full, extent_partial, rank ) \
-  if (cond) { TAGGED_LOOP_LAYOUT_6_REDUX( val, tag, func, type, is_left, m_offset, extent_full, rank ) } \
-  else      { TAGGED_LOOP_LAYOUT_6_REDUX( val, tag, func, type, is_left, m_offset, extent_partial, rank ) }
+#define TAGGED_TILE_LOOP_6_REDUX(val, tag, func, type, is_left, cond,         \
+                                 m_offset, extent_full, extent_partial, rank) \
+  if (cond) {                                                                 \
+    TAGGED_LOOP_LAYOUT_6_REDUX(val, tag, func, type, is_left, m_offset,       \
+                               extent_full, rank)                             \
+  } else {                                                                    \
+    TAGGED_LOOP_LAYOUT_6_REDUX(val, tag, func, type, is_left, m_offset,       \
+                               extent_partial, rank)                          \
+  }
 
-#define TAGGED_TILE_LOOP_7_REDUX( val, tag, func, type, is_left, cond, m_offset, extent_full, extent_partial, rank ) \
-  if (cond) { TAGGED_LOOP_LAYOUT_7_REDUX( val, tag, func, type, is_left, m_offset, extent_full, rank ) } \
-  else      { TAGGED_LOOP_LAYOUT_7_REDUX( val, tag, func, type, is_left, m_offset, extent_partial, rank ) }
+#define TAGGED_TILE_LOOP_7_REDUX(val, tag, func, type, is_left, cond,         \
+                                 m_offset, extent_full, extent_partial, rank) \
+  if (cond) {                                                                 \
+    TAGGED_LOOP_LAYOUT_7_REDUX(val, tag, func, type, is_left, m_offset,       \
+                               extent_full, rank)                             \
+  } else {                                                                    \
+    TAGGED_LOOP_LAYOUT_7_REDUX(val, tag, func, type, is_left, m_offset,       \
+                               extent_partial, rank)                          \
+  }
 
-#define TAGGED_TILE_LOOP_8_REDUX( val, tag, func, type, is_left, cond, m_offset, extent_full, extent_partial, rank ) \
-  if (cond) { TAGGED_LOOP_LAYOUT_8_REDUX( val, tag, func, type, is_left, m_offset, extent_full, rank ) } \
-  else      { TAGGED_LOOP_LAYOUT_8_REDUX( val, tag, func, type, is_left, m_offset, extent_partial, rank ) }
+#define TAGGED_TILE_LOOP_8_REDUX(val, tag, func, type, is_left, cond,         \
+                                 m_offset, extent_full, extent_partial, rank) \
+  if (cond) {                                                                 \
+    TAGGED_LOOP_LAYOUT_8_REDUX(val, tag, func, type, is_left, m_offset,       \
+                               extent_full, rank)                             \
+  } else {                                                                    \
+    TAGGED_LOOP_LAYOUT_8_REDUX(val, tag, func, type, is_left, m_offset,       \
+                               extent_partial, rank)                          \
+  }
 
 // end tagged macros
 
-
 // Structs for calling loops
-template < int Rank, bool IsLeft, typename IType, typename Tagged, typename Enable = void >
+template <int Rank, bool IsLeft, typename IType, typename Tagged,
+          typename Enable = void>
 struct Tile_Loop_Type;
 
-template < bool IsLeft, typename IType >
-struct Tile_Loop_Type<1, IsLeft, IType, void, void >
-{
-  template < typename Func, typename Offset, typename ExtentA, typename ExtentB >
-  static void apply(Func const& func, bool cond, Offset const& offset, ExtentA const& a, ExtentB const& b)
-  {
-    TILE_LOOP_1( func, IType, IsLeft, cond, offset, a, b, 1 );
+template <bool IsLeft, typename IType>
+struct Tile_Loop_Type<1, IsLeft, IType, void, void> {
+  template <typename Func, typename Offset, typename ExtentA, typename ExtentB>
+  static void apply(Func const& func, bool cond, Offset const& offset,
+                    ExtentA const& a, ExtentB const& b) {
+    TILE_LOOP_1(func, IType, IsLeft, cond, offset, a, b, 1);
   }
 
-  template < typename ValType, typename Func, typename Offset, typename ExtentA, typename ExtentB >
-  static void apply(ValType &value, Func const& func, bool cond, Offset const& offset, ExtentA const& a, ExtentB const& b)
-  {
-    TILE_LOOP_1_REDUX( value, func, IType, IsLeft, cond, offset, a, b, 1 );
+  template <typename ValType, typename Func, typename Offset, typename ExtentA,
+            typename ExtentB>
+  static void apply(ValType& value, Func const& func, bool cond,
+                    Offset const& offset, ExtentA const& a, ExtentB const& b) {
+    TILE_LOOP_1_REDUX(value, func, IType, IsLeft, cond, offset, a, b, 1);
   }
 };
 
-template < bool IsLeft, typename IType >
-struct Tile_Loop_Type<2, IsLeft, IType, void, void>
-{
-  template < typename Func, typename Offset, typename ExtentA, typename ExtentB >
-  static void apply(Func const& func, bool cond, Offset const& offset, ExtentA const& a, ExtentB const& b)
-  {
-    TILE_LOOP_2( func, IType, IsLeft, cond, offset, a, b, 2 );
+template <bool IsLeft, typename IType>
+struct Tile_Loop_Type<2, IsLeft, IType, void, void> {
+  template <typename Func, typename Offset, typename ExtentA, typename ExtentB>
+  static void apply(Func const& func, bool cond, Offset const& offset,
+                    ExtentA const& a, ExtentB const& b) {
+    TILE_LOOP_2(func, IType, IsLeft, cond, offset, a, b, 2);
   }
 
-  template < typename ValType, typename Func, typename Offset, typename ExtentA, typename ExtentB >
-  static void apply(ValType &value, Func const& func, bool cond, Offset const& offset, ExtentA const& a, ExtentB const& b)
-  {
-    TILE_LOOP_2_REDUX( value, func, IType, IsLeft, cond, offset, a, b, 2 );
+  template <typename ValType, typename Func, typename Offset, typename ExtentA,
+            typename ExtentB>
+  static void apply(ValType& value, Func const& func, bool cond,
+                    Offset const& offset, ExtentA const& a, ExtentB const& b) {
+    TILE_LOOP_2_REDUX(value, func, IType, IsLeft, cond, offset, a, b, 2);
   }
 };
 
-template < bool IsLeft, typename IType >
-struct Tile_Loop_Type<3, IsLeft, IType, void, void>
-{
-  template < typename Func, typename Offset, typename ExtentA, typename ExtentB >
-  static void apply(Func const& func, bool cond, Offset const& offset, ExtentA const& a, ExtentB const& b)
-  {
-    TILE_LOOP_3( func, IType, IsLeft, cond, offset, a, b, 3 );
+template <bool IsLeft, typename IType>
+struct Tile_Loop_Type<3, IsLeft, IType, void, void> {
+  template <typename Func, typename Offset, typename ExtentA, typename ExtentB>
+  static void apply(Func const& func, bool cond, Offset const& offset,
+                    ExtentA const& a, ExtentB const& b) {
+    TILE_LOOP_3(func, IType, IsLeft, cond, offset, a, b, 3);
   }
 
-  template < typename ValType, typename Func, typename Offset, typename ExtentA, typename ExtentB >
-  static void apply(ValType &value, Func const& func, bool cond, Offset const& offset, ExtentA const& a, ExtentB const& b)
-  {
-    TILE_LOOP_3_REDUX( value, func, IType, IsLeft, cond, offset, a, b, 3 );
+  template <typename ValType, typename Func, typename Offset, typename ExtentA,
+            typename ExtentB>
+  static void apply(ValType& value, Func const& func, bool cond,
+                    Offset const& offset, ExtentA const& a, ExtentB const& b) {
+    TILE_LOOP_3_REDUX(value, func, IType, IsLeft, cond, offset, a, b, 3);
   }
 };
 
-template < bool IsLeft, typename IType >
-struct Tile_Loop_Type<4, IsLeft, IType, void, void>
-{
-  template < typename Func, typename Offset, typename ExtentA, typename ExtentB >
-  static void apply(Func const& func, bool cond, Offset const& offset, ExtentA const& a, ExtentB const& b)
-  {
-    TILE_LOOP_4( func, IType, IsLeft, cond, offset, a, b, 4 );
+template <bool IsLeft, typename IType>
+struct Tile_Loop_Type<4, IsLeft, IType, void, void> {
+  template <typename Func, typename Offset, typename ExtentA, typename ExtentB>
+  static void apply(Func const& func, bool cond, Offset const& offset,
+                    ExtentA const& a, ExtentB const& b) {
+    TILE_LOOP_4(func, IType, IsLeft, cond, offset, a, b, 4);
   }
 
-  template < typename ValType, typename Func, typename Offset, typename ExtentA, typename ExtentB >
-  static void apply(ValType &value, Func const& func, bool cond, Offset const& offset, ExtentA const& a, ExtentB const& b)
-  {
-    TILE_LOOP_4_REDUX( value, func, IType, IsLeft, cond, offset, a, b, 4 );
+  template <typename ValType, typename Func, typename Offset, typename ExtentA,
+            typename ExtentB>
+  static void apply(ValType& value, Func const& func, bool cond,
+                    Offset const& offset, ExtentA const& a, ExtentB const& b) {
+    TILE_LOOP_4_REDUX(value, func, IType, IsLeft, cond, offset, a, b, 4);
   }
 };
 
-template < bool IsLeft, typename IType >
-struct Tile_Loop_Type<5, IsLeft, IType, void, void>
-{
-  template < typename Func, typename Offset, typename ExtentA, typename ExtentB >
-  static void apply(Func const& func, bool cond, Offset const& offset, ExtentA const& a, ExtentB const& b)
-  {
-    TILE_LOOP_5( func, IType, IsLeft, cond, offset, a, b, 5 );
+template <bool IsLeft, typename IType>
+struct Tile_Loop_Type<5, IsLeft, IType, void, void> {
+  template <typename Func, typename Offset, typename ExtentA, typename ExtentB>
+  static void apply(Func const& func, bool cond, Offset const& offset,
+                    ExtentA const& a, ExtentB const& b) {
+    TILE_LOOP_5(func, IType, IsLeft, cond, offset, a, b, 5);
   }
 
-  template < typename ValType, typename Func, typename Offset, typename ExtentA, typename ExtentB >
-  static void apply(ValType &value, Func const& func, bool cond, Offset const& offset, ExtentA const& a, ExtentB const& b)
-  {
-    TILE_LOOP_5_REDUX( value, func, IType, IsLeft, cond, offset, a, b, 5 );
+  template <typename ValType, typename Func, typename Offset, typename ExtentA,
+            typename ExtentB>
+  static void apply(ValType& value, Func const& func, bool cond,
+                    Offset const& offset, ExtentA const& a, ExtentB const& b) {
+    TILE_LOOP_5_REDUX(value, func, IType, IsLeft, cond, offset, a, b, 5);
   }
 };
 
-template < bool IsLeft, typename IType >
-struct Tile_Loop_Type<6, IsLeft, IType, void, void>
-{
-  template < typename Func, typename Offset, typename ExtentA, typename ExtentB >
-  static void apply(Func const& func, bool cond, Offset const& offset, ExtentA const& a, ExtentB const& b)
-  {
-    TILE_LOOP_6( func, IType, IsLeft, cond, offset, a, b, 6 );
+template <bool IsLeft, typename IType>
+struct Tile_Loop_Type<6, IsLeft, IType, void, void> {
+  template <typename Func, typename Offset, typename ExtentA, typename ExtentB>
+  static void apply(Func const& func, bool cond, Offset const& offset,
+                    ExtentA const& a, ExtentB const& b) {
+    TILE_LOOP_6(func, IType, IsLeft, cond, offset, a, b, 6);
   }
 
-  template < typename ValType, typename Func, typename Offset, typename ExtentA, typename ExtentB >
-  static void apply(ValType &value, Func const& func, bool cond, Offset const& offset, ExtentA const& a, ExtentB const& b)
-  {
-    TILE_LOOP_6_REDUX( value, func, IType, IsLeft, cond, offset, a, b, 6 );
+  template <typename ValType, typename Func, typename Offset, typename ExtentA,
+            typename ExtentB>
+  static void apply(ValType& value, Func const& func, bool cond,
+                    Offset const& offset, ExtentA const& a, ExtentB const& b) {
+    TILE_LOOP_6_REDUX(value, func, IType, IsLeft, cond, offset, a, b, 6);
   }
 };
 
-template < bool IsLeft, typename IType >
-struct Tile_Loop_Type<7, IsLeft, IType, void, void>
-{
-  template < typename Func, typename Offset, typename ExtentA, typename ExtentB >
-  static void apply(Func const& func, bool cond, Offset const& offset, ExtentA const& a, ExtentB const& b)
-  {
-    TILE_LOOP_7( func, IType, IsLeft, cond, offset, a, b, 7 );
+template <bool IsLeft, typename IType>
+struct Tile_Loop_Type<7, IsLeft, IType, void, void> {
+  template <typename Func, typename Offset, typename ExtentA, typename ExtentB>
+  static void apply(Func const& func, bool cond, Offset const& offset,
+                    ExtentA const& a, ExtentB const& b) {
+    TILE_LOOP_7(func, IType, IsLeft, cond, offset, a, b, 7);
   }
 
-  template < typename ValType, typename Func, typename Offset, typename ExtentA, typename ExtentB >
-  static void apply(ValType &value, Func const& func, bool cond, Offset const& offset, ExtentA const& a, ExtentB const& b)
-  {
-    TILE_LOOP_7_REDUX( value, func, IType, IsLeft, cond, offset, a, b, 7 );
+  template <typename ValType, typename Func, typename Offset, typename ExtentA,
+            typename ExtentB>
+  static void apply(ValType& value, Func const& func, bool cond,
+                    Offset const& offset, ExtentA const& a, ExtentB const& b) {
+    TILE_LOOP_7_REDUX(value, func, IType, IsLeft, cond, offset, a, b, 7);
   }
 };
 
-template < bool IsLeft, typename IType >
-struct Tile_Loop_Type<8, IsLeft, IType, void, void>
-{
-  template < typename Func, typename Offset, typename ExtentA, typename ExtentB >
-  static void apply(Func const& func, bool cond, Offset const& offset, ExtentA const& a, ExtentB const& b)
-  {
-    TILE_LOOP_8( func, IType, IsLeft, cond, offset, a, b, 8 );
+template <bool IsLeft, typename IType>
+struct Tile_Loop_Type<8, IsLeft, IType, void, void> {
+  template <typename Func, typename Offset, typename ExtentA, typename ExtentB>
+  static void apply(Func const& func, bool cond, Offset const& offset,
+                    ExtentA const& a, ExtentB const& b) {
+    TILE_LOOP_8(func, IType, IsLeft, cond, offset, a, b, 8);
   }
 
-  template < typename ValType, typename Func, typename Offset, typename ExtentA, typename ExtentB >
-  static void apply(ValType &value, Func const& func, bool cond, Offset const& offset, ExtentA const& a, ExtentB const& b)
-  {
-    TILE_LOOP_8_REDUX( value, func, IType, IsLeft, cond, offset, a, b, 8 );
+  template <typename ValType, typename Func, typename Offset, typename ExtentA,
+            typename ExtentB>
+  static void apply(ValType& value, Func const& func, bool cond,
+                    Offset const& offset, ExtentA const& a, ExtentB const& b) {
+    TILE_LOOP_8_REDUX(value, func, IType, IsLeft, cond, offset, a, b, 8);
   }
 };
 
 // tagged versions
 
-template < bool IsLeft, typename IType, typename Tagged >
-struct Tile_Loop_Type<1, IsLeft, IType, Tagged, typename std::enable_if< !std::is_same<Tagged,void>::value>::type >
-{
-  template < typename Func, typename Offset, typename ExtentA, typename ExtentB >
-  static void apply(Func const& func, bool cond, Offset const& offset, ExtentA const& a, ExtentB const& b)
-  {
-    TAGGED_TILE_LOOP_1( Tagged(), func, IType, IsLeft, cond, offset, a, b, 1 );
+template <bool IsLeft, typename IType, typename Tagged>
+struct Tile_Loop_Type<
+    1, IsLeft, IType, Tagged,
+    typename std::enable_if<!std::is_same<Tagged, void>::value>::type> {
+  template <typename Func, typename Offset, typename ExtentA, typename ExtentB>
+  static void apply(Func const& func, bool cond, Offset const& offset,
+                    ExtentA const& a, ExtentB const& b) {
+    TAGGED_TILE_LOOP_1(Tagged(), func, IType, IsLeft, cond, offset, a, b, 1);
   }
 
-  template < typename ValType, typename Func, typename Offset, typename ExtentA, typename ExtentB >
-  static void apply(ValType &value, Func const& func, bool cond, Offset const& offset, ExtentA const& a, ExtentB const& b)
-  {
-    TAGGED_TILE_LOOP_1_REDUX( value, Tagged(), func, IType, IsLeft, cond, offset, a, b, 1 );
+  template <typename ValType, typename Func, typename Offset, typename ExtentA,
+            typename ExtentB>
+  static void apply(ValType& value, Func const& func, bool cond,
+                    Offset const& offset, ExtentA const& a, ExtentB const& b) {
+    TAGGED_TILE_LOOP_1_REDUX(value, Tagged(), func, IType, IsLeft, cond, offset,
+                             a, b, 1);
   }
 };
 
-template < bool IsLeft, typename IType, typename Tagged >
-struct Tile_Loop_Type<2, IsLeft, IType, Tagged, typename std::enable_if< !std::is_same<Tagged,void>::value>::type>
-{
-  template < typename Func, typename Offset, typename ExtentA, typename ExtentB >
-  static void apply(Func const& func, bool cond, Offset const& offset, ExtentA const& a, ExtentB const& b)
-  {
-    TAGGED_TILE_LOOP_2( Tagged(), func, IType, IsLeft, cond, offset, a, b, 2 );
+template <bool IsLeft, typename IType, typename Tagged>
+struct Tile_Loop_Type<
+    2, IsLeft, IType, Tagged,
+    typename std::enable_if<!std::is_same<Tagged, void>::value>::type> {
+  template <typename Func, typename Offset, typename ExtentA, typename ExtentB>
+  static void apply(Func const& func, bool cond, Offset const& offset,
+                    ExtentA const& a, ExtentB const& b) {
+    TAGGED_TILE_LOOP_2(Tagged(), func, IType, IsLeft, cond, offset, a, b, 2);
   }
 
-  template < typename ValType, typename Func, typename Offset, typename ExtentA, typename ExtentB >
-  static void apply(ValType &value, Func const& func, bool cond, Offset const& offset, ExtentA const& a, ExtentB const& b)
-  {
-    TAGGED_TILE_LOOP_2_REDUX( value, Tagged(), func, IType, IsLeft, cond, offset, a, b, 2 );
+  template <typename ValType, typename Func, typename Offset, typename ExtentA,
+            typename ExtentB>
+  static void apply(ValType& value, Func const& func, bool cond,
+                    Offset const& offset, ExtentA const& a, ExtentB const& b) {
+    TAGGED_TILE_LOOP_2_REDUX(value, Tagged(), func, IType, IsLeft, cond, offset,
+                             a, b, 2);
   }
 };
 
-template < bool IsLeft, typename IType, typename Tagged >
-struct Tile_Loop_Type<3, IsLeft, IType, Tagged, typename std::enable_if< !std::is_same<Tagged,void>::value>::type>
-{
-  template < typename Func, typename Offset, typename ExtentA, typename ExtentB >
-  static void apply(Func const& func, bool cond, Offset const& offset, ExtentA const& a, ExtentB const& b)
-  {
-    TAGGED_TILE_LOOP_3( Tagged(), func, IType, IsLeft, cond, offset, a, b, 3 );
+template <bool IsLeft, typename IType, typename Tagged>
+struct Tile_Loop_Type<
+    3, IsLeft, IType, Tagged,
+    typename std::enable_if<!std::is_same<Tagged, void>::value>::type> {
+  template <typename Func, typename Offset, typename ExtentA, typename ExtentB>
+  static void apply(Func const& func, bool cond, Offset const& offset,
+                    ExtentA const& a, ExtentB const& b) {
+    TAGGED_TILE_LOOP_3(Tagged(), func, IType, IsLeft, cond, offset, a, b, 3);
   }
 
-  template < typename ValType, typename Func, typename Offset, typename ExtentA, typename ExtentB >
-  static void apply(ValType &value, Func const& func, bool cond, Offset const& offset, ExtentA const& a, ExtentB const& b)
-  {
-    TAGGED_TILE_LOOP_3_REDUX( value, Tagged(), func, IType, IsLeft, cond, offset, a, b, 3 );
+  template <typename ValType, typename Func, typename Offset, typename ExtentA,
+            typename ExtentB>
+  static void apply(ValType& value, Func const& func, bool cond,
+                    Offset const& offset, ExtentA const& a, ExtentB const& b) {
+    TAGGED_TILE_LOOP_3_REDUX(value, Tagged(), func, IType, IsLeft, cond, offset,
+                             a, b, 3);
   }
 };
 
-template < bool IsLeft, typename IType, typename Tagged >
-struct Tile_Loop_Type<4, IsLeft, IType, Tagged, typename std::enable_if< !std::is_same<Tagged,void>::value>::type>
-{
-  template < typename Func, typename Offset, typename ExtentA, typename ExtentB >
-  static void apply(Func const& func, bool cond, Offset const& offset, ExtentA const& a, ExtentB const& b)
-  {
-    TAGGED_TILE_LOOP_4( Tagged(), func, IType, IsLeft, cond, offset, a, b, 4 );
+template <bool IsLeft, typename IType, typename Tagged>
+struct Tile_Loop_Type<
+    4, IsLeft, IType, Tagged,
+    typename std::enable_if<!std::is_same<Tagged, void>::value>::type> {
+  template <typename Func, typename Offset, typename ExtentA, typename ExtentB>
+  static void apply(Func const& func, bool cond, Offset const& offset,
+                    ExtentA const& a, ExtentB const& b) {
+    TAGGED_TILE_LOOP_4(Tagged(), func, IType, IsLeft, cond, offset, a, b, 4);
   }
 
-  template < typename ValType, typename Func, typename Offset, typename ExtentA, typename ExtentB >
-  static void apply(ValType &value, Func const& func, bool cond, Offset const& offset, ExtentA const& a, ExtentB const& b)
-  {
-    TAGGED_TILE_LOOP_4_REDUX( value, Tagged(), func, IType, IsLeft, cond, offset, a, b, 4 );
+  template <typename ValType, typename Func, typename Offset, typename ExtentA,
+            typename ExtentB>
+  static void apply(ValType& value, Func const& func, bool cond,
+                    Offset const& offset, ExtentA const& a, ExtentB const& b) {
+    TAGGED_TILE_LOOP_4_REDUX(value, Tagged(), func, IType, IsLeft, cond, offset,
+                             a, b, 4);
   }
 };
 
-template < bool IsLeft, typename IType, typename Tagged >
-struct Tile_Loop_Type<5, IsLeft, IType, Tagged, typename std::enable_if< !std::is_same<Tagged,void>::value>::type>
-{
-  template < typename Func, typename Offset, typename ExtentA, typename ExtentB >
-  static void apply(Func const& func, bool cond, Offset const& offset, ExtentA const& a, ExtentB const& b)
-  {
-    TAGGED_TILE_LOOP_5( Tagged(), func, IType, IsLeft, cond, offset, a, b, 5 );
+template <bool IsLeft, typename IType, typename Tagged>
+struct Tile_Loop_Type<
+    5, IsLeft, IType, Tagged,
+    typename std::enable_if<!std::is_same<Tagged, void>::value>::type> {
+  template <typename Func, typename Offset, typename ExtentA, typename ExtentB>
+  static void apply(Func const& func, bool cond, Offset const& offset,
+                    ExtentA const& a, ExtentB const& b) {
+    TAGGED_TILE_LOOP_5(Tagged(), func, IType, IsLeft, cond, offset, a, b, 5);
   }
 
-  template < typename ValType, typename Func, typename Offset, typename ExtentA, typename ExtentB >
-  static void apply(ValType &value, Func const& func, bool cond, Offset const& offset, ExtentA const& a, ExtentB const& b)
-  {
-    TAGGED_TILE_LOOP_5_REDUX( value, Tagged(), func, IType, IsLeft, cond, offset, a, b, 5 );
+  template <typename ValType, typename Func, typename Offset, typename ExtentA,
+            typename ExtentB>
+  static void apply(ValType& value, Func const& func, bool cond,
+                    Offset const& offset, ExtentA const& a, ExtentB const& b) {
+    TAGGED_TILE_LOOP_5_REDUX(value, Tagged(), func, IType, IsLeft, cond, offset,
+                             a, b, 5);
   }
 };
 
-template < bool IsLeft, typename IType, typename Tagged >
-struct Tile_Loop_Type<6, IsLeft, IType, Tagged, typename std::enable_if< !std::is_same<Tagged,void>::value>::type>
-{
-  template < typename Func, typename Offset, typename ExtentA, typename ExtentB >
-  static void apply(Func const& func, bool cond, Offset const& offset, ExtentA const& a, ExtentB const& b)
-  {
-    TAGGED_TILE_LOOP_6( Tagged(), func, IType, IsLeft, cond, offset, a, b, 6 );
+template <bool IsLeft, typename IType, typename Tagged>
+struct Tile_Loop_Type<
+    6, IsLeft, IType, Tagged,
+    typename std::enable_if<!std::is_same<Tagged, void>::value>::type> {
+  template <typename Func, typename Offset, typename ExtentA, typename ExtentB>
+  static void apply(Func const& func, bool cond, Offset const& offset,
+                    ExtentA const& a, ExtentB const& b) {
+    TAGGED_TILE_LOOP_6(Tagged(), func, IType, IsLeft, cond, offset, a, b, 6);
   }
 
-  template < typename ValType, typename Func, typename Offset, typename ExtentA, typename ExtentB >
-  static void apply(ValType &value, Func const& func, bool cond, Offset const& offset, ExtentA const& a, ExtentB const& b)
-  {
-    TAGGED_TILE_LOOP_6_REDUX( value, Tagged(), func, IType, IsLeft, cond, offset, a, b, 6 );
+  template <typename ValType, typename Func, typename Offset, typename ExtentA,
+            typename ExtentB>
+  static void apply(ValType& value, Func const& func, bool cond,
+                    Offset const& offset, ExtentA const& a, ExtentB const& b) {
+    TAGGED_TILE_LOOP_6_REDUX(value, Tagged(), func, IType, IsLeft, cond, offset,
+                             a, b, 6);
   }
 };
 
-template < bool IsLeft, typename IType, typename Tagged >
-struct Tile_Loop_Type<7, IsLeft, IType, Tagged, typename std::enable_if< !std::is_same<Tagged,void>::value>::type>
-{
-  template < typename Func, typename Offset, typename ExtentA, typename ExtentB >
-  static void apply(Func const& func, bool cond, Offset const& offset, ExtentA const& a, ExtentB const& b)
-  {
-    TAGGED_TILE_LOOP_7( Tagged(), func, IType, IsLeft, cond, offset, a, b, 7 );
+template <bool IsLeft, typename IType, typename Tagged>
+struct Tile_Loop_Type<
+    7, IsLeft, IType, Tagged,
+    typename std::enable_if<!std::is_same<Tagged, void>::value>::type> {
+  template <typename Func, typename Offset, typename ExtentA, typename ExtentB>
+  static void apply(Func const& func, bool cond, Offset const& offset,
+                    ExtentA const& a, ExtentB const& b) {
+    TAGGED_TILE_LOOP_7(Tagged(), func, IType, IsLeft, cond, offset, a, b, 7);
   }
 
-  template < typename ValType, typename Func, typename Offset, typename ExtentA, typename ExtentB >
-  static void apply(ValType &value, Func const& func, bool cond, Offset const& offset, ExtentA const& a, ExtentB const& b)
-  {
-    TAGGED_TILE_LOOP_7_REDUX( value, Tagged(), func, IType, IsLeft, cond, offset, a, b, 7 );
+  template <typename ValType, typename Func, typename Offset, typename ExtentA,
+            typename ExtentB>
+  static void apply(ValType& value, Func const& func, bool cond,
+                    Offset const& offset, ExtentA const& a, ExtentB const& b) {
+    TAGGED_TILE_LOOP_7_REDUX(value, Tagged(), func, IType, IsLeft, cond, offset,
+                             a, b, 7);
   }
 };
 
-template < bool IsLeft, typename IType, typename Tagged >
-struct Tile_Loop_Type<8, IsLeft, IType, Tagged, typename std::enable_if< !std::is_same<Tagged,void>::value>::type>
-{
-  template < typename Func, typename Offset, typename ExtentA, typename ExtentB >
-  static void apply(Func const& func, bool cond, Offset const& offset, ExtentA const& a, ExtentB const& b)
-  {
-    TAGGED_TILE_LOOP_8( Tagged(), func, IType, IsLeft, cond, offset, a, b, 8 );
+template <bool IsLeft, typename IType, typename Tagged>
+struct Tile_Loop_Type<
+    8, IsLeft, IType, Tagged,
+    typename std::enable_if<!std::is_same<Tagged, void>::value>::type> {
+  template <typename Func, typename Offset, typename ExtentA, typename ExtentB>
+  static void apply(Func const& func, bool cond, Offset const& offset,
+                    ExtentA const& a, ExtentB const& b) {
+    TAGGED_TILE_LOOP_8(Tagged(), func, IType, IsLeft, cond, offset, a, b, 8);
   }
 
-  template < typename ValType, typename Func, typename Offset, typename ExtentA, typename ExtentB >
-  static void apply(ValType &value, Func const& func, bool cond, Offset const& offset, ExtentA const& a, ExtentB const& b)
-  {
-    TAGGED_TILE_LOOP_8_REDUX( value, Tagged(), func, IType, IsLeft, cond, offset, a, b, 8 );
+  template <typename ValType, typename Func, typename Offset, typename ExtentA,
+            typename ExtentB>
+  static void apply(ValType& value, Func const& func, bool cond,
+                    Offset const& offset, ExtentA const& a, ExtentB const& b) {
+    TAGGED_TILE_LOOP_8_REDUX(value, Tagged(), func, IType, IsLeft, cond, offset,
+                             a, b, 8);
   }
 };
 // end Structs for calling loops
 
+template <typename T>
+using is_void_type = std::is_same<T, void>;
 
 template <typename T>
-using is_void_type = std::is_same< T , void >;
-
-template <typename T>
-struct is_type_array : std::false_type 
-{
+struct is_type_array : std::false_type {
   using value_type = T;
 };
 
 template <typename T>
-struct is_type_array< T[] > : std::true_type
-{
+struct is_type_array<T[]> : std::true_type {
   using value_type = T;
 };
 
-
-template < typename RP
-         , typename Functor
-         , typename Tag = void
-         , typename ValueType = void
-         , typename Enable = void
-         >
+template <typename RP, typename Functor, typename Tag = void,
+          typename ValueType = void, typename Enable = void>
 struct HostIterateTile;
 
-//For ParallelFor
-template < typename RP
-         , typename Functor
-         , typename Tag
-         , typename ValueType
-         >
-struct HostIterateTile < RP , Functor , Tag , ValueType , typename std::enable_if< is_void_type<ValueType >::value >::type >
-{
+// For ParallelFor
+template <typename RP, typename Functor, typename Tag, typename ValueType>
+struct HostIterateTile<
+    RP, Functor, Tag, ValueType,
+    typename std::enable_if<is_void_type<ValueType>::value>::type> {
   using index_type = typename RP::index_type;
   using point_type = typename RP::point_type;
 
   using value_type = ValueType;
 
-  inline
-  HostIterateTile( RP const& rp, Functor const& func )
-    : m_rp(rp)
-    , m_func(func)
-  {
-  }
+  inline HostIterateTile(RP const& rp, Functor const& func)
+      : m_rp(rp), m_func(func) {}
 
-  inline
-  bool check_iteration_bounds( point_type& partial_tile , point_type& offset ) const {
+  inline bool check_iteration_bounds(point_type& partial_tile,
+                                     point_type& offset) const {
     bool is_full_tile = true;
 
-      for ( int i = 0; i < RP::rank; ++i ) {
-        if ((offset[i] + m_rp.m_tile[i]) <= m_rp.m_upper[i]) {
-            partial_tile[i] = m_rp.m_tile[i] ;
-        }
-        else {
-          is_full_tile = false ;
-            partial_tile[i] = (m_rp.m_upper[i] - 1 - offset[i]) == 0 ? 1
-                            : (m_rp.m_upper[i] - m_rp.m_tile[i]) > 0 ? (m_rp.m_upper[i] - offset[i])
-                            : (m_rp.m_upper[i] - m_rp.m_lower[i]) ; // when single tile encloses range
-        }
+    for (int i = 0; i < RP::rank; ++i) {
+      if ((offset[i] + m_rp.m_tile[i]) <= m_rp.m_upper[i]) {
+        partial_tile[i] = m_rp.m_tile[i];
+      } else {
+        is_full_tile = false;
+        partial_tile[i] =
+            (m_rp.m_upper[i] - 1 - offset[i]) == 0
+                ? 1
+                : (m_rp.m_upper[i] - m_rp.m_tile[i]) > 0
+                      ? (m_rp.m_upper[i] - offset[i])
+                      : (m_rp.m_upper[i] -
+                         m_rp.m_lower[i]);  // when single tile encloses range
       }
+    }
 
-    return is_full_tile ;
-  } // end check bounds
-
+    return is_full_tile;
+  }  // end check bounds
 
   template <int Rank>
-  struct RankTag
-  {
+  struct RankTag {
     typedef RankTag type;
     enum { value = (int)Rank };
   };
 
 #if KOKKOS_ENABLE_NEW_LOOP_MACROS
   template <typename IType>
-  inline
-  void
-  operator()(IType tile_idx) const
-  {
+  inline void operator()(IType tile_idx) const {
     point_type m_offset;
     point_type m_tiledims;
 
     if (RP::outer_direction == RP::Left) {
-      for (int i=0; i<RP::rank; ++i) {
-        m_offset[i] = (tile_idx % m_rp.m_tile_end[i]) * m_rp.m_tile[i] + m_rp.m_lower[i] ;
+      for (int i = 0; i < RP::rank; ++i) {
+        m_offset[i] =
+            (tile_idx % m_rp.m_tile_end[i]) * m_rp.m_tile[i] + m_rp.m_lower[i];
         tile_idx /= m_rp.m_tile_end[i];
       }
-    }
-    else {
-      for (int i=RP::rank-1; i>=0; --i) {
-        m_offset[i] = (tile_idx % m_rp.m_tile_end[i]) * m_rp.m_tile[i] + m_rp.m_lower[i] ;
+    } else {
+      for (int i = RP::rank - 1; i >= 0; --i) {
+        m_offset[i] =
+            (tile_idx % m_rp.m_tile_end[i]) * m_rp.m_tile[i] + m_rp.m_lower[i];
         tile_idx /= m_rp.m_tile_end[i];
       }
     }
 
-    //Check if offset+tiledim in bounds - if not, replace tile dims with the partial tile dims
-    const bool full_tile = check_iteration_bounds(m_tiledims , m_offset) ;
-
-    Tile_Loop_Type< RP::rank, (RP::inner_direction == RP::Left), index_type, Tag >::apply( m_func, full_tile, m_offset, m_rp.m_tile, m_tiledims );
+    // Check if offset+tiledim in bounds - if not, replace tile dims with the
+    // partial tile dims
+    const bool full_tile = check_iteration_bounds(m_tiledims, m_offset);
 
+    Tile_Loop_Type<RP::rank, (RP::inner_direction == RP::Left), index_type,
+                   Tag>::apply(m_func, full_tile, m_offset, m_rp.m_tile,
+                               m_tiledims);
   }
 
 #else
   template <typename IType>
-  inline
-  void
-  operator()(IType tile_idx) const
-  { operator_impl( tile_idx , RankTag<RP::rank>() ); }
-  // added due to compiler error when using sfinae to choose operator based on rank w/ cuda+serial
+  inline void operator()(IType tile_idx) const {
+    operator_impl(tile_idx, RankTag<RP::rank>());
+  }
+  // added due to compiler error when using sfinae to choose operator based on
+  // rank w/ cuda+serial
 
   template <typename IType>
-  inline
-  void operator_impl( IType tile_idx , const RankTag<2> ) const
-  {
+  inline void operator_impl(IType tile_idx, const RankTag<2>) const {
     point_type m_offset;
     point_type m_tiledims;
 
     if (RP::outer_direction == RP::Left) {
-      for (int i=0; i<RP::rank; ++i) {
-        m_offset[i] = (tile_idx % m_rp.m_tile_end[i]) * m_rp.m_tile[i] + m_rp.m_lower[i] ;
+      for (int i = 0; i < RP::rank; ++i) {
+        m_offset[i] =
+            (tile_idx % m_rp.m_tile_end[i]) * m_rp.m_tile[i] + m_rp.m_lower[i];
         tile_idx /= m_rp.m_tile_end[i];
       }
-    }
-    else {
-      for (int i=RP::rank-1; i>=0; --i) {
-        m_offset[i] = (tile_idx % m_rp.m_tile_end[i]) * m_rp.m_tile[i] + m_rp.m_lower[i] ;
+    } else {
+      for (int i = RP::rank - 1; i >= 0; --i) {
+        m_offset[i] =
+            (tile_idx % m_rp.m_tile_end[i]) * m_rp.m_tile[i] + m_rp.m_lower[i];
         tile_idx /= m_rp.m_tile_end[i];
       }
     }
 
-    //Check if offset+tiledim in bounds - if not, replace tile dims with the partial tile dims
-    const bool full_tile = check_iteration_bounds(m_tiledims , m_offset) ;
+    // Check if offset+tiledim in bounds - if not, replace tile dims with the
+    // partial tile dims
+    const bool full_tile = check_iteration_bounds(m_tiledims, m_offset);
 
     if (RP::inner_direction == RP::Left) {
-     if ( full_tile ) {
-//      #pragma simd
-        LOOP_2L(index_type, m_tiledims) {
-          apply( LOOP_ARGS_2 );
-        }
+      if (full_tile) {
+        //      #pragma simd
+        LOOP_2L(index_type, m_tiledims) { apply(LOOP_ARGS_2); }
       } else {
-//      #pragma simd
-        LOOP_2L(index_type, m_tiledims) {
-          apply( LOOP_ARGS_2 );
-        }
+        //      #pragma simd
+        LOOP_2L(index_type, m_tiledims) { apply(LOOP_ARGS_2); }
       }
-    } // end RP::Left
+    }  // end RP::Left
     else {
-     if ( full_tile ) {
-//      #pragma simd
-        LOOP_2R(index_type, m_tiledims) {
-          apply( LOOP_ARGS_2 );
-        }
+      if (full_tile) {
+        //      #pragma simd
+        LOOP_2R(index_type, m_tiledims) { apply(LOOP_ARGS_2); }
       } else {
-//      #pragma simd
-        LOOP_2R(index_type, m_tiledims) {
-          apply( LOOP_ARGS_2 );
-        }
+        //      #pragma simd
+        LOOP_2R(index_type, m_tiledims) { apply(LOOP_ARGS_2); }
       }
-    } // end RP::Right
-
-  } //end op() rank == 2
+    }  // end RP::Right
 
+  }  // end op() rank == 2
 
   template <typename IType>
-  inline
-  void operator_impl( IType tile_idx , const RankTag<3> ) const
-  {
+  inline void operator_impl(IType tile_idx, const RankTag<3>) const {
     point_type m_offset;
     point_type m_tiledims;
 
     if (RP::outer_direction == RP::Left) {
-      for (int i=0; i<RP::rank; ++i) {
-        m_offset[i] = (tile_idx % m_rp.m_tile_end[i]) * m_rp.m_tile[i] + m_rp.m_lower[i] ;
+      for (int i = 0; i < RP::rank; ++i) {
+        m_offset[i] =
+            (tile_idx % m_rp.m_tile_end[i]) * m_rp.m_tile[i] + m_rp.m_lower[i];
         tile_idx /= m_rp.m_tile_end[i];
       }
-    }
-    else {
-      for (int i=RP::rank-1; i>=0; --i) {
-        m_offset[i] = (tile_idx % m_rp.m_tile_end[i]) * m_rp.m_tile[i] + m_rp.m_lower[i] ;
+    } else {
+      for (int i = RP::rank - 1; i >= 0; --i) {
+        m_offset[i] =
+            (tile_idx % m_rp.m_tile_end[i]) * m_rp.m_tile[i] + m_rp.m_lower[i];
         tile_idx /= m_rp.m_tile_end[i];
       }
     }
 
-    //Check if offset+tiledim in bounds - if not, replace tile dims with the partial tile dims
-    const bool full_tile = check_iteration_bounds(m_tiledims , m_offset) ;
+    // Check if offset+tiledim in bounds - if not, replace tile dims with the
+    // partial tile dims
+    const bool full_tile = check_iteration_bounds(m_tiledims, m_offset);
 
     if (RP::inner_direction == RP::Left) {
-     if ( full_tile ) {
-//      #pragma simd
-        LOOP_3L(index_type, m_tiledims) {
-          apply( LOOP_ARGS_3 );
-        }
+      if (full_tile) {
+        //      #pragma simd
+        LOOP_3L(index_type, m_tiledims) { apply(LOOP_ARGS_3); }
       } else {
-//      #pragma simd
-        LOOP_3L(index_type, m_tiledims) {
-          apply( LOOP_ARGS_3 );
-        }
+        //      #pragma simd
+        LOOP_3L(index_type, m_tiledims) { apply(LOOP_ARGS_3); }
       }
-    } // end RP::Left
+    }  // end RP::Left
     else {
-     if ( full_tile ) {
-//      #pragma simd
-        LOOP_3R(index_type, m_tiledims) {
-          apply( LOOP_ARGS_3 );
-        }
+      if (full_tile) {
+        //      #pragma simd
+        LOOP_3R(index_type, m_tiledims) { apply(LOOP_ARGS_3); }
       } else {
-//      #pragma simd
-        LOOP_3R(index_type, m_tiledims) {
-          apply( LOOP_ARGS_3 );
-        }
+        //      #pragma simd
+        LOOP_3R(index_type, m_tiledims) { apply(LOOP_ARGS_3); }
       }
-    } // end RP::Right
-
-  } //end op() rank == 3
+    }  // end RP::Right
 
+  }  // end op() rank == 3
 
   template <typename IType>
-  inline
-  void operator_impl( IType tile_idx , const RankTag<4> ) const
-  {
+  inline void operator_impl(IType tile_idx, const RankTag<4>) const {
     point_type m_offset;
     point_type m_tiledims;
 
     if (RP::outer_direction == RP::Left) {
-      for (int i=0; i<RP::rank; ++i) {
-        m_offset[i] = (tile_idx % m_rp.m_tile_end[i]) * m_rp.m_tile[i] + m_rp.m_lower[i] ;
+      for (int i = 0; i < RP::rank; ++i) {
+        m_offset[i] =
+            (tile_idx % m_rp.m_tile_end[i]) * m_rp.m_tile[i] + m_rp.m_lower[i];
         tile_idx /= m_rp.m_tile_end[i];
       }
-    }
-    else {
-      for (int i=RP::rank-1; i>=0; --i) {
-        m_offset[i] = (tile_idx % m_rp.m_tile_end[i]) * m_rp.m_tile[i] + m_rp.m_lower[i] ;
+    } else {
+      for (int i = RP::rank - 1; i >= 0; --i) {
+        m_offset[i] =
+            (tile_idx % m_rp.m_tile_end[i]) * m_rp.m_tile[i] + m_rp.m_lower[i];
         tile_idx /= m_rp.m_tile_end[i];
       }
     }
 
-    //Check if offset+tiledim in bounds - if not, replace tile dims with the partial tile dims
-    const bool full_tile = check_iteration_bounds(m_tiledims , m_offset) ;
+    // Check if offset+tiledim in bounds - if not, replace tile dims with the
+    // partial tile dims
+    const bool full_tile = check_iteration_bounds(m_tiledims, m_offset);
 
     if (RP::inner_direction == RP::Left) {
-     if ( full_tile ) {
-//      #pragma simd
-        LOOP_4L(index_type, m_tiledims) {
-          apply( LOOP_ARGS_4 );
-        }
+      if (full_tile) {
+        //      #pragma simd
+        LOOP_4L(index_type, m_tiledims) { apply(LOOP_ARGS_4); }
       } else {
-//      #pragma simd
-        LOOP_4L(index_type, m_tiledims) {
-          apply( LOOP_ARGS_4 );
-        }
+        //      #pragma simd
+        LOOP_4L(index_type, m_tiledims) { apply(LOOP_ARGS_4); }
       }
-    } // end RP::Left
+    }  // end RP::Left
     else {
-     if ( full_tile ) {
-//      #pragma simd
-        LOOP_4R(index_type, m_tiledims) {
-          apply( LOOP_ARGS_4 );
-        }
+      if (full_tile) {
+        //      #pragma simd
+        LOOP_4R(index_type, m_tiledims) { apply(LOOP_ARGS_4); }
       } else {
-//      #pragma simd
-        LOOP_4R(index_type, m_tiledims) {
-          apply( LOOP_ARGS_4 );
-        }
+        //      #pragma simd
+        LOOP_4R(index_type, m_tiledims) { apply(LOOP_ARGS_4); }
       }
-    } // end RP::Right
-
-  } //end op() rank == 4
+    }  // end RP::Right
 
+  }  // end op() rank == 4
 
   template <typename IType>
-  inline
-  void operator_impl( IType tile_idx , const RankTag<5> ) const
-  {
+  inline void operator_impl(IType tile_idx, const RankTag<5>) const {
     point_type m_offset;
     point_type m_tiledims;
 
     if (RP::outer_direction == RP::Left) {
-      for (int i=0; i<RP::rank; ++i) {
-        m_offset[i] = (tile_idx % m_rp.m_tile_end[i]) * m_rp.m_tile[i] + m_rp.m_lower[i] ;
+      for (int i = 0; i < RP::rank; ++i) {
+        m_offset[i] =
+            (tile_idx % m_rp.m_tile_end[i]) * m_rp.m_tile[i] + m_rp.m_lower[i];
         tile_idx /= m_rp.m_tile_end[i];
       }
-    }
-    else {
-      for (int i=RP::rank-1; i>=0; --i) {
-        m_offset[i] = (tile_idx % m_rp.m_tile_end[i]) * m_rp.m_tile[i] + m_rp.m_lower[i] ;
+    } else {
+      for (int i = RP::rank - 1; i >= 0; --i) {
+        m_offset[i] =
+            (tile_idx % m_rp.m_tile_end[i]) * m_rp.m_tile[i] + m_rp.m_lower[i];
         tile_idx /= m_rp.m_tile_end[i];
       }
     }
 
-    //Check if offset+tiledim in bounds - if not, replace tile dims with the partial tile dims
-    const bool full_tile = check_iteration_bounds(m_tiledims , m_offset) ;
+    // Check if offset+tiledim in bounds - if not, replace tile dims with the
+    // partial tile dims
+    const bool full_tile = check_iteration_bounds(m_tiledims, m_offset);
 
     if (RP::inner_direction == RP::Left) {
-     if ( full_tile ) {
-//      #pragma simd
-        LOOP_5L(index_type, m_tiledims) {
-          apply( LOOP_ARGS_5 );
-        }
+      if (full_tile) {
+        //      #pragma simd
+        LOOP_5L(index_type, m_tiledims) { apply(LOOP_ARGS_5); }
       } else {
-//      #pragma simd
-        LOOP_5L(index_type, m_tiledims) {
-          apply( LOOP_ARGS_5 );
-        }
+        //      #pragma simd
+        LOOP_5L(index_type, m_tiledims) { apply(LOOP_ARGS_5); }
       }
-    } // end RP::Left
+    }  // end RP::Left
     else {
-     if ( full_tile ) {
-//      #pragma simd
-        LOOP_5R(index_type, m_tiledims) {
-          apply( LOOP_ARGS_5 );
-        }
+      if (full_tile) {
+        //      #pragma simd
+        LOOP_5R(index_type, m_tiledims) { apply(LOOP_ARGS_5); }
       } else {
-//      #pragma simd
-        LOOP_5R(index_type, m_tiledims) {
-          apply( LOOP_ARGS_5 );
-        }
+        //      #pragma simd
+        LOOP_5R(index_type, m_tiledims) { apply(LOOP_ARGS_5); }
       }
-    } // end RP::Right
-
-  } //end op() rank == 5
+    }  // end RP::Right
 
+  }  // end op() rank == 5
 
   template <typename IType>
-  inline
-  void operator_impl( IType tile_idx , const RankTag<6> ) const
-  {
+  inline void operator_impl(IType tile_idx, const RankTag<6>) const {
     point_type m_offset;
     point_type m_tiledims;
 
     if (RP::outer_direction == RP::Left) {
-      for (int i=0; i<RP::rank; ++i) {
-        m_offset[i] = (tile_idx % m_rp.m_tile_end[i]) * m_rp.m_tile[i] + m_rp.m_lower[i] ;
+      for (int i = 0; i < RP::rank; ++i) {
+        m_offset[i] =
+            (tile_idx % m_rp.m_tile_end[i]) * m_rp.m_tile[i] + m_rp.m_lower[i];
         tile_idx /= m_rp.m_tile_end[i];
       }
-    }
-    else {
-      for (int i=RP::rank-1; i>=0; --i) {
-        m_offset[i] = (tile_idx % m_rp.m_tile_end[i]) * m_rp.m_tile[i] + m_rp.m_lower[i] ;
+    } else {
+      for (int i = RP::rank - 1; i >= 0; --i) {
+        m_offset[i] =
+            (tile_idx % m_rp.m_tile_end[i]) * m_rp.m_tile[i] + m_rp.m_lower[i];
         tile_idx /= m_rp.m_tile_end[i];
       }
     }
 
-    //Check if offset+tiledim in bounds - if not, replace tile dims with the partial tile dims
-    const bool full_tile = check_iteration_bounds(m_tiledims , m_offset) ;
+    // Check if offset+tiledim in bounds - if not, replace tile dims with the
+    // partial tile dims
+    const bool full_tile = check_iteration_bounds(m_tiledims, m_offset);
 
     if (RP::inner_direction == RP::Left) {
-     if ( full_tile ) {
-//      #pragma simd
-        LOOP_6L(index_type, m_tiledims) {
-          apply( LOOP_ARGS_6 );
-        }
+      if (full_tile) {
+        //      #pragma simd
+        LOOP_6L(index_type, m_tiledims) { apply(LOOP_ARGS_6); }
       } else {
-//      #pragma simd
-        LOOP_6L(index_type, m_tiledims) {
-          apply( LOOP_ARGS_6 );
-        }
+        //      #pragma simd
+        LOOP_6L(index_type, m_tiledims) { apply(LOOP_ARGS_6); }
       }
-    } // end RP::Left
+    }  // end RP::Left
     else {
-     if ( full_tile ) {
-//      #pragma simd
-        LOOP_6R(index_type, m_tiledims) {
-          apply( LOOP_ARGS_6 );
-        }
+      if (full_tile) {
+        //      #pragma simd
+        LOOP_6R(index_type, m_tiledims) { apply(LOOP_ARGS_6); }
       } else {
-//      #pragma simd
-        LOOP_6R(index_type, m_tiledims) {
-          apply( LOOP_ARGS_6 );
-        }
+        //      #pragma simd
+        LOOP_6R(index_type, m_tiledims) { apply(LOOP_ARGS_6); }
       }
-    } // end RP::Right
-
-  } //end op() rank == 6
+    }  // end RP::Right
 
+  }  // end op() rank == 6
 
   template <typename IType>
-  inline
-  void operator_impl( IType tile_idx , const RankTag<7> ) const
-  {
+  inline void operator_impl(IType tile_idx, const RankTag<7>) const {
     point_type m_offset;
     point_type m_tiledims;
 
     if (RP::outer_direction == RP::Left) {
-      for (int i=0; i<RP::rank; ++i) {
-        m_offset[i] = (tile_idx % m_rp.m_tile_end[i]) * m_rp.m_tile[i] + m_rp.m_lower[i] ;
+      for (int i = 0; i < RP::rank; ++i) {
+        m_offset[i] =
+            (tile_idx % m_rp.m_tile_end[i]) * m_rp.m_tile[i] + m_rp.m_lower[i];
         tile_idx /= m_rp.m_tile_end[i];
       }
-    }
-    else {
-      for (int i=RP::rank-1; i>=0; --i) {
-        m_offset[i] = (tile_idx % m_rp.m_tile_end[i]) * m_rp.m_tile[i] + m_rp.m_lower[i] ;
+    } else {
+      for (int i = RP::rank - 1; i >= 0; --i) {
+        m_offset[i] =
+            (tile_idx % m_rp.m_tile_end[i]) * m_rp.m_tile[i] + m_rp.m_lower[i];
         tile_idx /= m_rp.m_tile_end[i];
       }
     }
 
-    //Check if offset+tiledim in bounds - if not, replace tile dims with the partial tile dims
-    const bool full_tile = check_iteration_bounds(m_tiledims , m_offset) ;
+    // Check if offset+tiledim in bounds - if not, replace tile dims with the
+    // partial tile dims
+    const bool full_tile = check_iteration_bounds(m_tiledims, m_offset);
 
     if (RP::inner_direction == RP::Left) {
-     if ( full_tile ) {
-//      #pragma simd
-        LOOP_7L(index_type, m_tiledims) {
-          apply( LOOP_ARGS_7 );
-        }
+      if (full_tile) {
+        //      #pragma simd
+        LOOP_7L(index_type, m_tiledims) { apply(LOOP_ARGS_7); }
       } else {
-//      #pragma simd
-        LOOP_7L(index_type, m_tiledims) {
-          apply( LOOP_ARGS_7 );
-        }
+        //      #pragma simd
+        LOOP_7L(index_type, m_tiledims) { apply(LOOP_ARGS_7); }
       }
-    } // end RP::Left
+    }  // end RP::Left
     else {
-     if ( full_tile ) {
-//      #pragma simd
-        LOOP_7R(index_type, m_tiledims) {
-          apply( LOOP_ARGS_7 );
-        }
+      if (full_tile) {
+        //      #pragma simd
+        LOOP_7R(index_type, m_tiledims) { apply(LOOP_ARGS_7); }
       } else {
-//      #pragma simd
-        LOOP_7R(index_type, m_tiledims) {
-          apply( LOOP_ARGS_7 );
-        }
+        //      #pragma simd
+        LOOP_7R(index_type, m_tiledims) { apply(LOOP_ARGS_7); }
       }
-    } // end RP::Right
-
-  } //end op() rank == 7
+    }  // end RP::Right
 
+  }  // end op() rank == 7
 
   template <typename IType>
-  inline
-  void operator_impl( IType tile_idx , const RankTag<8> ) const
-  {
+  inline void operator_impl(IType tile_idx, const RankTag<8>) const {
     point_type m_offset;
     point_type m_tiledims;
 
     if (RP::outer_direction == RP::Left) {
-      for (int i=0; i<RP::rank; ++i) {
-        m_offset[i] = (tile_idx % m_rp.m_tile_end[i]) * m_rp.m_tile[i] + m_rp.m_lower[i] ;
+      for (int i = 0; i < RP::rank; ++i) {
+        m_offset[i] =
+            (tile_idx % m_rp.m_tile_end[i]) * m_rp.m_tile[i] + m_rp.m_lower[i];
         tile_idx /= m_rp.m_tile_end[i];
       }
-    }
-    else {
-      for (int i=RP::rank-1; i>=0; --i) {
-        m_offset[i] = (tile_idx % m_rp.m_tile_end[i]) * m_rp.m_tile[i] + m_rp.m_lower[i] ;
+    } else {
+      for (int i = RP::rank - 1; i >= 0; --i) {
+        m_offset[i] =
+            (tile_idx % m_rp.m_tile_end[i]) * m_rp.m_tile[i] + m_rp.m_lower[i];
         tile_idx /= m_rp.m_tile_end[i];
       }
     }
 
-    //Check if offset+tiledim in bounds - if not, replace tile dims with the partial tile dims
-    const bool full_tile = check_iteration_bounds(m_tiledims , m_offset) ;
+    // Check if offset+tiledim in bounds - if not, replace tile dims with the
+    // partial tile dims
+    const bool full_tile = check_iteration_bounds(m_tiledims, m_offset);
 
     if (RP::inner_direction == RP::Left) {
-     if ( full_tile ) {
-//      #pragma simd
-        LOOP_8L(index_type, m_tiledims) {
-          apply( LOOP_ARGS_8 );
-        }
+      if (full_tile) {
+        //      #pragma simd
+        LOOP_8L(index_type, m_tiledims) { apply(LOOP_ARGS_8); }
       } else {
-//      #pragma simd
-        LOOP_8L(index_type, m_tiledims) {
-          apply( LOOP_ARGS_8 );
-        }
+        //      #pragma simd
+        LOOP_8L(index_type, m_tiledims) { apply(LOOP_ARGS_8); }
       }
-    } // end RP::Left
+    }  // end RP::Left
     else {
-     if ( full_tile ) {
-//      #pragma simd
-        LOOP_8R(index_type, m_tiledims) {
-          apply( LOOP_ARGS_8 );
-        }
+      if (full_tile) {
+        //      #pragma simd
+        LOOP_8R(index_type, m_tiledims) { apply(LOOP_ARGS_8); }
       } else {
-//      #pragma simd
-        LOOP_8R(index_type, m_tiledims) {
-          apply( LOOP_ARGS_8 );
-        }
+        //      #pragma simd
+        LOOP_8R(index_type, m_tiledims) { apply(LOOP_ARGS_8); }
       }
-    } // end RP::Right
+    }  // end RP::Right
 
-  } //end op() rank == 8
+  }  // end op() rank == 8
 #endif
 
+  template <typename... Args>
+  typename std::enable_if<(sizeof...(Args) == RP::rank &&
+                           std::is_same<Tag, void>::value),
+                          void>::type
+  apply(Args&&... args) const {
+    m_func(args...);
+  }
 
-    template <typename... Args>
-    typename std::enable_if<( sizeof...(Args) == RP::rank && std::is_same<Tag,void>::value), void>::type
-    apply(Args &&... args) const
-    {
-      m_func(args...);
-    }
+  template <typename... Args>
+  typename std::enable_if<(sizeof...(Args) == RP::rank &&
+                           !std::is_same<Tag, void>::value),
+                          void>::type
+  apply(Args&&... args) const {
+    m_func(m_tag, args...);
+  }
 
-    template <typename... Args>
-    typename std::enable_if<( sizeof...(Args) == RP::rank && !std::is_same<Tag,void>::value), void>::type
-    apply(Args &&... args) const
-    {
-      m_func( m_tag, args...);
-    }
-
-
-  RP         const& m_rp;
-  Functor    const& m_func;
-  typename std::conditional< std::is_same<Tag,void>::value,int,Tag>::type m_tag;
+  RP const& m_rp;
+  Functor const& m_func;
+  typename std::conditional<std::is_same<Tag, void>::value, int, Tag>::type
+      m_tag;
 };
 
-
 // For ParallelReduce
 // ValueType - scalar: For reductions
-template < typename RP
-         , typename Functor
-         , typename Tag
-         , typename ValueType
-         >
-struct HostIterateTile < RP , Functor , Tag , ValueType , typename std::enable_if< !is_void_type<ValueType >::value && !is_type_array<ValueType>::value >::type >
-{
+template <typename RP, typename Functor, typename Tag, typename ValueType>
+struct HostIterateTile<
+    RP, Functor, Tag, ValueType,
+    typename std::enable_if<!is_void_type<ValueType>::value &&
+                            !is_type_array<ValueType>::value>::type> {
   using index_type = typename RP::index_type;
   using point_type = typename RP::point_type;
 
   using value_type = ValueType;
 
-  inline
-  HostIterateTile( RP const& rp, Functor const& func, value_type & v )
-    : m_rp(rp) //Cuda 7.0 does not like braces...
-    , m_func(func)
-    , m_v(v) // use with non-void ValueType struct
+  inline HostIterateTile(RP const& rp, Functor const& func, value_type& v)
+      : m_rp(rp)  // Cuda 7.0 does not like braces...
+        ,
+        m_func(func),
+        m_v(v)  // use with non-void ValueType struct
   {
-// Errors due to braces rather than parenthesis for init (with cuda 7.0)
-//      /home/ndellin/kokkos/core/src/impl/KokkosExp_Host_IterateTile.hpp:1216:98: error: too many braces around initializer for ‘int’ [-fpermissive]
-//      /home/ndellin/kokkos/core/src/impl/KokkosExp_Host_IterateTile.hpp:1216:98: error: aggregate value used where an integer was expected
+    // Errors due to braces rather than parenthesis for init (with cuda 7.0)
+    //      /home/ndellin/kokkos/core/src/impl/KokkosExp_Host_IterateTile.hpp:1216:98:
+    //      error: too many braces around initializer for ‘int’ [-fpermissive]
+    //      /home/ndellin/kokkos/core/src/impl/KokkosExp_Host_IterateTile.hpp:1216:98:
+    //      error: aggregate value used where an integer was expected
   }
 
-  inline
-  bool check_iteration_bounds( point_type& partial_tile , point_type& offset ) const {
+  inline bool check_iteration_bounds(point_type& partial_tile,
+                                     point_type& offset) const {
     bool is_full_tile = true;
 
-      for ( int i = 0; i < RP::rank; ++i ) {
-        if ((offset[i] + m_rp.m_tile[i]) <= m_rp.m_upper[i]) {
-            partial_tile[i] = m_rp.m_tile[i] ;
-        }
-        else {
-          is_full_tile = false ;
-            partial_tile[i] = (m_rp.m_upper[i] - 1 - offset[i]) == 0 ? 1
-                            : (m_rp.m_upper[i] - m_rp.m_tile[i]) > 0 ? (m_rp.m_upper[i] - offset[i])
-                            : (m_rp.m_upper[i] - m_rp.m_lower[i]) ; // when single tile encloses range
-        }
+    for (int i = 0; i < RP::rank; ++i) {
+      if ((offset[i] + m_rp.m_tile[i]) <= m_rp.m_upper[i]) {
+        partial_tile[i] = m_rp.m_tile[i];
+      } else {
+        is_full_tile = false;
+        partial_tile[i] =
+            (m_rp.m_upper[i] - 1 - offset[i]) == 0
+                ? 1
+                : (m_rp.m_upper[i] - m_rp.m_tile[i]) > 0
+                      ? (m_rp.m_upper[i] - offset[i])
+                      : (m_rp.m_upper[i] -
+                         m_rp.m_lower[i]);  // when single tile encloses range
       }
+    }
 
-    return is_full_tile ;
-  } // end check bounds
-
+    return is_full_tile;
+  }  // end check bounds
 
   template <int Rank>
-  struct RankTag
-  {
+  struct RankTag {
     typedef RankTag type;
     enum { value = (int)Rank };
   };
 
-
 #if KOKKOS_ENABLE_NEW_LOOP_MACROS
   template <typename IType>
-  inline
-  void
-  operator()(IType tile_idx) const
-  {
+  inline void operator()(IType tile_idx) const {
     point_type m_offset;
     point_type m_tiledims;
 
     if (RP::outer_direction == RP::Left) {
-      for (int i=0; i<RP::rank; ++i) {
-        m_offset[i] = (tile_idx % m_rp.m_tile_end[i]) * m_rp.m_tile[i] + m_rp.m_lower[i] ;
+      for (int i = 0; i < RP::rank; ++i) {
+        m_offset[i] =
+            (tile_idx % m_rp.m_tile_end[i]) * m_rp.m_tile[i] + m_rp.m_lower[i];
         tile_idx /= m_rp.m_tile_end[i];
       }
-    }
-    else {
-      for (int i=RP::rank-1; i>=0; --i) {
-        m_offset[i] = (tile_idx % m_rp.m_tile_end[i]) * m_rp.m_tile[i] + m_rp.m_lower[i] ;
+    } else {
+      for (int i = RP::rank - 1; i >= 0; --i) {
+        m_offset[i] =
+            (tile_idx % m_rp.m_tile_end[i]) * m_rp.m_tile[i] + m_rp.m_lower[i];
         tile_idx /= m_rp.m_tile_end[i];
       }
     }
 
-    //Check if offset+tiledim in bounds - if not, replace tile dims with the partial tile dims
-    const bool full_tile = check_iteration_bounds(m_tiledims , m_offset) ;
-
-    Tile_Loop_Type< RP::rank, (RP::inner_direction == RP::Left), index_type, Tag >::apply( m_v, m_func, full_tile, m_offset, m_rp.m_tile, m_tiledims );
+    // Check if offset+tiledim in bounds - if not, replace tile dims with the
+    // partial tile dims
+    const bool full_tile = check_iteration_bounds(m_tiledims, m_offset);
 
+    Tile_Loop_Type<RP::rank, (RP::inner_direction == RP::Left), index_type,
+                   Tag>::apply(m_v, m_func, full_tile, m_offset, m_rp.m_tile,
+                               m_tiledims);
   }
 
 #else
   template <typename IType>
-  inline
-  void
-  operator()(IType tile_idx) const
-  { operator_impl( tile_idx , RankTag<RP::rank>() ); }
-  // added due to compiler error when using sfinae to choose operator based on rank
-
+  inline void operator()(IType tile_idx) const {
+    operator_impl(tile_idx, RankTag<RP::rank>());
+  }
+  // added due to compiler error when using sfinae to choose operator based on
+  // rank
 
   template <typename IType>
-  inline
-  void operator_impl( IType tile_idx , const RankTag<2> ) const
-  {
+  inline void operator_impl(IType tile_idx, const RankTag<2>) const {
     point_type m_offset;
     point_type m_tiledims;
 
     if (RP::outer_direction == RP::Left) {
-      for (int i=0; i<RP::rank; ++i) {
-        m_offset[i] = (tile_idx % m_rp.m_tile_end[i]) * m_rp.m_tile[i] + m_rp.m_lower[i] ;
+      for (int i = 0; i < RP::rank; ++i) {
+        m_offset[i] =
+            (tile_idx % m_rp.m_tile_end[i]) * m_rp.m_tile[i] + m_rp.m_lower[i];
         tile_idx /= m_rp.m_tile_end[i];
       }
-    }
-    else {
-      for (int i=RP::rank-1; i>=0; --i) {
-        m_offset[i] = (tile_idx % m_rp.m_tile_end[i]) * m_rp.m_tile[i] + m_rp.m_lower[i] ;
+    } else {
+      for (int i = RP::rank - 1; i >= 0; --i) {
+        m_offset[i] =
+            (tile_idx % m_rp.m_tile_end[i]) * m_rp.m_tile[i] + m_rp.m_lower[i];
         tile_idx /= m_rp.m_tile_end[i];
       }
     }
 
-    //Check if offset+tiledim in bounds - if not, replace tile dims with the partial tile dims
-    const bool full_tile = check_iteration_bounds(m_tiledims , m_offset) ;
+    // Check if offset+tiledim in bounds - if not, replace tile dims with the
+    // partial tile dims
+    const bool full_tile = check_iteration_bounds(m_tiledims, m_offset);
 
     if (RP::inner_direction == RP::Left) {
-     if ( full_tile ) {
-//      #pragma simd
-        LOOP_2L(index_type, m_tiledims) {
-          apply( LOOP_ARGS_2 );
-        }
+      if (full_tile) {
+        //      #pragma simd
+        LOOP_2L(index_type, m_tiledims) { apply(LOOP_ARGS_2); }
       } else {
-//      #pragma simd
-        LOOP_2L(index_type, m_tiledims) {
-          apply( LOOP_ARGS_2 );
-        }
+        //      #pragma simd
+        LOOP_2L(index_type, m_tiledims) { apply(LOOP_ARGS_2); }
       }
-    } // end RP::Left
+    }  // end RP::Left
     else {
-     if ( full_tile ) {
-//      #pragma simd
-        LOOP_2R(index_type, m_tiledims) {
-          apply( LOOP_ARGS_2 );
-        }
+      if (full_tile) {
+        //      #pragma simd
+        LOOP_2R(index_type, m_tiledims) { apply(LOOP_ARGS_2); }
       } else {
-//      #pragma simd
-        LOOP_2R(index_type, m_tiledims) {
-          apply( LOOP_ARGS_2 );
-        }
+        //      #pragma simd
+        LOOP_2R(index_type, m_tiledims) { apply(LOOP_ARGS_2); }
       }
-    } // end RP::Right
-
-  } //end op() rank == 2
+    }  // end RP::Right
 
+  }  // end op() rank == 2
 
   template <typename IType>
-  inline
-  void operator_impl( IType tile_idx , const RankTag<3> ) const
-  {
+  inline void operator_impl(IType tile_idx, const RankTag<3>) const {
     point_type m_offset;
     point_type m_tiledims;
 
     if (RP::outer_direction == RP::Left) {
-      for (int i=0; i<RP::rank; ++i) {
-        m_offset[i] = (tile_idx % m_rp.m_tile_end[i]) * m_rp.m_tile[i] + m_rp.m_lower[i] ;
+      for (int i = 0; i < RP::rank; ++i) {
+        m_offset[i] =
+            (tile_idx % m_rp.m_tile_end[i]) * m_rp.m_tile[i] + m_rp.m_lower[i];
         tile_idx /= m_rp.m_tile_end[i];
       }
-    }
-    else {
-      for (int i=RP::rank-1; i>=0; --i) {
-        m_offset[i] = (tile_idx % m_rp.m_tile_end[i]) * m_rp.m_tile[i] + m_rp.m_lower[i] ;
+    } else {
+      for (int i = RP::rank - 1; i >= 0; --i) {
+        m_offset[i] =
+            (tile_idx % m_rp.m_tile_end[i]) * m_rp.m_tile[i] + m_rp.m_lower[i];
         tile_idx /= m_rp.m_tile_end[i];
       }
     }
 
-    //Check if offset+tiledim in bounds - if not, replace tile dims with the partial tile dims
-    const bool full_tile = check_iteration_bounds(m_tiledims , m_offset) ;
+    // Check if offset+tiledim in bounds - if not, replace tile dims with the
+    // partial tile dims
+    const bool full_tile = check_iteration_bounds(m_tiledims, m_offset);
 
     if (RP::inner_direction == RP::Left) {
-     if ( full_tile ) {
-//      #pragma simd
-        LOOP_3L(index_type, m_tiledims) {
-          apply( LOOP_ARGS_3 );
-        }
+      if (full_tile) {
+        //      #pragma simd
+        LOOP_3L(index_type, m_tiledims) { apply(LOOP_ARGS_3); }
       } else {
-//      #pragma simd
-        LOOP_3L(index_type, m_tiledims) {
-          apply( LOOP_ARGS_3 );
-        }
+        //      #pragma simd
+        LOOP_3L(index_type, m_tiledims) { apply(LOOP_ARGS_3); }
       }
-    } // end RP::Left
+    }  // end RP::Left
     else {
-     if ( full_tile ) {
-//      #pragma simd
-        LOOP_3R(index_type, m_tiledims) {
-          apply( LOOP_ARGS_3 );
-        }
+      if (full_tile) {
+        //      #pragma simd
+        LOOP_3R(index_type, m_tiledims) { apply(LOOP_ARGS_3); }
       } else {
-//      #pragma simd
-        LOOP_3R(index_type, m_tiledims) {
-          apply( LOOP_ARGS_3 );
-        }
+        //      #pragma simd
+        LOOP_3R(index_type, m_tiledims) { apply(LOOP_ARGS_3); }
       }
-    } // end RP::Right
-
-  } //end op() rank == 3
+    }  // end RP::Right
 
+  }  // end op() rank == 3
 
   template <typename IType>
-  inline
-  void operator_impl( IType tile_idx , const RankTag<4> ) const
-  {
+  inline void operator_impl(IType tile_idx, const RankTag<4>) const {
     point_type m_offset;
     point_type m_tiledims;
 
     if (RP::outer_direction == RP::Left) {
-      for (int i=0; i<RP::rank; ++i) {
-        m_offset[i] = (tile_idx % m_rp.m_tile_end[i]) * m_rp.m_tile[i] + m_rp.m_lower[i] ;
+      for (int i = 0; i < RP::rank; ++i) {
+        m_offset[i] =
+            (tile_idx % m_rp.m_tile_end[i]) * m_rp.m_tile[i] + m_rp.m_lower[i];
         tile_idx /= m_rp.m_tile_end[i];
       }
-    }
-    else {
-      for (int i=RP::rank-1; i>=0; --i) {
-        m_offset[i] = (tile_idx % m_rp.m_tile_end[i]) * m_rp.m_tile[i] + m_rp.m_lower[i] ;
+    } else {
+      for (int i = RP::rank - 1; i >= 0; --i) {
+        m_offset[i] =
+            (tile_idx % m_rp.m_tile_end[i]) * m_rp.m_tile[i] + m_rp.m_lower[i];
         tile_idx /= m_rp.m_tile_end[i];
       }
     }
 
-    //Check if offset+tiledim in bounds - if not, replace tile dims with the partial tile dims
-    const bool full_tile = check_iteration_bounds(m_tiledims , m_offset) ;
+    // Check if offset+tiledim in bounds - if not, replace tile dims with the
+    // partial tile dims
+    const bool full_tile = check_iteration_bounds(m_tiledims, m_offset);
 
     if (RP::inner_direction == RP::Left) {
-     if ( full_tile ) {
-//      #pragma simd
-        LOOP_4L(index_type, m_tiledims) {
-          apply( LOOP_ARGS_4 );
-        }
+      if (full_tile) {
+        //      #pragma simd
+        LOOP_4L(index_type, m_tiledims) { apply(LOOP_ARGS_4); }
       } else {
-//      #pragma simd
-        LOOP_4L(index_type, m_tiledims) {
-          apply( LOOP_ARGS_4 );
-        }
+        //      #pragma simd
+        LOOP_4L(index_type, m_tiledims) { apply(LOOP_ARGS_4); }
       }
-    } // end RP::Left
+    }  // end RP::Left
     else {
-     if ( full_tile ) {
-//      #pragma simd
-        LOOP_4R(index_type, m_tiledims) {
-          apply( LOOP_ARGS_4 );
-        }
+      if (full_tile) {
+        //      #pragma simd
+        LOOP_4R(index_type, m_tiledims) { apply(LOOP_ARGS_4); }
       } else {
-//      #pragma simd
-        LOOP_4R(index_type, m_tiledims) {
-          apply( LOOP_ARGS_4 );
-        }
+        //      #pragma simd
+        LOOP_4R(index_type, m_tiledims) { apply(LOOP_ARGS_4); }
       }
-    } // end RP::Right
-
-  } //end op() rank == 4
+    }  // end RP::Right
 
+  }  // end op() rank == 4
 
   template <typename IType>
-  inline
-  void operator_impl( IType tile_idx , const RankTag<5> ) const
-  {
+  inline void operator_impl(IType tile_idx, const RankTag<5>) const {
     point_type m_offset;
     point_type m_tiledims;
 
     if (RP::outer_direction == RP::Left) {
-      for (int i=0; i<RP::rank; ++i) {
-        m_offset[i] = (tile_idx % m_rp.m_tile_end[i]) * m_rp.m_tile[i] + m_rp.m_lower[i] ;
+      for (int i = 0; i < RP::rank; ++i) {
+        m_offset[i] =
+            (tile_idx % m_rp.m_tile_end[i]) * m_rp.m_tile[i] + m_rp.m_lower[i];
         tile_idx /= m_rp.m_tile_end[i];
       }
-    }
-    else {
-      for (int i=RP::rank-1; i>=0; --i) {
-        m_offset[i] = (tile_idx % m_rp.m_tile_end[i]) * m_rp.m_tile[i] + m_rp.m_lower[i] ;
+    } else {
+      for (int i = RP::rank - 1; i >= 0; --i) {
+        m_offset[i] =
+            (tile_idx % m_rp.m_tile_end[i]) * m_rp.m_tile[i] + m_rp.m_lower[i];
         tile_idx /= m_rp.m_tile_end[i];
       }
     }
 
-    //Check if offset+tiledim in bounds - if not, replace tile dims with the partial tile dims
-    const bool full_tile = check_iteration_bounds(m_tiledims , m_offset) ;
+    // Check if offset+tiledim in bounds - if not, replace tile dims with the
+    // partial tile dims
+    const bool full_tile = check_iteration_bounds(m_tiledims, m_offset);
 
     if (RP::inner_direction == RP::Left) {
-     if ( full_tile ) {
-//      #pragma simd
-        LOOP_5L(index_type, m_tiledims) {
-          apply( LOOP_ARGS_5 );
-        }
+      if (full_tile) {
+        //      #pragma simd
+        LOOP_5L(index_type, m_tiledims) { apply(LOOP_ARGS_5); }
       } else {
-//      #pragma simd
-        LOOP_5L(index_type, m_tiledims) {
-          apply( LOOP_ARGS_5 );
-        }
+        //      #pragma simd
+        LOOP_5L(index_type, m_tiledims) { apply(LOOP_ARGS_5); }
       }
-    } // end RP::Left
+    }  // end RP::Left
     else {
-     if ( full_tile ) {
-//      #pragma simd
-        LOOP_5R(index_type, m_tiledims) {
-          apply( LOOP_ARGS_5 );
-        }
+      if (full_tile) {
+        //      #pragma simd
+        LOOP_5R(index_type, m_tiledims) { apply(LOOP_ARGS_5); }
       } else {
-//      #pragma simd
-        LOOP_5R(index_type, m_tiledims) {
-          apply( LOOP_ARGS_5 );
-        }
+        //      #pragma simd
+        LOOP_5R(index_type, m_tiledims) { apply(LOOP_ARGS_5); }
       }
-    } // end RP::Right
-
-  } //end op() rank == 5
+    }  // end RP::Right
 
+  }  // end op() rank == 5
 
   template <typename IType>
-  inline
-  void operator_impl( IType tile_idx , const RankTag<6> ) const
-  {
+  inline void operator_impl(IType tile_idx, const RankTag<6>) const {
     point_type m_offset;
     point_type m_tiledims;
 
     if (RP::outer_direction == RP::Left) {
-      for (int i=0; i<RP::rank; ++i) {
-        m_offset[i] = (tile_idx % m_rp.m_tile_end[i]) * m_rp.m_tile[i] + m_rp.m_lower[i] ;
+      for (int i = 0; i < RP::rank; ++i) {
+        m_offset[i] =
+            (tile_idx % m_rp.m_tile_end[i]) * m_rp.m_tile[i] + m_rp.m_lower[i];
         tile_idx /= m_rp.m_tile_end[i];
       }
-    }
-    else {
-      for (int i=RP::rank-1; i>=0; --i) {
-        m_offset[i] = (tile_idx % m_rp.m_tile_end[i]) * m_rp.m_tile[i] + m_rp.m_lower[i] ;
+    } else {
+      for (int i = RP::rank - 1; i >= 0; --i) {
+        m_offset[i] =
+            (tile_idx % m_rp.m_tile_end[i]) * m_rp.m_tile[i] + m_rp.m_lower[i];
         tile_idx /= m_rp.m_tile_end[i];
       }
     }
 
-    //Check if offset+tiledim in bounds - if not, replace tile dims with the partial tile dims
-    const bool full_tile = check_iteration_bounds(m_tiledims , m_offset) ;
+    // Check if offset+tiledim in bounds - if not, replace tile dims with the
+    // partial tile dims
+    const bool full_tile = check_iteration_bounds(m_tiledims, m_offset);
 
     if (RP::inner_direction == RP::Left) {
-     if ( full_tile ) {
-//      #pragma simd
-        LOOP_6L(index_type, m_tiledims) {
-          apply( LOOP_ARGS_6 );
-        }
+      if (full_tile) {
+        //      #pragma simd
+        LOOP_6L(index_type, m_tiledims) { apply(LOOP_ARGS_6); }
       } else {
-//      #pragma simd
-        LOOP_6L(index_type, m_tiledims) {
-          apply( LOOP_ARGS_6 );
-        }
+        //      #pragma simd
+        LOOP_6L(index_type, m_tiledims) { apply(LOOP_ARGS_6); }
       }
-    } // end RP::Left
+    }  // end RP::Left
     else {
-     if ( full_tile ) {
-//      #pragma simd
-        LOOP_6R(index_type, m_tiledims) {
-          apply( LOOP_ARGS_6 );
-        }
+      if (full_tile) {
+        //      #pragma simd
+        LOOP_6R(index_type, m_tiledims) { apply(LOOP_ARGS_6); }
       } else {
-//      #pragma simd
-        LOOP_6R(index_type, m_tiledims) {
-          apply( LOOP_ARGS_6 );
-        }
+        //      #pragma simd
+        LOOP_6R(index_type, m_tiledims) { apply(LOOP_ARGS_6); }
       }
-    } // end RP::Right
-
-  } //end op() rank == 6
+    }  // end RP::Right
 
+  }  // end op() rank == 6
 
   template <typename IType>
-  inline
-  void operator_impl( IType tile_idx , const RankTag<7> ) const
-  {
+  inline void operator_impl(IType tile_idx, const RankTag<7>) const {
     point_type m_offset;
     point_type m_tiledims;
 
     if (RP::outer_direction == RP::Left) {
-      for (int i=0; i<RP::rank; ++i) {
-        m_offset[i] = (tile_idx % m_rp.m_tile_end[i]) * m_rp.m_tile[i] + m_rp.m_lower[i] ;
+      for (int i = 0; i < RP::rank; ++i) {
+        m_offset[i] =
+            (tile_idx % m_rp.m_tile_end[i]) * m_rp.m_tile[i] + m_rp.m_lower[i];
         tile_idx /= m_rp.m_tile_end[i];
       }
-    }
-    else {
-      for (int i=RP::rank-1; i>=0; --i) {
-        m_offset[i] = (tile_idx % m_rp.m_tile_end[i]) * m_rp.m_tile[i] + m_rp.m_lower[i] ;
+    } else {
+      for (int i = RP::rank - 1; i >= 0; --i) {
+        m_offset[i] =
+            (tile_idx % m_rp.m_tile_end[i]) * m_rp.m_tile[i] + m_rp.m_lower[i];
         tile_idx /= m_rp.m_tile_end[i];
       }
     }
 
-    //Check if offset+tiledim in bounds - if not, replace tile dims with the partial tile dims
-    const bool full_tile = check_iteration_bounds(m_tiledims , m_offset) ;
+    // Check if offset+tiledim in bounds - if not, replace tile dims with the
+    // partial tile dims
+    const bool full_tile = check_iteration_bounds(m_tiledims, m_offset);
 
     if (RP::inner_direction == RP::Left) {
-     if ( full_tile ) {
-//      #pragma simd
-        LOOP_7L(index_type, m_tiledims) {
-          apply( LOOP_ARGS_7 );
-        }
+      if (full_tile) {
+        //      #pragma simd
+        LOOP_7L(index_type, m_tiledims) { apply(LOOP_ARGS_7); }
       } else {
-//      #pragma simd
-        LOOP_7L(index_type, m_tiledims) {
-          apply( LOOP_ARGS_7 );
-        }
+        //      #pragma simd
+        LOOP_7L(index_type, m_tiledims) { apply(LOOP_ARGS_7); }
       }
-    } // end RP::Left
+    }  // end RP::Left
     else {
-     if ( full_tile ) {
-//      #pragma simd
-        LOOP_7R(index_type, m_tiledims) {
-          apply( LOOP_ARGS_7 );
-        }
+      if (full_tile) {
+        //      #pragma simd
+        LOOP_7R(index_type, m_tiledims) { apply(LOOP_ARGS_7); }
       } else {
-//      #pragma simd
-        LOOP_7R(index_type, m_tiledims) {
-          apply( LOOP_ARGS_7 );
-        }
+        //      #pragma simd
+        LOOP_7R(index_type, m_tiledims) { apply(LOOP_ARGS_7); }
       }
-    } // end RP::Right
-
-  } //end op() rank == 7
+    }  // end RP::Right
 
+  }  // end op() rank == 7
 
   template <typename IType>
-  inline
-  void operator_impl( IType tile_idx , const RankTag<8> ) const
-  {
+  inline void operator_impl(IType tile_idx, const RankTag<8>) const {
     point_type m_offset;
     point_type m_tiledims;
 
     if (RP::outer_direction == RP::Left) {
-      for (int i=0; i<RP::rank; ++i) {
-        m_offset[i] = (tile_idx % m_rp.m_tile_end[i]) * m_rp.m_tile[i] + m_rp.m_lower[i] ;
+      for (int i = 0; i < RP::rank; ++i) {
+        m_offset[i] =
+            (tile_idx % m_rp.m_tile_end[i]) * m_rp.m_tile[i] + m_rp.m_lower[i];
         tile_idx /= m_rp.m_tile_end[i];
       }
-    }
-    else {
-      for (int i=RP::rank-1; i>=0; --i) {
-        m_offset[i] = (tile_idx % m_rp.m_tile_end[i]) * m_rp.m_tile[i] + m_rp.m_lower[i] ;
+    } else {
+      for (int i = RP::rank - 1; i >= 0; --i) {
+        m_offset[i] =
+            (tile_idx % m_rp.m_tile_end[i]) * m_rp.m_tile[i] + m_rp.m_lower[i];
         tile_idx /= m_rp.m_tile_end[i];
       }
     }
 
-    //Check if offset+tiledim in bounds - if not, replace tile dims with the partial tile dims
-    const bool full_tile = check_iteration_bounds(m_tiledims , m_offset) ;
+    // Check if offset+tiledim in bounds - if not, replace tile dims with the
+    // partial tile dims
+    const bool full_tile = check_iteration_bounds(m_tiledims, m_offset);
 
     if (RP::inner_direction == RP::Left) {
-     if ( full_tile ) {
-//      #pragma simd
-        LOOP_8L(index_type, m_tiledims) {
-          apply( LOOP_ARGS_8 );
-        }
+      if (full_tile) {
+        //      #pragma simd
+        LOOP_8L(index_type, m_tiledims) { apply(LOOP_ARGS_8); }
       } else {
-//      #pragma simd
-        LOOP_8L(index_type, m_tiledims) {
-          apply( LOOP_ARGS_8 );
-        }
+        //      #pragma simd
+        LOOP_8L(index_type, m_tiledims) { apply(LOOP_ARGS_8); }
       }
-    } // end RP::Left
+    }  // end RP::Left
     else {
-     if ( full_tile ) {
-//      #pragma simd
-        LOOP_8R(index_type, m_tiledims) {
-          apply( LOOP_ARGS_8 );
-        }
+      if (full_tile) {
+        //      #pragma simd
+        LOOP_8R(index_type, m_tiledims) { apply(LOOP_ARGS_8); }
       } else {
-//      #pragma simd
-        LOOP_8R(index_type, m_tiledims) {
-          apply( LOOP_ARGS_8 );
-        }
+        //      #pragma simd
+        LOOP_8R(index_type, m_tiledims) { apply(LOOP_ARGS_8); }
       }
-    } // end RP::Right
+    }  // end RP::Right
 
-  } //end op() rank == 8
+  }  // end op() rank == 8
 #endif
 
+  template <typename... Args>
+  typename std::enable_if<(sizeof...(Args) == RP::rank &&
+                           std::is_same<Tag, void>::value),
+                          void>::type
+  apply(Args&&... args) const {
+    m_func(args..., m_v);
+  }
 
-    template <typename... Args>
-    typename std::enable_if<( sizeof...(Args) == RP::rank && std::is_same<Tag,void>::value), void>::type
-    apply(Args &&... args) const
-    {
-      m_func(args... , m_v);
-    }
-
-    template <typename... Args>
-    typename std::enable_if<( sizeof...(Args) == RP::rank && !std::is_same<Tag,void>::value), void>::type
-    apply(Args &&... args) const
-    {
-      m_func( m_tag, args... , m_v);
-    }
-
-
-  RP         const& m_rp;
-  Functor    const& m_func;
-  value_type  & m_v;
-  typename std::conditional< std::is_same<Tag,void>::value,int,Tag>::type m_tag;
+  template <typename... Args>
+  typename std::enable_if<(sizeof...(Args) == RP::rank &&
+                           !std::is_same<Tag, void>::value),
+                          void>::type
+  apply(Args&&... args) const {
+    m_func(m_tag, args..., m_v);
+  }
 
+  RP const& m_rp;
+  Functor const& m_func;
+  value_type& m_v;
+  typename std::conditional<std::is_same<Tag, void>::value, int, Tag>::type
+      m_tag;
 };
 
-
 // For ParallelReduce
 // Extra specialization for array reductions
 // ValueType[]: For array reductions
-template < typename RP
-         , typename Functor
-         , typename Tag
-         , typename ValueType
-         >
-struct HostIterateTile < RP , Functor , Tag , ValueType , typename std::enable_if< !is_void_type<ValueType >::value && is_type_array<ValueType>::value >::type >
-{
+template <typename RP, typename Functor, typename Tag, typename ValueType>
+struct HostIterateTile<
+    RP, Functor, Tag, ValueType,
+    typename std::enable_if<!is_void_type<ValueType>::value &&
+                            is_type_array<ValueType>::value>::type> {
   using index_type = typename RP::index_type;
   using point_type = typename RP::point_type;
 
-  using value_type = typename is_type_array<ValueType>::value_type; // strip away the 'array-ness' [], only underlying type remains
+  using value_type =
+      typename is_type_array<ValueType>::value_type;  // strip away the
+                                                      // 'array-ness' [], only
+                                                      // underlying type remains
 
-  inline
-  HostIterateTile( RP const& rp, Functor const& func, value_type *v ) // v should be an array; treat as pointer for compatibility since size is not known nor needed here
-    : m_rp(rp) //Cuda 7.0 does not like braces...
-    , m_func(func)
-    , m_v(v) // use with non-void ValueType struct
+  inline HostIterateTile(
+      RP const& rp, Functor const& func,
+      value_type* v)  // v should be an array; treat as pointer for
+                      // compatibility since size is not known nor needed here
+      : m_rp(rp)      // Cuda 7.0 does not like braces...
+        ,
+        m_func(func),
+        m_v(v)  // use with non-void ValueType struct
   {}
 
-  inline
-  bool check_iteration_bounds( point_type& partial_tile , point_type& offset ) const {
+  inline bool check_iteration_bounds(point_type& partial_tile,
+                                     point_type& offset) const {
     bool is_full_tile = true;
 
-      for ( int i = 0; i < RP::rank; ++i ) {
-        if ((offset[i] + m_rp.m_tile[i]) <= m_rp.m_upper[i]) {
-            partial_tile[i] = m_rp.m_tile[i] ;
-        }
-        else {
-          is_full_tile = false ;
-            partial_tile[i] = (m_rp.m_upper[i] - 1 - offset[i]) == 0 ? 1
-                            : (m_rp.m_upper[i] - m_rp.m_tile[i]) > 0 ? (m_rp.m_upper[i] - offset[i])
-                            : (m_rp.m_upper[i] - m_rp.m_lower[i]) ; // when single tile encloses range
-        }
+    for (int i = 0; i < RP::rank; ++i) {
+      if ((offset[i] + m_rp.m_tile[i]) <= m_rp.m_upper[i]) {
+        partial_tile[i] = m_rp.m_tile[i];
+      } else {
+        is_full_tile = false;
+        partial_tile[i] =
+            (m_rp.m_upper[i] - 1 - offset[i]) == 0
+                ? 1
+                : (m_rp.m_upper[i] - m_rp.m_tile[i]) > 0
+                      ? (m_rp.m_upper[i] - offset[i])
+                      : (m_rp.m_upper[i] -
+                         m_rp.m_lower[i]);  // when single tile encloses range
       }
+    }
 
-    return is_full_tile ;
-  } // end check bounds
-
+    return is_full_tile;
+  }  // end check bounds
 
   template <int Rank>
-  struct RankTag
-  {
+  struct RankTag {
     typedef RankTag type;
     enum { value = (int)Rank };
   };
 
-
 #if KOKKOS_ENABLE_NEW_LOOP_MACROS
   template <typename IType>
-  inline
-  void
-  operator()(IType tile_idx) const
-  {
+  inline void operator()(IType tile_idx) const {
     point_type m_offset;
     point_type m_tiledims;
 
     if (RP::outer_direction == RP::Left) {
-      for (int i=0; i<RP::rank; ++i) {
-        m_offset[i] = (tile_idx % m_rp.m_tile_end[i]) * m_rp.m_tile[i] + m_rp.m_lower[i] ;
+      for (int i = 0; i < RP::rank; ++i) {
+        m_offset[i] =
+            (tile_idx % m_rp.m_tile_end[i]) * m_rp.m_tile[i] + m_rp.m_lower[i];
         tile_idx /= m_rp.m_tile_end[i];
       }
-    }
-    else {
-      for (int i=RP::rank-1; i>=0; --i) {
-        m_offset[i] = (tile_idx % m_rp.m_tile_end[i]) * m_rp.m_tile[i] + m_rp.m_lower[i] ;
+    } else {
+      for (int i = RP::rank - 1; i >= 0; --i) {
+        m_offset[i] =
+            (tile_idx % m_rp.m_tile_end[i]) * m_rp.m_tile[i] + m_rp.m_lower[i];
         tile_idx /= m_rp.m_tile_end[i];
       }
     }
 
-    //Check if offset+tiledim in bounds - if not, replace tile dims with the partial tile dims
-    const bool full_tile = check_iteration_bounds(m_tiledims , m_offset) ;
-
-    Tile_Loop_Type< RP::rank, (RP::inner_direction == RP::Left), index_type, Tag >::apply( m_v, m_func, full_tile, m_offset, m_rp.m_tile, m_tiledims );
+    // Check if offset+tiledim in bounds - if not, replace tile dims with the
+    // partial tile dims
+    const bool full_tile = check_iteration_bounds(m_tiledims, m_offset);
 
+    Tile_Loop_Type<RP::rank, (RP::inner_direction == RP::Left), index_type,
+                   Tag>::apply(m_v, m_func, full_tile, m_offset, m_rp.m_tile,
+                               m_tiledims);
   }
 
 #else
   template <typename IType>
-  inline
-  void
-  operator()(IType tile_idx) const
-  { operator_impl( tile_idx , RankTag<RP::rank>() ); }
-  // added due to compiler error when using sfinae to choose operator based on rank
-
+  inline void operator()(IType tile_idx) const {
+    operator_impl(tile_idx, RankTag<RP::rank>());
+  }
+  // added due to compiler error when using sfinae to choose operator based on
+  // rank
 
   template <typename IType>
-  inline
-  void operator_impl( IType tile_idx , const RankTag<2> ) const
-  {
+  inline void operator_impl(IType tile_idx, const RankTag<2>) const {
     point_type m_offset;
     point_type m_tiledims;
 
     if (RP::outer_direction == RP::Left) {
-      for (int i=0; i<RP::rank; ++i) {
-        m_offset[i] = (tile_idx % m_rp.m_tile_end[i]) * m_rp.m_tile[i] + m_rp.m_lower[i] ;
+      for (int i = 0; i < RP::rank; ++i) {
+        m_offset[i] =
+            (tile_idx % m_rp.m_tile_end[i]) * m_rp.m_tile[i] + m_rp.m_lower[i];
         tile_idx /= m_rp.m_tile_end[i];
       }
-    }
-    else {
-      for (int i=RP::rank-1; i>=0; --i) {
-        m_offset[i] = (tile_idx % m_rp.m_tile_end[i]) * m_rp.m_tile[i] + m_rp.m_lower[i] ;
+    } else {
+      for (int i = RP::rank - 1; i >= 0; --i) {
+        m_offset[i] =
+            (tile_idx % m_rp.m_tile_end[i]) * m_rp.m_tile[i] + m_rp.m_lower[i];
         tile_idx /= m_rp.m_tile_end[i];
       }
     }
 
-    //Check if offset+tiledim in bounds - if not, replace tile dims with the partial tile dims
-    const bool full_tile = check_iteration_bounds(m_tiledims , m_offset) ;
+    // Check if offset+tiledim in bounds - if not, replace tile dims with the
+    // partial tile dims
+    const bool full_tile = check_iteration_bounds(m_tiledims, m_offset);
 
     if (RP::inner_direction == RP::Left) {
-     if ( full_tile ) {
-//      #pragma simd
-        LOOP_2L(index_type, m_tiledims) {
-          apply( LOOP_ARGS_2 );
-        }
+      if (full_tile) {
+        //      #pragma simd
+        LOOP_2L(index_type, m_tiledims) { apply(LOOP_ARGS_2); }
       } else {
-//      #pragma simd
-        LOOP_2L(index_type, m_tiledims) {
-          apply( LOOP_ARGS_2 );
-        }
+        //      #pragma simd
+        LOOP_2L(index_type, m_tiledims) { apply(LOOP_ARGS_2); }
       }
-    } // end RP::Left
+    }  // end RP::Left
     else {
-     if ( full_tile ) {
-//      #pragma simd
-        LOOP_2R(index_type, m_tiledims) {
-          apply( LOOP_ARGS_2 );
-        }
+      if (full_tile) {
+        //      #pragma simd
+        LOOP_2R(index_type, m_tiledims) { apply(LOOP_ARGS_2); }
       } else {
-//      #pragma simd
-        LOOP_2R(index_type, m_tiledims) {
-          apply( LOOP_ARGS_2 );
-        }
+        //      #pragma simd
+        LOOP_2R(index_type, m_tiledims) { apply(LOOP_ARGS_2); }
       }
-    } // end RP::Right
-
-  } //end op() rank == 2
+    }  // end RP::Right
 
+  }  // end op() rank == 2
 
   template <typename IType>
-  inline
-  void operator_impl( IType tile_idx , const RankTag<3> ) const
-  {
+  inline void operator_impl(IType tile_idx, const RankTag<3>) const {
     point_type m_offset;
     point_type m_tiledims;
 
     if (RP::outer_direction == RP::Left) {
-      for (int i=0; i<RP::rank; ++i) {
-        m_offset[i] = (tile_idx % m_rp.m_tile_end[i]) * m_rp.m_tile[i] + m_rp.m_lower[i] ;
+      for (int i = 0; i < RP::rank; ++i) {
+        m_offset[i] =
+            (tile_idx % m_rp.m_tile_end[i]) * m_rp.m_tile[i] + m_rp.m_lower[i];
         tile_idx /= m_rp.m_tile_end[i];
       }
-    }
-    else {
-      for (int i=RP::rank-1; i>=0; --i) {
-        m_offset[i] = (tile_idx % m_rp.m_tile_end[i]) * m_rp.m_tile[i] + m_rp.m_lower[i] ;
+    } else {
+      for (int i = RP::rank - 1; i >= 0; --i) {
+        m_offset[i] =
+            (tile_idx % m_rp.m_tile_end[i]) * m_rp.m_tile[i] + m_rp.m_lower[i];
         tile_idx /= m_rp.m_tile_end[i];
       }
     }
 
-    //Check if offset+tiledim in bounds - if not, replace tile dims with the partial tile dims
-    const bool full_tile = check_iteration_bounds(m_tiledims , m_offset) ;
+    // Check if offset+tiledim in bounds - if not, replace tile dims with the
+    // partial tile dims
+    const bool full_tile = check_iteration_bounds(m_tiledims, m_offset);
 
     if (RP::inner_direction == RP::Left) {
-     if ( full_tile ) {
-//      #pragma simd
-        LOOP_3L(index_type, m_tiledims) {
-          apply( LOOP_ARGS_3 );
-        }
+      if (full_tile) {
+        //      #pragma simd
+        LOOP_3L(index_type, m_tiledims) { apply(LOOP_ARGS_3); }
       } else {
-//      #pragma simd
-        LOOP_3L(index_type, m_tiledims) {
-          apply( LOOP_ARGS_3 );
-        }
+        //      #pragma simd
+        LOOP_3L(index_type, m_tiledims) { apply(LOOP_ARGS_3); }
       }
-    } // end RP::Left
+    }  // end RP::Left
     else {
-     if ( full_tile ) {
-//      #pragma simd
-        LOOP_3R(index_type, m_tiledims) {
-          apply( LOOP_ARGS_3 );
-        }
+      if (full_tile) {
+        //      #pragma simd
+        LOOP_3R(index_type, m_tiledims) { apply(LOOP_ARGS_3); }
       } else {
-//      #pragma simd
-        LOOP_3R(index_type, m_tiledims) {
-          apply( LOOP_ARGS_3 );
-        }
+        //      #pragma simd
+        LOOP_3R(index_type, m_tiledims) { apply(LOOP_ARGS_3); }
       }
-    } // end RP::Right
-
-  } //end op() rank == 3
+    }  // end RP::Right
 
+  }  // end op() rank == 3
 
   template <typename IType>
-  inline
-  void operator_impl( IType tile_idx , const RankTag<4> ) const
-  {
+  inline void operator_impl(IType tile_idx, const RankTag<4>) const {
     point_type m_offset;
     point_type m_tiledims;
 
     if (RP::outer_direction == RP::Left) {
-      for (int i=0; i<RP::rank; ++i) {
-        m_offset[i] = (tile_idx % m_rp.m_tile_end[i]) * m_rp.m_tile[i] + m_rp.m_lower[i] ;
+      for (int i = 0; i < RP::rank; ++i) {
+        m_offset[i] =
+            (tile_idx % m_rp.m_tile_end[i]) * m_rp.m_tile[i] + m_rp.m_lower[i];
         tile_idx /= m_rp.m_tile_end[i];
       }
-    }
-    else {
-      for (int i=RP::rank-1; i>=0; --i) {
-        m_offset[i] = (tile_idx % m_rp.m_tile_end[i]) * m_rp.m_tile[i] + m_rp.m_lower[i] ;
+    } else {
+      for (int i = RP::rank - 1; i >= 0; --i) {
+        m_offset[i] =
+            (tile_idx % m_rp.m_tile_end[i]) * m_rp.m_tile[i] + m_rp.m_lower[i];
         tile_idx /= m_rp.m_tile_end[i];
       }
     }
 
-    //Check if offset+tiledim in bounds - if not, replace tile dims with the partial tile dims
-    const bool full_tile = check_iteration_bounds(m_tiledims , m_offset) ;
+    // Check if offset+tiledim in bounds - if not, replace tile dims with the
+    // partial tile dims
+    const bool full_tile = check_iteration_bounds(m_tiledims, m_offset);
 
     if (RP::inner_direction == RP::Left) {
-     if ( full_tile ) {
-//      #pragma simd
-        LOOP_4L(index_type, m_tiledims) {
-          apply( LOOP_ARGS_4 );
-        }
+      if (full_tile) {
+        //      #pragma simd
+        LOOP_4L(index_type, m_tiledims) { apply(LOOP_ARGS_4); }
       } else {
-//      #pragma simd
-        LOOP_4L(index_type, m_tiledims) {
-          apply( LOOP_ARGS_4 );
-        }
+        //      #pragma simd
+        LOOP_4L(index_type, m_tiledims) { apply(LOOP_ARGS_4); }
       }
-    } // end RP::Left
+    }  // end RP::Left
     else {
-     if ( full_tile ) {
-//      #pragma simd
-        LOOP_4R(index_type, m_tiledims) {
-          apply( LOOP_ARGS_4 );
-        }
+      if (full_tile) {
+        //      #pragma simd
+        LOOP_4R(index_type, m_tiledims) { apply(LOOP_ARGS_4); }
       } else {
-//      #pragma simd
-        LOOP_4R(index_type, m_tiledims) {
-          apply( LOOP_ARGS_4 );
-        }
+        //      #pragma simd
+        LOOP_4R(index_type, m_tiledims) { apply(LOOP_ARGS_4); }
       }
-    } // end RP::Right
-
-  } //end op() rank == 4
+    }  // end RP::Right
 
+  }  // end op() rank == 4
 
   template <typename IType>
-  inline
-  void operator_impl( IType tile_idx , const RankTag<5> ) const
-  {
+  inline void operator_impl(IType tile_idx, const RankTag<5>) const {
     point_type m_offset;
     point_type m_tiledims;
 
     if (RP::outer_direction == RP::Left) {
-      for (int i=0; i<RP::rank; ++i) {
-        m_offset[i] = (tile_idx % m_rp.m_tile_end[i]) * m_rp.m_tile[i] + m_rp.m_lower[i] ;
+      for (int i = 0; i < RP::rank; ++i) {
+        m_offset[i] =
+            (tile_idx % m_rp.m_tile_end[i]) * m_rp.m_tile[i] + m_rp.m_lower[i];
         tile_idx /= m_rp.m_tile_end[i];
       }
-    }
-    else {
-      for (int i=RP::rank-1; i>=0; --i) {
-        m_offset[i] = (tile_idx % m_rp.m_tile_end[i]) * m_rp.m_tile[i] + m_rp.m_lower[i] ;
+    } else {
+      for (int i = RP::rank - 1; i >= 0; --i) {
+        m_offset[i] =
+            (tile_idx % m_rp.m_tile_end[i]) * m_rp.m_tile[i] + m_rp.m_lower[i];
         tile_idx /= m_rp.m_tile_end[i];
       }
     }
 
-    //Check if offset+tiledim in bounds - if not, replace tile dims with the partial tile dims
-    const bool full_tile = check_iteration_bounds(m_tiledims , m_offset) ;
+    // Check if offset+tiledim in bounds - if not, replace tile dims with the
+    // partial tile dims
+    const bool full_tile = check_iteration_bounds(m_tiledims, m_offset);
 
     if (RP::inner_direction == RP::Left) {
-     if ( full_tile ) {
-//      #pragma simd
-        LOOP_5L(index_type, m_tiledims) {
-          apply( LOOP_ARGS_5 );
-        }
+      if (full_tile) {
+        //      #pragma simd
+        LOOP_5L(index_type, m_tiledims) { apply(LOOP_ARGS_5); }
       } else {
-//      #pragma simd
-        LOOP_5L(index_type, m_tiledims) {
-          apply( LOOP_ARGS_5 );
-        }
+        //      #pragma simd
+        LOOP_5L(index_type, m_tiledims) { apply(LOOP_ARGS_5); }
       }
-    } // end RP::Left
+    }  // end RP::Left
     else {
-     if ( full_tile ) {
-//      #pragma simd
-        LOOP_5R(index_type, m_tiledims) {
-          apply( LOOP_ARGS_5 );
-        }
+      if (full_tile) {
+        //      #pragma simd
+        LOOP_5R(index_type, m_tiledims) { apply(LOOP_ARGS_5); }
       } else {
-//      #pragma simd
-        LOOP_5R(index_type, m_tiledims) {
-          apply( LOOP_ARGS_5 );
-        }
+        //      #pragma simd
+        LOOP_5R(index_type, m_tiledims) { apply(LOOP_ARGS_5); }
       }
-    } // end RP::Right
-
-  } //end op() rank == 5
+    }  // end RP::Right
 
+  }  // end op() rank == 5
 
   template <typename IType>
-  inline
-  void operator_impl( IType tile_idx , const RankTag<6> ) const
-  {
+  inline void operator_impl(IType tile_idx, const RankTag<6>) const {
     point_type m_offset;
     point_type m_tiledims;
 
     if (RP::outer_direction == RP::Left) {
-      for (int i=0; i<RP::rank; ++i) {
-        m_offset[i] = (tile_idx % m_rp.m_tile_end[i]) * m_rp.m_tile[i] + m_rp.m_lower[i] ;
+      for (int i = 0; i < RP::rank; ++i) {
+        m_offset[i] =
+            (tile_idx % m_rp.m_tile_end[i]) * m_rp.m_tile[i] + m_rp.m_lower[i];
         tile_idx /= m_rp.m_tile_end[i];
       }
-    }
-    else {
-      for (int i=RP::rank-1; i>=0; --i) {
-        m_offset[i] = (tile_idx % m_rp.m_tile_end[i]) * m_rp.m_tile[i] + m_rp.m_lower[i] ;
+    } else {
+      for (int i = RP::rank - 1; i >= 0; --i) {
+        m_offset[i] =
+            (tile_idx % m_rp.m_tile_end[i]) * m_rp.m_tile[i] + m_rp.m_lower[i];
         tile_idx /= m_rp.m_tile_end[i];
       }
     }
 
-    //Check if offset+tiledim in bounds - if not, replace tile dims with the partial tile dims
-    const bool full_tile = check_iteration_bounds(m_tiledims , m_offset) ;
+    // Check if offset+tiledim in bounds - if not, replace tile dims with the
+    // partial tile dims
+    const bool full_tile = check_iteration_bounds(m_tiledims, m_offset);
 
     if (RP::inner_direction == RP::Left) {
-     if ( full_tile ) {
-//      #pragma simd
-        LOOP_6L(index_type, m_tiledims) {
-          apply( LOOP_ARGS_6 );
-        }
+      if (full_tile) {
+        //      #pragma simd
+        LOOP_6L(index_type, m_tiledims) { apply(LOOP_ARGS_6); }
       } else {
-//      #pragma simd
-        LOOP_6L(index_type, m_tiledims) {
-          apply( LOOP_ARGS_6 );
-        }
+        //      #pragma simd
+        LOOP_6L(index_type, m_tiledims) { apply(LOOP_ARGS_6); }
       }
-    } // end RP::Left
+    }  // end RP::Left
     else {
-     if ( full_tile ) {
-//      #pragma simd
-        LOOP_6R(index_type, m_tiledims) {
-          apply( LOOP_ARGS_6 );
-        }
+      if (full_tile) {
+        //      #pragma simd
+        LOOP_6R(index_type, m_tiledims) { apply(LOOP_ARGS_6); }
       } else {
-//      #pragma simd
-        LOOP_6R(index_type, m_tiledims) {
-          apply( LOOP_ARGS_6 );
-        }
+        //      #pragma simd
+        LOOP_6R(index_type, m_tiledims) { apply(LOOP_ARGS_6); }
       }
-    } // end RP::Right
-
-  } //end op() rank == 6
+    }  // end RP::Right
 
+  }  // end op() rank == 6
 
   template <typename IType>
-  inline
-  void operator_impl( IType tile_idx , const RankTag<7> ) const
-  {
+  inline void operator_impl(IType tile_idx, const RankTag<7>) const {
     point_type m_offset;
     point_type m_tiledims;
 
     if (RP::outer_direction == RP::Left) {
-      for (int i=0; i<RP::rank; ++i) {
-        m_offset[i] = (tile_idx % m_rp.m_tile_end[i]) * m_rp.m_tile[i] + m_rp.m_lower[i] ;
+      for (int i = 0; i < RP::rank; ++i) {
+        m_offset[i] =
+            (tile_idx % m_rp.m_tile_end[i]) * m_rp.m_tile[i] + m_rp.m_lower[i];
         tile_idx /= m_rp.m_tile_end[i];
       }
-    }
-    else {
-      for (int i=RP::rank-1; i>=0; --i) {
-        m_offset[i] = (tile_idx % m_rp.m_tile_end[i]) * m_rp.m_tile[i] + m_rp.m_lower[i] ;
+    } else {
+      for (int i = RP::rank - 1; i >= 0; --i) {
+        m_offset[i] =
+            (tile_idx % m_rp.m_tile_end[i]) * m_rp.m_tile[i] + m_rp.m_lower[i];
         tile_idx /= m_rp.m_tile_end[i];
       }
     }
 
-    //Check if offset+tiledim in bounds - if not, replace tile dims with the partial tile dims
-    const bool full_tile = check_iteration_bounds(m_tiledims , m_offset) ;
+    // Check if offset+tiledim in bounds - if not, replace tile dims with the
+    // partial tile dims
+    const bool full_tile = check_iteration_bounds(m_tiledims, m_offset);
 
     if (RP::inner_direction == RP::Left) {
-     if ( full_tile ) {
-//      #pragma simd
-        LOOP_7L(index_type, m_tiledims) {
-          apply( LOOP_ARGS_7 );
-        }
+      if (full_tile) {
+        //      #pragma simd
+        LOOP_7L(index_type, m_tiledims) { apply(LOOP_ARGS_7); }
       } else {
-//      #pragma simd
-        LOOP_7L(index_type, m_tiledims) {
-          apply( LOOP_ARGS_7 );
-        }
+        //      #pragma simd
+        LOOP_7L(index_type, m_tiledims) { apply(LOOP_ARGS_7); }
       }
-    } // end RP::Left
+    }  // end RP::Left
     else {
-     if ( full_tile ) {
-//      #pragma simd
-        LOOP_7R(index_type, m_tiledims) {
-          apply( LOOP_ARGS_7 );
-        }
+      if (full_tile) {
+        //      #pragma simd
+        LOOP_7R(index_type, m_tiledims) { apply(LOOP_ARGS_7); }
       } else {
-//      #pragma simd
-        LOOP_7R(index_type, m_tiledims) {
-          apply( LOOP_ARGS_7 );
-        }
+        //      #pragma simd
+        LOOP_7R(index_type, m_tiledims) { apply(LOOP_ARGS_7); }
       }
-    } // end RP::Right
-
-  } //end op() rank == 7
+    }  // end RP::Right
 
+  }  // end op() rank == 7
 
   template <typename IType>
-  inline
-  void operator_impl( IType tile_idx , const RankTag<8> ) const
-  {
+  inline void operator_impl(IType tile_idx, const RankTag<8>) const {
     point_type m_offset;
     point_type m_tiledims;
 
     if (RP::outer_direction == RP::Left) {
-      for (int i=0; i<RP::rank; ++i) {
-        m_offset[i] = (tile_idx % m_rp.m_tile_end[i]) * m_rp.m_tile[i] + m_rp.m_lower[i] ;
+      for (int i = 0; i < RP::rank; ++i) {
+        m_offset[i] =
+            (tile_idx % m_rp.m_tile_end[i]) * m_rp.m_tile[i] + m_rp.m_lower[i];
         tile_idx /= m_rp.m_tile_end[i];
       }
-    }
-    else {
-      for (int i=RP::rank-1; i>=0; --i) {
-        m_offset[i] = (tile_idx % m_rp.m_tile_end[i]) * m_rp.m_tile[i] + m_rp.m_lower[i] ;
+    } else {
+      for (int i = RP::rank - 1; i >= 0; --i) {
+        m_offset[i] =
+            (tile_idx % m_rp.m_tile_end[i]) * m_rp.m_tile[i] + m_rp.m_lower[i];
         tile_idx /= m_rp.m_tile_end[i];
       }
     }
 
-    //Check if offset+tiledim in bounds - if not, replace tile dims with the partial tile dims
-    const bool full_tile = check_iteration_bounds(m_tiledims , m_offset) ;
+    // Check if offset+tiledim in bounds - if not, replace tile dims with the
+    // partial tile dims
+    const bool full_tile = check_iteration_bounds(m_tiledims, m_offset);
 
     if (RP::inner_direction == RP::Left) {
-     if ( full_tile ) {
-//      #pragma simd
-        LOOP_8L(index_type, m_tiledims) {
-          apply( LOOP_ARGS_8 );
-        }
+      if (full_tile) {
+        //      #pragma simd
+        LOOP_8L(index_type, m_tiledims) { apply(LOOP_ARGS_8); }
       } else {
-//      #pragma simd
-        LOOP_8L(index_type, m_tiledims) {
-          apply( LOOP_ARGS_8 );
-        }
+        //      #pragma simd
+        LOOP_8L(index_type, m_tiledims) { apply(LOOP_ARGS_8); }
       }
-    } // end RP::Left
+    }  // end RP::Left
     else {
-     if ( full_tile ) {
-//      #pragma simd
-        LOOP_8R(index_type, m_tiledims) {
-          apply( LOOP_ARGS_8 );
-        }
+      if (full_tile) {
+        //      #pragma simd
+        LOOP_8R(index_type, m_tiledims) { apply(LOOP_ARGS_8); }
       } else {
-//      #pragma simd
-        LOOP_8R(index_type, m_tiledims) {
-          apply( LOOP_ARGS_8 );
-        }
+        //      #pragma simd
+        LOOP_8R(index_type, m_tiledims) { apply(LOOP_ARGS_8); }
       }
-    } // end RP::Right
+    }  // end RP::Right
 
-  } //end op() rank == 8
+  }  // end op() rank == 8
 #endif
 
+  template <typename... Args>
+  typename std::enable_if<(sizeof...(Args) == RP::rank &&
+                           std::is_same<Tag, void>::value),
+                          void>::type
+  apply(Args&&... args) const {
+    m_func(args..., m_v);
+  }
 
-    template <typename... Args>
-    typename std::enable_if<( sizeof...(Args) == RP::rank && std::is_same<Tag,void>::value), void>::type
-    apply(Args &&... args) const
-    {
-      m_func(args... , m_v);
-    }
-
-    template <typename... Args>
-    typename std::enable_if<( sizeof...(Args) == RP::rank && !std::is_same<Tag,void>::value), void>::type
-    apply(Args &&... args) const
-    {
-      m_func( m_tag, args... , m_v);
-    }
-
-
-  RP         const& m_rp;
-  Functor    const& m_func;
-  value_type * m_v;
-  typename std::conditional< std::is_same<Tag,void>::value,int,Tag>::type m_tag;
+  template <typename... Args>
+  typename std::enable_if<(sizeof...(Args) == RP::rank &&
+                           !std::is_same<Tag, void>::value),
+                          void>::type
+  apply(Args&&... args) const {
+    m_func(m_tag, args..., m_v);
+  }
 
+  RP const& m_rp;
+  Functor const& m_func;
+  value_type* m_v;
+  typename std::conditional<std::is_same<Tag, void>::value, int, Tag>::type
+      m_tag;
 };
 
-
 // ------------------------------------------------------------------ //
 
 #ifdef KOKKOS_ENABLE_DEPRECATED_CODE
@@ -2751,138 +2799,96 @@ struct HostIterateTile < RP , Functor , Tag , ValueType , typename std::enable_i
 // Cuda uses DeviceIterateTile directly within md_parallel_for
 // TODO Once md_parallel_{for,reduce} removed, this can be removed
 
-namespace Experimental { 
+namespace Experimental {
 
 // ParallelReduce - scalar reductions
-template < typename MDRange, typename Functor, typename ValueType = void >
-struct MDFunctor
-{
+template <typename MDRange, typename Functor, typename ValueType = void>
+struct MDFunctor {
   using range_policy = MDRange;
   using functor_type = Functor;
   using value_type   = ValueType;
   using work_tag     = typename range_policy::work_tag;
   using index_type   = typename range_policy::index_type;
-  using iterate_type = typename Kokkos::Impl::HostIterateTile< MDRange
-                                                             , Functor
-                                                             , work_tag
-                                                             , value_type
-                                                             >;
+  using iterate_type =
+      typename Kokkos::Impl::HostIterateTile<MDRange, Functor, work_tag,
+                                             value_type>;
 
+  inline MDFunctor(MDRange const& range, Functor const& f)
+      : m_range(range), m_func(f) {}
 
-  inline
-  MDFunctor( MDRange const& range, Functor const& f )
-    : m_range( range )
-    , m_func( f )
-  {}
+  inline MDFunctor(MDFunctor const&) = default;
 
-  inline
-  MDFunctor( MDFunctor const& ) = default;
+  inline MDFunctor& operator=(MDFunctor const&) = default;
 
-  inline
-  MDFunctor& operator=( MDFunctor const& ) = default;
+  inline MDFunctor(MDFunctor&&) = default;
 
-  inline
-  MDFunctor( MDFunctor && ) = default;
+  inline MDFunctor& operator=(MDFunctor&&) = default;
 
-  inline
-  MDFunctor& operator=( MDFunctor && ) = default;
-
-  inline
-  void operator()(index_type t, value_type & v) const
-  {
+  inline void operator()(index_type t, value_type& v) const {
     iterate_type(m_range, m_func, v)(t);
   }
 
-  MDRange   m_range;
-  Functor   m_func;
+  MDRange m_range;
+  Functor m_func;
 };
 
-
-// ParallelReduce - array reductions 
-template < typename MDRange, typename Functor, typename ValueType >
-struct MDFunctor< MDRange, Functor, ValueType[] >
-{
+// ParallelReduce - array reductions
+template <typename MDRange, typename Functor, typename ValueType>
+struct MDFunctor<MDRange, Functor, ValueType[]> {
   using range_policy = MDRange;
   using functor_type = Functor;
   using value_type   = ValueType[];
   using work_tag     = typename range_policy::work_tag;
   using index_type   = typename range_policy::index_type;
-  using iterate_type = typename Kokkos::Impl::HostIterateTile< MDRange
-                                                             , Functor
-                                                             , work_tag
-                                                             , value_type
-                                                             >;
+  using iterate_type =
+      typename Kokkos::Impl::HostIterateTile<MDRange, Functor, work_tag,
+                                             value_type>;
 
+  inline MDFunctor(MDRange const& range, Functor const& f)
+      : m_range(range), m_func(f), value_count(f.value_count) {}
 
-  inline
-  MDFunctor( MDRange const& range, Functor const& f )
-    : m_range( range )
-    , m_func( f )
-    , value_count( f.value_count )
-  {}
+  inline MDFunctor(MDFunctor const&) = default;
 
-  inline
-  MDFunctor( MDFunctor const& ) = default;
+  inline MDFunctor& operator=(MDFunctor const&) = default;
 
-  inline
-  MDFunctor& operator=( MDFunctor const& ) = default;
+  inline MDFunctor(MDFunctor&&) = default;
 
-  inline
-  MDFunctor( MDFunctor && ) = default;
+  inline MDFunctor& operator=(MDFunctor&&) = default;
 
-  inline
-  MDFunctor& operator=( MDFunctor && ) = default;
-
-  // FIXME Init and Join, as defined in m_func, are not working through the MDFunctor
-  // Best path forward is to eliminate need for MDFunctor, directly use MDRangePolicy within Parallel{For,Reduce} ??
-  inline
-  void operator()(index_type t, value_type v) const
-  {
+  // FIXME Init and Join, as defined in m_func, are not working through the
+  // MDFunctor Best path forward is to eliminate need for MDFunctor, directly
+  // use MDRangePolicy within Parallel{For,Reduce} ??
+  inline void operator()(index_type t, value_type v) const {
     iterate_type(m_range, m_func, v)(t);
   }
 
-  MDRange   m_range;
-  Functor   m_func;
-  size_t    value_count;
+  MDRange m_range;
+  Functor m_func;
+  size_t value_count;
 };
 
-
 // ParallelFor
-template < typename MDRange, typename Functor >
-struct MDFunctor< MDRange, Functor, void >
-{
+template <typename MDRange, typename Functor>
+struct MDFunctor<MDRange, Functor, void> {
   using range_policy = MDRange;
   using functor_type = Functor;
   using work_tag     = typename range_policy::work_tag;
   using index_type   = typename range_policy::index_type;
-  using iterate_type = typename Kokkos::Impl::HostIterateTile< MDRange
-                                                             , Functor
-                                                             , work_tag
-                                                             , void
-                                                             >;
+  using iterate_type =
+      typename Kokkos::Impl::HostIterateTile<MDRange, Functor, work_tag, void>;
 
+  inline MDFunctor(MDRange const& range, Functor const& f)
+      : m_range(range), m_func(f) {}
 
-  inline
-  MDFunctor( MDRange const& range, Functor const& f )
-    : m_range( range )
-    , m_func( f )
-  {}
+  inline MDFunctor(MDFunctor const&) = default;
 
-  inline
-  MDFunctor( MDFunctor const& ) = default;
+  inline MDFunctor& operator=(MDFunctor const&) = default;
 
-  inline
-  MDFunctor& operator=( MDFunctor const& ) = default;
+  inline MDFunctor(MDFunctor&&) = default;
 
-  inline
-  MDFunctor( MDFunctor && ) = default;
+  inline MDFunctor& operator=(MDFunctor&&) = default;
 
-  inline
-  MDFunctor& operator=( MDFunctor && ) = default;
-
-  inline
-  void operator()(index_type t) const
-  {
+  inline void operator()(index_type t) const {
     iterate_type(m_range, m_func)(t);
   }
 
@@ -2890,10 +2896,11 @@ struct MDFunctor< MDRange, Functor, void >
   Functor m_func;
 };
 
-} // end namespace Experimental
+}  // end namespace Experimental
 #endif
 #undef KOKKOS_ENABLE_NEW_LOOP_MACROS
 
-} } //end namespace Kokkos::Impl
+}  // namespace Impl
+}  // namespace Kokkos
 
 #endif
diff --git a/lib/kokkos/core/src/impl/KokkosExp_ViewMapping.hpp b/lib/kokkos/core/src/impl/KokkosExp_ViewMapping.hpp
index 0bfc5841df..a41ffb1e8a 100644
--- a/lib/kokkos/core/src/impl/KokkosExp_ViewMapping.hpp
+++ b/lib/kokkos/core/src/impl/KokkosExp_ViewMapping.hpp
@@ -1,13 +1,14 @@
 /*
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -36,7 +37,7 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 */
diff --git a/lib/kokkos/core/src/impl/Kokkos_AnalyzePolicy.hpp b/lib/kokkos/core/src/impl/Kokkos_AnalyzePolicy.hpp
index 50af5ec82e..ac86651433 100644
--- a/lib/kokkos/core/src/impl/Kokkos_AnalyzePolicy.hpp
+++ b/lib/kokkos/core/src/impl/Kokkos_AnalyzePolicy.hpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -48,207 +49,185 @@
 #include <Kokkos_Concepts.hpp>
 #include <impl/Kokkos_Tags.hpp>
 
-namespace Kokkos { namespace Impl {
+namespace Kokkos {
+namespace Impl {
 
-template < typename ExecutionSpace   = void
-         , typename Schedule         = void
-         , typename WorkTag          = void
-         , typename IndexType        = void
-         , typename IterationPattern = void
-         , typename LaunchBounds     = void
-         , typename MyWorkItemProperty = Kokkos::Experimental::WorkItemProperty::None_t
-         >
-struct PolicyTraitsBase
-{
-  using type = PolicyTraitsBase< ExecutionSpace, Schedule, WorkTag, IndexType, 
-               IterationPattern, LaunchBounds, MyWorkItemProperty>;
+template <typename ExecutionSpace = void, typename Schedule = void,
+          typename WorkTag = void, typename IndexType = void,
+          typename IterationPattern = void, typename LaunchBounds = void,
+          typename MyWorkItemProperty =
+              Kokkos::Experimental::WorkItemProperty::None_t>
+struct PolicyTraitsBase {
+  using type =
+      PolicyTraitsBase<ExecutionSpace, Schedule, WorkTag, IndexType,
+                       IterationPattern, LaunchBounds, MyWorkItemProperty>;
 
-  using execution_space   = ExecutionSpace;
-  using schedule_type     = Schedule;
-  using work_tag          = WorkTag;
-  using index_type        = IndexType;
-  using iteration_pattern = IterationPattern;
-  using launch_bounds     = LaunchBounds;
+  using execution_space    = ExecutionSpace;
+  using schedule_type      = Schedule;
+  using work_tag           = WorkTag;
+  using index_type         = IndexType;
+  using iteration_pattern  = IterationPattern;
+  using launch_bounds      = LaunchBounds;
   using work_item_property = MyWorkItemProperty;
 };
 
 template <typename PolicyBase, typename Property>
-struct SetWorkItemProperty
-{
-  static_assert( std::is_same<typename PolicyBase::work_item_property,Kokkos::Experimental::WorkItemProperty::None_t>::value
-               , "Kokkos Error: More than one work item property given" );
-  using type = PolicyTraitsBase< typename PolicyBase::execution_space
-                               , typename PolicyBase::schedule_type
-                               , typename PolicyBase::work_tag
-                               , typename PolicyBase::index_type
-                               , typename PolicyBase::iteration_pattern
-                               , typename PolicyBase::launch_bounds
-                               , Property
-                               >;
+struct SetWorkItemProperty {
+  static_assert(
+      std::is_same<typename PolicyBase::work_item_property,
+                   Kokkos::Experimental::WorkItemProperty::None_t>::value,
+      "Kokkos Error: More than one work item property given");
+  using type = PolicyTraitsBase<
+      typename PolicyBase::execution_space, typename PolicyBase::schedule_type,
+      typename PolicyBase::work_tag, typename PolicyBase::index_type,
+      typename PolicyBase::iteration_pattern,
+      typename PolicyBase::launch_bounds, Property>;
 };
 
 template <typename PolicyBase, typename ExecutionSpace>
-struct SetExecutionSpace
-{
-  static_assert( is_void<typename PolicyBase::execution_space>::value
-               , "Kokkos Error: More than one execution space given" );
-  using type = PolicyTraitsBase< ExecutionSpace
-                               , typename PolicyBase::schedule_type
-                               , typename PolicyBase::work_tag
-                               , typename PolicyBase::index_type
-                               , typename PolicyBase::iteration_pattern
-                               , typename PolicyBase::launch_bounds
-                               , typename PolicyBase::work_item_property
-                               >;
+struct SetExecutionSpace {
+  static_assert(is_void<typename PolicyBase::execution_space>::value,
+                "Kokkos Error: More than one execution space given");
+  using type =
+      PolicyTraitsBase<ExecutionSpace, typename PolicyBase::schedule_type,
+                       typename PolicyBase::work_tag,
+                       typename PolicyBase::index_type,
+                       typename PolicyBase::iteration_pattern,
+                       typename PolicyBase::launch_bounds,
+                       typename PolicyBase::work_item_property>;
 };
 
 template <typename PolicyBase, typename Schedule>
-struct SetSchedule
-{
-  static_assert( is_void<typename PolicyBase::schedule_type>::value
-               , "Kokkos Error: More than one schedule type given" );
-  using type = PolicyTraitsBase< typename PolicyBase::execution_space
-                               , Schedule
-                               , typename PolicyBase::work_tag
-                               , typename PolicyBase::index_type
-                               , typename PolicyBase::iteration_pattern
-                               , typename PolicyBase::launch_bounds
-                               , typename PolicyBase::work_item_property
-                               >;
+struct SetSchedule {
+  static_assert(is_void<typename PolicyBase::schedule_type>::value,
+                "Kokkos Error: More than one schedule type given");
+  using type = PolicyTraitsBase<typename PolicyBase::execution_space, Schedule,
+                                typename PolicyBase::work_tag,
+                                typename PolicyBase::index_type,
+                                typename PolicyBase::iteration_pattern,
+                                typename PolicyBase::launch_bounds,
+                                typename PolicyBase::work_item_property>;
 };
 
 template <typename PolicyBase, typename WorkTag>
-struct SetWorkTag
-{
-  static_assert( is_void<typename PolicyBase::work_tag>::value
-               , "Kokkos Error: More than one work tag given" );
-  using type = PolicyTraitsBase< typename PolicyBase::execution_space
-                               , typename PolicyBase::schedule_type
-                               , WorkTag
-                               , typename PolicyBase::index_type
-                               , typename PolicyBase::iteration_pattern
-                               , typename PolicyBase::launch_bounds
-                               , typename PolicyBase::work_item_property
-                               >;
+struct SetWorkTag {
+  static_assert(is_void<typename PolicyBase::work_tag>::value,
+                "Kokkos Error: More than one work tag given");
+  using type = PolicyTraitsBase<typename PolicyBase::execution_space,
+                                typename PolicyBase::schedule_type, WorkTag,
+                                typename PolicyBase::index_type,
+                                typename PolicyBase::iteration_pattern,
+                                typename PolicyBase::launch_bounds,
+                                typename PolicyBase::work_item_property>;
 };
 
 template <typename PolicyBase, typename IndexType>
-struct SetIndexType
-{
-  static_assert( is_void<typename PolicyBase::index_type>::value
-               , "Kokkos Error: More than one index type given" );
-  using type = PolicyTraitsBase< typename PolicyBase::execution_space
-                               , typename PolicyBase::schedule_type
-                               , typename PolicyBase::work_tag
-                               , IndexType
-                               , typename PolicyBase::iteration_pattern
-                               , typename PolicyBase::launch_bounds
-                               , typename PolicyBase::work_item_property
-                               >;
+struct SetIndexType {
+  static_assert(is_void<typename PolicyBase::index_type>::value,
+                "Kokkos Error: More than one index type given");
+  using type = PolicyTraitsBase<typename PolicyBase::execution_space,
+                                typename PolicyBase::schedule_type,
+                                typename PolicyBase::work_tag, IndexType,
+                                typename PolicyBase::iteration_pattern,
+                                typename PolicyBase::launch_bounds,
+                                typename PolicyBase::work_item_property>;
 };
 
-
 template <typename PolicyBase, typename IterationPattern>
-struct SetIterationPattern
-{
-  static_assert( is_void<typename PolicyBase::iteration_pattern>::value
-               , "Kokkos Error: More than one iteration_pattern given" );
-  using type = PolicyTraitsBase< typename PolicyBase::execution_space
-                               , typename PolicyBase::schedule_type
-                               , typename PolicyBase::work_tag
-                               , typename PolicyBase::index_type
-                               , IterationPattern
-                               , typename PolicyBase::launch_bounds
-                               , typename PolicyBase::work_item_property
-                               >;
+struct SetIterationPattern {
+  static_assert(is_void<typename PolicyBase::iteration_pattern>::value,
+                "Kokkos Error: More than one iteration_pattern given");
+  using type = PolicyTraitsBase<
+      typename PolicyBase::execution_space, typename PolicyBase::schedule_type,
+      typename PolicyBase::work_tag, typename PolicyBase::index_type,
+      IterationPattern, typename PolicyBase::launch_bounds,
+      typename PolicyBase::work_item_property>;
 };
 
-
 template <typename PolicyBase, typename LaunchBounds>
-struct SetLaunchBounds
-{
-  static_assert( is_void<typename PolicyBase::launch_bounds>::value
-               , "Kokkos Error: More than one launch_bounds given" );
-  using type = PolicyTraitsBase< typename PolicyBase::execution_space
-                               , typename PolicyBase::schedule_type
-                               , typename PolicyBase::work_tag
-                               , typename PolicyBase::index_type
-                               , typename PolicyBase::iteration_pattern
-                               , LaunchBounds
-                               , typename PolicyBase::work_item_property
-                               >;
+struct SetLaunchBounds {
+  static_assert(is_void<typename PolicyBase::launch_bounds>::value,
+                "Kokkos Error: More than one launch_bounds given");
+  using type = PolicyTraitsBase<
+      typename PolicyBase::execution_space, typename PolicyBase::schedule_type,
+      typename PolicyBase::work_tag, typename PolicyBase::index_type,
+      typename PolicyBase::iteration_pattern, LaunchBounds,
+      typename PolicyBase::work_item_property>;
 };
 
-
 template <typename Base, typename... Traits>
 struct AnalyzePolicy;
 
 template <typename Base, typename T, typename... Traits>
-struct AnalyzePolicy<Base, T, Traits...> : public
-  AnalyzePolicy<
-      typename std::conditional< is_execution_space<T>::value  , SetExecutionSpace<Base,T>
-    , typename std::conditional< is_schedule_type<T>::value    , SetSchedule<Base,T>
-    , typename std::conditional< is_index_type<T>::value       , SetIndexType<Base,T>
-    , typename std::conditional< std::is_integral<T>::value    , SetIndexType<Base, IndexType<T> >
-    , typename std::conditional< is_iteration_pattern<T>::value, SetIterationPattern<Base,T>
-    , typename std::conditional< is_launch_bounds<T>::value    , SetLaunchBounds<Base,T>
-    , typename std::conditional< Experimental::is_work_item_property<T>::value, SetWorkItemProperty<Base,T>
-    , SetWorkTag<Base,T>
-    >::type >::type >::type >::type >::type>::type>::type::type
-  , Traits...
-  >
-{};
+struct AnalyzePolicy<Base, T, Traits...>
+    : public AnalyzePolicy<
+          typename std::conditional<
+              is_execution_space<T>::value, SetExecutionSpace<Base, T>,
+              typename std::conditional<
+                  is_schedule_type<T>::value, SetSchedule<Base, T>,
+                  typename std::conditional<
+                      is_index_type<T>::value, SetIndexType<Base, T>,
+                      typename std::conditional<
+                          std::is_integral<T>::value,
+                          SetIndexType<Base, IndexType<T> >,
+                          typename std::conditional<
+                              is_iteration_pattern<T>::value,
+                              SetIterationPattern<Base, T>,
+                              typename std::conditional<
+                                  is_launch_bounds<T>::value,
+                                  SetLaunchBounds<Base, T>,
+                                  typename std::conditional<
+                                      Experimental::is_work_item_property<
+                                          T>::value,
+                                      SetWorkItemProperty<Base, T>,
+                                      SetWorkTag<Base, T> >::type>::type>::
+                              type>::type>::type>::type>::type::type,
+          Traits...> {};
 
 template <typename Base>
-struct AnalyzePolicy<Base>
-{
-  using execution_space = typename std::conditional< is_void< typename Base::execution_space >::value
-                                                   , DefaultExecutionSpace
-                                                   , typename Base::execution_space
-                                                   >::type;
+struct AnalyzePolicy<Base> {
+  using execution_space =
+      typename std::conditional<is_void<typename Base::execution_space>::value,
+                                DefaultExecutionSpace,
+                                typename Base::execution_space>::type;
 
-  using schedule_type = typename std::conditional< is_void< typename Base::schedule_type >::value
-                                                 , Schedule< Static >
-                                                 , typename Base::schedule_type
-                                                 >::type;
+  using schedule_type =
+      typename std::conditional<is_void<typename Base::schedule_type>::value,
+                                Schedule<Static>,
+                                typename Base::schedule_type>::type;
 
   using work_tag = typename Base::work_tag;
 
-  using index_type = typename std::conditional< is_void< typename Base::index_type >::value
-                                              , IndexType< typename execution_space::size_type >
-                                              , typename Base::index_type
-                                              >::type
-                                               ::type // nasty hack to make index_type into an integral_type
-                                              ;       // instead of the wrapped IndexType<T> for backwards compatibility
+  using index_type =
+      typename std::conditional<is_void<typename Base::index_type>::value,
+                                IndexType<typename execution_space::size_type>,
+                                typename Base::index_type>::type ::
+          type  // nasty hack to make index_type into an integral_type
+      ;  // instead of the wrapped IndexType<T> for backwards compatibility
 
-  using iteration_pattern = typename std::conditional< is_void< typename Base::iteration_pattern >::value
-                                                     , void // TODO set default iteration pattern
-                                                     , typename Base::iteration_pattern
-                                                     >::type;
+  using iteration_pattern = typename std::conditional<
+      is_void<typename Base::iteration_pattern>::value,
+      void  // TODO set default iteration pattern
+      ,
+      typename Base::iteration_pattern>::type;
 
-  using launch_bounds = typename std::conditional< is_void< typename Base::launch_bounds >::value
-                                                     , LaunchBounds<>
-                                                     , typename Base::launch_bounds
-                                                     >::type;
+  using launch_bounds =
+      typename std::conditional<is_void<typename Base::launch_bounds>::value,
+                                LaunchBounds<>,
+                                typename Base::launch_bounds>::type;
 
   using work_item_property = typename Base::work_item_property;
 
-  using type = PolicyTraitsBase< execution_space
-                               , schedule_type
-                               , work_tag
-                               , index_type
-                               , iteration_pattern
-                               , launch_bounds
-                               , work_item_property>;
+  using type =
+      PolicyTraitsBase<execution_space, schedule_type, work_tag, index_type,
+                       iteration_pattern, launch_bounds, work_item_property>;
 };
 
 template <typename... Traits>
 struct PolicyTraits
-  : public AnalyzePolicy< PolicyTraitsBase<>, Traits... >::type
-{};
+    : public AnalyzePolicy<PolicyTraitsBase<>, Traits...>::type {};
 
-}} // namespace Kokkos::Impl
-
-
-#endif //KOKKOS_IMPL_ANALYZE_POLICY_HPP
+}  // namespace Impl
+}  // namespace Kokkos
 
+#endif  // KOKKOS_IMPL_ANALYZE_POLICY_HPP
diff --git a/lib/kokkos/core/src/impl/Kokkos_Atomic_Assembly.hpp b/lib/kokkos/core/src/impl/Kokkos_Atomic_Assembly.hpp
index c943091622..786ffc902f 100644
--- a/lib/kokkos/core/src/impl/Kokkos_Atomic_Assembly.hpp
+++ b/lib/kokkos/core/src/impl/Kokkos_Atomic_Assembly.hpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -42,74 +43,62 @@
 */
 
 #include <Kokkos_Macros.hpp>
-#if defined( KOKKOS_ATOMIC_HPP ) && ! defined( KOKKOS_ATOMIC_ASSEMBLY_HPP )
+#if defined(KOKKOS_ATOMIC_HPP) && !defined(KOKKOS_ATOMIC_ASSEMBLY_HPP)
 #define KOKKOS_ATOMIC_ASSEMBLY_HPP
 namespace Kokkos {
 
 namespace Impl {
-  struct cas128_t
-  {
-    uint64_t lower;
-    uint64_t upper;
+struct cas128_t {
+  uint64_t lower;
+  uint64_t upper;
 
-    KOKKOS_INLINE_FUNCTION
-    cas128_t () {
-      lower = 0;
-      upper = 0;
-    }
-
-    KOKKOS_INLINE_FUNCTION
-    cas128_t (const cas128_t& a) {
-      lower = a.lower;
-      upper = a.upper;
-    }
-    KOKKOS_INLINE_FUNCTION
-    cas128_t (volatile cas128_t* a) {
-      lower = a->lower;
-      upper = a->upper;
-    }
-
-    KOKKOS_INLINE_FUNCTION
-    bool operator != (const cas128_t& a) const {
-      return (lower != a.lower) || upper!=a.upper;
-    }
-
-    KOKKOS_INLINE_FUNCTION
-    void operator = (const cas128_t& a) {
-      lower = a.lower;
-      upper = a.upper;
-    }
-    KOKKOS_INLINE_FUNCTION
-    void operator = (const cas128_t& a) volatile {
-      lower = a.lower;
-      upper = a.upper;
-    }
+  KOKKOS_INLINE_FUNCTION
+  cas128_t() {
+    lower = 0;
+    upper = 0;
   }
-  __attribute__ (( __aligned__( 16 ) ));
 
-
-  #if defined( KOKKOS_ENABLE_ASM ) && defined ( KOKKOS_ENABLE_ISA_X86_64 )
-  inline cas128_t cas128( volatile cas128_t * ptr, cas128_t cmp,  cas128_t swap )
-  {
-      bool swapped = false;
-      __asm__ __volatile__
-      (
-       "lock cmpxchg16b %1\n\t"
-       "setz %0"
-       : "=q" ( swapped )
-       , "+m" ( *ptr )
-       , "+d" ( cmp.upper )
-       , "+a" ( cmp.lower )
-       : "c" ( swap.upper )
-       , "b" ( swap.lower )
-       , "q" ( swapped )
-     );
-      return cmp;
+  KOKKOS_INLINE_FUNCTION
+  cas128_t(const cas128_t& a) {
+    lower = a.lower;
+    upper = a.upper;
+  }
+  KOKKOS_INLINE_FUNCTION
+  cas128_t(volatile cas128_t* a) {
+    lower = a->lower;
+    upper = a->upper;
   }
-  #endif
 
-}
-}
+  KOKKOS_INLINE_FUNCTION
+  bool operator!=(const cas128_t& a) const {
+    return (lower != a.lower) || upper != a.upper;
+  }
 
+  KOKKOS_INLINE_FUNCTION
+  void operator=(const cas128_t& a) {
+    lower = a.lower;
+    upper = a.upper;
+  }
+  KOKKOS_INLINE_FUNCTION
+  void operator=(const cas128_t& a) volatile {
+    lower = a.lower;
+    upper = a.upper;
+  }
+} __attribute__((__aligned__(16)));
+
+#if defined(KOKKOS_ENABLE_ASM) && defined(KOKKOS_ENABLE_ISA_X86_64)
+inline cas128_t cas128(volatile cas128_t* ptr, cas128_t cmp, cas128_t swap) {
+  bool swapped = false;
+  __asm__ __volatile__(
+      "lock cmpxchg16b %1\n\t"
+      "setz %0"
+      : "=q"(swapped), "+m"(*ptr), "+d"(cmp.upper), "+a"(cmp.lower)
+      : "c"(swap.upper), "b"(swap.lower), "q"(swapped));
+  return cmp;
+}
 #endif
 
+}  // namespace Impl
+}  // namespace Kokkos
+
+#endif
diff --git a/lib/kokkos/core/src/impl/Kokkos_Atomic_Compare_Exchange_Strong.hpp b/lib/kokkos/core/src/impl/Kokkos_Atomic_Compare_Exchange_Strong.hpp
index 63067c137a..4fe72ad142 100644
--- a/lib/kokkos/core/src/impl/Kokkos_Atomic_Compare_Exchange_Strong.hpp
+++ b/lib/kokkos/core/src/impl/Kokkos_Atomic_Compare_Exchange_Strong.hpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -41,16 +42,17 @@
 //@HEADER
 */
 
-#if defined( KOKKOS_ENABLE_RFO_PREFETCH )
+#if defined(KOKKOS_ENABLE_RFO_PREFETCH)
 #include <xmmintrin.h>
 #endif
 
 #include <Kokkos_Macros.hpp>
-#if defined( KOKKOS_ATOMIC_HPP ) && ! defined( KOKKOS_ATOMIC_COMPARE_EXCHANGE_STRONG_HPP )
+#if defined(KOKKOS_ATOMIC_HPP) && \
+    !defined(KOKKOS_ATOMIC_COMPARE_EXCHANGE_STRONG_HPP)
 #define KOKKOS_ATOMIC_COMPARE_EXCHANGE_STRONG_HPP
 
 #if defined(KOKKOS_ENABLE_CUDA)
-#include<Cuda/Kokkos_Cuda_Version_9_8_Compatibility.hpp>
+#include <Cuda/Kokkos_Cuda_Version_9_8_Compatibility.hpp>
 #endif
 
 #include <impl/Kokkos_Atomic_Memory_Order.hpp>
@@ -63,76 +65,76 @@
 namespace Kokkos {
 
 //----------------------------------------------------------------------------
-// Cuda native CAS supports int, unsigned int, and unsigned long long int (non-standard type).
-// Must cast-away 'volatile' for the CAS call.
+// Cuda native CAS supports int, unsigned int, and unsigned long long int
+// (non-standard type). Must cast-away 'volatile' for the CAS call.
 
-#if defined( KOKKOS_ENABLE_CUDA )
+#if defined(KOKKOS_ENABLE_CUDA)
 
 #if defined(__CUDA_ARCH__) || defined(KOKKOS_IMPL_CUDA_CLANG_WORKAROUND)
-__inline__ __device__
-int atomic_compare_exchange( volatile int * const dest, const int compare, const int val)
-{ return atomicCAS((int*)dest,compare,val); }
+__inline__ __device__ int atomic_compare_exchange(volatile int* const dest,
+                                                  const int compare,
+                                                  const int val) {
+  return atomicCAS((int*)dest, compare, val);
+}
 
-__inline__ __device__
-unsigned int atomic_compare_exchange( volatile unsigned int * const dest, const unsigned int compare, const unsigned int val)
-{ return atomicCAS((unsigned int*)dest,compare,val); }
+__inline__ __device__ unsigned int atomic_compare_exchange(
+    volatile unsigned int* const dest, const unsigned int compare,
+    const unsigned int val) {
+  return atomicCAS((unsigned int*)dest, compare, val);
+}
 
-__inline__ __device__
-unsigned long long int atomic_compare_exchange( volatile unsigned long long int * const dest ,
-                                                const unsigned long long int compare ,
-                                                const unsigned long long int val )
-{ return atomicCAS((unsigned long long int*)dest,compare,val); }
+__inline__ __device__ unsigned long long int atomic_compare_exchange(
+    volatile unsigned long long int* const dest,
+    const unsigned long long int compare, const unsigned long long int val) {
+  return atomicCAS((unsigned long long int*)dest, compare, val);
+}
 
-template < typename T >
-__inline__ __device__
-T atomic_compare_exchange( volatile T * const dest , const T & compare ,
-  typename Kokkos::Impl::enable_if< sizeof(T) == sizeof(int) , const T & >::type val )
-{
-  const int tmp = atomicCAS( (int*) dest , *((int*)&compare) , *((int*)&val) );
+template <typename T>
+__inline__ __device__ T atomic_compare_exchange(
+    volatile T* const dest, const T& compare,
+    typename Kokkos::Impl::enable_if<sizeof(T) == sizeof(int), const T&>::type
+        val) {
+  const int tmp = atomicCAS((int*)dest, *((int*)&compare), *((int*)&val));
   return *((T*)&tmp);
 }
 
-template < typename T >
-__inline__ __device__
-T atomic_compare_exchange( volatile T * const dest , const T & compare ,
-  typename Kokkos::Impl::enable_if< sizeof(T) != sizeof(int) &&
-                                    sizeof(T) == sizeof(unsigned long long int) , const T & >::type val )
-{
-  typedef unsigned long long int type ;
-  const type tmp = atomicCAS( (type*) dest , *((type*)&compare) , *((type*)&val) );
-  return *((T*)&tmp);
-}
-
-template < typename T >
-__inline__ __device__
-T atomic_compare_exchange( volatile T * const dest , const T & compare ,
+template <typename T>
+__inline__ __device__ T atomic_compare_exchange(
+    volatile T* const dest, const T& compare,
     typename Kokkos::Impl::enable_if<
-                  ( sizeof(T) != 4 )
-               && ( sizeof(T) != 8 )
-             , const T >::type& val )
-{
+        sizeof(T) != sizeof(int) && sizeof(T) == sizeof(unsigned long long int),
+        const T&>::type val) {
+  typedef unsigned long long int type;
+  const type tmp = atomicCAS((type*)dest, *((type*)&compare), *((type*)&val));
+  return *((T*)&tmp);
+}
+
+template <typename T>
+__inline__ __device__ T atomic_compare_exchange(
+    volatile T* const dest, const T& compare,
+    typename Kokkos::Impl::enable_if<(sizeof(T) != 4) && (sizeof(T) != 8),
+                                     const T>::type& val) {
   T return_val;
   // This is a way to (hopefully) avoid dead lock in a warp
   int done = 0;
 #ifdef KOKKOS_IMPL_CUDA_SYNCWARP_NEEDS_MASK
-  unsigned int mask = KOKKOS_IMPL_CUDA_ACTIVEMASK;
-  unsigned int active = KOKKOS_IMPL_CUDA_BALLOT_MASK(mask,1);
+  unsigned int mask   = KOKKOS_IMPL_CUDA_ACTIVEMASK;
+  unsigned int active = KOKKOS_IMPL_CUDA_BALLOT_MASK(mask, 1);
 #else
   unsigned int active = KOKKOS_IMPL_CUDA_BALLOT(1);
 #endif
   unsigned int done_active = 0;
-  while (active!=done_active) {
-    if(!done) {
-      if( Impl::lock_address_cuda_space( (void*) dest ) ) {
+  while (active != done_active) {
+    if (!done) {
+      if (Impl::lock_address_cuda_space((void*)dest)) {
         return_val = *dest;
-        if( return_val == compare )
-          *dest = val;
-        Impl::unlock_address_cuda_space( (void*) dest );
+        if (return_val == compare) *dest = val;
+        Impl::unlock_address_cuda_space((void*)dest);
         done = 1;
       }
     }
 #ifdef KOKKOS_IMPL_CUDA_SYNCWARP_NEEDS_MASK
-    done_active = KOKKOS_IMPL_CUDA_BALLOT_MASK(mask,done);
+    done_active = KOKKOS_IMPL_CUDA_BALLOT_MASK(mask, done);
 #else
     done_active = KOKKOS_IMPL_CUDA_BALLOT(done);
 #endif
@@ -149,163 +151,162 @@ T atomic_compare_exchange( volatile T * const dest , const T & compare ,
 #if !defined(__CUDA_ARCH__) || defined(KOKKOS_IMPL_CUDA_CLANG_WORKAROUND)
 #if defined(KOKKOS_ENABLE_GNU_ATOMICS) || defined(KOKKOS_ENABLE_INTEL_ATOMICS)
 
-inline
-int atomic_compare_exchange( volatile int * const dest, const int compare, const int val)
-{
-#if defined( KOKKOS_ENABLE_RFO_PREFETCH )
-  _mm_prefetch( (const char*) dest, _MM_HINT_ET0 );
+inline int atomic_compare_exchange(volatile int* const dest, const int compare,
+                                   const int val) {
+#if defined(KOKKOS_ENABLE_RFO_PREFETCH)
+  _mm_prefetch((const char*)dest, _MM_HINT_ET0);
 #endif
-  return __sync_val_compare_and_swap(dest,compare,val);
+  return __sync_val_compare_and_swap(dest, compare, val);
 }
 
-inline
-long atomic_compare_exchange( volatile long * const dest, const long compare, const long val )
-{ 
-#if defined( KOKKOS_ENABLE_RFO_PREFETCH )
-  _mm_prefetch( (const char*) dest, _MM_HINT_ET0 );
+inline long atomic_compare_exchange(volatile long* const dest,
+                                    const long compare, const long val) {
+#if defined(KOKKOS_ENABLE_RFO_PREFETCH)
+  _mm_prefetch((const char*)dest, _MM_HINT_ET0);
 #endif
-  return __sync_val_compare_and_swap(dest,compare,val);
+  return __sync_val_compare_and_swap(dest, compare, val);
 }
 
-#if defined( KOKKOS_ENABLE_GNU_ATOMICS )
+#if defined(KOKKOS_ENABLE_GNU_ATOMICS)
 
 // GCC supports unsigned
 
-inline
-unsigned int atomic_compare_exchange( volatile unsigned int * const dest, const unsigned int compare, const unsigned int val )
-{ return __sync_val_compare_and_swap(dest,compare,val); }
-
-inline
-unsigned long atomic_compare_exchange( volatile unsigned long * const dest ,
-                                       const unsigned long compare ,
-                                       const unsigned long val )
-{ return __sync_val_compare_and_swap(dest,compare,val); }
-
-#endif
-
-template < typename T >
-inline
-T atomic_compare_exchange( volatile T * const dest, const T & compare,
-  typename Kokkos::Impl::enable_if< sizeof(T) == sizeof(int) , const T & >::type val )
-{
-  union U {
-    int i ;
-    T t ;
-    KOKKOS_INLINE_FUNCTION U() {};
-  } tmp ;
-
-#if defined( KOKKOS_ENABLE_RFO_PREFETCH )
-  _mm_prefetch( (const char*) dest, _MM_HINT_ET0 );
-#endif
-
-  tmp.i = __sync_val_compare_and_swap( (int*) dest , *((int*)&compare) , *((int*)&val) );
-  return tmp.t ;
+inline unsigned int atomic_compare_exchange(volatile unsigned int* const dest,
+                                            const unsigned int compare,
+                                            const unsigned int val) {
+  return __sync_val_compare_and_swap(dest, compare, val);
 }
 
-template < typename T >
-inline
-T atomic_compare_exchange( volatile T * const dest, const T & compare,
-  typename Kokkos::Impl::enable_if< sizeof(T) != sizeof(int) &&
-                                    sizeof(T) == sizeof(long) , const T & >::type val )
-{
-  union U {
-    long i ;
-    T t ;
-    KOKKOS_INLINE_FUNCTION U() {};
-  } tmp ;
-
-#if defined( KOKKOS_ENABLE_RFO_PREFETCH )
-  _mm_prefetch( (const char*) dest, _MM_HINT_ET0 );
-#endif
-
-  tmp.i = __sync_val_compare_and_swap( (long*) dest , *((long*)&compare) , *((long*)&val) );
-  return tmp.t ;
+inline unsigned long atomic_compare_exchange(volatile unsigned long* const dest,
+                                             const unsigned long compare,
+                                             const unsigned long val) {
+  return __sync_val_compare_and_swap(dest, compare, val);
 }
 
-#if defined( KOKKOS_ENABLE_ASM) && defined ( KOKKOS_ENABLE_ISA_X86_64 )
-template < typename T >
-inline
-T atomic_compare_exchange( volatile T * const dest, const T & compare,
-  typename Kokkos::Impl::enable_if< sizeof(T) != sizeof(int) &&
-                                    sizeof(T) != sizeof(long) &&
-                                    sizeof(T) == sizeof(Impl::cas128_t), const T & >::type val )
-{
-  union U {
-    Impl::cas128_t i ;
-    T t ;
-    KOKKOS_INLINE_FUNCTION U() {};
-  } tmp ;
-
-#if defined( KOKKOS_ENABLE_RFO_PREFETCH )
-  _mm_prefetch( (const char*) dest, _MM_HINT_ET0 );
 #endif
 
-  tmp.i = Impl::cas128( (Impl::cas128_t*) dest , *((Impl::cas128_t*)&compare) , *((Impl::cas128_t*)&val) );
-  return tmp.t ;
+template <typename T>
+inline T atomic_compare_exchange(
+    volatile T* const dest, const T& compare,
+    typename Kokkos::Impl::enable_if<sizeof(T) == sizeof(int), const T&>::type
+        val) {
+  union U {
+    int i;
+    T t;
+    KOKKOS_INLINE_FUNCTION U(){};
+  } tmp;
+
+#if defined(KOKKOS_ENABLE_RFO_PREFETCH)
+  _mm_prefetch((const char*)dest, _MM_HINT_ET0);
+#endif
+
+  tmp.i =
+      __sync_val_compare_and_swap((int*)dest, *((int*)&compare), *((int*)&val));
+  return tmp.t;
+}
+
+template <typename T>
+inline T atomic_compare_exchange(
+    volatile T* const dest, const T& compare,
+    typename Kokkos::Impl::enable_if<sizeof(T) != sizeof(int) &&
+                                         sizeof(T) == sizeof(long),
+                                     const T&>::type val) {
+  union U {
+    long i;
+    T t;
+    KOKKOS_INLINE_FUNCTION U(){};
+  } tmp;
+
+#if defined(KOKKOS_ENABLE_RFO_PREFETCH)
+  _mm_prefetch((const char*)dest, _MM_HINT_ET0);
+#endif
+
+  tmp.i = __sync_val_compare_and_swap((long*)dest, *((long*)&compare),
+                                      *((long*)&val));
+  return tmp.t;
+}
+
+#if defined(KOKKOS_ENABLE_ASM) && defined(KOKKOS_ENABLE_ISA_X86_64)
+template <typename T>
+inline T atomic_compare_exchange(
+    volatile T* const dest, const T& compare,
+    typename Kokkos::Impl::enable_if<sizeof(T) != sizeof(int) &&
+                                         sizeof(T) != sizeof(long) &&
+                                         sizeof(T) == sizeof(Impl::cas128_t),
+                                     const T&>::type val) {
+  union U {
+    Impl::cas128_t i;
+    T t;
+    KOKKOS_INLINE_FUNCTION U(){};
+  } tmp;
+
+#if defined(KOKKOS_ENABLE_RFO_PREFETCH)
+  _mm_prefetch((const char*)dest, _MM_HINT_ET0);
+#endif
+
+  tmp.i = Impl::cas128((Impl::cas128_t*)dest, *((Impl::cas128_t*)&compare),
+                       *((Impl::cas128_t*)&val));
+  return tmp.t;
 }
 #endif
 
-template < typename T >
-inline
-T atomic_compare_exchange( volatile T * const dest , const T compare ,
-    typename Kokkos::Impl::enable_if<
-                  ( sizeof(T) != 4 )
-               && ( sizeof(T) != 8 )
-            #if defined(KOKKOS_ENABLE_ASM) && defined ( KOKKOS_ENABLE_ISA_X86_64 )
-               && ( sizeof(T) != 16 )
-            #endif
-             , const T >::type& val )
-{
-#if defined( KOKKOS_ENABLE_RFO_PREFETCH )
-  _mm_prefetch( (const char*) dest, _MM_HINT_ET0 );
+template <typename T>
+inline T atomic_compare_exchange(
+    volatile T* const dest, const T compare,
+    typename Kokkos::Impl::enable_if<(sizeof(T) != 4) && (sizeof(T) != 8)
+#if defined(KOKKOS_ENABLE_ASM) && defined(KOKKOS_ENABLE_ISA_X86_64)
+                                         && (sizeof(T) != 16)
+#endif
+                                         ,
+                                     const T>::type& val) {
+#if defined(KOKKOS_ENABLE_RFO_PREFETCH)
+  _mm_prefetch((const char*)dest, _MM_HINT_ET0);
 #endif
 
-  while( !Impl::lock_address_host_space( (void*) dest ) );
+  while (!Impl::lock_address_host_space((void*)dest))
+    ;
   T return_val = *dest;
-  if( return_val == compare ) {
+  if (return_val == compare) {
     // Don't use the following line of code here:
     //
-    //const T tmp = *dest = val;
+    // const T tmp = *dest = val;
     //
     // Instead, put each assignment in its own statement.  This is
     // because the overload of T::operator= for volatile *this should
     // return void, not volatile T&.  See Kokkos #177:
     //
     // https://github.com/kokkos/kokkos/issues/177
-    *dest = val;
+    *dest       = val;
     const T tmp = *dest;
-    #ifndef KOKKOS_COMPILER_CLANG
-    (void) tmp;
-    #endif
+#ifndef KOKKOS_COMPILER_CLANG
+    (void)tmp;
+#endif
   }
-  Impl::unlock_address_host_space( (void*) dest );
+  Impl::unlock_address_host_space((void*)dest);
   return return_val;
 }
 //----------------------------------------------------------------------------
 
-#elif defined( KOKKOS_ENABLE_OPENMP_ATOMICS )
+#elif defined(KOKKOS_ENABLE_OPENMP_ATOMICS)
 
-template< typename T >
-KOKKOS_INLINE_FUNCTION
-T atomic_compare_exchange( volatile T * const dest, const T compare, const T val )
-{
+template <typename T>
+KOKKOS_INLINE_FUNCTION T atomic_compare_exchange(volatile T* const dest,
+                                                 const T compare, const T val) {
   T retval;
 #pragma omp critical
   {
     retval = dest[0];
-    if ( retval == compare )
-        dest[0] = val;
+    if (retval == compare) dest[0] = val;
   }
   return retval;
 }
 
-#elif defined( KOKKOS_ENABLE_SERIAL_ATOMICS )
+#elif defined(KOKKOS_ENABLE_SERIAL_ATOMICS)
 
-template< typename T >
-KOKKOS_INLINE_FUNCTION
-T atomic_compare_exchange( volatile T * const dest_v, const T compare, const T val )
-{
-  T* dest = const_cast<T*>(dest_v);
+template <typename T>
+KOKKOS_INLINE_FUNCTION T atomic_compare_exchange(volatile T* const dest_v,
+                                                 const T compare, const T val) {
+  T* dest  = const_cast<T*>(dest_v);
   T retval = *dest;
   if (retval == compare) *dest = val;
   return retval;
@@ -313,22 +314,21 @@ T atomic_compare_exchange( volatile T * const dest_v, const T compare, const T v
 
 #endif
 #endif
-#endif // !defined ROCM_ATOMICS
+#endif  // !defined ROCM_ATOMICS
 
 // dummy for non-CUDA Kokkos headers being processed by NVCC
 #if defined(__CUDA_ARCH__) && !defined(KOKKOS_ENABLE_CUDA)
 template <typename T>
-__inline__ __device__
-T atomic_compare_exchange(volatile T * const, const Kokkos::Impl::identity_t<T>, const Kokkos::Impl::identity_t<T>)
-{
+__inline__ __device__ T
+atomic_compare_exchange(volatile T* const, const Kokkos::Impl::identity_t<T>,
+                        const Kokkos::Impl::identity_t<T>) {
   return T();
 }
 #endif
 
 template <typename T>
-KOKKOS_INLINE_FUNCTION
-bool atomic_compare_exchange_strong(volatile T* const dest, const T compare, const T val)
-{
+KOKKOS_INLINE_FUNCTION bool atomic_compare_exchange_strong(
+    volatile T* const dest, const T compare, const T val) {
   return compare == atomic_compare_exchange(dest, compare, val);
 }
 //----------------------------------------------------------------------------
@@ -337,161 +337,109 @@ namespace Impl {
 // memory-ordered versions are in the Impl namespace
 
 template <class T, class MemoryOrderFailure>
-KOKKOS_INLINE_FUNCTION
-bool _atomic_compare_exchange_strong_fallback(
-  T* dest, T compare, T val, memory_order_seq_cst_t, MemoryOrderFailure
-)
-{
+KOKKOS_INLINE_FUNCTION bool _atomic_compare_exchange_strong_fallback(
+    T* dest, T compare, T val, memory_order_seq_cst_t, MemoryOrderFailure) {
   Kokkos::memory_fence();
-  auto rv = Kokkos::atomic_compare_exchange_strong(
-    dest, compare, val
-  );
+  auto rv = Kokkos::atomic_compare_exchange_strong(dest, compare, val);
   Kokkos::memory_fence();
   return rv;
 }
 
 template <class T, class MemoryOrderFailure>
-KOKKOS_INLINE_FUNCTION
-bool _atomic_compare_exchange_strong_fallback(
-  T* dest, T compare, T val, memory_order_acquire_t, MemoryOrderFailure
-)
-{
-  auto rv = Kokkos::atomic_compare_exchange_strong(
-    dest, compare, val
-  );
+KOKKOS_INLINE_FUNCTION bool _atomic_compare_exchange_strong_fallback(
+    T* dest, T compare, T val, memory_order_acquire_t, MemoryOrderFailure) {
+  auto rv = Kokkos::atomic_compare_exchange_strong(dest, compare, val);
   Kokkos::memory_fence();
   return rv;
 }
 
 template <class T, class MemoryOrderFailure>
-KOKKOS_INLINE_FUNCTION
-bool _atomic_compare_exchange_strong_fallback(
-  T* dest, T compare, T val, memory_order_release_t, MemoryOrderFailure
-)
-{
+KOKKOS_INLINE_FUNCTION bool _atomic_compare_exchange_strong_fallback(
+    T* dest, T compare, T val, memory_order_release_t, MemoryOrderFailure) {
   Kokkos::memory_fence();
-  return Kokkos::atomic_compare_exchange_strong(
-    dest, compare, val
-  );
+  return Kokkos::atomic_compare_exchange_strong(dest, compare, val);
 }
 
 template <class T, class MemoryOrderFailure>
-KOKKOS_INLINE_FUNCTION
-bool _atomic_compare_exchange_strong_fallback(
-  T* dest, T compare, T val, memory_order_relaxed_t, MemoryOrderFailure
-)
-{
-  return Kokkos::atomic_compare_exchange_strong(
-    dest, compare, val
-  );
+KOKKOS_INLINE_FUNCTION bool _atomic_compare_exchange_strong_fallback(
+    T* dest, T compare, T val, memory_order_relaxed_t, MemoryOrderFailure) {
+  return Kokkos::atomic_compare_exchange_strong(dest, compare, val);
 }
 
-#if (defined(KOKKOS_ENABLE_GNU_ATOMICS) && !defined(__CUDA_ARCH__)) \
-    || (defined(KOKKOS_ENABLE_INTEL_ATOMICS) && !defined(__CUDA_ARCH__)) \
-    || defined(KOKKOS_ENABLE_CUDA_ASM_ATOMICS)
+#if (defined(KOKKOS_ENABLE_GNU_ATOMICS) && !defined(__CUDA_ARCH__)) ||   \
+    (defined(KOKKOS_ENABLE_INTEL_ATOMICS) && !defined(__CUDA_ARCH__)) || \
+    defined(KOKKOS_ENABLE_CUDA_ASM_ATOMICS)
 
 #if defined(__CUDA_ARCH__)
-  #define KOKKOS_INTERNAL_INLINE_DEVICE_IF_CUDA_ARCH __inline__ __device__
+#define KOKKOS_INTERNAL_INLINE_DEVICE_IF_CUDA_ARCH __inline__ __device__
 #else
-  #define KOKKOS_INTERNAL_INLINE_DEVICE_IF_CUDA_ARCH inline
+#define KOKKOS_INTERNAL_INLINE_DEVICE_IF_CUDA_ARCH inline
 #endif
 
 template <class T, class MemoryOrderSuccess, class MemoryOrderFailure>
-KOKKOS_INTERNAL_INLINE_DEVICE_IF_CUDA_ARCH
-bool _atomic_compare_exchange_strong(
-  T* dest, T compare, T val,
-  MemoryOrderSuccess,
-  MemoryOrderFailure,
-  typename std::enable_if<
-    (
-      sizeof(T) == 1
-      || sizeof(T) == 2
-      || sizeof(T) == 4
-      || sizeof(T) == 8
-    )
-    && std::is_same<
-      typename MemoryOrderSuccess::memory_order,
-      typename std::remove_cv<MemoryOrderSuccess>::type
-    >::value
-    && std::is_same<
-      typename MemoryOrderFailure::memory_order,
-      typename std::remove_cv<MemoryOrderFailure>::type
-    >::value,
-    void const**
-  >::type = nullptr
-) {
-  return __atomic_compare_exchange_n(
-    dest, &compare, val, /* weak = */ false,
-    MemoryOrderSuccess::gnu_constant,
-    MemoryOrderFailure::gnu_constant
-  );
+KOKKOS_INTERNAL_INLINE_DEVICE_IF_CUDA_ARCH bool _atomic_compare_exchange_strong(
+    T* dest, T compare, T val, MemoryOrderSuccess, MemoryOrderFailure,
+    typename std::enable_if<
+        (sizeof(T) == 1 || sizeof(T) == 2 || sizeof(T) == 4 ||
+         sizeof(T) == 8) &&
+            std::is_same<
+                typename MemoryOrderSuccess::memory_order,
+                typename std::remove_cv<MemoryOrderSuccess>::type>::value &&
+            std::is_same<
+                typename MemoryOrderFailure::memory_order,
+                typename std::remove_cv<MemoryOrderFailure>::type>::value,
+        void const**>::type = nullptr) {
+  return __atomic_compare_exchange_n(dest, &compare, val, /* weak = */ false,
+                                     MemoryOrderSuccess::gnu_constant,
+                                     MemoryOrderFailure::gnu_constant);
 }
 
 template <class T, class MemoryOrderSuccess, class MemoryOrderFailure>
-KOKKOS_INTERNAL_INLINE_DEVICE_IF_CUDA_ARCH
-bool _atomic_compare_exchange_strong(
-  T* dest, T compare, T val,
-  MemoryOrderSuccess order_success,
-  MemoryOrderFailure order_failure,
-  typename std::enable_if<
-    !(
-      sizeof(T) == 1
-      || sizeof(T) == 2
-      || sizeof(T) == 4
-      || sizeof(T) == 8
-    )
-    && std::is_same<
-      typename MemoryOrderSuccess::memory_order,
-      typename std::remove_cv<MemoryOrderSuccess>::type
-    >::value
-    && std::is_same<
-      typename MemoryOrderFailure::memory_order,
-      typename std::remove_cv<MemoryOrderFailure>::type
-    >::value,
-    void const**
-  >::type = nullptr
-) {
-  return _atomic_compare_exchange_fallback(
-    dest, compare, val,
-    order_success, order_failure
-  );
+KOKKOS_INTERNAL_INLINE_DEVICE_IF_CUDA_ARCH bool _atomic_compare_exchange_strong(
+    T* dest, T compare, T val, MemoryOrderSuccess order_success,
+    MemoryOrderFailure order_failure,
+    typename std::enable_if<
+        !(sizeof(T) == 1 || sizeof(T) == 2 || sizeof(T) == 4 ||
+          sizeof(T) == 8) &&
+            std::is_same<
+                typename MemoryOrderSuccess::memory_order,
+                typename std::remove_cv<MemoryOrderSuccess>::type>::value &&
+            std::is_same<
+                typename MemoryOrderFailure::memory_order,
+                typename std::remove_cv<MemoryOrderFailure>::type>::value,
+        void const**>::type = nullptr) {
+  return _atomic_compare_exchange_fallback(dest, compare, val, order_success,
+                                           order_failure);
 }
 
 #else
 
 template <class T, class MemoryOrderSuccess, class MemoryOrderFailure>
-KOKKOS_INLINE_FUNCTION
-bool _atomic_compare_exchange_strong(
-  T* dest, T compare, T val,
-  MemoryOrderSuccess order_success,
-  MemoryOrderFailure order_failure
-) {
-  return _atomic_compare_exchange_strong_fallback(
-    dest, compare, val, order_success, order_failure
-  );
+KOKKOS_INLINE_FUNCTION bool _atomic_compare_exchange_strong(
+    T* dest, T compare, T val, MemoryOrderSuccess order_success,
+    MemoryOrderFailure order_failure) {
+  return _atomic_compare_exchange_strong_fallback(dest, compare, val,
+                                                  order_success, order_failure);
 }
 
 #endif
 
-// TODO static asserts in overloads that don't make sense (as listed in https://gcc.gnu.org/onlinedocs/gcc-5.2.0/gcc/_005f_005fatomic-Builtins.html)
+// TODO static asserts in overloads that don't make sense (as listed in
+// https://gcc.gnu.org/onlinedocs/gcc-5.2.0/gcc/_005f_005fatomic-Builtins.html)
 template <class T, class MemoryOrderSuccess, class MemoryOrderFailure>
-KOKKOS_FORCEINLINE_FUNCTION
-bool atomic_compare_exchange_strong(
-  T* dest, T compare, T val,
-  MemoryOrderSuccess order_success,
-  MemoryOrderFailure order_failure
-) {
-  return _atomic_compare_exchange_strong(dest, compare, val, order_success, order_failure);
+KOKKOS_FORCEINLINE_FUNCTION bool atomic_compare_exchange_strong(
+    T* dest, T compare, T val, MemoryOrderSuccess order_success,
+    MemoryOrderFailure order_failure) {
+  return _atomic_compare_exchange_strong(dest, compare, val, order_success,
+                                         order_failure);
 }
 
+}  // end namespace Impl
 
-} // end namespace Impl
-
-} // namespace Kokkos
+}  // namespace Kokkos
 
 #if defined(KOKKOS_ENABLE_CUDA)
 #include <Cuda/Kokkos_Cuda_Atomic_Intrinsics_Restore_Builtins.hpp>
 #endif
 
 #endif
-
diff --git a/lib/kokkos/core/src/impl/Kokkos_Atomic_Compare_Exchange_Weak.hpp b/lib/kokkos/core/src/impl/Kokkos_Atomic_Compare_Exchange_Weak.hpp
index 3abc8ed4b7..c2aad61975 100644
--- a/lib/kokkos/core/src/impl/Kokkos_Atomic_Compare_Exchange_Weak.hpp
+++ b/lib/kokkos/core/src/impl/Kokkos_Atomic_Compare_Exchange_Weak.hpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -41,7 +42,7 @@
 //@HEADER
 */
 
-#if defined( KOKKOS_ENABLE_RFO_PREFETCH )
+#if defined(KOKKOS_ENABLE_RFO_PREFETCH)
 #include <xmmintrin.h>
 #endif
 
@@ -51,7 +52,7 @@
 #define KOKKOS_ATOMIC_COMPARE_EXCHANGE_WEAK_HPP
 
 #if defined(KOKKOS_ENABLE_CUDA)
-#include<Cuda/Kokkos_Cuda_Version_9_8_Compatibility.hpp>
+#include <Cuda/Kokkos_Cuda_Version_9_8_Compatibility.hpp>
 #endif
 
 namespace Kokkos {
@@ -60,42 +61,49 @@ namespace Kokkos {
 //----------------------------------------------------------------------------
 // Cuda sm_70 or greater supports C++-like semantics directly
 
-#if defined( KOKKOS_ENABLE_CUDA )
+#if defined(KOKKOS_ENABLE_CUDA)
 
 #if defined(__CUDA_ARCH__) || defined(KOKKOS_IMPL_CUDA_CLANG_WORKAROUND)
 
-
 #if __CUDA_ARCH__ >= 700
 // See: https://github.com/ogiroux/freestanding
-#  define kokkos_cuda_internal_cas_release_32(ptr, old, expected, desired) \
-  asm volatile("atom.cas.release.sys.b32 %0, [%1], %2, %3;" : "=r"(old) : "l"(ptr), "r"(expected), "r"(desired) : "memory")
-#  define kokkos_cuda_internal_cas_acquire_32(ptr, old, expected, desired) \
-  asm volatile("atom.cas.acquire.sys.b32 %0, [%1], %2, %3;" : "=r"(old) : "l"(ptr), "r"(expected), "r"(desired) : "memory")
-#  define kokkos_cuda_internal_cas_acq_rel_32(ptr, old, expected, desired) \
-  asm volatile("atom.cas.acq_rel.sys.b32 %0, [%1], %2, %3;" : "=r"(old) : "l"(ptr), "r"(expected), "r"(desired) : "memory")
-#  define kokkos_cuda_internal_cas_relaxed_32(ptr, old, expected, desired) \
-  asm volatile("atom.cas.relaxed.sys.b32 %0, [%1], %2, %3;" : "=r"(old) : "l"(ptr), "r"(expected), "r"(desired) : "memory")
-#  define kokkos_cuda_internal_fence_seq_cst() asm volatile("fence.sc.sys;" : : : "memory")
-#  define kokkos_cuda_internal_fence_acq_rel() asm volatile("fence.acq_rel.sys;" : : : "memory")
+#define kokkos_cuda_internal_cas_release_32(ptr, old, expected, desired) \
+  asm volatile("atom.cas.release.sys.b32 %0, [%1], %2, %3;"              \
+               : "=r"(old)                                               \
+               : "l"(ptr), "r"(expected), "r"(desired)                   \
+               : "memory")
+#define kokkos_cuda_internal_cas_acquire_32(ptr, old, expected, desired) \
+  asm volatile("atom.cas.acquire.sys.b32 %0, [%1], %2, %3;"              \
+               : "=r"(old)                                               \
+               : "l"(ptr), "r"(expected), "r"(desired)                   \
+               : "memory")
+#define kokkos_cuda_internal_cas_acq_rel_32(ptr, old, expected, desired) \
+  asm volatile("atom.cas.acq_rel.sys.b32 %0, [%1], %2, %3;"              \
+               : "=r"(old)                                               \
+               : "l"(ptr), "r"(expected), "r"(desired)                   \
+               : "memory")
+#define kokkos_cuda_internal_cas_relaxed_32(ptr, old, expected, desired) \
+  asm volatile("atom.cas.relaxed.sys.b32 %0, [%1], %2, %3;"              \
+               : "=r"(old)                                               \
+               : "l"(ptr), "r"(expected), "r"(desired)                   \
+               : "memory")
+#define kokkos_cuda_internal_fence_seq_cst() \
+  asm volatile("fence.sc.sys;" : : : "memory")
+#define kokkos_cuda_internal_fence_acq_rel() \
+  asm volatile("fence.acq_rel.sys;" : : : "memory")
 #else
-#  define kokkos_cuda_internal_fence_acq_rel() asm volatile("membar.sys;" : : : "memory")
-#  define kokkos_cuda_internal_fence_seq_cst() asm volatile("membar.sys;" : : : "memory")
+#define kokkos_cuda_internal_fence_acq_rel() \
+  asm volatile("membar.sys;" : : : "memory")
+#define kokkos_cuda_internal_fence_seq_cst() \
+  asm volatile("membar.sys;" : : : "memory")
 #endif
 
-
 // 32-bit version
-template <class T,
-  typename std::enable_if<sizeof(T) == 4, int>::type = 0
->
-__inline__ __device__
-bool
-atomic_compare_exchange_weak(
-  T volatile* const dest,
-  T* const expected,
-  T const desired,
-  std::memory_order success_order = std::memory_order_seq_cst,
-  std::memory_order failure_order = std::memory_order_seq_cst
-) {
+template <class T, typename std::enable_if<sizeof(T) == 4, int>::type = 0>
+__inline__ __device__ bool atomic_compare_exchange_weak(
+    T volatile* const dest, T* const expected, T const desired,
+    std::memory_order success_order = std::memory_order_seq_cst,
+    std::memory_order failure_order = std::memory_order_seq_cst) {
   // TODO assert that success_order >= failure_order
   // See: https://github.com/ogiroux/freestanding
   int32_t tmp = 0;
@@ -104,7 +112,7 @@ atomic_compare_exchange_weak(
   memcpy(&old, expected, sizeof(T));
   int32_t old_tmp = old;
 #if __CUDA_ARCH__ >= 700
-  switch(success_order) {
+  switch (success_order) {
     case std::memory_order_seq_cst:
       // sequentially consistent is just an acquire with a seq_cst fence
       kokkos_cuda_internal_fence_seq_cst();
@@ -129,42 +137,32 @@ atomic_compare_exchange_weak(
   };
 #else
   // All of the orders that require a fence before the relaxed atomic operation:
-  if(
-    success_order == std::memory_order_release
-    || success_order == std::memory_order_acq_rel
-  ) {
+  if (success_order == std::memory_order_release ||
+      success_order == std::memory_order_acq_rel) {
     kokkos_cuda_internal_fence_acq_rel();
-  }
-  else if(success_order == std::memory_order_seq_cst) {
+  } else if (success_order == std::memory_order_seq_cst) {
     kokkos_cuda_internal_fence_seq_cst();
   }
-  // This is relaxed: 
+  // This is relaxed:
   // Cuda API requires casting away volatile
   atomicCAS((T*)dest, old_tmp, tmp);
 #endif
   bool const rv = (old == old_tmp);
 #if __CUDA_ARCH__ < 700
-  if(rv) {
-    if(
-      success_order == std::memory_order_acquire
-      || success_order == std::memory_order_consume
-      || success_order == std::memory_order_acq_rel
-    ) {
+  if (rv) {
+    if (success_order == std::memory_order_acquire ||
+        success_order == std::memory_order_consume ||
+        success_order == std::memory_order_acq_rel) {
       kokkos_cuda_internal_fence_acq_rel();
-    }
-    else if(success_order == std::memory_order_seq_cst) {
+    } else if (success_order == std::memory_order_seq_cst) {
       kokkos_cuda_internal_fence_seq_cst();
     }
-  }
-  else {
-    if(
-      failure_order == std::memory_order_acquire
-      || failure_order == std::memory_order_consume
-      || failure_order == std::memory_order_acq_rel
-    ) {
+  } else {
+    if (failure_order == std::memory_order_acquire ||
+        failure_order == std::memory_order_consume ||
+        failure_order == std::memory_order_acq_rel) {
       kokkos_cuda_internal_fence_acq_rel();
-    }
-    else if(failure_order == std::memory_order_seq_cst) {
+    } else if (failure_order == std::memory_order_seq_cst) {
       kokkos_cuda_internal_fence_seq_cst();
     }
   }
@@ -174,17 +172,11 @@ atomic_compare_exchange_weak(
 }
 
 // 64-bit version
-template <class T,
-  typename std::enable_if<sizeof(T) == 8, int>::type = 0
->
-bool
-atomic_compare_exchange_weak(
-  T volatile* const dest,
-  T* const expected,
-  T const desired,
-  std::memory_order success_order = std::memory_order_seq_cst,
-  std::memory_order failure_order = std::memory_order_seq_cst
-) {
+template <class T, typename std::enable_if<sizeof(T) == 8, int>::type = 0>
+bool atomic_compare_exchange_weak(
+    T volatile* const dest, T* const expected, T const desired,
+    std::memory_order success_order = std::memory_order_seq_cst,
+    std::memory_order failure_order = std::memory_order_seq_cst) {
   // TODO assert that success_order >= failure_order
   // See: https://github.com/ogiroux/freestanding
   int64_t tmp = 0;
@@ -193,7 +185,7 @@ atomic_compare_exchange_weak(
   memcpy(&old, expected, sizeof(T));
   int64_t old_tmp = old;
 #if __CUDA_ARCH__ >= 700
-  switch(success_order) {
+  switch (success_order) {
     case std::memory_order_seq_cst:
       // sequentially consistent is just an acquire with a seq_cst fence
       kokkos_cuda_internal_fence_seq_cst();
@@ -225,9 +217,9 @@ atomic_compare_exchange_weak(
   return rv;
 }
 
-#endif // defined(__CUDA_ARCH__) || defined(KOKKOS_IMPL_CUDA_CLANG_WORKAROUND)
+#endif  // defined(__CUDA_ARCH__) || defined(KOKKOS_IMPL_CUDA_CLANG_WORKAROUND)
 
-#endif // defined( KOKKOS_ENABLE_CUDA )
+#endif  // defined( KOKKOS_ENABLE_CUDA )
 
 //----------------------------------------------------------------------------
 //----------------------------------------------------------------------------
@@ -238,163 +230,162 @@ atomic_compare_exchange_weak(
 #if !defined(__CUDA_ARCH__) || defined(KOKKOS_IMPL_CUDA_CLANG_WORKAROUND)
 #if defined(KOKKOS_ENABLE_GNU_ATOMICS) || defined(KOKKOS_ENABLE_INTEL_ATOMICS)
 
-inline
-int atomic_compare_exchange( volatile int * const dest, const int compare, const int val)
-{
-#if defined( KOKKOS_ENABLE_RFO_PREFETCH )
-  _mm_prefetch( (const char*) dest, _MM_HINT_ET0 );
+inline int atomic_compare_exchange(volatile int* const dest, const int compare,
+                                   const int val) {
+#if defined(KOKKOS_ENABLE_RFO_PREFETCH)
+  _mm_prefetch((const char*)dest, _MM_HINT_ET0);
 #endif
-  return __sync_val_compare_and_swap(dest,compare,val);
+  return __sync_val_compare_and_swap(dest, compare, val);
 }
 
-inline
-long atomic_compare_exchange( volatile long * const dest, const long compare, const long val )
-{ 
-#if defined( KOKKOS_ENABLE_RFO_PREFETCH )
-  _mm_prefetch( (const char*) dest, _MM_HINT_ET0 );
+inline long atomic_compare_exchange(volatile long* const dest,
+                                    const long compare, const long val) {
+#if defined(KOKKOS_ENABLE_RFO_PREFETCH)
+  _mm_prefetch((const char*)dest, _MM_HINT_ET0);
 #endif
-  return __sync_val_compare_and_swap(dest,compare,val);
+  return __sync_val_compare_and_swap(dest, compare, val);
 }
 
-#if defined( KOKKOS_ENABLE_GNU_ATOMICS )
+#if defined(KOKKOS_ENABLE_GNU_ATOMICS)
 
 // GCC supports unsigned
 
-inline
-unsigned int atomic_compare_exchange( volatile unsigned int * const dest, const unsigned int compare, const unsigned int val )
-{ return __sync_val_compare_and_swap(dest,compare,val); }
-
-inline
-unsigned long atomic_compare_exchange( volatile unsigned long * const dest ,
-                                       const unsigned long compare ,
-                                       const unsigned long val )
-{ return __sync_val_compare_and_swap(dest,compare,val); }
-
-#endif
-
-template < typename T >
-inline
-T atomic_compare_exchange( volatile T * const dest, const T & compare,
-  typename Kokkos::Impl::enable_if< sizeof(T) == sizeof(int) , const T & >::type val )
-{
-  union U {
-    int i ;
-    T t ;
-    KOKKOS_INLINE_FUNCTION U() {};
-  } tmp ;
-
-#if defined( KOKKOS_ENABLE_RFO_PREFETCH )
-  _mm_prefetch( (const char*) dest, _MM_HINT_ET0 );
-#endif
-
-  tmp.i = __sync_val_compare_and_swap( (int*) dest , *((int*)&compare) , *((int*)&val) );
-  return tmp.t ;
+inline unsigned int atomic_compare_exchange(volatile unsigned int* const dest,
+                                            const unsigned int compare,
+                                            const unsigned int val) {
+  return __sync_val_compare_and_swap(dest, compare, val);
 }
 
-template < typename T >
-inline
-T atomic_compare_exchange( volatile T * const dest, const T & compare,
-  typename Kokkos::Impl::enable_if< sizeof(T) != sizeof(int) &&
-                                    sizeof(T) == sizeof(long) , const T & >::type val )
-{
-  union U {
-    long i ;
-    T t ;
-    KOKKOS_INLINE_FUNCTION U() {};
-  } tmp ;
-
-#if defined( KOKKOS_ENABLE_RFO_PREFETCH )
-  _mm_prefetch( (const char*) dest, _MM_HINT_ET0 );
-#endif
-
-  tmp.i = __sync_val_compare_and_swap( (long*) dest , *((long*)&compare) , *((long*)&val) );
-  return tmp.t ;
+inline unsigned long atomic_compare_exchange(volatile unsigned long* const dest,
+                                             const unsigned long compare,
+                                             const unsigned long val) {
+  return __sync_val_compare_and_swap(dest, compare, val);
 }
 
-#if defined( KOKKOS_ENABLE_ASM) && defined ( KOKKOS_ENABLE_ISA_X86_64 )
-template < typename T >
-inline
-T atomic_compare_exchange( volatile T * const dest, const T & compare,
-  typename Kokkos::Impl::enable_if< sizeof(T) != sizeof(int) &&
-                                    sizeof(T) != sizeof(long) &&
-                                    sizeof(T) == sizeof(Impl::cas128_t), const T & >::type val )
-{
-  union U {
-    Impl::cas128_t i ;
-    T t ;
-    KOKKOS_INLINE_FUNCTION U() {};
-  } tmp ;
-
-#if defined( KOKKOS_ENABLE_RFO_PREFETCH )
-  _mm_prefetch( (const char*) dest, _MM_HINT_ET0 );
 #endif
 
-  tmp.i = Impl::cas128( (Impl::cas128_t*) dest , *((Impl::cas128_t*)&compare) , *((Impl::cas128_t*)&val) );
-  return tmp.t ;
+template <typename T>
+inline T atomic_compare_exchange(
+    volatile T* const dest, const T& compare,
+    typename Kokkos::Impl::enable_if<sizeof(T) == sizeof(int), const T&>::type
+        val) {
+  union U {
+    int i;
+    T t;
+    KOKKOS_INLINE_FUNCTION U(){};
+  } tmp;
+
+#if defined(KOKKOS_ENABLE_RFO_PREFETCH)
+  _mm_prefetch((const char*)dest, _MM_HINT_ET0);
+#endif
+
+  tmp.i =
+      __sync_val_compare_and_swap((int*)dest, *((int*)&compare), *((int*)&val));
+  return tmp.t;
+}
+
+template <typename T>
+inline T atomic_compare_exchange(
+    volatile T* const dest, const T& compare,
+    typename Kokkos::Impl::enable_if<sizeof(T) != sizeof(int) &&
+                                         sizeof(T) == sizeof(long),
+                                     const T&>::type val) {
+  union U {
+    long i;
+    T t;
+    KOKKOS_INLINE_FUNCTION U(){};
+  } tmp;
+
+#if defined(KOKKOS_ENABLE_RFO_PREFETCH)
+  _mm_prefetch((const char*)dest, _MM_HINT_ET0);
+#endif
+
+  tmp.i = __sync_val_compare_and_swap((long*)dest, *((long*)&compare),
+                                      *((long*)&val));
+  return tmp.t;
+}
+
+#if defined(KOKKOS_ENABLE_ASM) && defined(KOKKOS_ENABLE_ISA_X86_64)
+template <typename T>
+inline T atomic_compare_exchange(
+    volatile T* const dest, const T& compare,
+    typename Kokkos::Impl::enable_if<sizeof(T) != sizeof(int) &&
+                                         sizeof(T) != sizeof(long) &&
+                                         sizeof(T) == sizeof(Impl::cas128_t),
+                                     const T&>::type val) {
+  union U {
+    Impl::cas128_t i;
+    T t;
+    KOKKOS_INLINE_FUNCTION U(){};
+  } tmp;
+
+#if defined(KOKKOS_ENABLE_RFO_PREFETCH)
+  _mm_prefetch((const char*)dest, _MM_HINT_ET0);
+#endif
+
+  tmp.i = Impl::cas128((Impl::cas128_t*)dest, *((Impl::cas128_t*)&compare),
+                       *((Impl::cas128_t*)&val));
+  return tmp.t;
 }
 #endif
 
-template < typename T >
-inline
-T atomic_compare_exchange( volatile T * const dest , const T compare ,
-    typename Kokkos::Impl::enable_if<
-                  ( sizeof(T) != 4 )
-               && ( sizeof(T) != 8 )
-            #if defined(KOKKOS_ENABLE_ASM) && defined ( KOKKOS_ENABLE_ISA_X86_64 )
-               && ( sizeof(T) != 16 )
-            #endif
-             , const T >::type& val )
-{
-#if defined( KOKKOS_ENABLE_RFO_PREFETCH )
-  _mm_prefetch( (const char*) dest, _MM_HINT_ET0 );
+template <typename T>
+inline T atomic_compare_exchange(
+    volatile T* const dest, const T compare,
+    typename Kokkos::Impl::enable_if<(sizeof(T) != 4) && (sizeof(T) != 8)
+#if defined(KOKKOS_ENABLE_ASM) && defined(KOKKOS_ENABLE_ISA_X86_64)
+                                         && (sizeof(T) != 16)
+#endif
+                                         ,
+                                     const T>::type& val) {
+#if defined(KOKKOS_ENABLE_RFO_PREFETCH)
+  _mm_prefetch((const char*)dest, _MM_HINT_ET0);
 #endif
 
-  while( !Impl::lock_address_host_space( (void*) dest ) );
+  while (!Impl::lock_address_host_space((void*)dest))
+    ;
   T return_val = *dest;
-  if( return_val == compare ) {
+  if (return_val == compare) {
     // Don't use the following line of code here:
     //
-    //const T tmp = *dest = val;
+    // const T tmp = *dest = val;
     //
     // Instead, put each assignment in its own statement.  This is
     // because the overload of T::operator= for volatile *this should
     // return void, not volatile T&.  See Kokkos #177:
     //
     // https://github.com/kokkos/kokkos/issues/177
-    *dest = val;
+    *dest       = val;
     const T tmp = *dest;
-    #ifndef KOKKOS_COMPILER_CLANG
-    (void) tmp;
-    #endif
+#ifndef KOKKOS_COMPILER_CLANG
+    (void)tmp;
+#endif
   }
-  Impl::unlock_address_host_space( (void*) dest );
+  Impl::unlock_address_host_space((void*)dest);
   return return_val;
 }
 //----------------------------------------------------------------------------
 
-#elif defined( KOKKOS_ENABLE_OPENMP_ATOMICS )
+#elif defined(KOKKOS_ENABLE_OPENMP_ATOMICS)
 
-template< typename T >
-KOKKOS_INLINE_FUNCTION
-T atomic_compare_exchange( volatile T * const dest, const T compare, const T val )
-{
+template <typename T>
+KOKKOS_INLINE_FUNCTION T atomic_compare_exchange(volatile T* const dest,
+                                                 const T compare, const T val) {
   T retval;
 #pragma omp critical
   {
     retval = dest[0];
-    if ( retval == compare )
-        dest[0] = val;
+    if (retval == compare) dest[0] = val;
   }
   return retval;
 }
 
-#elif defined( KOKKOS_ENABLE_SERIAL_ATOMICS )
+#elif defined(KOKKOS_ENABLE_SERIAL_ATOMICS)
 
-template< typename T >
-KOKKOS_INLINE_FUNCTION
-T atomic_compare_exchange( volatile T * const dest_v, const T compare, const T val )
-{
-  T* dest = const_cast<T*>(dest_v);
+template <typename T>
+KOKKOS_INLINE_FUNCTION T atomic_compare_exchange(volatile T* const dest_v,
+                                                 const T compare, const T val) {
+  T* dest  = const_cast<T*>(dest_v);
   T retval = *dest;
   if (retval == compare) *dest = val;
   return retval;
@@ -402,17 +393,15 @@ T atomic_compare_exchange( volatile T * const dest_v, const T compare, const T v
 
 #endif
 #endif
-#endif // !defined ROCM_ATOMICS
+#endif  // !defined ROCM_ATOMICS
 
 template <typename T>
-KOKKOS_INLINE_FUNCTION
-bool atomic_compare_exchange_strong(volatile T* const dest, const T compare, const T val)
-{
+KOKKOS_INLINE_FUNCTION bool atomic_compare_exchange_strong(
+    volatile T* const dest, const T compare, const T val) {
   return compare == atomic_compare_exchange(dest, compare, val);
 }
 //----------------------------------------------------------------------------
 
-} // namespace Kokkos
+}  // namespace Kokkos
 
 #endif
-
diff --git a/lib/kokkos/core/src/impl/Kokkos_Atomic_Decrement.hpp b/lib/kokkos/core/src/impl/Kokkos_Atomic_Decrement.hpp
index 0f3dc52fce..992ae3c005 100644
--- a/lib/kokkos/core/src/impl/Kokkos_Atomic_Decrement.hpp
+++ b/lib/kokkos/core/src/impl/Kokkos_Atomic_Decrement.hpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -41,12 +42,12 @@
 //@HEADER
 */
 
-#if defined( KOKKOS_ENABLE_RFO_PREFETCH )
+#if defined(KOKKOS_ENABLE_RFO_PREFETCH)
 #include <xmmintrin.h>
 #endif
 
 #include <Kokkos_Macros.hpp>
-#if defined( KOKKOS_ATOMIC_HPP) && ! defined( KOKKOS_ATOMIC_DECREMENT_HPP )
+#if defined(KOKKOS_ATOMIC_HPP) && !defined(KOKKOS_ATOMIC_DECREMENT_HPP)
 #define KOKKOS_ATOMIC_DECREMENT_HPP
 
 #include "impl/Kokkos_Atomic_Fetch_Sub.hpp"
@@ -54,20 +55,18 @@
 namespace Kokkos {
 
 // Atomic increment
-template<>
-KOKKOS_INLINE_FUNCTION
-void atomic_decrement<char>(volatile char* a) {
-#if defined( KOKKOS_ENABLE_ASM ) && defined( KOKKOS_ENABLE_ISA_X86_64 ) && ! defined(_WIN32) && ! defined(__CUDA_ARCH__)
-#if defined( KOKKOS_ENABLE_RFO_PREFETCH )
-  _mm_prefetch( (const char*) a, _MM_HINT_ET0 );
+template <>
+KOKKOS_INLINE_FUNCTION void atomic_decrement<char>(volatile char* a) {
+#if defined(KOKKOS_ENABLE_ASM) && defined(KOKKOS_ENABLE_ISA_X86_64) && \
+    !defined(_WIN32) && !defined(__CUDA_ARCH__)
+#if defined(KOKKOS_ENABLE_RFO_PREFETCH)
+  _mm_prefetch((const char*)a, _MM_HINT_ET0);
 #endif
-  __asm__ __volatile__(
-      "lock decb %0"
-      : /* no output registers */
-      : "m" (a[0])
-      : "memory"
-    );
-#elif defined( KOKKOS_ENABLE_SERIAL_ATOMICS )
+  __asm__ __volatile__("lock decb %0"
+                       : /* no output registers */
+                       : "m"(a[0])
+                       : "memory");
+#elif defined(KOKKOS_ENABLE_SERIAL_ATOMICS)
   char* a_nv = const_cast<char*>(a);
   --(*a_nv);
 #else
@@ -75,20 +74,18 @@ void atomic_decrement<char>(volatile char* a) {
 #endif
 }
 
-template<>
-KOKKOS_INLINE_FUNCTION
-void atomic_decrement<short>(volatile short* a) {
-#if defined( KOKKOS_ENABLE_ASM ) && defined( KOKKOS_ENABLE_ISA_X86_64 ) && ! defined(_WIN32) && ! defined(__CUDA_ARCH__)
-#if defined( KOKKOS_ENABLE_RFO_PREFETCH )
-  _mm_prefetch( (const char*) a, _MM_HINT_ET0 );
+template <>
+KOKKOS_INLINE_FUNCTION void atomic_decrement<short>(volatile short* a) {
+#if defined(KOKKOS_ENABLE_ASM) && defined(KOKKOS_ENABLE_ISA_X86_64) && \
+    !defined(_WIN32) && !defined(__CUDA_ARCH__)
+#if defined(KOKKOS_ENABLE_RFO_PREFETCH)
+  _mm_prefetch((const char*)a, _MM_HINT_ET0);
 #endif
-  __asm__ __volatile__(
-      "lock decw %0"
-      : /* no output registers */
-      : "m" (a[0])
-      : "memory"
-    );
-#elif defined( KOKKOS_ENABLE_SERIAL_ATOMICS )
+  __asm__ __volatile__("lock decw %0"
+                       : /* no output registers */
+                       : "m"(a[0])
+                       : "memory");
+#elif defined(KOKKOS_ENABLE_SERIAL_ATOMICS)
   short* a_nv = const_cast<short*>(a);
   --(*a_nv);
 #else
@@ -96,20 +93,18 @@ void atomic_decrement<short>(volatile short* a) {
 #endif
 }
 
-template<>
-KOKKOS_INLINE_FUNCTION
-void atomic_decrement<int>(volatile int* a) {
-#if defined( KOKKOS_ENABLE_ASM ) && defined( KOKKOS_ENABLE_ISA_X86_64 ) && ! defined(_WIN32) && ! defined(__CUDA_ARCH__)
-#if defined( KOKKOS_ENABLE_RFO_PREFETCH )
-  _mm_prefetch( (const char*) a, _MM_HINT_ET0 );
+template <>
+KOKKOS_INLINE_FUNCTION void atomic_decrement<int>(volatile int* a) {
+#if defined(KOKKOS_ENABLE_ASM) && defined(KOKKOS_ENABLE_ISA_X86_64) && \
+    !defined(_WIN32) && !defined(__CUDA_ARCH__)
+#if defined(KOKKOS_ENABLE_RFO_PREFETCH)
+  _mm_prefetch((const char*)a, _MM_HINT_ET0);
 #endif
-  __asm__ __volatile__(
-      "lock decl %0"
-      : /* no output registers */
-      : "m" (a[0])
-      : "memory"
-    );
-#elif defined( KOKKOS_ENABLE_SERIAL_ATOMICS )
+  __asm__ __volatile__("lock decl %0"
+                       : /* no output registers */
+                       : "m"(a[0])
+                       : "memory");
+#elif defined(KOKKOS_ENABLE_SERIAL_ATOMICS)
   int* a_nv = const_cast<int*>(a);
   --(*a_nv);
 #else
@@ -117,20 +112,19 @@ void atomic_decrement<int>(volatile int* a) {
 #endif
 }
 
-template<>
-KOKKOS_INLINE_FUNCTION
-void atomic_decrement<long long int>(volatile long long int* a) {
-#if defined( KOKKOS_ENABLE_ASM ) && defined( KOKKOS_ENABLE_ISA_X86_64 ) && ! defined(_WIN32) && ! defined(__CUDA_ARCH__)
-#if defined( KOKKOS_ENABLE_RFO_PREFETCH )
-  _mm_prefetch( (const char*) a, _MM_HINT_ET0 );
+template <>
+KOKKOS_INLINE_FUNCTION void atomic_decrement<long long int>(
+    volatile long long int* a) {
+#if defined(KOKKOS_ENABLE_ASM) && defined(KOKKOS_ENABLE_ISA_X86_64) && \
+    !defined(_WIN32) && !defined(__CUDA_ARCH__)
+#if defined(KOKKOS_ENABLE_RFO_PREFETCH)
+  _mm_prefetch((const char*)a, _MM_HINT_ET0);
 #endif
-  __asm__ __volatile__(
-      "lock decq %0"
-      : /* no output registers */
-      : "m" (a[0])
-      : "memory"
-    );
-#elif defined( KOKKOS_ENABLE_SERIAL_ATOMICS )
+  __asm__ __volatile__("lock decq %0"
+                       : /* no output registers */
+                       : "m"(a[0])
+                       : "memory");
+#elif defined(KOKKOS_ENABLE_SERIAL_ATOMICS)
   long long int* a_nv = const_cast<long long int*>(a);
   --(*a_nv);
 #else
@@ -139,10 +133,9 @@ void atomic_decrement<long long int>(volatile long long int* a) {
 #endif
 }
 
-template<typename T>
-KOKKOS_INLINE_FUNCTION
-void atomic_decrement(volatile T* a) {
-#if defined( KOKKOS_ENABLE_SERIAL_ATOMICS )
+template <typename T>
+KOKKOS_INLINE_FUNCTION void atomic_decrement(volatile T* a) {
+#if defined(KOKKOS_ENABLE_SERIAL_ATOMICS)
   T* a_nv = const_cast<T*>(a);
   --(*a_nv);
 #else
@@ -150,6 +143,5 @@ void atomic_decrement(volatile T* a) {
 #endif
 }
 
-} // End of namespace Kokkos
+}  // End of namespace Kokkos
 #endif
-
diff --git a/lib/kokkos/core/src/impl/Kokkos_Atomic_Exchange.hpp b/lib/kokkos/core/src/impl/Kokkos_Atomic_Exchange.hpp
index 6ccf35816b..37aebf9a3d 100644
--- a/lib/kokkos/core/src/impl/Kokkos_Atomic_Exchange.hpp
+++ b/lib/kokkos/core/src/impl/Kokkos_Atomic_Exchange.hpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -41,113 +42,106 @@
 //@HEADER
 */
 
-#if defined( KOKKOS_ENABLE_RFO_PREFETCH )
+#if defined(KOKKOS_ENABLE_RFO_PREFETCH)
 #include <xmmintrin.h>
 #endif
 
 #include <Kokkos_Macros.hpp>
-#if defined( KOKKOS_ATOMIC_HPP ) && ! defined( KOKKOS_ATOMIC_EXCHANGE_HPP )
+#if defined(KOKKOS_ATOMIC_HPP) && !defined(KOKKOS_ATOMIC_EXCHANGE_HPP)
 #define KOKKOS_ATOMIC_EXCHANGE_HPP
 
 #if defined(KOKKOS_ENABLE_CUDA)
-#include<Cuda/Kokkos_Cuda_Version_9_8_Compatibility.hpp>
+#include <Cuda/Kokkos_Cuda_Version_9_8_Compatibility.hpp>
 #endif
 
 namespace Kokkos {
 
 //----------------------------------------------------------------------------
 
-#if defined( KOKKOS_ENABLE_CUDA )
+#if defined(KOKKOS_ENABLE_CUDA)
 #if defined(__CUDA_ARCH__) || defined(KOKKOS_IMPL_CUDA_CLANG_WORKAROUND)
 
-__inline__ __device__
-int atomic_exchange( volatile int * const dest , const int val )
-{
+__inline__ __device__ int atomic_exchange(volatile int* const dest,
+                                          const int val) {
   // return __iAtomicExch( (int*) dest , val );
-  return atomicExch( (int*) dest , val );
+  return atomicExch((int*)dest, val);
 }
 
-__inline__ __device__
-unsigned int atomic_exchange( volatile unsigned int * const dest , const unsigned int val )
-{
+__inline__ __device__ unsigned int atomic_exchange(
+    volatile unsigned int* const dest, const unsigned int val) {
   // return __uAtomicExch( (unsigned int*) dest , val );
-  return atomicExch( (unsigned int*) dest , val );
+  return atomicExch((unsigned int*)dest, val);
 }
 
-__inline__ __device__
-unsigned long long int atomic_exchange( volatile unsigned long long int * const dest , const unsigned long long int val )
-{
+__inline__ __device__ unsigned long long int atomic_exchange(
+    volatile unsigned long long int* const dest,
+    const unsigned long long int val) {
   // return __ullAtomicExch( (unsigned long long*) dest , val );
-  return atomicExch( (unsigned long long*) dest , val );
+  return atomicExch((unsigned long long*)dest, val);
 }
 
 /** \brief  Atomic exchange for any type with compatible size */
-template< typename T >
-__inline__ __device__
-T atomic_exchange(
-  volatile T * const dest ,
-  typename Kokkos::Impl::enable_if< sizeof(T) == sizeof(int) , const T & >::type val )
-{
+template <typename T>
+__inline__ __device__ T atomic_exchange(
+    volatile T* const dest,
+    typename Kokkos::Impl::enable_if<sizeof(T) == sizeof(int), const T&>::type
+        val) {
   // int tmp = __ullAtomicExch( (int*) dest , *((int*)&val) );
-#if defined( KOKKOS_ENABLE_RFO_PREFETCH )
-  _mm_prefetch( (const char*) dest, _MM_HINT_ET0 );
+#if defined(KOKKOS_ENABLE_RFO_PREFETCH)
+  _mm_prefetch((const char*)dest, _MM_HINT_ET0);
 #endif
 
-  int tmp = atomicExch( ((int*)dest) , *((int*)&val) );
+  int tmp = atomicExch(((int*)dest), *((int*)&val));
   return *((T*)&tmp);
 }
 
-template< typename T >
-__inline__ __device__
-T atomic_exchange(
-  volatile T * const dest ,
-  typename Kokkos::Impl::enable_if< sizeof(T) != sizeof(int) &&
-                                    sizeof(T) == sizeof(unsigned long long int) , const T & >::type val )
-{
-  typedef unsigned long long int type ;
+template <typename T>
+__inline__ __device__ T atomic_exchange(
+    volatile T* const dest,
+    typename Kokkos::Impl::enable_if<
+        sizeof(T) != sizeof(int) && sizeof(T) == sizeof(unsigned long long int),
+        const T&>::type val) {
+  typedef unsigned long long int type;
 
-#if defined( KOKKOS_ENABLE_RFO_PREFETCH )
-  _mm_prefetch( (const char*) dest, _MM_HINT_ET0 );
+#if defined(KOKKOS_ENABLE_RFO_PREFETCH)
+  _mm_prefetch((const char*)dest, _MM_HINT_ET0);
 #endif
 
   // type tmp = __ullAtomicExch( (type*) dest , *((type*)&val) );
-  type tmp = atomicExch( ((type*)dest) , *((type*)&val) );
+  type tmp = atomicExch(((type*)dest), *((type*)&val));
   return *((T*)&tmp);
 }
 
-template < typename T >
-__inline__ __device__
-T atomic_exchange( volatile T * const dest ,
-    typename Kokkos::Impl::enable_if<
-                  ( sizeof(T) != 4 )
-               && ( sizeof(T) != 8 )
-             , const T >::type& val )
-{
+template <typename T>
+__inline__ __device__ T atomic_exchange(
+    volatile T* const dest,
+    typename Kokkos::Impl::enable_if<(sizeof(T) != 4) && (sizeof(T) != 8),
+                                     const T>::type& val) {
   T return_val;
   // This is a way to (hopefully) avoid dead lock in a warp
-#if defined( KOKKOS_ENABLE_RFO_PREFETCH )
-  _mm_prefetch( (const char*) dest, _MM_HINT_ET0 );
+#if defined(KOKKOS_ENABLE_RFO_PREFETCH)
+  _mm_prefetch((const char*)dest, _MM_HINT_ET0);
 #endif
 
   int done = 0;
 #ifdef KOKKOS_IMPL_CUDA_SYNCWARP_NEEDS_MASK
-  unsigned int mask = KOKKOS_IMPL_CUDA_ACTIVEMASK;
-  unsigned int active = KOKKOS_IMPL_CUDA_BALLOT_MASK(mask,1);
+  unsigned int mask   = KOKKOS_IMPL_CUDA_ACTIVEMASK;
+  unsigned int active = KOKKOS_IMPL_CUDA_BALLOT_MASK(mask, 1);
 #else
   unsigned int active = KOKKOS_IMPL_CUDA_BALLOT(1);
 #endif
   unsigned int done_active = 0;
-  while (active!=done_active) {
-    if(!done) {
-      if( Impl::lock_address_cuda_space( (void*) dest ) ) {
+  while (active != done_active) {
+    if (!done) {
+      if (Impl::lock_address_cuda_space((void*)dest)) {
         return_val = *dest;
-        *dest = val;
-        Impl::unlock_address_cuda_space( (void*) dest );
+        *dest      = val;
+        Impl::unlock_address_cuda_space((void*)dest);
         done = 1;
       }
     }
 #ifdef KOKKOS_IMPL_CUDA_SYNCWARP_NEEDS_MASK
-    done_active = KOKKOS_IMPL_CUDA_BALLOT_MASK(mask,done);
+    done_active = KOKKOS_IMPL_CUDA_BALLOT_MASK(mask, done);
 #else
     done_active = KOKKOS_IMPL_CUDA_BALLOT(done);
 #endif
@@ -155,37 +149,33 @@ T atomic_exchange( volatile T * const dest ,
   return return_val;
 }
 /** \brief  Atomic exchange for any type with compatible size */
-template< typename T >
-__inline__ __device__
-void atomic_assign(
-  volatile T * const dest ,
-  typename Kokkos::Impl::enable_if< sizeof(T) == sizeof(int) , const T & >::type val )
-{
+template <typename T>
+__inline__ __device__ void atomic_assign(
+    volatile T* const dest,
+    typename Kokkos::Impl::enable_if<sizeof(T) == sizeof(int), const T&>::type
+        val) {
   // (void) __ullAtomicExch( (int*) dest , *((int*)&val) );
-  (void) atomicExch( ((int*)dest) , *((int*)&val) );
+  (void)atomicExch(((int*)dest), *((int*)&val));
 }
 
-template< typename T >
-__inline__ __device__
-void atomic_assign(
-  volatile T * const dest ,
-  typename Kokkos::Impl::enable_if< sizeof(T) != sizeof(int) &&
-                                    sizeof(T) == sizeof(unsigned long long int) , const T & >::type val )
-{
-  typedef unsigned long long int type ;
+template <typename T>
+__inline__ __device__ void atomic_assign(
+    volatile T* const dest,
+    typename Kokkos::Impl::enable_if<
+        sizeof(T) != sizeof(int) && sizeof(T) == sizeof(unsigned long long int),
+        const T&>::type val) {
+  typedef unsigned long long int type;
   // (void) __ullAtomicExch( (type*) dest , *((type*)&val) );
-  (void) atomicExch( ((type*)dest) , *((type*)&val) );
+  (void)atomicExch(((type*)dest), *((type*)&val));
 }
 
-template< typename T >
-__inline__ __device__
-void atomic_assign(
-  volatile T * const dest ,
-  typename Kokkos::Impl::enable_if< sizeof(T) != sizeof(int) &&
-                                    sizeof(T) != sizeof(unsigned long long int)
-                                  , const T & >::type val )
-{
-  (void) atomic_exchange(dest,val);
+template <typename T>
+__inline__ __device__ void atomic_assign(
+    volatile T* const dest,
+    typename Kokkos::Impl::enable_if<
+        sizeof(T) != sizeof(int) && sizeof(T) != sizeof(unsigned long long int),
+        const T&>::type val) {
+  (void)atomic_exchange(dest, val);
 }
 
 #endif
@@ -196,167 +186,167 @@ void atomic_assign(
 #if !defined(__CUDA_ARCH__) || defined(KOKKOS_IMPL_CUDA_CLANG_WORKAROUND)
 #if defined(KOKKOS_ENABLE_GNU_ATOMICS) || defined(KOKKOS_ENABLE_INTEL_ATOMICS)
 
-template< typename T >
-inline
-T atomic_exchange( volatile T * const dest ,
-  typename Kokkos::Impl::enable_if< sizeof(T) == sizeof(int) || sizeof(T) == sizeof(long)
-                                  , const T & >::type val )
-{
-  typedef typename Kokkos::Impl::if_c< sizeof(T) == sizeof(int) , int , long >::type type ;
-#if defined( KOKKOS_ENABLE_RFO_PREFETCH )
-  _mm_prefetch( (const char*) dest, _MM_HINT_ET0 );
+template <typename T>
+inline T atomic_exchange(
+    volatile T* const dest,
+    typename Kokkos::Impl::enable_if<sizeof(T) == sizeof(int) ||
+                                         sizeof(T) == sizeof(long),
+                                     const T&>::type val) {
+  typedef typename Kokkos::Impl::if_c<sizeof(T) == sizeof(int), int, long>::type
+      type;
+#if defined(KOKKOS_ENABLE_RFO_PREFETCH)
+  _mm_prefetch((const char*)dest, _MM_HINT_ET0);
 #endif
 
-  const type v = *((type*)&val); // Extract to be sure the value doesn't change
+  const type v = *((type*)&val);  // Extract to be sure the value doesn't change
 
-  type assumed ;
+  type assumed;
 
   union U {
-    T val_T ;
-    type val_type ;
-    inline U() {};
-  } old ;
+    T val_T;
+    type val_type;
+    inline U(){};
+  } old;
 
-  old.val_T = *dest ;
+  old.val_T = *dest;
 
   do {
-    assumed = old.val_type ;
-    old.val_type = __sync_val_compare_and_swap( (volatile type *) dest , assumed , v );
-  } while ( assumed != old.val_type );
+    assumed = old.val_type;
+    old.val_type =
+        __sync_val_compare_and_swap((volatile type*)dest, assumed, v);
+  } while (assumed != old.val_type);
 
-  return old.val_T ;
+  return old.val_T;
 }
 
-#if defined(KOKKOS_ENABLE_ASM) && defined ( KOKKOS_ENABLE_ISA_X86_64 )
-template< typename T >
-inline
-T atomic_exchange( volatile T * const dest ,
-  typename Kokkos::Impl::enable_if< sizeof(T) == sizeof(Impl::cas128_t)
-                                  , const T & >::type val )
-{
-#if defined( KOKKOS_ENABLE_RFO_PREFETCH )
-  _mm_prefetch( (const char*) dest, _MM_HINT_ET0 );
+#if defined(KOKKOS_ENABLE_ASM) && defined(KOKKOS_ENABLE_ISA_X86_64)
+template <typename T>
+inline T atomic_exchange(
+    volatile T* const dest,
+    typename Kokkos::Impl::enable_if<sizeof(T) == sizeof(Impl::cas128_t),
+                                     const T&>::type val) {
+#if defined(KOKKOS_ENABLE_RFO_PREFETCH)
+  _mm_prefetch((const char*)dest, _MM_HINT_ET0);
 #endif
 
   union U {
-    Impl::cas128_t i ;
-    T t ;
-    inline U() {};
-  } assume , oldval , newval ;
+    Impl::cas128_t i;
+    T t;
+    inline U(){};
+  } assume, oldval, newval;
 
-  oldval.t = *dest ;
+  oldval.t = *dest;
   newval.t = val;
 
   do {
-    assume.i = oldval.i ;
-    oldval.i = Impl::cas128( (volatile Impl::cas128_t*) dest , assume.i , newval.i );
-  } while ( assume.i != oldval.i );
+    assume.i = oldval.i;
+    oldval.i = Impl::cas128((volatile Impl::cas128_t*)dest, assume.i, newval.i);
+  } while (assume.i != oldval.i);
 
-  return oldval.t ;
+  return oldval.t;
 }
 #endif
 
 //----------------------------------------------------------------------------
 
-template < typename T >
-inline
-T atomic_exchange( volatile T * const dest ,
-    typename Kokkos::Impl::enable_if<
-                  ( sizeof(T) != 4 )
-               && ( sizeof(T) != 8 )
-              #if defined(KOKKOS_ENABLE_ASM) && defined ( KOKKOS_ENABLE_ISA_X86_64 )
-               && ( sizeof(T) != 16 )
-              #endif
-                 , const T >::type& val )
-{
-  while( !Impl::lock_address_host_space( (void*) dest ) );
+template <typename T>
+inline T atomic_exchange(
+    volatile T* const dest,
+    typename Kokkos::Impl::enable_if<(sizeof(T) != 4) && (sizeof(T) != 8)
+#if defined(KOKKOS_ENABLE_ASM) && defined(KOKKOS_ENABLE_ISA_X86_64)
+                                         && (sizeof(T) != 16)
+#endif
+                                         ,
+                                     const T>::type& val) {
+  while (!Impl::lock_address_host_space((void*)dest))
+    ;
   T return_val = *dest;
   // Don't use the following line of code here:
   //
-  //const T tmp = *dest = val;
+  // const T tmp = *dest = val;
   //
   // Instead, put each assignment in its own statement.  This is
   // because the overload of T::operator= for volatile *this should
   // return void, not volatile T&.  See Kokkos #177:
   //
   // https://github.com/kokkos/kokkos/issues/177
-  *dest = val;
+  *dest       = val;
   const T tmp = *dest;
-  #ifndef KOKKOS_COMPILER_CLANG
-  (void) tmp;
-  #endif
-  Impl::unlock_address_host_space( (void*) dest );
+#ifndef KOKKOS_COMPILER_CLANG
+  (void)tmp;
+#endif
+  Impl::unlock_address_host_space((void*)dest);
   return return_val;
 }
 
-template< typename T >
-inline
-void atomic_assign( volatile T * const dest ,
-  typename Kokkos::Impl::enable_if< sizeof(T) == sizeof(int) || sizeof(T) == sizeof(long)
-                                  , const T & >::type val )
-{
-  typedef typename Kokkos::Impl::if_c< sizeof(T) == sizeof(int) , int , long >::type type ;
+template <typename T>
+inline void atomic_assign(
+    volatile T* const dest,
+    typename Kokkos::Impl::enable_if<sizeof(T) == sizeof(int) ||
+                                         sizeof(T) == sizeof(long),
+                                     const T&>::type val) {
+  typedef typename Kokkos::Impl::if_c<sizeof(T) == sizeof(int), int, long>::type
+      type;
 
-#if defined( KOKKOS_ENABLE_RFO_PREFETCH )
-  _mm_prefetch( (const char*) dest, _MM_HINT_ET0 );
+#if defined(KOKKOS_ENABLE_RFO_PREFETCH)
+  _mm_prefetch((const char*)dest, _MM_HINT_ET0);
 #endif
 
-  const type v = *((type*)&val); // Extract to be sure the value doesn't change
+  const type v = *((type*)&val);  // Extract to be sure the value doesn't change
 
-  type assumed ;
+  type assumed;
 
   union U {
-    T val_T ;
-    type val_type ;
-    inline U() {};
-  } old ;
+    T val_T;
+    type val_type;
+    inline U(){};
+  } old;
 
-  old.val_T = *dest ;
+  old.val_T = *dest;
 
   do {
-    assumed = old.val_type ;
-    old.val_type = __sync_val_compare_and_swap( (volatile type *) dest , assumed , v );
-  } while ( assumed != old.val_type );
+    assumed = old.val_type;
+    old.val_type =
+        __sync_val_compare_and_swap((volatile type*)dest, assumed, v);
+  } while (assumed != old.val_type);
 }
 
-#if defined( KOKKOS_ENABLE_ASM ) && defined ( KOKKOS_ENABLE_ISA_X86_64 )
-template< typename T >
-inline
-void atomic_assign( volatile T * const dest ,
-  typename Kokkos::Impl::enable_if< sizeof(T) == sizeof(Impl::cas128_t)
-                                  , const T & >::type val )
-{
-#if defined( KOKKOS_ENABLE_RFO_PREFETCH )
-  _mm_prefetch( (const char*) dest, _MM_HINT_ET0 );
+#if defined(KOKKOS_ENABLE_ASM) && defined(KOKKOS_ENABLE_ISA_X86_64)
+template <typename T>
+inline void atomic_assign(
+    volatile T* const dest,
+    typename Kokkos::Impl::enable_if<sizeof(T) == sizeof(Impl::cas128_t),
+                                     const T&>::type val) {
+#if defined(KOKKOS_ENABLE_RFO_PREFETCH)
+  _mm_prefetch((const char*)dest, _MM_HINT_ET0);
 #endif
 
   union U {
-    Impl::cas128_t i ;
-    T t ;
-    inline U() {};
-  } assume , oldval , newval ;
+    Impl::cas128_t i;
+    T t;
+    inline U(){};
+  } assume, oldval, newval;
 
-  oldval.t = *dest ;
+  oldval.t = *dest;
   newval.t = val;
   do {
-    assume.i = oldval.i ;
-    oldval.i = Impl::cas128( (volatile Impl::cas128_t*) dest , assume.i , newval.i);
-  } while ( assume.i != oldval.i );
+    assume.i = oldval.i;
+    oldval.i = Impl::cas128((volatile Impl::cas128_t*)dest, assume.i, newval.i);
+  } while (assume.i != oldval.i);
 }
 #endif
 
-template < typename T >
-inline
-void atomic_assign( volatile T * const dest ,
-    typename Kokkos::Impl::enable_if<
-                  ( sizeof(T) != 4 )
-               && ( sizeof(T) != 8 )
-              #if defined(KOKKOS_ENABLE_ASM) && defined ( KOKKOS_ENABLE_ISA_X86_64 )
-               && ( sizeof(T) != 16 )
-              #endif
-                 , const T >::type& val )
-{
-  while( !Impl::lock_address_host_space( (void*) dest ) );
+template <typename T>
+inline void atomic_assign(
+    volatile T* const dest,
+    typename Kokkos::Impl::enable_if<(sizeof(T) != 4) && (sizeof(T) != 8)
+#if defined(KOKKOS_ENABLE_ASM) && defined(KOKKOS_ENABLE_ISA_X86_64)
+                                         && (sizeof(T) != 16)
+#endif
+                                         ,
+                                     const T>::type& val) {
+  while (!Impl::lock_address_host_space((void*)dest))
+    ;
   // This is likely an aggregate type with a defined
   // 'volatile T & operator = ( const T & ) volatile'
   // member.  The volatile return value implicitly defines a
@@ -365,55 +355,45 @@ void atomic_assign( volatile T * const dest ,
   //(void)( *dest = val );
   *dest = val;
 
-  Impl::unlock_address_host_space( (void*) dest );
+  Impl::unlock_address_host_space((void*)dest);
 }
 //----------------------------------------------------------------------------
 
-#elif defined( KOKKOS_ENABLE_OPENMP_ATOMICS )
+#elif defined(KOKKOS_ENABLE_OPENMP_ATOMICS)
 
-template < typename T >
-inline
-T atomic_exchange( volatile T * const dest , const T val )
-{
+template <typename T>
+inline T atomic_exchange(volatile T* const dest, const T val) {
   T retval;
-//#pragma omp atomic capture
-  #pragma omp critical
+  //#pragma omp atomic capture
+#pragma omp critical
   {
-    retval = dest[0];
+    retval  = dest[0];
     dest[0] = val;
   }
   return retval;
 }
 
-template < typename T >
-inline
-void atomic_assign( volatile T * const dest , const T val )
-{
-//#pragma omp atomic
-  #pragma omp critical
-  {
-    dest[0] = val;
-  }
+template <typename T>
+inline void atomic_assign(volatile T* const dest, const T val) {
+  //#pragma omp atomic
+#pragma omp critical
+  { dest[0] = val; }
 }
 
-#elif defined( KOKKOS_ENABLE_SERIAL_ATOMICS )
+#elif defined(KOKKOS_ENABLE_SERIAL_ATOMICS)
 
-template < typename T >
-inline
-T atomic_exchange( volatile T * const dest_v , const T val )
-{
-  T* dest = const_cast<T*>(dest_v);
+template <typename T>
+inline T atomic_exchange(volatile T* const dest_v, const T val) {
+  T* dest  = const_cast<T*>(dest_v);
   T retval = *dest;
-  *dest = val;
+  *dest    = val;
   return retval;
 }
 
-template < typename T >
-inline
-void atomic_assign( volatile T * const dest_v , const T val )
-{
+template <typename T>
+inline void atomic_assign(volatile T* const dest_v, const T val) {
   T* dest = const_cast<T*>(dest_v);
-  *dest = val;
+  *dest   = val;
 }
 
 #endif
@@ -422,20 +402,16 @@ void atomic_assign( volatile T * const dest_v , const T val )
 // dummy for non-CUDA Kokkos headers being processed by NVCC
 #if defined(__CUDA_ARCH__) && !defined(KOKKOS_ENABLE_CUDA)
 template <typename T>
-__inline__ __device__
-T atomic_exchange(volatile T * const, const Kokkos::Impl::identity_t<T>)
-{
+__inline__ __device__ T atomic_exchange(volatile T* const,
+                                        const Kokkos::Impl::identity_t<T>) {
   return T();
 }
 
-template < typename T >
-__inline__ __device__
-void atomic_assign(volatile T * const, const Kokkos::Impl::identity_t<T>)
-{
-}
+template <typename T>
+__inline__ __device__ void atomic_assign(volatile T* const,
+                                         const Kokkos::Impl::identity_t<T>) {}
 #endif
 
-} // namespace Kokkos
+}  // namespace Kokkos
 
 #endif
-
diff --git a/lib/kokkos/core/src/impl/Kokkos_Atomic_Fetch_Add.hpp b/lib/kokkos/core/src/impl/Kokkos_Atomic_Fetch_Add.hpp
index 495fd48477..58277740da 100644
--- a/lib/kokkos/core/src/impl/Kokkos_Atomic_Fetch_Add.hpp
+++ b/lib/kokkos/core/src/impl/Kokkos_Atomic_Fetch_Add.hpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -41,132 +42,134 @@
 //@HEADER
 */
 
-#if defined( KOKKOS_ENABLE_RFO_PREFETCH )
+#if defined(KOKKOS_ENABLE_RFO_PREFETCH)
 #include <xmmintrin.h>
 #endif
 
 #include <Kokkos_Macros.hpp>
-#if defined( KOKKOS_ATOMIC_HPP ) && ! defined( KOKKOS_ATOMIC_FETCH_ADD_HPP )
+#if defined(KOKKOS_ATOMIC_HPP) && !defined(KOKKOS_ATOMIC_FETCH_ADD_HPP)
 #define KOKKOS_ATOMIC_FETCH_ADD_HPP
 
 #if defined(KOKKOS_ENABLE_CUDA)
-#include<Cuda/Kokkos_Cuda_Version_9_8_Compatibility.hpp>
+#include <Cuda/Kokkos_Cuda_Version_9_8_Compatibility.hpp>
 #endif
 
 namespace Kokkos {
 
 //----------------------------------------------------------------------------
 
-#if defined( KOKKOS_ENABLE_CUDA )
+#if defined(KOKKOS_ENABLE_CUDA)
 #if defined(__CUDA_ARCH__) || defined(KOKKOS_IMPL_CUDA_CLANG_WORKAROUND)
 
 // Support for int, unsigned int, unsigned long long int, and float
 
-__inline__ __device__
-int atomic_fetch_add( volatile int * const dest , const int val )
-{ return atomicAdd((int*)dest,val); }
+__inline__ __device__ int atomic_fetch_add(volatile int* const dest,
+                                           const int val) {
+  return atomicAdd((int*)dest, val);
+}
 
-__inline__ __device__
-unsigned int atomic_fetch_add( volatile unsigned int * const dest , const unsigned int val )
-{ return atomicAdd((unsigned int*)dest,val); }
+__inline__ __device__ unsigned int atomic_fetch_add(
+    volatile unsigned int* const dest, const unsigned int val) {
+  return atomicAdd((unsigned int*)dest, val);
+}
 
-__inline__ __device__
-unsigned long long int atomic_fetch_add( volatile unsigned long long int * const dest ,
-                                         const unsigned long long int val )
-{ return atomicAdd((unsigned long long int*)dest,val); }
+__inline__ __device__ unsigned long long int atomic_fetch_add(
+    volatile unsigned long long int* const dest,
+    const unsigned long long int val) {
+  return atomicAdd((unsigned long long int*)dest, val);
+}
 
-__inline__ __device__
-float atomic_fetch_add( volatile float * const dest , const float val )
-{ return atomicAdd((float*)dest,val); }
+__inline__ __device__ float atomic_fetch_add(volatile float* const dest,
+                                             const float val) {
+  return atomicAdd((float*)dest, val);
+}
 
-#if ( 600 <= __CUDA_ARCH__ )
-__inline__ __device__
-double atomic_fetch_add( volatile double * const dest , const double val )
-{ return atomicAdd((double*)dest,val); }
+#if (600 <= __CUDA_ARCH__)
+__inline__ __device__ double atomic_fetch_add(volatile double* const dest,
+                                              const double val) {
+  return atomicAdd((double*)dest, val);
+}
 #endif
 
-template < typename T >
-__inline__ __device__
-T atomic_fetch_add( volatile T * const dest ,
-  typename Kokkos::Impl::enable_if< sizeof(T) == sizeof(int) , const T >::type val )
-{
+template <typename T>
+__inline__ __device__ T atomic_fetch_add(
+    volatile T* const dest,
+    typename Kokkos::Impl::enable_if<sizeof(T) == sizeof(int), const T>::type
+        val) {
   // to work around a bug in the clang cuda compiler, the name here needs to be
   // different from the one internal to the other overloads
   union U1 {
-    int i ;
-    T t ;
-    KOKKOS_INLINE_FUNCTION U1() {};
-  } assume , oldval , newval ;
+    int i;
+    T t;
+    KOKKOS_INLINE_FUNCTION U1(){};
+  } assume, oldval, newval;
 
-  oldval.t = *dest ;
+  oldval.t = *dest;
 
   do {
-    assume.i = oldval.i ;
-    newval.t = assume.t + val ;
-    oldval.i = atomicCAS( (int*)dest , assume.i , newval.i );
-  } while ( assume.i != oldval.i );
+    assume.i = oldval.i;
+    newval.t = assume.t + val;
+    oldval.i = atomicCAS((int*)dest, assume.i, newval.i);
+  } while (assume.i != oldval.i);
 
-  return oldval.t ;
+  return oldval.t;
 }
 
-template < typename T >
-__inline__ __device__
-T atomic_fetch_add( volatile T * const dest ,
-  typename Kokkos::Impl::enable_if< sizeof(T) != sizeof(int) &&
-                                    sizeof(T) == sizeof(unsigned long long int) , const T >::type val )
-{
+template <typename T>
+__inline__ __device__ T atomic_fetch_add(
+    volatile T* const dest,
+    typename Kokkos::Impl::enable_if<
+        sizeof(T) != sizeof(int) && sizeof(T) == sizeof(unsigned long long int),
+        const T>::type val) {
   // to work around a bug in the clang cuda compiler, the name here needs to be
   // different from the one internal to the other overloads
   union U2 {
-    unsigned long long int i ;
-    T t ;
-    KOKKOS_INLINE_FUNCTION U2() {};
-  } assume , oldval , newval ;
+    unsigned long long int i;
+    T t;
+    KOKKOS_INLINE_FUNCTION U2(){};
+  } assume, oldval, newval;
 
-  oldval.t = *dest ;
+  oldval.t = *dest;
 
   do {
-    assume.i = oldval.i ;
-    newval.t = assume.t + val ;
-    oldval.i = atomicCAS( (unsigned long long int*)dest , assume.i , newval.i );
-  } while ( assume.i != oldval.i );
+    assume.i = oldval.i;
+    newval.t = assume.t + val;
+    oldval.i = atomicCAS((unsigned long long int*)dest, assume.i, newval.i);
+  } while (assume.i != oldval.i);
 
-  return oldval.t ;
+  return oldval.t;
 }
 
 //----------------------------------------------------------------------------
 
-template < typename T >
-__inline__ __device__
-T atomic_fetch_add( volatile T * const dest ,
-    typename Kokkos::Impl::enable_if<
-                  ( sizeof(T) != 4 )
-               && ( sizeof(T) != 8 )
-             , const T >::type& val )
-{
+template <typename T>
+__inline__ __device__ T atomic_fetch_add(
+    volatile T* const dest,
+    typename Kokkos::Impl::enable_if<(sizeof(T) != 4) && (sizeof(T) != 8),
+                                     const T>::type& val) {
   T return_val;
   // This is a way to (hopefully) avoid dead lock in a warp
   int done = 0;
 #ifdef KOKKOS_IMPL_CUDA_SYNCWARP_NEEDS_MASK
-  unsigned int mask = KOKKOS_IMPL_CUDA_ACTIVEMASK;
-  unsigned int active = KOKKOS_IMPL_CUDA_BALLOT_MASK(mask,1);
+  unsigned int mask   = KOKKOS_IMPL_CUDA_ACTIVEMASK;
+  unsigned int active = KOKKOS_IMPL_CUDA_BALLOT_MASK(mask, 1);
 #else
   unsigned int active = KOKKOS_IMPL_CUDA_BALLOT(1);
 #endif
   unsigned int done_active = 0;
-  while (active!=done_active) {
-    if(!done) {
-      bool locked = Impl::lock_address_cuda_space( (void*) dest );
-      if( locked ) {
+  while (active != done_active) {
+    if (!done) {
+      bool locked = Impl::lock_address_cuda_space((void*)dest);
+      if (locked) {
         return_val = *dest;
-        *dest = return_val + val;
-        Impl::unlock_address_cuda_space( (void*) dest );
+        *dest      = return_val + val;
+        Impl::unlock_address_cuda_space((void*)dest);
         done = 1;
       }
     }
 
 #ifdef KOKKOS_IMPL_CUDA_SYNCWARP_NEEDS_MASK
-    done_active = KOKKOS_IMPL_CUDA_BALLOT_MASK(mask,done);
+    done_active = KOKKOS_IMPL_CUDA_BALLOT_MASK(mask, done);
 #else
     done_active = KOKKOS_IMPL_CUDA_BALLOT(done);
 #endif
@@ -180,189 +183,179 @@ T atomic_fetch_add( volatile T * const dest ,
 #if !defined(__CUDA_ARCH__) || defined(KOKKOS_IMPL_CUDA_CLANG_WORKAROUND)
 #if defined(KOKKOS_ENABLE_GNU_ATOMICS) || defined(KOKKOS_ENABLE_INTEL_ATOMICS)
 
-#if defined( KOKKOS_ENABLE_ASM ) && (defined(KOKKOS_ENABLE_ISA_X86_64) || defined(KOKKOS_KNL_USE_ASM_WORKAROUND))
-inline
-int atomic_fetch_add( volatile int * dest , const int val )
-{
-#if defined( KOKKOS_ENABLE_RFO_PREFETCH ) 
-  _mm_prefetch( (const char*) dest, _MM_HINT_ET0 );
+#if defined(KOKKOS_ENABLE_ASM) && (defined(KOKKOS_ENABLE_ISA_X86_64) || \
+                                   defined(KOKKOS_KNL_USE_ASM_WORKAROUND))
+inline int atomic_fetch_add(volatile int* dest, const int val) {
+#if defined(KOKKOS_ENABLE_RFO_PREFETCH)
+  _mm_prefetch((const char*)dest, _MM_HINT_ET0);
 #endif
 
   int original = val;
 
-  __asm__ __volatile__(
-  	"lock xadd %1, %0"
-        : "+m" (*dest), "+r" (original)
-        : "m" (*dest), "r" (original)
-        : "memory"
-        );
+  __asm__ __volatile__("lock xadd %1, %0"
+                       : "+m"(*dest), "+r"(original)
+                       : "m"(*dest), "r"(original)
+                       : "memory");
 
   return original;
 }
 #else
-inline
-int atomic_fetch_add( volatile int * const dest , const int val )
-{
-#if defined( KOKKOS_ENABLE_RFO_PREFETCH )
-  _mm_prefetch( (const char*) dest, _MM_HINT_ET0 );
+inline int atomic_fetch_add(volatile int* const dest, const int val) {
+#if defined(KOKKOS_ENABLE_RFO_PREFETCH)
+  _mm_prefetch((const char*)dest, _MM_HINT_ET0);
 #endif
   return __sync_fetch_and_add(dest, val);
 }
 #endif
 
-inline
-long int atomic_fetch_add( volatile long int * const dest , const long int val )
-{ 
-#if defined( KOKKOS_ENABLE_RFO_PREFETCH )
-  _mm_prefetch( (const char*) dest, _MM_HINT_ET0 );
+inline long int atomic_fetch_add(volatile long int* const dest,
+                                 const long int val) {
+#if defined(KOKKOS_ENABLE_RFO_PREFETCH)
+  _mm_prefetch((const char*)dest, _MM_HINT_ET0);
 #endif
-  return __sync_fetch_and_add(dest,val);
+  return __sync_fetch_and_add(dest, val);
 }
 
-#if defined( KOKKOS_ENABLE_GNU_ATOMICS )
+#if defined(KOKKOS_ENABLE_GNU_ATOMICS)
 
-inline
-unsigned int atomic_fetch_add( volatile unsigned int * const dest , const unsigned int val )
-{
-#if defined( KOKKOS_ENABLE_RFO_PREFETCH )
-  _mm_prefetch( (const char*) dest, _MM_HINT_ET0 );
+inline unsigned int atomic_fetch_add(volatile unsigned int* const dest,
+                                     const unsigned int val) {
+#if defined(KOKKOS_ENABLE_RFO_PREFETCH)
+  _mm_prefetch((const char*)dest, _MM_HINT_ET0);
 #endif
-  return __sync_fetch_and_add(dest,val);
+  return __sync_fetch_and_add(dest, val);
 }
 
-inline
-unsigned long int atomic_fetch_add( volatile unsigned long int * const dest , const unsigned long int val )
-{ 
-#if defined( KOKKOS_ENABLE_RFO_PREFETCH )
-  _mm_prefetch( (const char*) dest, _MM_HINT_ET0 );
+inline unsigned long int atomic_fetch_add(
+    volatile unsigned long int* const dest, const unsigned long int val) {
+#if defined(KOKKOS_ENABLE_RFO_PREFETCH)
+  _mm_prefetch((const char*)dest, _MM_HINT_ET0);
 #endif
-  return __sync_fetch_and_add(dest,val);
+  return __sync_fetch_and_add(dest, val);
 }
 
 #endif
 
-template < typename T >
-inline
-T atomic_fetch_add( volatile T * const dest ,
-  typename Kokkos::Impl::enable_if< sizeof(T) == sizeof(int) , const T >::type val )
-{
+template <typename T>
+inline T atomic_fetch_add(
+    volatile T* const dest,
+    typename Kokkos::Impl::enable_if<sizeof(T) == sizeof(int), const T>::type
+        val) {
   union U {
-    int i ;
-    T t ;
-    inline U() {};
-  } assume , oldval , newval ;
+    int i;
+    T t;
+    inline U(){};
+  } assume, oldval, newval;
 
-#if defined( KOKKOS_ENABLE_RFO_PREFETCH )
-  _mm_prefetch( (const char*) dest, _MM_HINT_ET0 );
+#if defined(KOKKOS_ENABLE_RFO_PREFETCH)
+  _mm_prefetch((const char*)dest, _MM_HINT_ET0);
 #endif
 
-  oldval.t = *dest ;
+  oldval.t = *dest;
 
   do {
-    assume.i = oldval.i ;
-    newval.t = assume.t + val ;
-    oldval.i = __sync_val_compare_and_swap( (int*) dest , assume.i , newval.i );
-  } while ( assume.i != oldval.i );
+    assume.i = oldval.i;
+    newval.t = assume.t + val;
+    oldval.i = __sync_val_compare_and_swap((int*)dest, assume.i, newval.i);
+  } while (assume.i != oldval.i);
 
-  return oldval.t ;
+  return oldval.t;
 }
 
-template < typename T >
-inline
-T atomic_fetch_add( volatile T * const dest ,
-  typename Kokkos::Impl::enable_if< sizeof(T) != sizeof(int) &&
-                                    sizeof(T) == sizeof(long) , const T >::type val )
-{
+template <typename T>
+inline T atomic_fetch_add(
+    volatile T* const dest,
+    typename Kokkos::Impl::enable_if<sizeof(T) != sizeof(int) &&
+                                         sizeof(T) == sizeof(long),
+                                     const T>::type val) {
   union U {
-    long i ;
-    T t ;
-    inline U() {};
-  } assume , oldval , newval ;
+    long i;
+    T t;
+    inline U(){};
+  } assume, oldval, newval;
 
-#if defined( KOKKOS_ENABLE_RFO_PREFETCH )
-  _mm_prefetch( (const char*) dest, _MM_HINT_ET0 );
+#if defined(KOKKOS_ENABLE_RFO_PREFETCH)
+  _mm_prefetch((const char*)dest, _MM_HINT_ET0);
 #endif
 
-  oldval.t = *dest ;
+  oldval.t = *dest;
 
   do {
-    assume.i = oldval.i ;
-    newval.t = assume.t + val ;
-    oldval.i = __sync_val_compare_and_swap( (long*) dest , assume.i , newval.i );
-  } while ( assume.i != oldval.i );
+    assume.i = oldval.i;
+    newval.t = assume.t + val;
+    oldval.i = __sync_val_compare_and_swap((long*)dest, assume.i, newval.i);
+  } while (assume.i != oldval.i);
 
-  return oldval.t ;
+  return oldval.t;
 }
 
-#if defined( KOKKOS_ENABLE_ASM ) && defined ( KOKKOS_ENABLE_ISA_X86_64 )
-template < typename T >
-inline
-T atomic_fetch_add( volatile T * const dest ,
-  typename Kokkos::Impl::enable_if< sizeof(T) != sizeof(int) &&
-                                    sizeof(T) != sizeof(long) &&
-                                    sizeof(T) == sizeof(Impl::cas128_t) , const T >::type val )
-{
+#if defined(KOKKOS_ENABLE_ASM) && defined(KOKKOS_ENABLE_ISA_X86_64)
+template <typename T>
+inline T atomic_fetch_add(
+    volatile T* const dest,
+    typename Kokkos::Impl::enable_if<sizeof(T) != sizeof(int) &&
+                                         sizeof(T) != sizeof(long) &&
+                                         sizeof(T) == sizeof(Impl::cas128_t),
+                                     const T>::type val) {
   union U {
-    Impl::cas128_t i ;
-    T t ;
-    inline U() {};
-  } assume , oldval , newval ;
+    Impl::cas128_t i;
+    T t;
+    inline U(){};
+  } assume, oldval, newval;
 
-#if defined( KOKKOS_ENABLE_RFO_PREFETCH )
-  _mm_prefetch( (const char*) dest, _MM_HINT_ET0 );
+#if defined(KOKKOS_ENABLE_RFO_PREFETCH)
+  _mm_prefetch((const char*)dest, _MM_HINT_ET0);
 #endif
 
-  oldval.t = *dest ;
+  oldval.t = *dest;
 
   do {
-    assume.i = oldval.i ;
-    newval.t = assume.t + val ;
-    oldval.i = Impl::cas128( (volatile Impl::cas128_t*) dest , assume.i , newval.i );
-  } while ( assume.i != oldval.i );
+    assume.i = oldval.i;
+    newval.t = assume.t + val;
+    oldval.i = Impl::cas128((volatile Impl::cas128_t*)dest, assume.i, newval.i);
+  } while (assume.i != oldval.i);
 
-  return oldval.t ;
+  return oldval.t;
 }
 #endif
 
 //----------------------------------------------------------------------------
 
-template < typename T >
-inline
-T atomic_fetch_add( volatile T * const dest ,
-    typename Kokkos::Impl::enable_if<
-                  ( sizeof(T) != 4 )
-               && ( sizeof(T) != 8 )
-              #if defined(KOKKOS_ENABLE_ASM) && defined ( KOKKOS_ENABLE_ISA_X86_64 )
-               && ( sizeof(T) != 16 )
-              #endif
-                 , const T >::type& val )
-{
-  while( !Impl::lock_address_host_space( (void*) dest ) );
+template <typename T>
+inline T atomic_fetch_add(
+    volatile T* const dest,
+    typename Kokkos::Impl::enable_if<(sizeof(T) != 4) && (sizeof(T) != 8)
+#if defined(KOKKOS_ENABLE_ASM) && defined(KOKKOS_ENABLE_ISA_X86_64)
+                                         && (sizeof(T) != 16)
+#endif
+                                         ,
+                                     const T>::type& val) {
+  while (!Impl::lock_address_host_space((void*)dest))
+    ;
   T return_val = *dest;
 
   // Don't use the following line of code here:
   //
-  //const T tmp = *dest = return_val + val;
+  // const T tmp = *dest = return_val + val;
   //
   // Instead, put each assignment in its own statement.  This is
   // because the overload of T::operator= for volatile *this should
   // return void, not volatile T&.  See Kokkos #177:
   //
   // https://github.com/kokkos/kokkos/issues/177
-  *dest = return_val + val;
+  *dest       = return_val + val;
   const T tmp = *dest;
-  (void) tmp;
-  Impl::unlock_address_host_space( (void*) dest );
+  (void)tmp;
+  Impl::unlock_address_host_space((void*)dest);
 
   return return_val;
 }
 //----------------------------------------------------------------------------
 
-#elif defined( KOKKOS_ENABLE_OPENMP_ATOMICS )
+#elif defined(KOKKOS_ENABLE_OPENMP_ATOMICS)
 
-template< typename T >
-T atomic_fetch_add( volatile T * const dest , const T val )
-{
+template <typename T>
+T atomic_fetch_add(volatile T* const dest, const T val) {
   T retval;
 #pragma omp atomic capture
   {
@@ -372,12 +365,12 @@ T atomic_fetch_add( volatile T * const dest , const T val )
   return retval;
 }
 
-#elif defined( KOKKOS_ENABLE_SERIAL_ATOMICS )
+#elif defined(KOKKOS_ENABLE_SERIAL_ATOMICS)
 
-template< typename T >
-T atomic_fetch_add( volatile T * const dest_v , typename std::add_const<T>::type val )
-{
-  T* dest = const_cast<T*>(dest_v);
+template <typename T>
+T atomic_fetch_add(volatile T* const dest_v,
+                   typename std::add_const<T>::type val) {
+  T* dest  = const_cast<T*>(dest_v);
   T retval = *dest;
   *dest += val;
   return retval;
@@ -385,25 +378,23 @@ T atomic_fetch_add( volatile T * const dest_v , typename std::add_const<T>::type
 
 #endif
 #endif
-#endif // !defined ROCM_ATOMICS
+#endif  // !defined ROCM_ATOMICS
 //----------------------------------------------------------------------------
 
 // dummy for non-CUDA Kokkos headers being processed by NVCC
 #if defined(__CUDA_ARCH__) && !defined(KOKKOS_ENABLE_CUDA)
-template< typename T >
-__inline__ __device__
-T atomic_fetch_add(volatile T* const, Kokkos::Impl::identity_t<T>) {
+template <typename T>
+__inline__ __device__ T atomic_fetch_add(volatile T* const,
+                                         Kokkos::Impl::identity_t<T>) {
   return T();
 }
 #endif
 
 // Simpler version of atomic_fetch_add without the fetch
 template <typename T>
-KOKKOS_INLINE_FUNCTION
-void atomic_add(volatile T * const dest, const T src) {
-  atomic_fetch_add(dest,src);
+KOKKOS_INLINE_FUNCTION void atomic_add(volatile T* const dest, const T src) {
+  atomic_fetch_add(dest, src);
 }
 
-}
+}  // namespace Kokkos
 #endif
-
diff --git a/lib/kokkos/core/src/impl/Kokkos_Atomic_Fetch_And.hpp b/lib/kokkos/core/src/impl/Kokkos_Atomic_Fetch_And.hpp
index db0d97ca19..1ad54ed3f1 100644
--- a/lib/kokkos/core/src/impl/Kokkos_Atomic_Fetch_And.hpp
+++ b/lib/kokkos/core/src/impl/Kokkos_Atomic_Fetch_And.hpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -41,36 +42,39 @@
 //@HEADER
 */
 
-#if defined( KOKKOS_ENABLE_RFO_PREFETCH )
+#if defined(KOKKOS_ENABLE_RFO_PREFETCH)
 #include <xmmintrin.h>
 #endif
 
 #include <Kokkos_Macros.hpp>
-#if defined( KOKKOS_ATOMIC_HPP ) && ! defined( KOKKOS_ATOMIC_FETCH_AND_HPP )
+#if defined(KOKKOS_ATOMIC_HPP) && !defined(KOKKOS_ATOMIC_FETCH_AND_HPP)
 #define KOKKOS_ATOMIC_FETCH_AND_HPP
 
 namespace Kokkos {
 
 //----------------------------------------------------------------------------
 
-#if defined( KOKKOS_ENABLE_CUDA )
+#if defined(KOKKOS_ENABLE_CUDA)
 #if defined(__CUDA_ARCH__) || defined(KOKKOS_IMPL_CUDA_CLANG_WORKAROUND)
 
 // Support for int, unsigned int, unsigned long long int, and float
 
-__inline__ __device__
-int atomic_fetch_and( volatile int * const dest , const int val )
-{ return atomicAnd((int*)dest,val); }
+__inline__ __device__ int atomic_fetch_and(volatile int* const dest,
+                                           const int val) {
+  return atomicAnd((int*)dest, val);
+}
 
-__inline__ __device__
-unsigned int atomic_fetch_and( volatile unsigned int * const dest , const unsigned int val )
-{ return atomicAnd((unsigned int*)dest,val); }
+__inline__ __device__ unsigned int atomic_fetch_and(
+    volatile unsigned int* const dest, const unsigned int val) {
+  return atomicAnd((unsigned int*)dest, val);
+}
 
-#if defined( __CUDA_ARCH__ ) && ( 350 <= __CUDA_ARCH__ )
-__inline__ __device__
-unsigned long long int atomic_fetch_and( volatile unsigned long long int * const dest ,
-                                         const unsigned long long int val )
-{ return atomicAnd((unsigned long long int*)dest,val); }
+#if defined(__CUDA_ARCH__) && (350 <= __CUDA_ARCH__)
+__inline__ __device__ unsigned long long int atomic_fetch_and(
+    volatile unsigned long long int* const dest,
+    const unsigned long long int val) {
+  return atomicAnd((unsigned long long int*)dest, val);
+}
 #endif
 #endif
 #endif
@@ -78,53 +82,47 @@ unsigned long long int atomic_fetch_and( volatile unsigned long long int * const
 #if !defined(__CUDA_ARCH__) || defined(KOKKOS_IMPL_CUDA_CLANG_WORKAROUND)
 #if defined(KOKKOS_ENABLE_GNU_ATOMICS) || defined(KOKKOS_ENABLE_INTEL_ATOMICS)
 
-inline
-int atomic_fetch_and( volatile int * const dest , const int val )
-{
-#if defined( KOKKOS_ENABLE_RFO_PREFETCH )
-  _mm_prefetch( (const char*) dest, _MM_HINT_ET0 );
+inline int atomic_fetch_and(volatile int* const dest, const int val) {
+#if defined(KOKKOS_ENABLE_RFO_PREFETCH)
+  _mm_prefetch((const char*)dest, _MM_HINT_ET0);
 #endif
-  return __sync_fetch_and_and(dest,val);
+  return __sync_fetch_and_and(dest, val);
 }
 
-inline
-long int atomic_fetch_and( volatile long int * const dest , const long int val )
-{
-#if defined( KOKKOS_ENABLE_RFO_PREFETCH )
-  _mm_prefetch( (const char*) dest, _MM_HINT_ET0 );
+inline long int atomic_fetch_and(volatile long int* const dest,
+                                 const long int val) {
+#if defined(KOKKOS_ENABLE_RFO_PREFETCH)
+  _mm_prefetch((const char*)dest, _MM_HINT_ET0);
 #endif
-  return __sync_fetch_and_and(dest,val);
+  return __sync_fetch_and_and(dest, val);
 }
 
-#if defined( KOKKOS_ENABLE_GNU_ATOMICS )
+#if defined(KOKKOS_ENABLE_GNU_ATOMICS)
 
-inline
-unsigned int atomic_fetch_and( volatile unsigned int * const dest , const unsigned int val )
-{ 
-#if defined( KOKKOS_ENABLE_RFO_PREFETCH )
-  _mm_prefetch( (const char*) dest, _MM_HINT_ET0 );
+inline unsigned int atomic_fetch_and(volatile unsigned int* const dest,
+                                     const unsigned int val) {
+#if defined(KOKKOS_ENABLE_RFO_PREFETCH)
+  _mm_prefetch((const char*)dest, _MM_HINT_ET0);
 #endif
-  return __sync_fetch_and_and(dest,val);
+  return __sync_fetch_and_and(dest, val);
 }
 
-inline
-unsigned long int atomic_fetch_and( volatile unsigned long int * const dest , const unsigned long int val )
-{
-#if defined( KOKKOS_ENABLE_RFO_PREFETCH )
-  _mm_prefetch( (const char*) dest, _MM_HINT_ET0 );
+inline unsigned long int atomic_fetch_and(
+    volatile unsigned long int* const dest, const unsigned long int val) {
+#if defined(KOKKOS_ENABLE_RFO_PREFETCH)
+  _mm_prefetch((const char*)dest, _MM_HINT_ET0);
 #endif
-  return __sync_fetch_and_and(dest,val);
+  return __sync_fetch_and_and(dest, val);
 }
 
 #endif
 
 //----------------------------------------------------------------------------
 
-#elif defined( KOKKOS_ENABLE_OPENMP_ATOMICS )
+#elif defined(KOKKOS_ENABLE_OPENMP_ATOMICS)
 
-template< typename T >
-T atomic_fetch_and( volatile T * const dest , const T val )
-{
+template <typename T>
+T atomic_fetch_and(volatile T* const dest, const T val) {
   T retval;
 #pragma omp atomic capture
   {
@@ -134,12 +132,11 @@ T atomic_fetch_and( volatile T * const dest , const T val )
   return retval;
 }
 
-#elif defined( KOKKOS_ENABLE_SERIAL_ATOMICS )
+#elif defined(KOKKOS_ENABLE_SERIAL_ATOMICS)
 
-template< typename T >
-T atomic_fetch_and( volatile T * const dest_v , const T val )
-{
-  T* dest = const_cast<T*>(dest_v);
+template <typename T>
+T atomic_fetch_and(volatile T* const dest_v, const T val) {
+  T* dest  = const_cast<T*>(dest_v);
   T retval = *dest;
   *dest &= val;
   return retval;
@@ -151,21 +148,19 @@ T atomic_fetch_and( volatile T * const dest_v , const T val )
 
 // dummy for non-CUDA Kokkos headers being processed by NVCC
 #if defined(__CUDA_ARCH__) && !defined(KOKKOS_ENABLE_CUDA)
-template< typename T >
-__inline__ __device__
-T atomic_fetch_and(volatile T* const, Kokkos::Impl::identity_t<T>) {
+template <typename T>
+__inline__ __device__ T atomic_fetch_and(volatile T* const,
+                                         Kokkos::Impl::identity_t<T>) {
   return T();
 }
 #endif
 
 // Simpler version of atomic_fetch_and without the fetch
 template <typename T>
-KOKKOS_INLINE_FUNCTION
-void atomic_and(volatile T * const dest, const T src) {
-  (void)atomic_fetch_and(dest,src);
+KOKKOS_INLINE_FUNCTION void atomic_and(volatile T* const dest, const T src) {
+  (void)atomic_fetch_and(dest, src);
 }
 
-}
+}  // namespace Kokkos
 
 #endif
-
diff --git a/lib/kokkos/core/src/impl/Kokkos_Atomic_Fetch_Or.hpp b/lib/kokkos/core/src/impl/Kokkos_Atomic_Fetch_Or.hpp
index d146ef3148..dc567265a7 100644
--- a/lib/kokkos/core/src/impl/Kokkos_Atomic_Fetch_Or.hpp
+++ b/lib/kokkos/core/src/impl/Kokkos_Atomic_Fetch_Or.hpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -41,36 +42,39 @@
 //@HEADER
 */
 
-#if defined( KOKKOS_ENABLE_RFO_PREFETCH )
+#if defined(KOKKOS_ENABLE_RFO_PREFETCH)
 #include <xmmintrin.h>
 #endif
 
 #include <Kokkos_Macros.hpp>
-#if defined( KOKKOS_ATOMIC_HPP ) && ! defined( KOKKOS_ATOMIC_FETCH_OR_HPP )
+#if defined(KOKKOS_ATOMIC_HPP) && !defined(KOKKOS_ATOMIC_FETCH_OR_HPP)
 #define KOKKOS_ATOMIC_FETCH_OR_HPP
 
 namespace Kokkos {
 
 //----------------------------------------------------------------------------
 
-#if defined( KOKKOS_ENABLE_CUDA )
+#if defined(KOKKOS_ENABLE_CUDA)
 #if defined(__CUDA_ARCH__) || defined(KOKKOS_IMPL_CUDA_CLANG_WORKAROUND)
 
 // Support for int, unsigned int, unsigned long long int, and float
 
-__inline__ __device__
-int atomic_fetch_or( volatile int * const dest , const int val )
-{ return atomicOr((int*)dest,val); }
+__inline__ __device__ int atomic_fetch_or(volatile int* const dest,
+                                          const int val) {
+  return atomicOr((int*)dest, val);
+}
 
-__inline__ __device__
-unsigned int atomic_fetch_or( volatile unsigned int * const dest , const unsigned int val )
-{ return atomicOr((unsigned int*)dest,val); }
+__inline__ __device__ unsigned int atomic_fetch_or(
+    volatile unsigned int* const dest, const unsigned int val) {
+  return atomicOr((unsigned int*)dest, val);
+}
 
-#if defined( __CUDA_ARCH__ ) && ( 350 <= __CUDA_ARCH__ )
-__inline__ __device__
-unsigned long long int atomic_fetch_or( volatile unsigned long long int * const dest ,
-                                         const unsigned long long int val )
-{ return atomicOr((unsigned long long int*)dest,val); }
+#if defined(__CUDA_ARCH__) && (350 <= __CUDA_ARCH__)
+__inline__ __device__ unsigned long long int atomic_fetch_or(
+    volatile unsigned long long int* const dest,
+    const unsigned long long int val) {
+  return atomicOr((unsigned long long int*)dest, val);
+}
 #endif
 #endif
 #endif
@@ -78,53 +82,47 @@ unsigned long long int atomic_fetch_or( volatile unsigned long long int * const
 #if !defined(__CUDA_ARCH__) || defined(KOKKOS_IMPL_CUDA_CLANG_WORKAROUND)
 #if defined(KOKKOS_ENABLE_GNU_ATOMICS) || defined(KOKKOS_ENABLE_INTEL_ATOMICS)
 
-inline
-int atomic_fetch_or( volatile int * const dest , const int val )
-{
-#if defined( KOKKOS_ENABLE_RFO_PREFETCH )
-  _mm_prefetch( (const char*) dest, _MM_HINT_ET0 );
+inline int atomic_fetch_or(volatile int* const dest, const int val) {
+#if defined(KOKKOS_ENABLE_RFO_PREFETCH)
+  _mm_prefetch((const char*)dest, _MM_HINT_ET0);
 #endif
-  return __sync_fetch_and_or(dest,val);
+  return __sync_fetch_and_or(dest, val);
 }
 
-inline
-long int atomic_fetch_or( volatile long int * const dest , const long int val )
-{
-#if defined( KOKKOS_ENABLE_RFO_PREFETCH )
-  _mm_prefetch( (const char*) dest, _MM_HINT_ET0 );
+inline long int atomic_fetch_or(volatile long int* const dest,
+                                const long int val) {
+#if defined(KOKKOS_ENABLE_RFO_PREFETCH)
+  _mm_prefetch((const char*)dest, _MM_HINT_ET0);
 #endif
-  return __sync_fetch_and_or(dest,val);
+  return __sync_fetch_and_or(dest, val);
 }
 
-#if defined( KOKKOS_ENABLE_GNU_ATOMICS )
+#if defined(KOKKOS_ENABLE_GNU_ATOMICS)
 
-inline
-unsigned int atomic_fetch_or( volatile unsigned int * const dest , const unsigned int val )
-{
-#if defined( KOKKOS_ENABLE_RFO_PREFETCH )
-  _mm_prefetch( (const char*) dest, _MM_HINT_ET0 );
+inline unsigned int atomic_fetch_or(volatile unsigned int* const dest,
+                                    const unsigned int val) {
+#if defined(KOKKOS_ENABLE_RFO_PREFETCH)
+  _mm_prefetch((const char*)dest, _MM_HINT_ET0);
 #endif
-  return __sync_fetch_and_or(dest,val);
+  return __sync_fetch_and_or(dest, val);
 }
 
-inline
-unsigned long int atomic_fetch_or( volatile unsigned long int * const dest , const unsigned long int val )
-{
-#if defined( KOKKOS_ENABLE_RFO_PREFETCH )
-  _mm_prefetch( (const char*) dest, _MM_HINT_ET0 );
+inline unsigned long int atomic_fetch_or(volatile unsigned long int* const dest,
+                                         const unsigned long int val) {
+#if defined(KOKKOS_ENABLE_RFO_PREFETCH)
+  _mm_prefetch((const char*)dest, _MM_HINT_ET0);
 #endif
-  return __sync_fetch_and_or(dest,val);
+  return __sync_fetch_and_or(dest, val);
 }
 
 #endif
 
 //----------------------------------------------------------------------------
 
-#elif defined( KOKKOS_ENABLE_OPENMP_ATOMICS )
+#elif defined(KOKKOS_ENABLE_OPENMP_ATOMICS)
 
-template< typename T >
-T atomic_fetch_or( volatile T * const dest , const T val )
-{
+template <typename T>
+T atomic_fetch_or(volatile T* const dest, const T val) {
   T retval;
 #pragma omp atomic capture
   {
@@ -134,12 +132,11 @@ T atomic_fetch_or( volatile T * const dest , const T val )
   return retval;
 }
 
-#elif defined( KOKKOS_ENABLE_SERIAL_ATOMICS )
+#elif defined(KOKKOS_ENABLE_SERIAL_ATOMICS)
 
-template< typename T >
-T atomic_fetch_or( volatile T * const dest_v , const T val )
-{
-  T* dest = const_cast<T*>(dest_v);
+template <typename T>
+T atomic_fetch_or(volatile T* const dest_v, const T val) {
+  T* dest  = const_cast<T*>(dest_v);
   T retval = *dest;
   *dest |= val;
   return retval;
@@ -151,21 +148,19 @@ T atomic_fetch_or( volatile T * const dest_v , const T val )
 
 // dummy for non-CUDA Kokkos headers being processed by NVCC
 #if defined(__CUDA_ARCH__) && !defined(KOKKOS_ENABLE_CUDA)
-template< typename T >
-__inline__ __device__
-T atomic_fetch_or(volatile T* const, Kokkos::Impl::identity_t<T>) {
+template <typename T>
+__inline__ __device__ T atomic_fetch_or(volatile T* const,
+                                        Kokkos::Impl::identity_t<T>) {
   return T();
 }
 #endif
 
 // Simpler version of atomic_fetch_or without the fetch
 template <typename T>
-KOKKOS_INLINE_FUNCTION
-void atomic_or(volatile T * const dest, const T src) {
-  (void)atomic_fetch_or(dest,src);
+KOKKOS_INLINE_FUNCTION void atomic_or(volatile T* const dest, const T src) {
+  (void)atomic_fetch_or(dest, src);
 }
 
-}
+}  // namespace Kokkos
 
 #endif
-
diff --git a/lib/kokkos/core/src/impl/Kokkos_Atomic_Fetch_Sub.hpp b/lib/kokkos/core/src/impl/Kokkos_Atomic_Fetch_Sub.hpp
index 7a4f95cd99..91da9fdcaa 100644
--- a/lib/kokkos/core/src/impl/Kokkos_Atomic_Fetch_Sub.hpp
+++ b/lib/kokkos/core/src/impl/Kokkos_Atomic_Fetch_Sub.hpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -41,126 +42,127 @@
 //@HEADER
 */
 
-#if defined( KOKKOS_ENABLE_RFO_PREFETCH )
+#if defined(KOKKOS_ENABLE_RFO_PREFETCH)
 #include <xmmintrin.h>
 #endif
 
 #include <Kokkos_Macros.hpp>
-#if defined( KOKKOS_ATOMIC_HPP ) && ! defined( KOKKOS_ATOMIC_FETCH_SUB_HPP )
+#if defined(KOKKOS_ATOMIC_HPP) && !defined(KOKKOS_ATOMIC_FETCH_SUB_HPP)
 #define KOKKOS_ATOMIC_FETCH_SUB_HPP
 
 #if defined(KOKKOS_ENABLE_CUDA)
-#include<Cuda/Kokkos_Cuda_Version_9_8_Compatibility.hpp>
+#include <Cuda/Kokkos_Cuda_Version_9_8_Compatibility.hpp>
 #endif
 
 namespace Kokkos {
 
 //----------------------------------------------------------------------------
 
-#if defined( KOKKOS_ENABLE_CUDA )
+#if defined(KOKKOS_ENABLE_CUDA)
 #if defined(__CUDA_ARCH__) || defined(KOKKOS_IMPL_CUDA_CLANG_WORKAROUND)
 
 // Support for int, unsigned int, unsigned long long int, and float
 
-__inline__ __device__
-int atomic_fetch_sub( volatile int * const dest , const int val )
-{ return atomicSub((int*)dest,val); }
+__inline__ __device__ int atomic_fetch_sub(volatile int* const dest,
+                                           const int val) {
+  return atomicSub((int*)dest, val);
+}
 
-__inline__ __device__
-unsigned int atomic_fetch_sub( volatile unsigned int * const dest , const unsigned int val )
-{ return atomicSub((unsigned int*)dest,val); }
+__inline__ __device__ unsigned int atomic_fetch_sub(
+    volatile unsigned int* const dest, const unsigned int val) {
+  return atomicSub((unsigned int*)dest, val);
+}
 
-__inline__ __device__
-unsigned int atomic_fetch_sub( volatile int64_t * const dest , const int64_t val )
-{ return atomic_fetch_add(dest,-val); }
+__inline__ __device__ unsigned int atomic_fetch_sub(
+    volatile int64_t* const dest, const int64_t val) {
+  return atomic_fetch_add(dest, -val);
+}
 
-__inline__ __device__
-unsigned int atomic_fetch_sub( volatile float * const dest , const float val )
-{ return atomicAdd((float*)dest,-val); }
+__inline__ __device__ unsigned int atomic_fetch_sub(volatile float* const dest,
+                                                    const float val) {
+  return atomicAdd((float*)dest, -val);
+}
 
-#if ( 600 <= __CUDA_ARCH__ )
-__inline__ __device__
-unsigned int atomic_fetch_sub( volatile double * const dest , const double val )
-{ return atomicAdd((double*)dest,-val); }
+#if (600 <= __CUDA_ARCH__)
+__inline__ __device__ unsigned int atomic_fetch_sub(volatile double* const dest,
+                                                    const double val) {
+  return atomicAdd((double*)dest, -val);
+}
 #endif
 
-template < typename T >
-__inline__ __device__
-T atomic_fetch_sub( volatile T * const dest ,
-  typename Kokkos::Impl::enable_if< sizeof(T) == sizeof(int) , const T >::type val )
-{
+template <typename T>
+__inline__ __device__ T atomic_fetch_sub(
+    volatile T* const dest,
+    typename Kokkos::Impl::enable_if<sizeof(T) == sizeof(int), const T>::type
+        val) {
   union U {
-    int i ;
-    T t ;
+    int i;
+    T t;
     KOKKOS_INLINE_FUNCTION U() {}
-  } oldval , assume , newval ;
+  } oldval, assume, newval;
 
-  oldval.t = *dest ;
+  oldval.t = *dest;
 
   do {
-    assume.i = oldval.i ;
-    newval.t = assume.t - val ;
-    oldval.i = atomicCAS( (int*)dest , assume.i , newval.i );
-  } while ( assume.i != oldval.i );
+    assume.i = oldval.i;
+    newval.t = assume.t - val;
+    oldval.i = atomicCAS((int*)dest, assume.i, newval.i);
+  } while (assume.i != oldval.i);
 
-  return oldval.t ;
+  return oldval.t;
 }
 
-template < typename T >
-__inline__ __device__
-T atomic_fetch_sub( volatile T * const dest ,
-  typename Kokkos::Impl::enable_if< sizeof(T) != sizeof(int) &&
-                                    sizeof(T) == sizeof(unsigned long long int) , const T >::type val )
-{
+template <typename T>
+__inline__ __device__ T atomic_fetch_sub(
+    volatile T* const dest,
+    typename Kokkos::Impl::enable_if<
+        sizeof(T) != sizeof(int) && sizeof(T) == sizeof(unsigned long long int),
+        const T>::type val) {
   union U {
-    unsigned long long int i ;
-    T t ;
+    unsigned long long int i;
+    T t;
     KOKKOS_INLINE_FUNCTION U() {}
-  } oldval , assume , newval ;
+  } oldval, assume, newval;
 
-  oldval.t = *dest ;
+  oldval.t = *dest;
 
   do {
-    assume.i = oldval.i ;
-    newval.t = assume.t - val ;
-    oldval.i = atomicCAS( (unsigned long long int*)dest , assume.i , newval.i );
-  } while ( assume.i != oldval.i );
+    assume.i = oldval.i;
+    newval.t = assume.t - val;
+    oldval.i = atomicCAS((unsigned long long int*)dest, assume.i, newval.i);
+  } while (assume.i != oldval.i);
 
-  return oldval.t ;
+  return oldval.t;
 }
 
-
 //----------------------------------------------------------------------------
 
-template < typename T >
-__inline__ __device__
-T atomic_fetch_sub( volatile T * const dest ,
-    typename Kokkos::Impl::enable_if<
-                  ( sizeof(T) != 4 )
-               && ( sizeof(T) != 8 )
-             , const T >::type& val )
-{
+template <typename T>
+__inline__ __device__ T atomic_fetch_sub(
+    volatile T* const dest,
+    typename Kokkos::Impl::enable_if<(sizeof(T) != 4) && (sizeof(T) != 8),
+                                     const T>::type& val) {
   T return_val;
   // This is a way to (hopefully) avoid dead lock in a warp
   int done = 0;
 #ifdef KOKKOS_IMPL_CUDA_SYNCWARP_NEEDS_MASK
-  unsigned int mask = KOKKOS_IMPL_CUDA_ACTIVEMASK;
-  unsigned int active = KOKKOS_IMPL_CUDA_BALLOT_MASK(mask,1);
+  unsigned int mask   = KOKKOS_IMPL_CUDA_ACTIVEMASK;
+  unsigned int active = KOKKOS_IMPL_CUDA_BALLOT_MASK(mask, 1);
 #else
   unsigned int active = KOKKOS_IMPL_CUDA_BALLOT(1);
 #endif
   unsigned int done_active = 0;
-  while (active!=done_active) {
-    if(!done) {
-      if( Impl::lock_address_cuda_space( (void*) dest ) ) {
+  while (active != done_active) {
+    if (!done) {
+      if (Impl::lock_address_cuda_space((void*)dest)) {
         return_val = *dest;
-        *dest = return_val - val;
-        Impl::unlock_address_cuda_space( (void*) dest );
+        *dest      = return_val - val;
+        Impl::unlock_address_cuda_space((void*)dest);
         done = 1;
       }
     }
 #ifdef KOKKOS_IMPL_CUDA_SYNCWARP_NEEDS_MASK
-    done_active = KOKKOS_IMPL_CUDA_BALLOT_MASK(mask,done);
+    done_active = KOKKOS_IMPL_CUDA_BALLOT_MASK(mask, done);
 #else
     done_active = KOKKOS_IMPL_CUDA_BALLOT(done);
 #endif
@@ -174,128 +176,119 @@ T atomic_fetch_sub( volatile T * const dest ,
 #if !defined(__CUDA_ARCH__) || defined(KOKKOS_IMPL_CUDA_CLANG_WORKAROUND)
 #if defined(KOKKOS_ENABLE_GNU_ATOMICS) || defined(KOKKOS_ENABLE_INTEL_ATOMICS)
 
-inline
-int atomic_fetch_sub( volatile int * const dest , const int val )
-{
-#if defined( KOKKOS_ENABLE_RFO_PREFETCH )
-  _mm_prefetch( (const char*) dest, _MM_HINT_ET0 );
+inline int atomic_fetch_sub(volatile int* const dest, const int val) {
+#if defined(KOKKOS_ENABLE_RFO_PREFETCH)
+  _mm_prefetch((const char*)dest, _MM_HINT_ET0);
 #endif
-  return __sync_fetch_and_sub(dest,val);
+  return __sync_fetch_and_sub(dest, val);
 }
 
-inline
-long int atomic_fetch_sub( volatile long int * const dest , const long int val )
-{
-#if defined( KOKKOS_ENABLE_RFO_PREFETCH )
-  _mm_prefetch( (const char*) dest, _MM_HINT_ET0 );
+inline long int atomic_fetch_sub(volatile long int* const dest,
+                                 const long int val) {
+#if defined(KOKKOS_ENABLE_RFO_PREFETCH)
+  _mm_prefetch((const char*)dest, _MM_HINT_ET0);
 #endif
-  return __sync_fetch_and_sub(dest,val);
+  return __sync_fetch_and_sub(dest, val);
 }
 
-#if defined( KOKKOS_ENABLE_GNU_ATOMICS )
+#if defined(KOKKOS_ENABLE_GNU_ATOMICS)
 
-inline
-unsigned int atomic_fetch_sub( volatile unsigned int * const dest , const unsigned int val )
-{
-#if defined( KOKKOS_ENABLE_RFO_PREFETCH )
-  _mm_prefetch( (const char*) dest, _MM_HINT_ET0 );
+inline unsigned int atomic_fetch_sub(volatile unsigned int* const dest,
+                                     const unsigned int val) {
+#if defined(KOKKOS_ENABLE_RFO_PREFETCH)
+  _mm_prefetch((const char*)dest, _MM_HINT_ET0);
 #endif
-  return __sync_fetch_and_sub(dest,val);
+  return __sync_fetch_and_sub(dest, val);
 }
 
-inline
-unsigned long int atomic_fetch_sub( volatile unsigned long int * const dest , const unsigned long int val )
-{
-#if defined( KOKKOS_ENABLE_RFO_PREFETCH )
-  _mm_prefetch( (const char*) dest, _MM_HINT_ET0 );
+inline unsigned long int atomic_fetch_sub(
+    volatile unsigned long int* const dest, const unsigned long int val) {
+#if defined(KOKKOS_ENABLE_RFO_PREFETCH)
+  _mm_prefetch((const char*)dest, _MM_HINT_ET0);
 #endif
-  return __sync_fetch_and_sub(dest,val);
+  return __sync_fetch_and_sub(dest, val);
 }
 
 #endif
 
-template < typename T >
-inline
-T atomic_fetch_sub( volatile T * const dest ,
-  typename Kokkos::Impl::enable_if< sizeof(T) == sizeof(int) , const T >::type val )
-{
+template <typename T>
+inline T atomic_fetch_sub(
+    volatile T* const dest,
+    typename Kokkos::Impl::enable_if<sizeof(T) == sizeof(int), const T>::type
+        val) {
   union U {
-    int i ;
-    T t ;
+    int i;
+    T t;
     KOKKOS_INLINE_FUNCTION U() {}
-  } oldval , assume , newval ;
+  } oldval, assume, newval;
 
-#if defined( KOKKOS_ENABLE_RFO_PREFETCH )
-  _mm_prefetch( (const char*) dest, _MM_HINT_ET0 );
+#if defined(KOKKOS_ENABLE_RFO_PREFETCH)
+  _mm_prefetch((const char*)dest, _MM_HINT_ET0);
 #endif
 
-  oldval.t = *dest ;
+  oldval.t = *dest;
 
   do {
-    assume.i = oldval.i ;
-    newval.t = assume.t - val ;
-    oldval.i = __sync_val_compare_and_swap( (int*) dest , assume.i , newval.i );
-  } while ( assume.i != oldval.i );
+    assume.i = oldval.i;
+    newval.t = assume.t - val;
+    oldval.i = __sync_val_compare_and_swap((int*)dest, assume.i, newval.i);
+  } while (assume.i != oldval.i);
 
-  return oldval.t ;
+  return oldval.t;
 }
 
-template < typename T >
-inline
-T atomic_fetch_sub( volatile T * const dest ,
-  typename Kokkos::Impl::enable_if< sizeof(T) != sizeof(int) &&
-                                    sizeof(T) == sizeof(long) , const T >::type val )
-{
-#if defined( KOKKOS_ENABLE_RFO_PREFETCH )
-  _mm_prefetch( (const char*) dest, _MM_HINT_ET0 );
+template <typename T>
+inline T atomic_fetch_sub(
+    volatile T* const dest,
+    typename Kokkos::Impl::enable_if<sizeof(T) != sizeof(int) &&
+                                         sizeof(T) == sizeof(long),
+                                     const T>::type val) {
+#if defined(KOKKOS_ENABLE_RFO_PREFETCH)
+  _mm_prefetch((const char*)dest, _MM_HINT_ET0);
 #endif
 
   union U {
-     long i ;
-     T t ;
-     KOKKOS_INLINE_FUNCTION U() {}
-   } oldval , assume , newval ;
+    long i;
+    T t;
+    KOKKOS_INLINE_FUNCTION U() {}
+  } oldval, assume, newval;
 
-  oldval.t = *dest ;
+  oldval.t = *dest;
 
   do {
-    assume.i = oldval.i ;
-    newval.t = assume.t - val ;
-    oldval.i = __sync_val_compare_and_swap( (long*) dest , assume.i , newval.i );
-  } while ( assume.i != oldval.i );
+    assume.i = oldval.i;
+    newval.t = assume.t - val;
+    oldval.i = __sync_val_compare_and_swap((long*)dest, assume.i, newval.i);
+  } while (assume.i != oldval.i);
 
-  return oldval.t ;
+  return oldval.t;
 }
 
-
 //----------------------------------------------------------------------------
 
-template < typename T >
-inline
-T atomic_fetch_sub( volatile T * const dest ,
-    typename Kokkos::Impl::enable_if<
-                  ( sizeof(T) != 4 )
-               && ( sizeof(T) != 8 )
-             , const T >::type& val )
-{
-#if defined( KOKKOS_ENABLE_RFO_PREFETCH )
-  _mm_prefetch( (const char*) dest, _MM_HINT_ET0 );
+template <typename T>
+inline T atomic_fetch_sub(
+    volatile T* const dest,
+    typename Kokkos::Impl::enable_if<(sizeof(T) != 4) && (sizeof(T) != 8),
+                                     const T>::type& val) {
+#if defined(KOKKOS_ENABLE_RFO_PREFETCH)
+  _mm_prefetch((const char*)dest, _MM_HINT_ET0);
 #endif
 
-  while( !Impl::lock_address_host_space( (void*) dest ) );
+  while (!Impl::lock_address_host_space((void*)dest))
+    ;
   T return_val = *dest;
-  *dest = return_val - val;
-  Impl::unlock_address_host_space( (void*) dest );
+  *dest        = return_val - val;
+  Impl::unlock_address_host_space((void*)dest);
   return return_val;
 }
 
 //----------------------------------------------------------------------------
 
-#elif defined( KOKKOS_ENABLE_OPENMP_ATOMICS )
+#elif defined(KOKKOS_ENABLE_OPENMP_ATOMICS)
 
-template< typename T >
-T atomic_fetch_sub( volatile T * const dest , const T val )
-{
+template <typename T>
+T atomic_fetch_sub(volatile T* const dest, const T val) {
   T retval;
 #pragma omp atomic capture
   {
@@ -305,12 +298,11 @@ T atomic_fetch_sub( volatile T * const dest , const T val )
   return retval;
 }
 
-#elif defined( KOKKOS_ENABLE_SERIAL_ATOMICS )
+#elif defined(KOKKOS_ENABLE_SERIAL_ATOMICS)
 
-template< typename T >
-T atomic_fetch_sub( volatile T * const dest_v , const T val )
-{
-  T* dest = const_cast<T*>(dest_v);
+template <typename T>
+T atomic_fetch_sub(volatile T* const dest_v, const T val) {
+  T* dest  = const_cast<T*>(dest_v);
   T retval = *dest;
   *dest -= val;
   return retval;
@@ -318,26 +310,24 @@ T atomic_fetch_sub( volatile T * const dest_v , const T val )
 
 #endif
 #endif
-#endif // !defined ROCM_ATOMICS
+#endif  // !defined ROCM_ATOMICS
 
 // dummy for non-CUDA Kokkos headers being processed by NVCC
 #if defined(__CUDA_ARCH__) && !defined(KOKKOS_ENABLE_CUDA)
-template< typename T >
-__inline__ __device__
-T atomic_fetch_sub(volatile T* const, Kokkos::Impl::identity_t<T>) {
+template <typename T>
+__inline__ __device__ T atomic_fetch_sub(volatile T* const,
+                                         Kokkos::Impl::identity_t<T>) {
   return T();
 }
 #endif
 
 // Simpler version of atomic_fetch_sub without the fetch
 template <typename T>
-KOKKOS_INLINE_FUNCTION
-void atomic_sub(volatile T * const dest, const T src) {
-  atomic_fetch_sub(dest,src);
+KOKKOS_INLINE_FUNCTION void atomic_sub(volatile T* const dest, const T src) {
+  atomic_fetch_sub(dest, src);
 }
 
-}
+}  // namespace Kokkos
 
-#include<impl/Kokkos_Atomic_Assembly.hpp>
+#include <impl/Kokkos_Atomic_Assembly.hpp>
 #endif
-
diff --git a/lib/kokkos/core/src/impl/Kokkos_Atomic_Generic.hpp b/lib/kokkos/core/src/impl/Kokkos_Atomic_Generic.hpp
index c1a7d80364..160a4e7921 100644
--- a/lib/kokkos/core/src/impl/Kokkos_Atomic_Generic.hpp
+++ b/lib/kokkos/core/src/impl/Kokkos_Atomic_Generic.hpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -42,19 +43,20 @@
 */
 
 #include <Kokkos_Macros.hpp>
-#if defined( KOKKOS_ATOMIC_HPP ) && ! defined( KOKKOS_ATOMIC_GENERIC_HPP )
+#if defined(KOKKOS_ATOMIC_HPP) && !defined(KOKKOS_ATOMIC_GENERIC_HPP)
 #define KOKKOS_ATOMIC_GENERIC_HPP
 #include <Kokkos_Macros.hpp>
 
 #if defined(KOKKOS_ENABLE_CUDA)
-#include<Cuda/Kokkos_Cuda_Version_9_8_Compatibility.hpp>
+#include <Cuda/Kokkos_Cuda_Version_9_8_Compatibility.hpp>
 #endif
 
-// Combination operands to be used in an Compare and Exchange based atomic operation
+// Combination operands to be used in an Compare and Exchange based atomic
+// operation
 namespace Kokkos {
 namespace Impl {
 
-template<class Scalar1, class Scalar2>
+template <class Scalar1, class Scalar2>
 struct MaxOper {
   KOKKOS_FORCEINLINE_FUNCTION
   static Scalar1 apply(const Scalar1& val1, const Scalar2& val2) {
@@ -62,7 +64,7 @@ struct MaxOper {
   }
 };
 
-template<class Scalar1, class Scalar2>
+template <class Scalar1, class Scalar2>
 struct MinOper {
   KOKKOS_FORCEINLINE_FUNCTION
   static Scalar1 apply(const Scalar1& val1, const Scalar2& val2) {
@@ -70,213 +72,213 @@ struct MinOper {
   }
 };
 
-template<class Scalar1, class Scalar2>
+template <class Scalar1, class Scalar2>
 struct AddOper {
   KOKKOS_FORCEINLINE_FUNCTION
   static Scalar1 apply(const Scalar1& val1, const Scalar2& val2) {
-    return val1+val2;
+    return val1 + val2;
   }
 };
 
-template<class Scalar1, class Scalar2>
+template <class Scalar1, class Scalar2>
 struct SubOper {
   KOKKOS_FORCEINLINE_FUNCTION
   static Scalar1 apply(const Scalar1& val1, const Scalar2& val2) {
-    return val1-val2;
+    return val1 - val2;
   }
 };
 
-template<class Scalar1, class Scalar2>
+template <class Scalar1, class Scalar2>
 struct MulOper {
   KOKKOS_FORCEINLINE_FUNCTION
   static Scalar1 apply(const Scalar1& val1, const Scalar2& val2) {
-    return val1*val2;
+    return val1 * val2;
   }
 };
 
-template<class Scalar1, class Scalar2>
+template <class Scalar1, class Scalar2>
 struct DivOper {
   KOKKOS_FORCEINLINE_FUNCTION
   static Scalar1 apply(const Scalar1& val1, const Scalar2& val2) {
-    return val1/val2;
+    return val1 / val2;
   }
 };
 
-template<class Scalar1, class Scalar2>
+template <class Scalar1, class Scalar2>
 struct ModOper {
   KOKKOS_FORCEINLINE_FUNCTION
   static Scalar1 apply(const Scalar1& val1, const Scalar2& val2) {
-    return val1%val2;
+    return val1 % val2;
   }
 };
 
-template<class Scalar1, class Scalar2>
+template <class Scalar1, class Scalar2>
 struct AndOper {
   KOKKOS_FORCEINLINE_FUNCTION
   static Scalar1 apply(const Scalar1& val1, const Scalar2& val2) {
-    return val1&val2;
+    return val1 & val2;
   }
 };
 
-template<class Scalar1, class Scalar2>
+template <class Scalar1, class Scalar2>
 struct OrOper {
   KOKKOS_FORCEINLINE_FUNCTION
   static Scalar1 apply(const Scalar1& val1, const Scalar2& val2) {
-    return val1|val2;
+    return val1 | val2;
   }
 };
 
-template<class Scalar1, class Scalar2>
+template <class Scalar1, class Scalar2>
 struct XorOper {
   KOKKOS_FORCEINLINE_FUNCTION
   static Scalar1 apply(const Scalar1& val1, const Scalar2& val2) {
-    return val1^val2;
+    return val1 ^ val2;
   }
 };
 
-template<class Scalar1, class Scalar2>
+template <class Scalar1, class Scalar2>
 struct LShiftOper {
   KOKKOS_FORCEINLINE_FUNCTION
   static Scalar1 apply(const Scalar1& val1, const Scalar2& val2) {
-    return val1<<val2;
+    return val1 << val2;
   }
 };
 
-template<class Scalar1, class Scalar2>
+template <class Scalar1, class Scalar2>
 struct RShiftOper {
   KOKKOS_FORCEINLINE_FUNCTION
   static Scalar1 apply(const Scalar1& val1, const Scalar2& val2) {
-    return val1>>val2;
+    return val1 >> val2;
   }
 };
 
-template < class Oper, typename T >
-KOKKOS_INLINE_FUNCTION
-T atomic_fetch_oper( const Oper& op, volatile T * const dest ,
-  typename Kokkos::Impl::enable_if< sizeof(T) != sizeof(int) &&
-                                    sizeof(T) == sizeof(unsigned long long int) , const T >::type val )
-{
+template <class Oper, typename T>
+KOKKOS_INLINE_FUNCTION T atomic_fetch_oper(
+    const Oper& op, volatile T* const dest,
+    typename Kokkos::Impl::enable_if<
+        sizeof(T) != sizeof(int) && sizeof(T) == sizeof(unsigned long long int),
+        const T>::type val) {
   union U {
-    unsigned long long int i ;
-    T t ;
+    unsigned long long int i;
+    T t;
     KOKKOS_INLINE_FUNCTION U() {}
-  } oldval , assume , newval ;
+  } oldval, assume, newval;
 
-  oldval.t = *dest ;
+  oldval.t = *dest;
 
   do {
-    assume.i = oldval.i ;
-    newval.t = op.apply(assume.t, val) ;
-    oldval.i = Kokkos::atomic_compare_exchange( (unsigned long long int*)dest , assume.i , newval.i );
-  } while ( assume.i != oldval.i );
+    assume.i = oldval.i;
+    newval.t = op.apply(assume.t, val);
+    oldval.i = Kokkos::atomic_compare_exchange((unsigned long long int*)dest,
+                                               assume.i, newval.i);
+  } while (assume.i != oldval.i);
 
-  return oldval.t ;
+  return oldval.t;
 }
 
-template < class Oper, typename T >
-KOKKOS_INLINE_FUNCTION
-T atomic_oper_fetch( const Oper& op, volatile T * const dest ,
-  typename Kokkos::Impl::enable_if< sizeof(T) != sizeof(int) &&
-                                    sizeof(T) == sizeof(unsigned long long int) , const T >::type val )
-{
+template <class Oper, typename T>
+KOKKOS_INLINE_FUNCTION T atomic_oper_fetch(
+    const Oper& op, volatile T* const dest,
+    typename Kokkos::Impl::enable_if<
+        sizeof(T) != sizeof(int) && sizeof(T) == sizeof(unsigned long long int),
+        const T>::type val) {
   union U {
-    unsigned long long int i ;
-    T t ;
+    unsigned long long int i;
+    T t;
     KOKKOS_INLINE_FUNCTION U() {}
-  } oldval , assume , newval ;
+  } oldval, assume, newval;
 
-  oldval.t = *dest ;
+  oldval.t = *dest;
 
   do {
-    assume.i = oldval.i ;
-    newval.t = Oper::apply(assume.t, val) ;
-    oldval.i = Kokkos::atomic_compare_exchange( (unsigned long long int*)dest , assume.i , newval.i );
-  } while ( assume.i != oldval.i );
+    assume.i = oldval.i;
+    newval.t = Oper::apply(assume.t, val);
+    oldval.i = Kokkos::atomic_compare_exchange((unsigned long long int*)dest,
+                                               assume.i, newval.i);
+  } while (assume.i != oldval.i);
 
-  return newval.t ;
+  return newval.t;
 }
 
-template < class Oper, typename T >
-KOKKOS_INLINE_FUNCTION
-T atomic_fetch_oper( const Oper& op, volatile T * const dest ,
-  typename Kokkos::Impl::enable_if< sizeof(T) == sizeof(int) , const T >::type val )
-{
+template <class Oper, typename T>
+KOKKOS_INLINE_FUNCTION T atomic_fetch_oper(
+    const Oper& op, volatile T* const dest,
+    typename Kokkos::Impl::enable_if<sizeof(T) == sizeof(int), const T>::type
+        val) {
   union U {
-    int i ;
-    T t ;
+    int i;
+    T t;
     KOKKOS_INLINE_FUNCTION U() {}
-  } oldval , assume , newval ;
+  } oldval, assume, newval;
 
-  oldval.t = *dest ;
+  oldval.t = *dest;
 
   do {
-    assume.i = oldval.i ;
-    newval.t = op.apply(assume.t, val) ;
-    oldval.i = Kokkos::atomic_compare_exchange( (int*)dest , assume.i , newval.i );
-  } while ( assume.i != oldval.i );
+    assume.i = oldval.i;
+    newval.t = op.apply(assume.t, val);
+    oldval.i = Kokkos::atomic_compare_exchange((int*)dest, assume.i, newval.i);
+  } while (assume.i != oldval.i);
 
-  return oldval.t ;
+  return oldval.t;
 }
 
-template < class Oper, typename T >
-KOKKOS_INLINE_FUNCTION
-T atomic_oper_fetch( const Oper& op, volatile T * const dest ,
-  typename Kokkos::Impl::enable_if< sizeof(T) == sizeof(int), const T >::type val )
-{
+template <class Oper, typename T>
+KOKKOS_INLINE_FUNCTION T atomic_oper_fetch(
+    const Oper& op, volatile T* const dest,
+    typename Kokkos::Impl::enable_if<sizeof(T) == sizeof(int), const T>::type
+        val) {
   union U {
-    int i ;
-    T t ;
+    int i;
+    T t;
     KOKKOS_INLINE_FUNCTION U() {}
-  } oldval , assume , newval ;
+  } oldval, assume, newval;
 
-  oldval.t = *dest ;
+  oldval.t = *dest;
 
   do {
-    assume.i = oldval.i ;
-    newval.t = Oper::apply(assume.t, val) ;
-    oldval.i = Kokkos::atomic_compare_exchange( (int*)dest , assume.i , newval.i );
-  } while ( assume.i != oldval.i );
+    assume.i = oldval.i;
+    newval.t = Oper::apply(assume.t, val);
+    oldval.i = Kokkos::atomic_compare_exchange((int*)dest, assume.i, newval.i);
+  } while (assume.i != oldval.i);
 
-  return newval.t ;
+  return newval.t;
 }
 
-template < class Oper, typename T >
-KOKKOS_INLINE_FUNCTION
-T atomic_fetch_oper( const Oper& op, volatile T * const dest ,
-  typename Kokkos::Impl::enable_if<
-                ( sizeof(T) != 4 )
-             && ( sizeof(T) != 8 )
-           , const T >::type val )
-{
-
+template <class Oper, typename T>
+KOKKOS_INLINE_FUNCTION T atomic_fetch_oper(
+    const Oper& op, volatile T* const dest,
+    typename Kokkos::Impl::enable_if<(sizeof(T) != 4) && (sizeof(T) != 8),
+                                     const T>::type val) {
 #ifdef KOKKOS_ACTIVE_EXECUTION_MEMORY_SPACE_HOST
-  while( !Impl::lock_address_host_space( (void*) dest ) );
+  while (!Impl::lock_address_host_space((void*)dest))
+    ;
   T return_val = *dest;
-  *dest = Oper::apply(return_val, val);
-  Impl::unlock_address_host_space( (void*) dest );
+  *dest        = Oper::apply(return_val, val);
+  Impl::unlock_address_host_space((void*)dest);
   return return_val;
 #elif defined(KOKKOS_ACTIVE_EXECUTION_MEMORY_SPACE_CUDA)
   // This is a way to (hopefully) avoid dead lock in a warp
   T return_val;
-  int done = 0;
+  int done                 = 0;
 #ifdef KOKKOS_IMPL_CUDA_SYNCWARP_NEEDS_MASK
-  unsigned int mask = KOKKOS_IMPL_CUDA_ACTIVEMASK;
-  unsigned int active = KOKKOS_IMPL_CUDA_BALLOT_MASK(mask,1);
+  unsigned int mask        = KOKKOS_IMPL_CUDA_ACTIVEMASK;
+  unsigned int active      = KOKKOS_IMPL_CUDA_BALLOT_MASK(mask, 1);
 #else
   unsigned int active = KOKKOS_IMPL_CUDA_BALLOT(1);
 #endif
   unsigned int done_active = 0;
-  while (active!=done_active) {
-    if(!done) {
-      if( Impl::lock_address_cuda_space( (void*) dest ) ) {
+  while (active != done_active) {
+    if (!done) {
+      if (Impl::lock_address_cuda_space((void*)dest)) {
         return_val = *dest;
-        *dest = Oper::apply(return_val, val);;
-        Impl::unlock_address_cuda_space( (void*) dest );
-        done=1;
+        *dest      = Oper::apply(return_val, val);
+        ;
+        Impl::unlock_address_cuda_space((void*)dest);
+        done = 1;
       }
     }
 #ifdef KOKKOS_IMPL_CUDA_SYNCWARP_NEEDS_MASK
-    done_active = KOKKOS_IMPL_CUDA_BALLOT_MASK(mask,done);
+    done_active = KOKKOS_IMPL_CUDA_BALLOT_MASK(mask, done);
 #else
     done_active = KOKKOS_IMPL_CUDA_BALLOT(done);
 #endif
@@ -285,46 +287,46 @@ T atomic_fetch_oper( const Oper& op, volatile T * const dest ,
 #endif
 }
 
-template < class Oper, typename T >
-KOKKOS_INLINE_FUNCTION
-T atomic_oper_fetch( const Oper& op, volatile T * const dest ,
-  typename Kokkos::Impl::enable_if<
-                ( sizeof(T) != 4 )
-             && ( sizeof(T) != 8 )
-          #if defined(KOKKOS_ENABLE_ASM) && defined(KOKKOS_ACTIVE_EXECUTION_MEMORY_SPACE_HOST)
-             && ( sizeof(T) != 16 )
-          #endif
-           , const T >::type& val )
-{
+template <class Oper, typename T>
+KOKKOS_INLINE_FUNCTION T atomic_oper_fetch(
+    const Oper& op, volatile T* const dest,
+    typename Kokkos::Impl::enable_if<(sizeof(T) != 4) && (sizeof(T) != 8)
+#if defined(KOKKOS_ENABLE_ASM) && \
+    defined(KOKKOS_ACTIVE_EXECUTION_MEMORY_SPACE_HOST)
+                                         && (sizeof(T) != 16)
+#endif
+                                         ,
+                                     const T>::type& val) {
 
 #ifdef KOKKOS_ACTIVE_EXECUTION_MEMORY_SPACE_HOST
-  while( !Impl::lock_address_host_space( (void*) dest ) );
+  while (!Impl::lock_address_host_space((void*)dest))
+    ;
   T return_val = Oper::apply(*dest, val);
-  *dest = return_val;
-  Impl::unlock_address_host_space( (void*) dest );
+  *dest        = return_val;
+  Impl::unlock_address_host_space((void*)dest);
   return return_val;
 #elif defined(KOKKOS_ACTIVE_EXECUTION_MEMORY_SPACE_CUDA)
   T return_val;
   // This is a way to (hopefully) avoid dead lock in a warp
-  int done = 0;
+  int done                 = 0;
 #ifdef KOKKOS_IMPL_CUDA_SYNCWARP_NEEDS_MASK
-  unsigned int mask = KOKKOS_IMPL_CUDA_ACTIVEMASK;
-  unsigned int active = KOKKOS_IMPL_CUDA_BALLOT_MASK(mask,1);
+  unsigned int mask        = KOKKOS_IMPL_CUDA_ACTIVEMASK;
+  unsigned int active      = KOKKOS_IMPL_CUDA_BALLOT_MASK(mask, 1);
 #else
   unsigned int active = KOKKOS_IMPL_CUDA_BALLOT(1);
 #endif
   unsigned int done_active = 0;
-  while (active!=done_active) {
-    if(!done) {
-      if( Impl::lock_address_cuda_space( (void*) dest ) ) {
+  while (active != done_active) {
+    if (!done) {
+      if (Impl::lock_address_cuda_space((void*)dest)) {
         return_val = Oper::apply(*dest, val);
-        *dest = return_val;
-        Impl::unlock_address_cuda_space( (void*) dest );
-        done=1;
+        *dest      = return_val;
+        Impl::unlock_address_cuda_space((void*)dest);
+        done = 1;
       }
     }
 #ifdef KOKKOS_IMPL_CUDA_SYNCWARP_NEEDS_MASK
-    done_active = KOKKOS_IMPL_CUDA_BALLOT_MASK(mask,done);
+    done_active = KOKKOS_IMPL_CUDA_BALLOT_MASK(mask, done);
 #else
     done_active = KOKKOS_IMPL_CUDA_BALLOT(done);
 #endif
@@ -333,138 +335,124 @@ T atomic_oper_fetch( const Oper& op, volatile T * const dest ,
 #endif
 }
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
 
 namespace Kokkos {
 
 // Fetch_Oper atomics: return value before operation
-template < typename T >
-KOKKOS_INLINE_FUNCTION
-T atomic_fetch_max(volatile T * const dest, const T val) {
-  return Impl::atomic_fetch_oper(Impl::MaxOper<T,const T>(),dest,val);
+template <typename T>
+KOKKOS_INLINE_FUNCTION T atomic_fetch_max(volatile T* const dest, const T val) {
+  return Impl::atomic_fetch_oper(Impl::MaxOper<T, const T>(), dest, val);
 }
 
-template < typename T >
-KOKKOS_INLINE_FUNCTION
-T atomic_fetch_min(volatile T * const dest, const T val) {
-  return Impl::atomic_fetch_oper(Impl::MinOper<T,const T>(),dest,val);
+template <typename T>
+KOKKOS_INLINE_FUNCTION T atomic_fetch_min(volatile T* const dest, const T val) {
+  return Impl::atomic_fetch_oper(Impl::MinOper<T, const T>(), dest, val);
 }
 
-template < typename T >
-KOKKOS_INLINE_FUNCTION
-T atomic_fetch_mul(volatile T * const dest, const T val) {
-  return Impl::atomic_fetch_oper(Impl::MulOper<T,const T>(),dest,val);
+template <typename T>
+KOKKOS_INLINE_FUNCTION T atomic_fetch_mul(volatile T* const dest, const T val) {
+  return Impl::atomic_fetch_oper(Impl::MulOper<T, const T>(), dest, val);
 }
 
-template < typename T >
-KOKKOS_INLINE_FUNCTION
-T atomic_fetch_div(volatile T * const dest, const T val) {
-  return Impl::atomic_fetch_oper(Impl::DivOper<T,const T>(),dest,val);
+template <typename T>
+KOKKOS_INLINE_FUNCTION T atomic_fetch_div(volatile T* const dest, const T val) {
+  return Impl::atomic_fetch_oper(Impl::DivOper<T, const T>(), dest, val);
 }
 
-template < typename T >
-KOKKOS_INLINE_FUNCTION
-T atomic_fetch_mod(volatile T * const dest, const T val) {
-  return Impl::atomic_fetch_oper(Impl::ModOper<T,const T>(),dest,val);
+template <typename T>
+KOKKOS_INLINE_FUNCTION T atomic_fetch_mod(volatile T* const dest, const T val) {
+  return Impl::atomic_fetch_oper(Impl::ModOper<T, const T>(), dest, val);
 }
 
-#if !defined( KOKKOS_ENABLE_SERIAL_ATOMICS )
+#if !defined(KOKKOS_ENABLE_SERIAL_ATOMICS)
 
-template < typename T >
-KOKKOS_INLINE_FUNCTION
-T atomic_fetch_and(volatile T * const dest, const T val) {
-  return Impl::atomic_fetch_oper(Impl::AndOper<T,const T>(),dest,val);
+template <typename T>
+KOKKOS_INLINE_FUNCTION T atomic_fetch_and(volatile T* const dest, const T val) {
+  return Impl::atomic_fetch_oper(Impl::AndOper<T, const T>(), dest, val);
 }
 
-template < typename T >
-KOKKOS_INLINE_FUNCTION
-T atomic_fetch_or(volatile T * const dest, const T val) {
-  return Impl::atomic_fetch_oper(Impl::OrOper<T,const T>(),dest,val);
+template <typename T>
+KOKKOS_INLINE_FUNCTION T atomic_fetch_or(volatile T* const dest, const T val) {
+  return Impl::atomic_fetch_oper(Impl::OrOper<T, const T>(), dest, val);
 }
 
 #endif
 
-template < typename T >
-KOKKOS_INLINE_FUNCTION
-T atomic_fetch_xor(volatile T * const dest, const T val) {
-  return Impl::atomic_fetch_oper(Impl::XorOper<T,const T>(),dest,val);
+template <typename T>
+KOKKOS_INLINE_FUNCTION T atomic_fetch_xor(volatile T* const dest, const T val) {
+  return Impl::atomic_fetch_oper(Impl::XorOper<T, const T>(), dest, val);
 }
 
-template < typename T >
-KOKKOS_INLINE_FUNCTION
-T atomic_fetch_lshift(volatile T * const dest, const unsigned int val) {
-  return Impl::atomic_fetch_oper(Impl::LShiftOper<T,const unsigned int>(),dest,val);
+template <typename T>
+KOKKOS_INLINE_FUNCTION T atomic_fetch_lshift(volatile T* const dest,
+                                             const unsigned int val) {
+  return Impl::atomic_fetch_oper(Impl::LShiftOper<T, const unsigned int>(),
+                                 dest, val);
 }
 
-template < typename T >
-KOKKOS_INLINE_FUNCTION
-T atomic_fetch_rshift(volatile T * const dest, const unsigned int val) {
-  return Impl::atomic_fetch_oper(Impl::RShiftOper<T,const unsigned int>(),dest,val);
+template <typename T>
+KOKKOS_INLINE_FUNCTION T atomic_fetch_rshift(volatile T* const dest,
+                                             const unsigned int val) {
+  return Impl::atomic_fetch_oper(Impl::RShiftOper<T, const unsigned int>(),
+                                 dest, val);
 }
 
-
 // Oper Fetch atomics: return value after operation
-template < typename T >
-KOKKOS_INLINE_FUNCTION
-T atomic_max_fetch(volatile T * const dest, const T val) {
-  return Impl::atomic_oper_fetch(Impl::MaxOper<T,const T>(),dest,val);
+template <typename T>
+KOKKOS_INLINE_FUNCTION T atomic_max_fetch(volatile T* const dest, const T val) {
+  return Impl::atomic_oper_fetch(Impl::MaxOper<T, const T>(), dest, val);
 }
 
-template < typename T >
-KOKKOS_INLINE_FUNCTION
-T atomic_min_fetch(volatile T * const dest, const T val) {
-  return Impl::atomic_oper_fetch(Impl::MinOper<T,const T>(),dest,val);
+template <typename T>
+KOKKOS_INLINE_FUNCTION T atomic_min_fetch(volatile T* const dest, const T val) {
+  return Impl::atomic_oper_fetch(Impl::MinOper<T, const T>(), dest, val);
 }
 
-template < typename T >
-KOKKOS_INLINE_FUNCTION
-T atomic_mul_fetch(volatile T * const dest, const T val) {
-  return Impl::atomic_oper_fetch(Impl::MulOper<T,const T>(),dest,val);
+template <typename T>
+KOKKOS_INLINE_FUNCTION T atomic_mul_fetch(volatile T* const dest, const T val) {
+  return Impl::atomic_oper_fetch(Impl::MulOper<T, const T>(), dest, val);
 }
 
-template < typename T >
-KOKKOS_INLINE_FUNCTION
-T atomic_div_fetch(volatile T * const dest, const T val) {
-  return Impl::atomic_oper_fetch(Impl::DivOper<T,const T>(),dest,val);
+template <typename T>
+KOKKOS_INLINE_FUNCTION T atomic_div_fetch(volatile T* const dest, const T val) {
+  return Impl::atomic_oper_fetch(Impl::DivOper<T, const T>(), dest, val);
 }
 
-template < typename T >
-KOKKOS_INLINE_FUNCTION
-T atomic_mod_fetch(volatile T * const dest, const T val) {
-  return Impl::atomic_oper_fetch(Impl::ModOper<T,const T>(),dest,val);
+template <typename T>
+KOKKOS_INLINE_FUNCTION T atomic_mod_fetch(volatile T* const dest, const T val) {
+  return Impl::atomic_oper_fetch(Impl::ModOper<T, const T>(), dest, val);
 }
 
-template < typename T >
-KOKKOS_INLINE_FUNCTION
-T atomic_and_fetch(volatile T * const dest, const T val) {
-  return Impl::atomic_oper_fetch(Impl::AndOper<T,const T>(),dest,val);
+template <typename T>
+KOKKOS_INLINE_FUNCTION T atomic_and_fetch(volatile T* const dest, const T val) {
+  return Impl::atomic_oper_fetch(Impl::AndOper<T, const T>(), dest, val);
 }
 
-template < typename T >
-KOKKOS_INLINE_FUNCTION
-T atomic_or_fetch(volatile T * const dest, const T val) {
-  return Impl::atomic_oper_fetch(Impl::OrOper<T,const T>(),dest,val);
+template <typename T>
+KOKKOS_INLINE_FUNCTION T atomic_or_fetch(volatile T* const dest, const T val) {
+  return Impl::atomic_oper_fetch(Impl::OrOper<T, const T>(), dest, val);
 }
 
-template < typename T >
-KOKKOS_INLINE_FUNCTION
-T atomic_xor_fetch(volatile T * const dest, const T val) {
-  return Impl::atomic_oper_fetch(Impl::XorOper<T,const T>(),dest,val);
+template <typename T>
+KOKKOS_INLINE_FUNCTION T atomic_xor_fetch(volatile T* const dest, const T val) {
+  return Impl::atomic_oper_fetch(Impl::XorOper<T, const T>(), dest, val);
 }
 
-template < typename T >
-KOKKOS_INLINE_FUNCTION
-T atomic_lshift_fetch(volatile T * const dest, const unsigned int val) {
-  return Impl::atomic_oper_fetch(Impl::LShiftOper<T,const unsigned int>(),dest,val);
+template <typename T>
+KOKKOS_INLINE_FUNCTION T atomic_lshift_fetch(volatile T* const dest,
+                                             const unsigned int val) {
+  return Impl::atomic_oper_fetch(Impl::LShiftOper<T, const unsigned int>(),
+                                 dest, val);
 }
 
-template < typename T >
-KOKKOS_INLINE_FUNCTION
-T atomic_rshift_fetch(volatile T * const dest, const unsigned int val) {
-  return Impl::atomic_oper_fetch(Impl::RShiftOper<T,const unsigned int>(),dest,val);
+template <typename T>
+KOKKOS_INLINE_FUNCTION T atomic_rshift_fetch(volatile T* const dest,
+                                             const unsigned int val) {
+  return Impl::atomic_oper_fetch(Impl::RShiftOper<T, const unsigned int>(),
+                                 dest, val);
 }
 
-} // namespace Kokkos
+}  // namespace Kokkos
 #endif
-
diff --git a/lib/kokkos/core/src/impl/Kokkos_Atomic_Increment.hpp b/lib/kokkos/core/src/impl/Kokkos_Atomic_Increment.hpp
index a1a8357b61..f0ffebef9a 100644
--- a/lib/kokkos/core/src/impl/Kokkos_Atomic_Increment.hpp
+++ b/lib/kokkos/core/src/impl/Kokkos_Atomic_Increment.hpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -41,31 +42,29 @@
 //@HEADER
 */
 
-#if defined( KOKKOS_ENABLE_RFO_PREFETCH )
+#if defined(KOKKOS_ENABLE_RFO_PREFETCH)
 #include <xmmintrin.h>
 #endif
 
 #include <Kokkos_Macros.hpp>
-#if defined( KOKKOS_ATOMIC_HPP) && ! defined( KOKKOS_ATOMIC_INCREMENT_HPP )
+#if defined(KOKKOS_ATOMIC_HPP) && !defined(KOKKOS_ATOMIC_INCREMENT_HPP)
 #define KOKKOS_ATOMIC_INCREMENT_HPP
 
 namespace Kokkos {
 
 // Atomic increment
-template<>
-KOKKOS_INLINE_FUNCTION
-void atomic_increment<char>(volatile char* a) {
-#if defined( KOKKOS_ENABLE_ASM ) && defined( KOKKOS_ENABLE_ISA_X86_64 ) && ! defined(_WIN32) && ! defined(__CUDA_ARCH__)
-#if defined( KOKKOS_ENABLE_RFO_PREFETCH )
-  _mm_prefetch( (const char*) a, _MM_HINT_ET0 );
+template <>
+KOKKOS_INLINE_FUNCTION void atomic_increment<char>(volatile char* a) {
+#if defined(KOKKOS_ENABLE_ASM) && defined(KOKKOS_ENABLE_ISA_X86_64) && \
+    !defined(_WIN32) && !defined(__CUDA_ARCH__)
+#if defined(KOKKOS_ENABLE_RFO_PREFETCH)
+  _mm_prefetch((const char*)a, _MM_HINT_ET0);
 #endif
-  __asm__ __volatile__(
-      "lock incb %0"
-      : /* no output registers */
-      : "m" (a[0])
-      : "memory"
-    );
-#elif defined( KOKKOS_ENABLE_SERIAL_ATOMICS )
+  __asm__ __volatile__("lock incb %0"
+                       : /* no output registers */
+                       : "m"(a[0])
+                       : "memory");
+#elif defined(KOKKOS_ENABLE_SERIAL_ATOMICS)
   char* a_nv = const_cast<char*>(a);
   ++(*a_nv);
 #else
@@ -73,20 +72,18 @@ void atomic_increment<char>(volatile char* a) {
 #endif
 }
 
-template<>
-KOKKOS_INLINE_FUNCTION
-void atomic_increment<short>(volatile short* a) {
-#if defined( KOKKOS_ENABLE_ASM ) && defined( KOKKOS_ENABLE_ISA_X86_64 ) && ! defined(_WIN32) && ! defined(__CUDA_ARCH__)
-#if defined( KOKKOS_ENABLE_RFO_PREFETCH )
-  _mm_prefetch( (const char*) a, _MM_HINT_ET0 );
+template <>
+KOKKOS_INLINE_FUNCTION void atomic_increment<short>(volatile short* a) {
+#if defined(KOKKOS_ENABLE_ASM) && defined(KOKKOS_ENABLE_ISA_X86_64) && \
+    !defined(_WIN32) && !defined(__CUDA_ARCH__)
+#if defined(KOKKOS_ENABLE_RFO_PREFETCH)
+  _mm_prefetch((const char*)a, _MM_HINT_ET0);
 #endif
-  __asm__ __volatile__(
-      "lock incw %0"
-      : /* no output registers */
-      : "m" (a[0])
-      : "memory"
-    );
-#elif defined( KOKKOS_ENABLE_SERIAL_ATOMICS )
+  __asm__ __volatile__("lock incw %0"
+                       : /* no output registers */
+                       : "m"(a[0])
+                       : "memory");
+#elif defined(KOKKOS_ENABLE_SERIAL_ATOMICS)
   short* a_nv = const_cast<short*>(a);
   ++(*a_nv);
 #else
@@ -94,60 +91,55 @@ void atomic_increment<short>(volatile short* a) {
 #endif
 }
 
-template<>
-KOKKOS_INLINE_FUNCTION
-void atomic_increment<int>(volatile int* a) {
-#if defined( KOKKOS_ENABLE_ASM ) && defined( KOKKOS_ENABLE_ISA_X86_64 ) && ! defined(_WIN32) && ! defined(__CUDA_ARCH__)
-#if defined( KOKKOS_ENABLE_RFO_PREFETCH )
-  _mm_prefetch( (const char*) a, _MM_HINT_ET0 );
+template <>
+KOKKOS_INLINE_FUNCTION void atomic_increment<int>(volatile int* a) {
+#if defined(KOKKOS_ENABLE_ASM) && defined(KOKKOS_ENABLE_ISA_X86_64) && \
+    !defined(_WIN32) && !defined(__CUDA_ARCH__)
+#if defined(KOKKOS_ENABLE_RFO_PREFETCH)
+  _mm_prefetch((const char*)a, _MM_HINT_ET0);
 #endif
-  __asm__ __volatile__(
-      "lock incl %0"
-      : /* no output registers */
-      : "m" (a[0])
-      : "memory"
-    );
-#elif defined( KOKKOS_ENABLE_SERIAL_ATOMICS )
+  __asm__ __volatile__("lock incl %0"
+                       : /* no output registers */
+                       : "m"(a[0])
+                       : "memory");
+#elif defined(KOKKOS_ENABLE_SERIAL_ATOMICS)
   int* a_nv = const_cast<int*>(a);
   ++(*a_nv);
 #else
-  Kokkos::atomic_fetch_add(a,int(1));
+  Kokkos::atomic_fetch_add(a, int(1));
 #endif
 }
 
-template<>
-KOKKOS_INLINE_FUNCTION
-void atomic_increment<long long int>(volatile long long int* a) {
-#if defined( KOKKOS_ENABLE_ASM ) && defined( KOKKOS_ENABLE_ISA_X86_64 ) && ! defined(_WIN32) && ! defined(__CUDA_ARCH__)
-#if defined( KOKKOS_ENABLE_RFO_PREFETCH )
-  _mm_prefetch( (const char*) a, _MM_HINT_ET0 );
+template <>
+KOKKOS_INLINE_FUNCTION void atomic_increment<long long int>(
+    volatile long long int* a) {
+#if defined(KOKKOS_ENABLE_ASM) && defined(KOKKOS_ENABLE_ISA_X86_64) && \
+    !defined(_WIN32) && !defined(__CUDA_ARCH__)
+#if defined(KOKKOS_ENABLE_RFO_PREFETCH)
+  _mm_prefetch((const char*)a, _MM_HINT_ET0);
 #endif
-  __asm__ __volatile__(
-      "lock incq %0"
-      : /* no output registers */
-      : "m" (a[0])
-      : "memory"
-    );
-#elif defined( KOKKOS_ENABLE_SERIAL_ATOMICS )
+  __asm__ __volatile__("lock incq %0"
+                       : /* no output registers */
+                       : "m"(a[0])
+                       : "memory");
+#elif defined(KOKKOS_ENABLE_SERIAL_ATOMICS)
   long long int* a_nv = const_cast<long long int*>(a);
   ++(*a_nv);
 #else
   using T = long long int;
-  Kokkos::atomic_fetch_add(a,T(1));
+  Kokkos::atomic_fetch_add(a, T(1));
 #endif
 }
 
-template<typename T>
-KOKKOS_INLINE_FUNCTION
-void atomic_increment(volatile T* a) {
-#if defined( KOKKOS_ENABLE_SERIAL_ATOMICS )
+template <typename T>
+KOKKOS_INLINE_FUNCTION void atomic_increment(volatile T* a) {
+#if defined(KOKKOS_ENABLE_SERIAL_ATOMICS)
   T* a_nv = const_cast<T*>(a);
   ++(*a_nv);
 #else
-  Kokkos::atomic_fetch_add(a,T(1));
+  Kokkos::atomic_fetch_add(a, T(1));
 #endif
 }
 
-} // End of namespace Kokkos
+}  // End of namespace Kokkos
 #endif
-
diff --git a/lib/kokkos/core/src/impl/Kokkos_Atomic_Load.hpp b/lib/kokkos/core/src/impl/Kokkos_Atomic_Load.hpp
index 2db74b9f1e..6b4c82b620 100644
--- a/lib/kokkos/core/src/impl/Kokkos_Atomic_Load.hpp
+++ b/lib/kokkos/core/src/impl/Kokkos_Atomic_Load.hpp
@@ -2,10 +2,10 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
+//                        Kokkos v. 3.0
 //              Copyright (2019) Sandia Corporation
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +23,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -48,6 +48,7 @@
 #if defined(KOKKOS_ATOMIC_HPP)
 
 #include <impl/Kokkos_Atomic_Memory_Order.hpp>
+#include <impl/Kokkos_Atomic_Generic.hpp>
 
 #if defined(KOKKOS_ENABLE_CUDA)
 #include <Cuda/Kokkos_Cuda_Atomic_Intrinsics.hpp>
@@ -58,56 +59,38 @@ namespace Impl {
 
 // Olivier's implementation helpfully binds to the same builtins as GNU, so
 // we make this code common across multiple options
-#if (defined(KOKKOS_ENABLE_GNU_ATOMICS) && !defined(__CUDA_ARCH__)) \
-    || (defined(KOKKOS_ENABLE_INTEL_ATOMICS) && !defined(__CUDA_ARCH__)) \
-    || defined(KOKKOS_ENABLE_CUDA_ASM_ATOMICS)
+#if (defined(KOKKOS_ENABLE_GNU_ATOMICS) && !defined(__CUDA_ARCH__)) ||   \
+    (defined(KOKKOS_ENABLE_INTEL_ATOMICS) && !defined(__CUDA_ARCH__)) || \
+    defined(KOKKOS_ENABLE_CUDA_ASM_ATOMICS)
 
 #if defined(__CUDA_ARCH__) && defined(KOKKOS_ENABLE_CUDA_ASM_ATOMICS)
-  #define KOKKOS_INTERNAL_INLINE_DEVICE_IF_CUDA_ARCH __inline__ __device__
+#define KOKKOS_INTERNAL_INLINE_DEVICE_IF_CUDA_ARCH __inline__ __device__
 #else
-  #define KOKKOS_INTERNAL_INLINE_DEVICE_IF_CUDA_ARCH inline
+#define KOKKOS_INTERNAL_INLINE_DEVICE_IF_CUDA_ARCH inline
 #endif
 
 template <class T, class MemoryOrder>
-KOKKOS_INTERNAL_INLINE_DEVICE_IF_CUDA_ARCH
-T _atomic_load(
-  T* ptr, MemoryOrder,
-  typename std::enable_if<
-    (
-      sizeof(T) == 1
-        || sizeof(T) == 2
-        || sizeof(T) == 4
-        || sizeof(T) == 8
-    )
-    && std::is_same<
-      typename MemoryOrder::memory_order,
-      typename std::remove_cv<MemoryOrder>::type
-    >::value,
-    void const**
-  >::type = nullptr
-) {
+KOKKOS_INTERNAL_INLINE_DEVICE_IF_CUDA_ARCH T _atomic_load(
+    T* ptr, MemoryOrder,
+    typename std::enable_if<
+        (sizeof(T) == 1 || sizeof(T) == 2 || sizeof(T) == 4 ||
+         sizeof(T) == 8) &&
+            std::is_same<typename MemoryOrder::memory_order,
+                         typename std::remove_cv<MemoryOrder>::type>::value,
+        void const**>::type = nullptr) {
   return __atomic_load_n(ptr, MemoryOrder::gnu_constant);
 }
 
 template <class T, class MemoryOrder>
-KOKKOS_INTERNAL_INLINE_DEVICE_IF_CUDA_ARCH
-T _atomic_load(
-  T* ptr, MemoryOrder,
-  typename std::enable_if<
-    !(
-      sizeof(T) == 1
-        || sizeof(T) == 2
-        || sizeof(T) == 4
-        || sizeof(T) == 8
-    )
-    && std::is_default_constructible<T>::value
-    && std::is_same<
-      typename MemoryOrder::memory_order,
-      typename std::remove_cv<MemoryOrder>::type
-    >::value,
-    void const**
-  >::type = nullptr
-) {
+KOKKOS_INTERNAL_INLINE_DEVICE_IF_CUDA_ARCH T _atomic_load(
+    T* ptr, MemoryOrder,
+    typename std::enable_if<
+        !(sizeof(T) == 1 || sizeof(T) == 2 || sizeof(T) == 4 ||
+          sizeof(T) == 8) &&
+            std::is_default_constructible<T>::value &&
+            std::is_same<typename MemoryOrder::memory_order,
+                         typename std::remove_cv<MemoryOrder>::type>::value,
+        void const**>::type = nullptr) {
   T rv{};
   __atomic_load(ptr, &rv, MemoryOrder::gnu_constant);
   return rv;
@@ -120,51 +103,34 @@ T _atomic_load(
 // Not compiling for Volta or later, or Cuda ASM atomics were manually disabled
 
 template <class T>
-__device__ __inline__
-T _relaxed_atomic_load_impl(
-  T* ptr,
-  typename std::enable_if<
-    (
-      sizeof(T) == 1
-      || sizeof(T) == 2
-      || sizeof(T) == 4
-      || sizeof(T) == 8
-    ),
-    void const**
-  >::type = nullptr
-) {
+__device__ __inline__ T _relaxed_atomic_load_impl(
+    T* ptr, typename std::enable_if<(sizeof(T) == 1 || sizeof(T) == 2 ||
+                                     sizeof(T) == 4 || sizeof(T) == 8),
+                                    void const**>::type = nullptr) {
   return *ptr;
 }
 
 template <class T>
 struct NoOpOper {
-  __device__ __inline__
-  static constexpr T apply(T const&, T const&) noexcept { }
+  __device__ __inline__ static constexpr T apply(T const& t,
+                                                 T const&) noexcept {
+    return t;
+  }
 };
 
 template <class T>
-__device__ __inline__
-T _relaxed_atomic_load_impl(
-  T* ptr,
-  typename std::enable_if<
-    !(
-      sizeof(T) == 1
-      || sizeof(T) == 2
-      || sizeof(T) == 4
-      || sizeof(T) == 8
-    ),
-    void const**
-  >::type = nullptr
-) {
+__device__ __inline__ T _relaxed_atomic_load_impl(
+    T* ptr, typename std::enable_if<!(sizeof(T) == 1 || sizeof(T) == 2 ||
+                                      sizeof(T) == 4 || sizeof(T) == 8),
+                                    void const**>::type = nullptr) {
   T rv{};
   // TODO remove a copy operation here?
-  Kokkos::atomic_oper_fetch(NoOpOper<T>{}, &rv, rv);
+  Kokkos::Impl::atomic_oper_fetch(NoOpOper<T>{}, &rv, rv);
   return rv;
 }
 
 template <class T>
-__device__ __inline__
-T _atomic_load(T* ptr, memory_order_seq_cst_t) {
+__device__ __inline__ T _atomic_load(T* ptr, memory_order_seq_cst_t) {
   Kokkos::memory_fence();
   T rv = Impl::_relaxed_atomic_load_impl(ptr);
   Kokkos::memory_fence();
@@ -172,95 +138,86 @@ T _atomic_load(T* ptr, memory_order_seq_cst_t) {
 }
 
 template <class T>
-__device__ __inline__
-T _atomic_load(T* ptr, memory_order_acquire_t) {
+__device__ __inline__ T _atomic_load(T* ptr, memory_order_acquire_t) {
   T rv = Impl::_relaxed_atomic_load_impl(ptr);
   Kokkos::memory_fence();
   return rv;
 }
 
 template <class T>
-__device__ __inline__
-T _atomic_load(T* ptr, memory_order_relaxed_t) {
+__device__ __inline__ T _atomic_load(T* ptr, memory_order_relaxed_t) {
   return _relaxed_atomic_load_impl(ptr);
 }
 
 #elif defined(KOKKOS_ENABLE_OPENMP_ATOMICS)
 
 template <class T, class MemoryOrder>
-inline
-T _atomic_load(T* ptr, MemoryOrder)
-{
-  // AFAICT, all OpenMP atomics are sequentially consistent, so memory order doesn't matter
-  T retval{ };
+inline T _atomic_load(T* ptr, MemoryOrder) {
+  // AFAICT, all OpenMP atomics are sequentially consistent, so memory order
+  // doesn't matter
+  T retval{};
 #pragma omp atomic read
-  {
-    retval = *ptr;
-  }
+  { retval = *ptr; }
   return retval;
 }
 
 #elif defined(KOKKOS_ENABLE_SERIAL_ATOMICS)
 
 template <class T, class MemoryOrder>
-inline
-T _atomic_load(T* ptr, MemoryOrder)
-{
+inline T _atomic_load(T* ptr, MemoryOrder) {
   return *ptr;
 }
 
-#endif // end of all atomic implementations
-
+#endif  // end of all atomic implementations
 
 template <class T>
-KOKKOS_FORCEINLINE_FUNCTION
-T atomic_load(T* ptr, Impl::memory_order_seq_cst_t) {
+KOKKOS_FORCEINLINE_FUNCTION T atomic_load(T* ptr,
+                                          Impl::memory_order_seq_cst_t) {
   return _atomic_load(ptr, Impl::memory_order_seq_cst);
 }
 
 template <class T>
-KOKKOS_FORCEINLINE_FUNCTION
-T atomic_load(T* ptr, Impl::memory_order_acquire_t) {
+KOKKOS_FORCEINLINE_FUNCTION T atomic_load(T* ptr,
+                                          Impl::memory_order_acquire_t) {
   return _atomic_load(ptr, Impl::memory_order_acquire);
 }
 
 template <class T>
-KOKKOS_FORCEINLINE_FUNCTION
-T atomic_load(T* ptr, Impl::memory_order_relaxed_t) {
+KOKKOS_FORCEINLINE_FUNCTION T atomic_load(T* ptr,
+                                          Impl::memory_order_relaxed_t) {
   return _atomic_load(ptr, Impl::memory_order_relaxed);
 }
 
 template <class T>
-KOKKOS_FORCEINLINE_FUNCTION
-T atomic_load(T* ptr, Impl::memory_order_release_t) {
+KOKKOS_FORCEINLINE_FUNCTION T atomic_load(T* ptr,
+                                          Impl::memory_order_release_t) {
   static_assert(
-    sizeof(T) == 0, // just something that will always be false, but only on instantiation
-    "atomic_load with memory order release doesn't make any sense!"
-  );
+      sizeof(T) == 0,  // just something that will always be false, but only on
+                       // instantiation
+      "atomic_load with memory order release doesn't make any sense!");
 }
 
 template <class T>
-KOKKOS_FORCEINLINE_FUNCTION
-T atomic_load(T* ptr, Impl::memory_order_acq_rel_t) {
+KOKKOS_FORCEINLINE_FUNCTION T atomic_load(T* ptr,
+                                          Impl::memory_order_acq_rel_t) {
   static_assert(
-    sizeof(T) == 0, // just something that will always be false, but only on instantiation
-    "atomic_load with memory order acq_rel doesn't make any sense!"
-  );
+      sizeof(T) == 0,  // just something that will always be false, but only on
+                       // instantiation
+      "atomic_load with memory order acq_rel doesn't make any sense!");
 }
 
 template <class T>
-KOKKOS_FORCEINLINE_FUNCTION
-T atomic_load(T* ptr) {
+KOKKOS_FORCEINLINE_FUNCTION T atomic_load(T* ptr) {
   // relaxed by default!
   return _atomic_load(ptr, Impl::memory_order_relaxed);
 }
 
-} // end namespace Impl
-} // end namespace Kokkos
+}  // end namespace Impl
+}  // end namespace Kokkos
 
 #if defined(KOKKOS_ENABLE_CUDA)
 #include <Cuda/Kokkos_Cuda_Atomic_Intrinsics_Restore_Builtins.hpp>
 #endif
 
-#endif // defined(KOKKOS_ATOMIC_HPP)
-#endif //KOKKOS_IMPL_KOKKOS_ATOMIC_LOAD_HPP
+#endif  // defined(KOKKOS_ATOMIC_HPP)
+#endif  // KOKKOS_IMPL_KOKKOS_ATOMIC_LOAD_HPP
diff --git a/lib/kokkos/core/src/impl/Kokkos_Atomic_Memory_Order.hpp b/lib/kokkos/core/src/impl/Kokkos_Atomic_Memory_Order.hpp
index 7b9c08551c..72a6dfa9a4 100644
--- a/lib/kokkos/core/src/impl/Kokkos_Atomic_Memory_Order.hpp
+++ b/lib/kokkos/core/src/impl/Kokkos_Atomic_Memory_Order.hpp
@@ -2,10 +2,10 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
+//                        Kokkos v. 3.0
 //              Copyright (2019) Sandia Corporation
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +23,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -60,63 +60,62 @@ namespace Impl {
 
 struct memory_order_seq_cst_t {
   using memory_order = memory_order_seq_cst_t;
-#if defined(KOKKOS_ENABLE_GNU_ATOMICS) \
-    || defined(KOKKOS_ENABLE_INTEL_ATOMICS) \
-    || defined(KOKKOS_ENABLE_CUDA_ASM_ATOMICS)
+#if defined(KOKKOS_ENABLE_GNU_ATOMICS) ||   \
+    defined(KOKKOS_ENABLE_INTEL_ATOMICS) || \
+    defined(KOKKOS_ENABLE_CUDA_ASM_ATOMICS)
   static constexpr auto gnu_constant = __ATOMIC_SEQ_CST;
 #endif
   static constexpr auto std_constant = std::memory_order_seq_cst;
 };
-constexpr memory_order_seq_cst_t memory_order_seq_cst = { };
+constexpr memory_order_seq_cst_t memory_order_seq_cst = {};
 
 struct memory_order_relaxed_t {
   using memory_order = memory_order_relaxed_t;
-#if defined(KOKKOS_ENABLE_GNU_ATOMICS) \
-    || defined(KOKKOS_ENABLE_INTEL_ATOMICS) \
-    || defined(KOKKOS_ENABLE_CUDA_ASM_ATOMICS)
+#if defined(KOKKOS_ENABLE_GNU_ATOMICS) ||   \
+    defined(KOKKOS_ENABLE_INTEL_ATOMICS) || \
+    defined(KOKKOS_ENABLE_CUDA_ASM_ATOMICS)
   static constexpr auto gnu_constant = __ATOMIC_RELAXED;
 #endif
   static constexpr auto std_constant = std::memory_order_relaxed;
 };
-constexpr memory_order_relaxed_t memory_order_relaxed = { };
+constexpr memory_order_relaxed_t memory_order_relaxed = {};
 
 struct memory_order_acquire_t {
   using memory_order = memory_order_acquire_t;
-#if defined(KOKKOS_ENABLE_GNU_ATOMICS) \
-    || defined(KOKKOS_ENABLE_INTEL_ATOMICS) \
-    || defined(KOKKOS_ENABLE_CUDA_ASM_ATOMICS)
+#if defined(KOKKOS_ENABLE_GNU_ATOMICS) ||   \
+    defined(KOKKOS_ENABLE_INTEL_ATOMICS) || \
+    defined(KOKKOS_ENABLE_CUDA_ASM_ATOMICS)
   static constexpr auto gnu_constant = __ATOMIC_ACQUIRE;
 #endif
   static constexpr auto std_constant = std::memory_order_acquire;
 };
-constexpr memory_order_acquire_t memory_order_acquire = { };
+constexpr memory_order_acquire_t memory_order_acquire = {};
 
 struct memory_order_release_t {
   using memory_order = memory_order_release_t;
-#if defined(KOKKOS_ENABLE_GNU_ATOMICS) \
-    || defined(KOKKOS_ENABLE_INTEL_ATOMICS) \
-    || defined(KOKKOS_ENABLE_CUDA_ASM_ATOMICS)
+#if defined(KOKKOS_ENABLE_GNU_ATOMICS) ||   \
+    defined(KOKKOS_ENABLE_INTEL_ATOMICS) || \
+    defined(KOKKOS_ENABLE_CUDA_ASM_ATOMICS)
   static constexpr auto gnu_constant = __ATOMIC_RELEASE;
 #endif
   static constexpr auto std_constant = std::memory_order_release;
 };
-constexpr memory_order_release_t memory_order_release = { };
+constexpr memory_order_release_t memory_order_release = {};
 
 struct memory_order_acq_rel_t {
   using memory_order = memory_order_acq_rel_t;
-#if defined(KOKKOS_ENABLE_GNU_ATOMICS) \
-    || defined(KOKKOS_ENABLE_INTEL_ATOMICS) \
-    || defined(KOKKOS_ENABLE_CUDA_ASM_ATOMICS)
+#if defined(KOKKOS_ENABLE_GNU_ATOMICS) ||   \
+    defined(KOKKOS_ENABLE_INTEL_ATOMICS) || \
+    defined(KOKKOS_ENABLE_CUDA_ASM_ATOMICS)
   static constexpr auto gnu_constant = __ATOMIC_ACQ_REL;
 #endif
   static constexpr auto std_constant = std::memory_order_acq_rel;
 };
-constexpr memory_order_acq_rel_t memory_order_acq_rel = { };
-
+constexpr memory_order_acq_rel_t memory_order_acq_rel = {};
 
 // Intentionally omit consume (for now)
 
-} // end namespace Impl
-} // end namespace Kokkos
+}  // end namespace Impl
+}  // end namespace Kokkos
 
-#endif //KOKKOS_KOKKOS_ATOMIC_MEMORY_ORDER_HPP
+#endif  // KOKKOS_KOKKOS_ATOMIC_MEMORY_ORDER_HPP
diff --git a/lib/kokkos/core/src/impl/Kokkos_Atomic_Store.hpp b/lib/kokkos/core/src/impl/Kokkos_Atomic_Store.hpp
index 066f90480d..6cd246e3ae 100644
--- a/lib/kokkos/core/src/impl/Kokkos_Atomic_Store.hpp
+++ b/lib/kokkos/core/src/impl/Kokkos_Atomic_Store.hpp
@@ -2,10 +2,10 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
+//                        Kokkos v. 3.0
 //              Copyright (2019) Sandia Corporation
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +23,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -48,6 +48,7 @@
 #if defined(KOKKOS_ATOMIC_HPP)
 
 #include <impl/Kokkos_Atomic_Memory_Order.hpp>
+#include <impl/Kokkos_Atomic_Generic.hpp>
 
 #if defined(KOKKOS_ENABLE_CUDA)
 #include <Cuda/Kokkos_Cuda_Atomic_Intrinsics.hpp>
@@ -58,56 +59,38 @@ namespace Impl {
 
 // Olivier's implementation helpfully binds to the same builtins as GNU, so
 // we make this code common across multiple options
-#if (defined(KOKKOS_ENABLE_GNU_ATOMICS) && !defined(__CUDA_ARCH__)) \
-    || (defined(KOKKOS_ENABLE_INTEL_ATOMICS) && !defined(__CUDA_ARCH__)) \
-    || defined(KOKKOS_ENABLE_CUDA_ASM_ATOMICS)
+#if (defined(KOKKOS_ENABLE_GNU_ATOMICS) && !defined(__CUDA_ARCH__)) ||   \
+    (defined(KOKKOS_ENABLE_INTEL_ATOMICS) && !defined(__CUDA_ARCH__)) || \
+    defined(KOKKOS_ENABLE_CUDA_ASM_ATOMICS)
 
 #if defined(__CUDA_ARCH__) && defined(KOKKOS_ENABLE_CUDA_ASM_ATOMICS)
-  #define KOKKOS_INTERNAL_INLINE_DEVICE_IF_CUDA_ARCH __inline__ __device__
+#define KOKKOS_INTERNAL_INLINE_DEVICE_IF_CUDA_ARCH __inline__ __device__
 #else
-  #define KOKKOS_INTERNAL_INLINE_DEVICE_IF_CUDA_ARCH inline
+#define KOKKOS_INTERNAL_INLINE_DEVICE_IF_CUDA_ARCH inline
 #endif
 
 template <class T, class MemoryOrder>
-KOKKOS_INTERNAL_INLINE_DEVICE_IF_CUDA_ARCH
-void _atomic_store(
-  T* ptr, T val, MemoryOrder,
-  typename std::enable_if<
-    (
-      sizeof(T) == 1
-        || sizeof(T) == 2
-        || sizeof(T) == 4
-        || sizeof(T) == 8
-    )
-    && std::is_same<
-      typename MemoryOrder::memory_order,
-      typename std::remove_cv<MemoryOrder>::type
-    >::value,
-    void const**
-  >::type = nullptr
-) {
+KOKKOS_INTERNAL_INLINE_DEVICE_IF_CUDA_ARCH void _atomic_store(
+    T* ptr, T val, MemoryOrder,
+    typename std::enable_if<
+        (sizeof(T) == 1 || sizeof(T) == 2 || sizeof(T) == 4 ||
+         sizeof(T) == 8) &&
+            std::is_same<typename MemoryOrder::memory_order,
+                         typename std::remove_cv<MemoryOrder>::type>::value,
+        void const**>::type = nullptr) {
   __atomic_store_n(ptr, val, MemoryOrder::gnu_constant);
 }
 
 template <class T, class MemoryOrder>
-KOKKOS_INTERNAL_INLINE_DEVICE_IF_CUDA_ARCH
-void _atomic_store(
-  T* ptr, T val, MemoryOrder,
-  typename std::enable_if<
-    !(
-      sizeof(T) == 1
-        || sizeof(T) == 2
-        || sizeof(T) == 4
-        || sizeof(T) == 8
-    )
-    && std::is_default_constructible<T>::value
-    && std::is_same<
-      typename MemoryOrder::memory_order,
-      typename std::remove_cv<MemoryOrder>::type
-    >::value,
-    void const**
-  >::type = nullptr
-) {
+KOKKOS_INTERNAL_INLINE_DEVICE_IF_CUDA_ARCH void _atomic_store(
+    T* ptr, T val, MemoryOrder,
+    typename std::enable_if<
+        !(sizeof(T) == 1 || sizeof(T) == 2 || sizeof(T) == 4 ||
+          sizeof(T) == 8) &&
+            std::is_default_constructible<T>::value &&
+            std::is_same<typename MemoryOrder::memory_order,
+                         typename std::remove_cv<MemoryOrder>::type>::value,
+        void const**>::type = nullptr) {
   __atomic_store(ptr, &val, MemoryOrder::gnu_constant);
 }
 
@@ -118,141 +101,119 @@ void _atomic_store(
 // Not compiling for Volta or later, or Cuda ASM atomics were manually disabled
 
 template <class T>
-__device__ __inline__
-void _relaxed_atomic_store_impl(
-  T* ptr, T val,
-  typename std::enable_if<
-    (
-      sizeof(T) == 1
-      || sizeof(T) == 2
-      || sizeof(T) == 4
-      || sizeof(T) == 8
-    ),
-    void const**
-  >::type = nullptr
-) {
+__device__ __inline__ void _relaxed_atomic_store_impl(
+    T* ptr, T val,
+    typename std::enable_if<(sizeof(T) == 1 || sizeof(T) == 2 ||
+                             sizeof(T) == 4 || sizeof(T) == 8),
+                            void const**>::type = nullptr) {
   *ptr = val;
 }
 
 template <class T>
 struct StoreOper {
-  __device__ __inline__
-  static constexpr T apply(T const&, T const& val) noexcept { return val; }
+  __device__ __inline__ static constexpr T apply(T const&,
+                                                 T const& val) noexcept {
+    return val;
+  }
 };
 
 template <class T>
-__device__ __inline__
-void _relaxed_atomic_store_impl(
-  T* ptr, T val,
-  typename std::enable_if<
-    !(
-      sizeof(T) == 1
-      || sizeof(T) == 2
-      || sizeof(T) == 4
-      || sizeof(T) == 8
-    ),
-    void const**
-  >::type = nullptr
-) {
-  Kokkos::atomic_oper_fetch(StoreOper<T>{}, &rv, (T&&)val);
+__device__ __inline__ void _relaxed_atomic_store_impl(
+    T* ptr, T val,
+    typename std::enable_if<!(sizeof(T) == 1 || sizeof(T) == 2 ||
+                              sizeof(T) == 4 || sizeof(T) == 8),
+                            void const**>::type = nullptr) {
+  Kokkos::Impl::atomic_oper_fetch(StoreOper<T>{}, ptr, (T &&) val);
 }
 
 template <class T>
-__device__ __inline__
-void _atomic_store(T* ptr, T val, memory_order_seq_cst_t) {
+__device__ __inline__ void _atomic_store(T* ptr, T val,
+                                         memory_order_seq_cst_t) {
   Kokkos::memory_fence();
   Impl::_relaxed_atomic_store_impl(ptr, val);
   Kokkos::memory_fence();
-  return rv;
 }
 
 template <class T>
-__device__ __inline__
-void _atomic_store(T* ptr, T val, memory_order_release_t) {
+__device__ __inline__ void _atomic_store(T* ptr, T val,
+                                         memory_order_release_t) {
   Kokkos::memory_fence();
   _relaxed_atomic_store_impl(ptr, val);
 }
 
 template <class T>
-__device__ __inline__
-void _atomic_store(T* ptr, T val, memory_order_relaxed_t) {
+__device__ __inline__ void _atomic_store(T* ptr, T val,
+                                         memory_order_relaxed_t) {
   _relaxed_atomic_store_impl(ptr, val);
 }
 
 #elif defined(KOKKOS_ENABLE_OPENMP_ATOMICS)
 
 template <class T, class MemoryOrder>
-inline
-void _atomic_store(T* ptr, T val, MemoryOrder)
-{
-  // AFAICT, all OpenMP atomics are sequentially consistent, so memory order doesn't matter
+inline void _atomic_store(T* ptr, T val, MemoryOrder) {
+  // AFAICT, all OpenMP atomics are sequentially consistent, so memory order
+  // doesn't matter
 #pragma omp atomic write
-  {
-    *ptr = val;
-  }
+  { *ptr = val; }
 }
 
 #elif defined(KOKKOS_ENABLE_SERIAL_ATOMICS)
 
 template <class T, class MemoryOrder>
-inline
-void _atomic_store(T* ptr, T val, MemoryOrder)
-{
+inline void _atomic_store(T* ptr, T val, MemoryOrder) {
   *ptr = val;
 }
 
-#endif // end of all atomic implementations
-
+#endif  // end of all atomic implementations
 
 template <class T>
-KOKKOS_FORCEINLINE_FUNCTION
-void atomic_store(T* ptr, T val, Impl::memory_order_seq_cst_t) {
+KOKKOS_FORCEINLINE_FUNCTION void atomic_store(T* ptr, T val,
+                                              Impl::memory_order_seq_cst_t) {
   _atomic_store(ptr, val, Impl::memory_order_seq_cst);
 }
 
 template <class T>
-KOKKOS_FORCEINLINE_FUNCTION
-void atomic_store(T* ptr, T val, Impl::memory_order_release_t) {
+KOKKOS_FORCEINLINE_FUNCTION void atomic_store(T* ptr, T val,
+                                              Impl::memory_order_release_t) {
   _atomic_store(ptr, val, Impl::memory_order_release);
 }
 
 template <class T>
-KOKKOS_FORCEINLINE_FUNCTION
-void atomic_store(T* ptr, T val, Impl::memory_order_relaxed_t) {
+KOKKOS_FORCEINLINE_FUNCTION void atomic_store(T* ptr, T val,
+                                              Impl::memory_order_relaxed_t) {
   _atomic_store(ptr, val, Impl::memory_order_relaxed);
 }
 
 template <class T>
-KOKKOS_FORCEINLINE_FUNCTION
-void atomic_store(T* ptr, T val, Impl::memory_order_acquire_t) {
+KOKKOS_FORCEINLINE_FUNCTION void atomic_store(T* ptr, T val,
+                                              Impl::memory_order_acquire_t) {
   static_assert(
-    sizeof(T) == 0, // just something that will always be false, but only on instantiation
-    "atomic_store with memory order acquire doesn't make any sense!"
-  );
+      sizeof(T) == 0,  // just something that will always be false, but only on
+                       // instantiation
+      "atomic_store with memory order acquire doesn't make any sense!");
 }
 
 template <class T>
-KOKKOS_FORCEINLINE_FUNCTION
-void atomic_store(T* ptr, T val, Impl::memory_order_acq_rel_t) {
+KOKKOS_FORCEINLINE_FUNCTION void atomic_store(T* ptr, T val,
+                                              Impl::memory_order_acq_rel_t) {
   static_assert(
-    sizeof(T) == 0, // just something that will always be false, but only on instantiation
-    "atomic_store with memory order acq_rel doesn't make any sense!"
-  );
+      sizeof(T) == 0,  // just something that will always be false, but only on
+                       // instantiation
+      "atomic_store with memory order acq_rel doesn't make any sense!");
 }
 
 template <class T>
-KOKKOS_FORCEINLINE_FUNCTION
-void atomic_store(T* ptr, T val) {
+KOKKOS_FORCEINLINE_FUNCTION void atomic_store(T* ptr, T val) {
   // relaxed by default!
   _atomic_store(ptr, Impl::memory_order_relaxed);
 }
 
-} // end namespace Impl
-} // end namespace Kokkos
+}  // end namespace Impl
+}  // end namespace Kokkos
 
 #if defined(KOKKOS_ENABLE_CUDA)
 #include <Cuda/Kokkos_Cuda_Atomic_Intrinsics_Restore_Builtins.hpp>
 #endif
 
-#endif // defined(KOKKOS_ATOMIC_HPP)
-#endif //KOKKOS_IMPL_KOKKOS_ATOMIC_STORE_HPP
+#endif  // defined(KOKKOS_ATOMIC_HPP)
+#endif  // KOKKOS_IMPL_KOKKOS_ATOMIC_STORE_HPP
diff --git a/lib/kokkos/core/src/impl/Kokkos_Atomic_View.hpp b/lib/kokkos/core/src/impl/Kokkos_Atomic_View.hpp
index 7f63f93060..bfe9bcd0b3 100644
--- a/lib/kokkos/core/src/impl/Kokkos_Atomic_View.hpp
+++ b/lib/kokkos/core/src/impl/Kokkos_Atomic_View.hpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -46,386 +47,335 @@
 #include <Kokkos_Macros.hpp>
 #include <Kokkos_Atomic.hpp>
 
-namespace Kokkos { namespace Impl {
+namespace Kokkos {
+namespace Impl {
 
-//The following tag is used to prevent an implicit call of the constructor when trying
-//to assign a literal 0 int ( = 0 );
+// The following tag is used to prevent an implicit call of the constructor when
+// trying to assign a literal 0 int ( = 0 );
 struct AtomicViewConstTag {};
 
-template<class ViewTraits>
+template <class ViewTraits>
 class AtomicDataElement {
-public:
+ public:
   typedef typename ViewTraits::value_type value_type;
   typedef typename ViewTraits::const_value_type const_value_type;
   typedef typename ViewTraits::non_const_value_type non_const_value_type;
   volatile value_type* const ptr;
 
   KOKKOS_INLINE_FUNCTION
-  AtomicDataElement(value_type* ptr_, AtomicViewConstTag ):ptr(ptr_){}
+  AtomicDataElement(value_type* ptr_, AtomicViewConstTag) : ptr(ptr_) {}
 
   KOKKOS_INLINE_FUNCTION
-  const_value_type operator = (const_value_type& val) const {
+  const_value_type operator=(const_value_type& val) const {
     *ptr = val;
     return val;
   }
   KOKKOS_INLINE_FUNCTION
-  const_value_type operator = (volatile const_value_type& val) const {
+  const_value_type operator=(volatile const_value_type& val) const {
     *ptr = val;
     return val;
   }
 
   KOKKOS_INLINE_FUNCTION
-  void inc() const {
-    Kokkos::atomic_increment(ptr);
+  void inc() const { Kokkos::atomic_increment(ptr); }
+
+  KOKKOS_INLINE_FUNCTION
+  void dec() const { Kokkos::atomic_decrement(ptr); }
+
+  KOKKOS_INLINE_FUNCTION
+  const_value_type operator++() const {
+    const_value_type tmp =
+        Kokkos::atomic_fetch_add(ptr, non_const_value_type(1));
+    return tmp + 1;
   }
 
   KOKKOS_INLINE_FUNCTION
-  void dec() const {
-    Kokkos::atomic_decrement(ptr);
+  const_value_type operator--() const {
+    const_value_type tmp =
+        Kokkos::atomic_fetch_sub(ptr, non_const_value_type(1));
+    return tmp - 1;
   }
 
   KOKKOS_INLINE_FUNCTION
-  const_value_type operator ++ () const {
-    const_value_type tmp = Kokkos::atomic_fetch_add(ptr,non_const_value_type(1));
-    return tmp+1;
+  const_value_type operator++(int) const {
+    return Kokkos::atomic_fetch_add(ptr, non_const_value_type(1));
   }
 
   KOKKOS_INLINE_FUNCTION
-  const_value_type operator -- () const {
-    const_value_type tmp = Kokkos::atomic_fetch_sub(ptr,non_const_value_type(1));
-    return tmp-1;
+  const_value_type operator--(int) const {
+    return Kokkos::atomic_fetch_sub(ptr, non_const_value_type(1));
   }
 
   KOKKOS_INLINE_FUNCTION
-  const_value_type operator ++ (int) const {
-    return Kokkos::atomic_fetch_add(ptr,non_const_value_type(1));
+  const_value_type operator+=(const_value_type& val) const {
+    const_value_type tmp = Kokkos::atomic_fetch_add(ptr, val);
+    return tmp + val;
+  }
+  KOKKOS_INLINE_FUNCTION
+  const_value_type operator+=(volatile const_value_type& val) const {
+    const_value_type tmp = Kokkos::atomic_fetch_add(ptr, val);
+    return tmp + val;
   }
 
   KOKKOS_INLINE_FUNCTION
-  const_value_type operator -- (int) const {
-    return Kokkos::atomic_fetch_sub(ptr,non_const_value_type(1));
+  const_value_type operator-=(const_value_type& val) const {
+    const_value_type tmp = Kokkos::atomic_fetch_sub(ptr, val);
+    return tmp - val;
+  }
+  KOKKOS_INLINE_FUNCTION
+  const_value_type operator-=(volatile const_value_type& val) const {
+    const_value_type tmp = Kokkos::atomic_fetch_sub(ptr, val);
+    return tmp - val;
   }
 
   KOKKOS_INLINE_FUNCTION
-  const_value_type operator += (const_value_type& val) const {
-    const_value_type tmp = Kokkos::atomic_fetch_add(ptr,val);
-    return tmp+val;
+  const_value_type operator*=(const_value_type& val) const {
+    return Kokkos::atomic_mul_fetch(ptr, val);
   }
   KOKKOS_INLINE_FUNCTION
-  const_value_type operator += (volatile const_value_type& val) const {
-    const_value_type tmp = Kokkos::atomic_fetch_add(ptr,val);
-    return tmp+val;
+  const_value_type operator*=(volatile const_value_type& val) const {
+    return Kokkos::atomic_mul_fetch(ptr, val);
   }
 
   KOKKOS_INLINE_FUNCTION
-  const_value_type operator -= (const_value_type& val) const {
-    const_value_type tmp = Kokkos::atomic_fetch_sub(ptr,val);
-    return tmp-val;
+  const_value_type operator/=(const_value_type& val) const {
+    return Kokkos::atomic_div_fetch(ptr, val);
   }
   KOKKOS_INLINE_FUNCTION
-  const_value_type operator -= (volatile const_value_type& val) const {
-    const_value_type tmp = Kokkos::atomic_fetch_sub(ptr,val);
-    return tmp-val;
+  const_value_type operator/=(volatile const_value_type& val) const {
+    return Kokkos::atomic_div_fetch(ptr, val);
   }
 
   KOKKOS_INLINE_FUNCTION
-  const_value_type operator *= (const_value_type& val) const {
-    return Kokkos::atomic_mul_fetch(ptr,val);
+  const_value_type operator%=(const_value_type& val) const {
+    return Kokkos::atomic_mod_fetch(ptr, val);
   }
   KOKKOS_INLINE_FUNCTION
-  const_value_type operator *= (volatile const_value_type& val) const {
-    return Kokkos::atomic_mul_fetch(ptr,val);
+  const_value_type operator%=(volatile const_value_type& val) const {
+    return Kokkos::atomic_mod_fetch(ptr, val);
   }
 
   KOKKOS_INLINE_FUNCTION
-  const_value_type operator /= (const_value_type& val) const {
-    return Kokkos::atomic_div_fetch(ptr,val);
+  const_value_type operator&=(const_value_type& val) const {
+    return Kokkos::atomic_and_fetch(ptr, val);
   }
   KOKKOS_INLINE_FUNCTION
-  const_value_type operator /= (volatile const_value_type& val) const {
-    return Kokkos::atomic_div_fetch(ptr,val);
+  const_value_type operator&=(volatile const_value_type& val) const {
+    return Kokkos::atomic_and_fetch(ptr, val);
   }
 
   KOKKOS_INLINE_FUNCTION
-  const_value_type operator %= (const_value_type& val) const {
-    return Kokkos::atomic_mod_fetch(ptr,val);
+  const_value_type operator^=(const_value_type& val) const {
+    return Kokkos::atomic_xor_fetch(ptr, val);
   }
   KOKKOS_INLINE_FUNCTION
-  const_value_type operator %= (volatile const_value_type& val) const {
-    return Kokkos::atomic_mod_fetch(ptr,val);
+  const_value_type operator^=(volatile const_value_type& val) const {
+    return Kokkos::atomic_xor_fetch(ptr, val);
   }
 
   KOKKOS_INLINE_FUNCTION
-  const_value_type operator &= (const_value_type& val) const {
-    return Kokkos::atomic_and_fetch(ptr,val);
+  const_value_type operator|=(const_value_type& val) const {
+    return Kokkos::atomic_or_fetch(ptr, val);
   }
   KOKKOS_INLINE_FUNCTION
-  const_value_type operator &= (volatile const_value_type& val) const {
-    return Kokkos::atomic_and_fetch(ptr,val);
+  const_value_type operator|=(volatile const_value_type& val) const {
+    return Kokkos::atomic_or_fetch(ptr, val);
   }
 
   KOKKOS_INLINE_FUNCTION
-  const_value_type operator ^= (const_value_type& val) const {
-    return Kokkos::atomic_xor_fetch(ptr,val);
+  const_value_type operator<<=(const_value_type& val) const {
+    return Kokkos::atomic_lshift_fetch(ptr, val);
   }
   KOKKOS_INLINE_FUNCTION
-  const_value_type operator ^= (volatile const_value_type& val) const {
-    return Kokkos::atomic_xor_fetch(ptr,val);
+  const_value_type operator<<=(volatile const_value_type& val) const {
+    return Kokkos::atomic_lshift_fetch(ptr, val);
   }
 
   KOKKOS_INLINE_FUNCTION
-  const_value_type operator |= (const_value_type& val) const {
-    return Kokkos::atomic_or_fetch(ptr,val);
+  const_value_type operator>>=(const_value_type& val) const {
+    return Kokkos::atomic_rshift_fetch(ptr, val);
   }
   KOKKOS_INLINE_FUNCTION
-  const_value_type operator |= (volatile const_value_type& val) const {
-    return Kokkos::atomic_or_fetch(ptr,val);
+  const_value_type operator>>=(volatile const_value_type& val) const {
+    return Kokkos::atomic_rshift_fetch(ptr, val);
   }
 
   KOKKOS_INLINE_FUNCTION
-  const_value_type operator <<= (const_value_type& val) const {
-    return Kokkos::atomic_lshift_fetch(ptr,val);
-  }
+  const_value_type operator+(const_value_type& val) const { return *ptr + val; }
   KOKKOS_INLINE_FUNCTION
-  const_value_type operator <<= (volatile const_value_type& val) const {
-    return Kokkos::atomic_lshift_fetch(ptr,val);
+  const_value_type operator+(volatile const_value_type& val) const {
+    return *ptr + val;
   }
 
   KOKKOS_INLINE_FUNCTION
-  const_value_type operator >>= (const_value_type& val) const {
-    return Kokkos::atomic_rshift_fetch(ptr,val);
-  }
+  const_value_type operator-(const_value_type& val) const { return *ptr - val; }
   KOKKOS_INLINE_FUNCTION
-  const_value_type operator >>= (volatile const_value_type& val) const {
-    return Kokkos::atomic_rshift_fetch(ptr,val);
+  const_value_type operator-(volatile const_value_type& val) const {
+    return *ptr - val;
   }
 
   KOKKOS_INLINE_FUNCTION
-  const_value_type operator + (const_value_type& val) const {
-    return *ptr+val;
-  }
+  const_value_type operator*(const_value_type& val) const { return *ptr * val; }
   KOKKOS_INLINE_FUNCTION
-  const_value_type operator + (volatile const_value_type& val) const {
-    return *ptr+val;
+  const_value_type operator*(volatile const_value_type& val) const {
+    return *ptr * val;
   }
 
   KOKKOS_INLINE_FUNCTION
-  const_value_type operator - (const_value_type& val) const {
-    return *ptr-val;
-  }
+  const_value_type operator/(const_value_type& val) const { return *ptr / val; }
   KOKKOS_INLINE_FUNCTION
-  const_value_type operator - (volatile const_value_type& val) const {
-    return *ptr-val;
+  const_value_type operator/(volatile const_value_type& val) const {
+    return *ptr / val;
   }
 
   KOKKOS_INLINE_FUNCTION
-  const_value_type operator * (const_value_type& val) const {
-    return *ptr*val;
-  }
+  const_value_type operator%(const_value_type& val) const { return *ptr ^ val; }
   KOKKOS_INLINE_FUNCTION
-  const_value_type operator * (volatile const_value_type& val) const {
-    return *ptr*val;
+  const_value_type operator%(volatile const_value_type& val) const {
+    return *ptr ^ val;
   }
 
   KOKKOS_INLINE_FUNCTION
-  const_value_type operator / (const_value_type& val) const {
-    return *ptr/val;
+  const_value_type operator!() const { return !*ptr; }
+
+  KOKKOS_INLINE_FUNCTION
+  const_value_type operator&&(const_value_type& val) const {
+    return *ptr && val;
   }
   KOKKOS_INLINE_FUNCTION
-  const_value_type operator / (volatile const_value_type& val) const {
-    return *ptr/val;
+  const_value_type operator&&(volatile const_value_type& val) const {
+    return *ptr && val;
   }
 
   KOKKOS_INLINE_FUNCTION
-  const_value_type operator % (const_value_type& val) const {
-    return *ptr^val;
+  const_value_type operator||(const_value_type& val) const {
+    return *ptr | val;
   }
   KOKKOS_INLINE_FUNCTION
-  const_value_type operator % (volatile const_value_type& val) const {
-    return *ptr^val;
+  const_value_type operator||(volatile const_value_type& val) const {
+    return *ptr | val;
   }
 
   KOKKOS_INLINE_FUNCTION
-  const_value_type operator ! () const {
-    return !*ptr;
+  const_value_type operator&(const_value_type& val) const { return *ptr & val; }
+  KOKKOS_INLINE_FUNCTION
+  const_value_type operator&(volatile const_value_type& val) const {
+    return *ptr & val;
   }
 
   KOKKOS_INLINE_FUNCTION
-  const_value_type operator && (const_value_type& val) const {
-    return *ptr&&val;
-  }
+  const_value_type operator|(const_value_type& val) const { return *ptr | val; }
   KOKKOS_INLINE_FUNCTION
-  const_value_type operator && (volatile const_value_type& val) const {
-    return *ptr&&val;
+  const_value_type operator|(volatile const_value_type& val) const {
+    return *ptr | val;
   }
 
   KOKKOS_INLINE_FUNCTION
-  const_value_type operator || (const_value_type& val) const {
-    return *ptr|val;
-  }
+  const_value_type operator^(const_value_type& val) const { return *ptr ^ val; }
   KOKKOS_INLINE_FUNCTION
-  const_value_type operator || (volatile const_value_type& val) const {
-    return *ptr|val;
+  const_value_type operator^(volatile const_value_type& val) const {
+    return *ptr ^ val;
   }
 
   KOKKOS_INLINE_FUNCTION
-  const_value_type operator & (const_value_type& val) const {
-    return *ptr&val;
+  const_value_type operator~() const { return ~*ptr; }
+
+  KOKKOS_INLINE_FUNCTION
+  const_value_type operator<<(const unsigned int& val) const {
+    return *ptr << val;
   }
   KOKKOS_INLINE_FUNCTION
-  const_value_type operator & (volatile const_value_type& val) const {
-    return *ptr&val;
+  const_value_type operator<<(volatile const unsigned int& val) const {
+    return *ptr << val;
   }
 
   KOKKOS_INLINE_FUNCTION
-  const_value_type operator | (const_value_type& val) const {
-    return *ptr|val;
+  const_value_type operator>>(const unsigned int& val) const {
+    return *ptr >> val;
   }
   KOKKOS_INLINE_FUNCTION
-  const_value_type operator | (volatile const_value_type& val) const {
-    return *ptr|val;
+  const_value_type operator>>(volatile const unsigned int& val) const {
+    return *ptr >> val;
   }
 
   KOKKOS_INLINE_FUNCTION
-  const_value_type operator ^ (const_value_type& val) const {
-    return *ptr^val;
-  }
+  bool operator==(const_value_type& val) const { return *ptr == val; }
   KOKKOS_INLINE_FUNCTION
-  const_value_type operator ^ (volatile const_value_type& val) const {
-    return *ptr^val;
-  }
+  bool operator==(volatile const_value_type& val) const { return *ptr == val; }
 
   KOKKOS_INLINE_FUNCTION
-  const_value_type operator ~ () const {
-    return ~*ptr;
-  }
+  bool operator!=(const_value_type& val) const { return *ptr != val; }
+  KOKKOS_INLINE_FUNCTION
+  bool operator!=(volatile const_value_type& val) const { return *ptr != val; }
 
   KOKKOS_INLINE_FUNCTION
-  const_value_type operator << (const unsigned int& val) const {
-    return *ptr<<val;
-  }
+  bool operator>=(const_value_type& val) const { return *ptr >= val; }
   KOKKOS_INLINE_FUNCTION
-  const_value_type operator << (volatile const unsigned int& val) const {
-    return *ptr<<val;
-  }
+  bool operator>=(volatile const_value_type& val) const { return *ptr >= val; }
 
   KOKKOS_INLINE_FUNCTION
-  const_value_type operator >> (const unsigned int& val) const {
-    return *ptr>>val;
-  }
+  bool operator<=(const_value_type& val) const { return *ptr <= val; }
   KOKKOS_INLINE_FUNCTION
-  const_value_type operator >> (volatile const unsigned int& val) const {
-    return *ptr>>val;
-  }
+  bool operator<=(volatile const_value_type& val) const { return *ptr <= val; }
 
   KOKKOS_INLINE_FUNCTION
-  bool operator == (const_value_type& val) const {
-    return *ptr == val;
-  }
+  bool operator<(const_value_type& val) const { return *ptr < val; }
   KOKKOS_INLINE_FUNCTION
-  bool operator == (volatile const_value_type& val) const {
-    return *ptr == val;
-  }
+  bool operator<(volatile const_value_type& val) const { return *ptr < val; }
 
   KOKKOS_INLINE_FUNCTION
-  bool operator != (const_value_type& val) const {
-    return *ptr != val;
-  }
+  bool operator>(const_value_type& val) const { return *ptr > val; }
   KOKKOS_INLINE_FUNCTION
-  bool operator != (volatile const_value_type& val) const {
-    return *ptr != val;
-  }
+  bool operator>(volatile const_value_type& val) const { return *ptr > val; }
 
   KOKKOS_INLINE_FUNCTION
-  bool operator >= (const_value_type& val) const {
-    return *ptr >= val;
-  }
-  KOKKOS_INLINE_FUNCTION
-  bool operator >= (volatile const_value_type& val) const {
-    return *ptr >= val;
-  }
-
-  KOKKOS_INLINE_FUNCTION
-  bool operator <= (const_value_type& val) const {
-    return *ptr <= val;
-  }
-  KOKKOS_INLINE_FUNCTION
-  bool operator <= (volatile const_value_type& val) const {
-    return *ptr <= val;
-  }
-
-  KOKKOS_INLINE_FUNCTION
-  bool operator < (const_value_type& val) const {
-    return *ptr < val;
-  }
-  KOKKOS_INLINE_FUNCTION
-  bool operator < (volatile const_value_type& val) const {
-    return *ptr < val;
-  }
-
-  KOKKOS_INLINE_FUNCTION
-  bool operator > (const_value_type& val) const {
-    return *ptr > val;
-  }
-  KOKKOS_INLINE_FUNCTION
-  bool operator > (volatile const_value_type& val) const {
-    return *ptr > val;
-  }
-
-  KOKKOS_INLINE_FUNCTION
-  operator const_value_type () const {
-    //return Kokkos::atomic_load(ptr);
+  operator const_value_type() const {
+    // return Kokkos::atomic_load(ptr);
     return *ptr;
   }
 
   KOKKOS_INLINE_FUNCTION
-  operator volatile non_const_value_type () volatile const {
-    //return Kokkos::atomic_load(ptr);
+  operator volatile non_const_value_type() volatile const {
+    // return Kokkos::atomic_load(ptr);
     return *ptr;
   }
 };
 
-template<class ViewTraits>
+template <class ViewTraits>
 class AtomicViewDataHandle {
-public:
+ public:
   typename ViewTraits::value_type* ptr;
 
   KOKKOS_INLINE_FUNCTION
-  AtomicViewDataHandle()
-    : ptr(NULL)
-  {}
+  AtomicViewDataHandle() : ptr(NULL) {}
 
   KOKKOS_INLINE_FUNCTION
-  AtomicViewDataHandle(typename ViewTraits::value_type* ptr_)
-    :ptr(ptr_)
-  {}
+  AtomicViewDataHandle(typename ViewTraits::value_type* ptr_) : ptr(ptr_) {}
 
-  template<class iType>
-  KOKKOS_INLINE_FUNCTION
-  AtomicDataElement<ViewTraits> operator[] (const iType& i) const {
-    return AtomicDataElement<ViewTraits>(ptr+i,AtomicViewConstTag());
+  template <class iType>
+  KOKKOS_INLINE_FUNCTION AtomicDataElement<ViewTraits> operator[](
+      const iType& i) const {
+    return AtomicDataElement<ViewTraits>(ptr + i, AtomicViewConstTag());
   }
 
-
   KOKKOS_INLINE_FUNCTION
-  operator typename ViewTraits::value_type * () const { return ptr ; }
-
+  operator typename ViewTraits::value_type*() const { return ptr; }
 };
 
-template<unsigned Size>
+template <unsigned Size>
 struct Kokkos_Atomic_is_only_allowed_with_32bit_and_64bit_scalars;
 
-template<>
+template <>
 struct Kokkos_Atomic_is_only_allowed_with_32bit_and_64bit_scalars<4> {
   typedef int type;
 };
 
-template<>
+template <>
 struct Kokkos_Atomic_is_only_allowed_with_32bit_and_64bit_scalars<8> {
   typedef int64_t type;
 };
 
-}} // namespace Kokkos::Impl
+}  // namespace Impl
+}  // namespace Kokkos
 
 #endif
-
diff --git a/lib/kokkos/core/src/impl/Kokkos_Atomic_Windows.hpp b/lib/kokkos/core/src/impl/Kokkos_Atomic_Windows.hpp
index b18134f40c..25230982ec 100644
--- a/lib/kokkos/core/src/impl/Kokkos_Atomic_Windows.hpp
+++ b/lib/kokkos/core/src/impl/Kokkos_Atomic_Windows.hpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -52,190 +53,191 @@
 #include <windows.h>
 
 namespace Kokkos {
-  namespace Impl {
+namespace Impl {
 #ifdef _MSC_VER
-    _declspec(align(16))
+_declspec(align(16))
 #endif
-    struct cas128_t
-    {
-      LONGLONG lower;
-      LONGLONG upper;
-      KOKKOS_INLINE_FUNCTION
-        bool operator != (const cas128_t& a) const {
-        return (lower != a.lower) || upper != a.upper;
-      }
-    }
-#ifdef __GNUC__
-    __attribute__ ((aligned (16)))
-#endif
-    ;
-  }
-
-  template < typename T >
+    struct cas128_t {
+  LONGLONG lower;
+  LONGLONG upper;
   KOKKOS_INLINE_FUNCTION
-    T atomic_compare_exchange(volatile T * const dest, const T & compare,
-    typename Kokkos::Impl::enable_if< sizeof(T) == sizeof(LONG), const T & >::type val)
-  {
-    union U {
-      LONG i;
-      T t;
-      KOKKOS_INLINE_FUNCTION U() {};
-    } tmp;
-
-    tmp.i = _InterlockedCompareExchange((LONG*)dest, *((LONG*)&val), *((LONG*)&compare));
-    return tmp.t;
+  bool operator!=(const cas128_t& a) const {
+    return (lower != a.lower) || upper != a.upper;
   }
-
-  template < typename T >
-  KOKKOS_INLINE_FUNCTION
-    T atomic_compare_exchange(volatile T * const dest, const T & compare,
-    typename Kokkos::Impl::enable_if< sizeof(T) == sizeof(LONGLONG), const T & >::type val)
-  {
-    union U {
-      LONGLONG i;
-      T t;
-      KOKKOS_INLINE_FUNCTION U() {};
-    } tmp;
-
-    tmp.i = _InterlockedCompareExchange64((LONGLONG*)dest, *((LONGLONG*)&val), *((LONGLONG*)&compare));
-    return tmp.t;
-  }
-
-  template < typename T >
-  KOKKOS_INLINE_FUNCTION
-    T atomic_compare_exchange(volatile T * const dest, const T & compare,
-    typename Kokkos::Impl::enable_if< sizeof(T) == sizeof(Impl::cas128_t), const T & >::type val)
-  {
-    union U {
-      Impl::cas128_t i;
-      T t;
-      KOKKOS_INLINE_FUNCTION U() {};
-    } tmp, newval;
-    newval.t = val;
-    _InterlockedCompareExchange128((LONGLONG*)dest, newval.i.upper, newval.i.lower, ((LONGLONG*)&compare));
-    tmp.t = dest;
-    return tmp.t;
-  }
-
-  template < typename T >
-  KOKKOS_INLINE_FUNCTION
-    T atomic_compare_exchange_strong(volatile T * const dest, const T & compare, const T & val)
-  {
-    return atomic_compare_exchange(dest,compare,val);
-  }
-
-  template< typename T >
-  T atomic_fetch_or(volatile T * const dest, const T val) {
-    T oldval = *dest;
-    T assume;
-    do {
-      assume = oldval;
-      T newval = val | oldval;
-      oldval = atomic_compare_exchange(dest, assume, newval);
-    } while (assume != oldval);
-
-    return oldval;
-  }
-
-  template< typename T >
-  T atomic_fetch_and(volatile T * const dest, const T val) {
-    T oldval = *dest;
-    T assume;
-    do {
-      assume = oldval;
-      T newval = val & oldval;
-      oldval = atomic_compare_exchange(dest, assume, newval);
-    } while (assume != oldval);
-
-    return oldval;
-  }
-
-  template< typename T >
-  T atomic_fetch_add(volatile T * const dest, const T val) {
-    T oldval = *dest;
-    T assume;
-    do {
-      assume = oldval;
-      T newval = val + oldval;
-      oldval = atomic_compare_exchange(dest, assume, newval);
-    } while (assume != oldval);
-
-    return oldval;
-  }
-
-  template< typename T >
-  T atomic_fetch_sub(volatile T * const dest, const T val) {
-    T oldval = *dest;
-    T assume;
-    do {
-      assume = oldval;
-      T newval = val - oldval;
-      oldval = atomic_compare_exchange(dest, assume, newval);
-    } while (assume != oldval);
-
-    return oldval;
-  }
-
-  template< typename T >
-  T atomic_exchange(volatile T * const dest, const T val) {
-    T oldval = *dest;
-    T assume;
-    do {
-      assume = oldval;
-      oldval = atomic_compare_exchange(dest, assume, val);
-    } while (assume != oldval);
-
-    return oldval;
-  }
-
-  template< typename T >
-  void atomic_or(volatile T * const dest, const T val) {
-    atomic_fetch_or(dest, val);
-  }
-
-  template< typename T >
-  void atomic_and(volatile T * const dest, const T val) {
-    atomic_fetch_and(dest, val);
-  }
-
-  template< typename T >
-  void atomic_add(volatile T * const dest, const T val) {
-    atomic_fetch_add(dest, val);
-  }
-
-  template< typename T >
-  void atomic_sub(volatile T * const dest, const T val) {
-    atomic_fetch_sub(dest, val);
-  }
-
-  template< typename T >
-  void atomic_assign(volatile T * const dest, const T val) {
-    atomic_fetch_exchange(dest, val);
-  }
-
-  template< typename T >
-  T atomic_increment(volatile T * const dest) {
-    T oldval = *dest;
-    T assume;
-    do {
-      assume = oldval;
-      T newval = assume++;
-      oldval = atomic_compare_exchange(dest, assume, newval);
-    } while (assume != oldval);
-  }
-
-  template< typename T >
-  T atomic_decrement(volatile T * const dest) {
-    T oldval = *dest;
-    T assume;
-    do {
-      assume = oldval;
-      T newval = assume--;
-      oldval = atomic_compare_exchange(dest, assume, newval);
-    } while (assume != oldval);
-  }
-
 }
+#ifdef __GNUC__
+__attribute__((aligned(16)))
 #endif
-#endif
+;
+}  // namespace Impl
 
+template <typename T>
+KOKKOS_INLINE_FUNCTION T atomic_compare_exchange(
+    volatile T* const dest, const T& compare,
+    typename Kokkos::Impl::enable_if<sizeof(T) == sizeof(LONG), const T&>::type
+        val) {
+  union U {
+    LONG i;
+    T t;
+    KOKKOS_INLINE_FUNCTION U(){};
+  } tmp;
+
+  tmp.i = _InterlockedCompareExchange((LONG*)dest, *((LONG*)&val),
+                                      *((LONG*)&compare));
+  return tmp.t;
+}
+
+template <typename T>
+KOKKOS_INLINE_FUNCTION T atomic_compare_exchange(
+    volatile T* const dest, const T& compare,
+    typename Kokkos::Impl::enable_if<sizeof(T) == sizeof(LONGLONG),
+                                     const T&>::type val) {
+  union U {
+    LONGLONG i;
+    T t;
+    KOKKOS_INLINE_FUNCTION U(){};
+  } tmp;
+
+  tmp.i = _InterlockedCompareExchange64((LONGLONG*)dest, *((LONGLONG*)&val),
+                                        *((LONGLONG*)&compare));
+  return tmp.t;
+}
+
+template <typename T>
+KOKKOS_INLINE_FUNCTION T atomic_compare_exchange(
+    volatile T* const dest, const T& compare,
+    typename Kokkos::Impl::enable_if<sizeof(T) == sizeof(Impl::cas128_t),
+                                     const T&>::type val) {
+  union U {
+    Impl::cas128_t i;
+    T t;
+    KOKKOS_INLINE_FUNCTION U(){};
+  } tmp, newval;
+  newval.t = val;
+  _InterlockedCompareExchange128((LONGLONG*)dest, newval.i.upper,
+                                 newval.i.lower, ((LONGLONG*)&compare));
+  tmp.t = dest;
+  return tmp.t;
+}
+
+template <typename T>
+KOKKOS_INLINE_FUNCTION T atomic_compare_exchange_strong(volatile T* const dest,
+                                                        const T& compare,
+                                                        const T& val) {
+  return atomic_compare_exchange(dest, compare, val);
+}
+
+template <typename T>
+T atomic_fetch_or(volatile T* const dest, const T val) {
+  T oldval = *dest;
+  T assume;
+  do {
+    assume   = oldval;
+    T newval = val | oldval;
+    oldval   = atomic_compare_exchange(dest, assume, newval);
+  } while (assume != oldval);
+
+  return oldval;
+}
+
+template <typename T>
+T atomic_fetch_and(volatile T* const dest, const T val) {
+  T oldval = *dest;
+  T assume;
+  do {
+    assume   = oldval;
+    T newval = val & oldval;
+    oldval   = atomic_compare_exchange(dest, assume, newval);
+  } while (assume != oldval);
+
+  return oldval;
+}
+
+template <typename T>
+T atomic_fetch_add(volatile T* const dest, const T val) {
+  T oldval = *dest;
+  T assume;
+  do {
+    assume   = oldval;
+    T newval = val + oldval;
+    oldval   = atomic_compare_exchange(dest, assume, newval);
+  } while (assume != oldval);
+
+  return oldval;
+}
+
+template <typename T>
+T atomic_fetch_sub(volatile T* const dest, const T val) {
+  T oldval = *dest;
+  T assume;
+  do {
+    assume   = oldval;
+    T newval = val - oldval;
+    oldval   = atomic_compare_exchange(dest, assume, newval);
+  } while (assume != oldval);
+
+  return oldval;
+}
+
+template <typename T>
+T atomic_exchange(volatile T* const dest, const T val) {
+  T oldval = *dest;
+  T assume;
+  do {
+    assume = oldval;
+    oldval = atomic_compare_exchange(dest, assume, val);
+  } while (assume != oldval);
+
+  return oldval;
+}
+
+template <typename T>
+void atomic_or(volatile T* const dest, const T val) {
+  atomic_fetch_or(dest, val);
+}
+
+template <typename T>
+void atomic_and(volatile T* const dest, const T val) {
+  atomic_fetch_and(dest, val);
+}
+
+template <typename T>
+void atomic_add(volatile T* const dest, const T val) {
+  atomic_fetch_add(dest, val);
+}
+
+template <typename T>
+void atomic_sub(volatile T* const dest, const T val) {
+  atomic_fetch_sub(dest, val);
+}
+
+template <typename T>
+void atomic_assign(volatile T* const dest, const T val) {
+  atomic_fetch_exchange(dest, val);
+}
+
+template <typename T>
+T atomic_increment(volatile T* const dest) {
+  T oldval = *dest;
+  T assume;
+  do {
+    assume   = oldval;
+    T newval = assume++;
+    oldval   = atomic_compare_exchange(dest, assume, newval);
+  } while (assume != oldval);
+}
+
+template <typename T>
+T atomic_decrement(volatile T* const dest) {
+  T oldval = *dest;
+  T assume;
+  do {
+    assume   = oldval;
+    T newval = assume--;
+    oldval   = atomic_compare_exchange(dest, assume, newval);
+  } while (assume != oldval);
+}
+
+}  // namespace Kokkos
+#endif
+#endif
diff --git a/lib/kokkos/core/src/impl/Kokkos_BitOps.hpp b/lib/kokkos/core/src/impl/Kokkos_BitOps.hpp
index 1e6714c08c..7d2cdf0d4a 100644
--- a/lib/kokkos/core/src/impl/Kokkos_BitOps.hpp
+++ b/lib/kokkos/core/src/impl/Kokkos_BitOps.hpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -49,35 +50,35 @@
 #include <climits>
 
 #ifdef KOKKOS_COMPILER_INTEL
-#include<immintrin.h>
+#include <immintrin.h>
 #endif
 
-#if defined( __HCC_ACCELERATOR__ )
+#if defined(__HCC_ACCELERATOR__)
 #include <hc.hpp>
 #endif
 
 namespace Kokkos {
 
 KOKKOS_FORCEINLINE_FUNCTION
-int log2( unsigned i )
-{
+int log2(unsigned i) {
   enum : int { shift = sizeof(unsigned) * CHAR_BIT - 1 };
-#if defined( __CUDA_ARCH__ )
+#if defined(__CUDA_ARCH__)
   return shift - __clz(i);
-#elif defined( __HCC_ACCELERATOR__ )
-  return  (int)hc::__firstbit_u32_u32(i);
-#elif defined( KOKKOS_COMPILER_INTEL )
+#elif defined(__HCC_ACCELERATOR__)
+  return (int)hc::__firstbit_u32_u32(i);
+#elif defined(KOKKOS_COMPILER_INTEL)
   return _bit_scan_reverse(i);
-#elif defined( KOKKOS_COMPILER_IBM )
+#elif defined(KOKKOS_COMPILER_IBM)
   return shift - __cntlz4(i);
-#elif defined( KOKKOS_COMPILER_CRAYC )
-  return i ? shift - _leadz32(i) : 0 ;
-#elif defined( __GNUC__ ) || defined( __GNUG__ )
+#elif defined(KOKKOS_COMPILER_CRAYC)
+  return i ? shift - _leadz32(i) : 0;
+#elif defined(__GNUC__) || defined(__GNUG__)
   return shift - __builtin_clz(i);
 #else
   int offset = 0;
-  if ( i ) {
-    for ( offset = shift ; (i & ( 1 << offset ) ) == 0 ; --offset );
+  if (i) {
+    for (offset = shift; (i & (1 << offset)) == 0; --offset)
+      ;
   }
   return offset;
 #endif
@@ -90,50 +91,50 @@ namespace Impl {
  *  If none then return -1 ;
  */
 KOKKOS_FORCEINLINE_FUNCTION
-int bit_first_zero( unsigned i ) noexcept
-{
+int bit_first_zero(unsigned i) noexcept {
   enum : unsigned { full = ~0u };
 
-#if defined( __CUDA_ARCH__ )
-  return full != i ? __ffs( ~i ) - 1 : -1 ;
-#elif defined( __HCC_ACCELERATOR__ )
-  return full != i ? (int)hc::__firstbit_u32_u32(~i) : -1 ;
-#elif defined( KOKKOS_COMPILER_INTEL )
-  return full != i ? _bit_scan_forward( ~i ) : -1 ;
-#elif defined( KOKKOS_COMPILER_IBM )
-  return full != i ? __cnttz4( ~i ) : -1 ;
-#elif defined( KOKKOS_COMPILER_CRAYC )
-  return full != i ? _popcnt( i ^ (i+1) ) - 1 : -1 ;
-#elif defined( KOKKOS_COMPILER_GNU ) || defined( __GNUC__ ) || defined( __GNUG__ )
-  return full != i ? __builtin_ffs( ~i ) - 1 : -1 ;
+#if defined(__CUDA_ARCH__)
+  return full != i ? __ffs(~i) - 1 : -1;
+#elif defined(__HCC_ACCELERATOR__)
+  return full != i ? (int)hc::__firstbit_u32_u32(~i) : -1;
+#elif defined(KOKKOS_COMPILER_INTEL)
+  return full != i ? _bit_scan_forward(~i) : -1;
+#elif defined(KOKKOS_COMPILER_IBM)
+  return full != i ? __cnttz4(~i) : -1;
+#elif defined(KOKKOS_COMPILER_CRAYC)
+  return full != i ? _popcnt(i ^ (i + 1)) - 1 : -1;
+#elif defined(KOKKOS_COMPILER_GNU) || defined(__GNUC__) || defined(__GNUG__)
+  return full != i ? __builtin_ffs(~i) - 1 : -1;
 #else
-  int offset = -1 ;
-  if ( full != i ) {
-    for ( offset = 0 ; i & ( 1 << offset ) ; ++offset );
+  int offset = -1;
+  if (full != i) {
+    for (offset = 0; i & (1 << offset); ++offset)
+      ;
   }
-  return offset ;
+  return offset;
 #endif
 }
 
 KOKKOS_FORCEINLINE_FUNCTION
-int bit_scan_forward( unsigned i )
-{
-#if defined( __CUDA_ARCH__ )
+int bit_scan_forward(unsigned i) {
+#if defined(__CUDA_ARCH__)
   return __ffs(i) - 1;
-#elif defined( __HCC_ACCELERATOR__ )
-  return  (int)hc::__firstbit_u32_u32(i);
-#elif defined( KOKKOS_COMPILER_INTEL )
+#elif defined(__HCC_ACCELERATOR__)
+  return (int)hc::__firstbit_u32_u32(i);
+#elif defined(KOKKOS_COMPILER_INTEL)
   return _bit_scan_forward(i);
-#elif defined( KOKKOS_COMPILER_IBM )
+#elif defined(KOKKOS_COMPILER_IBM)
   return __cnttz4(i);
-#elif defined( KOKKOS_COMPILER_CRAYC )
-  return i ? _popcnt(~i & (i-1)) : -1;
-#elif defined( KOKKOS_COMPILER_GNU ) || defined( __GNUC__ ) || defined( __GNUG__ )
+#elif defined(KOKKOS_COMPILER_CRAYC)
+  return i ? _popcnt(~i & (i - 1)) : -1;
+#elif defined(KOKKOS_COMPILER_GNU) || defined(__GNUC__) || defined(__GNUG__)
   return __builtin_ffs(i) - 1;
 #else
   int offset = -1;
-  if ( i ) {
-    for ( offset = 0 ; (i & ( 1 << offset ) ) == 0 ; ++offset );
+  if (i) {
+    for (offset = 0; (i & (1 << offset)) == 0; ++offset)
+      ;
   }
   return offset;
 #endif
@@ -141,41 +142,37 @@ int bit_scan_forward( unsigned i )
 
 /// Count the number of bits set.
 KOKKOS_FORCEINLINE_FUNCTION
-int bit_count( unsigned i )
-{
-#if defined( __CUDA_ARCH__ )
+int bit_count(unsigned i) {
+#if defined(__CUDA_ARCH__)
   return __popc(i);
-#elif defined( __HCC_ACCELERATOR__ )
-  return  (int)hc::__popcount_u32_b32(i);
-#elif defined ( __INTEL_COMPILER )
+#elif defined(__HCC_ACCELERATOR__)
+  return (int)hc::__popcount_u32_b32(i);
+#elif defined(__INTEL_COMPILER)
   return _popcnt32(i);
-#elif defined( KOKKOS_COMPILER_IBM )
+#elif defined(KOKKOS_COMPILER_IBM)
   return __popcnt4(i);
-#elif defined( KOKKOS_COMPILER_CRAYC )
+#elif defined(KOKKOS_COMPILER_CRAYC)
   return _popcnt(i);
-#elif defined( __GNUC__ ) || defined( __GNUG__ )
+#elif defined(__GNUC__) || defined(__GNUG__)
   return __builtin_popcount(i);
 #else
   // http://graphics.stanford.edu/~seander/bithacks.html#CountBitsSetNaive
-  i = i - ( ( i >> 1 ) & ~0u / 3u );                             // temp
-  i = ( i & ~0u / 15u * 3u ) + ( ( i >> 2 ) & ~0u / 15u * 3u );  // temp
-  i = ( i + ( i >> 4 ) ) & ~0u / 255u * 15u;                     // temp
+  i = i - ((i >> 1) & ~0u / 3u);                           // temp
+  i = (i & ~0u / 15u * 3u) + ((i >> 2) & ~0u / 15u * 3u);  // temp
+  i = (i + (i >> 4)) & ~0u / 255u * 15u;                   // temp
 
   // count
-  return (int)( ( i * ( ~0u / 255u ) ) >> ( sizeof(unsigned) - 1 ) * CHAR_BIT );
+  return (int)((i * (~0u / 255u)) >> (sizeof(unsigned) - 1) * CHAR_BIT);
 #endif
 }
 
 KOKKOS_INLINE_FUNCTION
-unsigned integral_power_of_two_that_contains( const unsigned N )
-{
-  const unsigned i = Kokkos::log2( N );
-  return ( (1u << i) < N ) ? i + 1 : i ;
+unsigned integral_power_of_two_that_contains(const unsigned N) {
+  const unsigned i = Kokkos::log2(N);
+  return ((1u << i) < N) ? i + 1 : i;
 }
 
+}  // namespace Impl
+}  // namespace Kokkos
 
-} // namespace Impl
-} // namespace Kokkos
-
-#endif // KOKKOS_BITOPS_HPP
-
+#endif  // KOKKOS_BITOPS_HPP
diff --git a/lib/kokkos/core/src/impl/Kokkos_CPUDiscovery.cpp b/lib/kokkos/core/src/impl/Kokkos_CPUDiscovery.cpp
index 7b16a8a998..3b003f84eb 100644
--- a/lib/kokkos/core/src/impl/Kokkos_CPUDiscovery.cpp
+++ b/lib/kokkos/core/src/impl/Kokkos_CPUDiscovery.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -44,7 +45,7 @@
 #ifdef _WIN32
 #define WIN32_LEAN_AND_MEAN
 #include <windows.h>
-#else
+#elif !defined(__APPLE__)
 #include <unistd.h>
 #endif
 #include <cstdio>
@@ -55,33 +56,14 @@
 namespace Kokkos {
 namespace Impl {
 
-//The following function (processors_per_node) is copied from here:
-// https://lists.gnu.org/archive/html/autoconf/2002-08/msg00126.html
-// Philip Willoughby
-
 int processors_per_node() {
-  int nprocs = -1;
-  int nprocs_max = -1;
-#ifdef _WIN32
-#ifndef _SC_NPROCESSORS_ONLN
-SYSTEM_INFO info;
-GetSystemInfo(&info);
-#define sysconf(a) info.dwNumberOfProcessors
-#define _SC_NPROCESSORS_ONLN
-#endif
-#endif
 #ifdef _SC_NPROCESSORS_ONLN
-  nprocs = sysconf(_SC_NPROCESSORS_ONLN);
-  if (nprocs < 1)
-  {
+  int const num_procs     = sysconf(_SC_NPROCESSORS_ONLN);
+  int const num_procs_max = sysconf(_SC_NPROCESSORS_CONF);
+  if ((num_procs < 1) || (num_procs_max < 1)) {
     return -1;
   }
-  nprocs_max = sysconf(_SC_NPROCESSORS_CONF);
-  if (nprocs_max < 1)
-  {
-    return -1;
-  }
-  return nprocs;
+  return num_procs;
 #else
   return -1;
 #endif
@@ -90,25 +72,25 @@ GetSystemInfo(&info);
 int mpi_ranks_per_node() {
   char *str;
   int ppn = 1;
-  //if ((str = getenv("SLURM_TASKS_PER_NODE"))) {
+  // if ((str = getenv("SLURM_TASKS_PER_NODE"))) {
   //  ppn = atoi(str);
   //  if(ppn<=0) ppn = 1;
   //}
   if ((str = getenv("MV2_COMM_WORLD_LOCAL_SIZE"))) {
     ppn = atoi(str);
-    if(ppn<=0) ppn = 1;
+    if (ppn <= 0) ppn = 1;
   }
   if ((str = getenv("OMPI_COMM_WORLD_LOCAL_SIZE"))) {
     ppn = atoi(str);
-    if(ppn<=0) ppn = 1;
+    if (ppn <= 0) ppn = 1;
   }
   return ppn;
 }
 
 int mpi_local_rank_on_node() {
   char *str;
-  int local_rank=0;
-  //if ((str = getenv("SLURM_LOCALID"))) {
+  int local_rank = 0;
+  // if ((str = getenv("SLURM_LOCALID"))) {
   //  local_rank = atoi(str);
   //}
   if ((str = getenv("MV2_COMM_WORLD_LOCAL_RANK"))) {
@@ -120,6 +102,5 @@ int mpi_local_rank_on_node() {
   return local_rank;
 }
 
-}
-}
-
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/impl/Kokkos_CPUDiscovery.hpp b/lib/kokkos/core/src/impl/Kokkos_CPUDiscovery.hpp
index 2b200b057d..6ba14c85b1 100644
--- a/lib/kokkos/core/src/impl/Kokkos_CPUDiscovery.hpp
+++ b/lib/kokkos/core/src/impl/Kokkos_CPUDiscovery.hpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -47,5 +48,5 @@ int processors_per_node();
 int mpi_ranks_per_node();
 int mpi_local_rank_on_node();
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/impl/Kokkos_ChaseLev.hpp b/lib/kokkos/core/src/impl/Kokkos_ChaseLev.hpp
index f86e68cb1d..bff0ed8315 100644
--- a/lib/kokkos/core/src/impl/Kokkos_ChaseLev.hpp
+++ b/lib/kokkos/core/src/impl/Kokkos_ChaseLev.hpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -47,14 +48,15 @@
 #define KOKKOS_IMPL_LOCKFREEDEQUE_HPP
 
 #include <Kokkos_Macros.hpp>
-#ifdef KOKKOS_ENABLE_TASKDAG // Note: implies CUDA_VERSION >= 8000 if using CUDA
+#ifdef KOKKOS_ENABLE_TASKDAG  // Note: implies CUDA_VERSION >= 8000 if using
+                              // CUDA
 
 #include <Kokkos_Core_fwd.hpp>
 
 #include <Kokkos_PointerOwnership.hpp>
 #include <impl/Kokkos_OptionalRef.hpp>
-#include <impl/Kokkos_Error.hpp> // KOKKOS_EXPECTS
-#include <impl/Kokkos_LinkedListNode.hpp> // KOKKOS_EXPECTS
+#include <impl/Kokkos_Error.hpp>           // KOKKOS_EXPECTS
+#include <impl/Kokkos_LinkedListNode.hpp>  // KOKKOS_EXPECTS
 
 #include <Kokkos_Atomic.hpp>  // atomic_compare_exchange, atomic_fence
 #include "Kokkos_LIFO.hpp"
@@ -70,23 +72,21 @@ namespace Impl {
 
 template <class NodeType, size_t CircularBufferSize, class SizeType = size_t>
 struct fixed_size_circular_buffer {
-public:
-
+ public:
   using node_type = NodeType;
   using size_type = SizeType;
 
-private:
+ private:
+  node_type* m_buffer[CircularBufferSize] = {nullptr};
 
-  node_type* m_buffer[CircularBufferSize] = { nullptr };
-
-public:
-
-  fixed_size_circular_buffer() = default;
+ public:
+  fixed_size_circular_buffer()                                  = default;
   fixed_size_circular_buffer(fixed_size_circular_buffer const&) = delete;
-  fixed_size_circular_buffer(fixed_size_circular_buffer&&) = default;
-  fixed_size_circular_buffer& operator=(fixed_size_circular_buffer const&) = delete;
+  fixed_size_circular_buffer(fixed_size_circular_buffer&&)      = default;
+  fixed_size_circular_buffer& operator=(fixed_size_circular_buffer const&) =
+      delete;
   fixed_size_circular_buffer& operator=(fixed_size_circular_buffer&&) = default;
-  ~fixed_size_circular_buffer() = default;
+  ~fixed_size_circular_buffer()                                       = default;
 
   KOKKOS_FORCEINLINE_FUNCTION
   static constexpr size_type size() noexcept {
@@ -106,38 +106,33 @@ public:
 
 template <class NodeType, class SizeType = size_t>
 struct non_owning_variable_size_circular_buffer {
-public:
-
+ public:
   using node_type = NodeType;
   using size_type = SizeType;
 
-private:
-
+ private:
   ObservingRawPtr<node_type*> m_buffer = nullptr;
-  size_type m_size = 0;
-
-public:
+  size_type m_size                     = 0;
 
+ public:
   KOKKOS_INLINE_FUNCTION
-  non_owning_variable_size_circular_buffer(
-    ObservingRawPtr<node_type*> buffer,
-    size_type arg_size
-  ) noexcept
-    : m_buffer(buffer),
-      m_size(arg_size)
-  { }
+  non_owning_variable_size_circular_buffer(ObservingRawPtr<node_type*> buffer,
+                                           size_type arg_size) noexcept
+      : m_buffer(buffer), m_size(arg_size) {}
 
   non_owning_variable_size_circular_buffer() = default;
-  non_owning_variable_size_circular_buffer(non_owning_variable_size_circular_buffer const&) = delete;
-  non_owning_variable_size_circular_buffer(non_owning_variable_size_circular_buffer&&) = default;
-  non_owning_variable_size_circular_buffer& operator=(non_owning_variable_size_circular_buffer const&) = delete;
-  non_owning_variable_size_circular_buffer& operator=(non_owning_variable_size_circular_buffer&&) = default;
-  ~non_owning_variable_size_circular_buffer() = default;
+  non_owning_variable_size_circular_buffer(
+      non_owning_variable_size_circular_buffer const&) = delete;
+  non_owning_variable_size_circular_buffer(
+      non_owning_variable_size_circular_buffer&&)      = default;
+  non_owning_variable_size_circular_buffer& operator   =(
+      non_owning_variable_size_circular_buffer const&) = delete;
+  non_owning_variable_size_circular_buffer& operator   =(
+      non_owning_variable_size_circular_buffer&&) = default;
+  ~non_owning_variable_size_circular_buffer()          = default;
 
   KOKKOS_FORCEINLINE_FUNCTION
-  constexpr size_type size() const noexcept {
-    return m_size;
-  }
+  constexpr size_type size() const noexcept { return m_size; }
 
   KOKKOS_FORCEINLINE_FUNCTION
   node_type* operator[](size_type idx) const noexcept {
@@ -154,42 +149,28 @@ public:
  * PPoPP '13, https://www.di.ens.fr/~zappa/readings/ppopp13.pdf
  *
  */
-template <
-  class T,
-  class CircularBufferT,
-  class SizeType = int32_t
->
+template <class T, class CircularBufferT, class SizeType = int32_t>
 struct ChaseLevDeque {
-public:
-
-  using size_type = SizeType;
+ public:
+  using size_type  = SizeType;
   using value_type = T;
   // Still using intrusive linked list for waiting queue
   using node_type = SimpleSinglyLinkedListNode<>;
 
-private:
-
+ private:
   // TODO @tasking @new_feature DSH variable size circular buffer?
 
   CircularBufferT m_array;
-  size_type m_top = 0;
+  size_type m_top    = 0;
   size_type m_bottom = 0;
 
+ public:
+  template <class _ignore = void,
+            class         = typename std::enable_if<
+                std::is_default_constructible<CircularBufferT>::value>::type>
+  ChaseLevDeque() : m_array() {}
 
-public:
-
-  template <
-    class _ignore=void,
-    class=typename std::enable_if<
-      std::is_default_constructible<CircularBufferT>::value
-    >::type
-  >
-  ChaseLevDeque() : m_array() { }
-
-  explicit
-  ChaseLevDeque(CircularBufferT buffer)
-    : m_array(std::move(buffer))
-  { }
+  explicit ChaseLevDeque(CircularBufferT buffer) : m_array(std::move(buffer)) {}
 
   KOKKOS_INLINE_FUNCTION
   bool empty() const {
@@ -198,75 +179,75 @@ public:
   }
 
   KOKKOS_INLINE_FUNCTION
-  OptionalRef<T>
-  pop() {
-    auto b = m_bottom - 1; // atomic load relaxed
-    auto& a = m_array; // atomic load relaxed
-    m_bottom = b; // atomic store relaxed
-    Kokkos::memory_fence(); // memory order seq_cst
-    auto t = m_top; // atomic load relaxed
+  OptionalRef<T> pop() {
+    auto b   = m_bottom - 1;  // atomic load relaxed
+    auto& a  = m_array;       // atomic load relaxed
+    m_bottom = b;             // atomic store relaxed
+    Kokkos::memory_fence();   // memory order seq_cst
+    auto t = m_top;           // atomic load relaxed
     OptionalRef<T> return_value;
-    if(t <= b) {
+    if (t <= b) {
       /* non-empty queue */
-      return_value = *static_cast<T*>(a[b]); // relaxed load
-      if(t == b) {
+      return_value = *static_cast<T*>(a[b]);  // relaxed load
+      if (t == b) {
         /* single last element in the queue. */
-        if(not Impl::atomic_compare_exchange_strong(&m_top, t, t+1, memory_order_seq_cst, memory_order_relaxed)) {
+        if (not Impl::atomic_compare_exchange_strong(
+                &m_top, t, t + 1, memory_order_seq_cst, memory_order_relaxed)) {
           /* failed race, someone else stole it */
           return_value = nullptr;
         }
-        m_bottom = b + 1; // memory order relaxed
+        m_bottom = b + 1;  // memory order relaxed
       }
     } else {
       /* empty queue */
-      m_bottom = b + 1; // memory order relaxed
+      m_bottom = b + 1;  // memory order relaxed
     }
     return return_value;
   }
 
   KOKKOS_INLINE_FUNCTION
-  bool push(node_type&& node)
-  {
+  bool push(node_type&& node) {
     // Just forward to the lvalue version
     return push(node);
   }
 
   KOKKOS_INLINE_FUNCTION
-  bool push(node_type& node)
-  {
-    auto b = m_bottom; // memory order relaxed
-    auto t = Impl::atomic_load(&m_top, memory_order_acquire);
+  bool push(node_type& node) {
+    auto b  = m_bottom;  // memory order relaxed
+    auto t  = Impl::atomic_load(&m_top, memory_order_acquire);
     auto& a = m_array;
-    if(b - t > a.size() - 1) {
+    if (b - t > a.size() - 1) {
       /* queue is full, resize */
-      //m_array = a->grow();
-      //a = m_array;
+      // m_array = a->grow();
+      // a = m_array;
       return false;
     }
-    a[b] = &node; // relaxed
+    a[b] = &node;  // relaxed
     Impl::atomic_store(&m_bottom, b + 1, memory_order_release);
     return true;
   }
 
   KOKKOS_INLINE_FUNCTION
-  OptionalRef<T>
-  steal() {
-    auto t = m_top; // TODO @tasking @memory_order DSH: atomic load acquire
-    Kokkos::memory_fence(); // seq_cst fence, so why does the above need to be acquire?
+  OptionalRef<T> steal() {
+    auto t = m_top;  // TODO @tasking @memory_order DSH: atomic load acquire
+    Kokkos::memory_fence();  // seq_cst fence, so why does the above need to be
+                             // acquire?
     auto b = Impl::atomic_load(&m_bottom, memory_order_acquire);
     OptionalRef<T> return_value;
-    if(t < b) {
+    if (t < b) {
       /* Non-empty queue */
-      auto& a = m_array; // TODO @tasking @memory_order DSH: technically consume ordered, but acquire should be fine
-      Kokkos::load_fence(); // TODO @tasking @memory_order DSH memory order instead of fence
-      return_value = *static_cast<T*>(a[t]); // relaxed
-      if(not Impl::atomic_compare_exchange_strong(&m_top, t, t+1, memory_order_seq_cst, memory_order_relaxed)) {
+      auto& a = m_array;     // TODO @tasking @memory_order DSH: technically
+                             // consume ordered, but acquire should be fine
+      Kokkos::load_fence();  // TODO @tasking @memory_order DSH memory order
+                             // instead of fence
+      return_value = *static_cast<T*>(a[t]);  // relaxed
+      if (not Impl::atomic_compare_exchange_strong(
+              &m_top, t, t + 1, memory_order_seq_cst, memory_order_relaxed)) {
         return_value = nullptr;
       }
     }
     return return_value;
   }
-
 };
 
 /*
@@ -275,8 +256,10 @@ public:
       // essentially using the memory order in this version as a fence, which
       // may be unnecessary
       auto buffer_ptr = (node_type***)&m_array.buffer;
-      auto a = Impl::atomic_load(buffer_ptr, memory_order_acquire); // technically consume ordered, but acquire should be fine
-      return_value = *static_cast<T*>(a[t % m_array->size]); // relaxed; we'd have to replace the m_array->size if we ever allow growth
+      auto a = Impl::atomic_load(buffer_ptr, memory_order_acquire); //
+   technically consume ordered, but acquire should be fine return_value =
+   *static_cast<T*>(a[t % m_array->size]); // relaxed; we'd have to replace the
+   m_array->size if we ever allow growth
 */
 
 //----------------------------------------------------------------------------
@@ -284,31 +267,27 @@ public:
 
 template <size_t CircularBufferSize>
 struct TaskQueueTraitsChaseLev {
-
   template <class Task>
-  using ready_queue_type = ChaseLevDeque<
-    Task,
-    fixed_size_circular_buffer<SimpleSinglyLinkedListNode<>, CircularBufferSize, int32_t>,
-    int32_t
-  >;
+  using ready_queue_type =
+      ChaseLevDeque<Task,
+                    fixed_size_circular_buffer<SimpleSinglyLinkedListNode<>,
+                                               CircularBufferSize, int32_t>,
+                    int32_t>;
 
   template <class Task>
   using waiting_queue_type = SingleConsumeOperationLIFO<Task>;
 
   template <class Task>
-  using intrusive_task_base_type =
-    typename ready_queue_type<Task>::node_type;
+  using intrusive_task_base_type = typename ready_queue_type<Task>::node_type;
 
   static constexpr auto ready_queue_insertion_may_fail = true;
-
 };
 
-} // end namespace Impl
-} // end namespace Kokkos
+}  // end namespace Impl
+}  // end namespace Kokkos
 
 //----------------------------------------------------------------------------
 //----------------------------------------------------------------------------
 
 #endif /* defined KOKKOS_ENABLE_TASKDAG */
 #endif /* #ifndef KOKKOS_IMPL_LOCKFREEDEQUE_HPP */
-
diff --git a/lib/kokkos/core/src/impl/Kokkos_ClockTic.hpp b/lib/kokkos/core/src/impl/Kokkos_ClockTic.hpp
index 68ca3b48f6..ad13fb7548 100644
--- a/lib/kokkos/core/src/impl/Kokkos_ClockTic.hpp
+++ b/lib/kokkos/core/src/impl/Kokkos_ClockTic.hpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -64,47 +65,46 @@ namespace Impl {
  *  having different index-seed values.
  */
 KOKKOS_FORCEINLINE_FUNCTION
-uint64_t clock_tic(void) noexcept
-{
-#if defined( __CUDA_ARCH__ )
+uint64_t clock_tic(void) noexcept {
+#if defined(__CUDA_ARCH__)
 
   // Return value of 64-bit hi-res clock register.
 
   return clock64();
 
 #elif defined(__HCC_ACCELERATOR__)
-    // Get clock register
-    return hc::__clock_u64();
+  // Get clock register
+  return hc::__clock_u64();
 
-#elif defined( __i386__ ) || defined( __x86_64 )
+#elif defined(__i386__) || defined(__x86_64)
 
   // Return value of 64-bit hi-res clock register.
 
   unsigned a = 0, d = 0;
 
-  __asm__ volatile( "rdtsc" : "=a" (a), "=d" (d) );
+  __asm__ volatile("rdtsc" : "=a"(a), "=d"(d));
 
-  return ( (uint64_t) a ) | ( ( (uint64_t) d ) << 32 );
+  return ((uint64_t)a) | (((uint64_t)d) << 32);
 
-#elif defined( __powerpc )     || defined( __powerpc__ ) || \
-      defined( __powerpc64__ ) || defined( __POWERPC__ ) || \
-      defined( __ppc__ )       || defined( __ppc64__ )
+#elif defined(__powerpc) || defined(__powerpc__) || defined(__powerpc64__) || \
+    defined(__POWERPC__) || defined(__ppc__) || defined(__ppc64__)
 
   unsigned int cycles = 0;
 
-  asm volatile( "mftb %0" : "=r" (cycles) );
+  asm volatile("mftb %0" : "=r"(cycles));
 
-  return (uint64_t) cycles;
+  return (uint64_t)cycles;
 
 #else
 
-  return (uint64_t)
-    std::chrono::high_resolution_clock::now().time_since_epoch().count();
+  return (uint64_t)std::chrono::high_resolution_clock::now()
+      .time_since_epoch()
+      .count();
 
 #endif
 }
 
-} // namespace Impl
-} // namespace Kokkos
+}  // namespace Impl
+}  // namespace Kokkos
 
-#endif // KOKKOS_CLOCKTIC_HPP
+#endif  // KOKKOS_CLOCKTIC_HPP
diff --git a/lib/kokkos/core/src/impl/Kokkos_ConcurrentBitset.hpp b/lib/kokkos/core/src/impl/Kokkos_ConcurrentBitset.hpp
index ca76c2ff72..4f10fb141e 100644
--- a/lib/kokkos/core/src/impl/Kokkos_ConcurrentBitset.hpp
+++ b/lib/kokkos/core/src/impl/Kokkos_ConcurrentBitset.hpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -53,12 +54,11 @@ namespace Kokkos {
 namespace Impl {
 
 struct concurrent_bitset {
-public:
-
+ public:
   // 32 bits per integer value
 
-  enum : uint32_t { bits_per_int_lg2  = 5 };
-  enum : uint32_t { bits_per_int_mask = ( 1 << bits_per_int_lg2 ) - 1 };
+  enum : uint32_t { bits_per_int_lg2 = 5 };
+  enum : uint32_t { bits_per_int_mask = (1 << bits_per_int_lg2) - 1 };
 
   // Buffer is uint32_t[ buffer_bound ]
   //   [ uint32_t { state_header | used_count } , uint32_t bits[*] ]
@@ -74,29 +74,28 @@ public:
   //    before risking an overflow race condition on a full bitset.
 
   enum : uint32_t { max_bit_count_lg2 = 25 };
-  enum : uint32_t { max_bit_count     = 1u << max_bit_count_lg2 };
+  enum : uint32_t { max_bit_count = 1u << max_bit_count_lg2 };
   enum : uint32_t { state_shift = 26 };
-  enum : uint32_t { state_used_mask   = ( 1 << state_shift ) - 1 };
+  enum : uint32_t { state_used_mask = (1 << state_shift) - 1 };
   enum : uint32_t { state_header_mask = uint32_t(0x001f) << state_shift };
 
-  KOKKOS_INLINE_FUNCTION static constexpr
-  uint32_t buffer_bound_lg2( uint32_t const bit_bound_lg2 ) noexcept
-    {
-      return bit_bound_lg2 <= max_bit_count_lg2
-           ? 1 + ( 1u << ( bit_bound_lg2 > bits_per_int_lg2
-                         ? bit_bound_lg2 - bits_per_int_lg2 : 0 ) )
-           : 0 ;
-    }
+  KOKKOS_INLINE_FUNCTION static constexpr uint32_t buffer_bound_lg2(
+      uint32_t const bit_bound_lg2) noexcept {
+    return bit_bound_lg2 <= max_bit_count_lg2
+               ? 1 + (1u << (bit_bound_lg2 > bits_per_int_lg2
+                                 ? bit_bound_lg2 - bits_per_int_lg2
+                                 : 0))
+               : 0;
+  }
 
   /**\brief  Initialize bitset buffer */
-  KOKKOS_INLINE_FUNCTION static constexpr
-  uint32_t buffer_bound( uint32_t const bit_bound ) noexcept
-    {
-      return bit_bound <= max_bit_count
-           ? 1 + ( bit_bound >> bits_per_int_lg2 ) +
-             ( bit_bound & bits_per_int_mask ? 1 : 0 )
-           : 0 ;
-    }
+  KOKKOS_INLINE_FUNCTION static constexpr uint32_t buffer_bound(
+      uint32_t const bit_bound) noexcept {
+    return bit_bound <= max_bit_count
+               ? 1 + (bit_bound >> bits_per_int_lg2) +
+                     (bit_bound & bits_per_int_mask ? 1 : 0)
+               : 0;
+  }
 
   /**\brief  Claim any bit within the bitset bound.
    *
@@ -118,77 +117,70 @@ public:
    *  Recommended to have hint
    *    bit = Kokkos::Impl::clock_tic() & ((1u<<bit_bound_lg2) - 1)
    */
-  KOKKOS_INLINE_FUNCTION static
-  Kokkos::pair<int,int>
-  acquire_bounded_lg2( uint32_t volatile * const buffer
-                     , uint32_t const bit_bound_lg2
-                     , uint32_t bit = 0                /* optional hint */
-                     , uint32_t const state_header = 0 /* optional header */
-                     ) noexcept
-    {
-      typedef Kokkos::pair<int,int> type ;
+  KOKKOS_INLINE_FUNCTION static Kokkos::pair<int, int> acquire_bounded_lg2(
+      uint32_t volatile *const buffer, uint32_t const bit_bound_lg2,
+      uint32_t bit = 0 /* optional hint */
+      ,
+      uint32_t const state_header = 0 /* optional header */
+      ) noexcept {
+    typedef Kokkos::pair<int, int> type;
 
-      const uint32_t bit_bound  = 1 << bit_bound_lg2 ;
-      const uint32_t word_count = bit_bound >> bits_per_int_lg2 ;
+    const uint32_t bit_bound  = 1 << bit_bound_lg2;
+    const uint32_t word_count = bit_bound >> bits_per_int_lg2;
 
-      if ( ( max_bit_count_lg2 < bit_bound_lg2 ) ||
-           ( state_header & ~state_header_mask ) ||
-           ( bit_bound < bit ) ) {
-        return type(-3,-3);
+    if ((max_bit_count_lg2 < bit_bound_lg2) ||
+        (state_header & ~state_header_mask) || (bit_bound < bit)) {
+      return type(-3, -3);
+    }
+
+    // Use potentially two fetch_add to avoid CAS loop.
+    // Could generate "racing" failure-to-acquire
+    // when is full at the atomic_fetch_add(+1)
+    // then a release occurs before the atomic_fetch_add(-1).
+
+    const uint32_t state =
+        (uint32_t)Kokkos::atomic_fetch_add((volatile int *)buffer, 1);
+
+    const uint32_t state_error = state_header != (state & state_header_mask);
+
+    const uint32_t state_bit_used = state & state_used_mask;
+
+    if (state_error || (bit_bound <= state_bit_used)) {
+      Kokkos::atomic_fetch_add((volatile int *)buffer, -1);
+      return state_error ? type(-2, -2) : type(-1, -1);
+    }
+
+    // Do not update bit until count is visible:
+
+    Kokkos::memory_fence();
+
+    // There is a zero bit available somewhere,
+    // now find the (first) available bit and set it.
+
+    while (1) {
+      const uint32_t word = bit >> bits_per_int_lg2;
+      const uint32_t mask = 1u << (bit & bits_per_int_mask);
+      const uint32_t prev = Kokkos::atomic_fetch_or(buffer + word + 1, mask);
+
+      if (!(prev & mask)) {
+        // Successfully claimed 'result.first' by
+        // atomically setting that bit.
+        return type(bit, state_bit_used + 1);
       }
 
-      // Use potentially two fetch_add to avoid CAS loop.
-      // Could generate "racing" failure-to-acquire
-      // when is full at the atomic_fetch_add(+1)
-      // then a release occurs before the atomic_fetch_add(-1).
+      // Failed race to set the selected bit
+      // Find a new bit to try.
 
-      const uint32_t state = (uint32_t)
-        Kokkos::atomic_fetch_add( (volatile int *) buffer , 1 );
+      const int j = Kokkos::Impl::bit_first_zero(prev);
 
-      const uint32_t state_error =
-        state_header != ( state & state_header_mask );
-
-      const uint32_t state_bit_used = state & state_used_mask ;
-
-      if ( state_error || ( bit_bound <= state_bit_used ) ) {
-        Kokkos::atomic_fetch_add( (volatile int *) buffer , -1 );
-        return state_error ? type(-2,-2) : type(-1,-1);
-      }
-
-      // Do not update bit until count is visible:
-
-      Kokkos::memory_fence();
-
-      // There is a zero bit available somewhere,
-      // now find the (first) available bit and set it.
-
-      while(1) {
-
-        const uint32_t word = bit >> bits_per_int_lg2 ;
-        const uint32_t mask = 1u << ( bit & bits_per_int_mask );
-        const uint32_t prev = Kokkos::atomic_fetch_or(buffer + word + 1, mask);
-
-        if ( ! ( prev & mask ) ) {
-          // Successfully claimed 'result.first' by
-          // atomically setting that bit.
-          return type( bit , state_bit_used + 1 );
-        }
-
-        // Failed race to set the selected bit
-        // Find a new bit to try.
-
-        const int j = Kokkos::Impl::bit_first_zero( prev );
-
-        if ( 0 <= j ) {
-          bit = ( word << bits_per_int_lg2 ) | uint32_t(j);
-        }
-        else {
-          bit =
-            ( (word+1) < word_count ? ((word+1) << bits_per_int_lg2) : 0 )
-            | ( bit & bits_per_int_mask );
-        }
+      if (0 <= j) {
+        bit = (word << bits_per_int_lg2) | uint32_t(j);
+      } else {
+        bit = ((word + 1) < word_count ? ((word + 1) << bits_per_int_lg2) : 0) |
+              (bit & bits_per_int_mask);
       }
     }
+  }
 
   /**\brief  Claim any bit within the bitset bound.
    *
@@ -210,77 +202,71 @@ public:
    *  Recommended to have hint
    *    bit = Kokkos::Impl::clock_tic() % bit_bound
    */
-  KOKKOS_INLINE_FUNCTION static
-  Kokkos::pair<int,int>
-  acquire_bounded( uint32_t volatile * const buffer
-                 , uint32_t const bit_bound
-                 , uint32_t bit = 0                /* optional hint */
-                 , uint32_t const state_header = 0 /* optional header */
-                 ) noexcept
-    {
-      typedef Kokkos::pair<int,int> type ;
+  KOKKOS_INLINE_FUNCTION static Kokkos::pair<int, int> acquire_bounded(
+      uint32_t volatile *const buffer, uint32_t const bit_bound,
+      uint32_t bit = 0 /* optional hint */
+      ,
+      uint32_t const state_header = 0 /* optional header */
+      ) noexcept {
+    typedef Kokkos::pair<int, int> type;
 
-      if ( ( max_bit_count < bit_bound ) ||
-           ( state_header & ~state_header_mask ) ||
-           ( bit_bound <= bit ) ) {
-        return type(-3,-3);
+    if ((max_bit_count < bit_bound) || (state_header & ~state_header_mask) ||
+        (bit_bound <= bit)) {
+      return type(-3, -3);
+    }
+
+    const uint32_t word_count = bit_bound >> bits_per_int_lg2;
+
+    // Use potentially two fetch_add to avoid CAS loop.
+    // Could generate "racing" failure-to-acquire
+    // when is full at the atomic_fetch_add(+1)
+    // then a release occurs before the atomic_fetch_add(-1).
+
+    const uint32_t state =
+        (uint32_t)Kokkos::atomic_fetch_add((volatile int *)buffer, 1);
+
+    const uint32_t state_error = state_header != (state & state_header_mask);
+
+    const uint32_t state_bit_used = state & state_used_mask;
+
+    if (state_error || (bit_bound <= state_bit_used)) {
+      Kokkos::atomic_fetch_add((volatile int *)buffer, -1);
+      return state_error ? type(-2, -2) : type(-1, -1);
+    }
+
+    // Do not update bit until count is visible:
+
+    Kokkos::memory_fence();
+
+    // There is a zero bit available somewhere,
+    // now find the (first) available bit and set it.
+
+    while (1) {
+      const uint32_t word = bit >> bits_per_int_lg2;
+      const uint32_t mask = 1u << (bit & bits_per_int_mask);
+      const uint32_t prev = Kokkos::atomic_fetch_or(buffer + word + 1, mask);
+
+      if (!(prev & mask)) {
+        // Successfully claimed 'result.first' by
+        // atomically setting that bit.
+        return type(bit, state_bit_used + 1);
       }
 
-      const uint32_t word_count = bit_bound >> bits_per_int_lg2 ;
+      // Failed race to set the selected bit
+      // Find a new bit to try.
 
-      // Use potentially two fetch_add to avoid CAS loop.
-      // Could generate "racing" failure-to-acquire
-      // when is full at the atomic_fetch_add(+1)
-      // then a release occurs before the atomic_fetch_add(-1).
+      const int j = Kokkos::Impl::bit_first_zero(prev);
 
-      const uint32_t state = (uint32_t)
-        Kokkos::atomic_fetch_add( (volatile int *) buffer , 1 );
-
-      const uint32_t state_error =
-        state_header != ( state & state_header_mask );
-
-      const uint32_t state_bit_used = state & state_used_mask ;
-
-      if ( state_error || ( bit_bound <= state_bit_used ) ) {
-        Kokkos::atomic_fetch_add( (volatile int *) buffer , -1 );
-        return state_error ? type(-2,-2) : type(-1,-1);
+      if (0 <= j) {
+        bit = (word << bits_per_int_lg2) | uint32_t(j);
       }
 
-      // Do not update bit until count is visible:
-
-      Kokkos::memory_fence();
-
-      // There is a zero bit available somewhere,
-      // now find the (first) available bit and set it.
-
-      while(1) {
-
-        const uint32_t word = bit >> bits_per_int_lg2 ;
-        const uint32_t mask = 1u << ( bit & bits_per_int_mask );
-        const uint32_t prev = Kokkos::atomic_fetch_or(buffer + word + 1, mask);
-
-        if ( ! ( prev & mask ) ) {
-          // Successfully claimed 'result.first' by
-          // atomically setting that bit.
-          return type( bit , state_bit_used + 1 );
-        }
-
-        // Failed race to set the selected bit
-        // Find a new bit to try.
-
-        const int j = Kokkos::Impl::bit_first_zero( prev );
-
-        if ( 0 <= j ) {
-          bit = (word << bits_per_int_lg2 ) | uint32_t(j);
-        }
-
-        if ( ( j < 0 ) || ( bit_bound <= bit ) ) {
-          bit =
-            ( (word+1) < word_count ? ((word+1) << bits_per_int_lg2) : 0 )
-            | ( bit & bits_per_int_mask );
-        }
+      if ((j < 0) || (bit_bound <= bit)) {
+        bit = ((word + 1) < word_count ? ((word + 1) << bits_per_int_lg2) : 0) |
+              (bit & bits_per_int_mask);
       }
     }
+  }
 
   /**\brief
    *
@@ -291,31 +277,30 @@ public:
    *    -1 bit was already released
    *    -2 state_header error
    */
-  KOKKOS_INLINE_FUNCTION static
-  int release( uint32_t volatile * const buffer
-             , uint32_t const bit
-             , uint32_t const state_header = 0 /* optional header */
-             ) noexcept
-    {
-      if ( state_header != ( state_header_mask & *buffer ) ) { return -2 ; }
-
-      const uint32_t mask = 1u << ( bit & bits_per_int_mask );
-      const uint32_t prev =
-        Kokkos::atomic_fetch_and( buffer + ( bit >> bits_per_int_lg2 ) + 1
-                                , ~mask
-                                );
-
-      if ( ! ( prev & mask ) ) { return -1 ; }
-
-      // Do not update count until bit clear is visible
-      Kokkos::memory_fence();
-
-      const int count =
-        Kokkos::atomic_fetch_add( (volatile int *) buffer , -1 );
-
-      return ( count & state_used_mask ) - 1 ;
+  KOKKOS_INLINE_FUNCTION static int release(
+      uint32_t volatile *const buffer, uint32_t const bit,
+      uint32_t const state_header = 0 /* optional header */
+      ) noexcept {
+    if (state_header != (state_header_mask & *buffer)) {
+      return -2;
     }
 
+    const uint32_t mask = 1u << (bit & bits_per_int_mask);
+    const uint32_t prev =
+        Kokkos::atomic_fetch_and(buffer + (bit >> bits_per_int_lg2) + 1, ~mask);
+
+    if (!(prev & mask)) {
+      return -1;
+    }
+
+    // Do not update count until bit clear is visible
+    Kokkos::memory_fence();
+
+    const int count = Kokkos::atomic_fetch_add((volatile int *)buffer, -1);
+
+    return (count & state_used_mask) - 1;
+  }
+
   /**\brief
    *
    *  Requires: Bit within bounds and not already set.
@@ -325,33 +310,32 @@ public:
    *    -1 bit was already released
    *    -2 bit or state_header error
    */
-  KOKKOS_INLINE_FUNCTION static
-  int set( uint32_t volatile * const buffer
-         , uint32_t const bit
-         , uint32_t const state_header = 0 /* optional header */
-         ) noexcept
-    {
-      if ( state_header != ( state_header_mask & *buffer ) ) { return -2 ; }
-
-      const uint32_t mask = 1u << ( bit & bits_per_int_mask );
-      const uint32_t prev =
-        Kokkos::atomic_fetch_or( buffer + ( bit >> bits_per_int_lg2 ) + 1
-                               , mask
-                               );
-
-      if ( ! ( prev & mask ) ) { return -1 ; }
-
-      // Do not update count until bit clear is visible
-      Kokkos::memory_fence();
-
-      const int count =
-        Kokkos::atomic_fetch_add( (volatile int *) buffer , -1 );
-
-      return ( count & state_used_mask ) - 1 ;
+  KOKKOS_INLINE_FUNCTION static int set(
+      uint32_t volatile *const buffer, uint32_t const bit,
+      uint32_t const state_header = 0 /* optional header */
+      ) noexcept {
+    if (state_header != (state_header_mask & *buffer)) {
+      return -2;
     }
+
+    const uint32_t mask = 1u << (bit & bits_per_int_mask);
+    const uint32_t prev =
+        Kokkos::atomic_fetch_or(buffer + (bit >> bits_per_int_lg2) + 1, mask);
+
+    if (!(prev & mask)) {
+      return -1;
+    }
+
+    // Do not update count until bit clear is visible
+    Kokkos::memory_fence();
+
+    const int count = Kokkos::atomic_fetch_add((volatile int *)buffer, -1);
+
+    return (count & state_used_mask) - 1;
+  }
 };
 
-}} // namespace Kokkos::Impl
+}  // namespace Impl
+}  // namespace Kokkos
 
 #endif /* #ifndef KOKKOS_CONCURRENTBITSET_HPP */
-
diff --git a/lib/kokkos/core/src/impl/Kokkos_Core.cpp b/lib/kokkos/core/src/impl/Kokkos_Core.cpp
index 0d472e98bb..53f3fd9ce2 100644
--- a/lib/kokkos/core/src/impl/Kokkos_Core.cpp
+++ b/lib/kokkos/core/src/impl/Kokkos_Core.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -50,34 +51,35 @@
 #include <cstdlib>
 #include <stack>
 #include <cerrno>
+#include <unistd.h>
 
 //----------------------------------------------------------------------------
 
 namespace {
 bool g_is_initialized = false;
-bool g_show_warnings = true;
+bool g_show_warnings  = true;
 std::stack<std::function<void()> > finalize_hooks;
-}
+}  // namespace
 
-namespace Kokkos { namespace Impl { namespace {
+namespace Kokkos {
+namespace Impl {
+namespace {
 
-bool is_unsigned_int(const char* str)
-{
-  const size_t len = strlen (str);
+bool is_unsigned_int(const char* str) {
+  const size_t len = strlen(str);
   for (size_t i = 0; i < len; ++i) {
-    if (! isdigit (str[i])) {
+    if (!isdigit(str[i])) {
       return false;
     }
   }
   return true;
 }
-void initialize_internal(const InitArguments& args)
-{
+void initialize_internal(const InitArguments& args) {
 // This is an experimental setting
 // For KNL in Flat mode this variable should be set, so that
 // memkind allocates high bandwidth memory correctly.
 #ifdef KOKKOS_ENABLE_HBWSPACE
-setenv("MEMKIND_HBW_NODES", "1", 0);
+  setenv("MEMKIND_HBW_NODES", "1", 0);
 #endif
 
   if (args.disable_warnings) {
@@ -85,102 +87,108 @@ setenv("MEMKIND_HBW_NODES", "1", 0);
   }
 
   // Protect declarations, to prevent "unused variable" warnings.
-#if defined( KOKKOS_ENABLE_OPENMP ) || defined( KOKKOS_ENABLE_THREADS ) ||\
-    defined( KOKKOS_ENABLE_OPENMPTARGET ) || defined ( KOKKOS_ENABLE_HPX )
+#if defined(KOKKOS_ENABLE_OPENMP) || defined(KOKKOS_ENABLE_THREADS) || \
+    defined(KOKKOS_ENABLE_OPENMPTARGET) || defined(KOKKOS_ENABLE_HPX)
   const int num_threads = args.num_threads;
 #endif
-#if defined( KOKKOS_ENABLE_THREADS ) || defined( KOKKOS_ENABLE_OPENMPTARGET )
+#if defined(KOKKOS_ENABLE_THREADS) || defined(KOKKOS_ENABLE_OPENMPTARGET)
   const int use_numa = args.num_numa;
 #endif
-#if defined( KOKKOS_ENABLE_CUDA ) || defined( KOKKOS_ENABLE_ROCM )
-  int use_gpu = args.device_id;
-  const int ndevices = args.ndevices;
+#if defined(KOKKOS_ENABLE_CUDA) || defined(KOKKOS_ENABLE_ROCM)
+  int use_gpu           = args.device_id;
+  const int ndevices    = args.ndevices;
   const int skip_device = args.skip_device;
-  // if the exact device is not set, but ndevices was given, assign round-robin using on-node MPI rank
+  // if the exact device is not set, but ndevices was given, assign round-robin
+  // using on-node MPI rank
   if (use_gpu < 0 && ndevices >= 0) {
-    auto local_rank_str = std::getenv("OMPI_COMM_WORLD_LOCAL_RANK"); //OpenMPI
-    if (!local_rank_str) local_rank_str = std::getenv("MV2_COMM_WORLD_LOCAL_RANK"); //MVAPICH2
-    if (!local_rank_str) local_rank_str = std::getenv("SLURM_LOCALID"); //SLURM
+    auto local_rank_str = std::getenv("OMPI_COMM_WORLD_LOCAL_RANK");  // OpenMPI
+    if (!local_rank_str)
+      local_rank_str = std::getenv("MV2_COMM_WORLD_LOCAL_RANK");  // MVAPICH2
+    if (!local_rank_str)
+      local_rank_str = std::getenv("SLURM_LOCALID");  // SLURM
     if (local_rank_str) {
       auto local_rank = std::atoi(local_rank_str);
-      use_gpu = local_rank % ndevices;
+      use_gpu         = local_rank % ndevices;
     } else {
-      // user only gave us ndevices, but the MPI environment variable wasn't set.
-      // start with GPU 0 at this point
+      // user only gave us ndevices, but the MPI environment variable wasn't
+      // set. start with GPU 0 at this point
       use_gpu = 0;
     }
     // shift assignments over by one so no one is assigned to "skip_device"
     if (use_gpu >= skip_device) ++use_gpu;
   }
-#endif // defined( KOKKOS_ENABLE_CUDA )
+#endif  // defined( KOKKOS_ENABLE_CUDA )
 
-#if defined( KOKKOS_ENABLE_OPENMP )
-  if( std::is_same< Kokkos::OpenMP , Kokkos::DefaultExecutionSpace >::value ||
-      std::is_same< Kokkos::OpenMP , Kokkos::HostSpace::execution_space >::value ) {
+#if defined(KOKKOS_ENABLE_OPENMP)
+  if (std::is_same<Kokkos::OpenMP, Kokkos::DefaultExecutionSpace>::value ||
+      std::is_same<Kokkos::OpenMP, Kokkos::HostSpace::execution_space>::value) {
 #ifdef KOKKOS_ENABLE_DEPRECATED_CODE
     Kokkos::OpenMP::initialize(num_threads);
 #else
     Kokkos::OpenMP::impl_initialize(num_threads);
 #endif
-  }
-  else {
-    //std::cout << "Kokkos::initialize() fyi: OpenMP enabled but not initialized" << std::endl ;
+  } else {
+    // std::cout << "Kokkos::initialize() fyi: OpenMP enabled but not
+    // initialized" << std::endl ;
   }
 #endif
 
-#if defined( KOKKOS_ENABLE_THREADS )
-  if( std::is_same< Kokkos::Threads , Kokkos::DefaultExecutionSpace >::value ||
-      std::is_same< Kokkos::Threads , Kokkos::HostSpace::execution_space >::value ) {
+#if defined(KOKKOS_ENABLE_THREADS)
+  if (std::is_same<Kokkos::Threads, Kokkos::DefaultExecutionSpace>::value ||
+      std::is_same<Kokkos::Threads,
+                   Kokkos::HostSpace::execution_space>::value) {
 #ifdef KOKKOS_ENABLE_DEPRECATED_CODE
-    if(num_threads>0) {
-      if(use_numa>0) {
-        Kokkos::Threads::initialize(num_threads,use_numa);
-      }
-      else {
+    if (num_threads > 0) {
+      if (use_numa > 0) {
+        Kokkos::Threads::initialize(num_threads, use_numa);
+      } else {
         Kokkos::Threads::initialize(num_threads);
       }
     } else {
       Kokkos::Threads::initialize();
     }
 #else
-    if(num_threads>0) {
-      if(use_numa>0) {
-        Kokkos::Threads::impl_initialize(num_threads,use_numa);
-      }
-      else {
+    if (num_threads > 0) {
+      if (use_numa > 0) {
+        Kokkos::Threads::impl_initialize(num_threads, use_numa);
+      } else {
         Kokkos::Threads::impl_initialize(num_threads);
       }
     } else {
       Kokkos::Threads::impl_initialize();
     }
 #endif
-    //std::cout << "Kokkos::initialize() fyi: Pthread enabled and initialized" << std::endl ;
-  }
-  else {
-    //std::cout << "Kokkos::initialize() fyi: Pthread enabled but not initialized" << std::endl ;
+    // std::cout << "Kokkos::initialize() fyi: Pthread enabled and initialized"
+    // << std::endl ;
+  } else {
+    // std::cout << "Kokkos::initialize() fyi: Pthread enabled but not
+    // initialized" << std::endl ;
   }
 #endif
 
-#if defined( KOKKOS_ENABLE_HPX )
-  if( std::is_same< Kokkos::Experimental::HPX , Kokkos::DefaultExecutionSpace >::value ||
-      std::is_same< Kokkos::Experimental::HPX , Kokkos::HostSpace::execution_space >::value ) {
-      if(num_threads>0) {
-        Kokkos::Experimental::HPX::impl_initialize(num_threads);
-      } else {
-        Kokkos::Experimental::HPX::impl_initialize();
-      }
-      //std::cout << "Kokkos::initialize() fyi: HPX enabled and initialized" << std::endl ;
-  }
-  else {
-      //std::cout << "Kokkos::initialize() fyi: HPX enabled but not initialized" << std::endl ;
+#if defined(KOKKOS_ENABLE_HPX)
+  if (std::is_same<Kokkos::Experimental::HPX,
+                   Kokkos::DefaultExecutionSpace>::value ||
+      std::is_same<Kokkos::Experimental::HPX,
+                   Kokkos::HostSpace::execution_space>::value) {
+    if (num_threads > 0) {
+      Kokkos::Experimental::HPX::impl_initialize(num_threads);
+    } else {
+      Kokkos::Experimental::HPX::impl_initialize();
+    }
+    // std::cout << "Kokkos::initialize() fyi: HPX enabled and initialized" <<
+    // std::endl ;
+  } else {
+    // std::cout << "Kokkos::initialize() fyi: HPX enabled but not initialized"
+    // << std::endl ;
   }
 #endif
 
-#if defined( KOKKOS_ENABLE_SERIAL )
+#if defined(KOKKOS_ENABLE_SERIAL)
   // Prevent "unused variable" warning for 'args' input struct.  If
   // Serial::initialize() ever needs to take arguments from the input
   // struct, you may remove this line of code.
-  (void) args;
+  (void)args;
 
   // Always initialize Serial if it is configure time enabled
 #ifdef KOKKOS_ENABLE_DEPRECATED_CODE
@@ -190,80 +198,96 @@ setenv("MEMKIND_HBW_NODES", "1", 0);
 #endif
 #endif
 
-#if defined( KOKKOS_ENABLE_OPENMPTARGET )
-  if( Impl::is_same< Kokkos::Experimental::OpenMPTarget , Kokkos::DefaultExecutionSpace >::value ) {
-    if(num_threads>0) {
-      if(use_numa>0) {
-        Kokkos::Experimental::OpenMPTarget::initialize(num_threads,use_numa);
-      }
-      else {
+#if defined(KOKKOS_ENABLE_OPENMPTARGET)
+  if (Impl::is_same<Kokkos::Experimental::OpenMPTarget,
+                    Kokkos::DefaultExecutionSpace>::value) {
+    if (num_threads > 0) {
+      if (use_numa > 0) {
+        Kokkos::Experimental::OpenMPTarget::initialize(num_threads, use_numa);
+      } else {
         Kokkos::Experimental::OpenMPTarget::initialize(num_threads);
       }
     } else {
       Kokkos::Experimental::OpenMPTarget::initialize();
     }
-    //std::cout << "Kokkos::initialize() fyi: OpenMP enabled and initialized" << std::endl ;
-  }
-  else {
-    //std::cout << "Kokkos::initialize() fyi: OpenMP enabled but not initialized" << std::endl ;
+    // std::cout << "Kokkos::initialize() fyi: OpenMP enabled and initialized"
+    // << std::endl ;
+  } else {
+    // std::cout << "Kokkos::initialize() fyi: OpenMP enabled but not
+    // initialized" << std::endl ;
   }
 #endif
 
-#if defined( KOKKOS_ENABLE_CUDA )
-  if( std::is_same< Kokkos::Cuda , Kokkos::DefaultExecutionSpace >::value || 0 < use_gpu ) {
+#if defined(KOKKOS_ENABLE_CUDA)
+  if (std::is_same<Kokkos::Cuda, Kokkos::DefaultExecutionSpace>::value ||
+      0 < use_gpu) {
     if (use_gpu > -1) {
 #ifdef KOKKOS_ENABLE_DEPRECATED_CODE
-      Kokkos::Cuda::initialize( Kokkos::Cuda::SelectDevice( use_gpu ) );
+      Kokkos::Cuda::initialize(Kokkos::Cuda::SelectDevice(use_gpu));
 #else
-      Kokkos::Cuda::impl_initialize( Kokkos::Cuda::SelectDevice( use_gpu ) );
+      Kokkos::Cuda::impl_initialize(Kokkos::Cuda::SelectDevice(use_gpu));
 #endif
-    }
-    else {
+    } else {
 #ifdef KOKKOS_ENABLE_DEPRECATED_CODE
       Kokkos::Cuda::initialize();
 #else
       Kokkos::Cuda::impl_initialize();
 #endif
     }
-    //std::cout << "Kokkos::initialize() fyi: Cuda enabled and initialized" << std::endl ;
+    // std::cout << "Kokkos::initialize() fyi: Cuda enabled and initialized" <<
+    // std::endl ;
   }
 #endif
 
-#if defined( KOKKOS_ENABLE_ROCM )
-  if( std::is_same< Kokkos::Experimental::ROCm , Kokkos::DefaultExecutionSpace >::value || 0 < use_gpu ) {
+#if defined(KOKKOS_ENABLE_ROCM)
+  if (std::is_same<Kokkos::Experimental::ROCm,
+                   Kokkos::DefaultExecutionSpace>::value ||
+      0 < use_gpu) {
     if (use_gpu > -1) {
-      Kokkos::Experimental::ROCm::initialize( Kokkos::Experimental::ROCm::SelectDevice( use_gpu ) );
-    }
-    else {
+      Kokkos::Experimental::ROCm::initialize(
+          Kokkos::Experimental::ROCm::SelectDevice(use_gpu));
+    } else {
       Kokkos::Experimental::ROCm::initialize();
     }
-    std::cout << "Kokkos::initialize() fyi: ROCm enabled and initialized" << std::endl ;
+    std::cout << "Kokkos::initialize() fyi: ROCm enabled and initialized"
+              << std::endl;
   }
 #endif
 
 #if defined(KOKKOS_ENABLE_PROFILING)
-    Kokkos::Profiling::initialize();
+  Kokkos::Profiling::initialize();
+#else
+  if (getenv("KOKKOS_PROFILE_LIBRARY") != nullptr) {
+    std::cerr << "Kokkos::initialize() warning: Requested Kokkos Profiling, "
+                 "but Kokkos was built without Profiling support"
+              << std::endl;
+  }
 #endif
-    g_is_initialized = true;
+  g_is_initialized = true;
 }
 
-void finalize_internal( const bool all_spaces = false )
-{
-
-  typename decltype(finalize_hooks)::size_type  numSuccessfulCalls = 0;
-  while(! finalize_hooks.empty()) {
+void finalize_internal(const bool all_spaces = false) {
+  typename decltype(finalize_hooks)::size_type numSuccessfulCalls = 0;
+  while (!finalize_hooks.empty()) {
     auto f = finalize_hooks.top();
     try {
       f();
-    }
-    catch(...) {
+    } catch (...) {
       std::cerr << "Kokkos::finalize: A finalize hook (set via "
-        "Kokkos::push_finalize_hook) threw an exception that it did not catch."
-        "  Per std::atexit rules, this results in std::terminate.  This is "
-        "finalize hook number " << numSuccessfulCalls << " (1-based indexing) "
-        "out of " << finalize_hooks.size() << " to call.  Remember that "
-        "Kokkos::finalize calls finalize hooks in reverse order from how they "
-        "were pushed." << std::endl;
+                   "Kokkos::push_finalize_hook) threw an exception that it did "
+                   "not catch."
+                   "  Per std::atexit rules, this results in std::terminate.  "
+                   "This is "
+                   "finalize hook number "
+                << numSuccessfulCalls
+                << " (1-based indexing) "
+                   "out of "
+                << finalize_hooks.size()
+                << " to call.  Remember that "
+                   "Kokkos::finalize calls finalize hooks in reverse order "
+                   "from how they "
+                   "were pushed."
+                << std::endl;
       std::terminate();
     }
     finalize_hooks.pop();
@@ -271,128 +295,128 @@ void finalize_internal( const bool all_spaces = false )
   }
 
 #if defined(KOKKOS_ENABLE_PROFILING)
-    Kokkos::Profiling::finalize();
+  Kokkos::Profiling::finalize();
 #endif
 
-#if defined( KOKKOS_ENABLE_CUDA )
-  if( std::is_same< Kokkos::Cuda , Kokkos::DefaultExecutionSpace >::value || all_spaces ) {
+#if defined(KOKKOS_ENABLE_CUDA)
+  if (std::is_same<Kokkos::Cuda, Kokkos::DefaultExecutionSpace>::value ||
+      all_spaces) {
 #ifdef KOKKOS_ENABLE_DEPRECATED_CODE
-    if(Kokkos::Cuda::is_initialized())
-      Kokkos::Cuda::finalize();
+    if (Kokkos::Cuda::is_initialized()) Kokkos::Cuda::finalize();
 #else
-    if(Kokkos::Cuda::impl_is_initialized())
-      Kokkos::Cuda::impl_finalize();
+    if (Kokkos::Cuda::impl_is_initialized()) Kokkos::Cuda::impl_finalize();
 #endif
   }
 #else
   (void)all_spaces;
 #endif
 
-#if defined( KOKKOS_ENABLE_ROCM )
-  if( std::is_same< Kokkos::Experimental::ROCm , Kokkos::DefaultExecutionSpace >::value || all_spaces ) {
-    if(Kokkos::Experimental::ROCm::is_initialized())
+#if defined(KOKKOS_ENABLE_ROCM)
+  if (std::is_same<Kokkos::Experimental::ROCm,
+                   Kokkos::DefaultExecutionSpace>::value ||
+      all_spaces) {
+    if (Kokkos::Experimental::ROCm::is_initialized())
       Kokkos::Experimental::ROCm::finalize();
   }
 #endif
 
-#if defined( KOKKOS_ENABLE_OPENMPTARGET )
-  if( std::is_same< Kokkos::Experimental::OpenMPTarget , Kokkos::DefaultExecutionSpace >::value || all_spaces ) {
-    if(Kokkos::Experimental::OpenMPTarget::is_initialized())
+#if defined(KOKKOS_ENABLE_OPENMPTARGET)
+  if (std::is_same<Kokkos::Experimental::OpenMPTarget,
+                   Kokkos::DefaultExecutionSpace>::value ||
+      all_spaces) {
+    if (Kokkos::Experimental::OpenMPTarget::is_initialized())
       Kokkos::Experimental::OpenMPTarget::finalize();
   }
 #endif
 
-#if defined( KOKKOS_ENABLE_OPENMP )
-  if( std::is_same< Kokkos::OpenMP , Kokkos::DefaultExecutionSpace >::value ||
-      std::is_same< Kokkos::OpenMP , Kokkos::HostSpace::execution_space >::value ||
-      all_spaces ) {
+#if defined(KOKKOS_ENABLE_OPENMP)
+  if (std::is_same<Kokkos::OpenMP, Kokkos::DefaultExecutionSpace>::value ||
+      std::is_same<Kokkos::OpenMP, Kokkos::HostSpace::execution_space>::value ||
+      all_spaces) {
 #ifdef KOKKOS_ENABLE_DEPRECATED_CODE
-    if(Kokkos::OpenMP::is_initialized())
-      Kokkos::OpenMP::finalize();
+    if (Kokkos::OpenMP::is_initialized()) Kokkos::OpenMP::finalize();
 #else
-    if(Kokkos::OpenMP::impl_is_initialized())
-      Kokkos::OpenMP::impl_finalize();
+    if (Kokkos::OpenMP::impl_is_initialized()) Kokkos::OpenMP::impl_finalize();
 #endif
   }
 #endif
 
-#if defined( KOKKOS_ENABLE_HPX )
-  if( std::is_same< Kokkos::Experimental::HPX , Kokkos::DefaultExecutionSpace >::value ||
-      std::is_same< Kokkos::Experimental::HPX , Kokkos::HostSpace::execution_space >::value ||
-      all_spaces ) {
-    if(Kokkos::Experimental::HPX::impl_is_initialized())
+#if defined(KOKKOS_ENABLE_HPX)
+  if (std::is_same<Kokkos::Experimental::HPX,
+                   Kokkos::DefaultExecutionSpace>::value ||
+      std::is_same<Kokkos::Experimental::HPX,
+                   Kokkos::HostSpace::execution_space>::value ||
+      all_spaces) {
+    if (Kokkos::Experimental::HPX::impl_is_initialized())
       Kokkos::Experimental::HPX::impl_finalize();
   }
 #endif
 
-#if defined( KOKKOS_ENABLE_THREADS )
-  if( std::is_same< Kokkos::Threads , Kokkos::DefaultExecutionSpace >::value ||
-      std::is_same< Kokkos::Threads , Kokkos::HostSpace::execution_space >::value ||
-      all_spaces ) {
+#if defined(KOKKOS_ENABLE_THREADS)
+  if (std::is_same<Kokkos::Threads, Kokkos::DefaultExecutionSpace>::value ||
+      std::is_same<Kokkos::Threads,
+                   Kokkos::HostSpace::execution_space>::value ||
+      all_spaces) {
 #ifdef KOKKOS_ENABLE_DEPRECATED_CODE
-    if(Kokkos::Threads::is_initialized())
-      Kokkos::Threads::finalize();
+    if (Kokkos::Threads::is_initialized()) Kokkos::Threads::finalize();
 #else
-    if(Kokkos::Threads::impl_is_initialized())
+    if (Kokkos::Threads::impl_is_initialized())
       Kokkos::Threads::impl_finalize();
 #endif
   }
 #endif
 
-#if defined( KOKKOS_ENABLE_SERIAL )
+#if defined(KOKKOS_ENABLE_SERIAL)
 #ifdef KOKKOS_ENABLE_DEPRECATED_CODE
-  if(Kokkos::Serial::is_initialized())
-    Kokkos::Serial::finalize();
+  if (Kokkos::Serial::is_initialized()) Kokkos::Serial::finalize();
 #else
-  if(Kokkos::Serial::impl_is_initialized())
-    Kokkos::Serial::impl_finalize();
+  if (Kokkos::Serial::impl_is_initialized()) Kokkos::Serial::impl_finalize();
 #endif
 #endif
 
   g_is_initialized = false;
-  g_show_warnings = true;
+  g_show_warnings  = true;
 }
 
-void fence_internal()
-{
-
-#if defined( KOKKOS_ENABLE_CUDA )
-  if( std::is_same< Kokkos::Cuda , Kokkos::DefaultExecutionSpace >::value ) {
+void fence_internal() {
+#if defined(KOKKOS_ENABLE_CUDA)
+  if (std::is_same<Kokkos::Cuda, Kokkos::DefaultExecutionSpace>::value) {
     Kokkos::Cuda::impl_static_fence();
   }
 #endif
 
-#if defined( KOKKOS_ENABLE_ROCM )
-  if( std::is_same< Kokkos::Experimental::ROCm , Kokkos::DefaultExecutionSpace >::value ) {
+#if defined(KOKKOS_ENABLE_ROCM)
+  if (std::is_same<Kokkos::Experimental::ROCm,
+                   Kokkos::DefaultExecutionSpace>::value) {
     Kokkos::Experimental::ROCm().fence();
   }
 #endif
 
-#if defined( KOKKOS_ENABLE_OPENMP )
-  if( std::is_same< Kokkos::OpenMP , Kokkos::DefaultExecutionSpace >::value ||
-      std::is_same< Kokkos::OpenMP , Kokkos::HostSpace::execution_space >::value ) {
+#if defined(KOKKOS_ENABLE_OPENMP)
+  if (std::is_same<Kokkos::OpenMP, Kokkos::DefaultExecutionSpace>::value ||
+      std::is_same<Kokkos::OpenMP, Kokkos::HostSpace::execution_space>::value) {
     Kokkos::OpenMP::impl_static_fence();
   }
 #endif
 
-#if defined( KOKKOS_ENABLE_HPX )
+#if defined(KOKKOS_ENABLE_HPX)
   Kokkos::Experimental::HPX::impl_static_fence();
 #endif
 
-#if defined( KOKKOS_ENABLE_THREADS )
-  if( std::is_same< Kokkos::Threads , Kokkos::DefaultExecutionSpace >::value ||
-      std::is_same< Kokkos::Threads , Kokkos::HostSpace::execution_space >::value ) {
+#if defined(KOKKOS_ENABLE_THREADS)
+  if (std::is_same<Kokkos::Threads, Kokkos::DefaultExecutionSpace>::value ||
+      std::is_same<Kokkos::Threads,
+                   Kokkos::HostSpace::execution_space>::value) {
     Kokkos::Threads::impl_static_fence();
   }
 #endif
 
-#if defined( KOKKOS_ENABLE_SERIAL )
-  if( std::is_same< Kokkos::Serial , Kokkos::DefaultExecutionSpace >::value ||
-      std::is_same< Kokkos::Serial , Kokkos::HostSpace::execution_space >::value ) {
+#if defined(KOKKOS_ENABLE_SERIAL)
+  if (std::is_same<Kokkos::Serial, Kokkos::DefaultExecutionSpace>::value ||
+      std::is_same<Kokkos::Serial, Kokkos::HostSpace::execution_space>::value) {
     Kokkos::Serial::impl_static_fence();
   }
 #endif
-
 }
 
 bool check_arg(char const* arg, char const* expected) {
@@ -404,7 +428,8 @@ bool check_arg(char const* arg, char const* expected) {
   /* if expected is "--threads", ignore "--threads-for-application"
      by checking this character          ---------^
      to see if it continues to make a longer name */
-  if (std::isalnum(arg[exp_len]) || arg[exp_len] == '-' || arg[exp_len] == '_') {
+  if (std::isalnum(arg[exp_len]) || arg[exp_len] == '-' ||
+      arg[exp_len] == '_') {
     return false;
   }
   return true;
@@ -414,272 +439,398 @@ bool check_int_arg(char const* arg, char const* expected, int* value) {
   if (!check_arg(arg, expected)) return false;
   std::size_t arg_len = std::strlen(arg);
   std::size_t exp_len = std::strlen(expected);
-  bool okay = true;
+  bool okay           = true;
   if (arg_len == exp_len || arg[exp_len] != '=') okay = false;
   char const* number = arg + exp_len + 1;
   if (!Impl::is_unsigned_int(number) || strlen(number) == 0) okay = false;
   *value = std::atoi(number);
   if (!okay) {
     std::ostringstream ss;
-    ss << "Error: expecting an '=INT' after command line argument '" << expected << "'";
+    ss << "Error: expecting an '=INT' after command line argument '" << expected
+       << "'";
     ss << ". Raised by Kokkos::initialize(int narg, char* argc[]).";
-    Impl::throw_runtime_exception( ss.str() );
+    Impl::throw_runtime_exception(ss.str());
   }
   return true;
 }
 
-}
+}  // namespace
 
-}} // namespace Kokkos::Impl::{unnamed}
+}  // namespace Impl
+}  // namespace Kokkos
 
 //----------------------------------------------------------------------------
 
 namespace Kokkos {
 
-void initialize(int& narg, char* arg[])
-{
-    int num_threads = -1;
-    int numa = -1;
-    int device = -1;
-    int ndevices=-1;
-    int skip_device = 9999;
-    bool disable_warnings = false;
+void initialize(int& narg, char* arg[]) {
+  int num_threads       = -1;
+  int numa              = -1;
+  int device            = -1;
+  int ndevices          = -1;
+  int skip_device       = 9999;
+  bool disable_warnings = false;
 
-    int kokkos_threads_found = 0;
-    int kokkos_numa_found = 0;
-    int kokkos_device_found = 0;
-    int kokkos_ndevices_found = 0;
+  int kokkos_threads_found  = 0;
+  int kokkos_numa_found     = 0;
+  int kokkos_device_found   = 0;
+  int kokkos_ndevices_found = 0;
 
-    int iarg = 0;
+  int iarg = 0;
 
-    while (iarg < narg) {
-      if (Impl::check_int_arg(arg[iarg], "--kokkos-threads", &num_threads)) {
-        for(int k=iarg;k<narg-1;k++) {
-          arg[k] = arg[k+1];
-        }
-        kokkos_threads_found=1;
-        narg--;
-      } else if (!kokkos_threads_found && Impl::check_int_arg(arg[iarg], "--threads", &num_threads)) {
-        iarg++;
-      } else if (Impl::check_int_arg(arg[iarg], "--kokkos-numa", &numa)) {
-        for(int k=iarg;k<narg-1;k++) {
-          arg[k] = arg[k+1];
-        }
-        kokkos_numa_found=1;
-        narg--;
-      } else if (!kokkos_numa_found && Impl::check_int_arg(arg[iarg], "--numa", &numa)) {
-        iarg++;
-      } else if (Impl::check_int_arg(arg[iarg], "--kokkos-device", &device)) {
-        for(int k=iarg;k<narg-1;k++) {
-          arg[k] = arg[k+1];
-        }
-        kokkos_device_found=1;
-        narg--;
-      } else if (!kokkos_device_found && Impl::check_int_arg(arg[iarg], "--device", &device)) {
-        iarg++;
-      } else if (Impl::check_arg(arg[iarg], "--kokkos-ndevices") || Impl::check_arg(arg[iarg], "--ndevices")) {
-
-        //Find the number of device (expecting --device=XX)
-        if (!((strncmp(arg[iarg],"--kokkos-ndevices=",18) == 0) || (strncmp(arg[iarg],"--ndevices=",11) == 0)))
-          Impl::throw_runtime_exception("Error: expecting an '=INT[,INT]' after command line argument '--ndevices/--kokkos-ndevices'. Raised by Kokkos::initialize(int narg, char* argc[]).");
-
-        char* num1 = strchr(arg[iarg],'=')+1;
-        char* num2 = strpbrk(num1,",");
-        int num1_len = num2==NULL?strlen(num1):num2-num1;
-        char* num1_only = new char[num1_len+1];
-        strncpy(num1_only,num1,num1_len);
-        num1_only[num1_len]=0;
-
-        if(!Impl::is_unsigned_int(num1_only) || (strlen(num1_only)==0)) {
-          Impl::throw_runtime_exception("Error: expecting an integer number after command line argument '--kokkos-ndevices'. Raised by Kokkos::initialize(int narg, char* argc[]).");
-        }
-        if((strncmp(arg[iarg],"--kokkos-ndevices",17) == 0) || !kokkos_ndevices_found)
-          ndevices = atoi(num1_only);
-        delete [] num1_only;
-
-        if( num2 != NULL ) {
-          if(( !Impl::is_unsigned_int(num2+1) ) || (strlen(num2)==1) )
-            Impl::throw_runtime_exception("Error: expecting an integer number after command line argument '--kokkos-ndevices=XX,'. Raised by Kokkos::initialize(int narg, char* argc[]).");
-
-          if((strncmp(arg[iarg],"--kokkos-ndevices",17) == 0) || !kokkos_ndevices_found)
-            skip_device = atoi(num2+1);
-        }
-
-        //Remove the --kokkos-ndevices argument from the list but leave --ndevices
-        if(strncmp(arg[iarg],"--kokkos-ndevices",17) == 0) {
-          for(int k=iarg;k<narg-1;k++) {
-            arg[k] = arg[k+1];
-          }
-          kokkos_ndevices_found=1;
-          narg--;
-        } else {
-          iarg++;
-        }
-      } else if ( strcmp(arg[iarg],"--kokkos-disable-warnings") == 0) {
-        disable_warnings = true;
-        for(int k=iarg;k<narg-1;k++) {
-          arg[k] = arg[k+1];
-        }
-        narg--;
-      } else if ((strcmp(arg[iarg],"--kokkos-help") == 0) || (strcmp(arg[iarg],"--help") == 0)) {
-         std::cout << std::endl;
-         std::cout << "--------------------------------------------------------------------------------" << std::endl;
-         std::cout << "-------------Kokkos command line arguments--------------------------------------" << std::endl;
-         std::cout << "--------------------------------------------------------------------------------" << std::endl;
-         std::cout << "The following arguments exist also without prefix 'kokkos' (e.g. --help)." << std::endl;
-         std::cout << "The prefixed arguments will be removed from the list by Kokkos::initialize()," << std::endl;
-         std::cout << "the non-prefixed ones are not removed. Prefixed versions take precedence over " << std::endl;
-         std::cout << "non prefixed ones, and the last occurrence of an argument overwrites prior" << std::endl;
-         std::cout << "settings." << std::endl;
-         std::cout << std::endl;
-         std::cout << "--kokkos-help               : print this message" << std::endl;
-         std::cout << "--kokkos-disable-warnings   : disable kokkos warning messages" << std::endl;
-         std::cout << "--kokkos-threads=INT        : specify total number of threads or" << std::endl;
-         std::cout << "                              number of threads per NUMA region if " << std::endl;
-         std::cout << "                              used in conjunction with '--numa' option. " << std::endl;
-         std::cout << "--kokkos-numa=INT           : specify number of NUMA regions used by process." << std::endl;
-         std::cout << "--kokkos-device=INT         : specify device id to be used by Kokkos. " << std::endl;
-         std::cout << "--kokkos-ndevices=INT[,INT] : used when running MPI jobs. Specify number of" << std::endl;
-         std::cout << "                              devices per node to be used. Process to device" << std::endl;
-         std::cout << "                              mapping happens by obtaining the local MPI rank" << std::endl;
-         std::cout << "                              and assigning devices round-robin. The optional" << std::endl;
-         std::cout << "                              second argument allows for an existing device" << std::endl;
-         std::cout << "                              to be ignored. This is most useful on workstations" << std::endl;
-         std::cout << "                              with multiple GPUs of which one is used to drive" << std::endl;
-         std::cout << "                              screen output." << std::endl;
-         std::cout << std::endl;
-         std::cout << "--------------------------------------------------------------------------------" << std::endl;
-         std::cout << std::endl;
-
-         //Remove the --kokkos-help argument from the list but leave --ndevices
-         if(strcmp(arg[iarg],"--kokkos-help") == 0) {
-           for(int k=iarg;k<narg-1;k++) {
-             arg[k] = arg[k+1];
-           }
-           narg--;
-         } else {
-           iarg++;
-         }
-      } else
+  while (iarg < narg) {
+    if (Impl::check_int_arg(arg[iarg], "--kokkos-threads", &num_threads)) {
+      for (int k = iarg; k < narg - 1; k++) {
+        arg[k] = arg[k + 1];
+      }
+      kokkos_threads_found = 1;
+      narg--;
+    } else if (!kokkos_threads_found &&
+               Impl::check_int_arg(arg[iarg], "--threads", &num_threads)) {
       iarg++;
-    }
+    } else if (Impl::check_int_arg(arg[iarg], "--kokkos-numa", &numa)) {
+      for (int k = iarg; k < narg - 1; k++) {
+        arg[k] = arg[k + 1];
+      }
+      kokkos_numa_found = 1;
+      narg--;
+    } else if (!kokkos_numa_found &&
+               Impl::check_int_arg(arg[iarg], "--numa", &numa)) {
+      iarg++;
+    } else if (Impl::check_int_arg(arg[iarg], "--kokkos-device", &device)) {
+      for (int k = iarg; k < narg - 1; k++) {
+        arg[k] = arg[k + 1];
+      }
+      kokkos_device_found = 1;
+      narg--;
+    } else if (!kokkos_device_found &&
+               Impl::check_int_arg(arg[iarg], "--device", &device)) {
+      iarg++;
+    } else if (Impl::check_arg(arg[iarg], "--kokkos-ndevices") ||
+               Impl::check_arg(arg[iarg], "--ndevices")) {
+      // Find the number of device (expecting --device=XX)
+      if (!((strncmp(arg[iarg], "--kokkos-ndevices=", 18) == 0) ||
+            (strncmp(arg[iarg], "--ndevices=", 11) == 0)))
+        Impl::throw_runtime_exception(
+            "Error: expecting an '=INT[,INT]' after command line argument "
+            "'--ndevices/--kokkos-ndevices'. Raised by Kokkos::initialize(int "
+            "narg, char* argc[]).");
 
-    //Read environment variables
-    char * endptr;
-    auto env_num_threads_str = std::getenv("KOKKOS_NUM_THREADS");
-    if (env_num_threads_str!=nullptr) {
-        errno = 0;
-        auto env_num_threads = std::strtol(env_num_threads_str,&endptr,10);
-        if (endptr== env_num_threads_str) 
-            Impl::throw_runtime_exception("Error: cannot convert KOKKOS_NUM_THREADS to an integer. Raised by Kokkos::initialize(int narg, char* argc[]).");
-        if (errno == ERANGE)
-            Impl::throw_runtime_exception("Error: KOKKOS_NUM_THREADS out of range of representable values by an integer. Raised by Kokkos::initialize(int narg, char* argc[]).");
-        if ((num_threads != -1)&&(env_num_threads!=num_threads))
-            Impl::throw_runtime_exception("Error: expecting a match between --kokkos-threads and KOKKOS_NUM_THREADS if both are set. Raised by Kokkos::initialize(int narg, char* argc[]).");
-        else
-            num_threads = env_num_threads;
-    }
-    auto env_numa_str = std::getenv("KOKKOS_NUMA");
-    if (env_numa_str!=nullptr) {
-        errno = 0;
-        auto env_numa = std::strtol(env_numa_str,&endptr,10);
-        if (endptr== env_numa_str) 
-            Impl::throw_runtime_exception("Error: cannot convert KOKKOS_NUMA to an integer. Raised by Kokkos::initialize(int narg, char* argc[]).");
-        if (errno == ERANGE)
-            Impl::throw_runtime_exception("Error: KOKKOS_NUMA out of range of representable values by an integer. Raised by Kokkos::initialize(int narg, char* argc[]).");
-        if ((numa != -1)&&(env_numa!=numa))
-            Impl::throw_runtime_exception("Error: expecting a match between --kokkos-numa and KOKKOS_NUMA if both are set. Raised by Kokkos::initialize(int narg, char* argc[]).");
-        else
-            numa = env_numa;
-    }
-    auto env_device_str = std::getenv("KOKKOS_DEVICE_ID");
-    if (env_device_str!=nullptr) {
-        errno = 0;
-        auto env_device = std::strtol(env_device_str,&endptr,10);
-        if (endptr== env_device_str) 
-            Impl::throw_runtime_exception("Error: cannot convert KOKKOS_DEVICE_ID to an integer. Raised by Kokkos::initialize(int narg, char* argc[]).");
-        if (errno == ERANGE)
-            Impl::throw_runtime_exception("Error: KOKKOS_DEVICE_ID out of range of representable values by an integer. Raised by Kokkos::initialize(int narg, char* argc[]).");
-        if ((device != -1)&&(env_device!=device))
-            Impl::throw_runtime_exception("Error: expecting a match between --kokkos-device and KOKKOS_DEVICE_ID if both are set. Raised by Kokkos::initialize(int narg, char* argc[]).");
-        else
-            device = env_device;
-    }
-    auto env_ndevices_str = std::getenv("KOKKOS_NUM_DEVICES");
-    if (env_ndevices_str!=nullptr) {
-        errno = 0;
-        auto env_ndevices = std::strtol(env_ndevices_str,&endptr,10);
-        if (endptr== env_ndevices_str) 
-            Impl::throw_runtime_exception("Error: cannot convert KOKKOS_NUM_DEVICES to an integer. Raised by Kokkos::initialize(int narg, char* argc[]).");
-        if (errno == ERANGE)
-            Impl::throw_runtime_exception("Error: KOKKOS_NUM_DEVICES out of range of representable values by an integer. Raised by Kokkos::initialize(int narg, char* argc[]).");
-        if ((ndevices != -1)&&(env_ndevices!=ndevices))
-            Impl::throw_runtime_exception("Error: expecting a match between --kokkos-ndevices and KOKKOS_NUM_DEVICES if both are set. Raised by Kokkos::initialize(int narg, char* argc[]).");
-        else
-            ndevices = env_ndevices;
-        //Skip device
-        auto env_skip_device_str = std::getenv("KOKKOS_SKIP_DEVICE");
-        if (env_skip_device_str!=nullptr) {
-            errno = 0;
-            auto env_skip_device = std::strtol(env_skip_device_str,&endptr,10);
-            if (endptr== env_skip_device_str) 
-                Impl::throw_runtime_exception("Error: cannot convert KOKKOS_SKIP_DEVICE to an integer. Raised by Kokkos::initialize(int narg, char* argc[]).");
-            if (errno == ERANGE)
-                Impl::throw_runtime_exception("Error: KOKKOS_SKIP_DEVICE out of range of representable values by an integer. Raised by Kokkos::initialize(int narg, char* argc[]).");
-            if ((skip_device != 9999)&&(env_skip_device!=skip_device))
-                Impl::throw_runtime_exception("Error: expecting a match between --kokkos-ndevices and KOKKOS_SKIP_DEVICE if both are set. Raised by Kokkos::initialize(int narg, char* argc[]).");
-            else
-                skip_device = env_skip_device;
+      char* num1      = strchr(arg[iarg], '=') + 1;
+      char* num2      = strpbrk(num1, ",");
+      int num1_len    = num2 == NULL ? strlen(num1) : num2 - num1;
+      char* num1_only = new char[num1_len + 1];
+      strncpy(num1_only, num1, num1_len);
+      num1_only[num1_len] = 0;
+
+      if (!Impl::is_unsigned_int(num1_only) || (strlen(num1_only) == 0)) {
+        Impl::throw_runtime_exception(
+            "Error: expecting an integer number after command line argument "
+            "'--kokkos-ndevices'. Raised by Kokkos::initialize(int narg, char* "
+            "argc[]).");
+      }
+      if ((strncmp(arg[iarg], "--kokkos-ndevices", 17) == 0) ||
+          !kokkos_ndevices_found)
+        ndevices = atoi(num1_only);
+      delete[] num1_only;
+
+      if (num2 != NULL) {
+        if ((!Impl::is_unsigned_int(num2 + 1)) || (strlen(num2) == 1))
+          Impl::throw_runtime_exception(
+              "Error: expecting an integer number after command line argument "
+              "'--kokkos-ndevices=XX,'. Raised by Kokkos::initialize(int narg, "
+              "char* argc[]).");
+
+        if ((strncmp(arg[iarg], "--kokkos-ndevices", 17) == 0) ||
+            !kokkos_ndevices_found)
+          skip_device = atoi(num2 + 1);
+      }
+
+      // Remove the --kokkos-ndevices argument from the list but leave
+      // --ndevices
+      if (strncmp(arg[iarg], "--kokkos-ndevices", 17) == 0) {
+        for (int k = iarg; k < narg - 1; k++) {
+          arg[k] = arg[k + 1];
         }
-    }
-    char * env_disablewarnings_str = std::getenv("KOKKOS_DISABLE_WARNINGS");
-    if (env_disablewarnings_str!=nullptr) {
-        std::string env_str (env_disablewarnings_str); // deep-copies string
-        for (char& c : env_str) { c = toupper (c); }
-        if ((env_str == "TRUE") || (env_str == "ON") || (env_str == "1"))
-            disable_warnings = true;
-        else
-            if (disable_warnings)
-                Impl::throw_runtime_exception("Error: expecting a match between --kokkos-disable-warnings and KOKKOS_DISABLE_WARNINGS if both are set. Raised by Kokkos::initialize(int narg, char* argc[]).");
-    }
+        kokkos_ndevices_found = 1;
+        narg--;
+      } else {
+        iarg++;
+      }
+    } else if (strcmp(arg[iarg], "--kokkos-disable-warnings") == 0) {
+      disable_warnings = true;
+      for (int k = iarg; k < narg - 1; k++) {
+        arg[k] = arg[k + 1];
+      }
+      narg--;
+    } else if ((strcmp(arg[iarg], "--kokkos-help") == 0) ||
+               (strcmp(arg[iarg], "--help") == 0)) {
+      std::cout << std::endl;
+      std::cout << "-----------------------------------------------------------"
+                   "---------------------"
+                << std::endl;
+      std::cout << "-------------Kokkos command line "
+                   "arguments--------------------------------------"
+                << std::endl;
+      std::cout << "-----------------------------------------------------------"
+                   "---------------------"
+                << std::endl;
+      std::cout << "The following arguments exist also without prefix 'kokkos' "
+                   "(e.g. --help)."
+                << std::endl;
+      std::cout << "The prefixed arguments will be removed from the list by "
+                   "Kokkos::initialize(),"
+                << std::endl;
+      std::cout << "the non-prefixed ones are not removed. Prefixed versions "
+                   "take precedence over "
+                << std::endl;
+      std::cout << "non prefixed ones, and the last occurrence of an argument "
+                   "overwrites prior"
+                << std::endl;
+      std::cout << "settings." << std::endl;
+      std::cout << std::endl;
+      std::cout << "--kokkos-help               : print this message"
+                << std::endl;
+      std::cout
+          << "--kokkos-disable-warnings   : disable kokkos warning messages"
+          << std::endl;
+      std::cout
+          << "--kokkos-threads=INT        : specify total number of threads or"
+          << std::endl;
+      std::cout << "                              number of threads per NUMA "
+                   "region if "
+                << std::endl;
+      std::cout << "                              used in conjunction with "
+                   "'--numa' option. "
+                << std::endl;
+      std::cout << "--kokkos-numa=INT           : specify number of NUMA "
+                   "regions used by process."
+                << std::endl;
+      std::cout << "--kokkos-device=INT         : specify device id to be used "
+                   "by Kokkos. "
+                << std::endl;
+      std::cout << "--kokkos-ndevices=INT[,INT] : used when running MPI jobs. "
+                   "Specify number of"
+                << std::endl;
+      std::cout << "                              devices per node to be used. "
+                   "Process to device"
+                << std::endl;
+      std::cout << "                              mapping happens by obtaining "
+                   "the local MPI rank"
+                << std::endl;
+      std::cout << "                              and assigning devices "
+                   "round-robin. The optional"
+                << std::endl;
+      std::cout << "                              second argument allows for "
+                   "an existing device"
+                << std::endl;
+      std::cout << "                              to be ignored. This is most "
+                   "useful on workstations"
+                << std::endl;
+      std::cout << "                              with multiple GPUs of which "
+                   "one is used to drive"
+                << std::endl;
+      std::cout << "                              screen output." << std::endl;
+      std::cout << std::endl;
+      std::cout << "-----------------------------------------------------------"
+                   "---------------------"
+                << std::endl;
+      std::cout << std::endl;
 
-    InitArguments arguments;
-    arguments.num_threads = num_threads;
-    arguments.num_numa = numa;
-    arguments.device_id = device;
-    arguments.ndevices = ndevices;
-    arguments.skip_device = skip_device;
-    arguments.disable_warnings = disable_warnings;
-    Impl::initialize_internal(arguments);
+      // Remove the --kokkos-help argument from the list but leave --ndevices
+      if (strcmp(arg[iarg], "--kokkos-help") == 0) {
+        for (int k = iarg; k < narg - 1; k++) {
+          arg[k] = arg[k + 1];
+        }
+        narg--;
+      } else {
+        iarg++;
+      }
+    } else
+      iarg++;
+  }
+
+  // Read environment variables
+  char* endptr;
+  auto env_num_threads_str = std::getenv("KOKKOS_NUM_THREADS");
+  if (env_num_threads_str != nullptr) {
+    errno                = 0;
+    auto env_num_threads = std::strtol(env_num_threads_str, &endptr, 10);
+    if (endptr == env_num_threads_str)
+      Impl::throw_runtime_exception(
+          "Error: cannot convert KOKKOS_NUM_THREADS to an integer. Raised by "
+          "Kokkos::initialize(int narg, char* argc[]).");
+    if (errno == ERANGE)
+      Impl::throw_runtime_exception(
+          "Error: KOKKOS_NUM_THREADS out of range of representable values by "
+          "an integer. Raised by Kokkos::initialize(int narg, char* argc[]).");
+    if ((num_threads != -1) && (env_num_threads != num_threads))
+      Impl::throw_runtime_exception(
+          "Error: expecting a match between --kokkos-threads and "
+          "KOKKOS_NUM_THREADS if both are set. Raised by "
+          "Kokkos::initialize(int narg, char* argc[]).");
+    else
+      num_threads = env_num_threads;
+  }
+  auto env_numa_str = std::getenv("KOKKOS_NUMA");
+  if (env_numa_str != nullptr) {
+    errno         = 0;
+    auto env_numa = std::strtol(env_numa_str, &endptr, 10);
+    if (endptr == env_numa_str)
+      Impl::throw_runtime_exception(
+          "Error: cannot convert KOKKOS_NUMA to an integer. Raised by "
+          "Kokkos::initialize(int narg, char* argc[]).");
+    if (errno == ERANGE)
+      Impl::throw_runtime_exception(
+          "Error: KOKKOS_NUMA out of range of representable values by an "
+          "integer. Raised by Kokkos::initialize(int narg, char* argc[]).");
+    if ((numa != -1) && (env_numa != numa))
+      Impl::throw_runtime_exception(
+          "Error: expecting a match between --kokkos-numa and KOKKOS_NUMA if "
+          "both are set. Raised by Kokkos::initialize(int narg, char* "
+          "argc[]).");
+    else
+      numa = env_numa;
+  }
+  auto env_device_str = std::getenv("KOKKOS_DEVICE_ID");
+  if (env_device_str != nullptr) {
+    errno           = 0;
+    auto env_device = std::strtol(env_device_str, &endptr, 10);
+    if (endptr == env_device_str)
+      Impl::throw_runtime_exception(
+          "Error: cannot convert KOKKOS_DEVICE_ID to an integer. Raised by "
+          "Kokkos::initialize(int narg, char* argc[]).");
+    if (errno == ERANGE)
+      Impl::throw_runtime_exception(
+          "Error: KOKKOS_DEVICE_ID out of range of representable values by an "
+          "integer. Raised by Kokkos::initialize(int narg, char* argc[]).");
+    if ((device != -1) && (env_device != device))
+      Impl::throw_runtime_exception(
+          "Error: expecting a match between --kokkos-device and "
+          "KOKKOS_DEVICE_ID if both are set. Raised by Kokkos::initialize(int "
+          "narg, char* argc[]).");
+    else
+      device = env_device;
+  }
+  auto env_rdevices_str = std::getenv("KOKKOS_RAND_DEVICES");
+  auto env_ndevices_str = std::getenv("KOKKOS_NUM_DEVICES");
+  if (env_ndevices_str != nullptr || env_rdevices_str != nullptr) {
+    errno = 0;
+    if (env_ndevices_str != nullptr && env_rdevices_str != nullptr) {
+      Impl::throw_runtime_exception(
+          "Error: cannot specify both KOKKOS_NUM_DEVICES and "
+          "KOKKOS_RAND_DEVICES. "
+          "Raised by Kokkos::initialize(int narg, char* argc[]).");
+    }
+    int rdevices = -1;
+    if (env_ndevices_str != nullptr) {
+      auto env_ndevices = std::strtol(env_ndevices_str, &endptr, 10);
+      if (endptr == env_ndevices_str)
+        Impl::throw_runtime_exception(
+            "Error: cannot convert KOKKOS_NUM_DEVICES to an integer. Raised by "
+            "Kokkos::initialize(int narg, char* argc[]).");
+      if (errno == ERANGE)
+        Impl::throw_runtime_exception(
+            "Error: KOKKOS_NUM_DEVICES out of range of representable values by "
+            "an integer. Raised by Kokkos::initialize(int narg, char* "
+            "argc[]).");
+      if ((ndevices != -1) && (env_ndevices != ndevices))
+        Impl::throw_runtime_exception(
+            "Error: expecting a match between --kokkos-ndevices and "
+            "KOKKOS_NUM_DEVICES if both are set. Raised by "
+            "Kokkos::initialize(int narg, char* argc[]).");
+      else
+        ndevices = env_ndevices;
+    } else {  // you set KOKKOS_RAND_DEVICES
+      auto env_rdevices = std::strtol(env_rdevices_str, &endptr, 10);
+      if (endptr == env_ndevices_str)
+        Impl::throw_runtime_exception(
+            "Error: cannot convert KOKKOS_RAND_DEVICES to an integer. Raised "
+            "by Kokkos::initialize(int narg, char* argc[]).");
+      if (errno == ERANGE)
+        Impl::throw_runtime_exception(
+            "Error: KOKKOS_RAND_DEVICES out of range of representable values "
+            "by an integer. Raised by Kokkos::initialize(int narg, char* "
+            "argc[]).");
+      else
+        rdevices = env_rdevices;
+    }
+    // Skip device
+    auto env_skip_device_str = std::getenv("KOKKOS_SKIP_DEVICE");
+    if (env_skip_device_str != nullptr) {
+      errno                = 0;
+      auto env_skip_device = std::strtol(env_skip_device_str, &endptr, 10);
+      if (endptr == env_skip_device_str)
+        Impl::throw_runtime_exception(
+            "Error: cannot convert KOKKOS_SKIP_DEVICE to an integer. Raised by "
+            "Kokkos::initialize(int narg, char* argc[]).");
+      if (errno == ERANGE)
+        Impl::throw_runtime_exception(
+            "Error: KOKKOS_SKIP_DEVICE out of range of representable values by "
+            "an integer. Raised by Kokkos::initialize(int narg, char* "
+            "argc[]).");
+      if ((skip_device != 9999) && (env_skip_device != skip_device))
+        Impl::throw_runtime_exception(
+            "Error: expecting a match between --kokkos-ndevices and "
+            "KOKKOS_SKIP_DEVICE if both are set. Raised by "
+            "Kokkos::initialize(int narg, char* argc[]).");
+      else
+        skip_device = env_skip_device;
+    }
+    if (rdevices > 0) {
+      if (skip_device > 0 && rdevices == 1)
+        Impl::throw_runtime_exception(
+            "Error: cannot KOKKOS_SKIP_DEVICE the only KOKKOS_RAND_DEVICE. "
+            "Raised by Kokkos::initialize(int narg, char* argc[]).");
+
+      std::srand(getpid());
+      while (device < 0) {
+        int test_device = std::rand() % rdevices;
+        if (test_device != skip_device) device = test_device;
+      }
+    }
+  }
+  char* env_disablewarnings_str = std::getenv("KOKKOS_DISABLE_WARNINGS");
+  if (env_disablewarnings_str != nullptr) {
+    std::string env_str(env_disablewarnings_str);  // deep-copies string
+    for (char& c : env_str) {
+      c = toupper(c);
+    }
+    if ((env_str == "TRUE") || (env_str == "ON") || (env_str == "1"))
+      disable_warnings = true;
+    else if (disable_warnings)
+      Impl::throw_runtime_exception(
+          "Error: expecting a match between --kokkos-disable-warnings and "
+          "KOKKOS_DISABLE_WARNINGS if both are set. Raised by "
+          "Kokkos::initialize(int narg, char* argc[]).");
+  }
+
+  InitArguments arguments;
+  arguments.num_threads      = num_threads;
+  arguments.num_numa         = numa;
+  arguments.device_id        = device;
+  arguments.ndevices         = ndevices;
+  arguments.skip_device      = skip_device;
+  arguments.disable_warnings = disable_warnings;
+  Impl::initialize_internal(arguments);
 }
 
 void initialize(const InitArguments& arguments) {
   Impl::initialize_internal(arguments);
 }
 
-void push_finalize_hook(std::function<void()> f)
-{
-  finalize_hooks.push(f);
-}
+void push_finalize_hook(std::function<void()> f) { finalize_hooks.push(f); }
 
-void finalize()
-{
-  Impl::finalize_internal();
-}
+void finalize() { Impl::finalize_internal(); }
 
-void finalize_all()
-{
+void finalize_all() {
   enum { all_spaces = true };
-  Impl::finalize_internal( all_spaces );
+  Impl::finalize_internal(all_spaces);
 }
 
-void fence()
-{
-  Impl::fence_internal();
-}
+void fence() { Impl::fence_internal(); }
 
-void print_configuration( std::ostream & out , const bool detail )
-{
+void print_configuration(std::ostream& out, const bool detail) {
   std::ostringstream msg;
 
   msg << "Compiler:" << std::endl;
@@ -708,7 +859,6 @@ void print_configuration( std::ostream & out , const bool detail )
   msg << "  KOKKOS_COMPILER_PGI: " << KOKKOS_COMPILER_PGI << std::endl;
 #endif
 
-
   msg << "Architecture:" << std::endl;
 #ifdef KOKKOS_ENABLE_ISA_KNC
   msg << "  KOKKOS_ENABLE_ISA_KNC: yes" << std::endl;
@@ -726,7 +876,6 @@ void print_configuration( std::ostream & out , const bool detail )
   msg << "  KOKKOS_ENABLE_ISA_X86_64: no" << std::endl;
 #endif
 
-
   msg << "Devices:" << std::endl;
   msg << "  KOKKOS_ENABLE_CUDA: ";
 #ifdef KOKKOS_ENABLE_CUDA
@@ -765,7 +914,6 @@ void print_configuration( std::ostream & out , const bool detail )
   msg << "no" << std::endl;
 #endif
 
-
   msg << "Default Device:" << std::endl;
   msg << "  KOKKOS_ENABLE_DEFAULT_DEVICE_TYPE_CUDA: ";
 #ifdef KOKKOS_ENABLE_DEFAULT_DEVICE_TYPE_CUDA
@@ -798,7 +946,6 @@ void print_configuration( std::ostream & out , const bool detail )
   msg << "no" << std::endl;
 #endif
 
-
   msg << "Atomics:" << std::endl;
   msg << "  KOKKOS_ENABLE_CUDA_ATOMICS: ";
 #ifdef KOKKOS_ENABLE_CUDA_ATOMICS
@@ -889,7 +1036,6 @@ void print_configuration( std::ostream & out , const bool detail )
   msg << "no" << std::endl;
 #endif
 
-
   msg << "Options:" << std::endl;
   msg << "  KOKKOS_ENABLE_ASM: ";
 #ifdef KOKKOS_ENABLE_ASM
@@ -997,7 +1143,7 @@ void print_configuration( std::ostream & out , const bool detail )
 #ifdef KOKKOS_ENABLE_HPX
   Experimental::HPX::print_configuration(msg, detail);
 #endif
-#if defined( KOKKOS_ENABLE_THREADS )
+#if defined(KOKKOS_ENABLE_THREADS)
   Threads::print_configuration(msg, detail);
 #endif
 #ifdef KOKKOS_ENABLE_QTHREADS
@@ -1014,5 +1160,13 @@ bool is_initialized() noexcept { return g_is_initialized; }
 
 bool show_warnings() noexcept { return g_show_warnings; }
 
-} // namespace Kokkos
+#ifdef KOKKOS_COMPILER_PGI
+namespace Impl {
+// Bizzarely, an extra jump instruction forces the PGI compiler to not have a
+// bug related to (probably?) empty base optimization and/or aggregate
+// construction.
+void _kokkos_pgi_compiler_bug_workaround() {}
+}  // end namespace Impl
+#endif
 
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/impl/Kokkos_EBO.hpp b/lib/kokkos/core/src/impl/Kokkos_EBO.hpp
index 69bb74e2c5..5adf4bd5f1 100644
--- a/lib/kokkos/core/src/impl/Kokkos_EBO.hpp
+++ b/lib/kokkos/core/src/impl/Kokkos_EBO.hpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -51,7 +52,6 @@
 #include <Kokkos_Core_fwd.hpp>
 //----------------------------------------------------------------------------
 
-
 #include <utility>
 #include <type_traits>
 
@@ -62,23 +62,23 @@ namespace Kokkos {
 namespace Impl {
 
 template <int I>
-struct NotOnDeviceCtorDisambiguator { };
+struct NotOnDeviceCtorDisambiguator {};
 
 template <class... Args>
-struct NoCtorsNotOnDevice : std::false_type { };
+struct NoCtorsNotOnDevice : std::false_type {};
 
 template <class... Args>
-struct DefaultCtorNotOnDevice : std::false_type { };
+struct DefaultCtorNotOnDevice : std::false_type {};
 
 template <>
-struct DefaultCtorNotOnDevice<> : std::true_type { };
+struct DefaultCtorNotOnDevice<> : std::true_type {};
 
-template <class T, bool Empty, template <class...> class CtorNotOnDevice = NoCtorsNotOnDevice>
+template <class T, bool Empty,
+          template <class...> class CtorNotOnDevice = NoCtorsNotOnDevice>
 struct EBOBaseImpl;
 
 template <class T, template <class...> class CtorNotOnDevice>
 struct EBOBaseImpl<T, true, CtorNotOnDevice> {
-
   /*
    * Workaround for constexpr in C++11: we need to still call T(args...), but we
    * can't do so in the body of a constexpr function (in C++11), and there's no
@@ -86,48 +86,36 @@ struct EBOBaseImpl<T, true, CtorNotOnDevice> {
    * of a delegating constructor...
    */
   // TODO @minor DSH the destructor gets called too early with this workaround
-  struct _constexpr_14_workaround_tag { };
-  struct _constexpr_14_workaround_no_device_tag { };
+  struct _constexpr_14_workaround_tag {};
+  struct _constexpr_14_workaround_no_device_tag {};
   KOKKOS_FORCEINLINE_FUNCTION
-  constexpr EBOBaseImpl(_constexpr_14_workaround_tag, T&&) noexcept { }
-  inline constexpr EBOBaseImpl(_constexpr_14_workaround_no_device_tag, T&&) noexcept { }
+  constexpr EBOBaseImpl(_constexpr_14_workaround_tag, T&&) noexcept {}
+  inline constexpr EBOBaseImpl(_constexpr_14_workaround_no_device_tag,
+                               T&&) noexcept {}
 
   template <
-    class... Args,
-    class _ignored = void,
-    typename std::enable_if<
-      std::is_void<_ignored>::value
-      && std::is_constructible<T, Args...>::value
-      && !CtorNotOnDevice<Args...>::value,
-      int
-    >::type = 0
-  >
-  KOKKOS_FORCEINLINE_FUNCTION
-  constexpr explicit
-  EBOBaseImpl(
-    Args&&... args
-  ) noexcept(noexcept(T(std::forward<Args>(args)...)))
-    // still call the constructor
-    : EBOBaseImpl(_constexpr_14_workaround_tag{}, T(std::forward<Args>(args)...))
-  { }
+      class... Args, class _ignored = void,
+      typename std::enable_if<std::is_void<_ignored>::value &&
+                                  std::is_constructible<T, Args...>::value &&
+                                  !CtorNotOnDevice<Args...>::value,
+                              int>::type = 0>
+  KOKKOS_FORCEINLINE_FUNCTION constexpr explicit EBOBaseImpl(
+      Args&&... args) noexcept(noexcept(T(std::forward<Args>(args)...)))
+      // still call the constructor
+      : EBOBaseImpl(_constexpr_14_workaround_tag{},
+                    T(std::forward<Args>(args)...)) {}
 
   template <
-    class... Args,
-    class _ignored=void,
-    typename std::enable_if<
-      std::is_void<_ignored>::value
-      && std::is_constructible<T, Args...>::value
-      && CtorNotOnDevice<Args...>::value,
-      long
-    >::type = 0
-  >
-  inline constexpr explicit
-  EBOBaseImpl(
-    Args&&... args
-  ) noexcept(noexcept(T(std::forward<Args>(args)...)))
-    // still call the constructor
-    : EBOBaseImpl(_constexpr_14_workaround_no_device_tag{}, T(std::forward<Args>(args)...))
-  { }
+      class... Args, class _ignored = void,
+      typename std::enable_if<std::is_void<_ignored>::value &&
+                                  std::is_constructible<T, Args...>::value &&
+                                  CtorNotOnDevice<Args...>::value,
+                              long>::type = 0>
+  inline constexpr explicit EBOBaseImpl(Args&&... args) noexcept(
+      noexcept(T(std::forward<Args>(args)...)))
+      // still call the constructor
+      : EBOBaseImpl(_constexpr_14_workaround_no_device_tag{},
+                    T(std::forward<Args>(args)...)) {}
 
   KOKKOS_FORCEINLINE_FUNCTION
   constexpr EBOBaseImpl(EBOBaseImpl const&) = default;
@@ -148,85 +136,59 @@ struct EBOBaseImpl<T, true, CtorNotOnDevice> {
 
   KOKKOS_INLINE_FUNCTION
   KOKKOS_CONSTEXPR_14
-  T& _ebo_data_member() & {
-    return *reinterpret_cast<T*>(this);
-  }
+  T& _ebo_data_member() & { return *reinterpret_cast<T*>(this); }
 
   KOKKOS_INLINE_FUNCTION
-  constexpr
-  T const& _ebo_data_member() const & {
+  constexpr T const& _ebo_data_member() const& {
     return *reinterpret_cast<T const*>(this);
   }
 
   KOKKOS_INLINE_FUNCTION
-  T volatile& _ebo_data_member() volatile & {
+  T volatile& _ebo_data_member() volatile& {
     return *reinterpret_cast<T volatile*>(this);
   }
 
   KOKKOS_INLINE_FUNCTION
-  T const volatile& _ebo_data_member() const volatile & {
+  T const volatile& _ebo_data_member() const volatile& {
     return *reinterpret_cast<T const volatile*>(this);
   }
 
   KOKKOS_INLINE_FUNCTION
   KOKKOS_CONSTEXPR_14
-  T&& _ebo_data_member() && {
-    return std::move(*reinterpret_cast<T*>(this));
-  }
-
+  T&& _ebo_data_member() && { return std::move(*reinterpret_cast<T*>(this)); }
 };
 
 template <class T, template <class...> class CTorsNotOnDevice>
 struct EBOBaseImpl<T, false, CTorsNotOnDevice> {
-
   T m_ebo_object;
 
   template <
-    class... Args,
-    class _ignored=void,
-    typename std::enable_if<
-      std::is_void<_ignored>::value
-        && !CTorsNotOnDevice<Args...>::value
-        && std::is_constructible<T, Args...>::value,
-      int
-    >::type = 0
-  >
-  KOKKOS_FORCEINLINE_FUNCTION
-  constexpr explicit
-  EBOBaseImpl(
-    Args&&... args
-  ) noexcept(noexcept(T(std::forward<Args>(args)...)))
-    : m_ebo_object(std::forward<Args>(args)...)
-  { }
+      class... Args, class _ignored = void,
+      typename std::enable_if<std::is_void<_ignored>::value &&
+                                  !CTorsNotOnDevice<Args...>::value &&
+                                  std::is_constructible<T, Args...>::value,
+                              int>::type = 0>
+  KOKKOS_FORCEINLINE_FUNCTION constexpr explicit EBOBaseImpl(
+      Args&&... args) noexcept(noexcept(T(std::forward<Args>(args)...)))
+      : m_ebo_object(std::forward<Args>(args)...) {}
 
   template <
-    class... Args,
-    class _ignored=void,
-    typename std::enable_if<
-      std::is_void<_ignored>::value
-        && CTorsNotOnDevice<Args...>::value
-        && std::is_constructible<T, Args...>::value,
-      long
-    >::type = 0
-  >
-  inline
-  constexpr explicit
-  EBOBaseImpl(
-    Args&&... args
-  ) noexcept(noexcept(T(std::forward<Args>(args)...)))
-    : m_ebo_object(std::forward<Args>(args)...)
-  { }
-
+      class... Args, class _ignored = void,
+      typename std::enable_if<std::is_void<_ignored>::value &&
+                                  CTorsNotOnDevice<Args...>::value &&
+                                  std::is_constructible<T, Args...>::value,
+                              long>::type = 0>
+  inline constexpr explicit EBOBaseImpl(Args&&... args) noexcept(
+      noexcept(T(std::forward<Args>(args)...)))
+      : m_ebo_object(std::forward<Args>(args)...) {}
 
   // TODO @tasking @minor DSH noexcept in the right places?
 
   KOKKOS_FORCEINLINE_FUNCTION
-  constexpr
-  EBOBaseImpl(EBOBaseImpl const&) = default;
+  constexpr EBOBaseImpl(EBOBaseImpl const&) = default;
 
   KOKKOS_FORCEINLINE_FUNCTION
-  constexpr
-  EBOBaseImpl(EBOBaseImpl&&) noexcept = default;
+  constexpr EBOBaseImpl(EBOBaseImpl&&) noexcept = default;
 
   KOKKOS_FORCEINLINE_FUNCTION
   KOKKOS_CONSTEXPR_14
@@ -240,46 +202,33 @@ struct EBOBaseImpl<T, false, CTorsNotOnDevice> {
   ~EBOBaseImpl() = default;
 
   KOKKOS_INLINE_FUNCTION
-  T& _ebo_data_member() & {
-    return m_ebo_object;
-  }
+  T& _ebo_data_member() & { return m_ebo_object; }
 
   KOKKOS_INLINE_FUNCTION
-  T const& _ebo_data_member() const & {
-    return m_ebo_object;
-  }
+  T const& _ebo_data_member() const& { return m_ebo_object; }
 
   KOKKOS_INLINE_FUNCTION
-  T volatile& _ebo_data_member() volatile & {
-    return m_ebo_object;
-  }
+  T volatile& _ebo_data_member() volatile& { return m_ebo_object; }
 
   KOKKOS_INLINE_FUNCTION
-  T const volatile& _ebo_data_member() const volatile & {
-    return m_ebo_object;
-  }
+  T const volatile& _ebo_data_member() const volatile& { return m_ebo_object; }
 
   KOKKOS_INLINE_FUNCTION
-  T&& _ebo_data_member() && {
-    return m_ebo_object;
-  }
-
+  T&& _ebo_data_member() && { return m_ebo_object; }
 };
 
 /**
  *
  * @tparam T
  */
-template <class T, template <class...> class CtorsNotOnDevice=NoCtorsNotOnDevice>
+template <class T,
+          template <class...> class CtorsNotOnDevice = NoCtorsNotOnDevice>
 struct StandardLayoutNoUniqueAddressMemberEmulation
-  : EBOBaseImpl<T, std::is_empty<T>::value, CtorsNotOnDevice>
-{
-private:
-
+    : EBOBaseImpl<T, std::is_empty<T>::value, CtorsNotOnDevice> {
+ private:
   using ebo_base_t = EBOBaseImpl<T, std::is_empty<T>::value, CtorsNotOnDevice>;
 
-public:
-
+ public:
   using ebo_base_t::ebo_base_t;
 
   KOKKOS_FORCEINLINE_FUNCTION
@@ -289,18 +238,17 @@ public:
   }
 
   KOKKOS_FORCEINLINE_FUNCTION
-  constexpr
-  T const& no_unique_address_data_member() const & {
+  constexpr T const& no_unique_address_data_member() const& {
     return this->ebo_base_t::_ebo_data_member();
   }
 
   KOKKOS_FORCEINLINE_FUNCTION
-  T volatile& no_unique_address_data_member() volatile & {
+  T volatile& no_unique_address_data_member() volatile& {
     return this->ebo_base_t::_ebo_data_member();
   }
 
   KOKKOS_FORCEINLINE_FUNCTION
-  T const volatile& no_unique_address_data_member() const volatile & {
+  T const volatile& no_unique_address_data_member() const volatile& {
     return this->ebo_base_t::_ebo_data_member();
   }
 
@@ -315,29 +263,24 @@ public:
  *
  * @tparam T
  */
-template <class T, template <class...> class CtorsNotOnDevice=NoCtorsNotOnDevice>
+template <class T,
+          template <class...> class CtorsNotOnDevice = NoCtorsNotOnDevice>
 class NoUniqueAddressMemberEmulation
-  : private StandardLayoutNoUniqueAddressMemberEmulation<T, CtorsNotOnDevice>
-{
-private:
-
-  using base_t = StandardLayoutNoUniqueAddressMemberEmulation<T, CtorsNotOnDevice>;
-
-public:
+    : private StandardLayoutNoUniqueAddressMemberEmulation<T,
+                                                           CtorsNotOnDevice> {
+ private:
+  using base_t =
+      StandardLayoutNoUniqueAddressMemberEmulation<T, CtorsNotOnDevice>;
 
+ public:
   using base_t::base_t;
   using base_t::no_unique_address_data_member;
-
 };
 
-
-} // end namespace Impl
-} // end namespace Kokkos
-
+}  // end namespace Impl
+}  // end namespace Kokkos
 
 //----------------------------------------------------------------------------
 //----------------------------------------------------------------------------
 
-
 #endif /* #ifndef KOKKOS_EBO_HPP */
-
diff --git a/lib/kokkos/core/src/impl/Kokkos_Error.cpp b/lib/kokkos/core/src/impl/Kokkos_Error.cpp
index 33b0ba918d..817c9a0581 100644
--- a/lib/kokkos/core/src/impl/Kokkos_Error.cpp
+++ b/lib/kokkos/core/src/impl/Kokkos_Error.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -57,28 +58,24 @@
 namespace Kokkos {
 namespace Impl {
 
-void host_abort( const char * const message )
-{
-  fwrite(message,1,strlen(message),stderr);
+void host_abort(const char *const message) {
+  fwrite(message, 1, strlen(message), stderr);
   fflush(stderr);
   ::abort();
 }
 
-void throw_runtime_exception( const std::string & msg )
-{
-  std::ostringstream o ;
-  o << msg ;
-  traceback_callstack( o );
-  throw std::runtime_error( o.str() );
+void throw_runtime_exception(const std::string &msg) {
+  std::ostringstream o;
+  o << msg;
+  traceback_callstack(o);
+  throw std::runtime_error(o.str());
 }
 
-
-std::string human_memory_size(size_t arg_bytes)
-{
-  double bytes = arg_bytes;
+std::string human_memory_size(size_t arg_bytes) {
+  double bytes   = arg_bytes;
   const double K = 1024;
-  const double M = K*1024;
-  const double G = M*1024;
+  const double M = K * 1024;
+  const double G = M * 1024;
 
   std::ostringstream out;
   if (bytes < K) {
@@ -96,99 +93,65 @@ std::string human_memory_size(size_t arg_bytes)
   return out.str();
 }
 
-}
-}
+}  // namespace Impl
 
-//----------------------------------------------------------------------------
-//----------------------------------------------------------------------------
-
-#if defined( __GNUC__ ) && defined( ENABLE_TRACEBACK )
-
-/*  This is only known to work with GNU C++
- *  Must be compiled with '-rdynamic'
- *  Must be linked with   '-ldl'
- */
-
-/* Print call stack into an error stream,
- * so one knows in which function the error occured.
- *
- * Code copied from:
- *   http://stupefydeveloper.blogspot.com/2008/10/cc-call-stack.html
- *
- * License on this site:
- *   This blog is licensed under a
- *   Creative Commons Attribution-Share Alike 3.0 Unported License.
- *
- *   http://creativecommons.org/licenses/by-sa/3.0/
- *
- * Modified to output to std::ostream.
- */
-#include <signal.h>
-#include <execinfo.h>
-#include <cxxabi.h>
-#include <dlfcn.h>
-
-#include <cstdlib>
-
-namespace Kokkos {
-namespace Impl {
-
-void traceback_callstack( std::ostream & msg )
-{
-  using namespace abi;
-
-  enum { MAX_DEPTH = 32 };
-
-  void *trace[MAX_DEPTH];
-  Dl_info dlinfo;
-
-  int status;
-
-  int trace_size = backtrace(trace, MAX_DEPTH);
-
-  msg << std::endl << "Call stack {" << std::endl ;
-
-  for (int i=1; i<trace_size; ++i)
-  {
-    if(!dladdr(trace[i], &dlinfo))
-        continue;
-
-    const char * symname = dlinfo.dli_sname;
-
-    char * demangled = __cxa_demangle(symname, NULL, 0, &status);
-
-    if ( status == 0 && demangled ) {
-      symname = demangled;
-    }
-
-    if ( symname && *symname != 0 ) {
-      msg << "  object: " << dlinfo.dli_fname
-          << " function: " << symname
-          << std::endl ;
-    }
-
-    if ( demangled ) {
-        free(demangled);
-    }
+void Experimental::RawMemoryAllocationFailure::print_error_message(
+    std::ostream &o) const {
+  o << "Allocation of size " << Impl::human_memory_size(m_attempted_size);
+  o << " failed";
+  switch (m_failure_mode) {
+    case FailureMode::OutOfMemoryError:
+      o << ", likely due to insufficient memory.";
+      break;
+    case FailureMode::AllocationNotAligned:
+      o << " because the allocation was improperly aligned.";
+      break;
+    case FailureMode::InvalidAllocationSize:
+      o << " because the requested allocation size is not a valid size for the"
+           " requested allocation mechanism (it's probably too large).";
+      break;
+    // TODO move this to the subclass for Cuda-related things
+    case FailureMode::MaximumCudaUVMAllocationsExceeded:
+      o << " because the maximum Cuda UVM allocations was exceeded.";
+      break;
+    case FailureMode::Unknown: o << " because of an unknown error."; break;
   }
-  msg << "}" ;
+  o << "  (The allocation mechanism was ";
+  switch (m_mechanism) {
+    case AllocationMechanism::StdMalloc: o << "standard malloc()."; break;
+    case AllocationMechanism::PosixMemAlign: o << "posix_memalign()."; break;
+    case AllocationMechanism::PosixMMap: o << "POSIX mmap()."; break;
+    case AllocationMechanism::IntelMMAlloc:
+      o << "the Intel _mm_malloc() intrinsic.";
+      break;
+    case AllocationMechanism::CudaMalloc: o << "cudaMalloc()."; break;
+    case AllocationMechanism::CudaMallocManaged:
+      o << "cudaMallocManaged().";
+      break;
+    case AllocationMechanism::CudaHostAlloc: o << "cudaHostAlloc()."; break;
+  }
+  append_additional_error_information(o);
+  o << ")" << std::endl;
 }
 
-}
+std::string Experimental::RawMemoryAllocationFailure::get_error_message()
+    const {
+  std::ostringstream out;
+  print_error_message(out);
+  return out.str();
 }
 
-#else
+}  // namespace Kokkos
+
+//----------------------------------------------------------------------------
+//----------------------------------------------------------------------------
 
 namespace Kokkos {
 namespace Impl {
 
-void traceback_callstack( std::ostream & msg )
-{
-  msg << std::endl << "Traceback functionality not available" << std::endl ;
+void traceback_callstack(std::ostream &msg) {
+  msg << std::endl << "Traceback functionality not available" << std::endl;
 }
 
-}
-}
-
-#endif
-
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/impl/Kokkos_Error.hpp b/lib/kokkos/core/src/impl/Kokkos_Error.hpp
index 3d634fe5d1..44f7771042 100644
--- a/lib/kokkos/core/src/impl/Kokkos_Error.hpp
+++ b/lib/kokkos/core/src/impl/Kokkos_Error.hpp
@@ -1,13 +1,14 @@
 /*
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -36,7 +37,7 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 */
@@ -52,87 +53,167 @@
 #endif
 
 #ifndef KOKKOS_ABORT_MESSAGE_BUFFER_SIZE
-#  define KOKKOS_ABORT_MESSAGE_BUFFER_SIZE 2048
-#endif // ifndef KOKKOS_ABORT_MESSAGE_BUFFER_SIZE
+#define KOKKOS_ABORT_MESSAGE_BUFFER_SIZE 2048
+#endif  // ifndef KOKKOS_ABORT_MESSAGE_BUFFER_SIZE
 
 namespace Kokkos {
 namespace Impl {
 
-void host_abort( const char * const );
+void host_abort(const char *const);
 
-void throw_runtime_exception( const std::string & );
+void throw_runtime_exception(const std::string &);
 
-void traceback_callstack( std::ostream & );
+void traceback_callstack(std::ostream &);
 
 std::string human_memory_size(size_t arg_bytes);
 
-}
-}
+}  // namespace Impl
+
+namespace Experimental {
+
+class RawMemoryAllocationFailure : public std::bad_alloc {
+ public:
+  enum class FailureMode {
+    OutOfMemoryError,
+    AllocationNotAligned,
+    InvalidAllocationSize,
+    MaximumCudaUVMAllocationsExceeded,
+    Unknown
+  };
+  enum class AllocationMechanism {
+    StdMalloc,
+    PosixMemAlign,
+    PosixMMap,
+    IntelMMAlloc,
+    CudaMalloc,
+    CudaMallocManaged,
+    CudaHostAlloc
+  };
+
+ private:
+  size_t m_attempted_size;
+  size_t m_attempted_alignment;
+  FailureMode m_failure_mode;
+  AllocationMechanism m_mechanism;
+
+ public:
+  RawMemoryAllocationFailure(
+      size_t arg_attempted_size, size_t arg_attempted_alignment,
+      FailureMode arg_failure_mode = FailureMode::OutOfMemoryError,
+      AllocationMechanism arg_mechanism =
+          AllocationMechanism::StdMalloc) noexcept
+      : m_attempted_size(arg_attempted_size),
+        m_attempted_alignment(arg_attempted_alignment),
+        m_failure_mode(arg_failure_mode),
+        m_mechanism(arg_mechanism) {}
+
+  RawMemoryAllocationFailure() noexcept = delete;
+
+  RawMemoryAllocationFailure(RawMemoryAllocationFailure const &) noexcept =
+      default;
+  RawMemoryAllocationFailure(RawMemoryAllocationFailure &&) noexcept = default;
+
+  RawMemoryAllocationFailure &operator             =(
+      RawMemoryAllocationFailure const &) noexcept = default;
+  RawMemoryAllocationFailure &operator             =(
+      RawMemoryAllocationFailure &&) noexcept = default;
+
+  ~RawMemoryAllocationFailure() noexcept override = default;
+
+  KOKKOS_ATTRIBUTE_NODISCARD
+  const char *what() const noexcept override {
+    if (m_failure_mode == FailureMode::OutOfMemoryError) {
+      return "Memory allocation error: out of memory";
+    } else if (m_failure_mode == FailureMode::OutOfMemoryError) {
+      return "Memory allocation error: allocation result was under-aligned";
+    }
+
+    return nullptr;  // unreachable
+  }
+
+  KOKKOS_ATTRIBUTE_NODISCARD
+  size_t attempted_size() const noexcept { return m_attempted_size; }
+
+  KOKKOS_ATTRIBUTE_NODISCARD
+  size_t attempted_alignment() const noexcept { return m_attempted_alignment; }
+
+  KOKKOS_ATTRIBUTE_NODISCARD
+  AllocationMechanism allocation_mechanism() const noexcept {
+    return m_mechanism;
+  }
+
+  KOKKOS_ATTRIBUTE_NODISCARD
+  FailureMode failure_mode() const noexcept { return m_failure_mode; }
+
+  void print_error_message(std::ostream &o) const;
+  KOKKOS_ATTRIBUTE_NODISCARD
+  std::string get_error_message() const;
+
+  virtual void append_additional_error_information(std::ostream &) const {}
+};
+
+}  // end namespace Experimental
+
+}  // namespace Kokkos
 
 //----------------------------------------------------------------------------
 //----------------------------------------------------------------------------
 
-
 namespace Kokkos {
 KOKKOS_INLINE_FUNCTION
-void abort( const char * const message ) {
+void abort(const char *const message) {
 #if defined(KOKKOS_ENABLE_CUDA) && defined(__CUDA_ARCH__)
   Kokkos::Impl::cuda_abort(message);
 #else
-  #if !defined(KOKKOS_ENABLE_OPENMPTARGET) && !defined(__HCC_ACCELERATOR__)
-    Kokkos::Impl::host_abort(message);
-  #endif
+#if !defined(KOKKOS_ENABLE_OPENMPTARGET) && !defined(__HCC_ACCELERATOR__)
+  Kokkos::Impl::host_abort(message);
+#endif
 #endif
 }
 
-}
-
+}  // namespace Kokkos
 
 //----------------------------------------------------------------------------
 //----------------------------------------------------------------------------
 
-
-#if !defined(NDEBUG) || defined(KOKKOS_ENFORCE_CONTRACTS) || defined(KOKKOS_DEBUG)
-#  define KOKKOS_EXPECTS(...) \
-  { \
-    if(!bool(__VA_ARGS__)) { \
-      ::Kokkos::abort( \
-        "Kokkos contract violation:\n  " \
-        "  Expected precondition `" #__VA_ARGS__ "` evaluated false." \
-      ); \
-    } \
+#if !defined(NDEBUG) || defined(KOKKOS_ENFORCE_CONTRACTS) || \
+    defined(KOKKOS_DEBUG)
+#define KOKKOS_EXPECTS(...)                                               \
+  {                                                                       \
+    if (!bool(__VA_ARGS__)) {                                             \
+      ::Kokkos::abort(                                                    \
+          "Kokkos contract violation:\n  "                                \
+          "  Expected precondition `" #__VA_ARGS__ "` evaluated false."); \
+    }                                                                     \
   }
-#  define KOKKOS_ENSURES(...) \
-  { \
-    if(!bool(__VA_ARGS__)) { \
-      ::Kokkos::abort( \
-        "Kokkos contract violation:\n  " \
-        "  Ensured postcondition `" #__VA_ARGS__ "` evaluated false." \
-      ); \
-    } \
+#define KOKKOS_ENSURES(...)                                               \
+  {                                                                       \
+    if (!bool(__VA_ARGS__)) {                                             \
+      ::Kokkos::abort(                                                    \
+          "Kokkos contract violation:\n  "                                \
+          "  Ensured postcondition `" #__VA_ARGS__ "` evaluated false."); \
+    }                                                                     \
   }
 // some projects already define this for themselves, so don't mess them up
-#  ifndef KOKKOS_ASSERT
-#    define KOKKOS_ASSERT(...) \
-  { \
-    if(!bool(__VA_ARGS__)) { \
-      ::Kokkos::abort( \
-        "Kokkos contract violation:\n  " \
-        "  Asserted condition `" #__VA_ARGS__ "` evaluated false." \
-      ); \
-    } \
+#ifndef KOKKOS_ASSERT
+#define KOKKOS_ASSERT(...)                                             \
+  {                                                                    \
+    if (!bool(__VA_ARGS__)) {                                          \
+      ::Kokkos::abort(                                                 \
+          "Kokkos contract violation:\n  "                             \
+          "  Asserted condition `" #__VA_ARGS__ "` evaluated false."); \
+    }                                                                  \
   }
-#  endif // ifndef KOKKOS_ASSERT
-#else // not debug mode
-#  define KOKKOS_EXPECTS(...)
-#  define KOKKOS_ENSURES(...)
-#  ifndef KOKKOS_ASSERT
-#    define KOKKOS_ASSERT(...)
-#  endif // ifndef KOKKOS_ASSERT
-#endif // end debug mode ifdefs
+#endif  // ifndef KOKKOS_ASSERT
+#else   // not debug mode
+#define KOKKOS_EXPECTS(...)
+#define KOKKOS_ENSURES(...)
+#ifndef KOKKOS_ASSERT
+#define KOKKOS_ASSERT(...)
+#endif  // ifndef KOKKOS_ASSERT
+#endif  // end debug mode ifdefs
 
 //----------------------------------------------------------------------------
 //----------------------------------------------------------------------------
 
 #endif /* #ifndef KOKKOS_IMPL_ERROR_HPP */
-
diff --git a/lib/kokkos/core/src/impl/Kokkos_ExecPolicy.cpp b/lib/kokkos/core/src/impl/Kokkos_ExecPolicy.cpp
index 72ba515613..eada15fe99 100644
--- a/lib/kokkos/core/src/impl/Kokkos_ExecPolicy.cpp
+++ b/lib/kokkos/core/src/impl/Kokkos_ExecPolicy.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -44,20 +45,15 @@
 #include <Kokkos_Core.hpp>
 namespace Kokkos {
 namespace Impl {
-    PerTeamValue::PerTeamValue(int arg):value(arg) {}
+PerTeamValue::PerTeamValue(int arg) : value(arg) {}
 
-    PerThreadValue::PerThreadValue(int arg):value(arg) {}
-}
+PerThreadValue::PerThreadValue(int arg) : value(arg) {}
+}  // namespace Impl
 
-Impl::PerTeamValue PerTeam(const int& arg)
-{
-  return Impl::PerTeamValue(arg);
-}
+Impl::PerTeamValue PerTeam(const int& arg) { return Impl::PerTeamValue(arg); }
 
-Impl::PerThreadValue PerThread(const int& arg)
-{
+Impl::PerThreadValue PerThread(const int& arg) {
   return Impl::PerThreadValue(arg);
 }
 
-}
-
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/impl/Kokkos_FixedBufferMemoryPool.hpp b/lib/kokkos/core/src/impl/Kokkos_FixedBufferMemoryPool.hpp
index 3053d8d9d0..a304e8eff2 100644
--- a/lib/kokkos/core/src/impl/Kokkos_FixedBufferMemoryPool.hpp
+++ b/lib/kokkos/core/src/impl/Kokkos_FixedBufferMemoryPool.hpp
@@ -2,10 +2,10 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
+//                        Kokkos v. 3.0
 //              Copyright (2019) Sandia Corporation
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +23,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -53,69 +53,64 @@
 namespace Kokkos {
 namespace Impl {
 
-template <
-  class DeviceType,
-  size_t Size,
-  size_t Align=1,
-  class SizeType = typename DeviceType::execution_space::size_type
->
+template <class DeviceType, size_t Size, size_t Align = 1,
+          class SizeType = typename DeviceType::execution_space::size_type>
 class FixedBlockSizeMemoryPool
-  : private MemorySpaceInstanceStorage<typename DeviceType::memory_space>
-{
-public:
-
+    : private MemorySpaceInstanceStorage<typename DeviceType::memory_space> {
+ public:
   using memory_space = typename DeviceType::memory_space;
-  using size_type = SizeType;
+  using size_type    = SizeType;
 
-private:
-
-  using memory_space_storage_base = MemorySpaceInstanceStorage<typename DeviceType::memory_space>;
+ private:
+  using memory_space_storage_base =
+      MemorySpaceInstanceStorage<typename DeviceType::memory_space>;
   using tracker_type = Kokkos::Impl::SharedAllocationTracker;
-  using record_type = Kokkos::Impl::SharedAllocationRecord<memory_space>;
+  using record_type  = Kokkos::Impl::SharedAllocationRecord<memory_space>;
 
-  struct alignas(Align) Block { union { char ignore; char data[Size]; }; };
+  struct alignas(Align) Block {
+    union {
+      char ignore;
+      char data[Size];
+    };
+  };
 
   static constexpr auto actual_size = sizeof(Block);
 
   // TODO shared allocation tracker
-  // TODO @optimization put the index values on different cache lines (CPU) or pages (GPU)?
+  // TODO @optimization put the index values on different cache lines (CPU) or
+  // pages (GPU)?
 
-  tracker_type m_tracker = { };
-  size_type m_num_blocks = 0;
-  size_type m_first_free_idx = 0;
-  size_type m_last_free_idx = 0;
-  Kokkos::OwningRawPtr<Block> m_first_block = nullptr;
+  tracker_type m_tracker                         = {};
+  size_type m_num_blocks                         = 0;
+  size_type m_first_free_idx                     = 0;
+  size_type m_last_free_idx                      = 0;
+  Kokkos::OwningRawPtr<Block> m_first_block      = nullptr;
   Kokkos::OwningRawPtr<size_type> m_free_indices = nullptr;
 
   enum : size_type { IndexInUse = ~size_type(0) };
 
-public:
-
-  FixedBlockSizeMemoryPool(
-    memory_space const& mem_space,
-    size_type num_blocks
-  ) : memory_space_storage_base(mem_space),
-      m_tracker(),
-      m_num_blocks(num_blocks),
-      m_first_free_idx(0),
-      m_last_free_idx(num_blocks)
-  {
+ public:
+  FixedBlockSizeMemoryPool(memory_space const& mem_space, size_type num_blocks)
+      : memory_space_storage_base(mem_space),
+        m_tracker(),
+        m_num_blocks(num_blocks),
+        m_first_free_idx(0),
+        m_last_free_idx(num_blocks) {
     // TODO alignment?
     auto block_record = record_type::allocate(
-      mem_space, "FixedBlockSizeMemPool_blocks", num_blocks * sizeof(Block)
-    );
+        mem_space, "FixedBlockSizeMemPool_blocks", num_blocks * sizeof(Block));
     KOKKOS_ASSERT(intptr_t(block_record->data()) % Align == 0);
     m_tracker.assign_allocated_record_to_uninitialized(block_record);
     m_first_block = (Block*)block_record->data();
 
-    auto idx_record = record_type::allocate(
-      mem_space, "FixedBlockSizeMemPool_blocks", num_blocks * sizeof(size_type)
-    );
+    auto idx_record =
+        record_type::allocate(mem_space, "FixedBlockSizeMemPool_blocks",
+                              num_blocks * sizeof(size_type));
     KOKKOS_ASSERT(intptr_t(idx_record->data()) % alignof(size_type) == 0);
     m_tracker.assign_allocated_record_to_uninitialized(idx_record);
     m_free_indices = (size_type*)idx_record->data();
 
-    for(size_type i = 0; i < num_blocks; ++i) {
+    for (size_type i = 0; i < num_blocks; ++i) {
       m_free_indices[i] = i;
     }
 
@@ -123,59 +118,62 @@ public:
   }
 
   // For compatibility with MemoryPool<>
-  FixedBlockSizeMemoryPool(
-    memory_space const& mem_space,
-    size_t mempool_capacity,
-    unsigned, unsigned, unsigned
-  ) : FixedBlockSizeMemoryPool(mem_space, mempool_capacity / actual_size)
-  { /* forwarding ctor, must be empty */ }
+  FixedBlockSizeMemoryPool(memory_space const& mem_space,
+                           size_t mempool_capacity, unsigned, unsigned,
+                           unsigned)
+      : FixedBlockSizeMemoryPool(
+            mem_space, mempool_capacity /
+                           actual_size) { /* forwarding ctor, must be empty */
+  }
 
   KOKKOS_INLINE_FUNCTION FixedBlockSizeMemoryPool() = default;
-  KOKKOS_INLINE_FUNCTION FixedBlockSizeMemoryPool(FixedBlockSizeMemoryPool&&) = default;
-  KOKKOS_INLINE_FUNCTION FixedBlockSizeMemoryPool(FixedBlockSizeMemoryPool const&) = default;
-  KOKKOS_INLINE_FUNCTION FixedBlockSizeMemoryPool& operator=(FixedBlockSizeMemoryPool&&) = default;
-  KOKKOS_INLINE_FUNCTION FixedBlockSizeMemoryPool& operator=(FixedBlockSizeMemoryPool const&) = default;
-
+  KOKKOS_INLINE_FUNCTION FixedBlockSizeMemoryPool(FixedBlockSizeMemoryPool&&) =
+      default;
+  KOKKOS_INLINE_FUNCTION FixedBlockSizeMemoryPool(
+      FixedBlockSizeMemoryPool const&)                     = default;
+  KOKKOS_INLINE_FUNCTION FixedBlockSizeMemoryPool& operator=(
+      FixedBlockSizeMemoryPool&&) = default;
+  KOKKOS_INLINE_FUNCTION FixedBlockSizeMemoryPool& operator=(
+      FixedBlockSizeMemoryPool const&) = default;
 
   KOKKOS_INLINE_FUNCTION
-  void* allocate(size_type alloc_size) const noexcept
-  {
+  void* allocate(size_type alloc_size) const noexcept {
     KOKKOS_EXPECTS(alloc_size <= Size);
-    auto free_idx_counter = Kokkos::atomic_fetch_add((volatile size_type*)&m_first_free_idx, size_type(1));
+    auto free_idx_counter = Kokkos::atomic_fetch_add(
+        (volatile size_type*)&m_first_free_idx, size_type(1));
     auto free_idx_idx = free_idx_counter % m_num_blocks;
 
     // We don't have exclusive access to m_free_indices[free_idx_idx] because
     // the allocate counter might have lapped us since we incremented it
     auto current_free_idx = m_free_indices[free_idx_idx];
-    size_type free_idx = IndexInUse;
-    free_idx =
-      Kokkos::atomic_compare_exchange(&m_free_indices[free_idx_idx], current_free_idx, free_idx);
+    size_type free_idx    = IndexInUse;
+    free_idx = Kokkos::atomic_compare_exchange(&m_free_indices[free_idx_idx],
+                                               current_free_idx, free_idx);
     Kokkos::memory_fence();
 
     // TODO figure out how to decrement here?
 
-    if(free_idx == IndexInUse) {
+    if (free_idx == IndexInUse) {
       return nullptr;
-    }
-    else {
+    } else {
       return (void*)&m_first_block[free_idx];
     }
   }
 
   KOKKOS_INLINE_FUNCTION
-  void deallocate(void* ptr, size_type alloc_size) const noexcept
-  {
+  void deallocate(void* ptr, size_type alloc_size) const noexcept {
     // figure out which block we are
     auto offset = intptr_t(ptr) - intptr_t(m_first_block);
 
-    KOKKOS_EXPECTS(offset % actual_size == 0 && offset/actual_size < m_num_blocks);
+    KOKKOS_EXPECTS(offset % actual_size == 0 &&
+                   offset / actual_size < m_num_blocks);
 
     Kokkos::memory_fence();
-    auto last_idx_idx = Kokkos::atomic_fetch_add((volatile size_type*)&m_last_free_idx, size_type(1));
+    auto last_idx_idx = Kokkos::atomic_fetch_add(
+        (volatile size_type*)&m_last_free_idx, size_type(1));
     last_idx_idx %= m_num_blocks;
     m_free_indices[last_idx_idx] = offset / actual_size;
   }
-
 };
 
 #if 0
@@ -301,7 +299,7 @@ public:
 };
 #endif
 
-} // end namespace Impl
-} // end namespace Kokkos
+}  // end namespace Impl
+}  // end namespace Kokkos
 
-#endif //KOKKOS_IMPL_KOKKOS_FIXEDBUFFERMEMORYPOOL_HPP
+#endif  // KOKKOS_IMPL_KOKKOS_FIXEDBUFFERMEMORYPOOL_HPP
diff --git a/lib/kokkos/core/src/impl/Kokkos_FunctorAdapter.hpp b/lib/kokkos/core/src/impl/Kokkos_FunctorAdapter.hpp
index ea3480b48b..e981e90366 100644
--- a/lib/kokkos/core/src/impl/Kokkos_FunctorAdapter.hpp
+++ b/lib/kokkos/core/src/impl/Kokkos_FunctorAdapter.hpp
@@ -1,13 +1,14 @@
 /*
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -36,7 +37,7 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 */
@@ -55,68 +56,76 @@
 namespace Kokkos {
 namespace Impl {
 
-template< class FunctorType, class Enable = void>
+template <class FunctorType, class Enable = void>
 struct ReduceFunctorHasInit {
-  enum {value = false};
+  enum { value = false };
 };
 
-template< class FunctorType>
-struct ReduceFunctorHasInit<FunctorType, typename Impl::enable_if< 0 < sizeof( & FunctorType::init ) >::type > {
-  enum {value = true};
+template <class FunctorType>
+struct ReduceFunctorHasInit<
+    FunctorType,
+    typename Impl::enable_if<0 < sizeof(&FunctorType::init)>::type> {
+  enum { value = true };
 };
 
-template< class FunctorType, class Enable = void>
+template <class FunctorType, class Enable = void>
 struct ReduceFunctorHasJoin {
-  enum {value = false};
+  enum { value = false };
 };
 
-template< class FunctorType>
-struct ReduceFunctorHasJoin<FunctorType, typename Impl::enable_if< 0 < sizeof( & FunctorType::join ) >::type > {
-  enum {value = true};
+template <class FunctorType>
+struct ReduceFunctorHasJoin<
+    FunctorType,
+    typename Impl::enable_if<0 < sizeof(&FunctorType::join)>::type> {
+  enum { value = true };
 };
 
-template< class FunctorType, class Enable = void>
+template <class FunctorType, class Enable = void>
 struct ReduceFunctorHasFinal {
-  enum {value = false};
+  enum { value = false };
 };
 
-template< class FunctorType>
-struct ReduceFunctorHasFinal<FunctorType, typename Impl::enable_if< 0 < sizeof( & FunctorType::final ) >::type > {
-  enum {value = true};
+template <class FunctorType>
+struct ReduceFunctorHasFinal<
+    FunctorType,
+    typename Impl::enable_if<0 < sizeof(&FunctorType::final)>::type> {
+  enum { value = true };
 };
 
-template< class FunctorType, class Enable = void>
-  struct ReduceFunctorHasShmemSize {
-  enum {value = false};
+template <class FunctorType, class Enable = void>
+struct ReduceFunctorHasShmemSize {
+  enum { value = false };
 };
 
-template< class FunctorType>
-struct ReduceFunctorHasShmemSize<FunctorType, typename Impl::enable_if< 0 < sizeof( & FunctorType::team_shmem_size ) >::type > {
-  enum {value = true};
+template <class FunctorType>
+struct ReduceFunctorHasShmemSize<
+    FunctorType,
+    typename Impl::enable_if<0 < sizeof(&FunctorType::team_shmem_size)>::type> {
+  enum { value = true };
 };
 
-template< class FunctorType , class ArgTag , class Enable = void >
+template <class FunctorType, class ArgTag, class Enable = void>
 struct FunctorDeclaresValueType : public Impl::false_type {};
 
-template< class FunctorType , class ArgTag >
-struct FunctorDeclaresValueType< FunctorType , ArgTag
-                               , typename Impl::enable_if_type< typename FunctorType::value_type >::type >
-  : public Impl::true_type {};
+template <class FunctorType, class ArgTag>
+struct FunctorDeclaresValueType<
+    FunctorType, ArgTag,
+    typename Impl::enable_if_type<typename FunctorType::value_type>::type>
+    : public Impl::true_type {};
 
-template< class FunctorType, bool Enable =
-      ( FunctorDeclaresValueType<FunctorType,void>::value) ||
-      ( ReduceFunctorHasInit<FunctorType>::value  ) ||
-      ( ReduceFunctorHasJoin<FunctorType>::value  ) ||
-      ( ReduceFunctorHasFinal<FunctorType>::value ) ||
-      ( ReduceFunctorHasShmemSize<FunctorType>::value )
-      >
+template <class FunctorType,
+          bool Enable = (FunctorDeclaresValueType<FunctorType, void>::value) ||
+                        (ReduceFunctorHasInit<FunctorType>::value) ||
+                        (ReduceFunctorHasJoin<FunctorType>::value) ||
+                        (ReduceFunctorHasFinal<FunctorType>::value) ||
+                        (ReduceFunctorHasShmemSize<FunctorType>::value)>
 struct IsNonTrivialReduceFunctor {
-  enum {value = false};
+  enum { value = false };
 };
 
-template< class FunctorType>
+template <class FunctorType>
 struct IsNonTrivialReduceFunctor<FunctorType, true> {
-  enum {value = true};
+  enum { value = true };
 };
 
 /** \brief  Query Functor and execution policy argument tag for value type.
@@ -124,30 +133,31 @@ struct IsNonTrivialReduceFunctor<FunctorType, true> {
  *  If C++11 enabled and 'value_type' is not explicitly declared then attempt
  *  to deduce the type from FunctorType::operator().
  */
-template< class FunctorType , class ArgTag , bool Dec = FunctorDeclaresValueType<FunctorType,ArgTag>::value >
-struct FunctorValueTraits
-{
-  typedef void value_type ;
-  typedef void pointer_type ;
-  typedef void reference_type ;
-  typedef void functor_type ;
+template <class FunctorType, class ArgTag,
+          bool Dec = FunctorDeclaresValueType<FunctorType, ArgTag>::value>
+struct FunctorValueTraits {
+  typedef void value_type;
+  typedef void pointer_type;
+  typedef void reference_type;
+  typedef void functor_type;
 
   enum { StaticValueSize = 0 };
 
-  KOKKOS_FORCEINLINE_FUNCTION static
-  unsigned value_count( const FunctorType & ) { return 0 ; }
+  KOKKOS_FORCEINLINE_FUNCTION static unsigned value_count(const FunctorType&) {
+    return 0;
+  }
 
-  KOKKOS_FORCEINLINE_FUNCTION static
-  unsigned value_size( const FunctorType & ) { return 0 ; }
+  KOKKOS_FORCEINLINE_FUNCTION static unsigned value_size(const FunctorType&) {
+    return 0;
+  }
 };
 
-template<class ArgTag>
-struct FunctorValueTraits<void, ArgTag,false>
-{
-  typedef void value_type ;
-  typedef void pointer_type ;
-  typedef void reference_type ;
-  typedef void functor_type ;
+template <class ArgTag>
+struct FunctorValueTraits<void, ArgTag, false> {
+  typedef void value_type;
+  typedef void pointer_type;
+  typedef void reference_type;
+  typedef void functor_type;
 };
 
 /** \brief  FunctorType::value_type is explicitly declared so use it.
@@ -161,844 +171,1138 @@ struct FunctorValueTraits<void, ArgTag,false>
  *        typedef {pod_type} value_type[] ;
  *        const unsigned     value_count ;
  */
-template< class FunctorType , class ArgTag >
-struct FunctorValueTraits< FunctorType , ArgTag , true /* == exists FunctorType::value_type */ >
-{
-  typedef typename Impl::remove_extent< typename FunctorType::value_type >::type  value_type ;
+template <class FunctorType, class ArgTag>
+struct FunctorValueTraits<FunctorType, ArgTag,
+                          true /* == exists FunctorType::value_type */> {
+  typedef typename Impl::remove_extent<typename FunctorType::value_type>::type
+      value_type;
   typedef FunctorType functor_type;
 
-  static_assert( 0 == ( sizeof(value_type) % sizeof(int) ) ,
-    "Reduction functor's declared value_type requires: 0 == sizeof(value_type) % sizeof(int)" );
+  static_assert(0 == (sizeof(value_type) % sizeof(int)),
+                "Reduction functor's declared value_type requires: 0 == "
+                "sizeof(value_type) % sizeof(int)");
 
   /* this cast to bool is needed for correctness by NVCC */
-  enum : bool { IsArray = static_cast<bool>(Impl::is_array< typename FunctorType::value_type >::value) };
+  enum : bool {
+    IsArray = static_cast<bool>(
+        Impl::is_array<typename FunctorType::value_type>::value)
+  };
 
   // If not an array then what is the sizeof(value_type)
   enum { StaticValueSize = IsArray ? 0 : sizeof(value_type) };
 
-  typedef value_type                 * pointer_type ;
+  typedef value_type* pointer_type;
 
   // The reference_type for an array is 'value_type *'
   // The reference_type for a single value is 'value_type &'
 
-  typedef typename Impl::if_c< IsArray , value_type *
-                                       , value_type & >::type  reference_type ;
+  typedef typename Impl::if_c<IsArray, value_type*, value_type&>::type
+      reference_type;
 
   // Number of values if single value
-  template< class F >
+  template <class F>
   KOKKOS_FORCEINLINE_FUNCTION static
-  typename Impl::enable_if< std::is_same<F,FunctorType>::value && ! IsArray , unsigned >::type
-    value_count( const F & ) { return 1 ; }
+      typename Impl::enable_if<std::is_same<F, FunctorType>::value && !IsArray,
+                               unsigned>::type
+      value_count(const F&) {
+    return 1;
+  }
 
-  // Number of values if an array, protect via templating because 'f.value_count'
-  // will only exist when the functor declares the value_type to be an array.
-  template< class F >
+  // Number of values if an array, protect via templating because
+  // 'f.value_count' will only exist when the functor declares the value_type to
+  // be an array.
+  template <class F>
   KOKKOS_FORCEINLINE_FUNCTION static
-  typename Impl::enable_if< std::is_same<F,FunctorType>::value && IsArray , unsigned >::type
-    value_count( const F & f ) { return f.value_count ; }
+      typename Impl::enable_if<std::is_same<F, FunctorType>::value && IsArray,
+                               unsigned>::type
+      value_count(const F& f) {
+    return f.value_count;
+  }
 
   // Total size of the value
-  KOKKOS_INLINE_FUNCTION static
-  unsigned value_size( const FunctorType & f ) { return value_count( f ) * sizeof(value_type) ; }
+  KOKKOS_INLINE_FUNCTION static unsigned value_size(const FunctorType& f) {
+    return value_count(f) * sizeof(value_type);
+  }
 };
 
+template <class FunctorType, class ArgTag>
+struct FunctorValueTraits<FunctorType, ArgTag,
+                          false /* == exists FunctorType::value_type */
+                          > {
+ private:
+  struct VOIDTAG {
+  };  // Allow declaration of non-matching operator() with void argument tag.
+  struct REJECTTAG {
+  };  // Reject tagged operator() when using non-tagged execution policy.
 
-template< class FunctorType , class ArgTag >
-struct FunctorValueTraits< FunctorType
-                         , ArgTag
-                         , false  /* == exists FunctorType::value_type */
-                         >
-{
-private:
-
-  struct VOIDTAG {};   // Allow declaration of non-matching operator() with void argument tag.
-  struct REJECTTAG {}; // Reject tagged operator() when using non-tagged execution policy.
-
-  typedef typename
-    Impl::if_c< std::is_same< ArgTag , void >::value , VOIDTAG , ArgTag >::type tag_type ;
+  typedef typename Impl::if_c<std::is_same<ArgTag, void>::value, VOIDTAG,
+                              ArgTag>::type tag_type;
 
   //----------------------------------------
   // parallel_for operator without a tag:
 
-  template< class ArgMember >
-  KOKKOS_INLINE_FUNCTION
-  static VOIDTAG deduce_reduce_type( VOIDTAG , void (FunctorType::*)( ArgMember ) const ) {}
+  template <class ArgMember>
+  KOKKOS_INLINE_FUNCTION static VOIDTAG deduce_reduce_type(
+      VOIDTAG, void (FunctorType::*)(ArgMember) const) {}
 
-  template< class ArgMember >
-  KOKKOS_INLINE_FUNCTION
-  static VOIDTAG deduce_reduce_type( VOIDTAG , void (FunctorType::*)( ArgMember , ArgMember ) const ) {}
+  template <class ArgMember>
+  KOKKOS_INLINE_FUNCTION static VOIDTAG deduce_reduce_type(
+      VOIDTAG, void (FunctorType::*)(ArgMember, ArgMember) const) {}
 
-  template< class ArgMember >
-  KOKKOS_INLINE_FUNCTION
-  static VOIDTAG deduce_reduce_type( VOIDTAG , void (FunctorType::*)( ArgMember , ArgMember , ArgMember ) const ) {}
+  template <class ArgMember>
+  KOKKOS_INLINE_FUNCTION static VOIDTAG deduce_reduce_type(
+      VOIDTAG, void (FunctorType::*)(ArgMember, ArgMember, ArgMember) const) {}
 
-  template< class ArgMember >
-  KOKKOS_INLINE_FUNCTION
-  static VOIDTAG deduce_reduce_type( VOIDTAG , void (FunctorType::*)( ArgMember , ArgMember , ArgMember , ArgMember ) const ) {}
+  template <class ArgMember>
+  KOKKOS_INLINE_FUNCTION static VOIDTAG deduce_reduce_type(
+      VOIDTAG, void (FunctorType::*)(ArgMember, ArgMember, ArgMember, ArgMember)
+                   const) {}
 
-  template< class ArgMember >
-  KOKKOS_INLINE_FUNCTION
-  static VOIDTAG deduce_reduce_type( VOIDTAG , void (FunctorType::*)( ArgMember , ArgMember , ArgMember , ArgMember , ArgMember ) const ) {}
+  template <class ArgMember>
+  KOKKOS_INLINE_FUNCTION static VOIDTAG deduce_reduce_type(
+      VOIDTAG, void (FunctorType::*)(ArgMember, ArgMember, ArgMember, ArgMember,
+                                     ArgMember) const) {}
 
-  template< class ArgMember >
-  KOKKOS_INLINE_FUNCTION
-  static VOIDTAG deduce_reduce_type( VOIDTAG , void (FunctorType::*)( ArgMember , ArgMember , ArgMember , ArgMember , ArgMember , ArgMember ) const ) {}
+  template <class ArgMember>
+  KOKKOS_INLINE_FUNCTION static VOIDTAG deduce_reduce_type(
+      VOIDTAG, void (FunctorType::*)(ArgMember, ArgMember, ArgMember, ArgMember,
+                                     ArgMember, ArgMember) const) {}
 
-  template< class ArgMember >
-  KOKKOS_INLINE_FUNCTION
-  static VOIDTAG deduce_reduce_type( VOIDTAG , void (FunctorType::*)( ArgMember , ArgMember , ArgMember , ArgMember , ArgMember , ArgMember , ArgMember ) const ) {}
+  template <class ArgMember>
+  KOKKOS_INLINE_FUNCTION static VOIDTAG deduce_reduce_type(
+      VOIDTAG, void (FunctorType::*)(ArgMember, ArgMember, ArgMember, ArgMember,
+                                     ArgMember, ArgMember, ArgMember) const) {}
 
-  template< class ArgMember >
-  KOKKOS_INLINE_FUNCTION
-  static VOIDTAG deduce_reduce_type( VOIDTAG , void (FunctorType::*)( ArgMember , ArgMember , ArgMember , ArgMember , ArgMember , ArgMember , ArgMember , ArgMember ) const ) {}
+  template <class ArgMember>
+  KOKKOS_INLINE_FUNCTION static VOIDTAG deduce_reduce_type(
+      VOIDTAG, void (FunctorType::*)(ArgMember, ArgMember, ArgMember, ArgMember,
+                                     ArgMember, ArgMember, ArgMember, ArgMember)
+                   const) {}
 
+  template <class ArgMember>
+  KOKKOS_INLINE_FUNCTION static VOIDTAG deduce_reduce_type(
+      VOIDTAG, void (FunctorType::*)(const ArgMember&) const) {}
 
-  template< class ArgMember >
-  KOKKOS_INLINE_FUNCTION
-  static VOIDTAG deduce_reduce_type( VOIDTAG , void (FunctorType::*)( const ArgMember & ) const ) {}
+  template <class ArgMember>
+  KOKKOS_INLINE_FUNCTION static VOIDTAG deduce_reduce_type(
+      VOIDTAG,
+      void (FunctorType::*)(const ArgMember&, const ArgMember&) const) {}
 
-  template< class ArgMember >
-  KOKKOS_INLINE_FUNCTION
-  static VOIDTAG deduce_reduce_type( VOIDTAG , void (FunctorType::*)( const ArgMember & , const ArgMember & ) const ) {}
+  template <class ArgMember>
+  KOKKOS_INLINE_FUNCTION static VOIDTAG deduce_reduce_type(
+      VOIDTAG, void (FunctorType::*)(const ArgMember&, const ArgMember&,
+                                     const ArgMember&) const) {}
 
-  template< class ArgMember >
-  KOKKOS_INLINE_FUNCTION
-  static VOIDTAG deduce_reduce_type( VOIDTAG , void (FunctorType::*)( const ArgMember & , const ArgMember & , const ArgMember & ) const ) {}
+  template <class ArgMember>
+  KOKKOS_INLINE_FUNCTION static VOIDTAG deduce_reduce_type(
+      VOIDTAG,
+      void (FunctorType::*)(const ArgMember&, const ArgMember&,
+                            const ArgMember&, const ArgMember&) const) {}
 
-  template< class ArgMember >
-  KOKKOS_INLINE_FUNCTION
-  static VOIDTAG deduce_reduce_type( VOIDTAG , void (FunctorType::*)( const ArgMember & , const ArgMember & , const ArgMember & , const ArgMember & ) const ) {}
+  template <class ArgMember>
+  KOKKOS_INLINE_FUNCTION static VOIDTAG deduce_reduce_type(
+      VOIDTAG, void (FunctorType::*)(const ArgMember&, const ArgMember&,
+                                     const ArgMember&, const ArgMember&,
+                                     const ArgMember&) const) {}
 
-  template< class ArgMember >
-  KOKKOS_INLINE_FUNCTION
-  static VOIDTAG deduce_reduce_type( VOIDTAG , void (FunctorType::*)( const ArgMember & , const ArgMember & , const ArgMember & , const ArgMember & , const ArgMember & ) const ) {}
+  template <class ArgMember>
+  KOKKOS_INLINE_FUNCTION static VOIDTAG deduce_reduce_type(
+      VOIDTAG,
+      void (FunctorType::*)(const ArgMember&, const ArgMember&,
+                            const ArgMember&, const ArgMember&,
+                            const ArgMember&, const ArgMember&) const) {}
 
-  template< class ArgMember >
-  KOKKOS_INLINE_FUNCTION
-  static VOIDTAG deduce_reduce_type( VOIDTAG , void (FunctorType::*)( const ArgMember & , const ArgMember & , const ArgMember & , const ArgMember & , const ArgMember & , const ArgMember & ) const ) {}
+  template <class ArgMember>
+  KOKKOS_INLINE_FUNCTION static VOIDTAG deduce_reduce_type(
+      VOIDTAG, void (FunctorType::*)(const ArgMember&, const ArgMember&,
+                                     const ArgMember&, const ArgMember&,
+                                     const ArgMember&, const ArgMember&,
+                                     const ArgMember&) const) {}
 
-  template< class ArgMember >
-  KOKKOS_INLINE_FUNCTION
-  static VOIDTAG deduce_reduce_type( VOIDTAG , void (FunctorType::*)( const ArgMember & , const ArgMember & , const ArgMember & , const ArgMember & , const ArgMember & , const ArgMember & , const ArgMember & ) const ) {}
+  template <class ArgMember>
+  KOKKOS_INLINE_FUNCTION static VOIDTAG deduce_reduce_type(
+      VOIDTAG,
+      void (FunctorType::*)(const ArgMember&, const ArgMember&,
+                            const ArgMember&, const ArgMember&,
+                            const ArgMember&, const ArgMember&,
+                            const ArgMember&, const ArgMember&) const) {}
 
-  template< class ArgMember >
-  KOKKOS_INLINE_FUNCTION
-  static VOIDTAG deduce_reduce_type( VOIDTAG , void (FunctorType::*)( const ArgMember & , const ArgMember & , const ArgMember & , const ArgMember & , const ArgMember & , const ArgMember & , const ArgMember & , const ArgMember & ) const ) {}
+  template <class TagType, class ArgMember>
+  KOKKOS_INLINE_FUNCTION static REJECTTAG deduce_reduce_type(
+      VOIDTAG, void (FunctorType::*)(TagType, ArgMember) const) {}
 
+  template <class TagType, class ArgMember>
+  KOKKOS_INLINE_FUNCTION static REJECTTAG deduce_reduce_type(
+      VOIDTAG, void (FunctorType::*)(TagType, ArgMember, ArgMember) const) {}
 
-  template< class TagType , class ArgMember >
-  KOKKOS_INLINE_FUNCTION
-  static REJECTTAG deduce_reduce_type( VOIDTAG , void (FunctorType::*)( TagType , ArgMember ) const ) {}
+  template <class TagType, class ArgMember>
+  KOKKOS_INLINE_FUNCTION static REJECTTAG deduce_reduce_type(
+      VOIDTAG,
+      void (FunctorType::*)(TagType, ArgMember, ArgMember, ArgMember) const) {}
 
-  template< class TagType , class ArgMember >
-  KOKKOS_INLINE_FUNCTION
-  static REJECTTAG deduce_reduce_type( VOIDTAG , void (FunctorType::*)( TagType , ArgMember , ArgMember ) const ) {}
+  template <class TagType, class ArgMember>
+  KOKKOS_INLINE_FUNCTION static REJECTTAG deduce_reduce_type(
+      VOIDTAG, void (FunctorType::*)(TagType, ArgMember, ArgMember, ArgMember,
+                                     ArgMember) const) {}
 
-  template< class TagType , class ArgMember >
-  KOKKOS_INLINE_FUNCTION
-  static REJECTTAG deduce_reduce_type( VOIDTAG , void (FunctorType::*)( TagType , ArgMember , ArgMember , ArgMember ) const ) {}
+  template <class TagType, class ArgMember>
+  KOKKOS_INLINE_FUNCTION static REJECTTAG deduce_reduce_type(
+      VOIDTAG, void (FunctorType::*)(TagType, ArgMember, ArgMember, ArgMember,
+                                     ArgMember, ArgMember) const) {}
 
-  template< class TagType , class ArgMember >
-  KOKKOS_INLINE_FUNCTION
-  static REJECTTAG deduce_reduce_type( VOIDTAG , void (FunctorType::*)( TagType , ArgMember , ArgMember , ArgMember , ArgMember ) const ) {}
+  template <class TagType, class ArgMember>
+  KOKKOS_INLINE_FUNCTION static REJECTTAG deduce_reduce_type(
+      VOIDTAG, void (FunctorType::*)(TagType, ArgMember, ArgMember, ArgMember,
+                                     ArgMember, ArgMember, ArgMember) const) {}
 
-  template< class TagType , class ArgMember >
-  KOKKOS_INLINE_FUNCTION
-  static REJECTTAG deduce_reduce_type( VOIDTAG , void (FunctorType::*)( TagType , ArgMember , ArgMember , ArgMember , ArgMember , ArgMember ) const ) {}
+  template <class TagType, class ArgMember>
+  KOKKOS_INLINE_FUNCTION static REJECTTAG deduce_reduce_type(
+      VOIDTAG,
+      void (FunctorType::*)(TagType, ArgMember, ArgMember, ArgMember, ArgMember,
+                            ArgMember, ArgMember, ArgMember) const) {}
 
-  template< class TagType , class ArgMember >
-  KOKKOS_INLINE_FUNCTION
-  static REJECTTAG deduce_reduce_type( VOIDTAG , void (FunctorType::*)( TagType , ArgMember , ArgMember , ArgMember , ArgMember , ArgMember , ArgMember ) const ) {}
+  template <class TagType, class ArgMember>
+  KOKKOS_INLINE_FUNCTION static REJECTTAG deduce_reduce_type(
+      VOIDTAG, void (FunctorType::*)(TagType, ArgMember, ArgMember, ArgMember,
+                                     ArgMember, ArgMember, ArgMember, ArgMember,
+                                     ArgMember) const) {}
 
-  template< class TagType , class ArgMember >
-  KOKKOS_INLINE_FUNCTION
-  static REJECTTAG deduce_reduce_type( VOIDTAG , void (FunctorType::*)( TagType , ArgMember , ArgMember , ArgMember , ArgMember , ArgMember , ArgMember , ArgMember ) const ) {}
+  template <class TagType, class ArgMember>
+  KOKKOS_INLINE_FUNCTION static REJECTTAG deduce_reduce_type(
+      VOIDTAG, void (FunctorType::*)(TagType, const ArgMember&) const) {}
 
-  template< class TagType , class ArgMember >
-  KOKKOS_INLINE_FUNCTION
-  static REJECTTAG deduce_reduce_type( VOIDTAG , void (FunctorType::*)( TagType , ArgMember , ArgMember , ArgMember , ArgMember , ArgMember , ArgMember , ArgMember , ArgMember ) const ) {}
+  template <class TagType, class ArgMember>
+  KOKKOS_INLINE_FUNCTION static REJECTTAG deduce_reduce_type(
+      VOIDTAG, void (FunctorType::*)(TagType, const ArgMember&,
+                                     const ArgMember&) const) {}
 
+  template <class TagType, class ArgMember>
+  KOKKOS_INLINE_FUNCTION static REJECTTAG deduce_reduce_type(
+      VOIDTAG,
+      void (FunctorType::*)(TagType, const ArgMember&, const ArgMember&,
+                            const ArgMember&) const) {}
 
-  template< class TagType , class ArgMember >
-  KOKKOS_INLINE_FUNCTION
-  static REJECTTAG deduce_reduce_type( VOIDTAG , void (FunctorType::*)( TagType , const ArgMember & ) const ) {}
+  template <class TagType, class ArgMember>
+  KOKKOS_INLINE_FUNCTION static REJECTTAG deduce_reduce_type(
+      VOIDTAG,
+      void (FunctorType::*)(TagType, const ArgMember&, const ArgMember&,
+                            const ArgMember&, const ArgMember&) const) {}
 
-  template< class TagType , class ArgMember >
-  KOKKOS_INLINE_FUNCTION
-  static REJECTTAG deduce_reduce_type( VOIDTAG , void (FunctorType::*)( TagType , const ArgMember & , const ArgMember & ) const ) {}
+  template <class TagType, class ArgMember>
+  KOKKOS_INLINE_FUNCTION static REJECTTAG deduce_reduce_type(
+      VOIDTAG,
+      void (FunctorType::*)(TagType, const ArgMember&, const ArgMember&,
+                            const ArgMember&, const ArgMember&,
+                            const ArgMember&) const) {}
 
-  template< class TagType , class ArgMember >
-  KOKKOS_INLINE_FUNCTION
-  static REJECTTAG deduce_reduce_type( VOIDTAG , void (FunctorType::*)( TagType , const ArgMember & , const ArgMember & , const ArgMember & ) const ) {}
+  template <class TagType, class ArgMember>
+  KOKKOS_INLINE_FUNCTION static REJECTTAG deduce_reduce_type(
+      VOIDTAG,
+      void (FunctorType::*)(TagType, const ArgMember&, const ArgMember&,
+                            const ArgMember&, const ArgMember&,
+                            const ArgMember&, const ArgMember&) const) {}
 
-  template< class TagType , class ArgMember >
-  KOKKOS_INLINE_FUNCTION
-  static REJECTTAG deduce_reduce_type( VOIDTAG , void (FunctorType::*)( TagType , const ArgMember & , const ArgMember & , const ArgMember & , const ArgMember & ) const ) {}
+  template <class TagType, class ArgMember>
+  KOKKOS_INLINE_FUNCTION static REJECTTAG deduce_reduce_type(
+      VOIDTAG,
+      void (FunctorType::*)(TagType, const ArgMember&, const ArgMember&,
+                            const ArgMember&, const ArgMember&,
+                            const ArgMember&, const ArgMember&,
+                            const ArgMember&) const) {}
 
-  template< class TagType , class ArgMember >
-  KOKKOS_INLINE_FUNCTION
-  static REJECTTAG deduce_reduce_type( VOIDTAG , void (FunctorType::*)( TagType , const ArgMember & , const ArgMember & , const ArgMember & , const ArgMember & , const ArgMember & ) const ) {}
+  template <class TagType, class ArgMember>
+  KOKKOS_INLINE_FUNCTION static REJECTTAG deduce_reduce_type(
+      VOIDTAG,
+      void (FunctorType::*)(TagType, const ArgMember&, const ArgMember&,
+                            const ArgMember&, const ArgMember&,
+                            const ArgMember&, const ArgMember&,
+                            const ArgMember&, const ArgMember&) const) {}
 
-  template< class TagType , class ArgMember >
-  KOKKOS_INLINE_FUNCTION
-  static REJECTTAG deduce_reduce_type( VOIDTAG , void (FunctorType::*)( TagType , const ArgMember & , const ArgMember & , const ArgMember & , const ArgMember & , const ArgMember & , const ArgMember & ) const ) {}
+  template <class TagType, class ArgMember>
+  KOKKOS_INLINE_FUNCTION static REJECTTAG deduce_reduce_type(
+      VOIDTAG, void (FunctorType::*)(const TagType&, ArgMember) const) {}
 
-  template< class TagType , class ArgMember >
-  KOKKOS_INLINE_FUNCTION
-  static REJECTTAG deduce_reduce_type( VOIDTAG , void (FunctorType::*)( TagType , const ArgMember & , const ArgMember & , const ArgMember & , const ArgMember & , const ArgMember & , const ArgMember & , const ArgMember & ) const ) {}
+  template <class TagType, class ArgMember>
+  KOKKOS_INLINE_FUNCTION static REJECTTAG deduce_reduce_type(
+      VOIDTAG,
+      void (FunctorType::*)(const TagType&, ArgMember, ArgMember) const) {}
 
-  template< class TagType , class ArgMember >
-  KOKKOS_INLINE_FUNCTION
-  static REJECTTAG deduce_reduce_type( VOIDTAG , void (FunctorType::*)( TagType , const ArgMember & , const ArgMember & , const ArgMember & , const ArgMember & , const ArgMember & , const ArgMember & , const ArgMember & , const ArgMember & ) const ) {}
+  template <class TagType, class ArgMember>
+  KOKKOS_INLINE_FUNCTION static REJECTTAG deduce_reduce_type(
+      VOIDTAG, void (FunctorType::*)(const TagType&, ArgMember, ArgMember,
+                                     ArgMember) const) {}
 
+  template <class TagType, class ArgMember>
+  KOKKOS_INLINE_FUNCTION static REJECTTAG deduce_reduce_type(
+      VOIDTAG, void (FunctorType::*)(const TagType&, ArgMember, ArgMember,
+                                     ArgMember, ArgMember) const) {}
 
+  template <class TagType, class ArgMember>
+  KOKKOS_INLINE_FUNCTION static REJECTTAG deduce_reduce_type(
+      VOIDTAG, void (FunctorType::*)(const TagType&, ArgMember, ArgMember,
+                                     ArgMember, ArgMember, ArgMember) const) {}
 
-  template< class TagType , class ArgMember >
-  KOKKOS_INLINE_FUNCTION
-  static REJECTTAG deduce_reduce_type( VOIDTAG , void (FunctorType::*)( const TagType & , ArgMember ) const ) {}
+  template <class TagType, class ArgMember>
+  KOKKOS_INLINE_FUNCTION static REJECTTAG deduce_reduce_type(
+      VOIDTAG,
+      void (FunctorType::*)(const TagType&, ArgMember, ArgMember, ArgMember,
+                            ArgMember, ArgMember, ArgMember) const) {}
 
-  template< class TagType , class ArgMember >
-  KOKKOS_INLINE_FUNCTION
-  static REJECTTAG deduce_reduce_type( VOIDTAG , void (FunctorType::*)( const TagType & , ArgMember , ArgMember ) const ) {}
+  template <class TagType, class ArgMember>
+  KOKKOS_INLINE_FUNCTION static REJECTTAG deduce_reduce_type(
+      VOIDTAG, void (FunctorType::*)(const TagType&, ArgMember, ArgMember,
+                                     ArgMember, ArgMember, ArgMember, ArgMember,
+                                     ArgMember) const) {}
 
-  template< class TagType , class ArgMember >
-  KOKKOS_INLINE_FUNCTION
-  static REJECTTAG deduce_reduce_type( VOIDTAG , void (FunctorType::*)( const TagType & , ArgMember , ArgMember , ArgMember ) const ) {}
+  template <class TagType, class ArgMember>
+  KOKKOS_INLINE_FUNCTION static REJECTTAG deduce_reduce_type(
+      VOIDTAG, void (FunctorType::*)(const TagType&, ArgMember, ArgMember,
+                                     ArgMember, ArgMember, ArgMember, ArgMember,
+                                     ArgMember, ArgMember) const) {}
 
-  template< class TagType , class ArgMember >
-  KOKKOS_INLINE_FUNCTION
-  static REJECTTAG deduce_reduce_type( VOIDTAG , void (FunctorType::*)( const TagType & , ArgMember , ArgMember , ArgMember , ArgMember ) const ) {}
+  template <class TagType, class ArgMember>
+  KOKKOS_INLINE_FUNCTION static REJECTTAG deduce_reduce_type(
+      VOIDTAG, void (FunctorType::*)(const TagType&, const ArgMember&) const) {}
 
-  template< class TagType , class ArgMember >
-  KOKKOS_INLINE_FUNCTION
-  static REJECTTAG deduce_reduce_type( VOIDTAG , void (FunctorType::*)( const TagType & , ArgMember , ArgMember , ArgMember , ArgMember , ArgMember ) const ) {}
+  template <class TagType, class ArgMember>
+  KOKKOS_INLINE_FUNCTION static REJECTTAG deduce_reduce_type(
+      VOIDTAG, void (FunctorType::*)(const TagType&, const ArgMember&,
+                                     const ArgMember&) const) {}
 
-  template< class TagType , class ArgMember >
-  KOKKOS_INLINE_FUNCTION
-  static REJECTTAG deduce_reduce_type( VOIDTAG , void (FunctorType::*)( const TagType & , ArgMember , ArgMember , ArgMember , ArgMember , ArgMember , ArgMember ) const ) {}
+  template <class TagType, class ArgMember>
+  KOKKOS_INLINE_FUNCTION static REJECTTAG deduce_reduce_type(
+      VOIDTAG,
+      void (FunctorType::*)(const TagType&, const ArgMember&, const ArgMember&,
+                            const ArgMember&) const) {}
 
-  template< class TagType , class ArgMember >
-  KOKKOS_INLINE_FUNCTION
-  static REJECTTAG deduce_reduce_type( VOIDTAG , void (FunctorType::*)( const TagType & , ArgMember , ArgMember , ArgMember , ArgMember , ArgMember , ArgMember , ArgMember ) const ) {}
+  template <class TagType, class ArgMember>
+  KOKKOS_INLINE_FUNCTION static REJECTTAG deduce_reduce_type(
+      VOIDTAG,
+      void (FunctorType::*)(const TagType&, const ArgMember&, const ArgMember&,
+                            const ArgMember&, const ArgMember&) const) {}
 
-  template< class TagType , class ArgMember >
-  KOKKOS_INLINE_FUNCTION
-  static REJECTTAG deduce_reduce_type( VOIDTAG , void (FunctorType::*)( const TagType & , ArgMember , ArgMember , ArgMember , ArgMember , ArgMember , ArgMember , ArgMember , ArgMember ) const ) {}
+  template <class TagType, class ArgMember>
+  KOKKOS_INLINE_FUNCTION static REJECTTAG deduce_reduce_type(
+      VOIDTAG,
+      void (FunctorType::*)(const TagType&, const ArgMember&, const ArgMember&,
+                            const ArgMember&, const ArgMember&,
+                            const ArgMember&) const) {}
 
+  template <class TagType, class ArgMember>
+  KOKKOS_INLINE_FUNCTION static REJECTTAG deduce_reduce_type(
+      VOIDTAG,
+      void (FunctorType::*)(const TagType&, const ArgMember&, const ArgMember&,
+                            const ArgMember&, const ArgMember&,
+                            const ArgMember&, const ArgMember&) const) {}
 
-  template< class TagType , class ArgMember >
-  KOKKOS_INLINE_FUNCTION
-  static REJECTTAG deduce_reduce_type( VOIDTAG , void (FunctorType::*)( const TagType & , const ArgMember & ) const ) {}
-
-  template< class TagType , class ArgMember >
-  KOKKOS_INLINE_FUNCTION
-  static REJECTTAG deduce_reduce_type( VOIDTAG , void (FunctorType::*)( const TagType & , const ArgMember & , const ArgMember & ) const ) {}
-
-  template< class TagType , class ArgMember >
-  KOKKOS_INLINE_FUNCTION
-  static REJECTTAG deduce_reduce_type( VOIDTAG , void (FunctorType::*)( const TagType & , const ArgMember & , const ArgMember & , const ArgMember & ) const ) {}
-
-  template< class TagType , class ArgMember >
-  KOKKOS_INLINE_FUNCTION
-  static REJECTTAG deduce_reduce_type( VOIDTAG , void (FunctorType::*)( const TagType & , const ArgMember & , const ArgMember & , const ArgMember & , const ArgMember & ) const ) {}
-
-  template< class TagType , class ArgMember >
-  KOKKOS_INLINE_FUNCTION
-  static REJECTTAG deduce_reduce_type( VOIDTAG , void (FunctorType::*)( const TagType & , const ArgMember & , const ArgMember & , const ArgMember & , const ArgMember & , const ArgMember & ) const ) {}
-
-  template< class TagType , class ArgMember >
-  KOKKOS_INLINE_FUNCTION
-  static REJECTTAG deduce_reduce_type( VOIDTAG , void (FunctorType::*)( const TagType & , const ArgMember & , const ArgMember & , const ArgMember & , const ArgMember & , const ArgMember & , const ArgMember & ) const ) {}
-
-  template< class TagType , class ArgMember >
-  KOKKOS_INLINE_FUNCTION
-  static REJECTTAG deduce_reduce_type( VOIDTAG , void (FunctorType::*)( const TagType & , const ArgMember & , const ArgMember & , const ArgMember & , const ArgMember & , const ArgMember & , const ArgMember & , const ArgMember & ) const ) {}
-
-  template< class TagType , class ArgMember >
-  KOKKOS_INLINE_FUNCTION
-  static REJECTTAG deduce_reduce_type( VOIDTAG , void (FunctorType::*)( const TagType & , const ArgMember & , const ArgMember & , const ArgMember & , const ArgMember & , const ArgMember & , const ArgMember & , const ArgMember & , const ArgMember & ) const ) {}
+  template <class TagType, class ArgMember>
+  KOKKOS_INLINE_FUNCTION static REJECTTAG deduce_reduce_type(
+      VOIDTAG,
+      void (FunctorType::*)(const TagType&, const ArgMember&, const ArgMember&,
+                            const ArgMember&, const ArgMember&,
+                            const ArgMember&, const ArgMember&,
+                            const ArgMember&) const) {}
 
+  template <class TagType, class ArgMember>
+  KOKKOS_INLINE_FUNCTION static REJECTTAG deduce_reduce_type(
+      VOIDTAG,
+      void (FunctorType::*)(const TagType&, const ArgMember&, const ArgMember&,
+                            const ArgMember&, const ArgMember&,
+                            const ArgMember&, const ArgMember&,
+                            const ArgMember&, const ArgMember&) const) {}
 
   //----------------------------------------
   // parallel_for operator with a tag:
 
-  template< class ArgMember >
-  KOKKOS_INLINE_FUNCTION
-  static VOIDTAG deduce_reduce_type( tag_type , void (FunctorType::*)( tag_type , ArgMember ) const ) {}
+  template <class ArgMember>
+  KOKKOS_INLINE_FUNCTION static VOIDTAG deduce_reduce_type(
+      tag_type, void (FunctorType::*)(tag_type, ArgMember) const) {}
 
-  template< class ArgMember >
-  KOKKOS_INLINE_FUNCTION
-  static VOIDTAG deduce_reduce_type( tag_type , void (FunctorType::*)( tag_type , ArgMember , ArgMember ) const ) {}
+  template <class ArgMember>
+  KOKKOS_INLINE_FUNCTION static VOIDTAG deduce_reduce_type(
+      tag_type, void (FunctorType::*)(tag_type, ArgMember, ArgMember) const) {}
 
-  template< class ArgMember >
-  KOKKOS_INLINE_FUNCTION
-  static VOIDTAG deduce_reduce_type( tag_type , void (FunctorType::*)( tag_type , ArgMember , ArgMember , ArgMember ) const ) {}
+  template <class ArgMember>
+  KOKKOS_INLINE_FUNCTION static VOIDTAG deduce_reduce_type(
+      tag_type,
+      void (FunctorType::*)(tag_type, ArgMember, ArgMember, ArgMember) const) {}
 
-  template< class ArgMember >
-  KOKKOS_INLINE_FUNCTION
-  static VOIDTAG deduce_reduce_type( tag_type , void (FunctorType::*)( tag_type , ArgMember , ArgMember , ArgMember , ArgMember ) const ) {}
+  template <class ArgMember>
+  KOKKOS_INLINE_FUNCTION static VOIDTAG deduce_reduce_type(
+      tag_type, void (FunctorType::*)(tag_type, ArgMember, ArgMember, ArgMember,
+                                      ArgMember) const) {}
 
-  template< class ArgMember >
-  KOKKOS_INLINE_FUNCTION
-  static VOIDTAG deduce_reduce_type( tag_type , void (FunctorType::*)( tag_type , ArgMember , ArgMember , ArgMember , ArgMember , ArgMember ) const ) {}
+  template <class ArgMember>
+  KOKKOS_INLINE_FUNCTION static VOIDTAG deduce_reduce_type(
+      tag_type, void (FunctorType::*)(tag_type, ArgMember, ArgMember, ArgMember,
+                                      ArgMember, ArgMember) const) {}
 
-  template< class ArgMember >
-  KOKKOS_INLINE_FUNCTION
-  static VOIDTAG deduce_reduce_type( tag_type , void (FunctorType::*)( tag_type , ArgMember , ArgMember , ArgMember , ArgMember , ArgMember , ArgMember ) const ) {}
+  template <class ArgMember>
+  KOKKOS_INLINE_FUNCTION static VOIDTAG deduce_reduce_type(
+      tag_type, void (FunctorType::*)(tag_type, ArgMember, ArgMember, ArgMember,
+                                      ArgMember, ArgMember, ArgMember) const) {}
 
-  template< class ArgMember >
-  KOKKOS_INLINE_FUNCTION
-  static VOIDTAG deduce_reduce_type( tag_type , void (FunctorType::*)( tag_type , ArgMember , ArgMember , ArgMember , ArgMember , ArgMember , ArgMember , ArgMember ) const ) {}
+  template <class ArgMember>
+  KOKKOS_INLINE_FUNCTION static VOIDTAG deduce_reduce_type(
+      tag_type, void (FunctorType::*)(tag_type, ArgMember, ArgMember, ArgMember,
+                                      ArgMember, ArgMember, ArgMember,
+                                      ArgMember) const) {}
 
-  template< class ArgMember >
-  KOKKOS_INLINE_FUNCTION
-  static VOIDTAG deduce_reduce_type( tag_type , void (FunctorType::*)( tag_type , ArgMember , ArgMember , ArgMember , ArgMember , ArgMember , ArgMember , ArgMember , ArgMember ) const ) {}
+  template <class ArgMember>
+  KOKKOS_INLINE_FUNCTION static VOIDTAG deduce_reduce_type(
+      tag_type, void (FunctorType::*)(tag_type, ArgMember, ArgMember, ArgMember,
+                                      ArgMember, ArgMember, ArgMember,
+                                      ArgMember, ArgMember) const) {}
 
+  template <class ArgMember>
+  KOKKOS_INLINE_FUNCTION static VOIDTAG deduce_reduce_type(
+      tag_type, void (FunctorType::*)(const tag_type&, ArgMember) const) {}
 
-  template< class ArgMember >
-  KOKKOS_INLINE_FUNCTION
-  static VOIDTAG deduce_reduce_type( tag_type , void (FunctorType::*)( const tag_type & , ArgMember ) const ) {}
+  template <class ArgMember>
+  KOKKOS_INLINE_FUNCTION static VOIDTAG deduce_reduce_type(
+      tag_type,
+      void (FunctorType::*)(const tag_type&, ArgMember, ArgMember) const) {}
 
-  template< class ArgMember >
-  KOKKOS_INLINE_FUNCTION
-  static VOIDTAG deduce_reduce_type( tag_type , void (FunctorType::*)( const tag_type & , ArgMember , ArgMember ) const ) {}
+  template <class ArgMember>
+  KOKKOS_INLINE_FUNCTION static VOIDTAG deduce_reduce_type(
+      tag_type, void (FunctorType::*)(const tag_type&, ArgMember, ArgMember,
+                                      ArgMember) const) {}
 
-  template< class ArgMember >
-  KOKKOS_INLINE_FUNCTION
-  static VOIDTAG deduce_reduce_type( tag_type , void (FunctorType::*)( const tag_type & , ArgMember , ArgMember , ArgMember ) const ) {}
+  template <class ArgMember>
+  KOKKOS_INLINE_FUNCTION static VOIDTAG deduce_reduce_type(
+      tag_type, void (FunctorType::*)(const tag_type&, ArgMember, ArgMember,
+                                      ArgMember, ArgMember) const) {}
 
-  template< class ArgMember >
-  KOKKOS_INLINE_FUNCTION
-  static VOIDTAG deduce_reduce_type( tag_type , void (FunctorType::*)( const tag_type & , ArgMember , ArgMember , ArgMember , ArgMember ) const ) {}
+  template <class ArgMember>
+  KOKKOS_INLINE_FUNCTION static VOIDTAG deduce_reduce_type(
+      tag_type, void (FunctorType::*)(const tag_type&, ArgMember, ArgMember,
+                                      ArgMember, ArgMember, ArgMember) const) {}
 
-  template< class ArgMember >
-  KOKKOS_INLINE_FUNCTION
-  static VOIDTAG deduce_reduce_type( tag_type , void (FunctorType::*)( const tag_type & , ArgMember , ArgMember , ArgMember , ArgMember , ArgMember ) const ) {}
+  template <class ArgMember>
+  KOKKOS_INLINE_FUNCTION static VOIDTAG deduce_reduce_type(
+      tag_type,
+      void (FunctorType::*)(const tag_type&, ArgMember, ArgMember, ArgMember,
+                            ArgMember, ArgMember, ArgMember) const) {}
 
-  template< class ArgMember >
-  KOKKOS_INLINE_FUNCTION
-  static VOIDTAG deduce_reduce_type( tag_type , void (FunctorType::*)( const tag_type & , ArgMember , ArgMember , ArgMember , ArgMember , ArgMember , ArgMember ) const ) {}
+  template <class ArgMember>
+  KOKKOS_INLINE_FUNCTION static VOIDTAG deduce_reduce_type(
+      tag_type, void (FunctorType::*)(const tag_type&, ArgMember, ArgMember,
+                                      ArgMember, ArgMember, ArgMember,
+                                      ArgMember, ArgMember) const) {}
 
-  template< class ArgMember >
-  KOKKOS_INLINE_FUNCTION
-  static VOIDTAG deduce_reduce_type( tag_type , void (FunctorType::*)( const tag_type & , ArgMember , ArgMember , ArgMember , ArgMember , ArgMember , ArgMember , ArgMember ) const ) {}
+  template <class ArgMember>
+  KOKKOS_INLINE_FUNCTION static VOIDTAG deduce_reduce_type(
+      tag_type, void (FunctorType::*)(const tag_type&, ArgMember, ArgMember,
+                                      ArgMember, ArgMember, ArgMember,
+                                      ArgMember, ArgMember, ArgMember) const) {}
 
-  template< class ArgMember >
-  KOKKOS_INLINE_FUNCTION
-  static VOIDTAG deduce_reduce_type( tag_type , void (FunctorType::*)( const tag_type & , ArgMember , ArgMember , ArgMember , ArgMember , ArgMember , ArgMember , ArgMember , ArgMember ) const ) {}
+  template <class ArgMember>
+  KOKKOS_INLINE_FUNCTION static VOIDTAG deduce_reduce_type(
+      tag_type, void (FunctorType::*)(tag_type, const ArgMember&) const) {}
 
+  template <class ArgMember>
+  KOKKOS_INLINE_FUNCTION static VOIDTAG deduce_reduce_type(
+      tag_type, void (FunctorType::*)(tag_type, const ArgMember&,
+                                      const ArgMember&) const) {}
 
-  template< class ArgMember >
-  KOKKOS_INLINE_FUNCTION
-  static VOIDTAG deduce_reduce_type( tag_type , void (FunctorType::*)( tag_type , const ArgMember & ) const ) {}
+  template <class ArgMember>
+  KOKKOS_INLINE_FUNCTION static VOIDTAG deduce_reduce_type(
+      tag_type,
+      void (FunctorType::*)(tag_type, const ArgMember&, const ArgMember&,
+                            const ArgMember&) const) {}
 
-  template< class ArgMember >
-  KOKKOS_INLINE_FUNCTION
-  static VOIDTAG deduce_reduce_type( tag_type , void (FunctorType::*)( tag_type , const ArgMember & , const ArgMember & ) const ) {}
+  template <class ArgMember>
+  KOKKOS_INLINE_FUNCTION static VOIDTAG deduce_reduce_type(
+      tag_type,
+      void (FunctorType::*)(tag_type, const ArgMember&, const ArgMember&,
+                            const ArgMember&, const ArgMember&) const) {}
 
-  template< class ArgMember >
-  KOKKOS_INLINE_FUNCTION
-  static VOIDTAG deduce_reduce_type( tag_type , void (FunctorType::*)( tag_type , const ArgMember & , const ArgMember & , const ArgMember & ) const ) {}
+  template <class ArgMember>
+  KOKKOS_INLINE_FUNCTION static VOIDTAG deduce_reduce_type(
+      tag_type,
+      void (FunctorType::*)(tag_type, const ArgMember&, const ArgMember&,
+                            const ArgMember&, const ArgMember&,
+                            const ArgMember&) const) {}
 
-  template< class ArgMember >
-  KOKKOS_INLINE_FUNCTION
-  static VOIDTAG deduce_reduce_type( tag_type , void (FunctorType::*)( tag_type , const ArgMember & , const ArgMember & , const ArgMember & , const ArgMember & ) const ) {}
+  template <class ArgMember>
+  KOKKOS_INLINE_FUNCTION static VOIDTAG deduce_reduce_type(
+      tag_type,
+      void (FunctorType::*)(tag_type, const ArgMember&, const ArgMember&,
+                            const ArgMember&, const ArgMember&,
+                            const ArgMember&, const ArgMember&) const) {}
 
-  template< class ArgMember >
-  KOKKOS_INLINE_FUNCTION
-  static VOIDTAG deduce_reduce_type( tag_type , void (FunctorType::*)( tag_type , const ArgMember & , const ArgMember & , const ArgMember & , const ArgMember & , const ArgMember & ) const ) {}
+  template <class ArgMember>
+  KOKKOS_INLINE_FUNCTION static VOIDTAG deduce_reduce_type(
+      tag_type,
+      void (FunctorType::*)(tag_type, const ArgMember&, const ArgMember&,
+                            const ArgMember&, const ArgMember&,
+                            const ArgMember&, const ArgMember&,
+                            const ArgMember&) const) {}
 
-  template< class ArgMember >
-  KOKKOS_INLINE_FUNCTION
-  static VOIDTAG deduce_reduce_type( tag_type , void (FunctorType::*)( tag_type , const ArgMember & , const ArgMember & , const ArgMember & , const ArgMember & , const ArgMember & , const ArgMember & ) const ) {}
+  template <class ArgMember>
+  KOKKOS_INLINE_FUNCTION static VOIDTAG deduce_reduce_type(
+      tag_type,
+      void (FunctorType::*)(tag_type, const ArgMember&, const ArgMember&,
+                            const ArgMember&, const ArgMember&,
+                            const ArgMember&, const ArgMember&,
+                            const ArgMember&, const ArgMember&) const) {}
 
-  template< class ArgMember >
-  KOKKOS_INLINE_FUNCTION
-  static VOIDTAG deduce_reduce_type( tag_type , void (FunctorType::*)( tag_type , const ArgMember & , const ArgMember & , const ArgMember & , const ArgMember & , const ArgMember & , const ArgMember & , const ArgMember & ) const ) {}
+  template <class ArgMember>
+  KOKKOS_INLINE_FUNCTION static VOIDTAG deduce_reduce_type(
+      tag_type,
+      void (FunctorType::*)(const tag_type&, const ArgMember&) const) {}
 
-  template< class ArgMember >
-  KOKKOS_INLINE_FUNCTION
-  static VOIDTAG deduce_reduce_type( tag_type , void (FunctorType::*)( tag_type , const ArgMember & , const ArgMember & , const ArgMember & , const ArgMember & , const ArgMember & , const ArgMember & , const ArgMember & , const ArgMember & ) const ) {}
+  template <class ArgMember>
+  KOKKOS_INLINE_FUNCTION static VOIDTAG deduce_reduce_type(
+      tag_type, void (FunctorType::*)(const tag_type&, const ArgMember&,
+                                      const ArgMember&) const) {}
 
+  template <class ArgMember>
+  KOKKOS_INLINE_FUNCTION static VOIDTAG deduce_reduce_type(
+      tag_type,
+      void (FunctorType::*)(const tag_type&, const ArgMember&, const ArgMember&,
+                            const ArgMember&) const) {}
 
-  template< class ArgMember >
-  KOKKOS_INLINE_FUNCTION
-  static VOIDTAG deduce_reduce_type( tag_type , void (FunctorType::*)( const tag_type & , const ArgMember & ) const ) {}
+  template <class ArgMember>
+  KOKKOS_INLINE_FUNCTION static VOIDTAG deduce_reduce_type(
+      tag_type,
+      void (FunctorType::*)(const tag_type&, const ArgMember&, const ArgMember&,
+                            const ArgMember&, const ArgMember&) const) {}
 
-  template< class ArgMember >
-  KOKKOS_INLINE_FUNCTION
-  static VOIDTAG deduce_reduce_type( tag_type , void (FunctorType::*)( const tag_type & , const ArgMember & , const ArgMember & ) const ) {}
+  template <class ArgMember>
+  KOKKOS_INLINE_FUNCTION static VOIDTAG deduce_reduce_type(
+      tag_type,
+      void (FunctorType::*)(const tag_type&, const ArgMember&, const ArgMember&,
+                            const ArgMember&, const ArgMember&,
+                            const ArgMember&) const) {}
 
-  template< class ArgMember >
-  KOKKOS_INLINE_FUNCTION
-  static VOIDTAG deduce_reduce_type( tag_type , void (FunctorType::*)( const tag_type & , const ArgMember & , const ArgMember & , const ArgMember & ) const ) {}
+  template <class ArgMember>
+  KOKKOS_INLINE_FUNCTION static VOIDTAG deduce_reduce_type(
+      tag_type,
+      void (FunctorType::*)(const tag_type&, const ArgMember&, const ArgMember&,
+                            const ArgMember&, const ArgMember&,
+                            const ArgMember&, const ArgMember&) const) {}
 
-  template< class ArgMember >
-  KOKKOS_INLINE_FUNCTION
-  static VOIDTAG deduce_reduce_type( tag_type , void (FunctorType::*)( const tag_type & , const ArgMember & , const ArgMember & , const ArgMember & , const ArgMember & ) const ) {}
-
-  template< class ArgMember >
-  KOKKOS_INLINE_FUNCTION
-  static VOIDTAG deduce_reduce_type( tag_type , void (FunctorType::*)( const tag_type & , const ArgMember & , const ArgMember & , const ArgMember & , const ArgMember & , const ArgMember & ) const ) {}
-
-  template< class ArgMember >
-  KOKKOS_INLINE_FUNCTION
-  static VOIDTAG deduce_reduce_type( tag_type , void (FunctorType::*)( const tag_type & , const ArgMember & , const ArgMember & , const ArgMember & , const ArgMember & , const ArgMember & , const ArgMember & ) const ) {}
-
-  template< class ArgMember >
-  KOKKOS_INLINE_FUNCTION
-  static VOIDTAG deduce_reduce_type( tag_type , void (FunctorType::*)( const tag_type & , const ArgMember & , const ArgMember & , const ArgMember & , const ArgMember & , const ArgMember & , const ArgMember & , const ArgMember & ) const ) {}
-
-  template< class ArgMember >
-  KOKKOS_INLINE_FUNCTION
-  static VOIDTAG deduce_reduce_type( tag_type , void (FunctorType::*)( const tag_type & , const ArgMember & , const ArgMember & , const ArgMember & , const ArgMember & , const ArgMember & , const ArgMember & , const ArgMember & , const ArgMember & ) const ) {}
+  template <class ArgMember>
+  KOKKOS_INLINE_FUNCTION static VOIDTAG deduce_reduce_type(
+      tag_type,
+      void (FunctorType::*)(const tag_type&, const ArgMember&, const ArgMember&,
+                            const ArgMember&, const ArgMember&,
+                            const ArgMember&, const ArgMember&,
+                            const ArgMember&) const) {}
 
+  template <class ArgMember>
+  KOKKOS_INLINE_FUNCTION static VOIDTAG deduce_reduce_type(
+      tag_type,
+      void (FunctorType::*)(const tag_type&, const ArgMember&, const ArgMember&,
+                            const ArgMember&, const ArgMember&,
+                            const ArgMember&, const ArgMember&,
+                            const ArgMember&, const ArgMember&) const) {}
 
   //----------------------------------------
   // parallel_reduce operator without a tag:
-  template< class ArgMember , class T >
-  KOKKOS_INLINE_FUNCTION
-  static T deduce_reduce_type( VOIDTAG , void (FunctorType::*)( ArgMember , T & ) const ) {}
+  template <class ArgMember, class T>
+  KOKKOS_INLINE_FUNCTION static T deduce_reduce_type(
+      VOIDTAG, void (FunctorType::*)(ArgMember, T&) const) {}
 
-  template< class ArgMember , class T >
-  KOKKOS_INLINE_FUNCTION
-  static T deduce_reduce_type( VOIDTAG , void (FunctorType::*)( ArgMember , ArgMember , T & ) const ) {}
+  template <class ArgMember, class T>
+  KOKKOS_INLINE_FUNCTION static T deduce_reduce_type(
+      VOIDTAG, void (FunctorType::*)(ArgMember, ArgMember, T&) const) {}
 
-  template< class ArgMember , class T >
-  KOKKOS_INLINE_FUNCTION
-  static T deduce_reduce_type( VOIDTAG , void (FunctorType::*)( ArgMember , ArgMember , ArgMember , T & ) const ) {}
+  template <class ArgMember, class T>
+  KOKKOS_INLINE_FUNCTION static T deduce_reduce_type(
+      VOIDTAG,
+      void (FunctorType::*)(ArgMember, ArgMember, ArgMember, T&) const) {}
 
-  template< class ArgMember , class T >
-  KOKKOS_INLINE_FUNCTION
-  static T deduce_reduce_type( VOIDTAG , void (FunctorType::*)( ArgMember , ArgMember , ArgMember , ArgMember , T & ) const ) {}
+  template <class ArgMember, class T>
+  KOKKOS_INLINE_FUNCTION static T deduce_reduce_type(
+      VOIDTAG, void (FunctorType::*)(ArgMember, ArgMember, ArgMember, ArgMember,
+                                     T&) const) {}
 
-  template< class ArgMember , class T >
-  KOKKOS_INLINE_FUNCTION
-  static T deduce_reduce_type( VOIDTAG , void (FunctorType::*)( ArgMember , ArgMember , ArgMember , ArgMember , ArgMember , T & ) const ) {}
+  template <class ArgMember, class T>
+  KOKKOS_INLINE_FUNCTION static T deduce_reduce_type(
+      VOIDTAG, void (FunctorType::*)(ArgMember, ArgMember, ArgMember, ArgMember,
+                                     ArgMember, T&) const) {}
 
-  template< class ArgMember , class T >
-  KOKKOS_INLINE_FUNCTION
-  static T deduce_reduce_type( VOIDTAG , void (FunctorType::*)( ArgMember , ArgMember , ArgMember , ArgMember , ArgMember , ArgMember , T & ) const ) {}
+  template <class ArgMember, class T>
+  KOKKOS_INLINE_FUNCTION static T deduce_reduce_type(
+      VOIDTAG, void (FunctorType::*)(ArgMember, ArgMember, ArgMember, ArgMember,
+                                     ArgMember, ArgMember, T&) const) {}
 
-  template< class ArgMember , class T >
-  KOKKOS_INLINE_FUNCTION
-  static T deduce_reduce_type( VOIDTAG , void (FunctorType::*)( ArgMember , ArgMember , ArgMember , ArgMember , ArgMember , ArgMember , ArgMember , T & ) const ) {}
+  template <class ArgMember, class T>
+  KOKKOS_INLINE_FUNCTION static T deduce_reduce_type(
+      VOIDTAG,
+      void (FunctorType::*)(ArgMember, ArgMember, ArgMember, ArgMember,
+                            ArgMember, ArgMember, ArgMember, T&) const) {}
 
-  template< class ArgMember , class T >
-  KOKKOS_INLINE_FUNCTION
-  static T deduce_reduce_type( VOIDTAG , void (FunctorType::*)( ArgMember , ArgMember , ArgMember , ArgMember , ArgMember , ArgMember , ArgMember , ArgMember , T & ) const ) {}
+  template <class ArgMember, class T>
+  KOKKOS_INLINE_FUNCTION static T deduce_reduce_type(
+      VOIDTAG, void (FunctorType::*)(ArgMember, ArgMember, ArgMember, ArgMember,
+                                     ArgMember, ArgMember, ArgMember, ArgMember,
+                                     T&) const) {}
 
+  template <class ArgMember, class T>
+  KOKKOS_INLINE_FUNCTION static T deduce_reduce_type(
+      VOIDTAG, void (FunctorType::*)(const ArgMember&, T&) const) {}
 
-  template< class ArgMember , class T >
-  KOKKOS_INLINE_FUNCTION
-  static T deduce_reduce_type( VOIDTAG , void (FunctorType::*)( const ArgMember & , T & ) const ) {}
+  template <class ArgMember, class T>
+  KOKKOS_INLINE_FUNCTION static T deduce_reduce_type(
+      VOIDTAG,
+      void (FunctorType::*)(const ArgMember&, const ArgMember&, T&) const) {}
 
-  template< class ArgMember , class T >
-  KOKKOS_INLINE_FUNCTION
-  static T deduce_reduce_type( VOIDTAG , void (FunctorType::*)( const ArgMember & , const ArgMember & , T & ) const ) {}
+  template <class ArgMember, class T>
+  KOKKOS_INLINE_FUNCTION static T deduce_reduce_type(
+      VOIDTAG, void (FunctorType::*)(const ArgMember&, const ArgMember&,
+                                     const ArgMember&, T&) const) {}
 
-  template< class ArgMember , class T >
-  KOKKOS_INLINE_FUNCTION
-  static T deduce_reduce_type( VOIDTAG , void (FunctorType::*)( const ArgMember & , const ArgMember & , const ArgMember & , T & ) const ) {}
+  template <class ArgMember, class T>
+  KOKKOS_INLINE_FUNCTION static T deduce_reduce_type(
+      VOIDTAG,
+      void (FunctorType::*)(const ArgMember&, const ArgMember&,
+                            const ArgMember&, const ArgMember&, T&) const) {}
 
-  template< class ArgMember , class T >
-  KOKKOS_INLINE_FUNCTION
-  static T deduce_reduce_type( VOIDTAG , void (FunctorType::*)( const ArgMember & , const ArgMember & , const ArgMember & , const ArgMember & , T & ) const ) {}
+  template <class ArgMember, class T>
+  KOKKOS_INLINE_FUNCTION static T deduce_reduce_type(
+      VOIDTAG, void (FunctorType::*)(const ArgMember&, const ArgMember&,
+                                     const ArgMember&, const ArgMember&,
+                                     const ArgMember&, T&) const) {}
 
-  template< class ArgMember , class T >
-  KOKKOS_INLINE_FUNCTION
-  static T deduce_reduce_type( VOIDTAG , void (FunctorType::*)( const ArgMember & , const ArgMember & , const ArgMember & , const ArgMember & , const ArgMember & , T & ) const ) {}
+  template <class ArgMember, class T>
+  KOKKOS_INLINE_FUNCTION static T deduce_reduce_type(
+      VOIDTAG,
+      void (FunctorType::*)(const ArgMember&, const ArgMember&,
+                            const ArgMember&, const ArgMember&,
+                            const ArgMember&, const ArgMember&, T&) const) {}
 
-  template< class ArgMember , class T >
-  KOKKOS_INLINE_FUNCTION
-  static T deduce_reduce_type( VOIDTAG , void (FunctorType::*)( const ArgMember & , const ArgMember & , const ArgMember & , const ArgMember & , const ArgMember & , const ArgMember & , T & ) const ) {}
+  template <class ArgMember, class T>
+  KOKKOS_INLINE_FUNCTION static T deduce_reduce_type(
+      VOIDTAG, void (FunctorType::*)(const ArgMember&, const ArgMember&,
+                                     const ArgMember&, const ArgMember&,
+                                     const ArgMember&, const ArgMember&,
+                                     const ArgMember&, T&) const) {}
 
-  template< class ArgMember , class T >
-  KOKKOS_INLINE_FUNCTION
-  static T deduce_reduce_type( VOIDTAG , void (FunctorType::*)( const ArgMember & , const ArgMember & , const ArgMember & , const ArgMember & , const ArgMember & , const ArgMember & , const ArgMember & , T & ) const ) {}
+  template <class ArgMember, class T>
+  KOKKOS_INLINE_FUNCTION static T deduce_reduce_type(
+      VOIDTAG,
+      void (FunctorType::*)(const ArgMember&, const ArgMember&,
+                            const ArgMember&, const ArgMember&,
+                            const ArgMember&, const ArgMember&,
+                            const ArgMember&, const ArgMember&, T&) const) {}
 
-  template< class ArgMember , class T >
-  KOKKOS_INLINE_FUNCTION
-  static T deduce_reduce_type( VOIDTAG , void (FunctorType::*)( const ArgMember & , const ArgMember & , const ArgMember & , const ArgMember & , const ArgMember & , const ArgMember & , const ArgMember & , const ArgMember & , T & ) const ) {}
+  template <class TagType, class ArgMember, class T>
+  KOKKOS_INLINE_FUNCTION static REJECTTAG deduce_reduce_type(
+      VOIDTAG, void (FunctorType::*)(TagType, ArgMember, T&) const) {}
 
+  template <class TagType, class ArgMember, class T>
+  KOKKOS_INLINE_FUNCTION static REJECTTAG deduce_reduce_type(
+      VOIDTAG, void (FunctorType::*)(TagType, ArgMember, ArgMember, T&) const) {
+  }
 
-  template< class TagType , class ArgMember , class T >
-  KOKKOS_INLINE_FUNCTION
-  static REJECTTAG deduce_reduce_type( VOIDTAG , void (FunctorType::*)( TagType , ArgMember , T & ) const ) {}
+  template <class TagType, class ArgMember, class T>
+  KOKKOS_INLINE_FUNCTION static REJECTTAG deduce_reduce_type(
+      VOIDTAG, void (FunctorType::*)(TagType, ArgMember, ArgMember, ArgMember,
+                                     T&) const) {}
 
-  template< class TagType , class ArgMember , class T >
-  KOKKOS_INLINE_FUNCTION
-  static REJECTTAG deduce_reduce_type( VOIDTAG , void (FunctorType::*)( TagType , ArgMember , ArgMember , T & ) const ) {}
+  template <class TagType, class ArgMember, class T>
+  KOKKOS_INLINE_FUNCTION static REJECTTAG deduce_reduce_type(
+      VOIDTAG, void (FunctorType::*)(TagType, ArgMember, ArgMember, ArgMember,
+                                     ArgMember, T&) const) {}
 
-  template< class TagType , class ArgMember , class T >
-  KOKKOS_INLINE_FUNCTION
-  static REJECTTAG deduce_reduce_type( VOIDTAG , void (FunctorType::*)( TagType , ArgMember , ArgMember , ArgMember , T & ) const ) {}
+  template <class TagType, class ArgMember, class T>
+  KOKKOS_INLINE_FUNCTION static REJECTTAG deduce_reduce_type(
+      VOIDTAG, void (FunctorType::*)(TagType, ArgMember, ArgMember, ArgMember,
+                                     ArgMember, ArgMember, T&) const) {}
 
-  template< class TagType , class ArgMember , class T >
-  KOKKOS_INLINE_FUNCTION
-  static REJECTTAG deduce_reduce_type( VOIDTAG , void (FunctorType::*)( TagType , ArgMember , ArgMember , ArgMember , ArgMember , T & ) const ) {}
+  template <class TagType, class ArgMember, class T>
+  KOKKOS_INLINE_FUNCTION static REJECTTAG deduce_reduce_type(
+      VOIDTAG,
+      void (FunctorType::*)(TagType, ArgMember, ArgMember, ArgMember, ArgMember,
+                            ArgMember, ArgMember, T&) const) {}
 
-  template< class TagType , class ArgMember , class T >
-  KOKKOS_INLINE_FUNCTION
-  static REJECTTAG deduce_reduce_type( VOIDTAG , void (FunctorType::*)( TagType , ArgMember , ArgMember , ArgMember , ArgMember , ArgMember , T & ) const ) {}
+  template <class TagType, class ArgMember, class T>
+  KOKKOS_INLINE_FUNCTION static REJECTTAG deduce_reduce_type(
+      VOIDTAG,
+      void (FunctorType::*)(TagType, ArgMember, ArgMember, ArgMember, ArgMember,
+                            ArgMember, ArgMember, ArgMember, T&) const) {}
 
-  template< class TagType , class ArgMember , class T >
-  KOKKOS_INLINE_FUNCTION
-  static REJECTTAG deduce_reduce_type( VOIDTAG , void (FunctorType::*)( TagType , ArgMember , ArgMember , ArgMember , ArgMember , ArgMember , ArgMember , T & ) const ) {}
+  template <class TagType, class ArgMember, class T>
+  KOKKOS_INLINE_FUNCTION static REJECTTAG deduce_reduce_type(
+      VOIDTAG, void (FunctorType::*)(TagType, ArgMember, ArgMember, ArgMember,
+                                     ArgMember, ArgMember, ArgMember, ArgMember,
+                                     ArgMember, T&) const) {}
 
-  template< class TagType , class ArgMember , class T >
-  KOKKOS_INLINE_FUNCTION
-  static REJECTTAG deduce_reduce_type( VOIDTAG , void (FunctorType::*)( TagType , ArgMember , ArgMember , ArgMember , ArgMember , ArgMember , ArgMember , ArgMember , T & ) const ) {}
+  template <class TagType, class ArgMember, class T>
+  KOKKOS_INLINE_FUNCTION static REJECTTAG deduce_reduce_type(
+      VOIDTAG, void (FunctorType::*)(TagType, const ArgMember&, T&) const) {}
 
-  template< class TagType , class ArgMember , class T >
-  KOKKOS_INLINE_FUNCTION
-  static REJECTTAG deduce_reduce_type( VOIDTAG , void (FunctorType::*)( TagType , ArgMember , ArgMember , ArgMember , ArgMember , ArgMember , ArgMember , ArgMember , ArgMember , T & ) const ) {}
+  template <class TagType, class ArgMember, class T>
+  KOKKOS_INLINE_FUNCTION static REJECTTAG deduce_reduce_type(
+      VOIDTAG, void (FunctorType::*)(TagType, const ArgMember&,
+                                     const ArgMember&, T&) const) {}
 
+  template <class TagType, class ArgMember, class T>
+  KOKKOS_INLINE_FUNCTION static REJECTTAG deduce_reduce_type(
+      VOIDTAG,
+      void (FunctorType::*)(TagType, const ArgMember&, const ArgMember&,
+                            const ArgMember&, T&) const) {}
 
-  template< class TagType , class ArgMember , class T >
-  KOKKOS_INLINE_FUNCTION
-  static REJECTTAG deduce_reduce_type( VOIDTAG , void (FunctorType::*)( TagType , const ArgMember & , T & ) const ) {}
+  template <class TagType, class ArgMember, class T>
+  KOKKOS_INLINE_FUNCTION static REJECTTAG deduce_reduce_type(
+      VOIDTAG,
+      void (FunctorType::*)(TagType, const ArgMember&, const ArgMember&,
+                            const ArgMember&, const ArgMember&, T&) const) {}
 
-  template< class TagType , class ArgMember , class T >
-  KOKKOS_INLINE_FUNCTION
-  static REJECTTAG deduce_reduce_type( VOIDTAG , void (FunctorType::*)( TagType , const ArgMember & , const ArgMember & , T & ) const ) {}
+  template <class TagType, class ArgMember, class T>
+  KOKKOS_INLINE_FUNCTION static REJECTTAG deduce_reduce_type(
+      VOIDTAG,
+      void (FunctorType::*)(TagType, const ArgMember&, const ArgMember&,
+                            const ArgMember&, const ArgMember&,
+                            const ArgMember&, T&) const) {}
 
-  template< class TagType , class ArgMember , class T >
-  KOKKOS_INLINE_FUNCTION
-  static REJECTTAG deduce_reduce_type( VOIDTAG , void (FunctorType::*)( TagType , const ArgMember & , const ArgMember & , const ArgMember & , T & ) const ) {}
+  template <class TagType, class ArgMember, class T>
+  KOKKOS_INLINE_FUNCTION static REJECTTAG deduce_reduce_type(
+      VOIDTAG,
+      void (FunctorType::*)(TagType, const ArgMember&, const ArgMember&,
+                            const ArgMember&, const ArgMember&,
+                            const ArgMember&, const ArgMember&, T&) const) {}
 
-  template< class TagType , class ArgMember , class T >
-  KOKKOS_INLINE_FUNCTION
-  static REJECTTAG deduce_reduce_type( VOIDTAG , void (FunctorType::*)( TagType , const ArgMember & , const ArgMember & , const ArgMember & , const ArgMember & , T & ) const ) {}
+  template <class TagType, class ArgMember, class T>
+  KOKKOS_INLINE_FUNCTION static REJECTTAG deduce_reduce_type(
+      VOIDTAG,
+      void (FunctorType::*)(TagType, const ArgMember&, const ArgMember&,
+                            const ArgMember&, const ArgMember&,
+                            const ArgMember&, const ArgMember&,
+                            const ArgMember&, T&) const) {}
 
-  template< class TagType , class ArgMember , class T >
-  KOKKOS_INLINE_FUNCTION
-  static REJECTTAG deduce_reduce_type( VOIDTAG , void (FunctorType::*)( TagType , const ArgMember & , const ArgMember & , const ArgMember & , const ArgMember & , const ArgMember & , T & ) const ) {}
+  template <class TagType, class ArgMember, class T>
+  KOKKOS_INLINE_FUNCTION static REJECTTAG deduce_reduce_type(
+      VOIDTAG,
+      void (FunctorType::*)(TagType, const ArgMember&, const ArgMember&,
+                            const ArgMember&, const ArgMember&,
+                            const ArgMember&, const ArgMember&,
+                            const ArgMember&, const ArgMember&, T&) const) {}
 
-  template< class TagType , class ArgMember , class T >
-  KOKKOS_INLINE_FUNCTION
-  static REJECTTAG deduce_reduce_type( VOIDTAG , void (FunctorType::*)( TagType , const ArgMember & , const ArgMember & , const ArgMember & , const ArgMember & , const ArgMember & , const ArgMember & , T & ) const ) {}
+  template <class TagType, class ArgMember, class T>
+  KOKKOS_INLINE_FUNCTION static REJECTTAG deduce_reduce_type(
+      VOIDTAG, void (FunctorType::*)(const TagType&, ArgMember, T&) const) {}
 
-  template< class TagType , class ArgMember , class T >
-  KOKKOS_INLINE_FUNCTION
-  static REJECTTAG deduce_reduce_type( VOIDTAG , void (FunctorType::*)( TagType , const ArgMember & , const ArgMember & , const ArgMember & , const ArgMember & , const ArgMember & , const ArgMember & , const ArgMember & , T & ) const ) {}
+  template <class TagType, class ArgMember, class T>
+  KOKKOS_INLINE_FUNCTION static REJECTTAG deduce_reduce_type(
+      VOIDTAG,
+      void (FunctorType::*)(const TagType&, ArgMember, ArgMember, T&) const) {}
 
-  template< class TagType , class ArgMember , class T >
-  KOKKOS_INLINE_FUNCTION
-  static REJECTTAG deduce_reduce_type( VOIDTAG , void (FunctorType::*)( TagType , const ArgMember & , const ArgMember & , const ArgMember & , const ArgMember & , const ArgMember & , const ArgMember & , const ArgMember & , const ArgMember & , T & ) const ) {}
+  template <class TagType, class ArgMember, class T>
+  KOKKOS_INLINE_FUNCTION static REJECTTAG deduce_reduce_type(
+      VOIDTAG, void (FunctorType::*)(const TagType&, ArgMember, ArgMember,
+                                     ArgMember, T&) const) {}
 
+  template <class TagType, class ArgMember, class T>
+  KOKKOS_INLINE_FUNCTION static REJECTTAG deduce_reduce_type(
+      VOIDTAG, void (FunctorType::*)(const TagType&, ArgMember, ArgMember,
+                                     ArgMember, ArgMember, T&) const) {}
 
-  template< class TagType , class ArgMember , class T >
-  KOKKOS_INLINE_FUNCTION
-  static REJECTTAG deduce_reduce_type( VOIDTAG , void (FunctorType::*)( const TagType & , ArgMember , T & ) const ) {}
+  template <class TagType, class ArgMember, class T>
+  KOKKOS_INLINE_FUNCTION static REJECTTAG deduce_reduce_type(
+      VOIDTAG,
+      void (FunctorType::*)(const TagType&, ArgMember, ArgMember, ArgMember,
+                            ArgMember, ArgMember, T&) const) {}
 
-  template< class TagType , class ArgMember , class T >
-  KOKKOS_INLINE_FUNCTION
-  static REJECTTAG deduce_reduce_type( VOIDTAG , void (FunctorType::*)( const TagType & , ArgMember , ArgMember , T & ) const ) {}
+  template <class TagType, class ArgMember, class T>
+  KOKKOS_INLINE_FUNCTION static REJECTTAG deduce_reduce_type(
+      VOIDTAG,
+      void (FunctorType::*)(const TagType&, ArgMember, ArgMember, ArgMember,
+                            ArgMember, ArgMember, ArgMember, T&) const) {}
 
-  template< class TagType , class ArgMember , class T >
-  KOKKOS_INLINE_FUNCTION
-  static REJECTTAG deduce_reduce_type( VOIDTAG , void (FunctorType::*)( const TagType & , ArgMember , ArgMember , ArgMember , T & ) const ) {}
+  template <class TagType, class ArgMember, class T>
+  KOKKOS_INLINE_FUNCTION static REJECTTAG deduce_reduce_type(
+      VOIDTAG, void (FunctorType::*)(const TagType&, ArgMember, ArgMember,
+                                     ArgMember, ArgMember, ArgMember, ArgMember,
+                                     ArgMember, T&) const) {}
 
-  template< class TagType , class ArgMember , class T >
-  KOKKOS_INLINE_FUNCTION
-  static REJECTTAG deduce_reduce_type( VOIDTAG , void (FunctorType::*)( const TagType & , ArgMember , ArgMember , ArgMember , ArgMember , T & ) const ) {}
+  template <class TagType, class ArgMember, class T>
+  KOKKOS_INLINE_FUNCTION static REJECTTAG deduce_reduce_type(
+      VOIDTAG, void (FunctorType::*)(const TagType&, ArgMember, ArgMember,
+                                     ArgMember, ArgMember, ArgMember, ArgMember,
+                                     ArgMember, ArgMember, T&) const) {}
 
-  template< class TagType , class ArgMember , class T >
-  KOKKOS_INLINE_FUNCTION
-  static REJECTTAG deduce_reduce_type( VOIDTAG , void (FunctorType::*)( const TagType & , ArgMember , ArgMember , ArgMember , ArgMember , ArgMember , T & ) const ) {}
+  template <class TagType, class ArgMember, class T>
+  KOKKOS_INLINE_FUNCTION static REJECTTAG deduce_reduce_type(
+      VOIDTAG,
+      void (FunctorType::*)(const TagType&, const ArgMember&, T&) const) {}
 
-  template< class TagType , class ArgMember , class T >
-  KOKKOS_INLINE_FUNCTION
-  static REJECTTAG deduce_reduce_type( VOIDTAG , void (FunctorType::*)( const TagType & , ArgMember , ArgMember , ArgMember , ArgMember , ArgMember , ArgMember , T & ) const ) {}
+  template <class TagType, class ArgMember, class T>
+  KOKKOS_INLINE_FUNCTION static REJECTTAG deduce_reduce_type(
+      VOIDTAG, void (FunctorType::*)(const TagType&, const ArgMember&,
+                                     const ArgMember&, T&) const) {}
 
-  template< class TagType , class ArgMember , class T >
-  KOKKOS_INLINE_FUNCTION
-  static REJECTTAG deduce_reduce_type( VOIDTAG , void (FunctorType::*)( const TagType & , ArgMember , ArgMember , ArgMember , ArgMember , ArgMember , ArgMember , ArgMember , T & ) const ) {}
+  template <class TagType, class ArgMember, class T>
+  KOKKOS_INLINE_FUNCTION static REJECTTAG deduce_reduce_type(
+      VOIDTAG,
+      void (FunctorType::*)(const TagType&, const ArgMember&, const ArgMember&,
+                            const ArgMember&, T&) const) {}
 
-  template< class TagType , class ArgMember , class T >
-  KOKKOS_INLINE_FUNCTION
-  static REJECTTAG deduce_reduce_type( VOIDTAG , void (FunctorType::*)( const TagType & , ArgMember , ArgMember , ArgMember , ArgMember , ArgMember , ArgMember , ArgMember , ArgMember , T & ) const ) {}
+  template <class TagType, class ArgMember, class T>
+  KOKKOS_INLINE_FUNCTION static REJECTTAG deduce_reduce_type(
+      VOIDTAG,
+      void (FunctorType::*)(const TagType&, const ArgMember&, const ArgMember&,
+                            const ArgMember&, const ArgMember&, T&) const) {}
 
+  template <class TagType, class ArgMember, class T>
+  KOKKOS_INLINE_FUNCTION static REJECTTAG deduce_reduce_type(
+      VOIDTAG,
+      void (FunctorType::*)(const TagType&, const ArgMember&, const ArgMember&,
+                            const ArgMember&, const ArgMember&,
+                            const ArgMember&, T&) const) {}
 
-  template< class TagType , class ArgMember , class T >
-  KOKKOS_INLINE_FUNCTION
-  static REJECTTAG deduce_reduce_type( VOIDTAG , void (FunctorType::*)( const TagType & , const ArgMember & , T & ) const ) {}
+  template <class TagType, class ArgMember, class T>
+  KOKKOS_INLINE_FUNCTION static REJECTTAG deduce_reduce_type(
+      VOIDTAG,
+      void (FunctorType::*)(const TagType&, const ArgMember&, const ArgMember&,
+                            const ArgMember&, const ArgMember&,
+                            const ArgMember&, const ArgMember&, T&) const) {}
 
-  template< class TagType , class ArgMember , class T >
-  KOKKOS_INLINE_FUNCTION
-  static REJECTTAG deduce_reduce_type( VOIDTAG , void (FunctorType::*)( const TagType & , const ArgMember & , const ArgMember & , T & ) const ) {}
+  template <class TagType, class ArgMember, class T>
+  KOKKOS_INLINE_FUNCTION static REJECTTAG deduce_reduce_type(
+      VOIDTAG,
+      void (FunctorType::*)(const TagType&, const ArgMember&, const ArgMember&,
+                            const ArgMember&, const ArgMember&,
+                            const ArgMember&, const ArgMember&,
+                            const ArgMember&, T&) const) {}
 
-  template< class TagType , class ArgMember , class T >
-  KOKKOS_INLINE_FUNCTION
-  static REJECTTAG deduce_reduce_type( VOIDTAG , void (FunctorType::*)( const TagType & , const ArgMember & , const ArgMember & , const ArgMember & , T & ) const ) {}
-
-  template< class TagType , class ArgMember , class T >
-  KOKKOS_INLINE_FUNCTION
-  static REJECTTAG deduce_reduce_type( VOIDTAG , void (FunctorType::*)( const TagType & , const ArgMember & , const ArgMember & , const ArgMember & , const ArgMember & , T & ) const ) {}
-
-  template< class TagType , class ArgMember , class T >
-  KOKKOS_INLINE_FUNCTION
-  static REJECTTAG deduce_reduce_type( VOIDTAG , void (FunctorType::*)( const TagType & , const ArgMember & , const ArgMember & , const ArgMember & , const ArgMember & , const ArgMember & , T & ) const ) {}
-
-  template< class TagType , class ArgMember , class T >
-  KOKKOS_INLINE_FUNCTION
-  static REJECTTAG deduce_reduce_type( VOIDTAG , void (FunctorType::*)( const TagType & , const ArgMember & , const ArgMember & , const ArgMember & , const ArgMember & , const ArgMember & , const ArgMember & , T & ) const ) {}
-
-  template< class TagType , class ArgMember , class T >
-  KOKKOS_INLINE_FUNCTION
-  static REJECTTAG deduce_reduce_type( VOIDTAG , void (FunctorType::*)( const TagType & , const ArgMember & , const ArgMember & , const ArgMember & , const ArgMember & , const ArgMember & , const ArgMember & , const ArgMember & , T & ) const ) {}
-
-  template< class TagType , class ArgMember , class T >
-  KOKKOS_INLINE_FUNCTION
-  static REJECTTAG deduce_reduce_type( VOIDTAG , void (FunctorType::*)( const TagType & , const ArgMember & , const ArgMember & , const ArgMember & , const ArgMember & , const ArgMember & , const ArgMember & , const ArgMember & , const ArgMember & , T & ) const ) {}
+  template <class TagType, class ArgMember, class T>
+  KOKKOS_INLINE_FUNCTION static REJECTTAG deduce_reduce_type(
+      VOIDTAG,
+      void (FunctorType::*)(const TagType&, const ArgMember&, const ArgMember&,
+                            const ArgMember&, const ArgMember&,
+                            const ArgMember&, const ArgMember&,
+                            const ArgMember&, const ArgMember&, T&) const) {}
 
   //----------------------------------------
   // parallel_reduce operator with a tag:
 
-  template< class ArgMember , class T >
-  KOKKOS_INLINE_FUNCTION
-  static T deduce_reduce_type( tag_type , void (FunctorType::*)( tag_type , ArgMember , T & ) const ) {}
+  template <class ArgMember, class T>
+  KOKKOS_INLINE_FUNCTION static T deduce_reduce_type(
+      tag_type, void (FunctorType::*)(tag_type, ArgMember, T&) const) {}
 
-  template< class ArgMember , class T >
-  KOKKOS_INLINE_FUNCTION
-  static T deduce_reduce_type( tag_type , void (FunctorType::*)( tag_type , ArgMember , ArgMember , T & ) const ) {}
+  template <class ArgMember, class T>
+  KOKKOS_INLINE_FUNCTION static T deduce_reduce_type(
+      tag_type,
+      void (FunctorType::*)(tag_type, ArgMember, ArgMember, T&) const) {}
 
-  template< class ArgMember , class T >
-  KOKKOS_INLINE_FUNCTION
-  static T deduce_reduce_type( tag_type , void (FunctorType::*)( tag_type , ArgMember , ArgMember , ArgMember , T & ) const ) {}
+  template <class ArgMember, class T>
+  KOKKOS_INLINE_FUNCTION static T deduce_reduce_type(
+      tag_type, void (FunctorType::*)(tag_type, ArgMember, ArgMember, ArgMember,
+                                      T&) const) {}
 
-  template< class ArgMember , class T >
-  KOKKOS_INLINE_FUNCTION
-  static T deduce_reduce_type( tag_type , void (FunctorType::*)( tag_type , ArgMember , ArgMember , ArgMember , ArgMember , T & ) const ) {}
+  template <class ArgMember, class T>
+  KOKKOS_INLINE_FUNCTION static T deduce_reduce_type(
+      tag_type, void (FunctorType::*)(tag_type, ArgMember, ArgMember, ArgMember,
+                                      ArgMember, T&) const) {}
 
-  template< class ArgMember , class T >
-  KOKKOS_INLINE_FUNCTION
-  static T deduce_reduce_type( tag_type , void (FunctorType::*)( tag_type , ArgMember , ArgMember , ArgMember , ArgMember , ArgMember , T & ) const ) {}
+  template <class ArgMember, class T>
+  KOKKOS_INLINE_FUNCTION static T deduce_reduce_type(
+      tag_type, void (FunctorType::*)(tag_type, ArgMember, ArgMember, ArgMember,
+                                      ArgMember, ArgMember, T&) const) {}
 
-  template< class ArgMember , class T >
-  KOKKOS_INLINE_FUNCTION
-  static T deduce_reduce_type( tag_type , void (FunctorType::*)( tag_type , ArgMember , ArgMember , ArgMember , ArgMember , ArgMember , ArgMember , T & ) const ) {}
+  template <class ArgMember, class T>
+  KOKKOS_INLINE_FUNCTION static T deduce_reduce_type(
+      tag_type,
+      void (FunctorType::*)(tag_type, ArgMember, ArgMember, ArgMember,
+                            ArgMember, ArgMember, ArgMember, T&) const) {}
 
-  template< class ArgMember , class T >
-  KOKKOS_INLINE_FUNCTION
-  static T deduce_reduce_type( tag_type , void (FunctorType::*)( tag_type , ArgMember , ArgMember , ArgMember , ArgMember , ArgMember , ArgMember , ArgMember , T & ) const ) {}
+  template <class ArgMember, class T>
+  KOKKOS_INLINE_FUNCTION static T deduce_reduce_type(
+      tag_type, void (FunctorType::*)(tag_type, ArgMember, ArgMember, ArgMember,
+                                      ArgMember, ArgMember, ArgMember,
+                                      ArgMember, T&) const) {}
 
-  template< class ArgMember , class T >
-  KOKKOS_INLINE_FUNCTION
-  static T deduce_reduce_type( tag_type , void (FunctorType::*)( tag_type , ArgMember , ArgMember , ArgMember , ArgMember , ArgMember , ArgMember , ArgMember , ArgMember , T & ) const ) {}
+  template <class ArgMember, class T>
+  KOKKOS_INLINE_FUNCTION static T deduce_reduce_type(
+      tag_type, void (FunctorType::*)(tag_type, ArgMember, ArgMember, ArgMember,
+                                      ArgMember, ArgMember, ArgMember,
+                                      ArgMember, ArgMember, T&) const) {}
 
+  template <class ArgMember, class T>
+  KOKKOS_INLINE_FUNCTION static T deduce_reduce_type(
+      tag_type, void (FunctorType::*)(const tag_type&, ArgMember, T&) const) {}
 
-  template< class ArgMember , class T >
-  KOKKOS_INLINE_FUNCTION
-  static T deduce_reduce_type( tag_type , void (FunctorType::*)( const tag_type & , ArgMember , T & ) const ) {}
+  template <class ArgMember, class T>
+  KOKKOS_INLINE_FUNCTION static T deduce_reduce_type(
+      tag_type,
+      void (FunctorType::*)(const tag_type&, ArgMember, ArgMember, T&) const) {}
 
-  template< class ArgMember , class T >
-  KOKKOS_INLINE_FUNCTION
-  static T deduce_reduce_type( tag_type , void (FunctorType::*)( const tag_type & , ArgMember , ArgMember , T & ) const ) {}
+  template <class ArgMember, class T>
+  KOKKOS_INLINE_FUNCTION static T deduce_reduce_type(
+      tag_type, void (FunctorType::*)(const tag_type&, ArgMember, ArgMember,
+                                      ArgMember, T&) const) {}
 
-  template< class ArgMember , class T >
-  KOKKOS_INLINE_FUNCTION
-  static T deduce_reduce_type( tag_type , void (FunctorType::*)( const tag_type & , ArgMember , ArgMember , ArgMember , T & ) const ) {}
+  template <class ArgMember, class T>
+  KOKKOS_INLINE_FUNCTION static T deduce_reduce_type(
+      tag_type, void (FunctorType::*)(const tag_type&, ArgMember, ArgMember,
+                                      ArgMember, ArgMember, T&) const) {}
 
-  template< class ArgMember , class T >
-  KOKKOS_INLINE_FUNCTION
-  static T deduce_reduce_type( tag_type , void (FunctorType::*)( const tag_type & , ArgMember , ArgMember , ArgMember , ArgMember , T & ) const ) {}
+  template <class ArgMember, class T>
+  KOKKOS_INLINE_FUNCTION static T deduce_reduce_type(
+      tag_type,
+      void (FunctorType::*)(const tag_type&, ArgMember, ArgMember, ArgMember,
+                            ArgMember, ArgMember, T&) const) {}
 
-  template< class ArgMember , class T >
-  KOKKOS_INLINE_FUNCTION
-  static T deduce_reduce_type( tag_type , void (FunctorType::*)( const tag_type & , ArgMember , ArgMember , ArgMember , ArgMember , ArgMember , T & ) const ) {}
+  template <class ArgMember, class T>
+  KOKKOS_INLINE_FUNCTION static T deduce_reduce_type(
+      tag_type,
+      void (FunctorType::*)(const tag_type&, ArgMember, ArgMember, ArgMember,
+                            ArgMember, ArgMember, ArgMember, T&) const) {}
 
-  template< class ArgMember , class T >
-  KOKKOS_INLINE_FUNCTION
-  static T deduce_reduce_type( tag_type , void (FunctorType::*)( const tag_type & , ArgMember , ArgMember , ArgMember , ArgMember , ArgMember , ArgMember , T & ) const ) {}
+  template <class ArgMember, class T>
+  KOKKOS_INLINE_FUNCTION static T deduce_reduce_type(
+      tag_type, void (FunctorType::*)(const tag_type&, ArgMember, ArgMember,
+                                      ArgMember, ArgMember, ArgMember,
+                                      ArgMember, ArgMember, T&) const) {}
 
-  template< class ArgMember , class T >
-  KOKKOS_INLINE_FUNCTION
-  static T deduce_reduce_type( tag_type , void (FunctorType::*)( const tag_type & , ArgMember , ArgMember , ArgMember , ArgMember , ArgMember , ArgMember , ArgMember , T & ) const ) {}
+  template <class ArgMember, class T>
+  KOKKOS_INLINE_FUNCTION static T deduce_reduce_type(
+      tag_type,
+      void (FunctorType::*)(const tag_type&, ArgMember, ArgMember, ArgMember,
+                            ArgMember, ArgMember, ArgMember, ArgMember,
+                            ArgMember, T&) const) {}
 
-  template< class ArgMember , class T >
-  KOKKOS_INLINE_FUNCTION
-  static T deduce_reduce_type( tag_type , void (FunctorType::*)( const tag_type & , ArgMember , ArgMember , ArgMember , ArgMember , ArgMember , ArgMember , ArgMember , ArgMember , T & ) const ) {}
+  template <class ArgMember, class T>
+  KOKKOS_INLINE_FUNCTION static T deduce_reduce_type(
+      tag_type, void (FunctorType::*)(tag_type, const ArgMember&, T&) const) {}
 
+  template <class ArgMember, class T>
+  KOKKOS_INLINE_FUNCTION static T deduce_reduce_type(
+      tag_type, void (FunctorType::*)(tag_type, const ArgMember&,
+                                      const ArgMember&, T&) const) {}
 
-  template< class ArgMember , class T >
-  KOKKOS_INLINE_FUNCTION
-  static T deduce_reduce_type( tag_type , void (FunctorType::*)( tag_type , const ArgMember & , T & ) const ) {}
+  template <class ArgMember, class T>
+  KOKKOS_INLINE_FUNCTION static T deduce_reduce_type(
+      tag_type,
+      void (FunctorType::*)(tag_type, const ArgMember&, const ArgMember&,
+                            const ArgMember&, T&) const) {}
 
-  template< class ArgMember , class T >
-  KOKKOS_INLINE_FUNCTION
-  static T deduce_reduce_type( tag_type , void (FunctorType::*)( tag_type , const ArgMember & , const ArgMember & , T & ) const ) {}
+  template <class ArgMember, class T>
+  KOKKOS_INLINE_FUNCTION static T deduce_reduce_type(
+      tag_type,
+      void (FunctorType::*)(tag_type, const ArgMember&, const ArgMember&,
+                            const ArgMember&, const ArgMember&, T&) const) {}
 
-  template< class ArgMember , class T >
-  KOKKOS_INLINE_FUNCTION
-  static T deduce_reduce_type( tag_type , void (FunctorType::*)( tag_type , const ArgMember & , const ArgMember & , const ArgMember & , T & ) const ) {}
+  template <class ArgMember, class T>
+  KOKKOS_INLINE_FUNCTION static T deduce_reduce_type(
+      tag_type,
+      void (FunctorType::*)(tag_type, const ArgMember&, const ArgMember&,
+                            const ArgMember&, const ArgMember&,
+                            const ArgMember&, T&) const) {}
 
-  template< class ArgMember , class T >
-  KOKKOS_INLINE_FUNCTION
-  static T deduce_reduce_type( tag_type , void (FunctorType::*)( tag_type , const ArgMember & , const ArgMember & , const ArgMember & , const ArgMember & , T & ) const ) {}
+  template <class ArgMember, class T>
+  KOKKOS_INLINE_FUNCTION static T deduce_reduce_type(
+      tag_type,
+      void (FunctorType::*)(tag_type, const ArgMember&, const ArgMember&,
+                            const ArgMember&, const ArgMember&,
+                            const ArgMember&, const ArgMember&, T&) const) {}
 
-  template< class ArgMember , class T >
-  KOKKOS_INLINE_FUNCTION
-  static T deduce_reduce_type( tag_type , void (FunctorType::*)( tag_type , const ArgMember & , const ArgMember & , const ArgMember & , const ArgMember & , const ArgMember & , T & ) const ) {}
+  template <class ArgMember, class T>
+  KOKKOS_INLINE_FUNCTION static T deduce_reduce_type(
+      tag_type,
+      void (FunctorType::*)(tag_type, const ArgMember&, const ArgMember&,
+                            const ArgMember&, const ArgMember&,
+                            const ArgMember&, const ArgMember&,
+                            const ArgMember&, T&) const) {}
 
-  template< class ArgMember , class T >
-  KOKKOS_INLINE_FUNCTION
-  static T deduce_reduce_type( tag_type , void (FunctorType::*)( tag_type , const ArgMember & , const ArgMember & , const ArgMember & , const ArgMember & , const ArgMember & , const ArgMember & , T & ) const ) {}
+  template <class ArgMember, class T>
+  KOKKOS_INLINE_FUNCTION static T deduce_reduce_type(
+      tag_type,
+      void (FunctorType::*)(tag_type, const ArgMember&, const ArgMember&,
+                            const ArgMember&, const ArgMember&,
+                            const ArgMember&, const ArgMember&,
+                            const ArgMember&, const ArgMember&, T&) const) {}
 
-  template< class ArgMember , class T >
-  KOKKOS_INLINE_FUNCTION
-  static T deduce_reduce_type( tag_type , void (FunctorType::*)( tag_type , const ArgMember & , const ArgMember & , const ArgMember & , const ArgMember & , const ArgMember & , const ArgMember & , const ArgMember & , T & ) const ) {}
+  template <class ArgMember, class T>
+  KOKKOS_INLINE_FUNCTION static T deduce_reduce_type(
+      tag_type,
+      void (FunctorType::*)(const tag_type&, const ArgMember&, T&) const) {}
 
-  template< class ArgMember , class T >
-  KOKKOS_INLINE_FUNCTION
-  static T deduce_reduce_type( tag_type , void (FunctorType::*)( tag_type , const ArgMember & , const ArgMember & , const ArgMember & , const ArgMember & , const ArgMember & , const ArgMember & , const ArgMember & , const ArgMember & , T & ) const ) {}
+  template <class ArgMember, class T>
+  KOKKOS_INLINE_FUNCTION static T deduce_reduce_type(
+      tag_type, void (FunctorType::*)(const tag_type&, const ArgMember&,
+                                      const ArgMember&, T&) const) {}
 
+  template <class ArgMember, class T>
+  KOKKOS_INLINE_FUNCTION static T deduce_reduce_type(
+      tag_type,
+      void (FunctorType::*)(const tag_type&, const ArgMember&, const ArgMember&,
+                            const ArgMember&, T&) const) {}
 
-  template< class ArgMember , class T >
-  KOKKOS_INLINE_FUNCTION
-  static T deduce_reduce_type( tag_type , void (FunctorType::*)( const tag_type & , const ArgMember & , T & ) const ) {}
+  template <class ArgMember, class T>
+  KOKKOS_INLINE_FUNCTION static T deduce_reduce_type(
+      tag_type,
+      void (FunctorType::*)(const tag_type&, const ArgMember&, const ArgMember&,
+                            const ArgMember&, const ArgMember&, T&) const) {}
 
-  template< class ArgMember , class T >
-  KOKKOS_INLINE_FUNCTION
-  static T deduce_reduce_type( tag_type , void (FunctorType::*)( const tag_type & , const ArgMember & , const ArgMember & , T & ) const ) {}
+  template <class ArgMember, class T>
+  KOKKOS_INLINE_FUNCTION static T deduce_reduce_type(
+      tag_type,
+      void (FunctorType::*)(const tag_type&, const ArgMember&, const ArgMember&,
+                            const ArgMember&, const ArgMember&,
+                            const ArgMember&, T&) const) {}
 
-  template< class ArgMember , class T >
-  KOKKOS_INLINE_FUNCTION
-  static T deduce_reduce_type( tag_type , void (FunctorType::*)( const tag_type & , const ArgMember & , const ArgMember & , const ArgMember & , T & ) const ) {}
+  template <class ArgMember, class T>
+  KOKKOS_INLINE_FUNCTION static T deduce_reduce_type(
+      tag_type,
+      void (FunctorType::*)(const tag_type&, const ArgMember&, const ArgMember&,
+                            const ArgMember&, const ArgMember&,
+                            const ArgMember&, const ArgMember&, T&) const) {}
 
-  template< class ArgMember , class T >
-  KOKKOS_INLINE_FUNCTION
-  static T deduce_reduce_type( tag_type , void (FunctorType::*)( const tag_type & , const ArgMember & , const ArgMember & , const ArgMember & , const ArgMember & , T & ) const ) {}
+  template <class ArgMember, class T>
+  KOKKOS_INLINE_FUNCTION static T deduce_reduce_type(
+      tag_type,
+      void (FunctorType::*)(const tag_type&, const ArgMember&, const ArgMember&,
+                            const ArgMember&, const ArgMember&,
+                            const ArgMember&, const ArgMember&,
+                            const ArgMember&, T&) const) {}
 
-  template< class ArgMember , class T >
-  KOKKOS_INLINE_FUNCTION
-  static T deduce_reduce_type( tag_type , void (FunctorType::*)( const tag_type & , const ArgMember & , const ArgMember & , const ArgMember & , const ArgMember & , const ArgMember & , T & ) const ) {}
-
-  template< class ArgMember , class T >
-  KOKKOS_INLINE_FUNCTION
-  static T deduce_reduce_type( tag_type , void (FunctorType::*)( const tag_type & , const ArgMember & , const ArgMember & , const ArgMember & , const ArgMember & , const ArgMember & , const ArgMember & , T & ) const ) {}
-
-  template< class ArgMember , class T >
-  KOKKOS_INLINE_FUNCTION
-  static T deduce_reduce_type( tag_type , void (FunctorType::*)( const tag_type & , const ArgMember & , const ArgMember & , const ArgMember & , const ArgMember & , const ArgMember & , const ArgMember & , const ArgMember & , T & ) const ) {}
-
-  template< class ArgMember , class T >
-  KOKKOS_INLINE_FUNCTION
-  static T deduce_reduce_type( tag_type , void (FunctorType::*)( const tag_type & , const ArgMember & , const ArgMember & , const ArgMember & , const ArgMember & , const ArgMember & , const ArgMember & , const ArgMember & , const ArgMember & , T & ) const ) {}
+  template <class ArgMember, class T>
+  KOKKOS_INLINE_FUNCTION static T deduce_reduce_type(
+      tag_type,
+      void (FunctorType::*)(const tag_type&, const ArgMember&, const ArgMember&,
+                            const ArgMember&, const ArgMember&,
+                            const ArgMember&, const ArgMember&,
+                            const ArgMember&, const ArgMember&, T&) const) {}
 
   //----------------------------------------
   // parallel_scan operator without a tag:
 
-  template< class ArgMember , class T >
-  KOKKOS_INLINE_FUNCTION
-  static T deduce_reduce_type( VOIDTAG , void (FunctorType::*)( ArgMember , T & , bool ) const ) {}
+  template <class ArgMember, class T>
+  KOKKOS_INLINE_FUNCTION static T deduce_reduce_type(
+      VOIDTAG, void (FunctorType::*)(ArgMember, T&, bool) const) {}
 
-  template< class ArgMember , class T >
-  KOKKOS_INLINE_FUNCTION
-  static T deduce_reduce_type( VOIDTAG , void (FunctorType::*)( const ArgMember & , T & , bool ) const ) {}
+  template <class ArgMember, class T>
+  KOKKOS_INLINE_FUNCTION static T deduce_reduce_type(
+      VOIDTAG, void (FunctorType::*)(const ArgMember&, T&, bool) const) {}
 
-  template< class TagType , class ArgMember , class T >
-  KOKKOS_INLINE_FUNCTION
-  static REJECTTAG deduce_reduce_type( VOIDTAG , void (FunctorType::*)( TagType , ArgMember , T & , bool ) const ) {}
+  template <class TagType, class ArgMember, class T>
+  KOKKOS_INLINE_FUNCTION static REJECTTAG deduce_reduce_type(
+      VOIDTAG, void (FunctorType::*)(TagType, ArgMember, T&, bool) const) {}
 
-  template< class TagType , class ArgMember , class T >
-  KOKKOS_INLINE_FUNCTION
-  static REJECTTAG deduce_reduce_type( VOIDTAG , void (FunctorType::*)( TagType , const ArgMember & , T & , bool ) const ) {}
+  template <class TagType, class ArgMember, class T>
+  KOKKOS_INLINE_FUNCTION static REJECTTAG deduce_reduce_type(
+      VOIDTAG,
+      void (FunctorType::*)(TagType, const ArgMember&, T&, bool) const) {}
 
-  template< class TagType , class ArgMember , class T >
-  KOKKOS_INLINE_FUNCTION
-  static REJECTTAG deduce_reduce_type( VOIDTAG , void (FunctorType::*)( const TagType & , ArgMember , T & , bool ) const ) {}
+  template <class TagType, class ArgMember, class T>
+  KOKKOS_INLINE_FUNCTION static REJECTTAG deduce_reduce_type(
+      VOIDTAG,
+      void (FunctorType::*)(const TagType&, ArgMember, T&, bool) const) {}
 
-  template< class TagType , class ArgMember , class T >
-  KOKKOS_INLINE_FUNCTION
-  static REJECTTAG deduce_reduce_type( VOIDTAG , void (FunctorType::*)( const TagType & , const ArgMember & , T & , bool ) const ) {}
+  template <class TagType, class ArgMember, class T>
+  KOKKOS_INLINE_FUNCTION static REJECTTAG deduce_reduce_type(
+      VOIDTAG, void (FunctorType::*)(const TagType&, const ArgMember&, T&, bool)
+                   const) {}
 
-  template< class ArgMember , class T >
-  KOKKOS_INLINE_FUNCTION
-  static T deduce_reduce_type( VOIDTAG , void (FunctorType::*)( ArgMember , T & , const bool& ) const ) {}
+  template <class ArgMember, class T>
+  KOKKOS_INLINE_FUNCTION static T deduce_reduce_type(
+      VOIDTAG, void (FunctorType::*)(ArgMember, T&, const bool&) const) {}
 
-  template< class ArgMember , class T >
-  KOKKOS_INLINE_FUNCTION
-  static T deduce_reduce_type( VOIDTAG , void (FunctorType::*)( const ArgMember & , T & , const bool& ) const ) {}
+  template <class ArgMember, class T>
+  KOKKOS_INLINE_FUNCTION static T deduce_reduce_type(
+      VOIDTAG, void (FunctorType::*)(const ArgMember&, T&, const bool&) const) {
+  }
 
-  template< class TagType , class ArgMember , class T >
-  KOKKOS_INLINE_FUNCTION
-  static REJECTTAG deduce_reduce_type( VOIDTAG , void (FunctorType::*)( TagType , ArgMember , T & , const bool& ) const ) {}
+  template <class TagType, class ArgMember, class T>
+  KOKKOS_INLINE_FUNCTION static REJECTTAG deduce_reduce_type(
+      VOIDTAG,
+      void (FunctorType::*)(TagType, ArgMember, T&, const bool&) const) {}
 
-  template< class TagType , class ArgMember , class T >
-  KOKKOS_INLINE_FUNCTION
-  static REJECTTAG deduce_reduce_type( VOIDTAG , void (FunctorType::*)( TagType , const ArgMember & , T & , const bool& ) const ) {}
+  template <class TagType, class ArgMember, class T>
+  KOKKOS_INLINE_FUNCTION static REJECTTAG deduce_reduce_type(
+      VOIDTAG, void (FunctorType::*)(TagType, const ArgMember&, T&, const bool&)
+                   const) {}
 
-  template< class TagType , class ArgMember , class T >
-  KOKKOS_INLINE_FUNCTION
-  static REJECTTAG deduce_reduce_type( VOIDTAG , void (FunctorType::*)( const TagType & , ArgMember , T & , const bool& ) const ) {}
+  template <class TagType, class ArgMember, class T>
+  KOKKOS_INLINE_FUNCTION static REJECTTAG deduce_reduce_type(
+      VOIDTAG, void (FunctorType::*)(const TagType&, ArgMember, T&, const bool&)
+                   const) {}
 
-  template< class TagType , class ArgMember , class T >
-  KOKKOS_INLINE_FUNCTION
-  static REJECTTAG deduce_reduce_type( VOIDTAG , void (FunctorType::*)( const TagType & , const ArgMember & , T & , const bool& ) const ) {}
+  template <class TagType, class ArgMember, class T>
+  KOKKOS_INLINE_FUNCTION static REJECTTAG deduce_reduce_type(
+      VOIDTAG, void (FunctorType::*)(const TagType&, const ArgMember&, T&,
+                                     const bool&) const) {}
   //----------------------------------------
   // parallel_scan operator with a tag:
 
-  template< class ArgMember , class T >
-  KOKKOS_INLINE_FUNCTION
-  static T deduce_reduce_type( tag_type , void (FunctorType::*)( tag_type , ArgMember , T & , bool ) const ) {}
+  template <class ArgMember, class T>
+  KOKKOS_INLINE_FUNCTION static T deduce_reduce_type(
+      tag_type, void (FunctorType::*)(tag_type, ArgMember, T&, bool) const) {}
 
-  template< class ArgMember , class T >
-  KOKKOS_INLINE_FUNCTION
-  static T deduce_reduce_type( tag_type , void (FunctorType::*)( const tag_type & , ArgMember , T & , bool ) const ) {}
+  template <class ArgMember, class T>
+  KOKKOS_INLINE_FUNCTION static T deduce_reduce_type(
+      tag_type,
+      void (FunctorType::*)(const tag_type&, ArgMember, T&, bool) const) {}
 
-  template< class ArgMember , class T >
-  KOKKOS_INLINE_FUNCTION
-  static T deduce_reduce_type( tag_type , void (FunctorType::*)( tag_type , const ArgMember& , T & , bool ) const ) {}
+  template <class ArgMember, class T>
+  KOKKOS_INLINE_FUNCTION static T deduce_reduce_type(
+      tag_type,
+      void (FunctorType::*)(tag_type, const ArgMember&, T&, bool) const) {}
 
-  template< class ArgMember , class T >
-  KOKKOS_INLINE_FUNCTION
-  static T deduce_reduce_type( tag_type , void (FunctorType::*)( const tag_type & , const ArgMember& , T & , bool ) const ) {}
+  template <class ArgMember, class T>
+  KOKKOS_INLINE_FUNCTION static T deduce_reduce_type(
+      tag_type, void (FunctorType::*)(const tag_type&, const ArgMember&, T&,
+                                      bool) const) {}
 
-  template< class ArgMember , class T >
-  KOKKOS_INLINE_FUNCTION
-  static T deduce_reduce_type( tag_type , void (FunctorType::*)( tag_type , ArgMember , T & , const bool& ) const ) {}
+  template <class ArgMember, class T>
+  KOKKOS_INLINE_FUNCTION static T deduce_reduce_type(
+      tag_type,
+      void (FunctorType::*)(tag_type, ArgMember, T&, const bool&) const) {}
 
-  template< class ArgMember , class T >
-  KOKKOS_INLINE_FUNCTION
-  static T deduce_reduce_type( tag_type , void (FunctorType::*)( const tag_type & , ArgMember , T & , const bool& ) const ) {}
+  template <class ArgMember, class T>
+  KOKKOS_INLINE_FUNCTION static T deduce_reduce_type(
+      tag_type, void (FunctorType::*)(const tag_type&, ArgMember, T&,
+                                      const bool&) const) {}
 
-  template< class ArgMember , class T >
-  KOKKOS_INLINE_FUNCTION
-  static T deduce_reduce_type( tag_type , void (FunctorType::*)( tag_type , const ArgMember& , T & , const bool& ) const ) {}
+  template <class ArgMember, class T>
+  KOKKOS_INLINE_FUNCTION static T deduce_reduce_type(
+      tag_type, void (FunctorType::*)(tag_type, const ArgMember&, T&,
+                                      const bool&) const) {}
 
-  template< class ArgMember , class T >
-  KOKKOS_INLINE_FUNCTION
-  static T deduce_reduce_type( tag_type , void (FunctorType::*)( const tag_type & , const ArgMember& , T & , const bool& ) const ) {}
+  template <class ArgMember, class T>
+  KOKKOS_INLINE_FUNCTION static T deduce_reduce_type(
+      tag_type, void (FunctorType::*)(const tag_type&, const ArgMember&, T&,
+                                      const bool&) const) {}
   //----------------------------------------
 
-  typedef decltype( deduce_reduce_type( tag_type() , & FunctorType::operator() ) ) ValueType ;
+  typedef decltype(
+      deduce_reduce_type(tag_type(), &FunctorType::operator())) ValueType;
 
-  enum { IS_VOID   = std::is_same<VOIDTAG  ,ValueType>::value };
-  enum { IS_REJECT = std::is_same<REJECTTAG,ValueType>::value };
+  enum { IS_VOID = std::is_same<VOIDTAG, ValueType>::value };
+  enum { IS_REJECT = std::is_same<REJECTTAG, ValueType>::value };
 
-public:
-
-  typedef typename Impl::if_c< IS_VOID || IS_REJECT , void , ValueType   >::type  value_type ;
-  typedef typename Impl::if_c< IS_VOID || IS_REJECT , void , ValueType * >::type  pointer_type ;
-  typedef typename Impl::if_c< IS_VOID || IS_REJECT , void , ValueType & >::type  reference_type ;
+ public:
+  typedef typename Impl::if_c<IS_VOID || IS_REJECT, void, ValueType>::type
+      value_type;
+  typedef typename Impl::if_c<IS_VOID || IS_REJECT, void, ValueType*>::type
+      pointer_type;
+  typedef typename Impl::if_c<IS_VOID || IS_REJECT, void, ValueType&>::type
+      reference_type;
   typedef FunctorType functor_type;
 
-  static_assert( IS_VOID || IS_REJECT || 0 == ( sizeof(ValueType) % sizeof(int) ) ,
-    "Reduction functor's value_type deduced from functor::operator() requires: 0 == sizeof(value_type) % sizeof(int)" );
+  static_assert(
+      IS_VOID || IS_REJECT || 0 == (sizeof(ValueType) % sizeof(int)),
+      "Reduction functor's value_type deduced from functor::operator() "
+      "requires: 0 == sizeof(value_type) % sizeof(int)");
 
   enum { StaticValueSize = IS_VOID || IS_REJECT ? 0 : sizeof(ValueType) };
 
-  KOKKOS_FORCEINLINE_FUNCTION static
-  unsigned value_size( const FunctorType & ) { return StaticValueSize ; }
+  KOKKOS_FORCEINLINE_FUNCTION static unsigned value_size(const FunctorType&) {
+    return StaticValueSize;
+  }
 
-  KOKKOS_FORCEINLINE_FUNCTION static
-  unsigned value_count( const FunctorType & ) { return IS_VOID || IS_REJECT ? 0 : 1 ; }
+  KOKKOS_FORCEINLINE_FUNCTION static unsigned value_count(const FunctorType&) {
+    return IS_VOID || IS_REJECT ? 0 : 1;
+  }
 };
 
-} // namespace Impl
-} // namespace Kokkos
+}  // namespace Impl
+}  // namespace Kokkos
 
 //----------------------------------------------------------------------------
 //----------------------------------------------------------------------------
@@ -1009,134 +1313,131 @@ namespace Impl {
 /** Function signatures for FunctorType::init function with a tag.
  *  reference_type is 'value_type &' for scalar and 'value_type *' for array.
  */
-template< class FunctorType , class ArgTag >
+template <class FunctorType, class ArgTag>
 struct FunctorValueInitFunction {
+  typedef typename FunctorValueTraits<FunctorType, ArgTag>::reference_type
+      reference_type;
 
-  typedef typename FunctorValueTraits<FunctorType,ArgTag>::reference_type
-    reference_type ;
-
-  KOKKOS_INLINE_FUNCTION static void
-    enable_if( void (FunctorType::*)( ArgTag         , reference_type ) const );
-  KOKKOS_INLINE_FUNCTION static void
-    enable_if( void (FunctorType::*)( ArgTag const & , reference_type ) const );
-  KOKKOS_INLINE_FUNCTION static void
-    enable_if( void (             *)( ArgTag         , reference_type ) );
-  KOKKOS_INLINE_FUNCTION static void
-    enable_if( void (             *)( ArgTag const & , reference_type ) );
-
+  KOKKOS_INLINE_FUNCTION static void enable_if(
+      void (FunctorType::*)(ArgTag, reference_type) const);
+  KOKKOS_INLINE_FUNCTION static void enable_if(
+      void (FunctorType::*)(ArgTag const&, reference_type) const);
+  KOKKOS_INLINE_FUNCTION static void enable_if(void (*)(ArgTag,
+                                                        reference_type));
+  KOKKOS_INLINE_FUNCTION static void enable_if(void (*)(ArgTag const&,
+                                                        reference_type));
 };
 
 /** Function signatures for FunctorType::init function without a tag.
  *  reference_type is 'value_type &' for scalar and 'value_type *' for array.
  */
-template< class FunctorType >
-struct FunctorValueInitFunction< FunctorType , void > {
+template <class FunctorType>
+struct FunctorValueInitFunction<FunctorType, void> {
+  typedef typename FunctorValueTraits<FunctorType, void>::reference_type
+      reference_type;
 
-  typedef typename FunctorValueTraits<FunctorType,void>::reference_type
-    reference_type ;
-
-  KOKKOS_INLINE_FUNCTION static void
-    enable_if( void (FunctorType::*)( reference_type ) const );
-  KOKKOS_INLINE_FUNCTION static void
-    enable_if( void (             *)( reference_type ) );
+  KOKKOS_INLINE_FUNCTION static void enable_if(
+      void (FunctorType::*)(reference_type) const);
+  KOKKOS_INLINE_FUNCTION static void enable_if(void (*)(reference_type));
 };
 
 // Adapter for value initialization function.
 // If a proper FunctorType::init is declared then use it,
 // otherwise use default constructor.
-template< class FunctorType , class ArgTag
-        , class T = typename FunctorValueTraits<FunctorType,ArgTag>::reference_type // FIXME Fix FunctorValueTraits for multi-dim operator
-        , class Enable = void >
-struct FunctorValueInit ;
+template <class FunctorType, class ArgTag,
+          class T = typename FunctorValueTraits<FunctorType, ArgTag>::
+              reference_type  // FIXME Fix FunctorValueTraits for multi-dim
+                              // operator
+          ,
+          class Enable = void>
+struct FunctorValueInit;
 
 /* No 'init' function provided for single value */
-template< class FunctorType , class ArgTag , class T , class Enable >
-struct FunctorValueInit< FunctorType , ArgTag , T & , Enable >
-{
-  KOKKOS_FORCEINLINE_FUNCTION static
-  T & init( const FunctorType & , void * p )
-    { return *( new(p) T() ); };
+template <class FunctorType, class ArgTag, class T, class Enable>
+struct FunctorValueInit<FunctorType, ArgTag, T&, Enable> {
+  KOKKOS_FORCEINLINE_FUNCTION static T& init(const FunctorType&, void* p) {
+    return *(new (p) T());
+  };
 };
 
 /* No 'init' function provided for array value */
-template< class FunctorType , class ArgTag , class T , class Enable >
-struct FunctorValueInit< FunctorType , ArgTag , T * , Enable >
-{
-  KOKKOS_FORCEINLINE_FUNCTION static
-  T * init( const FunctorType & f , void * p )
-    {
-      const int n = FunctorValueTraits< FunctorType , ArgTag >::value_count(f);
-      for ( int i = 0 ; i < n ; ++i ) { new( ((T*)p) + i ) T(); }
-      return (T*)p ;
+template <class FunctorType, class ArgTag, class T, class Enable>
+struct FunctorValueInit<FunctorType, ArgTag, T*, Enable> {
+  KOKKOS_FORCEINLINE_FUNCTION static T* init(const FunctorType& f, void* p) {
+    const int n = FunctorValueTraits<FunctorType, ArgTag>::value_count(f);
+    for (int i = 0; i < n; ++i) {
+      new (((T*)p) + i) T();
     }
+    return (T*)p;
+  }
 };
 
 /* 'init' function provided for single value */
-template< class FunctorType , class T >
-struct FunctorValueInit
-  < FunctorType
-  , void
-  , T &
+template <class FunctorType, class T>
+struct FunctorValueInit<
+    FunctorType, void,
+    T&
     // First  substitution failure when FunctorType::init does not exist.
     // Second substitution failure when FunctorType::init is not compatible.
-  , decltype( FunctorValueInitFunction< FunctorType , void >::enable_if( & FunctorType::init ) )
-  >
-{
-  KOKKOS_FORCEINLINE_FUNCTION static
-  T & init( const FunctorType & f , void * p )
-    { f.init( *((T*)p) ); return *((T*)p) ; }
+    ,
+    decltype(FunctorValueInitFunction<FunctorType, void>::enable_if(
+        &FunctorType::init))> {
+  KOKKOS_FORCEINLINE_FUNCTION static T& init(const FunctorType& f, void* p) {
+    f.init(*((T*)p));
+    return *((T*)p);
+  }
 };
 
 /* 'init' function provided for array value */
-template< class FunctorType , class T >
-struct FunctorValueInit
-  < FunctorType
-  , void
-  , T *
+template <class FunctorType, class T>
+struct FunctorValueInit<
+    FunctorType, void,
+    T*
     // First  substitution failure when FunctorType::init does not exist.
     // Second substitution failure when FunctorType::init is not compatible
-  , decltype( FunctorValueInitFunction< FunctorType , void >::enable_if( & FunctorType::init ) )
-  >
-{
-  KOKKOS_FORCEINLINE_FUNCTION static
-  T * init( const FunctorType & f , void * p )
-    { f.init( (T*)p ); return (T*)p ; }
+    ,
+    decltype(FunctorValueInitFunction<FunctorType, void>::enable_if(
+        &FunctorType::init))> {
+  KOKKOS_FORCEINLINE_FUNCTION static T* init(const FunctorType& f, void* p) {
+    f.init((T*)p);
+    return (T*)p;
+  }
 };
 
 /* 'init' function provided for single value */
-template< class FunctorType , class ArgTag , class T >
-struct FunctorValueInit
-  < FunctorType
-  , ArgTag
-  , T &
+template <class FunctorType, class ArgTag, class T>
+struct FunctorValueInit<
+    FunctorType, ArgTag,
+    T&
     // First  substitution failure when FunctorType::init does not exist.
     // Second substitution failure when FunctorType::init is not compatible.
-  , decltype( FunctorValueInitFunction< FunctorType , ArgTag >::enable_if( & FunctorType::init ) )
-  >
-{
-  KOKKOS_FORCEINLINE_FUNCTION static
-  T & init( const FunctorType & f , void * p )
-    { f.init( ArgTag() , *((T*)p) ); return *((T*)p) ; }
+    ,
+    decltype(FunctorValueInitFunction<FunctorType, ArgTag>::enable_if(
+        &FunctorType::init))> {
+  KOKKOS_FORCEINLINE_FUNCTION static T& init(const FunctorType& f, void* p) {
+    f.init(ArgTag(), *((T*)p));
+    return *((T*)p);
+  }
 };
 
 /* 'init' function provided for array value */
-template< class FunctorType , class ArgTag , class T >
-struct FunctorValueInit
-  < FunctorType
-  , ArgTag
-  , T *
+template <class FunctorType, class ArgTag, class T>
+struct FunctorValueInit<
+    FunctorType, ArgTag,
+    T*
     // First  substitution failure when FunctorType::init does not exist.
     // Second substitution failure when FunctorType::init is not compatible
-  , decltype( FunctorValueInitFunction< FunctorType , ArgTag >::enable_if( & FunctorType::init ) )
-  >
-{
-  KOKKOS_FORCEINLINE_FUNCTION static
-  T * init( const FunctorType & f , void * p )
-    { f.init( ArgTag() , (T*)p ); return (T*)p ; }
+    ,
+    decltype(FunctorValueInitFunction<FunctorType, ArgTag>::enable_if(
+        &FunctorType::init))> {
+  KOKKOS_FORCEINLINE_FUNCTION static T* init(const FunctorType& f, void* p) {
+    f.init(ArgTag(), (T*)p);
+    return (T*)p;
+  }
 };
 
-} // namespace Impl
-} // namespace Kokkos
+}  // namespace Impl
+}  // namespace Kokkos
 
 //----------------------------------------------------------------------------
 //----------------------------------------------------------------------------
@@ -1145,345 +1446,338 @@ namespace Kokkos {
 namespace Impl {
 
 // Signatures for compatible FunctorType::join with tag and not an array
-template< class FunctorType , class ArgTag , bool IsArray = 0 == FunctorValueTraits<FunctorType,ArgTag>::StaticValueSize >
+template <class FunctorType, class ArgTag,
+          bool IsArray =
+              0 == FunctorValueTraits<FunctorType, ArgTag>::StaticValueSize>
 struct FunctorValueJoinFunction {
+  typedef
+      typename FunctorValueTraits<FunctorType, ArgTag>::value_type value_type;
 
-  typedef typename FunctorValueTraits<FunctorType,ArgTag>::value_type value_type ;
+  typedef volatile value_type& vref_type;
+  typedef const volatile value_type& cvref_type;
 
-  typedef       volatile value_type & vref_type ;
-  typedef const volatile value_type & cvref_type ;
-
-  KOKKOS_INLINE_FUNCTION static void enable_if( void (FunctorType::*)( ArgTag         , vref_type , cvref_type ) const );
-  KOKKOS_INLINE_FUNCTION static void enable_if( void (FunctorType::*)( ArgTag const & , vref_type , cvref_type ) const );
-  KOKKOS_INLINE_FUNCTION static void enable_if( void (             *)( ArgTag         , vref_type , cvref_type ) );
-  KOKKOS_INLINE_FUNCTION static void enable_if( void (             *)( ArgTag const & , vref_type , cvref_type ) );
+  KOKKOS_INLINE_FUNCTION static void enable_if(
+      void (FunctorType::*)(ArgTag, vref_type, cvref_type) const);
+  KOKKOS_INLINE_FUNCTION static void enable_if(
+      void (FunctorType::*)(ArgTag const&, vref_type, cvref_type) const);
+  KOKKOS_INLINE_FUNCTION static void enable_if(void (*)(ArgTag, vref_type,
+                                                        cvref_type));
+  KOKKOS_INLINE_FUNCTION static void enable_if(void (*)(ArgTag const&,
+                                                        vref_type, cvref_type));
 };
 
 // Signatures for compatible FunctorType::join with tag and is an array
-template< class FunctorType , class ArgTag >
-struct FunctorValueJoinFunction< FunctorType , ArgTag , true > {
+template <class FunctorType, class ArgTag>
+struct FunctorValueJoinFunction<FunctorType, ArgTag, true> {
+  typedef
+      typename FunctorValueTraits<FunctorType, ArgTag>::value_type value_type;
 
-  typedef typename FunctorValueTraits<FunctorType,ArgTag>::value_type value_type ;
+  typedef volatile value_type* vptr_type;
+  typedef const volatile value_type* cvptr_type;
 
-  typedef       volatile value_type * vptr_type ;
-  typedef const volatile value_type * cvptr_type ;
-
-  KOKKOS_INLINE_FUNCTION static void enable_if( void (FunctorType::*)( ArgTag         , vptr_type , cvptr_type ) const );
-  KOKKOS_INLINE_FUNCTION static void enable_if( void (FunctorType::*)( ArgTag const & , vptr_type , cvptr_type ) const );
-  KOKKOS_INLINE_FUNCTION static void enable_if( void (             *)( ArgTag         , vptr_type , cvptr_type ) );
-  KOKKOS_INLINE_FUNCTION static void enable_if( void (             *)( ArgTag const & , vptr_type , cvptr_type ) );
+  KOKKOS_INLINE_FUNCTION static void enable_if(
+      void (FunctorType::*)(ArgTag, vptr_type, cvptr_type) const);
+  KOKKOS_INLINE_FUNCTION static void enable_if(
+      void (FunctorType::*)(ArgTag const&, vptr_type, cvptr_type) const);
+  KOKKOS_INLINE_FUNCTION static void enable_if(void (*)(ArgTag, vptr_type,
+                                                        cvptr_type));
+  KOKKOS_INLINE_FUNCTION static void enable_if(void (*)(ArgTag const&,
+                                                        vptr_type, cvptr_type));
 };
 
 // Signatures for compatible FunctorType::join without tag and not an array
-template< class FunctorType >
-struct FunctorValueJoinFunction< FunctorType , void , false > {
+template <class FunctorType>
+struct FunctorValueJoinFunction<FunctorType, void, false> {
+  typedef typename FunctorValueTraits<FunctorType, void>::value_type value_type;
 
-  typedef typename FunctorValueTraits<FunctorType,void>::value_type value_type ;
+  typedef volatile value_type& vref_type;
+  typedef const volatile value_type& cvref_type;
 
-  typedef       volatile value_type & vref_type ;
-  typedef const volatile value_type & cvref_type ;
-
-  KOKKOS_INLINE_FUNCTION static void enable_if( void (FunctorType::*)( vref_type , cvref_type ) const );
-  KOKKOS_INLINE_FUNCTION static void enable_if( void (             *)( vref_type , cvref_type ) );
+  KOKKOS_INLINE_FUNCTION static void enable_if(void (FunctorType::*)(vref_type,
+                                                                     cvref_type)
+                                                   const);
+  KOKKOS_INLINE_FUNCTION static void enable_if(void (*)(vref_type, cvref_type));
 };
 
 // Signatures for compatible FunctorType::join without tag and is an array
-template< class FunctorType >
-struct FunctorValueJoinFunction< FunctorType , void , true > {
+template <class FunctorType>
+struct FunctorValueJoinFunction<FunctorType, void, true> {
+  typedef typename FunctorValueTraits<FunctorType, void>::value_type value_type;
 
-  typedef typename FunctorValueTraits<FunctorType,void>::value_type value_type ;
+  typedef volatile value_type* vptr_type;
+  typedef const volatile value_type* cvptr_type;
 
-  typedef       volatile value_type * vptr_type ;
-  typedef const volatile value_type * cvptr_type ;
-
-  KOKKOS_INLINE_FUNCTION static void enable_if( void (FunctorType::*)( vptr_type , cvptr_type ) const );
-  KOKKOS_INLINE_FUNCTION static void enable_if( void (             *)( vptr_type , cvptr_type ) );
+  KOKKOS_INLINE_FUNCTION static void enable_if(void (FunctorType::*)(vptr_type,
+                                                                     cvptr_type)
+                                                   const);
+  KOKKOS_INLINE_FUNCTION static void enable_if(void (*)(vptr_type, cvptr_type));
 };
 
-
-template< class FunctorType , class ArgTag
-        , class T = typename FunctorValueTraits<FunctorType,ArgTag>::reference_type
-        , class Enable = void >
-struct FunctorValueJoin ;
+template <class FunctorType, class ArgTag,
+          class T =
+              typename FunctorValueTraits<FunctorType, ArgTag>::reference_type,
+          class Enable = void>
+struct FunctorValueJoin;
 
 /* No 'join' function provided, single value */
-template< class FunctorType , class ArgTag , class T , class Enable >
-struct FunctorValueJoin< FunctorType , ArgTag , T & , Enable >
-{
+template <class FunctorType, class ArgTag, class T, class Enable>
+struct FunctorValueJoin<FunctorType, ArgTag, T&, Enable> {
   KOKKOS_FORCEINLINE_FUNCTION
-  FunctorValueJoin(const FunctorType& ){}
+  FunctorValueJoin(const FunctorType&) {}
 
-  KOKKOS_FORCEINLINE_FUNCTION static
-  void join( const FunctorType & f , volatile void * const lhs , const volatile void * const rhs )
-    {
-      *((volatile T*)lhs) += *((const volatile T*)rhs);
-    }
+  KOKKOS_FORCEINLINE_FUNCTION static void join(const FunctorType& f,
+                                               volatile void* const lhs,
+                                               const volatile void* const rhs) {
+    *((volatile T*)lhs) += *((const volatile T*)rhs);
+  }
   KOKKOS_FORCEINLINE_FUNCTION
-  void operator()( volatile T& lhs , const volatile T& rhs ) const
-    {
-      lhs += rhs;
-    }
+  void operator()(volatile T& lhs, const volatile T& rhs) const { lhs += rhs; }
   KOKKOS_FORCEINLINE_FUNCTION
-  void operator() ( T& lhs , const T& rhs ) const
-    {
-      lhs += rhs;
-    }
+  void operator()(T& lhs, const T& rhs) const { lhs += rhs; }
 };
 
 /* No 'join' function provided, array of values */
-template< class FunctorType , class ArgTag , class T , class Enable >
-struct FunctorValueJoin< FunctorType , ArgTag , T * , Enable >
-{
+template <class FunctorType, class ArgTag, class T, class Enable>
+struct FunctorValueJoin<FunctorType, ArgTag, T*, Enable> {
   const FunctorType& f;
 
   KOKKOS_FORCEINLINE_FUNCTION
-  FunctorValueJoin(const FunctorType& f_):f(f_){}
+  FunctorValueJoin(const FunctorType& f_) : f(f_) {}
 
-  KOKKOS_FORCEINLINE_FUNCTION static
-  void join( const FunctorType & f_ , volatile void * const lhs , const volatile void * const rhs )
-    {
-      const int n = FunctorValueTraits<FunctorType,ArgTag>::value_count(f_);
+  KOKKOS_FORCEINLINE_FUNCTION static void join(const FunctorType& f_,
+                                               volatile void* const lhs,
+                                               const volatile void* const rhs) {
+    const int n = FunctorValueTraits<FunctorType, ArgTag>::value_count(f_);
 
-      for ( int i = 0 ; i < n ; ++i ) { ((volatile T*)lhs)[i] += ((const volatile T*)rhs)[i]; }
+    for (int i = 0; i < n; ++i) {
+      ((volatile T*)lhs)[i] += ((const volatile T*)rhs)[i];
     }
+  }
   KOKKOS_FORCEINLINE_FUNCTION
-  void operator()( volatile T* const lhs , const volatile T* const rhs ) const
-    {
-      const int n = FunctorValueTraits<FunctorType,ArgTag>::value_count(f);
+  void operator()(volatile T* const lhs, const volatile T* const rhs) const {
+    const int n = FunctorValueTraits<FunctorType, ArgTag>::value_count(f);
 
-      for ( int i = 0 ; i < n ; ++i ) { lhs[i] += rhs[i]; }
+    for (int i = 0; i < n; ++i) {
+      lhs[i] += rhs[i];
     }
+  }
   KOKKOS_FORCEINLINE_FUNCTION
-  void operator() ( T* lhs , const T* rhs ) const
-    {
-      const int n = FunctorValueTraits<FunctorType,ArgTag>::value_count(f);
+  void operator()(T* lhs, const T* rhs) const {
+    const int n = FunctorValueTraits<FunctorType, ArgTag>::value_count(f);
 
-      for ( int i = 0 ; i < n ; ++i ) { lhs[i] += rhs[i]; }
+    for (int i = 0; i < n; ++i) {
+      lhs[i] += rhs[i];
     }
+  }
 };
 
 /* 'join' function provided, single value */
-template< class FunctorType , class ArgTag , class T >
-struct FunctorValueJoin
-  < FunctorType
-  , ArgTag
-  , T &
+template <class FunctorType, class ArgTag, class T>
+struct FunctorValueJoin<
+    FunctorType, ArgTag,
+    T&
     // First  substitution failure when FunctorType::join does not exist.
-    // Second substitution failure when enable_if( & Functor::join ) does not exist
-  , decltype( FunctorValueJoinFunction< FunctorType , ArgTag >::enable_if( & FunctorType::join ) )
-  >
-{
+    // Second substitution failure when enable_if( & Functor::join ) does not
+    // exist
+    ,
+    decltype(FunctorValueJoinFunction<FunctorType, ArgTag>::enable_if(
+        &FunctorType::join))> {
   const FunctorType& f;
 
   KOKKOS_FORCEINLINE_FUNCTION
-  FunctorValueJoin(const FunctorType& f_):f(f_){}
+  FunctorValueJoin(const FunctorType& f_) : f(f_) {}
 
-  KOKKOS_FORCEINLINE_FUNCTION static
-  void join( const FunctorType & f_ , volatile void * const lhs , const volatile void * const rhs )
-    {
-      f_.join( ArgTag() , *((volatile T *)lhs) , *((const volatile T *)rhs) );
-    }
+  KOKKOS_FORCEINLINE_FUNCTION static void join(const FunctorType& f_,
+                                               volatile void* const lhs,
+                                               const volatile void* const rhs) {
+    f_.join(ArgTag(), *((volatile T*)lhs), *((const volatile T*)rhs));
+  }
   KOKKOS_FORCEINLINE_FUNCTION
-  void operator()( volatile T& lhs , const volatile T& rhs ) const
-    {
-      f.join( ArgTag() , lhs , rhs );
-    }
+  void operator()(volatile T& lhs, const volatile T& rhs) const {
+    f.join(ArgTag(), lhs, rhs);
+  }
   KOKKOS_FORCEINLINE_FUNCTION
-  void operator() ( T& lhs , const T& rhs ) const
-    {
-      f.join( ArgTag(), lhs , rhs );
-    }
+  void operator()(T& lhs, const T& rhs) const { f.join(ArgTag(), lhs, rhs); }
 };
 
 /* 'join' function provided, no tag, single value */
-template< class FunctorType , class T >
-struct FunctorValueJoin
-  < FunctorType
-  , void
-  , T &
+template <class FunctorType, class T>
+struct FunctorValueJoin<
+    FunctorType, void,
+    T&
     // First  substitution failure when FunctorType::join does not exist.
-    // Second substitution failure when enable_if( & Functor::join ) does not exist
-  , decltype( FunctorValueJoinFunction< FunctorType , void >::enable_if( & FunctorType::join ) )
-  >
-{
+    // Second substitution failure when enable_if( & Functor::join ) does not
+    // exist
+    ,
+    decltype(FunctorValueJoinFunction<FunctorType, void>::enable_if(
+        &FunctorType::join))> {
   const FunctorType& f;
 
   KOKKOS_FORCEINLINE_FUNCTION
-  FunctorValueJoin(const FunctorType& f_):f(f_){}
+  FunctorValueJoin(const FunctorType& f_) : f(f_) {}
 
-  KOKKOS_FORCEINLINE_FUNCTION static
-  void join( const FunctorType & f_ , volatile void * const lhs , const volatile void * const rhs )
-    {
-      f_.join( *((volatile T *)lhs) , *((const volatile T *)rhs) );
-    }
+  KOKKOS_FORCEINLINE_FUNCTION static void join(const FunctorType& f_,
+                                               volatile void* const lhs,
+                                               const volatile void* const rhs) {
+    f_.join(*((volatile T*)lhs), *((const volatile T*)rhs));
+  }
   KOKKOS_FORCEINLINE_FUNCTION
-  void operator()( volatile T& lhs , const volatile T& rhs ) const
-    {
-      f.join( lhs , rhs );
-    }
+  void operator()(volatile T& lhs, const volatile T& rhs) const {
+    f.join(lhs, rhs);
+  }
   KOKKOS_FORCEINLINE_FUNCTION
-  void operator() ( T& lhs , const T& rhs ) const
-    {
-      f.join( lhs , rhs );
-    }
+  void operator()(T& lhs, const T& rhs) const { f.join(lhs, rhs); }
 };
 
 /* 'join' function provided for array value */
-template< class FunctorType , class ArgTag , class T >
-struct FunctorValueJoin
-  < FunctorType
-  , ArgTag
-  , T *
+template <class FunctorType, class ArgTag, class T>
+struct FunctorValueJoin<
+    FunctorType, ArgTag,
+    T*
     // First  substitution failure when FunctorType::join does not exist.
-    // Second substitution failure when enable_if( & Functor::join ) does not exist
-  , decltype( FunctorValueJoinFunction< FunctorType , ArgTag >::enable_if( & FunctorType::join ) )
-  >
-{
+    // Second substitution failure when enable_if( & Functor::join ) does not
+    // exist
+    ,
+    decltype(FunctorValueJoinFunction<FunctorType, ArgTag>::enable_if(
+        &FunctorType::join))> {
   const FunctorType& f;
 
   KOKKOS_FORCEINLINE_FUNCTION
-  FunctorValueJoin(const FunctorType& f_):f(f_){}
+  FunctorValueJoin(const FunctorType& f_) : f(f_) {}
 
-  KOKKOS_FORCEINLINE_FUNCTION static
-  void join( const FunctorType & f_ , volatile void * const lhs , const volatile void * const rhs )
-    {
-      f_.join( ArgTag() , (volatile T *)lhs , (const volatile T *)rhs );
-    }
+  KOKKOS_FORCEINLINE_FUNCTION static void join(const FunctorType& f_,
+                                               volatile void* const lhs,
+                                               const volatile void* const rhs) {
+    f_.join(ArgTag(), (volatile T*)lhs, (const volatile T*)rhs);
+  }
   KOKKOS_FORCEINLINE_FUNCTION
-  void operator()( volatile T* const lhs , const volatile T* const rhs ) const
-    {
-      f.join( ArgTag() , lhs , rhs );
-    }
+  void operator()(volatile T* const lhs, const volatile T* const rhs) const {
+    f.join(ArgTag(), lhs, rhs);
+  }
   KOKKOS_FORCEINLINE_FUNCTION
-  void operator() ( T* lhs , const T* rhs ) const
-    {
-      f.join( ArgTag(), lhs , rhs );
-    }
+  void operator()(T* lhs, const T* rhs) const { f.join(ArgTag(), lhs, rhs); }
 };
 
 /* 'join' function provided, no tag, array value */
-template< class FunctorType , class T >
-struct FunctorValueJoin
-  < FunctorType
-  , void
-  , T *
+template <class FunctorType, class T>
+struct FunctorValueJoin<
+    FunctorType, void,
+    T*
     // First  substitution failure when FunctorType::join does not exist.
-    // Second substitution failure when enable_if( & Functor::join ) does not exist
-  , decltype( FunctorValueJoinFunction< FunctorType , void >::enable_if( & FunctorType::join ) )
-  >
-{
+    // Second substitution failure when enable_if( & Functor::join ) does not
+    // exist
+    ,
+    decltype(FunctorValueJoinFunction<FunctorType, void>::enable_if(
+        &FunctorType::join))> {
   const FunctorType& f;
 
   KOKKOS_FORCEINLINE_FUNCTION
-  FunctorValueJoin(const FunctorType& f_):f(f_){}
+  FunctorValueJoin(const FunctorType& f_) : f(f_) {}
 
-  KOKKOS_FORCEINLINE_FUNCTION static
-  void join( const FunctorType & f_ , volatile void * const lhs , const volatile void * const rhs )
-    {
-      f_.join( (volatile T *)lhs , (const volatile T *)rhs );
-    }
+  KOKKOS_FORCEINLINE_FUNCTION static void join(const FunctorType& f_,
+                                               volatile void* const lhs,
+                                               const volatile void* const rhs) {
+    f_.join((volatile T*)lhs, (const volatile T*)rhs);
+  }
   KOKKOS_FORCEINLINE_FUNCTION
-  void operator() ( volatile T* const lhs , const volatile T* const rhs ) const
-    {
-      f.join( lhs , rhs );
-    }
+  void operator()(volatile T* const lhs, const volatile T* const rhs) const {
+    f.join(lhs, rhs);
+  }
   KOKKOS_FORCEINLINE_FUNCTION
-  void operator() ( T* lhs , const T* rhs ) const
-    {
-      f.join( lhs , rhs );
-    }
+  void operator()(T* lhs, const T* rhs) const { f.join(lhs, rhs); }
 };
 
-} // namespace Impl
-} // namespace Kokkos
+}  // namespace Impl
+}  // namespace Kokkos
 
 namespace Kokkos {
 
 namespace Impl {
 
-  template<typename ValueType, class JoinOp, class Enable = void>
-  struct JoinLambdaAdapter {
-    typedef ValueType value_type;
-    const JoinOp& lambda;
-    KOKKOS_INLINE_FUNCTION
-    JoinLambdaAdapter(const JoinOp& lambda_):lambda(lambda_) {}
+template <typename ValueType, class JoinOp, class Enable = void>
+struct JoinLambdaAdapter {
+  typedef ValueType value_type;
+  const JoinOp& lambda;
+  KOKKOS_INLINE_FUNCTION
+  JoinLambdaAdapter(const JoinOp& lambda_) : lambda(lambda_) {}
 
-    KOKKOS_INLINE_FUNCTION
-    void join(volatile value_type& dst, const volatile value_type& src) const {
-      lambda(dst,src);
-    }
+  KOKKOS_INLINE_FUNCTION
+  void join(volatile value_type& dst, const volatile value_type& src) const {
+    lambda(dst, src);
+  }
 
-    KOKKOS_INLINE_FUNCTION
-    void join(value_type& dst, const value_type& src) const {
-      lambda(dst,src);
-    }
+  KOKKOS_INLINE_FUNCTION
+  void join(value_type& dst, const value_type& src) const { lambda(dst, src); }
 
-    KOKKOS_INLINE_FUNCTION
-    void operator() (volatile value_type& dst, const volatile value_type& src) const {
-      lambda(dst,src);
-    }
+  KOKKOS_INLINE_FUNCTION
+  void operator()(volatile value_type& dst,
+                  const volatile value_type& src) const {
+    lambda(dst, src);
+  }
 
-    KOKKOS_INLINE_FUNCTION
-    void operator() (value_type& dst, const value_type& src) const {
-      lambda(dst,src);
-    }
-  };
+  KOKKOS_INLINE_FUNCTION
+  void operator()(value_type& dst, const value_type& src) const {
+    lambda(dst, src);
+  }
+};
 
-  template<typename ValueType, class JoinOp>
-  struct JoinLambdaAdapter<ValueType, JoinOp, decltype( FunctorValueJoinFunction< JoinOp , void >::enable_if( & JoinOp::join ) )> {
-    typedef ValueType value_type;
-    static_assert(
-        std::is_same<ValueType,typename JoinOp::value_type>::value,
-        "JoinLambdaAdapter static_assert Fail: ValueType != JoinOp::value_type");
+template <typename ValueType, class JoinOp>
+struct JoinLambdaAdapter<ValueType, JoinOp,
+                         decltype(FunctorValueJoinFunction<
+                                  JoinOp, void>::enable_if(&JoinOp::join))> {
+  typedef ValueType value_type;
+  static_assert(
+      std::is_same<ValueType, typename JoinOp::value_type>::value,
+      "JoinLambdaAdapter static_assert Fail: ValueType != JoinOp::value_type");
 
-    const JoinOp& lambda;
-    KOKKOS_INLINE_FUNCTION
-    JoinLambdaAdapter(const JoinOp& lambda_):lambda(lambda_) {}
+  const JoinOp& lambda;
+  KOKKOS_INLINE_FUNCTION
+  JoinLambdaAdapter(const JoinOp& lambda_) : lambda(lambda_) {}
 
-    KOKKOS_INLINE_FUNCTION
-    void join(volatile value_type& dst, const volatile value_type& src) const {
-      lambda.join(dst,src);
-    }
+  KOKKOS_INLINE_FUNCTION
+  void join(volatile value_type& dst, const volatile value_type& src) const {
+    lambda.join(dst, src);
+  }
 
-    KOKKOS_INLINE_FUNCTION
-    void join(value_type& dst, const value_type& src) const {
-      lambda.join(dst,src);
-    }
+  KOKKOS_INLINE_FUNCTION
+  void join(value_type& dst, const value_type& src) const {
+    lambda.join(dst, src);
+  }
 
-    KOKKOS_INLINE_FUNCTION
-    void operator() (volatile value_type& dst, const volatile value_type& src) const {
-      lambda.join(dst,src);
-    }
+  KOKKOS_INLINE_FUNCTION
+  void operator()(volatile value_type& dst,
+                  const volatile value_type& src) const {
+    lambda.join(dst, src);
+  }
 
-    KOKKOS_INLINE_FUNCTION
-    void operator() (value_type& dst, const value_type& src) const {
-      lambda.join(dst,src);
-    }
-  };
+  KOKKOS_INLINE_FUNCTION
+  void operator()(value_type& dst, const value_type& src) const {
+    lambda.join(dst, src);
+  }
+};
 
-  template<typename ValueType>
-  struct JoinAdd {
-    typedef ValueType value_type;
+template <typename ValueType>
+struct JoinAdd {
+  typedef ValueType value_type;
 
-    KOKKOS_INLINE_FUNCTION
-    JoinAdd() {}
+  KOKKOS_INLINE_FUNCTION
+  JoinAdd() {}
 
-    KOKKOS_INLINE_FUNCTION
-    void join(volatile value_type& dst, const volatile value_type& src) const {
-      dst+=src;
-    }
-    KOKKOS_INLINE_FUNCTION
-    void operator() (value_type& dst, const value_type& src) const {
-      dst+=src;
-    }
-    KOKKOS_INLINE_FUNCTION
-    void operator() (volatile value_type& dst, const volatile value_type& src) const {
-      dst+=src;
-    }
-  };
+  KOKKOS_INLINE_FUNCTION
+  void join(volatile value_type& dst, const volatile value_type& src) const {
+    dst += src;
+  }
+  KOKKOS_INLINE_FUNCTION
+  void operator()(value_type& dst, const value_type& src) const { dst += src; }
+  KOKKOS_INLINE_FUNCTION
+  void operator()(volatile value_type& dst,
+                  const volatile value_type& src) const {
+    dst += src;
+  }
+};
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
 
 //----------------------------------------------------------------------------
 //----------------------------------------------------------------------------
@@ -1491,44 +1785,43 @@ namespace Impl {
 namespace Kokkos {
 namespace Impl {
 
-template< class FunctorType , class ArgTag
-        , class T = typename FunctorValueTraits<FunctorType,ArgTag>::reference_type >
-struct FunctorValueOps ;
+template <class FunctorType, class ArgTag,
+          class T =
+              typename FunctorValueTraits<FunctorType, ArgTag>::reference_type>
+struct FunctorValueOps;
 
-template< class FunctorType , class ArgTag , class T >
-struct FunctorValueOps< FunctorType , ArgTag , T & >
-{
-  KOKKOS_FORCEINLINE_FUNCTION static
-  T * pointer( T & r ) { return & r ; }
+template <class FunctorType, class ArgTag, class T>
+struct FunctorValueOps<FunctorType, ArgTag, T&> {
+  KOKKOS_FORCEINLINE_FUNCTION static T* pointer(T& r) { return &r; }
 
-  KOKKOS_FORCEINLINE_FUNCTION static
-  T & reference( void * p ) { return *((T*)p); }
+  KOKKOS_FORCEINLINE_FUNCTION static T& reference(void* p) { return *((T*)p); }
 
-  KOKKOS_FORCEINLINE_FUNCTION static
-  void copy( const FunctorType & , void * const lhs , const void * const rhs )
-    { *((T*)lhs) = *((const T*)rhs); }
+  KOKKOS_FORCEINLINE_FUNCTION static void copy(const FunctorType&,
+                                               void* const lhs,
+                                               const void* const rhs) {
+    *((T*)lhs) = *((const T*)rhs);
+  }
 };
 
 /* No 'join' function provided, array of values */
-template< class FunctorType , class ArgTag , class T >
-struct FunctorValueOps< FunctorType , ArgTag , T * >
-{
-  KOKKOS_FORCEINLINE_FUNCTION static
-  T * pointer( T * p ) { return p ; }
+template <class FunctorType, class ArgTag, class T>
+struct FunctorValueOps<FunctorType, ArgTag, T*> {
+  KOKKOS_FORCEINLINE_FUNCTION static T* pointer(T* p) { return p; }
 
-  KOKKOS_FORCEINLINE_FUNCTION static
-  T * reference( void * p ) { return ((T*)p); }
+  KOKKOS_FORCEINLINE_FUNCTION static T* reference(void* p) { return ((T*)p); }
 
-  KOKKOS_FORCEINLINE_FUNCTION static
-  void copy( const FunctorType & f , void * const lhs , const void * const rhs )
-    {
-      const int n = FunctorValueTraits<FunctorType,ArgTag>::value_count(f);
-      for ( int i = 0 ; i < n ; ++i ) { ((T*)lhs)[i] = ((const T*)rhs)[i]; }
+  KOKKOS_FORCEINLINE_FUNCTION static void copy(const FunctorType& f,
+                                               void* const lhs,
+                                               const void* const rhs) {
+    const int n = FunctorValueTraits<FunctorType, ArgTag>::value_count(f);
+    for (int i = 0; i < n; ++i) {
+      ((T*)lhs)[i] = ((const T*)rhs)[i];
     }
+  }
 };
 
-} // namespace Impl
-} // namespace Kokkos
+}  // namespace Impl
+}  // namespace Kokkos
 
 //----------------------------------------------------------------------------
 //----------------------------------------------------------------------------
@@ -1537,151 +1830,200 @@ namespace Kokkos {
 namespace Impl {
 
 // Compatible functions for 'final' function and value_type not an array
-template< class FunctorType , class ArgTag , bool IsArray = 0 == FunctorValueTraits<FunctorType,ArgTag>::StaticValueSize >
+template <class FunctorType, class ArgTag,
+          bool IsArray =
+              0 == FunctorValueTraits<FunctorType, ArgTag>::StaticValueSize>
 struct FunctorFinalFunction {
+  typedef
+      typename FunctorValueTraits<FunctorType, ArgTag>::value_type value_type;
 
-  typedef typename FunctorValueTraits<FunctorType,ArgTag>::value_type value_type ;
+  KOKKOS_INLINE_FUNCTION static void enable_if(
+      void (FunctorType::*)(ArgTag, value_type&) const);
+  KOKKOS_INLINE_FUNCTION static void enable_if(
+      void (FunctorType::*)(ArgTag const&, value_type&) const);
+  KOKKOS_INLINE_FUNCTION static void enable_if(
+      void (FunctorType::*)(ArgTag, value_type&));
+  KOKKOS_INLINE_FUNCTION static void enable_if(
+      void (FunctorType::*)(ArgTag const&, value_type&));
+  KOKKOS_INLINE_FUNCTION static void enable_if(void (*)(ArgTag, value_type&));
+  KOKKOS_INLINE_FUNCTION static void enable_if(void (*)(ArgTag const&,
+                                                        value_type&));
 
-  KOKKOS_INLINE_FUNCTION static void enable_if( void (FunctorType::*)( ArgTag         , value_type & ) const );
-  KOKKOS_INLINE_FUNCTION static void enable_if( void (FunctorType::*)( ArgTag const & , value_type & ) const );
-  KOKKOS_INLINE_FUNCTION static void enable_if( void (FunctorType::*)( ArgTag         , value_type & ) );
-  KOKKOS_INLINE_FUNCTION static void enable_if( void (FunctorType::*)( ArgTag const & , value_type & ) );
-  KOKKOS_INLINE_FUNCTION static void enable_if( void (             *)( ArgTag         , value_type & ) );
-  KOKKOS_INLINE_FUNCTION static void enable_if( void (             *)( ArgTag const & , value_type & ) );
+  // KOKKOS_INLINE_FUNCTION static void enable_if( void (FunctorType::*)( ArgTag
+  // , value_type volatile & ) const ); KOKKOS_INLINE_FUNCTION static void
+  // enable_if( void (FunctorType::*)( ArgTag const & , value_type volatile & )
+  // const ); KOKKOS_INLINE_FUNCTION static void enable_if( void
+  // (FunctorType::*)( ArgTag         , value_type volatile & ) );
+  // KOKKOS_INLINE_FUNCTION static void enable_if( void (FunctorType::*)( ArgTag
+  // const & , value_type volatile & ) ); KOKKOS_INLINE_FUNCTION static void
+  // enable_if( void (             *)( ArgTag         , value_type volatile & )
+  // ); KOKKOS_INLINE_FUNCTION static void enable_if( void (             *)(
+  // ArgTag const & , value_type volatile & ) );
 
-  // KOKKOS_INLINE_FUNCTION static void enable_if( void (FunctorType::*)( ArgTag         , value_type volatile & ) const );
-  // KOKKOS_INLINE_FUNCTION static void enable_if( void (FunctorType::*)( ArgTag const & , value_type volatile & ) const );
-  // KOKKOS_INLINE_FUNCTION static void enable_if( void (FunctorType::*)( ArgTag         , value_type volatile & ) );
-  // KOKKOS_INLINE_FUNCTION static void enable_if( void (FunctorType::*)( ArgTag const & , value_type volatile & ) );
-  // KOKKOS_INLINE_FUNCTION static void enable_if( void (             *)( ArgTag         , value_type volatile & ) );
-  // KOKKOS_INLINE_FUNCTION static void enable_if( void (             *)( ArgTag const & , value_type volatile & ) );
+  KOKKOS_INLINE_FUNCTION static void enable_if(
+      void (FunctorType::*)(ArgTag, value_type const&) const);
+  KOKKOS_INLINE_FUNCTION static void enable_if(
+      void (FunctorType::*)(ArgTag const&, value_type const&) const);
+  KOKKOS_INLINE_FUNCTION static void enable_if(
+      void (FunctorType::*)(ArgTag, value_type const&));
+  KOKKOS_INLINE_FUNCTION static void enable_if(
+      void (FunctorType::*)(ArgTag const&, value_type const&));
+  KOKKOS_INLINE_FUNCTION static void enable_if(void (*)(ArgTag,
+                                                        value_type const&));
+  KOKKOS_INLINE_FUNCTION static void enable_if(void (*)(ArgTag const&,
+                                                        value_type const&));
 
-  KOKKOS_INLINE_FUNCTION static void enable_if( void (FunctorType::*)( ArgTag         , value_type const & ) const );
-  KOKKOS_INLINE_FUNCTION static void enable_if( void (FunctorType::*)( ArgTag const & , value_type const & ) const );
-  KOKKOS_INLINE_FUNCTION static void enable_if( void (FunctorType::*)( ArgTag         , value_type const & ) );
-  KOKKOS_INLINE_FUNCTION static void enable_if( void (FunctorType::*)( ArgTag const & , value_type const & ) );
-  KOKKOS_INLINE_FUNCTION static void enable_if( void (             *)( ArgTag         , value_type const & ) );
-  KOKKOS_INLINE_FUNCTION static void enable_if( void (             *)( ArgTag const & , value_type const & ) );
-
-  // KOKKOS_INLINE_FUNCTION static void enable_if( void (FunctorType::*)( ArgTag         , value_type const volatile & ) const );
-  // KOKKOS_INLINE_FUNCTION static void enable_if( void (FunctorType::*)( ArgTag const & , value_type const volatile & ) const );
-  // KOKKOS_INLINE_FUNCTION static void enable_if( void (FunctorType::*)( ArgTag         , value_type const volatile & ) );
-  // KOKKOS_INLINE_FUNCTION static void enable_if( void (FunctorType::*)( ArgTag const & , value_type const volatile & ) );
-  // KOKKOS_INLINE_FUNCTION static void enable_if( void (             *)( ArgTag         , value_type const volatile & ) );
-  // KOKKOS_INLINE_FUNCTION static void enable_if( void (             *)( ArgTag const & , value_type const volatile & ) );
+  // KOKKOS_INLINE_FUNCTION static void enable_if( void (FunctorType::*)( ArgTag
+  // , value_type const volatile & ) const ); KOKKOS_INLINE_FUNCTION static void
+  // enable_if( void (FunctorType::*)( ArgTag const & , value_type const
+  // volatile & ) const ); KOKKOS_INLINE_FUNCTION static void enable_if( void
+  // (FunctorType::*)( ArgTag         , value_type const volatile & ) );
+  // KOKKOS_INLINE_FUNCTION static void enable_if( void (FunctorType::*)( ArgTag
+  // const & , value_type const volatile & ) ); KOKKOS_INLINE_FUNCTION static
+  // void enable_if( void (             *)( ArgTag         , value_type const
+  // volatile & ) ); KOKKOS_INLINE_FUNCTION static void enable_if( void ( *)(
+  // ArgTag const & , value_type const volatile & ) );
 };
 
 // Compatible functions for 'final' function and value_type is an array
-template< class FunctorType , class ArgTag >
-struct FunctorFinalFunction< FunctorType , ArgTag , true > {
+template <class FunctorType, class ArgTag>
+struct FunctorFinalFunction<FunctorType, ArgTag, true> {
+  typedef
+      typename FunctorValueTraits<FunctorType, ArgTag>::value_type value_type;
 
-  typedef typename FunctorValueTraits<FunctorType,ArgTag>::value_type value_type ;
+  KOKKOS_INLINE_FUNCTION static void enable_if(
+      void (FunctorType::*)(ArgTag, value_type*) const);
+  KOKKOS_INLINE_FUNCTION static void enable_if(
+      void (FunctorType::*)(ArgTag const&, value_type*) const);
+  KOKKOS_INLINE_FUNCTION static void enable_if(
+      void (FunctorType::*)(ArgTag, value_type*));
+  KOKKOS_INLINE_FUNCTION static void enable_if(
+      void (FunctorType::*)(ArgTag const&, value_type*));
+  KOKKOS_INLINE_FUNCTION static void enable_if(void (*)(ArgTag, value_type*));
+  KOKKOS_INLINE_FUNCTION static void enable_if(void (*)(ArgTag const&,
+                                                        value_type*));
 
-  KOKKOS_INLINE_FUNCTION static void enable_if( void (FunctorType::*)( ArgTag         , value_type * ) const );
-  KOKKOS_INLINE_FUNCTION static void enable_if( void (FunctorType::*)( ArgTag const & , value_type * ) const );
-  KOKKOS_INLINE_FUNCTION static void enable_if( void (FunctorType::*)( ArgTag         , value_type * ) );
-  KOKKOS_INLINE_FUNCTION static void enable_if( void (FunctorType::*)( ArgTag const & , value_type * ) );
-  KOKKOS_INLINE_FUNCTION static void enable_if( void (             *)( ArgTag         , value_type * ) );
-  KOKKOS_INLINE_FUNCTION static void enable_if( void (             *)( ArgTag const & , value_type * ) );
+  // KOKKOS_INLINE_FUNCTION static void enable_if( void (FunctorType::*)( ArgTag
+  // , value_type volatile * ) const ); KOKKOS_INLINE_FUNCTION static void
+  // enable_if( void (FunctorType::*)( ArgTag const & , value_type volatile * )
+  // const ); KOKKOS_INLINE_FUNCTION static void enable_if( void
+  // (FunctorType::*)( ArgTag         , value_type volatile * ) );
+  // KOKKOS_INLINE_FUNCTION static void enable_if( void (FunctorType::*)( ArgTag
+  // const & , value_type volatile * ) ); KOKKOS_INLINE_FUNCTION static void
+  // enable_if( void (             *)( ArgTag         , value_type volatile * )
+  // ); KOKKOS_INLINE_FUNCTION static void enable_if( void (             *)(
+  // ArgTag const & , value_type volatile * ) );
 
-  // KOKKOS_INLINE_FUNCTION static void enable_if( void (FunctorType::*)( ArgTag         , value_type volatile * ) const );
-  // KOKKOS_INLINE_FUNCTION static void enable_if( void (FunctorType::*)( ArgTag const & , value_type volatile * ) const );
-  // KOKKOS_INLINE_FUNCTION static void enable_if( void (FunctorType::*)( ArgTag         , value_type volatile * ) );
-  // KOKKOS_INLINE_FUNCTION static void enable_if( void (FunctorType::*)( ArgTag const & , value_type volatile * ) );
-  // KOKKOS_INLINE_FUNCTION static void enable_if( void (             *)( ArgTag         , value_type volatile * ) );
-  // KOKKOS_INLINE_FUNCTION static void enable_if( void (             *)( ArgTag const & , value_type volatile * ) );
+  KOKKOS_INLINE_FUNCTION static void enable_if(
+      void (FunctorType::*)(ArgTag, value_type const*) const);
+  KOKKOS_INLINE_FUNCTION static void enable_if(
+      void (FunctorType::*)(ArgTag const&, value_type const*) const);
+  KOKKOS_INLINE_FUNCTION static void enable_if(
+      void (FunctorType::*)(ArgTag, value_type const*));
+  KOKKOS_INLINE_FUNCTION static void enable_if(
+      void (FunctorType::*)(ArgTag const&, value_type const*));
+  KOKKOS_INLINE_FUNCTION static void enable_if(void (*)(ArgTag,
+                                                        value_type const*));
+  KOKKOS_INLINE_FUNCTION static void enable_if(void (*)(ArgTag const&,
+                                                        value_type const*));
 
-  KOKKOS_INLINE_FUNCTION static void enable_if( void (FunctorType::*)( ArgTag         , value_type const * ) const );
-  KOKKOS_INLINE_FUNCTION static void enable_if( void (FunctorType::*)( ArgTag const & , value_type const * ) const );
-  KOKKOS_INLINE_FUNCTION static void enable_if( void (FunctorType::*)( ArgTag         , value_type const * ) );
-  KOKKOS_INLINE_FUNCTION static void enable_if( void (FunctorType::*)( ArgTag const & , value_type const * ) );
-  KOKKOS_INLINE_FUNCTION static void enable_if( void (             *)( ArgTag         , value_type const * ) );
-  KOKKOS_INLINE_FUNCTION static void enable_if( void (             *)( ArgTag const & , value_type const * ) );
-
-  // KOKKOS_INLINE_FUNCTION static void enable_if( void (FunctorType::*)( ArgTag         , value_type const volatile * ) const );
-  // KOKKOS_INLINE_FUNCTION static void enable_if( void (FunctorType::*)( ArgTag const & , value_type const volatile * ) const );
-  // KOKKOS_INLINE_FUNCTION static void enable_if( void (FunctorType::*)( ArgTag         , value_type const volatile * ) );
-  // KOKKOS_INLINE_FUNCTION static void enable_if( void (FunctorType::*)( ArgTag const & , value_type const volatile * ) );
-  // KOKKOS_INLINE_FUNCTION static void enable_if( void (             *)( ArgTag         , value_type const volatile * ) );
-  // KOKKOS_INLINE_FUNCTION static void enable_if( void (             *)( ArgTag const & , value_type const volatile * ) );
+  // KOKKOS_INLINE_FUNCTION static void enable_if( void (FunctorType::*)( ArgTag
+  // , value_type const volatile * ) const ); KOKKOS_INLINE_FUNCTION static void
+  // enable_if( void (FunctorType::*)( ArgTag const & , value_type const
+  // volatile * ) const ); KOKKOS_INLINE_FUNCTION static void enable_if( void
+  // (FunctorType::*)( ArgTag         , value_type const volatile * ) );
+  // KOKKOS_INLINE_FUNCTION static void enable_if( void (FunctorType::*)( ArgTag
+  // const & , value_type const volatile * ) ); KOKKOS_INLINE_FUNCTION static
+  // void enable_if( void (             *)( ArgTag         , value_type const
+  // volatile * ) ); KOKKOS_INLINE_FUNCTION static void enable_if( void ( *)(
+  // ArgTag const & , value_type const volatile * ) );
 };
 
-template< class FunctorType >
-struct FunctorFinalFunction< FunctorType , void , false > {
+template <class FunctorType>
+struct FunctorFinalFunction<FunctorType, void, false> {
+  typedef typename FunctorValueTraits<FunctorType, void>::value_type value_type;
 
-  typedef typename FunctorValueTraits<FunctorType,void>::value_type value_type ;
+  KOKKOS_INLINE_FUNCTION static void enable_if(
+      void (FunctorType::*)(value_type&) const);
+  KOKKOS_INLINE_FUNCTION static void enable_if(
+      void (FunctorType::*)(value_type&));
+  KOKKOS_INLINE_FUNCTION static void enable_if(void (*)(value_type&));
 
-  KOKKOS_INLINE_FUNCTION static void enable_if( void (FunctorType::*)( value_type & ) const );
-  KOKKOS_INLINE_FUNCTION static void enable_if( void (FunctorType::*)( value_type & ) );
-  KOKKOS_INLINE_FUNCTION static void enable_if( void (             *)( value_type & ) );
-
-  KOKKOS_INLINE_FUNCTION static void enable_if( void (FunctorType::*)( const value_type & ) const );
-  KOKKOS_INLINE_FUNCTION static void enable_if( void (FunctorType::*)( const value_type & ) );
-  KOKKOS_INLINE_FUNCTION static void enable_if( void (             *)( const value_type & ) );
+  KOKKOS_INLINE_FUNCTION static void enable_if(
+      void (FunctorType::*)(const value_type&) const);
+  KOKKOS_INLINE_FUNCTION static void enable_if(
+      void (FunctorType::*)(const value_type&));
+  KOKKOS_INLINE_FUNCTION static void enable_if(void (*)(const value_type&));
 };
 
-template< class FunctorType >
-struct FunctorFinalFunction< FunctorType , void , true > {
+template <class FunctorType>
+struct FunctorFinalFunction<FunctorType, void, true> {
+  typedef typename FunctorValueTraits<FunctorType, void>::value_type value_type;
 
-  typedef typename FunctorValueTraits<FunctorType,void>::value_type value_type ;
+  KOKKOS_INLINE_FUNCTION static void enable_if(
+      void (FunctorType::*)(value_type*) const);
+  KOKKOS_INLINE_FUNCTION static void enable_if(
+      void (FunctorType::*)(value_type*));
+  KOKKOS_INLINE_FUNCTION static void enable_if(void (*)(value_type*));
 
-  KOKKOS_INLINE_FUNCTION static void enable_if( void (FunctorType::*)( value_type * ) const );
-  KOKKOS_INLINE_FUNCTION static void enable_if( void (FunctorType::*)( value_type * ) );
-  KOKKOS_INLINE_FUNCTION static void enable_if( void (             *)( value_type * ) );
-
-  KOKKOS_INLINE_FUNCTION static void enable_if( void (FunctorType::*)( const value_type * ) const );
-  KOKKOS_INLINE_FUNCTION static void enable_if( void (FunctorType::*)( const value_type * ) );
-  KOKKOS_INLINE_FUNCTION static void enable_if( void (             *)( const value_type * ) );
+  KOKKOS_INLINE_FUNCTION static void enable_if(
+      void (FunctorType::*)(const value_type*) const);
+  KOKKOS_INLINE_FUNCTION static void enable_if(
+      void (FunctorType::*)(const value_type*));
+  KOKKOS_INLINE_FUNCTION static void enable_if(void (*)(const value_type*));
 };
 
 /* No 'final' function provided */
-template< class FunctorType , class ArgTag
-        , class ResultType = typename FunctorValueTraits<FunctorType,ArgTag>::reference_type
-        , class Enable = void >
-struct FunctorFinal
-{
-  KOKKOS_FORCEINLINE_FUNCTION static
-  void final( const FunctorType & , void * ) {}
+template <class FunctorType, class ArgTag,
+          class ResultType =
+              typename FunctorValueTraits<FunctorType, ArgTag>::reference_type,
+          class Enable = void>
+struct FunctorFinal {
+  KOKKOS_FORCEINLINE_FUNCTION static void final(const FunctorType&, void*) {}
 };
 
 /* 'final' function provided */
-template< class FunctorType , class ArgTag , class T >
-struct FunctorFinal
-  < FunctorType
-  , ArgTag
-  , T &
-    // First  substitution failure when FunctorType::final does not exist.
-    // Second substitution failure when enable_if( & Functor::final ) does not exist
-  , decltype( FunctorFinalFunction< FunctorType , ArgTag >::enable_if( & FunctorType::final ) )
-  >
-{
-  KOKKOS_FORCEINLINE_FUNCTION static
-  void final( const FunctorType & f , void * p ) { f.final( *((T*)p) ); }
+template <class FunctorType, class ArgTag, class T>
+struct FunctorFinal<FunctorType, ArgTag,
+                    T&
+                    // First  substitution failure when FunctorType::final does
+                    // not exist. Second substitution failure when enable_if( &
+                    // Functor::final ) does not exist
+                    ,
+                    decltype(
+                        FunctorFinalFunction<FunctorType, ArgTag>::enable_if(
+                            &FunctorType::final))> {
+  KOKKOS_FORCEINLINE_FUNCTION static void final(const FunctorType& f, void* p) {
+    f.final(*((T*)p));
+  }
 
-  KOKKOS_FORCEINLINE_FUNCTION static
-  void final( FunctorType & f , void * p ) { f.final( *((T*)p) ); }
+  KOKKOS_FORCEINLINE_FUNCTION static void final(FunctorType& f, void* p) {
+    f.final(*((T*)p));
+  }
 };
 
 /* 'final' function provided for array value */
-template< class FunctorType , class ArgTag , class T >
-struct FunctorFinal
-  < FunctorType
-  , ArgTag
-  , T *
-    // First  substitution failure when FunctorType::final does not exist.
-    // Second substitution failure when enable_if( & Functor::final ) does not exist
-  , decltype( FunctorFinalFunction< FunctorType , ArgTag >::enable_if( & FunctorType::final ) )
-  >
-{
-  KOKKOS_FORCEINLINE_FUNCTION static
-  void final( const FunctorType & f , void * p ) { f.final( (T*)p ); }
+template <class FunctorType, class ArgTag, class T>
+struct FunctorFinal<FunctorType, ArgTag,
+                    T*
+                    // First  substitution failure when FunctorType::final does
+                    // not exist. Second substitution failure when enable_if( &
+                    // Functor::final ) does not exist
+                    ,
+                    decltype(
+                        FunctorFinalFunction<FunctorType, ArgTag>::enable_if(
+                            &FunctorType::final))> {
+  KOKKOS_FORCEINLINE_FUNCTION static void final(const FunctorType& f, void* p) {
+    f.final((T*)p);
+  }
 
-  KOKKOS_FORCEINLINE_FUNCTION static
-  void final( FunctorType & f , void * p ) { f.final( (T*)p ); }
+  KOKKOS_FORCEINLINE_FUNCTION static void final(FunctorType& f, void* p) {
+    f.final((T*)p);
+  }
 };
 
-} // namespace Impl
-} // namespace Kokkos
+}  // namespace Impl
+}  // namespace Kokkos
 
 //----------------------------------------------------------------------------
 //----------------------------------------------------------------------------
@@ -1689,82 +2031,86 @@ struct FunctorFinal
 namespace Kokkos {
 namespace Impl {
 
-template< class FunctorType , class ArgTag
-        , class ReferenceType = typename FunctorValueTraits<FunctorType,ArgTag>::reference_type >
+template <class FunctorType, class ArgTag,
+          class ReferenceType =
+              typename FunctorValueTraits<FunctorType, ArgTag>::reference_type>
 struct FunctorApplyFunction {
-
-  KOKKOS_INLINE_FUNCTION static void enable_if( void (FunctorType::*)( ArgTag         , ReferenceType ) const );
-  KOKKOS_INLINE_FUNCTION static void enable_if( void (FunctorType::*)( ArgTag const & , ReferenceType ) const );
-  KOKKOS_INLINE_FUNCTION static void enable_if( void (FunctorType::*)( ArgTag         , ReferenceType ) );
-  KOKKOS_INLINE_FUNCTION static void enable_if( void (FunctorType::*)( ArgTag const & , ReferenceType ) );
-  KOKKOS_INLINE_FUNCTION static void enable_if( void (             *)( ArgTag         , ReferenceType ) );
-  KOKKOS_INLINE_FUNCTION static void enable_if( void (             *)( ArgTag const & , ReferenceType ) );
+  KOKKOS_INLINE_FUNCTION static void enable_if(
+      void (FunctorType::*)(ArgTag, ReferenceType) const);
+  KOKKOS_INLINE_FUNCTION static void enable_if(
+      void (FunctorType::*)(ArgTag const&, ReferenceType) const);
+  KOKKOS_INLINE_FUNCTION static void enable_if(
+      void (FunctorType::*)(ArgTag, ReferenceType));
+  KOKKOS_INLINE_FUNCTION static void enable_if(
+      void (FunctorType::*)(ArgTag const&, ReferenceType));
+  KOKKOS_INLINE_FUNCTION static void enable_if(void (*)(ArgTag, ReferenceType));
+  KOKKOS_INLINE_FUNCTION static void enable_if(void (*)(ArgTag const&,
+                                                        ReferenceType));
 };
 
-template< class FunctorType , class ReferenceType >
-struct FunctorApplyFunction< FunctorType , void , ReferenceType > {
-
-  KOKKOS_INLINE_FUNCTION static void enable_if( void (FunctorType::*)( ReferenceType ) const );
-  KOKKOS_INLINE_FUNCTION static void enable_if( void (FunctorType::*)( ReferenceType ) );
-  KOKKOS_INLINE_FUNCTION static void enable_if( void (             *)( ReferenceType ) );
+template <class FunctorType, class ReferenceType>
+struct FunctorApplyFunction<FunctorType, void, ReferenceType> {
+  KOKKOS_INLINE_FUNCTION static void enable_if(
+      void (FunctorType::*)(ReferenceType) const);
+  KOKKOS_INLINE_FUNCTION static void enable_if(
+      void (FunctorType::*)(ReferenceType));
+  KOKKOS_INLINE_FUNCTION static void enable_if(void (*)(ReferenceType));
 };
 
-template< class FunctorType >
-struct FunctorApplyFunction< FunctorType , void , void > {
-
-  KOKKOS_INLINE_FUNCTION static void enable_if( void (FunctorType::*)() const );
-  KOKKOS_INLINE_FUNCTION static void enable_if( void (FunctorType::*)() );
+template <class FunctorType>
+struct FunctorApplyFunction<FunctorType, void, void> {
+  KOKKOS_INLINE_FUNCTION static void enable_if(void (FunctorType::*)() const);
+  KOKKOS_INLINE_FUNCTION static void enable_if(void (FunctorType::*)());
 };
 
-template< class FunctorType , class ArgTag , class ReferenceType
-        , class Enable = void >
-struct FunctorApply
-{
-  KOKKOS_FORCEINLINE_FUNCTION static
-  void apply( const FunctorType & , void * ) {}
+template <class FunctorType, class ArgTag, class ReferenceType,
+          class Enable = void>
+struct FunctorApply {
+  KOKKOS_FORCEINLINE_FUNCTION static void apply(const FunctorType&, void*) {}
 };
 
 /* 'apply' function provided for void value */
-template< class FunctorType , class ArgTag >
-struct FunctorApply
-  < FunctorType
-  , ArgTag
-  , void
+template <class FunctorType, class ArgTag>
+struct FunctorApply<
+    FunctorType, ArgTag,
+    void
     // First  substitution failure when FunctorType::apply does not exist.
-    // Second substitution failure when enable_if( & Functor::apply ) does not exist
-  , decltype( FunctorApplyFunction< FunctorType , ArgTag , void >::enable_if( & FunctorType::apply ) )
-  >
-{
-  KOKKOS_FORCEINLINE_FUNCTION static
-  void apply( FunctorType & f ) { f.apply(); }
+    // Second substitution failure when enable_if( & Functor::apply ) does not
+    // exist
+    ,
+    decltype(FunctorApplyFunction<FunctorType, ArgTag, void>::enable_if(
+        &FunctorType::apply))> {
+  KOKKOS_FORCEINLINE_FUNCTION static void apply(FunctorType& f) { f.apply(); }
 
-  KOKKOS_FORCEINLINE_FUNCTION static
-  void apply( const FunctorType & f ) { f.apply(); }
+  KOKKOS_FORCEINLINE_FUNCTION static void apply(const FunctorType& f) {
+    f.apply();
+  }
 };
 
 /* 'apply' function provided for single value */
-template< class FunctorType , class ArgTag , class T >
-struct FunctorApply
-  < FunctorType
-  , ArgTag
-  , T &
-    // First  substitution failure when FunctorType::apply does not exist.
-    // Second substitution failure when enable_if( & Functor::apply ) does not exist
-  , decltype( FunctorApplyFunction< FunctorType , ArgTag >::enable_if( & FunctorType::apply ) )
-  >
-{
-  KOKKOS_FORCEINLINE_FUNCTION static
-  void apply( const FunctorType & f , void * p ) { f.apply( *((T*)p) ); }
+template <class FunctorType, class ArgTag, class T>
+struct FunctorApply<FunctorType, ArgTag,
+                    T&
+                    // First  substitution failure when FunctorType::apply does
+                    // not exist. Second substitution failure when enable_if( &
+                    // Functor::apply ) does not exist
+                    ,
+                    decltype(
+                        FunctorApplyFunction<FunctorType, ArgTag>::enable_if(
+                            &FunctorType::apply))> {
+  KOKKOS_FORCEINLINE_FUNCTION static void apply(const FunctorType& f, void* p) {
+    f.apply(*((T*)p));
+  }
 
-  KOKKOS_FORCEINLINE_FUNCTION static
-  void apply( FunctorType & f , void * p ) { f.apply( *((T*)p) ); }
+  KOKKOS_FORCEINLINE_FUNCTION static void apply(FunctorType& f, void* p) {
+    f.apply(*((T*)p));
+  }
 };
 
-} // namespace Impl
-} // namespace Kokkos
+}  // namespace Impl
+}  // namespace Kokkos
 
 //----------------------------------------------------------------------------
 //----------------------------------------------------------------------------
 
 #endif /* KOKKOS_FUNCTORADAPTER_HPP */
-
diff --git a/lib/kokkos/core/src/impl/Kokkos_FunctorAnalysis.hpp b/lib/kokkos/core/src/impl/Kokkos_FunctorAnalysis.hpp
index cc4b2af1a2..a8f3b5042a 100644
--- a/lib/kokkos/core/src/impl/Kokkos_FunctorAnalysis.hpp
+++ b/lib/kokkos/core/src/impl/Kokkos_FunctorAnalysis.hpp
@@ -1,13 +1,14 @@
 /*
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -36,7 +37,7 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 */
@@ -70,75 +71,74 @@ struct FunctorPatternInterface {
  *  For the REDUCE pattern generate a Reducer and finalization function
  *  derived from what is available within the functor.
  */
-template< typename PatternInterface , class Policy , class Functor >
+template <typename PatternInterface, class Policy, class Functor>
 struct FunctorAnalysis {
-private:
-
-  using FOR    = FunctorPatternInterface::FOR ;
-  using REDUCE = FunctorPatternInterface::REDUCE ;
-  using SCAN   = FunctorPatternInterface::SCAN ;
+ private:
+  using FOR    = FunctorPatternInterface::FOR;
+  using REDUCE = FunctorPatternInterface::REDUCE;
+  using SCAN   = FunctorPatternInterface::SCAN;
 
   //----------------------------------------
 
   struct VOID {};
 
-  template< typename P = Policy , typename = std::false_type >
-  struct has_work_tag
-    {
-      using type = void ;
-      using wtag = VOID ;
-    };
+  template <typename P = Policy, typename = std::false_type>
+  struct has_work_tag {
+    using type = void;
+    using wtag = VOID;
+  };
 
-  template< typename P >
-  struct has_work_tag
-    < P , typename std::is_same< typename P::work_tag , void >::type >
-    {
-      using type = typename P::work_tag ;
-      using wtag = typename P::work_tag ;
-    };
+  template <typename P>
+  struct has_work_tag<P,
+                      typename std::is_same<typename P::work_tag, void>::type> {
+    using type = typename P::work_tag;
+    using wtag = typename P::work_tag;
+  };
 
-  using Tag  = typename has_work_tag<>::type ;
-  using WTag = typename has_work_tag<>::wtag ;
+  using Tag  = typename has_work_tag<>::type;
+  using WTag = typename has_work_tag<>::wtag;
 
   //----------------------------------------
   // Check for T::execution_space
 
-  template< typename T , typename = std::false_type >
-  struct has_execution_space { using type = void ; enum { value = false }; };
+  template <typename T, typename = std::false_type>
+  struct has_execution_space {
+    using type = void;
+    enum { value = false };
+  };
 
-  template< typename T >
-  struct has_execution_space
-    < T , typename std::is_same< typename T::execution_space , void >::type >
-  {
-    using type = typename T::execution_space ;
+  template <typename T>
+  struct has_execution_space<
+      T, typename std::is_same<typename T::execution_space, void>::type> {
+    using type = typename T::execution_space;
     enum { value = true };
   };
 
-  using policy_has_space  = has_execution_space< Policy > ;
-  using functor_has_space = has_execution_space< Functor > ;
+  using policy_has_space  = has_execution_space<Policy>;
+  using functor_has_space = has_execution_space<Functor>;
 
-  static_assert( ! policy_has_space::value ||
-                 ! functor_has_space::value ||
-                 std::is_same< typename policy_has_space::type
-                             , typename functor_has_space::type >::value
-               , "Execution Policy and Functor execution space must match" );
+  static_assert(!policy_has_space::value || !functor_has_space::value ||
+                    std::is_same<typename policy_has_space::type,
+                                 typename functor_has_space::type>::value,
+                "Execution Policy and Functor execution space must match");
 
   //----------------------------------------
   // Check for Functor::value_type, which is either a simple type T or T[]
 
-  template< typename F , typename = std::false_type >
-  struct has_value_type { using type = void ; };
+  template <typename F, typename = std::false_type>
+  struct has_value_type {
+    using type = void;
+  };
 
-  template< typename F >
-  struct has_value_type
-    < F , typename std::is_same< typename F::value_type , void >::type >
-  {
-    using type = typename F::value_type ;
+  template <typename F>
+  struct has_value_type<
+      F, typename std::is_same<typename F::value_type, void>::type> {
+    using type = typename F::value_type;
 
-    static_assert( ! std::is_reference< type >::value &&
-                   std::rank< type >::value <= 1 &&
-                   std::extent< type >::value == 0
-                 , "Kokkos Functor::value_type is T or T[]" );
+    static_assert(!std::is_reference<type>::value &&
+                      std::rank<type>::value <= 1 &&
+                      std::extent<type>::value == 0,
+                  "Kokkos Functor::value_type is T or T[]");
   };
 
   //----------------------------------------
@@ -146,691 +146,666 @@ private:
   // depending upon the pattern and whether the policy has a work tag,
   // to determine the reduction or scan value_type.
 
-  template< typename F
-          , typename P = PatternInterface
-          , typename V = typename has_value_type<F>::type
-          , bool     T = std::is_same< Tag , void >::value
-          >
-  struct deduce_value_type { using type = V ; };
-
-  template< typename F >
-  struct deduce_value_type< F , REDUCE , void , true > {
-
-    template< typename M , typename A >
-    KOKKOS_INLINE_FUNCTION static
-    A deduce( void (Functor::*)( M , A & ) const );
-
-    template< typename M , typename A >
-    KOKKOS_INLINE_FUNCTION static
-    A deduce( void (Functor::*)( M , M , A & ) const );
-
-    template< typename M , typename A >
-    KOKKOS_INLINE_FUNCTION static
-    A deduce( void (Functor::*)( M , M , M , A & ) const );
-
-    template< typename M , typename A >
-    KOKKOS_INLINE_FUNCTION static
-    A deduce( void (Functor::*)( M , M , M , M , A & ) const );
-
-    template< typename M , typename A >
-    KOKKOS_INLINE_FUNCTION static
-    A deduce( void (Functor::*)( M , M , M , M , M , A & ) const );
-
-    template< typename M , typename A >
-    KOKKOS_INLINE_FUNCTION static
-    A deduce( void (Functor::*)( M , M , M , M , M , M , A & ) const );
-
-    template< typename M , typename A >
-    KOKKOS_INLINE_FUNCTION static
-    A deduce( void (Functor::*)( M , M , M , M , M , M , M , A & ) const );
-
-    template< typename M , typename A >
-    KOKKOS_INLINE_FUNCTION static
-    A deduce( void (Functor::*)( M , M , M , M , M , M , M , M , A & ) const );
-
-    using type = decltype( deduce( & F::operator() ) );
+  template <typename F, typename P = PatternInterface,
+            typename V = typename has_value_type<F>::type,
+            bool T     = std::is_same<Tag, void>::value>
+  struct deduce_value_type {
+    using type = V;
   };
 
-  template< typename F >
-  struct deduce_value_type< F , REDUCE , void , false > {
+  template <typename F>
+  struct deduce_value_type<F, REDUCE, void, true> {
+    template <typename M, typename A>
+    KOKKOS_INLINE_FUNCTION static A deduce(void (Functor::*)(M, A&) const);
 
-    template< typename M , typename A >
-    KOKKOS_INLINE_FUNCTION static
-    A deduce( void (Functor::*)( WTag , M , A & ) const );
+    template <typename M, typename A>
+    KOKKOS_INLINE_FUNCTION static A deduce(void (Functor::*)(M, M, A&) const);
 
-    template< typename M , typename A >
-    KOKKOS_INLINE_FUNCTION static
-    A deduce( void (Functor::*)( WTag , M , M , A & ) const );
+    template <typename M, typename A>
+    KOKKOS_INLINE_FUNCTION static A deduce(void (Functor::*)(M, M, M, A&)
+                                               const);
 
-    template< typename M , typename A >
-    KOKKOS_INLINE_FUNCTION static
-    A deduce( void (Functor::*)( WTag , M , M , M , A & ) const );
+    template <typename M, typename A>
+    KOKKOS_INLINE_FUNCTION static A deduce(void (Functor::*)(M, M, M, M, A&)
+                                               const);
 
-    template< typename M , typename A >
-    KOKKOS_INLINE_FUNCTION static
-    A deduce( void (Functor::*)( WTag , M , M , M , M , A & ) const );
+    template <typename M, typename A>
+    KOKKOS_INLINE_FUNCTION static A deduce(void (Functor::*)(M, M, M, M, M, A&)
+                                               const);
 
-    template< typename M , typename A >
-    KOKKOS_INLINE_FUNCTION static
-    A deduce( void (Functor::*)( WTag , M , M , M , M , M , A & ) const );
+    template <typename M, typename A>
+    KOKKOS_INLINE_FUNCTION static A deduce(void (Functor::*)(M, M, M, M, M, M,
+                                                             A&) const);
 
-    template< typename M , typename A >
-    KOKKOS_INLINE_FUNCTION static
-    A deduce( void (Functor::*)( WTag , M , M , M , M , M , M , A & ) const );
+    template <typename M, typename A>
+    KOKKOS_INLINE_FUNCTION static A deduce(void (Functor::*)(M, M, M, M, M, M,
+                                                             M, A&) const);
 
-    template< typename M , typename A >
-    KOKKOS_INLINE_FUNCTION static
-    A deduce( void (Functor::*)( WTag , M , M , M , M , M , M , M , A & ) const );
+    template <typename M, typename A>
+    KOKKOS_INLINE_FUNCTION static A deduce(void (Functor::*)(M, M, M, M, M, M,
+                                                             M, M, A&) const);
 
-    template< typename M , typename A >
-    KOKKOS_INLINE_FUNCTION static
-    A deduce( void (Functor::*)( WTag , M , M , M , M , M , M , M , M , A & ) const );
-
-
-    template< typename M , typename A >
-    KOKKOS_INLINE_FUNCTION static
-    A deduce( void (Functor::*)( WTag const & , M , A & ) const );
-
-    template< typename M , typename A >
-    KOKKOS_INLINE_FUNCTION static
-    A deduce( void (Functor::*)( WTag const & , M , M , A & ) const );
-
-    template< typename M , typename A >
-    KOKKOS_INLINE_FUNCTION static
-    A deduce( void (Functor::*)( WTag const & , M , M , M , A & ) const );
-
-    template< typename M , typename A >
-    KOKKOS_INLINE_FUNCTION static
-    A deduce( void (Functor::*)( WTag const & , M , M , M , M , A & ) const );
-
-    template< typename M , typename A >
-    KOKKOS_INLINE_FUNCTION static
-    A deduce( void (Functor::*)( WTag const & , M , M , M , M , M , A & ) const );
-
-    template< typename M , typename A >
-    KOKKOS_INLINE_FUNCTION static
-    A deduce( void (Functor::*)( WTag const & , M , M , M , M , M , M , A & ) const );
-
-    template< typename M , typename A >
-    KOKKOS_INLINE_FUNCTION static
-    A deduce( void (Functor::*)( WTag const & , M , M , M , M , M , M , M , A & ) const );
-
-    template< typename M , typename A >
-    KOKKOS_INLINE_FUNCTION static
-    A deduce( void (Functor::*)( WTag const & , M , M , M , M , M , M , M , M , A & ) const );
-
-    using type = decltype( deduce( & F::operator() ) );
+    using type = decltype(deduce(&F::operator()));
   };
 
-  template< typename F >
-  struct deduce_value_type< F , SCAN , void , true > {
+  template <typename F>
+  struct deduce_value_type<F, REDUCE, void, false> {
+    template <typename M, typename A>
+    KOKKOS_INLINE_FUNCTION static A deduce(void (Functor::*)(WTag, M, A&)
+                                               const);
 
-    template< typename M , typename A , typename I >
-    KOKKOS_INLINE_FUNCTION static
-    A deduce( void (Functor::*)( M , A & , I ) const );
+    template <typename M, typename A>
+    KOKKOS_INLINE_FUNCTION static A deduce(void (Functor::*)(WTag, M, M, A&)
+                                               const);
 
-    using type = decltype( deduce( & F::operator() ) );
+    template <typename M, typename A>
+    KOKKOS_INLINE_FUNCTION static A deduce(void (Functor::*)(WTag, M, M, M, A&)
+                                               const);
+
+    template <typename M, typename A>
+    KOKKOS_INLINE_FUNCTION static A deduce(void (Functor::*)(WTag, M, M, M, M,
+                                                             A&) const);
+
+    template <typename M, typename A>
+    KOKKOS_INLINE_FUNCTION static A deduce(void (Functor::*)(WTag, M, M, M, M,
+                                                             M, A&) const);
+
+    template <typename M, typename A>
+    KOKKOS_INLINE_FUNCTION static A deduce(void (Functor::*)(WTag, M, M, M, M,
+                                                             M, M, A&) const);
+
+    template <typename M, typename A>
+    KOKKOS_INLINE_FUNCTION static A deduce(void (Functor::*)(WTag, M, M, M, M,
+                                                             M, M, M, A&)
+                                               const);
+
+    template <typename M, typename A>
+    KOKKOS_INLINE_FUNCTION static A deduce(void (Functor::*)(WTag, M, M, M, M,
+                                                             M, M, M, M, A&)
+                                               const);
+
+    template <typename M, typename A>
+    KOKKOS_INLINE_FUNCTION static A deduce(void (Functor::*)(WTag const&, M, A&)
+                                               const);
+
+    template <typename M, typename A>
+    KOKKOS_INLINE_FUNCTION static A deduce(void (Functor::*)(WTag const&, M, M,
+                                                             A&) const);
+
+    template <typename M, typename A>
+    KOKKOS_INLINE_FUNCTION static A deduce(void (Functor::*)(WTag const&, M, M,
+                                                             M, A&) const);
+
+    template <typename M, typename A>
+    KOKKOS_INLINE_FUNCTION static A deduce(void (Functor::*)(WTag const&, M, M,
+                                                             M, M, A&) const);
+
+    template <typename M, typename A>
+    KOKKOS_INLINE_FUNCTION static A deduce(void (Functor::*)(WTag const&, M, M,
+                                                             M, M, M, A&)
+                                               const);
+
+    template <typename M, typename A>
+    KOKKOS_INLINE_FUNCTION static A deduce(void (Functor::*)(WTag const&, M, M,
+                                                             M, M, M, M, A&)
+                                               const);
+
+    template <typename M, typename A>
+    KOKKOS_INLINE_FUNCTION static A deduce(void (Functor::*)(WTag const&, M, M,
+                                                             M, M, M, M, M, A&)
+                                               const);
+
+    template <typename M, typename A>
+    KOKKOS_INLINE_FUNCTION static A deduce(void (Functor::*)(WTag const&, M, M,
+                                                             M, M, M, M, M, M,
+                                                             A&) const);
+
+    using type = decltype(deduce(&F::operator()));
   };
 
-  template< typename F >
-  struct deduce_value_type< F , SCAN , void , false > {
+  template <typename F>
+  struct deduce_value_type<F, SCAN, void, true> {
+    template <typename M, typename A, typename I>
+    KOKKOS_INLINE_FUNCTION static A deduce(void (Functor::*)(M, A&, I) const);
 
-    template< typename M , typename A , typename I >
-    KOKKOS_INLINE_FUNCTION static
-    A deduce( void (Functor::*)( WTag , M , A & , I ) const );
+    using type = decltype(deduce(&F::operator()));
+  };
 
-    template< typename M , typename A , typename I >
-    KOKKOS_INLINE_FUNCTION static
-    A deduce( void (Functor::*)( WTag const & , M , A & , I ) const );
+  template <typename F>
+  struct deduce_value_type<F, SCAN, void, false> {
+    template <typename M, typename A, typename I>
+    KOKKOS_INLINE_FUNCTION static A deduce(void (Functor::*)(WTag, M, A&, I)
+                                               const);
 
-    using type = decltype( deduce( & F::operator() ) );
+    template <typename M, typename A, typename I>
+    KOKKOS_INLINE_FUNCTION static A deduce(void (Functor::*)(WTag const&, M, A&,
+                                                             I) const);
+
+    using type = decltype(deduce(&F::operator()));
   };
 
   //----------------------------------------
 
-  using candidate_type = typename deduce_value_type< Functor >::type ;
+  using candidate_type = typename deduce_value_type<Functor>::type;
 
-  enum { candidate_is_void  = std::is_same< candidate_type , void >::value
-       , candidate_is_array = std::rank< candidate_type >::value == 1 };
+  enum {
+    candidate_is_void  = std::is_same<candidate_type, void>::value,
+    candidate_is_array = std::rank<candidate_type>::value == 1
+  };
 
   //----------------------------------------
 
-public:
+ public:
+  using execution_space = typename std::conditional<
+      functor_has_space::value, typename functor_has_space::type,
+      typename std::conditional<policy_has_space::value,
+                                typename policy_has_space::type,
+                                Kokkos::DefaultExecutionSpace>::type>::type;
 
-  using execution_space = typename std::conditional
-    < functor_has_space::value
-    , typename functor_has_space::type
-    , typename std::conditional
-      < policy_has_space::value
-      , typename policy_has_space::type
-      , Kokkos::DefaultExecutionSpace
-      >::type
-    >::type ;
+  using value_type = typename std::remove_extent<candidate_type>::type;
 
-  using value_type = typename std::remove_extent< candidate_type >::type ;
-
-  static_assert( ! std::is_const< value_type >::value
-               , "Kokkos functor operator reduce argument cannot be const" );
-
-private:
+  static_assert(!std::is_const<value_type>::value,
+                "Kokkos functor operator reduce argument cannot be const");
 
+ private:
   // Stub to avoid defining a type 'void &'
-  using ValueType = typename
-    std::conditional< candidate_is_void , VOID , value_type >::type ;
+  using ValueType =
+      typename std::conditional<candidate_is_void, VOID, value_type>::type;
 
-public:
+ public:
+  using pointer_type =
+      typename std::conditional<candidate_is_void, void, ValueType*>::type;
 
-  using pointer_type = typename
-    std::conditional< candidate_is_void , void , ValueType * >::type ;
+  using reference_type = typename std::conditional<
+      candidate_is_array, ValueType*,
+      typename std::conditional<!candidate_is_void, ValueType&,
+                                void>::type>::type;
 
-  using reference_type = typename
-    std::conditional< candidate_is_array  , ValueType * , typename
-    std::conditional< ! candidate_is_void , ValueType & , void >
-    ::type >::type ;
-
-private:
-
-  template< bool IsArray , class FF >
+ private:
+  template <bool IsArray, class FF>
   KOKKOS_INLINE_FUNCTION static constexpr
-  typename std::enable_if< IsArray , unsigned >::type
-  get_length( FF const & f ) { return f.value_count ; }
+      typename std::enable_if<IsArray, unsigned>::type
+      get_length(FF const& f) {
+    return f.value_count;
+  }
 
-  template< bool IsArray , class FF >
+  template <bool IsArray, class FF>
   KOKKOS_INLINE_FUNCTION static constexpr
-  typename std::enable_if< ! IsArray , unsigned >::type
-  get_length( FF const & ) { return candidate_is_void ? 0 : 1 ; }
+      typename std::enable_if<!IsArray, unsigned>::type
+      get_length(FF const&) {
+    return candidate_is_void ? 0 : 1;
+  }
 
-public:
+ public:
+  enum {
+    StaticValueSize =
+        !candidate_is_void && !candidate_is_array ? sizeof(ValueType) : 0
+  };
 
-  enum { StaticValueSize = ! candidate_is_void &&
-                           ! candidate_is_array
-                         ? sizeof(ValueType) : 0 };
+  KOKKOS_FORCEINLINE_FUNCTION static constexpr unsigned value_count(
+      const Functor& f) {
+    return FunctorAnalysis::template get_length<candidate_is_array>(f);
+  }
 
-  KOKKOS_FORCEINLINE_FUNCTION static constexpr
-  unsigned value_count( const Functor & f )
-    { return FunctorAnalysis::template get_length< candidate_is_array >(f); }
-
-  KOKKOS_FORCEINLINE_FUNCTION static constexpr
-  unsigned value_size( const Functor & f )
-    { return FunctorAnalysis::template get_length< candidate_is_array >(f) * sizeof(ValueType); }
+  KOKKOS_FORCEINLINE_FUNCTION static constexpr unsigned value_size(
+      const Functor& f) {
+    return FunctorAnalysis::template get_length<candidate_is_array>(f) *
+           sizeof(ValueType);
+  }
 
   //----------------------------------------
 
-  template< class Unknown >
-  KOKKOS_FORCEINLINE_FUNCTION static constexpr
-  unsigned value_count( const Unknown & )
-    { return candidate_is_void ? 0 : 1  ; }
+  template <class Unknown>
+  KOKKOS_FORCEINLINE_FUNCTION static constexpr unsigned value_count(
+      const Unknown&) {
+    return candidate_is_void ? 0 : 1;
+  }
 
-  template< class Unknown >
-  KOKKOS_FORCEINLINE_FUNCTION static constexpr
-  unsigned value_size( const Unknown & )
-    { return candidate_is_void ? 0 : sizeof(ValueType); }
+  template <class Unknown>
+  KOKKOS_FORCEINLINE_FUNCTION static constexpr unsigned value_size(
+      const Unknown&) {
+    return candidate_is_void ? 0 : sizeof(ValueType);
+  }
 
-private:
-
-  enum INTERFACE : int
-    { DISABLE           = 0
-    , NO_TAG_NOT_ARRAY  = 1
-    , NO_TAG_IS_ARRAY   = 2
-    , HAS_TAG_NOT_ARRAY = 3
-    , HAS_TAG_IS_ARRAY  = 4
-    , DEDUCED =
-       ! std::is_same< PatternInterface , REDUCE >::value ? DISABLE : (
-       std::is_same<Tag,void>::value
-         ? (candidate_is_array ? NO_TAG_IS_ARRAY  : NO_TAG_NOT_ARRAY)
-         : (candidate_is_array ? HAS_TAG_IS_ARRAY : HAS_TAG_NOT_ARRAY) )
-    };
+ private:
+  enum INTERFACE : int {
+    DISABLE           = 0,
+    NO_TAG_NOT_ARRAY  = 1,
+    NO_TAG_IS_ARRAY   = 2,
+    HAS_TAG_NOT_ARRAY = 3,
+    HAS_TAG_IS_ARRAY  = 4,
+    DEDUCED =
+        !std::is_same<PatternInterface, REDUCE>::value
+            ? DISABLE
+            : (std::is_same<Tag, void>::value
+                   ? (candidate_is_array ? NO_TAG_IS_ARRAY : NO_TAG_NOT_ARRAY)
+                   : (candidate_is_array ? HAS_TAG_IS_ARRAY
+                                         : HAS_TAG_NOT_ARRAY))
+  };
 
   //----------------------------------------
   // parallel_reduce join operator
 
-  template< class F , INTERFACE >
-  struct has_join_function ;
+  template <class F, INTERFACE>
+  struct has_join_function;
 
-  template< class F >
-  struct has_join_function< F , NO_TAG_NOT_ARRAY >
-    {
-      typedef volatile       ValueType & vref_type ;
-      typedef volatile const ValueType & cvref_type ;
+  template <class F>
+  struct has_join_function<F, NO_TAG_NOT_ARRAY> {
+    typedef volatile ValueType& vref_type;
+    typedef volatile const ValueType& cvref_type;
 
-      KOKKOS_INLINE_FUNCTION static
-      void enable_if( void (F::*)( vref_type , cvref_type ) const );
+    KOKKOS_INLINE_FUNCTION static void enable_if(void (F::*)(vref_type,
+                                                             cvref_type) const);
 
-      KOKKOS_INLINE_FUNCTION static
-      void enable_if( void (*)( vref_type , cvref_type ) );
+    KOKKOS_INLINE_FUNCTION static void enable_if(void (*)(vref_type,
+                                                          cvref_type));
 
-      KOKKOS_INLINE_FUNCTION static
-      void join( F const * const f
-               , ValueType volatile * dst
-               , ValueType volatile const * src )
-        { f->join( *dst , *src ); }
-    };
+    KOKKOS_INLINE_FUNCTION static void join(F const* const f,
+                                            ValueType volatile* dst,
+                                            ValueType volatile const* src) {
+      f->join(*dst, *src);
+    }
+  };
 
-  template< class F >
-  struct has_join_function< F , NO_TAG_IS_ARRAY >
-    {
-      typedef volatile       ValueType * vref_type ;
-      typedef volatile const ValueType * cvref_type ;
+  template <class F>
+  struct has_join_function<F, NO_TAG_IS_ARRAY> {
+    typedef volatile ValueType* vref_type;
+    typedef volatile const ValueType* cvref_type;
 
-      KOKKOS_INLINE_FUNCTION static
-      void enable_if( void (F::*)( vref_type , cvref_type ) const );
+    KOKKOS_INLINE_FUNCTION static void enable_if(void (F::*)(vref_type,
+                                                             cvref_type) const);
 
-      KOKKOS_INLINE_FUNCTION static
-      void enable_if( void (*)( vref_type , cvref_type ) );
+    KOKKOS_INLINE_FUNCTION static void enable_if(void (*)(vref_type,
+                                                          cvref_type));
 
-      KOKKOS_INLINE_FUNCTION static
-      void join( F const * const f
-               , ValueType volatile * dst
-               , ValueType volatile const * src )
-        { f->join( dst , src ); }
-    };
+    KOKKOS_INLINE_FUNCTION static void join(F const* const f,
+                                            ValueType volatile* dst,
+                                            ValueType volatile const* src) {
+      f->join(dst, src);
+    }
+  };
 
-  template< class F >
-  struct has_join_function< F , HAS_TAG_NOT_ARRAY >
-    {
-      typedef volatile       ValueType & vref_type ;
-      typedef volatile const ValueType & cvref_type ;
+  template <class F>
+  struct has_join_function<F, HAS_TAG_NOT_ARRAY> {
+    typedef volatile ValueType& vref_type;
+    typedef volatile const ValueType& cvref_type;
 
-      KOKKOS_INLINE_FUNCTION static
-      void enable_if( void (F::*)( WTag , vref_type , cvref_type ) const );
+    KOKKOS_INLINE_FUNCTION static void enable_if(void (F::*)(WTag, vref_type,
+                                                             cvref_type) const);
 
-      KOKKOS_INLINE_FUNCTION static
-      void enable_if( void (*)( WTag , vref_type , cvref_type ) );
+    KOKKOS_INLINE_FUNCTION static void enable_if(void (*)(WTag, vref_type,
+                                                          cvref_type));
 
-      KOKKOS_INLINE_FUNCTION static
-      void enable_if( void (F::*)( WTag const & , vref_type , cvref_type ) const );
+    KOKKOS_INLINE_FUNCTION static void enable_if(void (F::*)(WTag const&,
+                                                             vref_type,
+                                                             cvref_type) const);
 
-      KOKKOS_INLINE_FUNCTION static
-      void enable_if( void (*)( WTag const & , vref_type , cvref_type ) );
+    KOKKOS_INLINE_FUNCTION static void enable_if(void (*)(WTag const&,
+                                                          vref_type,
+                                                          cvref_type));
 
-      KOKKOS_INLINE_FUNCTION static
-      void join( F const * const f
-               , ValueType volatile * dst
-               , ValueType volatile const * src )
-        { f->join( WTag() , *dst , *src ); }
-    };
+    KOKKOS_INLINE_FUNCTION static void join(F const* const f,
+                                            ValueType volatile* dst,
+                                            ValueType volatile const* src) {
+      f->join(WTag(), *dst, *src);
+    }
+  };
 
-  template< class F >
-  struct has_join_function< F , HAS_TAG_IS_ARRAY >
-    {
-      typedef volatile       ValueType * vref_type ;
-      typedef volatile const ValueType * cvref_type ;
+  template <class F>
+  struct has_join_function<F, HAS_TAG_IS_ARRAY> {
+    typedef volatile ValueType* vref_type;
+    typedef volatile const ValueType* cvref_type;
 
-      KOKKOS_INLINE_FUNCTION static
-      void enable_if( void (F::*)( WTag , vref_type , cvref_type ) const );
+    KOKKOS_INLINE_FUNCTION static void enable_if(void (F::*)(WTag, vref_type,
+                                                             cvref_type) const);
 
-      KOKKOS_INLINE_FUNCTION static
-      void enable_if( void (*)( WTag , vref_type , cvref_type ) );
+    KOKKOS_INLINE_FUNCTION static void enable_if(void (*)(WTag, vref_type,
+                                                          cvref_type));
 
-      KOKKOS_INLINE_FUNCTION static
-      void enable_if( void (F::*)( WTag const & , vref_type , cvref_type ) const );
+    KOKKOS_INLINE_FUNCTION static void enable_if(void (F::*)(WTag const&,
+                                                             vref_type,
+                                                             cvref_type) const);
 
-      KOKKOS_INLINE_FUNCTION static
-      void enable_if( void (*)( WTag const & , vref_type , cvref_type ) );
+    KOKKOS_INLINE_FUNCTION static void enable_if(void (*)(WTag const&,
+                                                          vref_type,
+                                                          cvref_type));
 
-      KOKKOS_INLINE_FUNCTION static
-      void join( F const * const f
-               , ValueType volatile * dst
-               , ValueType volatile const * src )
-        { f->join( WTag() , dst , src ); }
-    };
+    KOKKOS_INLINE_FUNCTION static void join(F const* const f,
+                                            ValueType volatile* dst,
+                                            ValueType volatile const* src) {
+      f->join(WTag(), dst, src);
+    }
+  };
 
+  template <class F = Functor, INTERFACE = DEDUCED, typename = void>
+  struct DeduceJoin {
+    enum { value = false };
 
-  template< class F   = Functor
-          , INTERFACE = DEDUCED
-          , typename  = void >
-  struct DeduceJoin
-    {
-      enum { value = false };
+    KOKKOS_INLINE_FUNCTION static void join(F const* const f,
+                                            ValueType volatile* dst,
+                                            ValueType volatile const* src) {
+      const int n = FunctorAnalysis::value_count(*f);
+      for (int i = 0; i < n; ++i) dst[i] += src[i];
+    }
+  };
 
-      KOKKOS_INLINE_FUNCTION static
-      void join( F const * const f
-               , ValueType volatile * dst
-               , ValueType volatile const * src )
-       {
-         const int n = FunctorAnalysis::value_count( *f );
-         for ( int i = 0 ; i < n ; ++i ) dst[i] += src[i];
-       }
-    };
+  template <class F>
+  struct DeduceJoin<F, DISABLE, void> {
+    enum { value = false };
 
-  template< class F >
-  struct DeduceJoin< F , DISABLE , void >
-    {
-      enum { value = false };
+    KOKKOS_INLINE_FUNCTION static void join(F const* const, ValueType volatile*,
+                                            ValueType volatile const*) {}
+  };
 
-      KOKKOS_INLINE_FUNCTION static
-      void join( F const * const
-               , ValueType volatile *
-               , ValueType volatile const * ) {}
-    };
-
-  template< class F , INTERFACE I >
-  struct DeduceJoin< F , I ,
-    decltype( has_join_function<F,I>::enable_if( & F::join ) ) >
-    : public has_join_function<F,I>
-    { enum { value = true }; };
+  template <class F, INTERFACE I>
+  struct DeduceJoin<F, I,
+                    decltype(has_join_function<F, I>::enable_if(&F::join))>
+      : public has_join_function<F, I> {
+    enum { value = true };
+  };
 
   //----------------------------------------
 
-  template< class , INTERFACE >
-  struct has_init_function ;
+  template <class, INTERFACE>
+  struct has_init_function;
 
-  template< class F >
-  struct has_init_function< F , NO_TAG_NOT_ARRAY >
-    {
-      KOKKOS_INLINE_FUNCTION static
-      void enable_if( void (F::*)( ValueType & ) const );
+  template <class F>
+  struct has_init_function<F, NO_TAG_NOT_ARRAY> {
+    KOKKOS_INLINE_FUNCTION static void enable_if(void (F::*)(ValueType&) const);
 
-      KOKKOS_INLINE_FUNCTION static
-      void enable_if( void (*)( ValueType & ) );
+    KOKKOS_INLINE_FUNCTION static void enable_if(void (*)(ValueType&));
 
-      KOKKOS_INLINE_FUNCTION static
-      void init( F const * const f , ValueType * dst )
-        { f->init( *dst ); }
-    };
+    KOKKOS_INLINE_FUNCTION static void init(F const* const f, ValueType* dst) {
+      f->init(*dst);
+    }
+  };
 
-  template< class F >
-  struct has_init_function< F , NO_TAG_IS_ARRAY >
-    {
-      KOKKOS_INLINE_FUNCTION static
-      void enable_if( void (F::*)( ValueType * ) const );
+  template <class F>
+  struct has_init_function<F, NO_TAG_IS_ARRAY> {
+    KOKKOS_INLINE_FUNCTION static void enable_if(void (F::*)(ValueType*) const);
 
-      KOKKOS_INLINE_FUNCTION static
-      void enable_if( void (*)( ValueType * ) );
+    KOKKOS_INLINE_FUNCTION static void enable_if(void (*)(ValueType*));
 
-      KOKKOS_INLINE_FUNCTION static
-      void init( F const * const f , ValueType * dst )
-        { f->init( dst ); }
-    };
+    KOKKOS_INLINE_FUNCTION static void init(F const* const f, ValueType* dst) {
+      f->init(dst);
+    }
+  };
 
-  template< class F >
-  struct has_init_function< F , HAS_TAG_NOT_ARRAY >
-    {
-      KOKKOS_INLINE_FUNCTION static
-      void enable_if( void (F::*)( WTag , ValueType & ) const );
+  template <class F>
+  struct has_init_function<F, HAS_TAG_NOT_ARRAY> {
+    KOKKOS_INLINE_FUNCTION static void enable_if(void (F::*)(WTag, ValueType&)
+                                                     const);
 
-      KOKKOS_INLINE_FUNCTION static
-      void enable_if( void (F::*)( WTag const & , ValueType & ) const );
+    KOKKOS_INLINE_FUNCTION static void enable_if(void (F::*)(WTag const&,
+                                                             ValueType&) const);
 
-      KOKKOS_INLINE_FUNCTION static
-      void enable_if( void (*)( WTag , ValueType & ) );
+    KOKKOS_INLINE_FUNCTION static void enable_if(void (*)(WTag, ValueType&));
 
-      KOKKOS_INLINE_FUNCTION static
-      void enable_if( void (*)( WTag const & , ValueType & ) );
+    KOKKOS_INLINE_FUNCTION static void enable_if(void (*)(WTag const&,
+                                                          ValueType&));
 
-      KOKKOS_INLINE_FUNCTION static
-      void init( F const * const f , ValueType * dst )
-        { f->init( WTag(), *dst ); }
-    };
+    KOKKOS_INLINE_FUNCTION static void init(F const* const f, ValueType* dst) {
+      f->init(WTag(), *dst);
+    }
+  };
 
-  template< class F >
-  struct has_init_function< F , HAS_TAG_IS_ARRAY >
-    {
-      KOKKOS_INLINE_FUNCTION static
-      void enable_if( void (F::*)( WTag , ValueType * ) const );
+  template <class F>
+  struct has_init_function<F, HAS_TAG_IS_ARRAY> {
+    KOKKOS_INLINE_FUNCTION static void enable_if(void (F::*)(WTag, ValueType*)
+                                                     const);
 
-      KOKKOS_INLINE_FUNCTION static
-      void enable_if( void (F::*)( WTag const & , ValueType * ) const );
+    KOKKOS_INLINE_FUNCTION static void enable_if(void (F::*)(WTag const&,
+                                                             ValueType*) const);
 
-      KOKKOS_INLINE_FUNCTION static
-      void enable_if( void (*)( WTag , ValueType * ) );
+    KOKKOS_INLINE_FUNCTION static void enable_if(void (*)(WTag, ValueType*));
 
-      KOKKOS_INLINE_FUNCTION static
-      void enable_if( void (*)( WTag const & , ValueType * ) );
+    KOKKOS_INLINE_FUNCTION static void enable_if(void (*)(WTag const&,
+                                                          ValueType*));
 
-      KOKKOS_INLINE_FUNCTION static
-      void init( F const * const f , ValueType * dst )
-        { f->init( WTag(), dst ); }
-    };
+    KOKKOS_INLINE_FUNCTION static void init(F const* const f, ValueType* dst) {
+      f->init(WTag(), dst);
+    }
+  };
 
-  template< class F   = Functor
-          , INTERFACE = DEDUCED
-          , typename  = void >
-  struct DeduceInit
-    {
-      enum { value = false };
+  template <class F = Functor, INTERFACE = DEDUCED, typename = void>
+  struct DeduceInit {
+    enum { value = false };
 
-      KOKKOS_INLINE_FUNCTION static
-      void init( F const * const , ValueType * dst ) { new(dst) ValueType(); }
-    };
+    KOKKOS_INLINE_FUNCTION static void init(F const* const, ValueType* dst) {
+      new (dst) ValueType();
+    }
+  };
 
-  template< class F >
-  struct DeduceInit< F , DISABLE , void >
-    {
-      enum { value = false };
+  template <class F>
+  struct DeduceInit<F, DISABLE, void> {
+    enum { value = false };
 
-      KOKKOS_INLINE_FUNCTION static
-      void init( F const * const , ValueType * ) {}
-    };
+    KOKKOS_INLINE_FUNCTION static void init(F const* const, ValueType*) {}
+  };
 
-  template< class F , INTERFACE I >
-  struct DeduceInit< F , I ,
-    decltype( has_init_function<F,I>::enable_if( & F::init ) ) >
-    : public has_init_function<F,I>
-    { enum { value = true }; };
+  template <class F, INTERFACE I>
+  struct DeduceInit<F, I,
+                    decltype(has_init_function<F, I>::enable_if(&F::init))>
+      : public has_init_function<F, I> {
+    enum { value = true };
+  };
 
   //----------------------------------------
 
-  template< class , INTERFACE >
-  struct has_final_function ;
+  template <class, INTERFACE>
+  struct has_final_function;
 
   // No tag, not array
-  template< class F >
-  struct has_final_function< F , NO_TAG_NOT_ARRAY >
-    {
-      KOKKOS_INLINE_FUNCTION static
-      void enable_if( void (F::*)( ValueType & ) const );
+  template <class F>
+  struct has_final_function<F, NO_TAG_NOT_ARRAY> {
+    KOKKOS_INLINE_FUNCTION static void enable_if(void (F::*)(ValueType&) const);
 
-      KOKKOS_INLINE_FUNCTION static
-      void enable_if( void (*)( ValueType & ) );
+    KOKKOS_INLINE_FUNCTION static void enable_if(void (*)(ValueType&));
 
-      KOKKOS_INLINE_FUNCTION static
-      void final( F const * const f , ValueType * dst )
-        { f->final( *dst ); }
-    };
+    KOKKOS_INLINE_FUNCTION static void final(F const* const f, ValueType* dst) {
+      f->final(*dst);
+    }
+  };
 
   // No tag, is array
-  template< class F >
-  struct has_final_function< F , NO_TAG_IS_ARRAY >
-    {
-      KOKKOS_INLINE_FUNCTION static
-      void enable_if( void (F::*)( ValueType * ) const );
+  template <class F>
+  struct has_final_function<F, NO_TAG_IS_ARRAY> {
+    KOKKOS_INLINE_FUNCTION static void enable_if(void (F::*)(ValueType*) const);
 
-      KOKKOS_INLINE_FUNCTION static
-      void enable_if( void (*)( ValueType * ) );
+    KOKKOS_INLINE_FUNCTION static void enable_if(void (*)(ValueType*));
 
-      KOKKOS_INLINE_FUNCTION static
-      void final( F const * const f , ValueType * dst )
-        { f->final( dst ); }
-    };
+    KOKKOS_INLINE_FUNCTION static void final(F const* const f, ValueType* dst) {
+      f->final(dst);
+    }
+  };
 
   // Has tag, not array
-  template< class F >
-  struct has_final_function< F , HAS_TAG_NOT_ARRAY >
-    {
-      KOKKOS_INLINE_FUNCTION static
-      void enable_if( void (F::*)( WTag , ValueType & ) const );
+  template <class F>
+  struct has_final_function<F, HAS_TAG_NOT_ARRAY> {
+    KOKKOS_INLINE_FUNCTION static void enable_if(void (F::*)(WTag, ValueType&)
+                                                     const);
 
-      KOKKOS_INLINE_FUNCTION static
-      void enable_if( void (F::*)( WTag const & , ValueType & ) const );
+    KOKKOS_INLINE_FUNCTION static void enable_if(void (F::*)(WTag const&,
+                                                             ValueType&) const);
 
-      KOKKOS_INLINE_FUNCTION static
-      void enable_if( void (*)( WTag , ValueType & ) );
+    KOKKOS_INLINE_FUNCTION static void enable_if(void (*)(WTag, ValueType&));
 
-      KOKKOS_INLINE_FUNCTION static
-      void enable_if( void (*)( WTag const & , ValueType & ) );
+    KOKKOS_INLINE_FUNCTION static void enable_if(void (*)(WTag const&,
+                                                          ValueType&));
 
-      KOKKOS_INLINE_FUNCTION static
-      void final( F const * const f , ValueType * dst )
-        { f->final( WTag(), *dst ); }
-    };
+    KOKKOS_INLINE_FUNCTION static void final(F const* const f, ValueType* dst) {
+      f->final(WTag(), *dst);
+    }
+  };
 
   // Has tag, is array
-  template< class F >
-  struct has_final_function< F , HAS_TAG_IS_ARRAY >
-    {
-      KOKKOS_INLINE_FUNCTION static
-      void enable_if( void (F::*)( WTag , ValueType * ) const );
+  template <class F>
+  struct has_final_function<F, HAS_TAG_IS_ARRAY> {
+    KOKKOS_INLINE_FUNCTION static void enable_if(void (F::*)(WTag, ValueType*)
+                                                     const);
 
-      KOKKOS_INLINE_FUNCTION static
-      void enable_if( void (F::*)( WTag const & , ValueType * ) const );
+    KOKKOS_INLINE_FUNCTION static void enable_if(void (F::*)(WTag const&,
+                                                             ValueType*) const);
 
-      KOKKOS_INLINE_FUNCTION static
-      void enable_if( void (*)( WTag , ValueType * ) );
+    KOKKOS_INLINE_FUNCTION static void enable_if(void (*)(WTag, ValueType*));
 
-      KOKKOS_INLINE_FUNCTION static
-      void enable_if( void (*)( WTag const & , ValueType * ) );
+    KOKKOS_INLINE_FUNCTION static void enable_if(void (*)(WTag const&,
+                                                          ValueType*));
 
-      KOKKOS_INLINE_FUNCTION static
-      void final( F const * const f , ValueType * dst )
-        { f->final( WTag(), dst ); }
-    };
+    KOKKOS_INLINE_FUNCTION static void final(F const* const f, ValueType* dst) {
+      f->final(WTag(), dst);
+    }
+  };
 
-  template< class F   = Functor
-          , INTERFACE = DEDUCED
-          , typename  = void >
-  struct DeduceFinal
-    {
-      enum { value = false };
+  template <class F = Functor, INTERFACE = DEDUCED, typename = void>
+  struct DeduceFinal {
+    enum { value = false };
 
-      KOKKOS_INLINE_FUNCTION
-      static void final( F const * const , ValueType * ) {}
-    };
+    KOKKOS_INLINE_FUNCTION
+    static void final(F const* const, ValueType*) {}
+  };
 
-  template< class F , INTERFACE I >
-  struct DeduceFinal< F , I ,
-    decltype( has_final_function<F,I>::enable_if( & F::final ) ) >
-    : public has_final_function<F,I>
-    { enum { value = true }; };
+  template <class F, INTERFACE I>
+  struct DeduceFinal<F, I,
+                     decltype(has_final_function<F, I>::enable_if(&F::final))>
+      : public has_final_function<F, I> {
+    enum { value = true };
+  };
 
   //----------------------------------------
 
-  template< class F = Functor , typename = void >
-  struct DeduceTeamShmem
-    {
-      enum { value = false };
+  template <class F = Functor, typename = void>
+  struct DeduceTeamShmem {
+    enum { value = false };
 
-      static size_t team_shmem_size( F const & , int ) { return 0 ; }
-    };
+    static size_t team_shmem_size(F const&, int) { return 0; }
+  };
 
-  template< class F >
-  struct DeduceTeamShmem< F , typename std::enable_if< 0 < sizeof( & F::team_shmem_size ) >::type >
-    {
-      enum { value = true };
+  template <class F>
+  struct DeduceTeamShmem<
+      F, typename std::enable_if<0 < sizeof(&F::team_shmem_size)>::type> {
+    enum { value = true };
 
-      static size_t team_shmem_size( F const * const f , int team_size )
-        { return f->team_shmem_size( team_size ); }
-    };
+    static size_t team_shmem_size(F const* const f, int team_size) {
+      return f->team_shmem_size(team_size);
+    }
+  };
 
-  template< class F >
-  struct DeduceTeamShmem< F , typename std::enable_if< 0 < sizeof( & F::shmem_size ) >::type >
-    {
-      enum { value = true };
+  template <class F>
+  struct DeduceTeamShmem<
+      F, typename std::enable_if<0 < sizeof(&F::shmem_size)>::type> {
+    enum { value = true };
 
-      static size_t team_shmem_size( F const * const f , int team_size )
-        { return f->shmem_size( team_size ); }
-    };
+    static size_t team_shmem_size(F const* const f, int team_size) {
+      return f->shmem_size(team_size);
+    }
+  };
 
   //----------------------------------------
 
-public:
-
-  inline static
-  size_t team_shmem_size( Functor const & f )
-    { return DeduceTeamShmem<>::team_shmem_size( f ); }
+ public:
+  inline static size_t team_shmem_size(Functor const& f) {
+    return DeduceTeamShmem<>::team_shmem_size(f);
+  }
 
   //----------------------------------------
 
-  enum { has_join_member_function  = DeduceJoin<>::value };
-  enum { has_init_member_function  = DeduceInit<>::value };
+  enum { has_join_member_function = DeduceJoin<>::value };
+  enum { has_init_member_function = DeduceInit<>::value };
   enum { has_final_member_function = DeduceFinal<>::value };
 
+  template <class MemorySpace = typename execution_space::memory_space>
+  struct Reducer {
+   private:
+    Functor const* const m_functor;
+    ValueType* const m_result;
 
-  template< class MemorySpace = typename execution_space::memory_space >
-  struct Reducer
-  {
-  private:
-
-    Functor const * const m_functor ;
-    ValueType     * const m_result ;
-
-    template< bool IsArray >
+    template <bool IsArray>
     KOKKOS_INLINE_FUNCTION constexpr
-    typename std::enable_if< IsArray , FunctorAnalysis::ValueType * >::type
-    ref() const noexcept { return m_result ; }
+        typename std::enable_if<IsArray, FunctorAnalysis::ValueType*>::type
+        ref() const noexcept {
+      return m_result;
+    }
 
-    template< bool IsArray >
+    template <bool IsArray>
     KOKKOS_INLINE_FUNCTION constexpr
-    typename std::enable_if< ! IsArray , FunctorAnalysis::ValueType & >::type
-    ref() const noexcept { return *m_result ; }
+        typename std::enable_if<!IsArray, FunctorAnalysis::ValueType&>::type
+        ref() const noexcept {
+      return *m_result;
+    }
 
-    template< bool IsArray >
+    template <bool IsArray>
+    KOKKOS_INLINE_FUNCTION constexpr typename std::enable_if<IsArray, int>::type
+    len() const noexcept {
+      return m_functor->value_count;
+    }
+
+    template <bool IsArray>
     KOKKOS_INLINE_FUNCTION constexpr
-    typename std::enable_if< IsArray , int >::type
-    len() const noexcept { return m_functor->value_count ; }
+        typename std::enable_if<!IsArray, int>::type
+        len() const noexcept {
+      return candidate_is_void ? 0 : 1;
+    }
 
-    template< bool IsArray >
-    KOKKOS_INLINE_FUNCTION constexpr
-    typename std::enable_if< ! IsArray , int >::type
-    len() const noexcept { return candidate_is_void ? 0 : 1 ; }
+   public:
+    using reducer        = Reducer;
+    using value_type     = FunctorAnalysis::value_type;
+    using memory_space   = MemorySpace;
+    using reference_type = FunctorAnalysis::reference_type;
+    using functor_type   = Functor;  // Adapts a functor
 
-  public:
+    KOKKOS_INLINE_FUNCTION constexpr value_type* data() const noexcept {
+      return m_result;
+    }
 
-    using reducer        = Reducer ;
-    using value_type     = FunctorAnalysis::value_type ;
-    using memory_space   = MemorySpace ;
-    using reference_type = FunctorAnalysis::reference_type ;
-    using functor_type   = Functor ; // Adapts a functor
+    KOKKOS_INLINE_FUNCTION constexpr reference_type reference() const noexcept {
+      return Reducer::template ref<candidate_is_array>();
+    }
 
-    KOKKOS_INLINE_FUNCTION constexpr
-    value_type * data() const noexcept { return m_result ; }
-
-    KOKKOS_INLINE_FUNCTION constexpr
-    reference_type reference() const noexcept
-      { return Reducer::template ref< candidate_is_array >(); }
-
-    KOKKOS_INLINE_FUNCTION constexpr
-    int length() const noexcept
-      { return Reducer::template len< candidate_is_array >(); }
+    KOKKOS_INLINE_FUNCTION constexpr int length() const noexcept {
+      return Reducer::template len<candidate_is_array>();
+    }
 
     KOKKOS_INLINE_FUNCTION
-    void copy( ValueType * const dst
-             , ValueType const * const src ) const noexcept
-      { for ( int i = 0 ; i < Reducer::template len< candidate_is_array >() ; ++i ) dst[i] = src[i] ; }
+    void copy(ValueType* const dst, ValueType const* const src) const noexcept {
+      for (int i = 0; i < Reducer::template len<candidate_is_array>(); ++i)
+        dst[i] = src[i];
+    }
 
     KOKKOS_INLINE_FUNCTION
-    void join( ValueType volatile * dst
-             , ValueType volatile const * src ) const noexcept
-      { DeduceJoin<>::join( m_functor , dst , src ); }
-
-    KOKKOS_INLINE_FUNCTION 
-    void init( ValueType * dst ) const noexcept
-      { DeduceInit<>::init( m_functor , dst ); }
+    void join(ValueType volatile* dst, ValueType volatile const* src) const
+        noexcept {
+      DeduceJoin<>::join(m_functor, dst, src);
+    }
 
     KOKKOS_INLINE_FUNCTION
-    void final( ValueType * dst ) const noexcept
-      { DeduceFinal<>::final( m_functor , dst ); }
+    void init(ValueType* dst) const noexcept {
+      DeduceInit<>::init(m_functor, dst);
+    }
 
-    Reducer( Reducer const & ) = default ;
-    Reducer( Reducer && ) = default ;
-    Reducer & operator = ( Reducer const & ) = delete ;
-    Reducer & operator = ( Reducer && ) = delete ;
+    KOKKOS_INLINE_FUNCTION
+    void final(ValueType* dst) const noexcept {
+      DeduceFinal<>::final(m_functor, dst);
+    }
 
-    template< class S >
-    using rebind = Reducer< S > ;
+    Reducer(Reducer const&) = default;
+    Reducer(Reducer&&)      = default;
+    Reducer& operator=(Reducer const&) = delete;
+    Reducer& operator=(Reducer&&) = delete;
 
-    KOKKOS_INLINE_FUNCTION explicit constexpr
-    Reducer( Functor const * arg_functor = 0
-           , ValueType * arg_value = 0 ) noexcept
-      : m_functor(arg_functor), m_result(arg_value) {}
+    template <class S>
+    using rebind = Reducer<S>;
+
+    KOKKOS_INLINE_FUNCTION explicit constexpr Reducer(
+        Functor const* arg_functor = 0, ValueType* arg_value = 0) noexcept
+        : m_functor(arg_functor), m_result(arg_value) {}
   };
 };
 
-} // namespace Impl
-} // namespace Kokkos
+}  // namespace Impl
+}  // namespace Kokkos
 
 //----------------------------------------------------------------------------
 //----------------------------------------------------------------------------
 
 #endif /* KOKKOS_FUNCTORANALYSIS_HPP */
-
diff --git a/lib/kokkos/core/src/impl/Kokkos_HBWSpace.cpp b/lib/kokkos/core/src/impl/Kokkos_HBWSpace.cpp
index 680e937db4..8a83aef4c9 100644
--- a/lib/kokkos/core/src/impl/Kokkos_HBWSpace.cpp
+++ b/lib/kokkos/core/src/impl/Kokkos_HBWSpace.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -41,7 +42,6 @@
 //@HEADER
 */
 
-
 #include <Kokkos_Macros.hpp>
 
 #include <cstddef>
@@ -56,6 +56,7 @@
 
 #include <Kokkos_HBWSpace.hpp>
 #include <impl/Kokkos_Error.hpp>
+#include <impl/Kokkos_MemorySpace.hpp>
 #include <Kokkos_Atomic.hpp>
 #ifdef KOKKOS_ENABLE_HBWSPACE
 #include <memkind.h>
@@ -68,7 +69,7 @@
 //----------------------------------------------------------------------------
 //----------------------------------------------------------------------------
 #ifdef KOKKOS_ENABLE_HBWSPACE
-#define MEMKIND_TYPE MEMKIND_HBW //hbw_get_kind(HBW_PAGESIZE_4KB)
+#define MEMKIND_TYPE MEMKIND_HBW  // hbw_get_kind(HBW_PAGESIZE_4KB)
 
 /*--------------------------------------------------------------------------*/
 
@@ -76,53 +77,47 @@ namespace Kokkos {
 namespace Experimental {
 
 /* Default allocation mechanism */
-HBWSpace::HBWSpace()
-  : m_alloc_mech(
-     HBWSpace::STD_MALLOC
-    )
-{
-printf("Init\n");
-setenv("MEMKIND_HBW_NODES", "1", 0);
+HBWSpace::HBWSpace() : m_alloc_mech(HBWSpace::STD_MALLOC) {
+  printf("Init\n");
+  setenv("MEMKIND_HBW_NODES", "1", 0);
 }
 
 /* Default allocation mechanism */
-HBWSpace::HBWSpace( const HBWSpace::AllocationMechanism & arg_alloc_mech )
-  : m_alloc_mech( HBWSpace::STD_MALLOC )
-{
-printf("Init2\n");
-setenv("MEMKIND_HBW_NODES", "1", 0);
-  if ( arg_alloc_mech == STD_MALLOC ) {
-    m_alloc_mech = HBWSpace::STD_MALLOC ;
+HBWSpace::HBWSpace(const HBWSpace::AllocationMechanism &arg_alloc_mech)
+    : m_alloc_mech(HBWSpace::STD_MALLOC) {
+  printf("Init2\n");
+  setenv("MEMKIND_HBW_NODES", "1", 0);
+  if (arg_alloc_mech == STD_MALLOC) {
+    m_alloc_mech = HBWSpace::STD_MALLOC;
   }
 }
 
-void * HBWSpace::allocate( const size_t arg_alloc_size ) const
-{
-  static_assert( sizeof(void*) == sizeof(uintptr_t)
-               , "Error sizeof(void*) != sizeof(uintptr_t)" );
+void *HBWSpace::allocate(const size_t arg_alloc_size) const {
+  static_assert(sizeof(void *) == sizeof(uintptr_t),
+                "Error sizeof(void*) != sizeof(uintptr_t)");
 
-  static_assert( Kokkos::Impl::power_of_two< Kokkos::Impl::MEMORY_ALIGNMENT >::value
-               , "Memory alignment must be power of two" );
+  static_assert(
+      Kokkos::Impl::power_of_two<Kokkos::Impl::MEMORY_ALIGNMENT>::value,
+      "Memory alignment must be power of two");
 
-  constexpr uintptr_t alignment = Kokkos::Impl::MEMORY_ALIGNMENT ;
-  constexpr uintptr_t alignment_mask = alignment - 1 ;
+  constexpr uintptr_t alignment      = Kokkos::Impl::MEMORY_ALIGNMENT;
+  constexpr uintptr_t alignment_mask = alignment - 1;
 
-  void * ptr = 0 ;
+  void *ptr = 0;
 
-  if ( arg_alloc_size ) {
-
-    if ( m_alloc_mech == STD_MALLOC ) {
+  if (arg_alloc_size) {
+    if (m_alloc_mech == STD_MALLOC) {
       // Over-allocate to and round up to guarantee proper alignment.
-      size_t size_padded = arg_alloc_size + sizeof(void*) + alignment ;
+      size_t size_padded = arg_alloc_size + sizeof(void *) + alignment;
 
-      void * alloc_ptr = memkind_malloc(MEMKIND_TYPE, size_padded );
+      void *alloc_ptr = memkind_malloc(MEMKIND_TYPE, size_padded);
 
       if (alloc_ptr) {
         uintptr_t address = reinterpret_cast<uintptr_t>(alloc_ptr);
 
         // offset enough to record the alloc_ptr
         address += sizeof(void *);
-        uintptr_t rem = address % alignment;
+        uintptr_t rem    = address % alignment;
         uintptr_t offset = rem ? (alignment - rem) : 0u;
         address += offset;
         ptr = reinterpret_cast<void *>(address);
@@ -133,41 +128,41 @@ void * HBWSpace::allocate( const size_t arg_alloc_size ) const
     }
   }
 
-  if ( ( ptr == 0 ) || ( reinterpret_cast<uintptr_t>(ptr) == ~uintptr_t(0) )
-       || ( reinterpret_cast<uintptr_t>(ptr) & alignment_mask ) ) {
-    std::ostringstream msg ;
-    msg << "Kokkos::Experimental::HBWSpace::allocate[ " ;
-    switch( m_alloc_mech ) {
-    case STD_MALLOC: msg << "STD_MALLOC" ; break ;
+  if ((ptr == 0) || (reinterpret_cast<uintptr_t>(ptr) == ~uintptr_t(0)) ||
+      (reinterpret_cast<uintptr_t>(ptr) & alignment_mask)) {
+    std::ostringstream msg;
+    msg << "Kokkos::Experimental::HBWSpace::allocate[ ";
+    switch (m_alloc_mech) {
+      case STD_MALLOC: msg << "STD_MALLOC"; break;
+    }
+    msg << " ]( " << arg_alloc_size << " ) FAILED";
+    if (ptr == NULL) {
+      msg << " NULL";
+    } else {
+      msg << " NOT ALIGNED " << ptr;
     }
-    msg << " ]( " << arg_alloc_size << " ) FAILED" ;
-    if ( ptr == NULL ) { msg << " NULL" ; }
-    else { msg << " NOT ALIGNED " << ptr ; }
 
-    std::cerr << msg.str() << std::endl ;
+    std::cerr << msg.str() << std::endl;
     std::cerr.flush();
 
-    Kokkos::Impl::throw_runtime_exception( msg.str() );
+    Kokkos::Impl::throw_runtime_exception(msg.str());
   }
 
   return ptr;
 }
 
-
-void HBWSpace::deallocate( void * const arg_alloc_ptr , const size_t arg_alloc_size ) const
-{
-  if ( arg_alloc_ptr ) {
-
-    if ( m_alloc_mech == STD_MALLOC ) {
-      void * alloc_ptr = *(reinterpret_cast<void **>(arg_alloc_ptr) -1);
-      memkind_free(MEMKIND_TYPE, alloc_ptr );
+void HBWSpace::deallocate(void *const arg_alloc_ptr,
+                          const size_t arg_alloc_size) const {
+  if (arg_alloc_ptr) {
+    if (m_alloc_mech == STD_MALLOC) {
+      void *alloc_ptr = *(reinterpret_cast<void **>(arg_alloc_ptr) - 1);
+      memkind_free(MEMKIND_TYPE, alloc_ptr);
     }
-
   }
 }
 
-} // namespace Experimental
-} // namespace Kokkos
+}  // namespace Experimental
+}  // namespace Kokkos
 
 //----------------------------------------------------------------------------
 //----------------------------------------------------------------------------
@@ -176,142 +171,143 @@ namespace Kokkos {
 namespace Impl {
 
 #ifdef KOKKOS_DEBUG
-SharedAllocationRecord< void , void >
-SharedAllocationRecord< Kokkos::Experimental::HBWSpace , void >::s_root_record ;
+SharedAllocationRecord<void, void>
+    SharedAllocationRecord<Kokkos::Experimental::HBWSpace, void>::s_root_record;
 #endif
 
-void
-SharedAllocationRecord< Kokkos::Experimental::HBWSpace , void >::
-deallocate( SharedAllocationRecord< void , void > * arg_rec )
-{
-  delete static_cast<SharedAllocationRecord*>(arg_rec);
+void SharedAllocationRecord<Kokkos::Experimental::HBWSpace, void>::deallocate(
+    SharedAllocationRecord<void, void> *arg_rec) {
+  delete static_cast<SharedAllocationRecord *>(arg_rec);
 }
 
-SharedAllocationRecord< Kokkos::Experimental::HBWSpace , void >::
-~SharedAllocationRecord()
-{
-  #if defined(KOKKOS_ENABLE_PROFILING)
-  if(Kokkos::Profiling::profileLibraryLoaded()) {
+SharedAllocationRecord<Kokkos::Experimental::HBWSpace,
+                       void>::~SharedAllocationRecord() {
+#if defined(KOKKOS_ENABLE_PROFILING)
+  if (Kokkos::Profiling::profileLibraryLoaded()) {
     Kokkos::Profiling::deallocateData(
-      Kokkos::Profiling::SpaceHandle(Kokkos::Experimental::HBWSpace::name()),RecordBase::m_alloc_ptr->m_label,
-      data(),size());
+        Kokkos::Profiling::SpaceHandle(Kokkos::Experimental::HBWSpace::name()),
+        RecordBase::m_alloc_ptr->m_label, data(), size());
   }
-  #endif
+#endif
 
-  m_space.deallocate( SharedAllocationRecord< void , void >::m_alloc_ptr
-                    , SharedAllocationRecord< void , void >::m_alloc_size
-                    );
+  m_space.deallocate(SharedAllocationRecord<void, void>::m_alloc_ptr,
+                     SharedAllocationRecord<void, void>::m_alloc_size);
 }
 
-SharedAllocationRecord< Kokkos::Experimental::HBWSpace , void >::
-SharedAllocationRecord( const Kokkos::Experimental::HBWSpace & arg_space
-                      , const std::string       & arg_label
-                      , const size_t              arg_alloc_size
-                      , const SharedAllocationRecord< void , void >::function_type arg_dealloc
-                      )
-  // Pass through allocated [ SharedAllocationHeader , user_memory ]
-  // Pass through deallocation function
-  : SharedAllocationRecord< void , void >
-      (
+SharedAllocationRecord<Kokkos::Experimental::HBWSpace, void>::
+    SharedAllocationRecord(
+        const Kokkos::Experimental::HBWSpace &arg_space,
+        const std::string &arg_label, const size_t arg_alloc_size,
+        const SharedAllocationRecord<void, void>::function_type arg_dealloc)
+    // Pass through allocated [ SharedAllocationHeader , user_memory ]
+    // Pass through deallocation function
+    : SharedAllocationRecord<void, void>(
 #ifdef KOKKOS_DEBUG
-        & SharedAllocationRecord< Kokkos::Experimental::HBWSpace , void >::s_root_record,
+          &SharedAllocationRecord<Kokkos::Experimental::HBWSpace,
+                                  void>::s_root_record,
 #endif
-        reinterpret_cast<SharedAllocationHeader*>( arg_space.allocate( sizeof(SharedAllocationHeader) + arg_alloc_size ) )
-      , sizeof(SharedAllocationHeader) + arg_alloc_size
-      , arg_dealloc
-      )
-  , m_space( arg_space )
-{
-  #if defined(KOKKOS_ENABLE_PROFILING)
-  if(Kokkos::Profiling::profileLibraryLoaded()) {
-    Kokkos::Profiling::allocateData(Kokkos::Profiling::SpaceHandle(arg_space.name()),arg_label,data(),arg_alloc_size);
+          Impl::checked_allocation_with_header(arg_space, arg_label,
+                                               arg_alloc_size),
+          sizeof(SharedAllocationHeader) + arg_alloc_size, arg_dealloc),
+      m_space(arg_space) {
+#if defined(KOKKOS_ENABLE_PROFILING)
+  if (Kokkos::Profiling::profileLibraryLoaded()) {
+    Kokkos::Profiling::allocateData(
+        Kokkos::Profiling::SpaceHandle(arg_space.name()), arg_label, data(),
+        arg_alloc_size);
   }
-  #endif
+#endif
 
   // Fill in the Header information
-  RecordBase::m_alloc_ptr->m_record = static_cast< SharedAllocationRecord< void , void > * >( this );
+  RecordBase::m_alloc_ptr->m_record =
+      static_cast<SharedAllocationRecord<void, void> *>(this);
 
-  strncpy( RecordBase::m_alloc_ptr->m_label
-          , arg_label.c_str()
-          , SharedAllocationHeader::maximum_label_length
-          );
+  strncpy(RecordBase::m_alloc_ptr->m_label, arg_label.c_str(),
+          SharedAllocationHeader::maximum_label_length);
   // Set last element zero, in case c_str is too long
-  RecordBase::m_alloc_ptr->m_label[SharedAllocationHeader::maximum_label_length - 1] = (char) 0;
+  RecordBase::m_alloc_ptr
+      ->m_label[SharedAllocationHeader::maximum_label_length - 1] = (char)0;
 }
 
 //----------------------------------------------------------------------------
 
-void * SharedAllocationRecord< Kokkos::Experimental::HBWSpace , void >::
-allocate_tracked( const Kokkos::Experimental::HBWSpace & arg_space
-                , const std::string & arg_alloc_label
-                , const size_t arg_alloc_size )
-{
-  if ( ! arg_alloc_size ) return (void *) 0 ;
+void *
+SharedAllocationRecord<Kokkos::Experimental::HBWSpace, void>::allocate_tracked(
+    const Kokkos::Experimental::HBWSpace &arg_space,
+    const std::string &arg_alloc_label, const size_t arg_alloc_size) {
+  if (!arg_alloc_size) return (void *)0;
 
-  SharedAllocationRecord * const r =
-    allocate( arg_space , arg_alloc_label , arg_alloc_size );
+  SharedAllocationRecord *const r =
+      allocate(arg_space, arg_alloc_label, arg_alloc_size);
 
-  RecordBase::increment( r );
+  RecordBase::increment(r);
 
   return r->data();
 }
 
-void SharedAllocationRecord< Kokkos::Experimental::HBWSpace , void >::
-deallocate_tracked( void * const arg_alloc_ptr )
-{
-  if ( arg_alloc_ptr != 0 ) {
-    SharedAllocationRecord * const r = get_record( arg_alloc_ptr );
+void SharedAllocationRecord<Kokkos::Experimental::HBWSpace,
+                            void>::deallocate_tracked(void *const
+                                                          arg_alloc_ptr) {
+  if (arg_alloc_ptr != 0) {
+    SharedAllocationRecord *const r = get_record(arg_alloc_ptr);
 
-    RecordBase::decrement( r );
+    RecordBase::decrement(r);
   }
 }
 
-void * SharedAllocationRecord< Kokkos::Experimental::HBWSpace , void >::
-reallocate_tracked( void * const arg_alloc_ptr
-                  , const size_t arg_alloc_size )
-{
-  SharedAllocationRecord * const r_old = get_record( arg_alloc_ptr );
-  SharedAllocationRecord * const r_new = allocate( r_old->m_space , r_old->get_label() , arg_alloc_size );
+void *SharedAllocationRecord<Kokkos::Experimental::HBWSpace, void>::
+    reallocate_tracked(void *const arg_alloc_ptr, const size_t arg_alloc_size) {
+  SharedAllocationRecord *const r_old = get_record(arg_alloc_ptr);
+  SharedAllocationRecord *const r_new =
+      allocate(r_old->m_space, r_old->get_label(), arg_alloc_size);
 
-  Kokkos::Impl::DeepCopy<Kokkos::Experimental::HBWSpace,Kokkos::Experimental::HBWSpace>( r_new->data() , r_old->data()
-                                             , std::min( r_old->size() , r_new->size() ) );
+  Kokkos::Impl::DeepCopy<Kokkos::Experimental::HBWSpace,
+                         Kokkos::Experimental::HBWSpace>(
+      r_new->data(), r_old->data(), std::min(r_old->size(), r_new->size()));
 
-  RecordBase::increment( r_new );
-  RecordBase::decrement( r_old );
+  RecordBase::increment(r_new);
+  RecordBase::decrement(r_old);
 
   return r_new->data();
 }
 
-SharedAllocationRecord< Kokkos::Experimental::HBWSpace , void > *
-SharedAllocationRecord< Kokkos::Experimental::HBWSpace , void >::get_record( void * alloc_ptr )
-{
-  typedef SharedAllocationHeader  Header ;
-  typedef SharedAllocationRecord< Kokkos::Experimental::HBWSpace , void >  RecordHost ;
+SharedAllocationRecord<Kokkos::Experimental::HBWSpace, void>
+    *SharedAllocationRecord<Kokkos::Experimental::HBWSpace, void>::get_record(
+        void *alloc_ptr) {
+  typedef SharedAllocationHeader Header;
+  typedef SharedAllocationRecord<Kokkos::Experimental::HBWSpace, void>
+      RecordHost;
 
-  SharedAllocationHeader const * const head   = alloc_ptr ? Header::get_header( alloc_ptr ) : (SharedAllocationHeader *)0 ;
-  RecordHost                   * const record = head ? static_cast< RecordHost * >( head->m_record ) : (RecordHost *) 0 ;
+  SharedAllocationHeader const *const head =
+      alloc_ptr ? Header::get_header(alloc_ptr) : (SharedAllocationHeader *)0;
+  RecordHost *const record =
+      head ? static_cast<RecordHost *>(head->m_record) : (RecordHost *)0;
 
-  if ( ! alloc_ptr || record->m_alloc_ptr != head ) {
-    Kokkos::Impl::throw_runtime_exception( std::string("Kokkos::Impl::SharedAllocationRecord< Kokkos::Experimental::HBWSpace , void >::get_record ERROR" ) );
+  if (!alloc_ptr || record->m_alloc_ptr != head) {
+    Kokkos::Impl::throw_runtime_exception(std::string(
+        "Kokkos::Impl::SharedAllocationRecord< Kokkos::Experimental::HBWSpace "
+        ", void >::get_record ERROR"));
   }
 
-  return record ;
+  return record;
 }
 
 // Iterate records to print orphaned memory ...
-void SharedAllocationRecord< Kokkos::Experimental::HBWSpace , void >::
-print_records( std::ostream & s , const Kokkos::Experimental::HBWSpace & space , bool detail )
-{
+void SharedAllocationRecord<Kokkos::Experimental::HBWSpace, void>::
+    print_records(std::ostream &s, const Kokkos::Experimental::HBWSpace &space,
+                  bool detail) {
 #ifdef KOKKOS_DEBUG
-  SharedAllocationRecord< void , void >::print_host_accessible_records( s , "HBWSpace" , & s_root_record , detail );
+  SharedAllocationRecord<void, void>::print_host_accessible_records(
+      s, "HBWSpace", &s_root_record, detail);
 #else
-  throw_runtime_exception("SharedAllocationRecord<HBWSpace>::print_records"
+  throw_runtime_exception(
+      "SharedAllocationRecord<HBWSpace>::print_records"
       " only works with KOKKOS_DEBUG enabled");
 #endif
 }
 
-} // namespace Impl
-} // namespace Kokkos
+}  // namespace Impl
+}  // namespace Kokkos
 
 /*--------------------------------------------------------------------------*/
 /*--------------------------------------------------------------------------*/
@@ -319,33 +315,35 @@ print_records( std::ostream & s , const Kokkos::Experimental::HBWSpace & space ,
 namespace Kokkos {
 namespace Experimental {
 namespace {
-  const unsigned HBW_SPACE_ATOMIC_MASK = 0xFFFF;
-  const unsigned HBW_SPACE_ATOMIC_XOR_MASK = 0x5A39;
-  static int HBW_SPACE_ATOMIC_LOCKS[HBW_SPACE_ATOMIC_MASK+1];
-}
+const unsigned HBW_SPACE_ATOMIC_MASK     = 0xFFFF;
+const unsigned HBW_SPACE_ATOMIC_XOR_MASK = 0x5A39;
+static int HBW_SPACE_ATOMIC_LOCKS[HBW_SPACE_ATOMIC_MASK + 1];
+}  // namespace
 
 namespace Impl {
 void init_lock_array_hbw_space() {
   static int is_initialized = 0;
-  if(! is_initialized)
-    for(int i = 0; i < static_cast<int> (HBW_SPACE_ATOMIC_MASK+1); i++)
+  if (!is_initialized)
+    for (int i = 0; i < static_cast<int>(HBW_SPACE_ATOMIC_MASK + 1); i++)
       HBW_SPACE_ATOMIC_LOCKS[i] = 0;
 }
 
-bool lock_address_hbw_space(void* ptr) {
-  return 0 == atomic_compare_exchange( &HBW_SPACE_ATOMIC_LOCKS[
-      (( size_t(ptr) >> 2 ) & HBW_SPACE_ATOMIC_MASK) ^ HBW_SPACE_ATOMIC_XOR_MASK] ,
-                                  0 , 1);
+bool lock_address_hbw_space(void *ptr) {
+  return 0 == atomic_compare_exchange(
+                  &HBW_SPACE_ATOMIC_LOCKS[((size_t(ptr) >> 2) &
+                                           HBW_SPACE_ATOMIC_MASK) ^
+                                          HBW_SPACE_ATOMIC_XOR_MASK],
+                  0, 1);
 }
 
-void unlock_address_hbw_space(void* ptr) {
-   atomic_exchange( &HBW_SPACE_ATOMIC_LOCKS[
-      (( size_t(ptr) >> 2 ) & HBW_SPACE_ATOMIC_MASK) ^ HBW_SPACE_ATOMIC_XOR_MASK] ,
-                    0);
+void unlock_address_hbw_space(void *ptr) {
+  atomic_exchange(
+      &HBW_SPACE_ATOMIC_LOCKS[((size_t(ptr) >> 2) & HBW_SPACE_ATOMIC_MASK) ^
+                              HBW_SPACE_ATOMIC_XOR_MASK],
+      0);
 }
 
-}
-}
-}
+}  // namespace Impl
+}  // namespace Experimental
+}  // namespace Kokkos
 #endif
-
diff --git a/lib/kokkos/core/src/impl/Kokkos_HostBarrier.cpp b/lib/kokkos/core/src/impl/Kokkos_HostBarrier.cpp
index 347a8b50ba..0b96add432 100644
--- a/lib/kokkos/core/src/impl/Kokkos_HostBarrier.cpp
+++ b/lib/kokkos/core/src/impl/Kokkos_HostBarrier.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -48,63 +49,60 @@
 
 #include <impl/Kokkos_HostBarrier.hpp>
 
-#if !defined( _WIN32 )
-  #include <sched.h>
-  #include <time.h>
+#if !defined(_WIN32)
+#include <sched.h>
+#include <time.h>
 #else
-  #include <process.h>
-  #include <winsock2.h>
-  #include <windows.h>
+#include <process.h>
+#include <winsock2.h>
+#include <windows.h>
 #endif
 
-namespace Kokkos { namespace Impl {
+namespace Kokkos {
+namespace Impl {
 
-void HostBarrier::impl_backoff_wait_until_equal( int * ptr
-                                               , const int v
-                                               , const bool active_wait
-                                               ) noexcept
-{
-  #if !defined( _WIN32 )
-  timespec req ;
-  req.tv_sec  = 0 ;
+void HostBarrier::impl_backoff_wait_until_equal(
+    int* ptr, const int v, const bool active_wait) noexcept {
+#if !defined(_WIN32)
+  timespec req;
+  req.tv_sec     = 0;
   unsigned count = 0u;
 
-  while (!test_equal( ptr, v )) {
+  while (!test_equal(ptr, v)) {
     const int c = ::Kokkos::log2(++count);
-    if ( !active_wait || c > log2_iterations_till_sleep) {
-      req.tv_nsec = c < 16 ? 256*c : 4096;
-      nanosleep( &req, nullptr );
-    }
-    else if (c > log2_iterations_till_yield) {
+    if (!active_wait || c > log2_iterations_till_sleep) {
+      req.tv_nsec = c < 16 ? 256 * c : 4096;
+      nanosleep(&req, nullptr);
+    } else if (c > log2_iterations_till_yield) {
       sched_yield();
     }
-    #if defined( KOKKOS_ENABLE_ASM )
-    #if   defined( __PPC64__ )
-    for (int j=0; j<num_nops; ++j) {
-      asm volatile( "nop\n" );
+#if defined(KOKKOS_ENABLE_ASM)
+#if defined(__PPC64__)
+    for (int j = 0; j < num_nops; ++j) {
+      asm volatile("nop\n");
     }
-    asm volatile( "or 27, 27, 27" ::: "memory" );
-    #elif defined( __amd64 )  || defined( __amd64__ ) || \
-          defined( __x86_64 ) || defined( __x86_64__ )
-    for (int j=0; j<num_nops; ++j) {
-      asm volatile( "nop\n" );
+    asm volatile("or 27, 27, 27" ::: "memory");
+#elif defined(__amd64) || defined(__amd64__) || defined(__x86_64) || \
+    defined(__x86_64__)
+    for (int j = 0; j < num_nops; ++j) {
+      asm volatile("nop\n");
     }
-    asm volatile( "pause\n":::"memory" );
-    #endif
-    #endif
+    asm volatile("pause\n" ::: "memory");
+#endif
+#endif
   }
-  #else // _WIN32
+#else  // _WIN32
   while (!try_wait()) {
-    #if defined( KOKKOS_ENABLE_ASM )
-    for (int j=0; j<num_nops; ++j) {
-      __asm__ __volatile__( "nop\n" );
+#if defined(KOKKOS_ENABLE_ASM)
+    for (int j = 0; j < num_nops; ++j) {
+      __asm__ __volatile__("nop\n");
     }
-    __asm__ __volatile__( "pause\n":::"memory" );
-    #endif
+    __asm__ __volatile__("pause\n" ::: "memory");
+#endif
   }
-  #endif
-  //printf("W: %d\n", count);
+#endif
+  // printf("W: %d\n", count);
 }
 
-}} // namespace Kokkos::Impl
-
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/impl/Kokkos_HostBarrier.hpp b/lib/kokkos/core/src/impl/Kokkos_HostBarrier.hpp
index 2416edbead..ce7a1408a3 100644
--- a/lib/kokkos/core/src/impl/Kokkos_HostBarrier.hpp
+++ b/lib/kokkos/core/src/impl/Kokkos_HostBarrier.hpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -47,7 +48,8 @@
 #include <Kokkos_Macros.hpp>
 #include <Kokkos_Atomic.hpp>
 
-namespace Kokkos { namespace Impl {
+namespace Kokkos {
+namespace Impl {
 
 // class HostBarrier
 //
@@ -55,8 +57,8 @@ namespace Kokkos { namespace Impl {
 // of execution.
 //
 // *buffer* is a shared resource between the threads of execution
-// *step* should be a stack variable associated with the current thread of execution
-// *size* is the number of threads which share the barrier
+// *step* should be a stack variable associated with the current thread of
+// execution *size* is the number of threads which share the barrier
 //
 // before calling any arrive type function the buffer and step must have been
 // initialized to 0 and one of the following conditions must be true
@@ -68,18 +70,18 @@ namespace Kokkos { namespace Impl {
 //    called split_release
 //
 // The purporse of the split functions is to allow the last thread to arrive
-// an opprotunity to perform some actions before releasing the waiting threads
+// an opportunity to perform some actions before releasing the waiting threads
 //
-// If all threads have arrived (and split_release has been call if using split_arrive)
-// before a wait type call, the wait may return quickly
-class HostBarrier
-{
-public:
-  using buffer_type = int;
-  static constexpr int required_buffer_size   = 128;
-  static constexpr int required_buffer_length = required_buffer_size / sizeof(int);
+// If all threads have arrived (and split_release has been call if using
+// split_arrive) before a wait type call, the wait may return quickly
+class HostBarrier {
+ public:
+  using buffer_type                         = int;
+  static constexpr int required_buffer_size = 128;
+  static constexpr int required_buffer_length =
+      required_buffer_size / sizeof(int);
 
-private:
+ private:
   // fit the following 3 atomics within a 128 bytes while
   // keeping the arrive atomic at least 64 bytes away from
   // the wait atomic to reduce contention on the caches
@@ -87,30 +89,25 @@ private:
   static constexpr int master_idx = 64 / sizeof(int);
   static constexpr int wait_idx   = 96 / sizeof(int);
 
-
   static constexpr int num_nops                   = 32;
   static constexpr int iterations_till_backoff    = 64;
   static constexpr int log2_iterations_till_yield = 4;
   static constexpr int log2_iterations_till_sleep = 6;
 
-public:
-
+ public:
   // will return true if call is the last thread to arrive
   KOKKOS_INLINE_FUNCTION
-  static bool split_arrive( int * buffer
-                          , const int size
-                          , int & step
-                          , const bool master_wait = true
-                          ) noexcept
-  {
+  static bool split_arrive(int* buffer, const int size, int& step,
+                           const bool master_wait = true) noexcept {
     if (size <= 1) return true;
 
     ++step;
     Kokkos::memory_fence();
-    const bool result = Kokkos::atomic_fetch_add( buffer + arrive_idx, 1 ) == size-1;
+    const bool result =
+        Kokkos::atomic_fetch_add(buffer + arrive_idx, 1) == size - 1;
 
     if (master_wait && result) {
-      Kokkos::atomic_fetch_add( buffer + master_idx, 1 );
+      Kokkos::atomic_fetch_add(buffer + master_idx, 1);
     }
 
     return result;
@@ -120,37 +117,26 @@ public:
   // only the thread which received a return value of true from split_arrive
   // or the thread which calls split_master_wait may call split_release
   KOKKOS_INLINE_FUNCTION
-  static void split_release( int * buffer
-                           , const int size
-                           , const int /*step*/
-                           ) noexcept
-  {
+  static void split_release(int* buffer, const int size, const int /*step*/
+                            ) noexcept {
     if (size <= 1) return;
     Kokkos::memory_fence();
-    Kokkos::atomic_fetch_sub( buffer + arrive_idx, size );
-    Kokkos::atomic_fetch_add( buffer + wait_idx, 1 );
+    Kokkos::atomic_fetch_sub(buffer + arrive_idx, size);
+    Kokkos::atomic_fetch_add(buffer + wait_idx, 1);
   }
 
-  // should only be called by the master thread, will allow the master thread to resume
-  // after all threads have arrived
+  // should only be called by the master thread, will allow the master thread to
+  // resume after all threads have arrived
   KOKKOS_INLINE_FUNCTION
-  static void split_master_wait( int * buffer
-                               , const int size
-                               , const int step
-                               , const bool active_wait = true
-                               ) noexcept
-  {
+  static void split_master_wait(int* buffer, const int size, const int step,
+                                const bool active_wait = true) noexcept {
     if (size <= 1) return;
-    wait_until_equal( buffer + master_idx, step, active_wait );
+    wait_until_equal(buffer + master_idx, step, active_wait);
   }
 
   // arrive, last thread automatically release waiting threads
   KOKKOS_INLINE_FUNCTION
-  static void arrive( int * buffer
-                    , const int size
-                    , int & step
-                    ) noexcept
-  {
+  static void arrive(int* buffer, const int size, int& step) noexcept {
     if (size <= 1) return;
     if (split_arrive(buffer, size, step)) {
       split_release(buffer, size, step);
@@ -159,84 +145,59 @@ public:
 
   // test if all threads have arrived
   KOKKOS_INLINE_FUNCTION
-  static bool try_wait( int * buffer
-                      , const int size
-                      , const int step
-                      ) noexcept
-  {
+  static bool try_wait(int* buffer, const int size, const int step) noexcept {
     if (size <= 1) return true;
-    return test_equal( buffer + wait_idx, step );
+    return test_equal(buffer + wait_idx, step);
   }
 
   // wait for all threads to arrive
   KOKKOS_INLINE_FUNCTION
-  static void wait( int * buffer
-                  , const int size
-                  , const int step
-                  , bool active_wait = true
-                  ) noexcept
-  {
+  static void wait(int* buffer, const int size, const int step,
+                   bool active_wait = true) noexcept {
     if (size <= 1) return;
-    wait_until_equal( buffer + wait_idx, step, active_wait );
+    wait_until_equal(buffer + wait_idx, step, active_wait);
   }
 
-public:
-
+ public:
   KOKKOS_INLINE_FUNCTION
-  bool split_arrive( const bool master_wait = true ) const noexcept
-  {
-    return split_arrive( m_buffer, m_size, m_step, master_wait );
+  bool split_arrive(const bool master_wait = true) const noexcept {
+    return split_arrive(m_buffer, m_size, m_step, master_wait);
   }
 
   KOKKOS_INLINE_FUNCTION
-  void split_release() const noexcept
-  {
+  void split_release() const noexcept {
     split_release(m_buffer, m_size, m_step);
   }
 
   KOKKOS_INLINE_FUNCTION
-  void split_master_wait( const bool active_wait = true) noexcept
-  {
-    split_master_wait( m_buffer, m_size, m_step,  active_wait );
+  void split_master_wait(const bool active_wait = true) noexcept {
+    split_master_wait(m_buffer, m_size, m_step, active_wait);
   }
 
   KOKKOS_INLINE_FUNCTION
-  void arrive() const noexcept
-  {
-    return arrive( m_buffer, m_size, m_step );
-  }
+  void arrive() const noexcept { return arrive(m_buffer, m_size, m_step); }
 
   KOKKOS_INLINE_FUNCTION
-  bool try_wait() const noexcept
-  {
-    return try_wait( m_buffer, m_size, m_step );
-  }
+  bool try_wait() const noexcept { return try_wait(m_buffer, m_size, m_step); }
 
   KOKKOS_INLINE_FUNCTION
-  void wait() const noexcept
-  {
-    wait( m_buffer, m_size, m_step );
-  }
+  void wait() const noexcept { wait(m_buffer, m_size, m_step); }
 
-  HostBarrier()                             = default;
-  HostBarrier( HostBarrier && )             = default;
-  HostBarrier & operator=( HostBarrier && ) = default;
+  HostBarrier()              = default;
+  HostBarrier(HostBarrier&&) = default;
+  HostBarrier& operator=(HostBarrier&&) = default;
 
   KOKKOS_INLINE_FUNCTION
-  HostBarrier( int size, int * buffer )
-    : m_size{size}
-    , m_step{0u}
-    , m_buffer{ buffer }
-  {}
+  HostBarrier(int size, int* buffer)
+      : m_size{size}, m_step{0u}, m_buffer{buffer} {}
 
-  HostBarrier( const HostBarrier &  )             = delete;
-  HostBarrier & operator=( const HostBarrier &  ) = delete;
+  HostBarrier(const HostBarrier&) = delete;
+  HostBarrier& operator=(const HostBarrier&) = delete;
 
-private:
+ private:
   KOKKOS_INLINE_FUNCTION
-  static bool test_equal( int * ptr, int v ) noexcept
-  {
-    const bool result = Kokkos::atomic_fetch_add( ptr, 0 ) == v;
+  static bool test_equal(int* ptr, int v) noexcept {
+    const bool result = Kokkos::atomic_fetch_add(ptr, 0) == v;
     if (result) {
       Kokkos::memory_fence();
     }
@@ -244,55 +205,51 @@ private:
   }
 
   KOKKOS_INLINE_FUNCTION
-  static void wait_until_equal( int * ptr
-                              , const int v
-                              , bool active_wait = true
-                              ) noexcept
-  {
-    #if defined(KOKKOS_ACTIVE_EXECUTION_MEMORY_SPACE_HOST)
-    bool result = test_equal( ptr, v );
-    for (int i=0; !result && i < iterations_till_backoff; ++i) {
-      #if defined( KOKKOS_ENABLE_ASM )
-      #if   defined( _WIN32 )
-      for (int j=0; j<num_nops; ++j) {
-        __asm__ __volatile__( "nop\n" );
+  static void wait_until_equal(int* ptr, const int v,
+                               bool active_wait = true) noexcept {
+#if defined(KOKKOS_ACTIVE_EXECUTION_MEMORY_SPACE_HOST)
+    bool result = test_equal(ptr, v);
+    for (int i = 0; !result && i < iterations_till_backoff; ++i) {
+#if defined(KOKKOS_ENABLE_ASM)
+#if defined(_WIN32)
+      for (int j = 0; j < num_nops; ++j) {
+        __asm__ __volatile__("nop\n");
       }
-      __asm__ __volatile__( "pause\n":::"memory" );
-      #elif defined( __PPC64__ )
-      for (int j=0; j<num_nops; ++j) {
-        asm volatile( "nop\n" );
+      __asm__ __volatile__("pause\n" ::: "memory");
+#elif defined(__PPC64__)
+      for (int j = 0; j < num_nops; ++j) {
+        asm volatile("nop\n");
       }
-      asm volatile( "or 27, 27, 27" ::: "memory" );
-      #elif defined( __amd64 ) || defined( __amd64__ ) || \
-            defined( __x86_64 ) || defined( __x86_64__ )
-      for (int j=0; j<num_nops; ++j) {
-        asm volatile( "nop\n" );
+      asm volatile("or 27, 27, 27" ::: "memory");
+#elif defined(__amd64) || defined(__amd64__) || defined(__x86_64) || \
+    defined(__x86_64__)
+      for (int j = 0; j < num_nops; ++j) {
+        asm volatile("nop\n");
       }
-      asm volatile( "pause\n":::"memory" );
-      #endif
-      #endif
-      result = test_equal( ptr, v );
+      asm volatile("pause\n" ::: "memory");
+#endif
+#endif
+      result = test_equal(ptr, v);
     }
     if (!result) {
-      impl_backoff_wait_until_equal( ptr, v, active_wait );
+      impl_backoff_wait_until_equal(ptr, v, active_wait);
     }
-    #else
-    while( !test_equal(ptr, v) ) {}
-    #endif
+#else
+    while (!test_equal(ptr, v)) {
+    }
+#endif
   }
 
-  static void impl_backoff_wait_until_equal( int * ptr
-                                           , const int v
-                                           , const bool active_wait
-                                           ) noexcept;
+  static void impl_backoff_wait_until_equal(int* ptr, const int v,
+                                            const bool active_wait) noexcept;
 
-private:
-  int         m_size   {0};
-  mutable int m_step   {0};
-  int *       m_buffer {nullptr};
+ private:
+  int m_size{0};
+  mutable int m_step{0};
+  int* m_buffer{nullptr};
 };
 
-}} // namespace Kokkos::Impl
-
-#endif // KOKKOS_HOST_BARRIER_HPP
+}  // namespace Impl
+}  // namespace Kokkos
 
+#endif  // KOKKOS_HOST_BARRIER_HPP
diff --git a/lib/kokkos/core/src/impl/Kokkos_HostSpace.cpp b/lib/kokkos/core/src/impl/Kokkos_HostSpace.cpp
index 848746d265..94490b8300 100644
--- a/lib/kokkos/core/src/impl/Kokkos_HostSpace.cpp
+++ b/lib/kokkos/core/src/impl/Kokkos_HostSpace.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -41,15 +42,18 @@
 //@HEADER
 */
 
+#include <cstdio>
 #include <algorithm>
 #include <Kokkos_Macros.hpp>
+#include <impl/Kokkos_Error.hpp>
+#include <impl/Kokkos_MemorySpace.hpp>
 #if defined(KOKKOS_ENABLE_PROFILING)
 #include <impl/Kokkos_Profiling_Interface.hpp>
 #endif
 
 /*--------------------------------------------------------------------------*/
 
-#if defined( __INTEL_COMPILER ) && ! defined ( KOKKOS_ENABLE_CUDA )
+#if defined(__INTEL_COMPILER) && !defined(KOKKOS_ENABLE_CUDA)
 
 // Intel specialized allocator does not interoperate with CUDA memory allocation
 
@@ -66,20 +70,21 @@
 
 /* mmap flags for private anonymous memory allocation */
 
-#if defined( MAP_ANONYMOUS ) && defined( MAP_PRIVATE )
-  #define KOKKOS_IMPL_POSIX_MMAP_FLAGS (MAP_PRIVATE | MAP_ANONYMOUS)
-#elif defined( MAP_ANON ) && defined( MAP_PRIVATE )
-  #define KOKKOS_IMPL_POSIX_MMAP_FLAGS (MAP_PRIVATE | MAP_ANON)
+#if defined(MAP_ANONYMOUS) && defined(MAP_PRIVATE)
+#define KOKKOS_IMPL_POSIX_MMAP_FLAGS (MAP_PRIVATE | MAP_ANONYMOUS)
+#elif defined(MAP_ANON) && defined(MAP_PRIVATE)
+#define KOKKOS_IMPL_POSIX_MMAP_FLAGS (MAP_PRIVATE | MAP_ANON)
 #endif
 
 // mmap flags for huge page tables
 // the Cuda driver does not interoperate with MAP_HUGETLB
-#if defined( KOKKOS_IMPL_POSIX_MMAP_FLAGS )
-  #if defined( MAP_HUGETLB ) && ! defined( KOKKOS_ENABLE_CUDA )
-    #define KOKKOS_IMPL_POSIX_MMAP_FLAGS_HUGE (KOKKOS_IMPL_POSIX_MMAP_FLAGS | MAP_HUGETLB )
-  #else
-    #define KOKKOS_IMPL_POSIX_MMAP_FLAGS_HUGE KOKKOS_IMPL_POSIX_MMAP_FLAGS
-  #endif
+#if defined(KOKKOS_IMPL_POSIX_MMAP_FLAGS)
+#if defined(MAP_HUGETLB) && !defined(KOKKOS_ENABLE_CUDA)
+#define KOKKOS_IMPL_POSIX_MMAP_FLAGS_HUGE \
+  (KOKKOS_IMPL_POSIX_MMAP_FLAGS | MAP_HUGETLB)
+#else
+#define KOKKOS_IMPL_POSIX_MMAP_FLAGS_HUGE KOKKOS_IMPL_POSIX_MMAP_FLAGS
+#endif
 #endif
 
 #endif
@@ -99,7 +104,8 @@
 #include <impl/Kokkos_Error.hpp>
 #include <Kokkos_Atomic.hpp>
 
-#if ( defined( KOKKOS_ENABLE_ASM ) || defined ( KOKKOS_ENABLE_TM ) ) && defined ( KOKKOS_ENABLE_ISA_X86_64 )
+#if (defined(KOKKOS_ENABLE_ASM) || defined(KOKKOS_ENABLE_TM)) && \
+    defined(KOKKOS_ENABLE_ISA_X86_64) && !defined(KOKKOS_COMPILER_PGI)
 #include <immintrin.h>
 #endif
 
@@ -110,80 +116,81 @@ namespace Kokkos {
 
 /* Default allocation mechanism */
 HostSpace::HostSpace()
-  : m_alloc_mech(
-#if defined( KOKKOS_ENABLE_INTEL_MM_ALLOC )
-      HostSpace::INTEL_MM_ALLOC
-#elif defined( KOKKOS_IMPL_POSIX_MMAP_FLAGS )
-      HostSpace::POSIX_MMAP
-#elif defined( KOKKOS_ENABLE_POSIX_MEMALIGN )
-      HostSpace::POSIX_MEMALIGN
+    : m_alloc_mech(
+#if defined(KOKKOS_ENABLE_INTEL_MM_ALLOC)
+          HostSpace::INTEL_MM_ALLOC
+#elif defined(KOKKOS_IMPL_POSIX_MMAP_FLAGS)
+          HostSpace::POSIX_MMAP
+#elif defined(KOKKOS_ENABLE_POSIX_MEMALIGN)
+          HostSpace::POSIX_MEMALIGN
 #else
-      HostSpace::STD_MALLOC
+          HostSpace::STD_MALLOC
 #endif
-    )
-{}
+      ) {
+}
 
 /* Default allocation mechanism */
-HostSpace::HostSpace( const HostSpace::AllocationMechanism & arg_alloc_mech )
-  : m_alloc_mech( HostSpace::STD_MALLOC )
-{
-  if ( arg_alloc_mech == STD_MALLOC ) {
-    m_alloc_mech = HostSpace::STD_MALLOC ;
+HostSpace::HostSpace(const HostSpace::AllocationMechanism &arg_alloc_mech)
+    : m_alloc_mech(HostSpace::STD_MALLOC) {
+  if (arg_alloc_mech == STD_MALLOC) {
+    m_alloc_mech = HostSpace::STD_MALLOC;
   }
-#if defined( KOKKOS_ENABLE_INTEL_MM_ALLOC )
-  else if ( arg_alloc_mech == HostSpace::INTEL_MM_ALLOC ) {
-    m_alloc_mech = HostSpace::INTEL_MM_ALLOC ;
+#if defined(KOKKOS_ENABLE_INTEL_MM_ALLOC)
+  else if (arg_alloc_mech == HostSpace::INTEL_MM_ALLOC) {
+    m_alloc_mech = HostSpace::INTEL_MM_ALLOC;
   }
-#elif defined( KOKKOS_ENABLE_POSIX_MEMALIGN )
-  else if ( arg_alloc_mech == HostSpace::POSIX_MEMALIGN ) {
-    m_alloc_mech = HostSpace::POSIX_MEMALIGN ;
+#elif defined(KOKKOS_ENABLE_POSIX_MEMALIGN)
+  else if (arg_alloc_mech == HostSpace::POSIX_MEMALIGN) {
+    m_alloc_mech = HostSpace::POSIX_MEMALIGN;
   }
-#elif defined( KOKKOS_IMPL_POSIX_MMAP_FLAGS )
-  else if ( arg_alloc_mech == HostSpace::POSIX_MMAP ) {
-    m_alloc_mech = HostSpace::POSIX_MMAP ;
+#elif defined(KOKKOS_IMPL_POSIX_MMAP_FLAGS)
+  else if (arg_alloc_mech == HostSpace::POSIX_MMAP) {
+    m_alloc_mech = HostSpace::POSIX_MMAP;
   }
 #endif
   else {
-    const char * const mech =
-      ( arg_alloc_mech == HostSpace::INTEL_MM_ALLOC ) ? "INTEL_MM_ALLOC" : (
-      ( arg_alloc_mech == HostSpace::POSIX_MEMALIGN ) ? "POSIX_MEMALIGN" : (
-      ( arg_alloc_mech == HostSpace::POSIX_MMAP     ) ? "POSIX_MMAP" : "" ));
+    const char *const mech =
+        (arg_alloc_mech == HostSpace::INTEL_MM_ALLOC)
+            ? "INTEL_MM_ALLOC"
+            : ((arg_alloc_mech == HostSpace::POSIX_MEMALIGN)
+                   ? "POSIX_MEMALIGN"
+                   : ((arg_alloc_mech == HostSpace::POSIX_MMAP) ? "POSIX_MMAP"
+                                                                : ""));
 
-    std::string msg ;
+    std::string msg;
     msg.append("Kokkos::HostSpace ");
     msg.append(mech);
-    msg.append(" is not available" );
-    Kokkos::Impl::throw_runtime_exception( msg );
+    msg.append(" is not available");
+    Kokkos::Impl::throw_runtime_exception(msg);
   }
 }
 
-void * HostSpace::allocate( const size_t arg_alloc_size ) const
-{
-  static_assert( sizeof(void*) == sizeof(uintptr_t)
-               , "Error sizeof(void*) != sizeof(uintptr_t)" );
+void *HostSpace::allocate(const size_t arg_alloc_size) const {
+  static_assert(sizeof(void *) == sizeof(uintptr_t),
+                "Error sizeof(void*) != sizeof(uintptr_t)");
 
-  static_assert( Kokkos::Impl::is_integral_power_of_two( Kokkos::Impl::MEMORY_ALIGNMENT )
-               , "Memory alignment must be power of two" );
+  static_assert(
+      Kokkos::Impl::is_integral_power_of_two(Kokkos::Impl::MEMORY_ALIGNMENT),
+      "Memory alignment must be power of two");
 
-  constexpr uintptr_t alignment = Kokkos::Impl::MEMORY_ALIGNMENT ;
-  constexpr uintptr_t alignment_mask = alignment - 1 ;
+  constexpr uintptr_t alignment      = Kokkos::Impl::MEMORY_ALIGNMENT;
+  constexpr uintptr_t alignment_mask = alignment - 1;
 
-  void * ptr = 0 ;
+  void *ptr = nullptr;
 
-  if ( arg_alloc_size ) {
-
-    if ( m_alloc_mech == STD_MALLOC ) {
+  if (arg_alloc_size) {
+    if (m_alloc_mech == STD_MALLOC) {
       // Over-allocate to and round up to guarantee proper alignment.
-      size_t size_padded = arg_alloc_size + sizeof(void*) + alignment ;
+      size_t size_padded = arg_alloc_size + sizeof(void *) + alignment;
 
-      void * alloc_ptr = malloc( size_padded );
+      void *alloc_ptr = malloc(size_padded);
 
       if (alloc_ptr) {
-        uintptr_t address = reinterpret_cast<uintptr_t>(alloc_ptr);
+        auto address = reinterpret_cast<uintptr_t>(alloc_ptr);
 
         // offset enough to record the alloc_ptr
         address += sizeof(void *);
-        uintptr_t rem = address % alignment;
+        uintptr_t rem    = address % alignment;
         uintptr_t offset = rem ? (alignment - rem) : 0u;
         address += offset;
         ptr = reinterpret_cast<void *>(address);
@@ -192,104 +199,115 @@ void * HostSpace::allocate( const size_t arg_alloc_size ) const
         *reinterpret_cast<void **>(address) = alloc_ptr;
       }
     }
-
-#if defined( KOKKOS_ENABLE_INTEL_MM_ALLOC )
-    else if ( m_alloc_mech == INTEL_MM_ALLOC ) {
-      ptr = _mm_malloc( arg_alloc_size , alignment );
+#if defined(KOKKOS_ENABLE_INTEL_MM_ALLOC)
+    else if (m_alloc_mech == INTEL_MM_ALLOC) {
+      ptr = _mm_malloc(arg_alloc_size, alignment);
     }
 #endif
 
-#if defined( KOKKOS_ENABLE_POSIX_MEMALIGN )
-    else if ( m_alloc_mech == POSIX_MEMALIGN ) {
-      posix_memalign( & ptr, alignment , arg_alloc_size );
+#if defined(KOKKOS_ENABLE_POSIX_MEMALIGN)
+    else if (m_alloc_mech == POSIX_MEMALIGN) {
+      posix_memalign(&ptr, alignment, arg_alloc_size);
     }
 #endif
 
-#if defined( KOKKOS_IMPL_POSIX_MMAP_FLAGS )
-    else if ( m_alloc_mech == POSIX_MMAP ) {
+#if defined(KOKKOS_IMPL_POSIX_MMAP_FLAGS)
+    else if (m_alloc_mech == POSIX_MMAP) {
       constexpr size_t use_huge_pages = (1u << 27);
-      constexpr int    prot  = PROT_READ | PROT_WRITE ;
-      const int flags = arg_alloc_size < use_huge_pages
-                      ? KOKKOS_IMPL_POSIX_MMAP_FLAGS
-                      : KOKKOS_IMPL_POSIX_MMAP_FLAGS_HUGE ;
+      constexpr int prot              = PROT_READ | PROT_WRITE;
+      const int flags                 = arg_alloc_size < use_huge_pages
+                            ? KOKKOS_IMPL_POSIX_MMAP_FLAGS
+                            : KOKKOS_IMPL_POSIX_MMAP_FLAGS_HUGE;
 
       // read write access to private memory
 
-      ptr = mmap( NULL /* address hint, if NULL OS kernel chooses address */
-                , arg_alloc_size /* size in bytes */
-                , prot           /* memory protection */
-                , flags          /* visibility of updates */
-                , -1             /* file descriptor */
-                ,  0             /* offset */
-                );
+      ptr = mmap(NULL /* address hint, if NULL OS kernel chooses address */
+                 ,
+                 arg_alloc_size /* size in bytes */
+                 ,
+                 prot /* memory protection */
+                 ,
+                 flags /* visibility of updates */
+                 ,
+                 -1 /* file descriptor */
+                 ,
+                 0 /* offset */
+      );
 
-/* Associated reallocation:
-       ptr = mremap( old_ptr , old_size , new_size , MREMAP_MAYMOVE );
-*/
+      /* Associated reallocation:
+             ptr = mremap( old_ptr , old_size , new_size , MREMAP_MAYMOVE );
+      */
     }
 #endif
   }
 
-  if ( ( ptr == 0 ) || ( reinterpret_cast<uintptr_t>(ptr) == ~uintptr_t(0) )
-       || ( reinterpret_cast<uintptr_t>(ptr) & alignment_mask ) ) {
-    std::ostringstream msg ;
-    msg << "Kokkos::HostSpace::allocate[ " ;
-    switch( m_alloc_mech ) {
-    case STD_MALLOC: msg << "STD_MALLOC" ; break ;
-    case POSIX_MEMALIGN: msg << "POSIX_MEMALIGN" ; break ;
-    case POSIX_MMAP: msg << "POSIX_MMAP" ; break ;
-    case INTEL_MM_ALLOC: msg << "INTEL_MM_ALLOC" ; break ;
+  if ((ptr == nullptr) || (reinterpret_cast<uintptr_t>(ptr) == ~uintptr_t(0)) ||
+      (reinterpret_cast<uintptr_t>(ptr) & alignment_mask)) {
+    Experimental::RawMemoryAllocationFailure::FailureMode failure_mode =
+        Experimental::RawMemoryAllocationFailure::FailureMode::
+            AllocationNotAligned;
+    if (ptr == nullptr) {
+      failure_mode = Experimental::RawMemoryAllocationFailure::FailureMode::
+          OutOfMemoryError;
     }
-    msg << " ]( " << arg_alloc_size << " ) FAILED" ;
-    if ( ptr == NULL ) { msg << " NULL" ; }
-    else { msg << " NOT ALIGNED " << ptr ; }
 
-    std::cerr << msg.str() << std::endl ;
-    std::cerr.flush();
+    Experimental::RawMemoryAllocationFailure::AllocationMechanism alloc_mec =
+        Experimental::RawMemoryAllocationFailure::AllocationMechanism::
+            StdMalloc;
+    switch (m_alloc_mech) {
+      case STD_MALLOC: break;  // default
+      case POSIX_MEMALIGN:
+        alloc_mec = Experimental::RawMemoryAllocationFailure::
+            AllocationMechanism::PosixMemAlign;
+        break;
+      case POSIX_MMAP:
+        alloc_mec = Experimental::RawMemoryAllocationFailure::
+            AllocationMechanism::PosixMMap;
+        break;
+      case INTEL_MM_ALLOC:
+        alloc_mec = Experimental::RawMemoryAllocationFailure::
+            AllocationMechanism::IntelMMAlloc;
+        break;
+    }
 
-    Kokkos::Impl::throw_runtime_exception( msg.str() );
+    throw Kokkos::Experimental::RawMemoryAllocationFailure(
+        arg_alloc_size, alignment, failure_mode, alloc_mec);
   }
 
   return ptr;
 }
 
-
-void HostSpace::deallocate( void * const arg_alloc_ptr
-    , const size_t
-#if defined( KOKKOS_IMPL_POSIX_MMAP_FLAGS )
-    arg_alloc_size
+void HostSpace::deallocate(void *const arg_alloc_ptr, const size_t
+#if defined(KOKKOS_IMPL_POSIX_MMAP_FLAGS)
+                                                          arg_alloc_size
 #endif
-    ) const
-{
-  if ( arg_alloc_ptr ) {
-
-    if ( m_alloc_mech == STD_MALLOC ) {
-      void * alloc_ptr = *(reinterpret_cast<void **>(arg_alloc_ptr) -1);
-      free( alloc_ptr );
+                           ) const {
+  if (arg_alloc_ptr) {
+    if (m_alloc_mech == STD_MALLOC) {
+      void *alloc_ptr = *(reinterpret_cast<void **>(arg_alloc_ptr) - 1);
+      free(alloc_ptr);
     }
-
-#if defined( KOKKOS_ENABLE_INTEL_MM_ALLOC )
-    else if ( m_alloc_mech == INTEL_MM_ALLOC ) {
-      _mm_free( arg_alloc_ptr );
+#if defined(KOKKOS_ENABLE_INTEL_MM_ALLOC)
+    else if (m_alloc_mech == INTEL_MM_ALLOC) {
+      _mm_free(arg_alloc_ptr);
     }
 #endif
 
-#if defined( KOKKOS_ENABLE_POSIX_MEMALIGN )
-    else if ( m_alloc_mech == POSIX_MEMALIGN ) {
-      free( arg_alloc_ptr );
+#if defined(KOKKOS_ENABLE_POSIX_MEMALIGN)
+    else if (m_alloc_mech == POSIX_MEMALIGN) {
+      free(arg_alloc_ptr);
     }
 #endif
 
-#if defined( KOKKOS_IMPL_POSIX_MMAP_FLAGS )
-    else if ( m_alloc_mech == POSIX_MMAP ) {
-      munmap( arg_alloc_ptr , arg_alloc_size );
+#if defined(KOKKOS_IMPL_POSIX_MMAP_FLAGS)
+    else if (m_alloc_mech == POSIX_MMAP) {
+      munmap(arg_alloc_ptr, arg_alloc_size);
     }
 #endif
-
   }
 }
 
-} // namespace Kokkos
+}  // namespace Kokkos
 
 //----------------------------------------------------------------------------
 //----------------------------------------------------------------------------
@@ -298,208 +316,229 @@ namespace Kokkos {
 namespace Impl {
 
 #ifdef KOKKOS_DEBUG
-SharedAllocationRecord< void , void >
-SharedAllocationRecord< Kokkos::HostSpace , void >::s_root_record ;
+SharedAllocationRecord<void, void>
+    SharedAllocationRecord<Kokkos::HostSpace, void>::s_root_record;
 #endif
 
-void
-SharedAllocationRecord< Kokkos::HostSpace , void >::
-deallocate( SharedAllocationRecord< void , void > * arg_rec )
-{
-  delete static_cast<SharedAllocationRecord*>(arg_rec);
+void SharedAllocationRecord<Kokkos::HostSpace, void>::deallocate(
+    SharedAllocationRecord<void, void> *arg_rec) {
+  delete static_cast<SharedAllocationRecord *>(arg_rec);
 }
 
-SharedAllocationRecord< Kokkos::HostSpace , void >::
-~SharedAllocationRecord()
-{
-  #if defined(KOKKOS_ENABLE_PROFILING)
-  if(Kokkos::Profiling::profileLibraryLoaded()) {
-    Kokkos::Profiling::deallocateData(
-      Kokkos::Profiling::SpaceHandle(Kokkos::HostSpace::name()),RecordBase::m_alloc_ptr->m_label,
-      data(),size());
-  }
-  #endif
-
-  m_space.deallocate( SharedAllocationRecord< void , void >::m_alloc_ptr
-                    , SharedAllocationRecord< void , void >::m_alloc_size
-                    );
-}
-
-SharedAllocationRecord< Kokkos::HostSpace , void >::
-SharedAllocationRecord( const Kokkos::HostSpace & arg_space
-                      , const std::string       & arg_label
-                      , const size_t              arg_alloc_size
-                      , const SharedAllocationRecord< void , void >::function_type arg_dealloc
-                      )
-  // Pass through allocated [ SharedAllocationHeader , user_memory ]
-  // Pass through deallocation function
-  : SharedAllocationRecord< void , void >
-      (
-#ifdef KOKKOS_DEBUG
-      & SharedAllocationRecord< Kokkos::HostSpace , void >::s_root_record,
-#endif
-        reinterpret_cast<SharedAllocationHeader*>( arg_space.allocate( sizeof(SharedAllocationHeader) + arg_alloc_size ) )
-      , sizeof(SharedAllocationHeader) + arg_alloc_size
-      , arg_dealloc
-      )
-  , m_space( arg_space )
-{
+SharedAllocationRecord<Kokkos::HostSpace, void>::~SharedAllocationRecord() {
 #if defined(KOKKOS_ENABLE_PROFILING)
-  if(Kokkos::Profiling::profileLibraryLoaded()) {
-    Kokkos::Profiling::allocateData(Kokkos::Profiling::SpaceHandle(arg_space.name()),arg_label,data(),arg_alloc_size);
-   }
+  if (Kokkos::Profiling::profileLibraryLoaded()) {
+    Kokkos::Profiling::deallocateData(
+        Kokkos::Profiling::SpaceHandle(Kokkos::HostSpace::name()),
+        RecordBase::m_alloc_ptr->m_label, data(), size());
+  }
+#endif
+
+  m_space.deallocate(SharedAllocationRecord<void, void>::m_alloc_ptr,
+                     SharedAllocationRecord<void, void>::m_alloc_size);
+}
+
+SharedAllocationHeader *_do_allocation(Kokkos::HostSpace const &space,
+                                       std::string const &label,
+                                       size_t alloc_size) {
+  try {
+    return reinterpret_cast<SharedAllocationHeader *>(
+        space.allocate(alloc_size));
+  } catch (Experimental::RawMemoryAllocationFailure const &failure) {
+    if (failure.failure_mode() == Experimental::RawMemoryAllocationFailure::
+                                      FailureMode::AllocationNotAligned) {
+      // TODO: delete the misaligned memory
+    }
+
+    std::cerr << "Kokkos failed to allocate memory for label \"" << label
+              << "\".  Allocation using MemorySpace named \"" << space.name()
+              << " failed with the following error:  ";
+    failure.print_error_message(std::cerr);
+    std::cerr.flush();
+    Kokkos::Impl::throw_runtime_exception("Memory allocation failure");
+  }
+  return nullptr;  // unreachable
+}
+
+SharedAllocationRecord<Kokkos::HostSpace, void>::SharedAllocationRecord(
+    const Kokkos::HostSpace &arg_space, const std::string &arg_label,
+    const size_t arg_alloc_size,
+    const SharedAllocationRecord<void, void>::function_type arg_dealloc)
+    // Pass through allocated [ SharedAllocationHeader , user_memory ]
+    // Pass through deallocation function
+    : SharedAllocationRecord<void, void>(
+#ifdef KOKKOS_DEBUG
+          &SharedAllocationRecord<Kokkos::HostSpace, void>::s_root_record,
+#endif
+          Impl::checked_allocation_with_header(arg_space, arg_label,
+                                               arg_alloc_size),
+          sizeof(SharedAllocationHeader) + arg_alloc_size, arg_dealloc),
+      m_space(arg_space) {
+#if defined(KOKKOS_ENABLE_PROFILING)
+  if (Kokkos::Profiling::profileLibraryLoaded()) {
+    Kokkos::Profiling::allocateData(
+        Kokkos::Profiling::SpaceHandle(arg_space.name()), arg_label, data(),
+        arg_alloc_size);
+  }
 #endif
   // Fill in the Header information
-  RecordBase::m_alloc_ptr->m_record = static_cast< SharedAllocationRecord< void , void > * >( this );
+  RecordBase::m_alloc_ptr->m_record =
+      static_cast<SharedAllocationRecord<void, void> *>(this);
 
-  strncpy( RecordBase::m_alloc_ptr->m_label
-          , arg_label.c_str()
-          , SharedAllocationHeader::maximum_label_length
-          );
+  strncpy(RecordBase::m_alloc_ptr->m_label, arg_label.c_str(),
+          SharedAllocationHeader::maximum_label_length);
   // Set last element zero, in case c_str is too long
-  RecordBase::m_alloc_ptr->m_label[SharedAllocationHeader::maximum_label_length - 1] = (char) 0;
+  RecordBase::m_alloc_ptr
+      ->m_label[SharedAllocationHeader::maximum_label_length - 1] = (char)0;
 }
 
 //----------------------------------------------------------------------------
 
-void * SharedAllocationRecord< Kokkos::HostSpace , void >::
-allocate_tracked( const Kokkos::HostSpace & arg_space
-                , const std::string & arg_alloc_label
-                , const size_t arg_alloc_size )
-{
-  if ( ! arg_alloc_size ) return (void *) 0 ;
+void *SharedAllocationRecord<Kokkos::HostSpace, void>::allocate_tracked(
+    const Kokkos::HostSpace &arg_space, const std::string &arg_alloc_label,
+    const size_t arg_alloc_size) {
+  if (!arg_alloc_size) return (void *)nullptr;
 
-  SharedAllocationRecord * const r =
-    allocate( arg_space , arg_alloc_label , arg_alloc_size );
+  SharedAllocationRecord *const r =
+      allocate(arg_space, arg_alloc_label, arg_alloc_size);
 
-  RecordBase::increment( r );
+  RecordBase::increment(r);
 
   return r->data();
 }
 
-void SharedAllocationRecord< Kokkos::HostSpace , void >::
-deallocate_tracked( void * const arg_alloc_ptr )
-{
-  if ( arg_alloc_ptr != 0 ) {
-    SharedAllocationRecord * const r = get_record( arg_alloc_ptr );
+void SharedAllocationRecord<Kokkos::HostSpace, void>::deallocate_tracked(
+    void *const arg_alloc_ptr) {
+  if (arg_alloc_ptr != 0) {
+    SharedAllocationRecord *const r = get_record(arg_alloc_ptr);
 
-    RecordBase::decrement( r );
+    RecordBase::decrement(r);
   }
 }
 
-void * SharedAllocationRecord< Kokkos::HostSpace , void >::
-reallocate_tracked( void * const arg_alloc_ptr
-                  , const size_t arg_alloc_size )
-{
-  SharedAllocationRecord * const r_old = get_record( arg_alloc_ptr );
-  SharedAllocationRecord * const r_new = allocate( r_old->m_space , r_old->get_label() , arg_alloc_size );
+void *SharedAllocationRecord<Kokkos::HostSpace, void>::reallocate_tracked(
+    void *const arg_alloc_ptr, const size_t arg_alloc_size) {
+  SharedAllocationRecord *const r_old = get_record(arg_alloc_ptr);
+  SharedAllocationRecord *const r_new =
+      allocate(r_old->m_space, r_old->get_label(), arg_alloc_size);
 
-  Kokkos::Impl::DeepCopy<HostSpace,HostSpace>( r_new->data() , r_old->data()
-                                             , std::min( r_old->size() , r_new->size() ) );
+  Kokkos::Impl::DeepCopy<HostSpace, HostSpace>(
+      r_new->data(), r_old->data(), std::min(r_old->size(), r_new->size()));
 
-  RecordBase::increment( r_new );
-  RecordBase::decrement( r_old );
+  RecordBase::increment(r_new);
+  RecordBase::decrement(r_old);
 
   return r_new->data();
 }
 
-SharedAllocationRecord< Kokkos::HostSpace , void > *
-SharedAllocationRecord< Kokkos::HostSpace , void >::get_record( void * alloc_ptr )
-{
-  typedef SharedAllocationHeader  Header ;
-  typedef SharedAllocationRecord< Kokkos::HostSpace , void >  RecordHost ;
+SharedAllocationRecord<Kokkos::HostSpace, void> *
+SharedAllocationRecord<Kokkos::HostSpace, void>::get_record(void *alloc_ptr) {
+  typedef SharedAllocationHeader Header;
+  typedef SharedAllocationRecord<Kokkos::HostSpace, void> RecordHost;
 
-  SharedAllocationHeader const * const head   = alloc_ptr ? Header::get_header( alloc_ptr ) : (SharedAllocationHeader *)0 ;
-  RecordHost                   * const record = head ? static_cast< RecordHost * >( head->m_record ) : (RecordHost *) 0 ;
+  SharedAllocationHeader const *const head =
+      alloc_ptr ? Header::get_header(alloc_ptr) : (SharedAllocationHeader *)0;
+  RecordHost *const record =
+      head ? static_cast<RecordHost *>(head->m_record) : (RecordHost *)0;
 
-  if ( ! alloc_ptr || record->m_alloc_ptr != head ) {
-    Kokkos::Impl::throw_runtime_exception( std::string("Kokkos::Impl::SharedAllocationRecord< Kokkos::HostSpace , void >::get_record ERROR" ) );
+  if (!alloc_ptr || record->m_alloc_ptr != head) {
+    Kokkos::Impl::throw_runtime_exception(
+        std::string("Kokkos::Impl::SharedAllocationRecord< Kokkos::HostSpace , "
+                    "void >::get_record ERROR"));
   }
 
-  return record ;
+  return record;
 }
 
 // Iterate records to print orphaned memory ...
 #ifdef KOKKOS_DEBUG
-void SharedAllocationRecord< Kokkos::HostSpace , void >::
-print_records( std::ostream & s , const Kokkos::HostSpace & , bool detail )
-{
-  SharedAllocationRecord< void , void >::print_host_accessible_records( s , "HostSpace" , & s_root_record , detail );
+void SharedAllocationRecord<Kokkos::HostSpace, void>::print_records(
+    std::ostream &s, const Kokkos::HostSpace &, bool detail) {
+  SharedAllocationRecord<void, void>::print_host_accessible_records(
+      s, "HostSpace", &s_root_record, detail);
 }
 #else
-void SharedAllocationRecord< Kokkos::HostSpace , void >::
-print_records( std::ostream & , const Kokkos::HostSpace & , bool )
-{
-  throw_runtime_exception("SharedAllocationRecord<HostSpace>::print_records only works with KOKKOS_DEBUG enabled");
+void SharedAllocationRecord<Kokkos::HostSpace, void>::print_records(
+    std::ostream &, const Kokkos::HostSpace &, bool) {
+  throw_runtime_exception(
+      "SharedAllocationRecord<HostSpace>::print_records only works with "
+      "KOKKOS_DEBUG enabled");
 }
 #endif
 
-} // namespace Impl
-} // namespace Kokkos
+}  // namespace Impl
+}  // namespace Kokkos
 
 /*--------------------------------------------------------------------------*/
 /*--------------------------------------------------------------------------*/
 
 namespace Kokkos {
 namespace {
-  const unsigned HOST_SPACE_ATOMIC_MASK = 0xFFFF;
-  const unsigned HOST_SPACE_ATOMIC_XOR_MASK = 0x5A39;
-  static int HOST_SPACE_ATOMIC_LOCKS[HOST_SPACE_ATOMIC_MASK+1];
-}
+const unsigned HOST_SPACE_ATOMIC_MASK     = 0xFFFF;
+const unsigned HOST_SPACE_ATOMIC_XOR_MASK = 0x5A39;
+static int HOST_SPACE_ATOMIC_LOCKS[HOST_SPACE_ATOMIC_MASK + 1];
+}  // namespace
 
 namespace Impl {
 void init_lock_array_host_space() {
   static int is_initialized = 0;
-  if(! is_initialized)
-    for(int i = 0; i < static_cast<int> (HOST_SPACE_ATOMIC_MASK+1); i++)
+  if (!is_initialized)
+    for (int i = 0; i < static_cast<int>(HOST_SPACE_ATOMIC_MASK + 1); i++)
       HOST_SPACE_ATOMIC_LOCKS[i] = 0;
 }
 
-bool lock_address_host_space(void* ptr) {
-#if defined( KOKKOS_ENABLE_ISA_X86_64 ) && defined ( KOKKOS_ENABLE_TM )
+bool lock_address_host_space(void *ptr) {
+#if defined(KOKKOS_ENABLE_ISA_X86_64) && defined(KOKKOS_ENABLE_TM) && \
+    !defined(KOKKOS_COMPILER_PGI)
   const unsigned status = _xbegin();
 
-  if( _XBEGIN_STARTED == status ) {
-	const int val = HOST_SPACE_ATOMIC_LOCKS[(( size_t(ptr) >> 2 ) &
-		HOST_SPACE_ATOMIC_MASK) ^ HOST_SPACE_ATOMIC_XOR_MASK];
+  if (_XBEGIN_STARTED == status) {
+    const int val =
+        HOST_SPACE_ATOMIC_LOCKS[((size_t(ptr) >> 2) & HOST_SPACE_ATOMIC_MASK) ^
+                                HOST_SPACE_ATOMIC_XOR_MASK];
 
-	if( 0 == val ) {
-		HOST_SPACE_ATOMIC_LOCKS[(( size_t(ptr) >> 2 ) &
-                   HOST_SPACE_ATOMIC_MASK) ^ HOST_SPACE_ATOMIC_XOR_MASK] = 1;
-	} else {
-		_xabort( 1 );
-	}
+    if (0 == val) {
+      HOST_SPACE_ATOMIC_LOCKS[((size_t(ptr) >> 2) & HOST_SPACE_ATOMIC_MASK) ^
+                              HOST_SPACE_ATOMIC_XOR_MASK] = 1;
+    } else {
+      _xabort(1);
+    }
 
-	_xend();
+    _xend();
 
-	return 1;
+    return 1;
   } else {
 #endif
-  return 0 == atomic_compare_exchange( &HOST_SPACE_ATOMIC_LOCKS[
-      (( size_t(ptr) >> 2 ) & HOST_SPACE_ATOMIC_MASK) ^ HOST_SPACE_ATOMIC_XOR_MASK] ,
-                                  0 , 1);
-#if defined( KOKKOS_ENABLE_ISA_X86_64 ) && defined ( KOKKOS_ENABLE_TM )
+    return 0 == atomic_compare_exchange(
+                    &HOST_SPACE_ATOMIC_LOCKS[((size_t(ptr) >> 2) &
+                                              HOST_SPACE_ATOMIC_MASK) ^
+                                             HOST_SPACE_ATOMIC_XOR_MASK],
+                    0, 1);
+#if defined(KOKKOS_ENABLE_ISA_X86_64) && defined(KOKKOS_ENABLE_TM) && \
+    !defined(KOKKOS_COMPILER_PGI)
   }
 #endif
 }
 
-void unlock_address_host_space(void* ptr) {
-#if defined( KOKKOS_ENABLE_ISA_X86_64 ) && defined ( KOKKOS_ENABLE_TM )
+void unlock_address_host_space(void *ptr) {
+#if defined(KOKKOS_ENABLE_ISA_X86_64) && defined(KOKKOS_ENABLE_TM) && \
+    !defined(KOKKOS_COMPILER_PGI)
   const unsigned status = _xbegin();
 
-  if( _XBEGIN_STARTED == status ) {
-	HOST_SPACE_ATOMIC_LOCKS[(( size_t(ptr) >> 2 ) &
-        	HOST_SPACE_ATOMIC_MASK) ^ HOST_SPACE_ATOMIC_XOR_MASK] = 0;
+  if (_XBEGIN_STARTED == status) {
+    HOST_SPACE_ATOMIC_LOCKS[((size_t(ptr) >> 2) & HOST_SPACE_ATOMIC_MASK) ^
+                            HOST_SPACE_ATOMIC_XOR_MASK] = 0;
   } else {
 #endif
-   atomic_exchange( &HOST_SPACE_ATOMIC_LOCKS[
-      (( size_t(ptr) >> 2 ) & HOST_SPACE_ATOMIC_MASK) ^ HOST_SPACE_ATOMIC_XOR_MASK] ,
-                    0);
-#if defined( KOKKOS_ENABLE_ISA_X86_64 ) && defined ( KOKKOS_ENABLE_TM )
+    atomic_exchange(
+        &HOST_SPACE_ATOMIC_LOCKS[((size_t(ptr) >> 2) & HOST_SPACE_ATOMIC_MASK) ^
+                                 HOST_SPACE_ATOMIC_XOR_MASK],
+        0);
+#if defined(KOKKOS_ENABLE_ISA_X86_64) && defined(KOKKOS_ENABLE_TM) && \
+    !defined(KOKKOS_COMPILER_PGI)
   }
 #endif
 }
 
-}
-}
-
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/impl/Kokkos_HostSpace_deepcopy.cpp b/lib/kokkos/core/src/impl/Kokkos_HostSpace_deepcopy.cpp
index 21b95f6985..35eee40ab7 100644
--- a/lib/kokkos/core/src/impl/Kokkos_HostSpace_deepcopy.cpp
+++ b/lib/kokkos/core/src/impl/Kokkos_HostSpace_deepcopy.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -49,86 +50,94 @@ namespace Kokkos {
 namespace Impl {
 
 #ifndef KOKKOS_IMPL_HOST_DEEP_COPY_SERIAL_LIMIT
-#define KOKKOS_IMPL_HOST_DEEP_COPY_SERIAL_LIMIT 10*8192
+#define KOKKOS_IMPL_HOST_DEEP_COPY_SERIAL_LIMIT 10 * 8192
 #endif
 
-void hostspace_parallel_deepcopy(void * dst, const void * src, ptrdiff_t n) {
-  if((n<KOKKOS_IMPL_HOST_DEEP_COPY_SERIAL_LIMIT) || (Kokkos::DefaultHostExecutionSpace().concurrency()==1)) {
-    std::memcpy(dst,src,n);
+void hostspace_parallel_deepcopy(void* dst, const void* src, ptrdiff_t n) {
+  if ((n < KOKKOS_IMPL_HOST_DEEP_COPY_SERIAL_LIMIT) ||
+      (Kokkos::DefaultHostExecutionSpace().concurrency() == 1)) {
+    std::memcpy(dst, src, n);
     return;
   }
 
   typedef Kokkos::RangePolicy<Kokkos::DefaultHostExecutionSpace> policy_t;
 
   // Both src and dst are aligned the same way with respect to 8 byte words
-  if(reinterpret_cast<ptrdiff_t>(src)%8 == reinterpret_cast<ptrdiff_t>(dst)%8) {
-    char* dst_c = reinterpret_cast<char*>(dst);
+  if (reinterpret_cast<ptrdiff_t>(src) % 8 ==
+      reinterpret_cast<ptrdiff_t>(dst) % 8) {
+    char* dst_c       = reinterpret_cast<char*>(dst);
     const char* src_c = reinterpret_cast<const char*>(src);
-    int count = 0;
+    int count         = 0;
     // get initial bytes copied
-    while(reinterpret_cast<ptrdiff_t>(dst_c)%8!=0) {
-      *dst_c=*src_c;
-      dst_c++; src_c++; count++;
+    while (reinterpret_cast<ptrdiff_t>(dst_c) % 8 != 0) {
+      *dst_c = *src_c;
+      dst_c++;
+      src_c++;
+      count++;
     }
 
     // copy the bulk of the data
-    double* dst_p = reinterpret_cast<double*>(dst_c);
+    double* dst_p       = reinterpret_cast<double*>(dst_c);
     const double* src_p = reinterpret_cast<const double*>(src_c);
-    Kokkos::parallel_for("Kokkos::Impl::host_space_deepcopy_double",policy_t(0,(n-count)/8),[=](const ptrdiff_t i) {
-      dst_p[i] = src_p[i];
-    });
+    Kokkos::parallel_for("Kokkos::Impl::host_space_deepcopy_double",
+                         policy_t(0, (n - count) / 8),
+                         [=](const ptrdiff_t i) { dst_p[i] = src_p[i]; });
 
     // get final data copied
-    dst_c += ((n-count)/8) * 8;
-    src_c += ((n-count)/8) * 8;
-    char* dst_end = reinterpret_cast<char*>(dst)+n;
-    while(dst_c != dst_end) {
+    dst_c += ((n - count) / 8) * 8;
+    src_c += ((n - count) / 8) * 8;
+    char* dst_end = reinterpret_cast<char*>(dst) + n;
+    while (dst_c != dst_end) {
       *dst_c = *src_c;
-      dst_c++; src_c++;
+      dst_c++;
+      src_c++;
     }
     return;
   }
 
   // Both src and dst are aligned the same way with respect to 4 byte words
-  if(reinterpret_cast<ptrdiff_t>(src)%4 == reinterpret_cast<ptrdiff_t>(dst)%4) {
-    char* dst_c = reinterpret_cast<char*>(dst);
+  if (reinterpret_cast<ptrdiff_t>(src) % 4 ==
+      reinterpret_cast<ptrdiff_t>(dst) % 4) {
+    char* dst_c       = reinterpret_cast<char*>(dst);
     const char* src_c = reinterpret_cast<const char*>(src);
-    int count = 0;
+    int count         = 0;
     // get initial bytes copied
-    while(reinterpret_cast<ptrdiff_t>(dst_c)%4!=0) {
-      *dst_c=*src_c;
-      dst_c++; src_c++; count++;
+    while (reinterpret_cast<ptrdiff_t>(dst_c) % 4 != 0) {
+      *dst_c = *src_c;
+      dst_c++;
+      src_c++;
+      count++;
     }
 
     // copy the bulk of the data
-    int32_t* dst_p = reinterpret_cast<int32_t*>(dst_c);
+    int32_t* dst_p       = reinterpret_cast<int32_t*>(dst_c);
     const int32_t* src_p = reinterpret_cast<const int32_t*>(src_c);
-    Kokkos::parallel_for("Kokkos::Impl::host_space_deepcopy_int",policy_t(0,(n-count)/4),[=](const ptrdiff_t i) {
-      dst_p[i] = src_p[i];
-    });
+    Kokkos::parallel_for("Kokkos::Impl::host_space_deepcopy_int",
+                         policy_t(0, (n - count) / 4),
+                         [=](const ptrdiff_t i) { dst_p[i] = src_p[i]; });
 
     // get final data copied
-    dst_c += ((n-count)/4) * 4;
-    src_c += ((n-count)/4) * 4;
-    char* dst_end = reinterpret_cast<char*>(dst)+n;
-    while(dst_c != dst_end) {
+    dst_c += ((n - count) / 4) * 4;
+    src_c += ((n - count) / 4) * 4;
+    char* dst_end = reinterpret_cast<char*>(dst) + n;
+    while (dst_c != dst_end) {
       *dst_c = *src_c;
-      dst_c++; src_c++;
+      dst_c++;
+      src_c++;
     }
     return;
   }
 
   // Src and dst are not aligned the same way, we can only to byte wise copy.
   {
-    char* dst_p = reinterpret_cast<char*>(dst);
+    char* dst_p       = reinterpret_cast<char*>(dst);
     const char* src_p = reinterpret_cast<const char*>(src);
-    Kokkos::parallel_for("Kokkos::Impl::host_space_deepcopy_char",policy_t(0,n),[=](const ptrdiff_t i) {
-      dst_p[i] = src_p[i];
-    });
+    Kokkos::parallel_for("Kokkos::Impl::host_space_deepcopy_char",
+                         policy_t(0, n),
+                         [=](const ptrdiff_t i) { dst_p[i] = src_p[i]; });
   }
 }
 
-} // namespace Impl
-
-} // namespace Kokkos
+}  // namespace Impl
 
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/impl/Kokkos_HostSpace_deepcopy.hpp b/lib/kokkos/core/src/impl/Kokkos_HostSpace_deepcopy.hpp
index b8aea95363..e9e0ef52a0 100644
--- a/lib/kokkos/core/src/impl/Kokkos_HostSpace_deepcopy.hpp
+++ b/lib/kokkos/core/src/impl/Kokkos_HostSpace_deepcopy.hpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -40,15 +41,14 @@
 // ************************************************************************
 //@HEADER
 */
-#include<cstdint>
+#include <cstdint>
 
 namespace Kokkos {
 
 namespace Impl {
 
-void hostspace_parallel_deepcopy(void * dst, const void * src, ptrdiff_t n);
+void hostspace_parallel_deepcopy(void* dst, const void* src, ptrdiff_t n);
 
-} // namespace Impl
-
-} // namespace Kokkos
+}  // namespace Impl
 
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/impl/Kokkos_HostThreadTeam.cpp b/lib/kokkos/core/src/impl/Kokkos_HostThreadTeam.cpp
index ccb8393d08..92e9aa24b0 100644
--- a/lib/kokkos/core/src/impl/Kokkos_HostThreadTeam.cpp
+++ b/lib/kokkos/core/src/impl/Kokkos_HostThreadTeam.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -53,126 +54,119 @@
 namespace Kokkos {
 namespace Impl {
 
-void HostThreadTeamData::organize_pool
-  ( HostThreadTeamData * members[] , const int size )
-{
-  bool ok = true ;
+void HostThreadTeamData::organize_pool(HostThreadTeamData *members[],
+                                       const int size) {
+  bool ok = true;
 
   memory_fence();
 
   // Verify not already a member of a pool:
-  for ( int rank = 0 ; rank < size && ok ; ++rank ) {
-    ok = ( nullptr != members[rank] ) && ( 0 == members[rank]->m_pool_scratch );
+  for (int rank = 0; rank < size && ok; ++rank) {
+    ok = (nullptr != members[rank]) && (0 == members[rank]->m_pool_scratch);
   }
 
-  if ( ok ) {
+  if (ok) {
+    int64_t *const root_scratch = members[0]->m_scratch;
 
-    int64_t * const root_scratch = members[0]->m_scratch ;
-
-    for ( int i = m_pool_rendezvous ; i < m_pool_reduce ; ++i ) {
-      root_scratch[i] = 0 ;
+    for (int i = m_pool_rendezvous; i < m_pool_reduce; ++i) {
+      root_scratch[i] = 0;
     }
 
     {
-      HostThreadTeamData ** const pool =
-        (HostThreadTeamData **) (root_scratch + m_pool_members);
+      HostThreadTeamData **const pool =
+          (HostThreadTeamData **)(root_scratch + m_pool_members);
 
       // team size == 1, league size == pool_size
 
-      for ( int rank = 0 ; rank < size ; ++rank ) {
-        HostThreadTeamData * const mem = members[ rank ] ;
-        mem->m_pool_scratch = root_scratch ;
-        mem->m_team_scratch = mem->m_scratch ;
-        mem->m_pool_rank    = rank ;
-        mem->m_pool_size    = size ;
-        mem->m_team_base    = rank ;
-        mem->m_team_rank    = 0 ;
-        mem->m_team_size    = 1 ;
-        mem->m_team_alloc   = 1 ;
-        mem->m_league_rank  = rank ;
-        mem->m_league_size  = size ;
-        mem->m_team_rendezvous_step = 0 ;
-        pool[ rank ] = mem ;
+      for (int rank = 0; rank < size; ++rank) {
+        HostThreadTeamData *const mem = members[rank];
+        mem->m_pool_scratch           = root_scratch;
+        mem->m_team_scratch           = mem->m_scratch;
+        mem->m_pool_rank              = rank;
+        mem->m_pool_size              = size;
+        mem->m_team_base              = rank;
+        mem->m_team_rank              = 0;
+        mem->m_team_size              = 1;
+        mem->m_team_alloc             = 1;
+        mem->m_league_rank            = rank;
+        mem->m_league_size            = size;
+        mem->m_team_rendezvous_step   = 0;
+        pool[rank]                    = mem;
       }
     }
 
     Kokkos::memory_fence();
-  }
-  else {
-    Kokkos::Impl::throw_runtime_exception("Kokkos::Impl::HostThreadTeamData::organize_pool ERROR pool already exists");
+  } else {
+    Kokkos::Impl::throw_runtime_exception(
+        "Kokkos::Impl::HostThreadTeamData::organize_pool ERROR pool already "
+        "exists");
   }
 }
 
-void HostThreadTeamData::disband_pool()
-{
-   m_work_range.first  = -1 ;
-   m_work_range.second = -1 ;
-   m_pool_scratch = 0 ;
-   m_team_scratch = 0 ;
-   m_pool_rank    = 0 ;
-   m_pool_size    = 1 ;
-   m_team_base    = 0 ;
-   m_team_rank    = 0 ;
-   m_team_size    = 1 ;
-   m_team_alloc   = 1 ;
-   m_league_rank  = 0 ;
-   m_league_size  = 1 ;
-   m_team_rendezvous_step = 0 ;
+void HostThreadTeamData::disband_pool() {
+  m_work_range.first     = -1;
+  m_work_range.second    = -1;
+  m_pool_scratch         = 0;
+  m_team_scratch         = 0;
+  m_pool_rank            = 0;
+  m_pool_size            = 1;
+  m_team_base            = 0;
+  m_team_rank            = 0;
+  m_team_size            = 1;
+  m_team_alloc           = 1;
+  m_league_rank          = 0;
+  m_league_size          = 1;
+  m_team_rendezvous_step = 0;
 }
 
-int HostThreadTeamData::organize_team( const int team_size )
-{
+int HostThreadTeamData::organize_team(const int team_size) {
   // Pool is initialized
-  const bool ok_pool = 0 != m_pool_scratch ;
+  const bool ok_pool = 0 != m_pool_scratch;
 
   // Team is not set
   const bool ok_team =
-    m_team_scratch == m_scratch &&
-    m_team_base    == m_pool_rank &&
-    m_team_rank    == 0 &&
-    m_team_size    == 1 &&
-    m_team_alloc   == 1 &&
-    m_league_rank  == m_pool_rank &&
-    m_league_size  == m_pool_size ;
+      m_team_scratch == m_scratch && m_team_base == m_pool_rank &&
+      m_team_rank == 0 && m_team_size == 1 && m_team_alloc == 1 &&
+      m_league_rank == m_pool_rank && m_league_size == m_pool_size;
 
-  if ( ok_pool && ok_team ) {
+  if (ok_pool && ok_team) {
+    if (team_size <= 0) return 0;  // No teams to organize
 
-    if ( team_size <= 0 ) return 0 ; // No teams to organize
+    if (team_size == 1) return 1;  // Already organized in teams of one
 
-    if ( team_size == 1 ) return 1 ; // Already organized in teams of one
-
-    HostThreadTeamData * const * const pool =
-      (HostThreadTeamData **) (m_pool_scratch + m_pool_members);
+    HostThreadTeamData *const *const pool =
+        (HostThreadTeamData **)(m_pool_scratch + m_pool_members);
 
     // "league_size" in this context is the number of concurrent teams
     // that the pool can accommodate.  Excess threads are idle.
-    const int league_size     = m_pool_size / team_size ;
-    const int team_alloc_size = m_pool_size / league_size ;
-    const int team_alloc_rank = m_pool_rank % team_alloc_size ;
-    const int league_rank     = m_pool_rank / team_alloc_size ;
-    const int team_base_rank  = league_rank * team_alloc_size ;
+    const int league_size     = m_pool_size / team_size;
+    const int team_alloc_size = m_pool_size / league_size;
+    const int team_alloc_rank = m_pool_rank % team_alloc_size;
+    const int league_rank     = m_pool_rank / team_alloc_size;
+    const int team_base_rank  = league_rank * team_alloc_size;
 
-    m_team_scratch = pool[ team_base_rank ]->m_scratch ;
-    m_team_base    = team_base_rank ;
+    m_team_scratch = pool[team_base_rank]->m_scratch;
+    m_team_base    = team_base_rank;
     // This needs to check overflow, if m_pool_size % team_alloc_size !=0
     // there are two corner cases:
     // (i) if team_alloc_size == team_size there might be a non-full
     //     zombi team around (for example m_pool_size = 5 and team_size = 2
     // (ii) if team_alloc > team_size then the last team might have less
     //      threads than the others
-    m_team_rank    = ( team_base_rank + team_size <= m_pool_size ) &&
-                     ( team_alloc_rank < team_size ) ?
-                     team_alloc_rank : -1;
-    m_team_size    = team_size ;
-    m_team_alloc   = team_alloc_size ;
-    m_league_rank  = league_rank ;
-    m_league_size  = league_size ;
-    m_team_rendezvous_step = 0 ;
+    m_team_rank = (team_base_rank + team_size <= m_pool_size) &&
+                          (team_alloc_rank < team_size)
+                      ? team_alloc_rank
+                      : -1;
+    m_team_size            = team_size;
+    m_team_alloc           = team_alloc_size;
+    m_league_rank          = league_rank;
+    m_league_size          = league_size;
+    m_team_rendezvous_step = 0;
 
-    if ( team_base_rank == m_pool_rank ) {
+    if (team_base_rank == m_pool_rank) {
       // Initialize team's rendezvous memory
-      for ( int i = m_team_rendezvous ; i < m_pool_reduce ; ++i ) {
-        m_scratch[i] = 0 ;
+      for (int i = m_team_rendezvous; i < m_pool_reduce; ++i) {
+        m_scratch[i] = 0;
       }
       // Make sure team's rendezvous memory initialized
       // is written before proceeding.
@@ -183,131 +177,121 @@ int HostThreadTeamData::organize_team( const int team_size )
     // entire pool to insure proper initialization of the team
     // rendezvous mechanism before a team rendezvous can be performed.
 
-    if ( pool_rendezvous() ) {
+    if (pool_rendezvous()) {
       pool_rendezvous_release();
     }
-  }
-  else {
-    Kokkos::Impl::throw_runtime_exception("Kokkos::Impl::HostThreadTeamData::organize_team ERROR");
+  } else {
+    Kokkos::Impl::throw_runtime_exception(
+        "Kokkos::Impl::HostThreadTeamData::organize_team ERROR");
   }
 
-  return 0 <= m_team_rank ;
+  return 0 <= m_team_rank;
 }
 
-void HostThreadTeamData::disband_team()
-{
-  m_team_scratch = m_scratch ;
-  m_team_base    = m_pool_rank ;
-  m_team_rank    = 0 ;
-  m_team_size    = 1 ;
-  m_team_alloc   = 1 ;
-  m_league_rank  = m_pool_rank ;
-  m_league_size  = m_pool_size ;
-  m_team_rendezvous_step = 0 ;
+void HostThreadTeamData::disband_team() {
+  m_team_scratch         = m_scratch;
+  m_team_base            = m_pool_rank;
+  m_team_rank            = 0;
+  m_team_size            = 1;
+  m_team_alloc           = 1;
+  m_league_rank          = m_pool_rank;
+  m_league_size          = m_pool_size;
+  m_team_rendezvous_step = 0;
 }
 
 //----------------------------------------------------------------------------
 
-int HostThreadTeamData::get_work_stealing() noexcept
-{
-  pair_int_t w( -1 , -1 );
+int HostThreadTeamData::get_work_stealing() noexcept {
+  pair_int_t w(-1, -1);
 
   // TODO DJS 3-17-2018:
   // Discover why the work stealing algorithm only works when called
   // by the master thread of the team.  If we can refactor this section to
   // remove that requirement we should be able to remove the split_master_wait
   // behavior in the team and pool rendezvous algorithms
-  if ( 1 == m_team_size || team_rendezvous() ) {
-
+  if (1 == m_team_size || team_rendezvous()) {
     // Attempt first from beginning of my work range
-    for ( int attempt = m_work_range.first < m_work_range.second ; attempt ; ) {
-
+    for (int attempt = m_work_range.first < m_work_range.second; attempt;) {
       // Query and attempt to update m_work_range
       //   from: [ w.first     , w.second )
       //   to:   [ w.first + 1 , w.second ) = w_new
       //
       // If w is invalid then is just a query.
 
-      const pair_int_t w_new( w.first + 1 , w.second );
+      const pair_int_t w_new(w.first + 1, w.second);
 
-      w = Kokkos::atomic_compare_exchange( & m_work_range, w, w_new );
+      w = Kokkos::atomic_compare_exchange(&m_work_range, w, w_new);
 
-      if ( w.first < w.second ) {
+      if (w.first < w.second) {
         // m_work_range is viable
 
         // If steal is successful then don't repeat attempt to steal
-        attempt = ! ( w_new.first  == w.first + 1 &&
-                      w_new.second == w.second );
-      }
-      else {
+        attempt = !(w_new.first == w.first + 1 && w_new.second == w.second);
+      } else {
         // m_work_range is not viable
-        w.first  = -1 ;
-        w.second = -1 ;
+        w.first  = -1;
+        w.second = -1;
 
-        attempt = 0 ;
+        attempt = 0;
       }
     }
 
-    if ( w.first == -1 && m_steal_rank != m_pool_rank ) {
+    if (w.first == -1 && m_steal_rank != m_pool_rank) {
+      HostThreadTeamData *const *const pool =
+          (HostThreadTeamData **)(m_pool_scratch + m_pool_members);
 
-      HostThreadTeamData * const * const pool =
-        (HostThreadTeamData**)( m_pool_scratch + m_pool_members );
+      // Attempt from beginning failed, try to steal from end of neighbor
 
-      // Attempt from begining failed, try to steal from end of neighbor
-
-      pair_int_t volatile * steal_range =
-        & ( pool[ m_steal_rank ]->m_work_range );
-
-      for ( int attempt = true ; attempt ; ) {
+      pair_int_t volatile *steal_range = &(pool[m_steal_rank]->m_work_range);
 
+      for (int attempt = true; attempt;) {
         // Query and attempt to update steal_work_range
         //   from: [ w.first , w.second )
         //   to:   [ w.first , w.second - 1 ) = w_new
         //
         // If w is invalid then is just a query.
 
-        const pair_int_t w_new( w.first , w.second - 1 );
+        const pair_int_t w_new(w.first, w.second - 1);
 
-        w = Kokkos::atomic_compare_exchange( steal_range, w, w_new );
+        w = Kokkos::atomic_compare_exchange(steal_range, w, w_new);
 
-        if ( w.first < w.second ) {
+        if (w.first < w.second) {
           // steal_work_range is viable
 
           // If steal is successful then don't repeat attempt to steal
-          attempt = ! ( w_new.first  == w.first &&
-                        w_new.second == w.second - 1 );
-        }
-        else {
+          attempt = !(w_new.first == w.first && w_new.second == w.second - 1);
+        } else {
           // steal_work_range is not viable, move to next member
-          w.first  = -1 ;
-          w.second = -1 ;
+          w.first  = -1;
+          w.second = -1;
 
           // We need to figure out whether the next team is active
-          // m_steal_rank + m_team_alloc could be the next base_rank to steal from
-          // but only if there are another m_team_size threads available so that that
-          // base rank has a full team.
-          m_steal_rank = m_steal_rank + m_team_alloc + m_team_size <= m_pool_size ?
-                         m_steal_rank + m_team_alloc : 0;
+          // m_steal_rank + m_team_alloc could be the next base_rank to steal
+          // from but only if there are another m_team_size threads available so
+          // that that base rank has a full team.
+          m_steal_rank =
+              m_steal_rank + m_team_alloc + m_team_size <= m_pool_size
+                  ? m_steal_rank + m_team_alloc
+                  : 0;
 
-          steal_range = & ( pool[ m_steal_rank ]->m_work_range );
+          steal_range = &(pool[m_steal_rank]->m_work_range);
 
           // If tried all other members then don't repeat attempt to steal
-          attempt = m_steal_rank != m_pool_rank ;
+          attempt = m_steal_rank != m_pool_rank;
         }
       }
 
-      if ( w.first != -1 ) w.first = w.second - 1 ;
+      if (w.first != -1) w.first = w.second - 1;
     }
 
-    if ( 1 < m_team_size ) {
+    if (1 < m_team_size) {
       // Must share the work index
-      *((int volatile *) team_reduce()) = w.first ;
+      *((int volatile *)team_reduce()) = w.first;
 
       team_rendezvous_release();
     }
-  }
-  else if ( 1 < m_team_size ) {
-    w.first = *((int volatile *) team_reduce());
+  } else if (1 < m_team_size) {
+    w.first = *((int volatile *)team_reduce());
   }
 
   // May exit because successfully stole work and w is good.
@@ -319,9 +303,8 @@ fprintf(stdout,"HostThreadTeamData::get_work_stealing() pool(%d of %d) %d\n"
 fflush(stdout);
 #endif
 
-  return w.first ;
+  return w.first;
 }
 
-} // namespace Impl
-} // namespace Kokkos
-
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/impl/Kokkos_HostThreadTeam.hpp b/lib/kokkos/core/src/impl/Kokkos_HostThreadTeam.hpp
index f44a13c574..fce665f6b1 100644
--- a/lib/kokkos/core/src/impl/Kokkos_HostThreadTeam.hpp
+++ b/lib/kokkos/core/src/impl/Kokkos_HostThreadTeam.hpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -52,7 +53,7 @@
 #include <impl/Kokkos_FunctorAnalysis.hpp>
 #include <impl/Kokkos_HostBarrier.hpp>
 
-#include <limits> // std::numeric_limits
+#include <limits>  // std::numeric_limits
 
 //----------------------------------------------------------------------------
 //----------------------------------------------------------------------------
@@ -60,25 +61,24 @@
 namespace Kokkos {
 namespace Impl {
 
-template< class HostExecSpace >
-class HostThreadTeamMember ;
+template <class HostExecSpace>
+class HostThreadTeamMember;
 
 class HostThreadTeamData {
-public:
-
-  template< class > friend class HostThreadTeamMember ;
+ public:
+  template <class>
+  friend class HostThreadTeamMember;
 
   // Assume upper bounds on number of threads:
   //   pool size       <= 1024 threads
   //   team size       <= 64 threads
 
-  enum : int { max_pool_members  = 1024 };
-  enum : int { max_team_members  = 64 };
+  enum : int { max_pool_members = 1024 };
+  enum : int { max_team_members = 64 };
   enum : int { max_pool_rendezvous = HostBarrier::required_buffer_size };
   enum : int { max_team_rendezvous = HostBarrier::required_buffer_size };
 
-private:
-
+ private:
   // per-thread scratch memory buffer chunks:
   //
   //   [ pool_members ]     = [ m_pool_members    .. m_pool_rendezvous )
@@ -89,168 +89,124 @@ private:
   //   [ team_shared ]      = [ m_team_shared     .. m_thread_local )
   //   [ thread_local ]     = [ m_thread_local    .. m_scratch_size )
 
-  enum : int { m_pool_members    = 0 };
-  enum : int { m_pool_rendezvous = m_pool_members    + max_pool_members };
+  enum : int { m_pool_members = 0 };
+  enum : int { m_pool_rendezvous = m_pool_members + max_pool_members };
   enum : int { m_team_rendezvous = m_pool_rendezvous + max_pool_rendezvous };
-  enum : int { m_pool_reduce     = m_team_rendezvous + max_team_rendezvous };
+  enum : int { m_pool_reduce = m_team_rendezvous + max_team_rendezvous };
 
-  using pair_int_t = Kokkos::pair<int64_t,int64_t> ;
+  using pair_int_t = Kokkos::pair<int64_t, int64_t>;
 
-  pair_int_t  m_work_range ;
-  int64_t     m_work_end ;
-  int64_t   * m_scratch ;       // per-thread buffer
-  int64_t   * m_pool_scratch ;  // == pool[0]->m_scratch
-  int64_t   * m_team_scratch ;  // == pool[ 0 + m_team_base ]->m_scratch
-  int         m_pool_rank ;
-  int         m_pool_size ;
-  int         m_team_reduce ;
-  int         m_team_shared ;
-  int         m_thread_local ;
-  int         m_scratch_size ;
-  int         m_team_base ;
-  int         m_team_rank ;
-  int         m_team_size ;
-  int         m_team_alloc ;
-  int         m_league_rank ;
-  int         m_league_size ;
-  int         m_work_chunk ;
-  int         m_steal_rank ; // work stealing rank
-  int mutable m_pool_rendezvous_step ;
-  int mutable m_team_rendezvous_step ;
+  pair_int_t m_work_range;
+  int64_t m_work_end;
+  int64_t* m_scratch;       // per-thread buffer
+  int64_t* m_pool_scratch;  // == pool[0]->m_scratch
+  int64_t* m_team_scratch;  // == pool[ 0 + m_team_base ]->m_scratch
+  int m_pool_rank;
+  int m_pool_size;
+  int m_team_reduce;
+  int m_team_shared;
+  int m_thread_local;
+  int m_scratch_size;
+  int m_team_base;
+  int m_team_rank;
+  int m_team_size;
+  int m_team_alloc;
+  int m_league_rank;
+  int m_league_size;
+  int m_work_chunk;
+  int m_steal_rank;  // work stealing rank
+  int mutable m_pool_rendezvous_step;
+  int mutable m_team_rendezvous_step;
 
-  HostThreadTeamData * team_member( int r ) const noexcept
-    { return ((HostThreadTeamData**)(m_pool_scratch+m_pool_members))[m_team_base+r]; }
+  HostThreadTeamData* team_member(int r) const noexcept {
+    return ((HostThreadTeamData**)(m_pool_scratch +
+                                   m_pool_members))[m_team_base + r];
+  }
 
-public:
-
-  inline
-  bool team_rendezvous() const noexcept
-  {
-    int * ptr = (int *)(m_team_scratch + m_team_rendezvous);
-    HostBarrier::split_arrive( ptr
-                             , m_team_size
-                             , m_team_rendezvous_step
-                             );
+ public:
+  inline bool team_rendezvous() const noexcept {
+    int* ptr = (int*)(m_team_scratch + m_team_rendezvous);
+    HostBarrier::split_arrive(ptr, m_team_size, m_team_rendezvous_step);
     if (m_team_rank != 0) {
-      HostBarrier::wait( ptr
-                       , m_team_size
-                       , m_team_rendezvous_step
-                       );
-    }
-    else {
-      HostBarrier::split_master_wait( ptr
-                                    , m_team_size
-                                    , m_team_rendezvous_step
-                                    );
+      HostBarrier::wait(ptr, m_team_size, m_team_rendezvous_step);
+    } else {
+      HostBarrier::split_master_wait(ptr, m_team_size, m_team_rendezvous_step);
     }
 
     return m_team_rank == 0;
   }
-  
-  inline
-  bool team_rendezvous(const int source_team_rank) const noexcept
-  {
-    int * ptr = (int *)(m_team_scratch + m_team_rendezvous);
-    HostBarrier::split_arrive( ptr
-                             , m_team_size
-                             , m_team_rendezvous_step
-                             );
+
+  inline bool team_rendezvous(const int source_team_rank) const noexcept {
+    int* ptr = (int*)(m_team_scratch + m_team_rendezvous);
+    HostBarrier::split_arrive(ptr, m_team_size, m_team_rendezvous_step);
     if (m_team_rank != source_team_rank) {
-      HostBarrier::wait( ptr
-                       , m_team_size
-                       , m_team_rendezvous_step
-                       );
-    }
-    else {
-      HostBarrier::split_master_wait( ptr
-                                    , m_team_size
-                                    , m_team_rendezvous_step
-                                    );
+      HostBarrier::wait(ptr, m_team_size, m_team_rendezvous_step);
+    } else {
+      HostBarrier::split_master_wait(ptr, m_team_size, m_team_rendezvous_step);
     }
 
     return (m_team_rank == source_team_rank);
   }
 
-  inline
-  void team_rendezvous_release() const noexcept
-    {
-      HostBarrier::split_release( (int *)(m_team_scratch + m_team_rendezvous)
-                                , m_team_size
-                                , m_team_rendezvous_step
-                                );
-    }
+  inline void team_rendezvous_release() const noexcept {
+    HostBarrier::split_release((int*)(m_team_scratch + m_team_rendezvous),
+                               m_team_size, m_team_rendezvous_step);
+  }
 
-  inline
-  int pool_rendezvous() const noexcept
-  {
-    // not sure if the follow hack is still needed with the new barrier
-    #if 0
+  inline int pool_rendezvous() const noexcept {
+// not sure if the follow hack is still needed with the new barrier
+#if 0
     static constexpr bool active_wait =
-    #if defined( KOKKOS_COMPILER_IBM )
+#if defined(KOKKOS_COMPILER_IBM)
       // If running on IBM POWER architecture the global
       // level rendzvous should immediately yield when
       // waiting for other threads in the pool to arrive.
       false;
-    #else
+#else
       true;
-    #endif
-    #endif
+#endif
+#endif
 
-    int * ptr = (int *)(m_pool_scratch + m_pool_rendezvous);
-    HostBarrier::split_arrive( ptr
-        , m_pool_size
-        , m_pool_rendezvous_step
-        );
+    int* ptr = (int*)(m_pool_scratch + m_pool_rendezvous);
+    HostBarrier::split_arrive(ptr, m_pool_size, m_pool_rendezvous_step);
     if (m_pool_rank != 0) {
-      HostBarrier::wait( ptr
-          , m_pool_size
-          , m_pool_rendezvous_step
-          );
-    }
-    else {
-      HostBarrier::split_master_wait( ptr
-          , m_pool_size
-          , m_pool_rendezvous_step
-          );
+      HostBarrier::wait(ptr, m_pool_size, m_pool_rendezvous_step);
+    } else {
+      HostBarrier::split_master_wait(ptr, m_pool_size, m_pool_rendezvous_step);
     }
 
     return m_pool_rank == 0;
   }
 
-  inline
-  void pool_rendezvous_release() const noexcept
-    {
-      HostBarrier::split_release( (int *)(m_pool_scratch + m_pool_rendezvous)
-                                , m_pool_size
-                                , m_pool_rendezvous_step
-                                );
-    }
+  inline void pool_rendezvous_release() const noexcept {
+    HostBarrier::split_release((int*)(m_pool_scratch + m_pool_rendezvous),
+                               m_pool_size, m_pool_rendezvous_step);
+  }
 
   //----------------------------------------
 
   constexpr HostThreadTeamData() noexcept
-    : m_work_range(-1,-1)
-    , m_work_end(0)
-    , m_scratch(0)
-    , m_pool_scratch(0)
-    , m_team_scratch(0)
-    , m_pool_rank(0)
-    , m_pool_size(1)
-    , m_team_reduce(0)
-    , m_team_shared(0)
-    , m_thread_local(0)
-    , m_scratch_size(0)
-    , m_team_base(0)
-    , m_team_rank(0)
-    , m_team_size(1)
-    , m_team_alloc(1)
-    , m_league_rank(0)
-    , m_league_size(1)
-    , m_work_chunk(0)
-    , m_steal_rank(0)
-    , m_pool_rendezvous_step(0)
-    , m_team_rendezvous_step(0)
-    {}
+      : m_work_range(-1, -1),
+        m_work_end(0),
+        m_scratch(0),
+        m_pool_scratch(0),
+        m_team_scratch(0),
+        m_pool_rank(0),
+        m_pool_size(1),
+        m_team_reduce(0),
+        m_team_shared(0),
+        m_thread_local(0),
+        m_scratch_size(0),
+        m_team_base(0),
+        m_team_rank(0),
+        m_team_size(1),
+        m_team_alloc(1),
+        m_league_rank(0),
+        m_league_size(1),
+        m_work_chunk(0),
+        m_steal_rank(0),
+        m_pool_rendezvous_step(0),
+        m_team_rendezvous_step(0) {}
 
   //----------------------------------------
   // Organize array of members into a pool.
@@ -259,8 +215,7 @@ public:
   // Requires: called by one thread.
   // Pool members are ordered as "close" - sorted by NUMA and then CORE
   // Each thread is its own team with team_size == 1.
-  static void organize_pool( HostThreadTeamData * members[]
-                           , const int size );
+  static void organize_pool(HostThreadTeamData* members[], const int size);
 
   // Called by each thread within the pool
   void disband_pool();
@@ -274,7 +229,7 @@ public:
   //
   // Return true  if a valid member of a team.
   // Return false if not a member and thread should be idled.
-  int organize_team( const int team_size );
+  int organize_team(const int team_size);
 
   // Each thread within a pool disbands itself from current team.
   // Each thread becomes its own team with team_size == 1.
@@ -283,61 +238,70 @@ public:
 
   //----------------------------------------
 
-  constexpr int pool_rank() const { return m_pool_rank ; }
-  constexpr int pool_size() const { return m_pool_size ; }
+  constexpr int pool_rank() const { return m_pool_rank; }
+  constexpr int pool_size() const { return m_pool_size; }
 
-  HostThreadTeamData * pool_member( int r ) const noexcept
-    { return ((HostThreadTeamData**)(m_pool_scratch+m_pool_members))[r]; }
+  HostThreadTeamData* pool_member(int r) const noexcept {
+    return ((HostThreadTeamData**)(m_pool_scratch + m_pool_members))[r];
+  }
 
   //----------------------------------------
 
-private:
+ private:
+  enum : int { mask_to_16 = 0x0f };  // align to 16 bytes
+  enum : int { shift_to_8 = 3 };     // size to 8 bytes
 
-  enum : int { mask_to_16 = 0x0f }; // align to 16 bytes
-  enum : int { shift_to_8 = 3 };    // size to 8 bytes
+ public:
+  static constexpr int align_to_int64(int n) {
+    return ((n + mask_to_16) & ~mask_to_16) >> shift_to_8;
+  }
 
-public:
+  constexpr int pool_reduce_bytes() const {
+    return m_scratch_size ? sizeof(int64_t) * (m_team_reduce - m_pool_reduce)
+                          : 0;
+  }
 
-  static constexpr int align_to_int64( int n )
-    { return ( ( n + mask_to_16 ) & ~mask_to_16 ) >> shift_to_8 ; }
+  constexpr int team_reduce_bytes() const {
+    return sizeof(int64_t) * (m_team_shared - m_team_reduce);
+  }
 
-  constexpr int pool_reduce_bytes() const
-    { return m_scratch_size ? sizeof(int64_t) * ( m_team_reduce - m_pool_reduce ) : 0 ; }
+  constexpr int team_shared_bytes() const {
+    return sizeof(int64_t) * (m_thread_local - m_team_shared);
+  }
 
-  constexpr int team_reduce_bytes() const
-    { return sizeof(int64_t) * ( m_team_shared - m_team_reduce ); }
+  constexpr int thread_local_bytes() const {
+    return sizeof(int64_t) * (m_scratch_size - m_thread_local);
+  }
 
-  constexpr int team_shared_bytes() const
-    { return sizeof(int64_t) * ( m_thread_local - m_team_shared ); }
-
-  constexpr int thread_local_bytes() const
-    { return sizeof(int64_t) * ( m_scratch_size - m_thread_local ); }
-
-  constexpr int scratch_bytes() const
-    { return sizeof(int64_t) * m_scratch_size ; }
+  constexpr int scratch_bytes() const {
+    return sizeof(int64_t) * m_scratch_size;
+  }
 
   // Memory chunks:
 
-  int64_t * scratch_buffer() const noexcept
-    { return m_scratch ; }
+  int64_t* scratch_buffer() const noexcept { return m_scratch; }
 
-  int64_t * pool_reduce() const noexcept
-    { return m_pool_scratch + m_pool_reduce ; }
+  int64_t* pool_reduce() const noexcept {
+    return m_pool_scratch + m_pool_reduce;
+  }
 
-  int64_t * pool_reduce_local() const noexcept
-    { return m_scratch + m_pool_reduce ; }
+  int64_t* pool_reduce_local() const noexcept {
+    return m_scratch + m_pool_reduce;
+  }
 
-  int64_t * team_reduce() const noexcept
-    { return m_team_scratch + m_team_reduce ; }
+  int64_t* team_reduce() const noexcept {
+    return m_team_scratch + m_team_reduce;
+  }
 
-  int64_t * team_reduce_local() const noexcept
-    { return m_scratch + m_team_reduce ; }
+  int64_t* team_reduce_local() const noexcept {
+    return m_scratch + m_team_reduce;
+  }
 
-  int64_t * team_shared() const noexcept
-    { return m_team_scratch + m_team_shared ; }
+  int64_t* team_shared() const noexcept {
+    return m_team_scratch + m_team_shared;
+  }
 
-  int64_t * local_scratch() const noexcept
-    { return m_scratch + m_thread_local ; }
+  int64_t* local_scratch() const noexcept { return m_scratch + m_thread_local; }
 
   // Given:
   //   pool_reduce_size  = number bytes for pool reduce
@@ -346,26 +310,20 @@ public:
   //   thread_local_size = number bytes for thread local memory
   // Return:
   //   total number of bytes that must be allocated
-  static
-  size_t scratch_size( int pool_reduce_size
-                     , int team_reduce_size
-                     , int team_shared_size
-                     , int thread_local_size )
-    {
-      pool_reduce_size  = align_to_int64( pool_reduce_size );
-      team_reduce_size  = align_to_int64( team_reduce_size );
-      team_shared_size  = align_to_int64( team_shared_size );
-      thread_local_size = align_to_int64( thread_local_size );
+  static size_t scratch_size(int pool_reduce_size, int team_reduce_size,
+                             int team_shared_size, int thread_local_size) {
+    pool_reduce_size  = align_to_int64(pool_reduce_size);
+    team_reduce_size  = align_to_int64(team_reduce_size);
+    team_shared_size  = align_to_int64(team_shared_size);
+    thread_local_size = align_to_int64(thread_local_size);
 
-      const size_t total_bytes = (
-        m_pool_reduce +
-        pool_reduce_size +
-        team_reduce_size +
-        team_shared_size +
-        thread_local_size ) * sizeof(int64_t);
+    const size_t total_bytes =
+        (m_pool_reduce + pool_reduce_size + team_reduce_size +
+         team_shared_size + thread_local_size) *
+        sizeof(int64_t);
 
-      return total_bytes ;
-    }
+    return total_bytes;
+  }
 
   // Given:
   //   alloc_ptr         = pointer to allocated memory
@@ -376,23 +334,19 @@ public:
   //   thread_local_size = number bytes for thread-local memory
   // Return:
   //   total number of bytes that must be allocated
-  void scratch_assign( void * const alloc_ptr
-                     , size_t const alloc_size
-                     , int pool_reduce_size
-                     , int team_reduce_size
-                     , int team_shared_size
-                     , int /* thread_local_size */ )
-    {
-      pool_reduce_size  = align_to_int64( pool_reduce_size );
-      team_reduce_size  = align_to_int64( team_reduce_size );
-      team_shared_size  = align_to_int64( team_shared_size );
-      // thread_local_size = align_to_int64( thread_local_size );
+  void scratch_assign(void* const alloc_ptr, size_t const alloc_size,
+                      int pool_reduce_size, int team_reduce_size,
+                      int team_shared_size, int /* thread_local_size */) {
+    pool_reduce_size = align_to_int64(pool_reduce_size);
+    team_reduce_size = align_to_int64(team_reduce_size);
+    team_shared_size = align_to_int64(team_shared_size);
+    // thread_local_size = align_to_int64( thread_local_size );
 
-      m_scratch      = (int64_t *) alloc_ptr ;
-      m_team_reduce  = m_pool_reduce + pool_reduce_size ;
-      m_team_shared  = m_team_reduce + team_reduce_size ;
-      m_thread_local = m_team_shared + team_shared_size ;
-      m_scratch_size = align_to_int64( alloc_size );
+    m_scratch      = (int64_t*)alloc_ptr;
+    m_team_reduce  = m_pool_reduce + pool_reduce_size;
+    m_team_shared  = m_team_reduce + team_reduce_size;
+    m_thread_local = m_team_shared + team_shared_size;
+    m_scratch_size = align_to_int64(alloc_size);
 
 #if 0
 fprintf(stdout,"HostThreadTeamData::scratch_assign { %d %d %d %d %d %d %d }\n"
@@ -406,224 +360,222 @@ fprintf(stdout,"HostThreadTeamData::scratch_assign { %d %d %d %d %d %d %d }\n"
        );
 fflush(stdout);
 #endif
-
-    }
+  }
 
   //----------------------------------------
   // Get a work index within the range.
   // First try to steal from beginning of own teams's partition.
   // If that fails then try to steal from end of another teams' partition.
-  int get_work_stealing() noexcept ;
+  int get_work_stealing() noexcept;
 
   //----------------------------------------
   // Set the initial work partitioning of [ 0 .. length ) among the teams
   // with granularity of chunk
 
-  void set_work_partition( int64_t const length
-                         , int     const chunk ) noexcept
-    {
-      // Minimum chunk size to insure that
-      //   m_work_end < std::numeric_limits<int>::max() * m_work_chunk
+  void set_work_partition(int64_t const length, int const chunk) noexcept {
+    // Minimum chunk size to insure that
+    //   m_work_end < std::numeric_limits<int>::max() * m_work_chunk
 
-      int const chunk_min = ( length + std::numeric_limits<int>::max() )
-                            / std::numeric_limits<int>::max();
+    int const chunk_min = (length + std::numeric_limits<int>::max()) /
+                          std::numeric_limits<int>::max();
 
-      m_work_end   = length ;
-      m_work_chunk = std::max( chunk , chunk_min );
+    m_work_end   = length;
+    m_work_chunk = std::max(chunk, chunk_min);
 
-      // Number of work chunks and partitioning of that number:
-      int const num  = ( m_work_end + m_work_chunk - 1 ) / m_work_chunk ;
-      int const part = ( num + m_league_size - 1 ) / m_league_size ;
+    // Number of work chunks and partitioning of that number:
+    int const num  = (m_work_end + m_work_chunk - 1) / m_work_chunk;
+    int const part = (num + m_league_size - 1) / m_league_size;
 
-      m_work_range.first  = part * m_league_rank ;
-      m_work_range.second = m_work_range.first + part ;
+    m_work_range.first  = part * m_league_rank;
+    m_work_range.second = m_work_range.first + part;
 
-      // Steal from next team, round robin
-      // The next team is offset by m_team_alloc if it fits in the pool.
+    // Steal from next team, round robin
+    // The next team is offset by m_team_alloc if it fits in the pool.
 
-      m_steal_rank = m_team_base + m_team_alloc + m_team_size <= m_pool_size ?
-                     m_team_base + m_team_alloc : 0 ;
+    m_steal_rank = m_team_base + m_team_alloc + m_team_size <= m_pool_size
+                       ? m_team_base + m_team_alloc
+                       : 0;
+  }
+
+  std::pair<int64_t, int64_t> get_work_partition() noexcept {
+    int64_t first  = m_work_range.first;
+    int64_t second = m_work_range.second;
+    first *= m_work_chunk;
+    second *= m_work_chunk;
+    return std::pair<int64_t, int64_t>(
+        first, second < m_work_end ? second : m_work_end);
+  }
+
+  std::pair<int64_t, int64_t> get_work_stealing_chunk() noexcept {
+    std::pair<int64_t, int64_t> x(-1, -1);
+
+    const int i = get_work_stealing();
+
+    if (0 <= i) {
+      x.first  = m_work_chunk * i;
+      x.second = x.first + m_work_chunk < m_work_end ? x.first + m_work_chunk
+                                                     : m_work_end;
     }
 
-  std::pair<int64_t,int64_t> get_work_partition() noexcept
-    {
-      int64_t first = m_work_range.first;
-      int64_t second = m_work_range.second;
-      first *= m_work_chunk;
-      second *= m_work_chunk;
-      return std::pair<int64_t,int64_t>
-        ( first
-        , second < m_work_end ? second : m_work_end );
-    }
-
-  std::pair<int64_t,int64_t> get_work_stealing_chunk() noexcept
-    {
-      std::pair<int64_t,int64_t> x(-1,-1);
-
-      const int i = get_work_stealing();
-
-      if ( 0 <= i ) {
-        x.first  = m_work_chunk * i ;
-        x.second = x.first + m_work_chunk < m_work_end
-                 ? x.first + m_work_chunk : m_work_end ;
-      }
-
-      return x ;
-    }
+    return x;
+  }
 };
 
 //----------------------------------------------------------------------------
 
-template< class HostExecSpace >
+template <class HostExecSpace>
 class HostThreadTeamMember {
-public:
-
-  using scratch_memory_space = typename HostExecSpace::scratch_memory_space ;
-  using execution_space = HostExecSpace;
-  using thread_team_member = HostThreadTeamMember;
+ public:
+  using scratch_memory_space    = typename HostExecSpace::scratch_memory_space;
+  using execution_space         = HostExecSpace;
+  using thread_team_member      = HostThreadTeamMember;
   using host_thread_team_member = HostThreadTeamMember;
 
-private:
+ private:
+  scratch_memory_space m_scratch;
+  HostThreadTeamData& m_data;
+  int const m_league_rank;
+  int const m_league_size;
 
-  scratch_memory_space m_scratch ;
-  HostThreadTeamData & m_data ;
-  int const            m_league_rank ;
-  int const            m_league_size ;
+ public:
+  constexpr HostThreadTeamMember(HostThreadTeamData& arg_data) noexcept
+      : m_scratch(arg_data.team_shared(), arg_data.team_shared_bytes()),
+        m_data(arg_data),
+        m_league_rank(arg_data.m_league_rank),
+        m_league_size(arg_data.m_league_size) {}
 
-public:
+  constexpr HostThreadTeamMember(HostThreadTeamData& arg_data,
+                                 int const arg_league_rank,
+                                 int const arg_league_size) noexcept
+      : m_scratch(arg_data.team_shared(), arg_data.team_shared_bytes(),
+                  arg_data.team_shared(), arg_data.team_shared_bytes()),
+        m_data(arg_data),
+        m_league_rank(arg_league_rank),
+        m_league_size(arg_league_size) {}
 
-  constexpr HostThreadTeamMember( HostThreadTeamData & arg_data ) noexcept
-    : m_scratch( arg_data.team_shared() , arg_data.team_shared_bytes() )
-    , m_data( arg_data )
-    , m_league_rank(arg_data.m_league_rank)
-    , m_league_size(arg_data.m_league_size)
-    {}
-
-  constexpr HostThreadTeamMember( HostThreadTeamData & arg_data
-                                , int const            arg_league_rank
-                                , int const            arg_league_size
-                                ) noexcept
-    : m_scratch( arg_data.team_shared()
-               , arg_data.team_shared_bytes()
-               , arg_data.team_shared()
-               , arg_data.team_shared_bytes() )
-    , m_data( arg_data )
-    , m_league_rank( arg_league_rank )
-    , m_league_size( arg_league_size )
-    {}
-
-  ~HostThreadTeamMember() = default ;
-  HostThreadTeamMember() = delete ;
-  HostThreadTeamMember( HostThreadTeamMember && ) = default ;
-  HostThreadTeamMember( HostThreadTeamMember const & ) = default ;
-  HostThreadTeamMember & operator = ( HostThreadTeamMember && ) = default ;
-  HostThreadTeamMember & operator = ( HostThreadTeamMember const & ) = default ;
+  ~HostThreadTeamMember()                           = default;
+  HostThreadTeamMember()                            = delete;
+  HostThreadTeamMember(HostThreadTeamMember&&)      = default;
+  HostThreadTeamMember(HostThreadTeamMember const&) = default;
+  HostThreadTeamMember& operator=(HostThreadTeamMember&&) = default;
+  HostThreadTeamMember& operator=(HostThreadTeamMember const&) = default;
 
   //----------------------------------------
 
   KOKKOS_INLINE_FUNCTION
-  int team_rank() const noexcept { return m_data.m_team_rank ; }
+  int team_rank() const noexcept { return m_data.m_team_rank; }
 
   KOKKOS_INLINE_FUNCTION
-  int team_size() const noexcept { return m_data.m_team_size ; }
+  int team_size() const noexcept { return m_data.m_team_size; }
 
   KOKKOS_INLINE_FUNCTION
-  int league_rank() const noexcept { return m_league_rank ; }
+  int league_rank() const noexcept { return m_league_rank; }
 
   KOKKOS_INLINE_FUNCTION
-  int league_size() const noexcept { return m_league_size ; }
+  int league_size() const noexcept { return m_league_size; }
 
   //----------------------------------------
 
   KOKKOS_INLINE_FUNCTION
-  const scratch_memory_space & team_shmem() const
-    { return m_scratch.set_team_thread_mode(0,1,0); }
+  const scratch_memory_space& team_shmem() const {
+    return m_scratch.set_team_thread_mode(0, 1, 0);
+  }
 
   KOKKOS_INLINE_FUNCTION
-  const scratch_memory_space & team_scratch(int) const
-    { return m_scratch.set_team_thread_mode(0,1,0); }
+  const scratch_memory_space& team_scratch(int) const {
+    return m_scratch.set_team_thread_mode(0, 1, 0);
+  }
 
   KOKKOS_INLINE_FUNCTION
-  const scratch_memory_space & thread_scratch(int) const
-    { return m_scratch.set_team_thread_mode(0,m_data.m_team_size,m_data.m_team_rank); }
+  const scratch_memory_space& thread_scratch(int) const {
+    return m_scratch.set_team_thread_mode(0, m_data.m_team_size,
+                                          m_data.m_team_rank);
+  }
 
   //--------------------------------------------------------------------------
   // Team collectives
   //--------------------------------------------------------------------------
 
   KOKKOS_INLINE_FUNCTION void team_barrier() const noexcept
-#if defined( KOKKOS_ACTIVE_EXECUTION_MEMORY_SPACE_HOST )
-    {
-      if ( m_data.team_rendezvous() ) { m_data.team_rendezvous_release(); };
-    }
+#if defined(KOKKOS_ACTIVE_EXECUTION_MEMORY_SPACE_HOST)
+  {
+    if (m_data.team_rendezvous()) {
+      m_data.team_rendezvous_release();
+    };
+  }
 #else
-    {}
+  {
+  }
 #endif
 
   //--------------------------------------------------------------------------
 
-  template< typename T >
-  KOKKOS_INLINE_FUNCTION
-  void team_broadcast( T & value , const int source_team_rank ) const noexcept
-#if defined( KOKKOS_ACTIVE_EXECUTION_MEMORY_SPACE_HOST )
-    {
-      if ( 1 < m_data.m_team_size ) {
-        T volatile * const shared_value = (T*) m_data.team_reduce();
-		
-        // Don't overwrite shared memory until all threads arrive
-
-        if ( m_data.team_rendezvous(source_team_rank) ) {
-
-          // All threads have entered 'team_rendezvous'
-          // only this thread returned from 'team_rendezvous'
-          // with a return value of 'true'
-
-          *shared_value = value;
-
-          m_data.team_rendezvous_release();
-          // This thread released all other threads from 'team_rendezvous'
-          // with a return value of 'false'
-        }
-        else {
-          value = *shared_value ;
-        }
-      }
-    }
-#else
-    { Kokkos::abort("HostThreadTeamMember team_broadcast\n"); }
-#endif
-
-  //--------------------------------------------------------------------------
-
-  template< class Closure , typename T >
-  KOKKOS_INLINE_FUNCTION
-  void team_broadcast( Closure const & f , T & value , const int source_team_rank) const noexcept
-#if defined( KOKKOS_ACTIVE_EXECUTION_MEMORY_SPACE_HOST )
-    {
-      T volatile * const shared_value = (T*) m_data.team_reduce();
+  template <typename T>
+  KOKKOS_INLINE_FUNCTION void team_broadcast(T& value,
+                                             const int source_team_rank) const
+      noexcept
+#if defined(KOKKOS_ACTIVE_EXECUTION_MEMORY_SPACE_HOST)
+  {
+    if (1 < m_data.m_team_size) {
+      T volatile* const shared_value = (T*)m_data.team_reduce();
 
       // Don't overwrite shared memory until all threads arrive
 
-      if ( m_data.team_rendezvous(source_team_rank) ) {
-
+      if (m_data.team_rendezvous(source_team_rank)) {
         // All threads have entered 'team_rendezvous'
         // only this thread returned from 'team_rendezvous'
         // with a return value of 'true'
 
-        f( value );
-
-        if ( 1 < m_data.m_team_size ) { *shared_value = value ; }
+        *shared_value = value;
 
         m_data.team_rendezvous_release();
         // This thread released all other threads from 'team_rendezvous'
         // with a return value of 'false'
-      }
-      else {
-        value = *shared_value ;
+      } else {
+        value = *shared_value;
       }
     }
+  }
 #else
-    { Kokkos::abort("HostThreadTeamMember team_broadcast\n"); }
+  {
+    Kokkos::abort("HostThreadTeamMember team_broadcast\n");
+  }
+#endif
+
+  //--------------------------------------------------------------------------
+
+  template <class Closure, typename T>
+  KOKKOS_INLINE_FUNCTION void team_broadcast(Closure const& f, T& value,
+                                             const int source_team_rank) const
+      noexcept
+#if defined(KOKKOS_ACTIVE_EXECUTION_MEMORY_SPACE_HOST)
+  {
+    T volatile* const shared_value = (T*)m_data.team_reduce();
+
+    // Don't overwrite shared memory until all threads arrive
+
+    if (m_data.team_rendezvous(source_team_rank)) {
+      // All threads have entered 'team_rendezvous'
+      // only this thread returned from 'team_rendezvous'
+      // with a return value of 'true'
+
+      f(value);
+
+      if (1 < m_data.m_team_size) {
+        *shared_value = value;
+      }
+
+      m_data.team_rendezvous_release();
+      // This thread released all other threads from 'team_rendezvous'
+      // with a return value of 'false'
+    } else {
+      value = *shared_value;
+    }
+  }
+#else
+  {
+    Kokkos::abort("HostThreadTeamMember team_broadcast\n");
+  }
 #endif
 
   //--------------------------------------------------------------------------
@@ -631,63 +583,65 @@ public:
   // team_reduce( Min(result) );
   // team_reduce( Max(result) );
 
-  template< typename ReducerType >
+  template <typename ReducerType>
   KOKKOS_INLINE_FUNCTION
-  typename std::enable_if< is_reducer< ReducerType >::value >::type
-  team_reduce( ReducerType const & reducer ) const noexcept
-  { team_reduce(reducer,reducer.reference()); }
+      typename std::enable_if<is_reducer<ReducerType>::value>::type
+      team_reduce(ReducerType const& reducer) const noexcept {
+    team_reduce(reducer, reducer.reference());
+  }
 
-  template< typename ReducerType >
+  template <typename ReducerType>
   KOKKOS_INLINE_FUNCTION
-  typename std::enable_if< is_reducer< ReducerType >::value >::type
-  team_reduce( ReducerType const & reducer, typename ReducerType::value_type contribution ) const noexcept
-#if defined( KOKKOS_ACTIVE_EXECUTION_MEMORY_SPACE_HOST )
-    {
-      if ( 1 < m_data.m_team_size ) {
+      typename std::enable_if<is_reducer<ReducerType>::value>::type
+      team_reduce(ReducerType const& reducer,
+                  typename ReducerType::value_type contribution) const noexcept
+#if defined(KOKKOS_ACTIVE_EXECUTION_MEMORY_SPACE_HOST)
+  {
+    if (1 < m_data.m_team_size) {
+      using value_type = typename ReducerType::value_type;
 
-        using value_type = typename ReducerType::value_type ;
-
-        if ( 0 != m_data.m_team_rank ) {
-          // Non-root copies to their local buffer:
-          /*reducer.copy( (value_type*) m_data.team_reduce_local()
-                      , reducer.data() );*/
-          *((value_type*) m_data.team_reduce_local()) = contribution;
-        }
-
-        // Root does not overwrite shared memory until all threads arrive
-        // and copy to their local buffer.
-
-        if ( m_data.team_rendezvous() ) {
-          // All threads have entered 'team_rendezvous'
-          // only this thread returned from 'team_rendezvous'
-          // with a return value of 'true'
-          //
-          // This thread sums contributed values
-          for ( int i = 1 ; i < m_data.m_team_size ; ++i ) {
-            value_type * const src =
-              (value_type*) m_data.team_member(i)->team_reduce_local();
-
-            reducer.join( contribution, *src);
-          }
-
-          // Copy result to root member's buffer:
-          // reducer.copy( (value_type*) m_data.team_reduce() , reducer.data() );
-          *((value_type*) m_data.team_reduce()) = contribution;
-          reducer.reference() = contribution;
-          m_data.team_rendezvous_release();
-          // This thread released all other threads from 'team_rendezvous'
-          // with a return value of 'false'
-        }
-        else {
-          // Copy from root member's buffer:
-          reducer.reference() = *((value_type*) m_data.team_reduce());
-        }
-      } else {
-        reducer.reference() = contribution;
+      if (0 != m_data.m_team_rank) {
+        // Non-root copies to their local buffer:
+        /*reducer.copy( (value_type*) m_data.team_reduce_local()
+                    , reducer.data() );*/
+        *((value_type*)m_data.team_reduce_local()) = contribution;
       }
+
+      // Root does not overwrite shared memory until all threads arrive
+      // and copy to their local buffer.
+
+      if (m_data.team_rendezvous()) {
+        // All threads have entered 'team_rendezvous'
+        // only this thread returned from 'team_rendezvous'
+        // with a return value of 'true'
+        //
+        // This thread sums contributed values
+        for (int i = 1; i < m_data.m_team_size; ++i) {
+          value_type* const src =
+              (value_type*)m_data.team_member(i)->team_reduce_local();
+
+          reducer.join(contribution, *src);
+        }
+
+        // Copy result to root member's buffer:
+        // reducer.copy( (value_type*) m_data.team_reduce() , reducer.data() );
+        *((value_type*)m_data.team_reduce()) = contribution;
+        reducer.reference()                  = contribution;
+        m_data.team_rendezvous_release();
+        // This thread released all other threads from 'team_rendezvous'
+        // with a return value of 'false'
+      } else {
+        // Copy from root member's buffer:
+        reducer.reference() = *((value_type*)m_data.team_reduce());
+      }
+    } else {
+      reducer.reference() = contribution;
     }
+  }
 #else
-    { Kokkos::abort("HostThreadTeamMember team_reduce\n"); }
+  {
+    Kokkos::abort("HostThreadTeamMember team_reduce\n");
+  }
 #endif
 
   //--------------------------------------------------------------------------
@@ -738,176 +692,138 @@ public:
     { Kokkos::abort("HostThreadTeamMember team_reduce\n"); return ValueType(); }
 #endif*/
 
+  template <typename T>
+  KOKKOS_INLINE_FUNCTION T team_scan(T const& value, T* const global = 0) const
+      noexcept
+#if defined(KOKKOS_ACTIVE_EXECUTION_MEMORY_SPACE_HOST)
+  {
+    if (0 != m_data.m_team_rank) {
+      // Non-root copies to their local buffer:
+      ((T*)m_data.team_reduce_local())[1] = value;
+    }
 
-  template< typename T >
-  KOKKOS_INLINE_FUNCTION
-  T team_scan( T const & value , T * const global = 0 ) const noexcept
-#if defined( KOKKOS_ACTIVE_EXECUTION_MEMORY_SPACE_HOST )
-    {
-      if ( 0 != m_data.m_team_rank ) {
-        // Non-root copies to their local buffer:
-        ((T*) m_data.team_reduce_local())[1] = value ;
+    // Root does not overwrite shared memory until all threads arrive
+    // and copy to their local buffer.
+
+    if (m_data.team_rendezvous()) {
+      // All threads have entered 'team_rendezvous'
+      // only this thread returned from 'team_rendezvous'
+      // with a return value of 'true'
+      //
+      // This thread scans contributed values
+
+      {
+        T* prev = (T*)m_data.team_reduce_local();
+
+        prev[0] = 0;
+        prev[1] = value;
+
+        for (int i = 1; i < m_data.m_team_size; ++i) {
+          T* const ptr = (T*)m_data.team_member(i)->team_reduce_local();
+
+          ptr[0] = prev[0] + prev[1];
+
+          prev = ptr;
+        }
       }
 
-      // Root does not overwrite shared memory until all threads arrive
-      // and copy to their local buffer.
-
-      if ( m_data.team_rendezvous() ) {
-        // All threads have entered 'team_rendezvous'
-        // only this thread returned from 'team_rendezvous'
-        // with a return value of 'true'
-        //
-        // This thread scans contributed values
+      // If adding to global value then atomic_fetch_add to that value
+      // and sum previous value to every entry of the scan.
+      if (global) {
+        T* prev = (T*)m_data.team_reduce_local();
 
         {
-          T * prev = (T*) m_data.team_reduce_local();
-
-          prev[0] = 0 ;
-          prev[1] = value ;
-
-          for ( int i = 1 ; i < m_data.m_team_size ; ++i ) {
-            T * const ptr = (T*) m_data.team_member(i)->team_reduce_local();
-
-            ptr[0] = prev[0] + prev[1] ;
-
-            prev = ptr ;
-          }
+          T* ptr = (T*)m_data.team_member(m_data.m_team_size - 1)
+                       ->team_reduce_local();
+          prev[0] = Kokkos::atomic_fetch_add(global, ptr[0] + ptr[1]);
         }
 
-        // If adding to global value then atomic_fetch_add to that value
-        // and sum previous value to every entry of the scan.
-        if ( global ) {
-          T * prev = (T*) m_data.team_reduce_local();
-
-          {
-            T * ptr  = (T*) m_data.team_member( m_data.m_team_size - 1 )->team_reduce_local();
-            prev[0] = Kokkos::atomic_fetch_add( global , ptr[0] + ptr[1] );
-          }
-
-          for ( int i = 1 ; i < m_data.m_team_size ; ++i ) {
-            T * ptr = (T*) m_data.team_member(i)->team_reduce_local();
-            ptr[0] += prev[0] ;
-          }
+        for (int i = 1; i < m_data.m_team_size; ++i) {
+          T* ptr = (T*)m_data.team_member(i)->team_reduce_local();
+          ptr[0] += prev[0];
         }
-
-        m_data.team_rendezvous_release();
       }
 
-      return ((T*) m_data.team_reduce_local())[0];
+      m_data.team_rendezvous_release();
     }
-#else
-    { Kokkos::abort("HostThreadTeamMember team_scan\n"); return T(); }
-#endif
 
+    return ((T*)m_data.team_reduce_local())[0];
+  }
+#else
+  {
+    Kokkos::abort("HostThreadTeamMember team_scan\n");
+    return T();
+  }
+#endif
 };
 
-
-}} /* namespace Kokkos::Impl */
+}  // namespace Impl
+}  // namespace Kokkos
 
 //----------------------------------------------------------------------------
 //----------------------------------------------------------------------------
 
 namespace Kokkos {
 
-template<typename iType, typename Member>
-KOKKOS_INLINE_FUNCTION
-Impl::TeamThreadRangeBoundariesStruct<iType, Member>
+template <typename iType, typename Member>
+KOKKOS_INLINE_FUNCTION Impl::TeamThreadRangeBoundariesStruct<iType, Member>
 TeamThreadRange(
-  Member const & member,
-  iType count,
-  typename std::enable_if<
-    Impl::is_thread_team_member<Member>::value
-  >::type const** = nullptr
-)
-{
-  return
-    Impl::TeamThreadRangeBoundariesStruct
-      <iType, Member>(member,0,count);
+    Member const& member, iType count,
+    typename std::enable_if<
+        Impl::is_thread_team_member<Member>::value>::type const** = nullptr) {
+  return Impl::TeamThreadRangeBoundariesStruct<iType, Member>(member, 0, count);
 }
 
-template<typename iType1, typename iType2, typename Member>
-KOKKOS_INLINE_FUNCTION
-Impl::TeamThreadRangeBoundariesStruct<
-  typename std::common_type< iType1, iType2 >::type, Member
->
+template <typename iType1, typename iType2, typename Member>
+KOKKOS_INLINE_FUNCTION Impl::TeamThreadRangeBoundariesStruct<
+    typename std::common_type<iType1, iType2>::type, Member>
 TeamThreadRange(
-  Member const & member,
-  iType1 begin,
-  iType2 end,
-  typename std::enable_if<
-    Impl::is_thread_team_member<Member>::value
-  >::type const** = nullptr
-)
-{
-  return
-    Impl::TeamThreadRangeBoundariesStruct
-      < typename std::common_type< iType1, iType2 >::type
-      , Member >( member , begin , end );
+    Member const& member, iType1 begin, iType2 end,
+    typename std::enable_if<
+        Impl::is_thread_team_member<Member>::value>::type const** = nullptr) {
+  return Impl::TeamThreadRangeBoundariesStruct<
+      typename std::common_type<iType1, iType2>::type, Member>(member, begin,
+                                                               end);
 }
 
-template<typename iType, typename Member>
-KOKKOS_INLINE_FUNCTION
-Impl::TeamThreadRangeBoundariesStruct<iType, Member>
+template <typename iType, typename Member>
+KOKKOS_INLINE_FUNCTION Impl::TeamThreadRangeBoundariesStruct<iType, Member>
 TeamVectorRange(
-  Member const & member,
-  iType count,
-  typename std::enable_if<
-    Impl::is_thread_team_member<Member>::value
-  >::type const** = nullptr
-)
-{
-  return
-    Impl::TeamThreadRangeBoundariesStruct
-      <iType, Member>(member,0,count);
+    Member const& member, iType count,
+    typename std::enable_if<
+        Impl::is_thread_team_member<Member>::value>::type const** = nullptr) {
+  return Impl::TeamThreadRangeBoundariesStruct<iType, Member>(member, 0, count);
 }
 
-template<typename iType1, typename iType2, typename Member>
-KOKKOS_INLINE_FUNCTION
-Impl::TeamThreadRangeBoundariesStruct<
-  typename std::common_type< iType1, iType2 >::type, Member
->
+template <typename iType1, typename iType2, typename Member>
+KOKKOS_INLINE_FUNCTION Impl::TeamThreadRangeBoundariesStruct<
+    typename std::common_type<iType1, iType2>::type, Member>
 TeamVectorRange(
-  Member const & member,
-  iType1 begin,
-  iType2 end,
-  typename std::enable_if<
-    Impl::is_thread_team_member<Member>::value
-  >::type const** = nullptr
-)
-{
-  return
-    Impl::TeamThreadRangeBoundariesStruct
-      < typename std::common_type< iType1, iType2 >::type
-      , Member >( member , begin , end );
+    Member const& member, iType1 begin, iType2 end,
+    typename std::enable_if<
+        Impl::is_thread_team_member<Member>::value>::type const** = nullptr) {
+  return Impl::TeamThreadRangeBoundariesStruct<
+      typename std::common_type<iType1, iType2>::type, Member>(member, begin,
+                                                               end);
 }
 
-template<typename iType, typename Member>
-KOKKOS_INLINE_FUNCTION
-Impl::ThreadVectorRangeBoundariesStruct<iType, Member>
+template <typename iType, typename Member>
+KOKKOS_INLINE_FUNCTION Impl::ThreadVectorRangeBoundariesStruct<iType, Member>
 ThreadVectorRange(
-  Member const & member,
-  iType count,
-  typename std::enable_if<
-    Impl::is_thread_team_member<Member>::value
-  >::type const** = nullptr
-)
-{
-  return Impl::ThreadVectorRangeBoundariesStruct<iType, Member>(member,count);
+    Member const& member, iType count,
+    typename std::enable_if<
+        Impl::is_thread_team_member<Member>::value>::type const** = nullptr) {
+  return Impl::ThreadVectorRangeBoundariesStruct<iType, Member>(member, count);
 }
 
-template<typename iType, typename Member>
-KOKKOS_INLINE_FUNCTION
-Impl::ThreadVectorRangeBoundariesStruct<iType, Member>
+template <typename iType, typename Member>
+KOKKOS_INLINE_FUNCTION Impl::ThreadVectorRangeBoundariesStruct<iType, Member>
 ThreadVectorRange(
-  Member const & member,
-  iType arg_begin,
-  iType arg_end,
-  typename std::enable_if<
-    Impl::is_thread_team_member<Member>::value
-  >::type const** = nullptr
-)
-{
-  return Impl::ThreadVectorRangeBoundariesStruct<iType, Member>(member,arg_begin,arg_end);
+    Member const& member, iType arg_begin, iType arg_end,
+    typename std::enable_if<
+        Impl::is_thread_team_member<Member>::value>::type const** = nullptr) {
+  return Impl::ThreadVectorRangeBoundariesStruct<iType, Member>(
+      member, arg_begin, arg_end);
 }
 
 //----------------------------------------------------------------------------
@@ -916,95 +832,72 @@ ThreadVectorRange(
  * Executes lambda(iType i) for each i=[0..N)
  *
  * The range [0..N) is mapped to all threads of the the calling thread team.
-*/
-template<typename iType, class Closure, class Member>
-KOKKOS_INLINE_FUNCTION
-void parallel_for
-  ( Impl::TeamThreadRangeBoundariesStruct<iType, Member> const & loop_boundaries
-  , Closure const & closure
-  , typename std::enable_if<
-      Impl::is_host_thread_team_member<Member>::value
-    >::type const** = nullptr
-  )
-{
-  for( iType i = loop_boundaries.start
-     ; i <  loop_boundaries.end
-     ; i += loop_boundaries.increment ) {
-    closure (i);
+ */
+template <typename iType, class Closure, class Member>
+KOKKOS_INLINE_FUNCTION void parallel_for(
+    Impl::TeamThreadRangeBoundariesStruct<iType, Member> const& loop_boundaries,
+    Closure const& closure,
+    typename std::enable_if<Impl::is_host_thread_team_member<Member>::value>::
+        type const** = nullptr) {
+  for (iType i = loop_boundaries.start; i < loop_boundaries.end;
+       i += loop_boundaries.increment) {
+    closure(i);
   }
 }
 
-template<typename iType, class Closure, class Member>
-KOKKOS_INLINE_FUNCTION
-void parallel_for
-  ( Impl::ThreadVectorRangeBoundariesStruct<iType, Member> const & loop_boundaries
-  , Closure const & closure
-  , typename std::enable_if<
-      Impl::is_host_thread_team_member<Member>::value
-    >::type const** = nullptr
-  )
-{
-  #ifdef KOKKOS_ENABLE_PRAGMA_IVDEP
-  #pragma ivdep
-  #endif
-  for( iType i = loop_boundaries.start
-     ; i <  loop_boundaries.end
-     ; i += loop_boundaries.increment ) {
-    closure (i);
+template <typename iType, class Closure, class Member>
+KOKKOS_INLINE_FUNCTION void parallel_for(
+    Impl::ThreadVectorRangeBoundariesStruct<iType, Member> const&
+        loop_boundaries,
+    Closure const& closure,
+    typename std::enable_if<Impl::is_host_thread_team_member<Member>::value>::
+        type const** = nullptr) {
+#ifdef KOKKOS_ENABLE_PRAGMA_IVDEP
+#pragma ivdep
+#endif
+  for (iType i = loop_boundaries.start; i < loop_boundaries.end;
+       i += loop_boundaries.increment) {
+    closure(i);
   }
 }
 
 //----------------------------------------------------------------------------
 
-template< typename iType, class Closure, class Reducer, class Member >
-KOKKOS_INLINE_FUNCTION
-typename std::enable_if<
-  Kokkos::is_reducer< Reducer >::value
-  && Impl::is_host_thread_team_member<Member>::value
->::type
-parallel_reduce
-  ( Impl::TeamThreadRangeBoundariesStruct<iType, Member>
-             const & loop_boundaries
-  , Closure  const & closure
-  , Reducer  const & reducer
-  )
-{
+template <typename iType, class Closure, class Reducer, class Member>
+KOKKOS_INLINE_FUNCTION typename std::enable_if<
+    Kokkos::is_reducer<Reducer>::value &&
+    Impl::is_host_thread_team_member<Member>::value>::type
+parallel_reduce(
+    Impl::TeamThreadRangeBoundariesStruct<iType, Member> const& loop_boundaries,
+    Closure const& closure, Reducer const& reducer) {
   typename Reducer::value_type value;
-  reducer.init( value );
+  reducer.init(value);
 
-  for( iType i = loop_boundaries.start
-     ; i <  loop_boundaries.end
-     ; i += loop_boundaries.increment ) {
-    closure( i , value );
+  for (iType i = loop_boundaries.start; i < loop_boundaries.end;
+       i += loop_boundaries.increment) {
+    closure(i, value);
   }
-  
-  loop_boundaries.thread.team_reduce( reducer, value );
+
+  loop_boundaries.thread.team_reduce(reducer, value);
 }
 
-template< typename iType, typename Closure, typename ValueType, typename Member >
-KOKKOS_INLINE_FUNCTION
-typename std::enable_if<
-  ! Kokkos::is_reducer<ValueType>::value
-  && Impl::is_host_thread_team_member<Member>::value
->::type
-parallel_reduce
-  ( Impl::TeamThreadRangeBoundariesStruct<iType, Member >
-             const & loop_boundaries
-  , Closure  const & closure
-  , ValueType      & result
-  )
-{
+template <typename iType, typename Closure, typename ValueType, typename Member>
+KOKKOS_INLINE_FUNCTION typename std::enable_if<
+    !Kokkos::is_reducer<ValueType>::value &&
+    Impl::is_host_thread_team_member<Member>::value>::type
+parallel_reduce(
+    Impl::TeamThreadRangeBoundariesStruct<iType, Member> const& loop_boundaries,
+    Closure const& closure, ValueType& result) {
   ValueType val;
-  Sum<ValueType> reducer( val );
-  reducer.init( val );
+  Sum<ValueType> reducer(val);
+  reducer.init(val);
 
-  for( iType i = loop_boundaries.start
-     ; i <  loop_boundaries.end
-     ; i += loop_boundaries.increment ) {
-    closure( i , reducer.reference() );
+  for (iType i = loop_boundaries.start; i < loop_boundaries.end;
+       i += loop_boundaries.increment) {
+    closure(i, reducer.reference());
   }
 
-  loop_boundaries.thread.team_reduce( reducer );
+  loop_boundaries.thread.team_reduce(reducer);
   result = reducer.reference();
 }
 
@@ -1012,7 +905,8 @@ parallel_reduce
          , class Closure, class Joiner , typename ValueType >
 KOKKOS_INLINE_FUNCTION
 void parallel_reduce
-  ( Impl::TeamThreadRangeBoundariesStruct<iType,Impl::HostThreadTeamMember<Space> >
+  (
+Impl::TeamThreadRangeBoundariesStruct<iType,Impl::HostThreadTeamMember<Space> >
              const & loop_boundaries
   , Closure  const & closure
   , Joiner   const & joiner
@@ -1041,174 +935,131 @@ void parallel_reduce
  *  calling thread team and a summation of  val is
  *  performed and put into result.
  */
-template< typename iType, class Lambda, typename ValueType, typename Member >
-KOKKOS_INLINE_FUNCTION
-typename std::enable_if<
-  ! Kokkos::is_reducer<ValueType>::value
-  && Impl::is_host_thread_team_member<Member>::value
->::type
-parallel_reduce
-  (const Impl::ThreadVectorRangeBoundariesStruct<iType, Member>& loop_boundaries,
-   const Lambda & lambda,
-   ValueType& result)
-{
+template <typename iType, class Lambda, typename ValueType, typename Member>
+KOKKOS_INLINE_FUNCTION typename std::enable_if<
+    !Kokkos::is_reducer<ValueType>::value &&
+    Impl::is_host_thread_team_member<Member>::value>::type
+parallel_reduce(const Impl::ThreadVectorRangeBoundariesStruct<iType, Member>&
+                    loop_boundaries,
+                const Lambda& lambda, ValueType& result) {
   result = ValueType();
-  for( iType i =  loop_boundaries.start ;
-             i <  loop_boundaries.end ;
-             i += loop_boundaries.increment) {
-    lambda(i,result);
+  for (iType i = loop_boundaries.start; i < loop_boundaries.end;
+       i += loop_boundaries.increment) {
+    lambda(i, result);
   }
 }
 
-template< typename iType, class Lambda, typename ReducerType, typename Member >
-KOKKOS_INLINE_FUNCTION
-typename std::enable_if<
-  Kokkos::is_reducer< ReducerType >::value
-  && Impl::is_host_thread_team_member<Member>::value
->::type
-parallel_reduce
-  (const Impl::ThreadVectorRangeBoundariesStruct<iType, Member>& loop_boundaries,
-   const Lambda & lambda,
-   const ReducerType& reducer)
-{
+template <typename iType, class Lambda, typename ReducerType, typename Member>
+KOKKOS_INLINE_FUNCTION typename std::enable_if<
+    Kokkos::is_reducer<ReducerType>::value &&
+    Impl::is_host_thread_team_member<Member>::value>::type
+parallel_reduce(const Impl::ThreadVectorRangeBoundariesStruct<iType, Member>&
+                    loop_boundaries,
+                const Lambda& lambda, const ReducerType& reducer) {
   reducer.init(reducer.reference());
-  for( iType i =  loop_boundaries.start ;
-             i <  loop_boundaries.end ;
-             i += loop_boundaries.increment) {
-    lambda(i,reducer.reference());
+  for (iType i = loop_boundaries.start; i < loop_boundaries.end;
+       i += loop_boundaries.increment) {
+    lambda(i, reducer.reference());
   }
 }
 
 //----------------------------------------------------------------------------
 
-template< typename iType, class Closure, class Member >
-KOKKOS_INLINE_FUNCTION
-typename std::enable_if<
-  Impl::is_host_thread_team_member<Member>::value
->::type
-parallel_scan
-  ( Impl::TeamThreadRangeBoundariesStruct<iType, Member> const & loop_boundaries
-  , Closure const & closure
-  )
-{
+template <typename iType, class Closure, class Member>
+KOKKOS_INLINE_FUNCTION typename std::enable_if<
+    Impl::is_host_thread_team_member<Member>::value>::type
+parallel_scan(
+    Impl::TeamThreadRangeBoundariesStruct<iType, Member> const& loop_boundaries,
+    Closure const& closure) {
   // Extract ValueType from the closure
 
-  using value_type =
-    typename Kokkos::Impl::FunctorAnalysis
-      < Kokkos::Impl::FunctorPatternInterface::SCAN
-      , void
-      , Closure >::value_type ;
+  using value_type = typename Kokkos::Impl::FunctorAnalysis<
+      Kokkos::Impl::FunctorPatternInterface::SCAN, void, Closure>::value_type;
 
-  value_type accum = 0 ;
+  value_type accum = 0;
 
   // Intra-member scan
-  for ( iType i = loop_boundaries.start
-      ; i <  loop_boundaries.end
-      ; i += loop_boundaries.increment ) {
-    closure(i,accum,false);
+  for (iType i = loop_boundaries.start; i < loop_boundaries.end;
+       i += loop_boundaries.increment) {
+    closure(i, accum, false);
   }
 
   // 'accum' output is the exclusive prefix sum
   accum = loop_boundaries.thread.team_scan(accum);
 
-  for ( iType i = loop_boundaries.start
-      ; i <  loop_boundaries.end
-      ; i += loop_boundaries.increment ) {
-    closure(i,accum,true);
+  for (iType i = loop_boundaries.start; i < loop_boundaries.end;
+       i += loop_boundaries.increment) {
+    closure(i, accum, true);
   }
 }
 
-
-template< typename iType, class ClosureType, class Member >
-KOKKOS_INLINE_FUNCTION
-typename std::enable_if<
-  Impl::is_host_thread_team_member<Member>::value
->::type
-parallel_scan
-  ( Impl::ThreadVectorRangeBoundariesStruct<iType, Member > const & loop_boundaries
-  , ClosureType const & closure
-  )
-{
-  using value_type = typename
-    Kokkos::Impl::FunctorAnalysis
-      < Impl::FunctorPatternInterface::SCAN
-      , void
-      , ClosureType >::value_type ;
+template <typename iType, class ClosureType, class Member>
+KOKKOS_INLINE_FUNCTION typename std::enable_if<
+    Impl::is_host_thread_team_member<Member>::value>::type
+parallel_scan(Impl::ThreadVectorRangeBoundariesStruct<iType, Member> const&
+                  loop_boundaries,
+              ClosureType const& closure) {
+  using value_type = typename Kokkos::Impl::FunctorAnalysis<
+      Impl::FunctorPatternInterface::SCAN, void, ClosureType>::value_type;
 
   value_type scan_val = value_type();
 
 #ifdef KOKKOS_ENABLE_PRAGMA_IVDEP
 #pragma ivdep
 #endif
-  for ( iType i = loop_boundaries.start
-      ; i <  loop_boundaries.end
-      ; i += loop_boundaries.increment ) {
-    closure(i,scan_val,true);
+  for (iType i = loop_boundaries.start; i < loop_boundaries.end;
+       i += loop_boundaries.increment) {
+    closure(i, scan_val, true);
   }
 }
 
 //----------------------------------------------------------------------------
 
-template< class Member >
-KOKKOS_INLINE_FUNCTION
-Impl::ThreadSingleStruct<Member>
-PerTeam(
-  Member const& member,
-  typename std::enable_if<Impl::is_thread_team_member<Member>::value>::type const** = nullptr
-)
-{
+template <class Member>
+KOKKOS_INLINE_FUNCTION Impl::ThreadSingleStruct<Member> PerTeam(
+    Member const& member,
+    typename std::enable_if<
+        Impl::is_thread_team_member<Member>::value>::type const** = nullptr) {
   return Impl::ThreadSingleStruct<Member>(member);
 }
 
-template< class Member >
-KOKKOS_INLINE_FUNCTION
-Impl::VectorSingleStruct<Member>
-PerThread(
-  Member const& member,
-  typename std::enable_if<Impl::is_thread_team_member<Member>::value>::type const** = nullptr
-)
-{
+template <class Member>
+KOKKOS_INLINE_FUNCTION Impl::VectorSingleStruct<Member> PerThread(
+    Member const& member,
+    typename std::enable_if<
+        Impl::is_thread_team_member<Member>::value>::type const** = nullptr) {
   return Impl::VectorSingleStruct<Member>(member);
 }
 
-template< class Member , class FunctorType >
-KOKKOS_INLINE_FUNCTION
-typename std::enable_if<
-  Impl::is_host_thread_team_member<Member>::value
->::type
-single( const Impl::ThreadSingleStruct<Member> & single , const FunctorType & functor )
-{
+template <class Member, class FunctorType>
+KOKKOS_INLINE_FUNCTION typename std::enable_if<
+    Impl::is_host_thread_team_member<Member>::value>::type
+single(const Impl::ThreadSingleStruct<Member>& single,
+       const FunctorType& functor) {
   // 'single' does not perform a barrier.
-  if ( single.team_member.team_rank() == 0 ) functor();
+  if (single.team_member.team_rank() == 0) functor();
 }
 
-template< class Member, class FunctorType , typename ValueType >
-KOKKOS_INLINE_FUNCTION
-typename std::enable_if<
-  Impl::is_host_thread_team_member<Member>::value
->::type
-single( const Impl::ThreadSingleStruct<Member> & single , const FunctorType & functor , ValueType & val )
-{
-  single.team_member.team_broadcast( functor , val , 0 );
+template <class Member, class FunctorType, typename ValueType>
+KOKKOS_INLINE_FUNCTION typename std::enable_if<
+    Impl::is_host_thread_team_member<Member>::value>::type
+single(const Impl::ThreadSingleStruct<Member>& single,
+       const FunctorType& functor, ValueType& val) {
+  single.team_member.team_broadcast(functor, val, 0);
 }
 
-template< class Member, class FunctorType >
-KOKKOS_INLINE_FUNCTION
-typename std::enable_if<
-  Impl::is_host_thread_team_member<Member>::value
->::type
-single( const Impl::VectorSingleStruct<Member> & , const FunctorType & functor )
-{
+template <class Member, class FunctorType>
+KOKKOS_INLINE_FUNCTION typename std::enable_if<
+    Impl::is_host_thread_team_member<Member>::value>::type
+single(const Impl::VectorSingleStruct<Member>&, const FunctorType& functor) {
   functor();
 }
 
-template< class Member, class FunctorType , typename ValueType >
-KOKKOS_INLINE_FUNCTION
-typename std::enable_if<
-  Impl::is_host_thread_team_member<Member>::value
->::type
-single( const Impl::VectorSingleStruct<Member> & , const FunctorType & functor , ValueType & val )
-{
+template <class Member, class FunctorType, typename ValueType>
+KOKKOS_INLINE_FUNCTION typename std::enable_if<
+    Impl::is_host_thread_team_member<Member>::value>::type
+single(const Impl::VectorSingleStruct<Member>&, const FunctorType& functor,
+       ValueType& val) {
   functor(val);
 }
 
@@ -1218,4 +1069,3 @@ single( const Impl::VectorSingleStruct<Member> & , const FunctorType & functor ,
 //----------------------------------------------------------------------------
 
 #endif /* #ifndef KOKKOS_IMPL_HOSTTHREADTEAM_HPP */
-
diff --git a/lib/kokkos/core/src/impl/Kokkos_LIFO.hpp b/lib/kokkos/core/src/impl/Kokkos_LIFO.hpp
index 43e9783beb..67e9af5c40 100644
--- a/lib/kokkos/core/src/impl/Kokkos_LIFO.hpp
+++ b/lib/kokkos/core/src/impl/Kokkos_LIFO.hpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -47,13 +48,14 @@
 #define KOKKOS_IMPL_LIFO_HPP
 
 #include <Kokkos_Macros.hpp>
-#ifdef KOKKOS_ENABLE_TASKDAG // Note: implies CUDA_VERSION >= 8000 if using CUDA
+#ifdef KOKKOS_ENABLE_TASKDAG  // Note: implies CUDA_VERSION >= 8000 if using
+                              // CUDA
 
 #include <Kokkos_Core_fwd.hpp>
 
 #include <Kokkos_PointerOwnership.hpp>
 #include <impl/Kokkos_OptionalRef.hpp>
-#include <impl/Kokkos_Error.hpp> // KOKKOS_EXPECTS
+#include <impl/Kokkos_Error.hpp>  // KOKKOS_EXPECTS
 #include <impl/Kokkos_LinkedListNode.hpp>
 
 #include <Kokkos_Atomic.hpp>  // atomic_compare_exchange, atomic_fence
@@ -68,32 +70,29 @@ namespace Impl {
 //----------------------------------------------------------------------------
 
 template <class T>
-struct LockBasedLIFOCommon
-{
-
+struct LockBasedLIFOCommon {
   using value_type = T;
 
   using node_type = SimpleSinglyLinkedListNode<>;
 
   static constexpr uintptr_t LockTag = ~uintptr_t(0);
-  static constexpr uintptr_t EndTag = ~uintptr_t(1);
+  static constexpr uintptr_t EndTag  = ~uintptr_t(1);
 
   OwningRawPtr<node_type> m_head = (node_type*)EndTag;
 
   KOKKOS_INLINE_FUNCTION
   bool _try_push_node(node_type& node) {
-
     KOKKOS_EXPECTS(!node.is_enqueued());
 
-    auto* volatile & next = LinkedListNodeAccess::next_ptr(node);
+    auto* volatile& next = LinkedListNodeAccess::next_ptr(node);
 
     // store the head of the queue in a local variable
     auto* old_head = m_head;
 
     // retry until someone locks the queue or we successfully compare exchange
     while (old_head != (node_type*)LockTag) {
-
-      // TODO @tasking @memory_order DSH this should have a memory order and not a memory fence
+      // TODO @tasking @memory_order DSH this should have a memory order and not
+      // a memory fence
 
       // set task->next to the head of the queue
       next = old_head;
@@ -114,13 +113,14 @@ struct LockBasedLIFOCommon
       //   old_head = m_head;
       old_head = ::Kokkos::atomic_compare_exchange(&m_head, old_head, &node);
 
-      if(old_head_tmp == old_head) return true;
+      if (old_head_tmp == old_head) return true;
     }
 
     // Failed, replace 'task->m_next' value since 'task' remains
     // not a member of a queue.
 
-    // TODO @tasking @memory_order DSH this should have a memory order and not a memory fence
+    // TODO @tasking @memory_order DSH this should have a memory order and not a
+    // memory fence
     LinkedListNodeAccess::mark_as_not_enqueued(node);
 
     // fence to emulate acquire semantics on next
@@ -131,55 +131,45 @@ struct LockBasedLIFOCommon
   }
 
   bool _is_empty() const noexcept {
-    // TODO @tasking @memory_order DSH make this an atomic load with memory order
+    // TODO @tasking @memory_order DSH make this an atomic load with memory
+    // order
     return (volatile node_type*)this->m_head == (node_type*)EndTag;
   }
-
 };
 
 //------------------------------------------------------------------------------
 //------------------------------------------------------------------------------
 
 template <class T>
-class LockBasedLIFO
-  : private LockBasedLIFOCommon<T>
-{
-
-private:
-
-  using base_t = LockBasedLIFOCommon<T>;
+class LockBasedLIFO : private LockBasedLIFOCommon<T> {
+ private:
+  using base_t    = LockBasedLIFOCommon<T>;
   using node_type = typename base_t::node_type;
 
-public:
-
-  using value_type = typename base_t::value_type; // = T
+ public:
+  using value_type               = typename base_t::value_type;  // = T
   using intrusive_node_base_type = SimpleSinglyLinkedListNode<>;
 
-public:
-
-
-  LockBasedLIFO() = default;
+ public:
+  LockBasedLIFO()                     = default;
   LockBasedLIFO(LockBasedLIFO const&) = delete;
-  LockBasedLIFO(LockBasedLIFO&&) = delete;
+  LockBasedLIFO(LockBasedLIFO&&)      = delete;
   LockBasedLIFO& operator=(LockBasedLIFO const&) = delete;
   LockBasedLIFO& operator=(LockBasedLIFO&&) = delete;
 
   ~LockBasedLIFO() = default;
 
-
   bool empty() const noexcept {
     // TODO @tasking @memory_order DSH memory order
     return this->_is_empty();
   }
 
   KOKKOS_INLINE_FUNCTION
-  OptionalRef<T> pop(bool abort_on_locked = false)
-  {
+  OptionalRef<T> pop(bool abort_on_locked = false) {
     // Put this in here to avoid requiring value_type to be complete until now.
-    static_assert(
-      std::is_base_of<intrusive_node_base_type, value_type>::value,
-      "Intrusive linked-list value_type must be derived from intrusive_node_base_type"
-    );
+    static_assert(std::is_base_of<intrusive_node_base_type, value_type>::value,
+                  "Intrusive linked-list value_type must be derived from "
+                  "intrusive_node_base_type");
 
     // We can't use the static constexpr LockTag directly because
     // atomic_compare_exchange needs to bind a reference to that, and you
@@ -191,8 +181,7 @@ public:
     auto* rv = this->m_head;
 
     // Retry until the lock is acquired or the queue is empty.
-    while(rv != (node_type*)base_t::EndTag) {
-
+    while (rv != (node_type*)base_t::EndTag) {
       // The only possible values for the queue are
       // (1) lock, (2) end, or (3) a valid task.
       // Thus zero will never appear in the queue.
@@ -200,22 +189,23 @@ public:
       // If queue is locked then just read by guaranteeing the CAS will fail.
       KOKKOS_ASSERT(rv != nullptr);
 
-      if(rv == lock_tag) {
-        // TODO @tasking @memory_order DSH this should just be an atomic load followed by a continue
-        // just set rv to nullptr for now, effectively turning the
-        // atomic_compare_exchange below into a load
+      if (rv == lock_tag) {
+        // TODO @tasking @memory_order DSH this should just be an atomic load
+        // followed by a continue just set rv to nullptr for now, effectively
+        // turning the atomic_compare_exchange below into a load
         rv = nullptr;
-        if(abort_on_locked) {
+        if (abort_on_locked) {
           break;
         }
       }
 
       auto* const old_rv = rv;
 
-      // TODO @tasking @memory_order DSH this should be a weak compare exchange in a loop
+      // TODO @tasking @memory_order DSH this should be a weak compare exchange
+      // in a loop
       rv = Kokkos::atomic_compare_exchange(&(this->m_head), old_rv, lock_tag);
 
-      if(rv == old_rv) {
+      if (rv == old_rv) {
         // CAS succeeded and queue is locked
         //
         // This thread has locked the queue and removed 'rv' from the queue.
@@ -229,14 +219,16 @@ public:
         // This thread has exclusive access to
         // the queue and the popped task's m_next.
 
-        // TODO @tasking @memory_order DSH check whether the volatile is needed here
-        auto* volatile& next = LinkedListNodeAccess::next_ptr(*rv); //->m_next;
+        // TODO @tasking @memory_order DSH check whether the volatile is needed
+        // here
+        auto* volatile& next = LinkedListNodeAccess::next_ptr(*rv);  //->m_next;
 
         // This algorithm is not lockfree because a adversarial scheduler could
         // context switch this thread at this point and the rest of the threads
         // calling this method would never make forward progress
 
-        // TODO @tasking @memory_order DSH I think this needs to be a atomic store release (and the memory fence needs to be removed)
+        // TODO @tasking @memory_order DSH I think this needs to be a atomic
+        // store release (and the memory fence needs to be removed)
         // TODO @tasking DSH prove that this doesn't need to be a volatile store
         // Lock is released here
         this->m_head = next;
@@ -246,7 +238,7 @@ public:
 
         Kokkos::memory_fence();
 
-        return OptionalRef<T>{ *static_cast<T*>(rv) };
+        return OptionalRef<T>{*static_cast<T*>(rv)};
       }
 
       // Otherwise, the CAS got a value that didn't match (either because
@@ -256,36 +248,32 @@ public:
     }
 
     // Return an empty OptionalRef by calling the default constructor
-    return { };
+    return {};
   }
 
   KOKKOS_INLINE_FUNCTION
-  OptionalRef<T>
-  steal()
-  {
+  OptionalRef<T> steal() {
     // TODO @tasking @optimization DSH do this with fewer retries
     return pop(/* abort_on_locked = */ true);
   }
 
   KOKKOS_INLINE_FUNCTION
-  bool push(node_type& node)
-  {
-    while(!this->_try_push_node(node)) { /* retry until success */ }
+  bool push(node_type& node) {
+    while (!this->_try_push_node(node)) { /* retry until success */
+    }
     // for consistency with push interface on other queue types:
     return true;
   }
 
   KOKKOS_INLINE_FUNCTION
-  bool push(node_type&& node)
-  {
+  bool push(node_type&& node) {
     // Just forward to the lvalue version
     return push(node);
   }
-
 };
 
-
-/** @brief A Multiple Producer, Single Consumer Queue with some special semantics
+/** @brief A Multiple Producer, Single Consumer Queue with some special
+ * semantics
  *
  * This multi-producer, single consumer queue has the following semantics:
  *
@@ -306,27 +294,24 @@ public:
  *
  */
 template <class T>
-class SingleConsumeOperationLIFO
-  : private LockBasedLIFOCommon<T>
-{
-private:
-
-  using base_t = LockBasedLIFOCommon<T>;
+class SingleConsumeOperationLIFO : private LockBasedLIFOCommon<T> {
+ private:
+  using base_t    = LockBasedLIFOCommon<T>;
   using node_type = typename base_t::node_type;
 
   // Allows us to reuse the existing infrastructure for
   static constexpr auto ConsumedTag = base_t::LockTag;
 
-public:
-
-  using value_type = typename base_t::value_type; // = T
+ public:
+  using value_type = typename base_t::value_type;  // = T
 
   KOKKOS_INLINE_FUNCTION
   SingleConsumeOperationLIFO() noexcept = default;
 
   SingleConsumeOperationLIFO(SingleConsumeOperationLIFO const&) = delete;
-  SingleConsumeOperationLIFO(SingleConsumeOperationLIFO&&) = delete;
-  SingleConsumeOperationLIFO& operator=(SingleConsumeOperationLIFO const&) = delete;
+  SingleConsumeOperationLIFO(SingleConsumeOperationLIFO&&)      = delete;
+  SingleConsumeOperationLIFO& operator=(SingleConsumeOperationLIFO const&) =
+      delete;
   SingleConsumeOperationLIFO& operator=(SingleConsumeOperationLIFO&&) = delete;
 
   KOKKOS_INLINE_FUNCTION
@@ -345,21 +330,20 @@ public:
   }
 
   KOKKOS_INLINE_FUNCTION
-  bool try_push(node_type& node)
-  {
+  bool try_push(node_type& node) {
     return this->_try_push_node(node);
     // Ensures: (return value is true) || (node.is_enqueued() == false);
   }
 
   template <class Function>
-  KOKKOS_INLINE_FUNCTION
-  void consume(Function&& f) {
+  KOKKOS_INLINE_FUNCTION void consume(Function&& f) {
     auto* const consumed_tag = (node_type*)ConsumedTag;
 
     // Swap the Consumed tag into the head of the queue:
 
     // (local variable used for assertion only)
-    // TODO @tasking @memory_order DSH this should have memory order release, I think
+    // TODO @tasking @memory_order DSH this should have memory order release, I
+    // think
     Kokkos::memory_fence();
     auto old_head = Kokkos::atomic_exchange(&(this->m_head), consumed_tag);
 
@@ -370,8 +354,7 @@ public:
 
     // We now have exclusive access to the queue; loop over it and call
     // the user function
-    while(old_head != (node_type*)base_t::EndTag) {
-
+    while (old_head != (node_type*)base_t::EndTag) {
       // get the Node to make the call with
       auto* call_arg = old_head;
 
@@ -384,15 +367,12 @@ public:
       // Call the user function
       auto& arg = *static_cast<T*>(call_arg);
       f(std::move(arg));
-
     }
-
   }
-
 };
 
-} // end namespace Impl
-} // end namespace Kokkos
+}  // end namespace Impl
+}  // end namespace Kokkos
 
 //----------------------------------------------------------------------------
 //----------------------------------------------------------------------------
@@ -400,9 +380,7 @@ public:
 namespace Kokkos {
 namespace Impl {
 
-struct TaskQueueTraitsLockBased
-{
-
+struct TaskQueueTraitsLockBased {
   // TODO @tasking @documentation DSH document what concepts these match
 
   template <class Task>
@@ -413,19 +391,16 @@ struct TaskQueueTraitsLockBased
 
   template <class Task>
   using intrusive_task_base_type =
-    typename ready_queue_type<Task>::intrusive_node_base_type;
+      typename ready_queue_type<Task>::intrusive_node_base_type;
 
   static constexpr auto ready_queue_insertion_may_fail = false;
-
 };
 
-
-} // end namespace Impl
-} // end namespace Kokkos
+}  // end namespace Impl
+}  // end namespace Kokkos
 
 //----------------------------------------------------------------------------
 //----------------------------------------------------------------------------
 
 #endif /* defined KOKKOS_ENABLE_TASKDAG */
 #endif /* #ifndef KOKKOS_IMPL_LIFO_HPP */
-
diff --git a/lib/kokkos/core/src/impl/Kokkos_LinkedListNode.hpp b/lib/kokkos/core/src/impl/Kokkos_LinkedListNode.hpp
index 78a6faca90..1b7918ed78 100644
--- a/lib/kokkos/core/src/impl/Kokkos_LinkedListNode.hpp
+++ b/lib/kokkos/core/src/impl/Kokkos_LinkedListNode.hpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -47,13 +48,14 @@
 #define KOKKOS_IMPL_LINKEDLISTNODE_HPP
 
 #include <Kokkos_Macros.hpp>
-#ifdef KOKKOS_ENABLE_TASKDAG // Note: implies CUDA_VERSION >= 8000 if using CUDA
+#ifdef KOKKOS_ENABLE_TASKDAG  // Note: implies CUDA_VERSION >= 8000 if using
+                              // CUDA
 
 #include <Kokkos_Core_fwd.hpp>
 
 #include <Kokkos_PointerOwnership.hpp>
 #include <impl/Kokkos_OptionalRef.hpp>
-#include <impl/Kokkos_Error.hpp> // KOKKOS_EXPECTS
+#include <impl/Kokkos_Error.hpp>  // KOKKOS_EXPECTS
 
 #include <Kokkos_Atomic.hpp>  // atomic_compare_exchange, atomic_fence
 
@@ -65,16 +67,12 @@ namespace Impl {
 
 struct LinkedListNodeAccess;
 
-template <
-  uintptr_t NotEnqueuedValue = 0,
-  template <class> class PointerTemplate = std::add_pointer
->
-struct SimpleSinglyLinkedListNode
-{
-
-private:
-
-  using pointer_type = typename PointerTemplate<SimpleSinglyLinkedListNode>::type;
+template <uintptr_t NotEnqueuedValue             = 0,
+          template <class> class PointerTemplate = std::add_pointer>
+struct SimpleSinglyLinkedListNode {
+ private:
+  using pointer_type =
+      typename PointerTemplate<SimpleSinglyLinkedListNode>::type;
 
   pointer_type m_next = reinterpret_cast<pointer_type>(NotEnqueuedValue);
 
@@ -84,31 +82,27 @@ private:
 
   KOKKOS_INLINE_FUNCTION
   void mark_as_not_enqueued() noexcept {
-    // TODO @tasking @memory_order DSH make this an atomic store with memory order
+    // TODO @tasking @memory_order DSH make this an atomic store with memory
+    // order
     m_next = (pointer_type)NotEnqueuedValue;
   }
 
   KOKKOS_INLINE_FUNCTION
   void mark_as_not_enqueued() volatile noexcept {
-    // TODO @tasking @memory_order DSH make this an atomic store with memory order
+    // TODO @tasking @memory_order DSH make this an atomic store with memory
+    // order
     m_next = (pointer_type)NotEnqueuedValue;
   }
 
   KOKKOS_INLINE_FUNCTION
-  pointer_type& _next_ptr() noexcept {
-    return m_next;
-  }
+  pointer_type& _next_ptr() noexcept { return m_next; }
 
   KOKKOS_INLINE_FUNCTION
-  pointer_type volatile& _next_ptr() volatile noexcept {
-    return m_next;
-  }
+  pointer_type volatile& _next_ptr() volatile noexcept { return m_next; }
 
   KOKKOS_INLINE_FUNCTION
-  pointer_type const& _next_ptr() const noexcept {
-    return m_next;
-  }
-  
+  pointer_type const& _next_ptr() const noexcept { return m_next; }
+
   KOKKOS_INLINE_FUNCTION
   pointer_type const volatile& _next_ptr() const volatile noexcept {
     return m_next;
@@ -116,91 +110,76 @@ private:
 
   friend struct LinkedListNodeAccess;
 
-public:
-
+ public:
   // KOKKOS_CONSTEXPR_14
   KOKKOS_INLINE_FUNCTION
   bool is_enqueued() const noexcept {
-    // TODO @tasking @memory_order DSH make this an atomic load with memory order
+    // TODO @tasking @memory_order DSH make this an atomic load with memory
+    // order
     return m_next != reinterpret_cast<pointer_type>(NotEnqueuedValue);
   }
 
   // KOKKOS_CONSTEXPR_14
   KOKKOS_INLINE_FUNCTION
   bool is_enqueued() const volatile noexcept {
-    // TODO @tasking @memory_order DSH make this an atomic load with memory order
+    // TODO @tasking @memory_order DSH make this an atomic load with memory
+    // order
     return m_next != reinterpret_cast<pointer_type>(NotEnqueuedValue);
   }
-
 };
 
 /// Attorney for LinkedListNode, since user types inherit from it
-struct LinkedListNodeAccess
-{
-
+struct LinkedListNodeAccess {
   template <class Node>
-  KOKKOS_INLINE_FUNCTION
-  static void mark_as_not_enqueued(Node& node) noexcept {
+  KOKKOS_INLINE_FUNCTION static void mark_as_not_enqueued(Node& node) noexcept {
     node.mark_as_not_enqueued();
   }
 
   template <class Node>
-  KOKKOS_INLINE_FUNCTION
-  static void mark_as_not_enqueued(Node volatile& node) noexcept {
+  KOKKOS_INLINE_FUNCTION static void mark_as_not_enqueued(
+      Node volatile& node) noexcept {
     node.mark_as_not_enqueued();
   }
 
   template <class Node>
-  KOKKOS_INLINE_FUNCTION
-  static
-  typename Node::pointer_type&
-  next_ptr(Node& node) noexcept {
+  KOKKOS_INLINE_FUNCTION static typename Node::pointer_type& next_ptr(
+      Node& node) noexcept {
     return node._next_ptr();
   }
 
   template <class Node>
-  KOKKOS_INLINE_FUNCTION
-  static
-  typename Node::pointer_type&
-  next_ptr(Node volatile& node) noexcept {
+  KOKKOS_INLINE_FUNCTION static typename Node::pointer_type& next_ptr(
+      Node volatile& node) noexcept {
     return node._next_ptr();
   }
 
   template <class Node>
-  KOKKOS_INLINE_FUNCTION
-  static
-  typename Node::pointer_type&
-  next_ptr(Node const& node) noexcept {
+  KOKKOS_INLINE_FUNCTION static typename Node::pointer_type& next_ptr(
+      Node const& node) noexcept {
     return node._next_ptr();
   }
 
   template <class Node>
-  KOKKOS_INLINE_FUNCTION
-  static
-  typename Node::pointer_type&
-  prev_ptr(Node& node) noexcept {
+  KOKKOS_INLINE_FUNCTION static typename Node::pointer_type& prev_ptr(
+      Node& node) noexcept {
     return node._prev_ptr();
   }
 
   template <class Node>
-  KOKKOS_INLINE_FUNCTION
-  static
-  typename Node::pointer_type&
-  prev_ptr(Node const& node) noexcept {
+  KOKKOS_INLINE_FUNCTION static typename Node::pointer_type& prev_ptr(
+      Node const& node) noexcept {
     return node._prev_ptr();
   }
-
 };
 
 //----------------------------------------------------------------------------
 //----------------------------------------------------------------------------
 
-} // end namespace Impl
-} // end namespace Kokkos
+}  // end namespace Impl
+}  // end namespace Kokkos
 
 //----------------------------------------------------------------------------
 //----------------------------------------------------------------------------
 
 #endif /* defined KOKKOS_ENABLE_TASKDAG */
 #endif /* #ifndef KOKKOS_IMPL_LINKEDLISTNODE_HPP */
-
diff --git a/lib/kokkos/core/src/impl/Kokkos_MemoryPool.cpp b/lib/kokkos/core/src/impl/Kokkos_MemoryPool.cpp
index 0394ccb5ad..d48368f761 100644
--- a/lib/kokkos/core/src/impl/Kokkos_MemoryPool.cpp
+++ b/lib/kokkos/core/src/impl/Kokkos_MemoryPool.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -53,73 +54,57 @@ namespace Impl {
 
 /* Verify size constraints:
  *   min_block_alloc_size <= max_block_alloc_size
- *   max_block_alloc_size <= min_superblock_size 
+ *   max_block_alloc_size <= min_superblock_size
  *   min_superblock_size  <= max_superblock_size
  *   min_superblock_size  <= min_total_alloc_size
- *   min_superblock_size  <= min_block_alloc_size * 
+ *   min_superblock_size  <= min_block_alloc_size *
  *                           max_block_per_superblock
  */
-void memory_pool_bounds_verification
-  ( size_t min_block_alloc_size
-  , size_t max_block_alloc_size
-  , size_t min_superblock_size
-  , size_t max_superblock_size
-  , size_t max_block_per_superblock
-  , size_t min_total_alloc_size
-  )
-{
-  const size_t max_superblock =
-    min_block_alloc_size * max_block_per_superblock ;
+void memory_pool_bounds_verification(size_t min_block_alloc_size,
+                                     size_t max_block_alloc_size,
+                                     size_t min_superblock_size,
+                                     size_t max_superblock_size,
+                                     size_t max_block_per_superblock,
+                                     size_t min_total_alloc_size) {
+  const size_t max_superblock = min_block_alloc_size * max_block_per_superblock;
 
-  if ( ( size_t(max_superblock_size) < min_superblock_size ) ||
-       ( min_total_alloc_size < min_superblock_size ) ||
-       ( max_superblock       < min_superblock_size ) ||
-       ( min_superblock_size  < max_block_alloc_size ) ||
-       ( max_block_alloc_size < min_block_alloc_size ) ) {
+  if ((size_t(max_superblock_size) < min_superblock_size) ||
+      (min_total_alloc_size < min_superblock_size) ||
+      (max_superblock < min_superblock_size) ||
+      (min_superblock_size < max_block_alloc_size) ||
+      (max_block_alloc_size < min_block_alloc_size)) {
+    std::ostringstream msg;
 
-    std::ostringstream msg ;
+    msg << "Kokkos::MemoryPool size constraint violation";
 
-    msg << "Kokkos::MemoryPool size constraint violation" ;
-
-    if ( size_t(max_superblock_size) < min_superblock_size ) {
-      msg << " : max_superblock_size("
-          << max_superblock_size
-          << ") < min_superblock_size("
-          << min_superblock_size << ")" ;
+    if (size_t(max_superblock_size) < min_superblock_size) {
+      msg << " : max_superblock_size(" << max_superblock_size
+          << ") < min_superblock_size(" << min_superblock_size << ")";
     }
 
-    if ( min_total_alloc_size < min_superblock_size ) {
-      msg << " : min_total_alloc_size("
-          << min_total_alloc_size
-          << ") < min_superblock_size("
-          << min_superblock_size << ")" ;
+    if (min_total_alloc_size < min_superblock_size) {
+      msg << " : min_total_alloc_size(" << min_total_alloc_size
+          << ") < min_superblock_size(" << min_superblock_size << ")";
     }
 
-    if ( max_superblock < min_superblock_size ) {
-      msg << " : max_superblock("
-          << max_superblock
-          << ") < min_superblock_size("
-          << min_superblock_size << ")" ;
+    if (max_superblock < min_superblock_size) {
+      msg << " : max_superblock(" << max_superblock
+          << ") < min_superblock_size(" << min_superblock_size << ")";
     }
 
-    if ( min_superblock_size < max_block_alloc_size ) {
-      msg << " : min_superblock_size("
-          << min_superblock_size
-          << ") < max_block_alloc_size("
-          << max_block_alloc_size << ")" ;
+    if (min_superblock_size < max_block_alloc_size) {
+      msg << " : min_superblock_size(" << min_superblock_size
+          << ") < max_block_alloc_size(" << max_block_alloc_size << ")";
     }
 
-    if ( max_block_alloc_size < min_block_alloc_size ) {
-      msg << " : max_block_alloc_size("
-          << max_block_alloc_size
-          << ") < min_block_alloc_size("
-          << min_block_alloc_size << ")" ;
+    if (max_block_alloc_size < min_block_alloc_size) {
+      msg << " : max_block_alloc_size(" << max_block_alloc_size
+          << ") < min_block_alloc_size(" << min_block_alloc_size << ")";
     }
 
-    Kokkos::Impl::throw_runtime_exception( msg.str() );
+    Kokkos::Impl::throw_runtime_exception(msg.str());
   }
 }
 
-}
-}
-
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/impl/Kokkos_MemoryPoolAllocator.hpp b/lib/kokkos/core/src/impl/Kokkos_MemoryPoolAllocator.hpp
index b4629df5b0..54f91eb68d 100644
--- a/lib/kokkos/core/src/impl/Kokkos_MemoryPoolAllocator.hpp
+++ b/lib/kokkos/core/src/impl/Kokkos_MemoryPoolAllocator.hpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -57,16 +58,13 @@ namespace Impl {
 
 template <class MemoryPool, class T>
 class MemoryPoolAllocator {
-public:
-
+ public:
   using memory_pool = MemoryPool;
 
-private:
-
+ private:
   memory_pool m_pool;
 
-public:
-
+ public:
   KOKKOS_INLINE_FUNCTION
   MemoryPoolAllocator() = default;
   KOKKOS_INLINE_FUNCTION
@@ -81,15 +79,16 @@ public:
   ~MemoryPoolAllocator() = default;
 
   KOKKOS_INLINE_FUNCTION
-  explicit MemoryPoolAllocator(memory_pool const& arg_pool) : m_pool(arg_pool) { }
+  explicit MemoryPoolAllocator(memory_pool const& arg_pool)
+      : m_pool(arg_pool) {}
   KOKKOS_INLINE_FUNCTION
-  explicit MemoryPoolAllocator(memory_pool&& arg_pool) : m_pool(std::move(arg_pool)) { }
+  explicit MemoryPoolAllocator(memory_pool&& arg_pool)
+      : m_pool(std::move(arg_pool)) {}
 
-public:
-
-  using value_type = T;
-  using pointer = T*;
-  using size_type = typename MemoryPool::memory_space::size_type;
+ public:
+  using value_type      = T;
+  using pointer         = T*;
+  using size_type       = typename MemoryPool::memory_space::size_type;
   using difference_type = typename std::make_signed<size_type>::type;
 
   template <class U>
@@ -100,21 +99,17 @@ public:
   KOKKOS_INLINE_FUNCTION
   pointer allocate(size_t n) {
     void* rv = m_pool.allocate(n * sizeof(T));
-    if(rv == nullptr) {
+    if (rv == nullptr) {
       Kokkos::abort("Kokkos MemoryPool allocator failed to allocate memory");
     }
     return reinterpret_cast<T*>(rv);
   }
 
   KOKKOS_INLINE_FUNCTION
-  void deallocate(T* ptr, size_t n) {
-    m_pool.deallocate(ptr, n * sizeof(T));
-  }
+  void deallocate(T* ptr, size_t n) { m_pool.deallocate(ptr, n * sizeof(T)); }
 
   KOKKOS_INLINE_FUNCTION
-  size_type max_size() const {
-    return m_pool.max_block_size();
-  }
+  size_type max_size() const { return m_pool.max_block_size(); }
 
   KOKKOS_INLINE_FUNCTION
   bool operator==(MemoryPoolAllocator const& other) const {
@@ -125,16 +120,12 @@ public:
   bool operator!=(MemoryPoolAllocator const& other) const {
     return !(*this == other);
   }
-
 };
 
-} // end namespace Impl
-} // end namespace Kokkos
+}  // end namespace Impl
+}  // end namespace Kokkos
 
 //----------------------------------------------------------------------------
 //----------------------------------------------------------------------------
 
-
-
 #endif /* #ifndef KOKKOS_IMPL_MEMORYPOOLALLOCATOR_HPP */
-
diff --git a/lib/kokkos/core/src/impl/Kokkos_MemorySpace.hpp b/lib/kokkos/core/src/impl/Kokkos_MemorySpace.hpp
new file mode 100644
index 0000000000..650cf8a70c
--- /dev/null
+++ b/lib/kokkos/core/src/impl/Kokkos_MemorySpace.hpp
@@ -0,0 +1,110 @@
+/*
+//@HEADER
+// ************************************************************************
+//
+//                        Kokkos v. 3.0
+//              Copyright (2019) Sandia Corporation
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
+// the U.S. Government retains certain rights in this software.
+//
+// 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 Corporation nor the names of the
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 NTESS OR THE
+// 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.
+//
+// Questions? Contact Christian R. Trott (crtrott@sandia.gov)
+//
+// ************************************************************************
+//@HEADER
+*/
+
+/** @file Kokkos_MemorySpace.hpp
+ *
+ *  Operations common to memory space instances, or at least default
+ *  implementations thereof.
+ */
+
+#ifndef KOKKOS_IMPL_MEMORYSPACE_HPP
+#define KOKKOS_IMPL_MEMORYSPACE_HPP
+
+#include <Kokkos_Macros.hpp>
+#include <impl/Kokkos_SharedAlloc.hpp>
+#include <impl/Kokkos_Error.hpp>
+
+#include <string>
+#include <iostream>
+#include <sstream>
+
+namespace Kokkos {
+namespace Impl {
+
+template <class MemorySpace>
+SharedAllocationHeader *checked_allocation_with_header(MemorySpace const &space,
+                                                       std::string const &label,
+                                                       size_t alloc_size) {
+  try {
+    return reinterpret_cast<SharedAllocationHeader *>(
+        space.allocate(alloc_size + sizeof(SharedAllocationHeader)));
+  } catch (Kokkos::Experimental::RawMemoryAllocationFailure const &failure) {
+    auto generate_failure_message = [&](std::ostream &o) {
+      o << "Kokkos failed to allocate memory for label \"" << label
+        << "\".  Allocation using MemorySpace named \"" << space.name()
+        << "\" failed with the following error:  ";
+      failure.print_error_message(o);
+      if (failure.failure_mode() ==
+          Kokkos::Experimental::RawMemoryAllocationFailure::FailureMode::
+              AllocationNotAligned) {
+        // TODO: delete the misaligned memory?
+        o << "Warning: Allocation failed due to misalignment; memory may "
+             "be leaked."
+          << std::endl;
+      }
+      o.flush();
+    };
+    try {
+      std::ostringstream sstr;
+      generate_failure_message(sstr);
+      Kokkos::Impl::throw_runtime_exception(sstr.str());
+    } catch (std::bad_alloc const &) {
+      // Probably failed to allocate the string because we're so close to out
+      // of memory. Try printing to std::cerr instead
+      try {
+        generate_failure_message(std::cerr);
+      } catch (std::bad_alloc const &) {
+        // oh well, we tried...
+      }
+      Kokkos::Impl::throw_runtime_exception(
+          "Kokkos encountered an allocation failure, then another allocation "
+          "failure while trying to create the error message.");
+    }
+  }
+  return nullptr;  // unreachable
+}
+
+}  // end namespace Impl
+}  // end namespace Kokkos
+
+#endif  // KOKKOS_IMPL_MEMORYSPACE_HPP
diff --git a/lib/kokkos/core/src/impl/Kokkos_Memory_Fence.hpp b/lib/kokkos/core/src/impl/Kokkos_Memory_Fence.hpp
index ac5948669a..f8bef72b77 100644
--- a/lib/kokkos/core/src/impl/Kokkos_Memory_Fence.hpp
+++ b/lib/kokkos/core/src/impl/Kokkos_Memory_Fence.hpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -42,49 +43,44 @@
 */
 
 #include <Kokkos_Macros.hpp>
-#if defined( KOKKOS_ATOMIC_HPP ) && ! defined( KOKKOS_MEMORY_FENCE_HPP )
+#if defined(KOKKOS_ATOMIC_HPP) && !defined(KOKKOS_MEMORY_FENCE_HPP)
 #define KOKKOS_MEMORY_FENCE_HPP
 namespace Kokkos {
 
 //----------------------------------------------------------------------------
 
 KOKKOS_FORCEINLINE_FUNCTION
-void memory_fence()
-{
-#if defined( __CUDA_ARCH__ )
+void memory_fence() {
+#if defined(__CUDA_ARCH__)
   __threadfence();
-#elif defined( KOKKOS_ENABLE_ROCM_ATOMICS )
+#elif defined(KOKKOS_ENABLE_ROCM_ATOMICS)
   amp_barrier(CLK_LOCAL_MEM_FENCE | CLK_GLOBAL_MEM_FENCE);
-#elif defined( KOKKOS_ENABLE_ASM ) && defined( KOKKOS_ENABLE_ISA_X86_64 )
-  asm volatile (
-	  "mfence" ::: "memory"
-  );
-#elif defined( KOKKOS_ENABLE_GNU_ATOMICS ) || \
-      ( defined( KOKKOS_COMPILER_NVCC ) && defined( KOKKOS_ENABLE_INTEL_ATOMICS ) )
+#elif defined(KOKKOS_ENABLE_ASM) && defined(KOKKOS_ENABLE_ISA_X86_64)
+  asm volatile("mfence" ::: "memory");
+#elif defined(KOKKOS_ENABLE_GNU_ATOMICS) || \
+    (defined(KOKKOS_COMPILER_NVCC) && defined(KOKKOS_ENABLE_INTEL_ATOMICS))
   __sync_synchronize();
-#elif defined( KOKKOS_ENABLE_INTEL_ATOMICS )
+#elif defined(KOKKOS_ENABLE_INTEL_ATOMICS)
   _mm_mfence();
-#elif defined( KOKKOS_ENABLE_OPENMP_ATOMICS )
-  #pragma omp flush
-#elif defined( KOKKOS_ENABLE_WINDOWS_ATOMICS )
+#elif defined(KOKKOS_ENABLE_OPENMP_ATOMICS)
+#pragma omp flush
+#elif defined(KOKKOS_ENABLE_WINDOWS_ATOMICS)
   MemoryBarrier();
-#elif !defined( KOKKOS_ENABLE_SERIAL_ATOMICS )
- #error "Error: memory_fence() not defined"
+#elif !defined(KOKKOS_ENABLE_SERIAL_ATOMICS)
+#error "Error: memory_fence() not defined"
 #endif
 }
 
 //////////////////////////////////////////////////////
 // store_fence()
 //
-// If possible use a store fence on the architecture, if not run a full memory fence
+// If possible use a store fence on the architecture, if not run a full memory
+// fence
 
 KOKKOS_FORCEINLINE_FUNCTION
-void store_fence()
-{
-#if defined( KOKKOS_ENABLE_ASM ) && defined( KOKKOS_ENABLE_ISA_X86_64 )
-  asm volatile (
-	  "sfence" ::: "memory"
-  );
+void store_fence() {
+#if defined(KOKKOS_ENABLE_ASM) && defined(KOKKOS_ENABLE_ISA_X86_64)
+  asm volatile("sfence" ::: "memory");
 #else
   memory_fence();
 #endif
@@ -93,21 +89,18 @@ void store_fence()
 //////////////////////////////////////////////////////
 // load_fence()
 //
-// If possible use a load fence on the architecture, if not run a full memory fence
+// If possible use a load fence on the architecture, if not run a full memory
+// fence
 
 KOKKOS_FORCEINLINE_FUNCTION
-void load_fence()
-{
-#if defined( KOKKOS_ENABLE_ASM ) && defined( KOKKOS_ENABLE_ISA_X86_64 )
-  asm volatile (
-	  "lfence" ::: "memory"
-  );
+void load_fence() {
+#if defined(KOKKOS_ENABLE_ASM) && defined(KOKKOS_ENABLE_ISA_X86_64)
+  asm volatile("lfence" ::: "memory");
 #else
   memory_fence();
 #endif
 }
 
-} // namespace kokkos
+}  // namespace Kokkos
 
 #endif
-
diff --git a/lib/kokkos/core/src/impl/Kokkos_MultipleTaskQueue.hpp b/lib/kokkos/core/src/impl/Kokkos_MultipleTaskQueue.hpp
index ed8d2be5ae..675547ba5e 100644
--- a/lib/kokkos/core/src/impl/Kokkos_MultipleTaskQueue.hpp
+++ b/lib/kokkos/core/src/impl/Kokkos_MultipleTaskQueue.hpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -45,7 +46,7 @@
 #define KOKKOS_IMPL_MULTIPLETASKQUEUE_HPP
 
 #include <Kokkos_Macros.hpp>
-#if defined( KOKKOS_ENABLE_TASKDAG )
+#if defined(KOKKOS_ENABLE_TASKDAG)
 
 #include <Kokkos_TaskScheduler_fwd.hpp>
 #include <Kokkos_Core_fwd.hpp>
@@ -66,7 +67,6 @@
 #include <typeinfo>
 #include <stdexcept>
 
-
 //----------------------------------------------------------------------------
 //----------------------------------------------------------------------------
 
@@ -86,35 +86,29 @@ struct FailedQueueInsertionLinkedListSchedulingInfo {
   task_base_type* next = nullptr;
 };
 
-struct EmptyTaskSchedulingInfo { };
+struct EmptyTaskSchedulingInfo {};
 
 //----------------------------------------------------------------------------
 //----------------------------------------------------------------------------
 
-template <
-  class ExecSpace,
-  class MemorySpace,
-  class TaskQueueTraits,
-  class MemoryPool
->
+template <class ExecSpace, class MemorySpace, class TaskQueueTraits,
+          class MemoryPool>
 class MultipleTaskQueue;
 
 template <class TaskQueueTraits>
 struct MultipleTaskQueueTeamEntry {
-public:
-
-  using task_base_type = TaskNode<TaskQueueTraits>;
+ public:
+  using task_base_type          = TaskNode<TaskQueueTraits>;
   using runnable_task_base_type = RunnableTaskBase<TaskQueueTraits>;
-  using ready_queue_type = typename TaskQueueTraits::template ready_queue_type<task_base_type>;
-  using task_queue_traits = TaskQueueTraits;
+  using ready_queue_type =
+      typename TaskQueueTraits::template ready_queue_type<task_base_type>;
+  using task_queue_traits         = TaskQueueTraits;
   using task_scheduling_info_type = typename std::conditional<
-    TaskQueueTraits::ready_queue_insertion_may_fail,
-    FailedQueueInsertionLinkedListSchedulingInfo<TaskQueueTraits>,
-    EmptyTaskSchedulingInfo
-  >::type;
-
-private:
+      TaskQueueTraits::ready_queue_insertion_may_fail,
+      FailedQueueInsertionLinkedListSchedulingInfo<TaskQueueTraits>,
+      EmptyTaskSchedulingInfo>::type;
 
+ private:
   // Number of allowed priorities
   static constexpr int NumPriorities = 3;
 
@@ -123,277 +117,223 @@ private:
   task_base_type* m_failed_heads[NumPriorities][2];
 
   KOKKOS_INLINE_FUNCTION
-  task_base_type*&
-  failed_head_for(runnable_task_base_type const& task)
-  {
+  task_base_type*& failed_head_for(runnable_task_base_type const& task) {
     return m_failed_heads[int(task.get_priority())][int(task.get_task_type())];
   }
 
-  template <class _always_void=void>
-  KOKKOS_INLINE_FUNCTION
-  OptionalRef<task_base_type>
-  _pop_failed_insertion(
-    int priority, TaskType type,
-    typename std::enable_if<
-      task_queue_traits::ready_queue_insertion_may_fail
-        and std::is_void<_always_void>::value,
-      void*
-    >::type = nullptr
-  ) {
+  template <class _always_void = void>
+  KOKKOS_INLINE_FUNCTION OptionalRef<task_base_type> _pop_failed_insertion(
+      int priority, TaskType type,
+      typename std::enable_if<
+          task_queue_traits::ready_queue_insertion_may_fail and
+              std::is_void<_always_void>::value,
+          void*>::type = nullptr) {
     auto* rv_ptr = m_failed_heads[priority][(int)type];
-    if(rv_ptr) {
+    if (rv_ptr) {
       m_failed_heads[priority][(int)type] =
-        rv_ptr->as_runnable_task()
-          .template scheduling_info_as<task_scheduling_info_type>()
-            .next;
-      return OptionalRef<task_base_type>{ *rv_ptr };
-    }
-    else {
-      return OptionalRef<task_base_type>{ nullptr };
+          rv_ptr->as_runnable_task()
+              .template scheduling_info_as<task_scheduling_info_type>()
+              .next;
+      return OptionalRef<task_base_type>{*rv_ptr};
+    } else {
+      return OptionalRef<task_base_type>{nullptr};
     }
   }
 
-  template <class _always_void=void>
-  KOKKOS_INLINE_FUNCTION
-  OptionalRef<task_base_type>
-  _pop_failed_insertion(
-    int priority, TaskType type,
-    typename std::enable_if<
-      not task_queue_traits::ready_queue_insertion_may_fail
-        and std::is_void<_always_void>::value,
-      void*
-    >::type = nullptr
-  ) {
-    return OptionalRef<task_base_type>{ nullptr };
+  template <class _always_void = void>
+  KOKKOS_INLINE_FUNCTION OptionalRef<task_base_type> _pop_failed_insertion(
+      int priority, TaskType type,
+      typename std::enable_if<
+          not task_queue_traits::ready_queue_insertion_may_fail and
+              std::is_void<_always_void>::value,
+          void*>::type = nullptr) {
+    return OptionalRef<task_base_type>{nullptr};
   }
 
-public:
-
+ public:
   KOKKOS_INLINE_FUNCTION
   MultipleTaskQueueTeamEntry() {
-    for(int iPriority = 0; iPriority < NumPriorities; ++iPriority) {
-      for(int iType = 0; iType < 2; ++iType) {
+    for (int iPriority = 0; iPriority < NumPriorities; ++iPriority) {
+      for (int iType = 0; iType < 2; ++iType) {
         m_failed_heads[iPriority][iType] = nullptr;
       }
     }
   }
 
-
   KOKKOS_INLINE_FUNCTION
-  OptionalRef<task_base_type>
-  try_to_steal_ready_task()
-  {
+  OptionalRef<task_base_type> try_to_steal_ready_task() {
     auto return_value = OptionalRef<task_base_type>{};
     // prefer lower priority tasks when stealing
-    for(int i_priority = NumPriorities-1; i_priority >= 0; --i_priority) {
+    for (int i_priority = NumPriorities - 1; i_priority >= 0; --i_priority) {
       // Check for a single task with this priority
       return_value = m_ready_queues[i_priority][TaskSingle].steal();
-      if(return_value) return return_value;
+      if (return_value) return return_value;
 
       // Check for a team task with this priority
       return_value = m_ready_queues[i_priority][TaskTeam].steal();
-      if(return_value) return return_value;
-
+      if (return_value) return return_value;
     }
     return return_value;
   }
 
   KOKKOS_INLINE_FUNCTION
-  OptionalRef<task_base_type>
-  pop_ready_task()
-  {
+  OptionalRef<task_base_type> pop_ready_task() {
     auto return_value = OptionalRef<task_base_type>{};
-    for(int i_priority = 0; i_priority < NumPriorities; ++i_priority) {
+    for (int i_priority = 0; i_priority < NumPriorities; ++i_priority) {
       return_value = _pop_failed_insertion(i_priority, TaskTeam);
-      if(not return_value) return_value = m_ready_queues[i_priority][TaskTeam].pop();
-      if(return_value) return return_value;
+      if (not return_value)
+        return_value = m_ready_queues[i_priority][TaskTeam].pop();
+      if (return_value) return return_value;
 
       // Check for a single task with this priority
       return_value = _pop_failed_insertion(i_priority, TaskSingle);
-      if(not return_value) return_value = m_ready_queues[i_priority][TaskSingle].pop();
-      if(return_value) return return_value;
+      if (not return_value)
+        return_value = m_ready_queues[i_priority][TaskSingle].pop();
+      if (return_value) return return_value;
     }
     return return_value;
   }
 
   KOKKOS_INLINE_FUNCTION
-  ready_queue_type&
-  team_queue_for(runnable_task_base_type const& task)
-  {
+  ready_queue_type& team_queue_for(runnable_task_base_type const& task) {
     return m_ready_queues[int(task.get_priority())][int(task.get_task_type())];
   }
 
-
-  template <class _always_void=void>
-  KOKKOS_INLINE_FUNCTION
-  void do_handle_failed_insertion(
-    runnable_task_base_type&& task,
-    typename std::enable_if<
-      task_queue_traits::ready_queue_insertion_may_fail
-        and std::is_void<_always_void>::value,
-      void*
-    >::type = nullptr
-  )
-  {
+  template <class _always_void = void>
+  KOKKOS_INLINE_FUNCTION void do_handle_failed_insertion(
+      runnable_task_base_type&& task,
+      typename std::enable_if<
+          task_queue_traits::ready_queue_insertion_may_fail and
+              std::is_void<_always_void>::value,
+          void*>::type = nullptr) {
     // failed insertions, if they happen, must be from the only thread that
-    // is allowed to push to m_ready_queues, so this linked-list insertion is not
-    // concurrent
-    auto& node = task.template scheduling_info_as<task_scheduling_info_type>();
+    // is allowed to push to m_ready_queues, so this linked-list insertion is
+    // not concurrent
+    auto& node  = task.template scheduling_info_as<task_scheduling_info_type>();
     auto*& head = failed_head_for(task);
-    node.next = head;
-    head = &task;
+    node.next   = head;
+    head        = &task;
   }
 
-  template <class _always_void=void>
-  KOKKOS_INLINE_FUNCTION
-  void do_handle_failed_insertion(
-    runnable_task_base_type&& task,
-    typename std::enable_if<
-      not task_queue_traits::ready_queue_insertion_may_fail
-        and std::is_void<_always_void>::value,
-      void*
-    >::type = nullptr
-  )
-  {
+  template <class _always_void = void>
+  KOKKOS_INLINE_FUNCTION void do_handle_failed_insertion(
+      runnable_task_base_type&& task,
+      typename std::enable_if<
+          not task_queue_traits::ready_queue_insertion_may_fail and
+              std::is_void<_always_void>::value,
+          void*>::type = nullptr) {
     Kokkos::abort("should be unreachable!");
   }
 
-
-  template <class _always_void=void>
-  KOKKOS_INLINE_FUNCTION
-  void
-  flush_failed_insertions(
-    int priority,
-    int task_type,
-    typename std::enable_if<
-      task_queue_traits::ready_queue_insertion_may_fail
-        and std::is_void<_always_void>::value, // just to make this dependent on template parameter
-      int
-    >::type = 0
-  ) {
-    // TODO @tasking @minor DSH this somethimes gets some things out of LIFO order, which may be undesirable (but not a bug)
-
+  template <class _always_void = void>
+  KOKKOS_INLINE_FUNCTION void flush_failed_insertions(
+      int priority, int task_type,
+      typename std::enable_if<
+          task_queue_traits::ready_queue_insertion_may_fail and
+              std::is_void<_always_void>::value,  // just to make this dependent
+                                                  // on template parameter
+          int>::type = 0) {
+    // TODO @tasking @minor DSH this somethimes gets some things out of LIFO
+    // order, which may be undesirable (but not a bug)
 
     auto*& failed_head = m_failed_heads[priority][task_type];
-    auto& team_queue = m_ready_queues[priority][task_type];
+    auto& team_queue   = m_ready_queues[priority][task_type];
 
-    while(failed_head != nullptr) {
+    while (failed_head != nullptr) {
       bool success = team_queue.push(*failed_head);
-      if(success) {
+      if (success) {
         // Step to the next linked list element
-        failed_head = failed_head->as_runnable_task()
-          .template scheduling_info_as<task_scheduling_info_type>().next;
-      }
-      else {
+        failed_head =
+            failed_head->as_runnable_task()
+                .template scheduling_info_as<task_scheduling_info_type>()
+                .next;
+      } else {
         // no more room, stop traversing and leave the head where it is
         break;
       }
     }
   }
 
-
-  template <class _always_void=void>
-  KOKKOS_INLINE_FUNCTION
-  void
-  flush_failed_insertions(
-    int, int,
-    typename std::enable_if<
-      not task_queue_traits::ready_queue_insertion_may_fail
-        and std::is_void<_always_void>::value, // just to make this dependent on template parameter
-      int
-    >::type = 0
-  ) { }
-
+  template <class _always_void = void>
+  KOKKOS_INLINE_FUNCTION void flush_failed_insertions(
+      int, int,
+      typename std::enable_if<
+          not task_queue_traits::ready_queue_insertion_may_fail and
+              std::is_void<_always_void>::value,  // just to make this dependent
+                                                  // on template parameter
+          int>::type = 0) {}
 
   KOKKOS_INLINE_FUNCTION
-  void
-  flush_all_failed_insertions() {
-    for(int iPriority = 0; iPriority < NumPriorities; ++iPriority) {
+  void flush_all_failed_insertions() {
+    for (int iPriority = 0; iPriority < NumPriorities; ++iPriority) {
       flush_failed_insertions(iPriority, (int)TaskType::TaskTeam);
       flush_failed_insertions(iPriority, (int)TaskType::TaskSingle);
     }
   }
 
-
-  template <class TeamSchedulerInfo, class ExecutionSpace, class MemorySpace, class MemoryPool>
-  KOKKOS_INLINE_FUNCTION
-  void
-  do_schedule_runnable(
-    MultipleTaskQueue<ExecutionSpace, MemorySpace, TaskQueueTraits, MemoryPool>& queue,
-    RunnableTaskBase<TaskQueueTraits>&& task,
-    TeamSchedulerInfo const& info
+  template <class TeamSchedulerInfo, class ExecutionSpace, class MemorySpace,
+            class MemoryPool>
+  KOKKOS_INLINE_FUNCTION void do_schedule_runnable(
+      MultipleTaskQueue<ExecutionSpace, MemorySpace, TaskQueueTraits,
+                        MemoryPool>& queue,
+      RunnableTaskBase<TaskQueueTraits>&& task, TeamSchedulerInfo const& info
 
   ) {
     // Push on any nodes that failed to enqueue
     auto& team_queue = team_queue_for(task);
-    auto priority = task.get_priority();
-    auto task_type = task.get_task_type();
+    auto priority    = task.get_priority();
+    auto task_type   = task.get_task_type();
 
     // First schedule the task
-    queue.schedule_runnable_to_queue(
-      std::move(task),
-      team_queue,
-      info
-    );
+    queue.schedule_runnable_to_queue(std::move(task), team_queue, info);
 
     // Task may be enqueued and may be run at any point; don't touch it (hence
     // the use of move semantics)
     flush_failed_insertions((int)priority, (int)task_type);
   }
-
-
-
 };
 
 //----------------------------------------------------------------------------
 //----------------------------------------------------------------------------
 
-template <
-  class ExecSpace,
-  class MemorySpace,
-  class TaskQueueTraits,
-  class MemoryPool
->
+template <class ExecSpace, class MemorySpace, class TaskQueueTraits,
+          class MemoryPool>
 class MultipleTaskQueue final
-  : public TaskQueueMemoryManager<ExecSpace, MemorySpace, MemoryPool>,
-    public TaskQueueCommonMixin<MultipleTaskQueue<ExecSpace, MemorySpace, TaskQueueTraits, MemoryPool>>,
-    private ObjectWithVLAEmulation<
-      MultipleTaskQueue<ExecSpace, MemorySpace, TaskQueueTraits, MemoryPool>,
-      MultipleTaskQueueTeamEntry<TaskQueueTraits>
-    >
-{
-public:
-
-  using task_queue_type = MultipleTaskQueue; // mark as task_queue concept
+    : public TaskQueueMemoryManager<ExecSpace, MemorySpace, MemoryPool>,
+      public TaskQueueCommonMixin<MultipleTaskQueue<
+          ExecSpace, MemorySpace, TaskQueueTraits, MemoryPool>>,
+      private ObjectWithVLAEmulation<
+          MultipleTaskQueue<ExecSpace, MemorySpace, TaskQueueTraits,
+                            MemoryPool>,
+          MultipleTaskQueueTeamEntry<TaskQueueTraits>> {
+ public:
+  using task_queue_type   = MultipleTaskQueue;  // mark as task_queue concept
   using task_queue_traits = TaskQueueTraits;
-  using task_base_type = TaskNode<TaskQueueTraits>;
-  using ready_queue_type = typename TaskQueueTraits::template ready_queue_type<task_base_type>;
-
-private:
+  using task_base_type    = TaskNode<TaskQueueTraits>;
+  using ready_queue_type =
+      typename TaskQueueTraits::template ready_queue_type<task_base_type>;
 
+ private:
   using base_t = TaskQueueMemoryManager<ExecSpace, MemorySpace, MemoryPool>;
-  using common_mixin_t = TaskQueueCommonMixin<MultipleTaskQueue>;
+  using common_mixin_t       = TaskQueueCommonMixin<MultipleTaskQueue>;
   using vla_emulation_base_t = ObjectWithVLAEmulation<
-    MultipleTaskQueue<ExecSpace, MemorySpace, TaskQueueTraits, MemoryPool>,
-    MultipleTaskQueueTeamEntry<TaskQueueTraits>
-  >;
+      MultipleTaskQueue<ExecSpace, MemorySpace, TaskQueueTraits, MemoryPool>,
+      MultipleTaskQueueTeamEntry<TaskQueueTraits>>;
 
   // Allow private inheritance from ObjectWithVLAEmulation
   friend struct VLAEmulationAccess;
 
-public:
-
+ public:
   struct SchedulerInfo {
-    using team_queue_id_t = int32_t;
+    using team_queue_id_t                             = int32_t;
     static constexpr team_queue_id_t NoAssociatedTeam = -1;
-    team_queue_id_t team_association = NoAssociatedTeam;
+    team_queue_id_t team_association                  = NoAssociatedTeam;
 
     using scheduler_info_type = SchedulerInfo;
 
     KOKKOS_INLINE_FUNCTION
     constexpr explicit SchedulerInfo(team_queue_id_t association) noexcept
-      : team_association(association)
-    { }
+        : team_association(association) {}
 
     KOKKOS_INLINE_FUNCTION
     SchedulerInfo() = default;
@@ -412,106 +352,101 @@ public:
 
     KOKKOS_INLINE_FUNCTION
     ~SchedulerInfo() = default;
-
   };
 
   using task_scheduling_info_type = typename std::conditional<
-    TaskQueueTraits::ready_queue_insertion_may_fail,
-    FailedQueueInsertionLinkedListSchedulingInfo<TaskQueueTraits>,
-    EmptyTaskSchedulingInfo
-  >::type;
+      TaskQueueTraits::ready_queue_insertion_may_fail,
+      FailedQueueInsertionLinkedListSchedulingInfo<TaskQueueTraits>,
+      EmptyTaskSchedulingInfo>::type;
   using team_scheduler_info_type = SchedulerInfo;
 
   using runnable_task_base_type = RunnableTaskBase<TaskQueueTraits>;
 
   template <class Functor, class Scheduler>
-    // requires TaskScheduler<Scheduler> && TaskFunctor<Functor>
-  using runnable_task_type = RunnableTask<
-    task_queue_traits, Scheduler, typename Functor::value_type, Functor
-  >;
+  // requires TaskScheduler<Scheduler> && TaskFunctor<Functor>
+  using runnable_task_type =
+      RunnableTask<task_queue_traits, Scheduler, typename Functor::value_type,
+                   Functor>;
 
-  using aggregate_task_type = AggregateTask<task_queue_traits, task_scheduling_info_type>;
+  using aggregate_task_type =
+      AggregateTask<task_queue_traits, task_scheduling_info_type>;
 
   // Number of allowed priorities
   static constexpr int NumPriorities = 3;
 
   KOKKOS_INLINE_FUNCTION
-  constexpr typename vla_emulation_base_t::vla_entry_count_type
-  n_queues() const noexcept { return this->n_vla_entries(); }
-
-public:
+  constexpr typename vla_emulation_base_t::vla_entry_count_type n_queues() const
+      noexcept {
+    return this->n_vla_entries();
+  }
 
+ public:
   //----------------------------------------------------------------------------
   // <editor-fold desc="Constructors, destructors, and assignment"> {{{2
 
-  MultipleTaskQueue() = delete;
+  MultipleTaskQueue()                         = delete;
   MultipleTaskQueue(MultipleTaskQueue const&) = delete;
-  MultipleTaskQueue(MultipleTaskQueue&&) = delete;
+  MultipleTaskQueue(MultipleTaskQueue&&)      = delete;
   MultipleTaskQueue& operator=(MultipleTaskQueue const&) = delete;
   MultipleTaskQueue& operator=(MultipleTaskQueue&&) = delete;
 
-  MultipleTaskQueue(
-    typename base_t::execution_space const& arg_execution_space,
-    typename base_t::memory_space const&,
-    typename base_t::memory_pool const& arg_memory_pool
-  ) : base_t(arg_memory_pool),
-      vla_emulation_base_t(
-        Impl::TaskQueueSpecialization<
-          // TODO @tasking @generalization DSH avoid referencing SimpleTaskScheduler directly?
-          SimpleTaskScheduler<typename base_t::execution_space, MultipleTaskQueue>
-        >::get_max_team_count(arg_execution_space)
-      )
-  { }
+  MultipleTaskQueue(typename base_t::execution_space const& arg_execution_space,
+                    typename base_t::memory_space const&,
+                    typename base_t::memory_pool const& arg_memory_pool)
+      : base_t(arg_memory_pool),
+        vla_emulation_base_t(
+            Impl::TaskQueueSpecialization<
+                // TODO @tasking @generalization DSH avoid referencing
+                // SimpleTaskScheduler directly?
+                SimpleTaskScheduler<typename base_t::execution_space,
+                                    MultipleTaskQueue>>::
+                get_max_team_count(arg_execution_space)) {}
 
   // </editor-fold> end Constructors, destructors, and assignment }}}2
   //----------------------------------------------------------------------------
 
   KOKKOS_FUNCTION
-  void
-  schedule_runnable(
-    runnable_task_base_type&& task,
-    team_scheduler_info_type const& info
-  ) {
+  void schedule_runnable(runnable_task_base_type&& task,
+                         team_scheduler_info_type const& info) {
     auto team_association = info.team_association;
     // Should only not be assigned if this is a host spawn...
-    if(team_association == team_scheduler_info_type::NoAssociatedTeam) {
+    if (team_association == team_scheduler_info_type::NoAssociatedTeam) {
       team_association = 0;
     }
-    this->vla_value_at(team_association).do_schedule_runnable(*this, std::move(task), info);
+    this->vla_value_at(team_association)
+        .do_schedule_runnable(*this, std::move(task), info);
     // Task may be enqueued and may be run at any point; don't touch it (hence
     // the use of move semantics)
   }
 
   KOKKOS_FUNCTION
-  OptionalRef<task_base_type>
-  pop_ready_task(
-    team_scheduler_info_type const& info
-  )
-  {
-    KOKKOS_EXPECTS(info.team_association != team_scheduler_info_type::NoAssociatedTeam);
+  OptionalRef<task_base_type> pop_ready_task(
+      team_scheduler_info_type const& info) {
+    KOKKOS_EXPECTS(info.team_association !=
+                   team_scheduler_info_type::NoAssociatedTeam);
 
-    auto return_value = OptionalRef<task_base_type>{};
+    auto return_value     = OptionalRef<task_base_type>{};
     auto team_association = info.team_association;
 
-    // always loop in order of priority first, then prefer team tasks over single tasks
+    // always loop in order of priority first, then prefer team tasks over
+    // single tasks
     auto& team_queue_info = this->vla_value_at(team_association);
 
-    if(task_queue_traits::ready_queue_insertion_may_fail) {
+    if (task_queue_traits::ready_queue_insertion_may_fail) {
       team_queue_info.flush_all_failed_insertions();
     }
 
     return_value = team_queue_info.pop_ready_task();
 
-    if(not return_value) {
-
+    if (not return_value) {
       // loop through the rest of the teams and try to steal
-      for(
-        auto isteal = (team_association + 1) % this->n_queues();
-        isteal != team_association;
-        isteal = (isteal + 1) % this->n_queues()
-      ) {
+      for (auto isteal = (team_association + 1) % this->n_queues();
+           isteal != team_association;
+           isteal = (isteal + 1) % this->n_queues()) {
         return_value = this->vla_value_at(isteal).try_to_steal_ready_task();
-        if(return_value) { break; }
+        if (return_value) {
+          break;
+        }
       }
 
       // Note that this is where we'd update the task's scheduling info
@@ -520,91 +455,76 @@ public:
     return return_value;
   }
 
-
-  // TODO @tasking @generalization DSH make this a property-based customization point
+  // TODO @tasking @generalization DSH make this a property-based customization
+  // point
   KOKKOS_INLINE_FUNCTION
-  team_scheduler_info_type
-  initial_team_scheduler_info(int rank_in_league) const noexcept {
+  team_scheduler_info_type initial_team_scheduler_info(int rank_in_league) const
+      noexcept {
     return team_scheduler_info_type{
-      typename team_scheduler_info_type::team_queue_id_t(rank_in_league % n_queues())
-    };
+        typename team_scheduler_info_type::team_queue_id_t(rank_in_league %
+                                                           n_queues())};
   }
 
-  // TODO @tasking @generalization DSH make this a property-based customization point
-  static /* KOKKOS_CONSTEXPR_14 */ size_t
-  task_queue_allocation_size(
-    typename base_t::execution_space const& exec_space,
-    typename base_t::memory_space const&,
-    typename base_t::memory_pool const&
-  )
-  {
-    using specialization =
-      Impl::TaskQueueSpecialization<
-        // TODO @tasking @generalization DSH avoid referencing SimpleTaskScheduler directly?
-        SimpleTaskScheduler<typename base_t::execution_space, MultipleTaskQueue>
-      >;
+  // TODO @tasking @generalization DSH make this a property-based customization
+  // point
+  static /* KOKKOS_CONSTEXPR_14 */ size_t task_queue_allocation_size(
+      typename base_t::execution_space const& exec_space,
+      typename base_t::memory_space const&,
+      typename base_t::memory_pool const&) {
+    using specialization = Impl::TaskQueueSpecialization<
+        // TODO @tasking @generalization DSH avoid referencing
+        // SimpleTaskScheduler directly?
+        SimpleTaskScheduler<typename base_t::execution_space,
+                            MultipleTaskQueue>>;
 
     return vla_emulation_base_t::required_allocation_size(
-      /* num_vla_entries = */ specialization::get_max_team_count(exec_space)
-    );
+        /* num_vla_entries = */ specialization::get_max_team_count(exec_space));
   }
 
   // Provide a sensible default that can be overridden
   KOKKOS_INLINE_FUNCTION
   void update_scheduling_info_from_completed_predecessor(
-    runnable_task_base_type& ready_task,
-    runnable_task_base_type const& predecessor
-  ) const
-  {
+      runnable_task_base_type& ready_task,
+      runnable_task_base_type const& predecessor) const {
     // Do nothing; we're using the extra storage for the failure linked list
   }
 
   // Provide a sensible default that can be overridden
   KOKKOS_INLINE_FUNCTION
   void update_scheduling_info_from_completed_predecessor(
-    aggregate_task_type& aggregate,
-    runnable_task_base_type const& predecessor
-  ) const
-  {
+      aggregate_task_type& aggregate,
+      runnable_task_base_type const& predecessor) const {
     // Do nothing; we're using the extra storage for the failure linked list
   }
 
   // Provide a sensible default that can be overridden
   KOKKOS_INLINE_FUNCTION
   void update_scheduling_info_from_completed_predecessor(
-    aggregate_task_type& aggregate,
-    aggregate_task_type const& predecessor
-  ) const
-  {
+      aggregate_task_type& aggregate,
+      aggregate_task_type const& predecessor) const {
     // Do nothing; we're using the extra storage for the failure linked list
   }
 
   // Provide a sensible default that can be overridden
   KOKKOS_INLINE_FUNCTION
   void update_scheduling_info_from_completed_predecessor(
-    runnable_task_base_type& ready_task,
-    aggregate_task_type const& predecessor
-  ) const
-  {
+      runnable_task_base_type& ready_task,
+      aggregate_task_type const& predecessor) const {
     // Do nothing; we're using the extra storage for the failure linked list
   }
 
   KOKKOS_INLINE_FUNCTION
-  void
-  handle_failed_ready_queue_insertion(
-    runnable_task_base_type&& task,
-    ready_queue_type&,
-    team_scheduler_info_type const& info
-  ) {
-    KOKKOS_EXPECTS(info.team_association != team_scheduler_info_type::NoAssociatedTeam);
+  void handle_failed_ready_queue_insertion(
+      runnable_task_base_type&& task, ready_queue_type&,
+      team_scheduler_info_type const& info) {
+    KOKKOS_EXPECTS(info.team_association !=
+                   team_scheduler_info_type::NoAssociatedTeam);
 
-    this->vla_value_at(info.team_association).do_handle_failed_insertion(
-      std::move(task)
-    );
+    this->vla_value_at(info.team_association)
+        .do_handle_failed_insertion(std::move(task));
   }
 };
 
-
 } /* namespace Impl */
 } /* namespace Kokkos */
 
@@ -613,4 +533,3 @@ public:
 
 #endif /* #if defined( KOKKOS_ENABLE_TASKDAG ) */
 #endif /* #ifndef KOKKOS_IMPL_MULTIPLETASKQUEUE_HPP */
-
diff --git a/lib/kokkos/core/src/impl/Kokkos_OldMacros.hpp b/lib/kokkos/core/src/impl/Kokkos_OldMacros.hpp
index c3198c0f13..6b1e8b63cc 100644
--- a/lib/kokkos/core/src/impl/Kokkos_OldMacros.hpp
+++ b/lib/kokkos/core/src/impl/Kokkos_OldMacros.hpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -108,7 +109,8 @@
 
 #ifdef KOKKOS_CUDA_USE_RELOCATABLE_DEVICE_CODE
 #ifndef KOKKOS_ENABLE_CUDA_RELOCATABLE_DEVICE_CODE
-#define KOKKOS_ENABLE_CUDA_RELOCATABLE_DEVICE_CODE KOKKOS_CUDA_USE_RELOCATABLE_DEVICE_CODE
+#define KOKKOS_ENABLE_CUDA_RELOCATABLE_DEVICE_CODE \
+  KOKKOS_CUDA_USE_RELOCATABLE_DEVICE_CODE
 #endif
 #endif
 
@@ -142,7 +144,6 @@
 #endif
 #endif
 
-
 #if defined(KOKKOS_HAVE_CXX1Z) || defined(KOKKOS_ENABLE_CXX17)
 #ifndef KOKKOS_ENABLE_CXX1Z
 #define KOKKOS_ENABLE_CXX1Z KOKKOS_HAVE_CXX1Z
@@ -151,25 +152,29 @@
 
 #ifdef KOKKOS_HAVE_DEFAULT_DEVICE_TYPE_CUDA
 #ifndef KOKKOS_ENABLE_DEFAULT_DEVICE_TYPE_CUDA
-#define KOKKOS_ENABLE_DEFAULT_DEVICE_TYPE_CUDA KOKKOS_HAVE_DEFAULT_DEVICE_TYPE_CUDA
+#define KOKKOS_ENABLE_DEFAULT_DEVICE_TYPE_CUDA \
+  KOKKOS_HAVE_DEFAULT_DEVICE_TYPE_CUDA
 #endif
 #endif
 
 #ifdef KOKKOS_HAVE_DEFAULT_DEVICE_TYPE_OPENMP
 #ifndef KOKKOS_ENABLE_DEFAULT_DEVICE_TYPE_OPENMP
-#define KOKKOS_ENABLE_DEFAULT_DEVICE_TYPE_OPENMP KOKKOS_HAVE_DEFAULT_DEVICE_TYPE_OPENMP
+#define KOKKOS_ENABLE_DEFAULT_DEVICE_TYPE_OPENMP \
+  KOKKOS_HAVE_DEFAULT_DEVICE_TYPE_OPENMP
 #endif
 #endif
 
 #ifdef KOKKOS_HAVE_DEFAULT_DEVICE_TYPE_SERIAL
 #ifndef KOKKOS_ENABLE_DEFAULT_DEVICE_TYPE_SERIAL
-#define KOKKOS_ENABLE_DEFAULT_DEVICE_TYPE_SERIAL KOKKOS_HAVE_DEFAULT_DEVICE_TYPE_SERIAL
+#define KOKKOS_ENABLE_DEFAULT_DEVICE_TYPE_SERIAL \
+  KOKKOS_HAVE_DEFAULT_DEVICE_TYPE_SERIAL
 #endif
 #endif
 
 #ifdef KOKKOS_HAVE_DEFAULT_DEVICE_TYPE_THREADS
 #ifndef KOKKOS_ENABLE_DEFAULT_DEVICE_TYPE_THREADS
-#define KOKKOS_ENABLE_DEFAULT_DEVICE_TYPE_THREADS KOKKOS_HAVE_DEFAULT_DEVICE_TYPE_THREADS
+#define KOKKOS_ENABLE_DEFAULT_DEVICE_TYPE_THREADS \
+  KOKKOS_HAVE_DEFAULT_DEVICE_TYPE_THREADS
 #endif
 #endif
 
@@ -205,7 +210,8 @@
 
 #ifdef KOKKOS_OPT_RANGE_AGGRESSIVE_VECTORIZATION
 #ifndef KOKKOS_ENABLE_AGGRESSIVE_VECTORIZATION
-#define KOKKOS_ENABLE_AGGRESSIVE_VECTORIZATION KOKKOS_OPT_RANGE_AGGRESSIVE_VECTORIZATION
+#define KOKKOS_ENABLE_AGGRESSIVE_VECTORIZATION \
+  KOKKOS_OPT_RANGE_AGGRESSIVE_VECTORIZATION
 #endif
 #endif
 
@@ -299,7 +305,6 @@
 #endif
 #endif
 
-
 #ifdef KOKKOS_MEMPOOL_PRINTERR
 #ifndef KOKKOS_ENABLE_MEMPOOL_PRINTERR
 #define KOKKOS_ENABLE_MEMPOOL_PRINTERR KOKKOS_MEMPOOL_PRINTERR
@@ -308,25 +313,29 @@
 
 #ifdef KOKKOS_MEMPOOL_PRINT_ACTIVE_SUPERBLOCKS
 #ifndef KOKKOS_ENABLE_MEMPOOL_PRINT_ACTIVE_SUPERBLOCKS
-#define KOKKOS_ENABLE_MEMPOOL_PRINT_ACTIVE_SUPERBLOCKS KOKKOS_MEMPOOL_PRINT_ACTIVE_SUPERBLOCKS
+#define KOKKOS_ENABLE_MEMPOOL_PRINT_ACTIVE_SUPERBLOCKS \
+  KOKKOS_MEMPOOL_PRINT_ACTIVE_SUPERBLOCKS
 #endif
 #endif
 
 #ifdef KOKKOS_MEMPOOL_PRINT_BLOCKSIZE_INFO
 #ifndef KOKKOS_ENABLE_MEMPOOL_PRINT_BLOCKSIZE_INFO
-#define KOKKOS_ENABLE_MEMPOOL_PRINT_BLOCKSIZE_INFO KOKKOS_MEMPOOL_PRINT_BLOCKSIZE_INFO
+#define KOKKOS_ENABLE_MEMPOOL_PRINT_BLOCKSIZE_INFO \
+  KOKKOS_MEMPOOL_PRINT_BLOCKSIZE_INFO
 #endif
 #endif
 
 #ifdef KOKKOS_MEMPOOL_PRINT_CONSTRUCTOR_INFO
 #ifndef KOKKOS_ENABLE_MEMPOOL_PRINT_CONSTRUCTOR_INFO
-#define KOKKOS_ENABLE_MEMPOOL_PRINT_CONSTRUCTOR_INFO KOKKOS_MEMPOOL_PRINT_CONSTRUCTOR_INFO
+#define KOKKOS_ENABLE_MEMPOOL_PRINT_CONSTRUCTOR_INFO \
+  KOKKOS_MEMPOOL_PRINT_CONSTRUCTOR_INFO
 #endif
 #endif
 
 #ifdef KOKKOS_MEMPOOL_PRINT_INDIVIDUAL_PAGE_INFO
 #ifndef KOKKOS_ENABLE_MEMPOOL_PRINT_INDIVIDUAL_PAGE_INFO
-#define KOKKOS_ENABLE_MEMPOOL_PRINT_INDIVIDUAL_PAGE_INFO KOKKOS_MEMPOOL_PRINT_INDIVIDUAL_PAGE_INFO
+#define KOKKOS_ENABLE_MEMPOOL_PRINT_INDIVIDUAL_PAGE_INFO \
+  KOKKOS_MEMPOOL_PRINT_INDIVIDUAL_PAGE_INFO
 #endif
 #endif
 
@@ -344,7 +353,8 @@
 
 #ifdef KOKKOS_MEMPOOL_PRINT_SUPERBLOCK_INFO
 #ifndef KOKKOS_ENABLE_MEMPOOL_PRINT_SUPERBLOCK_INFO
-#define KOKKOS_ENABLE_MEMPOOL_PRINT_SUPERBLOCK_INFO KOKKOS_MEMPOOL_PRINT_SUPERBLOCK_INFO
+#define KOKKOS_ENABLE_MEMPOOL_PRINT_SUPERBLOCK_INFO \
+  KOKKOS_MEMPOOL_PRINT_SUPERBLOCK_INFO
 #endif
 #endif
 
@@ -368,19 +378,22 @@
 
 #ifdef KOKKOS_SHARED_ALLOCATION_TRACKER_DECREMENT
 #ifndef KOKKOS_IMPL_SHARED_ALLOCATION_TRACKER_DECREMENT
-#define KOKKOS_IMPL_SHARED_ALLOCATION_TRACKER_DECREMENT KOKKOS_SHARED_ALLOCATION_TRACKER_DECREMENT
+#define KOKKOS_IMPL_SHARED_ALLOCATION_TRACKER_DECREMENT \
+  KOKKOS_SHARED_ALLOCATION_TRACKER_DECREMENT
 #endif
 #endif
 
 #ifdef KOKKOS_SHARED_ALLOCATION_TRACKER_ENABLED
 #ifndef KOKKOS_IMPL_SHARED_ALLOCATION_TRACKER_ENABLED
-#define KOKKOS_IMPL_SHARED_ALLOCATION_TRACKER_ENABLED KOKKOS_SHARED_ALLOCATION_TRACKER_ENABLED
+#define KOKKOS_IMPL_SHARED_ALLOCATION_TRACKER_ENABLED \
+  KOKKOS_SHARED_ALLOCATION_TRACKER_ENABLED
 #endif
 #endif
 
 #ifdef KOKKOS_SHARED_ALLOCATION_TRACKER_INCREMENT
 #ifndef KOKKOS_IMPL_SHARED_ALLOCATION_TRACKER_INCREMENT
-#define KOKKOS_IMPL_SHARED_ALLOCATION_TRACKER_INCREMENT KOKKOS_SHARED_ALLOCATION_TRACKER_INCREMENT
+#define KOKKOS_IMPL_SHARED_ALLOCATION_TRACKER_INCREMENT \
+  KOKKOS_SHARED_ALLOCATION_TRACKER_INCREMENT
 #endif
 #endif
 
@@ -420,7 +433,7 @@
 #endif
 #endif
 
-#if defined( KOKKOS_ENABLE_PTHREAD ) || defined( KOKKOS_ENABLE_WINTHREAD )
+#if defined(KOKKOS_ENABLE_PTHREAD) || defined(KOKKOS_ENABLE_WINTHREAD)
 #ifndef KOKKOS_ENABLE_THREADS
 #define KOKKOS_ENABLE_THREADS
 #endif
@@ -491,7 +504,8 @@
 #define KOKKOS_HAVE_HBWSPACE 1
 #endif
 
-#if (!defined(KOKKOS_CUDA_USE_LDG_INTRINSIC)) && defined(KOKKOS_ENABLE_CUDA_LDG_INTRINSIC)
+#if (!defined(KOKKOS_CUDA_USE_LDG_INTRINSIC)) && \
+    defined(KOKKOS_ENABLE_CUDA_LDG_INTRINSIC)
 #define KOKKOS_CUDA_USE_LDG_INTRINSIC 1
 #endif
 
@@ -499,7 +513,8 @@
 #define KOKKOS_CUDA_USE_UVM 1
 #endif
 
-#if (!defined(KOKKOS_CUDA_USE_RELOCATABLE_DEVICE_CODE)) && defined(KOKKOS_ENABLE_CUDA_RELOCATABLE_DEVICE_CODE)
+#if (!defined(KOKKOS_CUDA_USE_RELOCATABLE_DEVICE_CODE)) && \
+    defined(KOKKOS_ENABLE_CUDA_RELOCATABLE_DEVICE_CODE)
 #define KOKKOS_CUDA_USE_RELOCATABLE_DEVICE_CODE 1
 #endif
 
@@ -507,7 +522,8 @@
 #define KOKKOS_CUDA_USE_LAMBDA 1
 #endif
 
-#if (!defined(KOKKOS_CUDA_CLANG_WORKAROUND)) && defined(KOKKOS_IMPL_CUDA_CLANG_WORKAROUND)
+#if (!defined(KOKKOS_CUDA_CLANG_WORKAROUND)) && \
+    defined(KOKKOS_IMPL_CUDA_CLANG_WORKAROUND)
 #define KOKKOS_CUDA_CLANG_WORKAROUND 1
 #endif
 
@@ -515,6 +531,6 @@
 #define KOKKOS_HAVE_MPI 1
 #endif
 
-#endif // KOKKOS_ENABLE_DEPRECATED_CODE
+#endif  // KOKKOS_ENABLE_DEPRECATED_CODE
 
-#endif //KOKKOS_IMPL_OLD_MACROS_HPP
+#endif  // KOKKOS_IMPL_OLD_MACROS_HPP
diff --git a/lib/kokkos/core/src/impl/Kokkos_OptionalRef.hpp b/lib/kokkos/core/src/impl/Kokkos_OptionalRef.hpp
index bf83d1831c..668e7c0916 100644
--- a/lib/kokkos/core/src/impl/Kokkos_OptionalRef.hpp
+++ b/lib/kokkos/core/src/impl/Kokkos_OptionalRef.hpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -58,16 +59,14 @@
 namespace Kokkos {
 namespace Impl {
 
-struct InPlaceTag { };
+struct InPlaceTag {};
 
 template <class T>
 struct OptionalRef {
-private:
-
+ private:
   ObservingRawPtr<T> m_value = nullptr;
 
-public:
-
+ public:
   using value_type = T;
 
   KOKKOS_INLINE_FUNCTION
@@ -75,7 +74,7 @@ public:
 
   KOKKOS_INLINE_FUNCTION
   OptionalRef(OptionalRef const&) = default;
-  
+
   KOKKOS_INLINE_FUNCTION
   OptionalRef(OptionalRef&&) = default;
 
@@ -83,11 +82,9 @@ public:
   OptionalRef& operator=(OptionalRef const&) = default;
 
   KOKKOS_INLINE_FUNCTION
-  // Can't return a reference to volatile OptionalRef, since GCC issues a warning about
-  // reference to volatile not accessing the underlying value
-  void
-  operator=(OptionalRef const volatile& other) volatile noexcept
-  {
+  // Can't return a reference to volatile OptionalRef, since GCC issues a
+  // warning about reference to volatile not accessing the underlying value
+  void operator=(OptionalRef const volatile& other) volatile noexcept {
     m_value = other.m_value;
   }
 
@@ -98,34 +95,40 @@ public:
   ~OptionalRef() = default;
 
   KOKKOS_INLINE_FUNCTION
-  explicit OptionalRef(T& arg_value) : m_value(&arg_value) { }
+  explicit OptionalRef(T& arg_value) : m_value(&arg_value) {}
 
   KOKKOS_INLINE_FUNCTION
-  explicit OptionalRef(std::nullptr_t) : m_value(nullptr) { }
+  explicit OptionalRef(std::nullptr_t) : m_value(nullptr) {}
 
   KOKKOS_INLINE_FUNCTION
-  OptionalRef& operator=(T& arg_value) { m_value = &arg_value; return *this; }
+  OptionalRef& operator=(T& arg_value) {
+    m_value = &arg_value;
+    return *this;
+  }
 
   KOKKOS_INLINE_FUNCTION
-  OptionalRef& operator=(std::nullptr_t) { m_value = nullptr; return *this; }
+  OptionalRef& operator=(std::nullptr_t) {
+    m_value = nullptr;
+    return *this;
+  }
 
   //----------------------------------------
 
   KOKKOS_INLINE_FUNCTION
   OptionalRef<typename std::add_volatile<T>::type>
   as_volatile() volatile noexcept {
-    return 
-      OptionalRef<typename std::add_volatile<T>::type>(*(*this));
+    return OptionalRef<typename std::add_volatile<T>::type>(*(*this));
   }
 
   KOKKOS_INLINE_FUNCTION
-  OptionalRef<typename std::add_volatile<typename std::add_const<T>::type>::type>
+  OptionalRef<
+      typename std::add_volatile<typename std::add_const<T>::type>::type>
   as_volatile() const volatile noexcept {
-    return 
-      OptionalRef<typename std::add_volatile<typename std::add_const<T>::type>::type>(*(*this));
+    return OptionalRef<
+        typename std::add_volatile<typename std::add_const<T>::type>::type>(
+        *(*this));
   }
 
-
   //----------------------------------------
 
   KOKKOS_INLINE_FUNCTION
@@ -133,21 +136,21 @@ public:
     KOKKOS_EXPECTS(this->has_value());
     return *m_value;
   }
-   
+
   KOKKOS_INLINE_FUNCTION
-  T const& operator*() const & {
+  T const& operator*() const& {
     KOKKOS_EXPECTS(this->has_value());
     return *m_value;
   }
 
   KOKKOS_INLINE_FUNCTION
-  T volatile& operator*() volatile & {
+  T volatile& operator*() volatile& {
     KOKKOS_EXPECTS(this->has_value());
     return *m_value;
   }
 
   KOKKOS_INLINE_FUNCTION
-  T const volatile& operator*() const volatile & {
+  T const volatile& operator*() const volatile& {
     KOKKOS_EXPECTS(this->has_value());
     return *m_value;
   }
@@ -183,24 +186,16 @@ public:
   }
 
   KOKKOS_INLINE_FUNCTION
-  T* get() {
-    return m_value;
-  }
+  T* get() { return m_value; }
 
   KOKKOS_INLINE_FUNCTION
-  T const* get() const {
-    return m_value;
-  }
+  T const* get() const { return m_value; }
 
   KOKKOS_INLINE_FUNCTION
-  T volatile* get() volatile {
-    return m_value;
-  }
+  T volatile* get() volatile { return m_value; }
 
   KOKKOS_INLINE_FUNCTION
-  T const volatile* get() const volatile {
-    return m_value;
-  }
+  T const volatile* get() const volatile { return m_value; }
 
   //----------------------------------------
 
@@ -227,16 +222,12 @@ public:
 
   KOKKOS_INLINE_FUNCTION
   bool has_value() const volatile { return m_value != nullptr; }
-  
 };
 
-} // end namespace Impl
-} // end namespace Kokkos
+}  // end namespace Impl
+}  // end namespace Kokkos
 
 //----------------------------------------------------------------------------
 //----------------------------------------------------------------------------
 
-
-
 #endif /* #ifndef KOKKOS_IMPL_OPTIONALREF_HPP */
-
diff --git a/lib/kokkos/core/src/impl/Kokkos_PhysicalLayout.hpp b/lib/kokkos/core/src/impl/Kokkos_PhysicalLayout.hpp
index 919f676945..bc0a7df3e0 100644
--- a/lib/kokkos/core/src/impl/Kokkos_PhysicalLayout.hpp
+++ b/lib/kokkos/core/src/impl/Kokkos_PhysicalLayout.hpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -50,23 +51,27 @@ namespace Kokkos {
 namespace Impl {
 
 struct PhysicalLayout {
-  enum LayoutType {Left,Right,Scalar,Error};
+  enum LayoutType { Left, Right, Scalar, Error };
   LayoutType layout_type;
   int rank;
-  long long int stride[9]; //distance between two neighboring elements in a given dimension
+  long long int stride[9];  // distance between two neighboring elements in a
+                            // given dimension
 
-  template< class T , class L , class D , class M >
-  PhysicalLayout( const View<T,L,D,M> & view )
-    : layout_type( is_same< typename View<T,L,D,M>::array_layout , LayoutLeft  >::value ? Left : (
-                   is_same< typename View<T,L,D,M>::array_layout , LayoutRight >::value ? Right : Error ))
-    , rank( view.Rank )
-    {
-      for(int i=0;i<9;i++) stride[i] = 0;
-      view.stride( stride );
-    }
+  template <class T, class L, class D, class M>
+  PhysicalLayout(const View<T, L, D, M>& view)
+      : layout_type(
+            is_same<typename View<T, L, D, M>::array_layout, LayoutLeft>::value
+                ? Left
+                : (is_same<typename View<T, L, D, M>::array_layout,
+                           LayoutRight>::value
+                       ? Right
+                       : Error)),
+        rank(view.Rank) {
+    for (int i = 0; i < 9; i++) stride[i] = 0;
+    view.stride(stride);
+  }
 };
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
 #endif
-
diff --git a/lib/kokkos/core/src/impl/Kokkos_Profiling_DeviceInfo.hpp b/lib/kokkos/core/src/impl/Kokkos_Profiling_DeviceInfo.hpp
index 7f2f2bc394..e35ff84e97 100644
--- a/lib/kokkos/core/src/impl/Kokkos_Profiling_DeviceInfo.hpp
+++ b/lib/kokkos/core/src/impl/Kokkos_Profiling_DeviceInfo.hpp
@@ -1,44 +1,45 @@
 /*
- //@HEADER
- // ************************************************************************
- //
- //                        Kokkos v. 2.0
- //              Copyright (2014) Sandia Corporation
- //
- // Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
- // the U.S. Government retains certain rights in this software.
- //
- // 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 Corporation nor the names of the
- // contributors may be used to endorse or promote products derived from
- // this software without specific prior written permission.
- //
- // THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "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 SANDIA CORPORATION OR THE
- // 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.
- //
- // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
- //
- // ************************************************************************
- //@HEADER
+//@HEADER
+// ************************************************************************
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
+// the U.S. Government retains certain rights in this software.
+//
+// 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 Corporation nor the names of the
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 NTESS OR THE
+// 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.
+//
+// Questions? Contact Christian R. Trott (crtrott@sandia.gov)
+//
+// ************************************************************************
+//@HEADER
 */
 
 #ifndef KOKKOSP_DEVICE_INFO_HPP
@@ -53,7 +54,7 @@ struct KokkosPDeviceInfo {
   uint32_t deviceID;
 };
 
-}
-}
+}  // namespace Profiling
+}  // namespace Kokkos
 
 #endif
diff --git a/lib/kokkos/core/src/impl/Kokkos_Profiling_Interface.cpp b/lib/kokkos/core/src/impl/Kokkos_Profiling_Interface.cpp
index 51c9478150..a069a695fc 100644
--- a/lib/kokkos/core/src/impl/Kokkos_Profiling_Interface.cpp
+++ b/lib/kokkos/core/src/impl/Kokkos_Profiling_Interface.cpp
@@ -1,45 +1,46 @@
 /*
- //@HEADER
- // ************************************************************************
- //
- //                        Kokkos v. 2.0
- //              Copyright (2014) Sandia Corporation
- //
- // Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
- // the U.S. Government retains certain rights in this software.
- //
- // 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 Corporation nor the names of the
- // contributors may be used to endorse or promote products derived from
- // this software without specific prior written permission.
- //
- // THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "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 SANDIA CORPORATION OR THE
- // 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.
- //
- // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
- //
- // ************************************************************************
- //@HEADER
- */
+//@HEADER
+// ************************************************************************
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
+// the U.S. Government retains certain rights in this software.
+//
+// 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 Corporation nor the names of the
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 NTESS OR THE
+// 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.
+//
+// Questions? Contact Christian R. Trott (crtrott@sandia.gov)
+//
+// ************************************************************************
+//@HEADER
+*/
 
 #include <Kokkos_Macros.hpp>
 
@@ -51,246 +52,249 @@
 namespace Kokkos {
 namespace Profiling {
 
-static initFunction initProfileLibrary = nullptr;
+static initFunction initProfileLibrary         = nullptr;
 static finalizeFunction finalizeProfileLibrary = nullptr;
 
-static beginFunction beginForCallee = nullptr;
-static beginFunction beginScanCallee = nullptr;
+static beginFunction beginForCallee    = nullptr;
+static beginFunction beginScanCallee   = nullptr;
 static beginFunction beginReduceCallee = nullptr;
-static endFunction endForCallee = nullptr;
-static endFunction endScanCallee = nullptr;
-static endFunction endReduceCallee = nullptr;
+static endFunction endForCallee        = nullptr;
+static endFunction endScanCallee       = nullptr;
+static endFunction endReduceCallee     = nullptr;
 
 static pushFunction pushRegionCallee = nullptr;
-static popFunction popRegionCallee = nullptr;
+static popFunction popRegionCallee   = nullptr;
 
-static allocateDataFunction allocateDataCallee = nullptr;
+static allocateDataFunction allocateDataCallee     = nullptr;
 static deallocateDataFunction deallocateDataCallee = nullptr;
 
 static beginDeepCopyFunction beginDeepCopyCallee = nullptr;
-static endDeepCopyFunction endDeepCopyCallee = nullptr;
+static endDeepCopyFunction endDeepCopyCallee     = nullptr;
 
-static createProfileSectionFunction createSectionCallee = nullptr;
-static startProfileSectionFunction startSectionCallee = nullptr;
-static stopProfileSectionFunction stopSectionCallee = nullptr;
+static createProfileSectionFunction createSectionCallee   = nullptr;
+static startProfileSectionFunction startSectionCallee     = nullptr;
+static stopProfileSectionFunction stopSectionCallee       = nullptr;
 static destroyProfileSectionFunction destroySectionCallee = nullptr;
 
 static profileEventFunction profileEventCallee = nullptr;
 
 SpaceHandle::SpaceHandle(const char* space_name) {
-  strncpy(name,space_name,64);
+  strncpy(name, space_name, 64);
 }
 
-bool profileLibraryLoaded() {
-  return (nullptr != initProfileLibrary);
-}
+bool profileLibraryLoaded() { return (nullptr != initProfileLibrary); }
 
-void beginParallelFor(const std::string& kernelPrefix, const uint32_t devID, uint64_t* kernelID) {
-  if(nullptr != beginForCallee) {
+void beginParallelFor(const std::string& kernelPrefix, const uint32_t devID,
+                      uint64_t* kernelID) {
+  if (nullptr != beginForCallee) {
     Kokkos::fence();
     (*beginForCallee)(kernelPrefix.c_str(), devID, kernelID);
   }
 }
 
 void endParallelFor(const uint64_t kernelID) {
-  if(nullptr != endForCallee) {
+  if (nullptr != endForCallee) {
     Kokkos::fence();
     (*endForCallee)(kernelID);
   }
 }
 
-void beginParallelScan(const std::string& kernelPrefix, const uint32_t devID, uint64_t* kernelID) {
-  if(nullptr != beginScanCallee) {
+void beginParallelScan(const std::string& kernelPrefix, const uint32_t devID,
+                       uint64_t* kernelID) {
+  if (nullptr != beginScanCallee) {
     Kokkos::fence();
     (*beginScanCallee)(kernelPrefix.c_str(), devID, kernelID);
   }
 }
 
 void endParallelScan(const uint64_t kernelID) {
-  if(nullptr != endScanCallee) {
+  if (nullptr != endScanCallee) {
     Kokkos::fence();
     (*endScanCallee)(kernelID);
   }
 }
 
-void beginParallelReduce(const std::string& kernelPrefix, const uint32_t devID, uint64_t* kernelID) {
-  if(nullptr != beginReduceCallee) {
+void beginParallelReduce(const std::string& kernelPrefix, const uint32_t devID,
+                         uint64_t* kernelID) {
+  if (nullptr != beginReduceCallee) {
     Kokkos::fence();
     (*beginReduceCallee)(kernelPrefix.c_str(), devID, kernelID);
   }
 }
 
 void endParallelReduce(const uint64_t kernelID) {
-  if(nullptr != endReduceCallee) {
+  if (nullptr != endReduceCallee) {
     Kokkos::fence();
     (*endReduceCallee)(kernelID);
   }
 }
 
-
 void pushRegion(const std::string& kName) {
-  if( nullptr != pushRegionCallee ) {
+  if (nullptr != pushRegionCallee) {
     Kokkos::fence();
     (*pushRegionCallee)(kName.c_str());
   }
 }
 
 void popRegion() {
-  if( nullptr != popRegionCallee ) {
+  if (nullptr != popRegionCallee) {
     Kokkos::fence();
     (*popRegionCallee)();
   }
 }
 
-void allocateData(const SpaceHandle space, const std::string label, const void* ptr, const uint64_t size) {
-  if(nullptr != allocateDataCallee) {
-    (*allocateDataCallee)(space,label.c_str(),ptr,size);
+void allocateData(const SpaceHandle space, const std::string label,
+                  const void* ptr, const uint64_t size) {
+  if (nullptr != allocateDataCallee) {
+    (*allocateDataCallee)(space, label.c_str(), ptr, size);
   }
 }
 
-void deallocateData(const SpaceHandle space, const std::string label, const void* ptr, const uint64_t size) {
-  if(nullptr != deallocateDataCallee) {
-    (*deallocateDataCallee)(space,label.c_str(),ptr,size);
+void deallocateData(const SpaceHandle space, const std::string label,
+                    const void* ptr, const uint64_t size) {
+  if (nullptr != deallocateDataCallee) {
+    (*deallocateDataCallee)(space, label.c_str(), ptr, size);
   }
 }
 
-void beginDeepCopy(const SpaceHandle dst_space, const std::string dst_label, const void* dst_ptr,
-    const SpaceHandle src_space, const std::string src_label, const void* src_ptr,
-    const uint64_t size) {
-  if(nullptr != beginDeepCopyCallee) {
-    (*beginDeepCopyCallee)(dst_space, dst_label.c_str(), dst_ptr,
-                      src_space, src_label.c_str(), src_ptr,
-                      size);
+void beginDeepCopy(const SpaceHandle dst_space, const std::string dst_label,
+                   const void* dst_ptr, const SpaceHandle src_space,
+                   const std::string src_label, const void* src_ptr,
+                   const uint64_t size) {
+  if (nullptr != beginDeepCopyCallee) {
+    (*beginDeepCopyCallee)(dst_space, dst_label.c_str(), dst_ptr, src_space,
+                           src_label.c_str(), src_ptr, size);
   }
 }
 
 void endDeepCopy() {
-  if(nullptr != endDeepCopyCallee) {
+  if (nullptr != endDeepCopyCallee) {
     (*endDeepCopyCallee)();
   }
 }
 
 void createProfileSection(const std::string& sectionName, uint32_t* secID) {
-
-	if(nullptr != createSectionCallee) {
-		(*createSectionCallee)(sectionName.c_str(), secID);
-	}
+  if (nullptr != createSectionCallee) {
+    (*createSectionCallee)(sectionName.c_str(), secID);
+  }
 }
 
 void startSection(const uint32_t secID) {
-	if(nullptr != startSectionCallee) {
-		(*startSectionCallee)(secID);
-	}
+  if (nullptr != startSectionCallee) {
+    (*startSectionCallee)(secID);
+  }
 }
 
 void stopSection(const uint32_t secID) {
-	if(nullptr != stopSectionCallee) {
-		(*stopSectionCallee)(secID);
-	}
+  if (nullptr != stopSectionCallee) {
+    (*stopSectionCallee)(secID);
+  }
 }
 
 void destroyProfileSection(const uint32_t secID) {
-	if(nullptr != destroySectionCallee) {
-		(*destroySectionCallee)(secID);
-	}
+  if (nullptr != destroySectionCallee) {
+    (*destroySectionCallee)(secID);
+  }
 }
 
 void markEvent(const std::string& eventName) {
-	if(nullptr != profileEventCallee) {
-		(*profileEventCallee)(eventName.c_str());
-	}
+  if (nullptr != profileEventCallee) {
+    (*profileEventCallee)(eventName.c_str());
+  }
 }
 
 void initialize() {
-
   // Make sure initialize calls happens only once
   static int is_initialized = 0;
-  if(is_initialized) return;
+  if (is_initialized) return;
   is_initialized = 1;
 
   void* firstProfileLibrary;
 
-  char* envProfileLibrary  = getenv("KOKKOS_PROFILE_LIBRARY");
+  char* envProfileLibrary = getenv("KOKKOS_PROFILE_LIBRARY");
 
   // If we do not find a profiling library in the environment then exit
   // early.
-  if( nullptr == envProfileLibrary ) {
-    return ;
+  if (nullptr == envProfileLibrary) {
+    return;
   }
 
-  char* envProfileCopy = (char*) malloc(sizeof(char) * (strlen(envProfileLibrary) + 1));
+  char* envProfileCopy =
+      (char*)malloc(sizeof(char) * (strlen(envProfileLibrary) + 1));
   sprintf(envProfileCopy, "%s", envProfileLibrary);
 
   char* profileLibraryName = strtok(envProfileCopy, ";");
 
-  if( (nullptr != profileLibraryName) && (strcmp(profileLibraryName, "") != 0) ) {
+  if ((nullptr != profileLibraryName) &&
+      (strcmp(profileLibraryName, "") != 0)) {
     firstProfileLibrary = dlopen(profileLibraryName, RTLD_NOW | RTLD_GLOBAL);
 
-    if(nullptr == firstProfileLibrary) {
-      std::cerr << "Error: Unable to load KokkosP library: " <<
-        profileLibraryName << std::endl;
-      std::cerr << "dlopen(" << profileLibraryName << ", RTLD_NOW | RTLD_GLOBAL) failed with "
-        << dlerror() << '\n';
+    if (nullptr == firstProfileLibrary) {
+      std::cerr << "Error: Unable to load KokkosP library: "
+                << profileLibraryName << std::endl;
+      std::cerr << "dlopen(" << profileLibraryName
+                << ", RTLD_NOW | RTLD_GLOBAL) failed with " << dlerror()
+                << '\n';
     } else {
 #ifdef KOKKOS_ENABLE_PROFILING_LOAD_PRINT
-      std::cout << "KokkosP: Library Loaded: " << profileLibraryName << std::endl;
+      std::cout << "KokkosP: Library Loaded: " << profileLibraryName
+                << std::endl;
 #endif
 
-      // dlsym returns a pointer to an object, while we want to assign to pointer to function
-      // A direct cast will give warnings hence, we have to workaround the issue by casting pointer to pointers.
-      auto p1 = dlsym(firstProfileLibrary, "kokkosp_begin_parallel_for");
-      beginForCallee = *((beginFunction*) &p1);
+      // dlsym returns a pointer to an object, while we want to assign to
+      // pointer to function A direct cast will give warnings hence, we have to
+      // workaround the issue by casting pointer to pointers.
+      auto p1        = dlsym(firstProfileLibrary, "kokkosp_begin_parallel_for");
+      beginForCallee = *((beginFunction*)&p1);
       auto p2 = dlsym(firstProfileLibrary, "kokkosp_begin_parallel_scan");
-      beginScanCallee = *((beginFunction*) &p2);
+      beginScanCallee = *((beginFunction*)&p2);
       auto p3 = dlsym(firstProfileLibrary, "kokkosp_begin_parallel_reduce");
-      beginReduceCallee = *((beginFunction*) &p3);
+      beginReduceCallee = *((beginFunction*)&p3);
 
-      auto p4 = dlsym(firstProfileLibrary, "kokkosp_end_parallel_scan");
-      endScanCallee = *((endFunction*) &p4);
-      auto p5 = dlsym(firstProfileLibrary, "kokkosp_end_parallel_for");
-      endForCallee = *((endFunction*) &p5);
-      auto p6 = dlsym(firstProfileLibrary, "kokkosp_end_parallel_reduce");
-      endReduceCallee = *((endFunction*) &p6);
+      auto p4       = dlsym(firstProfileLibrary, "kokkosp_end_parallel_scan");
+      endScanCallee = *((endFunction*)&p4);
+      auto p5       = dlsym(firstProfileLibrary, "kokkosp_end_parallel_for");
+      endForCallee  = *((endFunction*)&p5);
+      auto p6       = dlsym(firstProfileLibrary, "kokkosp_end_parallel_reduce");
+      endReduceCallee = *((endFunction*)&p6);
 
-      auto p7 = dlsym(firstProfileLibrary, "kokkosp_init_library");
-      initProfileLibrary = *((initFunction*) &p7);
+      auto p7            = dlsym(firstProfileLibrary, "kokkosp_init_library");
+      initProfileLibrary = *((initFunction*)&p7);
       auto p8 = dlsym(firstProfileLibrary, "kokkosp_finalize_library");
-      finalizeProfileLibrary = *((finalizeFunction*) &p8);
+      finalizeProfileLibrary = *((finalizeFunction*)&p8);
 
       auto p9 = dlsym(firstProfileLibrary, "kokkosp_push_profile_region");
-      pushRegionCallee = *((pushFunction*) &p9);
+      pushRegionCallee = *((pushFunction*)&p9);
       auto p10 = dlsym(firstProfileLibrary, "kokkosp_pop_profile_region");
-      popRegionCallee = *((popFunction*) &p10);
+      popRegionCallee = *((popFunction*)&p10);
 
-      auto p11 = dlsym(firstProfileLibrary, "kokkosp_allocate_data");
-      allocateDataCallee = *((allocateDataFunction*) &p11);
+      auto p11           = dlsym(firstProfileLibrary, "kokkosp_allocate_data");
+      allocateDataCallee = *((allocateDataFunction*)&p11);
       auto p12 = dlsym(firstProfileLibrary, "kokkosp_deallocate_data");
-      deallocateDataCallee = *((deallocateDataFunction*) &p12);
+      deallocateDataCallee = *((deallocateDataFunction*)&p12);
 
       auto p13 = dlsym(firstProfileLibrary, "kokkosp_begin_deep_copy");
-      beginDeepCopyCallee = *((beginDeepCopyFunction*) &p13);
-      auto p14 = dlsym(firstProfileLibrary, "kokkosp_end_deep_copy");
-      endDeepCopyCallee = *((endDeepCopyFunction*) &p14);
-      
+      beginDeepCopyCallee = *((beginDeepCopyFunction*)&p13);
+      auto p14            = dlsym(firstProfileLibrary, "kokkosp_end_deep_copy");
+      endDeepCopyCallee   = *((endDeepCopyFunction*)&p14);
+
       auto p15 = dlsym(firstProfileLibrary, "kokkosp_create_profile_section");
-      createSectionCallee = *((createProfileSectionFunction*) &p15);
+      createSectionCallee = *((createProfileSectionFunction*)&p15);
       auto p16 = dlsym(firstProfileLibrary, "kokkosp_start_profile_section");
-      startSectionCallee = *((startProfileSectionFunction*) &p16);
+      startSectionCallee = *((startProfileSectionFunction*)&p16);
       auto p17 = dlsym(firstProfileLibrary, "kokkosp_stop_profile_section");
-      stopSectionCallee = *((stopProfileSectionFunction*) &p17);      
+      stopSectionCallee = *((stopProfileSectionFunction*)&p17);
       auto p18 = dlsym(firstProfileLibrary, "kokkosp_destroy_profile_section");
-      destroySectionCallee = *((destroyProfileSectionFunction*) &p18);
-      
-      auto p19 = dlsym(firstProfileLibrary, "kokkosp_profile_event");
-      profileEventCallee = *((profileEventFunction*) &p19);
+      destroySectionCallee = *((destroyProfileSectionFunction*)&p18);
+
+      auto p19           = dlsym(firstProfileLibrary, "kokkosp_profile_event");
+      profileEventCallee = *((profileEventFunction*)&p19);
     }
   }
 
-  if(nullptr != initProfileLibrary) {
-    (*initProfileLibrary)(0,
-        (uint64_t) KOKKOSP_INTERFACE_VERSION,
-        (uint32_t) 0,
-        nullptr);
+  if (nullptr != initProfileLibrary) {
+    (*initProfileLibrary)(0, (uint64_t)KOKKOSP_INTERFACE_VERSION, (uint32_t)0,
+                          nullptr);
   }
 
   free(envProfileCopy);
@@ -299,44 +303,44 @@ void initialize() {
 void finalize() {
   // Make sure finalize calls happens only once
   static int is_finalized = 0;
-  if(is_finalized) return;
+  if (is_finalized) return;
   is_finalized = 1;
 
-  if(nullptr != finalizeProfileLibrary) {
+  if (nullptr != finalizeProfileLibrary) {
     (*finalizeProfileLibrary)();
 
     // Set all profile hooks to nullptr to prevent
     // any additional calls. Once we are told to
     // finalize, we mean it
-    initProfileLibrary = nullptr;
+    initProfileLibrary     = nullptr;
     finalizeProfileLibrary = nullptr;
 
-    beginForCallee = nullptr;
-    beginScanCallee = nullptr;
+    beginForCallee    = nullptr;
+    beginScanCallee   = nullptr;
     beginReduceCallee = nullptr;
-    endScanCallee = nullptr;
-    endForCallee = nullptr;
-    endReduceCallee = nullptr;
+    endScanCallee     = nullptr;
+    endForCallee      = nullptr;
+    endReduceCallee   = nullptr;
 
     pushRegionCallee = nullptr;
-    popRegionCallee = nullptr;
+    popRegionCallee  = nullptr;
 
-    allocateDataCallee = nullptr;
+    allocateDataCallee   = nullptr;
     deallocateDataCallee = nullptr;
 
     beginDeepCopyCallee = nullptr;
-    endDeepCopyCallee = nullptr;
-    
-    createSectionCallee = nullptr;
-	startSectionCallee = nullptr;
-	stopSectionCallee = nullptr;
-	destroySectionCallee = nullptr;
+    endDeepCopyCallee   = nullptr;
 
-	profileEventCallee = nullptr;
+    createSectionCallee  = nullptr;
+    startSectionCallee   = nullptr;
+    stopSectionCallee    = nullptr;
+    destroySectionCallee = nullptr;
+
+    profileEventCallee = nullptr;
   }
 }
-}
-}
+}  // namespace Profiling
+}  // namespace Kokkos
 
 #else
 
@@ -348,34 +352,36 @@ namespace Profiling {
 
 bool profileLibraryLoaded() { return false; }
 
+void beginParallelFor(const std::string&, const uint32_t, uint64_t*) {}
+void endParallelFor(const uint64_t) {}
+void beginParallelScan(const std::string&, const uint32_t, uint64_t*) {}
+void endParallelScan(const uint64_t) {}
+void beginParallelReduce(const std::string&, const uint32_t, uint64_t*) {}
+void endParallelReduce(const uint64_t) {}
 
-void beginParallelFor(const std::string& , const uint32_t , uint64_t* ) {}
-void endParallelFor(const uint64_t ) {}
-void beginParallelScan(const std::string& , const uint32_t , uint64_t* ) {}
-void endParallelScan(const uint64_t ) {}
-void beginParallelReduce(const std::string& , const uint32_t , uint64_t* ) {}
-void endParallelReduce(const uint64_t ) {}
-
-void pushRegion(const std::string& ) {}
+void pushRegion(const std::string&) {}
 void popRegion() {}
-void createProfileSection(const std::string& , uint32_t* ) {}
-void startSection(const uint32_t ) {}
-void stopSection(const uint32_t ) {}
-void destroyProfileSection(const uint32_t ) {}
+void createProfileSection(const std::string&, uint32_t*) {}
+void startSection(const uint32_t) {}
+void stopSection(const uint32_t) {}
+void destroyProfileSection(const uint32_t) {}
 
-void markEvent(const std::string& ) {}
+void markEvent(const std::string&) {}
 
-void allocateData(const SpaceHandle , const std::string , const void* , const uint64_t ) {}
-void deallocateData(const SpaceHandle , const std::string , const void* , const uint64_t ) {}
+void allocateData(const SpaceHandle, const std::string, const void*,
+                  const uint64_t) {}
+void deallocateData(const SpaceHandle, const std::string, const void*,
+                    const uint64_t) {}
 
-void beginDeepCopy(const SpaceHandle , const std::string , const void* , 
-    const SpaceHandle , const std::string , const void* ,
-    const uint64_t ) {}
+void beginDeepCopy(const SpaceHandle, const std::string, const void*,
+                   const SpaceHandle, const std::string, const void*,
+                   const uint64_t) {}
 void endDeepCopy() {}
 
 void initialize() {}
 void finalize() {}
 
-}} // end namespace Kokkos::Profiling
+}  // namespace Profiling
+}  // namespace Kokkos
 
 #endif
diff --git a/lib/kokkos/core/src/impl/Kokkos_Profiling_Interface.hpp b/lib/kokkos/core/src/impl/Kokkos_Profiling_Interface.hpp
index b245db09a7..ac37401e10 100644
--- a/lib/kokkos/core/src/impl/Kokkos_Profiling_Interface.hpp
+++ b/lib/kokkos/core/src/impl/Kokkos_Profiling_Interface.hpp
@@ -1,45 +1,46 @@
 /*
- //@HEADER
- // ************************************************************************
- //
- //                        Kokkos v. 2.0
- //              Copyright (2014) Sandia Corporation
- //
- // Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
- // the U.S. Government retains certain rights in this software.
- //
- // 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 Corporation nor the names of the
- // contributors may be used to endorse or promote products derived from
- // this software without specific prior written permission.
- //
- // THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "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 SANDIA CORPORATION OR THE
- // 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.
- //
- // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
- //
- // ************************************************************************
- //@HEADER
- */
+//@HEADER
+// ************************************************************************
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
+// the U.S. Government retains certain rights in this software.
+//
+// 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 Corporation nor the names of the
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 NTESS OR THE
+// 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.
+//
+// Questions? Contact Christian R. Trott (crtrott@sandia.gov)
+//
+// ************************************************************************
+//@HEADER
+*/
 
 #ifndef KOKKOSP_INTERFACE_HPP
 #define KOKKOSP_INTERFACE_HPP
@@ -53,7 +54,6 @@
 #include <iostream>
 #include <cstdlib>
 
-
 #if defined(KOKKOS_ENABLE_PROFILING)
 #include <dlfcn.h>
 
@@ -69,9 +69,7 @@ struct SpaceHandle {
   char name[64];
 };
 
-typedef void (*initFunction)(const int,
-                             const uint64_t,
-                             const uint32_t,
+typedef void (*initFunction)(const int, const uint64_t, const uint32_t,
                              KokkosPDeviceInfo*);
 typedef void (*finalizeFunction)();
 typedef void (*beginFunction)(const char*, const uint32_t, uint64_t*);
@@ -80,8 +78,10 @@ typedef void (*endFunction)(uint64_t);
 typedef void (*pushFunction)(const char*);
 typedef void (*popFunction)();
 
-typedef void (*allocateDataFunction)(const SpaceHandle, const char*, const void*, const uint64_t);
-typedef void (*deallocateDataFunction)(const SpaceHandle, const char*, const void*, const uint64_t);
+typedef void (*allocateDataFunction)(const SpaceHandle, const char*,
+                                     const void*, const uint64_t);
+typedef void (*deallocateDataFunction)(const SpaceHandle, const char*,
+                                       const void*, const uint64_t);
 
 typedef void (*createProfileSectionFunction)(const char*, uint32_t*);
 typedef void (*startProfileSectionFunction)(const uint32_t);
@@ -90,19 +90,21 @@ typedef void (*destroyProfileSectionFunction)(const uint32_t);
 
 typedef void (*profileEventFunction)(const char*);
 
-typedef void (*beginDeepCopyFunction)(
-    SpaceHandle, const char*, const void*,
-    SpaceHandle, const char*, const void*,
-    uint64_t);
+typedef void (*beginDeepCopyFunction)(SpaceHandle, const char*, const void*,
+                                      SpaceHandle, const char*, const void*,
+                                      uint64_t);
 typedef void (*endDeepCopyFunction)();
 
 bool profileLibraryLoaded();
 
-void beginParallelFor(const std::string& kernelPrefix, const uint32_t devID, uint64_t* kernelID);
+void beginParallelFor(const std::string& kernelPrefix, const uint32_t devID,
+                      uint64_t* kernelID);
 void endParallelFor(const uint64_t kernelID);
-void beginParallelScan(const std::string& kernelPrefix, const uint32_t devID, uint64_t* kernelID);
+void beginParallelScan(const std::string& kernelPrefix, const uint32_t devID,
+                       uint64_t* kernelID);
 void endParallelScan(const uint64_t kernelID);
-void beginParallelReduce(const std::string& kernelPrefix, const uint32_t devID, uint64_t* kernelID);
+void beginParallelReduce(const std::string& kernelPrefix, const uint32_t devID,
+                         uint64_t* kernelID);
 void endParallelReduce(const uint64_t kernelID);
 
 void pushRegion(const std::string& kName);
@@ -115,19 +117,22 @@ void destroyProfileSection(const uint32_t secID);
 
 void markEvent(const std::string* evName);
 
-void allocateData(const SpaceHandle space, const std::string label, const void* ptr, const uint64_t size);
-void deallocateData(const SpaceHandle space, const std::string label, const void* ptr, const uint64_t size);
+void allocateData(const SpaceHandle space, const std::string label,
+                  const void* ptr, const uint64_t size);
+void deallocateData(const SpaceHandle space, const std::string label,
+                    const void* ptr, const uint64_t size);
 
-void beginDeepCopy(const SpaceHandle dst_space, const std::string dst_label, const void* dst_ptr,
-    const SpaceHandle src_space, const std::string src_label, const void* src_ptr,
-    const uint64_t size);
+void beginDeepCopy(const SpaceHandle dst_space, const std::string dst_label,
+                   const void* dst_ptr, const SpaceHandle src_space,
+                   const std::string src_label, const void* src_ptr,
+                   const uint64_t size);
 void endDeepCopy();
 
 void initialize();
 void finalize();
 
-}
-}
+}  // namespace Profiling
+}  // namespace Kokkos
 
 #else
 namespace Kokkos {
@@ -138,40 +143,39 @@ struct SpaceHandle {
   char name[64];
 };
 
-
 bool profileLibraryLoaded();
 
+void beginParallelFor(const std::string&, const uint32_t, uint64_t*);
+void endParallelFor(const uint64_t);
+void beginParallelScan(const std::string&, const uint32_t, uint64_t*);
+void endParallelScan(const uint64_t);
+void beginParallelReduce(const std::string&, const uint32_t, uint64_t*);
+void endParallelReduce(const uint64_t);
 
-void beginParallelFor(const std::string& , const uint32_t , uint64_t* );
-void endParallelFor(const uint64_t );
-void beginParallelScan(const std::string& , const uint32_t , uint64_t* );
-void endParallelScan(const uint64_t );
-void beginParallelReduce(const std::string& , const uint32_t , uint64_t* );
-void endParallelReduce(const uint64_t );
-
-void pushRegion(const std::string& );
+void pushRegion(const std::string&);
 void popRegion();
-void createProfileSection(const std::string& , uint32_t* );
-void startSection(const uint32_t );
-void stopSection(const uint32_t );
-void destroyProfileSection(const uint32_t );
+void createProfileSection(const std::string&, uint32_t*);
+void startSection(const uint32_t);
+void stopSection(const uint32_t);
+void destroyProfileSection(const uint32_t);
 
-void markEvent(const std::string& );
+void markEvent(const std::string&);
 
-void allocateData(const SpaceHandle , const std::string , const void* , const uint64_t );
-void deallocateData(const SpaceHandle , const std::string , const void* , const uint64_t );
+void allocateData(const SpaceHandle, const std::string, const void*,
+                  const uint64_t);
+void deallocateData(const SpaceHandle, const std::string, const void*,
+                    const uint64_t);
 
-void beginDeepCopy(const SpaceHandle , const std::string , const void* , 
-    const SpaceHandle , const std::string , const void* ,
-    const uint64_t );
+void beginDeepCopy(const SpaceHandle, const std::string, const void*,
+                   const SpaceHandle, const std::string, const void*,
+                   const uint64_t);
 void endDeepCopy();
 
 void initialize();
 void finalize();
 
-}
-}
+}  // namespace Profiling
+}  // namespace Kokkos
 
 #endif
 #endif
-
diff --git a/lib/kokkos/core/src/impl/Kokkos_Serial.cpp b/lib/kokkos/core/src/impl/Kokkos_Serial.cpp
index c299858c74..40aeaa1b7a 100644
--- a/lib/kokkos/core/src/impl/Kokkos_Serial.cpp
+++ b/lib/kokkos/core/src/impl/Kokkos_Serial.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -42,7 +43,7 @@
 */
 
 #include <Kokkos_Macros.hpp>
-#if defined( KOKKOS_ENABLE_SERIAL )
+#if defined(KOKKOS_ENABLE_SERIAL)
 
 #include <cstdlib>
 #include <sstream>
@@ -58,81 +59,87 @@ namespace Kokkos {
 namespace Impl {
 namespace {
 
-HostThreadTeamData g_serial_thread_team_data ;
+HostThreadTeamData g_serial_thread_team_data;
 
 bool g_serial_is_initialized = false;
 
-}
+}  // namespace
 
 // Resize thread team data scratch memory
-void serial_resize_thread_team_data( size_t pool_reduce_bytes
-                                   , size_t team_reduce_bytes
-                                   , size_t team_shared_bytes
-                                   , size_t thread_local_bytes )
-{
-  if ( pool_reduce_bytes < 512 ) pool_reduce_bytes = 512 ;
-  if ( team_reduce_bytes < 512 ) team_reduce_bytes = 512 ;
+void serial_resize_thread_team_data(size_t pool_reduce_bytes,
+                                    size_t team_reduce_bytes,
+                                    size_t team_shared_bytes,
+                                    size_t thread_local_bytes) {
+  if (pool_reduce_bytes < 512) pool_reduce_bytes = 512;
+  if (team_reduce_bytes < 512) team_reduce_bytes = 512;
 
-  const size_t old_pool_reduce  = g_serial_thread_team_data.pool_reduce_bytes();
-  const size_t old_team_reduce  = g_serial_thread_team_data.team_reduce_bytes();
-  const size_t old_team_shared  = g_serial_thread_team_data.team_shared_bytes();
-  const size_t old_thread_local = g_serial_thread_team_data.thread_local_bytes();
-  const size_t old_alloc_bytes  = g_serial_thread_team_data.scratch_bytes();
+  const size_t old_pool_reduce = g_serial_thread_team_data.pool_reduce_bytes();
+  const size_t old_team_reduce = g_serial_thread_team_data.team_reduce_bytes();
+  const size_t old_team_shared = g_serial_thread_team_data.team_shared_bytes();
+  const size_t old_thread_local =
+      g_serial_thread_team_data.thread_local_bytes();
+  const size_t old_alloc_bytes = g_serial_thread_team_data.scratch_bytes();
 
   // Allocate if any of the old allocation is tool small:
 
-  const bool allocate = ( old_pool_reduce  < pool_reduce_bytes ) ||
-                        ( old_team_reduce  < team_reduce_bytes ) ||
-                        ( old_team_shared  < team_shared_bytes ) ||
-                        ( old_thread_local < thread_local_bytes );
+  const bool allocate = (old_pool_reduce < pool_reduce_bytes) ||
+                        (old_team_reduce < team_reduce_bytes) ||
+                        (old_team_shared < team_shared_bytes) ||
+                        (old_thread_local < thread_local_bytes);
 
-  if ( allocate ) {
+  if (allocate) {
+    Kokkos::HostSpace space;
 
-    Kokkos::HostSpace space ;
-
-    if ( old_alloc_bytes ) {
+    if (old_alloc_bytes) {
       g_serial_thread_team_data.disband_team();
       g_serial_thread_team_data.disband_pool();
 
-      space.deallocate( g_serial_thread_team_data.scratch_buffer()
-                      , g_serial_thread_team_data.scratch_bytes() );
+      space.deallocate(g_serial_thread_team_data.scratch_buffer(),
+                       g_serial_thread_team_data.scratch_bytes());
     }
 
-    if ( pool_reduce_bytes < old_pool_reduce ) { pool_reduce_bytes = old_pool_reduce ; }
-    if ( team_reduce_bytes < old_team_reduce ) { team_reduce_bytes = old_team_reduce ; }
-    if ( team_shared_bytes < old_team_shared ) { team_shared_bytes = old_team_shared ; }
-    if ( thread_local_bytes < old_thread_local ) { thread_local_bytes = old_thread_local ; }
+    if (pool_reduce_bytes < old_pool_reduce) {
+      pool_reduce_bytes = old_pool_reduce;
+    }
+    if (team_reduce_bytes < old_team_reduce) {
+      team_reduce_bytes = old_team_reduce;
+    }
+    if (team_shared_bytes < old_team_shared) {
+      team_shared_bytes = old_team_shared;
+    }
+    if (thread_local_bytes < old_thread_local) {
+      thread_local_bytes = old_thread_local;
+    }
 
     const size_t alloc_bytes =
-      HostThreadTeamData::scratch_size( pool_reduce_bytes
-                                      , team_reduce_bytes
-                                      , team_shared_bytes
-                                      , thread_local_bytes );
+        HostThreadTeamData::scratch_size(pool_reduce_bytes, team_reduce_bytes,
+                                         team_shared_bytes, thread_local_bytes);
 
-    void * const ptr = space.allocate( alloc_bytes );
+    void* ptr = nullptr;
+    try {
+      ptr = space.allocate(alloc_bytes);
+    } catch (Kokkos::Experimental::RawMemoryAllocationFailure const& failure) {
+      // For now, just rethrow the error message the existing way
+      Kokkos::Impl::throw_runtime_exception(failure.get_error_message());
+    }
 
-    g_serial_thread_team_data.
-      scratch_assign( ((char *)ptr)
-                    , alloc_bytes
-                    , pool_reduce_bytes
-                    , team_reduce_bytes
-                    , team_shared_bytes
-                    , thread_local_bytes );
+    g_serial_thread_team_data.scratch_assign(
+        ((char*)ptr), alloc_bytes, pool_reduce_bytes, team_reduce_bytes,
+        team_shared_bytes, thread_local_bytes);
 
-    HostThreadTeamData * pool[1] = { & g_serial_thread_team_data };
+    HostThreadTeamData* pool[1] = {&g_serial_thread_team_data};
 
-    g_serial_thread_team_data.organize_pool( pool , 1 );
+    g_serial_thread_team_data.organize_pool(pool, 1);
     g_serial_thread_team_data.organize_team(1);
   }
 }
 
-HostThreadTeamData * serial_get_thread_team_data()
-{
-  return & g_serial_thread_team_data ;
+HostThreadTeamData* serial_get_thread_team_data() {
+  return &g_serial_thread_team_data;
 }
 
-} // namespace Impl
-} // namespace Kokkos
+}  // namespace Impl
+}  // namespace Kokkos
 
 /*--------------------------------------------------------------------------*/
 
@@ -144,31 +151,28 @@ bool Serial::is_initialized()
 bool Serial::impl_is_initialized()
 #endif
 {
-  return Impl::g_serial_is_initialized ;
+  return Impl::g_serial_is_initialized;
 }
 
 #ifdef KOKKOS_ENABLE_DEPRECATED_CODE
-void Serial::initialize( unsigned threads_count
-                       , unsigned use_numa_count
-                       , unsigned use_cores_per_numa
-                       , bool allow_asynchronous_threadpool )
-{
-  (void) threads_count;
-  (void) use_numa_count;
-  (void) use_cores_per_numa;
-  (void) allow_asynchronous_threadpool;
+void Serial::initialize(unsigned threads_count, unsigned use_numa_count,
+                        unsigned use_cores_per_numa,
+                        bool allow_asynchronous_threadpool) {
+  (void)threads_count;
+  (void)use_numa_count;
+  (void)use_cores_per_numa;
+  (void)allow_asynchronous_threadpool;
 #else
-void Serial::impl_initialize()
-{
+void Serial::impl_initialize() {
 #endif
 
-  Impl::SharedAllocationRecord< void, void >::tracking_enable();
+  Impl::SharedAllocationRecord<void, void>::tracking_enable();
 
   // Init the array of locks used for arbitrarily sized atomics
   Impl::init_lock_array_host_space();
-  #if defined(KOKKOS_ENABLE_DEPRECATED_CODE) && defined(KOKKOS_ENABLE_PROFILING)
-    Kokkos::Profiling::initialize();
-  #endif
+#if defined(KOKKOS_ENABLE_DEPRECATED_CODE) && defined(KOKKOS_ENABLE_PROFILING)
+  Kokkos::Profiling::initialize();
+#endif
 
   Impl::g_serial_is_initialized = true;
 }
@@ -179,30 +183,29 @@ void Serial::finalize()
 void Serial::impl_finalize()
 #endif
 {
-  if ( Impl::g_serial_thread_team_data.scratch_buffer() ) {
+  if (Impl::g_serial_thread_team_data.scratch_buffer()) {
     Impl::g_serial_thread_team_data.disband_team();
     Impl::g_serial_thread_team_data.disband_pool();
 
-    Kokkos::HostSpace space ;
+    Kokkos::HostSpace space;
 
-    space.deallocate( Impl::g_serial_thread_team_data.scratch_buffer()
-                    , Impl::g_serial_thread_team_data.scratch_bytes() );
+    space.deallocate(Impl::g_serial_thread_team_data.scratch_buffer(),
+                     Impl::g_serial_thread_team_data.scratch_bytes());
 
-    Impl::g_serial_thread_team_data.scratch_assign( (void*) 0, 0, 0, 0, 0, 0 );
+    Impl::g_serial_thread_team_data.scratch_assign((void*)0, 0, 0, 0, 0, 0);
   }
 
-  #if defined(KOKKOS_ENABLE_PROFILING)
-    Kokkos::Profiling::finalize();
-  #endif
+#if defined(KOKKOS_ENABLE_PROFILING)
+  Kokkos::Profiling::finalize();
+#endif
 
   Impl::g_serial_is_initialized = false;
 }
 
 const char* Serial::name() { return "Serial"; }
 
-} // namespace Kokkos
+}  // namespace Kokkos
 
 #else
 void KOKKOS_CORE_SRC_IMPL_SERIAL_PREVENT_LINK_ERROR() {}
-#endif // defined( KOKKOS_ENABLE_SERIAL )
-
+#endif  // defined( KOKKOS_ENABLE_SERIAL )
diff --git a/lib/kokkos/core/src/impl/Kokkos_Serial_Task.cpp b/lib/kokkos/core/src/impl/Kokkos_Serial_Task.cpp
index 687a0e9c37..179c55b10d 100644
--- a/lib/kokkos/core/src/impl/Kokkos_Serial_Task.cpp
+++ b/lib/kokkos/core/src/impl/Kokkos_Serial_Task.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -42,7 +43,7 @@
 */
 
 #include <Kokkos_Macros.hpp>
-#if defined( KOKKOS_ENABLE_SERIAL ) && defined( KOKKOS_ENABLE_TASKDAG )
+#if defined(KOKKOS_ENABLE_SERIAL) && defined(KOKKOS_ENABLE_TASKDAG)
 
 #include <Kokkos_Core.hpp>
 
@@ -57,9 +58,10 @@ namespace Impl {
 
 template class TaskQueue<Kokkos::Serial, typename Kokkos::Serial::memory_space>;
 
-}} /* namespace Kokkos::Impl */
+}
+}  // namespace Kokkos
 
 #else
 void KOKKOS_CORE_SRC_IMPL_SERIAL_TASK_PREVENT_LINK_ERROR() {}
-#endif /* #if defined( KOKKOS_ENABLE_SERIAL ) && defined( KOKKOS_ENABLE_TASKDAG ) */
-
+#endif /* #if defined( KOKKOS_ENABLE_SERIAL ) && defined( \
+          KOKKOS_ENABLE_TASKDAG ) */
diff --git a/lib/kokkos/core/src/impl/Kokkos_Serial_Task.hpp b/lib/kokkos/core/src/impl/Kokkos_Serial_Task.hpp
index c379a12fb1..6871e4f14a 100644
--- a/lib/kokkos/core/src/impl/Kokkos_Serial_Task.hpp
+++ b/lib/kokkos/core/src/impl/Kokkos_Serial_Task.hpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -45,7 +46,7 @@
 #define KOKKOS_IMPL_SERIAL_TASK_HPP
 
 #include <Kokkos_Macros.hpp>
-#if defined( KOKKOS_ENABLE_TASKDAG )
+#if defined(KOKKOS_ENABLE_TASKDAG)
 
 #include <Kokkos_TaskScheduler_fwd.hpp>
 
@@ -59,47 +60,39 @@
 namespace Kokkos {
 namespace Impl {
 
-template<class QueueType>
-class TaskQueueSpecialization<
-  SimpleTaskScheduler<Kokkos::Serial, QueueType>
->
-{
-public:
-
+template <class QueueType>
+class TaskQueueSpecialization<SimpleTaskScheduler<Kokkos::Serial, QueueType> > {
+ public:
   // Note: Scheduler may be an incomplete type at class scope (but not inside
   // of the methods, obviously)
 
   using execution_space = Kokkos::Serial;
-  using memory_space = Kokkos::HostSpace;
-  using scheduler_type = SimpleTaskScheduler<Kokkos::Serial, QueueType>;
-  using member_type = TaskTeamMemberAdapter<
-    HostThreadTeamMember<Kokkos::Serial>, scheduler_type
-  >;
+  using memory_space    = Kokkos::HostSpace;
+  using scheduler_type  = SimpleTaskScheduler<Kokkos::Serial, QueueType>;
+  using member_type =
+      TaskTeamMemberAdapter<HostThreadTeamMember<Kokkos::Serial>,
+                            scheduler_type>;
 
-  static
-  void execute(scheduler_type const& scheduler)
-  {
+  static void execute(scheduler_type const& scheduler) {
     using task_base_type = typename scheduler_type::task_base_type;
 
     // Set default buffers
-    serial_resize_thread_team_data(
-      0,   /* global reduce buffer */
-      512, /* team reduce buffer */
-      0,   /* team shared buffer */
-      0    /* thread local buffer */
+    serial_resize_thread_team_data(0,   /* global reduce buffer */
+                                   512, /* team reduce buffer */
+                                   0,   /* team shared buffer */
+                                   0    /* thread local buffer */
     );
 
     Impl::HostThreadTeamData& self = *Impl::serial_get_thread_team_data();
 
-    auto& queue = scheduler.queue();
+    auto& queue         = scheduler.queue();
     auto team_scheduler = scheduler.get_team_scheduler(0);
 
     member_type member(scheduler, self);
 
     auto current_task = OptionalRef<task_base_type>(nullptr);
 
-    while(not queue.is_done()) {
-
+    while (not queue.is_done()) {
       // Each team lead attempts to acquire either a thread team task
       // or a single thread task for the team.
 
@@ -107,135 +100,115 @@ public:
       current_task = queue.pop_ready_task(team_scheduler.team_scheduler_info());
 
       // run the task
-      if(current_task) {
+      if (current_task) {
         current_task->as_runnable_task().run(member);
         // Respawns are handled in the complete function
-        queue.complete(
-          (*std::move(current_task)).as_runnable_task(),
-          team_scheduler.team_scheduler_info()
-        );
+        queue.complete((*std::move(current_task)).as_runnable_task(),
+                       team_scheduler.team_scheduler_info());
       }
-
     }
-
   }
 
-  static constexpr uint32_t
-  get_max_team_count(execution_space const&) noexcept
-  {
+  static constexpr uint32_t get_max_team_count(
+      execution_space const&) noexcept {
     return 1;
   }
 
   template <typename TaskType>
-  static void
-  get_function_pointer(
-    typename TaskType::function_type& ptr,
-    typename TaskType::destroy_type& dtor
-  )
-  {
-    ptr = TaskType::apply;
+  static void get_function_pointer(typename TaskType::function_type& ptr,
+                                   typename TaskType::destroy_type& dtor) {
+    ptr  = TaskType::apply;
     dtor = TaskType::destroy;
   }
 };
 
 //----------------------------------------------------------------------------
 
-template<class Scheduler>
+template <class Scheduler>
 class TaskQueueSpecializationConstrained<
-  Scheduler,
-  typename std::enable_if<
-    std::is_same<typename Scheduler::execution_space, Kokkos::Serial>::value
-  >::type
->
-{
-public:
-
+    Scheduler,
+    typename std::enable_if<std::is_same<typename Scheduler::execution_space,
+                                         Kokkos::Serial>::value>::type> {
+ public:
   // Note: Scheduler may be an incomplete type at class scope (but not inside
   // of the methods, obviously)
 
   using execution_space = Kokkos::Serial;
-  using memory_space = Kokkos::HostSpace;
-  using scheduler_type = Scheduler;
-  using member_type = TaskTeamMemberAdapter<
-    HostThreadTeamMember<Kokkos::Serial>, scheduler_type
-  >;
+  using memory_space    = Kokkos::HostSpace;
+  using scheduler_type  = Scheduler;
+  using member_type =
+      TaskTeamMemberAdapter<HostThreadTeamMember<Kokkos::Serial>,
+                            scheduler_type>;
 
-  static
-  void iff_single_thread_recursive_execute(scheduler_type const& scheduler) {
+  static void iff_single_thread_recursive_execute(
+      scheduler_type const& scheduler) {
     using task_base_type = TaskBase;
-    using queue_type = typename scheduler_type::queue_type;
+    using queue_type     = typename scheduler_type::queue_type;
 
-    task_base_type * const end = (task_base_type *) task_base_type::EndTag ;
+    task_base_type* const end = (task_base_type*)task_base_type::EndTag;
 
-    Impl::HostThreadTeamData * const data = Impl::serial_get_thread_team_data();
+    Impl::HostThreadTeamData* const data = Impl::serial_get_thread_team_data();
 
-    member_type exec( scheduler, *data );
+    member_type exec(scheduler, *data);
 
     // Loop until no runnable task
 
-    task_base_type * task = end ;
+    task_base_type* task = end;
 
     auto* const queue = scheduler.m_queue;
 
     do {
+      task = end;
 
-      task = end ;
-
-      for ( int i = 0 ; i < queue_type::NumQueue && end == task ; ++i ) {
-        for ( int j = 0 ; j < 2 && end == task ; ++j ) {
-          task = queue_type::pop_ready_task( & queue->m_ready[i][j] );
+      for (int i = 0; i < queue_type::NumQueue && end == task; ++i) {
+        for (int j = 0; j < 2 && end == task; ++j) {
+          task = queue_type::pop_ready_task(&queue->m_ready[i][j]);
         }
       }
 
-      if ( end == task ) break ;
+      if (end == task) break;
 
-      (*task->m_apply)( task , & exec );
+      (*task->m_apply)(task, &exec);
 
-      queue->complete( task );
-
-    } while(1);
+      queue->complete(task);
 
+    } while (1);
   }
 
-  static
-  void execute(scheduler_type const& scheduler)
-  {
+  static void execute(scheduler_type const& scheduler) {
     using task_base_type = TaskBase;
-    using queue_type = typename scheduler_type::queue_type;
+    using queue_type     = typename scheduler_type::queue_type;
 
-    task_base_type * const end = (task_base_type *) task_base_type::EndTag ;
+    task_base_type* const end = (task_base_type*)task_base_type::EndTag;
 
     // Set default buffers
-    serial_resize_thread_team_data(
-      0,   /* global reduce buffer */
-      512, /* team reduce buffer */
-      0,   /* team shared buffer */
-      0    /* thread local buffer */
+    serial_resize_thread_team_data(0,   /* global reduce buffer */
+                                   512, /* team reduce buffer */
+                                   0,   /* team shared buffer */
+                                   0    /* thread local buffer */
     );
 
     auto* const queue = scheduler.m_queue;
 
-    Impl::HostThreadTeamData * const data = Impl::serial_get_thread_team_data();
+    Impl::HostThreadTeamData* const data = Impl::serial_get_thread_team_data();
 
-    member_type exec( scheduler, *data );
+    member_type exec(scheduler, *data);
 
     // Loop until all queues are empty
-    while ( 0 < queue->m_ready_count ) {
+    while (0 < queue->m_ready_count) {
+      task_base_type* task = end;
 
-      task_base_type * task = end ;
-
-      for ( int i = 0 ; i < queue_type::NumQueue && end == task ; ++i ) {
-        for ( int j = 0 ; j < 2 && end == task ; ++j ) {
-          task = queue_type::pop_ready_task( & queue->m_ready[i][j] );
+      for (int i = 0; i < queue_type::NumQueue && end == task; ++i) {
+        for (int j = 0; j < 2 && end == task; ++j) {
+          task = queue_type::pop_ready_task(&queue->m_ready[i][j]);
         }
       }
 
-      if ( end != task ) {
-
+      if (end != task) {
         // pop_ready_task resulted in lock == task->m_next
         // In the executing state
 
-        (*task->m_apply)( task , & exec );
+        (*task->m_apply)(task, &exec);
 
 #if 0
         printf( "TaskQueue<Serial>::executed: 0x%lx { 0x%lx 0x%lx %d %d %d }\n"
@@ -249,33 +222,29 @@ public:
 
         // If a respawn then re-enqueue otherwise the task is complete
         // and all tasks waiting on this task are updated.
-        queue->complete( task );
-      }
-      else if ( 0 != queue->m_ready_count ) {
+        queue->complete(task);
+      } else if (0 != queue->m_ready_count) {
         Kokkos::abort("TaskQueue<Serial>::execute ERROR: ready_count");
       }
     }
   }
 
   template <typename TaskType>
-  static void
-  get_function_pointer(
-    typename TaskType::function_type& ptr,
-    typename TaskType::destroy_type& dtor
-  )
-  {
-    ptr = TaskType::apply;
+  static void get_function_pointer(typename TaskType::function_type& ptr,
+                                   typename TaskType::destroy_type& dtor) {
+    ptr  = TaskType::apply;
     dtor = TaskType::destroy;
   }
 };
 
-extern template class TaskQueue< Kokkos::Serial, typename Kokkos::Serial::memory_space > ;
+extern template class TaskQueue<Kokkos::Serial,
+                                typename Kokkos::Serial::memory_space>;
 
-}} /* namespace Kokkos::Impl */
+}  // namespace Impl
+}  // namespace Kokkos
 
 //----------------------------------------------------------------------------
 //----------------------------------------------------------------------------
 
 #endif /* #if defined( KOKKOS_ENABLE_TASKDAG ) */
 #endif /* #ifndef KOKKOS_IMPL_SERIAL_TASK_HPP */
-
diff --git a/lib/kokkos/core/src/impl/Kokkos_Serial_WorkGraphPolicy.hpp b/lib/kokkos/core/src/impl/Kokkos_Serial_WorkGraphPolicy.hpp
index 07a207b556..4e26e0b138 100644
--- a/lib/kokkos/core/src/impl/Kokkos_Serial_WorkGraphPolicy.hpp
+++ b/lib/kokkos/core/src/impl/Kokkos_Serial_WorkGraphPolicy.hpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -47,55 +48,47 @@
 namespace Kokkos {
 namespace Impl {
 
-template< class FunctorType , class ... Traits >
-class ParallelFor< FunctorType ,
-                   Kokkos::WorkGraphPolicy< Traits ... > ,
-                   Kokkos::Serial
-                 >
-{
-private:
+template <class FunctorType, class... Traits>
+class ParallelFor<FunctorType, Kokkos::WorkGraphPolicy<Traits...>,
+                  Kokkos::Serial> {
+ private:
+  typedef Kokkos::WorkGraphPolicy<Traits...> Policy;
 
-  typedef Kokkos::WorkGraphPolicy< Traits ... > Policy ;
+  Policy m_policy;
+  FunctorType m_functor;
 
-  Policy       m_policy ;
-  FunctorType  m_functor ;
+  template <class TagType>
+  typename std::enable_if<std::is_same<TagType, void>::value>::type exec_one(
+      const std::int32_t w) const noexcept {
+    m_functor(w);
+  }
 
-  template< class TagType >
-  typename std::enable_if< std::is_same< TagType , void >::value >::type
-  exec_one( const std::int32_t w ) const noexcept
-    { m_functor( w ); }
+  template <class TagType>
+  typename std::enable_if<!std::is_same<TagType, void>::value>::type exec_one(
+      const std::int32_t w) const noexcept {
+    const TagType t{};
+    m_functor(t, w);
+  }
 
-  template< class TagType >
-  typename std::enable_if< ! std::is_same< TagType , void >::value >::type
-  exec_one( const std::int32_t w ) const noexcept
-    { const TagType t{}; m_functor( t , w ); }
+ public:
+  inline void execute() const noexcept {
+    // Spin until COMPLETED_TOKEN.
+    // END_TOKEN indicates no work is currently available.
 
-public:
-
-  inline
-  void execute() const noexcept
-    {
-      // Spin until COMPLETED_TOKEN.
-      // END_TOKEN indicates no work is currently available.
-        
-      for ( std::int32_t w = Policy::END_TOKEN ;
-            Policy::COMPLETED_TOKEN != ( w = m_policy.pop_work() ) ; ) {
-        if ( Policy::END_TOKEN != w ) {
-          exec_one< typename Policy::work_tag >( w );
-          m_policy.completed_work(w);
-        }
+    for (std::int32_t w = Policy::END_TOKEN;
+         Policy::COMPLETED_TOKEN != (w = m_policy.pop_work());) {
+      if (Policy::END_TOKEN != w) {
+        exec_one<typename Policy::work_tag>(w);
+        m_policy.completed_work(w);
       }
     }
+  }
 
-  inline
-  ParallelFor( const FunctorType & arg_functor
-             , const Policy      & arg_policy )
-    : m_policy( arg_policy )
-    , m_functor( arg_functor )
-    {}
+  inline ParallelFor(const FunctorType& arg_functor, const Policy& arg_policy)
+      : m_policy(arg_policy), m_functor(arg_functor) {}
 };
 
-} // namespace Impl
-} // namespace Kokkos
+}  // namespace Impl
+}  // namespace Kokkos
 
 #endif /* #define KOKKOS_SERIAL_WORKGRAPHPOLICY_HPP */
diff --git a/lib/kokkos/core/src/impl/Kokkos_SharedAlloc.cpp b/lib/kokkos/core/src/impl/Kokkos_SharedAlloc.cpp
index 77eb69d081..3688f069e5 100644
--- a/lib/kokkos/core/src/impl/Kokkos_SharedAlloc.cpp
+++ b/lib/kokkos/core/src/impl/Kokkos_SharedAlloc.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -49,129 +50,143 @@ namespace Impl {
 __thread int SharedAllocationRecord<void, void>::t_tracking_enabled = 1;
 
 #ifdef KOKKOS_DEBUG
-bool
-SharedAllocationRecord< void , void >::
-is_sane( SharedAllocationRecord< void , void > * arg_record )
-{
-  SharedAllocationRecord * const root = arg_record ? arg_record->m_root : 0 ;
+bool SharedAllocationRecord<void, void>::is_sane(
+    SharedAllocationRecord<void, void>* arg_record) {
+  SharedAllocationRecord* const root = arg_record ? arg_record->m_root : 0;
 
-  bool ok = root != 0 && root->use_count() == 0 ;
+  bool ok = root != 0 && root->use_count() == 0;
 
-  if ( ok ) {
-    SharedAllocationRecord * root_next = 0 ;
-    static constexpr SharedAllocationRecord * zero = nullptr;
+  if (ok) {
+    SharedAllocationRecord* root_next             = 0;
+    static constexpr SharedAllocationRecord* zero = nullptr;
     // Lock the list:
-    while ( ( root_next = Kokkos::atomic_exchange( & root->m_next , zero ) ) == nullptr );
+    while ((root_next = Kokkos::atomic_exchange(&root->m_next, zero)) ==
+           nullptr)
+      ;
 
-    for ( SharedAllocationRecord * rec = root_next ; ok && rec != root ; rec = rec->m_next ) {
-      const bool ok_non_null  = rec && rec->m_prev && ( rec == root || rec->m_next );
-      const bool ok_root      = ok_non_null && rec->m_root == root ;
-      const bool ok_prev_next = ok_non_null && ( rec->m_prev != root ? rec->m_prev->m_next == rec : root_next == rec );
-      const bool ok_next_prev = ok_non_null && rec->m_next->m_prev == rec ;
-      const bool ok_count     = ok_non_null && 0 <= rec->use_count() ;
+    for (SharedAllocationRecord* rec = root_next; ok && rec != root;
+         rec                         = rec->m_next) {
+      const bool ok_non_null =
+          rec && rec->m_prev && (rec == root || rec->m_next);
+      const bool ok_root = ok_non_null && rec->m_root == root;
+      const bool ok_prev_next =
+          ok_non_null &&
+          (rec->m_prev != root ? rec->m_prev->m_next == rec : root_next == rec);
+      const bool ok_next_prev = ok_non_null && rec->m_next->m_prev == rec;
+      const bool ok_count     = ok_non_null && 0 <= rec->use_count();
 
-      ok = ok_root && ok_prev_next && ok_next_prev && ok_count ;
+      ok = ok_root && ok_prev_next && ok_next_prev && ok_count;
 
-      if ( ! ok ) {
-        //Formatting dependent on sizeof(uintptr_t)
-        const char * format_string;
+      if (!ok) {
+        // Formatting dependent on sizeof(uintptr_t)
+        const char* format_string;
 
         if (sizeof(uintptr_t) == sizeof(unsigned long)) {
-          format_string = "Kokkos::Impl::SharedAllocationRecord failed is_sane: rec(0x%.12lx){ m_count(%d) m_root(0x%.12lx) m_next(0x%.12lx) m_prev(0x%.12lx) m_next->m_prev(0x%.12lx) m_prev->m_next(0x%.12lx) }\n";
-        }
-        else if (sizeof(uintptr_t) == sizeof(unsigned long long)) {
-          format_string = "Kokkos::Impl::SharedAllocationRecord failed is_sane: rec(0x%.12llx){ m_count(%d) m_root(0x%.12llx) m_next(0x%.12llx) m_prev(0x%.12llx) m_next->m_prev(0x%.12llx) m_prev->m_next(0x%.12llx) }\n";
+          format_string =
+              "Kokkos::Impl::SharedAllocationRecord failed is_sane: "
+              "rec(0x%.12lx){ m_count(%d) m_root(0x%.12lx) m_next(0x%.12lx) "
+              "m_prev(0x%.12lx) m_next->m_prev(0x%.12lx) "
+              "m_prev->m_next(0x%.12lx) }\n";
+        } else if (sizeof(uintptr_t) == sizeof(unsigned long long)) {
+          format_string =
+              "Kokkos::Impl::SharedAllocationRecord failed is_sane: "
+              "rec(0x%.12llx){ m_count(%d) m_root(0x%.12llx) m_next(0x%.12llx) "
+              "m_prev(0x%.12llx) m_next->m_prev(0x%.12llx) "
+              "m_prev->m_next(0x%.12llx) }\n";
         }
 
-        fprintf(stderr
-            , format_string
-            , reinterpret_cast< uintptr_t >( rec )
-            , rec->use_count()
-            , reinterpret_cast< uintptr_t >( rec->m_root )
-            , reinterpret_cast< uintptr_t >( rec->m_next )
-            , reinterpret_cast< uintptr_t >( rec->m_prev )
-            , reinterpret_cast< uintptr_t >( rec->m_next != NULL ? rec->m_next->m_prev : NULL )
-            , reinterpret_cast< uintptr_t >( rec->m_prev != rec->m_root ? rec->m_prev->m_next : root_next )
-            );
+        fprintf(stderr, format_string, reinterpret_cast<uintptr_t>(rec),
+                rec->use_count(), reinterpret_cast<uintptr_t>(rec->m_root),
+                reinterpret_cast<uintptr_t>(rec->m_next),
+                reinterpret_cast<uintptr_t>(rec->m_prev),
+                reinterpret_cast<uintptr_t>(
+                    rec->m_next != NULL ? rec->m_next->m_prev : NULL),
+                reinterpret_cast<uintptr_t>(rec->m_prev != rec->m_root
+                                                ? rec->m_prev->m_next
+                                                : root_next));
       }
-
     }
 
-    if ( nullptr != Kokkos::atomic_exchange( & root->m_next , root_next ) ) {
-      Kokkos::Impl::throw_runtime_exception("Kokkos::Impl::SharedAllocationRecord failed is_sane unlocking");
+    if (nullptr != Kokkos::atomic_exchange(&root->m_next, root_next)) {
+      Kokkos::Impl::throw_runtime_exception(
+          "Kokkos::Impl::SharedAllocationRecord failed is_sane unlocking");
     }
   }
-  return ok ;
+  return ok;
 }
 
 #else
 
-bool
-SharedAllocationRecord< void , void >::
-is_sane( SharedAllocationRecord< void , void > * )
-{
-  Kokkos::Impl::throw_runtime_exception("Kokkos::Impl::SharedAllocationRecord::is_sane only works with KOKKOS_DEBUG enabled");
-  return false ;
+bool SharedAllocationRecord<void, void>::is_sane(
+    SharedAllocationRecord<void, void>*) {
+  Kokkos::Impl::throw_runtime_exception(
+      "Kokkos::Impl::SharedAllocationRecord::is_sane only works with "
+      "KOKKOS_DEBUG enabled");
+  return false;
 }
-#endif //#ifdef KOKKOS_DEBUG
+#endif  //#ifdef KOKKOS_DEBUG
 
 #ifdef KOKKOS_DEBUG
-SharedAllocationRecord<void,void> *
-SharedAllocationRecord<void,void>::find( SharedAllocationRecord<void,void> * const arg_root , void * const arg_data_ptr )
-{
-  SharedAllocationRecord * root_next = 0 ;
-  static constexpr SharedAllocationRecord * zero = nullptr;
+SharedAllocationRecord<void, void>* SharedAllocationRecord<void, void>::find(
+    SharedAllocationRecord<void, void>* const arg_root,
+    void* const arg_data_ptr) {
+  SharedAllocationRecord* root_next             = 0;
+  static constexpr SharedAllocationRecord* zero = nullptr;
 
   // Lock the list:
-  while ( ( root_next = Kokkos::atomic_exchange( & arg_root->m_next , zero ) ) == nullptr );
+  while ((root_next = Kokkos::atomic_exchange(&arg_root->m_next, zero)) ==
+         nullptr)
+    ;
 
   // Iterate searching for the record with this data pointer
 
-  SharedAllocationRecord * r = root_next ;
+  SharedAllocationRecord* r = root_next;
 
-  while ( ( r != arg_root ) && ( r->data() != arg_data_ptr ) ) { r = r->m_next ; }
-
-  if ( r == arg_root ) { r = 0 ; }
-
-  if ( nullptr != Kokkos::atomic_exchange( & arg_root->m_next , root_next ) ) {
-    Kokkos::Impl::throw_runtime_exception("Kokkos::Impl::SharedAllocationRecord failed locking/unlocking");
+  while ((r != arg_root) && (r->data() != arg_data_ptr)) {
+    r = r->m_next;
   }
-  return r ;
+
+  if (r == arg_root) {
+    r = 0;
+  }
+
+  if (nullptr != Kokkos::atomic_exchange(&arg_root->m_next, root_next)) {
+    Kokkos::Impl::throw_runtime_exception(
+        "Kokkos::Impl::SharedAllocationRecord failed locking/unlocking");
+  }
+  return r;
 }
 #else
-SharedAllocationRecord<void,void> *
-SharedAllocationRecord<void,void>::find( SharedAllocationRecord<void,void> * const , void * const )
-{
-  Kokkos::Impl::throw_runtime_exception("Kokkos::Impl::SharedAllocationRecord::find only works with KOKKOS_DEBUG enabled");
+SharedAllocationRecord<void, void>* SharedAllocationRecord<void, void>::find(
+    SharedAllocationRecord<void, void>* const, void* const) {
+  Kokkos::Impl::throw_runtime_exception(
+      "Kokkos::Impl::SharedAllocationRecord::find only works with KOKKOS_DEBUG "
+      "enabled");
   return nullptr;
 }
 #endif
 
-
 /**\brief  Construct and insert into 'arg_root' tracking set.
  *         use_count is zero.
  */
-SharedAllocationRecord< void , void >::
-SharedAllocationRecord(
+SharedAllocationRecord<void, void>::SharedAllocationRecord(
 #ifdef KOKKOS_DEBUG
-                        SharedAllocationRecord<void,void> * arg_root,
+    SharedAllocationRecord<void, void>* arg_root,
 #endif
-                        SharedAllocationHeader            * arg_alloc_ptr
-                      , size_t                              arg_alloc_size
-                      , SharedAllocationRecord< void , void >::function_type  arg_dealloc
-                      )
-  : m_alloc_ptr(  arg_alloc_ptr )
-  , m_alloc_size( arg_alloc_size )
-  , m_dealloc(    arg_dealloc )
+    SharedAllocationHeader* arg_alloc_ptr, size_t arg_alloc_size,
+    SharedAllocationRecord<void, void>::function_type arg_dealloc)
+    : m_alloc_ptr(arg_alloc_ptr),
+      m_alloc_size(arg_alloc_size),
+      m_dealloc(arg_dealloc)
 #ifdef KOKKOS_DEBUG
-  , m_root( arg_root )
-  , m_prev( 0 )
-  , m_next( 0 )
+      ,
+      m_root(arg_root),
+      m_prev(0),
+      m_next(0)
 #endif
-  , m_count( 0 )
-{
-  if ( 0 != arg_alloc_ptr ) {
-
+      ,
+      m_count(0) {
+  if (0 != arg_alloc_ptr) {
 #ifdef KOKKOS_DEBUG
     // Insert into the root double-linked list for tracking
     //
@@ -179,47 +194,45 @@ SharedAllocationRecord(
     // after:   arg_root->m_next == this ; this->m_prev == arg_root ;
     //              this->m_next == next ; next->m_prev == this
 
-    m_prev = m_root ;
-    static constexpr SharedAllocationRecord * zero = nullptr;
+    m_prev                                        = m_root;
+    static constexpr SharedAllocationRecord* zero = nullptr;
 
     // Read root->m_next and lock by setting to NULL
-    while ( ( m_next = Kokkos::atomic_exchange( & m_root->m_next , zero ) ) == nullptr );
+    while ((m_next = Kokkos::atomic_exchange(&m_root->m_next, zero)) == nullptr)
+      ;
 
-    m_next->m_prev = this ;
+    m_next->m_prev = this;
 
     // memory fence before completing insertion into linked list
     Kokkos::memory_fence();
 
-    if ( nullptr != Kokkos::atomic_exchange( & m_root->m_next , this ) ) {
-      Kokkos::Impl::throw_runtime_exception("Kokkos::Impl::SharedAllocationRecord failed locking/unlocking");
+    if (nullptr != Kokkos::atomic_exchange(&m_root->m_next, this)) {
+      Kokkos::Impl::throw_runtime_exception(
+          "Kokkos::Impl::SharedAllocationRecord failed locking/unlocking");
     }
 #endif
 
-  }
-  else {
-    Kokkos::Impl::throw_runtime_exception("Kokkos::Impl::SharedAllocationRecord given NULL allocation");
+  } else {
+    Kokkos::Impl::throw_runtime_exception(
+        "Kokkos::Impl::SharedAllocationRecord given NULL allocation");
   }
 }
 
-void
-SharedAllocationRecord< void , void >::
-increment( SharedAllocationRecord< void , void > * arg_record )
-{
-  const int old_count = Kokkos::atomic_fetch_add( & arg_record->m_count , 1 );
+void SharedAllocationRecord<void, void>::increment(
+    SharedAllocationRecord<void, void>* arg_record) {
+  const int old_count = Kokkos::atomic_fetch_add(&arg_record->m_count, 1);
 
-  if ( old_count < 0 ) { // Error
-    Kokkos::Impl::throw_runtime_exception("Kokkos::Impl::SharedAllocationRecord failed increment");
+  if (old_count < 0) {  // Error
+    Kokkos::Impl::throw_runtime_exception(
+        "Kokkos::Impl::SharedAllocationRecord failed increment");
   }
 }
 
-SharedAllocationRecord< void , void > *
-SharedAllocationRecord< void , void >::
-decrement( SharedAllocationRecord< void , void > * arg_record )
-{
-  const int old_count = Kokkos::atomic_fetch_sub( & arg_record->m_count , 1 );
-
-  if ( old_count == 1 ) {
+SharedAllocationRecord<void, void>* SharedAllocationRecord<
+    void, void>::decrement(SharedAllocationRecord<void, void>* arg_record) {
+  const int old_count = Kokkos::atomic_fetch_sub(&arg_record->m_count, 1);
 
+  if (old_count == 1) {
     if (!Kokkos::is_initialized()) {
       std::stringstream ss;
       ss << "Kokkos allocation \"";
@@ -228,7 +241,8 @@ decrement( SharedAllocationRecord< void , void > * arg_record )
       auto s = ss.str();
 #ifdef KOKKOS_ENABLE_DEPRECATED_CODE
       std::cerr << s;
-      std::cerr << "This behavior is incorrect Kokkos usage, and will crash in future releases\n";
+      std::cerr << "This behavior is incorrect Kokkos usage, and will crash in "
+                   "future releases\n";
 #else
       Kokkos::Impl::throw_runtime_exception(s);
 #endif
@@ -241,124 +255,113 @@ decrement( SharedAllocationRecord< void , void > * arg_record )
     // after:   arg_record->m_prev->m_next == arg_record->m_next  &&
     //          arg_record->m_next->m_prev == arg_record->m_prev
 
-    SharedAllocationRecord * root_next = 0 ;
-    static constexpr SharedAllocationRecord * zero = nullptr;
+    SharedAllocationRecord* root_next             = 0;
+    static constexpr SharedAllocationRecord* zero = nullptr;
 
     // Lock the list:
-    while ( ( root_next = Kokkos::atomic_exchange( & arg_record->m_root->m_next , zero ) ) == nullptr );
+    while ((root_next = Kokkos::atomic_exchange(&arg_record->m_root->m_next,
+                                                zero)) == nullptr)
+      ;
 
-    arg_record->m_next->m_prev = arg_record->m_prev ;
+    arg_record->m_next->m_prev = arg_record->m_prev;
 
-    if ( root_next != arg_record ) {
-      arg_record->m_prev->m_next = arg_record->m_next ;
-    }
-    else {
+    if (root_next != arg_record) {
+      arg_record->m_prev->m_next = arg_record->m_next;
+    } else {
       // before:  arg_record->m_root == arg_record->m_prev
       // after:   arg_record->m_root == arg_record->m_next
-      root_next = arg_record->m_next ;
+      root_next = arg_record->m_next;
     }
 
     Kokkos::memory_fence();
 
     // Unlock the list:
-    if ( nullptr != Kokkos::atomic_exchange( & arg_record->m_root->m_next , root_next ) ) {
-      Kokkos::Impl::throw_runtime_exception("Kokkos::Impl::SharedAllocationRecord failed decrement unlocking");
+    if (nullptr !=
+        Kokkos::atomic_exchange(&arg_record->m_root->m_next, root_next)) {
+      Kokkos::Impl::throw_runtime_exception(
+          "Kokkos::Impl::SharedAllocationRecord failed decrement unlocking");
     }
 
-    arg_record->m_next = 0 ;
-    arg_record->m_prev = 0 ;
+    arg_record->m_next = 0;
+    arg_record->m_prev = 0;
 #endif
 
-    function_type d = arg_record->m_dealloc ;
-    (*d)( arg_record );
-    arg_record = 0 ;
-  }
-  else if ( old_count < 1 ) { // Error
-    fprintf(stderr,"Kokkos::Impl::SharedAllocationRecord '%s' failed decrement count = %d\n", arg_record->m_alloc_ptr->m_label , old_count );
+    function_type d = arg_record->m_dealloc;
+    (*d)(arg_record);
+    arg_record = 0;
+  } else if (old_count < 1) {  // Error
+    fprintf(stderr,
+            "Kokkos::Impl::SharedAllocationRecord '%s' failed decrement count "
+            "= %d\n",
+            arg_record->m_alloc_ptr->m_label, old_count);
     fflush(stderr);
-    Kokkos::Impl::throw_runtime_exception("Kokkos::Impl::SharedAllocationRecord failed decrement count");
+    Kokkos::Impl::throw_runtime_exception(
+        "Kokkos::Impl::SharedAllocationRecord failed decrement count");
   }
 
-  return arg_record ;
+  return arg_record;
 }
 
 #ifdef KOKKOS_DEBUG
-void
-SharedAllocationRecord< void , void >::
-print_host_accessible_records( std::ostream & s
-                             , const char * const space_name
-                             , const SharedAllocationRecord * const root
-                             , const bool detail )
-{
-  const SharedAllocationRecord< void , void > * r = root ;
+void SharedAllocationRecord<void, void>::print_host_accessible_records(
+    std::ostream& s, const char* const space_name,
+    const SharedAllocationRecord* const root, const bool detail) {
+  const SharedAllocationRecord<void, void>* r = root;
 
-  char buffer[256] ;
+  char buffer[256];
 
-  if ( detail ) {
+  if (detail) {
     do {
-      //Formatting dependent on sizeof(uintptr_t)
-      const char * format_string;
+      // Formatting dependent on sizeof(uintptr_t)
+      const char* format_string;
 
       if (sizeof(uintptr_t) == sizeof(unsigned long)) {
-        format_string = "%s addr( 0x%.12lx ) list( 0x%.12lx 0x%.12lx ) extent[ 0x%.12lx + %.8ld ] count(%d) dealloc(0x%.12lx) %s\n";
-      }
-      else if (sizeof(uintptr_t) == sizeof(unsigned long long)) {
-        format_string = "%s addr( 0x%.12llx ) list( 0x%.12llx 0x%.12llx ) extent[ 0x%.12llx + %.8ld ] count(%d) dealloc(0x%.12llx) %s\n";
+        format_string =
+            "%s addr( 0x%.12lx ) list( 0x%.12lx 0x%.12lx ) extent[ 0x%.12lx + "
+            "%.8ld ] count(%d) dealloc(0x%.12lx) %s\n";
+      } else if (sizeof(uintptr_t) == sizeof(unsigned long long)) {
+        format_string =
+            "%s addr( 0x%.12llx ) list( 0x%.12llx 0x%.12llx ) extent[ "
+            "0x%.12llx + %.8ld ] count(%d) dealloc(0x%.12llx) %s\n";
       }
 
-      snprintf( buffer , 256
-              , format_string
-              , space_name
-              , reinterpret_cast<uintptr_t>( r )
-              , reinterpret_cast<uintptr_t>( r->m_prev )
-              , reinterpret_cast<uintptr_t>( r->m_next )
-              , reinterpret_cast<uintptr_t>( r->m_alloc_ptr )
-              , r->m_alloc_size
-              , r->use_count()
-              , reinterpret_cast<uintptr_t>( r->m_dealloc )
-              , r->m_alloc_ptr->m_label
-              );
-      s << buffer ;
-      r = r->m_next ;
-    } while ( r != root );
-  }
-  else {
+      snprintf(buffer, 256, format_string, space_name,
+               reinterpret_cast<uintptr_t>(r),
+               reinterpret_cast<uintptr_t>(r->m_prev),
+               reinterpret_cast<uintptr_t>(r->m_next),
+               reinterpret_cast<uintptr_t>(r->m_alloc_ptr), r->m_alloc_size,
+               r->use_count(), reinterpret_cast<uintptr_t>(r->m_dealloc),
+               r->m_alloc_ptr->m_label);
+      s << buffer;
+      r = r->m_next;
+    } while (r != root);
+  } else {
     do {
-      if ( r->m_alloc_ptr ) {
-        //Formatting dependent on sizeof(uintptr_t)
-        const char * format_string;
+      if (r->m_alloc_ptr) {
+        // Formatting dependent on sizeof(uintptr_t)
+        const char* format_string;
 
         if (sizeof(uintptr_t) == sizeof(unsigned long)) {
           format_string = "%s [ 0x%.12lx + %ld ] %s\n";
-        }
-        else if (sizeof(uintptr_t) == sizeof(unsigned long long)) {
+        } else if (sizeof(uintptr_t) == sizeof(unsigned long long)) {
           format_string = "%s [ 0x%.12llx + %ld ] %s\n";
         }
 
-        snprintf( buffer , 256
-                , format_string
-                , space_name
-                , reinterpret_cast< uintptr_t >( r->data() )
-                , r->size()
-                , r->m_alloc_ptr->m_label
-                );
+        snprintf(buffer, 256, format_string, space_name,
+                 reinterpret_cast<uintptr_t>(r->data()), r->size(),
+                 r->m_alloc_ptr->m_label);
+      } else {
+        snprintf(buffer, 256, "%s [ 0 + 0 ]\n", space_name);
       }
-      else {
-        snprintf( buffer , 256 , "%s [ 0 + 0 ]\n" , space_name );
-      }
-      s << buffer ;
-      r = r->m_next ;
-    } while ( r != root );
+      s << buffer;
+      r = r->m_next;
+    } while (r != root);
   }
 }
 #else
-void
-SharedAllocationRecord< void , void >::
-print_host_accessible_records( std::ostream &
-                             , const char * const
-                             , const SharedAllocationRecord * const
-                             , const bool )
-{
+void SharedAllocationRecord<void, void>::print_host_accessible_records(
+    std::ostream&, const char* const, const SharedAllocationRecord* const,
+    const bool) {
   Kokkos::Impl::throw_runtime_exception(
       "Kokkos::Impl::SharedAllocationRecord::print_host_accessible_records"
       " only works with KOKKOS_DEBUG enabled");
@@ -367,4 +370,3 @@ print_host_accessible_records( std::ostream &
 
 } /* namespace Impl */
 } /* namespace Kokkos */
-
diff --git a/lib/kokkos/core/src/impl/Kokkos_SharedAlloc.hpp b/lib/kokkos/core/src/impl/Kokkos_SharedAlloc.hpp
index b5718573a2..b68c0834c9 100644
--- a/lib/kokkos/core/src/impl/Kokkos_SharedAlloc.hpp
+++ b/lib/kokkos/core/src/impl/Kokkos_SharedAlloc.hpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -50,73 +51,73 @@
 namespace Kokkos {
 namespace Impl {
 
-template< class MemorySpace = void , class DestroyFunctor = void >
-class SharedAllocationRecord ;
+template <class MemorySpace = void, class DestroyFunctor = void>
+class SharedAllocationRecord;
 
 class SharedAllocationHeader {
-private:
+ private:
+  typedef SharedAllocationRecord<void, void> Record;
 
-  typedef SharedAllocationRecord<void,void>  Record ;
+  static constexpr unsigned maximum_label_length =
+      (1u << 7 /* 128 */) - sizeof(Record*);
 
-  static constexpr unsigned maximum_label_length = ( 1u << 7 /* 128 */ ) - sizeof(Record*);
+  template <class, class>
+  friend class SharedAllocationRecord;
 
-  template< class , class > friend class SharedAllocationRecord ;
-
-  Record * m_record ;
-  char     m_label[ maximum_label_length ];
-
-public:
+  Record* m_record;
+  char m_label[maximum_label_length];
 
+ public:
   /* Given user memory get pointer to the header */
-  KOKKOS_INLINE_FUNCTION static
-  const SharedAllocationHeader * get_header( void * alloc_ptr )
-    { return reinterpret_cast<SharedAllocationHeader*>( reinterpret_cast<char*>(alloc_ptr) - sizeof(SharedAllocationHeader) ); }
+  KOKKOS_INLINE_FUNCTION static const SharedAllocationHeader* get_header(
+      void* alloc_ptr) {
+    return reinterpret_cast<SharedAllocationHeader*>(
+        reinterpret_cast<char*>(alloc_ptr) - sizeof(SharedAllocationHeader));
+  }
 
   KOKKOS_INLINE_FUNCTION
   const char* label() const { return m_label; }
 };
 
-template<>
-class SharedAllocationRecord< void , void > {
-protected:
+template <>
+class SharedAllocationRecord<void, void> {
+ protected:
+  static_assert(sizeof(SharedAllocationHeader) == (1u << 7 /* 128 */),
+                "sizeof(SharedAllocationHeader) != 128");
 
-  static_assert( sizeof(SharedAllocationHeader) == ( 1u << 7 /* 128 */ ) , "sizeof(SharedAllocationHeader) != 128" );
+  template <class, class>
+  friend class SharedAllocationRecord;
 
-  template< class , class > friend class SharedAllocationRecord ;
+  using function_type = void (*)(SharedAllocationRecord<void, void>*);
 
-  typedef void (* function_type )( SharedAllocationRecord<void,void> * );
-
-  SharedAllocationHeader * const m_alloc_ptr ;
-  size_t                   const m_alloc_size ;
-  function_type            const m_dealloc ;
+  SharedAllocationHeader* const m_alloc_ptr;
+  size_t const m_alloc_size;
+  function_type const m_dealloc;
 #ifdef KOKKOS_DEBUG
-  SharedAllocationRecord * const m_root ;
-  SharedAllocationRecord *       m_prev ;
-  SharedAllocationRecord *       m_next ;
+  SharedAllocationRecord* const m_root;
+  SharedAllocationRecord* m_prev;
+  SharedAllocationRecord* m_next;
 #endif
-  int                            m_count ;
+  int m_count;
 
-  SharedAllocationRecord( SharedAllocationRecord && ) = delete ;
-  SharedAllocationRecord( const SharedAllocationRecord & ) = delete ;
-  SharedAllocationRecord & operator = ( SharedAllocationRecord && ) = delete ;
-  SharedAllocationRecord & operator = ( const SharedAllocationRecord & ) = delete ;
+  SharedAllocationRecord(SharedAllocationRecord&&)      = delete;
+  SharedAllocationRecord(const SharedAllocationRecord&) = delete;
+  SharedAllocationRecord& operator=(SharedAllocationRecord&&) = delete;
+  SharedAllocationRecord& operator=(const SharedAllocationRecord&) = delete;
 
   /**\brief  Construct and insert into 'arg_root' tracking set.
    *         use_count is zero.
    */
   SharedAllocationRecord(
 #ifdef KOKKOS_DEBUG
-                          SharedAllocationRecord * arg_root,
+      SharedAllocationRecord* arg_root,
 #endif
-                          SharedAllocationHeader * arg_alloc_ptr
-                        , size_t                   arg_alloc_size
-                        , function_type            arg_dealloc
-                        );
-private:
-  
+      SharedAllocationHeader* arg_alloc_ptr, size_t arg_alloc_size,
+      function_type arg_dealloc);
+ private:
   static __thread int t_tracking_enabled;
 
-public:
+ public:
   virtual std::string get_label() const { return std::string("Unmanaged"); }
 
   static int tracking_enabled() { return t_tracking_enabled; }
@@ -134,155 +135,153 @@ public:
   virtual ~SharedAllocationRecord() {}
 
   SharedAllocationRecord()
-    : m_alloc_ptr( 0 )
-    , m_alloc_size( 0 )
-    , m_dealloc( 0 )
+      : m_alloc_ptr(nullptr),
+        m_alloc_size(0),
+        m_dealloc(nullptr)
 #ifdef KOKKOS_DEBUG
-    , m_root( this )
-    , m_prev( this )
-    , m_next( this )
+        ,
+        m_root(this),
+        m_prev(this),
+        m_next(this)
 #endif
-    , m_count( 0 )
-    {}
+        ,
+        m_count(0) {
+  }
 
-  static constexpr unsigned maximum_label_length = SharedAllocationHeader::maximum_label_length ;
+  static constexpr unsigned maximum_label_length =
+      SharedAllocationHeader::maximum_label_length;
 
   KOKKOS_INLINE_FUNCTION
-  const SharedAllocationHeader * head() const { return m_alloc_ptr ; }
+  const SharedAllocationHeader* head() const { return m_alloc_ptr; }
 
   /* User's memory begins at the end of the header */
   KOKKOS_INLINE_FUNCTION
-  void * data() const { return reinterpret_cast<void*>( m_alloc_ptr + 1 ); }
+  void* data() const { return reinterpret_cast<void*>(m_alloc_ptr + 1); }
 
   /* User's memory begins at the end of the header */
-  size_t size() const { return m_alloc_size - sizeof(SharedAllocationHeader) ; }
+  size_t size() const { return m_alloc_size - sizeof(SharedAllocationHeader); }
 
   /* Cannot be 'constexpr' because 'm_count' is volatile */
-  int use_count() const { return *static_cast<const volatile int *>(&m_count); }
+  int use_count() const { return *static_cast<const volatile int*>(&m_count); }
 
   /* Increment use count */
-  static void increment( SharedAllocationRecord * );
+  static void increment(SharedAllocationRecord*);
 
-  /* Decrement use count. If 1->0 then remove from the tracking list and invoke m_dealloc */
-  static SharedAllocationRecord * decrement( SharedAllocationRecord * );
+  /* Decrement use count. If 1->0 then remove from the tracking list and invoke
+   * m_dealloc */
+  static SharedAllocationRecord* decrement(SharedAllocationRecord*);
 
   /* Given a root record and data pointer find the record */
-  static SharedAllocationRecord * find( SharedAllocationRecord * const , void * const );
+  static SharedAllocationRecord* find(SharedAllocationRecord* const,
+                                      void* const);
 
-  /*  Sanity check for the whole set of records to which the input record belongs.
-   *  Locks the set's insert/erase operations until the sanity check is complete.
+  /*  Sanity check for the whole set of records to which the input record
+   * belongs. Locks the set's insert/erase operations until the sanity check is
+   * complete.
    */
-  static bool is_sane( SharedAllocationRecord * );
+  static bool is_sane(SharedAllocationRecord*);
 
   /*  Print host-accessible records */
-  static void print_host_accessible_records( std::ostream &
-                                           , const char * const space_name
-                                           , const SharedAllocationRecord * const root
-                                           , const bool detail );
+  static void print_host_accessible_records(
+      std::ostream&, const char* const space_name,
+      const SharedAllocationRecord* const root, const bool detail);
 };
 
 namespace {
 
 /* Taking the address of this function so make sure it is unique */
-template < class MemorySpace , class DestroyFunctor >
-void deallocate( SharedAllocationRecord<void,void> * record_ptr )
-{
-  typedef SharedAllocationRecord< MemorySpace , void > base_type ;
-  typedef SharedAllocationRecord< MemorySpace , DestroyFunctor > this_type ;
+template <class MemorySpace, class DestroyFunctor>
+void deallocate(SharedAllocationRecord<void, void>* record_ptr) {
+  typedef SharedAllocationRecord<MemorySpace, void> base_type;
+  typedef SharedAllocationRecord<MemorySpace, DestroyFunctor> this_type;
 
-  this_type * const ptr = static_cast< this_type * >(
-                          static_cast< base_type * >( record_ptr ) );
+  this_type* const ptr =
+      static_cast<this_type*>(static_cast<base_type*>(record_ptr));
 
   ptr->m_destroy.destroy_shared_allocation();
 
-  delete ptr ;
+  delete ptr;
 }
 
-}
+}  // namespace
 
 /*
- *  Memory space specialization of SharedAllocationRecord< Space , void > requires :
+ *  Memory space specialization of SharedAllocationRecord< Space , void >
+ * requires :
  *
- *  SharedAllocationRecord< Space , void > : public SharedAllocationRecord< void , void >
+ *  SharedAllocationRecord< Space , void > : public SharedAllocationRecord< void
+ * , void >
  *  {
  *    // delete allocated user memory via static_cast to this type.
  *    static void deallocate( const SharedAllocationRecord<void,void> * );
  *    Space m_space ;
  *  }
  */
-template< class MemorySpace , class DestroyFunctor >
-class SharedAllocationRecord : public SharedAllocationRecord< MemorySpace , void >
-{
-private:
+template <class MemorySpace, class DestroyFunctor>
+class SharedAllocationRecord
+    : public SharedAllocationRecord<MemorySpace, void> {
+ private:
+  SharedAllocationRecord(const MemorySpace& arg_space,
+                         const std::string& arg_label, const size_t arg_alloc)
+      /*  Allocate user memory as [ SharedAllocationHeader , user_memory ] */
+      : SharedAllocationRecord<MemorySpace, void>(
+            arg_space, arg_label, arg_alloc,
+            &Kokkos::Impl::deallocate<MemorySpace, DestroyFunctor>),
+        m_destroy() {}
 
-  SharedAllocationRecord( const MemorySpace & arg_space
-                        , const std::string & arg_label
-                        , const size_t        arg_alloc
-                        )
-    /*  Allocate user memory as [ SharedAllocationHeader , user_memory ] */
-    : SharedAllocationRecord< MemorySpace , void >( arg_space , arg_label , arg_alloc , & Kokkos::Impl::deallocate< MemorySpace , DestroyFunctor > )
-    , m_destroy()
-    {}
+  SharedAllocationRecord()                              = delete;
+  SharedAllocationRecord(const SharedAllocationRecord&) = delete;
+  SharedAllocationRecord& operator=(const SharedAllocationRecord&) = delete;
 
-  SharedAllocationRecord() = delete ;
-  SharedAllocationRecord( const SharedAllocationRecord & ) = delete ;
-  SharedAllocationRecord & operator = ( const SharedAllocationRecord & ) = delete ;
+ public:
+  DestroyFunctor m_destroy;
 
-public:
-
-  DestroyFunctor  m_destroy ;
-
-  // Allocate with a zero use count.  Incrementing the use count from zero to one
-  // inserts the record into the tracking list.  Decrementing the count from one to zero
-  // removes from the trakcing list and deallocates.
-  KOKKOS_INLINE_FUNCTION static
-  SharedAllocationRecord * allocate( const MemorySpace & arg_space
-                                   , const std::string & arg_label
-                                   , const size_t        arg_alloc
-                                   )
-    {
-#if defined( KOKKOS_ACTIVE_EXECUTION_MEMORY_SPACE_HOST )
-      return new SharedAllocationRecord( arg_space , arg_label , arg_alloc );
+  // Allocate with a zero use count.  Incrementing the use count from zero to
+  // one inserts the record into the tracking list.  Decrementing the count from
+  // one to zero removes from the trakcing list and deallocates.
+  KOKKOS_INLINE_FUNCTION static SharedAllocationRecord* allocate(
+      const MemorySpace& arg_space, const std::string& arg_label,
+      const size_t arg_alloc) {
+#if defined(KOKKOS_ACTIVE_EXECUTION_MEMORY_SPACE_HOST)
+    return new SharedAllocationRecord(arg_space, arg_label, arg_alloc);
 #else
-      return (SharedAllocationRecord *) 0 ;
+    return (SharedAllocationRecord*)0;
 #endif
-    }
+  }
 };
 
-template< class MemorySpace >
-class SharedAllocationRecord<MemorySpace,void> : public SharedAllocationRecord< void , void > {};
+template <class MemorySpace>
+class SharedAllocationRecord<MemorySpace, void>
+    : public SharedAllocationRecord<void, void> {};
 
 union SharedAllocationTracker {
-private:
-
-  typedef SharedAllocationRecord<void,void>  Record ;
+ private:
+  typedef SharedAllocationRecord<void, void> Record;
 
   enum : uintptr_t { DO_NOT_DEREF_FLAG = 0x01ul };
 
   // The allocation record resides in Host memory space
-  uintptr_t m_record_bits ;
-  Record  * m_record ;
-
-public:
+  uintptr_t m_record_bits;
+  Record* m_record;
 
+ public:
   // Use macros instead of inline functions to reduce
   // pressure on compiler optimization by reducing
-  // number of symbols and inline functons.
+  // number of symbols and inline functions.
 
-#if defined( KOKKOS_ACTIVE_EXECUTION_MEMORY_SPACE_HOST )
+#if defined(KOKKOS_ACTIVE_EXECUTION_MEMORY_SPACE_HOST)
 
-#define KOKKOS_IMPL_SHARED_ALLOCATION_TRACKER_ENABLED	\
-  Record::tracking_enabled()
+#define KOKKOS_IMPL_SHARED_ALLOCATION_TRACKER_ENABLED Record::tracking_enabled()
 
-#define KOKKOS_IMPL_SHARED_ALLOCATION_TRACKER_INCREMENT	\
-  if ( ! ( m_record_bits & DO_NOT_DEREF_FLAG ) ) Record::increment( m_record );
+#define KOKKOS_IMPL_SHARED_ALLOCATION_TRACKER_INCREMENT \
+  if (!(m_record_bits & DO_NOT_DEREF_FLAG)) Record::increment(m_record);
 
-#define KOKKOS_IMPL_SHARED_ALLOCATION_TRACKER_DECREMENT	\
-  if ( ! ( m_record_bits & DO_NOT_DEREF_FLAG ) ) Record::decrement( m_record );
+#define KOKKOS_IMPL_SHARED_ALLOCATION_TRACKER_DECREMENT \
+  if (!(m_record_bits & DO_NOT_DEREF_FLAG)) Record::decrement(m_record);
 
 #else
 
-#define KOKKOS_IMPL_SHARED_ALLOCATION_TRACKER_ENABLED  0
+#define KOKKOS_IMPL_SHARED_ALLOCATION_TRACKER_ENABLED 0
 
 #define KOKKOS_IMPL_SHARED_ALLOCATION_TRACKER_INCREMENT /* */
 
@@ -290,53 +289,50 @@ public:
 
 #endif
 
-#define KOKKOS_IMPL_SHARED_ALLOCATION_CARRY_RECORD_BITS(rhs, override_tracking) \
-  (((!override_tracking) || (rhs.m_record_bits & DO_NOT_DEREF_FLAG) \
-    || (!KOKKOS_IMPL_SHARED_ALLOCATION_TRACKER_ENABLED)) \
-  ? rhs.m_record_bits | DO_NOT_DEREF_FLAG \
-  : rhs.m_record_bits)
+#define KOKKOS_IMPL_SHARED_ALLOCATION_CARRY_RECORD_BITS(rhs,               \
+                                                        override_tracking) \
+  (((!override_tracking) || (rhs.m_record_bits & DO_NOT_DEREF_FLAG) ||     \
+    (!KOKKOS_IMPL_SHARED_ALLOCATION_TRACKER_ENABLED))                      \
+       ? rhs.m_record_bits | DO_NOT_DEREF_FLAG                             \
+       : rhs.m_record_bits)
 
   /** \brief  Assign a specialized record */
-  inline
-  void assign_allocated_record_to_uninitialized( Record * arg_record )
-    {
-      if ( arg_record ) {
-        Record::increment( m_record = arg_record );
-      }
-      else {
-        m_record_bits = DO_NOT_DEREF_FLAG ;
-      }
+  inline void assign_allocated_record_to_uninitialized(Record* arg_record) {
+    if (arg_record) {
+      Record::increment(m_record = arg_record);
+    } else {
+      m_record_bits = DO_NOT_DEREF_FLAG;
     }
+  }
 
-  template< class MemorySpace >
-  constexpr
-  SharedAllocationRecord< MemorySpace , void > *
-  get_record() const noexcept
-    {
-      return ( m_record_bits & DO_NOT_DEREF_FLAG )
-             ? (SharedAllocationRecord< MemorySpace,void>*) 0
-             : static_cast<SharedAllocationRecord<MemorySpace,void>*>(m_record);
-    }
+  template <class MemorySpace>
+  constexpr SharedAllocationRecord<MemorySpace, void>* get_record() const
+      noexcept {
+    return (m_record_bits & DO_NOT_DEREF_FLAG)
+               ? (SharedAllocationRecord<MemorySpace, void>*)0
+               : static_cast<SharedAllocationRecord<MemorySpace, void>*>(
+                     m_record);
+  }
 
-  template< class MemorySpace >
-  std::string get_label() const
-    {
-      return ( m_record_bits == DO_NOT_DEREF_FLAG )
-             ? std::string()
-             : reinterpret_cast< SharedAllocationRecord< MemorySpace , void > * >( m_record_bits & ~DO_NOT_DEREF_FLAG )->get_label()
-             ;
-    }
+  template <class MemorySpace>
+  std::string get_label() const {
+    return (m_record_bits == DO_NOT_DEREF_FLAG)
+               ? std::string()
+               : reinterpret_cast<SharedAllocationRecord<MemorySpace, void>*>(
+                     m_record_bits & ~DO_NOT_DEREF_FLAG)
+                     ->get_label();
+  }
 
   KOKKOS_INLINE_FUNCTION
-  int use_count() const
-    {
-#if defined( KOKKOS_ACTIVE_EXECUTION_MEMORY_SPACE_HOST )
-      Record * const tmp = reinterpret_cast<Record*>( m_record_bits & ~DO_NOT_DEREF_FLAG );
-      return ( tmp ? tmp->use_count() : 0 );
+  int use_count() const {
+#if defined(KOKKOS_ACTIVE_EXECUTION_MEMORY_SPACE_HOST)
+    Record* const tmp =
+        reinterpret_cast<Record*>(m_record_bits & ~DO_NOT_DEREF_FLAG);
+    return (tmp ? tmp->use_count() : 0);
 #else
-      return 0 ;
+    return 0;
 #endif
-    }
+  }
 
   KOKKOS_INLINE_FUNCTION
   bool has_record() const {
@@ -344,84 +340,75 @@ public:
   }
 
   KOKKOS_FORCEINLINE_FUNCTION
-  void clear()
-    {
-      // If this is tracking then must decrement
-      KOKKOS_IMPL_SHARED_ALLOCATION_TRACKER_DECREMENT
-      // Reset to default constructed value.
-      m_record_bits = DO_NOT_DEREF_FLAG ;
-    }
+  void clear() {
+    // If this is tracking then must decrement
+    KOKKOS_IMPL_SHARED_ALLOCATION_TRACKER_DECREMENT
+    // Reset to default constructed value.
+    m_record_bits = DO_NOT_DEREF_FLAG;
+  }
 
   // Copy:
   KOKKOS_FORCEINLINE_FUNCTION
-  ~SharedAllocationTracker()
-    { KOKKOS_IMPL_SHARED_ALLOCATION_TRACKER_DECREMENT }
+  ~SharedAllocationTracker(){KOKKOS_IMPL_SHARED_ALLOCATION_TRACKER_DECREMENT}
 
-  KOKKOS_FORCEINLINE_FUNCTION
-  constexpr SharedAllocationTracker()
-    : m_record_bits( DO_NOT_DEREF_FLAG ) {}
+  KOKKOS_FORCEINLINE_FUNCTION constexpr SharedAllocationTracker()
+      : m_record_bits(DO_NOT_DEREF_FLAG) {}
 
   // Move:
 
   KOKKOS_FORCEINLINE_FUNCTION
-  SharedAllocationTracker( SharedAllocationTracker && rhs )
-    : m_record_bits( rhs.m_record_bits )
-    { rhs.m_record_bits = DO_NOT_DEREF_FLAG ; }
+  SharedAllocationTracker(SharedAllocationTracker&& rhs)
+      : m_record_bits(rhs.m_record_bits) {
+    rhs.m_record_bits = DO_NOT_DEREF_FLAG;
+  }
 
   KOKKOS_FORCEINLINE_FUNCTION
-  SharedAllocationTracker & operator = ( SharedAllocationTracker && rhs )
-    {
-      auto swap_tmp = m_record_bits;
-      m_record_bits = rhs.m_record_bits;
-      rhs.m_record_bits = swap_tmp;
-      return *this ;
-    }
+  SharedAllocationTracker& operator=(SharedAllocationTracker&& rhs) {
+    auto swap_tmp     = m_record_bits;
+    m_record_bits     = rhs.m_record_bits;
+    rhs.m_record_bits = swap_tmp;
+    return *this;
+  }
 
   // Copy:
 
   KOKKOS_FORCEINLINE_FUNCTION
-  SharedAllocationTracker( const SharedAllocationTracker & rhs )
-    : m_record_bits( KOKKOS_IMPL_SHARED_ALLOCATION_CARRY_RECORD_BITS(rhs, true) )
-    {
-      KOKKOS_IMPL_SHARED_ALLOCATION_TRACKER_INCREMENT
-    }
+  SharedAllocationTracker(const SharedAllocationTracker& rhs)
+      : m_record_bits(KOKKOS_IMPL_SHARED_ALLOCATION_CARRY_RECORD_BITS(
+            rhs, true)){KOKKOS_IMPL_SHARED_ALLOCATION_TRACKER_INCREMENT}
 
-  /** \brief  Copy construction may disable tracking. */
-  KOKKOS_FORCEINLINE_FUNCTION
-  SharedAllocationTracker( const SharedAllocationTracker & rhs
-                         , const bool enable_tracking )
-    : m_record_bits( KOKKOS_IMPL_SHARED_ALLOCATION_CARRY_RECORD_BITS(rhs, enable_tracking) )
-    { KOKKOS_IMPL_SHARED_ALLOCATION_TRACKER_INCREMENT }
+        /** \brief  Copy construction may disable tracking. */
+        KOKKOS_FORCEINLINE_FUNCTION SharedAllocationTracker(
+            const SharedAllocationTracker& rhs, const bool enable_tracking)
+      : m_record_bits(KOKKOS_IMPL_SHARED_ALLOCATION_CARRY_RECORD_BITS(
+            rhs,
+            enable_tracking)){KOKKOS_IMPL_SHARED_ALLOCATION_TRACKER_INCREMENT}
 
-  KOKKOS_FORCEINLINE_FUNCTION
-  SharedAllocationTracker & operator = ( const SharedAllocationTracker & rhs )
-    {
-      // If this is tracking then must decrement
-      KOKKOS_IMPL_SHARED_ALLOCATION_TRACKER_DECREMENT
-      m_record_bits = KOKKOS_IMPL_SHARED_ALLOCATION_CARRY_RECORD_BITS(rhs, true);
-      KOKKOS_IMPL_SHARED_ALLOCATION_TRACKER_INCREMENT
-      return *this ;
-    }
+        KOKKOS_FORCEINLINE_FUNCTION SharedAllocationTracker
+        &
+        operator=(const SharedAllocationTracker& rhs) {
+    // If this is tracking then must decrement
+    KOKKOS_IMPL_SHARED_ALLOCATION_TRACKER_DECREMENT
+    m_record_bits = KOKKOS_IMPL_SHARED_ALLOCATION_CARRY_RECORD_BITS(rhs, true);
+    KOKKOS_IMPL_SHARED_ALLOCATION_TRACKER_INCREMENT
+    return *this;
+  }
 
   /** \brief  Copy assignment may disable tracking */
   KOKKOS_FORCEINLINE_FUNCTION
-  void assign( const SharedAllocationTracker & rhs
-             , const bool enable_tracking )
-    {
-      KOKKOS_IMPL_SHARED_ALLOCATION_TRACKER_DECREMENT
-      m_record_bits = KOKKOS_IMPL_SHARED_ALLOCATION_CARRY_RECORD_BITS(rhs, enable_tracking);
-      KOKKOS_IMPL_SHARED_ALLOCATION_TRACKER_INCREMENT
-    }
+  void assign(const SharedAllocationTracker& rhs, const bool enable_tracking) {
+    KOKKOS_IMPL_SHARED_ALLOCATION_TRACKER_DECREMENT
+    m_record_bits =
+        KOKKOS_IMPL_SHARED_ALLOCATION_CARRY_RECORD_BITS(rhs, enable_tracking);
+    KOKKOS_IMPL_SHARED_ALLOCATION_TRACKER_INCREMENT
+  }
 
 #undef KOKKOS_IMPL_SHARED_ALLOCATION_TRACKER_ENABLED
 #undef KOKKOS_IMPL_SHARED_ALLOCATION_TRACKER_INCREMENT
 #undef KOKKOS_IMPL_SHARED_ALLOCATION_TRACKER_DECREMENT
-
 };
 
-
 } /* namespace Impl */
 } /* namespace Kokkos */
 
 #endif
-
diff --git a/lib/kokkos/core/src/impl/Kokkos_SimpleTaskScheduler.hpp b/lib/kokkos/core/src/impl/Kokkos_SimpleTaskScheduler.hpp
index c2dbc96814..f01bdce17b 100644
--- a/lib/kokkos/core/src/impl/Kokkos_SimpleTaskScheduler.hpp
+++ b/lib/kokkos/core/src/impl/Kokkos_SimpleTaskScheduler.hpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -47,7 +48,7 @@
 //----------------------------------------------------------------------------
 
 #include <Kokkos_Macros.hpp>
-#if defined( KOKKOS_ENABLE_TASKDAG )
+#if defined(KOKKOS_ENABLE_TASKDAG)
 
 #include <Kokkos_Core_fwd.hpp>
 #include <Kokkos_TaskScheduler_fwd.hpp>
@@ -77,135 +78,120 @@ template <class T>
 struct DefaultDestroy {
   T* managed_object;
   KOKKOS_FUNCTION
-  void destroy_shared_allocation() {
-    managed_object->~T();
-  }
+  void destroy_shared_allocation() { managed_object->~T(); }
 };
 
-
 template <class ExecutionSpace>
 class ExecutionSpaceInstanceStorage
-  : private NoUniqueAddressMemberEmulation<ExecutionSpace, DefaultCtorNotOnDevice>
-{
-private:
+    : private NoUniqueAddressMemberEmulation<ExecutionSpace,
+                                             DefaultCtorNotOnDevice> {
+ private:
+  using base_t =
+      NoUniqueAddressMemberEmulation<ExecutionSpace, DefaultCtorNotOnDevice>;
 
-  using base_t = NoUniqueAddressMemberEmulation<ExecutionSpace, DefaultCtorNotOnDevice>;
-
-protected:
-
-  constexpr explicit
-  ExecutionSpaceInstanceStorage()
-    : base_t()
-  { }
+ protected:
+  constexpr explicit ExecutionSpaceInstanceStorage() : base_t() {}
 
   KOKKOS_INLINE_FUNCTION
-  constexpr explicit
-  ExecutionSpaceInstanceStorage(ExecutionSpace const& arg_execution_space)
-    : base_t(arg_execution_space)
-  { }
+  constexpr explicit ExecutionSpaceInstanceStorage(
+      ExecutionSpace const& arg_execution_space)
+      : base_t(arg_execution_space) {}
 
   KOKKOS_INLINE_FUNCTION
-  constexpr explicit
-  ExecutionSpaceInstanceStorage(ExecutionSpace&& arg_execution_space)
-    : base_t(std::move(arg_execution_space))
-  { }
+  constexpr explicit ExecutionSpaceInstanceStorage(
+      ExecutionSpace&& arg_execution_space)
+      : base_t(std::move(arg_execution_space)) {}
 
   KOKKOS_INLINE_FUNCTION
-  ExecutionSpace& execution_space_instance() &
-  {
+  ExecutionSpace& execution_space_instance() & {
     return this->no_unique_address_data_member();
   }
 
   KOKKOS_INLINE_FUNCTION
-  ExecutionSpace const& execution_space_instance() const &
-  {
+  ExecutionSpace const& execution_space_instance() const& {
     return this->no_unique_address_data_member();
   }
 
   KOKKOS_INLINE_FUNCTION
-  ExecutionSpace&& execution_space_instance() &&
-  {
+  ExecutionSpace&& execution_space_instance() && {
     return std::move(*this).no_unique_address_data_member();
   }
 };
 
-
 template <class MemorySpace>
 class MemorySpaceInstanceStorage
-  : private NoUniqueAddressMemberEmulation<MemorySpace, DefaultCtorNotOnDevice>
-{
-private:
+    : private NoUniqueAddressMemberEmulation<MemorySpace,
+                                             DefaultCtorNotOnDevice> {
+ private:
+  using base_t =
+      NoUniqueAddressMemberEmulation<MemorySpace, DefaultCtorNotOnDevice>;
 
-  using base_t = NoUniqueAddressMemberEmulation<MemorySpace, DefaultCtorNotOnDevice>;
-
-protected:
-
-  MemorySpaceInstanceStorage()
-    : base_t()
-  { }
+ protected:
+  MemorySpaceInstanceStorage() : base_t() {}
 
   KOKKOS_INLINE_FUNCTION
   MemorySpaceInstanceStorage(MemorySpace const& arg_memory_space)
-    : base_t(arg_memory_space)
-  { }
+      : base_t(arg_memory_space) {}
 
   KOKKOS_INLINE_FUNCTION
-  constexpr explicit
-  MemorySpaceInstanceStorage(MemorySpace&& arg_memory_space)
-    : base_t(arg_memory_space)
-  { }
+  constexpr explicit MemorySpaceInstanceStorage(MemorySpace&& arg_memory_space)
+      : base_t(arg_memory_space) {}
 
   KOKKOS_INLINE_FUNCTION
-  MemorySpace& memory_space_instance() &
-  {
+  MemorySpace& memory_space_instance() & {
     return this->no_unique_address_data_member();
   }
 
   KOKKOS_INLINE_FUNCTION
-  MemorySpace const& memory_space_instance() const &
-  {
+  MemorySpace const& memory_space_instance() const& {
     return this->no_unique_address_data_member();
   }
 
   KOKKOS_INLINE_FUNCTION
-  MemorySpace&& memory_space_instance() &&
-  {
+  MemorySpace&& memory_space_instance() && {
     return std::move(*this).no_unique_address_data_member();
   }
 };
 
-} // end namespace Impl
+}  // end namespace Impl
 
 //----------------------------------------------------------------------------
 //----------------------------------------------------------------------------
 
 template <class ExecSpace, class QueueType>
-  // requires ExecutionSpace<ExecSpace> && TaskQueue<QueueType>
+// requires ExecutionSpace<ExecSpace> && TaskQueue<QueueType>
 class SimpleTaskScheduler
-  : public Impl::TaskSchedulerBase,
-    private Impl::ExecutionSpaceInstanceStorage<ExecSpace>,
-    private Impl::MemorySpaceInstanceStorage<typename QueueType::memory_space>,
-    private Impl::NoUniqueAddressMemberEmulation<typename QueueType::team_scheduler_info_type>
-{
-public:
-  // TODO @tasking @generalization (maybe?) don't force QueueType to be complete here
+    : public Impl::TaskSchedulerBase,
+      private Impl::ExecutionSpaceInstanceStorage<ExecSpace>,
+      private Impl::MemorySpaceInstanceStorage<
+          typename QueueType::memory_space>,
+      private Impl::NoUniqueAddressMemberEmulation<
+          typename QueueType::team_scheduler_info_type> {
+ public:
+  // TODO @tasking @generalization (maybe?) don't force QueueType to be complete
+  // here
 
-  using scheduler_type = SimpleTaskScheduler; // tag as scheduler concept
+  using scheduler_type  = SimpleTaskScheduler;  // tag as scheduler concept
   using execution_space = ExecSpace;
   using task_queue_type = QueueType;
-  using memory_space = typename task_queue_type::memory_space;
-  using memory_pool = typename task_queue_type::memory_pool;
+  using memory_space    = typename task_queue_type::memory_space;
+  using memory_pool     = typename task_queue_type::memory_pool;
 
-  using team_scheduler_info_type = typename task_queue_type::team_scheduler_info_type;
-  using task_scheduling_info_type = typename task_queue_type::task_scheduling_info_type;
+  using team_scheduler_info_type =
+      typename task_queue_type::team_scheduler_info_type;
+  using task_scheduling_info_type =
+      typename task_queue_type::task_scheduling_info_type;
   using specialization = Impl::TaskQueueSpecialization<SimpleTaskScheduler>;
-  using member_type = typename specialization::member_type;
+  using member_type    = typename specialization::member_type;
 
   template <class Functor>
-  using runnable_task_type = typename QueueType::template runnable_task_type<Functor, SimpleTaskScheduler>;
+  using runnable_task_type =
+      typename QueueType::template runnable_task_type<Functor,
+                                                      SimpleTaskScheduler>;
 
   using task_base_type = typename task_queue_type::task_base_type;
-  using runnable_task_base_type = typename task_queue_type::runnable_task_base_type;
+  using runnable_task_base_type =
+      typename task_queue_type::runnable_task_base_type;
 
   using task_queue_traits = typename QueueType::task_queue_traits;
 
@@ -214,268 +200,228 @@ public:
   template <class FunctorType>
   using future_type_for_functor = future_type<typename FunctorType::value_type>;
 
-private:
-
+ private:
   template <typename, typename>
   friend class BasicFuture;
 
   using track_type = Kokkos::Impl::SharedAllocationTracker;
-  using execution_space_storage = Impl::ExecutionSpaceInstanceStorage<execution_space>;
+  using execution_space_storage =
+      Impl::ExecutionSpaceInstanceStorage<execution_space>;
   using memory_space_storage = Impl::MemorySpaceInstanceStorage<memory_space>;
-  using team_scheduler_info_storage = Impl::NoUniqueAddressMemberEmulation<team_scheduler_info_type>;
+  using team_scheduler_info_storage =
+      Impl::NoUniqueAddressMemberEmulation<team_scheduler_info_type>;
 
   track_type m_track;
   task_queue_type* m_queue = nullptr;
 
   KOKKOS_INLINE_FUNCTION
-  static constexpr task_base_type* _get_task_ptr(std::nullptr_t) { return nullptr; }
+  static constexpr task_base_type* _get_task_ptr(std::nullptr_t) {
+    return nullptr;
+  }
 
   template <class ValueType>
-  KOKKOS_INLINE_FUNCTION
-  static constexpr task_base_type* _get_task_ptr(future_type<ValueType>&& f)
-  {
+  KOKKOS_INLINE_FUNCTION static constexpr task_base_type* _get_task_ptr(
+      future_type<ValueType>&& f) {
     return f.m_task;
   }
 
-  template <
-    int TaskEnum,
-    class DepTaskType,
-    class FunctorType
-  >
+  template <int TaskEnum, class DepTaskType, class FunctorType>
   KOKKOS_FUNCTION
-  future_type_for_functor<typename std::decay<FunctorType>::type>
-  _spawn_impl(
-    DepTaskType arg_predecessor_task,
-    TaskPriority arg_priority,
-    typename runnable_task_base_type::function_type apply_function_ptr,
-    typename runnable_task_base_type::destroy_type destroy_function_ptr,
-    FunctorType&& functor
-  )
-  {
+      future_type_for_functor<typename std::decay<FunctorType>::type>
+      _spawn_impl(
+          DepTaskType arg_predecessor_task, TaskPriority arg_priority,
+          typename runnable_task_base_type::function_type apply_function_ptr,
+          typename runnable_task_base_type::destroy_type destroy_function_ptr,
+          FunctorType&& functor) {
     KOKKOS_EXPECTS(m_queue != nullptr);
 
-    using functor_future_type = future_type_for_functor<typename std::decay<FunctorType>::type>;
-    using task_type = typename task_queue_type::template runnable_task_type<
-      FunctorType, scheduler_type
-    >;
+    using functor_future_type =
+        future_type_for_functor<typename std::decay<FunctorType>::type>;
+    using task_type =
+        typename task_queue_type::template runnable_task_type<FunctorType,
+                                                              scheduler_type>;
 
     // Reference count starts at two:
     //   +1 for the matching decrement when task is complete
     //   +1 for the future
     auto& runnable_task = *m_queue->template allocate_and_construct<task_type>(
-      /* functor = */ std::forward<FunctorType>(functor),
-      /* apply_function_ptr = */ apply_function_ptr,
-      /* task_type = */ static_cast<Impl::TaskType>(TaskEnum),
-      /* priority = */ arg_priority,
-      /* queue_base = */ m_queue,
-      /* initial_reference_count = */ 2
-    );
+        /* functor = */ std::forward<FunctorType>(functor),
+        /* apply_function_ptr = */ apply_function_ptr,
+        /* task_type = */ static_cast<Impl::TaskType>(TaskEnum),
+        /* priority = */ arg_priority,
+        /* queue_base = */ m_queue,
+        /* initial_reference_count = */ 2);
 
-    if(arg_predecessor_task != nullptr) {
+    if (arg_predecessor_task != nullptr) {
       m_queue->initialize_scheduling_info_from_predecessor(
-        runnable_task, *arg_predecessor_task
-      );
+          runnable_task, *arg_predecessor_task);
       runnable_task.set_predecessor(*arg_predecessor_task);
       arg_predecessor_task->decrement_and_check_reference_count();
-    }
-    else {
+    } else {
       m_queue->initialize_scheduling_info_from_team_scheduler_info(
-        runnable_task, team_scheduler_info()
-      );
+          runnable_task, team_scheduler_info());
     }
 
     auto rv = functor_future_type(&runnable_task);
 
-    Kokkos::memory_fence(); // fence to ensure dependent stores are visible
+    Kokkos::memory_fence();  // fence to ensure dependent stores are visible
 
-    m_queue->schedule_runnable(
-      std::move(runnable_task),
-      team_scheduler_info()
-    );
-    // note that task may be already completed even here, so don't touch it again
+    m_queue->schedule_runnable(std::move(runnable_task), team_scheduler_info());
+    // note that task may be already completed even here, so don't touch it
+    // again
 
     return rv;
   }
 
-
-public:
-
+ public:
   //----------------------------------------------------------------------------
   // <editor-fold desc="Constructors, destructor, and assignment"> {{{2
 
   SimpleTaskScheduler() = default;
 
-  explicit
-  SimpleTaskScheduler(
-    execution_space const& arg_execution_space,
-    memory_space const& arg_memory_space,
-    memory_pool const& arg_memory_pool
-  ) : execution_space_storage(arg_execution_space),
-      memory_space_storage(arg_memory_space)
-  {
+  explicit SimpleTaskScheduler(execution_space const& arg_execution_space,
+                               memory_space const& arg_memory_space,
+                               memory_pool const& arg_memory_pool)
+      : execution_space_storage(arg_execution_space),
+        memory_space_storage(arg_memory_space) {
     // Ask the task queue how much space it needs (usually will just be
     // sizeof(task_queue_type), but some queues may need additional storage
     // dependent on runtime conditions or properties of the execution space)
     auto const allocation_size = task_queue_type::task_queue_allocation_size(
-      arg_execution_space,
-      arg_memory_space,
-      arg_memory_pool
-    );
+        arg_execution_space, arg_memory_space, arg_memory_pool);
 
-    // TODO @tasking @generalization DSH better encapsulation of the SharedAllocationRecord pattern
-    using record_type = Impl::SharedAllocationRecord<
-      memory_space, Impl::DefaultDestroy<task_queue_type>
-    >;
+    // TODO @tasking @generalization DSH better encapsulation of the
+    // SharedAllocationRecord pattern
+    using record_type =
+        Impl::SharedAllocationRecord<memory_space,
+                                     Impl::DefaultDestroy<task_queue_type> >;
 
     // Allocate space for the task queue
-    auto* record = record_type::allocate(
-      memory_space(), "TaskQueue", allocation_size
-    );
-    m_queue = new (record->data()) task_queue_type(
-      arg_execution_space,
-      arg_memory_space,
-      arg_memory_pool
-    );
+    auto* record =
+        record_type::allocate(memory_space(), "TaskQueue", allocation_size);
+    m_queue = new (record->data())
+        task_queue_type(arg_execution_space, arg_memory_space, arg_memory_pool);
     record->m_destroy.managed_object = m_queue;
     m_track.assign_allocated_record_to_uninitialized(record);
   }
 
-  explicit
-  SimpleTaskScheduler(
-    execution_space const& arg_execution_space,
-    memory_pool const& pool
-  ) : SimpleTaskScheduler(arg_execution_space, memory_space{}, pool)
-  { /* forwarding ctor, must be empty */ }
+  explicit SimpleTaskScheduler(execution_space const& arg_execution_space,
+                               memory_pool const& pool)
+      : SimpleTaskScheduler(arg_execution_space, memory_space{},
+                            pool) { /* forwarding ctor, must be empty */
+  }
 
-  explicit
-  SimpleTaskScheduler(memory_pool const& pool)
-    : SimpleTaskScheduler(execution_space{}, memory_space{}, pool)
-  { /* forwarding ctor, must be empty */ }
+  explicit SimpleTaskScheduler(memory_pool const& pool)
+      : SimpleTaskScheduler(execution_space{}, memory_space{},
+                            pool) { /* forwarding ctor, must be empty */
+  }
 
-  SimpleTaskScheduler(
-    memory_space const & arg_memory_space,
-    size_t const mempool_capacity,
-    unsigned const mempool_min_block_size, // = 1u << 6
-    unsigned const mempool_max_block_size, // = 1u << 10
-    unsigned const mempool_superblock_size // = 1u << 12
-  ) : SimpleTaskScheduler(
-        execution_space{},
-        arg_memory_space,
-        memory_pool(
-          arg_memory_space, mempool_capacity, mempool_min_block_size,
-          mempool_max_block_size, mempool_superblock_size
-        )
-      )
-  { /* forwarding ctor, must be empty */ }
+  SimpleTaskScheduler(memory_space const& arg_memory_space,
+                      size_t const mempool_capacity,
+                      unsigned const mempool_min_block_size,  // = 1u << 6
+                      unsigned const mempool_max_block_size,  // = 1u << 10
+                      unsigned const mempool_superblock_size  // = 1u << 12
+                      )
+      : SimpleTaskScheduler(
+            execution_space{}, arg_memory_space,
+            memory_pool(
+                arg_memory_space, mempool_capacity, mempool_min_block_size,
+                mempool_max_block_size,
+                mempool_superblock_size)) { /* forwarding ctor, must be empty */
+  }
 
   // </editor-fold> end Constructors, destructor, and assignment }}}2
   //----------------------------------------------------------------------------
 
   // Note that this is an expression of shallow constness
   KOKKOS_INLINE_FUNCTION
-  task_queue_type& queue() const
-  {
+  task_queue_type& queue() const {
     KOKKOS_EXPECTS(m_queue != nullptr);
     return *m_queue;
   }
 
   KOKKOS_INLINE_FUNCTION
-  SimpleTaskScheduler
-  get_team_scheduler(int rank_in_league) const noexcept
-  {
+  SimpleTaskScheduler get_team_scheduler(int rank_in_league) const noexcept {
     KOKKOS_EXPECTS(m_queue != nullptr);
-    auto rv = SimpleTaskScheduler{ *this };
-    rv.team_scheduler_info() = m_queue->initial_team_scheduler_info(rank_in_league);
+    auto rv = SimpleTaskScheduler{*this};
+    rv.team_scheduler_info() =
+        m_queue->initial_team_scheduler_info(rank_in_league);
     return rv;
   }
 
   KOKKOS_INLINE_FUNCTION
-  execution_space const& get_execution_space() const { return this->execution_space_instance(); }
+  execution_space const& get_execution_space() const {
+    return this->execution_space_instance();
+  }
 
   KOKKOS_INLINE_FUNCTION
-  team_scheduler_info_type& team_scheduler_info() &
-  {
+  team_scheduler_info_type& team_scheduler_info() & {
     return this->team_scheduler_info_storage::no_unique_address_data_member();
   }
 
   KOKKOS_INLINE_FUNCTION
-  team_scheduler_info_type const& team_scheduler_info() const &
-  {
+  team_scheduler_info_type const& team_scheduler_info() const& {
     return this->team_scheduler_info_storage::no_unique_address_data_member();
   }
 
   //----------------------------------------------------------------------------
 
-  #ifdef KOKKOS_ENABLE_DEPRECATED_CODE
+#ifdef KOKKOS_ENABLE_DEPRECATED_CODE
   // For backwards compatibility purposes only
   KOKKOS_DEPRECATED
   KOKKOS_INLINE_FUNCTION
-  memory_pool*
-  memory() const noexcept KOKKOS_DEPRECATED_TRAILING_ATTRIBUTE
-  {
-    if(m_queue != nullptr) return &(m_queue->get_memory_pool());
-    else return nullptr;
+  memory_pool* memory() const noexcept KOKKOS_DEPRECATED_TRAILING_ATTRIBUTE {
+    if (m_queue != nullptr)
+      return &(m_queue->get_memory_pool());
+    else
+      return nullptr;
   }
-  #endif
+#endif
 
   //----------------------------------------------------------------------------
 
   template <int TaskEnum, typename DepFutureType, typename FunctorType>
-  KOKKOS_FUNCTION
-  static
-  Kokkos::BasicFuture<typename FunctorType::value_type, scheduler_type>
-  spawn(
-    Impl::TaskPolicyWithScheduler<TaskEnum, scheduler_type, DepFutureType>&& arg_policy,
-    typename runnable_task_base_type::function_type arg_function,
-    typename runnable_task_base_type::destroy_type arg_destroy,
-    FunctorType&& arg_functor
-  )
-  {
-    return std::move(arg_policy.scheduler()).template _spawn_impl<TaskEnum>(
-      _get_task_ptr(std::move(arg_policy.predecessor())),
-      arg_policy.priority(),
-      arg_function,
-      arg_destroy,
-      std::forward<FunctorType>(arg_functor)
-    );
+  KOKKOS_FUNCTION static Kokkos::BasicFuture<typename FunctorType::value_type,
+                                             scheduler_type>
+  spawn(Impl::TaskPolicyWithScheduler<TaskEnum, scheduler_type, DepFutureType>&&
+            arg_policy,
+        typename runnable_task_base_type::function_type arg_function,
+        typename runnable_task_base_type::destroy_type arg_destroy,
+        FunctorType&& arg_functor) {
+    return std::move(arg_policy.scheduler())
+        .template _spawn_impl<TaskEnum>(
+            _get_task_ptr(std::move(arg_policy.predecessor())),
+            arg_policy.priority(), arg_function, arg_destroy,
+            std::forward<FunctorType>(arg_functor));
   }
 
   template <int TaskEnum, typename DepFutureType, typename FunctorType>
-  KOKKOS_FUNCTION
-  Kokkos::BasicFuture<typename FunctorType::value_type, scheduler_type>
-  spawn(
-    Impl::TaskPolicyWithPredecessor<TaskEnum, DepFutureType>&& arg_policy,
-    FunctorType&& arg_functor
-  )
-  {
-    static_assert(
-      std::is_same<typename DepFutureType::scheduler_type, scheduler_type>::value,
-      "Can't create a task policy from a scheduler and a future from a different scheduler"
-    );
+  KOKKOS_FUNCTION Kokkos::BasicFuture<typename FunctorType::value_type,
+                                      scheduler_type>
+  spawn(Impl::TaskPolicyWithPredecessor<TaskEnum, DepFutureType>&& arg_policy,
+        FunctorType&& arg_functor) {
+    static_assert(std::is_same<typename DepFutureType::scheduler_type,
+                               scheduler_type>::value,
+                  "Can't create a task policy from a scheduler and a future "
+                  "from a different scheduler");
 
     using task_type = runnable_task_type<FunctorType>;
     typename task_type::function_type const ptr = task_type::apply;
     typename task_type::destroy_type const dtor = task_type::destroy;
 
-    return _spawn_impl<TaskEnum>(
-      std::move(arg_policy).predecessor().m_task,
-      arg_policy.priority(),
-      ptr, dtor,
-      std::forward<FunctorType>(arg_functor)
-    );
+    return _spawn_impl<TaskEnum>(std::move(arg_policy).predecessor().m_task,
+                                 arg_policy.priority(), ptr, dtor,
+                                 std::forward<FunctorType>(arg_functor));
   }
 
   template <class FunctorType, class ValueType, class Scheduler>
-  KOKKOS_FUNCTION
-  static void
-  respawn(
-    FunctorType* functor,
-    BasicFuture<ValueType, Scheduler> const& predecessor,
-    TaskPriority priority = TaskPriority::Regular
-  ) {
-    using task_type = typename task_queue_type::template runnable_task_type<
-      FunctorType, scheduler_type
-    >;
+  KOKKOS_FUNCTION static void respawn(
+      FunctorType* functor,
+      BasicFuture<ValueType, Scheduler> const& predecessor,
+      TaskPriority priority = TaskPriority::Regular) {
+    using task_type =
+        typename task_queue_type::template runnable_task_type<FunctorType,
+                                                              scheduler_type>;
 
     auto& task = *static_cast<task_type*>(functor);
 
@@ -487,16 +433,12 @@ public:
   }
 
   template <class FunctorType>
-  KOKKOS_FUNCTION
-  static void
-  respawn(
-    FunctorType* functor,
-    scheduler_type const&,
-    TaskPriority priority = TaskPriority::Regular
-  ) {
-    using task_type = typename task_queue_type::template runnable_task_type<
-      FunctorType, scheduler_type
-    >;
+  KOKKOS_FUNCTION static void respawn(
+      FunctorType* functor, scheduler_type const&,
+      TaskPriority priority = TaskPriority::Regular) {
+    using task_type =
+        typename task_queue_type::template runnable_task_type<FunctorType,
+                                                              scheduler_type>;
 
     auto& task = *static_cast<task_type*>(functor);
 
@@ -507,64 +449,67 @@ public:
     task.set_respawn_flag(true);
   }
 
-
   template <class ValueType>
-  KOKKOS_FUNCTION
-  future_type<void>
-  when_all(BasicFuture<ValueType, scheduler_type> const predecessors[], int n_predecessors) {
-
+  KOKKOS_FUNCTION future_type<void> when_all(
+      BasicFuture<ValueType, scheduler_type> const predecessors[],
+      int n_predecessors) {
     // TODO @tasking @generalization DSH propagate scheduling info
 
     using task_type = typename task_queue_type::aggregate_task_type;
 
     future_type<void> rv;
 
-    if(n_predecessors > 0) {
+    if (n_predecessors > 0) {
       task_queue_type* queue_ptr = nullptr;
 
-      // Loop over the predecessors to find the queue and increment the reference
-      // counts
-      for(int i_pred = 0; i_pred < n_predecessors; ++i_pred) {
-
+      // Loop over the predecessors to find the queue and increment the
+      // reference counts
+      for (int i_pred = 0; i_pred < n_predecessors; ++i_pred) {
         auto* predecessor_task_ptr = predecessors[i_pred].m_task;
 
-        if(predecessor_task_ptr != nullptr) {
-          // TODO @tasking @cleanup DSH figure out when this is allowed to be nullptr (if at all anymore)
+        if (predecessor_task_ptr != nullptr) {
+          // TODO @tasking @cleanup DSH figure out when this is allowed to be
+          // nullptr (if at all anymore)
 
           // Increment reference count to track subsequent assignment.
-          // TODO @tasking @optimization DSH figure out if this reference count increment is necessary
+          // TODO @tasking @optimization DSH figure out if this reference count
+          // increment is necessary
           predecessor_task_ptr->increment_reference_count();
 
-          // TODO @tasking @cleanup DSH we should just set a boolean here instead to make this more readable
+          // TODO @tasking @cleanup DSH we should just set a boolean here
+          // instead to make this more readable
           queue_ptr = m_queue;
         }
 
-      } // end loop over predecessors
+      }  // end loop over predecessors
 
-      // This only represents a non-ready future if at least one of the predecessors
-      // has a task (and thus, a queue)
-      if(queue_ptr != nullptr) {
+      // This only represents a non-ready future if at least one of the
+      // predecessors has a task (and thus, a queue)
+      if (queue_ptr != nullptr) {
         auto& q = *queue_ptr;
 
-        auto* aggregate_task_ptr = q.template allocate_and_construct_with_vla_emulation<
-          task_type, task_base_type*
-        >(
-          /* n_vla_entries = */ n_predecessors,
-          /* aggregate_predecessor_count = */ n_predecessors,
-          /* queue_base = */ &q,
-          /* initial_reference_count = */ 2
-        );
+        auto* aggregate_task_ptr =
+            q.template allocate_and_construct_with_vla_emulation<
+                task_type, task_base_type*>(
+                /* n_vla_entries = */ n_predecessors,
+                /* aggregate_predecessor_count = */ n_predecessors,
+                /* queue_base = */ &q,
+                /* initial_reference_count = */ 2);
 
         rv = future_type<void>(aggregate_task_ptr);
 
-        for(int i_pred = 0; i_pred < n_predecessors; ++i_pred) {
-          aggregate_task_ptr->vla_value_at(i_pred) = predecessors[i_pred].m_task;
+        for (int i_pred = 0; i_pred < n_predecessors; ++i_pred) {
+          aggregate_task_ptr->vla_value_at(i_pred) =
+              predecessors[i_pred].m_task;
         }
 
-        Kokkos::memory_fence(); // we're touching very questionable memory, so be sure to fence
+        Kokkos::memory_fence();  // we're touching very questionable memory, so
+                                 // be sure to fence
 
-        q.schedule_aggregate(std::move(*aggregate_task_ptr), team_scheduler_info());
-        // the aggregate may be processed at any time, so don't touch it after this
+        q.schedule_aggregate(std::move(*aggregate_task_ptr),
+                             team_scheduler_info());
+        // the aggregate may be processed at any time, so don't touch it after
+        // this
       }
     }
 
@@ -572,75 +517,66 @@ public:
   }
 
   template <class F>
-  KOKKOS_FUNCTION
-  future_type<void>
-  when_all(int n_calls, F&& func)
-  {
+  KOKKOS_FUNCTION future_type<void> when_all(int n_calls, F&& func) {
     // TODO @tasking @generalization DSH propagate scheduling info?
 
     // later this should be std::invoke_result_t
     using generated_type = decltype(func(0));
-    using task_type = typename task_queue_type::aggregate_task_type;
+    using task_type      = typename task_queue_type::aggregate_task_type;
 
+    static_assert(is_future<generated_type>::value,
+                  "when_all function must return a Kokkos future (an instance "
+                  "of Kokkos::BasicFuture)");
     static_assert(
-      is_future<generated_type>::value,
-      "when_all function must return a Kokkos future (an instance of Kokkos::BasicFuture)"
-    );
-    static_assert(
-      std::is_base_of<scheduler_type, typename generated_type::scheduler_type>::value,
-      "when_all function must return a Kokkos::BasicFuture of a compatible scheduler type"
-    );
+        std::is_base_of<scheduler_type,
+                        typename generated_type::scheduler_type>::value,
+        "when_all function must return a Kokkos::BasicFuture of a compatible "
+        "scheduler type");
 
-    auto* aggregate_task = m_queue->template allocate_and_construct_with_vla_emulation<
-      task_type, task_base_type*
-    >(
-      /* n_vla_entries = */ n_calls,
-      /* aggregate_predecessor_count = */ n_calls,
-      /* queue_base = */ m_queue,
-      /* initial_reference_count = */ 2
-    );
+    auto* aggregate_task =
+        m_queue->template allocate_and_construct_with_vla_emulation<
+            task_type, task_base_type*>(
+            /* n_vla_entries = */ n_calls,
+            /* aggregate_predecessor_count = */ n_calls,
+            /* queue_base = */ m_queue,
+            /* initial_reference_count = */ 2);
 
     auto rv = future_type<void>(aggregate_task);
 
-    for(int i_call = 0; i_call < n_calls; ++i_call) {
-
+    for (int i_call = 0; i_call < n_calls; ++i_call) {
       auto generated_future = func(i_call);
 
-      if(generated_future.m_task != nullptr) {
+      if (generated_future.m_task != nullptr) {
         generated_future.m_task->increment_reference_count();
         aggregate_task->vla_value_at(i_call) = generated_future.m_task;
 
-        KOKKOS_ASSERT(m_queue == generated_future.m_task->ready_queue_base_ptr()
-          && "Queue mismatch in when_all"
-        );
+        KOKKOS_ASSERT(m_queue ==
+                          generated_future.m_task->ready_queue_base_ptr() &&
+                      "Queue mismatch in when_all");
       }
-
     }
 
     Kokkos::memory_fence();
 
-    m_queue->schedule_aggregate(std::move(*aggregate_task), team_scheduler_info());
+    m_queue->schedule_aggregate(std::move(*aggregate_task),
+                                team_scheduler_info());
     // This could complete at any moment, so don't touch anything after this
 
     return rv;
   }
-
 };
 
-
-template<class ExecSpace, class QueueType>
-inline
-void wait(SimpleTaskScheduler<ExecSpace, QueueType> const& scheduler)
-{
+template <class ExecSpace, class QueueType>
+inline void wait(SimpleTaskScheduler<ExecSpace, QueueType> const& scheduler) {
   using scheduler_type = SimpleTaskScheduler<ExecSpace, QueueType>;
   scheduler_type::specialization::execute(scheduler);
 }
 
-} // namespace Kokkos
+}  // namespace Kokkos
 
 //----------------------------------------------------------------------------
-//---------------------------------------------------------------------------#endif /* #if defined( KOKKOS_ENABLE_TASKDAG ) */
+//---------------------------------------------------------------------------#endif
+///* #if defined( KOKKOS_ENABLE_TASKDAG ) */
 
 #endif /* #if defined( KOKKOS_ENABLE_TASKDAG ) */
 #endif /* #ifndef KOKKOS_SIMPLETASKSCHEDULER_HPP */
-
diff --git a/lib/kokkos/core/src/impl/Kokkos_SingleTaskQueue.hpp b/lib/kokkos/core/src/impl/Kokkos_SingleTaskQueue.hpp
index d73028eb5b..8c149e978f 100644
--- a/lib/kokkos/core/src/impl/Kokkos_SingleTaskQueue.hpp
+++ b/lib/kokkos/core/src/impl/Kokkos_SingleTaskQueue.hpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -45,8 +46,7 @@
 #define KOKKOS_IMPL_SINGLETASKQUEUE_HPP
 
 #include <Kokkos_Macros.hpp>
-#if defined( KOKKOS_ENABLE_TASKDAG )
-
+#if defined(KOKKOS_ENABLE_TASKDAG)
 
 #include <Kokkos_TaskScheduler_fwd.hpp>
 #include <Kokkos_Core_fwd.hpp>
@@ -67,7 +67,6 @@
 #include <typeinfo>
 #include <stdexcept>
 
-
 //----------------------------------------------------------------------------
 //----------------------------------------------------------------------------
 
@@ -77,73 +76,63 @@ namespace Impl {
 //----------------------------------------------------------------------------
 //----------------------------------------------------------------------------
 
-template <
-  class ExecSpace,
-  class MemorySpace,
-  class TaskQueueTraits,
-  class MemoryPool
->
+template <class ExecSpace, class MemorySpace, class TaskQueueTraits,
+          class MemoryPool>
 class SingleTaskQueue
-  : public TaskQueueMemoryManager<ExecSpace, MemorySpace, MemoryPool>,
-    public TaskQueueCommonMixin<SingleTaskQueue<ExecSpace, MemorySpace, TaskQueueTraits, MemoryPool>>
-{
-private:
-
+    : public TaskQueueMemoryManager<ExecSpace, MemorySpace, MemoryPool>,
+      public TaskQueueCommonMixin<SingleTaskQueue<
+          ExecSpace, MemorySpace, TaskQueueTraits, MemoryPool>> {
+ private:
   using base_t = TaskQueueMemoryManager<ExecSpace, MemorySpace, MemoryPool>;
   using common_mixin_t = TaskQueueCommonMixin<SingleTaskQueue>;
 
-  struct EmptyTeamSchedulerInfo { };
-  struct EmptyTaskSchedulingInfo { };
+  struct EmptyTeamSchedulerInfo {};
+  struct EmptyTaskSchedulingInfo {};
 
-public:
-
-  using task_queue_type = SingleTaskQueue; // mark as task_queue concept
+ public:
+  using task_queue_type   = SingleTaskQueue;  // mark as task_queue concept
   using task_queue_traits = TaskQueueTraits;
-  using task_base_type = TaskNode<TaskQueueTraits>;
-  using ready_queue_type = typename TaskQueueTraits::template ready_queue_type<task_base_type>;
+  using task_base_type    = TaskNode<TaskQueueTraits>;
+  using ready_queue_type =
+      typename TaskQueueTraits::template ready_queue_type<task_base_type>;
 
-  using team_scheduler_info_type = EmptyTeamSchedulerInfo;
+  using team_scheduler_info_type  = EmptyTeamSchedulerInfo;
   using task_scheduling_info_type = EmptyTaskSchedulingInfo;
 
   using runnable_task_base_type = RunnableTaskBase<TaskQueueTraits>;
 
   template <class Functor, class Scheduler>
-    // requires TaskScheduler<Scheduler> && TaskFunctor<Functor>
-  using runnable_task_type = RunnableTask<
-    task_queue_traits, Scheduler, typename Functor::value_type, Functor
-  >;
+  // requires TaskScheduler<Scheduler> && TaskFunctor<Functor>
+  using runnable_task_type =
+      RunnableTask<task_queue_traits, Scheduler, typename Functor::value_type,
+                   Functor>;
 
-  using aggregate_task_type = AggregateTask<task_queue_traits, task_scheduling_info_type>;
+  using aggregate_task_type =
+      AggregateTask<task_queue_traits, task_scheduling_info_type>;
 
   // Number of allowed priorities
   static constexpr int NumQueue = 3;
 
-private:
-
+ private:
   ready_queue_type m_ready_queues[NumQueue][2];
 
-public:
-
+ public:
   //----------------------------------------------------------------------------
   // <editor-fold desc="Constructors, destructors, and assignment"> {{{2
 
-  SingleTaskQueue() = delete;
+  SingleTaskQueue()                       = delete;
   SingleTaskQueue(SingleTaskQueue const&) = delete;
-  SingleTaskQueue(SingleTaskQueue&&) = delete;
+  SingleTaskQueue(SingleTaskQueue&&)      = delete;
   SingleTaskQueue& operator=(SingleTaskQueue const&) = delete;
   SingleTaskQueue& operator=(SingleTaskQueue&&) = delete;
 
-  explicit
-  SingleTaskQueue(
-    typename base_t::execution_space const&,
-    typename base_t::memory_space const&,
-    typename base_t::memory_pool const& arg_memory_pool
-  )
-    : base_t(arg_memory_pool)
-  { }
+  explicit SingleTaskQueue(typename base_t::execution_space const&,
+                           typename base_t::memory_space const&,
+                           typename base_t::memory_pool const& arg_memory_pool)
+      : base_t(arg_memory_pool) {}
 
   ~SingleTaskQueue() {
-    for(int i_priority = 0; i_priority < NumQueue; ++i_priority) {
+    for (int i_priority = 0; i_priority < NumQueue; ++i_priority) {
       KOKKOS_EXPECTS(m_ready_queues[i_priority][TaskTeam].empty());
       KOKKOS_EXPECTS(m_ready_queues[i_priority][TaskSingle].empty());
     }
@@ -153,47 +142,40 @@ public:
   //----------------------------------------------------------------------------
 
   KOKKOS_FUNCTION
-  void
-  schedule_runnable(
-    runnable_task_base_type&& task,
-    team_scheduler_info_type const& info
-  ) {
+  void schedule_runnable(runnable_task_base_type&& task,
+                         team_scheduler_info_type const& info) {
     this->schedule_runnable_to_queue(
-      std::move(task),
-      m_ready_queues[int(task.get_priority())][int(task.get_task_type())],
-      info
-    );
+        std::move(task),
+        m_ready_queues[int(task.get_priority())][int(task.get_task_type())],
+        info);
     // Task may be enqueued and may be run at any point; don't touch it (hence
     // the use of move semantics)
   }
 
   KOKKOS_FUNCTION
-  OptionalRef<task_base_type>
-  pop_ready_task(
-    team_scheduler_info_type const& info
-  )
-  {
+  OptionalRef<task_base_type> pop_ready_task(
+      team_scheduler_info_type const& info) {
     OptionalRef<task_base_type> return_value;
-    // always loop in order of priority first, then prefer team tasks over single tasks
-    for(int i_priority = 0; i_priority < NumQueue; ++i_priority) {
-
+    // always loop in order of priority first, then prefer team tasks over
+    // single tasks
+    for (int i_priority = 0; i_priority < NumQueue; ++i_priority) {
       // Check for a team task with this priority
       return_value = m_ready_queues[i_priority][TaskTeam].pop();
-      if(return_value) return return_value;
+      if (return_value) return return_value;
 
       // Check for a single task with this priority
       return_value = m_ready_queues[i_priority][TaskSingle].pop();
-      if(return_value) return return_value;
-
+      if (return_value) return return_value;
     }
     // if nothing was found, return a default-constructed (empty) OptionalRef
     return return_value;
   }
 
   KOKKOS_INLINE_FUNCTION
-  constexpr team_scheduler_info_type
-  initial_team_scheduler_info(int) const noexcept { return { }; }
-
+  constexpr team_scheduler_info_type initial_team_scheduler_info(int) const
+      noexcept {
+    return {};
+  }
 };
 
 } /* namespace Impl */
@@ -204,4 +186,3 @@ public:
 
 #endif /* #if defined( KOKKOS_ENABLE_TASKDAG ) */
 #endif /* #ifndef KOKKOS_IMPL_SINGLETASKQUEUE_HPP */
-
diff --git a/lib/kokkos/core/src/impl/Kokkos_Spinwait.cpp b/lib/kokkos/core/src/impl/Kokkos_Spinwait.cpp
index 6bcb9c6cc4..2ae5c7863c 100644
--- a/lib/kokkos/core/src/impl/Kokkos_Spinwait.cpp
+++ b/lib/kokkos/core/src/impl/Kokkos_Spinwait.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -42,21 +43,21 @@
 */
 
 #include <Kokkos_Macros.hpp>
-#if defined( KOKKOS_ACTIVE_EXECUTION_MEMORY_SPACE_HOST )
+#if defined(KOKKOS_ACTIVE_EXECUTION_MEMORY_SPACE_HOST)
 
 #include <Kokkos_Atomic.hpp>
 #include <impl/Kokkos_Spinwait.hpp>
 #include <impl/Kokkos_BitOps.hpp>
 
-#if defined( KOKKOS_ENABLE_STDTHREAD) || defined( _WIN32 )
-  #include <thread>
-#elif !defined( _WIN32 )
-  #include <sched.h>
-  #include <time.h>
+#if defined(KOKKOS_ENABLE_STDTHREAD) || defined(_WIN32)
+#include <thread>
+#elif !defined(_WIN32)
+#include <sched.h>
+#include <time.h>
 #else
-  #include <process.h>
-  #include <winsock2.h>
-  #include <windows.h>
+#include <process.h>
+#include <winsock2.h>
+#include <windows.h>
 #endif
 
 /*--------------------------------------------------------------------------*/
@@ -64,99 +65,95 @@
 namespace Kokkos {
 namespace Impl {
 
-void host_thread_yield( const uint32_t i , const WaitMode mode )
-{
-  static constexpr uint32_t sleep_limit = 1 << 13 ;
-  static constexpr uint32_t yield_limit = 1 << 12 ;
+void host_thread_yield(const uint32_t i, const WaitMode mode) {
+  static constexpr uint32_t sleep_limit = 1 << 13;
+  static constexpr uint32_t yield_limit = 1 << 12;
 
   const int c = Kokkos::log2(i);
 
-  if ( WaitMode::ROOT != mode ) {
-    if ( sleep_limit < i ) {
-
+  if (WaitMode::ROOT != mode) {
+    if (sleep_limit < i) {
       // Attempt to put the thread to sleep for 'c' milliseconds
 
-      #if defined( KOKKOS_ENABLE_STDTHREAD ) || defined( _WIN32 )
-        auto start = std::chrono::high_resolution_clock::now();
-        std::this_thread::yield();
-        std::this_thread::sleep_until( start + std::chrono::nanoseconds( c * 1000 ) );
-      #else
-        timespec req ;
-        req.tv_sec  = 0 ;
-        req.tv_nsec = 1000 * c ;
-        nanosleep( &req, nullptr );
-      #endif
+#if defined(KOKKOS_ENABLE_STDTHREAD) || defined(_WIN32)
+      auto start = std::chrono::high_resolution_clock::now();
+      std::this_thread::yield();
+      std::this_thread::sleep_until(start + std::chrono::nanoseconds(c * 1000));
+#else
+      timespec req;
+      req.tv_sec  = 0;
+      req.tv_nsec = 1000 * c;
+      nanosleep(&req, nullptr);
+#endif
     }
 
-    else if ( mode == WaitMode::PASSIVE || yield_limit < i ) {
-
+    else if (mode == WaitMode::PASSIVE || yield_limit < i) {
       // Attempt to yield thread resources to runtime
 
-      #if defined( KOKKOS_ENABLE_STDTHREAD ) || defined( _WIN32 )
-        std::this_thread::yield();
-      #else
-        sched_yield();
-      #endif
+#if defined(KOKKOS_ENABLE_STDTHREAD) || defined(_WIN32)
+      std::this_thread::yield();
+#else
+      sched_yield();
+#endif
     }
+#if defined(KOKKOS_ENABLE_ASM)
 
-    #if defined( KOKKOS_ENABLE_ASM )
-
-    else if ( (1u<<4) < i ) {
+    else if ((1u << 4) < i) {
 
       // Insert a few no-ops to quiet the thread:
 
-      for ( int k = 0 ; k < c ; ++k ) {
-        #if defined( __amd64 ) || defined( __amd64__ ) || \
-              defined( __x86_64 ) || defined( __x86_64__ )
-          #if !defined( _WIN32 ) /* IS NOT Microsoft Windows */
-            asm volatile( "nop\n" );
-          #else
-            __asm__ __volatile__( "nop\n" );
-          #endif
-        #elif defined(__PPC64__)
-            asm volatile( "nop\n" );
-        #endif
+      for (int k = 0; k < c; ++k) {
+#if defined(__amd64) || defined(__amd64__) || defined(__x86_64) || \
+    defined(__x86_64__)
+#if !defined(_WIN32) /* IS NOT Microsoft Windows */
+        asm volatile("nop\n");
+#else
+        __asm__ __volatile__("nop\n");
+#endif
+#elif defined(__PPC64__)
+        asm volatile("nop\n");
+#endif
       }
     }
-    #endif /* defined( KOKKOS_ENABLE_ASM ) */
+#endif /* defined( KOKKOS_ENABLE_ASM ) */
   }
-  #if defined( KOKKOS_ENABLE_ASM )
-  else if ( (1u<<3) < i ) {
+#if defined(KOKKOS_ENABLE_ASM)
+  else if ((1u << 3) < i) {
     // no-ops for root thread
-    for ( int k = 0 ; k < c ; ++k ) {
-      #if defined( __amd64 ) || defined( __amd64__ ) || \
-            defined( __x86_64 ) || defined( __x86_64__ )
-        #if !defined( _WIN32 ) /* IS NOT Microsoft Windows */
-          asm volatile( "nop\n" );
-        #else
-          __asm__ __volatile__( "nop\n" );
-        #endif
-      #elif defined(__PPC64__)
-          asm volatile( "nop\n" );
-      #endif
+    for (int k = 0; k < c; ++k) {
+#if defined(__amd64) || defined(__amd64__) || defined(__x86_64) || \
+    defined(__x86_64__)
+#if !defined(_WIN32) /* IS NOT Microsoft Windows */
+      asm volatile("nop\n");
+#else
+      __asm__ __volatile__("nop\n");
+#endif
+#elif defined(__PPC64__)
+      asm volatile("nop\n");
+#endif
     }
   }
 
   {
     // Insert memory pause
-      #if defined( __amd64 )  || defined( __amd64__ ) || \
-       	  defined( __x86_64 ) || defined( __x86_64__ )
-    	  #if !defined( _WIN32 ) /* IS NOT Microsoft Windows */
-          asm volatile( "pause\n":::"memory" );
-	      #else
-          __asm__ __volatile__( "pause\n":::"memory" );
-        #endif
-      #elif defined(__PPC64__)
-	      asm volatile( "or 27, 27, 27" ::: "memory" );
-      #endif
+#if defined(__amd64) || defined(__amd64__) || defined(__x86_64) || \
+    defined(__x86_64__)
+#if !defined(_WIN32) /* IS NOT Microsoft Windows */
+    asm volatile("pause\n" ::: "memory");
+#else
+    __asm__ __volatile__("pause\n" ::: "memory");
+#endif
+#elif defined(__PPC64__)
+    asm volatile("or 27, 27, 27" ::: "memory");
+#endif
   }
 
-  #endif /* defined( KOKKOS_ENABLE_ASM ) */
+#endif /* defined( KOKKOS_ENABLE_ASM ) */
 }
 
-}} // namespace Kokkos::Impl
+}  // namespace Impl
+}  // namespace Kokkos
 
 #else
 void KOKKOS_CORE_SRC_IMPL_SPINWAIT_PREVENT_LINK_ERROR() {}
 #endif
-
diff --git a/lib/kokkos/core/src/impl/Kokkos_Spinwait.hpp b/lib/kokkos/core/src/impl/Kokkos_Spinwait.hpp
index 5cad7e48cc..1c65fb91f2 100644
--- a/lib/kokkos/core/src/impl/Kokkos_Spinwait.hpp
+++ b/lib/kokkos/core/src/impl/Kokkos_Spinwait.hpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -41,7 +42,6 @@
 //@HEADER
 */
 
-
 #ifndef KOKKOS_SPINWAIT_HPP
 #define KOKKOS_SPINWAIT_HPP
 
@@ -56,81 +56,76 @@ namespace Kokkos {
 namespace Impl {
 
 enum class WaitMode : int {
-    ACTIVE   // Used for tight loops to keep threads active longest
-  , PASSIVE  // Used to quickly yield the thread to quite down the system
-  , ROOT     // Never sleep or yield the root thread
+  ACTIVE  // Used for tight loops to keep threads active longest
+  ,
+  PASSIVE  // Used to quickly yield the thread to quite down the system
+  ,
+  ROOT  // Never sleep or yield the root thread
 };
 
-
-void host_thread_yield( const uint32_t i , const WaitMode mode );
+void host_thread_yield(const uint32_t i, const WaitMode mode);
 
 template <typename T>
-typename std::enable_if< std::is_integral<T>::value, void>::type
-root_spinwait_while_equal( T const volatile & flag, const T value )
-{
+typename std::enable_if<std::is_integral<T>::value, void>::type
+root_spinwait_while_equal(T const volatile& flag, const T value) {
   Kokkos::store_fence();
-  uint32_t i = 0 ;
-  while( value == flag ) {
+  uint32_t i = 0;
+  while (value == flag) {
     host_thread_yield(++i, WaitMode::ROOT);
   }
   Kokkos::load_fence();
 }
 
 template <typename T>
-typename std::enable_if< std::is_integral<T>::value, void>::type
-root_spinwait_until_equal( T const volatile & flag, const T value )
-{
+typename std::enable_if<std::is_integral<T>::value, void>::type
+root_spinwait_until_equal(T const volatile& flag, const T value) {
   Kokkos::store_fence();
-  uint32_t i = 0 ;
-  while( value != flag ) {
+  uint32_t i = 0;
+  while (value != flag) {
     host_thread_yield(++i, WaitMode::ROOT);
   }
   Kokkos::load_fence();
 }
 
 template <typename T>
-typename std::enable_if< std::is_integral<T>::value, void>::type
-spinwait_while_equal( T const volatile & flag, const T value )
-{
+typename std::enable_if<std::is_integral<T>::value, void>::type
+spinwait_while_equal(T const volatile& flag, const T value) {
   Kokkos::store_fence();
-  uint32_t i = 0 ;
-  while( value == flag ) {
+  uint32_t i = 0;
+  while (value == flag) {
     host_thread_yield(++i, WaitMode::ACTIVE);
   }
   Kokkos::load_fence();
 }
 
 template <typename T>
-typename std::enable_if< std::is_integral<T>::value, void>::type
-yield_while_equal( T const volatile & flag, const T value )
-{
+typename std::enable_if<std::is_integral<T>::value, void>::type
+yield_while_equal(T const volatile& flag, const T value) {
   Kokkos::store_fence();
-  uint32_t i = 0 ;
-  while( value == flag ) {
+  uint32_t i = 0;
+  while (value == flag) {
     host_thread_yield(++i, WaitMode::PASSIVE);
   }
   Kokkos::load_fence();
 }
 
 template <typename T>
-typename std::enable_if< std::is_integral<T>::value, void>::type
-spinwait_until_equal( T const volatile & flag, const T value )
-{
+typename std::enable_if<std::is_integral<T>::value, void>::type
+spinwait_until_equal(T const volatile& flag, const T value) {
   Kokkos::store_fence();
-  uint32_t i = 0 ;
-  while( value != flag ) {
+  uint32_t i = 0;
+  while (value != flag) {
     host_thread_yield(++i, WaitMode::ACTIVE);
   }
   Kokkos::load_fence();
 }
 
 template <typename T>
-typename std::enable_if< std::is_integral<T>::value, void>::type
-yield_until_equal( T const volatile & flag, const T value )
-{
+typename std::enable_if<std::is_integral<T>::value, void>::type
+yield_until_equal(T const volatile& flag, const T value) {
   Kokkos::store_fence();
-  uint32_t i = 0 ;
-  while( value != flag ) {
+  uint32_t i = 0;
+  while (value != flag) {
     host_thread_yield(++i, WaitMode::PASSIVE);
   }
   Kokkos::load_fence();
@@ -140,4 +135,3 @@ yield_until_equal( T const volatile & flag, const T value )
 } /* namespace Kokkos */
 
 #endif /* #ifndef KOKKOS_SPINWAIT_HPP */
-
diff --git a/lib/kokkos/core/src/impl/Kokkos_Stacktrace.cpp b/lib/kokkos/core/src/impl/Kokkos_Stacktrace.cpp
new file mode 100644
index 0000000000..582f697936
--- /dev/null
+++ b/lib/kokkos/core/src/impl/Kokkos_Stacktrace.cpp
@@ -0,0 +1,247 @@
+#include "Kokkos_Macros.hpp"
+#include "Kokkos_Stacktrace.hpp"
+
+#ifdef KOKKOS_IMPL_ENABLE_STACKTRACE
+// backtrace() function for retrieving the stacktrace
+#include <execinfo.h>
+#endif
+#ifdef KOKKOS_IMPL_ENABLE_CXXABI
+#include <cxxabi.h>
+#endif  // KOKKOS_ENABLE_CXXABI
+
+#include <exception>
+#include <iostream>
+#include <tuple>
+#include <vector>
+
+namespace Kokkos {
+namespace Impl {
+#ifndef KOKKOS_IMPL_ENABLE_STACKTRACE
+int backtrace(void**, int) { return 0; }
+char** backtrace_symbols(void* const*, int) { return NULL; }
+#endif
+
+std::string demangle(const std::string& name) {
+#ifndef KOKKOS_IMPL_ENABLE_CXXABI
+  return name;
+#else
+  size_t found_end = name.find_first_of("+)", 0, 2);
+  if (found_end == std::string::npos) {
+    found_end = name.size();
+  }
+  size_t found_parenthesis = name.find_first_of("(");
+  size_t start             = found_parenthesis + 1;
+  if (found_parenthesis == std::string::npos) start = 0;
+
+  std::string s = name.substr(start, found_end - start);
+
+  if (s.length() != 0) {
+    int status          = 0;
+    char* output_buffer = nullptr;
+    size_t length       = s.length();
+    char* d = abi::__cxa_demangle(s.c_str(), output_buffer, &length, &status);
+    if (d != nullptr) {
+      s = d;
+      free(d);
+    }
+  }
+
+  // Special cases for "main" and "start" on Mac
+  if (s.length() == 0) {
+    if (name == "main" || name == "start") {
+      s = name;
+    }
+  }
+  return s;
+#endif  // KOKKOS_ENABLE_CXXABI
+}
+
+class Stacktrace {
+ public:
+  Stacktrace()                  = delete;
+  Stacktrace(const Stacktrace&) = delete;
+  Stacktrace& operator=(const Stacktrace&) = delete;
+  Stacktrace(Stacktrace&&)                 = delete;
+  Stacktrace& operator=(Stacktrace&&) = delete;
+  ~Stacktrace()                       = delete;
+
+  // These are public only to avoid wasting an extra stacktrace line.
+  // See save_stacktrace below.
+  static constexpr int capacity = 100;
+  static void* buffer[capacity];
+  static int length;
+
+  static std::vector<std::string> lines() {
+    char** symbols = backtrace_symbols(buffer, length);
+    if (symbols == nullptr) {
+      return {};
+    } else {
+      std::vector<std::string> trace(length);
+      for (int i = 0; i < length; ++i) {
+        if (symbols[i] != nullptr) {
+          trace[i] = std::string(symbols[i]);
+        }
+      }
+      free(symbols);
+      return trace;
+    }
+  }
+};
+
+int Stacktrace::length = 0;
+void* Stacktrace::buffer[Stacktrace::capacity];
+
+void save_stacktrace() {
+  Stacktrace::length = backtrace(Stacktrace::buffer, Stacktrace::capacity);
+}
+
+size_t find_first_non_whitespace(const std::string& s, const size_t start_pos) {
+  constexpr size_t num_ws_chars = 3;
+  const char ws_chars[]         = "\n\t ";
+  return s.find_first_not_of(ws_chars, start_pos, num_ws_chars);
+}
+
+size_t find_first_whitespace(const std::string& s, const size_t start_pos) {
+  constexpr size_t num_ws_chars = 3;
+  const char ws_chars[]         = "\n\t ";
+  return s.find_first_of(ws_chars, start_pos, num_ws_chars);
+}
+
+template <class Callback>
+void for_each_token(const std::string& s, Callback c) {
+  size_t cur = find_first_non_whitespace(s, 0);
+  while (cur != std::string::npos) {
+    const size_t end   = find_first_whitespace(s, cur);
+    const bool last    = (end == std::string::npos);
+    const size_t count = last ? end : size_t(end - cur);
+    c(s.substr(cur, count), last);
+    cur = find_first_non_whitespace(s, end);
+  }
+}
+
+// Search the whole backtrace, column by column, for "main".
+// This tells us what column has the function names.
+// While we're doing that, figure out the longest column,
+// so we can compute spacing correctly.
+
+struct main_column_info {
+  bool found_main;
+  size_t main_col;
+  std::vector<size_t> main_col_lens;
+};
+
+main_column_info find_main_column(const std::vector<std::string>& traceback) {
+  bool found_main = false;
+  size_t main_col = 0;
+  for (auto&& entry : traceback) {
+    size_t col_count = 0;
+    for_each_token(entry, [&](const std::string& s, bool) {
+      const size_t pos = s.find("main");
+      if (pos != std::string::npos) {
+        found_main = true;
+        main_col   = col_count;
+      }
+      ++col_count;
+    });
+    if (found_main) {
+      break;
+    }
+  }
+
+  // Make another pass to get the column lengths.
+  // Only demangle the column of functions.
+  std::vector<size_t> max_col_lengths;
+  for (auto&& entry : traceback) {
+    size_t col_count = 0;
+    for_each_token(entry, [&](const std::string& s, bool) {
+      const size_t cur_col_len =
+          (found_main && col_count == main_col) ? demangle(s).size() : s.size();
+      ++col_count;
+      if (max_col_lengths.size() < col_count) {
+        max_col_lengths.push_back(cur_col_len);
+      } else {
+        const size_t old_max_len = max_col_lengths[col_count - 1];
+        if (old_max_len < cur_col_len) {
+          max_col_lengths[col_count - 1] = cur_col_len;
+        }
+      }
+    });
+  }
+  return main_column_info{found_main, main_col, max_col_lengths};
+}
+
+void demangle_and_print_traceback_entry(
+    std::ostream& out, const std::string& traceback_entry,
+    const bool found_main, const size_t main_col,
+    const std::vector<size_t>& max_col_lens) {
+  std::vector<std::string> tokens;
+  size_t cur_col = 0;
+  for_each_token(traceback_entry, [&](const std::string& s, bool last) {
+    const size_t old_width(out.width());
+    out.width(max_col_lens[cur_col]);
+    try {
+      if (found_main && cur_col == main_col) {
+        out << demangle(s);
+      } else {
+        out << s;
+      }
+      if (!last) {
+        out << " ";
+      }
+      ++cur_col;
+    } catch (...) {
+      out.width(old_width);
+      throw;
+    }
+    out.width(old_width);
+  });
+}
+
+void demangle_and_print_traceback(std::ostream& out,
+                                  const std::vector<std::string>& traceback) {
+  const auto result = find_main_column(traceback);
+  for (auto&& entry : traceback) {
+    demangle_and_print_traceback_entry(out, entry, result.found_main,
+                                       result.main_col, result.main_col_lens);
+    out << std::endl;
+  }
+}
+
+void print_saved_stacktrace(std::ostream& out) {
+  auto lines = Stacktrace::lines();
+  for (auto&& entry : lines) {
+    out << entry << std::endl;
+  }
+}
+
+void print_demangled_saved_stacktrace(std::ostream& out) {
+  demangle_and_print_traceback(out, Stacktrace::lines());
+}
+
+std::function<void()> user_terminate_handler_post_ = nullptr;
+
+void kokkos_terminate_handler() {
+  using std::cerr;
+  using std::endl;
+
+  cerr << "Kokkos observes that std::terminate has been called.  "
+          "Here is the last saved stack trace.  Note that this does not "
+          "necessarily show what called std::terminate."
+       << endl
+       << endl;
+  print_demangled_saved_stacktrace(std::cerr);
+
+  if (user_terminate_handler_post_ != nullptr) {
+    user_terminate_handler_post_();
+  } else {
+    std::abort();
+  }
+}
+
+void set_kokkos_terminate_handler(std::function<void()> user_post) {
+  user_terminate_handler_post_ = user_post;
+  std::set_terminate(kokkos_terminate_handler);
+}
+
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/lib/kokkos/core/src/impl/Kokkos_Stacktrace.hpp b/lib/kokkos/core/src/impl/Kokkos_Stacktrace.hpp
new file mode 100644
index 0000000000..b5cf4ee1b6
--- /dev/null
+++ b/lib/kokkos/core/src/impl/Kokkos_Stacktrace.hpp
@@ -0,0 +1,45 @@
+#ifndef KOKKOS_STACKTRACE_HPP
+#define KOKKOS_STACKTRACE_HPP
+
+#include <functional>
+#include <ostream>
+#include <string>
+
+namespace Kokkos {
+namespace Impl {
+
+/// \brief Return the demangled version of the input symbol, or the
+///   original input if demangling is not possible.
+std::string demangle(const std::string& name);
+
+/// \brief Save the current stacktrace.
+///
+/// You may only save one stacktrace at a time.  If you call this
+/// twice, the second call will overwrite the result of the first
+/// call.
+void save_stacktrace();
+
+/// \brief Print the raw form of the currently saved stacktrace, if
+///   any, to the given output stream.
+void print_saved_stacktrace(std::ostream& out);
+
+/// \brief Print the currently saved, demangled stacktrace, if any, to
+///   the given output stream.
+///
+/// Demangling is best effort only.
+void print_demangled_saved_stacktrace(std::ostream& out);
+
+/// \brief Set the std::terminate handler so that it prints the
+///   currently saved stack trace, then calls user_post.
+///
+/// This is useful if you want to call, say, MPI_Abort instead of
+/// std::abort.  The MPI Standard frowns upon calling MPI functions
+/// without including their header file, and Kokkos does not depend on
+/// MPI, so there's no way for Kokkos to depend on MPI_Abort in a
+/// portable way.
+void set_kokkos_terminate_handler(std::function<void()> user_post = nullptr);
+
+}  // namespace Impl
+}  // namespace Kokkos
+
+#endif  // KOKKOS_STACKTRACE_HPP
diff --git a/lib/kokkos/core/src/impl/Kokkos_Tags.hpp b/lib/kokkos/core/src/impl/Kokkos_Tags.hpp
index 0cd84108ba..1b33180ed2 100644
--- a/lib/kokkos/core/src/impl/Kokkos_Tags.hpp
+++ b/lib/kokkos/core/src/impl/Kokkos_Tags.hpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -61,29 +62,34 @@
  *   struct Foo { using array_layout = void; };
  *   have_array_layout<Foo>::value == 1;
  */
-#define KOKKOS_IMPL_HAS_TYPE( TYPE ) \
-template <typename T> struct have_ ## TYPE { \
-private: \
-  template <typename U, typename = void > struct X : std::false_type {}; \
-  template <typename U> struct X<U,typename std::conditional<true,void,typename X:: TYPE >::type > : std::true_type {}; \
-public: \
-  typedef typename X<T>::type type ; \
-  enum : bool { value = type::value }; \
-};
+#define KOKKOS_IMPL_HAS_TYPE(TYPE)                                             \
+  template <typename T>                                                        \
+  struct have_##TYPE {                                                         \
+   private:                                                                    \
+    template <typename U, typename = void>                                     \
+    struct X : std::false_type {};                                             \
+    template <typename U>                                                      \
+    struct X<U, typename std::conditional<true, void, typename X::TYPE>::type> \
+        : std::true_type {};                                                   \
+                                                                               \
+   public:                                                                     \
+    typedef typename X<T>::type type;                                          \
+    enum : bool { value = type::value };                                       \
+  };
 
 //----------------------------------------------------------------------------
 //----------------------------------------------------------------------------
 
-namespace Kokkos { namespace Impl {
+namespace Kokkos {
+namespace Impl {
 
 template <typename T>
-using is_void = std::is_same<void,T>;
-
-}} // namespace Kokkos::Impl
+using is_void = std::is_same<void, T>;
 
+}
+}  // namespace Kokkos
 
 //----------------------------------------------------------------------------
 //----------------------------------------------------------------------------
 
 #endif
-
diff --git a/lib/kokkos/core/src/impl/Kokkos_TaskBase.hpp b/lib/kokkos/core/src/impl/Kokkos_TaskBase.hpp
index b0c06fb26e..e3de5d0eb9 100644
--- a/lib/kokkos/core/src/impl/Kokkos_TaskBase.hpp
+++ b/lib/kokkos/core/src/impl/Kokkos_TaskBase.hpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -47,7 +48,7 @@
 #define KOKKOS_IMPL_TASKBASE_HPP
 
 #include <Kokkos_Macros.hpp>
-#if defined( KOKKOS_ENABLE_TASKDAG )
+#if defined(KOKKOS_ENABLE_TASKDAG)
 
 #include <Kokkos_TaskScheduler_fwd.hpp>
 #include <Kokkos_Core_fwd.hpp>
@@ -136,101 +137,96 @@ namespace Impl {
  *      m_next == LockTag: not a member of a wait queue
  *
  */
-class TaskBase
-{
-public:
+class TaskBase {
+ public:
+  enum : int16_t { TaskTeam = 0, TaskSingle = 1, Aggregate = 2 };
+  enum : uintptr_t { LockTag = ~uintptr_t(0), EndTag = ~uintptr_t(1) };
 
-  enum : int16_t   { TaskTeam = 0 , TaskSingle = 1 , Aggregate = 2 };
-  enum : uintptr_t { LockTag = ~uintptr_t(0) , EndTag = ~uintptr_t(1) };
-
-  template<typename, typename> friend class Kokkos::BasicTaskScheduler ;
+  template <typename, typename>
+  friend class Kokkos::BasicTaskScheduler;
 
   using queue_type = TaskQueueBase;
 
-  using function_type = void(*)( TaskBase * , void * );
-  typedef void (* destroy_type) ( TaskBase * );
+  using function_type = void (*)(TaskBase*, void*);
+  typedef void (*destroy_type)(TaskBase*);
 
   // sizeof(TaskBase) == 48
 
-  function_type m_apply = nullptr;         ///< Apply function pointer
-  queue_type* m_queue = nullptr;          ///< Pointer to the scheduler
-  TaskBase* m_next = nullptr; ///< next in linked list of ready tasks
-  TaskBase* m_wait = nullptr; ///< Queue of tasks waiting on this
-  int32_t m_ref_count = 0;
-  int32_t m_alloc_size = 0;
-  int32_t m_dep_count ;                    ///< Aggregate's number of dependences
-  int16_t        m_task_type ;   ///< Type of task
-  int16_t        m_priority ;    ///< Priority of runnable task
+  function_type m_apply = nullptr;  ///< Apply function pointer
+  queue_type* m_queue   = nullptr;  ///< Pointer to the scheduler
+  TaskBase* m_next      = nullptr;  ///< next in linked list of ready tasks
+  TaskBase* m_wait      = nullptr;  ///< Queue of tasks waiting on this
+  int32_t m_ref_count   = 0;
+  int32_t m_alloc_size  = 0;
+  int32_t m_dep_count;  ///< Aggregate's number of dependences
+  int16_t m_task_type;  ///< Type of task
+  int16_t m_priority;   ///< Priority of runnable task
 
-  TaskBase( TaskBase && ) = delete ;
-  TaskBase( const TaskBase & ) = delete ;
-  TaskBase & operator = ( TaskBase && ) = delete ;
-  TaskBase & operator = ( const TaskBase & ) = delete ;
+  TaskBase(TaskBase&&)      = delete;
+  TaskBase(const TaskBase&) = delete;
+  TaskBase& operator=(TaskBase&&) = delete;
+  TaskBase& operator=(const TaskBase&) = delete;
 
 #ifdef KOKKOS_CUDA_9_DEFAULTED_BUG_WORKAROUND
-  KOKKOS_INLINE_FUNCTION ~TaskBase() {};
+  KOKKOS_INLINE_FUNCTION ~TaskBase(){};
 #else
   KOKKOS_INLINE_FUNCTION ~TaskBase() = default;
 #endif
 
-  KOKKOS_INLINE_FUNCTION constexpr
-  TaskBase()
-    : m_apply( nullptr )
-    , m_queue( nullptr )
-    , m_next( nullptr )
-    , m_wait( nullptr )
-    , m_ref_count( 0 )
-    , m_alloc_size( 0 )
-    , m_dep_count( 0 )
-    , m_task_type( 0 )
-    , m_priority( 0 )
-    {}
+  KOKKOS_INLINE_FUNCTION constexpr TaskBase()
+      : m_apply(nullptr),
+        m_queue(nullptr),
+        m_next(nullptr),
+        m_wait(nullptr),
+        m_ref_count(0),
+        m_alloc_size(0),
+        m_dep_count(0),
+        m_task_type(0),
+        m_priority(0) {}
 
   //----------------------------------------
 
   KOKKOS_INLINE_FUNCTION
-  TaskBase * volatile * aggregate_dependences() volatile
-    { return reinterpret_cast<TaskBase*volatile*>( this + 1 ); }
+  TaskBase* volatile* aggregate_dependences() volatile {
+    return reinterpret_cast<TaskBase* volatile*>(this + 1);
+  }
 
   KOKKOS_INLINE_FUNCTION
-  bool requested_respawn()
-    {
-      // This should only be called when a task has finished executing and is
-      // in the transition to either the complete or executing-respawn state.
-      TaskBase * const lock = reinterpret_cast< TaskBase * >( LockTag );
-      return lock != m_next;
-    }
+  bool requested_respawn() {
+    // This should only be called when a task has finished executing and is
+    // in the transition to either the complete or executing-respawn state.
+    TaskBase* const lock = reinterpret_cast<TaskBase*>(LockTag);
+    return lock != m_next;
+  }
 
   KOKKOS_INLINE_FUNCTION
-  void add_dependence( TaskBase* dep )
-    {
-      // Precondition: lock == m_next
+  void add_dependence(TaskBase* dep) {
+    // Precondition: lock == m_next
 
-      TaskBase * const lock = (TaskBase *) LockTag ;
+    TaskBase* const lock = (TaskBase*)LockTag;
 
-      // Assign dependence to m_next.  It will be processed in the subsequent
-      // call to schedule.  Error if the dependence is reset.
-      if ( lock != Kokkos::atomic_exchange( & m_next, dep ) ) {
-        Kokkos::abort("TaskScheduler ERROR: resetting task dependence");
-      }
-
-      if ( 0 != dep ) {
-        // The future may be destroyed upon returning from this call
-        // so increment reference count to track this assignment.
-        Kokkos::atomic_increment( &(dep->m_ref_count) );
-      }
+    // Assign dependence to m_next.  It will be processed in the subsequent
+    // call to schedule.  Error if the dependence is reset.
+    if (lock != Kokkos::atomic_exchange(&m_next, dep)) {
+      Kokkos::abort("TaskScheduler ERROR: resetting task dependence");
     }
 
+    if (0 != dep) {
+      // The future may be destroyed upon returning from this call
+      // so increment reference count to track this assignment.
+      Kokkos::atomic_increment(&(dep->m_ref_count));
+    }
+  }
+
   //----------------------------------------
 
   KOKKOS_INLINE_FUNCTION
-  int32_t reference_count() const
-    { return *((int32_t volatile *)( & m_ref_count )); }
-
+  int32_t reference_count() const {
+    return *((int32_t volatile*)(&m_ref_count));
+  }
 };
 
-static_assert( sizeof(TaskBase) == 48
-             , "Verifying expected sizeof(TaskBase)" );
+static_assert(sizeof(TaskBase) == 48, "Verifying expected sizeof(TaskBase)");
 
 } /* namespace Impl */
 } /* namespace Kokkos */
@@ -241,78 +237,68 @@ static_assert( sizeof(TaskBase) == 48
 namespace Kokkos {
 namespace Impl {
 
-template< class Scheduler, typename ResultType , class FunctorType >
-class Task
-  : public TaskBase,
-    public FunctorType
-{
-public:
+template <class Scheduler, typename ResultType, class FunctorType>
+class Task : public TaskBase, public FunctorType {
+ public:
+  Task()            = delete;
+  Task(Task&&)      = delete;
+  Task(const Task&) = delete;
+  Task& operator=(Task&&) = delete;
+  Task& operator=(const Task&) = delete;
 
-  Task() = delete ;
-  Task( Task && ) = delete ;
-  Task( const Task & ) = delete ;
-  Task & operator = ( Task && ) = delete ;
-  Task & operator = ( const Task & ) = delete ;
+  using root_type    = TaskBase;
+  using functor_type = FunctorType;
+  using result_type  = ResultType;
 
-
-  using root_type = TaskBase;
-  using functor_type = FunctorType ;
-  using result_type = ResultType ;
-
-  using specialization = TaskQueueSpecialization<Scheduler> ;
-  using member_type = typename specialization::member_type ;
+  using specialization = TaskQueueSpecialization<Scheduler>;
+  using member_type    = typename specialization::member_type;
 
   KOKKOS_INLINE_FUNCTION
-  void apply_functor( member_type * const member , void * )
-    { this->functor_type::operator()( *member ); }
+  void apply_functor(member_type* const member, void*) {
+    this->functor_type::operator()(*member);
+  }
 
-  template< typename T >
-  KOKKOS_INLINE_FUNCTION
-  void apply_functor( member_type * const member
-                    , T           * const result )
-    { this->functor_type::operator()( *member , *result ); }
+  template <typename T>
+  KOKKOS_INLINE_FUNCTION void apply_functor(member_type* const member,
+                                            T* const result) {
+    this->functor_type::operator()(*member, *result);
+  }
 
-  KOKKOS_FUNCTION static
-  void destroy( root_type * root )
-  {
+  KOKKOS_FUNCTION static void destroy(root_type* root) {
     TaskResult<result_type>::destroy(root);
   }
 
-  KOKKOS_FUNCTION static
-  void apply( root_type * root , void * exec )
-    {
-      Task* const task = static_cast< Task * >( root );
-      member_type * const member = reinterpret_cast< member_type * >( exec );
-      result_type * const result = TaskResult< result_type >::ptr( task );
+  KOKKOS_FUNCTION static void apply(root_type* root, void* exec) {
+    Task* const task          = static_cast<Task*>(root);
+    member_type* const member = reinterpret_cast<member_type*>(exec);
+    result_type* const result = TaskResult<result_type>::ptr(task);
 
-      // Task may be serial or team.
-      // If team then must synchronize before querying if respawn was requested.
-      // If team then only one thread calls destructor.
+    // Task may be serial or team.
+    // If team then must synchronize before querying if respawn was requested.
+    // If team then only one thread calls destructor.
 
-      const bool only_one_thread =
+    const bool only_one_thread =
 #if defined(KOKKOS_ACTIVE_EXECUTION_MEMORY_SPACE_CUDA)
-        0 == threadIdx.x && 0 == threadIdx.y ;
+        0 == threadIdx.x && 0 == threadIdx.y;
 #else
         0 == member->team_rank();
 #endif
 
-      task->apply_functor( member , result );
+    task->apply_functor(member, result);
 
-      member->team_barrier();
+    member->team_barrier();
 
-      if ( only_one_thread && !(task->requested_respawn()) ) {
-        // Did not respawn, destroy the functor to free memory.
-        task->functor_type::~functor_type();
-        // Cannot destroy and deallocate the task until its dependences
-        // have been processed.
-      }
+    if (only_one_thread && !(task->requested_respawn())) {
+      // Did not respawn, destroy the functor to free memory.
+      task->functor_type::~functor_type();
+      // Cannot destroy and deallocate the task until its dependences
+      // have been processed.
     }
+  }
 
   // Constructor for runnable task
-  KOKKOS_INLINE_FUNCTION constexpr
-  Task( FunctorType && arg_functor )
-    : root_type() , functor_type( std::move(arg_functor) )
-  { }
+  KOKKOS_INLINE_FUNCTION constexpr Task(FunctorType&& arg_functor)
+      : root_type(), functor_type(std::move(arg_functor)) {}
 
   KOKKOS_INLINE_FUNCTION
   ~Task() = delete;
@@ -326,4 +312,3 @@ public:
 
 #endif /* #if defined( KOKKOS_ENABLE_TASKDAG ) */
 #endif /* #ifndef KOKKOS_IMPL_TASKBASE_HPP */
-
diff --git a/lib/kokkos/core/src/impl/Kokkos_TaskNode.hpp b/lib/kokkos/core/src/impl/Kokkos_TaskNode.hpp
index 35f8853f1f..1ea7fc2049 100644
--- a/lib/kokkos/core/src/impl/Kokkos_TaskNode.hpp
+++ b/lib/kokkos/core/src/impl/Kokkos_TaskNode.hpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -47,7 +48,7 @@
 #define KOKKOS_IMPL_TASKNODE_HPP
 
 #include <Kokkos_Macros.hpp>
-#if defined( KOKKOS_ENABLE_TASKDAG )
+#if defined(KOKKOS_ENABLE_TASKDAG)
 
 #include <Kokkos_TaskScheduler_fwd.hpp>
 #include <Kokkos_Core_fwd.hpp>
@@ -70,7 +71,20 @@
 namespace Kokkos {
 namespace Impl {
 
-enum TaskType : int16_t   { TaskTeam = 0 , TaskSingle = 1 , Aggregate = 2, TaskSpecial = -1 };
+#ifdef KOKKOS_COMPILER_PGI
+// Bizzarely, an extra jump instruction forces the PGI compiler to not have a
+// bug related to (probably?) empty base optimization and/or aggregate
+// construction.  This must be defined out-of-line to generate a jump
+// jump instruction
+void _kokkos_pgi_compiler_bug_workaround();
+#endif
+
+enum TaskType : int16_t {
+  TaskTeam    = 0,
+  TaskSingle  = 1,
+  Aggregate   = 2,
+  TaskSpecial = -1
+};
 
 //==============================================================================
 
@@ -87,50 +101,46 @@ enum TaskType : int16_t   { TaskTeam = 0 , TaskSingle = 1 , Aggregate = 2, TaskS
  */
 template <class CountType = int32_t>
 class alignas(void*) PoolAllocatedObjectBase {
-public:
-
+ public:
   using pool_allocation_size_type = CountType;
 
-private:
-
+ private:
   pool_allocation_size_type m_alloc_size;
 
-public:
-
-
+ public:
   KOKKOS_INLINE_FUNCTION
-  constexpr explicit PoolAllocatedObjectBase(pool_allocation_size_type allocation_size)
-    : m_alloc_size(allocation_size)
-  { }
+  constexpr explicit PoolAllocatedObjectBase(
+      pool_allocation_size_type allocation_size)
+      : m_alloc_size(allocation_size) {}
 
   KOKKOS_INLINE_FUNCTION
   CountType get_allocation_size() const noexcept { return m_alloc_size; }
-
 };
 
 //==============================================================================
 
-
 // TODO @tasking @cleanup DSH move this?
 template <class CountType = int32_t>
 class ReferenceCountedBase {
-public:
-
+ public:
   using reference_count_size_type = CountType;
 
-private:
-
+ private:
   reference_count_size_type m_ref_count = 0;
 
-public:
-
+ public:
   KOKKOS_INLINE_FUNCTION
-  constexpr explicit
-  ReferenceCountedBase(reference_count_size_type initial_reference_count)
-    : m_ref_count(initial_reference_count)
-  {
+#ifndef KOKKOS_COMPILER_PGI
+  constexpr
+#endif
+      explicit ReferenceCountedBase(
+          reference_count_size_type initial_reference_count)
+      : m_ref_count(initial_reference_count) {
     // This can't be here because it breaks constexpr
     // KOKKOS_EXPECTS(initial_reference_count > 0);
+#ifdef KOKKOS_COMPILER_PGI
+    Impl::_kokkos_pgi_compiler_bug_workaround();
+#endif
   }
 
   /** Decrement the reference count,
@@ -138,8 +148,7 @@ public:
    *  the reference count to become zero
    */
   KOKKOS_INLINE_FUNCTION
-  bool decrement_and_check_reference_count()
-  {
+  bool decrement_and_check_reference_count() {
     // TODO @tasking @memory_order DSH memory order
     auto old_count = Kokkos::atomic_fetch_add(&m_ref_count, -1);
 
@@ -149,11 +158,7 @@ public:
   }
 
   KOKKOS_INLINE_FUNCTION
-  void increment_reference_count()
-  {
-    Kokkos::atomic_increment(&m_ref_count);
-  }
-
+  void increment_reference_count() { Kokkos::atomic_increment(&m_ref_count); }
 };
 
 template <class TaskQueueTraits, class SchedulingInfo>
@@ -166,133 +171,131 @@ class RunnableTaskBase;
 
 template <class TaskQueueTraits>
 class TaskNode
-  : public PoolAllocatedObjectBase<int32_t>, // size 4, must be first!
-    public ReferenceCountedBase<int32_t>, // size 4
-    public TaskQueueTraits::template intrusive_task_base_type<TaskNode<TaskQueueTraits>> // size 8+
+    : public PoolAllocatedObjectBase<int32_t>,  // size 4, must be first!
+      public ReferenceCountedBase<int32_t>,     // size 4
+      public TaskQueueTraits::template intrusive_task_base_type<
+          TaskNode<TaskQueueTraits>>  // size 8+
 {
-public:
-
+ public:
   using priority_type = int16_t;
 
-private:
-
-  using task_base_type = TaskNode<TaskQueueTraits>;
-  using pool_allocated_base_type = PoolAllocatedObjectBase<int32_t>;
+ private:
+  using task_base_type              = TaskNode<TaskQueueTraits>;
+  using pool_allocated_base_type    = PoolAllocatedObjectBase<int32_t>;
   using reference_counted_base_type = ReferenceCountedBase<int32_t>;
-  using task_queue_traits = TaskQueueTraits;
+  using task_queue_traits           = TaskQueueTraits;
   using waiting_queue_type =
-    typename task_queue_traits::template waiting_queue_type<TaskNode>;
+      typename task_queue_traits::template waiting_queue_type<TaskNode>;
 
-  waiting_queue_type m_wait_queue; // size 8+
+  waiting_queue_type m_wait_queue;  // size 8+
 
-  // TODO @tasking @cleanup DSH eliminate this, or make its purpose a bit more clear.  It's only used in BasicFuture, and only for deallocation purposes
+  // TODO @tasking @cleanup DSH eliminate this, or make its purpose a bit more
+  // clear.  It's only used in BasicFuture, and only for deallocation purposes
   TaskQueueBase* m_ready_queue_base;
 
-  TaskType m_task_type;  // size 2
-  priority_type m_priority; // size 2
+  TaskType m_task_type;      // size 2
+  priority_type m_priority;  // size 2
   bool m_is_respawning = false;
 
-public:
-
+ public:
   KOKKOS_INLINE_FUNCTION
-  constexpr
-  TaskNode(
-    TaskType task_type,
-    TaskPriority priority,
-    TaskQueueBase* queue_base,
-    reference_count_size_type initial_reference_count,
-    pool_allocation_size_type allocation_size
-  ) : pool_allocated_base_type(
-        /* allocation_size = */ allocation_size
-      ),
-      reference_counted_base_type(
-        /* initial_reference_count = */ initial_reference_count
-      ),
-      m_wait_queue(),
-      m_ready_queue_base(queue_base),
-      m_task_type(task_type),
-      m_priority(static_cast<priority_type>(priority)),
-      m_is_respawning(false)
-  { }
+  constexpr TaskNode(TaskType task_type, TaskPriority priority,
+                     TaskQueueBase* queue_base,
+                     reference_count_size_type initial_reference_count,
+                     pool_allocation_size_type allocation_size)
+      : pool_allocated_base_type(
+            /* allocation_size = */ allocation_size),
+        reference_counted_base_type(
+            /* initial_reference_count = */ initial_reference_count),
+        m_wait_queue(),
+        m_ready_queue_base(queue_base),
+        m_task_type(task_type),
+        m_priority(static_cast<priority_type>(priority)),
+        m_is_respawning(false) {}
 
-  TaskNode() = delete;
+  TaskNode()                = delete;
   TaskNode(TaskNode const&) = delete;
-  TaskNode(TaskNode&&) = delete;
+  TaskNode(TaskNode&&)      = delete;
   TaskNode& operator=(TaskNode const&) = delete;
   TaskNode& operator=(TaskNode&&) = delete;
 
   KOKKOS_INLINE_FUNCTION
-  bool is_aggregate() const noexcept { return m_task_type == TaskType::Aggregate; }
+  bool is_aggregate() const noexcept {
+    return m_task_type == TaskType::Aggregate;
+  }
 
   KOKKOS_INLINE_FUNCTION
-  bool is_runnable() const noexcept { return m_task_type != TaskType::Aggregate; }
+  bool is_runnable() const noexcept {
+    return m_task_type != TaskType::Aggregate;
+  }
 
   KOKKOS_INLINE_FUNCTION
-  bool is_runnable() const volatile noexcept { return m_task_type != TaskType::Aggregate; }
+  bool is_runnable() const volatile noexcept {
+    return m_task_type != TaskType::Aggregate;
+  }
 
   KOKKOS_INLINE_FUNCTION
-  bool is_single_runnable() const noexcept { return m_task_type == TaskType::TaskSingle; }
+  bool is_single_runnable() const noexcept {
+    return m_task_type == TaskType::TaskSingle;
+  }
 
   KOKKOS_INLINE_FUNCTION
-  bool is_team_runnable() const noexcept { return m_task_type == TaskType::TaskTeam; }
+  bool is_team_runnable() const noexcept {
+    return m_task_type == TaskType::TaskTeam;
+  }
 
   KOKKOS_INLINE_FUNCTION
   TaskType get_task_type() const noexcept { return m_task_type; }
 
   KOKKOS_INLINE_FUNCTION
-  RunnableTaskBase<TaskQueueTraits>&
-  as_runnable_task() & {
+  RunnableTaskBase<TaskQueueTraits>& as_runnable_task() & {
     KOKKOS_EXPECTS(this->is_runnable());
     return static_cast<RunnableTaskBase<TaskQueueTraits>&>(*this);
   }
 
   KOKKOS_INLINE_FUNCTION
-  RunnableTaskBase<TaskQueueTraits> const&
-  as_runnable_task() const & {
+  RunnableTaskBase<TaskQueueTraits> const& as_runnable_task() const& {
     KOKKOS_EXPECTS(this->is_runnable());
     return static_cast<RunnableTaskBase<TaskQueueTraits> const&>(*this);
   }
 
   KOKKOS_INLINE_FUNCTION
-  RunnableTaskBase<TaskQueueTraits> volatile&
-  as_runnable_task() volatile & {
+  RunnableTaskBase<TaskQueueTraits> volatile& as_runnable_task() volatile& {
     KOKKOS_EXPECTS(this->is_runnable());
     return static_cast<RunnableTaskBase<TaskQueueTraits> volatile&>(*this);
   }
 
   KOKKOS_INLINE_FUNCTION
-  RunnableTaskBase<TaskQueueTraits> const volatile&
-  as_runnable_task() const volatile & {
+  RunnableTaskBase<TaskQueueTraits> const volatile& as_runnable_task() const
+      volatile& {
     KOKKOS_EXPECTS(this->is_runnable());
-    return static_cast<RunnableTaskBase<TaskQueueTraits> const volatile&>(*this);
+    return static_cast<RunnableTaskBase<TaskQueueTraits> const volatile&>(
+        *this);
   }
 
   KOKKOS_INLINE_FUNCTION
-  RunnableTaskBase<TaskQueueTraits>&&
-  as_runnable_task() && {
+  RunnableTaskBase<TaskQueueTraits>&& as_runnable_task() && {
     KOKKOS_EXPECTS(this->is_runnable());
     return static_cast<RunnableTaskBase<TaskQueueTraits>&&>(*this);
   }
 
   template <class SchedulingInfo>
-  KOKKOS_INLINE_FUNCTION
-  AggregateTask<TaskQueueTraits, SchedulingInfo>&
+  KOKKOS_INLINE_FUNCTION AggregateTask<TaskQueueTraits, SchedulingInfo>&
   as_aggregate() & {
     KOKKOS_EXPECTS(this->is_aggregate());
     return static_cast<AggregateTask<TaskQueueTraits, SchedulingInfo>&>(*this);
   }
 
   template <class SchedulingInfo>
-  KOKKOS_INLINE_FUNCTION
-  AggregateTask<TaskQueueTraits, SchedulingInfo> const&
-  as_aggregate() const & {
+  KOKKOS_INLINE_FUNCTION AggregateTask<TaskQueueTraits, SchedulingInfo> const&
+  as_aggregate() const& {
     KOKKOS_EXPECTS(this->is_aggregate());
-    return static_cast<AggregateTask<TaskQueueTraits, SchedulingInfo> const&>(*this);
+    return static_cast<AggregateTask<TaskQueueTraits, SchedulingInfo> const&>(
+        *this);
   }
 
   template <class SchedulingInfo>
-  KOKKOS_INLINE_FUNCTION
-  AggregateTask<TaskQueueTraits, SchedulingInfo>&&
+  KOKKOS_INLINE_FUNCTION AggregateTask<TaskQueueTraits, SchedulingInfo>&&
   as_aggregate() && {
     KOKKOS_EXPECTS(this->is_aggregate());
     return static_cast<AggregateTask<TaskQueueTraits, SchedulingInfo>&&>(*this);
@@ -304,8 +307,7 @@ public:
   }
 
   template <class Function>
-  KOKKOS_INLINE_FUNCTION
-  void consume_wait_queue(Function&& f) {
+  KOKKOS_INLINE_FUNCTION void consume_wait_queue(Function&& f) {
     KOKKOS_EXPECTS(not m_wait_queue.is_consumed());
     m_wait_queue.consume(std::forward<Function>(f));
   }
@@ -317,8 +319,7 @@ public:
   }
 
   KOKKOS_INLINE_FUNCTION
-  TaskQueueBase*
-  ready_queue_base_ptr() const noexcept {
+  TaskQueueBase* ready_queue_base_ptr() const noexcept {
     return m_ready_queue_base;
   }
 
@@ -343,15 +344,10 @@ public:
   bool get_respawn_flag() const { return m_is_respawning; }
 
   KOKKOS_INLINE_FUNCTION
-  void set_respawn_flag(bool value = true) {
-    m_is_respawning = value;
-  }
+  void set_respawn_flag(bool value = true) { m_is_respawning = value; }
 
   KOKKOS_INLINE_FUNCTION
-  void set_respawn_flag(bool value = true) volatile {
-    m_is_respawning = value;
-  }
-
+  void set_respawn_flag(bool value = true) volatile { m_is_respawning = value; }
 };
 
 //==============================================================================
@@ -363,127 +359,100 @@ class SchedulingInfoStorage;
 
 template <class BaseType, class SchedulingInfo>
 class SchedulingInfoStorage
-  : public BaseType, // must be first base class for allocation reasons!!!
-    private NoUniqueAddressMemberEmulation<SchedulingInfo>
-{
-
-private:
-
-  using base_t = BaseType;
+    : public BaseType,  // must be first base class for allocation reasons!!!
+      private NoUniqueAddressMemberEmulation<SchedulingInfo> {
+ private:
+  using base_t                    = BaseType;
   using task_scheduling_info_type = SchedulingInfo;
 
-public:
-
-  using base_t::base_t;
+ public:
+  // Can't just do using base_t::base_t because of stupid stuff with clang cuda
+  template <class... Args>
+  // requires std::is_constructible_v<base_t, Args&&...>
+  KOKKOS_INLINE_FUNCTION constexpr explicit SchedulingInfoStorage(
+      Args&&... args)
+      : base_t(std::forward<Args>(args)...) {}
 
   KOKKOS_INLINE_FUNCTION
-  task_scheduling_info_type& scheduling_info() &
-  {
+  task_scheduling_info_type& scheduling_info() & {
     return this->no_unique_address_data_member();
   }
 
   KOKKOS_INLINE_FUNCTION
-  task_scheduling_info_type const& scheduling_info() const &
-  {
+  task_scheduling_info_type const& scheduling_info() const& {
     return this->no_unique_address_data_member();
   }
 
   KOKKOS_INLINE_FUNCTION
-  task_scheduling_info_type&& scheduling_info() &&
-  {
+  task_scheduling_info_type&& scheduling_info() && {
     return std::move(*this).no_unique_address_data_member();
   }
-
 };
 
-
 //==============================================================================
 
 template <class TaskQueueTraits, class SchedulingInfo>
 class alignas(16) AggregateTask final
-  : public SchedulingInfoStorage<
-      TaskNode<TaskQueueTraits>,
-      SchedulingInfo
-    >, // must be first base class for allocation reasons!!!
-    public ObjectWithVLAEmulation<
-      AggregateTask<TaskQueueTraits, SchedulingInfo>,
-      OwningRawPtr<TaskNode<TaskQueueTraits>>
-    >
-{
-private:
-
-  using base_t = SchedulingInfoStorage<
-    TaskNode<TaskQueueTraits>,
-    SchedulingInfo
-  >;
-  using vla_base_t = ObjectWithVLAEmulation<
-    AggregateTask<TaskQueueTraits, SchedulingInfo>,
-    OwningRawPtr<TaskNode<TaskQueueTraits>>
-  >;
+    : public SchedulingInfoStorage<TaskNode<TaskQueueTraits>,
+                                   SchedulingInfo>,  // must be first base class
+                                                     // for allocation
+                                                     // reasons!!!
+      public ObjectWithVLAEmulation<
+          AggregateTask<TaskQueueTraits, SchedulingInfo>,
+          OwningRawPtr<TaskNode<TaskQueueTraits>>> {
+ private:
+  using base_t =
+      SchedulingInfoStorage<TaskNode<TaskQueueTraits>, SchedulingInfo>;
+  using vla_base_t =
+      ObjectWithVLAEmulation<AggregateTask<TaskQueueTraits, SchedulingInfo>,
+                             OwningRawPtr<TaskNode<TaskQueueTraits>>>;
 
   using task_base_type = TaskNode<TaskQueueTraits>;
 
-public:
-
-  using aggregate_task_type = AggregateTask; // concept marker
+ public:
+  using aggregate_task_type = AggregateTask;  // concept marker
 
   template <class... Args>
-    // requires std::is_constructible_v<base_t, Args&&...>
-  KOKKOS_INLINE_FUNCTION
-  constexpr explicit
-  AggregateTask(
-    int32_t aggregate_predecessor_count,
-    Args&&... args
-  ) : base_t(
-        TaskType::Aggregate,
-        TaskPriority::Regular, // all aggregates are regular priority
-        std::forward<Args>(args)...
-      ),
-      vla_base_t(aggregate_predecessor_count)
-  { }
+  // requires std::is_constructible_v<base_t, Args&&...>
+  KOKKOS_INLINE_FUNCTION constexpr explicit AggregateTask(
+      int32_t aggregate_predecessor_count, Args&&... args)
+      : base_t(TaskType::Aggregate,
+               TaskPriority::Regular,  // all aggregates are regular priority
+               std::forward<Args>(args)...),
+        vla_base_t(aggregate_predecessor_count) {}
 
   KOKKOS_INLINE_FUNCTION
   int32_t dependence_count() const { return this->n_vla_entries(); }
-
 };
 
-//KOKKOS_IMPL_IS_CONCEPT(aggregate_task);
+// KOKKOS_IMPL_IS_CONCEPT(aggregate_task);
 
 //==============================================================================
 
-
 template <class TaskQueueTraits>
 class RunnableTaskBase
-  : public TaskNode<TaskQueueTraits> // must be first base class for allocation reasons!!!
+    : public TaskNode<TaskQueueTraits>  // must be first base class for
+                                        // allocation reasons!!!
 {
-private:
-
+ private:
   using base_t = TaskNode<TaskQueueTraits>;
 
-public:
-
-  using task_base_type = TaskNode<TaskQueueTraits>;
-  using function_type = void(*)( task_base_type * , void * );
-  using destroy_type = void(*)( task_base_type * );
+ public:
+  using task_base_type     = TaskNode<TaskQueueTraits>;
+  using function_type      = void (*)(task_base_type*, void*);
+  using destroy_type       = void (*)(task_base_type*);
   using runnable_task_type = RunnableTaskBase;
 
-private:
-
+ private:
   function_type m_apply;
   task_base_type* m_predecessor = nullptr;
 
-public:
-
+ public:
   template <class... Args>
-    // requires std::is_constructible_v<base_t, Args&&...>
-  KOKKOS_INLINE_FUNCTION
-  constexpr explicit
-  RunnableTaskBase(
-    function_type apply_function_ptr,
-    Args&&... args
-  ) : base_t(std::forward<Args>(args)...),
-      m_apply(apply_function_ptr)
-  { }
+  // requires std::is_constructible_v<base_t, Args&&...>
+  KOKKOS_INLINE_FUNCTION constexpr explicit RunnableTaskBase(
+      function_type apply_function_ptr, Args&&... args)
+      : base_t(std::forward<Args>(args)...), m_apply(apply_function_ptr) {}
 
   KOKKOS_INLINE_FUNCTION
   bool has_predecessor() const { return m_predecessor != nullptr; }
@@ -495,26 +464,21 @@ public:
   void clear_predecessor() volatile { m_predecessor = nullptr; }
 
   template <class SchedulingInfo>
-  KOKKOS_INLINE_FUNCTION
-  SchedulingInfo&
-  scheduling_info_as()
-  {
-    using info_storage_type = SchedulingInfoStorage<RunnableTaskBase, SchedulingInfo>;
+  KOKKOS_INLINE_FUNCTION SchedulingInfo& scheduling_info_as() {
+    using info_storage_type =
+        SchedulingInfoStorage<RunnableTaskBase, SchedulingInfo>;
 
     return static_cast<info_storage_type*>(this)->scheduling_info();
   }
 
   template <class SchedulingInfo>
-  KOKKOS_INLINE_FUNCTION
-  SchedulingInfo const&
-  scheduling_info_as() const
-  {
-    using info_storage_type = SchedulingInfoStorage<RunnableTaskBase, SchedulingInfo>;
+  KOKKOS_INLINE_FUNCTION SchedulingInfo const& scheduling_info_as() const {
+    using info_storage_type =
+        SchedulingInfoStorage<RunnableTaskBase, SchedulingInfo>;
 
     return static_cast<info_storage_type const*>(this)->scheduling_info();
   }
 
-
   KOKKOS_INLINE_FUNCTION
   task_base_type& get_predecessor() const {
     KOKKOS_EXPECTS(m_predecessor != nullptr);
@@ -522,8 +486,7 @@ public:
   }
 
   KOKKOS_INLINE_FUNCTION
-  void set_predecessor(task_base_type& predecessor)
-  {
+  void set_predecessor(task_base_type& predecessor) {
     KOKKOS_EXPECTS(m_predecessor == nullptr);
     // Increment the reference count so that predecessor doesn't go away
     // before this task is enqueued.
@@ -533,53 +496,53 @@ public:
   }
 
   KOKKOS_INLINE_FUNCTION
-  void acquire_predecessor_from(runnable_task_type& other)
-  {
-    KOKKOS_EXPECTS(m_predecessor == nullptr || other.m_predecessor == m_predecessor);
-    // since we're transfering, no need to modify the reference count
-    m_predecessor = other.m_predecessor;
+  void acquire_predecessor_from(runnable_task_type& other) {
+    KOKKOS_EXPECTS(m_predecessor == nullptr ||
+                   other.m_predecessor == m_predecessor);
+    // since we're transferring, no need to modify the reference count
+    m_predecessor       = other.m_predecessor;
     other.m_predecessor = nullptr;
   }
 
   KOKKOS_INLINE_FUNCTION
-  void acquire_predecessor_from(runnable_task_type& other) volatile
-  {
-    KOKKOS_EXPECTS(m_predecessor == nullptr || other.m_predecessor == m_predecessor);
-    // since we're transfering, no need to modify the reference count
-    m_predecessor = other.m_predecessor;
+  void acquire_predecessor_from(runnable_task_type& other) volatile {
+    KOKKOS_EXPECTS(m_predecessor == nullptr ||
+                   other.m_predecessor == m_predecessor);
+    // since we're transferring, no need to modify the reference count
+    m_predecessor       = other.m_predecessor;
     other.m_predecessor = nullptr;
   }
 
   template <class TeamMember>
-  KOKKOS_INLINE_FUNCTION
-  void run(TeamMember& member) {
+  KOKKOS_INLINE_FUNCTION void run(TeamMember& member) {
     (*m_apply)(this, &member);
   }
 };
 
-//KOKKOS_IMPL_IS_CONCEPT(runnable_task);
+// KOKKOS_IMPL_IS_CONCEPT(runnable_task);
 
 //==============================================================================
 
 template <class ResultType, class Base>
-class TaskResultStorage : public Base
-{
-private:
-
+class TaskResultStorage : public Base {
+ private:
   using base_t = Base;
 
   alignas(Base) ResultType m_value = ResultType{};
 
-
-public:
-
-  using base_t::base_t;
+ public:
+  // using base_t::base_t;
+  // Can't just do using base_t::base_t because of stupid stuff with clang cuda
+  template <class... Args>
+  // requires std::is_constructible_v<base_t, Args&&...>
+  KOKKOS_INLINE_FUNCTION constexpr explicit TaskResultStorage(Args&&... args)
+      : base_t(std::forward<Args>(args)...) {}
 
   KOKKOS_INLINE_FUNCTION
   ResultType* value_pointer() {
     // Over-alignment makes this a non-standard-layout class,
     // so alignas() doesn't work
-    //static_assert(
+    // static_assert(
     //  offsetof(TaskResultStorage, m_value) == sizeof(Base),
     //  "TaskResultStorage must be POD for layout purposes"
     //);
@@ -588,131 +551,111 @@ public:
 
   KOKKOS_INLINE_FUNCTION
   ResultType& value_reference() { return m_value; }
-
 };
 
-
-// TODO @tasking @optimization DSH optimization for empty types (in addition to void)
+// TODO @tasking @optimization DSH optimization for empty types (in addition to
+// void)
 template <class Base>
-class TaskResultStorage<void, Base> : public Base
-{
-private:
-
+class TaskResultStorage<void, Base> : public Base {
+ private:
   using base_t = Base;
 
-public:
-
-  using base_t::base_t;
+ public:
+  // using base_t::base_t;
+  // Can't just do using base_t::base_t because of stupid stuff with clang cuda
+  template <class... Args>
+  // requires std::is_constructible_v<base_t, Args&&...>
+  KOKKOS_INLINE_FUNCTION constexpr explicit TaskResultStorage(Args&&... args)
+      : base_t(std::forward<Args>(args)...) {}
 
   KOKKOS_INLINE_FUNCTION
   void* value_pointer() noexcept { return nullptr; }
 
   KOKKOS_INLINE_FUNCTION
-  void value_reference() noexcept { }
-
+  void value_reference() noexcept {}
 };
 
 //==============================================================================
 
-template <
-  class TaskQueueTraits,
-  class Scheduler,
-  class ResultType,
-  class FunctorType
->
+template <class TaskQueueTraits, class Scheduler, class ResultType,
+          class FunctorType>
 class alignas(16) RunnableTask
-  : // using nesting of base classes to control layout; multiple empty base classes
-    // may not be ABI compatible with CUDA on Windows
-    public TaskResultStorage<
+    :  // using nesting of base classes to control layout; multiple empty base
+       // classes may not be ABI compatible with CUDA on Windows
+       public TaskResultStorage<
+           ResultType,
+           SchedulingInfoStorage<RunnableTaskBase<TaskQueueTraits>,
+                                 typename Scheduler::task_queue_type::
+                                     task_scheduling_info_type>>,  // must be
+                                                                   // first base
+                                                                   // class
+       public FunctorType {
+ private:
+  using base_t = TaskResultStorage<
       ResultType,
       SchedulingInfoStorage<
-        RunnableTaskBase<TaskQueueTraits>,
-        typename Scheduler::task_queue_type::task_scheduling_info_type
-      >
-    >, // must be first base class
-    public FunctorType
-{
-private:
-  using base_t = TaskResultStorage<
-    ResultType,
-    SchedulingInfoStorage<
-      RunnableTaskBase<TaskQueueTraits>,
-      typename Scheduler::task_queue_type::task_scheduling_info_type
-    >
-  >;
+          RunnableTaskBase<TaskQueueTraits>,
+          typename Scheduler::task_queue_type::task_scheduling_info_type>>;
 
   using runnable_task_base_type = RunnableTaskBase<TaskQueueTraits>;
-  using scheduler_type = Scheduler;
+  using scheduler_type          = Scheduler;
   using scheduling_info_type =
       typename scheduler_type::task_scheduling_info_type;
   using scheduling_info_storage_base = base_t;
 
   using task_base_type = TaskNode<TaskQueueTraits>;
   using specialization = TaskQueueSpecialization<scheduler_type>;
-  using member_type = typename specialization::member_type;
-  using result_type = ResultType;
-  using functor_type = FunctorType;
-
-public:
+  using member_type    = typename specialization::member_type;
+  using result_type    = ResultType;
+  using functor_type   = FunctorType;
 
+ public:
   template <class... Args>
-    // requires std::is_constructible_v<base_t, Args&&...>
-  KOKKOS_INLINE_FUNCTION
-  constexpr explicit
-  RunnableTask(
-    FunctorType&& functor,
-    Args&&... args
-  ) : base_t(
-        std::forward<Args>(args)...
-      ),
-      functor_type(std::move(functor))
-  { }
+  // requires std::is_constructible_v<base_t, Args&&...>
+  KOKKOS_INLINE_FUNCTION constexpr explicit RunnableTask(FunctorType&& functor,
+                                                         Args&&... args)
+      : base_t(std::forward<Args>(args)...), functor_type(std::move(functor)) {}
 
   KOKKOS_INLINE_FUNCTION
   ~RunnableTask() = delete;
 
   KOKKOS_INLINE_FUNCTION
-  void update_scheduling_info(
-    member_type& member
-  ) {
-    // TODO @tasking @generalization DSH call a queue-specific hook here; for now, this info is already updated elsewhere
-    // this->scheduling_info() = member.scheduler().scheduling_info();
+  void update_scheduling_info(member_type& member) {
+    // TODO @tasking @generalization DSH call a queue-specific hook here; for
+    // now, this info is already updated elsewhere this->scheduling_info() =
+    // member.scheduler().scheduling_info();
   }
 
   KOKKOS_INLINE_FUNCTION
-  void apply_functor(member_type* member, void*)
-  {
+  void apply_functor(member_type* member, void*) {
     update_scheduling_info(*member);
     this->functor_type::operator()(*member);
   }
 
   template <typename T>
-  KOKKOS_INLINE_FUNCTION
-  void apply_functor(member_type* member, T* val)
-  {
+  KOKKOS_INLINE_FUNCTION void apply_functor(member_type* member, T* val) {
     update_scheduling_info(*member);
-    //this->functor_type::operator()(*member, *val);
+    // this->functor_type::operator()(*member, *val);
     this->functor_type::operator()(*member, *val);
   }
 
-  KOKKOS_FUNCTION static
-  void destroy( task_base_type * root )
-  {
-    //TaskResult<result_type>::destroy(root);
+  KOKKOS_FUNCTION static void destroy(task_base_type* root) {
+    // TaskResult<result_type>::destroy(root);
   }
 
-  KOKKOS_FUNCTION static
-  void apply(task_base_type* self, void* member_as_void)
-  {
-    using task_type = Impl::RunnableTask<TaskQueueTraits, Scheduler, ResultType, FunctorType>*;
-    auto* const task = static_cast<task_type>(self);
+  KOKKOS_FUNCTION static void apply(task_base_type* self,
+                                    void* member_as_void) {
+    using task_type = Impl::RunnableTask<TaskQueueTraits, Scheduler, ResultType,
+                                         FunctorType>*;
+    auto* const task   = static_cast<task_type>(self);
     auto* const member = reinterpret_cast<member_type*>(member_as_void);
 
-    // Now that we're over-aligning the result storage, this isn't a problem any more
-    //static_assert(std::is_standard_layout<task_type>::value,
+    // Now that we're over-aligning the result storage, this isn't a problem any
+    // more
+    // static_assert(std::is_standard_layout<task_type>::value,
     //  "Tasks must be standard layout"
     //);
-    //static_assert(std::is_pod<task_type>::value,
+    // static_assert(std::is_pod<task_type>::value,
     //  "Tasks must be PODs"
     //);
 
@@ -722,32 +665,30 @@ public:
 
     const bool only_one_thread =
 #if defined(KOKKOS_ACTIVE_EXECUTION_MEMORY_SPACE_CUDA)
-      0 == threadIdx.x && 0 == threadIdx.y ;
+        0 == threadIdx.x && 0 == threadIdx.y;
 #else
-      0 == member->team_rank();
+        0 == member->team_rank();
 #endif
 
     // Ensure that the respawn flag is set to zero
     self->set_respawn_flag(false);
 
-    //task->apply_functor(member, TaskResult<result_type>::ptr(task));
+    // task->apply_functor(member, TaskResult<result_type>::ptr(task));
     task->apply_functor(member, task->value_pointer());
 
     member->team_barrier();
 
-    if ( only_one_thread && !(task->get_respawn_flag()) ) {
+    if (only_one_thread && !(task->get_respawn_flag())) {
       // Did not respawn, destroy the functor to free memory.
       task->functor_type::~functor_type();
       // Cannot destroy and deallocate the task until its dependences
       // have been processed.
     }
   }
-
 };
 
 } /* namespace Impl */
 
-
 } /* namespace Kokkos */
 
 //----------------------------------------------------------------------------
@@ -755,4 +696,3 @@ public:
 
 #endif /* #if defined( KOKKOS_ENABLE_TASKDAG ) */
 #endif /* #ifndef KOKKOS_IMPL_TASKNODE_HPP */
-
diff --git a/lib/kokkos/core/src/impl/Kokkos_TaskPolicyData.hpp b/lib/kokkos/core/src/impl/Kokkos_TaskPolicyData.hpp
index 85e665fffc..c5b8c2fc68 100644
--- a/lib/kokkos/core/src/impl/Kokkos_TaskPolicyData.hpp
+++ b/lib/kokkos/core/src/impl/Kokkos_TaskPolicyData.hpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -47,7 +48,7 @@
 //----------------------------------------------------------------------------
 
 #include <Kokkos_Macros.hpp>
-#if defined( KOKKOS_ENABLE_TASKDAG )
+#if defined(KOKKOS_ENABLE_TASKDAG)
 
 #include <Kokkos_Core_fwd.hpp>
 #include <Kokkos_TaskScheduler_fwd.hpp>
@@ -60,23 +61,17 @@ namespace Impl {
 
 //----------------------------------------------------------------------------
 
-template<int TaskEnum, typename DepFutureType>
-struct TaskPolicyWithPredecessor
-{
-private:
-
+template <int TaskEnum, typename DepFutureType>
+struct TaskPolicyWithPredecessor {
+ private:
   DepFutureType m_predecessor;
   Kokkos::TaskPriority m_priority;
 
-public:
-
+ public:
   KOKKOS_INLINE_FUNCTION
-  TaskPolicyWithPredecessor(
-    DepFutureType arg_predecessor,
-    Kokkos::TaskPriority arg_priority
-  ) : m_predecessor(std::move(arg_predecessor)),
-      m_priority(arg_priority)
-  { }
+  TaskPolicyWithPredecessor(DepFutureType arg_predecessor,
+                            Kokkos::TaskPriority arg_priority)
+      : m_predecessor(std::move(arg_predecessor)), m_priority(arg_priority) {}
 
   TaskPolicyWithPredecessor() = delete;
 
@@ -87,61 +82,50 @@ public:
   TaskPolicyWithPredecessor(TaskPolicyWithPredecessor&&) = default;
 
   KOKKOS_INLINE_FUNCTION
-  TaskPolicyWithPredecessor& operator=(TaskPolicyWithPredecessor const&) = default;
+  TaskPolicyWithPredecessor& operator=(TaskPolicyWithPredecessor const&) =
+      default;
 
   KOKKOS_INLINE_FUNCTION
   TaskPolicyWithPredecessor& operator=(TaskPolicyWithPredecessor&&) = default;
-  
+
   KOKKOS_INLINE_FUNCTION
   ~TaskPolicyWithPredecessor() = default;
 
   KOKKOS_INLINE_FUNCTION
-  DepFutureType&& predecessor() && {
-    return std::move(m_predecessor);
-  }
+  DepFutureType&& predecessor() && { return std::move(m_predecessor); }
 
   KOKKOS_INLINE_FUNCTION
   constexpr TaskPriority priority() const { return m_priority; }
 
   KOKKOS_INLINE_FUNCTION
   static constexpr int task_type() noexcept { return TaskEnum; }
-
 };
 
 // TODO @tasking @cleanup DSH clean this up. Using nullptr_t here is too clever
-template<int TaskEnum, typename Scheduler, typename PredecessorFuture=std::nullptr_t>
-struct TaskPolicyWithScheduler
-{
-public:
-
+template <int TaskEnum, typename Scheduler,
+          typename PredecessorFuture = std::nullptr_t>
+struct TaskPolicyWithScheduler {
+ public:
   using predecessor_future_type = PredecessorFuture;
 
-private:
-
+ private:
   Scheduler m_scheduler;
   Kokkos::TaskPriority m_priority;
   predecessor_future_type m_predecessor;
 
-public:
-
+ public:
+  KOKKOS_INLINE_FUNCTION
+  TaskPolicyWithScheduler(Scheduler arg_scheduler,
+                          Kokkos::TaskPriority arg_priority)
+      : m_scheduler(std::move(arg_scheduler)), m_priority(arg_priority) {}
 
   KOKKOS_INLINE_FUNCTION
-  TaskPolicyWithScheduler(
-    Scheduler arg_scheduler,
-    Kokkos::TaskPriority arg_priority
-  ) : m_scheduler(std::move(arg_scheduler)),
-      m_priority(arg_priority)
-  { }
-
-  KOKKOS_INLINE_FUNCTION
-  TaskPolicyWithScheduler(
-    Scheduler arg_scheduler,
-    predecessor_future_type arg_predecessor,
-    Kokkos::TaskPriority arg_priority
-  ) : m_scheduler(std::move(arg_scheduler)),
-      m_priority(arg_priority),
-      m_predecessor(std::move(arg_predecessor))
-  { }
+  TaskPolicyWithScheduler(Scheduler arg_scheduler,
+                          predecessor_future_type arg_predecessor,
+                          Kokkos::TaskPriority arg_priority)
+      : m_scheduler(std::move(arg_scheduler)),
+        m_priority(arg_priority),
+        m_predecessor(std::move(arg_predecessor)) {}
 
   TaskPolicyWithScheduler() = delete;
 
@@ -150,10 +134,10 @@ public:
 
   KOKKOS_INLINE_FUNCTION
   TaskPolicyWithScheduler(TaskPolicyWithScheduler&&) = default;
- 
+
   KOKKOS_INLINE_FUNCTION
   TaskPolicyWithScheduler& operator=(TaskPolicyWithScheduler const&) = default;
-  
+
   KOKKOS_INLINE_FUNCTION
   TaskPolicyWithScheduler& operator=(TaskPolicyWithScheduler&&) = default;
 
@@ -161,35 +145,28 @@ public:
   ~TaskPolicyWithScheduler() = default;
 
   KOKKOS_INLINE_FUNCTION
-  Scheduler& scheduler() & {
-    return m_scheduler;
-  }
+  Scheduler& scheduler() & { return m_scheduler; }
 
   KOKKOS_INLINE_FUNCTION
   constexpr TaskPriority priority() const { return m_priority; }
 
   KOKKOS_INLINE_FUNCTION
-  predecessor_future_type& predecessor() & {
-    return m_predecessor;
-  }
+  predecessor_future_type& predecessor() & { return m_predecessor; }
 
   KOKKOS_INLINE_FUNCTION
-  static constexpr bool has_predecessor() noexcept
-  {
+  static constexpr bool has_predecessor() noexcept {
     return not std::is_same<PredecessorFuture, std::nullptr_t>::value;
   }
 
   KOKKOS_INLINE_FUNCTION
   static constexpr int task_type() noexcept { return TaskEnum; }
-
 };
 
-} // namespace Impl
-} // namespace Kokkos
+}  // namespace Impl
+}  // namespace Kokkos
 
 //----------------------------------------------------------------------------
 //----------------------------------------------------------------------------
 
 #endif /* #if defined( KOKKOS_ENABLE_TASKDAG ) */
 #endif /* #ifndef KOKKOS_IMPL_TASKPOLICYDATA_HPP */
-
diff --git a/lib/kokkos/core/src/impl/Kokkos_TaskQueue.hpp b/lib/kokkos/core/src/impl/Kokkos_TaskQueue.hpp
index 1adcfe4cc4..f7787dae0c 100644
--- a/lib/kokkos/core/src/impl/Kokkos_TaskQueue.hpp
+++ b/lib/kokkos/core/src/impl/Kokkos_TaskQueue.hpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -47,8 +48,7 @@
 #define KOKKOS_IMPL_TASKQUEUE_HPP
 
 #include <Kokkos_Macros.hpp>
-#if defined( KOKKOS_ENABLE_TASKDAG )
-
+#if defined(KOKKOS_ENABLE_TASKDAG)
 
 #include <Kokkos_TaskScheduler_fwd.hpp>
 #include <Kokkos_Core_fwd.hpp>
@@ -67,23 +67,20 @@
 #include <typeinfo>
 #include <stdexcept>
 
-
 //----------------------------------------------------------------------------
 //----------------------------------------------------------------------------
 
 namespace Kokkos {
 namespace Impl {
 
-
 /** \brief  Manage task allocation, deallocation, and scheduling.
  *
  *  Task execution is deferred to the TaskQueueSpecialization.
  *  All other aspects of task management have shared implementation.
  */
-template< typename ExecSpace, typename MemorySpace >
+template <typename ExecSpace, typename MemorySpace>
 class TaskQueue : public TaskQueueBase {
-protected:
-
+ protected:
   template <class>
   friend struct TaskQueueSpecialization;
   template <class, class>
@@ -92,14 +89,14 @@ protected:
   friend class Kokkos::BasicTaskScheduler;
 
   using execution_space = ExecSpace;
-  using memory_space = MemorySpace;
-  using device_type = Kokkos::Device< execution_space , memory_space > ;
-  using memory_pool = Kokkos::MemoryPool< device_type > ;
-  using task_root_type = Kokkos::Impl::TaskBase;
+  using memory_space    = MemorySpace;
+  using device_type     = Kokkos::Device<execution_space, memory_space>;
+  using memory_pool     = Kokkos::MemoryPool<device_type>;
+  using task_root_type  = Kokkos::Impl::TaskBase;
   using team_queue_type = TaskQueue;
 
   struct Destroy {
-    TaskQueue * m_queue ;
+    TaskQueue* m_queue;
     void destroy_shared_allocation();
   };
 
@@ -109,23 +106,24 @@ protected:
 
   // Queue is organized as [ priority ][ type ]
 
-  memory_pool               m_memory ;
-  task_root_type * volatile m_ready[ NumQueue ][ 2 ];
-  //long                      m_accum_alloc ; // Accumulated number of allocations
-  int                       m_count_alloc = 0 ; // Current number of allocations
-  int                       m_max_alloc ;   // Maximum number of allocations
-  int                       m_ready_count ; // Number of ready or executing
+  memory_pool m_memory;
+  task_root_type* volatile m_ready[NumQueue][2];
+  // long                      m_accum_alloc ; // Accumulated number of
+  // allocations
+  int m_count_alloc = 0;  // Current number of allocations
+  int m_max_alloc;        // Maximum number of allocations
+  int m_ready_count;      // Number of ready or executing
 
   //----------------------------------------
 
   ~TaskQueue();
-  TaskQueue() = delete ;
-  TaskQueue( TaskQueue && ) = delete ;
-  TaskQueue( TaskQueue const & ) = delete ;
-  TaskQueue & operator = ( TaskQueue && ) = delete ;
-  TaskQueue & operator = ( TaskQueue const & ) = delete ;
+  TaskQueue()                 = delete;
+  TaskQueue(TaskQueue&&)      = delete;
+  TaskQueue(TaskQueue const&) = delete;
+  TaskQueue& operator=(TaskQueue&&) = delete;
+  TaskQueue& operator=(TaskQueue const&) = delete;
 
-  TaskQueue( const memory_pool & arg_memory_pool );
+  TaskQueue(const memory_pool& arg_memory_pool);
 
   // Schedule a task
   //   Precondition:
@@ -144,7 +142,7 @@ protected:
   //     task is in Executing-Respawn state
   //     task->m_next == 0 (no dependence)
   KOKKOS_FUNCTION
-  void reschedule( task_root_type * );
+  void reschedule(task_root_type*);
 
   // Complete a task
   //   Precondition:
@@ -155,27 +153,22 @@ protected:
   //     task->m_wait == LockTag  =>  task is complete
   //     task->m_wait != LockTag  =>  task is waiting
   KOKKOS_FUNCTION
-  void complete( task_root_type * );
+  void complete(task_root_type*);
 
   KOKKOS_FUNCTION
-  static bool push_task( task_root_type * volatile * const
-                       , task_root_type * const );
+  static bool push_task(task_root_type* volatile* const, task_root_type* const);
 
   KOKKOS_FUNCTION
-  static task_root_type * pop_ready_task( task_root_type * volatile * const );
+  static task_root_type* pop_ready_task(task_root_type* volatile* const);
 
-  KOKKOS_FUNCTION static
-  void decrement( task_root_type * task );
-
-
-public:
+  KOKKOS_FUNCTION static void decrement(task_root_type* task);
 
+ public:
   KOKKOS_INLINE_FUNCTION
   int allocation_count() const noexcept { return m_count_alloc; }
 
-
   KOKKOS_INLINE_FUNCTION
-  void initialize_team_queues(int pool_size) const noexcept { }
+  void initialize_team_queues(int pool_size) const noexcept {}
 
   KOKKOS_INLINE_FUNCTION
   task_root_type* attempt_to_steal_task() const noexcept { return nullptr; }
@@ -183,21 +176,18 @@ public:
   KOKKOS_INLINE_FUNCTION
   team_queue_type& get_team_queue(int team_rank) { return *this; }
 
-  //void execute() { specialization::execute( this ); }
+  // void execute() { specialization::execute( this ); }
 
-  template< typename FunctorType >
-  void proc_set_apply( typename task_root_type::function_type * ptr )
-    {
-      using specialization =
+  template <typename FunctorType>
+  void proc_set_apply(typename task_root_type::function_type* ptr) {
+    using specialization =
         TaskQueueSpecialization<BasicTaskScheduler<ExecSpace, TaskQueue>>;
-      specialization::template proc_set_apply< FunctorType >( ptr );
-    }
+    specialization::template proc_set_apply<FunctorType>(ptr);
+  }
 
   // Assign task pointer with reference counting of assigned tasks
-  KOKKOS_FUNCTION static
-  void assign( task_root_type ** const lhs
-             , task_root_type *  const rhs )
-    {
+  KOKKOS_FUNCTION static void assign(task_root_type** const lhs,
+                                     task_root_type* const rhs) {
 #if 0
   {
     printf( "assign( 0x%lx { 0x%lx %d %d } , 0x%lx { 0x%lx %d %d } )\n"
@@ -214,54 +204,54 @@ public:
   }
 #endif
 
-      if ( *lhs ) decrement( *lhs );
-      if ( rhs ) { Kokkos::atomic_increment( &(rhs->m_ref_count) ); }
-
-      // Force write of *lhs
-
-      *static_cast< task_root_type * volatile * >(lhs) = rhs ;
-
-      Kokkos::memory_fence();
+    if (*lhs) decrement(*lhs);
+    if (rhs) {
+      Kokkos::atomic_increment(&(rhs->m_ref_count));
     }
 
-  KOKKOS_FUNCTION
-  size_t allocate_block_size( size_t n ); ///< Actual block size allocated
+    // Force write of *lhs
+
+    *static_cast<task_root_type* volatile*>(lhs) = rhs;
+
+    Kokkos::memory_fence();
+  }
 
   KOKKOS_FUNCTION
-  void * allocate( size_t n ); ///< Allocate from the memory pool
+  size_t allocate_block_size(size_t n);  ///< Actual block size allocated
 
   KOKKOS_FUNCTION
-  void deallocate( void * p , size_t n ); ///< Deallocate to the memory pool
+  void* allocate(size_t n);  ///< Allocate from the memory pool
 
+  KOKKOS_FUNCTION
+  void deallocate(void* p, size_t n);  ///< Deallocate to the memory pool
 
   //----------------------------------------
   /**\brief  Allocation size for a spawned task */
 
-  template< typename FunctorType >
-  KOKKOS_FUNCTION
-  size_t spawn_allocation_size() const
-    {
-      using value_type = typename FunctorType::value_type ;
+  template <typename FunctorType>
+  KOKKOS_FUNCTION size_t spawn_allocation_size() const {
+    using value_type = typename FunctorType::value_type;
 
-      using task_type = Impl::Task<execution_space, value_type, FunctorType> ;
+    using task_type = Impl::Task<execution_space, value_type, FunctorType>;
 
-      enum : size_t { align = ( 1 << 4 ) , align_mask = align - 1 };
-      enum : size_t { task_size   = sizeof(task_type) };
-      enum : size_t { result_size = Impl::TaskResult< value_type >::size };
-      enum : size_t { alloc_size =
-        ( ( task_size   + align_mask ) & ~align_mask ) +
-        ( ( result_size + align_mask ) & ~align_mask ) };
+    enum : size_t { align = (1 << 4), align_mask = align - 1 };
+    enum : size_t { task_size = sizeof(task_type) };
+    enum : size_t { result_size = Impl::TaskResult<value_type>::size };
+    enum : size_t {
+      alloc_size = ((task_size + align_mask) & ~align_mask) +
+                   ((result_size + align_mask) & ~align_mask)
+    };
 
-      return m_memory.allocate_block_size( task_size );
-    }
+    return m_memory.allocate_block_size(task_size);
+  }
 
   /**\brief  Allocation size for a when_all aggregate */
 
   KOKKOS_FUNCTION
-  size_t when_all_allocation_size( int narg ) const
-    {
-      return m_memory.allocate_block_size( sizeof(task_root_type) + narg * sizeof(task_root_type*) );
-    }
+  size_t when_all_allocation_size(int narg) const {
+    return m_memory.allocate_block_size(sizeof(task_root_type) +
+                                        narg * sizeof(task_root_type*));
+  }
 };
 
 } /* namespace Impl */
@@ -272,4 +262,3 @@ public:
 
 #endif /* #if defined( KOKKOS_ENABLE_TASKDAG ) */
 #endif /* #ifndef KOKKOS_IMPL_TASKQUEUE_HPP */
-
diff --git a/lib/kokkos/core/src/impl/Kokkos_TaskQueueCommon.hpp b/lib/kokkos/core/src/impl/Kokkos_TaskQueueCommon.hpp
index b0685506d4..b3444420d6 100644
--- a/lib/kokkos/core/src/impl/Kokkos_TaskQueueCommon.hpp
+++ b/lib/kokkos/core/src/impl/Kokkos_TaskQueueCommon.hpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -45,8 +46,7 @@
 #define KOKKOS_IMPL_TASKQUEUECOMMON_HPP
 
 #include <Kokkos_Macros.hpp>
-#if defined( KOKKOS_ENABLE_TASKDAG )
-
+#if defined(KOKKOS_ENABLE_TASKDAG)
 
 #include <Kokkos_TaskScheduler_fwd.hpp>
 #include <Kokkos_Core_fwd.hpp>
@@ -66,34 +66,30 @@
 #include <typeinfo>
 #include <stdexcept>
 
-
 //----------------------------------------------------------------------------
 //----------------------------------------------------------------------------
 
 namespace Kokkos {
 namespace Impl {
 
-/// @brief CRTP Base class implementing the ready count parts common to most task queues
+/// @brief CRTP Base class implementing the ready count parts common to most
+/// task queues
 template <class Derived>
-class TaskQueueCommonMixin
-{
-private:
-
+class TaskQueueCommonMixin {
+ private:
   int32_t m_ready_count = 0;
 
   // CRTP boilerplate
   KOKKOS_INLINE_FUNCTION
   Derived& _self() { return *static_cast<Derived*>(this); }
 
-public:
-
+ public:
   //----------------------------------------------------------------------------
   // <editor-fold desc="Constructors, destructor, and assignment"> {{{2
 
-  TaskQueueCommonMixin()
-    : m_ready_count(0)
-  {
-    // TODO @tasking @memory_order DSH figure out if I need this store to be atomic
+  TaskQueueCommonMixin() : m_ready_count(0) {
+    // TODO @tasking @memory_order DSH figure out if I need this store to be
+    // atomic
   }
 
   ~TaskQueueCommonMixin() {
@@ -104,12 +100,10 @@ public:
   // </editor-fold> end Constructors, destructor, and assignment }}}2
   //----------------------------------------------------------------------------
 
-
   //----------------------------------------------------------------------------
   // <editor-fold desc="Task and queue completion"> {{{2
 
-private:
-
+ private:
   // This would be more readable with a lambda, but that comes with
   // all the baggage associated with a lambda (compilation times, bugs with
   // nvcc, etc.), so we'll use a simple little helper functor here.
@@ -120,57 +114,43 @@ private:
     TeamSchedulerInfo const& m_info;
     KOKKOS_INLINE_FUNCTION
     void operator()(TaskNode<TaskQueueTraits>&& task) const noexcept
-      // requires Same<TaskType, Derived::task_base_type>
+    // requires Same<TaskType, Derived::task_base_type>
     {
-      using task_scheduling_info_type = typename Derived::task_scheduling_info_type;
-      if(task.is_runnable()) // KOKKOS_LIKELY
+      using task_scheduling_info_type =
+          typename Derived::task_scheduling_info_type;
+      if (task.is_runnable())  // KOKKOS_LIKELY
       {
         // TODO @tasking @optimiazation DSH check this outside of the loop ?
-        if(m_predecessor.is_runnable()) {
+        if (m_predecessor.is_runnable()) {
           m_queue.update_scheduling_info_from_completed_predecessor(
-            /* ready_task = */ task.as_runnable_task(),
-            /* predecessor = */ m_predecessor.as_runnable_task()
-          );
-        }
-        else {
+              /* ready_task = */ task.as_runnable_task(),
+              /* predecessor = */ m_predecessor.as_runnable_task());
+        } else {
           KOKKOS_ASSERT(m_predecessor.is_aggregate());
           m_queue.update_scheduling_info_from_completed_predecessor(
-            /* ready_task = */ task.as_runnable_task(),
-            /* predecessor = */ m_predecessor.template as_aggregate<task_scheduling_info_type>()
-          );
+              /* ready_task = */ task.as_runnable_task(),
+              /* predecessor = */ m_predecessor
+                  .template as_aggregate<task_scheduling_info_type>());
         }
-        m_queue.schedule_runnable(
-          std::move(task).as_runnable_task(),
-          m_info
-        );
-      }
-      else {
+        m_queue.schedule_runnable(std::move(task).as_runnable_task(), m_info);
+      } else {
         // The scheduling info update happens inside of schedule_aggregate
         m_queue.schedule_aggregate(
-          std::move(task).template as_aggregate<task_scheduling_info_type>(),
-          m_info
-        );
+            std::move(task).template as_aggregate<task_scheduling_info_type>(),
+            m_info);
       }
     }
   };
 
-protected:
-
+ protected:
   template <class TaskQueueTraits, class TeamSchedulerInfo>
-  KOKKOS_FUNCTION
-  void _complete_finished_task(
-    TaskNode<TaskQueueTraits>&& task,
-    TeamSchedulerInfo const& info
-  ) {
+  KOKKOS_FUNCTION void _complete_finished_task(TaskNode<TaskQueueTraits>&& task,
+                                               TeamSchedulerInfo const& info) {
     task.consume_wait_queue(
-      _schedule_waiting_tasks_operation<TaskQueueTraits, TeamSchedulerInfo>{
-        task,
-        _self(),
-        info
-      }
-    );
+        _schedule_waiting_tasks_operation<TaskQueueTraits, TeamSchedulerInfo>{
+            task, _self(), info});
     bool should_delete = task.decrement_and_check_reference_count();
-    if(should_delete) {
+    if (should_delete) {
       _self().deallocate(std::move(task));
     }
   }
@@ -188,8 +168,7 @@ protected:
     Kokkos::memory_fence();
   }
 
-public:
-
+ public:
   KOKKOS_INLINE_FUNCTION
   bool is_done() const noexcept {
     // TODO @tasking @memory_order DSH Memory order, instead of volatile
@@ -203,17 +182,11 @@ public:
   }
 
   template <class TaskQueueTraits, class TeamSchedulerInfo>
-  KOKKOS_FUNCTION
-  void
-  complete(
-    RunnableTaskBase<TaskQueueTraits>&& task,
-    TeamSchedulerInfo const& info
-  )
-  {
-    if(task.get_respawn_flag()) {
+  KOKKOS_FUNCTION void complete(RunnableTaskBase<TaskQueueTraits>&& task,
+                                TeamSchedulerInfo const& info) {
+    if (task.get_respawn_flag()) {
       _self().schedule_runnable(std::move(task), info);
-    }
-    else {
+    } else {
       _complete_finished_task(std::move(task), info);
     }
     // A runnable task was popped from a ready queue finished executing.
@@ -227,38 +200,31 @@ public:
     _decrement_ready_count();
   }
 
-  template <class TaskQueueTraits, class SchedulingInfo, class TeamSchedulerInfo>
-  KOKKOS_FUNCTION
-  void
-  complete(
-    AggregateTask<TaskQueueTraits, SchedulingInfo>&& task,
-    TeamSchedulerInfo const& info
-  ) {
-    // TODO @tasking DSH old code has a ifndef __HCC_ACCELERATOR__ here; figure out why
+  template <class TaskQueueTraits, class SchedulingInfo,
+            class TeamSchedulerInfo>
+  KOKKOS_FUNCTION void complete(
+      AggregateTask<TaskQueueTraits, SchedulingInfo>&& task,
+      TeamSchedulerInfo const& info) {
+    // TODO @tasking DSH old code has a ifndef __HCC_ACCELERATOR__ here; figure
+    // out why
     _complete_finished_task(std::move(task), info);
   }
 
   // </editor-fold> end Task and queue completion }}}2
   //----------------------------------------------------------------------------
 
-
   //----------------------------------------------------------------------------
   // <editor-fold desc="Scheduling"> {{{2
 
-public:
-
+ public:
   // This isn't actually generic; the template parameters are just to keep
   // Derived from having to be complete
-  template <class TaskQueueTraits, class ReadyQueueType, class TeamSchedulerInfo>
-  KOKKOS_INLINE_FUNCTION
-  void
-  schedule_runnable_to_queue(
-    RunnableTaskBase<TaskQueueTraits>&& task,
-    ReadyQueueType& ready_queue,
-    TeamSchedulerInfo const& info
-  )
-  {
-    bool task_is_ready = true;
+  template <class TaskQueueTraits, class ReadyQueueType,
+            class TeamSchedulerInfo>
+  KOKKOS_INLINE_FUNCTION void schedule_runnable_to_queue(
+      RunnableTaskBase<TaskQueueTraits>&& task, ReadyQueueType& ready_queue,
+      TeamSchedulerInfo const& info) {
+    bool task_is_ready           = true;
     bool scheduling_info_updated = false;
 
     // do this before enqueueing and potentially losing exclusive access to task
@@ -269,19 +235,21 @@ public:
     // thread to access it might be a Cuda thread from a different thread block.
     ((RunnableTaskBase<TaskQueueTraits> volatile&)task).set_respawn_flag(false);
 
-    if(task.has_predecessor()) {
+    if (task.has_predecessor()) {
       // save the predecessor into a local variable, then clear it from the
       // task before adding it to the wait queue of the predecessor
       // (We have exclusive access to the task's predecessor, so we don't need
       // to do this atomically)
-      // TODO @tasking @internal_documentation DSH document that we expect exclusive access to `task` in this function
+      // TODO @tasking @internal_documentation DSH document that we expect
+      // exclusive access to `task` in this function
       auto& predecessor = task.get_predecessor();
       // This needs a load/store fence here, technically
       // making this a release store would also do this
       ((RunnableTaskBase<TaskQueueTraits> volatile&)task).clear_predecessor();
 
-      // TODO @tasking @memory_order DSH remove this fence in favor of memory orders
-      Kokkos::memory_fence(); // for now
+      // TODO @tasking @memory_order DSH remove this fence in favor of memory
+      // orders
+      Kokkos::memory_fence();  // for now
 
       // Try to add the task to the predecessor's waiting queue.  If it fails,
       // the predecessor is already done
@@ -293,17 +261,16 @@ public:
       // If the predecessor is not done, then task is not ready
       task_is_ready = not predecessor_not_ready;
 
-      if(task_is_ready and predecessor.is_runnable()) {
+      if (task_is_ready and predecessor.is_runnable()) {
         // this is our last chance to update the scheduling info before
         // predecessor is potentially deleted
         _self().update_scheduling_info_from_completed_predecessor(
-          /* ready_task = */ task,
-          /* predecessor = */ predecessor.as_runnable_task()
-        );
+            /* ready_task = */ task,
+            /* predecessor = */ predecessor.as_runnable_task());
         scheduling_info_updated = true;
       }
 
-      if(task_is_respawning) {
+      if (task_is_respawning) {
         // Reference count for predecessor was incremented when
         // respawn called set_dependency()
         // so that if predecessor completed prior to the
@@ -311,7 +278,7 @@ public:
         // predecessor reference count can now be decremented,
         // which may deallocate it.
         bool should_delete = predecessor.decrement_and_check_reference_count();
-        if(should_delete) {
+        if (should_delete) {
           // TODO @tasking @cleanup DSH better encapsulation of this!
           _self().deallocate(std::move(predecessor));
         }
@@ -320,22 +287,21 @@ public:
       // here
     }
 
-    if(scheduling_info_updated) {
+    if (scheduling_info_updated) {
       // We need to go back to the queue itself and see if it wants to schedule
       // somewhere else
       _self().schedule_runnable(std::move(task), info);
     }
     // Put it in the appropriate ready queue if it's ready
-    else if(task_is_ready) {
+    else if (task_is_ready) {
       // Increment the ready count
       _self()._increment_ready_count();
       // and enqueue the task
       // (can't move because the task isn't expired unless the push succeeds
       bool push_success = ready_queue.push(task);
-      if(not push_success) {
-        _self().handle_failed_ready_queue_insertion(
-          std::move(task), ready_queue, info
-        );
+      if (not push_success) {
+        _self().handle_failed_ready_queue_insertion(std::move(task),
+                                                    ready_queue, info);
       }
     }
 
@@ -343,46 +309,38 @@ public:
     // the use of move semantics)
   }
 
-  template <class TaskQueueTraits, class ReadyQueueType, class TeamSchedulerInfo>
-  KOKKOS_INLINE_FUNCTION
-  void
-  handle_failed_ready_queue_insertion(
-    RunnableTaskBase<TaskQueueTraits>&& task,
-    ReadyQueueType& ready_queue,
-    TeamSchedulerInfo const& info
-  ) {
+  template <class TaskQueueTraits, class ReadyQueueType,
+            class TeamSchedulerInfo>
+  KOKKOS_INLINE_FUNCTION void handle_failed_ready_queue_insertion(
+      RunnableTaskBase<TaskQueueTraits>&& task, ReadyQueueType& ready_queue,
+      TeamSchedulerInfo const& info) {
     Kokkos::abort("Unhandled failure of ready task queue insertion!\n");
   }
 
   // This isn't actually generic; the template parameters are just to keep
   // Derived from having to be complete
-  template <class TaskQueueTraits, class SchedulingInfo, class TeamSchedulerInfo>
-  KOKKOS_FUNCTION
-  void
-  schedule_aggregate(
-    AggregateTask<TaskQueueTraits, SchedulingInfo>&& aggregate,
-    TeamSchedulerInfo const& info
-  )
-  {
+  template <class TaskQueueTraits, class SchedulingInfo,
+            class TeamSchedulerInfo>
+  KOKKOS_FUNCTION void schedule_aggregate(
+      AggregateTask<TaskQueueTraits, SchedulingInfo>&& aggregate,
+      TeamSchedulerInfo const& info) {
     // Because the aggregate is being scheduled, should not be in any queue
     KOKKOS_EXPECTS(not aggregate.is_enqueued());
 
-    using task_scheduling_info_type = typename Derived::task_scheduling_info_type;
+    using task_scheduling_info_type =
+        typename Derived::task_scheduling_info_type;
     using team_scheduler_info_type = typename Derived::team_scheduler_info_type;
     static_assert(
-      std::is_same<TeamSchedulerInfo, team_scheduler_info_type>::value,
-      "SchedulingInfo type mismatch!"
-    );
+        std::is_same<TeamSchedulerInfo, team_scheduler_info_type>::value,
+        "SchedulingInfo type mismatch!");
 
     bool incomplete_dependence_found = false;
 
-    for(auto*& predecessor_ptr_ref : aggregate) {
-
+    for (auto*& predecessor_ptr_ref : aggregate) {
       // if a previous scheduling operation hasn't already set the predecessor
-      // to nullptr, try to enqueue the aggregate into the predecessorendence's waiting
-      // queue
-      if(predecessor_ptr_ref != nullptr) {
-
+      // to nullptr, try to enqueue the aggregate into the predecessorendence's
+      // waiting queue
+      if (predecessor_ptr_ref != nullptr) {
         // Swap the pointer onto the stack and set the one in the aggregate VLA
         // to nullptr before we try to add it to the waiting queue so that some
         // other thread doesn't also get to here and find the pointer to be
@@ -392,14 +350,16 @@ public:
         // exclusive access to aggregate until an insertion succeeds
         auto* predecessor_ptr = std::move(predecessor_ptr_ref);
 
-        // TODO @tasking @memory_order DSH I think this needs to be a store release so that it doesn't get reordered after the queue insertion
+        // TODO @tasking @memory_order DSH I think this needs to be a store
+        // release so that it doesn't get reordered after the queue insertion
         predecessor_ptr_ref = nullptr;
 
-        // TODO @tasking @memory_order DSH remove this fence in favor of memory orders
+        // TODO @tasking @memory_order DSH remove this fence in favor of memory
+        // orders
         Kokkos::memory_fence();
 
-        // If adding the aggregate to the waiting queue succeeds, the predecessor is not
-        // complete
+        // If adding the aggregate to the waiting queue succeeds, the
+        // predecessor is not complete
         bool pred_not_ready = predecessor_ptr->try_add_waiting(aggregate);
 
         // NOTE! At this point it is unsafe to access aggregate (unless the
@@ -409,85 +369,79 @@ public:
         // ready yet
         incomplete_dependence_found = pred_not_ready;
 
-        if(not pred_not_ready) {
+        if (not pred_not_ready) {
           // A predecessor was done, and we didn't enqueue the aggregate
           // Update the aggregate's scheduling info (we still have exclusive
           // access to it here)
-          if(predecessor_ptr->is_runnable()) {
+          if (predecessor_ptr->is_runnable()) {
             _self().update_scheduling_info_from_completed_predecessor(
-              aggregate, predecessor_ptr->as_runnable_task()
-            );
-          }
-          else {
+                aggregate, predecessor_ptr->as_runnable_task());
+          } else {
             KOKKOS_ASSERT(predecessor_ptr->is_aggregate());
             _self().update_scheduling_info_from_completed_predecessor(
-              aggregate, (*predecessor_ptr).template as_aggregate<task_scheduling_info_type>()
-            );
+                aggregate,
+                (*predecessor_ptr)
+                    .template as_aggregate<task_scheduling_info_type>());
           }
         }
 
         // the reference count for the predecessor was incremented when we put
         // it into the predecessor list, so decrement it here
-        bool should_delete = predecessor_ptr->decrement_and_check_reference_count();
-        if(should_delete) {
+        bool should_delete =
+            predecessor_ptr->decrement_and_check_reference_count();
+        if (should_delete) {
           // TODO @tasking @cleanup DSH better encapsulation of this!
           _self().deallocate(std::move(*predecessor_ptr));
         }
 
         // Stop the loop if we found an incomplete dependence
-        if(incomplete_dependence_found) break;
+        if (incomplete_dependence_found) break;
       }
     }
 
-    // NOTE: it's not safe to access aggregate any more if an incomplete dependence
-    // was found, because some other thread could have already popped it off
-    // of another waiting queue
+    // NOTE: it's not safe to access aggregate any more if an incomplete
+    // dependence was found, because some other thread could have already popped
+    // it off of another waiting queue
 
-    if(not incomplete_dependence_found) {
+    if (not incomplete_dependence_found) {
       // all of the predecessors were completed, so we can complete `task`
       _self().complete(std::move(aggregate), info);
     }
-    // Note!! task may have been deleted at this point, so don't add anything here!
+    // Note!! task may have been deleted at this point, so don't add anything
+    // here!
   }
 
   // Provide a sensible default that can be overridden
   template <class TaskQueueTraits>
-  KOKKOS_INLINE_FUNCTION
-  void update_scheduling_info_from_completed_predecessor(
-    RunnableTaskBase<TaskQueueTraits>& ready_task,
-    RunnableTaskBase<TaskQueueTraits> const& predecessor
-  ) const
-  {
+  KOKKOS_INLINE_FUNCTION void update_scheduling_info_from_completed_predecessor(
+      RunnableTaskBase<TaskQueueTraits>& ready_task,
+      RunnableTaskBase<TaskQueueTraits> const& predecessor) const {
     // by default, tell a ready task to use the scheduling info of its most
     // recent predecessor
-    using task_scheduling_info_type = typename Derived::task_scheduling_info_type;
+    using task_scheduling_info_type =
+        typename Derived::task_scheduling_info_type;
     ready_task.template scheduling_info_as<task_scheduling_info_type>() =
-      predecessor.template scheduling_info_as<task_scheduling_info_type>();
+        predecessor.template scheduling_info_as<task_scheduling_info_type>();
   }
 
   // Provide a sensible default that can be overridden
   template <class SchedulingInfo, class TaskQueueTraits>
-  KOKKOS_INLINE_FUNCTION
-  void update_scheduling_info_from_completed_predecessor(
-    AggregateTask<TaskQueueTraits, SchedulingInfo>& aggregate,
-    RunnableTaskBase<TaskQueueTraits> const& predecessor
-  ) const
-  {
+  KOKKOS_INLINE_FUNCTION void update_scheduling_info_from_completed_predecessor(
+      AggregateTask<TaskQueueTraits, SchedulingInfo>& aggregate,
+      RunnableTaskBase<TaskQueueTraits> const& predecessor) const {
     // by default, tell a ready task to use the scheduling info of its most
     // recent predecessor
-    using task_scheduling_info_type = typename Derived::task_scheduling_info_type;
+    using task_scheduling_info_type =
+        typename Derived::task_scheduling_info_type;
     aggregate.scheduling_info() =
-      predecessor.template scheduling_info_as<task_scheduling_info_type>();
+        predecessor.template scheduling_info_as<task_scheduling_info_type>();
   }
 
   // Provide a sensible default that can be overridden
   template <class SchedulingInfo, class TaskQueueTraits>
-  KOKKOS_INLINE_FUNCTION
-  void update_scheduling_info_from_completed_predecessor(
-    AggregateTask<TaskQueueTraits, SchedulingInfo>& aggregate,
-    AggregateTask<TaskQueueTraits, SchedulingInfo> const& predecessor
-  ) const
-  {
+  KOKKOS_INLINE_FUNCTION void update_scheduling_info_from_completed_predecessor(
+      AggregateTask<TaskQueueTraits, SchedulingInfo>& aggregate,
+      AggregateTask<TaskQueueTraits, SchedulingInfo> const& predecessor) const {
     // by default, tell a ready task to use the scheduling info of its most
     // recent predecessor
     aggregate.scheduling_info() = predecessor.scheduling_info();
@@ -495,67 +449,50 @@ public:
 
   // Provide a sensible default that can be overridden
   template <class SchedulingInfo, class TaskQueueTraits>
-  KOKKOS_INLINE_FUNCTION
-  void update_scheduling_info_from_completed_predecessor(
-    RunnableTaskBase<TaskQueueTraits>& ready_task,
-    AggregateTask<TaskQueueTraits, SchedulingInfo> const& predecessor
-  ) const
-  {
+  KOKKOS_INLINE_FUNCTION void update_scheduling_info_from_completed_predecessor(
+      RunnableTaskBase<TaskQueueTraits>& ready_task,
+      AggregateTask<TaskQueueTraits, SchedulingInfo> const& predecessor) const {
     // by default, tell a ready task to use the scheduling info of its most
     // recent predecessor
-    using task_scheduling_info_type = typename Derived::task_scheduling_info_type;
+    using task_scheduling_info_type =
+        typename Derived::task_scheduling_info_type;
     ready_task.template scheduling_info_as<task_scheduling_info_type>() =
-      predecessor.scheduling_info();
+        predecessor.scheduling_info();
   }
 
   template <class TaskQueueTraits>
-  KOKKOS_INLINE_FUNCTION
-  void initialize_scheduling_info_from_predecessor(
-    TaskNode<TaskQueueTraits>& task,
-    TaskNode<TaskQueueTraits>& predecessor
-  ) const
-  {
+  KOKKOS_INLINE_FUNCTION void initialize_scheduling_info_from_predecessor(
+      TaskNode<TaskQueueTraits>& task,
+      TaskNode<TaskQueueTraits>& predecessor) const {
     /* do nothing by default */
   }
 
   template <class TeamSchedulerInfo, class TaskQueueTraits>
-  KOKKOS_INLINE_FUNCTION
-  void initialize_scheduling_info_from_team_scheduler_info(
-    TaskNode<TaskQueueTraits>& task,
-    TeamSchedulerInfo const& info
-  ) const
-  {
+  KOKKOS_INLINE_FUNCTION void
+  initialize_scheduling_info_from_team_scheduler_info(
+      TaskNode<TaskQueueTraits>& task, TeamSchedulerInfo const& info) const {
     /* do nothing by default */
   }
 
-  template <
-    class ExecutionSpace,
-    class MemorySpace,
-    class MemoryPool
-  >
-  static /* KOKKOS_CONSTEXPR_14 */ size_t
-  task_queue_allocation_size(
-    ExecutionSpace const&,
-    MemorySpace const&,
-    MemoryPool const&
-  )
-    // requires Same<ExecutionSpace, typename Derived::execution_space>
-    //            && Same<MemorySpace, typename Derived::memory_space>
-    //            && Same<MemoryPool, typename Derived::memory_pool>
+  template <class ExecutionSpace, class MemorySpace, class MemoryPool>
+  static /* KOKKOS_CONSTEXPR_14 */ size_t task_queue_allocation_size(
+      ExecutionSpace const&, MemorySpace const&, MemoryPool const&)
+  // requires Same<ExecutionSpace, typename Derived::execution_space>
+  //            && Same<MemorySpace, typename Derived::memory_space>
+  //            && Same<MemoryPool, typename Derived::memory_pool>
   {
     static_assert(
-      std::is_same<ExecutionSpace, typename Derived::execution_space>::value
-        && std::is_same<MemorySpace, typename Derived::memory_space>::value
-        && std::is_same<MemoryPool, typename Derived::memory_pool>::value,
-      "Type mismatch in task_queue_allocation_size customization point"
-    );
+        std::is_same<ExecutionSpace,
+                     typename Derived::execution_space>::value &&
+            std::is_same<MemorySpace, typename Derived::memory_space>::value &&
+            std::is_same<MemoryPool, typename Derived::memory_pool>::value,
+        "Type mismatch in task_queue_allocation_size customization point");
 
     return sizeof(Derived);
   }
 
   // </editor-fold> end Scheduling }}}2
   //----------------------------------------------------------------------------
-
 };
 
 } /* namespace Impl */
@@ -566,4 +503,3 @@ public:
 
 #endif /* #if defined( KOKKOS_ENABLE_TASKDAG ) */
 #endif /* #ifndef KOKKOS_IMPL_TASKQUEUECOMMON_HPP */
-
diff --git a/lib/kokkos/core/src/impl/Kokkos_TaskQueueMemoryManager.hpp b/lib/kokkos/core/src/impl/Kokkos_TaskQueueMemoryManager.hpp
index c3ed1d6c71..6e2481f935 100644
--- a/lib/kokkos/core/src/impl/Kokkos_TaskQueueMemoryManager.hpp
+++ b/lib/kokkos/core/src/impl/Kokkos_TaskQueueMemoryManager.hpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -45,8 +46,7 @@
 #define KOKKOS_IMPL_TASKQUEUEMEMORYMANAGER_HPP
 
 #include <Kokkos_Macros.hpp>
-#if defined( KOKKOS_ENABLE_TASKDAG )
-
+#if defined(KOKKOS_ENABLE_TASKDAG)
 
 #include <Kokkos_TaskScheduler_fwd.hpp>
 #include <Kokkos_Core_fwd.hpp>
@@ -65,36 +65,29 @@
 #include <typeinfo>
 #include <stdexcept>
 
-
 //----------------------------------------------------------------------------
 //----------------------------------------------------------------------------
 
 namespace Kokkos {
 namespace Impl {
 
-template <
-  class ExecSpace,
-  class MemorySpace,
-  class MemoryPool = Kokkos::MemoryPool<Kokkos::Device<ExecSpace, MemorySpace>>
->
-class TaskQueueMemoryManager
-  : public TaskQueueBase
-{
-public:
-
-  using execution_space = ExecSpace;
-  using memory_space = MemorySpace;
-  using device_type = Kokkos::Device<execution_space, memory_space>;
-  using memory_pool = MemoryPool;
+template <class ExecSpace, class MemorySpace,
+          class MemoryPool =
+              Kokkos::MemoryPool<Kokkos::Device<ExecSpace, MemorySpace>>>
+class TaskQueueMemoryManager : public TaskQueueBase {
+ public:
+  using execution_space      = ExecSpace;
+  using memory_space         = MemorySpace;
+  using device_type          = Kokkos::Device<execution_space, memory_space>;
+  using memory_pool          = MemoryPool;
   using allocation_size_type = size_t;
 
-private:
-
+ private:
   memory_pool m_pool;
   // TODO @tasking @generalization DSH re-enable this with a flag in the type
-  //long m_accum_alloc = 0;
+  // long m_accum_alloc = 0;
   int m_count_alloc = 0;
-  int m_max_alloc = 0;
+  int m_max_alloc   = 0;
 
   struct _allocation_result {
     bool success;
@@ -102,116 +95,101 @@ private:
   };
 
   KOKKOS_INLINE_FUNCTION
-  _allocation_result
-  _do_pool_allocate(allocation_size_type requested_size) {
-    // KOKKOS_EXPECTS(requested_size >= 0); generates a warning when allocation_size_type is unsigned
-    if(requested_size == 0 ) {
-      return { true, nullptr };
-    }
-    else {
+  _allocation_result _do_pool_allocate(allocation_size_type requested_size) {
+    // KOKKOS_EXPECTS(requested_size >= 0); generates a warning when
+    // allocation_size_type is unsigned
+    if (requested_size == 0) {
+      return {true, nullptr};
+    } else {
       void* data = m_pool.allocate(static_cast<size_t>(requested_size));
 
-      //Kokkos::atomic_increment(&m_accum_alloc); // memory_order_relaxed
-      Kokkos::atomic_increment(&m_count_alloc); // memory_order_relaxed
-      // TODO @tasking @minor DSH make this thread safe? (otherwise, it's just an approximation, which is probably fine...)
-      if(m_max_alloc < m_count_alloc) m_max_alloc = m_count_alloc;
+      // Kokkos::atomic_increment(&m_accum_alloc); // memory_order_relaxed
+      Kokkos::atomic_increment(&m_count_alloc);  // memory_order_relaxed
+      // TODO @tasking @minor DSH make this thread safe? (otherwise, it's just
+      // an approximation, which is probably fine...)
+      if (m_max_alloc < m_count_alloc) m_max_alloc = m_count_alloc;
 
-      return { data != nullptr, data };
+      return {data != nullptr, data};
     }
   }
 
   template <class T, class... Args>
-  KOKKOS_INLINE_FUNCTION
-  T*
-  _do_contruct(void* allocated, allocation_size_type allocated_size, Args&&... args) {
-
-    static_assert(
-      std::is_base_of<PoolAllocatedObjectBase<int32_t>, T>::value,
-      "TaskQueueMemoryManager can only allocate objects with PoolAllocatedObjectBase base class"
-    );
+  KOKKOS_INLINE_FUNCTION T* _do_contruct(void* allocated,
+                                         allocation_size_type allocated_size,
+                                         Args&&... args) {
+    static_assert(std::is_base_of<PoolAllocatedObjectBase<int32_t>, T>::value,
+                  "TaskQueueMemoryManager can only allocate objects with "
+                  "PoolAllocatedObjectBase base class");
 
     // TODO @tasking DSH figure out why this isn't working
-    //static_assert(
+    // static_assert(
     //  std::is_constructible<T, Args..., int32_t>::value,
-    //  "TaskQueueMemoryManager can't construct object of the requested type from the "
-    //  " allocation size and the given arguments"
+    //  "TaskQueueMemoryManager can't construct object of the requested type
+    //  from the " " allocation size and the given arguments"
     //);
 
-
-    auto rv = new (allocated) T(
-      std::forward<Args>(args)...,
-      allocated_size
-    );
+    auto rv = new (allocated) T(std::forward<Args>(args)..., allocated_size);
 
     // It feels like there should be a way to check this at compile-time
     KOKKOS_ASSERT(
-      (intptr_t)(rv) == (intptr_t)(static_cast<PoolAllocatedObjectBase<int32_t>*>(rv))
-        && "PoolAllocatedObjectBase must be the first base class of the allocated type"
-    );
+        (intptr_t)(rv) ==
+            (intptr_t)(static_cast<PoolAllocatedObjectBase<int32_t>*>(rv)) &&
+        "PoolAllocatedObjectBase must be the first base class of the allocated "
+        "type");
 
     return rv;
-
   }
 
-
-public:
-
-  explicit
-  TaskQueueMemoryManager(memory_pool const& pool)
-    : m_pool(pool)
-  { }
-
+ public:
+  explicit TaskQueueMemoryManager(memory_pool const& pool) : m_pool(pool) {}
 
   template <class T, class... Args>
-  KOKKOS_FUNCTION
-  T*
-  allocate_and_construct(Args&&... args)
-    // requires
-    //   std::is_base_of_v<PoolAllocatedObjectBase<typename memory_pool::size_type>, T>
-    //     && std::is_constructible_v<T, Args&&..., allocation_size_type>
+  KOKKOS_FUNCTION T* allocate_and_construct(Args&&... args)
+  // requires
+  //   std::is_base_of_v<PoolAllocatedObjectBase<typename
+  //   memory_pool::size_type>, T>
+  //     && std::is_constructible_v<T, Args&&..., allocation_size_type>
   {
     constexpr auto allocation_size = sizeof(T);
 
-
     auto result = _do_pool_allocate(allocation_size);
 
     KOKKOS_ASSERT(result.success && "Memory allocation failure");
 
-    auto rv = _do_contruct<T>(result.pointer, allocation_size, std::forward<Args>(args)...);
+    auto rv = _do_contruct<T>(result.pointer, allocation_size,
+                              std::forward<Args>(args)...);
 
-    KOKKOS_ENSURES(intptr_t(rv) % alignof(T) == 0 && "alignment not preserved!");
+    KOKKOS_ENSURES(intptr_t(rv) % alignof(T) == 0 &&
+                   "alignment not preserved!");
 
     return rv;
   }
 
   template <class T, class VLAValueType, class... Args>
-  KOKKOS_INLINE_FUNCTION
-  T*
-  allocate_and_construct_with_vla_emulation(
-    allocation_size_type n_vla_entries,
-    Args&&... args
-  )
-    // requires
-    //   std::is_base_of_v<PoolAllocatedObjectBase<typename memory_pool::size_type>, T>
-    //     && std::is_base_of<ObjectWithVLAEmulation<T, VLAValueType>, T>::value
-    //     && std::is_constructible_v<T, allocation_size_type, Args&&...>
+  KOKKOS_INLINE_FUNCTION T* allocate_and_construct_with_vla_emulation(
+      allocation_size_type n_vla_entries, Args&&... args)
+  // requires
+  //   std::is_base_of_v<PoolAllocatedObjectBase<typename
+  //   memory_pool::size_type>, T>
+  //     && std::is_base_of<ObjectWithVLAEmulation<T, VLAValueType>, T>::value
+  //     && std::is_constructible_v<T, allocation_size_type, Args&&...>
   {
-
-
     static_assert(
-      std::is_base_of<ObjectWithVLAEmulation<T, VLAValueType>, T>::value,
-      "Can't append emulated variable length array of type with greater alignment than"
-      "  the type to which the VLA is being appended"
-    );
+        std::is_base_of<ObjectWithVLAEmulation<T, VLAValueType>, T>::value,
+        "Can't append emulated variable length array of type with greater "
+        "alignment than"
+        "  the type to which the VLA is being appended");
 
     using vla_emulation_base = ObjectWithVLAEmulation<T, VLAValueType>;
 
-    auto const allocation_size = vla_emulation_base::required_allocation_size(n_vla_entries);
+    auto const allocation_size =
+        vla_emulation_base::required_allocation_size(n_vla_entries);
     auto result = _do_pool_allocate(allocation_size);
 
     KOKKOS_ASSERT(result.success && "Memory allocation failure");
 
-    auto rv = _do_contruct<T>(result.pointer, allocation_size, std::forward<Args>(args)...);
+    auto rv = _do_contruct<T>(result.pointer, allocation_size,
+                              std::forward<Args>(args)...);
 
     KOKKOS_ENSURES(intptr_t(rv) % alignof(T) == 0);
 
@@ -219,11 +197,10 @@ public:
   }
 
   template <class CountType>
-  KOKKOS_INLINE_FUNCTION
-  void deallocate(PoolAllocatedObjectBase<CountType>&& obj)
-  {
+  KOKKOS_INLINE_FUNCTION void deallocate(
+      PoolAllocatedObjectBase<CountType>&& obj) {
     m_pool.deallocate((void*)&obj, 1);
-    Kokkos::atomic_decrement(&m_count_alloc); // memory_order_relaxed
+    Kokkos::atomic_decrement(&m_count_alloc);  // memory_order_relaxed
   }
 
   KOKKOS_INLINE_FUNCTION
@@ -242,10 +219,8 @@ public:
 // END OLD CODE
 ////////////////////////////////////////////////////////////////////////////////
 
-
 //----------------------------------------------------------------------------
 //----------------------------------------------------------------------------
 
 #endif /* #if defined( KOKKOS_ENABLE_TASKDAG ) */
 #endif /* #ifndef KOKKOS_IMPL_TASKQUEUEMEMORYMANAGER_HPP */
-
diff --git a/lib/kokkos/core/src/impl/Kokkos_TaskQueueMultiple.hpp b/lib/kokkos/core/src/impl/Kokkos_TaskQueueMultiple.hpp
index 17c357ff31..090bffd23a 100644
--- a/lib/kokkos/core/src/impl/Kokkos_TaskQueueMultiple.hpp
+++ b/lib/kokkos/core/src/impl/Kokkos_TaskQueueMultiple.hpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -47,8 +48,7 @@
 #define KOKKOS_IMPL_TASKQUEUEMULTIPLE_HPP
 
 #include <Kokkos_Macros.hpp>
-#if defined( KOKKOS_ENABLE_TASKDAG )
-
+#if defined(KOKKOS_ENABLE_TASKDAG)
 
 #include <Kokkos_TaskScheduler_fwd.hpp>
 #include <Kokkos_Core_fwd.hpp>
@@ -68,21 +68,20 @@
 #include <stdexcept>
 #include <cassert>
 
-
 //----------------------------------------------------------------------------
 //----------------------------------------------------------------------------
 
 namespace Kokkos {
 namespace Impl {
 
-template< typename ExecSpace, typename MemorySpace = typename ExecSpace::memory_space >
+template <typename ExecSpace,
+          typename MemorySpace = typename ExecSpace::memory_space>
 class LeagueQueueCollection;
 
 template <class ExecSpace, class MemorySpace>
 class TaskQueueMultiple : public TaskQueue<ExecSpace, MemorySpace> {
-private:
-
-  using base_t = TaskQueue<ExecSpace, MemorySpace>;
+ private:
+  using base_t             = TaskQueue<ExecSpace, MemorySpace>;
   using queue_collection_t = LeagueQueueCollection<ExecSpace, MemorySpace>;
 
   int m_league_rank = static_cast<int>(KOKKOS_INVALID_INDEX);
@@ -90,41 +89,33 @@ private:
   // This pointer is owning only if m_league_rank == 0
   queue_collection_t* m_other_queues = nullptr;
 
-
-public:
-
+ public:
   struct Destroy {
-    TaskQueueMultiple* m_queue ;
+    TaskQueueMultiple* m_queue;
     void destroy_shared_allocation();
   };
 
-
   using team_queue_type = TaskQueueMultiple;
 
-  TaskQueueMultiple(
-    int arg_league_rank,
-    queue_collection_t* arg_other_queues,
-    typename base_t::memory_pool const& arg_memory_pool
-  )
-    : base_t(arg_memory_pool),
-      m_league_rank(arg_league_rank),
-      m_other_queues(arg_other_queues)
-  { }
+  TaskQueueMultiple(int arg_league_rank, queue_collection_t* arg_other_queues,
+                    typename base_t::memory_pool const& arg_memory_pool)
+      : base_t(arg_memory_pool),
+        m_league_rank(arg_league_rank),
+        m_other_queues(arg_other_queues) {}
 
   explicit TaskQueueMultiple(
-    typename base_t::memory_pool const& arg_memory_pool
-  )
-    : base_t(arg_memory_pool),
-      m_league_rank(0)
-  {
-    void* other_queues_buffer = typename base_t::memory_space{}.allocate(sizeof(queue_collection_t));
-    m_other_queues = new(other_queues_buffer) queue_collection_t(this);
+      typename base_t::memory_pool const& arg_memory_pool)
+      : base_t(arg_memory_pool), m_league_rank(0) {
+    void* other_queues_buffer =
+        typename base_t::memory_space{}.allocate(sizeof(queue_collection_t));
+    m_other_queues = new (other_queues_buffer) queue_collection_t(this);
   }
 
   ~TaskQueueMultiple() {
-    if(m_league_rank == 0 && m_other_queues != nullptr) {
+    if (m_league_rank == 0 && m_other_queues != nullptr) {
       m_other_queues->~queue_collection_t();
-      typename base_t::memory_space{}.deallocate(m_other_queues, sizeof(queue_collection_t));
+      typename base_t::memory_space{}.deallocate(m_other_queues,
+                                                 sizeof(queue_collection_t));
     }
     // rest of destruction is handled in the base class
   }
@@ -137,14 +128,15 @@ public:
 
   KOKKOS_INLINE_FUNCTION
   team_queue_type& get_team_queue(int arg_league_rank) noexcept {
-    if(arg_league_rank == m_league_rank) return *this;
-    else return m_other_queues->get_team_queue(arg_league_rank);
+    if (arg_league_rank == m_league_rank)
+      return *this;
+    else
+      return m_other_queues->get_team_queue(arg_league_rank);
   }
 
   KOKKOS_INLINE_FUNCTION
-  typename base_t::task_root_type*
-  attempt_to_steal_task() noexcept {
-    TaskBase* rv = nullptr;
+  typename base_t::task_root_type* attempt_to_steal_task() noexcept {
+    TaskBase* rv        = nullptr;
     auto* const end_tag = reinterpret_cast<TaskBase*>(TaskBase::EndTag);
 
     if (m_other_queues == nullptr) {
@@ -152,18 +144,18 @@ public:
     }
 
     // Loop by priority and then type, and then team
-    for ( int i = 0 ; i < base_t::NumQueue; ++i ) {
-      for ( int j = 0 ; j < 2; ++j ) {
+    for (int i = 0; i < base_t::NumQueue; ++i) {
+      for (int j = 0; j < 2; ++j) {
         // for now, always start by trying to steal from team zero
-        for(int iteam = 0; iteam < m_other_queues->size(); ++iteam) {
-          if(iteam == m_league_rank) continue;
+        for (int iteam = 0; iteam < m_other_queues->size(); ++iteam) {
+          if (iteam == m_league_rank) continue;
           auto& steal_from = get_team_queue(iteam);
-          if( *((volatile int *) & steal_from.m_ready_count) > 0 ) {
-            // we've found at least one queue that's not done, so even if we can't
-            // pop something off of it we shouldn't return a nullptr indicating
-            // completion.  rv will be end_tag when the pop fails
+          if (*((volatile int*)&steal_from.m_ready_count) > 0) {
+            // we've found at least one queue that's not done, so even if we
+            // can't pop something off of it we shouldn't return a nullptr
+            // indicating completion.  rv will be end_tag when the pop fails
             rv = base_t::pop_ready_task(&steal_from.m_ready[i][j]);
-            if(rv != end_tag) {
+            if (rv != end_tag) {
               // task stolen.
               // first increment our ready count, then decrement the ready count
               // on the other queue:
@@ -182,30 +174,27 @@ public:
     // was called and returned end_tag if it couldn't pop a task
     return rv;
   }
-
-
 };
 
-template<typename ExecSpace, typename MemorySpace>
+template <typename ExecSpace, typename MemorySpace>
 class LeagueQueueCollection {
-private:
-
-  using execution_space = ExecSpace;
-  using memory_space = MemorySpace;
-  using device_type = Kokkos::Device<execution_space, memory_space>;
-  using memory_pool = Kokkos::MemoryPool<device_type>;
-  using team_queue_type = TaskQueueMultiple<execution_space, memory_space>;
+ private:
+  using execution_space     = ExecSpace;
+  using memory_space        = MemorySpace;
+  using device_type         = Kokkos::Device<execution_space, memory_space>;
+  using memory_pool         = Kokkos::MemoryPool<device_type>;
+  using team_queue_type     = TaskQueueMultiple<execution_space, memory_space>;
   using team_scheduler_type = BasicTaskScheduler<ExecSpace, team_queue_type>;
-  using specialization = TaskQueueSpecialization<team_scheduler_type>;
+  using specialization      = TaskQueueSpecialization<team_scheduler_type>;
 
-  enum : long { max_num_queues = 6 }; //specialization::max_league_size };
+  enum : long { max_num_queues = 6 };  // specialization::max_league_size };
 
   // this is a non-owning pointer
   team_queue_type* m_rank_zero_queue = nullptr;
   // This really needs to be an optional<TaskQueue<ExecSpace>>
   union optional_queue {
     KOKKOS_INLINE_FUNCTION
-    optional_queue() : uninitialized(0) { }
+    optional_queue() : uninitialized(0) {}
     KOKKOS_INLINE_FUNCTION
     ~optional_queue() { uninitialized = 0; }
     char uninitialized;
@@ -213,38 +202,33 @@ private:
   } m_queues[max_num_queues];
   int m_size = static_cast<int>(KOKKOS_INVALID_INDEX);
 
-public:
-
-  LeagueQueueCollection() = delete;
+ public:
+  LeagueQueueCollection()                             = delete;
   LeagueQueueCollection(LeagueQueueCollection const&) = delete;
-  LeagueQueueCollection(LeagueQueueCollection&&) = delete;
+  LeagueQueueCollection(LeagueQueueCollection&&)      = delete;
   LeagueQueueCollection& operator=(LeagueQueueCollection const&) = delete;
   LeagueQueueCollection& operator=(LeagueQueueCollection&&) = delete;
 
   ~LeagueQueueCollection() {
     // destroy only the initialized queues that we own
-    for(int iteam = 0; iteam < m_size - 1; ++iteam) {
+    for (int iteam = 0; iteam < m_size - 1; ++iteam) {
       m_queues[iteam].initialized.~team_queue_type();
       m_queues[iteam].uninitialized = 0;
     }
   }
 
   KOKKOS_INLINE_FUNCTION
-  explicit LeagueQueueCollection(
-    team_queue_type* arg_rank_zero_queue
-  ) : m_rank_zero_queue(arg_rank_zero_queue),
-      m_size(1)
-  { }
+  explicit LeagueQueueCollection(team_queue_type* arg_rank_zero_queue)
+      : m_rank_zero_queue(arg_rank_zero_queue), m_size(1) {}
 
-  void initialize_team_queues(
-    int arg_count, memory_pool const& arg_memory_pool
-  ) noexcept
-  {
+  void initialize_team_queues(int arg_count,
+                              memory_pool const& arg_memory_pool) noexcept {
     arg_count = std::min((int)max_num_queues, arg_count);
-    //assert(arg_count <= max_num_queues);
-    if(arg_count > m_size) {
-      for(int i = m_size; i < arg_count; ++i) {
-        new(&m_queues[i-1].initialized) team_queue_type(i, this, arg_memory_pool);
+    // assert(arg_count <= max_num_queues);
+    if (arg_count > m_size) {
+      for (int i = m_size; i < arg_count; ++i) {
+        new (&m_queues[i - 1].initialized)
+            team_queue_type(i, this, arg_memory_pool);
       }
       m_size = arg_count;
     }
@@ -254,28 +238,28 @@ public:
   constexpr int size() const noexcept { return m_size; }
 
   KOKKOS_INLINE_FUNCTION
-  constexpr bool initialized() const noexcept { return m_size != int(KOKKOS_INVALID_INDEX); }
+  constexpr bool initialized() const noexcept {
+    return m_size != int(KOKKOS_INVALID_INDEX);
+  }
 
   KOKKOS_INLINE_FUNCTION
   team_queue_type& get_team_queue(int iteam) {
     iteam %= max_num_queues;
-    #if !defined(__HCC_ACCELERATOR__) && !defined(__CUDA_ARCH__)
+#if !defined(__HCC_ACCELERATOR__) && !defined(__CUDA_ARCH__)
     assert(initialized());
     assert(iteam < m_size);
     assert(iteam >= 0);
-    #endif
-    if(iteam == 0) return *m_rank_zero_queue;
-    else return m_queues[iteam-1].initialized;
+#endif
+    if (iteam == 0)
+      return *m_rank_zero_queue;
+    else
+      return m_queues[iteam - 1].initialized;
   }
-
 };
 
-
 } /* namespace Impl */
 } /* namespace Kokkos */
 
-
-
 //----------------------------------------------------------------------------
 //----------------------------------------------------------------------------
 
@@ -283,4 +267,3 @@ public:
 
 #endif /* #if defined( KOKKOS_ENABLE_TASKDAG ) */
 #endif /* #ifndef KOKKOS_IMPL_TASKQUEUEMULTIPLE_HPP */
-
diff --git a/lib/kokkos/core/src/impl/Kokkos_TaskQueueMultiple_impl.hpp b/lib/kokkos/core/src/impl/Kokkos_TaskQueueMultiple_impl.hpp
index 81bcc96831..1af97918b8 100644
--- a/lib/kokkos/core/src/impl/Kokkos_TaskQueueMultiple_impl.hpp
+++ b/lib/kokkos/core/src/impl/Kokkos_TaskQueueMultiple_impl.hpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -45,7 +46,7 @@
 #define KOKKOS_IMPL_TASKQUEUEMULTIPLE_IMPL_HPP
 
 #include <Kokkos_Macros.hpp>
-#if defined( KOKKOS_ENABLE_TASKDAG )
+#if defined(KOKKOS_ENABLE_TASKDAG)
 
 #include <impl/Kokkos_TaskQueueMultiple.hpp>
 
@@ -55,9 +56,11 @@ namespace Kokkos {
 namespace Impl {
 
 template <class ExecSpace, class MemorySpace>
-void TaskQueueMultiple<ExecSpace, MemorySpace>::Destroy::destroy_shared_allocation() {
+void TaskQueueMultiple<ExecSpace,
+                       MemorySpace>::Destroy::destroy_shared_allocation() {
 // KOKKOS WORKAROUND for CUDA 10.1 with GCC 7.3.0
-#if(KOKKOS_COMPILER_CUDA_VERSION==101) && defined(KOKKOS_COMPILER_NVCC) && (KOKKOS_COMPILER_GNU>=730)
+#if (KOKKOS_COMPILER_CUDA_VERSION == 101) && defined(KOKKOS_COMPILER_NVCC) && \
+    (KOKKOS_COMPILER_GNU >= 730)
   (*m_queue).get_team_queue(0).~TaskQueueMultiple();
 #else
   m_queue->get_team_queue(0).~TaskQueueMultiple();
@@ -69,4 +72,3 @@ void TaskQueueMultiple<ExecSpace, MemorySpace>::Destroy::destroy_shared_allocati
 
 #endif /* #if defined( KOKKOS_ENABLE_TASKDAG ) */
 #endif /* #ifndef KOKKOS_IMPL_TASKQUEUEMULTIPLE_IMPL_HPP */
-
diff --git a/lib/kokkos/core/src/impl/Kokkos_TaskQueue_impl.hpp b/lib/kokkos/core/src/impl/Kokkos_TaskQueue_impl.hpp
index b5f8db0085..c64c497966 100644
--- a/lib/kokkos/core/src/impl/Kokkos_TaskQueue_impl.hpp
+++ b/lib/kokkos/core/src/impl/Kokkos_TaskQueue_impl.hpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -44,7 +45,7 @@
 #ifndef KOKKOS_IMPL_TASKQUEUE_IMPL_HPP
 #define KOKKOS_IMPL_TASKQUEUE_IMPL_HPP
 #include <Kokkos_Macros.hpp>
-#if defined( KOKKOS_ENABLE_TASKDAG )
+#if defined(KOKKOS_ENABLE_TASKDAG)
 
 #define KOKKOS_IMPL_DEBUG_TASKDAG_SCHEDULING 0
 
@@ -53,133 +54,120 @@ namespace Impl {
 
 //----------------------------------------------------------------------------
 
-template< typename ExecSpace, typename MemorySpace >
-void TaskQueue< ExecSpace, MemorySpace >::Destroy::destroy_shared_allocation()
-{
+template <typename ExecSpace, typename MemorySpace>
+void TaskQueue<ExecSpace, MemorySpace>::Destroy::destroy_shared_allocation() {
   m_queue->~TaskQueue();
 }
 
 //----------------------------------------------------------------------------
 
-template< typename ExecSpace, typename MemorySpace>
-TaskQueue< ExecSpace, MemorySpace>::TaskQueue
-  ( typename TaskQueue< ExecSpace, MemorySpace>::memory_pool const & arg_memory_pool )
-  : m_memory( arg_memory_pool )
-  , m_ready()
-  //, m_accum_alloc(0)
-  //, m_count_alloc(0)
-  //, m_max_alloc(0)
-  , m_ready_count(0)
-{
-  for ( int i = 0 ; i < NumQueue ; ++i ) {
-    m_ready[i][0] = (task_root_type *) task_root_type::EndTag ;
-    m_ready[i][1] = (task_root_type *) task_root_type::EndTag ;
+template <typename ExecSpace, typename MemorySpace>
+TaskQueue<ExecSpace, MemorySpace>::TaskQueue(
+    typename TaskQueue<ExecSpace, MemorySpace>::memory_pool const
+        &arg_memory_pool)
+    : m_memory(arg_memory_pool),
+      m_ready()
+      //, m_accum_alloc(0)
+      //, m_count_alloc(0)
+      //, m_max_alloc(0)
+      ,
+      m_ready_count(0) {
+  for (int i = 0; i < NumQueue; ++i) {
+    m_ready[i][0] = (task_root_type *)task_root_type::EndTag;
+    m_ready[i][1] = (task_root_type *)task_root_type::EndTag;
   }
 }
 
 //----------------------------------------------------------------------------
 
-template< typename ExecSpace, typename MemorySpace>
-TaskQueue< ExecSpace, MemorySpace>::~TaskQueue()
-{
+template <typename ExecSpace, typename MemorySpace>
+TaskQueue<ExecSpace, MemorySpace>::~TaskQueue() {
   // Verify that queues are empty and ready count is zero
 
-  for ( int i = 0 ; i < NumQueue ; ++i ) {
-    for ( int j = 0 ; j < 2 ; ++j ) {
-      if ( m_ready[i][j] != (task_root_type *) task_root_type::EndTag ) {
+  for (int i = 0; i < NumQueue; ++i) {
+    for (int j = 0; j < 2; ++j) {
+      if (m_ready[i][j] != (task_root_type *)task_root_type::EndTag) {
         Kokkos::abort("TaskQueue::~TaskQueue ERROR: has ready tasks");
       }
     }
   }
 
-  if ( 0 != m_ready_count ) {
+  if (0 != m_ready_count) {
     Kokkos::abort("TaskQueue::~TaskQueue ERROR: has ready or executing tasks");
   }
 }
 
 //----------------------------------------------------------------------------
 
-template< typename ExecSpace, typename MemorySpace>
-KOKKOS_FUNCTION
-void TaskQueue< ExecSpace, MemorySpace>::decrement
-  ( TaskQueue< ExecSpace, MemorySpace>::task_root_type * task )
-{
-  task_root_type volatile & t = *task ;
+template <typename ExecSpace, typename MemorySpace>
+KOKKOS_FUNCTION void TaskQueue<ExecSpace, MemorySpace>::decrement(
+    TaskQueue<ExecSpace, MemorySpace>::task_root_type *task) {
+  task_root_type volatile &t = *task;
 
-  const int count = Kokkos::atomic_fetch_add(&(t.m_ref_count),-1);
+  const int count = Kokkos::atomic_fetch_add(&(t.m_ref_count), -1);
 
 #if KOKKOS_IMPL_DEBUG_TASKDAG_SCHEDULING
-  if ( 1 == count ) {
-    printf( "decrement-destroy( 0x%lx { 0x%lx %d %d } )\n"
-          , uintptr_t( task )
-          , uintptr_t( task->m_next )
-          , int( task->m_task_type )
-          , int( task->m_ref_count )
-          );
+  if (1 == count) {
+    printf("decrement-destroy( 0x%lx { 0x%lx %d %d } )\n", uintptr_t(task),
+           uintptr_t(task->m_next), int(task->m_task_type),
+           int(task->m_ref_count));
   }
 #endif
 
-  if ( ( 1 == count ) &&
-       ( t.m_next == (task_root_type *) task_root_type::LockTag ) ) {
+  if ((1 == count) && (t.m_next == (task_root_type *)task_root_type::LockTag)) {
     // Reference count is zero and task is complete, deallocate.
 
-    //TaskQueue< ExecSpace, MemorySpace> * const queue =
+    // TaskQueue< ExecSpace, MemorySpace> * const queue =
     //  static_cast<scheduler_type const *>( t.m_scheduler )->m_queue;
-    auto* const volatile queue = static_cast<TaskQueue*>(t.m_queue);
+    auto *const volatile queue = static_cast<TaskQueue *>(t.m_queue);
 
-    // TODO @tasking @minor DSH this should call the destructor for a non-trivially destructible type (possibly just ignore this in the old version, though?)
-    // (Can't just do this; it needs to be queued since it's device code
-    // if(task->m_destroy) task->m_destroy(task);
+    // TODO @tasking @minor DSH this should call the destructor for a
+    // non-trivially destructible type (possibly just ignore this in the old
+    // version, though?) (Can't just do this; it needs to be queued since it's
+    // device code if(task->m_destroy) task->m_destroy(task);
 
-    queue->deallocate( task , t.m_alloc_size );
-  }
-  else if ( count <= 1 ) {
-    Kokkos::abort("TaskScheduler task has negative reference count or is incomplete" );
+    queue->deallocate(task, t.m_alloc_size);
+  } else if (count <= 1) {
+    Kokkos::abort(
+        "TaskScheduler task has negative reference count or is incomplete");
   }
 }
 
 //----------------------------------------------------------------------------
 
-template< typename ExecSpace, typename MemorySpace>
-KOKKOS_FUNCTION
-size_t TaskQueue< ExecSpace, MemorySpace>::allocate_block_size( size_t n )
-{
-  return m_memory.allocate_block_size( n );
+template <typename ExecSpace, typename MemorySpace>
+KOKKOS_FUNCTION size_t
+TaskQueue<ExecSpace, MemorySpace>::allocate_block_size(size_t n) {
+  return m_memory.allocate_block_size(n);
 }
 
-template< typename ExecSpace, typename MemorySpace>
-KOKKOS_FUNCTION
-void * TaskQueue< ExecSpace, MemorySpace>::allocate( size_t n )
-{
-  void * const p = m_memory.allocate(n);
+template <typename ExecSpace, typename MemorySpace>
+KOKKOS_FUNCTION void *TaskQueue<ExecSpace, MemorySpace>::allocate(size_t n) {
+  void *const p = m_memory.allocate(n);
 
-  if ( p ) {
-    //Kokkos::atomic_increment( & m_accum_alloc );
-    Kokkos::atomic_increment( & m_count_alloc );
+  if (p) {
+    // Kokkos::atomic_increment( & m_accum_alloc );
+    Kokkos::atomic_increment(&m_count_alloc);
 
-    //if ( m_max_alloc < m_count_alloc ) m_max_alloc = m_count_alloc ;
+    // if ( m_max_alloc < m_count_alloc ) m_max_alloc = m_count_alloc ;
   }
 
-  return p ;
+  return p;
 }
 
-template< typename ExecSpace, typename MemorySpace>
-KOKKOS_FUNCTION
-void TaskQueue< ExecSpace, MemorySpace>::deallocate( void * p , size_t n )
-{
-  m_memory.deallocate( p , n );
-  Kokkos::atomic_decrement( & m_count_alloc );
+template <typename ExecSpace, typename MemorySpace>
+KOKKOS_FUNCTION void TaskQueue<ExecSpace, MemorySpace>::deallocate(void *p,
+                                                                   size_t n) {
+  m_memory.deallocate(p, n);
+  Kokkos::atomic_decrement(&m_count_alloc);
 }
 
 //----------------------------------------------------------------------------
 
-template< typename ExecSpace, typename MemorySpace>
-KOKKOS_FUNCTION
-bool TaskQueue< ExecSpace, MemorySpace>::push_task
-  ( TaskQueue< ExecSpace, MemorySpace>::task_root_type * volatile * const queue
-  , TaskQueue< ExecSpace, MemorySpace>::task_root_type * const task
-  )
-{
+template <typename ExecSpace, typename MemorySpace>
+KOKKOS_FUNCTION bool TaskQueue<ExecSpace, MemorySpace>::push_task(
+    TaskQueue<ExecSpace, MemorySpace>::task_root_type *volatile *const queue,
+    TaskQueue<ExecSpace, MemorySpace>::task_root_type *const task) {
   // Push task into a concurrently pushed and popped queue.
   // The queue can be either a ready task queue or a waiting task queue.
   // The queue is a linked list where 'task->m_next' form the links.
@@ -187,31 +175,26 @@ bool TaskQueue< ExecSpace, MemorySpace>::push_task
   // otherwise retry until the push succeeds.
 
 #if KOKKOS_IMPL_DEBUG_TASKDAG_SCHEDULING
-  printf( "push_task( 0x%lx { 0x%lx } 0x%lx { 0x%lx 0x%lx %d %d %d } )\n"
-        , uintptr_t(queue)
-        , uintptr_t(*queue)
-        , uintptr_t(task)
-        , uintptr_t(task->m_wait)
-        , uintptr_t(task->m_next)
-        , task->m_task_type
-        , task->m_priority
-        , task->m_ref_count );
+  printf("push_task( 0x%lx { 0x%lx } 0x%lx { 0x%lx 0x%lx %d %d %d } )\n",
+         uintptr_t(queue), uintptr_t(*queue), uintptr_t(task),
+         uintptr_t(task->m_wait), uintptr_t(task->m_next), task->m_task_type,
+         task->m_priority, task->m_ref_count);
 #endif
 
-  task_root_type * const zero = (task_root_type *) 0 ;
-  task_root_type * const lock = (task_root_type *) task_root_type::LockTag ;
+  task_root_type *const zero = (task_root_type *)0;
+  task_root_type *const lock = (task_root_type *)task_root_type::LockTag;
 
-  task_root_type * volatile & next = task->m_next ;
+  task_root_type *volatile &next = task->m_next;
 
-  if ( zero != next ) {
-    Kokkos::abort("TaskQueue::push_task ERROR: already a member of another queue" );
+  if (zero != next) {
+    Kokkos::abort(
+        "TaskQueue::push_task ERROR: already a member of another queue");
   }
 
   // store the head of the queue
-  task_root_type * old_head = *queue ;
-
-  while ( old_head != lock ) {
+  task_root_type *old_head = *queue;
 
+  while (old_head != lock) {
     // set task->next to the head of the queue
     next = old_head;
 
@@ -219,7 +202,7 @@ bool TaskQueue< ExecSpace, MemorySpace>::push_task
     Kokkos::memory_fence();
 
     // store the old head
-    task_root_type * const old_head_tmp = old_head;
+    task_root_type *const old_head_tmp = old_head;
 
     // attempt to swap task with the old head of the queue
     // as if this were done atomically:
@@ -229,33 +212,31 @@ bool TaskQueue< ExecSpace, MemorySpace>::push_task
     //   old_head = *queue;
     old_head = Kokkos::atomic_compare_exchange(queue, old_head, task);
 
-    if(old_head_tmp == old_head) return true;
+    if (old_head_tmp == old_head) return true;
   }
 
   // Failed, replace 'task->m_next' value since 'task' remains
   // not a member of a queue.
 
-  next = zero ;
+  next = zero;
 
   // Do not proceed until 'next' has been stored.
   Kokkos::memory_fence();
 
-  return false ;
+  return false;
 }
 
 //----------------------------------------------------------------------------
 
-template< typename ExecSpace, typename MemorySpace>
-KOKKOS_FUNCTION
-typename TaskQueue< ExecSpace, MemorySpace>::task_root_type *
-TaskQueue< ExecSpace, MemorySpace>::pop_ready_task
-  ( TaskQueue< ExecSpace, MemorySpace>::task_root_type * volatile * const queue )
-{
+template <typename ExecSpace, typename MemorySpace>
+KOKKOS_FUNCTION typename TaskQueue<ExecSpace, MemorySpace>::task_root_type *
+TaskQueue<ExecSpace, MemorySpace>::pop_ready_task(
+    TaskQueue<ExecSpace, MemorySpace>::task_root_type *volatile *const queue) {
   // Pop task from a concurrently pushed and popped ready task queue.
   // The queue is a linked list where 'task->m_next' form the links.
 
-  task_root_type * const lock = (task_root_type *) task_root_type::LockTag ;
-  task_root_type * const end  = (task_root_type *) task_root_type::EndTag ;
+  task_root_type *const lock = (task_root_type *)task_root_type::LockTag;
+  task_root_type *const end  = (task_root_type *)task_root_type::EndTag;
 
   // *queue is
   //   end   => an empty queue
@@ -264,23 +245,22 @@ TaskQueue< ExecSpace, MemorySpace>::pop_ready_task
 
   // Retry until the lock is acquired or the queue is empty.
 
-  task_root_type * task = *queue ;
-
-  while ( end != task ) {
+  task_root_type *task = *queue;
 
+  while (end != task) {
     // The only possible values for the queue are
     // (1) lock, (2) end, or (3) a valid task.
     // Thus zero will never appear in the queue.
     //
     // If queue is locked then just read by guaranteeing the CAS will fail.
 
-    if ( lock == task ) task = 0 ;
+    if (lock == task) task = 0;
 
-    task_root_type * const x = task ;
+    task_root_type *const x = task;
 
-    task = Kokkos::atomic_compare_exchange(queue,x,lock);
+    task = Kokkos::atomic_compare_exchange(queue, x, lock);
 
-    if ( x == task ) {
+    if (x == task) {
       // CAS succeeded and queue is locked
       //
       // This thread has locked the queue and removed 'task' from the queue.
@@ -294,41 +274,36 @@ TaskQueue< ExecSpace, MemorySpace>::pop_ready_task
       // This thread has exclusive access to
       // the queue and the popped task's m_next.
 
-      task_root_type * volatile & next = task->m_next ;
+      task_root_type *volatile &next = task->m_next;
 
       // This algorithm is not lockfree because a adversarial scheduler could
       // context switch this thread at this point and the rest of the threads
       // calling this method would never make forward progress
 
-      *queue = next ; next = lock ;
+      *queue = next;
+      next   = lock;
 
       Kokkos::memory_fence();
 
 #if KOKKOS_IMPL_DEBUG_TASKDAG_SCHEDULING
-      printf( "pop_ready_task( 0x%lx 0x%lx { 0x%lx 0x%lx %d %d %d } )\n"
-            , uintptr_t(queue)
-            , uintptr_t(task)
-            , uintptr_t(task->m_wait)
-            , uintptr_t(task->m_next)
-            , int(task->m_task_type)
-            , int(task->m_priority)
-            , int(task->m_ref_count) );
+      printf("pop_ready_task( 0x%lx 0x%lx { 0x%lx 0x%lx %d %d %d } )\n",
+             uintptr_t(queue), uintptr_t(task), uintptr_t(task->m_wait),
+             uintptr_t(task->m_next), int(task->m_task_type),
+             int(task->m_priority), int(task->m_ref_count));
 #endif
 
-      return task ;
+      return task;
     }
   }
 
-  return end ;
+  return end;
 }
 
 //----------------------------------------------------------------------------
 
-template< typename ExecSpace, typename MemorySpace>
-KOKKOS_FUNCTION
-void TaskQueue< ExecSpace, MemorySpace>::schedule_runnable
-  ( TaskQueue< ExecSpace, MemorySpace>::task_root_type * const task )
-{
+template <typename ExecSpace, typename MemorySpace>
+KOKKOS_FUNCTION void TaskQueue<ExecSpace, MemorySpace>::schedule_runnable(
+    TaskQueue<ExecSpace, MemorySpace>::task_root_type *const task) {
   // Schedule a runnable task upon construction / spawn
   // and upon completion of other tasks that 'task' is waiting on.
   //
@@ -354,41 +329,35 @@ void TaskQueue< ExecSpace, MemorySpace>::schedule_runnable
   //     task->m_next == member of linked list (queue)
 
 #if KOKKOS_IMPL_DEBUG_TASKDAG_SCHEDULING
-  printf( "schedule_runnable( 0x%lx { 0x%lx 0x%lx %d %d %d }\n"
-        , uintptr_t(task)
-        , uintptr_t(task->m_wait)
-        , uintptr_t(task->m_next)
-        , task->m_task_type
-        , task->m_priority
-        , task->m_ref_count );
+  printf("schedule_runnable( 0x%lx { 0x%lx 0x%lx %d %d %d }\n", uintptr_t(task),
+         uintptr_t(task->m_wait), uintptr_t(task->m_next), task->m_task_type,
+         task->m_priority, task->m_ref_count);
 #endif
 
-  task_root_type * const zero = (task_root_type *) 0 ;
-  task_root_type * const lock = (task_root_type *) task_root_type::LockTag ;
-  task_root_type * const end  = (task_root_type *) task_root_type::EndTag ;
+  task_root_type *const zero = (task_root_type *)0;
+  task_root_type *const lock = (task_root_type *)task_root_type::LockTag;
+  task_root_type *const end  = (task_root_type *)task_root_type::EndTag;
 
-  task_root_type volatile & t = *task ;
+  task_root_type volatile &t = *task;
 
-  bool respawn = false ;
+  bool respawn = false;
 
   //----------------------------------------
 
-  if ( zero == t.m_wait ) {
+  if (zero == t.m_wait) {
     // Task in Constructing state
     // - Transition to Waiting state
     // Preconditions:
     // - call occurs exclusively within a single thread
 
-    t.m_wait = end ;
+    t.m_wait = end;
     // Task in Waiting state
-  }
-  else if ( lock != t.m_wait ) {
+  } else if (lock != t.m_wait) {
     // Task in Executing state with Respawn request
     // - Update dependence
     // - Transition to Waiting state
-    respawn = true ;
-  }
-  else {
+    respawn = true;
+  } else {
     // Task in Complete state
     Kokkos::abort("TaskQueue::schedule_runnable ERROR: task is complete");
   }
@@ -405,36 +374,36 @@ void TaskQueue< ExecSpace, MemorySpace>::schedule_runnable
 
   // Exclusive access so don't need an atomic exchange
   // task_root_type * dep = Kokkos::atomic_exchange( & task->m_next , zero );
-  task_root_type * dep = t.m_next ; t.m_next = zero ;
+  task_root_type *dep = t.m_next;
+  t.m_next            = zero;
 
   Kokkos::memory_fence();
 
-  // If we don't have a dependency, or if pushing onto the wait queue of that dependency
-  // failed (since the only time that queue should be locked is when the task is transitioning to complete??!?)
-  const bool is_ready =
-    ( 0 == dep ) || ( ! push_task( & dep->m_wait , task ) );
+  // If we don't have a dependency, or if pushing onto the wait queue of that
+  // dependency failed (since the only time that queue should be locked is when
+  // the task is transitioning to complete??!?)
+  const bool is_ready = (0 == dep) || (!push_task(&dep->m_wait, task));
 
-  if ( ( 0 != dep ) && respawn ) {
+  if ((0 != dep) && respawn) {
     // Reference count for dep was incremented when
     // respawn assigned dependency to task->m_next
     // so that if dep completed prior to the
     // above push_task dep would not be destroyed.
     // dep reference count can now be decremented,
     // which may deallocate the task.
-    TaskQueue::assign( & dep , (task_root_type *)0 );
+    TaskQueue::assign(&dep, (task_root_type *)0);
   }
 
-  if ( is_ready ) {
-
+  if (is_ready) {
     // No dependence or 'dep' is complete so push task into ready queue.
     // Increment the ready count before pushing into ready queue
     // to track number of ready + executing tasks.
     // The ready count will be decremented when the task is complete.
 
-    Kokkos::atomic_increment( & m_ready_count );
+    Kokkos::atomic_increment(&m_ready_count);
 
-    task_root_type * volatile * const ready_queue =
-      & m_ready[ t.m_priority ][ t.m_task_type ];
+    task_root_type *volatile *const ready_queue =
+        &m_ready[t.m_priority][t.m_task_type];
 
     // A push_task fails if the ready queue is locked.
     // A ready queue is only locked during a push or pop;
@@ -443,7 +412,8 @@ void TaskQueue< ExecSpace, MemorySpace>::schedule_runnable
     // When the push succeeds then 'task' may be
     // processed or executed by another thread at any time.
 
-    while ( ! push_task( ready_queue , task ) );
+    while (!push_task(ready_queue, task))
+      ;
   }
 
   //----------------------------------------
@@ -453,11 +423,9 @@ void TaskQueue< ExecSpace, MemorySpace>::schedule_runnable
   //   from a queue and processed it as appropriate.
 }
 
-template< typename ExecSpace, typename MemorySpace>
-KOKKOS_FUNCTION
-void TaskQueue< ExecSpace, MemorySpace>::schedule_aggregate
-  ( TaskQueue< ExecSpace, MemorySpace>::task_root_type * const task )
-{
+template <typename ExecSpace, typename MemorySpace>
+KOKKOS_FUNCTION void TaskQueue<ExecSpace, MemorySpace>::schedule_aggregate(
+    TaskQueue<ExecSpace, MemorySpace>::task_root_type *const task) {
   // Schedule an aggregate task upon construction
   // and upon completion of other tasks that 'task' is waiting on.
   //
@@ -478,34 +446,29 @@ void TaskQueue< ExecSpace, MemorySpace>::schedule_aggregate
   //     task->m_next == member of linked list (queue)
 
 #if KOKKOS_IMPL_DEBUG_TASKDAG_SCHEDULING
-  printf( "schedule_aggregate( 0x%lx { 0x%lx 0x%lx %d %d %d %d }\n"
-        , uintptr_t(task)
-        , uintptr_t(task->m_wait)
-        , uintptr_t(task->m_next)
-        , task->m_dep_count
-        , task->m_task_type
-        , task->m_priority
-        , task->m_ref_count );
+  printf("schedule_aggregate( 0x%lx { 0x%lx 0x%lx %d %d %d %d }\n",
+         uintptr_t(task), uintptr_t(task->m_wait), uintptr_t(task->m_next),
+         task->m_dep_count, task->m_task_type, task->m_priority,
+         task->m_ref_count);
 #endif
 
-  task_root_type * const zero = (task_root_type *) 0 ;
-  task_root_type * const lock = (task_root_type *) task_root_type::LockTag ;
-  task_root_type * const end  = (task_root_type *) task_root_type::EndTag ;
+  task_root_type *const zero = (task_root_type *)0;
+  task_root_type *const lock = (task_root_type *)task_root_type::LockTag;
+  task_root_type *const end  = (task_root_type *)task_root_type::EndTag;
 
-  task_root_type volatile & t = *task ;
+  task_root_type volatile &t = *task;
 
   //----------------------------------------
 
-  if ( zero == t.m_wait ) {
+  if (zero == t.m_wait) {
     // Task in Constructing state
     // - Transition to Waiting state
     // Preconditions:
     // - call occurs exclusively within a single thread
 
-    t.m_wait = end ;
+    t.m_wait = end;
     // Task in Waiting state
-  }
-  else if ( lock == t.m_wait ) {
+  } else if (lock == t.m_wait) {
     // Task in Complete state
     Kokkos::abort("TaskQueue::schedule_aggregate ERROR: task is complete");
   }
@@ -516,16 +479,15 @@ void TaskQueue< ExecSpace, MemorySpace>::schedule_aggregate
   // (1) created or
   // (2) being removed from a completed task's wait list.
 
-  task_root_type * volatile * const aggr = t.aggregate_dependences();
+  task_root_type *volatile *const aggr = t.aggregate_dependences();
 
   // Assume the 'when_all' is complete until a dependence is
   // found that is not complete.
 
-  bool is_complete = true ;
+  bool is_complete = true;
 
-  for ( int i = t.m_dep_count ; 0 < i && is_complete ; ) {
-
-    --i ;
+  for (int i = t.m_dep_count; 0 < i && is_complete;) {
+    --i;
 
     // Loop dependences looking for an incomplete task.
     // Add this task to the incomplete task's wait queue.
@@ -536,10 +498,10 @@ void TaskQueue< ExecSpace, MemorySpace>::schedule_aggregate
 
     // Exclusive access so don't need an atomic exchange
     // task_root_type * x = Kokkos::atomic_exchange( aggr + i , zero );
-    task_root_type * x = aggr[i] ; aggr[i] = zero ;
-
-    if ( x ) {
+    task_root_type *x = aggr[i];
+    aggr[i]           = zero;
 
+    if (x) {
       // If x->m_wait is not locked then push succeeds
       // and the aggregate is not complete.
       // If the push succeeds then this when_all 'task' may be
@@ -547,24 +509,24 @@ void TaskQueue< ExecSpace, MemorySpace>::schedule_aggregate
       // For example, 'x' may be completeed by another
       // thread and then re-schedule this when_all 'task'.
 
-      is_complete = ! push_task( & x->m_wait , task );
+      is_complete = !push_task(&x->m_wait, task);
 
       // Decrement reference count which had been incremented
       // when 'x' was added to the dependence list.
 
-      TaskQueue::assign( & x , zero );
+      TaskQueue::assign(&x, zero);
     }
   }
 
-  if ( is_complete ) {
+  if (is_complete) {
     // The when_all 'task' was not added to a wait queue because
     // all dependences were complete so this aggregate is complete.
     // Complete the when_all 'task' to schedule other tasks
     // that are waiting for the when_all 'task' to complete.
 
-    t.m_next = lock ;
+    t.m_next = lock;
 
-    complete( task );
+    complete(task);
 
     // '*task' may have been deleted upon completion
   }
@@ -578,10 +540,9 @@ void TaskQueue< ExecSpace, MemorySpace>::schedule_aggregate
 
 //----------------------------------------------------------------------------
 
-template< typename ExecSpace, typename MemorySpace>
-KOKKOS_FUNCTION
-void TaskQueue< ExecSpace, MemorySpace>::reschedule( task_root_type * task )
-{
+template <typename ExecSpace, typename MemorySpace>
+KOKKOS_FUNCTION void TaskQueue<ExecSpace, MemorySpace>::reschedule(
+    task_root_type *task) {
   // Precondition:
   //   task is in Executing state
   //   task->m_next == LockTag
@@ -590,49 +551,43 @@ void TaskQueue< ExecSpace, MemorySpace>::reschedule( task_root_type * task )
   //   task is in Executing-Respawn state
   //   task->m_next == 0 (no dependence)
 
-  task_root_type * const zero = (task_root_type *) 0 ;
-  task_root_type * const lock = (task_root_type *) task_root_type::LockTag ;
+  task_root_type *const zero = (task_root_type *)0;
+  task_root_type *const lock = (task_root_type *)task_root_type::LockTag;
 
-  if ( lock != Kokkos::atomic_exchange( & task->m_next, zero ) ) {
+  if (lock != Kokkos::atomic_exchange(&task->m_next, zero)) {
     Kokkos::abort("TaskScheduler::respawn ERROR: already respawned");
   }
 }
 
 //----------------------------------------------------------------------------
 
-template< typename ExecSpace, typename MemorySpace>
-KOKKOS_FUNCTION
-void TaskQueue< ExecSpace, MemorySpace>::complete
-  ( TaskQueue< ExecSpace, MemorySpace>::task_root_type * task )
-{
+template <typename ExecSpace, typename MemorySpace>
+KOKKOS_FUNCTION void TaskQueue<ExecSpace, MemorySpace>::complete(
+    TaskQueue<ExecSpace, MemorySpace>::task_root_type *task) {
   // Complete a runnable task that has finished executing
   // or a when_all task when all of its dependeneces are complete.
 
-  task_root_type * const zero = (task_root_type *) 0 ;
-  task_root_type * const lock = (task_root_type *) task_root_type::LockTag ;
-  task_root_type * const end  = (task_root_type *) task_root_type::EndTag ;
+  task_root_type *const zero = (task_root_type *)0;
+  task_root_type *const lock = (task_root_type *)task_root_type::LockTag;
+  task_root_type *const end  = (task_root_type *)task_root_type::EndTag;
 
 #if KOKKOS_IMPL_DEBUG_TASKDAG_SCHEDULING
-  printf( "complete( 0x%lx { 0x%lx 0x%lx %d %d %d }\n"
-        , uintptr_t(task)
-        , uintptr_t(task->m_wait)
-        , uintptr_t(task->m_next)
-        , task->m_task_type
-        , task->m_priority
-        , task->m_ref_count );
+  printf("complete( 0x%lx { 0x%lx 0x%lx %d %d %d }\n", uintptr_t(task),
+         uintptr_t(task->m_wait), uintptr_t(task->m_next), task->m_task_type,
+         task->m_priority, task->m_ref_count);
 #endif
 
-  task_root_type volatile & t = *task ;
+  task_root_type volatile &t = *task;
 
-  const bool runnable = task_root_type::Aggregate != t.m_task_type ;
+  const bool runnable = task_root_type::Aggregate != t.m_task_type;
 
   //----------------------------------------
 
-  if ( runnable && lock != t.m_next ) {
+  if (runnable && lock != t.m_next) {
     // Is a runnable task has finished executing and requested respawn.
     // Schedule the task for subsequent execution.
 
-    schedule_runnable( task );
+    schedule_runnable(task);
   }
   //----------------------------------------
   else {
@@ -642,56 +597,55 @@ void TaskQueue< ExecSpace, MemorySpace>::complete
     // If 'task' is an aggregate then any of the runnable tasks that
     // it depends upon may be attempting to complete this 'task'.
     // Must only transition a task once to complete status.
-    // This is controled by atomically locking the wait queue.
+    // This is controlled by atomically locking the wait queue.
 
     // Stop other tasks from adding themselves to this task's wait queue
     // by locking the head of this task's wait queue.
 
-    task_root_type * x = Kokkos::atomic_exchange( & t.m_wait , lock );
-
-    if ( x != (task_root_type *) lock ) {
+    task_root_type *x = Kokkos::atomic_exchange(&t.m_wait, lock);
 
+    if (x != (task_root_type *)lock) {
       // This thread has transitioned this 'task' to complete.
       // 'task' is no longer in a queue and is not executing
       // so decrement the reference count from 'task's creation.
       // If no other references to this 'task' then it will be deleted.
 
-      TaskQueue::assign( & task , zero );
+      TaskQueue::assign(&task, zero);
 
       // This thread has exclusive access to the wait list so
       // the concurrency-safe pop_ready_task function is not needed.
       // Schedule the tasks that have been waiting on the input 'task',
       // which may have been deleted.
 
-      while ( x != end ) {
+      while (x != end) {
         // Have exclusive access to 'x' until it is scheduled
         // Set x->m_next = zero  <=  no dependence, not a respawn
 
-        task_root_type volatile & vx = *x ;
+        task_root_type volatile &vx = *x;
 
-        task_root_type * const next = vx.m_next ; vx.m_next = 0 ;
+        task_root_type *const next = vx.m_next;
+        vx.m_next                  = 0;
 
         Kokkos::memory_fence();
 
-        if ( task_root_type::Aggregate != vx.m_task_type ) {
-          schedule_runnable( x );
-        }
-        else {
-#if !defined( __HCC_ACCELERATOR__ )
-          schedule_aggregate( x );
+        if (task_root_type::Aggregate != vx.m_task_type) {
+          schedule_runnable(x);
+        } else {
+#if !defined(__HCC_ACCELERATOR__)
+          schedule_aggregate(x);
 #endif
         }
 
-        x = next ;
+        x = next;
       }
     }
   }
 
-  if ( runnable ) {
+  if (runnable) {
     // A runnable task was popped from a ready queue and executed.
     // If respawned into a ready queue then the ready count was incremented
     // so decrement whether respawned or not.
-    Kokkos::atomic_decrement( & m_ready_count );
+    Kokkos::atomic_decrement(&m_ready_count);
   }
 }
 
@@ -702,4 +656,3 @@ void TaskQueue< ExecSpace, MemorySpace>::complete
 
 #endif /* #if defined( KOKKOS_ENABLE_TASKDAG ) */
 #endif /* #ifndef KOKKOS_IMPL_TASKQUEUE_IMPL_HPP */
-
diff --git a/lib/kokkos/core/src/impl/Kokkos_TaskResult.hpp b/lib/kokkos/core/src/impl/Kokkos_TaskResult.hpp
index d45ebff00b..f846ff4ea6 100644
--- a/lib/kokkos/core/src/impl/Kokkos_TaskResult.hpp
+++ b/lib/kokkos/core/src/impl/Kokkos_TaskResult.hpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -47,7 +48,7 @@
 #define KOKKOS_IMPL_TASKRESULT_HPP
 
 #include <Kokkos_Macros.hpp>
-#if defined( KOKKOS_ENABLE_TASKDAG )
+#if defined(KOKKOS_ENABLE_TASKDAG)
 
 #include <Kokkos_TaskScheduler_fwd.hpp>
 #include <Kokkos_Core_fwd.hpp>
@@ -65,78 +66,71 @@
 namespace Kokkos {
 namespace Impl {
 
-template< typename ResultType >
+template <typename ResultType>
 struct TaskResult {
-
   enum : int32_t { size = sizeof(ResultType) };
 
-  using reference_type = ResultType & ;
+  using reference_type = ResultType&;
 
   template <class CountType>
-  KOKKOS_INLINE_FUNCTION static
-  ResultType * ptr( PoolAllocatedObjectBase<CountType>* task )
-  {
-    return reinterpret_cast< ResultType * >
-    ( reinterpret_cast< char * >(task) + task->get_allocation_size() - sizeof(ResultType) );
+  KOKKOS_INLINE_FUNCTION static ResultType* ptr(
+      PoolAllocatedObjectBase<CountType>* task) {
+    return reinterpret_cast<ResultType*>(reinterpret_cast<char*>(task) +
+                                         task->get_allocation_size() -
+                                         sizeof(ResultType));
   }
 
-  KOKKOS_INLINE_FUNCTION static
-  ResultType * ptr( TaskBase* task )
-    {
-      return reinterpret_cast< ResultType * >
-        ( reinterpret_cast< char * >(task) + task->m_alloc_size - sizeof(ResultType) );
-    }
+  KOKKOS_INLINE_FUNCTION static ResultType* ptr(TaskBase* task) {
+    return reinterpret_cast<ResultType*>(reinterpret_cast<char*>(task) +
+                                         task->m_alloc_size -
+                                         sizeof(ResultType));
+  }
 
-  KOKKOS_INLINE_FUNCTION static
-  reference_type get( TaskBase* task )
-    { return *ptr( task ); }
+  KOKKOS_INLINE_FUNCTION static reference_type get(TaskBase* task) {
+    return *ptr(task);
+  }
 
   template <class TaskQueueTraits>
-  KOKKOS_INLINE_FUNCTION static
-  reference_type get( TaskNode<TaskQueueTraits>* task )
-  { return *ptr( task ); }
+  KOKKOS_INLINE_FUNCTION static reference_type get(
+      TaskNode<TaskQueueTraits>* task) {
+    return *ptr(task);
+  }
 
-  KOKKOS_INLINE_FUNCTION static
-  void destroy( TaskBase* task )
-    { get(task).~ResultType(); }
+  KOKKOS_INLINE_FUNCTION static void destroy(TaskBase* task) {
+    get(task).~ResultType();
+  }
 
-
-  //template <class TaskQueueTraits>
-  //KOKKOS_INLINE_FUNCTION static
-  //void destroy( TaskNode<TaskQueueTraits>* task )
+  // template <class TaskQueueTraits>
+  // KOKKOS_INLINE_FUNCTION static
+  // void destroy( TaskNode<TaskQueueTraits>* task )
   //{ get(task).~ResultType(); }
 };
 
-template<>
-struct TaskResult< void > {
-
+template <>
+struct TaskResult<void> {
   enum : int32_t { size = 0 };
 
-  using reference_type = void ;
+  using reference_type = void;
 
   template <class TaskQueueTraits>
-  KOKKOS_INLINE_FUNCTION static
-  void* ptr( TaskNode<TaskQueueTraits>* task )
-  { return nullptr; }
+  KOKKOS_INLINE_FUNCTION static void* ptr(TaskNode<TaskQueueTraits>* task) {
+    return nullptr;
+  }
 
-  KOKKOS_INLINE_FUNCTION static
-  void * ptr( TaskBase* ) { return (void*) nullptr ; }
+  KOKKOS_INLINE_FUNCTION static void* ptr(TaskBase*) { return (void*)nullptr; }
 
   template <class TaskQueueTraits>
-  KOKKOS_INLINE_FUNCTION static
-  reference_type get( TaskNode<TaskQueueTraits>* task )
-  { /* Should never be called */ }
+  KOKKOS_INLINE_FUNCTION static reference_type get(
+      TaskNode<TaskQueueTraits>* task) { /* Should never be called */
+  }
 
-  KOKKOS_INLINE_FUNCTION static
-  reference_type get( TaskBase* ) {}
+  KOKKOS_INLINE_FUNCTION static reference_type get(TaskBase*) {}
 
-  KOKKOS_INLINE_FUNCTION static
-  void destroy( TaskBase* task )
-    { }
+  KOKKOS_INLINE_FUNCTION static void destroy(TaskBase* task) {}
 
-  //template <class TaskQueueTraits>
-  //KOKKOS_INLINE_FUNCTION static
-  //void destroy( TaskNode<TaskQueueTraits>* task )
+  // template <class TaskQueueTraits>
+  // KOKKOS_INLINE_FUNCTION static
+  // void destroy( TaskNode<TaskQueueTraits>* task )
   //{ }
 };
 
@@ -148,4 +142,3 @@ struct TaskResult< void > {
 
 #endif /* #if defined( KOKKOS_ENABLE_TASKDAG ) */
 #endif /* #ifndef KOKKOS_IMPL_TASKRESULT_HPP */
-
diff --git a/lib/kokkos/core/src/impl/Kokkos_TaskTeamMember.hpp b/lib/kokkos/core/src/impl/Kokkos_TaskTeamMember.hpp
index 4bf3f4fa94..5a9d4c77bf 100644
--- a/lib/kokkos/core/src/impl/Kokkos_TaskTeamMember.hpp
+++ b/lib/kokkos/core/src/impl/Kokkos_TaskTeamMember.hpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -47,7 +48,7 @@
 //----------------------------------------------------------------------------
 
 #include <Kokkos_Macros.hpp>
-#if defined( KOKKOS_ENABLE_TASKDAG )
+#if defined(KOKKOS_ENABLE_TASKDAG)
 
 #include <Kokkos_Core_fwd.hpp>
 #include <Kokkos_TaskScheduler_fwd.hpp>
@@ -70,28 +71,22 @@ namespace Impl {
 
 template <class TeamMember, class Scheduler>
 class TaskTeamMemberAdapter : public TeamMember {
-private:
-
+ private:
   Scheduler m_scheduler;
 
-public:
-
+ public:
   //----------------------------------------
 
   // Forward everything but the Scheduler to the constructor of the TeamMember
   // type that we're adapting
   template <typename... Args>
-  KOKKOS_INLINE_FUNCTION
-  explicit TaskTeamMemberAdapter(
-    typename std::enable_if<
-      std::is_constructible<TeamMember, Args...>::value,
-      Scheduler
-    >::type arg_scheduler,
-    Args&&... args
-  ) // TODO @tasking @minor DSH noexcept specification
-    : TeamMember(std::forward<Args>(args)...),
-      m_scheduler(std::move(arg_scheduler).get_team_scheduler(this->league_rank()))
-  { }
+  KOKKOS_INLINE_FUNCTION explicit TaskTeamMemberAdapter(
+      typename std::enable_if<std::is_constructible<TeamMember, Args...>::value,
+                              Scheduler>::type arg_scheduler,
+      Args&&... args)  // TODO @tasking @minor DSH noexcept specification
+      : TeamMember(std::forward<Args>(args)...),
+        m_scheduler(
+            std::move(arg_scheduler).get_team_scheduler(this->league_rank())) {}
 
   // (rule of 6 constructors)
 
@@ -121,15 +116,13 @@ public:
   Scheduler& scheduler() noexcept { return m_scheduler; }
 
   //----------------------------------------
-
 };
 
-} // end namespace Impl
-} // namespace Kokkos
+}  // end namespace Impl
+}  // namespace Kokkos
 
 //----------------------------------------------------------------------------
 //----------------------------------------------------------------------------
 
 #endif /* #if defined( KOKKOS_ENABLE_TASKDAG ) */
 #endif /* #ifndef KOKKOS_TASKTEAMMEMBER_HPP */
-
diff --git a/lib/kokkos/core/src/impl/Kokkos_Timer.hpp b/lib/kokkos/core/src/impl/Kokkos_Timer.hpp
index 9897225c38..e8004ff852 100644
--- a/lib/kokkos/core/src/impl/Kokkos_Timer.hpp
+++ b/lib/kokkos/core/src/impl/Kokkos_Timer.hpp
@@ -1,13 +1,14 @@
 /*
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -36,7 +37,7 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 */
@@ -49,15 +50,14 @@
 namespace Kokkos {
 namespace Impl {
 
-/** \brief  Time since construction 
+/** \brief  Time since construction
  *   Timer promoted from Impl to Kokkos ns
  *   This file included for backwards compatibility
  */
 
-  using Kokkos::Timer ;
+using Kokkos::Timer;
 
-} // namespace Impl
-} // namespace Kokkos
+}  // namespace Impl
+}  // namespace Kokkos
 
 #endif /* #ifndef KOKKOS_IMPLWALLTIME_HPP */
-
diff --git a/lib/kokkos/core/src/impl/Kokkos_Traits.hpp b/lib/kokkos/core/src/impl/Kokkos_Traits.hpp
index a5af82838f..6f7e164baf 100644
--- a/lib/kokkos/core/src/impl/Kokkos_Traits.hpp
+++ b/lib/kokkos/core/src/impl/Kokkos_Traits.hpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -57,86 +58,82 @@ namespace Impl {
 //----------------------------------------------------------------------------
 // Help with C++11 variadic argument packs
 
-template< unsigned I , typename ... Pack >
-struct get_type { typedef void type ; };
-
-template< typename T , typename ... Pack >
-struct get_type< 0 , T , Pack ... >
-{ typedef T type ; };
-
-template< unsigned I , typename T , typename ... Pack >
-struct get_type< I , T , Pack ... >
-{ typedef typename get_type< I - 1 , Pack ... >::type type ; };
-
-
-template< typename T , typename ... Pack >
-struct has_type { enum { value = false }; };
-
-template< typename T , typename S , typename ... Pack >
-struct has_type<T,S,Pack...>
-{
-private:
-
-  enum { self_value = std::is_same<T,S>::value };
-
-  typedef has_type<T,Pack...> next ;
-
-  static_assert( ! ( self_value && next::value )
-               , "Error: more than one member of the argument pack matches the type" );
-
-public:
-
-  enum { value = self_value || next::value };
-
+template <unsigned I, typename... Pack>
+struct get_type {
+  typedef void type;
 };
 
+template <typename T, typename... Pack>
+struct get_type<0, T, Pack...> {
+  typedef T type;
+};
 
-template< typename DefaultType
-        , template< typename > class Condition
-        , typename ... Pack >
-struct has_condition
-{
+template <unsigned I, typename T, typename... Pack>
+struct get_type<I, T, Pack...> {
+  typedef typename get_type<I - 1, Pack...>::type type;
+};
+
+template <typename T, typename... Pack>
+struct has_type {
   enum { value = false };
-  typedef DefaultType type ;
 };
 
-template< typename DefaultType
-        , template< typename > class Condition
-        , typename S
-        , typename ... Pack >
-struct has_condition< DefaultType , Condition , S , Pack... >
-{
-private:
+template <typename T, typename S, typename... Pack>
+struct has_type<T, S, Pack...> {
+ private:
+  enum { self_value = std::is_same<T, S>::value };
 
+  typedef has_type<T, Pack...> next;
+
+  static_assert(
+      !(self_value && next::value),
+      "Error: more than one member of the argument pack matches the type");
+
+ public:
+  enum { value = self_value || next::value };
+};
+
+template <typename DefaultType, template <typename> class Condition,
+          typename... Pack>
+struct has_condition {
+  enum { value = false };
+  typedef DefaultType type;
+};
+
+template <typename DefaultType, template <typename> class Condition, typename S,
+          typename... Pack>
+struct has_condition<DefaultType, Condition, S, Pack...> {
+ private:
   enum { self_value = Condition<S>::value };
 
-  typedef has_condition< DefaultType , Condition , Pack... > next ;
+  typedef has_condition<DefaultType, Condition, Pack...> next;
 
-  static_assert( ! ( self_value && next::value )
-               , "Error: more than one member of the argument pack satisfies condition" );
-
-public:
+  static_assert(
+      !(self_value && next::value),
+      "Error: more than one member of the argument pack satisfies condition");
 
+ public:
   enum { value = self_value || next::value };
 
-  typedef typename
-    std::conditional< self_value , S , typename next::type >::type
-      type ;
+  typedef
+      typename std::conditional<self_value, S, typename next::type>::type type;
 };
 
+template <class... Args>
+struct are_integral {
+  enum { value = true };
+};
 
-template< class ... Args >
-struct are_integral { enum { value = true }; };
-
-template< typename T , class ... Args >
-struct are_integral<T,Args...> {
-  enum { value =
-    // Accept std::is_integral OR std::is_enum as an integral value
-    // since a simple enum value is automically convertable to an
-    // integral value.
-    ( std::is_integral<T>::value || std::is_enum<T>::value )
-    &&
-    are_integral<Args...>::value };
+template <typename T, class... Args>
+struct are_integral<T, Args...> {
+  enum {
+    value =
+        // Accept std::is_integral OR std::is_enum as an integral value
+        // since a simple enum value is automically convertible to an
+        // integral value.
+    (std::is_integral<T>::value || std::is_enum<T>::value) &&
+    are_integral<Args...>::value
+  };
 };
 
 //----------------------------------------------------------------------------
@@ -146,76 +143,128 @@ struct are_integral<T,Args...> {
 //----------------------------------------------------------------------------
 // C++11 Helpers:
 
-template < class T , T v >
-struct integral_constant
-{
+template <class T, T v>
+struct integral_constant {
   // Declaration of 'static const' causes an unresolved linker symbol in debug
   // static const T value = v ;
   enum { value = T(v) };
   typedef T value_type;
-  typedef integral_constant<T,v> type;
-  KOKKOS_INLINE_FUNCTION operator T() { return v ; }
+  typedef integral_constant<T, v> type;
+  KOKKOS_INLINE_FUNCTION operator T() { return v; }
 };
 
-typedef integral_constant<bool,false> false_type ;
-typedef integral_constant<bool,true>  true_type ;
+typedef integral_constant<bool, false> false_type;
+typedef integral_constant<bool, true> true_type;
 
 //----------------------------------------------------------------------------
 // C++11 Type relationships:
 
-template< class X , class Y > struct is_same : public false_type {};
-template< class X >           struct is_same<X,X> : public true_type {};
+template <class X, class Y>
+struct is_same : public false_type {};
+template <class X>
+struct is_same<X, X> : public true_type {};
 
 //----------------------------------------------------------------------------
 // C++11 Type properties:
 
-template <typename T> struct is_const : public false_type {};
-template <typename T> struct is_const<const T> : public true_type {};
-template <typename T> struct is_const<const T & > : public true_type {};
+template <typename T>
+struct is_const : public false_type {};
+template <typename T>
+struct is_const<const T> : public true_type {};
+template <typename T>
+struct is_const<const T&> : public true_type {};
 
-template <typename T> struct is_array : public false_type {};
-template <typename T> struct is_array< T[] > : public true_type {};
-template <typename T, unsigned N > struct is_array< T[N] > : public true_type {};
+template <typename T>
+struct is_array : public false_type {};
+template <typename T>
+struct is_array<T[]> : public true_type {};
+template <typename T, unsigned N>
+struct is_array<T[N]> : public true_type {};
 
 //----------------------------------------------------------------------------
 // C++11 Type transformations:
 
-template <typename T> struct remove_const { typedef T type; };
-template <typename T> struct remove_const<const T> { typedef T type; };
-template <typename T> struct remove_const<const T & > { typedef T & type; };
+template <typename T>
+struct remove_const {
+  typedef T type;
+};
+template <typename T>
+struct remove_const<const T> {
+  typedef T type;
+};
+template <typename T>
+struct remove_const<const T&> {
+  typedef T& type;
+};
 
-template <typename T> struct add_const { typedef const T type; };
-template <typename T> struct add_const<T & > { typedef const T & type; };
-template <typename T> struct add_const<const T> { typedef const T type; };
-template <typename T> struct add_const<const T & > { typedef const T & type; };
+template <typename T>
+struct add_const {
+  typedef const T type;
+};
+template <typename T>
+struct add_const<T&> {
+  typedef const T& type;
+};
+template <typename T>
+struct add_const<const T> {
+  typedef const T type;
+};
+template <typename T>
+struct add_const<const T&> {
+  typedef const T& type;
+};
 
-template <typename T> struct remove_reference { typedef T type ; };
-template <typename T> struct remove_reference< T & > { typedef T type ; };
-template <typename T> struct remove_reference< const T & > { typedef const T type ; };
+template <typename T>
+struct remove_reference {
+  typedef T type;
+};
+template <typename T>
+struct remove_reference<T&> {
+  typedef T type;
+};
+template <typename T>
+struct remove_reference<const T&> {
+  typedef const T type;
+};
 
-template <typename T> struct remove_extent { typedef T type ; };
-template <typename T> struct remove_extent<T[]> { typedef T type ; };
-template <typename T, unsigned N > struct remove_extent<T[N]> { typedef T type ; };
+template <typename T>
+struct remove_extent {
+  typedef T type;
+};
+template <typename T>
+struct remove_extent<T[]> {
+  typedef T type;
+};
+template <typename T, unsigned N>
+struct remove_extent<T[N]> {
+  typedef T type;
+};
 
 //----------------------------------------------------------------------------
 // C++11 Other type generators:
 
-template< bool , class T , class F >
-struct condition { typedef F type ; };
+template <bool, class T, class F>
+struct condition {
+  typedef F type;
+};
 
-template< class T , class F >
-struct condition<true,T,F> { typedef T type ; };
+template <class T, class F>
+struct condition<true, T, F> {
+  typedef T type;
+};
 
-template< bool , class = void >
-struct enable_if ;
+template <bool, class = void>
+struct enable_if;
 
-template< class T >
-struct enable_if< true , T > { typedef T type ; };
+template <class T>
+struct enable_if<true, T> {
+  typedef T type;
+};
 
 //----------------------------------------------------------------------------
 
-} // namespace Impl
-} // namespace Kokkos
+}  // namespace Impl
+}  // namespace Kokkos
 
 //----------------------------------------------------------------------------
 //----------------------------------------------------------------------------
@@ -226,107 +275,111 @@ namespace Impl {
 
 //----------------------------------------------------------------------------
 
-template< class , class T = void >
-struct enable_if_type { typedef T type ; };
+template <class, class T = void>
+struct enable_if_type {
+  typedef T type;
+};
 
 //----------------------------------------------------------------------------
 
-template< bool B >
-struct bool_ : public integral_constant<bool,B> {};
+template <bool B>
+struct bool_ : public integral_constant<bool, B> {};
 
-template< unsigned I >
-struct unsigned_ : public integral_constant<unsigned,I> {};
+template <unsigned I>
+struct unsigned_ : public integral_constant<unsigned, I> {};
 
-template< int I >
-struct int_ : public integral_constant<int,I> {};
+template <int I>
+struct int_ : public integral_constant<int, I> {};
 
 typedef bool_<true> true_;
 typedef bool_<false> false_;
 //----------------------------------------------------------------------------
 // if_
 
-template < bool Cond , typename TrueType , typename FalseType>
-struct if_c
-{
+template <bool Cond, typename TrueType, typename FalseType>
+struct if_c {
   enum { value = Cond };
 
   typedef FalseType type;
 
+  typedef typename remove_const<typename remove_reference<type>::type>::type
+      value_type;
 
-  typedef typename remove_const<
-          typename remove_reference<type>::type >::type value_type ;
+  typedef typename add_const<value_type>::type const_value_type;
 
-  typedef typename add_const<value_type>::type const_value_type ;
+  static KOKKOS_INLINE_FUNCTION const_value_type& select(const_value_type& v) {
+    return v;
+  }
 
-  static KOKKOS_INLINE_FUNCTION
-  const_value_type & select( const_value_type & v ) { return v ; }
+  static KOKKOS_INLINE_FUNCTION value_type& select(value_type& v) { return v; }
 
-  static KOKKOS_INLINE_FUNCTION
-  value_type & select( value_type & v ) { return v ; }
+  template <class T>
+  static KOKKOS_INLINE_FUNCTION value_type& select(const T&) {
+    value_type* ptr(0);
+    return *ptr;
+  }
 
-  template< class T >
-  static KOKKOS_INLINE_FUNCTION
-  value_type & select( const T & ) { value_type * ptr(0); return *ptr ; }
+  template <class T>
+  static KOKKOS_INLINE_FUNCTION const_value_type& select(const T&,
+                                                         const_value_type& v) {
+    return v;
+  }
 
-
-  template< class T >
-  static KOKKOS_INLINE_FUNCTION
-  const_value_type & select( const T & , const_value_type & v ) { return v ; }
-
-  template< class T >
-  static KOKKOS_INLINE_FUNCTION
-  value_type & select( const T & , value_type & v ) { return v ; }
+  template <class T>
+  static KOKKOS_INLINE_FUNCTION value_type& select(const T&, value_type& v) {
+    return v;
+  }
 };
 
 template <typename TrueType, typename FalseType>
-struct if_c< true , TrueType , FalseType >
-{
+struct if_c<true, TrueType, FalseType> {
   enum { value = true };
 
   typedef TrueType type;
 
+  typedef typename remove_const<typename remove_reference<type>::type>::type
+      value_type;
 
-  typedef typename remove_const<
-          typename remove_reference<type>::type >::type value_type ;
+  typedef typename add_const<value_type>::type const_value_type;
 
-  typedef typename add_const<value_type>::type const_value_type ;
+  static KOKKOS_INLINE_FUNCTION const_value_type& select(const_value_type& v) {
+    return v;
+  }
 
-  static KOKKOS_INLINE_FUNCTION
-  const_value_type & select( const_value_type & v ) { return v ; }
+  static KOKKOS_INLINE_FUNCTION value_type& select(value_type& v) { return v; }
 
-  static KOKKOS_INLINE_FUNCTION
-  value_type & select( value_type & v ) { return v ; }
+  template <class T>
+  static KOKKOS_INLINE_FUNCTION value_type& select(const T&) {
+    value_type* ptr(0);
+    return *ptr;
+  }
 
-  template< class T >
-  static KOKKOS_INLINE_FUNCTION
-  value_type & select( const T & ) { value_type * ptr(0); return *ptr ; }
+  template <class F>
+  static KOKKOS_INLINE_FUNCTION const_value_type& select(const_value_type& v,
+                                                         const F&) {
+    return v;
+  }
 
-
-  template< class F >
-  static KOKKOS_INLINE_FUNCTION
-  const_value_type & select( const_value_type & v , const F & ) { return v ; }
-
-  template< class F >
-  static KOKKOS_INLINE_FUNCTION
-  value_type & select( value_type & v , const F & ) { return v ; }
+  template <class F>
+  static KOKKOS_INLINE_FUNCTION value_type& select(value_type& v, const F&) {
+    return v;
+  }
 };
 
-template< typename TrueType >
-struct if_c< false , TrueType , void >
-{
+template <typename TrueType>
+struct if_c<false, TrueType, void> {
   enum { value = false };
 
-  typedef void type ;
-  typedef void value_type ;
+  typedef void type;
+  typedef void value_type;
 };
 
-template< typename FalseType >
-struct if_c< true , void , FalseType >
-{
+template <typename FalseType>
+struct if_c<true, void, FalseType> {
   enum { value = true };
 
-  typedef void type ;
-  typedef void value_type ;
+  typedef void type;
+  typedef void value_type;
 };
 
 template <typename Cond, typename TrueType, typename FalseType>
@@ -335,53 +388,48 @@ struct if_ : public if_c<Cond::value, TrueType, FalseType> {};
 //----------------------------------------------------------------------------
 
 // Allows aliased types:
-template< typename T >
-struct is_integral : public integral_constant< bool ,
-  (
-    std::is_same< T ,          char >::value ||
-    std::is_same< T , unsigned char >::value ||
-    std::is_same< T ,          short int >::value ||
-    std::is_same< T , unsigned short int >::value ||
-    std::is_same< T ,          int >::value ||
-    std::is_same< T , unsigned int >::value ||
-    std::is_same< T ,          long int >::value ||
-    std::is_same< T , unsigned long int >::value ||
-    std::is_same< T ,          long long int >::value ||
-    std::is_same< T , unsigned long long int >::value ||
+template <typename T>
+struct is_integral
+    : public integral_constant<
+          bool,
+          (std::is_same<T, char>::value ||
+           std::is_same<T, unsigned char>::value ||
+           std::is_same<T, short int>::value ||
+           std::is_same<T, unsigned short int>::value ||
+           std::is_same<T, int>::value ||
+           std::is_same<T, unsigned int>::value ||
+           std::is_same<T, long int>::value ||
+           std::is_same<T, unsigned long int>::value ||
+           std::is_same<T, long long int>::value ||
+           std::is_same<T, unsigned long long int>::value ||
 
-    std::is_same< T , int8_t   >::value ||
-    std::is_same< T , int16_t  >::value ||
-    std::is_same< T , int32_t  >::value ||
-    std::is_same< T , int64_t  >::value ||
-    std::is_same< T , uint8_t  >::value ||
-    std::is_same< T , uint16_t >::value ||
-    std::is_same< T , uint32_t >::value ||
-    std::is_same< T , uint64_t >::value
-  )>
-{};
+           std::is_same<T, int8_t>::value || std::is_same<T, int16_t>::value ||
+           std::is_same<T, int32_t>::value || std::is_same<T, int64_t>::value ||
+           std::is_same<T, uint8_t>::value ||
+           std::is_same<T, uint16_t>::value ||
+           std::is_same<T, uint32_t>::value ||
+           std::is_same<T, uint64_t>::value)> {};
 //----------------------------------------------------------------------------
 
-template<typename T>
+template <typename T>
 struct is_label : public false_type {};
 
-template<>
+template <>
 struct is_label<const char*> : public true_type {};
 
-template<>
+template <>
 struct is_label<char*> : public true_type {};
 
-
-template<int N>
+template <int N>
 struct is_label<const char[N]> : public true_type {};
 
-template<int N>
+template <int N>
 struct is_label<char[N]> : public true_type {};
 
-
-template<>
+template <>
 struct is_label<const std::string> : public true_type {};
 
-template<>
+template <>
 struct is_label<std::string> : public true_type {};
 
 // These 'constexpr'functions can be used as
@@ -389,47 +437,47 @@ struct is_label<std::string> : public true_type {};
 
 /**\brief  There exists integral 'k' such that N = 2^k */
 KOKKOS_INLINE_FUNCTION
-constexpr bool is_integral_power_of_two( const size_t N )
-{ return ( 0 < N ) && ( 0 == ( N & ( N - 1 ) ) ); }
+constexpr bool is_integral_power_of_two(const size_t N) {
+  return (0 < N) && (0 == (N & (N - 1)));
+}
 
 /**\brief  Return integral 'k' such that N = 2^k, assuming valid.  */
 KOKKOS_INLINE_FUNCTION
-constexpr unsigned integral_power_of_two_assume_valid( const size_t N )
-{ return N == 1 ? 0 : 1 + integral_power_of_two_assume_valid( N >> 1 ); }
+constexpr unsigned integral_power_of_two_assume_valid(const size_t N) {
+  return N == 1 ? 0 : 1 + integral_power_of_two_assume_valid(N >> 1);
+}
 
 /**\brief  Return integral 'k' such that N = 2^k, if exists.
  *         If does not exist return ~0u.
  */
 KOKKOS_INLINE_FUNCTION
-constexpr unsigned integral_power_of_two( const size_t N )
-{ return is_integral_power_of_two(N) ? integral_power_of_two_assume_valid(N) : ~0u ; }
+constexpr unsigned integral_power_of_two(const size_t N) {
+  return is_integral_power_of_two(N) ? integral_power_of_two_assume_valid(N)
+                                     : ~0u;
+}
 
 //----------------------------------------------------------------------------
 
-template < size_t N >
-struct is_power_of_two
-{
-  enum type { value = (N > 0) && !(N & (N-1)) };
+template <size_t N>
+struct is_power_of_two {
+  enum type { value = (N > 0) && !(N & (N - 1)) };
 };
 
-template < size_t N , bool OK = is_power_of_two<N>::value >
-struct power_of_two ;
+template <size_t N, bool OK = is_power_of_two<N>::value>
+struct power_of_two;
 
-template < size_t N >
-struct power_of_two<N,true>
-{
-  enum type { value = 1+ power_of_two<(N>>1),true>::value };
+template <size_t N>
+struct power_of_two<N, true> {
+  enum type { value = 1 + power_of_two<(N >> 1), true>::value };
 };
 
 template <>
-struct power_of_two<2,true>
-{
+struct power_of_two<2, true> {
   enum type { value = 1 };
 };
 
 template <>
-struct power_of_two<1,true>
-{
+struct power_of_two<1, true> {
   enum type { value = 0 };
 };
 
@@ -437,49 +485,45 @@ struct power_of_two<1,true>
  *          otherwise return ~0u.
  */
 KOKKOS_FORCEINLINE_FUNCTION
-unsigned power_of_two_if_valid( const unsigned N )
-{
-  unsigned p = ~0u ;
-  if ( is_integral_power_of_two ( N ) ) {
-    p = bit_scan_forward ( N ) ;
+unsigned power_of_two_if_valid(const unsigned N) {
+  unsigned p = ~0u;
+  if (is_integral_power_of_two(N)) {
+    p = bit_scan_forward(N);
   }
-  return p ;
+  return p;
 }
 
 //----------------------------------------------------------------------------
 
-template< typename T , T v , bool NonZero = ( v != T(0) ) >
-struct integral_nonzero_constant
-{
+template <typename T, T v, bool NonZero = (v != T(0))>
+struct integral_nonzero_constant {
   // Declaration of 'static const' causes an unresolved linker symbol in debug
   // static const T value = v ;
   enum { value = T(v) };
-  typedef T value_type ;
-  typedef integral_nonzero_constant<T,v> type ;
-  KOKKOS_INLINE_FUNCTION integral_nonzero_constant( const T & ) {}
+  typedef T value_type;
+  typedef integral_nonzero_constant<T, v> type;
+  KOKKOS_INLINE_FUNCTION integral_nonzero_constant(const T&) {}
 };
 
-template< typename T , T zero >
-struct integral_nonzero_constant<T,zero,false>
-{
-  const T value ;
-  typedef T value_type ;
-  typedef integral_nonzero_constant<T,0> type ;
-  KOKKOS_INLINE_FUNCTION integral_nonzero_constant( const T & v ) : value(v) {}
+template <typename T, T zero>
+struct integral_nonzero_constant<T, zero, false> {
+  const T value;
+  typedef T value_type;
+  typedef integral_nonzero_constant<T, 0> type;
+  KOKKOS_INLINE_FUNCTION integral_nonzero_constant(const T& v) : value(v) {}
 };
 
 //----------------------------------------------------------------------------
 
-template < class C > struct is_integral_constant : public false_
-{
-  typedef void integral_type ;
+template <class C>
+struct is_integral_constant : public false_ {
+  typedef void integral_type;
   enum { integral_value = 0 };
 };
 
-template < typename T , T v >
-struct is_integral_constant< integral_constant<T,v> > : public true_
-{
-  typedef T integral_type ;
+template <typename T, T v>
+struct is_integral_constant<integral_constant<T, v>> : public true_ {
+  typedef T integral_type;
   enum { integral_value = v };
 };
 
@@ -497,7 +541,8 @@ template <class Head, class... Tail>
 struct ReverseTypeList<TypeList<Head, Tail...>> {
   template <class... ReversedTail>
   struct impl {
-    using type = typename ReverseTypeList<TypeList<Tail...>>::template impl<Head, ReversedTail...>::type;
+    using type = typename ReverseTypeList<TypeList<Tail...>>::template impl<
+        Head, ReversedTail...>::type;
   };
   using type = typename impl<>::type;
 };
@@ -514,28 +559,24 @@ struct ReverseTypeList<TypeList<>> {
 //----------------------------------------------------------------------------
 
 template <class T>
-struct make_all_extents_into_pointers
-{
+struct make_all_extents_into_pointers {
   using type = T;
 };
 
 template <class T, unsigned N>
-struct make_all_extents_into_pointers<T[N]>
-{
+struct make_all_extents_into_pointers<T[N]> {
   using type = typename make_all_extents_into_pointers<T>::type*;
 };
 
 template <class T>
-struct make_all_extents_into_pointers<T*>
-{
+struct make_all_extents_into_pointers<T*> {
   using type = typename make_all_extents_into_pointers<T>::type*;
 };
 
-} // namespace Impl
-} // namespace Kokkos
+}  // namespace Impl
+}  // namespace Kokkos
 
 //----------------------------------------------------------------------------
 //----------------------------------------------------------------------------
 
 #endif /* #ifndef KOKKOSTRAITS_HPP */
-
diff --git a/lib/kokkos/core/src/impl/Kokkos_Utilities.hpp b/lib/kokkos/core/src/impl/Kokkos_Utilities.hpp
index 611a32c4fe..1b095248eb 100644
--- a/lib/kokkos/core/src/impl/Kokkos_Utilities.hpp
+++ b/lib/kokkos/core/src/impl/Kokkos_Utilities.hpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -51,100 +52,108 @@
 //----------------------------------------------------------------------------
 //----------------------------------------------------------------------------
 
-namespace Kokkos { namespace Impl {
+namespace Kokkos {
+namespace Impl {
 
 // same as std::forward
 // needed to allow perfect forwarding on the device
 template <typename T>
-KOKKOS_INLINE_FUNCTION
-constexpr
-T&& forward( typename std::remove_reference<T>::type& arg ) noexcept
-{ return static_cast<T&&>(arg); }
+KOKKOS_INLINE_FUNCTION constexpr T&& forward(
+    typename std::remove_reference<T>::type& arg) noexcept {
+  return static_cast<T&&>(arg);
+}
 
 template <typename T>
-KOKKOS_INLINE_FUNCTION
-constexpr
-T&& forward( typename std::remove_reference<T>::type&& arg ) noexcept
-{ return static_cast<T&&>(arg); }
+KOKKOS_INLINE_FUNCTION constexpr T&& forward(
+    typename std::remove_reference<T>::type&& arg) noexcept {
+  return static_cast<T&&>(arg);
+}
 
 // same as std::move
 // needed to allowing moving on the device
 template <typename T>
-KOKKOS_INLINE_FUNCTION
-constexpr
-typename std::remove_reference<T>::type&& move( T&& arg ) noexcept
-{ return static_cast<typename std::remove_reference<T>::type&&>(arg); }
+KOKKOS_INLINE_FUNCTION constexpr typename std::remove_reference<T>::type&& move(
+    T&& arg) noexcept {
+  return static_cast<typename std::remove_reference<T>::type&&>(arg);
+}
 
 // empty function to allow expanding a variadic argument pack
-template<typename... Args>
-KOKKOS_INLINE_FUNCTION
-void expand_variadic(Args &&...) {}
+template <typename... Args>
+KOKKOS_INLINE_FUNCTION void expand_variadic(Args&&...) {}
 
 //----------------------------------------
 // C++14 integer sequence
-template< typename T , T ... Ints >
+template <typename T, T... Ints>
 struct integer_sequence {
-  using value_type = T ;
+  using value_type = T;
   static constexpr std::size_t size() noexcept { return sizeof...(Ints); }
 };
 
-template< typename T , std::size_t N >
-struct make_integer_sequence_helper ;
+template <typename T, std::size_t N>
+struct make_integer_sequence_helper;
 
-template< typename T , T N >
-using make_integer_sequence =
-  typename make_integer_sequence_helper<T,N>::type ;
+template <typename T, T N>
+using make_integer_sequence = typename make_integer_sequence_helper<T, N>::type;
 
-template< typename T >
-struct make_integer_sequence_helper< T , 0 >
-{ using type = integer_sequence<T> ; };
+template <typename T>
+struct make_integer_sequence_helper<T, 0> {
+  using type = integer_sequence<T>;
+};
 
-template< typename T >
-struct make_integer_sequence_helper< T , 1 >
-{ using type = integer_sequence<T,0> ; };
+template <typename T>
+struct make_integer_sequence_helper<T, 1> {
+  using type = integer_sequence<T, 0>;
+};
 
-template< typename T >
-struct make_integer_sequence_helper< T , 2 >
-{ using type = integer_sequence<T,0,1> ; };
+template <typename T>
+struct make_integer_sequence_helper<T, 2> {
+  using type = integer_sequence<T, 0, 1>;
+};
 
-template< typename T >
-struct make_integer_sequence_helper< T , 3 >
-{ using type = integer_sequence<T,0,1,2> ; };
+template <typename T>
+struct make_integer_sequence_helper<T, 3> {
+  using type = integer_sequence<T, 0, 1, 2>;
+};
 
-template< typename T >
-struct make_integer_sequence_helper< T , 4 >
-{ using type = integer_sequence<T,0,1,2,3> ; };
+template <typename T>
+struct make_integer_sequence_helper<T, 4> {
+  using type = integer_sequence<T, 0, 1, 2, 3>;
+};
 
-template< typename T >
-struct make_integer_sequence_helper< T , 5 >
-{ using type = integer_sequence<T,0,1,2,3,4> ; };
+template <typename T>
+struct make_integer_sequence_helper<T, 5> {
+  using type = integer_sequence<T, 0, 1, 2, 3, 4>;
+};
 
-template< typename T >
-struct make_integer_sequence_helper< T , 6 >
-{ using type = integer_sequence<T,0,1,2,3,4,5> ; };
+template <typename T>
+struct make_integer_sequence_helper<T, 6> {
+  using type = integer_sequence<T, 0, 1, 2, 3, 4, 5>;
+};
 
-template< typename T >
-struct make_integer_sequence_helper< T , 7 >
-{ using type = integer_sequence<T,0,1,2,3,4,5,6> ; };
+template <typename T>
+struct make_integer_sequence_helper<T, 7> {
+  using type = integer_sequence<T, 0, 1, 2, 3, 4, 5, 6>;
+};
 
-template< typename T >
-struct make_integer_sequence_helper< T , 8 >
-{ using type = integer_sequence<T,0,1,2,3,4,5,6,7> ; };
+template <typename T>
+struct make_integer_sequence_helper<T, 8> {
+  using type = integer_sequence<T, 0, 1, 2, 3, 4, 5, 6, 7>;
+};
 
-template< typename X , typename Y >
-struct make_integer_sequence_concat ;
+template <typename X, typename Y>
+struct make_integer_sequence_concat;
 
-template< typename T , T ... x , T ... y >
-struct make_integer_sequence_concat< integer_sequence<T,x...>
-                                   , integer_sequence<T,y...> >
-{ using type = integer_sequence< T , x ... , (sizeof...(x)+y)... > ; };
+template <typename T, T... x, T... y>
+struct make_integer_sequence_concat<integer_sequence<T, x...>,
+                                    integer_sequence<T, y...> > {
+  using type = integer_sequence<T, x..., (sizeof...(x) + y)...>;
+};
 
-template< typename T , std::size_t N >
+template <typename T, std::size_t N>
 struct make_integer_sequence_helper {
-  using type = typename make_integer_sequence_concat
-    < typename make_integer_sequence_helper< T , N/2 >::type
-    , typename make_integer_sequence_helper< T , N - N/2 >::type
-    >::type ;
+  using type = typename make_integer_sequence_concat<
+      typename make_integer_sequence_helper<T, N / 2>::type,
+      typename make_integer_sequence_helper<T, N - N / 2>::type>::type;
 };
 
 //----------------------------------------
@@ -152,8 +161,8 @@ struct make_integer_sequence_helper {
 template <std::size_t... Indices>
 using index_sequence = integer_sequence<std::size_t, Indices...>;
 
-template< std::size_t N >
-using make_index_sequence = make_integer_sequence< std::size_t, N>;
+template <std::size_t N>
+using make_index_sequence = make_integer_sequence<std::size_t, N>;
 
 //----------------------------------------
 
@@ -162,258 +171,253 @@ struct integer_sequence_at;
 
 template <unsigned I, typename T, T h0, T... tail>
 struct integer_sequence_at<I, integer_sequence<T, h0, tail...> >
-  : public integer_sequence_at<I-1u, integer_sequence<T,tail...> >
-{
-  static_assert( 8 <= I , "Reasoning Error" );
-  static_assert( I < integer_sequence<T, h0, tail...>::size(), "Error: Index out of bounds");
+    : public integer_sequence_at<I - 1u, integer_sequence<T, tail...> > {
+  static_assert(8 <= I, "Reasoning Error");
+  static_assert(I < integer_sequence<T, h0, tail...>::size(),
+                "Error: Index out of bounds");
 };
 
-template < typename T, T h0, T... tail>
-struct integer_sequence_at<0u, integer_sequence<T,h0, tail...> >
-{
-  using type = T;
+template <typename T, T h0, T... tail>
+struct integer_sequence_at<0u, integer_sequence<T, h0, tail...> > {
+  using type               = T;
   static constexpr T value = h0;
 };
 
-template < typename T, T h0, T h1, T... tail>
-struct integer_sequence_at<1u, integer_sequence<T, h0, h1, tail...> >
-{
-  using type = T;
+template <typename T, T h0, T h1, T... tail>
+struct integer_sequence_at<1u, integer_sequence<T, h0, h1, tail...> > {
+  using type               = T;
   static constexpr T value = h1;
 };
 
-template < typename T, T h0, T h1, T h2, T... tail>
-struct integer_sequence_at<2u, integer_sequence<T, h0, h1, h2, tail...> >
-{
-  using type = T;
+template <typename T, T h0, T h1, T h2, T... tail>
+struct integer_sequence_at<2u, integer_sequence<T, h0, h1, h2, tail...> > {
+  using type               = T;
   static constexpr T value = h2;
 };
 
-template < typename T, T h0, T h1, T h2, T h3, T... tail>
-struct integer_sequence_at<3u, integer_sequence<T, h0, h1, h2, h3, tail...> >
-{
-  using type = T;
+template <typename T, T h0, T h1, T h2, T h3, T... tail>
+struct integer_sequence_at<3u, integer_sequence<T, h0, h1, h2, h3, tail...> > {
+  using type               = T;
   static constexpr T value = h3;
 };
 
-template < typename T, T h0, T h1, T h2, T h3, T h4, T... tail>
-struct integer_sequence_at<4u, integer_sequence<T, h0, h1, h2, h3, h4, tail...> >
-{
-  using type = T;
+template <typename T, T h0, T h1, T h2, T h3, T h4, T... tail>
+struct integer_sequence_at<4u,
+                           integer_sequence<T, h0, h1, h2, h3, h4, tail...> > {
+  using type               = T;
   static constexpr T value = h4;
 };
 
-template < typename T, T h0, T h1, T h2, T h3, T h4, T h5, T... tail>
-struct integer_sequence_at<5u, integer_sequence<T, h0, h1, h2, h3, h4, h5, tail...> >
-{
-  using type = T;
+template <typename T, T h0, T h1, T h2, T h3, T h4, T h5, T... tail>
+struct integer_sequence_at<
+    5u, integer_sequence<T, h0, h1, h2, h3, h4, h5, tail...> > {
+  using type               = T;
   static constexpr T value = h5;
 };
 
-template < typename T, T h0, T h1, T h2, T h3, T h4, T h5, T h6, T... tail>
-struct integer_sequence_at<6u, integer_sequence<T, h0, h1, h2, h3, h4, h5, h6, tail...> >
-{
-  using type = T;
+template <typename T, T h0, T h1, T h2, T h3, T h4, T h5, T h6, T... tail>
+struct integer_sequence_at<
+    6u, integer_sequence<T, h0, h1, h2, h3, h4, h5, h6, tail...> > {
+  using type               = T;
   static constexpr T value = h6;
 };
 
-template < typename T, T h0, T h1, T h2, T h3, T h4, T h5, T h6, T h7, T... tail>
-struct integer_sequence_at<7u, integer_sequence<T, h0, h1, h2, h3, h4, h5, h6, h7, tail...> >
-{
-  using type = T;
+template <typename T, T h0, T h1, T h2, T h3, T h4, T h5, T h6, T h7, T... tail>
+struct integer_sequence_at<
+    7u, integer_sequence<T, h0, h1, h2, h3, h4, h5, h6, h7, tail...> > {
+  using type               = T;
   static constexpr T value = h7;
 };
 
 //----------------------------------------
 
 template <typename T>
-constexpr
-T at( const unsigned, integer_sequence<T> ) noexcept
-{ return ~static_cast<T>(0); }
+constexpr T at(const unsigned, integer_sequence<T>) noexcept {
+  return ~static_cast<T>(0);
+}
 
 template <typename T, T h0, T... tail>
-constexpr
-T at( const unsigned i, integer_sequence<T, h0> ) noexcept
-{ return i==0u ? h0 : ~static_cast<T>(0); }
+constexpr T at(const unsigned i, integer_sequence<T, h0>) noexcept {
+  return i == 0u ? h0 : ~static_cast<T>(0);
+}
 
 template <typename T, T h0, T h1>
-constexpr
-T at( const unsigned i, integer_sequence<T, h0, h1> ) noexcept
-{ return i==0u ? h0 :
-         i==1u ? h1 : ~static_cast<T>(0);
+constexpr T at(const unsigned i, integer_sequence<T, h0, h1>) noexcept {
+  return i == 0u ? h0 : i == 1u ? h1 : ~static_cast<T>(0);
 }
 
 template <typename T, T h0, T h1, T h2>
-constexpr
-T at( const unsigned i, integer_sequence<T, h0, h1, h2> ) noexcept
-{ return i==0u ? h0 :
-         i==1u ? h1 :
-         i==2u ? h2 : ~static_cast<T>(0);
+constexpr T at(const unsigned i, integer_sequence<T, h0, h1, h2>) noexcept {
+  return i == 0u ? h0 : i == 1u ? h1 : i == 2u ? h2 : ~static_cast<T>(0);
 }
 
 template <typename T, T h0, T h1, T h2, T h3>
-constexpr
-T at( const unsigned i, integer_sequence<T, h0, h1, h2, h3> ) noexcept
-{ return i==0u ? h0 :
-         i==1u ? h1 :
-         i==2u ? h2 :
-         i==3u ? h3 : ~static_cast<T>(0);
+constexpr T at(const unsigned i, integer_sequence<T, h0, h1, h2, h3>) noexcept {
+  return i == 0u
+             ? h0
+             : i == 1u ? h1 : i == 2u ? h2 : i == 3u ? h3 : ~static_cast<T>(0);
 }
 
 template <typename T, T h0, T h1, T h2, T h3, T h4>
-constexpr
-T at( const unsigned i, integer_sequence<T, h0, h1, h2, h3, h4> ) noexcept
-{ return i==0u ? h0 :
-         i==1u ? h1 :
-         i==2u ? h2 :
-         i==3u ? h3 :
-         i==4u ? h4 : ~static_cast<T>(0);
+constexpr T at(const unsigned i,
+               integer_sequence<T, h0, h1, h2, h3, h4>) noexcept {
+  return i == 0u
+             ? h0
+             : i == 1u
+                   ? h1
+                   : i == 2u ? h2
+                             : i == 3u ? h3 : i == 4u ? h4 : ~static_cast<T>(0);
 }
 
 template <typename T, T h0, T h1, T h2, T h3, T h4, T h5>
-constexpr
-T at( const unsigned i, integer_sequence<T, h0, h1, h2, h3, h4, h5> ) noexcept
-{ return i==0u ? h0 :
-         i==1u ? h1 :
-         i==2u ? h2 :
-         i==3u ? h3 :
-         i==4u ? h4 :
-         i==5u ? h5 : ~static_cast<T>(0);
+constexpr T at(const unsigned i,
+               integer_sequence<T, h0, h1, h2, h3, h4, h5>) noexcept {
+  return i == 0u
+             ? h0
+             : i == 1u
+                   ? h1
+                   : i == 2u ? h2
+                             : i == 3u ? h3
+                                       : i == 4u ? h4
+                                                 : i == 5u ? h5
+                                                           : ~static_cast<T>(0);
 }
 
 template <typename T, T h0, T h1, T h2, T h3, T h4, T h5, T h6>
-constexpr
-T at( const unsigned i, integer_sequence<T, h0, h1, h2, h3, h4, h5, h6> ) noexcept
-{ return i==0u ? h0 :
-         i==1u ? h1 :
-         i==2u ? h2 :
-         i==3u ? h3 :
-         i==4u ? h4 :
-         i==5u ? h5 :
-         i==6u ? h6 : ~static_cast<T>(0);
+constexpr T at(const unsigned i,
+               integer_sequence<T, h0, h1, h2, h3, h4, h5, h6>) noexcept {
+  return i == 0u
+             ? h0
+             : i == 1u
+                   ? h1
+                   : i == 2u
+                         ? h2
+                         : i == 3u
+                               ? h3
+                               : i == 4u
+                                     ? h4
+                                     : i == 5u
+                                           ? h5
+                                           : i == 6u ? h6 : ~static_cast<T>(0);
 }
 
 template <typename T, T h0, T h1, T h2, T h3, T h4, T h5, T h6, T h7, T... tail>
-constexpr
-T at( const unsigned i, integer_sequence<T, h0, h1, h2, h3, h4, h5, h6, h7, tail...> ) noexcept
-{ return i==0u ? h0 :
-         i==1u ? h1 :
-         i==2u ? h2 :
-         i==3u ? h3 :
-         i==4u ? h4 :
-         i==5u ? h5 :
-         i==6u ? h6 :
-         i==7u ? h7 : at(i-8u, integer_sequence<T, tail...>{} );
+constexpr T at(
+    const unsigned i,
+    integer_sequence<T, h0, h1, h2, h3, h4, h5, h6, h7, tail...>) noexcept {
+  return i == 0u
+             ? h0
+             : i == 1u
+                   ? h1
+                   : i == 2u
+                         ? h2
+                         : i == 3u
+                               ? h3
+                               : i == 4u
+                                     ? h4
+                                     : i == 5u
+                                           ? h5
+                                           : i == 6u
+                                                 ? h6
+                                                 : i == 7u
+                                                       ? h7
+                                                       : at(i - 8u,
+                                                            integer_sequence<
+                                                                T, tail...>{});
 }
 
 //----------------------------------------
 
-
-template < typename IntegerSequence
-         , typename ResultSequence = integer_sequence<typename IntegerSequence::value_type>
-         >
+template <typename IntegerSequence,
+          typename ResultSequence =
+              integer_sequence<typename IntegerSequence::value_type> >
 struct reverse_integer_sequence_helper;
 
 template <typename T, T h0, T... tail, T... results>
-struct reverse_integer_sequence_helper< integer_sequence<T, h0, tail...>, integer_sequence<T, results...> >
-  : public reverse_integer_sequence_helper< integer_sequence<T, tail...>, integer_sequence<T, h0, results...> >
-{};
+struct reverse_integer_sequence_helper<integer_sequence<T, h0, tail...>,
+                                       integer_sequence<T, results...> >
+    : public reverse_integer_sequence_helper<
+          integer_sequence<T, tail...>, integer_sequence<T, h0, results...> > {
+};
 
 template <typename T, T... results>
-struct reverse_integer_sequence_helper< integer_sequence<T>, integer_sequence<T, results...> >
-{
+struct reverse_integer_sequence_helper<integer_sequence<T>,
+                                       integer_sequence<T, results...> > {
   using type = integer_sequence<T, results...>;
 };
 
-
 template <typename IntegerSequence>
-using reverse_integer_sequence = typename reverse_integer_sequence_helper<IntegerSequence>::type;
+using reverse_integer_sequence =
+    typename reverse_integer_sequence_helper<IntegerSequence>::type;
 
 //----------------------------------------
 
-template < typename IntegerSequence
-         , typename Result
-         , typename ResultSequence = integer_sequence<typename IntegerSequence::value_type>
-         >
+template <typename IntegerSequence, typename Result,
+          typename ResultSequence =
+              integer_sequence<typename IntegerSequence::value_type> >
 struct exclusive_scan_integer_sequence_helper;
 
 template <typename T, T h0, T... tail, typename Result, T... results>
-struct exclusive_scan_integer_sequence_helper
-  < integer_sequence<T, h0, tail...>
-  , Result
-  , integer_sequence<T, results...> >
-  : public exclusive_scan_integer_sequence_helper
-     < integer_sequence<T, tail...>
-     , std::integral_constant<T,Result::value+h0>
-     , integer_sequence<T, 0, (results+h0)...> >
-{};
+struct exclusive_scan_integer_sequence_helper<
+    integer_sequence<T, h0, tail...>, Result, integer_sequence<T, results...> >
+    : public exclusive_scan_integer_sequence_helper<
+          integer_sequence<T, tail...>,
+          std::integral_constant<T, Result::value + h0>,
+          integer_sequence<T, 0, (results + h0)...> > {};
 
 template <typename T, typename Result, T... results>
-struct exclusive_scan_integer_sequence_helper
-  < integer_sequence<T>, Result, integer_sequence<T, results...> >
-{
-  using type = integer_sequence<T, results...>;
-  static constexpr T value = Result::value ;
+struct exclusive_scan_integer_sequence_helper<
+    integer_sequence<T>, Result, integer_sequence<T, results...> > {
+  using type               = integer_sequence<T, results...>;
+  static constexpr T value = Result::value;
 };
 
 template <typename IntegerSequence>
-struct exclusive_scan_integer_sequence
-{
+struct exclusive_scan_integer_sequence {
   using value_type = typename IntegerSequence::value_type;
-  using helper =
-    exclusive_scan_integer_sequence_helper
-       < reverse_integer_sequence<IntegerSequence>
-       , std::integral_constant< value_type , 0 >
-       > ;
-  using type = typename helper::type ;
-  static constexpr value_type value  = helper::value ;
+  using helper     = exclusive_scan_integer_sequence_helper<
+      reverse_integer_sequence<IntegerSequence>,
+      std::integral_constant<value_type, 0> >;
+  using type                        = typename helper::type;
+  static constexpr value_type value = helper::value;
 };
 
 //----------------------------------------
 
-template < typename IntegerSequence
-         , typename Result
-         , typename ResultSequence = integer_sequence<typename IntegerSequence::value_type>
-         >
+template <typename IntegerSequence, typename Result,
+          typename ResultSequence =
+              integer_sequence<typename IntegerSequence::value_type> >
 struct inclusive_scan_integer_sequence_helper;
 
 template <typename T, T h0, T... tail, typename Result, T... results>
-struct inclusive_scan_integer_sequence_helper
-  < integer_sequence<T, h0, tail...>
-  , Result
-  , integer_sequence<T, results...> >
-  : public inclusive_scan_integer_sequence_helper
-     < integer_sequence<T, tail...>
-     , std::integral_constant<T,Result::value+h0>
-     , integer_sequence<T, h0, (results+h0)...> >
-{};
+struct inclusive_scan_integer_sequence_helper<
+    integer_sequence<T, h0, tail...>, Result, integer_sequence<T, results...> >
+    : public inclusive_scan_integer_sequence_helper<
+          integer_sequence<T, tail...>,
+          std::integral_constant<T, Result::value + h0>,
+          integer_sequence<T, h0, (results + h0)...> > {};
 
 template <typename T, typename Result, T... results>
-struct inclusive_scan_integer_sequence_helper
-  < integer_sequence<T>, Result, integer_sequence<T, results...> >
-{
-  using type = integer_sequence<T, results...>;
-  static constexpr T value = Result::value ;
+struct inclusive_scan_integer_sequence_helper<
+    integer_sequence<T>, Result, integer_sequence<T, results...> > {
+  using type               = integer_sequence<T, results...>;
+  static constexpr T value = Result::value;
 };
 
 template <typename IntegerSequence>
-struct inclusive_scan_integer_sequence
-{
+struct inclusive_scan_integer_sequence {
   using value_type = typename IntegerSequence::value_type;
-  using helper =
-    inclusive_scan_integer_sequence_helper
-       < reverse_integer_sequence<IntegerSequence>
-       , std::integral_constant< value_type , 0 >
-       > ;
-  using type = typename helper::type ;
-  static constexpr value_type value  = helper::value ;
+  using helper     = inclusive_scan_integer_sequence_helper<
+      reverse_integer_sequence<IntegerSequence>,
+      std::integral_constant<value_type, 0> >;
+  using type                        = typename helper::type;
+  static constexpr value_type value = helper::value;
 };
 
 template <typename T>
 using identity_t = T;
 
-}} // namespace Kokkos::Impl
-
-
-#endif //KOKKOS_CORE_IMPL_UTILITIES_HPP
+}  // namespace Impl
+}  // namespace Kokkos
 
+#endif  // KOKKOS_CORE_IMPL_UTILITIES_HPP
diff --git a/lib/kokkos/core/src/impl/Kokkos_VLAEmulation.hpp b/lib/kokkos/core/src/impl/Kokkos_VLAEmulation.hpp
index 48e1851e60..2746932878 100644
--- a/lib/kokkos/core/src/impl/Kokkos_VLAEmulation.hpp
+++ b/lib/kokkos/core/src/impl/Kokkos_VLAEmulation.hpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -45,14 +46,13 @@
 #define KOKKOS_IMPL_VLAEMULATION_HPP
 
 #include <Kokkos_Macros.hpp>
-#if defined( KOKKOS_ENABLE_TASKDAG )
-
+#if defined(KOKKOS_ENABLE_TASKDAG)
 
 #include <Kokkos_Core_fwd.hpp>
 
-#include <impl/Kokkos_Error.hpp> // KOKKOS_EXPECTS
+#include <impl/Kokkos_Error.hpp>  // KOKKOS_EXPECTS
 
-#include <type_traits> // std::is_abstract<>, ...
+#include <type_traits>  // std::is_abstract<>, ...
 
 //----------------------------------------------------------------------------
 //----------------------------------------------------------------------------
@@ -60,89 +60,86 @@
 namespace Kokkos {
 namespace Impl {
 
-template <
-  class Derived,
-  class VLAValueType,
-  class EntryCountType = int32_t
->
+template <class Derived, class VLAValueType, class EntryCountType = int32_t>
 struct ObjectWithVLAEmulation;
 
 //----------------------------------------------------------------------------
 //----------------------------------------------------------------------------
 
-/** @brief Attorney to enable private CRTP inheritance from ObjectWithVLAEmulation
+/** @brief Attorney to enable private CRTP inheritance from
+ * ObjectWithVLAEmulation
  */
 struct VLAEmulationAccess {
-private:
-
+ private:
   template <class, class, class>
   friend struct ObjectWithVLAEmulation;
 
   template <class Derived, class VLAValueType, class EntryCountType>
-  KOKKOS_FORCEINLINE_FUNCTION
-  static constexpr Derived*
-  _cast_to_derived(ObjectWithVLAEmulation<Derived, VLAValueType, EntryCountType>* base) noexcept
-  {
+  KOKKOS_FORCEINLINE_FUNCTION static constexpr Derived* _cast_to_derived(
+      ObjectWithVLAEmulation<Derived, VLAValueType, EntryCountType>*
+          base) noexcept {
     return static_cast<Derived*>(base);
   }
 
   template <class Derived, class VLAValueType, class EntryCountType>
-  KOKKOS_FORCEINLINE_FUNCTION
-  static constexpr Derived const*
-  _cast_to_derived(ObjectWithVLAEmulation<Derived, VLAValueType, EntryCountType> const* base) noexcept
-  {
+  KOKKOS_FORCEINLINE_FUNCTION static constexpr Derived const* _cast_to_derived(
+      ObjectWithVLAEmulation<Derived, VLAValueType, EntryCountType> const*
+          base) noexcept {
     return static_cast<Derived const*>(base);
   }
-
 };
 
 //----------------------------------------------------------------------------
 //----------------------------------------------------------------------------
 
-/** \brief A CRTP base class for a type that includes a variable-length array by allocation
+/** \brief A CRTP base class for a type that includes a variable-length array by
+ * allocation
  *
  *  The storage for the derived type must be allocated manually and the objects
  *  (both derived type and VLA objects) must be constructed with placement new.
  *  Obviously, this can't be done for objects on the stack.
  *
- *  Note: Though most uses of this currently delete the copy and move constructor
- *  in the `Derived` type, this type is intended to have value semantics.
+ *  Note: Though most uses of this currently delete the copy and move
+ * constructor in the `Derived` type, this type is intended to have value
+ * semantics.
  *
- *  \todo @documentation elaborate on implications of value semantics for this class template
+ *  \todo @documentation elaborate on implications of value semantics for this
+ * class template
  *
  */
-template <
-  class Derived,
-  class VLAValueType,
-  class EntryCountType /* = int32_t */
->
+template <class Derived, class VLAValueType,
+          class EntryCountType /* = int32_t */
+          >
 struct ObjectWithVLAEmulation {
-public:
-
-  using object_type = Derived;
-  using vla_value_type = VLAValueType;
+ public:
+  using object_type          = Derived;
+  using vla_value_type       = VLAValueType;
   using vla_entry_count_type = EntryCountType;
 
-  using iterator = VLAValueType*;
+  using iterator       = VLAValueType*;
   using const_iterator = typename std::add_const<VLAValueType>::type*;
 
+  // TODO @tasking @minor DSH require that Derived be marked final? (note that
+  // std::is_final is C++14)
+  // TODO @tasking @minor DSH delete non-placement operator new for Derived
+  // type?
 
-  // TODO @tasking @minor DSH require that Derived be marked final? (note that std::is_final is C++14)
-  // TODO @tasking @minor DSH delete non-placement operator new for Derived type?
-
-private:
-
+ private:
   vla_entry_count_type m_num_entries;
 
   // CRTP boilerplate
 
   KOKKOS_FORCEINLINE_FUNCTION
   /* KOKKOS_CONSTEXPR_14 */
-  Derived* _this() noexcept { return VLAEmulationAccess::_cast_to_derived(this); }
+  Derived* _this() noexcept {
+    return VLAEmulationAccess::_cast_to_derived(this);
+  }
 
   KOKKOS_FORCEINLINE_FUNCTION
   /* KOKKOS_CONSTEXPR_14 */
-  Derived const* _this() const noexcept { return VLAEmulationAccess::_cast_to_derived(this); }
+  Derived const* _this() const noexcept {
+    return VLAEmulationAccess::_cast_to_derived(this);
+  }
 
   // Note: can't be constexpr because of reinterpret_cast
   KOKKOS_FORCEINLINE_FUNCTION
@@ -160,11 +157,10 @@ private:
     return reinterpret_cast<vla_value_type const*>(_this() + 1);
   }
 
-public:
-
+ public:
   KOKKOS_INLINE_FUNCTION
-  static /* KOKKOS_CONSTEXPR_14 */ size_t
-  required_allocation_size(vla_entry_count_type num_vla_entries) {
+  static /* KOKKOS_CONSTEXPR_14 */ size_t required_allocation_size(
+      vla_entry_count_type num_vla_entries) {
     KOKKOS_EXPECTS(num_vla_entries >= 0);
     return sizeof(Derived) + num_vla_entries * sizeof(VLAValueType);
   }
@@ -172,53 +168,52 @@ public:
   //----------------------------------------------------------------------------
   // <editor-fold desc="Constructors, destructor, and assignment"> {{{2
 
-  // TODO @tasking @optimization DSH specialization for trivially constructible VLAValueType?
-  // TODO @tasking @minor DSH SFINAE-out this constructor for non-default contructible vla_value_types
+  // TODO @tasking @optimization DSH specialization for trivially constructible
+  // VLAValueType?
+  // TODO @tasking @minor DSH SFINAE-out this constructor for non-default
+  // contructible vla_value_types
   KOKKOS_INLINE_FUNCTION
-  explicit
-  ObjectWithVLAEmulation(vla_entry_count_type num_entries)
-    noexcept(noexcept(vla_value_type()))
-    : m_num_entries(num_entries)
-  {
+  explicit ObjectWithVLAEmulation(vla_entry_count_type num_entries) noexcept(
+      noexcept(vla_value_type()))
+      : m_num_entries(num_entries) {
     // Note: We can't do this at class scope because it unnecessarily requires
     // object_type to be a complete type
-    static_assert(
-      alignof(object_type) >= alignof(vla_value_type),
-      "Can't append emulated variable length array of type with greater alignment than"
-      "  the type to which the VLA is being appended"
-    );
+    static_assert(alignof(object_type) >= alignof(vla_value_type),
+                  "Can't append emulated variable length array of type with "
+                  "greater alignment than"
+                  "  the type to which the VLA is being appended");
 
     // Note: We can't do this at class scope because it unnecessarily requires
     // vla_value_type to be a complete type
-    static_assert(
-      not std::is_abstract<vla_value_type>::value,
-      "Can't use abstract type with VLA emulation"
-    );
+    static_assert(not std::is_abstract<vla_value_type>::value,
+                  "Can't use abstract type with VLA emulation");
 
     KOKKOS_EXPECTS(num_entries >= 0);
-    for(vla_entry_count_type i = 0; i < m_num_entries; ++i) {
+    for (vla_entry_count_type i = 0; i < m_num_entries; ++i) {
       new (_vla_pointer() + i) vla_value_type();
     }
   }
 
   KOKKOS_INLINE_FUNCTION
-  ~ObjectWithVLAEmulation()
-    noexcept(noexcept(std::declval<vla_value_type>().~vla_value_type()))
-  {
-    for(auto&& value : *this) { value.~vla_value_type(); }
+  ~ObjectWithVLAEmulation() noexcept(
+      noexcept(std::declval<vla_value_type>().~vla_value_type())) {
+    for (auto&& value : *this) {
+      value.~vla_value_type();
+    }
   }
 
-  // TODO @tasking @new_feature DSH constrained analogs for move and copy ctors and assignment ops
+  // TODO @tasking @new_feature DSH constrained analogs for move and copy ctors
+  // and assignment ops
   // TODO @tasking @new_feature DSH forwarding in_place constructor
   // TODO @tasking @new_feature DSH initializer_list constructor?
 
   // </editor-fold> end Constructors, destructor, and assignment }}}2
   //----------------------------------------------------------------------------
 
-
   KOKKOS_INLINE_FUNCTION
-  constexpr EntryCountType n_vla_entries() const noexcept { return m_num_entries; }
-
+  constexpr EntryCountType n_vla_entries() const noexcept {
+    return m_num_entries;
+  }
 
   //----------------------------------------------------------------------------
   // <editor-fold desc="Accessing the object and the VLA values"> {{{2
@@ -227,29 +222,27 @@ public:
   object_type& object() & { return static_cast<Derived&>(*this); }
 
   KOKKOS_INLINE_FUNCTION
-  object_type const& object() const & { return static_cast<Derived const&>(*this); }
+  object_type const& object() const& {
+    return static_cast<Derived const&>(*this);
+  }
 
   KOKKOS_INLINE_FUNCTION
   object_type&& object() && { return static_cast<Derived&&>(*this); }
 
-
   KOKKOS_INLINE_FUNCTION
-  vla_value_type& vla_value_at(vla_entry_count_type n) &
-  {
+  vla_value_type& vla_value_at(vla_entry_count_type n) & {
     KOKKOS_EXPECTS(n < n_vla_entries());
     return _vla_pointer()[n];
   }
 
   KOKKOS_INLINE_FUNCTION
-  vla_value_type const& vla_value_at(vla_entry_count_type n) const &
-  {
+  vla_value_type const& vla_value_at(vla_entry_count_type n) const& {
     KOKKOS_EXPECTS(n < n_vla_entries());
     return _vla_pointer()[n];
   }
 
   KOKKOS_INLINE_FUNCTION
-  vla_value_type& vla_value_at(vla_entry_count_type n) &&
-  {
+  vla_value_type& vla_value_at(vla_entry_count_type n) && {
     KOKKOS_EXPECTS(n < n_vla_entries());
     return _vla_pointer()[n];
   }
@@ -257,7 +250,6 @@ public:
   // </editor-fold> end Accessing the object and the VLA values }}}2
   //----------------------------------------------------------------------------
 
-
   //----------------------------------------------------------------------------
   // <editor-fold desc="Iterators"> {{{2
 
@@ -281,7 +273,6 @@ public:
 
   // </editor-fold> end Iterators }}}2
   //----------------------------------------------------------------------------
-
 };
 
 } /* namespace Impl */
@@ -292,4 +283,3 @@ public:
 
 #endif /* #if defined( KOKKOS_ENABLE_TASKDAG ) */
 #endif /* #ifndef KOKKOS_IMPL_VLAEMULATION_HPP */
-
diff --git a/lib/kokkos/core/src/impl/Kokkos_ViewArray.hpp b/lib/kokkos/core/src/impl/Kokkos_ViewArray.hpp
index 07774da279..6123a608a7 100644
--- a/lib/kokkos/core/src/impl/Kokkos_ViewArray.hpp
+++ b/lib/kokkos/core/src/impl/Kokkos_ViewArray.hpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -49,51 +50,56 @@
 namespace Kokkos {
 namespace Impl {
 
-template< class DataType , class ArrayLayout , class V , size_t N , class P >
-struct ViewDataAnalysis< DataType , ArrayLayout , Kokkos::Array<V,N,P> >
-{
-private:
+template <class DataType, class ArrayLayout, class V, size_t N, class P>
+struct ViewDataAnalysis<DataType, ArrayLayout, Kokkos::Array<V, N, P> > {
+ private:
+  typedef ViewArrayAnalysis<DataType> array_analysis;
 
-  typedef ViewArrayAnalysis<DataType> array_analysis ;
+  static_assert(std::is_same<P, void>::value, "");
+  static_assert(std::is_same<typename array_analysis::non_const_value_type,
+                             Kokkos::Array<V, N, P> >::value,
+                "");
+  static_assert(std::is_scalar<V>::value,
+                "View of Array type must be of a scalar type");
 
-  static_assert( std::is_same<P,void>::value , "" );
-  static_assert( std::is_same<typename array_analysis::non_const_value_type , Kokkos::Array<V,N,P> >::value , "" );
-  static_assert( std::is_scalar<V>::value , "View of Array type must be of a scalar type" );
+ public:
+  typedef Kokkos::Array<> specialize;
 
-public:
+  typedef typename array_analysis::dimension dimension;
 
-  typedef Kokkos::Array<>  specialize ;
+ private:
+  enum {
+    is_const = std::is_same<typename array_analysis::value_type,
+                            typename array_analysis::const_value_type>::value
+  };
 
-  typedef typename array_analysis::dimension  dimension ;
+  typedef typename dimension::template append<N>::type array_scalar_dimension;
 
-private:
+  typedef typename std::conditional<is_const, const V, V>::type scalar_type;
+  typedef V non_const_scalar_type;
+  typedef const V const_scalar_type;
 
-  enum { is_const = std::is_same< typename array_analysis::value_type
-                                , typename array_analysis::const_value_type
-                                >::value };
+ public:
+  typedef typename array_analysis::value_type value_type;
+  typedef typename array_analysis::const_value_type const_value_type;
+  typedef typename array_analysis::non_const_value_type non_const_value_type;
 
-  typedef typename dimension::template append<N>::type array_scalar_dimension ;
+  typedef typename ViewDataType<value_type, dimension>::type type;
+  typedef typename ViewDataType<const_value_type, dimension>::type const_type;
+  typedef typename ViewDataType<non_const_value_type, dimension>::type
+      non_const_type;
 
-  typedef typename std::conditional< is_const , const V , V >::type  scalar_type ;
-  typedef V       non_const_scalar_type ;
-  typedef const V const_scalar_type ;
-
-public:
-
-  typedef typename array_analysis::value_type            value_type ;
-  typedef typename array_analysis::const_value_type      const_value_type ;
-  typedef typename array_analysis::non_const_value_type  non_const_value_type ;
-
-  typedef typename ViewDataType<           value_type , dimension >::type  type ;
-  typedef typename ViewDataType<     const_value_type , dimension >::type  const_type ;
-  typedef typename ViewDataType< non_const_value_type , dimension >::type  non_const_type ;
-
-  typedef typename ViewDataType<           scalar_type , array_scalar_dimension >::type  scalar_array_type ;
-  typedef typename ViewDataType<     const_scalar_type , array_scalar_dimension >::type  const_scalar_array_type ;
-  typedef typename ViewDataType< non_const_scalar_type , array_scalar_dimension >::type  non_const_scalar_array_type ;
+  typedef typename ViewDataType<scalar_type, array_scalar_dimension>::type
+      scalar_array_type;
+  typedef typename ViewDataType<const_scalar_type, array_scalar_dimension>::type
+      const_scalar_array_type;
+  typedef
+      typename ViewDataType<non_const_scalar_type, array_scalar_dimension>::type
+          non_const_scalar_array_type;
 };
 
-}} // namespace Kokkos::Impl
+}  // namespace Impl
+}  // namespace Kokkos
 
 //----------------------------------------------------------------------------
 //----------------------------------------------------------------------------
@@ -102,442 +108,552 @@ namespace Kokkos {
 namespace Impl {
 
 /** \brief  View mapping for non-specialized data type and standard layout */
-template< class Traits >
-class ViewMapping< Traits , Kokkos::Array<> >
-{
-private:
+template <class Traits>
+class ViewMapping<Traits, Kokkos::Array<> > {
+ private:
+  template <class, class...>
+  friend class ViewMapping;
+  template <class, class...>
+  friend class Kokkos::View;
 
-  template< class , class ... > friend class ViewMapping ;
-  template< class , class ... > friend class Kokkos::View ;
+  typedef ViewOffset<typename Traits::dimension, typename Traits::array_layout,
+                     void>
+      offset_type;
 
-  typedef ViewOffset< typename Traits::dimension
-                    , typename Traits::array_layout
-                    , void
-                    >  offset_type ;
+  typedef typename Traits::value_type::pointer handle_type;
 
-  typedef typename Traits::value_type::pointer handle_type ;
+  handle_type m_impl_handle;
+  offset_type m_impl_offset;
+  size_t m_stride;
 
-  handle_type  m_impl_handle ;
-  offset_type  m_impl_offset ;
-  size_t       m_stride ;
+  typedef typename Traits::value_type::value_type scalar_type;
 
-  typedef typename Traits::value_type::value_type scalar_type ;
+  typedef Kokkos::Array<scalar_type, KOKKOS_INVALID_INDEX,
+                        Kokkos::Array<>::contiguous>
+      contiguous_reference;
+  typedef Kokkos::Array<scalar_type, KOKKOS_INVALID_INDEX,
+                        Kokkos::Array<>::strided>
+      strided_reference;
 
-  typedef Kokkos::Array< scalar_type ,KOKKOS_INVALID_INDEX , Kokkos::Array<>::contiguous >  contiguous_reference ;
-  typedef Kokkos::Array< scalar_type ,KOKKOS_INVALID_INDEX , Kokkos::Array<>::strided >     strided_reference ;
-
-  enum { is_contiguous_reference =
-    ( Traits::rank == 0 ) || ( std::is_same< typename Traits::array_layout , Kokkos::LayoutRight >::value ) };
+  enum {
+    is_contiguous_reference =
+        (Traits::rank == 0) || (std::is_same<typename Traits::array_layout,
+                                             Kokkos::LayoutRight>::value)
+  };
 
   enum { Array_N = Traits::value_type::size() };
   enum { Array_S = is_contiguous_reference ? Array_N : 1 };
 
   KOKKOS_INLINE_FUNCTION
-  ViewMapping( const handle_type & arg_handle , const offset_type & arg_offset )
-    : m_impl_handle( arg_handle )
-    , m_impl_offset( arg_offset )
-    , m_stride( is_contiguous_reference ? 0 : arg_offset.span() )
-    {}
-
-public:
+  ViewMapping(const handle_type &arg_handle, const offset_type &arg_offset)
+      : m_impl_handle(arg_handle),
+        m_impl_offset(arg_offset),
+        m_stride(is_contiguous_reference ? 0 : arg_offset.span()) {}
 
+ public:
   //----------------------------------------
   // Domain dimensions
 
   enum { Rank = Traits::dimension::rank };
 
-  template< typename iType >
-  KOKKOS_INLINE_FUNCTION constexpr size_t extent( const iType & r ) const
-    { return m_impl_offset.m_dim.extent(r); }
+  template <typename iType>
+  KOKKOS_INLINE_FUNCTION constexpr size_t extent(const iType &r) const {
+    return m_impl_offset.m_dim.extent(r);
+  }
 
-  KOKKOS_INLINE_FUNCTION constexpr
-  typename Traits::array_layout layout() const
-    { return m_impl_offset.layout(); }
+  KOKKOS_INLINE_FUNCTION constexpr typename Traits::array_layout layout()
+      const {
+    return m_impl_offset.layout();
+  }
 
-
-  KOKKOS_INLINE_FUNCTION constexpr size_t dimension_0() const { return m_impl_offset.dimension_0(); }
-  KOKKOS_INLINE_FUNCTION constexpr size_t dimension_1() const { return m_impl_offset.dimension_1(); }
-  KOKKOS_INLINE_FUNCTION constexpr size_t dimension_2() const { return m_impl_offset.dimension_2(); }
-  KOKKOS_INLINE_FUNCTION constexpr size_t dimension_3() const { return m_impl_offset.dimension_3(); }
-  KOKKOS_INLINE_FUNCTION constexpr size_t dimension_4() const { return m_impl_offset.dimension_4(); }
-  KOKKOS_INLINE_FUNCTION constexpr size_t dimension_5() const { return m_impl_offset.dimension_5(); }
-  KOKKOS_INLINE_FUNCTION constexpr size_t dimension_6() const { return m_impl_offset.dimension_6(); }
-  KOKKOS_INLINE_FUNCTION constexpr size_t dimension_7() const { return m_impl_offset.dimension_7(); }
+  KOKKOS_INLINE_FUNCTION constexpr size_t dimension_0() const {
+    return m_impl_offset.dimension_0();
+  }
+  KOKKOS_INLINE_FUNCTION constexpr size_t dimension_1() const {
+    return m_impl_offset.dimension_1();
+  }
+  KOKKOS_INLINE_FUNCTION constexpr size_t dimension_2() const {
+    return m_impl_offset.dimension_2();
+  }
+  KOKKOS_INLINE_FUNCTION constexpr size_t dimension_3() const {
+    return m_impl_offset.dimension_3();
+  }
+  KOKKOS_INLINE_FUNCTION constexpr size_t dimension_4() const {
+    return m_impl_offset.dimension_4();
+  }
+  KOKKOS_INLINE_FUNCTION constexpr size_t dimension_5() const {
+    return m_impl_offset.dimension_5();
+  }
+  KOKKOS_INLINE_FUNCTION constexpr size_t dimension_6() const {
+    return m_impl_offset.dimension_6();
+  }
+  KOKKOS_INLINE_FUNCTION constexpr size_t dimension_7() const {
+    return m_impl_offset.dimension_7();
+  }
 
   // Is a regular layout with uniform striding for each index.
-  using is_regular = typename offset_type::is_regular ;
+  using is_regular = typename offset_type::is_regular;
 
-  KOKKOS_INLINE_FUNCTION constexpr size_t stride_0() const { return m_impl_offset.stride_0(); }
-  KOKKOS_INLINE_FUNCTION constexpr size_t stride_1() const { return m_impl_offset.stride_1(); }
-  KOKKOS_INLINE_FUNCTION constexpr size_t stride_2() const { return m_impl_offset.stride_2(); }
-  KOKKOS_INLINE_FUNCTION constexpr size_t stride_3() const { return m_impl_offset.stride_3(); }
-  KOKKOS_INLINE_FUNCTION constexpr size_t stride_4() const { return m_impl_offset.stride_4(); }
-  KOKKOS_INLINE_FUNCTION constexpr size_t stride_5() const { return m_impl_offset.stride_5(); }
-  KOKKOS_INLINE_FUNCTION constexpr size_t stride_6() const { return m_impl_offset.stride_6(); }
-  KOKKOS_INLINE_FUNCTION constexpr size_t stride_7() const { return m_impl_offset.stride_7(); }
+  KOKKOS_INLINE_FUNCTION constexpr size_t stride_0() const {
+    return m_impl_offset.stride_0();
+  }
+  KOKKOS_INLINE_FUNCTION constexpr size_t stride_1() const {
+    return m_impl_offset.stride_1();
+  }
+  KOKKOS_INLINE_FUNCTION constexpr size_t stride_2() const {
+    return m_impl_offset.stride_2();
+  }
+  KOKKOS_INLINE_FUNCTION constexpr size_t stride_3() const {
+    return m_impl_offset.stride_3();
+  }
+  KOKKOS_INLINE_FUNCTION constexpr size_t stride_4() const {
+    return m_impl_offset.stride_4();
+  }
+  KOKKOS_INLINE_FUNCTION constexpr size_t stride_5() const {
+    return m_impl_offset.stride_5();
+  }
+  KOKKOS_INLINE_FUNCTION constexpr size_t stride_6() const {
+    return m_impl_offset.stride_6();
+  }
+  KOKKOS_INLINE_FUNCTION constexpr size_t stride_7() const {
+    return m_impl_offset.stride_7();
+  }
 
   //----------------------------------------
   // Range span
 
   /** \brief  Span of the mapped range */
-  KOKKOS_INLINE_FUNCTION constexpr size_t span() const
-    { return m_impl_offset.span() * Array_N ; }
+  KOKKOS_INLINE_FUNCTION constexpr size_t span() const {
+    return m_impl_offset.span() * Array_N;
+  }
 
   /** \brief  Is the mapped range span contiguous */
-  KOKKOS_INLINE_FUNCTION constexpr bool span_is_contiguous() const
-    { return m_impl_offset.span_is_contiguous(); }
+  KOKKOS_INLINE_FUNCTION constexpr bool span_is_contiguous() const {
+    return m_impl_offset.span_is_contiguous();
+  }
 
-  typedef typename std::conditional< is_contiguous_reference , contiguous_reference , strided_reference >::type  reference_type ;
+  typedef
+      typename std::conditional<is_contiguous_reference, contiguous_reference,
+                                strided_reference>::type reference_type;
 
-  typedef handle_type pointer_type ;
+  typedef handle_type pointer_type;
 
-  /** \brief  If data references are lvalue_reference than can query pointer to memory */
-  KOKKOS_INLINE_FUNCTION constexpr pointer_type data() const
-    { return m_impl_handle ; }
+  /** \brief  If data references are lvalue_reference than can query pointer to
+   * memory */
+  KOKKOS_INLINE_FUNCTION constexpr pointer_type data() const {
+    return m_impl_handle;
+  }
 
   //----------------------------------------
   // The View class performs all rank and bounds checking before
   // calling these element reference methods.
 
   KOKKOS_FORCEINLINE_FUNCTION
-  reference_type reference() const { return reference_type( m_impl_handle + 0 , Array_N , 0 ); }
+  reference_type reference() const {
+    return reference_type(m_impl_handle + 0, Array_N, 0);
+  }
 
-  template< typename I0 >
-  KOKKOS_FORCEINLINE_FUNCTION
-  reference_type
-  reference( const I0 & i0 ) const
-    { return reference_type( m_impl_handle + m_impl_offset(i0) * Array_S , Array_N , m_stride ); }
+  template <typename I0>
+  KOKKOS_FORCEINLINE_FUNCTION reference_type reference(const I0 &i0) const {
+    return reference_type(m_impl_handle + m_impl_offset(i0) * Array_S, Array_N,
+                          m_stride);
+  }
 
-  template< typename I0 , typename I1 >
-  KOKKOS_FORCEINLINE_FUNCTION
-  reference_type reference( const I0 & i0 , const I1 & i1 ) const
-    { return reference_type( m_impl_handle + m_impl_offset(i0,i1) * Array_S , Array_N , m_stride ); }
+  template <typename I0, typename I1>
+  KOKKOS_FORCEINLINE_FUNCTION reference_type reference(const I0 &i0,
+                                                       const I1 &i1) const {
+    return reference_type(m_impl_handle + m_impl_offset(i0, i1) * Array_S,
+                          Array_N, m_stride);
+  }
 
-  template< typename I0 , typename I1 , typename I2 >
-  KOKKOS_FORCEINLINE_FUNCTION
-  reference_type reference( const I0 & i0 , const I1 & i1 , const I2 & i2 ) const
-    { return reference_type( m_impl_handle + m_impl_offset(i0,i1,i2) * Array_S , Array_N , m_stride ); }
+  template <typename I0, typename I1, typename I2>
+  KOKKOS_FORCEINLINE_FUNCTION reference_type reference(const I0 &i0,
+                                                       const I1 &i1,
+                                                       const I2 &i2) const {
+    return reference_type(m_impl_handle + m_impl_offset(i0, i1, i2) * Array_S,
+                          Array_N, m_stride);
+  }
 
-  template< typename I0 , typename I1 , typename I2 , typename I3 >
-  KOKKOS_FORCEINLINE_FUNCTION
-  reference_type reference( const I0 & i0 , const I1 & i1 , const I2 & i2 , const I3 & i3 ) const
-    { return reference_type( m_impl_handle + m_impl_offset(i0,i1,i2,i3) * Array_S , Array_N , m_stride ); }
+  template <typename I0, typename I1, typename I2, typename I3>
+  KOKKOS_FORCEINLINE_FUNCTION reference_type
+  reference(const I0 &i0, const I1 &i1, const I2 &i2, const I3 &i3) const {
+    return reference_type(
+        m_impl_handle + m_impl_offset(i0, i1, i2, i3) * Array_S, Array_N,
+        m_stride);
+  }
 
-  template< typename I0 , typename I1 , typename I2 , typename I3
-          , typename I4 >
-  KOKKOS_FORCEINLINE_FUNCTION
-  reference_type reference( const I0 & i0 , const I1 & i1 , const I2 & i2 , const I3 & i3
-                          , const I4 & i4 ) const
-    { return reference_type( m_impl_handle + m_impl_offset(i0,i1,i2,i3,i4) * Array_S , Array_N , m_stride ); }
+  template <typename I0, typename I1, typename I2, typename I3, typename I4>
+  KOKKOS_FORCEINLINE_FUNCTION reference_type reference(const I0 &i0,
+                                                       const I1 &i1,
+                                                       const I2 &i2,
+                                                       const I3 &i3,
+                                                       const I4 &i4) const {
+    return reference_type(
+        m_impl_handle + m_impl_offset(i0, i1, i2, i3, i4) * Array_S, Array_N,
+        m_stride);
+  }
 
-  template< typename I0 , typename I1 , typename I2 , typename I3
-          , typename I4 , typename I5 >
-  KOKKOS_FORCEINLINE_FUNCTION
-  reference_type reference( const I0 & i0 , const I1 & i1 , const I2 & i2 , const I3 & i3
-                          , const I4 & i4 , const I5 & i5 ) const
-    { return reference_type( m_impl_handle + m_impl_offset(i0,i1,i2,i3,i4,i5) * Array_S , Array_N , m_stride ); }
+  template <typename I0, typename I1, typename I2, typename I3, typename I4,
+            typename I5>
+  KOKKOS_FORCEINLINE_FUNCTION reference_type
+  reference(const I0 &i0, const I1 &i1, const I2 &i2, const I3 &i3,
+            const I4 &i4, const I5 &i5) const {
+    return reference_type(
+        m_impl_handle + m_impl_offset(i0, i1, i2, i3, i4, i5) * Array_S,
+        Array_N, m_stride);
+  }
 
-  template< typename I0 , typename I1 , typename I2 , typename I3
-          , typename I4 , typename I5 , typename I6 >
-  KOKKOS_FORCEINLINE_FUNCTION
-  reference_type reference( const I0 & i0 , const I1 & i1 , const I2 & i2 , const I3 & i3
-                          , const I4 & i4 , const I5 & i5 , const I6 & i6 ) const
-    { return reference_type( m_impl_handle + m_impl_offset(i0,i1,i2,i3,i4,i5,i6) * Array_S , Array_N , m_stride ); }
+  template <typename I0, typename I1, typename I2, typename I3, typename I4,
+            typename I5, typename I6>
+  KOKKOS_FORCEINLINE_FUNCTION reference_type
+  reference(const I0 &i0, const I1 &i1, const I2 &i2, const I3 &i3,
+            const I4 &i4, const I5 &i5, const I6 &i6) const {
+    return reference_type(
+        m_impl_handle + m_impl_offset(i0, i1, i2, i3, i4, i5, i6) * Array_S,
+        Array_N, m_stride);
+  }
 
-  template< typename I0 , typename I1 , typename I2 , typename I3
-          , typename I4 , typename I5 , typename I6 , typename I7 >
-  KOKKOS_FORCEINLINE_FUNCTION
-  reference_type reference( const I0 & i0 , const I1 & i1 , const I2 & i2 , const I3 & i3
-                          , const I4 & i4 , const I5 & i5 , const I6 & i6 , const I7 & i7 ) const
-    { return reference_type( m_impl_handle + m_impl_offset(i0,i1,i2,i3,i4,i5,i6,i7) * Array_S , Array_N , m_stride ); }
+  template <typename I0, typename I1, typename I2, typename I3, typename I4,
+            typename I5, typename I6, typename I7>
+  KOKKOS_FORCEINLINE_FUNCTION reference_type
+  reference(const I0 &i0, const I1 &i1, const I2 &i2, const I3 &i3,
+            const I4 &i4, const I5 &i5, const I6 &i6, const I7 &i7) const {
+    return reference_type(
+        m_impl_handle + m_impl_offset(i0, i1, i2, i3, i4, i5, i6, i7) * Array_S,
+        Array_N, m_stride);
+  }
 
   //----------------------------------------
 
-private:
-
+ private:
   enum { MemorySpanMask = 8 - 1 /* Force alignment on 8 byte boundary */ };
   enum { MemorySpanSize = sizeof(scalar_type) };
 
-public:
-
+ public:
   /** \brief  Span, in bytes, of the referenced memory */
-  KOKKOS_INLINE_FUNCTION constexpr size_t memory_span() const
-    {
-      return ( m_impl_offset.span() * Array_N * MemorySpanSize + MemorySpanMask ) & ~size_t(MemorySpanMask);
-    }
+  KOKKOS_INLINE_FUNCTION constexpr size_t memory_span() const {
+    return (m_impl_offset.span() * Array_N * MemorySpanSize + MemorySpanMask) &
+           ~size_t(MemorySpanMask);
+  }
 
   //----------------------------------------
 
   KOKKOS_INLINE_FUNCTION ~ViewMapping() {}
-  KOKKOS_INLINE_FUNCTION ViewMapping() : m_impl_handle(), m_impl_offset(), m_stride(0) {}
-  KOKKOS_INLINE_FUNCTION ViewMapping( const ViewMapping & rhs )
-    : m_impl_handle( rhs.m_impl_handle ), m_impl_offset( rhs.m_impl_offset ), m_stride( rhs.m_stride ) {}
-  KOKKOS_INLINE_FUNCTION ViewMapping & operator = ( const ViewMapping & rhs )
-    { m_impl_handle = rhs.m_impl_handle ; m_impl_offset = rhs.m_impl_offset ; m_stride = rhs.m_stride ; ; return *this ; }
+  KOKKOS_INLINE_FUNCTION ViewMapping()
+      : m_impl_handle(), m_impl_offset(), m_stride(0) {}
+  KOKKOS_INLINE_FUNCTION ViewMapping(const ViewMapping &rhs)
+      : m_impl_handle(rhs.m_impl_handle),
+        m_impl_offset(rhs.m_impl_offset),
+        m_stride(rhs.m_stride) {}
+  KOKKOS_INLINE_FUNCTION ViewMapping &operator=(const ViewMapping &rhs) {
+    m_impl_handle = rhs.m_impl_handle;
+    m_impl_offset = rhs.m_impl_offset;
+    m_stride      = rhs.m_stride;
+    ;
+    return *this;
+  }
 
-  KOKKOS_INLINE_FUNCTION ViewMapping( ViewMapping && rhs )
-    : m_impl_handle( rhs.m_impl_handle ), m_impl_offset( rhs.m_impl_offset ), m_stride( rhs.m_stride ) {}
-  KOKKOS_INLINE_FUNCTION ViewMapping & operator = ( ViewMapping && rhs )
-    { m_impl_handle = rhs.m_impl_handle ; m_impl_offset = rhs.m_impl_offset ; m_stride = rhs.m_stride ; return *this ; }
+  KOKKOS_INLINE_FUNCTION ViewMapping(ViewMapping &&rhs)
+      : m_impl_handle(rhs.m_impl_handle),
+        m_impl_offset(rhs.m_impl_offset),
+        m_stride(rhs.m_stride) {}
+  KOKKOS_INLINE_FUNCTION ViewMapping &operator=(ViewMapping &&rhs) {
+    m_impl_handle = rhs.m_impl_handle;
+    m_impl_offset = rhs.m_impl_offset;
+    m_stride      = rhs.m_stride;
+    return *this;
+  }
 
   //----------------------------------------
 
-  template< class ... Args >
-  KOKKOS_INLINE_FUNCTION
-  ViewMapping( pointer_type ptr , Args ... args )
-    : m_impl_handle( ptr )
-    , m_impl_offset( std::integral_constant< unsigned , 0 >() , args... )
-    , m_stride( m_impl_offset.span() )
-    {}
+  template <class... Args>
+  KOKKOS_INLINE_FUNCTION ViewMapping(pointer_type ptr, Args... args)
+      : m_impl_handle(ptr),
+        m_impl_offset(std::integral_constant<unsigned, 0>(), args...),
+        m_stride(m_impl_offset.span()) {}
 
   //----------------------------------------
 
-  template< class ... P >
-  Kokkos::Impl::SharedAllocationRecord<> *
-  allocate_shared( Kokkos::Impl::ViewCtorProp< P... > const & arg_prop
-                 , typename Traits::array_layout const & arg_layout
-                 )
-  {
-    typedef Kokkos::Impl::ViewCtorProp< P... > alloc_prop ;
+  template <class... P>
+  Kokkos::Impl::SharedAllocationRecord<> *allocate_shared(
+      Kokkos::Impl::ViewCtorProp<P...> const &arg_prop,
+      typename Traits::array_layout const &arg_layout) {
+    typedef Kokkos::Impl::ViewCtorProp<P...> alloc_prop;
 
-    typedef typename alloc_prop::execution_space  execution_space ;
-    typedef typename Traits::memory_space         memory_space ;
-    typedef ViewValueFunctor< execution_space , scalar_type > functor_type ;
-    typedef Kokkos::Impl::SharedAllocationRecord< memory_space , functor_type > record_type ;
+    typedef typename alloc_prop::execution_space execution_space;
+    typedef typename Traits::memory_space memory_space;
+    typedef ViewValueFunctor<execution_space, scalar_type> functor_type;
+    typedef Kokkos::Impl::SharedAllocationRecord<memory_space, functor_type>
+        record_type;
 
     // Query the mapping for byte-size of allocation.
-    typedef std::integral_constant< unsigned ,
-      alloc_prop::allow_padding ? sizeof(scalar_type) : 0 > padding ;
+    typedef std::integral_constant<
+        unsigned, alloc_prop::allow_padding ? sizeof(scalar_type) : 0>
+        padding;
 
-    m_impl_offset = offset_type( padding(), arg_layout );
+    m_impl_offset = offset_type(padding(), arg_layout);
 
     const size_t alloc_size =
-      ( m_impl_offset.span() * Array_N * MemorySpanSize + MemorySpanMask ) & ~size_t(MemorySpanMask);
+        (m_impl_offset.span() * Array_N * MemorySpanSize + MemorySpanMask) &
+        ~size_t(MemorySpanMask);
 
     // Allocate memory from the memory space and create tracking record.
-    record_type * const record =
-      record_type::allocate( ((Kokkos::Impl::ViewCtorProp<void,memory_space> const &) arg_prop ).value
-                           , ((Kokkos::Impl::ViewCtorProp<void,std::string>  const &) arg_prop ).value
-                           , alloc_size );
+    record_type *const record = record_type::allocate(
+        ((Kokkos::Impl::ViewCtorProp<void, memory_space> const &)arg_prop)
+            .value,
+        ((Kokkos::Impl::ViewCtorProp<void, std::string> const &)arg_prop).value,
+        alloc_size);
 
-    if ( alloc_size ) {
+    if (alloc_size) {
       m_impl_handle =
-        handle_type( reinterpret_cast< pointer_type >( record->data() ) );
+          handle_type(reinterpret_cast<pointer_type>(record->data()));
 
-      if ( alloc_prop::initialize ) {
+      if (alloc_prop::initialize) {
         // The functor constructs and destroys
-        record->m_destroy = functor_type( ((Kokkos::Impl::ViewCtorProp<void,execution_space> const & )arg_prop).value
-                                        , (pointer_type) m_impl_handle
-                                        , m_impl_offset.span() * Array_N
-                                        );
+        record->m_destroy = functor_type(
+            ((Kokkos::Impl::ViewCtorProp<void, execution_space> const &)
+                 arg_prop)
+                .value,
+            (pointer_type)m_impl_handle, m_impl_offset.span() * Array_N);
 
         record->m_destroy.construct_shared_allocation();
       }
     }
 
-    return record ;
+    return record;
   }
 };
 
 /** \brief Assign Array to non-Array */
 
-template< class DstTraits , class SrcTraits >
-class ViewMapping< DstTraits , SrcTraits ,
-  typename std::enable_if<(
-    std::is_same< typename DstTraits::memory_space , typename SrcTraits::memory_space >::value
-    &&
-    std::is_same< typename DstTraits::specialize , void >::value
-    &&
-    (
-      std::is_same< typename DstTraits::array_layout , Kokkos::LayoutLeft >::value ||
-      std::is_same< typename DstTraits::array_layout , Kokkos::LayoutRight >::value ||
-      std::is_same< typename DstTraits::array_layout , Kokkos::LayoutStride >::value
-    )
-    &&
-    std::is_same< typename SrcTraits::specialize , Kokkos::Array<> >::value
-    &&
-    (
-      std::is_same< typename SrcTraits::array_layout , Kokkos::LayoutLeft >::value ||
-      std::is_same< typename SrcTraits::array_layout , Kokkos::LayoutRight >::value ||
-      std::is_same< typename SrcTraits::array_layout , Kokkos::LayoutStride >::value
-    )
-  )>::type >
-{
-public:
-
+template <class DstTraits, class SrcTraits>
+class ViewMapping<
+    DstTraits, SrcTraits,
+    typename std::enable_if<(
+        std::is_same<typename DstTraits::memory_space,
+                     typename SrcTraits::memory_space>::value &&
+        std::is_same<typename DstTraits::specialize, void>::value &&
+        (std::is_same<typename DstTraits::array_layout,
+                      Kokkos::LayoutLeft>::value ||
+         std::is_same<typename DstTraits::array_layout,
+                      Kokkos::LayoutRight>::value ||
+         std::is_same<typename DstTraits::array_layout,
+                      Kokkos::LayoutStride>::value) &&
+        std::is_same<typename SrcTraits::specialize, Kokkos::Array<> >::value &&
+        (std::is_same<typename SrcTraits::array_layout,
+                      Kokkos::LayoutLeft>::value ||
+         std::is_same<typename SrcTraits::array_layout,
+                      Kokkos::LayoutRight>::value ||
+         std::is_same<typename SrcTraits::array_layout,
+                      Kokkos::LayoutStride>::value))>::type> {
+ public:
   // Can only convert to View::array_type
 
-  enum { is_assignable_data_type = std::is_same< typename DstTraits::data_type ,    typename SrcTraits::scalar_array_type >::value &&
-                                   (DstTraits::rank==SrcTraits::rank+1)};
-  enum { is_assignable = std::is_same< typename DstTraits::data_type ,    typename SrcTraits::scalar_array_type >::value &&
-                         std::is_same< typename DstTraits::array_layout , typename SrcTraits::array_layout >::value };
+  enum {
+    is_assignable_data_type =
+        std::is_same<typename DstTraits::data_type,
+                     typename SrcTraits::scalar_array_type>::value &&
+        (DstTraits::rank == SrcTraits::rank + 1)
+  };
+  enum {
+    is_assignable =
+        std::is_same<typename DstTraits::data_type,
+                     typename SrcTraits::scalar_array_type>::value &&
+        std::is_same<typename DstTraits::array_layout,
+                     typename SrcTraits::array_layout>::value
+  };
 
-  typedef Kokkos::Impl::SharedAllocationTracker  TrackType ;
-  typedef ViewMapping< DstTraits , void >  DstType ;
-  typedef ViewMapping< SrcTraits , Kokkos::Array<> >  SrcType ;
+  typedef Kokkos::Impl::SharedAllocationTracker TrackType;
+  typedef ViewMapping<DstTraits, void> DstType;
+  typedef ViewMapping<SrcTraits, Kokkos::Array<> > SrcType;
 
   KOKKOS_INLINE_FUNCTION
-  static void assign( DstType & dst , const SrcType & src , const TrackType & src_track )
-    {
-      static_assert( is_assignable , "Can only convert to array_type" );
+  static void assign(DstType &dst, const SrcType &src,
+                     const TrackType &src_track) {
+    static_assert(is_assignable, "Can only convert to array_type");
 
-      typedef typename DstType::offset_type  dst_offset_type ;
+    typedef typename DstType::offset_type dst_offset_type;
 
-      // Array dimension becomes the last dimension.
-      // Arguments beyond the destination rank are ignored.
-      if ( src.span_is_contiguous() ) { // not padded
-        dst.m_impl_offset = dst_offset_type( std::integral_constant<unsigned,0>() ,
-          typename DstTraits::array_layout
-            ( ( 0 < SrcType::Rank ? src.dimension_0() : SrcTraits::value_type::size() )
-            , ( 1 < SrcType::Rank ? src.dimension_1() : SrcTraits::value_type::size() )
-            , ( 2 < SrcType::Rank ? src.dimension_2() : SrcTraits::value_type::size() )
-            , ( 3 < SrcType::Rank ? src.dimension_3() : SrcTraits::value_type::size() )
-            , ( 4 < SrcType::Rank ? src.dimension_4() : SrcTraits::value_type::size() )
-            , ( 5 < SrcType::Rank ? src.dimension_5() : SrcTraits::value_type::size() )
-            , ( 6 < SrcType::Rank ? src.dimension_6() : SrcTraits::value_type::size() )
-            , ( 7 < SrcType::Rank ? src.dimension_7() : SrcTraits::value_type::size() )
-            ) );
-      }
-      else { // is padded
-        typedef std::integral_constant<unsigned,sizeof(typename SrcTraits::value_type::value_type)> padded ;
+    // Array dimension becomes the last dimension.
+    // Arguments beyond the destination rank are ignored.
+    if (src.span_is_contiguous()) {  // not padded
+      dst.m_impl_offset = dst_offset_type(
+          std::integral_constant<unsigned, 0>(),
+          typename DstTraits::array_layout(
+              (0 < SrcType::Rank ? src.dimension_0()
+                                 : SrcTraits::value_type::size()),
+              (1 < SrcType::Rank ? src.dimension_1()
+                                 : SrcTraits::value_type::size()),
+              (2 < SrcType::Rank ? src.dimension_2()
+                                 : SrcTraits::value_type::size()),
+              (3 < SrcType::Rank ? src.dimension_3()
+                                 : SrcTraits::value_type::size()),
+              (4 < SrcType::Rank ? src.dimension_4()
+                                 : SrcTraits::value_type::size()),
+              (5 < SrcType::Rank ? src.dimension_5()
+                                 : SrcTraits::value_type::size()),
+              (6 < SrcType::Rank ? src.dimension_6()
+                                 : SrcTraits::value_type::size()),
+              (7 < SrcType::Rank ? src.dimension_7()
+                                 : SrcTraits::value_type::size())));
+    } else {  // is padded
+      typedef std::integral_constant<
+          unsigned, sizeof(typename SrcTraits::value_type::value_type)>
+          padded;
 
-        dst.m_impl_offset = dst_offset_type( padded() ,
-          typename DstTraits::array_layout
-            ( ( 0 < SrcType::Rank ? src.dimension_0() : SrcTraits::value_type::size() )
-            , ( 1 < SrcType::Rank ? src.dimension_1() : SrcTraits::value_type::size() )
-            , ( 2 < SrcType::Rank ? src.dimension_2() : SrcTraits::value_type::size() )
-            , ( 3 < SrcType::Rank ? src.dimension_3() : SrcTraits::value_type::size() )
-            , ( 4 < SrcType::Rank ? src.dimension_4() : SrcTraits::value_type::size() )
-            , ( 5 < SrcType::Rank ? src.dimension_5() : SrcTraits::value_type::size() )
-            , ( 6 < SrcType::Rank ? src.dimension_6() : SrcTraits::value_type::size() )
-            , ( 7 < SrcType::Rank ? src.dimension_7() : SrcTraits::value_type::size() )
-            ) );
-      }
-
-      dst.m_impl_handle = src.m_impl_handle ;
+      dst.m_impl_offset = dst_offset_type(
+          padded(), typename DstTraits::array_layout(
+                        (0 < SrcType::Rank ? src.dimension_0()
+                                           : SrcTraits::value_type::size()),
+                        (1 < SrcType::Rank ? src.dimension_1()
+                                           : SrcTraits::value_type::size()),
+                        (2 < SrcType::Rank ? src.dimension_2()
+                                           : SrcTraits::value_type::size()),
+                        (3 < SrcType::Rank ? src.dimension_3()
+                                           : SrcTraits::value_type::size()),
+                        (4 < SrcType::Rank ? src.dimension_4()
+                                           : SrcTraits::value_type::size()),
+                        (5 < SrcType::Rank ? src.dimension_5()
+                                           : SrcTraits::value_type::size()),
+                        (6 < SrcType::Rank ? src.dimension_6()
+                                           : SrcTraits::value_type::size()),
+                        (7 < SrcType::Rank ? src.dimension_7()
+                                           : SrcTraits::value_type::size())));
     }
+
+    dst.m_impl_handle = src.m_impl_handle;
+  }
 };
 
-
 //----------------------------------------------------------------------------
 //----------------------------------------------------------------------------
 
-template< class SrcTraits , class ... Args >
-struct ViewMapping
-  < typename std::enable_if<(
-      std::is_same< typename SrcTraits::specialize , Kokkos::Array<> >::value
-      &&
-      (
-        std::is_same< typename SrcTraits::array_layout , Kokkos::LayoutLeft >::value ||
-        std::is_same< typename SrcTraits::array_layout , Kokkos::LayoutRight >::value ||
-        std::is_same< typename SrcTraits::array_layout , Kokkos::LayoutStride >::value
-      )
-    )>::type
-  , SrcTraits
-  , Args ... >
-{
-private:
+template <class SrcTraits, class... Args>
+struct ViewMapping<
+    typename std::enable_if<(
+        std::is_same<typename SrcTraits::specialize, Kokkos::Array<> >::value &&
+        (std::is_same<typename SrcTraits::array_layout,
+                      Kokkos::LayoutLeft>::value ||
+         std::is_same<typename SrcTraits::array_layout,
+                      Kokkos::LayoutRight>::value ||
+         std::is_same<typename SrcTraits::array_layout,
+                      Kokkos::LayoutStride>::value))>::type,
+    SrcTraits, Args...> {
+ private:
+  static_assert(SrcTraits::rank == sizeof...(Args), "");
 
-  static_assert( SrcTraits::rank == sizeof...(Args) , "" );
+  enum : bool {
+    R0 = is_integral_extent<0, Args...>::value,
+    R1 = is_integral_extent<1, Args...>::value,
+    R2 = is_integral_extent<2, Args...>::value,
+    R3 = is_integral_extent<3, Args...>::value,
+    R4 = is_integral_extent<4, Args...>::value,
+    R5 = is_integral_extent<5, Args...>::value,
+    R6 = is_integral_extent<6, Args...>::value,
+    R7 = is_integral_extent<7, Args...>::value
+  };
 
-  enum : bool
-    { R0 = is_integral_extent<0,Args...>::value
-    , R1 = is_integral_extent<1,Args...>::value
-    , R2 = is_integral_extent<2,Args...>::value
-    , R3 = is_integral_extent<3,Args...>::value
-    , R4 = is_integral_extent<4,Args...>::value
-    , R5 = is_integral_extent<5,Args...>::value
-    , R6 = is_integral_extent<6,Args...>::value
-    , R7 = is_integral_extent<7,Args...>::value
-    };
-
-  enum { rank = unsigned(R0) + unsigned(R1) + unsigned(R2) + unsigned(R3)
-              + unsigned(R4) + unsigned(R5) + unsigned(R6) + unsigned(R7) };
+  enum {
+    rank = unsigned(R0) + unsigned(R1) + unsigned(R2) + unsigned(R3) +
+           unsigned(R4) + unsigned(R5) + unsigned(R6) + unsigned(R7)
+  };
 
   // Whether right-most rank is a range.
-  enum { R0_rev = 0 == SrcTraits::rank ? false : (
-                  1 == SrcTraits::rank ? R0 : (
-                  2 == SrcTraits::rank ? R1 : (
-                  3 == SrcTraits::rank ? R2 : (
-                  4 == SrcTraits::rank ? R3 : (
-                  5 == SrcTraits::rank ? R4 : (
-                  6 == SrcTraits::rank ? R5 : (
-                  7 == SrcTraits::rank ? R6 : R7 ))))))) };
+  enum {
+    R0_rev =
+        0 == SrcTraits::rank
+            ? false
+            : (1 == SrcTraits::rank
+                   ? R0
+                   : (2 == SrcTraits::rank
+                          ? R1
+                          : (3 == SrcTraits::rank
+                                 ? R2
+                                 : (4 == SrcTraits::rank
+                                        ? R3
+                                        : (5 == SrcTraits::rank
+                                               ? R4
+                                               : (6 == SrcTraits::rank
+                                                      ? R5
+                                                      : (7 == SrcTraits::rank
+                                                             ? R6
+                                                             : R7)))))))
+  };
 
   // Subview's layout
   typedef typename std::conditional<
-      ( /* Same array layout IF */
-        ( rank == 0 ) /* output rank zero */
-        ||
-        // OutputRank 1 or 2, InputLayout Left, Interval 0
-        // because single stride one or second index has a stride.
-        ( rank <= 2 && R0 && std::is_same< typename SrcTraits::array_layout , Kokkos::LayoutLeft >::value )
-        ||
-        // OutputRank 1 or 2, InputLayout Right, Interval [InputRank-1]
-        // because single stride one or second index has a stride.
-        ( rank <= 2 && R0_rev && std::is_same< typename SrcTraits::array_layout , Kokkos::LayoutRight >::value )
-      ), typename SrcTraits::array_layout , Kokkos::LayoutStride
-      >::type array_layout ;
+      (            /* Same array layout IF */
+       (rank == 0) /* output rank zero */
+       ||
+       // OutputRank 1 or 2, InputLayout Left, Interval 0
+       // because single stride one or second index has a stride.
+       (rank <= 2 && R0 &&
+        std::is_same<typename SrcTraits::array_layout,
+                     Kokkos::LayoutLeft>::value) ||
+       // OutputRank 1 or 2, InputLayout Right, Interval [InputRank-1]
+       // because single stride one or second index has a stride.
+       (rank <= 2 && R0_rev &&
+        std::is_same<typename SrcTraits::array_layout,
+                     Kokkos::LayoutRight>::value)),
+      typename SrcTraits::array_layout, Kokkos::LayoutStride>::type
+      array_layout;
 
-  typedef typename SrcTraits::value_type  value_type ;
+  typedef typename SrcTraits::value_type value_type;
 
-  typedef typename std::conditional< rank == 0 , value_type ,
-          typename std::conditional< rank == 1 , value_type * ,
-          typename std::conditional< rank == 2 , value_type ** ,
-          typename std::conditional< rank == 3 , value_type *** ,
-          typename std::conditional< rank == 4 , value_type **** ,
-          typename std::conditional< rank == 5 , value_type ***** ,
-          typename std::conditional< rank == 6 , value_type ****** ,
-          typename std::conditional< rank == 7 , value_type ******* ,
-                                                 value_type ********
-          >::type >::type >::type >::type >::type >::type >::type >::type
-     data_type ;
+  typedef typename std::conditional<
+      rank == 0, value_type,
+      typename std::conditional<
+          rank == 1, value_type *,
+          typename std::conditional<
+              rank == 2, value_type **,
+              typename std::conditional<
+                  rank == 3, value_type ***,
+                  typename std::conditional<
+                      rank == 4, value_type ****,
+                      typename std::conditional<
+                          rank == 5, value_type *****,
+                          typename std::conditional<
+                              rank == 6, value_type ******,
+                              typename std::conditional<
+                                  rank == 7, value_type *******,
+                                  value_type ********>::type>::type>::type>::
+                      type>::type>::type>::type>::type data_type;
 
-public:
+ public:
+  typedef Kokkos::ViewTraits<data_type, array_layout,
+                             typename SrcTraits::device_type,
+                             typename SrcTraits::memory_traits>
+      traits_type;
 
-  typedef Kokkos::ViewTraits
-    < data_type
-    , array_layout
-    , typename SrcTraits::device_type
-    , typename SrcTraits::memory_traits > traits_type ;
-
-  typedef Kokkos::View
-    < data_type
-    , array_layout
-    , typename SrcTraits::device_type
-    , typename SrcTraits::memory_traits > type ;
+  typedef Kokkos::View<data_type, array_layout, typename SrcTraits::device_type,
+                       typename SrcTraits::memory_traits>
+      type;
 
   KOKKOS_INLINE_FUNCTION
-  static void assign( ViewMapping< traits_type , void > & dst
-                    , ViewMapping< SrcTraits , void > const & src
-                    , Args ... args )
-    {
-      typedef ViewMapping< traits_type , void >  DstType ;
+  static void assign(ViewMapping<traits_type, void> &dst,
+                     ViewMapping<SrcTraits, void> const &src, Args... args) {
+    typedef ViewMapping<traits_type, void> DstType;
 
-      typedef typename DstType::offset_type  dst_offset_type ;
-      typedef typename DstType::handle_type  dst_handle_type ;
+    typedef typename DstType::offset_type dst_offset_type;
+    typedef typename DstType::handle_type dst_handle_type;
 
-      const SubviewExtents< SrcTraits::rank , rank >
-        extents( src.m_impl_offset.m_dim , args... );
+    const SubviewExtents<SrcTraits::rank, rank> extents(src.m_impl_offset.m_dim,
+                                                        args...);
 
-      dst.m_impl_offset = dst_offset_type( src.m_impl_offset , extents );
-      dst.m_impl_handle = dst_handle_type( src.m_impl_handle +
-                                      src.m_impl_offset( extents.domain_offset(0)
-                                                  , extents.domain_offset(1)
-                                                  , extents.domain_offset(2)
-                                                  , extents.domain_offset(3)
-                                                  , extents.domain_offset(4)
-                                                  , extents.domain_offset(5)
-                                                  , extents.domain_offset(6)
-                                                  , extents.domain_offset(7)
-                                                  ) );
-    }
+    dst.m_impl_offset = dst_offset_type(src.m_impl_offset, extents);
+    dst.m_impl_handle = dst_handle_type(
+        src.m_impl_handle +
+        src.m_impl_offset(extents.domain_offset(0), extents.domain_offset(1),
+                          extents.domain_offset(2), extents.domain_offset(3),
+                          extents.domain_offset(4), extents.domain_offset(5),
+                          extents.domain_offset(6), extents.domain_offset(7)));
+  }
 };
 
-}} // namespace Kokkos::Impl
+}  // namespace Impl
+}  // namespace Kokkos
 
 //----------------------------------------------------------------------------
 //----------------------------------------------------------------------------
 
 #endif /* #ifndef KOKKOS_EXPERIMENTAL_VIEW_ARRAY_MAPPING_HPP */
-
diff --git a/lib/kokkos/core/src/impl/Kokkos_ViewCtor.hpp b/lib/kokkos/core/src/impl/Kokkos_ViewCtor.hpp
index f5b19f915f..33c6e73f05 100644
--- a/lib/kokkos/core/src/impl/Kokkos_ViewCtor.hpp
+++ b/lib/kokkos/core/src/impl/Kokkos_ViewCtor.hpp
@@ -1,13 +1,14 @@
 /*
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -36,7 +37,7 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 */
@@ -52,16 +53,15 @@ namespace Kokkos {
 /* For backward compatibility */
 
 struct ViewAllocateWithoutInitializing {
-
-  const std::string label ;
+  const std::string label;
 
   ViewAllocateWithoutInitializing() : label() {}
 
-  explicit
-  ViewAllocateWithoutInitializing( const std::string & arg_label ) : label( arg_label ) {}
+  explicit ViewAllocateWithoutInitializing(const std::string &arg_label)
+      : label(arg_label) {}
 
-  explicit
-  ViewAllocateWithoutInitializing( const char * const  arg_label ) : label( arg_label ) {}
+  explicit ViewAllocateWithoutInitializing(const char *const arg_label)
+      : label(arg_label) {}
 };
 
 } /* namespace Kokkos */
@@ -79,189 +79,166 @@ struct NullSpace_t {};
 //----------------------------------------------------------------------------
 /**\brief Whether a type can be used for a view label */
 
-template < typename >
+template <typename>
 struct is_view_label : public std::false_type {};
 
-template<>
-struct is_view_label< std::string > : public std::true_type {};
+template <>
+struct is_view_label<std::string> : public std::true_type {};
 
-template< unsigned N >
-struct is_view_label< char[N] > : public std::true_type {};
+template <unsigned N>
+struct is_view_label<char[N]> : public std::true_type {};
 
-template< unsigned N >
-struct is_view_label< const char[N] > : public std::true_type {};
+template <unsigned N>
+struct is_view_label<const char[N]> : public std::true_type {};
 
 //----------------------------------------------------------------------------
 
-template< typename ... P >
-struct ViewCtorProp ;
+template <typename... P>
+struct ViewCtorProp;
 
 // Forward declare
-template< typename Specialize , typename T >
-struct CommonViewAllocProp ;
+template <typename Specialize, typename T>
+struct CommonViewAllocProp;
 
 /* Common value_type stored as ViewCtorProp
  */
-template< typename Specialize , typename T >
-struct ViewCtorProp< void , CommonViewAllocProp<Specialize,T> >
-{
-  ViewCtorProp() = default ;
-  ViewCtorProp( const ViewCtorProp & ) = default ;
-  ViewCtorProp & operator = ( const ViewCtorProp & ) = default ;
+template <typename Specialize, typename T>
+struct ViewCtorProp<void, CommonViewAllocProp<Specialize, T> > {
+  ViewCtorProp()                     = default;
+  ViewCtorProp(const ViewCtorProp &) = default;
+  ViewCtorProp &operator=(const ViewCtorProp &) = default;
 
-  using type = CommonViewAllocProp<Specialize,T> ;
+  using type = CommonViewAllocProp<Specialize, T>;
 
   KOKKOS_INLINE_FUNCTION
-  ViewCtorProp( const type & arg ) : value( arg ) {}
+  ViewCtorProp(const type &arg) : value(arg) {}
   KOKKOS_INLINE_FUNCTION
-  ViewCtorProp( type && arg ) : value( arg ) {}
+  ViewCtorProp(type &&arg) : value(arg) {}
 
-  type value ;
+  type value;
 };
 
 /*  std::integral_constant<unsigned,I> are dummy arguments
  *  that avoid duplicate base class errors
  */
-template< unsigned I >
-struct ViewCtorProp< void , std::integral_constant<unsigned,I> >
-{
-  ViewCtorProp() = default ;
-  ViewCtorProp( const ViewCtorProp & ) = default ;
-  ViewCtorProp & operator = ( const ViewCtorProp & ) = default ;
+template <unsigned I>
+struct ViewCtorProp<void, std::integral_constant<unsigned, I> > {
+  ViewCtorProp()                     = default;
+  ViewCtorProp(const ViewCtorProp &) = default;
+  ViewCtorProp &operator=(const ViewCtorProp &) = default;
 
-  template< typename P >
-  KOKKOS_INLINE_FUNCTION
-  ViewCtorProp( const P & ) {}
+  template <typename P>
+  KOKKOS_INLINE_FUNCTION ViewCtorProp(const P &) {}
 };
 
 /* Property flags have constexpr value */
-template< typename P >
-struct ViewCtorProp
-  < typename std::enable_if<
-      std::is_same< P , AllowPadding_t >::value ||
-      std::is_same< P , WithoutInitializing_t >::value
-    >::type
-  , P
-  >
-{
-  ViewCtorProp() = default ;
-  ViewCtorProp( const ViewCtorProp & ) = default ;
-  ViewCtorProp & operator = ( const ViewCtorProp & ) = default ;
+template <typename P>
+struct ViewCtorProp<typename std::enable_if<
+                        std::is_same<P, AllowPadding_t>::value ||
+                        std::is_same<P, WithoutInitializing_t>::value>::type,
+                    P> {
+  ViewCtorProp()                     = default;
+  ViewCtorProp(const ViewCtorProp &) = default;
+  ViewCtorProp &operator=(const ViewCtorProp &) = default;
 
-  typedef P type ;
+  typedef P type;
 
-  ViewCtorProp( const type & ) {}
+  ViewCtorProp(const type &) {}
 
   static constexpr type value = type();
 };
 
 /* Map input label type to std::string */
-template< typename Label >
-struct ViewCtorProp
-  < typename std::enable_if< is_view_label< Label >::value >::type
-  , Label
-  >
-{
-  ViewCtorProp() = default ;
-  ViewCtorProp( const ViewCtorProp & ) = default ;
-  ViewCtorProp & operator = ( const ViewCtorProp & ) = default ;
+template <typename Label>
+struct ViewCtorProp<typename std::enable_if<is_view_label<Label>::value>::type,
+                    Label> {
+  ViewCtorProp()                     = default;
+  ViewCtorProp(const ViewCtorProp &) = default;
+  ViewCtorProp &operator=(const ViewCtorProp &) = default;
 
-  typedef std::string type ;
+  typedef std::string type;
 
-  ViewCtorProp( const type & arg ) : value( arg ) {}
-  ViewCtorProp( type && arg ) : value( arg ) {}
+  ViewCtorProp(const type &arg) : value(arg) {}
+  ViewCtorProp(type &&arg) : value(arg) {}
 
-  type value ;
+  type value;
 };
 
-template< typename Space >
-struct ViewCtorProp
-  < typename std::enable_if<
-      Kokkos::Impl::is_memory_space<Space>::value ||
-      Kokkos::Impl::is_execution_space<Space>::value
-    >::type
-  , Space
-  >
-{
-  ViewCtorProp() = default ;
-  ViewCtorProp( const ViewCtorProp & ) = default ;
-  ViewCtorProp & operator = ( const ViewCtorProp & ) = default ;
+template <typename Space>
+struct ViewCtorProp<typename std::enable_if<
+                        Kokkos::Impl::is_memory_space<Space>::value ||
+                        Kokkos::Impl::is_execution_space<Space>::value>::type,
+                    Space> {
+  ViewCtorProp()                     = default;
+  ViewCtorProp(const ViewCtorProp &) = default;
+  ViewCtorProp &operator=(const ViewCtorProp &) = default;
 
-  typedef Space type ;
+  typedef Space type;
 
-  ViewCtorProp( const type & arg ) : value( arg ) {}
+  ViewCtorProp(const type &arg) : value(arg) {}
 
-  type value ;
+  type value;
 };
 
+template <typename T>
+struct ViewCtorProp<void, T *> {
+  ViewCtorProp()                     = default;
+  ViewCtorProp(const ViewCtorProp &) = default;
+  ViewCtorProp &operator=(const ViewCtorProp &) = default;
 
-template< typename T >
-struct ViewCtorProp < void , T * >
-{
-  ViewCtorProp() = default ;
-  ViewCtorProp( const ViewCtorProp & ) = default ;
-  ViewCtorProp & operator = ( const ViewCtorProp & ) = default ;
-
-  typedef T * type ;
+  typedef T *type;
 
   KOKKOS_INLINE_FUNCTION
-  ViewCtorProp( const type arg ) : value( arg ) {}
+  ViewCtorProp(const type arg) : value(arg) {}
 
-  type value ;
+  type value;
 };
 
+template <typename... P>
+struct ViewCtorProp : public ViewCtorProp<void, P>... {
+ private:
+  typedef Kokkos::Impl::has_condition<void, Kokkos::Impl::is_memory_space, P...>
+      var_memory_space;
 
-template< typename ... P >
-struct ViewCtorProp : public ViewCtorProp< void , P > ...
-{
-private:
+  typedef Kokkos::Impl::has_condition<void, Kokkos::Impl::is_execution_space,
+                                      P...>
+      var_execution_space;
 
-  typedef Kokkos::Impl::has_condition< void , Kokkos::Impl::is_memory_space , P ... >
-    var_memory_space ;
+  struct VOIDDUMMY {};
 
-  typedef Kokkos::Impl::has_condition< void , Kokkos::Impl::is_execution_space , P ... >
-    var_execution_space ;
-
-  struct VOIDDUMMY{};
-
-  typedef Kokkos::Impl::has_condition< VOIDDUMMY , std::is_pointer , P ... >
-    var_pointer ;
-
-public:
+  typedef Kokkos::Impl::has_condition<VOIDDUMMY, std::is_pointer, P...>
+      var_pointer;
 
+ public:
   /* Flags for the common properties */
-  enum { has_memory_space    = var_memory_space::value };
+  enum { has_memory_space = var_memory_space::value };
   enum { has_execution_space = var_execution_space::value };
-  enum { has_pointer         = var_pointer::value };
-  enum { has_label           = Kokkos::Impl::has_type< std::string , P... >::value };
-  enum { allow_padding       = Kokkos::Impl::has_type< AllowPadding_t , P... >::value };
-  enum { initialize          = ! Kokkos::Impl::has_type< WithoutInitializing_t , P ... >::value };
+  enum { has_pointer = var_pointer::value };
+  enum { has_label = Kokkos::Impl::has_type<std::string, P...>::value };
+  enum { allow_padding = Kokkos::Impl::has_type<AllowPadding_t, P...>::value };
+  enum {
+    initialize = !Kokkos::Impl::has_type<WithoutInitializing_t, P...>::value
+  };
 
-  typedef typename var_memory_space::type     memory_space ;
-  typedef typename var_execution_space::type  execution_space ;
-  typedef typename var_pointer::type          pointer_type ;
+  typedef typename var_memory_space::type memory_space;
+  typedef typename var_execution_space::type execution_space;
+  typedef typename var_pointer::type pointer_type;
 
   /*  Copy from a matching argument list.
    *  Requires  std::is_same< P , ViewCtorProp< void , Args >::value ...
    */
-  template< typename ... Args >
-  inline
-  ViewCtorProp( Args const & ... args )
-    : ViewCtorProp< void , P >( args ) ...
-    {}
+  template <typename... Args>
+  inline ViewCtorProp(Args const &... args) : ViewCtorProp<void, P>(args)... {}
 
-  template< typename ... Args >
-  KOKKOS_INLINE_FUNCTION
-  ViewCtorProp( pointer_type arg0 , Args const & ... args )
-    : ViewCtorProp< void , pointer_type >( arg0 )
-    , ViewCtorProp< void , typename ViewCtorProp< void , Args >::type >( args ) ...
-    {}
+  template <typename... Args>
+  KOKKOS_INLINE_FUNCTION ViewCtorProp(pointer_type arg0, Args const &... args)
+      : ViewCtorProp<void, pointer_type>(arg0),
+        ViewCtorProp<void, typename ViewCtorProp<void, Args>::type>(args)... {}
 
   /* Copy from a matching property subset */
-  template< typename ... Args >
-  ViewCtorProp( ViewCtorProp< Args ... > const & arg )
-    : ViewCtorProp< void , Args >( ((ViewCtorProp<void,Args> const &) arg ) ) ...
-    {}
+  template <typename... Args>
+  ViewCtorProp(ViewCtorProp<Args...> const &arg)
+      : ViewCtorProp<void, Args>(((ViewCtorProp<void, Args> const &)arg))... {}
 };
 
 } /* namespace Impl */
@@ -271,4 +248,3 @@ public:
 //----------------------------------------------------------------------------
 
 #endif
-
diff --git a/lib/kokkos/core/src/impl/Kokkos_ViewFillCopyETIAvail.hpp b/lib/kokkos/core/src/impl/Kokkos_ViewFillCopyETIAvail.hpp
index 3a5c31ab50..b415cb6d50 100644
--- a/lib/kokkos/core/src/impl/Kokkos_ViewFillCopyETIAvail.hpp
+++ b/lib/kokkos/core/src/impl/Kokkos_ViewFillCopyETIAvail.hpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -47,59 +48,78 @@
 namespace Kokkos {
 namespace Impl {
 
-template<class ViewTypeA,class ViewTypeB, class Layout, class ExecSpace, int Rank, typename iType>
+template <class ViewTypeA, class ViewTypeB, class Layout, class ExecSpace,
+          int Rank, typename iType>
 struct ViewCopyETIAvail {
-  enum {value=false};
+  enum { value = false };
 };
 
-#define KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(DATATYPE,LAYOUTA,LAYOUTB,EXECSPACE,ITYPE) \
-  template<> \
-  struct ViewCopyETIAvail<Kokkos::View<DATATYPE,LAYOUTA,Kokkos::Device<EXECSPACE,Kokkos::AnonymousSpace>,Kokkos::MemoryTraits<0>>, \
-                          Kokkos::View<const DATATYPE,LAYOUTB,Kokkos::Device<EXECSPACE,Kokkos::AnonymousSpace>,Kokkos::MemoryTraits<0>>, \
-                          Kokkos::LayoutLeft,EXECSPACE,Kokkos::View<DATATYPE>::rank,ITYPE> { \
-    enum {value=true}; \
-  }; \
-  template<> \
-  struct ViewCopyETIAvail<Kokkos::View<DATATYPE,LAYOUTA,Kokkos::Device<EXECSPACE,Kokkos::AnonymousSpace>,Kokkos::MemoryTraits<0>>, \
-                          Kokkos::View<const DATATYPE,LAYOUTB,Kokkos::Device<EXECSPACE,Kokkos::AnonymousSpace>,Kokkos::MemoryTraits<0>>, \
-                          Kokkos::LayoutRight,EXECSPACE,Kokkos::View<DATATYPE>::rank,ITYPE> { \
-    enum {value=true}; \
+#define KOKKOS_IMPL_VIEWCOPY_ETI_AVAIL(DATATYPE, LAYOUTA, LAYOUTB, EXECSPACE, \
+                                       ITYPE)                                 \
+  template <>                                                                 \
+  struct ViewCopyETIAvail<                                                    \
+      Kokkos::View<DATATYPE, LAYOUTA,                                         \
+                   Kokkos::Device<EXECSPACE, Kokkos::AnonymousSpace>,         \
+                   Kokkos::MemoryTraits<0>>,                                  \
+      Kokkos::View<const DATATYPE, LAYOUTB,                                   \
+                   Kokkos::Device<EXECSPACE, Kokkos::AnonymousSpace>,         \
+                   Kokkos::MemoryTraits<0>>,                                  \
+      Kokkos::LayoutLeft, EXECSPACE, Kokkos::View<DATATYPE>::rank, ITYPE> {   \
+    enum { value = true };                                                    \
+  };                                                                          \
+  template <>                                                                 \
+  struct ViewCopyETIAvail<                                                    \
+      Kokkos::View<DATATYPE, LAYOUTA,                                         \
+                   Kokkos::Device<EXECSPACE, Kokkos::AnonymousSpace>,         \
+                   Kokkos::MemoryTraits<0>>,                                  \
+      Kokkos::View<const DATATYPE, LAYOUTB,                                   \
+                   Kokkos::Device<EXECSPACE, Kokkos::AnonymousSpace>,         \
+                   Kokkos::MemoryTraits<0>>,                                  \
+      Kokkos::LayoutRight, EXECSPACE, Kokkos::View<DATATYPE>::rank, ITYPE> {  \
+    enum { value = true };                                                    \
   };
 
-template<class ViewType, class Layout, class ExecSpace, int Rank, typename iType>
+template <class ViewType, class Layout, class ExecSpace, int Rank,
+          typename iType>
 struct ViewFillETIAvail {
-  enum {value=false};
+  enum { value = false };
 };
 
-#define KOKKOS_IMPL_VIEWFILL_ETI_AVAIL(DATATYPE,LAYOUT,EXECSPACE,ITYPE) \
-  template<> \
-  struct ViewFillETIAvail<Kokkos::View<DATATYPE,LAYOUT,Kokkos::Device<EXECSPACE,Kokkos::AnonymousSpace>,Kokkos::MemoryTraits<0>>, \
-                          Kokkos::LayoutLeft,EXECSPACE,Kokkos::View<DATATYPE>::rank,ITYPE> { \
-    enum {value=true}; \
-  }; \
-  template<> \
-  struct ViewFillETIAvail<Kokkos::View<DATATYPE,LAYOUT,Kokkos::Device<EXECSPACE,Kokkos::AnonymousSpace>,Kokkos::MemoryTraits<0>>, \
-                          Kokkos::LayoutRight,EXECSPACE,Kokkos::View<DATATYPE>::rank,ITYPE> { \
-    enum {value=true}; \
+#define KOKKOS_IMPL_VIEWFILL_ETI_AVAIL(DATATYPE, LAYOUT, EXECSPACE, ITYPE)   \
+  template <>                                                                \
+  struct ViewFillETIAvail<                                                   \
+      Kokkos::View<DATATYPE, LAYOUT,                                         \
+                   Kokkos::Device<EXECSPACE, Kokkos::AnonymousSpace>,        \
+                   Kokkos::MemoryTraits<0>>,                                 \
+      Kokkos::LayoutLeft, EXECSPACE, Kokkos::View<DATATYPE>::rank, ITYPE> {  \
+    enum { value = true };                                                   \
+  };                                                                         \
+  template <>                                                                \
+  struct ViewFillETIAvail<                                                   \
+      Kokkos::View<DATATYPE, LAYOUT,                                         \
+                   Kokkos::Device<EXECSPACE, Kokkos::AnonymousSpace>,        \
+                   Kokkos::MemoryTraits<0>>,                                 \
+      Kokkos::LayoutRight, EXECSPACE, Kokkos::View<DATATYPE>::rank, ITYPE> { \
+    enum { value = true };                                                   \
   };
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
 #ifdef KOKKOS_ENABLE_ETI
 #ifdef KOKKOS_ENABLE_Serial
-#include<Serial/Kokkos_Serial_ViewCopyETIAvail.hpp>
+#include <Serial/Kokkos_Serial_ViewCopyETIAvail.hpp>
 #endif
 #ifdef KOKKOS_ENABLE_OPENMP
-#include<OpenMP/Kokkos_OpenMP_ViewCopyETIAvail.hpp>
+#include <OpenMP/Kokkos_OpenMP_ViewCopyETIAvail.hpp>
 #endif
 #ifdef KOKKOS_ENABLE_THREADS
-#include<Threads/Kokkos_Threads_ViewCopyETIAvail.hpp>
+#include <Threads/Kokkos_Threads_ViewCopyETIAvail.hpp>
 #endif
 #ifdef KOKKOS_ENABLE_CUDA
-#include<Cuda/Kokkos_Cuda_ViewCopyETIAvail.hpp>
+#include <Cuda/Kokkos_Cuda_ViewCopyETIAvail.hpp>
 #endif
 #ifdef KOKKOS_ENABLE_ROCM
-#include<ROCm/Kokkos_ROCm_ViewCopyETIAvail.hpp>
+#include <ROCm/Kokkos_ROCm_ViewCopyETIAvail.hpp>
 #endif
 #endif
 
diff --git a/lib/kokkos/core/src/impl/Kokkos_ViewFillCopyETIDecl.hpp b/lib/kokkos/core/src/impl/Kokkos_ViewFillCopyETIDecl.hpp
index c2905d9119..e23dabd840 100644
--- a/lib/kokkos/core/src/impl/Kokkos_ViewFillCopyETIDecl.hpp
+++ b/lib/kokkos/core/src/impl/Kokkos_ViewFillCopyETIDecl.hpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -47,51 +48,93 @@
 namespace Kokkos {
 namespace Impl {
 
-#define KOKKOS_IMPL_VIEWCOPY_ETI_DECL(DATATYPE,LAYOUTA,LAYOUTB,EXECSPACE,ITYPE) \
-  extern template struct ViewCopy<Kokkos::View<DATATYPE,LAYOUTA,Kokkos::Device<EXECSPACE,Kokkos::AnonymousSpace>,Kokkos::MemoryTraits<0>>, \
-                  Kokkos::View<const DATATYPE,LAYOUTB,Kokkos::Device<EXECSPACE,Kokkos::AnonymousSpace>,Kokkos::MemoryTraits<0>>, \
-                  Kokkos::LayoutLeft,EXECSPACE,Kokkos::View<DATATYPE>::rank,ITYPE,true>; \
-  extern template struct ViewCopy<Kokkos::View<DATATYPE,LAYOUTA,Kokkos::Device<EXECSPACE,Kokkos::AnonymousSpace>,Kokkos::MemoryTraits<0>>, \
-                  Kokkos::View<const DATATYPE,LAYOUTB,Kokkos::Device<EXECSPACE,Kokkos::AnonymousSpace>,Kokkos::MemoryTraits<0>>, \
-                  Kokkos::LayoutRight,EXECSPACE,Kokkos::View<DATATYPE>::rank,ITYPE,true>;
+#define KOKKOS_IMPL_VIEWCOPY_ETI_DECL(DATATYPE, LAYOUTA, LAYOUTB, EXECSPACE, \
+                                      ITYPE)                                 \
+  extern template struct ViewCopy<                                           \
+      Kokkos::View<DATATYPE, LAYOUTA,                                        \
+                   Kokkos::Device<EXECSPACE, Kokkos::AnonymousSpace>,        \
+                   Kokkos::MemoryTraits<0>>,                                 \
+      Kokkos::View<const DATATYPE, LAYOUTB,                                  \
+                   Kokkos::Device<EXECSPACE, Kokkos::AnonymousSpace>,        \
+                   Kokkos::MemoryTraits<0>>,                                 \
+      Kokkos::LayoutLeft, EXECSPACE, Kokkos::View<DATATYPE>::rank, ITYPE,    \
+      true>;                                                                 \
+  extern template struct ViewCopy<                                           \
+      Kokkos::View<DATATYPE, LAYOUTA,                                        \
+                   Kokkos::Device<EXECSPACE, Kokkos::AnonymousSpace>,        \
+                   Kokkos::MemoryTraits<0>>,                                 \
+      Kokkos::View<const DATATYPE, LAYOUTB,                                  \
+                   Kokkos::Device<EXECSPACE, Kokkos::AnonymousSpace>,        \
+                   Kokkos::MemoryTraits<0>>,                                 \
+      Kokkos::LayoutRight, EXECSPACE, Kokkos::View<DATATYPE>::rank, ITYPE,   \
+      true>;
 
-#define KOKKOS_IMPL_VIEWFILL_ETI_DECL(DATATYPE,LAYOUT,EXECSPACE,ITYPE) \
-  extern template struct ViewFill<Kokkos::View<DATATYPE,LAYOUT,Kokkos::Device<EXECSPACE,Kokkos::AnonymousSpace>,Kokkos::MemoryTraits<0>>, \
-                                  Kokkos::LayoutLeft,EXECSPACE,Kokkos::View<DATATYPE>::rank,ITYPE,true>; \
-  extern template struct ViewFill<Kokkos::View<DATATYPE,LAYOUT,Kokkos::Device<EXECSPACE,Kokkos::AnonymousSpace>,Kokkos::MemoryTraits<0>>, \
-                                  Kokkos::LayoutRight,EXECSPACE,Kokkos::View<DATATYPE>::rank,ITYPE,true>;
+#define KOKKOS_IMPL_VIEWFILL_ETI_DECL(DATATYPE, LAYOUT, EXECSPACE, ITYPE)  \
+  extern template struct ViewFill<                                         \
+      Kokkos::View<DATATYPE, LAYOUT,                                       \
+                   Kokkos::Device<EXECSPACE, Kokkos::AnonymousSpace>,      \
+                   Kokkos::MemoryTraits<0>>,                               \
+      Kokkos::LayoutLeft, EXECSPACE, Kokkos::View<DATATYPE>::rank, ITYPE,  \
+      true>;                                                               \
+  extern template struct ViewFill<                                         \
+      Kokkos::View<DATATYPE, LAYOUT,                                       \
+                   Kokkos::Device<EXECSPACE, Kokkos::AnonymousSpace>,      \
+                   Kokkos::MemoryTraits<0>>,                               \
+      Kokkos::LayoutRight, EXECSPACE, Kokkos::View<DATATYPE>::rank, ITYPE, \
+      true>;
 
-#define KOKKOS_IMPL_VIEWCOPY_ETI_INST(DATATYPE,LAYOUTA,LAYOUTB,EXECSPACE,ITYPE) \
-  template struct ViewCopy<Kokkos::View<DATATYPE,LAYOUTA,Kokkos::Device<EXECSPACE,Kokkos::AnonymousSpace>,Kokkos::MemoryTraits<0>>, \
-                  Kokkos::View<const DATATYPE,LAYOUTB,Kokkos::Device<EXECSPACE,Kokkos::AnonymousSpace>,Kokkos::MemoryTraits<0>>, \
-                  Kokkos::LayoutLeft,EXECSPACE,Kokkos::View<DATATYPE>::rank,ITYPE,true>; \
-  template struct ViewCopy<Kokkos::View<DATATYPE,LAYOUTA,Kokkos::Device<EXECSPACE,Kokkos::AnonymousSpace>,Kokkos::MemoryTraits<0>>, \
-                  Kokkos::View<const DATATYPE,LAYOUTB,Kokkos::Device<EXECSPACE,Kokkos::AnonymousSpace>,Kokkos::MemoryTraits<0>>, \
-                  Kokkos::LayoutRight,EXECSPACE,Kokkos::View<DATATYPE>::rank,ITYPE,true>;
+#define KOKKOS_IMPL_VIEWCOPY_ETI_INST(DATATYPE, LAYOUTA, LAYOUTB, EXECSPACE, \
+                                      ITYPE)                                 \
+  template struct ViewCopy<                                                  \
+      Kokkos::View<DATATYPE, LAYOUTA,                                        \
+                   Kokkos::Device<EXECSPACE, Kokkos::AnonymousSpace>,        \
+                   Kokkos::MemoryTraits<0>>,                                 \
+      Kokkos::View<const DATATYPE, LAYOUTB,                                  \
+                   Kokkos::Device<EXECSPACE, Kokkos::AnonymousSpace>,        \
+                   Kokkos::MemoryTraits<0>>,                                 \
+      Kokkos::LayoutLeft, EXECSPACE, Kokkos::View<DATATYPE>::rank, ITYPE,    \
+      true>;                                                                 \
+  template struct ViewCopy<                                                  \
+      Kokkos::View<DATATYPE, LAYOUTA,                                        \
+                   Kokkos::Device<EXECSPACE, Kokkos::AnonymousSpace>,        \
+                   Kokkos::MemoryTraits<0>>,                                 \
+      Kokkos::View<const DATATYPE, LAYOUTB,                                  \
+                   Kokkos::Device<EXECSPACE, Kokkos::AnonymousSpace>,        \
+                   Kokkos::MemoryTraits<0>>,                                 \
+      Kokkos::LayoutRight, EXECSPACE, Kokkos::View<DATATYPE>::rank, ITYPE,   \
+      true>;
 
-#define KOKKOS_IMPL_VIEWFILL_ETI_INST(DATATYPE,LAYOUT,EXECSPACE,ITYPE) \
-  template struct ViewFill<Kokkos::View<DATATYPE,LAYOUT,Kokkos::Device<EXECSPACE,Kokkos::AnonymousSpace>,Kokkos::MemoryTraits<0>>, \
-                                  Kokkos::LayoutLeft,EXECSPACE,Kokkos::View<DATATYPE>::rank,ITYPE,true>; \
-  template struct ViewFill<Kokkos::View<DATATYPE,LAYOUT,Kokkos::Device<EXECSPACE,Kokkos::AnonymousSpace>,Kokkos::MemoryTraits<0>>, \
-                                  Kokkos::LayoutRight,EXECSPACE,Kokkos::View<DATATYPE>::rank,ITYPE,true>;
+#define KOKKOS_IMPL_VIEWFILL_ETI_INST(DATATYPE, LAYOUT, EXECSPACE, ITYPE)  \
+  template struct ViewFill<                                                \
+      Kokkos::View<DATATYPE, LAYOUT,                                       \
+                   Kokkos::Device<EXECSPACE, Kokkos::AnonymousSpace>,      \
+                   Kokkos::MemoryTraits<0>>,                               \
+      Kokkos::LayoutLeft, EXECSPACE, Kokkos::View<DATATYPE>::rank, ITYPE,  \
+      true>;                                                               \
+  template struct ViewFill<                                                \
+      Kokkos::View<DATATYPE, LAYOUT,                                       \
+                   Kokkos::Device<EXECSPACE, Kokkos::AnonymousSpace>,      \
+                   Kokkos::MemoryTraits<0>>,                               \
+      Kokkos::LayoutRight, EXECSPACE, Kokkos::View<DATATYPE>::rank, ITYPE, \
+      true>;
 
-}
-}
+}  // namespace Impl
+}  // namespace Kokkos
 #ifdef KOKKOS_ENABLE_ETI
 #ifdef KOKKOS_ENABLE_Serial
-#include<Serial/Kokkos_Serial_ViewCopyETIDecl.hpp>
+#include <Serial/Kokkos_Serial_ViewCopyETIDecl.hpp>
 #endif
 #ifdef KOKKOS_ENABLE_OPENMP
-#include<OpenMP/Kokkos_OpenMP_ViewCopyETIDecl.hpp>
+#include <OpenMP/Kokkos_OpenMP_ViewCopyETIDecl.hpp>
 #endif
 #ifdef KOKKOS_ENABLE_THREADS
-#include<Threads/Kokkos_Threads_ViewCopyETIDecl.hpp>
+#include <Threads/Kokkos_Threads_ViewCopyETIDecl.hpp>
 #endif
 #ifdef KOKKOS_ENABLE_CUDA
-#include<Cuda/Kokkos_Cuda_ViewCopyETIDecl.hpp>
+#include <Cuda/Kokkos_Cuda_ViewCopyETIDecl.hpp>
 #endif
 #ifdef KOKKOS_ENABLE_ROCM
-#include<ROCm/Kokkos_ROCm_ViewCopyETIDecl.hpp>
+#include <ROCm/Kokkos_ROCm_ViewCopyETIDecl.hpp>
 #endif
 #endif
 #endif
diff --git a/lib/kokkos/core/src/impl/Kokkos_ViewLayoutTiled.hpp b/lib/kokkos/core/src/impl/Kokkos_ViewLayoutTiled.hpp
index a64101110f..2071f931e3 100644
--- a/lib/kokkos/core/src/impl/Kokkos_ViewLayoutTiled.hpp
+++ b/lib/kokkos/core/src/impl/Kokkos_ViewLayoutTiled.hpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -56,53 +57,75 @@ namespace Kokkos {
 
 // View offset and mapping for tiled view's
 
-template < Kokkos::Iterate OuterP, Kokkos::Iterate InnerP, unsigned ArgN0 , unsigned ArgN1 >
-struct is_array_layout < Kokkos::Experimental::LayoutTiled<OuterP, InnerP, ArgN0, ArgN1, 0, 0, 0, 0, 0, 0, true> > : public std::true_type {};
+template <Kokkos::Iterate OuterP, Kokkos::Iterate InnerP, unsigned ArgN0,
+          unsigned ArgN1>
+struct is_array_layout<Kokkos::Experimental::LayoutTiled<
+    OuterP, InnerP, ArgN0, ArgN1, 0, 0, 0, 0, 0, 0, true> >
+    : public std::true_type {};
 
-template < Kokkos::Iterate OuterP, Kokkos::Iterate InnerP, unsigned ArgN0 , unsigned ArgN1 , unsigned ArgN2 >
-struct is_array_layout < Kokkos::Experimental::LayoutTiled<OuterP, InnerP, ArgN0, ArgN1, ArgN2, 0, 0, 0, 0, 0, true> > : public std::true_type {};
+template <Kokkos::Iterate OuterP, Kokkos::Iterate InnerP, unsigned ArgN0,
+          unsigned ArgN1, unsigned ArgN2>
+struct is_array_layout<Kokkos::Experimental::LayoutTiled<
+    OuterP, InnerP, ArgN0, ArgN1, ArgN2, 0, 0, 0, 0, 0, true> >
+    : public std::true_type {};
 
-template < Kokkos::Iterate OuterP, Kokkos::Iterate InnerP, unsigned ArgN0 , unsigned ArgN1 , unsigned ArgN2 ,  unsigned ArgN3 >
-struct is_array_layout < Kokkos::Experimental::LayoutTiled<OuterP, InnerP, ArgN0, ArgN1, ArgN2, ArgN3, 0, 0, 0, 0, true> > : public std::true_type {};
+template <Kokkos::Iterate OuterP, Kokkos::Iterate InnerP, unsigned ArgN0,
+          unsigned ArgN1, unsigned ArgN2, unsigned ArgN3>
+struct is_array_layout<Kokkos::Experimental::LayoutTiled<
+    OuterP, InnerP, ArgN0, ArgN1, ArgN2, ArgN3, 0, 0, 0, 0, true> >
+    : public std::true_type {};
 
-template < Kokkos::Iterate OuterP, Kokkos::Iterate InnerP, unsigned ArgN0 , unsigned ArgN1 , unsigned ArgN2 ,  unsigned ArgN3 ,  unsigned ArgN4 >
-struct is_array_layout < Kokkos::Experimental::LayoutTiled<OuterP, InnerP, ArgN0, ArgN1, ArgN2, ArgN3, ArgN4, 0, 0, 0, true> > : public std::true_type {};
+template <Kokkos::Iterate OuterP, Kokkos::Iterate InnerP, unsigned ArgN0,
+          unsigned ArgN1, unsigned ArgN2, unsigned ArgN3, unsigned ArgN4>
+struct is_array_layout<Kokkos::Experimental::LayoutTiled<
+    OuterP, InnerP, ArgN0, ArgN1, ArgN2, ArgN3, ArgN4, 0, 0, 0, true> >
+    : public std::true_type {};
 
-template < Kokkos::Iterate OuterP, Kokkos::Iterate InnerP, unsigned ArgN0 , unsigned ArgN1 , unsigned ArgN2 ,  unsigned ArgN3 ,  unsigned ArgN4 ,  unsigned ArgN5 >
-struct is_array_layout < Kokkos::Experimental::LayoutTiled<OuterP, InnerP, ArgN0, ArgN1, ArgN2, ArgN3, ArgN4, ArgN5, 0, 0, true> > : public std::true_type {};
+template <Kokkos::Iterate OuterP, Kokkos::Iterate InnerP, unsigned ArgN0,
+          unsigned ArgN1, unsigned ArgN2, unsigned ArgN3, unsigned ArgN4,
+          unsigned ArgN5>
+struct is_array_layout<Kokkos::Experimental::LayoutTiled<
+    OuterP, InnerP, ArgN0, ArgN1, ArgN2, ArgN3, ArgN4, ArgN5, 0, 0, true> >
+    : public std::true_type {};
 
-template < Kokkos::Iterate OuterP, Kokkos::Iterate InnerP, unsigned ArgN0 , unsigned ArgN1 , unsigned ArgN2 ,  unsigned ArgN3 ,  unsigned ArgN4 ,  unsigned ArgN5 ,  unsigned ArgN6 >
-struct is_array_layout < Kokkos::Experimental::LayoutTiled<OuterP, InnerP, ArgN0, ArgN1, ArgN2, ArgN3, ArgN4, ArgN5, ArgN6, 0, true> > : public std::true_type {};
+template <Kokkos::Iterate OuterP, Kokkos::Iterate InnerP, unsigned ArgN0,
+          unsigned ArgN1, unsigned ArgN2, unsigned ArgN3, unsigned ArgN4,
+          unsigned ArgN5, unsigned ArgN6>
+struct is_array_layout<Kokkos::Experimental::LayoutTiled<
+    OuterP, InnerP, ArgN0, ArgN1, ArgN2, ArgN3, ArgN4, ArgN5, ArgN6, 0, true> >
+    : public std::true_type {};
 
-template < Kokkos::Iterate OuterP, Kokkos::Iterate InnerP, unsigned ArgN0 , unsigned ArgN1 , unsigned ArgN2 ,  unsigned ArgN3 ,  unsigned ArgN4 ,  unsigned ArgN5 ,  unsigned ArgN6 ,  unsigned ArgN7 > 
-struct is_array_layout < Kokkos::Experimental::LayoutTiled<OuterP, InnerP, ArgN0, ArgN1, ArgN2, ArgN3, ArgN4, ArgN5, ArgN6, ArgN7, true> > : public std::true_type {};
+template <Kokkos::Iterate OuterP, Kokkos::Iterate InnerP, unsigned ArgN0,
+          unsigned ArgN1, unsigned ArgN2, unsigned ArgN3, unsigned ArgN4,
+          unsigned ArgN5, unsigned ArgN6, unsigned ArgN7>
+struct is_array_layout<
+    Kokkos::Experimental::LayoutTiled<OuterP, InnerP, ArgN0, ArgN1, ArgN2,
+                                      ArgN3, ArgN4, ArgN5, ArgN6, ArgN7, true> >
+    : public std::true_type {};
 
-
-template< class L >
+template <class L>
 struct is_array_layout_tiled : public std::false_type {};
 
-template < Kokkos::Iterate OuterP, Kokkos::Iterate InnerP, unsigned ArgN0 , unsigned ArgN1 , unsigned ArgN2 ,  unsigned ArgN3 ,  unsigned ArgN4 ,  unsigned ArgN5 ,  unsigned ArgN6 , unsigned ArgN7 , bool IsPowerTwo >
-struct is_array_layout_tiled < Kokkos::Experimental::LayoutTiled<OuterP, InnerP, ArgN0, ArgN1, ArgN2, ArgN3, ArgN4, ArgN5, ArgN6, ArgN7, IsPowerTwo> > : public std::true_type {}; // Last template parameter "true" meaning this currently only supports powers-of-two
-
+template <Kokkos::Iterate OuterP, Kokkos::Iterate InnerP, unsigned ArgN0,
+          unsigned ArgN1, unsigned ArgN2, unsigned ArgN3, unsigned ArgN4,
+          unsigned ArgN5, unsigned ArgN6, unsigned ArgN7, bool IsPowerTwo>
+struct is_array_layout_tiled<Kokkos::Experimental::LayoutTiled<
+    OuterP, InnerP, ArgN0, ArgN1, ArgN2, ArgN3, ArgN4, ArgN5, ArgN6, ArgN7,
+    IsPowerTwo> > : public std::true_type {
+};  // Last template parameter "true" meaning this currently only supports
+    // powers-of-two
 
 namespace Impl {
 
-template< class Dimension , class Layout >
-struct ViewOffset< Dimension , Layout ,
-  typename std::enable_if<(
-    ( Dimension::rank <= 8 )
-    &&
-    ( Dimension::rank >= 2 )
-    &&
-    is_array_layout< Layout >::value
-    &&
-    is_array_layout_tiled< Layout >::value
-  )>::type >
-{
-public:
-
-//  enum { outer_pattern = Layout::outer_pattern };
-//  enum { inner_pattern = Layout::inner_pattern };
+template <class Dimension, class Layout>
+struct ViewOffset<
+    Dimension, Layout,
+    typename std::enable_if<((Dimension::rank <= 8) && (Dimension::rank >= 2) &&
+                             is_array_layout<Layout>::value &&
+                             is_array_layout_tiled<Layout>::value)>::type> {
+ public:
+  //  enum { outer_pattern = Layout::outer_pattern };
+  //  enum { inner_pattern = Layout::inner_pattern };
   static constexpr Kokkos::Iterate outer_pattern = Layout::outer_pattern;
   static constexpr Kokkos::Iterate inner_pattern = Layout::inner_pattern;
 
@@ -116,258 +139,484 @@ public:
   enum { SHIFT_5 = Kokkos::Impl::integral_power_of_two(Layout::N5) };
   enum { SHIFT_6 = Kokkos::Impl::integral_power_of_two(Layout::N6) };
   enum { SHIFT_7 = Kokkos::Impl::integral_power_of_two(Layout::N7) };
-  enum { MASK_0  = Layout::N0 - 1 };
-  enum { MASK_1  = Layout::N1 - 1 };
-  enum { MASK_2  = Layout::N2 - 1 };
-  enum { MASK_3  = Layout::N3 - 1 };
-  enum { MASK_4  = Layout::N4 - 1 };
-  enum { MASK_5  = Layout::N5 - 1 };
-  enum { MASK_6  = Layout::N6 - 1 };
-  enum { MASK_7  = Layout::N7 - 1 };
+  enum { MASK_0 = Layout::N0 - 1 };
+  enum { MASK_1 = Layout::N1 - 1 };
+  enum { MASK_2 = Layout::N2 - 1 };
+  enum { MASK_3 = Layout::N3 - 1 };
+  enum { MASK_4 = Layout::N4 - 1 };
+  enum { MASK_5 = Layout::N5 - 1 };
+  enum { MASK_6 = Layout::N6 - 1 };
+  enum { MASK_7 = Layout::N7 - 1 };
 
   enum { SHIFT_2T = SHIFT_0 + SHIFT_1 };
   enum { SHIFT_3T = SHIFT_0 + SHIFT_1 + SHIFT_2 };
   enum { SHIFT_4T = SHIFT_0 + SHIFT_1 + SHIFT_2 + SHIFT_3 };
   enum { SHIFT_5T = SHIFT_0 + SHIFT_1 + SHIFT_2 + SHIFT_3 + SHIFT_4 };
   enum { SHIFT_6T = SHIFT_0 + SHIFT_1 + SHIFT_2 + SHIFT_3 + SHIFT_4 + SHIFT_5 };
-  enum { SHIFT_7T = SHIFT_0 + SHIFT_1 + SHIFT_2 + SHIFT_3 + SHIFT_4 + SHIFT_5 + SHIFT_6 };
-  enum { SHIFT_8T = SHIFT_0 + SHIFT_1 + SHIFT_2 + SHIFT_3 + SHIFT_4 + SHIFT_5 + SHIFT_6 + SHIFT_7 };
+  enum {
+    SHIFT_7T =
+        SHIFT_0 + SHIFT_1 + SHIFT_2 + SHIFT_3 + SHIFT_4 + SHIFT_5 + SHIFT_6
+  };
+  enum {
+    SHIFT_8T = SHIFT_0 + SHIFT_1 + SHIFT_2 + SHIFT_3 + SHIFT_4 + SHIFT_5 +
+               SHIFT_6 + SHIFT_7
+  };
 
   // Is an irregular layout that does not have uniform striding for each index.
-  using is_mapping_plugin = std::true_type ;
-  using is_regular        = std::false_type ;
+  using is_mapping_plugin = std::true_type;
+  using is_regular        = std::false_type;
 
-  typedef size_t     size_type ;
-  typedef Dimension  dimension_type ;
-  typedef Layout     array_layout ;
+  typedef size_t size_type;
+  typedef Dimension dimension_type;
+  typedef Layout array_layout;
 
-  dimension_type m_dim ;
-  size_type      m_tile_N0 ; // Num tiles dim 0
-  size_type      m_tile_N1 ;
-  size_type      m_tile_N2 ;
-  size_type      m_tile_N3 ;
-  size_type      m_tile_N4 ;
-  size_type      m_tile_N5 ;
-  size_type      m_tile_N6 ;
-  size_type      m_tile_N7 ;
+  dimension_type m_dim;
+  size_type m_tile_N0;  // Num tiles dim 0
+  size_type m_tile_N1;
+  size_type m_tile_N2;
+  size_type m_tile_N3;
+  size_type m_tile_N4;
+  size_type m_tile_N5;
+  size_type m_tile_N6;
+  size_type m_tile_N7;
 
   //----------------------------------------
 
 #define DEBUG_OUTPUT_CHECK 0
 
   // Rank 2
-  template< typename I0 , typename I1 >
-  KOKKOS_INLINE_FUNCTION
-  size_type operator()( I0 const & i0 , I1 const & i1 ) const {
-    auto tile_offset = (outer_pattern == (Kokkos::Iterate::Left)) 
-                     ? ( ( (i0>>SHIFT_0) + m_tile_N0*((i1>>SHIFT_1)) ) << SHIFT_2T)
-                     : ( ( (m_tile_N1*(i0>>SHIFT_0) + (i1>>SHIFT_1)) ) << SHIFT_2T) ;
+  template <typename I0, typename I1>
+  KOKKOS_INLINE_FUNCTION size_type operator()(I0 const& i0,
+                                              I1 const& i1) const {
+    auto tile_offset =
+        (outer_pattern == (Kokkos::Iterate::Left))
+            ? (((i0 >> SHIFT_0) + m_tile_N0 * ((i1 >> SHIFT_1))) << SHIFT_2T)
+            : (((m_tile_N1 * (i0 >> SHIFT_0) + (i1 >> SHIFT_1))) << SHIFT_2T);
     //                     ( num_tiles[1] * ti0     +  ti1 ) * FTD
 
-    auto local_offset = (inner_pattern == (Kokkos::Iterate::Left)) 
-                      ? ( (i0 & MASK_0) + ((i1 & MASK_1)<<SHIFT_0) )
-                      : ( ((i0 & MASK_0) << SHIFT_1) + (i1 & MASK_1) ) ;
+    auto local_offset = (inner_pattern == (Kokkos::Iterate::Left))
+                            ? ((i0 & MASK_0) + ((i1 & MASK_1) << SHIFT_0))
+                            : (((i0 & MASK_0) << SHIFT_1) + (i1 & MASK_1));
     //                     ( tile_dim[1] * li0         +  li1 )
 
 #if DEBUG_OUTPUT_CHECK
-    std::cout << "Am I Outer Left? " << (outer_pattern == (Kokkos::Iterate::Left)) << std::endl;
-    std::cout << "Am I Inner Left? " << (inner_pattern == (Kokkos::Iterate::Left)) << std::endl;
-    std::cout << "i0 = " << i0
-      << " i1 = " << i1
-      << "\ntilei0 = " << (i0>>SHIFT_0)
-      << " tilei1 = " << (i1>>SHIFT_1)
-      << "locali0 = " << (i0 & MASK_0)
-      << "\nlocali1 = " << (i1 & MASK_1) 
-      << std::endl;
+    std::cout << "Am I Outer Left? "
+              << (outer_pattern == (Kokkos::Iterate::Left)) << std::endl;
+    std::cout << "Am I Inner Left? "
+              << (inner_pattern == (Kokkos::Iterate::Left)) << std::endl;
+    std::cout << "i0 = " << i0 << " i1 = " << i1
+              << "\ntilei0 = " << (i0 >> SHIFT_0)
+              << " tilei1 = " << (i1 >> SHIFT_1)
+              << "locali0 = " << (i0 & MASK_0)
+              << "\nlocali1 = " << (i1 & MASK_1) << std::endl;
 #endif
 
     return tile_offset + local_offset;
   }
 
   // Rank 3
-  template< typename I0 , typename I1 , typename I2 >
-  KOKKOS_INLINE_FUNCTION
-  size_type operator()( I0 const & i0 , I1 const & i1 , I2 const & i2 ) const {
-    auto tile_offset = (outer_pattern == Kokkos::Iterate::Left) 
-                     ? ( ( (i0>>SHIFT_0) + m_tile_N0*((i1>>SHIFT_1) + m_tile_N1*(i2>>SHIFT_2)) ) << SHIFT_3T)
-                     : ( ( m_tile_N2*(m_tile_N1*(i0>>SHIFT_0) + (i1>>SHIFT_1)) + (i2>>SHIFT_2) ) << SHIFT_3T) ;
+  template <typename I0, typename I1, typename I2>
+  KOKKOS_INLINE_FUNCTION size_type operator()(I0 const& i0, I1 const& i1,
+                                              I2 const& i2) const {
+    auto tile_offset =
+        (outer_pattern == Kokkos::Iterate::Left)
+            ? (((i0 >> SHIFT_0) +
+                m_tile_N0 * ((i1 >> SHIFT_1) + m_tile_N1 * (i2 >> SHIFT_2)))
+               << SHIFT_3T)
+            : ((m_tile_N2 * (m_tile_N1 * (i0 >> SHIFT_0) + (i1 >> SHIFT_1)) +
+                (i2 >> SHIFT_2))
+               << SHIFT_3T);
 
-    auto local_offset = (inner_pattern == Kokkos::Iterate::Left) 
-                      ? ( (i0 & MASK_0) + ((i1 & MASK_1)<<SHIFT_0) + ((i2 & MASK_2)<<(SHIFT_0+SHIFT_1)) )
-                      : ( ((i0 & MASK_0) << (SHIFT_2+SHIFT_1)) + ((i1 & MASK_1) << (SHIFT_2)) + (i2 & MASK_2) ) ;
+    auto local_offset = (inner_pattern == Kokkos::Iterate::Left)
+                            ? ((i0 & MASK_0) + ((i1 & MASK_1) << SHIFT_0) +
+                               ((i2 & MASK_2) << (SHIFT_0 + SHIFT_1)))
+                            : (((i0 & MASK_0) << (SHIFT_2 + SHIFT_1)) +
+                               ((i1 & MASK_1) << (SHIFT_2)) + (i2 & MASK_2));
 
 #if DEBUG_OUTPUT_CHECK
-    std::cout << "Am I Outer Left? " << (outer_pattern == (Kokkos::Iterate::Left)) << std::endl;
-    std::cout << "Am I Inner Left? " << (inner_pattern == (Kokkos::Iterate::Left)) << std::endl;
-    std::cout << "i0 = " << i0
-      << " i1 = " << i1
-      << " i2 = " << i2
-      << "\ntilei0 = " << (i0>>SHIFT_0)
-      << " tilei1 = " << (i1>>SHIFT_1)
-      << " tilei2 = " << (i2>>SHIFT_2)
-      << "\nlocali0 = " << (i0 & MASK_0)
-      << "locali1 = " << (i1 & MASK_1)
-      << "locali2 = " << (i2 & MASK_2)
-      << std::endl;
+    std::cout << "Am I Outer Left? "
+              << (outer_pattern == (Kokkos::Iterate::Left)) << std::endl;
+    std::cout << "Am I Inner Left? "
+              << (inner_pattern == (Kokkos::Iterate::Left)) << std::endl;
+    std::cout << "i0 = " << i0 << " i1 = " << i1 << " i2 = " << i2
+              << "\ntilei0 = " << (i0 >> SHIFT_0)
+              << " tilei1 = " << (i1 >> SHIFT_1)
+              << " tilei2 = " << (i2 >> SHIFT_2)
+              << "\nlocali0 = " << (i0 & MASK_0)
+              << "locali1 = " << (i1 & MASK_1) << "locali2 = " << (i2 & MASK_2)
+              << std::endl;
 #endif
 
     return tile_offset + local_offset;
   }
 
   // Rank 4
-  template< typename I0 , typename I1 , typename I2 , typename I3 >
-  KOKKOS_INLINE_FUNCTION
-  size_type operator()( I0 const & i0 , I1 const & i1 , I2 const & i2 , I3 const & i3 ) const {
-    auto tile_offset = (outer_pattern == Kokkos::Iterate::Left) 
-                     ? ( ( (i0>>SHIFT_0) + m_tile_N0*((i1>>SHIFT_1) + m_tile_N1*((i2>>SHIFT_2) + m_tile_N2*(i3>>SHIFT_3))) ) << SHIFT_4T)
-                     : ( ( m_tile_N3*(m_tile_N2*(m_tile_N1*(i0>>SHIFT_0) + (i1>>SHIFT_1)) + (i2>>SHIFT_2)) + (i3>>SHIFT_3) ) << SHIFT_4T) ;
+  template <typename I0, typename I1, typename I2, typename I3>
+  KOKKOS_INLINE_FUNCTION size_type operator()(I0 const& i0, I1 const& i1,
+                                              I2 const& i2,
+                                              I3 const& i3) const {
+    auto tile_offset =
+        (outer_pattern == Kokkos::Iterate::Left)
+            ? (((i0 >> SHIFT_0) +
+                m_tile_N0 * ((i1 >> SHIFT_1) +
+                             m_tile_N1 * ((i2 >> SHIFT_2) +
+                                          m_tile_N2 * (i3 >> SHIFT_3))))
+               << SHIFT_4T)
+            : ((m_tile_N3 * (m_tile_N2 * (m_tile_N1 * (i0 >> SHIFT_0) +
+                                          (i1 >> SHIFT_1)) +
+                             (i2 >> SHIFT_2)) +
+                (i3 >> SHIFT_3))
+               << SHIFT_4T);
 
-    auto local_offset = (inner_pattern == Kokkos::Iterate::Left) 
-                      ? ( (i0 & MASK_0) + ((i1 & MASK_1)<<SHIFT_0) + ((i2 & MASK_2)<<(SHIFT_0+SHIFT_1)) + ((i3 & MASK_3)<<(SHIFT_0+SHIFT_1+SHIFT_2)) )
-                      : ( ((i0 & MASK_0) << (SHIFT_3+SHIFT_2+SHIFT_1)) + ((i1 & MASK_1) << (SHIFT_3+SHIFT_2)) + ((i2 & MASK_2)<<(SHIFT_3)) + (i3 & MASK_3) ) ;
+    auto local_offset =
+        (inner_pattern == Kokkos::Iterate::Left)
+            ? ((i0 & MASK_0) + ((i1 & MASK_1) << SHIFT_0) +
+               ((i2 & MASK_2) << (SHIFT_0 + SHIFT_1)) +
+               ((i3 & MASK_3) << (SHIFT_0 + SHIFT_1 + SHIFT_2)))
+            : (((i0 & MASK_0) << (SHIFT_3 + SHIFT_2 + SHIFT_1)) +
+               ((i1 & MASK_1) << (SHIFT_3 + SHIFT_2)) +
+               ((i2 & MASK_2) << (SHIFT_3)) + (i3 & MASK_3));
 
     return tile_offset + local_offset;
   }
 
   // Rank 5
-  template< typename I0 , typename I1 , typename I2 , typename I3 , typename I4 >
-  KOKKOS_INLINE_FUNCTION
-  size_type operator()( I0 const & i0 , I1 const & i1 , I2 const & i2 , I3 const & i3 , I4 const & i4 ) const {
-    auto tile_offset = (outer_pattern == Kokkos::Iterate::Left) 
-                     ? ( ( (i0>>SHIFT_0) + m_tile_N0*((i1>>SHIFT_1) + m_tile_N1*((i2>>SHIFT_2) + m_tile_N2*((i3>>SHIFT_3) + m_tile_N3*(i4>>SHIFT_4)))) ) << SHIFT_5T)
-                     : ( ( m_tile_N4*(m_tile_N3*(m_tile_N2*(m_tile_N1*(i0>>SHIFT_0) + (i1>>SHIFT_1)) + (i2>>SHIFT_2)) + (i3>>SHIFT_3)) + (i4>>SHIFT_4) ) << SHIFT_5T) ;
+  template <typename I0, typename I1, typename I2, typename I3, typename I4>
+  KOKKOS_INLINE_FUNCTION size_type operator()(I0 const& i0, I1 const& i1,
+                                              I2 const& i2, I3 const& i3,
+                                              I4 const& i4) const {
+    auto tile_offset =
+        (outer_pattern == Kokkos::Iterate::Left)
+            ? (((i0 >> SHIFT_0) +
+                m_tile_N0 *
+                    ((i1 >> SHIFT_1) +
+                     m_tile_N1 * ((i2 >> SHIFT_2) +
+                                  m_tile_N2 * ((i3 >> SHIFT_3) +
+                                               m_tile_N3 * (i4 >> SHIFT_4)))))
+               << SHIFT_5T)
+            : ((m_tile_N4 *
+                    (m_tile_N3 * (m_tile_N2 * (m_tile_N1 * (i0 >> SHIFT_0) +
+                                               (i1 >> SHIFT_1)) +
+                                  (i2 >> SHIFT_2)) +
+                     (i3 >> SHIFT_3)) +
+                (i4 >> SHIFT_4))
+               << SHIFT_5T);
 
-    auto local_offset = (inner_pattern == Kokkos::Iterate::Left) 
-                      ? ( (i0 & MASK_0) + ((i1 & MASK_1)<<SHIFT_0) + ((i2 & MASK_2)<<(SHIFT_0+SHIFT_1)) + ((i3 & MASK_3)<<(SHIFT_0+SHIFT_1+SHIFT_2)) + ((i4 & MASK_4)<<(SHIFT_0+SHIFT_1+SHIFT_2+SHIFT_3)) )
-                      : ( ((i0 & MASK_0) << (SHIFT_4+SHIFT_3+SHIFT_2+SHIFT_1)) + ((i1 & MASK_1) << (SHIFT_4+SHIFT_3+SHIFT_2)) + ((i2 & MASK_2)<<(SHIFT_4+SHIFT_3)) + ((i3 & MASK_3)<<(SHIFT_4)) + (i4 & MASK_4) ) ;
+    auto local_offset =
+        (inner_pattern == Kokkos::Iterate::Left)
+            ? ((i0 & MASK_0) + ((i1 & MASK_1) << SHIFT_0) +
+               ((i2 & MASK_2) << (SHIFT_0 + SHIFT_1)) +
+               ((i3 & MASK_3) << (SHIFT_0 + SHIFT_1 + SHIFT_2)) +
+               ((i4 & MASK_4) << (SHIFT_0 + SHIFT_1 + SHIFT_2 + SHIFT_3)))
+            : (((i0 & MASK_0) << (SHIFT_4 + SHIFT_3 + SHIFT_2 + SHIFT_1)) +
+               ((i1 & MASK_1) << (SHIFT_4 + SHIFT_3 + SHIFT_2)) +
+               ((i2 & MASK_2) << (SHIFT_4 + SHIFT_3)) +
+               ((i3 & MASK_3) << (SHIFT_4)) + (i4 & MASK_4));
 
     return tile_offset + local_offset;
   }
 
   // Rank 6
-  template< typename I0 , typename I1 , typename I2 , typename I3 , typename I4 , typename I5 >
-  KOKKOS_INLINE_FUNCTION
-  size_type operator()( I0 const & i0 , I1 const & i1 , I2 const & i2 , I3 const & i3 , I4 const & i4 , I5 const & i5 ) const {
-    auto tile_offset = (outer_pattern == Kokkos::Iterate::Left) 
-                     ? ( ( (i0>>SHIFT_0) + m_tile_N0*((i1>>SHIFT_1) + m_tile_N1*((i2>>SHIFT_2) + m_tile_N2*((i3>>SHIFT_3) + m_tile_N3*((i4>>SHIFT_4) + m_tile_N4*(i5>>SHIFT_5))))) ) << SHIFT_6T)
-                     : ( ( m_tile_N5*(m_tile_N4*(m_tile_N3*(m_tile_N2*(m_tile_N1*(i0>>SHIFT_0) + (i1>>SHIFT_1)) + (i2>>SHIFT_2)) + (i3>>SHIFT_3)) + (i4>>SHIFT_4)) + (i5>>SHIFT_5) ) << SHIFT_6T) ;
+  template <typename I0, typename I1, typename I2, typename I3, typename I4,
+            typename I5>
+  KOKKOS_INLINE_FUNCTION size_type operator()(I0 const& i0, I1 const& i1,
+                                              I2 const& i2, I3 const& i3,
+                                              I4 const& i4,
+                                              I5 const& i5) const {
+    auto tile_offset =
+        (outer_pattern == Kokkos::Iterate::Left)
+            ? (((i0 >> SHIFT_0) +
+                m_tile_N0 *
+                    ((i1 >> SHIFT_1) +
+                     m_tile_N1 *
+                         ((i2 >> SHIFT_2) +
+                          m_tile_N2 *
+                              ((i3 >> SHIFT_3) +
+                               m_tile_N3 * ((i4 >> SHIFT_4) +
+                                            m_tile_N4 * (i5 >> SHIFT_5))))))
+               << SHIFT_6T)
+            : ((m_tile_N5 *
+                    (m_tile_N4 *
+                         (m_tile_N3 *
+                              (m_tile_N2 * (m_tile_N1 * (i0 >> SHIFT_0) +
+                                            (i1 >> SHIFT_1)) +
+                               (i2 >> SHIFT_2)) +
+                          (i3 >> SHIFT_3)) +
+                     (i4 >> SHIFT_4)) +
+                (i5 >> SHIFT_5))
+               << SHIFT_6T);
 
-    auto local_offset = (inner_pattern == Kokkos::Iterate::Left) 
-                      ? ( (i0 & MASK_0) + ((i1 & MASK_1)<<SHIFT_0) + ((i2 & MASK_2)<<(SHIFT_0+SHIFT_1)) + ((i3 & MASK_3)<<(SHIFT_0+SHIFT_1+SHIFT_2)) + ((i4 & MASK_4)<<(SHIFT_0+SHIFT_1+SHIFT_2+SHIFT_3)) + ((i5 & MASK_5)<<(SHIFT_0+SHIFT_1+SHIFT_2+SHIFT_3+SHIFT_4)) )
-                      : ( ((i0 & MASK_0) << (SHIFT_5+SHIFT_4+SHIFT_3+SHIFT_2+SHIFT_1)) + ((i1 & MASK_1) << (SHIFT_5+SHIFT_4+SHIFT_3+SHIFT_2)) + ((i2 & MASK_2)<<(SHIFT_5+SHIFT_4+SHIFT_3)) + ((i3 & MASK_3)<<(SHIFT_5+SHIFT_4)) + ((i4 & MASK_4)<<(SHIFT_5)) + (i5 & MASK_5) ) ;
+    auto local_offset =
+        (inner_pattern == Kokkos::Iterate::Left)
+            ? ((i0 & MASK_0) + ((i1 & MASK_1) << SHIFT_0) +
+               ((i2 & MASK_2) << (SHIFT_0 + SHIFT_1)) +
+               ((i3 & MASK_3) << (SHIFT_0 + SHIFT_1 + SHIFT_2)) +
+               ((i4 & MASK_4) << (SHIFT_0 + SHIFT_1 + SHIFT_2 + SHIFT_3)) +
+               ((i5 & MASK_5)
+                << (SHIFT_0 + SHIFT_1 + SHIFT_2 + SHIFT_3 + SHIFT_4)))
+            : (((i0 & MASK_0)
+                << (SHIFT_5 + SHIFT_4 + SHIFT_3 + SHIFT_2 + SHIFT_1)) +
+               ((i1 & MASK_1) << (SHIFT_5 + SHIFT_4 + SHIFT_3 + SHIFT_2)) +
+               ((i2 & MASK_2) << (SHIFT_5 + SHIFT_4 + SHIFT_3)) +
+               ((i3 & MASK_3) << (SHIFT_5 + SHIFT_4)) +
+               ((i4 & MASK_4) << (SHIFT_5)) + (i5 & MASK_5));
 
     return tile_offset + local_offset;
   }
 
   // Rank 7
-  template< typename I0 , typename I1 , typename I2 , typename I3 , typename I4 , typename I5 , typename I6 >
-  KOKKOS_INLINE_FUNCTION
-  size_type operator()( I0 const & i0 , I1 const & i1 , I2 const & i2 , I3 const & i3 , I4 const & i4 , I5 const & i5 , I6 const & i6 ) const {
-    auto tile_offset = (outer_pattern == Kokkos::Iterate::Left) 
-                     ? ( ( (i0>>SHIFT_0) + m_tile_N0*((i1>>SHIFT_1) + m_tile_N1*((i2>>SHIFT_2) + m_tile_N2*((i3>>SHIFT_3) + m_tile_N3*((i4>>SHIFT_4) + m_tile_N4*((i5>>SHIFT_5) + m_tile_N5*(i6>>SHIFT_6)))))) ) << SHIFT_7T)
-                     : ( ( m_tile_N6*(m_tile_N5*(m_tile_N4*(m_tile_N3*(m_tile_N2*(m_tile_N1*(i0>>SHIFT_0) + (i1>>SHIFT_1)) + (i2>>SHIFT_2)) + (i3>>SHIFT_3)) + (i4>>SHIFT_4)) + (i5>>SHIFT_5)) + (i6>>SHIFT_6) ) << SHIFT_7T) ;
+  template <typename I0, typename I1, typename I2, typename I3, typename I4,
+            typename I5, typename I6>
+  KOKKOS_INLINE_FUNCTION size_type operator()(I0 const& i0, I1 const& i1,
+                                              I2 const& i2, I3 const& i3,
+                                              I4 const& i4, I5 const& i5,
+                                              I6 const& i6) const {
+    auto tile_offset =
+        (outer_pattern == Kokkos::Iterate::Left)
+            ? (((i0 >> SHIFT_0) +
+                m_tile_N0 *
+                    ((i1 >> SHIFT_1) +
+                     m_tile_N1 *
+                         ((i2 >> SHIFT_2) +
+                          m_tile_N2 *
+                              ((i3 >> SHIFT_3) +
+                               m_tile_N3 *
+                                   ((i4 >> SHIFT_4) +
+                                    m_tile_N4 *
+                                        ((i5 >> SHIFT_5) +
+                                         m_tile_N5 * (i6 >> SHIFT_6)))))))
+               << SHIFT_7T)
+            : ((m_tile_N6 *
+                    (m_tile_N5 *
+                         (m_tile_N4 *
+                              (m_tile_N3 *
+                                   (m_tile_N2 * (m_tile_N1 * (i0 >> SHIFT_0) +
+                                                 (i1 >> SHIFT_1)) +
+                                    (i2 >> SHIFT_2)) +
+                               (i3 >> SHIFT_3)) +
+                          (i4 >> SHIFT_4)) +
+                     (i5 >> SHIFT_5)) +
+                (i6 >> SHIFT_6))
+               << SHIFT_7T);
 
-    auto local_offset = (inner_pattern == Kokkos::Iterate::Left) 
-                      ? ( (i0 & MASK_0) + ((i1 & MASK_1)<<SHIFT_0) + ((i2 & MASK_2)<<(SHIFT_0+SHIFT_1)) + ((i3 & MASK_3)<<(SHIFT_0+SHIFT_1+SHIFT_2)) + ((i4 & MASK_4)<<(SHIFT_0+SHIFT_1+SHIFT_2+SHIFT_3)) + ((i5 & MASK_5)<<(SHIFT_0+SHIFT_1+SHIFT_2+SHIFT_3+SHIFT_4)) + ((i6 & MASK_6)<<(SHIFT_0+SHIFT_1+SHIFT_2+SHIFT_3+SHIFT_4+SHIFT_5)) )
-                      : ( ((i0 & MASK_0) << (SHIFT_6+SHIFT_5+SHIFT_4+SHIFT_3+SHIFT_2+SHIFT_1)) + ((i1 & MASK_1) << (SHIFT_6+SHIFT_5+SHIFT_4+SHIFT_3+SHIFT_2)) + ((i2 & MASK_2)<<(SHIFT_6+SHIFT_5+SHIFT_4+SHIFT_3)) + ((i3 & MASK_3)<<(SHIFT_6+SHIFT_5+SHIFT_4)) + ((i4 & MASK_4)<<(SHIFT_6+SHIFT_5)) + ((i5 & MASK_5)<<(SHIFT_6)) + (i6 & MASK_6) ) ;
+    auto local_offset =
+        (inner_pattern == Kokkos::Iterate::Left)
+            ? ((i0 & MASK_0) + ((i1 & MASK_1) << SHIFT_0) +
+               ((i2 & MASK_2) << (SHIFT_0 + SHIFT_1)) +
+               ((i3 & MASK_3) << (SHIFT_0 + SHIFT_1 + SHIFT_2)) +
+               ((i4 & MASK_4) << (SHIFT_0 + SHIFT_1 + SHIFT_2 + SHIFT_3)) +
+               ((i5 & MASK_5)
+                << (SHIFT_0 + SHIFT_1 + SHIFT_2 + SHIFT_3 + SHIFT_4)) +
+               ((i6 & MASK_6)
+                << (SHIFT_0 + SHIFT_1 + SHIFT_2 + SHIFT_3 + SHIFT_4 + SHIFT_5)))
+            : (((i0 & MASK_0) << (SHIFT_6 + SHIFT_5 + SHIFT_4 + SHIFT_3 +
+                                  SHIFT_2 + SHIFT_1)) +
+               ((i1 & MASK_1)
+                << (SHIFT_6 + SHIFT_5 + SHIFT_4 + SHIFT_3 + SHIFT_2)) +
+               ((i2 & MASK_2) << (SHIFT_6 + SHIFT_5 + SHIFT_4 + SHIFT_3)) +
+               ((i3 & MASK_3) << (SHIFT_6 + SHIFT_5 + SHIFT_4)) +
+               ((i4 & MASK_4) << (SHIFT_6 + SHIFT_5)) +
+               ((i5 & MASK_5) << (SHIFT_6)) + (i6 & MASK_6));
 
     return tile_offset + local_offset;
   }
 
   // Rank 8
-  template< typename I0 , typename I1 , typename I2 , typename I3 , typename I4 , typename I5 , typename I6 , typename I7 >
-  KOKKOS_INLINE_FUNCTION
-  size_type operator()( I0 const & i0 , I1 const & i1 , I2 const & i2 , I3 const & i3 , I4 const & i4 , I5 const & i5 , I6 const & i6 , I7 const & i7 ) const {
-    auto tile_offset = (outer_pattern == Kokkos::Iterate::Left) 
-                     ? ( ( (i0>>SHIFT_0) + m_tile_N0*((i1>>SHIFT_1) + m_tile_N1*((i2>>SHIFT_2) + m_tile_N2*((i3>>SHIFT_3) + m_tile_N3*((i4>>SHIFT_4) + m_tile_N4*((i5>>SHIFT_5) + m_tile_N5*((i6>>SHIFT_6) + m_tile_N6*(i7>>SHIFT_7))))))) ) << SHIFT_8T)
-                     : ( ( m_tile_N7*(m_tile_N6*(m_tile_N5*(m_tile_N4*(m_tile_N3*(m_tile_N2*(m_tile_N1*(i0>>SHIFT_0) + (i1>>SHIFT_1)) + (i2>>SHIFT_2)) + (i3>>SHIFT_3)) + (i4>>SHIFT_4)) + (i5>>SHIFT_5)) + (i6>>SHIFT_6)) + (i7>>SHIFT_7) ) << SHIFT_8T) ;
+  template <typename I0, typename I1, typename I2, typename I3, typename I4,
+            typename I5, typename I6, typename I7>
+  KOKKOS_INLINE_FUNCTION size_type operator()(I0 const& i0, I1 const& i1,
+                                              I2 const& i2, I3 const& i3,
+                                              I4 const& i4, I5 const& i5,
+                                              I6 const& i6,
+                                              I7 const& i7) const {
+    auto tile_offset =
+        (outer_pattern == Kokkos::Iterate::Left)
+            ? (((i0 >> SHIFT_0) +
+                m_tile_N0 *
+                    ((i1 >> SHIFT_1) +
+                     m_tile_N1 *
+                         ((i2 >> SHIFT_2) +
+                          m_tile_N2 *
+                              ((i3 >> SHIFT_3) +
+                               m_tile_N3 *
+                                   ((i4 >> SHIFT_4) +
+                                    m_tile_N4 *
+                                        ((i5 >> SHIFT_5) +
+                                         m_tile_N5 *
+                                             ((i6 >> SHIFT_6) +
+                                              m_tile_N6 * (i7 >> SHIFT_7))))))))
+               << SHIFT_8T)
+            : ((m_tile_N7 *
+                    (m_tile_N6 *
+                         (m_tile_N5 *
+                              (m_tile_N4 *
+                                   (m_tile_N3 *
+                                        (m_tile_N2 *
+                                             (m_tile_N1 * (i0 >> SHIFT_0) +
+                                              (i1 >> SHIFT_1)) +
+                                         (i2 >> SHIFT_2)) +
+                                    (i3 >> SHIFT_3)) +
+                               (i4 >> SHIFT_4)) +
+                          (i5 >> SHIFT_5)) +
+                     (i6 >> SHIFT_6)) +
+                (i7 >> SHIFT_7))
+               << SHIFT_8T);
 
-    auto local_offset = (inner_pattern == Kokkos::Iterate::Left) 
-                      ? ( (i0 & MASK_0) + ((i1 & MASK_1)<<SHIFT_0) + ((i2 & MASK_2)<<(SHIFT_0+SHIFT_1)) + ((i3 & MASK_3)<<(SHIFT_0+SHIFT_1+SHIFT_2)) + ((i4 & MASK_4)<<(SHIFT_0+SHIFT_1+SHIFT_2+SHIFT_3)) + ((i5 & MASK_5)<<(SHIFT_0+SHIFT_1+SHIFT_2+SHIFT_3+SHIFT_4)) + ((i6 & MASK_6)<<(SHIFT_0+SHIFT_1+SHIFT_2+SHIFT_3+SHIFT_4+SHIFT_5)) + ((i7 & MASK_7)<<(SHIFT_0+SHIFT_1+SHIFT_2+SHIFT_3+SHIFT_4+SHIFT_5+SHIFT_6)) )
-                      : ( ((i0 & MASK_0) << (SHIFT_7+SHIFT_6+SHIFT_5+SHIFT_4+SHIFT_3+SHIFT_2+SHIFT_1)) + ((i1 & MASK_1) << (SHIFT_7+SHIFT_6+SHIFT_5+SHIFT_4+SHIFT_3+SHIFT_2)) + ((i2 & MASK_2)<<(SHIFT_7+SHIFT_6+SHIFT_5+SHIFT_4+SHIFT_3)) + ((i3 & MASK_3)<<(SHIFT_7+SHIFT_6+SHIFT_5+SHIFT_4)) + ((i4 & MASK_4)<<(SHIFT_7+SHIFT_6+SHIFT_5)) + ((i5 & MASK_5)<<(SHIFT_7+SHIFT_6)) + ((i6 & MASK_6)<<(SHIFT_7)) + (i7 & MASK_7) ) ;
+    auto local_offset =
+        (inner_pattern == Kokkos::Iterate::Left)
+            ? ((i0 & MASK_0) + ((i1 & MASK_1) << SHIFT_0) +
+               ((i2 & MASK_2) << (SHIFT_0 + SHIFT_1)) +
+               ((i3 & MASK_3) << (SHIFT_0 + SHIFT_1 + SHIFT_2)) +
+               ((i4 & MASK_4) << (SHIFT_0 + SHIFT_1 + SHIFT_2 + SHIFT_3)) +
+               ((i5 & MASK_5)
+                << (SHIFT_0 + SHIFT_1 + SHIFT_2 + SHIFT_3 + SHIFT_4)) +
+               ((i6 & MASK_6) << (SHIFT_0 + SHIFT_1 + SHIFT_2 + SHIFT_3 +
+                                  SHIFT_4 + SHIFT_5)) +
+               ((i7 & MASK_7) << (SHIFT_0 + SHIFT_1 + SHIFT_2 + SHIFT_3 +
+                                  SHIFT_4 + SHIFT_5 + SHIFT_6)))
+            : (((i0 & MASK_0) << (SHIFT_7 + SHIFT_6 + SHIFT_5 + SHIFT_4 +
+                                  SHIFT_3 + SHIFT_2 + SHIFT_1)) +
+               ((i1 & MASK_1) << (SHIFT_7 + SHIFT_6 + SHIFT_5 + SHIFT_4 +
+                                  SHIFT_3 + SHIFT_2)) +
+               ((i2 & MASK_2)
+                << (SHIFT_7 + SHIFT_6 + SHIFT_5 + SHIFT_4 + SHIFT_3)) +
+               ((i3 & MASK_3) << (SHIFT_7 + SHIFT_6 + SHIFT_5 + SHIFT_4)) +
+               ((i4 & MASK_4) << (SHIFT_7 + SHIFT_6 + SHIFT_5)) +
+               ((i5 & MASK_5) << (SHIFT_7 + SHIFT_6)) +
+               ((i6 & MASK_6) << (SHIFT_7)) + (i7 & MASK_7));
 
     return tile_offset + local_offset;
   }
 
   //----------------------------------------
 
-  KOKKOS_INLINE_FUNCTION constexpr
-  array_layout layout() const
-    { return array_layout( m_dim.N0 , m_dim.N1 , m_dim.N2 , m_dim.N2  , m_dim.N3  , m_dim.N4  , m_dim.N5  , m_dim.N6  , m_dim.N7 ); }
+  KOKKOS_INLINE_FUNCTION constexpr array_layout layout() const {
+    return array_layout(m_dim.N0, m_dim.N1, m_dim.N2, m_dim.N2, m_dim.N3,
+                        m_dim.N4, m_dim.N5, m_dim.N6, m_dim.N7);
+  }
 
-  KOKKOS_INLINE_FUNCTION constexpr size_type dimension_0() const { return m_dim.N0 ; }
-  KOKKOS_INLINE_FUNCTION constexpr size_type dimension_1() const { return m_dim.N1 ; }
-  KOKKOS_INLINE_FUNCTION constexpr size_type dimension_2() const { return m_dim.N2 ; }
-  KOKKOS_INLINE_FUNCTION constexpr size_type dimension_3() const { return m_dim.N3 ; }
-  KOKKOS_INLINE_FUNCTION constexpr size_type dimension_4() const { return m_dim.N4 ; }
-  KOKKOS_INLINE_FUNCTION constexpr size_type dimension_5() const { return m_dim.N5 ; }
-  KOKKOS_INLINE_FUNCTION constexpr size_type dimension_6() const { return m_dim.N6 ; }
-  KOKKOS_INLINE_FUNCTION constexpr size_type dimension_7() const { return m_dim.N7 ; }
+  KOKKOS_INLINE_FUNCTION constexpr size_type dimension_0() const {
+    return m_dim.N0;
+  }
+  KOKKOS_INLINE_FUNCTION constexpr size_type dimension_1() const {
+    return m_dim.N1;
+  }
+  KOKKOS_INLINE_FUNCTION constexpr size_type dimension_2() const {
+    return m_dim.N2;
+  }
+  KOKKOS_INLINE_FUNCTION constexpr size_type dimension_3() const {
+    return m_dim.N3;
+  }
+  KOKKOS_INLINE_FUNCTION constexpr size_type dimension_4() const {
+    return m_dim.N4;
+  }
+  KOKKOS_INLINE_FUNCTION constexpr size_type dimension_5() const {
+    return m_dim.N5;
+  }
+  KOKKOS_INLINE_FUNCTION constexpr size_type dimension_6() const {
+    return m_dim.N6;
+  }
+  KOKKOS_INLINE_FUNCTION constexpr size_type dimension_7() const {
+    return m_dim.N7;
+  }
 
-  KOKKOS_INLINE_FUNCTION constexpr size_type size() const { return m_dim.N0 * m_dim.N1 * m_dim.N2 * m_dim.N3 * m_dim.N4 * m_dim.N5 * m_dim.N6 * m_dim.N7 ; }
+  KOKKOS_INLINE_FUNCTION constexpr size_type size() const {
+    return m_dim.N0 * m_dim.N1 * m_dim.N2 * m_dim.N3 * m_dim.N4 * m_dim.N5 *
+           m_dim.N6 * m_dim.N7;
+  }
 
   // Strides are meaningless due to irregularity
-  KOKKOS_INLINE_FUNCTION constexpr size_type stride_0() const { return 0 ; }
-  KOKKOS_INLINE_FUNCTION constexpr size_type stride_1() const { return 0 ; }
-  KOKKOS_INLINE_FUNCTION constexpr size_type stride_2() const { return 0 ; }
-  KOKKOS_INLINE_FUNCTION constexpr size_type stride_3() const { return 0 ; }
-  KOKKOS_INLINE_FUNCTION constexpr size_type stride_4() const { return 0 ; }
-  KOKKOS_INLINE_FUNCTION constexpr size_type stride_5() const { return 0 ; }
-  KOKKOS_INLINE_FUNCTION constexpr size_type stride_6() const { return 0 ; }
-  KOKKOS_INLINE_FUNCTION constexpr size_type stride_7() const { return 0 ; }
+  KOKKOS_INLINE_FUNCTION constexpr size_type stride_0() const { return 0; }
+  KOKKOS_INLINE_FUNCTION constexpr size_type stride_1() const { return 0; }
+  KOKKOS_INLINE_FUNCTION constexpr size_type stride_2() const { return 0; }
+  KOKKOS_INLINE_FUNCTION constexpr size_type stride_3() const { return 0; }
+  KOKKOS_INLINE_FUNCTION constexpr size_type stride_4() const { return 0; }
+  KOKKOS_INLINE_FUNCTION constexpr size_type stride_5() const { return 0; }
+  KOKKOS_INLINE_FUNCTION constexpr size_type stride_6() const { return 0; }
+  KOKKOS_INLINE_FUNCTION constexpr size_type stride_7() const { return 0; }
 
   // Stride with [ rank ] value is the total length
-  template< typename iType >
-  KOKKOS_INLINE_FUNCTION
-  void stride( iType * const s ) const
-    {
-      s[0] = 0 ;
-      if ( 0 < dimension_type::rank ) { s[1] = 0 ; }
-      if ( 1 < dimension_type::rank ) { s[2] = 0 ; }
-      if ( 2 < dimension_type::rank ) { s[3] = 0 ; }
-      if ( 3 < dimension_type::rank ) { s[4] = 0 ; }
-      if ( 4 < dimension_type::rank ) { s[5] = 0 ; }
-      if ( 5 < dimension_type::rank ) { s[6] = 0 ; }
-      if ( 6 < dimension_type::rank ) { s[7] = 0 ; }
-      if ( 7 < dimension_type::rank ) { s[8] = 0 ; }
+  template <typename iType>
+  KOKKOS_INLINE_FUNCTION void stride(iType* const s) const {
+    s[0] = 0;
+    if (0 < dimension_type::rank) {
+      s[1] = 0;
     }
+    if (1 < dimension_type::rank) {
+      s[2] = 0;
+    }
+    if (2 < dimension_type::rank) {
+      s[3] = 0;
+    }
+    if (3 < dimension_type::rank) {
+      s[4] = 0;
+    }
+    if (4 < dimension_type::rank) {
+      s[5] = 0;
+    }
+    if (5 < dimension_type::rank) {
+      s[6] = 0;
+    }
+    if (6 < dimension_type::rank) {
+      s[7] = 0;
+    }
+    if (7 < dimension_type::rank) {
+      s[8] = 0;
+    }
+  }
 
-  KOKKOS_INLINE_FUNCTION constexpr size_type span() const
-    {
-      // Rank2: ( NumTile0 * ( NumTile1 ) ) * TileSize, etc
-      return   ( VORank == 2 ) ? ( m_tile_N0 * m_tile_N1 ) << SHIFT_2T
-             : ( VORank == 3 ) ? ( m_tile_N0 * m_tile_N1 * m_tile_N2 ) << SHIFT_3T
-             : ( VORank == 4 ) ? ( m_tile_N0 * m_tile_N1 * m_tile_N2 * m_tile_N3 ) << SHIFT_4T
-             : ( VORank == 5 ) ? ( m_tile_N0 * m_tile_N1 * m_tile_N2 * m_tile_N3 * m_tile_N4 ) << SHIFT_5T
-             : ( VORank == 6 ) ? ( m_tile_N0 * m_tile_N1 * m_tile_N2 * m_tile_N3 * m_tile_N4 * m_tile_N5 ) << SHIFT_6T
-             : ( VORank == 7 ) ? ( m_tile_N0 * m_tile_N1 * m_tile_N2 * m_tile_N3 * m_tile_N4 * m_tile_N5 * m_tile_N6 ) << SHIFT_7T
-             : ( m_tile_N0 * m_tile_N1 * m_tile_N2 * m_tile_N3 * m_tile_N4 * m_tile_N5 * m_tile_N6 * m_tile_N7 ) << SHIFT_8T ;
-    }
+  KOKKOS_INLINE_FUNCTION constexpr size_type span() const {
+    // Rank2: ( NumTile0 * ( NumTile1 ) ) * TileSize, etc
+    return (VORank == 2)
+               ? (m_tile_N0 * m_tile_N1) << SHIFT_2T
+               : (VORank == 3)
+                     ? (m_tile_N0 * m_tile_N1 * m_tile_N2) << SHIFT_3T
+                     : (VORank == 4)
+                           ? (m_tile_N0 * m_tile_N1 * m_tile_N2 * m_tile_N3)
+                                 << SHIFT_4T
+                           : (VORank == 5)
+                                 ? (m_tile_N0 * m_tile_N1 * m_tile_N2 *
+                                    m_tile_N3 * m_tile_N4)
+                                       << SHIFT_5T
+                                 : (VORank == 6)
+                                       ? (m_tile_N0 * m_tile_N1 * m_tile_N2 *
+                                          m_tile_N3 * m_tile_N4 * m_tile_N5)
+                                             << SHIFT_6T
+                                       : (VORank == 7)
+                                             ? (m_tile_N0 * m_tile_N1 *
+                                                m_tile_N2 * m_tile_N3 *
+                                                m_tile_N4 * m_tile_N5 *
+                                                m_tile_N6)
+                                                   << SHIFT_7T
+                                             : (m_tile_N0 * m_tile_N1 *
+                                                m_tile_N2 * m_tile_N3 *
+                                                m_tile_N4 * m_tile_N5 *
+                                                m_tile_N6 * m_tile_N7)
+                                                   << SHIFT_8T;
+  }
 
-  KOKKOS_INLINE_FUNCTION constexpr bool span_is_contiguous() const
-    {
-      return true;
-    }
+  KOKKOS_INLINE_FUNCTION constexpr bool span_is_contiguous() const {
+    return true;
+  }
 
   //----------------------------------------
 
 #ifdef KOKKOS_CUDA_9_DEFAULTED_BUG_WORKAROUND
   KOKKOS_INLINE_FUNCTION ~ViewOffset() {}
   KOKKOS_INLINE_FUNCTION ViewOffset() {}
-  KOKKOS_INLINE_FUNCTION ViewOffset( const ViewOffset & rhs )
-  : m_dim(rhs.m_dim)
-  , m_tile_N0(rhs.m_tile_N0)
-  , m_tile_N1(rhs.m_tile_N1)
-  , m_tile_N2(rhs.m_tile_N2)
-  , m_tile_N3(rhs.m_tile_N3)
-  , m_tile_N4(rhs.m_tile_N4)
-  , m_tile_N5(rhs.m_tile_N5)
-  , m_tile_N6(rhs.m_tile_N6)
-  , m_tile_N7(rhs.m_tile_N7)
-  {}
+  KOKKOS_INLINE_FUNCTION ViewOffset(const ViewOffset& rhs)
+      : m_dim(rhs.m_dim),
+        m_tile_N0(rhs.m_tile_N0),
+        m_tile_N1(rhs.m_tile_N1),
+        m_tile_N2(rhs.m_tile_N2),
+        m_tile_N3(rhs.m_tile_N3),
+        m_tile_N4(rhs.m_tile_N4),
+        m_tile_N5(rhs.m_tile_N5),
+        m_tile_N6(rhs.m_tile_N6),
+        m_tile_N7(rhs.m_tile_N7) {}
 
-  KOKKOS_INLINE_FUNCTION ViewOffset & operator = ( const ViewOffset & rhs ) {
-    m_dim = rhs.m_dim;
+  KOKKOS_INLINE_FUNCTION ViewOffset& operator=(const ViewOffset& rhs) {
+    m_dim     = rhs.m_dim;
     m_tile_N0 = rhs.m_tile_N0;
     m_tile_N1 = rhs.m_tile_N1;
     m_tile_N2 = rhs.m_tile_N2;
@@ -380,394 +629,513 @@ public:
   }
 
 #else
-  KOKKOS_INLINE_FUNCTION ~ViewOffset() = default;
-  KOKKOS_INLINE_FUNCTION ViewOffset() = default;
-  KOKKOS_INLINE_FUNCTION ViewOffset( const ViewOffset & ) = default;
-  KOKKOS_INLINE_FUNCTION ViewOffset & operator = ( const ViewOffset & ) = default;
+  KOKKOS_INLINE_FUNCTION ~ViewOffset()                 = default;
+  KOKKOS_INLINE_FUNCTION ViewOffset()                  = default;
+  KOKKOS_INLINE_FUNCTION ViewOffset(const ViewOffset&) = default;
+  KOKKOS_INLINE_FUNCTION ViewOffset& operator=(const ViewOffset&) = default;
 #endif
 
-  template< unsigned TrivialScalarSize >
-  KOKKOS_INLINE_FUNCTION
-  constexpr ViewOffset( std::integral_constant<unsigned,TrivialScalarSize> const & ,
-                        array_layout const arg_layout )
-    : m_dim( arg_layout.dimension[0], arg_layout.dimension[1], arg_layout.dimension[2], arg_layout.dimension[3], arg_layout.dimension[4], arg_layout.dimension[5], arg_layout.dimension[6], arg_layout.dimension[7] )
-    , m_tile_N0( ( arg_layout.dimension[0] + MASK_0 ) >> SHIFT_0 /* number of tiles in first dimension */ )
-    , m_tile_N1( ( arg_layout.dimension[1] + MASK_1 ) >> SHIFT_1 )
-    , m_tile_N2( (VORank > 2 ) ? ( arg_layout.dimension[2] + MASK_2 ) >> SHIFT_2 : 0 )
-    , m_tile_N3( (VORank > 3 ) ? ( arg_layout.dimension[3] + MASK_3 ) >> SHIFT_3 : 0 )
-    , m_tile_N4( (VORank > 4 ) ? ( arg_layout.dimension[4] + MASK_4 ) >> SHIFT_4 : 0 )
-    , m_tile_N5( (VORank > 5 ) ? ( arg_layout.dimension[5] + MASK_5 ) >> SHIFT_5 : 0 )
-    , m_tile_N6( (VORank > 6 ) ? ( arg_layout.dimension[6] + MASK_6 ) >> SHIFT_6 : 0 )
-    , m_tile_N7( (VORank > 7 ) ? ( arg_layout.dimension[7] + MASK_7 ) >> SHIFT_7 : 0 )
-    {}
-
+  template <unsigned TrivialScalarSize>
+  KOKKOS_INLINE_FUNCTION constexpr ViewOffset(
+      std::integral_constant<unsigned, TrivialScalarSize> const&,
+      array_layout const arg_layout)
+      : m_dim(arg_layout.dimension[0], arg_layout.dimension[1],
+              arg_layout.dimension[2], arg_layout.dimension[3],
+              arg_layout.dimension[4], arg_layout.dimension[5],
+              arg_layout.dimension[6], arg_layout.dimension[7]),
+        m_tile_N0((arg_layout.dimension[0] + MASK_0) >>
+                  SHIFT_0 /* number of tiles in first dimension */),
+        m_tile_N1((arg_layout.dimension[1] + MASK_1) >> SHIFT_1),
+        m_tile_N2((VORank > 2) ? (arg_layout.dimension[2] + MASK_2) >> SHIFT_2
+                               : 0),
+        m_tile_N3((VORank > 3) ? (arg_layout.dimension[3] + MASK_3) >> SHIFT_3
+                               : 0),
+        m_tile_N4((VORank > 4) ? (arg_layout.dimension[4] + MASK_4) >> SHIFT_4
+                               : 0),
+        m_tile_N5((VORank > 5) ? (arg_layout.dimension[5] + MASK_5) >> SHIFT_5
+                               : 0),
+        m_tile_N6((VORank > 6) ? (arg_layout.dimension[6] + MASK_6) >> SHIFT_6
+                               : 0),
+        m_tile_N7((VORank > 7) ? (arg_layout.dimension[7] + MASK_7) >> SHIFT_7
+                               : 0) {}
 };
 
-
 //----------------------------------------
 
-
-// ViewMapping assign method needed in order to return a 'subview' tile as a proper View
-// The outer iteration pattern determines the mapping of the pointer offset to the beginning of requested tile
-// The inner iteration pattern is needed for the layout of the tile's View to be returned
-// Rank 2
-template< typename T , Kokkos::Iterate OuterP , Kokkos::Iterate InnerP , unsigned N0 , unsigned N1 , unsigned N2 , unsigned N3 , unsigned N4 , unsigned N5 , unsigned N6 , unsigned N7
-        , class ... P
-        , typename iType0 , typename iType1
-        >
-struct ViewMapping
-  < typename std::enable_if< (N2 == 0 && N3 == 0 && N4 == 0 && N5 == 0 && N6 == 0 && N7 == 0) >::type //void
-  , Kokkos::ViewTraits<T**,Kokkos::Experimental::LayoutTiled<OuterP,InnerP,N0,N1,N2,N3,N4,N5,N6,N7,true>,P...>
-  , Kokkos::Experimental::LayoutTiled<OuterP,InnerP,N0,N1,N2,N3,N4,N5,N6,N7,true>
-  , iType0
-  , iType1 >
-{
-  typedef Kokkos::Experimental::LayoutTiled<OuterP,InnerP,N0,N1,N2,N3,N4,N5,N6,N7,true>  src_layout ;
-  typedef Kokkos::ViewTraits< T** , src_layout , P... > src_traits ;
+// ViewMapping assign method needed in order to return a 'subview' tile as a
+// proper View The outer iteration pattern determines the mapping of the pointer
+// offset to the beginning of requested tile The inner iteration pattern is
+// needed for the layout of the tile's View to be returned Rank 2
+template <typename T, Kokkos::Iterate OuterP, Kokkos::Iterate InnerP,
+          unsigned N0, unsigned N1, unsigned N2, unsigned N3, unsigned N4,
+          unsigned N5, unsigned N6, unsigned N7, class... P, typename iType0,
+          typename iType1>
+struct ViewMapping<
+    typename std::enable_if<(N2 == 0 && N3 == 0 && N4 == 0 && N5 == 0 &&
+                             N6 == 0 && N7 == 0)>::type  // void
+    ,
+    Kokkos::ViewTraits<
+        T**,
+        Kokkos::Experimental::LayoutTiled<OuterP, InnerP, N0, N1, N2, N3, N4,
+                                          N5, N6, N7, true>,
+        P...>,
+    Kokkos::Experimental::LayoutTiled<OuterP, InnerP, N0, N1, N2, N3, N4, N5,
+                                      N6, N7, true>,
+    iType0, iType1> {
+  typedef Kokkos::Experimental::LayoutTiled<OuterP, InnerP, N0, N1, N2, N3, N4,
+                                            N5, N6, N7, true>
+      src_layout;
+  typedef Kokkos::ViewTraits<T**, src_layout, P...> src_traits;
 
   enum { is_outer_left = (OuterP == Kokkos::Iterate::Left) };
   enum { is_inner_left = (InnerP == Kokkos::Iterate::Left) };
-  typedef typename std::conditional< is_inner_left, Kokkos::LayoutLeft, Kokkos::LayoutRight >::type array_layout;
-  typedef Kokkos::ViewTraits< T[N0][N1] , array_layout , P ... > traits ;
-  typedef Kokkos::View< T[N0][N1] , array_layout , P ... > type ;
+  typedef typename std::conditional<is_inner_left, Kokkos::LayoutLeft,
+                                    Kokkos::LayoutRight>::type array_layout;
+  typedef Kokkos::ViewTraits<T[N0][N1], array_layout, P...> traits;
+  typedef Kokkos::View<T[N0][N1], array_layout, P...> type;
 
-  KOKKOS_INLINE_FUNCTION static
-  void assign( ViewMapping< traits , void > & dst
-             , const ViewMapping< src_traits , void > & src
-             , const src_layout &
-             , const iType0 i_tile0
-             , const iType1 i_tile1
-             )
-    {
-      typedef ViewMapping< traits , void >        dst_map_type ;
-      typedef ViewMapping< src_traits , void >    src_map_type ;
-      typedef typename dst_map_type::handle_type  dst_handle_type ;
-      typedef typename dst_map_type::offset_type  dst_offset_type ;
-      typedef typename src_map_type::offset_type  src_offset_type ;
+  KOKKOS_INLINE_FUNCTION static void assign(
+      ViewMapping<traits, void>& dst, const ViewMapping<src_traits, void>& src,
+      const src_layout&, const iType0 i_tile0, const iType1 i_tile1) {
+    typedef ViewMapping<traits, void> dst_map_type;
+    typedef ViewMapping<src_traits, void> src_map_type;
+    typedef typename dst_map_type::handle_type dst_handle_type;
+    typedef typename dst_map_type::offset_type dst_offset_type;
+    typedef typename src_map_type::offset_type src_offset_type;
 
-      dst = dst_map_type(
-         dst_handle_type( src.m_impl_handle +
-                          ( is_outer_left ? ( (i_tile0 + src.m_impl_offset.m_tile_N0 * i_tile1) << src_offset_type::SHIFT_2T )
-                                          : ( (src.m_impl_offset.m_tile_N1 * i_tile0 + i_tile1) << src_offset_type::SHIFT_2T )
-                          ) // offset to start of the tile
-                        )
-       , dst_offset_type() );
-    }
+    dst = dst_map_type(
+        dst_handle_type(
+            src.m_impl_handle +
+            (is_outer_left ? ((i_tile0 + src.m_impl_offset.m_tile_N0 * i_tile1)
+                              << src_offset_type::SHIFT_2T)
+                           : ((src.m_impl_offset.m_tile_N1 * i_tile0 + i_tile1)
+                              << src_offset_type::SHIFT_2T))  // offset to start
+                                                              // of the tile
+            ),
+        dst_offset_type());
+  }
 };
 
 // Rank 3
-template< typename T , Kokkos::Iterate OuterP , Kokkos::Iterate InnerP , unsigned N0 , unsigned N1 , unsigned N2 , unsigned N3 , unsigned N4 , unsigned N5 , unsigned N6 , unsigned N7
-        , class ... P
-        , typename iType0 , typename iType1 , typename iType2
-        >
-struct ViewMapping
-  < typename std::enable_if< (N3 == 0 && N4 == 0 && N5 == 0 && N6 == 0 && N7 == 0) >::type //void
-  , Kokkos::ViewTraits<T***,Kokkos::Experimental::LayoutTiled<OuterP,InnerP,N0,N1,N2,N3,N4,N5,N6,N7,true>,P...>
-  , Kokkos::Experimental::LayoutTiled<OuterP,InnerP,N0,N1,N2,N3,N4,N5,N6,N7,true>
-  , iType0
-  , iType1
-  , iType2 >
-{
-  typedef Kokkos::Experimental::LayoutTiled<OuterP,InnerP,N0,N1,N2,N3,N4,N5,N6,N7,true>  src_layout ;
-  typedef Kokkos::ViewTraits< T*** , src_layout , P... > src_traits ;
+template <typename T, Kokkos::Iterate OuterP, Kokkos::Iterate InnerP,
+          unsigned N0, unsigned N1, unsigned N2, unsigned N3, unsigned N4,
+          unsigned N5, unsigned N6, unsigned N7, class... P, typename iType0,
+          typename iType1, typename iType2>
+struct ViewMapping<typename std::enable_if<(N3 == 0 && N4 == 0 && N5 == 0 &&
+                                            N6 == 0 && N7 == 0)>::type  // void
+                   ,
+                   Kokkos::ViewTraits<T***,
+                                      Kokkos::Experimental::LayoutTiled<
+                                          OuterP, InnerP, N0, N1, N2, N3, N4,
+                                          N5, N6, N7, true>,
+                                      P...>,
+                   Kokkos::Experimental::LayoutTiled<OuterP, InnerP, N0, N1, N2,
+                                                     N3, N4, N5, N6, N7, true>,
+                   iType0, iType1, iType2> {
+  typedef Kokkos::Experimental::LayoutTiled<OuterP, InnerP, N0, N1, N2, N3, N4,
+                                            N5, N6, N7, true>
+      src_layout;
+  typedef Kokkos::ViewTraits<T***, src_layout, P...> src_traits;
 
   enum { is_outer_left = (OuterP == Kokkos::Iterate::Left) };
   enum { is_inner_left = (InnerP == Kokkos::Iterate::Left) };
-  typedef typename std::conditional< is_inner_left, Kokkos::LayoutLeft, Kokkos::LayoutRight >::type array_layout;
-  typedef Kokkos::ViewTraits< T[N0][N1][N2] , array_layout , P ... > traits ;
-  typedef Kokkos::View< T[N0][N1][N2] , array_layout , P ... > type ;
+  typedef typename std::conditional<is_inner_left, Kokkos::LayoutLeft,
+                                    Kokkos::LayoutRight>::type array_layout;
+  typedef Kokkos::ViewTraits<T[N0][N1][N2], array_layout, P...> traits;
+  typedef Kokkos::View<T[N0][N1][N2], array_layout, P...> type;
 
-  KOKKOS_INLINE_FUNCTION static
-  void assign( ViewMapping< traits , void > & dst
-             , const ViewMapping< src_traits , void > & src
-             , const src_layout &
-             , const iType0 i_tile0
-             , const iType1 i_tile1
-             , const iType2 i_tile2
-             )
-    {
-      typedef ViewMapping< traits , void >        dst_map_type ;
-      typedef ViewMapping< src_traits , void >    src_map_type ;
-      typedef typename dst_map_type::handle_type  dst_handle_type ;
-      typedef typename dst_map_type::offset_type  dst_offset_type ;
-      typedef typename src_map_type::offset_type  src_offset_type ;
+  KOKKOS_INLINE_FUNCTION static void assign(
+      ViewMapping<traits, void>& dst, const ViewMapping<src_traits, void>& src,
+      const src_layout&, const iType0 i_tile0, const iType1 i_tile1,
+      const iType2 i_tile2) {
+    typedef ViewMapping<traits, void> dst_map_type;
+    typedef ViewMapping<src_traits, void> src_map_type;
+    typedef typename dst_map_type::handle_type dst_handle_type;
+    typedef typename dst_map_type::offset_type dst_offset_type;
+    typedef typename src_map_type::offset_type src_offset_type;
 
-      dst = dst_map_type(
-         dst_handle_type( src.m_impl_handle +
-                          ( is_outer_left ? ( ( i_tile0 + src.m_impl_offset.m_tile_N0 * ( i_tile1 + src.m_impl_offset.m_tile_N1 * i_tile2 ) ) << src_offset_type::SHIFT_3T ) 
-                                          : ( ( src.m_impl_offset.m_tile_N2 * ( src.m_impl_offset.m_tile_N1 * i_tile0 + i_tile1 ) + i_tile2 ) << src_offset_type::SHIFT_3T )
-                          )
-                        ) // offset to start of the tile
-       , dst_offset_type() );
-    }
+    dst = dst_map_type(
+        dst_handle_type(
+            src.m_impl_handle +
+            (is_outer_left
+                 ? ((i_tile0 +
+                     src.m_impl_offset.m_tile_N0 *
+                         (i_tile1 + src.m_impl_offset.m_tile_N1 * i_tile2))
+                    << src_offset_type::SHIFT_3T)
+                 : ((src.m_impl_offset.m_tile_N2 *
+                         (src.m_impl_offset.m_tile_N1 * i_tile0 + i_tile1) +
+                     i_tile2)
+                    << src_offset_type::SHIFT_3T)))  // offset to start of the
+                                                     // tile
+        ,
+        dst_offset_type());
+  }
 };
 
 // Rank 4
-template< typename T , Kokkos::Iterate OuterP , Kokkos::Iterate InnerP , unsigned N0 , unsigned N1 , unsigned N2 , unsigned N3 , unsigned N4 , unsigned N5 , unsigned N6 , unsigned N7
-        , class ... P
-        , typename iType0 , typename iType1 , typename iType2 , typename iType3
-        >
-struct ViewMapping
-  < typename std::enable_if< (N4 == 0 && N5 == 0 && N6 == 0 && N7 == 0) >::type //void
-  , Kokkos::ViewTraits<T****,Kokkos::Experimental::LayoutTiled<OuterP,InnerP,N0,N1,N2,N3,N4,N5,N6,N7,true>,P...>
-  , Kokkos::Experimental::LayoutTiled<OuterP,InnerP,N0,N1,N2,N3,N4,N5,N6,N7,true>
-  , iType0
-  , iType1
-  , iType2 
-  , iType3 >
-{
-  typedef Kokkos::Experimental::LayoutTiled<OuterP,InnerP,N0,N1,N2,N3,N4,N5,N6,N7,true>  src_layout ;
-  typedef Kokkos::ViewTraits< T**** , src_layout , P... > src_traits ;
+template <typename T, Kokkos::Iterate OuterP, Kokkos::Iterate InnerP,
+          unsigned N0, unsigned N1, unsigned N2, unsigned N3, unsigned N4,
+          unsigned N5, unsigned N6, unsigned N7, class... P, typename iType0,
+          typename iType1, typename iType2, typename iType3>
+struct ViewMapping<typename std::enable_if<(N4 == 0 && N5 == 0 && N6 == 0 &&
+                                            N7 == 0)>::type  // void
+                   ,
+                   Kokkos::ViewTraits<T****,
+                                      Kokkos::Experimental::LayoutTiled<
+                                          OuterP, InnerP, N0, N1, N2, N3, N4,
+                                          N5, N6, N7, true>,
+                                      P...>,
+                   Kokkos::Experimental::LayoutTiled<OuterP, InnerP, N0, N1, N2,
+                                                     N3, N4, N5, N6, N7, true>,
+                   iType0, iType1, iType2, iType3> {
+  typedef Kokkos::Experimental::LayoutTiled<OuterP, InnerP, N0, N1, N2, N3, N4,
+                                            N5, N6, N7, true>
+      src_layout;
+  typedef Kokkos::ViewTraits<T****, src_layout, P...> src_traits;
 
   enum { is_outer_left = (OuterP == Kokkos::Iterate::Left) };
   enum { is_inner_left = (InnerP == Kokkos::Iterate::Left) };
-  typedef typename std::conditional< is_inner_left, Kokkos::LayoutLeft, Kokkos::LayoutRight >::type array_layout;
-  typedef Kokkos::ViewTraits< T[N0][N1][N2][N3] , array_layout , P ... > traits ;
-  typedef Kokkos::View< T[N0][N1][N2][N3] , array_layout , P ... > type ;
+  typedef typename std::conditional<is_inner_left, Kokkos::LayoutLeft,
+                                    Kokkos::LayoutRight>::type array_layout;
+  typedef Kokkos::ViewTraits<T[N0][N1][N2][N3], array_layout, P...> traits;
+  typedef Kokkos::View<T[N0][N1][N2][N3], array_layout, P...> type;
 
-  KOKKOS_INLINE_FUNCTION static
-  void assign( ViewMapping< traits , void > & dst
-             , const ViewMapping< src_traits , void > & src
-             , const src_layout &
-             , const iType0 i_tile0
-             , const iType1 i_tile1
-             , const iType2 i_tile2
-             , const iType3 i_tile3
-             )
-    {
-      typedef ViewMapping< traits , void >        dst_map_type ;
-      typedef ViewMapping< src_traits , void >    src_map_type ;
-      typedef typename dst_map_type::handle_type  dst_handle_type ;
-      typedef typename dst_map_type::offset_type  dst_offset_type ;
-      typedef typename src_map_type::offset_type  src_offset_type ;
+  KOKKOS_INLINE_FUNCTION static void assign(
+      ViewMapping<traits, void>& dst, const ViewMapping<src_traits, void>& src,
+      const src_layout&, const iType0 i_tile0, const iType1 i_tile1,
+      const iType2 i_tile2, const iType3 i_tile3) {
+    typedef ViewMapping<traits, void> dst_map_type;
+    typedef ViewMapping<src_traits, void> src_map_type;
+    typedef typename dst_map_type::handle_type dst_handle_type;
+    typedef typename dst_map_type::offset_type dst_offset_type;
+    typedef typename src_map_type::offset_type src_offset_type;
 
-      dst = dst_map_type(
-         dst_handle_type( src.m_impl_handle +
-                          ( is_outer_left ? ( ( i_tile0 + src.m_impl_offset.m_tile_N0 * ( i_tile1 + src.m_impl_offset.m_tile_N1 * ( i_tile2 + src.m_impl_offset.m_tile_N2 * i_tile3 ) ) ) << src_offset_type::SHIFT_4T ) 
-                                          : ( ( src.m_impl_offset.m_tile_N3 * ( src.m_impl_offset.m_tile_N2 * ( src.m_impl_offset.m_tile_N1 * i_tile0 + i_tile1 ) + i_tile2 ) + i_tile3 ) << src_offset_type::SHIFT_4T )
-                          )
-                        ) // offset to start of the tile
-       , dst_offset_type() );
-    }
+    dst = dst_map_type(
+        dst_handle_type(
+            src.m_impl_handle +
+            (is_outer_left
+                 ? ((i_tile0 +
+                     src.m_impl_offset.m_tile_N0 *
+                         (i_tile1 + src.m_impl_offset.m_tile_N1 *
+                                        (i_tile2 + src.m_impl_offset.m_tile_N2 *
+                                                       i_tile3)))
+                    << src_offset_type::SHIFT_4T)
+                 : ((src.m_impl_offset.m_tile_N3 *
+                         (src.m_impl_offset.m_tile_N2 *
+                              (src.m_impl_offset.m_tile_N1 * i_tile0 +
+                               i_tile1) +
+                          i_tile2) +
+                     i_tile3)
+                    << src_offset_type::SHIFT_4T)))  // offset to start of the
+                                                     // tile
+        ,
+        dst_offset_type());
+  }
 };
 
 // Rank 5
-template< typename T , Kokkos::Iterate OuterP , Kokkos::Iterate InnerP , unsigned N0 , unsigned N1 , unsigned N2 , unsigned N3 , unsigned N4 , unsigned N5 , unsigned N6 , unsigned N7
-        , class ... P
-        , typename iType0 , typename iType1 , typename iType2 , typename iType3 , typename iType4
-        >
-struct ViewMapping
-  < typename std::enable_if< (N5 == 0 && N6 == 0 && N7 == 0) >::type //void
-  , Kokkos::ViewTraits<T*****,Kokkos::Experimental::LayoutTiled<OuterP,InnerP,N0,N1,N2,N3,N4,N5,N6,N7,true>,P...>
-  , Kokkos::Experimental::LayoutTiled<OuterP,InnerP,N0,N1,N2,N3,N4,N5,N6,N7,true>
-  , iType0
-  , iType1
-  , iType2 
-  , iType3
-  , iType4 >
-{
-  typedef Kokkos::Experimental::LayoutTiled<OuterP,InnerP,N0,N1,N2,N3,N4,N5,N6,N7,true>  src_layout ;
-  typedef Kokkos::ViewTraits< T***** , src_layout , P... > src_traits ;
+template <typename T, Kokkos::Iterate OuterP, Kokkos::Iterate InnerP,
+          unsigned N0, unsigned N1, unsigned N2, unsigned N3, unsigned N4,
+          unsigned N5, unsigned N6, unsigned N7, class... P, typename iType0,
+          typename iType1, typename iType2, typename iType3, typename iType4>
+struct ViewMapping<
+    typename std::enable_if<(N5 == 0 && N6 == 0 && N7 == 0)>::type  // void
+    ,
+    Kokkos::ViewTraits<
+        T*****,
+        Kokkos::Experimental::LayoutTiled<OuterP, InnerP, N0, N1, N2, N3, N4,
+                                          N5, N6, N7, true>,
+        P...>,
+    Kokkos::Experimental::LayoutTiled<OuterP, InnerP, N0, N1, N2, N3, N4, N5,
+                                      N6, N7, true>,
+    iType0, iType1, iType2, iType3, iType4> {
+  typedef Kokkos::Experimental::LayoutTiled<OuterP, InnerP, N0, N1, N2, N3, N4,
+                                            N5, N6, N7, true>
+      src_layout;
+  typedef Kokkos::ViewTraits<T*****, src_layout, P...> src_traits;
 
   enum { is_outer_left = (OuterP == Kokkos::Iterate::Left) };
   enum { is_inner_left = (InnerP == Kokkos::Iterate::Left) };
-  typedef typename std::conditional< is_inner_left, Kokkos::LayoutLeft, Kokkos::LayoutRight >::type array_layout;
-  typedef Kokkos::ViewTraits< T[N0][N1][N2][N3][N4] , array_layout , P ... > traits ;
-  typedef Kokkos::View< T[N0][N1][N2][N3][N4] , array_layout , P ... > type ;
+  typedef typename std::conditional<is_inner_left, Kokkos::LayoutLeft,
+                                    Kokkos::LayoutRight>::type array_layout;
+  typedef Kokkos::ViewTraits<T[N0][N1][N2][N3][N4], array_layout, P...> traits;
+  typedef Kokkos::View<T[N0][N1][N2][N3][N4], array_layout, P...> type;
 
-  KOKKOS_INLINE_FUNCTION static
-  void assign( ViewMapping< traits , void > & dst
-             , const ViewMapping< src_traits , void > & src
-             , const src_layout &
-             , const iType0 i_tile0
-             , const iType1 i_tile1
-             , const iType2 i_tile2
-             , const iType3 i_tile3
-             , const iType4 i_tile4
-             )
-    {
-      typedef ViewMapping< traits , void >        dst_map_type ;
-      typedef ViewMapping< src_traits , void >    src_map_type ;
-      typedef typename dst_map_type::handle_type  dst_handle_type ;
-      typedef typename dst_map_type::offset_type  dst_offset_type ;
-      typedef typename src_map_type::offset_type  src_offset_type ;
+  KOKKOS_INLINE_FUNCTION static void assign(
+      ViewMapping<traits, void>& dst, const ViewMapping<src_traits, void>& src,
+      const src_layout&, const iType0 i_tile0, const iType1 i_tile1,
+      const iType2 i_tile2, const iType3 i_tile3, const iType4 i_tile4) {
+    typedef ViewMapping<traits, void> dst_map_type;
+    typedef ViewMapping<src_traits, void> src_map_type;
+    typedef typename dst_map_type::handle_type dst_handle_type;
+    typedef typename dst_map_type::offset_type dst_offset_type;
+    typedef typename src_map_type::offset_type src_offset_type;
 
-      dst = dst_map_type(
-         dst_handle_type( src.m_impl_handle +
-                          ( is_outer_left ? ( ( i_tile0 + src.m_impl_offset.m_tile_N0 * ( i_tile1 + src.m_impl_offset.m_tile_N1 * ( i_tile2 + src.m_impl_offset.m_tile_N2 * ( i_tile3 + src.m_impl_offset.m_tile_N3 * i_tile4 ) ) ) ) << src_offset_type::SHIFT_5T ) 
-                                          : ( ( src.m_impl_offset.m_tile_N4 * ( src.m_impl_offset.m_tile_N3 * ( src.m_impl_offset.m_tile_N2 * ( src.m_impl_offset.m_tile_N1 * i_tile0 + i_tile1 ) + i_tile2 ) + i_tile3 ) + i_tile4 ) << src_offset_type::SHIFT_5T )
-                          )
-                        ) // offset to start of the tile
-       , dst_offset_type() );
-    }
+    dst = dst_map_type(
+        dst_handle_type(
+            src.m_impl_handle +
+            (is_outer_left
+                 ? ((i_tile0 +
+                     src.m_impl_offset.m_tile_N0 *
+                         (i_tile1 +
+                          src.m_impl_offset.m_tile_N1 *
+                              (i_tile2 +
+                               src.m_impl_offset.m_tile_N2 *
+                                   (i_tile3 +
+                                    src.m_impl_offset.m_tile_N3 * i_tile4))))
+                    << src_offset_type::SHIFT_5T)
+                 : ((src.m_impl_offset.m_tile_N4 *
+                         (src.m_impl_offset.m_tile_N3 *
+                              (src.m_impl_offset.m_tile_N2 *
+                                   (src.m_impl_offset.m_tile_N1 * i_tile0 +
+                                    i_tile1) +
+                               i_tile2) +
+                          i_tile3) +
+                     i_tile4)
+                    << src_offset_type::SHIFT_5T)))  // offset to start of the
+                                                     // tile
+        ,
+        dst_offset_type());
+  }
 };
 
 // Rank 6
-template< typename T , Kokkos::Iterate OuterP , Kokkos::Iterate InnerP , unsigned N0 , unsigned N1 , unsigned N2 , unsigned N3 , unsigned N4 , unsigned N5 , unsigned N6 , unsigned N7
-        , class ... P
-        , typename iType0 , typename iType1 , typename iType2 , typename iType3 , typename iType4 , typename iType5
-        >
-struct ViewMapping
-  < typename std::enable_if< (N6 == 0 && N7 == 0) >::type //void
-  , Kokkos::ViewTraits<T******,Kokkos::Experimental::LayoutTiled<OuterP,InnerP,N0,N1,N2,N3,N4,N5,N6,N7,true>,P...>
-  , Kokkos::Experimental::LayoutTiled<OuterP,InnerP,N0,N1,N2,N3,N4,N5,N6,N7,true>
-  , iType0
-  , iType1
-  , iType2 
-  , iType3
-  , iType4
-  , iType5 >
-{
-  typedef Kokkos::Experimental::LayoutTiled<OuterP,InnerP,N0,N1,N2,N3,N4,N5,N6,N7,true>  src_layout ;
-  typedef Kokkos::ViewTraits< T****** , src_layout , P... > src_traits ;
+template <typename T, Kokkos::Iterate OuterP, Kokkos::Iterate InnerP,
+          unsigned N0, unsigned N1, unsigned N2, unsigned N3, unsigned N4,
+          unsigned N5, unsigned N6, unsigned N7, class... P, typename iType0,
+          typename iType1, typename iType2, typename iType3, typename iType4,
+          typename iType5>
+struct ViewMapping<typename std::enable_if<(N6 == 0 && N7 == 0)>::type  // void
+                   ,
+                   Kokkos::ViewTraits<T******,
+                                      Kokkos::Experimental::LayoutTiled<
+                                          OuterP, InnerP, N0, N1, N2, N3, N4,
+                                          N5, N6, N7, true>,
+                                      P...>,
+                   Kokkos::Experimental::LayoutTiled<OuterP, InnerP, N0, N1, N2,
+                                                     N3, N4, N5, N6, N7, true>,
+                   iType0, iType1, iType2, iType3, iType4, iType5> {
+  typedef Kokkos::Experimental::LayoutTiled<OuterP, InnerP, N0, N1, N2, N3, N4,
+                                            N5, N6, N7, true>
+      src_layout;
+  typedef Kokkos::ViewTraits<T******, src_layout, P...> src_traits;
 
   enum { is_outer_left = (OuterP == Kokkos::Iterate::Left) };
   enum { is_inner_left = (InnerP == Kokkos::Iterate::Left) };
-  typedef typename std::conditional< is_inner_left, Kokkos::LayoutLeft, Kokkos::LayoutRight >::type array_layout;
-  typedef Kokkos::ViewTraits< T[N0][N1][N2][N3][N4][N5] , array_layout , P ... > traits ;
-  typedef Kokkos::View< T[N0][N1][N2][N3][N4][N5] , array_layout , P ... > type ;
+  typedef typename std::conditional<is_inner_left, Kokkos::LayoutLeft,
+                                    Kokkos::LayoutRight>::type array_layout;
+  typedef Kokkos::ViewTraits<T[N0][N1][N2][N3][N4][N5], array_layout, P...>
+      traits;
+  typedef Kokkos::View<T[N0][N1][N2][N3][N4][N5], array_layout, P...> type;
 
-  KOKKOS_INLINE_FUNCTION static
-  void assign( ViewMapping< traits , void > & dst
-             , const ViewMapping< src_traits , void > & src
-             , const src_layout &
-             , const iType0 i_tile0
-             , const iType1 i_tile1
-             , const iType2 i_tile2
-             , const iType3 i_tile3
-             , const iType4 i_tile4
-             , const iType5 i_tile5
-             )
-    {
-      typedef ViewMapping< traits , void >        dst_map_type ;
-      typedef ViewMapping< src_traits , void >    src_map_type ;
-      typedef typename dst_map_type::handle_type  dst_handle_type ;
-      typedef typename dst_map_type::offset_type  dst_offset_type ;
-      typedef typename src_map_type::offset_type  src_offset_type ;
+  KOKKOS_INLINE_FUNCTION static void assign(
+      ViewMapping<traits, void>& dst, const ViewMapping<src_traits, void>& src,
+      const src_layout&, const iType0 i_tile0, const iType1 i_tile1,
+      const iType2 i_tile2, const iType3 i_tile3, const iType4 i_tile4,
+      const iType5 i_tile5) {
+    typedef ViewMapping<traits, void> dst_map_type;
+    typedef ViewMapping<src_traits, void> src_map_type;
+    typedef typename dst_map_type::handle_type dst_handle_type;
+    typedef typename dst_map_type::offset_type dst_offset_type;
+    typedef typename src_map_type::offset_type src_offset_type;
 
-      dst = dst_map_type(
-         dst_handle_type( src.m_impl_handle +
-                          ( is_outer_left ? ( ( i_tile0 + src.m_impl_offset.m_tile_N0 * ( i_tile1 + src.m_impl_offset.m_tile_N1 * ( i_tile2 + src.m_impl_offset.m_tile_N2 * ( i_tile3 + src.m_impl_offset.m_tile_N3 * ( i_tile4 + src.m_impl_offset.m_tile_N4 * i_tile5 ) ) ) ) ) << src_offset_type::SHIFT_6T ) 
-                                          : ( ( src.m_impl_offset.m_tile_N5 * ( src.m_impl_offset.m_tile_N4 * ( src.m_impl_offset.m_tile_N3 * ( src.m_impl_offset.m_tile_N2 * ( src.m_impl_offset.m_tile_N1 * i_tile0 + i_tile1 ) + i_tile2 ) + i_tile3 ) + i_tile4 ) + i_tile5 ) << src_offset_type::SHIFT_6T )
-                          )
-                        ) // offset to start of the tile
-       , dst_offset_type() );
-    }
+    dst = dst_map_type(
+        dst_handle_type(
+            src.m_impl_handle +
+            (is_outer_left
+                 ? ((i_tile0 +
+                     src.m_impl_offset.m_tile_N0 *
+                         (i_tile1 +
+                          src.m_impl_offset.m_tile_N1 *
+                              (i_tile2 +
+                               src.m_impl_offset.m_tile_N2 *
+                                   (i_tile3 +
+                                    src.m_impl_offset.m_tile_N3 *
+                                        (i_tile4 + src.m_impl_offset.m_tile_N4 *
+                                                       i_tile5)))))
+                    << src_offset_type::SHIFT_6T)
+                 : ((src.m_impl_offset.m_tile_N5 *
+                         (src.m_impl_offset.m_tile_N4 *
+                              (src.m_impl_offset.m_tile_N3 *
+                                   (src.m_impl_offset.m_tile_N2 *
+                                        (src.m_impl_offset.m_tile_N1 * i_tile0 +
+                                         i_tile1) +
+                                    i_tile2) +
+                               i_tile3) +
+                          i_tile4) +
+                     i_tile5)
+                    << src_offset_type::SHIFT_6T)))  // offset to start of the
+                                                     // tile
+        ,
+        dst_offset_type());
+  }
 };
 
 // Rank 7
-template< typename T , Kokkos::Iterate OuterP , Kokkos::Iterate InnerP , unsigned N0 , unsigned N1 , unsigned N2 , unsigned N3 , unsigned N4 , unsigned N5 , unsigned N6 , unsigned N7
-        , class ... P
-        , typename iType0 , typename iType1 , typename iType2 , typename iType3 , typename iType4 , typename iType5 , typename iType6
-        >
-struct ViewMapping
-  < typename std::enable_if< (N7 == 0) >::type //void
-  , Kokkos::ViewTraits<T*******,Kokkos::Experimental::LayoutTiled<OuterP,InnerP,N0,N1,N2,N3,N4,N5,N6,N7,true>,P...>
-  , Kokkos::Experimental::LayoutTiled<OuterP,InnerP,N0,N1,N2,N3,N4,N5,N6,N7,true>
-  , iType0
-  , iType1
-  , iType2 
-  , iType3
-  , iType4
-  , iType5 
-  , iType6 >
-{
-  typedef Kokkos::Experimental::LayoutTiled<OuterP,InnerP,N0,N1,N2,N3,N4,N5,N6,N7,true>  src_layout ;
-  typedef Kokkos::ViewTraits< T******* , src_layout , P... > src_traits ;
+template <typename T, Kokkos::Iterate OuterP, Kokkos::Iterate InnerP,
+          unsigned N0, unsigned N1, unsigned N2, unsigned N3, unsigned N4,
+          unsigned N5, unsigned N6, unsigned N7, class... P, typename iType0,
+          typename iType1, typename iType2, typename iType3, typename iType4,
+          typename iType5, typename iType6>
+struct ViewMapping<typename std::enable_if<(N7 == 0)>::type  // void
+                   ,
+                   Kokkos::ViewTraits<T*******,
+                                      Kokkos::Experimental::LayoutTiled<
+                                          OuterP, InnerP, N0, N1, N2, N3, N4,
+                                          N5, N6, N7, true>,
+                                      P...>,
+                   Kokkos::Experimental::LayoutTiled<OuterP, InnerP, N0, N1, N2,
+                                                     N3, N4, N5, N6, N7, true>,
+                   iType0, iType1, iType2, iType3, iType4, iType5, iType6> {
+  typedef Kokkos::Experimental::LayoutTiled<OuterP, InnerP, N0, N1, N2, N3, N4,
+                                            N5, N6, N7, true>
+      src_layout;
+  typedef Kokkos::ViewTraits<T*******, src_layout, P...> src_traits;
 
   enum { is_outer_left = (OuterP == Kokkos::Iterate::Left) };
   enum { is_inner_left = (InnerP == Kokkos::Iterate::Left) };
-  typedef typename std::conditional< is_inner_left, Kokkos::LayoutLeft, Kokkos::LayoutRight >::type array_layout;
-  typedef Kokkos::ViewTraits< T[N0][N1][N2][N3][N4][N5][N6] , array_layout , P ... > traits ;
-  typedef Kokkos::View< T[N0][N1][N2][N3][N4][N5][N6] , array_layout , P ... > type ;
+  typedef typename std::conditional<is_inner_left, Kokkos::LayoutLeft,
+                                    Kokkos::LayoutRight>::type array_layout;
+  typedef Kokkos::ViewTraits<T[N0][N1][N2][N3][N4][N5][N6], array_layout, P...>
+      traits;
+  typedef Kokkos::View<T[N0][N1][N2][N3][N4][N5][N6], array_layout, P...> type;
 
-  KOKKOS_INLINE_FUNCTION static
-  void assign( ViewMapping< traits , void > & dst
-             , const ViewMapping< src_traits , void > & src
-             , const src_layout &
-             , const iType0 i_tile0
-             , const iType1 i_tile1
-             , const iType2 i_tile2
-             , const iType3 i_tile3
-             , const iType4 i_tile4
-             , const iType5 i_tile5
-             , const iType6 i_tile6
-             )
-    {
-      typedef ViewMapping< traits , void >        dst_map_type ;
-      typedef ViewMapping< src_traits , void >    src_map_type ;
-      typedef typename dst_map_type::handle_type  dst_handle_type ;
-      typedef typename dst_map_type::offset_type  dst_offset_type ;
-      typedef typename src_map_type::offset_type  src_offset_type ;
+  KOKKOS_INLINE_FUNCTION static void assign(
+      ViewMapping<traits, void>& dst, const ViewMapping<src_traits, void>& src,
+      const src_layout&, const iType0 i_tile0, const iType1 i_tile1,
+      const iType2 i_tile2, const iType3 i_tile3, const iType4 i_tile4,
+      const iType5 i_tile5, const iType6 i_tile6) {
+    typedef ViewMapping<traits, void> dst_map_type;
+    typedef ViewMapping<src_traits, void> src_map_type;
+    typedef typename dst_map_type::handle_type dst_handle_type;
+    typedef typename dst_map_type::offset_type dst_offset_type;
+    typedef typename src_map_type::offset_type src_offset_type;
 
-      dst = dst_map_type(
-         dst_handle_type( src.m_impl_handle +
-                          ( is_outer_left ? ( ( i_tile0 + src.m_impl_offset.m_tile_N0 * ( i_tile1 + src.m_impl_offset.m_tile_N1 * ( i_tile2 + src.m_impl_offset.m_tile_N2 * ( i_tile3 + src.m_impl_offset.m_tile_N3 * ( i_tile4 + src.m_impl_offset.m_tile_N4 * ( i_tile5 + src.m_impl_offset.m_tile_N5 * i_tile6 ) ) ) ) ) ) << src_offset_type::SHIFT_7T ) 
-                                          : ( ( src.m_impl_offset.m_tile_N6 * ( src.m_impl_offset.m_tile_N5 * ( src.m_impl_offset.m_tile_N4 * ( src.m_impl_offset.m_tile_N3 * ( src.m_impl_offset.m_tile_N2 * ( src.m_impl_offset.m_tile_N1 * i_tile0 + i_tile1 ) + i_tile2 ) + i_tile3 ) + i_tile4 ) + i_tile5 ) + i_tile6 ) << src_offset_type::SHIFT_7T )
-                          )
-                        ) // offset to start of the tile
-       , dst_offset_type() );
-    }
+    dst = dst_map_type(
+        dst_handle_type(
+            src.m_impl_handle +
+            (is_outer_left
+                 ? ((i_tile0 +
+                     src.m_impl_offset.m_tile_N0 *
+                         (i_tile1 +
+                          src.m_impl_offset.m_tile_N1 *
+                              (i_tile2 +
+                               src.m_impl_offset.m_tile_N2 *
+                                   (i_tile3 +
+                                    src.m_impl_offset.m_tile_N3 *
+                                        (i_tile4 +
+                                         src.m_impl_offset.m_tile_N4 *
+                                             (i_tile5 +
+                                              src.m_impl_offset.m_tile_N5 *
+                                                  i_tile6))))))
+                    << src_offset_type::SHIFT_7T)
+                 : ((src.m_impl_offset.m_tile_N6 *
+                         (src.m_impl_offset.m_tile_N5 *
+                              (src.m_impl_offset.m_tile_N4 *
+                                   (src.m_impl_offset.m_tile_N3 *
+                                        (src.m_impl_offset.m_tile_N2 *
+                                             (src.m_impl_offset.m_tile_N1 *
+                                                  i_tile0 +
+                                              i_tile1) +
+                                         i_tile2) +
+                                    i_tile3) +
+                               i_tile4) +
+                          i_tile5) +
+                     i_tile6)
+                    << src_offset_type::SHIFT_7T)))  // offset to start of the
+                                                     // tile
+        ,
+        dst_offset_type());
+  }
 };
 
 // Rank 8
-template< typename T , Kokkos::Iterate OuterP , Kokkos::Iterate InnerP , unsigned N0 , unsigned N1 , unsigned N2 , unsigned N3 , unsigned N4 , unsigned N5 , unsigned N6 , unsigned N7
-        , class ... P
-        , typename iType0 , typename iType1 , typename iType2 , typename iType3 , typename iType4 , typename iType5 , typename iType6 , typename iType7
-        >
-struct ViewMapping
-  < typename std::enable_if< (N0 != 0 && N1 != 0 && N2 != 0 && N3 != 0 && N4 != 0 && N5 != 0 && N6 != 0 && N7 != 0) >::type //void
-  , Kokkos::ViewTraits<T********,Kokkos::Experimental::LayoutTiled<OuterP,InnerP,N0,N1,N2,N3,N4,N5,N6,N7,true>,P...>
-  , Kokkos::Experimental::LayoutTiled<OuterP,InnerP,N0,N1,N2,N3,N4,N5,N6,N7,true>
-  , iType0
-  , iType1
-  , iType2 
-  , iType3
-  , iType4
-  , iType5 
-  , iType6
-  , iType7 >
-{
-  typedef Kokkos::Experimental::LayoutTiled<OuterP,InnerP,N0,N1,N2,N3,N4,N5,N6,N7,true>  src_layout ;
-  typedef Kokkos::ViewTraits< T******** , src_layout , P... > src_traits ;
+template <typename T, Kokkos::Iterate OuterP, Kokkos::Iterate InnerP,
+          unsigned N0, unsigned N1, unsigned N2, unsigned N3, unsigned N4,
+          unsigned N5, unsigned N6, unsigned N7, class... P, typename iType0,
+          typename iType1, typename iType2, typename iType3, typename iType4,
+          typename iType5, typename iType6, typename iType7>
+struct ViewMapping<
+    typename std::enable_if<(N0 != 0 && N1 != 0 && N2 != 0 && N3 != 0 &&
+                             N4 != 0 && N5 != 0 && N6 != 0 &&
+                             N7 != 0)>::type  // void
+    ,
+    Kokkos::ViewTraits<
+        T********,
+        Kokkos::Experimental::LayoutTiled<OuterP, InnerP, N0, N1, N2, N3, N4,
+                                          N5, N6, N7, true>,
+        P...>,
+    Kokkos::Experimental::LayoutTiled<OuterP, InnerP, N0, N1, N2, N3, N4, N5,
+                                      N6, N7, true>,
+    iType0, iType1, iType2, iType3, iType4, iType5, iType6, iType7> {
+  typedef Kokkos::Experimental::LayoutTiled<OuterP, InnerP, N0, N1, N2, N3, N4,
+                                            N5, N6, N7, true>
+      src_layout;
+  typedef Kokkos::ViewTraits<T********, src_layout, P...> src_traits;
 
   enum { is_outer_left = (OuterP == Kokkos::Iterate::Left) };
   enum { is_inner_left = (InnerP == Kokkos::Iterate::Left) };
-  typedef typename std::conditional< is_inner_left, Kokkos::LayoutLeft, Kokkos::LayoutRight >::type array_layout;
-  typedef Kokkos::ViewTraits< T[N0][N1][N2][N3][N4][N5][N6][N7] , array_layout , P ... > traits ;
-  typedef Kokkos::View< T[N0][N1][N2][N3][N4][N5][N6][N7] , array_layout , P ... > type ;
+  typedef typename std::conditional<is_inner_left, Kokkos::LayoutLeft,
+                                    Kokkos::LayoutRight>::type array_layout;
+  typedef Kokkos::ViewTraits<T[N0][N1][N2][N3][N4][N5][N6][N7], array_layout,
+                             P...>
+      traits;
+  typedef Kokkos::View<T[N0][N1][N2][N3][N4][N5][N6][N7], array_layout, P...>
+      type;
 
-  KOKKOS_INLINE_FUNCTION static
-  void assign( ViewMapping< traits , void > & dst
-             , const ViewMapping< src_traits , void > & src
-             , const src_layout &
-             , const iType0 i_tile0
-             , const iType1 i_tile1
-             , const iType2 i_tile2
-             , const iType3 i_tile3
-             , const iType4 i_tile4
-             , const iType5 i_tile5
-             , const iType6 i_tile6
-             , const iType7 i_tile7
-             )
-    {
-      typedef ViewMapping< traits , void >        dst_map_type ;
-      typedef ViewMapping< src_traits , void >    src_map_type ;
-      typedef typename dst_map_type::handle_type  dst_handle_type ;
-      typedef typename dst_map_type::offset_type  dst_offset_type ;
-      typedef typename src_map_type::offset_type  src_offset_type ;
+  KOKKOS_INLINE_FUNCTION static void assign(
+      ViewMapping<traits, void>& dst, const ViewMapping<src_traits, void>& src,
+      const src_layout&, const iType0 i_tile0, const iType1 i_tile1,
+      const iType2 i_tile2, const iType3 i_tile3, const iType4 i_tile4,
+      const iType5 i_tile5, const iType6 i_tile6, const iType7 i_tile7) {
+    typedef ViewMapping<traits, void> dst_map_type;
+    typedef ViewMapping<src_traits, void> src_map_type;
+    typedef typename dst_map_type::handle_type dst_handle_type;
+    typedef typename dst_map_type::offset_type dst_offset_type;
+    typedef typename src_map_type::offset_type src_offset_type;
 
-      dst = dst_map_type(
-         dst_handle_type( src.m_impl_handle +
-                          ( is_outer_left ? ( ( i_tile0 + src.m_impl_offset.m_tile_N0 * ( i_tile1 + src.m_impl_offset.m_tile_N1 * ( i_tile2 + src.m_impl_offset.m_tile_N2 * ( i_tile3 + src.m_impl_offset.m_tile_N3 * ( i_tile4 + src.m_impl_offset.m_tile_N4 * ( i_tile5 + src.m_impl_offset.m_tile_N5 * ( i_tile6 + src.m_impl_offset.m_tile_N6 * i_tile7 ) ) ) ) ) ) ) << src_offset_type::SHIFT_8T ) 
-                                          : ( ( src.m_impl_offset.m_tile_N7 * ( src.m_impl_offset.m_tile_N6 * ( src.m_impl_offset.m_tile_N5 * ( src.m_impl_offset.m_tile_N4 * ( src.m_impl_offset.m_tile_N3 * ( src.m_impl_offset.m_tile_N2 * ( src.m_impl_offset.m_tile_N1 * i_tile0 + i_tile1 ) + i_tile2 ) + i_tile3 ) + i_tile4 ) + i_tile5 ) + i_tile6 ) + i_tile7 ) << src_offset_type::SHIFT_8T )
-                          )
-                        ) // offset to start of the tile
-       , dst_offset_type() );
-    }
+    dst = dst_map_type(
+        dst_handle_type(
+            src.m_impl_handle +
+            (is_outer_left
+                 ? ((i_tile0 +
+                     src.m_impl_offset.m_tile_N0 *
+                         (i_tile1 +
+                          src.m_impl_offset.m_tile_N1 *
+                              (i_tile2 +
+                               src.m_impl_offset.m_tile_N2 *
+                                   (i_tile3 +
+                                    src.m_impl_offset.m_tile_N3 *
+                                        (i_tile4 +
+                                         src.m_impl_offset.m_tile_N4 *
+                                             (i_tile5 +
+                                              src.m_impl_offset.m_tile_N5 *
+                                                  (i_tile6 +
+                                                   src.m_impl_offset.m_tile_N6 *
+                                                       i_tile7)))))))
+                    << src_offset_type::SHIFT_8T)
+                 : ((src.m_impl_offset.m_tile_N7 *
+                         (src.m_impl_offset.m_tile_N6 *
+                              (src.m_impl_offset.m_tile_N5 *
+                                   (src.m_impl_offset.m_tile_N4 *
+                                        (src.m_impl_offset.m_tile_N3 *
+                                             (src.m_impl_offset.m_tile_N2 *
+                                                  (src.m_impl_offset.m_tile_N1 *
+                                                       i_tile0 +
+                                                   i_tile1) +
+                                              i_tile2) +
+                                         i_tile3) +
+                                    i_tile4) +
+                               i_tile5) +
+                          i_tile6) +
+                     i_tile7)
+                    << src_offset_type::SHIFT_8T)))  // offset to start of the
+                                                     // tile
+        ,
+        dst_offset_type());
+  }
 };
 
-
 } /* namespace Impl */
 } /* namespace Kokkos */
 
@@ -776,170 +1144,220 @@ struct ViewMapping
 namespace Kokkos {
 
 // Rank 2
-template< typename T , Kokkos::Iterate OuterP , Kokkos::Iterate InnerP , unsigned N0 , unsigned N1 , unsigned N2 , unsigned N3 , unsigned N4 , unsigned N5 , unsigned N6 , unsigned N7 
-        , class ... P 
-        >
-KOKKOS_INLINE_FUNCTION
-Kokkos::View< T[N0][N1] , typename std::conditional< (InnerP == Kokkos::Iterate::Left), Kokkos::LayoutLeft, Kokkos::LayoutRight >::type , P... >
-tile_subview( const Kokkos::View<T**, Kokkos::Experimental::LayoutTiled<OuterP,InnerP,N0,N1,N2,N3,N4,N5,N6,N7,true>, P...> & src
-            , const size_t i_tile0
-            , const size_t i_tile1
-            )
-{
+template <typename T, Kokkos::Iterate OuterP, Kokkos::Iterate InnerP,
+          unsigned N0, unsigned N1, unsigned N2, unsigned N3, unsigned N4,
+          unsigned N5, unsigned N6, unsigned N7, class... P>
+KOKKOS_INLINE_FUNCTION Kokkos::View<
+    T[N0][N1],
+    typename std::conditional<(InnerP == Kokkos::Iterate::Left),
+                              Kokkos::LayoutLeft, Kokkos::LayoutRight>::type,
+    P...>
+tile_subview(const Kokkos::View<
+                 T**,
+                 Kokkos::Experimental::LayoutTiled<OuterP, InnerP, N0, N1, N2,
+                                                   N3, N4, N5, N6, N7, true>,
+                 P...>& src,
+             const size_t i_tile0, const size_t i_tile1) {
   // Force the specialized ViewMapping for extracting a tile
   // by using the first subview argument as the layout.
-  typedef typename std::conditional< (InnerP == Kokkos::Iterate::Left), Kokkos::LayoutLeft, Kokkos::LayoutRight >::type array_layout;
-  typedef Kokkos::Experimental::LayoutTiled<OuterP,InnerP,N0,N1,N2,N3,N4,N5,N6,N7,true> SrcLayout ;
+  typedef
+      typename std::conditional<(InnerP == Kokkos::Iterate::Left),
+                                Kokkos::LayoutLeft, Kokkos::LayoutRight>::type
+          array_layout;
+  typedef Kokkos::Experimental::LayoutTiled<OuterP, InnerP, N0, N1, N2, N3, N4,
+                                            N5, N6, N7, true>
+      SrcLayout;
 
-  return Kokkos::View< T[N0][N1] , array_layout , P... >
-    ( src , SrcLayout() , i_tile0 , i_tile1 );
+  return Kokkos::View<T[N0][N1], array_layout, P...>(src, SrcLayout(), i_tile0,
+                                                     i_tile1);
 }
 
 // Rank 3
-template< typename T , Kokkos::Iterate OuterP , Kokkos::Iterate InnerP , unsigned N0 , unsigned N1 , unsigned N2 , unsigned N3 , unsigned N4 , unsigned N5 , unsigned N6 , unsigned N7 
-        , class ... P 
-        >
-KOKKOS_INLINE_FUNCTION
-Kokkos::View< T[N0][N1][N2] , typename std::conditional< (InnerP == Kokkos::Iterate::Left), Kokkos::LayoutLeft, Kokkos::LayoutRight >::type , P... >
-tile_subview( const Kokkos::View<T***, Kokkos::Experimental::LayoutTiled<OuterP,InnerP,N0,N1,N2,N3,N4,N5,N6,N7,true>, P...> & src
-            , const size_t i_tile0
-            , const size_t i_tile1
-            , const size_t i_tile2
-            )
-{
+template <typename T, Kokkos::Iterate OuterP, Kokkos::Iterate InnerP,
+          unsigned N0, unsigned N1, unsigned N2, unsigned N3, unsigned N4,
+          unsigned N5, unsigned N6, unsigned N7, class... P>
+KOKKOS_INLINE_FUNCTION Kokkos::View<
+    T[N0][N1][N2],
+    typename std::conditional<(InnerP == Kokkos::Iterate::Left),
+                              Kokkos::LayoutLeft, Kokkos::LayoutRight>::type,
+    P...>
+tile_subview(const Kokkos::View<
+                 T***,
+                 Kokkos::Experimental::LayoutTiled<OuterP, InnerP, N0, N1, N2,
+                                                   N3, N4, N5, N6, N7, true>,
+                 P...>& src,
+             const size_t i_tile0, const size_t i_tile1, const size_t i_tile2) {
   // Force the specialized ViewMapping for extracting a tile
   // by using the first subview argument as the layout.
-  typedef typename std::conditional< (InnerP == Kokkos::Iterate::Left), Kokkos::LayoutLeft, Kokkos::LayoutRight >::type array_layout;
-  typedef Kokkos::Experimental::LayoutTiled<OuterP,InnerP,N0,N1,N2,N3,N4,N5,N6,N7,true> SrcLayout ;
+  typedef
+      typename std::conditional<(InnerP == Kokkos::Iterate::Left),
+                                Kokkos::LayoutLeft, Kokkos::LayoutRight>::type
+          array_layout;
+  typedef Kokkos::Experimental::LayoutTiled<OuterP, InnerP, N0, N1, N2, N3, N4,
+                                            N5, N6, N7, true>
+      SrcLayout;
 
-  return Kokkos::View< T[N0][N1][N2] , array_layout , P... >
-    ( src , SrcLayout() , i_tile0 , i_tile1 , i_tile2 );
+  return Kokkos::View<T[N0][N1][N2], array_layout, P...>(
+      src, SrcLayout(), i_tile0, i_tile1, i_tile2);
 }
 
 // Rank 4
-template< typename T , Kokkos::Iterate OuterP , Kokkos::Iterate InnerP , unsigned N0 , unsigned N1 , unsigned N2 , unsigned N3 , unsigned N4 , unsigned N5 , unsigned N6 , unsigned N7 
-        , class ... P 
-        >
-KOKKOS_INLINE_FUNCTION
-Kokkos::View< T[N0][N1][N2][N3] , typename std::conditional< (InnerP == Kokkos::Iterate::Left), Kokkos::LayoutLeft, Kokkos::LayoutRight >::type , P... >
-tile_subview( const Kokkos::View<T****, Kokkos::Experimental::LayoutTiled<OuterP,InnerP,N0,N1,N2,N3,N4,N5,N6,N7,true>, P...> & src
-            , const size_t i_tile0
-            , const size_t i_tile1
-            , const size_t i_tile2
-            , const size_t i_tile3
-            )
-{
+template <typename T, Kokkos::Iterate OuterP, Kokkos::Iterate InnerP,
+          unsigned N0, unsigned N1, unsigned N2, unsigned N3, unsigned N4,
+          unsigned N5, unsigned N6, unsigned N7, class... P>
+KOKKOS_INLINE_FUNCTION Kokkos::View<
+    T[N0][N1][N2][N3],
+    typename std::conditional<(InnerP == Kokkos::Iterate::Left),
+                              Kokkos::LayoutLeft, Kokkos::LayoutRight>::type,
+    P...>
+tile_subview(const Kokkos::View<
+                 T****,
+                 Kokkos::Experimental::LayoutTiled<OuterP, InnerP, N0, N1, N2,
+                                                   N3, N4, N5, N6, N7, true>,
+                 P...>& src,
+             const size_t i_tile0, const size_t i_tile1, const size_t i_tile2,
+             const size_t i_tile3) {
   // Force the specialized ViewMapping for extracting a tile
   // by using the first subview argument as the layout.
-  typedef typename std::conditional< (InnerP == Kokkos::Iterate::Left), Kokkos::LayoutLeft, Kokkos::LayoutRight >::type array_layout;
-  typedef Kokkos::Experimental::LayoutTiled<OuterP,InnerP,N0,N1,N2,N3,N4,N5,N6,N7,true> SrcLayout ;
+  typedef
+      typename std::conditional<(InnerP == Kokkos::Iterate::Left),
+                                Kokkos::LayoutLeft, Kokkos::LayoutRight>::type
+          array_layout;
+  typedef Kokkos::Experimental::LayoutTiled<OuterP, InnerP, N0, N1, N2, N3, N4,
+                                            N5, N6, N7, true>
+      SrcLayout;
 
-  return Kokkos::View< T[N0][N1][N2][N3] , array_layout , P... >
-    ( src , SrcLayout() , i_tile0 , i_tile1 , i_tile2 , i_tile3 );
+  return Kokkos::View<T[N0][N1][N2][N3], array_layout, P...>(
+      src, SrcLayout(), i_tile0, i_tile1, i_tile2, i_tile3);
 }
 
 // Rank 5
-template< typename T , Kokkos::Iterate OuterP , Kokkos::Iterate InnerP , unsigned N0 , unsigned N1 , unsigned N2 , unsigned N3 , unsigned N4 , unsigned N5 , unsigned N6 , unsigned N7 
-        , class ... P 
-        >
-KOKKOS_INLINE_FUNCTION
-Kokkos::View< T[N0][N1][N2][N3][N4] , typename std::conditional< (InnerP == Kokkos::Iterate::Left), Kokkos::LayoutLeft, Kokkos::LayoutRight >::type , P... >
-tile_subview( const Kokkos::View<T*****, Kokkos::Experimental::LayoutTiled<OuterP,InnerP,N0,N1,N2,N3,N4,N5,N6,N7,true>, P...> & src
-            , const size_t i_tile0
-            , const size_t i_tile1
-            , const size_t i_tile2
-            , const size_t i_tile3
-            , const size_t i_tile4
-            )
-{
+template <typename T, Kokkos::Iterate OuterP, Kokkos::Iterate InnerP,
+          unsigned N0, unsigned N1, unsigned N2, unsigned N3, unsigned N4,
+          unsigned N5, unsigned N6, unsigned N7, class... P>
+KOKKOS_INLINE_FUNCTION Kokkos::View<
+    T[N0][N1][N2][N3][N4],
+    typename std::conditional<(InnerP == Kokkos::Iterate::Left),
+                              Kokkos::LayoutLeft, Kokkos::LayoutRight>::type,
+    P...>
+tile_subview(const Kokkos::View<
+                 T*****,
+                 Kokkos::Experimental::LayoutTiled<OuterP, InnerP, N0, N1, N2,
+                                                   N3, N4, N5, N6, N7, true>,
+                 P...>& src,
+             const size_t i_tile0, const size_t i_tile1, const size_t i_tile2,
+             const size_t i_tile3, const size_t i_tile4) {
   // Force the specialized ViewMapping for extracting a tile
   // by using the first subview argument as the layout.
-  typedef typename std::conditional< (InnerP == Kokkos::Iterate::Left), Kokkos::LayoutLeft, Kokkos::LayoutRight >::type array_layout;
-  typedef Kokkos::Experimental::LayoutTiled<OuterP,InnerP,N0,N1,N2,N3,N4,N5,N6,N7,true> SrcLayout ;
+  typedef
+      typename std::conditional<(InnerP == Kokkos::Iterate::Left),
+                                Kokkos::LayoutLeft, Kokkos::LayoutRight>::type
+          array_layout;
+  typedef Kokkos::Experimental::LayoutTiled<OuterP, InnerP, N0, N1, N2, N3, N4,
+                                            N5, N6, N7, true>
+      SrcLayout;
 
-  return Kokkos::View< T[N0][N1][N2][N3][N4] , array_layout , P... >
-    ( src , SrcLayout() , i_tile0 , i_tile1 , i_tile2 , i_tile3 , i_tile4 );
+  return Kokkos::View<T[N0][N1][N2][N3][N4], array_layout, P...>(
+      src, SrcLayout(), i_tile0, i_tile1, i_tile2, i_tile3, i_tile4);
 }
 
 // Rank 6
-template< typename T , Kokkos::Iterate OuterP , Kokkos::Iterate InnerP , unsigned N0 , unsigned N1 , unsigned N2 , unsigned N3 , unsigned N4 , unsigned N5 , unsigned N6 , unsigned N7 
-        , class ... P 
-        >
-KOKKOS_INLINE_FUNCTION
-Kokkos::View< T[N0][N1][N2][N3][N4][N5] , typename std::conditional< (InnerP == Kokkos::Iterate::Left), Kokkos::LayoutLeft, Kokkos::LayoutRight >::type , P... >
-tile_subview( const Kokkos::View<T******, Kokkos::Experimental::LayoutTiled<OuterP,InnerP,N0,N1,N2,N3,N4,N5,N6,N7,true>, P...> & src
-            , const size_t i_tile0
-            , const size_t i_tile1
-            , const size_t i_tile2
-            , const size_t i_tile3
-            , const size_t i_tile4
-            , const size_t i_tile5
-            )
-{
+template <typename T, Kokkos::Iterate OuterP, Kokkos::Iterate InnerP,
+          unsigned N0, unsigned N1, unsigned N2, unsigned N3, unsigned N4,
+          unsigned N5, unsigned N6, unsigned N7, class... P>
+KOKKOS_INLINE_FUNCTION Kokkos::View<
+    T[N0][N1][N2][N3][N4][N5],
+    typename std::conditional<(InnerP == Kokkos::Iterate::Left),
+                              Kokkos::LayoutLeft, Kokkos::LayoutRight>::type,
+    P...>
+tile_subview(const Kokkos::View<
+                 T******,
+                 Kokkos::Experimental::LayoutTiled<OuterP, InnerP, N0, N1, N2,
+                                                   N3, N4, N5, N6, N7, true>,
+                 P...>& src,
+             const size_t i_tile0, const size_t i_tile1, const size_t i_tile2,
+             const size_t i_tile3, const size_t i_tile4, const size_t i_tile5) {
   // Force the specialized ViewMapping for extracting a tile
   // by using the first subview argument as the layout.
-  typedef typename std::conditional< (InnerP == Kokkos::Iterate::Left), Kokkos::LayoutLeft, Kokkos::LayoutRight >::type array_layout;
-  typedef Kokkos::Experimental::LayoutTiled<OuterP,InnerP,N0,N1,N2,N3,N4,N5,N6,N7,true> SrcLayout ;
+  typedef
+      typename std::conditional<(InnerP == Kokkos::Iterate::Left),
+                                Kokkos::LayoutLeft, Kokkos::LayoutRight>::type
+          array_layout;
+  typedef Kokkos::Experimental::LayoutTiled<OuterP, InnerP, N0, N1, N2, N3, N4,
+                                            N5, N6, N7, true>
+      SrcLayout;
 
-  return Kokkos::View< T[N0][N1][N2][N3][N4][N5] , array_layout , P... >
-    ( src , SrcLayout() , i_tile0 , i_tile1 , i_tile2 , i_tile3 , i_tile4 , i_tile5 );
+  return Kokkos::View<T[N0][N1][N2][N3][N4][N5], array_layout, P...>(
+      src, SrcLayout(), i_tile0, i_tile1, i_tile2, i_tile3, i_tile4, i_tile5);
 }
 
 // Rank 7
-template< typename T , Kokkos::Iterate OuterP , Kokkos::Iterate InnerP , unsigned N0 , unsigned N1 , unsigned N2 , unsigned N3 , unsigned N4 , unsigned N5 , unsigned N6 , unsigned N7 
-        , class ... P 
-        >
-KOKKOS_INLINE_FUNCTION
-Kokkos::View< T[N0][N1][N2][N3][N4][N5][N6] , typename std::conditional< (InnerP == Kokkos::Iterate::Left), Kokkos::LayoutLeft, Kokkos::LayoutRight >::type , P... >
-tile_subview( const Kokkos::View<T*******, Kokkos::Experimental::LayoutTiled<OuterP,InnerP,N0,N1,N2,N3,N4,N5,N6,N7,true>, P...> & src
-            , const size_t i_tile0
-            , const size_t i_tile1
-            , const size_t i_tile2
-            , const size_t i_tile3
-            , const size_t i_tile4
-            , const size_t i_tile5
-            , const size_t i_tile6
-            )
-{
+template <typename T, Kokkos::Iterate OuterP, Kokkos::Iterate InnerP,
+          unsigned N0, unsigned N1, unsigned N2, unsigned N3, unsigned N4,
+          unsigned N5, unsigned N6, unsigned N7, class... P>
+KOKKOS_INLINE_FUNCTION Kokkos::View<
+    T[N0][N1][N2][N3][N4][N5][N6],
+    typename std::conditional<(InnerP == Kokkos::Iterate::Left),
+                              Kokkos::LayoutLeft, Kokkos::LayoutRight>::type,
+    P...>
+tile_subview(const Kokkos::View<
+                 T*******,
+                 Kokkos::Experimental::LayoutTiled<OuterP, InnerP, N0, N1, N2,
+                                                   N3, N4, N5, N6, N7, true>,
+                 P...>& src,
+             const size_t i_tile0, const size_t i_tile1, const size_t i_tile2,
+             const size_t i_tile3, const size_t i_tile4, const size_t i_tile5,
+             const size_t i_tile6) {
   // Force the specialized ViewMapping for extracting a tile
   // by using the first subview argument as the layout.
-  typedef typename std::conditional< (InnerP == Kokkos::Iterate::Left), Kokkos::LayoutLeft, Kokkos::LayoutRight >::type array_layout;
-  typedef Kokkos::Experimental::LayoutTiled<OuterP,InnerP,N0,N1,N2,N3,N4,N5,N6,N7,true> SrcLayout ;
+  typedef
+      typename std::conditional<(InnerP == Kokkos::Iterate::Left),
+                                Kokkos::LayoutLeft, Kokkos::LayoutRight>::type
+          array_layout;
+  typedef Kokkos::Experimental::LayoutTiled<OuterP, InnerP, N0, N1, N2, N3, N4,
+                                            N5, N6, N7, true>
+      SrcLayout;
 
-  return Kokkos::View< T[N0][N1][N2][N3][N4][N5][N6] , array_layout , P... >
-    ( src , SrcLayout() , i_tile0 , i_tile1 , i_tile2 , i_tile3 , i_tile4 , i_tile5 , i_tile6 );
+  return Kokkos::View<T[N0][N1][N2][N3][N4][N5][N6], array_layout, P...>(
+      src, SrcLayout(), i_tile0, i_tile1, i_tile2, i_tile3, i_tile4, i_tile5,
+      i_tile6);
 }
 
 // Rank 8
-template< typename T , Kokkos::Iterate OuterP , Kokkos::Iterate InnerP , unsigned N0 , unsigned N1 , unsigned N2 , unsigned N3 , unsigned N4 , unsigned N5 , unsigned N6 , unsigned N7 
-        , class ... P 
-        >
-KOKKOS_INLINE_FUNCTION
-Kokkos::View< T[N0][N1][N2][N3][N4][N5][N6][N7] , typename std::conditional< (InnerP == Kokkos::Iterate::Left), Kokkos::LayoutLeft, Kokkos::LayoutRight >::type , P... >
-tile_subview( const Kokkos::View<T********, Kokkos::Experimental::LayoutTiled<OuterP,InnerP,N0,N1,N2,N3,N4,N5,N6,N7,true>, P...> & src
-            , const size_t i_tile0
-            , const size_t i_tile1
-            , const size_t i_tile2
-            , const size_t i_tile3
-            , const size_t i_tile4
-            , const size_t i_tile5
-            , const size_t i_tile6
-            , const size_t i_tile7
-            )
-{
+template <typename T, Kokkos::Iterate OuterP, Kokkos::Iterate InnerP,
+          unsigned N0, unsigned N1, unsigned N2, unsigned N3, unsigned N4,
+          unsigned N5, unsigned N6, unsigned N7, class... P>
+KOKKOS_INLINE_FUNCTION Kokkos::View<
+    T[N0][N1][N2][N3][N4][N5][N6][N7],
+    typename std::conditional<(InnerP == Kokkos::Iterate::Left),
+                              Kokkos::LayoutLeft, Kokkos::LayoutRight>::type,
+    P...>
+tile_subview(const Kokkos::View<
+                 T********,
+                 Kokkos::Experimental::LayoutTiled<OuterP, InnerP, N0, N1, N2,
+                                                   N3, N4, N5, N6, N7, true>,
+                 P...>& src,
+             const size_t i_tile0, const size_t i_tile1, const size_t i_tile2,
+             const size_t i_tile3, const size_t i_tile4, const size_t i_tile5,
+             const size_t i_tile6, const size_t i_tile7) {
   // Force the specialized ViewMapping for extracting a tile
   // by using the first subview argument as the layout.
-  typedef typename std::conditional< (InnerP == Kokkos::Iterate::Left), Kokkos::LayoutLeft, Kokkos::LayoutRight >::type array_layout;
-  typedef Kokkos::Experimental::LayoutTiled<OuterP,InnerP,N0,N1,N2,N3,N4,N5,N6,N7,true> SrcLayout ;
+  typedef
+      typename std::conditional<(InnerP == Kokkos::Iterate::Left),
+                                Kokkos::LayoutLeft, Kokkos::LayoutRight>::type
+          array_layout;
+  typedef Kokkos::Experimental::LayoutTiled<OuterP, InnerP, N0, N1, N2, N3, N4,
+                                            N5, N6, N7, true>
+      SrcLayout;
 
-  return Kokkos::View< T[N0][N1][N2][N3][N4][N5][N6][N7] , array_layout , P... >
-    ( src , SrcLayout() , i_tile0 , i_tile1 , i_tile2 , i_tile3 , i_tile4 , i_tile5 , i_tile6 , i_tile7 );
+  return Kokkos::View<T[N0][N1][N2][N3][N4][N5][N6][N7], array_layout, P...>(
+      src, SrcLayout(), i_tile0, i_tile1, i_tile2, i_tile3, i_tile4, i_tile5,
+      i_tile6, i_tile7);
 }
 
 } /* namespace Kokkos */
-#endif //!defined(KOKKOS_ENABLE_DEPRECATED_CODE
+#endif  //! defined(KOKKOS_ENABLE_DEPRECATED_CODE
 //----------------------------------------------------------------------------
 //----------------------------------------------------------------------------
 
 #endif /* #ifndef KOKKOS_EXPERIENTAL_VIEWLAYOUTTILE_HPP */
-
diff --git a/lib/kokkos/core/src/impl/Kokkos_ViewMapping.hpp b/lib/kokkos/core/src/impl/Kokkos_ViewMapping.hpp
index b2d8dea20a..f6dfacb4d8 100644
--- a/lib/kokkos/core/src/impl/Kokkos_ViewMapping.hpp
+++ b/lib/kokkos/core/src/impl/Kokkos_ViewMapping.hpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -65,205 +66,240 @@
 namespace Kokkos {
 namespace Impl {
 
-template< unsigned I , size_t ... Args >
-struct variadic_size_t
-  { enum { value =KOKKOS_INVALID_INDEX }; };
-
-template< size_t Val , size_t ... Args >
-struct variadic_size_t< 0 , Val , Args ... >
-  { enum { value = Val }; };
-
-template< unsigned I , size_t Val , size_t ... Args >
-struct variadic_size_t< I , Val , Args ... >
-  { enum { value = variadic_size_t< I - 1 , Args ... >::value }; };
-
-template< size_t ... Args >
-struct rank_dynamic ;
-
-template<>
-struct rank_dynamic<> { enum { value = 0 }; };
-
-template< size_t Val , size_t ... Args >
-struct rank_dynamic< Val , Args... >
-{
-  enum { value = ( Val == 0 ? 1 : 0 ) + rank_dynamic< Args... >::value };
+template <unsigned I, size_t... Args>
+struct variadic_size_t {
+  enum { value = KOKKOS_INVALID_INDEX };
 };
 
-#define KOKKOS_IMPL_VIEW_DIMENSION( R ) \
-  template< size_t V , unsigned > struct ViewDimension ## R \
-    { \
-      enum { ArgN ## R = ( V !=KOKKOS_INVALID_INDEX ? V : 1 ) }; \
-      enum { N ## R = ( V !=KOKKOS_INVALID_INDEX ? V : 1 ) }; \
-      KOKKOS_INLINE_FUNCTION explicit ViewDimension ## R ( size_t ) {} \
-      ViewDimension ## R () = default ; \
-      ViewDimension ## R ( const ViewDimension ## R  & ) = default ; \
-      ViewDimension ## R & operator = ( const ViewDimension ## R  & ) = default ; \
-    }; \
-  template< unsigned RD > struct ViewDimension ## R < 0 , RD > \
-    { \
-      enum { ArgN ## R = 0 }; \
-      typename std::conditional<( RD < 3 ), size_t , unsigned >::type N ## R ; \
-      ViewDimension ## R () = default ; \
-      ViewDimension ## R ( const ViewDimension ## R  & ) = default ; \
-      ViewDimension ## R & operator = ( const ViewDimension ## R  & ) = default ; \
-      KOKKOS_INLINE_FUNCTION explicit ViewDimension ## R ( size_t V ) : N ## R ( V ) {} \
-    };
+template <size_t Val, size_t... Args>
+struct variadic_size_t<0, Val, Args...> {
+  enum { value = Val };
+};
 
-KOKKOS_IMPL_VIEW_DIMENSION( 0 )
-KOKKOS_IMPL_VIEW_DIMENSION( 1 )
-KOKKOS_IMPL_VIEW_DIMENSION( 2 )
-KOKKOS_IMPL_VIEW_DIMENSION( 3 )
-KOKKOS_IMPL_VIEW_DIMENSION( 4 )
-KOKKOS_IMPL_VIEW_DIMENSION( 5 )
-KOKKOS_IMPL_VIEW_DIMENSION( 6 )
-KOKKOS_IMPL_VIEW_DIMENSION( 7 )
+template <unsigned I, size_t Val, size_t... Args>
+struct variadic_size_t<I, Val, Args...> {
+  enum { value = variadic_size_t<I - 1, Args...>::value };
+};
+
+template <size_t... Args>
+struct rank_dynamic;
+
+template <>
+struct rank_dynamic<> {
+  enum { value = 0 };
+};
+
+template <size_t Val, size_t... Args>
+struct rank_dynamic<Val, Args...> {
+  enum { value = (Val == 0 ? 1 : 0) + rank_dynamic<Args...>::value };
+};
+
+#define KOKKOS_IMPL_VIEW_DIMENSION(R)                                       \
+  template <size_t V, unsigned>                                             \
+  struct ViewDimension##R {                                                 \
+    enum { ArgN##R = (V != KOKKOS_INVALID_INDEX ? V : 1) };                 \
+    enum { N##R = (V != KOKKOS_INVALID_INDEX ? V : 1) };                    \
+    KOKKOS_INLINE_FUNCTION explicit ViewDimension##R(size_t) {}             \
+    ViewDimension##R()                        = default;                    \
+    ViewDimension##R(const ViewDimension##R&) = default;                    \
+    ViewDimension##R& operator=(const ViewDimension##R&) = default;         \
+  };                                                                        \
+  template <unsigned RD>                                                    \
+  struct ViewDimension##R<0, RD> {                                          \
+    enum { ArgN##R = 0 };                                                   \
+    typename std::conditional<(RD < 3), size_t, unsigned>::type N##R;       \
+    ViewDimension##R()                        = default;                    \
+    ViewDimension##R(const ViewDimension##R&) = default;                    \
+    ViewDimension##R& operator=(const ViewDimension##R&) = default;         \
+    KOKKOS_INLINE_FUNCTION explicit ViewDimension##R(size_t V) : N##R(V) {} \
+  };
+
+KOKKOS_IMPL_VIEW_DIMENSION(0)
+KOKKOS_IMPL_VIEW_DIMENSION(1)
+KOKKOS_IMPL_VIEW_DIMENSION(2)
+KOKKOS_IMPL_VIEW_DIMENSION(3)
+KOKKOS_IMPL_VIEW_DIMENSION(4)
+KOKKOS_IMPL_VIEW_DIMENSION(5)
+KOKKOS_IMPL_VIEW_DIMENSION(6)
+KOKKOS_IMPL_VIEW_DIMENSION(7)
 
 #undef KOKKOS_IMPL_VIEW_DIMENSION
 
-template< size_t ... Vals >
-struct ViewDimension
-  : public ViewDimension0< variadic_size_t<0,Vals...>::value
-                         , rank_dynamic< Vals... >::value >
-  , public ViewDimension1< variadic_size_t<1,Vals...>::value
-                         , rank_dynamic< Vals... >::value >
-  , public ViewDimension2< variadic_size_t<2,Vals...>::value
-                         , rank_dynamic< Vals... >::value >
-  , public ViewDimension3< variadic_size_t<3,Vals...>::value
-                         , rank_dynamic< Vals... >::value >
-  , public ViewDimension4< variadic_size_t<4,Vals...>::value
-                         , rank_dynamic< Vals... >::value >
-  , public ViewDimension5< variadic_size_t<5,Vals...>::value
-                         , rank_dynamic< Vals... >::value >
-  , public ViewDimension6< variadic_size_t<6,Vals...>::value
-                         , rank_dynamic< Vals... >::value >
-  , public ViewDimension7< variadic_size_t<7,Vals...>::value
-                         , rank_dynamic< Vals... >::value >
-{
-  typedef ViewDimension0< variadic_size_t<0,Vals...>::value
-                        , rank_dynamic< Vals... >::value > D0 ;
-  typedef ViewDimension1< variadic_size_t<1,Vals...>::value
-                        , rank_dynamic< Vals... >::value > D1 ;
-  typedef ViewDimension2< variadic_size_t<2,Vals...>::value
-                        , rank_dynamic< Vals... >::value > D2 ;
-  typedef ViewDimension3< variadic_size_t<3,Vals...>::value
-                        , rank_dynamic< Vals... >::value > D3 ;
-  typedef ViewDimension4< variadic_size_t<4,Vals...>::value
-                        , rank_dynamic< Vals... >::value > D4 ;
-  typedef ViewDimension5< variadic_size_t<5,Vals...>::value
-                        , rank_dynamic< Vals... >::value > D5 ;
-  typedef ViewDimension6< variadic_size_t<6,Vals...>::value
-                        , rank_dynamic< Vals... >::value > D6 ;
-  typedef ViewDimension7< variadic_size_t<7,Vals...>::value
-                        , rank_dynamic< Vals... >::value > D7 ;
+template <size_t... Vals>
+struct ViewDimension : public ViewDimension0<variadic_size_t<0, Vals...>::value,
+                                             rank_dynamic<Vals...>::value>,
+                       public ViewDimension1<variadic_size_t<1, Vals...>::value,
+                                             rank_dynamic<Vals...>::value>,
+                       public ViewDimension2<variadic_size_t<2, Vals...>::value,
+                                             rank_dynamic<Vals...>::value>,
+                       public ViewDimension3<variadic_size_t<3, Vals...>::value,
+                                             rank_dynamic<Vals...>::value>,
+                       public ViewDimension4<variadic_size_t<4, Vals...>::value,
+                                             rank_dynamic<Vals...>::value>,
+                       public ViewDimension5<variadic_size_t<5, Vals...>::value,
+                                             rank_dynamic<Vals...>::value>,
+                       public ViewDimension6<variadic_size_t<6, Vals...>::value,
+                                             rank_dynamic<Vals...>::value>,
+                       public ViewDimension7<variadic_size_t<7, Vals...>::value,
+                                             rank_dynamic<Vals...>::value> {
+  typedef ViewDimension0<variadic_size_t<0, Vals...>::value,
+                         rank_dynamic<Vals...>::value>
+      D0;
+  typedef ViewDimension1<variadic_size_t<1, Vals...>::value,
+                         rank_dynamic<Vals...>::value>
+      D1;
+  typedef ViewDimension2<variadic_size_t<2, Vals...>::value,
+                         rank_dynamic<Vals...>::value>
+      D2;
+  typedef ViewDimension3<variadic_size_t<3, Vals...>::value,
+                         rank_dynamic<Vals...>::value>
+      D3;
+  typedef ViewDimension4<variadic_size_t<4, Vals...>::value,
+                         rank_dynamic<Vals...>::value>
+      D4;
+  typedef ViewDimension5<variadic_size_t<5, Vals...>::value,
+                         rank_dynamic<Vals...>::value>
+      D5;
+  typedef ViewDimension6<variadic_size_t<6, Vals...>::value,
+                         rank_dynamic<Vals...>::value>
+      D6;
+  typedef ViewDimension7<variadic_size_t<7, Vals...>::value,
+                         rank_dynamic<Vals...>::value>
+      D7;
 
-  using D0::ArgN0 ;
-  using D1::ArgN1 ;
-  using D2::ArgN2 ;
-  using D3::ArgN3 ;
-  using D4::ArgN4 ;
-  using D5::ArgN5 ;
-  using D6::ArgN6 ;
-  using D7::ArgN7 ;
+  using D0::ArgN0;
+  using D1::ArgN1;
+  using D2::ArgN2;
+  using D3::ArgN3;
+  using D4::ArgN4;
+  using D5::ArgN5;
+  using D6::ArgN6;
+  using D7::ArgN7;
 
-  using D0::N0 ;
-  using D1::N1 ;
-  using D2::N2 ;
-  using D3::N3 ;
-  using D4::N4 ;
-  using D5::N5 ;
-  using D6::N6 ;
-  using D7::N7 ;
+  using D0::N0;
+  using D1::N1;
+  using D2::N2;
+  using D3::N3;
+  using D4::N4;
+  using D5::N5;
+  using D6::N6;
+  using D7::N7;
 
   enum { rank = sizeof...(Vals) };
-  enum { rank_dynamic = Impl::rank_dynamic< Vals... >::value };
+  enum { rank_dynamic = Impl::rank_dynamic<Vals...>::value };
 
-  ViewDimension() = default ;
-  ViewDimension( const ViewDimension & ) = default ;
-  ViewDimension & operator = ( const ViewDimension & ) = default ;
+  ViewDimension()                     = default;
+  ViewDimension(const ViewDimension&) = default;
+  ViewDimension& operator=(const ViewDimension&) = default;
 
   KOKKOS_INLINE_FUNCTION
-  constexpr
-  ViewDimension( size_t n0 , size_t n1 , size_t n2 , size_t n3
-               , size_t n4 , size_t n5 , size_t n6 , size_t n7 )
-    : D0( n0 )
-    , D1( n1 )
-    , D2( n2 )
-    , D3( n3 )
-    , D4( n4 )
-    , D5( n5 )
-    , D6( n6 )
-    , D7( n7 )
-    {}
+  constexpr ViewDimension(size_t n0, size_t n1, size_t n2, size_t n3, size_t n4,
+                          size_t n5, size_t n6, size_t n7)
+      : D0(n0), D1(n1), D2(n2), D3(n3), D4(n4), D5(n5), D6(n6), D7(n7) {}
 
   KOKKOS_INLINE_FUNCTION
-  constexpr size_t extent( const unsigned r ) const noexcept
-    {
-      return r == 0 ? N0 : (
-             r == 1 ? N1 : (
-             r == 2 ? N2 : (
-             r == 3 ? N3 : (
-             r == 4 ? N4 : (
-             r == 5 ? N5 : (
-             r == 6 ? N6 : (
-             r == 7 ? N7 : 0 )))))));
-    }
+  constexpr size_t extent(const unsigned r) const noexcept {
+    return r == 0
+               ? N0
+               : (r == 1
+                      ? N1
+                      : (r == 2
+                             ? N2
+                             : (r == 3
+                                    ? N3
+                                    : (r == 4
+                                           ? N4
+                                           : (r == 5
+                                                  ? N5
+                                                  : (r == 6
+                                                         ? N6
+                                                         : (r == 7 ? N7
+                                                                   : 0)))))));
+  }
 
-  static KOKKOS_INLINE_FUNCTION
-  constexpr size_t static_extent( const unsigned r ) noexcept
-    {
-      return r == 0 ? ArgN0 : (
-             r == 1 ? ArgN1 : (
-             r == 2 ? ArgN2 : (
-             r == 3 ? ArgN3 : (
-             r == 4 ? ArgN4 : (
-             r == 5 ? ArgN5 : (
-             r == 6 ? ArgN6 : (
-             r == 7 ? ArgN7 : 0 )))))));
-    }
+  static KOKKOS_INLINE_FUNCTION constexpr size_t static_extent(
+      const unsigned r) noexcept {
+    return r == 0
+               ? ArgN0
+               : (r == 1
+                      ? ArgN1
+                      : (r == 2
+                             ? ArgN2
+                             : (r == 3
+                                    ? ArgN3
+                                    : (r == 4
+                                           ? ArgN4
+                                           : (r == 5
+                                                  ? ArgN5
+                                                  : (r == 6
+                                                         ? ArgN6
+                                                         : (r == 7 ? ArgN7
+                                                                   : 0)))))));
+  }
 
-  template< size_t N >
-  struct prepend { typedef ViewDimension< N , Vals... > type ; };
+  template <size_t N>
+  struct prepend {
+    typedef ViewDimension<N, Vals...> type;
+  };
 
-  template< size_t N >
-  struct append { typedef ViewDimension< Vals... , N > type ; };
+  template <size_t N>
+  struct append {
+    typedef ViewDimension<Vals..., N> type;
+  };
 };
 
-template< class A , class B >
-struct ViewDimensionJoin ;
+template <class A, class B>
+struct ViewDimensionJoin;
 
-template< size_t ... A , size_t ... B >
-struct ViewDimensionJoin< ViewDimension< A... > , ViewDimension< B... > > {
-  typedef ViewDimension< A... , B... > type ;
+template <size_t... A, size_t... B>
+struct ViewDimensionJoin<ViewDimension<A...>, ViewDimension<B...> > {
+  typedef ViewDimension<A..., B...> type;
 };
 
 //----------------------------------------------------------------------------
 
-template< class DstDim , class SrcDim >
-struct ViewDimensionAssignable ;
+template <class DstDim, class SrcDim>
+struct ViewDimensionAssignable;
 
-template< size_t ... DstArgs , size_t ... SrcArgs >
-struct ViewDimensionAssignable< ViewDimension< DstArgs ... >
-                              , ViewDimension< SrcArgs ... > >
-{
-  typedef ViewDimension< DstArgs... > dst ;
-  typedef ViewDimension< SrcArgs... > src ;
-
-  enum { value =
-    unsigned(dst::rank) == unsigned(src::rank) && (
-      //Compile time check that potential static dimensions match
-      ( ( 1 > dst::rank_dynamic && 1 > src::rank_dynamic ) ? (size_t(dst::ArgN0) == size_t(src::ArgN0)) : true ) &&
-      ( ( 2 > dst::rank_dynamic && 2 > src::rank_dynamic ) ? (size_t(dst::ArgN1) == size_t(src::ArgN1)) : true ) &&
-      ( ( 3 > dst::rank_dynamic && 3 > src::rank_dynamic ) ? (size_t(dst::ArgN2) == size_t(src::ArgN2)) : true ) &&
-      ( ( 4 > dst::rank_dynamic && 4 > src::rank_dynamic ) ? (size_t(dst::ArgN3) == size_t(src::ArgN3)) : true ) &&
-      ( ( 5 > dst::rank_dynamic && 5 > src::rank_dynamic ) ? (size_t(dst::ArgN4) == size_t(src::ArgN4)) : true ) &&
-      ( ( 6 > dst::rank_dynamic && 6 > src::rank_dynamic ) ? (size_t(dst::ArgN5) == size_t(src::ArgN5)) : true ) &&
-      ( ( 7 > dst::rank_dynamic && 7 > src::rank_dynamic ) ? (size_t(dst::ArgN6) == size_t(src::ArgN6)) : true ) &&
-      ( ( 8 > dst::rank_dynamic && 8 > src::rank_dynamic ) ? (size_t(dst::ArgN7) == size_t(src::ArgN7)) : true )
-    )};
+template <size_t... DstArgs, size_t... SrcArgs>
+struct ViewDimensionAssignable<ViewDimension<DstArgs...>,
+                               ViewDimension<SrcArgs...> > {
+  typedef ViewDimension<DstArgs...> dst;
+  typedef ViewDimension<SrcArgs...> src;
 
+  enum {
+    value = unsigned(dst::rank) == unsigned(src::rank) &&
+            (
+                // Compile time check that potential static dimensions match
+                ((1 > dst::rank_dynamic && 1 > src::rank_dynamic)
+                     ? (size_t(dst::ArgN0) == size_t(src::ArgN0))
+                     : true) &&
+                ((2 > dst::rank_dynamic && 2 > src::rank_dynamic)
+                     ? (size_t(dst::ArgN1) == size_t(src::ArgN1))
+                     : true) &&
+                ((3 > dst::rank_dynamic && 3 > src::rank_dynamic)
+                     ? (size_t(dst::ArgN2) == size_t(src::ArgN2))
+                     : true) &&
+                ((4 > dst::rank_dynamic && 4 > src::rank_dynamic)
+                     ? (size_t(dst::ArgN3) == size_t(src::ArgN3))
+                     : true) &&
+                ((5 > dst::rank_dynamic && 5 > src::rank_dynamic)
+                     ? (size_t(dst::ArgN4) == size_t(src::ArgN4))
+                     : true) &&
+                ((6 > dst::rank_dynamic && 6 > src::rank_dynamic)
+                     ? (size_t(dst::ArgN5) == size_t(src::ArgN5))
+                     : true) &&
+                ((7 > dst::rank_dynamic && 7 > src::rank_dynamic)
+                     ? (size_t(dst::ArgN6) == size_t(src::ArgN6))
+                     : true) &&
+                ((8 > dst::rank_dynamic && 8 > src::rank_dynamic)
+                     ? (size_t(dst::ArgN7) == size_t(src::ArgN7))
+                     : true))
+  };
 };
 
-}} // namespace Kokkos::Impl
+}  // namespace Impl
+}  // namespace Kokkos
 
 //----------------------------------------------------------------------------
 //----------------------------------------------------------------------------
@@ -273,418 +309,411 @@ namespace Impl {
 
 struct ALL_t {
   KOKKOS_INLINE_FUNCTION
-  constexpr const ALL_t & operator()() const { return *this ; }
+  constexpr const ALL_t& operator()() const { return *this; }
 
   KOKKOS_INLINE_FUNCTION
-  constexpr bool operator == ( const ALL_t & ) const { return true;}
+  constexpr bool operator==(const ALL_t&) const { return true; }
 };
 
-}} // namespace Kokkos::Impl
+}  // namespace Impl
+}  // namespace Kokkos
 
 namespace Kokkos {
 namespace Impl {
 
-template< class T >
-struct is_integral_extent_type
-{ enum { value = std::is_same<T,Kokkos::Impl::ALL_t>::value ? 1 : 0 }; };
+template <class T>
+struct is_integral_extent_type {
+  enum { value = std::is_same<T, Kokkos::Impl::ALL_t>::value ? 1 : 0 };
+};
 
-template< class iType >
-struct is_integral_extent_type< std::pair<iType,iType> >
-{ enum { value = std::is_integral<iType>::value ? 1 : 0 }; };
+template <class iType>
+struct is_integral_extent_type<std::pair<iType, iType> > {
+  enum { value = std::is_integral<iType>::value ? 1 : 0 };
+};
 
-template< class iType >
-struct is_integral_extent_type< Kokkos::pair<iType,iType> >
-{ enum { value = std::is_integral<iType>::value ? 1 : 0 }; };
+template <class iType>
+struct is_integral_extent_type<Kokkos::pair<iType, iType> > {
+  enum { value = std::is_integral<iType>::value ? 1 : 0 };
+};
 
 // Assuming '2 == initializer_list<iType>::size()'
-template< class iType >
-struct is_integral_extent_type< std::initializer_list<iType> >
-{ enum { value = std::is_integral<iType>::value ? 1 : 0 }; };
+template <class iType>
+struct is_integral_extent_type<std::initializer_list<iType> > {
+  enum { value = std::is_integral<iType>::value ? 1 : 0 };
+};
 
-template < unsigned I , class ... Args >
-struct is_integral_extent
-{
+template <unsigned I, class... Args>
+struct is_integral_extent {
   // get_type is void when sizeof...(Args) <= I
-  typedef typename std::remove_cv<
-          typename std::remove_reference<
-          typename Kokkos::Impl::get_type<I,Args...
-          >::type >::type >::type type ;
+  typedef typename std::remove_cv<typename std::remove_reference<
+      typename Kokkos::Impl::get_type<I, Args...>::type>::type>::type type;
 
   enum { value = is_integral_extent_type<type>::value };
 
-  static_assert( value ||
-                 std::is_integral<type>::value ||
-                 std::is_same<type,void>::value
-               , "subview argument must be either integral or integral extent" );
+  static_assert(value || std::is_integral<type>::value ||
+                    std::is_same<type, void>::value,
+                "subview argument must be either integral or integral extent");
 };
 
 // Rules for subview arguments and layouts matching
 
-template<class LayoutDest, class LayoutSrc, int RankDest, int RankSrc, int CurrentArg, class ... SubViewArgs>
+template <class LayoutDest, class LayoutSrc, int RankDest, int RankSrc,
+          int CurrentArg, class... SubViewArgs>
 struct SubviewLegalArgsCompileTime;
 
 // Rules which allow LayoutLeft to LayoutLeft assignment
 
-template<int RankDest, int RankSrc, int CurrentArg, class Arg, class ... SubViewArgs>
-struct SubviewLegalArgsCompileTime<Kokkos::LayoutLeft, Kokkos::LayoutLeft, RankDest, RankSrc, CurrentArg, Arg, SubViewArgs...> {
-  enum { value      =(((CurrentArg==RankDest-1) && (Kokkos::Impl::is_integral_extent_type<Arg>::value)) ||
-                      ((CurrentArg>=RankDest) && (std::is_integral<Arg>::value)) ||
-                      ((CurrentArg<RankDest) && (std::is_same<Arg,Kokkos::Impl::ALL_t>::value)) ||
-                      ((CurrentArg==0) && (Kokkos::Impl::is_integral_extent_type<Arg>::value))
-                     ) && (SubviewLegalArgsCompileTime<Kokkos::LayoutLeft, Kokkos::LayoutLeft, RankDest, RankSrc, CurrentArg+1, SubViewArgs...>::value)};
+template <int RankDest, int RankSrc, int CurrentArg, class Arg,
+          class... SubViewArgs>
+struct SubviewLegalArgsCompileTime<Kokkos::LayoutLeft, Kokkos::LayoutLeft,
+                                   RankDest, RankSrc, CurrentArg, Arg,
+                                   SubViewArgs...> {
+  enum {
+    value = (((CurrentArg == RankDest - 1) &&
+              (Kokkos::Impl::is_integral_extent_type<Arg>::value)) ||
+             ((CurrentArg >= RankDest) && (std::is_integral<Arg>::value)) ||
+             ((CurrentArg < RankDest) &&
+              (std::is_same<Arg, Kokkos::Impl::ALL_t>::value)) ||
+             ((CurrentArg == 0) &&
+              (Kokkos::Impl::is_integral_extent_type<Arg>::value))) &&
+            (SubviewLegalArgsCompileTime<Kokkos::LayoutLeft, Kokkos::LayoutLeft,
+                                         RankDest, RankSrc, CurrentArg + 1,
+                                         SubViewArgs...>::value)
+  };
 };
 
-template<int RankDest, int RankSrc, int CurrentArg, class Arg>
-struct SubviewLegalArgsCompileTime<Kokkos::LayoutLeft, Kokkos::LayoutLeft, RankDest, RankSrc, CurrentArg, Arg> {
-  enum { value = ((CurrentArg==RankDest-1) || (std::is_integral<Arg>::value)) &&
-                 (CurrentArg==RankSrc-1) };
+template <int RankDest, int RankSrc, int CurrentArg, class Arg>
+struct SubviewLegalArgsCompileTime<Kokkos::LayoutLeft, Kokkos::LayoutLeft,
+                                   RankDest, RankSrc, CurrentArg, Arg> {
+  enum {
+    value = ((CurrentArg == RankDest - 1) || (std::is_integral<Arg>::value)) &&
+            (CurrentArg == RankSrc - 1)
+  };
 };
 
 // Rules which allow LayoutRight to LayoutRight assignment
 
-template<int RankDest, int RankSrc, int CurrentArg, class Arg, class ... SubViewArgs>
-struct SubviewLegalArgsCompileTime<Kokkos::LayoutRight, Kokkos::LayoutRight, RankDest, RankSrc, CurrentArg, Arg, SubViewArgs...> {
-  enum { value      =(((CurrentArg==RankSrc-RankDest) && (Kokkos::Impl::is_integral_extent_type<Arg>::value)) ||
-                      ((CurrentArg<RankSrc-RankDest) && (std::is_integral<Arg>::value)) ||
-                      ((CurrentArg>=RankSrc-RankDest) && (std::is_same<Arg,Kokkos::Impl::ALL_t>::value))
-                     ) && (SubviewLegalArgsCompileTime<Kokkos::LayoutRight, Kokkos::LayoutRight, RankDest, RankSrc, CurrentArg+1, SubViewArgs...>::value)};
+template <int RankDest, int RankSrc, int CurrentArg, class Arg,
+          class... SubViewArgs>
+struct SubviewLegalArgsCompileTime<Kokkos::LayoutRight, Kokkos::LayoutRight,
+                                   RankDest, RankSrc, CurrentArg, Arg,
+                                   SubViewArgs...> {
+  enum {
+    value = (((CurrentArg == RankSrc - RankDest) &&
+              (Kokkos::Impl::is_integral_extent_type<Arg>::value)) ||
+             ((CurrentArg < RankSrc - RankDest) &&
+              (std::is_integral<Arg>::value)) ||
+             ((CurrentArg >= RankSrc - RankDest) &&
+              (std::is_same<Arg, Kokkos::Impl::ALL_t>::value))) &&
+            (SubviewLegalArgsCompileTime<Kokkos::LayoutRight,
+                                         Kokkos::LayoutRight, RankDest, RankSrc,
+                                         CurrentArg + 1, SubViewArgs...>::value)
+  };
 };
 
-template<int RankDest, int RankSrc, int CurrentArg, class Arg>
-struct SubviewLegalArgsCompileTime<Kokkos::LayoutRight, Kokkos::LayoutRight, RankDest, RankSrc, CurrentArg, Arg> {
-  enum { value = ((CurrentArg==RankSrc-1) && (std::is_same<Arg,Kokkos::Impl::ALL_t>::value)) };
+template <int RankDest, int RankSrc, int CurrentArg, class Arg>
+struct SubviewLegalArgsCompileTime<Kokkos::LayoutRight, Kokkos::LayoutRight,
+                                   RankDest, RankSrc, CurrentArg, Arg> {
+  enum {
+    value = ((CurrentArg == RankSrc - 1) &&
+             (std::is_same<Arg, Kokkos::Impl::ALL_t>::value))
+  };
 };
 
 // Rules which allow assignment to LayoutStride
 
-template<int RankDest, int RankSrc, int CurrentArg, class ... SubViewArgs>
-struct SubviewLegalArgsCompileTime<Kokkos::LayoutStride,Kokkos::LayoutLeft,RankDest,RankSrc,CurrentArg,SubViewArgs...> {
+template <int RankDest, int RankSrc, int CurrentArg, class... SubViewArgs>
+struct SubviewLegalArgsCompileTime<Kokkos::LayoutStride, Kokkos::LayoutLeft,
+                                   RankDest, RankSrc, CurrentArg,
+                                   SubViewArgs...> {
   enum { value = true };
 };
 
-template<int RankDest, int RankSrc, int CurrentArg, class ... SubViewArgs>
-struct SubviewLegalArgsCompileTime<Kokkos::LayoutStride,Kokkos::LayoutRight,RankDest,RankSrc,CurrentArg,SubViewArgs...> {
+template <int RankDest, int RankSrc, int CurrentArg, class... SubViewArgs>
+struct SubviewLegalArgsCompileTime<Kokkos::LayoutStride, Kokkos::LayoutRight,
+                                   RankDest, RankSrc, CurrentArg,
+                                   SubViewArgs...> {
   enum { value = true };
 };
 
-template<int RankDest, int RankSrc, int CurrentArg, class ... SubViewArgs>
-struct SubviewLegalArgsCompileTime<Kokkos::LayoutStride,Kokkos::LayoutStride,RankDest,RankSrc,CurrentArg,SubViewArgs...> {
+template <int RankDest, int RankSrc, int CurrentArg, class... SubViewArgs>
+struct SubviewLegalArgsCompileTime<Kokkos::LayoutStride, Kokkos::LayoutStride,
+                                   RankDest, RankSrc, CurrentArg,
+                                   SubViewArgs...> {
   enum { value = true };
 };
 
-
-template< unsigned DomainRank , unsigned RangeRank >
+template <unsigned DomainRank, unsigned RangeRank>
 struct SubviewExtents {
-private:
-
+ private:
   // Cannot declare zero-length arrays
-  // '+' is used to silence GCC 7.2.0 -Wduplicated-branches warning when RangeRank=1
+  // '+' is used to silence GCC 7.2.0 -Wduplicated-branches warning when
+  // RangeRank=1
   enum { InternalRangeRank = RangeRank ? RangeRank : +1u };
 
-  size_t   m_begin[  DomainRank ];
-  size_t   m_length[ InternalRangeRank ];
-  unsigned m_index[  InternalRangeRank ];
+  size_t m_begin[DomainRank];
+  size_t m_length[InternalRangeRank];
+  unsigned m_index[InternalRangeRank];
 
-  template< size_t ... DimArgs >
-  KOKKOS_FORCEINLINE_FUNCTION
-  bool set( unsigned
-          , unsigned
-          , const ViewDimension< DimArgs ... > & )
-    { return true ; }
+  template <size_t... DimArgs>
+  KOKKOS_FORCEINLINE_FUNCTION bool set(unsigned, unsigned,
+                                       const ViewDimension<DimArgs...>&) {
+    return true;
+  }
 
-  template< class T , size_t ... DimArgs , class ... Args >
-  KOKKOS_FORCEINLINE_FUNCTION
-  bool set( unsigned domain_rank
-          , unsigned range_rank
-          , const ViewDimension< DimArgs ... > & dim
-          , const T & val
-          , Args ... args )
-    {
-      const size_t v = static_cast<size_t>(val);
+  template <class T, size_t... DimArgs, class... Args>
+  KOKKOS_FORCEINLINE_FUNCTION bool set(unsigned domain_rank,
+                                       unsigned range_rank,
+                                       const ViewDimension<DimArgs...>& dim,
+                                       const T& val, Args... args) {
+    const size_t v = static_cast<size_t>(val);
 
-      m_begin[ domain_rank ] = v ;
+    m_begin[domain_rank] = v;
 
-      return set( domain_rank + 1 , range_rank , dim , args... )
-#if defined( KOKKOS_ENABLE_DEBUG_BOUNDS_CHECK )
-             && ( v < dim.extent( domain_rank ) )
+    return set(domain_rank + 1, range_rank, dim, args...)
+#if defined(KOKKOS_ENABLE_DEBUG_BOUNDS_CHECK)
+           && (v < dim.extent(domain_rank))
 #endif
-      ;
-    }
+        ;
+  }
 
   // ALL_t
-  template< size_t ... DimArgs , class ... Args >
-  KOKKOS_FORCEINLINE_FUNCTION
-  bool set( unsigned domain_rank
-          , unsigned range_rank
-          , const ViewDimension< DimArgs ... > & dim
-          , const Kokkos::Impl::ALL_t
-          , Args ... args )
-    {
-      m_begin[  domain_rank ] = 0 ;
-      m_length[ range_rank  ] = dim.extent( domain_rank );
-      m_index[  range_rank  ] = domain_rank ;
+  template <size_t... DimArgs, class... Args>
+  KOKKOS_FORCEINLINE_FUNCTION bool set(unsigned domain_rank,
+                                       unsigned range_rank,
+                                       const ViewDimension<DimArgs...>& dim,
+                                       const Kokkos::Impl::ALL_t,
+                                       Args... args) {
+    m_begin[domain_rank] = 0;
+    m_length[range_rank] = dim.extent(domain_rank);
+    m_index[range_rank]  = domain_rank;
 
-      return set( domain_rank + 1 , range_rank + 1 , dim , args... );
-    }
+    return set(domain_rank + 1, range_rank + 1, dim, args...);
+  }
 
   // std::pair range
-  template< class T , size_t ... DimArgs , class ... Args >
-  KOKKOS_FORCEINLINE_FUNCTION
-  bool set( unsigned domain_rank
-          , unsigned range_rank
-          , const ViewDimension< DimArgs ... > & dim
-          , const std::pair<T,T> & val
-          , Args ... args )
-    {
-      const size_t b = static_cast<size_t>( val.first );
-      const size_t e = static_cast<size_t>( val.second );
+  template <class T, size_t... DimArgs, class... Args>
+  KOKKOS_FORCEINLINE_FUNCTION bool set(unsigned domain_rank,
+                                       unsigned range_rank,
+                                       const ViewDimension<DimArgs...>& dim,
+                                       const std::pair<T, T>& val,
+                                       Args... args) {
+    const size_t b = static_cast<size_t>(val.first);
+    const size_t e = static_cast<size_t>(val.second);
 
-      m_begin[  domain_rank ] = b ;
-      m_length[ range_rank  ] = e - b ;
-      m_index[  range_rank  ] = domain_rank ;
+    m_begin[domain_rank] = b;
+    m_length[range_rank] = e - b;
+    m_index[range_rank]  = domain_rank;
 
-      return set( domain_rank + 1 , range_rank + 1 , dim , args... )
-#if defined( KOKKOS_ENABLE_DEBUG_BOUNDS_CHECK )
-             && ( e <= b + dim.extent( domain_rank ) )
+    return set(domain_rank + 1, range_rank + 1, dim, args...)
+#if defined(KOKKOS_ENABLE_DEBUG_BOUNDS_CHECK)
+           && (e <= b + dim.extent(domain_rank))
 #endif
-      ;
-    }
+        ;
+  }
 
   // Kokkos::pair range
-  template< class T , size_t ... DimArgs , class ... Args >
-  KOKKOS_FORCEINLINE_FUNCTION
-  bool set( unsigned domain_rank
-          , unsigned range_rank
-          , const ViewDimension< DimArgs ... > & dim
-          , const Kokkos::pair<T,T> & val
-          , Args ... args )
-    {
-      const size_t b = static_cast<size_t>( val.first );
-      const size_t e = static_cast<size_t>( val.second );
+  template <class T, size_t... DimArgs, class... Args>
+  KOKKOS_FORCEINLINE_FUNCTION bool set(unsigned domain_rank,
+                                       unsigned range_rank,
+                                       const ViewDimension<DimArgs...>& dim,
+                                       const Kokkos::pair<T, T>& val,
+                                       Args... args) {
+    const size_t b = static_cast<size_t>(val.first);
+    const size_t e = static_cast<size_t>(val.second);
 
-      m_begin[  domain_rank ] = b ;
-      m_length[ range_rank  ] = e - b ;
-      m_index[  range_rank  ] = domain_rank ;
+    m_begin[domain_rank] = b;
+    m_length[range_rank] = e - b;
+    m_index[range_rank]  = domain_rank;
 
-      return set( domain_rank + 1 , range_rank + 1 , dim , args... )
-#if defined( KOKKOS_ENABLE_DEBUG_BOUNDS_CHECK )
-             && ( e <= b + dim.extent( domain_rank ) )
+    return set(domain_rank + 1, range_rank + 1, dim, args...)
+#if defined(KOKKOS_ENABLE_DEBUG_BOUNDS_CHECK)
+           && (e <= b + dim.extent(domain_rank))
 #endif
-      ;
-    }
+        ;
+  }
 
   // { begin , end } range
-  template< class T , size_t ... DimArgs , class ... Args >
-  KOKKOS_FORCEINLINE_FUNCTION
-  bool set( unsigned domain_rank
-          , unsigned range_rank
-          , const ViewDimension< DimArgs ... > & dim
-          , const std::initializer_list< T > & val
-          , Args ... args )
-    {
-      const size_t b = static_cast<size_t>( val.begin()[0] );
-      const size_t e = static_cast<size_t>( val.begin()[1] );
+  template <class T, size_t... DimArgs, class... Args>
+  KOKKOS_FORCEINLINE_FUNCTION bool set(unsigned domain_rank,
+                                       unsigned range_rank,
+                                       const ViewDimension<DimArgs...>& dim,
+                                       const std::initializer_list<T>& val,
+                                       Args... args) {
+    const size_t b = static_cast<size_t>(val.begin()[0]);
+    const size_t e = static_cast<size_t>(val.begin()[1]);
 
-      m_begin[  domain_rank ] = b ;
-      m_length[ range_rank  ] = e - b ;
-      m_index[  range_rank  ] = domain_rank ;
+    m_begin[domain_rank] = b;
+    m_length[range_rank] = e - b;
+    m_index[range_rank]  = domain_rank;
 
-      return set( domain_rank + 1 , range_rank + 1 , dim , args... )
-#if defined( KOKKOS_ENABLE_DEBUG_BOUNDS_CHECK )
-             && ( val.size() == 2 )
-             && ( e <= b + dim.extent( domain_rank ) )
+    return set(domain_rank + 1, range_rank + 1, dim, args...)
+#if defined(KOKKOS_ENABLE_DEBUG_BOUNDS_CHECK)
+           && (val.size() == 2) && (e <= b + dim.extent(domain_rank))
 #endif
-      ;
-    }
+        ;
+  }
 
   //------------------------------
 
-#if defined( KOKKOS_ENABLE_DEBUG_BOUNDS_CHECK )
+#if defined(KOKKOS_ENABLE_DEBUG_BOUNDS_CHECK)
 
-  template< size_t ... DimArgs >
-  void error( char *
-            , int
-            , unsigned
-            , unsigned
-            , const ViewDimension< DimArgs ... > & ) const
-    {}
+  template <size_t... DimArgs>
+  void error(char*, int, unsigned, unsigned,
+             const ViewDimension<DimArgs...>&) const {}
 
-  template< class T , size_t ... DimArgs , class ... Args >
-  void error( char * buf , int buf_len
-            , unsigned domain_rank
-            , unsigned range_rank
-            , const ViewDimension< DimArgs ... > & dim
-            , const T & val
-            , Args ... args ) const
-    {
-      const int n = std::min( buf_len ,
-        snprintf( buf , buf_len
-                , " %lu < %lu %c"
-                , static_cast<unsigned long>(val)
-                , static_cast<unsigned long>( dim.extent( domain_rank ) )
-                , int( sizeof...(Args) ? ',' : ')' ) ) );
+  template <class T, size_t... DimArgs, class... Args>
+  void error(char* buf, int buf_len, unsigned domain_rank, unsigned range_rank,
+             const ViewDimension<DimArgs...>& dim, const T& val,
+             Args... args) const {
+    const int n = std::min(
+        buf_len,
+        snprintf(buf, buf_len, " %lu < %lu %c", static_cast<unsigned long>(val),
+                 static_cast<unsigned long>(dim.extent(domain_rank)),
+                 int(sizeof...(Args) ? ',' : ')')));
 
-      error( buf+n, buf_len-n, domain_rank + 1 , range_rank , dim , args... );
-    }
+    error(buf + n, buf_len - n, domain_rank + 1, range_rank, dim, args...);
+  }
 
   // std::pair range
-  template< size_t ... DimArgs , class ... Args >
-  void error( char * buf , int buf_len
-            , unsigned domain_rank
-            , unsigned range_rank
-            , const ViewDimension< DimArgs ... > & dim
-            , const Kokkos::Impl::ALL_t
-            , Args ... args ) const
-    {
-      const int n = std::min( buf_len ,
-        snprintf( buf , buf_len
-                , " Kokkos::ALL %c"
-                , int( sizeof...(Args) ? ',' : ')' ) ) );
+  template <size_t... DimArgs, class... Args>
+  void error(char* buf, int buf_len, unsigned domain_rank, unsigned range_rank,
+             const ViewDimension<DimArgs...>& dim, const Kokkos::Impl::ALL_t,
+             Args... args) const {
+    const int n = std::min(buf_len, snprintf(buf, buf_len, " Kokkos::ALL %c",
+                                             int(sizeof...(Args) ? ',' : ')')));
 
-      error( buf+n , buf_len-n , domain_rank + 1 , range_rank + 1 , dim , args... );
-    }
+    error(buf + n, buf_len - n, domain_rank + 1, range_rank + 1, dim, args...);
+  }
 
   // std::pair range
-  template< class T , size_t ... DimArgs , class ... Args >
-  void error( char * buf , int buf_len
-            , unsigned domain_rank
-            , unsigned range_rank
-            , const ViewDimension< DimArgs ... > & dim
-            , const std::pair<T,T> & val
-            , Args ... args ) const
-    {
-      // d <= e - b
-      const int n = std::min( buf_len ,
-        snprintf( buf , buf_len
-                , " %lu <= %lu - %lu %c"
-                , static_cast<unsigned long>( dim.extent( domain_rank ) )
-                , static_cast<unsigned long>( val.second )
-                , static_cast<unsigned long>( val.first )
-                , int( sizeof...(Args) ? ',' : ')' ) ) );
+  template <class T, size_t... DimArgs, class... Args>
+  void error(char* buf, int buf_len, unsigned domain_rank, unsigned range_rank,
+             const ViewDimension<DimArgs...>& dim, const std::pair<T, T>& val,
+             Args... args) const {
+    // d <= e - b
+    const int n = std::min(
+        buf_len, snprintf(buf, buf_len, " %lu <= %lu - %lu %c",
+                          static_cast<unsigned long>(dim.extent(domain_rank)),
+                          static_cast<unsigned long>(val.second),
+                          static_cast<unsigned long>(val.first),
+                          int(sizeof...(Args) ? ',' : ')')));
 
-      error( buf+n , buf_len-n , domain_rank + 1 , range_rank + 1 , dim , args... );
-    }
+    error(buf + n, buf_len - n, domain_rank + 1, range_rank + 1, dim, args...);
+  }
 
   // Kokkos::pair range
-  template< class T , size_t ... DimArgs , class ... Args >
-  void error( char * buf , int buf_len
-            , unsigned domain_rank
-            , unsigned range_rank
-            , const ViewDimension< DimArgs ... > & dim
-            , const Kokkos::pair<T,T> & val
-            , Args ... args ) const
-    {
-      // d <= e - b
-      const int n = std::min( buf_len ,
-        snprintf( buf , buf_len
-                , " %lu <= %lu - %lu %c"
-                , static_cast<unsigned long>( dim.extent( domain_rank ) )
-                , static_cast<unsigned long>( val.second )
-                , static_cast<unsigned long>( val.first )
-                , int( sizeof...(Args) ? ',' : ')' ) ) );
+  template <class T, size_t... DimArgs, class... Args>
+  void error(char* buf, int buf_len, unsigned domain_rank, unsigned range_rank,
+             const ViewDimension<DimArgs...>& dim,
+             const Kokkos::pair<T, T>& val, Args... args) const {
+    // d <= e - b
+    const int n = std::min(
+        buf_len, snprintf(buf, buf_len, " %lu <= %lu - %lu %c",
+                          static_cast<unsigned long>(dim.extent(domain_rank)),
+                          static_cast<unsigned long>(val.second),
+                          static_cast<unsigned long>(val.first),
+                          int(sizeof...(Args) ? ',' : ')')));
 
-      error( buf+n , buf_len-n , domain_rank + 1 , range_rank + 1 , dim , args... );
-    }
+    error(buf + n, buf_len - n, domain_rank + 1, range_rank + 1, dim, args...);
+  }
 
   // { begin , end } range
-  template< class T , size_t ... DimArgs , class ... Args >
-  void error( char * buf , int buf_len
-            , unsigned domain_rank
-            , unsigned range_rank
-            , const ViewDimension< DimArgs ... > & dim
-            , const std::initializer_list< T > & val
-            , Args ... args ) const
-    {
-      // d <= e - b
-      int n = 0 ;
-      if ( val.size() == 2 ) {
-        n = std::min( buf_len ,
-          snprintf( buf , buf_len
-                  , " %lu <= %lu - %lu %c"
-                  , static_cast<unsigned long>( dim.extent( domain_rank ) )
-                  , static_cast<unsigned long>( val.begin()[0] )
-                  , static_cast<unsigned long>( val.begin()[1] )
-                  , int( sizeof...(Args) ? ',' : ')' ) ) );
-      }
-      else {
-        n = std::min( buf_len ,
-          snprintf( buf , buf_len
-                  , " { ... }.size() == %u %c"
-                  , unsigned(val.size())
-                  , int( sizeof...(Args) ? ',' : ')' ) ) );
-      }
-
-      error( buf+n , buf_len-n , domain_rank + 1 , range_rank + 1 , dim , args... );
+  template <class T, size_t... DimArgs, class... Args>
+  void error(char* buf, int buf_len, unsigned domain_rank, unsigned range_rank,
+             const ViewDimension<DimArgs...>& dim,
+             const std::initializer_list<T>& val, Args... args) const {
+    // d <= e - b
+    int n = 0;
+    if (val.size() == 2) {
+      n = std::min(buf_len,
+                   snprintf(buf, buf_len, " %lu <= %lu - %lu %c",
+                            static_cast<unsigned long>(dim.extent(domain_rank)),
+                            static_cast<unsigned long>(val.begin()[0]),
+                            static_cast<unsigned long>(val.begin()[1]),
+                            int(sizeof...(Args) ? ',' : ')')));
+    } else {
+      n = std::min(buf_len, snprintf(buf, buf_len, " { ... }.size() == %u %c",
+                                     unsigned(val.size()),
+                                     int(sizeof...(Args) ? ',' : ')')));
     }
 
-  template< size_t ... DimArgs , class ... Args >
-  KOKKOS_FORCEINLINE_FUNCTION
-  void error( const ViewDimension< DimArgs ... > & dim , Args ... args ) const
-    {
-#if defined( KOKKOS_ACTIVE_EXECUTION_MEMORY_SPACE_HOST )
-      enum { LEN = 1024 };
-      char buffer[ LEN ];
+    error(buf + n, buf_len - n, domain_rank + 1, range_rank + 1, dim, args...);
+  }
 
-      const int n = snprintf(buffer,LEN,"Kokkos::subview bounds error (");
-      error( buffer+n , LEN-n , 0 , 0 , dim , args... );
+  template <size_t... DimArgs, class... Args>
+  KOKKOS_FORCEINLINE_FUNCTION void error(const ViewDimension<DimArgs...>& dim,
+                                         Args... args) const {
+#if defined(KOKKOS_ACTIVE_EXECUTION_MEMORY_SPACE_HOST)
+    enum { LEN = 1024 };
+    char buffer[LEN];
 
-      Kokkos::Impl::throw_runtime_exception(std::string(buffer));
+    const int n = snprintf(buffer, LEN, "Kokkos::subview bounds error (");
+    error(buffer + n, LEN - n, 0, 0, dim, args...);
+
+    Kokkos::Impl::throw_runtime_exception(std::string(buffer));
 #else
-      Kokkos::abort("Kokkos::subview bounds error");
+    Kokkos::abort("Kokkos::subview bounds error");
 #endif
-    }
+  }
 
 #else
 
-  template< size_t ... DimArgs , class ... Args >
-  KOKKOS_FORCEINLINE_FUNCTION
-  void error( const ViewDimension< DimArgs ... > & , Args ... ) const {}
+  template <size_t... DimArgs, class... Args>
+  KOKKOS_FORCEINLINE_FUNCTION void error(const ViewDimension<DimArgs...>&,
+                                         Args...) const {}
 
 #endif
 
-public:
+ public:
+  template <size_t... DimArgs, class... Args>
+  KOKKOS_INLINE_FUNCTION SubviewExtents(const ViewDimension<DimArgs...>& dim,
+                                        Args... args) {
+    static_assert(DomainRank == sizeof...(DimArgs), "");
+    static_assert(DomainRank == sizeof...(Args), "");
 
-  template< size_t ... DimArgs , class ... Args >
-  KOKKOS_INLINE_FUNCTION
-  SubviewExtents( const ViewDimension< DimArgs ... > & dim , Args ... args )
-    {
-      static_assert( DomainRank == sizeof...(DimArgs) , "" );
-      static_assert( DomainRank == sizeof...(Args) , "" );
+    // Verifies that all arguments, up to 8, are integral types,
+    // integral extents, or don't exist.
+    static_assert(
+        RangeRank == unsigned(is_integral_extent<0, Args...>::value) +
+                         unsigned(is_integral_extent<1, Args...>::value) +
+                         unsigned(is_integral_extent<2, Args...>::value) +
+                         unsigned(is_integral_extent<3, Args...>::value) +
+                         unsigned(is_integral_extent<4, Args...>::value) +
+                         unsigned(is_integral_extent<5, Args...>::value) +
+                         unsigned(is_integral_extent<6, Args...>::value) +
+                         unsigned(is_integral_extent<7, Args...>::value),
+        "");
 
-      // Verifies that all arguments, up to 8, are integral types,
-      // integral extents, or don't exist.
-      static_assert( RangeRank ==
-        unsigned( is_integral_extent<0,Args...>::value ) +
-        unsigned( is_integral_extent<1,Args...>::value ) +
-        unsigned( is_integral_extent<2,Args...>::value ) +
-        unsigned( is_integral_extent<3,Args...>::value ) +
-        unsigned( is_integral_extent<4,Args...>::value ) +
-        unsigned( is_integral_extent<5,Args...>::value ) +
-        unsigned( is_integral_extent<6,Args...>::value ) +
-        unsigned( is_integral_extent<7,Args...>::value ) , "" );
-
-      if ( RangeRank == 0 ) { m_length[0] = 0 ; m_index[0] = ~0u ; }
-
-      if ( ! set( 0 , 0 , dim , args... ) ) error( dim , args... );
+    if (RangeRank == 0) {
+      m_length[0] = 0;
+      m_index[0]  = ~0u;
     }
 
-  template < typename iType >
-  KOKKOS_FORCEINLINE_FUNCTION
-  constexpr size_t domain_offset( const iType i ) const
-    { return unsigned(i) < DomainRank ? m_begin[i] : 0 ; }
+    if (!set(0, 0, dim, args...)) error(dim, args...);
+  }
 
-  template < typename iType >
-  KOKKOS_FORCEINLINE_FUNCTION
-  constexpr size_t range_extent( const iType i ) const
-    { return unsigned(i) < InternalRangeRank ? m_length[i] : 0 ; }
+  template <typename iType>
+  KOKKOS_FORCEINLINE_FUNCTION constexpr size_t domain_offset(
+      const iType i) const {
+    return unsigned(i) < DomainRank ? m_begin[i] : 0;
+  }
 
-  template < typename iType >
-  KOKKOS_FORCEINLINE_FUNCTION
-  constexpr unsigned range_index( const iType i ) const
-    { return unsigned(i) < InternalRangeRank ? m_index[i] : ~0u ; }
+  template <typename iType>
+  KOKKOS_FORCEINLINE_FUNCTION constexpr size_t range_extent(
+      const iType i) const {
+    return unsigned(i) < InternalRangeRank ? m_length[i] : 0;
+  }
+
+  template <typename iType>
+  KOKKOS_FORCEINLINE_FUNCTION constexpr unsigned range_index(
+      const iType i) const {
+    return unsigned(i) < InternalRangeRank ? m_index[i] : ~0u;
+  }
 };
 
-}} // namespace Kokkos::Impl
+}  // namespace Impl
+}  // namespace Kokkos
 
 //----------------------------------------------------------------------------
 //----------------------------------------------------------------------------
@@ -693,25 +722,22 @@ namespace Kokkos {
 namespace Impl {
 
 /** \brief  Given a value type and dimension generate the View data type */
-template< class T , class Dim >
-struct ViewDataType ;
+template <class T, class Dim>
+struct ViewDataType;
 
-template< class T >
-struct ViewDataType< T , ViewDimension<> >
-{
-  typedef T type ;
+template <class T>
+struct ViewDataType<T, ViewDimension<> > {
+  typedef T type;
 };
 
-template< class T , size_t ... Args >
-struct ViewDataType< T , ViewDimension< 0 , Args... > >
-{
-  typedef typename ViewDataType<T*,ViewDimension<Args...> >::type type ;
+template <class T, size_t... Args>
+struct ViewDataType<T, ViewDimension<0, Args...> > {
+  typedef typename ViewDataType<T*, ViewDimension<Args...> >::type type;
 };
 
-template< class T , size_t N , size_t ... Args >
-struct ViewDataType< T , ViewDimension< N , Args... > >
-{
-  typedef typename ViewDataType<T,ViewDimension<Args...> >::type type[N] ;
+template <class T, size_t N, size_t... Args>
+struct ViewDataType<T, ViewDimension<N, Args...> > {
+  typedef typename ViewDataType<T, ViewDimension<Args...> >::type type[N];
 };
 
 /**\brief  Analysis of View data type.
@@ -723,111 +749,108 @@ struct ViewDataType< T , ViewDimension< N , Args... > >
  *
  *  Provide typedef for the ViewDimension<...> and value_type.
  */
-template< class T >
-struct ViewArrayAnalysis
-{
-  typedef T                                      value_type ;
-  typedef typename std::add_const<    T >::type  const_value_type ;
-  typedef typename std::remove_const< T >::type  non_const_value_type ;
-  typedef ViewDimension<>                        static_dimension ;
-  typedef ViewDimension<>                        dynamic_dimension ;
-  typedef ViewDimension<>                        dimension ;
+template <class T>
+struct ViewArrayAnalysis {
+  typedef T value_type;
+  typedef typename std::add_const<T>::type const_value_type;
+  typedef typename std::remove_const<T>::type non_const_value_type;
+  typedef ViewDimension<> static_dimension;
+  typedef ViewDimension<> dynamic_dimension;
+  typedef ViewDimension<> dimension;
 };
 
-template< class T , size_t N >
-struct ViewArrayAnalysis< T[N] >
-{
-private:
-  typedef ViewArrayAnalysis< T > nested ;
-public:
-  typedef typename nested::value_type            value_type ;
-  typedef typename nested::const_value_type      const_value_type ;
-  typedef typename nested::non_const_value_type  non_const_value_type ;
+template <class T, size_t N>
+struct ViewArrayAnalysis<T[N]> {
+ private:
+  typedef ViewArrayAnalysis<T> nested;
+
+ public:
+  typedef typename nested::value_type value_type;
+  typedef typename nested::const_value_type const_value_type;
+  typedef typename nested::non_const_value_type non_const_value_type;
 
   typedef typename nested::static_dimension::template prepend<N>::type
-    static_dimension ;
+      static_dimension;
 
-  typedef typename nested::dynamic_dimension dynamic_dimension ;
+  typedef typename nested::dynamic_dimension dynamic_dimension;
 
-  typedef typename
-    ViewDimensionJoin< dynamic_dimension , static_dimension >::type
-      dimension ;
+  typedef typename ViewDimensionJoin<dynamic_dimension, static_dimension>::type
+      dimension;
 };
 
-template< class T >
-struct ViewArrayAnalysis< T[] >
-{
-private:
-  typedef ViewArrayAnalysis< T > nested ;
-  typedef typename nested::dimension nested_dimension ;
-public:
-  typedef typename nested::value_type            value_type ;
-  typedef typename nested::const_value_type      const_value_type ;
-  typedef typename nested::non_const_value_type  non_const_value_type ;
+template <class T>
+struct ViewArrayAnalysis<T[]> {
+ private:
+  typedef ViewArrayAnalysis<T> nested;
+  typedef typename nested::dimension nested_dimension;
+
+ public:
+  typedef typename nested::value_type value_type;
+  typedef typename nested::const_value_type const_value_type;
+  typedef typename nested::non_const_value_type non_const_value_type;
 
   typedef typename nested::dynamic_dimension::template prepend<0>::type
-    dynamic_dimension ;
+      dynamic_dimension;
 
-  typedef typename nested::static_dimension static_dimension ;
+  typedef typename nested::static_dimension static_dimension;
 
-  typedef typename
-    ViewDimensionJoin< dynamic_dimension , static_dimension >::type
-      dimension ;
+  typedef typename ViewDimensionJoin<dynamic_dimension, static_dimension>::type
+      dimension;
 };
 
-template< class T >
-struct ViewArrayAnalysis< T* >
-{
-private:
-  typedef ViewArrayAnalysis< T > nested ;
-public:
-  typedef typename nested::value_type            value_type ;
-  typedef typename nested::const_value_type      const_value_type ;
-  typedef typename nested::non_const_value_type  non_const_value_type ;
+template <class T>
+struct ViewArrayAnalysis<T*> {
+ private:
+  typedef ViewArrayAnalysis<T> nested;
+
+ public:
+  typedef typename nested::value_type value_type;
+  typedef typename nested::const_value_type const_value_type;
+  typedef typename nested::non_const_value_type non_const_value_type;
 
   typedef typename nested::dynamic_dimension::template prepend<0>::type
-    dynamic_dimension ;
+      dynamic_dimension;
 
-  typedef typename nested::static_dimension static_dimension ;
+  typedef typename nested::static_dimension static_dimension;
 
-  typedef typename
-    ViewDimensionJoin< dynamic_dimension , static_dimension >::type
-      dimension ;
+  typedef typename ViewDimensionJoin<dynamic_dimension, static_dimension>::type
+      dimension;
 };
 
-
-template< class DataType , class ArrayLayout , class ValueType >
-struct ViewDataAnalysis
-{
-private:
-
-  typedef ViewArrayAnalysis< DataType > array_analysis ;
+template <class DataType, class ArrayLayout, class ValueType>
+struct ViewDataAnalysis {
+ private:
+  typedef ViewArrayAnalysis<DataType> array_analysis;
 
   // ValueType is opportunity for partial specialization.
   // Must match array analysis when this default template is used.
-  static_assert( std::is_same< ValueType , typename array_analysis::non_const_value_type >::value , "" );
+  static_assert(
+      std::is_same<ValueType,
+                   typename array_analysis::non_const_value_type>::value,
+      "");
 
-public:
+ public:
+  typedef void specialize;  // No specialization
 
-  typedef void specialize ; // No specialization
-
-  typedef typename array_analysis::dimension             dimension ;
-  typedef typename array_analysis::value_type            value_type ;
-  typedef typename array_analysis::const_value_type      const_value_type ;
-  typedef typename array_analysis::non_const_value_type  non_const_value_type ;
+  typedef typename array_analysis::dimension dimension;
+  typedef typename array_analysis::value_type value_type;
+  typedef typename array_analysis::const_value_type const_value_type;
+  typedef typename array_analysis::non_const_value_type non_const_value_type;
 
   // Generate analogous multidimensional array specification type.
-  typedef typename ViewDataType<           value_type , dimension >::type  type ;
-  typedef typename ViewDataType<     const_value_type , dimension >::type  const_type ;
-  typedef typename ViewDataType< non_const_value_type , dimension >::type  non_const_type ;
+  typedef typename ViewDataType<value_type, dimension>::type type;
+  typedef typename ViewDataType<const_value_type, dimension>::type const_type;
+  typedef typename ViewDataType<non_const_value_type, dimension>::type
+      non_const_type;
 
   // Generate "flattened" multidimensional array specification type.
-  typedef type            scalar_array_type ;
-  typedef const_type      const_scalar_array_type ;
-  typedef non_const_type  non_const_scalar_array_type ;
+  typedef type scalar_array_type;
+  typedef const_type const_scalar_array_type;
+  typedef non_const_type non_const_scalar_array_type;
 };
 
-}} // namespace Kokkos::Impl
+}  // namespace Impl
+}  // namespace Kokkos
 
 //----------------------------------------------------------------------------
 //----------------------------------------------------------------------------
@@ -835,467 +858,568 @@ public:
 namespace Kokkos {
 namespace Impl {
 
-template < class Dimension , class Layout , typename Enable = void >
+template <class Dimension, class Layout, typename Enable = void>
 struct ViewOffset {
-  using is_mapping_plugin = std::false_type ;
+  using is_mapping_plugin = std::false_type;
 };
 
 //----------------------------------------------------------------------------
 // LayoutLeft AND ( 1 >= rank OR 0 == rank_dynamic ) : no padding / striding
-template < class Dimension >
-struct ViewOffset< Dimension , Kokkos::LayoutLeft
-                 , typename std::enable_if<( 1 >= Dimension::rank
-                                             ||
-                                             0 == Dimension::rank_dynamic
-                                           )>::type >
-{
-  using is_mapping_plugin = std::true_type ;
-  using is_regular        = std::true_type ;
+template <class Dimension>
+struct ViewOffset<
+    Dimension, Kokkos::LayoutLeft,
+    typename std::enable_if<(1 >= Dimension::rank ||
+                             0 == Dimension::rank_dynamic)>::type> {
+  using is_mapping_plugin = std::true_type;
+  using is_regular        = std::true_type;
 
-  typedef size_t             size_type ;
-  typedef Dimension          dimension_type ;
-  typedef Kokkos::LayoutLeft array_layout ;
+  typedef size_t size_type;
+  typedef Dimension dimension_type;
+  typedef Kokkos::LayoutLeft array_layout;
 
-  dimension_type m_dim ;
+  dimension_type m_dim;
 
   //----------------------------------------
 
   // rank 1
-  template< typename I0 >
-  KOKKOS_INLINE_FUNCTION constexpr
-  size_type operator()( I0 const & i0 ) const { return i0 ; }
+  template <typename I0>
+  KOKKOS_INLINE_FUNCTION constexpr size_type operator()(I0 const& i0) const {
+    return i0;
+  }
 
   // rank 2
-  template < typename I0 , typename I1 >
-  KOKKOS_INLINE_FUNCTION constexpr
-  size_type operator()( I0 const & i0 , I1 const & i1 ) const
-    { return i0 + m_dim.N0 * i1 ; }
-
-  //rank 3
-  template < typename I0, typename I1, typename I2 >
-  KOKKOS_INLINE_FUNCTION constexpr
-  size_type operator()( I0 const & i0, I1 const & i1, I2 const & i2 ) const
-  {
-    return i0 + m_dim.N0 * ( i1 + m_dim.N1 * i2 );
+  template <typename I0, typename I1>
+  KOKKOS_INLINE_FUNCTION constexpr size_type operator()(I0 const& i0,
+                                                        I1 const& i1) const {
+    return i0 + m_dim.N0 * i1;
   }
 
-  //rank 4
-  template < typename I0, typename I1, typename I2, typename I3 >
-  KOKKOS_INLINE_FUNCTION constexpr
-  size_type operator()( I0 const & i0, I1 const & i1, I2 const & i2, I3 const & i3 ) const
-  {
-    return i0 + m_dim.N0 * (
-           i1 + m_dim.N1 * (
-           i2 + m_dim.N2 * i3 ));
+  // rank 3
+  template <typename I0, typename I1, typename I2>
+  KOKKOS_INLINE_FUNCTION constexpr size_type operator()(I0 const& i0,
+                                                        I1 const& i1,
+                                                        I2 const& i2) const {
+    return i0 + m_dim.N0 * (i1 + m_dim.N1 * i2);
   }
 
-  //rank 5
-  template < typename I0, typename I1, typename I2, typename I3
-           , typename I4 >
-  KOKKOS_INLINE_FUNCTION constexpr
-  size_type operator()( I0 const & i0, I1 const & i1, I2 const & i2, I3 const & i3
-                      , I4 const & i4 ) const
-  {
-    return i0 + m_dim.N0 * (
-           i1 + m_dim.N1 * (
-           i2 + m_dim.N2 * (
-           i3 + m_dim.N3 * i4 )));
+  // rank 4
+  template <typename I0, typename I1, typename I2, typename I3>
+  KOKKOS_INLINE_FUNCTION constexpr size_type operator()(I0 const& i0,
+                                                        I1 const& i1,
+                                                        I2 const& i2,
+                                                        I3 const& i3) const {
+    return i0 + m_dim.N0 * (i1 + m_dim.N1 * (i2 + m_dim.N2 * i3));
   }
 
-  //rank 6
-  template < typename I0, typename I1, typename I2, typename I3
-           , typename I4, typename I5 >
-  KOKKOS_INLINE_FUNCTION constexpr
-  size_type operator()( I0 const & i0, I1 const & i1, I2 const & i2, I3 const & i3
-                      , I4 const & i4, I5 const & i5 ) const
-  {
-    return i0 + m_dim.N0 * (
-           i1 + m_dim.N1 * (
-           i2 + m_dim.N2 * (
-           i3 + m_dim.N3 * (
-           i4 + m_dim.N4 * i5 ))));
+  // rank 5
+  template <typename I0, typename I1, typename I2, typename I3, typename I4>
+  KOKKOS_INLINE_FUNCTION constexpr size_type operator()(I0 const& i0,
+                                                        I1 const& i1,
+                                                        I2 const& i2,
+                                                        I3 const& i3,
+                                                        I4 const& i4) const {
+    return i0 +
+           m_dim.N0 * (i1 + m_dim.N1 * (i2 + m_dim.N2 * (i3 + m_dim.N3 * i4)));
   }
 
-  //rank 7
-  template < typename I0, typename I1, typename I2, typename I3
-           , typename I4, typename I5, typename I6 >
-  KOKKOS_INLINE_FUNCTION constexpr
-  size_type operator()( I0 const & i0, I1 const & i1, I2 const & i2, I3 const & i3
-                      , I4 const & i4, I5 const & i5, I6 const & i6 ) const
-  {
-    return i0 + m_dim.N0 * (
-           i1 + m_dim.N1 * (
-           i2 + m_dim.N2 * (
-           i3 + m_dim.N3 * (
-           i4 + m_dim.N4 * (
-           i5 + m_dim.N5 * i6 )))));
+  // rank 6
+  template <typename I0, typename I1, typename I2, typename I3, typename I4,
+            typename I5>
+  KOKKOS_INLINE_FUNCTION constexpr size_type operator()(
+      I0 const& i0, I1 const& i1, I2 const& i2, I3 const& i3, I4 const& i4,
+      I5 const& i5) const {
+    return i0 +
+           m_dim.N0 *
+               (i1 +
+                m_dim.N1 *
+                    (i2 + m_dim.N2 * (i3 + m_dim.N3 * (i4 + m_dim.N4 * i5))));
   }
 
-  //rank 8
-  template < typename I0, typename I1, typename I2, typename I3
-           , typename I4, typename I5, typename I6, typename I7 >
-  KOKKOS_INLINE_FUNCTION constexpr
-  size_type operator()( I0 const & i0, I1 const & i1, I2 const & i2, I3 const & i3
-                      , I4 const & i4, I5 const & i5, I6 const & i6, I7 const & i7 ) const
-  {
-    return i0 + m_dim.N0 * (
-           i1 + m_dim.N1 * (
-           i2 + m_dim.N2 * (
-           i3 + m_dim.N3 * (
-           i4 + m_dim.N4 * (
-           i5 + m_dim.N5 * (
-           i6 + m_dim.N6 * i7 ))))));
+  // rank 7
+  template <typename I0, typename I1, typename I2, typename I3, typename I4,
+            typename I5, typename I6>
+  KOKKOS_INLINE_FUNCTION constexpr size_type operator()(
+      I0 const& i0, I1 const& i1, I2 const& i2, I3 const& i3, I4 const& i4,
+      I5 const& i5, I6 const& i6) const {
+    return i0 +
+           m_dim.N0 *
+               (i1 + m_dim.N1 *
+                         (i2 + m_dim.N2 *
+                                   (i3 + m_dim.N3 *
+                                             (i4 + m_dim.N4 *
+                                                       (i5 + m_dim.N5 * i6)))));
+  }
+
+  // rank 8
+  template <typename I0, typename I1, typename I2, typename I3, typename I4,
+            typename I5, typename I6, typename I7>
+  KOKKOS_INLINE_FUNCTION constexpr size_type operator()(
+      I0 const& i0, I1 const& i1, I2 const& i2, I3 const& i3, I4 const& i4,
+      I5 const& i5, I6 const& i6, I7 const& i7) const {
+    return i0 +
+           m_dim.N0 *
+               (i1 +
+                m_dim.N1 *
+                    (i2 + m_dim.N2 *
+                              (i3 + m_dim.N3 *
+                                        (i4 + m_dim.N4 *
+                                                  (i5 + m_dim.N5 *
+                                                            (i6 + m_dim.N6 *
+                                                                      i7))))));
   }
 
   //----------------------------------------
 
   KOKKOS_INLINE_FUNCTION
-  constexpr array_layout layout() const
-    {
-      return array_layout( m_dim.N0 , m_dim.N1 , m_dim.N2 , m_dim.N3
-                         , m_dim.N4 , m_dim.N5 , m_dim.N6 , m_dim.N7 );
-    }
+  constexpr array_layout layout() const {
+    return array_layout(m_dim.N0, m_dim.N1, m_dim.N2, m_dim.N3, m_dim.N4,
+                        m_dim.N5, m_dim.N6, m_dim.N7);
+  }
 
-  KOKKOS_INLINE_FUNCTION constexpr size_type dimension_0() const { return m_dim.N0 ; }
-  KOKKOS_INLINE_FUNCTION constexpr size_type dimension_1() const { return m_dim.N1 ; }
-  KOKKOS_INLINE_FUNCTION constexpr size_type dimension_2() const { return m_dim.N2 ; }
-  KOKKOS_INLINE_FUNCTION constexpr size_type dimension_3() const { return m_dim.N3 ; }
-  KOKKOS_INLINE_FUNCTION constexpr size_type dimension_4() const { return m_dim.N4 ; }
-  KOKKOS_INLINE_FUNCTION constexpr size_type dimension_5() const { return m_dim.N5 ; }
-  KOKKOS_INLINE_FUNCTION constexpr size_type dimension_6() const { return m_dim.N6 ; }
-  KOKKOS_INLINE_FUNCTION constexpr size_type dimension_7() const { return m_dim.N7 ; }
+  KOKKOS_INLINE_FUNCTION constexpr size_type dimension_0() const {
+    return m_dim.N0;
+  }
+  KOKKOS_INLINE_FUNCTION constexpr size_type dimension_1() const {
+    return m_dim.N1;
+  }
+  KOKKOS_INLINE_FUNCTION constexpr size_type dimension_2() const {
+    return m_dim.N2;
+  }
+  KOKKOS_INLINE_FUNCTION constexpr size_type dimension_3() const {
+    return m_dim.N3;
+  }
+  KOKKOS_INLINE_FUNCTION constexpr size_type dimension_4() const {
+    return m_dim.N4;
+  }
+  KOKKOS_INLINE_FUNCTION constexpr size_type dimension_5() const {
+    return m_dim.N5;
+  }
+  KOKKOS_INLINE_FUNCTION constexpr size_type dimension_6() const {
+    return m_dim.N6;
+  }
+  KOKKOS_INLINE_FUNCTION constexpr size_type dimension_7() const {
+    return m_dim.N7;
+  }
 
   /* Cardinality of the domain index space */
   KOKKOS_INLINE_FUNCTION
-  constexpr size_type size() const
-    { return m_dim.N0 * m_dim.N1 * m_dim.N2 * m_dim.N3 * m_dim.N4 * m_dim.N5 * m_dim.N6 * m_dim.N7 ; }
+  constexpr size_type size() const {
+    return m_dim.N0 * m_dim.N1 * m_dim.N2 * m_dim.N3 * m_dim.N4 * m_dim.N5 *
+           m_dim.N6 * m_dim.N7;
+  }
 
   /* Span of the range space */
   KOKKOS_INLINE_FUNCTION
-  constexpr size_type span() const
-    { return m_dim.N0 * m_dim.N1 * m_dim.N2 * m_dim.N3 * m_dim.N4 * m_dim.N5 * m_dim.N6 * m_dim.N7 ; }
+  constexpr size_type span() const {
+    return m_dim.N0 * m_dim.N1 * m_dim.N2 * m_dim.N3 * m_dim.N4 * m_dim.N5 *
+           m_dim.N6 * m_dim.N7;
+  }
 
-  KOKKOS_INLINE_FUNCTION constexpr bool span_is_contiguous() const { return true ; }
+  KOKKOS_INLINE_FUNCTION constexpr bool span_is_contiguous() const {
+    return true;
+  }
 
   /* Strides of dimensions */
-  KOKKOS_INLINE_FUNCTION constexpr size_type stride_0() const { return 1 ; }
-  KOKKOS_INLINE_FUNCTION constexpr size_type stride_1() const { return m_dim.N0 ; }
-  KOKKOS_INLINE_FUNCTION constexpr size_type stride_2() const { return m_dim.N0 * m_dim.N1 ; }
-  KOKKOS_INLINE_FUNCTION constexpr size_type stride_3() const { return m_dim.N0 * m_dim.N1 * m_dim.N2 ; }
-  KOKKOS_INLINE_FUNCTION constexpr size_type stride_4() const { return m_dim.N0 * m_dim.N1 * m_dim.N2 * m_dim.N3 ; }
-  KOKKOS_INLINE_FUNCTION constexpr size_type stride_5() const { return m_dim.N0 * m_dim.N1 * m_dim.N2 * m_dim.N3 * m_dim.N4 ; }
-  KOKKOS_INLINE_FUNCTION constexpr size_type stride_6() const { return m_dim.N0 * m_dim.N1 * m_dim.N2 * m_dim.N3 * m_dim.N4 * m_dim.N5 ; }
-  KOKKOS_INLINE_FUNCTION constexpr size_type stride_7() const { return m_dim.N0 * m_dim.N1 * m_dim.N2 * m_dim.N3 * m_dim.N4 * m_dim.N5 * m_dim.N6 ; }
+  KOKKOS_INLINE_FUNCTION constexpr size_type stride_0() const { return 1; }
+  KOKKOS_INLINE_FUNCTION constexpr size_type stride_1() const {
+    return m_dim.N0;
+  }
+  KOKKOS_INLINE_FUNCTION constexpr size_type stride_2() const {
+    return m_dim.N0 * m_dim.N1;
+  }
+  KOKKOS_INLINE_FUNCTION constexpr size_type stride_3() const {
+    return m_dim.N0 * m_dim.N1 * m_dim.N2;
+  }
+  KOKKOS_INLINE_FUNCTION constexpr size_type stride_4() const {
+    return m_dim.N0 * m_dim.N1 * m_dim.N2 * m_dim.N3;
+  }
+  KOKKOS_INLINE_FUNCTION constexpr size_type stride_5() const {
+    return m_dim.N0 * m_dim.N1 * m_dim.N2 * m_dim.N3 * m_dim.N4;
+  }
+  KOKKOS_INLINE_FUNCTION constexpr size_type stride_6() const {
+    return m_dim.N0 * m_dim.N1 * m_dim.N2 * m_dim.N3 * m_dim.N4 * m_dim.N5;
+  }
+  KOKKOS_INLINE_FUNCTION constexpr size_type stride_7() const {
+    return m_dim.N0 * m_dim.N1 * m_dim.N2 * m_dim.N3 * m_dim.N4 * m_dim.N5 *
+           m_dim.N6;
+  }
 
   // Stride with [ rank ] value is the total length
-  template< typename iType >
-  KOKKOS_INLINE_FUNCTION
-  void stride( iType * const s ) const
-    {
-      s[0] = 1 ;
-      if ( 0 < dimension_type::rank ) { s[1] = m_dim.N0 ; }
-      if ( 1 < dimension_type::rank ) { s[2] = s[1] * m_dim.N1 ; }
-      if ( 2 < dimension_type::rank ) { s[3] = s[2] * m_dim.N2 ; }
-      if ( 3 < dimension_type::rank ) { s[4] = s[3] * m_dim.N3 ; }
-      if ( 4 < dimension_type::rank ) { s[5] = s[4] * m_dim.N4 ; }
-      if ( 5 < dimension_type::rank ) { s[6] = s[5] * m_dim.N5 ; }
-      if ( 6 < dimension_type::rank ) { s[7] = s[6] * m_dim.N6 ; }
-      if ( 7 < dimension_type::rank ) { s[8] = s[7] * m_dim.N7 ; }
+  template <typename iType>
+  KOKKOS_INLINE_FUNCTION void stride(iType* const s) const {
+    s[0] = 1;
+    if (0 < dimension_type::rank) {
+      s[1] = m_dim.N0;
     }
+    if (1 < dimension_type::rank) {
+      s[2] = s[1] * m_dim.N1;
+    }
+    if (2 < dimension_type::rank) {
+      s[3] = s[2] * m_dim.N2;
+    }
+    if (3 < dimension_type::rank) {
+      s[4] = s[3] * m_dim.N3;
+    }
+    if (4 < dimension_type::rank) {
+      s[5] = s[4] * m_dim.N4;
+    }
+    if (5 < dimension_type::rank) {
+      s[6] = s[5] * m_dim.N5;
+    }
+    if (6 < dimension_type::rank) {
+      s[7] = s[6] * m_dim.N6;
+    }
+    if (7 < dimension_type::rank) {
+      s[8] = s[7] * m_dim.N7;
+    }
+  }
 
   //----------------------------------------
 
-  ViewOffset() = default ;
-  ViewOffset( const ViewOffset & ) = default ;
-  ViewOffset & operator = ( const ViewOffset & ) = default ;
+  ViewOffset()                  = default;
+  ViewOffset(const ViewOffset&) = default;
+  ViewOffset& operator=(const ViewOffset&) = default;
 
-  template< unsigned TrivialScalarSize >
-  KOKKOS_INLINE_FUNCTION
-  constexpr ViewOffset
-    ( std::integral_constant<unsigned,TrivialScalarSize> const &
-    , Kokkos::LayoutLeft const & arg_layout
-    )
-    : m_dim( arg_layout.dimension[0], 0, 0, 0, 0, 0, 0, 0 )
-    {}
+  template <unsigned TrivialScalarSize>
+  KOKKOS_INLINE_FUNCTION constexpr ViewOffset(
+      std::integral_constant<unsigned, TrivialScalarSize> const&,
+      Kokkos::LayoutLeft const& arg_layout)
+      : m_dim(arg_layout.dimension[0], 0, 0, 0, 0, 0, 0, 0) {}
 
-  template< class DimRHS >
-  KOKKOS_INLINE_FUNCTION
-  constexpr ViewOffset( const ViewOffset< DimRHS , Kokkos::LayoutLeft , void > & rhs )
-    : m_dim( rhs.m_dim.N0 , rhs.m_dim.N1 , rhs.m_dim.N2 , rhs.m_dim.N3
-           , rhs.m_dim.N4 , rhs.m_dim.N5 , rhs.m_dim.N6 , rhs.m_dim.N7 )
-    {
-      static_assert( int(DimRHS::rank) == int(dimension_type::rank) , "ViewOffset assignment requires equal rank" );
-      // Also requires equal static dimensions ...
-    }
-
-  template< class DimRHS >
-  KOKKOS_INLINE_FUNCTION
-  constexpr ViewOffset( const ViewOffset< DimRHS , Kokkos::LayoutRight , void > & rhs )
-    : m_dim( rhs.m_dim.N0, 0, 0, 0, 0, 0, 0, 0 )
-    {
-      static_assert(
-        ( DimRHS::rank == 0 &&
-          dimension_type::rank == 0 ) ||
-        ( DimRHS::rank == 1 &&
-          dimension_type::rank == 1 &&
-          dimension_type::rank_dynamic == 1 )
-        , "ViewOffset LayoutLeft and LayoutRight are only compatible when rank <= 1" );
-    }
-
-  template< class DimRHS >
-  KOKKOS_INLINE_FUNCTION
-  ViewOffset( const ViewOffset< DimRHS , Kokkos::LayoutStride , void > & rhs )
-    : m_dim( rhs.m_dim.N0, 0, 0, 0, 0, 0, 0, 0 )
-    {
-      if ( rhs.m_stride.S0 != 1 ) {
-        Kokkos::abort("Kokkos::Impl::ViewOffset assignment of LayoutLeft from LayoutStride  requires stride == 1" );
-      }
+  template <class DimRHS>
+  KOKKOS_INLINE_FUNCTION constexpr ViewOffset(
+      const ViewOffset<DimRHS, Kokkos::LayoutLeft, void>& rhs)
+      : m_dim(rhs.m_dim.N0, rhs.m_dim.N1, rhs.m_dim.N2, rhs.m_dim.N3,
+              rhs.m_dim.N4, rhs.m_dim.N5, rhs.m_dim.N6, rhs.m_dim.N7) {
+    static_assert(int(DimRHS::rank) == int(dimension_type::rank),
+                  "ViewOffset assignment requires equal rank");
+    // Also requires equal static dimensions ...
+  }
+
+  template <class DimRHS>
+  KOKKOS_INLINE_FUNCTION constexpr ViewOffset(
+      const ViewOffset<DimRHS, Kokkos::LayoutRight, void>& rhs)
+      : m_dim(rhs.m_dim.N0, 0, 0, 0, 0, 0, 0, 0) {
+    static_assert((DimRHS::rank == 0 && dimension_type::rank == 0) ||
+                      (DimRHS::rank == 1 && dimension_type::rank == 1 &&
+                       dimension_type::rank_dynamic == 1),
+                  "ViewOffset LayoutLeft and LayoutRight are only compatible "
+                  "when rank <= 1");
+  }
+
+  template <class DimRHS>
+  KOKKOS_INLINE_FUNCTION ViewOffset(
+      const ViewOffset<DimRHS, Kokkos::LayoutStride, void>& rhs)
+      : m_dim(rhs.m_dim.N0, 0, 0, 0, 0, 0, 0, 0) {
+    if (rhs.m_stride.S0 != 1) {
+      Kokkos::abort(
+          "Kokkos::Impl::ViewOffset assignment of LayoutLeft from LayoutStride "
+          " requires stride == 1");
     }
+  }
 
   //----------------------------------------
   // Subview construction
 
-  template< class DimRHS >
-  KOKKOS_INLINE_FUNCTION
-  constexpr ViewOffset(
-    const ViewOffset< DimRHS , Kokkos::LayoutLeft , void > & ,
-    const SubviewExtents< DimRHS::rank , dimension_type::rank > & sub )
-    : m_dim( sub.range_extent(0), 0, 0, 0, 0, 0, 0, 0 )
-    {
-      static_assert( ( 0 == dimension_type::rank ) ||
-                     ( 1 == dimension_type::rank && 1 == dimension_type::rank_dynamic && 1 <= DimRHS::rank )
-                   , "ViewOffset subview construction requires compatible rank" );
-    }
+  template <class DimRHS>
+  KOKKOS_INLINE_FUNCTION constexpr ViewOffset(
+      const ViewOffset<DimRHS, Kokkos::LayoutLeft, void>&,
+      const SubviewExtents<DimRHS::rank, dimension_type::rank>& sub)
+      : m_dim(sub.range_extent(0), 0, 0, 0, 0, 0, 0, 0) {
+    static_assert((0 == dimension_type::rank_dynamic) ||
+                      (1 == dimension_type::rank &&
+                       1 == dimension_type::rank_dynamic && 1 <= DimRHS::rank),
+                  "ViewOffset subview construction requires compatible rank");
+  }
 };
 
 //----------------------------------------------------------------------------
 // LayoutLeft AND ( 1 < rank AND 0 < rank_dynamic ) : has padding / striding
-template < class Dimension >
-struct ViewOffset< Dimension , Kokkos::LayoutLeft
-                 , typename std::enable_if<( 1 < Dimension::rank
-                                             &&
-                                             0 < Dimension::rank_dynamic
-                                           )>::type >
-{
-  using is_mapping_plugin = std::true_type ;
-  using is_regular        = std::true_type ;
+template <class Dimension>
+struct ViewOffset<
+    Dimension, Kokkos::LayoutLeft,
+    typename std::enable_if<(1 < Dimension::rank &&
+                             0 < Dimension::rank_dynamic)>::type> {
+  using is_mapping_plugin = std::true_type;
+  using is_regular        = std::true_type;
 
-  typedef size_t             size_type ;
-  typedef Dimension          dimension_type ;
-  typedef Kokkos::LayoutLeft array_layout ;
+  typedef size_t size_type;
+  typedef Dimension dimension_type;
+  typedef Kokkos::LayoutLeft array_layout;
 
-  dimension_type m_dim ;
-  size_type      m_stride ;
+  dimension_type m_dim;
+  size_type m_stride;
 
   //----------------------------------------
 
   // rank 1
-  template< typename I0 >
-  KOKKOS_INLINE_FUNCTION constexpr
-  size_type operator()( I0 const & i0 ) const { return i0 ; }
+  template <typename I0>
+  KOKKOS_INLINE_FUNCTION constexpr size_type operator()(I0 const& i0) const {
+    return i0;
+  }
 
   // rank 2
-  template < typename I0 , typename I1 >
-  KOKKOS_INLINE_FUNCTION constexpr
-  size_type operator()( I0 const & i0 , I1 const & i1 ) const
-    { return i0 + m_stride * i1 ; }
-
-  //rank 3
-  template < typename I0, typename I1, typename I2 >
-  KOKKOS_INLINE_FUNCTION constexpr
-  size_type operator()( I0 const & i0, I1 const & i1, I2 const & i2 ) const
-  {
-    return i0 + m_stride * ( i1 + m_dim.N1 * i2 );
+  template <typename I0, typename I1>
+  KOKKOS_INLINE_FUNCTION constexpr size_type operator()(I0 const& i0,
+                                                        I1 const& i1) const {
+    return i0 + m_stride * i1;
   }
 
-  //rank 4
-  template < typename I0, typename I1, typename I2, typename I3 >
-  KOKKOS_INLINE_FUNCTION constexpr
-  size_type operator()( I0 const & i0, I1 const & i1, I2 const & i2, I3 const & i3 ) const
-  {
-    return i0 + m_stride * (
-           i1 + m_dim.N1 * (
-           i2 + m_dim.N2 * i3 ));
+  // rank 3
+  template <typename I0, typename I1, typename I2>
+  KOKKOS_INLINE_FUNCTION constexpr size_type operator()(I0 const& i0,
+                                                        I1 const& i1,
+                                                        I2 const& i2) const {
+    return i0 + m_stride * (i1 + m_dim.N1 * i2);
   }
 
-  //rank 5
-  template < typename I0, typename I1, typename I2, typename I3
-           , typename I4 >
-  KOKKOS_INLINE_FUNCTION constexpr
-  size_type operator()( I0 const & i0, I1 const & i1, I2 const & i2, I3 const & i3
-                      , I4 const & i4 ) const
-  {
-    return i0 + m_stride * (
-           i1 + m_dim.N1 * (
-           i2 + m_dim.N2 * (
-           i3 + m_dim.N3 * i4 )));
+  // rank 4
+  template <typename I0, typename I1, typename I2, typename I3>
+  KOKKOS_INLINE_FUNCTION constexpr size_type operator()(I0 const& i0,
+                                                        I1 const& i1,
+                                                        I2 const& i2,
+                                                        I3 const& i3) const {
+    return i0 + m_stride * (i1 + m_dim.N1 * (i2 + m_dim.N2 * i3));
   }
 
-  //rank 6
-  template < typename I0, typename I1, typename I2, typename I3
-           , typename I4, typename I5 >
-  KOKKOS_INLINE_FUNCTION constexpr
-  size_type operator()( I0 const & i0, I1 const & i1, I2 const & i2, I3 const & i3
-                      , I4 const & i4, I5 const & i5 ) const
-  {
-    return i0 + m_stride * (
-           i1 + m_dim.N1 * (
-           i2 + m_dim.N2 * (
-           i3 + m_dim.N3 * (
-           i4 + m_dim.N4 * i5 ))));
+  // rank 5
+  template <typename I0, typename I1, typename I2, typename I3, typename I4>
+  KOKKOS_INLINE_FUNCTION constexpr size_type operator()(I0 const& i0,
+                                                        I1 const& i1,
+                                                        I2 const& i2,
+                                                        I3 const& i3,
+                                                        I4 const& i4) const {
+    return i0 +
+           m_stride * (i1 + m_dim.N1 * (i2 + m_dim.N2 * (i3 + m_dim.N3 * i4)));
   }
 
-  //rank 7
-  template < typename I0, typename I1, typename I2, typename I3
-           , typename I4, typename I5, typename I6 >
-  KOKKOS_INLINE_FUNCTION constexpr
-  size_type operator()( I0 const & i0, I1 const & i1, I2 const & i2, I3 const & i3
-                      , I4 const & i4, I5 const & i5, I6 const & i6 ) const
-  {
-    return i0 + m_stride * (
-           i1 + m_dim.N1 * (
-           i2 + m_dim.N2 * (
-           i3 + m_dim.N3 * (
-           i4 + m_dim.N4 * (
-           i5 + m_dim.N5 * i6 )))));
+  // rank 6
+  template <typename I0, typename I1, typename I2, typename I3, typename I4,
+            typename I5>
+  KOKKOS_INLINE_FUNCTION constexpr size_type operator()(
+      I0 const& i0, I1 const& i1, I2 const& i2, I3 const& i3, I4 const& i4,
+      I5 const& i5) const {
+    return i0 +
+           m_stride *
+               (i1 +
+                m_dim.N1 *
+                    (i2 + m_dim.N2 * (i3 + m_dim.N3 * (i4 + m_dim.N4 * i5))));
   }
 
-  //rank 8
-  template < typename I0, typename I1, typename I2, typename I3
-           , typename I4, typename I5, typename I6, typename I7 >
-  KOKKOS_INLINE_FUNCTION constexpr
-  size_type operator()( I0 const & i0, I1 const & i1, I2 const & i2, I3 const & i3
-                      , I4 const & i4, I5 const & i5, I6 const & i6, I7 const & i7 ) const
-  {
-    return i0 + m_stride * (
-           i1 + m_dim.N1 * (
-           i2 + m_dim.N2 * (
-           i3 + m_dim.N3 * (
-           i4 + m_dim.N4 * (
-           i5 + m_dim.N5 * (
-           i6 + m_dim.N6 * i7 ))))));
+  // rank 7
+  template <typename I0, typename I1, typename I2, typename I3, typename I4,
+            typename I5, typename I6>
+  KOKKOS_INLINE_FUNCTION constexpr size_type operator()(
+      I0 const& i0, I1 const& i1, I2 const& i2, I3 const& i3, I4 const& i4,
+      I5 const& i5, I6 const& i6) const {
+    return i0 +
+           m_stride *
+               (i1 + m_dim.N1 *
+                         (i2 + m_dim.N2 *
+                                   (i3 + m_dim.N3 *
+                                             (i4 + m_dim.N4 *
+                                                       (i5 + m_dim.N5 * i6)))));
+  }
+
+  // rank 8
+  template <typename I0, typename I1, typename I2, typename I3, typename I4,
+            typename I5, typename I6, typename I7>
+  KOKKOS_INLINE_FUNCTION constexpr size_type operator()(
+      I0 const& i0, I1 const& i1, I2 const& i2, I3 const& i3, I4 const& i4,
+      I5 const& i5, I6 const& i6, I7 const& i7) const {
+    return i0 +
+           m_stride *
+               (i1 +
+                m_dim.N1 *
+                    (i2 + m_dim.N2 *
+                              (i3 + m_dim.N3 *
+                                        (i4 + m_dim.N4 *
+                                                  (i5 + m_dim.N5 *
+                                                            (i6 + m_dim.N6 *
+                                                                      i7))))));
   }
 
   //----------------------------------------
 
   KOKKOS_INLINE_FUNCTION
-  constexpr array_layout layout() const
-    {
-      return array_layout( m_dim.N0 , m_dim.N1 , m_dim.N2 , m_dim.N3
-                         , m_dim.N4 , m_dim.N5 , m_dim.N6 , m_dim.N7 );
-    }
+  constexpr array_layout layout() const {
+    return array_layout(m_dim.N0, m_dim.N1, m_dim.N2, m_dim.N3, m_dim.N4,
+                        m_dim.N5, m_dim.N6, m_dim.N7);
+  }
 
-  KOKKOS_INLINE_FUNCTION constexpr size_type dimension_0() const { return m_dim.N0 ; }
-  KOKKOS_INLINE_FUNCTION constexpr size_type dimension_1() const { return m_dim.N1 ; }
-  KOKKOS_INLINE_FUNCTION constexpr size_type dimension_2() const { return m_dim.N2 ; }
-  KOKKOS_INLINE_FUNCTION constexpr size_type dimension_3() const { return m_dim.N3 ; }
-  KOKKOS_INLINE_FUNCTION constexpr size_type dimension_4() const { return m_dim.N4 ; }
-  KOKKOS_INLINE_FUNCTION constexpr size_type dimension_5() const { return m_dim.N5 ; }
-  KOKKOS_INLINE_FUNCTION constexpr size_type dimension_6() const { return m_dim.N6 ; }
-  KOKKOS_INLINE_FUNCTION constexpr size_type dimension_7() const { return m_dim.N7 ; }
+  KOKKOS_INLINE_FUNCTION constexpr size_type dimension_0() const {
+    return m_dim.N0;
+  }
+  KOKKOS_INLINE_FUNCTION constexpr size_type dimension_1() const {
+    return m_dim.N1;
+  }
+  KOKKOS_INLINE_FUNCTION constexpr size_type dimension_2() const {
+    return m_dim.N2;
+  }
+  KOKKOS_INLINE_FUNCTION constexpr size_type dimension_3() const {
+    return m_dim.N3;
+  }
+  KOKKOS_INLINE_FUNCTION constexpr size_type dimension_4() const {
+    return m_dim.N4;
+  }
+  KOKKOS_INLINE_FUNCTION constexpr size_type dimension_5() const {
+    return m_dim.N5;
+  }
+  KOKKOS_INLINE_FUNCTION constexpr size_type dimension_6() const {
+    return m_dim.N6;
+  }
+  KOKKOS_INLINE_FUNCTION constexpr size_type dimension_7() const {
+    return m_dim.N7;
+  }
 
   /* Cardinality of the domain index space */
   KOKKOS_INLINE_FUNCTION
-  constexpr size_type size() const
-    { return m_dim.N0 * m_dim.N1 * m_dim.N2 * m_dim.N3 * m_dim.N4 * m_dim.N5 * m_dim.N6 * m_dim.N7 ; }
+  constexpr size_type size() const {
+    return m_dim.N0 * m_dim.N1 * m_dim.N2 * m_dim.N3 * m_dim.N4 * m_dim.N5 *
+           m_dim.N6 * m_dim.N7;
+  }
 
   /* Span of the range space */
   KOKKOS_INLINE_FUNCTION
-  constexpr size_type span() const
-    { return m_stride * m_dim.N1 * m_dim.N2 * m_dim.N3 * m_dim.N4 * m_dim.N5 * m_dim.N6 * m_dim.N7 ; }
+  constexpr size_type span() const {
+    return m_stride * m_dim.N1 * m_dim.N2 * m_dim.N3 * m_dim.N4 * m_dim.N5 *
+           m_dim.N6 * m_dim.N7;
+  }
 
-  KOKKOS_INLINE_FUNCTION constexpr bool span_is_contiguous() const { return m_stride == m_dim.N0 ; }
+  KOKKOS_INLINE_FUNCTION constexpr bool span_is_contiguous() const {
+    return m_stride == m_dim.N0;
+  }
 
   /* Strides of dimensions */
-  KOKKOS_INLINE_FUNCTION constexpr size_type stride_0() const { return 1 ; }
-  KOKKOS_INLINE_FUNCTION constexpr size_type stride_1() const { return m_stride ; }
-  KOKKOS_INLINE_FUNCTION constexpr size_type stride_2() const { return m_stride * m_dim.N1 ; }
-  KOKKOS_INLINE_FUNCTION constexpr size_type stride_3() const { return m_stride * m_dim.N1 * m_dim.N2 ; }
-  KOKKOS_INLINE_FUNCTION constexpr size_type stride_4() const { return m_stride * m_dim.N1 * m_dim.N2 * m_dim.N3 ; }
-  KOKKOS_INLINE_FUNCTION constexpr size_type stride_5() const { return m_stride * m_dim.N1 * m_dim.N2 * m_dim.N3 * m_dim.N4 ; }
-  KOKKOS_INLINE_FUNCTION constexpr size_type stride_6() const { return m_stride * m_dim.N1 * m_dim.N2 * m_dim.N3 * m_dim.N4 * m_dim.N5 ; }
-  KOKKOS_INLINE_FUNCTION constexpr size_type stride_7() const { return m_stride * m_dim.N1 * m_dim.N2 * m_dim.N3 * m_dim.N4 * m_dim.N5 * m_dim.N6 ; }
+  KOKKOS_INLINE_FUNCTION constexpr size_type stride_0() const { return 1; }
+  KOKKOS_INLINE_FUNCTION constexpr size_type stride_1() const {
+    return m_stride;
+  }
+  KOKKOS_INLINE_FUNCTION constexpr size_type stride_2() const {
+    return m_stride * m_dim.N1;
+  }
+  KOKKOS_INLINE_FUNCTION constexpr size_type stride_3() const {
+    return m_stride * m_dim.N1 * m_dim.N2;
+  }
+  KOKKOS_INLINE_FUNCTION constexpr size_type stride_4() const {
+    return m_stride * m_dim.N1 * m_dim.N2 * m_dim.N3;
+  }
+  KOKKOS_INLINE_FUNCTION constexpr size_type stride_5() const {
+    return m_stride * m_dim.N1 * m_dim.N2 * m_dim.N3 * m_dim.N4;
+  }
+  KOKKOS_INLINE_FUNCTION constexpr size_type stride_6() const {
+    return m_stride * m_dim.N1 * m_dim.N2 * m_dim.N3 * m_dim.N4 * m_dim.N5;
+  }
+  KOKKOS_INLINE_FUNCTION constexpr size_type stride_7() const {
+    return m_stride * m_dim.N1 * m_dim.N2 * m_dim.N3 * m_dim.N4 * m_dim.N5 *
+           m_dim.N6;
+  }
 
   // Stride with [ rank ] value is the total length
-  template< typename iType >
-  KOKKOS_INLINE_FUNCTION
-  void stride( iType * const s ) const
-    {
-      s[0] = 1 ;
-      if ( 0 < dimension_type::rank ) { s[1] = m_stride ; }
-      if ( 1 < dimension_type::rank ) { s[2] = s[1] * m_dim.N1 ; }
-      if ( 2 < dimension_type::rank ) { s[3] = s[2] * m_dim.N2 ; }
-      if ( 3 < dimension_type::rank ) { s[4] = s[3] * m_dim.N3 ; }
-      if ( 4 < dimension_type::rank ) { s[5] = s[4] * m_dim.N4 ; }
-      if ( 5 < dimension_type::rank ) { s[6] = s[5] * m_dim.N5 ; }
-      if ( 6 < dimension_type::rank ) { s[7] = s[6] * m_dim.N6 ; }
-      if ( 7 < dimension_type::rank ) { s[8] = s[7] * m_dim.N7 ; }
+  template <typename iType>
+  KOKKOS_INLINE_FUNCTION void stride(iType* const s) const {
+    s[0] = 1;
+    if (0 < dimension_type::rank) {
+      s[1] = m_stride;
     }
+    if (1 < dimension_type::rank) {
+      s[2] = s[1] * m_dim.N1;
+    }
+    if (2 < dimension_type::rank) {
+      s[3] = s[2] * m_dim.N2;
+    }
+    if (3 < dimension_type::rank) {
+      s[4] = s[3] * m_dim.N3;
+    }
+    if (4 < dimension_type::rank) {
+      s[5] = s[4] * m_dim.N4;
+    }
+    if (5 < dimension_type::rank) {
+      s[6] = s[5] * m_dim.N5;
+    }
+    if (6 < dimension_type::rank) {
+      s[7] = s[6] * m_dim.N6;
+    }
+    if (7 < dimension_type::rank) {
+      s[8] = s[7] * m_dim.N7;
+    }
+  }
 
   //----------------------------------------
 
-private:
-
-  template< unsigned TrivialScalarSize >
+ private:
+  template <unsigned TrivialScalarSize>
   struct Padding {
-    enum { div = TrivialScalarSize == 0 ? 0 : Kokkos::Impl::MEMORY_ALIGNMENT / ( TrivialScalarSize ? TrivialScalarSize : 1 ) };
-    enum { mod = TrivialScalarSize == 0 ? 0 : Kokkos::Impl::MEMORY_ALIGNMENT % ( TrivialScalarSize ? TrivialScalarSize : 1 ) };
+    enum {
+      div = TrivialScalarSize == 0
+                ? 0
+                : Kokkos::Impl::MEMORY_ALIGNMENT /
+                      (TrivialScalarSize ? TrivialScalarSize : 1)
+    };
+    enum {
+      mod = TrivialScalarSize == 0
+                ? 0
+                : Kokkos::Impl::MEMORY_ALIGNMENT %
+                      (TrivialScalarSize ? TrivialScalarSize : 1)
+    };
 
-    // If memory alignment is a multiple of the trivial scalar size then attempt to align.
+    // If memory alignment is a multiple of the trivial scalar size then attempt
+    // to align.
     enum { align = 0 != TrivialScalarSize && 0 == mod ? div : 0 };
-    enum { div_ok = (div != 0) ? div : 1 }; // To valid modulo zero in constexpr
+    enum {
+      div_ok = (div != 0) ? div : 1
+    };  // To valid modulo zero in constexpr
 
     KOKKOS_INLINE_FUNCTION
-    static constexpr size_t stride( size_t const N )
-    {
-      return ( (align != 0) && ((Kokkos::Impl::MEMORY_ALIGNMENT_THRESHOLD * align) < N) && ((N % div_ok) != 0) )
-             ? N + align - ( N % div_ok ) : N ;
+    static constexpr size_t stride(size_t const N) {
+      return ((align != 0) &&
+              ((Kokkos::Impl::MEMORY_ALIGNMENT_THRESHOLD * align) < N) &&
+              ((N % div_ok) != 0))
+                 ? N + align - (N % div_ok)
+                 : N;
     }
   };
 
-public:
+ public:
+  ViewOffset()                  = default;
+  ViewOffset(const ViewOffset&) = default;
+  ViewOffset& operator=(const ViewOffset&) = default;
 
-  ViewOffset() = default ;
-  ViewOffset( const ViewOffset & ) = default ;
-  ViewOffset & operator = ( const ViewOffset & ) = default ;
+  /* Enable padding for trivial scalar types with non-zero trivial scalar size
+   */
+  template <unsigned TrivialScalarSize>
+  KOKKOS_INLINE_FUNCTION constexpr ViewOffset(
+      std::integral_constant<unsigned, TrivialScalarSize> const&,
+      Kokkos::LayoutLeft const& arg_layout)
+      : m_dim(arg_layout.dimension[0], arg_layout.dimension[1],
+              arg_layout.dimension[2], arg_layout.dimension[3],
+              arg_layout.dimension[4], arg_layout.dimension[5],
+              arg_layout.dimension[6], arg_layout.dimension[7]),
+        m_stride(Padding<TrivialScalarSize>::stride(arg_layout.dimension[0])) {}
 
-  /* Enable padding for trivial scalar types with non-zero trivial scalar size */
-  template< unsigned TrivialScalarSize >
-  KOKKOS_INLINE_FUNCTION
-  constexpr ViewOffset
-    ( std::integral_constant<unsigned,TrivialScalarSize> const &
-    , Kokkos::LayoutLeft const & arg_layout
-    )
-    : m_dim( arg_layout.dimension[0] , arg_layout.dimension[1]
-           , arg_layout.dimension[2] , arg_layout.dimension[3]
-           , arg_layout.dimension[4] , arg_layout.dimension[5]
-           , arg_layout.dimension[6] , arg_layout.dimension[7]
-           )
-    , m_stride( Padding<TrivialScalarSize>::stride( arg_layout.dimension[0] ) )
-    {}
+  template <class DimRHS>
+  KOKKOS_INLINE_FUNCTION constexpr ViewOffset(
+      const ViewOffset<DimRHS, Kokkos::LayoutLeft, void>& rhs)
+      : m_dim(rhs.m_dim.N0, rhs.m_dim.N1, rhs.m_dim.N2, rhs.m_dim.N3,
+              rhs.m_dim.N4, rhs.m_dim.N5, rhs.m_dim.N6, rhs.m_dim.N7),
+        m_stride(rhs.stride_1()) {
+    static_assert(int(DimRHS::rank) == int(dimension_type::rank),
+                  "ViewOffset assignment requires equal rank");
+    // Also requires equal static dimensions ...
+  }
 
-  template< class DimRHS >
-  KOKKOS_INLINE_FUNCTION
-  constexpr ViewOffset( const ViewOffset< DimRHS , Kokkos::LayoutLeft , void > & rhs )
-    : m_dim( rhs.m_dim.N0 , rhs.m_dim.N1 , rhs.m_dim.N2 , rhs.m_dim.N3
-           , rhs.m_dim.N4 , rhs.m_dim.N5 , rhs.m_dim.N6 , rhs.m_dim.N7 )
-    , m_stride( rhs.stride_1() )
-    {
-      static_assert( int(DimRHS::rank) == int(dimension_type::rank) , "ViewOffset assignment requires equal rank" );
-      // Also requires equal static dimensions ...
-    }
-
-  template< class DimRHS >
-  KOKKOS_INLINE_FUNCTION
-  ViewOffset( const ViewOffset< DimRHS , Kokkos::LayoutStride , void > & rhs )
-    : m_dim( rhs.m_dim.N0 , rhs.m_dim.N1 , rhs.m_dim.N2 , rhs.m_dim.N3
-           , rhs.m_dim.N4 , rhs.m_dim.N5 , rhs.m_dim.N6 , rhs.m_dim.N7 )
-    , m_stride( rhs.stride_1() )
-    {
-      if ( rhs.m_stride.S0 != 1 ) {
-        Kokkos::abort("Kokkos::Impl::ViewOffset assignment of LayoutLeft from LayoutStride requires stride == 1" );
-      }
+  template <class DimRHS>
+  KOKKOS_INLINE_FUNCTION ViewOffset(
+      const ViewOffset<DimRHS, Kokkos::LayoutStride, void>& rhs)
+      : m_dim(rhs.m_dim.N0, rhs.m_dim.N1, rhs.m_dim.N2, rhs.m_dim.N3,
+              rhs.m_dim.N4, rhs.m_dim.N5, rhs.m_dim.N6, rhs.m_dim.N7),
+        m_stride(rhs.stride_1()) {
+    if (rhs.m_stride.S0 != 1) {
+      Kokkos::abort(
+          "Kokkos::Impl::ViewOffset assignment of LayoutLeft from LayoutStride "
+          "requires stride == 1");
     }
+  }
 
   //----------------------------------------
   // Subview construction
@@ -1304,973 +1428,1116 @@ public:
   // The source dimension #0 must be non-zero for stride-one leading dimension.
   // At most subsequent dimension can be non-zero.
 
-  template< class DimRHS >
-  KOKKOS_INLINE_FUNCTION
-  constexpr ViewOffset
-    ( const ViewOffset< DimRHS , Kokkos::LayoutLeft , void > & rhs ,
-      const SubviewExtents< DimRHS::rank , dimension_type::rank > & sub )
-    : m_dim( sub.range_extent(0)
-           , sub.range_extent(1)
-           , sub.range_extent(2)
-           , sub.range_extent(3)
-           , sub.range_extent(4)
-           , sub.range_extent(5)
-           , sub.range_extent(6)
-           , sub.range_extent(7))
-    , m_stride( ( 1 == sub.range_index(1) ? rhs.stride_1() :
-                ( 2 == sub.range_index(1) ? rhs.stride_2() :
-                ( 3 == sub.range_index(1) ? rhs.stride_3() :
-                ( 4 == sub.range_index(1) ? rhs.stride_4() :
-                ( 5 == sub.range_index(1) ? rhs.stride_5() :
-                ( 6 == sub.range_index(1) ? rhs.stride_6() :
-                ( 7 == sub.range_index(1) ? rhs.stride_7() : 0 ))))))))
-    {
-      //static_assert( ( 2 == dimension_type::rank ) &&
-      //               ( 2 == dimension_type::rank_dynamic ) &&
-      //               ( 2 <= DimRHS::rank )
-      //             , "ViewOffset subview construction requires compatible rank" );
-    }
+  template <class DimRHS>
+  KOKKOS_INLINE_FUNCTION constexpr ViewOffset(
+      const ViewOffset<DimRHS, Kokkos::LayoutLeft, void>& rhs,
+      const SubviewExtents<DimRHS::rank, dimension_type::rank>& sub)
+      : m_dim(sub.range_extent(0), sub.range_extent(1), sub.range_extent(2),
+              sub.range_extent(3), sub.range_extent(4), sub.range_extent(5),
+              sub.range_extent(6), sub.range_extent(7)),
+        m_stride(
+            (1 == sub.range_index(1)
+                 ? rhs.stride_1()
+                 : (2 == sub.range_index(1)
+                        ? rhs.stride_2()
+                        : (3 == sub.range_index(1)
+                               ? rhs.stride_3()
+                               : (4 == sub.range_index(1)
+                                      ? rhs.stride_4()
+                                      : (5 == sub.range_index(1)
+                                             ? rhs.stride_5()
+                                             : (6 == sub.range_index(1)
+                                                    ? rhs.stride_6()
+                                                    : (7 == sub.range_index(1)
+                                                           ? rhs.stride_7()
+                                                           : 0)))))))) {
+    // static_assert( ( 2 == dimension_type::rank ) &&
+    //               ( 2 == dimension_type::rank_dynamic ) &&
+    //               ( 2 <= DimRHS::rank )
+    //             , "ViewOffset subview construction requires compatible rank"
+    //             );
+  }
 };
 
 //----------------------------------------------------------------------------
 // LayoutRight AND ( 1 >= rank OR 0 == rank_dynamic ) : no padding / striding
-template < class Dimension >
-struct ViewOffset< Dimension , Kokkos::LayoutRight
-                 , typename std::enable_if<( 1 >= Dimension::rank
-                                             ||
-                                             0 == Dimension::rank_dynamic
-                                           )>::type >
-{
-  using is_mapping_plugin = std::true_type ;
-  using is_regular        = std::true_type ;
+template <class Dimension>
+struct ViewOffset<
+    Dimension, Kokkos::LayoutRight,
+    typename std::enable_if<(1 >= Dimension::rank ||
+                             0 == Dimension::rank_dynamic)>::type> {
+  using is_mapping_plugin = std::true_type;
+  using is_regular        = std::true_type;
 
-  typedef size_t              size_type ;
-  typedef Dimension           dimension_type ;
-  typedef Kokkos::LayoutRight array_layout ;
+  typedef size_t size_type;
+  typedef Dimension dimension_type;
+  typedef Kokkos::LayoutRight array_layout;
 
-  dimension_type m_dim ;
+  dimension_type m_dim;
 
   //----------------------------------------
 
   // rank 1
-  template< typename I0 >
-  KOKKOS_INLINE_FUNCTION constexpr
-  size_type operator()( I0 const & i0 ) const { return i0 ; }
+  template <typename I0>
+  KOKKOS_INLINE_FUNCTION constexpr size_type operator()(I0 const& i0) const {
+    return i0;
+  }
 
   // rank 2
-  template < typename I0 , typename I1 >
-  KOKKOS_INLINE_FUNCTION constexpr
-  size_type operator()( I0 const & i0 , I1 const & i1 ) const
-    { return i1 + m_dim.N1 * i0 ; }
-
-  //rank 3
-  template < typename I0, typename I1, typename I2 >
-  KOKKOS_INLINE_FUNCTION constexpr
-  size_type operator()( I0 const & i0, I1 const & i1, I2 const & i2 ) const
-  {
-    return i2 + m_dim.N2 * ( i1 + m_dim.N1 * ( i0 ));
+  template <typename I0, typename I1>
+  KOKKOS_INLINE_FUNCTION constexpr size_type operator()(I0 const& i0,
+                                                        I1 const& i1) const {
+    return i1 + m_dim.N1 * i0;
   }
 
-  //rank 4
-  template < typename I0, typename I1, typename I2, typename I3 >
-  KOKKOS_INLINE_FUNCTION constexpr
-  size_type operator()( I0 const & i0, I1 const & i1, I2 const & i2, I3 const & i3 ) const
-  {
-    return i3 + m_dim.N3 * (
-           i2 + m_dim.N2 * (
-           i1 + m_dim.N1 * ( i0 )));
+  // rank 3
+  template <typename I0, typename I1, typename I2>
+  KOKKOS_INLINE_FUNCTION constexpr size_type operator()(I0 const& i0,
+                                                        I1 const& i1,
+                                                        I2 const& i2) const {
+    return i2 + m_dim.N2 * (i1 + m_dim.N1 * (i0));
   }
 
-  //rank 5
-  template < typename I0, typename I1, typename I2, typename I3
-           , typename I4 >
-  KOKKOS_INLINE_FUNCTION constexpr
-  size_type operator()( I0 const & i0, I1 const & i1, I2 const & i2, I3 const & i3
-                      , I4 const & i4 ) const
-  {
-    return i4 + m_dim.N4 * (
-           i3 + m_dim.N3 * (
-           i2 + m_dim.N2 * (
-           i1 + m_dim.N1 * ( i0 ))));
+  // rank 4
+  template <typename I0, typename I1, typename I2, typename I3>
+  KOKKOS_INLINE_FUNCTION constexpr size_type operator()(I0 const& i0,
+                                                        I1 const& i1,
+                                                        I2 const& i2,
+                                                        I3 const& i3) const {
+    return i3 + m_dim.N3 * (i2 + m_dim.N2 * (i1 + m_dim.N1 * (i0)));
   }
 
-  //rank 6
-  template < typename I0, typename I1, typename I2, typename I3
-           , typename I4, typename I5 >
-  KOKKOS_INLINE_FUNCTION constexpr
-  size_type operator()( I0 const & i0, I1 const & i1, I2 const & i2, I3 const & i3
-                      , I4 const & i4, I5 const & i5 ) const
-  {
-    return i5 + m_dim.N5 * (
-           i4 + m_dim.N4 * (
-           i3 + m_dim.N3 * (
-           i2 + m_dim.N2 * (
-           i1 + m_dim.N1 * ( i0 )))));
+  // rank 5
+  template <typename I0, typename I1, typename I2, typename I3, typename I4>
+  KOKKOS_INLINE_FUNCTION constexpr size_type operator()(I0 const& i0,
+                                                        I1 const& i1,
+                                                        I2 const& i2,
+                                                        I3 const& i3,
+                                                        I4 const& i4) const {
+    return i4 + m_dim.N4 *
+                    (i3 + m_dim.N3 * (i2 + m_dim.N2 * (i1 + m_dim.N1 * (i0))));
   }
 
-  //rank 7
-  template < typename I0, typename I1, typename I2, typename I3
-           , typename I4, typename I5, typename I6 >
-  KOKKOS_INLINE_FUNCTION constexpr
-  size_type operator()( I0 const & i0, I1 const & i1, I2 const & i2, I3 const & i3
-                      , I4 const & i4, I5 const & i5, I6 const & i6 ) const
-  {
-    return i6 + m_dim.N6 * (
-           i5 + m_dim.N5 * (
-           i4 + m_dim.N4 * (
-           i3 + m_dim.N3 * (
-           i2 + m_dim.N2 * (
-           i1 + m_dim.N1 * ( i0 ))))));
+  // rank 6
+  template <typename I0, typename I1, typename I2, typename I3, typename I4,
+            typename I5>
+  KOKKOS_INLINE_FUNCTION constexpr size_type operator()(
+      I0 const& i0, I1 const& i1, I2 const& i2, I3 const& i3, I4 const& i4,
+      I5 const& i5) const {
+    return i5 +
+           m_dim.N5 *
+               (i4 +
+                m_dim.N4 *
+                    (i3 + m_dim.N3 * (i2 + m_dim.N2 * (i1 + m_dim.N1 * (i0)))));
   }
 
-  //rank 8
-  template < typename I0, typename I1, typename I2, typename I3
-           , typename I4, typename I5, typename I6, typename I7 >
-  KOKKOS_INLINE_FUNCTION constexpr
-  size_type operator()( I0 const & i0, I1 const & i1, I2 const & i2, I3 const & i3
-                      , I4 const & i4, I5 const & i5, I6 const & i6, I7 const & i7 ) const
-  {
-    return i7 + m_dim.N7 * (
-           i6 + m_dim.N6 * (
-           i5 + m_dim.N5 * (
-           i4 + m_dim.N4 * (
-           i3 + m_dim.N3 * (
-           i2 + m_dim.N2 * (
-           i1 + m_dim.N1 * ( i0 )))))));
+  // rank 7
+  template <typename I0, typename I1, typename I2, typename I3, typename I4,
+            typename I5, typename I6>
+  KOKKOS_INLINE_FUNCTION constexpr size_type operator()(
+      I0 const& i0, I1 const& i1, I2 const& i2, I3 const& i3, I4 const& i4,
+      I5 const& i5, I6 const& i6) const {
+    return i6 +
+           m_dim.N6 *
+               (i5 +
+                m_dim.N5 *
+                    (i4 +
+                     m_dim.N4 *
+                         (i3 + m_dim.N3 *
+                                   (i2 + m_dim.N2 * (i1 + m_dim.N1 * (i0))))));
+  }
+
+  // rank 8
+  template <typename I0, typename I1, typename I2, typename I3, typename I4,
+            typename I5, typename I6, typename I7>
+  KOKKOS_INLINE_FUNCTION constexpr size_type operator()(
+      I0 const& i0, I1 const& i1, I2 const& i2, I3 const& i3, I4 const& i4,
+      I5 const& i5, I6 const& i6, I7 const& i7) const {
+    return i7 +
+           m_dim.N7 *
+               (i6 +
+                m_dim.N6 *
+                    (i5 +
+                     m_dim.N5 *
+                         (i4 +
+                          m_dim.N4 *
+                              (i3 +
+                               m_dim.N3 *
+                                   (i2 + m_dim.N2 * (i1 + m_dim.N1 * (i0)))))));
   }
 
   //----------------------------------------
 
   KOKKOS_INLINE_FUNCTION
-  constexpr array_layout layout() const
-    {
-      return array_layout( m_dim.N0 , m_dim.N1 , m_dim.N2 , m_dim.N3
-                         , m_dim.N4 , m_dim.N5 , m_dim.N6 , m_dim.N7 );
-    }
+  constexpr array_layout layout() const {
+    return array_layout(m_dim.N0, m_dim.N1, m_dim.N2, m_dim.N3, m_dim.N4,
+                        m_dim.N5, m_dim.N6, m_dim.N7);
+  }
 
-  KOKKOS_INLINE_FUNCTION constexpr size_type dimension_0() const { return m_dim.N0 ; }
-  KOKKOS_INLINE_FUNCTION constexpr size_type dimension_1() const { return m_dim.N1 ; }
-  KOKKOS_INLINE_FUNCTION constexpr size_type dimension_2() const { return m_dim.N2 ; }
-  KOKKOS_INLINE_FUNCTION constexpr size_type dimension_3() const { return m_dim.N3 ; }
-  KOKKOS_INLINE_FUNCTION constexpr size_type dimension_4() const { return m_dim.N4 ; }
-  KOKKOS_INLINE_FUNCTION constexpr size_type dimension_5() const { return m_dim.N5 ; }
-  KOKKOS_INLINE_FUNCTION constexpr size_type dimension_6() const { return m_dim.N6 ; }
-  KOKKOS_INLINE_FUNCTION constexpr size_type dimension_7() const { return m_dim.N7 ; }
+  KOKKOS_INLINE_FUNCTION constexpr size_type dimension_0() const {
+    return m_dim.N0;
+  }
+  KOKKOS_INLINE_FUNCTION constexpr size_type dimension_1() const {
+    return m_dim.N1;
+  }
+  KOKKOS_INLINE_FUNCTION constexpr size_type dimension_2() const {
+    return m_dim.N2;
+  }
+  KOKKOS_INLINE_FUNCTION constexpr size_type dimension_3() const {
+    return m_dim.N3;
+  }
+  KOKKOS_INLINE_FUNCTION constexpr size_type dimension_4() const {
+    return m_dim.N4;
+  }
+  KOKKOS_INLINE_FUNCTION constexpr size_type dimension_5() const {
+    return m_dim.N5;
+  }
+  KOKKOS_INLINE_FUNCTION constexpr size_type dimension_6() const {
+    return m_dim.N6;
+  }
+  KOKKOS_INLINE_FUNCTION constexpr size_type dimension_7() const {
+    return m_dim.N7;
+  }
 
   /* Cardinality of the domain index space */
   KOKKOS_INLINE_FUNCTION
-  constexpr size_type size() const
-    { return m_dim.N0 * m_dim.N1 * m_dim.N2 * m_dim.N3 * m_dim.N4 * m_dim.N5 * m_dim.N6 * m_dim.N7 ; }
+  constexpr size_type size() const {
+    return m_dim.N0 * m_dim.N1 * m_dim.N2 * m_dim.N3 * m_dim.N4 * m_dim.N5 *
+           m_dim.N6 * m_dim.N7;
+  }
 
   /* Span of the range space */
   KOKKOS_INLINE_FUNCTION
-  constexpr size_type span() const
-    { return m_dim.N0 * m_dim.N1 * m_dim.N2 * m_dim.N3 * m_dim.N4 * m_dim.N5 * m_dim.N6 * m_dim.N7 ; }
+  constexpr size_type span() const {
+    return m_dim.N0 * m_dim.N1 * m_dim.N2 * m_dim.N3 * m_dim.N4 * m_dim.N5 *
+           m_dim.N6 * m_dim.N7;
+  }
 
-  KOKKOS_INLINE_FUNCTION constexpr bool span_is_contiguous() const { return true ; }
+  KOKKOS_INLINE_FUNCTION constexpr bool span_is_contiguous() const {
+    return true;
+  }
 
   /* Strides of dimensions */
-  KOKKOS_INLINE_FUNCTION constexpr size_type stride_7() const { return 1 ; }
-  KOKKOS_INLINE_FUNCTION constexpr size_type stride_6() const { return m_dim.N7 ; }
-  KOKKOS_INLINE_FUNCTION constexpr size_type stride_5() const { return m_dim.N7 * m_dim.N6 ; }
-  KOKKOS_INLINE_FUNCTION constexpr size_type stride_4() const { return m_dim.N7 * m_dim.N6 * m_dim.N5 ; }
-  KOKKOS_INLINE_FUNCTION constexpr size_type stride_3() const { return m_dim.N7 * m_dim.N6 * m_dim.N5 * m_dim.N4 ; }
-  KOKKOS_INLINE_FUNCTION constexpr size_type stride_2() const { return m_dim.N7 * m_dim.N6 * m_dim.N5 * m_dim.N4 * m_dim.N3 ; }
-  KOKKOS_INLINE_FUNCTION constexpr size_type stride_1() const { return m_dim.N7 * m_dim.N6 * m_dim.N5 * m_dim.N4 * m_dim.N3 * m_dim.N2 ; }
-  KOKKOS_INLINE_FUNCTION constexpr size_type stride_0() const { return m_dim.N7 * m_dim.N6 * m_dim.N5 * m_dim.N4 * m_dim.N3 * m_dim.N2 * m_dim.N1 ; }
+  KOKKOS_INLINE_FUNCTION constexpr size_type stride_7() const { return 1; }
+  KOKKOS_INLINE_FUNCTION constexpr size_type stride_6() const {
+    return m_dim.N7;
+  }
+  KOKKOS_INLINE_FUNCTION constexpr size_type stride_5() const {
+    return m_dim.N7 * m_dim.N6;
+  }
+  KOKKOS_INLINE_FUNCTION constexpr size_type stride_4() const {
+    return m_dim.N7 * m_dim.N6 * m_dim.N5;
+  }
+  KOKKOS_INLINE_FUNCTION constexpr size_type stride_3() const {
+    return m_dim.N7 * m_dim.N6 * m_dim.N5 * m_dim.N4;
+  }
+  KOKKOS_INLINE_FUNCTION constexpr size_type stride_2() const {
+    return m_dim.N7 * m_dim.N6 * m_dim.N5 * m_dim.N4 * m_dim.N3;
+  }
+  KOKKOS_INLINE_FUNCTION constexpr size_type stride_1() const {
+    return m_dim.N7 * m_dim.N6 * m_dim.N5 * m_dim.N4 * m_dim.N3 * m_dim.N2;
+  }
+  KOKKOS_INLINE_FUNCTION constexpr size_type stride_0() const {
+    return m_dim.N7 * m_dim.N6 * m_dim.N5 * m_dim.N4 * m_dim.N3 * m_dim.N2 *
+           m_dim.N1;
+  }
 
   // Stride with [ rank ] value is the total length
-  template< typename iType >
-  KOKKOS_INLINE_FUNCTION
-  void stride( iType * const s ) const
-    {
-      size_type n = 1 ;
-      if ( 7 < dimension_type::rank ) { s[7] = n ; n *= m_dim.N7 ; }
-      if ( 6 < dimension_type::rank ) { s[6] = n ; n *= m_dim.N6 ; }
-      if ( 5 < dimension_type::rank ) { s[5] = n ; n *= m_dim.N5 ; }
-      if ( 4 < dimension_type::rank ) { s[4] = n ; n *= m_dim.N4 ; }
-      if ( 3 < dimension_type::rank ) { s[3] = n ; n *= m_dim.N3 ; }
-      if ( 2 < dimension_type::rank ) { s[2] = n ; n *= m_dim.N2 ; }
-      if ( 1 < dimension_type::rank ) { s[1] = n ; n *= m_dim.N1 ; }
-      if ( 0 < dimension_type::rank ) { s[0] = n ; }
-      s[dimension_type::rank] = n * m_dim.N0 ;
+  template <typename iType>
+  KOKKOS_INLINE_FUNCTION void stride(iType* const s) const {
+    size_type n = 1;
+    if (7 < dimension_type::rank) {
+      s[7] = n;
+      n *= m_dim.N7;
     }
+    if (6 < dimension_type::rank) {
+      s[6] = n;
+      n *= m_dim.N6;
+    }
+    if (5 < dimension_type::rank) {
+      s[5] = n;
+      n *= m_dim.N5;
+    }
+    if (4 < dimension_type::rank) {
+      s[4] = n;
+      n *= m_dim.N4;
+    }
+    if (3 < dimension_type::rank) {
+      s[3] = n;
+      n *= m_dim.N3;
+    }
+    if (2 < dimension_type::rank) {
+      s[2] = n;
+      n *= m_dim.N2;
+    }
+    if (1 < dimension_type::rank) {
+      s[1] = n;
+      n *= m_dim.N1;
+    }
+    if (0 < dimension_type::rank) {
+      s[0] = n;
+    }
+    s[dimension_type::rank] = n * m_dim.N0;
+  }
 
   //----------------------------------------
 
-  ViewOffset() = default ;
-  ViewOffset( const ViewOffset & ) = default ;
-  ViewOffset & operator = ( const ViewOffset & ) = default ;
+  ViewOffset()                  = default;
+  ViewOffset(const ViewOffset&) = default;
+  ViewOffset& operator=(const ViewOffset&) = default;
 
-  template< unsigned TrivialScalarSize >
-  KOKKOS_INLINE_FUNCTION
-  constexpr ViewOffset
-    ( std::integral_constant<unsigned,TrivialScalarSize> const &
-    , Kokkos::LayoutRight const & arg_layout
-    )
-    : m_dim( arg_layout.dimension[0], 0, 0, 0, 0, 0, 0, 0 )
-    {}
+  template <unsigned TrivialScalarSize>
+  KOKKOS_INLINE_FUNCTION constexpr ViewOffset(
+      std::integral_constant<unsigned, TrivialScalarSize> const&,
+      Kokkos::LayoutRight const& arg_layout)
+      : m_dim(arg_layout.dimension[0], 0, 0, 0, 0, 0, 0, 0) {}
 
-  template< class DimRHS >
-  KOKKOS_INLINE_FUNCTION
-  constexpr ViewOffset( const ViewOffset< DimRHS , Kokkos::LayoutRight , void > & rhs )
-    : m_dim( rhs.m_dim.N0 , rhs.m_dim.N1 , rhs.m_dim.N2 , rhs.m_dim.N3
-           , rhs.m_dim.N4 , rhs.m_dim.N5 , rhs.m_dim.N6 , rhs.m_dim.N7 )
-    {
-      static_assert( int(DimRHS::rank) == int(dimension_type::rank) , "ViewOffset assignment requires equal rank" );
-      // Also requires equal static dimensions ...
-    }
+  template <class DimRHS>
+  KOKKOS_INLINE_FUNCTION constexpr ViewOffset(
+      const ViewOffset<DimRHS, Kokkos::LayoutRight, void>& rhs)
+      : m_dim(rhs.m_dim.N0, rhs.m_dim.N1, rhs.m_dim.N2, rhs.m_dim.N3,
+              rhs.m_dim.N4, rhs.m_dim.N5, rhs.m_dim.N6, rhs.m_dim.N7) {
+    static_assert(int(DimRHS::rank) == int(dimension_type::rank),
+                  "ViewOffset assignment requires equal rank");
+    // Also requires equal static dimensions ...
+  }
 
-  template< class DimRHS >
-  KOKKOS_INLINE_FUNCTION
-  constexpr ViewOffset( const ViewOffset< DimRHS , Kokkos::LayoutLeft , void > & rhs )
-    : m_dim( rhs.m_dim.N0, 0, 0, 0, 0, 0, 0, 0 )
-    {
-      static_assert(
-       ( DimRHS::rank == 0 &&
-         dimension_type::rank == 0 ) ||
-       ( DimRHS::rank == 1 &&
-         dimension_type::rank == 1 &&
-         dimension_type::rank_dynamic == 1 )
-      , "ViewOffset LayoutRight and LayoutLeft are only compatible when rank <= 1" );
-    }
+  template <class DimRHS>
+  KOKKOS_INLINE_FUNCTION constexpr ViewOffset(
+      const ViewOffset<DimRHS, Kokkos::LayoutLeft, void>& rhs)
+      : m_dim(rhs.m_dim.N0, 0, 0, 0, 0, 0, 0, 0) {
+    static_assert((DimRHS::rank == 0 && dimension_type::rank == 0) ||
+                      (DimRHS::rank == 1 && dimension_type::rank == 1 &&
+                       dimension_type::rank_dynamic == 1),
+                  "ViewOffset LayoutRight and LayoutLeft are only compatible "
+                  "when rank <= 1");
+  }
 
-  template< class DimRHS >
-  KOKKOS_INLINE_FUNCTION
-  ViewOffset( const ViewOffset< DimRHS , Kokkos::LayoutStride , void > & rhs )
-    : m_dim( rhs.m_dim.N0, 0, 0, 0, 0, 0, 0, 0 )
-    {
-
-    }
+  template <class DimRHS>
+  KOKKOS_INLINE_FUNCTION ViewOffset(
+      const ViewOffset<DimRHS, Kokkos::LayoutStride, void>& rhs)
+      : m_dim(rhs.m_dim.N0, 0, 0, 0, 0, 0, 0, 0) {}
 
   //----------------------------------------
   // Subview construction
 
-  template< class DimRHS >
-  KOKKOS_INLINE_FUNCTION
-  constexpr ViewOffset
-    ( const ViewOffset< DimRHS , Kokkos::LayoutRight , void > &
-    , const SubviewExtents< DimRHS::rank , dimension_type::rank > & sub
-    )
-    : m_dim( sub.range_extent(0) , 0, 0, 0, 0, 0, 0, 0 )
-    {
-      static_assert( ( 0 == dimension_type::rank_dynamic ) ||
-                     ( 1 == dimension_type::rank && 1 == dimension_type::rank_dynamic && 1 <= DimRHS::rank )
-                   , "ViewOffset subview construction requires compatible rank" );
-    }
+  template <class DimRHS>
+  KOKKOS_INLINE_FUNCTION constexpr ViewOffset(
+      const ViewOffset<DimRHS, Kokkos::LayoutRight, void>&,
+      const SubviewExtents<DimRHS::rank, dimension_type::rank>& sub)
+      : m_dim(sub.range_extent(0), 0, 0, 0, 0, 0, 0, 0) {
+    static_assert((0 == dimension_type::rank_dynamic) ||
+                      (1 == dimension_type::rank &&
+                       1 == dimension_type::rank_dynamic && 1 <= DimRHS::rank),
+                  "ViewOffset subview construction requires compatible rank");
+  }
 };
 
 //----------------------------------------------------------------------------
 // LayoutRight AND ( 1 < rank AND 0 < rank_dynamic ) : has padding / striding
-template < class Dimension >
-struct ViewOffset< Dimension , Kokkos::LayoutRight
-                 , typename std::enable_if<( 1 < Dimension::rank
-                                             &&
-                                             0 < Dimension::rank_dynamic
-                                           )>::type >
-{
-  using is_mapping_plugin = std::true_type ;
-  using is_regular        = std::true_type ;
+template <class Dimension>
+struct ViewOffset<
+    Dimension, Kokkos::LayoutRight,
+    typename std::enable_if<(1 < Dimension::rank &&
+                             0 < Dimension::rank_dynamic)>::type> {
+  using is_mapping_plugin = std::true_type;
+  using is_regular        = std::true_type;
 
-  typedef size_t               size_type ;
-  typedef Dimension            dimension_type ;
-  typedef Kokkos::LayoutRight  array_layout ;
+  typedef size_t size_type;
+  typedef Dimension dimension_type;
+  typedef Kokkos::LayoutRight array_layout;
 
-  dimension_type m_dim ;
-  size_type      m_stride ;
+  dimension_type m_dim;
+  size_type m_stride;
 
   //----------------------------------------
 
   // rank 1
-  template< typename I0 >
-  KOKKOS_INLINE_FUNCTION constexpr
-  size_type operator()( I0 const & i0 ) const { return i0 ; }
+  template <typename I0>
+  KOKKOS_INLINE_FUNCTION constexpr size_type operator()(I0 const& i0) const {
+    return i0;
+  }
 
   // rank 2
-  template < typename I0 , typename I1 >
-  KOKKOS_INLINE_FUNCTION constexpr
-  size_type operator()( I0 const & i0 , I1 const & i1 ) const
-  { return i1 + i0 * m_stride ; }
-
-  //rank 3
-  template < typename I0, typename I1, typename I2 >
-  KOKKOS_INLINE_FUNCTION constexpr
-  size_type operator()( I0 const & i0, I1 const & i1, I2 const & i2 ) const
-  { return i2 + m_dim.N2 * ( i1 ) + i0 * m_stride ; }
-
-  //rank 4
-  template < typename I0, typename I1, typename I2, typename I3 >
-  KOKKOS_INLINE_FUNCTION constexpr
-  size_type operator()( I0 const & i0, I1 const & i1, I2 const & i2, I3 const & i3 ) const
-  {
-    return i3 + m_dim.N3 * (
-           i2 + m_dim.N2 * ( i1 )) +
-           i0 * m_stride ;
+  template <typename I0, typename I1>
+  KOKKOS_INLINE_FUNCTION constexpr size_type operator()(I0 const& i0,
+                                                        I1 const& i1) const {
+    return i1 + i0 * m_stride;
   }
 
-  //rank 5
-  template < typename I0, typename I1, typename I2, typename I3
-           , typename I4 >
-  KOKKOS_INLINE_FUNCTION constexpr
-  size_type operator()( I0 const & i0, I1 const & i1, I2 const & i2, I3 const & i3
-                      , I4 const & i4 ) const
-  {
-    return i4 + m_dim.N4 * (
-           i3 + m_dim.N3 * (
-           i2 + m_dim.N2 * ( i1 ))) +
-           i0 * m_stride ;
+  // rank 3
+  template <typename I0, typename I1, typename I2>
+  KOKKOS_INLINE_FUNCTION constexpr size_type operator()(I0 const& i0,
+                                                        I1 const& i1,
+                                                        I2 const& i2) const {
+    return i2 + m_dim.N2 * (i1) + i0 * m_stride;
   }
 
-  //rank 6
-  template < typename I0, typename I1, typename I2, typename I3
-           , typename I4, typename I5 >
-  KOKKOS_INLINE_FUNCTION constexpr
-  size_type operator()( I0 const & i0, I1 const & i1, I2 const & i2, I3 const & i3
-                      , I4 const & i4, I5 const & i5 ) const
-  {
-    return i5 + m_dim.N5 * (
-           i4 + m_dim.N4 * (
-           i3 + m_dim.N3 * (
-           i2 + m_dim.N2 * ( i1 )))) +
-           i0 * m_stride ;
+  // rank 4
+  template <typename I0, typename I1, typename I2, typename I3>
+  KOKKOS_INLINE_FUNCTION constexpr size_type operator()(I0 const& i0,
+                                                        I1 const& i1,
+                                                        I2 const& i2,
+                                                        I3 const& i3) const {
+    return i3 + m_dim.N3 * (i2 + m_dim.N2 * (i1)) + i0 * m_stride;
   }
 
-  //rank 7
-  template < typename I0, typename I1, typename I2, typename I3
-           , typename I4, typename I5, typename I6 >
-  KOKKOS_INLINE_FUNCTION constexpr
-  size_type operator()( I0 const & i0, I1 const & i1, I2 const & i2, I3 const & i3
-                      , I4 const & i4, I5 const & i5, I6 const & i6 ) const
-  {
-    return i6 + m_dim.N6 * (
-           i5 + m_dim.N5 * (
-           i4 + m_dim.N4 * (
-           i3 + m_dim.N3 * (
-           i2 + m_dim.N2 * ( i1 ))))) +
-           i0 * m_stride ;
+  // rank 5
+  template <typename I0, typename I1, typename I2, typename I3, typename I4>
+  KOKKOS_INLINE_FUNCTION constexpr size_type operator()(I0 const& i0,
+                                                        I1 const& i1,
+                                                        I2 const& i2,
+                                                        I3 const& i3,
+                                                        I4 const& i4) const {
+    return i4 + m_dim.N4 * (i3 + m_dim.N3 * (i2 + m_dim.N2 * (i1))) +
+           i0 * m_stride;
   }
 
-  //rank 8
-  template < typename I0, typename I1, typename I2, typename I3
-           , typename I4, typename I5, typename I6, typename I7 >
-  KOKKOS_INLINE_FUNCTION constexpr
-  size_type operator()( I0 const & i0, I1 const & i1, I2 const & i2, I3 const & i3
-                      , I4 const & i4, I5 const & i5, I6 const & i6, I7 const & i7 ) const
-  {
-    return i7 + m_dim.N7 * (
-           i6 + m_dim.N6 * (
-           i5 + m_dim.N5 * (
-           i4 + m_dim.N4 * (
-           i3 + m_dim.N3 * (
-           i2 + m_dim.N2 * ( i1 )))))) +
-           i0 * m_stride ;
+  // rank 6
+  template <typename I0, typename I1, typename I2, typename I3, typename I4,
+            typename I5>
+  KOKKOS_INLINE_FUNCTION constexpr size_type operator()(
+      I0 const& i0, I1 const& i1, I2 const& i2, I3 const& i3, I4 const& i4,
+      I5 const& i5) const {
+    return i5 +
+           m_dim.N5 *
+               (i4 + m_dim.N4 * (i3 + m_dim.N3 * (i2 + m_dim.N2 * (i1)))) +
+           i0 * m_stride;
+  }
+
+  // rank 7
+  template <typename I0, typename I1, typename I2, typename I3, typename I4,
+            typename I5, typename I6>
+  KOKKOS_INLINE_FUNCTION constexpr size_type operator()(
+      I0 const& i0, I1 const& i1, I2 const& i2, I3 const& i3, I4 const& i4,
+      I5 const& i5, I6 const& i6) const {
+    return i6 +
+           m_dim.N6 *
+               (i5 + m_dim.N5 *
+                         (i4 + m_dim.N4 *
+                                   (i3 + m_dim.N3 * (i2 + m_dim.N2 * (i1))))) +
+           i0 * m_stride;
+  }
+
+  // rank 8
+  template <typename I0, typename I1, typename I2, typename I3, typename I4,
+            typename I5, typename I6, typename I7>
+  KOKKOS_INLINE_FUNCTION constexpr size_type operator()(
+      I0 const& i0, I1 const& i1, I2 const& i2, I3 const& i3, I4 const& i4,
+      I5 const& i5, I6 const& i6, I7 const& i7) const {
+    return i7 +
+           m_dim.N7 *
+               (i6 +
+                m_dim.N6 *
+                    (i5 +
+                     m_dim.N5 *
+                         (i4 + m_dim.N4 *
+                                   (i3 + m_dim.N3 * (i2 + m_dim.N2 * (i1)))))) +
+           i0 * m_stride;
   }
 
   //----------------------------------------
 
   KOKKOS_INLINE_FUNCTION
-  constexpr array_layout layout() const
-    {
-      return array_layout( m_dim.N0 , m_dim.N1 , m_dim.N2 , m_dim.N3
-                         , m_dim.N4 , m_dim.N5 , m_dim.N6 , m_dim.N7 );
-    }
+  constexpr array_layout layout() const {
+    return array_layout(m_dim.N0, m_dim.N1, m_dim.N2, m_dim.N3, m_dim.N4,
+                        m_dim.N5, m_dim.N6, m_dim.N7);
+  }
 
-  KOKKOS_INLINE_FUNCTION constexpr size_type dimension_0() const { return m_dim.N0 ; }
-  KOKKOS_INLINE_FUNCTION constexpr size_type dimension_1() const { return m_dim.N1 ; }
-  KOKKOS_INLINE_FUNCTION constexpr size_type dimension_2() const { return m_dim.N2 ; }
-  KOKKOS_INLINE_FUNCTION constexpr size_type dimension_3() const { return m_dim.N3 ; }
-  KOKKOS_INLINE_FUNCTION constexpr size_type dimension_4() const { return m_dim.N4 ; }
-  KOKKOS_INLINE_FUNCTION constexpr size_type dimension_5() const { return m_dim.N5 ; }
-  KOKKOS_INLINE_FUNCTION constexpr size_type dimension_6() const { return m_dim.N6 ; }
-  KOKKOS_INLINE_FUNCTION constexpr size_type dimension_7() const { return m_dim.N7 ; }
+  KOKKOS_INLINE_FUNCTION constexpr size_type dimension_0() const {
+    return m_dim.N0;
+  }
+  KOKKOS_INLINE_FUNCTION constexpr size_type dimension_1() const {
+    return m_dim.N1;
+  }
+  KOKKOS_INLINE_FUNCTION constexpr size_type dimension_2() const {
+    return m_dim.N2;
+  }
+  KOKKOS_INLINE_FUNCTION constexpr size_type dimension_3() const {
+    return m_dim.N3;
+  }
+  KOKKOS_INLINE_FUNCTION constexpr size_type dimension_4() const {
+    return m_dim.N4;
+  }
+  KOKKOS_INLINE_FUNCTION constexpr size_type dimension_5() const {
+    return m_dim.N5;
+  }
+  KOKKOS_INLINE_FUNCTION constexpr size_type dimension_6() const {
+    return m_dim.N6;
+  }
+  KOKKOS_INLINE_FUNCTION constexpr size_type dimension_7() const {
+    return m_dim.N7;
+  }
 
   /* Cardinality of the domain index space */
   KOKKOS_INLINE_FUNCTION
-  constexpr size_type size() const
-    { return m_dim.N0 * m_dim.N1 * m_dim.N2 * m_dim.N3 * m_dim.N4 * m_dim.N5 * m_dim.N6 * m_dim.N7 ; }
+  constexpr size_type size() const {
+    return m_dim.N0 * m_dim.N1 * m_dim.N2 * m_dim.N3 * m_dim.N4 * m_dim.N5 *
+           m_dim.N6 * m_dim.N7;
+  }
 
   /* Span of the range space */
   KOKKOS_INLINE_FUNCTION
-  constexpr size_type span() const
-    { return m_dim.N0 * m_stride ; }
+  constexpr size_type span() const { return m_dim.N0 * m_stride; }
 
-  KOKKOS_INLINE_FUNCTION constexpr bool span_is_contiguous() const
-    { return m_stride == m_dim.N7 * m_dim.N6 * m_dim.N5 * m_dim.N4 * m_dim.N3 * m_dim.N2 * m_dim.N1 ; }
+  KOKKOS_INLINE_FUNCTION constexpr bool span_is_contiguous() const {
+    return m_stride == m_dim.N7 * m_dim.N6 * m_dim.N5 * m_dim.N4 * m_dim.N3 *
+                           m_dim.N2 * m_dim.N1;
+  }
 
   /* Strides of dimensions */
-  KOKKOS_INLINE_FUNCTION constexpr size_type stride_7() const { return 1 ; }
-  KOKKOS_INLINE_FUNCTION constexpr size_type stride_6() const { return m_dim.N7 ; }
-  KOKKOS_INLINE_FUNCTION constexpr size_type stride_5() const { return m_dim.N7 * m_dim.N6 ; }
-  KOKKOS_INLINE_FUNCTION constexpr size_type stride_4() const { return m_dim.N7 * m_dim.N6 * m_dim.N5 ; }
-  KOKKOS_INLINE_FUNCTION constexpr size_type stride_3() const { return m_dim.N7 * m_dim.N6 * m_dim.N5 * m_dim.N4 ; }
-  KOKKOS_INLINE_FUNCTION constexpr size_type stride_2() const { return m_dim.N7 * m_dim.N6 * m_dim.N5 * m_dim.N4 * m_dim.N3 ; }
-  KOKKOS_INLINE_FUNCTION constexpr size_type stride_1() const { return m_dim.N7 * m_dim.N6 * m_dim.N5 * m_dim.N4 * m_dim.N3 * m_dim.N2 ; }
-  KOKKOS_INLINE_FUNCTION constexpr size_type stride_0() const { return m_stride ; }
+  KOKKOS_INLINE_FUNCTION constexpr size_type stride_7() const { return 1; }
+  KOKKOS_INLINE_FUNCTION constexpr size_type stride_6() const {
+    return m_dim.N7;
+  }
+  KOKKOS_INLINE_FUNCTION constexpr size_type stride_5() const {
+    return m_dim.N7 * m_dim.N6;
+  }
+  KOKKOS_INLINE_FUNCTION constexpr size_type stride_4() const {
+    return m_dim.N7 * m_dim.N6 * m_dim.N5;
+  }
+  KOKKOS_INLINE_FUNCTION constexpr size_type stride_3() const {
+    return m_dim.N7 * m_dim.N6 * m_dim.N5 * m_dim.N4;
+  }
+  KOKKOS_INLINE_FUNCTION constexpr size_type stride_2() const {
+    return m_dim.N7 * m_dim.N6 * m_dim.N5 * m_dim.N4 * m_dim.N3;
+  }
+  KOKKOS_INLINE_FUNCTION constexpr size_type stride_1() const {
+    return m_dim.N7 * m_dim.N6 * m_dim.N5 * m_dim.N4 * m_dim.N3 * m_dim.N2;
+  }
+  KOKKOS_INLINE_FUNCTION constexpr size_type stride_0() const {
+    return m_stride;
+  }
 
   // Stride with [ rank ] value is the total length
-  template< typename iType >
-  KOKKOS_INLINE_FUNCTION
-  void stride( iType * const s ) const
-    {
-      size_type n = 1 ;
-      if ( 7 < dimension_type::rank ) { s[7] = n ; n *= m_dim.N7 ; }
-      if ( 6 < dimension_type::rank ) { s[6] = n ; n *= m_dim.N6 ; }
-      if ( 5 < dimension_type::rank ) { s[5] = n ; n *= m_dim.N5 ; }
-      if ( 4 < dimension_type::rank ) { s[4] = n ; n *= m_dim.N4 ; }
-      if ( 3 < dimension_type::rank ) { s[3] = n ; n *= m_dim.N3 ; }
-      if ( 2 < dimension_type::rank ) { s[2] = n ; n *= m_dim.N2 ; }
-      if ( 1 < dimension_type::rank ) { s[1] = n ; }
-      if ( 0 < dimension_type::rank ) { s[0] = m_stride ; }
-      s[dimension_type::rank] = m_stride * m_dim.N0 ;
+  template <typename iType>
+  KOKKOS_INLINE_FUNCTION void stride(iType* const s) const {
+    size_type n = 1;
+    if (7 < dimension_type::rank) {
+      s[7] = n;
+      n *= m_dim.N7;
     }
+    if (6 < dimension_type::rank) {
+      s[6] = n;
+      n *= m_dim.N6;
+    }
+    if (5 < dimension_type::rank) {
+      s[5] = n;
+      n *= m_dim.N5;
+    }
+    if (4 < dimension_type::rank) {
+      s[4] = n;
+      n *= m_dim.N4;
+    }
+    if (3 < dimension_type::rank) {
+      s[3] = n;
+      n *= m_dim.N3;
+    }
+    if (2 < dimension_type::rank) {
+      s[2] = n;
+      n *= m_dim.N2;
+    }
+    if (1 < dimension_type::rank) {
+      s[1] = n;
+    }
+    if (0 < dimension_type::rank) {
+      s[0] = m_stride;
+    }
+    s[dimension_type::rank] = m_stride * m_dim.N0;
+  }
 
   //----------------------------------------
 
-private:
-
-  template< unsigned TrivialScalarSize >
+ private:
+  template <unsigned TrivialScalarSize>
   struct Padding {
-    enum { div = TrivialScalarSize == 0 ? 0 : Kokkos::Impl::MEMORY_ALIGNMENT / ( TrivialScalarSize ? TrivialScalarSize : 1 ) };
-    enum { mod = TrivialScalarSize == 0 ? 0 : Kokkos::Impl::MEMORY_ALIGNMENT % ( TrivialScalarSize ? TrivialScalarSize : 1 ) };
+    enum {
+      div = TrivialScalarSize == 0
+                ? 0
+                : Kokkos::Impl::MEMORY_ALIGNMENT /
+                      (TrivialScalarSize ? TrivialScalarSize : 1)
+    };
+    enum {
+      mod = TrivialScalarSize == 0
+                ? 0
+                : Kokkos::Impl::MEMORY_ALIGNMENT %
+                      (TrivialScalarSize ? TrivialScalarSize : 1)
+    };
 
-    // If memory alignment is a multiple of the trivial scalar size then attempt to align.
+    // If memory alignment is a multiple of the trivial scalar size then attempt
+    // to align.
     enum { align = 0 != TrivialScalarSize && 0 == mod ? div : 0 };
-    enum { div_ok = (div != 0) ? div : 1 }; // To valid modulo zero in constexpr
+    enum {
+      div_ok = (div != 0) ? div : 1
+    };  // To valid modulo zero in constexpr
 
     KOKKOS_INLINE_FUNCTION
-    static constexpr size_t stride( size_t const N )
-    {
-      return ( (align != 0) && ((Kokkos::Impl::MEMORY_ALIGNMENT_THRESHOLD * align) < N) && ((N % div_ok) != 0) )
-             ? N + align - ( N % div_ok ) : N ;
+    static constexpr size_t stride(size_t const N) {
+      return ((align != 0) &&
+              ((Kokkos::Impl::MEMORY_ALIGNMENT_THRESHOLD * align) < N) &&
+              ((N % div_ok) != 0))
+                 ? N + align - (N % div_ok)
+                 : N;
     }
   };
 
-public:
+ public:
+  ViewOffset()                  = default;
+  ViewOffset(const ViewOffset&) = default;
+  ViewOffset& operator=(const ViewOffset&) = default;
 
-  ViewOffset() = default ;
-  ViewOffset( const ViewOffset & ) = default ;
-  ViewOffset & operator = ( const ViewOffset & ) = default ;
+  /* Enable padding for trivial scalar types with non-zero trivial scalar size.
+   */
+  template <unsigned TrivialScalarSize>
+  KOKKOS_INLINE_FUNCTION constexpr ViewOffset(
+      std::integral_constant<unsigned, TrivialScalarSize> const&,
+      Kokkos::LayoutRight const& arg_layout)
+      : m_dim(arg_layout.dimension[0], arg_layout.dimension[1],
+              arg_layout.dimension[2], arg_layout.dimension[3],
+              arg_layout.dimension[4], arg_layout.dimension[5],
+              arg_layout.dimension[6], arg_layout.dimension[7]),
+        m_stride(
+            Padding<TrivialScalarSize>::
+                stride(/* 2 <= rank */
+                       m_dim.N1 *
+                       (dimension_type::rank == 2
+                            ? 1
+                            : m_dim.N2 *
+                                  (dimension_type::rank == 3
+                                       ? 1
+                                       : m_dim.N3 *
+                                             (dimension_type::rank == 4
+                                                  ? 1
+                                                  : m_dim.N4 *
+                                                        (dimension_type::rank ==
+                                                                 5
+                                                             ? 1
+                                                             : m_dim.N5 *
+                                                                   (dimension_type::
+                                                                                rank ==
+                                                                            6
+                                                                        ? 1
+                                                                        : m_dim.N6 *
+                                                                              (dimension_type::
+                                                                                           rank ==
+                                                                                       7
+                                                                                   ? 1
+                                                                                   : m_dim
+                                                                                         .N7)))))))) {
+  }
 
-  /* Enable padding for trivial scalar types with non-zero trivial scalar size.  */
-  template< unsigned TrivialScalarSize >
-  KOKKOS_INLINE_FUNCTION
-  constexpr ViewOffset
-    ( std::integral_constant<unsigned,TrivialScalarSize> const &
-    , Kokkos::LayoutRight const & arg_layout
-    )
-    : m_dim( arg_layout.dimension[0] , arg_layout.dimension[1]
-           , arg_layout.dimension[2] , arg_layout.dimension[3]
-           , arg_layout.dimension[4] , arg_layout.dimension[5]
-           , arg_layout.dimension[6] , arg_layout.dimension[7]
-           )
-    , m_stride( Padding<TrivialScalarSize>::
-                  stride( /* 2 <= rank */
-                          m_dim.N1 * ( dimension_type::rank == 2 ? 1 :
-                          m_dim.N2 * ( dimension_type::rank == 3 ? 1 :
-                          m_dim.N3 * ( dimension_type::rank == 4 ? 1 :
-                          m_dim.N4 * ( dimension_type::rank == 5 ? 1 :
-                          m_dim.N5 * ( dimension_type::rank == 6 ? 1 :
-                          m_dim.N6 * ( dimension_type::rank == 7 ? 1 : m_dim.N7 )))))) ))
-    {}
+  template <class DimRHS>
+  KOKKOS_INLINE_FUNCTION constexpr ViewOffset(
+      const ViewOffset<DimRHS, Kokkos::LayoutRight, void>& rhs)
+      : m_dim(rhs.m_dim.N0, rhs.m_dim.N1, rhs.m_dim.N2, rhs.m_dim.N3,
+              rhs.m_dim.N4, rhs.m_dim.N5, rhs.m_dim.N6, rhs.m_dim.N7),
+        m_stride(rhs.stride_0()) {
+    static_assert(int(DimRHS::rank) == int(dimension_type::rank),
+                  "ViewOffset assignment requires equal rank");
+    // Also requires equal static dimensions ...
+  }
 
-  template< class DimRHS >
-  KOKKOS_INLINE_FUNCTION
-  constexpr ViewOffset( const ViewOffset< DimRHS , Kokkos::LayoutRight , void > & rhs )
-    : m_dim( rhs.m_dim.N0 , rhs.m_dim.N1 , rhs.m_dim.N2 , rhs.m_dim.N3
-           , rhs.m_dim.N4 , rhs.m_dim.N5 , rhs.m_dim.N6 , rhs.m_dim.N7 )
-    , m_stride( rhs.stride_0() )
-    {
-      static_assert( int(DimRHS::rank) == int(dimension_type::rank) , "ViewOffset assignment requires equal rank" );
-      // Also requires equal static dimensions ...
-    }
-
-  template< class DimRHS >
-  KOKKOS_INLINE_FUNCTION
-  ViewOffset( const ViewOffset< DimRHS , Kokkos::LayoutStride , void > & rhs )
-    : m_dim( rhs.m_dim.N0 , rhs.m_dim.N1 , rhs.m_dim.N2 , rhs.m_dim.N3
-           , rhs.m_dim.N4 , rhs.m_dim.N5 , rhs.m_dim.N6 , rhs.m_dim.N7 )
-    , m_stride( rhs.stride_0() )
-    {
-      if ( ((dimension_type::rank == 2)?rhs.m_stride.S1:
-           ((dimension_type::rank == 3)?rhs.m_stride.S2:
-           ((dimension_type::rank == 4)?rhs.m_stride.S3:
-           ((dimension_type::rank == 5)?rhs.m_stride.S4:
-           ((dimension_type::rank == 6)?rhs.m_stride.S5:
-           ((dimension_type::rank == 7)?rhs.m_stride.S6:rhs.m_stride.S7)))))) != 1 ){
-        Kokkos::abort("Kokkos::Impl::ViewOffset assignment of LayoutRight from LayoutStride requires right-most stride == 1" );
-      }
+  template <class DimRHS>
+  KOKKOS_INLINE_FUNCTION ViewOffset(
+      const ViewOffset<DimRHS, Kokkos::LayoutStride, void>& rhs)
+      : m_dim(rhs.m_dim.N0, rhs.m_dim.N1, rhs.m_dim.N2, rhs.m_dim.N3,
+              rhs.m_dim.N4, rhs.m_dim.N5, rhs.m_dim.N6, rhs.m_dim.N7),
+        m_stride(rhs.stride_0()) {
+    if (((dimension_type::rank == 2)
+             ? rhs.m_stride.S1
+             : ((dimension_type::rank == 3)
+                    ? rhs.m_stride.S2
+                    : ((dimension_type::rank == 4)
+                           ? rhs.m_stride.S3
+                           : ((dimension_type::rank == 5)
+                                  ? rhs.m_stride.S4
+                                  : ((dimension_type::rank == 6)
+                                         ? rhs.m_stride.S5
+                                         : ((dimension_type::rank == 7)
+                                                ? rhs.m_stride.S6
+                                                : rhs.m_stride.S7)))))) != 1) {
+      Kokkos::abort(
+          "Kokkos::Impl::ViewOffset assignment of LayoutRight from "
+          "LayoutStride requires right-most stride == 1");
     }
+  }
 
   //----------------------------------------
   // Subview construction
   // Last dimension must be non-zero
 
-  template< class DimRHS >
-  KOKKOS_INLINE_FUNCTION
-  constexpr ViewOffset
-    ( const ViewOffset< DimRHS , Kokkos::LayoutRight , void > & rhs
-    , const SubviewExtents< DimRHS::rank , dimension_type::rank > & sub
-    )
-    : m_dim( sub.range_extent(0)
-           , sub.range_extent(1)
-           , sub.range_extent(2)
-           , sub.range_extent(3)
-           , sub.range_extent(4)
-           , sub.range_extent(5)
-           , sub.range_extent(6)
-           , sub.range_extent(7))
-    , m_stride( 0 == sub.range_index(0) ? rhs.stride_0() : (
-                1 == sub.range_index(0) ? rhs.stride_1() : (
-                2 == sub.range_index(0) ? rhs.stride_2() : (
-                3 == sub.range_index(0) ? rhs.stride_3() : (
-                4 == sub.range_index(0) ? rhs.stride_4() : (
-                5 == sub.range_index(0) ? rhs.stride_5() : (
-                6 == sub.range_index(0) ? rhs.stride_6() : 0 )))))))
-    {
-/*      // This subview must be 2 == rank and 2 == rank_dynamic
-      // due to only having stride #0.
-      // The source dimension #0 must be non-zero for stride-one leading dimension.
-      // At most subsequent dimension can be non-zero.
+  template <class DimRHS>
+  KOKKOS_INLINE_FUNCTION constexpr ViewOffset(
+      const ViewOffset<DimRHS, Kokkos::LayoutRight, void>& rhs,
+      const SubviewExtents<DimRHS::rank, dimension_type::rank>& sub)
+      : m_dim(sub.range_extent(0), sub.range_extent(1), sub.range_extent(2),
+              sub.range_extent(3), sub.range_extent(4), sub.range_extent(5),
+              sub.range_extent(6), sub.range_extent(7)),
+        m_stride(
+            0 == sub.range_index(0)
+                ? rhs.stride_0()
+                : (1 == sub.range_index(0)
+                       ? rhs.stride_1()
+                       : (2 == sub.range_index(0)
+                              ? rhs.stride_2()
+                              : (3 == sub.range_index(0)
+                                     ? rhs.stride_3()
+                                     : (4 == sub.range_index(0)
+                                            ? rhs.stride_4()
+                                            : (5 == sub.range_index(0)
+                                                   ? rhs.stride_5()
+                                                   : (6 == sub.range_index(0)
+                                                          ? rhs.stride_6()
+                                                          : 0))))))) {
+    /*      // This subview must be 2 == rank and 2 == rank_dynamic
+          // due to only having stride #0.
+          // The source dimension #0 must be non-zero for stride-one leading
+       dimension.
+          // At most subsequent dimension can be non-zero.
 
-      static_assert( (( 2 == dimension_type::rank ) &&
-                      ( 2 <= DimRHS::rank )) ||
-                     ()
-                   , "ViewOffset subview construction requires compatible rank" );
-*/
-    }
+          static_assert( (( 2 == dimension_type::rank ) &&
+                          ( 2 <= DimRHS::rank )) ||
+                         ()
+                       , "ViewOffset subview construction requires compatible
+       rank" );
+    */
+  }
 };
 
 //----------------------------------------------------------------------------
 /* Strided array layout only makes sense for 0 < rank */
 /* rank = 0 included for DynRankView case */
 
-template< unsigned Rank >
-struct ViewStride ;
+template <unsigned Rank>
+struct ViewStride;
 
-template<>
+template <>
 struct ViewStride<0> {
-  enum { S0 = 0 , S1 = 0 , S2 = 0 , S3 = 0 , S4 = 0 , S5 = 0 , S6 = 0 , S7 = 0 };
+  enum { S0 = 0, S1 = 0, S2 = 0, S3 = 0, S4 = 0, S5 = 0, S6 = 0, S7 = 0 };
 
-  ViewStride() = default ;
-  ViewStride( const ViewStride & ) = default ;
-  ViewStride & operator = ( const ViewStride & ) = default ;
+  ViewStride()                  = default;
+  ViewStride(const ViewStride&) = default;
+  ViewStride& operator=(const ViewStride&) = default;
 
   KOKKOS_INLINE_FUNCTION
-  constexpr ViewStride( size_t , size_t , size_t , size_t
-                      , size_t , size_t , size_t , size_t )
-    {}
+  constexpr ViewStride(size_t, size_t, size_t, size_t, size_t, size_t, size_t,
+                       size_t) {}
 };
 
-template<>
+template <>
 struct ViewStride<1> {
-  size_t S0 ;
-  enum { S1 = 0 , S2 = 0 , S3 = 0 , S4 = 0 , S5 = 0 , S6 = 0 , S7 = 0 };
+  size_t S0;
+  enum { S1 = 0, S2 = 0, S3 = 0, S4 = 0, S5 = 0, S6 = 0, S7 = 0 };
 
-  ViewStride() = default ;
-  ViewStride( const ViewStride & ) = default ;
-  ViewStride & operator = ( const ViewStride & ) = default ;
+  ViewStride()                  = default;
+  ViewStride(const ViewStride&) = default;
+  ViewStride& operator=(const ViewStride&) = default;
 
   KOKKOS_INLINE_FUNCTION
-  constexpr ViewStride( size_t aS0 , size_t , size_t , size_t
-                      , size_t , size_t , size_t , size_t )
-    : S0( aS0 )
-    {}
+  constexpr ViewStride(size_t aS0, size_t, size_t, size_t, size_t, size_t,
+                       size_t, size_t)
+      : S0(aS0) {}
 };
 
-template<>
+template <>
 struct ViewStride<2> {
-  size_t S0 , S1 ;
-  enum { S2 = 0 , S3 = 0 , S4 = 0 , S5 = 0 , S6 = 0 , S7 = 0 };
+  size_t S0, S1;
+  enum { S2 = 0, S3 = 0, S4 = 0, S5 = 0, S6 = 0, S7 = 0 };
 
-  ViewStride() = default ;
-  ViewStride( const ViewStride & ) = default ;
-  ViewStride & operator = ( const ViewStride & ) = default ;
+  ViewStride()                  = default;
+  ViewStride(const ViewStride&) = default;
+  ViewStride& operator=(const ViewStride&) = default;
 
   KOKKOS_INLINE_FUNCTION
-  constexpr ViewStride( size_t aS0 , size_t aS1 , size_t , size_t
-                      , size_t , size_t , size_t , size_t )
-    : S0( aS0 ) , S1( aS1 )
-    {}
+  constexpr ViewStride(size_t aS0, size_t aS1, size_t, size_t, size_t, size_t,
+                       size_t, size_t)
+      : S0(aS0), S1(aS1) {}
 };
 
-template<>
+template <>
 struct ViewStride<3> {
-  size_t S0 , S1 , S2 ;
-  enum { S3 = 0 , S4 = 0 , S5 = 0 , S6 = 0 , S7 = 0 };
+  size_t S0, S1, S2;
+  enum { S3 = 0, S4 = 0, S5 = 0, S6 = 0, S7 = 0 };
 
-  ViewStride() = default ;
-  ViewStride( const ViewStride & ) = default ;
-  ViewStride & operator = ( const ViewStride & ) = default ;
+  ViewStride()                  = default;
+  ViewStride(const ViewStride&) = default;
+  ViewStride& operator=(const ViewStride&) = default;
 
   KOKKOS_INLINE_FUNCTION
-  constexpr ViewStride( size_t aS0 , size_t aS1 , size_t aS2 , size_t
-                      , size_t , size_t , size_t , size_t )
-    : S0( aS0 ) , S1( aS1 ) , S2( aS2 )
-    {}
+  constexpr ViewStride(size_t aS0, size_t aS1, size_t aS2, size_t, size_t,
+                       size_t, size_t, size_t)
+      : S0(aS0), S1(aS1), S2(aS2) {}
 };
 
-template<>
+template <>
 struct ViewStride<4> {
-  size_t S0 , S1 , S2 , S3 ;
-  enum { S4 = 0 , S5 = 0 , S6 = 0 , S7 = 0 };
+  size_t S0, S1, S2, S3;
+  enum { S4 = 0, S5 = 0, S6 = 0, S7 = 0 };
 
-  ViewStride() = default ;
-  ViewStride( const ViewStride & ) = default ;
-  ViewStride & operator = ( const ViewStride & ) = default ;
+  ViewStride()                  = default;
+  ViewStride(const ViewStride&) = default;
+  ViewStride& operator=(const ViewStride&) = default;
 
   KOKKOS_INLINE_FUNCTION
-  constexpr ViewStride( size_t aS0 , size_t aS1 , size_t aS2 , size_t aS3
-                      , size_t , size_t , size_t , size_t )
-    : S0( aS0 ) , S1( aS1 ) , S2( aS2 ) , S3( aS3 )
-    {}
+  constexpr ViewStride(size_t aS0, size_t aS1, size_t aS2, size_t aS3, size_t,
+                       size_t, size_t, size_t)
+      : S0(aS0), S1(aS1), S2(aS2), S3(aS3) {}
 };
 
-template<>
+template <>
 struct ViewStride<5> {
-  size_t S0 , S1 , S2 , S3 , S4 ;
-  enum { S5 = 0 , S6 = 0 , S7 = 0 };
+  size_t S0, S1, S2, S3, S4;
+  enum { S5 = 0, S6 = 0, S7 = 0 };
 
-  ViewStride() = default ;
-  ViewStride( const ViewStride & ) = default ;
-  ViewStride & operator = ( const ViewStride & ) = default ;
+  ViewStride()                  = default;
+  ViewStride(const ViewStride&) = default;
+  ViewStride& operator=(const ViewStride&) = default;
 
   KOKKOS_INLINE_FUNCTION
-  constexpr ViewStride( size_t aS0 , size_t aS1 , size_t aS2 , size_t aS3
-                      , size_t aS4 , size_t , size_t , size_t )
-    : S0( aS0 ) , S1( aS1 ) , S2( aS2 ) , S3( aS3 )
-    , S4( aS4 )
-    {}
+  constexpr ViewStride(size_t aS0, size_t aS1, size_t aS2, size_t aS3,
+                       size_t aS4, size_t, size_t, size_t)
+      : S0(aS0), S1(aS1), S2(aS2), S3(aS3), S4(aS4) {}
 };
 
-template<>
+template <>
 struct ViewStride<6> {
-  size_t S0 , S1 , S2 , S3 , S4 , S5 ;
-  enum { S6 = 0 , S7 = 0 };
+  size_t S0, S1, S2, S3, S4, S5;
+  enum { S6 = 0, S7 = 0 };
 
-  ViewStride() = default ;
-  ViewStride( const ViewStride & ) = default ;
-  ViewStride & operator = ( const ViewStride & ) = default ;
+  ViewStride()                  = default;
+  ViewStride(const ViewStride&) = default;
+  ViewStride& operator=(const ViewStride&) = default;
 
   KOKKOS_INLINE_FUNCTION
-  constexpr ViewStride( size_t aS0 , size_t aS1 , size_t aS2 , size_t aS3
-                      , size_t aS4 , size_t aS5 , size_t , size_t )
-    : S0( aS0 ) , S1( aS1 ) , S2( aS2 ) , S3( aS3 )
-    , S4( aS4 ) , S5( aS5 )
-    {}
+  constexpr ViewStride(size_t aS0, size_t aS1, size_t aS2, size_t aS3,
+                       size_t aS4, size_t aS5, size_t, size_t)
+      : S0(aS0), S1(aS1), S2(aS2), S3(aS3), S4(aS4), S5(aS5) {}
 };
 
-template<>
+template <>
 struct ViewStride<7> {
-  size_t S0 , S1 , S2 , S3 , S4 , S5 , S6 ;
+  size_t S0, S1, S2, S3, S4, S5, S6;
   enum { S7 = 0 };
 
-  ViewStride() = default ;
-  ViewStride( const ViewStride & ) = default ;
-  ViewStride & operator = ( const ViewStride & ) = default ;
+  ViewStride()                  = default;
+  ViewStride(const ViewStride&) = default;
+  ViewStride& operator=(const ViewStride&) = default;
 
   KOKKOS_INLINE_FUNCTION
-  constexpr ViewStride( size_t aS0 , size_t aS1 , size_t aS2 , size_t aS3
-                      , size_t aS4 , size_t aS5 , size_t aS6 , size_t )
-    : S0( aS0 ) , S1( aS1 ) , S2( aS2 ) , S3( aS3 )
-    , S4( aS4 ) , S5( aS5 ) , S6( aS6 )
-    {}
+  constexpr ViewStride(size_t aS0, size_t aS1, size_t aS2, size_t aS3,
+                       size_t aS4, size_t aS5, size_t aS6, size_t)
+      : S0(aS0), S1(aS1), S2(aS2), S3(aS3), S4(aS4), S5(aS5), S6(aS6) {}
 };
 
-template<>
+template <>
 struct ViewStride<8> {
-  size_t S0 , S1 , S2 , S3 , S4 , S5 , S6 , S7 ;
+  size_t S0, S1, S2, S3, S4, S5, S6, S7;
 
-  ViewStride() = default ;
-  ViewStride( const ViewStride & ) = default ;
-  ViewStride & operator = ( const ViewStride & ) = default ;
+  ViewStride()                  = default;
+  ViewStride(const ViewStride&) = default;
+  ViewStride& operator=(const ViewStride&) = default;
 
   KOKKOS_INLINE_FUNCTION
-  constexpr ViewStride( size_t aS0 , size_t aS1 , size_t aS2 , size_t aS3
-                      , size_t aS4 , size_t aS5 , size_t aS6 , size_t aS7 )
-    : S0( aS0 ) , S1( aS1 ) , S2( aS2 ) , S3( aS3 )
-    , S4( aS4 ) , S5( aS5 ) , S6( aS6 ) , S7( aS7 )
-    {}
+  constexpr ViewStride(size_t aS0, size_t aS1, size_t aS2, size_t aS3,
+                       size_t aS4, size_t aS5, size_t aS6, size_t aS7)
+      : S0(aS0),
+        S1(aS1),
+        S2(aS2),
+        S3(aS3),
+        S4(aS4),
+        S5(aS5),
+        S6(aS6),
+        S7(aS7) {}
 };
 
-template < class Dimension >
-struct ViewOffset< Dimension , Kokkos::LayoutStride
-                 , void >
-{
-private:
-  typedef ViewStride< Dimension::rank >  stride_type ;
-public:
+template <class Dimension>
+struct ViewOffset<Dimension, Kokkos::LayoutStride, void> {
+ private:
+  typedef ViewStride<Dimension::rank> stride_type;
 
-  using is_mapping_plugin = std::true_type ;
-  using is_regular        = std::true_type ;
+ public:
+  using is_mapping_plugin = std::true_type;
+  using is_regular        = std::true_type;
 
-  typedef size_t                size_type ;
-  typedef Dimension             dimension_type ;
-  typedef Kokkos::LayoutStride  array_layout ;
+  typedef size_t size_type;
+  typedef Dimension dimension_type;
+  typedef Kokkos::LayoutStride array_layout;
 
-  dimension_type  m_dim ;
-  stride_type     m_stride ;
+  dimension_type m_dim;
+  stride_type m_stride;
 
   //----------------------------------------
 
   // rank 1
-  template< typename I0 >
-  KOKKOS_INLINE_FUNCTION constexpr
-  size_type operator()( I0 const & i0 ) const
-  {
-    return i0 * m_stride.S0 ;
+  template <typename I0>
+  KOKKOS_INLINE_FUNCTION constexpr size_type operator()(I0 const& i0) const {
+    return i0 * m_stride.S0;
   }
 
   // rank 2
-  template < typename I0 , typename I1 >
-  KOKKOS_INLINE_FUNCTION constexpr
-  size_type operator()( I0 const & i0 , I1 const & i1 ) const
-  {
-    return i0 * m_stride.S0 +
-           i1 * m_stride.S1 ;
+  template <typename I0, typename I1>
+  KOKKOS_INLINE_FUNCTION constexpr size_type operator()(I0 const& i0,
+                                                        I1 const& i1) const {
+    return i0 * m_stride.S0 + i1 * m_stride.S1;
   }
 
-  //rank 3
-  template < typename I0, typename I1, typename I2 >
-  KOKKOS_INLINE_FUNCTION constexpr
-  size_type operator()( I0 const & i0, I1 const & i1, I2 const & i2 ) const
-  {
-    return i0 * m_stride.S0 +
-           i1 * m_stride.S1 +
-           i2 * m_stride.S2 ;
+  // rank 3
+  template <typename I0, typename I1, typename I2>
+  KOKKOS_INLINE_FUNCTION constexpr size_type operator()(I0 const& i0,
+                                                        I1 const& i1,
+                                                        I2 const& i2) const {
+    return i0 * m_stride.S0 + i1 * m_stride.S1 + i2 * m_stride.S2;
   }
 
-  //rank 4
-  template < typename I0, typename I1, typename I2, typename I3 >
-  KOKKOS_INLINE_FUNCTION constexpr
-  size_type operator()( I0 const & i0, I1 const & i1, I2 const & i2, I3 const & i3 ) const
-  {
-    return i0 * m_stride.S0 +
-           i1 * m_stride.S1 +
-           i2 * m_stride.S2 +
-           i3 * m_stride.S3 ;
+  // rank 4
+  template <typename I0, typename I1, typename I2, typename I3>
+  KOKKOS_INLINE_FUNCTION constexpr size_type operator()(I0 const& i0,
+                                                        I1 const& i1,
+                                                        I2 const& i2,
+                                                        I3 const& i3) const {
+    return i0 * m_stride.S0 + i1 * m_stride.S1 + i2 * m_stride.S2 +
+           i3 * m_stride.S3;
   }
 
-  //rank 5
-  template < typename I0, typename I1, typename I2, typename I3
-           , typename I4 >
-  KOKKOS_INLINE_FUNCTION constexpr
-  size_type operator()( I0 const & i0, I1 const & i1, I2 const & i2, I3 const & i3
-                      , I4 const & i4 ) const
-  {
-    return i0 * m_stride.S0 +
-           i1 * m_stride.S1 +
-           i2 * m_stride.S2 +
-           i3 * m_stride.S3 +
-           i4 * m_stride.S4 ;
+  // rank 5
+  template <typename I0, typename I1, typename I2, typename I3, typename I4>
+  KOKKOS_INLINE_FUNCTION constexpr size_type operator()(I0 const& i0,
+                                                        I1 const& i1,
+                                                        I2 const& i2,
+                                                        I3 const& i3,
+                                                        I4 const& i4) const {
+    return i0 * m_stride.S0 + i1 * m_stride.S1 + i2 * m_stride.S2 +
+           i3 * m_stride.S3 + i4 * m_stride.S4;
   }
 
-  //rank 6
-  template < typename I0, typename I1, typename I2, typename I3
-           , typename I4, typename I5 >
-  KOKKOS_INLINE_FUNCTION constexpr
-  size_type operator()( I0 const & i0, I1 const & i1, I2 const & i2, I3 const & i3
-                      , I4 const & i4, I5 const & i5 ) const
-  {
-    return i0 * m_stride.S0 +
-           i1 * m_stride.S1 +
-           i2 * m_stride.S2 +
-           i3 * m_stride.S3 +
-           i4 * m_stride.S4 +
-           i5 * m_stride.S5 ;
+  // rank 6
+  template <typename I0, typename I1, typename I2, typename I3, typename I4,
+            typename I5>
+  KOKKOS_INLINE_FUNCTION constexpr size_type operator()(
+      I0 const& i0, I1 const& i1, I2 const& i2, I3 const& i3, I4 const& i4,
+      I5 const& i5) const {
+    return i0 * m_stride.S0 + i1 * m_stride.S1 + i2 * m_stride.S2 +
+           i3 * m_stride.S3 + i4 * m_stride.S4 + i5 * m_stride.S5;
   }
 
-  //rank 7
-  template < typename I0, typename I1, typename I2, typename I3
-           , typename I4, typename I5, typename I6 >
-  KOKKOS_INLINE_FUNCTION constexpr
-  size_type operator()( I0 const & i0, I1 const & i1, I2 const & i2, I3 const & i3
-                      , I4 const & i4, I5 const & i5, I6 const & i6 ) const
-  {
-    return i0 * m_stride.S0 +
-           i1 * m_stride.S1 +
-           i2 * m_stride.S2 +
-           i3 * m_stride.S3 +
-           i4 * m_stride.S4 +
-           i5 * m_stride.S5 +
-           i6 * m_stride.S6 ;
+  // rank 7
+  template <typename I0, typename I1, typename I2, typename I3, typename I4,
+            typename I5, typename I6>
+  KOKKOS_INLINE_FUNCTION constexpr size_type operator()(
+      I0 const& i0, I1 const& i1, I2 const& i2, I3 const& i3, I4 const& i4,
+      I5 const& i5, I6 const& i6) const {
+    return i0 * m_stride.S0 + i1 * m_stride.S1 + i2 * m_stride.S2 +
+           i3 * m_stride.S3 + i4 * m_stride.S4 + i5 * m_stride.S5 +
+           i6 * m_stride.S6;
   }
 
-  //rank 8
-  template < typename I0, typename I1, typename I2, typename I3
-           , typename I4, typename I5, typename I6, typename I7 >
-  KOKKOS_INLINE_FUNCTION constexpr
-  size_type operator()( I0 const & i0, I1 const & i1, I2 const & i2, I3 const & i3
-                      , I4 const & i4, I5 const & i5, I6 const & i6, I7 const & i7 ) const
-  {
-    return i0 * m_stride.S0 +
-           i1 * m_stride.S1 +
-           i2 * m_stride.S2 +
-           i3 * m_stride.S3 +
-           i4 * m_stride.S4 +
-           i5 * m_stride.S5 +
-           i6 * m_stride.S6 +
-           i7 * m_stride.S7 ;
+  // rank 8
+  template <typename I0, typename I1, typename I2, typename I3, typename I4,
+            typename I5, typename I6, typename I7>
+  KOKKOS_INLINE_FUNCTION constexpr size_type operator()(
+      I0 const& i0, I1 const& i1, I2 const& i2, I3 const& i3, I4 const& i4,
+      I5 const& i5, I6 const& i6, I7 const& i7) const {
+    return i0 * m_stride.S0 + i1 * m_stride.S1 + i2 * m_stride.S2 +
+           i3 * m_stride.S3 + i4 * m_stride.S4 + i5 * m_stride.S5 +
+           i6 * m_stride.S6 + i7 * m_stride.S7;
   }
 
   //----------------------------------------
 
   KOKKOS_INLINE_FUNCTION
-  constexpr array_layout layout() const
-    {
-      return array_layout( m_dim.N0 , m_stride.S0
-                         , m_dim.N1 , m_stride.S1
-                         , m_dim.N2 , m_stride.S2
-                         , m_dim.N3 , m_stride.S3
-                         , m_dim.N4 , m_stride.S4
-                         , m_dim.N5 , m_stride.S5
-                         , m_dim.N6 , m_stride.S6
-                         , m_dim.N7 , m_stride.S7
-                         );
-    }
+  constexpr array_layout layout() const {
+    return array_layout(m_dim.N0, m_stride.S0, m_dim.N1, m_stride.S1, m_dim.N2,
+                        m_stride.S2, m_dim.N3, m_stride.S3, m_dim.N4,
+                        m_stride.S4, m_dim.N5, m_stride.S5, m_dim.N6,
+                        m_stride.S6, m_dim.N7, m_stride.S7);
+  }
 
-  KOKKOS_INLINE_FUNCTION constexpr size_type dimension_0() const { return m_dim.N0 ; }
-  KOKKOS_INLINE_FUNCTION constexpr size_type dimension_1() const { return m_dim.N1 ; }
-  KOKKOS_INLINE_FUNCTION constexpr size_type dimension_2() const { return m_dim.N2 ; }
-  KOKKOS_INLINE_FUNCTION constexpr size_type dimension_3() const { return m_dim.N3 ; }
-  KOKKOS_INLINE_FUNCTION constexpr size_type dimension_4() const { return m_dim.N4 ; }
-  KOKKOS_INLINE_FUNCTION constexpr size_type dimension_5() const { return m_dim.N5 ; }
-  KOKKOS_INLINE_FUNCTION constexpr size_type dimension_6() const { return m_dim.N6 ; }
-  KOKKOS_INLINE_FUNCTION constexpr size_type dimension_7() const { return m_dim.N7 ; }
+  KOKKOS_INLINE_FUNCTION constexpr size_type dimension_0() const {
+    return m_dim.N0;
+  }
+  KOKKOS_INLINE_FUNCTION constexpr size_type dimension_1() const {
+    return m_dim.N1;
+  }
+  KOKKOS_INLINE_FUNCTION constexpr size_type dimension_2() const {
+    return m_dim.N2;
+  }
+  KOKKOS_INLINE_FUNCTION constexpr size_type dimension_3() const {
+    return m_dim.N3;
+  }
+  KOKKOS_INLINE_FUNCTION constexpr size_type dimension_4() const {
+    return m_dim.N4;
+  }
+  KOKKOS_INLINE_FUNCTION constexpr size_type dimension_5() const {
+    return m_dim.N5;
+  }
+  KOKKOS_INLINE_FUNCTION constexpr size_type dimension_6() const {
+    return m_dim.N6;
+  }
+  KOKKOS_INLINE_FUNCTION constexpr size_type dimension_7() const {
+    return m_dim.N7;
+  }
 
   /* Cardinality of the domain index space */
   KOKKOS_INLINE_FUNCTION
-  constexpr size_type size() const
-    { return m_dim.N0 * m_dim.N1 * m_dim.N2 * m_dim.N3 * m_dim.N4 * m_dim.N5 * m_dim.N6 * m_dim.N7 ; }
-
-private:
+  constexpr size_type size() const {
+    return m_dim.N0 * m_dim.N1 * m_dim.N2 * m_dim.N3 * m_dim.N4 * m_dim.N5 *
+           m_dim.N6 * m_dim.N7;
+  }
 
+ private:
   KOKKOS_INLINE_FUNCTION
-  static constexpr size_type Max( size_type lhs , size_type rhs )
-    { return lhs < rhs ? rhs : lhs ; }
-
-public:
+  static constexpr size_type Max(size_type lhs, size_type rhs) {
+    return lhs < rhs ? rhs : lhs;
+  }
 
+ public:
   /* Span of the range space, largest stride * dimension */
   KOKKOS_INLINE_FUNCTION
-  constexpr size_type span() const
-    {
-      return Max( m_dim.N0 * m_stride.S0 ,
-             Max( m_dim.N1 * m_stride.S1 ,
-             Max( m_dim.N2 * m_stride.S2 ,
-             Max( m_dim.N3 * m_stride.S3 ,
-             Max( m_dim.N4 * m_stride.S4 ,
-             Max( m_dim.N5 * m_stride.S5 ,
-             Max( m_dim.N6 * m_stride.S6 ,
-                  m_dim.N7 * m_stride.S7 )))))));
-    }
+  constexpr size_type span() const {
+    return Max(m_dim.N0 * m_stride.S0,
+               Max(m_dim.N1 * m_stride.S1,
+                   Max(m_dim.N2 * m_stride.S2,
+                       Max(m_dim.N3 * m_stride.S3,
+                           Max(m_dim.N4 * m_stride.S4,
+                               Max(m_dim.N5 * m_stride.S5,
+                                   Max(m_dim.N6 * m_stride.S6,
+                                       m_dim.N7 * m_stride.S7)))))));
+  }
 
-  KOKKOS_INLINE_FUNCTION constexpr bool span_is_contiguous() const { return span() == size(); }
+  KOKKOS_INLINE_FUNCTION constexpr bool span_is_contiguous() const {
+    return span() == size();
+  }
 
   /* Strides of dimensions */
-  KOKKOS_INLINE_FUNCTION constexpr size_type stride_0() const { return m_stride.S0 ; }
-  KOKKOS_INLINE_FUNCTION constexpr size_type stride_1() const { return m_stride.S1 ; }
-  KOKKOS_INLINE_FUNCTION constexpr size_type stride_2() const { return m_stride.S2 ; }
-  KOKKOS_INLINE_FUNCTION constexpr size_type stride_3() const { return m_stride.S3 ; }
-  KOKKOS_INLINE_FUNCTION constexpr size_type stride_4() const { return m_stride.S4 ; }
-  KOKKOS_INLINE_FUNCTION constexpr size_type stride_5() const { return m_stride.S5 ; }
-  KOKKOS_INLINE_FUNCTION constexpr size_type stride_6() const { return m_stride.S6 ; }
-  KOKKOS_INLINE_FUNCTION constexpr size_type stride_7() const { return m_stride.S7 ; }
+  KOKKOS_INLINE_FUNCTION constexpr size_type stride_0() const {
+    return m_stride.S0;
+  }
+  KOKKOS_INLINE_FUNCTION constexpr size_type stride_1() const {
+    return m_stride.S1;
+  }
+  KOKKOS_INLINE_FUNCTION constexpr size_type stride_2() const {
+    return m_stride.S2;
+  }
+  KOKKOS_INLINE_FUNCTION constexpr size_type stride_3() const {
+    return m_stride.S3;
+  }
+  KOKKOS_INLINE_FUNCTION constexpr size_type stride_4() const {
+    return m_stride.S4;
+  }
+  KOKKOS_INLINE_FUNCTION constexpr size_type stride_5() const {
+    return m_stride.S5;
+  }
+  KOKKOS_INLINE_FUNCTION constexpr size_type stride_6() const {
+    return m_stride.S6;
+  }
+  KOKKOS_INLINE_FUNCTION constexpr size_type stride_7() const {
+    return m_stride.S7;
+  }
 
   // Stride with [ rank ] value is the total length
-  template< typename iType >
-  KOKKOS_INLINE_FUNCTION
-  void stride( iType * const s ) const
-    {
-      if ( 0 < dimension_type::rank ) { s[0] = m_stride.S0 ; }
-      if ( 1 < dimension_type::rank ) { s[1] = m_stride.S1 ; }
-      if ( 2 < dimension_type::rank ) { s[2] = m_stride.S2 ; }
-      if ( 3 < dimension_type::rank ) { s[3] = m_stride.S3 ; }
-      if ( 4 < dimension_type::rank ) { s[4] = m_stride.S4 ; }
-      if ( 5 < dimension_type::rank ) { s[5] = m_stride.S5 ; }
-      if ( 6 < dimension_type::rank ) { s[6] = m_stride.S6 ; }
-      if ( 7 < dimension_type::rank ) { s[7] = m_stride.S7 ; }
-      s[dimension_type::rank] = span();
+  template <typename iType>
+  KOKKOS_INLINE_FUNCTION void stride(iType* const s) const {
+    if (0 < dimension_type::rank) {
+      s[0] = m_stride.S0;
     }
+    if (1 < dimension_type::rank) {
+      s[1] = m_stride.S1;
+    }
+    if (2 < dimension_type::rank) {
+      s[2] = m_stride.S2;
+    }
+    if (3 < dimension_type::rank) {
+      s[3] = m_stride.S3;
+    }
+    if (4 < dimension_type::rank) {
+      s[4] = m_stride.S4;
+    }
+    if (5 < dimension_type::rank) {
+      s[5] = m_stride.S5;
+    }
+    if (6 < dimension_type::rank) {
+      s[6] = m_stride.S6;
+    }
+    if (7 < dimension_type::rank) {
+      s[7] = m_stride.S7;
+    }
+    s[dimension_type::rank] = span();
+  }
 
   //----------------------------------------
 
-  ViewOffset() = default ;
-  ViewOffset( const ViewOffset & ) = default ;
-  ViewOffset & operator = ( const ViewOffset & ) = default ;
+  ViewOffset()                  = default;
+  ViewOffset(const ViewOffset&) = default;
+  ViewOffset& operator=(const ViewOffset&) = default;
 
   KOKKOS_INLINE_FUNCTION
-  constexpr ViewOffset( std::integral_constant<unsigned,0> const &
-                      , Kokkos::LayoutStride const & rhs )
-    : m_dim( rhs.dimension[0] , rhs.dimension[1] , rhs.dimension[2] , rhs.dimension[3]
-           , rhs.dimension[4] , rhs.dimension[5] , rhs.dimension[6] , rhs.dimension[7] )
-    , m_stride( rhs.stride[0] , rhs.stride[1] , rhs.stride[2] , rhs.stride[3]
-              , rhs.stride[4] , rhs.stride[5] , rhs.stride[6] , rhs.stride[7] )
-    {}
+  constexpr ViewOffset(std::integral_constant<unsigned, 0> const&,
+                       Kokkos::LayoutStride const& rhs)
+      : m_dim(rhs.dimension[0], rhs.dimension[1], rhs.dimension[2],
+              rhs.dimension[3], rhs.dimension[4], rhs.dimension[5],
+              rhs.dimension[6], rhs.dimension[7]),
+        m_stride(rhs.stride[0], rhs.stride[1], rhs.stride[2], rhs.stride[3],
+                 rhs.stride[4], rhs.stride[5], rhs.stride[6], rhs.stride[7]) {}
 
-  template< class DimRHS , class LayoutRHS >
-  KOKKOS_INLINE_FUNCTION
-  constexpr ViewOffset( const ViewOffset< DimRHS , LayoutRHS , void > & rhs )
-    : m_dim( rhs.m_dim.N0 , rhs.m_dim.N1 , rhs.m_dim.N2 , rhs.m_dim.N3
-           , rhs.m_dim.N4 , rhs.m_dim.N5 , rhs.m_dim.N6 , rhs.m_dim.N7 )
-    , m_stride( rhs.stride_0() , rhs.stride_1() , rhs.stride_2() , rhs.stride_3()
-              , rhs.stride_4() , rhs.stride_5() , rhs.stride_6() , rhs.stride_7() )
-    {
-      static_assert( int(DimRHS::rank) == int(dimension_type::rank) , "ViewOffset assignment requires equal rank" );
-      // Also requires equal static dimensions ...
-    }
+  template <class DimRHS, class LayoutRHS>
+  KOKKOS_INLINE_FUNCTION constexpr ViewOffset(
+      const ViewOffset<DimRHS, LayoutRHS, void>& rhs)
+      : m_dim(rhs.m_dim.N0, rhs.m_dim.N1, rhs.m_dim.N2, rhs.m_dim.N3,
+              rhs.m_dim.N4, rhs.m_dim.N5, rhs.m_dim.N6, rhs.m_dim.N7),
+        m_stride(rhs.stride_0(), rhs.stride_1(), rhs.stride_2(), rhs.stride_3(),
+                 rhs.stride_4(), rhs.stride_5(), rhs.stride_6(),
+                 rhs.stride_7()) {
+    static_assert(int(DimRHS::rank) == int(dimension_type::rank),
+                  "ViewOffset assignment requires equal rank");
+    // Also requires equal static dimensions ...
+  }
 
   //----------------------------------------
   // Subview construction
 
-private:
+ private:
+  template <class DimRHS, class LayoutRHS>
+  KOKKOS_INLINE_FUNCTION static constexpr size_t stride(
+      unsigned r, const ViewOffset<DimRHS, LayoutRHS, void>& rhs) {
+    return r > 7
+               ? 0
+               : (r == 0
+                      ? rhs.stride_0()
+                      : (r == 1
+                             ? rhs.stride_1()
+                             : (r == 2
+                                    ? rhs.stride_2()
+                                    : (r == 3
+                                           ? rhs.stride_3()
+                                           : (r == 4
+                                                  ? rhs.stride_4()
+                                                  : (r == 5
+                                                         ? rhs.stride_5()
+                                                         : (r == 6
+                                                                ? rhs.stride_6()
+                                                                : rhs.stride_7())))))));
+  }
 
-  template< class DimRHS , class LayoutRHS >
-  KOKKOS_INLINE_FUNCTION static
-  constexpr size_t stride
-    ( unsigned r , const ViewOffset< DimRHS , LayoutRHS , void > & rhs )
-    {
-      return r >  7 ? 0 : (
-             r == 0 ? rhs.stride_0() : (
-             r == 1 ? rhs.stride_1() : (
-             r == 2 ? rhs.stride_2() : (
-             r == 3 ? rhs.stride_3() : (
-             r == 4 ? rhs.stride_4() : (
-             r == 5 ? rhs.stride_5() : (
-             r == 6 ? rhs.stride_6() : rhs.stride_7() )))))));
-    }
-
-public:
-
-  template< class DimRHS , class LayoutRHS >
-  KOKKOS_INLINE_FUNCTION
-  constexpr ViewOffset
-    ( const ViewOffset< DimRHS , LayoutRHS , void > & rhs
-    , const SubviewExtents< DimRHS::rank , dimension_type::rank > & sub
-    )
-    // range_extent(r) returns 0 when dimension_type::rank <= r
-    : m_dim( sub.range_extent(0)
-           , sub.range_extent(1)
-           , sub.range_extent(2)
-           , sub.range_extent(3)
-           , sub.range_extent(4)
-           , sub.range_extent(5)
-           , sub.range_extent(6)
-           , sub.range_extent(7)
-           )
-    // range_index(r) returns ~0u when dimension_type::rank <= r
-    , m_stride( stride( sub.range_index(0), rhs )
-              , stride( sub.range_index(1), rhs )
-              , stride( sub.range_index(2), rhs )
-              , stride( sub.range_index(3), rhs )
-              , stride( sub.range_index(4), rhs )
-              , stride( sub.range_index(5), rhs )
-              , stride( sub.range_index(6), rhs )
-              , stride( sub.range_index(7), rhs )
-              )
-    {}
+ public:
+  template <class DimRHS, class LayoutRHS>
+  KOKKOS_INLINE_FUNCTION constexpr ViewOffset(
+      const ViewOffset<DimRHS, LayoutRHS, void>& rhs,
+      const SubviewExtents<DimRHS::rank, dimension_type::rank>& sub)
+      // range_extent(r) returns 0 when dimension_type::rank <= r
+      : m_dim(sub.range_extent(0), sub.range_extent(1), sub.range_extent(2),
+              sub.range_extent(3), sub.range_extent(4), sub.range_extent(5),
+              sub.range_extent(6), sub.range_extent(7))
+        // range_index(r) returns ~0u when dimension_type::rank <= r
+        ,
+        m_stride(
+            stride(sub.range_index(0), rhs), stride(sub.range_index(1), rhs),
+            stride(sub.range_index(2), rhs), stride(sub.range_index(3), rhs),
+            stride(sub.range_index(4), rhs), stride(sub.range_index(5), rhs),
+            stride(sub.range_index(6), rhs), stride(sub.range_index(7), rhs)) {}
 };
 
-}} // namespace Kokkos::Impl
+}  // namespace Impl
+}  // namespace Kokkos
 
 //----------------------------------------------------------------------------
 //----------------------------------------------------------------------------
@@ -2286,187 +2553,170 @@ namespace Impl {
  *          'return_type' which is what the view operators will give back.
  *          Specialisation of this object allows three things depending
  *          on ViewTraits and compiler options:
- *          (i)   Use special allocator (e.g. huge pages/small pages and pinned memory)
- *          (ii)  Use special data handle type (e.g. add Cuda Texture Object)
- *          (iii) Use special access intrinsics (e.g. texture fetch and non-caching loads)
+ *          (i)   Use special allocator (e.g. huge pages/small pages and pinned
+ * memory) (ii)  Use special data handle type (e.g. add Cuda Texture Object)
+ *          (iii) Use special access intrinsics (e.g. texture fetch and
+ * non-caching loads)
  */
-template< class Traits , class Enable = void >
+template <class Traits, class Enable = void>
 struct ViewDataHandle {
-
-  typedef typename Traits::value_type   value_type  ;
-  typedef typename Traits::value_type * handle_type ;
-  typedef typename Traits::value_type & return_type ;
-  typedef Kokkos::Impl::SharedAllocationTracker  track_type  ;
+  typedef typename Traits::value_type value_type;
+  typedef typename Traits::value_type* handle_type;
+  typedef typename Traits::value_type& return_type;
+  typedef Kokkos::Impl::SharedAllocationTracker track_type;
 
   KOKKOS_INLINE_FUNCTION
-  static handle_type assign( value_type * arg_data_ptr
-                           , track_type const & /*arg_tracker*/ )
-  {
-    return handle_type( arg_data_ptr );
+  static handle_type assign(value_type* arg_data_ptr,
+                            track_type const& /*arg_tracker*/) {
+    return handle_type(arg_data_ptr);
   }
 
   KOKKOS_INLINE_FUNCTION
-  static handle_type assign( handle_type const arg_data_ptr
-                           , size_t offset )
-  {
-    return handle_type( arg_data_ptr + offset );
+  static handle_type assign(handle_type const arg_data_ptr, size_t offset) {
+    return handle_type(arg_data_ptr + offset);
   }
 };
 
-template< class Traits >
-struct ViewDataHandle< Traits ,
-  typename std::enable_if<( std::is_same< typename Traits::non_const_value_type
-                                        , typename Traits::value_type >::value
-                            &&
-                            std::is_same< typename Traits::specialize , void >::value
-                            &&
-                            Traits::memory_traits::is_atomic
-                          )>::type >
-{
-  typedef typename Traits::value_type  value_type ;
-  typedef typename Kokkos::Impl::AtomicViewDataHandle< Traits >  handle_type ;
-  typedef typename Kokkos::Impl::AtomicDataElement< Traits >     return_type ;
-  typedef Kokkos::Impl::SharedAllocationTracker                  track_type  ;
+template <class Traits>
+struct ViewDataHandle<
+    Traits, typename std::enable_if<(
+                std::is_same<typename Traits::non_const_value_type,
+                             typename Traits::value_type>::value &&
+                std::is_same<typename Traits::specialize, void>::value &&
+                Traits::memory_traits::is_atomic)>::type> {
+  typedef typename Traits::value_type value_type;
+  typedef typename Kokkos::Impl::AtomicViewDataHandle<Traits> handle_type;
+  typedef typename Kokkos::Impl::AtomicDataElement<Traits> return_type;
+  typedef Kokkos::Impl::SharedAllocationTracker track_type;
 
   KOKKOS_INLINE_FUNCTION
-  static handle_type assign( value_type * arg_data_ptr
-                           , track_type const & /*arg_tracker*/ )
-  {
-    return handle_type( arg_data_ptr );
+  static handle_type assign(value_type* arg_data_ptr,
+                            track_type const& /*arg_tracker*/) {
+    return handle_type(arg_data_ptr);
   }
 
-  template<class SrcHandleType>
-  KOKKOS_INLINE_FUNCTION
-  static handle_type assign( const SrcHandleType& arg_handle
-                           , size_t offset )
-  {
-    return handle_type( arg_handle.ptr + offset );
+  template <class SrcHandleType>
+  KOKKOS_INLINE_FUNCTION static handle_type assign(
+      const SrcHandleType& arg_handle, size_t offset) {
+    return handle_type(arg_handle.ptr + offset);
   }
 };
 
-template< class Traits >
-struct ViewDataHandle< Traits ,
-  typename std::enable_if<(
-                            std::is_same< typename Traits::specialize , void >::value
-                            &&
-                            (!Traits::memory_traits::is_aligned)
-                            &&
-                            Traits::memory_traits::is_restrict
+template <class Traits>
+struct ViewDataHandle<
+    Traits, typename std::enable_if<(
+                std::is_same<typename Traits::specialize, void>::value &&
+                (!Traits::memory_traits::is_aligned) &&
+                Traits::memory_traits::is_restrict
 #ifdef KOKKOS_ENABLE_CUDA
-                            &&
-                            (!( std::is_same< typename Traits::memory_space,Kokkos::CudaSpace>::value ||
-                                std::is_same< typename Traits::memory_space,Kokkos::CudaUVMSpace>::value ))
+                && (!(std::is_same<typename Traits::memory_space,
+                                   Kokkos::CudaSpace>::value ||
+                      std::is_same<typename Traits::memory_space,
+                                   Kokkos::CudaUVMSpace>::value))
 #endif
-                            &&
-                            (!Traits::memory_traits::is_atomic)
-                          )>::type >
-{
-  typedef typename Traits::value_type  value_type ;
-  typedef typename Traits::value_type * KOKKOS_RESTRICT handle_type ;
-  typedef typename Traits::value_type & KOKKOS_RESTRICT return_type ;
-  typedef Kokkos::Impl::SharedAllocationTracker  track_type  ;
+                && (!Traits::memory_traits::is_atomic))>::type> {
+  typedef typename Traits::value_type value_type;
+  typedef typename Traits::value_type* KOKKOS_RESTRICT handle_type;
+  typedef typename Traits::value_type& KOKKOS_RESTRICT return_type;
+  typedef Kokkos::Impl::SharedAllocationTracker track_type;
 
   KOKKOS_INLINE_FUNCTION
-  static value_type* assign( value_type * arg_data_ptr
-                           , track_type const & /*arg_tracker*/ )
-  {
-    return (value_type*)( arg_data_ptr );
+  static value_type* assign(value_type* arg_data_ptr,
+                            track_type const& /*arg_tracker*/) {
+    return (value_type*)(arg_data_ptr);
   }
 
   KOKKOS_INLINE_FUNCTION
-  static value_type* assign( handle_type const arg_data_ptr
-                           , size_t offset )
-  {
-    return (value_type*)( arg_data_ptr + offset );
+  static value_type* assign(handle_type const arg_data_ptr, size_t offset) {
+    return (value_type*)(arg_data_ptr + offset);
   }
 };
 
-template< class Traits >
-struct ViewDataHandle< Traits ,
-  typename std::enable_if<(
-                            std::is_same< typename Traits::specialize , void >::value
-                            &&
-                            Traits::memory_traits::is_aligned
-			    &&
-                            (!Traits::memory_traits::is_restrict)
+template <class Traits>
+struct ViewDataHandle<
+    Traits, typename std::enable_if<(
+                std::is_same<typename Traits::specialize, void>::value &&
+                Traits::memory_traits::is_aligned &&
+                (!Traits::memory_traits::is_restrict)
 #ifdef KOKKOS_ENABLE_CUDA
-                            &&
-                            (!( std::is_same< typename Traits::memory_space,Kokkos::CudaSpace>::value ||
-                                std::is_same< typename Traits::memory_space,Kokkos::CudaUVMSpace>::value ))
+                && (!(std::is_same<typename Traits::memory_space,
+                                   Kokkos::CudaSpace>::value ||
+                      std::is_same<typename Traits::memory_space,
+                                   Kokkos::CudaUVMSpace>::value))
 #endif
-                            &&
-                            (!Traits::memory_traits::is_atomic)
-                          )>::type >
-{
-  typedef typename Traits::value_type  value_type ;
-  typedef typename Traits::value_type * KOKKOS_IMPL_ALIGN_PTR(KOKKOS_MEMORY_ALIGNMENT) handle_type ;
-  typedef typename Traits::value_type & return_type ;
-  typedef Kokkos::Impl::SharedAllocationTracker  track_type  ;
+                && (!Traits::memory_traits::is_atomic))>::type> {
+  typedef typename Traits::value_type value_type;
+  typedef typename Traits::value_type* KOKKOS_IMPL_ALIGN_PTR(
+      KOKKOS_MEMORY_ALIGNMENT) handle_type;
+  typedef typename Traits::value_type& return_type;
+  typedef Kokkos::Impl::SharedAllocationTracker track_type;
 
   KOKKOS_INLINE_FUNCTION
-  static handle_type assign( value_type * arg_data_ptr
-                           , track_type const & /*arg_tracker*/ )
-  {
-    if ( reinterpret_cast<uintptr_t>(arg_data_ptr) % Impl::MEMORY_ALIGNMENT ) {
-      Kokkos::abort("Assigning NonAligned View or Pointer to Kokkos::View with Aligned attribute");
+  static handle_type assign(value_type* arg_data_ptr,
+                            track_type const& /*arg_tracker*/) {
+    if (reinterpret_cast<uintptr_t>(arg_data_ptr) % Impl::MEMORY_ALIGNMENT) {
+      Kokkos::abort(
+          "Assigning NonAligned View or Pointer to Kokkos::View with Aligned "
+          "attribute");
     }
-    return handle_type( arg_data_ptr );
+    return handle_type(arg_data_ptr);
   }
 
   KOKKOS_INLINE_FUNCTION
-  static handle_type assign( handle_type const arg_data_ptr
-                           , size_t offset )
-  {
-    if ( reinterpret_cast<uintptr_t>(arg_data_ptr+offset) % Impl::MEMORY_ALIGNMENT ) {
-      Kokkos::abort("Assigning NonAligned View or Pointer to Kokkos::View with Aligned attribute");
+  static handle_type assign(handle_type const arg_data_ptr, size_t offset) {
+    if (reinterpret_cast<uintptr_t>(arg_data_ptr + offset) %
+        Impl::MEMORY_ALIGNMENT) {
+      Kokkos::abort(
+          "Assigning NonAligned View or Pointer to Kokkos::View with Aligned "
+          "attribute");
     }
-    return handle_type( arg_data_ptr + offset );
+    return handle_type(arg_data_ptr + offset);
   }
 };
 
-template< class Traits >
-struct ViewDataHandle< Traits ,
-  typename std::enable_if<(
-                            std::is_same< typename Traits::specialize , void >::value
-                            &&
-                            Traits::memory_traits::is_aligned
-                            &&
-                            Traits::memory_traits::is_restrict
+template <class Traits>
+struct ViewDataHandle<
+    Traits,
+    typename std::enable_if<(
+        std::is_same<typename Traits::specialize, void>::value &&
+        Traits::memory_traits::is_aligned && Traits::memory_traits::is_restrict
 #ifdef KOKKOS_ENABLE_CUDA
-                            &&
-                            (!( std::is_same< typename Traits::memory_space,Kokkos::CudaSpace>::value ||
-                                std::is_same< typename Traits::memory_space,Kokkos::CudaUVMSpace>::value ))
+        && (!(std::is_same<typename Traits::memory_space,
+                           Kokkos::CudaSpace>::value ||
+              std::is_same<typename Traits::memory_space,
+                           Kokkos::CudaUVMSpace>::value))
 #endif
-                            &&
-                            (!Traits::memory_traits::is_atomic)
-                          )>::type >
-{
-  typedef typename Traits::value_type  value_type ;
-  typedef typename Traits::value_type * KOKKOS_RESTRICT KOKKOS_IMPL_ALIGN_PTR(KOKKOS_MEMORY_ALIGNMENT) handle_type ;
-  typedef typename Traits::value_type & return_type ;
-  typedef Kokkos::Impl::SharedAllocationTracker  track_type  ;
+        && (!Traits::memory_traits::is_atomic))>::type> {
+  typedef typename Traits::value_type value_type;
+  typedef typename Traits::value_type* KOKKOS_RESTRICT
+      KOKKOS_IMPL_ALIGN_PTR(KOKKOS_MEMORY_ALIGNMENT) handle_type;
+  typedef typename Traits::value_type& return_type;
+  typedef Kokkos::Impl::SharedAllocationTracker track_type;
 
   KOKKOS_INLINE_FUNCTION
-  static value_type* assign( value_type * arg_data_ptr
-                           , track_type const & /*arg_tracker*/ )
-  {
-    if ( reinterpret_cast<uintptr_t>(arg_data_ptr) % Impl::MEMORY_ALIGNMENT ) {
-      Kokkos::abort("Assigning NonAligned View or Pointer to Kokkos::View with Aligned attribute");
+  static value_type* assign(value_type* arg_data_ptr,
+                            track_type const& /*arg_tracker*/) {
+    if (reinterpret_cast<uintptr_t>(arg_data_ptr) % Impl::MEMORY_ALIGNMENT) {
+      Kokkos::abort(
+          "Assigning NonAligned View or Pointer to Kokkos::View with Aligned "
+          "attribute");
     }
-    return (value_type*)( arg_data_ptr );
+    return (value_type*)(arg_data_ptr);
   }
 
   KOKKOS_INLINE_FUNCTION
-  static value_type* assign( handle_type const arg_data_ptr
-                           , size_t offset )
-  {
-    if ( reinterpret_cast<uintptr_t>(arg_data_ptr+offset) % Impl::MEMORY_ALIGNMENT ) {
-      Kokkos::abort("Assigning NonAligned View or Pointer to Kokkos::View with Aligned attribute");
+  static value_type* assign(handle_type const arg_data_ptr, size_t offset) {
+    if (reinterpret_cast<uintptr_t>(arg_data_ptr + offset) %
+        Impl::MEMORY_ALIGNMENT) {
+      Kokkos::abort(
+          "Assigning NonAligned View or Pointer to Kokkos::View with Aligned "
+          "attribute");
     }
-    return (value_type*)( arg_data_ptr + offset );
+    return (value_type*)(arg_data_ptr + offset);
   }
 };
-}} // namespace Kokkos::Impl
+}  // namespace Impl
+}  // namespace Kokkos
 
 //----------------------------------------------------------------------------
 //----------------------------------------------------------------------------
@@ -2484,164 +2734,143 @@ namespace Impl {
  *  called from the shared memory tracking destruction.
  *  Secondarily to have two fewer partial specializations.
  */
-template< class ExecSpace
-        , class ValueType
-        , bool IsScalar = std::is_scalar< ValueType >::value
-        >
-struct ViewValueFunctor ;
+template <class ExecSpace, class ValueType,
+          bool IsScalar = std::is_scalar<ValueType>::value>
+struct ViewValueFunctor;
 
-template< class ExecSpace , class ValueType >
-struct ViewValueFunctor< ExecSpace , ValueType , false /* is_scalar */ >
-{
-  typedef Kokkos::RangePolicy< ExecSpace > PolicyType ;
+template <class ExecSpace, class ValueType>
+struct ViewValueFunctor<ExecSpace, ValueType, false /* is_scalar */> {
+  typedef Kokkos::RangePolicy<ExecSpace> PolicyType;
   typedef typename ExecSpace::execution_space Exec;
 
-  Exec        space ;
-  ValueType * ptr ;
-  size_t      n ;
-  bool        destroy ;
+  Exec space;
+  ValueType* ptr;
+  size_t n;
+  bool destroy;
 
   KOKKOS_INLINE_FUNCTION
-  void operator()( const size_t i ) const
-    {
-      if ( destroy ) { (ptr+i)->~ValueType(); } //KOKKOS_IMPL_CUDA_CLANG_WORKAROUND this line causes ptax error __cxa_begin_catch in nested_view unit-test
-      else           { new (ptr+i) ValueType(); }
+  void operator()(const size_t i) const {
+    if (destroy) {
+      (ptr + i)->~ValueType();
+    }  // KOKKOS_IMPL_CUDA_CLANG_WORKAROUND this line causes ptax error
+       // __cxa_begin_catch in nested_view unit-test
+    else {
+      new (ptr + i) ValueType();
     }
+  }
 
-  ViewValueFunctor() = default ;
-  ViewValueFunctor( const ViewValueFunctor & ) = default ;
-  ViewValueFunctor & operator = ( const ViewValueFunctor & ) = default ;
+  ViewValueFunctor()                        = default;
+  ViewValueFunctor(const ViewValueFunctor&) = default;
+  ViewValueFunctor& operator=(const ViewValueFunctor&) = default;
 
-  ViewValueFunctor( ExecSpace   const & arg_space
-                  , ValueType * const arg_ptr
-                  , size_t      const arg_n )
-    : space( arg_space )
-    , ptr( arg_ptr )
-    , n( arg_n )
-    , destroy( false )
-    {}
+  ViewValueFunctor(ExecSpace const& arg_space, ValueType* const arg_ptr,
+                   size_t const arg_n)
+      : space(arg_space), ptr(arg_ptr), n(arg_n), destroy(false) {}
 
-  void execute( bool arg )
-    {
-      destroy = arg ;
-      if ( ! space.in_parallel() ) {
+  void execute(bool arg) {
+    destroy = arg;
+    if (!space.in_parallel()) {
 #if defined(KOKKOS_ENABLE_PROFILING)
-        uint64_t kpID = 0;
-        if(Kokkos::Profiling::profileLibraryLoaded()) {
-          Kokkos::Profiling::beginParallelFor((destroy ? "Kokkos::View::destruction" : "Kokkos::View::initialization"), 0, &kpID);
-        }
+      uint64_t kpID = 0;
+      if (Kokkos::Profiling::profileLibraryLoaded()) {
+        Kokkos::Profiling::beginParallelFor(
+            (destroy ? "Kokkos::View::destruction"
+                     : "Kokkos::View::initialization"),
+            0, &kpID);
+      }
 #endif
-        const Kokkos::Impl::ParallelFor< ViewValueFunctor , PolicyType >
-          closure( *this , PolicyType( 0 , n ) );
-        closure.execute();
-        space.fence();
+      const Kokkos::Impl::ParallelFor<ViewValueFunctor, PolicyType> closure(
+          *this, PolicyType(0, n));
+      closure.execute();
+      space.fence();
 #if defined(KOKKOS_ENABLE_PROFILING)
-        if(Kokkos::Profiling::profileLibraryLoaded()) {
-          Kokkos::Profiling::endParallelFor(kpID);
-        }
+      if (Kokkos::Profiling::profileLibraryLoaded()) {
+        Kokkos::Profiling::endParallelFor(kpID);
+      }
 #endif
-      }
-      else {
-        for ( size_t i = 0 ; i < n ; ++i ) operator()(i);
-      }
+    } else {
+      for (size_t i = 0; i < n; ++i) operator()(i);
     }
+  }
 
-  void construct_shared_allocation()
-    { execute( false ); }
+  void construct_shared_allocation() { execute(false); }
 
-  void destroy_shared_allocation()
-    { execute( true ); }
+  void destroy_shared_allocation() { execute(true); }
 };
 
+template <class ExecSpace, class ValueType>
+struct ViewValueFunctor<ExecSpace, ValueType, true /* is_scalar */> {
+  typedef Kokkos::RangePolicy<ExecSpace> PolicyType;
 
-template< class ExecSpace , class ValueType >
-struct ViewValueFunctor< ExecSpace , ValueType , true /* is_scalar */ >
-{
-  typedef Kokkos::RangePolicy< ExecSpace > PolicyType ;
-
-  ExecSpace   space ;
-  ValueType * ptr ;
-  size_t      n ;
+  ExecSpace space;
+  ValueType* ptr;
+  size_t n;
 
   KOKKOS_INLINE_FUNCTION
-  void operator()( const size_t i ) const
-    { ptr[i] = ValueType(); }
+  void operator()(const size_t i) const { ptr[i] = ValueType(); }
 
-  ViewValueFunctor() = default ;
-  ViewValueFunctor( const ViewValueFunctor & ) = default ;
-  ViewValueFunctor & operator = ( const ViewValueFunctor & ) = default ;
+  ViewValueFunctor()                        = default;
+  ViewValueFunctor(const ViewValueFunctor&) = default;
+  ViewValueFunctor& operator=(const ViewValueFunctor&) = default;
 
-  ViewValueFunctor( ExecSpace   const & arg_space
-                  , ValueType * const arg_ptr
-                  , size_t      const arg_n )
-    : space( arg_space )
-    , ptr( arg_ptr )
-    , n( arg_n )
-    {}
+  ViewValueFunctor(ExecSpace const& arg_space, ValueType* const arg_ptr,
+                   size_t const arg_n)
+      : space(arg_space), ptr(arg_ptr), n(arg_n) {}
 
-  void construct_shared_allocation()
-    {
-      if ( ! space.in_parallel() ) {
+  void construct_shared_allocation() {
+    if (!space.in_parallel()) {
 #if defined(KOKKOS_ENABLE_PROFILING)
-        uint64_t kpID = 0;
-        if(Kokkos::Profiling::profileLibraryLoaded()) {
-          Kokkos::Profiling::beginParallelFor("Kokkos::View::initialization", 0, &kpID);
-        }
+      uint64_t kpID = 0;
+      if (Kokkos::Profiling::profileLibraryLoaded()) {
+        Kokkos::Profiling::beginParallelFor("Kokkos::View::initialization", 0,
+                                            &kpID);
+      }
 #endif
-        const Kokkos::Impl::ParallelFor< ViewValueFunctor , PolicyType >
-          closure( *this , PolicyType( 0 , n ) );
-        closure.execute();
-        space.fence();
+      const Kokkos::Impl::ParallelFor<ViewValueFunctor, PolicyType> closure(
+          *this, PolicyType(0, n));
+      closure.execute();
+      space.fence();
 #if defined(KOKKOS_ENABLE_PROFILING)
-        if(Kokkos::Profiling::profileLibraryLoaded()) {
-          Kokkos::Profiling::endParallelFor(kpID);
-        }
+      if (Kokkos::Profiling::profileLibraryLoaded()) {
+        Kokkos::Profiling::endParallelFor(kpID);
+      }
 #endif
-      }
-      else {
-        for ( size_t i = 0 ; i < n ; ++i ) operator()(i);
-      }
+    } else {
+      for (size_t i = 0; i < n; ++i) operator()(i);
     }
+  }
 
   void destroy_shared_allocation() {}
 };
 
 //----------------------------------------------------------------------------
 /** \brief  View mapping for non-specialized data type and standard layout */
-template< class Traits >
-class ViewMapping< Traits ,
-  typename std::enable_if<(
-    std::is_same< typename Traits::specialize , void >::value
-    &&
-    ViewOffset< typename Traits::dimension
-              , typename Traits::array_layout
-              , void >::is_mapping_plugin::value
-  )>::type >
-{
+template <class Traits>
+class ViewMapping<
+    Traits,
+    typename std::enable_if<(
+        std::is_same<typename Traits::specialize, void>::value &&
+        ViewOffset<typename Traits::dimension, typename Traits::array_layout,
+                   void>::is_mapping_plugin::value)>::type> {
+ public:
+  typedef ViewOffset<typename Traits::dimension, typename Traits::array_layout,
+                     void>
+      offset_type;
 
-public:
-  typedef ViewOffset< typename Traits::dimension
-                    , typename Traits::array_layout
-                    , void
-                    >  offset_type ;
+  typedef typename ViewDataHandle<Traits>::handle_type handle_type;
 
-  typedef typename ViewDataHandle< Traits >::handle_type  handle_type ;
+  handle_type m_impl_handle;
+  offset_type m_impl_offset;
 
-  handle_type  m_impl_handle ;
-  offset_type  m_impl_offset ;
-
-private:
-
-  template < class , class ...> friend class ViewMapping;
+ private:
+  template <class, class...>
+  friend class ViewMapping;
 
   KOKKOS_INLINE_FUNCTION
-  ViewMapping( const handle_type & arg_handle , const offset_type & arg_offset )
-    : m_impl_handle( arg_handle )
-    , m_impl_offset( arg_offset )
-    {}
-
-public:
+  ViewMapping(const handle_type& arg_handle, const offset_type& arg_offset)
+      : m_impl_handle(arg_handle), m_impl_offset(arg_offset) {}
 
+ public:
   typedef void printable_label_typedef;
   enum { is_managed = Traits::is_managed };
 
@@ -2650,61 +2879,100 @@ public:
 
   enum { Rank = Traits::dimension::rank };
 
-  template< typename iType >
-  KOKKOS_INLINE_FUNCTION constexpr size_t extent( const iType & r ) const
-    { return m_impl_offset.m_dim.extent(r); }
+  template <typename iType>
+  KOKKOS_INLINE_FUNCTION constexpr size_t extent(const iType& r) const {
+    return m_impl_offset.m_dim.extent(r);
+  }
 
-  static KOKKOS_INLINE_FUNCTION constexpr size_t static_extent( const unsigned r ) noexcept
-    {
-      using dim_type = typename offset_type::dimension_type;
-      return dim_type::static_extent(r);
-    }
+  static KOKKOS_INLINE_FUNCTION constexpr size_t static_extent(
+      const unsigned r) noexcept {
+    using dim_type = typename offset_type::dimension_type;
+    return dim_type::static_extent(r);
+  }
 
-  KOKKOS_INLINE_FUNCTION constexpr
-  typename Traits::array_layout layout() const
-    { return m_impl_offset.layout(); }
+  KOKKOS_INLINE_FUNCTION constexpr typename Traits::array_layout layout()
+      const {
+    return m_impl_offset.layout();
+  }
 
-  KOKKOS_INLINE_FUNCTION constexpr size_t dimension_0() const { return m_impl_offset.dimension_0(); }
-  KOKKOS_INLINE_FUNCTION constexpr size_t dimension_1() const { return m_impl_offset.dimension_1(); }
-  KOKKOS_INLINE_FUNCTION constexpr size_t dimension_2() const { return m_impl_offset.dimension_2(); }
-  KOKKOS_INLINE_FUNCTION constexpr size_t dimension_3() const { return m_impl_offset.dimension_3(); }
-  KOKKOS_INLINE_FUNCTION constexpr size_t dimension_4() const { return m_impl_offset.dimension_4(); }
-  KOKKOS_INLINE_FUNCTION constexpr size_t dimension_5() const { return m_impl_offset.dimension_5(); }
-  KOKKOS_INLINE_FUNCTION constexpr size_t dimension_6() const { return m_impl_offset.dimension_6(); }
-  KOKKOS_INLINE_FUNCTION constexpr size_t dimension_7() const { return m_impl_offset.dimension_7(); }
+  KOKKOS_INLINE_FUNCTION constexpr size_t dimension_0() const {
+    return m_impl_offset.dimension_0();
+  }
+  KOKKOS_INLINE_FUNCTION constexpr size_t dimension_1() const {
+    return m_impl_offset.dimension_1();
+  }
+  KOKKOS_INLINE_FUNCTION constexpr size_t dimension_2() const {
+    return m_impl_offset.dimension_2();
+  }
+  KOKKOS_INLINE_FUNCTION constexpr size_t dimension_3() const {
+    return m_impl_offset.dimension_3();
+  }
+  KOKKOS_INLINE_FUNCTION constexpr size_t dimension_4() const {
+    return m_impl_offset.dimension_4();
+  }
+  KOKKOS_INLINE_FUNCTION constexpr size_t dimension_5() const {
+    return m_impl_offset.dimension_5();
+  }
+  KOKKOS_INLINE_FUNCTION constexpr size_t dimension_6() const {
+    return m_impl_offset.dimension_6();
+  }
+  KOKKOS_INLINE_FUNCTION constexpr size_t dimension_7() const {
+    return m_impl_offset.dimension_7();
+  }
 
   // Is a regular layout with uniform striding for each index.
-  using is_regular = typename offset_type::is_regular ;
+  using is_regular = typename offset_type::is_regular;
 
-  KOKKOS_INLINE_FUNCTION constexpr size_t stride_0() const { return m_impl_offset.stride_0(); }
-  KOKKOS_INLINE_FUNCTION constexpr size_t stride_1() const { return m_impl_offset.stride_1(); }
-  KOKKOS_INLINE_FUNCTION constexpr size_t stride_2() const { return m_impl_offset.stride_2(); }
-  KOKKOS_INLINE_FUNCTION constexpr size_t stride_3() const { return m_impl_offset.stride_3(); }
-  KOKKOS_INLINE_FUNCTION constexpr size_t stride_4() const { return m_impl_offset.stride_4(); }
-  KOKKOS_INLINE_FUNCTION constexpr size_t stride_5() const { return m_impl_offset.stride_5(); }
-  KOKKOS_INLINE_FUNCTION constexpr size_t stride_6() const { return m_impl_offset.stride_6(); }
-  KOKKOS_INLINE_FUNCTION constexpr size_t stride_7() const { return m_impl_offset.stride_7(); }
+  KOKKOS_INLINE_FUNCTION constexpr size_t stride_0() const {
+    return m_impl_offset.stride_0();
+  }
+  KOKKOS_INLINE_FUNCTION constexpr size_t stride_1() const {
+    return m_impl_offset.stride_1();
+  }
+  KOKKOS_INLINE_FUNCTION constexpr size_t stride_2() const {
+    return m_impl_offset.stride_2();
+  }
+  KOKKOS_INLINE_FUNCTION constexpr size_t stride_3() const {
+    return m_impl_offset.stride_3();
+  }
+  KOKKOS_INLINE_FUNCTION constexpr size_t stride_4() const {
+    return m_impl_offset.stride_4();
+  }
+  KOKKOS_INLINE_FUNCTION constexpr size_t stride_5() const {
+    return m_impl_offset.stride_5();
+  }
+  KOKKOS_INLINE_FUNCTION constexpr size_t stride_6() const {
+    return m_impl_offset.stride_6();
+  }
+  KOKKOS_INLINE_FUNCTION constexpr size_t stride_7() const {
+    return m_impl_offset.stride_7();
+  }
 
-  template< typename iType >
-  KOKKOS_INLINE_FUNCTION void stride( iType * const s ) const { m_impl_offset.stride(s); }
+  template <typename iType>
+  KOKKOS_INLINE_FUNCTION void stride(iType* const s) const {
+    m_impl_offset.stride(s);
+  }
 
   //----------------------------------------
   // Range span
 
   /** \brief  Span of the mapped range */
-  KOKKOS_INLINE_FUNCTION constexpr size_t span() const { return m_impl_offset.span(); }
+  KOKKOS_INLINE_FUNCTION constexpr size_t span() const {
+    return m_impl_offset.span();
+  }
 
   /** \brief  Is the mapped range span contiguous */
-  KOKKOS_INLINE_FUNCTION constexpr bool span_is_contiguous() const { return m_impl_offset.span_is_contiguous(); }
+  KOKKOS_INLINE_FUNCTION constexpr bool span_is_contiguous() const {
+    return m_impl_offset.span_is_contiguous();
+  }
 
-  typedef typename ViewDataHandle< Traits >::return_type  reference_type ;
-  typedef typename Traits::value_type *                   pointer_type ;
+  typedef typename ViewDataHandle<Traits>::return_type reference_type;
+  typedef typename Traits::value_type* pointer_type;
 
   /** \brief  Query raw pointer to memory */
-  KOKKOS_INLINE_FUNCTION constexpr pointer_type data() const
-    {
-      return m_impl_handle;
-    }
+  KOKKOS_INLINE_FUNCTION constexpr pointer_type data() const {
+    return m_impl_handle;
+  }
 
   //----------------------------------------
   // The View class performs all rank and bounds checking before
@@ -2713,179 +2981,203 @@ public:
   KOKKOS_FORCEINLINE_FUNCTION
   reference_type reference() const { return m_impl_handle[0]; }
 
-  template< typename I0 >
+  template <typename I0>
   KOKKOS_FORCEINLINE_FUNCTION
-  typename
-    std::enable_if< std::is_integral<I0>::value &&
-                    ! std::is_same< typename Traits::array_layout , Kokkos::LayoutStride >::value
-                  , reference_type >::type
-  reference( const I0 & i0 ) const { return m_impl_handle[i0]; }
+      typename std::enable_if<std::is_integral<I0>::value &&
+                                  !std::is_same<typename Traits::array_layout,
+                                                Kokkos::LayoutStride>::value,
+                              reference_type>::type
+      reference(const I0& i0) const {
+    return m_impl_handle[i0];
+  }
 
-  template< typename I0 >
+  template <typename I0>
   KOKKOS_FORCEINLINE_FUNCTION
-  typename
-    std::enable_if< std::is_integral<I0>::value &&
-                    std::is_same< typename Traits::array_layout , Kokkos::LayoutStride >::value
-                  , reference_type >::type
-  reference( const I0 & i0 ) const { return m_impl_handle[ m_impl_offset(i0) ]; }
+      typename std::enable_if<std::is_integral<I0>::value &&
+                                  std::is_same<typename Traits::array_layout,
+                                               Kokkos::LayoutStride>::value,
+                              reference_type>::type
+      reference(const I0& i0) const {
+    return m_impl_handle[m_impl_offset(i0)];
+  }
 
-  template< typename I0 , typename I1 >
-  KOKKOS_FORCEINLINE_FUNCTION
-  reference_type reference( const I0 & i0 , const I1 & i1 ) const
-    { return m_impl_handle[ m_impl_offset(i0,i1) ]; }
+  template <typename I0, typename I1>
+  KOKKOS_FORCEINLINE_FUNCTION reference_type reference(const I0& i0,
+                                                       const I1& i1) const {
+    return m_impl_handle[m_impl_offset(i0, i1)];
+  }
 
-  template< typename I0 , typename I1 , typename I2 >
-  KOKKOS_FORCEINLINE_FUNCTION
-  reference_type reference( const I0 & i0 , const I1 & i1 , const I2 & i2 ) const
-    { return m_impl_handle[ m_impl_offset(i0,i1,i2) ]; }
+  template <typename I0, typename I1, typename I2>
+  KOKKOS_FORCEINLINE_FUNCTION reference_type reference(const I0& i0,
+                                                       const I1& i1,
+                                                       const I2& i2) const {
+    return m_impl_handle[m_impl_offset(i0, i1, i2)];
+  }
 
-  template< typename I0 , typename I1 , typename I2 , typename I3 >
-  KOKKOS_FORCEINLINE_FUNCTION
-  reference_type reference( const I0 & i0 , const I1 & i1 , const I2 & i2 , const I3 & i3 ) const
-    { return m_impl_handle[ m_impl_offset(i0,i1,i2,i3) ]; }
+  template <typename I0, typename I1, typename I2, typename I3>
+  KOKKOS_FORCEINLINE_FUNCTION reference_type
+  reference(const I0& i0, const I1& i1, const I2& i2, const I3& i3) const {
+    return m_impl_handle[m_impl_offset(i0, i1, i2, i3)];
+  }
 
-  template< typename I0 , typename I1 , typename I2 , typename I3
-          , typename I4 >
-  KOKKOS_FORCEINLINE_FUNCTION
-  reference_type reference( const I0 & i0 , const I1 & i1 , const I2 & i2 , const I3 & i3
-                          , const I4 & i4 ) const
-    { return m_impl_handle[ m_impl_offset(i0,i1,i2,i3,i4) ]; }
+  template <typename I0, typename I1, typename I2, typename I3, typename I4>
+  KOKKOS_FORCEINLINE_FUNCTION reference_type reference(const I0& i0,
+                                                       const I1& i1,
+                                                       const I2& i2,
+                                                       const I3& i3,
+                                                       const I4& i4) const {
+    return m_impl_handle[m_impl_offset(i0, i1, i2, i3, i4)];
+  }
 
-  template< typename I0 , typename I1 , typename I2 , typename I3
-          , typename I4 , typename I5 >
-  KOKKOS_FORCEINLINE_FUNCTION
-  reference_type reference( const I0 & i0 , const I1 & i1 , const I2 & i2 , const I3 & i3
-                          , const I4 & i4 , const I5 & i5 ) const
-    { return m_impl_handle[ m_impl_offset(i0,i1,i2,i3,i4,i5) ]; }
+  template <typename I0, typename I1, typename I2, typename I3, typename I4,
+            typename I5>
+  KOKKOS_FORCEINLINE_FUNCTION reference_type
+  reference(const I0& i0, const I1& i1, const I2& i2, const I3& i3,
+            const I4& i4, const I5& i5) const {
+    return m_impl_handle[m_impl_offset(i0, i1, i2, i3, i4, i5)];
+  }
 
-  template< typename I0 , typename I1 , typename I2 , typename I3
-          , typename I4 , typename I5 , typename I6 >
-  KOKKOS_FORCEINLINE_FUNCTION
-  reference_type reference( const I0 & i0 , const I1 & i1 , const I2 & i2 , const I3 & i3
-                          , const I4 & i4 , const I5 & i5 , const I6 & i6 ) const
-    { return m_impl_handle[ m_impl_offset(i0,i1,i2,i3,i4,i5,i6) ]; }
+  template <typename I0, typename I1, typename I2, typename I3, typename I4,
+            typename I5, typename I6>
+  KOKKOS_FORCEINLINE_FUNCTION reference_type
+  reference(const I0& i0, const I1& i1, const I2& i2, const I3& i3,
+            const I4& i4, const I5& i5, const I6& i6) const {
+    return m_impl_handle[m_impl_offset(i0, i1, i2, i3, i4, i5, i6)];
+  }
 
-  template< typename I0 , typename I1 , typename I2 , typename I3
-          , typename I4 , typename I5 , typename I6 , typename I7 >
-  KOKKOS_FORCEINLINE_FUNCTION
-  reference_type reference( const I0 & i0 , const I1 & i1 , const I2 & i2 , const I3 & i3
-                          , const I4 & i4 , const I5 & i5 , const I6 & i6 , const I7 & i7 ) const
-    { return m_impl_handle[ m_impl_offset(i0,i1,i2,i3,i4,i5,i6,i7) ]; }
+  template <typename I0, typename I1, typename I2, typename I3, typename I4,
+            typename I5, typename I6, typename I7>
+  KOKKOS_FORCEINLINE_FUNCTION reference_type
+  reference(const I0& i0, const I1& i1, const I2& i2, const I3& i3,
+            const I4& i4, const I5& i5, const I6& i6, const I7& i7) const {
+    return m_impl_handle[m_impl_offset(i0, i1, i2, i3, i4, i5, i6, i7)];
+  }
 
   //----------------------------------------
 
-private:
-
+ private:
   enum { MemorySpanMask = 8 - 1 /* Force alignment on 8 byte boundary */ };
   enum { MemorySpanSize = sizeof(typename Traits::value_type) };
 
-public:
-
+ public:
   /** \brief  Span, in bytes, of the referenced memory */
-  KOKKOS_INLINE_FUNCTION constexpr size_t memory_span() const
-    {
-      return ( m_impl_offset.span() * sizeof(typename Traits::value_type) + MemorySpanMask ) & ~size_t(MemorySpanMask);
-    }
+  KOKKOS_INLINE_FUNCTION constexpr size_t memory_span() const {
+    return (m_impl_offset.span() * sizeof(typename Traits::value_type) +
+            MemorySpanMask) &
+           ~size_t(MemorySpanMask);
+  }
 
   //----------------------------------------
 
   KOKKOS_INLINE_FUNCTION ~ViewMapping() {}
   KOKKOS_INLINE_FUNCTION ViewMapping() : m_impl_handle(), m_impl_offset() {}
-  KOKKOS_INLINE_FUNCTION ViewMapping( const ViewMapping & rhs )
-    : m_impl_handle( rhs.m_impl_handle ), m_impl_offset( rhs.m_impl_offset ) {}
-  KOKKOS_INLINE_FUNCTION ViewMapping & operator = ( const ViewMapping & rhs )
-    { m_impl_handle = rhs.m_impl_handle ; m_impl_offset = rhs.m_impl_offset ; return *this ; }
+  KOKKOS_INLINE_FUNCTION ViewMapping(const ViewMapping& rhs)
+      : m_impl_handle(rhs.m_impl_handle), m_impl_offset(rhs.m_impl_offset) {}
+  KOKKOS_INLINE_FUNCTION ViewMapping& operator=(const ViewMapping& rhs) {
+    m_impl_handle = rhs.m_impl_handle;
+    m_impl_offset = rhs.m_impl_offset;
+    return *this;
+  }
 
-  KOKKOS_INLINE_FUNCTION ViewMapping( ViewMapping && rhs )
-    : m_impl_handle( rhs.m_impl_handle ), m_impl_offset( rhs.m_impl_offset ) {}
-  KOKKOS_INLINE_FUNCTION ViewMapping & operator = ( ViewMapping && rhs )
-    { m_impl_handle = rhs.m_impl_handle ; m_impl_offset = rhs.m_impl_offset ; return *this ; }
+  KOKKOS_INLINE_FUNCTION ViewMapping(ViewMapping&& rhs)
+      : m_impl_handle(rhs.m_impl_handle), m_impl_offset(rhs.m_impl_offset) {}
+  KOKKOS_INLINE_FUNCTION ViewMapping& operator=(ViewMapping&& rhs) {
+    m_impl_handle = rhs.m_impl_handle;
+    m_impl_offset = rhs.m_impl_offset;
+    return *this;
+  }
 
   //----------------------------------------
 
   /**\brief  Span, in bytes, of the required memory */
   KOKKOS_INLINE_FUNCTION
-  static constexpr size_t memory_span( typename Traits::array_layout const & arg_layout )
-    {
-      typedef std::integral_constant< unsigned , 0 >  padding ;
-      return ( offset_type( padding(), arg_layout ).span() * MemorySpanSize + MemorySpanMask ) & ~size_t(MemorySpanMask);
-    }
+  static constexpr size_t memory_span(
+      typename Traits::array_layout const& arg_layout) {
+    typedef std::integral_constant<unsigned, 0> padding;
+    return (offset_type(padding(), arg_layout).span() * MemorySpanSize +
+            MemorySpanMask) &
+           ~size_t(MemorySpanMask);
+  }
 
   /**\brief  Wrap a span of memory */
-  template< class ... P >
-  KOKKOS_INLINE_FUNCTION
-  ViewMapping( Kokkos::Impl::ViewCtorProp< P ... > const & arg_prop
-             , typename Traits::array_layout const & arg_layout
-             )
-    : m_impl_handle( ( (Kokkos::Impl::ViewCtorProp<void,pointer_type> const &) arg_prop ).value )
-    , m_impl_offset( std::integral_constant< unsigned , 0 >() , arg_layout )
-    {}
+  template <class... P>
+  KOKKOS_INLINE_FUNCTION ViewMapping(
+      Kokkos::Impl::ViewCtorProp<P...> const& arg_prop,
+      typename Traits::array_layout const& arg_layout)
+      : m_impl_handle(
+            ((Kokkos::Impl::ViewCtorProp<void, pointer_type> const&)arg_prop)
+                .value),
+        m_impl_offset(std::integral_constant<unsigned, 0>(), arg_layout) {}
 
   /**\brief  Assign data */
   KOKKOS_INLINE_FUNCTION
-  void assign_data( pointer_type arg_ptr )
-    { m_impl_handle = handle_type( arg_ptr ); }
+  void assign_data(pointer_type arg_ptr) {
+    m_impl_handle = handle_type(arg_ptr);
+  }
 
   //----------------------------------------
   /*  Allocate and construct mapped array.
    *  Allocate via shared allocation record and
    *  return that record for allocation tracking.
    */
-  template< class ... P >
-  Kokkos::Impl::SharedAllocationRecord<> *
-  allocate_shared( Kokkos::Impl::ViewCtorProp< P... > const & arg_prop
-                 , typename Traits::array_layout const & arg_layout )
-  {
-    typedef Kokkos::Impl::ViewCtorProp< P... > alloc_prop ;
+  template <class... P>
+  Kokkos::Impl::SharedAllocationRecord<>* allocate_shared(
+      Kokkos::Impl::ViewCtorProp<P...> const& arg_prop,
+      typename Traits::array_layout const& arg_layout) {
+    typedef Kokkos::Impl::ViewCtorProp<P...> alloc_prop;
 
-    typedef typename alloc_prop::execution_space  execution_space ;
-    typedef typename Traits::memory_space         memory_space ;
-    typedef typename Traits::value_type           value_type ;
-    typedef ViewValueFunctor< execution_space , value_type > functor_type ;
-    typedef Kokkos::Impl::SharedAllocationRecord< memory_space , functor_type > record_type ;
+    typedef typename alloc_prop::execution_space execution_space;
+    typedef typename Traits::memory_space memory_space;
+    typedef typename Traits::value_type value_type;
+    typedef ViewValueFunctor<execution_space, value_type> functor_type;
+    typedef Kokkos::Impl::SharedAllocationRecord<memory_space, functor_type>
+        record_type;
 
     // Query the mapping for byte-size of allocation.
     // If padding is allowed then pass in sizeof value type
     // for padding computation.
-    typedef std::integral_constant
-      < unsigned
-      , alloc_prop::allow_padding ? sizeof(value_type) : 0
-      > padding ;
+    typedef std::integral_constant<
+        unsigned, alloc_prop::allow_padding ? sizeof(value_type) : 0>
+        padding;
 
-    m_impl_offset = offset_type( padding(), arg_layout );
+    m_impl_offset = offset_type(padding(), arg_layout);
 
     const size_t alloc_size =
-      ( m_impl_offset.span() * MemorySpanSize + MemorySpanMask ) & ~size_t(MemorySpanMask);
+        (m_impl_offset.span() * MemorySpanSize + MemorySpanMask) &
+        ~size_t(MemorySpanMask);
 
-    // Create shared memory tracking record with allocate memory from the memory space
-    record_type * const record =
-      record_type::allocate( ( (Kokkos::Impl::ViewCtorProp<void,memory_space> const &) arg_prop ).value
-                           , ( (Kokkos::Impl::ViewCtorProp<void,std::string>  const &) arg_prop ).value
-                           , alloc_size );
+    // Create shared memory tracking record with allocate memory from the memory
+    // space
+    record_type* const record = record_type::allocate(
+        ((Kokkos::Impl::ViewCtorProp<void, memory_space> const&)arg_prop).value,
+        ((Kokkos::Impl::ViewCtorProp<void, std::string> const&)arg_prop).value,
+        alloc_size);
 
 #ifdef KOKKOS_ENABLE_DEPRECATED_CODE
-    if ( alloc_size ) {
+    if (alloc_size) {
 #endif
-    m_impl_handle = handle_type( reinterpret_cast< pointer_type >( record->data() ) );
+      m_impl_handle =
+          handle_type(reinterpret_cast<pointer_type>(record->data()));
 #ifdef KOKKOS_ENABLE_DEPRECATED_CODE
     }
 #endif
 
     //  Only initialize if the allocation is non-zero.
     //  May be zero if one of the dimensions is zero.
-    if ( alloc_size && alloc_prop::initialize ) {
+    if (alloc_size && alloc_prop::initialize) {
       // Assume destruction is only required when construction is requested.
-      // The ViewValueFunctor has both value construction and destruction operators.
-      record->m_destroy = functor_type( ( (Kokkos::Impl::ViewCtorProp<void,execution_space> const &) arg_prop).value
-                                      , (value_type *) m_impl_handle
-                                      , m_impl_offset.span()
-                                      );
+      // The ViewValueFunctor has both value construction and destruction
+      // operators.
+      record->m_destroy = functor_type(
+          ((Kokkos::Impl::ViewCtorProp<void, execution_space> const&)arg_prop)
+              .value,
+          (value_type*)m_impl_handle, m_impl_offset.span());
 
       // Construct values
       record->m_destroy.construct_shared_allocation();
     }
 
-    return record ;
+    return record;
   }
 };
 
@@ -2893,243 +3185,302 @@ public:
 //----------------------------------------------------------------------------
 /** \brief  Assign compatible default mappings */
 
-template< class DstTraits , class SrcTraits >
-class ViewMapping< DstTraits , SrcTraits ,
-  typename std::enable_if<(
-    !(std::is_same<typename SrcTraits::array_layout, LayoutStride>::value) && //Added to have a new specialization for SrcType of LayoutStride
-    // default mappings
-    std::is_same< typename DstTraits::specialize , void >::value
-    &&
-    std::is_same< typename SrcTraits::specialize , void >::value
-    &&
-    (
-      // same layout
-      std::is_same< typename DstTraits::array_layout , typename SrcTraits::array_layout >::value
-      ||
-      // known layout
-      (
+template <class DstTraits, class SrcTraits>
+class ViewMapping<
+    DstTraits, SrcTraits,
+    typename std::enable_if<(
+        !(std::is_same<typename SrcTraits::array_layout, LayoutStride>::
+              value) &&  // Added to have a new specialization for SrcType of
+                         // LayoutStride
+        // default mappings
+        std::is_same<typename DstTraits::specialize, void>::value &&
+        std::is_same<typename SrcTraits::specialize, void>::value &&
         (
-          std::is_same< typename DstTraits::array_layout , Kokkos::LayoutLeft >::value ||
-          std::is_same< typename DstTraits::array_layout , Kokkos::LayoutRight >::value ||
-          std::is_same< typename DstTraits::array_layout , Kokkos::LayoutStride >::value
-        )
-        &&
-        (
-          std::is_same< typename SrcTraits::array_layout , Kokkos::LayoutLeft >::value ||
-          std::is_same< typename SrcTraits::array_layout , Kokkos::LayoutRight >::value ||
-          std::is_same< typename SrcTraits::array_layout , Kokkos::LayoutStride >::value
-        )
-      )
-    )
-  )>::type >
-{
-private:
-
-  enum { is_assignable_space =
+            // same layout
+            std::is_same<typename DstTraits::array_layout,
+                         typename SrcTraits::array_layout>::value ||
+            // known layout
+            ((std::is_same<typename DstTraits::array_layout,
+                           Kokkos::LayoutLeft>::value ||
+              std::is_same<typename DstTraits::array_layout,
+                           Kokkos::LayoutRight>::value ||
+              std::is_same<typename DstTraits::array_layout,
+                           Kokkos::LayoutStride>::value) &&
+             (std::is_same<typename SrcTraits::array_layout,
+                           Kokkos::LayoutLeft>::value ||
+              std::is_same<typename SrcTraits::array_layout,
+                           Kokkos::LayoutRight>::value ||
+              std::is_same<typename SrcTraits::array_layout,
+                           Kokkos::LayoutStride>::value))))>::type> {
+ private:
+  enum {
+    is_assignable_space =
 #if 1
-   Kokkos::Impl::MemorySpaceAccess
-     < typename DstTraits::memory_space
-     , typename SrcTraits::memory_space >::assignable };
+        Kokkos::Impl::MemorySpaceAccess<
+            typename DstTraits::memory_space,
+            typename SrcTraits::memory_space>::assignable
+  };
 #else
-   std::is_same< typename DstTraits::memory_space
-               , typename SrcTraits::memory_space >::value };
+        std::is_same<typename DstTraits::memory_space,
+                     typename SrcTraits::memory_space>::value
+  };
 #endif
 
-  enum { is_assignable_value_type =
-    std::is_same< typename DstTraits::value_type
-                , typename SrcTraits::value_type >::value ||
-    std::is_same< typename DstTraits::value_type
-                , typename SrcTraits::const_value_type >::value };
+  enum {
+    is_assignable_value_type =
+        std::is_same<typename DstTraits::value_type,
+                     typename SrcTraits::value_type>::value ||
+        std::is_same<typename DstTraits::value_type,
+                     typename SrcTraits::const_value_type>::value
+  };
 
-  enum { is_assignable_dimension =
-    ViewDimensionAssignable< typename DstTraits::dimension
-                           , typename SrcTraits::dimension >::value };
+  enum {
+    is_assignable_dimension =
+        ViewDimensionAssignable<typename DstTraits::dimension,
+                                typename SrcTraits::dimension>::value
+  };
 
-  enum { is_assignable_layout =
-    std::is_same< typename DstTraits::array_layout
-                , typename SrcTraits::array_layout >::value ||
-    std::is_same< typename DstTraits::array_layout
-                , Kokkos::LayoutStride >::value ||
-    ( DstTraits::dimension::rank == 0 ) ||
-    ( DstTraits::dimension::rank == 1 &&
-      DstTraits::dimension::rank_dynamic == 1 )
-    };
+  enum {
+    is_assignable_layout =
+        std::is_same<typename DstTraits::array_layout,
+                     typename SrcTraits::array_layout>::value ||
+        std::is_same<typename DstTraits::array_layout,
+                     Kokkos::LayoutStride>::value ||
+        (DstTraits::dimension::rank == 0) ||
+        (DstTraits::dimension::rank == 1 &&
+         DstTraits::dimension::rank_dynamic == 1)
+  };
 
-public:
-  enum { is_assignable_data_type = is_assignable_value_type &&
-                                   is_assignable_dimension };
-  enum { is_assignable = is_assignable_space &&
-                         is_assignable_value_type &&
-                         is_assignable_dimension &&
-                         is_assignable_layout };
+ public:
+  enum {
+    is_assignable_data_type =
+        is_assignable_value_type && is_assignable_dimension
+  };
+  enum {
+    is_assignable = is_assignable_space && is_assignable_value_type &&
+                    is_assignable_dimension && is_assignable_layout
+  };
 
-  typedef Kokkos::Impl::SharedAllocationTracker  TrackType ;
-  typedef ViewMapping< DstTraits , void >  DstType ;
-  typedef ViewMapping< SrcTraits , void >  SrcType ;
+  typedef Kokkos::Impl::SharedAllocationTracker TrackType;
+  typedef ViewMapping<DstTraits, void> DstType;
+  typedef ViewMapping<SrcTraits, void> SrcType;
 
   KOKKOS_INLINE_FUNCTION
-  static void assign( DstType & dst , const SrcType & src , const TrackType & src_track )
-    {
-      static_assert( is_assignable_space
-                   , "View assignment must have compatible spaces" );
+  static void assign(DstType& dst, const SrcType& src,
+                     const TrackType& src_track) {
+    static_assert(is_assignable_space,
+                  "View assignment must have compatible spaces");
 
-      static_assert( is_assignable_value_type
-                   , "View assignment must have same value type or const = non-const" );
+    static_assert(
+        is_assignable_value_type,
+        "View assignment must have same value type or const = non-const");
 
-      static_assert( is_assignable_dimension
-                   , "View assignment must have compatible dimensions" );
+    static_assert(is_assignable_dimension,
+                  "View assignment must have compatible dimensions");
 
-      static_assert( is_assignable_layout
-                   , "View assignment must have compatible layout or have rank <= 1" );
+    static_assert(
+        is_assignable_layout,
+        "View assignment must have compatible layout or have rank <= 1");
 
-      typedef typename DstType::offset_type  dst_offset_type ;
+    typedef typename DstType::offset_type dst_offset_type;
 
-      if ( size_t(DstTraits::dimension::rank_dynamic) < size_t(SrcTraits::dimension::rank_dynamic) ) {
-        typedef typename DstTraits::dimension dst_dim;
-        bool assignable =
-          ( ( 1 > DstTraits::dimension::rank_dynamic && 1 <= SrcTraits::dimension::rank_dynamic ) ?
-            dst_dim::ArgN0 == src.dimension_0() : true ) &&
-          ( ( 2 > DstTraits::dimension::rank_dynamic && 2 <= SrcTraits::dimension::rank_dynamic ) ?
-            dst_dim::ArgN1 == src.dimension_1() : true ) &&
-          ( ( 3 > DstTraits::dimension::rank_dynamic && 3 <= SrcTraits::dimension::rank_dynamic ) ?
-            dst_dim::ArgN2 == src.dimension_2() : true ) &&
-          ( ( 4 > DstTraits::dimension::rank_dynamic && 4 <= SrcTraits::dimension::rank_dynamic ) ?
-            dst_dim::ArgN3 == src.dimension_3() : true ) &&
-          ( ( 5 > DstTraits::dimension::rank_dynamic && 5 <= SrcTraits::dimension::rank_dynamic ) ?
-            dst_dim::ArgN4 == src.dimension_4() : true ) &&
-          ( ( 6 > DstTraits::dimension::rank_dynamic && 6 <= SrcTraits::dimension::rank_dynamic ) ?
-            dst_dim::ArgN5 == src.dimension_5() : true ) &&
-          ( ( 7 > DstTraits::dimension::rank_dynamic && 7 <= SrcTraits::dimension::rank_dynamic ) ?
-            dst_dim::ArgN6 == src.dimension_6() : true ) &&
-          ( ( 8 > DstTraits::dimension::rank_dynamic && 8 <= SrcTraits::dimension::rank_dynamic ) ?
-            dst_dim::ArgN7 == src.dimension_7() : true )
-          ;
-        if(!assignable)
-          Kokkos::abort("View Assignment: trying to assign runtime dimension to non matching compile time dimension.");
-      }
-      dst.m_impl_offset = dst_offset_type( src.m_impl_offset );
-      dst.m_impl_handle = Kokkos::Impl::ViewDataHandle< DstTraits >::assign( src.m_impl_handle , src_track );
+    if (size_t(DstTraits::dimension::rank_dynamic) <
+        size_t(SrcTraits::dimension::rank_dynamic)) {
+      typedef typename DstTraits::dimension dst_dim;
+      bool assignable = ((1 > DstTraits::dimension::rank_dynamic &&
+                          1 <= SrcTraits::dimension::rank_dynamic)
+                             ? dst_dim::ArgN0 == src.dimension_0()
+                             : true) &&
+                        ((2 > DstTraits::dimension::rank_dynamic &&
+                          2 <= SrcTraits::dimension::rank_dynamic)
+                             ? dst_dim::ArgN1 == src.dimension_1()
+                             : true) &&
+                        ((3 > DstTraits::dimension::rank_dynamic &&
+                          3 <= SrcTraits::dimension::rank_dynamic)
+                             ? dst_dim::ArgN2 == src.dimension_2()
+                             : true) &&
+                        ((4 > DstTraits::dimension::rank_dynamic &&
+                          4 <= SrcTraits::dimension::rank_dynamic)
+                             ? dst_dim::ArgN3 == src.dimension_3()
+                             : true) &&
+                        ((5 > DstTraits::dimension::rank_dynamic &&
+                          5 <= SrcTraits::dimension::rank_dynamic)
+                             ? dst_dim::ArgN4 == src.dimension_4()
+                             : true) &&
+                        ((6 > DstTraits::dimension::rank_dynamic &&
+                          6 <= SrcTraits::dimension::rank_dynamic)
+                             ? dst_dim::ArgN5 == src.dimension_5()
+                             : true) &&
+                        ((7 > DstTraits::dimension::rank_dynamic &&
+                          7 <= SrcTraits::dimension::rank_dynamic)
+                             ? dst_dim::ArgN6 == src.dimension_6()
+                             : true) &&
+                        ((8 > DstTraits::dimension::rank_dynamic &&
+                          8 <= SrcTraits::dimension::rank_dynamic)
+                             ? dst_dim::ArgN7 == src.dimension_7()
+                             : true);
+      if (!assignable)
+        Kokkos::abort(
+            "View Assignment: trying to assign runtime dimension to non "
+            "matching compile time dimension.");
     }
+    dst.m_impl_offset = dst_offset_type(src.m_impl_offset);
+    dst.m_impl_handle = Kokkos::Impl::ViewDataHandle<DstTraits>::assign(
+        src.m_impl_handle, src_track);
+  }
 };
 
 //----------------------------------------------------------------------------
-//Create new specialization for SrcType of LayoutStride. Runtime check for compatible layout
-template< class DstTraits , class SrcTraits >
-class ViewMapping< DstTraits , SrcTraits ,
-  typename std::enable_if<(
-    std::is_same< typename SrcTraits::array_layout, Kokkos::LayoutStride >::value
-    &&
-    std::is_same< typename DstTraits::specialize , void >::value
-    &&
-    std::is_same< typename SrcTraits::specialize , void >::value
-    &&
-    (
-      // same layout
-      std::is_same< typename DstTraits::array_layout , typename SrcTraits::array_layout >::value
-      ||
-      // known layout
-      (
-        std::is_same< typename DstTraits::array_layout , Kokkos::LayoutLeft >::value ||
-        std::is_same< typename DstTraits::array_layout , Kokkos::LayoutRight >::value ||
-        std::is_same< typename DstTraits::array_layout , Kokkos::LayoutStride >::value
-      )
-    )
-  )>::type >
-{
-private:
+// Create new specialization for SrcType of LayoutStride. Runtime check for
+// compatible layout
+template <class DstTraits, class SrcTraits>
+class ViewMapping<
+    DstTraits, SrcTraits,
+    typename std::enable_if<(
+        std::is_same<typename SrcTraits::array_layout,
+                     Kokkos::LayoutStride>::value &&
+        std::is_same<typename DstTraits::specialize, void>::value &&
+        std::is_same<typename SrcTraits::specialize, void>::value &&
+        (
+            // same layout
+            std::is_same<typename DstTraits::array_layout,
+                         typename SrcTraits::array_layout>::value ||
+            // known layout
+            (std::is_same<typename DstTraits::array_layout,
+                          Kokkos::LayoutLeft>::value ||
+             std::is_same<typename DstTraits::array_layout,
+                          Kokkos::LayoutRight>::value ||
+             std::is_same<typename DstTraits::array_layout,
+                          Kokkos::LayoutStride>::value)))>::type> {
+ private:
+  enum {
+    is_assignable_space = Kokkos::Impl::MemorySpaceAccess<
+        typename DstTraits::memory_space,
+        typename SrcTraits::memory_space>::assignable
+  };
 
-  enum { is_assignable_space =
-   Kokkos::Impl::MemorySpaceAccess
-     < typename DstTraits::memory_space
-     , typename SrcTraits::memory_space >::assignable };
+  enum {
+    is_assignable_value_type =
+        std::is_same<typename DstTraits::value_type,
+                     typename SrcTraits::value_type>::value ||
+        std::is_same<typename DstTraits::value_type,
+                     typename SrcTraits::const_value_type>::value
+  };
 
-  enum { is_assignable_value_type =
-    std::is_same< typename DstTraits::value_type
-                , typename SrcTraits::value_type >::value ||
-    std::is_same< typename DstTraits::value_type
-                , typename SrcTraits::const_value_type >::value };
+  enum {
+    is_assignable_dimension =
+        ViewDimensionAssignable<typename DstTraits::dimension,
+                                typename SrcTraits::dimension>::value
+  };
 
-  enum { is_assignable_dimension =
-    ViewDimensionAssignable< typename DstTraits::dimension
-                           , typename SrcTraits::dimension >::value };
+ public:
+  enum {
+    is_assignable_data_type =
+        is_assignable_value_type && is_assignable_dimension
+  };
+  enum {
+    is_assignable = is_assignable_space && is_assignable_value_type &&
+                    is_assignable_dimension
+  };
 
-public:
-  enum { is_assignable_data_type = is_assignable_value_type &&
-                                   is_assignable_dimension };
-  enum { is_assignable = is_assignable_space &&
-                         is_assignable_value_type &&
-                         is_assignable_dimension };
-
-  typedef Kokkos::Impl::SharedAllocationTracker  TrackType ;
-  typedef ViewMapping< DstTraits , void >  DstType ;
-  typedef ViewMapping< SrcTraits , void >  SrcType ;
+  typedef Kokkos::Impl::SharedAllocationTracker TrackType;
+  typedef ViewMapping<DstTraits, void> DstType;
+  typedef ViewMapping<SrcTraits, void> SrcType;
 
   KOKKOS_INLINE_FUNCTION
-  static bool assignable_layout_check(DstType &, const SrcType & src) //Runtime check
-    {
-      size_t strides[9];
-      bool assignable = true;
-      src.stride(strides);
-      size_t exp_stride = 1;
-      if (std::is_same< typename DstTraits::array_layout, Kokkos::LayoutLeft >::value) {
-	    for(int i=0; i<src.Rank; i++) {
-          if (i>0) exp_stride *= src.extent(i-1);
-          if (strides[i] != exp_stride){assignable=false;break;}
-	    }
+  static bool assignable_layout_check(DstType&,
+                                      const SrcType& src)  // Runtime check
+  {
+    size_t strides[9];
+    bool assignable = true;
+    src.stride(strides);
+    size_t exp_stride = 1;
+    if (std::is_same<typename DstTraits::array_layout,
+                     Kokkos::LayoutLeft>::value) {
+      for (int i = 0; i < src.Rank; i++) {
+        if (i > 0) exp_stride *= src.extent(i - 1);
+        if (strides[i] != exp_stride) {
+          assignable = false;
+          break;
+        }
       }
-      else if (std::is_same< typename DstTraits::array_layout, Kokkos::LayoutRight >::value) {
-	    for(int i=src.Rank-1; i>=0; i--) {
-          if (i<src.Rank-1) exp_stride *= src.extent(i+1);
-          if (strides[i] != exp_stride){assignable=false;break;}
-	    }
+    } else if (std::is_same<typename DstTraits::array_layout,
+                            Kokkos::LayoutRight>::value) {
+      for (int i = src.Rank - 1; i >= 0; i--) {
+        if (i < src.Rank - 1) exp_stride *= src.extent(i + 1);
+        if (strides[i] != exp_stride) {
+          assignable = false;
+          break;
+        }
       }
-      return assignable; 
     }
+    return assignable;
+  }
 
   KOKKOS_INLINE_FUNCTION
-  static void assign( DstType & dst , const SrcType & src , const TrackType & src_track )
-    {
-      static_assert( is_assignable_space
-                   , "View assignment must have compatible spaces" );
+  static void assign(DstType& dst, const SrcType& src,
+                     const TrackType& src_track) {
+    static_assert(is_assignable_space,
+                  "View assignment must have compatible spaces");
 
-      static_assert( is_assignable_value_type
-                   , "View assignment must have same value type or const = non-const" );
+    static_assert(
+        is_assignable_value_type,
+        "View assignment must have same value type or const = non-const");
 
-      static_assert( is_assignable_dimension
-                   , "View assignment must have compatible dimensions" );
+    static_assert(is_assignable_dimension,
+                  "View assignment must have compatible dimensions");
 
-      bool assignable_layout = assignable_layout_check(dst, src); //Runtime check
-      if(!assignable_layout)
-          Kokkos::abort("View assignment must have compatible layouts\n");
-	  
-      typedef typename DstType::offset_type  dst_offset_type ;
+    bool assignable_layout = assignable_layout_check(dst, src);  // Runtime
+                                                                 // check
+    if (!assignable_layout)
+      Kokkos::abort("View assignment must have compatible layouts\n");
 
-      if ( size_t(DstTraits::dimension::rank_dynamic) < size_t(SrcTraits::dimension::rank_dynamic) ) {
-        typedef typename DstTraits::dimension dst_dim;
-        bool assignable =
-          ( ( 1 > DstTraits::dimension::rank_dynamic && 1 <= SrcTraits::dimension::rank_dynamic ) ?
-            dst_dim::ArgN0 == src.dimension_0() : true ) &&
-          ( ( 2 > DstTraits::dimension::rank_dynamic && 2 <= SrcTraits::dimension::rank_dynamic ) ?
-            dst_dim::ArgN1 == src.dimension_1() : true ) &&
-          ( ( 3 > DstTraits::dimension::rank_dynamic && 3 <= SrcTraits::dimension::rank_dynamic ) ?
-            dst_dim::ArgN2 == src.dimension_2() : true ) &&
-          ( ( 4 > DstTraits::dimension::rank_dynamic && 4 <= SrcTraits::dimension::rank_dynamic ) ?
-            dst_dim::ArgN3 == src.dimension_3() : true ) &&
-          ( ( 5 > DstTraits::dimension::rank_dynamic && 5 <= SrcTraits::dimension::rank_dynamic ) ?
-            dst_dim::ArgN4 == src.dimension_4() : true ) &&
-          ( ( 6 > DstTraits::dimension::rank_dynamic && 6 <= SrcTraits::dimension::rank_dynamic ) ?
-            dst_dim::ArgN5 == src.dimension_5() : true ) &&
-          ( ( 7 > DstTraits::dimension::rank_dynamic && 7 <= SrcTraits::dimension::rank_dynamic ) ?
-            dst_dim::ArgN6 == src.dimension_6() : true ) &&
-          ( ( 8 > DstTraits::dimension::rank_dynamic && 8 <= SrcTraits::dimension::rank_dynamic ) ?
-            dst_dim::ArgN7 == src.dimension_7() : true )
-          ;
-        if(!assignable)
-          Kokkos::abort("View Assignment: trying to assign runtime dimension to non matching compile time dimension.");
-      }
-      dst.m_impl_offset = dst_offset_type( src.m_impl_offset );
-      dst.m_impl_handle = Kokkos::Impl::ViewDataHandle< DstTraits >::assign( src.m_impl_handle , src_track );
+    typedef typename DstType::offset_type dst_offset_type;
+
+    if (size_t(DstTraits::dimension::rank_dynamic) <
+        size_t(SrcTraits::dimension::rank_dynamic)) {
+      typedef typename DstTraits::dimension dst_dim;
+      bool assignable = ((1 > DstTraits::dimension::rank_dynamic &&
+                          1 <= SrcTraits::dimension::rank_dynamic)
+                             ? dst_dim::ArgN0 == src.dimension_0()
+                             : true) &&
+                        ((2 > DstTraits::dimension::rank_dynamic &&
+                          2 <= SrcTraits::dimension::rank_dynamic)
+                             ? dst_dim::ArgN1 == src.dimension_1()
+                             : true) &&
+                        ((3 > DstTraits::dimension::rank_dynamic &&
+                          3 <= SrcTraits::dimension::rank_dynamic)
+                             ? dst_dim::ArgN2 == src.dimension_2()
+                             : true) &&
+                        ((4 > DstTraits::dimension::rank_dynamic &&
+                          4 <= SrcTraits::dimension::rank_dynamic)
+                             ? dst_dim::ArgN3 == src.dimension_3()
+                             : true) &&
+                        ((5 > DstTraits::dimension::rank_dynamic &&
+                          5 <= SrcTraits::dimension::rank_dynamic)
+                             ? dst_dim::ArgN4 == src.dimension_4()
+                             : true) &&
+                        ((6 > DstTraits::dimension::rank_dynamic &&
+                          6 <= SrcTraits::dimension::rank_dynamic)
+                             ? dst_dim::ArgN5 == src.dimension_5()
+                             : true) &&
+                        ((7 > DstTraits::dimension::rank_dynamic &&
+                          7 <= SrcTraits::dimension::rank_dynamic)
+                             ? dst_dim::ArgN6 == src.dimension_6()
+                             : true) &&
+                        ((8 > DstTraits::dimension::rank_dynamic &&
+                          8 <= SrcTraits::dimension::rank_dynamic)
+                             ? dst_dim::ArgN7 == src.dimension_7()
+                             : true);
+      if (!assignable)
+        Kokkos::abort(
+            "View Assignment: trying to assign runtime dimension to non "
+            "matching compile time dimension.");
     }
+    dst.m_impl_offset = dst_offset_type(src.m_impl_offset);
+    dst.m_impl_handle = Kokkos::Impl::ViewDataHandle<DstTraits>::assign(
+        src.m_impl_handle, src_track);
+  }
 };
 
 //----------------------------------------------------------------------------
@@ -3142,144 +3493,130 @@ struct SubViewDataTypeImpl;
 
 /* base case */
 template <class ValueType>
-struct SubViewDataTypeImpl<
-  void,
-  ValueType,
-  Experimental::Extents<>
->
-{ using type = ValueType; };
+struct SubViewDataTypeImpl<void, ValueType, Experimental::Extents<> > {
+  using type = ValueType;
+};
 
 /* for integral args, subview doesn't have that dimension */
-template <class ValueType, ptrdiff_t Ext, ptrdiff_t... Exts, class Integral, class... Args>
+template <class ValueType, ptrdiff_t Ext, ptrdiff_t... Exts, class Integral,
+          class... Args>
 struct SubViewDataTypeImpl<
-  typename std::enable_if<std::is_integral<typename std::decay<Integral>::type>::value>::type,
-  ValueType,
-  Experimental::Extents<Ext, Exts...>,
-  Integral, Args...
-> : SubViewDataTypeImpl<
-      void, ValueType,
-      Experimental::Extents<Exts...>,
-      Args...
-    >
-{ };
-
+    typename std::enable_if<
+        std::is_integral<typename std::decay<Integral>::type>::value>::type,
+    ValueType, Experimental::Extents<Ext, Exts...>, Integral, Args...>
+    : SubViewDataTypeImpl<void, ValueType, Experimental::Extents<Exts...>,
+                          Args...> {};
 
 /* for ALL slice, subview has the same dimension */
 template <class ValueType, ptrdiff_t Ext, ptrdiff_t... Exts, class... Args>
+struct SubViewDataTypeImpl<void, ValueType, Experimental::Extents<Ext, Exts...>,
+                           ALL_t, Args...>
+    : SubViewDataTypeImpl<void, typename ApplyExtent<ValueType, Ext>::type,
+                          Experimental::Extents<Exts...>, Args...> {};
+
+/* for pair-style slice, subview has dynamic dimension, since pair doesn't give
+ * static sizes */
+/* Since we don't allow interleaving of dynamic and static extents, make all of
+ * the dimensions to the left dynamic  */
+template <class ValueType, ptrdiff_t Ext, ptrdiff_t... Exts, class PairLike,
+          class... Args>
 struct SubViewDataTypeImpl<
-  void,
-  ValueType,
-  Experimental::Extents<Ext, Exts...>,
-  ALL_t, Args...
-> : SubViewDataTypeImpl<
-      void, typename ApplyExtent<ValueType, Ext>::type,
-      Experimental::Extents<Exts...>,
-      Args...
-    >
-{ };
-
-
-/* for pair-style slice, subview has dynamic dimension, since pair doesn't give static sizes */
-/* Since we don't allow interleaving of dynamic and static extents, make all of the dimensions to the left dynamic  */
-template <class ValueType, ptrdiff_t Ext, ptrdiff_t... Exts, class PairLike, class... Args>
-struct SubViewDataTypeImpl<
-  typename std::enable_if<is_pair_like<PairLike>::value>::type,
-  ValueType,
-  Experimental::Extents<Ext, Exts...>,
-  PairLike, Args...
-> : SubViewDataTypeImpl<
-      void, typename make_all_extents_into_pointers<ValueType>::type*,
-      Experimental::Extents<Exts...>,
-      Args...
-    >
-{ };
-
+    typename std::enable_if<is_pair_like<PairLike>::value>::type, ValueType,
+    Experimental::Extents<Ext, Exts...>, PairLike, Args...>
+    : SubViewDataTypeImpl<
+          void, typename make_all_extents_into_pointers<ValueType>::type*,
+          Experimental::Extents<Exts...>, Args...> {};
 
 template <class ValueType, class Exts, class... Args>
-struct SubViewDataType
-  : SubViewDataTypeImpl<
-      void, ValueType, Exts, Args...
-    >
-{ };
+struct SubViewDataType : SubViewDataTypeImpl<void, ValueType, Exts, Args...> {};
 
 //----------------------------------------------------------------------------
 
-template< class SrcTraits , class ... Args >
-struct ViewMapping
-  < typename std::enable_if<(
-      std::is_same< typename SrcTraits::specialize , void >::value
-      &&
-      (
-        std::is_same< typename SrcTraits::array_layout
-                    , Kokkos::LayoutLeft >::value ||
-        std::is_same< typename SrcTraits::array_layout
-                    , Kokkos::LayoutRight >::value ||
-        std::is_same< typename SrcTraits::array_layout
-                    , Kokkos::LayoutStride >::value
-      )
-    )>::type
-  , SrcTraits
-  , Args ... >
-{
-private:
+template <class SrcTraits, class... Args>
+struct ViewMapping<
+    typename std::enable_if<(
+        std::is_same<typename SrcTraits::specialize, void>::value &&
+        (std::is_same<typename SrcTraits::array_layout,
+                      Kokkos::LayoutLeft>::value ||
+         std::is_same<typename SrcTraits::array_layout,
+                      Kokkos::LayoutRight>::value ||
+         std::is_same<typename SrcTraits::array_layout,
+                      Kokkos::LayoutStride>::value))>::type,
+    SrcTraits, Args...> {
+ private:
+  static_assert(SrcTraits::rank == sizeof...(Args),
+                "Subview mapping requires one argument for each dimension of "
+                "source View");
 
-  static_assert( SrcTraits::rank == sizeof...(Args) ,
-    "Subview mapping requires one argument for each dimension of source View" );
+  enum {
+    RZ = false,
+    R0 = bool(is_integral_extent<0, Args...>::value),
+    R1 = bool(is_integral_extent<1, Args...>::value),
+    R2 = bool(is_integral_extent<2, Args...>::value),
+    R3 = bool(is_integral_extent<3, Args...>::value),
+    R4 = bool(is_integral_extent<4, Args...>::value),
+    R5 = bool(is_integral_extent<5, Args...>::value),
+    R6 = bool(is_integral_extent<6, Args...>::value),
+    R7 = bool(is_integral_extent<7, Args...>::value)
+  };
 
-  enum
-    { RZ = false
-    , R0 = bool(is_integral_extent<0,Args...>::value)
-    , R1 = bool(is_integral_extent<1,Args...>::value)
-    , R2 = bool(is_integral_extent<2,Args...>::value)
-    , R3 = bool(is_integral_extent<3,Args...>::value)
-    , R4 = bool(is_integral_extent<4,Args...>::value)
-    , R5 = bool(is_integral_extent<5,Args...>::value)
-    , R6 = bool(is_integral_extent<6,Args...>::value)
-    , R7 = bool(is_integral_extent<7,Args...>::value)
-    };
-
-  enum { rank = unsigned(R0) + unsigned(R1) + unsigned(R2) + unsigned(R3)
-              + unsigned(R4) + unsigned(R5) + unsigned(R6) + unsigned(R7) };
+  enum {
+    rank = unsigned(R0) + unsigned(R1) + unsigned(R2) + unsigned(R3) +
+           unsigned(R4) + unsigned(R5) + unsigned(R6) + unsigned(R7)
+  };
 
   // Whether right-most rank is a range.
-  enum { R0_rev = ( 0 == SrcTraits::rank ? RZ : (
-                    1 == SrcTraits::rank ? R0 : (
-                    2 == SrcTraits::rank ? R1 : (
-                    3 == SrcTraits::rank ? R2 : (
-                    4 == SrcTraits::rank ? R3 : (
-                    5 == SrcTraits::rank ? R4 : (
-                    6 == SrcTraits::rank ? R5 : (
-                    7 == SrcTraits::rank ? R6 : R7 )))))))) };
+  enum {
+    R0_rev =
+        (0 == SrcTraits::rank
+             ? RZ
+             : (1 == SrcTraits::rank
+                    ? R0
+                    : (2 == SrcTraits::rank
+                           ? R1
+                           : (3 == SrcTraits::rank
+                                  ? R2
+                                  : (4 == SrcTraits::rank
+                                         ? R3
+                                         : (5 == SrcTraits::rank
+                                                ? R4
+                                                : (6 == SrcTraits::rank
+                                                       ? R5
+                                                       : (7 == SrcTraits::rank
+                                                              ? R6
+                                                              : R7))))))))
+  };
 
   // Subview's layout
   typedef typename std::conditional<
-      ( /* Same array layout IF */
-        ( rank == 0 ) /* output rank zero */
-        ||
-        SubviewLegalArgsCompileTime<typename SrcTraits::array_layout, typename SrcTraits::array_layout,
-                                    rank, SrcTraits::rank, 0, Args...>::value
-        ||
-        // OutputRank 1 or 2, InputLayout Left, Interval 0
-        // because single stride one or second index has a stride.
-        ( rank <= 2 && R0 && std::is_same< typename SrcTraits::array_layout , Kokkos::LayoutLeft >::value ) //replace with input rank
-        ||
-        // OutputRank 1 or 2, InputLayout Right, Interval [InputRank-1]
-        // because single stride one or second index has a stride.
-        ( rank <= 2 && R0_rev && std::is_same< typename SrcTraits::array_layout , Kokkos::LayoutRight >::value ) //replace input rank
-      ), typename SrcTraits::array_layout , Kokkos::LayoutStride
-      >::type array_layout ;
+      (            /* Same array layout IF */
+       (rank == 0) /* output rank zero */
+       || SubviewLegalArgsCompileTime<typename SrcTraits::array_layout,
+                                      typename SrcTraits::array_layout, rank,
+                                      SrcTraits::rank, 0, Args...>::value ||
+       // OutputRank 1 or 2, InputLayout Left, Interval 0
+       // because single stride one or second index has a stride.
+       (rank <= 2 && R0 &&
+        std::is_same<typename SrcTraits::array_layout,
+                     Kokkos::LayoutLeft>::value)  // replace with input rank
+       ||
+       // OutputRank 1 or 2, InputLayout Right, Interval [InputRank-1]
+       // because single stride one or second index has a stride.
+       (rank <= 2 && R0_rev &&
+        std::is_same<typename SrcTraits::array_layout,
+                     Kokkos::LayoutRight>::value)  // replace input rank
+       ),
+      typename SrcTraits::array_layout, Kokkos::LayoutStride>::type
+      array_layout;
 
-  typedef typename SrcTraits::value_type  value_type ;
+  typedef typename SrcTraits::value_type value_type;
 
   using data_type =
-    typename SubViewDataType<
-      value_type,
-      typename Kokkos::Impl::ParseViewExtents<
-        typename SrcTraits::data_type
-      >::type,
-      Args...
-    >::type;
-  //typedef typename std::conditional< rank == 0 , value_type ,
+      typename SubViewDataType<value_type,
+                               typename Kokkos::Impl::ParseViewExtents<
+                                   typename SrcTraits::data_type>::type,
+                               Args...>::type;
+  // typedef typename std::conditional< rank == 0 , value_type ,
   //        typename std::conditional< rank == 1 , value_type * ,
   //        typename std::conditional< rank == 2 , value_type ** ,
   //        typename std::conditional< rank == 3 , value_type *** ,
@@ -3291,77 +3628,61 @@ private:
   //        >::type >::type >::type >::type >::type >::type >::type >::type
   //   data_type ;
 
-public:
+ public:
+  typedef Kokkos::ViewTraits<data_type, array_layout,
+                             typename SrcTraits::device_type,
+                             typename SrcTraits::memory_traits>
+      traits_type;
 
-  typedef Kokkos::ViewTraits
-    < data_type
-    , array_layout
-    , typename SrcTraits::device_type
-    , typename SrcTraits::memory_traits > traits_type ;
+  typedef Kokkos::View<data_type, array_layout, typename SrcTraits::device_type,
+                       typename SrcTraits::memory_traits>
+      type;
 
-  typedef Kokkos::View
-    < data_type
-    , array_layout
-    , typename SrcTraits::device_type
-    , typename SrcTraits::memory_traits > type ;
-
-  template< class MemoryTraits >
+  template <class MemoryTraits>
   struct apply {
+    static_assert(Kokkos::Impl::is_memory_traits<MemoryTraits>::value, "");
 
-    static_assert( Kokkos::Impl::is_memory_traits< MemoryTraits >::value , "" );
+    typedef Kokkos::ViewTraits<data_type, array_layout,
+                               typename SrcTraits::device_type, MemoryTraits>
+        traits_type;
 
-    typedef Kokkos::ViewTraits
-      < data_type
-      , array_layout
-      , typename SrcTraits::device_type
-      , MemoryTraits > traits_type ;
-
-    typedef Kokkos::View
-      < data_type
-      , array_layout
-      , typename SrcTraits::device_type
-      , MemoryTraits > type ;
+    typedef Kokkos::View<data_type, array_layout,
+                         typename SrcTraits::device_type, MemoryTraits>
+        type;
   };
 
   // The presumed type is 'ViewMapping< traits_type , void >'
   // However, a compatible ViewMapping is acceptable.
-  template< class DstTraits >
-  KOKKOS_INLINE_FUNCTION
-  static void assign( ViewMapping< DstTraits , void > & dst
-                    , ViewMapping< SrcTraits , void > const & src
-                    , Args ... args )
-    {
-      static_assert(
-        ViewMapping< DstTraits , traits_type , void >::is_assignable ,
-        "Subview destination type must be compatible with subview derived type" );
+  template <class DstTraits>
+  KOKKOS_INLINE_FUNCTION static void assign(
+      ViewMapping<DstTraits, void>& dst,
+      ViewMapping<SrcTraits, void> const& src, Args... args) {
+    static_assert(ViewMapping<DstTraits, traits_type, void>::is_assignable,
+                  "Subview destination type must be compatible with subview "
+                  "derived type");
 
-      typedef ViewMapping< DstTraits , void >  DstType ;
+    typedef ViewMapping<DstTraits, void> DstType;
 
-      typedef typename DstType::offset_type  dst_offset_type ;
+    typedef typename DstType::offset_type dst_offset_type;
 
-      const SubviewExtents< SrcTraits::rank , rank >
-        extents( src.m_impl_offset.m_dim , args... );
+    const SubviewExtents<SrcTraits::rank, rank> extents(src.m_impl_offset.m_dim,
+                                                        args...);
 
-      dst.m_impl_offset = dst_offset_type( src.m_impl_offset , extents );
+    dst.m_impl_offset = dst_offset_type(src.m_impl_offset, extents);
 
-      dst.m_impl_handle = ViewDataHandle< DstTraits >::assign(src.m_impl_handle,
-          src.m_impl_offset( extents.domain_offset(0)
-                      , extents.domain_offset(1)
-                      , extents.domain_offset(2)
-                      , extents.domain_offset(3)
-                      , extents.domain_offset(4)
-                      , extents.domain_offset(5)
-                      , extents.domain_offset(6)
-                      , extents.domain_offset(7)
-          ));
-    }
+    dst.m_impl_handle = ViewDataHandle<DstTraits>::assign(
+        src.m_impl_handle,
+        src.m_impl_offset(extents.domain_offset(0), extents.domain_offset(1),
+                          extents.domain_offset(2), extents.domain_offset(3),
+                          extents.domain_offset(4), extents.domain_offset(5),
+                          extents.domain_offset(6), extents.domain_offset(7)));
+  }
 };
 
-
-
 //----------------------------------------------------------------------------
 
-}} // namespace Kokkos::Impl
+}  // namespace Impl
+}  // namespace Kokkos
 
 //----------------------------------------------------------------------------
 //----------------------------------------------------------------------------
@@ -3369,131 +3690,105 @@ public:
 namespace Kokkos {
 namespace Impl {
 
-template< unsigned , class MapType >
-KOKKOS_INLINE_FUNCTION
-bool view_verify_operator_bounds( const MapType & )
-{ return true ; }
-
-template< unsigned R , class MapType , class iType , class ... Args >
-KOKKOS_INLINE_FUNCTION
-bool view_verify_operator_bounds
-  ( const MapType & map
-  , const iType   & i
-  , Args ... args
-  )
-{
-  return ( size_t(i) < map.extent(R) )
-         && view_verify_operator_bounds<R+1>( map , args ... );
+template <unsigned, class MapType>
+KOKKOS_INLINE_FUNCTION bool view_verify_operator_bounds(const MapType&) {
+  return true;
 }
 
-
-template< unsigned , class MapType >
-inline
-void view_error_operator_bounds( char * , int , const MapType & )
-{}
-
-template< unsigned R , class MapType , class iType , class ... Args >
-inline
-void view_error_operator_bounds
-  ( char * buf
-  , int len
-  , const MapType & map
-  , const iType   & i
-  , Args ... args
-  )
-{
-  const int n =
-    snprintf(buf,len," %ld < %ld %c"
-            , static_cast<unsigned long>(i)
-            , static_cast<unsigned long>( map.extent(R) )
-            , ( sizeof...(Args) ? ',' : ')' )
-            );
-  view_error_operator_bounds<R+1>(buf+n,len-n,map,args...);
+template <unsigned R, class MapType, class iType, class... Args>
+KOKKOS_INLINE_FUNCTION bool view_verify_operator_bounds(const MapType& map,
+                                                        const iType& i,
+                                                        Args... args) {
+  return (size_t(i) < map.extent(R)) &&
+         view_verify_operator_bounds<R + 1>(map, args...);
 }
 
+template <unsigned, class MapType>
+inline void view_error_operator_bounds(char*, int, const MapType&) {}
 
-#if ! defined( KOKKOS_ACTIVE_EXECUTION_MEMORY_SPACE_HOST )
+template <unsigned R, class MapType, class iType, class... Args>
+inline void view_error_operator_bounds(char* buf, int len, const MapType& map,
+                                       const iType& i, Args... args) {
+  const int n = snprintf(
+      buf, len, " %ld < %ld %c", static_cast<unsigned long>(i),
+      static_cast<unsigned long>(map.extent(R)), (sizeof...(Args) ? ',' : ')'));
+  view_error_operator_bounds<R + 1>(buf + n, len - n, map, args...);
+}
+
+#if !defined(KOKKOS_ACTIVE_EXECUTION_MEMORY_SPACE_HOST)
 
 /* Check #3: is the View managed as determined by the MemoryTraits? */
-template< class MapType,
-  bool is_managed = (MapType::is_managed != 0) >
+template <class MapType, bool is_managed = (MapType::is_managed != 0)>
 struct OperatorBoundsErrorOnDevice;
 
-template< class MapType >
-struct OperatorBoundsErrorOnDevice< MapType, false > {
-KOKKOS_INLINE_FUNCTION
-static void run(MapType const&) {
-  Kokkos::abort("View bounds error");
-}
+template <class MapType>
+struct OperatorBoundsErrorOnDevice<MapType, false> {
+  KOKKOS_INLINE_FUNCTION
+  static void run(MapType const&) { Kokkos::abort("View bounds error"); }
 };
 
-template< class MapType >
-struct OperatorBoundsErrorOnDevice< MapType, true > {
-KOKKOS_INLINE_FUNCTION
-static void run(MapType const& map) {
-  SharedAllocationHeader const* const header =
-    SharedAllocationHeader::get_header((void*)(map.data()));
-  char const* const label = header->label();
-  enum { LEN = 128 };
-  char msg[LEN];
-  char const* const first_part = "View bounds error of view ";
-  char* p = msg;
-  char* const end = msg + LEN - 1;
-  for (char const* p2 = first_part; (*p2 != '\0') && (p < end); ++p, ++p2) {
-    *p = *p2;
+template <class MapType>
+struct OperatorBoundsErrorOnDevice<MapType, true> {
+  KOKKOS_INLINE_FUNCTION
+  static void run(MapType const& map) {
+    SharedAllocationHeader const* const header =
+        SharedAllocationHeader::get_header((void*)(map.data()));
+    char const* const label = header->label();
+    enum { LEN = 128 };
+    char msg[LEN];
+    char const* const first_part = "View bounds error of view ";
+    char* p                      = msg;
+    char* const end              = msg + LEN - 1;
+    for (char const* p2 = first_part; (*p2 != '\0') && (p < end); ++p, ++p2) {
+      *p = *p2;
+    }
+    for (char const* p2 = label; (*p2 != '\0') && (p < end); ++p, ++p2) {
+      *p = *p2;
+    }
+    *p = '\0';
+    Kokkos::abort(msg);
   }
-  for (char const* p2 = label; (*p2 != '\0') && (p < end); ++p, ++p2) {
-    *p = *p2;
-  }
-  *p = '\0';
-  Kokkos::abort(msg);
-}
 };
 
 /* Check #2: does the ViewMapping have the printable_label_typedef defined?
    See above that only the non-specialized standard-layout ViewMapping has
    this defined by default.
-   The existence of this typedef indicates the existence of MapType::is_managed */
-template< class T, class Enable = void >
+   The existence of this typedef indicates the existence of MapType::is_managed
+ */
+template <class T, class Enable = void>
 struct has_printable_label_typedef : public std::false_type {};
 
-template<class T>
+template <class T>
 struct has_printable_label_typedef<
-  T, typename enable_if_type<typename T::printable_label_typedef>::type>
-  : public std::true_type
-{};
+    T, typename enable_if_type<typename T::printable_label_typedef>::type>
+    : public std::true_type {};
 
-template< class MapType >
-KOKKOS_INLINE_FUNCTION
-void operator_bounds_error_on_device(
-    MapType const&,
-    std::false_type) {
+template <class MapType>
+KOKKOS_INLINE_FUNCTION void operator_bounds_error_on_device(MapType const&,
+                                                            std::false_type) {
   Kokkos::abort("View bounds error");
 }
 
-template< class MapType >
-KOKKOS_INLINE_FUNCTION
-void operator_bounds_error_on_device(
-    MapType const& map,
-    std::true_type) {
-  OperatorBoundsErrorOnDevice< MapType >::run(map);
+template <class MapType>
+KOKKOS_INLINE_FUNCTION void operator_bounds_error_on_device(MapType const& map,
+                                                            std::true_type) {
+  OperatorBoundsErrorOnDevice<MapType>::run(map);
 }
 
-#endif // ! defined( KOKKOS_ACTIVE_EXECUTION_MEMORY_SPACE_HOST )
+#endif  // ! defined( KOKKOS_ACTIVE_EXECUTION_MEMORY_SPACE_HOST )
 
-template< class MemorySpace , class MapType , class ... Args >
-KOKKOS_INLINE_FUNCTION
-void view_verify_operator_bounds
-  ( Kokkos::Impl::SharedAllocationTracker const & tracker
-  , const MapType & map , Args ... args )
-{
-  if ( ! view_verify_operator_bounds<0>( map , args ... ) ) {
-#if defined( KOKKOS_ACTIVE_EXECUTION_MEMORY_SPACE_HOST )
+template <class MemorySpace, class MapType, class... Args>
+KOKKOS_INLINE_FUNCTION void view_verify_operator_bounds(
+    Kokkos::Impl::SharedAllocationTracker const& tracker, const MapType& map,
+    Args... args) {
+  if (!view_verify_operator_bounds<0>(map, args...)) {
+#if defined(KOKKOS_ACTIVE_EXECUTION_MEMORY_SPACE_HOST)
     enum { LEN = 1024 };
-    char buffer[ LEN ];
+    char buffer[LEN];
     const std::string label = tracker.template get_label<MemorySpace>();
-    int n = snprintf(buffer,LEN,"View bounds error of view %s (",label.c_str());
-    view_error_operator_bounds<0>( buffer + n , LEN - n , map , args ... );
+    int n =
+        snprintf(buffer, LEN, "View bounds error of view %s (", label.c_str());
+    view_error_operator_bounds<0>(buffer + n, LEN - n, map, args...);
     Kokkos::Impl::throw_runtime_exception(std::string(buffer));
 #else
     /* Check #1: is there a SharedAllocationRecord?
@@ -3511,8 +3806,6 @@ void view_verify_operator_bounds
   }
 }
 
-
-
 } /* namespace Impl */
 } /* namespace Kokkos */
 
@@ -3520,4 +3813,3 @@ void view_verify_operator_bounds
 //----------------------------------------------------------------------------
 
 #endif /* #ifndef KOKKOS_EXPERIMENTAL_VIEW_MAPPING_HPP */
-
diff --git a/lib/kokkos/core/src/impl/Kokkos_ViewTile.hpp b/lib/kokkos/core/src/impl/Kokkos_ViewTile.hpp
index a8645db451..f1227c2ab6 100644
--- a/lib/kokkos/core/src/impl/Kokkos_ViewTile.hpp
+++ b/lib/kokkos/core/src/impl/Kokkos_ViewTile.hpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -55,163 +56,151 @@ namespace Impl {
 
 // View mapping for rank two tiled array
 
-template< class L >
+template <class L>
 struct is_layout_tile : public std::false_type {};
 
-template< unsigned N0 , unsigned N1 >
-struct is_layout_tile< Kokkos::LayoutTileLeft<N0,N1,true> > : public std::true_type {};
-
-template< class Dimension , class Layout >
-struct ViewOffset< Dimension , Layout ,
-  typename std::enable_if<(
-    ( Dimension::rank == 2 )
-    &&
-    is_layout_tile< Layout >::value
-  )>::type >
-{
-public:
+template <unsigned N0, unsigned N1>
+struct is_layout_tile<Kokkos::LayoutTileLeft<N0, N1, true> >
+    : public std::true_type {};
 
+template <class Dimension, class Layout>
+struct ViewOffset<
+    Dimension, Layout,
+    typename std::enable_if<((Dimension::rank == 2) &&
+                             is_layout_tile<Layout>::value)>::type> {
+ public:
   enum { SHIFT_0 = Kokkos::Impl::integral_power_of_two(Layout::N0) };
   enum { SHIFT_1 = Kokkos::Impl::integral_power_of_two(Layout::N1) };
   enum { SHIFT_T = SHIFT_0 + SHIFT_1 };
-  enum { MASK_0  = Layout::N0 - 1 };
-  enum { MASK_1  = Layout::N1 - 1 };
+  enum { MASK_0 = Layout::N0 - 1 };
+  enum { MASK_1 = Layout::N1 - 1 };
 
   // Is an irregular layout that does not have uniform striding for each index.
-  using is_mapping_plugin = std::true_type ;
-  using is_regular        = std::false_type ;
+  using is_mapping_plugin = std::true_type;
+  using is_regular        = std::false_type;
 
-  typedef size_t     size_type ;
-  typedef Dimension  dimension_type ;
-  typedef Layout     array_layout ;
+  typedef size_t size_type;
+  typedef Dimension dimension_type;
+  typedef Layout array_layout;
 
-  dimension_type m_dim ;
-  size_type      m_tile_N0 ;
+  dimension_type m_dim;
+  size_type m_tile_N0;
 
   //----------------------------------------
 
   // Only instantiated for rank 2
-  template< typename I0 , typename I1 >
-  KOKKOS_INLINE_FUNCTION constexpr
-  size_type operator()( I0 const & i0 , I1 const & i1
-                      , int = 0 , int = 0
-                      , int = 0 , int = 0
-                      , int = 0 , int = 0
-                      ) const
-    {
-      return /* ( ( Tile offset                               ) * Tile size ) */
-                ( ( (i0>>SHIFT_0) + m_tile_N0 * (i1>>SHIFT_1) ) << SHIFT_T) +
-             /* ( Offset within tile                       ) */
-                ( (i0 & MASK_0) + ((i1 & MASK_1)<<SHIFT_0) ) ;
-    }
+  template <typename I0, typename I1>
+  KOKKOS_INLINE_FUNCTION constexpr size_type operator()(I0 const& i0,
+                                                        I1 const& i1, int = 0,
+                                                        int = 0, int = 0,
+                                                        int = 0, int = 0,
+                                                        int = 0) const {
+    return /* ( ( Tile offset                               ) * Tile size ) */
+        (((i0 >> SHIFT_0) + m_tile_N0 * (i1 >> SHIFT_1)) << SHIFT_T) +
+        /* ( Offset within tile                       ) */
+        ((i0 & MASK_0) + ((i1 & MASK_1) << SHIFT_0));
+  }
 
   //----------------------------------------
 
-  KOKKOS_INLINE_FUNCTION constexpr
-  array_layout layout() const
-    { return array_layout( m_dim.N0 , m_dim.N1 ); }
+  KOKKOS_INLINE_FUNCTION constexpr array_layout layout() const {
+    return array_layout(m_dim.N0, m_dim.N1);
+  }
 
-  KOKKOS_INLINE_FUNCTION constexpr size_type dimension_0() const { return m_dim.N0 ; }
-  KOKKOS_INLINE_FUNCTION constexpr size_type dimension_1() const { return m_dim.N1 ; }
-  KOKKOS_INLINE_FUNCTION constexpr size_type dimension_2() const { return 1 ; }
-  KOKKOS_INLINE_FUNCTION constexpr size_type dimension_3() const { return 1 ; }
-  KOKKOS_INLINE_FUNCTION constexpr size_type dimension_4() const { return 1 ; }
-  KOKKOS_INLINE_FUNCTION constexpr size_type dimension_5() const { return 1 ; }
-  KOKKOS_INLINE_FUNCTION constexpr size_type dimension_6() const { return 1 ; }
-  KOKKOS_INLINE_FUNCTION constexpr size_type dimension_7() const { return 1 ; }
+  KOKKOS_INLINE_FUNCTION constexpr size_type dimension_0() const {
+    return m_dim.N0;
+  }
+  KOKKOS_INLINE_FUNCTION constexpr size_type dimension_1() const {
+    return m_dim.N1;
+  }
+  KOKKOS_INLINE_FUNCTION constexpr size_type dimension_2() const { return 1; }
+  KOKKOS_INLINE_FUNCTION constexpr size_type dimension_3() const { return 1; }
+  KOKKOS_INLINE_FUNCTION constexpr size_type dimension_4() const { return 1; }
+  KOKKOS_INLINE_FUNCTION constexpr size_type dimension_5() const { return 1; }
+  KOKKOS_INLINE_FUNCTION constexpr size_type dimension_6() const { return 1; }
+  KOKKOS_INLINE_FUNCTION constexpr size_type dimension_7() const { return 1; }
 
-  KOKKOS_INLINE_FUNCTION constexpr size_type size() const { return m_dim.N0 * m_dim.N1 ; }
+  KOKKOS_INLINE_FUNCTION constexpr size_type size() const {
+    return m_dim.N0 * m_dim.N1;
+  }
 
   // Strides are meaningless due to irregularity
-  KOKKOS_INLINE_FUNCTION constexpr size_type stride_0() const { return 0 ; }
-  KOKKOS_INLINE_FUNCTION constexpr size_type stride_1() const { return 0 ; }
-  KOKKOS_INLINE_FUNCTION constexpr size_type stride_2() const { return 0 ; }
-  KOKKOS_INLINE_FUNCTION constexpr size_type stride_3() const { return 0 ; }
-  KOKKOS_INLINE_FUNCTION constexpr size_type stride_4() const { return 0 ; }
-  KOKKOS_INLINE_FUNCTION constexpr size_type stride_5() const { return 0 ; }
-  KOKKOS_INLINE_FUNCTION constexpr size_type stride_6() const { return 0 ; }
-  KOKKOS_INLINE_FUNCTION constexpr size_type stride_7() const { return 0 ; }
+  KOKKOS_INLINE_FUNCTION constexpr size_type stride_0() const { return 0; }
+  KOKKOS_INLINE_FUNCTION constexpr size_type stride_1() const { return 0; }
+  KOKKOS_INLINE_FUNCTION constexpr size_type stride_2() const { return 0; }
+  KOKKOS_INLINE_FUNCTION constexpr size_type stride_3() const { return 0; }
+  KOKKOS_INLINE_FUNCTION constexpr size_type stride_4() const { return 0; }
+  KOKKOS_INLINE_FUNCTION constexpr size_type stride_5() const { return 0; }
+  KOKKOS_INLINE_FUNCTION constexpr size_type stride_6() const { return 0; }
+  KOKKOS_INLINE_FUNCTION constexpr size_type stride_7() const { return 0; }
 
-  KOKKOS_INLINE_FUNCTION constexpr size_type span() const
-    {
-      // ( TileDim0 * ( TileDim1 ) ) * TileSize
-      return ( m_tile_N0 * ( ( m_dim.N1 + MASK_1 ) >> SHIFT_1 ) ) << SHIFT_T ;
-    }
+  KOKKOS_INLINE_FUNCTION constexpr size_type span() const {
+    // ( TileDim0 * ( TileDim1 ) ) * TileSize
+    return (m_tile_N0 * ((m_dim.N1 + MASK_1) >> SHIFT_1)) << SHIFT_T;
+  }
 
-  KOKKOS_INLINE_FUNCTION constexpr bool span_is_contiguous() const
-    {
-      // Only if dimensions align with tile size
-      return ( m_dim.N0 & MASK_0 ) == 0 && ( m_dim.N1 & MASK_1 ) == 0 ;
-    }
+  KOKKOS_INLINE_FUNCTION constexpr bool span_is_contiguous() const {
+    // Only if dimensions align with tile size
+    return (m_dim.N0 & MASK_0) == 0 && (m_dim.N1 & MASK_1) == 0;
+  }
 
   //----------------------------------------
 
 #ifdef KOKKOS_CUDA_9_DEFAULTED_BUG_WORKAROUND
   KOKKOS_INLINE_FUNCTION ~ViewOffset() {}
   KOKKOS_INLINE_FUNCTION ViewOffset() {}
-  KOKKOS_INLINE_FUNCTION ViewOffset( const ViewOffset & rhs )
-  : m_dim(rhs.m_dim)
-  , m_tile_N0(rhs.m_tile_N0)
-  {
-  }
-  KOKKOS_INLINE_FUNCTION ViewOffset & operator = ( const ViewOffset & rhs ) {
-    m_dim = rhs.m_dim;
+  KOKKOS_INLINE_FUNCTION ViewOffset(const ViewOffset& rhs)
+      : m_dim(rhs.m_dim), m_tile_N0(rhs.m_tile_N0) {}
+  KOKKOS_INLINE_FUNCTION ViewOffset& operator=(const ViewOffset& rhs) {
+    m_dim     = rhs.m_dim;
     m_tile_N0 = rhs.m_tile_N0;
     return *this;
   }
 #else
-  KOKKOS_INLINE_FUNCTION ~ViewOffset() = default;
-  KOKKOS_INLINE_FUNCTION ViewOffset() = default;
-  KOKKOS_INLINE_FUNCTION ViewOffset( const ViewOffset & ) = default;
-  KOKKOS_INLINE_FUNCTION ViewOffset & operator = ( const ViewOffset & ) = default;
+  KOKKOS_INLINE_FUNCTION ~ViewOffset()                 = default;
+  KOKKOS_INLINE_FUNCTION ViewOffset()                  = default;
+  KOKKOS_INLINE_FUNCTION ViewOffset(const ViewOffset&) = default;
+  KOKKOS_INLINE_FUNCTION ViewOffset& operator=(const ViewOffset&) = default;
 #endif
 
-  template< unsigned TrivialScalarSize >
-  KOKKOS_INLINE_FUNCTION
-  constexpr ViewOffset( std::integral_constant<unsigned,TrivialScalarSize> const & ,
-                        array_layout const arg_layout )
-    : m_dim( arg_layout.dimension[0], arg_layout.dimension[1], 0, 0, 0, 0, 0, 0 )
-    , m_tile_N0( ( arg_layout.dimension[0] + MASK_0 ) >> SHIFT_0 /* number of tiles in first dimension */ )
-    {}
+  template <unsigned TrivialScalarSize>
+  KOKKOS_INLINE_FUNCTION constexpr ViewOffset(
+      std::integral_constant<unsigned, TrivialScalarSize> const&,
+      array_layout const arg_layout)
+      : m_dim(arg_layout.dimension[0], arg_layout.dimension[1], 0, 0, 0, 0, 0,
+              0),
+        m_tile_N0((arg_layout.dimension[0] + MASK_0) >>
+                  SHIFT_0 /* number of tiles in first dimension */) {}
 };
 
-template< typename T , unsigned N0 , unsigned N1 , class ... P
-        , typename iType0 , typename iType1
-        >
-struct ViewMapping
-  < void
-  , Kokkos::ViewTraits<T**,Kokkos::LayoutTileLeft<N0,N1,true>,P...>
-  , Kokkos::LayoutTileLeft<N0,N1,true>
-  , iType0
-  , iType1 >
-{
-  typedef Kokkos::LayoutTileLeft<N0,N1,true>  src_layout ;
-  typedef Kokkos::ViewTraits< T** , src_layout , P... > src_traits ;
-  typedef Kokkos::ViewTraits< T[N0][N1] , LayoutLeft , P ... > traits ;
-  typedef Kokkos::View< T[N0][N1] , LayoutLeft , P ... > type ;
+template <typename T, unsigned N0, unsigned N1, class... P, typename iType0,
+          typename iType1>
+struct ViewMapping<
+    void, Kokkos::ViewTraits<T**, Kokkos::LayoutTileLeft<N0, N1, true>, P...>,
+    Kokkos::LayoutTileLeft<N0, N1, true>, iType0, iType1> {
+  typedef Kokkos::LayoutTileLeft<N0, N1, true> src_layout;
+  typedef Kokkos::ViewTraits<T**, src_layout, P...> src_traits;
+  typedef Kokkos::ViewTraits<T[N0][N1], LayoutLeft, P...> traits;
+  typedef Kokkos::View<T[N0][N1], LayoutLeft, P...> type;
 
-  KOKKOS_INLINE_FUNCTION static
-  void assign( ViewMapping< traits , void > & dst
-             , const ViewMapping< src_traits , void > & src
-             , const src_layout &
-             , const size_t i_tile0
-             , const size_t i_tile1
-             )
-    {
-      typedef ViewMapping< traits , void >        dst_map_type ;
-      typedef ViewMapping< src_traits , void >    src_map_type ;
-      typedef typename dst_map_type::handle_type  dst_handle_type ;
-      typedef typename dst_map_type::offset_type  dst_offset_type ;
-      typedef typename src_map_type::offset_type  src_offset_type ;
+  KOKKOS_INLINE_FUNCTION static void assign(
+      ViewMapping<traits, void>& dst, const ViewMapping<src_traits, void>& src,
+      const src_layout&, const size_t i_tile0, const size_t i_tile1) {
+    typedef ViewMapping<traits, void> dst_map_type;
+    typedef ViewMapping<src_traits, void> src_map_type;
+    typedef typename dst_map_type::handle_type dst_handle_type;
+    typedef typename dst_map_type::offset_type dst_offset_type;
+    typedef typename src_map_type::offset_type src_offset_type;
 
-      dst = dst_map_type(
-         dst_handle_type( src.m_impl_handle +
-                        ( ( i_tile0 + src.m_impl_offset.m_tile_N0 * i_tile1 ) << src_offset_type::SHIFT_T ) ) ,
-         dst_offset_type() );
-    }
+    dst = dst_map_type(
+        dst_handle_type(src.m_impl_handle +
+                        ((i_tile0 + src.m_impl_offset.m_tile_N0 * i_tile1)
+                         << src_offset_type::SHIFT_T)),
+        dst_offset_type());
+  }
 };
 
-#endif // KOKKOS_ENABLE_DEPRECATED_CODE
+#endif  // KOKKOS_ENABLE_DEPRECATED_CODE
 // ===============================================================================
 
 } /* namespace Impl */
@@ -222,23 +211,19 @@ namespace Kokkos {
 // ==============================================================================
 #ifdef KOKKOS_ENABLE_DEPRECATED_CODE
 
-template< typename T , unsigned N0 , unsigned N1 , class ... P >
-KOKKOS_INLINE_FUNCTION
-Kokkos::View< T[N0][N1] , LayoutLeft , P... >
-tile_subview( const Kokkos::View<T**,Kokkos::LayoutTileLeft<N0,N1,true>,P...> & src
-            , const size_t i_tile0
-            , const size_t i_tile1
-            )
-{
+template <typename T, unsigned N0, unsigned N1, class... P>
+KOKKOS_INLINE_FUNCTION Kokkos::View<T[N0][N1], LayoutLeft, P...> tile_subview(
+    const Kokkos::View<T**, Kokkos::LayoutTileLeft<N0, N1, true>, P...>& src,
+    const size_t i_tile0, const size_t i_tile1) {
   // Force the specialized ViewMapping for extracting a tile
   // by using the first subview argument as the layout.
-  typedef Kokkos::LayoutTileLeft<N0,N1,true> SrcLayout ;
+  typedef Kokkos::LayoutTileLeft<N0, N1, true> SrcLayout;
 
-  return Kokkos::View< T[N0][N1] , LayoutLeft , P... >
-    ( src , SrcLayout() , i_tile0 , i_tile1 );
+  return Kokkos::View<T[N0][N1], LayoutLeft, P...>(src, SrcLayout(), i_tile0,
+                                                   i_tile1);
 }
 
-#endif // KOKKOS_ENABLE_DEPRECATED_CODE
+#endif  // KOKKOS_ENABLE_DEPRECATED_CODE
 // ===============================================================================
 
 } /* namespace Kokkos */
@@ -247,4 +232,3 @@ tile_subview( const Kokkos::View<T**,Kokkos::LayoutTileLeft<N0,N1,true>,P...> &
 //----------------------------------------------------------------------------
 
 #endif /* #ifndef KOKKOS_EXPERIENTAL_VIEWTILE_HPP */
-
diff --git a/lib/kokkos/core/src/impl/Kokkos_ViewUniformType.hpp b/lib/kokkos/core/src/impl/Kokkos_ViewUniformType.hpp
index 1d2dbfcf0d..7ce3a532b4 100644
--- a/lib/kokkos/core/src/impl/Kokkos_ViewUniformType.hpp
+++ b/lib/kokkos/core/src/impl/Kokkos_ViewUniformType.hpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -46,56 +47,77 @@
 
 namespace Kokkos {
 namespace Impl {
-  template< class ScalarType, int Rank>
-  struct ViewScalarToDataType {
-    typedef typename ViewScalarToDataType<ScalarType,Rank-1>::type* type;
-  };
+template <class ScalarType, int Rank>
+struct ViewScalarToDataType {
+  typedef typename ViewScalarToDataType<ScalarType, Rank - 1>::type* type;
+};
 
-  template< class ScalarType>
-  struct ViewScalarToDataType<ScalarType,0> {
-    typedef ScalarType type;
-  };
+template <class ScalarType>
+struct ViewScalarToDataType<ScalarType, 0> {
+  typedef ScalarType type;
+};
 
-  template< class LayoutType, int Rank>
-  struct ViewUniformLayout {
-    typedef LayoutType array_layout;
-  };
+template <class LayoutType, int Rank>
+struct ViewUniformLayout {
+  typedef LayoutType array_layout;
+};
 
-  template< class LayoutType>
-  struct ViewUniformLayout<LayoutType, 0> {
-    typedef Kokkos::LayoutLeft array_layout;
-  };
+template <class LayoutType>
+struct ViewUniformLayout<LayoutType, 0> {
+  typedef Kokkos::LayoutLeft array_layout;
+};
 
-  template<>
-  struct ViewUniformLayout<Kokkos::LayoutRight, 1> {
-    typedef Kokkos::LayoutLeft array_layout;
-  };
+template <>
+struct ViewUniformLayout<Kokkos::LayoutRight, 1> {
+  typedef Kokkos::LayoutLeft array_layout;
+};
 
-  template< class ViewType , int Traits>
-  struct ViewUniformType {
-    typedef typename ViewType::data_type data_type;
-    typedef typename std::add_const<typename ViewType::data_type>::type const_data_type;
-    typedef typename ViewScalarToDataType<typename ViewType::value_type,ViewType::rank>::type runtime_data_type;
-    typedef typename ViewScalarToDataType<typename std::add_const<typename ViewType::value_type>::type,ViewType::rank>::type runtime_const_data_type;
+template <class ViewType, int Traits>
+struct ViewUniformType {
+  typedef typename ViewType::data_type data_type;
+  typedef typename std::add_const<typename ViewType::data_type>::type
+      const_data_type;
+  typedef typename ViewScalarToDataType<typename ViewType::value_type,
+                                        ViewType::rank>::type runtime_data_type;
+  typedef typename ViewScalarToDataType<
+      typename std::add_const<typename ViewType::value_type>::type,
+      ViewType::rank>::type runtime_const_data_type;
 
-    typedef typename ViewUniformLayout<typename ViewType::array_layout, ViewType::rank>::array_layout array_layout;
+  typedef typename ViewUniformLayout<typename ViewType::array_layout,
+                                     ViewType::rank>::array_layout array_layout;
 
-    typedef typename ViewType::device_type device_type;
-    typedef typename Kokkos::Device<typename device_type::execution_space,Kokkos::AnonymousSpace> anonymous_device_type;
+  typedef typename ViewType::device_type device_type;
+  typedef typename Kokkos::Device<typename device_type::execution_space,
+                                  Kokkos::AnonymousSpace>
+      anonymous_device_type;
 
-    typedef typename Kokkos::MemoryTraits<Traits> memory_traits;
-    typedef Kokkos::View<data_type,array_layout,device_type,memory_traits> type;
-    typedef Kokkos::View<const_data_type,array_layout,device_type,memory_traits> const_type;
-    typedef Kokkos::View<runtime_data_type,array_layout,device_type,memory_traits> runtime_type;
-    typedef Kokkos::View<runtime_const_data_type,array_layout,device_type,memory_traits> runtime_const_type;
-
-    typedef Kokkos::View<data_type,array_layout,anonymous_device_type,memory_traits> nomemspace_type;
-    typedef Kokkos::View<const_data_type,array_layout,anonymous_device_type,memory_traits> const_nomemspace_type;
-    typedef Kokkos::View<runtime_data_type,array_layout,anonymous_device_type,memory_traits> runtime_nomemspace_type;
-    typedef Kokkos::View<runtime_const_data_type,array_layout,anonymous_device_type,memory_traits> runtime_const_nomemspace_type;
-  };
-}
-}
+  typedef typename Kokkos::MemoryTraits<Traits> memory_traits;
+  typedef Kokkos::View<data_type, array_layout, device_type, memory_traits>
+      type;
+  typedef Kokkos::View<const_data_type, array_layout, device_type,
+                       memory_traits>
+      const_type;
+  typedef Kokkos::View<runtime_data_type, array_layout, device_type,
+                       memory_traits>
+      runtime_type;
+  typedef Kokkos::View<runtime_const_data_type, array_layout, device_type,
+                       memory_traits>
+      runtime_const_type;
 
+  typedef Kokkos::View<data_type, array_layout, anonymous_device_type,
+                       memory_traits>
+      nomemspace_type;
+  typedef Kokkos::View<const_data_type, array_layout, anonymous_device_type,
+                       memory_traits>
+      const_nomemspace_type;
+  typedef Kokkos::View<runtime_data_type, array_layout, anonymous_device_type,
+                       memory_traits>
+      runtime_nomemspace_type;
+  typedef Kokkos::View<runtime_const_data_type, array_layout,
+                       anonymous_device_type, memory_traits>
+      runtime_const_nomemspace_type;
+};
+}  // namespace Impl
+}  // namespace Kokkos
 
 #endif
diff --git a/lib/kokkos/core/src/impl/Kokkos_Volatile_Load.hpp b/lib/kokkos/core/src/impl/Kokkos_Volatile_Load.hpp
index f36ffc8add..3626a1f17c 100644
--- a/lib/kokkos/core/src/impl/Kokkos_Volatile_Load.hpp
+++ b/lib/kokkos/core/src/impl/Kokkos_Volatile_Load.hpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -41,12 +42,11 @@
 //@HEADER
 */
 
-#if defined( KOKKOS_ATOMIC_HPP ) && ! defined( KOKKOS_VOLATILE_LOAD_HPP )
+#if defined(KOKKOS_ATOMIC_HPP) && !defined(KOKKOS_VOLATILE_LOAD_HPP)
 #define KOKKOS_VOLATILE_LOAD_HPP
 
-#if defined( __GNUC__ ) /* GNU C   */ || \
-    defined( __GNUG__ ) /* GNU C++ */ || \
-    defined( __clang__ )
+#if defined(__GNUC__) /* GNU C   */ || defined(__GNUG__) /* GNU C++ */ || \
+    defined(__clang__)
 
 #define KOKKOS_IMPL_MAY_ALIAS __attribute__((__may_alias__))
 
@@ -61,13 +61,11 @@ namespace Kokkos {
 //----------------------------------------------------------------------------
 
 template <typename T>
-KOKKOS_FORCEINLINE_FUNCTION
-T volatile_load(T const volatile * const src_ptr)
-{
+KOKKOS_FORCEINLINE_FUNCTION T volatile_load(T const volatile* const src_ptr) {
   typedef uint64_t KOKKOS_IMPL_MAY_ALIAS T64;
   typedef uint32_t KOKKOS_IMPL_MAY_ALIAS T32;
   typedef uint16_t KOKKOS_IMPL_MAY_ALIAS T16;
-  typedef uint8_t  KOKKOS_IMPL_MAY_ALIAS T8;
+  typedef uint8_t KOKKOS_IMPL_MAY_ALIAS T8;
 
   enum {
     NUM_8  = sizeof(T),
@@ -77,50 +75,49 @@ T volatile_load(T const volatile * const src_ptr)
   };
 
   union {
-    T   const volatile * const ptr;
-    T64 const volatile * const ptr64;
-    T32 const volatile * const ptr32;
-    T16 const volatile * const ptr16;
-    T8  const volatile * const ptr8;
+    T const volatile* const ptr;
+    T64 const volatile* const ptr64;
+    T32 const volatile* const ptr32;
+    T16 const volatile* const ptr16;
+    T8 const volatile* const ptr8;
   } src = {src_ptr};
 
   T result;
 
   union {
-    T   * const ptr;
-    T64 * const ptr64;
-    T32 * const ptr32;
-    T16 * const ptr16;
-    T8  * const ptr8;
+    T* const ptr;
+    T64* const ptr64;
+    T32* const ptr32;
+    T16* const ptr16;
+    T8* const ptr8;
   } dst = {&result};
 
-  for (int i=0; i < NUM_64; ++i) {
+  for (int i = 0; i < NUM_64; ++i) {
     dst.ptr64[i] = src.ptr64[i];
   }
 
-  if ( NUM_64*2 < NUM_32 ) {
-    dst.ptr32[NUM_64*2] = src.ptr32[NUM_64*2];
+  if (NUM_64 * 2 < NUM_32) {
+    dst.ptr32[NUM_64 * 2] = src.ptr32[NUM_64 * 2];
   }
 
-  if ( NUM_32*2 < NUM_16 ) {
-    dst.ptr16[NUM_32*2] = src.ptr16[NUM_32*2];
+  if (NUM_32 * 2 < NUM_16) {
+    dst.ptr16[NUM_32 * 2] = src.ptr16[NUM_32 * 2];
   }
 
-  if ( NUM_16*2 < NUM_8 ) {
-    dst.ptr8[NUM_16*2] = src.ptr8[NUM_16*2];
+  if (NUM_16 * 2 < NUM_8) {
+    dst.ptr8[NUM_16 * 2] = src.ptr8[NUM_16 * 2];
   }
 
   return result;
 }
 
 template <typename T>
-KOKKOS_FORCEINLINE_FUNCTION
-void volatile_store(T volatile * const dst_ptr, T const volatile * const src_ptr)
-{
+KOKKOS_FORCEINLINE_FUNCTION void volatile_store(
+    T volatile* const dst_ptr, T const volatile* const src_ptr) {
   typedef uint64_t KOKKOS_IMPL_MAY_ALIAS T64;
   typedef uint32_t KOKKOS_IMPL_MAY_ALIAS T32;
   typedef uint16_t KOKKOS_IMPL_MAY_ALIAS T16;
-  typedef uint8_t  KOKKOS_IMPL_MAY_ALIAS T8;
+  typedef uint8_t KOKKOS_IMPL_MAY_ALIAS T8;
 
   enum {
     NUM_8  = sizeof(T),
@@ -130,46 +127,45 @@ void volatile_store(T volatile * const dst_ptr, T const volatile * const src_ptr
   };
 
   union {
-    T   const volatile * const ptr;
-    T64 const volatile * const ptr64;
-    T32 const volatile * const ptr32;
-    T16 const volatile * const ptr16;
-    T8  const volatile * const ptr8;
+    T const volatile* const ptr;
+    T64 const volatile* const ptr64;
+    T32 const volatile* const ptr32;
+    T16 const volatile* const ptr16;
+    T8 const volatile* const ptr8;
   } src = {src_ptr};
 
   union {
-    T   volatile * const ptr;
-    T64 volatile * const ptr64;
-    T32 volatile * const ptr32;
-    T16 volatile * const ptr16;
-    T8  volatile * const ptr8;
+    T volatile* const ptr;
+    T64 volatile* const ptr64;
+    T32 volatile* const ptr32;
+    T16 volatile* const ptr16;
+    T8 volatile* const ptr8;
   } dst = {dst_ptr};
 
-  for (int i=0; i < NUM_64; ++i) {
+  for (int i = 0; i < NUM_64; ++i) {
     dst.ptr64[i] = src.ptr64[i];
   }
 
-  if ( NUM_64*2 < NUM_32 ) {
-    dst.ptr32[NUM_64*2] = src.ptr32[NUM_64*2];
+  if (NUM_64 * 2 < NUM_32) {
+    dst.ptr32[NUM_64 * 2] = src.ptr32[NUM_64 * 2];
   }
 
-  if ( NUM_32*2 < NUM_16 ) {
-    dst.ptr16[NUM_32*2] = src.ptr16[NUM_32*2];
+  if (NUM_32 * 2 < NUM_16) {
+    dst.ptr16[NUM_32 * 2] = src.ptr16[NUM_32 * 2];
   }
 
-  if ( NUM_16*2 < NUM_8 ) {
-    dst.ptr8[NUM_16*2] = src.ptr8[NUM_16*2];
+  if (NUM_16 * 2 < NUM_8) {
+    dst.ptr8[NUM_16 * 2] = src.ptr8[NUM_16 * 2];
   }
 }
 
 template <typename T>
-KOKKOS_FORCEINLINE_FUNCTION
-void volatile_store(T volatile * const dst_ptr, T const * const src_ptr)
-{
+KOKKOS_FORCEINLINE_FUNCTION void volatile_store(T volatile* const dst_ptr,
+                                                T const* const src_ptr) {
   typedef uint64_t KOKKOS_IMPL_MAY_ALIAS T64;
   typedef uint32_t KOKKOS_IMPL_MAY_ALIAS T32;
   typedef uint16_t KOKKOS_IMPL_MAY_ALIAS T16;
-  typedef uint8_t  KOKKOS_IMPL_MAY_ALIAS T8;
+  typedef uint8_t KOKKOS_IMPL_MAY_ALIAS T8;
 
   enum {
     NUM_8  = sizeof(T),
@@ -179,62 +175,61 @@ void volatile_store(T volatile * const dst_ptr, T const * const src_ptr)
   };
 
   union {
-    T   const * const ptr;
-    T64 const * const ptr64;
-    T32 const * const ptr32;
-    T16 const * const ptr16;
-    T8  const * const ptr8;
+    T const* const ptr;
+    T64 const* const ptr64;
+    T32 const* const ptr32;
+    T16 const* const ptr16;
+    T8 const* const ptr8;
   } src = {src_ptr};
 
   union {
-    T   volatile * const ptr;
-    T64 volatile * const ptr64;
-    T32 volatile * const ptr32;
-    T16 volatile * const ptr16;
-    T8  volatile * const ptr8;
+    T volatile* const ptr;
+    T64 volatile* const ptr64;
+    T32 volatile* const ptr32;
+    T16 volatile* const ptr16;
+    T8 volatile* const ptr8;
   } dst = {dst_ptr};
 
-  for (int i=0; i < NUM_64; ++i) {
+  for (int i = 0; i < NUM_64; ++i) {
     dst.ptr64[i] = src.ptr64[i];
   }
 
-  if ( NUM_64*2 < NUM_32 ) {
-    dst.ptr32[NUM_64*2] = src.ptr32[NUM_64*2];
+  if (NUM_64 * 2 < NUM_32) {
+    dst.ptr32[NUM_64 * 2] = src.ptr32[NUM_64 * 2];
   }
 
-  if ( NUM_32*2 < NUM_16 ) {
-    dst.ptr16[NUM_32*2] = src.ptr16[NUM_32*2];
+  if (NUM_32 * 2 < NUM_16) {
+    dst.ptr16[NUM_32 * 2] = src.ptr16[NUM_32 * 2];
   }
 
-  if ( NUM_16*2 < NUM_8 ) {
-    dst.ptr8[NUM_16*2] = src.ptr8[NUM_16*2];
+  if (NUM_16 * 2 < NUM_8) {
+    dst.ptr8[NUM_16 * 2] = src.ptr8[NUM_16 * 2];
   }
 }
 
 template <typename T>
-KOKKOS_FORCEINLINE_FUNCTION
-void volatile_store(T volatile * dst_ptr, T const volatile & src)
-{ volatile_store(dst_ptr, &src); }
+KOKKOS_FORCEINLINE_FUNCTION void volatile_store(T volatile* dst_ptr,
+                                                T const volatile& src) {
+  volatile_store(dst_ptr, &src);
+}
 
 template <typename T>
-KOKKOS_FORCEINLINE_FUNCTION
-void volatile_store(T volatile * dst_ptr, T const & src)
-{ volatile_store(dst_ptr, &src); }
+KOKKOS_FORCEINLINE_FUNCTION void volatile_store(T volatile* dst_ptr,
+                                                T const& src) {
+  volatile_store(dst_ptr, &src);
+}
 
 template <typename T>
-KOKKOS_FORCEINLINE_FUNCTION
-T safe_load(T const * const ptr)
-{
-#if !defined( __MIC__ )
+KOKKOS_FORCEINLINE_FUNCTION T safe_load(T const* const ptr) {
+#if !defined(__MIC__)
   return *ptr;
 #else
   return volatile_load(ptr);
 #endif
 }
 
-} // namespace kokkos
+}  // namespace Kokkos
 
 #undef KOKKOS_IMPL_MAY_ALIAS
 
 #endif
-
diff --git a/lib/kokkos/core/src/impl/Kokkos_hwloc.cpp b/lib/kokkos/core/src/impl/Kokkos_hwloc.cpp
index 423944962b..04507b0984 100644
--- a/lib/kokkos/core/src/impl/Kokkos_hwloc.cpp
+++ b/lib/kokkos/core/src/impl/Kokkos_hwloc.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -59,147 +60,168 @@ namespace Kokkos {
 namespace hwloc {
 
 /* Return 0 if asynchronous, 1 if synchronous and include process. */
-unsigned thread_mapping( const char * const label ,
-                         const bool allow_async ,
-                         unsigned & thread_count ,
-                         unsigned & use_numa_count ,
-                         unsigned & use_cores_per_numa ,
-                         std::pair<unsigned,unsigned> threads_coord[] )
-{
-  const bool     hwloc_avail            = Kokkos::hwloc::available();
-  const unsigned avail_numa_count       = hwloc_avail ? hwloc::get_available_numa_count() : 1 ;
-  const unsigned avail_cores_per_numa   = hwloc_avail ? hwloc::get_available_cores_per_numa() : thread_count ;
-  const unsigned avail_threads_per_core = hwloc_avail ? hwloc::get_available_threads_per_core() : 1 ;
+unsigned thread_mapping(const char* const label, const bool allow_async,
+                        unsigned& thread_count, unsigned& use_numa_count,
+                        unsigned& use_cores_per_numa,
+                        std::pair<unsigned, unsigned> threads_coord[]) {
+  const bool hwloc_avail = Kokkos::hwloc::available();
+  const unsigned avail_numa_count =
+      hwloc_avail ? hwloc::get_available_numa_count() : 1;
+  const unsigned avail_cores_per_numa =
+      hwloc_avail ? hwloc::get_available_cores_per_numa() : thread_count;
+  const unsigned avail_threads_per_core =
+      hwloc_avail ? hwloc::get_available_threads_per_core() : 1;
 
   // (numa,core) coordinate of the process:
-  const std::pair<unsigned,unsigned> proc_coord = Kokkos::hwloc::get_this_thread_coordinate();
+  const std::pair<unsigned, unsigned> proc_coord =
+      Kokkos::hwloc::get_this_thread_coordinate();
 
   //------------------------------------------------------------------------
   // Defaults for unspecified inputs:
 
-  if ( ! use_numa_count ) {
+  if (!use_numa_count) {
     // Default to use all NUMA regions
-    use_numa_count = ! thread_count ? avail_numa_count : (
-                       thread_count < avail_numa_count ? thread_count : avail_numa_count );
+    use_numa_count = !thread_count
+                         ? avail_numa_count
+                         : (thread_count < avail_numa_count ? thread_count
+                                                            : avail_numa_count);
   }
 
-  if ( ! use_cores_per_numa ) {
-    // Default to use all but one core if asynchronous, all cores if synchronous.
-    const unsigned threads_per_numa = thread_count / use_numa_count ;
+  if (!use_cores_per_numa) {
+    // Default to use all but one core if asynchronous, all cores if
+    // synchronous.
+    const unsigned threads_per_numa = thread_count / use_numa_count;
 
-    use_cores_per_numa = ! threads_per_numa ? avail_cores_per_numa - ( allow_async ? 1 : 0 ) : (
-                           threads_per_numa < avail_cores_per_numa ? threads_per_numa : avail_cores_per_numa );
+    use_cores_per_numa =
+        !threads_per_numa
+            ? avail_cores_per_numa - (allow_async ? 1 : 0)
+            : (threads_per_numa < avail_cores_per_numa ? threads_per_numa
+                                                       : avail_cores_per_numa);
   }
 
-  if ( ! thread_count ) {
-    thread_count = use_numa_count * use_cores_per_numa * avail_threads_per_core ;
+  if (!thread_count) {
+    thread_count = use_numa_count * use_cores_per_numa * avail_threads_per_core;
   }
 
   //------------------------------------------------------------------------
   // Input verification:
 
-  const bool valid_numa      = use_numa_count <= avail_numa_count ;
-  const bool valid_cores     = use_cores_per_numa &&
-                               use_cores_per_numa <= avail_cores_per_numa ;
-  const bool valid_threads   = thread_count &&
-                               thread_count <= use_numa_count * use_cores_per_numa * avail_threads_per_core ;
-  const bool balanced_numa   = ! ( thread_count % use_numa_count );
-  const bool balanced_cores  = ! ( thread_count % ( use_numa_count * use_cores_per_numa ) );
+  const bool valid_numa = use_numa_count <= avail_numa_count;
+  const bool valid_cores =
+      use_cores_per_numa && use_cores_per_numa <= avail_cores_per_numa;
+  const bool valid_threads =
+      thread_count && thread_count <= use_numa_count * use_cores_per_numa *
+                                          avail_threads_per_core;
+  const bool balanced_numa = !(thread_count % use_numa_count);
+  const bool balanced_cores =
+      !(thread_count % (use_numa_count * use_cores_per_numa));
 
-  const bool valid_input = valid_numa && valid_cores && valid_threads && balanced_numa && balanced_cores ;
+  const bool valid_input = valid_numa && valid_cores && valid_threads &&
+                           balanced_numa && balanced_cores;
 
-  if ( ! valid_input ) {
+  if (!valid_input) {
+    std::ostringstream msg;
 
-    std::ostringstream msg ;
+    msg << label << " HWLOC ERROR(s)";
 
-    msg << label << " HWLOC ERROR(s)" ;
-
-    if ( ! valid_threads ) {
-      msg << " : thread_count(" << thread_count
-          << ") exceeds capacity("
+    if (!valid_threads) {
+      msg << " : thread_count(" << thread_count << ") exceeds capacity("
           << use_numa_count * use_cores_per_numa * avail_threads_per_core
-          << ")" ;
+          << ")";
     }
-    if ( ! valid_numa ) {
-      msg << " : use_numa_count(" << use_numa_count
-          << ") exceeds capacity(" << avail_numa_count << ")" ;
+    if (!valid_numa) {
+      msg << " : use_numa_count(" << use_numa_count << ") exceeds capacity("
+          << avail_numa_count << ")";
     }
-    if ( ! valid_cores ) {
+    if (!valid_cores) {
       msg << " : use_cores_per_numa(" << use_cores_per_numa
-          << ") exceeds capacity(" << avail_cores_per_numa << ")" ;
+          << ") exceeds capacity(" << avail_cores_per_numa << ")";
     }
-    if ( ! balanced_numa ) {
-      msg << " : thread_count(" << thread_count
-          << ") imbalanced among numa(" << use_numa_count << ")" ;
+    if (!balanced_numa) {
+      msg << " : thread_count(" << thread_count << ") imbalanced among numa("
+          << use_numa_count << ")";
     }
-    if ( ! balanced_cores ) {
-      msg << " : thread_count(" << thread_count
-          << ") imbalanced among cores(" << use_numa_count * use_cores_per_numa << ")" ;
+    if (!balanced_cores) {
+      msg << " : thread_count(" << thread_count << ") imbalanced among cores("
+          << use_numa_count * use_cores_per_numa << ")";
     }
 
-    Kokkos::Impl::throw_runtime_exception( msg.str() );
+    Kokkos::Impl::throw_runtime_exception(msg.str());
   }
 
   const unsigned thread_spawn_synchronous =
-    ( allow_async &&
-      1 < thread_count &&
-      ( use_numa_count     < avail_numa_count ||
-        use_cores_per_numa < avail_cores_per_numa ) )
-     ? 0 /* asyncronous */
-     : 1 /* synchronous, threads_coord[0] is process core */ ;
+      (allow_async && 1 < thread_count &&
+       (use_numa_count < avail_numa_count ||
+        use_cores_per_numa < avail_cores_per_numa))
+          ? 0 /* asyncronous */
+          : 1 /* synchronous, threads_coord[0] is process core */;
 
   // Determine binding coordinates for to-be-spawned threads so that
   // threads may be bound to cores as they are spawned.
 
-  const unsigned threads_per_core = thread_count / ( use_numa_count * use_cores_per_numa );
+  const unsigned threads_per_core =
+      thread_count / (use_numa_count * use_cores_per_numa);
 
-  if ( thread_spawn_synchronous ) {
+  if (thread_spawn_synchronous) {
     // Working synchronously and include process core as threads_coord[0].
     // Swap the NUMA coordinate of the process core with 0
     // Swap the CORE coordinate of the process core with 0
-    for ( unsigned i = 0 , inuma = avail_numa_count - use_numa_count ; inuma < avail_numa_count ; ++inuma ) {
-      const unsigned numa_coord = 0 == inuma ? proc_coord.first : ( proc_coord.first == inuma ? 0 : inuma );
-      for ( unsigned icore = avail_cores_per_numa - use_cores_per_numa ; icore < avail_cores_per_numa ; ++icore ) {
-        const unsigned core_coord = 0 == icore ? proc_coord.second : ( proc_coord.second == icore ? 0 : icore );
-        for ( unsigned ith = 0 ; ith < threads_per_core ; ++ith , ++i ) {
-          threads_coord[i].first  = numa_coord ;
-          threads_coord[i].second = core_coord ;
+    for (unsigned i = 0, inuma = avail_numa_count - use_numa_count;
+         inuma < avail_numa_count; ++inuma) {
+      const unsigned numa_coord = 0 == inuma
+                                      ? proc_coord.first
+                                      : (proc_coord.first == inuma ? 0 : inuma);
+      for (unsigned icore = avail_cores_per_numa - use_cores_per_numa;
+           icore < avail_cores_per_numa; ++icore) {
+        const unsigned core_coord =
+            0 == icore ? proc_coord.second
+                       : (proc_coord.second == icore ? 0 : icore);
+        for (unsigned ith = 0; ith < threads_per_core; ++ith, ++i) {
+          threads_coord[i].first  = numa_coord;
+          threads_coord[i].second = core_coord;
         }
       }
     }
-  }
-  else if ( use_numa_count < avail_numa_count ) {
+  } else if (use_numa_count < avail_numa_count) {
     // Working asynchronously and omit the process' NUMA region from the pool.
-    // Swap the NUMA coordinate of the process core with ( ( avail_numa_count - use_numa_count ) - 1 )
-    const unsigned numa_coord_swap = ( avail_numa_count - use_numa_count ) - 1 ;
-    for ( unsigned i = 0 , inuma = avail_numa_count - use_numa_count ; inuma < avail_numa_count ; ++inuma ) {
-      const unsigned numa_coord = proc_coord.first == inuma ? numa_coord_swap : inuma ;
-      for ( unsigned icore = avail_cores_per_numa - use_cores_per_numa ; icore < avail_cores_per_numa ; ++icore ) {
-        const unsigned core_coord = icore ;
-        for ( unsigned ith = 0 ; ith < threads_per_core ; ++ith , ++i ) {
-          threads_coord[i].first  = numa_coord ;
-          threads_coord[i].second = core_coord ;
+    // Swap the NUMA coordinate of the process core with ( ( avail_numa_count -
+    // use_numa_count ) - 1 )
+    const unsigned numa_coord_swap = (avail_numa_count - use_numa_count) - 1;
+    for (unsigned i = 0, inuma = avail_numa_count - use_numa_count;
+         inuma < avail_numa_count; ++inuma) {
+      const unsigned numa_coord =
+          proc_coord.first == inuma ? numa_coord_swap : inuma;
+      for (unsigned icore = avail_cores_per_numa - use_cores_per_numa;
+           icore < avail_cores_per_numa; ++icore) {
+        const unsigned core_coord = icore;
+        for (unsigned ith = 0; ith < threads_per_core; ++ith, ++i) {
+          threads_coord[i].first  = numa_coord;
+          threads_coord[i].second = core_coord;
         }
       }
     }
-  }
-  else if ( use_cores_per_numa < avail_cores_per_numa ) {
+  } else if (use_cores_per_numa < avail_cores_per_numa) {
     // Working asynchronously and omit the process' core from the pool.
-    // Swap the CORE coordinate of the process core with ( ( avail_cores_per_numa - use_cores_per_numa ) - 1 )
-    const unsigned core_coord_swap = ( avail_cores_per_numa - use_cores_per_numa ) - 1 ;
-    for ( unsigned i = 0 , inuma = avail_numa_count - use_numa_count ; inuma < avail_numa_count ; ++inuma ) {
-      const unsigned numa_coord = inuma ;
-      for ( unsigned icore = avail_cores_per_numa - use_cores_per_numa ; icore < avail_cores_per_numa ; ++icore ) {
-        const unsigned core_coord = proc_coord.second == icore ? core_coord_swap : icore ;
-        for ( unsigned ith = 0 ; ith < threads_per_core ; ++ith , ++i ) {
-          threads_coord[i].first  = numa_coord ;
-          threads_coord[i].second = core_coord ;
+    // Swap the CORE coordinate of the process core with ( (
+    // avail_cores_per_numa - use_cores_per_numa ) - 1 )
+    const unsigned core_coord_swap =
+        (avail_cores_per_numa - use_cores_per_numa) - 1;
+    for (unsigned i = 0, inuma = avail_numa_count - use_numa_count;
+         inuma < avail_numa_count; ++inuma) {
+      const unsigned numa_coord = inuma;
+      for (unsigned icore = avail_cores_per_numa - use_cores_per_numa;
+           icore < avail_cores_per_numa; ++icore) {
+        const unsigned core_coord =
+            proc_coord.second == icore ? core_coord_swap : icore;
+        for (unsigned ith = 0; ith < threads_per_core; ++ith, ++i) {
+          threads_coord[i].first  = numa_coord;
+          threads_coord[i].second = core_coord;
         }
       }
     }
   }
 
-  return thread_spawn_synchronous ;
+  return thread_spawn_synchronous;
 }
 
 } /* namespace hwloc */
@@ -208,7 +230,7 @@ unsigned thread_mapping( const char * const label ,
 /*--------------------------------------------------------------------------*/
 /*--------------------------------------------------------------------------*/
 
-#if defined( KOKKOS_ENABLE_HWLOC )
+#if defined(KOKKOS_ENABLE_HWLOC)
 
 #include <iostream>
 #include <sstream>
@@ -220,10 +242,11 @@ unsigned thread_mapping( const char * const label ,
 /* Hardware locality library: http://www.open-mpi.org/projects/hwloc/ */
 #include <hwloc.h>
 
-#define  REQUIRED_HWLOC_API_VERSION  0x000010300
+#define REQUIRED_HWLOC_API_VERSION 0x000010300
 
 #if HWLOC_API_VERSION < REQUIRED_HWLOC_API_VERSION
-#error "Requires  http://www.open-mpi.org/projects/hwloc/  Version 1.3 or greater"
+#error \
+    "Requires  http://www.open-mpi.org/projects/hwloc/  Version 1.3 or greater"
 #endif
 
 /*--------------------------------------------------------------------------*/
@@ -234,458 +257,453 @@ namespace {
 
 #if DEBUG_PRINT
 
-inline
-void print_bitmap( std::ostream & s , const hwloc_const_bitmap_t bitmap )
-{
-  s << "{" ;
-  for ( int i = hwloc_bitmap_first( bitmap ) ;
-        -1 != i ; i = hwloc_bitmap_next( bitmap , i ) ) {
-    s << " " << i ;
+inline void print_bitmap(std::ostream& s, const hwloc_const_bitmap_t bitmap) {
+  s << "{";
+  for (int i = hwloc_bitmap_first(bitmap); - 1 != i;
+       i     = hwloc_bitmap_next(bitmap, i)) {
+    s << " " << i;
   }
-  s << " }" ;
+  s << " }";
 }
 
 #endif
 
 enum { MAX_CORE = 1024 };
 
-std::pair<unsigned,unsigned> s_core_topology(0,0);
-unsigned                     s_core_capacity(0);
-hwloc_topology_t             s_hwloc_topology(0);
-hwloc_bitmap_t               s_hwloc_location(0);
-hwloc_bitmap_t               s_process_binding(0);
-hwloc_bitmap_t               s_core[ MAX_CORE ];
-bool                         s_can_bind_threads(true);
+std::pair<unsigned, unsigned> s_core_topology(0, 0);
+unsigned s_core_capacity(0);
+hwloc_topology_t s_hwloc_topology(0);
+hwloc_bitmap_t s_hwloc_location(0);
+hwloc_bitmap_t s_process_binding(0);
+hwloc_bitmap_t s_core[MAX_CORE];
+bool s_can_bind_threads(true);
 
 struct Sentinel {
   ~Sentinel();
   Sentinel();
 };
 
-bool sentinel()
-{
-  static Sentinel self ;
+bool sentinel() {
+  static Sentinel self;
 
-  if ( 0 == s_hwloc_topology ) {
-    std::cerr << "Kokkos::hwloc ERROR : Called after return from main()" << std::endl ;
+  if (0 == s_hwloc_topology) {
+    std::cerr << "Kokkos::hwloc ERROR : Called after return from main()"
+              << std::endl;
     std::cerr.flush();
   }
 
-  return 0 != s_hwloc_topology ;
+  return 0 != s_hwloc_topology;
 }
 
-Sentinel::~Sentinel()
-{
-  hwloc_topology_destroy( s_hwloc_topology );
-  hwloc_bitmap_free( s_process_binding );
-  hwloc_bitmap_free( s_hwloc_location );
+Sentinel::~Sentinel() {
+  hwloc_topology_destroy(s_hwloc_topology);
+  hwloc_bitmap_free(s_process_binding);
+  hwloc_bitmap_free(s_hwloc_location);
 
-  s_core_topology.first  = 0 ;
-  s_core_topology.second = 0 ;
-  s_core_capacity   = 0 ;
-  s_hwloc_topology  = 0 ;
-  s_hwloc_location  = 0 ;
-  s_process_binding = 0 ;
+  s_core_topology.first  = 0;
+  s_core_topology.second = 0;
+  s_core_capacity        = 0;
+  s_hwloc_topology       = 0;
+  s_hwloc_location       = 0;
+  s_process_binding      = 0;
 }
 
-Sentinel::Sentinel()
-{
+Sentinel::Sentinel() {
 #if defined(__MIC__)
-  static const bool remove_core_0 = true ;
+  static const bool remove_core_0 = true;
 #else
-  static const bool remove_core_0 = false ;
+  static const bool remove_core_0 = false;
 #endif
 
-  s_core_topology   = std::pair<unsigned,unsigned>(0,0);
-  s_core_capacity   = 0 ;
-  s_hwloc_topology  = 0 ;
-  s_hwloc_location  = 0 ;
-  s_process_binding = 0 ;
+  s_core_topology   = std::pair<unsigned, unsigned>(0, 0);
+  s_core_capacity   = 0;
+  s_hwloc_topology  = 0;
+  s_hwloc_location  = 0;
+  s_process_binding = 0;
 
-  for ( unsigned i = 0 ; i < MAX_CORE ; ++i ) s_core[i] = 0 ;
+  for (unsigned i = 0; i < MAX_CORE; ++i) s_core[i] = 0;
 
-  hwloc_topology_init( & s_hwloc_topology );
-  hwloc_topology_load( s_hwloc_topology );
+  hwloc_topology_init(&s_hwloc_topology);
+  hwloc_topology_load(s_hwloc_topology);
 
   s_hwloc_location  = hwloc_bitmap_alloc();
   s_process_binding = hwloc_bitmap_alloc();
 
-  hwloc_get_cpubind( s_hwloc_topology , s_process_binding ,  HWLOC_CPUBIND_PROCESS );
+  hwloc_get_cpubind(s_hwloc_topology, s_process_binding, HWLOC_CPUBIND_PROCESS);
 
-  if ( hwloc_bitmap_iszero( s_process_binding ) ) {
-    if (Kokkos::show_warnings() ) {
-      std::cerr << "WARNING: Cannot detect process binding -- ASSUMING ALL processing units" << std::endl;
+  if (hwloc_bitmap_iszero(s_process_binding)) {
+    if (Kokkos::show_warnings()) {
+      std::cerr << "WARNING: Cannot detect process binding -- ASSUMING ALL "
+                   "processing units"
+                << std::endl;
     }
-    const int pu_depth = hwloc_get_type_depth( s_hwloc_topology, HWLOC_OBJ_PU );
-    int num_pu = 1;
-    if ( pu_depth != HWLOC_TYPE_DEPTH_UNKNOWN ) {
-      num_pu = hwloc_get_nbobjs_by_depth( s_hwloc_topology, pu_depth );
-    }
-    else {
-      if (Kokkos::show_warnings() ) {
-        std::cerr << "WARNING: Cannot detect number of processing units -- ASSUMING 1 (serial)." << std::endl;
+    const int pu_depth = hwloc_get_type_depth(s_hwloc_topology, HWLOC_OBJ_PU);
+    int num_pu         = 1;
+    if (pu_depth != HWLOC_TYPE_DEPTH_UNKNOWN) {
+      num_pu = hwloc_get_nbobjs_by_depth(s_hwloc_topology, pu_depth);
+    } else {
+      if (Kokkos::show_warnings()) {
+        std::cerr << "WARNING: Cannot detect number of processing units -- "
+                     "ASSUMING 1 (serial)."
+                  << std::endl;
       }
       num_pu = 1;
     }
-    hwloc_bitmap_set_range( s_process_binding, 0, num_pu-1);
+    hwloc_bitmap_set_range(s_process_binding, 0, num_pu - 1);
     s_can_bind_threads = false;
   }
 
+  if (remove_core_0) {
+    const hwloc_obj_t core =
+        hwloc_get_obj_by_type(s_hwloc_topology, HWLOC_OBJ_CORE, 0);
 
-  if ( remove_core_0 ) {
-
-    const hwloc_obj_t core = hwloc_get_obj_by_type( s_hwloc_topology , HWLOC_OBJ_CORE , 0 );
-
-    if ( hwloc_bitmap_intersects( s_process_binding , core->cpuset ) ) {
-
+    if (hwloc_bitmap_intersects(s_process_binding, core->cpuset)) {
       hwloc_bitmap_t s_process_no_core_zero = hwloc_bitmap_alloc();
 
-      hwloc_bitmap_andnot( s_process_no_core_zero , s_process_binding , core->cpuset );
+      hwloc_bitmap_andnot(s_process_no_core_zero, s_process_binding,
+                          core->cpuset);
 
-      bool ok = 0 == hwloc_set_cpubind( s_hwloc_topology ,
-                                        s_process_no_core_zero ,
-                                        HWLOC_CPUBIND_PROCESS | HWLOC_CPUBIND_STRICT );
+      bool ok =
+          0 == hwloc_set_cpubind(s_hwloc_topology, s_process_no_core_zero,
+                                 HWLOC_CPUBIND_PROCESS | HWLOC_CPUBIND_STRICT);
 
-      if ( ok ) {
-        hwloc_get_cpubind( s_hwloc_topology , s_process_binding ,  HWLOC_CPUBIND_PROCESS );
+      if (ok) {
+        hwloc_get_cpubind(s_hwloc_topology, s_process_binding,
+                          HWLOC_CPUBIND_PROCESS);
 
-        ok = 0 != hwloc_bitmap_isequal( s_process_binding , s_process_no_core_zero );
+        ok = 0 !=
+             hwloc_bitmap_isequal(s_process_binding, s_process_no_core_zero);
       }
 
-      hwloc_bitmap_free( s_process_no_core_zero );
+      hwloc_bitmap_free(s_process_no_core_zero);
 
-      if ( Kokkos::show_warnings() && ! ok ) {
-        std::cerr << "WARNING: Kokkos::hwloc attempted and failed to move process off of core #0" << std::endl ;
+      if (Kokkos::show_warnings() && !ok) {
+        std::cerr << "WARNING: Kokkos::hwloc attempted and failed to move "
+                     "process off of core #0"
+                  << std::endl;
       }
     }
   }
 
   // Choose a hwloc object type for the NUMA level, which may not exist.
 
-  hwloc_obj_type_t root_type = HWLOC_OBJ_TYPE_MAX ;
+  hwloc_obj_type_t root_type = HWLOC_OBJ_TYPE_MAX;
 
   {
     // Object types to search, in order.
-    static const hwloc_obj_type_t candidate_root_type[] =
-      { HWLOC_OBJ_NODE     /* NUMA region     */
-      , HWLOC_OBJ_SOCKET   /* hardware socket */
-      , HWLOC_OBJ_MACHINE  /* local machine   */
-      };
+    static const hwloc_obj_type_t candidate_root_type[] = {
+        HWLOC_OBJ_NODE /* NUMA region     */
+        ,
+        HWLOC_OBJ_SOCKET /* hardware socket */
+        ,
+        HWLOC_OBJ_MACHINE /* local machine   */
+    };
 
-    enum { CANDIDATE_ROOT_TYPE_COUNT =
-             sizeof(candidate_root_type) / sizeof(hwloc_obj_type_t) };
+    enum {
+      CANDIDATE_ROOT_TYPE_COUNT =
+          sizeof(candidate_root_type) / sizeof(hwloc_obj_type_t)
+    };
 
-    for ( int k = 0 ; k < CANDIDATE_ROOT_TYPE_COUNT && HWLOC_OBJ_TYPE_MAX == root_type ; ++k ) {
-      if ( 0 < hwloc_get_nbobjs_by_type( s_hwloc_topology , candidate_root_type[k] ) ) {
-        root_type = candidate_root_type[k] ;
+    for (int k = 0;
+         k < CANDIDATE_ROOT_TYPE_COUNT && HWLOC_OBJ_TYPE_MAX == root_type;
+         ++k) {
+      if (0 <
+          hwloc_get_nbobjs_by_type(s_hwloc_topology, candidate_root_type[k])) {
+        root_type = candidate_root_type[k];
       }
     }
   }
 
   // Determine which of these 'root' types are available to this process.
-  // The process may have been bound (e.g., by MPI) to a subset of these root types.
-  // Determine current location of the master (calling) process>
+  // The process may have been bound (e.g., by MPI) to a subset of these root
+  // types. Determine current location of the master (calling) process>
 
   hwloc_bitmap_t proc_cpuset_location = hwloc_bitmap_alloc();
 
-  hwloc_get_last_cpu_location( s_hwloc_topology , proc_cpuset_location , HWLOC_CPUBIND_THREAD );
+  hwloc_get_last_cpu_location(s_hwloc_topology, proc_cpuset_location,
+                              HWLOC_CPUBIND_THREAD);
 
-  const unsigned max_root = hwloc_get_nbobjs_by_type( s_hwloc_topology , root_type );
+  const unsigned max_root =
+      hwloc_get_nbobjs_by_type(s_hwloc_topology, root_type);
 
-  unsigned root_base     = max_root ;
-  unsigned root_count    = 0 ;
-  unsigned core_per_root = 0 ;
-  unsigned pu_per_core   = 0 ;
-  bool     symmetric     = true ;
+  unsigned root_base     = max_root;
+  unsigned root_count    = 0;
+  unsigned core_per_root = 0;
+  unsigned pu_per_core   = 0;
+  bool symmetric         = true;
 
-  for ( unsigned i = 0 ; i < max_root ; ++i ) {
+  for (unsigned i = 0; i < max_root; ++i) {
+    const hwloc_obj_t root =
+        hwloc_get_obj_by_type(s_hwloc_topology, root_type, i);
 
-    const hwloc_obj_t root = hwloc_get_obj_by_type( s_hwloc_topology , root_type , i );
-
-    if ( hwloc_bitmap_intersects( s_process_binding , root->cpuset ) ) {
-
-      ++root_count ;
+    if (hwloc_bitmap_intersects(s_process_binding, root->cpuset)) {
+      ++root_count;
 
       // Remember which root (NUMA) object the master thread is running on.
       // This will be logical NUMA rank #0 for this process.
 
-      if ( hwloc_bitmap_intersects( proc_cpuset_location, root->cpuset ) ) {
-        root_base = i ;
+      if (hwloc_bitmap_intersects(proc_cpuset_location, root->cpuset)) {
+        root_base = i;
       }
 
       // Count available cores:
 
-      const unsigned max_core =
-        hwloc_get_nbobjs_inside_cpuset_by_type( s_hwloc_topology ,
-                                                root->cpuset ,
-                                                HWLOC_OBJ_CORE );
+      const unsigned max_core = hwloc_get_nbobjs_inside_cpuset_by_type(
+          s_hwloc_topology, root->cpuset, HWLOC_OBJ_CORE);
 
-      unsigned core_count = 0 ;
+      unsigned core_count = 0;
 
-      for ( unsigned j = 0 ; j < max_core ; ++j ) {
+      for (unsigned j = 0; j < max_core; ++j) {
+        const hwloc_obj_t core = hwloc_get_obj_inside_cpuset_by_type(
+            s_hwloc_topology, root->cpuset, HWLOC_OBJ_CORE, j);
 
-        const hwloc_obj_t core =
-          hwloc_get_obj_inside_cpuset_by_type( s_hwloc_topology ,
-                                               root->cpuset ,
-                                               HWLOC_OBJ_CORE , j );
-
-        // If process' cpuset intersects core's cpuset then process can access this core.
-        // Must use intersection instead of inclusion because the Intel-Phi
-        // MPI may bind the process to only one of the core's hyperthreads.
+        // If process' cpuset intersects core's cpuset then process can access
+        // this core. Must use intersection instead of inclusion because the
+        // Intel-Phi MPI may bind the process to only one of the core's
+        // hyperthreads.
         //
         // Assumption: if the process can access any hyperthread of the core
         // then it has ownership of the entire core.
         // This assumes that it would be performance-detrimental
         // to spawn more than one MPI process per core and use nested threading.
 
-        if ( hwloc_bitmap_intersects( s_process_binding , core->cpuset ) ) {
+        if (hwloc_bitmap_intersects(s_process_binding, core->cpuset)) {
+          ++core_count;
 
-          ++core_count ;
+          const unsigned pu_count = hwloc_get_nbobjs_inside_cpuset_by_type(
+              s_hwloc_topology, core->cpuset, HWLOC_OBJ_PU);
 
-          const unsigned pu_count =
-            hwloc_get_nbobjs_inside_cpuset_by_type( s_hwloc_topology ,
-                                                    core->cpuset ,
-                                                    HWLOC_OBJ_PU );
-
-          if ( pu_per_core == 0 ) pu_per_core = pu_count ;
+          if (pu_per_core == 0) pu_per_core = pu_count;
 
           // Enforce symmetry by taking the minimum:
 
-          pu_per_core = std::min( pu_per_core , pu_count );
+          pu_per_core = std::min(pu_per_core, pu_count);
 
-          if ( pu_count != pu_per_core ) symmetric = false ;
+          if (pu_count != pu_per_core) symmetric = false;
         }
       }
 
-      if ( 0 == core_per_root ) core_per_root = core_count ;
+      if (0 == core_per_root) core_per_root = core_count;
 
       // Enforce symmetry by taking the minimum:
 
-      core_per_root = std::min( core_per_root , core_count );
+      core_per_root = std::min(core_per_root, core_count);
 
-      if ( core_count != core_per_root ) symmetric = false ;
+      if (core_count != core_per_root) symmetric = false;
     }
   }
 
-  s_core_topology.first  = root_count ;
-  s_core_topology.second = core_per_root ;
-  s_core_capacity        = pu_per_core ;
+  s_core_topology.first  = root_count;
+  s_core_topology.second = core_per_root;
+  s_core_capacity        = pu_per_core;
 
   // Fill the 's_core' array for fast mapping from a core coordinate to the
   // hwloc cpuset object required for thread location querying and binding.
 
-  for ( unsigned i = 0 ; i < max_root ; ++i ) {
+  for (unsigned i = 0; i < max_root; ++i) {
+    const unsigned root_rank = (i + root_base) % max_root;
 
-    const unsigned root_rank = ( i + root_base ) % max_root ;
+    const hwloc_obj_t root =
+        hwloc_get_obj_by_type(s_hwloc_topology, root_type, root_rank);
 
-    const hwloc_obj_t root = hwloc_get_obj_by_type( s_hwloc_topology , root_type , root_rank );
+    if (hwloc_bitmap_intersects(s_process_binding, root->cpuset)) {
+      const unsigned max_core = hwloc_get_nbobjs_inside_cpuset_by_type(
+          s_hwloc_topology, root->cpuset, HWLOC_OBJ_CORE);
 
-    if ( hwloc_bitmap_intersects( s_process_binding , root->cpuset ) ) {
+      unsigned core_count = 0;
 
-      const unsigned max_core =
-        hwloc_get_nbobjs_inside_cpuset_by_type( s_hwloc_topology ,
-                                                root->cpuset ,
-                                                HWLOC_OBJ_CORE );
+      for (unsigned j = 0; j < max_core && core_count < core_per_root; ++j) {
+        const hwloc_obj_t core = hwloc_get_obj_inside_cpuset_by_type(
+            s_hwloc_topology, root->cpuset, HWLOC_OBJ_CORE, j);
 
-      unsigned core_count = 0 ;
+        if (hwloc_bitmap_intersects(s_process_binding, core->cpuset)) {
+          s_core[core_count + core_per_root * i] = core->cpuset;
 
-      for ( unsigned j = 0 ; j < max_core && core_count < core_per_root ; ++j ) {
-
-        const hwloc_obj_t core =
-          hwloc_get_obj_inside_cpuset_by_type( s_hwloc_topology ,
-                                               root->cpuset ,
-                                               HWLOC_OBJ_CORE , j );
-
-        if ( hwloc_bitmap_intersects( s_process_binding , core->cpuset ) ) {
-
-          s_core[ core_count + core_per_root * i ] = core->cpuset ;
-
-          ++core_count ;
+          ++core_count;
         }
       }
     }
   }
 
-  hwloc_bitmap_free( proc_cpuset_location );
+  hwloc_bitmap_free(proc_cpuset_location);
 
-  if ( Kokkos::show_warnings() && ! symmetric ) {
-    std::cerr << "Kokkos::hwloc WARNING: Using a symmetric subset of a non-symmetric core topology."
-              << std::endl ;
+  if (Kokkos::show_warnings() && !symmetric) {
+    std::cerr << "Kokkos::hwloc WARNING: Using a symmetric subset of a "
+                 "non-symmetric core topology."
+              << std::endl;
   }
 }
 
-
-} // namespace
+}  // namespace
 
 //----------------------------------------------------------------------------
 //----------------------------------------------------------------------------
 
-bool available()
-{ return true ; }
+bool available() { return true; }
 
-unsigned get_available_numa_count()
-{ sentinel(); return s_core_topology.first ; }
+unsigned get_available_numa_count() {
+  sentinel();
+  return s_core_topology.first;
+}
 
-unsigned get_available_cores_per_numa()
-{ sentinel(); return s_core_topology.second ; }
+unsigned get_available_cores_per_numa() {
+  sentinel();
+  return s_core_topology.second;
+}
 
-unsigned get_available_threads_per_core()
-{ sentinel(); return s_core_capacity ; }
+unsigned get_available_threads_per_core() {
+  sentinel();
+  return s_core_capacity;
+}
 
-bool can_bind_threads()
-{ sentinel(); return s_can_bind_threads; }
+bool can_bind_threads() {
+  sentinel();
+  return s_can_bind_threads;
+}
 
 //----------------------------------------------------------------------------
 //----------------------------------------------------------------------------
 
-unsigned bind_this_thread(
-  const unsigned               coordinate_count ,
-  std::pair<unsigned,unsigned> coordinate[] )
-{
-  unsigned i = 0 ;
+unsigned bind_this_thread(const unsigned coordinate_count,
+                          std::pair<unsigned, unsigned> coordinate[]) {
+  unsigned i = 0;
 
   try {
-    const std::pair<unsigned,unsigned> current = get_this_thread_coordinate();
+    const std::pair<unsigned, unsigned> current = get_this_thread_coordinate();
 
     // Match one of the requests:
-    for ( i = 0 ; i < coordinate_count && current != coordinate[i] ; ++i );
+    for (i = 0; i < coordinate_count && current != coordinate[i]; ++i)
+      ;
 
-    if ( coordinate_count == i ) {
+    if (coordinate_count == i) {
       // Match the first request (typically NUMA):
-      for ( i = 0 ; i < coordinate_count && current.first != coordinate[i].first ; ++i );
+      for (i = 0; i < coordinate_count && current.first != coordinate[i].first;
+           ++i)
+        ;
     }
 
-    if ( coordinate_count == i ) {
+    if (coordinate_count == i) {
       // Match any unclaimed request:
-      for ( i = 0 ; i < coordinate_count && ~0u == coordinate[i].first  ; ++i );
+      for (i = 0; i < coordinate_count && ~0u == coordinate[i].first; ++i)
+        ;
     }
 
-    if ( coordinate_count == i || ! bind_this_thread( coordinate[i] ) ) {
-       // Failed to bind:
-       i = ~0u ;
+    if (coordinate_count == i || !bind_this_thread(coordinate[i])) {
+      // Failed to bind:
+      i = ~0u;
     }
 
-    if ( i < coordinate_count ) {
-
+    if (i < coordinate_count) {
 #if DEBUG_PRINT
-      if ( current != coordinate[i] ) {
-        std::cout << "  bind_this_thread: rebinding from ("
-                  << current.first << ","
-                  << current.second
-                  << ") to ("
-                  << coordinate[i].first << ","
-                  << coordinate[i].second
-                  << ")" << std::endl ;
+      if (current != coordinate[i]) {
+        std::cout << "  bind_this_thread: rebinding from (" << current.first
+                  << "," << current.second << ") to (" << coordinate[i].first
+                  << "," << coordinate[i].second << ")" << std::endl;
       }
 #endif
 
-      coordinate[i].first  = ~0u ;
-      coordinate[i].second = ~0u ;
+      coordinate[i].first  = ~0u;
+      coordinate[i].second = ~0u;
     }
-  }
-  catch( ... ) {
-    i = ~0u ;
+  } catch (...) {
+    i = ~0u;
   }
 
-  return i ;
+  return i;
 }
 
-
-bool bind_this_thread( const std::pair<unsigned,unsigned> coord )
-{
-  if ( ! sentinel() ) return false ;
+bool bind_this_thread(const std::pair<unsigned, unsigned> coord) {
+  if (!sentinel()) return false;
 
 #if DEBUG_PRINT
 
-  std::cout << "Kokkos::bind_this_thread() at " ;
+  std::cout << "Kokkos::bind_this_thread() at ";
 
-  hwloc_get_last_cpu_location( s_hwloc_topology ,
-                               s_hwloc_location , HWLOC_CPUBIND_THREAD );
+  hwloc_get_last_cpu_location(s_hwloc_topology, s_hwloc_location,
+                              HWLOC_CPUBIND_THREAD);
 
-  print_bitmap( std::cout , s_hwloc_location );
+  print_bitmap(std::cout, s_hwloc_location);
 
-  std::cout << " to " ;
+  std::cout << " to ";
 
-  print_bitmap( std::cout , s_core[ coord.second + coord.first * s_core_topology.second ] );
+  print_bitmap(std::cout,
+               s_core[coord.second + coord.first * s_core_topology.second]);
 
-  std::cout << std::endl ;
+  std::cout << std::endl;
 
 #endif
 
   // As safe and fast as possible.
   // Fast-lookup by caching the coordinate -> hwloc cpuset mapping in 's_core'.
-  return coord.first  < s_core_topology.first &&
+  return coord.first < s_core_topology.first &&
          coord.second < s_core_topology.second &&
-         0 == hwloc_set_cpubind( s_hwloc_topology ,
-                                 s_core[ coord.second + coord.first * s_core_topology.second ] ,
-                                 HWLOC_CPUBIND_THREAD | HWLOC_CPUBIND_STRICT );
+         0 == hwloc_set_cpubind(
+                  s_hwloc_topology,
+                  s_core[coord.second + coord.first * s_core_topology.second],
+                  HWLOC_CPUBIND_THREAD | HWLOC_CPUBIND_STRICT);
 }
 
-bool unbind_this_thread()
-{
-  if ( ! sentinel() ) return false ;
+bool unbind_this_thread() {
+  if (!sentinel()) return false;
 
 #define HWLOC_DEBUG_PRINT 0
 
 #if HWLOC_DEBUG_PRINT
 
-  std::cout << "Kokkos::unbind_this_thread() from " ;
+  std::cout << "Kokkos::unbind_this_thread() from ";
 
-  hwloc_get_cpubind( s_hwloc_topology , s_hwloc_location , HWLOC_CPUBIND_THREAD );
+  hwloc_get_cpubind(s_hwloc_topology, s_hwloc_location, HWLOC_CPUBIND_THREAD);
 
-  print_bitmap( std::cout , s_hwloc_location );
+  print_bitmap(std::cout, s_hwloc_location);
 
 #endif
 
   const bool result =
-    s_hwloc_topology &&
-    0 == hwloc_set_cpubind( s_hwloc_topology ,
-                            s_process_binding ,
-                            HWLOC_CPUBIND_THREAD | HWLOC_CPUBIND_STRICT );
+      s_hwloc_topology &&
+      0 == hwloc_set_cpubind(s_hwloc_topology, s_process_binding,
+                             HWLOC_CPUBIND_THREAD | HWLOC_CPUBIND_STRICT);
 
 #if HWLOC_DEBUG_PRINT
 
-  std::cout << " to " ;
+  std::cout << " to ";
 
-  hwloc_get_cpubind( s_hwloc_topology , s_hwloc_location , HWLOC_CPUBIND_THREAD );
+  hwloc_get_cpubind(s_hwloc_topology, s_hwloc_location, HWLOC_CPUBIND_THREAD);
 
-  print_bitmap( std::cout , s_hwloc_location );
+  print_bitmap(std::cout, s_hwloc_location);
 
-  std::cout << std::endl ;
+  std::cout << std::endl;
 
 #endif
 
-  return result ;
+  return result;
 
 #undef HWLOC_DEBUG_PRINT
-
 }
 
 //----------------------------------------------------------------------------
 
-std::pair<unsigned,unsigned> get_this_thread_coordinate()
-{
-  std::pair<unsigned,unsigned> coord(0u,0u);
+std::pair<unsigned, unsigned> get_this_thread_coordinate() {
+  std::pair<unsigned, unsigned> coord(0u, 0u);
 
-  if ( ! sentinel() ) return coord ;
+  if (!sentinel()) return coord;
 
-  const unsigned n = s_core_topology.first * s_core_topology.second ;
+  const unsigned n = s_core_topology.first * s_core_topology.second;
 
   // Using the pre-allocated 's_hwloc_location' to avoid memory
   // allocation by this thread.  This call is NOT thread-safe.
-  hwloc_get_last_cpu_location( s_hwloc_topology ,
-                               s_hwloc_location , HWLOC_CPUBIND_THREAD );
+  hwloc_get_last_cpu_location(s_hwloc_topology, s_hwloc_location,
+                              HWLOC_CPUBIND_THREAD);
 
-  unsigned i = 0 ;
+  unsigned i = 0;
 
-  while ( i < n && ! hwloc_bitmap_intersects( s_hwloc_location , s_core[ i ] ) ) ++i ;
+  while (i < n && !hwloc_bitmap_intersects(s_hwloc_location, s_core[i])) ++i;
 
-  if ( i < n ) {
-    coord.first  = i / s_core_topology.second ;
-    coord.second = i % s_core_topology.second ;
+  if (i < n) {
+    coord.first  = i / s_core_topology.second;
+    coord.second = i % s_core_topology.second;
   }
 
-  return coord ;
+  return coord;
 }
 
 //----------------------------------------------------------------------------
@@ -701,30 +719,29 @@ std::pair<unsigned,unsigned> get_this_thread_coordinate()
 namespace Kokkos {
 namespace hwloc {
 
-bool available() { return false ; }
-bool can_bind_threads() { return false ; }
+bool available() { return false; }
+bool can_bind_threads() { return false; }
 
-unsigned get_available_numa_count() { return 1 ; }
-unsigned get_available_cores_per_numa() { return 1 ; }
-unsigned get_available_threads_per_core() { return 1 ; }
+unsigned get_available_numa_count() { return 1; }
+unsigned get_available_cores_per_numa() { return 1; }
+unsigned get_available_threads_per_core() { return 1; }
 
-unsigned bind_this_thread( const unsigned , std::pair<unsigned,unsigned>[] )
-{ return ~0 ; }
+unsigned bind_this_thread(const unsigned, std::pair<unsigned, unsigned>[]) {
+  return ~0;
+}
 
-bool bind_this_thread( const std::pair<unsigned,unsigned> )
-{ return false ; }
+bool bind_this_thread(const std::pair<unsigned, unsigned>) { return false; }
 
-bool unbind_this_thread()
-{ return true ; }
+bool unbind_this_thread() { return true; }
 
-std::pair<unsigned,unsigned> get_this_thread_coordinate()
-{ return std::pair<unsigned,unsigned>(0,0); }
+std::pair<unsigned, unsigned> get_this_thread_coordinate() {
+  return std::pair<unsigned, unsigned>(0, 0);
+}
 
-} // namespace hwloc
-} // namespace Kokkos
+}  // namespace hwloc
+}  // namespace Kokkos
 
 //----------------------------------------------------------------------------
 //----------------------------------------------------------------------------
 
 #endif
-
diff --git a/lib/kokkos/core/src/kokkos.pc.in b/lib/kokkos/core/src/kokkos.pc.in
index f27b57c960..47786faefb 100644
--- a/lib/kokkos/core/src/kokkos.pc.in
+++ b/lib/kokkos/core/src/kokkos.pc.in
@@ -1,8 +1,9 @@
 # 
-#                        Kokkos v. 2.0
-#              Copyright (2014) Sandia Corporation
+#                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 # 
-# Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+# Under the terms of Contract DE-NA0003525 with NTESS,
 # the U.S. Government retains certain rights in this software.
 # 
 # Redistribution and use in source and binary forms, with or without
@@ -20,10 +21,10 @@
 # contributors may be used to endorse or promote products derived from
 # this software without specific prior written permission.
 #
-# THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+# THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 # 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
@@ -57,14 +58,13 @@
 # pkg_check_modules(KOKKOS IMPORTED_TARGET kokkos)
 # target_link_libraries(<lib> PkgConfig::KOKKOS)
 
-prefix=@CMAKE_INSTALL_PREFIX@
-libdir=${prefix}/lib
-includedir=${prefix}/include
+libdir=@CMAKE_INSTALL_FULL_LIBDIR@
+includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@
 
 Name: kokkos
 Description: Kokkos C++ Performance Portability Programming EcoSystem
 URL: https://github.com/kokkos
-Version:
+Version: @Kokkos_VERSION@
 Requires:
 Libs: -L${libdir} -lkokkos @KOKKOS_EXTRA_LIBS_LIST@ @KOKKOS_LINK_FLAGS@
 Libs.private: -lm
diff --git a/lib/kokkos/core/unit_test/CMakeLists.txt b/lib/kokkos/core/unit_test/CMakeLists.txt
index 6a480daa8d..c0957e83a8 100644
--- a/lib/kokkos/core/unit_test/CMakeLists.txt
+++ b/lib/kokkos/core/unit_test/CMakeLists.txt
@@ -2,635 +2,162 @@
 # Add test-only library for gtest to be reused by all the subpackages
 #
 
-IF(NOT KOKKOS_HAS_TRILINOS)
-  IF(KOKKOS_SEPARATE_LIBS)
-    set(TEST_LINK_TARGETS kokkoscore)
-  ELSE()
-    set(TEST_LINK_TARGETS kokkos)
-  ENDIF()
-ENDIF()
 
 SET(GTEST_SOURCE_DIR ${${PARENT_PACKAGE_NAME}_SOURCE_DIR}/tpls/gtest)
-# TODO get the C++ standard flag from KOKKOS_CXX_STANDARD
-SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DGTEST_HAS_PTHREAD=0")
 
-INCLUDE_DIRECTORIES(${GTEST_SOURCE_DIR})
-TRIBITS_ADD_LIBRARY(
+#need here for tribits
+KOKKOS_INCLUDE_DIRECTORIES(${GTEST_SOURCE_DIR})
+KOKKOS_ADD_TEST_LIBRARY(
   kokkos_gtest
   HEADERS ${GTEST_SOURCE_DIR}/gtest/gtest.h
   SOURCES ${GTEST_SOURCE_DIR}/gtest/gtest-all.cc
-  TESTONLY
-  )
+)
+KOKKOS_TARGET_COMPILE_DEFINITIONS(kokkos_gtest PUBLIC "-DGTEST_HAS_PTHREAD=0")
+KOKKOS_TARGET_INCLUDE_DIRECTORIES(kokkos_gtest PUBLIC ${GTEST_SOURCE_DIR})
 
-IF(NOT KOKKOS_HAS_TRILINOS)
-target_compile_options(
-  kokkos_gtest
-  PUBLIC $<$<COMPILE_LANGUAGE:CXX>:${KOKKOS_CXX_FLAGS}>
-)
-target_link_libraries(
-  kokkos_gtest
-  PUBLIC ${KOKKOS_LD_FLAGS}
-)
-ENDIF()
 
 #
 # Define the tests
 #
 
-INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR})
-INCLUDE_DIRECTORIES(REQUIRED_DURING_INSTALLATION_TESTING ${CMAKE_CURRENT_SOURCE_DIR})
+#I will leave these alone for now because I don't need transitive dependencies on tests
+KOKKOS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR})
+KOKKOS_INCLUDE_DIRECTORIES(REQUIRED_DURING_INSTALLATION_TESTING ${CMAKE_CURRENT_SOURCE_DIR})
 
-IF(Kokkos_ENABLE_Serial)
-  IF(KOKKOS_SEPARATE_TESTS)
-    TRIBITS_ADD_EXECUTABLE_AND_TEST(
-      UnitTest_Serial_Atomics
-      SOURCES
-        UnitTestMainInit.cpp
-        serial/TestSerial_AtomicOperations_int.cpp
-        serial/TestSerial_AtomicOperations_unsignedint.cpp
-        serial/TestSerial_AtomicOperations_longint.cpp
-        serial/TestSerial_AtomicOperations_unsignedlongint.cpp
-        serial/TestSerial_AtomicOperations_longlongint.cpp
-        serial/TestSerial_AtomicOperations_double.cpp
-        serial/TestSerial_AtomicOperations_float.cpp
-        serial/TestSerial_AtomicOperations_complexdouble.cpp
-        serial/TestSerial_AtomicOperations_complexfloat.cpp
-        serial/TestSerial_AtomicViews.cpp
-        serial/TestSerial_Atomics.cpp
-      COMM serial mpi
-      NUM_MPI_PROCS 1
-      FAIL_REGULAR_EXPRESSION "  FAILED  "
-      TESTONLYLIBS kokkos_gtest ${TEST_LINK_TARGETS}
-    )
-    TRIBITS_ADD_EXECUTABLE_AND_TEST(
-      UnitTest_Serial_SubView
-      SOURCES
-        UnitTestMainInit.cpp
-        serial/TestSerial_SubView_a.cpp
-        serial/TestSerial_SubView_b.cpp
-        serial/TestSerial_SubView_c01.cpp
-        serial/TestSerial_SubView_c02.cpp
-        serial/TestSerial_SubView_c03.cpp
-        serial/TestSerial_SubView_c04.cpp
-        serial/TestSerial_SubView_c05.cpp
-        serial/TestSerial_SubView_c06.cpp
-        serial/TestSerial_SubView_c07.cpp
-        serial/TestSerial_SubView_c08.cpp
-        serial/TestSerial_SubView_c09.cpp
-        serial/TestSerial_SubView_c10.cpp
-        serial/TestSerial_SubView_c11.cpp
-        serial/TestSerial_SubView_c12.cpp
-        serial/TestSerial_SubView_c13.cpp
-      COMM serial mpi
-      NUM_MPI_PROCS 1
-      FAIL_REGULAR_EXPRESSION "  FAILED  "
-      TESTONLYLIBS kokkos_gtest ${TEST_LINK_TARGETS}
-    )
-    TRIBITS_ADD_EXECUTABLE_AND_TEST(
-      UnitTest_Serial_ViewAPI
-      SOURCES
-        UnitTestMainInit.cpp
-        serial/TestSerial_ViewAPI_a.cpp
-        serial/TestSerial_ViewAPI_b.cpp
-        serial/TestSerial_ViewAPI_c.cpp
-        serial/TestSerial_ViewAPI_d.cpp
-        serial/TestSerial_ViewAPI_e.cpp
-        serial/TestSerial_ViewOfClass.cpp
-      COMM serial mpi
-      NUM_MPI_PROCS 1
-      FAIL_REGULAR_EXPRESSION "  FAILED  "
-      TESTONLYLIBS kokkos_gtest ${TEST_LINK_TARGETS}
-    )
-    TRIBITS_ADD_EXECUTABLE_AND_TEST(
-      UnitTest_Serial_ViewMapping
-      SOURCES
-        UnitTestMainInit.cpp
-        serial/TestSerial_ViewMapping_a.cpp
-        serial/TestSerial_ViewMapping_b.cpp
-        serial/TestSerial_ViewMapping_subview.cpp
-      COMM serial mpi
-      NUM_MPI_PROCS 1
-      FAIL_REGULAR_EXPRESSION "  FAILED  "
-      TESTONLYLIBS kokkos_gtest ${TEST_LINK_TARGETS}
-    )
-    TRIBITS_ADD_EXECUTABLE_AND_TEST(
-      UnitTest_Serial_Reducers
-      SOURCES
-        UnitTestMainInit.cpp
-        serial/TestSerial_Reductions.cpp
-        serial/TestSerial_Reducers_a.cpp
-        serial/TestSerial_Reducers_b.cpp
-        serial/TestSerial_Reducers_c.cpp
-        serial/TestSerial_Reducers_d.cpp
-      COMM serial mpi
-      NUM_MPI_PROCS 1
-      FAIL_REGULAR_EXPRESSION "  FAILED  "
-      TESTONLYLIBS kokkos_gtest ${TEST_LINK_TARGETS}
-    )
-    TRIBITS_ADD_EXECUTABLE_AND_TEST(
-      UnitTest_Serial_MDRange
-      SOURCES
-        UnitTestMainInit.cpp
-        serial/TestSerial_MDRange_a.cpp
-        serial/TestSerial_MDRange_b.cpp
-        serial/TestSerial_MDRange_c.cpp
-        serial/TestSerial_MDRange_d.cpp
-        serial/TestSerial_MDRange_e.cpp
-      COMM serial mpi
-      NUM_MPI_PROCS 1
-      FAIL_REGULAR_EXPRESSION "  FAILED  "
-      TESTONLYLIBS kokkos_gtest ${TEST_LINK_TARGETS}
-    )
-    TRIBITS_ADD_EXECUTABLE_AND_TEST(
-      UnitTest_Serial_Team
-      SOURCES
-        UnitTestMainInit.cpp
-        serial/TestSerial_Team.cpp
-        serial/TestSerial_TeamReductionScan.cpp
-      COMM serial mpi
-      NUM_MPI_PROCS 1
-      FAIL_REGULAR_EXPRESSION "  FAILED  "
-      TESTONLYLIBS kokkos_gtest ${TEST_LINK_TARGETS}
-    )
-    TRIBITS_ADD_EXECUTABLE_AND_TEST(
-      UnitTest_Serial_Tasking
-      SOURCES
-        UnitTestMainInit.cpp
-        serial/TestSerial_Task.cpp
-        serial/TestSerial_WorkGraph.cpp
-      COMM serial mpi
-      NUM_MPI_PROCS 1
-      FAIL_REGULAR_EXPRESSION "  FAILED  "
-      TESTONLYLIBS kokkos_gtest ${TEST_LINK_TARGETS}
-    )
-    TRIBITS_ADD_EXECUTABLE_AND_TEST(
-      UnitTest_Serial_Misc
-      SOURCES
-        UnitTestMainInit.cpp
-        serial/TestSerial_Complex.cpp
-        serial/TestSerial_Init.cpp
-        serial/TestSerial_Other.cpp
-        serial/TestSerial_RangePolicy.cpp
-        serial/TestSerial_Scan.cpp
-        serial/TestSerial_SharedAlloc.cpp
-        serial/TestSerial_Crs.cpp
-      COMM serial mpi
-      NUM_MPI_PROCS 1
-      FAIL_REGULAR_EXPRESSION "  FAILED  "
-      TESTONLYLIBS kokkos_gtest ${TEST_LINK_TARGETS}
-    )
-  ELSE()
-    TRIBITS_ADD_EXECUTABLE_AND_TEST(
-      UnitTest_Serial
-      SOURCES
-        UnitTestMainInit.cpp
-        serial/TestSerial_AtomicOperations_int.cpp
-        serial/TestSerial_AtomicOperations_unsignedint.cpp
-        serial/TestSerial_AtomicOperations_longint.cpp
-        serial/TestSerial_AtomicOperations_unsignedlongint.cpp
-        serial/TestSerial_AtomicOperations_longlongint.cpp
-        serial/TestSerial_AtomicOperations_double.cpp
-        serial/TestSerial_AtomicOperations_float.cpp
-        serial/TestSerial_AtomicOperations_complexdouble.cpp
-        serial/TestSerial_AtomicOperations_complexfloat.cpp
-        serial/TestSerial_AtomicViews.cpp
-        serial/TestSerial_Atomics.cpp
-        serial/TestSerial_Complex.cpp
-        serial/TestSerial_Init.cpp
-        serial/TestSerial_MDRange_a.cpp
-        serial/TestSerial_MDRange_b.cpp
-        serial/TestSerial_MDRange_c.cpp
-        serial/TestSerial_MDRange_d.cpp
-        serial/TestSerial_MDRange_e.cpp
-        serial/TestSerial_Other.cpp
-        serial/TestSerial_RangePolicy.cpp
-        serial/TestSerial_Reductions.cpp
-        serial/TestSerial_Reducers_a.cpp
-        serial/TestSerial_Reducers_b.cpp
-        serial/TestSerial_Reducers_c.cpp
-        serial/TestSerial_Reducers_d.cpp
-        serial/TestSerial_Scan.cpp
-        serial/TestSerial_SharedAlloc.cpp
-        serial/TestSerial_SubView_a.cpp
-        serial/TestSerial_SubView_b.cpp
-        serial/TestSerial_SubView_c01.cpp
-        serial/TestSerial_SubView_c02.cpp
-        serial/TestSerial_SubView_c03.cpp
-        serial/TestSerial_SubView_c04.cpp
-        serial/TestSerial_SubView_c05.cpp
-        serial/TestSerial_SubView_c06.cpp
-        serial/TestSerial_SubView_c07.cpp
-        serial/TestSerial_SubView_c08.cpp
-        serial/TestSerial_SubView_c09.cpp
-        serial/TestSerial_SubView_c10.cpp
-        serial/TestSerial_SubView_c11.cpp
-        serial/TestSerial_SubView_c12.cpp
-        serial/TestSerial_SubView_c13.cpp
-        serial/TestSerial_Task.cpp
-        serial/TestSerial_Team.cpp
-        serial/TestSerial_TeamReductionScan.cpp
-        serial/TestSerial_TeamScratch.cpp
-        serial/TestSerial_ViewAPI_a.cpp
-        serial/TestSerial_ViewAPI_b.cpp
-        serial/TestSerial_ViewAPI_c.cpp
-        serial/TestSerial_ViewAPI_d.cpp
-        serial/TestSerial_ViewAPI_e.cpp
-        serial/TestSerial_ViewMapping_a.cpp
-        serial/TestSerial_ViewMapping_b.cpp
-        serial/TestSerial_ViewMapping_subview.cpp
-        serial/TestSerial_ViewOfClass.cpp
-        serial/TestSerial_Crs.cpp
-        serial/TestSerial_WorkGraph.cpp
-      COMM serial mpi
-      NUM_MPI_PROCS 1
-      FAIL_REGULAR_EXPRESSION "  FAILED  "
-      TESTONLYLIBS kokkos_gtest ${TEST_LINK_TARGETS}
-    )
-  ENDIF()
-ENDIF()
+foreach(Tag Threads;Serial;OpenMP;Cuda;HPX)
+  # Because there is always an exception to the rule
+  if(Tag STREQUAL "Threads")
+    set(DEVICE "PTHREAD")
+  else()
+    string(TOUPPER ${Tag} DEVICE)
+  endif()
+  string(TOLOWER ${Tag} dir)
 
-IF(Kokkos_ENABLE_Pthread)
-  TRIBITS_ADD_EXECUTABLE_AND_TEST(
-    UnitTest_Threads
-    SOURCES
+  SET(${Tag}_SOURCES
       UnitTestMainInit.cpp
-      threads/TestThreads_AtomicOperations_int.cpp
-      threads/TestThreads_AtomicOperations_unsignedint.cpp
-      threads/TestThreads_AtomicOperations_longint.cpp
-      threads/TestThreads_AtomicOperations_unsignedlongint.cpp
-      threads/TestThreads_AtomicOperations_longlongint.cpp
-      threads/TestThreads_AtomicOperations_double.cpp
-      threads/TestThreads_AtomicOperations_float.cpp
-      threads/TestThreads_AtomicOperations_complexdouble.cpp
-      threads/TestThreads_AtomicOperations_complexfloat.cpp
-      threads/TestThreads_AtomicViews.cpp
-      threads/TestThreads_Atomics.cpp
-      threads/TestThreads_Complex.cpp
-      threads/TestThreads_Init.cpp
-      threads/TestThreads_MDRange_a.cpp
-      threads/TestThreads_MDRange_b.cpp
-      threads/TestThreads_MDRange_c.cpp
-      threads/TestThreads_MDRange_d.cpp
-      threads/TestThreads_MDRange_e.cpp
-      threads/TestThreads_Other.cpp
-      threads/TestThreads_RangePolicy.cpp
-      threads/TestThreads_Reductions.cpp
-      threads/TestThreads_Reducers_a.cpp
-      threads/TestThreads_Reducers_b.cpp
-      threads/TestThreads_Reducers_c.cpp
-      threads/TestThreads_Reducers_d.cpp
-      threads/TestThreads_Scan.cpp
-      threads/TestThreads_SharedAlloc.cpp
-      threads/TestThreads_SubView_a.cpp
-      threads/TestThreads_SubView_b.cpp
-      threads/TestThreads_SubView_c01.cpp
-      threads/TestThreads_SubView_c02.cpp
-      threads/TestThreads_SubView_c03.cpp
-      threads/TestThreads_SubView_c04.cpp
-      threads/TestThreads_SubView_c05.cpp
-      threads/TestThreads_SubView_c06.cpp
-      threads/TestThreads_SubView_c07.cpp
-      threads/TestThreads_SubView_c08.cpp
-      threads/TestThreads_SubView_c09.cpp
-      threads/TestThreads_SubView_c10.cpp
-      threads/TestThreads_SubView_c11.cpp
-      threads/TestThreads_SubView_c12.cpp
-      threads/TestThreads_SubView_c13.cpp
-      threads/TestThreads_Team.cpp
-      threads/TestThreads_TeamReductionScan.cpp
-      threads/TestThreads_TeamScratch.cpp
-      threads/TestThreads_ViewAPI_a.cpp
-      threads/TestThreads_ViewAPI_b.cpp
-      threads/TestThreads_ViewAPI_c.cpp
-      threads/TestThreads_ViewAPI_d.cpp
-      threads/TestThreads_ViewAPI_e.cpp
-      threads/TestThreads_ViewMapping_a.cpp
-      threads/TestThreads_ViewMapping_b.cpp
-      threads/TestThreads_ViewMapping_subview.cpp
-      threads/TestThreads_ViewOfClass.cpp
-      threads/TestThreads_Crs.cpp
-      threads/TestThreads_WorkGraph.cpp
-    COMM serial mpi
-    NUM_MPI_PROCS 1
-    FAIL_REGULAR_EXPRESSION "  FAILED  "
-    TESTONLYLIBS kokkos_gtest ${TEST_LINK_TARGETS}
+      ${dir}/Test${Tag}_AtomicOperations_int.cpp
+      ${dir}/Test${Tag}_AtomicOperations_unsignedint.cpp
+      ${dir}/Test${Tag}_AtomicOperations_longint.cpp
+      ${dir}/Test${Tag}_AtomicOperations_unsignedlongint.cpp
+      ${dir}/Test${Tag}_AtomicOperations_longlongint.cpp
+      ${dir}/Test${Tag}_AtomicOperations_double.cpp
+      ${dir}/Test${Tag}_AtomicOperations_float.cpp
+      ${dir}/Test${Tag}_AtomicOperations_complexdouble.cpp
+      ${dir}/Test${Tag}_AtomicOperations_complexfloat.cpp
+      ${dir}/Test${Tag}_AtomicViews.cpp
+      ${dir}/Test${Tag}_Atomics.cpp
+      ${dir}/Test${Tag}_Complex.cpp
+      ${dir}/Test${Tag}_Crs.cpp
+      ${dir}/Test${Tag}_DeepCopyAlignment.cpp
+      ${dir}/Test${Tag}_FunctorAnalysis.cpp
+      ${dir}/Test${Tag}_Init.cpp
+      ${dir}/Test${Tag}_LocalDeepCopy.cpp
+      ${dir}/Test${Tag}_MDRange_a.cpp
+      ${dir}/Test${Tag}_MDRange_b.cpp
+      ${dir}/Test${Tag}_MDRange_c.cpp
+      ${dir}/Test${Tag}_MDRange_d.cpp
+      ${dir}/Test${Tag}_MDRange_e.cpp
+      ${dir}/Test${Tag}_Other.cpp
+      ${dir}/Test${Tag}_RangePolicy.cpp
+      ${dir}/Test${Tag}_Reductions.cpp
+      ${dir}/Test${Tag}_Reducers_a.cpp
+      ${dir}/Test${Tag}_Reducers_b.cpp
+      ${dir}/Test${Tag}_Reducers_c.cpp
+      ${dir}/Test${Tag}_Reducers_d.cpp
+      ${dir}/Test${Tag}_Reductions_DeviceView.cpp
+      ${dir}/Test${Tag}_Scan.cpp
+      ${dir}/Test${Tag}_SharedAlloc.cpp
+      ${dir}/Test${Tag}_SubView_a.cpp
+      ${dir}/Test${Tag}_SubView_b.cpp
+      ${dir}/Test${Tag}_SubView_c01.cpp
+      ${dir}/Test${Tag}_SubView_c02.cpp
+      ${dir}/Test${Tag}_SubView_c03.cpp
+      ${dir}/Test${Tag}_SubView_c04.cpp
+      ${dir}/Test${Tag}_SubView_c05.cpp
+      ${dir}/Test${Tag}_SubView_c06.cpp
+      ${dir}/Test${Tag}_SubView_c07.cpp
+      ${dir}/Test${Tag}_SubView_c08.cpp
+      ${dir}/Test${Tag}_SubView_c09.cpp
+      ${dir}/Test${Tag}_SubView_c10.cpp
+      ${dir}/Test${Tag}_SubView_c11.cpp
+      ${dir}/Test${Tag}_SubView_c12.cpp
+      ${dir}/Test${Tag}_SubView_c13.cpp
+      ${dir}/Test${Tag}_Team.cpp
+      ${dir}/Test${Tag}_TeamReductionScan.cpp
+      ${dir}/Test${Tag}_TeamScratch.cpp
+      ${dir}/Test${Tag}_TeamTeamSize.cpp
+      ${dir}/Test${Tag}_TeamVectorRange.cpp
+      ${dir}/Test${Tag}_UniqueToken.cpp
+      ${dir}/Test${Tag}_ViewAPI_a.cpp
+      ${dir}/Test${Tag}_ViewAPI_b.cpp
+      ${dir}/Test${Tag}_ViewAPI_c.cpp
+      ${dir}/Test${Tag}_ViewAPI_d.cpp
+      ${dir}/Test${Tag}_ViewAPI_e.cpp
+      ${dir}/Test${Tag}_ViewLayoutStrideAssignment.cpp
+      ${dir}/Test${Tag}_ViewMapping_a.cpp
+      ${dir}/Test${Tag}_ViewMapping_b.cpp
+      ${dir}/Test${Tag}_ViewMapping_subview.cpp
+      ${dir}/Test${Tag}_ViewOfClass.cpp
+      ${dir}/Test${Tag}_WorkGraph.cpp
+      ${dir}/Test${Tag}_View_64bit.cpp
+      ${dir}/Test${Tag}_ViewResize.cpp
   )
-ENDIF()
+endforeach()
 
-IF(Kokkos_ENABLE_OpenMP)
-  IF(KOKKOS_SEPARATE_TESTS)
-    TRIBITS_ADD_EXECUTABLE_AND_TEST(
-      UnitTest_OpenMP_Atomics
-      SOURCES
-        UnitTestMainInit.cpp
-        openmp/TestOpenMP_AtomicOperations_int.cpp
-        openmp/TestOpenMP_AtomicOperations_unsignedint.cpp
-        openmp/TestOpenMP_AtomicOperations_longint.cpp
-        openmp/TestOpenMP_AtomicOperations_unsignedlongint.cpp
-        openmp/TestOpenMP_AtomicOperations_longlongint.cpp
-        openmp/TestOpenMP_AtomicOperations_double.cpp
-        openmp/TestOpenMP_AtomicOperations_float.cpp
-        openmp/TestOpenMP_AtomicOperations_complexdouble.cpp
-        openmp/TestOpenMP_AtomicOperations_complexfloat.cpp
-        openmp/TestOpenMP_AtomicViews.cpp
-        openmp/TestOpenMP_Atomics.cpp
-      COMM serial mpi
-      NUM_MPI_PROCS 1
-      FAIL_REGULAR_EXPRESSION "  FAILED  "
-      TESTONLYLIBS kokkos_gtest ${TEST_LINK_TARGETS}
-    )
-    TRIBITS_ADD_EXECUTABLE_AND_TEST(
-      UnitTest_OpenMP_SubView
-      SOURCES
-        UnitTestMainInit.cpp
-        openmp/TestOpenMP_SubView_a.cpp
-        openmp/TestOpenMP_SubView_b.cpp
-        openmp/TestOpenMP_SubView_c01.cpp
-        openmp/TestOpenMP_SubView_c02.cpp
-        openmp/TestOpenMP_SubView_c03.cpp
-        openmp/TestOpenMP_SubView_c04.cpp
-        openmp/TestOpenMP_SubView_c05.cpp
-        openmp/TestOpenMP_SubView_c06.cpp
-        openmp/TestOpenMP_SubView_c07.cpp
-        openmp/TestOpenMP_SubView_c08.cpp
-        openmp/TestOpenMP_SubView_c09.cpp
-        openmp/TestOpenMP_SubView_c10.cpp
-        openmp/TestOpenMP_SubView_c11.cpp
-        openmp/TestOpenMP_SubView_c12.cpp
-        openmp/TestOpenMP_SubView_c13.cpp
-      COMM serial mpi
-      NUM_MPI_PROCS 1
-      FAIL_REGULAR_EXPRESSION "  FAILED  "
-      TESTONLYLIBS kokkos_gtest ${TEST_LINK_TARGETS}
-    )
-    TRIBITS_ADD_EXECUTABLE_AND_TEST(
-      UnitTest_OpenMP_ViewAPI
-      SOURCES
-        UnitTestMainInit.cpp
-        openmp/TestOpenMP_ViewAPI_a.cpp
-        openmp/TestOpenMP_ViewAPI_b.cpp
-        openmp/TestOpenMP_ViewAPI_c.cpp
-        openmp/TestOpenMP_ViewAPI_d.cpp
-        openmp/TestOpenMP_ViewAPI_e.cpp
-        openmp/TestOpenMP_ViewOfClass.cpp
-      COMM serial mpi
-      NUM_MPI_PROCS 1
-      FAIL_REGULAR_EXPRESSION "  FAILED  "
-      TESTONLYLIBS kokkos_gtest ${TEST_LINK_TARGETS}
-    )
-    TRIBITS_ADD_EXECUTABLE_AND_TEST(
-      UnitTest_OpenMP_ViewMapping
-      SOURCES
-        UnitTestMainInit.cpp
-        openmp/TestOpenMP_ViewMapping_a.cpp
-        openmp/TestOpenMP_ViewMapping_b.cpp
-        openmp/TestOpenMP_ViewMapping_subview.cpp
-      COMM serial mpi
-      NUM_MPI_PROCS 1
-      FAIL_REGULAR_EXPRESSION "  FAILED  "
-      TESTONLYLIBS kokkos_gtest ${TEST_LINK_TARGETS}
-    )
-    TRIBITS_ADD_EXECUTABLE_AND_TEST(
-      UnitTest_OpenMP_Reducers
-      SOURCES
-        UnitTestMainInit.cpp
-        openmp/TestOpenMP_Reductions.cpp
-        openmp/TestOpenMP_Reducers_a.cpp
-        openmp/TestOpenMP_Reducers_b.cpp
-        openmp/TestOpenMP_Reducers_c.cpp
-        openmp/TestOpenMP_Reducers_d.cpp
-      COMM serial mpi
-      NUM_MPI_PROCS 1
-      FAIL_REGULAR_EXPRESSION "  FAILED  "
-      TESTONLYLIBS kokkos_gtest ${TEST_LINK_TARGETS}
-    )
-    TRIBITS_ADD_EXECUTABLE_AND_TEST(
-      UnitTest_OpenMP_MDRange
-      SOURCES
-        UnitTestMainInit.cpp
-        openmp/TestOpenMP_MDRange_a.cpp
-        openmp/TestOpenMP_MDRange_b.cpp
-        openmp/TestOpenMP_MDRange_c.cpp
-        openmp/TestOpenMP_MDRange_d.cpp
-        openmp/TestOpenMP_MDRange_e.cpp
-      COMM serial mpi
-      NUM_MPI_PROCS 1
-      FAIL_REGULAR_EXPRESSION "  FAILED  "
-      TESTONLYLIBS kokkos_gtest ${TEST_LINK_TARGETS}
-    )
-    TRIBITS_ADD_EXECUTABLE_AND_TEST(
-      UnitTest_OpenMP_Team
-      SOURCES
-        UnitTestMainInit.cpp
-        openmp/TestOpenMP_Team.cpp
-        openmp/TestOpenMP_TeamReductionScan.cpp
-      COMM serial mpi
-      NUM_MPI_PROCS 1
-      FAIL_REGULAR_EXPRESSION "  FAILED  "
-      TESTONLYLIBS kokkos_gtest ${TEST_LINK_TARGETS}
-    )
-    TRIBITS_ADD_EXECUTABLE_AND_TEST(
-      UnitTest_OpenMP_Tasking
-      SOURCES
-        UnitTestMainInit.cpp
-        openmp/TestOpenMP_Task.cpp
-        openmp/TestOpenMP_WorkGraph.cpp
-      COMM serial mpi
-      NUM_MPI_PROCS 1
-      FAIL_REGULAR_EXPRESSION "  FAILED  "
-      TESTONLYLIBS kokkos_gtest ${TEST_LINK_TARGETS}
-    )
-    TRIBITS_ADD_EXECUTABLE_AND_TEST(
-      UnitTest_OpenMP_Misc
-      SOURCES
-        UnitTestMainInit.cpp
-        openmp/TestOpenMP_Complex.cpp
-        openmp/TestOpenMP_Init.cpp
-        openmp/TestOpenMP_Other.cpp
-        openmp/TestOpenMP_RangePolicy.cpp
-        openmp/TestOpenMP_Scan.cpp
-        openmp/TestOpenMP_SharedAlloc.cpp
-        openmp/TestOpenMP_Crs.cpp
-        openmp/TestOpenMP_UniqueToken.cpp
-      COMM serial mpi
-      NUM_MPI_PROCS 1
-      FAIL_REGULAR_EXPRESSION "  FAILED  "
-      TESTONLYLIBS kokkos_gtest ${TEST_LINK_TARGETS}
-    )
-    TRIBITS_ADD_EXECUTABLE_AND_TEST(
-      UnitTest_OpenMPInterOp
-      SOURCES
-        UnitTestMain.cpp
-        openmp/TestOpenMP_InterOp.cpp
-      COMM serial mpi
-      NUM_MPI_PROCS 1
-      FAIL_REGULAR_EXPRESSION "  FAILED  "
-      TESTONLYLIBS kokkos_gtest ${TEST_LINK_TARGETS}
-    )
-  ELSE()
-    TRIBITS_ADD_EXECUTABLE_AND_TEST(
-      UnitTest_OpenMP
-      SOURCES
-        UnitTestMainInit.cpp
-        openmp/TestOpenMP_AtomicOperations_int.cpp
-        openmp/TestOpenMP_AtomicOperations_unsignedint.cpp
-        openmp/TestOpenMP_AtomicOperations_longint.cpp
-        openmp/TestOpenMP_AtomicOperations_unsignedlongint.cpp
-        openmp/TestOpenMP_AtomicOperations_longlongint.cpp
-        openmp/TestOpenMP_AtomicOperations_double.cpp
-        openmp/TestOpenMP_AtomicOperations_float.cpp
-        openmp/TestOpenMP_AtomicOperations_complexdouble.cpp
-        openmp/TestOpenMP_AtomicOperations_complexfloat.cpp
-        openmp/TestOpenMP_AtomicViews.cpp
-        openmp/TestOpenMP_Atomics.cpp
-        openmp/TestOpenMP_Complex.cpp
-        openmp/TestOpenMP_Init.cpp
-        openmp/TestOpenMP_MDRange_a.cpp
-        openmp/TestOpenMP_MDRange_b.cpp
-        openmp/TestOpenMP_MDRange_c.cpp
-        openmp/TestOpenMP_MDRange_d.cpp
-        openmp/TestOpenMP_MDRange_e.cpp
-        openmp/TestOpenMP_Other.cpp
-        openmp/TestOpenMP_RangePolicy.cpp
-        openmp/TestOpenMP_Reductions.cpp
-        openmp/TestOpenMP_Reducers_a.cpp
-        openmp/TestOpenMP_Reducers_b.cpp
-        openmp/TestOpenMP_Reducers_c.cpp
-        openmp/TestOpenMP_Reducers_d.cpp
-        openmp/TestOpenMP_Scan.cpp
-        openmp/TestOpenMP_SharedAlloc.cpp
-        openmp/TestOpenMP_SubView_a.cpp
-        openmp/TestOpenMP_SubView_b.cpp
-        openmp/TestOpenMP_SubView_c01.cpp
-        openmp/TestOpenMP_SubView_c02.cpp
-        openmp/TestOpenMP_SubView_c03.cpp
-        openmp/TestOpenMP_SubView_c04.cpp
-        openmp/TestOpenMP_SubView_c05.cpp
-        openmp/TestOpenMP_SubView_c06.cpp
-        openmp/TestOpenMP_SubView_c07.cpp
-        openmp/TestOpenMP_SubView_c08.cpp
-        openmp/TestOpenMP_SubView_c09.cpp
-        openmp/TestOpenMP_SubView_c10.cpp
-        openmp/TestOpenMP_SubView_c11.cpp
-        openmp/TestOpenMP_SubView_c12.cpp
-        openmp/TestOpenMP_SubView_c13.cpp
-        openmp/TestOpenMP_Task.cpp
-        openmp/TestOpenMP_Team.cpp
-        openmp/TestOpenMP_TeamReductionScan.cpp
-        openmp/TestOpenMP_ViewAPI_a.cpp
-        openmp/TestOpenMP_ViewAPI_b.cpp
-        openmp/TestOpenMP_ViewAPI_c.cpp
-        openmp/TestOpenMP_ViewAPI_d.cpp
-        openmp/TestOpenMP_ViewAPI_e.cpp
-        openmp/TestOpenMP_ViewMapping_a.cpp
-        openmp/TestOpenMP_ViewMapping_b.cpp
-        openmp/TestOpenMP_ViewMapping_subview.cpp
-        openmp/TestOpenMP_ViewOfClass.cpp
-        openmp/TestOpenMP_Crs.cpp
-        openmp/TestOpenMP_WorkGraph.cpp
-        openmp/TestOpenMP_UniqueToken.cpp
-      COMM serial mpi
-      NUM_MPI_PROCS 1
-      FAIL_REGULAR_EXPRESSION "  FAILED  "
-      TESTONLYLIBS kokkos_gtest ${TEST_LINK_TARGETS}
-    )
-    TRIBITS_ADD_EXECUTABLE_AND_TEST(
-      UnitTest_OpenMPInterOp
-      SOURCES
-        UnitTestMain.cpp
-        openmp/TestOpenMP_InterOp.cpp
-      COMM serial mpi
-      NUM_MPI_PROCS 1
-      FAIL_REGULAR_EXPRESSION "  FAILED  "
-      TESTONLYLIBS kokkos_gtest ${TEST_LINK_TARGETS}
-    )
-  ENDIF()
-ENDIF()
+if(Kokkos_ENABLE_SERIAL)
+  KOKKOS_ADD_EXECUTABLE_AND_TEST(
+    UnitTest_Serial
+    SOURCES
+    ${Serial_SOURCES}
+    serial/TestSerial_Task.cpp
+  )
+endif()
 
-IF(Kokkos_ENABLE_HPX)
-  TRIBITS_ADD_EXECUTABLE_AND_TEST(
+if(Kokkos_ENABLE_PTHREAD)
+  KOKKOS_ADD_EXECUTABLE_AND_TEST(
+    UnitTest_Threads
+    SOURCES ${Threads_SOURCES}
+  )
+endif()
+
+if(Kokkos_ENABLE_OPENMP)
+  KOKKOS_ADD_EXECUTABLE_AND_TEST(
+    UnitTest_OpenMP
+    SOURCES
+    ${OpenMP_SOURCES}
+    openmp/TestOpenMP_Task.cpp
+  )
+  KOKKOS_ADD_EXECUTABLE_AND_TEST(
+    UnitTest_OpenMPInterOp
+    SOURCES
+      UnitTestMain.cpp
+      openmp/TestOpenMP_InterOp.cpp
+  )
+endif()
+
+if(Kokkos_ENABLE_HPX)
+  KOKKOS_ADD_EXECUTABLE_AND_TEST(
     UnitTest_HPX
     SOURCES
-      UnitTestMainInit.cpp
-      hpx/TestHPX_AtomicOperations_int.cpp
-      hpx/TestHPX_AtomicOperations_unsignedint.cpp
-      hpx/TestHPX_AtomicOperations_longint.cpp
-      hpx/TestHPX_AtomicOperations_unsignedlongint.cpp
-      hpx/TestHPX_AtomicOperations_longlongint.cpp
-      hpx/TestHPX_AtomicOperations_double.cpp
-      hpx/TestHPX_AtomicOperations_float.cpp
-      hpx/TestHPX_AtomicViews.cpp
-      hpx/TestHPX_Atomics.cpp
-      hpx/TestHPX_Complex.cpp
-      hpx/TestHPX_Init.cpp
-      hpx/TestHPX_MDRange_a.cpp
-      hpx/TestHPX_MDRange_b.cpp
-      hpx/TestHPX_MDRange_c.cpp
-      hpx/TestHPX_MDRange_d.cpp
-      hpx/TestHPX_MDRange_e.cpp
-      hpx/TestHPX_Other.cpp
-      hpx/TestHPX_RangePolicy.cpp
-      hpx/TestHPX_Reductions.cpp
-      hpx/TestHPX_Reducers_a.cpp
-      hpx/TestHPX_Reducers_b.cpp
-      hpx/TestHPX_Reducers_c.cpp
-      hpx/TestHPX_Reducers_d.cpp
-      hpx/TestHPX_Scan.cpp
-      hpx/TestHPX_SharedAlloc.cpp
-      hpx/TestHPX_SubView_a.cpp
-      hpx/TestHPX_SubView_b.cpp
-      hpx/TestHPX_SubView_c01.cpp
-      hpx/TestHPX_SubView_c02.cpp
-      hpx/TestHPX_SubView_c03.cpp
-      hpx/TestHPX_SubView_c04.cpp
-      hpx/TestHPX_SubView_c05.cpp
-      hpx/TestHPX_SubView_c06.cpp
-      hpx/TestHPX_SubView_c07.cpp
-      hpx/TestHPX_SubView_c08.cpp
-      hpx/TestHPX_SubView_c09.cpp
-      hpx/TestHPX_SubView_c10.cpp
-      hpx/TestHPX_SubView_c11.cpp
-      hpx/TestHPX_SubView_c12.cpp
-      hpx/TestHPX_SubView_c13.cpp
+      ${HPX_SOURCES}
       hpx/TestHPX_Task.cpp
-      hpx/TestHPX_Team.cpp
-      hpx/TestHPX_TeamReductionScan.cpp
-      hpx/TestHPX_ViewAPI_a.cpp
-      hpx/TestHPX_ViewAPI_b.cpp
-      hpx/TestHPX_ViewAPI_c.cpp
-      hpx/TestHPX_ViewAPI_d.cpp
-      hpx/TestHPX_ViewAPI_e.cpp
-      hpx/TestHPX_ViewMapping_a.cpp
-      hpx/TestHPX_ViewMapping_b.cpp
-      hpx/TestHPX_ViewMapping_subview.cpp
-      hpx/TestHPX_ViewOfClass.cpp
-      hpx/TestHPX_Crs.cpp
-      hpx/TestHPX_WorkGraph.cpp
-      hpx/TestHPX_UniqueToken.cpp
-    COMM serial mpi
-    NUM_MPI_PROCS 1
-    FAIL_REGULAR_EXPRESSION "  FAILED  "
-    TESTONLYLIBS kokkos_gtest ${TEST_LINK_TARGETS}
   )
-  TRIBITS_ADD_EXECUTABLE_AND_TEST(
+  KOKKOS_ADD_EXECUTABLE_AND_TEST(
     UnitTest_HPXInterOp
     SOURCES
       UnitTestMain.cpp
       hpx/TestHPX_InterOp.cpp
-    COMM serial mpi
-    NUM_MPI_PROCS 1
-    FAIL_REGULAR_EXPRESSION "  FAILED  "
-    TESTONLYLIBS kokkos_gtest ${TEST_LINK_TARGETS}
   )
-ENDIF()
+endif()
 
-IF(Kokkos_ENABLE_Qthreads)
-  TRIBITS_ADD_EXECUTABLE_AND_TEST(
+if(Kokkos_ENABLE_QTHREADS)
+  KOKKOS_ADD_EXECUTABLE_AND_TEST(
     UnitTest_Qthreads
     SOURCES
       UnitTestMainInit.cpp
       qthreads/TestQthreads_Atomics.cpp
       qthreads/TestQthreads_Complex.cpp
+      qthreads/TestQthreads_DeepCopyAlignment.cpp
       qthreads/TestQthreads_Other.cpp
       qthreads/TestQthreads_Reductions.cpp
       qthreads/TestQthreads_Reducers_a.cpp
@@ -653,23 +180,21 @@ IF(Kokkos_ENABLE_Qthreads)
       qthreads/TestQthreads_SubView_c12.cpp
       qthreads/TestQthreads_SubView_c13.cpp
       qthreads/TestQthreads_Team.cpp
+      qthreads/TestQthreads_View_64bit.cpp
       qthreads/TestQthreads_ViewAPI_a.cpp
       qthreads/TestQthreads_ViewAPI_b.cpp
       qthreads/TestQthreads_ViewAPI_c.cpp
       qthreads/TestQthreads_ViewAPI_d.cpp
       qthreads/TestQthreads_ViewAPI_e.cpp
-    COMM serial mpi
-    NUM_MPI_PROCS 1
-    FAIL_REGULAR_EXPRESSION "  FAILED  "
-    TESTONLYLIBS kokkos_gtest ${TEST_LINK_TARGETS}
   )
-ENDIF()
+endif()
 
-IF(Kokkos_ENABLE_Cuda)
-  TRIBITS_ADD_EXECUTABLE_AND_TEST(
+if(Kokkos_ENABLE_CUDA)
+  KOKKOS_ADD_EXECUTABLE_AND_TEST(
     UnitTest_Cuda
     SOURCES
-      UnitTestMainInit.cpp
+      ${Cuda_SOURCES}
+      cuda/TestCuda_Task.cpp
       cuda/TestCudaHostPinned_SharedAlloc.cpp
       cuda/TestCudaHostPinned_ViewCopy.cpp
       cuda/TestCudaHostPinned_ViewAPI_a.cpp
@@ -690,93 +215,25 @@ IF(Kokkos_ENABLE_Cuda)
       cuda/TestCudaUVM_ViewMapping_a.cpp
       cuda/TestCudaUVM_ViewMapping_b.cpp
       cuda/TestCudaUVM_ViewMapping_subview.cpp
-      cuda/TestCuda_AtomicOperations_int.cpp
-      cuda/TestCuda_AtomicOperations_unsignedint.cpp
-      cuda/TestCuda_AtomicOperations_longint.cpp
-      cuda/TestCuda_AtomicOperations_unsignedlongint.cpp
-      cuda/TestCuda_AtomicOperations_longlongint.cpp
-      cuda/TestCuda_AtomicOperations_double.cpp
-      cuda/TestCuda_AtomicOperations_float.cpp
-      cuda/TestCuda_AtomicOperations_complexdouble.cpp
-      cuda/TestCuda_AtomicOperations_complexfloat.cpp
-      cuda/TestCuda_AtomicViews.cpp
-      cuda/TestCuda_Atomics.cpp
-      cuda/TestCuda_Complex.cpp
-      cuda/TestCuda_Init.cpp
-      cuda/TestCuda_MDRange_a.cpp
-      cuda/TestCuda_MDRange_b.cpp
-      cuda/TestCuda_MDRange_c.cpp
-      cuda/TestCuda_MDRange_d.cpp
-      cuda/TestCuda_MDRange_e.cpp
-      cuda/TestCuda_Other.cpp
-      cuda/TestCuda_RangePolicy.cpp
-      cuda/TestCuda_Reductions.cpp
-      cuda/TestCuda_Reducers_a.cpp
-      cuda/TestCuda_Reducers_b.cpp
-      cuda/TestCuda_Reducers_c.cpp
-      cuda/TestCuda_Reducers_d.cpp
-      cuda/TestCuda_Scan.cpp
-      cuda/TestCuda_SharedAlloc.cpp
       cuda/TestCuda_Spaces.cpp
-      cuda/TestCuda_SubView_a.cpp
-      cuda/TestCuda_SubView_b.cpp
-      cuda/TestCuda_SubView_c01.cpp
-      cuda/TestCuda_SubView_c02.cpp
-      cuda/TestCuda_SubView_c03.cpp
-      cuda/TestCuda_SubView_c04.cpp
-      cuda/TestCuda_SubView_c05.cpp
-      cuda/TestCuda_SubView_c06.cpp
-      cuda/TestCuda_SubView_c07.cpp
-      cuda/TestCuda_SubView_c08.cpp
-      cuda/TestCuda_SubView_c09.cpp
-      cuda/TestCuda_SubView_c10.cpp
-      cuda/TestCuda_SubView_c11.cpp
-      cuda/TestCuda_SubView_c12.cpp
-      cuda/TestCuda_SubView_c13.cpp
-      cuda/TestCuda_Task.cpp
-      cuda/TestCuda_Team.cpp
-      cuda/TestCuda_TeamReductionScan.cpp
-      cuda/TestCuda_TeamScratch.cpp
-      cuda/TestCuda_ViewAPI_a.cpp
-      cuda/TestCuda_ViewAPI_b.cpp
-      cuda/TestCuda_ViewAPI_c.cpp
-      cuda/TestCuda_ViewAPI_d.cpp
-      cuda/TestCuda_ViewAPI_e.cpp
-      cuda/TestCuda_ViewMapping_a.cpp
-      cuda/TestCuda_ViewMapping_b.cpp
-      cuda/TestCuda_ViewMapping_subview.cpp
-      cuda/TestCuda_ViewOfClass.cpp
-      cuda/TestCuda_Crs.cpp
-      cuda/TestCuda_WorkGraph.cpp
-      cuda/TestCuda_UniqueToken.cpp
-    COMM serial mpi
-    NUM_MPI_PROCS 1
-    FAIL_REGULAR_EXPRESSION "  FAILED  "
-    TESTONLYLIBS kokkos_gtest ${TEST_LINK_TARGETS}
+      cuda/TestCuda_DebugSerialExecution.cpp
+      cuda/TestCuda_DebugPinUVMSpace.cpp
   )
-  TRIBITS_ADD_EXECUTABLE_AND_TEST(
+  KOKKOS_ADD_EXECUTABLE_AND_TEST(
     UnitTest_CudaInterOpInit
     SOURCES
       UnitTestMain.cpp
       cuda/TestCuda_InterOp_Init.cpp
-    COMM serial mpi
-    NUM_MPI_PROCS 1
-    FAIL_REGULAR_EXPRESSION "  FAILED  "
-    TESTONLYLIBS kokkos_gtest ${TEST_LINK_TARGETS}
   )
-  TRIBITS_ADD_EXECUTABLE_AND_TEST(
+  KOKKOS_ADD_EXECUTABLE_AND_TEST(
     UnitTest_CudaInterOpStreams
     SOURCES
       UnitTestMain.cpp
       cuda/TestCuda_InterOp_Streams.cpp
-    COMM serial mpi
-    NUM_MPI_PROCS 1
-    FAIL_REGULAR_EXPRESSION "  FAILED  "
-    TESTONLYLIBS kokkos_gtest ${TEST_LINK_TARGETS}
   )
-ENDIF()
+endif()
 
-TRIBITS_ADD_EXECUTABLE_AND_TEST(
+KOKKOS_ADD_EXECUTABLE_AND_TEST(
   UnitTest_Default
   SOURCES
     UnitTestMainInit.cpp
@@ -792,33 +249,24 @@ TRIBITS_ADD_EXECUTABLE_AND_TEST(
     default/TestDefaultDeviceType_c3.cpp
     default/TestDefaultDeviceType_d.cpp
     default/TestDefaultDeviceTypeResize.cpp
-  COMM serial mpi
-  NUM_MPI_PROCS 1
-  FAIL_REGULAR_EXPRESSION "  FAILED  "
-    TESTONLYLIBS kokkos_gtest ${TEST_LINK_TARGETS}
 )
 
-TRIBITS_ADD_EXECUTABLE_AND_TEST(
+KOKKOS_ADD_EXECUTABLE_AND_TEST(
   UnitTest_PushFinalizeHook
   SOURCES
     UnitTest_PushFinalizeHook.cpp
-  COMM serial mpi
-  NUM_MPI_PROCS 1
-  FAIL_REGULAR_EXPRESSION "FAILED"
-    TESTONLYLIBS kokkos_gtest ${TEST_LINK_TARGETS}
 )
 
 # This test is special, because it passes exactly when it prints the
 # message "PASSED: I am the custom std::terminate handler.", AND calls
 # std::terminate.  This means that we can't use
-# TRIBITS_ADD_EXECUTABLE_AND_TEST.  See GitHub issue #2147.
+# KOKKOS_ADD_EXECUTABLE_AND_TEST.  See GitHub issue #2147.
 
-TRIBITS_ADD_EXECUTABLE( push_finalize_hook_terminate
+KOKKOS_ADD_TEST_EXECUTABLE( push_finalize_hook_terminate
   SOURCES UnitTest_PushFinalizeHook_terminate.cpp
-  TESTONLYLIBS kokkos_gtest ${TEST_LINK_TARGETS}
 )
 
-TRIBITS_ADD_ADVANCED_TEST( UnitTest_PushFinalizeHook_terminate
+KOKKOS_ADD_ADVANCED_TEST( UnitTest_PushFinalizeHook_terminate
   TEST_0
     EXEC push_finalize_hook_terminate
     NUM_MPI_PROCS 1
@@ -827,68 +275,55 @@ TRIBITS_ADD_ADVANCED_TEST( UnitTest_PushFinalizeHook_terminate
     ALWAYS_FAIL_ON_ZERO_RETURN
 )
 
+KOKKOS_ADD_TEST_EXECUTABLE(
+  StackTraceTestExec
+  SOURCES
+    TestStackTrace.cpp
+    TestStackTrace_f0.cpp
+    TestStackTrace_f1.cpp
+    TestStackTrace_f2.cpp
+    TestStackTrace_f3.cpp
+    TestStackTrace_f4.cpp
+)
+# We need -rdynamic on GNU platforms for the stacktrace functionality
+# to work correctly with shared libraries
+if(NOT KOKKOS_HAS_TRILINOS)
+SET_PROPERTY(TARGET StackTraceTestExec PROPERTY ENABLE_EXPORTS 1)
+
+KOKKOS_ADD_TEST( NAME UnitTest_StackTraceTest_normal
+                 EXE  StackTraceTestExec 
+                 FAIL_REGULAR_EXPRESSION "FAILED"
+               )
+
+KOKKOS_ADD_TEST( NAME UnitTest_StackTraceTest_terminate
+                 EXE  StackTraceTestExec
+                 FAIL_REGULAR_EXPRESSION "FAILED"
+               )
+
+KOKKOS_ADD_TEST( NAME UnitTest_StackTraceTest_generic_term
+                 EXE  StackTraceTestExec
+                 FAIL_REGULAR_EXPRESSION "FAILED"
+               )
+endif()
+
 foreach(INITTESTS_NUM RANGE 1 16)
-TRIBITS_ADD_EXECUTABLE_AND_TEST(
+KOKKOS_ADD_EXECUTABLE_AND_TEST(
   UnitTest_DefaultInit_${INITTESTS_NUM}
   SOURCES UnitTestMain.cpp default/TestDefaultDeviceTypeInit_${INITTESTS_NUM}.cpp
-  COMM serial mpi
-  NUM_MPI_PROCS 1
-  FAIL_REGULAR_EXPRESSION "  FAILED  "
-    TESTONLYLIBS kokkos_gtest ${TEST_LINK_TARGETS}
 )
 endforeach(INITTESTS_NUM)
 
-TRIBITS_ADD_EXECUTABLE_AND_TEST(
+if (KOKKOS_ENABLE_HWLOC)
+KOKKOS_ADD_EXECUTABLE_AND_TEST(
   UnitTest_HWLOC
   SOURCES UnitTestMain.cpp  TestHWLOC.cpp
-  COMM serial mpi
-  NUM_MPI_PROCS 1
-  FAIL_REGULAR_EXPRESSION "  FAILED  "
-    TESTONLYLIBS kokkos_gtest ${TEST_LINK_TARGETS}
 )
+endif()
 
-TRIBITS_ADD_EXECUTABLE_AND_TEST(
+KOKKOS_ADD_EXECUTABLE_AND_TEST(
   UnitTest_HostBarrier
   SOURCES UnitTestMain.cpp  TestHostBarrier.cpp
-  COMM serial mpi
-  NUM_MPI_PROCS 1
-  FAIL_REGULAR_EXPRESSION "  FAILED  "
-    TESTONLYLIBS kokkos_gtest ${TEST_LINK_TARGETS}
 )
 
-#
-# Compile-only tests
-#
-FUNCTION(KOKKOS_ADD_COMPILE_TEST TEST_NAME)
 
-  SET(options LINK_KOKKOS)
-  SET(oneValueArgs)
-  SET(multiValueArgs)
-
-  CMAKE_PARSE_ARGUMENTS(PARSE "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN})
-
-  IF(PARSE_LINK_KOKKOS)
-    SET(libs ${TEST_LINK_TARGETS})
-  ELSE()
-    SET(libs)
-  ENDIF()
-
-  TRIBITS_ADD_EXECUTABLE(
-    ${TEST_NAME}
-    TESTONLY
-    COMM serial
-    TESTONLYLIBS ${libs}
-    ${PARSE_UNPARSED_ARGUMENTS}
-  )
-
-  target_compile_options(
-    ${PACKAGE_NAME}_${TEST_NAME}
-    PUBLIC $<$<COMPILE_LANGUAGE:CXX>:${KOKKOS_CXX_FLAGS}>
-  )
-  target_link_libraries(
-    ${PACKAGE_NAME}_${TEST_NAME}
-    PUBLIC ${KOKKOS_LD_FLAGS}
-  )
-
-ENDFUNCTION()
 
diff --git a/lib/kokkos/core/unit_test/Makefile b/lib/kokkos/core/unit_test/Makefile
index 5a69213108..cf945bd718 100644
--- a/lib/kokkos/core/unit_test/Makefile
+++ b/lib/kokkos/core/unit_test/Makefile
@@ -38,6 +38,31 @@ KOKKOS_CXXFLAGS += -I$(GTEST_PATH) -I${KOKKOS_PATH}/core/unit_test
 TEST_TARGETS =
 TARGETS =
 
+KOKKOS_INTERNAL_HAS_OPTIMIZATIONS := $(call kokkos_has_string,$(KOKKOS_CXXFLAGS),O3)
+ifneq ($(KOKKOS_INTERNAL_HAS_OPTIMIZATIONS), 1)
+   KOKKOS_INTERNAL_HAS_OPTIMIZATIONS := $(call kokkos_has_string,$(KOKKOS_CXXFLAGS),O2)
+   ifneq ($(KOKKOS_INTERNAL_HAS_OPTIMIZATIONS), 1)
+      KOKKOS_INTERNAL_HAS_OPTIMIZATIONS := $(call kokkos_has_string,$(CXXFLAGS),O3)
+      ifneq ($(KOKKOS_INTERNAL_HAS_OPTIMIZATIONS), 1)
+         KOKKOS_INTERNAL_HAS_OPTIMIZATIONS := $(call kokkos_has_string,$(CXXFLAGS),O2)
+      endif
+   endif
+endif
+KOKKOS_INTERNAL_USE_RDYNAMIC := $(call kokkos_has_string,$(KOKKOS_CXXFLAGS),rdynamic)
+ifneq ($(KOKKOS_INTERNAL_USE_RDYNAMIC), 1)
+   KOKKOS_INTERNAL_USE_RDYNAMIC := $(call kokkos_has_string,$(CXXFLAGS),rdynamic)
+endif
+
+ifeq ($(KOKKOS_INTERNAL_USE_RDYNAMIC),1) 
+   ifneq ($(KOKKOS_INTERNAL_HAS_OPTIMIZATIONS),1) 
+      STACK_TRACE_TERMINATE_FILTER :=_dynamic
+   else
+      STACK_TRACE_TERMINATE_FILTER :=
+   endif
+else
+   STACK_TRACE_TERMINATE_FILTER :=
+endif
+
 ifeq ($(KOKKOS_INTERNAL_USE_CUDA), 1)
     OBJ_CUDA = UnitTestMainInit.o gtest-all.o
     OBJ_CUDA += TestCuda_Init.o
@@ -45,7 +70,7 @@ ifeq ($(KOKKOS_INTERNAL_USE_CUDA), 1)
     OBJ_CUDA += TestCuda_RangePolicy.o
     OBJ_CUDA += TestCuda_ViewAPI_a.o TestCuda_ViewAPI_b.o TestCuda_ViewAPI_c.o TestCuda_ViewAPI_d.o TestCuda_ViewAPI_e.o
     OBJ_CUDA += TestCuda_DeepCopyAlignment.o
-    OBJ_CUDA += TestCuda_ViewMapping_a.o TestCuda_ViewMapping_b.o TestCuda_ViewMapping_subview.o TestCuda_ViewLayoutStrideAssignment.o
+    OBJ_CUDA += TestCuda_ViewMapping_a.o TestCuda_ViewMapping_b.o TestCuda_ViewMapping_subview.o TestCuda_ViewResize.o TestCuda_ViewLayoutStrideAssignment.o
     OBJ_CUDA += TestCudaUVM_ViewCopy.o TestCudaUVM_ViewAPI_a.o TestCudaUVM_ViewAPI_b.o TestCudaUVM_ViewAPI_c.o TestCudaUVM_ViewAPI_d.o TestCudaUVM_ViewAPI_e.o
     OBJ_CUDA += TestCudaUVM_ViewMapping_a.o TestCudaUVM_ViewMapping_b.o TestCudaUVM_ViewMapping_subview.o
     OBJ_CUDA += TestCudaHostPinned_ViewCopy.o TestCudaHostPinned_ViewAPI_a.o TestCudaHostPinned_ViewAPI_b.o TestCudaHostPinned_ViewAPI_c.o TestCudaHostPinned_ViewAPI_d.o TestCudaHostPinned_ViewAPI_e.o
@@ -76,7 +101,9 @@ ifeq ($(KOKKOS_INTERNAL_USE_CUDA), 1)
     OBJ_CUDA += TestCuda_Spaces.o
     OBJ_CUDA += TestCuda_UniqueToken.o
     OBJ_CUDA += TestCuda_LocalDeepCopy.o
-
+    OBJ_CUDA += TestCuda_DebugSerialExecution.o
+    OBJ_CUDA += TestCuda_DebugPinUVMSpace.o
+  
     TARGETS += KokkosCore_UnitTest_Cuda
     TARGETS += KokkosCore_UnitTest_CudaInterOpInit
     TARGETS += KokkosCore_UnitTest_CudaInterOpStreams
@@ -143,7 +170,7 @@ ifeq ($(KOKKOS_INTERNAL_USE_PTHREADS), 1)
     OBJ_THREADS += TestThreads_View_64bit.o
     OBJ_THREADS += TestThreads_ViewAPI_a.o TestThreads_ViewAPI_b.o TestThreads_ViewAPI_c.o TestThreads_ViewAPI_d.o TestThreads_ViewAPI_e.o
     OBJ_THREADS += TestThreads_DeepCopyAlignment.o
-    OBJ_THREADS += TestThreads_ViewMapping_a.o TestThreads_ViewMapping_b.o TestThreads_ViewMapping_subview.o TestThreads_ViewLayoutStrideAssignment.o
+    OBJ_THREADS += TestThreads_ViewMapping_a.o TestThreads_ViewMapping_b.o TestThreads_ViewMapping_subview.o TestThreads_ViewResize.o TestThreads_ViewLayoutStrideAssignment.o
     OBJ_THREADS += TestThreads_ViewOfClass.o
     OBJ_THREADS += TestThreads_SubView_a.o TestThreads_SubView_b.o
     OBJ_THREADS += TestThreads_SubView_c01.o TestThreads_SubView_c02.o TestThreads_SubView_c03.o
@@ -178,7 +205,7 @@ ifeq ($(KOKKOS_INTERNAL_USE_OPENMP), 1)
     OBJ_OPENMP += TestOpenMP_View_64bit.o
     OBJ_OPENMP += TestOpenMP_ViewAPI_a.o TestOpenMP_ViewAPI_b.o TestOpenMP_ViewAPI_c.o TestOpenMP_ViewAPI_d.o TestOpenMP_ViewAPI_e.o
     OBJ_OPENMP += TestOpenMP_DeepCopyAlignment.o
-    OBJ_OPENMP += TestOpenMP_ViewMapping_a.o TestOpenMP_ViewMapping_b.o TestOpenMP_ViewMapping_subview.o TestOpenMP_ViewLayoutStrideAssignment.o
+    OBJ_OPENMP += TestOpenMP_ViewMapping_a.o TestOpenMP_ViewMapping_b.o TestOpenMP_ViewMapping_subview.o TestOpenMP_ViewResize.o TestOpenMP_ViewLayoutStrideAssignment.o
     OBJ_OPENMP += TestOpenMP_ViewOfClass.o
     OBJ_OPENMP += TestOpenMP_SubView_a.o TestOpenMP_SubView_b.o
     OBJ_OPENMP += TestOpenMP_SubView_c01.o TestOpenMP_SubView_c02.o TestOpenMP_SubView_c03.o
@@ -272,7 +299,7 @@ ifeq ($(KOKKOS_INTERNAL_USE_HPX), 1)
 	OBJ_HPX += TestHPX_RangePolicy.o
 	OBJ_HPX += TestHPX_View_64bit.o
 	OBJ_HPX += TestHPX_ViewAPI_a.o TestHPX_ViewAPI_b.o TestHPX_ViewAPI_c.o TestHPX_ViewAPI_d.o TestHPX_ViewAPI_e.o
-	OBJ_HPX += TestHPX_ViewMapping_a.o TestHPX_ViewMapping_b.o TestHPX_ViewMapping_subview.o
+	OBJ_HPX += TestHPX_ViewMapping_a.o TestHPX_ViewMapping_b.o TestHPX_ViewMapping_subview.o TestHPX_ViewResize.o
 	OBJ_HPX += TestHPX_ViewOfClass.o
 	OBJ_HPX += TestHPX_SubView_a.o TestHPX_SubView_b.o
 	OBJ_HPX += TestHPX_SubView_c01.o TestHPX_SubView_c02.o TestHPX_SubView_c03.o
@@ -312,7 +339,7 @@ ifeq ($(KOKKOS_INTERNAL_USE_SERIAL), 1)
     OBJ_SERIAL += TestSerial_View_64bit.o
     OBJ_SERIAL += TestSerial_ViewAPI_a.o TestSerial_ViewAPI_b.o TestSerial_ViewAPI_c.o TestSerial_ViewAPI_d.o TestSerial_ViewAPI_e.o
     OBJ_SERIAL += TestSerial_DeepCopyAlignment.o
-    OBJ_SERIAL += TestSerial_ViewMapping_a.o TestSerial_ViewMapping_b.o TestSerial_ViewMapping_subview.o TestSerial_ViewLayoutStrideAssignment.o
+    OBJ_SERIAL += TestSerial_ViewMapping_a.o TestSerial_ViewMapping_b.o TestSerial_ViewMapping_subview.o TestSerial_ViewResize.o TestSerial_ViewLayoutStrideAssignment.o
     OBJ_SERIAL += TestSerial_ViewOfClass.o
     OBJ_SERIAL += TestSerial_SubView_a.o TestSerial_SubView_b.o
     OBJ_SERIAL += TestSerial_SubView_c01.o TestSerial_SubView_c02.o TestSerial_SubView_c03.o
@@ -373,6 +400,11 @@ TEST_TARGETS += test-push-finalize-hook
 TARGETS += KokkosCore_UnitTest_PushFinalizeHook_terminate
 TEST_TARGETS += test-push-finalize-hook-terminate
 
+TARGETS += KokkosCore_UnitTest_StackTraceTestExec
+TEST_TARGETS += test-stack-trace
+TEST_TARGETS += test-stack-trace-terminate
+TEST_TARGETS += test-stack-trace-generic-term
+
 NUM_INITTESTS = 16
 INITTESTS_NUMBERS := $(shell seq 1 ${NUM_INITTESTS})
 INITTESTS_TARGETS := $(addprefix KokkosCore_UnitTest_DefaultDeviceTypeInit_,${INITTESTS_NUMBERS})
@@ -440,6 +472,9 @@ KokkosCore_UnitTest_PushFinalizeHook_terminate: $(OBJ_DEFAULT) $(KOKKOS_LINK_DEP
 ${INITTESTS_TARGETS}: KokkosCore_UnitTest_DefaultDeviceTypeInit_%: TestDefaultDeviceTypeInit_%.o UnitTestMain.o gtest-all.o $(KOKKOS_LINK_DEPENDS)
 	$(LINK) $(EXTRA_PATH) TestDefaultDeviceTypeInit_$*.o UnitTestMain.o gtest-all.o $(KOKKOS_LIBS) $(LIB) $(KOKKOS_LDFLAGS) $(LDFLAGS) -o KokkosCore_UnitTest_DefaultDeviceTypeInit_$*
 
+KokkosCore_UnitTest_StackTraceTestExec: TestStackTrace.o  TestStackTrace_f0.o TestStackTrace_f1.o TestStackTrace_f2.o TestStackTrace_f3.o TestStackTrace_f4.o $(KOKKOS_LINK_DEPENDS) gtest-all.o
+	$(LINK) $(EXTRA_PATH) TestStackTrace.o TestStackTrace_f0.o TestStackTrace_f1.o TestStackTrace_f2.o TestStackTrace_f3.o TestStackTrace_f4.o gtest-all.o $(KOKKOS_LIBS) $(LIB) $(KOKKOS_LDFLAGS) $(LDFLAGS) -o KokkosCore_UnitTest_StackTraceTestExec
+
 test-cuda: KokkosCore_UnitTest_Cuda
 	./KokkosCore_UnitTest_Cuda
 	./KokkosCore_UnitTest_CudaInterOpInit
@@ -486,6 +521,16 @@ test-push-finalize-hook: KokkosCore_UnitTest_PushFinalizeHook
 
 test-push-finalize-hook-terminate: KokkosCore_UnitTest_PushFinalizeHook_terminate
 	./KokkosCore_UnitTest_PushFinalizeHook_terminate
+	
+test-stack-trace: KokkosCore_UnitTest_StackTraceTestExec
+	./KokkosCore_UnitTest_StackTraceTestExec --gtest_filter=*normal$(STACK_TRACE_TERMINATE_FILTER)
+
+test-stack-trace-terminate: KokkosCore_UnitTest_StackTraceTestExec
+	./KokkosCore_UnitTest_StackTraceTestExec --gtest_filter=*terminate$(STACK_TRACE_TERMINATE_FILTER)
+
+test-stack-trace-generic-term: KokkosCore_UnitTest_StackTraceTestExec
+	./KokkosCore_UnitTest_StackTraceTestExec --gtest_filter=*generic_term$(STACK_TRACE_TERMINATE_FILTER)
+
 
 ${INITTESTS_TEST_TARGETS}: test-default-init-%: KokkosCore_UnitTest_DefaultDeviceTypeInit_%
 	./KokkosCore_UnitTest_DefaultDeviceTypeInit_$*
diff --git a/lib/kokkos/core/unit_test/TestAggregate.hpp b/lib/kokkos/core/unit_test/TestAggregate.hpp
index 83813b5b1b..1f812cc11e 100644
--- a/lib/kokkos/core/unit_test/TestAggregate.hpp
+++ b/lib/kokkos/core/unit_test/TestAggregate.hpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -54,43 +55,53 @@
 
 namespace Test {
 
-template< class DeviceType >
-void TestViewAggregate()
-{
-  typedef Kokkos::Array< double, 32 >  value_type;
-  typedef Kokkos::Impl::ViewDataAnalysis< value_type *, Kokkos::LayoutLeft, value_type > analysis_1d;
+template <class DeviceType>
+void TestViewAggregate() {
+  typedef Kokkos::Array<double, 32> value_type;
+  typedef Kokkos::Impl::ViewDataAnalysis<value_type *, Kokkos::LayoutLeft,
+                                         value_type>
+      analysis_1d;
 
-  static_assert( std::is_same< typename analysis_1d::specialize, Kokkos::Array<> >::value, "" );
+  static_assert(
+      std::is_same<typename analysis_1d::specialize, Kokkos::Array<> >::value,
+      "");
 
-  typedef Kokkos::ViewTraits< value_type **, DeviceType > a32_traits;
-  typedef Kokkos::ViewTraits< typename a32_traits::scalar_array_type, DeviceType > flat_traits;
+  typedef Kokkos::ViewTraits<value_type **, DeviceType> a32_traits;
+  typedef Kokkos::ViewTraits<typename a32_traits::scalar_array_type, DeviceType>
+      flat_traits;
 
-  static_assert( std::is_same< typename a32_traits::specialize, Kokkos::Array<> >::value, "" );
-  static_assert( std::is_same< typename a32_traits::value_type, value_type >::value, "" );
-  static_assert( a32_traits::rank == 2, "" );
-  static_assert( a32_traits::rank_dynamic == 2, "" );
+  static_assert(
+      std::is_same<typename a32_traits::specialize, Kokkos::Array<> >::value,
+      "");
+  static_assert(
+      std::is_same<typename a32_traits::value_type, value_type>::value, "");
+  static_assert(a32_traits::rank == 2, "");
+  static_assert(a32_traits::rank_dynamic == 2, "");
 
-  static_assert( std::is_same< typename flat_traits::specialize, void >::value, "" );
-  static_assert( flat_traits::rank == 3, "" );
-  static_assert( flat_traits::rank_dynamic == 2, "" );
-  static_assert( flat_traits::dimension::N2 == 32, "" );
+  static_assert(std::is_same<typename flat_traits::specialize, void>::value,
+                "");
+  static_assert(flat_traits::rank == 3, "");
+  static_assert(flat_traits::rank_dynamic == 2, "");
+  static_assert(flat_traits::dimension::N2 == 32, "");
 
-  typedef Kokkos::View< Kokkos::Array< double, 32 > **, DeviceType > a32_type;
-  typedef typename a32_type::array_type  a32_flat_type;
+  typedef Kokkos::View<Kokkos::Array<double, 32> **, DeviceType> a32_type;
+  typedef typename a32_type::array_type a32_flat_type;
 
-  static_assert( std::is_same< typename a32_type::value_type, value_type >::value, "" );
-  static_assert( std::is_same< typename a32_type::pointer_type, double * >::value, "" );
-  static_assert( a32_type::Rank == 2, "" );
-  static_assert( a32_flat_type::Rank == 3, "" );
+  static_assert(std::is_same<typename a32_type::value_type, value_type>::value,
+                "");
+  static_assert(std::is_same<typename a32_type::pointer_type, double *>::value,
+                "");
+  static_assert(a32_type::Rank == 2, "");
+  static_assert(a32_flat_type::Rank == 3, "");
 
-  a32_type x( "test", 4, 5 );
-  a32_flat_type y( x );
+  a32_type x("test", 4, 5);
+  a32_flat_type y(x);
 
-  ASSERT_EQ( x.extent( 0 ), 4 );
-  ASSERT_EQ( x.extent( 1 ), 5 );
-  ASSERT_EQ( y.extent( 0 ), 4 );
-  ASSERT_EQ( y.extent( 1 ), 5 );
-  ASSERT_EQ( y.extent( 2 ), 32 );
+  ASSERT_EQ(x.extent(0), 4);
+  ASSERT_EQ(x.extent(1), 5);
+  ASSERT_EQ(y.extent(0), 4);
+  ASSERT_EQ(y.extent(1), 5);
+  ASSERT_EQ(y.extent(2), 32);
 
   // Initialize arrays from brace-init-list as for std::array.
   //
@@ -101,29 +112,36 @@ void TestViewAggregate()
   //            warning: suggest braces around initialization of subobject
   //
   //          but single brace syntax would be valid as well.
-  Kokkos::Array< float, 2 > aggregate_initialization_syntax_1 = { { 1.41, 3.14 } };
-  ASSERT_FLOAT_EQ( aggregate_initialization_syntax_1[0], 1.41 );
-  ASSERT_FLOAT_EQ( aggregate_initialization_syntax_1[1], 3.14 );
+  Kokkos::Array<float, 2> aggregate_initialization_syntax_1 = {{1.41, 3.14}};
+  ASSERT_FLOAT_EQ(aggregate_initialization_syntax_1[0], 1.41);
+  ASSERT_FLOAT_EQ(aggregate_initialization_syntax_1[1], 3.14);
 
-  Kokkos::Array< int, 3 > aggregate_initialization_syntax_2{ { 0, 1, 2 } }; // since C++11
-  for ( int i = 0; i < 3; ++i ) {
-    ASSERT_EQ( aggregate_initialization_syntax_2[i], i );
+  Kokkos::Array<int, 3> aggregate_initialization_syntax_2{
+      {0, 1, 2}};  // since C++11
+  for (int i = 0; i < 3; ++i) {
+    ASSERT_EQ(aggregate_initialization_syntax_2[i], i);
   }
 
   // Note that this is a valid initialization.
-  Kokkos::Array< double, 3 > initialized_with_one_argument_missing = { { 255, 255 } };
+  Kokkos::Array<double, 3> initialized_with_one_argument_missing = {{255, 255}};
   for (int i = 0; i < 2; ++i) {
-    ASSERT_DOUBLE_EQ( initialized_with_one_argument_missing[i], 255 );
+    ASSERT_DOUBLE_EQ(initialized_with_one_argument_missing[i], 255);
   }
   // But the following line would not compile
-//  Kokkos::Array< double, 3 > initialized_with_too_many{ { 1, 2, 3, 4 } };
+  //  Kokkos::Array< double, 3 > initialized_with_too_many{ { 1, 2, 3, 4 } };
+
+  // The code below must compile for zero-sized arrays.
+  using T = float;
+
+  constexpr int N = 0;
+  Kokkos::Array<T, N> a;
+  for (int i = 0; i < N; ++i) {
+    a[i] = T();
+  }
 }
 
-TEST_F( TEST_CATEGORY, view_aggregate )
-{
-  TestViewAggregate< TEST_EXECSPACE >();
-}
+TEST(TEST_CATEGORY, view_aggregate) { TestViewAggregate<TEST_EXECSPACE>(); }
 
-} // namespace Test
+}  // namespace Test
 
 #endif /* #ifndef TEST_AGGREGATE_HPP */
diff --git a/lib/kokkos/core/unit_test/TestAtomic.hpp b/lib/kokkos/core/unit_test/TestAtomic.hpp
index ee93d53470..a72a179e02 100644
--- a/lib/kokkos/core/unit_test/TestAtomic.hpp
+++ b/lib/kokkos/core/unit_test/TestAtomic.hpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -47,201 +48,194 @@ namespace TestAtomic {
 
 // Struct for testing arbitrary size atomics.
 
-template< int N >
+template <int N>
 struct SuperScalar {
   double val[N];
 
   KOKKOS_INLINE_FUNCTION
   SuperScalar() {
-    for ( int i = 0; i < N; i++ ) {
+    for (int i = 0; i < N; i++) {
       val[i] = 0.0;
     }
   }
 
   KOKKOS_INLINE_FUNCTION
-  SuperScalar( const SuperScalar & src ) {
-    for ( int i = 0; i < N; i++ ) {
+  SuperScalar(const SuperScalar& src) {
+    for (int i = 0; i < N; i++) {
       val[i] = src.val[i];
     }
   }
 
   KOKKOS_INLINE_FUNCTION
-  SuperScalar( const volatile SuperScalar & src ) {
-    for ( int i = 0; i < N; i++ ) {
+  SuperScalar(const volatile SuperScalar& src) {
+    for (int i = 0; i < N; i++) {
       val[i] = src.val[i];
     }
   }
 
   KOKKOS_INLINE_FUNCTION
-  SuperScalar& operator=( const SuperScalar & src ) {
-    for ( int i = 0; i < N; i++ ) {
+  SuperScalar& operator=(const SuperScalar& src) {
+    for (int i = 0; i < N; i++) {
       val[i] = src.val[i];
     }
     return *this;
   }
 
   KOKKOS_INLINE_FUNCTION
-  SuperScalar& operator=( const volatile SuperScalar & src ) {
-    for ( int i = 0; i < N; i++ ) {
+  SuperScalar& operator=(const volatile SuperScalar& src) {
+    for (int i = 0; i < N; i++) {
       val[i] = src.val[i];
     }
     return *this;
   }
 
   KOKKOS_INLINE_FUNCTION
-  void operator=( const SuperScalar & src ) volatile  {
-    for ( int i = 0; i < N; i++ ) {
+  void operator=(const SuperScalar& src) volatile {
+    for (int i = 0; i < N; i++) {
       val[i] = src.val[i];
     }
   }
 
   KOKKOS_INLINE_FUNCTION
-  SuperScalar operator+( const SuperScalar & src ) {
+  SuperScalar operator+(const SuperScalar& src) {
     SuperScalar tmp = *this;
-    for ( int i = 0; i < N; i++ ) {
+    for (int i = 0; i < N; i++) {
       tmp.val[i] += src.val[i];
     }
     return tmp;
   }
 
   KOKKOS_INLINE_FUNCTION
-  SuperScalar& operator+=( const double & src ) {
-    for ( int i = 0; i < N; i++ ) {
-      val[i] += 1.0 * ( i + 1 ) * src;
+  SuperScalar& operator+=(const double& src) {
+    for (int i = 0; i < N; i++) {
+      val[i] += 1.0 * (i + 1) * src;
     }
     return *this;
   }
 
   KOKKOS_INLINE_FUNCTION
-  SuperScalar& operator+=( const SuperScalar & src ) {
-    for ( int i = 0; i < N; i++ ) {
+  SuperScalar& operator+=(const SuperScalar& src) {
+    for (int i = 0; i < N; i++) {
       val[i] += src.val[i];
     }
     return *this;
   }
 
   KOKKOS_INLINE_FUNCTION
-  bool operator==( const SuperScalar & src ) {
+  bool operator==(const SuperScalar& src) {
     bool compare = true;
-    for( int i = 0; i < N; i++ ) {
-      compare = compare && ( val[i] == src.val[i] );
+    for (int i = 0; i < N; i++) {
+      compare = compare && (val[i] == src.val[i]);
     }
     return compare;
   }
 
   KOKKOS_INLINE_FUNCTION
-  bool operator!=( const SuperScalar & src ) {
+  bool operator!=(const SuperScalar& src) {
     bool compare = true;
-    for ( int i = 0; i < N; i++ ) {
-      compare = compare && ( val[i] == src.val[i] );
+    for (int i = 0; i < N; i++) {
+      compare = compare && (val[i] == src.val[i]);
     }
     return !compare;
   }
 
   KOKKOS_INLINE_FUNCTION
-  SuperScalar( const double & src ) {
-    for ( int i = 0; i < N; i++ ) {
-      val[i] = 1.0 * ( i + 1 ) * src;
+  SuperScalar(const double& src) {
+    for (int i = 0; i < N; i++) {
+      val[i] = 1.0 * (i + 1) * src;
     }
   }
 };
 
-template< int N >
-std::ostream & operator<<( std::ostream & os, const SuperScalar< N > & dt )
-{
+template <int N>
+std::ostream& operator<<(std::ostream& os, const SuperScalar<N>& dt) {
   os << "{ ";
-  for ( int  i = 0; i < N - 1; i++ ) {
-     os << dt.val[i] << ", ";
+  for (int i = 0; i < N - 1; i++) {
+    os << dt.val[i] << ", ";
   }
-  os << dt.val[N-1] << "}";
+  os << dt.val[N - 1] << "}";
 
   return os;
 }
 
-template< class T, class DEVICE_TYPE >
+template <class T, class DEVICE_TYPE>
 struct ZeroFunctor {
   typedef DEVICE_TYPE execution_space;
-  typedef typename Kokkos::View< T, execution_space > type;
-  typedef typename Kokkos::View< T, execution_space >::HostMirror h_type;
+  typedef typename Kokkos::View<T, execution_space> type;
+  typedef typename Kokkos::View<T, execution_space>::HostMirror h_type;
 
   type data;
 
   KOKKOS_INLINE_FUNCTION
-  void operator()( int ) const {
-    data() = 0;
-  }
+  void operator()(int) const { data() = 0; }
 };
 
 //---------------------------------------------------
 //--------------atomic_fetch_add---------------------
 //---------------------------------------------------
 
-template< class T, class DEVICE_TYPE >
+template <class T, class DEVICE_TYPE>
 struct AddFunctor {
   typedef DEVICE_TYPE execution_space;
-  typedef Kokkos::View< T, execution_space > type;
+  typedef Kokkos::View<T, execution_space> type;
 
   type data;
 
   KOKKOS_INLINE_FUNCTION
-  void operator()( int ) const {
-    Kokkos::atomic_fetch_add( &data(), (T) 1 );
-  }
+  void operator()(int) const { Kokkos::atomic_fetch_add(&data(), (T)1); }
 };
 
-template< class T, class DEVICE_TYPE >
+template <class T, class DEVICE_TYPE>
 struct AddFunctorReduce {
   typedef DEVICE_TYPE execution_space;
-  typedef Kokkos::View< T, execution_space > type;
+  typedef Kokkos::View<T, execution_space> type;
 
   type data;
 
   KOKKOS_INLINE_FUNCTION
-  void operator()( int , int& ) const {
-    Kokkos::atomic_fetch_add( &data(), (T) 1 );
-  }
+  void operator()(int, int&) const { Kokkos::atomic_fetch_add(&data(), (T)1); }
 };
 
-template< class T, class execution_space >
-T AddLoop( int loop ) {
-  struct ZeroFunctor< T, execution_space > f_zero;
-  typename ZeroFunctor< T, execution_space >::type data( "Data" );
-  typename ZeroFunctor< T, execution_space >::h_type h_data( "HData" );
+template <class T, class execution_space>
+T AddLoop(int loop) {
+  struct ZeroFunctor<T, execution_space> f_zero;
+  typename ZeroFunctor<T, execution_space>::type data("Data");
+  typename ZeroFunctor<T, execution_space>::h_type h_data("HData");
 
   f_zero.data = data;
 
-  Kokkos::parallel_for( 1, f_zero );
+  Kokkos::parallel_for(1, f_zero);
   execution_space().fence();
 
-  struct AddFunctor< T, execution_space > f_add;
+  struct AddFunctor<T, execution_space> f_add;
 
   f_add.data = data;
-  Kokkos::parallel_for( loop, f_add );
+  Kokkos::parallel_for(loop, f_add);
   execution_space().fence();
 
-  Kokkos::deep_copy( h_data, data );
+  Kokkos::deep_copy(h_data, data);
   T val = h_data();
 
-  struct AddFunctorReduce< T, execution_space > f_add_red;
+  struct AddFunctorReduce<T, execution_space> f_add_red;
   f_add_red.data = data;
   int dummy_result;
-  Kokkos::parallel_reduce( loop, f_add_red , dummy_result );
+  Kokkos::parallel_reduce(loop, f_add_red, dummy_result);
   execution_space().fence();
 
   return val;
 }
 
-template< class T >
-T AddLoopSerial( int loop ) {
+template <class T>
+T AddLoopSerial(int loop) {
   T* data = new T[1];
   data[0] = 0;
 
-  for ( int i = 0; i < loop; i++ ) {
-    *data += (T) 1;
+  for (int i = 0; i < loop; i++) {
+    *data += (T)1;
   }
 
   T val = *data;
-  delete [] data;
+  delete[] data;
 
   return val;
 }
@@ -250,93 +244,93 @@ T AddLoopSerial( int loop ) {
 //--------------atomic_compare_exchange-----------------
 //------------------------------------------------------
 
-template< class T, class DEVICE_TYPE >
+template <class T, class DEVICE_TYPE>
 struct CASFunctor {
   typedef DEVICE_TYPE execution_space;
-  typedef Kokkos::View< T, execution_space > type;
+  typedef Kokkos::View<T, execution_space> type;
 
   type data;
 
   KOKKOS_INLINE_FUNCTION
-  void operator()( int ) const {
+  void operator()(int) const {
     T old = data();
     T newval, assumed;
 
     do {
       assumed = old;
-      newval = assumed + (T) 1;
-      old = Kokkos::atomic_compare_exchange( &data(), assumed, newval );
-    } while( old != assumed );
+      newval  = assumed + (T)1;
+      old     = Kokkos::atomic_compare_exchange(&data(), assumed, newval);
+    } while (old != assumed);
   }
 };
 
-template< class T, class DEVICE_TYPE >
+template <class T, class DEVICE_TYPE>
 struct CASFunctorReduce {
   typedef DEVICE_TYPE execution_space;
-  typedef Kokkos::View< T, execution_space > type;
+  typedef Kokkos::View<T, execution_space> type;
 
   type data;
 
   KOKKOS_INLINE_FUNCTION
-  void operator()( int , int& ) const {
+  void operator()(int, int&) const {
     T old = data();
     T newval, assumed;
 
     do {
       assumed = old;
-      newval = assumed + (T) 1;
-      old = Kokkos::atomic_compare_exchange( &data(), assumed, newval );
-    } while( old != assumed );
+      newval  = assumed + (T)1;
+      old     = Kokkos::atomic_compare_exchange(&data(), assumed, newval);
+    } while (old != assumed);
   }
 };
 
-template< class T, class execution_space >
-T CASLoop( int loop ) {
-  struct ZeroFunctor< T, execution_space > f_zero;
-  typename ZeroFunctor< T, execution_space >::type data( "Data" );
-  typename ZeroFunctor< T, execution_space >::h_type h_data( "HData" );
+template <class T, class execution_space>
+T CASLoop(int loop) {
+  struct ZeroFunctor<T, execution_space> f_zero;
+  typename ZeroFunctor<T, execution_space>::type data("Data");
+  typename ZeroFunctor<T, execution_space>::h_type h_data("HData");
 
   f_zero.data = data;
-  Kokkos::parallel_for( 1, f_zero );
+  Kokkos::parallel_for(1, f_zero);
   execution_space().fence();
 
-  struct CASFunctor< T, execution_space > f_cas;
+  struct CASFunctor<T, execution_space> f_cas;
   f_cas.data = data;
-  Kokkos::parallel_for( loop, f_cas );
+  Kokkos::parallel_for(loop, f_cas);
   execution_space().fence();
 
-  Kokkos::deep_copy( h_data, data );
+  Kokkos::deep_copy(h_data, data);
   T val = h_data();
 
-  struct CASFunctorReduce< T, execution_space > f_cas_red;
+  struct CASFunctorReduce<T, execution_space> f_cas_red;
   f_cas_red.data = data;
   int dummy_result;
-  Kokkos::parallel_reduce( loop, f_cas_red , dummy_result );
+  Kokkos::parallel_reduce(loop, f_cas_red, dummy_result);
   execution_space().fence();
 
   return val;
 }
 
-template< class T >
-T CASLoopSerial( int loop ) {
+template <class T>
+T CASLoopSerial(int loop) {
   T* data = new T[1];
   data[0] = 0;
 
-  for ( int i = 0; i < loop; i++ ) {
+  for (int i = 0; i < loop; i++) {
     T assumed;
     T newval;
     T old;
 
     do {
       assumed = *data;
-      newval = assumed + (T) 1;
-      old = *data;
-      *data = newval;
-    } while( !( assumed == old ) );
+      newval  = assumed + (T)1;
+      old     = *data;
+      *data   = newval;
+    } while (!(assumed == old));
   }
 
   T val = *data;
-  delete [] data;
+  delete[] data;
 
   return val;
 }
@@ -345,209 +339,228 @@ T CASLoopSerial( int loop ) {
 //--------------atomic_exchange-----------------
 //----------------------------------------------
 
-template< class T, class DEVICE_TYPE >
+template <class T, class DEVICE_TYPE>
 struct ExchFunctor {
   typedef DEVICE_TYPE execution_space;
-  typedef Kokkos::View< T, execution_space > type;
+  typedef Kokkos::View<T, execution_space> type;
 
   type data, data2;
 
   KOKKOS_INLINE_FUNCTION
-  void operator()( int i ) const {
-    T old = Kokkos::atomic_exchange( &data(), (T) i );
-    Kokkos::atomic_fetch_add( &data2(), old );
+  void operator()(int i) const {
+    T old = Kokkos::atomic_exchange(&data(), (T)i);
+    Kokkos::atomic_fetch_add(&data2(), old);
   }
 };
 
-template< class T, class DEVICE_TYPE >
+template <class T, class DEVICE_TYPE>
 struct ExchFunctorReduce {
   typedef DEVICE_TYPE execution_space;
-  typedef Kokkos::View< T, execution_space > type;
+  typedef Kokkos::View<T, execution_space> type;
 
   type data, data2;
 
   KOKKOS_INLINE_FUNCTION
-  void operator()( int i , int& ) const {
-    T old = Kokkos::atomic_exchange( &data(), (T) i );
-    Kokkos::atomic_fetch_add( &data2(), old );
+  void operator()(int i, int&) const {
+    T old = Kokkos::atomic_exchange(&data(), (T)i);
+    Kokkos::atomic_fetch_add(&data2(), old);
   }
 };
 
-template< class T, class execution_space >
-T ExchLoop( int loop ) {
-  struct ZeroFunctor< T, execution_space > f_zero;
-  typename ZeroFunctor< T, execution_space >::type data( "Data" );
-  typename ZeroFunctor< T, execution_space >::h_type h_data( "HData" );
+template <class T, class execution_space>
+T ExchLoop(int loop) {
+  struct ZeroFunctor<T, execution_space> f_zero;
+  typename ZeroFunctor<T, execution_space>::type data("Data");
+  typename ZeroFunctor<T, execution_space>::h_type h_data("HData");
 
   f_zero.data = data;
-  Kokkos::parallel_for( 1, f_zero );
+  Kokkos::parallel_for(1, f_zero);
   execution_space().fence();
 
-  typename ZeroFunctor< T, execution_space >::type data2( "Data" );
-  typename ZeroFunctor< T, execution_space >::h_type h_data2( "HData" );
+  typename ZeroFunctor<T, execution_space>::type data2("Data");
+  typename ZeroFunctor<T, execution_space>::h_type h_data2("HData");
 
   f_zero.data = data2;
-  Kokkos::parallel_for( 1, f_zero );
+  Kokkos::parallel_for(1, f_zero);
   execution_space().fence();
 
-  struct ExchFunctor< T, execution_space > f_exch;
-  f_exch.data = data;
+  struct ExchFunctor<T, execution_space> f_exch;
+  f_exch.data  = data;
   f_exch.data2 = data2;
-  Kokkos::parallel_for( loop, f_exch );
+  Kokkos::parallel_for(loop, f_exch);
   execution_space().fence();
 
-  Kokkos::deep_copy( h_data, data );
-  Kokkos::deep_copy( h_data2, data2 );
+  Kokkos::deep_copy(h_data, data);
+  Kokkos::deep_copy(h_data2, data2);
   T val = h_data() + h_data2();
 
-  struct ExchFunctorReduce< T, execution_space > f_exch_red;
-  f_exch_red.data = data;
+  struct ExchFunctorReduce<T, execution_space> f_exch_red;
+  f_exch_red.data  = data;
   f_exch_red.data2 = data2;
   int dummy_result;
-  Kokkos::parallel_reduce( loop, f_exch_red , dummy_result );
+  Kokkos::parallel_reduce(loop, f_exch_red, dummy_result);
   execution_space().fence();
 
   return val;
 }
 
-template< class T >
-T ExchLoopSerial( typename std::conditional< !std::is_same< T, Kokkos::complex<double> >::value, int, void >::type loop ) {
-  T* data = new T[1];
+template <class T>
+T ExchLoopSerial(
+    typename std::conditional<!std::is_same<T, Kokkos::complex<double> >::value,
+                              int, void>::type loop) {
+  T* data  = new T[1];
   T* data2 = new T[1];
-  data[0] = 0;
+  data[0]  = 0;
   data2[0] = 0;
 
-  for ( int i = 0; i < loop; i++ ) {
+  for (int i = 0; i < loop; i++) {
     T old = *data;
-    *data = (T) i;
+    *data = (T)i;
     *data2 += old;
   }
 
   T val = *data2 + *data;
-  delete [] data;
-  delete [] data2;
+  delete[] data;
+  delete[] data2;
 
   return val;
 }
 
-template< class T >
-T ExchLoopSerial( typename std::conditional< std::is_same< T, Kokkos::complex<double> >::value, int, void >::type loop ) {
-  T* data = new T[1];
+template <class T>
+T ExchLoopSerial(
+    typename std::conditional<std::is_same<T, Kokkos::complex<double> >::value,
+                              int, void>::type loop) {
+  T* data  = new T[1];
   T* data2 = new T[1];
-  data[0] = 0;
+  data[0]  = 0;
   data2[0] = 0;
 
-  for ( int i = 0; i < loop; i++ ) {
-    T old = *data;
-    data->real() = ( static_cast<double>( i ) );
+  for (int i = 0; i < loop; i++) {
+    T old        = *data;
+    data->real() = (static_cast<double>(i));
     data->imag() = 0;
     *data2 += old;
   }
 
   T val = *data2 + *data;
-  delete [] data;
-  delete [] data2;
+  delete[] data;
+  delete[] data2;
 
   return val;
 }
 
-template< class T, class DeviceType >
-T LoopVariant( int loop, int test ) {
-  switch ( test ) {
-    case 1: return AddLoop< T, DeviceType >( loop );
-    case 2: return CASLoop< T, DeviceType >( loop );
-    case 3: return ExchLoop< T, DeviceType >( loop );
+template <class T, class DeviceType>
+T LoopVariant(int loop, int test) {
+  switch (test) {
+    case 1: return AddLoop<T, DeviceType>(loop);
+    case 2: return CASLoop<T, DeviceType>(loop);
+    case 3: return ExchLoop<T, DeviceType>(loop);
   }
 
   return 0;
 }
 
-template< class T >
-T LoopVariantSerial( int loop, int test ) {
-  switch ( test ) {
-    case 1: return AddLoopSerial< T >( loop );
-    case 2: return CASLoopSerial< T >( loop );
-    case 3: return ExchLoopSerial< T >( loop );
+template <class T>
+T LoopVariantSerial(int loop, int test) {
+  switch (test) {
+    case 1: return AddLoopSerial<T>(loop);
+    case 2: return CASLoopSerial<T>(loop);
+    case 3: return ExchLoopSerial<T>(loop);
   }
 
   return 0;
 }
 
-template< class T, class DeviceType >
-bool Loop( int loop, int test )
-{
-  T res       = LoopVariant< T, DeviceType >( loop, test );
-  T resSerial = LoopVariantSerial< T >( loop, test );
+template <class T, class DeviceType>
+bool Loop(int loop, int test) {
+  T res       = LoopVariant<T, DeviceType>(loop, test);
+  T resSerial = LoopVariantSerial<T>(loop, test);
 
   bool passed = true;
 
-  if ( resSerial != res ) {
+  if (resSerial != res) {
     passed = false;
 
-    std::cout << "Loop<"
-              << typeid( T ).name()
-              << ">( test = "
-              << test << " FAILED : "
-              << resSerial << " != " << res
-              << std::endl;
+    std::cout << "Loop<" << typeid(T).name() << ">( test = " << test
+              << " FAILED : " << resSerial << " != " << res << std::endl;
   }
 
   return passed;
 }
 
-} // namespace TestAtomic
+}  // namespace TestAtomic
 
 namespace Test {
 
-TEST_F( TEST_CATEGORY, atomics )
-{
+TEST(TEST_CATEGORY, atomics) {
   const int loop_count = 1e4;
 
-  ASSERT_TRUE( ( TestAtomic::Loop< int, TEST_EXECSPACE >( loop_count, 1 ) ) );
-  ASSERT_TRUE( ( TestAtomic::Loop< int, TEST_EXECSPACE >( loop_count, 2 ) ) );
-  ASSERT_TRUE( ( TestAtomic::Loop< int, TEST_EXECSPACE >( loop_count, 3 ) ) );
+  ASSERT_TRUE((TestAtomic::Loop<int, TEST_EXECSPACE>(loop_count, 1)));
+  ASSERT_TRUE((TestAtomic::Loop<int, TEST_EXECSPACE>(loop_count, 2)));
+  ASSERT_TRUE((TestAtomic::Loop<int, TEST_EXECSPACE>(loop_count, 3)));
 
-  ASSERT_TRUE( ( TestAtomic::Loop< unsigned int, TEST_EXECSPACE >( loop_count, 1 ) ) );
-  ASSERT_TRUE( ( TestAtomic::Loop< unsigned int, TEST_EXECSPACE >( loop_count, 2 ) ) );
-  ASSERT_TRUE( ( TestAtomic::Loop< unsigned int, TEST_EXECSPACE >( loop_count, 3 ) ) );
+  ASSERT_TRUE((TestAtomic::Loop<unsigned int, TEST_EXECSPACE>(loop_count, 1)));
+  ASSERT_TRUE((TestAtomic::Loop<unsigned int, TEST_EXECSPACE>(loop_count, 2)));
+  ASSERT_TRUE((TestAtomic::Loop<unsigned int, TEST_EXECSPACE>(loop_count, 3)));
 
-  ASSERT_TRUE( ( TestAtomic::Loop< long int, TEST_EXECSPACE >( loop_count, 1 ) ) );
-  ASSERT_TRUE( ( TestAtomic::Loop< long int, TEST_EXECSPACE >( loop_count, 2 ) ) );
-  ASSERT_TRUE( ( TestAtomic::Loop< long int, TEST_EXECSPACE >( loop_count, 3 ) ) );
+  ASSERT_TRUE((TestAtomic::Loop<long int, TEST_EXECSPACE>(loop_count, 1)));
+  ASSERT_TRUE((TestAtomic::Loop<long int, TEST_EXECSPACE>(loop_count, 2)));
+  ASSERT_TRUE((TestAtomic::Loop<long int, TEST_EXECSPACE>(loop_count, 3)));
 
-  ASSERT_TRUE( ( TestAtomic::Loop< unsigned long int, TEST_EXECSPACE >( loop_count, 1 ) ) );
-  ASSERT_TRUE( ( TestAtomic::Loop< unsigned long int, TEST_EXECSPACE >( loop_count, 2 ) ) );
-  ASSERT_TRUE( ( TestAtomic::Loop< unsigned long int, TEST_EXECSPACE >( loop_count, 3 ) ) );
+  ASSERT_TRUE(
+      (TestAtomic::Loop<unsigned long int, TEST_EXECSPACE>(loop_count, 1)));
+  ASSERT_TRUE(
+      (TestAtomic::Loop<unsigned long int, TEST_EXECSPACE>(loop_count, 2)));
+  ASSERT_TRUE(
+      (TestAtomic::Loop<unsigned long int, TEST_EXECSPACE>(loop_count, 3)));
 
-  ASSERT_TRUE( ( TestAtomic::Loop< long long int, TEST_EXECSPACE >( loop_count, 1 ) ) );
-  ASSERT_TRUE( ( TestAtomic::Loop< long long int, TEST_EXECSPACE >( loop_count, 2 ) ) );
-  ASSERT_TRUE( ( TestAtomic::Loop< long long int, TEST_EXECSPACE >( loop_count, 3 ) ) );
+  ASSERT_TRUE((TestAtomic::Loop<long long int, TEST_EXECSPACE>(loop_count, 1)));
+  ASSERT_TRUE((TestAtomic::Loop<long long int, TEST_EXECSPACE>(loop_count, 2)));
+  ASSERT_TRUE((TestAtomic::Loop<long long int, TEST_EXECSPACE>(loop_count, 3)));
 
-  ASSERT_TRUE( ( TestAtomic::Loop< double, TEST_EXECSPACE >( loop_count, 1 ) ) );
-  ASSERT_TRUE( ( TestAtomic::Loop< double, TEST_EXECSPACE >( loop_count, 2 ) ) );
-  ASSERT_TRUE( ( TestAtomic::Loop< double, TEST_EXECSPACE >( loop_count, 3 ) ) );
+  ASSERT_TRUE((TestAtomic::Loop<double, TEST_EXECSPACE>(loop_count, 1)));
+  ASSERT_TRUE((TestAtomic::Loop<double, TEST_EXECSPACE>(loop_count, 2)));
+  ASSERT_TRUE((TestAtomic::Loop<double, TEST_EXECSPACE>(loop_count, 3)));
 
-  ASSERT_TRUE( ( TestAtomic::Loop< float, TEST_EXECSPACE >( 100, 1 ) ) );
-  ASSERT_TRUE( ( TestAtomic::Loop< float, TEST_EXECSPACE >( 100, 2 ) ) );
-  ASSERT_TRUE( ( TestAtomic::Loop< float, TEST_EXECSPACE >( 100, 3 ) ) );
+  ASSERT_TRUE((TestAtomic::Loop<float, TEST_EXECSPACE>(100, 1)));
+  ASSERT_TRUE((TestAtomic::Loop<float, TEST_EXECSPACE>(100, 2)));
+  ASSERT_TRUE((TestAtomic::Loop<float, TEST_EXECSPACE>(100, 3)));
 
 #ifndef KOKKOS_ENABLE_OPENMPTARGET
-#ifndef KOKKOS_ENABLE_ROCM // ROCM doesn't yet support atomics for >64bit types
-  ASSERT_TRUE( ( TestAtomic::Loop< Kokkos::complex<double>, TEST_EXECSPACE >( 1, 1 ) ) );
-  ASSERT_TRUE( ( TestAtomic::Loop< Kokkos::complex<double>, TEST_EXECSPACE >( 1, 2 ) ) );
-  ASSERT_TRUE( ( TestAtomic::Loop< Kokkos::complex<double>, TEST_EXECSPACE >( 1, 3 ) ) );
+#ifndef KOKKOS_ENABLE_ROCM  // ROCM doesn't yet support atomics for >64bit types
+  ASSERT_TRUE(
+      (TestAtomic::Loop<Kokkos::complex<double>, TEST_EXECSPACE>(1, 1)));
+  ASSERT_TRUE(
+      (TestAtomic::Loop<Kokkos::complex<double>, TEST_EXECSPACE>(1, 2)));
+  ASSERT_TRUE(
+      (TestAtomic::Loop<Kokkos::complex<double>, TEST_EXECSPACE>(1, 3)));
 
-  ASSERT_TRUE( ( TestAtomic::Loop< Kokkos::complex<double>, TEST_EXECSPACE >( 100, 1 ) ) );
-  ASSERT_TRUE( ( TestAtomic::Loop< Kokkos::complex<double>, TEST_EXECSPACE >( 100, 2 ) ) );
-  ASSERT_TRUE( ( TestAtomic::Loop< Kokkos::complex<double>, TEST_EXECSPACE >( 100, 3 ) ) );
+  ASSERT_TRUE(
+      (TestAtomic::Loop<Kokkos::complex<double>, TEST_EXECSPACE>(100, 1)));
+  ASSERT_TRUE(
+      (TestAtomic::Loop<Kokkos::complex<double>, TEST_EXECSPACE>(100, 2)));
+  ASSERT_TRUE(
+      (TestAtomic::Loop<Kokkos::complex<double>, TEST_EXECSPACE>(100, 3)));
 
-  ASSERT_TRUE( ( TestAtomic::Loop< TestAtomic::SuperScalar<4>, TEST_EXECSPACE >( 100, 1 ) ) );
-  ASSERT_TRUE( ( TestAtomic::Loop< TestAtomic::SuperScalar<4>, TEST_EXECSPACE >( 100, 2 ) ) );
-  ASSERT_TRUE( ( TestAtomic::Loop< TestAtomic::SuperScalar<4>, TEST_EXECSPACE >( 100, 3 ) ) );
+  ASSERT_TRUE((TestAtomic::Loop<Kokkos::complex<float>, TEST_EXECSPACE>(1, 1)));
+  ASSERT_TRUE((TestAtomic::Loop<Kokkos::complex<float>, TEST_EXECSPACE>(1, 2)));
+  ASSERT_TRUE((TestAtomic::Loop<Kokkos::complex<float>, TEST_EXECSPACE>(1, 3)));
+
+  ASSERT_TRUE(
+      (TestAtomic::Loop<Kokkos::complex<float>, TEST_EXECSPACE>(100, 1)));
+  ASSERT_TRUE(
+      (TestAtomic::Loop<Kokkos::complex<float>, TEST_EXECSPACE>(100, 2)));
+  ASSERT_TRUE(
+      (TestAtomic::Loop<Kokkos::complex<float>, TEST_EXECSPACE>(100, 3)));
+
+  ASSERT_TRUE(
+      (TestAtomic::Loop<TestAtomic::SuperScalar<4>, TEST_EXECSPACE>(100, 1)));
+  ASSERT_TRUE(
+      (TestAtomic::Loop<TestAtomic::SuperScalar<4>, TEST_EXECSPACE>(100, 2)));
+  ASSERT_TRUE(
+      (TestAtomic::Loop<TestAtomic::SuperScalar<4>, TEST_EXECSPACE>(100, 3)));
 #endif
 #endif
 }
 
-
-} // namespace Test
-
+}  // namespace Test
diff --git a/lib/kokkos/core/unit_test/TestAtomicOperations.hpp b/lib/kokkos/core/unit_test/TestAtomicOperations.hpp
index e043737e42..109adaa1b3 100644
--- a/lib/kokkos/core/unit_test/TestAtomicOperations.hpp
+++ b/lib/kokkos/core/unit_test/TestAtomicOperations.hpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -49,114 +50,105 @@ namespace TestAtomicOperations {
 //--------------zero_functor---------------------
 //-----------------------------------------------
 
-template< class T, class DEVICE_TYPE >
+template <class T, class DEVICE_TYPE>
 struct ZeroFunctor {
   typedef DEVICE_TYPE execution_space;
-  typedef typename Kokkos::View< T, execution_space > type;
-  typedef typename Kokkos::View< T, execution_space >::HostMirror h_type;
+  typedef typename Kokkos::View<T, execution_space> type;
+  typedef typename Kokkos::View<T, execution_space>::HostMirror h_type;
 
   type data;
 
   KOKKOS_INLINE_FUNCTION
-  void operator()( int ) const {
-    data() = 0;
-  }
+  void operator()(int) const { data() = 0; }
 };
 
 //-----------------------------------------------
 //--------------init_functor---------------------
 //-----------------------------------------------
 
-template< class T, class DEVICE_TYPE >
+template <class T, class DEVICE_TYPE>
 struct InitFunctor {
   typedef DEVICE_TYPE execution_space;
-  typedef typename Kokkos::View< T, execution_space > type;
-  typedef typename Kokkos::View< T, execution_space >::HostMirror h_type;
+  typedef typename Kokkos::View<T, execution_space> type;
+  typedef typename Kokkos::View<T, execution_space>::HostMirror h_type;
 
   type data;
   T init_value;
 
   KOKKOS_INLINE_FUNCTION
-  void operator()( int ) const {
-    data() = init_value;
-  }
+  void operator()(int) const { data() = init_value; }
 
-  InitFunctor( T _init_value ) : init_value( _init_value ) {}
+  InitFunctor(T _init_value) : init_value(_init_value) {}
 };
 
 //---------------------------------------------------
 //--------------atomic_fetch_max---------------------
 //---------------------------------------------------
 
-template< class T, class DEVICE_TYPE >
+template <class T, class DEVICE_TYPE>
 struct MaxFunctor {
   typedef DEVICE_TYPE execution_space;
-  typedef Kokkos::View< T, execution_space > type;
+  typedef Kokkos::View<T, execution_space> type;
 
   type data;
   T i0;
   T i1;
 
   KOKKOS_INLINE_FUNCTION
-  void operator()( int ) const {
-    //Kokkos::atomic_fetch_max( &data(), (T) 1 );
-    Kokkos::atomic_fetch_max( &data(), (T) i1 );
+  void operator()(int) const {
+    // Kokkos::atomic_fetch_max( &data(), (T) 1 );
+    Kokkos::atomic_fetch_max(&data(), (T)i1);
   }
-  MaxFunctor( T _i0, T _i1 ) : i0( _i0 ), i1( _i1 ) {}
+  MaxFunctor(T _i0, T _i1) : i0(_i0), i1(_i1) {}
 };
 
-template< class T, class execution_space >
-T MaxAtomic( T i0, T i1 ) {
-  struct InitFunctor< T, execution_space > f_init( i0 );
-  typename InitFunctor< T, execution_space >::type data( "Data" );
-  typename InitFunctor< T, execution_space >::h_type h_data( "HData" );
+template <class T, class execution_space>
+T MaxAtomic(T i0, T i1) {
+  struct InitFunctor<T, execution_space> f_init(i0);
+  typename InitFunctor<T, execution_space>::type data("Data");
+  typename InitFunctor<T, execution_space>::h_type h_data("HData");
 
   f_init.data = data;
-  Kokkos::parallel_for( 1, f_init );
+  Kokkos::parallel_for(1, f_init);
   execution_space().fence();
 
-  struct MaxFunctor< T, execution_space > f( i0, i1 );
+  struct MaxFunctor<T, execution_space> f(i0, i1);
 
   f.data = data;
-  Kokkos::parallel_for( 1, f );
+  Kokkos::parallel_for(1, f);
   execution_space().fence();
 
-  Kokkos::deep_copy( h_data, data );
+  Kokkos::deep_copy(h_data, data);
   T val = h_data();
 
   return val;
 }
 
-template< class T >
-T MaxAtomicCheck( T i0, T i1 ) {
+template <class T>
+T MaxAtomicCheck(T i0, T i1) {
   T* data = new T[1];
   data[0] = 0;
 
-  *data = ( i0 > i1 ? i0 : i1 );
+  *data = (i0 > i1 ? i0 : i1);
 
   T val = *data;
-  delete [] data;
+  delete[] data;
 
   return val;
 }
 
-template< class T, class DeviceType >
-bool MaxAtomicTest( T i0, T i1 )
-{
-  T res       = MaxAtomic< T, DeviceType >( i0, i1 );
-  T resSerial = MaxAtomicCheck<T>( i0, i1 );
+template <class T, class DeviceType>
+bool MaxAtomicTest(T i0, T i1) {
+  T res       = MaxAtomic<T, DeviceType>(i0, i1);
+  T resSerial = MaxAtomicCheck<T>(i0, i1);
 
   bool passed = true;
 
-  if ( resSerial != res ) {
+  if (resSerial != res) {
     passed = false;
 
-    std::cout << "Loop<"
-              << typeid( T ).name()
-              << ">( test = MaxAtomicTest"
-              << " FAILED : "
-              << resSerial << " != " << res
-              << std::endl;
+    std::cout << "Loop<" << typeid(T).name() << ">( test = MaxAtomicTest"
+              << " FAILED : " << resSerial << " != " << res << std::endl;
   }
 
   return passed;
@@ -166,75 +158,68 @@ bool MaxAtomicTest( T i0, T i1 )
 //--------------atomic_fetch_min---------------------
 //---------------------------------------------------
 
-template< class T, class DEVICE_TYPE >
+template <class T, class DEVICE_TYPE>
 struct MinFunctor {
   typedef DEVICE_TYPE execution_space;
-  typedef Kokkos::View< T, execution_space > type;
+  typedef Kokkos::View<T, execution_space> type;
 
   type data;
   T i0;
   T i1;
 
   KOKKOS_INLINE_FUNCTION
-  void operator()( int ) const {
-    Kokkos::atomic_fetch_min( &data(), (T) i1 );
-  }
+  void operator()(int) const { Kokkos::atomic_fetch_min(&data(), (T)i1); }
 
-  MinFunctor( T _i0, T _i1 ) : i0( _i0 ), i1( _i1 ) {}
+  MinFunctor(T _i0, T _i1) : i0(_i0), i1(_i1) {}
 };
 
-template< class T, class execution_space >
-T MinAtomic( T i0, T i1 ) {
-  struct InitFunctor< T, execution_space > f_init( i0 );
-  typename InitFunctor< T, execution_space >::type data( "Data" );
-  typename InitFunctor< T, execution_space >::h_type h_data( "HData" );
+template <class T, class execution_space>
+T MinAtomic(T i0, T i1) {
+  struct InitFunctor<T, execution_space> f_init(i0);
+  typename InitFunctor<T, execution_space>::type data("Data");
+  typename InitFunctor<T, execution_space>::h_type h_data("HData");
 
   f_init.data = data;
-  Kokkos::parallel_for( 1, f_init );
+  Kokkos::parallel_for(1, f_init);
   execution_space().fence();
 
-  struct MinFunctor< T, execution_space > f( i0, i1 );
+  struct MinFunctor<T, execution_space> f(i0, i1);
 
   f.data = data;
-  Kokkos::parallel_for( 1, f );
+  Kokkos::parallel_for(1, f);
   execution_space().fence();
 
-  Kokkos::deep_copy( h_data, data );
+  Kokkos::deep_copy(h_data, data);
   T val = h_data();
 
   return val;
 }
 
-template< class T >
-T MinAtomicCheck( T i0, T i1 ) {
+template <class T>
+T MinAtomicCheck(T i0, T i1) {
   T* data = new T[1];
   data[0] = 0;
 
-  *data = ( i0 < i1 ? i0 : i1 );
+  *data = (i0 < i1 ? i0 : i1);
 
   T val = *data;
-  delete [] data;
+  delete[] data;
 
   return val;
 }
 
-template< class T, class DeviceType >
-bool MinAtomicTest( T i0, T i1 )
-{
-  T res       = MinAtomic< T, DeviceType >( i0, i1 );
-  T resSerial = MinAtomicCheck< T >( i0, i1 );
+template <class T, class DeviceType>
+bool MinAtomicTest(T i0, T i1) {
+  T res       = MinAtomic<T, DeviceType>(i0, i1);
+  T resSerial = MinAtomicCheck<T>(i0, i1);
 
   bool passed = true;
 
-  if ( resSerial != res ) {
+  if (resSerial != res) {
     passed = false;
 
-    std::cout << "Loop<"
-              << typeid( T ).name()
-              << ">( test = MinAtomicTest"
-              << " FAILED : "
-              << resSerial << " != " << res
-              << std::endl;
+    std::cout << "Loop<" << typeid(T).name() << ">( test = MinAtomicTest"
+              << " FAILED : " << resSerial << " != " << res << std::endl;
   }
 
   return passed;
@@ -244,74 +229,67 @@ bool MinAtomicTest( T i0, T i1 )
 //--------------atomic_increment---------------------
 //---------------------------------------------------
 
-template< class T, class DEVICE_TYPE >
+template <class T, class DEVICE_TYPE>
 struct IncFunctor {
   typedef DEVICE_TYPE execution_space;
-  typedef Kokkos::View< T, execution_space > type;
+  typedef Kokkos::View<T, execution_space> type;
 
   type data;
   T i0;
 
   KOKKOS_INLINE_FUNCTION
-  void operator()( int ) const {
-    Kokkos::atomic_increment( &data() );
-  }
+  void operator()(int) const { Kokkos::atomic_increment(&data()); }
 
-  IncFunctor( T _i0 ) : i0( _i0 ) {}
+  IncFunctor(T _i0) : i0(_i0) {}
 };
 
-template< class T, class execution_space >
-T IncAtomic( T i0 ) {
-  struct InitFunctor< T, execution_space > f_init( i0 );
-  typename InitFunctor< T, execution_space >::type data( "Data" );
-  typename InitFunctor< T, execution_space >::h_type h_data( "HData" );
+template <class T, class execution_space>
+T IncAtomic(T i0) {
+  struct InitFunctor<T, execution_space> f_init(i0);
+  typename InitFunctor<T, execution_space>::type data("Data");
+  typename InitFunctor<T, execution_space>::h_type h_data("HData");
 
   f_init.data = data;
-  Kokkos::parallel_for( 1, f_init );
+  Kokkos::parallel_for(1, f_init);
   execution_space().fence();
 
-  struct IncFunctor< T, execution_space > f( i0 );
+  struct IncFunctor<T, execution_space> f(i0);
 
   f.data = data;
-  Kokkos::parallel_for( 1, f );
+  Kokkos::parallel_for(1, f);
   execution_space().fence();
 
-  Kokkos::deep_copy( h_data, data );
+  Kokkos::deep_copy(h_data, data);
   T val = h_data();
 
   return val;
 }
 
-template< class T >
-T IncAtomicCheck( T i0 ) {
+template <class T>
+T IncAtomicCheck(T i0) {
   T* data = new T[1];
   data[0] = 0;
 
   *data = i0 + 1;
 
   T val = *data;
-  delete [] data;
+  delete[] data;
 
   return val;
 }
 
-template< class T, class DeviceType >
-bool IncAtomicTest( T i0 )
-{
-  T res       = IncAtomic< T, DeviceType >( i0 );
-  T resSerial = IncAtomicCheck< T >( i0 );
+template <class T, class DeviceType>
+bool IncAtomicTest(T i0) {
+  T res       = IncAtomic<T, DeviceType>(i0);
+  T resSerial = IncAtomicCheck<T>(i0);
 
   bool passed = true;
 
-  if ( resSerial != res ) {
+  if (resSerial != res) {
     passed = false;
 
-    std::cout << "Loop<"
-              << typeid( T ).name()
-              << ">( test = IncAtomicTest"
-              << " FAILED : "
-              << resSerial << " != " << res
-              << std::endl;
+    std::cout << "Loop<" << typeid(T).name() << ">( test = IncAtomicTest"
+              << " FAILED : " << resSerial << " != " << res << std::endl;
   }
 
   return passed;
@@ -321,74 +299,67 @@ bool IncAtomicTest( T i0 )
 //--------------atomic_decrement---------------------
 //---------------------------------------------------
 
-template< class T, class DEVICE_TYPE >
+template <class T, class DEVICE_TYPE>
 struct DecFunctor {
   typedef DEVICE_TYPE execution_space;
-  typedef Kokkos::View< T, execution_space > type;
+  typedef Kokkos::View<T, execution_space> type;
 
   type data;
   T i0;
 
   KOKKOS_INLINE_FUNCTION
-  void operator()( int ) const {
-    Kokkos::atomic_decrement( &data() );
-  }
+  void operator()(int) const { Kokkos::atomic_decrement(&data()); }
 
-  DecFunctor( T _i0 ) : i0( _i0 ) {}
+  DecFunctor(T _i0) : i0(_i0) {}
 };
 
-template< class T, class execution_space >
-T DecAtomic( T i0 ) {
-  struct InitFunctor< T, execution_space > f_init( i0 );
-  typename InitFunctor< T, execution_space >::type data( "Data" );
-  typename InitFunctor< T, execution_space >::h_type h_data( "HData" );
+template <class T, class execution_space>
+T DecAtomic(T i0) {
+  struct InitFunctor<T, execution_space> f_init(i0);
+  typename InitFunctor<T, execution_space>::type data("Data");
+  typename InitFunctor<T, execution_space>::h_type h_data("HData");
 
   f_init.data = data;
-  Kokkos::parallel_for( 1, f_init );
+  Kokkos::parallel_for(1, f_init);
   execution_space().fence();
 
-  struct DecFunctor< T, execution_space > f( i0 );
+  struct DecFunctor<T, execution_space> f(i0);
 
   f.data = data;
-  Kokkos::parallel_for( 1, f );
+  Kokkos::parallel_for(1, f);
   execution_space().fence();
 
-  Kokkos::deep_copy( h_data, data );
+  Kokkos::deep_copy(h_data, data);
   T val = h_data();
 
   return val;
 }
 
-template< class T >
-T DecAtomicCheck( T i0 ) {
+template <class T>
+T DecAtomicCheck(T i0) {
   T* data = new T[1];
   data[0] = 0;
 
   *data = i0 - 1;
 
   T val = *data;
-  delete [] data;
+  delete[] data;
 
   return val;
 }
 
-template< class T, class DeviceType >
-bool DecAtomicTest( T i0 )
-{
-  T res       = DecAtomic< T, DeviceType >( i0 );
-  T resSerial = DecAtomicCheck< T >( i0 );
+template <class T, class DeviceType>
+bool DecAtomicTest(T i0) {
+  T res       = DecAtomic<T, DeviceType>(i0);
+  T resSerial = DecAtomicCheck<T>(i0);
 
   bool passed = true;
 
-  if ( resSerial != res ) {
+  if (resSerial != res) {
     passed = false;
 
-    std::cout << "Loop<"
-              << typeid( T ).name()
-              << ">( test = DecAtomicTest"
-              << " FAILED : "
-              << resSerial << " != " << res
-              << std::endl;
+    std::cout << "Loop<" << typeid(T).name() << ">( test = DecAtomicTest"
+              << " FAILED : " << resSerial << " != " << res << std::endl;
   }
 
   return passed;
@@ -398,75 +369,68 @@ bool DecAtomicTest( T i0 )
 //--------------atomic_fetch_mul---------------------
 //---------------------------------------------------
 
-template< class T, class DEVICE_TYPE >
+template <class T, class DEVICE_TYPE>
 struct MulFunctor {
   typedef DEVICE_TYPE execution_space;
-  typedef Kokkos::View< T, execution_space > type;
+  typedef Kokkos::View<T, execution_space> type;
 
   type data;
   T i0;
   T i1;
 
   KOKKOS_INLINE_FUNCTION
-  void operator()( int ) const {
-    Kokkos::atomic_fetch_mul( &data(), (T) i1 );
-  }
+  void operator()(int) const { Kokkos::atomic_fetch_mul(&data(), (T)i1); }
 
-  MulFunctor( T _i0, T _i1 ) : i0( _i0 ), i1( _i1 ) {}
+  MulFunctor(T _i0, T _i1) : i0(_i0), i1(_i1) {}
 };
 
-template< class T, class execution_space >
-T MulAtomic( T i0, T i1 ) {
-  struct InitFunctor< T, execution_space > f_init( i0 );
-  typename InitFunctor< T, execution_space >::type data( "Data" );
-  typename InitFunctor< T, execution_space >::h_type h_data( "HData" );
+template <class T, class execution_space>
+T MulAtomic(T i0, T i1) {
+  struct InitFunctor<T, execution_space> f_init(i0);
+  typename InitFunctor<T, execution_space>::type data("Data");
+  typename InitFunctor<T, execution_space>::h_type h_data("HData");
 
   f_init.data = data;
-  Kokkos::parallel_for( 1, f_init );
+  Kokkos::parallel_for(1, f_init);
   execution_space().fence();
 
-  struct MulFunctor< T, execution_space > f( i0, i1 );
+  struct MulFunctor<T, execution_space> f(i0, i1);
 
   f.data = data;
-  Kokkos::parallel_for( 1, f );
+  Kokkos::parallel_for(1, f);
   execution_space().fence();
 
-  Kokkos::deep_copy( h_data, data );
+  Kokkos::deep_copy(h_data, data);
   T val = h_data();
 
   return val;
 }
 
-template< class T >
-T MulAtomicCheck( T i0, T i1 ) {
+template <class T>
+T MulAtomicCheck(T i0, T i1) {
   T* data = new T[1];
   data[0] = 0;
 
-  *data = i0*i1;
+  *data = i0 * i1;
 
   T val = *data;
-  delete [] data;
+  delete[] data;
 
   return val;
 }
 
-template< class T, class DeviceType >
-bool MulAtomicTest( T i0, T i1 )
-{
-  T res       = MulAtomic< T, DeviceType >( i0, i1 );
-  T resSerial = MulAtomicCheck< T >( i0, i1 );
+template <class T, class DeviceType>
+bool MulAtomicTest(T i0, T i1) {
+  T res       = MulAtomic<T, DeviceType>(i0, i1);
+  T resSerial = MulAtomicCheck<T>(i0, i1);
 
   bool passed = true;
 
-  if ( resSerial != res ) {
+  if (resSerial != res) {
     passed = false;
 
-    std::cout << "Loop<"
-              << typeid( T ).name()
-              << ">( test = MulAtomicTest"
-              << " FAILED : "
-              << resSerial << " != " << res
-              << std::endl;
+    std::cout << "Loop<" << typeid(T).name() << ">( test = MulAtomicTest"
+              << " FAILED : " << resSerial << " != " << res << std::endl;
   }
 
   return passed;
@@ -476,77 +440,70 @@ bool MulAtomicTest( T i0, T i1 )
 //--------------atomic_fetch_div---------------------
 //---------------------------------------------------
 
-template< class T, class DEVICE_TYPE >
+template <class T, class DEVICE_TYPE>
 struct DivFunctor {
   typedef DEVICE_TYPE execution_space;
-  typedef Kokkos::View< T, execution_space > type;
+  typedef Kokkos::View<T, execution_space> type;
 
   type data;
   T i0;
   T i1;
 
   KOKKOS_INLINE_FUNCTION
-  void operator()( int ) const {
-    Kokkos::atomic_fetch_div( &data(), (T) i1 );
-  }
+  void operator()(int) const { Kokkos::atomic_fetch_div(&data(), (T)i1); }
 
-  DivFunctor( T _i0, T _i1 ) : i0( _i0 ), i1( _i1 ) {}
+  DivFunctor(T _i0, T _i1) : i0(_i0), i1(_i1) {}
 };
 
-template< class T, class execution_space >
-T DivAtomic( T i0, T i1 ) {
-  struct InitFunctor< T, execution_space > f_init( i0 );
-  typename InitFunctor< T, execution_space >::type data( "Data" );
-  typename InitFunctor< T, execution_space >::h_type h_data( "HData" );
+template <class T, class execution_space>
+T DivAtomic(T i0, T i1) {
+  struct InitFunctor<T, execution_space> f_init(i0);
+  typename InitFunctor<T, execution_space>::type data("Data");
+  typename InitFunctor<T, execution_space>::h_type h_data("HData");
 
   f_init.data = data;
-  Kokkos::parallel_for( 1, f_init );
+  Kokkos::parallel_for(1, f_init);
   execution_space().fence();
 
-  struct DivFunctor< T, execution_space > f( i0, i1 );
+  struct DivFunctor<T, execution_space> f(i0, i1);
 
   f.data = data;
-  Kokkos::parallel_for( 1, f );
+  Kokkos::parallel_for(1, f);
   execution_space().fence();
 
-  Kokkos::deep_copy( h_data, data );
+  Kokkos::deep_copy(h_data, data);
   T val = h_data();
 
   return val;
 }
 
-template< class T >
-T DivAtomicCheck( T i0, T i1 ) {
+template <class T>
+T DivAtomicCheck(T i0, T i1) {
   T* data = new T[1];
   data[0] = 0;
 
   *data = i0 / i1;
 
   T val = *data;
-  delete [] data;
+  delete[] data;
 
   return val;
 }
 
-template< class T, class DeviceType >
-bool DivAtomicTest( T i0, T i1 )
-{
-  T res       = DivAtomic< T, DeviceType >( i0, i1 );
-  T resSerial = DivAtomicCheck< T >( i0, i1 );
+template <class T, class DeviceType>
+bool DivAtomicTest(T i0, T i1) {
+  T res       = DivAtomic<T, DeviceType>(i0, i1);
+  T resSerial = DivAtomicCheck<T>(i0, i1);
 
   bool passed = true;
 
-  using std::abs;
   using Kokkos::abs;
-  if ( abs( (resSerial-res) * 1.) > 1e-5 ) {
+  using std::abs;
+  if (abs((resSerial - res) * 1.) > 1e-5) {
     passed = false;
 
-    std::cout << "Loop<"
-              << typeid( T ).name()
-              << ">( test = DivAtomicTest"
-              << " FAILED : "
-              << resSerial << " != " << res
-              << std::endl;
+    std::cout << "Loop<" << typeid(T).name() << ">( test = DivAtomicTest"
+              << " FAILED : " << resSerial << " != " << res << std::endl;
   }
 
   return passed;
@@ -556,75 +513,68 @@ bool DivAtomicTest( T i0, T i1 )
 //--------------atomic_fetch_mod---------------------
 //---------------------------------------------------
 
-template< class T, class DEVICE_TYPE >
+template <class T, class DEVICE_TYPE>
 struct ModFunctor {
   typedef DEVICE_TYPE execution_space;
-  typedef Kokkos::View< T, execution_space > type;
+  typedef Kokkos::View<T, execution_space> type;
 
   type data;
   T i0;
   T i1;
 
   KOKKOS_INLINE_FUNCTION
-  void operator()( int ) const {
-    Kokkos::atomic_fetch_mod( &data(), (T) i1 );
-  }
+  void operator()(int) const { Kokkos::atomic_fetch_mod(&data(), (T)i1); }
 
-  ModFunctor( T _i0, T _i1 ) : i0( _i0 ), i1( _i1 ) {}
+  ModFunctor(T _i0, T _i1) : i0(_i0), i1(_i1) {}
 };
 
-template< class T, class execution_space >
-T ModAtomic( T i0, T i1 ) {
-  struct InitFunctor< T, execution_space > f_init( i0 );
-  typename InitFunctor< T, execution_space >::type data( "Data" );
-  typename InitFunctor< T, execution_space >::h_type h_data( "HData" );
+template <class T, class execution_space>
+T ModAtomic(T i0, T i1) {
+  struct InitFunctor<T, execution_space> f_init(i0);
+  typename InitFunctor<T, execution_space>::type data("Data");
+  typename InitFunctor<T, execution_space>::h_type h_data("HData");
 
   f_init.data = data;
-  Kokkos::parallel_for( 1, f_init );
+  Kokkos::parallel_for(1, f_init);
   execution_space().fence();
 
-  struct ModFunctor< T, execution_space > f( i0, i1 );
+  struct ModFunctor<T, execution_space> f(i0, i1);
 
   f.data = data;
-  Kokkos::parallel_for( 1, f );
+  Kokkos::parallel_for(1, f);
   execution_space().fence();
 
-  Kokkos::deep_copy( h_data, data );
+  Kokkos::deep_copy(h_data, data);
   T val = h_data();
 
   return val;
 }
 
-template< class T >
-T ModAtomicCheck( T i0, T i1 ) {
+template <class T>
+T ModAtomicCheck(T i0, T i1) {
   T* data = new T[1];
   data[0] = 0;
 
   *data = i0 % i1;
 
   T val = *data;
-  delete [] data;
+  delete[] data;
 
   return val;
 }
 
-template< class T, class DeviceType >
-bool ModAtomicTest( T i0, T i1 )
-{
-  T res       = ModAtomic< T, DeviceType >( i0, i1 );
-  T resSerial = ModAtomicCheck< T >( i0, i1 );
+template <class T, class DeviceType>
+bool ModAtomicTest(T i0, T i1) {
+  T res       = ModAtomic<T, DeviceType>(i0, i1);
+  T resSerial = ModAtomicCheck<T>(i0, i1);
 
   bool passed = true;
 
-  if ( resSerial != res ) {
+  if (resSerial != res) {
     passed = false;
 
-    std::cout << "Loop<"
-              << typeid( T ).name()
-              << ">( test = ModAtomicTest"
-              << " FAILED : "
-              << resSerial << " != " << res
-              << std::endl;
+    std::cout << "Loop<" << typeid(T).name() << ">( test = ModAtomicTest"
+              << " FAILED : " << resSerial << " != " << res << std::endl;
   }
 
   return passed;
@@ -634,75 +584,68 @@ bool ModAtomicTest( T i0, T i1 )
 //--------------atomic_fetch_and---------------------
 //---------------------------------------------------
 
-template< class T, class DEVICE_TYPE >
+template <class T, class DEVICE_TYPE>
 struct AndFunctor {
   typedef DEVICE_TYPE execution_space;
-  typedef Kokkos::View< T, execution_space > type;
+  typedef Kokkos::View<T, execution_space> type;
 
   type data;
   T i0;
   T i1;
 
   KOKKOS_INLINE_FUNCTION
-  void operator()( int ) const {
-    Kokkos::atomic_fetch_and( &data(), (T) i1 );
-  }
+  void operator()(int) const { Kokkos::atomic_fetch_and(&data(), (T)i1); }
 
-  AndFunctor( T _i0, T _i1 ) : i0( _i0 ), i1( _i1 ) {}
+  AndFunctor(T _i0, T _i1) : i0(_i0), i1(_i1) {}
 };
 
-template< class T, class execution_space >
-T AndAtomic( T i0, T i1 ) {
-  struct InitFunctor< T, execution_space > f_init( i0 );
-  typename InitFunctor< T, execution_space >::type data( "Data" );
-  typename InitFunctor< T, execution_space >::h_type h_data( "HData" );
+template <class T, class execution_space>
+T AndAtomic(T i0, T i1) {
+  struct InitFunctor<T, execution_space> f_init(i0);
+  typename InitFunctor<T, execution_space>::type data("Data");
+  typename InitFunctor<T, execution_space>::h_type h_data("HData");
 
   f_init.data = data;
-  Kokkos::parallel_for( 1, f_init );
+  Kokkos::parallel_for(1, f_init);
   execution_space().fence();
 
-  struct AndFunctor< T, execution_space > f( i0, i1 );
+  struct AndFunctor<T, execution_space> f(i0, i1);
 
   f.data = data;
-  Kokkos::parallel_for( 1, f );
+  Kokkos::parallel_for(1, f);
   execution_space().fence();
 
-  Kokkos::deep_copy( h_data, data );
+  Kokkos::deep_copy(h_data, data);
   T val = h_data();
 
   return val;
 }
 
-template< class T >
-T AndAtomicCheck( T i0, T i1 ) {
+template <class T>
+T AndAtomicCheck(T i0, T i1) {
   T* data = new T[1];
   data[0] = 0;
 
   *data = i0 & i1;
 
   T val = *data;
-  delete [] data;
+  delete[] data;
 
   return val;
 }
 
-template< class T, class DeviceType >
-bool AndAtomicTest( T i0, T i1 )
-{
-  T res       = AndAtomic< T, DeviceType >( i0, i1 );
-  T resSerial = AndAtomicCheck< T >( i0, i1 );
+template <class T, class DeviceType>
+bool AndAtomicTest(T i0, T i1) {
+  T res       = AndAtomic<T, DeviceType>(i0, i1);
+  T resSerial = AndAtomicCheck<T>(i0, i1);
 
   bool passed = true;
 
-  if ( resSerial != res ) {
+  if (resSerial != res) {
     passed = false;
 
-    std::cout << "Loop<"
-              << typeid( T ).name()
-              << ">( test = AndAtomicTest"
-              << " FAILED : "
-              << resSerial << " != " << res
-              << std::endl;
+    std::cout << "Loop<" << typeid(T).name() << ">( test = AndAtomicTest"
+              << " FAILED : " << resSerial << " != " << res << std::endl;
   }
 
   return passed;
@@ -712,75 +655,68 @@ bool AndAtomicTest( T i0, T i1 )
 //--------------atomic_fetch_or----------------------
 //---------------------------------------------------
 
-template< class T, class DEVICE_TYPE >
+template <class T, class DEVICE_TYPE>
 struct OrFunctor {
   typedef DEVICE_TYPE execution_space;
-  typedef Kokkos::View< T, execution_space > type;
+  typedef Kokkos::View<T, execution_space> type;
 
   type data;
   T i0;
   T i1;
 
   KOKKOS_INLINE_FUNCTION
-  void operator()( int ) const {
-    Kokkos::atomic_fetch_or( &data(), (T) i1 );
-  }
+  void operator()(int) const { Kokkos::atomic_fetch_or(&data(), (T)i1); }
 
-  OrFunctor( T _i0, T _i1 ) : i0( _i0 ), i1( _i1 ) {}
+  OrFunctor(T _i0, T _i1) : i0(_i0), i1(_i1) {}
 };
 
-template< class T, class execution_space >
-T OrAtomic( T i0, T i1 ) {
-  struct InitFunctor< T, execution_space > f_init( i0 );
-  typename InitFunctor< T, execution_space >::type data( "Data" );
-  typename InitFunctor< T, execution_space >::h_type h_data( "HData" );
+template <class T, class execution_space>
+T OrAtomic(T i0, T i1) {
+  struct InitFunctor<T, execution_space> f_init(i0);
+  typename InitFunctor<T, execution_space>::type data("Data");
+  typename InitFunctor<T, execution_space>::h_type h_data("HData");
 
   f_init.data = data;
-  Kokkos::parallel_for( 1, f_init );
+  Kokkos::parallel_for(1, f_init);
   execution_space().fence();
 
-  struct OrFunctor< T, execution_space > f( i0, i1 );
+  struct OrFunctor<T, execution_space> f(i0, i1);
 
   f.data = data;
-  Kokkos::parallel_for( 1, f );
+  Kokkos::parallel_for(1, f);
   execution_space().fence();
 
-  Kokkos::deep_copy( h_data, data );
+  Kokkos::deep_copy(h_data, data);
   T val = h_data();
 
   return val;
 }
 
-template< class T >
-T OrAtomicCheck( T i0, T i1 ) {
+template <class T>
+T OrAtomicCheck(T i0, T i1) {
   T* data = new T[1];
   data[0] = 0;
 
   *data = i0 | i1;
 
   T val = *data;
-  delete [] data;
+  delete[] data;
 
   return val;
 }
 
-template< class T, class DeviceType >
-bool OrAtomicTest( T i0, T i1 )
-{
-  T res       = OrAtomic< T, DeviceType >( i0, i1 );
-  T resSerial = OrAtomicCheck< T >( i0, i1 );
+template <class T, class DeviceType>
+bool OrAtomicTest(T i0, T i1) {
+  T res       = OrAtomic<T, DeviceType>(i0, i1);
+  T resSerial = OrAtomicCheck<T>(i0, i1);
 
   bool passed = true;
 
-  if ( resSerial != res ) {
+  if (resSerial != res) {
     passed = false;
 
-    std::cout << "Loop<"
-              << typeid( T ).name()
-              << ">( test = OrAtomicTest"
-              << " FAILED : "
-              << resSerial << " != " << res
-              << std::endl;
+    std::cout << "Loop<" << typeid(T).name() << ">( test = OrAtomicTest"
+              << " FAILED : " << resSerial << " != " << res << std::endl;
   }
 
   return passed;
@@ -790,75 +726,68 @@ bool OrAtomicTest( T i0, T i1 )
 //--------------atomic_fetch_xor---------------------
 //---------------------------------------------------
 
-template< class T, class DEVICE_TYPE >
+template <class T, class DEVICE_TYPE>
 struct XorFunctor {
   typedef DEVICE_TYPE execution_space;
-  typedef Kokkos::View< T, execution_space > type;
+  typedef Kokkos::View<T, execution_space> type;
 
   type data;
   T i0;
   T i1;
 
   KOKKOS_INLINE_FUNCTION
-  void operator()( int ) const {
-    Kokkos::atomic_fetch_xor( &data(), (T) i1 );
-  }
+  void operator()(int) const { Kokkos::atomic_fetch_xor(&data(), (T)i1); }
 
-  XorFunctor( T _i0, T _i1 ) : i0( _i0 ), i1( _i1 ) {}
+  XorFunctor(T _i0, T _i1) : i0(_i0), i1(_i1) {}
 };
 
-template< class T, class execution_space >
-T XorAtomic( T i0, T i1 ) {
-  struct InitFunctor< T, execution_space > f_init( i0 );
-  typename InitFunctor< T, execution_space >::type data( "Data" );
-  typename InitFunctor< T, execution_space >::h_type h_data( "HData" );
+template <class T, class execution_space>
+T XorAtomic(T i0, T i1) {
+  struct InitFunctor<T, execution_space> f_init(i0);
+  typename InitFunctor<T, execution_space>::type data("Data");
+  typename InitFunctor<T, execution_space>::h_type h_data("HData");
 
   f_init.data = data;
-  Kokkos::parallel_for( 1, f_init );
+  Kokkos::parallel_for(1, f_init);
   execution_space().fence();
 
-  struct XorFunctor< T, execution_space > f( i0, i1 );
+  struct XorFunctor<T, execution_space> f(i0, i1);
 
   f.data = data;
-  Kokkos::parallel_for( 1, f );
+  Kokkos::parallel_for(1, f);
   execution_space().fence();
 
-  Kokkos::deep_copy( h_data, data );
+  Kokkos::deep_copy(h_data, data);
   T val = h_data();
 
   return val;
 }
 
-template< class T >
-T XorAtomicCheck( T i0, T i1 ) {
+template <class T>
+T XorAtomicCheck(T i0, T i1) {
   T* data = new T[1];
   data[0] = 0;
 
   *data = i0 ^ i1;
 
   T val = *data;
-  delete [] data;
+  delete[] data;
 
   return val;
 }
 
-template< class T, class DeviceType >
-bool XorAtomicTest( T i0, T i1 )
-{
-  T res       = XorAtomic< T, DeviceType >( i0, i1 );
-  T resSerial = XorAtomicCheck< T >( i0, i1 );
+template <class T, class DeviceType>
+bool XorAtomicTest(T i0, T i1) {
+  T res       = XorAtomic<T, DeviceType>(i0, i1);
+  T resSerial = XorAtomicCheck<T>(i0, i1);
 
   bool passed = true;
 
-  if ( resSerial != res ) {
+  if (resSerial != res) {
     passed = false;
 
-    std::cout << "Loop<"
-              << typeid( T ).name()
-              << ">( test = XorAtomicTest"
-              << " FAILED : "
-              << resSerial << " != " << res
-              << std::endl;
+    std::cout << "Loop<" << typeid(T).name() << ">( test = XorAtomicTest"
+              << " FAILED : " << resSerial << " != " << res << std::endl;
   }
 
   return passed;
@@ -868,75 +797,68 @@ bool XorAtomicTest( T i0, T i1 )
 //--------------atomic_fetch_lshift---------------------
 //---------------------------------------------------
 
-template< class T, class DEVICE_TYPE >
+template <class T, class DEVICE_TYPE>
 struct LShiftFunctor {
   typedef DEVICE_TYPE execution_space;
-  typedef Kokkos::View< T, execution_space > type;
+  typedef Kokkos::View<T, execution_space> type;
 
   type data;
   T i0;
   T i1;
 
   KOKKOS_INLINE_FUNCTION
-  void operator()( int ) const {
-    Kokkos::atomic_fetch_lshift( &data(), (T) i1 );
-  }
+  void operator()(int) const { Kokkos::atomic_fetch_lshift(&data(), (T)i1); }
 
-  LShiftFunctor( T _i0, T _i1 ) : i0( _i0 ), i1( _i1 ) {}
+  LShiftFunctor(T _i0, T _i1) : i0(_i0), i1(_i1) {}
 };
 
-template< class T, class execution_space >
-T LShiftAtomic( T i0, T i1 ) {
-  struct InitFunctor< T, execution_space > f_init( i0 );
-  typename InitFunctor< T, execution_space >::type data( "Data" );
-  typename InitFunctor< T, execution_space >::h_type h_data( "HData" );
+template <class T, class execution_space>
+T LShiftAtomic(T i0, T i1) {
+  struct InitFunctor<T, execution_space> f_init(i0);
+  typename InitFunctor<T, execution_space>::type data("Data");
+  typename InitFunctor<T, execution_space>::h_type h_data("HData");
 
   f_init.data = data;
-  Kokkos::parallel_for( 1, f_init );
+  Kokkos::parallel_for(1, f_init);
   execution_space().fence();
 
-  struct LShiftFunctor< T, execution_space > f( i0, i1 );
+  struct LShiftFunctor<T, execution_space> f(i0, i1);
 
   f.data = data;
-  Kokkos::parallel_for( 1, f );
+  Kokkos::parallel_for(1, f);
   execution_space().fence();
 
-  Kokkos::deep_copy( h_data, data );
+  Kokkos::deep_copy(h_data, data);
   T val = h_data();
 
   return val;
 }
 
-template< class T >
-T LShiftAtomicCheck( T i0, T i1 ) {
+template <class T>
+T LShiftAtomicCheck(T i0, T i1) {
   T* data = new T[1];
   data[0] = 0;
 
   *data = i0 << i1;
 
   T val = *data;
-  delete [] data;
+  delete[] data;
 
   return val;
 }
 
-template< class T, class DeviceType >
-bool LShiftAtomicTest( T i0, T i1 )
-{
-  T res       = LShiftAtomic< T, DeviceType >( i0, i1 );
-  T resSerial = LShiftAtomicCheck< T >( i0, i1 );
+template <class T, class DeviceType>
+bool LShiftAtomicTest(T i0, T i1) {
+  T res       = LShiftAtomic<T, DeviceType>(i0, i1);
+  T resSerial = LShiftAtomicCheck<T>(i0, i1);
 
   bool passed = true;
 
-  if ( resSerial != res ) {
+  if (resSerial != res) {
     passed = false;
 
-    std::cout << "Loop<"
-              << typeid( T ).name()
-              << ">( test = LShiftAtomicTest"
-              << " FAILED : "
-              << resSerial << " != " << res
-              << std::endl;
+    std::cout << "Loop<" << typeid(T).name() << ">( test = LShiftAtomicTest"
+              << " FAILED : " << resSerial << " != " << res << std::endl;
   }
 
   return passed;
@@ -946,75 +868,68 @@ bool LShiftAtomicTest( T i0, T i1 )
 //--------------atomic_fetch_rshift---------------------
 //---------------------------------------------------
 
-template< class T, class DEVICE_TYPE >
+template <class T, class DEVICE_TYPE>
 struct RShiftFunctor {
   typedef DEVICE_TYPE execution_space;
-  typedef Kokkos::View< T, execution_space > type;
+  typedef Kokkos::View<T, execution_space> type;
 
   type data;
   T i0;
   T i1;
 
   KOKKOS_INLINE_FUNCTION
-  void operator()( int ) const {
-    Kokkos::atomic_fetch_rshift( &data(), (T) i1 );
-  }
+  void operator()(int) const { Kokkos::atomic_fetch_rshift(&data(), (T)i1); }
 
-  RShiftFunctor( T _i0, T _i1 ) : i0( _i0 ), i1( _i1 ) {}
+  RShiftFunctor(T _i0, T _i1) : i0(_i0), i1(_i1) {}
 };
 
-template< class T, class execution_space >
-T RShiftAtomic( T i0, T i1 ) {
-  struct InitFunctor< T, execution_space > f_init( i0 );
-  typename InitFunctor< T, execution_space >::type data( "Data" );
-  typename InitFunctor< T, execution_space >::h_type h_data( "HData" );
+template <class T, class execution_space>
+T RShiftAtomic(T i0, T i1) {
+  struct InitFunctor<T, execution_space> f_init(i0);
+  typename InitFunctor<T, execution_space>::type data("Data");
+  typename InitFunctor<T, execution_space>::h_type h_data("HData");
 
   f_init.data = data;
-  Kokkos::parallel_for( 1, f_init );
+  Kokkos::parallel_for(1, f_init);
   execution_space().fence();
 
-  struct RShiftFunctor< T, execution_space > f( i0, i1 );
+  struct RShiftFunctor<T, execution_space> f(i0, i1);
 
   f.data = data;
-  Kokkos::parallel_for( 1, f );
+  Kokkos::parallel_for(1, f);
   execution_space().fence();
 
-  Kokkos::deep_copy( h_data, data );
+  Kokkos::deep_copy(h_data, data);
   T val = h_data();
 
   return val;
 }
 
-template< class T >
-T RShiftAtomicCheck( T i0, T i1 ) {
+template <class T>
+T RShiftAtomicCheck(T i0, T i1) {
   T* data = new T[1];
   data[0] = 0;
 
   *data = i0 >> i1;
 
   T val = *data;
-  delete [] data;
+  delete[] data;
 
   return val;
 }
 
-template< class T, class DeviceType >
-bool RShiftAtomicTest( T i0, T i1 )
-{
-  T res       = RShiftAtomic< T, DeviceType >( i0, i1 );
-  T resSerial = RShiftAtomicCheck< T >( i0, i1 );
+template <class T, class DeviceType>
+bool RShiftAtomicTest(T i0, T i1) {
+  T res       = RShiftAtomic<T, DeviceType>(i0, i1);
+  T resSerial = RShiftAtomicCheck<T>(i0, i1);
 
   bool passed = true;
 
-  if ( resSerial != res ) {
+  if (resSerial != res) {
     passed = false;
 
-    std::cout << "Loop<"
-              << typeid( T ).name()
-              << ">( test = RShiftAtomicTest"
-              << " FAILED : "
-              << resSerial << " != " << res
-              << std::endl;
+    std::cout << "Loop<" << typeid(T).name() << ">( test = RShiftAtomicTest"
+              << " FAILED : " << resSerial << " != " << res << std::endl;
   }
 
   return passed;
@@ -1024,39 +939,36 @@ bool RShiftAtomicTest( T i0, T i1 )
 //--------------atomic_test_control------------------
 //---------------------------------------------------
 
-template< class T, class DeviceType >
-bool AtomicOperationsTestIntegralType( int i0, int i1, int test )
-{
-  switch ( test ) {
-    case 1: return MaxAtomicTest< T, DeviceType >( (T) i0, (T) i1 );
-    case 2: return MinAtomicTest< T, DeviceType >( (T) i0, (T) i1 );
-    case 3: return MulAtomicTest< T, DeviceType >( (T) i0, (T) i1 );
-    case 4: return DivAtomicTest< T, DeviceType >( (T) i0, (T) i1 );
-    case 5: return ModAtomicTest< T, DeviceType >( (T) i0, (T) i1 );
-    case 6: return AndAtomicTest< T, DeviceType >( (T) i0, (T) i1 );
-    case 7: return OrAtomicTest< T, DeviceType >( (T) i0, (T) i1 );
-    case 8: return XorAtomicTest< T, DeviceType >( (T) i0, (T) i1 );
-    case 9: return LShiftAtomicTest< T, DeviceType >( (T) i0, (T) i1 );
-    case 10: return RShiftAtomicTest< T, DeviceType >( (T) i0, (T) i1 );
-    case 11: return IncAtomicTest< T, DeviceType >( (T) i0 );
-    case 12: return DecAtomicTest< T, DeviceType >( (T) i0 );
+template <class T, class DeviceType>
+bool AtomicOperationsTestIntegralType(int i0, int i1, int test) {
+  switch (test) {
+    case 1: return MaxAtomicTest<T, DeviceType>((T)i0, (T)i1);
+    case 2: return MinAtomicTest<T, DeviceType>((T)i0, (T)i1);
+    case 3: return MulAtomicTest<T, DeviceType>((T)i0, (T)i1);
+    case 4: return DivAtomicTest<T, DeviceType>((T)i0, (T)i1);
+    case 5: return ModAtomicTest<T, DeviceType>((T)i0, (T)i1);
+    case 6: return AndAtomicTest<T, DeviceType>((T)i0, (T)i1);
+    case 7: return OrAtomicTest<T, DeviceType>((T)i0, (T)i1);
+    case 8: return XorAtomicTest<T, DeviceType>((T)i0, (T)i1);
+    case 9: return LShiftAtomicTest<T, DeviceType>((T)i0, (T)i1);
+    case 10: return RShiftAtomicTest<T, DeviceType>((T)i0, (T)i1);
+    case 11: return IncAtomicTest<T, DeviceType>((T)i0);
+    case 12: return DecAtomicTest<T, DeviceType>((T)i0);
   }
 
   return 0;
 }
 
-template< class T, class DeviceType >
-bool AtomicOperationsTestNonIntegralType( int i0, int i1, int test )
-{
-  switch ( test ) {
-    case 1: return MaxAtomicTest< T, DeviceType >( (T) i0, (T) i1 );
-    case 2: return MinAtomicTest< T, DeviceType >( (T) i0, (T) i1 );
-    case 3: return MulAtomicTest< T, DeviceType >( (T) i0, (T) i1 );
-    case 4: return DivAtomicTest< T, DeviceType >( (T) i0, (T) i1 );
+template <class T, class DeviceType>
+bool AtomicOperationsTestNonIntegralType(int i0, int i1, int test) {
+  switch (test) {
+    case 1: return MaxAtomicTest<T, DeviceType>((T)i0, (T)i1);
+    case 2: return MinAtomicTest<T, DeviceType>((T)i0, (T)i1);
+    case 3: return MulAtomicTest<T, DeviceType>((T)i0, (T)i1);
+    case 4: return DivAtomicTest<T, DeviceType>((T)i0, (T)i1);
   }
 
   return 0;
 }
 
-}
-
+}  // namespace TestAtomicOperations
diff --git a/lib/kokkos/core/unit_test/TestAtomicOperations_complexdouble.hpp b/lib/kokkos/core/unit_test/TestAtomicOperations_complexdouble.hpp
index a8474d8952..612247d03f 100644
--- a/lib/kokkos/core/unit_test/TestAtomicOperations_complexdouble.hpp
+++ b/lib/kokkos/core/unit_test/TestAtomicOperations_complexdouble.hpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -41,17 +42,19 @@
 //@HEADER
 */
 
-#include<TestAtomicOperations.hpp>
+#include <TestAtomicOperations.hpp>
 
 namespace Test {
-TEST_F( TEST_CATEGORY , atomic_operations_complexdouble )
-{
-  const int start = 1; // Avoid zero for division.
-  const int end = 11;
-  for ( int i = start; i < end; ++i )
-  {
-    ASSERT_TRUE( ( TestAtomicOperations::MulAtomicTest< Kokkos::complex<double>, TEST_EXECSPACE >( start , end - i) ) );
-    ASSERT_TRUE( ( TestAtomicOperations::DivAtomicTest< Kokkos::complex<double>, TEST_EXECSPACE >( start , end - i) ) );
+TEST(TEST_CATEGORY, atomic_operations_complexdouble) {
+  const int start = 1;  // Avoid zero for division.
+  const int end   = 11;
+  for (int i = start; i < end; ++i) {
+    ASSERT_TRUE(
+        (TestAtomicOperations::MulAtomicTest<Kokkos::complex<double>,
+                                             TEST_EXECSPACE>(start, end - i)));
+    ASSERT_TRUE(
+        (TestAtomicOperations::DivAtomicTest<Kokkos::complex<double>,
+                                             TEST_EXECSPACE>(start, end - i)));
   }
 }
-}
+}  // namespace Test
diff --git a/lib/kokkos/core/unit_test/TestAtomicOperations_complexfloat.hpp b/lib/kokkos/core/unit_test/TestAtomicOperations_complexfloat.hpp
index 961418e675..e812d32074 100644
--- a/lib/kokkos/core/unit_test/TestAtomicOperations_complexfloat.hpp
+++ b/lib/kokkos/core/unit_test/TestAtomicOperations_complexfloat.hpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -41,17 +42,19 @@
 //@HEADER
 */
 
-#include<TestAtomicOperations.hpp>
+#include <TestAtomicOperations.hpp>
 
 namespace Test {
-TEST_F( TEST_CATEGORY , atomic_operations_complexfloat )
-{
-  const int start = 1; // Avoid zero for division.
-  const int end = 11;
-  for ( int i = start; i < end; ++i )
-  {
-    ASSERT_TRUE( ( TestAtomicOperations::MulAtomicTest< Kokkos::complex<float>, TEST_EXECSPACE >( start , end - i) ) );
-    ASSERT_TRUE( ( TestAtomicOperations::DivAtomicTest< Kokkos::complex<float>, TEST_EXECSPACE >( start , end - i) ) );
+TEST(TEST_CATEGORY, atomic_operations_complexfloat) {
+  const int start = 1;  // Avoid zero for division.
+  const int end   = 11;
+  for (int i = start; i < end; ++i) {
+    ASSERT_TRUE(
+        (TestAtomicOperations::MulAtomicTest<Kokkos::complex<float>,
+                                             TEST_EXECSPACE>(start, end - i)));
+    ASSERT_TRUE(
+        (TestAtomicOperations::DivAtomicTest<Kokkos::complex<float>,
+                                             TEST_EXECSPACE>(start, end - i)));
   }
 }
-}
+}  // namespace Test
diff --git a/lib/kokkos/core/unit_test/TestAtomicOperations_double.hpp b/lib/kokkos/core/unit_test/TestAtomicOperations_double.hpp
index 7b9f9b7fe3..ba9937e1c6 100644
--- a/lib/kokkos/core/unit_test/TestAtomicOperations_double.hpp
+++ b/lib/kokkos/core/unit_test/TestAtomicOperations_double.hpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -41,19 +42,21 @@
 //@HEADER
 */
 
-#include<TestAtomicOperations.hpp>
+#include <TestAtomicOperations.hpp>
 
 namespace Test {
-TEST_F( TEST_CATEGORY , atomic_operations_double )
-{
-  const int start = 1; // Avoid zero for division.
-  const int end = 11;
-  for ( int i = start; i < end; ++i )
-  {
-    ASSERT_TRUE( ( TestAtomicOperations::AtomicOperationsTestNonIntegralType< double, TEST_EXECSPACE >( start, end - i, 1 ) ) );
-    ASSERT_TRUE( ( TestAtomicOperations::AtomicOperationsTestNonIntegralType< double, TEST_EXECSPACE >( start, end - i, 2 ) ) );
-    ASSERT_TRUE( ( TestAtomicOperations::AtomicOperationsTestNonIntegralType< double, TEST_EXECSPACE >( start, end - i, 3 ) ) );
-    ASSERT_TRUE( ( TestAtomicOperations::AtomicOperationsTestNonIntegralType< double, TEST_EXECSPACE >( start, end - i, 4 ) ) );
+TEST(TEST_CATEGORY, atomic_operations_double) {
+  const int start = 1;  // Avoid zero for division.
+  const int end   = 11;
+  for (int i = start; i < end; ++i) {
+    ASSERT_TRUE((TestAtomicOperations::AtomicOperationsTestNonIntegralType<
+                 double, TEST_EXECSPACE>(start, end - i, 1)));
+    ASSERT_TRUE((TestAtomicOperations::AtomicOperationsTestNonIntegralType<
+                 double, TEST_EXECSPACE>(start, end - i, 2)));
+    ASSERT_TRUE((TestAtomicOperations::AtomicOperationsTestNonIntegralType<
+                 double, TEST_EXECSPACE>(start, end - i, 3)));
+    ASSERT_TRUE((TestAtomicOperations::AtomicOperationsTestNonIntegralType<
+                 double, TEST_EXECSPACE>(start, end - i, 4)));
   }
 }
-}
+}  // namespace Test
diff --git a/lib/kokkos/core/unit_test/TestAtomicOperations_float.hpp b/lib/kokkos/core/unit_test/TestAtomicOperations_float.hpp
index ec28f2262d..aa56b5ff10 100644
--- a/lib/kokkos/core/unit_test/TestAtomicOperations_float.hpp
+++ b/lib/kokkos/core/unit_test/TestAtomicOperations_float.hpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -41,19 +42,21 @@
 //@HEADER
 */
 
-#include<TestAtomicOperations.hpp>
+#include <TestAtomicOperations.hpp>
 
 namespace Test {
-TEST_F( TEST_CATEGORY , atomic_operations_float )
-{
-  const int start = 1; // Avoid zero for division.
-  const int end = 11;
-  for ( int i = start; i < end; ++i )
-  {
-    ASSERT_TRUE( ( TestAtomicOperations::AtomicOperationsTestNonIntegralType< float, TEST_EXECSPACE >( start, end - i, 1 ) ) );
-    ASSERT_TRUE( ( TestAtomicOperations::AtomicOperationsTestNonIntegralType< float, TEST_EXECSPACE >( start, end - i, 2 ) ) );
-    ASSERT_TRUE( ( TestAtomicOperations::AtomicOperationsTestNonIntegralType< float, TEST_EXECSPACE >( start, end - i, 3 ) ) );
-    ASSERT_TRUE( ( TestAtomicOperations::AtomicOperationsTestNonIntegralType< float, TEST_EXECSPACE >( start, end - i, 4 ) ) );
+TEST(TEST_CATEGORY, atomic_operations_float) {
+  const int start = 1;  // Avoid zero for division.
+  const int end   = 11;
+  for (int i = start; i < end; ++i) {
+    ASSERT_TRUE((TestAtomicOperations::AtomicOperationsTestNonIntegralType<
+                 float, TEST_EXECSPACE>(start, end - i, 1)));
+    ASSERT_TRUE((TestAtomicOperations::AtomicOperationsTestNonIntegralType<
+                 float, TEST_EXECSPACE>(start, end - i, 2)));
+    ASSERT_TRUE((TestAtomicOperations::AtomicOperationsTestNonIntegralType<
+                 float, TEST_EXECSPACE>(start, end - i, 3)));
+    ASSERT_TRUE((TestAtomicOperations::AtomicOperationsTestNonIntegralType<
+                 float, TEST_EXECSPACE>(start, end - i, 4)));
   }
 }
-}
+}  // namespace Test
diff --git a/lib/kokkos/core/unit_test/TestAtomicOperations_int.hpp b/lib/kokkos/core/unit_test/TestAtomicOperations_int.hpp
index 3165ba037d..f828be6223 100644
--- a/lib/kokkos/core/unit_test/TestAtomicOperations_int.hpp
+++ b/lib/kokkos/core/unit_test/TestAtomicOperations_int.hpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -41,26 +42,35 @@
 //@HEADER
 */
 
-#include<TestAtomicOperations.hpp>
+#include <TestAtomicOperations.hpp>
 
 namespace Test {
-TEST_F( TEST_CATEGORY , atomic_operations_int )
-{
-  const int start = 1; // Avoid zero for division.
-  const int end = 11;
-  for ( int i = start; i < end; ++i )
-  {
-    ASSERT_TRUE( ( TestAtomicOperations::AtomicOperationsTestIntegralType< int, TEST_EXECSPACE >( start, end - i, 1 ) ) );
-    ASSERT_TRUE( ( TestAtomicOperations::AtomicOperationsTestIntegralType< int, TEST_EXECSPACE >( start, end - i, 2 ) ) );
-    ASSERT_TRUE( ( TestAtomicOperations::AtomicOperationsTestIntegralType< int, TEST_EXECSPACE >( start, end - i, 3 ) ) );
-    ASSERT_TRUE( ( TestAtomicOperations::AtomicOperationsTestIntegralType< int, TEST_EXECSPACE >( start, end - i, 4 ) ) );
-    ASSERT_TRUE( ( TestAtomicOperations::AtomicOperationsTestIntegralType< int, TEST_EXECSPACE >( start, end - i, 5 ) ) );
-    ASSERT_TRUE( ( TestAtomicOperations::AtomicOperationsTestIntegralType< int, TEST_EXECSPACE >( start, end - i, 6 ) ) );
-    ASSERT_TRUE( ( TestAtomicOperations::AtomicOperationsTestIntegralType< int, TEST_EXECSPACE >( start, end - i, 7 ) ) );
-    ASSERT_TRUE( ( TestAtomicOperations::AtomicOperationsTestIntegralType< int, TEST_EXECSPACE >( start, end - i, 8 ) ) );
-    ASSERT_TRUE( ( TestAtomicOperations::AtomicOperationsTestIntegralType< int, TEST_EXECSPACE >( start, end - i, 9 ) ) );
-    ASSERT_TRUE( ( TestAtomicOperations::AtomicOperationsTestIntegralType< int, TEST_EXECSPACE >( start, end - i, 11 ) ) );
-    ASSERT_TRUE( ( TestAtomicOperations::AtomicOperationsTestIntegralType< int, TEST_EXECSPACE >( start, end - i, 12 ) ) );
+TEST(TEST_CATEGORY, atomic_operations_int) {
+  const int start = 1;  // Avoid zero for division.
+  const int end   = 11;
+  for (int i = start; i < end; ++i) {
+    ASSERT_TRUE((TestAtomicOperations::AtomicOperationsTestIntegralType<
+                 int, TEST_EXECSPACE>(start, end - i, 1)));
+    ASSERT_TRUE((TestAtomicOperations::AtomicOperationsTestIntegralType<
+                 int, TEST_EXECSPACE>(start, end - i, 2)));
+    ASSERT_TRUE((TestAtomicOperations::AtomicOperationsTestIntegralType<
+                 int, TEST_EXECSPACE>(start, end - i, 3)));
+    ASSERT_TRUE((TestAtomicOperations::AtomicOperationsTestIntegralType<
+                 int, TEST_EXECSPACE>(start, end - i, 4)));
+    ASSERT_TRUE((TestAtomicOperations::AtomicOperationsTestIntegralType<
+                 int, TEST_EXECSPACE>(start, end - i, 5)));
+    ASSERT_TRUE((TestAtomicOperations::AtomicOperationsTestIntegralType<
+                 int, TEST_EXECSPACE>(start, end - i, 6)));
+    ASSERT_TRUE((TestAtomicOperations::AtomicOperationsTestIntegralType<
+                 int, TEST_EXECSPACE>(start, end - i, 7)));
+    ASSERT_TRUE((TestAtomicOperations::AtomicOperationsTestIntegralType<
+                 int, TEST_EXECSPACE>(start, end - i, 8)));
+    ASSERT_TRUE((TestAtomicOperations::AtomicOperationsTestIntegralType<
+                 int, TEST_EXECSPACE>(start, end - i, 9)));
+    ASSERT_TRUE((TestAtomicOperations::AtomicOperationsTestIntegralType<
+                 int, TEST_EXECSPACE>(start, end - i, 11)));
+    ASSERT_TRUE((TestAtomicOperations::AtomicOperationsTestIntegralType<
+                 int, TEST_EXECSPACE>(start, end - i, 12)));
   }
 }
-}
+}  // namespace Test
diff --git a/lib/kokkos/core/unit_test/TestAtomicOperations_longint.hpp b/lib/kokkos/core/unit_test/TestAtomicOperations_longint.hpp
index 8cb0d68af3..eee44c9571 100644
--- a/lib/kokkos/core/unit_test/TestAtomicOperations_longint.hpp
+++ b/lib/kokkos/core/unit_test/TestAtomicOperations_longint.hpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -41,26 +42,35 @@
 //@HEADER
 */
 
-#include<TestAtomicOperations.hpp>
+#include <TestAtomicOperations.hpp>
 
 namespace Test {
-TEST_F( TEST_CATEGORY , atomic_operations_long )
-{
-  const int start = 1; // Avoid zero for division.
-  const int end = 11;
-  for ( int i = start; i < end; ++i )
-  {
-    ASSERT_TRUE( ( TestAtomicOperations::AtomicOperationsTestIntegralType< long int, TEST_EXECSPACE >( start, end - i, 1 ) ) );
-    ASSERT_TRUE( ( TestAtomicOperations::AtomicOperationsTestIntegralType< long int, TEST_EXECSPACE >( start, end - i, 2 ) ) );
-    ASSERT_TRUE( ( TestAtomicOperations::AtomicOperationsTestIntegralType< long int, TEST_EXECSPACE >( start, end - i, 3 ) ) );
-    ASSERT_TRUE( ( TestAtomicOperations::AtomicOperationsTestIntegralType< long int, TEST_EXECSPACE >( start, end - i, 4 ) ) );
-    ASSERT_TRUE( ( TestAtomicOperations::AtomicOperationsTestIntegralType< long int, TEST_EXECSPACE >( start, end - i, 5 ) ) );
-    ASSERT_TRUE( ( TestAtomicOperations::AtomicOperationsTestIntegralType< long int, TEST_EXECSPACE >( start, end - i, 6 ) ) );
-    ASSERT_TRUE( ( TestAtomicOperations::AtomicOperationsTestIntegralType< long int, TEST_EXECSPACE >( start, end - i, 7 ) ) );
-    ASSERT_TRUE( ( TestAtomicOperations::AtomicOperationsTestIntegralType< long int, TEST_EXECSPACE >( start, end - i, 8 ) ) );
-    ASSERT_TRUE( ( TestAtomicOperations::AtomicOperationsTestIntegralType< long int, TEST_EXECSPACE >( start, end - i, 9 ) ) );
-    ASSERT_TRUE( ( TestAtomicOperations::AtomicOperationsTestIntegralType< long int, TEST_EXECSPACE >( start, end - i, 11 ) ) );
-    ASSERT_TRUE( ( TestAtomicOperations::AtomicOperationsTestIntegralType< long int, TEST_EXECSPACE >( start, end - i, 12 ) ) );
+TEST(TEST_CATEGORY, atomic_operations_long) {
+  const int start = 1;  // Avoid zero for division.
+  const int end   = 11;
+  for (int i = start; i < end; ++i) {
+    ASSERT_TRUE((TestAtomicOperations::AtomicOperationsTestIntegralType<
+                 long int, TEST_EXECSPACE>(start, end - i, 1)));
+    ASSERT_TRUE((TestAtomicOperations::AtomicOperationsTestIntegralType<
+                 long int, TEST_EXECSPACE>(start, end - i, 2)));
+    ASSERT_TRUE((TestAtomicOperations::AtomicOperationsTestIntegralType<
+                 long int, TEST_EXECSPACE>(start, end - i, 3)));
+    ASSERT_TRUE((TestAtomicOperations::AtomicOperationsTestIntegralType<
+                 long int, TEST_EXECSPACE>(start, end - i, 4)));
+    ASSERT_TRUE((TestAtomicOperations::AtomicOperationsTestIntegralType<
+                 long int, TEST_EXECSPACE>(start, end - i, 5)));
+    ASSERT_TRUE((TestAtomicOperations::AtomicOperationsTestIntegralType<
+                 long int, TEST_EXECSPACE>(start, end - i, 6)));
+    ASSERT_TRUE((TestAtomicOperations::AtomicOperationsTestIntegralType<
+                 long int, TEST_EXECSPACE>(start, end - i, 7)));
+    ASSERT_TRUE((TestAtomicOperations::AtomicOperationsTestIntegralType<
+                 long int, TEST_EXECSPACE>(start, end - i, 8)));
+    ASSERT_TRUE((TestAtomicOperations::AtomicOperationsTestIntegralType<
+                 long int, TEST_EXECSPACE>(start, end - i, 9)));
+    ASSERT_TRUE((TestAtomicOperations::AtomicOperationsTestIntegralType<
+                 long int, TEST_EXECSPACE>(start, end - i, 11)));
+    ASSERT_TRUE((TestAtomicOperations::AtomicOperationsTestIntegralType<
+                 long int, TEST_EXECSPACE>(start, end - i, 12)));
   }
 }
-}
+}  // namespace Test
diff --git a/lib/kokkos/core/unit_test/TestAtomicOperations_longlongint.hpp b/lib/kokkos/core/unit_test/TestAtomicOperations_longlongint.hpp
index 472cf3318c..73d4a61d72 100644
--- a/lib/kokkos/core/unit_test/TestAtomicOperations_longlongint.hpp
+++ b/lib/kokkos/core/unit_test/TestAtomicOperations_longlongint.hpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -41,26 +42,35 @@
 //@HEADER
 */
 
-#include<TestAtomicOperations.hpp>
+#include <TestAtomicOperations.hpp>
 
 namespace Test {
-TEST_F( TEST_CATEGORY , atomic_operations_longlong )
-{
-  const int start = 1; // Avoid zero for division.
-  const int end = 11;
-  for ( int i = start; i < end; ++i )
-  {
-    ASSERT_TRUE( ( TestAtomicOperations::AtomicOperationsTestIntegralType< long long int, TEST_EXECSPACE >( start, end - i, 1 ) ) );
-    ASSERT_TRUE( ( TestAtomicOperations::AtomicOperationsTestIntegralType< long long int, TEST_EXECSPACE >( start, end - i, 2 ) ) );
-    ASSERT_TRUE( ( TestAtomicOperations::AtomicOperationsTestIntegralType< long long int, TEST_EXECSPACE >( start, end - i, 3 ) ) );
-    ASSERT_TRUE( ( TestAtomicOperations::AtomicOperationsTestIntegralType< long long int, TEST_EXECSPACE >( start, end - i, 4 ) ) );
-    ASSERT_TRUE( ( TestAtomicOperations::AtomicOperationsTestIntegralType< long long int, TEST_EXECSPACE >( start, end - i, 5 ) ) );
-    ASSERT_TRUE( ( TestAtomicOperations::AtomicOperationsTestIntegralType< long long int, TEST_EXECSPACE >( start, end - i, 6 ) ) );
-    ASSERT_TRUE( ( TestAtomicOperations::AtomicOperationsTestIntegralType< long long int, TEST_EXECSPACE >( start, end - i, 7 ) ) );
-    ASSERT_TRUE( ( TestAtomicOperations::AtomicOperationsTestIntegralType< long long int, TEST_EXECSPACE >( start, end - i, 8 ) ) );
-    ASSERT_TRUE( ( TestAtomicOperations::AtomicOperationsTestIntegralType< long long int, TEST_EXECSPACE >( start, end - i, 9 ) ) );
-    ASSERT_TRUE( ( TestAtomicOperations::AtomicOperationsTestIntegralType< long long int, TEST_EXECSPACE >( start, end - i, 11 ) ) );
-    ASSERT_TRUE( ( TestAtomicOperations::AtomicOperationsTestIntegralType< long long int, TEST_EXECSPACE >( start, end - i, 12 ) ) );
+TEST(TEST_CATEGORY, atomic_operations_longlong) {
+  const int start = 1;  // Avoid zero for division.
+  const int end   = 11;
+  for (int i = start; i < end; ++i) {
+    ASSERT_TRUE((TestAtomicOperations::AtomicOperationsTestIntegralType<
+                 long long int, TEST_EXECSPACE>(start, end - i, 1)));
+    ASSERT_TRUE((TestAtomicOperations::AtomicOperationsTestIntegralType<
+                 long long int, TEST_EXECSPACE>(start, end - i, 2)));
+    ASSERT_TRUE((TestAtomicOperations::AtomicOperationsTestIntegralType<
+                 long long int, TEST_EXECSPACE>(start, end - i, 3)));
+    ASSERT_TRUE((TestAtomicOperations::AtomicOperationsTestIntegralType<
+                 long long int, TEST_EXECSPACE>(start, end - i, 4)));
+    ASSERT_TRUE((TestAtomicOperations::AtomicOperationsTestIntegralType<
+                 long long int, TEST_EXECSPACE>(start, end - i, 5)));
+    ASSERT_TRUE((TestAtomicOperations::AtomicOperationsTestIntegralType<
+                 long long int, TEST_EXECSPACE>(start, end - i, 6)));
+    ASSERT_TRUE((TestAtomicOperations::AtomicOperationsTestIntegralType<
+                 long long int, TEST_EXECSPACE>(start, end - i, 7)));
+    ASSERT_TRUE((TestAtomicOperations::AtomicOperationsTestIntegralType<
+                 long long int, TEST_EXECSPACE>(start, end - i, 8)));
+    ASSERT_TRUE((TestAtomicOperations::AtomicOperationsTestIntegralType<
+                 long long int, TEST_EXECSPACE>(start, end - i, 9)));
+    ASSERT_TRUE((TestAtomicOperations::AtomicOperationsTestIntegralType<
+                 long long int, TEST_EXECSPACE>(start, end - i, 11)));
+    ASSERT_TRUE((TestAtomicOperations::AtomicOperationsTestIntegralType<
+                 long long int, TEST_EXECSPACE>(start, end - i, 12)));
   }
 }
-}
+}  // namespace Test
diff --git a/lib/kokkos/core/unit_test/TestAtomicOperations_unsignedint.hpp b/lib/kokkos/core/unit_test/TestAtomicOperations_unsignedint.hpp
index 7e72c9f2e6..02f337c57c 100644
--- a/lib/kokkos/core/unit_test/TestAtomicOperations_unsignedint.hpp
+++ b/lib/kokkos/core/unit_test/TestAtomicOperations_unsignedint.hpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -41,26 +42,35 @@
 //@HEADER
 */
 
-#include<TestAtomicOperations.hpp>
+#include <TestAtomicOperations.hpp>
 
 namespace Test {
-TEST_F( TEST_CATEGORY , atomic_operations_unsigned )
-{
-  const int start = 1; // Avoid zero for division.
-  const int end = 11;
-  for ( int i = start; i < end; ++i )
-  {
-    ASSERT_TRUE( ( TestAtomicOperations::AtomicOperationsTestIntegralType< unsigned int, TEST_EXECSPACE >( start, end - i, 1 ) ) );
-    ASSERT_TRUE( ( TestAtomicOperations::AtomicOperationsTestIntegralType< unsigned int, TEST_EXECSPACE >( start, end - i, 2 ) ) );
-    ASSERT_TRUE( ( TestAtomicOperations::AtomicOperationsTestIntegralType< unsigned int, TEST_EXECSPACE >( start, end - i, 3 ) ) );
-    ASSERT_TRUE( ( TestAtomicOperations::AtomicOperationsTestIntegralType< unsigned int, TEST_EXECSPACE >( start, end - i, 4 ) ) );
-    ASSERT_TRUE( ( TestAtomicOperations::AtomicOperationsTestIntegralType< unsigned int, TEST_EXECSPACE >( start, end - i, 5 ) ) );
-    ASSERT_TRUE( ( TestAtomicOperations::AtomicOperationsTestIntegralType< unsigned int, TEST_EXECSPACE >( start, end - i, 6 ) ) );
-    ASSERT_TRUE( ( TestAtomicOperations::AtomicOperationsTestIntegralType< unsigned int, TEST_EXECSPACE >( start, end - i, 7 ) ) );
-    ASSERT_TRUE( ( TestAtomicOperations::AtomicOperationsTestIntegralType< unsigned int, TEST_EXECSPACE >( start, end - i, 8 ) ) );
-    ASSERT_TRUE( ( TestAtomicOperations::AtomicOperationsTestIntegralType< unsigned int, TEST_EXECSPACE >( start, end - i, 9 ) ) );
-    ASSERT_TRUE( ( TestAtomicOperations::AtomicOperationsTestIntegralType< unsigned int, TEST_EXECSPACE >( start, end - i, 11 ) ) );
-    ASSERT_TRUE( ( TestAtomicOperations::AtomicOperationsTestIntegralType< unsigned int, TEST_EXECSPACE >( start, end - i, 12 ) ) );
+TEST(TEST_CATEGORY, atomic_operations_unsigned) {
+  const int start = 1;  // Avoid zero for division.
+  const int end   = 11;
+  for (int i = start; i < end; ++i) {
+    ASSERT_TRUE((TestAtomicOperations::AtomicOperationsTestIntegralType<
+                 unsigned int, TEST_EXECSPACE>(start, end - i, 1)));
+    ASSERT_TRUE((TestAtomicOperations::AtomicOperationsTestIntegralType<
+                 unsigned int, TEST_EXECSPACE>(start, end - i, 2)));
+    ASSERT_TRUE((TestAtomicOperations::AtomicOperationsTestIntegralType<
+                 unsigned int, TEST_EXECSPACE>(start, end - i, 3)));
+    ASSERT_TRUE((TestAtomicOperations::AtomicOperationsTestIntegralType<
+                 unsigned int, TEST_EXECSPACE>(start, end - i, 4)));
+    ASSERT_TRUE((TestAtomicOperations::AtomicOperationsTestIntegralType<
+                 unsigned int, TEST_EXECSPACE>(start, end - i, 5)));
+    ASSERT_TRUE((TestAtomicOperations::AtomicOperationsTestIntegralType<
+                 unsigned int, TEST_EXECSPACE>(start, end - i, 6)));
+    ASSERT_TRUE((TestAtomicOperations::AtomicOperationsTestIntegralType<
+                 unsigned int, TEST_EXECSPACE>(start, end - i, 7)));
+    ASSERT_TRUE((TestAtomicOperations::AtomicOperationsTestIntegralType<
+                 unsigned int, TEST_EXECSPACE>(start, end - i, 8)));
+    ASSERT_TRUE((TestAtomicOperations::AtomicOperationsTestIntegralType<
+                 unsigned int, TEST_EXECSPACE>(start, end - i, 9)));
+    ASSERT_TRUE((TestAtomicOperations::AtomicOperationsTestIntegralType<
+                 unsigned int, TEST_EXECSPACE>(start, end - i, 11)));
+    ASSERT_TRUE((TestAtomicOperations::AtomicOperationsTestIntegralType<
+                 unsigned int, TEST_EXECSPACE>(start, end - i, 12)));
   }
 }
-}
+}  // namespace Test
diff --git a/lib/kokkos/core/unit_test/TestAtomicOperations_unsignedlongint.hpp b/lib/kokkos/core/unit_test/TestAtomicOperations_unsignedlongint.hpp
index dedddcc7ad..f4340475f5 100644
--- a/lib/kokkos/core/unit_test/TestAtomicOperations_unsignedlongint.hpp
+++ b/lib/kokkos/core/unit_test/TestAtomicOperations_unsignedlongint.hpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -41,26 +42,35 @@
 //@HEADER
 */
 
-#include<TestAtomicOperations.hpp>
+#include <TestAtomicOperations.hpp>
 
 namespace Test {
-TEST_F( TEST_CATEGORY , atomic_operations_unsignedlong )
-{
-  const int start = 1; // Avoid zero for division.
-  const int end = 11;
-  for ( int i = start; i < end; ++i )
-  {
-    ASSERT_TRUE( ( TestAtomicOperations::AtomicOperationsTestIntegralType< unsigned long int, TEST_EXECSPACE >( start, end - i, 1 ) ) );
-    ASSERT_TRUE( ( TestAtomicOperations::AtomicOperationsTestIntegralType< unsigned long int, TEST_EXECSPACE >( start, end - i, 2 ) ) );
-    ASSERT_TRUE( ( TestAtomicOperations::AtomicOperationsTestIntegralType< unsigned long int, TEST_EXECSPACE >( start, end - i, 3 ) ) );
-    ASSERT_TRUE( ( TestAtomicOperations::AtomicOperationsTestIntegralType< unsigned long int, TEST_EXECSPACE >( start, end - i, 4 ) ) );
-    ASSERT_TRUE( ( TestAtomicOperations::AtomicOperationsTestIntegralType< unsigned long int, TEST_EXECSPACE >( start, end - i, 5 ) ) );
-    ASSERT_TRUE( ( TestAtomicOperations::AtomicOperationsTestIntegralType< unsigned long int, TEST_EXECSPACE >( start, end - i, 6 ) ) );
-    ASSERT_TRUE( ( TestAtomicOperations::AtomicOperationsTestIntegralType< unsigned long int, TEST_EXECSPACE >( start, end - i, 7 ) ) );
-    ASSERT_TRUE( ( TestAtomicOperations::AtomicOperationsTestIntegralType< unsigned long int, TEST_EXECSPACE >( start, end - i, 8 ) ) );
-    ASSERT_TRUE( ( TestAtomicOperations::AtomicOperationsTestIntegralType< unsigned long int, TEST_EXECSPACE >( start, end - i, 9 ) ) );
-    ASSERT_TRUE( ( TestAtomicOperations::AtomicOperationsTestIntegralType< unsigned long int, TEST_EXECSPACE >( start, end - i, 11 ) ) );
-    ASSERT_TRUE( ( TestAtomicOperations::AtomicOperationsTestIntegralType< unsigned long int, TEST_EXECSPACE >( start, end - i, 12 ) ) );
+TEST(TEST_CATEGORY, atomic_operations_unsignedlong) {
+  const int start = 1;  // Avoid zero for division.
+  const int end   = 11;
+  for (int i = start; i < end; ++i) {
+    ASSERT_TRUE((TestAtomicOperations::AtomicOperationsTestIntegralType<
+                 unsigned long int, TEST_EXECSPACE>(start, end - i, 1)));
+    ASSERT_TRUE((TestAtomicOperations::AtomicOperationsTestIntegralType<
+                 unsigned long int, TEST_EXECSPACE>(start, end - i, 2)));
+    ASSERT_TRUE((TestAtomicOperations::AtomicOperationsTestIntegralType<
+                 unsigned long int, TEST_EXECSPACE>(start, end - i, 3)));
+    ASSERT_TRUE((TestAtomicOperations::AtomicOperationsTestIntegralType<
+                 unsigned long int, TEST_EXECSPACE>(start, end - i, 4)));
+    ASSERT_TRUE((TestAtomicOperations::AtomicOperationsTestIntegralType<
+                 unsigned long int, TEST_EXECSPACE>(start, end - i, 5)));
+    ASSERT_TRUE((TestAtomicOperations::AtomicOperationsTestIntegralType<
+                 unsigned long int, TEST_EXECSPACE>(start, end - i, 6)));
+    ASSERT_TRUE((TestAtomicOperations::AtomicOperationsTestIntegralType<
+                 unsigned long int, TEST_EXECSPACE>(start, end - i, 7)));
+    ASSERT_TRUE((TestAtomicOperations::AtomicOperationsTestIntegralType<
+                 unsigned long int, TEST_EXECSPACE>(start, end - i, 8)));
+    ASSERT_TRUE((TestAtomicOperations::AtomicOperationsTestIntegralType<
+                 unsigned long int, TEST_EXECSPACE>(start, end - i, 9)));
+    ASSERT_TRUE((TestAtomicOperations::AtomicOperationsTestIntegralType<
+                 unsigned long int, TEST_EXECSPACE>(start, end - i, 11)));
+    ASSERT_TRUE((TestAtomicOperations::AtomicOperationsTestIntegralType<
+                 unsigned long int, TEST_EXECSPACE>(start, end - i, 12)));
   }
 }
-}
+}  // namespace Test
diff --git a/lib/kokkos/core/unit_test/TestAtomicViews.hpp b/lib/kokkos/core/unit_test/TestAtomicViews.hpp
index 38b49730d4..d7a45dc40f 100644
--- a/lib/kokkos/core/unit_test/TestAtomicViews.hpp
+++ b/lib/kokkos/core/unit_test/TestAtomicViews.hpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -49,241 +50,262 @@ namespace TestAtomicViews {
 //-----------atomic view api tests-----------------
 //-------------------------------------------------
 
-template< class T, class ... P >
-size_t allocation_count( const Kokkos::View< T, P... > & view )
-{
+template <class T, class... P>
+size_t allocation_count(const Kokkos::View<T, P...>& view) {
   const size_t card  = view.size();
   const size_t alloc = view.span();
 
-  const int memory_span = Kokkos::View< int* >::required_allocation_size( 100 );
+  const int memory_span = Kokkos::View<int*>::required_allocation_size(100);
 
-  return ( card <= alloc && memory_span == 400 ) ? alloc : 0;
+  return (card <= alloc && memory_span == 400) ? alloc : 0;
 }
 
-template< class DataType,
-          class DeviceType,
-          unsigned Rank = Kokkos::ViewTraits< DataType >::rank >
+template <class DataType, class DeviceType,
+          unsigned Rank = Kokkos::ViewTraits<DataType>::rank>
 struct TestViewOperator_LeftAndRight;
 
-template< class DataType, class DeviceType >
-struct TestViewOperator_LeftAndRight< DataType, DeviceType, 1 >
-{
-  typedef typename DeviceType::execution_space  execution_space;
-  typedef typename DeviceType::memory_space     memory_space;
-  typedef typename execution_space::size_type   size_type;
+template <class DataType, class DeviceType>
+struct TestViewOperator_LeftAndRight<DataType, DeviceType, 1> {
+  typedef typename DeviceType::execution_space execution_space;
+  typedef typename DeviceType::memory_space memory_space;
+  typedef typename execution_space::size_type size_type;
 
   typedef int value_type;
 
   KOKKOS_INLINE_FUNCTION
-  static void join( volatile value_type & update,
-                    const volatile value_type & input )
-    { update |= input; }
+  static void join(volatile value_type& update,
+                   const volatile value_type& input) {
+    update |= input;
+  }
 
   KOKKOS_INLINE_FUNCTION
-  static void init( value_type & update )
-    { update = 0; }
+  static void init(value_type& update) { update = 0; }
 
-  typedef Kokkos::View< DataType, Kokkos::LayoutLeft, execution_space, Kokkos::MemoryTraits<Kokkos::Atomic> > left_view;
+  typedef Kokkos::View<DataType, Kokkos::LayoutLeft, execution_space,
+                       Kokkos::MemoryTraits<Kokkos::Atomic> >
+      left_view;
 
-  typedef Kokkos::View< DataType, Kokkos::LayoutRight, execution_space, Kokkos::MemoryTraits<Kokkos::Atomic> > right_view;
+  typedef Kokkos::View<DataType, Kokkos::LayoutRight, execution_space,
+                       Kokkos::MemoryTraits<Kokkos::Atomic> >
+      right_view;
 
-  typedef Kokkos::View< DataType, Kokkos::LayoutStride, execution_space, Kokkos::MemoryTraits<Kokkos::Atomic> > stride_view;
+  typedef Kokkos::View<DataType, Kokkos::LayoutStride, execution_space,
+                       Kokkos::MemoryTraits<Kokkos::Atomic> >
+      stride_view;
 
-  left_view    left;
-  right_view   right;
-  stride_view  left_stride;
-  stride_view  right_stride;
-  long         left_alloc;
-  long         right_alloc;
+  left_view left;
+  right_view right;
+  stride_view left_stride;
+  stride_view right_stride;
+  long left_alloc;
+  long right_alloc;
 
   TestViewOperator_LeftAndRight()
-    : left(  "left" )
-    , right( "right" )
-    , left_stride( left )
-    , right_stride( right )
-    , left_alloc( allocation_count( left ) )
-    , right_alloc( allocation_count( right ) )
-    {}
+      : left("left"),
+        right("right"),
+        left_stride(left),
+        right_stride(right),
+        left_alloc(allocation_count(left)),
+        right_alloc(allocation_count(right)) {}
 
-  static void testit()
-  {
+  static void testit() {
     TestViewOperator_LeftAndRight driver;
 
     int error_flag = 0;
 
-    Kokkos::parallel_reduce( 1, driver, error_flag );
+    Kokkos::parallel_reduce(1, driver, error_flag);
 
-    ASSERT_EQ( error_flag, 0 );
+    ASSERT_EQ(error_flag, 0);
   }
 
   KOKKOS_INLINE_FUNCTION
-  void operator()( const size_type, value_type & update ) const
-  {
-    for ( unsigned i0 = 0; i0 < unsigned( left.extent(0) ); ++i0 )
-    {
+  void operator()(const size_type, value_type& update) const {
+    for (unsigned i0 = 0; i0 < unsigned(left.extent(0)); ++i0) {
       // Below checks that values match, but unable to check the references.
       // Should this be able to be checked?
 #ifdef KOKKOS_ENABLE_DEPRECATED_CODE
-        if ( left( i0 )  != left( i0, 0, 0, 0, 0, 0, 0, 0 ) )  { update |= 3; }
-        if ( right( i0 ) != right( i0, 0, 0, 0, 0, 0, 0, 0 ) ) { update |= 3; }
+      if (left(i0) != left(i0, 0, 0, 0, 0, 0, 0, 0)) {
+        update |= 3;
+      }
+      if (right(i0) != right(i0, 0, 0, 0, 0, 0, 0, 0)) {
+        update |= 3;
+      }
 #else
-        if ( left( i0 )  != left.access( i0, 0, 0, 0, 0, 0, 0, 0 ) )  { update |= 3; }
-        if ( right( i0 ) != right.access( i0, 0, 0, 0, 0, 0, 0, 0 ) ) { update |= 3; }
+      if (left(i0) != left.access(i0, 0, 0, 0, 0, 0, 0, 0)) {
+        update |= 3;
+      }
+      if (right(i0) != right.access(i0, 0, 0, 0, 0, 0, 0, 0)) {
+        update |= 3;
+      }
 #endif
-      if ( left( i0 )  != left_stride( i0 ) ) { update |= 4; }
-      if ( right( i0 ) != right_stride( i0 ) ) { update |= 8; }
-/*
-      if ( &left( i0 )  != &left( i0, 0, 0, 0, 0, 0, 0, 0 ) )  { update |= 3; }
-      if ( &right( i0 ) != &right( i0, 0, 0, 0, 0, 0, 0, 0 ) ) { update |= 3; }
-      if ( &left( i0 )  != &left_stride( i0 ) ) { update |= 4; }
-      if ( &right( i0 ) != &right_stride( i0 ) ) { update |= 8; }
-*/
+      if (left(i0) != left_stride(i0)) {
+        update |= 4;
+      }
+      if (right(i0) != right_stride(i0)) {
+        update |= 8;
+      }
+      /*
+            if ( &left( i0 )  != &left( i0, 0, 0, 0, 0, 0, 0, 0 ) )  { update |=
+         3; } if ( &right( i0 ) != &right( i0, 0, 0, 0, 0, 0, 0, 0 ) ) { update
+         |= 3; } if ( &left( i0 )  != &left_stride( i0 ) ) { update |= 4; } if (
+         &right( i0 ) != &right_stride( i0 ) ) { update |= 8; }
+      */
     }
   }
 };
 
-template< typename T, class DeviceType >
-class TestAtomicViewAPI
-{
-public:
+template <typename T, class DeviceType>
+class TestAtomicViewAPI {
+ public:
   typedef DeviceType device;
 
-  enum { N0 = 1000,
-         N1 = 3,
-         N2 = 5,
-         N3 = 7 };
+  enum { N0 = 1000, N1 = 3, N2 = 5, N3 = 7 };
 
-  typedef Kokkos::View< T, device > dView0;
-  typedef Kokkos::View< T*, device > dView1;
-  typedef Kokkos::View< T*[N1], device > dView2;
-  typedef Kokkos::View< T*[N1][N2], device > dView3;
-  typedef Kokkos::View< T*[N1][N2][N3], device > dView4;
-  typedef Kokkos::View< const T*[N1][N2][N3], device > const_dView4;
-  typedef Kokkos::View< T****, device, Kokkos::MemoryUnmanaged > dView4_unmanaged;
+  typedef Kokkos::View<T, device> dView0;
+  typedef Kokkos::View<T*, device> dView1;
+  typedef Kokkos::View<T * [N1], device> dView2;
+  typedef Kokkos::View<T * [N1][N2], device> dView3;
+  typedef Kokkos::View<T * [N1][N2][N3], device> dView4;
+  typedef Kokkos::View<const T * [N1][N2][N3], device> const_dView4;
+  typedef Kokkos::View<T****, device, Kokkos::MemoryUnmanaged> dView4_unmanaged;
   typedef typename dView0::host_mirror_space host;
 
-  typedef Kokkos::View< T, device, Kokkos::MemoryTraits< Kokkos::Atomic > > aView0;
-  typedef Kokkos::View< T*, device, Kokkos::MemoryTraits< Kokkos::Atomic > > aView1;
-  typedef Kokkos::View< T*[N1], device, Kokkos::MemoryTraits< Kokkos::Atomic > > aView2;
-  typedef Kokkos::View< T*[N1][N2], device, Kokkos::MemoryTraits< Kokkos::Atomic > > aView3;
-  typedef Kokkos::View< T*[N1][N2][N3], device, Kokkos::MemoryTraits< Kokkos::Atomic > > aView4;
-  typedef Kokkos::View< const T*[N1][N2][N3], device, Kokkos::MemoryTraits< Kokkos::Atomic > > const_aView4;
+  typedef Kokkos::View<T, device, Kokkos::MemoryTraits<Kokkos::Atomic> > aView0;
+  typedef Kokkos::View<T*, device, Kokkos::MemoryTraits<Kokkos::Atomic> >
+      aView1;
+  typedef Kokkos::View<T * [N1], device, Kokkos::MemoryTraits<Kokkos::Atomic> >
+      aView2;
+  typedef Kokkos::View<T * [N1][N2], device,
+                       Kokkos::MemoryTraits<Kokkos::Atomic> >
+      aView3;
+  typedef Kokkos::View<T * [N1][N2][N3], device,
+                       Kokkos::MemoryTraits<Kokkos::Atomic> >
+      aView4;
+  typedef Kokkos::View<const T * [N1][N2][N3], device,
+                       Kokkos::MemoryTraits<Kokkos::Atomic> >
+      const_aView4;
 
-  typedef Kokkos::View< T****, device, Kokkos::MemoryTraits< Kokkos::Unmanaged | Kokkos::Atomic > > aView4_unmanaged;
+  typedef Kokkos::View<
+      T****, device, Kokkos::MemoryTraits<Kokkos::Unmanaged | Kokkos::Atomic> >
+      aView4_unmanaged;
 
   typedef typename aView0::host_mirror_space host_atomic;
 
-  TestAtomicViewAPI()
-  {
-    TestViewOperator_LeftAndRight< int[2], device >::testit();
+  TestAtomicViewAPI() {
+    TestViewOperator_LeftAndRight<int[2], device>::testit();
     run_test_rank0();
     run_test_rank4();
     run_test_const();
   }
 
-  static void run_test_rank0()
-  {
+  static void run_test_rank0() {
     dView0 dx, dy;
     aView0 ax, ay, az;
 
-    dx = dView0( "dx" );
-    dy = dView0( "dy" );
-    ASSERT_EQ( dx.use_count(), size_t( 1 ) );
-    ASSERT_EQ( dy.use_count(), size_t( 1 ) );
+    dx = dView0("dx");
+    dy = dView0("dy");
+    ASSERT_EQ(dx.use_count(), size_t(1));
+    ASSERT_EQ(dy.use_count(), size_t(1));
 
     ax = dx;
     ay = dy;
-    ASSERT_EQ( dx.use_count(), size_t( 2 ) );
-    ASSERT_EQ( dy.use_count(), size_t( 2 ) );
-    ASSERT_EQ( dx.use_count(), ax.use_count() );
+    ASSERT_EQ(dx.use_count(), size_t(2));
+    ASSERT_EQ(dy.use_count(), size_t(2));
+    ASSERT_EQ(dx.use_count(), ax.use_count());
 
     az = ax;
-    ASSERT_EQ( dx.use_count(), size_t( 3 ) );
-    ASSERT_EQ( ax.use_count(), size_t( 3 ) );
-    ASSERT_EQ( az.use_count(), size_t( 3 ) );
-    ASSERT_EQ( az.use_count(), ax.use_count() );
+    ASSERT_EQ(dx.use_count(), size_t(3));
+    ASSERT_EQ(ax.use_count(), size_t(3));
+    ASSERT_EQ(az.use_count(), size_t(3));
+    ASSERT_EQ(az.use_count(), ax.use_count());
   }
 
-  static void run_test_rank4()
-  {
+  static void run_test_rank4() {
     dView4 dx, dy;
     aView4 ax, ay, az;
 
-    dx = dView4( "dx", N0 );
-    dy = dView4( "dy", N0 );
-    ASSERT_EQ( dx.use_count(), size_t( 1 ) );
-    ASSERT_EQ( dy.use_count(), size_t( 1 ) );
+    dx = dView4("dx", N0);
+    dy = dView4("dy", N0);
+    ASSERT_EQ(dx.use_count(), size_t(1));
+    ASSERT_EQ(dy.use_count(), size_t(1));
 
     ax = dx;
     ay = dy;
-    ASSERT_EQ( dx.use_count(), size_t( 2 ) );
-    ASSERT_EQ( dy.use_count(), size_t( 2 ) );
-    ASSERT_EQ( dx.use_count(), ax.use_count() );
+    ASSERT_EQ(dx.use_count(), size_t(2));
+    ASSERT_EQ(dy.use_count(), size_t(2));
+    ASSERT_EQ(dx.use_count(), ax.use_count());
 
     dView4_unmanaged unmanaged_dx = dx;
-    ASSERT_EQ( dx.use_count(), size_t( 2 ) );
+    ASSERT_EQ(dx.use_count(), size_t(2));
 
     az = ax;
-    ASSERT_EQ( dx.use_count(), size_t( 3 ) );
-    ASSERT_EQ( ax.use_count(), size_t( 3 ) );
-    ASSERT_EQ( az.use_count(), size_t( 3 ) );
-    ASSERT_EQ( az.use_count(), ax.use_count() );
+    ASSERT_EQ(dx.use_count(), size_t(3));
+    ASSERT_EQ(ax.use_count(), size_t(3));
+    ASSERT_EQ(az.use_count(), size_t(3));
+    ASSERT_EQ(az.use_count(), ax.use_count());
 
     aView4_unmanaged unmanaged_ax = ax;
-    ASSERT_EQ( ax.use_count(), size_t( 3 ) );
+    ASSERT_EQ(ax.use_count(), size_t(3));
 
-    aView4_unmanaged unmanaged_ax_from_ptr_dx =
-      aView4_unmanaged( dx.data(), dx.extent(0), dx.extent(1), dx.extent(2), dx.extent(3) );
-    ASSERT_EQ( ax.use_count(), size_t( 3 ) );
+    aView4_unmanaged unmanaged_ax_from_ptr_dx = aView4_unmanaged(
+        dx.data(), dx.extent(0), dx.extent(1), dx.extent(2), dx.extent(3));
+    ASSERT_EQ(ax.use_count(), size_t(3));
 
     const_aView4 const_ax = ax;
-    ASSERT_EQ( ax.use_count(), size_t( 4 ) );
-    ASSERT_EQ( const_ax.use_count(), ax.use_count() );
+    ASSERT_EQ(ax.use_count(), size_t(4));
+    ASSERT_EQ(const_ax.use_count(), ax.use_count());
 
-    ASSERT_FALSE( ax.data() == 0 );
-    ASSERT_FALSE( const_ax.data() == 0 ); // referenceable ptr
-    ASSERT_FALSE( unmanaged_ax.data() == 0 );
-    ASSERT_FALSE( unmanaged_ax_from_ptr_dx.data() == 0 );
-    ASSERT_FALSE( ay.data() == 0 );
-//    ASSERT_NE( ax, ay );
-//    Above test results in following runtime error from gtest:
-//    Expected: (ax) != (ay), actual: 32-byte object <30-01 D0-A0 D8-7F 00-00 00-31 44-0C 01-00 00-00 E8-03 00-00 00-00 00-00 69-00 00-00 00-00 00-00> vs 32-byte object <80-01 D0-A0 D8-7F 00-00 00-A1 4A-0C 01-00 00-00 E8-03 00-00 00-00 00-00 69-00 00-00 00-00 00-00>
+    ASSERT_FALSE(ax.data() == 0);
+    ASSERT_FALSE(const_ax.data() == 0);  // referenceable ptr
+    ASSERT_FALSE(unmanaged_ax.data() == 0);
+    ASSERT_FALSE(unmanaged_ax_from_ptr_dx.data() == 0);
+    ASSERT_FALSE(ay.data() == 0);
+    //    ASSERT_NE( ax, ay );
+    //    Above test results in following runtime error from gtest:
+    //    Expected: (ax) != (ay), actual: 32-byte object <30-01 D0-A0 D8-7F
+    //    00-00 00-31 44-0C 01-00 00-00 E8-03 00-00 00-00 00-00 69-00 00-00
+    //    00-00 00-00> vs 32-byte object <80-01 D0-A0 D8-7F 00-00 00-A1 4A-0C
+    //    01-00 00-00 E8-03 00-00 00-00 00-00 69-00 00-00 00-00 00-00>
 
-    ASSERT_EQ( ax.extent(0), unsigned( N0 ) );
-    ASSERT_EQ( ax.extent(1), unsigned( N1 ) );
-    ASSERT_EQ( ax.extent(2), unsigned( N2 ) );
-    ASSERT_EQ( ax.extent(3), unsigned( N3 ) );
+    ASSERT_EQ(ax.extent(0), unsigned(N0));
+    ASSERT_EQ(ax.extent(1), unsigned(N1));
+    ASSERT_EQ(ax.extent(2), unsigned(N2));
+    ASSERT_EQ(ax.extent(3), unsigned(N3));
 
-    ASSERT_EQ( ay.extent(0), unsigned( N0 ) );
-    ASSERT_EQ( ay.extent(1), unsigned( N1 ) );
-    ASSERT_EQ( ay.extent(2), unsigned( N2 ) );
-    ASSERT_EQ( ay.extent(3), unsigned( N3 ) );
+    ASSERT_EQ(ay.extent(0), unsigned(N0));
+    ASSERT_EQ(ay.extent(1), unsigned(N1));
+    ASSERT_EQ(ay.extent(2), unsigned(N2));
+    ASSERT_EQ(ay.extent(3), unsigned(N3));
 
-    ASSERT_EQ( unmanaged_ax_from_ptr_dx.span(), unsigned( N0 ) * unsigned( N1 ) * unsigned( N2 ) * unsigned( N3 ) );
+    ASSERT_EQ(unmanaged_ax_from_ptr_dx.span(),
+              unsigned(N0) * unsigned(N1) * unsigned(N2) * unsigned(N3));
   }
 
   typedef T DataType[2];
 
-  static void
-  check_auto_conversion_to_const(
-     const Kokkos::View< const DataType, device, Kokkos::MemoryTraits<Kokkos::Atomic> > & arg_const,
-     const Kokkos::View< const DataType, device, Kokkos::MemoryTraits<Kokkos::Atomic> > & arg )
-  {
-    ASSERT_TRUE( arg_const == arg );
+  static void check_auto_conversion_to_const(
+      const Kokkos::View<const DataType, device,
+                         Kokkos::MemoryTraits<Kokkos::Atomic> >& arg_const,
+      const Kokkos::View<const DataType, device,
+                         Kokkos::MemoryTraits<Kokkos::Atomic> >& arg) {
+    ASSERT_TRUE(arg_const == arg);
   }
 
-  static void run_test_const()
-  {
-    typedef Kokkos::View< DataType, device, Kokkos::MemoryTraits<Kokkos::Atomic> > typeX;
-    typedef Kokkos::View< const DataType, device, Kokkos::MemoryTraits<Kokkos::Atomic> > const_typeX;
+  static void run_test_const() {
+    typedef Kokkos::View<DataType, device,
+                         Kokkos::MemoryTraits<Kokkos::Atomic> >
+        typeX;
+    typedef Kokkos::View<const DataType, device,
+                         Kokkos::MemoryTraits<Kokkos::Atomic> >
+        const_typeX;
 
-    typeX x( "X" );
+    typeX x("X");
     const_typeX xc = x;
 
-    //ASSERT_TRUE( xc == x ); // const xc is referenceable, non-const x is not
-    //ASSERT_TRUE( x == xc );
+    // ASSERT_TRUE( xc == x ); // const xc is referenceable, non-const x is not
+    // ASSERT_TRUE( x == xc );
 
-    check_auto_conversion_to_const( x, xc );
+    check_auto_conversion_to_const(x, xc);
   }
 };
 
@@ -291,72 +313,65 @@ public:
 //-----------initialization functors-----------------
 //---------------------------------------------------
 
-template<class T, class execution_space >
+template <class T, class execution_space>
 struct InitFunctor_Seq {
-  typedef Kokkos::View< T*, execution_space > view_type;
+  typedef Kokkos::View<T*, execution_space> view_type;
 
   view_type input;
   const long length;
 
-  InitFunctor_Seq( view_type & input_, const long length_ )
-    : input( input_ )
-    , length( length_ )
-  {}
+  InitFunctor_Seq(view_type& input_, const long length_)
+      : input(input_), length(length_) {}
 
   KOKKOS_INLINE_FUNCTION
-  void operator()( const long i ) const {
-    if ( i < length ) {
-      input( i ) = (T) i;
+  void operator()(const long i) const {
+    if (i < length) {
+      input(i) = (T)i;
     }
   }
 };
 
-template<class T, class execution_space >
+template <class T, class execution_space>
 struct InitFunctor_ModTimes {
-  typedef Kokkos::View< T*, execution_space > view_type;
+  typedef Kokkos::View<T*, execution_space> view_type;
 
   view_type input;
   const long length;
   const long remainder;
 
-  InitFunctor_ModTimes( view_type & input_, const long length_, const long remainder_ )
-    : input( input_ )
-    , length( length_ )
-    , remainder( remainder_ )
-  {}
+  InitFunctor_ModTimes(view_type& input_, const long length_,
+                       const long remainder_)
+      : input(input_), length(length_), remainder(remainder_) {}
 
   KOKKOS_INLINE_FUNCTION
-  void operator()( const long i ) const {
-    if ( i < length ) {
-      if ( i % ( remainder + 1 ) == remainder ) {
-        input( i ) = (T) 2;
-      }
-      else {
-        input( i ) = (T) 1;
+  void operator()(const long i) const {
+    if (i < length) {
+      if (i % (remainder + 1) == remainder) {
+        input(i) = (T)2;
+      } else {
+        input(i) = (T)1;
       }
     }
   }
 };
 
-template<class T, class execution_space >
+template <class T, class execution_space>
 struct InitFunctor_ModShift {
-  typedef Kokkos::View< T*, execution_space > view_type;
+  typedef Kokkos::View<T*, execution_space> view_type;
 
   view_type input;
   const long length;
   const long remainder;
 
-  InitFunctor_ModShift( view_type & input_, const long length_, const long remainder_ )
-    : input( input_ )
-    , length( length_ )
-    , remainder( remainder_ )
-  {}
+  InitFunctor_ModShift(view_type& input_, const long length_,
+                       const long remainder_)
+      : input(input_), length(length_), remainder(remainder_) {}
 
   KOKKOS_INLINE_FUNCTION
-  void operator()( const long i ) const {
-    if ( i < length ) {
-      if ( i % ( remainder + 1 ) == remainder ) {
-        input( i ) = 1;
+  void operator()(const long i) const {
+    if (i < length) {
+      if (i % (remainder + 1) == remainder) {
+        input(i) = 1;
       }
     }
   }
@@ -366,96 +381,94 @@ struct InitFunctor_ModShift {
 //-----------atomic view plus-equal------------------
 //---------------------------------------------------
 
-template<class T, class execution_space >
+template <class T, class execution_space>
 struct PlusEqualAtomicViewFunctor {
-  typedef Kokkos::View< T*, execution_space, Kokkos::MemoryTraits<Kokkos::Atomic> > atomic_view_type;
-  typedef Kokkos::View< T*, execution_space > view_type;
+  typedef Kokkos::View<T*, execution_space,
+                       Kokkos::MemoryTraits<Kokkos::Atomic> >
+      atomic_view_type;
+  typedef Kokkos::View<T*, execution_space> view_type;
 
   view_type input;
   atomic_view_type even_odd_result;
   const long length;
 
   // Wrap the result view in an atomic view, use this for operator
-  PlusEqualAtomicViewFunctor( const view_type & input_, view_type & even_odd_result_, const long length_ )
-    : input( input_ )
-    , even_odd_result( even_odd_result_ )
-    , length( length_ )
-  {}
+  PlusEqualAtomicViewFunctor(const view_type& input_,
+                             view_type& even_odd_result_, const long length_)
+      : input(input_), even_odd_result(even_odd_result_), length(length_) {}
 
   KOKKOS_INLINE_FUNCTION
-  void operator()( const long i ) const {
-    if ( i < length ) {
-      if ( i % 2 == 0 ) {
-        even_odd_result( 0 ) += input( i );
-      }
-      else {
-        even_odd_result( 1 ) += input( i );
+  void operator()(const long i) const {
+    if (i < length) {
+      if (i % 2 == 0) {
+        even_odd_result(0) += input(i);
+      } else {
+        even_odd_result(1) += input(i);
       }
     }
   }
 };
 
-template< class T, class execution_space >
-T PlusEqualAtomicView( const long input_length ) {
-  typedef Kokkos::View< T*, execution_space > view_type;
+template <class T, class execution_space>
+T PlusEqualAtomicView(const long input_length) {
+  typedef Kokkos::View<T*, execution_space> view_type;
   typedef typename view_type::HostMirror host_view_type;
 
   const long length = input_length;
 
-  view_type input( "input_view", length );
-  view_type result_view( "result_view", 2 );
+  view_type input("input_view", length);
+  view_type result_view("result_view", 2);
 
-  InitFunctor_Seq< T, execution_space > init_f( input, length );
-  Kokkos::parallel_for( Kokkos::RangePolicy< execution_space >( 0, length ), init_f );
+  InitFunctor_Seq<T, execution_space> init_f(input, length);
+  Kokkos::parallel_for(Kokkos::RangePolicy<execution_space>(0, length), init_f);
 
-  PlusEqualAtomicViewFunctor< T, execution_space > functor( input, result_view, length );
-  Kokkos::parallel_for( Kokkos::RangePolicy<execution_space>( 0, length ), functor );
+  PlusEqualAtomicViewFunctor<T, execution_space> functor(input, result_view,
+                                                         length);
+  Kokkos::parallel_for(Kokkos::RangePolicy<execution_space>(0, length),
+                       functor);
   Kokkos::fence();
 
-  host_view_type h_result_view = Kokkos::create_mirror_view( result_view );
-  Kokkos::deep_copy( h_result_view, result_view );
+  host_view_type h_result_view = Kokkos::create_mirror_view(result_view);
+  Kokkos::deep_copy(h_result_view, result_view);
 
-  return (T) ( h_result_view( 0 ) + h_result_view( 1 ) );
+  return (T)(h_result_view(0) + h_result_view(1));
 }
 
-template< class T >
-T PlusEqualAtomicViewCheck( const long input_length ) {
+template <class T>
+T PlusEqualAtomicViewCheck(const long input_length) {
   const long N = input_length;
   T result[2];
 
-  if ( N % 2 == 0 ) {
-    const long half_sum_end = ( N / 2 ) - 1;
+  if (N % 2 == 0) {
+    const long half_sum_end = (N / 2) - 1;
     const long full_sum_end = N - 1;
-    result[0] = half_sum_end * ( half_sum_end + 1 ) / 2; // Even sum.
-    result[1] = ( full_sum_end * ( full_sum_end + 1 ) / 2 ) - result[0]; // Odd sum.
-  }
-  else {
-    const long half_sum_end = (T) ( N / 2 );
+    result[0] = half_sum_end * (half_sum_end + 1) / 2;  // Even sum.
+    result[1] =
+        (full_sum_end * (full_sum_end + 1) / 2) - result[0];  // Odd sum.
+  } else {
+    const long half_sum_end = (T)(N / 2);
     const long full_sum_end = N - 2;
-    result[0] = half_sum_end * ( half_sum_end - 1 ) / 2; // Even sum.
-    result[1] = ( full_sum_end * ( full_sum_end - 1 ) / 2 ) - result[0]; // Odd sum.
+    result[0] = half_sum_end * (half_sum_end - 1) / 2;  // Even sum.
+    result[1] =
+        (full_sum_end * (full_sum_end - 1) / 2) - result[0];  // Odd sum.
   }
 
-  return (T) ( result[0] + result[1] );
+  return (T)(result[0] + result[1]);
 }
 
-template< class T, class DeviceType >
-bool PlusEqualAtomicViewTest( long input_length )
-{
-  T res       = PlusEqualAtomicView< T, DeviceType >( input_length );
-  T resSerial = PlusEqualAtomicViewCheck< T >( input_length );
+template <class T, class DeviceType>
+bool PlusEqualAtomicViewTest(long input_length) {
+  T res       = PlusEqualAtomicView<T, DeviceType>(input_length);
+  T resSerial = PlusEqualAtomicViewCheck<T>(input_length);
 
   bool passed = true;
 
-  if ( resSerial != res ) {
+  if (resSerial != res) {
     passed = false;
 
-    std::cout << "Loop<"
-              << typeid( T ).name()
+    std::cout << "Loop<" << typeid(T).name()
               << ">( test = PlusEqualAtomicViewTest"
-              << " FAILED : "
-              << resSerial << " != " << res
-              << std::endl;
+              << " FAILED : " << resSerial << " != " << res << std::endl;
   }
 
   return passed;
@@ -465,96 +478,94 @@ bool PlusEqualAtomicViewTest( long input_length )
 //-----------atomic view minus-equal-----------------
 //---------------------------------------------------
 
-template<class T, class execution_space >
+template <class T, class execution_space>
 struct MinusEqualAtomicViewFunctor {
-  typedef Kokkos::View< T*, execution_space, Kokkos::MemoryTraits<Kokkos::Atomic> > atomic_view_type;
-  typedef Kokkos::View< T*, execution_space > view_type;
+  typedef Kokkos::View<T*, execution_space,
+                       Kokkos::MemoryTraits<Kokkos::Atomic> >
+      atomic_view_type;
+  typedef Kokkos::View<T*, execution_space> view_type;
 
   view_type input;
   atomic_view_type even_odd_result;
   const long length;
 
   // Wrap the result view in an atomic view, use this for operator.
-  MinusEqualAtomicViewFunctor( const view_type & input_, view_type & even_odd_result_, const long length_ )
-    : input( input_ )
-    , even_odd_result( even_odd_result_ )
-    , length( length_ )
-  {}
+  MinusEqualAtomicViewFunctor(const view_type& input_,
+                              view_type& even_odd_result_, const long length_)
+      : input(input_), even_odd_result(even_odd_result_), length(length_) {}
 
   KOKKOS_INLINE_FUNCTION
-  void operator()( const long i ) const {
-    if ( i < length ) {
-      if ( i % 2 == 0 ) {
-        even_odd_result( 0 ) -= input( i );
-      }
-      else {
-        even_odd_result( 1 ) -= input( i );
+  void operator()(const long i) const {
+    if (i < length) {
+      if (i % 2 == 0) {
+        even_odd_result(0) -= input(i);
+      } else {
+        even_odd_result(1) -= input(i);
       }
     }
   }
 };
 
-template< class T, class execution_space >
-T MinusEqualAtomicView( const long input_length ) {
-  typedef Kokkos::View< T*, execution_space > view_type;
+template <class T, class execution_space>
+T MinusEqualAtomicView(const long input_length) {
+  typedef Kokkos::View<T*, execution_space> view_type;
   typedef typename view_type::HostMirror host_view_type;
 
   const long length = input_length;
 
-  view_type input( "input_view", length );
-  view_type result_view( "result_view", 2 );
+  view_type input("input_view", length);
+  view_type result_view("result_view", 2);
 
-  InitFunctor_Seq< T, execution_space > init_f( input, length );
-  Kokkos::parallel_for( Kokkos::RangePolicy< execution_space >( 0, length ), init_f );
+  InitFunctor_Seq<T, execution_space> init_f(input, length);
+  Kokkos::parallel_for(Kokkos::RangePolicy<execution_space>(0, length), init_f);
 
-  MinusEqualAtomicViewFunctor< T, execution_space > functor( input, result_view, length );
-  Kokkos::parallel_for( Kokkos::RangePolicy< execution_space >( 0, length ), functor );
+  MinusEqualAtomicViewFunctor<T, execution_space> functor(input, result_view,
+                                                          length);
+  Kokkos::parallel_for(Kokkos::RangePolicy<execution_space>(0, length),
+                       functor);
   Kokkos::fence();
 
-  host_view_type h_result_view = Kokkos::create_mirror_view( result_view );
-  Kokkos::deep_copy( h_result_view, result_view );
+  host_view_type h_result_view = Kokkos::create_mirror_view(result_view);
+  Kokkos::deep_copy(h_result_view, result_view);
 
-  return (T) ( h_result_view( 0 ) + h_result_view( 1 ) );
+  return (T)(h_result_view(0) + h_result_view(1));
 }
 
-template< class T >
-T MinusEqualAtomicViewCheck( const long input_length ) {
+template <class T>
+T MinusEqualAtomicViewCheck(const long input_length) {
   const long N = input_length;
   T result[2];
 
-  if ( N % 2 == 0 ) {
-    const long half_sum_end = ( N / 2 ) - 1;
+  if (N % 2 == 0) {
+    const long half_sum_end = (N / 2) - 1;
     const long full_sum_end = N - 1;
-    result[0] = -1 * ( half_sum_end * ( half_sum_end + 1 ) / 2 ); // Even sum.
-    result[1] = -1 * ( ( full_sum_end * ( full_sum_end + 1 ) / 2 ) + result[0] ); // Odd sum.
-  }
-  else {
-    const long half_sum_end = (long) ( N / 2 );
+    result[0] = -1 * (half_sum_end * (half_sum_end + 1) / 2);  // Even sum.
+    result[1] =
+        -1 * ((full_sum_end * (full_sum_end + 1) / 2) + result[0]);  // Odd sum.
+  } else {
+    const long half_sum_end = (long)(N / 2);
     const long full_sum_end = N - 2;
-    result[0] = -1 * ( half_sum_end * ( half_sum_end - 1 ) / 2 ); // Even sum.
-    result[1] = -1 * ( ( full_sum_end * ( full_sum_end - 1 ) / 2 ) + result[0] ); // Odd sum.
+    result[0] = -1 * (half_sum_end * (half_sum_end - 1) / 2);  // Even sum.
+    result[1] =
+        -1 * ((full_sum_end * (full_sum_end - 1) / 2) + result[0]);  // Odd sum.
   }
 
-  return ( result[0] + result[1] );
+  return (result[0] + result[1]);
 }
 
-template< class T, class DeviceType >
-bool MinusEqualAtomicViewTest( long input_length )
-{
-  T res       = MinusEqualAtomicView< T, DeviceType >( input_length );
-  T resSerial = MinusEqualAtomicViewCheck< T >( input_length );
+template <class T, class DeviceType>
+bool MinusEqualAtomicViewTest(long input_length) {
+  T res       = MinusEqualAtomicView<T, DeviceType>(input_length);
+  T resSerial = MinusEqualAtomicViewCheck<T>(input_length);
 
   bool passed = true;
 
-  if ( resSerial != res ) {
+  if (resSerial != res) {
     passed = false;
 
-    std::cout << "Loop<"
-              << typeid( T ).name()
+    std::cout << "Loop<" << typeid(T).name()
               << ">( test = MinusEqualAtomicViewTest"
-              << " FAILED : "
-              << resSerial << " != " << res
-              << std::endl;
+              << " FAILED : " << resSerial << " != " << res << std::endl;
   }
 
   return passed;
@@ -564,90 +575,87 @@ bool MinusEqualAtomicViewTest( long input_length )
 //-----------atomic view times-equal-----------------
 //---------------------------------------------------
 
-template<class T, class execution_space >
+template <class T, class execution_space>
 struct TimesEqualAtomicViewFunctor {
-  typedef Kokkos::View< T*, execution_space, Kokkos::MemoryTraits<Kokkos::Atomic> > atomic_view_type;
-  typedef Kokkos::View< T*, execution_space > view_type;
+  typedef Kokkos::View<T*, execution_space,
+                       Kokkos::MemoryTraits<Kokkos::Atomic> >
+      atomic_view_type;
+  typedef Kokkos::View<T*, execution_space> view_type;
 
   view_type input;
   atomic_view_type result;
   const long length;
 
   // Wrap the result view in an atomic view, use this for operator
-  TimesEqualAtomicViewFunctor( const view_type & input_, view_type & result_, const long length_ )
-    : input( input_ )
-    , result( result_ )
-    , length( length_ )
-  {}
+  TimesEqualAtomicViewFunctor(const view_type& input_, view_type& result_,
+                              const long length_)
+      : input(input_), result(result_), length(length_) {}
 
   KOKKOS_INLINE_FUNCTION
-  void operator()( const long i ) const {
-    if ( i < length && i > 0 ) {
-      result( 0 ) *= (double) input( i );
+  void operator()(const long i) const {
+    if (i < length && i > 0) {
+      result(0) *= (double)input(i);
     }
   }
 };
 
-template< class T, class execution_space >
-T TimesEqualAtomicView( const long input_length, const long remainder ) {
-  typedef Kokkos::View< T*, execution_space > view_type;
+template <class T, class execution_space>
+T TimesEqualAtomicView(const long input_length, const long remainder) {
+  typedef Kokkos::View<T*, execution_space> view_type;
   typedef typename view_type::HostMirror host_view_type;
 
   const long length = input_length;
 
-  view_type input( "input_view", length );
-  view_type result_view( "result_view", 1 );
-  deep_copy( result_view, 1.0 );
+  view_type input("input_view", length);
+  view_type result_view("result_view", 1);
+  deep_copy(result_view, 1.0);
 
-  InitFunctor_ModTimes< T, execution_space > init_f( input, length, remainder );
-  Kokkos::parallel_for( Kokkos::RangePolicy< execution_space >( 0, length ), init_f );
+  InitFunctor_ModTimes<T, execution_space> init_f(input, length, remainder);
+  Kokkos::parallel_for(Kokkos::RangePolicy<execution_space>(0, length), init_f);
 
-  TimesEqualAtomicViewFunctor< T, execution_space > functor( input, result_view, length );
-  Kokkos::parallel_for( Kokkos::RangePolicy< execution_space >( 0, length ), functor );
+  TimesEqualAtomicViewFunctor<T, execution_space> functor(input, result_view,
+                                                          length);
+  Kokkos::parallel_for(Kokkos::RangePolicy<execution_space>(0, length),
+                       functor);
   Kokkos::fence();
 
-  host_view_type h_result_view = Kokkos::create_mirror_view( result_view );
-  Kokkos::deep_copy( h_result_view, result_view );
+  host_view_type h_result_view = Kokkos::create_mirror_view(result_view);
+  Kokkos::deep_copy(h_result_view, result_view);
 
-  return (T) ( h_result_view( 0 ) );
+  return (T)(h_result_view(0));
 }
 
-template< class T >
-T TimesEqualAtomicViewCheck( const long input_length, const long remainder ) {
+template <class T>
+T TimesEqualAtomicViewCheck(const long input_length, const long remainder) {
   // Analytical result.
   const long N = input_length;
-  T result = 1.0;
+  T result     = 1.0;
 
-  for ( long i = 2; i < N; ++i ) {
-    if ( i % ( remainder + 1 ) == remainder ) {
+  for (long i = 2; i < N; ++i) {
+    if (i % (remainder + 1) == remainder) {
       result *= 2.0;
-    }
-    else {
+    } else {
       result *= 1.0;
     }
   }
 
-  return (T) result;
+  return (T)result;
 }
 
-template< class T, class DeviceType>
-bool TimesEqualAtomicViewTest( const long input_length )
-{
+template <class T, class DeviceType>
+bool TimesEqualAtomicViewTest(const long input_length) {
   const long remainder = 23;
-  T res       = TimesEqualAtomicView< T, DeviceType >( input_length, remainder );
-  T resSerial = TimesEqualAtomicViewCheck< T >( input_length, remainder );
+  T res       = TimesEqualAtomicView<T, DeviceType>(input_length, remainder);
+  T resSerial = TimesEqualAtomicViewCheck<T>(input_length, remainder);
 
   bool passed = true;
 
-  if ( resSerial != res ) {
+  if (resSerial != res) {
     passed = false;
 
-    std::cout << "Loop<"
-              << typeid( T ).name()
+    std::cout << "Loop<" << typeid(T).name()
               << ">( test = TimesEqualAtomicViewTest"
-              << " FAILED : "
-              << resSerial << " != " << res
-              << std::endl;
+              << " FAILED : " << resSerial << " != " << res << std::endl;
   }
 
   return passed;
@@ -657,91 +665,88 @@ bool TimesEqualAtomicViewTest( const long input_length )
 //------------atomic view div-equal------------------
 //---------------------------------------------------
 
-template<class T, class execution_space >
+template <class T, class execution_space>
 struct DivEqualAtomicViewFunctor {
-  typedef Kokkos::View< T, execution_space, Kokkos::MemoryTraits<Kokkos::Atomic> > atomic_view_type;
-  typedef Kokkos::View< T*, execution_space > view_type;
-  typedef Kokkos::View< T, execution_space > scalar_view_type;
+  typedef Kokkos::View<T, execution_space,
+                       Kokkos::MemoryTraits<Kokkos::Atomic> >
+      atomic_view_type;
+  typedef Kokkos::View<T*, execution_space> view_type;
+  typedef Kokkos::View<T, execution_space> scalar_view_type;
 
   view_type input;
   atomic_view_type result;
   const long length;
 
   // Wrap the result view in an atomic view, use this for operator.
-  DivEqualAtomicViewFunctor( const view_type & input_, scalar_view_type & result_, const long length_ )
-    : input( input_ )
-    , result( result_ )
-    , length( length_ )
-  {}
+  DivEqualAtomicViewFunctor(const view_type& input_, scalar_view_type& result_,
+                            const long length_)
+      : input(input_), result(result_), length(length_) {}
 
   KOKKOS_INLINE_FUNCTION
-  void operator()( const long i ) const {
-    if ( i < length && i > 0 ) {
-      result() /= (double) ( input( i ) );
+  void operator()(const long i) const {
+    if (i < length && i > 0) {
+      result() /= (double)(input(i));
     }
   }
 };
 
-template< class T, class execution_space >
-T DivEqualAtomicView( const long input_length, const long remainder ) {
-  typedef Kokkos::View< T*, execution_space > view_type;
-  typedef Kokkos::View< T, execution_space > scalar_view_type;
+template <class T, class execution_space>
+T DivEqualAtomicView(const long input_length, const long remainder) {
+  typedef Kokkos::View<T*, execution_space> view_type;
+  typedef Kokkos::View<T, execution_space> scalar_view_type;
   typedef typename scalar_view_type::HostMirror host_scalar_view_type;
 
   const long length = input_length;
 
-  view_type input( "input_view", length );
-  scalar_view_type result_view( "result_view" );
-  Kokkos::deep_copy( result_view, 12121212121 );
+  view_type input("input_view", length);
+  scalar_view_type result_view("result_view");
+  Kokkos::deep_copy(result_view, 12121212121);
 
-  InitFunctor_ModTimes< T, execution_space > init_f( input, length, remainder );
-  Kokkos::parallel_for( Kokkos::RangePolicy< execution_space >( 0, length ), init_f );
+  InitFunctor_ModTimes<T, execution_space> init_f(input, length, remainder);
+  Kokkos::parallel_for(Kokkos::RangePolicy<execution_space>(0, length), init_f);
 
-  DivEqualAtomicViewFunctor< T, execution_space > functor( input, result_view, length );
-  Kokkos::parallel_for( Kokkos::RangePolicy< execution_space >( 0, length ), functor );
+  DivEqualAtomicViewFunctor<T, execution_space> functor(input, result_view,
+                                                        length);
+  Kokkos::parallel_for(Kokkos::RangePolicy<execution_space>(0, length),
+                       functor);
   Kokkos::fence();
 
-  host_scalar_view_type h_result_view = Kokkos::create_mirror_view( result_view );
-  Kokkos::deep_copy( h_result_view, result_view );
+  host_scalar_view_type h_result_view = Kokkos::create_mirror_view(result_view);
+  Kokkos::deep_copy(h_result_view, result_view);
 
-  return (T) ( h_result_view() );
+  return (T)(h_result_view());
 }
 
-template< class T >
-T DivEqualAtomicViewCheck( const long input_length, const long remainder ) {
+template <class T>
+T DivEqualAtomicViewCheck(const long input_length, const long remainder) {
   const long N = input_length;
-  T result = 12121212121.0;
-  for ( long i = 2; i < N; ++i ) {
-    if ( i % ( remainder + 1 ) == remainder ) {
+  T result     = 12121212121.0;
+  for (long i = 2; i < N; ++i) {
+    if (i % (remainder + 1) == remainder) {
       result /= 1.0;
-    }
-    else {
+    } else {
       result /= 2.0;
     }
   }
 
-  return (T) result;
+  return (T)result;
 }
 
-template< class T, class DeviceType >
-bool DivEqualAtomicViewTest( const long input_length )
-{
+template <class T, class DeviceType>
+bool DivEqualAtomicViewTest(const long input_length) {
   const long remainder = 23;
 
-  T res       = DivEqualAtomicView< T, DeviceType >( input_length, remainder );
-  T resSerial = DivEqualAtomicViewCheck< T >( input_length, remainder );
+  T res       = DivEqualAtomicView<T, DeviceType>(input_length, remainder);
+  T resSerial = DivEqualAtomicViewCheck<T>(input_length, remainder);
 
   bool passed = true;
 
-  if ( resSerial != res ) {
+  if (resSerial != res) {
     passed = false;
 
-    std::cout << "Loop<"
-              << typeid( T ).name()
+    std::cout << "Loop<" << typeid(T).name()
               << ">( test = DivEqualAtomicViewTest"
-              << " FAILED : "
-              << resSerial << " != " << res
-              << std::endl;
+              << " FAILED : " << resSerial << " != " << res << std::endl;
   }
 
   return passed;
@@ -751,93 +756,92 @@ bool DivEqualAtomicViewTest( const long input_length )
 //------------atomic view mod-equal------------------
 //---------------------------------------------------
 
-template< class T, class execution_space >
+template <class T, class execution_space>
 struct ModEqualAtomicViewFunctor {
-  typedef Kokkos::View< T, execution_space, Kokkos::MemoryTraits<Kokkos::Atomic> > atomic_view_type;
-  typedef Kokkos::View< T*, execution_space > view_type;
-  typedef Kokkos::View< T, execution_space > scalar_view_type;
+  typedef Kokkos::View<T, execution_space,
+                       Kokkos::MemoryTraits<Kokkos::Atomic> >
+      atomic_view_type;
+  typedef Kokkos::View<T*, execution_space> view_type;
+  typedef Kokkos::View<T, execution_space> scalar_view_type;
 
   view_type input;
   atomic_view_type result;
   const long length;
 
   // Wrap the result view in an atomic view, use this for operator.
-  ModEqualAtomicViewFunctor( const view_type & input_, scalar_view_type & result_, const long length_ )
-    : input( input_ )
-    , result( result_ )
-    , length( length_ )
-  {}
+  ModEqualAtomicViewFunctor(const view_type& input_, scalar_view_type& result_,
+                            const long length_)
+      : input(input_), result(result_), length(length_) {}
 
   KOKKOS_INLINE_FUNCTION
-  void operator()( const long i ) const {
-    if ( i < length && i > 0 ) {
-      result() %= (double) ( input( i ) );
+  void operator()(const long i) const {
+    if (i < length && i > 0) {
+      result() %= (double)(input(i));
     }
   }
 };
 
-template< class T, class execution_space >
-T ModEqualAtomicView( const long input_length, const long remainder ) {
-  typedef Kokkos::View< T*, execution_space > view_type;
-  typedef Kokkos::View< T, execution_space > scalar_view_type;
+template <class T, class execution_space>
+T ModEqualAtomicView(const long input_length, const long remainder) {
+  typedef Kokkos::View<T*, execution_space> view_type;
+  typedef Kokkos::View<T, execution_space> scalar_view_type;
   typedef typename scalar_view_type::HostMirror host_scalar_view_type;
 
   const long length = input_length;
 
-  view_type input( "input_view", length );
-  scalar_view_type result_view( "result_view" );
-  Kokkos::deep_copy( result_view, 12121212121 );
+  view_type input("input_view", length);
+  scalar_view_type result_view("result_view");
+  Kokkos::deep_copy(result_view, 12121212121);
 
-  InitFunctor_ModTimes< T, execution_space > init_f( input, length, remainder );
-  Kokkos::parallel_for( Kokkos::RangePolicy< execution_space >( 0, length ), init_f );
+  InitFunctor_ModTimes<T, execution_space> init_f(input, length, remainder);
+  Kokkos::parallel_for(Kokkos::RangePolicy<execution_space>(0, length), init_f);
 
-  ModEqualAtomicViewFunctor< T, execution_space > functor( input, result_view, length );
-  Kokkos::parallel_for( Kokkos::RangePolicy< execution_space >( 0, length ), functor );
+  ModEqualAtomicViewFunctor<T, execution_space> functor(input, result_view,
+                                                        length);
+  Kokkos::parallel_for(Kokkos::RangePolicy<execution_space>(0, length),
+                       functor);
   Kokkos::fence();
 
-  host_scalar_view_type h_result_view = Kokkos::create_mirror_view( result_view );
-  Kokkos::deep_copy( h_result_view, result_view );
+  host_scalar_view_type h_result_view = Kokkos::create_mirror_view(result_view);
+  Kokkos::deep_copy(h_result_view, result_view);
 
-  return (T) ( h_result_view() );
+  return (T)(h_result_view());
 }
 
-template< class T >
-T ModEqualAtomicViewCheck( const long input_length, const long remainder ) {
+template <class T>
+T ModEqualAtomicViewCheck(const long input_length, const long remainder) {
   const long N = input_length;
-  T result = 12121212121;
-  for ( long i = 2; i < N; ++i ) {
-    if ( i % ( remainder + 1 ) == remainder ) {
+  T result     = 12121212121;
+  for (long i = 2; i < N; ++i) {
+    if (i % (remainder + 1) == remainder) {
       result %= 1;
-    }
-    else {
+    } else {
       result %= 2;
     }
   }
 
-  return (T) result;
+  return (T)result;
 }
 
-template< class T, class DeviceType >
-bool ModEqualAtomicViewTest( const long input_length )
-{
-  static_assert( std::is_integral< T >::value, "ModEqualAtomicView Error: Type must be integral type for this unit test" );
+template <class T, class DeviceType>
+bool ModEqualAtomicViewTest(const long input_length) {
+  static_assert(std::is_integral<T>::value,
+                "ModEqualAtomicView Error: Type must be integral type for this "
+                "unit test");
 
   const long remainder = 23;
 
-  T res       = ModEqualAtomicView< T, DeviceType >( input_length, remainder );
-  T resSerial = ModEqualAtomicViewCheck< T >( input_length, remainder );
+  T res       = ModEqualAtomicView<T, DeviceType>(input_length, remainder);
+  T resSerial = ModEqualAtomicViewCheck<T>(input_length, remainder);
 
   bool passed = true;
 
-  if ( resSerial != res ) {
+  if (resSerial != res) {
     passed = false;
 
-    std::cout << "Loop<"
-              << typeid( T ).name()
+    std::cout << "Loop<" << typeid(T).name()
               << ">( test = ModEqualAtomicViewTest"
-              << " FAILED : "
-              << resSerial << " != " << res
-              << std::endl;
+              << " FAILED : " << resSerial << " != " << res << std::endl;
   }
 
   return passed;
@@ -847,11 +851,13 @@ bool ModEqualAtomicViewTest( const long input_length )
 //------------atomic view rs-equal------------------
 //---------------------------------------------------
 
-template< class T, class execution_space >
+template <class T, class execution_space>
 struct RSEqualAtomicViewFunctor {
-  typedef Kokkos::View< T****, execution_space, Kokkos::MemoryTraits<Kokkos::Atomic> > atomic_view_type;
-  typedef Kokkos::View< T*, execution_space > view_type;
-  typedef Kokkos::View< T****, execution_space > result_view_type;
+  typedef Kokkos::View<T****, execution_space,
+                       Kokkos::MemoryTraits<Kokkos::Atomic> >
+      atomic_view_type;
+  typedef Kokkos::View<T*, execution_space> view_type;
+  typedef Kokkos::View<T****, execution_space> result_view_type;
 
   const view_type input;
   atomic_view_type result;
@@ -859,120 +865,111 @@ struct RSEqualAtomicViewFunctor {
   const long value;
 
   // Wrap the result view in an atomic view, use this for operator.
-  RSEqualAtomicViewFunctor( const view_type & input_, result_view_type & result_, const long & length_, const long & value_ )
-    : input( input_ )
-    , result( result_ )
-    , length( length_ )
-    , value( value_ )
-  {}
+  RSEqualAtomicViewFunctor(const view_type& input_, result_view_type& result_,
+                           const long& length_, const long& value_)
+      : input(input_), result(result_), length(length_), value(value_) {}
 
   KOKKOS_INLINE_FUNCTION
-  void operator()( const long i ) const {
-    if ( i < length ) {
-      if ( i % 4 == 0 ) {
-        result( 1, 0, 0, 0 ) >>= input( i );
-      }
-      else if ( i % 4 == 1 ) {
-        result( 0, 1, 0, 0 ) >>= input( i );
-      }
-      else if ( i % 4 == 2 ) {
-        result( 0, 0, 1, 0 ) >>= input( i );
-      }
-      else if ( i % 4 == 3 ) {
-        result( 0, 0, 0, 1 ) >>= input( i );
+  void operator()(const long i) const {
+    if (i < length) {
+      if (i % 4 == 0) {
+        result(1, 0, 0, 0) >>= input(i);
+      } else if (i % 4 == 1) {
+        result(0, 1, 0, 0) >>= input(i);
+      } else if (i % 4 == 2) {
+        result(0, 0, 1, 0) >>= input(i);
+      } else if (i % 4 == 3) {
+        result(0, 0, 0, 1) >>= input(i);
       }
     }
   }
 };
 
-template< class T, class execution_space >
-T RSEqualAtomicView( const long input_length, const long value, const long remainder ) {
-  typedef Kokkos::View< T*, execution_space > view_type;
-  typedef Kokkos::View< T****, execution_space > result_view_type;
+template <class T, class execution_space>
+T RSEqualAtomicView(const long input_length, const long value,
+                    const long remainder) {
+  typedef Kokkos::View<T*, execution_space> view_type;
+  typedef Kokkos::View<T****, execution_space> result_view_type;
   typedef typename result_view_type::HostMirror host_scalar_view_type;
 
   const long length = input_length;
 
-  view_type input( "input_view", length );
-  result_view_type result_view( "result_view", 2, 2, 2, 2 );
-  host_scalar_view_type h_result_view = Kokkos::create_mirror_view( result_view );
-  h_result_view( 1, 0, 0, 0 ) = value;
-  h_result_view( 0, 1, 0, 0 ) = value;
-  h_result_view( 0, 0, 1, 0 ) = value;
-  h_result_view( 0, 0, 0, 1 ) = value;
-  Kokkos::deep_copy( result_view, h_result_view );
+  view_type input("input_view", length);
+  result_view_type result_view("result_view", 2, 2, 2, 2);
+  host_scalar_view_type h_result_view = Kokkos::create_mirror_view(result_view);
+  h_result_view(1, 0, 0, 0)           = value;
+  h_result_view(0, 1, 0, 0)           = value;
+  h_result_view(0, 0, 1, 0)           = value;
+  h_result_view(0, 0, 0, 1)           = value;
+  Kokkos::deep_copy(result_view, h_result_view);
 
-  InitFunctor_ModShift< T, execution_space > init_f( input, length, remainder );
-  Kokkos::parallel_for( Kokkos::RangePolicy< execution_space >( 0, length ), init_f );
+  InitFunctor_ModShift<T, execution_space> init_f(input, length, remainder);
+  Kokkos::parallel_for(Kokkos::RangePolicy<execution_space>(0, length), init_f);
 
-  RSEqualAtomicViewFunctor< T, execution_space > functor( input, result_view, length, value );
-  Kokkos::parallel_for( Kokkos::RangePolicy< execution_space >( 0, length ), functor );
+  RSEqualAtomicViewFunctor<T, execution_space> functor(input, result_view,
+                                                       length, value);
+  Kokkos::parallel_for(Kokkos::RangePolicy<execution_space>(0, length),
+                       functor);
   Kokkos::fence();
 
-  Kokkos::deep_copy( h_result_view, result_view );
+  Kokkos::deep_copy(h_result_view, result_view);
 
-  return (T) ( h_result_view( 1, 0, 0, 0 ) );
+  return (T)(h_result_view(1, 0, 0, 0));
 }
 
-template< class T >
-T RSEqualAtomicViewCheck( const long input_length, const long value, const long remainder ) {
+template <class T>
+T RSEqualAtomicViewCheck(const long input_length, const long value,
+                         const long remainder) {
   T result[4];
   result[0] = value;
   result[1] = value;
   result[2] = value;
   result[3] = value;
 
-  T * input = new T[input_length];
-  for ( long i = 0; i < input_length; ++i ) {
-    if ( i % ( remainder + 1 ) == remainder ) {
+  T* input = new T[input_length];
+  for (long i = 0; i < input_length; ++i) {
+    if (i % (remainder + 1) == remainder) {
       input[i] = 1;
-    }
-    else {
+    } else {
       input[i] = 0;
     }
   }
 
-  for ( long i = 0; i < input_length; ++i ) {
-    if ( i % 4 == 0 ) {
+  for (long i = 0; i < input_length; ++i) {
+    if (i % 4 == 0) {
       result[0] >>= input[i];
-    }
-    else if ( i % 4 == 1 ) {
+    } else if (i % 4 == 1) {
       result[1] >>= input[i];
-    }
-    else if ( i % 4 == 2 ) {
+    } else if (i % 4 == 2) {
       result[2] >>= input[i];
-    }
-    else if ( i % 4 == 3 ) {
+    } else if (i % 4 == 3) {
       result[3] >>= input[i];
     }
   }
 
-  delete [] input;
+  delete[] input;
 
-  return (T) result[0];
+  return (T)result[0];
 }
 
-template< class T, class DeviceType >
-bool RSEqualAtomicViewTest( const long input_length )
-{
-  static_assert( std::is_integral< T >::value, "RSEqualAtomicViewTest: Must be integral type for test" );
+template <class T, class DeviceType>
+bool RSEqualAtomicViewTest(const long input_length) {
+  static_assert(std::is_integral<T>::value,
+                "RSEqualAtomicViewTest: Must be integral type for test");
 
-  const long remainder = 61042; //prime - 1
-  const long value = 1073741825; //  2^30+1
-  T res       = RSEqualAtomicView< T, DeviceType >( input_length, value, remainder );
-  T resSerial = RSEqualAtomicViewCheck< T >( input_length, value, remainder );
+  const long remainder = 61042;       // prime - 1
+  const long value     = 1073741825;  //  2^30+1
+  T res = RSEqualAtomicView<T, DeviceType>(input_length, value, remainder);
+  T resSerial = RSEqualAtomicViewCheck<T>(input_length, value, remainder);
 
   bool passed = true;
 
-  if ( resSerial != res ) {
+  if (resSerial != res) {
     passed = false;
 
-    std::cout << "Loop<"
-              << typeid( T ).name()
+    std::cout << "Loop<" << typeid(T).name()
               << ">( test = RSEqualAtomicViewTest"
-              << " FAILED : "
-              << resSerial << " != " << res
-              << std::endl;
+              << " FAILED : " << resSerial << " != " << res << std::endl;
   }
 
   return passed;
@@ -982,11 +979,13 @@ bool RSEqualAtomicViewTest( const long input_length )
 //------------atomic view ls-equal------------------
 //---------------------------------------------------
 
-template<class T, class execution_space >
+template <class T, class execution_space>
 struct LSEqualAtomicViewFunctor {
-  typedef Kokkos::View< T****, execution_space, Kokkos::MemoryTraits<Kokkos::Atomic> > atomic_view_type;
-  typedef Kokkos::View< T*, execution_space > view_type;
-  typedef Kokkos::View< T****, execution_space > result_view_type;
+  typedef Kokkos::View<T****, execution_space,
+                       Kokkos::MemoryTraits<Kokkos::Atomic> >
+      atomic_view_type;
+  typedef Kokkos::View<T*, execution_space> view_type;
+  typedef Kokkos::View<T****, execution_space> result_view_type;
 
   view_type input;
   atomic_view_type result;
@@ -994,120 +993,111 @@ struct LSEqualAtomicViewFunctor {
   const long value;
 
   // Wrap the result view in an atomic view, use this for operator.
-  LSEqualAtomicViewFunctor( const view_type & input_, result_view_type & result_, const long & length_, const long & value_ )
-    : input( input_ )
-    , result( result_ )
-    , length( length_ )
-    , value( value_ )
-  {}
+  LSEqualAtomicViewFunctor(const view_type& input_, result_view_type& result_,
+                           const long& length_, const long& value_)
+      : input(input_), result(result_), length(length_), value(value_) {}
 
   KOKKOS_INLINE_FUNCTION
-  void operator()( const long i ) const {
-    if ( i < length ) {
-      if ( i % 4 == 0 ) {
-        result( 1, 0, 0, 0 ) <<= input( i );
-      }
-      else if ( i % 4 == 1 ) {
-        result( 0, 1, 0, 0 ) <<= input( i );
-      }
-      else if ( i % 4 == 2 ) {
-        result( 0, 0, 1, 0 ) <<= input( i );
-      }
-      else if ( i % 4 == 3 ) {
-        result( 0, 0, 0, 1 ) <<= input( i );
+  void operator()(const long i) const {
+    if (i < length) {
+      if (i % 4 == 0) {
+        result(1, 0, 0, 0) <<= input(i);
+      } else if (i % 4 == 1) {
+        result(0, 1, 0, 0) <<= input(i);
+      } else if (i % 4 == 2) {
+        result(0, 0, 1, 0) <<= input(i);
+      } else if (i % 4 == 3) {
+        result(0, 0, 0, 1) <<= input(i);
       }
     }
   }
 };
 
-template< class T, class execution_space >
-T LSEqualAtomicView( const long input_length, const long value, const long remainder ) {
-  typedef Kokkos::View< T*, execution_space > view_type;
-  typedef Kokkos::View< T****, execution_space > result_view_type;
+template <class T, class execution_space>
+T LSEqualAtomicView(const long input_length, const long value,
+                    const long remainder) {
+  typedef Kokkos::View<T*, execution_space> view_type;
+  typedef Kokkos::View<T****, execution_space> result_view_type;
   typedef typename result_view_type::HostMirror host_scalar_view_type;
 
   const long length = input_length;
 
-  view_type input( "input_view", length );
-  result_view_type result_view( "result_view", 2, 2, 2, 2 );
-  host_scalar_view_type h_result_view = Kokkos::create_mirror_view( result_view );
-    h_result_view( 1, 0, 0, 0 ) = value;
-    h_result_view( 0, 1, 0, 0 ) = value;
-    h_result_view( 0, 0, 1, 0 ) = value;
-    h_result_view( 0, 0, 0, 1 ) = value;
-  Kokkos::deep_copy( result_view, h_result_view );
+  view_type input("input_view", length);
+  result_view_type result_view("result_view", 2, 2, 2, 2);
+  host_scalar_view_type h_result_view = Kokkos::create_mirror_view(result_view);
+  h_result_view(1, 0, 0, 0)           = value;
+  h_result_view(0, 1, 0, 0)           = value;
+  h_result_view(0, 0, 1, 0)           = value;
+  h_result_view(0, 0, 0, 1)           = value;
+  Kokkos::deep_copy(result_view, h_result_view);
 
-  InitFunctor_ModShift< T, execution_space > init_f( input, length, remainder );
-  Kokkos::parallel_for( Kokkos::RangePolicy< execution_space >( 0, length ), init_f );
+  InitFunctor_ModShift<T, execution_space> init_f(input, length, remainder);
+  Kokkos::parallel_for(Kokkos::RangePolicy<execution_space>(0, length), init_f);
 
-  LSEqualAtomicViewFunctor< T, execution_space > functor( input, result_view, length, value );
-  Kokkos::parallel_for( Kokkos::RangePolicy< execution_space >( 0, length ), functor );
+  LSEqualAtomicViewFunctor<T, execution_space> functor(input, result_view,
+                                                       length, value);
+  Kokkos::parallel_for(Kokkos::RangePolicy<execution_space>(0, length),
+                       functor);
   Kokkos::fence();
 
-  Kokkos::deep_copy( h_result_view, result_view );
+  Kokkos::deep_copy(h_result_view, result_view);
 
-  return (T) ( h_result_view( 1, 0, 0, 0 ) );
+  return (T)(h_result_view(1, 0, 0, 0));
 }
 
-template< class T >
-T LSEqualAtomicViewCheck( const long input_length, const long value, const long remainder ) {
+template <class T>
+T LSEqualAtomicViewCheck(const long input_length, const long value,
+                         const long remainder) {
   T result[4];
   result[0] = value;
   result[1] = value;
   result[2] = value;
   result[3] = value;
 
-  T * input = new T[input_length];
-  for ( long i = 0; i < input_length; ++i ) {
-    if ( i % ( remainder + 1 ) == remainder ) {
+  T* input = new T[input_length];
+  for (long i = 0; i < input_length; ++i) {
+    if (i % (remainder + 1) == remainder) {
       input[i] = 1;
-    }
-    else {
+    } else {
       input[i] = 0;
     }
   }
 
-  for ( long i = 0; i < input_length; ++i ) {
-    if ( i % 4 == 0 ) {
+  for (long i = 0; i < input_length; ++i) {
+    if (i % 4 == 0) {
       result[0] <<= input[i];
-    }
-    else if ( i % 4 == 1 ) {
+    } else if (i % 4 == 1) {
       result[1] <<= input[i];
-    }
-    else if ( i % 4 == 2 ) {
+    } else if (i % 4 == 2) {
       result[2] <<= input[i];
-    }
-    else if ( i % 4 == 3 ) {
+    } else if (i % 4 == 3) {
       result[3] <<= input[i];
     }
   }
 
-  delete [] input;
+  delete[] input;
 
-  return (T) result[0];
+  return (T)result[0];
 }
 
-template< class T, class DeviceType >
-bool LSEqualAtomicViewTest( const long input_length )
-{
-  static_assert( std::is_integral< T >::value, "LSEqualAtomicViewTest: Must be integral type for test" );
+template <class T, class DeviceType>
+bool LSEqualAtomicViewTest(const long input_length) {
+  static_assert(std::is_integral<T>::value,
+                "LSEqualAtomicViewTest: Must be integral type for test");
 
-  const long remainder = 61042; //prime - 1
-  const long value = 1; //  2^30+1
-  T res       = LSEqualAtomicView< T, DeviceType >( input_length, value, remainder );
-  T resSerial = LSEqualAtomicViewCheck< T >( input_length, value, remainder );
+  const long remainder = 61042;  // prime - 1
+  const long value     = 1;      //  2^30+1
+  T res = LSEqualAtomicView<T, DeviceType>(input_length, value, remainder);
+  T resSerial = LSEqualAtomicViewCheck<T>(input_length, value, remainder);
 
   bool passed = true;
 
-  if ( resSerial != res ) {
+  if (resSerial != res) {
     passed = false;
 
-    std::cout << "Loop<"
-              << typeid( T ).name()
+    std::cout << "Loop<" << typeid(T).name()
               << ">( test = RSEqualAtomicViewTest"
-              << " FAILED : "
-              << resSerial << " != " << res
-              << std::endl;
+              << " FAILED : " << resSerial << " != " << res << std::endl;
   }
 
   return passed;
@@ -1117,94 +1107,91 @@ bool LSEqualAtomicViewTest( const long input_length )
 //-----------atomic view and-equal-----------------
 //---------------------------------------------------
 
-template< class T, class execution_space >
+template <class T, class execution_space>
 struct AndEqualAtomicViewFunctor {
-  typedef Kokkos::View< T*, execution_space, Kokkos::MemoryTraits<Kokkos::Atomic> > atomic_view_type;
-  typedef Kokkos::View< T*, execution_space > view_type;
+  typedef Kokkos::View<T*, execution_space,
+                       Kokkos::MemoryTraits<Kokkos::Atomic> >
+      atomic_view_type;
+  typedef Kokkos::View<T*, execution_space> view_type;
 
   view_type input;
   atomic_view_type even_odd_result;
   const long length;
 
   // Wrap the result view in an atomic view, use this for operator.
-  AndEqualAtomicViewFunctor( const view_type & input_, view_type & even_odd_result_, const long length_ )
-    : input( input_ )
-    , even_odd_result( even_odd_result_ )
-    , length( length_ )
-  {}
+  AndEqualAtomicViewFunctor(const view_type& input_,
+                            view_type& even_odd_result_, const long length_)
+      : input(input_), even_odd_result(even_odd_result_), length(length_) {}
 
   KOKKOS_INLINE_FUNCTION
-  void operator()( const long i ) const {
-    if ( i < length ) {
-      if ( i % 2 == 0 ) {
-        even_odd_result( 0 ) &= input( i );
-      }
-      else {
-        even_odd_result( 1 ) &= input( i );
+  void operator()(const long i) const {
+    if (i < length) {
+      if (i % 2 == 0) {
+        even_odd_result(0) &= input(i);
+      } else {
+        even_odd_result(1) &= input(i);
       }
     }
   }
 };
 
-template< class T, class execution_space >
-T AndEqualAtomicView( const long input_length ) {
-  typedef Kokkos::View< T*, execution_space > view_type;
+template <class T, class execution_space>
+T AndEqualAtomicView(const long input_length) {
+  typedef Kokkos::View<T*, execution_space> view_type;
   typedef typename view_type::HostMirror host_view_type;
 
   const long length = input_length;
 
-  view_type input( "input_view", length );
-  view_type result_view( "result_view", 2 );
-  Kokkos::deep_copy( result_view, 1 );
+  view_type input("input_view", length);
+  view_type result_view("result_view", 2);
+  Kokkos::deep_copy(result_view, 1);
 
-  InitFunctor_Seq< T, execution_space > init_f( input, length );
-  Kokkos::parallel_for( Kokkos::RangePolicy< execution_space >( 0, length ), init_f );
+  InitFunctor_Seq<T, execution_space> init_f(input, length);
+  Kokkos::parallel_for(Kokkos::RangePolicy<execution_space>(0, length), init_f);
 
-  AndEqualAtomicViewFunctor< T, execution_space > functor( input, result_view, length );
-  Kokkos::parallel_for( Kokkos::RangePolicy< execution_space >( 0, length ), functor );
+  AndEqualAtomicViewFunctor<T, execution_space> functor(input, result_view,
+                                                        length);
+  Kokkos::parallel_for(Kokkos::RangePolicy<execution_space>(0, length),
+                       functor);
   Kokkos::fence();
 
-  host_view_type h_result_view = Kokkos::create_mirror_view( result_view );
-  Kokkos::deep_copy( h_result_view, result_view );
+  host_view_type h_result_view = Kokkos::create_mirror_view(result_view);
+  Kokkos::deep_copy(h_result_view, result_view);
 
-  return (T) ( h_result_view( 0 ) );
+  return (T)(h_result_view(0));
 }
 
-template< class T >
-T AndEqualAtomicViewCheck( const long input_length ) {
+template <class T>
+T AndEqualAtomicViewCheck(const long input_length) {
   const long N = input_length;
-  T result[2] = { 1 };
-  for ( long i = 0; i < N; ++i ) {
-    if ( N % 2 == 0 ) {
-      result[0] &= (T) i;
-    }
-    else {
-      result[1] &= (T) i;
+  T result[2]  = {1};
+  for (long i = 0; i < N; ++i) {
+    if (N % 2 == 0) {
+      result[0] &= (T)i;
+    } else {
+      result[1] &= (T)i;
     }
   }
 
-  return ( result[0] );
+  return (result[0]);
 }
 
-template< class T, class DeviceType >
-bool AndEqualAtomicViewTest( long input_length )
-{
-  static_assert( std::is_integral< T >::value, "AndEqualAtomicViewTest: Must be integral type for test" );
+template <class T, class DeviceType>
+bool AndEqualAtomicViewTest(long input_length) {
+  static_assert(std::is_integral<T>::value,
+                "AndEqualAtomicViewTest: Must be integral type for test");
 
-  T res       = AndEqualAtomicView< T, DeviceType >( input_length );
-  T resSerial = AndEqualAtomicViewCheck< T >( input_length );
+  T res       = AndEqualAtomicView<T, DeviceType>(input_length);
+  T resSerial = AndEqualAtomicViewCheck<T>(input_length);
 
   bool passed = true;
 
-  if ( resSerial != res ) {
+  if (resSerial != res) {
     passed = false;
 
-    std::cout << "Loop<"
-              << typeid( T ).name()
+    std::cout << "Loop<" << typeid(T).name()
               << ">( test = AndEqualAtomicViewTest"
-              << " FAILED : "
-              << resSerial << " != " << res
-              << std::endl;
+              << " FAILED : " << resSerial << " != " << res << std::endl;
   }
 
   return passed;
@@ -1214,94 +1201,90 @@ bool AndEqualAtomicViewTest( long input_length )
 //-----------atomic view or-equal-----------------
 //---------------------------------------------------
 
-template< class T, class execution_space >
+template <class T, class execution_space>
 struct OrEqualAtomicViewFunctor {
-  typedef Kokkos::View< T*, execution_space, Kokkos::MemoryTraits<Kokkos::Atomic> > atomic_view_type;
-  typedef Kokkos::View< T*, execution_space > view_type;
+  typedef Kokkos::View<T*, execution_space,
+                       Kokkos::MemoryTraits<Kokkos::Atomic> >
+      atomic_view_type;
+  typedef Kokkos::View<T*, execution_space> view_type;
 
   view_type input;
   atomic_view_type even_odd_result;
   const long length;
 
   // Wrap the result view in an atomic view, use this for operator.
-  OrEqualAtomicViewFunctor( const view_type & input_, view_type & even_odd_result_, const long length_ )
-    : input( input_ )
-    , even_odd_result( even_odd_result_ )
-    , length( length_ )
-  {}
+  OrEqualAtomicViewFunctor(const view_type& input_, view_type& even_odd_result_,
+                           const long length_)
+      : input(input_), even_odd_result(even_odd_result_), length(length_) {}
 
   KOKKOS_INLINE_FUNCTION
-  void operator()( const long i ) const {
-    if ( i < length ) {
-      if ( i % 2 == 0 ) {
-        even_odd_result( 0 ) |= input( i );
-      }
-      else {
-        even_odd_result( 1 ) |= input( i );
+  void operator()(const long i) const {
+    if (i < length) {
+      if (i % 2 == 0) {
+        even_odd_result(0) |= input(i);
+      } else {
+        even_odd_result(1) |= input(i);
       }
     }
   }
 };
 
-template< class T, class execution_space >
-T OrEqualAtomicView( const long input_length ) {
-  typedef Kokkos::View< T*, execution_space > view_type;
+template <class T, class execution_space>
+T OrEqualAtomicView(const long input_length) {
+  typedef Kokkos::View<T*, execution_space> view_type;
   typedef typename view_type::HostMirror host_view_type;
 
   const long length = input_length;
 
-  view_type input( "input_view", length );
-  view_type result_view( "result_view", 2 );
+  view_type input("input_view", length);
+  view_type result_view("result_view", 2);
 
-  InitFunctor_Seq< T, execution_space > init_f( input, length );
-  Kokkos::parallel_for( Kokkos::RangePolicy< execution_space >( 0, length ), init_f );
+  InitFunctor_Seq<T, execution_space> init_f(input, length);
+  Kokkos::parallel_for(Kokkos::RangePolicy<execution_space>(0, length), init_f);
 
-  OrEqualAtomicViewFunctor< T, execution_space > functor( input, result_view, length );
-  Kokkos::parallel_for( Kokkos::RangePolicy< execution_space >( 0, length ), functor );
+  OrEqualAtomicViewFunctor<T, execution_space> functor(input, result_view,
+                                                       length);
+  Kokkos::parallel_for(Kokkos::RangePolicy<execution_space>(0, length),
+                       functor);
   Kokkos::fence();
 
-  host_view_type h_result_view = Kokkos::create_mirror_view( result_view );
-  Kokkos::deep_copy( h_result_view, result_view );
+  host_view_type h_result_view = Kokkos::create_mirror_view(result_view);
+  Kokkos::deep_copy(h_result_view, result_view);
 
-  return (T) ( h_result_view( 0 ) );
+  return (T)(h_result_view(0));
 }
 
-template< class T >
-T OrEqualAtomicViewCheck( const long input_length ) {
-
+template <class T>
+T OrEqualAtomicViewCheck(const long input_length) {
   const long N = input_length;
-  T result[2] = { 0 };
-  for ( long i = 0; i < N; ++i ) {
-    if ( i % 2 == 0 ) {
-      result[0] |= (T) i;
-    }
-    else {
-      result[1] |= (T) i;
+  T result[2]  = {0};
+  for (long i = 0; i < N; ++i) {
+    if (i % 2 == 0) {
+      result[0] |= (T)i;
+    } else {
+      result[1] |= (T)i;
     }
   }
 
-  return (T) ( result[0] );
+  return (T)(result[0]);
 }
 
-template< class T, class DeviceType >
-bool OrEqualAtomicViewTest( long input_length )
-{
-  static_assert( std::is_integral< T >::value, "OrEqualAtomicViewTest: Must be integral type for test" );
+template <class T, class DeviceType>
+bool OrEqualAtomicViewTest(long input_length) {
+  static_assert(std::is_integral<T>::value,
+                "OrEqualAtomicViewTest: Must be integral type for test");
 
-  T res       = OrEqualAtomicView< T, DeviceType >( input_length );
-  T resSerial = OrEqualAtomicViewCheck< T >( input_length );
+  T res       = OrEqualAtomicView<T, DeviceType>(input_length);
+  T resSerial = OrEqualAtomicViewCheck<T>(input_length);
 
   bool passed = true;
 
-  if ( resSerial != res ) {
+  if (resSerial != res) {
     passed = false;
 
-    std::cout << "Loop<"
-              << typeid( T ).name()
+    std::cout << "Loop<" << typeid(T).name()
               << ">( test = OrEqualAtomicViewTest"
-              << " FAILED : "
-              << resSerial << " != " << res
-              << std::endl;
+              << " FAILED : " << resSerial << " != " << res << std::endl;
   }
 
   return passed;
@@ -1311,93 +1294,90 @@ bool OrEqualAtomicViewTest( long input_length )
 //-----------atomic view xor-equal-----------------
 //---------------------------------------------------
 
-template< class T, class execution_space >
+template <class T, class execution_space>
 struct XOrEqualAtomicViewFunctor {
-  typedef Kokkos::View< T*, execution_space, Kokkos::MemoryTraits<Kokkos::Atomic> > atomic_view_type;
-  typedef Kokkos::View< T*, execution_space > view_type;
+  typedef Kokkos::View<T*, execution_space,
+                       Kokkos::MemoryTraits<Kokkos::Atomic> >
+      atomic_view_type;
+  typedef Kokkos::View<T*, execution_space> view_type;
 
   view_type input;
   atomic_view_type even_odd_result;
   const long length;
 
   // Wrap the result view in an atomic view, use this for operator.
-  XOrEqualAtomicViewFunctor( const view_type & input_, view_type & even_odd_result_, const long length_ )
-    : input( input_ )
-    , even_odd_result( even_odd_result_ )
-    , length( length_ )
-  {}
+  XOrEqualAtomicViewFunctor(const view_type& input_,
+                            view_type& even_odd_result_, const long length_)
+      : input(input_), even_odd_result(even_odd_result_), length(length_) {}
 
   KOKKOS_INLINE_FUNCTION
-  void operator()( const long i ) const {
-    if ( i < length ) {
-      if ( i % 2 == 0 ) {
-        even_odd_result( 0 ) ^= input( i );
-      }
-      else {
-        even_odd_result( 1 ) ^= input( i );
+  void operator()(const long i) const {
+    if (i < length) {
+      if (i % 2 == 0) {
+        even_odd_result(0) ^= input(i);
+      } else {
+        even_odd_result(1) ^= input(i);
       }
     }
   }
 };
 
-template< class T, class execution_space >
-T XOrEqualAtomicView( const long input_length ) {
-  typedef Kokkos::View< T*, execution_space > view_type;
+template <class T, class execution_space>
+T XOrEqualAtomicView(const long input_length) {
+  typedef Kokkos::View<T*, execution_space> view_type;
   typedef typename view_type::HostMirror host_view_type;
 
   const long length = input_length;
 
-  view_type input( "input_view", length );
-  view_type result_view( "result_view", 2 );
+  view_type input("input_view", length);
+  view_type result_view("result_view", 2);
 
-  InitFunctor_Seq< T, execution_space > init_f( input, length );
-  Kokkos::parallel_for( Kokkos::RangePolicy< execution_space >( 0, length ), init_f );
+  InitFunctor_Seq<T, execution_space> init_f(input, length);
+  Kokkos::parallel_for(Kokkos::RangePolicy<execution_space>(0, length), init_f);
 
-  XOrEqualAtomicViewFunctor< T, execution_space > functor( input, result_view, length );
-  Kokkos::parallel_for( Kokkos::RangePolicy< execution_space >( 0, length ), functor );
+  XOrEqualAtomicViewFunctor<T, execution_space> functor(input, result_view,
+                                                        length);
+  Kokkos::parallel_for(Kokkos::RangePolicy<execution_space>(0, length),
+                       functor);
   Kokkos::fence();
 
-  host_view_type h_result_view = Kokkos::create_mirror_view( result_view );
-  Kokkos::deep_copy( h_result_view, result_view );
+  host_view_type h_result_view = Kokkos::create_mirror_view(result_view);
+  Kokkos::deep_copy(h_result_view, result_view);
 
-  return (T) ( h_result_view( 0 ) );
+  return (T)(h_result_view(0));
 }
 
-template< class T >
-T XOrEqualAtomicViewCheck( const long input_length ) {
+template <class T>
+T XOrEqualAtomicViewCheck(const long input_length) {
   const long N = input_length;
-  T result[2] = { 0 };
-  for ( long i = 0; i < N; ++i ) {
-    if ( i % 2 == 0 ) {
-      result[0] ^= (T) i;
-    }
-    else {
-      result[1] ^= (T) i;
+  T result[2]  = {0};
+  for (long i = 0; i < N; ++i) {
+    if (i % 2 == 0) {
+      result[0] ^= (T)i;
+    } else {
+      result[1] ^= (T)i;
     }
   }
 
-  return (T) ( result[0] );
+  return (T)(result[0]);
 }
 
-template< class T, class DeviceType >
-bool XOrEqualAtomicViewTest( long input_length )
-{
-  static_assert( std::is_integral< T >::value, "XOrEqualAtomicViewTest: Must be integral type for test" );
+template <class T, class DeviceType>
+bool XOrEqualAtomicViewTest(long input_length) {
+  static_assert(std::is_integral<T>::value,
+                "XOrEqualAtomicViewTest: Must be integral type for test");
 
-  T res       = XOrEqualAtomicView< T, DeviceType >( input_length );
-  T resSerial = XOrEqualAtomicViewCheck< T >( input_length );
+  T res       = XOrEqualAtomicView<T, DeviceType>(input_length);
+  T resSerial = XOrEqualAtomicViewCheck<T>(input_length);
 
   bool passed = true;
 
-  if ( resSerial != res ) {
+  if (resSerial != res) {
     passed = false;
 
-    std::cout << "Loop<"
-              << typeid( T ).name()
+    std::cout << "Loop<" << typeid(T).name()
               << ">( test = XOrEqualAtomicViewTest"
-              << " FAILED : "
-              << resSerial << " != " << res
-              << std::endl;
+              << " FAILED : " << resSerial << " != " << res << std::endl;
   }
 
   return passed;
@@ -1409,72 +1389,93 @@ bool XOrEqualAtomicViewTest( long input_length )
 //--------------atomic_test_control------------------
 //---------------------------------------------------
 
-template< class T, class DeviceType >
-bool AtomicViewsTestIntegralType( const int length, int test )
-{
-  static_assert( std::is_integral< T >::value, "TestAtomicViews Error: Non-integral type passed into IntegralType tests" );
+template <class T, class DeviceType>
+bool AtomicViewsTestIntegralType(const int length, int test) {
+  static_assert(std::is_integral<T>::value,
+                "TestAtomicViews Error: Non-integral type passed into "
+                "IntegralType tests");
 
-  switch ( test ) {
-    case 1: return PlusEqualAtomicViewTest< T, DeviceType >( length );
-    case 2: return MinusEqualAtomicViewTest< T, DeviceType >( length );
-    case 3: return RSEqualAtomicViewTest< T, DeviceType >( length );
-    case 4: return LSEqualAtomicViewTest< T, DeviceType >( length );
-    case 5: return ModEqualAtomicViewTest< T, DeviceType >( length );
-    case 6: return AndEqualAtomicViewTest< T, DeviceType >( length );
-    case 7: return OrEqualAtomicViewTest< T, DeviceType >( length );
-    case 8: return XOrEqualAtomicViewTest< T, DeviceType >( length );
+  switch (test) {
+    case 1: return PlusEqualAtomicViewTest<T, DeviceType>(length);
+    case 2: return MinusEqualAtomicViewTest<T, DeviceType>(length);
+    case 3: return RSEqualAtomicViewTest<T, DeviceType>(length);
+    case 4: return LSEqualAtomicViewTest<T, DeviceType>(length);
+    case 5: return ModEqualAtomicViewTest<T, DeviceType>(length);
+    case 6: return AndEqualAtomicViewTest<T, DeviceType>(length);
+    case 7: return OrEqualAtomicViewTest<T, DeviceType>(length);
+    case 8: return XOrEqualAtomicViewTest<T, DeviceType>(length);
   }
 
   return 0;
 }
 
-template< class T, class DeviceType >
-bool AtomicViewsTestNonIntegralType( const int length, int test )
-{
-  switch ( test ) {
-    case 1: return PlusEqualAtomicViewTest< T, DeviceType >( length );
-    case 2: return MinusEqualAtomicViewTest< T, DeviceType >( length );
-    case 3: return TimesEqualAtomicViewTest< T, DeviceType >( length );
-    case 4: return DivEqualAtomicViewTest< T, DeviceType >( length );
+template <class T, class DeviceType>
+bool AtomicViewsTestNonIntegralType(const int length, int test) {
+  switch (test) {
+    case 1: return PlusEqualAtomicViewTest<T, DeviceType>(length);
+    case 2: return MinusEqualAtomicViewTest<T, DeviceType>(length);
+    case 3: return TimesEqualAtomicViewTest<T, DeviceType>(length);
+    case 4: return DivEqualAtomicViewTest<T, DeviceType>(length);
   }
 
   return 0;
 }
 
-} // namespace TestAtomicViews
+}  // namespace TestAtomicViews
 
 namespace Test {
 
-TEST_F( TEST_CATEGORY, atomic_views_integral )
-{
+TEST(TEST_CATEGORY, atomic_views_integral) {
   const long length = 1000000;
   {
     // Integral Types.
-    ASSERT_TRUE( ( TestAtomicViews::AtomicViewsTestIntegralType< long, TEST_EXECSPACE >( length, 1 ) ) );
-    ASSERT_TRUE( ( TestAtomicViews::AtomicViewsTestIntegralType< long, TEST_EXECSPACE >( length, 2 ) ) );
-    ASSERT_TRUE( ( TestAtomicViews::AtomicViewsTestIntegralType< long, TEST_EXECSPACE >( length, 3 ) ) );
-    ASSERT_TRUE( ( TestAtomicViews::AtomicViewsTestIntegralType< long, TEST_EXECSPACE >( length, 4 ) ) );
-    ASSERT_TRUE( ( TestAtomicViews::AtomicViewsTestIntegralType< long, TEST_EXECSPACE >( length, 5 ) ) );
-    ASSERT_TRUE( ( TestAtomicViews::AtomicViewsTestIntegralType< long, TEST_EXECSPACE >( length, 6 ) ) );
-    ASSERT_TRUE( ( TestAtomicViews::AtomicViewsTestIntegralType< long, TEST_EXECSPACE >( length, 7 ) ) );
-    ASSERT_TRUE( ( TestAtomicViews::AtomicViewsTestIntegralType< long, TEST_EXECSPACE >( length, 8 ) ) );
+    ASSERT_TRUE(
+        (TestAtomicViews::AtomicViewsTestIntegralType<long, TEST_EXECSPACE>(
+            length, 1)));
+    ASSERT_TRUE(
+        (TestAtomicViews::AtomicViewsTestIntegralType<long, TEST_EXECSPACE>(
+            length, 2)));
+    ASSERT_TRUE(
+        (TestAtomicViews::AtomicViewsTestIntegralType<long, TEST_EXECSPACE>(
+            length, 3)));
+    ASSERT_TRUE(
+        (TestAtomicViews::AtomicViewsTestIntegralType<long, TEST_EXECSPACE>(
+            length, 4)));
+    ASSERT_TRUE(
+        (TestAtomicViews::AtomicViewsTestIntegralType<long, TEST_EXECSPACE>(
+            length, 5)));
+    ASSERT_TRUE(
+        (TestAtomicViews::AtomicViewsTestIntegralType<long, TEST_EXECSPACE>(
+            length, 6)));
+    ASSERT_TRUE(
+        (TestAtomicViews::AtomicViewsTestIntegralType<long, TEST_EXECSPACE>(
+            length, 7)));
+    ASSERT_TRUE(
+        (TestAtomicViews::AtomicViewsTestIntegralType<long, TEST_EXECSPACE>(
+            length, 8)));
   }
 }
 
-TEST_F( TEST_CATEGORY, atomic_views_nonintegral )
-{
+TEST(TEST_CATEGORY, atomic_views_nonintegral) {
   const long length = 1000000;
   {
     // Non-Integral Types.
-    ASSERT_TRUE( ( TestAtomicViews::AtomicViewsTestNonIntegralType< double, TEST_EXECSPACE >( length, 1 ) ) );
-    ASSERT_TRUE( ( TestAtomicViews::AtomicViewsTestNonIntegralType< double, TEST_EXECSPACE >( length, 2 ) ) );
-    ASSERT_TRUE( ( TestAtomicViews::AtomicViewsTestNonIntegralType< double, TEST_EXECSPACE >( length, 3 ) ) );
-    ASSERT_TRUE( ( TestAtomicViews::AtomicViewsTestNonIntegralType< double, TEST_EXECSPACE >( length, 4 ) ) );
+    ASSERT_TRUE((
+        TestAtomicViews::AtomicViewsTestNonIntegralType<double, TEST_EXECSPACE>(
+            length, 1)));
+    ASSERT_TRUE((
+        TestAtomicViews::AtomicViewsTestNonIntegralType<double, TEST_EXECSPACE>(
+            length, 2)));
+    ASSERT_TRUE((
+        TestAtomicViews::AtomicViewsTestNonIntegralType<double, TEST_EXECSPACE>(
+            length, 3)));
+    ASSERT_TRUE((
+        TestAtomicViews::AtomicViewsTestNonIntegralType<double, TEST_EXECSPACE>(
+            length, 4)));
   }
 }
 
-TEST_F( TEST_CATEGORY, atomic_view_api )
-{
-  TestAtomicViews::TestAtomicViewAPI< int, TEST_EXECSPACE >();
-}
+TEST(TEST_CATEGORY, atomic_view_api) {
+  TestAtomicViews::TestAtomicViewAPI<int, TEST_EXECSPACE>();
 }
+}  // namespace Test
diff --git a/lib/kokkos/core/unit_test/TestCXX11.hpp b/lib/kokkos/core/unit_test/TestCXX11.hpp
index 542b4a1912..876a3b5da8 100644
--- a/lib/kokkos/core/unit_test/TestCXX11.hpp
+++ b/lib/kokkos/core/unit_test/TestCXX11.hpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -45,303 +46,317 @@
 
 namespace TestCXX11 {
 
-template< class DeviceType >
+template <class DeviceType>
 struct FunctorAddTest {
-  typedef Kokkos::View< double**, DeviceType > view_type;
+  typedef Kokkos::View<double**, DeviceType> view_type;
   typedef DeviceType execution_space;
-  typedef typename Kokkos::TeamPolicy< execution_space >::member_type team_member;
+  typedef typename Kokkos::TeamPolicy<execution_space>::member_type team_member;
 
   view_type a_, b_;
 
-  FunctorAddTest( view_type & a, view_type & b ) : a_( a ), b_( b ) {}
+  FunctorAddTest(view_type& a, view_type& b) : a_(a), b_(b) {}
 
   KOKKOS_INLINE_FUNCTION
-  void operator() ( const int& i ) const {
-    b_( i, 0 ) = a_( i, 1 ) + a_( i, 2 );
-    b_( i, 1 ) = a_( i, 0 ) - a_( i, 3 );
-    b_( i, 2 ) = a_( i, 4 ) + a_( i, 0 );
-    b_( i, 3 ) = a_( i, 2 ) - a_( i, 1 );
-    b_( i, 4 ) = a_( i, 3 ) + a_( i, 4 );
+  void operator()(const int& i) const {
+    b_(i, 0) = a_(i, 1) + a_(i, 2);
+    b_(i, 1) = a_(i, 0) - a_(i, 3);
+    b_(i, 2) = a_(i, 4) + a_(i, 0);
+    b_(i, 3) = a_(i, 2) - a_(i, 1);
+    b_(i, 4) = a_(i, 3) + a_(i, 4);
   }
 
   KOKKOS_INLINE_FUNCTION
-  void operator() ( const team_member & dev ) const {
+  void operator()(const team_member& dev) const {
     const int begin = dev.league_rank() * 4;
     const int end   = begin + 4;
-    for ( int i = begin + dev.team_rank(); i < end; i += dev.team_size() ) {
-      b_( i, 0 ) = a_( i, 1 ) + a_( i, 2 );
-      b_( i, 1 ) = a_( i, 0 ) - a_( i, 3 );
-      b_( i, 2 ) = a_( i, 4 ) + a_( i, 0 );
-      b_( i, 3 ) = a_( i, 2 ) - a_( i, 1 );
-      b_( i, 4 ) = a_( i, 3 ) + a_( i, 4 );
+    for (int i = begin + dev.team_rank(); i < end; i += dev.team_size()) {
+      b_(i, 0) = a_(i, 1) + a_(i, 2);
+      b_(i, 1) = a_(i, 0) - a_(i, 3);
+      b_(i, 2) = a_(i, 4) + a_(i, 0);
+      b_(i, 3) = a_(i, 2) - a_(i, 1);
+      b_(i, 4) = a_(i, 3) + a_(i, 4);
     }
   }
 };
 
-template< class DeviceType, bool PWRTest >
+template <class DeviceType, bool PWRTest>
 double AddTestFunctor() {
-  typedef Kokkos::TeamPolicy< DeviceType > policy_type;
+  typedef Kokkos::TeamPolicy<DeviceType> policy_type;
 
-  Kokkos::View< double**, DeviceType > a( "A", 100, 5 );
-  Kokkos::View< double**, DeviceType > b( "B", 100, 5 );
-  typename Kokkos::View< double**, DeviceType >::HostMirror h_a = Kokkos::create_mirror_view( a );
-  typename Kokkos::View< double**, DeviceType >::HostMirror h_b = Kokkos::create_mirror_view( b );
+  Kokkos::View<double**, DeviceType> a("A", 100, 5);
+  Kokkos::View<double**, DeviceType> b("B", 100, 5);
+  typename Kokkos::View<double**, DeviceType>::HostMirror h_a =
+      Kokkos::create_mirror_view(a);
+  typename Kokkos::View<double**, DeviceType>::HostMirror h_b =
+      Kokkos::create_mirror_view(b);
 
-  for ( int i = 0; i < 100; i++ ) {
-    for  ( int j = 0; j < 5; j++ ) {
-       h_a( i, j ) = 0.1 * i / ( 1.1 * j + 1.0 ) + 0.5 * j;
+  for (int i = 0; i < 100; i++) {
+    for (int j = 0; j < 5; j++) {
+      h_a(i, j) = 0.1 * i / (1.1 * j + 1.0) + 0.5 * j;
     }
   }
-  Kokkos::deep_copy( a, h_a );
+  Kokkos::deep_copy(a, h_a);
 
-  if ( PWRTest == false ) {
-    Kokkos::parallel_for( 100, FunctorAddTest< DeviceType >( a, b ) );
+  if (PWRTest == false) {
+    Kokkos::parallel_for(100, FunctorAddTest<DeviceType>(a, b));
+  } else {
+    Kokkos::parallel_for(policy_type(25, Kokkos::AUTO),
+                         FunctorAddTest<DeviceType>(a, b));
   }
-  else {
-    Kokkos::parallel_for( policy_type( 25, Kokkos::AUTO ), FunctorAddTest< DeviceType >( a, b ) );
-  }
-  Kokkos::deep_copy( h_b, b );
+  Kokkos::deep_copy(h_b, b);
 
   double result = 0;
-  for ( int i = 0; i < 100; i++ ) {
-    for ( int j = 0; j < 5; j++ ) {
-      result += h_b( i, j );
+  for (int i = 0; i < 100; i++) {
+    for (int j = 0; j < 5; j++) {
+      result += h_b(i, j);
     }
   }
 
   return result;
 }
 
-#if defined( KOKKOS_ENABLE_CXX11_DISPATCH_LAMBDA )
-template< class DeviceType, bool PWRTest >
+#if defined(KOKKOS_ENABLE_CXX11_DISPATCH_LAMBDA)
+template <class DeviceType, bool PWRTest>
 double AddTestLambda() {
-  Kokkos::View< double**, DeviceType > a( "A", 100, 5 );
-  Kokkos::View< double**, DeviceType > b( "B", 100, 5 );
-  typename Kokkos::View< double**, DeviceType >::HostMirror h_a = Kokkos::create_mirror_view( a );
-  typename Kokkos::View< double**, DeviceType >::HostMirror h_b = Kokkos::create_mirror_view( b );
+  Kokkos::View<double**, DeviceType> a("A", 100, 5);
+  Kokkos::View<double**, DeviceType> b("B", 100, 5);
+  typename Kokkos::View<double**, DeviceType>::HostMirror h_a =
+      Kokkos::create_mirror_view(a);
+  typename Kokkos::View<double**, DeviceType>::HostMirror h_b =
+      Kokkos::create_mirror_view(b);
 
-  for ( int i = 0; i < 100; i++ ) {
-    for ( int j = 0; j < 5; j++ ) {
-       h_a( i, j ) = 0.1 * i / ( 1.1 * j + 1.0 ) + 0.5 * j;
+  for (int i = 0; i < 100; i++) {
+    for (int j = 0; j < 5; j++) {
+      h_a(i, j) = 0.1 * i / (1.1 * j + 1.0) + 0.5 * j;
     }
   }
-  Kokkos::deep_copy( a, h_a );
+  Kokkos::deep_copy(a, h_a);
 
-  if ( PWRTest == false ) {
-    Kokkos::parallel_for( 100, KOKKOS_LAMBDA( const int & i ) {
-      b( i, 0 ) = a( i, 1 ) + a( i, 2 );
-      b( i, 1 ) = a( i, 0 ) - a( i, 3 );
-      b( i, 2 ) = a( i, 4 ) + a( i, 0 );
-      b( i, 3 ) = a( i, 2 ) - a( i, 1 );
-      b( i, 4 ) = a( i, 3 ) + a( i, 4 );
-    });
-  }
-  else {
-    typedef Kokkos::TeamPolicy< DeviceType > policy_type;
+  if (PWRTest == false) {
+    Kokkos::parallel_for(
+        100, KOKKOS_LAMBDA(const int& i) {
+          b(i, 0) = a(i, 1) + a(i, 2);
+          b(i, 1) = a(i, 0) - a(i, 3);
+          b(i, 2) = a(i, 4) + a(i, 0);
+          b(i, 3) = a(i, 2) - a(i, 1);
+          b(i, 4) = a(i, 3) + a(i, 4);
+        });
+  } else {
+    typedef Kokkos::TeamPolicy<DeviceType> policy_type;
     typedef typename policy_type::member_type team_member;
 
-    policy_type policy( 25, Kokkos::AUTO );
+    policy_type policy(25, Kokkos::AUTO);
 
-    Kokkos::parallel_for( policy, KOKKOS_LAMBDA( const team_member & dev ) {
-      const int begin = dev.league_rank() * 4;
-      const int end   = begin + 4;
-      for ( int i = begin + dev.team_rank(); i < end; i += dev.team_size() ) {
-        b( i, 0 ) = a( i, 1 ) + a( i, 2 );
-        b( i, 1 ) = a( i, 0 ) - a( i, 3 );
-        b( i, 2 ) = a( i, 4 ) + a( i, 0 );
-        b( i, 3 ) = a( i, 2 ) - a( i, 1 );
-        b( i, 4 ) = a( i, 3 ) + a( i, 4 );
-      }
-    });
+    Kokkos::parallel_for(
+        policy, KOKKOS_LAMBDA(const team_member& dev) {
+          const int begin = dev.league_rank() * 4;
+          const int end   = begin + 4;
+          for (int i = begin + dev.team_rank(); i < end; i += dev.team_size()) {
+            b(i, 0) = a(i, 1) + a(i, 2);
+            b(i, 1) = a(i, 0) - a(i, 3);
+            b(i, 2) = a(i, 4) + a(i, 0);
+            b(i, 3) = a(i, 2) - a(i, 1);
+            b(i, 4) = a(i, 3) + a(i, 4);
+          }
+        });
   }
-  Kokkos::deep_copy( h_b, b );
+  Kokkos::deep_copy(h_b, b);
 
   double result = 0;
-  for ( int i = 0; i < 100; i++ ) {
-    for ( int j = 0; j < 5; j++ ) {
-      result += h_b( i, j );
+  for (int i = 0; i < 100; i++) {
+    for (int j = 0; j < 5; j++) {
+      result += h_b(i, j);
     }
   }
 
   return result;
 }
 #else
-template< class DeviceType, bool PWRTest >
+template <class DeviceType, bool PWRTest>
 double AddTestLambda() {
-  return AddTestFunctor< DeviceType, PWRTest >();
+  return AddTestFunctor<DeviceType, PWRTest>();
 }
 #endif
 
-template< class DeviceType >
+template <class DeviceType>
 struct FunctorReduceTest {
-  typedef Kokkos::View< double**, DeviceType > view_type;
+  typedef Kokkos::View<double**, DeviceType> view_type;
   typedef DeviceType execution_space;
   typedef double value_type;
-  typedef typename Kokkos::TeamPolicy< execution_space >::member_type team_member;
+  typedef typename Kokkos::TeamPolicy<execution_space>::member_type team_member;
 
   view_type a_;
 
-  FunctorReduceTest( view_type & a ) : a_( a ) {}
+  FunctorReduceTest(view_type& a) : a_(a) {}
 
   KOKKOS_INLINE_FUNCTION
-  void operator() ( const int & i, value_type & sum ) const {
-    sum += a_( i, 1 ) + a_( i, 2 );
-    sum += a_( i, 0 ) - a_( i, 3 );
-    sum += a_( i, 4 ) + a_( i, 0 );
-    sum += a_( i, 2 ) - a_( i, 1 );
-    sum += a_( i, 3 ) + a_( i, 4 );
+  void operator()(const int& i, value_type& sum) const {
+    sum += a_(i, 1) + a_(i, 2);
+    sum += a_(i, 0) - a_(i, 3);
+    sum += a_(i, 4) + a_(i, 0);
+    sum += a_(i, 2) - a_(i, 1);
+    sum += a_(i, 3) + a_(i, 4);
   }
 
   KOKKOS_INLINE_FUNCTION
-  void operator() ( const team_member & dev, value_type & sum ) const {
+  void operator()(const team_member& dev, value_type& sum) const {
     const int begin = dev.league_rank() * 4;
     const int end   = begin + 4;
-    for ( int i = begin + dev.team_rank(); i < end; i += dev.team_size() ) {
-      sum += a_( i, 1 ) + a_( i, 2 );
-      sum += a_( i, 0 ) - a_( i, 3 );
-      sum += a_( i, 4 ) + a_( i, 0 );
-      sum += a_( i, 2 ) - a_( i, 1 );
-      sum += a_( i, 3 ) + a_( i, 4 );
+    for (int i = begin + dev.team_rank(); i < end; i += dev.team_size()) {
+      sum += a_(i, 1) + a_(i, 2);
+      sum += a_(i, 0) - a_(i, 3);
+      sum += a_(i, 4) + a_(i, 0);
+      sum += a_(i, 2) - a_(i, 1);
+      sum += a_(i, 3) + a_(i, 4);
     }
   }
 
   KOKKOS_INLINE_FUNCTION
-  void init( value_type & update ) const { update = 0.0; }
+  void init(value_type& update) const { update = 0.0; }
 
   KOKKOS_INLINE_FUNCTION
-  void join( volatile value_type & update, volatile value_type const & input ) const { update += input; }
+  void join(volatile value_type& update,
+            volatile value_type const& input) const {
+    update += input;
+  }
 };
 
-template< class DeviceType, bool PWRTest >
+template <class DeviceType, bool PWRTest>
 double ReduceTestFunctor() {
-  typedef Kokkos::TeamPolicy< DeviceType > policy_type;
-  typedef Kokkos::View< double**, DeviceType > view_type;
-  typedef Kokkos::View< double, Kokkos::HostSpace, Kokkos::MemoryUnmanaged > unmanaged_result;
+  typedef Kokkos::TeamPolicy<DeviceType> policy_type;
+  typedef Kokkos::View<double**, DeviceType> view_type;
+  typedef Kokkos::View<double, Kokkos::HostSpace, Kokkos::MemoryUnmanaged>
+      unmanaged_result;
 
-  view_type a( "A", 100, 5 );
-  typename view_type::HostMirror h_a = Kokkos::create_mirror_view( a );
+  view_type a("A", 100, 5);
+  typename view_type::HostMirror h_a = Kokkos::create_mirror_view(a);
 
-  for ( int i = 0; i < 100; i++ ) {
-    for ( int j = 0; j < 5; j++ ) {
-       h_a( i, j ) = 0.1 * i / ( 1.1 * j + 1.0 ) + 0.5 * j;
+  for (int i = 0; i < 100; i++) {
+    for (int j = 0; j < 5; j++) {
+      h_a(i, j) = 0.1 * i / (1.1 * j + 1.0) + 0.5 * j;
     }
   }
-  Kokkos::deep_copy( a, h_a );
+  Kokkos::deep_copy(a, h_a);
 
   double result = 0.0;
-  if ( PWRTest == false ) {
-    Kokkos::parallel_reduce( 100, FunctorReduceTest< DeviceType >( a ), unmanaged_result( & result ) );
-  }
-  else {
-    Kokkos::parallel_reduce( policy_type( 25, Kokkos::AUTO ), FunctorReduceTest< DeviceType >( a ), unmanaged_result( & result ) );
+  if (PWRTest == false) {
+    Kokkos::parallel_reduce(100, FunctorReduceTest<DeviceType>(a),
+                            unmanaged_result(&result));
+  } else {
+    Kokkos::parallel_reduce(policy_type(25, Kokkos::AUTO),
+                            FunctorReduceTest<DeviceType>(a),
+                            unmanaged_result(&result));
   }
   Kokkos::fence();
 
   return result;
 }
 
-#if defined( KOKKOS_ENABLE_CXX11_DISPATCH_LAMBDA )
-template< class DeviceType, bool PWRTest >
+#if defined(KOKKOS_ENABLE_CXX11_DISPATCH_LAMBDA)
+template <class DeviceType, bool PWRTest>
 double ReduceTestLambda() {
-  typedef Kokkos::TeamPolicy< DeviceType > policy_type;
-  typedef Kokkos::View< double**, DeviceType > view_type;
-  typedef Kokkos::View< double, Kokkos::HostSpace, Kokkos::MemoryUnmanaged > unmanaged_result;
+  typedef Kokkos::TeamPolicy<DeviceType> policy_type;
+  typedef Kokkos::View<double**, DeviceType> view_type;
+  typedef Kokkos::View<double, Kokkos::HostSpace, Kokkos::MemoryUnmanaged>
+      unmanaged_result;
 
-  view_type a( "A", 100, 5 );
-  typename view_type::HostMirror h_a = Kokkos::create_mirror_view( a );
+  view_type a("A", 100, 5);
+  typename view_type::HostMirror h_a = Kokkos::create_mirror_view(a);
 
-  for ( int i = 0; i < 100; i++ ) {
-    for ( int j = 0; j < 5; j++ ) {
-       h_a( i, j ) = 0.1 * i / ( 1.1 * j + 1.0 ) + 0.5 * j;
+  for (int i = 0; i < 100; i++) {
+    for (int j = 0; j < 5; j++) {
+      h_a(i, j) = 0.1 * i / (1.1 * j + 1.0) + 0.5 * j;
     }
   }
-  Kokkos::deep_copy( a, h_a );
+  Kokkos::deep_copy(a, h_a);
 
   double result = 0.0;
 
-  if ( PWRTest == false ) {
-    Kokkos::parallel_reduce( 100, KOKKOS_LAMBDA( const int & i, double & sum ) {
-      sum += a( i, 1 ) + a( i, 2 );
-      sum += a( i, 0 ) - a( i, 3 );
-      sum += a( i, 4 ) + a( i, 0 );
-      sum += a( i, 2 ) - a( i, 1 );
-      sum += a( i, 3 ) + a( i, 4 );
-    }, unmanaged_result( & result ) );
-  }
-  else {
+  if (PWRTest == false) {
+    Kokkos::parallel_reduce(
+        100,
+        KOKKOS_LAMBDA(const int& i, double& sum) {
+          sum += a(i, 1) + a(i, 2);
+          sum += a(i, 0) - a(i, 3);
+          sum += a(i, 4) + a(i, 0);
+          sum += a(i, 2) - a(i, 1);
+          sum += a(i, 3) + a(i, 4);
+        },
+        unmanaged_result(&result));
+  } else {
     typedef typename policy_type::member_type team_member;
-    Kokkos::parallel_reduce( policy_type( 25, Kokkos::AUTO ), KOKKOS_LAMBDA( const team_member & dev, double & sum ) {
-      const int begin = dev.league_rank() * 4;
-      const int end   = begin + 4;
-      for ( int i = begin + dev.team_rank(); i < end; i += dev.team_size() ) {
-        sum += a( i, 1 ) + a( i, 2 );
-        sum += a( i, 0 ) - a( i, 3 );
-        sum += a( i, 4 ) + a( i, 0 );
-        sum += a( i, 2 ) - a( i, 1 );
-        sum += a( i, 3 ) + a( i, 4 );
-      }
-    }, unmanaged_result( & result ) );
+    Kokkos::parallel_reduce(
+        policy_type(25, Kokkos::AUTO),
+        KOKKOS_LAMBDA(const team_member& dev, double& sum) {
+          const int begin = dev.league_rank() * 4;
+          const int end   = begin + 4;
+          for (int i = begin + dev.team_rank(); i < end; i += dev.team_size()) {
+            sum += a(i, 1) + a(i, 2);
+            sum += a(i, 0) - a(i, 3);
+            sum += a(i, 4) + a(i, 0);
+            sum += a(i, 2) - a(i, 1);
+            sum += a(i, 3) + a(i, 4);
+          }
+        },
+        unmanaged_result(&result));
   }
   Kokkos::fence();
 
   return result;
 }
 #else
-template< class DeviceType, bool PWRTest >
+template <class DeviceType, bool PWRTest>
 double ReduceTestLambda() {
-  return ReduceTestFunctor< DeviceType, PWRTest >();
+  return ReduceTestFunctor<DeviceType, PWRTest>();
 }
 #endif
 
-template< class DeviceType >
-double TestVariantLambda( int test ) {
-  switch ( test ) {
-    case 1: return AddTestLambda< DeviceType, false >();
-    case 2: return AddTestLambda< DeviceType, true >();
-    case 3: return ReduceTestLambda< DeviceType, false >();
-    case 4: return ReduceTestLambda< DeviceType, true >();
+template <class DeviceType>
+double TestVariantLambda(int test) {
+  switch (test) {
+    case 1: return AddTestLambda<DeviceType, false>();
+    case 2: return AddTestLambda<DeviceType, true>();
+    case 3: return ReduceTestLambda<DeviceType, false>();
+    case 4: return ReduceTestLambda<DeviceType, true>();
   }
 
   return 0;
 }
 
-template< class DeviceType >
-double TestVariantFunctor( int test ) {
-  switch ( test ) {
-    case 1: return AddTestFunctor< DeviceType, false >();
-    case 2: return AddTestFunctor< DeviceType, true >();
-    case 3: return ReduceTestFunctor< DeviceType, false >();
-    case 4: return ReduceTestFunctor< DeviceType, true >();
+template <class DeviceType>
+double TestVariantFunctor(int test) {
+  switch (test) {
+    case 1: return AddTestFunctor<DeviceType, false>();
+    case 2: return AddTestFunctor<DeviceType, true>();
+    case 3: return ReduceTestFunctor<DeviceType, false>();
+    case 4: return ReduceTestFunctor<DeviceType, true>();
   }
 
   return 0;
 }
 
-template< class DeviceType >
-bool Test( int test ) {
+template <class DeviceType>
+bool Test(int test) {
 #ifdef KOKKOS_ENABLE_CXX11_DISPATCH_LAMBDA
-  double res_functor = TestVariantFunctor< DeviceType >( test );
-  double res_lambda = TestVariantLambda< DeviceType >( test );
+  double res_functor = TestVariantFunctor<DeviceType>(test);
+  double res_lambda  = TestVariantLambda<DeviceType>(test);
 
-  char testnames[5][256] = { " "
-                           , "AddTest", "AddTest TeamPolicy"
-                           , "ReduceTest", "ReduceTest TeamPolicy"
-                           };
-  bool passed = true;
+  char testnames[5][256] = {" ", "AddTest", "AddTest TeamPolicy", "ReduceTest",
+                            "ReduceTest TeamPolicy"};
+  bool passed            = true;
 
   auto a = res_functor;
   auto b = res_lambda;
-  // use a tolerant comparison because functors and lambdas vectorize differently
-  // https://github.com/trilinos/Trilinos/issues/3233
+  // use a tolerant comparison because functors and lambdas vectorize
+  // differently https://github.com/trilinos/Trilinos/issues/3233
   auto rel_err = (std::abs(b - a) / std::max(std::abs(a), std::abs(b)));
-  auto tol = 1e-14;
+  auto tol     = 1e-14;
   if (rel_err > tol) {
     passed = false;
 
-    std::cout << "CXX11 ( test = '"
-              << testnames[test] << "' FAILED : relative error "
-              << rel_err << " > tolerance " << tol
-              << std::endl;
+    std::cout << "CXX11 ( test = '" << testnames[test]
+              << "' FAILED : relative error " << rel_err << " > tolerance "
+              << tol << std::endl;
   }
 
   return passed;
@@ -350,18 +365,16 @@ bool Test( int test ) {
 #endif
 }
 
-} // namespace TestCXX11
+}  // namespace TestCXX11
 
 namespace Test {
-TEST_F( TEST_CATEGORY, cxx11 )
-{
-  if ( std::is_same< Kokkos::DefaultExecutionSpace, TEST_EXECSPACE >::value ) {
-    ASSERT_TRUE( ( TestCXX11::Test< TEST_EXECSPACE >( 1 ) ) );
-    ASSERT_TRUE( ( TestCXX11::Test< TEST_EXECSPACE >( 2 ) ) );
-    ASSERT_TRUE( ( TestCXX11::Test< TEST_EXECSPACE >( 3 ) ) );
-    ASSERT_TRUE( ( TestCXX11::Test< TEST_EXECSPACE >( 4 ) ) );
+TEST(TEST_CATEGORY, cxx11) {
+  if (std::is_same<Kokkos::DefaultExecutionSpace, TEST_EXECSPACE>::value) {
+    ASSERT_TRUE((TestCXX11::Test<TEST_EXECSPACE>(1)));
+    ASSERT_TRUE((TestCXX11::Test<TEST_EXECSPACE>(2)));
+    ASSERT_TRUE((TestCXX11::Test<TEST_EXECSPACE>(3)));
+    ASSERT_TRUE((TestCXX11::Test<TEST_EXECSPACE>(4)));
   }
 }
 
-}
-
+}  // namespace Test
diff --git a/lib/kokkos/core/unit_test/TestCXX11Deduction.hpp b/lib/kokkos/core/unit_test/TestCXX11Deduction.hpp
index 220732918d..0e60d91a89 100644
--- a/lib/kokkos/core/unit_test/TestCXX11Deduction.hpp
+++ b/lib/kokkos/core/unit_test/TestCXX11Deduction.hpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -51,49 +52,57 @@ namespace TestCXX11 {
 struct TestReductionDeductionTagA {};
 struct TestReductionDeductionTagB {};
 
-template < class ExecSpace >
+template <class ExecSpace>
 struct TestReductionDeductionFunctor {
   // KOKKOS_INLINE_FUNCTION
   // void operator()( long i, long & value ) const
   // { value += i + 1; }
 
   KOKKOS_INLINE_FUNCTION
-  void operator()( TestReductionDeductionTagA, long i, long & value ) const
-  { value += ( 2 * i + 1 ) + ( 2 * i + 2 ); }
+  void operator()(TestReductionDeductionTagA, long i, long &value) const {
+    value += (2 * i + 1) + (2 * i + 2);
+  }
 
   KOKKOS_INLINE_FUNCTION
-  void operator()( const TestReductionDeductionTagB &, const long i, long & value ) const
-  { value += ( 3 * i + 1 ) + ( 3 * i + 2 ) + ( 3 * i + 3 ); }
+  void operator()(const TestReductionDeductionTagB &, const long i,
+                  long &value) const {
+    value += (3 * i + 1) + (3 * i + 2) + (3 * i + 3);
+  }
 };
 
-template< class ExecSpace >
-void test_reduction_deduction()
-{
-  typedef TestReductionDeductionFunctor< ExecSpace > Functor;
+template <class ExecSpace>
+void test_reduction_deduction() {
+  typedef TestReductionDeductionFunctor<ExecSpace> Functor;
 
   const long N = 50;
-  // const long answer  = N % 2 ? ( N * ( ( N + 1 ) / 2 ) ) : ( ( N / 2 ) * ( N + 1 ) );
-  const long answerA = N % 2 ? ( ( 2 * N ) * ( ( ( 2 * N ) + 1 ) / 2 ) ) : ( ( ( 2 * N ) / 2 ) * ( ( 2 * N ) + 1 ) );
-  const long answerB = N % 2 ? ( ( 3 * N ) * ( ( ( 3 * N ) + 1 ) / 2 ) ) : ( ( ( 3 * N ) / 2 ) * ( ( 3 * N ) + 1 ) );
+  // const long answer  = N % 2 ? ( N * ( ( N + 1 ) / 2 ) ) : ( ( N / 2 ) * ( N
+  // + 1 ) );
+  const long answerA =
+      N % 2 ? ((2 * N) * (((2 * N) + 1) / 2)) : (((2 * N) / 2) * ((2 * N) + 1));
+  const long answerB =
+      N % 2 ? ((3 * N) * (((3 * N) + 1) / 2)) : (((3 * N) / 2) * ((3 * N) + 1));
   long result = 0;
 
-  // Kokkos::parallel_reduce( Kokkos::RangePolicy< ExecSpace >( 0, N ), Functor(), result );
-  // ASSERT_EQ( answer, result );
+  // Kokkos::parallel_reduce( Kokkos::RangePolicy< ExecSpace >( 0, N ),
+  // Functor(), result ); ASSERT_EQ( answer, result );
 
-  Kokkos::parallel_reduce( Kokkos::RangePolicy< ExecSpace, TestReductionDeductionTagA >( 0, N ), Functor(), result );
-  ASSERT_EQ( answerA, result );
+  Kokkos::parallel_reduce(
+      Kokkos::RangePolicy<ExecSpace, TestReductionDeductionTagA>(0, N),
+      Functor(), result);
+  ASSERT_EQ(answerA, result);
 
-  Kokkos::parallel_reduce( Kokkos::RangePolicy< ExecSpace, TestReductionDeductionTagB >( 0, N ), Functor(), result );
-  ASSERT_EQ( answerB, result );
+  Kokkos::parallel_reduce(
+      Kokkos::RangePolicy<ExecSpace, TestReductionDeductionTagB>(0, N),
+      Functor(), result);
+  ASSERT_EQ(answerB, result);
 }
 
-} // namespace TestCXX11
+}  // namespace TestCXX11
 
 namespace Test {
 
-TEST_F( TEST_CATEGORY, reduction_deduction )
-{
-  TestCXX11::test_reduction_deduction< TEST_EXECSPACE >();
-}
+TEST(TEST_CATEGORY, reduction_deduction) {
+  TestCXX11::test_reduction_deduction<TEST_EXECSPACE>();
 }
+}  // namespace Test
 #endif
diff --git a/lib/kokkos/core/unit_test/TestCompilerMacros.hpp b/lib/kokkos/core/unit_test/TestCompilerMacros.hpp
index 07c332a9ae..e8daab9db6 100644
--- a/lib/kokkos/core/unit_test/TestCompilerMacros.hpp
+++ b/lib/kokkos/core/unit_test/TestCompilerMacros.hpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -43,75 +44,74 @@
 
 #include <Kokkos_Core.hpp>
 
-#if defined(KOKKOS_ENABLE_CUDA) && \
-    ( !defined(KOKKOS_ENABLE_CUDA_LAMBDA) || \
-      (  ( defined(KOKKOS_ENABLE_SERIAL) || defined(KOKKOS_ENABLE_OPENMP) ) && \
-         (  (CUDA_VERSION < 8000) && defined( __NVCC__ ))))
-  #if defined(KOKKOS_ENABLE_CXX11_DISPATCH_LAMBDA)
-    #error "Macro bug: KOKKOS_ENABLE_CXX11_DISPATCH_LAMBDA shouldn't be defined"
-  #endif
+#if defined(KOKKOS_ENABLE_CUDA) &&                                        \
+    (!defined(KOKKOS_ENABLE_CUDA_LAMBDA) ||                               \
+     ((defined(KOKKOS_ENABLE_SERIAL) || defined(KOKKOS_ENABLE_OPENMP)) && \
+      ((CUDA_VERSION < 8000) && defined(__NVCC__))))
+#if defined(KOKKOS_ENABLE_CXX11_DISPATCH_LAMBDA)
+#error "Macro bug: KOKKOS_ENABLE_CXX11_DISPATCH_LAMBDA shouldn't be defined"
+#endif
 #else
-  #if !defined(KOKKOS_ENABLE_CXX11_DISPATCH_LAMBDA)
-    #error "Macro bug: KOKKOS_ENABLE_CXX11_DISPATCH_LAMBDA should be defined"
-  #endif
+#if !defined(KOKKOS_ENABLE_CXX11_DISPATCH_LAMBDA)
+#error "Macro bug: KOKKOS_ENABLE_CXX11_DISPATCH_LAMBDA should be defined"
+#endif
 #endif
 
 #define KOKKOS_PRAGMA_UNROLL(a)
 
 namespace TestCompilerMacros {
 
-template< class DEVICE_TYPE >
+template <class DEVICE_TYPE>
 struct AddFunctor {
   typedef DEVICE_TYPE execution_space;
-  typedef typename Kokkos::View< int**, execution_space > type;
+  typedef typename Kokkos::View<int**, execution_space> type;
   type a, b;
   int length;
 
-  AddFunctor( type a_, type b_ ) : a( a_ ), b( b_ ), length( a.extent(1) ) {}
+  AddFunctor(type a_, type b_) : a(a_), b(b_), length(a.extent(1)) {}
 
   KOKKOS_INLINE_FUNCTION
-  void operator()( int i ) const {
+  void operator()(int i) const {
 #ifdef KOKKOS_ENABLE_PRAGMA_UNROLL
-    #pragma unroll
+#pragma unroll
 #endif
 #ifdef KOKKOS_ENABLE_PRAGMA_IVDEP
-    #pragma ivdep
+#pragma ivdep
 #endif
 #ifdef KOKKOS_ENABLE_PRAGMA_VECTOR
-    #pragma vector always
+#pragma vector always
 #endif
 #ifdef KOKKOS_ENABLE_PRAGMA_LOOPCOUNT
-    #pragma loop count(128)
+#pragma loop count(128)
 #endif
 #ifndef KOKKOS_DEBUG
 #ifdef KOKKOS_ENABLE_PRAGMA_SIMD
-    #pragma simd
+#pragma simd
 #endif
 #endif
-    for ( int j = 0; j < length; j++ ) {
-      a( i, j ) += b( i, j );
+    for (int j = 0; j < length; j++) {
+      a(i, j) += b(i, j);
     }
   }
 };
 
-template< class DeviceType >
+template <class DeviceType>
 bool Test() {
-  typedef typename Kokkos::View< int**, DeviceType > type;
-  type a( "A", 1024, 128 );
-  type b( "B", 1024, 128 );
+  typedef typename Kokkos::View<int**, DeviceType> type;
+  type a("A", 1024, 128);
+  type b("B", 1024, 128);
 
-  AddFunctor< DeviceType > f( a, b );
-  Kokkos::parallel_for( 1024, f );
+  AddFunctor<DeviceType> f(a, b);
+  Kokkos::parallel_for(1024, f);
   DeviceType().fence();
 
   return true;
 }
 
-} // namespace TestCompilerMacros
+}  // namespace TestCompilerMacros
 
 namespace Test {
-TEST_F( TEST_CATEGORY, compiler_macros )
-{
-  ASSERT_TRUE( ( TestCompilerMacros::Test< TEST_EXECSPACE >() ) );
-}
+TEST(TEST_CATEGORY, compiler_macros) {
+  ASSERT_TRUE((TestCompilerMacros::Test<TEST_EXECSPACE>()));
 }
+}  // namespace Test
diff --git a/lib/kokkos/core/unit_test/TestComplex.hpp b/lib/kokkos/core/unit_test/TestComplex.hpp
index f4343df0ce..e049dcd175 100644
--- a/lib/kokkos/core/unit_test/TestComplex.hpp
+++ b/lib/kokkos/core/unit_test/TestComplex.hpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -41,57 +42,78 @@
 //@HEADER
 */
 
-#include<Kokkos_Core.hpp>
-#include<cstdio>
+#include <Kokkos_Core.hpp>
+#include <cstdio>
+#include <sstream>
 
 namespace Test {
 
 // Test construction and assignment
 
-template<class ExecSpace>
+template <class ExecSpace>
 struct TestComplexConstruction {
-  Kokkos::View<Kokkos::complex<double>*,ExecSpace> d_results;
-  typename Kokkos::View<Kokkos::complex<double>*,ExecSpace>::HostMirror h_results;
-  
-  void testit () {
-    d_results = Kokkos::View<Kokkos::complex<double>*,ExecSpace>("TestComplexConstruction",10);
+  Kokkos::View<Kokkos::complex<double> *, ExecSpace> d_results;
+  typename Kokkos::View<Kokkos::complex<double> *, ExecSpace>::HostMirror
+      h_results;
+
+  void testit() {
+    d_results = Kokkos::View<Kokkos::complex<double> *, ExecSpace>(
+        "TestComplexConstruction", 10);
     h_results = Kokkos::create_mirror_view(d_results);
-   
-    Kokkos::parallel_for(Kokkos::RangePolicy<ExecSpace>(0,1), *this);
+
+    Kokkos::parallel_for(Kokkos::RangePolicy<ExecSpace>(0, 1), *this);
     Kokkos::fence();
-    Kokkos::deep_copy(h_results,d_results);
+    Kokkos::deep_copy(h_results, d_results);
 
-    ASSERT_FLOAT_EQ(h_results(0).real(),1.5);  ASSERT_FLOAT_EQ(h_results(0).imag(),2.5);
-    ASSERT_FLOAT_EQ(h_results(1).real(),1.5);  ASSERT_FLOAT_EQ(h_results(1).imag(),2.5);
-    ASSERT_FLOAT_EQ(h_results(2).real(),0.0);  ASSERT_FLOAT_EQ(h_results(2).imag(),0.0);
-    ASSERT_FLOAT_EQ(h_results(3).real(),3.5);  ASSERT_FLOAT_EQ(h_results(3).imag(),0.0);
-    ASSERT_FLOAT_EQ(h_results(4).real(),4.5);  ASSERT_FLOAT_EQ(h_results(4).imag(),5.5);
-    ASSERT_FLOAT_EQ(h_results(5).real(),1.5);  ASSERT_FLOAT_EQ(h_results(5).imag(),2.5);
-    ASSERT_FLOAT_EQ(h_results(6).real(),4.5);  ASSERT_FLOAT_EQ(h_results(6).imag(),5.5);
-    ASSERT_FLOAT_EQ(h_results(7).real(),7.5);  ASSERT_FLOAT_EQ(h_results(7).imag(),0.0);
-    ASSERT_FLOAT_EQ(h_results(8).real(),double(8));  ASSERT_FLOAT_EQ(h_results(8).imag(),0.0);
+    ASSERT_FLOAT_EQ(h_results(0).real(), 1.5);
+    ASSERT_FLOAT_EQ(h_results(0).imag(), 2.5);
+    ASSERT_FLOAT_EQ(h_results(1).real(), 1.5);
+    ASSERT_FLOAT_EQ(h_results(1).imag(), 2.5);
+    ASSERT_FLOAT_EQ(h_results(2).real(), 0.0);
+    ASSERT_FLOAT_EQ(h_results(2).imag(), 0.0);
+    ASSERT_FLOAT_EQ(h_results(3).real(), 3.5);
+    ASSERT_FLOAT_EQ(h_results(3).imag(), 0.0);
+    ASSERT_FLOAT_EQ(h_results(4).real(), 4.5);
+    ASSERT_FLOAT_EQ(h_results(4).imag(), 5.5);
+    ASSERT_FLOAT_EQ(h_results(5).real(), 1.5);
+    ASSERT_FLOAT_EQ(h_results(5).imag(), 2.5);
+    ASSERT_FLOAT_EQ(h_results(6).real(), 4.5);
+    ASSERT_FLOAT_EQ(h_results(6).imag(), 5.5);
+    ASSERT_FLOAT_EQ(h_results(7).real(), 7.5);
+    ASSERT_FLOAT_EQ(h_results(7).imag(), 0.0);
+    ASSERT_FLOAT_EQ(h_results(8).real(), double(8));
+    ASSERT_FLOAT_EQ(h_results(8).imag(), 0.0);
 
-#ifndef KOKKOS_ENABLE_ROCM // Copy construction conversion between Kokkos::complex and std::complex doesn't compile
-    Kokkos::complex<double> a(1.5,2.5),b(3.25,5.25),r_kk;
-    std::complex<double> sa(a),sb(3.25,5.25),r;
-    r = a; r_kk = a;         ASSERT_FLOAT_EQ(r.real(),r_kk.real()); ASSERT_FLOAT_EQ(r.imag(),r_kk.imag());
-    r = sb*a; r_kk = b*a;    ASSERT_FLOAT_EQ(r.real(),r_kk.real()); ASSERT_FLOAT_EQ(r.imag(),r_kk.imag());
-    r = sa; r_kk = a;        ASSERT_FLOAT_EQ(r.real(),r_kk.real()); ASSERT_FLOAT_EQ(r.imag(),r_kk.imag());
+#ifndef KOKKOS_ENABLE_ROCM  // Copy construction conversion between
+                            // Kokkos::complex and std::complex doesn't compile
+    Kokkos::complex<double> a(1.5, 2.5), b(3.25, 5.25), r_kk;
+    std::complex<double> sa(a), sb(3.25, 5.25), r;
+    r    = a;
+    r_kk = a;
+    ASSERT_FLOAT_EQ(r.real(), r_kk.real());
+    ASSERT_FLOAT_EQ(r.imag(), r_kk.imag());
+    r    = sb * a;
+    r_kk = b * a;
+    ASSERT_FLOAT_EQ(r.real(), r_kk.real());
+    ASSERT_FLOAT_EQ(r.imag(), r_kk.imag());
+    r    = sa;
+    r_kk = a;
+    ASSERT_FLOAT_EQ(r.real(), r_kk.real());
+    ASSERT_FLOAT_EQ(r.imag(), r_kk.imag());
 #endif
-
   }
 
-  KOKKOS_INLINE_FUNCTION 
-  void operator() (const int &i ) const {
-    Kokkos::complex<double> a(1.5,2.5);
+  KOKKOS_INLINE_FUNCTION
+  void operator()(const int &i) const {
+    Kokkos::complex<double> a(1.5, 2.5);
     d_results(0) = a;
     Kokkos::complex<double> b(a);
-    d_results(1) = b;
+    d_results(1)              = b;
     Kokkos::complex<double> c = Kokkos::complex<double>();
-    d_results(2) = c;
+    d_results(2)              = c;
     Kokkos::complex<double> d(3.5);
-    d_results(3) = d; 
-    volatile Kokkos::complex<double> a_v(4.5,5.5);
+    d_results(3) = d;
+    volatile Kokkos::complex<double> a_v(4.5, 5.5);
     d_results(4) = a_v;
     volatile Kokkos::complex<double> b_v(a);
     d_results(5) = b_v;
@@ -100,164 +122,238 @@ struct TestComplexConstruction {
 
     d_results(7) = double(7.5);
     d_results(8) = int(8);
-  } 
+  }
 };
 
-TEST_F(TEST_CATEGORY, complex_construction) {
+TEST(TEST_CATEGORY, complex_construction) {
   TestComplexConstruction<TEST_EXECSPACE> test;
   test.testit();
-} 
+}
 
 // Test Math FUnction
 
-template<class ExecSpace>
+template <class ExecSpace>
 struct TestComplexBasicMath {
-  Kokkos::View<Kokkos::complex<double>*,ExecSpace> d_results;
-  typename Kokkos::View<Kokkos::complex<double>*,ExecSpace>::HostMirror h_results;
+  Kokkos::View<Kokkos::complex<double> *, ExecSpace> d_results;
+  typename Kokkos::View<Kokkos::complex<double> *, ExecSpace>::HostMirror
+      h_results;
 
-  void testit () {
-    d_results = Kokkos::View<Kokkos::complex<double>*,ExecSpace>("TestComplexBasicMath",24);
+  void testit() {
+    d_results = Kokkos::View<Kokkos::complex<double> *, ExecSpace>(
+        "TestComplexBasicMath", 24);
     h_results = Kokkos::create_mirror_view(d_results);
 
-    Kokkos::parallel_for(Kokkos::RangePolicy<ExecSpace>(0,1), *this);
+    Kokkos::parallel_for(Kokkos::RangePolicy<ExecSpace>(0, 1), *this);
     Kokkos::fence();
-    Kokkos::deep_copy(h_results,d_results);
+    Kokkos::deep_copy(h_results, d_results);
 
-    std::complex<double> a(1.5,2.5);
-    std::complex<double> b(3.25,5.75);
-    std::complex<double> d(1.0,2.0);
+    std::complex<double> a(1.5, 2.5);
+    std::complex<double> b(3.25, 5.75);
+    std::complex<double> d(1.0, 2.0);
     double c = 9.3;
-    int e = 2;
+    int e    = 2;
 
     std::complex<double> r;
-    r = a+b; ASSERT_FLOAT_EQ(h_results(0).real(),  r.real()); ASSERT_FLOAT_EQ(h_results(0).imag(),  r.imag());
-    r = a-b; ASSERT_FLOAT_EQ(h_results(1).real(),  r.real()); ASSERT_FLOAT_EQ(h_results(1).imag(),  r.imag());
-    r = a*b; ASSERT_FLOAT_EQ(h_results(2).real(),  r.real()); ASSERT_FLOAT_EQ(h_results(2).imag(),  r.imag());
-    r = a/b; ASSERT_FLOAT_EQ(h_results(3).real(),  r.real()); ASSERT_FLOAT_EQ(h_results(3).imag(),  r.imag());
-    r = d+a; ASSERT_FLOAT_EQ(h_results(4).real(),  r.real()); ASSERT_FLOAT_EQ(h_results(4).imag(),  r.imag());
-    r = d-a; ASSERT_FLOAT_EQ(h_results(5).real(),  r.real()); ASSERT_FLOAT_EQ(h_results(5).imag(),  r.imag());
-    r = d*a; ASSERT_FLOAT_EQ(h_results(6).real(),  r.real()); ASSERT_FLOAT_EQ(h_results(6).imag(),  r.imag());
-    r = d/a; ASSERT_FLOAT_EQ(h_results(7).real(),  r.real()); ASSERT_FLOAT_EQ(h_results(7).imag(),  r.imag());
-    r = a+c; ASSERT_FLOAT_EQ(h_results(8).real(),  r.real()); ASSERT_FLOAT_EQ(h_results(8).imag(),  r.imag());
-    r = a-c; ASSERT_FLOAT_EQ(h_results(9).real(),  r.real()); ASSERT_FLOAT_EQ(h_results(9).imag(),  r.imag());
-    r = a*c; ASSERT_FLOAT_EQ(h_results(10).real(), r.real()); ASSERT_FLOAT_EQ(h_results(10).imag(), r.imag());
-    r = a/c; ASSERT_FLOAT_EQ(h_results(11).real(), r.real()); ASSERT_FLOAT_EQ(h_results(11).imag(), r.imag());
-    r = d+c; ASSERT_FLOAT_EQ(h_results(12).real(), r.real()); ASSERT_FLOAT_EQ(h_results(12).imag(), r.imag());
-    r = d-c; ASSERT_FLOAT_EQ(h_results(13).real(), r.real()); ASSERT_FLOAT_EQ(h_results(13).imag(), r.imag());
-    r = d*c; ASSERT_FLOAT_EQ(h_results(14).real(), r.real()); ASSERT_FLOAT_EQ(h_results(14).imag(), r.imag());
-    r = d/c; ASSERT_FLOAT_EQ(h_results(15).real(), r.real()); ASSERT_FLOAT_EQ(h_results(15).imag(), r.imag());
-    r = c+a; ASSERT_FLOAT_EQ(h_results(16).real(), r.real()); ASSERT_FLOAT_EQ(h_results(16).imag(), r.imag());
-    r = c-a; ASSERT_FLOAT_EQ(h_results(17).real(), r.real()); ASSERT_FLOAT_EQ(h_results(17).imag(), r.imag());
-    r = c*a; ASSERT_FLOAT_EQ(h_results(18).real(), r.real()); ASSERT_FLOAT_EQ(h_results(18).imag(), r.imag());
-    r = c/a; ASSERT_FLOAT_EQ(h_results(19).real(), r.real()); ASSERT_FLOAT_EQ(h_results(19).imag(), r.imag());
+    r = a + b;
+    ASSERT_FLOAT_EQ(h_results(0).real(), r.real());
+    ASSERT_FLOAT_EQ(h_results(0).imag(), r.imag());
+    r = a - b;
+    ASSERT_FLOAT_EQ(h_results(1).real(), r.real());
+    ASSERT_FLOAT_EQ(h_results(1).imag(), r.imag());
+    r = a * b;
+    ASSERT_FLOAT_EQ(h_results(2).real(), r.real());
+    ASSERT_FLOAT_EQ(h_results(2).imag(), r.imag());
+    r = a / b;
+    ASSERT_FLOAT_EQ(h_results(3).real(), r.real());
+    ASSERT_FLOAT_EQ(h_results(3).imag(), r.imag());
+    r = d + a;
+    ASSERT_FLOAT_EQ(h_results(4).real(), r.real());
+    ASSERT_FLOAT_EQ(h_results(4).imag(), r.imag());
+    r = d - a;
+    ASSERT_FLOAT_EQ(h_results(5).real(), r.real());
+    ASSERT_FLOAT_EQ(h_results(5).imag(), r.imag());
+    r = d * a;
+    ASSERT_FLOAT_EQ(h_results(6).real(), r.real());
+    ASSERT_FLOAT_EQ(h_results(6).imag(), r.imag());
+    r = d / a;
+    ASSERT_FLOAT_EQ(h_results(7).real(), r.real());
+    ASSERT_FLOAT_EQ(h_results(7).imag(), r.imag());
+    r = a + c;
+    ASSERT_FLOAT_EQ(h_results(8).real(), r.real());
+    ASSERT_FLOAT_EQ(h_results(8).imag(), r.imag());
+    r = a - c;
+    ASSERT_FLOAT_EQ(h_results(9).real(), r.real());
+    ASSERT_FLOAT_EQ(h_results(9).imag(), r.imag());
+    r = a * c;
+    ASSERT_FLOAT_EQ(h_results(10).real(), r.real());
+    ASSERT_FLOAT_EQ(h_results(10).imag(), r.imag());
+    r = a / c;
+    ASSERT_FLOAT_EQ(h_results(11).real(), r.real());
+    ASSERT_FLOAT_EQ(h_results(11).imag(), r.imag());
+    r = d + c;
+    ASSERT_FLOAT_EQ(h_results(12).real(), r.real());
+    ASSERT_FLOAT_EQ(h_results(12).imag(), r.imag());
+    r = d - c;
+    ASSERT_FLOAT_EQ(h_results(13).real(), r.real());
+    ASSERT_FLOAT_EQ(h_results(13).imag(), r.imag());
+    r = d * c;
+    ASSERT_FLOAT_EQ(h_results(14).real(), r.real());
+    ASSERT_FLOAT_EQ(h_results(14).imag(), r.imag());
+    r = d / c;
+    ASSERT_FLOAT_EQ(h_results(15).real(), r.real());
+    ASSERT_FLOAT_EQ(h_results(15).imag(), r.imag());
+    r = c + a;
+    ASSERT_FLOAT_EQ(h_results(16).real(), r.real());
+    ASSERT_FLOAT_EQ(h_results(16).imag(), r.imag());
+    r = c - a;
+    ASSERT_FLOAT_EQ(h_results(17).real(), r.real());
+    ASSERT_FLOAT_EQ(h_results(17).imag(), r.imag());
+    r = c * a;
+    ASSERT_FLOAT_EQ(h_results(18).real(), r.real());
+    ASSERT_FLOAT_EQ(h_results(18).imag(), r.imag());
+    r = c / a;
+    ASSERT_FLOAT_EQ(h_results(19).real(), r.real());
+    ASSERT_FLOAT_EQ(h_results(19).imag(), r.imag());
 
-    r = a; 
-    /* r = a+e; */ ASSERT_FLOAT_EQ(h_results(20).real(),  r.real()+e); ASSERT_FLOAT_EQ(h_results(20).imag(),  r.imag());
-    /* r = a-e; */ ASSERT_FLOAT_EQ(h_results(21).real(),  r.real()-e); ASSERT_FLOAT_EQ(h_results(21).imag(),  r.imag());
-    /* r = a*e; */ ASSERT_FLOAT_EQ(h_results(22).real(),  r.real()*e); ASSERT_FLOAT_EQ(h_results(22).imag(),  r.imag()*e);
-    /* r = a/e; */ ASSERT_FLOAT_EQ(h_results(23).real(),  r.real()/2); ASSERT_FLOAT_EQ(h_results(23).imag(),  r.imag()/e);
+    r = a;
+    /* r = a+e; */ ASSERT_FLOAT_EQ(h_results(20).real(), r.real() + e);
+    ASSERT_FLOAT_EQ(h_results(20).imag(), r.imag());
+    /* r = a-e; */ ASSERT_FLOAT_EQ(h_results(21).real(), r.real() - e);
+    ASSERT_FLOAT_EQ(h_results(21).imag(), r.imag());
+    /* r = a*e; */ ASSERT_FLOAT_EQ(h_results(22).real(), r.real() * e);
+    ASSERT_FLOAT_EQ(h_results(22).imag(), r.imag() * e);
+    /* r = a/e; */ ASSERT_FLOAT_EQ(h_results(23).real(), r.real() / 2);
+    ASSERT_FLOAT_EQ(h_results(23).imag(), r.imag() / e);
   }
 
   KOKKOS_INLINE_FUNCTION
-  void operator() (const int &i ) const {
-    Kokkos::complex<double> a(1.5,2.5);
-    Kokkos::complex<double> b(3.25,5.75);
+  void operator()(const int &i) const {
+    Kokkos::complex<double> a(1.5, 2.5);
+    Kokkos::complex<double> b(3.25, 5.75);
     // Basic math complex / complex
-    d_results(0) = a+b;
-    d_results(1) = a-b;
-    d_results(2) = a*b;
-    d_results(3) = a/b;
+    d_results(0) = a + b;
+    d_results(1) = a - b;
+    d_results(2) = a * b;
+    d_results(3) = a / b;
     d_results(4).real(1.0);
     d_results(4).imag(2.0);
     d_results(4) += a;
-    d_results(5) = Kokkos::complex<double>(1.0,2.0);
+    d_results(5) = Kokkos::complex<double>(1.0, 2.0);
     d_results(5) -= a;
-    d_results(6) = Kokkos::complex<double>(1.0,2.0);
+    d_results(6) = Kokkos::complex<double>(1.0, 2.0);
     d_results(6) *= a;
-    d_results(7) = Kokkos::complex<double>(1.0,2.0);
+    d_results(7) = Kokkos::complex<double>(1.0, 2.0);
     d_results(7) /= a;
 
     // Basic math complex / scalar
-    double c = 9.3;
-    d_results(8) = a+c;
-    d_results(9) = a-c;
-    d_results(10) = a*c;
-    d_results(11) = a/c;
+    double c      = 9.3;
+    d_results(8)  = a + c;
+    d_results(9)  = a - c;
+    d_results(10) = a * c;
+    d_results(11) = a / c;
     d_results(12).real(1.0);
     d_results(12).imag(2.0);
     d_results(12) += c;
-    d_results(13) = Kokkos::complex<double>(1.0,2.0);
+    d_results(13) = Kokkos::complex<double>(1.0, 2.0);
     d_results(13) -= c;
-    d_results(14) = Kokkos::complex<double>(1.0,2.0);
+    d_results(14) = Kokkos::complex<double>(1.0, 2.0);
     d_results(14) *= c;
-    d_results(15) = Kokkos::complex<double>(1.0,2.0);
+    d_results(15) = Kokkos::complex<double>(1.0, 2.0);
     d_results(15) /= c;
 
-
     // Basic math scalar / complex
-    d_results(16) = c+a;
-    d_results(17) = c-a;
-    d_results(18) = c*a;
-    d_results(19) = c/a;
+    d_results(16) = c + a;
+    d_results(17) = c - a;
+    d_results(18) = c * a;
+    d_results(19) = c / a;
 
-    int e = 2;
-    d_results(20) = a+e;
-    d_results(21) = a-e;
-    d_results(22) = a*e;
-    d_results(23) = a/e;
+    int e         = 2;
+    d_results(20) = a + e;
+    d_results(21) = a - e;
+    d_results(22) = a * e;
+    d_results(23) = a / e;
   }
 };
 
-TEST_F(TEST_CATEGORY, complex_basic_math) {
+TEST(TEST_CATEGORY, complex_basic_math) {
   TestComplexBasicMath<TEST_EXECSPACE> test;
   test.testit();
 }
 
-
-template<class ExecSpace>
+template <class ExecSpace>
 struct TestComplexSpecialFunctions {
-  Kokkos::View<Kokkos::complex<double>*,ExecSpace> d_results;
-  typename Kokkos::View<Kokkos::complex<double>*,ExecSpace>::HostMirror h_results;
+  Kokkos::View<Kokkos::complex<double> *, ExecSpace> d_results;
+  typename Kokkos::View<Kokkos::complex<double> *, ExecSpace>::HostMirror
+      h_results;
 
-  void testit () {
-    d_results = Kokkos::View<Kokkos::complex<double>*,ExecSpace>("TestComplexSpecialFunctions",20);
+  void testit() {
+    d_results = Kokkos::View<Kokkos::complex<double> *, ExecSpace>(
+        "TestComplexSpecialFunctions", 20);
     h_results = Kokkos::create_mirror_view(d_results);
 
-    Kokkos::parallel_for(Kokkos::RangePolicy<ExecSpace>(0,1), *this);
+    Kokkos::parallel_for(Kokkos::RangePolicy<ExecSpace>(0, 1), *this);
     Kokkos::fence();
-    Kokkos::deep_copy(h_results,d_results);
+    Kokkos::deep_copy(h_results, d_results);
 
-    std::complex<double> a(1.5,2.5);
+    std::complex<double> a(1.5, 2.5);
     double c = 9.3;
 
     std::complex<double> r;
-    r = a;               ASSERT_FLOAT_EQ(h_results(0).real(),  r.real()); ASSERT_FLOAT_EQ(h_results(0).imag(),  r.imag());
-    r = std::sqrt(a);    ASSERT_FLOAT_EQ(h_results(1).real(),  r.real()); ASSERT_FLOAT_EQ(h_results(1).imag(),  r.imag());
-    r = std::pow(a,c);   ASSERT_FLOAT_EQ(h_results(2).real(),  r.real()); ASSERT_FLOAT_EQ(h_results(2).imag(),  r.imag());
-    r = std::abs(a);     ASSERT_FLOAT_EQ(h_results(3).real(),  r.real()); ASSERT_FLOAT_EQ(h_results(3).imag(),  r.imag());
-    r = std::exp(a);     ASSERT_FLOAT_EQ(h_results(4).real(),  r.real()); ASSERT_FLOAT_EQ(h_results(4).imag(),  r.imag());
-    r = Kokkos::exp(a);  ASSERT_FLOAT_EQ(h_results(4).real(),  r.real()); ASSERT_FLOAT_EQ(h_results(4).imag(),  r.imag());
+    r = a;
+    ASSERT_FLOAT_EQ(h_results(0).real(), r.real());
+    ASSERT_FLOAT_EQ(h_results(0).imag(), r.imag());
+    r = std::sqrt(a);
+    ASSERT_FLOAT_EQ(h_results(1).real(), r.real());
+    ASSERT_FLOAT_EQ(h_results(1).imag(), r.imag());
+    r = std::pow(a, c);
+    ASSERT_FLOAT_EQ(h_results(2).real(), r.real());
+    ASSERT_FLOAT_EQ(h_results(2).imag(), r.imag());
+    r = std::abs(a);
+    ASSERT_FLOAT_EQ(h_results(3).real(), r.real());
+    ASSERT_FLOAT_EQ(h_results(3).imag(), r.imag());
+    r = std::exp(a);
+    ASSERT_FLOAT_EQ(h_results(4).real(), r.real());
+    ASSERT_FLOAT_EQ(h_results(4).imag(), r.imag());
+    r = Kokkos::exp(a);
+    ASSERT_FLOAT_EQ(h_results(4).real(), r.real());
+    ASSERT_FLOAT_EQ(h_results(4).imag(), r.imag());
   }
 
   KOKKOS_INLINE_FUNCTION
-  void operator() (const int &i ) const {
-    Kokkos::complex<double> a(1.5,2.5);
-    Kokkos::complex<double> b(3.25,5.75);
+  void operator()(const int &i) const {
+    Kokkos::complex<double> a(1.5, 2.5);
+    Kokkos::complex<double> b(3.25, 5.75);
     double c = 9.3;
 
-    d_results(0) = Kokkos::complex<double>(Kokkos::real(a),Kokkos::imag(a));
+    d_results(0) = Kokkos::complex<double>(Kokkos::real(a), Kokkos::imag(a));
     d_results(1) = Kokkos::sqrt(a);
-    d_results(2) = Kokkos::pow(a,c);
+    d_results(2) = Kokkos::pow(a, c);
     d_results(3) = Kokkos::abs(a);
     d_results(4) = Kokkos::exp(a);
-
   }
 };
 
-TEST_F(TEST_CATEGORY, complex_special_funtions) {
+void testComplexIO() {
+  Kokkos::complex<double> z = {3.14, 1.41};
+  std::stringstream ss;
+  ss << z;
+  ASSERT_EQ(ss.str(), "(3.14,1.41)");
+
+  ss.str("1 (2) (3,4)");
+  ss.clear();
+  ss >> z;
+  ASSERT_EQ(z, (Kokkos::complex<double>{1, 0}));
+  ss >> z;
+  ASSERT_EQ(z, (Kokkos::complex<double>{2, 0}));
+  ss >> z;
+  ASSERT_EQ(z, (Kokkos::complex<double>{3, 4}));
+}
+
+TEST(TEST_CATEGORY, complex_special_funtions) {
   TestComplexSpecialFunctions<TEST_EXECSPACE> test;
   test.testit();
 }
-} // namespace Test
 
+TEST(TEST_CATEGORY, complex_io) { testComplexIO(); }
 
+}  // namespace Test
diff --git a/lib/kokkos/core/unit_test/TestConcurrentBitset.hpp b/lib/kokkos/core/unit_test/TestConcurrentBitset.hpp
index f479998ede..db451495b4 100644
--- a/lib/kokkos/core/unit_test/TestConcurrentBitset.hpp
+++ b/lib/kokkos/core/unit_test/TestConcurrentBitset.hpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -54,124 +55,115 @@
 
 namespace Test {
 
-template< class DeviceType >
+template <class DeviceType>
 struct ConcurrentBitset {
+  typedef Kokkos::View<uint32_t*, DeviceType> view_unsigned_type;
+  typedef Kokkos::View<int*, DeviceType> view_int_type;
 
-  typedef Kokkos::View<uint32_t*,DeviceType> view_unsigned_type ;
-  typedef Kokkos::View<int*,DeviceType>      view_int_type ;
+  view_unsigned_type bitset;
+  view_int_type acquired;
+  uint32_t bitset_count_lg2;
+  uint32_t bitset_count_mask;
 
-  view_unsigned_type  bitset ;
-  view_int_type       acquired ;
-  uint32_t            bitset_count_lg2 ;
-  uint32_t            bitset_count_mask ;
-
-  ConcurrentBitset( const uint32_t arg_bitset_count_lg2
-                  , const view_unsigned_type & arg_bitset
-                  , const view_int_type & arg_acquired )
-    : bitset( arg_bitset ), acquired( arg_acquired )
-    , bitset_count_lg2( arg_bitset_count_lg2 )
-    , bitset_count_mask( uint32_t( 1u << arg_bitset_count_lg2 ) - 1 )
-    {}
+  ConcurrentBitset(const uint32_t arg_bitset_count_lg2,
+                   const view_unsigned_type& arg_bitset,
+                   const view_int_type& arg_acquired)
+      : bitset(arg_bitset),
+        acquired(arg_acquired),
+        bitset_count_lg2(arg_bitset_count_lg2),
+        bitset_count_mask(uint32_t(1u << arg_bitset_count_lg2) - 1) {}
 
   struct TagAcquire {};
   struct TagRelease {};
   struct TagReacquire {};
 
   KOKKOS_INLINE_FUNCTION
-  void operator()( TagAcquire , int i , long & update ) const
-    {
-      unsigned hint = Kokkos::Impl::clock_tic() & bitset_count_mask ;
+  void operator()(TagAcquire, int i, long& update) const {
+    unsigned hint = Kokkos::Impl::clock_tic() & bitset_count_mask;
 
-      Kokkos::pair<int,int> result =
-        Kokkos::Impl::concurrent_bitset::acquire_bounded_lg2
-          ( bitset.data() , bitset_count_lg2 , hint );
+    Kokkos::pair<int, int> result =
+        Kokkos::Impl::concurrent_bitset::acquire_bounded_lg2(
+            bitset.data(), bitset_count_lg2, hint);
 
-      acquired(i) = result.first ;
+    acquired(i) = result.first;
 
-      if ( 0 <= result.first ) ++update ;
-    }
+    if (0 <= result.first) ++update;
+  }
 
   KOKKOS_INLINE_FUNCTION
-  void operator()( TagRelease , int i , long & update ) const
-    {
-      if ( 0 == ( i % 3 ) && 0 <= acquired(i) ) {
-        Kokkos::Impl::concurrent_bitset::release( bitset.data() , acquired(i) );
-        acquired(i) = -1 ;
-        ++update ;
-      }
+  void operator()(TagRelease, int i, long& update) const {
+    if (0 == (i % 3) && 0 <= acquired(i)) {
+      Kokkos::Impl::concurrent_bitset::release(bitset.data(), acquired(i));
+      acquired(i) = -1;
+      ++update;
     }
+  }
 
   KOKKOS_INLINE_FUNCTION
-  void operator()( TagReacquire , int i , long & update ) const
-    {
-      if ( acquired(i) < 0 ) {
+  void operator()(TagReacquire, int i, long& update) const {
+    if (acquired(i) < 0) {
+      unsigned hint = Kokkos::Impl::clock_tic() & bitset_count_mask;
 
-        unsigned hint = Kokkos::Impl::clock_tic() & bitset_count_mask ;
+      Kokkos::pair<int, int> result =
+          Kokkos::Impl::concurrent_bitset::acquire_bounded_lg2(
+              bitset.data(), bitset_count_lg2, hint);
 
-        Kokkos::pair<int,int> result  = Kokkos::Impl::concurrent_bitset::acquire_bounded_lg2
-            ( bitset.data() , bitset_count_lg2 , hint );
+      acquired(i) = result.first;
 
-        acquired(i) = result.first ;
-
-        if ( 0 <= result.first ) ++update ;
-      }
+      if (0 <= result.first) ++update;
     }
+  }
 };
 
-template< class DeviceType >
-void test_concurrent_bitset( int bit_count )
-{
-  typedef ConcurrentBitset< DeviceType > Functor ;
-  typedef typename Functor::view_unsigned_type view_unsigned_type ;
-  typedef typename Functor::view_int_type      view_int_type ;
+template <class DeviceType>
+void test_concurrent_bitset(int bit_count) {
+  typedef ConcurrentBitset<DeviceType> Functor;
+  typedef typename Functor::view_unsigned_type view_unsigned_type;
+  typedef typename Functor::view_int_type view_int_type;
 
-  int bit_count_lg2 = 1 ;
+  int bit_count_lg2 = 1;
 
-  while ( ( 1 << bit_count_lg2 ) < bit_count ) ++bit_count_lg2 ;
+  while ((1 << bit_count_lg2) < bit_count) ++bit_count_lg2;
 
-  bit_count = 1 << bit_count_lg2 ;
+  bit_count = 1 << bit_count_lg2;
 
   const int buffer_length =
-    Kokkos::Impl::concurrent_bitset::buffer_bound_lg2(bit_count_lg2);
+      Kokkos::Impl::concurrent_bitset::buffer_bound_lg2(bit_count_lg2);
 
-  view_unsigned_type bitset("bitset",buffer_length);
+  view_unsigned_type bitset("bitset", buffer_length);
 
   // Try to acquire more than available:
 
-  const size_t n = ( bit_count * 3 ) / 2 ;
+  const size_t n = (bit_count * 3) / 2;
 
-  view_int_type acquired("acquired", n );
+  view_int_type acquired("acquired", n);
 
   typename view_unsigned_type::HostMirror bitset_host =
-    Kokkos::create_mirror_view( bitset );
+      Kokkos::create_mirror_view(bitset);
 
-  Kokkos::deep_copy( bitset , 0u );
+  Kokkos::deep_copy(bitset, 0u);
 
-  long total = 0 ;
-  long total_release = 0 ;
-  long total_reacquire = 0 ;
+  long total           = 0;
+  long total_release   = 0;
+  long total_reacquire = 0;
 
-  Kokkos::parallel_reduce
-    ( Kokkos::RangePolicy< DeviceType , typename Functor::TagAcquire >(0,n)
-    , Functor( bit_count_lg2 , bitset , acquired )
-    , total );
+  Kokkos::parallel_reduce(
+      Kokkos::RangePolicy<DeviceType, typename Functor::TagAcquire>(0, n),
+      Functor(bit_count_lg2, bitset, acquired), total);
 
-  ASSERT_EQ( bit_count , total );
+  ASSERT_EQ(bit_count, total);
 
-  Kokkos::parallel_reduce
-    ( Kokkos::RangePolicy< DeviceType , typename Functor::TagRelease >(0,n)
-    , Functor( bit_count_lg2 , bitset , acquired )
-    , total_release );
+  Kokkos::parallel_reduce(
+      Kokkos::RangePolicy<DeviceType, typename Functor::TagRelease>(0, n),
+      Functor(bit_count_lg2, bitset, acquired), total_release);
 
-  Kokkos::parallel_reduce
-    ( Kokkos::RangePolicy< DeviceType , typename Functor::TagReacquire >(0,n)
-    , Functor( bit_count_lg2 , bitset , acquired )
-    , total_reacquire );
-
-  ASSERT_EQ( total_release , total_reacquire );
+  Kokkos::parallel_reduce(
+      Kokkos::RangePolicy<DeviceType, typename Functor::TagReacquire>(0, n),
+      Functor(bit_count_lg2, bitset, acquired), total_reacquire);
 
+  ASSERT_EQ(total_release, total_reacquire);
 }
 
-} // namespace Test
+}  // namespace Test
 
 #endif /* #ifndef TEST_CONCURRENTBITSET_HPP */
diff --git a/lib/kokkos/core/unit_test/TestCrs.hpp b/lib/kokkos/core/unit_test/TestCrs.hpp
index 08087ae062..5807109601 100644
--- a/lib/kokkos/core/unit_test/TestCrs.hpp
+++ b/lib/kokkos/core/unit_test/TestCrs.hpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -49,10 +50,10 @@ namespace Test {
 
 namespace {
 
-template< class ExecSpace >
+template <class ExecSpace>
 struct CountFillFunctor {
   KOKKOS_INLINE_FUNCTION
-  std::int32_t operator()(std::int32_t row, std::int32_t* fill) const {
+  std::int32_t operator()(std::int32_t row, std::int32_t *fill) const {
     auto n = (row % 4) + 1;
     if (fill) {
       for (std::int32_t j = 0; j < n; ++j) {
@@ -65,85 +66,92 @@ struct CountFillFunctor {
 
 /* RunUpdateCrsTest
  *   4 test cases:
- *     1. use member object version which is constructed directly using the copy constructor
+ *     1. use member object version which is constructed directly using the copy
+ * constructor
  *     2. excplicity copy construct in local variable
  *     3. construct default and assign to input object
  *     4. construct object from views
  */
-template< class CrsType, class ExecSpace, class scalarType >
+template <class CrsType, class ExecSpace, class scalarType>
 struct RunUpdateCrsTest {
-
   struct TestOne {};
   struct TestTwo {};
   struct TestThree {};
   struct TestFour {};
 
   CrsType graph;
-  RunUpdateCrsTest( CrsType g_in ) : graph(g_in)
-  {
-  }
+  RunUpdateCrsTest(CrsType g_in) : graph(g_in) {}
 
   void run_test(int nTest) {
-     switch (nTest)
-     {
-        case 1:
-           parallel_for ("TestCrs1", Kokkos::RangePolicy<ExecSpace, TestOne>(0,graph.numRows()),*this);
-           break;
-        case 2:
-           parallel_for ("TestCrs2", Kokkos::RangePolicy<ExecSpace, TestTwo>(0,graph.numRows()),*this);
-           break;
-        case 3:
-           parallel_for ("TestCrs3", Kokkos::RangePolicy<ExecSpace, TestThree>(0,graph.numRows()),*this);
-           break;
-        case 4:
-           parallel_for ("TestCrs4", Kokkos::RangePolicy<ExecSpace, TestFour>(0,graph.numRows()),*this);
-           break;
-        default:
-           break;
-     }
+    switch (nTest) {
+      case 1:
+        parallel_for(
+            "TestCrs1",
+            Kokkos::RangePolicy<ExecSpace, TestOne>(0, graph.numRows()), *this);
+        break;
+      case 2:
+        parallel_for(
+            "TestCrs2",
+            Kokkos::RangePolicy<ExecSpace, TestTwo>(0, graph.numRows()), *this);
+        break;
+      case 3:
+        parallel_for(
+            "TestCrs3",
+            Kokkos::RangePolicy<ExecSpace, TestThree>(0, graph.numRows()),
+            *this);
+        break;
+      case 4:
+        parallel_for(
+            "TestCrs4",
+            Kokkos::RangePolicy<ExecSpace, TestFour>(0, graph.numRows()),
+            *this);
+        break;
+      default: break;
+    }
   }
 
   KOKKOS_INLINE_FUNCTION
-  void updateGraph(const CrsType & g_in, const scalarType row) const {
-     auto row_map = g_in.row_map;
-     auto entries = g_in.entries;
-     auto j_start = row_map(row);
-     auto j_end = row_map(row+1)-j_start;
-     for (scalarType j = 0; j < j_end; ++j) {
-        entries(j_start+j) = (j+1)*(j+1);
-     }
+  void updateGraph(const CrsType &g_in, const scalarType row) const {
+    auto row_map = g_in.row_map;
+    auto entries = g_in.entries;
+    auto j_start = row_map(row);
+    auto j_end   = row_map(row + 1) - j_start;
+    for (scalarType j = 0; j < j_end; ++j) {
+      entries(j_start + j) = (j + 1) * (j + 1);
+    }
   }
 
   // Test Crs class from class member
   KOKKOS_INLINE_FUNCTION
   void operator()(const TestOne &, const scalarType row) const {
-      updateGraph(graph, row);
+    updateGraph(graph, row);
   }
 
   // Test Crs class from copy constructor (local_graph(graph)
   KOKKOS_INLINE_FUNCTION
   void operator()(const TestTwo &, const scalarType row) const {
-      CrsType local_graph(graph);
-      updateGraph(local_graph, row);
+    CrsType local_graph(graph);
+    updateGraph(local_graph, row);
   }
 
   // Test Crs class from default constructor assigned to function parameter
   KOKKOS_INLINE_FUNCTION
   void operator()(const TestThree &, const scalarType row) const {
-      CrsType local_graph;
-      local_graph = graph;
-      updateGraph(local_graph, row);
+    CrsType local_graph;
+    local_graph = graph;
+    updateGraph(local_graph, row);
   }
 
-  // Test Crs class from local graph constructed from row_map and entities access on input parameter)
+  // Test Crs class from local graph constructed from row_map and entities
+  // access on input parameter)
   KOKKOS_INLINE_FUNCTION
   void operator()(const TestFour &, const scalarType row) const {
-      CrsType local_graph(graph.row_map, graph.entries);
-      updateGraph(local_graph, row);
+    CrsType local_graph(graph.row_map, graph.entries);
+    updateGraph(local_graph, row);
   }
 };
 
-template< class ExecSpace >
+template <class ExecSpace>
 void test_count_fill(std::int32_t nrows) {
   Kokkos::Crs<std::int32_t, ExecSpace, void, std::int32_t> graph;
   Kokkos::count_and_fill_crs(graph, nrows, CountFillFunctor<ExecSpace>());
@@ -161,42 +169,39 @@ void test_count_fill(std::int32_t nrows) {
   }
 }
 
-// Test Crs Constructor / assignment operation by 
+// Test Crs Constructor / assignment operation by
 // using count and fill to create/populate initial graph,
 // then use parallel_for with Crs directly to update content
 // then verify results
-template< class ExecSpace >
+template <class ExecSpace>
 void test_constructor(std::int32_t nrows) {
+  for (int nTest = 1; nTest < 5; nTest++) {
+    typedef Kokkos::Crs<std::int32_t, ExecSpace, void, std::int32_t> crs_int32;
+    crs_int32 graph;
+    Kokkos::count_and_fill_crs(graph, nrows, CountFillFunctor<ExecSpace>());
+    ASSERT_EQ(graph.numRows(), nrows);
 
-  for (int nTest = 1; nTest < 5; nTest++)
-  {
-     typedef Kokkos::Crs<std::int32_t, ExecSpace, void, std::int32_t> crs_int32;
-     crs_int32 graph;
-     Kokkos::count_and_fill_crs(graph, nrows, CountFillFunctor<ExecSpace>());
-     ASSERT_EQ(graph.numRows(), nrows);
+    RunUpdateCrsTest<crs_int32, ExecSpace, std::int32_t> crstest(graph);
+    crstest.run_test(nTest);
 
-     RunUpdateCrsTest<crs_int32, ExecSpace, std::int32_t> crstest(graph);
-     crstest.run_test(nTest);
+    auto row_map = Kokkos::create_mirror_view(graph.row_map);
+    Kokkos::deep_copy(row_map, graph.row_map);
+    auto entries = Kokkos::create_mirror_view(graph.entries);
+    Kokkos::deep_copy(entries, graph.entries);
 
-     auto row_map = Kokkos::create_mirror_view(graph.row_map);
-     Kokkos::deep_copy(row_map, graph.row_map);
-     auto entries = Kokkos::create_mirror_view(graph.entries);
-     Kokkos::deep_copy(entries, graph.entries);
-
-     for (std::int32_t row = 0; row < nrows; ++row) {
-       auto n = (row % 4) + 1;
-       ASSERT_EQ(row_map(row + 1) - row_map(row), n);    
-       for (std::int32_t j = 0; j < n; ++j) {
-         ASSERT_EQ(entries(row_map(row) + j), (j + 1)*(j+1));
-       }
-     }
+    for (std::int32_t row = 0; row < nrows; ++row) {
+      auto n = (row % 4) + 1;
+      ASSERT_EQ(row_map(row + 1) - row_map(row), n);
+      for (std::int32_t j = 0; j < n; ++j) {
+        ASSERT_EQ(entries(row_map(row) + j), (j + 1) * (j + 1));
+      }
+    }
   }
 }
 
-} // anonymous namespace
+}  // anonymous namespace
 
-TEST_F( TEST_CATEGORY, crs_count_fill )
-{
+TEST(TEST_CATEGORY, crs_count_fill) {
   test_count_fill<TEST_EXECSPACE>(0);
   test_count_fill<TEST_EXECSPACE>(1);
   test_count_fill<TEST_EXECSPACE>(2);
@@ -207,8 +212,7 @@ TEST_F( TEST_CATEGORY, crs_count_fill )
   test_count_fill<TEST_EXECSPACE>(10000);
 }
 
-TEST_F( TEST_CATEGORY, crs_copy_constructor )
-{
+TEST(TEST_CATEGORY, crs_copy_constructor) {
   test_constructor<TEST_EXECSPACE>(0);
   test_constructor<TEST_EXECSPACE>(1);
   test_constructor<TEST_EXECSPACE>(2);
@@ -219,5 +223,4 @@ TEST_F( TEST_CATEGORY, crs_copy_constructor )
   test_constructor<TEST_EXECSPACE>(10000);
 }
 
-
-} // namespace Test
+}  // namespace Test
diff --git a/lib/kokkos/core/unit_test/TestDeepCopy.hpp b/lib/kokkos/core/unit_test/TestDeepCopy.hpp
index aebf263290..a7e80cef36 100644
--- a/lib/kokkos/core/unit_test/TestDeepCopy.hpp
+++ b/lib/kokkos/core/unit_test/TestDeepCopy.hpp
@@ -1,11 +1,10 @@
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 
 namespace Test {
 
 namespace Impl {
-template<class MemorySpaceA, class MemorySpaceB>
+template <class MemorySpaceA, class MemorySpaceB>
 struct TestDeepCopy {
-
   typedef Kokkos::View<double*, Kokkos::LayoutRight, MemorySpaceA> a_base_t;
   typedef Kokkos::View<double*, Kokkos::LayoutRight, MemorySpaceB> b_base_t;
   typedef Kokkos::View<char*, Kokkos::LayoutRight, MemorySpaceA> a_char_t;
@@ -14,59 +13,76 @@ struct TestDeepCopy {
   typedef Kokkos::RangePolicy<typename MemorySpaceA::execution_space> policyA_t;
   typedef Kokkos::RangePolicy<typename MemorySpaceB::execution_space> policyB_t;
 
-  static void reset_a_copy_and_b(Kokkos::View<char*, Kokkos::LayoutRight, MemorySpaceA> a_char_copy, Kokkos::View<char*, Kokkos::LayoutRight, MemorySpaceB> b_char) {
+  static void reset_a_copy_and_b(
+      Kokkos::View<char*, Kokkos::LayoutRight, MemorySpaceA> a_char_copy,
+      Kokkos::View<char*, Kokkos::LayoutRight, MemorySpaceB> b_char) {
     const int N = b_char.extent(0);
-    Kokkos::parallel_for("TestDeepCopy: FillA_copy",policyA_t(0,N), KOKKOS_LAMBDA (const int& i) {
-      a_char_copy(i) = char(0);
-    });
-    Kokkos::parallel_for("TestDeepCopy: FillB",policyB_t(0,N), KOKKOS_LAMBDA (const int& i) {
-      b_char(i) = char(0);
-    });
+    Kokkos::parallel_for(
+        "TestDeepCopy: FillA_copy", policyA_t(0, N),
+        KOKKOS_LAMBDA(const int& i) { a_char_copy(i) = char(0); });
+    Kokkos::parallel_for(
+        "TestDeepCopy: FillB", policyB_t(0, N),
+        KOKKOS_LAMBDA(const int& i) { b_char(i) = char(0); });
   }
 
-  static int compare_equal(Kokkos::View<char*, Kokkos::LayoutRight, MemorySpaceA> a_char_copy, Kokkos::View<char*, Kokkos::LayoutRight, MemorySpaceA> a_char) {
+  static int compare_equal(
+      Kokkos::View<char*, Kokkos::LayoutRight, MemorySpaceA> a_char_copy,
+      Kokkos::View<char*, Kokkos::LayoutRight, MemorySpaceA> a_char) {
     const int N = a_char.extent(0);
     int errors;
-    Kokkos::parallel_reduce("TestDeepCopy: FillA_copy",policyA_t(0,N), KOKKOS_LAMBDA (const int& i, int& lsum) {
-      if(a_char_copy(i) != a_char(i)) lsum++;
-    },errors);
+    Kokkos::parallel_reduce(
+        "TestDeepCopy: FillA_copy", policyA_t(0, N),
+        KOKKOS_LAMBDA(const int& i, int& lsum) {
+          if (a_char_copy(i) != a_char(i)) lsum++;
+        },
+        errors);
     return errors;
   }
 
   static void run_test(int num_bytes) {
-    a_base_t a_base("test_space_to_space",(num_bytes+128)/8);
-    a_base_t a_base_copy("test_space_to_space",(num_bytes+128)/8);
-    Kokkos::View<double*, Kokkos::LayoutRight, MemorySpaceB> b_base("test_space_to_space",(num_bytes+128)/8);
-    
-    Kokkos::View<char*, Kokkos::LayoutRight, MemorySpaceA> a_char((char*) a_base.data(),a_base.extent(0)*8);
-    Kokkos::View<char*, Kokkos::LayoutRight, MemorySpaceA> a_char_copy((char*) a_base_copy.data(),a_base.extent(0)*8);
-    Kokkos::View<char*, Kokkos::LayoutRight, MemorySpaceB> b_char((char*) b_base.data(),b_base.extent(0)*8);
+    a_base_t a_base("test_space_to_space", (num_bytes + 128) / 8);
+    a_base_t a_base_copy("test_space_to_space", (num_bytes + 128) / 8);
+    Kokkos::View<double*, Kokkos::LayoutRight, MemorySpaceB> b_base(
+        "test_space_to_space", (num_bytes + 128) / 8);
 
-    Kokkos::parallel_for("TestDeepCopy: FillA",policyA_t(0,a_char.extent(0)), KOKKOS_LAMBDA (const int& i) {
-      a_char(i) = static_cast<char>(i%97)+1;
-    });
+    Kokkos::View<char*, Kokkos::LayoutRight, MemorySpaceA> a_char(
+        (char*)a_base.data(), a_base.extent(0) * 8);
+    Kokkos::View<char*, Kokkos::LayoutRight, MemorySpaceA> a_char_copy(
+        (char*)a_base_copy.data(), a_base.extent(0) * 8);
+    Kokkos::View<char*, Kokkos::LayoutRight, MemorySpaceB> b_char(
+        (char*)b_base.data(), b_base.extent(0) * 8);
+
+    Kokkos::parallel_for(
+        "TestDeepCopy: FillA", policyA_t(0, a_char.extent(0)),
+        KOKKOS_LAMBDA(const int& i) {
+          a_char(i) = static_cast<char>(i % 97) + 1;
+        });
 
     reset_a_copy_and_b(a_char_copy, b_char);
 
     {
-      int check = compare_equal(a_char_copy,a_char);
-      ASSERT_EQ( check, a_char.extent(0) );
+      int check = compare_equal(a_char_copy, a_char);
+      ASSERT_EQ(check, a_char.extent(0));
     }
 
-    // (a.data()%8, (a.data()+a.extent(0))%8, b.data()%8, (b.data()+b.extent(0))%8
-    // (0,0,0,0) 
+    // (a.data()%8, (a.data()+a.extent(0))%8, b.data()%8,
+    // (b.data()+b.extent(0))%8 (0,0,0,0)
     {
       int a_begin = 0;
       int a_end   = 0;
       int b_begin = 0;
       int b_end   = 0;
-      auto a = Kokkos::subview(a_char,std::pair<int,int>(a_begin,a_char.extent(0)-a_end));
-      auto b = Kokkos::subview(b_char,std::pair<int,int>(b_begin,b_char.extent(0)-b_end));
-      auto a_copy = Kokkos::subview(a_char_copy,std::pair<int,int>(a_begin,a_char_copy.extent(0)-a_end));
-      Kokkos::deep_copy(b,a);
-      Kokkos::deep_copy(a_copy,b);
-      int check = compare_equal(a_copy,a);
-      ASSERT_EQ( check, 0 );
+      auto a      = Kokkos::subview(
+          a_char, std::pair<int, int>(a_begin, a_char.extent(0) - a_end));
+      auto b = Kokkos::subview(
+          b_char, std::pair<int, int>(b_begin, b_char.extent(0) - b_end));
+      auto a_copy = Kokkos::subview(
+          a_char_copy,
+          std::pair<int, int>(a_begin, a_char_copy.extent(0) - a_end));
+      Kokkos::deep_copy(b, a);
+      Kokkos::deep_copy(a_copy, b);
+      int check = compare_equal(a_copy, a);
+      ASSERT_EQ(check, 0);
     }
 
     {
@@ -74,27 +90,35 @@ struct TestDeepCopy {
       int a_end   = 5;
       int b_begin = 0;
       int b_end   = 5;
-      auto a = Kokkos::subview(a_char,std::pair<int,int>(a_begin,a_char.extent(0)-a_end));
-      auto b = Kokkos::subview(b_char,std::pair<int,int>(b_begin,b_char.extent(0)-b_end));
-      auto a_copy = Kokkos::subview(a_char_copy,std::pair<int,int>(a_begin,a_char_copy.extent(0)-a_end));
-      Kokkos::deep_copy(b,a);
-      Kokkos::deep_copy(a_copy,b);
-      int check = compare_equal(a_copy,a);
-      ASSERT_EQ( check, 0 );
+      auto a      = Kokkos::subview(
+          a_char, std::pair<int, int>(a_begin, a_char.extent(0) - a_end));
+      auto b = Kokkos::subview(
+          b_char, std::pair<int, int>(b_begin, b_char.extent(0) - b_end));
+      auto a_copy = Kokkos::subview(
+          a_char_copy,
+          std::pair<int, int>(a_begin, a_char_copy.extent(0) - a_end));
+      Kokkos::deep_copy(b, a);
+      Kokkos::deep_copy(a_copy, b);
+      int check = compare_equal(a_copy, a);
+      ASSERT_EQ(check, 0);
     }
-    
+
     {
       int a_begin = 3;
       int a_end   = 0;
       int b_begin = 3;
       int b_end   = 0;
-      auto a = Kokkos::subview(a_char,std::pair<int,int>(a_begin,a_char.extent(0)-a_end));
-      auto b = Kokkos::subview(b_char,std::pair<int,int>(b_begin,b_char.extent(0)-b_end));
-      auto a_copy = Kokkos::subview(a_char_copy,std::pair<int,int>(a_begin,a_char_copy.extent(0)-a_end));
-      Kokkos::deep_copy(b,a);
-      Kokkos::deep_copy(a_copy,b);
-      int check = compare_equal(a_copy,a);
-      ASSERT_EQ( check, 0 );
+      auto a      = Kokkos::subview(
+          a_char, std::pair<int, int>(a_begin, a_char.extent(0) - a_end));
+      auto b = Kokkos::subview(
+          b_char, std::pair<int, int>(b_begin, b_char.extent(0) - b_end));
+      auto a_copy = Kokkos::subview(
+          a_char_copy,
+          std::pair<int, int>(a_begin, a_char_copy.extent(0) - a_end));
+      Kokkos::deep_copy(b, a);
+      Kokkos::deep_copy(a_copy, b);
+      int check = compare_equal(a_copy, a);
+      ASSERT_EQ(check, 0);
     }
 
     {
@@ -102,13 +126,17 @@ struct TestDeepCopy {
       int a_end   = 6;
       int b_begin = 3;
       int b_end   = 6;
-      auto a = Kokkos::subview(a_char,std::pair<int,int>(a_begin,a_char.extent(0)-a_end));
-      auto b = Kokkos::subview(b_char,std::pair<int,int>(b_begin,b_char.extent(0)-b_end));
-      auto a_copy = Kokkos::subview(a_char_copy,std::pair<int,int>(a_begin,a_char_copy.extent(0)-a_end));
-      Kokkos::deep_copy(b,a);
-      Kokkos::deep_copy(a_copy,b);
-      int check = compare_equal(a_copy,a);
-      ASSERT_EQ( check, 0 );
+      auto a      = Kokkos::subview(
+          a_char, std::pair<int, int>(a_begin, a_char.extent(0) - a_end));
+      auto b = Kokkos::subview(
+          b_char, std::pair<int, int>(b_begin, b_char.extent(0) - b_end));
+      auto a_copy = Kokkos::subview(
+          a_char_copy,
+          std::pair<int, int>(a_begin, a_char_copy.extent(0) - a_end));
+      Kokkos::deep_copy(b, a);
+      Kokkos::deep_copy(a_copy, b);
+      int check = compare_equal(a_copy, a);
+      ASSERT_EQ(check, 0);
     }
 
     {
@@ -116,13 +144,17 @@ struct TestDeepCopy {
       int a_end   = 4;
       int b_begin = 3;
       int b_end   = 6;
-      auto a = Kokkos::subview(a_char,std::pair<int,int>(a_begin,a_char.extent(0)-a_end));
-      auto b = Kokkos::subview(b_char,std::pair<int,int>(b_begin,b_char.extent(0)-b_end));
-      auto a_copy = Kokkos::subview(a_char_copy,std::pair<int,int>(a_begin,a_char_copy.extent(0)-a_end));
-      Kokkos::deep_copy(b,a);
-      Kokkos::deep_copy(a_copy,b);
-      int check = compare_equal(a_copy,a);
-      ASSERT_EQ( check, 0 );
+      auto a      = Kokkos::subview(
+          a_char, std::pair<int, int>(a_begin, a_char.extent(0) - a_end));
+      auto b = Kokkos::subview(
+          b_char, std::pair<int, int>(b_begin, b_char.extent(0) - b_end));
+      auto a_copy = Kokkos::subview(
+          a_char_copy,
+          std::pair<int, int>(a_begin, a_char_copy.extent(0) - a_end));
+      Kokkos::deep_copy(b, a);
+      Kokkos::deep_copy(a_copy, b);
+      int check = compare_equal(a_copy, a);
+      ASSERT_EQ(check, 0);
     }
 
     {
@@ -130,38 +162,53 @@ struct TestDeepCopy {
       int a_end   = 8;
       int b_begin = 2;
       int b_end   = 6;
-      auto a = Kokkos::subview(a_char,std::pair<int,int>(a_begin,a_char.extent(0)-a_end));
-      auto b = Kokkos::subview(b_char,std::pair<int,int>(b_begin,b_char.extent(0)-b_end));
-      auto a_copy = Kokkos::subview(a_char_copy,std::pair<int,int>(a_begin,a_char_copy.extent(0)-a_end));
-      Kokkos::deep_copy(b,a);
-      Kokkos::deep_copy(a_copy,b);
-      int check = compare_equal(a_copy,a);
-      ASSERT_EQ( check, 0 );
+      auto a      = Kokkos::subview(
+          a_char, std::pair<int, int>(a_begin, a_char.extent(0) - a_end));
+      auto b = Kokkos::subview(
+          b_char, std::pair<int, int>(b_begin, b_char.extent(0) - b_end));
+      auto a_copy = Kokkos::subview(
+          a_char_copy,
+          std::pair<int, int>(a_begin, a_char_copy.extent(0) - a_end));
+      Kokkos::deep_copy(b, a);
+      Kokkos::deep_copy(a_copy, b);
+      int check = compare_equal(a_copy, a);
+      ASSERT_EQ(check, 0);
     }
-     
+
     {
       int a_begin = 2;
       int a_end   = 6;
       int b_begin = 0;
       int b_end   = 8;
-      auto a = Kokkos::subview(a_char,std::pair<int,int>(a_begin,a_char.extent(0)-a_end));
-      auto b = Kokkos::subview(b_char,std::pair<int,int>(b_begin,b_char.extent(0)-b_end));
-      auto a_copy = Kokkos::subview(a_char_copy,std::pair<int,int>(a_begin,a_char_copy.extent(0)-a_end));
-      Kokkos::deep_copy(b,a);
-      Kokkos::deep_copy(a_copy,b);
-      int check = compare_equal(a_copy,a);
-      ASSERT_EQ( check, 0 );
+      auto a      = Kokkos::subview(
+          a_char, std::pair<int, int>(a_begin, a_char.extent(0) - a_end));
+      auto b = Kokkos::subview(
+          b_char, std::pair<int, int>(b_begin, b_char.extent(0) - b_end));
+      auto a_copy = Kokkos::subview(
+          a_char_copy,
+          std::pair<int, int>(a_begin, a_char_copy.extent(0) - a_end));
+      Kokkos::deep_copy(b, a);
+      Kokkos::deep_copy(a_copy, b);
+      int check = compare_equal(a_copy, a);
+      ASSERT_EQ(check, 0);
     }
-
   }
 };
+}  // namespace Impl
+
+TEST(TEST_CATEGORY, deep_copy_alignment) {
+  {
+    Impl::TestDeepCopy<TEST_EXECSPACE::memory_space,
+                       TEST_EXECSPACE::memory_space>::run_test(100000);
+  }
+  {
+    Impl::TestDeepCopy<Kokkos::HostSpace,
+                       TEST_EXECSPACE::memory_space>::run_test(100000);
+  }
+  {
+    Impl::TestDeepCopy<TEST_EXECSPACE::memory_space,
+                       Kokkos::HostSpace>::run_test(100000);
+  }
 }
 
-TEST_F( TEST_CATEGORY, deep_copy_alignment )
-{
-  { Impl::TestDeepCopy< TEST_EXECSPACE::memory_space , TEST_EXECSPACE::memory_space >::run_test( 100000 ); }
-  { Impl::TestDeepCopy< Kokkos::HostSpace , TEST_EXECSPACE::memory_space >::run_test( 100000 ); }
-  { Impl::TestDeepCopy< TEST_EXECSPACE::memory_space , Kokkos::HostSpace >::run_test( 100000 ); }
-}
-
-}
+}  // namespace Test
diff --git a/lib/kokkos/core/unit_test/TestDefaultDeviceTypeInit.hpp b/lib/kokkos/core/unit_test/TestDefaultDeviceTypeInit.hpp
index 1261948f87..33c736c5e0 100644
--- a/lib/kokkos/core/unit_test/TestDefaultDeviceTypeInit.hpp
+++ b/lib/kokkos/core/unit_test/TestDefaultDeviceTypeInit.hpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -49,106 +50,110 @@
 #include <omp.h>
 #endif
 
-#if !defined( KOKKOS_ENABLE_CUDA ) || defined( __CUDACC__ )
+#if !defined(KOKKOS_ENABLE_CUDA) || defined(__CUDACC__)
 
 namespace Test {
 
 namespace Impl {
 
-char** init_kokkos_args( bool do_threads, bool do_numa, bool do_device, bool do_other, int & nargs, Kokkos::InitArguments & init_args ) {
-  nargs = ( do_threads ? 1 : 0 ) +
-          ( do_numa ? 1 : 0 ) +
-          ( do_device ? 1 : 0 ) +
-          ( do_other ? 4 : 0 );
+char** init_kokkos_args(bool do_threads, bool do_numa, bool do_device,
+                        bool do_other, int& nargs,
+                        Kokkos::InitArguments& init_args) {
+  nargs = (do_threads ? 1 : 0) + (do_numa ? 1 : 0) + (do_device ? 1 : 0) +
+          (do_other ? 4 : 0);
 
   char** args_kokkos = new char*[nargs];
-  for ( int i = 0; i < nargs; i++ ) {
+  for (int i = 0; i < nargs; i++) {
     args_kokkos[i] = new char[20];
   }
 
   int threads_idx = do_other ? 1 : 0;
-  int numa_idx = ( do_other ? 3 : 0 ) + ( do_threads ? 1 : 0 );
-  int device_idx = ( do_other ? 3 : 0 ) + ( do_threads ? 1 : 0 ) + ( do_numa ? 1 : 0 );
+  int numa_idx    = (do_other ? 3 : 0) + (do_threads ? 1 : 0);
+  int device_idx =
+      (do_other ? 3 : 0) + (do_threads ? 1 : 0) + (do_numa ? 1 : 0);
 
-  if ( do_threads ) {
+  if (do_threads) {
     int nthreads = 3;
 
 #ifdef KOKKOS_ENABLE_OPENMP
-    if ( omp_get_max_threads() < 3 )
-      nthreads = omp_get_max_threads();
+    if (omp_get_max_threads() < 3) nthreads = omp_get_max_threads();
 #endif
 
-    if ( Kokkos::hwloc::available() ) {
-      if ( Kokkos::hwloc::get_available_threads_per_core() < 3 )
-        nthreads =   Kokkos::hwloc::get_available_threads_per_core()
-                   * Kokkos::hwloc::get_available_numa_count();
+    if (Kokkos::hwloc::available()) {
+      if (Kokkos::hwloc::get_available_threads_per_core() < 3)
+        nthreads = Kokkos::hwloc::get_available_threads_per_core() *
+                   Kokkos::hwloc::get_available_numa_count();
     }
 
 #ifdef KOKKOS_ENABLE_SERIAL
-    if ( std::is_same< Kokkos::Serial, Kokkos::DefaultExecutionSpace >::value ||
-         std::is_same< Kokkos::Serial, Kokkos::DefaultHostExecutionSpace >::value ) {
+    if (std::is_same<Kokkos::Serial, Kokkos::DefaultExecutionSpace>::value ||
+        std::is_same<Kokkos::Serial,
+                     Kokkos::DefaultHostExecutionSpace>::value) {
       nthreads = 1;
     }
 #endif
 
     init_args.num_threads = nthreads;
-    sprintf( args_kokkos[threads_idx], "--threads=%i", nthreads );
+    sprintf(args_kokkos[threads_idx], "--threads=%i", nthreads);
   }
 
-  if ( do_numa ) {
+  if (do_numa) {
     int numa = 1;
-    if ( Kokkos::hwloc::available() ) {
+    if (Kokkos::hwloc::available()) {
       numa = Kokkos::hwloc::get_available_numa_count();
     }
 
 #ifdef KOKKOS_ENABLE_SERIAL
-    if ( std::is_same< Kokkos::Serial, Kokkos::DefaultExecutionSpace >::value ||
-         std::is_same< Kokkos::Serial, Kokkos::DefaultHostExecutionSpace >::value ) {
+    if (std::is_same<Kokkos::Serial, Kokkos::DefaultExecutionSpace>::value ||
+        std::is_same<Kokkos::Serial,
+                     Kokkos::DefaultHostExecutionSpace>::value) {
       numa = 1;
     }
 #endif
 
     init_args.num_numa = numa;
-    sprintf( args_kokkos[numa_idx], "--numa=%i", numa );
+    sprintf(args_kokkos[numa_idx], "--numa=%i", numa);
   }
 
-  if ( do_device ) {
+  if (do_device) {
     init_args.device_id = 0;
-    sprintf( args_kokkos[device_idx], "--device=%i", 0 );
+    sprintf(args_kokkos[device_idx], "--device=%i", 0);
   }
 
-  if ( do_other ) {
-    sprintf( args_kokkos[0], "--dummyarg=1" );
-    sprintf( args_kokkos[ threads_idx + ( do_threads ? 1 : 0 ) ], "--dummy2arg" );
-    sprintf( args_kokkos[ threads_idx + ( do_threads ? 1 : 0 ) + 1 ], "dummy3arg" );
-    sprintf( args_kokkos[ device_idx + ( do_device ? 1 : 0 ) ], "dummy4arg=1" );
+  if (do_other) {
+    sprintf(args_kokkos[0], "--dummyarg=1");
+    sprintf(args_kokkos[threads_idx + (do_threads ? 1 : 0)], "--dummy2arg");
+    sprintf(args_kokkos[threads_idx + (do_threads ? 1 : 0) + 1], "dummy3arg");
+    sprintf(args_kokkos[device_idx + (do_device ? 1 : 0)], "dummy4arg=1");
   }
 
   return args_kokkos;
 }
 
-Kokkos::InitArguments init_initstruct( bool do_threads, bool do_numa, bool do_device ) {
+Kokkos::InitArguments init_initstruct(bool do_threads, bool do_numa,
+                                      bool do_device) {
   Kokkos::InitArguments args;
 
-  if ( do_threads ) {
+  if (do_threads) {
     int nthreads = 3;
 
 #ifdef KOKKOS_ENABLE_OPENMP
-    if ( omp_get_max_threads() < 3 ) {
+    if (omp_get_max_threads() < 3) {
       nthreads = omp_get_max_threads();
     }
 #endif
 
-    if ( Kokkos::hwloc::available() ) {
-      if ( Kokkos::hwloc::get_available_threads_per_core() < 3 ) {
-        nthreads =   Kokkos::hwloc::get_available_threads_per_core()
-                   * Kokkos::hwloc::get_available_numa_count();
+    if (Kokkos::hwloc::available()) {
+      if (Kokkos::hwloc::get_available_threads_per_core() < 3) {
+        nthreads = Kokkos::hwloc::get_available_threads_per_core() *
+                   Kokkos::hwloc::get_available_numa_count();
       }
     }
 
 #ifdef KOKKOS_ENABLE_SERIAL
-    if ( std::is_same< Kokkos::Serial, Kokkos::DefaultExecutionSpace >::value ||
-         std::is_same< Kokkos::Serial, Kokkos::DefaultHostExecutionSpace >::value ) {
+    if (std::is_same<Kokkos::Serial, Kokkos::DefaultExecutionSpace>::value ||
+        std::is_same<Kokkos::Serial,
+                     Kokkos::DefaultHostExecutionSpace>::value) {
       nthreads = 1;
     }
 #endif
@@ -156,15 +161,16 @@ Kokkos::InitArguments init_initstruct( bool do_threads, bool do_numa, bool do_de
     args.num_threads = nthreads;
   }
 
-  if ( do_numa ) {
+  if (do_numa) {
     int numa = 1;
-    if ( Kokkos::hwloc::available() ) {
+    if (Kokkos::hwloc::available()) {
       numa = Kokkos::hwloc::get_available_numa_count();
     }
 
 #ifdef KOKKOS_ENABLE_SERIAL
-    if ( std::is_same< Kokkos::Serial, Kokkos::DefaultExecutionSpace >::value ||
-         std::is_same< Kokkos::Serial, Kokkos::DefaultHostExecutionSpace >::value ) {
+    if (std::is_same<Kokkos::Serial, Kokkos::DefaultExecutionSpace>::value ||
+        std::is_same<Kokkos::Serial,
+                     Kokkos::DefaultHostExecutionSpace>::value) {
       numa = 1;
     }
 #endif
@@ -172,61 +178,65 @@ Kokkos::InitArguments init_initstruct( bool do_threads, bool do_numa, bool do_de
     args.num_numa = numa;
   }
 
-  if ( do_device ) {
+  if (do_device) {
     args.device_id = 0;
   }
 
   return args;
 }
 
-void check_correct_initialization( const Kokkos::InitArguments & argstruct ) {
+void check_correct_initialization(const Kokkos::InitArguments& argstruct) {
 #ifdef KOKKOS_ENABLE_DEPRECATED_CODE
-  ASSERT_EQ( Kokkos::DefaultExecutionSpace::is_initialized(), 1 );
-  ASSERT_EQ( Kokkos::HostSpace::execution_space::is_initialized(), 1 );
+  ASSERT_EQ(Kokkos::DefaultExecutionSpace::is_initialized(), 1);
+  ASSERT_EQ(Kokkos::HostSpace::execution_space::is_initialized(), 1);
 #else
-  ASSERT_EQ( Kokkos::DefaultExecutionSpace::impl_is_initialized(), 1 );
-  ASSERT_EQ( Kokkos::HostSpace::execution_space::impl_is_initialized(), 1 );
+  ASSERT_EQ(Kokkos::DefaultExecutionSpace::impl_is_initialized(), 1);
+  ASSERT_EQ(Kokkos::HostSpace::execution_space::impl_is_initialized(), 1);
 #endif
 
-  // Figure out the number of threads the HostSpace ExecutionSpace should have initialized to.
+  // Figure out the number of threads the HostSpace ExecutionSpace should have
+  // initialized to.
   int expected_nthreads = argstruct.num_threads;
 
 #ifdef KOKKOS_ENABLE_OPENMP
-  if ( std::is_same< Kokkos::HostSpace::execution_space, Kokkos::OpenMP >::value ) {
+  if (std::is_same<Kokkos::HostSpace::execution_space, Kokkos::OpenMP>::value) {
     // use openmp default num threads
-    if ( expected_nthreads < 0 || ( expected_nthreads == 0 && !Kokkos::hwloc::available() ) ) {
+    if (expected_nthreads < 0 ||
+        (expected_nthreads == 0 && !Kokkos::hwloc::available())) {
       expected_nthreads = omp_get_max_threads();
     }
     // use hwloc if available
-    else if ( expected_nthreads == 0 && Kokkos::hwloc::available() ) {
-      expected_nthreads = Kokkos::hwloc::get_available_numa_count()
-                        * Kokkos::hwloc::get_available_cores_per_numa()
-                        * Kokkos::hwloc::get_available_threads_per_core();
+    else if (expected_nthreads == 0 && Kokkos::hwloc::available()) {
+      expected_nthreads = Kokkos::hwloc::get_available_numa_count() *
+                          Kokkos::hwloc::get_available_cores_per_numa() *
+                          Kokkos::hwloc::get_available_threads_per_core();
     }
   }
 #endif
 
-  if ( expected_nthreads < 1 ) {
-    if ( Kokkos::hwloc::available() ) {
-      expected_nthreads = Kokkos::hwloc::get_available_numa_count()
-                        * Kokkos::hwloc::get_available_cores_per_numa()
-                        * Kokkos::hwloc::get_available_threads_per_core();
-    }
-    else {
-        expected_nthreads = 1;
+  if (expected_nthreads < 1) {
+    if (Kokkos::hwloc::available()) {
+      expected_nthreads = Kokkos::hwloc::get_available_numa_count() *
+                          Kokkos::hwloc::get_available_cores_per_numa() *
+                          Kokkos::hwloc::get_available_threads_per_core();
+    } else {
+      expected_nthreads = 1;
     }
 
 #ifdef KOKKOS_ENABLE_SERIAL
-    if ( std::is_same< Kokkos::DefaultExecutionSpace, Kokkos::Serial >::value ||
-         std::is_same< Kokkos::DefaultHostExecutionSpace, Kokkos::Serial >::value ) {
+    if (std::is_same<Kokkos::DefaultExecutionSpace, Kokkos::Serial>::value ||
+        std::is_same<Kokkos::DefaultHostExecutionSpace,
+                     Kokkos::Serial>::value) {
       expected_nthreads = 1;
     }
 #endif
 
 #ifdef KOKKOS_ENABLE_HPX
     // HPX uses all cores on machine by default. Skip this test.
-    if ( std::is_same< Kokkos::DefaultExecutionSpace, Kokkos::Experimental::HPX >::value ||
-         std::is_same< Kokkos::DefaultHostExecutionSpace, Kokkos::Experimental::HPX >::value ) {
+    if (std::is_same<Kokkos::DefaultExecutionSpace,
+                     Kokkos::Experimental::HPX>::value ||
+        std::is_same<Kokkos::DefaultHostExecutionSpace,
+                     Kokkos::Experimental::HPX>::value) {
       return;
     }
 #endif
@@ -234,38 +244,39 @@ void check_correct_initialization( const Kokkos::InitArguments & argstruct ) {
 
   int expected_numa = argstruct.num_numa;
 
-  if ( expected_numa < 1 ) {
-    if ( Kokkos::hwloc::available() ) {
+  if (expected_numa < 1) {
+    if (Kokkos::hwloc::available()) {
       expected_numa = Kokkos::hwloc::get_available_numa_count();
-    }
-    else {
+    } else {
       expected_numa = 1;
     }
 
 #ifdef KOKKOS_ENABLE_SERIAL
-    if ( std::is_same< Kokkos::DefaultExecutionSpace, Kokkos::Serial >::value ||
-         std::is_same< Kokkos::DefaultHostExecutionSpace, Kokkos::Serial >::value )
+    if (std::is_same<Kokkos::DefaultExecutionSpace, Kokkos::Serial>::value ||
+        std::is_same<Kokkos::DefaultHostExecutionSpace, Kokkos::Serial>::value)
       expected_numa = 1;
 #endif
   }
 
 #ifdef KOKKOS_ENABLE_DEPRECATED_CODE
-  ASSERT_EQ( Kokkos::HostSpace::execution_space::thread_pool_size(), expected_nthreads );
+  ASSERT_EQ(Kokkos::HostSpace::execution_space::thread_pool_size(),
+            expected_nthreads);
 #else
-  ASSERT_EQ( Kokkos::HostSpace::execution_space::impl_thread_pool_size(), expected_nthreads );
+  ASSERT_EQ(Kokkos::HostSpace::execution_space::impl_thread_pool_size(),
+            expected_nthreads);
 #endif
 
 #ifdef KOKKOS_ENABLE_CUDA
-  if ( std::is_same< Kokkos::DefaultExecutionSpace, Kokkos::Cuda >::value ) {
+  if (std::is_same<Kokkos::DefaultExecutionSpace, Kokkos::Cuda>::value) {
     int device;
-    cudaGetDevice( &device );
+    cudaGetDevice(&device);
 
     int expected_device = argstruct.device_id;
-    if ( argstruct.device_id < 0 ) {
+    if (argstruct.device_id < 0) {
       expected_device = 0;
     }
 
-    ASSERT_EQ( expected_device, device );
+    ASSERT_EQ(expected_device, device);
   }
 #endif
 }
@@ -273,221 +284,206 @@ void check_correct_initialization( const Kokkos::InitArguments & argstruct ) {
 // TODO: Add check whether correct number of threads are actually started.
 void test_no_arguments() {
   Kokkos::initialize();
-  check_correct_initialization( Kokkos::InitArguments() );
+  check_correct_initialization(Kokkos::InitArguments());
   Kokkos::finalize();
 }
 
-void test_commandline_args( int nargs, char** args, const Kokkos::InitArguments & argstruct ) {
-  Kokkos::initialize( nargs, args );
-  check_correct_initialization( argstruct );
+void test_commandline_args(int nargs, char** args,
+                           const Kokkos::InitArguments& argstruct) {
+  Kokkos::initialize(nargs, args);
+  check_correct_initialization(argstruct);
   Kokkos::finalize();
 }
 
-void test_initstruct_args( const Kokkos::InitArguments & args ) {
-  Kokkos::initialize( args );
-  check_correct_initialization( args );
+void test_initstruct_args(const Kokkos::InitArguments& args) {
+  Kokkos::initialize(args);
+  check_correct_initialization(args);
   Kokkos::finalize();
 }
 
-} // namespace Impl
-
-class defaultdevicetypeinit : public ::testing::Test {
-protected:
-  static void SetUpTestCase() {}
-
-  static void TearDownTestCase() {}
-};
+}  // namespace Impl
 
 #ifdef KOKKOS_DEFAULTDEVICETYPE_INIT_TEST_01
-TEST_F( defaultdevicetypeinit, no_args )
-{
-  Impl::test_no_arguments();
-}
+TEST(defaultdevicetypeinit, no_args) { Impl::test_no_arguments(); }
 #endif
 
 #ifdef KOKKOS_DEFAULTDEVICETYPE_INIT_TEST_02
-TEST_F( defaultdevicetypeinit, commandline_args_empty )
-{
+TEST(defaultdevicetypeinit, commandline_args_empty) {
   Kokkos::InitArguments argstruct;
   int nargs = 0;
-  char** args = Impl::init_kokkos_args( false, false, false, false, nargs, argstruct );
-  Impl::test_commandline_args( nargs, args, argstruct );
+  char** args =
+      Impl::init_kokkos_args(false, false, false, false, nargs, argstruct);
+  Impl::test_commandline_args(nargs, args, argstruct);
 
-  for ( int i = 0; i < nargs; i++ ) {
-    delete [] args[i];
+  for (int i = 0; i < nargs; i++) {
+    delete[] args[i];
   }
-  delete [] args;
+  delete[] args;
 }
 #endif
 
 #ifdef KOKKOS_DEFAULTDEVICETYPE_INIT_TEST_03
-TEST_F( defaultdevicetypeinit, commandline_args_other )
-{
+TEST(defaultdevicetypeinit, commandline_args_other) {
   Kokkos::InitArguments argstruct;
   int nargs = 0;
-  char** args = Impl::init_kokkos_args( false, false, false, true, nargs, argstruct );
-  Impl::test_commandline_args( nargs, args, argstruct );
+  char** args =
+      Impl::init_kokkos_args(false, false, false, true, nargs, argstruct);
+  Impl::test_commandline_args(nargs, args, argstruct);
 
-  for ( int i = 0; i < nargs; i++ ) {
-    delete [] args[i];
+  for (int i = 0; i < nargs; i++) {
+    delete[] args[i];
   }
-  delete [] args;
+  delete[] args;
 }
 #endif
 
 #ifdef KOKKOS_DEFAULTDEVICETYPE_INIT_TEST_04
-TEST_F( defaultdevicetypeinit, commandline_args_nthreads )
-{
+TEST(defaultdevicetypeinit, commandline_args_nthreads) {
   Kokkos::InitArguments argstruct;
   int nargs = 0;
-  char** args = Impl::init_kokkos_args( true, false, false, false, nargs, argstruct );
-  Impl::test_commandline_args( nargs, args, argstruct );
+  char** args =
+      Impl::init_kokkos_args(true, false, false, false, nargs, argstruct);
+  Impl::test_commandline_args(nargs, args, argstruct);
 
-  for ( int i = 0; i < nargs; i++ ) {
-    delete [] args[i];
+  for (int i = 0; i < nargs; i++) {
+    delete[] args[i];
   }
-  delete [] args;
+  delete[] args;
 }
 #endif
 
 #ifdef KOKKOS_DEFAULTDEVICETYPE_INIT_TEST_05
-TEST_F( defaultdevicetypeinit, commandline_args_nthreads_numa )
-{
+TEST(defaultdevicetypeinit, commandline_args_nthreads_numa) {
   Kokkos::InitArguments argstruct;
   int nargs = 0;
-  char** args = Impl::init_kokkos_args( true, true, false, false, nargs, argstruct );
-  Impl::test_commandline_args( nargs, args, argstruct );
+  char** args =
+      Impl::init_kokkos_args(true, true, false, false, nargs, argstruct);
+  Impl::test_commandline_args(nargs, args, argstruct);
 
-  for ( int i = 0; i < nargs; i++ ) {
-    delete [] args[i];
+  for (int i = 0; i < nargs; i++) {
+    delete[] args[i];
   }
-  delete [] args;
+  delete[] args;
 }
 #endif
 
 #ifdef KOKKOS_DEFAULTDEVICETYPE_INIT_TEST_06
-TEST_F( defaultdevicetypeinit, commandline_args_nthreads_numa_device )
-{
+TEST(defaultdevicetypeinit, commandline_args_nthreads_numa_device) {
   Kokkos::InitArguments argstruct;
   int nargs = 0;
-  char** args = Impl::init_kokkos_args( true, true, true, false, nargs, argstruct );
-  Impl::test_commandline_args( nargs, args, argstruct );
+  char** args =
+      Impl::init_kokkos_args(true, true, true, false, nargs, argstruct);
+  Impl::test_commandline_args(nargs, args, argstruct);
 
-  for ( int i = 0; i < nargs; i++ ) {
-    delete [] args[i];
+  for (int i = 0; i < nargs; i++) {
+    delete[] args[i];
   }
-  delete [] args;
+  delete[] args;
 }
 #endif
 
 #ifdef KOKKOS_DEFAULTDEVICETYPE_INIT_TEST_07
-TEST_F( defaultdevicetypeinit, commandline_args_nthreads_device )
-{
+TEST(defaultdevicetypeinit, commandline_args_nthreads_device) {
   Kokkos::InitArguments argstruct;
   int nargs = 0;
-  char** args = Impl::init_kokkos_args( true, false, true, false, nargs, argstruct );
-  Impl::test_commandline_args( nargs, args, argstruct );
+  char** args =
+      Impl::init_kokkos_args(true, false, true, false, nargs, argstruct);
+  Impl::test_commandline_args(nargs, args, argstruct);
 
-  for ( int i = 0; i < nargs; i++ ) {
-    delete [] args[i];
+  for (int i = 0; i < nargs; i++) {
+    delete[] args[i];
   }
-  delete [] args;
+  delete[] args;
 }
 #endif
 
 #ifdef KOKKOS_DEFAULTDEVICETYPE_INIT_TEST_08
-TEST_F( defaultdevicetypeinit, commandline_args_numa_device )
-{
+TEST(defaultdevicetypeinit, commandline_args_numa_device) {
   Kokkos::InitArguments argstruct;
   int nargs = 0;
-  char** args = Impl::init_kokkos_args( false, true, true, false, nargs, argstruct );
-  Impl::test_commandline_args( nargs, args, argstruct );
+  char** args =
+      Impl::init_kokkos_args(false, true, true, false, nargs, argstruct);
+  Impl::test_commandline_args(nargs, args, argstruct);
 
-  for ( int i = 0; i < nargs; i++ ) {
-    delete [] args[i];
+  for (int i = 0; i < nargs; i++) {
+    delete[] args[i];
   }
-  delete [] args;
+  delete[] args;
 }
 #endif
 
 #ifdef KOKKOS_DEFAULTDEVICETYPE_INIT_TEST_09
-TEST_F( defaultdevicetypeinit, commandline_args_device )
-{
+TEST(defaultdevicetypeinit, commandline_args_device) {
   Kokkos::InitArguments argstruct;
   int nargs = 0;
-  char** args = Impl::init_kokkos_args( false, false, true, false, nargs, argstruct );
-  Impl::test_commandline_args( nargs, args, argstruct );
+  char** args =
+      Impl::init_kokkos_args(false, false, true, false, nargs, argstruct);
+  Impl::test_commandline_args(nargs, args, argstruct);
 
-  for ( int i = 0; i < nargs; i++ ) {
-    delete [] args[i];
+  for (int i = 0; i < nargs; i++) {
+    delete[] args[i];
   }
-  delete [] args;
+  delete[] args;
 }
 #endif
 
 #ifdef KOKKOS_DEFAULTDEVICETYPE_INIT_TEST_10
-TEST_F( defaultdevicetypeinit, commandline_args_nthreads_numa_device_other )
-{
+TEST(defaultdevicetypeinit, commandline_args_nthreads_numa_device_other) {
   Kokkos::InitArguments argstruct;
   int nargs = 0;
-  char** args = Impl::init_kokkos_args( true, true, true, true, nargs, argstruct );
-  Impl::test_commandline_args( nargs, args, argstruct );
+  char** args =
+      Impl::init_kokkos_args(true, true, true, true, nargs, argstruct);
+  Impl::test_commandline_args(nargs, args, argstruct);
 
-  for ( int i = 0; i < nargs; i++ ) {
-    delete [] args[i];
+  for (int i = 0; i < nargs; i++) {
+    delete[] args[i];
   }
-  delete [] args;
+  delete[] args;
 }
 #endif
 
 #ifdef KOKKOS_DEFAULTDEVICETYPE_INIT_TEST_11
-TEST_F( defaultdevicetypeinit, initstruct_default )
-{
+TEST(defaultdevicetypeinit, initstruct_default) {
   Kokkos::InitArguments args;
-  Impl::test_initstruct_args( args );
+  Impl::test_initstruct_args(args);
 }
 #endif
 
 #ifdef KOKKOS_DEFAULTDEVICETYPE_INIT_TEST_12
-TEST_F( defaultdevicetypeinit, initstruct_nthreads )
-{
-  Kokkos::InitArguments args = Impl::init_initstruct( true, false, false );
-  Impl::test_initstruct_args( args );
+TEST(defaultdevicetypeinit, initstruct_nthreads) {
+  Kokkos::InitArguments args = Impl::init_initstruct(true, false, false);
+  Impl::test_initstruct_args(args);
 }
 #endif
 
 #ifdef KOKKOS_DEFAULTDEVICETYPE_INIT_TEST_13
-TEST_F( defaultdevicetypeinit, initstruct_nthreads_numa )
-{
-  Kokkos::InitArguments args = Impl::init_initstruct( true, true, false );
-  Impl::test_initstruct_args( args );
+TEST(defaultdevicetypeinit, initstruct_nthreads_numa) {
+  Kokkos::InitArguments args = Impl::init_initstruct(true, true, false);
+  Impl::test_initstruct_args(args);
 }
 #endif
 
 #ifdef KOKKOS_DEFAULTDEVICETYPE_INIT_TEST_14
-TEST_F( defaultdevicetypeinit, initstruct_device )
-{
-  Kokkos::InitArguments args = Impl::init_initstruct( false, false, true );
-  Impl::test_initstruct_args( args );
+TEST(defaultdevicetypeinit, initstruct_device) {
+  Kokkos::InitArguments args = Impl::init_initstruct(false, false, true);
+  Impl::test_initstruct_args(args);
 }
 #endif
 
 #ifdef KOKKOS_DEFAULTDEVICETYPE_INIT_TEST_15
-TEST_F( defaultdevicetypeinit, initstruct_nthreads_device )
-{
-  Kokkos::InitArguments args = Impl::init_initstruct( true, false, true );
-  Impl::test_initstruct_args( args );
+TEST(defaultdevicetypeinit, initstruct_nthreads_device) {
+  Kokkos::InitArguments args = Impl::init_initstruct(true, false, true);
+  Impl::test_initstruct_args(args);
 }
 #endif
 
 #ifdef KOKKOS_DEFAULTDEVICETYPE_INIT_TEST_16
-TEST_F( defaultdevicetypeinit, initstruct_nthreads_numa_device )
-{
-  Kokkos::InitArguments args = Impl::init_initstruct( true, true, true );
-  Impl::test_initstruct_args( args );
+TEST(defaultdevicetypeinit, initstruct_nthreads_numa_device) {
+  Kokkos::InitArguments args = Impl::init_initstruct(true, true, true);
+  Impl::test_initstruct_args(args);
 }
 #endif
 
-} // namespace Test
+}  // namespace Test
 
 #endif
diff --git a/lib/kokkos/core/unit_test/TestFunctorAnalysis.hpp b/lib/kokkos/core/unit_test/TestFunctorAnalysis.hpp
index e1dcbbdb4d..5e72972bed 100644
--- a/lib/kokkos/core/unit_test/TestFunctorAnalysis.hpp
+++ b/lib/kokkos/core/unit_test/TestFunctorAnalysis.hpp
@@ -1,13 +1,14 @@
 /*
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -36,7 +37,7 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 */
@@ -52,102 +53,100 @@
 namespace Test {
 
 struct TestFunctorAnalysis_03 {
-
-  struct value_type { double x[2]; };
+  struct value_type {
+    double x[2];
+  };
 
   KOKKOS_INLINE_FUNCTION
-  void operator()( int , value_type & ) const {}
+  void operator()(int, value_type&) const {}
 
   KOKKOS_INLINE_FUNCTION
-  void join( value_type volatile & , value_type const volatile & ) const {}
+  void join(value_type volatile&, value_type const volatile&) const {}
 
-  KOKKOS_INLINE_FUNCTION static
-  void init( value_type & ) {}
+  KOKKOS_INLINE_FUNCTION static void init(value_type&) {}
 };
 
-
-template< class ExecSpace >
-void test_functor_analysis()
-{
+template <class ExecSpace>
+void test_functor_analysis() {
   //------------------------------
-  auto c01 = KOKKOS_LAMBDA(int){} ;
-  typedef Kokkos::Impl::FunctorAnalysis
-            < Kokkos::Impl::FunctorPatternInterface::FOR
-            , Kokkos::RangePolicy< ExecSpace >
-            , decltype( c01 ) >
-    A01 ;
+  auto c01 = KOKKOS_LAMBDA(int){};
+  typedef Kokkos::Impl::FunctorAnalysis<
+      Kokkos::Impl::FunctorPatternInterface::FOR,
+      Kokkos::RangePolicy<ExecSpace>, decltype(c01)>
+      A01;
 
-  typedef typename A01::template Reducer< typename ExecSpace::memory_space >
-    R01 ;
+  typedef typename A01::template Reducer<typename ExecSpace::memory_space> R01;
 
-  static_assert( std::is_same< typename A01::value_type , void >::value , "" );
-  static_assert( std::is_same< typename A01::pointer_type , void >::value , "" );
-  static_assert( std::is_same< typename A01::reference_type , void >::value , "" );
-  static_assert( std::is_same< typename R01::functor_type , decltype(c01) >::value , "" );
+  static_assert(std::is_same<typename A01::value_type, void>::value, "");
+  static_assert(std::is_same<typename A01::pointer_type, void>::value, "");
+  static_assert(std::is_same<typename A01::reference_type, void>::value, "");
+  static_assert(std::is_same<typename R01::functor_type, decltype(c01)>::value,
+                "");
 
-  static_assert( ! A01::has_join_member_function , "" );
-  static_assert( ! A01::has_init_member_function , "" );
-  static_assert( ! A01::has_final_member_function , "" );
-  static_assert( A01::StaticValueSize == 0 , "" );
-  ASSERT_EQ( R01( & c01 ).length() , 0 );
+  static_assert(!A01::has_join_member_function, "");
+  static_assert(!A01::has_init_member_function, "");
+  static_assert(!A01::has_final_member_function, "");
+  static_assert(A01::StaticValueSize == 0, "");
+  ASSERT_EQ(R01(&c01).length(), 0);
 
   //------------------------------
-  auto c02 = KOKKOS_LAMBDA(int,double&){} ;
-  typedef Kokkos::Impl::FunctorAnalysis
-    < Kokkos::Impl::FunctorPatternInterface::REDUCE
-    , Kokkos::RangePolicy< ExecSpace >
-    , decltype( c02 ) >
-    A02 ;
-  typedef typename A02::template Reducer< typename ExecSpace::memory_space >
-    R02 ;
+  auto c02 = KOKKOS_LAMBDA(int, double&){};
+  typedef Kokkos::Impl::FunctorAnalysis<
+      Kokkos::Impl::FunctorPatternInterface::REDUCE,
+      Kokkos::RangePolicy<ExecSpace>, decltype(c02)>
+      A02;
+  typedef typename A02::template Reducer<typename ExecSpace::memory_space> R02;
 
-  static_assert( std::is_same< typename A02::value_type , double >::value , "" );
-  static_assert( std::is_same< typename A02::pointer_type , double * >::value , "" );
-  static_assert( std::is_same< typename A02::reference_type , double & >::value , "" );
-  static_assert( std::is_same< typename R02::functor_type , decltype(c02) >::value , "" );
+  static_assert(std::is_same<typename A02::value_type, double>::value, "");
+  static_assert(std::is_same<typename A02::pointer_type, double*>::value, "");
+  static_assert(std::is_same<typename A02::reference_type, double&>::value, "");
+  static_assert(std::is_same<typename R02::functor_type, decltype(c02)>::value,
+                "");
 
-  static_assert( ! A02::has_join_member_function , "" );
-  static_assert( ! A02::has_init_member_function , "" );
-  static_assert( ! A02::has_final_member_function , "" );
-  static_assert( A02::StaticValueSize == sizeof(double) , "" );
-  ASSERT_EQ( R02( & c02 ).length() , 1 );
-
-  //------------------------------
-  
-  TestFunctorAnalysis_03 c03 ;
-  typedef Kokkos::Impl::FunctorAnalysis
-    < Kokkos::Impl::FunctorPatternInterface::REDUCE
-    , Kokkos::RangePolicy< ExecSpace >
-    , TestFunctorAnalysis_03 > 
-    A03 ;
-  typedef typename A03::template Reducer< typename ExecSpace::memory_space >
-    R03 ;
-
-  static_assert( std::is_same< typename A03::value_type , TestFunctorAnalysis_03::value_type >::value , "" );
-  static_assert( std::is_same< typename A03::pointer_type , TestFunctorAnalysis_03::value_type * >::value , "" );
-  static_assert( std::is_same< typename A03::reference_type , TestFunctorAnalysis_03::value_type & >::value , "" );
-  static_assert( std::is_same< typename R03::functor_type , TestFunctorAnalysis_03 >::value , "" );
-
-  static_assert( A03::has_join_member_function , "" );
-  static_assert( A03::has_init_member_function , "" );
-  static_assert( ! A03::has_final_member_function , "" );
-  static_assert( A03::StaticValueSize == sizeof(TestFunctorAnalysis_03::value_type) , "" );
-  ASSERT_EQ( R03( & c03 ).length() , 1 );
+  static_assert(!A02::has_join_member_function, "");
+  static_assert(!A02::has_init_member_function, "");
+  static_assert(!A02::has_final_member_function, "");
+  static_assert(A02::StaticValueSize == sizeof(double), "");
+  ASSERT_EQ(R02(&c02).length(), 1);
 
   //------------------------------
 
-  
+  TestFunctorAnalysis_03 c03;
+  typedef Kokkos::Impl::FunctorAnalysis<
+      Kokkos::Impl::FunctorPatternInterface::REDUCE,
+      Kokkos::RangePolicy<ExecSpace>, TestFunctorAnalysis_03>
+      A03;
+  typedef typename A03::template Reducer<typename ExecSpace::memory_space> R03;
 
+  static_assert(std::is_same<typename A03::value_type,
+                             TestFunctorAnalysis_03::value_type>::value,
+                "");
+  static_assert(std::is_same<typename A03::pointer_type,
+                             TestFunctorAnalysis_03::value_type*>::value,
+                "");
+  static_assert(std::is_same<typename A03::reference_type,
+                             TestFunctorAnalysis_03::value_type&>::value,
+                "");
+  static_assert(
+      std::is_same<typename R03::functor_type, TestFunctorAnalysis_03>::value,
+      "");
+
+  static_assert(A03::has_join_member_function, "");
+  static_assert(A03::has_init_member_function, "");
+  static_assert(!A03::has_final_member_function, "");
+  static_assert(
+      A03::StaticValueSize == sizeof(TestFunctorAnalysis_03::value_type), "");
+  ASSERT_EQ(R03(&c03).length(), 1);
+
+  //------------------------------
 }
 
-TEST_F( TEST_CATEGORY , functor_analysis )
-{
-  test_functor_analysis< TEST_EXECSPACE >();
+TEST(TEST_CATEGORY, functor_analysis) {
+  test_functor_analysis<TEST_EXECSPACE>();
 }
 
-}
+}  // namespace Test
 
 /*--------------------------------------------------------------------------*/
 
 #endif /* #ifndef TEST_FUNCTOR_ANALYSIS_HPP */
-
diff --git a/lib/kokkos/core/unit_test/TestHWLOC.cpp b/lib/kokkos/core/unit_test/TestHWLOC.cpp
index 40a4a441eb..428a670484 100644
--- a/lib/kokkos/core/unit_test/TestHWLOC.cpp
+++ b/lib/kokkos/core/unit_test/TestHWLOC.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -49,19 +50,11 @@
 
 namespace Test {
 
-class hwloc : public ::testing::Test {
-protected:
-  static void SetUpTestCase() {}
-
-  static void TearDownTestCase() {}
-};
-
-TEST_F( hwloc, query )
-{
+TEST(hwloc, query) {
   std::cout << " NUMA[" << Kokkos::hwloc::get_available_numa_count() << "]"
             << " CORE[" << Kokkos::hwloc::get_available_cores_per_numa() << "]"
-            << " PU[" << Kokkos::hwloc::get_available_threads_per_core()  << "]"
+            << " PU[" << Kokkos::hwloc::get_available_threads_per_core() << "]"
             << std::endl;
 }
 
-} // namespace Test
+}  // namespace Test
diff --git a/lib/kokkos/core/unit_test/TestHostBarrier.cpp b/lib/kokkos/core/unit_test/TestHostBarrier.cpp
index 6806ecec38..230ba2fb83 100644
--- a/lib/kokkos/core/unit_test/TestHostBarrier.cpp
+++ b/lib/kokkos/core/unit_test/TestHostBarrier.cpp
@@ -2,15 +2,6 @@
 
 namespace Test {
 
-class host_barrier : public ::testing::Test {
-protected:
-  static void SetUpTestCase() {}
-  static void TearDownTestCase() {}
-};
+TEST(host_barrier, openmp) {}
 
-TEST_F( host_barrier, openmp )
-{
-
-}
-
-} // namespace Test
+}  // namespace Test
diff --git a/lib/kokkos/core/unit_test/TestInit.hpp b/lib/kokkos/core/unit_test/TestInit.hpp
index 1f3aef7141..03ceb45d77 100644
--- a/lib/kokkos/core/unit_test/TestInit.hpp
+++ b/lib/kokkos/core/unit_test/TestInit.hpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -49,28 +50,22 @@
 #include <Kokkos_Core.hpp>
 
 namespace Test {
-TEST_F( TEST_CATEGORY, init )
-{
-   ;
-}
+TEST(TEST_CATEGORY, init) { ; }
 
 #ifdef KOKKOS_ENABLE_CXX11_DISPATCH_LAMBDA
 
-template<class ExecSpace>
-void test_dispatch () {
+template <class ExecSpace>
+void test_dispatch() {
   const int repeat = 100;
-  for ( int i = 0; i < repeat; ++i ) {
-    for ( int j = 0; j < repeat; ++j ) {
-      Kokkos::parallel_for( Kokkos::RangePolicy< TEST_EXECSPACE >( 0, j )
-                          , KOKKOS_LAMBDA( int ) {} );
+  for (int i = 0; i < repeat; ++i) {
+    for (int j = 0; j < repeat; ++j) {
+      Kokkos::parallel_for(Kokkos::RangePolicy<TEST_EXECSPACE>(0, j),
+                           KOKKOS_LAMBDA(int){});
     }
   }
 }
 
-TEST_F( TEST_CATEGORY, dispatch )
-{
-  test_dispatch<TEST_EXECSPACE>();
-}
+TEST(TEST_CATEGORY, dispatch) { test_dispatch<TEST_EXECSPACE>(); }
 #endif
 
-}
+}  // namespace Test
diff --git a/lib/kokkos/core/unit_test/TestLocalDeepCopy.hpp b/lib/kokkos/core/unit_test/TestLocalDeepCopy.hpp
index 31bda530a5..9bca373a40 100644
--- a/lib/kokkos/core/unit_test/TestLocalDeepCopy.hpp
+++ b/lib/kokkos/core/unit_test/TestLocalDeepCopy.hpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -52,853 +53,995 @@
 
 namespace Test {
 
-  template<typename ExecSpace, typename ViewType>
-  void impl_test_local_deepcopy_teampolicy_rank_1 (const int N) {
+template <typename ExecSpace, typename ViewType>
+void impl_test_local_deepcopy_teampolicy_rank_1(const int N) {
+  // Allocate matrices on device.
+  ViewType A("A", N, N, N, N, N, N, N, N);
+  ViewType B("B", N, N, N, N, N, N, N, N);
 
-    // Allocate matrices on device.
-    ViewType A( "A", N, N, N, N, N, N, N, N );
-    ViewType B( "B", N, N, N, N, N, N, N, N );
+  // Create host mirrors of device views.
+  typename ViewType::HostMirror h_A = Kokkos::create_mirror_view(A);
+  typename ViewType::HostMirror h_B = Kokkos::create_mirror_view(B);
 
-    // Create host mirrors of device views.
-    typename ViewType::HostMirror h_A = Kokkos::create_mirror_view( A );
-    typename ViewType::HostMirror h_B = Kokkos::create_mirror_view( B );
+  // Initialize A matrix.
+  auto subA =
+      Kokkos::subview(A, 1, 1, 1, 1, 1, 1, Kokkos::ALL(), Kokkos::ALL());
+  Kokkos::deep_copy(subA, 10.0);
 
-    // Initialize A matrix.
-    auto subA = Kokkos::subview(A, 1, 1, 1, 1, 1, 1, Kokkos::ALL(), Kokkos::ALL());
-    Kokkos::deep_copy( subA, 10.0 );
+  typedef Kokkos::TeamPolicy<ExecSpace> team_policy;
+  typedef typename Kokkos::TeamPolicy<ExecSpace>::member_type member_type;
 
-    typedef Kokkos::TeamPolicy<ExecSpace>               team_policy;
-    typedef typename Kokkos::TeamPolicy<ExecSpace>::member_type  member_type;
+  // Deep Copy
+  Kokkos::parallel_for(
+      team_policy(N, Kokkos::AUTO),
+      KOKKOS_LAMBDA(const member_type& teamMember) {
+        int lid = teamMember.league_rank();  // returns a number between 0 and N
+        auto subSrc = Kokkos::subview(A, 1, 1, 1, 1, 1, 1, lid, Kokkos::ALL());
+        auto subDst = Kokkos::subview(B, 1, 1, 1, 1, 1, 1, lid, Kokkos::ALL());
+        Kokkos::Experimental::local_deep_copy(teamMember, subDst, subSrc);
+      });
 
-    //Deep Copy
-    Kokkos::parallel_for( team_policy( N, Kokkos::AUTO ), KOKKOS_LAMBDA ( const member_type &teamMember ) {
-      int lid = teamMember.league_rank();// returns a number between 0 and N
-      auto subSrc = Kokkos::subview(A, 1, 1, 1, 1, 1, 1, lid, Kokkos::ALL());
-      auto subDst = Kokkos::subview(B, 1, 1, 1, 1, 1, 1, lid, Kokkos::ALL());
-      Kokkos::Experimental::local_deep_copy(teamMember,subDst,subSrc);
-    });
+  Kokkos::deep_copy(h_A, A);
+  Kokkos::deep_copy(h_B, B);
 
-    Kokkos::deep_copy( h_A, A );
-    Kokkos::deep_copy( h_B, B );
-
-    bool test = true;
-    for(size_t i=0; i<A.span();i++){
-      if (h_A.data()[i]!=h_B.data()[i]) {test = false;break;}
+  bool test = true;
+  for (size_t i = 0; i < A.span(); i++) {
+    if (h_A.data()[i] != h_B.data()[i]) {
+      test = false;
+      break;
     }
-
-    ASSERT_EQ( test, true );
-
-    //Fill
-    Kokkos::deep_copy( B, 0.0 );
-
-    Kokkos::parallel_for( team_policy( N, Kokkos::AUTO ), KOKKOS_LAMBDA ( const member_type &teamMember ) {
-      int lid = teamMember.league_rank();// returns a number between 0 and N      
-      auto subDst = Kokkos::subview(B, 1, 1, 1, 1, 1, 1, lid, Kokkos::ALL());
-      Kokkos::Experimental::local_deep_copy(teamMember,subDst,20.0);
-    });
-
-    Kokkos::deep_copy( h_B, B );
-
-    double sum_all = 0.0;
-    for(size_t i=0; i<B.span();i++){
-      sum_all += h_B.data()[i];
-    }
-
-    ASSERT_EQ( sum_all, 20.0*N*N );  
   }
+
+  ASSERT_EQ(test, true);
+
+  // Fill
+  Kokkos::deep_copy(B, 0.0);
+
+  Kokkos::parallel_for(
+      team_policy(N, Kokkos::AUTO),
+      KOKKOS_LAMBDA(const member_type& teamMember) {
+        int lid = teamMember.league_rank();  // returns a number between 0 and N
+        auto subDst = Kokkos::subview(B, 1, 1, 1, 1, 1, 1, lid, Kokkos::ALL());
+        Kokkos::Experimental::local_deep_copy(teamMember, subDst, 20.0);
+      });
+
+  Kokkos::deep_copy(h_B, B);
+
+  double sum_all = 0.0;
+  for (size_t i = 0; i < B.span(); i++) {
+    sum_all += h_B.data()[i];
+  }
+
+  ASSERT_EQ(sum_all, 20.0 * N * N);
+}
 //-------------------------------------------------------------------------------------------------------------
-  template<typename ExecSpace, typename ViewType>
-  void impl_test_local_deepcopy_teampolicy_rank_2 (const int N) {
+template <typename ExecSpace, typename ViewType>
+void impl_test_local_deepcopy_teampolicy_rank_2(const int N) {
+  // Allocate matrices on device.
+  ViewType A("A", N, N, N, N, N, N, N, N);
+  ViewType B("B", N, N, N, N, N, N, N, N);
 
-    // Allocate matrices on device.
-    ViewType A( "A", N, N, N, N, N, N, N, N );
-    ViewType B( "B", N, N, N, N, N, N, N, N );
+  // Create host mirrors of device views.
+  typename ViewType::HostMirror h_A = Kokkos::create_mirror_view(A);
+  typename ViewType::HostMirror h_B = Kokkos::create_mirror_view(B);
 
-    // Create host mirrors of device views.
-    typename ViewType::HostMirror h_A = Kokkos::create_mirror_view( A );
-    typename ViewType::HostMirror h_B = Kokkos::create_mirror_view( B );
+  // Initialize A matrix.
+  auto subA = Kokkos::subview(A, 1, 1, 1, 1, 1, Kokkos::ALL(), Kokkos::ALL(),
+                              Kokkos::ALL());
+  Kokkos::deep_copy(subA, 10.0);
 
-    // Initialize A matrix.
-    auto subA = Kokkos::subview(A, 1, 1, 1, 1, 1, Kokkos::ALL(), Kokkos::ALL(), Kokkos::ALL());
-    Kokkos::deep_copy( subA, 10.0 );
+  typedef Kokkos::TeamPolicy<ExecSpace> team_policy;
+  typedef typename Kokkos::TeamPolicy<ExecSpace>::member_type member_type;
 
-    typedef Kokkos::TeamPolicy<ExecSpace>               team_policy;
-    typedef typename Kokkos::TeamPolicy<ExecSpace>::member_type  member_type;
+  // Deep Copy
+  Kokkos::parallel_for(
+      team_policy(N, Kokkos::AUTO),
+      KOKKOS_LAMBDA(const member_type& teamMember) {
+        int lid = teamMember.league_rank();  // returns a number between 0 and N
+        auto subSrc = Kokkos::subview(A, 1, 1, 1, 1, 1, lid, Kokkos::ALL(),
+                                      Kokkos::ALL());
+        auto subDst = Kokkos::subview(B, 1, 1, 1, 1, 1, lid, Kokkos::ALL(),
+                                      Kokkos::ALL());
+        Kokkos::Experimental::local_deep_copy(teamMember, subDst, subSrc);
+      });
 
-    //Deep Copy
-    Kokkos::parallel_for( team_policy( N, Kokkos::AUTO ), KOKKOS_LAMBDA ( const member_type &teamMember ) {
-      int lid = teamMember.league_rank();// returns a number between 0 and N
-      auto subSrc = Kokkos::subview(A, 1, 1, 1, 1, 1, lid, Kokkos::ALL(), Kokkos::ALL());
-      auto subDst = Kokkos::subview(B, 1, 1, 1, 1, 1, lid, Kokkos::ALL(), Kokkos::ALL());
-      Kokkos::Experimental::local_deep_copy(teamMember,subDst,subSrc);
-    });
+  Kokkos::deep_copy(h_A, A);
+  Kokkos::deep_copy(h_B, B);
 
-    Kokkos::deep_copy( h_A, A );
-    Kokkos::deep_copy( h_B, B );
-
-    bool test = true;
-    for(size_t i=0; i<A.span();i++){
-      if (h_A.data()[i]!=h_B.data()[i]) {test = false;break;}
+  bool test = true;
+  for (size_t i = 0; i < A.span(); i++) {
+    if (h_A.data()[i] != h_B.data()[i]) {
+      test = false;
+      break;
     }
-
-    ASSERT_EQ( test, true );
-
-    //Fill
-    Kokkos::deep_copy( B, 0.0 );
-
-    Kokkos::parallel_for( team_policy( N, Kokkos::AUTO ), KOKKOS_LAMBDA ( const member_type &teamMember ) {
-      int lid = teamMember.league_rank();// returns a number between 0 and N      
-      auto subDst = Kokkos::subview(B, 1, 1, 1, 1, 1, lid, Kokkos::ALL(), Kokkos::ALL());
-      Kokkos::Experimental::local_deep_copy(teamMember,subDst,20.0);
-    });
-
-    Kokkos::deep_copy( h_B, B );
-
-    double sum_all = 0.0;
-    for(size_t i=0; i<B.span();i++){
-      sum_all += h_B.data()[i];
-    }
-
-    ASSERT_EQ( sum_all, 20.0*N*N*N );
   }
+
+  ASSERT_EQ(test, true);
+
+  // Fill
+  Kokkos::deep_copy(B, 0.0);
+
+  Kokkos::parallel_for(
+      team_policy(N, Kokkos::AUTO),
+      KOKKOS_LAMBDA(const member_type& teamMember) {
+        int lid = teamMember.league_rank();  // returns a number between 0 and N
+        auto subDst = Kokkos::subview(B, 1, 1, 1, 1, 1, lid, Kokkos::ALL(),
+                                      Kokkos::ALL());
+        Kokkos::Experimental::local_deep_copy(teamMember, subDst, 20.0);
+      });
+
+  Kokkos::deep_copy(h_B, B);
+
+  double sum_all = 0.0;
+  for (size_t i = 0; i < B.span(); i++) {
+    sum_all += h_B.data()[i];
+  }
+
+  ASSERT_EQ(sum_all, 20.0 * N * N * N);
+}
 //-------------------------------------------------------------------------------------------------------------
-  template<typename ExecSpace, typename ViewType>
-  void impl_test_local_deepcopy_teampolicy_rank_3 (const int N) {
-  
-    // Allocate matrices on device.
-    ViewType A( "A", N, N, N, N, N, N, N, N );
-    ViewType B( "B", N, N, N, N, N, N, N, N );
+template <typename ExecSpace, typename ViewType>
+void impl_test_local_deepcopy_teampolicy_rank_3(const int N) {
+  // Allocate matrices on device.
+  ViewType A("A", N, N, N, N, N, N, N, N);
+  ViewType B("B", N, N, N, N, N, N, N, N);
 
-    // Create host mirrors of device views.
-    typename ViewType::HostMirror h_A = Kokkos::create_mirror_view( A );
-    typename ViewType::HostMirror h_B = Kokkos::create_mirror_view( B );
+  // Create host mirrors of device views.
+  typename ViewType::HostMirror h_A = Kokkos::create_mirror_view(A);
+  typename ViewType::HostMirror h_B = Kokkos::create_mirror_view(B);
 
-    // Initialize A matrix.
-    auto subA = Kokkos::subview(A, 1, 1, 1, 1, Kokkos::ALL(), Kokkos::ALL(), Kokkos::ALL(), Kokkos::ALL());
-    Kokkos::deep_copy( subA, 10.0 );
+  // Initialize A matrix.
+  auto subA = Kokkos::subview(A, 1, 1, 1, 1, Kokkos::ALL(), Kokkos::ALL(),
+                              Kokkos::ALL(), Kokkos::ALL());
+  Kokkos::deep_copy(subA, 10.0);
 
-    typedef Kokkos::TeamPolicy<ExecSpace>               team_policy;
-    typedef typename Kokkos::TeamPolicy<ExecSpace>::member_type  member_type;
+  typedef Kokkos::TeamPolicy<ExecSpace> team_policy;
+  typedef typename Kokkos::TeamPolicy<ExecSpace>::member_type member_type;
 
-    //Deep Copy
-    Kokkos::parallel_for( team_policy( N, Kokkos::AUTO ), KOKKOS_LAMBDA ( const member_type &teamMember ) {
-      int lid = teamMember.league_rank();// returns a number between 0 and N
-      auto subSrc = Kokkos::subview(A, 1, 1, 1, 1, lid, Kokkos::ALL(), Kokkos::ALL(), Kokkos::ALL());
-      auto subDst = Kokkos::subview(B, 1, 1, 1, 1, lid, Kokkos::ALL(), Kokkos::ALL(), Kokkos::ALL());
-      Kokkos::Experimental::local_deep_copy(teamMember,subDst,subSrc);
-    });
+  // Deep Copy
+  Kokkos::parallel_for(
+      team_policy(N, Kokkos::AUTO),
+      KOKKOS_LAMBDA(const member_type& teamMember) {
+        int lid = teamMember.league_rank();  // returns a number between 0 and N
+        auto subSrc = Kokkos::subview(A, 1, 1, 1, 1, lid, Kokkos::ALL(),
+                                      Kokkos::ALL(), Kokkos::ALL());
+        auto subDst = Kokkos::subview(B, 1, 1, 1, 1, lid, Kokkos::ALL(),
+                                      Kokkos::ALL(), Kokkos::ALL());
+        Kokkos::Experimental::local_deep_copy(teamMember, subDst, subSrc);
+      });
 
-    Kokkos::deep_copy( h_A, A );
-    Kokkos::deep_copy( h_B, B );
+  Kokkos::deep_copy(h_A, A);
+  Kokkos::deep_copy(h_B, B);
 
-    bool test = true;
-    for(size_t i=0; i<A.span();i++){
-      if (h_A.data()[i]!=h_B.data()[i]) {test = false;break;}
+  bool test = true;
+  for (size_t i = 0; i < A.span(); i++) {
+    if (h_A.data()[i] != h_B.data()[i]) {
+      test = false;
+      break;
     }
-
-    ASSERT_EQ( test, true );
-
-    //Fill
-    Kokkos::deep_copy( B, 0.0 );
-
-    Kokkos::parallel_for( team_policy( N, Kokkos::AUTO ), KOKKOS_LAMBDA ( const member_type &teamMember ) {
-      int lid = teamMember.league_rank();// returns a number between 0 and N      
-      auto subDst = Kokkos::subview(B, 1, 1, 1, 1, lid, Kokkos::ALL(), Kokkos::ALL(), Kokkos::ALL());
-      Kokkos::Experimental::local_deep_copy(teamMember,subDst,20.0);
-    });
-
-    Kokkos::deep_copy( h_B, B );
-
-    double sum_all = 0.0;
-    for(size_t i=0; i<B.span();i++){
-      sum_all += h_B.data()[i];
-    }
-
-    ASSERT_EQ( sum_all, 20.0*N*N*N*N );
   }
+
+  ASSERT_EQ(test, true);
+
+  // Fill
+  Kokkos::deep_copy(B, 0.0);
+
+  Kokkos::parallel_for(
+      team_policy(N, Kokkos::AUTO),
+      KOKKOS_LAMBDA(const member_type& teamMember) {
+        int lid = teamMember.league_rank();  // returns a number between 0 and N
+        auto subDst = Kokkos::subview(B, 1, 1, 1, 1, lid, Kokkos::ALL(),
+                                      Kokkos::ALL(), Kokkos::ALL());
+        Kokkos::Experimental::local_deep_copy(teamMember, subDst, 20.0);
+      });
+
+  Kokkos::deep_copy(h_B, B);
+
+  double sum_all = 0.0;
+  for (size_t i = 0; i < B.span(); i++) {
+    sum_all += h_B.data()[i];
+  }
+
+  ASSERT_EQ(sum_all, 20.0 * N * N * N * N);
+}
 //-------------------------------------------------------------------------------------------------------------
-  template<typename ExecSpace, typename ViewType>
-  void impl_test_local_deepcopy_teampolicy_rank_4 (const int N) {
-  
-    // Allocate matrices on device.
-    ViewType A( "A", N, N, N, N, N, N, N, N );
-    ViewType B( "B", N, N, N, N, N, N, N, N );
+template <typename ExecSpace, typename ViewType>
+void impl_test_local_deepcopy_teampolicy_rank_4(const int N) {
+  // Allocate matrices on device.
+  ViewType A("A", N, N, N, N, N, N, N, N);
+  ViewType B("B", N, N, N, N, N, N, N, N);
 
-    // Create host mirrors of device views.
-    typename ViewType::HostMirror h_A = Kokkos::create_mirror_view( A );
-    typename ViewType::HostMirror h_B = Kokkos::create_mirror_view( B );
+  // Create host mirrors of device views.
+  typename ViewType::HostMirror h_A = Kokkos::create_mirror_view(A);
+  typename ViewType::HostMirror h_B = Kokkos::create_mirror_view(B);
 
-    // Initialize A matrix.
-    auto subA = Kokkos::subview(A, 1, 1, 1, Kokkos::ALL(), Kokkos::ALL(), Kokkos::ALL(), Kokkos::ALL(), Kokkos::ALL());
-    Kokkos::deep_copy( subA, 10.0 );
+  // Initialize A matrix.
+  auto subA = Kokkos::subview(A, 1, 1, 1, Kokkos::ALL(), Kokkos::ALL(),
+                              Kokkos::ALL(), Kokkos::ALL(), Kokkos::ALL());
+  Kokkos::deep_copy(subA, 10.0);
 
-    typedef Kokkos::TeamPolicy<ExecSpace>               team_policy;
-    typedef typename Kokkos::TeamPolicy<ExecSpace>::member_type  member_type;
+  typedef Kokkos::TeamPolicy<ExecSpace> team_policy;
+  typedef typename Kokkos::TeamPolicy<ExecSpace>::member_type member_type;
 
-    //Deep Copy
-    Kokkos::parallel_for( team_policy( N, Kokkos::AUTO ), KOKKOS_LAMBDA ( const member_type &teamMember ) {
-      int lid = teamMember.league_rank();// returns a number between 0 and N
-      auto subSrc = Kokkos::subview(A, 1, 1, 1, lid, Kokkos::ALL(), Kokkos::ALL(), Kokkos::ALL(), Kokkos::ALL());
-      auto subDst = Kokkos::subview(B, 1, 1, 1, lid, Kokkos::ALL(), Kokkos::ALL(), Kokkos::ALL(), Kokkos::ALL());
-      Kokkos::Experimental::local_deep_copy(teamMember,subDst,subSrc);
-    });
+  // Deep Copy
+  Kokkos::parallel_for(
+      team_policy(N, Kokkos::AUTO),
+      KOKKOS_LAMBDA(const member_type& teamMember) {
+        int lid = teamMember.league_rank();  // returns a number between 0 and N
+        auto subSrc =
+            Kokkos::subview(A, 1, 1, 1, lid, Kokkos::ALL(), Kokkos::ALL(),
+                            Kokkos::ALL(), Kokkos::ALL());
+        auto subDst =
+            Kokkos::subview(B, 1, 1, 1, lid, Kokkos::ALL(), Kokkos::ALL(),
+                            Kokkos::ALL(), Kokkos::ALL());
+        Kokkos::Experimental::local_deep_copy(teamMember, subDst, subSrc);
+      });
 
-    Kokkos::deep_copy( h_A, A );
-    Kokkos::deep_copy( h_B, B );
+  Kokkos::deep_copy(h_A, A);
+  Kokkos::deep_copy(h_B, B);
 
-    bool test = true;
-    for(size_t i=0; i<A.span();i++){
-      if (h_A.data()[i]!=h_B.data()[i]) {test = false;break;}
+  bool test = true;
+  for (size_t i = 0; i < A.span(); i++) {
+    if (h_A.data()[i] != h_B.data()[i]) {
+      test = false;
+      break;
     }
-
-    ASSERT_EQ( test, true );
-
-    //Fill
-    Kokkos::deep_copy( B, 0.0 );
-
-    Kokkos::parallel_for( team_policy( N, Kokkos::AUTO ), KOKKOS_LAMBDA ( const member_type &teamMember ) {
-      int lid = teamMember.league_rank();// returns a number between 0 and N      
-      auto subDst = Kokkos::subview(B, 1, 1, 1, lid, Kokkos::ALL(), Kokkos::ALL(), Kokkos::ALL(), Kokkos::ALL());
-      Kokkos::Experimental::local_deep_copy(teamMember,subDst,20.0);
-    });
-
-    Kokkos::deep_copy( h_B, B );
-
-    double sum_all = 0.0;
-    for(size_t i=0; i<B.span();i++){
-      sum_all += h_B.data()[i];
-    }
-
-    ASSERT_EQ( sum_all, 20.0*N*N*N*N*N );
   }
+
+  ASSERT_EQ(test, true);
+
+  // Fill
+  Kokkos::deep_copy(B, 0.0);
+
+  Kokkos::parallel_for(
+      team_policy(N, Kokkos::AUTO),
+      KOKKOS_LAMBDA(const member_type& teamMember) {
+        int lid = teamMember.league_rank();  // returns a number between 0 and N
+        auto subDst =
+            Kokkos::subview(B, 1, 1, 1, lid, Kokkos::ALL(), Kokkos::ALL(),
+                            Kokkos::ALL(), Kokkos::ALL());
+        Kokkos::Experimental::local_deep_copy(teamMember, subDst, 20.0);
+      });
+
+  Kokkos::deep_copy(h_B, B);
+
+  double sum_all = 0.0;
+  for (size_t i = 0; i < B.span(); i++) {
+    sum_all += h_B.data()[i];
+  }
+
+  ASSERT_EQ(sum_all, 20.0 * N * N * N * N * N);
+}
 //-------------------------------------------------------------------------------------------------------------
-  template<typename ExecSpace, typename ViewType>
-  void impl_test_local_deepcopy_teampolicy_rank_5 (const int N) {
-  
-    // Allocate matrices on device.
-    ViewType A( "A", N, N, N, N, N, N, N, N );
-    ViewType B( "B", N, N, N, N, N, N, N, N );
+template <typename ExecSpace, typename ViewType>
+void impl_test_local_deepcopy_teampolicy_rank_5(const int N) {
+  // Allocate matrices on device.
+  ViewType A("A", N, N, N, N, N, N, N, N);
+  ViewType B("B", N, N, N, N, N, N, N, N);
 
-    // Create host mirrors of device views.
-    typename ViewType::HostMirror h_A = Kokkos::create_mirror_view( A );
-    typename ViewType::HostMirror h_B = Kokkos::create_mirror_view( B );
+  // Create host mirrors of device views.
+  typename ViewType::HostMirror h_A = Kokkos::create_mirror_view(A);
+  typename ViewType::HostMirror h_B = Kokkos::create_mirror_view(B);
 
-    // Initialize A matrix.
-    auto subA = Kokkos::subview(A, 1, 1, Kokkos::ALL(), Kokkos::ALL(), Kokkos::ALL(), Kokkos::ALL(), Kokkos::ALL(), Kokkos::ALL());
-    Kokkos::deep_copy( subA, 10.0 );
+  // Initialize A matrix.
+  auto subA =
+      Kokkos::subview(A, 1, 1, Kokkos::ALL(), Kokkos::ALL(), Kokkos::ALL(),
+                      Kokkos::ALL(), Kokkos::ALL(), Kokkos::ALL());
+  Kokkos::deep_copy(subA, 10.0);
 
-    typedef Kokkos::TeamPolicy<ExecSpace>               team_policy;
-    typedef typename Kokkos::TeamPolicy<ExecSpace>::member_type  member_type;
+  typedef Kokkos::TeamPolicy<ExecSpace> team_policy;
+  typedef typename Kokkos::TeamPolicy<ExecSpace>::member_type member_type;
 
-    //Deep Copy
-    Kokkos::parallel_for( team_policy( N, Kokkos::AUTO ), KOKKOS_LAMBDA ( const member_type &teamMember ) {
-      int lid = teamMember.league_rank();// returns a number between 0 and N
-      auto subSrc = Kokkos::subview(A, 1, 1, lid, Kokkos::ALL(), Kokkos::ALL(), Kokkos::ALL(), Kokkos::ALL(), Kokkos::ALL());
-      auto subDst = Kokkos::subview(B, 1, 1, lid, Kokkos::ALL(), Kokkos::ALL(), Kokkos::ALL(), Kokkos::ALL(), Kokkos::ALL());
-      Kokkos::Experimental::local_deep_copy(teamMember,subDst,subSrc);
-    });
+  // Deep Copy
+  Kokkos::parallel_for(
+      team_policy(N, Kokkos::AUTO),
+      KOKKOS_LAMBDA(const member_type& teamMember) {
+        int lid = teamMember.league_rank();  // returns a number between 0 and N
+        auto subSrc =
+            Kokkos::subview(A, 1, 1, lid, Kokkos::ALL(), Kokkos::ALL(),
+                            Kokkos::ALL(), Kokkos::ALL(), Kokkos::ALL());
+        auto subDst =
+            Kokkos::subview(B, 1, 1, lid, Kokkos::ALL(), Kokkos::ALL(),
+                            Kokkos::ALL(), Kokkos::ALL(), Kokkos::ALL());
+        Kokkos::Experimental::local_deep_copy(teamMember, subDst, subSrc);
+      });
 
-    Kokkos::deep_copy( h_A, A );
-    Kokkos::deep_copy( h_B, B );
+  Kokkos::deep_copy(h_A, A);
+  Kokkos::deep_copy(h_B, B);
 
-    bool test = true;
-    for(size_t i=0; i<A.span();i++){
-      if (h_A.data()[i]!=h_B.data()[i]) {test = false;break;}
+  bool test = true;
+  for (size_t i = 0; i < A.span(); i++) {
+    if (h_A.data()[i] != h_B.data()[i]) {
+      test = false;
+      break;
     }
-
-    ASSERT_EQ( test, true );
-
-    //Fill
-    Kokkos::deep_copy( B, 0.0 );
-
-    Kokkos::parallel_for( team_policy( N, Kokkos::AUTO ), KOKKOS_LAMBDA ( const member_type &teamMember ) {
-      int lid = teamMember.league_rank();// returns a number between 0 and N      
-      auto subDst = Kokkos::subview(B, 1, 1, lid, Kokkos::ALL(), Kokkos::ALL(), Kokkos::ALL(), Kokkos::ALL(), Kokkos::ALL());
-      Kokkos::Experimental::local_deep_copy(teamMember,subDst,20.0);
-    });
-
-    Kokkos::deep_copy( h_B, B );
-
-    double sum_all = 0.0;
-    for(size_t i=0; i<B.span();i++){
-      sum_all += h_B.data()[i];
-    }
-
-    ASSERT_EQ( sum_all, 20.0*N*N*N*N*N*N );
   }
+
+  ASSERT_EQ(test, true);
+
+  // Fill
+  Kokkos::deep_copy(B, 0.0);
+
+  Kokkos::parallel_for(
+      team_policy(N, Kokkos::AUTO),
+      KOKKOS_LAMBDA(const member_type& teamMember) {
+        int lid = teamMember.league_rank();  // returns a number between 0 and N
+        auto subDst =
+            Kokkos::subview(B, 1, 1, lid, Kokkos::ALL(), Kokkos::ALL(),
+                            Kokkos::ALL(), Kokkos::ALL(), Kokkos::ALL());
+        Kokkos::Experimental::local_deep_copy(teamMember, subDst, 20.0);
+      });
+
+  Kokkos::deep_copy(h_B, B);
+
+  double sum_all = 0.0;
+  for (size_t i = 0; i < B.span(); i++) {
+    sum_all += h_B.data()[i];
+  }
+
+  ASSERT_EQ(sum_all, 20.0 * N * N * N * N * N * N);
+}
 //-------------------------------------------------------------------------------------------------------------
-  template<typename ExecSpace, typename ViewType>
-  void impl_test_local_deepcopy_teampolicy_rank_6 (const int N) {
-  
-    // Allocate matrices on device.
-    ViewType A( "A", N, N, N, N, N, N, N, N );
-    ViewType B( "B", N, N, N, N, N, N, N, N );
+template <typename ExecSpace, typename ViewType>
+void impl_test_local_deepcopy_teampolicy_rank_6(const int N) {
+  // Allocate matrices on device.
+  ViewType A("A", N, N, N, N, N, N, N, N);
+  ViewType B("B", N, N, N, N, N, N, N, N);
 
-    // Create host mirrors of device views.
-    typename ViewType::HostMirror h_A = Kokkos::create_mirror_view( A );
-    typename ViewType::HostMirror h_B = Kokkos::create_mirror_view( B );
+  // Create host mirrors of device views.
+  typename ViewType::HostMirror h_A = Kokkos::create_mirror_view(A);
+  typename ViewType::HostMirror h_B = Kokkos::create_mirror_view(B);
 
-    // Initialize A matrix.
-    auto subA = Kokkos::subview(A, 1, Kokkos::ALL(), Kokkos::ALL(), Kokkos::ALL(), Kokkos::ALL(), Kokkos::ALL(), Kokkos::ALL(), Kokkos::ALL());
-    Kokkos::deep_copy( subA, 10.0 );
+  // Initialize A matrix.
+  auto subA = Kokkos::subview(A, 1, Kokkos::ALL(), Kokkos::ALL(), Kokkos::ALL(),
+                              Kokkos::ALL(), Kokkos::ALL(), Kokkos::ALL(),
+                              Kokkos::ALL());
+  Kokkos::deep_copy(subA, 10.0);
 
-    typedef Kokkos::TeamPolicy<ExecSpace>               team_policy;
-    typedef typename Kokkos::TeamPolicy<ExecSpace>::member_type  member_type;
+  typedef Kokkos::TeamPolicy<ExecSpace> team_policy;
+  typedef typename Kokkos::TeamPolicy<ExecSpace>::member_type member_type;
 
-    //Deep Copy
-    Kokkos::parallel_for( team_policy( N, Kokkos::AUTO ), KOKKOS_LAMBDA ( const member_type &teamMember ) {
-      int lid = teamMember.league_rank();// returns a number between 0 and N
-      auto subSrc = Kokkos::subview(A, 1, lid, Kokkos::ALL(), Kokkos::ALL(), Kokkos::ALL(), Kokkos::ALL(), Kokkos::ALL(), Kokkos::ALL());
-      auto subDst = Kokkos::subview(B, 1, lid, Kokkos::ALL(), Kokkos::ALL(), Kokkos::ALL(), Kokkos::ALL(), Kokkos::ALL(), Kokkos::ALL());
-      Kokkos::Experimental::local_deep_copy(teamMember,subDst,subSrc);
-    });
+  // Deep Copy
+  Kokkos::parallel_for(
+      team_policy(N, Kokkos::AUTO),
+      KOKKOS_LAMBDA(const member_type& teamMember) {
+        int lid = teamMember.league_rank();  // returns a number between 0 and N
+        auto subSrc = Kokkos::subview(A, 1, lid, Kokkos::ALL(), Kokkos::ALL(),
+                                      Kokkos::ALL(), Kokkos::ALL(),
+                                      Kokkos::ALL(), Kokkos::ALL());
+        auto subDst = Kokkos::subview(B, 1, lid, Kokkos::ALL(), Kokkos::ALL(),
+                                      Kokkos::ALL(), Kokkos::ALL(),
+                                      Kokkos::ALL(), Kokkos::ALL());
+        Kokkos::Experimental::local_deep_copy(teamMember, subDst, subSrc);
+      });
 
-    Kokkos::deep_copy( h_A, A );
-    Kokkos::deep_copy( h_B, B );
+  Kokkos::deep_copy(h_A, A);
+  Kokkos::deep_copy(h_B, B);
 
-    bool test = true;
-    for(size_t i=0; i<A.span();i++){
-      if (h_A.data()[i]!=h_B.data()[i]) {test = false;break;}
+  bool test = true;
+  for (size_t i = 0; i < A.span(); i++) {
+    if (h_A.data()[i] != h_B.data()[i]) {
+      test = false;
+      break;
     }
-
-    ASSERT_EQ( test, true );
-
-    //Fill
-    Kokkos::deep_copy( B, 0.0 );
-
-    Kokkos::parallel_for( team_policy( N, Kokkos::AUTO ), KOKKOS_LAMBDA ( const member_type &teamMember ) {
-      int lid = teamMember.league_rank();// returns a number between 0 and N      
-      auto subDst = Kokkos::subview(B, 1, lid, Kokkos::ALL(), Kokkos::ALL(), Kokkos::ALL(), Kokkos::ALL(), Kokkos::ALL(), Kokkos::ALL());
-      Kokkos::Experimental::local_deep_copy(teamMember,subDst,20.0);
-    });
-
-    Kokkos::deep_copy( h_B, B );
-
-    double sum_all = 0.0;
-    for(size_t i=0; i<B.span();i++){
-      sum_all += h_B.data()[i];
-    }
-
-    ASSERT_EQ( sum_all, 20.0*N*N*N*N*N*N*N );
   }
+
+  ASSERT_EQ(test, true);
+
+  // Fill
+  Kokkos::deep_copy(B, 0.0);
+
+  Kokkos::parallel_for(
+      team_policy(N, Kokkos::AUTO),
+      KOKKOS_LAMBDA(const member_type& teamMember) {
+        int lid = teamMember.league_rank();  // returns a number between 0 and N
+        auto subDst = Kokkos::subview(B, 1, lid, Kokkos::ALL(), Kokkos::ALL(),
+                                      Kokkos::ALL(), Kokkos::ALL(),
+                                      Kokkos::ALL(), Kokkos::ALL());
+        Kokkos::Experimental::local_deep_copy(teamMember, subDst, 20.0);
+      });
+
+  Kokkos::deep_copy(h_B, B);
+
+  double sum_all = 0.0;
+  for (size_t i = 0; i < B.span(); i++) {
+    sum_all += h_B.data()[i];
+  }
+
+  ASSERT_EQ(sum_all, 20.0 * N * N * N * N * N * N * N);
+}
 //-------------------------------------------------------------------------------------------------------------
-  template<typename ExecSpace, typename ViewType>
-  void impl_test_local_deepcopy_teampolicy_rank_7 (const int N) {
-  
-    // Allocate matrices on device.
-    ViewType A( "A", N, N, N, N, N, N, N, N );
-    ViewType B( "B", N, N, N, N, N, N, N, N );
+template <typename ExecSpace, typename ViewType>
+void impl_test_local_deepcopy_teampolicy_rank_7(const int N) {
+  // Allocate matrices on device.
+  ViewType A("A", N, N, N, N, N, N, N, N);
+  ViewType B("B", N, N, N, N, N, N, N, N);
 
-    // Create host mirrors of device views.
-    typename ViewType::HostMirror h_A = Kokkos::create_mirror_view( A );
-    typename ViewType::HostMirror h_B = Kokkos::create_mirror_view( B );
+  // Create host mirrors of device views.
+  typename ViewType::HostMirror h_A = Kokkos::create_mirror_view(A);
+  typename ViewType::HostMirror h_B = Kokkos::create_mirror_view(B);
 
-    // Initialize A matrix.
-    Kokkos::deep_copy( A, 10.0 );
+  // Initialize A matrix.
+  Kokkos::deep_copy(A, 10.0);
 
-    typedef Kokkos::TeamPolicy<ExecSpace>               team_policy;
-    typedef typename Kokkos::TeamPolicy<ExecSpace>::member_type  member_type;
+  typedef Kokkos::TeamPolicy<ExecSpace> team_policy;
+  typedef typename Kokkos::TeamPolicy<ExecSpace>::member_type member_type;
 
-    //Deep Copy
-    Kokkos::parallel_for( team_policy( N, Kokkos::AUTO ), KOKKOS_LAMBDA ( const member_type &teamMember ) {
-      int lid = teamMember.league_rank();// returns a number between 0 and N
-      auto subSrc = Kokkos::subview(A, lid, Kokkos::ALL(), Kokkos::ALL(), Kokkos::ALL(), Kokkos::ALL(), Kokkos::ALL(), Kokkos::ALL(), Kokkos::ALL());
-      auto subDst = Kokkos::subview(B, lid, Kokkos::ALL(), Kokkos::ALL(), Kokkos::ALL(), Kokkos::ALL(), Kokkos::ALL(), Kokkos::ALL(), Kokkos::ALL());
-      Kokkos::Experimental::local_deep_copy(teamMember,subDst,subSrc);
-    });
+  // Deep Copy
+  Kokkos::parallel_for(
+      team_policy(N, Kokkos::AUTO),
+      KOKKOS_LAMBDA(const member_type& teamMember) {
+        int lid = teamMember.league_rank();  // returns a number between 0 and N
+        auto subSrc = Kokkos::subview(
+            A, lid, Kokkos::ALL(), Kokkos::ALL(), Kokkos::ALL(), Kokkos::ALL(),
+            Kokkos::ALL(), Kokkos::ALL(), Kokkos::ALL());
+        auto subDst = Kokkos::subview(
+            B, lid, Kokkos::ALL(), Kokkos::ALL(), Kokkos::ALL(), Kokkos::ALL(),
+            Kokkos::ALL(), Kokkos::ALL(), Kokkos::ALL());
+        Kokkos::Experimental::local_deep_copy(teamMember, subDst, subSrc);
+      });
 
-    Kokkos::deep_copy( h_A, A );
-    Kokkos::deep_copy( h_B, B );
+  Kokkos::deep_copy(h_A, A);
+  Kokkos::deep_copy(h_B, B);
 
-    bool test = true;
-    for(size_t i=0; i<A.span();i++){
-      if (h_A.data()[i]!=h_B.data()[i]) {test = false;break;}
+  bool test = true;
+  for (size_t i = 0; i < A.span(); i++) {
+    if (h_A.data()[i] != h_B.data()[i]) {
+      test = false;
+      break;
     }
-
-    ASSERT_EQ( test, true );
-
-    //Fill
-    Kokkos::deep_copy( B, 0.0 );
-
-    Kokkos::parallel_for( team_policy( N, Kokkos::AUTO ), KOKKOS_LAMBDA ( const member_type &teamMember ) {
-      int lid = teamMember.league_rank();// returns a number between 0 and N      
-      auto subDst = Kokkos::subview(B, lid, Kokkos::ALL(), Kokkos::ALL(), Kokkos::ALL(), Kokkos::ALL(), Kokkos::ALL(), Kokkos::ALL(), Kokkos::ALL());
-      Kokkos::Experimental::local_deep_copy(teamMember,subDst,20.0);
-    });
-
-    Kokkos::deep_copy( h_B, B );
-
-    double sum_all = 0.0;
-    for(size_t i=0; i<B.span();i++){
-      sum_all += h_B.data()[i];
-    }
-
-    ASSERT_EQ( sum_all, 20.0*N*N*N*N*N*N*N*N );
   }
+
+  ASSERT_EQ(test, true);
+
+  // Fill
+  Kokkos::deep_copy(B, 0.0);
+
+  Kokkos::parallel_for(
+      team_policy(N, Kokkos::AUTO),
+      KOKKOS_LAMBDA(const member_type& teamMember) {
+        int lid = teamMember.league_rank();  // returns a number between 0 and N
+        auto subDst = Kokkos::subview(
+            B, lid, Kokkos::ALL(), Kokkos::ALL(), Kokkos::ALL(), Kokkos::ALL(),
+            Kokkos::ALL(), Kokkos::ALL(), Kokkos::ALL());
+        Kokkos::Experimental::local_deep_copy(teamMember, subDst, 20.0);
+      });
+
+  Kokkos::deep_copy(h_B, B);
+
+  double sum_all = 0.0;
+  for (size_t i = 0; i < B.span(); i++) {
+    sum_all += h_B.data()[i];
+  }
+
+  ASSERT_EQ(sum_all, 20.0 * N * N * N * N * N * N * N * N);
+}
 //-------------------------------------------------------------------------------------------------------------
-  template<typename ExecSpace, typename ViewType>
-  void impl_test_local_deepcopy_rangepolicy_rank_1 (const int N) {
-  
-    // Allocate matrices on device.
-    ViewType A( "A", N, N, N, N, N, N, N, N );
-    ViewType B( "B", N, N, N, N, N, N, N, N );
+template <typename ExecSpace, typename ViewType>
+void impl_test_local_deepcopy_rangepolicy_rank_1(const int N) {
+  // Allocate matrices on device.
+  ViewType A("A", N, N, N, N, N, N, N, N);
+  ViewType B("B", N, N, N, N, N, N, N, N);
 
-    // Create host mirrors of device views.
-    typename ViewType::HostMirror h_A = Kokkos::create_mirror_view( A );
-    typename ViewType::HostMirror h_B = Kokkos::create_mirror_view( B );
+  // Create host mirrors of device views.
+  typename ViewType::HostMirror h_A = Kokkos::create_mirror_view(A);
+  typename ViewType::HostMirror h_B = Kokkos::create_mirror_view(B);
 
-    // Initialize A matrix.
-    auto subA = Kokkos::subview(A, 1, 1, 1, 1, 1, 1, Kokkos::ALL(), Kokkos::ALL());
-    Kokkos::deep_copy( subA, 10.0 );
+  // Initialize A matrix.
+  auto subA =
+      Kokkos::subview(A, 1, 1, 1, 1, 1, 1, Kokkos::ALL(), Kokkos::ALL());
+  Kokkos::deep_copy(subA, 10.0);
 
-    //Deep Copy
-    Kokkos::parallel_for( Kokkos::RangePolicy<ExecSpace>(0,N), KOKKOS_LAMBDA ( const int& i ) {
-      auto subSrc = Kokkos::subview(A, 1, 1, 1, 1, 1, 1, i, Kokkos::ALL());
-      auto subDst = Kokkos::subview(B, 1, 1, 1, 1, 1, 1, i, Kokkos::ALL());
-      Kokkos::Experimental::local_deep_copy(subDst,subSrc);
-    });
+  // Deep Copy
+  Kokkos::parallel_for(
+      Kokkos::RangePolicy<ExecSpace>(0, N), KOKKOS_LAMBDA(const int& i) {
+        auto subSrc = Kokkos::subview(A, 1, 1, 1, 1, 1, 1, i, Kokkos::ALL());
+        auto subDst = Kokkos::subview(B, 1, 1, 1, 1, 1, 1, i, Kokkos::ALL());
+        Kokkos::Experimental::local_deep_copy(subDst, subSrc);
+      });
 
-    Kokkos::deep_copy( h_A, A );
-    Kokkos::deep_copy( h_B, B );
+  Kokkos::deep_copy(h_A, A);
+  Kokkos::deep_copy(h_B, B);
 
-    bool test = true;
-    for(size_t i=0; i<A.span();i++){
-      if (h_A.data()[i]!=h_B.data()[i]) {test = false;break;}
+  bool test = true;
+  for (size_t i = 0; i < A.span(); i++) {
+    if (h_A.data()[i] != h_B.data()[i]) {
+      test = false;
+      break;
     }
-
-    ASSERT_EQ( test, true );
-
-    //Fill
-    Kokkos::deep_copy( B, 0.0 );
-
-    Kokkos::parallel_for( Kokkos::RangePolicy<ExecSpace>(0,N), KOKKOS_LAMBDA ( const int& i ) {      
-      auto subDst = Kokkos::subview(B, 1, 1, 1, 1, 1, 1, i, Kokkos::ALL());
-      Kokkos::Experimental::local_deep_copy(subDst,20.0);
-    });
-
-    Kokkos::deep_copy( h_B, B );
-
-    double sum_all = 0.0;
-    for(size_t i=0; i<B.span();i++){
-      sum_all += h_B.data()[i];
-    }
-
-    ASSERT_EQ( sum_all, 20.0*N*N );  
   }
+
+  ASSERT_EQ(test, true);
+
+  // Fill
+  Kokkos::deep_copy(B, 0.0);
+
+  Kokkos::parallel_for(
+      Kokkos::RangePolicy<ExecSpace>(0, N), KOKKOS_LAMBDA(const int& i) {
+        auto subDst = Kokkos::subview(B, 1, 1, 1, 1, 1, 1, i, Kokkos::ALL());
+        Kokkos::Experimental::local_deep_copy(subDst, 20.0);
+      });
+
+  Kokkos::deep_copy(h_B, B);
+
+  double sum_all = 0.0;
+  for (size_t i = 0; i < B.span(); i++) {
+    sum_all += h_B.data()[i];
+  }
+
+  ASSERT_EQ(sum_all, 20.0 * N * N);
+}
 //-------------------------------------------------------------------------------------------------------------
-  template<typename ExecSpace, typename ViewType>
-  void impl_test_local_deepcopy_rangepolicy_rank_2 (const int N) {
+template <typename ExecSpace, typename ViewType>
+void impl_test_local_deepcopy_rangepolicy_rank_2(const int N) {
+  // Allocate matrices on device.
+  ViewType A("A", N, N, N, N, N, N, N, N);
+  ViewType B("B", N, N, N, N, N, N, N, N);
 
-    // Allocate matrices on device.
-    ViewType A( "A", N, N, N, N, N, N, N, N );
-    ViewType B( "B", N, N, N, N, N, N, N, N );
+  // Create host mirrors of device views.
+  typename ViewType::HostMirror h_A = Kokkos::create_mirror_view(A);
+  typename ViewType::HostMirror h_B = Kokkos::create_mirror_view(B);
 
-    // Create host mirrors of device views.
-    typename ViewType::HostMirror h_A = Kokkos::create_mirror_view( A );
-    typename ViewType::HostMirror h_B = Kokkos::create_mirror_view( B );
+  // Initialize A matrix.
+  auto subA = Kokkos::subview(A, 1, 1, 1, 1, 1, Kokkos::ALL(), Kokkos::ALL(),
+                              Kokkos::ALL());
+  Kokkos::deep_copy(subA, 10.0);
 
-    // Initialize A matrix.
-    auto subA = Kokkos::subview(A, 1, 1, 1, 1, 1, Kokkos::ALL(), Kokkos::ALL(), Kokkos::ALL());
-    Kokkos::deep_copy( subA, 10.0 );
+  // Deep Copy
+  Kokkos::parallel_for(
+      Kokkos::RangePolicy<ExecSpace>(0, N), KOKKOS_LAMBDA(const int& i) {
+        auto subSrc =
+            Kokkos::subview(A, 1, 1, 1, 1, 1, i, Kokkos::ALL(), Kokkos::ALL());
+        auto subDst =
+            Kokkos::subview(B, 1, 1, 1, 1, 1, i, Kokkos::ALL(), Kokkos::ALL());
+        Kokkos::Experimental::local_deep_copy(subDst, subSrc);
+      });
 
-    //Deep Copy
-    Kokkos::parallel_for( Kokkos::RangePolicy<ExecSpace>(0,N), KOKKOS_LAMBDA ( const int& i ) {
-      auto subSrc = Kokkos::subview(A, 1, 1, 1, 1, 1, i, Kokkos::ALL(), Kokkos::ALL());
-      auto subDst = Kokkos::subview(B, 1, 1, 1, 1, 1, i, Kokkos::ALL(), Kokkos::ALL());
-      Kokkos::Experimental::local_deep_copy(subDst,subSrc);
-    });
+  Kokkos::deep_copy(h_A, A);
+  Kokkos::deep_copy(h_B, B);
 
-    Kokkos::deep_copy( h_A, A );
-    Kokkos::deep_copy( h_B, B );
-
-    bool test = true;
-    for(size_t i=0; i<A.span();i++){
-      if (h_A.data()[i]!=h_B.data()[i]) {test = false;break;}
+  bool test = true;
+  for (size_t i = 0; i < A.span(); i++) {
+    if (h_A.data()[i] != h_B.data()[i]) {
+      test = false;
+      break;
     }
-
-    ASSERT_EQ( test, true );
-
-    //Fill
-    Kokkos::deep_copy( B, 0.0 );
-
-    Kokkos::parallel_for( Kokkos::RangePolicy<ExecSpace>(0,N), KOKKOS_LAMBDA ( const int& i ) {      
-      auto subDst = Kokkos::subview(B, 1, 1, 1, 1, 1, i, Kokkos::ALL(), Kokkos::ALL());
-      Kokkos::Experimental::local_deep_copy(subDst,20.0);
-    });
-
-    Kokkos::deep_copy( h_B, B );
-
-    double sum_all = 0.0;
-    for(size_t i=0; i<B.span();i++){
-      sum_all += h_B.data()[i];
-    }
-
-    ASSERT_EQ( sum_all, 20.0*N*N*N );
   }
+
+  ASSERT_EQ(test, true);
+
+  // Fill
+  Kokkos::deep_copy(B, 0.0);
+
+  Kokkos::parallel_for(
+      Kokkos::RangePolicy<ExecSpace>(0, N), KOKKOS_LAMBDA(const int& i) {
+        auto subDst =
+            Kokkos::subview(B, 1, 1, 1, 1, 1, i, Kokkos::ALL(), Kokkos::ALL());
+        Kokkos::Experimental::local_deep_copy(subDst, 20.0);
+      });
+
+  Kokkos::deep_copy(h_B, B);
+
+  double sum_all = 0.0;
+  for (size_t i = 0; i < B.span(); i++) {
+    sum_all += h_B.data()[i];
+  }
+
+  ASSERT_EQ(sum_all, 20.0 * N * N * N);
+}
 //-------------------------------------------------------------------------------------------------------------
-  template<typename ExecSpace, typename ViewType>
-  void impl_test_local_deepcopy_rangepolicy_rank_3 (const int N) {
- 
-    // Allocate matrices on device.
-    ViewType A( "A", N, N, N, N, N, N, N, N );
-    ViewType B( "B", N, N, N, N, N, N, N, N );
+template <typename ExecSpace, typename ViewType>
+void impl_test_local_deepcopy_rangepolicy_rank_3(const int N) {
+  // Allocate matrices on device.
+  ViewType A("A", N, N, N, N, N, N, N, N);
+  ViewType B("B", N, N, N, N, N, N, N, N);
 
-    // Create host mirrors of device views.
-    typename ViewType::HostMirror h_A = Kokkos::create_mirror_view( A );
-    typename ViewType::HostMirror h_B = Kokkos::create_mirror_view( B );
+  // Create host mirrors of device views.
+  typename ViewType::HostMirror h_A = Kokkos::create_mirror_view(A);
+  typename ViewType::HostMirror h_B = Kokkos::create_mirror_view(B);
 
-    // Initialize A matrix.
-    auto subA = Kokkos::subview(A, 1, 1, 1, 1, Kokkos::ALL(), Kokkos::ALL(), Kokkos::ALL(), Kokkos::ALL());
-    Kokkos::deep_copy( subA, 10.0 );
+  // Initialize A matrix.
+  auto subA = Kokkos::subview(A, 1, 1, 1, 1, Kokkos::ALL(), Kokkos::ALL(),
+                              Kokkos::ALL(), Kokkos::ALL());
+  Kokkos::deep_copy(subA, 10.0);
 
-    //Deep Copy
-    Kokkos::parallel_for( Kokkos::RangePolicy<ExecSpace>(0,N), KOKKOS_LAMBDA ( const int& i ) {
-      auto subSrc = Kokkos::subview(A, 1, 1, 1, 1, i, Kokkos::ALL(), Kokkos::ALL(), Kokkos::ALL());
-      auto subDst = Kokkos::subview(B, 1, 1, 1, 1, i, Kokkos::ALL(), Kokkos::ALL(), Kokkos::ALL());
-      Kokkos::Experimental::local_deep_copy(subDst,subSrc);
-    });
+  // Deep Copy
+  Kokkos::parallel_for(
+      Kokkos::RangePolicy<ExecSpace>(0, N), KOKKOS_LAMBDA(const int& i) {
+        auto subSrc = Kokkos::subview(A, 1, 1, 1, 1, i, Kokkos::ALL(),
+                                      Kokkos::ALL(), Kokkos::ALL());
+        auto subDst = Kokkos::subview(B, 1, 1, 1, 1, i, Kokkos::ALL(),
+                                      Kokkos::ALL(), Kokkos::ALL());
+        Kokkos::Experimental::local_deep_copy(subDst, subSrc);
+      });
 
-    Kokkos::deep_copy( h_A, A );
-    Kokkos::deep_copy( h_B, B );
+  Kokkos::deep_copy(h_A, A);
+  Kokkos::deep_copy(h_B, B);
 
-    bool test = true;
-    for(size_t i=0; i<A.span();i++){
-      if (h_A.data()[i]!=h_B.data()[i]) {test = false;break;}
+  bool test = true;
+  for (size_t i = 0; i < A.span(); i++) {
+    if (h_A.data()[i] != h_B.data()[i]) {
+      test = false;
+      break;
     }
-
-    ASSERT_EQ( test, true );
-
-    //Fill
-    Kokkos::deep_copy( B, 0.0 );
-
-    Kokkos::parallel_for( Kokkos::RangePolicy<ExecSpace>(0,N), KOKKOS_LAMBDA ( const int& i ) {
-      auto subDst = Kokkos::subview(B, 1, 1, 1, 1, i, Kokkos::ALL(), Kokkos::ALL(), Kokkos::ALL());
-      Kokkos::Experimental::local_deep_copy(subDst,20.0);
-    });
-
-    Kokkos::deep_copy( h_B, B );
-
-    double sum_all = 0.0;
-    for(size_t i=0; i<B.span();i++){
-      sum_all += h_B.data()[i];
-    }
-
-    ASSERT_EQ( sum_all, 20.0*N*N*N*N );
   }
+
+  ASSERT_EQ(test, true);
+
+  // Fill
+  Kokkos::deep_copy(B, 0.0);
+
+  Kokkos::parallel_for(
+      Kokkos::RangePolicy<ExecSpace>(0, N), KOKKOS_LAMBDA(const int& i) {
+        auto subDst = Kokkos::subview(B, 1, 1, 1, 1, i, Kokkos::ALL(),
+                                      Kokkos::ALL(), Kokkos::ALL());
+        Kokkos::Experimental::local_deep_copy(subDst, 20.0);
+      });
+
+  Kokkos::deep_copy(h_B, B);
+
+  double sum_all = 0.0;
+  for (size_t i = 0; i < B.span(); i++) {
+    sum_all += h_B.data()[i];
+  }
+
+  ASSERT_EQ(sum_all, 20.0 * N * N * N * N);
+}
 //-------------------------------------------------------------------------------------------------------------
-  template<typename ExecSpace, typename ViewType>
-  void impl_test_local_deepcopy_rangepolicy_rank_4 (const int N) {
- 
-    // Allocate matrices on device.
-    ViewType A( "A", N, N, N, N, N, N, N, N );
-    ViewType B( "B", N, N, N, N, N, N, N, N );
+template <typename ExecSpace, typename ViewType>
+void impl_test_local_deepcopy_rangepolicy_rank_4(const int N) {
+  // Allocate matrices on device.
+  ViewType A("A", N, N, N, N, N, N, N, N);
+  ViewType B("B", N, N, N, N, N, N, N, N);
 
-    // Create host mirrors of device views.
-    typename ViewType::HostMirror h_A = Kokkos::create_mirror_view( A );
-    typename ViewType::HostMirror h_B = Kokkos::create_mirror_view( B );
+  // Create host mirrors of device views.
+  typename ViewType::HostMirror h_A = Kokkos::create_mirror_view(A);
+  typename ViewType::HostMirror h_B = Kokkos::create_mirror_view(B);
 
-    // Initialize A matrix.
-    auto subA = Kokkos::subview(A, 1, 1, 1, Kokkos::ALL(), Kokkos::ALL(), Kokkos::ALL(), Kokkos::ALL(), Kokkos::ALL());
-    Kokkos::deep_copy( subA, 10.0 );
+  // Initialize A matrix.
+  auto subA = Kokkos::subview(A, 1, 1, 1, Kokkos::ALL(), Kokkos::ALL(),
+                              Kokkos::ALL(), Kokkos::ALL(), Kokkos::ALL());
+  Kokkos::deep_copy(subA, 10.0);
 
-    //Deep Copy
-    Kokkos::parallel_for( Kokkos::RangePolicy<ExecSpace>(0,N), KOKKOS_LAMBDA ( const int& i ) {
-      auto subSrc = Kokkos::subview(A, 1, 1, 1, i, Kokkos::ALL(), Kokkos::ALL(), Kokkos::ALL(), Kokkos::ALL());
-      auto subDst = Kokkos::subview(B, 1, 1, 1, i, Kokkos::ALL(), Kokkos::ALL(), Kokkos::ALL(), Kokkos::ALL());
-      Kokkos::Experimental::local_deep_copy(subDst,subSrc);
-    });
+  // Deep Copy
+  Kokkos::parallel_for(
+      Kokkos::RangePolicy<ExecSpace>(0, N), KOKKOS_LAMBDA(const int& i) {
+        auto subSrc =
+            Kokkos::subview(A, 1, 1, 1, i, Kokkos::ALL(), Kokkos::ALL(),
+                            Kokkos::ALL(), Kokkos::ALL());
+        auto subDst =
+            Kokkos::subview(B, 1, 1, 1, i, Kokkos::ALL(), Kokkos::ALL(),
+                            Kokkos::ALL(), Kokkos::ALL());
+        Kokkos::Experimental::local_deep_copy(subDst, subSrc);
+      });
 
-    Kokkos::deep_copy( h_A, A );
-    Kokkos::deep_copy( h_B, B );
+  Kokkos::deep_copy(h_A, A);
+  Kokkos::deep_copy(h_B, B);
 
-    bool test = true;
-    for(size_t i=0; i<A.span();i++){
-      if (h_A.data()[i]!=h_B.data()[i]) {test = false;break;}
+  bool test = true;
+  for (size_t i = 0; i < A.span(); i++) {
+    if (h_A.data()[i] != h_B.data()[i]) {
+      test = false;
+      break;
     }
-
-    ASSERT_EQ( test, true );
-
-    //Fill
-    Kokkos::deep_copy( B, 0.0 );
-
-    Kokkos::parallel_for( Kokkos::RangePolicy<ExecSpace>(0,N), KOKKOS_LAMBDA ( const int& i ) {
-      auto subDst = Kokkos::subview(B, 1, 1, 1, i, Kokkos::ALL(), Kokkos::ALL(), Kokkos::ALL(), Kokkos::ALL());
-      Kokkos::Experimental::local_deep_copy(subDst,20.0);
-    });
-
-    Kokkos::deep_copy( h_B, B );
-
-    double sum_all = 0.0;
-    for(size_t i=0; i<B.span();i++){
-      sum_all += h_B.data()[i];
-    }
-
-    ASSERT_EQ( sum_all, 20.0*N*N*N*N*N );
   }
+
+  ASSERT_EQ(test, true);
+
+  // Fill
+  Kokkos::deep_copy(B, 0.0);
+
+  Kokkos::parallel_for(
+      Kokkos::RangePolicy<ExecSpace>(0, N), KOKKOS_LAMBDA(const int& i) {
+        auto subDst =
+            Kokkos::subview(B, 1, 1, 1, i, Kokkos::ALL(), Kokkos::ALL(),
+                            Kokkos::ALL(), Kokkos::ALL());
+        Kokkos::Experimental::local_deep_copy(subDst, 20.0);
+      });
+
+  Kokkos::deep_copy(h_B, B);
+
+  double sum_all = 0.0;
+  for (size_t i = 0; i < B.span(); i++) {
+    sum_all += h_B.data()[i];
+  }
+
+  ASSERT_EQ(sum_all, 20.0 * N * N * N * N * N);
+}
 //-------------------------------------------------------------------------------------------------------------
-  template<typename ExecSpace, typename ViewType>
-  void impl_test_local_deepcopy_rangepolicy_rank_5 (const int N) {
- 
-    // Allocate matrices on device.
-    ViewType A( "A", N, N, N, N, N, N, N, N );
-    ViewType B( "B", N, N, N, N, N, N, N, N );
+template <typename ExecSpace, typename ViewType>
+void impl_test_local_deepcopy_rangepolicy_rank_5(const int N) {
+  // Allocate matrices on device.
+  ViewType A("A", N, N, N, N, N, N, N, N);
+  ViewType B("B", N, N, N, N, N, N, N, N);
 
-    // Create host mirrors of device views.
-    typename ViewType::HostMirror h_A = Kokkos::create_mirror_view( A );
-    typename ViewType::HostMirror h_B = Kokkos::create_mirror_view( B );
+  // Create host mirrors of device views.
+  typename ViewType::HostMirror h_A = Kokkos::create_mirror_view(A);
+  typename ViewType::HostMirror h_B = Kokkos::create_mirror_view(B);
 
-    // Initialize A matrix.
-    auto subA = Kokkos::subview(A, 1, 1, Kokkos::ALL(), Kokkos::ALL(), Kokkos::ALL(), Kokkos::ALL(), Kokkos::ALL(), Kokkos::ALL());
-    Kokkos::deep_copy( subA, 10.0 );
+  // Initialize A matrix.
+  auto subA =
+      Kokkos::subview(A, 1, 1, Kokkos::ALL(), Kokkos::ALL(), Kokkos::ALL(),
+                      Kokkos::ALL(), Kokkos::ALL(), Kokkos::ALL());
+  Kokkos::deep_copy(subA, 10.0);
 
-    //Deep Copy
-    Kokkos::parallel_for( Kokkos::RangePolicy<ExecSpace>(0,N), KOKKOS_LAMBDA ( const int& i ) {
-      auto subSrc = Kokkos::subview(A, 1, 1, i, Kokkos::ALL(), Kokkos::ALL(), Kokkos::ALL(), Kokkos::ALL(), Kokkos::ALL());
-      auto subDst = Kokkos::subview(B, 1, 1, i, Kokkos::ALL(), Kokkos::ALL(), Kokkos::ALL(), Kokkos::ALL(), Kokkos::ALL());
-      Kokkos::Experimental::local_deep_copy(subDst,subSrc);
-    });
+  // Deep Copy
+  Kokkos::parallel_for(
+      Kokkos::RangePolicy<ExecSpace>(0, N), KOKKOS_LAMBDA(const int& i) {
+        auto subSrc =
+            Kokkos::subview(A, 1, 1, i, Kokkos::ALL(), Kokkos::ALL(),
+                            Kokkos::ALL(), Kokkos::ALL(), Kokkos::ALL());
+        auto subDst =
+            Kokkos::subview(B, 1, 1, i, Kokkos::ALL(), Kokkos::ALL(),
+                            Kokkos::ALL(), Kokkos::ALL(), Kokkos::ALL());
+        Kokkos::Experimental::local_deep_copy(subDst, subSrc);
+      });
 
-    Kokkos::deep_copy( h_A, A );
-    Kokkos::deep_copy( h_B, B );
+  Kokkos::deep_copy(h_A, A);
+  Kokkos::deep_copy(h_B, B);
 
-    bool test = true;
-    for(size_t i=0; i<A.span();i++){
-      if (h_A.data()[i]!=h_B.data()[i]) {test = false;break;}
+  bool test = true;
+  for (size_t i = 0; i < A.span(); i++) {
+    if (h_A.data()[i] != h_B.data()[i]) {
+      test = false;
+      break;
     }
-
-    ASSERT_EQ( test, true );
-
-    //Fill
-    Kokkos::deep_copy( B, 0.0 );
-
-    Kokkos::parallel_for( Kokkos::RangePolicy<ExecSpace>(0,N), KOKKOS_LAMBDA ( const int& i ) {
-      auto subDst = Kokkos::subview(B, 1, 1, i, Kokkos::ALL(), Kokkos::ALL(), Kokkos::ALL(), Kokkos::ALL(), Kokkos::ALL());
-      Kokkos::Experimental::local_deep_copy(subDst,20.0);
-    });
-
-    Kokkos::deep_copy( h_B, B );
-
-    double sum_all = 0.0;
-    for(size_t i=0; i<B.span();i++){
-      sum_all += h_B.data()[i];
-    }
-
-    ASSERT_EQ( sum_all, 20.0*N*N*N*N*N*N );
   }
+
+  ASSERT_EQ(test, true);
+
+  // Fill
+  Kokkos::deep_copy(B, 0.0);
+
+  Kokkos::parallel_for(
+      Kokkos::RangePolicy<ExecSpace>(0, N), KOKKOS_LAMBDA(const int& i) {
+        auto subDst =
+            Kokkos::subview(B, 1, 1, i, Kokkos::ALL(), Kokkos::ALL(),
+                            Kokkos::ALL(), Kokkos::ALL(), Kokkos::ALL());
+        Kokkos::Experimental::local_deep_copy(subDst, 20.0);
+      });
+
+  Kokkos::deep_copy(h_B, B);
+
+  double sum_all = 0.0;
+  for (size_t i = 0; i < B.span(); i++) {
+    sum_all += h_B.data()[i];
+  }
+
+  ASSERT_EQ(sum_all, 20.0 * N * N * N * N * N * N);
+}
 //-------------------------------------------------------------------------------------------------------------
-  template<typename ExecSpace, typename ViewType>
-  void impl_test_local_deepcopy_rangepolicy_rank_6 (const int N) {
- 
-    // Allocate matrices on device.
-    ViewType A( "A", N, N, N, N, N, N, N, N );
-    ViewType B( "B", N, N, N, N, N, N, N, N );
+template <typename ExecSpace, typename ViewType>
+void impl_test_local_deepcopy_rangepolicy_rank_6(const int N) {
+  // Allocate matrices on device.
+  ViewType A("A", N, N, N, N, N, N, N, N);
+  ViewType B("B", N, N, N, N, N, N, N, N);
 
-    // Create host mirrors of device views.
-    typename ViewType::HostMirror h_A = Kokkos::create_mirror_view( A );
-    typename ViewType::HostMirror h_B = Kokkos::create_mirror_view( B );
+  // Create host mirrors of device views.
+  typename ViewType::HostMirror h_A = Kokkos::create_mirror_view(A);
+  typename ViewType::HostMirror h_B = Kokkos::create_mirror_view(B);
 
-    // Initialize A matrix.
-    auto subA = Kokkos::subview(A, 1, Kokkos::ALL(), Kokkos::ALL(), Kokkos::ALL(), Kokkos::ALL(), Kokkos::ALL(), Kokkos::ALL(), Kokkos::ALL());
-    Kokkos::deep_copy( subA, 10.0 );
+  // Initialize A matrix.
+  auto subA = Kokkos::subview(A, 1, Kokkos::ALL(), Kokkos::ALL(), Kokkos::ALL(),
+                              Kokkos::ALL(), Kokkos::ALL(), Kokkos::ALL(),
+                              Kokkos::ALL());
+  Kokkos::deep_copy(subA, 10.0);
 
-    //Deep Copy
-    Kokkos::parallel_for( Kokkos::RangePolicy<ExecSpace>(0,N), KOKKOS_LAMBDA ( const int& i ) {
-      auto subSrc = Kokkos::subview(A, 1, i, Kokkos::ALL(), Kokkos::ALL(), Kokkos::ALL(), Kokkos::ALL(), Kokkos::ALL(), Kokkos::ALL());
-      auto subDst = Kokkos::subview(B, 1, i, Kokkos::ALL(), Kokkos::ALL(), Kokkos::ALL(), Kokkos::ALL(), Kokkos::ALL(), Kokkos::ALL());
-      Kokkos::Experimental::local_deep_copy(subDst,subSrc);
-    });
+  // Deep Copy
+  Kokkos::parallel_for(
+      Kokkos::RangePolicy<ExecSpace>(0, N), KOKKOS_LAMBDA(const int& i) {
+        auto subSrc = Kokkos::subview(A, 1, i, Kokkos::ALL(), Kokkos::ALL(),
+                                      Kokkos::ALL(), Kokkos::ALL(),
+                                      Kokkos::ALL(), Kokkos::ALL());
+        auto subDst = Kokkos::subview(B, 1, i, Kokkos::ALL(), Kokkos::ALL(),
+                                      Kokkos::ALL(), Kokkos::ALL(),
+                                      Kokkos::ALL(), Kokkos::ALL());
+        Kokkos::Experimental::local_deep_copy(subDst, subSrc);
+      });
 
-    Kokkos::deep_copy( h_A, A );
-    Kokkos::deep_copy( h_B, B );
+  Kokkos::deep_copy(h_A, A);
+  Kokkos::deep_copy(h_B, B);
 
-    bool test = true;
-    for(size_t i=0; i<A.span();i++){
-      if (h_A.data()[i]!=h_B.data()[i]) {test = false;break;}
+  bool test = true;
+  for (size_t i = 0; i < A.span(); i++) {
+    if (h_A.data()[i] != h_B.data()[i]) {
+      test = false;
+      break;
     }
-
-    ASSERT_EQ( test, true );
-
-    //Fill
-    Kokkos::deep_copy( B, 0.0 );
-
-    Kokkos::parallel_for( Kokkos::RangePolicy<ExecSpace>(0,N), KOKKOS_LAMBDA ( const int& i ) {
-      auto subDst = Kokkos::subview(B, 1, i, Kokkos::ALL(), Kokkos::ALL(), Kokkos::ALL(), Kokkos::ALL(), Kokkos::ALL(), Kokkos::ALL());
-      Kokkos::Experimental::local_deep_copy(subDst,20.0);
-    });
-
-    Kokkos::deep_copy( h_B, B );
-
-    double sum_all = 0.0;
-    for(size_t i=0; i<B.span();i++){
-      sum_all += h_B.data()[i];
-    }
-
-    ASSERT_EQ( sum_all, 20.0*N*N*N*N*N*N*N );
   }
+
+  ASSERT_EQ(test, true);
+
+  // Fill
+  Kokkos::deep_copy(B, 0.0);
+
+  Kokkos::parallel_for(
+      Kokkos::RangePolicy<ExecSpace>(0, N), KOKKOS_LAMBDA(const int& i) {
+        auto subDst = Kokkos::subview(B, 1, i, Kokkos::ALL(), Kokkos::ALL(),
+                                      Kokkos::ALL(), Kokkos::ALL(),
+                                      Kokkos::ALL(), Kokkos::ALL());
+        Kokkos::Experimental::local_deep_copy(subDst, 20.0);
+      });
+
+  Kokkos::deep_copy(h_B, B);
+
+  double sum_all = 0.0;
+  for (size_t i = 0; i < B.span(); i++) {
+    sum_all += h_B.data()[i];
+  }
+
+  ASSERT_EQ(sum_all, 20.0 * N * N * N * N * N * N * N);
+}
 //-------------------------------------------------------------------------------------------------------------
-  template<typename ExecSpace, typename ViewType>
-  void impl_test_local_deepcopy_rangepolicy_rank_7 (const int N) {
- 
-    // Allocate matrices on device.
-    ViewType A( "A", N, N, N, N, N, N, N, N );
-    ViewType B( "B", N, N, N, N, N, N, N, N );
+template <typename ExecSpace, typename ViewType>
+void impl_test_local_deepcopy_rangepolicy_rank_7(const int N) {
+  // Allocate matrices on device.
+  ViewType A("A", N, N, N, N, N, N, N, N);
+  ViewType B("B", N, N, N, N, N, N, N, N);
 
-    // Create host mirrors of device views.
-    typename ViewType::HostMirror h_A = Kokkos::create_mirror_view( A );
-    typename ViewType::HostMirror h_B = Kokkos::create_mirror_view( B );
+  // Create host mirrors of device views.
+  typename ViewType::HostMirror h_A = Kokkos::create_mirror_view(A);
+  typename ViewType::HostMirror h_B = Kokkos::create_mirror_view(B);
 
-    // Initialize A matrix.
-    Kokkos::deep_copy( A, 10.0 );
+  // Initialize A matrix.
+  Kokkos::deep_copy(A, 10.0);
 
-    //Deep Copy
-    Kokkos::parallel_for( Kokkos::RangePolicy<ExecSpace>(0,N), KOKKOS_LAMBDA ( const int& i ) {
-      auto subSrc = Kokkos::subview(A, i, Kokkos::ALL(), Kokkos::ALL(), Kokkos::ALL(), Kokkos::ALL(), Kokkos::ALL(), Kokkos::ALL(), Kokkos::ALL());
-      auto subDst = Kokkos::subview(B, i, Kokkos::ALL(), Kokkos::ALL(), Kokkos::ALL(), Kokkos::ALL(), Kokkos::ALL(), Kokkos::ALL(), Kokkos::ALL());
-      Kokkos::Experimental::local_deep_copy(subDst,subSrc);
-    });
+  // Deep Copy
+  Kokkos::parallel_for(
+      Kokkos::RangePolicy<ExecSpace>(0, N), KOKKOS_LAMBDA(const int& i) {
+        auto subSrc = Kokkos::subview(
+            A, i, Kokkos::ALL(), Kokkos::ALL(), Kokkos::ALL(), Kokkos::ALL(),
+            Kokkos::ALL(), Kokkos::ALL(), Kokkos::ALL());
+        auto subDst = Kokkos::subview(
+            B, i, Kokkos::ALL(), Kokkos::ALL(), Kokkos::ALL(), Kokkos::ALL(),
+            Kokkos::ALL(), Kokkos::ALL(), Kokkos::ALL());
+        Kokkos::Experimental::local_deep_copy(subDst, subSrc);
+      });
 
-    Kokkos::deep_copy( h_A, A );
-    Kokkos::deep_copy( h_B, B );
+  Kokkos::deep_copy(h_A, A);
+  Kokkos::deep_copy(h_B, B);
 
-    bool test = true;
-    for(size_t i=0; i<A.span();i++){
-      if (h_A.data()[i]!=h_B.data()[i]) {test = false;break;}
+  bool test = true;
+  for (size_t i = 0; i < A.span(); i++) {
+    if (h_A.data()[i] != h_B.data()[i]) {
+      test = false;
+      break;
     }
-
-    ASSERT_EQ( test, true );
-
-    //Fill
-    Kokkos::deep_copy( B, 0.0 );
-
-    Kokkos::parallel_for( Kokkos::RangePolicy<ExecSpace>(0,N), KOKKOS_LAMBDA ( const int& i ) {
-      auto subDst = Kokkos::subview(B, i, Kokkos::ALL(), Kokkos::ALL(), Kokkos::ALL(), Kokkos::ALL(), Kokkos::ALL(), Kokkos::ALL(), Kokkos::ALL());
-      Kokkos::Experimental::local_deep_copy(subDst,20.0);
-    });
-
-    Kokkos::deep_copy( h_B, B );
-
-    double sum_all = 0.0;
-    for(size_t i=0; i<B.span();i++){
-      sum_all += h_B.data()[i];
-    }
-
-    ASSERT_EQ( sum_all, 20.0*N*N*N*N*N*N*N*N );
   }
-//-------------------------------------------------------------------------------------------------------------  
 
-#if defined( KOKKOS_ENABLE_CXX11_DISPATCH_LAMBDA )
-#if !defined(KOKKOS_ENABLE_CUDA) || ( 8000 <= CUDA_VERSION )
-TEST_F( TEST_CATEGORY , local_deepcopy_teampolicy_layoutleft )
-{
+  ASSERT_EQ(test, true);
+
+  // Fill
+  Kokkos::deep_copy(B, 0.0);
+
+  Kokkos::parallel_for(
+      Kokkos::RangePolicy<ExecSpace>(0, N), KOKKOS_LAMBDA(const int& i) {
+        auto subDst = Kokkos::subview(
+            B, i, Kokkos::ALL(), Kokkos::ALL(), Kokkos::ALL(), Kokkos::ALL(),
+            Kokkos::ALL(), Kokkos::ALL(), Kokkos::ALL());
+        Kokkos::Experimental::local_deep_copy(subDst, 20.0);
+      });
+
+  Kokkos::deep_copy(h_B, B);
+
+  double sum_all = 0.0;
+  for (size_t i = 0; i < B.span(); i++) {
+    sum_all += h_B.data()[i];
+  }
+
+  ASSERT_EQ(sum_all, 20.0 * N * N * N * N * N * N * N * N);
+}
+//-------------------------------------------------------------------------------------------------------------
+
+#if defined(KOKKOS_ENABLE_CXX11_DISPATCH_LAMBDA)
+#if !defined(KOKKOS_ENABLE_CUDA) || (8000 <= CUDA_VERSION)
+TEST(TEST_CATEGORY, local_deepcopy_teampolicy_layoutleft) {
   typedef TEST_EXECSPACE ExecSpace;
-  typedef Kokkos::View<double********,Kokkos::LayoutLeft,ExecSpace> ViewType;
-  
-  { //Rank-1
-    impl_test_local_deepcopy_teampolicy_rank_1<ExecSpace,ViewType>(8);
+  typedef Kokkos::View<double********, Kokkos::LayoutLeft, ExecSpace> ViewType;
+
+  {  // Rank-1
+    impl_test_local_deepcopy_teampolicy_rank_1<ExecSpace, ViewType>(8);
   }
-  { //Rank-2
-    impl_test_local_deepcopy_teampolicy_rank_2<ExecSpace,ViewType>(8);
+  {  // Rank-2
+    impl_test_local_deepcopy_teampolicy_rank_2<ExecSpace, ViewType>(8);
   }
-  { //Rank-3
-    impl_test_local_deepcopy_teampolicy_rank_3<ExecSpace,ViewType>(8);
+  {  // Rank-3
+    impl_test_local_deepcopy_teampolicy_rank_3<ExecSpace, ViewType>(8);
   }
-  { //Rank-4
-    impl_test_local_deepcopy_teampolicy_rank_4<ExecSpace,ViewType>(8);
+  {  // Rank-4
+    impl_test_local_deepcopy_teampolicy_rank_4<ExecSpace, ViewType>(8);
   }
-  { //Rank-5
-    impl_test_local_deepcopy_teampolicy_rank_5<ExecSpace,ViewType>(8);
+  {  // Rank-5
+    impl_test_local_deepcopy_teampolicy_rank_5<ExecSpace, ViewType>(8);
   }
-  { //Rank-6
-    impl_test_local_deepcopy_teampolicy_rank_6<ExecSpace,ViewType>(8);
+  {  // Rank-6
+    impl_test_local_deepcopy_teampolicy_rank_6<ExecSpace, ViewType>(8);
   }
-  { //Rank-7
-    impl_test_local_deepcopy_teampolicy_rank_7<ExecSpace,ViewType>(8);
+  {  // Rank-7
+    impl_test_local_deepcopy_teampolicy_rank_7<ExecSpace, ViewType>(8);
   }
 }
 //-------------------------------------------------------------------------------------------------------------
-TEST_F( TEST_CATEGORY , local_deepcopy_rangepolicy_layoutleft )
-{
+TEST(TEST_CATEGORY, local_deepcopy_rangepolicy_layoutleft) {
   typedef TEST_EXECSPACE ExecSpace;
-  typedef Kokkos::View<double********,Kokkos::LayoutLeft,ExecSpace> ViewType;
+  typedef Kokkos::View<double********, Kokkos::LayoutLeft, ExecSpace> ViewType;
 
-  { //Rank-1
-    impl_test_local_deepcopy_rangepolicy_rank_1<ExecSpace,ViewType>(8);
+  {  // Rank-1
+    impl_test_local_deepcopy_rangepolicy_rank_1<ExecSpace, ViewType>(8);
   }
-  { //Rank-2
-    impl_test_local_deepcopy_rangepolicy_rank_2<ExecSpace,ViewType>(8);
+  {  // Rank-2
+    impl_test_local_deepcopy_rangepolicy_rank_2<ExecSpace, ViewType>(8);
   }
-  { //Rank-3
-    impl_test_local_deepcopy_rangepolicy_rank_3<ExecSpace,ViewType>(8);
+  {  // Rank-3
+    impl_test_local_deepcopy_rangepolicy_rank_3<ExecSpace, ViewType>(8);
   }
-  { //Rank-4
-    impl_test_local_deepcopy_rangepolicy_rank_4<ExecSpace,ViewType>(8);
+  {  // Rank-4
+    impl_test_local_deepcopy_rangepolicy_rank_4<ExecSpace, ViewType>(8);
   }
-  { //Rank-5
-    impl_test_local_deepcopy_rangepolicy_rank_5<ExecSpace,ViewType>(8);
+  {  // Rank-5
+    impl_test_local_deepcopy_rangepolicy_rank_5<ExecSpace, ViewType>(8);
   }
-  { //Rank-6
-    impl_test_local_deepcopy_rangepolicy_rank_6<ExecSpace,ViewType>(8);
+  {  // Rank-6
+    impl_test_local_deepcopy_rangepolicy_rank_6<ExecSpace, ViewType>(8);
   }
-  { //Rank-7
-    impl_test_local_deepcopy_rangepolicy_rank_7<ExecSpace,ViewType>(8);
+  {  // Rank-7
+    impl_test_local_deepcopy_rangepolicy_rank_7<ExecSpace, ViewType>(8);
   }
 }
 //-------------------------------------------------------------------------------------------------------------
-TEST_F( TEST_CATEGORY , local_deepcopy_teampolicy_layoutright )
-{
+TEST(TEST_CATEGORY, local_deepcopy_teampolicy_layoutright) {
   typedef TEST_EXECSPACE ExecSpace;
-  typedef Kokkos::View<double********,Kokkos::LayoutRight,ExecSpace> ViewType;
+  typedef Kokkos::View<double********, Kokkos::LayoutRight, ExecSpace> ViewType;
 
-  { //Rank-1
-    impl_test_local_deepcopy_teampolicy_rank_1<ExecSpace,ViewType>(8);
+  {  // Rank-1
+    impl_test_local_deepcopy_teampolicy_rank_1<ExecSpace, ViewType>(8);
   }
-  { //Rank-2
-    impl_test_local_deepcopy_teampolicy_rank_2<ExecSpace,ViewType>(8);
+  {  // Rank-2
+    impl_test_local_deepcopy_teampolicy_rank_2<ExecSpace, ViewType>(8);
   }
-  { //Rank-3
-    impl_test_local_deepcopy_teampolicy_rank_3<ExecSpace,ViewType>(8);
+  {  // Rank-3
+    impl_test_local_deepcopy_teampolicy_rank_3<ExecSpace, ViewType>(8);
   }
-  { //Rank-4
-    impl_test_local_deepcopy_teampolicy_rank_4<ExecSpace,ViewType>(8);
+  {  // Rank-4
+    impl_test_local_deepcopy_teampolicy_rank_4<ExecSpace, ViewType>(8);
   }
-  { //Rank-5
-    impl_test_local_deepcopy_teampolicy_rank_5<ExecSpace,ViewType>(8);
+  {  // Rank-5
+    impl_test_local_deepcopy_teampolicy_rank_5<ExecSpace, ViewType>(8);
   }
-  { //Rank-6
-    impl_test_local_deepcopy_teampolicy_rank_6<ExecSpace,ViewType>(8);
+  {  // Rank-6
+    impl_test_local_deepcopy_teampolicy_rank_6<ExecSpace, ViewType>(8);
   }
-  { //Rank-7
-    impl_test_local_deepcopy_teampolicy_rank_7<ExecSpace,ViewType>(8);
+  {  // Rank-7
+    impl_test_local_deepcopy_teampolicy_rank_7<ExecSpace, ViewType>(8);
   }
 }
 //-------------------------------------------------------------------------------------------------------------
-TEST_F( TEST_CATEGORY , local_deepcopy_rangepolicy_layoutright )
-{
+TEST(TEST_CATEGORY, local_deepcopy_rangepolicy_layoutright) {
   typedef TEST_EXECSPACE ExecSpace;
-  typedef Kokkos::View<double********,Kokkos::LayoutRight,ExecSpace> ViewType;
+  typedef Kokkos::View<double********, Kokkos::LayoutRight, ExecSpace> ViewType;
 
-  { //Rank-1
-    impl_test_local_deepcopy_rangepolicy_rank_1<ExecSpace,ViewType>(8);
+  {  // Rank-1
+    impl_test_local_deepcopy_rangepolicy_rank_1<ExecSpace, ViewType>(8);
   }
-  { //Rank-2
-    impl_test_local_deepcopy_rangepolicy_rank_2<ExecSpace,ViewType>(8);
+  {  // Rank-2
+    impl_test_local_deepcopy_rangepolicy_rank_2<ExecSpace, ViewType>(8);
   }
-  { //Rank-3
-    impl_test_local_deepcopy_rangepolicy_rank_3<ExecSpace,ViewType>(8);
+  {  // Rank-3
+    impl_test_local_deepcopy_rangepolicy_rank_3<ExecSpace, ViewType>(8);
   }
-  { //Rank-4
-    impl_test_local_deepcopy_rangepolicy_rank_4<ExecSpace,ViewType>(8);
+  {  // Rank-4
+    impl_test_local_deepcopy_rangepolicy_rank_4<ExecSpace, ViewType>(8);
   }
-  { //Rank-5
-    impl_test_local_deepcopy_rangepolicy_rank_5<ExecSpace,ViewType>(8);
+  {  // Rank-5
+    impl_test_local_deepcopy_rangepolicy_rank_5<ExecSpace, ViewType>(8);
   }
-  { //Rank-6
-    impl_test_local_deepcopy_rangepolicy_rank_6<ExecSpace,ViewType>(8);
+  {  // Rank-6
+    impl_test_local_deepcopy_rangepolicy_rank_6<ExecSpace, ViewType>(8);
   }
-  { //Rank-7
-    impl_test_local_deepcopy_rangepolicy_rank_7<ExecSpace,ViewType>(8);
+  {  // Rank-7
+    impl_test_local_deepcopy_rangepolicy_rank_7<ExecSpace, ViewType>(8);
   }
 }
 #endif
 #endif
-}
+}  // namespace Test
diff --git a/lib/kokkos/core/unit_test/TestMDRange.hpp b/lib/kokkos/core/unit_test/TestMDRange.hpp
index cea89a4872..1e1bd869ca 100644
--- a/lib/kokkos/core/unit_test/TestMDRange.hpp
+++ b/lib/kokkos/core/unit_test/TestMDRange.hpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -53,916 +54,996 @@ namespace {
 
 using namespace Kokkos;
 
-template <typename ExecSpace >
+template <typename ExecSpace>
 struct TestMDRange_ReduceArray_2D {
-
   using DataType       = int;
-  using ViewType_2     = typename Kokkos::View< DataType**, ExecSpace >;
+  using ViewType_2     = typename Kokkos::View<DataType **, ExecSpace>;
   using HostViewType_2 = typename ViewType_2::HostMirror;
 
   ViewType_2 input_view;
 
   using scalar_type = double;
-  using value_type = scalar_type[];
+  using value_type  = scalar_type[];
   const unsigned value_count;
 
-  TestMDRange_ReduceArray_2D( const int N0, const int N1, const unsigned array_size ) 
-    : input_view( "input_view", N0, N1 ) 
-    , value_count( array_size )
-  {}
+  TestMDRange_ReduceArray_2D(const int N0, const int N1,
+                             const unsigned array_size)
+      : input_view("input_view", N0, N1), value_count(array_size) {}
 
   KOKKOS_INLINE_FUNCTION
-  void init( scalar_type dst[] ) const
-  {
-    for ( unsigned i = 0; i < value_count; ++i ) {
+  void init(scalar_type dst[]) const {
+    for (unsigned i = 0; i < value_count; ++i) {
       dst[i] = 0.0;
     }
   }
 
   KOKKOS_INLINE_FUNCTION
-  void join( volatile scalar_type dst[],
-             const volatile scalar_type src[] ) const
-  {
-    for ( unsigned i = 0; i < value_count; ++i ) {
-        dst[i] += src[i];
+  void join(volatile scalar_type dst[],
+            const volatile scalar_type src[]) const {
+    for (unsigned i = 0; i < value_count; ++i) {
+      dst[i] += src[i];
     }
   }
 
+  KOKKOS_INLINE_FUNCTION
+  void operator()(const int i, const int j) const { input_view(i, j) = 1; }
 
   KOKKOS_INLINE_FUNCTION
-  void operator()( const int i, const int j ) const
-  {
-    input_view( i, j ) = 1;
-  }
-
-  KOKKOS_INLINE_FUNCTION
-  void operator()( const int i, const int j, value_type lsum ) const
-  {
-    lsum[0] += input_view( i, j ) * 2; //+=6 each time if InitTag => N0*N1*6
-    lsum[1] += input_view( i, j ) ;    //+=3 each time if InitTag => N0*N1*3
+  void operator()(const int i, const int j, value_type lsum) const {
+    lsum[0] += input_view(i, j) * 2;  //+=6 each time if InitTag => N0*N1*6
+    lsum[1] += input_view(i, j);      //+=3 each time if InitTag => N0*N1*3
   }
 
   // tagged operators
   struct InitTag {};
   KOKKOS_INLINE_FUNCTION
-  void operator()( const InitTag &, const int i, const int j ) const
-  {
-    input_view( i, j ) = 3;
+  void operator()(const InitTag &, const int i, const int j) const {
+    input_view(i, j) = 3;
   }
 
-  static void test_arrayreduce2( const int N0, const int N1 )
-  {
-
+  static void test_arrayreduce2(const int N0, const int N1) {
     {
-      typedef typename Kokkos::MDRangePolicy< ExecSpace, Kokkos::Rank<2>, Kokkos::IndexType<int>, InitTag > range_type_init;
-      typedef typename Kokkos::MDRangePolicy< ExecSpace, Kokkos::Rank<2>, Kokkos::IndexType<int> > range_type;
+      typedef typename Kokkos::MDRangePolicy<ExecSpace, Kokkos::Rank<2>,
+                                             Kokkos::IndexType<int>, InitTag>
+          range_type_init;
+      typedef typename Kokkos::MDRangePolicy<ExecSpace, Kokkos::Rank<2>,
+                                             Kokkos::IndexType<int> >
+          range_type;
       typedef typename range_type::tile_type tile_type;
       typedef typename range_type::point_type point_type;
 
-      range_type_init range_init( point_type{ { 0, 0 } }, point_type{ { N0, N1 } }, tile_type{ { 3, 3 } } );
-      range_type range( point_type{ { 0, 0 } }, point_type{ { N0, N1 } }, tile_type{ { 3, 3 } } );
+      range_type_init range_init(point_type{{0, 0}}, point_type{{N0, N1}},
+                                 tile_type{{3, 3}});
+      range_type range(point_type{{0, 0}}, point_type{{N0, N1}},
+                       tile_type{{3, 3}});
 
       const unsigned array_size = 2;
 
-      TestMDRange_ReduceArray_2D functor( N0, N1, array_size );
+      TestMDRange_ReduceArray_2D functor(N0, N1, array_size);
 
-      parallel_for( range_init, functor ); // Init the view to 3's
+      parallel_for(range_init, functor);  // Init the view to 3's
 
-      double sums[ array_size ];
-      parallel_reduce( range, functor, sums );
+      double sums[array_size];
+      parallel_reduce(range, functor, sums);
 
       // Check output
-      //printf("Array Reduce result. N0 = %d  N1 = %d  N0*N1 = %d  sums[0] = %lf  sums[1] = %lf \n", N0, N1, N0*N1, sums[0], sums[1]);
+      // printf("Array Reduce result. N0 = %d  N1 = %d  N0*N1 = %d  sums[0] =
+      // %lf  sums[1] = %lf \n", N0, N1, N0*N1, sums[0], sums[1]);
 
-      ASSERT_EQ( sums[0], 6 * N0 * N1 );
-      ASSERT_EQ( sums[1], 3 * N0 * N1 );
+      ASSERT_EQ(sums[0], 6 * N0 * N1);
+      ASSERT_EQ(sums[1], 3 * N0 * N1);
     }
   }
 };
 
-template <typename ExecSpace >
+template <typename ExecSpace>
 struct TestMDRange_ReduceArray_3D {
-
   using DataType       = int;
-  using ViewType_3     = typename Kokkos::View< DataType***, ExecSpace >;
+  using ViewType_3     = typename Kokkos::View<DataType ***, ExecSpace>;
   using HostViewType_3 = typename ViewType_3::HostMirror;
 
   ViewType_3 input_view;
 
   using scalar_type = double;
-  using value_type = scalar_type[];
+  using value_type  = scalar_type[];
   const unsigned value_count;
 
-  TestMDRange_ReduceArray_3D( const int N0, const int N1, const int N2, const unsigned array_size ) 
-    : input_view( "input_view", N0, N1, N2 ) 
-    , value_count( array_size )
-  {}
+  TestMDRange_ReduceArray_3D(const int N0, const int N1, const int N2,
+                             const unsigned array_size)
+      : input_view("input_view", N0, N1, N2), value_count(array_size) {}
 
   KOKKOS_INLINE_FUNCTION
-  void init( scalar_type dst[] ) const
-  {
-    for ( unsigned i = 0; i < value_count; ++i ) {
+  void init(scalar_type dst[]) const {
+    for (unsigned i = 0; i < value_count; ++i) {
       dst[i] = 0.0;
     }
   }
 
   KOKKOS_INLINE_FUNCTION
-  void join( volatile scalar_type dst[],
-             const volatile scalar_type src[] ) const
-  {
-    for ( unsigned i = 0; i < value_count; ++i ) {
-        dst[i] += src[i];
+  void join(volatile scalar_type dst[],
+            const volatile scalar_type src[]) const {
+    for (unsigned i = 0; i < value_count; ++i) {
+      dst[i] += src[i];
     }
   }
 
-
   KOKKOS_INLINE_FUNCTION
-  void operator()( const int i, const int j, const int k ) const
-  {
-    input_view( i, j, k ) = 1;
+  void operator()(const int i, const int j, const int k) const {
+    input_view(i, j, k) = 1;
   }
 
   KOKKOS_INLINE_FUNCTION
-  void operator()( const int i, const int j, const int k, value_type lsum ) const
-  {
-    lsum[0] += input_view( i, j, k ) * 2; //+=6 each time if InitTag => N0*N1*N2*6
-    lsum[1] += input_view( i, j, k ) ;    //+=3 each time if InitTag => N0*N1*N2*3
+  void operator()(const int i, const int j, const int k,
+                  value_type lsum) const {
+    lsum[0] +=
+        input_view(i, j, k) * 2;     //+=6 each time if InitTag => N0*N1*N2*6
+    lsum[1] += input_view(i, j, k);  //+=3 each time if InitTag => N0*N1*N2*3
   }
 
   // tagged operators
   struct InitTag {};
   KOKKOS_INLINE_FUNCTION
-  void operator()( const InitTag &, const int i, const int j, const int k ) const
-  {
-    input_view( i, j, k ) = 3;
+  void operator()(const InitTag &, const int i, const int j,
+                  const int k) const {
+    input_view(i, j, k) = 3;
   }
 
-  static void test_arrayreduce3( const int N0, const int N1, const int N2 )
-  {
-
+  static void test_arrayreduce3(const int N0, const int N1, const int N2) {
     {
-      typedef typename Kokkos::MDRangePolicy< ExecSpace, Kokkos::Rank<3>, Kokkos::IndexType<int>, InitTag > range_type_init;
-      typedef typename Kokkos::MDRangePolicy< ExecSpace, Kokkos::Rank<3>, Kokkos::IndexType<int> > range_type;
+      typedef typename Kokkos::MDRangePolicy<ExecSpace, Kokkos::Rank<3>,
+                                             Kokkos::IndexType<int>, InitTag>
+          range_type_init;
+      typedef typename Kokkos::MDRangePolicy<ExecSpace, Kokkos::Rank<3>,
+                                             Kokkos::IndexType<int> >
+          range_type;
       typedef typename range_type::tile_type tile_type;
       typedef typename range_type::point_type point_type;
 
-      range_type_init range_init( point_type{ { 0, 0, 0 } }, point_type{ { N0, N1, N2 } }, tile_type{ { 3, 3, 3 } } );
-      range_type range( point_type{ { 0, 0, 0 } }, point_type{ { N0, N1, N2 } }, tile_type{ { 3, 3, 3 } } );
+      range_type_init range_init(point_type{{0, 0, 0}},
+                                 point_type{{N0, N1, N2}},
+                                 tile_type{{3, 3, 3}});
+      range_type range(point_type{{0, 0, 0}}, point_type{{N0, N1, N2}},
+                       tile_type{{3, 3, 3}});
 
       const unsigned array_size = 2;
 
-      TestMDRange_ReduceArray_3D functor( N0, N1, N2, array_size );
+      TestMDRange_ReduceArray_3D functor(N0, N1, N2, array_size);
 
-      parallel_for( range_init, functor ); // Init the view to 3's
+      parallel_for(range_init, functor);  // Init the view to 3's
 
-      double sums[ array_size ];
-      parallel_reduce( range, functor, sums );
+      double sums[array_size];
+      parallel_reduce(range, functor, sums);
 
-      ASSERT_EQ( sums[0], 6 * N0 * N1 * N2 );
-      ASSERT_EQ( sums[1], 3 * N0 * N1 * N2 );
+      ASSERT_EQ(sums[0], 6 * N0 * N1 * N2);
+      ASSERT_EQ(sums[1], 3 * N0 * N1 * N2);
     }
   }
 };
 
-
-template <typename ExecSpace >
+template <typename ExecSpace>
 struct TestMDRange_2D {
   using DataType     = int;
-  using ViewType     = typename Kokkos::View< DataType**, ExecSpace >;
+  using ViewType     = typename Kokkos::View<DataType **, ExecSpace>;
   using HostViewType = typename ViewType::HostMirror;
 
   ViewType input_view;
   using value_type = double;
 
-  TestMDRange_2D( const DataType N0, const DataType N1 ) : input_view( "input_view", N0, N1 ) {}
+  TestMDRange_2D(const DataType N0, const DataType N1)
+      : input_view("input_view", N0, N1) {}
 
   KOKKOS_INLINE_FUNCTION
-  void operator()( const int i, const int j ) const
-  {
-    input_view( i, j ) = 1;
-  }
+  void operator()(const int i, const int j) const { input_view(i, j) = 1; }
 
   KOKKOS_INLINE_FUNCTION
-  void operator()( const int i, const int j, value_type &lsum ) const
-  {
-    lsum += input_view( i, j ) * 2;
+  void operator()(const int i, const int j, value_type &lsum) const {
+    lsum += input_view(i, j) * 2;
   }
 
   // tagged operators
   struct InitTag {};
   KOKKOS_INLINE_FUNCTION
-  void operator()( const InitTag &, const int i, const int j ) const
-  {
-    input_view( i, j ) = 3;
+  void operator()(const InitTag &, const int i, const int j) const {
+    input_view(i, j) = 3;
   }
 
   // reduction tagged operators
   KOKKOS_INLINE_FUNCTION
-  void operator()( const InitTag &, const int i, const int j, value_type &lsum ) const
-  {
-    lsum += input_view( i, j ) * 3;
+  void operator()(const InitTag &, const int i, const int j,
+                  value_type &lsum) const {
+    lsum += input_view(i, j) * 3;
   }
 
-  static void test_reduce2( const int N0, const int N1 )
-  {
-#if defined( KOKKOS_ENABLE_CXX11_DISPATCH_LAMBDA )
-#if !defined(KOKKOS_ENABLE_CUDA) || ( 8000 <= CUDA_VERSION )
+  static void test_reduce2(const int N0, const int N1) {
+#if defined(KOKKOS_ENABLE_CXX11_DISPATCH_LAMBDA)
+#if !defined(KOKKOS_ENABLE_CUDA) || (8000 <= CUDA_VERSION)
     {
-      typedef typename Kokkos::MDRangePolicy< ExecSpace, Kokkos::Rank<2>, Kokkos::IndexType<int> > range_type;
+      typedef typename Kokkos::MDRangePolicy<ExecSpace, Kokkos::Rank<2>,
+                                             Kokkos::IndexType<int> >
+          range_type;
       typedef typename range_type::tile_type tile_type;
       typedef typename range_type::point_type point_type;
 
-      range_type range( point_type{ { 0, 0 } }, point_type{ { N0, N1 } }, tile_type{ { 3, 3 } } );
+      range_type range(point_type{{0, 0}}, point_type{{N0, N1}},
+                       tile_type{{3, 3}});
       double sum = 0.0;
-      parallel_reduce( range
-        , KOKKOS_LAMBDA(const int i, const int j, double &lsum) {
-            lsum+=1.0;
-          }
-        , sum );
-      ASSERT_EQ( sum, N0 * N1 );
+      parallel_reduce(
+          range,
+          KOKKOS_LAMBDA(const int i, const int j, double &lsum) {
+            lsum += 1.0;
+          },
+          sum);
+      ASSERT_EQ(sum, N0 * N1);
     }
 #endif
 #endif
 
     {
-      typedef typename Kokkos::MDRangePolicy< ExecSpace, Kokkos::Rank<2>, Kokkos::IndexType<int> > range_type;
+      typedef typename Kokkos::MDRangePolicy<ExecSpace, Kokkos::Rank<2>,
+                                             Kokkos::IndexType<int> >
+          range_type;
       typedef typename range_type::tile_type tile_type;
       typedef typename range_type::point_type point_type;
 
-      range_type range( point_type{ { 0, 0 } }, point_type{ { N0, N1 } }, tile_type{ { 3, 3 } } );
+      range_type range(point_type{{0, 0}}, point_type{{N0, N1}},
+                       tile_type{{3, 3}});
 
-      TestMDRange_2D functor( N0, N1 );
+      TestMDRange_2D functor(N0, N1);
 
-      parallel_for( range, functor );
+      parallel_for(range, functor);
       double sum = 0.0;
-      parallel_reduce( range, functor, sum );
+      parallel_reduce(range, functor, sum);
 
-      ASSERT_EQ( sum, 2 * N0 * N1 );
+      ASSERT_EQ(sum, 2 * N0 * N1);
     }
 
     // Test with reducers - scalar
     {
-      typedef typename Kokkos::MDRangePolicy< ExecSpace, Kokkos::Rank<2>, Kokkos::IndexType<int> > range_type;
+      typedef typename Kokkos::MDRangePolicy<ExecSpace, Kokkos::Rank<2>,
+                                             Kokkos::IndexType<int> >
+          range_type;
       int s0 = 1;
       int s1 = 1;
-      range_type range( {{ s0, s1 }}, {{ N0, N1 }}, {{ 3, 3 }} );
+      range_type range({{s0, s1}}, {{N0, N1}}, {{3, 3}});
 
-      TestMDRange_2D functor( N0, N1 );
+      TestMDRange_2D functor(N0, N1);
 
-      parallel_for( range, functor );
+      parallel_for(range, functor);
 
       value_type sum = 0.0;
-      Kokkos::Sum< value_type > reducer_scalar( sum );
+      Kokkos::Sum<value_type> reducer_scalar(sum);
 
-      parallel_reduce( range, functor, reducer_scalar );
+      parallel_reduce(range, functor, reducer_scalar);
 
-      ASSERT_EQ( sum, 2 * (N0 - s0) * (N1 - s1) );
+      ASSERT_EQ(sum, 2 * (N0 - s0) * (N1 - s1));
     }
     // Test with reducers - scalar + label
     {
-      typedef typename Kokkos::MDRangePolicy< ExecSpace, Kokkos::Rank<2>, Kokkos::IndexType<int> > range_type;
+      typedef typename Kokkos::MDRangePolicy<ExecSpace, Kokkos::Rank<2>,
+                                             Kokkos::IndexType<int> >
+          range_type;
       int s0 = 1;
       int s1 = 1;
-      range_type range( {{ s0, s1 }}, {{ N0, N1 }}, {{ 3, 3 }} );
+      range_type range({{s0, s1}}, {{N0, N1}}, {{3, 3}});
 
-      TestMDRange_2D functor( N0, N1 );
+      TestMDRange_2D functor(N0, N1);
 
-      parallel_for( "rank2-parfor-label", range, functor );
+      parallel_for("rank2-parfor-label", range, functor);
 
       value_type sum = 0.0;
-      Kokkos::Sum< value_type > reducer_scalar( sum );
+      Kokkos::Sum<value_type> reducer_scalar(sum);
 
-      parallel_reduce( "rank2-reducer-label", range, functor, reducer_scalar );
+      parallel_reduce("rank2-reducer-label", range, functor, reducer_scalar);
 
-      ASSERT_EQ( sum, 2 * (N0 - s0) * (N1 - s1) );
+      ASSERT_EQ(sum, 2 * (N0 - s0) * (N1 - s1));
     }
     // Test with reducers - scalar view
     {
-      typedef typename Kokkos::MDRangePolicy< ExecSpace, Kokkos::Rank<2>, Kokkos::IndexType<int> > range_type;
-      range_type range( {{ 0, 0 }}, {{ N0, N1 }}, {{ 3, 3 }} );
+      typedef typename Kokkos::MDRangePolicy<ExecSpace, Kokkos::Rank<2>,
+                                             Kokkos::IndexType<int> >
+          range_type;
+      range_type range({{0, 0}}, {{N0, N1}}, {{3, 3}});
 
-      TestMDRange_2D functor( N0, N1 );
+      TestMDRange_2D functor(N0, N1);
 
-      parallel_for( range, functor );
+      parallel_for(range, functor);
 
       value_type sum = 0.0;
-      Kokkos::View< value_type, Kokkos::HostSpace > sum_view("sum_view");
+      Kokkos::View<value_type, Kokkos::HostSpace> sum_view("sum_view");
       sum_view() = sum;
-      Kokkos::Sum< value_type > reducer_view( sum_view );
+      Kokkos::Sum<value_type> reducer_view(sum_view);
 
-      parallel_reduce( range, functor, reducer_view);
+      parallel_reduce(range, functor, reducer_view);
       Kokkos::fence();
       sum = sum_view();
 
-      ASSERT_EQ( sum, 2 * N0 * N1 );
+      ASSERT_EQ(sum, 2 * N0 * N1);
     }
     // Test Min reducer with lambda
-#if defined( KOKKOS_ENABLE_CXX11_DISPATCH_LAMBDA )
-#if !defined(KOKKOS_ENABLE_CUDA) || ( 8000 <= CUDA_VERSION )
+#if defined(KOKKOS_ENABLE_CXX11_DISPATCH_LAMBDA)
+#if !defined(KOKKOS_ENABLE_CUDA) || (8000 <= CUDA_VERSION)
     {
-      typedef typename Kokkos::MDRangePolicy< ExecSpace, Kokkos::Rank<2>, Kokkos::IndexType<int> > range_type;
-      range_type range( {{ 1, 1 }}, {{ N0, N1 }}, {{ 3, 3 }} );
+      typedef typename Kokkos::MDRangePolicy<ExecSpace, Kokkos::Rank<2>,
+                                             Kokkos::IndexType<int> >
+          range_type;
+      range_type range({{1, 1}}, {{N0, N1}}, {{3, 3}});
 
-      Kokkos::View< double**, ExecSpace > v_in("v_in", N0, N1 );
+      Kokkos::View<double **, ExecSpace> v_in("v_in", N0, N1);
 
-      parallel_for( "rank2-init-lambda", range, KOKKOS_LAMBDA ( const int i, const int j ) {
-          v_in( i , j ) = (i+1) * (j+1) ;
-        });
+      parallel_for(
+          "rank2-init-lambda", range, KOKKOS_LAMBDA(const int i, const int j) {
+            v_in(i, j) = (i + 1) * (j + 1);
+          });
 
       double min;
-      Kokkos::Min< double > reducer_scalar( min );
+      Kokkos::Min<double> reducer_scalar(min);
 
-      parallel_reduce( "rank2-min-reducer", range, KOKKOS_LAMBDA ( const int i, const int j, double& min_val ) {
-            min_val = fmin( v_in(i,j), min_val );
-          }
-        , reducer_scalar);
+      parallel_reduce(
+          "rank2-min-reducer", range,
+          KOKKOS_LAMBDA(const int i, const int j, double &min_val) {
+            min_val = fmin(v_in(i, j), min_val);
+          },
+          reducer_scalar);
 
-      ASSERT_EQ( min, 4.0 );
+      ASSERT_EQ(min, 4.0);
     }
 #endif
 #endif
     // Tagged operator test
     {
-      typedef typename Kokkos::MDRangePolicy< ExecSpace, Kokkos::Rank<2, Iterate::Default, Iterate::Default >, Kokkos::IndexType<int>, InitTag > range_type;
+      typedef typename Kokkos::MDRangePolicy<
+          ExecSpace, Kokkos::Rank<2, Iterate::Default, Iterate::Default>,
+          Kokkos::IndexType<int>, InitTag>
+          range_type;
       typedef typename range_type::tile_type tile_type;
       typedef typename range_type::point_type point_type;
 
-      range_type range( point_type{ { 0, 0 } }, point_type{ { N0, N1 } }, tile_type{ { 2, 4 } } );
+      range_type range(point_type{{0, 0}}, point_type{{N0, N1}},
+                       tile_type{{2, 4}});
 
-      TestMDRange_2D functor( N0, N1 );
+      TestMDRange_2D functor(N0, N1);
 
-      parallel_for( range, functor );
+      parallel_for(range, functor);
 
       // check parallel_for results correct with InitTag
-      HostViewType h_view = Kokkos::create_mirror_view( functor.input_view );
-      Kokkos::deep_copy( h_view, functor.input_view );
+      HostViewType h_view = Kokkos::create_mirror_view(functor.input_view);
+      Kokkos::deep_copy(h_view, functor.input_view);
       int counter = 0;
-      for ( int i = 0; i < N0; ++i )
-      for ( int j = 0; j < N1; ++j )
-      {
-        if ( h_view( i, j ) != 3 ) {
-          ++counter;
-        }
-      }
-
-      if ( counter != 0 ) {
-        printf( "Defaults + InitTag op(): Errors in test_for3; mismatches = %d\n\n", counter );
-      }
-      ASSERT_EQ( counter, 0 );
-
-
-      double sum = 0.0;
-      parallel_reduce( range, functor, sum );
-
-      ASSERT_EQ( sum, 9 * N0 * N1 );
-    }
-
-    {
-      typedef typename Kokkos::MDRangePolicy< ExecSpace, Kokkos::Rank<2, Iterate::Default, Iterate::Default>, Kokkos::IndexType<int> > range_type;
-      typedef typename range_type::tile_type tile_type;
-      typedef typename range_type::point_type point_type;
-
-      range_type range( point_type{ { 0, 0 } }, point_type{ { N0, N1 } }, tile_type{ { 2, 6 } } );
-
-      TestMDRange_2D functor( N0, N1 );
-
-      parallel_for( range, functor );
-      double sum = 0.0;
-      parallel_reduce( range, functor, sum );
-
-      ASSERT_EQ( sum, 2 * N0 * N1 );
-    }
-
-    {
-      typedef typename Kokkos::MDRangePolicy< ExecSpace, Kokkos::Rank<2, Iterate::Left, Iterate::Left>, Kokkos::IndexType<int> > range_type;
-      typedef typename range_type::tile_type tile_type;
-      typedef typename range_type::point_type point_type;
-
-      range_type range( point_type{ { 0, 0 } }, point_type{ { N0, N1 } }, tile_type{ { 2, 6 } } );
-
-      TestMDRange_2D functor( N0, N1 );
-
-      parallel_for( range, functor );
-      double sum = 0.0;
-      parallel_reduce( range, functor, sum );
-
-      ASSERT_EQ( sum, 2 * N0 * N1 );
-    }
-
-    {
-      typedef typename Kokkos::MDRangePolicy< ExecSpace, Kokkos::Rank<2, Iterate::Left, Iterate::Right>, Kokkos::IndexType<int> > range_type;
-      typedef typename range_type::tile_type tile_type;
-      typedef typename range_type::point_type point_type;
-
-      range_type range( point_type{ { 0, 0 } }, point_type{ { N0, N1 } }, tile_type{ { 2, 6 } } );
-
-      TestMDRange_2D functor( N0, N1 );
-
-      parallel_for( range, functor );
-      double sum = 0.0;
-      parallel_reduce( range, functor, sum );
-
-      ASSERT_EQ( sum, 2 * N0 * N1 );
-    }
-
-    {
-      typedef typename Kokkos::MDRangePolicy< ExecSpace, Kokkos::Rank<2, Iterate::Right, Iterate::Left>, Kokkos::IndexType<int> > range_type;
-      typedef typename range_type::tile_type tile_type;
-      typedef typename range_type::point_type point_type;
-
-      range_type range( point_type{ { 0, 0 } }, point_type{ { N0, N1 } }, tile_type{ { 2, 6 } } );
-
-      TestMDRange_2D functor( N0, N1 );
-
-      parallel_for( range, functor );
-      double sum = 0.0;
-      parallel_reduce( range, functor, sum );
-
-      ASSERT_EQ( sum, 2 * N0 * N1 );
-    }
-
-    {
-      typedef typename Kokkos::MDRangePolicy< ExecSpace, Kokkos::Rank<2, Iterate::Right, Iterate::Right>, Kokkos::IndexType<int> > range_type;
-      typedef typename range_type::tile_type tile_type;
-      typedef typename range_type::point_type point_type;
-
-      range_type range( point_type{ { 0, 0 } }, point_type{ { N0, N1 } }, tile_type{ { 2, 6 } } );
-
-      TestMDRange_2D functor( N0, N1 );
-
-      parallel_for( range, functor );
-      double sum = 0.0;
-      parallel_reduce( range, functor, sum );
-
-      ASSERT_EQ( sum, 2 * N0 * N1 );
-    }
-  } // end test_reduce2
-
-  static void test_for2( const int N0, const int N1 )
-  {
-
-#if defined( KOKKOS_ENABLE_CXX11_DISPATCH_LAMBDA )
-#if !defined(KOKKOS_ENABLE_CUDA) || ( 8000 <= CUDA_VERSION )
-    {
-      typedef typename Kokkos::MDRangePolicy< ExecSpace, Kokkos::Rank<2>, Kokkos::IndexType<int> > range_type;
-      typedef typename range_type::tile_type tile_type;
-      typedef typename range_type::point_type point_type;
-
-      const int s0 = 1;
-      const int s1 = 1;
-
-      range_type range( point_type{ { s0, s1 } }, point_type{ { N0, N1 } }, tile_type{ { 3, 3 } } );
-
-      TestMDRange_2D::ViewType v( "v", N0, N1 );
-
-      parallel_for( range, 
-          KOKKOS_LAMBDA ( const int i , const int j ) {
-            v(i, j) = 3;
+      for (int i = 0; i < N0; ++i)
+        for (int j = 0; j < N1; ++j) {
+          if (h_view(i, j) != 3) {
+            ++counter;
           }
-        );
-
-      TestMDRange_2D::HostViewType h_view = Kokkos::create_mirror_view( v );
-      Kokkos::deep_copy( h_view, v );
-
-      int counter = 0;
-      for ( int i = s0; i < N0; ++i )
-      for ( int j = s1; j < N1; ++j )
-      {
-        if ( h_view( i, j ) != 3 ) {
-          ++counter;
         }
-      }
 
-      if ( counter != 0 ) {
-        printf( "Offset Start + Default Layouts + InitTag op(): Errors in test_for2; mismatches = %d\n\n", counter );
+      if (counter != 0) {
+        printf(
+            "Defaults + InitTag op(): Errors in test_for3; mismatches = %d\n\n",
+            counter);
       }
+      ASSERT_EQ(counter, 0);
 
-      ASSERT_EQ( counter, 0 );
+      double sum = 0.0;
+      parallel_reduce(range, functor, sum);
+
+      ASSERT_EQ(sum, 9 * N0 * N1);
     }
-#endif
-#endif
 
     {
-      typedef typename Kokkos::MDRangePolicy< ExecSpace, Kokkos::Rank<2>, Kokkos::IndexType<int>, InitTag > range_type;
+      typedef typename Kokkos::MDRangePolicy<
+          ExecSpace, Kokkos::Rank<2, Iterate::Default, Iterate::Default>,
+          Kokkos::IndexType<int> >
+          range_type;
+      typedef typename range_type::tile_type tile_type;
+      typedef typename range_type::point_type point_type;
+
+      range_type range(point_type{{0, 0}}, point_type{{N0, N1}},
+                       tile_type{{2, 6}});
+
+      TestMDRange_2D functor(N0, N1);
+
+      parallel_for(range, functor);
+      double sum = 0.0;
+      parallel_reduce(range, functor, sum);
+
+      ASSERT_EQ(sum, 2 * N0 * N1);
+    }
+
+    {
+      typedef typename Kokkos::MDRangePolicy<
+          ExecSpace, Kokkos::Rank<2, Iterate::Left, Iterate::Left>,
+          Kokkos::IndexType<int> >
+          range_type;
+      typedef typename range_type::tile_type tile_type;
+      typedef typename range_type::point_type point_type;
+
+      range_type range(point_type{{0, 0}}, point_type{{N0, N1}},
+                       tile_type{{2, 6}});
+
+      TestMDRange_2D functor(N0, N1);
+
+      parallel_for(range, functor);
+      double sum = 0.0;
+      parallel_reduce(range, functor, sum);
+
+      ASSERT_EQ(sum, 2 * N0 * N1);
+    }
+
+    {
+      typedef typename Kokkos::MDRangePolicy<
+          ExecSpace, Kokkos::Rank<2, Iterate::Left, Iterate::Right>,
+          Kokkos::IndexType<int> >
+          range_type;
+      typedef typename range_type::tile_type tile_type;
+      typedef typename range_type::point_type point_type;
+
+      range_type range(point_type{{0, 0}}, point_type{{N0, N1}},
+                       tile_type{{2, 6}});
+
+      TestMDRange_2D functor(N0, N1);
+
+      parallel_for(range, functor);
+      double sum = 0.0;
+      parallel_reduce(range, functor, sum);
+
+      ASSERT_EQ(sum, 2 * N0 * N1);
+    }
+
+    {
+      typedef typename Kokkos::MDRangePolicy<
+          ExecSpace, Kokkos::Rank<2, Iterate::Right, Iterate::Left>,
+          Kokkos::IndexType<int> >
+          range_type;
+      typedef typename range_type::tile_type tile_type;
+      typedef typename range_type::point_type point_type;
+
+      range_type range(point_type{{0, 0}}, point_type{{N0, N1}},
+                       tile_type{{2, 6}});
+
+      TestMDRange_2D functor(N0, N1);
+
+      parallel_for(range, functor);
+      double sum = 0.0;
+      parallel_reduce(range, functor, sum);
+
+      ASSERT_EQ(sum, 2 * N0 * N1);
+    }
+
+    {
+      typedef typename Kokkos::MDRangePolicy<
+          ExecSpace, Kokkos::Rank<2, Iterate::Right, Iterate::Right>,
+          Kokkos::IndexType<int> >
+          range_type;
+      typedef typename range_type::tile_type tile_type;
+      typedef typename range_type::point_type point_type;
+
+      range_type range(point_type{{0, 0}}, point_type{{N0, N1}},
+                       tile_type{{2, 6}});
+
+      TestMDRange_2D functor(N0, N1);
+
+      parallel_for(range, functor);
+      double sum = 0.0;
+      parallel_reduce(range, functor, sum);
+
+      ASSERT_EQ(sum, 2 * N0 * N1);
+    }
+  }  // end test_reduce2
+
+  static void test_for2(const int N0, const int N1) {
+#if defined(KOKKOS_ENABLE_CXX11_DISPATCH_LAMBDA)
+#if !defined(KOKKOS_ENABLE_CUDA) || (8000 <= CUDA_VERSION)
+    {
+      typedef typename Kokkos::MDRangePolicy<ExecSpace, Kokkos::Rank<2>,
+                                             Kokkos::IndexType<int> >
+          range_type;
       typedef typename range_type::tile_type tile_type;
       typedef typename range_type::point_type point_type;
 
       const int s0 = 1;
       const int s1 = 1;
-      range_type range( point_type{ { s0, s1 } }, point_type{ { N0, N1 } }, tile_type{ { 3, 3 } } );
-      TestMDRange_2D functor( N0, N1 );
 
-      parallel_for( range, functor );
+      range_type range(point_type{{s0, s1}}, point_type{{N0, N1}},
+                       tile_type{{3, 3}});
 
-      HostViewType h_view = Kokkos::create_mirror_view( functor.input_view );
-      Kokkos::deep_copy( h_view, functor.input_view );
+      TestMDRange_2D::ViewType v("v", N0, N1);
+
+      parallel_for(
+          range, KOKKOS_LAMBDA(const int i, const int j) { v(i, j) = 3; });
+
+      TestMDRange_2D::HostViewType h_view = Kokkos::create_mirror_view(v);
+      Kokkos::deep_copy(h_view, v);
 
       int counter = 0;
-      for ( int i = s0; i < N0; ++i )
-      for ( int j = s1; j < N1; ++j )
-      {
-        if ( h_view( i, j ) != 3 ) {
-          ++counter;
+      for (int i = s0; i < N0; ++i)
+        for (int j = s1; j < N1; ++j) {
+          if (h_view(i, j) != 3) {
+            ++counter;
+          }
         }
+
+      if (counter != 0) {
+        printf(
+            "Offset Start + Default Layouts + InitTag op(): Errors in "
+            "test_for2; mismatches = %d\n\n",
+            counter);
       }
 
-      if ( counter != 0 ) {
-        printf( "Offset Start + Default Layouts + InitTag op(): Errors in test_for2; mismatches = %d\n\n", counter );
-      }
-
-      ASSERT_EQ( counter, 0 );
+      ASSERT_EQ(counter, 0);
     }
+#endif
+#endif
 
     {
-      typedef typename Kokkos::MDRangePolicy< ExecSpace, Kokkos::Rank<2>, InitTag > range_type;
+      typedef typename Kokkos::MDRangePolicy<ExecSpace, Kokkos::Rank<2>,
+                                             Kokkos::IndexType<int>, InitTag>
+          range_type;
       typedef typename range_type::tile_type tile_type;
       typedef typename range_type::point_type point_type;
 
-      range_type range( point_type{ { 0, 0 } }, point_type{ { N0, N1 } }, tile_type{ { 3, 3 } } );
-      TestMDRange_2D functor( N0, N1 );
+      const int s0 = 1;
+      const int s1 = 1;
+      range_type range(point_type{{s0, s1}}, point_type{{N0, N1}},
+                       tile_type{{3, 3}});
+      TestMDRange_2D functor(N0, N1);
 
-      parallel_for( range, functor );
+      parallel_for(range, functor);
 
-      HostViewType h_view = Kokkos::create_mirror_view( functor.input_view );
-      Kokkos::deep_copy( h_view, functor.input_view );
+      HostViewType h_view = Kokkos::create_mirror_view(functor.input_view);
+      Kokkos::deep_copy(h_view, functor.input_view);
 
       int counter = 0;
-      for ( int i = 0; i < N0; ++i )
-      for ( int j = 0; j < N1; ++j )
-      {
-        if ( h_view( i, j ) != 3 ) {
-          ++counter;
+      for (int i = s0; i < N0; ++i)
+        for (int j = s1; j < N1; ++j) {
+          if (h_view(i, j) != 3) {
+            ++counter;
+          }
         }
+
+      if (counter != 0) {
+        printf(
+            "Offset Start + Default Layouts + InitTag op(): Errors in "
+            "test_for2; mismatches = %d\n\n",
+            counter);
       }
 
-      if ( counter != 0 ) {
-        printf( "Default Layouts + InitTag op(): Errors in test_for2; mismatches = %d\n\n", counter );
-      }
-
-      ASSERT_EQ( counter, 0 );
+      ASSERT_EQ(counter, 0);
     }
 
     {
-      typedef typename Kokkos::MDRangePolicy< ExecSpace, Kokkos::Rank<2>, InitTag > range_type;
-      typedef typename range_type::point_type point_type;
-
-      range_type range( point_type{ { 0, 0 } }, point_type{ { N0, N1 } } );
-      TestMDRange_2D functor( N0, N1 );
-
-      parallel_for( range, functor );
-
-      HostViewType h_view = Kokkos::create_mirror_view( functor.input_view );
-      Kokkos::deep_copy( h_view, functor.input_view );
-
-      int counter = 0;
-      for ( int i = 0; i < N0; ++i )
-      for ( int j = 0; j < N1; ++j )
-      {
-        if ( h_view( i, j ) != 3 ) {
-          ++counter;
-        }
-      }
-
-      if ( counter != 0 ) {
-        printf( "Default Layouts + InitTag op() + Default Tile: Errors in test_for2; mismatches = %d\n\n", counter );
-      }
-
-      ASSERT_EQ( counter, 0 );
-    }
-
-    {
-      typedef typename Kokkos::MDRangePolicy< ExecSpace, Kokkos::Rank<2>, Kokkos::IndexType<int> > range_type;
+      typedef
+          typename Kokkos::MDRangePolicy<ExecSpace, Kokkos::Rank<2>, InitTag>
+              range_type;
       typedef typename range_type::tile_type tile_type;
       typedef typename range_type::point_type point_type;
 
-      range_type range( point_type{ { 0, 0 } }, point_type{ { N0, N1 } }, tile_type{ { 3, 3 } } );
-      TestMDRange_2D functor( N0, N1 );
+      range_type range(point_type{{0, 0}}, point_type{{N0, N1}},
+                       tile_type{{3, 3}});
+      TestMDRange_2D functor(N0, N1);
 
-      parallel_for( range, functor );
+      parallel_for(range, functor);
 
-      HostViewType h_view = Kokkos::create_mirror_view( functor.input_view );
-      Kokkos::deep_copy( h_view, functor.input_view );
+      HostViewType h_view = Kokkos::create_mirror_view(functor.input_view);
+      Kokkos::deep_copy(h_view, functor.input_view);
 
       int counter = 0;
-      for ( int i = 0; i < N0; ++i )
-      for ( int j = 0; j < N1; ++j )
-      {
-        if ( h_view( i, j ) != 1 ) {
-          ++counter;
+      for (int i = 0; i < N0; ++i)
+        for (int j = 0; j < N1; ++j) {
+          if (h_view(i, j) != 3) {
+            ++counter;
+          }
         }
+
+      if (counter != 0) {
+        printf(
+            "Default Layouts + InitTag op(): Errors in test_for2; mismatches = "
+            "%d\n\n",
+            counter);
       }
 
-      if ( counter != 0 ) {
-        printf( "No info: Errors in test_for2; mismatches = %d\n\n", counter );
-      }
-
-      ASSERT_EQ( counter, 0 );
+      ASSERT_EQ(counter, 0);
     }
 
     {
-      typedef typename Kokkos::MDRangePolicy< ExecSpace, Kokkos::Rank<2, Iterate::Default, Iterate::Default>, Kokkos::IndexType<int> > range_type;
-      typedef typename range_type::tile_type tile_type;
+      typedef
+          typename Kokkos::MDRangePolicy<ExecSpace, Kokkos::Rank<2>, InitTag>
+              range_type;
       typedef typename range_type::point_type point_type;
 
-      range_type range( point_type{ { 0, 0 } }, point_type{ { N0, N1 } }, tile_type{ { 4, 4 } } );
-      TestMDRange_2D functor( N0, N1 );
+      range_type range(point_type{{0, 0}}, point_type{{N0, N1}});
+      TestMDRange_2D functor(N0, N1);
 
-      parallel_for( range, functor );
+      parallel_for(range, functor);
 
-      HostViewType h_view = Kokkos::create_mirror_view( functor.input_view );
-      Kokkos::deep_copy( h_view, functor.input_view );
+      HostViewType h_view = Kokkos::create_mirror_view(functor.input_view);
+      Kokkos::deep_copy(h_view, functor.input_view);
 
       int counter = 0;
-      for ( int i = 0; i < N0; ++i )
-      for ( int j = 0; j < N1; ++j )
-      {
-        if ( h_view( i, j ) != 1 ) {
-          ++counter;
+      for (int i = 0; i < N0; ++i)
+        for (int j = 0; j < N1; ++j) {
+          if (h_view(i, j) != 3) {
+            ++counter;
+          }
         }
+
+      if (counter != 0) {
+        printf(
+            "Default Layouts + InitTag op() + Default Tile: Errors in "
+            "test_for2; mismatches = %d\n\n",
+            counter);
       }
 
-      if ( counter != 0 ) {
-        printf( "D D: Errors in test_for2; mismatches = %d\n\n", counter );
-      }
-
-      ASSERT_EQ( counter, 0 );
+      ASSERT_EQ(counter, 0);
     }
 
     {
-      typedef typename Kokkos::MDRangePolicy< ExecSpace, Kokkos::Rank<2, Iterate::Left, Iterate::Left>, Kokkos::IndexType<int> > range_type;
+      typedef typename Kokkos::MDRangePolicy<ExecSpace, Kokkos::Rank<2>,
+                                             Kokkos::IndexType<int> >
+          range_type;
       typedef typename range_type::tile_type tile_type;
       typedef typename range_type::point_type point_type;
 
-      range_type range( point_type{ { 0, 0 } }, point_type{ { N0, N1 } }, tile_type{ { 3, 3 } } );
-      TestMDRange_2D functor( N0, N1 );
+      range_type range(point_type{{0, 0}}, point_type{{N0, N1}},
+                       tile_type{{3, 3}});
+      TestMDRange_2D functor(N0, N1);
 
-      parallel_for( range, functor );
+      parallel_for(range, functor);
 
-      HostViewType h_view = Kokkos::create_mirror_view( functor.input_view );
-      Kokkos::deep_copy( h_view, functor.input_view );
+      HostViewType h_view = Kokkos::create_mirror_view(functor.input_view);
+      Kokkos::deep_copy(h_view, functor.input_view);
 
       int counter = 0;
-      for ( int i = 0; i < N0; ++i )
-      for ( int j = 0; j < N1; ++j )
-      {
-        if ( h_view( i, j ) != 1 ) {
-          ++counter;
+      for (int i = 0; i < N0; ++i)
+        for (int j = 0; j < N1; ++j) {
+          if (h_view(i, j) != 1) {
+            ++counter;
+          }
         }
+
+      if (counter != 0) {
+        printf("No info: Errors in test_for2; mismatches = %d\n\n", counter);
       }
 
-      if ( counter != 0 ) {
-        printf( "L L: Errors in test_for2; mismatches = %d\n\n", counter );
-      }
-
-      ASSERT_EQ( counter, 0 );
+      ASSERT_EQ(counter, 0);
     }
 
     {
-      typedef typename Kokkos::MDRangePolicy< ExecSpace, Kokkos::Rank<2, Iterate::Left, Iterate::Right>, Kokkos::IndexType<int> > range_type;
+      typedef typename Kokkos::MDRangePolicy<
+          ExecSpace, Kokkos::Rank<2, Iterate::Default, Iterate::Default>,
+          Kokkos::IndexType<int> >
+          range_type;
       typedef typename range_type::tile_type tile_type;
       typedef typename range_type::point_type point_type;
 
-      range_type range( point_type{ { 0, 0 } }, point_type{ { N0, N1 } }, tile_type{ { 7, 7 } } );
-      TestMDRange_2D functor( N0, N1 );
+      range_type range(point_type{{0, 0}}, point_type{{N0, N1}},
+                       tile_type{{4, 4}});
+      TestMDRange_2D functor(N0, N1);
 
-      parallel_for( range, functor );
+      parallel_for(range, functor);
 
-      HostViewType h_view = Kokkos::create_mirror_view( functor.input_view );
-      Kokkos::deep_copy( h_view, functor.input_view );
+      HostViewType h_view = Kokkos::create_mirror_view(functor.input_view);
+      Kokkos::deep_copy(h_view, functor.input_view);
 
       int counter = 0;
-      for ( int i = 0; i < N0; ++i )
-      for ( int j = 0; j < N1; ++j )
-      {
-        if ( h_view( i, j ) != 1 ) {
-          ++counter;
+      for (int i = 0; i < N0; ++i)
+        for (int j = 0; j < N1; ++j) {
+          if (h_view(i, j) != 1) {
+            ++counter;
+          }
         }
+
+      if (counter != 0) {
+        printf("D D: Errors in test_for2; mismatches = %d\n\n", counter);
       }
 
-      if ( counter != 0 ) {
-        printf( "L R: Errors in test_for2; mismatches = %d\n\n", counter );
-      }
-
-      ASSERT_EQ( counter, 0 );
+      ASSERT_EQ(counter, 0);
     }
 
     {
-      typedef typename Kokkos::MDRangePolicy< ExecSpace, Kokkos::Rank<2, Iterate::Right, Iterate::Left>, Kokkos::IndexType<int> > range_type;
+      typedef typename Kokkos::MDRangePolicy<
+          ExecSpace, Kokkos::Rank<2, Iterate::Left, Iterate::Left>,
+          Kokkos::IndexType<int> >
+          range_type;
       typedef typename range_type::tile_type tile_type;
       typedef typename range_type::point_type point_type;
 
-      range_type range( point_type{ { 0, 0 } }, point_type{ { N0, N1 } }, tile_type{ { 16, 16 } } );
-      TestMDRange_2D functor( N0, N1 );
+      range_type range(point_type{{0, 0}}, point_type{{N0, N1}},
+                       tile_type{{3, 3}});
+      TestMDRange_2D functor(N0, N1);
 
-      parallel_for( range, functor );
+      parallel_for(range, functor);
 
-      HostViewType h_view = Kokkos::create_mirror_view( functor.input_view );
-      Kokkos::deep_copy( h_view, functor.input_view );
+      HostViewType h_view = Kokkos::create_mirror_view(functor.input_view);
+      Kokkos::deep_copy(h_view, functor.input_view);
 
       int counter = 0;
-      for ( int i = 0; i < N0; ++i )
-      for ( int j = 0; j < N1; ++j )
-      {
-        if ( h_view( i, j ) != 1 ) {
-          ++counter;
+      for (int i = 0; i < N0; ++i)
+        for (int j = 0; j < N1; ++j) {
+          if (h_view(i, j) != 1) {
+            ++counter;
+          }
         }
+
+      if (counter != 0) {
+        printf("L L: Errors in test_for2; mismatches = %d\n\n", counter);
       }
 
-      if ( counter != 0 ) {
-        printf( "R L: Errors in test_for2; mismatches = %d\n\n", counter );
-      }
-
-      ASSERT_EQ( counter, 0 );
+      ASSERT_EQ(counter, 0);
     }
 
     {
-      typedef typename Kokkos::MDRangePolicy< ExecSpace, Kokkos::Rank<2, Iterate::Right, Iterate::Right>, Kokkos::IndexType<int> > range_type;
+      typedef typename Kokkos::MDRangePolicy<
+          ExecSpace, Kokkos::Rank<2, Iterate::Left, Iterate::Right>,
+          Kokkos::IndexType<int> >
+          range_type;
       typedef typename range_type::tile_type tile_type;
       typedef typename range_type::point_type point_type;
 
-      range_type range( point_type{ { 0, 0 } }, point_type{ { N0, N1 } }, tile_type{ { 5, 16 } } );
-      TestMDRange_2D functor( N0, N1 );
+      range_type range(point_type{{0, 0}}, point_type{{N0, N1}},
+                       tile_type{{7, 7}});
+      TestMDRange_2D functor(N0, N1);
 
-      parallel_for( range, functor );
+      parallel_for(range, functor);
 
-      HostViewType h_view = Kokkos::create_mirror_view( functor.input_view );
-      Kokkos::deep_copy( h_view, functor.input_view );
+      HostViewType h_view = Kokkos::create_mirror_view(functor.input_view);
+      Kokkos::deep_copy(h_view, functor.input_view);
 
       int counter = 0;
-      for ( int i = 0; i < N0; ++i )
-      for ( int j = 0; j < N1; ++j )
-      {
-        if ( h_view( i, j ) != 1 ) {
-          ++counter;
+      for (int i = 0; i < N0; ++i)
+        for (int j = 0; j < N1; ++j) {
+          if (h_view(i, j) != 1) {
+            ++counter;
+          }
         }
+
+      if (counter != 0) {
+        printf("L R: Errors in test_for2; mismatches = %d\n\n", counter);
       }
 
-      if ( counter != 0 ) {
-        printf( "R R: Errors in test_for2; mismatches = %d\n\n", counter );
-      }
-
-      ASSERT_EQ( counter, 0 );
+      ASSERT_EQ(counter, 0);
     }
 
-  } // end test_for2
-}; // MDRange_2D
+    {
+      typedef typename Kokkos::MDRangePolicy<
+          ExecSpace, Kokkos::Rank<2, Iterate::Right, Iterate::Left>,
+          Kokkos::IndexType<int> >
+          range_type;
+      typedef typename range_type::tile_type tile_type;
+      typedef typename range_type::point_type point_type;
 
-template <typename ExecSpace >
+      range_type range(point_type{{0, 0}}, point_type{{N0, N1}},
+                       tile_type{{16, 16}});
+      TestMDRange_2D functor(N0, N1);
+
+      parallel_for(range, functor);
+
+      HostViewType h_view = Kokkos::create_mirror_view(functor.input_view);
+      Kokkos::deep_copy(h_view, functor.input_view);
+
+      int counter = 0;
+      for (int i = 0; i < N0; ++i)
+        for (int j = 0; j < N1; ++j) {
+          if (h_view(i, j) != 1) {
+            ++counter;
+          }
+        }
+
+      if (counter != 0) {
+        printf("R L: Errors in test_for2; mismatches = %d\n\n", counter);
+      }
+
+      ASSERT_EQ(counter, 0);
+    }
+
+    {
+      typedef typename Kokkos::MDRangePolicy<
+          ExecSpace, Kokkos::Rank<2, Iterate::Right, Iterate::Right>,
+          Kokkos::IndexType<int> >
+          range_type;
+      typedef typename range_type::tile_type tile_type;
+      typedef typename range_type::point_type point_type;
+
+      range_type range(point_type{{0, 0}}, point_type{{N0, N1}},
+                       tile_type{{5, 16}});
+      TestMDRange_2D functor(N0, N1);
+
+      parallel_for(range, functor);
+
+      HostViewType h_view = Kokkos::create_mirror_view(functor.input_view);
+      Kokkos::deep_copy(h_view, functor.input_view);
+
+      int counter = 0;
+      for (int i = 0; i < N0; ++i)
+        for (int j = 0; j < N1; ++j) {
+          if (h_view(i, j) != 1) {
+            ++counter;
+          }
+        }
+
+      if (counter != 0) {
+        printf("R R: Errors in test_for2; mismatches = %d\n\n", counter);
+      }
+
+      ASSERT_EQ(counter, 0);
+    }
+
+  }  // end test_for2
+};   // MDRange_2D
+
+template <typename ExecSpace>
 struct TestMDRange_3D {
   using DataType     = int;
-  using ViewType     = typename Kokkos::View< DataType***, ExecSpace >;
+  using ViewType     = typename Kokkos::View<DataType ***, ExecSpace>;
   using HostViewType = typename ViewType::HostMirror;
 
   ViewType input_view;
   using value_type = double;
 
-  TestMDRange_3D( const DataType N0, const DataType N1, const DataType N2 ) : input_view( "input_view", N0, N1, N2 ) {}
+  TestMDRange_3D(const DataType N0, const DataType N1, const DataType N2)
+      : input_view("input_view", N0, N1, N2) {}
 
   KOKKOS_INLINE_FUNCTION
-  void operator()( const int i, const int j, const int k ) const
-  {
-    input_view( i, j, k ) = 1;
+  void operator()(const int i, const int j, const int k) const {
+    input_view(i, j, k) = 1;
   }
 
   KOKKOS_INLINE_FUNCTION
-  void operator()( const int i, const int j, const int k, double &lsum ) const
-  {
-    lsum += input_view( i, j, k ) * 2;
+  void operator()(const int i, const int j, const int k, double &lsum) const {
+    lsum += input_view(i, j, k) * 2;
   }
 
   // tagged operators
   struct InitTag {};
   KOKKOS_INLINE_FUNCTION
-  void operator()( const InitTag &, const int i, const int j, const int k ) const
-  {
-    input_view( i, j, k ) = 3;
+  void operator()(const InitTag &, const int i, const int j,
+                  const int k) const {
+    input_view(i, j, k) = 3;
   }
 
   // reduction tagged operators
   KOKKOS_INLINE_FUNCTION
-  void operator()( const InitTag &, const int i, const int j, const int k, value_type &lsum ) const
-  {
-    lsum += input_view( i, j, k ) * 3;
+  void operator()(const InitTag &, const int i, const int j, const int k,
+                  value_type &lsum) const {
+    lsum += input_view(i, j, k) * 3;
   }
 
-  static void test_reduce3( const int N0, const int N1, const int N2 )
-  {
-#if defined( KOKKOS_ENABLE_CXX11_DISPATCH_LAMBDA )
-#if !defined(KOKKOS_ENABLE_CUDA) || ( 8000 <= CUDA_VERSION )
+  static void test_reduce3(const int N0, const int N1, const int N2) {
+#if defined(KOKKOS_ENABLE_CXX11_DISPATCH_LAMBDA)
+#if !defined(KOKKOS_ENABLE_CUDA) || (8000 <= CUDA_VERSION)
     {
-      typedef typename Kokkos::MDRangePolicy< ExecSpace, Kokkos::Rank<3>, Kokkos::IndexType<int> > range_type;
+      typedef typename Kokkos::MDRangePolicy<ExecSpace, Kokkos::Rank<3>,
+                                             Kokkos::IndexType<int> >
+          range_type;
       typedef typename range_type::tile_type tile_type;
       typedef typename range_type::point_type point_type;
 
-      range_type range( point_type{ { 0, 0, 0 } }, point_type{ { N0, N1, N2 } }, tile_type{ { 3, 3, 3 } } );
+      range_type range(point_type{{0, 0, 0}}, point_type{{N0, N1, N2}},
+                       tile_type{{3, 3, 3}});
       double sum = 0.0;
-      parallel_reduce( range
-        , KOKKOS_LAMBDA(const int i, const int j, const int k, double &lsum) {
-            lsum+=1.0;
-          }
-        , sum );
-      ASSERT_EQ( sum, N0 * N1 * N2 );
+      parallel_reduce(
+          range,
+          KOKKOS_LAMBDA(const int i, const int j, const int k, double &lsum) {
+            lsum += 1.0;
+          },
+          sum);
+      ASSERT_EQ(sum, N0 * N1 * N2);
     }
 #endif
 #endif
 
     {
-      typedef typename Kokkos::MDRangePolicy< ExecSpace, Kokkos::Rank<3>, Kokkos::IndexType<int> > range_type;
+      typedef typename Kokkos::MDRangePolicy<ExecSpace, Kokkos::Rank<3>,
+                                             Kokkos::IndexType<int> >
+          range_type;
       typedef typename range_type::tile_type tile_type;
       typedef typename range_type::point_type point_type;
 
       int s0 = 1;
       int s1 = 1;
       int s2 = 1;
-      range_type range( point_type{ { s0, s1, s2 } }, point_type{ { N0, N1, N2 } }, tile_type{ { 3, 3, 3 } } );
+      range_type range(point_type{{s0, s1, s2}}, point_type{{N0, N1, N2}},
+                       tile_type{{3, 3, 3}});
 
-      TestMDRange_3D functor( N0, N1, N2 );
+      TestMDRange_3D functor(N0, N1, N2);
 
-      parallel_for( range, functor );
+      parallel_for(range, functor);
       double sum = 0.0;
-      parallel_reduce( range, functor, sum );
+      parallel_reduce(range, functor, sum);
 
-      ASSERT_EQ( sum, 2 * (N0 - s0) * (N1 - s1) * (N2 - s2) );
+      ASSERT_EQ(sum, 2 * (N0 - s0) * (N1 - s1) * (N2 - s2));
     }
 
     // Test with reducers - scalar
     {
-      typedef typename Kokkos::MDRangePolicy< ExecSpace, Kokkos::Rank<3>, Kokkos::IndexType<int> > range_type;
-      range_type range( {{ 0, 0, 0 }}, {{ N0, N1, N2 }}, {{ 3, 3, 3 }} );
+      typedef typename Kokkos::MDRangePolicy<ExecSpace, Kokkos::Rank<3>,
+                                             Kokkos::IndexType<int> >
+          range_type;
+      range_type range({{0, 0, 0}}, {{N0, N1, N2}}, {{3, 3, 3}});
 
-      TestMDRange_3D functor( N0, N1, N2 );
+      TestMDRange_3D functor(N0, N1, N2);
 
-      parallel_for( range, functor );
+      parallel_for(range, functor);
 
       value_type sum = 0.0;
-      Kokkos::Sum< value_type > reducer_scalar( sum );
+      Kokkos::Sum<value_type> reducer_scalar(sum);
 
-      parallel_reduce( range, functor, reducer_scalar );
+      parallel_reduce(range, functor, reducer_scalar);
 
-      ASSERT_EQ( sum, 2 * N0 * N1 * N2 );
+      ASSERT_EQ(sum, 2 * N0 * N1 * N2);
     }
     // Test with reducers - scalar + label
     {
-      typedef typename Kokkos::MDRangePolicy< ExecSpace, Kokkos::Rank<3>, Kokkos::IndexType<int> > range_type;
-      range_type range( {{ 0, 0, 0 }}, {{ N0, N1, N2 }}, {{ 3, 3, 3 }} );
+      typedef typename Kokkos::MDRangePolicy<ExecSpace, Kokkos::Rank<3>,
+                                             Kokkos::IndexType<int> >
+          range_type;
+      range_type range({{0, 0, 0}}, {{N0, N1, N2}}, {{3, 3, 3}});
 
-      TestMDRange_3D functor( N0, N1, N2 );
+      TestMDRange_3D functor(N0, N1, N2);
 
-      parallel_for( "rank3-parfor-label", range, functor );
+      parallel_for("rank3-parfor-label", range, functor);
 
       value_type sum = 0.0;
-      Kokkos::Sum< value_type > reducer_scalar( sum );
+      Kokkos::Sum<value_type> reducer_scalar(sum);
 
-      parallel_reduce( "rank3-reducer-label", range, functor, reducer_scalar );
+      parallel_reduce("rank3-reducer-label", range, functor, reducer_scalar);
 
-      ASSERT_EQ( sum, 2 * N0 * N1 * N2 );
+      ASSERT_EQ(sum, 2 * N0 * N1 * N2);
     }
     // Test with reducers - scalar view
     {
-      typedef typename Kokkos::MDRangePolicy< ExecSpace, Kokkos::Rank<3>, Kokkos::IndexType<int> > range_type;
-      range_type range( {{ 0, 0, 0 }}, {{ N0, N1, N2 }}, {{ 3, 3, 3 }} );
+      typedef typename Kokkos::MDRangePolicy<ExecSpace, Kokkos::Rank<3>,
+                                             Kokkos::IndexType<int> >
+          range_type;
+      range_type range({{0, 0, 0}}, {{N0, N1, N2}}, {{3, 3, 3}});
 
-      TestMDRange_3D functor( N0, N1, N2 );
+      TestMDRange_3D functor(N0, N1, N2);
 
-      parallel_for( range, functor );
+      parallel_for(range, functor);
 
       value_type sum = 0.0;
-      Kokkos::View< value_type, Kokkos::HostSpace > sum_view("sum_view");
+      Kokkos::View<value_type, Kokkos::HostSpace> sum_view("sum_view");
       sum_view() = sum;
-      Kokkos::Sum< value_type > reducer_view( sum_view );
+      Kokkos::Sum<value_type> reducer_view(sum_view);
 
-      parallel_reduce( range, functor, reducer_view);
+      parallel_reduce(range, functor, reducer_view);
       Kokkos::fence();
       sum = sum_view();
 
-      ASSERT_EQ( sum, 2 * N0 * N1 * N2 );
+      ASSERT_EQ(sum, 2 * N0 * N1 * N2);
     }
     // Test Min reducer with lambda
-#if defined( KOKKOS_ENABLE_CXX11_DISPATCH_LAMBDA )
-#if !defined(KOKKOS_ENABLE_CUDA) || ( 8000 <= CUDA_VERSION )
+#if defined(KOKKOS_ENABLE_CXX11_DISPATCH_LAMBDA)
+#if !defined(KOKKOS_ENABLE_CUDA) || (8000 <= CUDA_VERSION)
     {
-      typedef typename Kokkos::MDRangePolicy< ExecSpace, Kokkos::Rank<3>, Kokkos::IndexType<int> > range_type;
+      typedef typename Kokkos::MDRangePolicy<ExecSpace, Kokkos::Rank<3>,
+                                             Kokkos::IndexType<int> >
+          range_type;
 
-      range_type range( {{ 1, 1, 1 }}, {{ N0, N1, N2 }}, {{ 3, 3, 3 }} );
+      range_type range({{1, 1, 1}}, {{N0, N1, N2}}, {{3, 3, 3}});
 
-      Kokkos::View< double***, ExecSpace > v_in("v_in", N0, N1, N2 );
+      Kokkos::View<double ***, ExecSpace> v_in("v_in", N0, N1, N2);
 
-      parallel_for( "rank3-init-lambda", range, KOKKOS_LAMBDA ( const int i, const int j, const int k ) {
-          v_in( i, j, k ) = (i+1) * (j+1) * (k+1) ;
-        });
+      parallel_for(
+          "rank3-init-lambda", range,
+          KOKKOS_LAMBDA(const int i, const int j, const int k) {
+            v_in(i, j, k) = (i + 1) * (j + 1) * (k + 1);
+          });
 
       double min;
 
-      parallel_reduce("rank3-min-reducer", range, KOKKOS_LAMBDA ( const int i, const int j, const int k, double& min_val ) {
-            min_val = (v_in(i,j,k) < min_val) ? v_in(i,j,k) : min_val;
-          }
-        , Kokkos::Min<double>(min) );
+      parallel_reduce(
+          "rank3-min-reducer", range,
+          KOKKOS_LAMBDA(const int i, const int j, const int k,
+                        double &min_val) {
+            min_val = (v_in(i, j, k) < min_val) ? v_in(i, j, k) : min_val;
+          },
+          Kokkos::Min<double>(min));
 
-      if((N0-1)*(N1-1)*(N2-1)>0)
-        ASSERT_EQ( min, 8.0 );
+      if ((N0 - 1) * (N1 - 1) * (N2 - 1) > 0)
+        ASSERT_EQ(min, 8.0);
       else {
         double min_identity = Kokkos::reduction_identity<double>::min();
-        ASSERT_EQ( min, min_identity );
+        ASSERT_EQ(min, min_identity);
       }
     }
 #endif
@@ -970,128 +1051,153 @@ struct TestMDRange_3D {
 
     // Tagged operator test
     {
-      typedef typename Kokkos::MDRangePolicy< ExecSpace, Kokkos::Rank<3, Iterate::Default, Iterate::Default >, Kokkos::IndexType<int>, InitTag > range_type;
+      typedef typename Kokkos::MDRangePolicy<
+          ExecSpace, Kokkos::Rank<3, Iterate::Default, Iterate::Default>,
+          Kokkos::IndexType<int>, InitTag>
+          range_type;
       typedef typename range_type::tile_type tile_type;
       typedef typename range_type::point_type point_type;
 
-      range_type range( point_type{ { 0, 0, 0 } }, point_type{ { N0, N1, N2 } }, tile_type{ { 2, 4, 6 } } );
+      range_type range(point_type{{0, 0, 0}}, point_type{{N0, N1, N2}},
+                       tile_type{{2, 4, 6}});
 
-      TestMDRange_3D functor( N0, N1, N2 );
+      TestMDRange_3D functor(N0, N1, N2);
 
-      parallel_for( range, functor );
+      parallel_for(range, functor);
 
       // check parallel_for results correct with InitTag
-      HostViewType h_view = Kokkos::create_mirror_view( functor.input_view );
-      Kokkos::deep_copy( h_view, functor.input_view );
+      HostViewType h_view = Kokkos::create_mirror_view(functor.input_view);
+      Kokkos::deep_copy(h_view, functor.input_view);
       int counter = 0;
-      for ( int i = 0; i < N0; ++i )
-      for ( int j = 0; j < N1; ++j )
-      for ( int k = 0; k < N2; ++k )
-      {
-        if ( h_view( i, j, k ) != 3 ) {
-          ++counter;
-        }
+      for (int i = 0; i < N0; ++i)
+        for (int j = 0; j < N1; ++j)
+          for (int k = 0; k < N2; ++k) {
+            if (h_view(i, j, k) != 3) {
+              ++counter;
+            }
+          }
+
+      if (counter != 0) {
+        printf(
+            "Defaults + InitTag op(): Errors in test_for3; mismatches = %d\n\n",
+            counter);
       }
-
-      if ( counter != 0 ) {
-        printf( "Defaults + InitTag op(): Errors in test_for3; mismatches = %d\n\n", counter );
-      }
-      ASSERT_EQ( counter, 0 );
-
+      ASSERT_EQ(counter, 0);
 
       double sum = 0.0;
-      parallel_reduce( range, functor, sum );
+      parallel_reduce(range, functor, sum);
 
-      ASSERT_EQ( sum, 9 * N0 * N1 * N2 );
+      ASSERT_EQ(sum, 9 * N0 * N1 * N2);
     }
 
     {
-      typedef typename Kokkos::MDRangePolicy< ExecSpace, Kokkos::Rank<3, Iterate::Default, Iterate::Default >, Kokkos::IndexType<int> > range_type;
+      typedef typename Kokkos::MDRangePolicy<
+          ExecSpace, Kokkos::Rank<3, Iterate::Default, Iterate::Default>,
+          Kokkos::IndexType<int> >
+          range_type;
       typedef typename range_type::tile_type tile_type;
       typedef typename range_type::point_type point_type;
 
-      range_type range( point_type{ { 0, 0, 0 } }, point_type{ { N0, N1, N2 } }, tile_type{ { 2, 4, 6 } } );
+      range_type range(point_type{{0, 0, 0}}, point_type{{N0, N1, N2}},
+                       tile_type{{2, 4, 6}});
 
-      TestMDRange_3D functor( N0, N1, N2 );
+      TestMDRange_3D functor(N0, N1, N2);
 
-      parallel_for( range, functor );
+      parallel_for(range, functor);
       double sum = 0.0;
-      parallel_reduce( range, functor, sum );
+      parallel_reduce(range, functor, sum);
 
-      ASSERT_EQ( sum, 2 * N0 * N1 * N2 );
+      ASSERT_EQ(sum, 2 * N0 * N1 * N2);
     }
 
     {
-      typedef typename Kokkos::MDRangePolicy< ExecSpace, Kokkos::Rank<3, Iterate::Left, Iterate::Left>, Kokkos::IndexType<int> > range_type;
+      typedef typename Kokkos::MDRangePolicy<
+          ExecSpace, Kokkos::Rank<3, Iterate::Left, Iterate::Left>,
+          Kokkos::IndexType<int> >
+          range_type;
       typedef typename range_type::tile_type tile_type;
       typedef typename range_type::point_type point_type;
 
-      range_type range( point_type{ { 0, 0, 0 } }, point_type{ { N0, N1, N2 } }, tile_type{ { 2, 4, 6 } } );
+      range_type range(point_type{{0, 0, 0}}, point_type{{N0, N1, N2}},
+                       tile_type{{2, 4, 6}});
 
-      TestMDRange_3D functor( N0, N1, N2 );
+      TestMDRange_3D functor(N0, N1, N2);
 
-      parallel_for( range, functor );
+      parallel_for(range, functor);
       double sum = 0.0;
-      parallel_reduce( range, functor, sum );
+      parallel_reduce(range, functor, sum);
 
-      ASSERT_EQ( sum, 2 * N0 * N1 * N2 );
+      ASSERT_EQ(sum, 2 * N0 * N1 * N2);
     }
 
     {
-      typedef typename Kokkos::MDRangePolicy< ExecSpace, Kokkos::Rank<3, Iterate::Left, Iterate::Right>, Kokkos::IndexType<int> > range_type;
+      typedef typename Kokkos::MDRangePolicy<
+          ExecSpace, Kokkos::Rank<3, Iterate::Left, Iterate::Right>,
+          Kokkos::IndexType<int> >
+          range_type;
       typedef typename range_type::tile_type tile_type;
       typedef typename range_type::point_type point_type;
 
-      range_type range( point_type{ { 0, 0, 0 } }, point_type{ { N0, N1, N2 } }, tile_type{ { 2, 4, 6 } } );
+      range_type range(point_type{{0, 0, 0}}, point_type{{N0, N1, N2}},
+                       tile_type{{2, 4, 6}});
 
-      TestMDRange_3D functor( N0, N1, N2 );
+      TestMDRange_3D functor(N0, N1, N2);
 
-      parallel_for( range, functor );
+      parallel_for(range, functor);
       double sum = 0.0;
-      parallel_reduce( range, functor, sum );
+      parallel_reduce(range, functor, sum);
 
-      ASSERT_EQ( sum, 2 * N0 * N1 * N2 );
+      ASSERT_EQ(sum, 2 * N0 * N1 * N2);
     }
 
     {
-      typedef typename Kokkos::MDRangePolicy< ExecSpace, Kokkos::Rank<3, Iterate::Right, Iterate::Left>, Kokkos::IndexType<int> > range_type;
+      typedef typename Kokkos::MDRangePolicy<
+          ExecSpace, Kokkos::Rank<3, Iterate::Right, Iterate::Left>,
+          Kokkos::IndexType<int> >
+          range_type;
       typedef typename range_type::tile_type tile_type;
       typedef typename range_type::point_type point_type;
 
-      range_type range( point_type{ { 0, 0, 0 } }, point_type{ { N0, N1, N2 } }, tile_type{ { 2, 4, 6 } } );
+      range_type range(point_type{{0, 0, 0}}, point_type{{N0, N1, N2}},
+                       tile_type{{2, 4, 6}});
 
-      TestMDRange_3D functor( N0, N1, N2 );
+      TestMDRange_3D functor(N0, N1, N2);
 
-      parallel_for( range, functor );
+      parallel_for(range, functor);
       double sum = 0.0;
-      parallel_reduce( range, functor, sum );
+      parallel_reduce(range, functor, sum);
 
-      ASSERT_EQ( sum, 2 * N0 * N1 * N2 );
+      ASSERT_EQ(sum, 2 * N0 * N1 * N2);
     }
 
     {
-      typedef typename Kokkos::MDRangePolicy< ExecSpace, Kokkos::Rank<3, Iterate::Right, Iterate::Right>, Kokkos::IndexType<int> > range_type;
+      typedef typename Kokkos::MDRangePolicy<
+          ExecSpace, Kokkos::Rank<3, Iterate::Right, Iterate::Right>,
+          Kokkos::IndexType<int> >
+          range_type;
       typedef typename range_type::tile_type tile_type;
       typedef typename range_type::point_type point_type;
 
-      range_type range( point_type{ { 0, 0, 0 } }, point_type{ { N0, N1, N2 } }, tile_type{ { 2, 4, 6 } } );
+      range_type range(point_type{{0, 0, 0}}, point_type{{N0, N1, N2}},
+                       tile_type{{2, 4, 6}});
 
-      TestMDRange_3D functor( N0, N1, N2 );
+      TestMDRange_3D functor(N0, N1, N2);
 
-      parallel_for( range, functor );
+      parallel_for(range, functor);
       double sum = 0.0;
-      parallel_reduce( range, functor, sum );
+      parallel_reduce(range, functor, sum);
 
-      ASSERT_EQ( sum, 2 * N0 * N1 * N2 );
+      ASSERT_EQ(sum, 2 * N0 * N1 * N2);
     }
-  } // end test_reduce3
+  }  // end test_reduce3
 
-  static void test_for3( const int N0, const int N1, const int N2 )
-  {
-#if defined( KOKKOS_ENABLE_CXX11_DISPATCH_LAMBDA )
-#if !defined(KOKKOS_ENABLE_CUDA) || ( 8000 <= CUDA_VERSION )
+  static void test_for3(const int N0, const int N1, const int N2) {
+#if defined(KOKKOS_ENABLE_CXX11_DISPATCH_LAMBDA)
+#if !defined(KOKKOS_ENABLE_CUDA) || (8000 <= CUDA_VERSION)
     {
-      typedef typename Kokkos::MDRangePolicy< ExecSpace, Kokkos::Rank<3>, Kokkos::IndexType<int> > range_type;
+      typedef typename Kokkos::MDRangePolicy<ExecSpace, Kokkos::Rank<3>,
+                                             Kokkos::IndexType<int> >
+          range_type;
       typedef typename range_type::tile_type tile_type;
       typedef typename range_type::point_type point_type;
 
@@ -1099,344 +1205,375 @@ struct TestMDRange_3D {
       const int s1 = 1;
       const int s2 = 1;
 
-      range_type range( point_type{ { s0, s1, s2 } }, point_type{ { N0, N1, N2 } }, tile_type{ { 3, 3, 3 } } );
+      range_type range(point_type{{s0, s1, s2}}, point_type{{N0, N1, N2}},
+                       tile_type{{3, 3, 3}});
 
-      TestMDRange_3D::ViewType v( "v", N0, N1, N2 );
+      TestMDRange_3D::ViewType v("v", N0, N1, N2);
 
-      parallel_for( range, 
-          KOKKOS_LAMBDA ( const int i , const int j , const int k ) {
+      parallel_for(
+          range, KOKKOS_LAMBDA(const int i, const int j, const int k) {
             v(i, j, k) = 3;
-          }
-        );
+          });
 
-      TestMDRange_3D::HostViewType h_view = Kokkos::create_mirror_view( v );
-      Kokkos::deep_copy( h_view, v );
+      TestMDRange_3D::HostViewType h_view = Kokkos::create_mirror_view(v);
+      Kokkos::deep_copy(h_view, v);
 
       int counter = 0;
-      for ( int i = s0; i < N0; ++i )
-      for ( int j = s1; j < N1; ++j )
-      for ( int k = s2; k < N2; ++k )
-      {
-        if ( h_view( i, j, k ) != 3 ) {
-          ++counter;
-        }
+      for (int i = s0; i < N0; ++i)
+        for (int j = s1; j < N1; ++j)
+          for (int k = s2; k < N2; ++k) {
+            if (h_view(i, j, k) != 3) {
+              ++counter;
+            }
+          }
+
+      if (counter != 0) {
+        printf(
+            "Offset Start + Default Layouts + InitTag op(): Errors in "
+            "test_for3; mismatches = %d\n\n",
+            counter);
       }
 
-      if ( counter != 0 ) {
-        printf( "Offset Start + Default Layouts + InitTag op(): Errors in test_for3; mismatches = %d\n\n", counter );
-      }
-
-      ASSERT_EQ( counter, 0 );
+      ASSERT_EQ(counter, 0);
     }
 #endif
 #endif
 
     {
-      typedef typename Kokkos::MDRangePolicy< ExecSpace, Kokkos::Rank<3> > range_type;
+      typedef typename Kokkos::MDRangePolicy<ExecSpace, Kokkos::Rank<3> >
+          range_type;
       typedef typename range_type::point_type point_type;
 
-      range_type range( point_type{ { 0, 0, 0 } }, point_type{ { N0, N1, N2 } } );
-      TestMDRange_3D functor( N0, N1, N2 );
+      range_type range(point_type{{0, 0, 0}}, point_type{{N0, N1, N2}});
+      TestMDRange_3D functor(N0, N1, N2);
 
-      parallel_for( range, functor );
+      parallel_for(range, functor);
 
-      HostViewType h_view = Kokkos::create_mirror_view( functor.input_view );
-      Kokkos::deep_copy( h_view, functor.input_view );
+      HostViewType h_view = Kokkos::create_mirror_view(functor.input_view);
+      Kokkos::deep_copy(h_view, functor.input_view);
 
       int counter = 0;
-      for ( int i = 0; i < N0; ++i )
-      for ( int j = 0; j < N1; ++j )
-      for ( int k = 0; k < N2; ++k )
-      {
-        if ( h_view( i, j, k ) != 1 ) {
-          ++counter;
-        }
+      for (int i = 0; i < N0; ++i)
+        for (int j = 0; j < N1; ++j)
+          for (int k = 0; k < N2; ++k) {
+            if (h_view(i, j, k) != 1) {
+              ++counter;
+            }
+          }
+
+      if (counter != 0) {
+        printf("Defaults + No Tile: Errors in test_for3; mismatches = %d\n\n",
+               counter);
       }
 
-      if ( counter != 0 ) {
-        printf( "Defaults + No Tile: Errors in test_for3; mismatches = %d\n\n", counter );
-      }
-
-      ASSERT_EQ( counter, 0 );
+      ASSERT_EQ(counter, 0);
     }
 
     {
-      typedef typename Kokkos::MDRangePolicy< ExecSpace, Kokkos::Rank<3>, Kokkos::IndexType<int>, InitTag > range_type;
+      typedef typename Kokkos::MDRangePolicy<ExecSpace, Kokkos::Rank<3>,
+                                             Kokkos::IndexType<int>, InitTag>
+          range_type;
       typedef typename range_type::tile_type tile_type;
       typedef typename range_type::point_type point_type;
 
       int s0 = 1;
       int s1 = 1;
       int s2 = 1;
-      range_type range( point_type{ { s0, s1, s2 } }, point_type{ { N0, N1, N2 } }, tile_type{ { 3, 3, 3 } } );
-      TestMDRange_3D functor( N0, N1, N2 );
+      range_type range(point_type{{s0, s1, s2}}, point_type{{N0, N1, N2}},
+                       tile_type{{3, 3, 3}});
+      TestMDRange_3D functor(N0, N1, N2);
 
-      parallel_for( range, functor );
+      parallel_for(range, functor);
 
-      HostViewType h_view = Kokkos::create_mirror_view( functor.input_view );
-      Kokkos::deep_copy( h_view, functor.input_view );
+      HostViewType h_view = Kokkos::create_mirror_view(functor.input_view);
+      Kokkos::deep_copy(h_view, functor.input_view);
 
       int counter = 0;
-      for ( int i = s0; i < N0; ++i )
-      for ( int j = s1; j < N1; ++j )
-      for ( int k = s2; k < N2; ++k )
-      {
-        if ( h_view( i, j, k ) != 3 ) {
-          ++counter;
-        }
+      for (int i = s0; i < N0; ++i)
+        for (int j = s1; j < N1; ++j)
+          for (int k = s2; k < N2; ++k) {
+            if (h_view(i, j, k) != 3) {
+              ++counter;
+            }
+          }
+
+      if (counter != 0) {
+        printf(
+            "Offset Start + Defaults + InitTag op(): Errors in test_for3; "
+            "mismatches = %d\n\n",
+            counter);
       }
 
-      if ( counter != 0 ) {
-        printf( "Offset Start + Defaults + InitTag op(): Errors in test_for3; mismatches = %d\n\n", counter );
-      }
-
-      ASSERT_EQ( counter, 0 );
+      ASSERT_EQ(counter, 0);
     }
 
     {
-      typedef typename Kokkos::MDRangePolicy< ExecSpace, Kokkos::Rank<3>, Kokkos::IndexType<int> > range_type;
+      typedef typename Kokkos::MDRangePolicy<ExecSpace, Kokkos::Rank<3>,
+                                             Kokkos::IndexType<int> >
+          range_type;
       typedef typename range_type::tile_type tile_type;
       typedef typename range_type::point_type point_type;
 
-      range_type range( point_type{ { 0, 0, 0 } }, point_type{ { N0, N1, N2 } }, tile_type{ { 3, 3, 3 } } );
+      range_type range(point_type{{0, 0, 0}}, point_type{{N0, N1, N2}},
+                       tile_type{{3, 3, 3}});
 
-      TestMDRange_3D functor( N0, N1, N2 );
+      TestMDRange_3D functor(N0, N1, N2);
 
-      parallel_for( range, functor );
+      parallel_for(range, functor);
 
-      HostViewType h_view = Kokkos::create_mirror_view( functor.input_view );
-      Kokkos::deep_copy( h_view, functor.input_view );
+      HostViewType h_view = Kokkos::create_mirror_view(functor.input_view);
+      Kokkos::deep_copy(h_view, functor.input_view);
 
       int counter = 0;
-      for ( int i = 0; i < N0; ++i )
-      for ( int j = 0; j < N1; ++j )
-      for ( int k = 0; k < N2; ++k )
-      {
-        if ( h_view( i, j, k ) != 1 ) {
-          ++counter;
-        }
+      for (int i = 0; i < N0; ++i)
+        for (int j = 0; j < N1; ++j)
+          for (int k = 0; k < N2; ++k) {
+            if (h_view(i, j, k) != 1) {
+              ++counter;
+            }
+          }
+
+      if (counter != 0) {
+        printf(" Errors in test_for3; mismatches = %d\n\n", counter);
       }
 
-      if ( counter != 0 ) {
-        printf( " Errors in test_for3; mismatches = %d\n\n", counter );
-      }
-
-      ASSERT_EQ( counter, 0 );
+      ASSERT_EQ(counter, 0);
     }
 
     {
-      typedef typename Kokkos::MDRangePolicy< ExecSpace, Kokkos::Rank<3, Iterate::Default, Iterate::Default>, Kokkos::IndexType<int> > range_type;
+      typedef typename Kokkos::MDRangePolicy<
+          ExecSpace, Kokkos::Rank<3, Iterate::Default, Iterate::Default>,
+          Kokkos::IndexType<int> >
+          range_type;
       typedef typename range_type::tile_type tile_type;
       typedef typename range_type::point_type point_type;
 
-      range_type range( point_type{ { 0, 0, 0 } }, point_type{ { N0, N1, N2 } }, tile_type{ { 3, 3, 3 } } );
-      TestMDRange_3D functor( N0, N1, N2 );
+      range_type range(point_type{{0, 0, 0}}, point_type{{N0, N1, N2}},
+                       tile_type{{3, 3, 3}});
+      TestMDRange_3D functor(N0, N1, N2);
 
-      parallel_for( range, functor );
+      parallel_for(range, functor);
 
-      HostViewType h_view = Kokkos::create_mirror_view( functor.input_view );
-      Kokkos::deep_copy( h_view, functor.input_view );
+      HostViewType h_view = Kokkos::create_mirror_view(functor.input_view);
+      Kokkos::deep_copy(h_view, functor.input_view);
 
       int counter = 0;
-      for ( int i = 0; i < N0; ++i )
-      for ( int j = 0; j < N1; ++j )
-      for ( int k = 0; k < N2; ++k )
-      {
-        if ( h_view( i, j, k ) != 1 ) {
-          ++counter;
-        }
+      for (int i = 0; i < N0; ++i)
+        for (int j = 0; j < N1; ++j)
+          for (int k = 0; k < N2; ++k) {
+            if (h_view(i, j, k) != 1) {
+              ++counter;
+            }
+          }
+
+      if (counter != 0) {
+        printf(" Errors in test_for3; mismatches = %d\n\n", counter);
       }
 
-      if ( counter != 0 ) {
-        printf( " Errors in test_for3; mismatches = %d\n\n", counter );
-      }
-
-      ASSERT_EQ( counter, 0 );
+      ASSERT_EQ(counter, 0);
     }
 
     {
-      typedef typename Kokkos::MDRangePolicy< ExecSpace, Kokkos::Rank<3, Iterate::Left, Iterate::Left>, Kokkos::IndexType<int> > range_type;
+      typedef typename Kokkos::MDRangePolicy<
+          ExecSpace, Kokkos::Rank<3, Iterate::Left, Iterate::Left>,
+          Kokkos::IndexType<int> >
+          range_type;
       typedef typename range_type::tile_type tile_type;
       typedef typename range_type::point_type point_type;
 
-      range_type range( point_type{ { 0, 0, 0 } }, point_type{ { N0, N1, N2 } }, tile_type{ { 2, 4, 2 } } );
-      TestMDRange_3D functor( N0, N1, N2 );
+      range_type range(point_type{{0, 0, 0}}, point_type{{N0, N1, N2}},
+                       tile_type{{2, 4, 2}});
+      TestMDRange_3D functor(N0, N1, N2);
 
-      parallel_for( range, functor );
+      parallel_for(range, functor);
 
-      HostViewType h_view = Kokkos::create_mirror_view( functor.input_view );
-      Kokkos::deep_copy( h_view, functor.input_view );
+      HostViewType h_view = Kokkos::create_mirror_view(functor.input_view);
+      Kokkos::deep_copy(h_view, functor.input_view);
 
       int counter = 0;
-      for ( int i = 0; i < N0; ++i )
-      for ( int j = 0; j < N1; ++j )
-      for ( int k = 0; k < N2; ++k )
-      {
-        if ( h_view( i, j, k ) != 1 ) {
-          ++counter;
-        }
+      for (int i = 0; i < N0; ++i)
+        for (int j = 0; j < N1; ++j)
+          for (int k = 0; k < N2; ++k) {
+            if (h_view(i, j, k) != 1) {
+              ++counter;
+            }
+          }
+
+      if (counter != 0) {
+        printf(" Errors in test_for3; mismatches = %d\n\n", counter);
       }
 
-      if ( counter != 0 ) {
-        printf( " Errors in test_for3; mismatches = %d\n\n", counter );
-      }
-
-      ASSERT_EQ( counter, 0 );
+      ASSERT_EQ(counter, 0);
     }
 
     {
-      typedef typename Kokkos::MDRangePolicy< ExecSpace, Kokkos::Rank<3, Iterate::Left, Iterate::Right>, Kokkos::IndexType<int> > range_type;
+      typedef typename Kokkos::MDRangePolicy<
+          ExecSpace, Kokkos::Rank<3, Iterate::Left, Iterate::Right>,
+          Kokkos::IndexType<int> >
+          range_type;
       typedef typename range_type::tile_type tile_type;
       typedef typename range_type::point_type point_type;
 
-      range_type range( point_type{ { 0, 0, 0 } }, point_type{ { N0, N1, N2 } }, tile_type{ { 3, 5, 7 } } );
-      TestMDRange_3D functor( N0, N1, N2 );
+      range_type range(point_type{{0, 0, 0}}, point_type{{N0, N1, N2}},
+                       tile_type{{3, 5, 7}});
+      TestMDRange_3D functor(N0, N1, N2);
 
-      parallel_for( range, functor );
+      parallel_for(range, functor);
 
-      HostViewType h_view = Kokkos::create_mirror_view( functor.input_view );
-      Kokkos::deep_copy( h_view, functor.input_view );
+      HostViewType h_view = Kokkos::create_mirror_view(functor.input_view);
+      Kokkos::deep_copy(h_view, functor.input_view);
 
       int counter = 0;
-      for ( int i = 0; i < N0; ++i )
-      for ( int j = 0; j < N1; ++j )
-      for ( int k = 0; k < N2; ++k )
-      {
-        if ( h_view( i, j, k ) != 1 ) {
-          ++counter;
-        }
+      for (int i = 0; i < N0; ++i)
+        for (int j = 0; j < N1; ++j)
+          for (int k = 0; k < N2; ++k) {
+            if (h_view(i, j, k) != 1) {
+              ++counter;
+            }
+          }
+
+      if (counter != 0) {
+        printf(" Errors in test_for3; mismatches = %d\n\n", counter);
       }
 
-      if ( counter != 0 ) {
-        printf( " Errors in test_for3; mismatches = %d\n\n", counter );
-      }
-
-      ASSERT_EQ( counter, 0 );
+      ASSERT_EQ(counter, 0);
     }
 
     {
-      typedef typename Kokkos::MDRangePolicy< ExecSpace, Kokkos::Rank<3, Iterate::Right, Iterate::Left>, Kokkos::IndexType<int> > range_type;
+      typedef typename Kokkos::MDRangePolicy<
+          ExecSpace, Kokkos::Rank<3, Iterate::Right, Iterate::Left>,
+          Kokkos::IndexType<int> >
+          range_type;
       typedef typename range_type::tile_type tile_type;
       typedef typename range_type::point_type point_type;
 
-      range_type range( point_type{ { 0, 0, 0 } }, point_type{ { N0, N1, N2 } }, tile_type{ { 8, 8, 8 } } );
-      TestMDRange_3D functor( N0, N1, N2 );
+      range_type range(point_type{{0, 0, 0}}, point_type{{N0, N1, N2}},
+                       tile_type{{8, 8, 8}});
+      TestMDRange_3D functor(N0, N1, N2);
 
-      parallel_for( range, functor );
+      parallel_for(range, functor);
 
-      HostViewType h_view = Kokkos::create_mirror_view( functor.input_view );
-      Kokkos::deep_copy( h_view, functor.input_view );
+      HostViewType h_view = Kokkos::create_mirror_view(functor.input_view);
+      Kokkos::deep_copy(h_view, functor.input_view);
 
       int counter = 0;
-      for ( int i = 0; i < N0; ++i )
-      for ( int j = 0; j < N1; ++j )
-      for ( int k = 0; k < N2; ++k )
-      {
-        if ( h_view( i, j, k ) != 1 ) {
-          ++counter;
-        }
+      for (int i = 0; i < N0; ++i)
+        for (int j = 0; j < N1; ++j)
+          for (int k = 0; k < N2; ++k) {
+            if (h_view(i, j, k) != 1) {
+              ++counter;
+            }
+          }
+
+      if (counter != 0) {
+        printf(" Errors in test_for3; mismatches = %d\n\n", counter);
       }
 
-      if ( counter != 0 ) {
-        printf( " Errors in test_for3; mismatches = %d\n\n", counter );
-      }
-
-      ASSERT_EQ( counter, 0 );
+      ASSERT_EQ(counter, 0);
     }
 
     {
-      typedef typename Kokkos::MDRangePolicy< ExecSpace, Kokkos::Rank<3, Iterate::Right, Iterate::Right>, Kokkos::IndexType<int> > range_type;
+      typedef typename Kokkos::MDRangePolicy<
+          ExecSpace, Kokkos::Rank<3, Iterate::Right, Iterate::Right>,
+          Kokkos::IndexType<int> >
+          range_type;
       typedef typename range_type::tile_type tile_type;
       typedef typename range_type::point_type point_type;
 
-      range_type range( point_type{ { 0, 0, 0 } }, point_type{ { N0, N1, N2 } }, tile_type{ { 2, 4, 2 } } );
-      TestMDRange_3D functor( N0, N1, N2 );
+      range_type range(point_type{{0, 0, 0}}, point_type{{N0, N1, N2}},
+                       tile_type{{2, 4, 2}});
+      TestMDRange_3D functor(N0, N1, N2);
 
-      parallel_for( range, functor );
+      parallel_for(range, functor);
 
-      HostViewType h_view = Kokkos::create_mirror_view( functor.input_view );
-      Kokkos::deep_copy( h_view, functor.input_view );
+      HostViewType h_view = Kokkos::create_mirror_view(functor.input_view);
+      Kokkos::deep_copy(h_view, functor.input_view);
 
       int counter = 0;
-      for ( int i = 0; i < N0; ++i )
-      for ( int j = 0; j < N1; ++j )
-      for ( int k = 0; k < N2; ++k )
-      {
-        if ( h_view( i, j, k ) != 1 ) {
-          ++counter;
-        }
+      for (int i = 0; i < N0; ++i)
+        for (int j = 0; j < N1; ++j)
+          for (int k = 0; k < N2; ++k) {
+            if (h_view(i, j, k) != 1) {
+              ++counter;
+            }
+          }
+
+      if (counter != 0) {
+        printf(" Errors in test_for3; mismatches = %d\n\n", counter);
       }
 
-      if ( counter != 0 ) {
-        printf( " Errors in test_for3; mismatches = %d\n\n", counter );
-      }
-
-      ASSERT_EQ( counter, 0 );
+      ASSERT_EQ(counter, 0);
     }
-  } // end test_for3
+  }  // end test_for3
 };
 
-template <typename ExecSpace >
+template <typename ExecSpace>
 struct TestMDRange_4D {
   using DataType     = int;
-  using ViewType     = typename Kokkos::View< DataType****, ExecSpace >;
+  using ViewType     = typename Kokkos::View<DataType ****, ExecSpace>;
   using HostViewType = typename ViewType::HostMirror;
 
   ViewType input_view;
   using value_type = double;
 
-  TestMDRange_4D( const DataType N0, const DataType N1, const DataType N2, const DataType N3 ) : input_view( "input_view", N0, N1, N2, N3 ) {}
+  TestMDRange_4D(const DataType N0, const DataType N1, const DataType N2,
+                 const DataType N3)
+      : input_view("input_view", N0, N1, N2, N3) {}
 
   KOKKOS_INLINE_FUNCTION
-  void operator()( const int i, const int j, const int k, const int l ) const
-  {
-    input_view( i, j, k, l ) = 1;
+  void operator()(const int i, const int j, const int k, const int l) const {
+    input_view(i, j, k, l) = 1;
   }
 
   KOKKOS_INLINE_FUNCTION
-  void operator()( const int i, const int j, const int k, const int l, double &lsum ) const
-  {
-    lsum += input_view( i, j, k, l ) * 2;
+  void operator()(const int i, const int j, const int k, const int l,
+                  double &lsum) const {
+    lsum += input_view(i, j, k, l) * 2;
   }
 
   // tagged operators
   struct InitTag {};
   KOKKOS_INLINE_FUNCTION
-  void operator()( const InitTag &, const int i, const int j, const int k, const int l ) const
-  {
-    input_view( i, j, k, l ) = 3;
+  void operator()(const InitTag &, const int i, const int j, const int k,
+                  const int l) const {
+    input_view(i, j, k, l) = 3;
   }
 
   // reduction tagged operators
   KOKKOS_INLINE_FUNCTION
-  void operator()( const InitTag &, const int i, const int j, const int k, const int l, value_type &lsum ) const
-  {
-    lsum += input_view( i, j, k, l ) * 3;
+  void operator()(const InitTag &, const int i, const int j, const int k,
+                  const int l, value_type &lsum) const {
+    lsum += input_view(i, j, k, l) * 3;
   }
 
-  static void test_reduce4( const int N0, const int N1, const int N2, const int N3 )
-  {
-#if defined( KOKKOS_ENABLE_CXX11_DISPATCH_LAMBDA )
-#if !defined(KOKKOS_ENABLE_CUDA) || ( 8000 <= CUDA_VERSION )
+  static void test_reduce4(const int N0, const int N1, const int N2,
+                           const int N3) {
+#if defined(KOKKOS_ENABLE_CXX11_DISPATCH_LAMBDA)
+#if !defined(KOKKOS_ENABLE_CUDA) || (8000 <= CUDA_VERSION)
     {
-      typedef typename Kokkos::MDRangePolicy< ExecSpace, Kokkos::Rank<4>, Kokkos::IndexType<int> > range_type;
+      typedef typename Kokkos::MDRangePolicy<ExecSpace, Kokkos::Rank<4>,
+                                             Kokkos::IndexType<int> >
+          range_type;
       typedef typename range_type::tile_type tile_type;
       typedef typename range_type::point_type point_type;
 
-      range_type range( point_type{ { 0, 0, 0, 0 } }, point_type{ { N0, N1, N2, N3 } }, tile_type{ { 3, 3, 3, 3 } } );
+      range_type range(point_type{{0, 0, 0, 0}}, point_type{{N0, N1, N2, N3}},
+                       tile_type{{3, 3, 3, 3}});
       double sum = 0.0;
-      parallel_reduce( range
-        , KOKKOS_LAMBDA(const int i, const int j, const int k, const int l, double &lsum) {
-            lsum+=1.0;
-          }
-        , sum );
-      ASSERT_EQ( sum, N0 * N1 * N2 * N3 );
+      parallel_reduce(
+          range,
+          KOKKOS_LAMBDA(const int i, const int j, const int k, const int l,
+                        double &lsum) { lsum += 1.0; },
+          sum);
+      ASSERT_EQ(sum, N0 * N1 * N2 * N3);
     }
 #endif
 #endif
 
     {
-      typedef typename Kokkos::MDRangePolicy< ExecSpace, Kokkos::Rank<4>, Kokkos::IndexType<int> > range_type;
+      typedef typename Kokkos::MDRangePolicy<ExecSpace, Kokkos::Rank<4>,
+                                             Kokkos::IndexType<int> >
+          range_type;
       typedef typename range_type::tile_type tile_type;
       typedef typename range_type::point_type point_type;
 
@@ -1444,225 +1581,264 @@ struct TestMDRange_4D {
       int s1 = 1;
       int s2 = 1;
       int s3 = 1;
-      range_type range( point_type{ { s0, s1, s2, s3 } }, point_type{ { N0, N1, N2, N3 } }, tile_type{ { 3, 3, 3, 3 } } );
+      range_type range(point_type{{s0, s1, s2, s3}},
+                       point_type{{N0, N1, N2, N3}}, tile_type{{3, 3, 3, 3}});
 
-      TestMDRange_4D functor( N0, N1, N2, N3 );
+      TestMDRange_4D functor(N0, N1, N2, N3);
 
-      parallel_for( range, functor );
+      parallel_for(range, functor);
       double sum = 0.0;
-      parallel_reduce( range, functor, sum );
+      parallel_reduce(range, functor, sum);
 
-      ASSERT_EQ( sum, 2 * (N0 - s0) * (N1 - s1) * (N2 - s2) * (N3 - s3) );
+      ASSERT_EQ(sum, 2 * (N0 - s0) * (N1 - s1) * (N2 - s2) * (N3 - s3));
     }
 
     // Test with reducers - scalar
     {
-      typedef typename Kokkos::MDRangePolicy< ExecSpace, Kokkos::Rank<4>, Kokkos::IndexType<int> > range_type;
-      range_type range( {{ 0, 0, 0, 0 }}, {{ N0, N1, N2, N3 }}, {{ 3, 3, 3, 3 }} );
+      typedef typename Kokkos::MDRangePolicy<ExecSpace, Kokkos::Rank<4>,
+                                             Kokkos::IndexType<int> >
+          range_type;
+      range_type range({{0, 0, 0, 0}}, {{N0, N1, N2, N3}}, {{3, 3, 3, 3}});
 
-      TestMDRange_4D functor( N0, N1, N2, N3 );
+      TestMDRange_4D functor(N0, N1, N2, N3);
 
-      parallel_for( range, functor );
+      parallel_for(range, functor);
 
       value_type sum = 0.0;
-      Kokkos::Sum< value_type > reducer_scalar( sum );
+      Kokkos::Sum<value_type> reducer_scalar(sum);
 
-      parallel_reduce( range, functor, reducer_scalar );
+      parallel_reduce(range, functor, reducer_scalar);
 
-      ASSERT_EQ( sum, 2 * N0 * N1 * N2 * N3 );
+      ASSERT_EQ(sum, 2 * N0 * N1 * N2 * N3);
     }
 
     // Test with reducers - scalar + label
     {
-      typedef typename Kokkos::MDRangePolicy< ExecSpace, Kokkos::Rank<4>, Kokkos::IndexType<int> > range_type;
-      range_type range( {{ 0, 0, 0, 0 }}, {{ N0, N1, N2, N3 }}, {{ 3, 3, 3, 3 }} );
+      typedef typename Kokkos::MDRangePolicy<ExecSpace, Kokkos::Rank<4>,
+                                             Kokkos::IndexType<int> >
+          range_type;
+      range_type range({{0, 0, 0, 0}}, {{N0, N1, N2, N3}}, {{3, 3, 3, 3}});
 
-      TestMDRange_4D functor( N0, N1, N2, N3 );
+      TestMDRange_4D functor(N0, N1, N2, N3);
 
-      parallel_for( "rank4-parfor-label", range, functor );
+      parallel_for("rank4-parfor-label", range, functor);
 
       value_type sum = 0.0;
-      Kokkos::Sum< value_type > reducer_scalar( sum );
+      Kokkos::Sum<value_type> reducer_scalar(sum);
 
-      parallel_reduce( "rank4-reducer-label", range, functor, reducer_scalar );
+      parallel_reduce("rank4-reducer-label", range, functor, reducer_scalar);
 
-      ASSERT_EQ( sum, 2 * N0 * N1 * N2 * N3 );
+      ASSERT_EQ(sum, 2 * N0 * N1 * N2 * N3);
     }
 
     // Test with reducers - scalar view
     {
-      typedef typename Kokkos::MDRangePolicy< ExecSpace, Kokkos::Rank<4>, Kokkos::IndexType<int> > range_type;
-      range_type range( {{ 0, 0, 0, 0 }}, {{ N0, N1, N2, N3 }}, {{ 3, 3, 3, 3 }} );
+      typedef typename Kokkos::MDRangePolicy<ExecSpace, Kokkos::Rank<4>,
+                                             Kokkos::IndexType<int> >
+          range_type;
+      range_type range({{0, 0, 0, 0}}, {{N0, N1, N2, N3}}, {{3, 3, 3, 3}});
 
-      TestMDRange_4D functor( N0, N1, N2, N3 );
+      TestMDRange_4D functor(N0, N1, N2, N3);
 
-      parallel_for( range, functor );
+      parallel_for(range, functor);
 
       value_type sum = 0.0;
-      Kokkos::View< value_type, Kokkos::HostSpace > sum_view("sum_view");
+      Kokkos::View<value_type, Kokkos::HostSpace> sum_view("sum_view");
       sum_view() = sum;
-      Kokkos::Sum< value_type > reducer_view( sum_view );
+      Kokkos::Sum<value_type> reducer_view(sum_view);
 
-      parallel_reduce( range, functor, reducer_view);
+      parallel_reduce(range, functor, reducer_view);
       Kokkos::fence();
       sum = sum_view();
 
-      ASSERT_EQ( sum, 2 * N0 * N1 * N2 * N3 );
+      ASSERT_EQ(sum, 2 * N0 * N1 * N2 * N3);
     }
 
     // Test Min reducer with lambda
-#if defined( KOKKOS_ENABLE_CXX11_DISPATCH_LAMBDA )
-#if !defined(KOKKOS_ENABLE_CUDA) || ( 8000 <= CUDA_VERSION )
+#if defined(KOKKOS_ENABLE_CXX11_DISPATCH_LAMBDA)
+#if !defined(KOKKOS_ENABLE_CUDA) || (8000 <= CUDA_VERSION)
     {
-      typedef typename Kokkos::MDRangePolicy< ExecSpace, Kokkos::Rank<4>, Kokkos::IndexType<int> > range_type;
+      typedef typename Kokkos::MDRangePolicy<ExecSpace, Kokkos::Rank<4>,
+                                             Kokkos::IndexType<int> >
+          range_type;
 
-      range_type range( {{ 1, 1, 1, 1 }}, {{ N0, N1, N2, N3 }}, {{ 3, 3, 3, 3 }} );
+      range_type range({{1, 1, 1, 1}}, {{N0, N1, N2, N3}}, {{3, 3, 3, 3}});
 
-      Kokkos::View< double****, ExecSpace > v_in("v_in", N0, N1, N2, N3 );
+      Kokkos::View<double ****, ExecSpace> v_in("v_in", N0, N1, N2, N3);
 
-      parallel_for( "rank4-init-lambda", range, KOKKOS_LAMBDA ( const int i, const int j, const int k, const int l ) {
-          v_in( i, j, k, l ) = (i+1) * (j+1) * (k+1) * (l+1) ;
-        });
+      parallel_for(
+          "rank4-init-lambda", range,
+          KOKKOS_LAMBDA(const int i, const int j, const int k, const int l) {
+            v_in(i, j, k, l) = (i + 1) * (j + 1) * (k + 1) * (l + 1);
+          });
 
       double min;
 
-      parallel_reduce("rank4-min-reducer", range, KOKKOS_LAMBDA ( const int i, const int j, const int k, const int l, double& min_val ) {
-            min_val = (v_in(i,j,k,l) < min_val) ? v_in(i,j,k,l) : min_val;
-          }
-        , Kokkos::Min<double>(min) );
+      parallel_reduce(
+          "rank4-min-reducer", range,
+          KOKKOS_LAMBDA(const int i, const int j, const int k, const int l,
+                        double &min_val) {
+            min_val = (v_in(i, j, k, l) < min_val) ? v_in(i, j, k, l) : min_val;
+          },
+          Kokkos::Min<double>(min));
 
-      ASSERT_EQ( min, 16.0 );
+      ASSERT_EQ(min, 16.0);
     }
 #endif
 #endif
 
     // Tagged operator test
     {
-      typedef typename Kokkos::MDRangePolicy< ExecSpace, Kokkos::Rank<4, Iterate::Default, Iterate::Default >, Kokkos::IndexType<int>, InitTag > range_type;
+      typedef typename Kokkos::MDRangePolicy<
+          ExecSpace, Kokkos::Rank<4, Iterate::Default, Iterate::Default>,
+          Kokkos::IndexType<int>, InitTag>
+          range_type;
       typedef typename range_type::tile_type tile_type;
       typedef typename range_type::point_type point_type;
 
-      range_type range( point_type{ { 0, 0, 0, 0 } }, point_type{ { N0, N1, N2, N3 } }, tile_type{ { 2, 4, 6, 2 } } );
+      range_type range(point_type{{0, 0, 0, 0}}, point_type{{N0, N1, N2, N3}},
+                       tile_type{{2, 4, 6, 2}});
 
-      TestMDRange_4D functor( N0, N1, N2, N3 );
+      TestMDRange_4D functor(N0, N1, N2, N3);
 
-      parallel_for( range, functor );
+      parallel_for(range, functor);
 
       // check parallel_for results correct with InitTag
-      HostViewType h_view = Kokkos::create_mirror_view( functor.input_view );
-      Kokkos::deep_copy( h_view, functor.input_view );
+      HostViewType h_view = Kokkos::create_mirror_view(functor.input_view);
+      Kokkos::deep_copy(h_view, functor.input_view);
       int counter = 0;
-      for ( int i = 0; i < N0; ++i )
-      for ( int j = 0; j < N1; ++j )
-      for ( int k = 0; k < N2; ++k )
-      for ( int l = 0; l < N3; ++l )
-      {
-        if ( h_view( i, j, k, l ) != 3 ) {
-          ++counter;
-        }
+      for (int i = 0; i < N0; ++i)
+        for (int j = 0; j < N1; ++j)
+          for (int k = 0; k < N2; ++k)
+            for (int l = 0; l < N3; ++l) {
+              if (h_view(i, j, k, l) != 3) {
+                ++counter;
+              }
+            }
+
+      if (counter != 0) {
+        printf(
+            "Defaults + InitTag op(): Errors in test_reduce4 parallel_for "
+            "init; mismatches = %d\n\n",
+            counter);
       }
-
-      if ( counter != 0 ) {
-        printf( "Defaults + InitTag op(): Errors in test_reduce4 parallel_for init; mismatches = %d\n\n", counter );
-      }
-      ASSERT_EQ( counter, 0 );
-
+      ASSERT_EQ(counter, 0);
 
       double sum = 0.0;
-      parallel_reduce( range, functor, sum );
+      parallel_reduce(range, functor, sum);
 
-      ASSERT_EQ( sum, 9 * N0 * N1 * N2 * N3 );
+      ASSERT_EQ(sum, 9 * N0 * N1 * N2 * N3);
     }
 
     {
-      typedef typename Kokkos::MDRangePolicy< ExecSpace, Kokkos::Rank<4, Iterate::Default, Iterate::Default >, Kokkos::IndexType<int> > range_type;
+      typedef typename Kokkos::MDRangePolicy<
+          ExecSpace, Kokkos::Rank<4, Iterate::Default, Iterate::Default>,
+          Kokkos::IndexType<int> >
+          range_type;
       typedef typename range_type::tile_type tile_type;
       typedef typename range_type::point_type point_type;
 
-      range_type range( point_type{ { 0, 0, 0, 0 } }, point_type{ { N0, N1, N2, N3 } }, tile_type{ { 2, 4, 6, 2 } } );
+      range_type range(point_type{{0, 0, 0, 0}}, point_type{{N0, N1, N2, N3}},
+                       tile_type{{2, 4, 6, 2}});
 
-      TestMDRange_4D functor( N0, N1, N2, N3 );
+      TestMDRange_4D functor(N0, N1, N2, N3);
 
-      parallel_for( range, functor );
+      parallel_for(range, functor);
       double sum = 0.0;
-      parallel_reduce( range, functor, sum );
+      parallel_reduce(range, functor, sum);
 
-      ASSERT_EQ( sum, 2 * N0 * N1 * N2 * N3 );
+      ASSERT_EQ(sum, 2 * N0 * N1 * N2 * N3);
     }
 
     {
-      typedef typename Kokkos::MDRangePolicy< ExecSpace, Kokkos::Rank<4, Iterate::Left, Iterate::Left>, Kokkos::IndexType<int> > range_type;
+      typedef typename Kokkos::MDRangePolicy<
+          ExecSpace, Kokkos::Rank<4, Iterate::Left, Iterate::Left>,
+          Kokkos::IndexType<int> >
+          range_type;
       typedef typename range_type::tile_type tile_type;
       typedef typename range_type::point_type point_type;
 
-      range_type range( point_type{ { 0, 0, 0, 0 } }, point_type{ { N0, N1, N2, N3 } }, tile_type{ { 2, 4, 6, 2 } } );
+      range_type range(point_type{{0, 0, 0, 0}}, point_type{{N0, N1, N2, N3}},
+                       tile_type{{2, 4, 6, 2}});
 
-      TestMDRange_4D functor( N0, N1, N2, N3 );
+      TestMDRange_4D functor(N0, N1, N2, N3);
 
-      parallel_for( range, functor );
+      parallel_for(range, functor);
       double sum = 0.0;
-      parallel_reduce( range, functor, sum );
+      parallel_reduce(range, functor, sum);
 
-      ASSERT_EQ( sum, 2 * N0 * N1 * N2 * N3 );
+      ASSERT_EQ(sum, 2 * N0 * N1 * N2 * N3);
     }
 
     {
-      typedef typename Kokkos::MDRangePolicy< ExecSpace, Kokkos::Rank<4, Iterate::Left, Iterate::Right>, Kokkos::IndexType<int> > range_type;
+      typedef typename Kokkos::MDRangePolicy<
+          ExecSpace, Kokkos::Rank<4, Iterate::Left, Iterate::Right>,
+          Kokkos::IndexType<int> >
+          range_type;
       typedef typename range_type::tile_type tile_type;
       typedef typename range_type::point_type point_type;
 
-      range_type range( point_type{ { 0, 0, 0, 0 } }, point_type{ { N0, N1, N2, N3 } }, tile_type{ { 2, 4, 6, 2 } } );
+      range_type range(point_type{{0, 0, 0, 0}}, point_type{{N0, N1, N2, N3}},
+                       tile_type{{2, 4, 6, 2}});
 
-      TestMDRange_4D functor( N0, N1, N2, N3 );
+      TestMDRange_4D functor(N0, N1, N2, N3);
 
-      parallel_for( range, functor );
+      parallel_for(range, functor);
       double sum = 0.0;
-      parallel_reduce( range, functor, sum );
+      parallel_reduce(range, functor, sum);
 
-      ASSERT_EQ( sum, 2 * N0 * N1 * N2 * N3 );
+      ASSERT_EQ(sum, 2 * N0 * N1 * N2 * N3);
     }
 
     {
-      typedef typename Kokkos::MDRangePolicy< ExecSpace, Kokkos::Rank<4, Iterate::Right, Iterate::Left>, Kokkos::IndexType<int> > range_type;
+      typedef typename Kokkos::MDRangePolicy<
+          ExecSpace, Kokkos::Rank<4, Iterate::Right, Iterate::Left>,
+          Kokkos::IndexType<int> >
+          range_type;
       typedef typename range_type::tile_type tile_type;
       typedef typename range_type::point_type point_type;
 
-      range_type range( point_type{ { 0, 0, 0, 0 } }, point_type{ { N0, N1, N2, N3 } }, tile_type{ { 2, 4, 6, 2 } } );
+      range_type range(point_type{{0, 0, 0, 0}}, point_type{{N0, N1, N2, N3}},
+                       tile_type{{2, 4, 6, 2}});
 
-      TestMDRange_4D functor( N0, N1, N2, N3 );
+      TestMDRange_4D functor(N0, N1, N2, N3);
 
-      parallel_for( range, functor );
+      parallel_for(range, functor);
       double sum = 0.0;
-      parallel_reduce( range, functor, sum );
+      parallel_reduce(range, functor, sum);
 
-      ASSERT_EQ( sum, 2 * N0 * N1 * N2 * N3 );
+      ASSERT_EQ(sum, 2 * N0 * N1 * N2 * N3);
     }
 
     {
-      typedef typename Kokkos::MDRangePolicy< ExecSpace, Kokkos::Rank<4, Iterate::Right, Iterate::Right>, Kokkos::IndexType<int> > range_type;
+      typedef typename Kokkos::MDRangePolicy<
+          ExecSpace, Kokkos::Rank<4, Iterate::Right, Iterate::Right>,
+          Kokkos::IndexType<int> >
+          range_type;
       typedef typename range_type::tile_type tile_type;
       typedef typename range_type::point_type point_type;
 
-      range_type range( point_type{ { 0, 0, 0, 0 } }, point_type{ { N0, N1, N2, N3 } }, tile_type{ { 2, 4, 6, 2 } } );
+      range_type range(point_type{{0, 0, 0, 0}}, point_type{{N0, N1, N2, N3}},
+                       tile_type{{2, 4, 6, 2}});
 
-      TestMDRange_4D functor( N0, N1, N2, N3 );
+      TestMDRange_4D functor(N0, N1, N2, N3);
 
-      parallel_for( range, functor );
+      parallel_for(range, functor);
       double sum = 0.0;
-      parallel_reduce( range, functor, sum );
+      parallel_reduce(range, functor, sum);
 
-      ASSERT_EQ( sum, 2 * N0 * N1 * N2 * N3 );
+      ASSERT_EQ(sum, 2 * N0 * N1 * N2 * N3);
     }
-  } // end test_reduce
+  }  // end test_reduce
 
-
-
-  static void test_for4( const int N0, const int N1, const int N2, const int N3 )
-  {
-#if defined( KOKKOS_ENABLE_CXX11_DISPATCH_LAMBDA )
-#if !defined(KOKKOS_ENABLE_CUDA) || ( 8000 <= CUDA_VERSION )
+  static void test_for4(const int N0, const int N1, const int N2,
+                        const int N3) {
+#if defined(KOKKOS_ENABLE_CXX11_DISPATCH_LAMBDA)
+#if !defined(KOKKOS_ENABLE_CUDA) || (8000 <= CUDA_VERSION)
     {
-      typedef typename Kokkos::MDRangePolicy< ExecSpace, Kokkos::Rank<4>, Kokkos::IndexType<int> > range_type;
+      typedef typename Kokkos::MDRangePolicy<ExecSpace, Kokkos::Rank<4>,
+                                             Kokkos::IndexType<int> >
+          range_type;
       typedef typename range_type::tile_type tile_type;
       typedef typename range_type::point_type point_type;
 
@@ -1671,71 +1847,75 @@ struct TestMDRange_4D {
       const int s2 = 1;
       const int s3 = 1;
 
-      range_type range( point_type{ { s0, s1, s2, s3 } }, point_type{ { N0, N1, N2, N3 } }, tile_type{ { 3, 3, 3, 3 } } );
+      range_type range(point_type{{s0, s1, s2, s3}},
+                       point_type{{N0, N1, N2, N3}}, tile_type{{3, 3, 3, 3}});
 
-      TestMDRange_4D::ViewType v( "v", N0, N1, N2, N3 );
+      TestMDRange_4D::ViewType v("v", N0, N1, N2, N3);
 
-      parallel_for( range, 
-          KOKKOS_LAMBDA ( const int i , const int j , const int k, const int l ) {
-            v(i, j, k, l) = 3;
-          }
-        );
+      parallel_for(
+          range, KOKKOS_LAMBDA(const int i, const int j, const int k,
+                               const int l) { v(i, j, k, l) = 3; });
 
-      TestMDRange_4D::HostViewType h_view = Kokkos::create_mirror_view( v );
-      Kokkos::deep_copy( h_view, v );
+      TestMDRange_4D::HostViewType h_view = Kokkos::create_mirror_view(v);
+      Kokkos::deep_copy(h_view, v);
 
       int counter = 0;
-      for ( int i = s0; i < N0; ++i )
-      for ( int j = s1; j < N1; ++j )
-      for ( int k = s2; k < N2; ++k )
-      for ( int l = s3; l < N3; ++l )
-      {
-        if ( h_view( i, j, k, l ) != 3 ) {
-          ++counter;
-        }
+      for (int i = s0; i < N0; ++i)
+        for (int j = s1; j < N1; ++j)
+          for (int k = s2; k < N2; ++k)
+            for (int l = s3; l < N3; ++l) {
+              if (h_view(i, j, k, l) != 3) {
+                ++counter;
+              }
+            }
+
+      if (counter != 0) {
+        printf(
+            "Offset Start + Default Layouts + InitTag op(): Errors in "
+            "test_for4; mismatches = %d\n\n",
+            counter);
       }
 
-      if ( counter != 0 ) {
-        printf( "Offset Start + Default Layouts + InitTag op(): Errors in test_for4; mismatches = %d\n\n", counter );
-      }
-
-      ASSERT_EQ( counter, 0 );
+      ASSERT_EQ(counter, 0);
     }
 #endif
 #endif
 
     {
-      typedef typename Kokkos::MDRangePolicy< ExecSpace, Kokkos::Rank<4> > range_type;
+      typedef typename Kokkos::MDRangePolicy<ExecSpace, Kokkos::Rank<4> >
+          range_type;
       typedef typename range_type::point_type point_type;
 
-      range_type range( point_type{ { 0, 0, 0, 0 } }, point_type{ { N0, N1, N2, N3 } } );
-      TestMDRange_4D functor( N0, N1, N2, N3 );
+      range_type range(point_type{{0, 0, 0, 0}}, point_type{{N0, N1, N2, N3}});
+      TestMDRange_4D functor(N0, N1, N2, N3);
 
-      parallel_for( range, functor );
+      parallel_for(range, functor);
 
-      HostViewType h_view = Kokkos::create_mirror_view( functor.input_view );
-      Kokkos::deep_copy( h_view, functor.input_view );
+      HostViewType h_view = Kokkos::create_mirror_view(functor.input_view);
+      Kokkos::deep_copy(h_view, functor.input_view);
 
       int counter = 0;
-      for ( int i = 0; i < N0; ++i )
-      for ( int j = 0; j < N1; ++j )
-      for ( int k = 0; k < N2; ++k )
-      for ( int l = 0; l < N3; ++l )
-      {
-        if ( h_view( i, j, k, l ) != 1 ) {
-          ++counter;
-        }
+      for (int i = 0; i < N0; ++i)
+        for (int j = 0; j < N1; ++j)
+          for (int k = 0; k < N2; ++k)
+            for (int l = 0; l < N3; ++l) {
+              if (h_view(i, j, k, l) != 1) {
+                ++counter;
+              }
+            }
+
+      if (counter != 0) {
+        printf("Defaults + No Tile: Errors in test_for4; mismatches = %d\n\n",
+               counter);
       }
 
-      if ( counter != 0 ) {
-        printf( "Defaults + No Tile: Errors in test_for4; mismatches = %d\n\n", counter );
-      }
-
-      ASSERT_EQ( counter, 0 );
+      ASSERT_EQ(counter, 0);
     }
 
     {
-      typedef typename Kokkos::MDRangePolicy< ExecSpace, Kokkos::Rank<4>, Kokkos::IndexType<int>, InitTag > range_type;
+      typedef typename Kokkos::MDRangePolicy<ExecSpace, Kokkos::Rank<4>,
+                                             Kokkos::IndexType<int>, InitTag>
+          range_type;
       typedef typename range_type::tile_type tile_type;
       typedef typename range_type::point_type point_type;
 
@@ -1743,287 +1923,315 @@ struct TestMDRange_4D {
       int s1 = 1;
       int s2 = 1;
       int s3 = 1;
-      range_type range( point_type{ { s0, s1, s2, s3 } }, point_type{ { N0, N1, N2, N3 } }, tile_type{ { 3, 11, 3, 3 } } );
-      TestMDRange_4D functor( N0, N1, N2, N3 );
+      range_type range(point_type{{s0, s1, s2, s3}},
+                       point_type{{N0, N1, N2, N3}}, tile_type{{3, 11, 3, 3}});
+      TestMDRange_4D functor(N0, N1, N2, N3);
 
-      parallel_for( range, functor );
+      parallel_for(range, functor);
 
-      HostViewType h_view = Kokkos::create_mirror_view( functor.input_view );
-      Kokkos::deep_copy( h_view, functor.input_view );
+      HostViewType h_view = Kokkos::create_mirror_view(functor.input_view);
+      Kokkos::deep_copy(h_view, functor.input_view);
 
       int counter = 0;
-      for ( int i = s0; i < N0; ++i )
-      for ( int j = s1; j < N1; ++j )
-      for ( int k = s2; k < N2; ++k )
-      for ( int l = s3; l < N3; ++l )
-      {
-        if ( h_view( i, j, k, l ) != 3 ) {
-          ++counter;
-        }
+      for (int i = s0; i < N0; ++i)
+        for (int j = s1; j < N1; ++j)
+          for (int k = s2; k < N2; ++k)
+            for (int l = s3; l < N3; ++l) {
+              if (h_view(i, j, k, l) != 3) {
+                ++counter;
+              }
+            }
+
+      if (counter != 0) {
+        printf(
+            "Offset Start + Defaults +m_tile > m_upper dim2 InitTag op(): "
+            "Errors in test_for4; mismatches = %d\n\n",
+            counter);
       }
 
-      if ( counter != 0 ) {
-        printf("Offset Start + Defaults +m_tile > m_upper dim2 InitTag op(): Errors in test_for4; mismatches = %d\n\n",counter);
-      }
-
-      ASSERT_EQ( counter, 0 );
+      ASSERT_EQ(counter, 0);
     }
 
     {
-      typedef typename Kokkos::MDRangePolicy< ExecSpace, Kokkos::Rank<4>, Kokkos::IndexType<int> > range_type;
+      typedef typename Kokkos::MDRangePolicy<ExecSpace, Kokkos::Rank<4>,
+                                             Kokkos::IndexType<int> >
+          range_type;
       typedef typename range_type::tile_type tile_type;
       typedef typename range_type::point_type point_type;
 
-      range_type range( point_type{ { 0, 0, 0, 0 } }, point_type{ { N0, N1, N2, N3 } }, tile_type{ { 4, 4, 4, 4 } } );
+      range_type range(point_type{{0, 0, 0, 0}}, point_type{{N0, N1, N2, N3}},
+                       tile_type{{4, 4, 4, 4}});
 
-      TestMDRange_4D functor( N0, N1, N2, N3 );
+      TestMDRange_4D functor(N0, N1, N2, N3);
 
-      parallel_for( range, functor );
+      parallel_for(range, functor);
 
-      HostViewType h_view = Kokkos::create_mirror_view( functor.input_view );
-      Kokkos::deep_copy( h_view, functor.input_view );
+      HostViewType h_view = Kokkos::create_mirror_view(functor.input_view);
+      Kokkos::deep_copy(h_view, functor.input_view);
 
       int counter = 0;
-      for ( int i = 0; i < N0; ++i )
-      for ( int j = 0; j < N1; ++j )
-      for ( int k = 0; k < N2; ++k )
-      for ( int l = 0; l < N3; ++l )
-      {
-        if ( h_view( i, j, k, l ) != 1 ) {
-          ++counter;
-        }
+      for (int i = 0; i < N0; ++i)
+        for (int j = 0; j < N1; ++j)
+          for (int k = 0; k < N2; ++k)
+            for (int l = 0; l < N3; ++l) {
+              if (h_view(i, j, k, l) != 1) {
+                ++counter;
+              }
+            }
+
+      if (counter != 0) {
+        printf(" Errors in test_for4; mismatches = %d\n\n", counter);
       }
 
-      if ( counter != 0 ) {
-        printf( " Errors in test_for4; mismatches = %d\n\n", counter );
-      }
-
-      ASSERT_EQ( counter, 0 );
+      ASSERT_EQ(counter, 0);
     }
 
     {
-      typedef typename Kokkos::MDRangePolicy< ExecSpace, Kokkos::Rank<4, Iterate::Default, Iterate::Default>, Kokkos::IndexType<int> > range_type;
+      typedef typename Kokkos::MDRangePolicy<
+          ExecSpace, Kokkos::Rank<4, Iterate::Default, Iterate::Default>,
+          Kokkos::IndexType<int> >
+          range_type;
       typedef typename range_type::tile_type tile_type;
       typedef typename range_type::point_type point_type;
 
-      range_type range( point_type{ { 0, 0, 0, 0 } }, point_type{ { N0, N1, N2, N3 } }, tile_type{ { 4, 4, 4, 4 } } );
+      range_type range(point_type{{0, 0, 0, 0}}, point_type{{N0, N1, N2, N3}},
+                       tile_type{{4, 4, 4, 4}});
 
-      TestMDRange_4D functor( N0, N1, N2, N3 );
+      TestMDRange_4D functor(N0, N1, N2, N3);
 
-      parallel_for( range, functor );
+      parallel_for(range, functor);
 
-      HostViewType h_view = Kokkos::create_mirror_view( functor.input_view );
-      Kokkos::deep_copy( h_view, functor.input_view );
+      HostViewType h_view = Kokkos::create_mirror_view(functor.input_view);
+      Kokkos::deep_copy(h_view, functor.input_view);
 
       int counter = 0;
-      for ( int i = 0; i < N0; ++i )
-      for ( int j = 0; j < N1; ++j )
-      for ( int k = 0; k < N2; ++k )
-      for ( int l = 0; l < N3; ++l )
-      {
-        if ( h_view( i, j, k, l ) != 1 ) {
-          ++counter;
-        }
+      for (int i = 0; i < N0; ++i)
+        for (int j = 0; j < N1; ++j)
+          for (int k = 0; k < N2; ++k)
+            for (int l = 0; l < N3; ++l) {
+              if (h_view(i, j, k, l) != 1) {
+                ++counter;
+              }
+            }
+
+      if (counter != 0) {
+        printf(" Errors in test_for4; mismatches = %d\n\n", counter);
       }
 
-      if ( counter != 0 ) {
-        printf( " Errors in test_for4; mismatches = %d\n\n", counter );
-      }
-
-      ASSERT_EQ( counter, 0 );
+      ASSERT_EQ(counter, 0);
     }
 
     {
-      typedef typename Kokkos::MDRangePolicy< ExecSpace, Kokkos::Rank<4, Iterate::Left, Iterate::Left>, Kokkos::IndexType<int> > range_type;
+      typedef typename Kokkos::MDRangePolicy<
+          ExecSpace, Kokkos::Rank<4, Iterate::Left, Iterate::Left>,
+          Kokkos::IndexType<int> >
+          range_type;
       typedef typename range_type::tile_type tile_type;
       typedef typename range_type::point_type point_type;
 
-      range_type range( point_type{ { 0, 0, 0, 0 } }, point_type{ { N0, N1, N2, N3 } }, tile_type{ { 4, 4, 4, 4 } } );
+      range_type range(point_type{{0, 0, 0, 0}}, point_type{{N0, N1, N2, N3}},
+                       tile_type{{4, 4, 4, 4}});
 
-      TestMDRange_4D functor( N0, N1, N2, N3 );
+      TestMDRange_4D functor(N0, N1, N2, N3);
 
-      parallel_for( range, functor );
+      parallel_for(range, functor);
 
-      HostViewType h_view = Kokkos::create_mirror_view( functor.input_view );
-      Kokkos::deep_copy( h_view, functor.input_view );
+      HostViewType h_view = Kokkos::create_mirror_view(functor.input_view);
+      Kokkos::deep_copy(h_view, functor.input_view);
 
       int counter = 0;
-      for ( int i = 0; i < N0; ++i )
-      for ( int j = 0; j < N1; ++j )
-      for ( int k = 0; k < N2; ++k )
-      for ( int l = 0; l < N3; ++l )
-      {
-        if ( h_view( i, j, k, l ) != 1 ) {
-          ++counter;
-        }
+      for (int i = 0; i < N0; ++i)
+        for (int j = 0; j < N1; ++j)
+          for (int k = 0; k < N2; ++k)
+            for (int l = 0; l < N3; ++l) {
+              if (h_view(i, j, k, l) != 1) {
+                ++counter;
+              }
+            }
+
+      if (counter != 0) {
+        printf(" Errors in test_for4; mismatches = %d\n\n", counter);
       }
 
-      if ( counter != 0 ) {
-        printf( " Errors in test_for4; mismatches = %d\n\n", counter );
-      }
-
-      ASSERT_EQ( counter, 0 );
+      ASSERT_EQ(counter, 0);
     }
 
     {
-      typedef typename Kokkos::MDRangePolicy< ExecSpace, Kokkos::Rank<4, Iterate::Left, Iterate::Right>, Kokkos::IndexType<int> > range_type;
+      typedef typename Kokkos::MDRangePolicy<
+          ExecSpace, Kokkos::Rank<4, Iterate::Left, Iterate::Right>,
+          Kokkos::IndexType<int> >
+          range_type;
       typedef typename range_type::tile_type tile_type;
       typedef typename range_type::point_type point_type;
 
-      range_type range( point_type{ { 0, 0, 0, 0 } }, point_type{ { N0, N1, N2, N3 } }, tile_type{ { 4, 4, 4, 4 } } );
+      range_type range(point_type{{0, 0, 0, 0}}, point_type{{N0, N1, N2, N3}},
+                       tile_type{{4, 4, 4, 4}});
 
-      TestMDRange_4D functor( N0, N1, N2, N3 );
+      TestMDRange_4D functor(N0, N1, N2, N3);
 
-      parallel_for( range, functor );
+      parallel_for(range, functor);
 
-      HostViewType h_view = Kokkos::create_mirror_view( functor.input_view );
-      Kokkos::deep_copy( h_view, functor.input_view );
+      HostViewType h_view = Kokkos::create_mirror_view(functor.input_view);
+      Kokkos::deep_copy(h_view, functor.input_view);
 
       int counter = 0;
-      for ( int i = 0; i < N0; ++i )
-      for ( int j = 0; j < N1; ++j )
-      for ( int k = 0; k < N2; ++k )
-      for ( int l = 0; l < N3; ++l )
-      {
-        if ( h_view( i, j, k, l ) != 1 ) {
-          ++counter;
-        }
+      for (int i = 0; i < N0; ++i)
+        for (int j = 0; j < N1; ++j)
+          for (int k = 0; k < N2; ++k)
+            for (int l = 0; l < N3; ++l) {
+              if (h_view(i, j, k, l) != 1) {
+                ++counter;
+              }
+            }
+
+      if (counter != 0) {
+        printf(" Errors in test_for4; mismatches = %d\n\n", counter);
       }
 
-      if ( counter != 0 ) {
-        printf( " Errors in test_for4; mismatches = %d\n\n", counter );
-      }
-
-      ASSERT_EQ( counter, 0 );
+      ASSERT_EQ(counter, 0);
     }
 
     {
-      typedef typename Kokkos::MDRangePolicy< ExecSpace, Kokkos::Rank<4, Iterate::Right, Iterate::Left>, Kokkos::IndexType<int> > range_type;
+      typedef typename Kokkos::MDRangePolicy<
+          ExecSpace, Kokkos::Rank<4, Iterate::Right, Iterate::Left>,
+          Kokkos::IndexType<int> >
+          range_type;
       typedef typename range_type::tile_type tile_type;
       typedef typename range_type::point_type point_type;
 
-      range_type range( point_type{ { 0, 0, 0, 0 } }, point_type{ { N0, N1, N2, N3 } }, tile_type{ { 4, 4, 4, 4 } } );
+      range_type range(point_type{{0, 0, 0, 0}}, point_type{{N0, N1, N2, N3}},
+                       tile_type{{4, 4, 4, 4}});
 
-      TestMDRange_4D functor( N0, N1, N2, N3 );
+      TestMDRange_4D functor(N0, N1, N2, N3);
 
-      parallel_for( range, functor );
+      parallel_for(range, functor);
 
-      HostViewType h_view = Kokkos::create_mirror_view( functor.input_view );
-      Kokkos::deep_copy( h_view, functor.input_view );
+      HostViewType h_view = Kokkos::create_mirror_view(functor.input_view);
+      Kokkos::deep_copy(h_view, functor.input_view);
 
       int counter = 0;
-      for ( int i = 0; i < N0; ++i )
-      for ( int j = 0; j < N1; ++j )
-      for ( int k = 0; k < N2; ++k )
-      for ( int l = 0; l < N3; ++l )
-      {
-        if ( h_view( i, j, k, l ) != 1 ) {
-          ++counter;
-        }
+      for (int i = 0; i < N0; ++i)
+        for (int j = 0; j < N1; ++j)
+          for (int k = 0; k < N2; ++k)
+            for (int l = 0; l < N3; ++l) {
+              if (h_view(i, j, k, l) != 1) {
+                ++counter;
+              }
+            }
+
+      if (counter != 0) {
+        printf(" Errors in test_for4; mismatches = %d\n\n", counter);
       }
 
-      if ( counter != 0 ) {
-        printf( " Errors in test_for4; mismatches = %d\n\n", counter );
-      }
-
-      ASSERT_EQ( counter, 0 );
+      ASSERT_EQ(counter, 0);
     }
 
     {
-      typedef typename Kokkos::MDRangePolicy< ExecSpace, Kokkos::Rank<4, Iterate::Right, Iterate::Right>, Kokkos::IndexType<int> > range_type;
+      typedef typename Kokkos::MDRangePolicy<
+          ExecSpace, Kokkos::Rank<4, Iterate::Right, Iterate::Right>,
+          Kokkos::IndexType<int> >
+          range_type;
       typedef typename range_type::tile_type tile_type;
       typedef typename range_type::point_type point_type;
 
-      range_type range( point_type{ { 0, 0, 0, 0 } }, point_type{ { N0, N1, N2, N3 } }, tile_type{ { 4, 4, 4, 4 } } );
+      range_type range(point_type{{0, 0, 0, 0}}, point_type{{N0, N1, N2, N3}},
+                       tile_type{{4, 4, 4, 4}});
 
-      TestMDRange_4D functor( N0, N1, N2, N3 );
+      TestMDRange_4D functor(N0, N1, N2, N3);
 
-      parallel_for( range, functor );
+      parallel_for(range, functor);
 
-      HostViewType h_view = Kokkos::create_mirror_view( functor.input_view );
-      Kokkos::deep_copy( h_view, functor.input_view );
+      HostViewType h_view = Kokkos::create_mirror_view(functor.input_view);
+      Kokkos::deep_copy(h_view, functor.input_view);
 
       int counter = 0;
-      for ( int i = 0; i < N0; ++i )
-      for ( int j = 0; j < N1; ++j )
-      for ( int k = 0; k < N2; ++k )
-      for ( int l = 0; l < N3; ++l )
-      {
-        if ( h_view( i, j, k, l ) != 1 ) {
-          ++counter;
-        }
+      for (int i = 0; i < N0; ++i)
+        for (int j = 0; j < N1; ++j)
+          for (int k = 0; k < N2; ++k)
+            for (int l = 0; l < N3; ++l) {
+              if (h_view(i, j, k, l) != 1) {
+                ++counter;
+              }
+            }
+
+      if (counter != 0) {
+        printf(" Errors in test_for4; mismatches = %d\n\n", counter);
       }
 
-      if ( counter != 0 ) {
-        printf( " Errors in test_for4; mismatches = %d\n\n", counter );
-      }
-
-      ASSERT_EQ( counter, 0 );
+      ASSERT_EQ(counter, 0);
     }
-  } // end test_for4
+  }  // end test_for4
 };
 
-template <typename ExecSpace >
+template <typename ExecSpace>
 struct TestMDRange_5D {
   using DataType     = int;
-  using ViewType     = typename Kokkos::View< DataType*****, ExecSpace >;
+  using ViewType     = typename Kokkos::View<DataType *****, ExecSpace>;
   using HostViewType = typename ViewType::HostMirror;
 
   ViewType input_view;
   using value_type = double;
 
-  TestMDRange_5D( const DataType N0, const DataType N1, const DataType N2, const DataType N3, const DataType N4 ) : input_view( "input_view", N0, N1, N2, N3, N4 ) {}
+  TestMDRange_5D(const DataType N0, const DataType N1, const DataType N2,
+                 const DataType N3, const DataType N4)
+      : input_view("input_view", N0, N1, N2, N3, N4) {}
 
   KOKKOS_INLINE_FUNCTION
-  void operator()( const int i, const int j, const int k, const int l, const int m ) const
-  {
-    input_view( i, j, k, l, m ) = 1;
+  void operator()(const int i, const int j, const int k, const int l,
+                  const int m) const {
+    input_view(i, j, k, l, m) = 1;
   }
 
   KOKKOS_INLINE_FUNCTION
-  void operator()( const int i, const int j, const int k, const int l, const int m, value_type &lsum ) const
-  {
-    lsum += input_view( i, j, k, l, m ) * 2;
+  void operator()(const int i, const int j, const int k, const int l,
+                  const int m, value_type &lsum) const {
+    lsum += input_view(i, j, k, l, m) * 2;
   }
 
   // tagged operators
   struct InitTag {};
   KOKKOS_INLINE_FUNCTION
-  void operator()( const InitTag &, const int i, const int j, const int k, const int l, const int m ) const
-  {
-    input_view( i, j, k, l, m ) = 3;
+  void operator()(const InitTag &, const int i, const int j, const int k,
+                  const int l, const int m) const {
+    input_view(i, j, k, l, m) = 3;
   }
 
   // reduction tagged operators
   KOKKOS_INLINE_FUNCTION
-  void operator()( const InitTag &, const int i, const int j, const int k, const int l, const int m, value_type &lsum ) const
-  {
-    lsum += input_view( i, j, k, l, m ) * 3;
+  void operator()(const InitTag &, const int i, const int j, const int k,
+                  const int l, const int m, value_type &lsum) const {
+    lsum += input_view(i, j, k, l, m) * 3;
   }
 
-  static void test_reduce5( const int N0, const int N1, const int N2, const int N3, const int N4 )
-  {
-#if defined( KOKKOS_ENABLE_CXX11_DISPATCH_LAMBDA )
-#if !defined(KOKKOS_ENABLE_CUDA) || ( 8000 <= CUDA_VERSION )
+  static void test_reduce5(const int N0, const int N1, const int N2,
+                           const int N3, const int N4) {
+#if defined(KOKKOS_ENABLE_CXX11_DISPATCH_LAMBDA)
+#if !defined(KOKKOS_ENABLE_CUDA) || (8000 <= CUDA_VERSION)
     {
-      typedef typename Kokkos::MDRangePolicy< ExecSpace, Kokkos::Rank<5>, Kokkos::IndexType<int> > range_type;
+      typedef typename Kokkos::MDRangePolicy<ExecSpace, Kokkos::Rank<5>,
+                                             Kokkos::IndexType<int> >
+          range_type;
       typedef typename range_type::tile_type tile_type;
       typedef typename range_type::point_type point_type;
 
-      range_type range( point_type{ { 0, 0, 0, 0, 0 } }, point_type{ { N0, N1, N2, N3, N4 } }, tile_type{ { 3, 3, 3, 3, 1 } } );
+      range_type range(point_type{{0, 0, 0, 0, 0}},
+                       point_type{{N0, N1, N2, N3, N4}},
+                       tile_type{{3, 3, 3, 3, 1}});
       double sum = 0.0;
-      parallel_reduce( range
-        , KOKKOS_LAMBDA(const int i, const int j, const int k, const int l, const int m, double &lsum) {
-            lsum+=1.0;
-          }
-        , sum );
-      ASSERT_EQ( sum, N0 * N1 * N2 * N3 * N4 );
+      parallel_reduce(
+          range,
+          KOKKOS_LAMBDA(const int i, const int j, const int k, const int l,
+                        const int m, double &lsum) { lsum += 1.0; },
+          sum);
+      ASSERT_EQ(sum, N0 * N1 * N2 * N3 * N4);
     }
 #endif
 #endif
 
     {
-      typedef typename Kokkos::MDRangePolicy< ExecSpace, Kokkos::Rank<5>, Kokkos::IndexType<int> > range_type;
+      typedef typename Kokkos::MDRangePolicy<ExecSpace, Kokkos::Rank<5>,
+                                             Kokkos::IndexType<int> >
+          range_type;
       typedef typename range_type::tile_type tile_type;
       typedef typename range_type::point_type point_type;
 
@@ -2032,144 +2240,175 @@ struct TestMDRange_5D {
       int s2 = 1;
       int s3 = 1;
       int s4 = 1;
-      range_type range( point_type{ { s0, s1, s2, s3, s4 } }, point_type{ { N0, N1, N2, N3, N4 } }, tile_type{ { 3, 3, 3, 3, 3 } } );
+      range_type range(point_type{{s0, s1, s2, s3, s4}},
+                       point_type{{N0, N1, N2, N3, N4}},
+                       tile_type{{3, 3, 3, 3, 3}});
 
-      TestMDRange_5D functor( N0, N1, N2, N3, N4 );
+      TestMDRange_5D functor(N0, N1, N2, N3, N4);
 
-      parallel_for( range, functor );
+      parallel_for(range, functor);
       double sum = 0.0;
-      parallel_reduce( range, functor, sum );
+      parallel_reduce(range, functor, sum);
 
-      ASSERT_EQ( sum, 2 * (N0 - s0) * (N1 - s1) * (N2 - s2) * (N3 - s3) * (N4 - s4) );
+      ASSERT_EQ(sum,
+                2 * (N0 - s0) * (N1 - s1) * (N2 - s2) * (N3 - s3) * (N4 - s4));
     }
 
     // Test with reducers - scalar
     {
-      typedef typename Kokkos::MDRangePolicy< ExecSpace, Kokkos::Rank<5>, Kokkos::IndexType<int> > range_type;
-      range_type range( {{ 0, 0, 0, 0, 0 }}, {{ N0, N1, N2, N3, N4 }}, {{ 3, 3, 3, 3, 3 }} );
+      typedef typename Kokkos::MDRangePolicy<ExecSpace, Kokkos::Rank<5>,
+                                             Kokkos::IndexType<int> >
+          range_type;
+      range_type range({{0, 0, 0, 0, 0}}, {{N0, N1, N2, N3, N4}},
+                       {{3, 3, 3, 3, 3}});
 
-      TestMDRange_5D functor( N0, N1, N2, N3, N4 );
+      TestMDRange_5D functor(N0, N1, N2, N3, N4);
 
-      parallel_for( range, functor );
+      parallel_for(range, functor);
 
       value_type sum = 0.0;
-      Kokkos::Sum< value_type > reducer_scalar( sum );
+      Kokkos::Sum<value_type> reducer_scalar(sum);
 
-      parallel_reduce( range, functor, reducer_scalar );
+      parallel_reduce(range, functor, reducer_scalar);
 
-      ASSERT_EQ( sum, 2 * N0 * N1 * N2 * N3 * N4 );
+      ASSERT_EQ(sum, 2 * N0 * N1 * N2 * N3 * N4);
     }
 
     // Test with reducers - scalar + label
     {
-      typedef typename Kokkos::MDRangePolicy< ExecSpace, Kokkos::Rank<5>, Kokkos::IndexType<int> > range_type;
-      range_type range( {{ 0, 0, 0, 0, 0 }}, {{ N0, N1, N2, N3, N4 }}, {{ 3, 3, 3, 3, 3 }} );
+      typedef typename Kokkos::MDRangePolicy<ExecSpace, Kokkos::Rank<5>,
+                                             Kokkos::IndexType<int> >
+          range_type;
+      range_type range({{0, 0, 0, 0, 0}}, {{N0, N1, N2, N3, N4}},
+                       {{3, 3, 3, 3, 3}});
 
-      TestMDRange_5D functor( N0, N1, N2, N3, N4 );
+      TestMDRange_5D functor(N0, N1, N2, N3, N4);
 
-      parallel_for( "rank5-parfor-label", range, functor );
+      parallel_for("rank5-parfor-label", range, functor);
 
       value_type sum = 0.0;
-      Kokkos::Sum< value_type > reducer_scalar( sum );
+      Kokkos::Sum<value_type> reducer_scalar(sum);
 
-      parallel_reduce( "rank5-reducer-label", range, functor, reducer_scalar );
+      parallel_reduce("rank5-reducer-label", range, functor, reducer_scalar);
 
-      ASSERT_EQ( sum, 2 * N0 * N1 * N2 * N3 * N4 );
+      ASSERT_EQ(sum, 2 * N0 * N1 * N2 * N3 * N4);
     }
 
     // Test with reducers - scalar view
     {
-      typedef typename Kokkos::MDRangePolicy< ExecSpace, Kokkos::Rank<5>, Kokkos::IndexType<int> > range_type;
-      range_type range( {{ 0, 0, 0, 0, 0 }}, {{ N0, N1, N2, N3, N4 }}, {{ 3, 3, 3, 3, 3 }} );
+      typedef typename Kokkos::MDRangePolicy<ExecSpace, Kokkos::Rank<5>,
+                                             Kokkos::IndexType<int> >
+          range_type;
+      range_type range({{0, 0, 0, 0, 0}}, {{N0, N1, N2, N3, N4}},
+                       {{3, 3, 3, 3, 3}});
 
-      TestMDRange_5D functor( N0, N1, N2, N3, N4 );
+      TestMDRange_5D functor(N0, N1, N2, N3, N4);
 
-      parallel_for( range, functor );
+      parallel_for(range, functor);
 
       value_type sum = 0.0;
-      Kokkos::View< value_type, Kokkos::HostSpace > sum_view("sum_view");
+      Kokkos::View<value_type, Kokkos::HostSpace> sum_view("sum_view");
       sum_view() = sum;
-      Kokkos::Sum< value_type > reducer_view( sum_view );
+      Kokkos::Sum<value_type> reducer_view(sum_view);
 
-      parallel_reduce( range, functor, reducer_view);
+      parallel_reduce(range, functor, reducer_view);
       Kokkos::fence();
       sum = sum_view();
 
-      ASSERT_EQ( sum, 2 * N0 * N1 * N2 * N3 * N4 );
+      ASSERT_EQ(sum, 2 * N0 * N1 * N2 * N3 * N4);
     }
 
     // Test Min reducer with lambda
-#if defined( KOKKOS_ENABLE_CXX11_DISPATCH_LAMBDA )
-#if !defined(KOKKOS_ENABLE_CUDA) || ( 8000 <= CUDA_VERSION )
+#if defined(KOKKOS_ENABLE_CXX11_DISPATCH_LAMBDA)
+#if !defined(KOKKOS_ENABLE_CUDA) || (8000 <= CUDA_VERSION)
     {
-      typedef typename Kokkos::MDRangePolicy< ExecSpace, Kokkos::Rank<5>, Kokkos::IndexType<int> > range_type;
+      typedef typename Kokkos::MDRangePolicy<ExecSpace, Kokkos::Rank<5>,
+                                             Kokkos::IndexType<int> >
+          range_type;
 
-      range_type range( {{ 1, 1, 1, 1, 1 }}, {{ N0, N1, N2, N3, N4 }}, {{ 3, 3, 3, 2, 2 }} );
+      range_type range({{1, 1, 1, 1, 1}}, {{N0, N1, N2, N3, N4}},
+                       {{3, 3, 3, 2, 2}});
 
-      Kokkos::View< double*****, ExecSpace > v_in("v_in", N0, N1, N2, N3, N4 );
+      Kokkos::View<double *****, ExecSpace> v_in("v_in", N0, N1, N2, N3, N4);
 
-      parallel_for( "rank5-init-lambda", range, KOKKOS_LAMBDA ( const int i, const int j, const int k, const int l, const int m ) {
-          v_in( i, j, k, l, m ) = (i+1) * (j+1) * (k+1) * (l+1) * (m+1) ;
-        });
+      parallel_for(
+          "rank5-init-lambda", range,
+          KOKKOS_LAMBDA(const int i, const int j, const int k, const int l,
+                        const int m) {
+            v_in(i, j, k, l, m) =
+                (i + 1) * (j + 1) * (k + 1) * (l + 1) * (m + 1);
+          });
 
       double min;
 
-      parallel_reduce("rank5-min-reducer", range, KOKKOS_LAMBDA ( const int i, const int j, const int k, const int l, const int m, double& min_val ) {
-            min_val = (v_in(i,j,k,l,m) < min_val) ? v_in(i,j,k,l,m) : min_val;
-          }
-        , Kokkos::Min<double>(min) );
+      parallel_reduce(
+          "rank5-min-reducer", range,
+          KOKKOS_LAMBDA(const int i, const int j, const int k, const int l,
+                        const int m, double &min_val) {
+            min_val =
+                (v_in(i, j, k, l, m) < min_val) ? v_in(i, j, k, l, m) : min_val;
+          },
+          Kokkos::Min<double>(min));
 
-      ASSERT_EQ( min, 32.0 );
+      ASSERT_EQ(min, 32.0);
     }
 #endif
 #endif
 
     // Tagged operator test
     {
-      typedef typename Kokkos::MDRangePolicy< ExecSpace, Kokkos::Rank<5, Iterate::Default, Iterate::Default >, Kokkos::IndexType<int>, InitTag > range_type;
+      typedef typename Kokkos::MDRangePolicy<
+          ExecSpace, Kokkos::Rank<5, Iterate::Default, Iterate::Default>,
+          Kokkos::IndexType<int>, InitTag>
+          range_type;
       typedef typename range_type::tile_type tile_type;
       typedef typename range_type::point_type point_type;
 
-      range_type range( point_type{ { 0, 0, 0, 0, 0 } }, point_type{ { N0, N1, N2, N3, N4 } }, tile_type{ { 2, 4, 6, 2, 2 } } );
+      range_type range(point_type{{0, 0, 0, 0, 0}},
+                       point_type{{N0, N1, N2, N3, N4}},
+                       tile_type{{2, 4, 6, 2, 2}});
 
-      TestMDRange_5D functor( N0, N1, N2, N3, N4 );
+      TestMDRange_5D functor(N0, N1, N2, N3, N4);
 
-      parallel_for( range, functor );
+      parallel_for(range, functor);
 
       // check parallel_for results correct with InitTag
-      HostViewType h_view = Kokkos::create_mirror_view( functor.input_view );
-      Kokkos::deep_copy( h_view, functor.input_view );
+      HostViewType h_view = Kokkos::create_mirror_view(functor.input_view);
+      Kokkos::deep_copy(h_view, functor.input_view);
       int counter = 0;
-      for ( int i = 0; i < N0; ++i )
-      for ( int j = 0; j < N1; ++j )
-      for ( int k = 0; k < N2; ++k )
-      for ( int l = 0; l < N3; ++l )
-      for ( int m = 0; m < N4; ++m )
-      {
-        if ( h_view( i, j, k, l, m ) != 3 ) {
-          ++counter;
-        }
-      }
+      for (int i = 0; i < N0; ++i)
+        for (int j = 0; j < N1; ++j)
+          for (int k = 0; k < N2; ++k)
+            for (int l = 0; l < N3; ++l)
+              for (int m = 0; m < N4; ++m) {
+                if (h_view(i, j, k, l, m) != 3) {
+                  ++counter;
+                }
+              }
 
-      if ( counter != 0 ) {
-        printf( "Defaults + InitTag op(): Errors in test_reduce5 parallel_for init; mismatches = %d\n\n", counter );
+      if (counter != 0) {
+        printf(
+            "Defaults + InitTag op(): Errors in test_reduce5 parallel_for "
+            "init; mismatches = %d\n\n",
+            counter);
       }
-      ASSERT_EQ( counter, 0 );
-
+      ASSERT_EQ(counter, 0);
 
       double sum = 0.0;
-      parallel_reduce( range, functor, sum );
+      parallel_reduce(range, functor, sum);
 
-      ASSERT_EQ( sum, 9 * N0 * N1 * N2 * N3 * N4 );
+      ASSERT_EQ(sum, 9 * N0 * N1 * N2 * N3 * N4);
     }
   }
 
-  static void test_for5( const int N0, const int N1, const int N2, const int N3, const int N4 )
-  {
-#if defined( KOKKOS_ENABLE_CXX11_DISPATCH_LAMBDA )
-#if !defined(KOKKOS_ENABLE_CUDA) || ( 8000 <= CUDA_VERSION )
+  static void test_for5(const int N0, const int N1, const int N2, const int N3,
+                        const int N4) {
+#if defined(KOKKOS_ENABLE_CXX11_DISPATCH_LAMBDA)
+#if !defined(KOKKOS_ENABLE_CUDA) || (8000 <= CUDA_VERSION)
     {
-      typedef typename Kokkos::MDRangePolicy< ExecSpace, Kokkos::Rank<5>, Kokkos::IndexType<int> > range_type;
+      typedef typename Kokkos::MDRangePolicy<ExecSpace, Kokkos::Rank<5>,
+                                             Kokkos::IndexType<int> >
+          range_type;
       typedef typename range_type::tile_type tile_type;
       typedef typename range_type::point_type point_type;
 
@@ -2179,73 +2418,80 @@ struct TestMDRange_5D {
       const int s3 = 1;
       const int s4 = 1;
 
-      range_type range( point_type{ { s0, s1, s2, s3, s4 } }, point_type{ { N0, N1, N2, N3, N4 } }, tile_type{ { 3, 3, 3, 3, 1 } } );
+      range_type range(point_type{{s0, s1, s2, s3, s4}},
+                       point_type{{N0, N1, N2, N3, N4}},
+                       tile_type{{3, 3, 3, 3, 1}});
 
-      TestMDRange_5D::ViewType v( "v", N0, N1, N2, N3, N4 );
+      TestMDRange_5D::ViewType v("v", N0, N1, N2, N3, N4);
 
-      parallel_for( range, 
-          KOKKOS_LAMBDA ( const int i , const int j , const int k, const int l, const int m ) {
-            v(i, j, k, l, m) = 3;
-          }
-        );
+      parallel_for(
+          range,
+          KOKKOS_LAMBDA(const int i, const int j, const int k, const int l,
+                        const int m) { v(i, j, k, l, m) = 3; });
 
-      TestMDRange_5D::HostViewType h_view = Kokkos::create_mirror_view( v );
-      Kokkos::deep_copy( h_view, v );
+      TestMDRange_5D::HostViewType h_view = Kokkos::create_mirror_view(v);
+      Kokkos::deep_copy(h_view, v);
 
       int counter = 0;
-      for ( int i = s0; i < N0; ++i )
-      for ( int j = s1; j < N1; ++j )
-      for ( int k = s2; k < N2; ++k )
-      for ( int l = s3; l < N3; ++l )
-      for ( int m = s4; m < N4; ++m )
-      {
-        if ( h_view( i, j, k, l, m ) != 3 ) {
-          ++counter;
-        }
+      for (int i = s0; i < N0; ++i)
+        for (int j = s1; j < N1; ++j)
+          for (int k = s2; k < N2; ++k)
+            for (int l = s3; l < N3; ++l)
+              for (int m = s4; m < N4; ++m) {
+                if (h_view(i, j, k, l, m) != 3) {
+                  ++counter;
+                }
+              }
+
+      if (counter != 0) {
+        printf(
+            "Offset Start + Default Layouts + InitTag op(): Errors in "
+            "test_for5; mismatches = %d\n\n",
+            counter);
       }
 
-      if ( counter != 0 ) {
-        printf( "Offset Start + Default Layouts + InitTag op(): Errors in test_for5; mismatches = %d\n\n", counter );
-      }
-
-      ASSERT_EQ( counter, 0 );
+      ASSERT_EQ(counter, 0);
     }
 #endif
 #endif
 
     {
-      typedef typename Kokkos::MDRangePolicy< ExecSpace, Kokkos::Rank<5> > range_type;
+      typedef typename Kokkos::MDRangePolicy<ExecSpace, Kokkos::Rank<5> >
+          range_type;
       typedef typename range_type::point_type point_type;
 
-      range_type range( point_type{ { 0, 0, 0, 0, 0 } }, point_type{ { N0, N1, N2, N3, N4 } } );
-      TestMDRange_5D functor( N0, N1, N2, N3, N4 );
+      range_type range(point_type{{0, 0, 0, 0, 0}},
+                       point_type{{N0, N1, N2, N3, N4}});
+      TestMDRange_5D functor(N0, N1, N2, N3, N4);
 
-      parallel_for( range, functor );
+      parallel_for(range, functor);
 
-      HostViewType h_view = Kokkos::create_mirror_view( functor.input_view );
-      Kokkos::deep_copy( h_view, functor.input_view );
+      HostViewType h_view = Kokkos::create_mirror_view(functor.input_view);
+      Kokkos::deep_copy(h_view, functor.input_view);
 
       int counter = 0;
-      for ( int i = 0; i < N0; ++i )
-      for ( int j = 0; j < N1; ++j )
-      for ( int k = 0; k < N2; ++k )
-      for ( int l = 0; l < N3; ++l )
-      for ( int m = 0; m < N4; ++m )
-      {
-        if ( h_view( i, j, k, l, m ) != 1 ) {
-          ++counter;
-        }
+      for (int i = 0; i < N0; ++i)
+        for (int j = 0; j < N1; ++j)
+          for (int k = 0; k < N2; ++k)
+            for (int l = 0; l < N3; ++l)
+              for (int m = 0; m < N4; ++m) {
+                if (h_view(i, j, k, l, m) != 1) {
+                  ++counter;
+                }
+              }
+
+      if (counter != 0) {
+        printf("Defaults + No Tile: Errors in test_for5; mismatches = %d\n\n",
+               counter);
       }
 
-      if ( counter != 0 ) {
-        printf( "Defaults + No Tile: Errors in test_for5; mismatches = %d\n\n", counter );
-      }
-
-      ASSERT_EQ( counter, 0 );
+      ASSERT_EQ(counter, 0);
     }
 
     {
-      typedef typename Kokkos::MDRangePolicy< ExecSpace, Kokkos::Rank<5>, Kokkos::IndexType<int>, InitTag > range_type;
+      typedef typename Kokkos::MDRangePolicy<ExecSpace, Kokkos::Rank<5>,
+                                             Kokkos::IndexType<int>, InitTag>
+          range_type;
       typedef typename range_type::tile_type tile_type;
       typedef typename range_type::point_type point_type;
 
@@ -2254,294 +2500,331 @@ struct TestMDRange_5D {
       int s2 = 1;
       int s3 = 1;
       int s4 = 1;
-      range_type range( point_type{ { s0, s1, s2, s3, s4 } }, point_type{ { N0, N1, N2, N3, N4 } }, tile_type{ { 3, 3, 3, 3, 5 } } );
-      TestMDRange_5D functor( N0, N1, N2, N3, N4 );
+      range_type range(point_type{{s0, s1, s2, s3, s4}},
+                       point_type{{N0, N1, N2, N3, N4}},
+                       tile_type{{3, 3, 3, 3, 5}});
+      TestMDRange_5D functor(N0, N1, N2, N3, N4);
 
-      parallel_for( range, functor );
+      parallel_for(range, functor);
 
-      HostViewType h_view = Kokkos::create_mirror_view( functor.input_view );
-      Kokkos::deep_copy( h_view, functor.input_view );
+      HostViewType h_view = Kokkos::create_mirror_view(functor.input_view);
+      Kokkos::deep_copy(h_view, functor.input_view);
 
       int counter = 0;
-      for ( int i = s0; i < N0; ++i )
-      for ( int j = s1; j < N1; ++j )
-      for ( int k = s2; k < N2; ++k )
-      for ( int l = s3; l < N3; ++l )
-      for ( int m = s4; m < N4; ++m )
-      {
-        if ( h_view( i, j, k, l, m ) != 3 ) {
-          ++counter;
-        }
+      for (int i = s0; i < N0; ++i)
+        for (int j = s1; j < N1; ++j)
+          for (int k = s2; k < N2; ++k)
+            for (int l = s3; l < N3; ++l)
+              for (int m = s4; m < N4; ++m) {
+                if (h_view(i, j, k, l, m) != 3) {
+                  ++counter;
+                }
+              }
+
+      if (counter != 0) {
+        printf(
+            "Offset Start + Defaults + InitTag op(): Errors in test_for5; "
+            "mismatches = %d\n\n",
+            counter);
       }
 
-      if ( counter != 0 ) {
-        printf( "Offset Start + Defaults + InitTag op(): Errors in test_for5; mismatches = %d\n\n", counter );
-      }
-
-      ASSERT_EQ( counter, 0 );
+      ASSERT_EQ(counter, 0);
     }
 
     {
-      typedef typename Kokkos::MDRangePolicy< ExecSpace, Kokkos::Rank<5>, Kokkos::IndexType<int> > range_type;
+      typedef typename Kokkos::MDRangePolicy<ExecSpace, Kokkos::Rank<5>,
+                                             Kokkos::IndexType<int> >
+          range_type;
       typedef typename range_type::tile_type tile_type;
       typedef typename range_type::point_type point_type;
 
-      range_type range( point_type{ { 0, 0, 0, 0, 0 } }, point_type{ { N0, N1, N2, N3, N4 } }, tile_type{ { 4, 4, 4, 2, 2 } } );
+      range_type range(point_type{{0, 0, 0, 0, 0}},
+                       point_type{{N0, N1, N2, N3, N4}},
+                       tile_type{{4, 4, 4, 2, 2}});
 
-      TestMDRange_5D functor( N0, N1, N2, N3, N4 );
+      TestMDRange_5D functor(N0, N1, N2, N3, N4);
 
-      parallel_for( range, functor );
+      parallel_for(range, functor);
 
-      HostViewType h_view = Kokkos::create_mirror_view( functor.input_view );
-      Kokkos::deep_copy( h_view, functor.input_view );
+      HostViewType h_view = Kokkos::create_mirror_view(functor.input_view);
+      Kokkos::deep_copy(h_view, functor.input_view);
 
       int counter = 0;
-      for ( int i = 0; i < N0; ++i )
-      for ( int j = 0; j < N1; ++j )
-      for ( int k = 0; k < N2; ++k )
-      for ( int l = 0; l < N3; ++l )
-      for ( int m = 0; m < N4; ++m )
-      {
-        if ( h_view( i, j, k, l, m ) != 1 ) {
-          ++counter;
-        }
+      for (int i = 0; i < N0; ++i)
+        for (int j = 0; j < N1; ++j)
+          for (int k = 0; k < N2; ++k)
+            for (int l = 0; l < N3; ++l)
+              for (int m = 0; m < N4; ++m) {
+                if (h_view(i, j, k, l, m) != 1) {
+                  ++counter;
+                }
+              }
+
+      if (counter != 0) {
+        printf(" Errors in test_for5; mismatches = %d\n\n", counter);
       }
 
-      if ( counter != 0 ) {
-        printf( " Errors in test_for5; mismatches = %d\n\n", counter );
-      }
-
-      ASSERT_EQ( counter, 0 );
+      ASSERT_EQ(counter, 0);
     }
 
     {
-      typedef typename Kokkos::MDRangePolicy< ExecSpace, Kokkos::Rank<5, Iterate::Default, Iterate::Default>, Kokkos::IndexType<int> > range_type;
+      typedef typename Kokkos::MDRangePolicy<
+          ExecSpace, Kokkos::Rank<5, Iterate::Default, Iterate::Default>,
+          Kokkos::IndexType<int> >
+          range_type;
       typedef typename range_type::tile_type tile_type;
       typedef typename range_type::point_type point_type;
 
-      range_type range( point_type{ { 0, 0, 0, 0, 0 } }, point_type{ { N0, N1, N2, N3, N4 } }, tile_type{ { 4, 4, 4, 2, 2 } } );
+      range_type range(point_type{{0, 0, 0, 0, 0}},
+                       point_type{{N0, N1, N2, N3, N4}},
+                       tile_type{{4, 4, 4, 2, 2}});
 
-      TestMDRange_5D functor( N0, N1, N2, N3, N4 );
+      TestMDRange_5D functor(N0, N1, N2, N3, N4);
 
-      parallel_for( range, functor );
+      parallel_for(range, functor);
 
-      HostViewType h_view = Kokkos::create_mirror_view( functor.input_view );
-      Kokkos::deep_copy( h_view, functor.input_view );
+      HostViewType h_view = Kokkos::create_mirror_view(functor.input_view);
+      Kokkos::deep_copy(h_view, functor.input_view);
 
       int counter = 0;
-      for ( int i = 0; i < N0; ++i )
-      for ( int j = 0; j < N1; ++j )
-      for ( int k = 0; k < N2; ++k )
-      for ( int l = 0; l < N3; ++l )
-      for ( int m = 0; m < N4; ++m )
-      {
-        if ( h_view( i, j, k, l, m ) != 1 ) {
-          ++counter;
-        }
+      for (int i = 0; i < N0; ++i)
+        for (int j = 0; j < N1; ++j)
+          for (int k = 0; k < N2; ++k)
+            for (int l = 0; l < N3; ++l)
+              for (int m = 0; m < N4; ++m) {
+                if (h_view(i, j, k, l, m) != 1) {
+                  ++counter;
+                }
+              }
+
+      if (counter != 0) {
+        printf(" Errors in test_for5; mismatches = %d\n\n", counter);
       }
 
-      if ( counter != 0 ) {
-        printf( " Errors in test_for5; mismatches = %d\n\n", counter );
-      }
-
-      ASSERT_EQ( counter, 0 );
+      ASSERT_EQ(counter, 0);
     }
 
     {
-      typedef typename Kokkos::MDRangePolicy< ExecSpace, Kokkos::Rank<5, Iterate::Left, Iterate::Left>, Kokkos::IndexType<int> > range_type;
+      typedef typename Kokkos::MDRangePolicy<
+          ExecSpace, Kokkos::Rank<5, Iterate::Left, Iterate::Left>,
+          Kokkos::IndexType<int> >
+          range_type;
       typedef typename range_type::tile_type tile_type;
       typedef typename range_type::point_type point_type;
 
-      range_type range( point_type{ { 0, 0, 0, 0, 0 } }, point_type{ { N0, N1, N2, N3, N4 } }, tile_type{ { 4, 4, 4, 2, 2 } } );
+      range_type range(point_type{{0, 0, 0, 0, 0}},
+                       point_type{{N0, N1, N2, N3, N4}},
+                       tile_type{{4, 4, 4, 2, 2}});
 
-      TestMDRange_5D functor( N0, N1, N2, N3, N4 );
+      TestMDRange_5D functor(N0, N1, N2, N3, N4);
 
-      parallel_for( range, functor );
+      parallel_for(range, functor);
 
-      HostViewType h_view = Kokkos::create_mirror_view( functor.input_view );
-      Kokkos::deep_copy( h_view, functor.input_view );
+      HostViewType h_view = Kokkos::create_mirror_view(functor.input_view);
+      Kokkos::deep_copy(h_view, functor.input_view);
 
       int counter = 0;
-      for ( int i = 0; i < N0; ++i )
-      for ( int j = 0; j < N1; ++j )
-      for ( int k = 0; k < N2; ++k )
-      for ( int l = 0; l < N3; ++l )
-      for ( int m = 0; m < N4; ++m )
-      {
-        if ( h_view( i, j, k, l, m ) != 1 ) {
-          ++counter;
-        }
+      for (int i = 0; i < N0; ++i)
+        for (int j = 0; j < N1; ++j)
+          for (int k = 0; k < N2; ++k)
+            for (int l = 0; l < N3; ++l)
+              for (int m = 0; m < N4; ++m) {
+                if (h_view(i, j, k, l, m) != 1) {
+                  ++counter;
+                }
+              }
+
+      if (counter != 0) {
+        printf(" Errors in test_for5; mismatches = %d\n\n", counter);
       }
 
-      if ( counter != 0 ) {
-        printf( " Errors in test_for5; mismatches = %d\n\n", counter );
-      }
-
-      ASSERT_EQ( counter, 0 );
+      ASSERT_EQ(counter, 0);
     }
 
     {
-      typedef typename Kokkos::MDRangePolicy< ExecSpace, Kokkos::Rank<5, Iterate::Left, Iterate::Right>, Kokkos::IndexType<int> > range_type;
+      typedef typename Kokkos::MDRangePolicy<
+          ExecSpace, Kokkos::Rank<5, Iterate::Left, Iterate::Right>,
+          Kokkos::IndexType<int> >
+          range_type;
       typedef typename range_type::tile_type tile_type;
       typedef typename range_type::point_type point_type;
 
-      range_type range( point_type{ { 0, 0, 0, 0, 0 } }, point_type{ { N0, N1, N2, N3, N4 } }, tile_type{ { 4, 4, 4, 2, 2 } } );
+      range_type range(point_type{{0, 0, 0, 0, 0}},
+                       point_type{{N0, N1, N2, N3, N4}},
+                       tile_type{{4, 4, 4, 2, 2}});
 
-      TestMDRange_5D functor( N0, N1, N2, N3, N4 );
+      TestMDRange_5D functor(N0, N1, N2, N3, N4);
 
-      parallel_for( range, functor );
+      parallel_for(range, functor);
 
-      HostViewType h_view = Kokkos::create_mirror_view( functor.input_view );
-      Kokkos::deep_copy( h_view, functor.input_view );
+      HostViewType h_view = Kokkos::create_mirror_view(functor.input_view);
+      Kokkos::deep_copy(h_view, functor.input_view);
 
       int counter = 0;
-      for ( int i = 0; i < N0; ++i )
-      for ( int j = 0; j < N1; ++j )
-      for ( int k = 0; k < N2; ++k )
-      for ( int l = 0; l < N3; ++l )
-      for ( int m = 0; m < N4; ++m )
-      {
-        if ( h_view( i, j, k, l, m ) != 1 ) {
-          ++counter;
-        }
+      for (int i = 0; i < N0; ++i)
+        for (int j = 0; j < N1; ++j)
+          for (int k = 0; k < N2; ++k)
+            for (int l = 0; l < N3; ++l)
+              for (int m = 0; m < N4; ++m) {
+                if (h_view(i, j, k, l, m) != 1) {
+                  ++counter;
+                }
+              }
+
+      if (counter != 0) {
+        printf(" Errors in test_for5; mismatches = %d\n\n", counter);
       }
 
-      if ( counter != 0 ) {
-        printf( " Errors in test_for5; mismatches = %d\n\n", counter );
-      }
-
-      ASSERT_EQ( counter, 0 );
+      ASSERT_EQ(counter, 0);
     }
 
     {
-      typedef typename Kokkos::MDRangePolicy< ExecSpace, Kokkos::Rank<5, Iterate::Right, Iterate::Left>, Kokkos::IndexType<int> > range_type;
+      typedef typename Kokkos::MDRangePolicy<
+          ExecSpace, Kokkos::Rank<5, Iterate::Right, Iterate::Left>,
+          Kokkos::IndexType<int> >
+          range_type;
       typedef typename range_type::tile_type tile_type;
       typedef typename range_type::point_type point_type;
 
-      range_type range( point_type{ { 0, 0, 0, 0, 0 } }, point_type{ { N0, N1, N2, N3, N4 } }, tile_type{ { 4, 4, 4, 2, 2 } } );
+      range_type range(point_type{{0, 0, 0, 0, 0}},
+                       point_type{{N0, N1, N2, N3, N4}},
+                       tile_type{{4, 4, 4, 2, 2}});
 
-      TestMDRange_5D functor( N0, N1, N2, N3, N4 );
+      TestMDRange_5D functor(N0, N1, N2, N3, N4);
 
-      parallel_for( range, functor );
+      parallel_for(range, functor);
 
-      HostViewType h_view = Kokkos::create_mirror_view( functor.input_view );
-      Kokkos::deep_copy( h_view, functor.input_view );
+      HostViewType h_view = Kokkos::create_mirror_view(functor.input_view);
+      Kokkos::deep_copy(h_view, functor.input_view);
 
       int counter = 0;
-      for ( int i = 0; i < N0; ++i )
-      for ( int j = 0; j < N1; ++j )
-      for ( int k = 0; k < N2; ++k )
-      for ( int l = 0; l < N3; ++l )
-      for ( int m = 0; m < N4; ++m )
-      {
-        if ( h_view( i, j, k, l, m ) != 1 ) {
-          ++counter;
-        }
+      for (int i = 0; i < N0; ++i)
+        for (int j = 0; j < N1; ++j)
+          for (int k = 0; k < N2; ++k)
+            for (int l = 0; l < N3; ++l)
+              for (int m = 0; m < N4; ++m) {
+                if (h_view(i, j, k, l, m) != 1) {
+                  ++counter;
+                }
+              }
+
+      if (counter != 0) {
+        printf(" Errors in test_for5; mismatches = %d\n\n", counter);
       }
 
-      if ( counter != 0 ) {
-        printf( " Errors in test_for5; mismatches = %d\n\n", counter );
-      }
-
-      ASSERT_EQ( counter, 0 );
+      ASSERT_EQ(counter, 0);
     }
 
     {
-      typedef typename Kokkos::MDRangePolicy< ExecSpace, Kokkos::Rank<5, Iterate::Right, Iterate::Right>, Kokkos::IndexType<int> > range_type;
+      typedef typename Kokkos::MDRangePolicy<
+          ExecSpace, Kokkos::Rank<5, Iterate::Right, Iterate::Right>,
+          Kokkos::IndexType<int> >
+          range_type;
       typedef typename range_type::tile_type tile_type;
       typedef typename range_type::point_type point_type;
 
-      range_type range( point_type{ { 0, 0, 0, 0, 0 } }, point_type{ { N0, N1, N2, N3, N4 } }, tile_type{ { 4, 4, 4, 2, 2 } } );
+      range_type range(point_type{{0, 0, 0, 0, 0}},
+                       point_type{{N0, N1, N2, N3, N4}},
+                       tile_type{{4, 4, 4, 2, 2}});
 
-      TestMDRange_5D functor( N0, N1, N2, N3, N4 );
+      TestMDRange_5D functor(N0, N1, N2, N3, N4);
 
-      parallel_for( range, functor );
+      parallel_for(range, functor);
 
-      HostViewType h_view = Kokkos::create_mirror_view( functor.input_view );
-      Kokkos::deep_copy( h_view, functor.input_view );
+      HostViewType h_view = Kokkos::create_mirror_view(functor.input_view);
+      Kokkos::deep_copy(h_view, functor.input_view);
 
       int counter = 0;
-      for ( int i = 0; i < N0; ++i )
-      for ( int j = 0; j < N1; ++j )
-      for ( int k = 0; k < N2; ++k )
-      for ( int l = 0; l < N3; ++l )
-      for ( int m = 0; m < N4; ++m )
-      {
-        if ( h_view( i, j, k, l, m ) != 1 ) {
-          ++counter;
-        }
+      for (int i = 0; i < N0; ++i)
+        for (int j = 0; j < N1; ++j)
+          for (int k = 0; k < N2; ++k)
+            for (int l = 0; l < N3; ++l)
+              for (int m = 0; m < N4; ++m) {
+                if (h_view(i, j, k, l, m) != 1) {
+                  ++counter;
+                }
+              }
+
+      if (counter != 0) {
+        printf(" Errors in test_for5; mismatches = %d\n\n", counter);
       }
 
-      if ( counter != 0 ) {
-        printf( " Errors in test_for5; mismatches = %d\n\n", counter );
-      }
-
-      ASSERT_EQ( counter, 0 );
+      ASSERT_EQ(counter, 0);
     }
   }
 };
 
-template <typename ExecSpace >
+template <typename ExecSpace>
 struct TestMDRange_6D {
   using DataType     = int;
-  using ViewType     = typename Kokkos::View< DataType******, ExecSpace >;
+  using ViewType     = typename Kokkos::View<DataType ******, ExecSpace>;
   using HostViewType = typename ViewType::HostMirror;
 
   ViewType input_view;
   using value_type = double;
 
-  TestMDRange_6D( const DataType N0, const DataType N1, const DataType N2, const DataType N3, const DataType N4, const DataType N5 ) : input_view( "input_view", N0, N1, N2, N3, N4, N5 ) {}
+  TestMDRange_6D(const DataType N0, const DataType N1, const DataType N2,
+                 const DataType N3, const DataType N4, const DataType N5)
+      : input_view("input_view", N0, N1, N2, N3, N4, N5) {}
 
   KOKKOS_INLINE_FUNCTION
-  void operator()( const int i, const int j, const int k, const int l, const int m, const int n ) const
-  {
-    input_view( i, j, k, l, m, n ) = 1;
+  void operator()(const int i, const int j, const int k, const int l,
+                  const int m, const int n) const {
+    input_view(i, j, k, l, m, n) = 1;
   }
 
   KOKKOS_INLINE_FUNCTION
-  void operator()( const int i, const int j, const int k, const int l, const int m, const int n, value_type &lsum ) const
-  {
-    lsum += input_view( i, j, k, l, m, n ) * 2;
+  void operator()(const int i, const int j, const int k, const int l,
+                  const int m, const int n, value_type &lsum) const {
+    lsum += input_view(i, j, k, l, m, n) * 2;
   }
 
   // tagged operators
   struct InitTag {};
   KOKKOS_INLINE_FUNCTION
-  void operator()( const InitTag &, const int i, const int j, const int k, const int l, const int m, const int n ) const
-  {
-    input_view( i, j, k, l, m, n ) = 3;
+  void operator()(const InitTag &, const int i, const int j, const int k,
+                  const int l, const int m, const int n) const {
+    input_view(i, j, k, l, m, n) = 3;
   }
 
   // reduction tagged operators
   KOKKOS_INLINE_FUNCTION
-  void operator()( const InitTag &, const int i, const int j, const int k, const int l, const int m, const int n, value_type &lsum ) const
-  {
-    lsum += input_view( i, j, k, l, m, n ) * 3;
+  void operator()(const InitTag &, const int i, const int j, const int k,
+                  const int l, const int m, const int n,
+                  value_type &lsum) const {
+    lsum += input_view(i, j, k, l, m, n) * 3;
   }
 
-  static void test_reduce6( const int N0, const int N1, const int N2, const int N3, const int N4, const int N5 )
-  {
-#if defined( KOKKOS_ENABLE_CXX11_DISPATCH_LAMBDA )
-#if !defined(KOKKOS_ENABLE_CUDA) || ( 8000 <= CUDA_VERSION )
+  static void test_reduce6(const int N0, const int N1, const int N2,
+                           const int N3, const int N4, const int N5) {
+#if defined(KOKKOS_ENABLE_CXX11_DISPATCH_LAMBDA)
+#if !defined(KOKKOS_ENABLE_CUDA) || (8000 <= CUDA_VERSION)
     {
-      typedef typename Kokkos::MDRangePolicy< ExecSpace, Kokkos::Rank<6>, Kokkos::IndexType<int> > range_type;
+      typedef typename Kokkos::MDRangePolicy<ExecSpace, Kokkos::Rank<6>,
+                                             Kokkos::IndexType<int> >
+          range_type;
       typedef typename range_type::tile_type tile_type;
       typedef typename range_type::point_type point_type;
 
-      range_type range( point_type{ { 0, 0, 0, 0, 0, 0 } }, point_type{ { N0, N1, N2, N3, N4, N5 } }, tile_type{ { 3, 3, 3, 3, 1, 1 } } );
+      range_type range(point_type{{0, 0, 0, 0, 0, 0}},
+                       point_type{{N0, N1, N2, N3, N4, N5}},
+                       tile_type{{3, 3, 3, 3, 1, 1}});
       double sum = 0.0;
-      parallel_reduce( range
-        , KOKKOS_LAMBDA(const int i, const int j, const int k, const int l, const int m, const int n, double &lsum) {
-            lsum+=1.0;
-          }
-        , sum );
-      ASSERT_EQ( sum, N0 * N1 * N2 * N3 * N4 * N5 );
+      parallel_reduce(
+          range,
+          KOKKOS_LAMBDA(const int i, const int j, const int k, const int l,
+                        const int m, const int n,
+                        double &lsum) { lsum += 1.0; },
+          sum);
+      ASSERT_EQ(sum, N0 * N1 * N2 * N3 * N4 * N5);
     }
 #endif
 #endif
 
     {
-      typedef typename Kokkos::MDRangePolicy< ExecSpace, Kokkos::Rank<6>, Kokkos::IndexType<int> > range_type;
+      typedef typename Kokkos::MDRangePolicy<ExecSpace, Kokkos::Rank<6>,
+                                             Kokkos::IndexType<int> >
+          range_type;
       typedef typename range_type::tile_type tile_type;
       typedef typename range_type::point_type point_type;
 
@@ -2551,145 +2834,178 @@ struct TestMDRange_6D {
       int s3 = 1;
       int s4 = 1;
       int s5 = 1;
-      range_type range( point_type{ { s0, s1, s2, s3, s4, s5 } }, point_type{ { N0, N1, N2, N3, N4, N5 } }, tile_type{ { 3, 3, 3, 3, 3, 2 } } );
+      range_type range(point_type{{s0, s1, s2, s3, s4, s5}},
+                       point_type{{N0, N1, N2, N3, N4, N5}},
+                       tile_type{{3, 3, 3, 3, 3, 2}});
 
-      TestMDRange_6D functor( N0, N1, N2, N3, N4, N5 );
+      TestMDRange_6D functor(N0, N1, N2, N3, N4, N5);
 
-      parallel_for( range, functor );
+      parallel_for(range, functor);
       double sum = 0.0;
-      parallel_reduce( range, functor, sum );
+      parallel_reduce(range, functor, sum);
 
-      ASSERT_EQ( sum, 2 * (N0 - s0) * (N1 - s1) * (N2 - s2) * (N3 - s3) * (N4 - s4) * (N5 - s5) );
+      ASSERT_EQ(sum, 2 * (N0 - s0) * (N1 - s1) * (N2 - s2) * (N3 - s3) *
+                         (N4 - s4) * (N5 - s5));
     }
 
     // Test with reducers - scalar
     {
-      typedef typename Kokkos::MDRangePolicy< ExecSpace, Kokkos::Rank<6>, Kokkos::IndexType<int> > range_type;
-      range_type range( {{ 0, 0, 0, 0, 0, 0 }}, {{ N0, N1, N2, N3, N4, N5 }}, {{ 3, 3, 3, 3, 3, 2 }} );
+      typedef typename Kokkos::MDRangePolicy<ExecSpace, Kokkos::Rank<6>,
+                                             Kokkos::IndexType<int> >
+          range_type;
+      range_type range({{0, 0, 0, 0, 0, 0}}, {{N0, N1, N2, N3, N4, N5}},
+                       {{3, 3, 3, 3, 3, 2}});
 
-      TestMDRange_6D functor( N0, N1, N2, N3, N4, N5 );
+      TestMDRange_6D functor(N0, N1, N2, N3, N4, N5);
 
-      parallel_for( range, functor );
+      parallel_for(range, functor);
 
       value_type sum = 0.0;
-      Kokkos::Sum< value_type > reducer_scalar( sum );
+      Kokkos::Sum<value_type> reducer_scalar(sum);
 
-      parallel_reduce( range, functor, reducer_scalar );
+      parallel_reduce(range, functor, reducer_scalar);
 
-      ASSERT_EQ( sum, 2 * N0 * N1 * N2 * N3 * N4 * N5 );
+      ASSERT_EQ(sum, 2 * N0 * N1 * N2 * N3 * N4 * N5);
     }
 
     // Test with reducers - scalar + label
     {
-      typedef typename Kokkos::MDRangePolicy< ExecSpace, Kokkos::Rank<6>, Kokkos::IndexType<int> > range_type;
-      range_type range( {{ 0, 0, 0, 0, 0, 0 }}, {{ N0, N1, N2, N3, N4, N5 }}, {{ 3, 3, 3, 3, 3, 2 }} );
+      typedef typename Kokkos::MDRangePolicy<ExecSpace, Kokkos::Rank<6>,
+                                             Kokkos::IndexType<int> >
+          range_type;
+      range_type range({{0, 0, 0, 0, 0, 0}}, {{N0, N1, N2, N3, N4, N5}},
+                       {{3, 3, 3, 3, 3, 2}});
 
-      TestMDRange_6D functor( N0, N1, N2, N3, N4, N5 );
+      TestMDRange_6D functor(N0, N1, N2, N3, N4, N5);
 
-      parallel_for( "rank6-parfor-label", range, functor );
+      parallel_for("rank6-parfor-label", range, functor);
 
       value_type sum = 0.0;
-      Kokkos::Sum< value_type > reducer_scalar( sum );
+      Kokkos::Sum<value_type> reducer_scalar(sum);
 
-      parallel_reduce( "rank6-reducer-label", range, functor, reducer_scalar );
+      parallel_reduce("rank6-reducer-label", range, functor, reducer_scalar);
 
-      ASSERT_EQ( sum, 2 * N0 * N1 * N2 * N3 * N4 * N5 );
+      ASSERT_EQ(sum, 2 * N0 * N1 * N2 * N3 * N4 * N5);
     }
 
     // Test with reducers - scalar view
     {
-      typedef typename Kokkos::MDRangePolicy< ExecSpace, Kokkos::Rank<6>, Kokkos::IndexType<int> > range_type;
-      range_type range( {{ 0, 0, 0, 0, 0, 0 }}, {{ N0, N1, N2, N3, N4, N5 }}, {{ 3, 3, 3, 3, 3, 2 }} );
+      typedef typename Kokkos::MDRangePolicy<ExecSpace, Kokkos::Rank<6>,
+                                             Kokkos::IndexType<int> >
+          range_type;
+      range_type range({{0, 0, 0, 0, 0, 0}}, {{N0, N1, N2, N3, N4, N5}},
+                       {{3, 3, 3, 3, 3, 2}});
 
-      TestMDRange_6D functor( N0, N1, N2, N3, N4, N5 );
+      TestMDRange_6D functor(N0, N1, N2, N3, N4, N5);
 
-      parallel_for( range, functor );
+      parallel_for(range, functor);
 
       value_type sum = 0.0;
-      Kokkos::View< value_type, Kokkos::HostSpace > sum_view("sum_view");
+      Kokkos::View<value_type, Kokkos::HostSpace> sum_view("sum_view");
       sum_view() = sum;
-      Kokkos::Sum< value_type > reducer_view( sum_view );
+      Kokkos::Sum<value_type> reducer_view(sum_view);
 
-      parallel_reduce( range, functor, reducer_view);
+      parallel_reduce(range, functor, reducer_view);
       Kokkos::fence();
       sum = sum_view();
 
-      ASSERT_EQ( sum, 2 * N0 * N1 * N2 * N3 * N4 * N5 );
+      ASSERT_EQ(sum, 2 * N0 * N1 * N2 * N3 * N4 * N5);
     }
 
     // Test Min reducer with lambda
-#if defined( KOKKOS_ENABLE_CXX11_DISPATCH_LAMBDA )
-#if !defined(KOKKOS_ENABLE_CUDA) || ( 8000 <= CUDA_VERSION )
+#if defined(KOKKOS_ENABLE_CXX11_DISPATCH_LAMBDA)
+#if !defined(KOKKOS_ENABLE_CUDA) || (8000 <= CUDA_VERSION)
     {
-      typedef typename Kokkos::MDRangePolicy< ExecSpace, Kokkos::Rank<6>, Kokkos::IndexType<int> > range_type;
+      typedef typename Kokkos::MDRangePolicy<ExecSpace, Kokkos::Rank<6>,
+                                             Kokkos::IndexType<int> >
+          range_type;
 
-      range_type range( {{ 1, 1, 1, 1, 1, 1 }}, {{ N0, N1, N2, N3, N4, N5 }}, {{ 3, 3, 3, 2, 2, 1 }} );
+      range_type range({{1, 1, 1, 1, 1, 1}}, {{N0, N1, N2, N3, N4, N5}},
+                       {{3, 3, 3, 2, 2, 1}});
 
-      Kokkos::View< double******, ExecSpace > v_in("v_in", N0, N1, N2, N3, N4, N5 );
+      Kokkos::View<double ******, ExecSpace> v_in("v_in", N0, N1, N2, N3, N4,
+                                                  N5);
 
-      parallel_for( "rank6-init-lambda", range, KOKKOS_LAMBDA ( const int i, const int j, const int k, const int l, const int m, const int n ) {
-          v_in( i, j, k, l, m, n ) = (i+1) * (j+1) * (k+1) * (l+1) * (m+1) * (n+1) ;
-        });
+      parallel_for(
+          "rank6-init-lambda", range,
+          KOKKOS_LAMBDA(const int i, const int j, const int k, const int l,
+                        const int m, const int n) {
+            v_in(i, j, k, l, m, n) =
+                (i + 1) * (j + 1) * (k + 1) * (l + 1) * (m + 1) * (n + 1);
+          });
 
       double min;
 
-      parallel_reduce("rank6-min-reducer",  range, KOKKOS_LAMBDA ( const int i, const int j, const int k, const int l, const int m, const int n, double& min_val ) {
-            min_val = (v_in(i,j,k,l,m,n) < min_val) ? v_in(i,j,k,l,m,n) : min_val;
-          }
-        , Kokkos::Min<double>(min) );
+      parallel_reduce(
+          "rank6-min-reducer", range,
+          KOKKOS_LAMBDA(const int i, const int j, const int k, const int l,
+                        const int m, const int n, double &min_val) {
+            min_val = (v_in(i, j, k, l, m, n) < min_val)
+                          ? v_in(i, j, k, l, m, n)
+                          : min_val;
+          },
+          Kokkos::Min<double>(min));
 
-      ASSERT_EQ( min, 64.0 );
+      ASSERT_EQ(min, 64.0);
     }
 #endif
 #endif
 
     // Tagged operator test
     {
-      typedef typename Kokkos::MDRangePolicy< ExecSpace, Kokkos::Rank<6, Iterate::Default, Iterate::Default >, Kokkos::IndexType<int>, InitTag > range_type;
+      typedef typename Kokkos::MDRangePolicy<
+          ExecSpace, Kokkos::Rank<6, Iterate::Default, Iterate::Default>,
+          Kokkos::IndexType<int>, InitTag>
+          range_type;
       typedef typename range_type::tile_type tile_type;
       typedef typename range_type::point_type point_type;
 
-      range_type range( point_type{ { 0, 0, 0, 0, 0, 0 } }, point_type{ { N0, N1, N2, N3, N4, N5 } }, tile_type{ { 2, 4, 6, 2, 2, 2 } } );
+      range_type range(point_type{{0, 0, 0, 0, 0, 0}},
+                       point_type{{N0, N1, N2, N3, N4, N5}},
+                       tile_type{{2, 4, 6, 2, 2, 2}});
 
-      TestMDRange_6D functor( N0, N1, N2, N3, N4, N5 );
+      TestMDRange_6D functor(N0, N1, N2, N3, N4, N5);
 
-      parallel_for( range, functor );
+      parallel_for(range, functor);
 
       // check parallel_for results correct with InitTag
-      HostViewType h_view = Kokkos::create_mirror_view( functor.input_view );
-      Kokkos::deep_copy( h_view, functor.input_view );
+      HostViewType h_view = Kokkos::create_mirror_view(functor.input_view);
+      Kokkos::deep_copy(h_view, functor.input_view);
       int counter = 0;
-      for ( int i = 0; i < N0; ++i )
-      for ( int j = 0; j < N1; ++j )
-      for ( int k = 0; k < N2; ++k )
-      for ( int l = 0; l < N3; ++l )
-      for ( int m = 0; m < N4; ++m )
-      for ( int n = 0; n < N5; ++n )
-      {
-        if ( h_view( i, j, k, l, m, n ) != 3 ) {
-          ++counter;
-        }
-      }
+      for (int i = 0; i < N0; ++i)
+        for (int j = 0; j < N1; ++j)
+          for (int k = 0; k < N2; ++k)
+            for (int l = 0; l < N3; ++l)
+              for (int m = 0; m < N4; ++m)
+                for (int n = 0; n < N5; ++n) {
+                  if (h_view(i, j, k, l, m, n) != 3) {
+                    ++counter;
+                  }
+                }
 
-      if ( counter != 0 ) {
-        printf( "Defaults + InitTag op(): Errors in test_reduce6 parallel_for init; mismatches = %d\n\n", counter );
+      if (counter != 0) {
+        printf(
+            "Defaults + InitTag op(): Errors in test_reduce6 parallel_for "
+            "init; mismatches = %d\n\n",
+            counter);
       }
-      ASSERT_EQ( counter, 0 );
-
+      ASSERT_EQ(counter, 0);
 
       double sum = 0.0;
-      parallel_reduce( range, functor, sum );
+      parallel_reduce(range, functor, sum);
 
-      ASSERT_EQ( sum, 9 * N0 * N1 * N2 * N3 * N4 * N5 );
+      ASSERT_EQ(sum, 9 * N0 * N1 * N2 * N3 * N4 * N5);
     }
   }
 
-  static void test_for6( const int N0, const int N1, const int N2, const int N3, const int N4, const int N5 )
-  {
-#if defined( KOKKOS_ENABLE_CXX11_DISPATCH_LAMBDA )
-#if !defined(KOKKOS_ENABLE_CUDA) || ( 8000 <= CUDA_VERSION )
+  static void test_for6(const int N0, const int N1, const int N2, const int N3,
+                        const int N4, const int N5) {
+#if defined(KOKKOS_ENABLE_CXX11_DISPATCH_LAMBDA)
+#if !defined(KOKKOS_ENABLE_CUDA) || (8000 <= CUDA_VERSION)
     {
-      typedef typename Kokkos::MDRangePolicy< ExecSpace, Kokkos::Rank<6>, Kokkos::IndexType<int> > range_type;
+      typedef typename Kokkos::MDRangePolicy<ExecSpace, Kokkos::Rank<6>,
+                                             Kokkos::IndexType<int> >
+          range_type;
       typedef typename range_type::tile_type tile_type;
       typedef typename range_type::point_type point_type;
 
@@ -2700,75 +3016,82 @@ struct TestMDRange_6D {
       const int s4 = 1;
       const int s5 = 1;
 
-      range_type range( point_type{ { s0, s1, s2, s3, s4, s5 } }, point_type{ { N0, N1, N2, N3, N4, N5 } }, tile_type{ { 3, 3, 3, 3, 1, 1 } } );
+      range_type range(point_type{{s0, s1, s2, s3, s4, s5}},
+                       point_type{{N0, N1, N2, N3, N4, N5}},
+                       tile_type{{3, 3, 3, 3, 1, 1}});
 
-      TestMDRange_6D::ViewType v( "v", N0, N1, N2, N3, N4, N5 );
+      TestMDRange_6D::ViewType v("v", N0, N1, N2, N3, N4, N5);
 
-      parallel_for( range, 
-          KOKKOS_LAMBDA ( const int i , const int j , const int k, const int l, const int m, const int n ) {
-            v(i, j, k, l, m, n) = 3;
-          }
-        );
+      parallel_for(
+          range,
+          KOKKOS_LAMBDA(const int i, const int j, const int k, const int l,
+                        const int m, const int n) { v(i, j, k, l, m, n) = 3; });
 
-      TestMDRange_6D::HostViewType h_view = Kokkos::create_mirror_view( v );
-      Kokkos::deep_copy( h_view, v );
+      TestMDRange_6D::HostViewType h_view = Kokkos::create_mirror_view(v);
+      Kokkos::deep_copy(h_view, v);
 
       int counter = 0;
-      for ( int i = s0; i < N0; ++i )
-      for ( int j = s1; j < N1; ++j )
-      for ( int k = s2; k < N2; ++k )
-      for ( int l = s3; l < N3; ++l )
-      for ( int m = s4; m < N4; ++m )
-      for ( int n = s5; n < N5; ++n )
-      {
-        if ( h_view( i, j, k, l, m, n ) != 3 ) {
-          ++counter;
-        }
+      for (int i = s0; i < N0; ++i)
+        for (int j = s1; j < N1; ++j)
+          for (int k = s2; k < N2; ++k)
+            for (int l = s3; l < N3; ++l)
+              for (int m = s4; m < N4; ++m)
+                for (int n = s5; n < N5; ++n) {
+                  if (h_view(i, j, k, l, m, n) != 3) {
+                    ++counter;
+                  }
+                }
+
+      if (counter != 0) {
+        printf(
+            "Offset Start + Default Layouts + InitTag op(): Errors in "
+            "test_for6; mismatches = %d\n\n",
+            counter);
       }
 
-      if ( counter != 0 ) {
-        printf( "Offset Start + Default Layouts + InitTag op(): Errors in test_for6; mismatches = %d\n\n", counter );
-      }
-
-      ASSERT_EQ( counter, 0 );
+      ASSERT_EQ(counter, 0);
     }
 #endif
 #endif
 
     {
-      typedef typename Kokkos::MDRangePolicy< ExecSpace, Kokkos::Rank<6> > range_type;
+      typedef typename Kokkos::MDRangePolicy<ExecSpace, Kokkos::Rank<6> >
+          range_type;
       typedef typename range_type::point_type point_type;
 
-      range_type range( point_type{ { 0, 0, 0, 0, 0, 0 } }, point_type{ { N0, N1, N2, N3, N4, N5 } } );
-      TestMDRange_6D functor( N0, N1, N2, N3, N4, N5 );
+      range_type range(point_type{{0, 0, 0, 0, 0, 0}},
+                       point_type{{N0, N1, N2, N3, N4, N5}});
+      TestMDRange_6D functor(N0, N1, N2, N3, N4, N5);
 
-      parallel_for( range, functor );
+      parallel_for(range, functor);
 
-      HostViewType h_view = Kokkos::create_mirror_view( functor.input_view );
-      Kokkos::deep_copy( h_view, functor.input_view );
+      HostViewType h_view = Kokkos::create_mirror_view(functor.input_view);
+      Kokkos::deep_copy(h_view, functor.input_view);
 
       int counter = 0;
-      for ( int i = 0; i < N0; ++i )
-      for ( int j = 0; j < N1; ++j )
-      for ( int k = 0; k < N2; ++k )
-      for ( int l = 0; l < N3; ++l )
-      for ( int m = 0; m < N4; ++m )
-      for ( int n = 0; n < N5; ++n )
-      {
-        if ( h_view( i, j, k, l, m, n ) != 1 ) {
-          ++counter;
-        }
+      for (int i = 0; i < N0; ++i)
+        for (int j = 0; j < N1; ++j)
+          for (int k = 0; k < N2; ++k)
+            for (int l = 0; l < N3; ++l)
+              for (int m = 0; m < N4; ++m)
+                for (int n = 0; n < N5; ++n) {
+                  if (h_view(i, j, k, l, m, n) != 1) {
+                    ++counter;
+                  }
+                }
+
+      if (counter != 0) {
+        printf("Defaults + No Tile: Errors in test_for6; mismatches = %d\n\n",
+               counter);
       }
 
-      if ( counter != 0 ) {
-        printf( "Defaults + No Tile: Errors in test_for6; mismatches = %d\n\n", counter );
-      }
-
-      ASSERT_EQ( counter, 0 );
+      ASSERT_EQ(counter, 0);
     }
 
     {
-      typedef typename Kokkos::MDRangePolicy< ExecSpace, Kokkos::Rank<6>, Kokkos::IndexType<int>, InitTag > range_type;
+      typedef typename Kokkos::MDRangePolicy<ExecSpace, Kokkos::Rank<6>,
+                                             Kokkos::IndexType<int>, InitTag>
+          range_type;
       typedef typename range_type::tile_type tile_type;
       typedef typename range_type::point_type point_type;
 
@@ -2778,426 +3101,473 @@ struct TestMDRange_6D {
       int s3 = 1;
       int s4 = 1;
       int s5 = 1;
-      range_type range( point_type{ { s0, s1, s2, s3, s4, s5 } }, point_type{ { N0, N1, N2, N3, N4, N5 } }, tile_type{ { 3, 3, 3, 3, 2, 3 } } ); //tile dims 3,3,3,3,3,3 more than cuda can handle with debugging
-      TestMDRange_6D functor( N0, N1, N2, N3, N4, N5 );
+      range_type range(
+          point_type{{s0, s1, s2, s3, s4, s5}},
+          point_type{{N0, N1, N2, N3, N4, N5}},
+          tile_type{{3, 3, 3, 3, 2, 3}});  // tile dims 3,3,3,3,3,3 more than
+                                           // cuda can handle with debugging
+      TestMDRange_6D functor(N0, N1, N2, N3, N4, N5);
 
-      parallel_for( range, functor );
+      parallel_for(range, functor);
 
-      HostViewType h_view = Kokkos::create_mirror_view( functor.input_view );
-      Kokkos::deep_copy( h_view, functor.input_view );
+      HostViewType h_view = Kokkos::create_mirror_view(functor.input_view);
+      Kokkos::deep_copy(h_view, functor.input_view);
 
       int counter = 0;
-      for ( int i = s0; i < N0; ++i )
-      for ( int j = s1; j < N1; ++j )
-      for ( int k = s2; k < N2; ++k )
-      for ( int l = s3; l < N3; ++l )
-      for ( int m = s4; m < N4; ++m )
-      for ( int n = s5; n < N5; ++n )
-      {
-        if ( h_view( i, j, k, l, m, n ) != 3 ) {
-          ++counter;
-        }
+      for (int i = s0; i < N0; ++i)
+        for (int j = s1; j < N1; ++j)
+          for (int k = s2; k < N2; ++k)
+            for (int l = s3; l < N3; ++l)
+              for (int m = s4; m < N4; ++m)
+                for (int n = s5; n < N5; ++n) {
+                  if (h_view(i, j, k, l, m, n) != 3) {
+                    ++counter;
+                  }
+                }
+
+      if (counter != 0) {
+        printf(
+            "Offset Start + Defaults + InitTag op(): Errors in test_for6; "
+            "mismatches = %d\n\n",
+            counter);
       }
 
-      if ( counter != 0 ) {
-        printf( "Offset Start + Defaults + InitTag op(): Errors in test_for6; mismatches = %d\n\n", counter );
-      }
-
-      ASSERT_EQ( counter, 0 );
+      ASSERT_EQ(counter, 0);
     }
 
     {
-      typedef typename Kokkos::MDRangePolicy< ExecSpace, Kokkos::Rank<6>, Kokkos::IndexType<int> > range_type;
+      typedef typename Kokkos::MDRangePolicy<ExecSpace, Kokkos::Rank<6>,
+                                             Kokkos::IndexType<int> >
+          range_type;
       typedef typename range_type::tile_type tile_type;
       typedef typename range_type::point_type point_type;
 
-      range_type range( point_type{ { 0, 0, 0, 0, 0, 0 } }, point_type{ { N0, N1, N2, N3, N4, N5 } }, tile_type{ { 4, 4, 4, 2, 2, 2 } } );
+      range_type range(point_type{{0, 0, 0, 0, 0, 0}},
+                       point_type{{N0, N1, N2, N3, N4, N5}},
+                       tile_type{{4, 4, 4, 2, 2, 2}});
 
-      TestMDRange_6D functor( N0, N1, N2, N3, N4, N5 );
+      TestMDRange_6D functor(N0, N1, N2, N3, N4, N5);
 
-      parallel_for( range, functor );
+      parallel_for(range, functor);
 
-      HostViewType h_view = Kokkos::create_mirror_view( functor.input_view );
-      Kokkos::deep_copy( h_view, functor.input_view );
+      HostViewType h_view = Kokkos::create_mirror_view(functor.input_view);
+      Kokkos::deep_copy(h_view, functor.input_view);
 
       int counter = 0;
-      for ( int i = 0; i < N0; ++i )
-      for ( int j = 0; j < N1; ++j )
-      for ( int k = 0; k < N2; ++k )
-      for ( int l = 0; l < N3; ++l )
-      for ( int m = 0; m < N4; ++m )
-      for ( int n = 0; n < N5; ++n )
-      {
-        if ( h_view( i, j, k, l, m, n ) != 1 ) {
-          ++counter;
-        }
+      for (int i = 0; i < N0; ++i)
+        for (int j = 0; j < N1; ++j)
+          for (int k = 0; k < N2; ++k)
+            for (int l = 0; l < N3; ++l)
+              for (int m = 0; m < N4; ++m)
+                for (int n = 0; n < N5; ++n) {
+                  if (h_view(i, j, k, l, m, n) != 1) {
+                    ++counter;
+                  }
+                }
+
+      if (counter != 0) {
+        printf(" Errors in test_for6; mismatches = %d\n\n", counter);
       }
 
-      if ( counter != 0 ) {
-        printf( " Errors in test_for6; mismatches = %d\n\n", counter );
-      }
-
-      ASSERT_EQ( counter, 0 );
+      ASSERT_EQ(counter, 0);
     }
 
     {
-      typedef typename Kokkos::MDRangePolicy< ExecSpace, Kokkos::Rank<6, Iterate::Default, Iterate::Default>, Kokkos::IndexType<int> > range_type;
+      typedef typename Kokkos::MDRangePolicy<
+          ExecSpace, Kokkos::Rank<6, Iterate::Default, Iterate::Default>,
+          Kokkos::IndexType<int> >
+          range_type;
       typedef typename range_type::tile_type tile_type;
       typedef typename range_type::point_type point_type;
 
-      range_type range( point_type{ { 0, 0, 0, 0, 0, 0 } }, point_type{ { N0, N1, N2, N3, N4, N5 } }, tile_type{ { 4, 4, 4, 2, 2, 2 } } );
+      range_type range(point_type{{0, 0, 0, 0, 0, 0}},
+                       point_type{{N0, N1, N2, N3, N4, N5}},
+                       tile_type{{4, 4, 4, 2, 2, 2}});
 
-      TestMDRange_6D functor( N0, N1, N2, N3, N4, N5 );
+      TestMDRange_6D functor(N0, N1, N2, N3, N4, N5);
 
-      parallel_for( range, functor );
+      parallel_for(range, functor);
 
-      HostViewType h_view = Kokkos::create_mirror_view( functor.input_view );
-      Kokkos::deep_copy( h_view, functor.input_view );
+      HostViewType h_view = Kokkos::create_mirror_view(functor.input_view);
+      Kokkos::deep_copy(h_view, functor.input_view);
 
       int counter = 0;
-      for ( int i = 0; i < N0; ++i )
-      for ( int j = 0; j < N1; ++j )
-      for ( int k = 0; k < N2; ++k )
-      for ( int l = 0; l < N3; ++l )
-      for ( int m = 0; m < N4; ++m )
-      for ( int n = 0; n < N5; ++n )
-      {
-        if ( h_view( i, j, k, l, m, n ) != 1 ) {
-          ++counter;
-        }
+      for (int i = 0; i < N0; ++i)
+        for (int j = 0; j < N1; ++j)
+          for (int k = 0; k < N2; ++k)
+            for (int l = 0; l < N3; ++l)
+              for (int m = 0; m < N4; ++m)
+                for (int n = 0; n < N5; ++n) {
+                  if (h_view(i, j, k, l, m, n) != 1) {
+                    ++counter;
+                  }
+                }
+
+      if (counter != 0) {
+        printf(" Errors in test_for6; mismatches = %d\n\n", counter);
       }
 
-      if ( counter != 0 ) {
-        printf( " Errors in test_for6; mismatches = %d\n\n", counter );
-      }
-
-      ASSERT_EQ( counter, 0 );
+      ASSERT_EQ(counter, 0);
     }
 
     {
-      typedef typename Kokkos::MDRangePolicy< ExecSpace, Kokkos::Rank<6, Iterate::Left, Iterate::Left>, Kokkos::IndexType<int> > range_type;
+      typedef typename Kokkos::MDRangePolicy<
+          ExecSpace, Kokkos::Rank<6, Iterate::Left, Iterate::Left>,
+          Kokkos::IndexType<int> >
+          range_type;
       typedef typename range_type::tile_type tile_type;
       typedef typename range_type::point_type point_type;
 
-      range_type range( point_type{ { 0, 0, 0, 0, 0, 0 } }, point_type{ { N0, N1, N2, N3, N4, N5 } }, tile_type{ { 4, 4, 4, 2, 2, 2 } } );
+      range_type range(point_type{{0, 0, 0, 0, 0, 0}},
+                       point_type{{N0, N1, N2, N3, N4, N5}},
+                       tile_type{{4, 4, 4, 2, 2, 2}});
 
-      TestMDRange_6D functor( N0, N1, N2, N3, N4, N5 );
+      TestMDRange_6D functor(N0, N1, N2, N3, N4, N5);
 
-      parallel_for( range, functor );
+      parallel_for(range, functor);
 
-      HostViewType h_view = Kokkos::create_mirror_view( functor.input_view );
-      Kokkos::deep_copy( h_view, functor.input_view );
+      HostViewType h_view = Kokkos::create_mirror_view(functor.input_view);
+      Kokkos::deep_copy(h_view, functor.input_view);
 
       int counter = 0;
-      for ( int i = 0; i < N0; ++i )
-      for ( int j = 0; j < N1; ++j )
-      for ( int k = 0; k < N2; ++k )
-      for ( int l = 0; l < N3; ++l )
-      for ( int m = 0; m < N4; ++m )
-      for ( int n = 0; n < N5; ++n )
-      {
-        if ( h_view( i, j, k, l, m, n ) != 1 ) {
-          ++counter;
-        }
+      for (int i = 0; i < N0; ++i)
+        for (int j = 0; j < N1; ++j)
+          for (int k = 0; k < N2; ++k)
+            for (int l = 0; l < N3; ++l)
+              for (int m = 0; m < N4; ++m)
+                for (int n = 0; n < N5; ++n) {
+                  if (h_view(i, j, k, l, m, n) != 1) {
+                    ++counter;
+                  }
+                }
+
+      if (counter != 0) {
+        printf(" Errors in test_for6; mismatches = %d\n\n", counter);
       }
 
-      if ( counter != 0 ) {
-        printf( " Errors in test_for6; mismatches = %d\n\n", counter );
-      }
-
-      ASSERT_EQ( counter, 0 );
+      ASSERT_EQ(counter, 0);
     }
 
     {
-      typedef typename Kokkos::MDRangePolicy< ExecSpace, Kokkos::Rank<6, Iterate::Left, Iterate::Right>, Kokkos::IndexType<int> > range_type;
+      typedef typename Kokkos::MDRangePolicy<
+          ExecSpace, Kokkos::Rank<6, Iterate::Left, Iterate::Right>,
+          Kokkos::IndexType<int> >
+          range_type;
       typedef typename range_type::tile_type tile_type;
       typedef typename range_type::point_type point_type;
 
-      range_type range( point_type{ { 0, 0, 0, 0, 0, 0 } }, point_type{ { N0, N1, N2, N3, N4, N5 } }, tile_type{ { 4, 4, 4, 2, 2, 2 } } );
+      range_type range(point_type{{0, 0, 0, 0, 0, 0}},
+                       point_type{{N0, N1, N2, N3, N4, N5}},
+                       tile_type{{4, 4, 4, 2, 2, 2}});
 
-      TestMDRange_6D functor( N0, N1, N2, N3, N4, N5 );
+      TestMDRange_6D functor(N0, N1, N2, N3, N4, N5);
 
-      parallel_for( range, functor );
+      parallel_for(range, functor);
 
-      HostViewType h_view = Kokkos::create_mirror_view( functor.input_view );
-      Kokkos::deep_copy( h_view, functor.input_view );
+      HostViewType h_view = Kokkos::create_mirror_view(functor.input_view);
+      Kokkos::deep_copy(h_view, functor.input_view);
 
       int counter = 0;
-      for ( int i = 0; i < N0; ++i )
-      for ( int j = 0; j < N1; ++j )
-      for ( int k = 0; k < N2; ++k )
-      for ( int l = 0; l < N3; ++l )
-      for ( int m = 0; m < N4; ++m )
-      for ( int n = 0; n < N5; ++n )
-      {
-        if ( h_view( i, j, k, l, m, n ) != 1 ) {
-          ++counter;
-        }
+      for (int i = 0; i < N0; ++i)
+        for (int j = 0; j < N1; ++j)
+          for (int k = 0; k < N2; ++k)
+            for (int l = 0; l < N3; ++l)
+              for (int m = 0; m < N4; ++m)
+                for (int n = 0; n < N5; ++n) {
+                  if (h_view(i, j, k, l, m, n) != 1) {
+                    ++counter;
+                  }
+                }
+
+      if (counter != 0) {
+        printf(" Errors in test_for6; mismatches = %d\n\n", counter);
       }
 
-      if ( counter != 0 ) {
-        printf( " Errors in test_for6; mismatches = %d\n\n", counter );
-      }
-
-      ASSERT_EQ( counter, 0 );
+      ASSERT_EQ(counter, 0);
     }
 
     {
-      typedef typename Kokkos::MDRangePolicy< ExecSpace, Kokkos::Rank<6, Iterate::Right, Iterate::Left>, Kokkos::IndexType<int> > range_type;
+      typedef typename Kokkos::MDRangePolicy<
+          ExecSpace, Kokkos::Rank<6, Iterate::Right, Iterate::Left>,
+          Kokkos::IndexType<int> >
+          range_type;
       typedef typename range_type::tile_type tile_type;
       typedef typename range_type::point_type point_type;
 
-      range_type range( point_type{ { 0, 0, 0, 0, 0, 0 } }, point_type{ { N0, N1, N2, N3, N4, N5 } }, tile_type{ { 4, 4, 4, 2, 2, 2 } } );
+      range_type range(point_type{{0, 0, 0, 0, 0, 0}},
+                       point_type{{N0, N1, N2, N3, N4, N5}},
+                       tile_type{{4, 4, 4, 2, 2, 2}});
 
-      TestMDRange_6D functor( N0, N1, N2, N3, N4, N5 );
+      TestMDRange_6D functor(N0, N1, N2, N3, N4, N5);
 
-      parallel_for( range, functor );
+      parallel_for(range, functor);
 
-      HostViewType h_view = Kokkos::create_mirror_view( functor.input_view );
-      Kokkos::deep_copy( h_view, functor.input_view );
+      HostViewType h_view = Kokkos::create_mirror_view(functor.input_view);
+      Kokkos::deep_copy(h_view, functor.input_view);
 
       int counter = 0;
-      for ( int i = 0; i < N0; ++i )
-      for ( int j = 0; j < N1; ++j )
-      for ( int k = 0; k < N2; ++k )
-      for ( int l = 0; l < N3; ++l )
-      for ( int m = 0; m < N4; ++m )
-      for ( int n = 0; n < N5; ++n )
-      {
-        if ( h_view( i, j, k, l, m, n ) != 1 ) {
-          ++counter;
-        }
+      for (int i = 0; i < N0; ++i)
+        for (int j = 0; j < N1; ++j)
+          for (int k = 0; k < N2; ++k)
+            for (int l = 0; l < N3; ++l)
+              for (int m = 0; m < N4; ++m)
+                for (int n = 0; n < N5; ++n) {
+                  if (h_view(i, j, k, l, m, n) != 1) {
+                    ++counter;
+                  }
+                }
+
+      if (counter != 0) {
+        printf(" Errors in test_for6; mismatches = %d\n\n", counter);
       }
 
-      if ( counter != 0 ) {
-        printf( " Errors in test_for6; mismatches = %d\n\n", counter );
-      }
-
-      ASSERT_EQ( counter, 0 );
+      ASSERT_EQ(counter, 0);
     }
 
     {
-      typedef typename Kokkos::MDRangePolicy< ExecSpace, Kokkos::Rank<6, Iterate::Right, Iterate::Right>, Kokkos::IndexType<int> > range_type;
+      typedef typename Kokkos::MDRangePolicy<
+          ExecSpace, Kokkos::Rank<6, Iterate::Right, Iterate::Right>,
+          Kokkos::IndexType<int> >
+          range_type;
       typedef typename range_type::tile_type tile_type;
       typedef typename range_type::point_type point_type;
 
-      range_type range( point_type{ { 0, 0, 0, 0, 0, 0 } }, point_type{ { N0, N1, N2, N3, N4, N5 } }, tile_type{ { 4, 4, 4, 2, 2, 2 } } );
+      range_type range(point_type{{0, 0, 0, 0, 0, 0}},
+                       point_type{{N0, N1, N2, N3, N4, N5}},
+                       tile_type{{4, 4, 4, 2, 2, 2}});
 
-      TestMDRange_6D functor( N0, N1, N2, N3, N4, N5 );
+      TestMDRange_6D functor(N0, N1, N2, N3, N4, N5);
 
-      parallel_for( range, functor );
+      parallel_for(range, functor);
 
-      HostViewType h_view = Kokkos::create_mirror_view( functor.input_view );
-      Kokkos::deep_copy( h_view, functor.input_view );
+      HostViewType h_view = Kokkos::create_mirror_view(functor.input_view);
+      Kokkos::deep_copy(h_view, functor.input_view);
 
       int counter = 0;
-      for ( int i = 0; i < N0; ++i )
-      for ( int j = 0; j < N1; ++j )
-      for ( int k = 0; k < N2; ++k )
-      for ( int l = 0; l < N3; ++l )
-      for ( int m = 0; m < N4; ++m )
-      for ( int n = 0; n < N5; ++n )
-      {
-        if ( h_view( i, j, k, l, m, n ) != 1 ) {
-          ++counter;
-        }
+      for (int i = 0; i < N0; ++i)
+        for (int j = 0; j < N1; ++j)
+          for (int k = 0; k < N2; ++k)
+            for (int l = 0; l < N3; ++l)
+              for (int m = 0; m < N4; ++m)
+                for (int n = 0; n < N5; ++n) {
+                  if (h_view(i, j, k, l, m, n) != 1) {
+                    ++counter;
+                  }
+                }
+
+      if (counter != 0) {
+        printf(" Errors in test_for6; mismatches = %d\n\n", counter);
       }
 
-      if ( counter != 0 ) {
-        printf( " Errors in test_for6; mismatches = %d\n\n", counter );
-      }
-
-      ASSERT_EQ( counter, 0 );
+      ASSERT_EQ(counter, 0);
     }
   }
 };
 
-
-template <typename ExecSpace >
+template <typename ExecSpace>
 struct TestMDRange_2D_NegIdx {
-
   using value_type = double;
 
   using DataType     = int;
-  using ViewType     = typename Kokkos::View< DataType**, ExecSpace >;
+  using ViewType     = typename Kokkos::View<DataType **, ExecSpace>;
   using HostViewType = typename ViewType::HostMirror;
 
   ViewType input_view;
   DataType lower_offset[2];
 
-  TestMDRange_2D_NegIdx( const DataType L0, const DataType L1, const DataType N0, const DataType N1 ) : input_view( "input_view", N0 - L0, N1 - L1 ) 
-  {
+  TestMDRange_2D_NegIdx(const DataType L0, const DataType L1, const DataType N0,
+                        const DataType N1)
+      : input_view("input_view", N0 - L0, N1 - L1) {
     lower_offset[0] = L0;
     lower_offset[1] = L1;
   }
 
-  // When using negative indices, must offset View appropriately as views cannot take a negative index
+  // When using negative indices, must offset View appropriately as views cannot
+  // take a negative index
   KOKKOS_INLINE_FUNCTION
-  void operator()( const int i, const int j ) const
-  {
-    input_view( i - lower_offset[0], j - lower_offset[1] ) = 1;
+  void operator()(const int i, const int j) const {
+    input_view(i - lower_offset[0], j - lower_offset[1]) = 1;
   }
 
   KOKKOS_INLINE_FUNCTION
-  void operator()( const int i, const int j, value_type &lsum ) const
-  {
-    lsum += input_view( i - lower_offset[0], j - lower_offset[1] ) * 2;
+  void operator()(const int i, const int j, value_type &lsum) const {
+    lsum += input_view(i - lower_offset[0], j - lower_offset[1]) * 2;
   }
 
-  static void test_2D_negidx( const int N0, const int N1 )
-  {
-
+  static void test_2D_negidx(const int N0, const int N1) {
     {
-      typedef typename Kokkos::MDRangePolicy< ExecSpace, Kokkos::Rank<2>, Kokkos::IndexType<int> > range_type;
+      typedef typename Kokkos::MDRangePolicy<ExecSpace, Kokkos::Rank<2>,
+                                             Kokkos::IndexType<int> >
+          range_type;
       typedef typename range_type::tile_type tile_type;
       typedef typename range_type::point_type point_type;
 
       const point_type lower{{-1, -1}};
       const point_type upper{{N0, N1}};
-      const tile_type  tile{{8,8}};
+      const tile_type tile{{8, 8}};
 
-      range_type range( point_type{{ lower[0], lower[1] }}, point_type{{ upper[0], upper[1] }}, tile_type{{ tile[0], tile[1] }} );
+      range_type range(point_type{{lower[0], lower[1]}},
+                       point_type{{upper[0], upper[1]}},
+                       tile_type{{tile[0], tile[1]}});
 
-      TestMDRange_2D_NegIdx functor( lower[0], lower[1], upper[0], upper[1] );
+      TestMDRange_2D_NegIdx functor(lower[0], lower[1], upper[0], upper[1]);
 
-      parallel_for( range, functor );
+      parallel_for(range, functor);
       double sum = 0.0;
-      parallel_reduce( range, functor, sum );
+      parallel_reduce(range, functor, sum);
 
-      ASSERT_EQ( sum, 2 * (upper[0] - lower[0]) * (upper[1] - lower[1]) );
+      ASSERT_EQ(sum, 2 * (upper[0] - lower[0]) * (upper[1] - lower[1]));
     }
   }
 };
 
-template <typename ExecSpace >
+template <typename ExecSpace>
 struct TestMDRange_3D_NegIdx {
-
   using value_type = double;
 
   using DataType     = int;
-  using ViewType     = typename Kokkos::View< DataType***, ExecSpace >;
+  using ViewType     = typename Kokkos::View<DataType ***, ExecSpace>;
   using HostViewType = typename ViewType::HostMirror;
 
   ViewType input_view;
   DataType lower_offset[3];
 
-  TestMDRange_3D_NegIdx( const DataType L0, const DataType L1, const DataType L2, const DataType N0, const DataType N1, const DataType N2 ) : input_view( "input_view", N0 - L0, N1 - L1, N2 - L2 ) 
-  {
+  TestMDRange_3D_NegIdx(const DataType L0, const DataType L1, const DataType L2,
+                        const DataType N0, const DataType N1, const DataType N2)
+      : input_view("input_view", N0 - L0, N1 - L1, N2 - L2) {
     lower_offset[0] = L0;
     lower_offset[1] = L1;
     lower_offset[2] = L2;
   }
 
-  // When using negative indices, must offset View appropriately as views cannot take a negative index
+  // When using negative indices, must offset View appropriately as views cannot
+  // take a negative index
   KOKKOS_INLINE_FUNCTION
-  void operator()( const int i, const int j, const int k ) const
-  {
-    input_view( i - lower_offset[0], j - lower_offset[1], k - lower_offset[2] ) = 1;
+  void operator()(const int i, const int j, const int k) const {
+    input_view(i - lower_offset[0], j - lower_offset[1], k - lower_offset[2]) =
+        1;
   }
 
   KOKKOS_INLINE_FUNCTION
-  void operator()( const int i, const int j, const int k, value_type &lsum ) const
-  {
-    lsum += input_view( i - lower_offset[0], j - lower_offset[1], k - lower_offset[2] ) * 2;
+  void operator()(const int i, const int j, const int k,
+                  value_type &lsum) const {
+    lsum += input_view(i - lower_offset[0], j - lower_offset[1],
+                       k - lower_offset[2]) *
+            2;
   }
 
-  static void test_3D_negidx( const int N0, const int N1, const int N2 )
-  {
-
+  static void test_3D_negidx(const int N0, const int N1, const int N2) {
     {
-      typedef typename Kokkos::MDRangePolicy< ExecSpace, Kokkos::Rank<3>, Kokkos::IndexType<int> > range_type;
+      typedef typename Kokkos::MDRangePolicy<ExecSpace, Kokkos::Rank<3>,
+                                             Kokkos::IndexType<int> >
+          range_type;
       typedef typename range_type::tile_type tile_type;
       typedef typename range_type::point_type point_type;
 
       const point_type lower{{-1, -1, -1}};
       const point_type upper{{N0, N1, N2}};
-      const tile_type  tile{{8,8,2}};
+      const tile_type tile{{8, 8, 2}};
 
-      range_type range( point_type{{ lower[0], lower[1], lower[2] }}, point_type{{ upper[0], upper[1], upper[2] }}, tile_type{{ tile[0], tile[1], tile[2] }} );
+      range_type range(point_type{{lower[0], lower[1], lower[2]}},
+                       point_type{{upper[0], upper[1], upper[2]}},
+                       tile_type{{tile[0], tile[1], tile[2]}});
 
-      TestMDRange_3D_NegIdx functor( lower[0], lower[1], lower[2], upper[0], upper[1], upper[2] );
+      TestMDRange_3D_NegIdx functor(lower[0], lower[1], lower[2], upper[0],
+                                    upper[1], upper[2]);
 
-      parallel_for( range, functor );
+      parallel_for(range, functor);
       double sum = 0.0;
-      parallel_reduce( range, functor, sum );
+      parallel_reduce(range, functor, sum);
 
-      ASSERT_EQ( sum, 2 * (upper[0] - lower[0]) * (upper[1] - lower[1]) * (upper[2] - lower[2]) );
+      ASSERT_EQ(sum, 2 * (upper[0] - lower[0]) * (upper[1] - lower[1]) *
+                         (upper[2] - lower[2]));
     }
   }
 };
 
-template <typename ExecSpace >
+template <typename ExecSpace>
 struct TestMDRange_4D_NegIdx {
-
   using value_type = double;
 
   using DataType     = int;
-  using ViewType     = typename Kokkos::View< DataType****, ExecSpace >;
+  using ViewType     = typename Kokkos::View<DataType ****, ExecSpace>;
   using HostViewType = typename ViewType::HostMirror;
 
   ViewType input_view;
   DataType lower_offset[4];
 
-  TestMDRange_4D_NegIdx( const DataType L0, const DataType L1, const DataType L2, const DataType L3, const DataType N0, const DataType N1, const DataType N2, const DataType N3 ) : input_view( "input_view", N0 - L0, N1 - L1, N2 - L2, N3 - L3 ) 
-  {
+  TestMDRange_4D_NegIdx(const DataType L0, const DataType L1, const DataType L2,
+                        const DataType L3, const DataType N0, const DataType N1,
+                        const DataType N2, const DataType N3)
+      : input_view("input_view", N0 - L0, N1 - L1, N2 - L2, N3 - L3) {
     lower_offset[0] = L0;
     lower_offset[1] = L1;
     lower_offset[2] = L2;
     lower_offset[3] = L3;
   }
 
-  // When using negative indices, must offset View appropriately as views cannot take a negative index
+  // When using negative indices, must offset View appropriately as views cannot
+  // take a negative index
   KOKKOS_INLINE_FUNCTION
-  void operator()( const int i, const int j, const int k, const int l ) const
-  {
-    input_view( i - lower_offset[0], j - lower_offset[1], k - lower_offset[2], l - lower_offset[3] ) = 1;
+  void operator()(const int i, const int j, const int k, const int l) const {
+    input_view(i - lower_offset[0], j - lower_offset[1], k - lower_offset[2],
+               l - lower_offset[3]) = 1;
   }
 
   KOKKOS_INLINE_FUNCTION
-  void operator()( const int i, const int j, const int k, const int l, value_type &lsum ) const
-  {
-    lsum += input_view( i - lower_offset[0], j - lower_offset[1], k - lower_offset[2], l - lower_offset[3] ) * 2;
+  void operator()(const int i, const int j, const int k, const int l,
+                  value_type &lsum) const {
+    lsum += input_view(i - lower_offset[0], j - lower_offset[1],
+                       k - lower_offset[2], l - lower_offset[3]) *
+            2;
   }
 
-  static void test_4D_negidx( const int N0, const int N1, const int N2, const int N3 )
-  {
-
+  static void test_4D_negidx(const int N0, const int N1, const int N2,
+                             const int N3) {
     {
-      typedef typename Kokkos::MDRangePolicy< ExecSpace, Kokkos::Rank<4>, Kokkos::IndexType<int> > range_type;
+      typedef typename Kokkos::MDRangePolicy<ExecSpace, Kokkos::Rank<4>,
+                                             Kokkos::IndexType<int> >
+          range_type;
       typedef typename range_type::tile_type tile_type;
       typedef typename range_type::point_type point_type;
 
       const point_type lower{{-1, -1, -1, -1}};
       const point_type upper{{N0, N1, N2, N3}};
-      const tile_type  tile{{8,8,2,2}};
+      const tile_type tile{{8, 8, 2, 2}};
 
-      range_type range( point_type{{ lower[0], lower[1], lower[2], lower[3] }}, point_type{{ upper[0], upper[1], upper[2], upper[3] }}, tile_type{{ tile[0], tile[1], tile[2], tile[3] }} );
+      range_type range(point_type{{lower[0], lower[1], lower[2], lower[3]}},
+                       point_type{{upper[0], upper[1], upper[2], upper[3]}},
+                       tile_type{{tile[0], tile[1], tile[2], tile[3]}});
 
-      TestMDRange_4D_NegIdx functor( lower[0], lower[1], lower[2], lower[3], upper[0], upper[1], upper[2], upper[3] );
+      TestMDRange_4D_NegIdx functor(lower[0], lower[1], lower[2], lower[3],
+                                    upper[0], upper[1], upper[2], upper[3]);
 
-      parallel_for( range, functor );
+      parallel_for(range, functor);
       double sum = 0.0;
-      parallel_reduce( range, functor, sum );
+      parallel_reduce(range, functor, sum);
 
-      ASSERT_EQ( sum, 2 * (upper[0] - lower[0]) * (upper[1] - lower[1]) * (upper[2] - lower[2]) * (upper[3] - lower[3]) );
+      ASSERT_EQ(sum, 2 * (upper[0] - lower[0]) * (upper[1] - lower[1]) *
+                         (upper[2] - lower[2]) * (upper[3] - lower[3]));
     }
   }
 };
 
-template <typename ExecSpace >
+template <typename ExecSpace>
 struct TestMDRange_5D_NegIdx {
-
   using value_type = double;
 
   using DataType     = int;
-  using ViewType     = typename Kokkos::View< DataType*****, ExecSpace >;
+  using ViewType     = typename Kokkos::View<DataType *****, ExecSpace>;
   using HostViewType = typename ViewType::HostMirror;
 
   ViewType input_view;
   DataType lower_offset[5];
 
-  TestMDRange_5D_NegIdx( const DataType L0, const DataType L1, const DataType L2, const DataType L3, const DataType L4, const DataType N0, const DataType N1, const DataType N2, const DataType N3, const DataType N4 ) : input_view( "input_view", N0 - L0, N1 - L1, N2 - L2, N3 - L3, N4 - L4 ) 
-  {
+  TestMDRange_5D_NegIdx(const DataType L0, const DataType L1, const DataType L2,
+                        const DataType L3, const DataType L4, const DataType N0,
+                        const DataType N1, const DataType N2, const DataType N3,
+                        const DataType N4)
+      : input_view("input_view", N0 - L0, N1 - L1, N2 - L2, N3 - L3, N4 - L4) {
     lower_offset[0] = L0;
     lower_offset[1] = L1;
     lower_offset[2] = L2;
@@ -3205,58 +3575,74 @@ struct TestMDRange_5D_NegIdx {
     lower_offset[4] = L4;
   }
 
-  // When using negative indices, must offset View appropriately as views cannot take a negative index
+  // When using negative indices, must offset View appropriately as views cannot
+  // take a negative index
   KOKKOS_INLINE_FUNCTION
-  void operator()( const int i, const int j, const int k, const int l, const int m ) const
-  {
-    input_view( i - lower_offset[0], j - lower_offset[1], k - lower_offset[2], l - lower_offset[3], m - lower_offset[4] ) = 1;
+  void operator()(const int i, const int j, const int k, const int l,
+                  const int m) const {
+    input_view(i - lower_offset[0], j - lower_offset[1], k - lower_offset[2],
+               l - lower_offset[3], m - lower_offset[4]) = 1;
   }
 
   KOKKOS_INLINE_FUNCTION
-  void operator()( const int i, const int j, const int k, const int l, const int m, value_type &lsum ) const
-  {
-    lsum += input_view( i - lower_offset[0], j - lower_offset[1], k - lower_offset[2], l - lower_offset[3], m - lower_offset[4] ) * 2;
+  void operator()(const int i, const int j, const int k, const int l,
+                  const int m, value_type &lsum) const {
+    lsum += input_view(i - lower_offset[0], j - lower_offset[1],
+                       k - lower_offset[2], l - lower_offset[3],
+                       m - lower_offset[4]) *
+            2;
   }
 
-  static void test_5D_negidx( const int N0, const int N1, const int N2, const int N3, const int N4 )
-  {
-
+  static void test_5D_negidx(const int N0, const int N1, const int N2,
+                             const int N3, const int N4) {
     {
-      typedef typename Kokkos::MDRangePolicy< ExecSpace, Kokkos::Rank<5>, Kokkos::IndexType<int> > range_type;
+      typedef typename Kokkos::MDRangePolicy<ExecSpace, Kokkos::Rank<5>,
+                                             Kokkos::IndexType<int> >
+          range_type;
       typedef typename range_type::tile_type tile_type;
       typedef typename range_type::point_type point_type;
 
       const point_type lower{{-1, -1, -1, -1, -1}};
       const point_type upper{{N0, N1, N2, N3, N4}};
-      const tile_type  tile{{8,4,2,2,2}};
+      const tile_type tile{{8, 4, 2, 2, 2}};
 
-      range_type range( point_type{{ lower[0], lower[1], lower[2], lower[3], lower[4] }}, point_type{{ upper[0], upper[1], upper[2], upper[3], upper[4] }}, tile_type{{ tile[0], tile[1], tile[2], tile[3], tile[4] }} );
+      range_type range(
+          point_type{{lower[0], lower[1], lower[2], lower[3], lower[4]}},
+          point_type{{upper[0], upper[1], upper[2], upper[3], upper[4]}},
+          tile_type{{tile[0], tile[1], tile[2], tile[3], tile[4]}});
 
-      TestMDRange_5D_NegIdx functor( lower[0], lower[1], lower[2], lower[3], lower[4], upper[0], upper[1], upper[2], upper[3], upper[4] );
+      TestMDRange_5D_NegIdx functor(lower[0], lower[1], lower[2], lower[3],
+                                    lower[4], upper[0], upper[1], upper[2],
+                                    upper[3], upper[4]);
 
-      parallel_for( range, functor );
+      parallel_for(range, functor);
       double sum = 0.0;
-      parallel_reduce( range, functor, sum );
+      parallel_reduce(range, functor, sum);
 
-      ASSERT_EQ( sum, 2 * (upper[0] - lower[0]) * (upper[1] - lower[1]) * (upper[2] - lower[2]) * (upper[3] - lower[3]) * (upper[4] - lower[4]) );
+      ASSERT_EQ(sum, 2 * (upper[0] - lower[0]) * (upper[1] - lower[1]) *
+                         (upper[2] - lower[2]) * (upper[3] - lower[3]) *
+                         (upper[4] - lower[4]));
     }
   }
 };
 
-template <typename ExecSpace >
+template <typename ExecSpace>
 struct TestMDRange_6D_NegIdx {
-
   using value_type = double;
 
   using DataType     = int;
-  using ViewType     = typename Kokkos::View< DataType******, ExecSpace >;
+  using ViewType     = typename Kokkos::View<DataType ******, ExecSpace>;
   using HostViewType = typename ViewType::HostMirror;
 
   ViewType input_view;
   DataType lower_offset[6];
 
-  TestMDRange_6D_NegIdx( const DataType L0, const DataType L1, const DataType L2, const DataType L3, const DataType L4, const DataType L5, const DataType N0, const DataType N1, const DataType N2, const DataType N3, const DataType N4, const DataType N5 ) : input_view( "input_view", N0 - L0, N1 - L1, N2 - L2, N3 - L3, N4 - L4, N5 - L5 ) 
-  {
+  TestMDRange_6D_NegIdx(const DataType L0, const DataType L1, const DataType L2,
+                        const DataType L3, const DataType L4, const DataType L5,
+                        const DataType N0, const DataType N1, const DataType N2,
+                        const DataType N3, const DataType N4, const DataType N5)
+      : input_view("input_view", N0 - L0, N1 - L1, N2 - L2, N3 - L3, N4 - L4,
+                   N5 - L5) {
     lower_offset[0] = L0;
     lower_offset[1] = L1;
     lower_offset[2] = L2;
@@ -3265,45 +3651,60 @@ struct TestMDRange_6D_NegIdx {
     lower_offset[5] = L5;
   }
 
-  // When using negative indices, must offset View appropriately as views cannot take a negative index
+  // When using negative indices, must offset View appropriately as views cannot
+  // take a negative index
   KOKKOS_INLINE_FUNCTION
-  void operator()( const int i, const int j, const int k, const int l, const int m, const int n ) const
-  {
-    input_view( i - lower_offset[0], j - lower_offset[1], k - lower_offset[2], l - lower_offset[3], m - lower_offset[4], n - lower_offset[5] ) = 1;
+  void operator()(const int i, const int j, const int k, const int l,
+                  const int m, const int n) const {
+    input_view(i - lower_offset[0], j - lower_offset[1], k - lower_offset[2],
+               l - lower_offset[3], m - lower_offset[4], n - lower_offset[5]) =
+        1;
   }
 
   KOKKOS_INLINE_FUNCTION
-  void operator()( const int i, const int j, const int k, const int l, const int m, const int n, value_type &lsum ) const
-  {
-    lsum += input_view( i - lower_offset[0], j - lower_offset[1], k - lower_offset[2], l - lower_offset[3], m - lower_offset[4], n - lower_offset[5] ) * 2;
+  void operator()(const int i, const int j, const int k, const int l,
+                  const int m, const int n, value_type &lsum) const {
+    lsum += input_view(i - lower_offset[0], j - lower_offset[1],
+                       k - lower_offset[2], l - lower_offset[3],
+                       m - lower_offset[4], n - lower_offset[5]) *
+            2;
   }
 
-  static void test_6D_negidx( const int N0, const int N1, const int N2, const int N3, const int N4, const int N5 )
-  {
-
+  static void test_6D_negidx(const int N0, const int N1, const int N2,
+                             const int N3, const int N4, const int N5) {
     {
-      typedef typename Kokkos::MDRangePolicy< ExecSpace, Kokkos::Rank<6>, Kokkos::IndexType<int> > range_type;
+      typedef typename Kokkos::MDRangePolicy<ExecSpace, Kokkos::Rank<6>,
+                                             Kokkos::IndexType<int> >
+          range_type;
       typedef typename range_type::tile_type tile_type;
       typedef typename range_type::point_type point_type;
 
       const point_type lower{{-1, -1, -1, -1, -1, -1}};
       const point_type upper{{N0, N1, N2, N3, N4, N5}};
-      const tile_type  tile{{8,4,2,2,2,1}};
+      const tile_type tile{{8, 4, 2, 2, 2, 1}};
 
-      range_type range( point_type{{ lower[0], lower[1], lower[2], lower[3], lower[4], lower[5] }}, point_type{{ upper[0], upper[1], upper[2], upper[3], upper[4], upper[5] }}, tile_type{{ tile[0], tile[1], tile[2], tile[3], tile[4], tile[5] }} );
+      range_type range(
+          point_type{
+              {lower[0], lower[1], lower[2], lower[3], lower[4], lower[5]}},
+          point_type{
+              {upper[0], upper[1], upper[2], upper[3], upper[4], upper[5]}},
+          tile_type{{tile[0], tile[1], tile[2], tile[3], tile[4], tile[5]}});
 
-      TestMDRange_6D_NegIdx functor( lower[0], lower[1], lower[2], lower[3], lower[4], lower[5], upper[0], upper[1], upper[2], upper[3], upper[4], upper[5] );
+      TestMDRange_6D_NegIdx functor(lower[0], lower[1], lower[2], lower[3],
+                                    lower[4], lower[5], upper[0], upper[1],
+                                    upper[2], upper[3], upper[4], upper[5]);
 
-      parallel_for( range, functor );
+      parallel_for(range, functor);
       double sum = 0.0;
-      parallel_reduce( range, functor, sum );
+      parallel_reduce(range, functor, sum);
 
-      ASSERT_EQ( sum, 2 * (upper[0] - lower[0]) * (upper[1] - lower[1]) * (upper[2] - lower[2]) * (upper[3] - lower[3]) * (upper[4] - lower[4]) * (upper[5] - lower[5]) );
+      ASSERT_EQ(sum, 2 * (upper[0] - lower[0]) * (upper[1] - lower[1]) *
+                         (upper[2] - lower[2]) * (upper[3] - lower[3]) *
+                         (upper[4] - lower[4]) * (upper[5] - lower[5]));
     }
   }
 };
 
+}  // namespace
 
-} // namespace
-
-} // namespace Test
+}  // namespace Test
diff --git a/lib/kokkos/core/unit_test/TestMDRange_a.hpp b/lib/kokkos/core/unit_test/TestMDRange_a.hpp
index 308b3a3029..3bb9ab089f 100644
--- a/lib/kokkos/core/unit_test/TestMDRange_a.hpp
+++ b/lib/kokkos/core/unit_test/TestMDRange_a.hpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -41,15 +42,16 @@
 //@HEADER
 */
 
-#include<TestMDRange.hpp>
+#include <TestMDRange.hpp>
 
 namespace Test {
 
-TEST_F( TEST_CATEGORY , mdrange_5d ) {
-#if !defined ( KOKKOS_ENABLE_ROCM ) // MDRange Reduce explicitly handled in its own cpp file
-  TestMDRange_5D< TEST_EXECSPACE >::test_reduce5( 100, 10, 10, 10, 5 );
+TEST(TEST_CATEGORY, mdrange_5d) {
+#if !defined(KOKKOS_ENABLE_ROCM)  // MDRange Reduce explicitly handled in its
+                                  // own cpp file
+  TestMDRange_5D<TEST_EXECSPACE>::test_reduce5(100, 10, 10, 10, 5);
 #endif
-  TestMDRange_5D< TEST_EXECSPACE >::test_for5( 100, 10, 10, 10, 5 );
+  TestMDRange_5D<TEST_EXECSPACE>::test_for5(100, 10, 10, 10, 5);
 }
 
-}
+}  // namespace Test
diff --git a/lib/kokkos/core/unit_test/TestMDRange_b.hpp b/lib/kokkos/core/unit_test/TestMDRange_b.hpp
index e714f18395..17dcedd428 100644
--- a/lib/kokkos/core/unit_test/TestMDRange_b.hpp
+++ b/lib/kokkos/core/unit_test/TestMDRange_b.hpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -41,15 +42,16 @@
 //@HEADER
 */
 
-#include<TestMDRange.hpp>
+#include <TestMDRange.hpp>
 
 namespace Test {
 
-TEST_F( TEST_CATEGORY , mdrange_6d ) {
-  TestMDRange_6D< TEST_EXECSPACE >::test_for6( 10, 10, 10, 10, 5, 5 );
-#if !defined( KOKKOS_ENABLE_ROCM ) // MDRange Reduce explicitly handled in its own cpp file
-  TestMDRange_6D< TEST_EXECSPACE >::test_reduce6( 100, 10, 10, 10, 5, 5 );
+TEST(TEST_CATEGORY, mdrange_6d) {
+  TestMDRange_6D<TEST_EXECSPACE>::test_for6(10, 10, 10, 10, 5, 5);
+#if !defined(KOKKOS_ENABLE_ROCM)  // MDRange Reduce explicitly handled in its
+                                  // own cpp file
+  TestMDRange_6D<TEST_EXECSPACE>::test_reduce6(100, 10, 10, 10, 5, 5);
 #endif
 }
 
-}
+}  // namespace Test
diff --git a/lib/kokkos/core/unit_test/TestMDRange_c.hpp b/lib/kokkos/core/unit_test/TestMDRange_c.hpp
index 810e1d82bc..c37b259937 100644
--- a/lib/kokkos/core/unit_test/TestMDRange_c.hpp
+++ b/lib/kokkos/core/unit_test/TestMDRange_c.hpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -41,20 +42,21 @@
 //@HEADER
 */
 
-#include<TestMDRange.hpp>
+#include <TestMDRange.hpp>
 
 namespace Test {
 
-TEST_F( TEST_CATEGORY , mdrange_2d) {
-#if !defined( KOKKOS_ENABLE_ROCM ) // MDRange Reduce explicitly handled in its own cpp file
-  TestMDRange_2D< TEST_EXECSPACE >::test_reduce2( 100, 100 );
+TEST(TEST_CATEGORY, mdrange_2d) {
+#if !defined(KOKKOS_ENABLE_ROCM)  // MDRange Reduce explicitly handled in its
+                                  // own cpp file
+  TestMDRange_2D<TEST_EXECSPACE>::test_reduce2(100, 100);
 #endif
-  TestMDRange_2D< TEST_EXECSPACE >::test_for2( 100, 100 );
+  TestMDRange_2D<TEST_EXECSPACE>::test_for2(100, 100);
 }
 
-TEST_F( TEST_CATEGORY , mdrange_array_reduce ) {
-  TestMDRange_ReduceArray_2D< TEST_EXECSPACE >::test_arrayreduce2( 4, 5 );
-  TestMDRange_ReduceArray_3D< TEST_EXECSPACE >::test_arrayreduce3( 4, 5, 10 );
+TEST(TEST_CATEGORY, mdrange_array_reduce) {
+  TestMDRange_ReduceArray_2D<TEST_EXECSPACE>::test_arrayreduce2(4, 5);
+  TestMDRange_ReduceArray_3D<TEST_EXECSPACE>::test_arrayreduce3(4, 5, 10);
 }
 
-}
+}  // namespace Test
diff --git a/lib/kokkos/core/unit_test/TestMDRange_d.hpp b/lib/kokkos/core/unit_test/TestMDRange_d.hpp
index e25213a289..75c33caf5a 100644
--- a/lib/kokkos/core/unit_test/TestMDRange_d.hpp
+++ b/lib/kokkos/core/unit_test/TestMDRange_d.hpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -41,25 +42,26 @@
 //@HEADER
 */
 
-#include<TestMDRange.hpp>
+#include <TestMDRange.hpp>
 
 namespace Test {
 
-TEST_F( TEST_CATEGORY , mdrange_3d) {
-  TestMDRange_3D< TEST_EXECSPACE >::test_for3( 1, 10, 100 );
-  TestMDRange_3D< TEST_EXECSPACE >::test_for3( 100, 10, 100 );
-#if !defined( KOKKOS_ENABLE_ROCM ) // MDRange Reduced explicitly handled in its own cpp file
-  TestMDRange_3D< TEST_EXECSPACE >::test_reduce3( 1, 10, 100 );
-  TestMDRange_3D< TEST_EXECSPACE >::test_reduce3( 100, 10, 100 );
+TEST(TEST_CATEGORY, mdrange_3d) {
+  TestMDRange_3D<TEST_EXECSPACE>::test_for3(1, 10, 100);
+  TestMDRange_3D<TEST_EXECSPACE>::test_for3(100, 10, 100);
+#if !defined(KOKKOS_ENABLE_ROCM)  // MDRange Reduced explicitly handled in its
+                                  // own cpp file
+  TestMDRange_3D<TEST_EXECSPACE>::test_reduce3(1, 10, 100);
+  TestMDRange_3D<TEST_EXECSPACE>::test_reduce3(100, 10, 100);
 #endif
 }
 
-TEST_F( TEST_CATEGORY , mdrange_neg_idx ) {
-  TestMDRange_2D_NegIdx< TEST_EXECSPACE >::test_2D_negidx( 128, 32 );
-  TestMDRange_3D_NegIdx< TEST_EXECSPACE >::test_3D_negidx( 128, 32, 8 );
-  TestMDRange_4D_NegIdx< TEST_EXECSPACE >::test_4D_negidx( 128, 32, 8, 8 );
-  TestMDRange_5D_NegIdx< TEST_EXECSPACE >::test_5D_negidx( 128, 32, 8, 8, 4 );
-  TestMDRange_6D_NegIdx< TEST_EXECSPACE >::test_6D_negidx( 128, 32, 8, 8, 4, 2 );
+TEST(TEST_CATEGORY, mdrange_neg_idx) {
+  TestMDRange_2D_NegIdx<TEST_EXECSPACE>::test_2D_negidx(128, 32);
+  TestMDRange_3D_NegIdx<TEST_EXECSPACE>::test_3D_negidx(128, 32, 8);
+  TestMDRange_4D_NegIdx<TEST_EXECSPACE>::test_4D_negidx(128, 32, 8, 8);
+  TestMDRange_5D_NegIdx<TEST_EXECSPACE>::test_5D_negidx(128, 32, 8, 8, 4);
+  TestMDRange_6D_NegIdx<TEST_EXECSPACE>::test_6D_negidx(128, 32, 8, 8, 4, 2);
 }
 
-}
+}  // namespace Test
diff --git a/lib/kokkos/core/unit_test/TestMDRange_e.hpp b/lib/kokkos/core/unit_test/TestMDRange_e.hpp
index a626725352..38746cd785 100644
--- a/lib/kokkos/core/unit_test/TestMDRange_e.hpp
+++ b/lib/kokkos/core/unit_test/TestMDRange_e.hpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -41,15 +42,16 @@
 //@HEADER
 */
 
-#include<TestMDRange.hpp>
+#include <TestMDRange.hpp>
 
 namespace Test {
 
-TEST_F( TEST_CATEGORY , mdrange_4d ) {
-#if !defined( KOKKOS_ENABLE_ROCM ) // MDRange Reduce explicitly handled in its own cpp file
-  TestMDRange_4D< TEST_EXECSPACE >::test_reduce4( 100, 10, 10, 10 );
+TEST(TEST_CATEGORY, mdrange_4d) {
+#if !defined(KOKKOS_ENABLE_ROCM)  // MDRange Reduce explicitly handled in its
+                                  // own cpp file
+  TestMDRange_4D<TEST_EXECSPACE>::test_reduce4(100, 10, 10, 10);
 #endif
-  TestMDRange_4D< TEST_EXECSPACE >::test_for4( 100, 10, 10, 10 );
+  TestMDRange_4D<TEST_EXECSPACE>::test_for4(100, 10, 10, 10);
 }
 
-}
+}  // namespace Test
diff --git a/lib/kokkos/core/unit_test/TestMemoryPool.hpp b/lib/kokkos/core/unit_test/TestMemoryPool.hpp
index 00079e02ee..bc78a2908e 100644
--- a/lib/kokkos/core/unit_test/TestMemoryPool.hpp
+++ b/lib/kokkos/core/unit_test/TestMemoryPool.hpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -41,7 +42,6 @@
 //@HEADER
 */
 
-
 #ifndef KOKKOS_UNITTEST_MEMPOOL_HPP
 #define KOKKOS_UNITTEST_MEMPOOL_HPP
 
@@ -54,466 +54,418 @@
 
 namespace TestMemoryPool {
 
-template< typename MemSpace = Kokkos::HostSpace >
-void test_host_memory_pool_defaults()
-{
-  typedef typename MemSpace::execution_space   Space ;
-  typedef typename Kokkos::MemoryPool< Space > MemPool ;
+template <typename MemSpace = Kokkos::HostSpace>
+void test_host_memory_pool_defaults() {
+  typedef typename MemSpace::execution_space Space;
+  typedef typename Kokkos::MemoryPool<Space> MemPool;
 
   {
-    const size_t MemoryCapacity = 32000 ;
-    const size_t MinBlockSize   =    64 ;
-    const size_t MaxBlockSize   =  1024 ;
-    const size_t SuperBlockSize =  4096 ;
+    const size_t MemoryCapacity = 32000;
+    const size_t MinBlockSize   = 64;
+    const size_t MaxBlockSize   = 1024;
+    const size_t SuperBlockSize = 4096;
 
-    MemPool pool( MemSpace()
-                , MemoryCapacity
-                , MinBlockSize
-                , MaxBlockSize
-                , SuperBlockSize
-                );
+    MemPool pool(MemSpace(), MemoryCapacity, MinBlockSize, MaxBlockSize,
+                 SuperBlockSize);
 
-    typename MemPool::usage_statistics stats ;
+    typename MemPool::usage_statistics stats;
 
-    pool.get_usage_statistics( stats );
+    pool.get_usage_statistics(stats);
 
-    ASSERT_LE( MemoryCapacity , stats.capacity_bytes );
-    ASSERT_LE( MinBlockSize , stats.min_block_bytes );
-    ASSERT_LE( MaxBlockSize , stats.max_block_bytes );
-    ASSERT_LE( SuperBlockSize , stats.superblock_bytes );
+    ASSERT_LE(MemoryCapacity, stats.capacity_bytes);
+    ASSERT_LE(MinBlockSize, stats.min_block_bytes);
+    ASSERT_LE(MaxBlockSize, stats.max_block_bytes);
+    ASSERT_LE(SuperBlockSize, stats.superblock_bytes);
   }
 
   {
-    const size_t MemoryCapacity = 10000 ;
+    const size_t MemoryCapacity = 10000;
 
-    MemPool pool( MemSpace()
-                , MemoryCapacity
-                );
+    MemPool pool(MemSpace(), MemoryCapacity);
 
-    typename MemPool::usage_statistics stats ;
+    typename MemPool::usage_statistics stats;
 
-    pool.get_usage_statistics( stats );
+    pool.get_usage_statistics(stats);
 
-    ASSERT_LE( MemoryCapacity , stats.capacity_bytes );
-    ASSERT_LE( 64u /* default */ , stats.min_block_bytes );
-    ASSERT_LE( stats.min_block_bytes , stats.max_block_bytes );
-    ASSERT_LE( stats.max_block_bytes , stats.superblock_bytes );
-    ASSERT_LE( stats.superblock_bytes , stats.capacity_bytes );
+    ASSERT_LE(MemoryCapacity, stats.capacity_bytes);
+    ASSERT_LE(64u /* default */, stats.min_block_bytes);
+    ASSERT_LE(stats.min_block_bytes, stats.max_block_bytes);
+    ASSERT_LE(stats.max_block_bytes, stats.superblock_bytes);
+    ASSERT_LE(stats.superblock_bytes, stats.capacity_bytes);
   }
 
   {
-    const size_t MemoryCapacity = 10000 ;
-    const size_t MinBlockSize   =    32 ; // power of two is exact
+    const size_t MemoryCapacity = 10000;
+    const size_t MinBlockSize   = 32;  // power of two is exact
 
-    MemPool pool( MemSpace()
-                , MemoryCapacity
-                , MinBlockSize
-                );
+    MemPool pool(MemSpace(), MemoryCapacity, MinBlockSize);
 
-    typename MemPool::usage_statistics stats ;
+    typename MemPool::usage_statistics stats;
 
-    pool.get_usage_statistics( stats );
+    pool.get_usage_statistics(stats);
 
-    ASSERT_LE( MemoryCapacity , stats.capacity_bytes );
-    ASSERT_EQ( MinBlockSize , stats.min_block_bytes );
-    ASSERT_LE( stats.min_block_bytes , stats.max_block_bytes );
-    ASSERT_LE( stats.max_block_bytes , stats.superblock_bytes );
-    ASSERT_LE( stats.superblock_bytes , stats.capacity_bytes );
+    ASSERT_LE(MemoryCapacity, stats.capacity_bytes);
+    ASSERT_EQ(MinBlockSize, stats.min_block_bytes);
+    ASSERT_LE(stats.min_block_bytes, stats.max_block_bytes);
+    ASSERT_LE(stats.max_block_bytes, stats.superblock_bytes);
+    ASSERT_LE(stats.superblock_bytes, stats.capacity_bytes);
   }
 
   {
-    const size_t MemoryCapacity = 32000 ;
-    const size_t MinBlockSize   =    32 ; // power of two is exact
-    const size_t MaxBlockSize   =  1024 ; // power of two is exact
+    const size_t MemoryCapacity = 32000;
+    const size_t MinBlockSize   = 32;    // power of two is exact
+    const size_t MaxBlockSize   = 1024;  // power of two is exact
 
-    MemPool pool( MemSpace()
-                , MemoryCapacity
-                , MinBlockSize
-                , MaxBlockSize
-                );
+    MemPool pool(MemSpace(), MemoryCapacity, MinBlockSize, MaxBlockSize);
 
-    typename MemPool::usage_statistics stats ;
+    typename MemPool::usage_statistics stats;
 
-    pool.get_usage_statistics( stats );
+    pool.get_usage_statistics(stats);
 
-    ASSERT_LE( MemoryCapacity , stats.capacity_bytes );
-    ASSERT_EQ( MinBlockSize , stats.min_block_bytes );
-    ASSERT_EQ( MaxBlockSize , stats.max_block_bytes );
-    ASSERT_LE( stats.max_block_bytes , stats.superblock_bytes );
-    ASSERT_LE( stats.superblock_bytes , stats.capacity_bytes );
+    ASSERT_LE(MemoryCapacity, stats.capacity_bytes);
+    ASSERT_EQ(MinBlockSize, stats.min_block_bytes);
+    ASSERT_EQ(MaxBlockSize, stats.max_block_bytes);
+    ASSERT_LE(stats.max_block_bytes, stats.superblock_bytes);
+    ASSERT_LE(stats.superblock_bytes, stats.capacity_bytes);
   }
 }
 
-template< typename MemSpace = Kokkos::HostSpace >
-void test_host_memory_pool_stats()
-{
-  typedef typename MemSpace::execution_space   Space ;
-  typedef typename Kokkos::MemoryPool< Space > MemPool ;
+template <typename MemSpace = Kokkos::HostSpace>
+void test_host_memory_pool_stats() {
+  typedef typename MemSpace::execution_space Space;
+  typedef typename Kokkos::MemoryPool<Space> MemPool;
 
-  const size_t MemoryCapacity = 32000 ;
-  const size_t MinBlockSize   =    64 ;
-  const size_t MaxBlockSize   =  1024 ;
-  const size_t SuperBlockSize =  4096 ;
+  const size_t MemoryCapacity = 32000;
+  const size_t MinBlockSize   = 64;
+  const size_t MaxBlockSize   = 1024;
+  const size_t SuperBlockSize = 4096;
 
-  MemPool pool( MemSpace()
-              , MemoryCapacity
-              , MinBlockSize
-              , MaxBlockSize
-              , SuperBlockSize
-              );
+  MemPool pool(MemSpace(), MemoryCapacity, MinBlockSize, MaxBlockSize,
+               SuperBlockSize);
 
   {
-    typename MemPool::usage_statistics stats ;
+    typename MemPool::usage_statistics stats;
 
-    pool.get_usage_statistics( stats );
+    pool.get_usage_statistics(stats);
 
-    ASSERT_LE( MemoryCapacity , stats.capacity_bytes );
-    ASSERT_LE( MinBlockSize , stats.min_block_bytes );
-    ASSERT_LE( MaxBlockSize , stats.max_block_bytes );
-    ASSERT_LE( SuperBlockSize , stats.superblock_bytes );
+    ASSERT_LE(MemoryCapacity, stats.capacity_bytes);
+    ASSERT_LE(MinBlockSize, stats.min_block_bytes);
+    ASSERT_LE(MaxBlockSize, stats.max_block_bytes);
+    ASSERT_LE(SuperBlockSize, stats.superblock_bytes);
   }
 
-  void * p0064 = pool.allocate(64);
-  void * p0128 = pool.allocate(128);
-  void * p0256 = pool.allocate(256);
-  void * p1024 = pool.allocate(1024);
+  void* p0064 = pool.allocate(64);
+  void* p0128 = pool.allocate(128);
+  void* p0256 = pool.allocate(256);
+  void* p1024 = pool.allocate(1024);
 
   // Aborts because exceeds max block size:
   // void * p2048 = pool.allocate(2048);
 
-  ASSERT_NE( p0064 , (void*) 0 );
-  ASSERT_NE( p0128 , (void*) 0 );
-  ASSERT_NE( p0256 , (void*) 0 );
-  ASSERT_NE( p1024 , (void*) 0 );
-
-  pool.deallocate( p0064 , 64 );
-  pool.deallocate( p0128 , 128 );
-  pool.deallocate( p0256 , 256 );
-  pool.deallocate( p1024 , 1024 );
+  ASSERT_NE(p0064, (void*)0);
+  ASSERT_NE(p0128, (void*)0);
+  ASSERT_NE(p0256, (void*)0);
+  ASSERT_NE(p1024, (void*)0);
 
+  pool.deallocate(p0064, 64);
+  pool.deallocate(p0128, 128);
+  pool.deallocate(p0256, 256);
+  pool.deallocate(p1024, 1024);
 }
 
 //----------------------------------------------------------------------------
 //----------------------------------------------------------------------------
 
-template< class DeviceType >
+template <class DeviceType>
 struct TestMemoryPool_Functor {
+  typedef Kokkos::View<uintptr_t*, DeviceType> ptrs_type;
+  typedef Kokkos::MemoryPool<DeviceType> pool_type;
 
-  typedef Kokkos::View< uintptr_t * , DeviceType >         ptrs_type ;
-  typedef Kokkos::MemoryPool< DeviceType > pool_type ;
+  pool_type pool;
+  ptrs_type ptrs;
 
-  pool_type pool ;
-  ptrs_type ptrs ;
-
-  TestMemoryPool_Functor( const pool_type & arg_pool , size_t n )
-    : pool( arg_pool )
-    , ptrs( "ptrs" , n )
-    {}
+  TestMemoryPool_Functor(const pool_type& arg_pool, size_t n)
+      : pool(arg_pool), ptrs("ptrs", n) {}
 
   // Specify reduction argument value_type to avoid
   // confusion with tag-dispatch.
 
-  using value_type = long ;
+  using value_type = long;
 
   struct TagAlloc {};
 
   KOKKOS_INLINE_FUNCTION
-  void operator()( TagAlloc , int i , long & update ) const noexcept
-    {
-      unsigned alloc_size = 32 * ( 1 + ( i % 5 ));
-      ptrs(i) = (uintptr_t)  pool.allocate( alloc_size );
-      if ( ptrs(i) ) { ++update ; }
+  void operator()(TagAlloc, int i, long& update) const noexcept {
+    unsigned alloc_size = 32 * (1 + (i % 5));
+    ptrs(i)             = (uintptr_t)pool.allocate(alloc_size);
+    if (ptrs(i)) {
+      ++update;
     }
+  }
 
   struct TagDealloc {};
 
   KOKKOS_INLINE_FUNCTION
-  void operator()( TagDealloc , int i , long & update ) const noexcept
-    {
-      if ( ptrs(i) && ( 0 == i % 3 ) ) {
-        unsigned alloc_size = 32 * ( 1 + ( i % 5 ));
-        pool.deallocate( (void*) ptrs(i) , alloc_size );
-        ptrs(i) = 0 ;
-        ++update ;
-      }
+  void operator()(TagDealloc, int i, long& update) const noexcept {
+    if (ptrs(i) && (0 == i % 3)) {
+      unsigned alloc_size = 32 * (1 + (i % 5));
+      pool.deallocate((void*)ptrs(i), alloc_size);
+      ptrs(i) = 0;
+      ++update;
     }
+  }
 
   struct TagRealloc {};
 
   KOKKOS_INLINE_FUNCTION
-  void operator()( TagRealloc , int i , long & update ) const noexcept
-    {
-      if ( 0 == ptrs(i) ) {
-        unsigned alloc_size = 32 * ( 1 + ( i % 5 ));
-        ptrs(i) = (uintptr_t)  pool.allocate( alloc_size );
-        if ( ptrs(i) ) { ++update ; }
+  void operator()(TagRealloc, int i, long& update) const noexcept {
+    if (0 == ptrs(i)) {
+      unsigned alloc_size = 32 * (1 + (i % 5));
+      ptrs(i)             = (uintptr_t)pool.allocate(alloc_size);
+      if (ptrs(i)) {
+        ++update;
       }
     }
+  }
 
   struct TagMixItUp {};
 
   KOKKOS_INLINE_FUNCTION
-  void operator()( TagMixItUp , int i , long & update ) const noexcept
-    {
-      if ( ptrs(i) && ( 0 == i % 3 ) ) {
+  void operator()(TagMixItUp, int i, long& update) const noexcept {
+    if (ptrs(i) && (0 == i % 3)) {
+      unsigned alloc_size = 32 * (1 + (i % 5));
 
-        unsigned alloc_size = 32 * ( 1 + ( i % 5 ));
+      pool.deallocate((void*)ptrs(i), alloc_size);
 
-        pool.deallocate( (void*) ptrs(i) , alloc_size );
+      ptrs(i) = (uintptr_t)pool.allocate(alloc_size);
 
-        ptrs(i) = (uintptr_t)  pool.allocate( alloc_size );
-
-        if ( ptrs(i) ) { ++update ; }
+      if (ptrs(i)) {
+        ++update;
       }
     }
+  }
 };
 
-template< class PoolType >
-void print_memory_pool_stats
-  ( typename PoolType::usage_statistics const & stats )
-{
+template <class PoolType>
+void print_memory_pool_stats(typename PoolType::usage_statistics const& stats) {
   std::cout << "MemoryPool {" << std::endl
             << "  bytes capacity = " << stats.capacity_bytes << std::endl
             << "  bytes used     = " << stats.consumed_bytes << std::endl
             << "  bytes reserved = " << stats.reserved_bytes << std::endl
-            << "  bytes free     = " << ( stats.capacity_bytes -
-               ( stats.consumed_bytes + stats.reserved_bytes ) ) << std::endl
+            << "  bytes free     = "
+            << (stats.capacity_bytes -
+                (stats.consumed_bytes + stats.reserved_bytes))
+            << std::endl
             << "  block used     = " << stats.consumed_blocks << std::endl
             << "  block reserved = " << stats.reserved_blocks << std::endl
             << "  super used     = " << stats.consumed_superblocks << std::endl
-            << "  super reserved = " << ( stats.capacity_superblocks -
-                                    stats.consumed_superblocks ) << std::endl
-            << "}" << std::endl ;
+            << "  super reserved = "
+            << (stats.capacity_superblocks - stats.consumed_superblocks)
+            << std::endl
+            << "}" << std::endl;
 }
 
-template< class DeviceType >
-void test_memory_pool_v2( const bool print_statistics
-                        , const bool print_superblocks )
-{
-  typedef typename DeviceType::memory_space     memory_space ;
-  typedef typename DeviceType::execution_space  execution_space ;
-  typedef Kokkos::MemoryPool< DeviceType > pool_type ;
-  typedef TestMemoryPool_Functor< DeviceType > functor_type ;
+template <class DeviceType>
+void test_memory_pool_v2(const bool print_statistics,
+                         const bool print_superblocks) {
+  typedef typename DeviceType::memory_space memory_space;
+  typedef typename DeviceType::execution_space execution_space;
+  typedef Kokkos::MemoryPool<DeviceType> pool_type;
+  typedef TestMemoryPool_Functor<DeviceType> functor_type;
 
-  typedef typename functor_type::TagAlloc   TagAlloc ;
-  typedef typename functor_type::TagDealloc TagDealloc ;
-  typedef typename functor_type::TagRealloc TagRealloc ;
-  typedef typename functor_type::TagMixItUp TagMixItUp ;
+  typedef typename functor_type::TagAlloc TagAlloc;
+  typedef typename functor_type::TagDealloc TagDealloc;
+  typedef typename functor_type::TagRealloc TagRealloc;
+  typedef typename functor_type::TagMixItUp TagMixItUp;
 
-  const size_t    total_alloc_size = 10000000 ;
-  const unsigned  min_block_size   = 64 ;
-  const unsigned  max_block_size   = 256 ;
-  const long      nfill            = 70000 ;
+  const size_t total_alloc_size = 10000000;
+  const unsigned min_block_size = 64;
+  const unsigned max_block_size = 256;
+  const long nfill              = 70000;
 
-  for ( uint32_t k = 0 , min_superblock_size = 10000 ;
-        k < 3 ; ++k , min_superblock_size *= 10 ) {
+  for (uint32_t k = 0, min_superblock_size = 10000; k < 3;
+       ++k, min_superblock_size *= 10) {
+    typename pool_type::usage_statistics stats;
 
-    typename pool_type::usage_statistics stats ;
+    pool_type pool(memory_space(), total_alloc_size, min_block_size,
+                   max_block_size, min_superblock_size);
 
-    pool_type pool( memory_space()
-                  , total_alloc_size
-                  , min_block_size
-                  , max_block_size
-                  , min_superblock_size );
+    functor_type functor(pool, nfill);
 
-    functor_type functor(pool,nfill);
+    long result = 0;
+    long ndel   = 0;
 
-    long result = 0 ;
-    long ndel  = 0 ;
+    Kokkos::parallel_reduce(
+        Kokkos::RangePolicy<execution_space, TagAlloc>(0, nfill), functor,
+        result);
 
-    Kokkos::parallel_reduce
-      ( Kokkos::RangePolicy< execution_space , TagAlloc >(0,nfill)
-      , functor
-      , result
-      );
+    pool.get_usage_statistics(stats);
 
-    pool.get_usage_statistics( stats );
+    const int fill_error =
+        (nfill != result) || (nfill != long(stats.consumed_blocks));
 
-    const int fill_error = ( nfill != result ) ||
-                           ( nfill != long(stats.consumed_blocks) );
+    if (fill_error || print_statistics)
+      print_memory_pool_stats<pool_type>(stats);
+    if (fill_error || print_superblocks) pool.print_state(std::cout);
 
-    if ( fill_error || print_statistics ) print_memory_pool_stats< pool_type >( stats );
-    if ( fill_error || print_superblocks ) pool.print_state( std::cout );
+    ASSERT_EQ(nfill, result);
+    ASSERT_EQ(nfill, long(stats.consumed_blocks));
 
-    ASSERT_EQ( nfill , result );
-    ASSERT_EQ( nfill , long(stats.consumed_blocks) );
+    Kokkos::parallel_reduce(
+        Kokkos::RangePolicy<execution_space, TagDealloc>(0, nfill), functor,
+        ndel);
 
-    Kokkos::parallel_reduce
-      ( Kokkos::RangePolicy< execution_space , TagDealloc >(0,nfill)
-      , functor
-      , ndel
-      );
+    pool.get_usage_statistics(stats);
 
-    pool.get_usage_statistics( stats );
+    const int del_error = (nfill - ndel) != long(stats.consumed_blocks);
 
-    const int del_error = ( nfill - ndel ) != long(stats.consumed_blocks);
+    if (del_error || print_statistics)
+      print_memory_pool_stats<pool_type>(stats);
+    if (del_error || print_superblocks) pool.print_state(std::cout);
 
-    if ( del_error || print_statistics ) print_memory_pool_stats< pool_type >( stats );
-    if ( del_error || print_superblocks ) pool.print_state( std::cout );
+    ASSERT_EQ((nfill - ndel), long(stats.consumed_blocks));
 
-    ASSERT_EQ( ( nfill - ndel ) , long(stats.consumed_blocks) );
+    Kokkos::parallel_reduce(
+        Kokkos::RangePolicy<execution_space, TagRealloc>(0, nfill), functor,
+        result);
 
-    Kokkos::parallel_reduce
-      ( Kokkos::RangePolicy< execution_space , TagRealloc >(0,nfill)
-      , functor
-      , result
-      );
+    pool.get_usage_statistics(stats);
 
-    pool.get_usage_statistics( stats );
+    const int refill_error =
+        (ndel != result) || (nfill != long(stats.consumed_blocks));
 
-    const int refill_error = ( ndel != result ) ||
-                             ( nfill != long(stats.consumed_blocks) );
+    if (refill_error || print_statistics)
+      print_memory_pool_stats<pool_type>(stats);
+    if (refill_error || print_superblocks) pool.print_state(std::cout);
 
-    if ( refill_error || print_statistics ) print_memory_pool_stats< pool_type >( stats );
-    if ( refill_error || print_superblocks ) pool.print_state( std::cout );
+    ASSERT_EQ(ndel, result);
+    ASSERT_EQ(nfill, long(stats.consumed_blocks));
 
-    ASSERT_EQ( ndel , result );
-    ASSERT_EQ( nfill , long(stats.consumed_blocks) );
+    Kokkos::parallel_reduce(
+        Kokkos::RangePolicy<execution_space, TagMixItUp>(0, nfill), functor,
+        result);
 
-    Kokkos::parallel_reduce
-      ( Kokkos::RangePolicy< execution_space , TagMixItUp >(0,nfill)
-      , functor
-      , result
-      );
+    pool.get_usage_statistics(stats);
 
-    pool.get_usage_statistics( stats );
+    const int mix_error =
+        (ndel != result) || (nfill != long(stats.consumed_blocks));
 
-    const int mix_error = ( ndel != result ) ||
-                          ( nfill != long(stats.consumed_blocks) );
+    if (mix_error || print_statistics)
+      print_memory_pool_stats<pool_type>(stats);
+    if (mix_error || print_superblocks) pool.print_state(std::cout);
 
-    if ( mix_error || print_statistics ) print_memory_pool_stats< pool_type >( stats );
-    if ( mix_error || print_superblocks ) pool.print_state( std::cout );
-
-    ASSERT_EQ( ndel , result );
-    ASSERT_EQ( nfill , long(stats.consumed_blocks) );
+    ASSERT_EQ(ndel, result);
+    ASSERT_EQ(nfill, long(stats.consumed_blocks));
   }
 }
 
 //----------------------------------------------------------------------------
 //----------------------------------------------------------------------------
 
-template< class DeviceType >
+template <class DeviceType>
 struct TestMemoryPoolCorners {
+  typedef Kokkos::View<uintptr_t*, DeviceType> ptrs_type;
+  typedef Kokkos::MemoryPool<DeviceType> pool_type;
 
-  typedef Kokkos::View< uintptr_t * , DeviceType >  ptrs_type ;
-  typedef Kokkos::MemoryPool< DeviceType >          pool_type ;
+  pool_type pool;
+  ptrs_type ptrs;
+  uint32_t size;
+  uint32_t stride;
 
-  pool_type pool ;
-  ptrs_type ptrs ;
-  uint32_t  size ;
-  uint32_t  stride ;
-
-  TestMemoryPoolCorners( const pool_type & arg_pool
-                       , const ptrs_type & arg_ptrs
-                       , const uint32_t arg_base
-                       , const uint32_t arg_stride
-                       )
-    : pool( arg_pool )
-    , ptrs( arg_ptrs )
-    , size( arg_base )
-    , stride( arg_stride )
-    {}
+  TestMemoryPoolCorners(const pool_type& arg_pool, const ptrs_type& arg_ptrs,
+                        const uint32_t arg_base, const uint32_t arg_stride)
+      : pool(arg_pool), ptrs(arg_ptrs), size(arg_base), stride(arg_stride) {}
 
   // Specify reduction argument value_type to
   // avoid confusion with tag-dispatch.
 
-  using value_type = long ;
+  using value_type = long;
 
   KOKKOS_INLINE_FUNCTION
-  void operator()( int i , long & err ) const noexcept
-    {
-      unsigned alloc_size = size << ( i % stride );
-      if ( 0 == ptrs(i) ) {
-        ptrs(i) = (uintptr_t) pool.allocate( alloc_size );
-        if ( ptrs(i) && ! alloc_size ) { ++err ; }
+  void operator()(int i, long& err) const noexcept {
+    unsigned alloc_size = size << (i % stride);
+    if (0 == ptrs(i)) {
+      ptrs(i) = (uintptr_t)pool.allocate(alloc_size);
+      if (ptrs(i) && !alloc_size) {
+        ++err;
       }
     }
+  }
 
   struct TagDealloc {};
 
   KOKKOS_INLINE_FUNCTION
-  void operator()( int i ) const noexcept
-    {
-      unsigned alloc_size = size << ( i % stride );
-      if ( ptrs(i) ) { pool.deallocate( (void*) ptrs(i) , alloc_size ); }
-      ptrs(i) = 0 ;
+  void operator()(int i) const noexcept {
+    unsigned alloc_size = size << (i % stride);
+    if (ptrs(i)) {
+      pool.deallocate((void*)ptrs(i), alloc_size);
     }
+    ptrs(i) = 0;
+  }
 };
 
-template< class DeviceType >
-void test_memory_pool_corners( const bool print_statistics
-                             , const bool print_superblocks )
-{
-  typedef typename DeviceType::memory_space     memory_space ;
-  typedef typename DeviceType::execution_space  execution_space ;
-  typedef Kokkos::MemoryPool< DeviceType >      pool_type ;
-  typedef TestMemoryPoolCorners< DeviceType >   functor_type ;
-  typedef typename functor_type::ptrs_type      ptrs_type ;
+template <class DeviceType>
+void test_memory_pool_corners(const bool print_statistics,
+                              const bool print_superblocks) {
+  typedef typename DeviceType::memory_space memory_space;
+  typedef typename DeviceType::execution_space execution_space;
+  typedef Kokkos::MemoryPool<DeviceType> pool_type;
+  typedef TestMemoryPoolCorners<DeviceType> functor_type;
+  typedef typename functor_type::ptrs_type ptrs_type;
 
   {
-    // superblock size 1 << 14 
-    const size_t  min_superblock_size = 1u << 14 ;
+    // superblock size 1 << 14
+    const size_t min_superblock_size = 1u << 14;
 
     // four superblocks
-    const size_t total_alloc_size = min_superblock_size * 4 ;
+    const size_t total_alloc_size = min_superblock_size * 4;
 
     // block sizes  {  64 , 128 , 256 , 512 }
     // block counts { 256 , 128 ,  64 ,  32 }
-    const unsigned  min_block_size  = 64 ;
-    const unsigned  max_block_size  = 512 ;
-    const unsigned  num_blocks      = 480 ;
+    const unsigned min_block_size = 64;
+    const unsigned max_block_size = 512;
+    const unsigned num_blocks     = 480;
 
-    pool_type pool( memory_space()
-                  , total_alloc_size
-                  , min_block_size
-                  , max_block_size
-                  , min_superblock_size );
+    pool_type pool(memory_space(), total_alloc_size, min_block_size,
+                   max_block_size, min_superblock_size);
 
     // Allocate one block from each superblock to lock that
     // superblock into the block size.
 
-    ptrs_type ptrs("ptrs",num_blocks);
+    ptrs_type ptrs("ptrs", num_blocks);
 
-    long err = 0 ;
+    long err = 0;
 
-    Kokkos::parallel_reduce
-      ( Kokkos::RangePolicy< execution_space >(0,4)
-      , functor_type( pool , ptrs , 64 , 4 )
-      , err
-      );
+    Kokkos::parallel_reduce(Kokkos::RangePolicy<execution_space>(0, 4),
+                            functor_type(pool, ptrs, 64, 4), err);
 
-    if ( print_statistics || err ) {
+    if (print_statistics || err) {
+      typename pool_type::usage_statistics stats;
 
-      typename pool_type::usage_statistics stats ;
+      pool.get_usage_statistics(stats);
 
-      pool.get_usage_statistics( stats );
-
-      print_memory_pool_stats< pool_type >( stats );
+      print_memory_pool_stats<pool_type>(stats);
     }
 
-    if ( print_superblocks || err ) {
-      pool.print_state( std::cout );
+    if (print_superblocks || err) {
+      pool.print_state(std::cout);
     }
 
     // Now fill remaining allocations with small size
 
-    Kokkos::parallel_reduce
-      ( Kokkos::RangePolicy< execution_space >(0,num_blocks)
-      , functor_type( pool , ptrs , 64 , 1 )
-      , err
-      );
+    Kokkos::parallel_reduce(Kokkos::RangePolicy<execution_space>(0, num_blocks),
+                            functor_type(pool, ptrs, 64, 1), err);
 
-    if ( print_statistics || err ) {
+    if (print_statistics || err) {
+      typename pool_type::usage_statistics stats;
 
-      typename pool_type::usage_statistics stats ;
+      pool.get_usage_statistics(stats);
 
-      pool.get_usage_statistics( stats );
-
-      print_memory_pool_stats< pool_type >( stats );
+      print_memory_pool_stats<pool_type>(stats);
     }
 
-    if ( print_superblocks || err ) {
-      pool.print_state( std::cout );
+    if (print_superblocks || err) {
+      pool.print_state(std::cout);
     }
   }
 }
@@ -521,117 +473,106 @@ void test_memory_pool_corners( const bool print_statistics
 //----------------------------------------------------------------------------
 //----------------------------------------------------------------------------
 
-template< class DeviceType , class Enable = void >
-struct TestMemoryPoolHuge
-{
+template <class DeviceType, class Enable = void>
+struct TestMemoryPoolHuge {
   TestMemoryPoolHuge() {}
 
   enum : size_t { num_superblock = 0 };
 
-  using value_type = long ;
+  using value_type = long;
 
   KOKKOS_INLINE_FUNCTION
-  void operator()( int i , long & err ) const noexcept {}
+  void operator()(int i, long& err) const noexcept {}
 
   KOKKOS_INLINE_FUNCTION
-  void operator()( int i ) const noexcept {}
+  void operator()(int i) const noexcept {}
 };
 
-template< class DeviceType >
-struct TestMemoryPoolHuge< DeviceType
-                         , typename std::enable_if<
-                           std::is_same< Kokkos::HostSpace
-                                       , typename DeviceType::memory_space >
-                             ::value >::type
-                         >
-{
-  typedef Kokkos::View< uintptr_t * , DeviceType >  ptrs_type ;
-  typedef Kokkos::MemoryPool< DeviceType >          pool_type ;
-  typedef typename DeviceType::memory_space         memory_space ;
+template <class DeviceType>
+struct TestMemoryPoolHuge<
+    DeviceType,
+    typename std::enable_if<std::is_same<
+        Kokkos::HostSpace, typename DeviceType::memory_space>::value>::type> {
+  typedef Kokkos::View<uintptr_t*, DeviceType> ptrs_type;
+  typedef Kokkos::MemoryPool<DeviceType> pool_type;
+  typedef typename DeviceType::memory_space memory_space;
 
-  pool_type pool ;
-  ptrs_type ptrs ;
+  pool_type pool;
+  ptrs_type ptrs;
 
-  enum : size_t { min_block_size = 512
-                , max_block_size = 1lu << 31
-                , min_superblock_size = max_block_size
-                , num_superblock = 4 
-                , total_alloc_size = num_superblock * max_block_size };
+  enum : size_t {
+    min_block_size      = 512,
+    max_block_size      = 1lu << 31,
+    min_superblock_size = max_block_size,
+    num_superblock      = 4,
+    total_alloc_size    = num_superblock * max_block_size
+  };
 
   TestMemoryPoolHuge()
-    : pool( memory_space()
-           , total_alloc_size
-           , min_block_size
-           , max_block_size
-           , min_superblock_size )
-    , ptrs( "ptrs" , num_superblock )
-    {}
+      : pool(memory_space(), total_alloc_size, min_block_size, max_block_size,
+             min_superblock_size),
+        ptrs("ptrs", num_superblock) {}
 
   // Specify reduction argument value_type to
   // avoid confusion with tag-dispatch.
 
-  using value_type = long ;
+  using value_type = long;
 
-  void operator()( int i , long & err ) const noexcept
-    {
-      if ( i < int(num_superblock) ) {
-        ptrs(i) = (uintptr_t) pool.allocate( max_block_size );
+  void operator()(int i, long& err) const noexcept {
+    if (i < int(num_superblock)) {
+      ptrs(i) = (uintptr_t)pool.allocate(max_block_size);
 #if 0
         printf("TestMemoryPoolHuge size(0x%lx) ptr(0x%lx)\n"
               , max_block_size
               , ptrs(i) );
 #endif
-        if ( ! ptrs(i) ) {
-          Kokkos::abort("TestMemoryPoolHuge");
-          ++err ;
-        }
+      if (!ptrs(i)) {
+        Kokkos::abort("TestMemoryPoolHuge");
+        ++err;
       }
     }
+  }
 
-  void operator()( int i ) const noexcept
-    {
-      if ( i < int(num_superblock) ) {
-        pool.deallocate( (void*) ptrs(i) , max_block_size );
-        ptrs(i) = 0 ;
-      }
+  void operator()(int i) const noexcept {
+    if (i < int(num_superblock)) {
+      pool.deallocate((void*)ptrs(i), max_block_size);
+      ptrs(i) = 0;
     }
+  }
 };
 
-template< class DeviceType >
-void test_memory_pool_huge()
-{
-  typedef typename DeviceType::execution_space  execution_space ;
-  typedef TestMemoryPoolHuge< DeviceType >      functor_type ;
-  typedef Kokkos::RangePolicy< execution_space > policy_type ;
+template <class DeviceType>
+void test_memory_pool_huge() {
+  typedef typename DeviceType::execution_space execution_space;
+  typedef TestMemoryPoolHuge<DeviceType> functor_type;
+  typedef Kokkos::RangePolicy<execution_space> policy_type;
 
-  functor_type f ;
-  policy_type policy( 0 , functor_type::num_superblock );
+  functor_type f;
+  policy_type policy(0, functor_type::num_superblock);
 
-  long err = 0 ;
+  long err = 0;
 
-  Kokkos::parallel_reduce( policy , f , err );
-  Kokkos::parallel_for( policy , f );
+  Kokkos::parallel_reduce(policy, f, err);
+  Kokkos::parallel_for(policy, f);
 }
 
 //----------------------------------------------------------------------------
 //----------------------------------------------------------------------------
 
-} // namespace TestMemoryPool
+}  // namespace TestMemoryPool
 
 namespace Test {
 
-TEST_F( TEST_CATEGORY, memory_pool )
-{
+TEST(TEST_CATEGORY, memory_pool) {
   TestMemoryPool::test_host_memory_pool_defaults<>();
   TestMemoryPool::test_host_memory_pool_stats<>();
-  TestMemoryPool::test_memory_pool_v2< TEST_EXECSPACE >(false,false);
-  TestMemoryPool::test_memory_pool_corners< TEST_EXECSPACE >(false,false);
+  TestMemoryPool::test_memory_pool_v2<TEST_EXECSPACE>(false, false);
+  TestMemoryPool::test_memory_pool_corners<TEST_EXECSPACE>(false, false);
 #ifdef KOKKOS_ENABLE_LARGE_MEM_TESTS
-  TestMemoryPool::test_memory_pool_huge< TEST_EXECSPACE >();
+  TestMemoryPool::test_memory_pool_huge<TEST_EXECSPACE>();
 #endif
 }
 
-}
+}  // namespace Test
 
 #endif
-
diff --git a/lib/kokkos/core/unit_test/TestPolicyConstruction.hpp b/lib/kokkos/core/unit_test/TestPolicyConstruction.hpp
index be744a7712..a5ec173205 100644
--- a/lib/kokkos/core/unit_test/TestPolicyConstruction.hpp
+++ b/lib/kokkos/core/unit_test/TestPolicyConstruction.hpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -51,679 +52,833 @@
 namespace Test {
 struct SomeTag {};
 
-template< class ExecutionSpace >
+template <class ExecutionSpace>
 class TestRangePolicyConstruction {
-public:
+ public:
   TestRangePolicyConstruction() {
     test_compile_time_parameters();
     test_runtime_parameters();
   }
 
-private:
+ private:
   void test_compile_time_parameters() {
     {
       Kokkos::Impl::expand_variadic();
-      Kokkos::Impl::expand_variadic( 1, 2, 3 );
+      Kokkos::Impl::expand_variadic(1, 2, 3);
     }
 
     {
       typedef Kokkos::RangePolicy<> policy_t;
-      typedef typename policy_t::execution_space  execution_space;
-      typedef typename policy_t::index_type       index_type;
-      typedef typename policy_t::schedule_type    schedule_type;
-      typedef typename policy_t::work_tag         work_tag;
+      typedef typename policy_t::execution_space execution_space;
+      typedef typename policy_t::index_type index_type;
+      typedef typename policy_t::schedule_type schedule_type;
+      typedef typename policy_t::work_tag work_tag;
 
-      ASSERT_TRUE( ( std::is_same< execution_space, Kokkos::DefaultExecutionSpace       >::value ) );
-      ASSERT_TRUE( ( std::is_same< index_type,      typename execution_space::size_type >::value ) );
-      ASSERT_TRUE( ( std::is_same< schedule_type,   Kokkos::Schedule<Kokkos::Static>    >::value ) );
-      ASSERT_TRUE( ( std::is_same< work_tag,        void                                >::value ) );
+      ASSERT_TRUE((
+          std::is_same<execution_space, Kokkos::DefaultExecutionSpace>::value));
+      ASSERT_TRUE((std::is_same<index_type,
+                                typename execution_space::size_type>::value));
+      ASSERT_TRUE((std::is_same<schedule_type,
+                                Kokkos::Schedule<Kokkos::Static> >::value));
+      ASSERT_TRUE((std::is_same<work_tag, void>::value));
     }
 
     {
-      typedef Kokkos::RangePolicy< ExecutionSpace > policy_t;
-      typedef typename policy_t::execution_space  execution_space;
-      typedef typename policy_t::index_type       index_type;
-      typedef typename policy_t::schedule_type    schedule_type;
-      typedef typename policy_t::work_tag         work_tag;
+      typedef Kokkos::RangePolicy<ExecutionSpace> policy_t;
+      typedef typename policy_t::execution_space execution_space;
+      typedef typename policy_t::index_type index_type;
+      typedef typename policy_t::schedule_type schedule_type;
+      typedef typename policy_t::work_tag work_tag;
 
-      ASSERT_TRUE( ( std::is_same< execution_space, ExecutionSpace                      >::value ) );
-      ASSERT_TRUE( ( std::is_same< index_type,      typename execution_space::size_type >::value ) );
-      ASSERT_TRUE( ( std::is_same< schedule_type,   Kokkos::Schedule<Kokkos::Static>    >::value ) );
-      ASSERT_TRUE( ( std::is_same< work_tag,        void                                >::value ) );
+      ASSERT_TRUE((std::is_same<execution_space, ExecutionSpace>::value));
+      ASSERT_TRUE((std::is_same<index_type,
+                                typename execution_space::size_type>::value));
+      ASSERT_TRUE((std::is_same<schedule_type,
+                                Kokkos::Schedule<Kokkos::Static> >::value));
+      ASSERT_TRUE((std::is_same<work_tag, void>::value));
     }
 
     {
-      typedef Kokkos::RangePolicy< ExecutionSpace, Kokkos::Schedule<Kokkos::Dynamic> > policy_t;
-      typedef typename policy_t::execution_space  execution_space;
-      typedef typename policy_t::index_type       index_type;
-      typedef typename policy_t::schedule_type    schedule_type;
-      typedef typename policy_t::work_tag         work_tag;
+      typedef Kokkos::RangePolicy<ExecutionSpace,
+                                  Kokkos::Schedule<Kokkos::Dynamic> >
+          policy_t;
+      typedef typename policy_t::execution_space execution_space;
+      typedef typename policy_t::index_type index_type;
+      typedef typename policy_t::schedule_type schedule_type;
+      typedef typename policy_t::work_tag work_tag;
 
-      ASSERT_TRUE( ( std::is_same< execution_space, ExecutionSpace                      >::value ) );
-      ASSERT_TRUE( ( std::is_same< index_type,      typename execution_space::size_type >::value ) );
-      ASSERT_TRUE( ( std::is_same< schedule_type,   Kokkos::Schedule<Kokkos::Dynamic>   >::value ) );
-      ASSERT_TRUE( ( std::is_same< work_tag,        void                                >::value ) );
+      ASSERT_TRUE((std::is_same<execution_space, ExecutionSpace>::value));
+      ASSERT_TRUE((std::is_same<index_type,
+                                typename execution_space::size_type>::value));
+      ASSERT_TRUE((std::is_same<schedule_type,
+                                Kokkos::Schedule<Kokkos::Dynamic> >::value));
+      ASSERT_TRUE((std::is_same<work_tag, void>::value));
     }
 
     {
-      typedef Kokkos::RangePolicy< ExecutionSpace, Kokkos::Schedule<Kokkos::Dynamic>, Kokkos::IndexType<long> > policy_t;
-      typedef typename policy_t::execution_space  execution_space;
-      typedef typename policy_t::index_type       index_type;
-      typedef typename policy_t::schedule_type    schedule_type;
-      typedef typename policy_t::work_tag         work_tag;
+      typedef Kokkos::RangePolicy<ExecutionSpace,
+                                  Kokkos::Schedule<Kokkos::Dynamic>,
+                                  Kokkos::IndexType<long> >
+          policy_t;
+      typedef typename policy_t::execution_space execution_space;
+      typedef typename policy_t::index_type index_type;
+      typedef typename policy_t::schedule_type schedule_type;
+      typedef typename policy_t::work_tag work_tag;
 
-      ASSERT_TRUE( ( std::is_same< execution_space, ExecutionSpace                      >::value ) );
-      ASSERT_TRUE( ( std::is_same< index_type,      long                                >::value ) );
-      ASSERT_TRUE( ( std::is_same< schedule_type,   Kokkos::Schedule<Kokkos::Dynamic>   >::value ) );
-      ASSERT_TRUE( ( std::is_same< work_tag,        void                                >::value ) );
+      ASSERT_TRUE((std::is_same<execution_space, ExecutionSpace>::value));
+      ASSERT_TRUE((std::is_same<index_type, long>::value));
+      ASSERT_TRUE((std::is_same<schedule_type,
+                                Kokkos::Schedule<Kokkos::Dynamic> >::value));
+      ASSERT_TRUE((std::is_same<work_tag, void>::value));
     }
 
     {
-      typedef Kokkos::RangePolicy< Kokkos::IndexType<long>, ExecutionSpace, Kokkos::Schedule<Kokkos::Dynamic> > policy_t;
-      typedef typename policy_t::execution_space  execution_space;
-      typedef typename policy_t::index_type       index_type;
-      typedef typename policy_t::schedule_type    schedule_type;
-      typedef typename policy_t::work_tag         work_tag;
+      typedef Kokkos::RangePolicy<Kokkos::IndexType<long>, ExecutionSpace,
+                                  Kokkos::Schedule<Kokkos::Dynamic> >
+          policy_t;
+      typedef typename policy_t::execution_space execution_space;
+      typedef typename policy_t::index_type index_type;
+      typedef typename policy_t::schedule_type schedule_type;
+      typedef typename policy_t::work_tag work_tag;
 
-      ASSERT_TRUE( ( std::is_same< execution_space, ExecutionSpace                      >::value ) );
-      ASSERT_TRUE( ( std::is_same< index_type,      long                                >::value ) );
-      ASSERT_TRUE( ( std::is_same< schedule_type,   Kokkos::Schedule<Kokkos::Dynamic>   >::value ) );
-      ASSERT_TRUE( ( std::is_same< work_tag,        void                                >::value ) );
+      ASSERT_TRUE((std::is_same<execution_space, ExecutionSpace>::value));
+      ASSERT_TRUE((std::is_same<index_type, long>::value));
+      ASSERT_TRUE((std::is_same<schedule_type,
+                                Kokkos::Schedule<Kokkos::Dynamic> >::value));
+      ASSERT_TRUE((std::is_same<work_tag, void>::value));
     }
 
     {
-      typedef Kokkos::RangePolicy< ExecutionSpace, Kokkos::Schedule<Kokkos::Dynamic>, Kokkos::IndexType<long>, SomeTag > policy_t;
-      typedef typename policy_t::execution_space  execution_space;
-      typedef typename policy_t::index_type       index_type;
-      typedef typename policy_t::schedule_type    schedule_type;
-      typedef typename policy_t::work_tag         work_tag;
+      typedef Kokkos::RangePolicy<ExecutionSpace,
+                                  Kokkos::Schedule<Kokkos::Dynamic>,
+                                  Kokkos::IndexType<long>, SomeTag>
+          policy_t;
+      typedef typename policy_t::execution_space execution_space;
+      typedef typename policy_t::index_type index_type;
+      typedef typename policy_t::schedule_type schedule_type;
+      typedef typename policy_t::work_tag work_tag;
 
-      ASSERT_TRUE( ( std::is_same< execution_space, ExecutionSpace                      >::value ) );
-      ASSERT_TRUE( ( std::is_same< index_type,      long                                >::value ) );
-      ASSERT_TRUE( ( std::is_same< schedule_type,   Kokkos::Schedule<Kokkos::Dynamic>   >::value ) );
-      ASSERT_TRUE( ( std::is_same< work_tag,        SomeTag                             >::value ) );
+      ASSERT_TRUE((std::is_same<execution_space, ExecutionSpace>::value));
+      ASSERT_TRUE((std::is_same<index_type, long>::value));
+      ASSERT_TRUE((std::is_same<schedule_type,
+                                Kokkos::Schedule<Kokkos::Dynamic> >::value));
+      ASSERT_TRUE((std::is_same<work_tag, SomeTag>::value));
     }
 
     {
-      typedef Kokkos::RangePolicy< Kokkos::Schedule<Kokkos::Dynamic>, ExecutionSpace, Kokkos::IndexType<long>, SomeTag > policy_t;
-      typedef typename policy_t::execution_space  execution_space;
-      typedef typename policy_t::index_type       index_type;
-      typedef typename policy_t::schedule_type    schedule_type;
-      typedef typename policy_t::work_tag         work_tag;
+      typedef Kokkos::RangePolicy<Kokkos::Schedule<Kokkos::Dynamic>,
+                                  ExecutionSpace, Kokkos::IndexType<long>,
+                                  SomeTag>
+          policy_t;
+      typedef typename policy_t::execution_space execution_space;
+      typedef typename policy_t::index_type index_type;
+      typedef typename policy_t::schedule_type schedule_type;
+      typedef typename policy_t::work_tag work_tag;
 
-      ASSERT_TRUE( ( std::is_same< execution_space, ExecutionSpace                      >::value ) );
-      ASSERT_TRUE( ( std::is_same< index_type,      long                                >::value ) );
-      ASSERT_TRUE( ( std::is_same< schedule_type,   Kokkos::Schedule<Kokkos::Dynamic>   >::value ) );
-      ASSERT_TRUE( ( std::is_same< work_tag,        SomeTag                             >::value ) );
+      ASSERT_TRUE((std::is_same<execution_space, ExecutionSpace>::value));
+      ASSERT_TRUE((std::is_same<index_type, long>::value));
+      ASSERT_TRUE((std::is_same<schedule_type,
+                                Kokkos::Schedule<Kokkos::Dynamic> >::value));
+      ASSERT_TRUE((std::is_same<work_tag, SomeTag>::value));
     }
 
     {
-      typedef Kokkos::RangePolicy< SomeTag, Kokkos::Schedule<Kokkos::Dynamic>, Kokkos::IndexType<long>, ExecutionSpace > policy_t;
-      typedef typename policy_t::execution_space  execution_space;
-      typedef typename policy_t::index_type       index_type;
-      typedef typename policy_t::schedule_type    schedule_type;
-      typedef typename policy_t::work_tag         work_tag;
+      typedef Kokkos::RangePolicy<SomeTag, Kokkos::Schedule<Kokkos::Dynamic>,
+                                  Kokkos::IndexType<long>, ExecutionSpace>
+          policy_t;
+      typedef typename policy_t::execution_space execution_space;
+      typedef typename policy_t::index_type index_type;
+      typedef typename policy_t::schedule_type schedule_type;
+      typedef typename policy_t::work_tag work_tag;
 
-      ASSERT_TRUE( ( std::is_same< execution_space, ExecutionSpace                      >::value ) );
-      ASSERT_TRUE( ( std::is_same< index_type,      long                                >::value ) );
-      ASSERT_TRUE( ( std::is_same< schedule_type,   Kokkos::Schedule<Kokkos::Dynamic>   >::value ) );
-      ASSERT_TRUE( ( std::is_same< work_tag,        SomeTag                             >::value ) );
+      ASSERT_TRUE((std::is_same<execution_space, ExecutionSpace>::value));
+      ASSERT_TRUE((std::is_same<index_type, long>::value));
+      ASSERT_TRUE((std::is_same<schedule_type,
+                                Kokkos::Schedule<Kokkos::Dynamic> >::value));
+      ASSERT_TRUE((std::is_same<work_tag, SomeTag>::value));
     }
 
     {
-      typedef Kokkos::RangePolicy< Kokkos::Schedule<Kokkos::Dynamic> > policy_t;
-      typedef typename policy_t::execution_space  execution_space;
-      typedef typename policy_t::index_type       index_type;
-      typedef typename policy_t::schedule_type    schedule_type;
-      typedef typename policy_t::work_tag         work_tag;
+      typedef Kokkos::RangePolicy<Kokkos::Schedule<Kokkos::Dynamic> > policy_t;
+      typedef typename policy_t::execution_space execution_space;
+      typedef typename policy_t::index_type index_type;
+      typedef typename policy_t::schedule_type schedule_type;
+      typedef typename policy_t::work_tag work_tag;
 
-      ASSERT_TRUE( ( std::is_same< execution_space, Kokkos::DefaultExecutionSpace       >::value ) );
-      ASSERT_TRUE( ( std::is_same< index_type,      typename execution_space::size_type >::value ) );
-      ASSERT_TRUE( ( std::is_same< schedule_type,   Kokkos::Schedule<Kokkos::Dynamic>   >::value ) );
-      ASSERT_TRUE( ( std::is_same< work_tag,        void                                >::value ) );
+      ASSERT_TRUE((
+          std::is_same<execution_space, Kokkos::DefaultExecutionSpace>::value));
+      ASSERT_TRUE((std::is_same<index_type,
+                                typename execution_space::size_type>::value));
+      ASSERT_TRUE((std::is_same<schedule_type,
+                                Kokkos::Schedule<Kokkos::Dynamic> >::value));
+      ASSERT_TRUE((std::is_same<work_tag, void>::value));
     }
 
     {
-      typedef Kokkos::RangePolicy< Kokkos::Schedule<Kokkos::Dynamic>, Kokkos::IndexType<long> > policy_t;
-      typedef typename policy_t::execution_space  execution_space;
-      typedef typename policy_t::index_type       index_type;
-      typedef typename policy_t::schedule_type    schedule_type;
-      typedef typename policy_t::work_tag         work_tag;
+      typedef Kokkos::RangePolicy<Kokkos::Schedule<Kokkos::Dynamic>,
+                                  Kokkos::IndexType<long> >
+          policy_t;
+      typedef typename policy_t::execution_space execution_space;
+      typedef typename policy_t::index_type index_type;
+      typedef typename policy_t::schedule_type schedule_type;
+      typedef typename policy_t::work_tag work_tag;
 
-      ASSERT_TRUE( ( std::is_same< execution_space, Kokkos::DefaultExecutionSpace       >::value ) );
-      ASSERT_TRUE( ( std::is_same< index_type,      long                                >::value ) );
-      ASSERT_TRUE( ( std::is_same< schedule_type,   Kokkos::Schedule<Kokkos::Dynamic>   >::value ) );
-      ASSERT_TRUE( ( std::is_same< work_tag,        void                                >::value ) );
+      ASSERT_TRUE((
+          std::is_same<execution_space, Kokkos::DefaultExecutionSpace>::value));
+      ASSERT_TRUE((std::is_same<index_type, long>::value));
+      ASSERT_TRUE((std::is_same<schedule_type,
+                                Kokkos::Schedule<Kokkos::Dynamic> >::value));
+      ASSERT_TRUE((std::is_same<work_tag, void>::value));
     }
 
     {
-      typedef Kokkos::RangePolicy< Kokkos::IndexType<long>, Kokkos::Schedule<Kokkos::Dynamic> > policy_t;
-      typedef typename policy_t::execution_space  execution_space;
-      typedef typename policy_t::index_type       index_type;
-      typedef typename policy_t::schedule_type    schedule_type;
-      typedef typename policy_t::work_tag         work_tag;
+      typedef Kokkos::RangePolicy<Kokkos::IndexType<long>,
+                                  Kokkos::Schedule<Kokkos::Dynamic> >
+          policy_t;
+      typedef typename policy_t::execution_space execution_space;
+      typedef typename policy_t::index_type index_type;
+      typedef typename policy_t::schedule_type schedule_type;
+      typedef typename policy_t::work_tag work_tag;
 
-      ASSERT_TRUE( ( std::is_same< execution_space, Kokkos::DefaultExecutionSpace       >::value ) );
-      ASSERT_TRUE( ( std::is_same< index_type,      long                                >::value ) );
-      ASSERT_TRUE( ( std::is_same< schedule_type,   Kokkos::Schedule<Kokkos::Dynamic>   >::value ) );
-      ASSERT_TRUE( ( std::is_same< work_tag,        void                                >::value ) );
+      ASSERT_TRUE((
+          std::is_same<execution_space, Kokkos::DefaultExecutionSpace>::value));
+      ASSERT_TRUE((std::is_same<index_type, long>::value));
+      ASSERT_TRUE((std::is_same<schedule_type,
+                                Kokkos::Schedule<Kokkos::Dynamic> >::value));
+      ASSERT_TRUE((std::is_same<work_tag, void>::value));
     }
 
     {
-      typedef Kokkos::RangePolicy< Kokkos::Schedule<Kokkos::Dynamic>, Kokkos::IndexType<long>, SomeTag > policy_t;
-      typedef typename policy_t::execution_space  execution_space;
-      typedef typename policy_t::index_type       index_type;
-      typedef typename policy_t::schedule_type    schedule_type;
-      typedef typename policy_t::work_tag         work_tag;
+      typedef Kokkos::RangePolicy<Kokkos::Schedule<Kokkos::Dynamic>,
+                                  Kokkos::IndexType<long>, SomeTag>
+          policy_t;
+      typedef typename policy_t::execution_space execution_space;
+      typedef typename policy_t::index_type index_type;
+      typedef typename policy_t::schedule_type schedule_type;
+      typedef typename policy_t::work_tag work_tag;
 
-      ASSERT_TRUE( ( std::is_same< execution_space, Kokkos::DefaultExecutionSpace       >::value ) );
-      ASSERT_TRUE( ( std::is_same< index_type,      long                                >::value ) );
-      ASSERT_TRUE( ( std::is_same< schedule_type,   Kokkos::Schedule<Kokkos::Dynamic>   >::value ) );
-      ASSERT_TRUE( ( std::is_same< work_tag,        SomeTag                             >::value ) );
+      ASSERT_TRUE((
+          std::is_same<execution_space, Kokkos::DefaultExecutionSpace>::value));
+      ASSERT_TRUE((std::is_same<index_type, long>::value));
+      ASSERT_TRUE((std::is_same<schedule_type,
+                                Kokkos::Schedule<Kokkos::Dynamic> >::value));
+      ASSERT_TRUE((std::is_same<work_tag, SomeTag>::value));
     }
 
     {
-      typedef Kokkos::RangePolicy< Kokkos::Schedule<Kokkos::Dynamic>, Kokkos::IndexType<long>, SomeTag > policy_t;
-      typedef typename policy_t::execution_space  execution_space;
-      typedef typename policy_t::index_type       index_type;
-      typedef typename policy_t::schedule_type    schedule_type;
-      typedef typename policy_t::work_tag         work_tag;
+      typedef Kokkos::RangePolicy<Kokkos::Schedule<Kokkos::Dynamic>,
+                                  Kokkos::IndexType<long>, SomeTag>
+          policy_t;
+      typedef typename policy_t::execution_space execution_space;
+      typedef typename policy_t::index_type index_type;
+      typedef typename policy_t::schedule_type schedule_type;
+      typedef typename policy_t::work_tag work_tag;
 
-      ASSERT_TRUE( ( std::is_same< execution_space, Kokkos::DefaultExecutionSpace       >::value ) );
-      ASSERT_TRUE( ( std::is_same< index_type,      long                                >::value ) );
-      ASSERT_TRUE( ( std::is_same< schedule_type,   Kokkos::Schedule<Kokkos::Dynamic>   >::value ) );
-      ASSERT_TRUE( ( std::is_same< work_tag,        SomeTag                             >::value ) );
+      ASSERT_TRUE((
+          std::is_same<execution_space, Kokkos::DefaultExecutionSpace>::value));
+      ASSERT_TRUE((std::is_same<index_type, long>::value));
+      ASSERT_TRUE((std::is_same<schedule_type,
+                                Kokkos::Schedule<Kokkos::Dynamic> >::value));
+      ASSERT_TRUE((std::is_same<work_tag, SomeTag>::value));
     }
 
     {
-      typedef Kokkos::RangePolicy< SomeTag, Kokkos::Schedule<Kokkos::Dynamic>, Kokkos::IndexType<long> > policy_t;
-      typedef typename policy_t::execution_space  execution_space;
-      typedef typename policy_t::index_type       index_type;
-      typedef typename policy_t::schedule_type    schedule_type;
-      typedef typename policy_t::work_tag         work_tag;
+      typedef Kokkos::RangePolicy<SomeTag, Kokkos::Schedule<Kokkos::Dynamic>,
+                                  Kokkos::IndexType<long> >
+          policy_t;
+      typedef typename policy_t::execution_space execution_space;
+      typedef typename policy_t::index_type index_type;
+      typedef typename policy_t::schedule_type schedule_type;
+      typedef typename policy_t::work_tag work_tag;
 
-      ASSERT_TRUE( ( std::is_same< execution_space, Kokkos::DefaultExecutionSpace       >::value ) );
-      ASSERT_TRUE( ( std::is_same< index_type,      long                                >::value ) );
-      ASSERT_TRUE( ( std::is_same< schedule_type,   Kokkos::Schedule<Kokkos::Dynamic>   >::value ) );
-      ASSERT_TRUE( ( std::is_same< work_tag,        SomeTag                             >::value ) );
+      ASSERT_TRUE((
+          std::is_same<execution_space, Kokkos::DefaultExecutionSpace>::value));
+      ASSERT_TRUE((std::is_same<index_type, long>::value));
+      ASSERT_TRUE((std::is_same<schedule_type,
+                                Kokkos::Schedule<Kokkos::Dynamic> >::value));
+      ASSERT_TRUE((std::is_same<work_tag, SomeTag>::value));
     }
   }
   void test_runtime_parameters() {
     {
       typedef Kokkos::RangePolicy<> policy_t;
-      policy_t p(5,15);
-      ASSERT_TRUE( (p.begin() == 5) );
-      ASSERT_TRUE( (p.end() == 15) );
+      policy_t p(5, 15);
+      ASSERT_TRUE((p.begin() == 5));
+      ASSERT_TRUE((p.end() == 15));
     }
     {
       typedef Kokkos::RangePolicy<> policy_t;
-      policy_t p(Kokkos::DefaultExecutionSpace(),5,15);
-      ASSERT_TRUE( (p.begin() == 5) );
-      ASSERT_TRUE( (p.end() == 15) );
+      policy_t p(Kokkos::DefaultExecutionSpace(), 5, 15);
+      ASSERT_TRUE((p.begin() == 5));
+      ASSERT_TRUE((p.end() == 15));
     }
     {
       typedef Kokkos::RangePolicy<> policy_t;
-      policy_t p(5,15,Kokkos::ChunkSize(10));
-      ASSERT_TRUE( (p.begin() == 5) );
-      ASSERT_TRUE( (p.end() == 15) );
-      ASSERT_TRUE( (p.chunk_size() == 10) );
+      policy_t p(5, 15, Kokkos::ChunkSize(10));
+      ASSERT_TRUE((p.begin() == 5));
+      ASSERT_TRUE((p.end() == 15));
+      ASSERT_TRUE((p.chunk_size() == 10));
     }
     {
       typedef Kokkos::RangePolicy<> policy_t;
-      policy_t p(Kokkos::DefaultExecutionSpace(),5,15,Kokkos::ChunkSize(10));
-      ASSERT_TRUE( (p.begin() == 5) );
-      ASSERT_TRUE( (p.end() == 15) );
-      ASSERT_TRUE( (p.chunk_size() == 10) );
+      policy_t p(Kokkos::DefaultExecutionSpace(), 5, 15, Kokkos::ChunkSize(10));
+      ASSERT_TRUE((p.begin() == 5));
+      ASSERT_TRUE((p.end() == 15));
+      ASSERT_TRUE((p.chunk_size() == 10));
     }
   }
 };
 
-template< class ExecutionSpace >
+template <class ExecutionSpace>
 class TestTeamPolicyConstruction {
-public:
+ public:
   TestTeamPolicyConstruction() {
     test_compile_time_parameters();
     test_run_time_parameters();
   }
 
-private:
+ private:
   void test_compile_time_parameters() {
     {
       typedef Kokkos::TeamPolicy<> policy_t;
-      typedef typename policy_t::execution_space  execution_space;
-      typedef typename policy_t::index_type       index_type;
-      typedef typename policy_t::schedule_type    schedule_type;
-      typedef typename policy_t::work_tag         work_tag;
+      typedef typename policy_t::execution_space execution_space;
+      typedef typename policy_t::index_type index_type;
+      typedef typename policy_t::schedule_type schedule_type;
+      typedef typename policy_t::work_tag work_tag;
 
-      ASSERT_TRUE( ( std::is_same< execution_space, Kokkos::DefaultExecutionSpace       >::value ) );
-      ASSERT_TRUE( ( std::is_same< index_type,      typename execution_space::size_type >::value ) );
-      ASSERT_TRUE( ( std::is_same< schedule_type,   Kokkos::Schedule<Kokkos::Static>    >::value ) );
-      ASSERT_TRUE( ( std::is_same< work_tag,        void                                >::value ) );
+      ASSERT_TRUE((
+          std::is_same<execution_space, Kokkos::DefaultExecutionSpace>::value));
+      ASSERT_TRUE((std::is_same<index_type,
+                                typename execution_space::size_type>::value));
+      ASSERT_TRUE((std::is_same<schedule_type,
+                                Kokkos::Schedule<Kokkos::Static> >::value));
+      ASSERT_TRUE((std::is_same<work_tag, void>::value));
     }
 
     {
-      typedef Kokkos::TeamPolicy< ExecutionSpace > policy_t;
-      typedef typename policy_t::execution_space  execution_space;
-      typedef typename policy_t::index_type       index_type;
-      typedef typename policy_t::schedule_type    schedule_type;
-      typedef typename policy_t::work_tag         work_tag;
+      typedef Kokkos::TeamPolicy<ExecutionSpace> policy_t;
+      typedef typename policy_t::execution_space execution_space;
+      typedef typename policy_t::index_type index_type;
+      typedef typename policy_t::schedule_type schedule_type;
+      typedef typename policy_t::work_tag work_tag;
 
-      ASSERT_TRUE( ( std::is_same< execution_space, ExecutionSpace                      >::value ) );
-      ASSERT_TRUE( ( std::is_same< index_type,      typename execution_space::size_type >::value ) );
-      ASSERT_TRUE( ( std::is_same< schedule_type,   Kokkos::Schedule<Kokkos::Static>    >::value ) );
-      ASSERT_TRUE( ( std::is_same< work_tag,        void                                >::value ) );
+      ASSERT_TRUE((std::is_same<execution_space, ExecutionSpace>::value));
+      ASSERT_TRUE((std::is_same<index_type,
+                                typename execution_space::size_type>::value));
+      ASSERT_TRUE((std::is_same<schedule_type,
+                                Kokkos::Schedule<Kokkos::Static> >::value));
+      ASSERT_TRUE((std::is_same<work_tag, void>::value));
     }
 
     {
-      typedef Kokkos::TeamPolicy< ExecutionSpace, Kokkos::Schedule<Kokkos::Dynamic> > policy_t;
-      typedef typename policy_t::execution_space  execution_space;
-      typedef typename policy_t::index_type       index_type;
-      typedef typename policy_t::schedule_type    schedule_type;
-      typedef typename policy_t::work_tag         work_tag;
+      typedef Kokkos::TeamPolicy<ExecutionSpace,
+                                 Kokkos::Schedule<Kokkos::Dynamic> >
+          policy_t;
+      typedef typename policy_t::execution_space execution_space;
+      typedef typename policy_t::index_type index_type;
+      typedef typename policy_t::schedule_type schedule_type;
+      typedef typename policy_t::work_tag work_tag;
 
-      ASSERT_TRUE( ( std::is_same< execution_space, ExecutionSpace                      >::value ) );
-      ASSERT_TRUE( ( std::is_same< index_type,      typename execution_space::size_type >::value ) );
-      ASSERT_TRUE( ( std::is_same< schedule_type,   Kokkos::Schedule<Kokkos::Dynamic>   >::value ) );
-      ASSERT_TRUE( ( std::is_same< work_tag,        void                                >::value ) );
+      ASSERT_TRUE((std::is_same<execution_space, ExecutionSpace>::value));
+      ASSERT_TRUE((std::is_same<index_type,
+                                typename execution_space::size_type>::value));
+      ASSERT_TRUE((std::is_same<schedule_type,
+                                Kokkos::Schedule<Kokkos::Dynamic> >::value));
+      ASSERT_TRUE((std::is_same<work_tag, void>::value));
     }
 
     {
-      typedef Kokkos::TeamPolicy< ExecutionSpace, Kokkos::Schedule<Kokkos::Dynamic>, Kokkos::IndexType<long> > policy_t;
-      typedef typename policy_t::execution_space  execution_space;
-      typedef typename policy_t::index_type       index_type;
-      typedef typename policy_t::schedule_type    schedule_type;
-      typedef typename policy_t::work_tag         work_tag;
+      typedef Kokkos::TeamPolicy<ExecutionSpace,
+                                 Kokkos::Schedule<Kokkos::Dynamic>,
+                                 Kokkos::IndexType<long> >
+          policy_t;
+      typedef typename policy_t::execution_space execution_space;
+      typedef typename policy_t::index_type index_type;
+      typedef typename policy_t::schedule_type schedule_type;
+      typedef typename policy_t::work_tag work_tag;
 
-      ASSERT_TRUE( ( std::is_same< execution_space, ExecutionSpace                      >::value ) );
-      ASSERT_TRUE( ( std::is_same< index_type,      long                                >::value ) );
-      ASSERT_TRUE( ( std::is_same< schedule_type,   Kokkos::Schedule<Kokkos::Dynamic>   >::value ) );
-      ASSERT_TRUE( ( std::is_same< work_tag,        void                                >::value ) );
+      ASSERT_TRUE((std::is_same<execution_space, ExecutionSpace>::value));
+      ASSERT_TRUE((std::is_same<index_type, long>::value));
+      ASSERT_TRUE((std::is_same<schedule_type,
+                                Kokkos::Schedule<Kokkos::Dynamic> >::value));
+      ASSERT_TRUE((std::is_same<work_tag, void>::value));
     }
 
     {
-      typedef Kokkos::TeamPolicy< Kokkos::IndexType<long>, ExecutionSpace, Kokkos::Schedule<Kokkos::Dynamic> > policy_t;
-      typedef typename policy_t::execution_space  execution_space;
-      typedef typename policy_t::index_type       index_type;
-      typedef typename policy_t::schedule_type    schedule_type;
-      typedef typename policy_t::work_tag         work_tag;
+      typedef Kokkos::TeamPolicy<Kokkos::IndexType<long>, ExecutionSpace,
+                                 Kokkos::Schedule<Kokkos::Dynamic> >
+          policy_t;
+      typedef typename policy_t::execution_space execution_space;
+      typedef typename policy_t::index_type index_type;
+      typedef typename policy_t::schedule_type schedule_type;
+      typedef typename policy_t::work_tag work_tag;
 
-      ASSERT_TRUE( ( std::is_same< execution_space, ExecutionSpace                      >::value ) );
-      ASSERT_TRUE( ( std::is_same< index_type,      long                                >::value ) );
-      ASSERT_TRUE( ( std::is_same< schedule_type,   Kokkos::Schedule<Kokkos::Dynamic>   >::value ) );
-      ASSERT_TRUE( ( std::is_same< work_tag,        void                                >::value ) );
+      ASSERT_TRUE((std::is_same<execution_space, ExecutionSpace>::value));
+      ASSERT_TRUE((std::is_same<index_type, long>::value));
+      ASSERT_TRUE((std::is_same<schedule_type,
+                                Kokkos::Schedule<Kokkos::Dynamic> >::value));
+      ASSERT_TRUE((std::is_same<work_tag, void>::value));
     }
 
     {
-      typedef Kokkos::TeamPolicy< ExecutionSpace, Kokkos::Schedule<Kokkos::Dynamic>, Kokkos::IndexType<long>, SomeTag > policy_t;
-      typedef typename policy_t::execution_space  execution_space;
-      typedef typename policy_t::index_type       index_type;
-      typedef typename policy_t::schedule_type    schedule_type;
-      typedef typename policy_t::work_tag         work_tag;
+      typedef Kokkos::TeamPolicy<ExecutionSpace,
+                                 Kokkos::Schedule<Kokkos::Dynamic>,
+                                 Kokkos::IndexType<long>, SomeTag>
+          policy_t;
+      typedef typename policy_t::execution_space execution_space;
+      typedef typename policy_t::index_type index_type;
+      typedef typename policy_t::schedule_type schedule_type;
+      typedef typename policy_t::work_tag work_tag;
 
-      ASSERT_TRUE( ( std::is_same< execution_space, ExecutionSpace                      >::value ) );
-      ASSERT_TRUE( ( std::is_same< index_type,      long                                >::value ) );
-      ASSERT_TRUE( ( std::is_same< schedule_type,   Kokkos::Schedule<Kokkos::Dynamic>   >::value ) );
-      ASSERT_TRUE( ( std::is_same< work_tag,        SomeTag                             >::value ) );
+      ASSERT_TRUE((std::is_same<execution_space, ExecutionSpace>::value));
+      ASSERT_TRUE((std::is_same<index_type, long>::value));
+      ASSERT_TRUE((std::is_same<schedule_type,
+                                Kokkos::Schedule<Kokkos::Dynamic> >::value));
+      ASSERT_TRUE((std::is_same<work_tag, SomeTag>::value));
     }
 
     {
-      typedef Kokkos::TeamPolicy< Kokkos::Schedule<Kokkos::Dynamic>, ExecutionSpace, Kokkos::IndexType<long>, SomeTag > policy_t;
-      typedef typename policy_t::execution_space  execution_space;
-      typedef typename policy_t::index_type       index_type;
-      typedef typename policy_t::schedule_type    schedule_type;
-      typedef typename policy_t::work_tag         work_tag;
+      typedef Kokkos::TeamPolicy<Kokkos::Schedule<Kokkos::Dynamic>,
+                                 ExecutionSpace, Kokkos::IndexType<long>,
+                                 SomeTag>
+          policy_t;
+      typedef typename policy_t::execution_space execution_space;
+      typedef typename policy_t::index_type index_type;
+      typedef typename policy_t::schedule_type schedule_type;
+      typedef typename policy_t::work_tag work_tag;
 
-      ASSERT_TRUE( ( std::is_same< execution_space, ExecutionSpace                      >::value ) );
-      ASSERT_TRUE( ( std::is_same< index_type,      long                                >::value ) );
-      ASSERT_TRUE( ( std::is_same< schedule_type,   Kokkos::Schedule<Kokkos::Dynamic>   >::value ) );
-      ASSERT_TRUE( ( std::is_same< work_tag,        SomeTag                             >::value ) );
+      ASSERT_TRUE((std::is_same<execution_space, ExecutionSpace>::value));
+      ASSERT_TRUE((std::is_same<index_type, long>::value));
+      ASSERT_TRUE((std::is_same<schedule_type,
+                                Kokkos::Schedule<Kokkos::Dynamic> >::value));
+      ASSERT_TRUE((std::is_same<work_tag, SomeTag>::value));
     }
 
     {
-      typedef Kokkos::TeamPolicy< SomeTag, Kokkos::Schedule<Kokkos::Dynamic>, Kokkos::IndexType<long>, ExecutionSpace > policy_t;
-      typedef typename policy_t::execution_space  execution_space;
-      typedef typename policy_t::index_type       index_type;
-      typedef typename policy_t::schedule_type    schedule_type;
-      typedef typename policy_t::work_tag         work_tag;
+      typedef Kokkos::TeamPolicy<SomeTag, Kokkos::Schedule<Kokkos::Dynamic>,
+                                 Kokkos::IndexType<long>, ExecutionSpace>
+          policy_t;
+      typedef typename policy_t::execution_space execution_space;
+      typedef typename policy_t::index_type index_type;
+      typedef typename policy_t::schedule_type schedule_type;
+      typedef typename policy_t::work_tag work_tag;
 
-      ASSERT_TRUE( ( std::is_same< execution_space, ExecutionSpace                      >::value ) );
-      ASSERT_TRUE( ( std::is_same< index_type,      long                                >::value ) );
-      ASSERT_TRUE( ( std::is_same< schedule_type,   Kokkos::Schedule<Kokkos::Dynamic>   >::value ) );
-      ASSERT_TRUE( ( std::is_same< work_tag,        SomeTag                             >::value ) );
+      ASSERT_TRUE((std::is_same<execution_space, ExecutionSpace>::value));
+      ASSERT_TRUE((std::is_same<index_type, long>::value));
+      ASSERT_TRUE((std::is_same<schedule_type,
+                                Kokkos::Schedule<Kokkos::Dynamic> >::value));
+      ASSERT_TRUE((std::is_same<work_tag, SomeTag>::value));
     }
 
     {
-      typedef Kokkos::TeamPolicy< Kokkos::Schedule<Kokkos::Dynamic> > policy_t;
-      typedef typename policy_t::execution_space  execution_space;
-      typedef typename policy_t::index_type       index_type;
-      typedef typename policy_t::schedule_type    schedule_type;
-      typedef typename policy_t::work_tag         work_tag;
+      typedef Kokkos::TeamPolicy<Kokkos::Schedule<Kokkos::Dynamic> > policy_t;
+      typedef typename policy_t::execution_space execution_space;
+      typedef typename policy_t::index_type index_type;
+      typedef typename policy_t::schedule_type schedule_type;
+      typedef typename policy_t::work_tag work_tag;
 
-      ASSERT_TRUE( ( std::is_same< execution_space, Kokkos::DefaultExecutionSpace        >::value ) );
-      ASSERT_TRUE( ( std::is_same< index_type,      typename execution_space::size_type >::value ) );
-      ASSERT_TRUE( ( std::is_same< schedule_type,   Kokkos::Schedule<Kokkos::Dynamic>   >::value ) );
-      ASSERT_TRUE( ( std::is_same< work_tag,        void                                >::value ) );
+      ASSERT_TRUE((
+          std::is_same<execution_space, Kokkos::DefaultExecutionSpace>::value));
+      ASSERT_TRUE((std::is_same<index_type,
+                                typename execution_space::size_type>::value));
+      ASSERT_TRUE((std::is_same<schedule_type,
+                                Kokkos::Schedule<Kokkos::Dynamic> >::value));
+      ASSERT_TRUE((std::is_same<work_tag, void>::value));
     }
 
     {
-      typedef Kokkos::TeamPolicy< Kokkos::Schedule<Kokkos::Dynamic>, Kokkos::IndexType<long> > policy_t;
-      typedef typename policy_t::execution_space  execution_space;
-      typedef typename policy_t::index_type       index_type;
-      typedef typename policy_t::schedule_type    schedule_type;
-      typedef typename policy_t::work_tag         work_tag;
+      typedef Kokkos::TeamPolicy<Kokkos::Schedule<Kokkos::Dynamic>,
+                                 Kokkos::IndexType<long> >
+          policy_t;
+      typedef typename policy_t::execution_space execution_space;
+      typedef typename policy_t::index_type index_type;
+      typedef typename policy_t::schedule_type schedule_type;
+      typedef typename policy_t::work_tag work_tag;
 
-      ASSERT_TRUE( ( std::is_same< execution_space, Kokkos::DefaultExecutionSpace       >::value ) );
-      ASSERT_TRUE( ( std::is_same< index_type,      long                                >::value ) );
-      ASSERT_TRUE( ( std::is_same< schedule_type,   Kokkos::Schedule<Kokkos::Dynamic>   >::value ) );
-      ASSERT_TRUE( ( std::is_same< work_tag,        void                                >::value ) );
+      ASSERT_TRUE((
+          std::is_same<execution_space, Kokkos::DefaultExecutionSpace>::value));
+      ASSERT_TRUE((std::is_same<index_type, long>::value));
+      ASSERT_TRUE((std::is_same<schedule_type,
+                                Kokkos::Schedule<Kokkos::Dynamic> >::value));
+      ASSERT_TRUE((std::is_same<work_tag, void>::value));
     }
 
     {
-      typedef Kokkos::TeamPolicy< Kokkos::IndexType<long>, Kokkos::Schedule<Kokkos::Dynamic> > policy_t;
-      typedef typename policy_t::execution_space  execution_space;
-      typedef typename policy_t::index_type       index_type;
-      typedef typename policy_t::schedule_type    schedule_type;
-      typedef typename policy_t::work_tag         work_tag;
+      typedef Kokkos::TeamPolicy<Kokkos::IndexType<long>,
+                                 Kokkos::Schedule<Kokkos::Dynamic> >
+          policy_t;
+      typedef typename policy_t::execution_space execution_space;
+      typedef typename policy_t::index_type index_type;
+      typedef typename policy_t::schedule_type schedule_type;
+      typedef typename policy_t::work_tag work_tag;
 
-      ASSERT_TRUE( ( std::is_same< execution_space, Kokkos::DefaultExecutionSpace       >::value ) );
-      ASSERT_TRUE( ( std::is_same< index_type,      long                                >::value ) );
-      ASSERT_TRUE( ( std::is_same< schedule_type,   Kokkos::Schedule<Kokkos::Dynamic>   >::value ) );
-      ASSERT_TRUE( ( std::is_same< work_tag,        void                                >::value ) );
+      ASSERT_TRUE((
+          std::is_same<execution_space, Kokkos::DefaultExecutionSpace>::value));
+      ASSERT_TRUE((std::is_same<index_type, long>::value));
+      ASSERT_TRUE((std::is_same<schedule_type,
+                                Kokkos::Schedule<Kokkos::Dynamic> >::value));
+      ASSERT_TRUE((std::is_same<work_tag, void>::value));
     }
 
     {
-      typedef Kokkos::TeamPolicy< Kokkos::Schedule<Kokkos::Dynamic>, Kokkos::IndexType<long>, SomeTag > policy_t;
-      typedef typename policy_t::execution_space  execution_space;
-      typedef typename policy_t::index_type       index_type;
-      typedef typename policy_t::schedule_type    schedule_type;
-      typedef typename policy_t::work_tag         work_tag;
+      typedef Kokkos::TeamPolicy<Kokkos::Schedule<Kokkos::Dynamic>,
+                                 Kokkos::IndexType<long>, SomeTag>
+          policy_t;
+      typedef typename policy_t::execution_space execution_space;
+      typedef typename policy_t::index_type index_type;
+      typedef typename policy_t::schedule_type schedule_type;
+      typedef typename policy_t::work_tag work_tag;
 
-      ASSERT_TRUE( ( std::is_same< execution_space, Kokkos::DefaultExecutionSpace       >::value ) );
-      ASSERT_TRUE( ( std::is_same< index_type,      long                                >::value ) );
-      ASSERT_TRUE( ( std::is_same< schedule_type,   Kokkos::Schedule<Kokkos::Dynamic>   >::value ) );
-      ASSERT_TRUE( ( std::is_same< work_tag,        SomeTag                             >::value ) );
+      ASSERT_TRUE((
+          std::is_same<execution_space, Kokkos::DefaultExecutionSpace>::value));
+      ASSERT_TRUE((std::is_same<index_type, long>::value));
+      ASSERT_TRUE((std::is_same<schedule_type,
+                                Kokkos::Schedule<Kokkos::Dynamic> >::value));
+      ASSERT_TRUE((std::is_same<work_tag, SomeTag>::value));
     }
 
     {
-      typedef Kokkos::TeamPolicy< Kokkos::Schedule<Kokkos::Dynamic>, Kokkos::IndexType<long>, SomeTag > policy_t;
-      typedef typename policy_t::execution_space  execution_space;
-      typedef typename policy_t::index_type       index_type;
-      typedef typename policy_t::schedule_type    schedule_type;
-      typedef typename policy_t::work_tag         work_tag;
+      typedef Kokkos::TeamPolicy<Kokkos::Schedule<Kokkos::Dynamic>,
+                                 Kokkos::IndexType<long>, SomeTag>
+          policy_t;
+      typedef typename policy_t::execution_space execution_space;
+      typedef typename policy_t::index_type index_type;
+      typedef typename policy_t::schedule_type schedule_type;
+      typedef typename policy_t::work_tag work_tag;
 
-      ASSERT_TRUE( ( std::is_same< execution_space, Kokkos::DefaultExecutionSpace       >::value ) );
-      ASSERT_TRUE( ( std::is_same< index_type,      long                                >::value ) );
-      ASSERT_TRUE( ( std::is_same< schedule_type,   Kokkos::Schedule<Kokkos::Dynamic>   >::value ) );
-      ASSERT_TRUE( ( std::is_same< work_tag,        SomeTag                             >::value ) );
+      ASSERT_TRUE((
+          std::is_same<execution_space, Kokkos::DefaultExecutionSpace>::value));
+      ASSERT_TRUE((std::is_same<index_type, long>::value));
+      ASSERT_TRUE((std::is_same<schedule_type,
+                                Kokkos::Schedule<Kokkos::Dynamic> >::value));
+      ASSERT_TRUE((std::is_same<work_tag, SomeTag>::value));
     }
 
     {
-      typedef Kokkos::TeamPolicy< SomeTag, Kokkos::Schedule<Kokkos::Dynamic>, Kokkos::IndexType<long> > policy_t;
-      typedef typename policy_t::execution_space  execution_space;
-      typedef typename policy_t::index_type       index_type;
-      typedef typename policy_t::schedule_type    schedule_type;
-      typedef typename policy_t::work_tag         work_tag;
+      typedef Kokkos::TeamPolicy<SomeTag, Kokkos::Schedule<Kokkos::Dynamic>,
+                                 Kokkos::IndexType<long> >
+          policy_t;
+      typedef typename policy_t::execution_space execution_space;
+      typedef typename policy_t::index_type index_type;
+      typedef typename policy_t::schedule_type schedule_type;
+      typedef typename policy_t::work_tag work_tag;
 
-      ASSERT_TRUE( ( std::is_same< execution_space, Kokkos::DefaultExecutionSpace       >::value ) );
-      ASSERT_TRUE( ( std::is_same< index_type,      long                                >::value ) );
-      ASSERT_TRUE( ( std::is_same< schedule_type,   Kokkos::Schedule<Kokkos::Dynamic>   >::value ) );
-      ASSERT_TRUE( ( std::is_same< work_tag,        SomeTag                             >::value ) );
+      ASSERT_TRUE((
+          std::is_same<execution_space, Kokkos::DefaultExecutionSpace>::value));
+      ASSERT_TRUE((std::is_same<index_type, long>::value));
+      ASSERT_TRUE((std::is_same<schedule_type,
+                                Kokkos::Schedule<Kokkos::Dynamic> >::value));
+      ASSERT_TRUE((std::is_same<work_tag, SomeTag>::value));
     }
   }
 
-
-  template< class policy_t >
+  template <class policy_t>
   void test_run_time_parameters_type() {
     int league_size = 131;
-    int team_size = 4 < policy_t::execution_space::concurrency() ? 4 : policy_t::execution_space::concurrency();
+    int team_size   = 4 < policy_t::execution_space::concurrency()
+                        ? 4
+                        : policy_t::execution_space::concurrency();
 #ifdef KOKKOS_ENABLE_HPX
     team_size = 1;
 #endif
-    int chunk_size = 4;
-    int per_team_scratch = 1024;
+    int chunk_size         = 4;
+    int per_team_scratch   = 1024;
     int per_thread_scratch = 16;
-    int scratch_size = per_team_scratch + per_thread_scratch * team_size;
+    int scratch_size       = per_team_scratch + per_thread_scratch * team_size;
 #ifdef KOKKOS_ENABLE_DEPRECATED_CODE
     int vector_length = 4;
 #endif
 
-    policy_t p1( league_size, team_size );
-    ASSERT_EQ  ( p1.league_size(),     league_size                    );
-    ASSERT_EQ  ( p1.team_size(),       team_size                      );
-    ASSERT_TRUE( p1.chunk_size()  > 0                                 );
-    ASSERT_EQ  ( p1.scratch_size( 0 ), 0                              );
+    policy_t p1(league_size, team_size);
+    ASSERT_EQ(p1.league_size(), league_size);
+    ASSERT_EQ(p1.team_size(), team_size);
+    ASSERT_TRUE(p1.chunk_size() > 0);
+    ASSERT_EQ(p1.scratch_size(0), 0);
 
-    policy_t p2 = p1.set_chunk_size( chunk_size );
-    ASSERT_EQ  ( p1.league_size(),     league_size                    );
-    ASSERT_EQ  ( p1.team_size(),       team_size                      );
+    policy_t p2 = p1.set_chunk_size(chunk_size);
+    ASSERT_EQ(p1.league_size(), league_size);
+    ASSERT_EQ(p1.team_size(), team_size);
 #ifdef KOKKOS_ENABLE_DEPRECATED_CODE
-    ASSERT_TRUE( p1.chunk_size()  > 0                                 );
+    ASSERT_TRUE(p1.chunk_size() > 0);
 #else
-    ASSERT_EQ  ( p1.chunk_size(),      chunk_size                     );
+    ASSERT_EQ(p1.chunk_size(), chunk_size);
 #endif
-    ASSERT_EQ  ( p1.scratch_size( 0 ), 0                              );
+    ASSERT_EQ(p1.scratch_size(0), 0);
 
-    ASSERT_EQ  ( p2.league_size(),     league_size                    );
-    ASSERT_EQ  ( p2.team_size(),       team_size                      );
-    ASSERT_EQ  ( p2.chunk_size(),      chunk_size                     );
-    ASSERT_EQ  ( p2.scratch_size( 0 ), 0                              );
+    ASSERT_EQ(p2.league_size(), league_size);
+    ASSERT_EQ(p2.team_size(), team_size);
+    ASSERT_EQ(p2.chunk_size(), chunk_size);
+    ASSERT_EQ(p2.scratch_size(0), 0);
 
-    policy_t p3 = p2.set_scratch_size( 0, Kokkos::PerTeam( per_team_scratch ) );
-    ASSERT_EQ  ( p2.league_size(),     league_size                    );
-    ASSERT_EQ  ( p2.team_size(),       team_size                      );
-    ASSERT_EQ  ( p2.chunk_size(),      chunk_size                     );
+    policy_t p3 = p2.set_scratch_size(0, Kokkos::PerTeam(per_team_scratch));
+    ASSERT_EQ(p2.league_size(), league_size);
+    ASSERT_EQ(p2.team_size(), team_size);
+    ASSERT_EQ(p2.chunk_size(), chunk_size);
 #ifdef KOKKOS_ENABLE_DEPRECATED_CODE
-    ASSERT_EQ  ( p2.scratch_size( 0 ), 0                              );
+    ASSERT_EQ(p2.scratch_size(0), 0);
 #else
-    ASSERT_EQ  ( p2.scratch_size( 0 ), per_team_scratch               );
+    ASSERT_EQ(p2.scratch_size(0), per_team_scratch);
 #endif
-    ASSERT_EQ  ( p3.league_size(),     league_size                    );
-    ASSERT_EQ  ( p3.team_size(),       team_size                      );
-    ASSERT_EQ  ( p3.chunk_size(),      chunk_size                     );
-    ASSERT_EQ  ( p3.scratch_size( 0 ), per_team_scratch               );
+    ASSERT_EQ(p3.league_size(), league_size);
+    ASSERT_EQ(p3.team_size(), team_size);
+    ASSERT_EQ(p3.chunk_size(), chunk_size);
+    ASSERT_EQ(p3.scratch_size(0), per_team_scratch);
 
-    policy_t p4 = p2.set_scratch_size( 0, Kokkos::PerThread( per_thread_scratch ) );
-    ASSERT_EQ  ( p2.league_size(),     league_size                    );
-    ASSERT_EQ  ( p2.team_size(),       team_size                      );
-    ASSERT_EQ  ( p2.chunk_size(),      chunk_size                     );
+    policy_t p4 = p2.set_scratch_size(0, Kokkos::PerThread(per_thread_scratch));
+    ASSERT_EQ(p2.league_size(), league_size);
+    ASSERT_EQ(p2.team_size(), team_size);
+    ASSERT_EQ(p2.chunk_size(), chunk_size);
 #ifdef KOKKOS_ENABLE_DEPRECATED_CODE
-    ASSERT_EQ  ( p2.scratch_size( 0 ), 0                              );
+    ASSERT_EQ(p2.scratch_size(0), 0);
 #else
-    ASSERT_EQ  ( p2.scratch_size( 0 ), scratch_size );
+    ASSERT_EQ(p2.scratch_size(0), scratch_size);
 #endif
-    ASSERT_EQ  ( p4.league_size(),     league_size                    );
-    ASSERT_EQ  ( p4.team_size(),       team_size                      );
-    ASSERT_EQ  ( p4.chunk_size(),      chunk_size                     );
+    ASSERT_EQ(p4.league_size(), league_size);
+    ASSERT_EQ(p4.team_size(), team_size);
+    ASSERT_EQ(p4.chunk_size(), chunk_size);
 #ifdef KOKKOS_ENABLE_DEPRECATED_CODE
-    ASSERT_EQ  ( p4.scratch_size( 0 ), per_thread_scratch * team_size );
+    ASSERT_EQ(p4.scratch_size(0), per_thread_scratch * team_size);
 #else
-    ASSERT_EQ  ( p4.scratch_size( 0 ), scratch_size );
+    ASSERT_EQ(p4.scratch_size(0), scratch_size);
 #endif
 
-    policy_t p5 = p2.set_scratch_size( 0, Kokkos::PerThread( per_thread_scratch ), Kokkos::PerTeam( per_team_scratch ) );
-    ASSERT_EQ  ( p2.league_size(),     league_size                    );
-    ASSERT_EQ  ( p2.team_size(),       team_size                      );
-    ASSERT_EQ  ( p2.chunk_size(),      chunk_size                     );
+    policy_t p5 = p2.set_scratch_size(0, Kokkos::PerThread(per_thread_scratch),
+                                      Kokkos::PerTeam(per_team_scratch));
+    ASSERT_EQ(p2.league_size(), league_size);
+    ASSERT_EQ(p2.team_size(), team_size);
+    ASSERT_EQ(p2.chunk_size(), chunk_size);
 #ifdef KOKKOS_ENABLE_DEPRECATED_CODE
-    ASSERT_EQ  ( p2.scratch_size( 0 ), 0                              );
+    ASSERT_EQ(p2.scratch_size(0), 0);
 #else
-    ASSERT_EQ  ( p2.scratch_size( 0 ), scratch_size                   );
+    ASSERT_EQ(p2.scratch_size(0), scratch_size);
 #endif
-    ASSERT_EQ  ( p5.league_size(),     league_size                    );
-    ASSERT_EQ  ( p5.team_size(),       team_size                      );
-    ASSERT_EQ  ( p5.chunk_size(),      chunk_size                     );
-    ASSERT_EQ  ( p5.scratch_size( 0 ), scratch_size                   );
+    ASSERT_EQ(p5.league_size(), league_size);
+    ASSERT_EQ(p5.team_size(), team_size);
+    ASSERT_EQ(p5.chunk_size(), chunk_size);
+    ASSERT_EQ(p5.scratch_size(0), scratch_size);
 
-    policy_t p6 = p2.set_scratch_size( 0, Kokkos::PerTeam( per_team_scratch ), Kokkos::PerThread( per_thread_scratch ) );
-    ASSERT_EQ  ( p2.league_size(),     league_size                    );
-    ASSERT_EQ  ( p2.team_size(),       team_size                      );
-    ASSERT_EQ  ( p2.chunk_size(),      chunk_size                     );
+    policy_t p6 = p2.set_scratch_size(0, Kokkos::PerTeam(per_team_scratch),
+                                      Kokkos::PerThread(per_thread_scratch));
+    ASSERT_EQ(p2.league_size(), league_size);
+    ASSERT_EQ(p2.team_size(), team_size);
+    ASSERT_EQ(p2.chunk_size(), chunk_size);
 #ifdef KOKKOS_ENABLE_DEPRECATED_CODE
-    ASSERT_EQ  ( p2.scratch_size( 0 ), 0                              );
+    ASSERT_EQ(p2.scratch_size(0), 0);
 #else
-    ASSERT_EQ  ( p2.scratch_size( 0 ), scratch_size                   );
+    ASSERT_EQ(p2.scratch_size(0), scratch_size);
 #endif
-    ASSERT_EQ  ( p6.league_size(),     league_size                    );
-    ASSERT_EQ  ( p6.team_size(),       team_size                      );
-    ASSERT_EQ  ( p6.chunk_size(),      chunk_size                     );
-    ASSERT_EQ  ( p6.scratch_size( 0 ), scratch_size                   );
+    ASSERT_EQ(p6.league_size(), league_size);
+    ASSERT_EQ(p6.team_size(), team_size);
+    ASSERT_EQ(p6.chunk_size(), chunk_size);
+    ASSERT_EQ(p6.scratch_size(0), scratch_size);
 
-    policy_t p7 = p3.set_scratch_size( 0, Kokkos::PerTeam( per_team_scratch ), Kokkos::PerThread( per_thread_scratch ) );
-    ASSERT_EQ  ( p3.league_size(),     league_size                    );
-    ASSERT_EQ  ( p3.team_size(),       team_size                      );
-    ASSERT_EQ  ( p3.chunk_size(),      chunk_size                     );
+    policy_t p7 = p3.set_scratch_size(0, Kokkos::PerTeam(per_team_scratch),
+                                      Kokkos::PerThread(per_thread_scratch));
+    ASSERT_EQ(p3.league_size(), league_size);
+    ASSERT_EQ(p3.team_size(), team_size);
+    ASSERT_EQ(p3.chunk_size(), chunk_size);
 #ifdef KOKKOS_ENABLE_DEPRECATED_CODE
-    ASSERT_EQ  ( p3.scratch_size( 0 ), per_team_scratch               );
+    ASSERT_EQ(p3.scratch_size(0), per_team_scratch);
 #else
-    ASSERT_EQ  ( p3.scratch_size( 0 ), scratch_size                   );
+    ASSERT_EQ(p3.scratch_size(0), scratch_size);
 #endif
-    ASSERT_EQ  ( p7.league_size(),     league_size                    );
-    ASSERT_EQ  ( p7.team_size(),       team_size                      );
-    ASSERT_EQ  ( p7.chunk_size(),      chunk_size                     );
-    ASSERT_EQ  ( p7.scratch_size( 0 ), scratch_size                   );
+    ASSERT_EQ(p7.league_size(), league_size);
+    ASSERT_EQ(p7.team_size(), team_size);
+    ASSERT_EQ(p7.chunk_size(), chunk_size);
+    ASSERT_EQ(p7.scratch_size(0), scratch_size);
 
 #ifdef KOKKOS_ENABLE_DEPRECATED_CODE
-    policy_t p8(league_size, team_size, Kokkos::ChunkSize(chunk_size) );
-    ASSERT_EQ  ( p8.league_size(),     league_size                    );
-    ASSERT_EQ  ( p8.team_size(),       team_size                      );
-    ASSERT_EQ  ( p8.chunk_size(),      chunk_size                     );
-    ASSERT_EQ  ( p8.scratch_size( 0 ), 0                              );
+    policy_t p8(league_size, team_size, Kokkos::ChunkSize(chunk_size));
+    ASSERT_EQ(p8.league_size(), league_size);
+    ASSERT_EQ(p8.team_size(), team_size);
+    ASSERT_EQ(p8.chunk_size(), chunk_size);
+    ASSERT_EQ(p8.scratch_size(0), 0);
 
-    policy_t p10( league_size, team_size, Kokkos::ScratchRequest( 0, Kokkos::PerTeam( per_team_scratch ) ) );
-    ASSERT_EQ  ( p10.league_size(),     league_size                    );
-    ASSERT_EQ  ( p10.team_size(),       team_size                      );
-    ASSERT_TRUE( p10.chunk_size()  > 0                                 );
-    ASSERT_EQ  ( p10.scratch_size( 0 ), per_team_scratch               );
+    policy_t p10(league_size, team_size,
+                 Kokkos::ScratchRequest(0, Kokkos::PerTeam(per_team_scratch)));
+    ASSERT_EQ(p10.league_size(), league_size);
+    ASSERT_EQ(p10.team_size(), team_size);
+    ASSERT_TRUE(p10.chunk_size() > 0);
+    ASSERT_EQ(p10.scratch_size(0), per_team_scratch);
 
-    policy_t p11( league_size, team_size, Kokkos::ScratchRequest( 0, Kokkos::PerThread( per_thread_scratch ) ) );
-    ASSERT_EQ  ( p11.league_size(),     league_size                    );
-    ASSERT_EQ  ( p11.team_size(),       team_size                      );
-    ASSERT_TRUE( p11.chunk_size()  > 0                                 );
-    ASSERT_EQ  ( p11.scratch_size( 0 ), per_thread_scratch * team_size );
+    policy_t p11(
+        league_size, team_size,
+        Kokkos::ScratchRequest(0, Kokkos::PerThread(per_thread_scratch)));
+    ASSERT_EQ(p11.league_size(), league_size);
+    ASSERT_EQ(p11.team_size(), team_size);
+    ASSERT_TRUE(p11.chunk_size() > 0);
+    ASSERT_EQ(p11.scratch_size(0), per_thread_scratch * team_size);
 
-    policy_t p12( league_size, team_size, Kokkos::ScratchRequest( 0, Kokkos::PerThread( per_thread_scratch ), Kokkos::PerTeam( per_team_scratch ) ) );
-    ASSERT_EQ  ( p12.league_size(),     league_size                    );
-    ASSERT_EQ  ( p12.team_size(),       team_size                      );
-    ASSERT_TRUE( p12.chunk_size()  > 0                                 );
-    ASSERT_EQ  ( p12.scratch_size( 0 ), scratch_size                   );
+    policy_t p12(
+        league_size, team_size,
+        Kokkos::ScratchRequest(0, Kokkos::PerThread(per_thread_scratch),
+                               Kokkos::PerTeam(per_team_scratch)));
+    ASSERT_EQ(p12.league_size(), league_size);
+    ASSERT_EQ(p12.team_size(), team_size);
+    ASSERT_TRUE(p12.chunk_size() > 0);
+    ASSERT_EQ(p12.scratch_size(0), scratch_size);
 
-    policy_t p13( league_size, team_size, Kokkos::ScratchRequest( 0, Kokkos::PerTeam( per_team_scratch ), Kokkos::PerThread( per_thread_scratch ) ) );
-    ASSERT_EQ  ( p13.league_size(),     league_size                    );
-    ASSERT_EQ  ( p13.team_size(),       team_size                      );
-    ASSERT_TRUE( p13.chunk_size()  > 0                                 );
-    ASSERT_EQ  ( p13.scratch_size( 0 ), scratch_size                   );
+    policy_t p13(league_size, team_size,
+                 Kokkos::ScratchRequest(0, Kokkos::PerTeam(per_team_scratch),
+                                        Kokkos::PerThread(per_thread_scratch)));
+    ASSERT_EQ(p13.league_size(), league_size);
+    ASSERT_EQ(p13.team_size(), team_size);
+    ASSERT_TRUE(p13.chunk_size() > 0);
+    ASSERT_EQ(p13.scratch_size(0), scratch_size);
 
-    policy_t p14( league_size, team_size, Kokkos::ScratchRequest( 0, Kokkos::PerTeam( per_team_scratch ), Kokkos::PerThread( per_thread_scratch ) ) );
-    ASSERT_EQ  ( p14.league_size(),     league_size                    );
-    ASSERT_EQ  ( p14.team_size(),       team_size                      );
-    ASSERT_TRUE( p14.chunk_size()  > 0                                 );
-    ASSERT_EQ  ( p14.scratch_size( 0 ), scratch_size                   );
+    policy_t p14(league_size, team_size,
+                 Kokkos::ScratchRequest(0, Kokkos::PerTeam(per_team_scratch),
+                                        Kokkos::PerThread(per_thread_scratch)));
+    ASSERT_EQ(p14.league_size(), league_size);
+    ASSERT_EQ(p14.team_size(), team_size);
+    ASSERT_TRUE(p14.chunk_size() > 0);
+    ASSERT_EQ(p14.scratch_size(0), scratch_size);
 
-    policy_t p15( league_size, team_size, Kokkos::ChunkSize(chunk_size), Kokkos::ScratchRequest( 0, Kokkos::PerTeam( per_team_scratch ) ) );
-    ASSERT_EQ  ( p15.league_size(),     league_size                    );
-    ASSERT_EQ  ( p15.team_size(),       team_size                      );
-    ASSERT_TRUE( p15.chunk_size()  > 0                                 );
-    ASSERT_EQ  ( p15.scratch_size( 0 ), per_team_scratch               );
+    policy_t p15(league_size, team_size, Kokkos::ChunkSize(chunk_size),
+                 Kokkos::ScratchRequest(0, Kokkos::PerTeam(per_team_scratch)));
+    ASSERT_EQ(p15.league_size(), league_size);
+    ASSERT_EQ(p15.team_size(), team_size);
+    ASSERT_TRUE(p15.chunk_size() > 0);
+    ASSERT_EQ(p15.scratch_size(0), per_team_scratch);
 
-    policy_t p16( league_size, team_size, Kokkos::ScratchRequest( 0, Kokkos::PerThread( per_thread_scratch ) ), Kokkos::ChunkSize(chunk_size) );
-    ASSERT_EQ  ( p16.league_size(),     league_size                    );
-    ASSERT_EQ  ( p16.team_size(),       team_size                      );
-    ASSERT_EQ  ( p16.chunk_size(),      chunk_size                     );
-    ASSERT_EQ  ( p16.scratch_size( 0 ), per_thread_scratch * team_size );
+    policy_t p16(
+        league_size, team_size,
+        Kokkos::ScratchRequest(0, Kokkos::PerThread(per_thread_scratch)),
+        Kokkos::ChunkSize(chunk_size));
+    ASSERT_EQ(p16.league_size(), league_size);
+    ASSERT_EQ(p16.team_size(), team_size);
+    ASSERT_EQ(p16.chunk_size(), chunk_size);
+    ASSERT_EQ(p16.scratch_size(0), per_thread_scratch * team_size);
 
-    policy_t p17( league_size, team_size, Kokkos::ChunkSize(chunk_size), Kokkos::ScratchRequest( 0, Kokkos::PerThread( per_thread_scratch ), Kokkos::PerTeam( per_team_scratch ) ) );
-    ASSERT_EQ  ( p17.league_size(),     league_size                    );
-    ASSERT_EQ  ( p17.team_size(),       team_size                      );
-    ASSERT_EQ  ( p17.chunk_size(),      chunk_size                     );
-    ASSERT_EQ  ( p17.scratch_size( 0 ), scratch_size                   );
+    policy_t p17(
+        league_size, team_size, Kokkos::ChunkSize(chunk_size),
+        Kokkos::ScratchRequest(0, Kokkos::PerThread(per_thread_scratch),
+                               Kokkos::PerTeam(per_team_scratch)));
+    ASSERT_EQ(p17.league_size(), league_size);
+    ASSERT_EQ(p17.team_size(), team_size);
+    ASSERT_EQ(p17.chunk_size(), chunk_size);
+    ASSERT_EQ(p17.scratch_size(0), scratch_size);
 
-    policy_t p18( league_size, team_size, Kokkos::ScratchRequest( 0, Kokkos::PerTeam( per_team_scratch ), Kokkos::PerThread( per_thread_scratch ) ), Kokkos::ChunkSize(chunk_size) );
-    ASSERT_EQ  ( p18.league_size(),     league_size                    );
-    ASSERT_EQ  ( p18.team_size(),       team_size                      );
-    ASSERT_EQ  ( p18.chunk_size(),      chunk_size                     );
-    ASSERT_EQ  ( p18.scratch_size( 0 ), scratch_size                   );
+    policy_t p18(league_size, team_size,
+                 Kokkos::ScratchRequest(0, Kokkos::PerTeam(per_team_scratch),
+                                        Kokkos::PerThread(per_thread_scratch)),
+                 Kokkos::ChunkSize(chunk_size));
+    ASSERT_EQ(p18.league_size(), league_size);
+    ASSERT_EQ(p18.team_size(), team_size);
+    ASSERT_EQ(p18.chunk_size(), chunk_size);
+    ASSERT_EQ(p18.scratch_size(0), scratch_size);
 
-    policy_t p19( league_size, team_size, Kokkos::ChunkSize(chunk_size), Kokkos::ScratchRequest( 0, Kokkos::PerTeam( per_team_scratch ), Kokkos::PerThread( per_thread_scratch ) ) );
-    ASSERT_EQ  ( p19.league_size(),     league_size                    );
-    ASSERT_EQ  ( p19.team_size(),       team_size                      );
-    ASSERT_EQ  ( p19.chunk_size(),      chunk_size                     );
-    ASSERT_EQ  ( p19.scratch_size( 0 ), scratch_size                   );
+    policy_t p19(league_size, team_size, Kokkos::ChunkSize(chunk_size),
+                 Kokkos::ScratchRequest(0, Kokkos::PerTeam(per_team_scratch),
+                                        Kokkos::PerThread(per_thread_scratch)));
+    ASSERT_EQ(p19.league_size(), league_size);
+    ASSERT_EQ(p19.team_size(), team_size);
+    ASSERT_EQ(p19.chunk_size(), chunk_size);
+    ASSERT_EQ(p19.scratch_size(0), scratch_size);
 
-    policy_t p20( league_size, team_size, vector_length, Kokkos::ScratchRequest( 0, Kokkos::PerTeam( per_team_scratch ) ) );
-    ASSERT_EQ  ( p20.league_size(),     league_size                    );
-    ASSERT_EQ  ( p20.team_size(),       team_size                      );
-    ASSERT_TRUE( p20.chunk_size()  > 0                                 );
-    ASSERT_EQ  ( p20.scratch_size( 0 ), per_team_scratch               );
+    policy_t p20(league_size, team_size, vector_length,
+                 Kokkos::ScratchRequest(0, Kokkos::PerTeam(per_team_scratch)));
+    ASSERT_EQ(p20.league_size(), league_size);
+    ASSERT_EQ(p20.team_size(), team_size);
+    ASSERT_TRUE(p20.chunk_size() > 0);
+    ASSERT_EQ(p20.scratch_size(0), per_team_scratch);
 
-    policy_t p21( league_size, team_size, vector_length, Kokkos::ScratchRequest( 0, Kokkos::PerThread( per_thread_scratch ) ) );
-    ASSERT_EQ  ( p21.league_size(),     league_size                    );
-    ASSERT_EQ  ( p21.team_size(),       team_size                      );
-    ASSERT_TRUE( p21.chunk_size()  > 0                                 );
-    ASSERT_EQ  ( p21.scratch_size( 0 ), per_thread_scratch * team_size );
+    policy_t p21(
+        league_size, team_size, vector_length,
+        Kokkos::ScratchRequest(0, Kokkos::PerThread(per_thread_scratch)));
+    ASSERT_EQ(p21.league_size(), league_size);
+    ASSERT_EQ(p21.team_size(), team_size);
+    ASSERT_TRUE(p21.chunk_size() > 0);
+    ASSERT_EQ(p21.scratch_size(0), per_thread_scratch * team_size);
 
-    policy_t p22( league_size, team_size, vector_length, Kokkos::ScratchRequest( 0, Kokkos::PerThread( per_thread_scratch ), Kokkos::PerTeam( per_team_scratch ) ) );
-    ASSERT_EQ  ( p22.league_size(),     league_size                    );
-    ASSERT_EQ  ( p22.team_size(),       team_size                      );
-    ASSERT_TRUE( p22.chunk_size()  > 0                                 );
-    ASSERT_EQ  ( p22.scratch_size( 0 ), scratch_size                   );
+    policy_t p22(
+        league_size, team_size, vector_length,
+        Kokkos::ScratchRequest(0, Kokkos::PerThread(per_thread_scratch),
+                               Kokkos::PerTeam(per_team_scratch)));
+    ASSERT_EQ(p22.league_size(), league_size);
+    ASSERT_EQ(p22.team_size(), team_size);
+    ASSERT_TRUE(p22.chunk_size() > 0);
+    ASSERT_EQ(p22.scratch_size(0), scratch_size);
 
-    policy_t p23( league_size, team_size, (size_t) vector_length, Kokkos::ScratchRequest( 0, Kokkos::PerTeam( per_team_scratch ), Kokkos::PerThread( per_thread_scratch ) ) );
-    ASSERT_EQ  ( p23.league_size(),     league_size                    );
-    ASSERT_EQ  ( p23.team_size(),       team_size                      );
-    ASSERT_TRUE( p23.chunk_size()  > 0                                 );
-    ASSERT_EQ  ( p23.scratch_size( 0 ), scratch_size                   );
+    policy_t p23(league_size, team_size, (size_t)vector_length,
+                 Kokkos::ScratchRequest(0, Kokkos::PerTeam(per_team_scratch),
+                                        Kokkos::PerThread(per_thread_scratch)));
+    ASSERT_EQ(p23.league_size(), league_size);
+    ASSERT_EQ(p23.team_size(), team_size);
+    ASSERT_TRUE(p23.chunk_size() > 0);
+    ASSERT_EQ(p23.scratch_size(0), scratch_size);
 
-    policy_t p24( league_size, team_size, (size_t) vector_length, Kokkos::ScratchRequest( 0, Kokkos::PerTeam( per_team_scratch ), Kokkos::PerThread( per_thread_scratch ) ) );
-    ASSERT_EQ  ( p24.league_size(),     league_size                    );
-    ASSERT_EQ  ( p24.team_size(),       team_size                      );
-    ASSERT_TRUE( p24.chunk_size()  > 0                                 );
-    ASSERT_EQ  ( p24.scratch_size( 0 ), scratch_size                   );
+    policy_t p24(league_size, team_size, (size_t)vector_length,
+                 Kokkos::ScratchRequest(0, Kokkos::PerTeam(per_team_scratch),
+                                        Kokkos::PerThread(per_thread_scratch)));
+    ASSERT_EQ(p24.league_size(), league_size);
+    ASSERT_EQ(p24.team_size(), team_size);
+    ASSERT_TRUE(p24.chunk_size() > 0);
+    ASSERT_EQ(p24.scratch_size(0), scratch_size);
 
-    policy_t p25( league_size, team_size, vector_length, Kokkos::ChunkSize(chunk_size), Kokkos::ScratchRequest( 0, Kokkos::PerTeam( per_team_scratch ) ) );
-    ASSERT_EQ  ( p25.league_size(),     league_size                    );
-    ASSERT_EQ  ( p25.team_size(),       team_size                      );
-    ASSERT_TRUE( p25.chunk_size()  > 0                                 );
-    ASSERT_EQ  ( p25.scratch_size( 0 ), per_team_scratch               );
+    policy_t p25(league_size, team_size, vector_length,
+                 Kokkos::ChunkSize(chunk_size),
+                 Kokkos::ScratchRequest(0, Kokkos::PerTeam(per_team_scratch)));
+    ASSERT_EQ(p25.league_size(), league_size);
+    ASSERT_EQ(p25.team_size(), team_size);
+    ASSERT_TRUE(p25.chunk_size() > 0);
+    ASSERT_EQ(p25.scratch_size(0), per_team_scratch);
 
-    policy_t p26( league_size, team_size, vector_length, Kokkos::ScratchRequest( 0, Kokkos::PerThread( per_thread_scratch ) ), Kokkos::ChunkSize(chunk_size) );
-    ASSERT_EQ  ( p26.league_size(),     league_size                    );
-    ASSERT_EQ  ( p26.team_size(),       team_size                      );
-    ASSERT_EQ  ( p26.chunk_size(),      chunk_size                     );
-    ASSERT_EQ  ( p26.scratch_size( 0 ), per_thread_scratch * team_size );
+    policy_t p26(
+        league_size, team_size, vector_length,
+        Kokkos::ScratchRequest(0, Kokkos::PerThread(per_thread_scratch)),
+        Kokkos::ChunkSize(chunk_size));
+    ASSERT_EQ(p26.league_size(), league_size);
+    ASSERT_EQ(p26.team_size(), team_size);
+    ASSERT_EQ(p26.chunk_size(), chunk_size);
+    ASSERT_EQ(p26.scratch_size(0), per_thread_scratch * team_size);
 
-    policy_t p27( league_size, team_size, vector_length, Kokkos::ChunkSize(chunk_size), Kokkos::ScratchRequest( 0, Kokkos::PerThread( per_thread_scratch ), Kokkos::PerTeam( per_team_scratch ) ) );
-    ASSERT_EQ  ( p27.league_size(),     league_size                    );
-    ASSERT_EQ  ( p27.team_size(),       team_size                      );
-    ASSERT_EQ  ( p27.chunk_size(),      chunk_size                     );
-    ASSERT_EQ  ( p27.scratch_size( 0 ), scratch_size                   );
+    policy_t p27(
+        league_size, team_size, vector_length, Kokkos::ChunkSize(chunk_size),
+        Kokkos::ScratchRequest(0, Kokkos::PerThread(per_thread_scratch),
+                               Kokkos::PerTeam(per_team_scratch)));
+    ASSERT_EQ(p27.league_size(), league_size);
+    ASSERT_EQ(p27.team_size(), team_size);
+    ASSERT_EQ(p27.chunk_size(), chunk_size);
+    ASSERT_EQ(p27.scratch_size(0), scratch_size);
 
-    policy_t p28( league_size, team_size, (size_t) vector_length, Kokkos::ScratchRequest( 0, Kokkos::PerTeam( per_team_scratch ), Kokkos::PerThread( per_thread_scratch ) ), Kokkos::ChunkSize(chunk_size) );
-    ASSERT_EQ  ( p28.league_size(),     league_size                    );
-    ASSERT_EQ  ( p28.team_size(),       team_size                      );
-    ASSERT_EQ  ( p28.chunk_size(),      chunk_size                     );
-    ASSERT_EQ  ( p28.scratch_size( 0 ), scratch_size                   );
+    policy_t p28(league_size, team_size, (size_t)vector_length,
+                 Kokkos::ScratchRequest(0, Kokkos::PerTeam(per_team_scratch),
+                                        Kokkos::PerThread(per_thread_scratch)),
+                 Kokkos::ChunkSize(chunk_size));
+    ASSERT_EQ(p28.league_size(), league_size);
+    ASSERT_EQ(p28.team_size(), team_size);
+    ASSERT_EQ(p28.chunk_size(), chunk_size);
+    ASSERT_EQ(p28.scratch_size(0), scratch_size);
 
-    policy_t p29( league_size, team_size, (size_t) vector_length, Kokkos::ChunkSize(chunk_size), Kokkos::ScratchRequest( 0, Kokkos::PerTeam( per_team_scratch ), Kokkos::PerThread( per_thread_scratch ) ) );
-    ASSERT_EQ  ( p29.league_size(),     league_size                    );
-    ASSERT_EQ  ( p29.team_size(),       team_size                      );
-    ASSERT_EQ  ( p29.chunk_size(),      chunk_size                     );
-    ASSERT_EQ  ( p29.scratch_size( 0 ), scratch_size                   );
+    policy_t p29(league_size, team_size, (size_t)vector_length,
+                 Kokkos::ChunkSize(chunk_size),
+                 Kokkos::ScratchRequest(0, Kokkos::PerTeam(per_team_scratch),
+                                        Kokkos::PerThread(per_thread_scratch)));
+    ASSERT_EQ(p29.league_size(), league_size);
+    ASSERT_EQ(p29.team_size(), team_size);
+    ASSERT_EQ(p29.chunk_size(), chunk_size);
+    ASSERT_EQ(p29.scratch_size(0), scratch_size);
 #endif
-
   }
 
   void test_run_time_parameters() {
-    test_run_time_parameters_type< Kokkos::TeamPolicy<ExecutionSpace> >();
-    test_run_time_parameters_type< Kokkos::TeamPolicy<ExecutionSpace, Kokkos::Schedule<Kokkos::Dynamic>, Kokkos::IndexType<long> > >();
-    test_run_time_parameters_type< Kokkos::TeamPolicy<Kokkos::IndexType<long>, ExecutionSpace, Kokkos::Schedule<Kokkos::Dynamic> > >();
-    test_run_time_parameters_type< Kokkos::TeamPolicy<Kokkos::Schedule<Kokkos::Dynamic>, Kokkos::IndexType<long>, ExecutionSpace, SomeTag > >();
+    test_run_time_parameters_type<Kokkos::TeamPolicy<ExecutionSpace> >();
+    test_run_time_parameters_type<
+        Kokkos::TeamPolicy<ExecutionSpace, Kokkos::Schedule<Kokkos::Dynamic>,
+                           Kokkos::IndexType<long> > >();
+    test_run_time_parameters_type<
+        Kokkos::TeamPolicy<Kokkos::IndexType<long>, ExecutionSpace,
+                           Kokkos::Schedule<Kokkos::Dynamic> > >();
+    test_run_time_parameters_type<Kokkos::TeamPolicy<
+        Kokkos::Schedule<Kokkos::Dynamic>, Kokkos::IndexType<long>,
+        ExecutionSpace, SomeTag> >();
   }
 };
 
-TEST_F( TEST_CATEGORY, policy_construction )
-{
-   TestRangePolicyConstruction< TEST_EXECSPACE >();
-   TestTeamPolicyConstruction< TEST_EXECSPACE >();
+TEST(TEST_CATEGORY, policy_construction) {
+  TestRangePolicyConstruction<TEST_EXECSPACE>();
+  TestTeamPolicyConstruction<TEST_EXECSPACE>();
 }
 
-}
+}  // namespace Test
diff --git a/lib/kokkos/core/unit_test/TestRange.hpp b/lib/kokkos/core/unit_test/TestRange.hpp
index be878046cb..1fd6a508f7 100644
--- a/lib/kokkos/core/unit_test/TestRange.hpp
+++ b/lib/kokkos/core/unit_test/TestRange.hpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -49,11 +50,11 @@ namespace Test {
 
 namespace {
 
-template< class ExecSpace, class ScheduleType >
+template <class ExecSpace, class ScheduleType>
 struct TestRange {
-  typedef int value_type; ///< typedef required for the parallel_reduce
+  typedef int value_type;  ///< typedef required for the parallel_reduce
 
-  typedef Kokkos::View< int*, ExecSpace > view_type;
+  typedef Kokkos::View<int *, ExecSpace> view_type;
 
   view_type m_flags;
 
@@ -65,97 +66,107 @@ struct TestRange {
 
   int N;
   static const int offset = 13;
-  TestRange( const size_t N_ )
-    : m_flags( Kokkos::ViewAllocateWithoutInitializing( "flags" ), N_ ), N(N_)
-    {}
+  TestRange(const size_t N_)
+      : m_flags(Kokkos::ViewAllocateWithoutInitializing("flags"), N_), N(N_) {}
 
-  void test_for()
-  {
+  void test_for() {
+    typename view_type::HostMirror host_flags =
+        Kokkos::create_mirror_view(m_flags);
 
-    typename view_type::HostMirror host_flags = Kokkos::create_mirror_view( m_flags );
-
-    Kokkos::parallel_for( Kokkos::RangePolicy< ExecSpace, ScheduleType >( 0, N ), *this );
+    Kokkos::parallel_for(Kokkos::RangePolicy<ExecSpace, ScheduleType>(0, N),
+                         *this);
 
 #if defined(KOKKOS_ENABLE_PROFILING)
     {
-      typedef TestRange< ExecSpace, ScheduleType > ThisType;
+      typedef TestRange<ExecSpace, ScheduleType> ThisType;
       std::string label("parallel_for");
-      Kokkos::Impl::ParallelConstructName< ThisType, void> pcn(label);
-      ASSERT_EQ( pcn.get(), label );
+      Kokkos::Impl::ParallelConstructName<ThisType, void> pcn(label);
+      ASSERT_EQ(pcn.get(), label);
       std::string empty_label("");
-      Kokkos::Impl::ParallelConstructName< ThisType, void> empty_pcn(empty_label);
-      ASSERT_EQ( empty_pcn.get(), typeid(ThisType).name() );
+      Kokkos::Impl::ParallelConstructName<ThisType, void> empty_pcn(
+          empty_label);
+      ASSERT_EQ(empty_pcn.get(), typeid(ThisType).name());
     }
 #endif
 
-    Kokkos::parallel_for( Kokkos::RangePolicy< ExecSpace, ScheduleType, VerifyInitTag >( 0, N ), *this );
+    Kokkos::parallel_for(
+        Kokkos::RangePolicy<ExecSpace, ScheduleType, VerifyInitTag>(0, N),
+        *this);
 
 #if defined(KOKKOS_ENABLE_PROFILING)
     {
-      typedef TestRange< ExecSpace, ScheduleType > ThisType;
+      typedef TestRange<ExecSpace, ScheduleType> ThisType;
       std::string label("parallel_for");
-      Kokkos::Impl::ParallelConstructName< ThisType, VerifyInitTag> pcn(label);
-      ASSERT_EQ( pcn.get(), label );
+      Kokkos::Impl::ParallelConstructName<ThisType, VerifyInitTag> pcn(label);
+      ASSERT_EQ(pcn.get(), label);
       std::string empty_label("");
-      Kokkos::Impl::ParallelConstructName< ThisType, VerifyInitTag> empty_pcn(empty_label);
-      ASSERT_EQ( empty_pcn.get(), std::string(typeid(ThisType).name()) + "/" + typeid(VerifyInitTag).name() );
+      Kokkos::Impl::ParallelConstructName<ThisType, VerifyInitTag> empty_pcn(
+          empty_label);
+      ASSERT_EQ(empty_pcn.get(), std::string(typeid(ThisType).name()) + "/" +
+                                     typeid(VerifyInitTag).name());
     }
 #endif
 
-    Kokkos::deep_copy( host_flags, m_flags );
+    Kokkos::deep_copy(host_flags, m_flags);
 
     int error_count = 0;
-    for ( int i = 0; i < N; ++i ) {
-      if ( int( i ) != host_flags( i ) ) ++error_count;
+    for (int i = 0; i < N; ++i) {
+      if (int(i) != host_flags(i)) ++error_count;
     }
-    ASSERT_EQ( error_count, int( 0 ) );
+    ASSERT_EQ(error_count, int(0));
 
-    Kokkos::parallel_for( Kokkos::RangePolicy< ExecSpace, ScheduleType, ResetTag >( 0, N ), *this );
-    Kokkos::parallel_for( std::string( "TestKernelFor" ), Kokkos::RangePolicy< ExecSpace, ScheduleType, VerifyResetTag >( 0, N ), *this );
-
-    Kokkos::deep_copy( host_flags, m_flags );
-
-    error_count = 0;
-    for ( int i = 0; i < N; ++i ) {
-      if ( int( 2 * i ) != host_flags( i ) ) ++error_count;
-    }
-    ASSERT_EQ( error_count, int( 0 ) );
-
-    Kokkos::parallel_for( Kokkos::RangePolicy< ExecSpace, ScheduleType, OffsetTag >( offset, N + offset ), *this );
-    Kokkos::parallel_for( std::string("TestKernelFor"), Kokkos::RangePolicy<ExecSpace, ScheduleType, VerifyOffsetTag>( 0, N ), *this);
+    Kokkos::parallel_for(
+        Kokkos::RangePolicy<ExecSpace, ScheduleType, ResetTag>(0, N), *this);
+    Kokkos::parallel_for(
+        std::string("TestKernelFor"),
+        Kokkos::RangePolicy<ExecSpace, ScheduleType, VerifyResetTag>(0, N),
+        *this);
 
     Kokkos::deep_copy(host_flags, m_flags);
 
     error_count = 0;
     for (int i = 0; i < N; ++i) {
-      if (i + offset != host_flags(i))
-        ++error_count;
+      if (int(2 * i) != host_flags(i)) ++error_count;
+    }
+    ASSERT_EQ(error_count, int(0));
+
+    Kokkos::parallel_for(
+        Kokkos::RangePolicy<ExecSpace, ScheduleType, OffsetTag>(offset,
+                                                                N + offset),
+        *this);
+    Kokkos::parallel_for(
+        std::string("TestKernelFor"),
+        Kokkos::RangePolicy<ExecSpace, ScheduleType, VerifyOffsetTag>(0, N),
+        *this);
+
+    Kokkos::deep_copy(host_flags, m_flags);
+
+    error_count = 0;
+    for (int i = 0; i < N; ++i) {
+      if (i + offset != host_flags(i)) ++error_count;
     }
     ASSERT_EQ(error_count, int(0));
   }
 
   KOKKOS_INLINE_FUNCTION
-  void operator()( const int i ) const
-  { m_flags( i )  = i; }
+  void operator()(const int i) const { m_flags(i) = i; }
 
   KOKKOS_INLINE_FUNCTION
-  void operator()( const VerifyInitTag &, const int i ) const
-  {
-    if ( i != m_flags( i ) ) {
-      printf( "TestRange::test_for error at %d != %d\n", i, m_flags( i ) );
+  void operator()(const VerifyInitTag &, const int i) const {
+    if (i != m_flags(i)) {
+      printf("TestRange::test_for error at %d != %d\n", i, m_flags(i));
     }
   }
 
   KOKKOS_INLINE_FUNCTION
-  void operator()( const ResetTag &, const int i ) const
-  { m_flags( i ) = 2 * m_flags( i ); }
+  void operator()(const ResetTag &, const int i) const {
+    m_flags(i) = 2 * m_flags(i);
+  }
 
   KOKKOS_INLINE_FUNCTION
-  void operator()( const VerifyResetTag &, const int i ) const
-  {
-    if ( 2 * i != m_flags( i ) )
-    {
-      printf( "TestRange::test_for error at %d != %d\n", i, m_flags( i ) );
+  void operator()(const VerifyResetTag &, const int i) const {
+    if (2 * i != m_flags(i)) {
+      printf("TestRange::test_for error at %d != %d\n", i, m_flags(i));
     }
   }
 
@@ -173,131 +184,160 @@ struct TestRange {
 
   //----------------------------------------
 
-  void test_reduce( )
-  {
+  void test_reduce() {
     int total = 0;
 
-    Kokkos::parallel_for( Kokkos::RangePolicy< ExecSpace, ScheduleType >( 0, N ), *this );
+    Kokkos::parallel_for(Kokkos::RangePolicy<ExecSpace, ScheduleType>(0, N),
+                         *this);
 
-    Kokkos::parallel_reduce( "TestKernelReduce", Kokkos::RangePolicy< ExecSpace, ScheduleType >( 0, N ), *this, total );
+    Kokkos::parallel_reduce("TestKernelReduce",
+                            Kokkos::RangePolicy<ExecSpace, ScheduleType>(0, N),
+                            *this, total);
     // sum( 0 .. N-1 )
-    ASSERT_EQ( size_t( ( N - 1 ) * ( N ) / 2 ), size_t( total ) );
+    ASSERT_EQ(size_t((N - 1) * (N) / 2), size_t(total));
 
-    Kokkos::parallel_reduce( Kokkos::RangePolicy< ExecSpace, ScheduleType, OffsetTag>( offset, N+offset ), *this, total );
+    Kokkos::parallel_reduce(
+        Kokkos::RangePolicy<ExecSpace, ScheduleType, OffsetTag>(offset,
+                                                                N + offset),
+        *this, total);
     // sum( 1 .. N )
-    ASSERT_EQ( size_t( ( N ) * ( N + 1 ) / 2 ), size_t( total ) );
+    ASSERT_EQ(size_t((N) * (N + 1) / 2), size_t(total));
   }
 
   KOKKOS_INLINE_FUNCTION
-  void operator()( const int i, value_type & update ) const
-  { update += m_flags( i ); }
+  void operator()(const int i, value_type &update) const {
+    update += m_flags(i);
+  }
 
   KOKKOS_INLINE_FUNCTION
-  void operator()( const OffsetTag &, const int i, value_type & update ) const
-  { update += 1 + m_flags( i-offset ); }
+  void operator()(const OffsetTag &, const int i, value_type &update) const {
+    update += 1 + m_flags(i - offset);
+  }
 
   //----------------------------------------
 
-  void test_scan( )
-  {
+  void test_scan() {
+    Kokkos::parallel_for(Kokkos::RangePolicy<ExecSpace, ScheduleType>(0, N),
+                         *this);
 
-    Kokkos::parallel_for( Kokkos::RangePolicy< ExecSpace, ScheduleType >( 0, N ), *this );
-
-    Kokkos::parallel_scan( "TestKernelScan", Kokkos::RangePolicy< ExecSpace, ScheduleType, OffsetTag>( 0, N ), *this );
+    Kokkos::parallel_scan(
+        "TestKernelScan",
+        Kokkos::RangePolicy<ExecSpace, ScheduleType, OffsetTag>(0, N), *this);
 
     int total = 0;
-    Kokkos::parallel_scan( "TestKernelScanWithTotal", Kokkos::RangePolicy< ExecSpace, ScheduleType, OffsetTag>( 0, N ), *this, total );
-    ASSERT_EQ( size_t( ( N - 1 ) * ( N ) / 2 ), size_t( total ) );// sum( 0 .. N-1 )
+    Kokkos::parallel_scan(
+        "TestKernelScanWithTotal",
+        Kokkos::RangePolicy<ExecSpace, ScheduleType, OffsetTag>(0, N), *this,
+        total);
+    ASSERT_EQ(size_t((N - 1) * (N) / 2), size_t(total));  // sum( 0 .. N-1 )
   }
 
   KOKKOS_INLINE_FUNCTION
-  void operator()( const OffsetTag &, const int i, value_type & update, bool final ) const
-  {
-    update += m_flags( i );
+  void operator()(const OffsetTag &, const int i, value_type &update,
+                  bool final) const {
+    update += m_flags(i);
 
-    if ( final ) {
-      if ( update != ( i * ( i + 1 ) ) / 2 ) {
-        printf( "TestRange::test_scan error %d : %d != %d\n", i, ( i * ( i + 1 ) ) / 2, m_flags( i ) );
+    if (final) {
+      if (update != (i * (i + 1)) / 2) {
+        printf("TestRange::test_scan error %d : %d != %d\n", i,
+               (i * (i + 1)) / 2, m_flags(i));
       }
     }
   }
 
-  void test_dynamic_policy()
-  {
-#if defined(KOKKOS_ENABLE_CXX11_DISPATCH_LAMBDA) 
-   #if !defined(KOKKOS_ENABLE_CUDA) || ( 8000 <= CUDA_VERSION )
-     typedef Kokkos::RangePolicy< ExecSpace, Kokkos::Schedule<Kokkos::Dynamic> > policy_t;
+  void test_dynamic_policy() {
+    auto const N_no_implicit_capture = N;
+#if defined(KOKKOS_ENABLE_CXX11_DISPATCH_LAMBDA)
+#if !defined(KOKKOS_ENABLE_CUDA) || (8000 <= CUDA_VERSION)
+    typedef Kokkos::RangePolicy<ExecSpace, Kokkos::Schedule<Kokkos::Dynamic> >
+        policy_t;
 
     {
-      Kokkos::View< size_t*, ExecSpace, Kokkos::MemoryTraits<Kokkos::Atomic> > count( "Count", ExecSpace::concurrency() );
-      Kokkos::View< int*, ExecSpace > a( "A", N );
+      Kokkos::View<size_t *, ExecSpace, Kokkos::MemoryTraits<Kokkos::Atomic> >
+          count("Count", ExecSpace::concurrency());
+      Kokkos::View<int *, ExecSpace> a("A", N);
 
-      Kokkos::parallel_for( policy_t( 0, N ), KOKKOS_LAMBDA ( const int& i ) {
-        for ( int k = 0; k < ( i < N / 2 ? 1 : 10000 ); k++ ) {
-          a( i )++;
-        }
+      Kokkos::parallel_for(
+          policy_t(0, N), KOKKOS_LAMBDA(const int &i) {
+            for (int k = 0; k < (i < N_no_implicit_capture / 2 ? 1 : 10000);
+                 k++) {
+              a(i)++;
+            }
 #ifdef KOKKOS_ENABLE_DEPRECATED_CODE
-        count( ExecSpace::hardware_thread_id() )++;
+            count(ExecSpace::hardware_thread_id())++;
 #else
         count( ExecSpace::impl_hardware_thread_id() )++;
 #endif
-      });
+          });
 
       int error = 0;
-      Kokkos::parallel_reduce( Kokkos::RangePolicy< ExecSpace >( 0, N ), KOKKOS_LAMBDA( const int & i, int & lsum ) {
-        lsum += ( a( i ) != ( i < N / 2 ? 1 : 10000 ) );
-      }, error );
-      ASSERT_EQ( error, 0 );
+      Kokkos::parallel_reduce(
+          Kokkos::RangePolicy<ExecSpace>(0, N),
+          KOKKOS_LAMBDA(const int &i, int &lsum) {
+            lsum += (a(i) != (i < N_no_implicit_capture / 2 ? 1 : 10000));
+          },
+          error);
+      ASSERT_EQ(error, 0);
 
-      if ( ( ExecSpace::concurrency() > (int) 1 ) && ( N > static_cast<int>( 4 * ExecSpace::concurrency() ) ) ) {
+      if ((ExecSpace::concurrency() > (int)1) &&
+          (N > static_cast<int>(4 * ExecSpace::concurrency()))) {
         size_t min = N;
         size_t max = 0;
-        for ( int t = 0; t < ExecSpace::concurrency(); t++ ) {
-          if ( count( t ) < min ) min = count( t );
-          if ( count( t ) > max ) max = count( t );
+        for (int t = 0; t < ExecSpace::concurrency(); t++) {
+          if (count(t) < min) min = count(t);
+          if (count(t) > max) max = count(t);
         }
-        ASSERT_TRUE( min < max );
+        ASSERT_TRUE(min < max);
 
-        //if ( ExecSpace::concurrency() > 2 ) {
+        // if ( ExecSpace::concurrency() > 2 ) {
         //  ASSERT_TRUE( 2 * min < max );
         //}
       }
     }
 
     {
-      Kokkos::View< size_t*, ExecSpace, Kokkos::MemoryTraits<Kokkos::Atomic> > count( "Count", ExecSpace::concurrency() );
-      Kokkos::View< int*, ExecSpace> a( "A", N );
+      Kokkos::View<size_t *, ExecSpace, Kokkos::MemoryTraits<Kokkos::Atomic> >
+          count("Count", ExecSpace::concurrency());
+      Kokkos::View<int *, ExecSpace> a("A", N);
 
       int sum = 0;
-      Kokkos::parallel_reduce( policy_t( 0, N ), KOKKOS_LAMBDA( const int & i, int & lsum ) {
-        for ( int k = 0; k < ( i < N / 2 ? 1 : 10000 ); k++ ) {
-          a( i )++;
-        }
+      Kokkos::parallel_reduce(
+          policy_t(0, N),
+          KOKKOS_LAMBDA(const int &i, int &lsum) {
+            for (int k = 0; k < (i < N_no_implicit_capture / 2 ? 1 : 10000);
+                 k++) {
+              a(i)++;
+            }
 #ifdef KOKKOS_ENABLE_DEPRECATED_CODE
-        count( ExecSpace::hardware_thread_id() )++;
+            count(ExecSpace::hardware_thread_id())++;
 #else
-        count( ExecSpace::impl_hardware_thread_id() )++;
+            count(ExecSpace::impl_hardware_thread_id())++;
 #endif
-        lsum++;
-      }, sum );
-      ASSERT_EQ( sum, N );
+            lsum++;
+          },
+          sum);
+      ASSERT_EQ(sum, N);
 
       int error = 0;
-      Kokkos::parallel_reduce( Kokkos::RangePolicy< ExecSpace >( 0, N ), KOKKOS_LAMBDA( const int & i, int & lsum ) {
-        lsum += ( a( i ) != ( i < N / 2 ? 1 : 10000 ) );
-      }, error );
-      ASSERT_EQ( error, 0 );
+      Kokkos::parallel_reduce(
+          Kokkos::RangePolicy<ExecSpace>(0, N),
+          KOKKOS_LAMBDA(const int &i, int &lsum) {
+            lsum += (a(i) != (i < N_no_implicit_capture / 2 ? 1 : 10000));
+          },
+          error);
+      ASSERT_EQ(error, 0);
 
-      if ( ( ExecSpace::concurrency() > (int) 1 ) && ( N > static_cast<int>( 4 * ExecSpace::concurrency() ) ) ) {
+      if ((ExecSpace::concurrency() > (int)1) &&
+          (N > static_cast<int>(4 * ExecSpace::concurrency()))) {
         size_t min = N;
         size_t max = 0;
-        for ( int t = 0; t < ExecSpace::concurrency(); t++ ) {
-          if ( count( t ) < min ) min = count( t );
-          if ( count( t ) > max ) max = count( t );
+        for (int t = 0; t < ExecSpace::concurrency(); t++) {
+          if (count(t) < min) min = count(t);
+          if (count(t) > max) max = count(t);
         }
-        ASSERT_TRUE( min < max );
+        ASSERT_TRUE(min < max);
 
-        //if ( ExecSpace::concurrency() > 2 ) {
+        // if ( ExecSpace::concurrency() > 2 ) {
         //  ASSERT_TRUE( 2 * min < max );
         //}
       }
@@ -307,52 +347,112 @@ struct TestRange {
   }
 };
 
-} // namespace
+}  // namespace
 
-TEST_F( TEST_CATEGORY, range_for )
-{
-  { TestRange< TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Static> >f(0); f.test_for(); }
-  { TestRange< TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Dynamic> >f(0); f.test_for(); }
+TEST(TEST_CATEGORY, range_for) {
+  {
+    TestRange<TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Static> > f(0);
+    f.test_for();
+  }
+  {
+    TestRange<TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Dynamic> > f(0);
+    f.test_for();
+  }
 
-  { TestRange< TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Static> >f(2); f.test_for(); }
-  { TestRange< TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Dynamic> >f(3); f.test_for(); }
+  {
+    TestRange<TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Static> > f(2);
+    f.test_for();
+  }
+  {
+    TestRange<TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Dynamic> > f(3);
+    f.test_for();
+  }
 
-  { TestRange< TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Static> >f(1000); f.test_for(); }
-  { TestRange< TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Dynamic> >f(1001); f.test_for(); }
+  {
+    TestRange<TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Static> > f(1000);
+    f.test_for();
+  }
+  {
+    TestRange<TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Dynamic> > f(1001);
+    f.test_for();
+  }
 }
 
-TEST_F( TEST_CATEGORY, range_reduce )
-{
-  { TestRange< TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Static> >f(0); f.test_reduce(); }
-  { TestRange< TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Dynamic> >f(0); f.test_reduce(); }
+TEST(TEST_CATEGORY, range_reduce) {
+  {
+    TestRange<TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Static> > f(0);
+    f.test_reduce();
+  }
+  {
+    TestRange<TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Dynamic> > f(0);
+    f.test_reduce();
+  }
 
-  { TestRange< TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Static> >f(2); f.test_reduce(); }
-  { TestRange< TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Dynamic> >f(3); f.test_reduce(); }
+  {
+    TestRange<TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Static> > f(2);
+    f.test_reduce();
+  }
+  {
+    TestRange<TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Dynamic> > f(3);
+    f.test_reduce();
+  }
 
-  { TestRange< TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Static> >f(1000); f.test_reduce(); }
-  { TestRange< TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Dynamic> >f(1001); f.test_reduce(); }
+  {
+    TestRange<TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Static> > f(1000);
+    f.test_reduce();
+  }
+  {
+    TestRange<TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Dynamic> > f(1001);
+    f.test_reduce();
+  }
 }
 
-#ifndef KOKKOS_ENABLE_OPENMPTARGET 
-TEST_F( TEST_CATEGORY, range_scan )
-{
-  { TestRange< TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Static> >f(0); f.test_scan(); }
-  { TestRange< TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Dynamic> >f(0); f.test_scan(); }
+#ifndef KOKKOS_ENABLE_OPENMPTARGET
+TEST(TEST_CATEGORY, range_scan) {
+  {
+    TestRange<TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Static> > f(0);
+    f.test_scan();
+  }
+  {
+    TestRange<TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Dynamic> > f(0);
+    f.test_scan();
+  }
 #if !defined(KOKKOS_ENABLE_CUDA) && !defined(KOKKOS_ENABLE_ROCM)
-  { TestRange< TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Dynamic> >f(0); f.test_dynamic_policy(); }
+  {
+    TestRange<TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Dynamic> > f(0);
+    f.test_dynamic_policy();
+  }
 #endif
 
-  { TestRange< TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Static> >f(2); f.test_scan(); }
-  { TestRange< TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Dynamic> >f(3); f.test_scan(); }
+  {
+    TestRange<TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Static> > f(2);
+    f.test_scan();
+  }
+  {
+    TestRange<TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Dynamic> > f(3);
+    f.test_scan();
+  }
 #if !defined(KOKKOS_ENABLE_CUDA) && !defined(KOKKOS_ENABLE_ROCM)
-  { TestRange< TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Dynamic> >f(3); f.test_dynamic_policy(); }
+  {
+    TestRange<TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Dynamic> > f(3);
+    f.test_dynamic_policy();
+  }
 #endif
 
-  { TestRange< TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Static> >f(1000); f.test_scan(); }
-  { TestRange< TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Dynamic> >f(1001); f.test_scan(); }
+  {
+    TestRange<TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Static> > f(1000);
+    f.test_scan();
+  }
+  {
+    TestRange<TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Dynamic> > f(1001);
+    f.test_scan();
+  }
 #if !defined(KOKKOS_ENABLE_CUDA) && !defined(KOKKOS_ENABLE_ROCM)
-  { TestRange< TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Dynamic> >f(1001); f.test_dynamic_policy(); }
+  {
+    TestRange<TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Dynamic> > f(1001);
+    f.test_dynamic_policy();
+  }
 #endif
 }
 #endif
-} // namespace Test
+}  // namespace Test
diff --git a/lib/kokkos/core/unit_test/TestReduce.hpp b/lib/kokkos/core/unit_test/TestReduce.hpp
index 924d8eb45f..6c518429a0 100644
--- a/lib/kokkos/core/unit_test/TestReduce.hpp
+++ b/lib/kokkos/core/unit_test/TestReduce.hpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -50,10 +51,9 @@
 
 namespace Test {
 
-template< typename ScalarType, class DeviceType >
-class ReduceFunctor
-{
-public:
+template <typename ScalarType, class DeviceType>
+class ReduceFunctor {
+ public:
   typedef DeviceType execution_space;
   typedef typename execution_space::size_type size_type;
 
@@ -64,443 +64,400 @@ public:
   const size_type nwork;
 
   KOKKOS_INLINE_FUNCTION
-  ReduceFunctor( const size_type & arg_nwork )
-    : nwork( arg_nwork ) {}
+  ReduceFunctor(const size_type& arg_nwork) : nwork(arg_nwork) {}
 
   KOKKOS_INLINE_FUNCTION
-  ReduceFunctor( const ReduceFunctor & rhs )
-    : nwork( rhs.nwork ) {}
+  ReduceFunctor(const ReduceFunctor& rhs) : nwork(rhs.nwork) {}
 
-/*
-  KOKKOS_INLINE_FUNCTION
-  void init( value_type & dst ) const
-  {
-    dst.value[0] = 0;
-    dst.value[1] = 0;
-    dst.value[2] = 0;
-  }
-*/
+  /*
+    KOKKOS_INLINE_FUNCTION
+    void init( value_type & dst ) const
+    {
+      dst.value[0] = 0;
+      dst.value[1] = 0;
+      dst.value[2] = 0;
+    }
+  */
 
   KOKKOS_INLINE_FUNCTION
-  void join( volatile value_type & dst,
-             const volatile value_type & src ) const
-  {
+  void join(volatile value_type& dst, const volatile value_type& src) const {
     dst.value[0] += src.value[0];
     dst.value[1] += src.value[1];
     dst.value[2] += src.value[2];
   }
 
   KOKKOS_INLINE_FUNCTION
-  void operator()( size_type iwork, value_type & dst ) const
-  {
+  void operator()(size_type iwork, value_type& dst) const {
     dst.value[0] += 1;
     dst.value[1] += iwork + 1;
     dst.value[2] += nwork - iwork;
   }
 };
 
-template< class DeviceType >
-class ReduceFunctorFinal : public ReduceFunctor< long, DeviceType > {
-public:
-  typedef typename ReduceFunctor< long, DeviceType >::value_type value_type;
+template <class DeviceType>
+class ReduceFunctorFinal : public ReduceFunctor<long, DeviceType> {
+ public:
+  typedef typename ReduceFunctor<long, DeviceType>::value_type value_type;
 
   KOKKOS_INLINE_FUNCTION
-  ReduceFunctorFinal( const size_t n )
-    : ReduceFunctor< long, DeviceType >( n ) {}
+  ReduceFunctorFinal(const size_t n) : ReduceFunctor<long, DeviceType>(n) {}
 
   KOKKOS_INLINE_FUNCTION
-  void final( value_type & dst ) const
-  {
+  void final(value_type& dst) const {
     dst.value[0] = -dst.value[0];
     dst.value[1] = -dst.value[1];
     dst.value[2] = -dst.value[2];
   }
 };
 
-template< typename ScalarType, class DeviceType >
-class RuntimeReduceFunctor
-{
-public:
+template <typename ScalarType, class DeviceType>
+class RuntimeReduceFunctor {
+ public:
   // Required for functor:
-  typedef DeviceType  execution_space;
-  typedef ScalarType  value_type[];
-  const unsigned      value_count;
+  typedef DeviceType execution_space;
+  typedef ScalarType value_type[];
+  const unsigned value_count;
 
   // Unit test details:
 
   typedef typename execution_space::size_type size_type;
 
-  const size_type     nwork;
+  const size_type nwork;
 
-  RuntimeReduceFunctor( const size_type arg_nwork,
-                        const size_type arg_count )
-    : value_count( arg_count )
-    , nwork( arg_nwork ) {}
+  RuntimeReduceFunctor(const size_type arg_nwork, const size_type arg_count)
+      : value_count(arg_count), nwork(arg_nwork) {}
 
   KOKKOS_INLINE_FUNCTION
-  void init( ScalarType dst[] ) const
-  {
-    for ( unsigned i = 0; i < value_count; ++i ) dst[i] = 0;
+  void init(ScalarType dst[]) const {
+    for (unsigned i = 0; i < value_count; ++i) dst[i] = 0;
   }
 
   KOKKOS_INLINE_FUNCTION
-  void join( volatile ScalarType dst[],
-             const volatile ScalarType src[] ) const
-  {
-    for ( unsigned i = 0; i < value_count; ++i ) dst[i] += src[i];
+  void join(volatile ScalarType dst[], const volatile ScalarType src[]) const {
+    for (unsigned i = 0; i < value_count; ++i) dst[i] += src[i];
   }
 
   KOKKOS_INLINE_FUNCTION
-  void operator()( size_type iwork, ScalarType dst[] ) const
-  {
-    const size_type tmp[3] = { 1, iwork + 1, nwork - iwork };
+  void operator()(size_type iwork, ScalarType dst[]) const {
+    const size_type tmp[3] = {1, iwork + 1, nwork - iwork};
 
-    for ( size_type i = 0; i < value_count; ++i ) {
-      dst[i] += tmp[ i % 3 ];
+    for (size_type i = 0; i < value_count; ++i) {
+      dst[i] += tmp[i % 3];
     }
   }
 };
 
-template< typename ScalarType, class DeviceType >
-class RuntimeReduceMinMax
-{
-public:
+template <typename ScalarType, class DeviceType>
+class RuntimeReduceMinMax {
+ public:
   // Required for functor:
-  typedef DeviceType  execution_space;
-  typedef ScalarType  value_type[];
-  const unsigned      value_count;
+  typedef DeviceType execution_space;
+  typedef ScalarType value_type[];
+  const unsigned value_count;
 
   // Unit test details:
 
   typedef typename execution_space::size_type size_type;
 
-  const size_type     nwork;
-  const ScalarType    amin;
-  const ScalarType    amax;
+  const size_type nwork;
+  const ScalarType amin;
+  const ScalarType amax;
 
-  RuntimeReduceMinMax( const size_type arg_nwork,
-                       const size_type arg_count )
-    : value_count( arg_count )
-    , nwork( arg_nwork )
-    , amin( std::numeric_limits< ScalarType >::min() )
-    , amax( std::numeric_limits< ScalarType >::max() )
-    {}
+  RuntimeReduceMinMax(const size_type arg_nwork, const size_type arg_count)
+      : value_count(arg_count),
+        nwork(arg_nwork),
+        amin(std::numeric_limits<ScalarType>::min()),
+        amax(std::numeric_limits<ScalarType>::max()) {}
 
   KOKKOS_INLINE_FUNCTION
-  void init( ScalarType dst[] ) const
-  {
-    for ( unsigned i = 0; i < value_count; ++i ) {
+  void init(ScalarType dst[]) const {
+    for (unsigned i = 0; i < value_count; ++i) {
       dst[i] = i % 2 ? amax : amin;
     }
   }
 
   KOKKOS_INLINE_FUNCTION
-  void join( volatile ScalarType dst[],
-             const volatile ScalarType src[] ) const
-  {
-    for ( unsigned i = 0; i < value_count; ++i ) {
-      dst[i] = i % 2 ? ( dst[i] < src[i] ? dst[i] : src[i] )  // min
-                     : ( dst[i] > src[i] ? dst[i] : src[i] ); // max
+  void join(volatile ScalarType dst[], const volatile ScalarType src[]) const {
+    for (unsigned i = 0; i < value_count; ++i) {
+      dst[i] = i % 2 ? (dst[i] < src[i] ? dst[i] : src[i])   // min
+                     : (dst[i] > src[i] ? dst[i] : src[i]);  // max
     }
   }
 
   KOKKOS_INLINE_FUNCTION
-  void operator()( size_type iwork, ScalarType dst[] ) const
-  {
-    const ScalarType tmp[2] = { ScalarType( iwork + 1 )
-                              , ScalarType( nwork - iwork ) };
+  void operator()(size_type iwork, ScalarType dst[]) const {
+    const ScalarType tmp[2] = {ScalarType(iwork + 1),
+                               ScalarType(nwork - iwork)};
 
-    for ( size_type i = 0; i < value_count; ++i ) {
-      dst[i] = i % 2 ? ( dst[i] < tmp[i % 2] ? dst[i] : tmp[i % 2] )
-                     : ( dst[i] > tmp[i % 2] ? dst[i] : tmp[i % 2] );
+    for (size_type i = 0; i < value_count; ++i) {
+      dst[i] = i % 2 ? (dst[i] < tmp[i % 2] ? dst[i] : tmp[i % 2])
+                     : (dst[i] > tmp[i % 2] ? dst[i] : tmp[i % 2]);
     }
   }
 };
 
-template< class DeviceType >
-class RuntimeReduceFunctorFinal : public RuntimeReduceFunctor< long, DeviceType > {
-public:
-  typedef RuntimeReduceFunctor< long, DeviceType > base_type;
+template <class DeviceType>
+class RuntimeReduceFunctorFinal
+    : public RuntimeReduceFunctor<long, DeviceType> {
+ public:
+  typedef RuntimeReduceFunctor<long, DeviceType> base_type;
   typedef typename base_type::value_type value_type;
   typedef long scalar_type;
 
-  RuntimeReduceFunctorFinal( const size_t theNwork, const size_t count )
-    : base_type( theNwork, count ) {}
+  RuntimeReduceFunctorFinal(const size_t theNwork, const size_t count)
+      : base_type(theNwork, count) {}
 
   KOKKOS_INLINE_FUNCTION
-  void final( value_type dst ) const
-  {
-    for ( unsigned i = 0; i < base_type::value_count; ++i ) {
+  void final(value_type dst) const {
+    for (unsigned i = 0; i < base_type::value_count; ++i) {
       dst[i] = -dst[i];
     }
   }
 };
 
-
 namespace {
 
-template< typename ScalarType, class DeviceType >
-class TestReduce
-{
-public:
+template <typename ScalarType, class DeviceType>
+class TestReduce {
+ public:
   typedef DeviceType execution_space;
   typedef typename execution_space::size_type size_type;
 
-  TestReduce( const size_type & nwork )
-  {
-    run_test( nwork );
-    run_test_final( nwork );
+  TestReduce(const size_type& nwork) {
+    run_test(nwork);
+    run_test_final(nwork);
   }
 
-  void run_test( const size_type & nwork )
-  {
-    typedef Test::ReduceFunctor< ScalarType, execution_space > functor_type;
+  void run_test(const size_type& nwork) {
+    typedef Test::ReduceFunctor<ScalarType, execution_space> functor_type;
     typedef typename functor_type::value_type value_type;
 
     enum { Count = 3 };
     enum { Repeat = 100 };
 
-    value_type result[ Repeat ];
+    value_type result[Repeat];
 
-    const unsigned long nw   = nwork;
-    const unsigned long nsum = nw % 2 ? nw * ( ( nw + 1 ) / 2 )
-                                      : ( nw / 2 ) * ( nw + 1 );
+    const unsigned long nw = nwork;
+    const unsigned long nsum =
+        nw % 2 ? nw * ((nw + 1) / 2) : (nw / 2) * (nw + 1);
 
-    for ( unsigned i = 0; i < Repeat; ++i ) {
-      Kokkos::parallel_reduce( nwork, functor_type( nwork ), result[i] );
+    for (unsigned i = 0; i < Repeat; ++i) {
+      Kokkos::parallel_reduce(nwork, functor_type(nwork), result[i]);
     }
 
-    for ( unsigned i = 0; i < Repeat; ++i ) {
-      for ( unsigned j = 0; j < Count; ++j ) {
+    for (unsigned i = 0; i < Repeat; ++i) {
+      for (unsigned j = 0; j < Count; ++j) {
         const unsigned long correct = 0 == j % 3 ? nw : nsum;
-        ASSERT_EQ( (ScalarType) correct, result[i].value[j] );
+        ASSERT_EQ((ScalarType)correct, result[i].value[j]);
       }
     }
   }
 
-  void run_test_final( const size_type & nwork )
-  {
-    typedef Test::ReduceFunctorFinal< execution_space > functor_type;
+  void run_test_final(const size_type& nwork) {
+    typedef Test::ReduceFunctorFinal<execution_space> functor_type;
     typedef typename functor_type::value_type value_type;
 
     enum { Count = 3 };
     enum { Repeat = 100 };
 
-    value_type result[ Repeat ];
+    value_type result[Repeat];
 
-    const unsigned long nw   = nwork;
-    const unsigned long nsum = nw % 2 ? nw * ( ( nw + 1 ) / 2 )
-                                      : ( nw / 2 ) * ( nw + 1 );
+    const unsigned long nw = nwork;
+    const unsigned long nsum =
+        nw % 2 ? nw * ((nw + 1) / 2) : (nw / 2) * (nw + 1);
 
-    for ( unsigned i = 0; i < Repeat; ++i ) {
-      if ( i % 2 == 0 ) {
-        Kokkos::parallel_reduce( nwork, functor_type( nwork ), result[i] );
-      }
-      else {
-        Kokkos::parallel_reduce( "Reduce", nwork, functor_type( nwork ), result[i] );
+    for (unsigned i = 0; i < Repeat; ++i) {
+      if (i % 2 == 0) {
+        Kokkos::parallel_reduce(nwork, functor_type(nwork), result[i]);
+      } else {
+        Kokkos::parallel_reduce("Reduce", nwork, functor_type(nwork),
+                                result[i]);
       }
     }
 
-    for ( unsigned i = 0; i < Repeat; ++i ) {
-      for ( unsigned j = 0; j < Count; ++j ) {
+    for (unsigned i = 0; i < Repeat; ++i) {
+      for (unsigned j = 0; j < Count; ++j) {
         const unsigned long correct = 0 == j % 3 ? nw : nsum;
-        ASSERT_EQ( (ScalarType) correct, -result[i].value[j] );
+        ASSERT_EQ((ScalarType)correct, -result[i].value[j]);
       }
     }
   }
 };
 
-template< typename ScalarType, class DeviceType >
-class TestReduceDynamic
-{
-public:
+template <typename ScalarType, class DeviceType>
+class TestReduceDynamic {
+ public:
   typedef DeviceType execution_space;
   typedef typename execution_space::size_type size_type;
 
-  TestReduceDynamic( const size_type nwork )
-  {
-    run_test_dynamic( nwork );
-    run_test_dynamic_minmax( nwork );
-    run_test_dynamic_final( nwork );
+  TestReduceDynamic(const size_type nwork) {
+    run_test_dynamic(nwork);
+    run_test_dynamic_minmax(nwork);
+    run_test_dynamic_final(nwork);
   }
 
-  void run_test_dynamic( const size_type nwork )
-  {
-    typedef Test::RuntimeReduceFunctor< ScalarType, execution_space > functor_type;
+  void run_test_dynamic(const size_type nwork) {
+    typedef Test::RuntimeReduceFunctor<ScalarType, execution_space>
+        functor_type;
 
     enum { Count = 3 };
     enum { Repeat = 100 };
 
-    ScalarType result[ Repeat ][ Count ];
+    ScalarType result[Repeat][Count];
 
-    const unsigned long nw   = nwork;
-    const unsigned long nsum = nw % 2 ? nw * ( ( nw + 1 ) / 2 )
-                                      : ( nw / 2 ) * ( nw + 1 );
+    const unsigned long nw = nwork;
+    const unsigned long nsum =
+        nw % 2 ? nw * ((nw + 1) / 2) : (nw / 2) * (nw + 1);
 
-    for ( unsigned i = 0; i < Repeat; ++i ) {
-      if ( i % 2 == 0 ) {
-        Kokkos::parallel_reduce( nwork, functor_type( nwork, Count ), result[i] );
-      }
-      else {
-        Kokkos::parallel_reduce( "Reduce", nwork, functor_type( nwork, Count ), result[i] );
+    for (unsigned i = 0; i < Repeat; ++i) {
+      if (i % 2 == 0) {
+        Kokkos::parallel_reduce(nwork, functor_type(nwork, Count), result[i]);
+      } else {
+        Kokkos::parallel_reduce("Reduce", nwork, functor_type(nwork, Count),
+                                result[i]);
       }
     }
 
-    for ( unsigned i = 0; i < Repeat; ++i ) {
-      for ( unsigned j = 0; j < Count; ++j ) {
+    for (unsigned i = 0; i < Repeat; ++i) {
+      for (unsigned j = 0; j < Count; ++j) {
         const unsigned long correct = 0 == j % 3 ? nw : nsum;
-        ASSERT_EQ( (ScalarType) correct, result[i][j] );
+        ASSERT_EQ((ScalarType)correct, result[i][j]);
       }
     }
   }
 
-  void run_test_dynamic_minmax( const size_type nwork )
-  {
-    typedef Test::RuntimeReduceMinMax< ScalarType, execution_space > functor_type;
+  void run_test_dynamic_minmax(const size_type nwork) {
+    typedef Test::RuntimeReduceMinMax<ScalarType, execution_space> functor_type;
 
     enum { Count = 2 };
     enum { Repeat = 100 };
 
-    ScalarType result[ Repeat ][ Count ];
+    ScalarType result[Repeat][Count];
 
-    for ( unsigned i = 0; i < Repeat; ++i ) {
-      if ( i % 2 == 0 ) {
-        Kokkos::parallel_reduce( nwork, functor_type( nwork, Count ), result[i] );
-      }
-      else {
-        Kokkos::parallel_reduce( "Reduce", nwork, functor_type( nwork, Count ), result[i] );
+    for (unsigned i = 0; i < Repeat; ++i) {
+      if (i % 2 == 0) {
+        Kokkos::parallel_reduce(nwork, functor_type(nwork, Count), result[i]);
+      } else {
+        Kokkos::parallel_reduce("Reduce", nwork, functor_type(nwork, Count),
+                                result[i]);
       }
     }
 
-    for ( unsigned i = 0; i < Repeat; ++i ) {
-      for ( unsigned j = 0; j < Count; ++j ) {
-        if ( nwork == 0 )
-        {
-          ScalarType amin( std::numeric_limits< ScalarType >::min() );
-          ScalarType amax( std::numeric_limits< ScalarType >::max() );
-          const ScalarType correct = ( j % 2 ) ? amax : amin;
-          ASSERT_EQ( (ScalarType) correct, result[i][j] );
-        }
-        else {
+    for (unsigned i = 0; i < Repeat; ++i) {
+      for (unsigned j = 0; j < Count; ++j) {
+        if (nwork == 0) {
+          ScalarType amin(std::numeric_limits<ScalarType>::min());
+          ScalarType amax(std::numeric_limits<ScalarType>::max());
+          const ScalarType correct = (j % 2) ? amax : amin;
+          ASSERT_EQ((ScalarType)correct, result[i][j]);
+        } else {
           const unsigned long correct = j % 2 ? 1 : nwork;
-          ASSERT_EQ( (ScalarType) correct, result[i][j] );
+          ASSERT_EQ((ScalarType)correct, result[i][j]);
         }
       }
     }
   }
 
-  void run_test_dynamic_final( const size_type nwork )
-  {
-    typedef Test::RuntimeReduceFunctorFinal< execution_space > functor_type;
+  void run_test_dynamic_final(const size_type nwork) {
+    typedef Test::RuntimeReduceFunctorFinal<execution_space> functor_type;
 
     enum { Count = 3 };
     enum { Repeat = 100 };
 
-    typename functor_type::scalar_type result[ Repeat ][ Count ];
+    typename functor_type::scalar_type result[Repeat][Count];
 
-    const unsigned long nw   = nwork;
-    const unsigned long nsum = nw % 2 ? nw * ( ( nw + 1 ) / 2 )
-                                      : ( nw / 2 ) * ( nw + 1 );
+    const unsigned long nw = nwork;
+    const unsigned long nsum =
+        nw % 2 ? nw * ((nw + 1) / 2) : (nw / 2) * (nw + 1);
 
-    for ( unsigned i = 0; i < Repeat; ++i ) {
-      if ( i % 2 == 0 ) {
-        Kokkos::parallel_reduce( nwork, functor_type( nwork, Count ), result[i] );
+    for (unsigned i = 0; i < Repeat; ++i) {
+      if (i % 2 == 0) {
+        Kokkos::parallel_reduce(nwork, functor_type(nwork, Count), result[i]);
+      } else {
+        Kokkos::parallel_reduce("TestKernelReduce", nwork,
+                                functor_type(nwork, Count), result[i]);
       }
-      else {
-        Kokkos::parallel_reduce( "TestKernelReduce", nwork, functor_type( nwork, Count ), result[i] );
-      }
-
     }
 
-    for ( unsigned i = 0; i < Repeat; ++i ) {
-      for ( unsigned j = 0; j < Count; ++j ) {
+    for (unsigned i = 0; i < Repeat; ++i) {
+      for (unsigned j = 0; j < Count; ++j) {
         const unsigned long correct = 0 == j % 3 ? nw : nsum;
-        ASSERT_EQ( (ScalarType) correct, -result[i][j] );
+        ASSERT_EQ((ScalarType)correct, -result[i][j]);
       }
     }
   }
 };
 
-template< typename ScalarType, class DeviceType >
-class TestReduceDynamicView
-{
-public:
+template <typename ScalarType, class DeviceType>
+class TestReduceDynamicView {
+ public:
   typedef DeviceType execution_space;
   typedef typename execution_space::size_type size_type;
 
-  TestReduceDynamicView( const size_type nwork )
-  {
-    run_test_dynamic_view( nwork );
-  }
+  TestReduceDynamicView(const size_type nwork) { run_test_dynamic_view(nwork); }
 
-  void run_test_dynamic_view( const size_type nwork )
-  {
-    typedef Test::RuntimeReduceFunctor< ScalarType, execution_space > functor_type;
+  void run_test_dynamic_view(const size_type nwork) {
+    typedef Test::RuntimeReduceFunctor<ScalarType, execution_space>
+        functor_type;
 
-    typedef Kokkos::View< ScalarType*, DeviceType > result_type;
+    typedef Kokkos::View<ScalarType*, DeviceType> result_type;
     typedef typename result_type::HostMirror result_host_type;
 
     const unsigned CountLimit = 23;
 
-    const unsigned long nw   = nwork;
-    const unsigned long nsum = nw % 2 ? nw * ( ( nw + 1 ) / 2 )
-                                      : ( nw / 2 ) * ( nw + 1 );
+    const unsigned long nw = nwork;
+    const unsigned long nsum =
+        nw % 2 ? nw * ((nw + 1) / 2) : (nw / 2) * (nw + 1);
 
-    for ( unsigned count = 0; count < CountLimit; ++count ) {
-
-      result_type result( "result", count );
-      result_host_type host_result = Kokkos::create_mirror( result );
+    for (unsigned count = 0; count < CountLimit; ++count) {
+      result_type result("result", count);
+      result_host_type host_result = Kokkos::create_mirror(result);
 
       // Test result to host pointer:
 
-      std::string str( "TestKernelReduce" );
-      if ( count % 2 == 0 ) {
-        Kokkos::parallel_reduce( nw, functor_type( nw, count ), host_result.data() );
-      }
-      else {
-        Kokkos::parallel_reduce( str, nw, functor_type( nw, count ), host_result.data() );
+      std::string str("TestKernelReduce");
+      if (count % 2 == 0) {
+        Kokkos::parallel_reduce(nw, functor_type(nw, count),
+                                host_result.data());
+      } else {
+        Kokkos::parallel_reduce(str, nw, functor_type(nw, count),
+                                host_result.data());
       }
 
-      for ( unsigned j = 0; j < count; ++j ) {
+      for (unsigned j = 0; j < count; ++j) {
         const unsigned long correct = 0 == j % 3 ? nw : nsum;
-        ASSERT_EQ( host_result( j ), (ScalarType) correct );
-        host_result( j ) = 0;
+        ASSERT_EQ(host_result(j), (ScalarType)correct);
+        host_result(j) = 0;
       }
     }
   }
 };
 
-} // namespace
+}  // namespace
 
-
-TEST_F( TEST_CATEGORY, long_reduce )
-{
-  TestReduce< long, TEST_EXECSPACE >( 0 );
-  TestReduce< long, TEST_EXECSPACE >( 1000000 );
+TEST(TEST_CATEGORY, long_reduce) {
+  TestReduce<long, TEST_EXECSPACE>(0);
+  TestReduce<long, TEST_EXECSPACE>(1000000);
 }
 
-TEST_F( TEST_CATEGORY, double_reduce )
-{
-  TestReduce< double, TEST_EXECSPACE >( 0 );
-  TestReduce< double, TEST_EXECSPACE >( 1000000 );
+TEST(TEST_CATEGORY, double_reduce) {
+  TestReduce<double, TEST_EXECSPACE>(0);
+  TestReduce<double, TEST_EXECSPACE>(1000000);
 }
 
-TEST_F( TEST_CATEGORY, long_reduce_dynamic )
-{
-  TestReduceDynamic< long, TEST_EXECSPACE >( 0 );
-  TestReduceDynamic< long, TEST_EXECSPACE >( 1000000 );
+TEST(TEST_CATEGORY, long_reduce_dynamic) {
+  TestReduceDynamic<long, TEST_EXECSPACE>(0);
+  TestReduceDynamic<long, TEST_EXECSPACE>(1000000);
 }
 
-TEST_F( TEST_CATEGORY, double_reduce_dynamic )
-{
-  TestReduceDynamic< double, TEST_EXECSPACE >( 0 );
-  TestReduceDynamic< double, TEST_EXECSPACE >( 1000000 );
+TEST(TEST_CATEGORY, double_reduce_dynamic) {
+  TestReduceDynamic<double, TEST_EXECSPACE>(0);
+  TestReduceDynamic<double, TEST_EXECSPACE>(1000000);
 }
 
-TEST_F( TEST_CATEGORY, long_reduce_dynamic_view )
-{
-  TestReduceDynamicView< long, TEST_EXECSPACE >( 0 );
-  TestReduceDynamicView< long, TEST_EXECSPACE >( 1000000 );
+TEST(TEST_CATEGORY, long_reduce_dynamic_view) {
+  TestReduceDynamicView<long, TEST_EXECSPACE>(0);
+  TestReduceDynamicView<long, TEST_EXECSPACE>(1000000);
 }
 
-} // namespace Test
+}  // namespace Test
diff --git a/lib/kokkos/core/unit_test/TestReduceCombinatorical.hpp b/lib/kokkos/core/unit_test/TestReduceCombinatorical.hpp
index 293cc0ca59..a03dbd1141 100644
--- a/lib/kokkos/core/unit_test/TestReduceCombinatorical.hpp
+++ b/lib/kokkos/core/unit_test/TestReduceCombinatorical.hpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -52,357 +53,311 @@ namespace Test {
 
 namespace ReduceCombinatorical {
 
-template< class Scalar, class Space = Kokkos::HostSpace >
+template <class Scalar, class Space = Kokkos::HostSpace>
 struct AddPlus {
-public:
+ public:
   // Required.
   typedef AddPlus reducer;
   typedef Scalar value_type;
 
-  typedef Kokkos::View< value_type, Space, Kokkos::MemoryTraits<Kokkos::Unmanaged> > result_view_type;
+  typedef Kokkos::View<value_type, Space,
+                       Kokkos::MemoryTraits<Kokkos::Unmanaged> >
+      result_view_type;
 
-private:
+ private:
   result_view_type result;
 
-public:
-  AddPlus( value_type & result_ ) : result( &result_ ) {}
+ public:
+  AddPlus(value_type& result_) : result(&result_) {}
 
   // Required.
   KOKKOS_INLINE_FUNCTION
-  void join( value_type & dest, const value_type & src ) const {
-    dest += src + 1;
-  }
+  void join(value_type& dest, const value_type& src) const { dest += src + 1; }
 
   KOKKOS_INLINE_FUNCTION
-  void join( volatile value_type & dest, const volatile value_type & src ) const {
+  void join(volatile value_type& dest, const volatile value_type& src) const {
     dest += src + 1;
   }
 
   // Optional.
   KOKKOS_INLINE_FUNCTION
-  void init( value_type & val )  const {
-    val = value_type();
-  }
+  void init(value_type& val) const { val = value_type(); }
 
   KOKKOS_INLINE_FUNCTION
-  value_type& reference() const {
-    return result();
-  }
+  value_type& reference() const { return result(); }
 
   KOKKOS_INLINE_FUNCTION
-  result_view_type view() const {
-    return result;
-  }
+  result_view_type view() const { return result; }
 };
 
-template< int ISTEAM >
+template <int ISTEAM>
 struct FunctorScalar;
 
-template<>
-struct FunctorScalar< 0 > {
-  Kokkos::View< double > result;
+template <>
+struct FunctorScalar<0> {
+  Kokkos::View<double> result;
 
-  FunctorScalar( Kokkos::View< double > r ) : result( r ) {}
+  FunctorScalar(Kokkos::View<double> r) : result(r) {}
 
   KOKKOS_INLINE_FUNCTION
-  void operator()( const int & i, double & update ) const {
-    update += i;
-  }
+  void operator()(const int& i, double& update) const { update += i; }
 };
 
-template<>
-struct FunctorScalar< 1 > {
+template <>
+struct FunctorScalar<1> {
   typedef Kokkos::TeamPolicy<>::member_type team_type;
 
-  Kokkos::View< double > result;
+  Kokkos::View<double> result;
 
-  FunctorScalar( Kokkos::View< double > r ) : result( r ) {}
+  FunctorScalar(Kokkos::View<double> r) : result(r) {}
 
   KOKKOS_INLINE_FUNCTION
-  void operator()( const team_type & team, double & update ) const {
+  void operator()(const team_type& team, double& update) const {
     update += 1.0 / team.team_size() * team.league_rank();
   }
 };
 
-template< int ISTEAM >
+template <int ISTEAM>
 struct FunctorScalarInit;
 
-template<>
-struct FunctorScalarInit< 0 > {
-  Kokkos::View< double > result;
+template <>
+struct FunctorScalarInit<0> {
+  Kokkos::View<double> result;
 
-  FunctorScalarInit( Kokkos::View< double > r ) : result( r ) {}
+  FunctorScalarInit(Kokkos::View<double> r) : result(r) {}
 
   KOKKOS_INLINE_FUNCTION
-  void operator()( const int & i, double & update ) const {
-    update += i;
-  }
+  void operator()(const int& i, double& update) const { update += i; }
 
   KOKKOS_INLINE_FUNCTION
-  void init( double & update ) const {
-    update = 0.0;
-  }
+  void init(double& update) const { update = 0.0; }
 };
 
-template<>
-struct FunctorScalarInit< 1 > {
+template <>
+struct FunctorScalarInit<1> {
   typedef Kokkos::TeamPolicy<>::member_type team_type;
 
-  Kokkos::View< double > result;
+  Kokkos::View<double> result;
 
-  FunctorScalarInit( Kokkos::View< double > r ) : result( r ) {}
+  FunctorScalarInit(Kokkos::View<double> r) : result(r) {}
 
   KOKKOS_INLINE_FUNCTION
-  void operator()( const team_type & team, double & update ) const {
+  void operator()(const team_type& team, double& update) const {
     update += 1.0 / team.team_size() * team.league_rank();
   }
 
   KOKKOS_INLINE_FUNCTION
-  void init( double & update ) const {
-    update = 0.0;
-  }
+  void init(double& update) const { update = 0.0; }
 };
 
-template< int ISTEAM >
+template <int ISTEAM>
 struct FunctorScalarFinal;
 
-template<>
-struct FunctorScalarFinal< 0 > {
+template <>
+struct FunctorScalarFinal<0> {
   Kokkos::View<double> result;
 
-  FunctorScalarFinal( Kokkos::View< double > r ) : result( r ) {}
+  FunctorScalarFinal(Kokkos::View<double> r) : result(r) {}
 
   KOKKOS_INLINE_FUNCTION
-  void operator()( const int & i, double & update ) const {
-    update += i;
-  }
+  void operator()(const int& i, double& update) const { update += i; }
 
   KOKKOS_INLINE_FUNCTION
-  void final( double & update ) const {
-    result() = update;
-  }
+  void final(double& update) const { result() = update; }
 };
 
-template<>
-struct FunctorScalarFinal< 1 > {
+template <>
+struct FunctorScalarFinal<1> {
   typedef Kokkos::TeamPolicy<>::member_type team_type;
 
-  Kokkos::View< double > result;
+  Kokkos::View<double> result;
 
-  FunctorScalarFinal( Kokkos::View< double > r ) : result( r ) {}
+  FunctorScalarFinal(Kokkos::View<double> r) : result(r) {}
 
   KOKKOS_INLINE_FUNCTION
-  void operator()( const team_type & team, double & update ) const {
+  void operator()(const team_type& team, double& update) const {
     update += 1.0 / team.team_size() * team.league_rank();
   }
 
   KOKKOS_INLINE_FUNCTION
-  void final( double & update ) const {
-    result() = update;
-  }
+  void final(double& update) const { result() = update; }
 };
 
-template< int ISTEAM >
+template <int ISTEAM>
 struct FunctorScalarJoin;
 
-template<>
-struct FunctorScalarJoin< 0 > {
+template <>
+struct FunctorScalarJoin<0> {
   Kokkos::View<double> result;
 
-  FunctorScalarJoin( Kokkos::View< double > r ) : result( r ) {}
+  FunctorScalarJoin(Kokkos::View<double> r) : result(r) {}
 
   KOKKOS_INLINE_FUNCTION
-  void operator()( const int & i, double & update ) const {
-    update += i;
-  }
+  void operator()(const int& i, double& update) const { update += i; }
 
   KOKKOS_INLINE_FUNCTION
-  void join( volatile double & dst, const volatile double & update ) const {
+  void join(volatile double& dst, const volatile double& update) const {
     dst += update;
   }
 };
 
-template<>
-struct FunctorScalarJoin< 1 > {
+template <>
+struct FunctorScalarJoin<1> {
   typedef Kokkos::TeamPolicy<>::member_type team_type;
 
-  Kokkos::View< double > result;
+  Kokkos::View<double> result;
 
-  FunctorScalarJoin( Kokkos::View< double > r ) : result( r ) {}
+  FunctorScalarJoin(Kokkos::View<double> r) : result(r) {}
 
   KOKKOS_INLINE_FUNCTION
-  void operator()( const team_type & team, double & update ) const {
+  void operator()(const team_type& team, double& update) const {
     update += 1.0 / team.team_size() * team.league_rank();
   }
 
   KOKKOS_INLINE_FUNCTION
-  void join( volatile double & dst, const volatile double & update ) const {
+  void join(volatile double& dst, const volatile double& update) const {
     dst += update;
   }
 };
 
-template< int ISTEAM >
+template <int ISTEAM>
 struct FunctorScalarJoinFinal;
 
-template<>
-struct FunctorScalarJoinFinal< 0 > {
-  Kokkos::View< double > result;
-
-  FunctorScalarJoinFinal( Kokkos::View< double > r ) : result( r ) {}
-
-  KOKKOS_INLINE_FUNCTION
-  void operator()( const int & i, double & update ) const {
-    update += i;
-  }
-
-  KOKKOS_INLINE_FUNCTION
-  void join( volatile double & dst, const volatile double & update ) const {
-    dst += update;
-  }
-
-  KOKKOS_INLINE_FUNCTION
-  void final( double & update ) const {
-    result() = update;
-  }
-};
-
-template<>
-struct FunctorScalarJoinFinal< 1 > {
-  typedef Kokkos::TeamPolicy<>::member_type team_type;
-
-  Kokkos::View< double > result;
-
-  FunctorScalarJoinFinal( Kokkos::View< double > r ) : result( r ) {}
-
-  KOKKOS_INLINE_FUNCTION
-  void operator()( const team_type & team, double & update ) const {
-    update += 1.0 / team.team_size() * team.league_rank();
-  }
-
-  KOKKOS_INLINE_FUNCTION
-  void join( volatile double & dst, const volatile double & update ) const {
-    dst += update;
-  }
-
-  KOKKOS_INLINE_FUNCTION
-  void final( double & update ) const {
-    result() = update;
-  }
-};
-
-template< int ISTEAM >
-struct FunctorScalarJoinInit;
-
-template<>
-struct FunctorScalarJoinInit< 0 > {
-  Kokkos::View< double > result;
-
-  FunctorScalarJoinInit( Kokkos::View< double > r ) : result( r ) {}
-
-  KOKKOS_INLINE_FUNCTION
-  void operator()( const int & i, double & update ) const {
-    update += i;
-  }
-
-  KOKKOS_INLINE_FUNCTION
-  void join( volatile double & dst, const volatile double & update ) const {
-    dst += update;
-  }
-
-  KOKKOS_INLINE_FUNCTION
-  void init( double & update ) const {
-    update = 0.0;
-  }
-};
-
-template<>
-struct FunctorScalarJoinInit< 1 > {
-  typedef Kokkos::TeamPolicy<>::member_type team_type;
-
-  Kokkos::View< double > result;
-
-  FunctorScalarJoinInit( Kokkos::View< double > r ) : result( r ) {}
-
-  KOKKOS_INLINE_FUNCTION
-  void operator()( const team_type & team, double & update ) const {
-    update += 1.0 / team.team_size() * team.league_rank();
-  }
-
-  KOKKOS_INLINE_FUNCTION
-  void join( volatile double & dst, const volatile double & update ) const {
-    dst += update;
-  }
-
-  KOKKOS_INLINE_FUNCTION
-  void init( double & update ) const {
-    update = 0.0;
-  }
-};
-
-template< int ISTEAM >
-struct FunctorScalarJoinFinalInit;
-
-template<>
-struct FunctorScalarJoinFinalInit< 0 > {
+template <>
+struct FunctorScalarJoinFinal<0> {
   Kokkos::View<double> result;
 
-  FunctorScalarJoinFinalInit( Kokkos::View< double > r ) : result( r ) {}
+  FunctorScalarJoinFinal(Kokkos::View<double> r) : result(r) {}
 
   KOKKOS_INLINE_FUNCTION
-  void operator()( const int & i, double & update ) const {
-    update += i;
-  }
+  void operator()(const int& i, double& update) const { update += i; }
 
   KOKKOS_INLINE_FUNCTION
-  void join( volatile double & dst, const volatile double & update ) const {
+  void join(volatile double& dst, const volatile double& update) const {
     dst += update;
   }
 
   KOKKOS_INLINE_FUNCTION
-  void final( double & update ) const {
-    result() = update;
-  }
-
-  KOKKOS_INLINE_FUNCTION
-  void init( double & update ) const {
-    update = 0.0;
-  }
+  void final(double& update) const { result() = update; }
 };
 
-template<>
-struct FunctorScalarJoinFinalInit< 1 > {
+template <>
+struct FunctorScalarJoinFinal<1> {
   typedef Kokkos::TeamPolicy<>::member_type team_type;
 
-  Kokkos::View< double > result;
+  Kokkos::View<double> result;
 
-  FunctorScalarJoinFinalInit( Kokkos::View< double > r ) : result( r ) {}
+  FunctorScalarJoinFinal(Kokkos::View<double> r) : result(r) {}
 
   KOKKOS_INLINE_FUNCTION
-  void operator()( const team_type & team, double & update ) const {
+  void operator()(const team_type& team, double& update) const {
     update += 1.0 / team.team_size() * team.league_rank();
   }
 
   KOKKOS_INLINE_FUNCTION
-  void join( volatile double & dst, const volatile double & update ) const {
+  void join(volatile double& dst, const volatile double& update) const {
     dst += update;
   }
 
   KOKKOS_INLINE_FUNCTION
-  void final( double & update ) const {
-    result() = update;
+  void final(double& update) const { result() = update; }
+};
+
+template <int ISTEAM>
+struct FunctorScalarJoinInit;
+
+template <>
+struct FunctorScalarJoinInit<0> {
+  Kokkos::View<double> result;
+
+  FunctorScalarJoinInit(Kokkos::View<double> r) : result(r) {}
+
+  KOKKOS_INLINE_FUNCTION
+  void operator()(const int& i, double& update) const { update += i; }
+
+  KOKKOS_INLINE_FUNCTION
+  void join(volatile double& dst, const volatile double& update) const {
+    dst += update;
   }
 
   KOKKOS_INLINE_FUNCTION
-  void init( double & update ) const {
-    update = 0.0;
+  void init(double& update) const { update = 0.0; }
+};
+
+template <>
+struct FunctorScalarJoinInit<1> {
+  typedef Kokkos::TeamPolicy<>::member_type team_type;
+
+  Kokkos::View<double> result;
+
+  FunctorScalarJoinInit(Kokkos::View<double> r) : result(r) {}
+
+  KOKKOS_INLINE_FUNCTION
+  void operator()(const team_type& team, double& update) const {
+    update += 1.0 / team.team_size() * team.league_rank();
   }
+
+  KOKKOS_INLINE_FUNCTION
+  void join(volatile double& dst, const volatile double& update) const {
+    dst += update;
+  }
+
+  KOKKOS_INLINE_FUNCTION
+  void init(double& update) const { update = 0.0; }
+};
+
+template <int ISTEAM>
+struct FunctorScalarJoinFinalInit;
+
+template <>
+struct FunctorScalarJoinFinalInit<0> {
+  Kokkos::View<double> result;
+
+  FunctorScalarJoinFinalInit(Kokkos::View<double> r) : result(r) {}
+
+  KOKKOS_INLINE_FUNCTION
+  void operator()(const int& i, double& update) const { update += i; }
+
+  KOKKOS_INLINE_FUNCTION
+  void join(volatile double& dst, const volatile double& update) const {
+    dst += update;
+  }
+
+  KOKKOS_INLINE_FUNCTION
+  void final(double& update) const { result() = update; }
+
+  KOKKOS_INLINE_FUNCTION
+  void init(double& update) const { update = 0.0; }
+};
+
+template <>
+struct FunctorScalarJoinFinalInit<1> {
+  typedef Kokkos::TeamPolicy<>::member_type team_type;
+
+  Kokkos::View<double> result;
+
+  FunctorScalarJoinFinalInit(Kokkos::View<double> r) : result(r) {}
+
+  KOKKOS_INLINE_FUNCTION
+  void operator()(const team_type& team, double& update) const {
+    update += 1.0 / team.team_size() * team.league_rank();
+  }
+
+  KOKKOS_INLINE_FUNCTION
+  void join(volatile double& dst, const volatile double& update) const {
+    dst += update;
+  }
+
+  KOKKOS_INLINE_FUNCTION
+  void final(double& update) const { result() = update; }
+
+  KOKKOS_INLINE_FUNCTION
+  void init(double& update) const { update = 0.0; }
 };
 
 struct Functor1 {
   KOKKOS_INLINE_FUNCTION
-  void operator()( const int & i, double & update ) const {
-    update += i;
-  }
+  void operator()(const int& i, double& update) const { update += i; }
 };
 
 struct Functor2 {
@@ -410,239 +365,277 @@ struct Functor2 {
 
   const unsigned value_count;
 
-  Functor2( unsigned n ) : value_count( n ) {}
+  Functor2(unsigned n) : value_count(n) {}
 
   KOKKOS_INLINE_FUNCTION
-  void operator()( const unsigned & i, double update[] ) const {
-    for ( unsigned j = 0; j < value_count; j++ ) {
+  void operator()(const unsigned& i, double update[]) const {
+    for (unsigned j = 0; j < value_count; j++) {
       update[j] += i;
     }
   }
 
   KOKKOS_INLINE_FUNCTION
-  void init( double dst[] ) const
-  {
-    for ( unsigned i = 0; i < value_count; ++i ) dst[i] = 0;
+  void init(double dst[]) const {
+    for (unsigned i = 0; i < value_count; ++i) dst[i] = 0;
   }
 
   KOKKOS_INLINE_FUNCTION
-  void join( volatile double dst[],
-             const volatile double src[] ) const
-  {
-    for ( unsigned i = 0; i < value_count; ++i ) dst[i] += src[i];
+  void join(volatile double dst[], const volatile double src[]) const {
+    for (unsigned i = 0; i < value_count; ++i) dst[i] += src[i];
   }
 };
 
-} // namespace ReduceCombinatorical
+}  // namespace ReduceCombinatorical
 
-template< class ExecSpace = Kokkos::DefaultExecutionSpace >
+template <class ExecSpace = Kokkos::DefaultExecutionSpace>
 struct TestReduceCombinatoricalInstantiation {
-  template< class ... Args >
-  static void CallParallelReduce( Args... args ) {
-    Kokkos::parallel_reduce( args... );
+  template <class... Args>
+  static void CallParallelReduce(Args... args) {
+    Kokkos::parallel_reduce(args...);
   }
 
-  template< class ... Args >
-  static void AddReturnArgument( Args... args ) {
-    Kokkos::View< double, Kokkos::HostSpace > result_view( "ResultView" );
+  template <class... Args>
+  static void AddReturnArgument(Args... args) {
+    Kokkos::View<double, Kokkos::HostSpace> result_view("ResultView");
     double expected_result = 1000.0 * 999.0 / 2.0;
 
     double value = 0;
-    Kokkos::parallel_reduce( args..., value );
-    ASSERT_EQ( expected_result, value );
+    Kokkos::parallel_reduce(args..., value);
+    ASSERT_EQ(expected_result, value);
 
     result_view() = 0;
-    CallParallelReduce( args..., result_view );
+    CallParallelReduce(args..., result_view);
     Kokkos::fence();
-    ASSERT_EQ( expected_result, result_view() );
+    ASSERT_EQ(expected_result, result_view());
 
     value = 0;
-    CallParallelReduce( args..., Kokkos::View< double, Kokkos::HostSpace, Kokkos::MemoryTraits<Kokkos::Unmanaged> >( &value ) );
+    CallParallelReduce(
+        args...,
+        Kokkos::View<double, Kokkos::HostSpace,
+                     Kokkos::MemoryTraits<Kokkos::Unmanaged> >(&value));
     Kokkos::fence();
-    ASSERT_EQ( expected_result, value );
+    ASSERT_EQ(expected_result, value);
 
     result_view() = 0;
-    const Kokkos::View< double, Kokkos::HostSpace, Kokkos::MemoryTraits<Kokkos::Unmanaged> > result_view_const_um = result_view;
-    CallParallelReduce( args..., result_view_const_um );
+    const Kokkos::View<double, Kokkos::HostSpace,
+                       Kokkos::MemoryTraits<Kokkos::Unmanaged> >
+        result_view_const_um = result_view;
+    CallParallelReduce(args..., result_view_const_um);
     Kokkos::fence();
-    ASSERT_EQ( expected_result, result_view_const_um() );
+    ASSERT_EQ(expected_result, result_view_const_um());
 
     value = 0;
-    CallParallelReduce( args..., Test::ReduceCombinatorical::AddPlus< double >( value ) );
-    if ( ( Kokkos::DefaultExecutionSpace::concurrency() > 1 ) && ( ExecSpace::concurrency() > 1 ) ) {
-      ASSERT_TRUE( expected_result < value );
-    }
-    else if ( ( Kokkos::DefaultExecutionSpace::concurrency() > 1 ) || ( ExecSpace::concurrency() > 1 ) ) {
-      ASSERT_TRUE( expected_result <= value );
-    }
-    else {
-      ASSERT_EQ( expected_result, value );
+    CallParallelReduce(args...,
+                       Test::ReduceCombinatorical::AddPlus<double>(value));
+    if ((Kokkos::DefaultExecutionSpace::concurrency() > 1) &&
+        (ExecSpace::concurrency() > 1)) {
+      ASSERT_TRUE(expected_result < value);
+    } else if ((Kokkos::DefaultExecutionSpace::concurrency() > 1) ||
+               (ExecSpace::concurrency() > 1)) {
+      ASSERT_TRUE(expected_result <= value);
+    } else {
+      ASSERT_EQ(expected_result, value);
     }
 
     value = 0;
-    Test::ReduceCombinatorical::AddPlus< double > add( value );
-    CallParallelReduce( args..., add );
-    if ( ( Kokkos::DefaultExecutionSpace::concurrency() > 1 ) && ( ExecSpace::concurrency() > 1 ) ) {
-      ASSERT_TRUE( expected_result < value );
-    }
-    else if ( ( Kokkos::DefaultExecutionSpace::concurrency() > 1 ) || ( ExecSpace::concurrency() > 1 ) ) {
-      ASSERT_TRUE( expected_result <= value );
-    }
-    else {
-      ASSERT_EQ( expected_result, value );
+    Test::ReduceCombinatorical::AddPlus<double> add(value);
+    CallParallelReduce(args..., add);
+    if ((Kokkos::DefaultExecutionSpace::concurrency() > 1) &&
+        (ExecSpace::concurrency() > 1)) {
+      ASSERT_TRUE(expected_result < value);
+    } else if ((Kokkos::DefaultExecutionSpace::concurrency() > 1) ||
+               (ExecSpace::concurrency() > 1)) {
+      ASSERT_TRUE(expected_result <= value);
+    } else {
+      ASSERT_EQ(expected_result, value);
     }
   }
 
-  template< class ... Args >
-  static void AddLambdaRange( void*, Args... args ) {
-    AddReturnArgument( args..., KOKKOS_LAMBDA ( const int & i, double & lsum ) {
-      lsum += i;
-    });
+  template <class... Args>
+  static void AddLambdaRange(void*, Args... args) {
+    AddReturnArgument(
+        args..., KOKKOS_LAMBDA(const int& i, double& lsum) { lsum += i; });
   }
 
-  template< class ... Args >
-  static void AddLambdaTeam( void*, Args... args ) {
-    AddReturnArgument( args..., KOKKOS_LAMBDA ( const Kokkos::TeamPolicy<>::member_type & team, double & update ) {
-      update += 1.0 / team.team_size() * team.league_rank();
-    });
+  template <class... Args>
+  static void AddLambdaTeam(void*, Args... args) {
+    AddReturnArgument(
+        args..., KOKKOS_LAMBDA(const Kokkos::TeamPolicy<>::member_type& team,
+                               double& update) {
+          update += 1.0 / team.team_size() * team.league_rank();
+        });
   }
 
-  template< class ... Args >
-  static void AddLambdaRange( Kokkos::InvalidType, Args... args ) {}
+  template <class... Args>
+  static void AddLambdaRange(Kokkos::InvalidType, Args... args) {}
 
-  template< class ... Args >
-  static void AddLambdaTeam( Kokkos::InvalidType, Args... args ) {}
+  template <class... Args>
+  static void AddLambdaTeam(Kokkos::InvalidType, Args... args) {}
 
-  template< int ISTEAM, class ... Args >
-  static void AddFunctor( Args... args ) {
-    Kokkos::View< double > result_view( "FunctorView" );
-    auto h_r = Kokkos::create_mirror_view( result_view );
-    Test::ReduceCombinatorical::FunctorScalar< ISTEAM > functor( result_view );
+  template <int ISTEAM, class... Args>
+  static void AddFunctor(Args... args) {
+    Kokkos::View<double> result_view("FunctorView");
+    auto h_r = Kokkos::create_mirror_view(result_view);
+    Test::ReduceCombinatorical::FunctorScalar<ISTEAM> functor(result_view);
     double expected_result = 1000.0 * 999.0 / 2.0;
 
-    AddReturnArgument( args..., functor );
-    AddReturnArgument( args..., Test::ReduceCombinatorical::FunctorScalar< ISTEAM >( result_view ) );
-    AddReturnArgument( args..., Test::ReduceCombinatorical::FunctorScalarInit< ISTEAM >( result_view ) );
-    AddReturnArgument( args..., Test::ReduceCombinatorical::FunctorScalarJoin< ISTEAM >( result_view ) );
-    AddReturnArgument( args..., Test::ReduceCombinatorical::FunctorScalarJoinInit< ISTEAM >( result_view ) );
+    AddReturnArgument(args..., functor);
+    AddReturnArgument(
+        args...,
+        Test::ReduceCombinatorical::FunctorScalar<ISTEAM>(result_view));
+    AddReturnArgument(
+        args...,
+        Test::ReduceCombinatorical::FunctorScalarInit<ISTEAM>(result_view));
+    AddReturnArgument(
+        args...,
+        Test::ReduceCombinatorical::FunctorScalarJoin<ISTEAM>(result_view));
+    AddReturnArgument(
+        args...,
+        Test::ReduceCombinatorical::FunctorScalarJoinInit<ISTEAM>(result_view));
 
     h_r() = 0;
-    Kokkos::deep_copy( result_view, h_r );
-    CallParallelReduce( args..., Test::ReduceCombinatorical::FunctorScalarFinal< ISTEAM >( result_view ) );
+    Kokkos::deep_copy(result_view, h_r);
+    CallParallelReduce(
+        args...,
+        Test::ReduceCombinatorical::FunctorScalarFinal<ISTEAM>(result_view));
     Kokkos::fence();
-    Kokkos::deep_copy( h_r, result_view );
-    ASSERT_EQ( expected_result, h_r() );
+    Kokkos::deep_copy(h_r, result_view);
+    ASSERT_EQ(expected_result, h_r());
 
     h_r() = 0;
-    Kokkos::deep_copy( result_view, h_r );
-    CallParallelReduce( args..., Test::ReduceCombinatorical::FunctorScalarJoinFinal< ISTEAM >( result_view ) );
+    Kokkos::deep_copy(result_view, h_r);
+    CallParallelReduce(
+        args..., Test::ReduceCombinatorical::FunctorScalarJoinFinal<ISTEAM>(
+                     result_view));
     Kokkos::fence();
-    Kokkos::deep_copy( h_r, result_view );
-    ASSERT_EQ( expected_result, h_r() );
+    Kokkos::deep_copy(h_r, result_view);
+    ASSERT_EQ(expected_result, h_r());
 
     h_r() = 0;
-    Kokkos::deep_copy( result_view, h_r );
-    CallParallelReduce( args..., Test::ReduceCombinatorical::FunctorScalarJoinFinalInit< ISTEAM >( result_view ) );
+    Kokkos::deep_copy(result_view, h_r);
+    CallParallelReduce(
+        args..., Test::ReduceCombinatorical::FunctorScalarJoinFinalInit<ISTEAM>(
+                     result_view));
     Kokkos::fence();
-    Kokkos::deep_copy( h_r, result_view );
-    ASSERT_EQ( expected_result, h_r() );
+    Kokkos::deep_copy(h_r, result_view);
+    ASSERT_EQ(expected_result, h_r());
   }
 
-  template< class ... Args >
-  static void AddFunctorLambdaRange( Args... args ) {
-    AddFunctor< 0, Args... >( args... );
+  template <class... Args>
+  static void AddFunctorLambdaRange(Args... args) {
+    AddFunctor<0, Args...>(args...);
 #ifdef KOKKOS_ENABLE_CXX11_DISPATCH_LAMBDA
-    AddLambdaRange( typename std::conditional< std::is_same<ExecSpace, Kokkos::DefaultExecutionSpace>::value, void*, Kokkos::InvalidType >::type(), args... );
+    AddLambdaRange(
+        typename std::conditional<
+            std::is_same<ExecSpace, Kokkos::DefaultExecutionSpace>::value,
+            void*, Kokkos::InvalidType>::type(),
+        args...);
 #endif
   }
 
-  template< class ... Args >
-  static void AddFunctorLambdaTeam( Args... args ) {
-    AddFunctor< 1, Args... >( args... );
+  template <class... Args>
+  static void AddFunctorLambdaTeam(Args... args) {
+    AddFunctor<1, Args...>(args...);
 #ifdef KOKKOS_ENABLE_CXX11_DISPATCH_LAMBDA
-    AddLambdaTeam( typename std::conditional< std::is_same<ExecSpace, Kokkos::DefaultExecutionSpace>::value, void*, Kokkos::InvalidType >::type(), args... );
+    AddLambdaTeam(
+        typename std::conditional<
+            std::is_same<ExecSpace, Kokkos::DefaultExecutionSpace>::value,
+            void*, Kokkos::InvalidType>::type(),
+        args...);
 #endif
   }
 
-  template< class ... Args >
-  static void AddPolicy_1( Args... args ) {
+  template <class... Args>
+  static void AddPolicy_1(Args... args) {
     int N = 1000;
-    Kokkos::RangePolicy< ExecSpace > policy( 0, N );
+    Kokkos::RangePolicy<ExecSpace> policy(0, N);
 
-    AddFunctorLambdaRange( args..., 1000 );
-    AddFunctorLambdaRange( args..., N );
-    AddFunctorLambdaRange( args..., policy );
+    AddFunctorLambdaRange(args..., 1000);
+    AddFunctorLambdaRange(args..., N);
+    AddFunctorLambdaRange(args..., policy);
   }
 
-  template< class ... Args >
-  static void AddPolicy_2( Args... args ) {
+  template <class... Args>
+  static void AddPolicy_2(Args... args) {
     int N = 1000;
-    Kokkos::RangePolicy< ExecSpace > policy( 0, N );
-
-    AddFunctorLambdaRange( args..., Kokkos::RangePolicy< ExecSpace >( 0, N ) );
-    AddFunctorLambdaRange( args..., Kokkos::RangePolicy< ExecSpace, Kokkos::Schedule<Kokkos::Dynamic> >( 0, N ) );
-    AddFunctorLambdaRange( args..., Kokkos::RangePolicy< ExecSpace, Kokkos::Schedule<Kokkos::Static> >( 0, N ).set_chunk_size( 10 ) );
-    AddFunctorLambdaRange( args..., Kokkos::RangePolicy< ExecSpace, Kokkos::Schedule<Kokkos::Dynamic> >( 0, N ).set_chunk_size( 10 ) );
+    Kokkos::RangePolicy<ExecSpace> policy(0, N);
 
+    AddFunctorLambdaRange(args..., Kokkos::RangePolicy<ExecSpace>(0, N));
+    AddFunctorLambdaRange(
+        args...,
+        Kokkos::RangePolicy<ExecSpace, Kokkos::Schedule<Kokkos::Dynamic> >(0,
+                                                                           N));
+    AddFunctorLambdaRange(
+        args...,
+        Kokkos::RangePolicy<ExecSpace, Kokkos::Schedule<Kokkos::Static> >(0, N)
+            .set_chunk_size(10));
+    AddFunctorLambdaRange(
+        args...,
+        Kokkos::RangePolicy<ExecSpace, Kokkos::Schedule<Kokkos::Dynamic> >(0, N)
+            .set_chunk_size(10));
   }
 
-  template< class ... Args >
-  static void AddPolicy_3( Args... args ) {
+  template <class... Args>
+  static void AddPolicy_3(Args... args) {
     int N = 1000;
-    Kokkos::RangePolicy< ExecSpace > policy( 0, N );
+    Kokkos::RangePolicy<ExecSpace> policy(0, N);
 
-    AddFunctorLambdaTeam( args..., Kokkos::TeamPolicy< ExecSpace >( N, Kokkos::AUTO ) );
-    AddFunctorLambdaTeam( args..., Kokkos::TeamPolicy< ExecSpace, Kokkos::Schedule<Kokkos::Dynamic> >( N, Kokkos::AUTO ) );
-    AddFunctorLambdaTeam( args..., Kokkos::TeamPolicy< ExecSpace, Kokkos::Schedule<Kokkos::Static> >( N, Kokkos::AUTO ).set_chunk_size( 10 ) );
-    AddFunctorLambdaTeam( args..., Kokkos::TeamPolicy< ExecSpace, Kokkos::Schedule<Kokkos::Dynamic> >( N, Kokkos::AUTO ).set_chunk_size( 10 ) );
+    AddFunctorLambdaTeam(args...,
+                         Kokkos::TeamPolicy<ExecSpace>(N, Kokkos::AUTO));
+    AddFunctorLambdaTeam(
+        args...,
+        Kokkos::TeamPolicy<ExecSpace, Kokkos::Schedule<Kokkos::Dynamic> >(
+            N, Kokkos::AUTO));
+    AddFunctorLambdaTeam(
+        args...,
+        Kokkos::TeamPolicy<ExecSpace, Kokkos::Schedule<Kokkos::Static> >(
+            N, Kokkos::AUTO)
+            .set_chunk_size(10));
+    AddFunctorLambdaTeam(
+        args...,
+        Kokkos::TeamPolicy<ExecSpace, Kokkos::Schedule<Kokkos::Dynamic> >(
+            N, Kokkos::AUTO)
+            .set_chunk_size(10));
   }
 
-  static void execute_a1() {
-    AddPolicy_1();
-  }
+  static void execute_a1() { AddPolicy_1(); }
 
   static void execute_b1() {
-    std::string s( "Std::String" );
-    AddPolicy_1( s.c_str() );
-    AddPolicy_1( "Char Constant" );
+    std::string s("Std::String");
+    AddPolicy_1(s.c_str());
+    AddPolicy_1("Char Constant");
   }
 
   static void execute_c1() {
-    std::string s( "Std::String" );
-    AddPolicy_1( s );
+    std::string s("Std::String");
+    AddPolicy_1(s);
   }
 
-  static void execute_a2() {
-    AddPolicy_2();
-  }
+  static void execute_a2() { AddPolicy_2(); }
 
   static void execute_b2() {
-    std::string s( "Std::String" );
-    AddPolicy_2( s.c_str() );
-    AddPolicy_2( "Char Constant" );
+    std::string s("Std::String");
+    AddPolicy_2(s.c_str());
+    AddPolicy_2("Char Constant");
   }
 
   static void execute_c2() {
-    std::string s( "Std::String" );
-    AddPolicy_2( s );
+    std::string s("Std::String");
+    AddPolicy_2(s);
   }
 
-  static void execute_a3() {
-    AddPolicy_1();
-  }
+  static void execute_a3() { AddPolicy_1(); }
 
   static void execute_b3() {
-    std::string s( "Std::String" );
-    AddPolicy_1( s.c_str() );
-    AddPolicy_1( "Char Constant" );
+    std::string s("Std::String");
+    AddPolicy_1(s.c_str());
+    AddPolicy_1("Char Constant");
   }
 
   static void execute_c3() {
-    std::string s( "Std::String" );
-    AddPolicy_1( s );
+    std::string s("Std::String");
+    AddPolicy_1(s);
   }
-
 };
 
-} // namespace Test
-
+}  // namespace Test
diff --git a/lib/kokkos/core/unit_test/TestReduceDeviceView.hpp b/lib/kokkos/core/unit_test/TestReduceDeviceView.hpp
index d55c5449bc..d0562a2aa0 100644
--- a/lib/kokkos/core/unit_test/TestReduceDeviceView.hpp
+++ b/lib/kokkos/core/unit_test/TestReduceDeviceView.hpp
@@ -1,131 +1,133 @@
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 
 namespace Test {
 namespace {
 
 struct TestIsAsynchFunctor {
-  Kokkos::View<double,TEST_EXECSPACE> atomic_test;
-  TestIsAsynchFunctor(Kokkos::View<double,TEST_EXECSPACE> atomic_test_):atomic_test(atomic_test_){}
+  Kokkos::View<double, TEST_EXECSPACE> atomic_test;
+  TestIsAsynchFunctor(Kokkos::View<double, TEST_EXECSPACE> atomic_test_)
+      : atomic_test(atomic_test_) {}
 
   KOKKOS_INLINE_FUNCTION
-  void operator()(const int) const {
-    Kokkos::atomic_add(&atomic_test(),1.0);
-  }
+  void operator()(const int) const { Kokkos::atomic_add(&atomic_test(), 1.0); }
 };
 
-template<class PolicyType, class ReduceFunctor>
-void test_reduce_device_view(int64_t N, PolicyType policy, ReduceFunctor functor) {
+template <class PolicyType, class ReduceFunctor>
+void test_reduce_device_view(int64_t N, PolicyType policy,
+                             ReduceFunctor functor) {
+  using ExecSpace = TEST_EXECSPACE;
 
-     using ExecSpace = TEST_EXECSPACE;
-     
-     Kokkos::View<int64_t,TEST_EXECSPACE> result("Result");
-     Kokkos::View<double,TEST_EXECSPACE> atomic_test("Atomic");
-     int64_t reducer_result, view_result, scalar_result;
+  Kokkos::View<int64_t, TEST_EXECSPACE> result("Result");
+  Kokkos::View<double, TEST_EXECSPACE> atomic_test("Atomic");
+  int64_t reducer_result, view_result, scalar_result;
 
-     
-     Kokkos::Timer timer;     
+  Kokkos::Timer timer;
 
-     // Establish whether execspace is asynchronous
-     Kokkos::parallel_for("Test::ReduceDeviceView::TestIsAsynch",Kokkos::RangePolicy<TEST_EXECSPACE>(0,1000000),
-       TestIsAsynchFunctor(atomic_test));
-     double time0 = timer.seconds();
-     timer.reset();
-     typename ExecSpace::execution_space().fence();
-     double time_fence0 = timer.seconds(); 
-     Kokkos::deep_copy(result,0);
-     timer.reset();
-     bool is_async = time0<time_fence0;
+  // Establish whether execspace is asynchronous
+  Kokkos::parallel_for("Test::ReduceDeviceView::TestIsAsynch",
+                       Kokkos::RangePolicy<TEST_EXECSPACE>(0, 1000000),
+                       TestIsAsynchFunctor(atomic_test));
+  double time0 = timer.seconds();
+  timer.reset();
+  typename ExecSpace::execution_space().fence();
+  double time_fence0 = timer.seconds();
+  Kokkos::deep_copy(result, 0);
+  timer.reset();
+  bool is_async = time0 < time_fence0;
 
-     // Test Reducer 
+  // Test Reducer
 
-     Kokkos::parallel_reduce("Test::ReduceDeviceView::TestReducer",policy, functor, Kokkos::Sum<int64_t,TEST_EXECSPACE>(result));
-     double time1 = timer.seconds();
-     // Check whether it was asyncronous
-     timer.reset();
-     typename ExecSpace::execution_space().fence();
-     double time_fence1 = timer.seconds();    
-     Kokkos::deep_copy(reducer_result,result);    
-     Kokkos::deep_copy(result,0);
-     ASSERT_EQ(N,reducer_result); 
-     timer.reset();
-     
-     
-     // Test View 
-     Kokkos::parallel_reduce("Test::ReduceDeviceView::TestView",policy, functor, result);
-     double time2 = timer.seconds();
-     // Check whether it was asyncronous
-     timer.reset();
-     typename ExecSpace::execution_space().fence();
-     double time_fence2 = timer.seconds();    
-     Kokkos::deep_copy(view_result,result);    
-     Kokkos::deep_copy(result,0);
-     ASSERT_EQ(N,view_result); 
-     timer.reset();
-     
-     
-     // Test Scalar
-     Kokkos::parallel_reduce("Test::ReduceDeviceView::TestScalar",policy, functor, scalar_result);
-     double time3 = timer.seconds();
+  Kokkos::parallel_reduce("Test::ReduceDeviceView::TestReducer", policy,
+                          functor,
+                          Kokkos::Sum<int64_t, TEST_EXECSPACE>(result));
+  double time1 = timer.seconds();
+  // Check whether it was asyncronous
+  timer.reset();
+  typename ExecSpace::execution_space().fence();
+  double time_fence1 = timer.seconds();
+  Kokkos::deep_copy(reducer_result, result);
+  Kokkos::deep_copy(result, 0);
+  ASSERT_EQ(N, reducer_result);
+  timer.reset();
 
-     // Check whether it was asyncronous
-     timer.reset();
-     typename ExecSpace::execution_space().fence();
-     double time_fence3 = timer.seconds();
+  // Test View
+  Kokkos::parallel_reduce("Test::ReduceDeviceView::TestView", policy, functor,
+                          result);
+  double time2 = timer.seconds();
+  // Check whether it was asyncronous
+  timer.reset();
+  typename ExecSpace::execution_space().fence();
+  double time_fence2 = timer.seconds();
+  Kokkos::deep_copy(view_result, result);
+  Kokkos::deep_copy(result, 0);
+  ASSERT_EQ(N, view_result);
+  timer.reset();
 
-     ASSERT_EQ(N,scalar_result); 
-     if(is_async) {
-       ASSERT_TRUE(time1<time_fence1);
-     }
-     if(is_async) {
-       ASSERT_TRUE(time2<time_fence2);
-       ASSERT_TRUE(time3>time_fence3);
-     }
+  // Test Scalar
+  Kokkos::parallel_reduce("Test::ReduceDeviceView::TestScalar", policy, functor,
+                          scalar_result);
+  double time3 = timer.seconds();
+
+  // Check whether it was asyncronous
+  timer.reset();
+  typename ExecSpace::execution_space().fence();
+  double time_fence3 = timer.seconds();
+
+  ASSERT_EQ(N, scalar_result);
+  if (is_async) {
+    ASSERT_TRUE(time1 < time_fence1);
   }
+  if (is_async) {
+    ASSERT_TRUE(time2 < time_fence2);
+    ASSERT_TRUE(time3 > time_fence3);
+  }
+}
 
 struct RangePolicyFunctor {
   KOKKOS_INLINE_FUNCTION
-  void operator() (const int, int64_t& lsum) const {
-    lsum += 1;
-  }
+  void operator()(const int, int64_t& lsum) const { lsum += 1; }
 };
 
 struct MDRangePolicyFunctor {
   KOKKOS_INLINE_FUNCTION
-  void operator() (const int, const int, const int, int64_t& lsum) const {
+  void operator()(const int, const int, const int, int64_t& lsum) const {
     lsum += 1;
   }
 };
 
 struct TeamPolicyFunctor {
   int M;
-  TeamPolicyFunctor(int M_):M(M_){}
+  TeamPolicyFunctor(int M_) : M(M_) {}
 
   KOKKOS_INLINE_FUNCTION
-  void operator() (const Kokkos::TeamPolicy<TEST_EXECSPACE>::member_type& team, int64_t& lsum) const {
-    for(int i=team.team_rank(); i<M; i+=team.team_size())
-      lsum += 1;
+  void operator()(const Kokkos::TeamPolicy<TEST_EXECSPACE>::member_type& team,
+                  int64_t& lsum) const {
+    for (int i = team.team_rank(); i < M; i += team.team_size()) lsum += 1;
   }
 };
 
-} // namespace
+}  // namespace
 
-TEST_F( TEST_CATEGORY, reduce_device_view_range_policy )
-{
-  int N=1000*1024*1024;
-  test_reduce_device_view(N,Kokkos::RangePolicy<TEST_EXECSPACE>(0,N),RangePolicyFunctor());
+TEST(TEST_CATEGORY, reduce_device_view_range_policy) {
+  int N = 1000 * 1024 * 1024;
+  test_reduce_device_view(N, Kokkos::RangePolicy<TEST_EXECSPACE>(0, N),
+                          RangePolicyFunctor());
 }
 
-TEST_F( TEST_CATEGORY, reduce_device_view_mdrange_policy )
-{
-  int N=1000*1024*1024;
-  test_reduce_device_view(N,Kokkos::MDRangePolicy<TEST_EXECSPACE,Kokkos::Rank<3>>({0,0,0},{1000,1024,1024}),MDRangePolicyFunctor());
+TEST(TEST_CATEGORY, reduce_device_view_mdrange_policy) {
+  int N = 1000 * 1024 * 1024;
+  test_reduce_device_view(
+      N,
+      Kokkos::MDRangePolicy<TEST_EXECSPACE, Kokkos::Rank<3>>(
+          {0, 0, 0}, {1000, 1024, 1024}),
+      MDRangePolicyFunctor());
 }
 
-TEST_F( TEST_CATEGORY, reduce_device_view_team_policy )
-{
-  int N=1000*1024*1024;
-  test_reduce_device_view(N,Kokkos::TeamPolicy<TEST_EXECSPACE>(1000*1024,Kokkos::AUTO),TeamPolicyFunctor(1024));
+TEST(TEST_CATEGORY, reduce_device_view_team_policy) {
+  int N = 1000 * 1024 * 1024;
+  test_reduce_device_view(
+      N, Kokkos::TeamPolicy<TEST_EXECSPACE>(1000 * 1024, Kokkos::AUTO),
+      TeamPolicyFunctor(1024));
 }
 
-} // namespace Test
-
+}  // namespace Test
diff --git a/lib/kokkos/core/unit_test/TestReducers.hpp b/lib/kokkos/core/unit_test/TestReducers.hpp
index 1d77574412..04b4bd373f 100644
--- a/lib/kokkos/core/unit_test/TestReducers.hpp
+++ b/lib/kokkos/core/unit_test/TestReducers.hpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -48,451 +49,469 @@
 
 #include <Kokkos_Core.hpp>
 
-
 //--------------------------------------------------------------------------
 
 namespace Test {
 
 struct ReducerTag {};
 
-template< class Scalar, class ExecSpace = Kokkos::DefaultExecutionSpace >
+template <class Scalar, class ExecSpace = Kokkos::DefaultExecutionSpace>
 struct TestReducers {
   struct SumFunctor {
-    Kokkos::View< const Scalar*, ExecSpace > values;
+    Kokkos::View<const Scalar*, ExecSpace> values;
 
     KOKKOS_INLINE_FUNCTION
-    void operator()( const int & i, Scalar & value ) const {
-      value += values( i );
-    }
+    void operator()(const int& i, Scalar& value) const { value += values(i); }
   };
 
   struct ProdFunctor {
-    Kokkos::View< const Scalar*, ExecSpace > values;
+    Kokkos::View<const Scalar*, ExecSpace> values;
 
     KOKKOS_INLINE_FUNCTION
-    void operator()( const int & i, Scalar & value ) const {
-      value *= values( i );
-    }
+    void operator()(const int& i, Scalar& value) const { value *= values(i); }
   };
 
   struct MinFunctor {
-    Kokkos::View< const Scalar*, ExecSpace > values;
+    Kokkos::View<const Scalar*, ExecSpace> values;
 
     KOKKOS_INLINE_FUNCTION
-    void operator()( const int & i, Scalar & value ) const {
-      if ( values( i ) < value ) value = values( i );
+    void operator()(const int& i, Scalar& value) const {
+      if (values(i) < value) value = values(i);
     }
   };
 
   struct MaxFunctor {
-    Kokkos::View< const Scalar*, ExecSpace > values;
+    Kokkos::View<const Scalar*, ExecSpace> values;
 
     KOKKOS_INLINE_FUNCTION
-    void operator()( const int & i, Scalar & value ) const {
-      if ( values( i ) > value ) value = values( i );
+    void operator()(const int& i, Scalar& value) const {
+      if (values(i) > value) value = values(i);
     }
   };
 
   struct MinLocFunctor {
-    Kokkos::View< const Scalar*, ExecSpace > values;
+    Kokkos::View<const Scalar*, ExecSpace> values;
 
     KOKKOS_INLINE_FUNCTION
-    void operator()( const int & i, typename Kokkos::MinLoc< Scalar, int >::value_type & value ) const {
-      if ( values( i ) < value.val ) {
-        value.val = values( i );
+    void operator()(
+        const int& i,
+        typename Kokkos::MinLoc<Scalar, int>::value_type& value) const {
+      if (values(i) < value.val) {
+        value.val = values(i);
         value.loc = i;
       }
     }
   };
 
   struct MaxLocFunctor {
-    Kokkos::View< const Scalar*, ExecSpace > values;
+    Kokkos::View<const Scalar*, ExecSpace> values;
 
     KOKKOS_INLINE_FUNCTION
-    void operator()( const int & i, typename Kokkos::MaxLoc< Scalar, int >::value_type & value ) const {
-      if ( values( i ) > value.val ) {
-        value.val = values( i );
+    void operator()(
+        const int& i,
+        typename Kokkos::MaxLoc<Scalar, int>::value_type& value) const {
+      if (values(i) > value.val) {
+        value.val = values(i);
         value.loc = i;
       }
     }
   };
 
   struct MinMaxLocFunctor {
-    Kokkos::View< const Scalar*, ExecSpace > values;
+    Kokkos::View<const Scalar*, ExecSpace> values;
 
     KOKKOS_INLINE_FUNCTION
-    void operator()( const int & i, typename Kokkos::MinMaxLoc< Scalar, int >::value_type & value ) const {
-      if ( values( i ) > value.max_val ) {
-        value.max_val = values( i );
+    void operator()(
+        const int& i,
+        typename Kokkos::MinMaxLoc<Scalar, int>::value_type& value) const {
+      if (values(i) > value.max_val) {
+        value.max_val = values(i);
         value.max_loc = i;
       }
 
-      if ( values( i ) < value.min_val ) {
-        value.min_val = values( i );
+      if (values(i) < value.min_val) {
+        value.min_val = values(i);
         value.min_loc = i;
       }
     }
   };
 
   struct BAndFunctor {
-    Kokkos::View< const Scalar*, ExecSpace > values;
+    Kokkos::View<const Scalar*, ExecSpace> values;
 
     KOKKOS_INLINE_FUNCTION
-    void operator()( const int & i, Scalar & value ) const {
-      value = value & values( i );
+    void operator()(const int& i, Scalar& value) const {
+      value = value & values(i);
     }
   };
 
   struct BOrFunctor {
-    Kokkos::View< const Scalar*, ExecSpace > values;
+    Kokkos::View<const Scalar*, ExecSpace> values;
 
     KOKKOS_INLINE_FUNCTION
-    void operator()( const int & i, Scalar & value ) const {
-      value = value | values( i );
+    void operator()(const int& i, Scalar& value) const {
+      value = value | values(i);
     }
   };
 
   struct LAndFunctor {
-    Kokkos::View< const Scalar*, ExecSpace > values;
+    Kokkos::View<const Scalar*, ExecSpace> values;
 
     KOKKOS_INLINE_FUNCTION
-    void operator()( const int & i, Scalar & value ) const {
-      value = value && values( i );
+    void operator()(const int& i, Scalar& value) const {
+      value = value && values(i);
     }
   };
 
   struct LOrFunctor {
-    Kokkos::View< const Scalar*, ExecSpace > values;
+    Kokkos::View<const Scalar*, ExecSpace> values;
 
     KOKKOS_INLINE_FUNCTION
-    void operator()( const int & i, Scalar & value ) const {
-      value = value || values( i );
+    void operator()(const int& i, Scalar& value) const {
+      value = value || values(i);
     }
   };
 
   struct SumFunctorTag {
-    Kokkos::View< const Scalar*, ExecSpace > values;
+    Kokkos::View<const Scalar*, ExecSpace> values;
 
     KOKKOS_INLINE_FUNCTION
-    void operator()( const ReducerTag, const int & i, Scalar & value ) const {
-      value += values( i );
+    void operator()(const ReducerTag, const int& i, Scalar& value) const {
+      value += values(i);
     }
   };
 
   struct ProdFunctorTag {
-    Kokkos::View< const Scalar*, ExecSpace > values;
+    Kokkos::View<const Scalar*, ExecSpace> values;
 
     KOKKOS_INLINE_FUNCTION
-    void operator()( const ReducerTag, const int & i, Scalar & value ) const {
-      value *= values( i );
+    void operator()(const ReducerTag, const int& i, Scalar& value) const {
+      value *= values(i);
     }
   };
 
   struct MinFunctorTag {
-    Kokkos::View< const Scalar*, ExecSpace > values;
+    Kokkos::View<const Scalar*, ExecSpace> values;
 
     KOKKOS_INLINE_FUNCTION
-    void operator()( const ReducerTag, const int & i, Scalar & value ) const {
-      if ( values( i ) < value ) value = values( i );
+    void operator()(const ReducerTag, const int& i, Scalar& value) const {
+      if (values(i) < value) value = values(i);
     }
   };
 
   struct MaxFunctorTag {
-    Kokkos::View< const Scalar*, ExecSpace > values;
+    Kokkos::View<const Scalar*, ExecSpace> values;
 
     KOKKOS_INLINE_FUNCTION
-    void operator()( const ReducerTag, const int & i, Scalar & value ) const {
-      if ( values( i ) > value ) value = values( i );
+    void operator()(const ReducerTag, const int& i, Scalar& value) const {
+      if (values(i) > value) value = values(i);
     }
   };
 
   struct MinLocFunctorTag {
-    Kokkos::View< const Scalar*, ExecSpace > values;
+    Kokkos::View<const Scalar*, ExecSpace> values;
 
     KOKKOS_INLINE_FUNCTION
-    void operator()( const ReducerTag, const int & i, typename Kokkos::MinLoc< Scalar, int >::value_type & value ) const {
-      if ( values( i ) < value.val ) {
-        value.val = values( i );
+    void operator()(
+        const ReducerTag, const int& i,
+        typename Kokkos::MinLoc<Scalar, int>::value_type& value) const {
+      if (values(i) < value.val) {
+        value.val = values(i);
         value.loc = i;
       }
     }
   };
 
   struct MaxLocFunctorTag {
-    Kokkos::View< const Scalar*, ExecSpace > values;
+    Kokkos::View<const Scalar*, ExecSpace> values;
 
     KOKKOS_INLINE_FUNCTION
-    void operator()( const ReducerTag, const int & i, typename Kokkos::MaxLoc< Scalar, int >::value_type & value ) const {
-      if ( values( i ) > value.val ) {
-        value.val = values( i );
+    void operator()(
+        const ReducerTag, const int& i,
+        typename Kokkos::MaxLoc<Scalar, int>::value_type& value) const {
+      if (values(i) > value.val) {
+        value.val = values(i);
         value.loc = i;
       }
     }
   };
 
   struct MinMaxLocFunctorTag {
-    Kokkos::View< const Scalar*, ExecSpace > values;
+    Kokkos::View<const Scalar*, ExecSpace> values;
 
     KOKKOS_INLINE_FUNCTION
-    void operator()( const ReducerTag, const int & i, typename Kokkos::MinMaxLoc< Scalar, int >::value_type & value ) const {
-      if ( values( i ) > value.max_val ) {
-        value.max_val = values( i );
+    void operator()(
+        const ReducerTag, const int& i,
+        typename Kokkos::MinMaxLoc<Scalar, int>::value_type& value) const {
+      if (values(i) > value.max_val) {
+        value.max_val = values(i);
         value.max_loc = i;
       }
 
-      if ( values( i ) < value.min_val ) {
-        value.min_val = values( i );
+      if (values(i) < value.min_val) {
+        value.min_val = values(i);
         value.min_loc = i;
       }
     }
   };
 
   struct BAndFunctorTag {
-    Kokkos::View< const Scalar*, ExecSpace > values;
+    Kokkos::View<const Scalar*, ExecSpace> values;
 
     KOKKOS_INLINE_FUNCTION
-    void operator()( const ReducerTag, const int & i, Scalar & value ) const {
-      value = value & values( i );
+    void operator()(const ReducerTag, const int& i, Scalar& value) const {
+      value = value & values(i);
     }
   };
 
   struct BOrFunctorTag {
-    Kokkos::View< const Scalar*, ExecSpace > values;
+    Kokkos::View<const Scalar*, ExecSpace> values;
 
     KOKKOS_INLINE_FUNCTION
-    void operator()( const ReducerTag, const int & i, Scalar & value ) const {
-      value = value | values( i );
+    void operator()(const ReducerTag, const int& i, Scalar& value) const {
+      value = value | values(i);
     }
   };
 
   struct LAndFunctorTag {
-    Kokkos::View< const Scalar*, ExecSpace > values;
+    Kokkos::View<const Scalar*, ExecSpace> values;
 
     KOKKOS_INLINE_FUNCTION
-    void operator()( const ReducerTag, const int & i, Scalar & value ) const {
-      value = value && values( i );
+    void operator()(const ReducerTag, const int& i, Scalar& value) const {
+      value = value && values(i);
     }
   };
 
   struct LOrFunctorTag {
-    Kokkos::View< const Scalar*, ExecSpace > values;
+    Kokkos::View<const Scalar*, ExecSpace> values;
 
     KOKKOS_INLINE_FUNCTION
-    void operator()( const ReducerTag, const int & i, Scalar & value ) const {
-      value = value || values( i );
+    void operator()(const ReducerTag, const int& i, Scalar& value) const {
+      value = value || values(i);
     }
   };
-  static void test_sum( int N ) {
-    Kokkos::View< Scalar*, ExecSpace > values( "Values", N );
-    auto h_values = Kokkos::create_mirror_view( values );
+  static void test_sum(int N) {
+    Kokkos::View<Scalar*, ExecSpace> values("Values", N);
+    auto h_values        = Kokkos::create_mirror_view(values);
     Scalar reference_sum = 0;
 
-    for ( int i = 0; i < N; i++ ) {
-      h_values( i ) = (Scalar) ( rand() % 100 );
-      reference_sum += h_values( i );
+    for (int i = 0; i < N; i++) {
+      h_values(i) = (Scalar)(rand() % 100);
+      reference_sum += h_values(i);
     }
-    Kokkos::deep_copy( values, h_values );
+    Kokkos::deep_copy(values, h_values);
 
     SumFunctor f;
     f.values = values;
     SumFunctorTag f_tag;
     f_tag.values = values;
-    Scalar init = 0;
+    Scalar init  = 0;
 
     {
       Scalar sum_scalar = init;
-      Kokkos::Sum< Scalar > reducer_scalar( sum_scalar );
-      
-      Kokkos::parallel_reduce( Kokkos::RangePolicy< ExecSpace >( 0, N ), f, reducer_scalar );
-      ASSERT_EQ( sum_scalar, reference_sum );
-     
+      Kokkos::Sum<Scalar> reducer_scalar(sum_scalar);
+
+      Kokkos::parallel_reduce(Kokkos::RangePolicy<ExecSpace>(0, N), f,
+                              reducer_scalar);
+      ASSERT_EQ(sum_scalar, reference_sum);
+
       sum_scalar = init;
-      Kokkos::parallel_reduce( Kokkos::RangePolicy< ExecSpace , ReducerTag >( 0, N ), f_tag, reducer_scalar );
-      ASSERT_EQ( sum_scalar, reference_sum );
+      Kokkos::parallel_reduce(Kokkos::RangePolicy<ExecSpace, ReducerTag>(0, N),
+                              f_tag, reducer_scalar);
+      ASSERT_EQ(sum_scalar, reference_sum);
 
       Scalar sum_scalar_view = reducer_scalar.reference();
-      ASSERT_EQ( sum_scalar_view, reference_sum );
+      ASSERT_EQ(sum_scalar_view, reference_sum);
     }
 
     {
-      Kokkos::View< Scalar, Kokkos::HostSpace> sum_view( "View" );
+      Kokkos::View<Scalar, Kokkos::HostSpace> sum_view("View");
       sum_view() = init;
-      Kokkos::Sum< Scalar > reducer_view( sum_view );
-      Kokkos::parallel_reduce( Kokkos::RangePolicy< ExecSpace >( 0, N ), f, reducer_view );
+      Kokkos::Sum<Scalar> reducer_view(sum_view);
+      Kokkos::parallel_reduce(Kokkos::RangePolicy<ExecSpace>(0, N), f,
+                              reducer_view);
       Kokkos::fence();
 
       Scalar sum_view_scalar = sum_view();
-      ASSERT_EQ( sum_view_scalar, reference_sum );
+      ASSERT_EQ(sum_view_scalar, reference_sum);
 
       Scalar sum_view_view = reducer_view.reference();
-      ASSERT_EQ( sum_view_view, reference_sum );
+      ASSERT_EQ(sum_view_view, reference_sum);
     }
   }
 
-  static void test_prod( int N ) {
-    Kokkos::View< Scalar*, ExecSpace > values( "Values", N );
-    auto h_values = Kokkos::create_mirror_view( values );
+  static void test_prod(int N) {
+    Kokkos::View<Scalar*, ExecSpace> values("Values", N);
+    auto h_values         = Kokkos::create_mirror_view(values);
     Scalar reference_prod = 1;
 
-    for ( int i = 0; i < N; i++ ) {
-      h_values( i ) = (Scalar) ( rand() % 4 + 1 );
-      reference_prod *= h_values( i );
+    for (int i = 0; i < N; i++) {
+      h_values(i) = (Scalar)(rand() % 4 + 1);
+      reference_prod *= h_values(i);
     }
-    Kokkos::deep_copy( values, h_values );
+    Kokkos::deep_copy(values, h_values);
 
     ProdFunctor f;
     f.values = values;
     ProdFunctorTag f_tag;
     f_tag.values = values;
-    Scalar init = 1;
+    Scalar init  = 1;
 
     {
       Scalar prod_scalar = init;
-      Kokkos::Prod< Scalar > reducer_scalar( prod_scalar );
-   
-      Kokkos::parallel_reduce( Kokkos::RangePolicy< ExecSpace >( 0, N ), f, reducer_scalar );
-      ASSERT_EQ( prod_scalar, reference_prod );
-      
+      Kokkos::Prod<Scalar> reducer_scalar(prod_scalar);
+
+      Kokkos::parallel_reduce(Kokkos::RangePolicy<ExecSpace>(0, N), f,
+                              reducer_scalar);
+      ASSERT_EQ(prod_scalar, reference_prod);
+
       prod_scalar = init;
-      Kokkos::parallel_reduce( Kokkos::RangePolicy< ExecSpace , ReducerTag >( 0, N ), f_tag, reducer_scalar );
-      ASSERT_EQ( prod_scalar, reference_prod );
+      Kokkos::parallel_reduce(Kokkos::RangePolicy<ExecSpace, ReducerTag>(0, N),
+                              f_tag, reducer_scalar);
+      ASSERT_EQ(prod_scalar, reference_prod);
 
       Scalar prod_scalar_view = reducer_scalar.reference();
-      ASSERT_EQ( prod_scalar_view, reference_prod );
+      ASSERT_EQ(prod_scalar_view, reference_prod);
     }
 
     {
-      Kokkos::View< Scalar, Kokkos::HostSpace > prod_view( "View" );
+      Kokkos::View<Scalar, Kokkos::HostSpace> prod_view("View");
       prod_view() = init;
-      Kokkos::Prod< Scalar > reducer_view( prod_view );
-      Kokkos::parallel_reduce( Kokkos::RangePolicy< ExecSpace >( 0, N ), f, reducer_view );
+      Kokkos::Prod<Scalar> reducer_view(prod_view);
+      Kokkos::parallel_reduce(Kokkos::RangePolicy<ExecSpace>(0, N), f,
+                              reducer_view);
       Kokkos::fence();
 
       Scalar prod_view_scalar = prod_view();
-      ASSERT_EQ( prod_view_scalar, reference_prod );
+      ASSERT_EQ(prod_view_scalar, reference_prod);
 
       Scalar prod_view_view = reducer_view.reference();
-      ASSERT_EQ( prod_view_view, reference_prod );
+      ASSERT_EQ(prod_view_view, reference_prod);
     }
   }
 
-  static void test_min( int N ) {
-    Kokkos::View< Scalar*, ExecSpace > values( "Values", N );
-    auto h_values = Kokkos::create_mirror_view( values );
-    Scalar reference_min = std::numeric_limits< Scalar >::max();
+  static void test_min(int N) {
+    Kokkos::View<Scalar*, ExecSpace> values("Values", N);
+    auto h_values        = Kokkos::create_mirror_view(values);
+    Scalar reference_min = std::numeric_limits<Scalar>::max();
 
-    for ( int i = 0; i < N; i++ ) {
-      h_values( i ) = (Scalar) ( rand() % 100000 );
+    for (int i = 0; i < N; i++) {
+      h_values(i) = (Scalar)(rand() % 100000);
 
-      if ( h_values( i ) < reference_min ) reference_min = h_values( i );
+      if (h_values(i) < reference_min) reference_min = h_values(i);
     }
-    Kokkos::deep_copy( values, h_values );
+    Kokkos::deep_copy(values, h_values);
 
     MinFunctor f;
     f.values = values;
     MinFunctorTag f_tag;
     f_tag.values = values;
-    Scalar init = std::numeric_limits< Scalar >::max();
+    Scalar init  = std::numeric_limits<Scalar>::max();
 
     {
       Scalar min_scalar = init;
-      Kokkos::Min< Scalar > reducer_scalar( min_scalar );
-     
-      Kokkos::parallel_reduce( Kokkos::RangePolicy< ExecSpace >( 0, N ), f, reducer_scalar );
-      ASSERT_EQ( min_scalar, reference_min );
+      Kokkos::Min<Scalar> reducer_scalar(min_scalar);
+
+      Kokkos::parallel_reduce(Kokkos::RangePolicy<ExecSpace>(0, N), f,
+                              reducer_scalar);
+      ASSERT_EQ(min_scalar, reference_min);
 
       min_scalar = init;
-      Kokkos::parallel_reduce( Kokkos::RangePolicy< ExecSpace , ReducerTag >( 0, N ), f_tag, reducer_scalar );
-      ASSERT_EQ( min_scalar, reference_min );
+      Kokkos::parallel_reduce(Kokkos::RangePolicy<ExecSpace, ReducerTag>(0, N),
+                              f_tag, reducer_scalar);
+      ASSERT_EQ(min_scalar, reference_min);
 
       Scalar min_scalar_view = reducer_scalar.reference();
-      ASSERT_EQ( min_scalar_view, reference_min );
+      ASSERT_EQ(min_scalar_view, reference_min);
     }
 
     {
-      Kokkos::View< Scalar, Kokkos::HostSpace > min_view( "View" );
+      Kokkos::View<Scalar, Kokkos::HostSpace> min_view("View");
       min_view() = init;
-      Kokkos::Min< Scalar > reducer_view( min_view );
-      Kokkos::parallel_reduce( Kokkos::RangePolicy< ExecSpace >( 0, N ), f, reducer_view );
+      Kokkos::Min<Scalar> reducer_view(min_view);
+      Kokkos::parallel_reduce(Kokkos::RangePolicy<ExecSpace>(0, N), f,
+                              reducer_view);
       Kokkos::fence();
 
       Scalar min_view_scalar = min_view();
-      ASSERT_EQ( min_view_scalar, reference_min );
+      ASSERT_EQ(min_view_scalar, reference_min);
 
       Scalar min_view_view = reducer_view.reference();
-      ASSERT_EQ( min_view_view, reference_min );
+      ASSERT_EQ(min_view_view, reference_min);
     }
   }
 
-  static void test_max( int N ) {
-    Kokkos::View< Scalar*, ExecSpace > values( "Values", N );
-    auto h_values = Kokkos::create_mirror_view( values );
-    Scalar reference_max = std::numeric_limits< Scalar >::min();
+  static void test_max(int N) {
+    Kokkos::View<Scalar*, ExecSpace> values("Values", N);
+    auto h_values        = Kokkos::create_mirror_view(values);
+    Scalar reference_max = std::numeric_limits<Scalar>::min();
 
-    for ( int i = 0; i < N; i++ ) {
-      h_values( i ) = (Scalar) ( rand() % 100000 + 1 );
+    for (int i = 0; i < N; i++) {
+      h_values(i) = (Scalar)(rand() % 100000 + 1);
 
-      if ( h_values( i ) > reference_max ) reference_max = h_values( i );
+      if (h_values(i) > reference_max) reference_max = h_values(i);
     }
-    Kokkos::deep_copy( values, h_values );
+    Kokkos::deep_copy(values, h_values);
 
     MaxFunctor f;
     f.values = values;
     MaxFunctorTag f_tag;
     f_tag.values = values;
-    Scalar init = std::numeric_limits< Scalar >::min();
+    Scalar init  = std::numeric_limits<Scalar>::min();
 
     {
       Scalar max_scalar = init;
-      Kokkos::Max< Scalar > reducer_scalar( max_scalar );
+      Kokkos::Max<Scalar> reducer_scalar(max_scalar);
 
-      Kokkos::parallel_reduce( Kokkos::RangePolicy< ExecSpace >( 0, N ), f, reducer_scalar );
-      ASSERT_EQ( max_scalar, reference_max );
+      Kokkos::parallel_reduce(Kokkos::RangePolicy<ExecSpace>(0, N), f,
+                              reducer_scalar);
+      ASSERT_EQ(max_scalar, reference_max);
 
       max_scalar = init;
-      Kokkos::parallel_reduce( Kokkos::RangePolicy< ExecSpace , ReducerTag >( 0, N ), f_tag, reducer_scalar );
-      ASSERT_EQ( max_scalar, reference_max );
+      Kokkos::parallel_reduce(Kokkos::RangePolicy<ExecSpace, ReducerTag>(0, N),
+                              f_tag, reducer_scalar);
+      ASSERT_EQ(max_scalar, reference_max);
 
       Scalar max_scalar_view = reducer_scalar.reference();
-      ASSERT_EQ( max_scalar_view, reference_max );
+      ASSERT_EQ(max_scalar_view, reference_max);
     }
 
     {
-      Kokkos::View< Scalar, Kokkos::HostSpace > max_view( "View" );
+      Kokkos::View<Scalar, Kokkos::HostSpace> max_view("View");
       max_view() = init;
-      Kokkos::Max< Scalar > reducer_view( max_view );
-      Kokkos::parallel_reduce( Kokkos::RangePolicy< ExecSpace >( 0, N ), f, reducer_view );
+      Kokkos::Max<Scalar> reducer_view(max_view);
+      Kokkos::parallel_reduce(Kokkos::RangePolicy<ExecSpace>(0, N), f,
+                              reducer_view);
       Kokkos::fence();
 
       Scalar max_view_scalar = max_view();
-      ASSERT_EQ( max_view_scalar, reference_max );
+      ASSERT_EQ(max_view_scalar, reference_max);
 
       Scalar max_view_view = reducer_view.reference();
-      ASSERT_EQ( max_view_view, reference_max );
+      ASSERT_EQ(max_view_view, reference_max);
     }
   }
 
-  static void test_minloc( int N ) {
-    typedef typename Kokkos::MinLoc< Scalar, int >::value_type value_type;
+  static void test_minloc(int N) {
+    typedef typename Kokkos::MinLoc<Scalar, int>::value_type value_type;
 
-    Kokkos::View< Scalar*, ExecSpace > values( "Values", N );
-    auto h_values = Kokkos::create_mirror_view( values );
-    Scalar reference_min = std::numeric_limits< Scalar >::max();
-    int reference_loc = -1;
+    Kokkos::View<Scalar*, ExecSpace> values("Values", N);
+    auto h_values        = Kokkos::create_mirror_view(values);
+    Scalar reference_min = std::numeric_limits<Scalar>::max();
+    int reference_loc    = -1;
 
-    for ( int i = 0; i < N; i++ ) {
-      h_values( i ) = (Scalar) ( rand() % 100000 + 2 );
+    for (int i = 0; i < N; i++) {
+      h_values(i) = (Scalar)(rand() % 100000 + 2);
 
-      if ( h_values( i ) < reference_min ) {
-        reference_min = h_values( i );
+      if (h_values(i) < reference_min) {
+        reference_min = h_values(i);
         reference_loc = i;
-      }
-      else if ( h_values( i ) == reference_min ) {
+      } else if (h_values(i) == reference_min) {
         // Make min unique.
-        h_values( i ) += Scalar(1);
+        h_values(i) += Scalar(1);
       }
     }
-    Kokkos::deep_copy( values, h_values );
+    Kokkos::deep_copy(values, h_values);
 
     MinLocFunctor f;
     f.values = values;
@@ -501,59 +520,61 @@ struct TestReducers {
 
     {
       value_type min_scalar;
-      Kokkos::MinLoc< Scalar, int > reducer_scalar( min_scalar );
+      Kokkos::MinLoc<Scalar, int> reducer_scalar(min_scalar);
 
-      Kokkos::parallel_reduce( Kokkos::RangePolicy< ExecSpace >( 0, N ), f, reducer_scalar );
-      ASSERT_EQ( min_scalar.val, reference_min );
-      ASSERT_EQ( min_scalar.loc, reference_loc );
+      Kokkos::parallel_reduce(Kokkos::RangePolicy<ExecSpace>(0, N), f,
+                              reducer_scalar);
+      ASSERT_EQ(min_scalar.val, reference_min);
+      ASSERT_EQ(min_scalar.loc, reference_loc);
 
       min_scalar = value_type();
-      Kokkos::parallel_reduce( Kokkos::RangePolicy< ExecSpace , ReducerTag >( 0, N ), f_tag, reducer_scalar );
-      ASSERT_EQ( min_scalar.val, reference_min );
-      ASSERT_EQ( min_scalar.loc, reference_loc );
+      Kokkos::parallel_reduce(Kokkos::RangePolicy<ExecSpace, ReducerTag>(0, N),
+                              f_tag, reducer_scalar);
+      ASSERT_EQ(min_scalar.val, reference_min);
+      ASSERT_EQ(min_scalar.loc, reference_loc);
 
       value_type min_scalar_view = reducer_scalar.reference();
-      ASSERT_EQ( min_scalar_view.val, reference_min );
-      ASSERT_EQ( min_scalar_view.loc, reference_loc );
+      ASSERT_EQ(min_scalar_view.val, reference_min);
+      ASSERT_EQ(min_scalar_view.loc, reference_loc);
     }
 
     {
-      Kokkos::View< value_type, Kokkos::HostSpace > min_view( "View" );
-      Kokkos::MinLoc< Scalar, int > reducer_view( min_view );
-      Kokkos::parallel_reduce( Kokkos::RangePolicy< ExecSpace >( 0, N ), f, reducer_view );
+      Kokkos::View<value_type, Kokkos::HostSpace> min_view("View");
+      Kokkos::MinLoc<Scalar, int> reducer_view(min_view);
+      Kokkos::parallel_reduce(Kokkos::RangePolicy<ExecSpace>(0, N), f,
+                              reducer_view);
       Kokkos::fence();
 
       value_type min_view_scalar = min_view();
-      ASSERT_EQ( min_view_scalar.val, reference_min );
-      ASSERT_EQ( min_view_scalar.loc, reference_loc );
+      ASSERT_EQ(min_view_scalar.val, reference_min);
+      ASSERT_EQ(min_view_scalar.loc, reference_loc);
 
       value_type min_view_view = reducer_view.reference();
-      ASSERT_EQ( min_view_view.val, reference_min );
-      ASSERT_EQ( min_view_view.loc, reference_loc );
+      ASSERT_EQ(min_view_view.val, reference_min);
+      ASSERT_EQ(min_view_view.loc, reference_loc);
     }
   }
 
-  static void test_maxloc( int N ) {
-    typedef typename Kokkos::MaxLoc< Scalar, int >::value_type value_type;
+  static void test_maxloc(int N) {
+    typedef typename Kokkos::MaxLoc<Scalar, int>::value_type value_type;
 
-    Kokkos::View< Scalar*, ExecSpace > values( "Values", N );
-    auto h_values = Kokkos::create_mirror_view( values );
-    Scalar reference_max = std::numeric_limits< Scalar >::min();
-    int reference_loc = -1;
+    Kokkos::View<Scalar*, ExecSpace> values("Values", N);
+    auto h_values        = Kokkos::create_mirror_view(values);
+    Scalar reference_max = std::numeric_limits<Scalar>::min();
+    int reference_loc    = -1;
 
-    for ( int i = 0; i < N; i++ ) {
-      h_values( i ) = (Scalar) ( rand() % 100000 + 2 );
+    for (int i = 0; i < N; i++) {
+      h_values(i) = (Scalar)(rand() % 100000 + 2);
 
-      if ( h_values( i ) > reference_max ) {
-        reference_max = h_values( i );
+      if (h_values(i) > reference_max) {
+        reference_max = h_values(i);
         reference_loc = i;
-      }
-      else if ( h_values( i ) == reference_max ) {
+      } else if (h_values(i) == reference_max) {
         // Make max unique.
-        h_values( i ) -= Scalar(1);
+        h_values(i) -= Scalar(1);
       }
     }
-    Kokkos::deep_copy( values, h_values );
+    Kokkos::deep_copy(values, h_values);
 
     MaxLocFunctor f;
     f.values = values;
@@ -562,370 +583,386 @@ struct TestReducers {
 
     {
       value_type max_scalar;
-      Kokkos::MaxLoc< Scalar, int > reducer_scalar( max_scalar );
+      Kokkos::MaxLoc<Scalar, int> reducer_scalar(max_scalar);
 
-      Kokkos::parallel_reduce( Kokkos::RangePolicy< ExecSpace >( 0, N ), f, reducer_scalar );
-      ASSERT_EQ( max_scalar.val, reference_max );
-      ASSERT_EQ( max_scalar.loc, reference_loc );
+      Kokkos::parallel_reduce(Kokkos::RangePolicy<ExecSpace>(0, N), f,
+                              reducer_scalar);
+      ASSERT_EQ(max_scalar.val, reference_max);
+      ASSERT_EQ(max_scalar.loc, reference_loc);
 
       max_scalar = value_type();
-      Kokkos::parallel_reduce( Kokkos::RangePolicy< ExecSpace , ReducerTag >( 0, N ), f_tag, reducer_scalar );
-      ASSERT_EQ( max_scalar.val, reference_max );
-      ASSERT_EQ( max_scalar.loc, reference_loc );
+      Kokkos::parallel_reduce(Kokkos::RangePolicy<ExecSpace, ReducerTag>(0, N),
+                              f_tag, reducer_scalar);
+      ASSERT_EQ(max_scalar.val, reference_max);
+      ASSERT_EQ(max_scalar.loc, reference_loc);
 
       value_type max_scalar_view = reducer_scalar.reference();
-      ASSERT_EQ( max_scalar_view.val, reference_max );
-      ASSERT_EQ( max_scalar_view.loc, reference_loc );
+      ASSERT_EQ(max_scalar_view.val, reference_max);
+      ASSERT_EQ(max_scalar_view.loc, reference_loc);
     }
 
     {
-      Kokkos::View< value_type, Kokkos::HostSpace > max_view( "View" );
-      Kokkos::MaxLoc< Scalar, int > reducer_view( max_view );
-      Kokkos::parallel_reduce( Kokkos::RangePolicy< ExecSpace >( 0, N ), f, reducer_view );
+      Kokkos::View<value_type, Kokkos::HostSpace> max_view("View");
+      Kokkos::MaxLoc<Scalar, int> reducer_view(max_view);
+      Kokkos::parallel_reduce(Kokkos::RangePolicy<ExecSpace>(0, N), f,
+                              reducer_view);
       Kokkos::fence();
 
       value_type max_view_scalar = max_view();
-      ASSERT_EQ( max_view_scalar.val, reference_max );
-      ASSERT_EQ( max_view_scalar.loc, reference_loc );
+      ASSERT_EQ(max_view_scalar.val, reference_max);
+      ASSERT_EQ(max_view_scalar.loc, reference_loc);
 
       value_type max_view_view = reducer_view.reference();
-      ASSERT_EQ( max_view_view.val, reference_max );
-      ASSERT_EQ( max_view_view.loc, reference_loc );
+      ASSERT_EQ(max_view_view.val, reference_max);
+      ASSERT_EQ(max_view_view.loc, reference_loc);
     }
   }
 
-  static void test_minmaxloc( int N ) {
-     typedef typename Kokkos::MinMaxLoc< Scalar, int >::value_type value_type;
+  static void test_minmaxloc(int N) {
+    typedef typename Kokkos::MinMaxLoc<Scalar, int>::value_type value_type;
 
-     Kokkos::View< Scalar*, ExecSpace > values( "Values", N );
-     auto h_values = Kokkos::create_mirror_view( values );
-     Scalar reference_max = std::numeric_limits< Scalar >::min();
-     Scalar reference_min = std::numeric_limits< Scalar >::max();
-     int reference_minloc = -1;
-     int reference_maxloc = -1;
+    Kokkos::View<Scalar*, ExecSpace> values("Values", N);
+    auto h_values        = Kokkos::create_mirror_view(values);
+    Scalar reference_max = std::numeric_limits<Scalar>::min();
+    Scalar reference_min = std::numeric_limits<Scalar>::max();
+    int reference_minloc = -1;
+    int reference_maxloc = -1;
 
-     for ( int i = 0; i < N; i++ ) {
-       h_values( i ) = (Scalar) ( rand() % 100000 + 2);
-     }
-
-     for ( int i = 0; i < N; i++ ) {
-       if ( h_values( i ) > reference_max ) {
-         reference_max = h_values( i );
-         reference_maxloc = i;
-       }
-       else if ( h_values( i ) == reference_max ) {
-         // Make max unique.
-         h_values( i ) -= Scalar(1);
-       }
-     }
-
-     for ( int i = 0; i < N; i++ ) {
-       if ( h_values( i ) < reference_min ) {
-         reference_min = h_values( i );
-         reference_minloc = i;
-       }
-       else if ( h_values( i ) == reference_min ) {
-         // Make min unique.
-         h_values( i ) += Scalar(1);
-       }
-     }
-
-     Kokkos::deep_copy( values, h_values );
-
-     MinMaxLocFunctor f;
-     f.values = values;
-     MinMaxLocFunctorTag f_tag;
-     f_tag.values = values;
-
-     {
-       value_type minmax_scalar;
-       Kokkos::MinMaxLoc< Scalar, int > reducer_scalar( minmax_scalar );
-
-       Kokkos::parallel_reduce( Kokkos::RangePolicy< ExecSpace >( 0, N ), f, reducer_scalar );
-       ASSERT_EQ( minmax_scalar.min_val, reference_min );
-
-       for ( int i = 0; i < N; i++ ) {
-         if ( ( i == minmax_scalar.min_loc ) && ( h_values( i ) == reference_min ) ) {
-           reference_minloc = i;
-         }
-       }
-
-       ASSERT_EQ( minmax_scalar.min_loc, reference_minloc );
-       ASSERT_EQ( minmax_scalar.max_val, reference_max );
-
-       for ( int i = 0; i < N; i++ ) {
-         if ( ( i == minmax_scalar.max_loc ) && ( h_values( i ) == reference_max ) ) {
-           reference_maxloc = i;
-         }
-       }
-
-       ASSERT_EQ( minmax_scalar.max_loc, reference_maxloc );
-
-       minmax_scalar = value_type();
-       Kokkos::parallel_reduce( Kokkos::RangePolicy< ExecSpace , ReducerTag >( 0, N ), f_tag, reducer_scalar );
-       ASSERT_EQ( minmax_scalar.min_val, reference_min );
-
-       for ( int i = 0; i < N; i++ ) {
-         if ( ( i == minmax_scalar.min_loc ) && ( h_values( i ) == reference_min ) ) {
-           reference_minloc = i;
-         }
-       }
-
-       ASSERT_EQ( minmax_scalar.min_loc, reference_minloc );
-       ASSERT_EQ( minmax_scalar.max_val, reference_max );
-
-       for ( int i = 0; i < N; i++ ) {
-         if ( ( i == minmax_scalar.max_loc ) && ( h_values( i ) == reference_max ) ) {
-           reference_maxloc = i;
-         }
-       }
-
-       ASSERT_EQ( minmax_scalar.max_loc, reference_maxloc );
-
-       value_type minmax_scalar_view = reducer_scalar.reference();
-       ASSERT_EQ( minmax_scalar_view.min_val, reference_min );
-       ASSERT_EQ( minmax_scalar_view.min_loc, reference_minloc );
-       ASSERT_EQ( minmax_scalar_view.max_val, reference_max );
-       ASSERT_EQ( minmax_scalar_view.max_loc, reference_maxloc );
-     }
-
-     {
-       Kokkos::View< value_type, Kokkos::HostSpace > minmax_view( "View" );
-       Kokkos::MinMaxLoc< Scalar, int > reducer_view( minmax_view );
-       Kokkos::parallel_reduce( Kokkos::RangePolicy< ExecSpace >( 0, N ), f, reducer_view );
-       Kokkos::fence();
-
-       value_type minmax_view_scalar = minmax_view();
-       ASSERT_EQ( minmax_view_scalar.min_val, reference_min );
-       ASSERT_EQ( minmax_view_scalar.min_loc, reference_minloc );
-       ASSERT_EQ( minmax_view_scalar.max_val, reference_max );
-       ASSERT_EQ( minmax_view_scalar.max_loc, reference_maxloc );
-
-       value_type minmax_view_view = reducer_view.reference();
-       ASSERT_EQ( minmax_view_view.min_val, reference_min );
-       ASSERT_EQ( minmax_view_view.min_loc, reference_minloc );
-       ASSERT_EQ( minmax_view_view.max_val, reference_max );
-       ASSERT_EQ( minmax_view_view.max_loc, reference_maxloc );
-     }
-   }
-
-  static void test_BAnd( int N ) {
-    Kokkos::View< Scalar*, ExecSpace > values( "Values", N );
-    auto h_values = Kokkos::create_mirror_view( values );
-    Scalar reference_band = Scalar() | ( ~Scalar() );
-
-    for ( int i = 0; i < N; i++ ) {
-      h_values( i ) = (Scalar) ( rand() % 100000 + 1 );
-      reference_band = reference_band & h_values( i );
+    for (int i = 0; i < N; i++) {
+      h_values(i) = (Scalar)(rand() % 100000 + 2);
     }
-    Kokkos::deep_copy( values, h_values );
+
+    for (int i = 0; i < N; i++) {
+      if (h_values(i) > reference_max) {
+        reference_max    = h_values(i);
+        reference_maxloc = i;
+      } else if (h_values(i) == reference_max) {
+        // Make max unique.
+        h_values(i) -= Scalar(1);
+      }
+    }
+
+    for (int i = 0; i < N; i++) {
+      if (h_values(i) < reference_min) {
+        reference_min    = h_values(i);
+        reference_minloc = i;
+      } else if (h_values(i) == reference_min) {
+        // Make min unique.
+        h_values(i) += Scalar(1);
+      }
+    }
+
+    Kokkos::deep_copy(values, h_values);
+
+    MinMaxLocFunctor f;
+    f.values = values;
+    MinMaxLocFunctorTag f_tag;
+    f_tag.values = values;
+
+    {
+      value_type minmax_scalar;
+      Kokkos::MinMaxLoc<Scalar, int> reducer_scalar(minmax_scalar);
+
+      Kokkos::parallel_reduce(Kokkos::RangePolicy<ExecSpace>(0, N), f,
+                              reducer_scalar);
+      ASSERT_EQ(minmax_scalar.min_val, reference_min);
+
+      for (int i = 0; i < N; i++) {
+        if ((i == minmax_scalar.min_loc) && (h_values(i) == reference_min)) {
+          reference_minloc = i;
+        }
+      }
+
+      ASSERT_EQ(minmax_scalar.min_loc, reference_minloc);
+      ASSERT_EQ(minmax_scalar.max_val, reference_max);
+
+      for (int i = 0; i < N; i++) {
+        if ((i == minmax_scalar.max_loc) && (h_values(i) == reference_max)) {
+          reference_maxloc = i;
+        }
+      }
+
+      ASSERT_EQ(minmax_scalar.max_loc, reference_maxloc);
+
+      minmax_scalar = value_type();
+      Kokkos::parallel_reduce(Kokkos::RangePolicy<ExecSpace, ReducerTag>(0, N),
+                              f_tag, reducer_scalar);
+      ASSERT_EQ(minmax_scalar.min_val, reference_min);
+
+      for (int i = 0; i < N; i++) {
+        if ((i == minmax_scalar.min_loc) && (h_values(i) == reference_min)) {
+          reference_minloc = i;
+        }
+      }
+
+      ASSERT_EQ(minmax_scalar.min_loc, reference_minloc);
+      ASSERT_EQ(minmax_scalar.max_val, reference_max);
+
+      for (int i = 0; i < N; i++) {
+        if ((i == minmax_scalar.max_loc) && (h_values(i) == reference_max)) {
+          reference_maxloc = i;
+        }
+      }
+
+      ASSERT_EQ(minmax_scalar.max_loc, reference_maxloc);
+
+      value_type minmax_scalar_view = reducer_scalar.reference();
+      ASSERT_EQ(minmax_scalar_view.min_val, reference_min);
+      ASSERT_EQ(minmax_scalar_view.min_loc, reference_minloc);
+      ASSERT_EQ(minmax_scalar_view.max_val, reference_max);
+      ASSERT_EQ(minmax_scalar_view.max_loc, reference_maxloc);
+    }
+
+    {
+      Kokkos::View<value_type, Kokkos::HostSpace> minmax_view("View");
+      Kokkos::MinMaxLoc<Scalar, int> reducer_view(minmax_view);
+      Kokkos::parallel_reduce(Kokkos::RangePolicy<ExecSpace>(0, N), f,
+                              reducer_view);
+      Kokkos::fence();
+
+      value_type minmax_view_scalar = minmax_view();
+      ASSERT_EQ(minmax_view_scalar.min_val, reference_min);
+      ASSERT_EQ(minmax_view_scalar.min_loc, reference_minloc);
+      ASSERT_EQ(minmax_view_scalar.max_val, reference_max);
+      ASSERT_EQ(minmax_view_scalar.max_loc, reference_maxloc);
+
+      value_type minmax_view_view = reducer_view.reference();
+      ASSERT_EQ(minmax_view_view.min_val, reference_min);
+      ASSERT_EQ(minmax_view_view.min_loc, reference_minloc);
+      ASSERT_EQ(minmax_view_view.max_val, reference_max);
+      ASSERT_EQ(minmax_view_view.max_loc, reference_maxloc);
+    }
+  }
+
+  static void test_BAnd(int N) {
+    Kokkos::View<Scalar*, ExecSpace> values("Values", N);
+    auto h_values         = Kokkos::create_mirror_view(values);
+    Scalar reference_band = Scalar() | (~Scalar());
+
+    for (int i = 0; i < N; i++) {
+      h_values(i)    = (Scalar)(rand() % 100000 + 1);
+      reference_band = reference_band & h_values(i);
+    }
+    Kokkos::deep_copy(values, h_values);
 
     BAndFunctor f;
     f.values = values;
     BAndFunctorTag f_tag;
     f_tag.values = values;
-    Scalar init = Scalar() | ( ~Scalar() );
+    Scalar init  = Scalar() | (~Scalar());
 
     {
       Scalar band_scalar = init;
-      Kokkos::BAnd< Scalar > reducer_scalar( band_scalar );
+      Kokkos::BAnd<Scalar> reducer_scalar(band_scalar);
 
-      Kokkos::parallel_reduce( Kokkos::RangePolicy< ExecSpace >( 0, N ), f, reducer_scalar );
-      ASSERT_EQ( band_scalar, reference_band );
+      Kokkos::parallel_reduce(Kokkos::RangePolicy<ExecSpace>(0, N), f,
+                              reducer_scalar);
+      ASSERT_EQ(band_scalar, reference_band);
 
       band_scalar = init;
-      Kokkos::parallel_reduce( Kokkos::RangePolicy< ExecSpace , ReducerTag >( 0, N ), f_tag, reducer_scalar );
-      ASSERT_EQ( band_scalar, reference_band );
+      Kokkos::parallel_reduce(Kokkos::RangePolicy<ExecSpace, ReducerTag>(0, N),
+                              f_tag, reducer_scalar);
+      ASSERT_EQ(band_scalar, reference_band);
 
       Scalar band_scalar_view = reducer_scalar.reference();
 
-      ASSERT_EQ( band_scalar_view, reference_band );
+      ASSERT_EQ(band_scalar_view, reference_band);
     }
 
     {
-      Kokkos::View< Scalar, Kokkos::HostSpace > band_view( "View" );
+      Kokkos::View<Scalar, Kokkos::HostSpace> band_view("View");
       band_view() = init;
-      Kokkos::BAnd< Scalar > reducer_view( band_view );
-      Kokkos::parallel_reduce( Kokkos::RangePolicy< ExecSpace >( 0, N ), f, reducer_view );
+      Kokkos::BAnd<Scalar> reducer_view(band_view);
+      Kokkos::parallel_reduce(Kokkos::RangePolicy<ExecSpace>(0, N), f,
+                              reducer_view);
       Kokkos::fence();
 
       Scalar band_view_scalar = band_view();
-      ASSERT_EQ( band_view_scalar, reference_band );
+      ASSERT_EQ(band_view_scalar, reference_band);
 
       Scalar band_view_view = reducer_view.reference();
-      ASSERT_EQ( band_view_view, reference_band );
+      ASSERT_EQ(band_view_view, reference_band);
     }
   }
 
-  static void test_BOr( int N ) {
-    Kokkos::View< Scalar*, ExecSpace > values( "Values", N );
-    auto h_values = Kokkos::create_mirror_view( values );
-    Scalar reference_bor = Scalar() & ( ~Scalar() );
+  static void test_BOr(int N) {
+    Kokkos::View<Scalar*, ExecSpace> values("Values", N);
+    auto h_values        = Kokkos::create_mirror_view(values);
+    Scalar reference_bor = Scalar() & (~Scalar());
 
-    for ( int i = 0; i < N; i++ ) {
-      h_values( i ) = (Scalar) ( ( rand() % 100000 + 1 ) * 2 );
-      reference_bor = reference_bor | h_values( i );
+    for (int i = 0; i < N; i++) {
+      h_values(i)   = (Scalar)((rand() % 100000 + 1) * 2);
+      reference_bor = reference_bor | h_values(i);
     }
-    Kokkos::deep_copy( values, h_values );
+    Kokkos::deep_copy(values, h_values);
 
     BOrFunctor f;
     f.values = values;
     BOrFunctorTag f_tag;
     f_tag.values = values;
-    Scalar init = Scalar() & ( ~Scalar() );
+    Scalar init  = Scalar() & (~Scalar());
 
     {
       Scalar bor_scalar = init;
-      Kokkos::BOr< Scalar > reducer_scalar( bor_scalar );
+      Kokkos::BOr<Scalar> reducer_scalar(bor_scalar);
 
-      Kokkos::parallel_reduce( Kokkos::RangePolicy< ExecSpace >( 0, N ), f, reducer_scalar );
-      ASSERT_EQ( bor_scalar, reference_bor );
+      Kokkos::parallel_reduce(Kokkos::RangePolicy<ExecSpace>(0, N), f,
+                              reducer_scalar);
+      ASSERT_EQ(bor_scalar, reference_bor);
 
       bor_scalar = init;
-      Kokkos::parallel_reduce( Kokkos::RangePolicy< ExecSpace , ReducerTag >( 0, N ), f_tag, reducer_scalar );
-      ASSERT_EQ( bor_scalar, reference_bor );
+      Kokkos::parallel_reduce(Kokkos::RangePolicy<ExecSpace, ReducerTag>(0, N),
+                              f_tag, reducer_scalar);
+      ASSERT_EQ(bor_scalar, reference_bor);
 
       Scalar bor_scalar_view = reducer_scalar.reference();
-      ASSERT_EQ( bor_scalar_view, reference_bor );
+      ASSERT_EQ(bor_scalar_view, reference_bor);
     }
 
     {
-      Kokkos::View< Scalar, Kokkos::HostSpace > bor_view( "View" );
+      Kokkos::View<Scalar, Kokkos::HostSpace> bor_view("View");
       bor_view() = init;
-      Kokkos::BOr< Scalar > reducer_view( bor_view );
-      Kokkos::parallel_reduce( Kokkos::RangePolicy< ExecSpace >( 0, N ), f, reducer_view );
+      Kokkos::BOr<Scalar> reducer_view(bor_view);
+      Kokkos::parallel_reduce(Kokkos::RangePolicy<ExecSpace>(0, N), f,
+                              reducer_view);
       Kokkos::fence();
 
       Scalar bor_view_scalar = bor_view();
-      ASSERT_EQ( bor_view_scalar, reference_bor );
+      ASSERT_EQ(bor_view_scalar, reference_bor);
 
       Scalar bor_view_view = reducer_view.reference();
-      ASSERT_EQ( bor_view_view, reference_bor );
+      ASSERT_EQ(bor_view_view, reference_bor);
     }
   }
 
-  static void test_LAnd( int N ) {
-    Kokkos::View< Scalar*, ExecSpace > values( "Values", N );
-    auto h_values = Kokkos::create_mirror_view( values );
+  static void test_LAnd(int N) {
+    Kokkos::View<Scalar*, ExecSpace> values("Values", N);
+    auto h_values         = Kokkos::create_mirror_view(values);
     Scalar reference_land = 1;
 
-    for ( int i = 0; i < N; i++ ) {
-      h_values( i ) = (Scalar) ( rand() % 2 );
-      reference_land = reference_land && h_values( i );
+    for (int i = 0; i < N; i++) {
+      h_values(i)    = (Scalar)(rand() % 2);
+      reference_land = reference_land && h_values(i);
     }
-    Kokkos::deep_copy( values, h_values );
+    Kokkos::deep_copy(values, h_values);
 
     LAndFunctor f;
     f.values = values;
     LAndFunctorTag f_tag;
     f_tag.values = values;
-    Scalar init = 1;
+    Scalar init  = 1;
 
     {
       Scalar land_scalar = init;
-      Kokkos::LAnd< Scalar > reducer_scalar( land_scalar );
+      Kokkos::LAnd<Scalar> reducer_scalar(land_scalar);
 
-      Kokkos::parallel_reduce( Kokkos::RangePolicy< ExecSpace >( 0, N ), f, reducer_scalar );
-      ASSERT_EQ( land_scalar, reference_land );
+      Kokkos::parallel_reduce(Kokkos::RangePolicy<ExecSpace>(0, N), f,
+                              reducer_scalar);
+      ASSERT_EQ(land_scalar, reference_land);
 
       land_scalar = init;
-      Kokkos::parallel_reduce( Kokkos::RangePolicy< ExecSpace , ReducerTag >( 0, N ), f_tag, reducer_scalar );
-      ASSERT_EQ( land_scalar, reference_land );
+      Kokkos::parallel_reduce(Kokkos::RangePolicy<ExecSpace, ReducerTag>(0, N),
+                              f_tag, reducer_scalar);
+      ASSERT_EQ(land_scalar, reference_land);
 
       Scalar land_scalar_view = reducer_scalar.reference();
-      ASSERT_EQ( land_scalar_view, reference_land );
+      ASSERT_EQ(land_scalar_view, reference_land);
     }
 
     {
-      Kokkos::View< Scalar, Kokkos::HostSpace > land_view( "View" );
+      Kokkos::View<Scalar, Kokkos::HostSpace> land_view("View");
       land_view() = init;
-      Kokkos::LAnd< Scalar > reducer_view( land_view );
-      Kokkos::parallel_reduce( Kokkos::RangePolicy< ExecSpace >( 0, N ), f, reducer_view );
+      Kokkos::LAnd<Scalar> reducer_view(land_view);
+      Kokkos::parallel_reduce(Kokkos::RangePolicy<ExecSpace>(0, N), f,
+                              reducer_view);
       Kokkos::fence();
 
       Scalar land_view_scalar = land_view();
-      ASSERT_EQ( land_view_scalar, reference_land );
+      ASSERT_EQ(land_view_scalar, reference_land);
 
       Scalar land_view_view = reducer_view.reference();
-      ASSERT_EQ( land_view_view, reference_land );
+      ASSERT_EQ(land_view_view, reference_land);
     }
   }
 
-  static void test_LOr( int N ) {
-    Kokkos::View< Scalar*, ExecSpace > values( "Values", N );
-    auto h_values = Kokkos::create_mirror_view( values );
+  static void test_LOr(int N) {
+    Kokkos::View<Scalar*, ExecSpace> values("Values", N);
+    auto h_values        = Kokkos::create_mirror_view(values);
     Scalar reference_lor = 0;
 
-    for ( int i = 0; i < N; i++ ) {
-      h_values( i ) = (Scalar) ( rand() % 2 );
-      reference_lor = reference_lor || h_values( i );
+    for (int i = 0; i < N; i++) {
+      h_values(i)   = (Scalar)(rand() % 2);
+      reference_lor = reference_lor || h_values(i);
     }
-    Kokkos::deep_copy( values, h_values );
+    Kokkos::deep_copy(values, h_values);
 
     LOrFunctor f;
     f.values = values;
     LOrFunctorTag f_tag;
     f_tag.values = values;
-    Scalar init = 0;
+    Scalar init  = 0;
 
     {
       Scalar lor_scalar = init;
-      Kokkos::LOr< Scalar > reducer_scalar( lor_scalar );
+      Kokkos::LOr<Scalar> reducer_scalar(lor_scalar);
 
-      Kokkos::parallel_reduce( Kokkos::RangePolicy< ExecSpace >( 0, N ), f, reducer_scalar );
-      ASSERT_EQ( lor_scalar, reference_lor );
+      Kokkos::parallel_reduce(Kokkos::RangePolicy<ExecSpace>(0, N), f,
+                              reducer_scalar);
+      ASSERT_EQ(lor_scalar, reference_lor);
 
       lor_scalar = init;
-      Kokkos::parallel_reduce( Kokkos::RangePolicy< ExecSpace , ReducerTag >( 0, N ), f_tag, reducer_scalar );
-      ASSERT_EQ( lor_scalar, reference_lor );
+      Kokkos::parallel_reduce(Kokkos::RangePolicy<ExecSpace, ReducerTag>(0, N),
+                              f_tag, reducer_scalar);
+      ASSERT_EQ(lor_scalar, reference_lor);
 
       Scalar lor_scalar_view = reducer_scalar.reference();
-      ASSERT_EQ( lor_scalar_view, reference_lor );
+      ASSERT_EQ(lor_scalar_view, reference_lor);
     }
 
     {
-      Kokkos::View< Scalar, Kokkos::HostSpace > lor_view( "View" );
+      Kokkos::View<Scalar, Kokkos::HostSpace> lor_view("View");
       lor_view() = init;
-      Kokkos::LOr< Scalar > reducer_view( lor_view );
-      Kokkos::parallel_reduce( Kokkos::RangePolicy< ExecSpace >( 0, N ), f, reducer_view );
+      Kokkos::LOr<Scalar> reducer_view(lor_view);
+      Kokkos::parallel_reduce(Kokkos::RangePolicy<ExecSpace>(0, N), f,
+                              reducer_view);
       Kokkos::fence();
 
       Scalar lor_view_scalar = lor_view();
-      ASSERT_EQ( lor_view_scalar, reference_lor );
+      ASSERT_EQ(lor_view_scalar, reference_lor);
 
       Scalar lor_view_view = reducer_view.reference();
-      ASSERT_EQ( lor_view_view, reference_lor );
+      ASSERT_EQ(lor_view_view, reference_lor);
     }
   }
 
   static void execute_float() {
-    test_sum( 10001 );
-    test_prod( 35 );
-    test_min( 10003 );
-    test_minloc( 10003 );
-    test_max( 10007 );
-    test_maxloc( 10007 );
-    test_minmaxloc( 10007 );
+    test_sum(10001);
+    test_prod(35);
+    test_min(10003);
+    test_minloc(10003);
+    test_max(10007);
+    test_maxloc(10007);
+    test_minmaxloc(10007);
   }
 
   static void execute_integer() {
-    test_sum( 10001 );
-    test_prod( 35 );
-    test_min( 10003 );
-    test_minloc( 10003 );
-    test_max( 10007 );
-    test_maxloc( 10007 );
-    test_minmaxloc( 10007 );
-    test_BAnd( 35 );
-    test_BOr( 35 );
-    test_LAnd( 35 );
-    test_LOr( 35 );
+    test_sum(10001);
+    test_prod(35);
+    test_min(10003);
+    test_minloc(10003);
+    test_max(10007);
+    test_maxloc(10007);
+    test_minmaxloc(10007);
+    test_BAnd(35);
+    test_BOr(35);
+    test_LAnd(35);
+    test_LOr(35);
   }
 
   static void execute_basic() {
-    test_sum( 10001 );
-    test_prod( 35 );
+    test_sum(10001);
+    test_prod(35);
   }
 };
 
-} // namespace Test
+}  // namespace Test
diff --git a/lib/kokkos/core/unit_test/TestReducers_a.hpp b/lib/kokkos/core/unit_test/TestReducers_a.hpp
index cfa2b626d1..4efc4f6450 100644
--- a/lib/kokkos/core/unit_test/TestReducers_a.hpp
+++ b/lib/kokkos/core/unit_test/TestReducers_a.hpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -44,9 +45,8 @@
 #include <TestReducers.hpp>
 
 namespace Test {
-TEST_F( TEST_CATEGORY, reducers_int )
-{
-  TestReducers< int, TEST_EXECSPACE >::execute_integer();
+TEST(TEST_CATEGORY, reducers_int) {
+  TestReducers<int, TEST_EXECSPACE>::execute_integer();
 }
 
-} // namespace Test
+}  // namespace Test
diff --git a/lib/kokkos/core/unit_test/TestReducers_b.hpp b/lib/kokkos/core/unit_test/TestReducers_b.hpp
index 9f32f049bd..57aa0f3b76 100644
--- a/lib/kokkos/core/unit_test/TestReducers_b.hpp
+++ b/lib/kokkos/core/unit_test/TestReducers_b.hpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -44,8 +45,7 @@
 #include <TestReducers.hpp>
 
 namespace Test {
-TEST_F( TEST_CATEGORY, reducers_size_t )
-{
-  TestReducers< size_t, TEST_EXECSPACE >::execute_integer();
+TEST(TEST_CATEGORY, reducers_size_t) {
+  TestReducers<size_t, TEST_EXECSPACE>::execute_integer();
 }
-} // namespace Test
+}  // namespace Test
diff --git a/lib/kokkos/core/unit_test/TestReducers_c.hpp b/lib/kokkos/core/unit_test/TestReducers_c.hpp
index 8248906c6a..d1353b1f64 100644
--- a/lib/kokkos/core/unit_test/TestReducers_c.hpp
+++ b/lib/kokkos/core/unit_test/TestReducers_c.hpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -44,8 +45,7 @@
 #include <TestReducers.hpp>
 
 namespace Test {
-TEST_F( TEST_CATEGORY, reducers_double )
-{
-  TestReducers< double, TEST_EXECSPACE >::execute_float();
+TEST(TEST_CATEGORY, reducers_double) {
+  TestReducers<double, TEST_EXECSPACE>::execute_float();
 }
-} // namespace Test
+}  // namespace Test
diff --git a/lib/kokkos/core/unit_test/TestReducers_d.hpp b/lib/kokkos/core/unit_test/TestReducers_d.hpp
index 33132092ff..2dc8ae5b5a 100644
--- a/lib/kokkos/core/unit_test/TestReducers_d.hpp
+++ b/lib/kokkos/core/unit_test/TestReducers_d.hpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -44,10 +45,8 @@
 #include <TestReducers.hpp>
 
 namespace Test {
-TEST_F( TEST_CATEGORY, reducers_complex_double )
-{
-  TestReducers< Kokkos::complex<double>, TEST_EXECSPACE >::execute_basic();
+TEST(TEST_CATEGORY, reducers_complex_double) {
+  TestReducers<Kokkos::complex<double>, TEST_EXECSPACE>::execute_basic();
 }
 
-
-} // namespace Test
+}  // namespace Test
diff --git a/lib/kokkos/core/unit_test/TestResize.hpp b/lib/kokkos/core/unit_test/TestResize.hpp
index d62bc68b31..14d1295538 100644
--- a/lib/kokkos/core/unit_test/TestResize.hpp
+++ b/lib/kokkos/core/unit_test/TestResize.hpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -40,101 +41,361 @@
 // ************************************************************************
 //@HEADER
 */
-#ifndef TESTVIEWSUBVIEW_HPP_
-#define TESTVIEWSUBVIEW_HPP_
+#ifndef TESTRESIZE_HPP_
+#define TESTRESIZE_HPP_
 
 #include <gtest/gtest.h>
 #include <Kokkos_Core.hpp>
 
 namespace TestViewResize {
 
-template<class DeviceType>
-void testResize ()
-{
-  const int sizes[8] = {2, 3, 4, 5, 6, 7, 8, 9};
+struct Default {};
+struct WithoutInitializing {};
+
+template <typename View, typename... Args>
+inline void resize_dispatch(Default, View& v, Args&&... args) {
+  Kokkos::resize(v, std::forward<Args>(args)...);
+}
+
+template <typename View, typename... Args>
+inline void resize_dispatch(WithoutInitializing, View& v, Args&&... args) {
+  Kokkos::resize(Kokkos::WithoutInitializing, v, std::forward<Args>(args)...);
+}
+
+template <class DeviceType, class Tag = Default>
+void impl_testResize() {
+  const size_t sizes[8] = {2, 3, 4, 5, 6, 7, 8, 9};
 
   // Check #904 fix (no reallocation if dimensions didn't change).
   {
     typedef Kokkos::View<int*, DeviceType> view_type;
-    view_type view_1d ("view_1d", sizes[0]);
-    const int* oldPointer = view_1d.data ();
-    EXPECT_TRUE( oldPointer != NULL );
-    Kokkos::resize (view_1d, sizes[0]);
-    const int* newPointer = view_1d.data ();
-    EXPECT_TRUE( oldPointer == newPointer );
+    view_type view_1d("view_1d", sizes[0]);
+    const int* oldPointer = view_1d.data();
+    EXPECT_TRUE(oldPointer != NULL);
+    resize_dispatch(Tag{}, view_1d, sizes[0]);
+    const int* newPointer = view_1d.data();
+    EXPECT_TRUE(oldPointer == newPointer);
   }
   {
     typedef Kokkos::View<int**, DeviceType> view_type;
-    view_type view_2d ("view_2d", sizes[0], sizes[1]);
-    const int* oldPointer = view_2d.data ();
-    EXPECT_TRUE( oldPointer != NULL );
-    Kokkos::resize (view_2d, sizes[0], sizes[1]);
-    const int* newPointer = view_2d.data ();
-    EXPECT_TRUE( oldPointer == newPointer );
+    view_type view_2d("view_2d", sizes[0], sizes[1]);
+    const int* oldPointer = view_2d.data();
+    EXPECT_TRUE(oldPointer != NULL);
+    resize_dispatch(Tag{}, view_2d, sizes[0], sizes[1]);
+    const int* newPointer = view_2d.data();
+    EXPECT_TRUE(oldPointer == newPointer);
   }
   {
     typedef Kokkos::View<int***, DeviceType> view_type;
-    view_type view_3d ("view_3d", sizes[0], sizes[1], sizes[2]);
-    const int* oldPointer = view_3d.data ();
-    EXPECT_TRUE( oldPointer != NULL );
-    Kokkos::resize (view_3d, sizes[0], sizes[1], sizes[2]);
-    const int* newPointer = view_3d.data ();
-    EXPECT_TRUE( oldPointer == newPointer );
+    view_type view_3d("view_3d", sizes[0], sizes[1], sizes[2]);
+    const int* oldPointer = view_3d.data();
+    EXPECT_TRUE(oldPointer != NULL);
+    resize_dispatch(Tag{}, view_3d, sizes[0], sizes[1], sizes[2]);
+    const int* newPointer = view_3d.data();
+    EXPECT_TRUE(oldPointer == newPointer);
   }
   {
     typedef Kokkos::View<int****, DeviceType> view_type;
-    view_type view_4d ("view_4d", sizes[0], sizes[1], sizes[2], sizes[3]);
-    const int* oldPointer = view_4d.data ();
-    EXPECT_TRUE( oldPointer != NULL );
-    Kokkos::resize (view_4d, sizes[0], sizes[1], sizes[2], sizes[3]);
-    const int* newPointer = view_4d.data ();
-    EXPECT_TRUE( oldPointer == newPointer );
+    view_type view_4d("view_4d", sizes[0], sizes[1], sizes[2], sizes[3]);
+    const int* oldPointer = view_4d.data();
+    EXPECT_TRUE(oldPointer != NULL);
+    resize_dispatch(Tag{}, view_4d, sizes[0], sizes[1], sizes[2], sizes[3]);
+    const int* newPointer = view_4d.data();
+    EXPECT_TRUE(oldPointer == newPointer);
   }
   {
     typedef Kokkos::View<int*****, DeviceType> view_type;
-    view_type view_5d ("view_5d", sizes[0], sizes[1], sizes[2], sizes[3],
-                       sizes[4]);
-    const int* oldPointer = view_5d.data ();
-    EXPECT_TRUE( oldPointer != NULL );
-    Kokkos::resize (view_5d, sizes[0], sizes[1], sizes[2], sizes[3], sizes[4]);
-    const int* newPointer = view_5d.data ();
-    EXPECT_TRUE( oldPointer == newPointer );
+    view_type view_5d("view_5d", sizes[0], sizes[1], sizes[2], sizes[3],
+                      sizes[4]);
+    const int* oldPointer = view_5d.data();
+    EXPECT_TRUE(oldPointer != NULL);
+    resize_dispatch(Tag{}, view_5d, sizes[0], sizes[1], sizes[2], sizes[3],
+                    sizes[4]);
+    const int* newPointer = view_5d.data();
+    EXPECT_TRUE(oldPointer == newPointer);
   }
   {
     typedef Kokkos::View<int******, DeviceType> view_type;
-    view_type view_6d ("view_6d", sizes[0], sizes[1], sizes[2], sizes[3],
-                       sizes[4], sizes[5]);
-    const int* oldPointer = view_6d.data ();
-    EXPECT_TRUE( oldPointer != NULL );
-    Kokkos::resize (view_6d, sizes[0], sizes[1], sizes[2], sizes[3], sizes[4],
-                    sizes[5]);
-    const int* newPointer = view_6d.data ();
-    EXPECT_TRUE( oldPointer == newPointer );
+    view_type view_6d("view_6d", sizes[0], sizes[1], sizes[2], sizes[3],
+                      sizes[4], sizes[5]);
+    const int* oldPointer = view_6d.data();
+    EXPECT_TRUE(oldPointer != NULL);
+    resize_dispatch(Tag{}, view_6d, sizes[0], sizes[1], sizes[2], sizes[3],
+                    sizes[4], sizes[5]);
+    const int* newPointer = view_6d.data();
+    EXPECT_TRUE(oldPointer == newPointer);
   }
   {
     typedef Kokkos::View<int*******, DeviceType> view_type;
-    view_type view_7d ("view_7d", sizes[0], sizes[1], sizes[2], sizes[3],
-                       sizes[4], sizes[5], sizes[6]);
-    const int* oldPointer = view_7d.data ();
-    EXPECT_TRUE( oldPointer != NULL );
-    Kokkos::resize (view_7d, sizes[0], sizes[1], sizes[2], sizes[3], sizes[4],
-                    sizes[5], sizes[6]);
-    const int* newPointer = view_7d.data ();
-    EXPECT_TRUE( oldPointer == newPointer );
+    view_type view_7d("view_7d", sizes[0], sizes[1], sizes[2], sizes[3],
+                      sizes[4], sizes[5], sizes[6]);
+    const int* oldPointer = view_7d.data();
+    EXPECT_TRUE(oldPointer != NULL);
+    resize_dispatch(Tag{}, view_7d, sizes[0], sizes[1], sizes[2], sizes[3],
+                    sizes[4], sizes[5], sizes[6]);
+    const int* newPointer = view_7d.data();
+    EXPECT_TRUE(oldPointer == newPointer);
   }
   {
     typedef Kokkos::View<int********, DeviceType> view_type;
-    view_type view_8d ("view_8d", sizes[0], sizes[1], sizes[2], sizes[3],
-                       sizes[4], sizes[5], sizes[6], sizes[7]);
-    const int* oldPointer = view_8d.data ();
-    EXPECT_TRUE( oldPointer != NULL );
-    Kokkos::resize (view_8d, sizes[0], sizes[1], sizes[2], sizes[3], sizes[4],
-                    sizes[5], sizes[6], sizes[7]);
-    const int* newPointer = view_8d.data ();
-    EXPECT_TRUE( oldPointer == newPointer );
+    view_type view_8d("view_8d", sizes[0], sizes[1], sizes[2], sizes[3],
+                      sizes[4], sizes[5], sizes[6], sizes[7]);
+    const int* oldPointer = view_8d.data();
+    EXPECT_TRUE(oldPointer != NULL);
+    resize_dispatch(Tag{}, view_8d, sizes[0], sizes[1], sizes[2], sizes[3],
+                    sizes[4], sizes[5], sizes[6], sizes[7]);
+    const int* newPointer = view_8d.data();
+    EXPECT_TRUE(oldPointer == newPointer);
+  }
+  // Resize without initialization: check if data preserved
+  {
+    typedef Kokkos::View<int*, DeviceType> view_type;
+    view_type view_1d("view_1d", sizes[0]);
+    typename view_type::HostMirror h_view_1d_old =
+        Kokkos::create_mirror(view_1d);
+    Kokkos::deep_copy(view_1d, 111);
+    Kokkos::deep_copy(h_view_1d_old, view_1d);
+    resize_dispatch(Tag{}, view_1d, 2 * sizes[0]);
+    EXPECT_TRUE(view_1d.extent(0) == 2 * sizes[0]);
+    typename view_type::HostMirror h_view_1d =
+        Kokkos::create_mirror_view(view_1d);
+    Kokkos::deep_copy(h_view_1d, view_1d);
+    bool test = true;
+    for (size_t i0 = 0; i0 < sizes[0]; ++i0) {
+      if (h_view_1d(i0) != h_view_1d_old(i0)) {
+        test = false;
+        break;
+      }
+    }
+    EXPECT_TRUE(test == true);
+  }
+  {
+    typedef Kokkos::View<int**, DeviceType> view_type;
+    view_type view_2d("view_2d", sizes[0], sizes[1]);
+    typename view_type::HostMirror h_view_2d_old =
+        Kokkos::create_mirror(view_2d);
+    Kokkos::deep_copy(view_2d, 222);
+    Kokkos::deep_copy(h_view_2d_old, view_2d);
+    resize_dispatch(Tag{}, view_2d, 2 * sizes[0], sizes[1]);
+    EXPECT_TRUE(view_2d.extent(0) == 2 * sizes[0]);
+    typename view_type::HostMirror h_view_2d =
+        Kokkos::create_mirror_view(view_2d);
+    Kokkos::deep_copy(h_view_2d, view_2d);
+    bool test = true;
+    for (size_t i0 = 0; i0 < sizes[0]; ++i0) {
+      for (size_t i1 = 0; i1 < sizes[1]; ++i1) {
+        if (h_view_2d(i0, i1) != h_view_2d_old(i0, i1)) {
+          test = false;
+          break;
+        }
+      }
+    }
+    EXPECT_TRUE(test == true);
+  }
+  {
+    typedef Kokkos::View<int***, DeviceType> view_type;
+    view_type view_3d("view_3d", sizes[0], sizes[1], sizes[2]);
+    typename view_type::HostMirror h_view_3d_old =
+        Kokkos::create_mirror(view_3d);
+    Kokkos::deep_copy(view_3d, 333);
+    Kokkos::deep_copy(h_view_3d_old, view_3d);
+    resize_dispatch(Tag{}, view_3d, 2 * sizes[0], sizes[1], sizes[2]);
+    EXPECT_TRUE(view_3d.extent(0) == 2 * sizes[0]);
+    typename view_type::HostMirror h_view_3d =
+        Kokkos::create_mirror_view(view_3d);
+    Kokkos::deep_copy(h_view_3d, view_3d);
+    bool test = true;
+    for (size_t i0 = 0; i0 < sizes[0]; ++i0) {
+      for (size_t i1 = 0; i1 < sizes[1]; ++i1) {
+        for (size_t i2 = 0; i2 < sizes[2]; ++i2) {
+          if (h_view_3d(i0, i1, i2) != h_view_3d_old(i0, i1, i2)) {
+            test = false;
+            break;
+          }
+        }
+      }
+    }
+    EXPECT_TRUE(test == true);
+  }
+  {
+    typedef Kokkos::View<int****, DeviceType> view_type;
+    view_type view_4d("view_4d", sizes[0], sizes[1], sizes[2], sizes[3]);
+    typename view_type::HostMirror h_view_4d_old =
+        Kokkos::create_mirror(view_4d);
+    Kokkos::deep_copy(view_4d, 444);
+    Kokkos::deep_copy(h_view_4d_old, view_4d);
+    resize_dispatch(Tag{}, view_4d, 2 * sizes[0], sizes[1], sizes[2], sizes[3]);
+    EXPECT_TRUE(view_4d.extent(0) == 2 * sizes[0]);
+    typename view_type::HostMirror h_view_4d =
+        Kokkos::create_mirror_view(view_4d);
+    Kokkos::deep_copy(h_view_4d, view_4d);
+    bool test = true;
+    for (size_t i0 = 0; i0 < sizes[0]; ++i0) {
+      for (size_t i1 = 0; i1 < sizes[1]; ++i1) {
+        for (size_t i2 = 0; i2 < sizes[2]; ++i2) {
+          for (size_t i3 = 0; i3 < sizes[3]; ++i3) {
+            if (h_view_4d(i0, i1, i2, i3) != h_view_4d_old(i0, i1, i2, i3)) {
+              test = false;
+              break;
+            }
+          }
+        }
+      }
+    }
+    EXPECT_TRUE(test == true);
+  }
+  {
+    typedef Kokkos::View<int*****, DeviceType> view_type;
+    view_type view_5d("view_5d", sizes[0], sizes[1], sizes[2], sizes[3],
+                      sizes[4]);
+    typename view_type::HostMirror h_view_5d_old =
+        Kokkos::create_mirror(view_5d);
+    Kokkos::deep_copy(view_5d, 555);
+    Kokkos::deep_copy(h_view_5d_old, view_5d);
+    resize_dispatch(Tag{}, view_5d, 2 * sizes[0], sizes[1], sizes[2], sizes[3],
+                    sizes[4]);
+    EXPECT_TRUE(view_5d.extent(0) == 2 * sizes[0]);
+    typename view_type::HostMirror h_view_5d =
+        Kokkos::create_mirror_view(view_5d);
+    Kokkos::deep_copy(h_view_5d, view_5d);
+    bool test = true;
+    for (size_t i0 = 0; i0 < sizes[0]; ++i0) {
+      for (size_t i1 = 0; i1 < sizes[1]; ++i1) {
+        for (size_t i2 = 0; i2 < sizes[2]; ++i2) {
+          for (size_t i3 = 0; i3 < sizes[3]; ++i3) {
+            for (size_t i4 = 0; i4 < sizes[4]; ++i4) {
+              if (h_view_5d(i0, i1, i2, i3, i4) !=
+                  h_view_5d_old(i0, i1, i2, i3, i4)) {
+                test = false;
+                break;
+              }
+            }
+          }
+        }
+      }
+    }
+    EXPECT_TRUE(test == true);
+  }
+  {
+    typedef Kokkos::View<int******, DeviceType> view_type;
+    view_type view_6d("view_6d", sizes[0], sizes[1], sizes[2], sizes[3],
+                      sizes[4], sizes[5]);
+    typename view_type::HostMirror h_view_6d_old =
+        Kokkos::create_mirror(view_6d);
+    Kokkos::deep_copy(view_6d, 666);
+    Kokkos::deep_copy(h_view_6d_old, view_6d);
+    resize_dispatch(Tag{}, view_6d, 2 * sizes[0], sizes[1], sizes[2], sizes[3],
+                    sizes[4], sizes[5]);
+    EXPECT_TRUE(view_6d.extent(0) == 2 * sizes[0]);
+    typename view_type::HostMirror h_view_6d =
+        Kokkos::create_mirror_view(view_6d);
+    Kokkos::deep_copy(h_view_6d, view_6d);
+    bool test = true;
+    for (size_t i0 = 0; i0 < sizes[0]; ++i0) {
+      for (size_t i1 = 0; i1 < sizes[1]; ++i1) {
+        for (size_t i2 = 0; i2 < sizes[2]; ++i2) {
+          for (size_t i3 = 0; i3 < sizes[3]; ++i3) {
+            for (size_t i4 = 0; i4 < sizes[4]; ++i4) {
+              for (size_t i5 = 0; i5 < sizes[5]; ++i5) {
+                if (h_view_6d(i0, i1, i2, i3, i4, i5) !=
+                    h_view_6d_old(i0, i1, i2, i3, i4, i5)) {
+                  test = false;
+                  break;
+                }
+              }
+            }
+          }
+        }
+      }
+    }
+    EXPECT_TRUE(test == true);
+  }
+  {
+    typedef Kokkos::View<int*******, DeviceType> view_type;
+    view_type view_7d("view_7d", sizes[0], sizes[1], sizes[2], sizes[3],
+                      sizes[4], sizes[5], sizes[6]);
+    typename view_type::HostMirror h_view_7d_old =
+        Kokkos::create_mirror(view_7d);
+    Kokkos::deep_copy(view_7d, 777);
+    Kokkos::deep_copy(h_view_7d_old, view_7d);
+    resize_dispatch(Tag{}, view_7d, 2 * sizes[0], sizes[1], sizes[2], sizes[3],
+                    sizes[4], sizes[5], sizes[6]);
+    EXPECT_TRUE(view_7d.extent(0) == 2 * sizes[0]);
+    typename view_type::HostMirror h_view_7d =
+        Kokkos::create_mirror_view(view_7d);
+    Kokkos::deep_copy(h_view_7d, view_7d);
+    bool test = true;
+    for (size_t i0 = 0; i0 < sizes[0]; ++i0) {
+      for (size_t i1 = 0; i1 < sizes[1]; ++i1) {
+        for (size_t i2 = 0; i2 < sizes[2]; ++i2) {
+          for (size_t i3 = 0; i3 < sizes[3]; ++i3) {
+            for (size_t i4 = 0; i4 < sizes[4]; ++i4) {
+              for (size_t i5 = 0; i5 < sizes[5]; ++i5) {
+                for (size_t i6 = 0; i6 < sizes[6]; ++i6) {
+                  if (h_view_7d(i0, i1, i2, i3, i4, i5, i6) !=
+                      h_view_7d_old(i0, i1, i2, i3, i4, i5, i6)) {
+                    test = false;
+                    break;
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
+    }
+    EXPECT_TRUE(test == true);
+  }
+  {
+    typedef Kokkos::View<int********, DeviceType> view_type;
+    view_type view_8d("view_8d", sizes[0], sizes[1], sizes[2], sizes[3],
+                      sizes[4], sizes[5], sizes[6], sizes[7]);
+    typename view_type::HostMirror h_view_8d_old =
+        Kokkos::create_mirror(view_8d);
+    Kokkos::deep_copy(view_8d, 888);
+    Kokkos::deep_copy(h_view_8d_old, view_8d);
+    resize_dispatch(Tag{}, view_8d, 2 * sizes[0], sizes[1], sizes[2], sizes[3],
+                    sizes[4], sizes[5], sizes[6], sizes[7]);
+    EXPECT_TRUE(view_8d.extent(0) == 2 * sizes[0]);
+    typename view_type::HostMirror h_view_8d =
+        Kokkos::create_mirror_view(view_8d);
+    Kokkos::deep_copy(h_view_8d, view_8d);
+    bool test = true;
+    for (size_t i0 = 0; i0 < sizes[0]; ++i0) {
+      for (size_t i1 = 0; i1 < sizes[1]; ++i1) {
+        for (size_t i2 = 0; i2 < sizes[2]; ++i2) {
+          for (size_t i3 = 0; i3 < sizes[3]; ++i3) {
+            for (size_t i4 = 0; i4 < sizes[4]; ++i4) {
+              for (size_t i5 = 0; i5 < sizes[5]; ++i5) {
+                for (size_t i6 = 0; i6 < sizes[6]; ++i6) {
+                  for (size_t i7 = 0; i7 < sizes[7]; ++i7) {
+                    if (h_view_8d(i0, i1, i2, i3, i4, i5, i6, i7) !=
+                        h_view_8d_old(i0, i1, i2, i3, i4, i5, i6, i7)) {
+                      test = false;
+                      break;
+                    }
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
+    }
+    EXPECT_TRUE(test == true);
   }
 }
 
-} // namespace TestViewSubview
+template <class DeviceType>
+void testResize() {
+  {
+    impl_testResize<DeviceType>();  // with data initialization
+  }
+  {
+    impl_testResize<DeviceType,
+                    WithoutInitializing>();  // without data initialization
+  }
+}
 
-#endif // TESTVIEWSUBVIEW_HPP_
+}  // namespace TestViewResize
+#endif  // TESTRESIZE_HPP_
diff --git a/lib/kokkos/core/unit_test/TestScan.hpp b/lib/kokkos/core/unit_test/TestScan.hpp
index eaebb254a7..483f186880 100644
--- a/lib/kokkos/core/unit_test/TestScan.hpp
+++ b/lib/kokkos/core/unit_test/TestScan.hpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -46,70 +47,72 @@
 
 namespace Test {
 
-template< class Device, class WorkSpec = size_t >
+template <class Device, class WorkSpec = size_t>
 struct TestScan {
-  typedef  Device    execution_space;
-  typedef  long int  value_type;
+  typedef Device execution_space;
+  typedef long int value_type;
 
-  Kokkos::View< int, Device, Kokkos::MemoryTraits<Kokkos::Atomic> > errors;
+  Kokkos::View<int, Device, Kokkos::MemoryTraits<Kokkos::Atomic> > errors;
 
   KOKKOS_INLINE_FUNCTION
-  void operator()( const int iwork, value_type & update, const bool final_pass ) const
-  {
-    const value_type n = iwork + 1;
-    const value_type imbalance = ( ( 1000 <= n ) && ( 0 == n % 1000 ) ) ? 1000 : 0;
+  void operator()(const int iwork, value_type& update,
+                  const bool final_pass) const {
+    const value_type n         = iwork + 1;
+    const value_type imbalance = ((1000 <= n) && (0 == n % 1000)) ? 1000 : 0;
 
     // Insert an artificial load imbalance
 
-    for ( value_type i = 0; i < imbalance; ++i ) { ++update; }
+    for (value_type i = 0; i < imbalance; ++i) {
+      ++update;
+    }
 
     update += n - imbalance;
 
-    if ( final_pass ) {
-      const value_type answer = n & 1 ? ( n * ( ( n + 1 ) / 2 ) ) : ( ( n / 2 ) * ( n + 1 ) );
+    if (final_pass) {
+      const value_type answer =
+          n & 1 ? (n * ((n + 1) / 2)) : ((n / 2) * (n + 1));
 
-      if ( answer != update ) {
+      if (answer != update) {
         int fail = errors()++;
 
-        if ( fail < 20 ) {
-          printf( "TestScan(%d,%ld) != %ld\n", iwork, update, answer );
+        if (fail < 20) {
+          printf("TestScan(%d,%ld) != %ld\n", iwork, update, answer);
         }
       }
     }
   }
 
   KOKKOS_INLINE_FUNCTION
-  void init( value_type & update ) const { update = 0; }
+  void init(value_type& update) const { update = 0; }
 
   KOKKOS_INLINE_FUNCTION
-  void join( volatile       value_type & update,
-             volatile const value_type & input ) const
-  { update += input; }
+  void join(volatile value_type& update,
+            volatile const value_type& input) const {
+    update += input;
+  }
 
-  TestScan( const WorkSpec & N )
-  {
-    Kokkos::View< int, Device > errors_a( "Errors" );
-    Kokkos::deep_copy( errors_a, 0 );
+  TestScan(const WorkSpec& N) {
+    Kokkos::View<int, Device> errors_a("Errors");
+    Kokkos::deep_copy(errors_a, 0);
     errors = errors_a;
 
-    Kokkos::parallel_scan( N , *this );
+    Kokkos::parallel_scan(N, *this);
 
     long long int total = 0;
-    Kokkos::parallel_scan( N, *this, total );
+    Kokkos::parallel_scan(N, *this, total);
 
-    run_check( size_t( ( N+1 )*N/2 ), size_t( total ) );
+    run_check(size_t((N + 1) * N / 2), size_t(total));
     check_error();
   }
 
-  TestScan( const WorkSpec & Start , const WorkSpec & N )
-  {
-    typedef Kokkos::RangePolicy< execution_space > exec_policy ;
+  TestScan(const WorkSpec& Start, const WorkSpec& N) {
+    typedef Kokkos::RangePolicy<execution_space> exec_policy;
 
-    Kokkos::View< int, Device > errors_a( "Errors" );
-    Kokkos::deep_copy( errors_a, 0 );
+    Kokkos::View<int, Device> errors_a("Errors");
+    Kokkos::deep_copy(errors_a, 0);
     errors = errors_a;
-    
-    Kokkos::parallel_scan( exec_policy( Start , N ) , *this );
+
+    Kokkos::parallel_scan(exec_policy(Start, N), *this);
     Kokkos::fence();
 
     check_error();
@@ -118,36 +121,32 @@ struct TestScan {
   void check_error() {
     int total_errors;
     Kokkos::deep_copy(total_errors, errors);
-    ASSERT_EQ(total_errors,0);
+    ASSERT_EQ(total_errors, 0);
   }
 
-  static void test_range( const WorkSpec & begin, const WorkSpec & end )
-  {
-    for ( WorkSpec i = begin; i < end; ++i ) {
-      (void) TestScan( i );
+  static void test_range(const WorkSpec& begin, const WorkSpec& end) {
+    for (WorkSpec i = begin; i < end; ++i) {
+      (void)TestScan(i);
     }
   }
 
-  void run_check( const size_t & expected, const size_t & actual )
-  { 
-    ASSERT_EQ( expected, actual ); 
+  void run_check(const size_t& expected, const size_t& actual) {
+    ASSERT_EQ(expected, actual);
   }
-
 };
 
-TEST_F( TEST_CATEGORY, scan )
-{
-  TestScan< TEST_EXECSPACE >::test_range( 1, 1000 );
-  TestScan< TEST_EXECSPACE >( 0 );
-  TestScan< TEST_EXECSPACE >( 100000 );
-  TestScan< TEST_EXECSPACE >( 10000000 );
+TEST(TEST_CATEGORY, scan) {
+  TestScan<TEST_EXECSPACE>::test_range(1, 1000);
+  TestScan<TEST_EXECSPACE>(0);
+  TestScan<TEST_EXECSPACE>(100000);
+  TestScan<TEST_EXECSPACE>(10000000);
   TEST_EXECSPACE().fence();
 }
 
-
-/*TEST_F( TEST_CATEGORY, scan_small )
+/*TEST( TEST_CATEGORY, scan_small )
 {
-  typedef TestScan< TEST_EXECSPACE, Kokkos::Impl::ThreadsExecUseScanSmall > TestScanFunctor;
+  typedef TestScan< TEST_EXECSPACE, Kokkos::Impl::ThreadsExecUseScanSmall >
+TestScanFunctor;
 
   for ( int i = 0; i < 1000; ++i ) {
     TestScanFunctor( 10 );
@@ -159,5 +158,4 @@ TEST_F( TEST_CATEGORY, scan )
   TEST_EXECSPACE().fence();
 }*/
 
-
-} // namespace Test
+}  // namespace Test
diff --git a/lib/kokkos/core/unit_test/TestSharedAlloc.hpp b/lib/kokkos/core/unit_test/TestSharedAlloc.hpp
index c475fe55dc..d284b7d61e 100644
--- a/lib/kokkos/core/unit_test/TestSharedAlloc.hpp
+++ b/lib/kokkos/core/unit_test/TestSharedAlloc.hpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -54,71 +55,71 @@
 namespace Test {
 
 struct SharedAllocDestroy {
-  volatile int * count;
+  volatile int* count;
 
   SharedAllocDestroy() = default;
-  SharedAllocDestroy( int * arg ) : count( arg ) {}
+  SharedAllocDestroy(int* arg) : count(arg) {}
 
-  void destroy_shared_allocation()
-  {
-    Kokkos::atomic_increment( count );
-  }
+  void destroy_shared_allocation() { Kokkos::atomic_increment(count); }
 };
 
-template< class MemorySpace, class ExecutionSpace >
-void test_shared_alloc()
-{
-#if defined( KOKKOS_ACTIVE_EXECUTION_MEMORY_SPACE_HOST )
-  typedef const Kokkos::Impl::SharedAllocationHeader                               Header;
-  typedef Kokkos::Impl::SharedAllocationTracker                                    Tracker;
-  typedef Kokkos::Impl::SharedAllocationRecord< void, void >                       RecordBase;
-  typedef Kokkos::Impl::SharedAllocationRecord< MemorySpace, void >                RecordMemS;
-  typedef Kokkos::Impl::SharedAllocationRecord< MemorySpace, SharedAllocDestroy >  RecordFull;
+template <class MemorySpace, class ExecutionSpace>
+void test_shared_alloc() {
+#if defined(KOKKOS_ACTIVE_EXECUTION_MEMORY_SPACE_HOST)
+  typedef const Kokkos::Impl::SharedAllocationHeader Header;
+  typedef Kokkos::Impl::SharedAllocationTracker Tracker;
+  typedef Kokkos::Impl::SharedAllocationRecord<void, void> RecordBase;
+  typedef Kokkos::Impl::SharedAllocationRecord<MemorySpace, void> RecordMemS;
+  typedef Kokkos::Impl::SharedAllocationRecord<MemorySpace, SharedAllocDestroy>
+      RecordFull;
 
-  static_assert( sizeof( Tracker ) == sizeof( int* ), "SharedAllocationTracker has wrong size!" );
+  static_assert(sizeof(Tracker) == sizeof(int*),
+                "SharedAllocationTracker has wrong size!");
 
   MemorySpace s;
 
-  const size_t N = 1200;
+  const size_t N    = 1200;
   const size_t size = 8;
 
-  RecordMemS * rarray[ N ];
-  Header     * harray[ N ];
+  RecordMemS* rarray[N];
+  Header* harray[N];
 
-  RecordMemS ** const r = rarray;
-  Header     ** const h = harray;
+  RecordMemS** const r = rarray;
+  Header** const h     = harray;
 
-  Kokkos::RangePolicy< ExecutionSpace > range( 0, N );
+  Kokkos::RangePolicy<ExecutionSpace> range(0, N);
 
   {
     // Since always executed on host space, leave [=]
-    Kokkos::parallel_for( range, [=] ( size_t i ) {
+    Kokkos::parallel_for(range, [=](size_t i) {
       char name[64];
-      sprintf( name, "test_%.2d", int( i ) );
+      sprintf(name, "test_%.2d", int(i));
 
-      r[i] = RecordMemS::allocate( s, name, size * ( i + 1 ) );
-      h[i] = Header::get_header( r[i]->data() );
+      r[i] = RecordMemS::allocate(s, name, size * (i + 1));
+      h[i] = Header::get_header(r[i]->data());
 
-      ASSERT_EQ( r[i]->use_count(), 0 );
+      ASSERT_EQ(r[i]->use_count(), 0);
 
-      for ( size_t j = 0; j < ( i / 10 ) + 1; ++j ) RecordBase::increment( r[i] );
+      for (size_t j = 0; j < (i / 10) + 1; ++j) RecordBase::increment(r[i]);
 
-      ASSERT_EQ( r[i]->use_count(), ( i / 10 ) + 1 );
-      ASSERT_EQ( r[i], RecordMemS::get_record( r[i]->data() ) );
+      ASSERT_EQ(r[i]->use_count(), (i / 10) + 1);
+      ASSERT_EQ(r[i], RecordMemS::get_record(r[i]->data()));
     });
 
     Kokkos::fence();
 
 #ifdef KOKKOS_DEBUG
-    // Sanity check for the whole set of allocation records to which this record belongs.
-    RecordBase::is_sane( r[0] );
+    // Sanity check for the whole set of allocation records to which this record
+    // belongs.
+    RecordBase::is_sane(r[0]);
     // RecordMemS::print_records( std::cout, s, true );
 #endif
 
-    Kokkos::parallel_for( range, [=] ( size_t i ) {
-      while ( 0 != ( r[i] = static_cast< RecordMemS * >( RecordBase::decrement( r[i] ) ) ) ) {
+    Kokkos::parallel_for(range, [=](size_t i) {
+      while (0 !=
+             (r[i] = static_cast<RecordMemS*>(RecordBase::decrement(r[i])))) {
 #ifdef KOKKOS_DEBUG
-        if ( r[i]->use_count() == 1 ) RecordBase::is_sane( r[i] );
+        if (r[i]->use_count() == 1) RecordBase::is_sane(r[i]);
 #endif
       }
     });
@@ -128,101 +129,102 @@ void test_shared_alloc()
 
   {
     int destroy_count = 0;
-    SharedAllocDestroy counter( &destroy_count );
+    SharedAllocDestroy counter(&destroy_count);
 
-    Kokkos::parallel_for( range, [=] ( size_t i ) {
+    Kokkos::parallel_for(range, [=](size_t i) {
       char name[64];
-      sprintf( name, "test_%.2d", int( i ) );
+      sprintf(name, "test_%.2d", int(i));
 
-      RecordFull * rec = RecordFull::allocate( s, name, size * ( i + 1 ) );
+      RecordFull* rec = RecordFull::allocate(s, name, size * (i + 1));
 
       rec->m_destroy = counter;
 
       r[i] = rec;
-      h[i] = Header::get_header( r[i]->data() );
+      h[i] = Header::get_header(r[i]->data());
 
-      ASSERT_EQ( r[i]->use_count(), 0 );
+      ASSERT_EQ(r[i]->use_count(), 0);
 
-      for ( size_t j = 0; j < ( i / 10 ) + 1; ++j ) RecordBase::increment( r[i] );
+      for (size_t j = 0; j < (i / 10) + 1; ++j) RecordBase::increment(r[i]);
 
-      ASSERT_EQ( r[i]->use_count(), ( i / 10 ) + 1 );
-      ASSERT_EQ( r[i], RecordMemS::get_record( r[i]->data() ) );
+      ASSERT_EQ(r[i]->use_count(), (i / 10) + 1);
+      ASSERT_EQ(r[i], RecordMemS::get_record(r[i]->data()));
     });
 
     Kokkos::fence();
 
 #ifdef KOKKOS_DEBUG
-    RecordBase::is_sane( r[0] );
+    RecordBase::is_sane(r[0]);
 #endif
 
-    Kokkos::parallel_for( range, [=] ( size_t i ) {
-      while ( 0 != ( r[i] = static_cast< RecordMemS * >( RecordBase::decrement( r[i] ) ) ) ) {
+    Kokkos::parallel_for(range, [=](size_t i) {
+      while (0 !=
+             (r[i] = static_cast<RecordMemS*>(RecordBase::decrement(r[i])))) {
 #ifdef KOKKOS_DEBUG
-        if ( r[i]->use_count() == 1 ) RecordBase::is_sane( r[i] );
+        if (r[i]->use_count() == 1) RecordBase::is_sane(r[i]);
 #endif
       }
     });
 
     Kokkos::fence();
 
-    ASSERT_EQ( destroy_count, int( N ) );
+    ASSERT_EQ(destroy_count, int(N));
   }
 
   {
     int destroy_count = 0;
 
     {
-      RecordFull * rec = RecordFull::allocate( s, "test", size );
+      RecordFull* rec = RecordFull::allocate(s, "test", size);
 
       // ... Construction of the allocated { rec->data(), rec->size() }
 
       // Copy destruction function object into the allocation record.
-      rec->m_destroy = SharedAllocDestroy( & destroy_count );
+      rec->m_destroy = SharedAllocDestroy(&destroy_count);
 
-      ASSERT_EQ( rec->use_count(), 0 );
+      ASSERT_EQ(rec->use_count(), 0);
 
       // Start tracking, increments the use count from 0 to 1.
       Tracker track;
 
-      track.assign_allocated_record_to_uninitialized( rec );
+      track.assign_allocated_record_to_uninitialized(rec);
 
-      ASSERT_EQ( rec->use_count(), 1 );
-      ASSERT_EQ( track.use_count(), 1 );
+      ASSERT_EQ(rec->use_count(), 1);
+      ASSERT_EQ(track.use_count(), 1);
 
       // Verify construction / destruction increment.
-      for ( size_t i = 0; i < N; ++i ) {
-        ASSERT_EQ( rec->use_count(), 1 );
+      for (size_t i = 0; i < N; ++i) {
+        ASSERT_EQ(rec->use_count(), 1);
 
         {
           Tracker local_tracker;
-          local_tracker.assign_allocated_record_to_uninitialized( rec );
-          ASSERT_EQ( rec->use_count(), 2 );
-          ASSERT_EQ( local_tracker.use_count(), 2 );
+          local_tracker.assign_allocated_record_to_uninitialized(rec);
+          ASSERT_EQ(rec->use_count(), 2);
+          ASSERT_EQ(local_tracker.use_count(), 2);
         }
 
-        ASSERT_EQ( rec->use_count(), 1 );
-        ASSERT_EQ( track.use_count(), 1 );
+        ASSERT_EQ(rec->use_count(), 1);
+        ASSERT_EQ(track.use_count(), 1);
       }
 
-      Kokkos::parallel_for( range, [=] ( size_t ) {
+      Kokkos::parallel_for(range, [=](size_t) {
         Tracker local_tracker;
-        local_tracker.assign_allocated_record_to_uninitialized( rec );
-        ASSERT_GT( rec->use_count(), 1 );
+        local_tracker.assign_allocated_record_to_uninitialized(rec);
+        ASSERT_GT(rec->use_count(), 1);
       });
 
       Kokkos::fence();
 
-      ASSERT_EQ( rec->use_count(), 1 );
-      ASSERT_EQ( track.use_count(), 1 );
+      ASSERT_EQ(rec->use_count(), 1);
+      ASSERT_EQ(track.use_count(), 1);
 
-      // Destruction of 'track' object deallocates the 'rec' and invokes the destroy function object.
+      // Destruction of 'track' object deallocates the 'rec' and invokes the
+      // destroy function object.
     }
 
-    ASSERT_EQ( destroy_count, 1 );
+    ASSERT_EQ(destroy_count, 1);
   }
 
 #endif /* #if defined( KOKKOS_ACTIVE_EXECUTION_MEMORY_SPACE_HOST ) */
-
 }
 
-} // namespace Test
+}  // namespace Test
diff --git a/lib/kokkos/example/feint/feint_fwd.hpp b/lib/kokkos/core/unit_test/TestStackTrace.cpp
similarity index 69%
rename from lib/kokkos/example/feint/feint_fwd.hpp
rename to lib/kokkos/core/unit_test/TestStackTrace.cpp
index cc969ae572..76ab7e3ebe 100644
--- a/lib/kokkos/example/feint/feint_fwd.hpp
+++ b/lib/kokkos/core/unit_test/TestStackTrace.cpp
@@ -1,13 +1,14 @@
 /*
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -36,25 +37,24 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 */
 
-#ifndef KOKKOS_EXAMPLE_FEINT_FWD_HPP
-#define KOKKOS_EXAMPLE_FEINT_FWD_HPP
+#include <iostream>
+#include "Kokkos_Core.hpp"
 
-namespace Kokkos {
-namespace Example {
+#include <impl/Kokkos_Stacktrace.hpp>
 
-template < class Device , bool UseAtomic >
-void feint(
-  const unsigned global_elem_nx = 100 ,
-  const unsigned global_elem_ny = 115 ,
-  const unsigned global_elem_nz = 130 );
+namespace Test {
 
-} /* namespace Example */
-} /* namespace Kokkos */
+void my_fancy_handler() {
+  std::cerr << "I am the custom std::terminate handler." << std::endl;
+  std::abort();
+}
 
-#endif /* #ifndef KOKKOS_EXAMPLE_FEINT_FWD_HPP */
+}  // namespace Test
 
+#include <TestStackTrace.hpp>
+#include "UnitTestMainInit.cpp"
diff --git a/lib/kokkos/core/unit_test/TestStackTrace.hpp b/lib/kokkos/core/unit_test/TestStackTrace.hpp
new file mode 100644
index 0000000000..284332f3f8
--- /dev/null
+++ b/lib/kokkos/core/unit_test/TestStackTrace.hpp
@@ -0,0 +1,169 @@
+/*
+//@HEADER
+// ************************************************************************
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
+// the U.S. Government retains certain rights in this software.
+//
+// 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 Corporation nor the names of the
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 NTESS OR THE
+// 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.
+//
+// Questions? Contact Christian R. Trott (crtrott@sandia.gov)
+//
+// ************************************************************************
+//@HEADER
+*/
+#include <iostream>
+#include <gtest/gtest.h>
+#include "Kokkos_Core.hpp"
+
+#include <impl/Kokkos_Stacktrace.hpp>
+
+namespace Test {
+
+void stacktrace_test_f0(std::ostream& out);
+
+int stacktrace_test_f1(std::ostream& out);
+
+void stacktrace_test_f2(std::ostream& out);
+
+int stacktrace_test_f3(std::ostream& out, const int level);
+
+void stacktrace_test_f4();
+
+void my_fancy_handler();
+
+void test_stacktrace(bool bTerminate, bool bCustom = true) {
+  stacktrace_test_f1(std::cout);
+  bool bDynamic = false;
+  {
+    std::stringstream sstream;
+    Kokkos::Impl::print_saved_stacktrace(sstream);
+    std::string foutput = sstream.str();
+
+    bDynamic = std::string::npos != foutput.find("stacktrace");
+
+    if (bDynamic) {
+      printf("test_f1: %s \n", foutput.c_str());
+      ASSERT_TRUE(std::string::npos != foutput.find("stacktrace_test_f1"));
+      for (auto x : {"stacktrace_test_f0", "stacktrace_test_f2",
+                     "stacktrace_test_f3", "stacktrace_test_f4"}) {
+        ASSERT_TRUE(std::string::npos == foutput.find(x));
+      }
+    }
+  }
+
+  {
+    std::stringstream sstream;
+    Kokkos::Impl::print_demangled_saved_stacktrace(sstream);
+
+    if (bDynamic) {
+      std::string foutput = sstream.str();
+      printf("demangled test_f1: %s \n", foutput.c_str());
+      ASSERT_TRUE(std::string::npos !=
+                  foutput.find("Test::stacktrace_test_f1"));
+      for (auto x : {"stacktrace_test_f0", "stacktrace_test_f2",
+                     "stacktrace_test_f3", "stacktrace_test_f4"}) {
+        ASSERT_TRUE(std::string::npos == foutput.find(x));
+      }
+    }
+  }
+
+  int val = stacktrace_test_f3(std::cout, 4);
+
+  // Don't remove this, otherwise the compiler will optimize away call sequences
+  // via
+  printf("StackTrace f3(std::cout, 4) returned: %i\n", val);
+
+  // TODO test by making sure that f3 and f1, but no other functions,
+  // appear in the stack trace, and that f3 appears 5 times.
+  // Fix that f3 doesn't show up when compiling with -O3
+  {
+    std::stringstream sstream;
+    Kokkos::Impl::print_saved_stacktrace(sstream);
+
+    if (bDynamic) {
+      std::string foutput = sstream.str();
+      printf("test_f3: %s \n", foutput.c_str());
+      for (auto x : {"stacktrace_test_f1", "stacktrace_test_f3"}) {
+        ASSERT_TRUE(std::string::npos != foutput.find(x));
+      }
+    }
+    // TODO make sure stacktrace_test_f2/4 don't show up
+    // TODO make sure stacktrace_test_f3 shows up 5 times
+  }
+
+  {
+    std::stringstream sstream;
+    Kokkos::Impl::print_demangled_saved_stacktrace(sstream);
+
+    if (bDynamic) {
+      std::string foutput = sstream.str();
+      printf("demangled test_f3: %s \n", foutput.c_str());
+      for (auto x : {"stacktrace_test_f1", "stacktrace_test_f3"}) {
+        ASSERT_TRUE(std::string::npos != foutput.find(x));
+      }
+    }
+
+    // TODO make sure stacktrace_test_f2/4 don't show up
+    // TODO make sure stacktrace_test_f3 shows up 5 times
+  }
+  std::cout << "Test setting std::terminate handler that prints "
+               "the last saved stack trace"
+            << std::endl;
+
+  stacktrace_test_f4();
+
+  if (bCustom) {
+    Kokkos::Impl::set_kokkos_terminate_handler(my_fancy_handler);
+  } else {
+    Kokkos::Impl::set_kokkos_terminate_handler();
+  }
+
+  // TODO test that this prints "Oh noes!" and the correct stacktrace.
+  if (bTerminate) {
+    std::terminate();
+  }
+}
+
+TEST(defaultdevicetype, stacktrace_normal) { test_stacktrace(false); }
+
+TEST(defaultdevicetype_DeathTest, stacktrace_terminate) {
+  ASSERT_DEATH({ test_stacktrace(true); },
+               "I am the custom std::terminate handler.");
+}
+
+TEST(defaultdevicetype_DeathTest, stacktrace_generic_term) {
+  ASSERT_DEATH({ test_stacktrace(true, false); },
+               "Kokkos observes that std::terminate has been called");
+}
+
+}  // namespace Test
diff --git a/lib/kokkos/example/feint/feint_openmp.cpp b/lib/kokkos/core/unit_test/TestStackTrace_f0.cpp
similarity index 67%
rename from lib/kokkos/example/feint/feint_openmp.cpp
rename to lib/kokkos/core/unit_test/TestStackTrace_f0.cpp
index 8c7e0b6a08..1514600f7d 100644
--- a/lib/kokkos/example/feint/feint_openmp.cpp
+++ b/lib/kokkos/core/unit_test/TestStackTrace_f0.cpp
@@ -1,13 +1,14 @@
 /*
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -36,32 +37,18 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 */
 
-#include <Kokkos_Core.hpp>
+#include <iostream>
+#include "Kokkos_Core.hpp"
 
-#ifdef KOKKOS_ENABLE_OPENMP
+#include <impl/Kokkos_Stacktrace.hpp>
 
-#include <feint.hpp>
+namespace Test {
 
-namespace Kokkos {
-namespace Example {
-
-template void feint<Kokkos::OpenMP,false>(
-  const unsigned global_elem_nx ,
-  const unsigned global_elem_ny ,
-  const unsigned global_elem_nz );
-
-template void feint<Kokkos::OpenMP,true>(
-  const unsigned global_elem_nx ,
-  const unsigned global_elem_ny ,
-  const unsigned global_elem_nz );
-
-} /* namespace Example */
-} /* namespace Kokkos */
-
-#endif
+void stacktrace_test_f0(std::ostream& out) { out << "Top of f0" << std::endl; }
 
+}  // namespace Test
diff --git a/lib/kokkos/example/fixture/TestFixture.cpp b/lib/kokkos/core/unit_test/TestStackTrace_f1.cpp
similarity index 69%
rename from lib/kokkos/example/fixture/TestFixture.cpp
rename to lib/kokkos/core/unit_test/TestStackTrace_f1.cpp
index b83d40588f..b10c574c9b 100644
--- a/lib/kokkos/example/fixture/TestFixture.cpp
+++ b/lib/kokkos/core/unit_test/TestStackTrace_f1.cpp
@@ -1,13 +1,14 @@
 /*
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -36,27 +37,27 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 */
 
-#include <Kokkos_Core.hpp>
-#include <TestFixture.hpp>
+#include <iostream>
+#include "Kokkos_Core.hpp"
 
-namespace Kokkos {
-namespace Example {
+#include <impl/Kokkos_Stacktrace.hpp>
 
-template void test_fixture< Kokkos::HostSpace::execution_space >();
+namespace Test {
 
-#if defined( KOKKOS_ENABLE_CUDA )
-template void test_fixture<Kokkos::Cuda>();
-#endif
+void stacktrace_test_f0(std::ostream& out);
 
-#if defined( KOKKOS_ENABLE_ROCM )
-template void test_fixture<Kokkos::Experimental::ROCm>();
-#endif
+int stacktrace_test_f1(std::ostream& out) {
+  out << "Top of f1" << std::endl;
+  stacktrace_test_f0(out);
+  Kokkos::Impl::save_stacktrace();
+  stacktrace_test_f0(out);
 
-} /* namespace Example */
-} /* namespace Kokkos */
+  return 42;
+}
 
+}  // namespace Test
diff --git a/lib/kokkos/example/feint/feint_serial.cpp b/lib/kokkos/core/unit_test/TestStackTrace_f2.cpp
similarity index 67%
rename from lib/kokkos/example/feint/feint_serial.cpp
rename to lib/kokkos/core/unit_test/TestStackTrace_f2.cpp
index e70a05032d..23c1895e69 100644
--- a/lib/kokkos/example/feint/feint_serial.cpp
+++ b/lib/kokkos/core/unit_test/TestStackTrace_f2.cpp
@@ -1,13 +1,14 @@
 /*
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -36,32 +37,24 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 */
 
-#include <Kokkos_Core.hpp>
+#include <iostream>
+#include "Kokkos_Core.hpp"
 
-#ifdef KOKKOS_ENABLE_SERIAL
+#include <impl/Kokkos_Stacktrace.hpp>
 
-#include <feint.hpp>
+namespace Test {
 
-namespace Kokkos {
-namespace Example {
+int stacktrace_test_f1(std::ostream& out);
 
-template void feint<Kokkos::Serial,false>(
-  const unsigned global_elem_nx ,
-  const unsigned global_elem_ny ,
-  const unsigned global_elem_nz );
-
-template void feint<Kokkos::Serial,true>(
-  const unsigned global_elem_nx ,
-  const unsigned global_elem_ny ,
-  const unsigned global_elem_nz );
-
-} /* namespace Example */
-} /* namespace Kokkos */
-
-#endif
+void stacktrace_test_f2(std::ostream& out) {
+  out << "Top of f2" << std::endl;
+  const int result = stacktrace_test_f1(out);
+  out << "f2: f1 returned " << result << std::endl;
+}
 
+}  // namespace Test
diff --git a/lib/kokkos/core/unit_test/TestStackTrace_f3.cpp b/lib/kokkos/core/unit_test/TestStackTrace_f3.cpp
new file mode 100644
index 0000000000..ac004243f1
--- /dev/null
+++ b/lib/kokkos/core/unit_test/TestStackTrace_f3.cpp
@@ -0,0 +1,62 @@
+/*
+//@HEADER
+// ************************************************************************
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
+// the U.S. Government retains certain rights in this software.
+//
+// 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 Corporation nor the names of the
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 NTESS OR THE
+// 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.
+//
+// Questions? Contact Christian R. Trott (crtrott@sandia.gov)
+//
+// ************************************************************************
+//@HEADER
+*/
+
+#include <iostream>
+#include "Kokkos_Core.hpp"
+
+#include <impl/Kokkos_Stacktrace.hpp>
+
+namespace Test {
+
+int stacktrace_test_f1(std::ostream& out);
+
+int stacktrace_test_f3(std::ostream& out, const int level) {
+  out << "Top of f3" << std::endl;
+  if (level <= 0) {
+    return stacktrace_test_f1(out);
+  } else {
+    return stacktrace_test_f3(out, level - 1) + 17;
+  }
+}
+}  // namespace Test
diff --git a/lib/kokkos/core/unit_test/TestStackTrace_f4.cpp b/lib/kokkos/core/unit_test/TestStackTrace_f4.cpp
new file mode 100644
index 0000000000..afae98a2a8
--- /dev/null
+++ b/lib/kokkos/core/unit_test/TestStackTrace_f4.cpp
@@ -0,0 +1,53 @@
+/*
+//@HEADER
+// ************************************************************************
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
+// the U.S. Government retains certain rights in this software.
+//
+// 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 Corporation nor the names of the
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 NTESS OR THE
+// 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.
+//
+// Questions? Contact Christian R. Trott (crtrott@sandia.gov)
+//
+// ************************************************************************
+//@HEADER
+*/
+
+#include <iostream>
+#include "Kokkos_Core.hpp"
+
+#include <impl/Kokkos_Stacktrace.hpp>
+
+namespace Test {
+
+void stacktrace_test_f4() { Kokkos::Impl::save_stacktrace(); }
+}  // namespace Test
diff --git a/lib/kokkos/core/unit_test/TestTaskScheduler.hpp b/lib/kokkos/core/unit_test/TestTaskScheduler.hpp
index 361e8da9e1..9f593a00fd 100644
--- a/lib/kokkos/core/unit_test/TestTaskScheduler.hpp
+++ b/lib/kokkos/core/unit_test/TestTaskScheduler.hpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -45,14 +46,13 @@
 #define KOKKOS_UNITTEST_TASKSCHEDULER_HPP
 
 #include <Kokkos_Macros.hpp>
-#if defined( KOKKOS_ENABLE_TASKDAG )
+#if defined(KOKKOS_ENABLE_TASKDAG)
 #include <Kokkos_Core.hpp>
 #include <impl/Kokkos_FixedBufferMemoryPool.hpp>
 #include <cstdio>
 #include <iostream>
 #include <cmath>
 
-
 //==============================================================================
 // <editor-fold desc="TestFib"> {{{1
 
@@ -60,113 +60,103 @@ namespace TestTaskScheduler {
 
 namespace {
 
-inline
-long eval_fib( long n )
-{
+inline long eval_fib(long n) {
   constexpr long mask = 0x03;
 
-  long fib[4] = { 0, 1, 1, 2 };
+  long fib[4] = {0, 1, 1, 2};
 
-  for ( long i = 2; i <= n; ++i ) {
-    fib[ i & mask ] = fib[ ( i - 1 ) & mask ] + fib[ ( i - 2 ) & mask ];
+  for (long i = 2; i <= n; ++i) {
+    fib[i & mask] = fib[(i - 1) & mask] + fib[(i - 2) & mask];
   }
 
-  return fib[ n & mask ];
+  return fib[n & mask];
 }
 
-}
+}  // namespace
 
-template< typename Scheduler >
-struct TestFib
-{
-  using sched_type = Scheduler;
-  using future_type = Kokkos::BasicFuture< long, Scheduler >;
-  using value_type = long;
+template <typename Scheduler>
+struct TestFib {
+  using sched_type  = Scheduler;
+  using future_type = Kokkos::BasicFuture<long, Scheduler>;
+  using value_type  = long;
 
   future_type fib_m1;
   future_type fib_m2;
   const value_type n;
 
   KOKKOS_INLINE_FUNCTION
-  TestFib( const value_type arg_n )
-    : fib_m1(), fib_m2(), n( arg_n ) {}
+  TestFib(const value_type arg_n) : fib_m1(), fib_m2(), n(arg_n) {}
 
   KOKKOS_INLINE_FUNCTION
-  void operator()( typename sched_type::member_type & member, value_type & result )
-  {
+  void operator()(typename sched_type::member_type& member,
+                  value_type& result) {
 #if 0
     printf( "\nTestFib(%ld) %d %d\n", n, int( !fib_m1.is_null() ), int( !fib_m2.is_null() ) );
 #endif
 
     auto& sched = member.scheduler();
 
-    if ( n < 2 ) {
+    if (n < 2) {
       result = n;
-    }
-    else if ( !fib_m2.is_null() && !fib_m1.is_null() ) {
+    } else if (!fib_m2.is_null() && !fib_m1.is_null()) {
       result = fib_m1.get() + fib_m2.get();
-    }
-    else {
+    } else {
       // Spawn new children and respawn myself to sum their results.
       // Spawn lower value at higher priority as it has a shorter
       // path to completion.
 
-      fib_m2 = Kokkos::task_spawn( Kokkos::TaskSingle( sched, Kokkos::TaskPriority::High )
-                                 , TestFib( n - 2 ) );
+      fib_m2 = Kokkos::task_spawn(
+          Kokkos::TaskSingle(sched, Kokkos::TaskPriority::High),
+          TestFib(n - 2));
 
-      fib_m1 = Kokkos::task_spawn( Kokkos::TaskSingle( sched )
-                                 , TestFib( n - 1 ) );
+      fib_m1 = Kokkos::task_spawn(Kokkos::TaskSingle(sched), TestFib(n - 1));
 
-      Kokkos::BasicFuture<void, Scheduler> dep[] = { fib_m1, fib_m2 };
-      Kokkos::BasicFuture<void, Scheduler> fib_all = sched.when_all( dep, 2 );
+      Kokkos::BasicFuture<void, Scheduler> dep[]   = {fib_m1, fib_m2};
+      Kokkos::BasicFuture<void, Scheduler> fib_all = sched.when_all(dep, 2);
 
-      if ( !fib_m2.is_null() && !fib_m1.is_null() && !fib_all.is_null() ) {
+      if (!fib_m2.is_null() && !fib_m1.is_null() && !fib_all.is_null()) {
         // High priority to retire this branch.
-        Kokkos::respawn( this, fib_all, Kokkos::TaskPriority::High );
-      }
-      else {
+        Kokkos::respawn(this, fib_all, Kokkos::TaskPriority::High);
+      } else {
 #if 1
-        printf( "TestFib(%ld) insufficient memory alloc_capacity(%d) task_max(%d) task_accum(%ld)\n"
-               , n
-               , 0 //sched.allocation_capacity()
-               , 0 //sched.allocated_task_count_max()
-               , 0l //sched.allocated_task_count_accum()
-               );
+        printf(
+            "TestFib(%ld) insufficient memory alloc_capacity(%d) task_max(%d) "
+            "task_accum(%ld)\n",
+            n, 0  // sched.allocation_capacity()
+            ,
+            0  // sched.allocated_task_count_max()
+            ,
+            0l  // sched.allocated_task_count_accum()
+        );
 #endif
 
-        Kokkos::abort( "TestFib insufficient memory" );
-
+        Kokkos::abort("TestFib insufficient memory");
       }
     }
   }
 
-  static void run( int i, size_t MemoryCapacity = 16000 )
-  {
+  static void run(int i, size_t MemoryCapacity = 16000) {
     typedef typename sched_type::memory_space memory_space;
 
-    enum { MinBlockSize   =   64 };
-    enum { MaxBlockSize   = 1024 };
+    enum { MinBlockSize = 64 };
+    enum { MaxBlockSize = 1024 };
     enum { SuperBlockSize = 4096 };
 
-    sched_type root_sched( memory_space()
-                         , MemoryCapacity
-                         , MinBlockSize
-                         , std::min(size_t(MaxBlockSize),MemoryCapacity)
-                         , std::min(size_t(SuperBlockSize),MemoryCapacity) );
+    sched_type root_sched(memory_space(), MemoryCapacity, MinBlockSize,
+                          std::min(size_t(MaxBlockSize), MemoryCapacity),
+                          std::min(size_t(SuperBlockSize), MemoryCapacity));
 
     {
-      future_type f = Kokkos::host_spawn( Kokkos::TaskSingle( root_sched )
-                                        , TestFib( i ) );
+      future_type f =
+          Kokkos::host_spawn(Kokkos::TaskSingle(root_sched), TestFib(i));
 
-      Kokkos::wait( root_sched );
+      Kokkos::wait(root_sched);
 
-      ASSERT_EQ( eval_fib( i ), f.get() );
+      ASSERT_EQ(eval_fib(i), f.get());
     }
 
     ASSERT_EQ(root_sched.queue().allocation_count(), 0);
 
-
-
 #if 0
     fprintf( stdout, "\nTestFib::run(%d) spawn_size(%d) when_all_size(%d) alloc_capacity(%d) task_max(%d) task_accum(%ld)\n"
            , i
@@ -181,7 +171,7 @@ struct TestFib
   }
 };
 
-} // namespace TestTaskScheduler
+}  // namespace TestTaskScheduler
 
 // </editor-fold> end TestFib }}}1
 //==============================================================================
@@ -193,83 +183,73 @@ struct TestFib
 
 namespace TestTaskScheduler {
 
-template< class Scheduler >
+template <class Scheduler>
 struct TestTaskDependence {
-  typedef Scheduler  sched_type;
-  typedef Kokkos::BasicFuture< void, Scheduler > future_type;
-  typedef Kokkos::View< long, typename sched_type::execution_space >     accum_type;
-  typedef void                            value_type;
+  typedef Scheduler sched_type;
+  typedef Kokkos::BasicFuture<void, Scheduler> future_type;
+  typedef Kokkos::View<long, typename sched_type::execution_space> accum_type;
+  typedef void value_type;
 
-  accum_type  m_accum;
-  long        m_count;
+  accum_type m_accum;
+  long m_count;
 
   KOKKOS_INLINE_FUNCTION
-  TestTaskDependence( long n
-                    , const accum_type & arg_accum )
-    : m_accum( arg_accum )
-    , m_count( n ) {}
+  TestTaskDependence(long n, const accum_type& arg_accum)
+      : m_accum(arg_accum), m_count(n) {}
 
   KOKKOS_INLINE_FUNCTION
-  void operator()( typename sched_type::member_type & member )
-  {
+  void operator()(typename sched_type::member_type& member) {
     auto& sched = member.scheduler();
     enum { CHUNK = 8 };
     const int n = CHUNK < m_count ? CHUNK : m_count;
 
-    if ( 1 < m_count ) {
+    if (1 < m_count) {
+      const int increment = (m_count + n - 1) / n;
 
-      const int increment = ( m_count + n - 1 ) / n;
+      future_type f = sched.when_all(n, [this, &member, increment](int i) {
+        const long inc   = increment;
+        const long begin = i * inc;
+        const long count = begin + inc < m_count ? inc : m_count - begin;
 
-      future_type f =
-        sched.when_all( n , [this,&member,increment]( int i ) {
-          const long inc   = increment ;
-          const long begin = i * inc ;
-          const long count = begin + inc < m_count ? inc : m_count - begin ;
-
-          return Kokkos::task_spawn
-            ( Kokkos::TaskSingle( member.scheduler() )
-            , TestTaskDependence( count, m_accum ) );
-        });
+        return Kokkos::task_spawn(Kokkos::TaskSingle(member.scheduler()),
+                                  TestTaskDependence(count, m_accum));
+      });
 
       m_count = 0;
 
-      Kokkos::respawn( this, f );
-    }
-    else if ( 1 == m_count ) {
-      Kokkos::atomic_increment( & m_accum() );
+      Kokkos::respawn(this, f);
+    } else if (1 == m_count) {
+      Kokkos::atomic_increment(&m_accum());
     }
   }
 
-  static void run( int n )
-  {
+  static void run(int n) {
     typedef typename sched_type::memory_space memory_space;
 
     enum { MemoryCapacity = 16000 };
-    enum { MinBlockSize   =   64 };
-    enum { MaxBlockSize   = 1024 };
+    enum { MinBlockSize = 64 };
+    enum { MaxBlockSize = 1024 };
     enum { SuperBlockSize = 4096 };
 
-    sched_type sched( memory_space()
-                    , MemoryCapacity
-                    , MinBlockSize
-                    , MaxBlockSize
-                    , SuperBlockSize );
+    sched_type sched(memory_space(), MemoryCapacity, MinBlockSize, MaxBlockSize,
+                     SuperBlockSize);
 
-    accum_type accum( "accum" );
+    accum_type accum("accum");
 
-    typename accum_type::HostMirror host_accum = Kokkos::create_mirror_view( accum );
+    typename accum_type::HostMirror host_accum =
+        Kokkos::create_mirror_view(accum);
 
-    Kokkos::host_spawn( Kokkos::TaskSingle( sched ), TestTaskDependence( n, accum ) );
+    Kokkos::host_spawn(Kokkos::TaskSingle(sched), TestTaskDependence(n, accum));
 
-    Kokkos::wait( sched );
+    Kokkos::wait(sched);
 
-    Kokkos::deep_copy( host_accum, accum );
+    Kokkos::deep_copy(host_accum, accum);
 
-    ASSERT_EQ( host_accum(), n );
+    ASSERT_EQ(host_accum(), n);
   }
 };
 
-} // namespace TestTaskScheduler
+}  // namespace TestTaskScheduler
 
 // </editor-fold> end TestTaskDependence }}}1
 //==============================================================================
@@ -278,114 +258,107 @@ struct TestTaskDependence {
 
 namespace TestTaskScheduler {
 
-template< class Scheduler >
+template <class Scheduler>
 struct TestTaskTeam {
-  //enum { SPAN = 8 };
+  // enum { SPAN = 8 };
   enum { SPAN = 33 };
-  //enum { SPAN = 1 };
+  // enum { SPAN = 1 };
 
-  typedef void                                value_type;
-  using sched_type = Scheduler;
+  typedef void value_type;
+  using sched_type  = Scheduler;
   using future_type = Kokkos::BasicFuture<void, sched_type>;
-  using ExecSpace = typename sched_type::execution_space;
-  typedef Kokkos::View< long*, ExecSpace >    view_type;
+  using ExecSpace   = typename sched_type::execution_space;
+  typedef Kokkos::View<long*, ExecSpace> view_type;
 
-  future_type  future;
+  future_type future;
 
-  view_type   parfor_result;
-  view_type   parreduce_check;
-  view_type   parscan_result;
-  view_type   parscan_check;
-  const long  nvalue;
+  view_type parfor_result;
+  view_type parreduce_check;
+  view_type parscan_result;
+  view_type parscan_check;
+  const long nvalue;
 
   KOKKOS_INLINE_FUNCTION
-  TestTaskTeam( const view_type  & arg_parfor_result
-              , const view_type  & arg_parreduce_check
-              , const view_type  & arg_parscan_result
-              , const view_type  & arg_parscan_check
-              , const long         arg_nvalue )
-    : future()
-    , parfor_result( arg_parfor_result )
-    , parreduce_check( arg_parreduce_check )
-    , parscan_result( arg_parscan_result )
-    , parscan_check( arg_parscan_check )
-    , nvalue( arg_nvalue ) {}
+  TestTaskTeam(const view_type& arg_parfor_result,
+               const view_type& arg_parreduce_check,
+               const view_type& arg_parscan_result,
+               const view_type& arg_parscan_check, const long arg_nvalue)
+      : future(),
+        parfor_result(arg_parfor_result),
+        parreduce_check(arg_parreduce_check),
+        parscan_result(arg_parscan_result),
+        parscan_check(arg_parscan_check),
+        nvalue(arg_nvalue) {}
 
   KOKKOS_INLINE_FUNCTION
-  void operator()( typename sched_type::member_type & member )
-  {
-    auto& sched = member.scheduler();
-    const long end   = nvalue + 1;
+  void operator()(typename sched_type::member_type& member) {
+    auto& sched    = member.scheduler();
+    const long end = nvalue + 1;
     // begin = max(end - SPAN, 0);
     const long begin = 0 < end - SPAN ? end - SPAN : 0;
 
-    if ( 0 < begin && future.is_null() ) {
-      if ( member.team_rank() == 0 ) {
-        future = Kokkos::task_spawn( Kokkos::TaskTeam( sched )
-                                   , TestTaskTeam( parfor_result
-                                                 , parreduce_check
-                                                 , parscan_result
-                                                 , parscan_check
-                                                 , begin - 1 )
-                                   );
+    if (0 < begin && future.is_null()) {
+      if (member.team_rank() == 0) {
+        future = Kokkos::task_spawn(
+            Kokkos::TaskTeam(sched),
+            TestTaskTeam(parfor_result, parreduce_check, parscan_result,
+                         parscan_check, begin - 1));
 
-        #if !defined(__HCC_ACCELERATOR__) && !defined(__CUDA_ARCH__)
-        assert( !future.is_null() );
-        #endif
+#if !defined(__HCC_ACCELERATOR__) && !defined(__CUDA_ARCH__)
+        assert(!future.is_null());
+#endif
 
-        Kokkos::respawn( this, future );
+        Kokkos::respawn(this, future);
       }
 
       return;
     }
 
-    Kokkos::parallel_for( Kokkos::TeamThreadRange( member, begin, end )
-                        , [&] ( int i ) { parfor_result[i] = i; }
-                        );
+    Kokkos::parallel_for(Kokkos::TeamThreadRange(member, begin, end),
+                         [&](int i) { parfor_result[i] = i; });
 
     // Test parallel_reduce without join.
 
-    long tot = 0;
-    long expected = ( begin + end - 1 ) * ( end - begin ) * 0.5;
+    long tot      = 0;
+    long expected = (begin + end - 1) * (end - begin) * 0.5;
 
-    Kokkos::parallel_reduce( Kokkos::TeamThreadRange( member, begin, end )
-                           , [&] ( int i, long & res ) { res += parfor_result[i]; }
-                           , tot
-                           );
+    Kokkos::parallel_reduce(
+        Kokkos::TeamThreadRange(member, begin, end),
+        [&](int i, long& res) { res += parfor_result[i]; }, tot);
 
-    Kokkos::parallel_for( Kokkos::TeamThreadRange( member, begin, end )
-                        , [&] ( int i ) { parreduce_check[i] = expected - tot; }
-                        );
+    Kokkos::parallel_for(Kokkos::TeamThreadRange(member, begin, end),
+                         [&](int i) { parreduce_check[i] = expected - tot; });
 
     // Test parallel_reduce with join.
 
     tot = 0;
-    Kokkos::parallel_reduce( Kokkos::TeamThreadRange( member, begin, end )
-                           , [&] ( int i, long & res ) { res += parfor_result[i]; }
-                           , Kokkos::Sum<long>( tot )
-                           );
+    Kokkos::parallel_reduce(
+        Kokkos::TeamThreadRange(member, begin, end),
+        [&](int i, long& res) { res += parfor_result[i]; },
+        Kokkos::Sum<long>(tot));
 
-    Kokkos::parallel_for( Kokkos::TeamThreadRange( member, begin, end )
-                        , [&] ( int i ) { parreduce_check[i] += expected - tot; }
-                        );
+    Kokkos::parallel_for(Kokkos::TeamThreadRange(member, begin, end),
+                         [&](int i) { parreduce_check[i] += expected - tot; });
 
     // Test parallel_scan.
 
     // Exclusive scan.
-    Kokkos::parallel_scan<long>( Kokkos::TeamThreadRange( member, begin, end )
-                               , [&] ( int i, long & val, const bool final )
-    {
-      if ( final ) { parscan_result[i] = val; }
+    Kokkos::parallel_scan<long>(Kokkos::TeamThreadRange(member, begin, end),
+                                [&](int i, long& val, const bool final) {
+                                  if (final) {
+                                    parscan_result[i] = val;
+                                  }
 
-      val += i;
-    });
+                                  val += i;
+                                });
 
     // Wait for 'parscan_result' before testing it.
     member.team_barrier();
 
-    if ( member.team_rank() == 0 ) {
-      for ( long i = begin; i < end; ++i ) {
-        parscan_check[i] = ( i * ( i - 1 ) - begin * ( begin - 1 ) ) * 0.5 - parscan_result[i];
+    if (member.team_rank() == 0) {
+      for (long i = begin; i < end; ++i) {
+        parscan_check[i] =
+            (i * (i - 1) - begin * (begin - 1)) * 0.5 - parscan_result[i];
       }
     }
 
@@ -393,394 +366,355 @@ struct TestTaskTeam {
     member.team_barrier();
 
     // Inclusive scan.
-    Kokkos::parallel_scan<long>( Kokkos::TeamThreadRange( member, begin, end )
-                               , [&] ( int i, long & val, const bool final )
-    {
-      val += i;
+    Kokkos::parallel_scan<long>(Kokkos::TeamThreadRange(member, begin, end),
+                                [&](int i, long& val, const bool final) {
+                                  val += i;
 
-      if ( final ) { parscan_result[i] = val; }
-    });
+                                  if (final) {
+                                    parscan_result[i] = val;
+                                  }
+                                });
 
     // Wait for 'parscan_result' before testing it.
     member.team_barrier();
 
-    if ( member.team_rank() == 0 ) {
-      for ( long i = begin; i < end; ++i ) {
-        parscan_check[i] += ( i * ( i + 1 ) - begin * ( begin - 1 ) ) * 0.5 - parscan_result[i];
+    if (member.team_rank() == 0) {
+      for (long i = begin; i < end; ++i) {
+        parscan_check[i] +=
+            (i * (i + 1) - begin * (begin - 1)) * 0.5 - parscan_result[i];
       }
     }
 
     // ThreadVectorRange check.
-/*
-    long result = 0;
-    expected = ( begin + end - 1 ) * ( end - begin ) * 0.5;
-    Kokkos::parallel_reduce( Kokkos::TeamThreadRange( member, 0, 1 )
-                           , [&] ( const int i, long & outerUpdate )
-    {
-      long sum_j = 0.0;
+    /*
+        long result = 0;
+        expected = ( begin + end - 1 ) * ( end - begin ) * 0.5;
+        Kokkos::parallel_reduce( Kokkos::TeamThreadRange( member, 0, 1 )
+                               , [&] ( const int i, long & outerUpdate )
+        {
+          long sum_j = 0.0;
 
-      Kokkos::parallel_reduce( Kokkos::ThreadVectorRange( member, end - begin )
-                             , [&] ( const int j, long & innerUpdate )
-      {
-        innerUpdate += begin + j;
-      }, sum_j );
+          Kokkos::parallel_reduce( Kokkos::ThreadVectorRange( member, end -
+       begin ) , [&] ( const int j, long & innerUpdate )
+          {
+            innerUpdate += begin + j;
+          }, sum_j );
 
-      outerUpdate += sum_j;
-    }, result );
-
-    Kokkos::parallel_for( Kokkos::TeamThreadRange( member, begin, end )
-                        , [&] ( int i )
-    {
-      parreduce_check[i] += result - expected;
-    });
-*/
+          outerUpdate += sum_j;
+        }, result );
 
+        Kokkos::parallel_for( Kokkos::TeamThreadRange( member, begin, end )
+                            , [&] ( int i )
+        {
+          parreduce_check[i] += result - expected;
+        });
+    */
   }
 
-  static void run( long n )
-  {
+  static void run(long n) {
     const unsigned memory_capacity = 400000;
 
-    enum { MinBlockSize   =   64 };
-    enum { MaxBlockSize   = 1024 };
+    enum { MinBlockSize = 64 };
+    enum { MaxBlockSize = 1024 };
     enum { SuperBlockSize = 4096 };
 
-    sched_type root_sched( typename sched_type::memory_space()
-                         , memory_capacity
-                         , MinBlockSize
-                         , MaxBlockSize
-                         , SuperBlockSize );
+    sched_type root_sched(typename sched_type::memory_space(), memory_capacity,
+                          MinBlockSize, MaxBlockSize, SuperBlockSize);
 
-    view_type root_parfor_result( "parfor_result", n + 1 );
-    view_type root_parreduce_check( "parreduce_check", n + 1 );
-    view_type root_parscan_result( "parscan_result", n + 1 );
-    view_type root_parscan_check( "parscan_check", n + 1 );
+    view_type root_parfor_result("parfor_result", n + 1);
+    view_type root_parreduce_check("parreduce_check", n + 1);
+    view_type root_parscan_result("parscan_result", n + 1);
+    view_type root_parscan_check("parscan_check", n + 1);
 
-    typename view_type::HostMirror
-      host_parfor_result = Kokkos::create_mirror_view( root_parfor_result );
-    typename view_type::HostMirror
-      host_parreduce_check = Kokkos::create_mirror_view( root_parreduce_check );
-    typename view_type::HostMirror
-      host_parscan_result = Kokkos::create_mirror_view( root_parscan_result );
-    typename view_type::HostMirror
-      host_parscan_check = Kokkos::create_mirror_view( root_parscan_check );
+    typename view_type::HostMirror host_parfor_result =
+        Kokkos::create_mirror_view(root_parfor_result);
+    typename view_type::HostMirror host_parreduce_check =
+        Kokkos::create_mirror_view(root_parreduce_check);
+    typename view_type::HostMirror host_parscan_result =
+        Kokkos::create_mirror_view(root_parscan_result);
+    typename view_type::HostMirror host_parscan_check =
+        Kokkos::create_mirror_view(root_parscan_check);
 
-    future_type f = Kokkos::host_spawn( Kokkos::TaskTeam( root_sched )
-                                      , TestTaskTeam( root_parfor_result
-                                                    , root_parreduce_check
-                                                    , root_parscan_result
-                                                    , root_parscan_check
-                                                    , n )
-                                      );
+    future_type f = Kokkos::host_spawn(
+        Kokkos::TaskTeam(root_sched),
+        TestTaskTeam(root_parfor_result, root_parreduce_check,
+                     root_parscan_result, root_parscan_check, n));
 
-    Kokkos::wait( root_sched );
+    Kokkos::wait(root_sched);
 
-    Kokkos::deep_copy( host_parfor_result, root_parfor_result );
-    Kokkos::deep_copy( host_parreduce_check, root_parreduce_check );
-    Kokkos::deep_copy( host_parscan_result, root_parscan_result );
-    Kokkos::deep_copy( host_parscan_check, root_parscan_check );
+    Kokkos::deep_copy(host_parfor_result, root_parfor_result);
+    Kokkos::deep_copy(host_parreduce_check, root_parreduce_check);
+    Kokkos::deep_copy(host_parscan_result, root_parscan_result);
+    Kokkos::deep_copy(host_parscan_check, root_parscan_check);
 
-    long error_count = 0 ;
+    long error_count = 0;
 
-    for ( long i = 0; i <= n; ++i ) {
+    for (long i = 0; i <= n; ++i) {
       const long answer = i;
 
-      if ( host_parfor_result( i ) != answer ) {
-        ++error_count ;
-        std::cerr << "TestTaskTeam::run ERROR parallel_for result(" << i << ") = "
-                  << host_parfor_result( i ) << " != " << answer << std::endl;
+      if (host_parfor_result(i) != answer) {
+        ++error_count;
+        std::cerr << "TestTaskTeam::run ERROR parallel_for result(" << i
+                  << ") = " << host_parfor_result(i) << " != " << answer
+                  << std::endl;
       }
 
-      if ( host_parreduce_check( i ) != 0 ) {
-        ++error_count ;
-        std::cerr << "TestTaskTeam::run ERROR parallel_reduce check(" << i << ") = "
-                  << host_parreduce_check( i ) << " != 0" << std::endl;
+      if (host_parreduce_check(i) != 0) {
+        ++error_count;
+        std::cerr << "TestTaskTeam::run ERROR parallel_reduce check(" << i
+                  << ") = " << host_parreduce_check(i) << " != 0" << std::endl;
       }
 
-      if ( host_parscan_check( i ) != 0 ) {
-        ++error_count ;
-        std::cerr << "TestTaskTeam::run ERROR parallel_scan check(" << i << ") = "
-                  << host_parscan_check( i ) << " != 0" << std::endl;
+      if (host_parscan_check(i) != 0) {
+        ++error_count;
+        std::cerr << "TestTaskTeam::run ERROR parallel_scan check(" << i
+                  << ") = " << host_parscan_check(i) << " != 0" << std::endl;
       }
     }
 
-    ASSERT_EQ( 0L , error_count );
+    ASSERT_EQ(0L, error_count);
   }
 };
 
-template< class Scheduler >
+template <class Scheduler>
 struct TestTaskTeamValue {
   enum { SPAN = 8 };
 
-  typedef long                                     value_type;
-  using sched_type = Scheduler;
-  using future_type = Kokkos::BasicFuture< value_type, sched_type >;
-  using ExecSpace = typename sched_type::execution_space;
-  typedef Kokkos::View< long*, ExecSpace >         view_type;
+  typedef long value_type;
+  using sched_type  = Scheduler;
+  using future_type = Kokkos::BasicFuture<value_type, sched_type>;
+  using ExecSpace   = typename sched_type::execution_space;
+  typedef Kokkos::View<long*, ExecSpace> view_type;
 
-  future_type  future;
+  future_type future;
 
-  view_type   result;
-  const long  nvalue;
+  view_type result;
+  const long nvalue;
 
   KOKKOS_INLINE_FUNCTION
-  TestTaskTeamValue( const view_type  & arg_result
-                   , const long         arg_nvalue )
-    : future()
-    , result( arg_result )
-    , nvalue( arg_nvalue ) {}
+  TestTaskTeamValue(const view_type& arg_result, const long arg_nvalue)
+      : future(), result(arg_result), nvalue(arg_nvalue) {}
 
   KOKKOS_INLINE_FUNCTION
-  void operator()( typename sched_type::member_type const & member
-                 , value_type & final )
-  {
+  void operator()(typename sched_type::member_type const& member,
+                  value_type& final) {
     const long end   = nvalue + 1;
     const long begin = 0 < end - SPAN ? end - SPAN : 0;
 
     auto& sched = member.scheduler();
 
-    if ( 0 < begin && future.is_null() ) {
-      if ( member.team_rank() == 0 ) {
-        future = sched.task_spawn( TestTaskTeamValue( result, begin - 1 )
-                                 , Kokkos::TaskTeam );
+    if (0 < begin && future.is_null()) {
+      if (member.team_rank() == 0) {
+        future = sched.task_spawn(TestTaskTeamValue(result, begin - 1),
+                                  Kokkos::TaskTeam);
 
-        #if !defined(__HCC_ACCELERATOR__) && !defined(__CUDA_ARCH__)
-        assert( !future.is_null() );
-        #endif
+#if !defined(__HCC_ACCELERATOR__) && !defined(__CUDA_ARCH__)
+        assert(!future.is_null());
+#endif
 
-        sched.respawn( this , future );
+        sched.respawn(this, future);
       }
 
       return;
     }
 
-    Kokkos::parallel_for( Kokkos::TeamThreadRange( member, begin, end )
-                        , [&] ( int i ) { result[i] = i + 1; }
-                        );
+    Kokkos::parallel_for(Kokkos::TeamThreadRange(member, begin, end),
+                         [&](int i) { result[i] = i + 1; });
 
-    if ( member.team_rank() == 0 ) {
+    if (member.team_rank() == 0) {
       final = result[nvalue];
     }
 
     Kokkos::memory_fence();
   }
 
-  static void run( long n )
-  {
+  static void run(long n) {
     const unsigned memory_capacity = 100000;
 
-    enum { MinBlockSize   =   64 };
-    enum { MaxBlockSize   = 1024 };
+    enum { MinBlockSize = 64 };
+    enum { MaxBlockSize = 1024 };
     enum { SuperBlockSize = 4096 };
 
-    sched_type root_sched( typename sched_type::memory_space()
-                         , memory_capacity
-                         , MinBlockSize
-                         , MaxBlockSize
-                         , SuperBlockSize );
+    sched_type root_sched(typename sched_type::memory_space(), memory_capacity,
+                          MinBlockSize, MaxBlockSize, SuperBlockSize);
 
-    view_type root_result( "result", n + 1 );
+    view_type root_result("result", n + 1);
 
-    typename view_type::HostMirror host_result = Kokkos::create_mirror_view( root_result );
+    typename view_type::HostMirror host_result =
+        Kokkos::create_mirror_view(root_result);
 
-    future_type fv = root_sched.host_spawn( TestTaskTeamValue( root_result, n )
-                                          , Kokkos::TaskTeam );
+    future_type fv = root_sched.host_spawn(TestTaskTeamValue(root_result, n),
+                                           Kokkos::TaskTeam);
 
-    Kokkos::wait( root_sched );
+    Kokkos::wait(root_sched);
 
-    Kokkos::deep_copy( host_result, root_result );
+    Kokkos::deep_copy(host_result, root_result);
 
-    if ( fv.get() != n + 1 ) {
-      std::cerr << "TestTaskTeamValue ERROR future = "
-                << fv.get() << " != " << n + 1 << std::endl;
+    if (fv.get() != n + 1) {
+      std::cerr << "TestTaskTeamValue ERROR future = " << fv.get()
+                << " != " << n + 1 << std::endl;
     }
 
-    for ( long i = 0; i <= n; ++i ) {
+    for (long i = 0; i <= n; ++i) {
       const long answer = i + 1;
 
-      if ( host_result( i ) != answer ) {
-        std::cerr << "TestTaskTeamValue ERROR result(" << i << ") = "
-                  << host_result( i ) << " != " << answer << std::endl;
+      if (host_result(i) != answer) {
+        std::cerr << "TestTaskTeamValue ERROR result(" << i
+                  << ") = " << host_result(i) << " != " << answer << std::endl;
       }
     }
   }
 };
 
-} // namespace TestTaskScheduler
+}  // namespace TestTaskScheduler
 
 //----------------------------------------------------------------------------
 
 namespace TestTaskScheduler {
 
-template< class Scheduler >
+template <class Scheduler>
 struct TestTaskSpawnWithPool {
-  using sched_type = Scheduler;
+  using sched_type  = Scheduler;
   using future_type = Kokkos::BasicFuture<void, sched_type>;
-  typedef void                            value_type;
+  typedef void value_type;
   using Space = typename sched_type::execution_space;
 
-  int  m_count ;
-  Kokkos::MemoryPool<Space> m_pool ;
+  int m_count;
+  Kokkos::MemoryPool<Space> m_pool;
 
   KOKKOS_INLINE_FUNCTION
-  TestTaskSpawnWithPool(
-    const int & arg_count,
-    const Kokkos::MemoryPool<Space> & arg_pool
-  )
-    : m_count( arg_count )
-    , m_pool( arg_pool )
-    {}
+  TestTaskSpawnWithPool(const int& arg_count,
+                        const Kokkos::MemoryPool<Space>& arg_pool)
+      : m_count(arg_count), m_pool(arg_pool) {}
 
   KOKKOS_INLINE_FUNCTION
-  void operator()( typename sched_type::member_type & member )
-  {
-    if ( m_count ) {
-      Kokkos::task_spawn( Kokkos::TaskSingle( member.scheduler() ) , TestTaskSpawnWithPool( m_count - 1, m_pool ) );
+  void operator()(typename sched_type::member_type& member) {
+    if (m_count) {
+      Kokkos::task_spawn(Kokkos::TaskSingle(member.scheduler()),
+                         TestTaskSpawnWithPool(m_count - 1, m_pool));
     }
   }
 
-  static void run()
-  {
+  static void run() {
     typedef typename sched_type::memory_space memory_space;
 
     enum { MemoryCapacity = 16000 };
-    enum { MinBlockSize   =   64 };
-    enum { MaxBlockSize   = 1024 };
+    enum { MinBlockSize = 64 };
+    enum { MaxBlockSize = 1024 };
     enum { SuperBlockSize = 4096 };
 
-    sched_type sched( memory_space()
-                    , MemoryCapacity
-                    , MinBlockSize
-                    , MaxBlockSize
-                    , SuperBlockSize );
+    sched_type sched(memory_space(), MemoryCapacity, MinBlockSize, MaxBlockSize,
+                     SuperBlockSize);
 
     using other_memory_space = typename Space::memory_space;
     Kokkos::MemoryPool<Space> pool(other_memory_space(), 10000, 100, 200, 1000);
-    auto f = Kokkos::host_spawn( Kokkos::TaskSingle( sched ), TestTaskSpawnWithPool( 3, pool ) );
+    auto f = Kokkos::host_spawn(Kokkos::TaskSingle(sched),
+                                TestTaskSpawnWithPool(3, pool));
 
-    Kokkos::wait( sched );
+    Kokkos::wait(sched);
   }
 };
 
-}
+}  // namespace TestTaskScheduler
 
 //----------------------------------------------------------------------------
 
 namespace TestTaskScheduler {
 
-template< class Scheduler >
+template <class Scheduler>
 struct TestTaskCtorsDevice {
-  using sched_type = Scheduler;
+  using sched_type  = Scheduler;
   using future_type = Kokkos::BasicFuture<void, sched_type>;
-  using value_type = void;
-  using Space = typename sched_type::execution_space;
+  using value_type  = void;
+  using Space       = typename sched_type::execution_space;
 
   int m_count;
 
   KOKKOS_INLINE_FUNCTION
-  TestTaskCtorsDevice(const int & arg_count) : m_count(arg_count) { }
+  TestTaskCtorsDevice(const int& arg_count) : m_count(arg_count) {}
 
   KOKKOS_INLINE_FUNCTION
-  void operator()(typename sched_type::member_type& member )
-  {
+  void operator()(typename sched_type::member_type& member) {
     // Note: Default construction on the device is not allowed
-    if(m_count == 4) {
-      Kokkos::task_spawn(
-        Kokkos::TaskSingle(member.scheduler()),
-        TestTaskCtorsDevice(m_count - 1)
-      );
-    }
-    else if(m_count == 3) {
-      sched_type s = member.scheduler(); // move construct
-      s = member.scheduler(); // move assignment
-      Kokkos::task_spawn(
-        Kokkos::TaskSingle(s),
-        TestTaskCtorsDevice(m_count - 1)
-      );
-    }
-    else if(m_count == 2) {
-      sched_type s3 = member.scheduler(); // move construct from member.scheduler();
-      Kokkos::task_spawn(
-        Kokkos::TaskSingle(s3),
-        TestTaskCtorsDevice(m_count - 1)
-      );
-    }
-    else if(m_count == 1) {
-      sched_type s = member.scheduler(); // move construct from member.scheduler();
-      sched_type s2 = s; // copy construct from s
-      Kokkos::task_spawn(
-        Kokkos::TaskSingle(s2),
-        TestTaskCtorsDevice(m_count - 1)
-      );
+    if (m_count == 4) {
+      Kokkos::task_spawn(Kokkos::TaskSingle(member.scheduler()),
+                         TestTaskCtorsDevice(m_count - 1));
+    } else if (m_count == 3) {
+      sched_type s = member.scheduler();  // move construct
+      s            = member.scheduler();  // move assignment
+      Kokkos::task_spawn(Kokkos::TaskSingle(s),
+                         TestTaskCtorsDevice(m_count - 1));
+    } else if (m_count == 2) {
+      sched_type s3 =
+          member.scheduler();  // move construct from member.scheduler();
+      Kokkos::task_spawn(Kokkos::TaskSingle(s3),
+                         TestTaskCtorsDevice(m_count - 1));
+    } else if (m_count == 1) {
+      sched_type s =
+          member.scheduler();  // move construct from member.scheduler();
+      sched_type s2 = s;       // copy construct from s
+      Kokkos::task_spawn(Kokkos::TaskSingle(s2),
+                         TestTaskCtorsDevice(m_count - 1));
     }
   }
 
-  static void run()
-  {
+  static void run() {
     using memory_space = typename sched_type::memory_space;
 
     enum { MemoryCapacity = 16000 };
-    enum { MinBlockSize   =   64 };
-    enum { MaxBlockSize   = 1024 };
+    enum { MinBlockSize = 64 };
+    enum { MaxBlockSize = 1024 };
     enum { SuperBlockSize = 4096 };
 
-    sched_type sched(
-      memory_space(), MemoryCapacity, MinBlockSize, MaxBlockSize, SuperBlockSize
-    );
+    sched_type sched(memory_space(), MemoryCapacity, MinBlockSize, MaxBlockSize,
+                     SuperBlockSize);
 
-    auto f = Kokkos::host_spawn(
-      Kokkos::TaskSingle(sched),
-      TestTaskCtorsDevice(4)
-    );
+    auto f =
+        Kokkos::host_spawn(Kokkos::TaskSingle(sched), TestTaskCtorsDevice(4));
 
     Kokkos::wait(sched);
 
     // TODO assertions and sanity checks
-
   }
 };
 
-}
+}  // namespace TestTaskScheduler
 
 //----------------------------------------------------------------------------
 
-
 namespace TestTaskScheduler {
 
-template<class Scheduler>
+template <class Scheduler>
 struct TestMultipleDependence {
-
-  using sched_type = Scheduler;
-  using future_bool = Kokkos::BasicFuture<bool, sched_type>;
-  using future_int = Kokkos::BasicFuture<int, sched_type>;
-  using value_type = bool;
+  using sched_type      = Scheduler;
+  using future_bool     = Kokkos::BasicFuture<bool, sched_type>;
+  using future_int      = Kokkos::BasicFuture<int, sched_type>;
+  using value_type      = bool;
   using execution_space = typename sched_type::execution_space;
 
   enum : int { NPerDepth = 6 };
   enum : int { NFanout = 3 };
 
-  // xlC doesn't like incomplete aggregate constructors, so we have do do this manually:
+  // xlC doesn't like incomplete aggregate constructors, so we have do do this
+  // manually:
   KOKKOS_INLINE_FUNCTION
   TestMultipleDependence(int depth, int max_depth)
-    : m_depth(depth),
-      m_max_depth(max_depth),
-      m_dep()
-  { 
-    // gcc 4.8 has an internal compile error when I give the initializer in the class, so I have do do it here
-    for(int i = 0; i < NPerDepth; ++i) {
+      : m_depth(depth), m_max_depth(max_depth), m_dep() {
+    // gcc 4.8 has an internal compile error when I give the initializer in the
+    // class, so I have do do it here
+    for (int i = 0; i < NPerDepth; ++i) {
       m_result_futures[i] = future_bool();
     }
   }
 
-  // xlC doesn't like incomplete aggregate constructors, so we have do do this manually:
+  // xlC doesn't like incomplete aggregate constructors, so we have do do this
+  // manually:
   KOKKOS_INLINE_FUNCTION
   TestMultipleDependence(int depth, int max_depth, future_int dep)
-    : m_depth(depth),
-      m_max_depth(max_depth),
-      m_dep(dep)
-  { 
-    // gcc 4.8 has an internal compile error when I give the initializer in the class, so I have do do it here
-    for(int i = 0; i < NPerDepth; ++i) {
+      : m_depth(depth), m_max_depth(max_depth), m_dep(dep) {
+    // gcc 4.8 has an internal compile error when I give the initializer in the
+    // class, so I have do do it here
+    for (int i = 0; i < NPerDepth; ++i) {
       m_result_futures[i] = future_bool();
     }
   }
@@ -790,18 +724,17 @@ struct TestMultipleDependence {
   future_int m_dep;
   future_bool m_result_futures[NPerDepth];
 
-
   struct TestCheckReady {
-     future_int m_dep;
-     using value_type = bool;
-     KOKKOS_INLINE_FUNCTION
-     void operator()(typename Scheduler::member_type&, bool& value) {
-       // if it was "transiently" ready, this could be false even if we made it a dependence of this task
-       value = m_dep.is_ready();
-       return;
-     }
+    future_int m_dep;
+    using value_type = bool;
+    KOKKOS_INLINE_FUNCTION
+    void operator()(typename Scheduler::member_type&, bool& value) {
+      // if it was "transiently" ready, this could be false even if we made it a
+      // dependence of this task
+      value = m_dep.is_ready();
+      return;
+    }
   };
-     
 
   struct TestComputeValue {
     using value_type = int;
@@ -809,7 +742,7 @@ struct TestMultipleDependence {
     void operator()(typename Scheduler::member_type&, int& result) {
       double value = 0;
       // keep this one busy for a while
-      for(int i = 0; i < 10000; ++i) {
+      for (int i = 0; i < 10000; ++i) {
         value += i * i / 7.138 / value;
       }
       // Do something irrelevant
@@ -818,40 +751,40 @@ struct TestMultipleDependence {
     }
   };
 
-
   KOKKOS_INLINE_FUNCTION
-  void operator()(typename sched_type::member_type & member, bool& value)
-  {
-    if(m_result_futures[0].is_null()) {
+  void operator()(typename sched_type::member_type& member, bool& value) {
+    if (m_result_futures[0].is_null()) {
       if (m_depth == 0) {
         // Spawn one expensive task at the root
-        m_dep = Kokkos::task_spawn(Kokkos::TaskSingle(member.scheduler()), TestComputeValue{});
+        m_dep = Kokkos::task_spawn(Kokkos::TaskSingle(member.scheduler()),
+                                   TestComputeValue{});
       }
 
       // Then check for it to be ready in a whole bunch of other tasks that race
       int n_checkers = NPerDepth;
-      if(m_depth < m_max_depth) {
+      if (m_depth < m_max_depth) {
         n_checkers -= NFanout;
-        for(int i = n_checkers; i < NPerDepth; ++i) {
-          m_result_futures[i] = Kokkos::task_spawn(Kokkos::TaskSingle(member.scheduler()),
-            TestMultipleDependence<Scheduler>(m_depth + 1, m_max_depth, m_dep)
-          );
+        for (int i = n_checkers; i < NPerDepth; ++i) {
+          m_result_futures[i] =
+              Kokkos::task_spawn(Kokkos::TaskSingle(member.scheduler()),
+                                 TestMultipleDependence<Scheduler>(
+                                     m_depth + 1, m_max_depth, m_dep));
         }
       }
 
-      for(int i = 0; i < n_checkers; ++i) {
-        m_result_futures[i] = member.scheduler().spawn(Kokkos::TaskSingle(m_dep), TestCheckReady{m_dep});
+      for (int i = 0; i < n_checkers; ++i) {
+        m_result_futures[i] = member.scheduler().spawn(
+            Kokkos::TaskSingle(m_dep), TestCheckReady{m_dep});
       }
       auto done = member.scheduler().when_all(m_result_futures, NPerDepth);
       Kokkos::respawn(this, done);
 
       return;
-    }
-    else {
+    } else {
       value = true;
-      for(int i = 0; i < NPerDepth; ++i) {
+      for (int i = 0; i < NPerDepth; ++i) {
         value = value && !m_result_futures[i].is_null();
-        if(value) {
+        if (value) {
           value = value && m_result_futures[i].get();
         }
       }
@@ -859,35 +792,31 @@ struct TestMultipleDependence {
     }
   }
 
-  static void run(int depth)
-  {
+  static void run(int depth) {
     typedef typename sched_type::memory_space memory_space;
 
     enum { MemoryCapacity = 1 << 30 };
-    enum { MinBlockSize   =   64 };
-    enum { MaxBlockSize   = 1024 };
+    enum { MinBlockSize = 64 };
+    enum { MaxBlockSize = 1024 };
     enum { SuperBlockSize = 4096 };
 
-    sched_type sched( memory_space()
-                    , MemoryCapacity
-                    , MinBlockSize
-                    , MaxBlockSize
-                    , SuperBlockSize );
+    sched_type sched(memory_space(), MemoryCapacity, MinBlockSize, MaxBlockSize,
+                     SuperBlockSize);
 
-    auto f = Kokkos::host_spawn( Kokkos::TaskSingle( sched ), TestMultipleDependence<Scheduler>( 0, depth )  );
+    auto f = Kokkos::host_spawn(Kokkos::TaskSingle(sched),
+                                TestMultipleDependence<Scheduler>(0, depth));
 
-    Kokkos::wait( sched );
-
-    ASSERT_TRUE( f.get() );
+    Kokkos::wait(sched);
 
+    ASSERT_TRUE(f.get());
   }
 };
 
-}
+}  // namespace TestTaskScheduler
 
 //----------------------------------------------------------------------------
 
-#define KOKKOS_PP_CAT_IMPL(x, y) x ## y
+#define KOKKOS_PP_CAT_IMPL(x, y) x##y
 #define KOKKOS_TEST_WITH_SUFFIX(x, y) KOKKOS_PP_CAT_IMPL(x, y)
 
 #define TEST_SCHEDULER_SUFFIX _deprecated
@@ -902,7 +831,6 @@ struct TestMultipleDependence {
 #undef TEST_SCHEDULER
 #undef TEST_SCHEDULER_SUFFIX
 
-
 #define TEST_SCHEDULER_SUFFIX _single
 #define TEST_SCHEDULER Kokkos::TaskScheduler<TEST_EXECSPACE>
 #include "TestTaskScheduler_single.hpp"
@@ -915,7 +843,6 @@ struct TestMultipleDependence {
 #undef TEST_SCHEDULER
 #undef TEST_SCHEDULER_SUFFIX
 
-
 #define TEST_SCHEDULER_SUFFIX _chase_lev
 #define TEST_SCHEDULER Kokkos::ChaseLevTaskScheduler<TEST_EXECSPACE>
 #include "TestTaskScheduler_single.hpp"
@@ -924,39 +851,41 @@ struct TestMultipleDependence {
 
 #if 0
 #define TEST_SCHEDULER_SUFFIX _fixed_mempool
-#define TEST_SCHEDULER \
-      Kokkos::SimpleTaskScheduler< \
-        TEST_EXECSPACE, \
-        Kokkos::Impl::SingleTaskQueue< \
-          TEST_EXECSPACE, \
-          Kokkos::Impl::default_tasking_memory_space_for_execution_space_t<TEST_EXECSPACE>, \
-          Kokkos::Impl::TaskQueueTraitsLockBased, \
-          Kokkos::Impl::FixedBlockSizeMemoryPool< \
-            Kokkos::Device<TEST_EXECSPACE, Kokkos::Impl::default_tasking_memory_space_for_execution_space_t<TEST_EXECSPACE>>, \
-            128, \
-            16 \
-          > \
-        > \
-      >
+#define TEST_SCHEDULER                                                      \
+  Kokkos::SimpleTaskScheduler<                                              \
+      TEST_EXECSPACE,                                                       \
+      Kokkos::Impl::SingleTaskQueue<                                        \
+          TEST_EXECSPACE,                                                   \
+          Kokkos::Impl::default_tasking_memory_space_for_execution_space_t< \
+              TEST_EXECSPACE>,                                              \
+          Kokkos::Impl::TaskQueueTraitsLockBased,                           \
+          Kokkos::Impl::FixedBlockSizeMemoryPool<                           \
+              Kokkos::Device<                                               \
+                  TEST_EXECSPACE,                                           \
+                  Kokkos::Impl::                                            \
+                      default_tasking_memory_space_for_execution_space_t<   \
+                          TEST_EXECSPACE>>,                                 \
+              128, 16>>>
 #include "TestTaskScheduler_single.hpp"
 #undef TEST_SCHEDULER
 #undef TEST_SCHEDULER_SUFFIX
 
 #define TEST_SCHEDULER_SUFFIX _fixed_mempool_multiple
-#define TEST_SCHEDULER \
-      Kokkos::SimpleTaskScheduler< \
-        TEST_EXECSPACE, \
-        Kokkos::Impl::MultipleTaskQueue< \
-          TEST_EXECSPACE, \
-          Kokkos::Impl::default_tasking_memory_space_for_execution_space_t<TEST_EXECSPACE>, \
-          Kokkos::Impl::TaskQueueTraitsLockBased, \
-          Kokkos::Impl::FixedBlockSizeMemoryPool< \
-            Kokkos::Device<TEST_EXECSPACE, Kokkos::Impl::default_tasking_memory_space_for_execution_space_t<TEST_EXECSPACE>>, \
-            128, \
-            16 \
-          > \
-        > \
-      >
+#define TEST_SCHEDULER                                                      \
+  Kokkos::SimpleTaskScheduler<                                              \
+      TEST_EXECSPACE,                                                       \
+      Kokkos::Impl::MultipleTaskQueue<                                      \
+          TEST_EXECSPACE,                                                   \
+          Kokkos::Impl::default_tasking_memory_space_for_execution_space_t< \
+              TEST_EXECSPACE>,                                              \
+          Kokkos::Impl::TaskQueueTraitsLockBased,                           \
+          Kokkos::Impl::FixedBlockSizeMemoryPool<                           \
+              Kokkos::Device<                                               \
+                  TEST_EXECSPACE,                                           \
+                  Kokkos::Impl::                                            \
+                      default_tasking_memory_space_for_execution_space_t<   \
+                          TEST_EXECSPACE>>,                                 \
+              128, 16>>>
 #include "TestTaskScheduler_single.hpp"
 #undef TEST_SCHEDULER
 #undef TEST_SCHEDULER_SUFFIX
@@ -965,6 +894,5 @@ struct TestMultipleDependence {
 #undef KOKKOS_TEST_WITH_SUFFIX
 #undef KOKKOS_PP_CAT_IMPL
 
-#endif // #if defined( KOKKOS_ENABLE_TASKDAG )
-#endif // #ifndef KOKKOS_UNITTEST_TASKSCHEDULER_HPP
-
+#endif  // #if defined( KOKKOS_ENABLE_TASKDAG )
+#endif  // #ifndef KOKKOS_UNITTEST_TASKSCHEDULER_HPP
diff --git a/lib/kokkos/core/unit_test/TestTaskScheduler_single.hpp b/lib/kokkos/core/unit_test/TestTaskScheduler_single.hpp
index 6ac9a6d740..c5d05382f8 100644
--- a/lib/kokkos/core/unit_test/TestTaskScheduler_single.hpp
+++ b/lib/kokkos/core/unit_test/TestTaskScheduler_single.hpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -43,50 +44,49 @@
 
 namespace Test {
 
-TEST_F( TEST_CATEGORY, KOKKOS_TEST_WITH_SUFFIX(task_fib, TEST_SCHEDULER_SUFFIX) )
-{
-  const int N = 27 ;
-  for ( int i = 0; i < N; ++i ) {
-    TestTaskScheduler::TestFib< TEST_SCHEDULER >::run( i , ( i + 1 ) * ( i + 1 ) * 64000 );
+TEST(TEST_CATEGORY, KOKKOS_TEST_WITH_SUFFIX(task_fib, TEST_SCHEDULER_SUFFIX)) {
+  const int N = 27;
+  for (int i = 0; i < N; ++i) {
+    TestTaskScheduler::TestFib<TEST_SCHEDULER>::run(i,
+                                                    (i + 1) * (i + 1) * 64000);
   }
 }
 
-TEST_F( TEST_CATEGORY, KOKKOS_TEST_WITH_SUFFIX(task_depend, TEST_SCHEDULER_SUFFIX) )
-{
-  for ( int i = 0; i < 25; ++i ) {
-    TestTaskScheduler::TestTaskDependence< TEST_SCHEDULER >::run( i );
+TEST(TEST_CATEGORY,
+     KOKKOS_TEST_WITH_SUFFIX(task_depend, TEST_SCHEDULER_SUFFIX)) {
+  for (int i = 0; i < 25; ++i) {
+    TestTaskScheduler::TestTaskDependence<TEST_SCHEDULER>::run(i);
   }
 }
 
-TEST_F( TEST_CATEGORY, KOKKOS_TEST_WITH_SUFFIX(task_team, TEST_SCHEDULER_SUFFIX) )
-{
-  TestTaskScheduler::TestTaskTeam< TEST_SCHEDULER >::run( 1000 );
-  //TestTaskScheduler::TestTaskTeamValue< TEST_EXECSPACE >::run( 1000 ); // Put back after testing.
+TEST(TEST_CATEGORY, KOKKOS_TEST_WITH_SUFFIX(task_team, TEST_SCHEDULER_SUFFIX)) {
+  TestTaskScheduler::TestTaskTeam<TEST_SCHEDULER>::run(1000);
+  // TestTaskScheduler::TestTaskTeamValue< TEST_EXECSPACE >::run( 1000 ); // Put
+  // back after testing.
 }
 
-TEST_F( TEST_CATEGORY, KOKKOS_TEST_WITH_SUFFIX(task_with_mempool, TEST_SCHEDULER_SUFFIX) )
-{
+TEST(TEST_CATEGORY,
+     KOKKOS_TEST_WITH_SUFFIX(task_with_mempool, TEST_SCHEDULER_SUFFIX)) {
   TestTaskScheduler::TestTaskSpawnWithPool<TEST_SCHEDULER>::run();
 }
 
-TEST_F( TEST_CATEGORY, KOKKOS_TEST_WITH_SUFFIX(task_multiple_depend, TEST_SCHEDULER_SUFFIX) )
-{
-  for ( int i = 2; i < 6; ++i ) {
-    TestTaskScheduler::TestMultipleDependence<TEST_SCHEDULER>::run( i );
+TEST(TEST_CATEGORY,
+     KOKKOS_TEST_WITH_SUFFIX(task_multiple_depend, TEST_SCHEDULER_SUFFIX)) {
+  for (int i = 2; i < 6; ++i) {
+    TestTaskScheduler::TestMultipleDependence<TEST_SCHEDULER>::run(i);
   }
 }
 
-TEST_F( TEST_CATEGORY, KOKKOS_TEST_WITH_SUFFIX(task_scheduler_ctors, TEST_SCHEDULER_SUFFIX) )
-{
+TEST(TEST_CATEGORY,
+     KOKKOS_TEST_WITH_SUFFIX(task_scheduler_ctors, TEST_SCHEDULER_SUFFIX)) {
   TEST_SCHEDULER sched;
   TEST_SCHEDULER sched2 = sched;
-  sched = sched2;
+  sched                 = sched2;
 }
 
-TEST_F( TEST_CATEGORY, KOKKOS_TEST_WITH_SUFFIX(task_scheduer_ctors_device, TEST_SCHEDULER_SUFFIX) )
-{
+TEST(TEST_CATEGORY, KOKKOS_TEST_WITH_SUFFIX(task_scheduer_ctors_device,
+                                            TEST_SCHEDULER_SUFFIX)) {
   TestTaskScheduler::TestTaskCtorsDevice<TEST_SCHEDULER>::run();
 }
 
-
-} // end namespace Test
\ No newline at end of file
+}  // end namespace Test
diff --git a/lib/kokkos/core/unit_test/TestTeam.hpp b/lib/kokkos/core/unit_test/TestTeam.hpp
index 5f325eb905..e19c1c160d 100644
--- a/lib/kokkos/core/unit_test/TestTeam.hpp
+++ b/lib/kokkos/core/unit_test/TestTeam.hpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -52,38 +53,43 @@ namespace Test {
 
 namespace {
 
-template< class ExecSpace, class ScheduleType >
+template <class ExecSpace, class ScheduleType>
 struct TestTeamPolicy {
-  typedef typename Kokkos::TeamPolicy< ScheduleType,  ExecSpace >::member_type team_member;
-  typedef Kokkos::View< int**, ExecSpace > view_type;
+  typedef typename Kokkos::TeamPolicy<ScheduleType, ExecSpace>::member_type
+      team_member;
+  typedef Kokkos::View<int **, ExecSpace> view_type;
 
   view_type m_flags;
 
-  TestTeamPolicy( const size_t league_size )
-    : m_flags( Kokkos::ViewAllocateWithoutInitializing( "flags" ),
-               Kokkos::TeamPolicy< ScheduleType,  ExecSpace >(1,1).team_size_max( *this, Kokkos::ParallelReduceTag() ),
-               league_size ) {}
+  TestTeamPolicy(const size_t league_size)
+      : m_flags(Kokkos::ViewAllocateWithoutInitializing("flags"),
+                Kokkos::TeamPolicy<ScheduleType, ExecSpace>(1, 1).team_size_max(
+                    *this, Kokkos::ParallelReduceTag()),
+                league_size) {}
 
   struct VerifyInitTag {};
 
   KOKKOS_INLINE_FUNCTION
-  void operator()( const team_member & member ) const
-  {
-    const int tid = member.team_rank() + member.team_size() * member.league_rank();
+  void operator()(const team_member &member) const {
+    const int tid =
+        member.team_rank() + member.team_size() * member.league_rank();
 
-    m_flags( member.team_rank(), member.league_rank() ) = tid;
-    static_assert((std::is_same<typename team_member::execution_space,ExecSpace>::value),"TeamMember::execution_space is not the same as TeamPolicy<>::execution_space");
+    m_flags(member.team_rank(), member.league_rank()) = tid;
+    static_assert(
+        (std::is_same<typename team_member::execution_space, ExecSpace>::value),
+        "TeamMember::execution_space is not the same as "
+        "TeamPolicy<>::execution_space");
   }
 
   KOKKOS_INLINE_FUNCTION
-  void operator()( const VerifyInitTag &, const team_member & member ) const
-  {
-    const int tid = member.team_rank() + member.team_size() * member.league_rank();
+  void operator()(const VerifyInitTag &, const team_member &member) const {
+    const int tid =
+        member.team_rank() + member.team_size() * member.league_rank();
 
-    if ( tid != m_flags( member.team_rank(), member.league_rank() ) ) {
-      printf( "TestTeamPolicy member(%d,%d) error %d != %d\n",
-               member.league_rank(), member.team_rank(),
-               tid, m_flags( member.team_rank(), member.league_rank() ) );
+    if (tid != m_flags(member.team_rank(), member.league_rank())) {
+      printf("TestTeamPolicy member(%d,%d) error %d != %d\n",
+             member.league_rank(), member.team_rank(), tid,
+             m_flags(member.team_rank(), member.league_rank()));
     }
   }
 
@@ -94,34 +100,39 @@ struct TestTeamPolicy {
   struct NoOpTag {};
 
   KOKKOS_INLINE_FUNCTION
-  void operator()( const NoOpTag &, const team_member & member ) const {}
-
+  void operator()(const NoOpTag &, const team_member &member) const {}
 
   static void test_small_league_size() {
-    int bs = 8; // batch size (number of elements per batch)
-    int ns = 16; // total number of "problems" to process
+    int bs = 8;   // batch size (number of elements per batch)
+    int ns = 16;  // total number of "problems" to process
 
     // Calculate total scratch memory space size.
-    const int level = 0;
-    int mem_size = 960;
+    const int level     = 0;
+    int mem_size        = 960;
     const int num_teams = ns / bs;
-    Kokkos::TeamPolicy< ExecSpace, NoOpTag > policy( num_teams, Kokkos::AUTO() );
+    Kokkos::TeamPolicy<ExecSpace, NoOpTag> policy(num_teams, Kokkos::AUTO());
 
-    Kokkos::parallel_for( policy.set_scratch_size( level, Kokkos::PerTeam( mem_size ), Kokkos::PerThread( 0 ) ),
-                          TestTeamPolicy() );
+    Kokkos::parallel_for(
+        policy.set_scratch_size(level, Kokkos::PerTeam(mem_size),
+                                Kokkos::PerThread(0)),
+        TestTeamPolicy());
   }
 
-  static void test_for( const size_t league_size )
-  {
-    TestTeamPolicy functor( league_size );
-    typedef Kokkos::TeamPolicy< ScheduleType,  ExecSpace > policy_type;
-    typedef Kokkos::TeamPolicy< ScheduleType,  ExecSpace, VerifyInitTag > policy_type_init;
+  static void test_for(const size_t league_size) {
+    TestTeamPolicy functor(league_size);
+    typedef Kokkos::TeamPolicy<ScheduleType, ExecSpace> policy_type;
+    typedef Kokkos::TeamPolicy<ScheduleType, ExecSpace, VerifyInitTag>
+        policy_type_init;
 
-    const int team_size = policy_type(league_size,1).team_size_max( functor, Kokkos::ParallelForTag() );
-    const int team_size_init = policy_type_init(league_size,1).team_size_max( functor, Kokkos::ParallelForTag() );
+    const int team_size = policy_type(league_size, 1)
+                              .team_size_max(functor, Kokkos::ParallelForTag());
+    const int team_size_init =
+        policy_type_init(league_size, 1)
+            .team_size_max(functor, Kokkos::ParallelForTag());
 
-    Kokkos::parallel_for( policy_type( league_size, team_size ), functor );
-    Kokkos::parallel_for( policy_type_init( league_size, team_size_init ), functor );
+    Kokkos::parallel_for(policy_type(league_size, team_size), functor);
+    Kokkos::parallel_for(policy_type_init(league_size, team_size_init),
+                         functor);
 
     test_small_league_size();
   }
@@ -131,53 +142,56 @@ struct TestTeamPolicy {
   typedef long value_type;
 
   KOKKOS_INLINE_FUNCTION
-  void operator()( const team_member & member, value_type & update ) const
-  {
+  void operator()(const team_member &member, value_type &update) const {
     update += member.team_rank() + member.team_size() * member.league_rank();
   }
 
   KOKKOS_INLINE_FUNCTION
-  void operator()( const ReduceTag &, const team_member & member, value_type & update ) const
-  {
-    update += 1 + member.team_rank() + member.team_size() * member.league_rank();
+  void operator()(const ReduceTag &, const team_member &member,
+                  value_type &update) const {
+    update +=
+        1 + member.team_rank() + member.team_size() * member.league_rank();
   }
 
-  static void test_reduce( const size_t league_size )
-  {
-    TestTeamPolicy functor( league_size );
+  static void test_reduce(const size_t league_size) {
+    TestTeamPolicy functor(league_size);
 
-    typedef Kokkos::TeamPolicy< ScheduleType,  ExecSpace > policy_type;
-    typedef Kokkos::TeamPolicy< ScheduleType,  ExecSpace, ReduceTag > policy_type_reduce;
+    typedef Kokkos::TeamPolicy<ScheduleType, ExecSpace> policy_type;
+    typedef Kokkos::TeamPolicy<ScheduleType, ExecSpace, ReduceTag>
+        policy_type_reduce;
 
-    const int team_size = policy_type_reduce(league_size,1).team_size_max( functor, Kokkos::ParallelReduceTag() );
+    const int team_size =
+        policy_type_reduce(league_size, 1)
+            .team_size_max(functor, Kokkos::ParallelReduceTag());
 
     const long N = team_size * league_size;
 
     long total = 0;
 
-    Kokkos::parallel_reduce( policy_type( league_size, team_size ), functor, total );
-    ASSERT_EQ( size_t( ( N - 1 ) * ( N ) ) / 2, size_t( total ) );
+    Kokkos::parallel_reduce(policy_type(league_size, team_size), functor,
+                            total);
+    ASSERT_EQ(size_t((N - 1) * (N)) / 2, size_t(total));
 
-    Kokkos::parallel_reduce( policy_type_reduce( league_size, team_size ), functor, total );
-    ASSERT_EQ( ( size_t( N ) * size_t( N + 1 ) ) / 2, size_t( total ) );
+    Kokkos::parallel_reduce(policy_type_reduce(league_size, team_size), functor,
+                            total);
+    ASSERT_EQ((size_t(N) * size_t(N + 1)) / 2, size_t(total));
   }
 };
 
-} // namespace
+}  // namespace
 
-} // namespace Test
+}  // namespace Test
 
 /*--------------------------------------------------------------------------*/
 
 namespace Test {
 
-template< typename ScalarType, class DeviceType, class ScheduleType >
-class ReduceTeamFunctor
-{
-public:
-  typedef DeviceType                                           execution_space;
-  typedef Kokkos::TeamPolicy< ScheduleType, execution_space >  policy_type;
-  typedef typename execution_space::size_type                  size_type;
+template <typename ScalarType, class DeviceType, class ScheduleType>
+class ReduceTeamFunctor {
+ public:
+  typedef DeviceType execution_space;
+  typedef Kokkos::TeamPolicy<ScheduleType, execution_space> policy_type;
+  typedef typename execution_space::size_type size_type;
 
   struct value_type {
     ScalarType value[3];
@@ -186,38 +200,37 @@ public:
   const size_type nwork;
 
   KOKKOS_INLINE_FUNCTION
-  ReduceTeamFunctor( const size_type & arg_nwork ) : nwork( arg_nwork ) {}
+  ReduceTeamFunctor(const size_type &arg_nwork) : nwork(arg_nwork) {}
 
   KOKKOS_INLINE_FUNCTION
-  ReduceTeamFunctor( const ReduceTeamFunctor & rhs ) : nwork( rhs.nwork ) {}
+  ReduceTeamFunctor(const ReduceTeamFunctor &rhs) : nwork(rhs.nwork) {}
 
   KOKKOS_INLINE_FUNCTION
-  void init( value_type & dst ) const
-  {
+  void init(value_type &dst) const {
     dst.value[0] = 0;
     dst.value[1] = 0;
     dst.value[2] = 0;
   }
 
   KOKKOS_INLINE_FUNCTION
-  void join( volatile value_type & dst, const volatile value_type & src ) const
-  {
+  void join(volatile value_type &dst, const volatile value_type &src) const {
     dst.value[0] += src.value[0];
     dst.value[1] += src.value[1];
     dst.value[2] += src.value[2];
   }
 
   KOKKOS_INLINE_FUNCTION
-  void operator()( const typename policy_type::member_type ind, value_type & dst ) const
-  {
-    const int thread_rank = ind.team_rank() + ind.team_size() * ind.league_rank();
+  void operator()(const typename policy_type::member_type ind,
+                  value_type &dst) const {
+    const int thread_rank =
+        ind.team_rank() + ind.team_size() * ind.league_rank();
     const int thread_size = ind.team_size() * ind.league_size();
-    const int chunk = ( nwork + thread_size - 1 ) / thread_size;
+    const int chunk       = (nwork + thread_size - 1) / thread_size;
 
-    size_type iwork = chunk * thread_rank;
+    size_type iwork           = chunk * thread_rank;
     const size_type iwork_end = iwork + chunk < nwork ? iwork + chunk : nwork;
 
-    for ( ; iwork < iwork_end; ++iwork ) {
+    for (; iwork < iwork_end; ++iwork) {
       dst.value[0] += 1;
       dst.value[1] += iwork + 1;
       dst.value[2] += nwork - iwork;
@@ -225,248 +238,248 @@ public:
   }
 };
 
-} // namespace Test
+}  // namespace Test
 
 namespace {
 
-template< typename ScalarType, class DeviceType, class ScheduleType >
-class TestReduceTeam
-{
-public:
-  typedef DeviceType                                            execution_space;
-  typedef Kokkos::TeamPolicy< ScheduleType,  execution_space >  policy_type;
-  typedef typename execution_space::size_type                   size_type;
+template <typename ScalarType, class DeviceType, class ScheduleType>
+class TestReduceTeam {
+ public:
+  typedef DeviceType execution_space;
+  typedef Kokkos::TeamPolicy<ScheduleType, execution_space> policy_type;
+  typedef typename execution_space::size_type size_type;
 
-  TestReduceTeam( const size_type & nwork ) { run_test( nwork ); }
+  TestReduceTeam(const size_type &nwork) { run_test(nwork); }
 
-  void run_test( const size_type & nwork )
-  {
-    typedef Test::ReduceTeamFunctor< ScalarType, execution_space, ScheduleType> functor_type;
+  void run_test(const size_type &nwork) {
+    typedef Test::ReduceTeamFunctor<ScalarType, execution_space, ScheduleType>
+        functor_type;
     typedef typename functor_type::value_type value_type;
-    typedef Kokkos::View< value_type, Kokkos::HostSpace, Kokkos::MemoryUnmanaged > result_type;
+    typedef Kokkos::View<value_type, Kokkos::HostSpace, Kokkos::MemoryUnmanaged>
+        result_type;
 
     enum { Count = 3 };
     enum { Repeat = 100 };
 
-    value_type result[ Repeat ];
+    value_type result[Repeat];
 
-    const unsigned long nw   = nwork;
-    const unsigned long nsum = nw % 2 ? nw * ( ( nw + 1 ) / 2 )
-                                      : ( nw / 2 ) * ( nw + 1 );
+    const unsigned long nw = nwork;
+    const unsigned long nsum =
+        nw % 2 ? nw * ((nw + 1) / 2) : (nw / 2) * (nw + 1);
 
-    policy_type team_exec( nw, 1 );
+    policy_type team_exec(nw, 1);
 
-    const unsigned team_size   = team_exec.team_size_recommended( functor_type( nwork ), Kokkos::ParallelReduceTag() );
-    const unsigned league_size = ( nwork + team_size - 1 ) / team_size;
+    const unsigned team_size = team_exec.team_size_recommended(
+        functor_type(nwork), Kokkos::ParallelReduceTag());
+    const unsigned league_size = (nwork + team_size - 1) / team_size;
 
-    team_exec = policy_type( league_size, team_size );
+    team_exec = policy_type(league_size, team_size);
 
-    for ( unsigned i = 0; i < Repeat; ++i ) {
-      result_type tmp( & result[i] );
-      Kokkos::parallel_reduce( team_exec, functor_type( nwork ), tmp );
+    for (unsigned i = 0; i < Repeat; ++i) {
+      result_type tmp(&result[i]);
+      Kokkos::parallel_reduce(team_exec, functor_type(nwork), tmp);
     }
 
     execution_space().fence();
 
-    for ( unsigned i = 0; i < Repeat; ++i ) {
-      for ( unsigned j = 0; j < Count; ++j ) {
+    for (unsigned i = 0; i < Repeat; ++i) {
+      for (unsigned j = 0; j < Count; ++j) {
         const unsigned long correct = 0 == j % 3 ? nw : nsum;
-        ASSERT_EQ( (ScalarType) correct, result[i].value[j] );
+        ASSERT_EQ((ScalarType)correct, result[i].value[j]);
       }
     }
   }
 };
 
-} // namespace
+}  // namespace
 
 /*--------------------------------------------------------------------------*/
 
 namespace Test {
 
-template< class DeviceType, class ScheduleType >
-class ScanTeamFunctor
-{
-public:
-  typedef DeviceType                                            execution_space;
-  typedef Kokkos::TeamPolicy< ScheduleType,  execution_space >  policy_type;
-  typedef long int                                              value_type;
+template <class DeviceType, class ScheduleType>
+class ScanTeamFunctor {
+ public:
+  typedef DeviceType execution_space;
+  typedef Kokkos::TeamPolicy<ScheduleType, execution_space> policy_type;
+  typedef long int value_type;
 
-  Kokkos::View< value_type, execution_space > accum;
-  Kokkos::View< value_type, execution_space > total;
+  Kokkos::View<value_type, execution_space> accum;
+  Kokkos::View<value_type, execution_space> total;
 
-  ScanTeamFunctor() : accum( "accum" ), total( "total" ) {}
+  ScanTeamFunctor() : accum("accum"), total("total") {}
 
   KOKKOS_INLINE_FUNCTION
-  void init( value_type & error ) const { error = 0; }
+  void init(value_type &error) const { error = 0; }
 
   KOKKOS_INLINE_FUNCTION
-  void join( value_type volatile & error, value_type volatile const & input ) const
-  { if ( input ) error = 1; }
+  void join(value_type volatile &error,
+            value_type volatile const &input) const {
+    if (input) error = 1;
+  }
 
   struct JoinMax {
     typedef long int value_type;
 
     KOKKOS_INLINE_FUNCTION
-    void join( value_type volatile & dst, value_type volatile const & input ) const
-    { if ( dst < input ) dst = input; }
+    void join(value_type volatile &dst,
+              value_type volatile const &input) const {
+      if (dst < input) dst = input;
+    }
   };
 
   KOKKOS_INLINE_FUNCTION
-  void operator()( const typename policy_type::member_type ind, value_type & error ) const
-  {
-    if ( 0 == ind.league_rank() && 0 == ind.team_rank() ) {
+  void operator()(const typename policy_type::member_type ind,
+                  value_type &error) const {
+    if (0 == ind.league_rank() && 0 == ind.team_rank()) {
       const long int thread_count = ind.league_size() * ind.team_size();
-      total() = ( thread_count * ( thread_count + 1 ) ) / 2;
+      total()                     = (thread_count * (thread_count + 1)) / 2;
     }
 
     // Team max:
-    int long m = (long int) ( ind.league_rank() + ind.team_rank() );
-    ind.team_reduce(  Kokkos::Max<int long>(m) );
+    int long m = (long int)(ind.league_rank() + ind.team_rank());
+    ind.team_reduce(Kokkos::Max<int long>(m));
 
-    if ( m != ind.league_rank() + ( ind.team_size() - 1 ) ) {
-      printf( "ScanTeamFunctor[%d.%d of %d.%d] reduce_max_answer(%ld) != reduce_max(%ld)\n",
-               ind.league_rank(), ind.team_rank(),
-               ind.league_size(), ind.team_size(),
-               (long int) ( ind.league_rank() + ( ind.team_size() - 1 ) ), m );
+    if (m != ind.league_rank() + (ind.team_size() - 1)) {
+      printf(
+          "ScanTeamFunctor[%d.%d of %d.%d] reduce_max_answer(%ld) != "
+          "reduce_max(%ld)\n",
+          ind.league_rank(), ind.team_rank(), ind.league_size(),
+          ind.team_size(),
+          (long int)(ind.league_rank() + (ind.team_size() - 1)), m);
     }
 
     // Scan:
-    const long int answer =
-      ( ind.league_rank() + 1 ) * ind.team_rank() + ( ind.team_rank() * ( ind.team_rank() + 1 ) ) / 2;
+    const long int answer = (ind.league_rank() + 1) * ind.team_rank() +
+                            (ind.team_rank() * (ind.team_rank() + 1)) / 2;
 
     const long int result =
-      ind.team_scan( ind.league_rank() + 1 + ind.team_rank() + 1 );
+        ind.team_scan(ind.league_rank() + 1 + ind.team_rank() + 1);
 
     const long int result2 =
-      ind.team_scan( ind.league_rank() + 1 + ind.team_rank() + 1 );
+        ind.team_scan(ind.league_rank() + 1 + ind.team_rank() + 1);
 
-    if ( answer != result || answer != result2 ) {
-      printf( "ScanTeamFunctor[%d.%d of %d.%d] answer(%ld) != scan_first(%ld) or scan_second(%ld)\n",
-              ind.league_rank(), ind.team_rank(),
-              ind.league_size(), ind.team_size(),
-              answer, result, result2 );
+    if (answer != result || answer != result2) {
+      printf(
+          "ScanTeamFunctor[%d.%d of %d.%d] answer(%ld) != scan_first(%ld) or "
+          "scan_second(%ld)\n",
+          ind.league_rank(), ind.team_rank(), ind.league_size(),
+          ind.team_size(), answer, result, result2);
 
       error = 1;
     }
 
-    const long int thread_rank = ind.team_rank() +
-                                 ind.team_size() * ind.league_rank();
-    ind.team_scan( 1 + thread_rank, accum.data() );
+    const long int thread_rank =
+        ind.team_rank() + ind.team_size() * ind.league_rank();
+    ind.team_scan(1 + thread_rank, accum.data());
   }
 };
 
-template< class DeviceType, class ScheduleType >
-class TestScanTeam
-{
-public:
-  typedef DeviceType                                            execution_space;
-  typedef long int                                              value_type;
-  typedef Kokkos::TeamPolicy< ScheduleType,  execution_space >  policy_type;
-  typedef Test::ScanTeamFunctor<DeviceType, ScheduleType>       functor_type;
+template <class DeviceType, class ScheduleType>
+class TestScanTeam {
+ public:
+  typedef DeviceType execution_space;
+  typedef long int value_type;
+  typedef Kokkos::TeamPolicy<ScheduleType, execution_space> policy_type;
+  typedef Test::ScanTeamFunctor<DeviceType, ScheduleType> functor_type;
 
-  TestScanTeam( const size_t nteam ) { run_test( nteam ); }
+  TestScanTeam(const size_t nteam) { run_test(nteam); }
 
-  void run_test( const size_t nteam )
-  {
-    typedef Kokkos::View< long int, Kokkos::HostSpace, Kokkos::MemoryUnmanaged >  result_type;
+  void run_test(const size_t nteam) {
+    typedef Kokkos::View<long int, Kokkos::HostSpace, Kokkos::MemoryUnmanaged>
+        result_type;
 
     const unsigned REPEAT = 100000;
     unsigned Repeat;
 
-    if ( nteam == 0 ) {
+    if (nteam == 0) {
       Repeat = 1;
-    }
-    else {
-      Repeat = ( REPEAT + nteam - 1 ) / nteam; // Error here.
+    } else {
+      Repeat = (REPEAT + nteam - 1) / nteam;  // Error here.
     }
 
     functor_type functor;
 
-    policy_type team_exec( nteam, 1);
-    team_exec = policy_type(nteam, team_exec.team_size_max(functor, Kokkos::ParallelReduceTag()));
+    policy_type team_exec(nteam, 1);
+    team_exec = policy_type(
+        nteam, team_exec.team_size_max(functor, Kokkos::ParallelReduceTag()));
 
-    for ( unsigned i = 0; i < Repeat; ++i ) {
+    for (unsigned i = 0; i < Repeat; ++i) {
       long int accum = 0;
       long int total = 0;
       long int error = 0;
-      Kokkos::deep_copy( functor.accum, total );
+      Kokkos::deep_copy(functor.accum, total);
 
-      Kokkos::parallel_reduce( team_exec, functor, result_type( & error ) );
+      Kokkos::parallel_reduce(team_exec, functor, result_type(&error));
       DeviceType().fence();
 
-      Kokkos::deep_copy( accum, functor.accum );
-      Kokkos::deep_copy( total, functor.total );
+      Kokkos::deep_copy(accum, functor.accum);
+      Kokkos::deep_copy(total, functor.total);
 
-      ASSERT_EQ( error, 0 );
-      ASSERT_EQ( total, accum );
+      ASSERT_EQ(error, 0);
+      ASSERT_EQ(total, accum);
     }
 
     execution_space().fence();
   }
 };
 
-} // namespace Test
+}  // namespace Test
 
 /*--------------------------------------------------------------------------*/
 
 namespace Test {
 
-template< class ExecSpace, class ScheduleType >
+template <class ExecSpace, class ScheduleType>
 struct SharedTeamFunctor {
-
-  typedef ExecSpace                                             execution_space;
-  typedef int                                                   value_type;
-  typedef Kokkos::TeamPolicy< ScheduleType,  execution_space >  policy_type;
+  typedef ExecSpace execution_space;
+  typedef int value_type;
+  typedef Kokkos::TeamPolicy<ScheduleType, execution_space> policy_type;
 
   enum { SHARED_COUNT = 1000 };
 
-  typedef typename ExecSpace::scratch_memory_space  shmem_space;
+  typedef typename ExecSpace::scratch_memory_space shmem_space;
 
   // TBD: MemoryUnmanaged should be the default for shared memory space.
-  typedef Kokkos::View< int*, shmem_space, Kokkos::MemoryUnmanaged > shared_int_array_type;
+  typedef Kokkos::View<int *, shmem_space, Kokkos::MemoryUnmanaged>
+      shared_int_array_type;
 
   // Tell how much shared memory will be required by this functor.
-  inline
-  unsigned team_shmem_size( int team_size ) const
-  {
-    return shared_int_array_type::shmem_size( SHARED_COUNT ) +
-           shared_int_array_type::shmem_size( SHARED_COUNT );
+  inline unsigned team_shmem_size(int team_size) const {
+    return shared_int_array_type::shmem_size(SHARED_COUNT) +
+           shared_int_array_type::shmem_size(SHARED_COUNT);
   }
 
   KOKKOS_INLINE_FUNCTION
-  void operator()( const typename policy_type::member_type & ind, value_type & update ) const
-  {
-    const shared_int_array_type shared_A( ind.team_shmem(), SHARED_COUNT );
-    const shared_int_array_type shared_B( ind.team_shmem(), SHARED_COUNT );
+  void operator()(const typename policy_type::member_type &ind,
+                  value_type &update) const {
+    const shared_int_array_type shared_A(ind.team_shmem(), SHARED_COUNT);
+    const shared_int_array_type shared_B(ind.team_shmem(), SHARED_COUNT);
 
-    if ( ( shared_A.data() == nullptr && SHARED_COUNT > 0 ) ||
-         ( shared_B.data() == nullptr && SHARED_COUNT > 0 ) )
-    {
-      printf ("member( %d/%d , %d/%d ) Failed to allocate shared memory of size %lu\n"
-             , ind.league_rank()
-             , ind.league_size()
-             , ind.team_rank()
-             , ind.team_size()
-             , static_cast<unsigned long>( SHARED_COUNT )
-             );
+    if ((shared_A.data() == nullptr && SHARED_COUNT > 0) ||
+        (shared_B.data() == nullptr && SHARED_COUNT > 0)) {
+      printf(
+          "member( %d/%d , %d/%d ) Failed to allocate shared memory of size "
+          "%lu\n",
+          ind.league_rank(), ind.league_size(), ind.team_rank(),
+          ind.team_size(), static_cast<unsigned long>(SHARED_COUNT));
 
-      ++update; // Failure to allocate is an error.
-    }
-    else {
-      for ( int i = ind.team_rank(); i < SHARED_COUNT; i += ind.team_size() ) {
+      ++update;  // Failure to allocate is an error.
+    } else {
+      for (int i = ind.team_rank(); i < SHARED_COUNT; i += ind.team_size()) {
         shared_A[i] = i + ind.league_rank();
         shared_B[i] = 2 * i + ind.league_rank();
       }
 
       ind.team_barrier();
 
-      if ( ind.team_rank() + 1 == ind.team_size() ) {
-        for ( int i = 0; i < SHARED_COUNT; ++i ) {
-          if ( shared_A[i] != i + ind.league_rank() ) {
+      if (ind.team_rank() + 1 == ind.team_size()) {
+        for (int i = 0; i < SHARED_COUNT; ++i) {
+          if (shared_A[i] != i + ind.league_rank()) {
             ++update;
           }
 
-          if ( shared_B[i] != 2 * i + ind.league_rank() ) {
+          if (shared_B[i] != 2 * i + ind.league_rank()) {
             ++update;
           }
         }
@@ -475,120 +488,130 @@ struct SharedTeamFunctor {
   }
 };
 
-} // namespace Test
+}  // namespace Test
 
 namespace {
 
-template< class ExecSpace, class ScheduleType >
+template <class ExecSpace, class ScheduleType>
 struct TestSharedTeam {
   TestSharedTeam() { run(); }
 
-  void run()
-  {
+  void run() {
     typedef Test::SharedTeamFunctor<ExecSpace, ScheduleType> Functor;
-    typedef Kokkos::View< typename Functor::value_type, Kokkos::HostSpace, Kokkos::MemoryUnmanaged > result_type;
+    typedef Kokkos::View<typename Functor::value_type, Kokkos::HostSpace,
+                         Kokkos::MemoryUnmanaged>
+        result_type;
 
-    const size_t team_size = Kokkos::TeamPolicy< ScheduleType, ExecSpace >(8192, 1).team_size_max( Functor(),
-        Kokkos::ParallelReduceTag() );
+    const size_t team_size =
+        Kokkos::TeamPolicy<ScheduleType, ExecSpace>(8192, 1).team_size_max(
+            Functor(), Kokkos::ParallelReduceTag());
 
-    Kokkos::TeamPolicy< ScheduleType, ExecSpace > team_exec( 8192 / team_size, team_size );
+    Kokkos::TeamPolicy<ScheduleType, ExecSpace> team_exec(8192 / team_size,
+                                                          team_size);
 
     typename Functor::value_type error_count = 0;
 
-    Kokkos::parallel_reduce( team_exec, Functor(), result_type( & error_count ) );
+    Kokkos::parallel_reduce(team_exec, Functor(), result_type(&error_count));
     Kokkos::fence();
 
-    ASSERT_EQ( error_count, 0 );
+    ASSERT_EQ(error_count, 0);
   }
 };
 
-} // namespace
+}  // namespace
 
 namespace Test {
 
-#if defined( KOKKOS_ENABLE_CXX11_DISPATCH_LAMBDA )
-#if !defined(KOKKOS_ENABLE_CUDA) || ( 8000 <= CUDA_VERSION )
-template< class MemorySpace, class ExecSpace, class ScheduleType >
+#if defined(KOKKOS_ENABLE_CXX11_DISPATCH_LAMBDA)
+#if !defined(KOKKOS_ENABLE_CUDA) || (8000 <= CUDA_VERSION)
+template <class MemorySpace, class ExecSpace, class ScheduleType>
 struct TestLambdaSharedTeam {
   TestLambdaSharedTeam() { run(); }
 
-  void run()
-  {
-    typedef Test::SharedTeamFunctor< ExecSpace, ScheduleType > Functor;
-    //typedef Kokkos::View< typename Functor::value_type, Kokkos::HostSpace, Kokkos::MemoryUnmanaged > result_type;
-    typedef Kokkos::View< typename Functor::value_type, MemorySpace, Kokkos::MemoryUnmanaged > result_type;
+  void run() {
+    typedef Test::SharedTeamFunctor<ExecSpace, ScheduleType> Functor;
+    // typedef Kokkos::View< typename Functor::value_type, Kokkos::HostSpace,
+    // Kokkos::MemoryUnmanaged > result_type;
+    typedef Kokkos::View<typename Functor::value_type, MemorySpace,
+                         Kokkos::MemoryUnmanaged>
+        result_type;
 
     typedef typename ExecSpace::scratch_memory_space shmem_space;
 
     // TBD: MemoryUnmanaged should be the default for shared memory space.
-    typedef Kokkos::View< int*, shmem_space, Kokkos::MemoryUnmanaged > shared_int_array_type;
+    typedef Kokkos::View<int *, shmem_space, Kokkos::MemoryUnmanaged>
+        shared_int_array_type;
 
     const int SHARED_COUNT = 1000;
-    int team_size = 1;
+    int team_size          = 1;
 
 #ifdef KOKKOS_ENABLE_CUDA
-    if ( std::is_same< ExecSpace, Kokkos::Cuda >::value ) team_size = 128;
+    if (std::is_same<ExecSpace, Kokkos::Cuda>::value) team_size = 128;
 #endif
 
-    Kokkos::TeamPolicy< ScheduleType,  ExecSpace > team_exec( 8192 / team_size, team_size );
-    team_exec = team_exec.set_scratch_size( 0, Kokkos::PerTeam( SHARED_COUNT * 2 * sizeof( int ) ) );
+    Kokkos::TeamPolicy<ScheduleType, ExecSpace> team_exec(8192 / team_size,
+                                                          team_size);
+    team_exec = team_exec.set_scratch_size(
+        0, Kokkos::PerTeam(SHARED_COUNT * 2 * sizeof(int)));
 
     typename Functor::value_type error_count = 0;
 
-    Kokkos::parallel_reduce( team_exec, KOKKOS_LAMBDA
-        ( const typename Kokkos::TeamPolicy< ScheduleType,  ExecSpace >::member_type & ind, int & update )
-    {
-      const shared_int_array_type shared_A( ind.team_shmem(), SHARED_COUNT );
-      const shared_int_array_type shared_B( ind.team_shmem(), SHARED_COUNT );
+    Kokkos::parallel_reduce(
+        team_exec,
+        KOKKOS_LAMBDA(
+            const typename Kokkos::TeamPolicy<ScheduleType,
+                                              ExecSpace>::member_type &ind,
+            int &update) {
+          const shared_int_array_type shared_A(ind.team_shmem(), SHARED_COUNT);
+          const shared_int_array_type shared_B(ind.team_shmem(), SHARED_COUNT);
 
-      if ( ( shared_A.data () == nullptr && SHARED_COUNT > 0 ) ||
-           ( shared_B.data () == nullptr && SHARED_COUNT > 0 ) )
-      {
-        printf( "Failed to allocate shared memory of size %lu\n",
-                static_cast<unsigned long>( SHARED_COUNT ) );
+          if ((shared_A.data() == nullptr && SHARED_COUNT > 0) ||
+              (shared_B.data() == nullptr && SHARED_COUNT > 0)) {
+            printf("Failed to allocate shared memory of size %lu\n",
+                   static_cast<unsigned long>(SHARED_COUNT));
 
-        ++update; // Failure to allocate is an error.
-      }
-      else {
-        for ( int i = ind.team_rank(); i < SHARED_COUNT; i += ind.team_size() ) {
-          shared_A[i] = i + ind.league_rank();
-          shared_B[i] = 2 * i + ind.league_rank();
-        }
-
-        ind.team_barrier();
-
-        if ( ind.team_rank() + 1 == ind.team_size() ) {
-          for ( int i = 0; i < SHARED_COUNT; ++i ) {
-            if ( shared_A[i] != i + ind.league_rank() ) {
-              ++update;
+            ++update;  // Failure to allocate is an error.
+          } else {
+            for (int i = ind.team_rank(); i < SHARED_COUNT;
+                 i += ind.team_size()) {
+              shared_A[i] = i + ind.league_rank();
+              shared_B[i] = 2 * i + ind.league_rank();
             }
 
-            if ( shared_B[i] != 2 * i + ind.league_rank() ) {
-              ++update;
+            ind.team_barrier();
+
+            if (ind.team_rank() + 1 == ind.team_size()) {
+              for (int i = 0; i < SHARED_COUNT; ++i) {
+                if (shared_A[i] != i + ind.league_rank()) {
+                  ++update;
+                }
+
+                if (shared_B[i] != 2 * i + ind.league_rank()) {
+                  ++update;
+                }
+              }
             }
           }
-        }
-      }
-    }, result_type( & error_count ) );
+        },
+        result_type(&error_count));
 
     Kokkos::fence();
 
-    ASSERT_EQ( error_count, 0 );
+    ASSERT_EQ(error_count, 0);
   }
 };
 #endif
 #endif
 
-} // namespace Test
+}  // namespace Test
 
 namespace Test {
 
-template< class ExecSpace, class ScheduleType >
+template <class ExecSpace, class ScheduleType>
 struct ScratchTeamFunctor {
-
-  typedef ExecSpace                                            execution_space;
-  typedef int                                                  value_type;
-  typedef Kokkos::TeamPolicy< ScheduleType, execution_space >  policy_type;
+  typedef ExecSpace execution_space;
+  typedef int value_type;
+  typedef Kokkos::TeamPolicy<ScheduleType, execution_space> policy_type;
 
   enum { SHARED_TEAM_COUNT = 100 };
   enum { SHARED_THREAD_COUNT = 10 };
@@ -596,54 +619,58 @@ struct ScratchTeamFunctor {
   typedef typename ExecSpace::scratch_memory_space shmem_space;
 
   // TBD: MemoryUnmanaged should be the default for shared memory space.
-  typedef Kokkos::View< size_t*, shmem_space, Kokkos::MemoryUnmanaged > shared_int_array_type;
+  typedef Kokkos::View<size_t *, shmem_space, Kokkos::MemoryUnmanaged>
+      shared_int_array_type;
 
   KOKKOS_INLINE_FUNCTION
-  void operator()( const typename policy_type::member_type & ind, value_type & update ) const
-  {
-    const shared_int_array_type scratch_ptr( ind.team_scratch( 1 ), 3 * ind.team_size() );
-    const shared_int_array_type scratch_A( ind.team_scratch( 1 ), SHARED_TEAM_COUNT );
-    const shared_int_array_type scratch_B( ind.thread_scratch( 1 ), SHARED_THREAD_COUNT );
+  void operator()(const typename policy_type::member_type &ind,
+                  value_type &update) const {
+    const shared_int_array_type scratch_ptr(ind.team_scratch(1),
+                                            3 * ind.team_size());
+    const shared_int_array_type scratch_A(ind.team_scratch(1),
+                                          SHARED_TEAM_COUNT);
+    const shared_int_array_type scratch_B(ind.thread_scratch(1),
+                                          SHARED_THREAD_COUNT);
 
-    if ( ( scratch_ptr.data() == nullptr ) ||
-         ( scratch_A.  data() == nullptr && SHARED_TEAM_COUNT > 0 ) ||
-         ( scratch_B.  data() == nullptr && SHARED_THREAD_COUNT > 0 ) )
-    {
-      printf( "Failed to allocate shared memory of size %lu\n",
-              static_cast<unsigned long>( SHARED_TEAM_COUNT ) );
+    if ((scratch_ptr.data() == nullptr) ||
+        (scratch_A.data() == nullptr && SHARED_TEAM_COUNT > 0) ||
+        (scratch_B.data() == nullptr && SHARED_THREAD_COUNT > 0)) {
+      printf("Failed to allocate shared memory of size %lu\n",
+             static_cast<unsigned long>(SHARED_TEAM_COUNT));
 
-      ++update; // Failure to allocate is an error.
-    }
-    else {
-      Kokkos::parallel_for( Kokkos::TeamThreadRange( ind, 0, (int) SHARED_TEAM_COUNT ), [&] ( const int & i ) {
-        scratch_A[i] = i + ind.league_rank();
-      });
+      ++update;  // Failure to allocate is an error.
+    } else {
+      Kokkos::parallel_for(
+          Kokkos::TeamThreadRange(ind, 0, (int)SHARED_TEAM_COUNT),
+          [&](const int &i) { scratch_A[i] = i + ind.league_rank(); });
 
-      for ( int i = 0; i < SHARED_THREAD_COUNT; i++ ) {
+      for (int i = 0; i < SHARED_THREAD_COUNT; i++) {
         scratch_B[i] = 10000 * ind.league_rank() + 100 * ind.team_rank() + i;
       }
 
-      scratch_ptr[ind.team_rank()] = (size_t) scratch_A.data();
-      scratch_ptr[ind.team_rank() + ind.team_size()] = (size_t) scratch_B.data();
+      scratch_ptr[ind.team_rank()]                   = (size_t)scratch_A.data();
+      scratch_ptr[ind.team_rank() + ind.team_size()] = (size_t)scratch_B.data();
 
       ind.team_barrier();
 
-      for ( int i = 0; i < SHARED_TEAM_COUNT; i++ ) {
-        if ( scratch_A[i] != size_t( i + ind.league_rank() ) ) ++update;
+      for (int i = 0; i < SHARED_TEAM_COUNT; i++) {
+        if (scratch_A[i] != size_t(i + ind.league_rank())) ++update;
       }
 
-      for ( int i = 0; i < ind.team_size(); i++ ) {
-        if ( scratch_ptr[0] != scratch_ptr[i] ) ++update;
+      for (int i = 0; i < ind.team_size(); i++) {
+        if (scratch_ptr[0] != scratch_ptr[i]) ++update;
       }
 
-      if ( scratch_ptr[1 + ind.team_size()] - scratch_ptr[0 + ind.team_size()] < SHARED_THREAD_COUNT * sizeof( size_t ) ) {
+      if (scratch_ptr[1 + ind.team_size()] - scratch_ptr[0 + ind.team_size()] <
+          SHARED_THREAD_COUNT * sizeof(size_t)) {
         ++update;
       }
 
-      for ( int i = 1; i < ind.team_size(); i++ ) {
-        if ( ( scratch_ptr[i + ind.team_size()] - scratch_ptr[i - 1 + ind.team_size()] ) !=
-             ( scratch_ptr[1 + ind.team_size()] - scratch_ptr[0 + ind.team_size()] ) )
-        {
+      for (int i = 1; i < ind.team_size(); i++) {
+        if ((scratch_ptr[i + ind.team_size()] -
+             scratch_ptr[i - 1 + ind.team_size()]) !=
+            (scratch_ptr[1 + ind.team_size()] -
+             scratch_ptr[0 + ind.team_size()])) {
           ++update;
         }
       }
@@ -651,129 +678,164 @@ struct ScratchTeamFunctor {
   }
 };
 
-} // namespace Test
+}  // namespace Test
 
 namespace {
 
-template< class ExecSpace, class ScheduleType >
+template <class ExecSpace, class ScheduleType>
 struct TestScratchTeam {
   TestScratchTeam() { run(); }
 
-  void run()
-  {
+  void run() {
     typedef Test::ScratchTeamFunctor<ExecSpace, ScheduleType> Functor;
-    typedef Kokkos::View< typename Functor::value_type, Kokkos::HostSpace, Kokkos::MemoryUnmanaged >  result_type;
-    typedef Kokkos::TeamPolicy< ScheduleType,  ExecSpace > p_type;
-
+    typedef Kokkos::View<typename Functor::value_type, Kokkos::HostSpace,
+                         Kokkos::MemoryUnmanaged>
+        result_type;
+    typedef Kokkos::TeamPolicy<ScheduleType, ExecSpace> p_type;
 
     typename Functor::value_type error_count = 0;
 
-    int thread_scratch_size = Functor::shared_int_array_type::shmem_size( Functor::SHARED_THREAD_COUNT );
+    int thread_scratch_size = Functor::shared_int_array_type::shmem_size(
+        Functor::SHARED_THREAD_COUNT);
 
-    p_type team_exec = p_type(8192,1).set_scratch_size( 1, Kokkos::PerTeam( Functor::shared_int_array_type::shmem_size( Functor::SHARED_TEAM_COUNT ) ),
-                                                           Kokkos::PerThread( thread_scratch_size + 3*sizeof(int)));
+    p_type team_exec = p_type(8192, 1).set_scratch_size(
+        1,
+        Kokkos::PerTeam(Functor::shared_int_array_type::shmem_size(
+            Functor::SHARED_TEAM_COUNT)),
+        Kokkos::PerThread(thread_scratch_size + 3 * sizeof(int)));
 
-    const size_t team_size = team_exec.team_size_max( Functor(), Kokkos::ParallelReduceTag() );
+    const size_t team_size =
+        team_exec.team_size_max(Functor(), Kokkos::ParallelReduceTag());
 
-    int team_scratch_size   = Functor::shared_int_array_type::shmem_size( Functor::SHARED_TEAM_COUNT ) +
-                              Functor::shared_int_array_type::shmem_size( 3 * team_size );
+    int team_scratch_size =
+        Functor::shared_int_array_type::shmem_size(Functor::SHARED_TEAM_COUNT) +
+        Functor::shared_int_array_type::shmem_size(3 * team_size);
 
-    team_exec = p_type(8192 / team_size, team_size );
+    team_exec = p_type(8192 / team_size, team_size);
 
-    Kokkos::parallel_reduce( team_exec.set_scratch_size( 1, Kokkos::PerTeam( team_scratch_size ),
-                                                         Kokkos::PerThread( thread_scratch_size ) ),
-                             Functor(), result_type( & error_count ) );
+    Kokkos::parallel_reduce(
+        team_exec.set_scratch_size(1, Kokkos::PerTeam(team_scratch_size),
+                                   Kokkos::PerThread(thread_scratch_size)),
+        Functor(), result_type(&error_count));
     Kokkos::fence();
-    ASSERT_EQ( error_count, 0 );
+    ASSERT_EQ(error_count, 0);
   }
 };
 
-} // namespace
+}  // namespace
 
 namespace Test {
 
-template< class ExecSpace >
-KOKKOS_INLINE_FUNCTION
-int test_team_mulit_level_scratch_loop_body( const typename Kokkos::TeamPolicy<ExecSpace>::member_type& team ) {
-  Kokkos::View< double*, ExecSpace, Kokkos::MemoryTraits<Kokkos::Unmanaged> > a_team1( team.team_scratch( 0 ), 128 );
-  Kokkos::View< double*, ExecSpace, Kokkos::MemoryTraits<Kokkos::Unmanaged> > a_thread1( team.thread_scratch( 0 ), 16 );
-  Kokkos::View< double*, ExecSpace, Kokkos::MemoryTraits<Kokkos::Unmanaged> > a_team2( team.team_scratch( 0 ), 128 );
-  Kokkos::View< double*, ExecSpace, Kokkos::MemoryTraits<Kokkos::Unmanaged> > a_thread2( team.thread_scratch( 0 ), 16 );
+template <class ExecSpace>
+KOKKOS_INLINE_FUNCTION int test_team_mulit_level_scratch_loop_body(
+    const typename Kokkos::TeamPolicy<ExecSpace>::member_type &team) {
+  Kokkos::View<double *, ExecSpace, Kokkos::MemoryTraits<Kokkos::Unmanaged> >
+      a_team1(team.team_scratch(0), 128);
+  Kokkos::View<double *, ExecSpace, Kokkos::MemoryTraits<Kokkos::Unmanaged> >
+      a_thread1(team.thread_scratch(0), 16);
+  Kokkos::View<double *, ExecSpace, Kokkos::MemoryTraits<Kokkos::Unmanaged> >
+      a_team2(team.team_scratch(0), 128);
+  Kokkos::View<double *, ExecSpace, Kokkos::MemoryTraits<Kokkos::Unmanaged> >
+      a_thread2(team.thread_scratch(0), 16);
 
-  Kokkos::View< double*, ExecSpace, Kokkos::MemoryTraits<Kokkos::Unmanaged> > b_team1( team.team_scratch( 1 ), 128000 );
-  Kokkos::View< double*, ExecSpace, Kokkos::MemoryTraits<Kokkos::Unmanaged> > b_thread1( team.thread_scratch( 1 ), 16000 );
-  Kokkos::View< double*, ExecSpace, Kokkos::MemoryTraits<Kokkos::Unmanaged> > b_team2( team.team_scratch( 1 ), 128000 );
-  Kokkos::View< double*, ExecSpace, Kokkos::MemoryTraits<Kokkos::Unmanaged> > b_thread2( team.thread_scratch( 1 ), 16000 );
+  Kokkos::View<double *, ExecSpace, Kokkos::MemoryTraits<Kokkos::Unmanaged> >
+      b_team1(team.team_scratch(1), 128000);
+  Kokkos::View<double *, ExecSpace, Kokkos::MemoryTraits<Kokkos::Unmanaged> >
+      b_thread1(team.thread_scratch(1), 16000);
+  Kokkos::View<double *, ExecSpace, Kokkos::MemoryTraits<Kokkos::Unmanaged> >
+      b_team2(team.team_scratch(1), 128000);
+  Kokkos::View<double *, ExecSpace, Kokkos::MemoryTraits<Kokkos::Unmanaged> >
+      b_thread2(team.thread_scratch(1), 16000);
 
-  Kokkos::View< double*, ExecSpace, Kokkos::MemoryTraits<Kokkos::Unmanaged> > a_team3( team.team_scratch( 0 ), 128 );
-  Kokkos::View< double*, ExecSpace, Kokkos::MemoryTraits<Kokkos::Unmanaged> > a_thread3( team.thread_scratch( 0 ), 16 );
-  Kokkos::View< double*, ExecSpace, Kokkos::MemoryTraits<Kokkos::Unmanaged> > b_team3( team.team_scratch( 1 ), 128000 );
-  Kokkos::View< double*, ExecSpace, Kokkos::MemoryTraits<Kokkos::Unmanaged> > b_thread3( team.thread_scratch( 1 ), 16000 );
+  Kokkos::View<double *, ExecSpace, Kokkos::MemoryTraits<Kokkos::Unmanaged> >
+      a_team3(team.team_scratch(0), 128);
+  Kokkos::View<double *, ExecSpace, Kokkos::MemoryTraits<Kokkos::Unmanaged> >
+      a_thread3(team.thread_scratch(0), 16);
+  Kokkos::View<double *, ExecSpace, Kokkos::MemoryTraits<Kokkos::Unmanaged> >
+      b_team3(team.team_scratch(1), 128000);
+  Kokkos::View<double *, ExecSpace, Kokkos::MemoryTraits<Kokkos::Unmanaged> >
+      b_thread3(team.thread_scratch(1), 16000);
 
-  // The explicit types for 0 and 128 are here to test TeamThreadRange accepting different
-  // types for begin and end.
-  Kokkos::parallel_for( Kokkos::TeamThreadRange( team, int( 0 ), unsigned( 128 ) ), [&] ( const int & i )
-  {
-    a_team1( i ) = 1000000 + i + team.league_rank() * 100000;
-    a_team2( i ) = 2000000 + i + team.league_rank() * 100000;
-    a_team3( i ) = 3000000 + i + team.league_rank() * 100000;
-  });
+  // The explicit types for 0 and 128 are here to test TeamThreadRange accepting
+  // different types for begin and end.
+  Kokkos::parallel_for(Kokkos::TeamThreadRange(team, int(0), unsigned(128)),
+                       [&](const int &i) {
+                         a_team1(i) = 1000000 + i + team.league_rank() * 100000;
+                         a_team2(i) = 2000000 + i + team.league_rank() * 100000;
+                         a_team3(i) = 3000000 + i + team.league_rank() * 100000;
+                       });
   team.team_barrier();
 
-  Kokkos::parallel_for( Kokkos::ThreadVectorRange( team, 16 ), [&] ( const int & i )
-  {
-    a_thread1( i ) = 1000000 + 100000 * team.team_rank() + 16 - i + team.league_rank() * 100000;
-    a_thread2( i ) = 2000000 + 100000 * team.team_rank() + 16 - i + team.league_rank() * 100000;
-    a_thread3( i ) = 3000000 + 100000 * team.team_rank() + 16 - i + team.league_rank() * 100000;
+  Kokkos::parallel_for(Kokkos::ThreadVectorRange(team, 16), [&](const int &i) {
+    a_thread1(i) = 1000000 + 100000 * team.team_rank() + 16 - i +
+                   team.league_rank() * 100000;
+    a_thread2(i) = 2000000 + 100000 * team.team_rank() + 16 - i +
+                   team.league_rank() * 100000;
+    a_thread3(i) = 3000000 + 100000 * team.team_rank() + 16 - i +
+                   team.league_rank() * 100000;
   });
 
-  Kokkos::parallel_for( Kokkos::TeamThreadRange( team, 0, 128000 ), [&] ( const int & i )
-  {
-    b_team1( i ) = 1000000 + i + team.league_rank() * 100000;
-    b_team2( i ) = 2000000 + i + team.league_rank() * 100000;
-    b_team3( i ) = 3000000 + i + team.league_rank() * 100000;
-  });
+  Kokkos::parallel_for(Kokkos::TeamThreadRange(team, 0, 128000),
+                       [&](const int &i) {
+                         b_team1(i) = 1000000 + i + team.league_rank() * 100000;
+                         b_team2(i) = 2000000 + i + team.league_rank() * 100000;
+                         b_team3(i) = 3000000 + i + team.league_rank() * 100000;
+                       });
   team.team_barrier();
 
-  Kokkos::parallel_for( Kokkos::ThreadVectorRange( team, 16000 ), [&] ( const int & i )
-  {
-    b_thread1( i ) = 1000000 + 100000 * team.team_rank() + 16 - i + team.league_rank() * 100000;
-    b_thread2( i ) = 2000000 + 100000 * team.team_rank() + 16 - i + team.league_rank() * 100000;
-    b_thread3( i ) = 3000000 + 100000 * team.team_rank() + 16 - i + team.league_rank() * 100000;
-  });
+  Kokkos::parallel_for(Kokkos::ThreadVectorRange(team, 16000),
+                       [&](const int &i) {
+                         b_thread1(i) = 1000000 + 100000 * team.team_rank() +
+                                        16 - i + team.league_rank() * 100000;
+                         b_thread2(i) = 2000000 + 100000 * team.team_rank() +
+                                        16 - i + team.league_rank() * 100000;
+                         b_thread3(i) = 3000000 + 100000 * team.team_rank() +
+                                        16 - i + team.league_rank() * 100000;
+                       });
 
   team.team_barrier();
 
   int error = 0;
-  Kokkos::parallel_for( Kokkos::TeamThreadRange( team, 0, 128 ), [&] ( const int & i )
-  {
-    if ( a_team1( i ) != 1000000 + i + team.league_rank() * 100000 ) error++;
-    if ( a_team2( i ) != 2000000 + i + team.league_rank() * 100000 ) error++;
-    if ( a_team3( i ) != 3000000 + i + team.league_rank() * 100000 ) error++;
-  });
+  Kokkos::parallel_for(
+      Kokkos::TeamThreadRange(team, 0, 128), [&](const int &i) {
+        if (a_team1(i) != 1000000 + i + team.league_rank() * 100000) error++;
+        if (a_team2(i) != 2000000 + i + team.league_rank() * 100000) error++;
+        if (a_team3(i) != 3000000 + i + team.league_rank() * 100000) error++;
+      });
   team.team_barrier();
 
-  Kokkos::parallel_for( Kokkos::ThreadVectorRange( team, 16 ), [&] ( const int & i )
-  {
-    if ( a_thread1( i ) != 1000000 + 100000 * team.team_rank() + 16 - i + team.league_rank() * 100000 ) error++;
-    if ( a_thread2( i ) != 2000000 + 100000 * team.team_rank() + 16 - i + team.league_rank() * 100000 ) error++;
-    if ( a_thread3( i ) != 3000000 + 100000 * team.team_rank() + 16 - i + team.league_rank() * 100000 ) error++;
+  Kokkos::parallel_for(Kokkos::ThreadVectorRange(team, 16), [&](const int &i) {
+    if (a_thread1(i) != 1000000 + 100000 * team.team_rank() + 16 - i +
+                            team.league_rank() * 100000)
+      error++;
+    if (a_thread2(i) != 2000000 + 100000 * team.team_rank() + 16 - i +
+                            team.league_rank() * 100000)
+      error++;
+    if (a_thread3(i) != 3000000 + 100000 * team.team_rank() + 16 - i +
+                            team.league_rank() * 100000)
+      error++;
   });
 
-  Kokkos::parallel_for( Kokkos::TeamThreadRange( team, 0, 128000 ), [&] ( const int & i )
-  {
-    if ( b_team1( i ) != 1000000 + i + team.league_rank() * 100000 ) error++;
-    if ( b_team2( i ) != 2000000 + i + team.league_rank() * 100000 ) error++;
-    if ( b_team3( i ) != 3000000 + i + team.league_rank() * 100000 ) error++;
-  });
+  Kokkos::parallel_for(
+      Kokkos::TeamThreadRange(team, 0, 128000), [&](const int &i) {
+        if (b_team1(i) != 1000000 + i + team.league_rank() * 100000) error++;
+        if (b_team2(i) != 2000000 + i + team.league_rank() * 100000) error++;
+        if (b_team3(i) != 3000000 + i + team.league_rank() * 100000) error++;
+      });
   team.team_barrier();
 
-  Kokkos::parallel_for( Kokkos::ThreadVectorRange( team, 16000 ), [&] ( const int & i )
-  {
-    if ( b_thread1( i ) != 1000000 + 100000 * team.team_rank() + 16 - i + team.league_rank() * 100000 ) error++;
-    if ( b_thread2( i ) != 2000000 + 100000 * team.team_rank() + 16 - i + team.league_rank() * 100000 ) error++;
-    if ( b_thread3( i ) != 3000000 + 100000 * team.team_rank() + 16 - i + team.league_rank() * 100000 ) error++;
-  });
+  Kokkos::parallel_for(
+      Kokkos::ThreadVectorRange(team, 16000), [&](const int &i) {
+        if (b_thread1(i) != 1000000 + 100000 * team.team_rank() + 16 - i +
+                                team.league_rank() * 100000)
+          error++;
+        if (b_thread2(i) != 2000000 + 100000 * team.team_rank() + 16 - i +
+                                team.league_rank() * 100000)
+          error++;
+        if (b_thread3(i) != 3000000 + 100000 * team.team_rank() + 16 - i +
+                                team.league_rank() * 100000)
+          error++;
+      });
 
   return error;
 }
@@ -781,217 +843,293 @@ int test_team_mulit_level_scratch_loop_body( const typename Kokkos::TeamPolicy<E
 struct TagReduce {};
 struct TagFor {};
 
-template< class ExecSpace, class ScheduleType >
+template <class ExecSpace, class ScheduleType>
 struct ClassNoShmemSizeFunction {
-  typedef typename Kokkos::TeamPolicy< ExecSpace, ScheduleType >::member_type member_type;
+  typedef typename Kokkos::TeamPolicy<ExecSpace, ScheduleType>::member_type
+      member_type;
 
-  Kokkos::View< int, ExecSpace, Kokkos::MemoryTraits<Kokkos::Atomic> > errors;
+  Kokkos::View<int, ExecSpace, Kokkos::MemoryTraits<Kokkos::Atomic> > errors;
 
   KOKKOS_INLINE_FUNCTION
-  void operator()( const TagFor &, const member_type & team ) const {
-    int error = test_team_mulit_level_scratch_loop_body< ExecSpace >( team );
+  void operator()(const TagFor &, const member_type &team) const {
+    int error = test_team_mulit_level_scratch_loop_body<ExecSpace>(team);
     errors() += error;
   }
 
   KOKKOS_INLINE_FUNCTION
-  void operator() ( const TagReduce &, const member_type & team, int & error ) const {
-    error += test_team_mulit_level_scratch_loop_body< ExecSpace >( team );
+  void operator()(const TagReduce &, const member_type &team,
+                  int &error) const {
+    error += test_team_mulit_level_scratch_loop_body<ExecSpace>(team);
   }
 
   void run() {
-    Kokkos::View< int, ExecSpace > d_errors = Kokkos::View< int, ExecSpace >( "Errors" );
+    Kokkos::View<int, ExecSpace> d_errors =
+        Kokkos::View<int, ExecSpace>("Errors");
     errors = d_errors;
 
-    const int per_team0 = 3 * Kokkos::View< double*, ExecSpace, Kokkos::MemoryTraits<Kokkos::Unmanaged> >::shmem_size( 128 );
-    const int per_thread0 = 3 * Kokkos::View< double*, ExecSpace, Kokkos::MemoryTraits<Kokkos::Unmanaged> >::shmem_size( 16 );
+    const int per_team0 =
+        3 *
+        Kokkos::View<double *, ExecSpace,
+                     Kokkos::MemoryTraits<Kokkos::Unmanaged> >::shmem_size(128);
+    const int per_thread0 =
+        3 *
+        Kokkos::View<double *, ExecSpace,
+                     Kokkos::MemoryTraits<Kokkos::Unmanaged> >::shmem_size(16);
 
-    const int per_team1 = 3 * Kokkos::View< double*, ExecSpace, Kokkos::MemoryTraits<Kokkos::Unmanaged> >::shmem_size( 128000 );
-    const int per_thread1 = 3 * Kokkos::View< double*, ExecSpace, Kokkos::MemoryTraits<Kokkos::Unmanaged> >::shmem_size( 16000 );
+    const int per_team1 =
+        3 * Kokkos::View<
+                double *, ExecSpace,
+                Kokkos::MemoryTraits<Kokkos::Unmanaged> >::shmem_size(128000);
+    const int per_thread1 =
+        3 * Kokkos::View<
+                double *, ExecSpace,
+                Kokkos::MemoryTraits<Kokkos::Unmanaged> >::shmem_size(16000);
 
     int team_size = 8;
-    if(team_size > ExecSpace::concurrency())
+    if (team_size > ExecSpace::concurrency())
       team_size = ExecSpace::concurrency();
     {
-      Kokkos::TeamPolicy< TagFor, ExecSpace, ScheduleType > policy( 10, team_size, 16 );
+      Kokkos::TeamPolicy<TagFor, ExecSpace, ScheduleType> policy(10, team_size,
+                                                                 16);
 
-      Kokkos::parallel_for( policy.set_scratch_size( 0, Kokkos::PerTeam( per_team0 ), Kokkos::PerThread( per_thread0 ) ).set_scratch_size( 1, Kokkos::PerTeam( per_team1 ), Kokkos::PerThread( per_thread1 ) ), *this );
+      Kokkos::parallel_for(
+          policy
+              .set_scratch_size(0, Kokkos::PerTeam(per_team0),
+                                Kokkos::PerThread(per_thread0))
+              .set_scratch_size(1, Kokkos::PerTeam(per_team1),
+                                Kokkos::PerThread(per_thread1)),
+          *this);
       Kokkos::fence();
 
-      typename Kokkos::View< int, ExecSpace >::HostMirror h_errors = Kokkos::create_mirror_view( d_errors );
-      Kokkos::deep_copy( h_errors, d_errors );
-      ASSERT_EQ( h_errors(), 0 );
+      typename Kokkos::View<int, ExecSpace>::HostMirror h_errors =
+          Kokkos::create_mirror_view(d_errors);
+      Kokkos::deep_copy(h_errors, d_errors);
+      ASSERT_EQ(h_errors(), 0);
     }
 
     {
       int error = 0;
-      Kokkos::TeamPolicy< TagReduce, ExecSpace, ScheduleType > policy( 10, team_size, 16 );
+      Kokkos::TeamPolicy<TagReduce, ExecSpace, ScheduleType> policy(
+          10, team_size, 16);
 
-      Kokkos::parallel_reduce( policy.set_scratch_size( 0, Kokkos::PerTeam( per_team0 ), Kokkos::PerThread( per_thread0 ) ).set_scratch_size( 1, Kokkos::PerTeam( per_team1 ), Kokkos::PerThread( per_thread1 ) ), *this, error );
+      Kokkos::parallel_reduce(
+          policy
+              .set_scratch_size(0, Kokkos::PerTeam(per_team0),
+                                Kokkos::PerThread(per_thread0))
+              .set_scratch_size(1, Kokkos::PerTeam(per_team1),
+                                Kokkos::PerThread(per_thread1)),
+          *this, error);
 
-      ASSERT_EQ( error, 0 );
+      ASSERT_EQ(error, 0);
     }
   };
 };
 
-template< class ExecSpace, class ScheduleType >
+template <class ExecSpace, class ScheduleType>
 struct ClassWithShmemSizeFunction {
-  typedef typename Kokkos::TeamPolicy< ExecSpace, ScheduleType >::member_type member_type;
+  typedef typename Kokkos::TeamPolicy<ExecSpace, ScheduleType>::member_type
+      member_type;
 
-  Kokkos::View< int, ExecSpace, Kokkos::MemoryTraits<Kokkos::Atomic> > errors;
+  Kokkos::View<int, ExecSpace, Kokkos::MemoryTraits<Kokkos::Atomic> > errors;
 
   KOKKOS_INLINE_FUNCTION
-  void operator()( const TagFor &, const member_type & team ) const {
-    int error = test_team_mulit_level_scratch_loop_body< ExecSpace >( team );
+  void operator()(const TagFor &, const member_type &team) const {
+    int error = test_team_mulit_level_scratch_loop_body<ExecSpace>(team);
     errors() += error;
   }
 
   KOKKOS_INLINE_FUNCTION
-  void operator() ( const TagReduce &, const member_type & team, int & error ) const {
-    error += test_team_mulit_level_scratch_loop_body< ExecSpace >( team );
+  void operator()(const TagReduce &, const member_type &team,
+                  int &error) const {
+    error += test_team_mulit_level_scratch_loop_body<ExecSpace>(team);
   }
 
   void run() {
-    Kokkos::View< int, ExecSpace > d_errors = Kokkos::View< int, ExecSpace >( "Errors" );
+    Kokkos::View<int, ExecSpace> d_errors =
+        Kokkos::View<int, ExecSpace>("Errors");
     errors = d_errors;
 
-    const int per_team1 = 3 * Kokkos::View< double*, ExecSpace, Kokkos::MemoryTraits<Kokkos::Unmanaged> >::shmem_size( 128000 );
-    const int per_thread1 = 3 * Kokkos::View< double*, ExecSpace, Kokkos::MemoryTraits<Kokkos::Unmanaged> >::shmem_size( 16000 );
+    const int per_team1 =
+        3 * Kokkos::View<
+                double *, ExecSpace,
+                Kokkos::MemoryTraits<Kokkos::Unmanaged> >::shmem_size(128000);
+    const int per_thread1 =
+        3 * Kokkos::View<
+                double *, ExecSpace,
+                Kokkos::MemoryTraits<Kokkos::Unmanaged> >::shmem_size(16000);
 
     int team_size = 8;
-    if(team_size > ExecSpace::concurrency())
+    if (team_size > ExecSpace::concurrency())
       team_size = ExecSpace::concurrency();
 
     {
-      Kokkos::TeamPolicy< TagFor, ExecSpace, ScheduleType > policy( 10, team_size, 16 );
+      Kokkos::TeamPolicy<TagFor, ExecSpace, ScheduleType> policy(10, team_size,
+                                                                 16);
 
-      Kokkos::parallel_for( policy.set_scratch_size( 1, Kokkos::PerTeam( per_team1 ),
-                                                     Kokkos::PerThread( per_thread1 ) ),
-                            *this );
+      Kokkos::parallel_for(
+          policy.set_scratch_size(1, Kokkos::PerTeam(per_team1),
+                                  Kokkos::PerThread(per_thread1)),
+          *this);
       Kokkos::fence();
 
-      typename Kokkos::View< int, ExecSpace >::HostMirror h_errors = Kokkos::create_mirror_view( d_errors );
-      Kokkos::deep_copy( h_errors, d_errors );
-      ASSERT_EQ( h_errors(), 0 );
+      typename Kokkos::View<int, ExecSpace>::HostMirror h_errors =
+          Kokkos::create_mirror_view(d_errors);
+      Kokkos::deep_copy(h_errors, d_errors);
+      ASSERT_EQ(h_errors(), 0);
     }
 
     {
       int error = 0;
-      Kokkos::TeamPolicy< TagReduce, ExecSpace, ScheduleType > policy( 10, team_size, 16 );
+      Kokkos::TeamPolicy<TagReduce, ExecSpace, ScheduleType> policy(
+          10, team_size, 16);
 
-      Kokkos::parallel_reduce( policy.set_scratch_size( 1, Kokkos::PerTeam( per_team1 ),
-                                                        Kokkos::PerThread( per_thread1 ) ),
-                               *this, error );
+      Kokkos::parallel_reduce(
+          policy.set_scratch_size(1, Kokkos::PerTeam(per_team1),
+                                  Kokkos::PerThread(per_thread1)),
+          *this, error);
 
-      ASSERT_EQ( error, 0 );
+      ASSERT_EQ(error, 0);
     }
   };
 
-  unsigned team_shmem_size( int team_size ) const {
-    const int per_team0 = 3 * Kokkos::View< double*, ExecSpace, Kokkos::MemoryTraits<Kokkos::Unmanaged> >::shmem_size( 128 );
-    const int per_thread0 = 3 * Kokkos::View< double*, ExecSpace, Kokkos::MemoryTraits<Kokkos::Unmanaged> >::shmem_size( 16 );
+  unsigned team_shmem_size(int team_size) const {
+    const int per_team0 =
+        3 *
+        Kokkos::View<double *, ExecSpace,
+                     Kokkos::MemoryTraits<Kokkos::Unmanaged> >::shmem_size(128);
+    const int per_thread0 =
+        3 *
+        Kokkos::View<double *, ExecSpace,
+                     Kokkos::MemoryTraits<Kokkos::Unmanaged> >::shmem_size(16);
     return per_team0 + team_size * per_thread0;
   }
 };
 
-template< class ExecSpace, class ScheduleType >
+template <class ExecSpace, class ScheduleType>
 void test_team_mulit_level_scratch_test_lambda() {
 #ifdef KOKKOS_ENABLE_CXX11_DISPATCH_LAMBDA
-#if !defined(KOKKOS_ENABLE_CUDA) || ( 8000 <= CUDA_VERSION )
-  Kokkos::View< int, ExecSpace, Kokkos::MemoryTraits<Kokkos::Atomic> > errors;
-  Kokkos::View< int, ExecSpace > d_errors( "Errors" );
+#if !defined(KOKKOS_ENABLE_CUDA) || (8000 <= CUDA_VERSION)
+  Kokkos::View<int, ExecSpace, Kokkos::MemoryTraits<Kokkos::Atomic> > errors;
+  Kokkos::View<int, ExecSpace> d_errors("Errors");
   errors = d_errors;
 
-  const int per_team0 = 3 * Kokkos::View< double*, ExecSpace, Kokkos::MemoryTraits<Kokkos::Unmanaged> >::shmem_size( 128 );
-  const int per_thread0 = 3 * Kokkos::View< double*, ExecSpace, Kokkos::MemoryTraits<Kokkos::Unmanaged> >::shmem_size( 16 );
+  const int per_team0 =
+      3 *
+      Kokkos::View<double *, ExecSpace,
+                   Kokkos::MemoryTraits<Kokkos::Unmanaged> >::shmem_size(128);
+  const int per_thread0 =
+      3 *
+      Kokkos::View<double *, ExecSpace,
+                   Kokkos::MemoryTraits<Kokkos::Unmanaged> >::shmem_size(16);
 
-  const int per_team1 = 3 * Kokkos::View< double*, ExecSpace, Kokkos::MemoryTraits<Kokkos::Unmanaged> >::shmem_size( 128000 );
-  const int per_thread1 = 3 * Kokkos::View< double*, ExecSpace, Kokkos::MemoryTraits<Kokkos::Unmanaged> >::shmem_size( 16000 );
+  const int per_team1 =
+      3 * Kokkos::View<
+              double *, ExecSpace,
+              Kokkos::MemoryTraits<Kokkos::Unmanaged> >::shmem_size(128000);
+  const int per_thread1 =
+      3 *
+      Kokkos::View<double *, ExecSpace,
+                   Kokkos::MemoryTraits<Kokkos::Unmanaged> >::shmem_size(16000);
 
   int team_size = 8;
-  if(team_size > ExecSpace::concurrency())
+  if (team_size > ExecSpace::concurrency())
     team_size = ExecSpace::concurrency();
 
-  Kokkos::TeamPolicy< ExecSpace, ScheduleType > policy( 10, team_size, 16 );
+  Kokkos::TeamPolicy<ExecSpace, ScheduleType> policy(10, team_size, 16);
 
-  Kokkos::parallel_for( policy.set_scratch_size( 0, Kokkos::PerTeam( per_team0 ), Kokkos::PerThread( per_thread0 ) ).set_scratch_size( 1, Kokkos::PerTeam( per_team1 ), Kokkos::PerThread( per_thread1 ) ),
-                        KOKKOS_LAMBDA ( const typename Kokkos::TeamPolicy< ExecSpace >::member_type & team )
-  {
-    int error = test_team_mulit_level_scratch_loop_body< ExecSpace >( team );
-    errors() += error;
-  });
+  Kokkos::parallel_for(
+      policy
+          .set_scratch_size(0, Kokkos::PerTeam(per_team0),
+                            Kokkos::PerThread(per_thread0))
+          .set_scratch_size(1, Kokkos::PerTeam(per_team1),
+                            Kokkos::PerThread(per_thread1)),
+      KOKKOS_LAMBDA(
+          const typename Kokkos::TeamPolicy<ExecSpace>::member_type &team) {
+        int error = test_team_mulit_level_scratch_loop_body<ExecSpace>(team);
+        errors() += error;
+      });
   Kokkos::fence();
 
-  typename Kokkos::View< int, ExecSpace >::HostMirror h_errors = Kokkos::create_mirror_view( errors );
-  Kokkos::deep_copy( h_errors, d_errors );
-  ASSERT_EQ( h_errors(), 0 );
+  typename Kokkos::View<int, ExecSpace>::HostMirror h_errors =
+      Kokkos::create_mirror_view(errors);
+  Kokkos::deep_copy(h_errors, d_errors);
+  ASSERT_EQ(h_errors(), 0);
 
   int error = 0;
-  Kokkos::parallel_reduce( policy.set_scratch_size( 0, Kokkos::PerTeam( per_team0 ), Kokkos::PerThread( per_thread0 ) ).set_scratch_size( 1, Kokkos::PerTeam( per_team1 ), Kokkos::PerThread( per_thread1 ) ),
-                           KOKKOS_LAMBDA ( const typename Kokkos::TeamPolicy< ExecSpace >::member_type & team, int & count )
-  {
-    count += test_team_mulit_level_scratch_loop_body< ExecSpace >( team );
-  }, error );
-  ASSERT_EQ( error, 0 );
+  Kokkos::parallel_reduce(
+      policy
+          .set_scratch_size(0, Kokkos::PerTeam(per_team0),
+                            Kokkos::PerThread(per_thread0))
+          .set_scratch_size(1, Kokkos::PerTeam(per_team1),
+                            Kokkos::PerThread(per_thread1)),
+      KOKKOS_LAMBDA(
+          const typename Kokkos::TeamPolicy<ExecSpace>::member_type &team,
+          int &count) {
+        count += test_team_mulit_level_scratch_loop_body<ExecSpace>(team);
+      },
+      error);
+  ASSERT_EQ(error, 0);
 #endif
 #endif
 }
 
-} // namespace Test
+}  // namespace Test
 
 namespace {
 
-template< class ExecSpace, class ScheduleType >
+template <class ExecSpace, class ScheduleType>
 struct TestMultiLevelScratchTeam {
   TestMultiLevelScratchTeam() { run(); }
 
-  void run()
-  {
+  void run() {
 #ifdef KOKKOS_ENABLE_CXX11_DISPATCH_LAMBDA
-    Test::test_team_mulit_level_scratch_test_lambda< ExecSpace, ScheduleType >();
+    Test::test_team_mulit_level_scratch_test_lambda<ExecSpace, ScheduleType>();
 #endif
-    Test::ClassNoShmemSizeFunction< ExecSpace, ScheduleType > c1;
+    Test::ClassNoShmemSizeFunction<ExecSpace, ScheduleType> c1;
     c1.run();
 
-    Test::ClassWithShmemSizeFunction< ExecSpace, ScheduleType > c2;
+    Test::ClassWithShmemSizeFunction<ExecSpace, ScheduleType> c2;
     c2.run();
   }
 };
 
-} // namespace
+}  // namespace
 
 namespace Test {
 
-template< class ExecSpace >
+template <class ExecSpace>
 struct TestShmemSize {
   TestShmemSize() { run(); }
 
-  void run()
-  {
-    typedef Kokkos::View< long***, ExecSpace > view_type;
+  void run() {
+    typedef Kokkos::View<long ***, ExecSpace> view_type;
 
     size_t d1 = 5;
     size_t d2 = 6;
     size_t d3 = 7;
 
-    size_t size = view_type::shmem_size( d1, d2, d3 );
+    size_t size = view_type::shmem_size(d1, d2, d3);
 
-    ASSERT_EQ( size, (d1 * d2 * d3 + 1)* sizeof( long ) );
+    ASSERT_EQ(size, (d1 * d2 * d3 + 1) * sizeof(long));
 
     test_layout_stride();
   }
 
-  void test_layout_stride()
-  {
-    int rank = 3;
-    int order[3] = {2, 0, 1};
+  void test_layout_stride() {
+    int rank       = 3;
+    int order[3]   = {2, 0, 1};
     int extents[3] = {100, 10, 3};
-    auto s1 = Kokkos::View<double***, Kokkos::LayoutStride, ExecSpace>::shmem_size(Kokkos::LayoutStride::order_dimensions(rank, order, extents));
-    auto s2 = Kokkos::View<double***, Kokkos::LayoutRight, ExecSpace>::shmem_size(extents[0], extents[1], extents[2]);
+    auto s1 =
+        Kokkos::View<double ***, Kokkos::LayoutStride, ExecSpace>::shmem_size(
+            Kokkos::LayoutStride::order_dimensions(rank, order, extents));
+    auto s2 =
+        Kokkos::View<double ***, Kokkos::LayoutRight, ExecSpace>::shmem_size(
+            extents[0], extents[1], extents[2]);
     ASSERT_EQ(s1, s2);
   }
 };
 
-} // namespace Test
+}  // namespace Test
 
 /*--------------------------------------------------------------------------*/
 
@@ -999,38 +1137,39 @@ namespace Test {
 
 namespace {
 
-template< class ExecSpace, class ScheduleType >
+template <class ExecSpace, class ScheduleType>
 struct TestTeamBroadcast {
-  typedef typename Kokkos::TeamPolicy< ScheduleType,  ExecSpace >::member_type team_member;
+  typedef typename Kokkos::TeamPolicy<ScheduleType, ExecSpace>::member_type
+      team_member;
 
-  TestTeamBroadcast( const size_t league_size ) {}
+  TestTeamBroadcast(const size_t league_size) {}
 
   struct BroadcastTag {};
 
   typedef long value_type;
 
   KOKKOS_INLINE_FUNCTION
-  void operator()( const team_member &teamMember, value_type &update ) const
-  {
+  void operator()(const team_member &teamMember, value_type &update) const {
     int lid = teamMember.league_rank();
     int tid = teamMember.team_rank();
     int ts  = teamMember.team_size();
 
     value_type parUpdate = 0;
     value_type value     = tid * 3 + 1;
-	
-    teamMember.team_broadcast(value, lid%ts); 
 
-    Kokkos::parallel_reduce( Kokkos::TeamThreadRange( teamMember, ts ), [&] ( const int j, value_type &teamUpdate ) {
-      teamUpdate += value;
-    }, parUpdate );
+    teamMember.team_broadcast(value, lid % ts);
 
-    if ( teamMember.team_rank() == 0 ) update += parUpdate;
+    Kokkos::parallel_reduce(
+        Kokkos::TeamThreadRange(teamMember, ts),
+        [&](const int j, value_type &teamUpdate) { teamUpdate += value; },
+        parUpdate);
+
+    if (teamMember.team_rank() == 0) update += parUpdate;
   }
 
   KOKKOS_INLINE_FUNCTION
-  void operator()( const BroadcastTag &, const team_member &teamMember, value_type &update ) const
-  {
+  void operator()(const BroadcastTag &, const team_member &teamMember,
+                  value_type &update) const {
     int lid = teamMember.league_rank();
     int tid = teamMember.team_rank();
     int ts  = teamMember.team_size();
@@ -1038,77 +1177,97 @@ struct TestTeamBroadcast {
     value_type parUpdate = 0;
     value_type value     = tid * 3 + 1;
 
-    teamMember.team_broadcast([&] (value_type & var) { var*=2; }, value, lid%ts);
-    
-    Kokkos::parallel_reduce( Kokkos::TeamThreadRange( teamMember, ts ), [&] ( const int j, value_type &teamUpdate ) {
-      teamUpdate += value;
-    }, parUpdate );
+    teamMember.team_broadcast([&](value_type &var) { var *= 2; }, value,
+                              lid % ts);
 
-    if ( teamMember.team_rank() == 0 ) update += parUpdate;
+    Kokkos::parallel_reduce(
+        Kokkos::TeamThreadRange(teamMember, ts),
+        [&](const int j, value_type &teamUpdate) { teamUpdate += value; },
+        parUpdate);
+
+    if (teamMember.team_rank() == 0) update += parUpdate;
   }
 
-  static void test_teambroadcast( const size_t league_size )
-  {
-    TestTeamBroadcast functor( league_size );
+  static void test_teambroadcast(const size_t league_size) {
+    TestTeamBroadcast functor(league_size);
 
-    typedef Kokkos::TeamPolicy< ScheduleType, ExecSpace > policy_type;
-    typedef Kokkos::TeamPolicy< ScheduleType, ExecSpace, BroadcastTag > policy_type_f;
+    typedef Kokkos::TeamPolicy<ScheduleType, ExecSpace> policy_type;
+    typedef Kokkos::TeamPolicy<ScheduleType, ExecSpace, BroadcastTag>
+        policy_type_f;
 
-    const int team_size = policy_type_f(league_size,1).team_size_max( functor, Kokkos::ParallelReduceTag() ); //printf("team_size=%d\n",team_size);
+    const int team_size =
+        policy_type_f(league_size, 1)
+            .team_size_max(
+                functor,
+                Kokkos::
+                    ParallelReduceTag());  // printf("team_size=%d\n",team_size);
 
-    //team_broadcast with value
+    // team_broadcast with value
     long total = 0;
 
-    Kokkos::parallel_reduce( policy_type( league_size, team_size ), functor, total );
-    
-    value_type expected_result = 0;
-    for (unsigned int i=0; i<league_size; i++){
-      value_type val  = ((i%team_size)*3+1)*team_size;
-      expected_result+= val;
-    }
-    ASSERT_EQ( size_t( expected_result ), size_t( total ) ); //printf("team_broadcast with value -- expected_result=%d, total=%d\n",expected_result, total);
+    Kokkos::parallel_reduce(policy_type(league_size, team_size), functor,
+                            total);
 
-    //team_broadcast with funtion object
+    value_type expected_result = 0;
+    for (unsigned int i = 0; i < league_size; i++) {
+      value_type val = ((i % team_size) * 3 + 1) * team_size;
+      expected_result += val;
+    }
+    ASSERT_EQ(size_t(expected_result),
+              size_t(total));  // printf("team_broadcast with value --
+                               // expected_result=%d,
+                               // total=%d\n",expected_result, total);
+
+    // team_broadcast with function object
     total = 0;
 
-    Kokkos::parallel_reduce( policy_type_f( league_size, team_size ), functor, total );
+    Kokkos::parallel_reduce(policy_type_f(league_size, team_size), functor,
+                            total);
 
     expected_result = 0;
-    for (unsigned int i=0; i<league_size; i++){
-      value_type val  = ((i%team_size)*3+1)*2*team_size;
-      expected_result+= val;
+    for (unsigned int i = 0; i < league_size; i++) {
+      value_type val = ((i % team_size) * 3 + 1) * 2 * team_size;
+      expected_result += val;
     }
-    ASSERT_EQ( size_t( expected_result ), size_t( total ) ); //printf("team_broadcast with funtion object -- expected_result=%d, total=%d\n",expected_result, total);
+    ASSERT_EQ(size_t(expected_result),
+              size_t(total));  // printf("team_broadcast with function object --
+                               // expected_result=%d,
+                               // total=%d\n",expected_result, total);
   }
 };
 
-template<class ExecSpace>
+template <class ExecSpace>
 struct TestScratchAlignment {
   struct TestScalar {
-    double x,y,z;
+    double x, y, z;
   };
   TestScratchAlignment() {
     test(true);
     test(false);
   }
-  typedef Kokkos::View<TestScalar*,typename ExecSpace::scratch_memory_space> ScratchView;
-  typedef Kokkos::View<int*,typename ExecSpace::scratch_memory_space> ScratchViewInt;
+  typedef Kokkos::View<TestScalar *, typename ExecSpace::scratch_memory_space>
+      ScratchView;
+  typedef Kokkos::View<int *, typename ExecSpace::scratch_memory_space>
+      ScratchViewInt;
   void test(bool allocate_small) {
     int shmem_size = ScratchView::shmem_size(11);
-    if(allocate_small) shmem_size += ScratchViewInt::shmem_size(1);
-    Kokkos::parallel_for(Kokkos::TeamPolicy<ExecSpace>(1,1).set_scratch_size(0,Kokkos::PerTeam(shmem_size)),
-     KOKKOS_LAMBDA (const typename Kokkos::TeamPolicy<ExecSpace>::member_type& team) {
-     if(allocate_small) ScratchViewInt p(team.team_scratch(0),1);
-     ScratchView a(team.team_scratch(0),11);
-     if(ptrdiff_t(a.data())%sizeof(TestScalar)!=0)
-       Kokkos::abort("Error: invalid scratch view alignment\n");
-    });
+    if (allocate_small) shmem_size += ScratchViewInt::shmem_size(1);
+    Kokkos::parallel_for(
+        Kokkos::TeamPolicy<ExecSpace>(1, 1).set_scratch_size(
+            0, Kokkos::PerTeam(shmem_size)),
+        KOKKOS_LAMBDA(
+            const typename Kokkos::TeamPolicy<ExecSpace>::member_type &team) {
+          if (allocate_small) ScratchViewInt p(team.team_scratch(0), 1);
+          ScratchView a(team.team_scratch(0), 11);
+          if (ptrdiff_t(a.data()) % sizeof(TestScalar) != 0)
+            Kokkos::abort("Error: invalid scratch view alignment\n");
+        });
     Kokkos::fence();
   }
 };
 
-} // namespace
+}  // namespace
 
-} // namespace Test
+}  // namespace Test
 
 /*--------------------------------------------------------------------------*/
diff --git a/lib/kokkos/core/unit_test/TestTeamTeamSize.hpp b/lib/kokkos/core/unit_test/TestTeamTeamSize.hpp
index f9d5add5d0..4a9b7c41a4 100644
--- a/lib/kokkos/core/unit_test/TestTeamTeamSize.hpp
+++ b/lib/kokkos/core/unit_test/TestTeamTeamSize.hpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -51,96 +52,172 @@
 namespace Test {
 
 namespace {
-  template<class T,int N>
-  class MyArray {
-  public:
-    T values[N];
-    KOKKOS_INLINE_FUNCTION
-    void operator+= (const MyArray& src) { for(int i=0; i<N; i++) values[i] += src.values[i]; }
-    KOKKOS_INLINE_FUNCTION
-    void operator=  (const MyArray& src) { for(int i=0; i<N; i++) values[i] =  src.values[i]; }
-    KOKKOS_INLINE_FUNCTION
-    void operator+= (const volatile MyArray& src) volatile { for(int i=0; i<N; i++) values[i] += src.values[i]; }
-    KOKKOS_INLINE_FUNCTION
-    void operator=  (const volatile MyArray& src) volatile { for(int i=0; i<N; i++) values[i] =  src.values[i]; }
-  };
-
-  template<class T,int N, class PolicyType, int S>
-  struct FunctorFor {
-    double static_array[S];
-    KOKKOS_INLINE_FUNCTION
-    void operator() (const typename PolicyType::member_type& team) const {
-    }
-  };
-  template<class T,int N, class PolicyType, int S>
-  struct FunctorReduce {
-    double static_array[S];
-    KOKKOS_INLINE_FUNCTION
-    void operator() (const typename PolicyType::member_type& team, MyArray<T,N>& lval) const {
-      for(int j=0; j<N; j++)
-        lval.values[j] += 1 + lval.values[0];
-    }
-  };
-}
+template <class T, int N>
+class MyArray {
+ public:
+  T values[N];
+  KOKKOS_INLINE_FUNCTION
+  void operator+=(const MyArray& src) {
+    for (int i = 0; i < N; i++) values[i] += src.values[i];
+  }
+  KOKKOS_INLINE_FUNCTION
+  void operator=(const MyArray& src) {
+    for (int i = 0; i < N; i++) values[i] = src.values[i];
+  }
+  KOKKOS_INLINE_FUNCTION
+  void operator+=(const volatile MyArray& src) volatile {
+    for (int i = 0; i < N; i++) values[i] += src.values[i];
+  }
+  KOKKOS_INLINE_FUNCTION
+  void operator=(const volatile MyArray& src) volatile {
+    for (int i = 0; i < N; i++) values[i] = src.values[i];
+  }
+};
 
+template <class T, int N, class PolicyType, int S>
+struct FunctorFor {
+  double static_array[S];
+  KOKKOS_INLINE_FUNCTION
+  void operator()(const typename PolicyType::member_type& team) const {}
+};
+template <class T, int N, class PolicyType, int S>
+struct FunctorReduce {
+  double static_array[S];
+  KOKKOS_INLINE_FUNCTION
+  void operator()(const typename PolicyType::member_type& team,
+                  MyArray<T, N>& lval) const {
+    for (int j = 0; j < N; j++) lval.values[j] += 1 + lval.values[0];
+  }
+};
+}  // namespace
 
 typedef Kokkos::TeamPolicy<TEST_EXECSPACE> policy_type;
-typedef Kokkos::TeamPolicy<TEST_EXECSPACE, Kokkos::LaunchBounds<128,8> > policy_type_128_8;
-typedef Kokkos::TeamPolicy<TEST_EXECSPACE, Kokkos::LaunchBounds<1024,2> > policy_type_1024_2;
+typedef Kokkos::TeamPolicy<TEST_EXECSPACE, Kokkos::LaunchBounds<128, 8> >
+    policy_type_128_8;
+typedef Kokkos::TeamPolicy<TEST_EXECSPACE, Kokkos::LaunchBounds<1024, 2> >
+    policy_type_1024_2;
 
-template<class T, int N, class PolicyType, int S>
+template <class T, int N, class PolicyType, int S>
 void test_team_policy_max_recommended_static_size(int scratch_size) {
-  PolicyType p = PolicyType(10000, Kokkos::AUTO, 4).set_scratch_size(0,Kokkos::PerTeam(scratch_size));
-  int team_size_max_for = p.team_size_max(FunctorFor<T,N,PolicyType,S>(),Kokkos::ParallelForTag());
-  int team_size_rec_for = p.team_size_recommended(FunctorFor<T,N,PolicyType,S>(),Kokkos::ParallelForTag());
-  int team_size_max_reduce = p.team_size_max(FunctorReduce<T,N,PolicyType,S>(),Kokkos::ParallelReduceTag());
-  int team_size_rec_reduce = p.team_size_recommended(FunctorReduce<T,N,PolicyType,S>(),Kokkos::ParallelReduceTag());
+  PolicyType p = PolicyType(10000, Kokkos::AUTO, 4)
+                     .set_scratch_size(0, Kokkos::PerTeam(scratch_size));
+  int team_size_max_for = p.team_size_max(FunctorFor<T, N, PolicyType, S>(),
+                                          Kokkos::ParallelForTag());
+  int team_size_rec_for = p.team_size_recommended(
+      FunctorFor<T, N, PolicyType, S>(), Kokkos::ParallelForTag());
+  int team_size_max_reduce = p.team_size_max(
+      FunctorReduce<T, N, PolicyType, S>(), Kokkos::ParallelReduceTag());
+  int team_size_rec_reduce = p.team_size_recommended(
+      FunctorReduce<T, N, PolicyType, S>(), Kokkos::ParallelReduceTag());
 
-  ASSERT_TRUE( team_size_max_for >= team_size_rec_for );
-  ASSERT_TRUE( team_size_max_reduce >= team_size_rec_reduce );
-  ASSERT_TRUE( team_size_max_for >= team_size_max_reduce );
+  ASSERT_TRUE(team_size_max_for >= team_size_rec_for);
+  ASSERT_TRUE(team_size_max_reduce >= team_size_rec_reduce);
+  ASSERT_TRUE(team_size_max_for >= team_size_max_reduce);
 
-  Kokkos::parallel_for(PolicyType(10000, team_size_max_for, 4).set_scratch_size(0,Kokkos::PerTeam(scratch_size)),
-                       FunctorFor<T,N,PolicyType,S>());
-  Kokkos::parallel_for(PolicyType(10000, team_size_rec_for, 4).set_scratch_size(0,Kokkos::PerTeam(scratch_size)),
-                       FunctorFor<T,N,PolicyType,S>());
-  MyArray<T,N> val;
-  Kokkos::parallel_reduce(PolicyType(10000, team_size_max_reduce, 4).set_scratch_size(0,Kokkos::PerTeam(scratch_size)),
-                       FunctorReduce<T,N,PolicyType,S>(),val);
-  Kokkos::parallel_reduce(PolicyType(10000, team_size_rec_reduce, 4).set_scratch_size(0,Kokkos::PerTeam(scratch_size)),
-                       FunctorReduce<T,N,PolicyType,S>(),val);
+  Kokkos::parallel_for(PolicyType(10000, team_size_max_for, 4)
+                           .set_scratch_size(0, Kokkos::PerTeam(scratch_size)),
+                       FunctorFor<T, N, PolicyType, S>());
+  Kokkos::parallel_for(PolicyType(10000, team_size_rec_for, 4)
+                           .set_scratch_size(0, Kokkos::PerTeam(scratch_size)),
+                       FunctorFor<T, N, PolicyType, S>());
+  MyArray<T, N> val;
+  Kokkos::parallel_reduce(
+      PolicyType(10000, team_size_max_reduce, 4)
+          .set_scratch_size(0, Kokkos::PerTeam(scratch_size)),
+      FunctorReduce<T, N, PolicyType, S>(), val);
+  Kokkos::parallel_reduce(
+      PolicyType(10000, team_size_rec_reduce, 4)
+          .set_scratch_size(0, Kokkos::PerTeam(scratch_size)),
+      FunctorReduce<T, N, PolicyType, S>(), val);
   Kokkos::fence();
 }
 
-template<class T, int N, class PolicyType>
+template <class T, int N, class PolicyType>
 void test_team_policy_max_recommended(int scratch_size) {
-  test_team_policy_max_recommended_static_size<T,N,PolicyType,1>(scratch_size);
-  test_team_policy_max_recommended_static_size<T,N,PolicyType,1000>(scratch_size);
+  test_team_policy_max_recommended_static_size<T, N, PolicyType, 1>(
+      scratch_size);
+  test_team_policy_max_recommended_static_size<T, N, PolicyType, 1000>(
+      scratch_size);
 }
 
-TEST_F( TEST_CATEGORY, team_policy_max_recommended )
-{
+TEST(TEST_CATEGORY, team_policy_max_recommended) {
   int max_scratch_size = policy_type::scratch_size_max(0);
-  test_team_policy_max_recommended<double,2,policy_type>(0);
-  test_team_policy_max_recommended<double,2,policy_type>(max_scratch_size/3);
-  test_team_policy_max_recommended<double,2,policy_type>(max_scratch_size);
-  test_team_policy_max_recommended<double,2,policy_type_128_8>(0);
-  test_team_policy_max_recommended<double,2,policy_type_128_8>(max_scratch_size/3/8);
-  test_team_policy_max_recommended<double,2,policy_type_128_8>(max_scratch_size/8);
-  test_team_policy_max_recommended<double,2,policy_type_1024_2>(0);
-  test_team_policy_max_recommended<double,2,policy_type_1024_2>(max_scratch_size/3/2);
-  test_team_policy_max_recommended<double,2,policy_type_1024_2>(max_scratch_size/2);
+  test_team_policy_max_recommended<double, 2, policy_type>(0);
+  test_team_policy_max_recommended<double, 2, policy_type>(max_scratch_size /
+                                                           3);
+  test_team_policy_max_recommended<double, 2, policy_type>(max_scratch_size);
+  test_team_policy_max_recommended<double, 2, policy_type_128_8>(0);
+  test_team_policy_max_recommended<double, 2, policy_type_128_8>(
+      max_scratch_size / 3 / 8);
+  test_team_policy_max_recommended<double, 2, policy_type_128_8>(
+      max_scratch_size / 8);
+  test_team_policy_max_recommended<double, 2, policy_type_1024_2>(0);
+  test_team_policy_max_recommended<double, 2, policy_type_1024_2>(
+      max_scratch_size / 3 / 2);
+  test_team_policy_max_recommended<double, 2, policy_type_1024_2>(
+      max_scratch_size / 2);
 
-  test_team_policy_max_recommended<double,16,policy_type>(0);
-  test_team_policy_max_recommended<double,16,policy_type>(max_scratch_size/3);
-  test_team_policy_max_recommended<double,16,policy_type>(max_scratch_size);
-  test_team_policy_max_recommended<double,16,policy_type_128_8>(0);
-  test_team_policy_max_recommended<double,16,policy_type_128_8>(max_scratch_size/3/8);
-  test_team_policy_max_recommended<double,16,policy_type_128_8>(max_scratch_size/8);
-  test_team_policy_max_recommended<double,16,policy_type_1024_2>(0);
-  test_team_policy_max_recommended<double,16,policy_type_1024_2>(max_scratch_size/3/2);
-  test_team_policy_max_recommended<double,16,policy_type_1024_2>(max_scratch_size/2);
+  test_team_policy_max_recommended<double, 16, policy_type>(0);
+  test_team_policy_max_recommended<double, 16, policy_type>(max_scratch_size /
+                                                            3);
+  test_team_policy_max_recommended<double, 16, policy_type>(max_scratch_size);
+  test_team_policy_max_recommended<double, 16, policy_type_128_8>(0);
+  test_team_policy_max_recommended<double, 16, policy_type_128_8>(
+      max_scratch_size / 3 / 8);
+  test_team_policy_max_recommended<double, 16, policy_type_128_8>(
+      max_scratch_size / 8);
+  test_team_policy_max_recommended<double, 16, policy_type_1024_2>(0);
+  test_team_policy_max_recommended<double, 16, policy_type_1024_2>(
+      max_scratch_size / 3 / 2);
+  test_team_policy_max_recommended<double, 16, policy_type_1024_2>(
+      max_scratch_size / 2);
 }
 
+template <typename TeamHandleType, typename ReducerValueType>
+struct PrintFunctor1 {
+  KOKKOS_INLINE_FUNCTION void operator()(const TeamHandleType& team,
+                                         ReducerValueType&) const {
+    printf("Test %i %i\n", int(team.league_rank()), int(team.team_rank()));
+  }
+};
 
-} // namespace Test
+template <typename TeamHandleType, typename ReducerValueType>
+struct PrintFunctor2 {
+  KOKKOS_INLINE_FUNCTION void operator()(const TeamHandleType& team,
+                                         ReducerValueType& teamVal) const {
+    printf("Test %i %i\n", int(team.league_rank()), int(team.team_rank()));
+    teamVal += 1;
+  }
+};
+
+TEST(TEST_CATEGORY, team_policy_max_scalar_without_plus_equal_k) {
+  using ExecSpace           = Kokkos::DefaultExecutionSpace;
+  using ReducerType         = Kokkos::MinMax<double, Kokkos::HostSpace>;
+  using ReducerValueType    = typename ReducerType::value_type;
+  using DynamicScheduleType = Kokkos::Schedule<Kokkos::Dynamic>;
+  using TeamPolicyType = Kokkos::TeamPolicy<ExecSpace, DynamicScheduleType>;
+  using TeamHandleType = typename TeamPolicyType::member_type;
+
+  static constexpr int num_teams = 17;
+  ReducerValueType val;
+  ReducerType reducer(val);
+
+  TeamPolicyType p(num_teams, Kokkos::AUTO);
+  PrintFunctor1<TeamHandleType, ReducerValueType> f1;
+  const int max_team_size =
+      p.team_size_max(f1, reducer, Kokkos::ParallelReduceTag());
+
+  const int recommended_team_size =
+      p.team_size_recommended(f1, reducer, Kokkos::ParallelReduceTag());
+
+  printf("Max TeamSize: %i Recommended TeamSize: %i\n", max_team_size,
+         recommended_team_size);
+
+  Kokkos::parallel_reduce(p, f1, reducer);
+  double sum;
+  Kokkos::parallel_reduce(TeamPolicyType(num_teams, Kokkos::AUTO),
+                          PrintFunctor2<TeamHandleType, double>{}, sum);
+  printf("Sum: %lf\n", sum);
+}
+
+}  // namespace Test
diff --git a/lib/kokkos/core/unit_test/TestTeamVector.hpp b/lib/kokkos/core/unit_test/TestTeamVector.hpp
index 45433012f9..4cf0ceaf47 100644
--- a/lib/kokkos/core/unit_test/TestTeamVector.hpp
+++ b/lib/kokkos/core/unit_test/TestTeamVector.hpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -57,66 +58,66 @@ struct my_complex {
 
   KOKKOS_INLINE_FUNCTION
   my_complex() {
-    re = 0.0;
-    im = 0.0;
+    re    = 0.0;
+    im    = 0.0;
     dummy = 0;
   }
 
   KOKKOS_INLINE_FUNCTION
-  my_complex( const my_complex & src ) {
-    re = src.re;
-    im = src.im;
+  my_complex(const my_complex &src) {
+    re    = src.re;
+    im    = src.im;
     dummy = src.dummy;
   }
 
   KOKKOS_INLINE_FUNCTION
-  my_complex & operator=( const my_complex & src ) {
-    re = src.re;
-    im = src.im;
+  my_complex &operator=(const my_complex &src) {
+    re    = src.re;
+    im    = src.im;
     dummy = src.dummy;
-    return *this ;
+    return *this;
   }
 
   KOKKOS_INLINE_FUNCTION
-  my_complex & operator=( const volatile my_complex & src ) {
-    re = src.re;
-    im = src.im;
+  my_complex &operator=(const volatile my_complex &src) {
+    re    = src.re;
+    im    = src.im;
     dummy = src.dummy;
-    return *this ;
+    return *this;
   }
 
   KOKKOS_INLINE_FUNCTION
-  volatile my_complex & operator=( const my_complex & src ) volatile {
-    re = src.re;
-    im = src.im;
+  volatile my_complex &operator=(const my_complex &src) volatile {
+    re    = src.re;
+    im    = src.im;
     dummy = src.dummy;
-    return *this ;
+    return *this;
   }
 
   KOKKOS_INLINE_FUNCTION
-  volatile my_complex & operator=( const volatile my_complex & src ) volatile {
-    re = src.re;
-    im = src.im;
+  volatile my_complex &operator=(const volatile my_complex &src) volatile {
+    re    = src.re;
+    im    = src.im;
     dummy = src.dummy;
-    return *this ;
+    return *this;
   }
 
   KOKKOS_INLINE_FUNCTION
-  my_complex( const volatile my_complex & src ) {
-    re = src.re;
-    im = src.im;
+  my_complex(const volatile my_complex &src) {
+    re    = src.re;
+    im    = src.im;
     dummy = src.dummy;
   }
 
   KOKKOS_INLINE_FUNCTION
-  my_complex( const double & val ) {
-    re = val;
-    im = 0.0;
+  my_complex(const double &val) {
+    re    = val;
+    im    = 0.0;
     dummy = 0;
   }
 
   KOKKOS_INLINE_FUNCTION
-  my_complex & operator+=( const my_complex & src ) {
+  my_complex &operator+=(const my_complex &src) {
     re += src.re;
     im += src.im;
     dummy += src.dummy;
@@ -124,14 +125,14 @@ struct my_complex {
   }
 
   KOKKOS_INLINE_FUNCTION
-  void operator+=( const volatile my_complex & src ) volatile {
+  void operator+=(const volatile my_complex &src) volatile {
     re += src.re;
     im += src.im;
     dummy += src.dummy;
   }
 
   KOKKOS_INLINE_FUNCTION
-  my_complex operator +( const my_complex & src ) {
+  my_complex operator+(const my_complex &src) {
     my_complex tmp = *this;
     tmp.re += src.re;
     tmp.im += src.im;
@@ -140,7 +141,7 @@ struct my_complex {
   }
 
   KOKKOS_INLINE_FUNCTION
-  my_complex operator+( const volatile my_complex & src ) volatile {
+  my_complex operator+(const volatile my_complex &src) volatile {
     my_complex tmp = *this;
     tmp.re += src.re;
     tmp.im += src.im;
@@ -149,130 +150,133 @@ struct my_complex {
   }
 
   KOKKOS_INLINE_FUNCTION
-  my_complex & operator*=( const my_complex & src ) {
+  my_complex &operator*=(const my_complex &src) {
     double re_tmp = re * src.re - im * src.im;
     double im_tmp = re * src.im + im * src.re;
-    re = re_tmp;
-    im = im_tmp;
+    re            = re_tmp;
+    im            = im_tmp;
     dummy *= src.dummy;
     return *this;
   }
 
   KOKKOS_INLINE_FUNCTION
-  void operator*=( const volatile my_complex & src ) volatile {
+  void operator*=(const volatile my_complex &src) volatile {
     double re_tmp = re * src.re - im * src.im;
     double im_tmp = re * src.im + im * src.re;
-    re = re_tmp;
-    im = im_tmp;
+    re            = re_tmp;
+    im            = im_tmp;
     dummy *= src.dummy;
   }
 
   KOKKOS_INLINE_FUNCTION
-  bool operator==( const my_complex & src ) {
-    return ( re == src.re ) && ( im == src.im ) && ( dummy == src.dummy );
+  bool operator==(const my_complex &src) {
+    return (re == src.re) && (im == src.im) && (dummy == src.dummy);
   }
 
   KOKKOS_INLINE_FUNCTION
-  bool operator!=( const my_complex & src ) {
-    return ( re != src.re ) || ( im != src.im ) || ( dummy != src.dummy );
+  bool operator!=(const my_complex &src) {
+    return (re != src.re) || (im != src.im) || (dummy != src.dummy);
   }
 
   KOKKOS_INLINE_FUNCTION
-  bool operator!=( const double & val ) {
-    return ( re != val ) || ( im != 0 ) || ( dummy != 0 );
+  bool operator!=(const double &val) {
+    return (re != val) || (im != 0) || (dummy != 0);
   }
 
   KOKKOS_INLINE_FUNCTION
-  my_complex & operator=( const int & val ) {
-    re = val;
-    im = 0.0;
+  my_complex &operator=(const int &val) {
+    re    = val;
+    im    = 0.0;
     dummy = 0;
     return *this;
   }
 
   KOKKOS_INLINE_FUNCTION
-  my_complex & operator=( const double & val ) {
-    re = val;
-    im = 0.0;
+  my_complex &operator=(const double &val) {
+    re    = val;
+    im    = 0.0;
     dummy = 0;
     return *this;
   }
 
   KOKKOS_INLINE_FUNCTION
-  operator double() {
-    return re;
-  }
+  operator double() { return re; }
 };
-}
+}  // namespace TestTeamVector
 
 namespace Kokkos {
-template<>
-struct reduction_identity<TestTeamVector::my_complex > {
+template <>
+struct reduction_identity<TestTeamVector::my_complex> {
   typedef reduction_identity<double> t_red_ident;
-  KOKKOS_FORCEINLINE_FUNCTION static TestTeamVector::my_complex sum()
-      {return TestTeamVector::my_complex(t_red_ident::sum());}
-  KOKKOS_FORCEINLINE_FUNCTION static TestTeamVector::my_complex prod()
-      {return TestTeamVector::my_complex(t_red_ident::prod());}
+  KOKKOS_FORCEINLINE_FUNCTION static TestTeamVector::my_complex sum() {
+    return TestTeamVector::my_complex(t_red_ident::sum());
+  }
+  KOKKOS_FORCEINLINE_FUNCTION static TestTeamVector::my_complex prod() {
+    return TestTeamVector::my_complex(t_red_ident::prod());
+  }
 };
-}
+}  // namespace Kokkos
 
 namespace TestTeamVector {
 
-template< typename Scalar, class ExecutionSpace >
+template <typename Scalar, class ExecutionSpace>
 struct functor_team_for {
-  typedef Kokkos::TeamPolicy< ExecutionSpace > policy_type;
+  typedef Kokkos::TeamPolicy<ExecutionSpace> policy_type;
   typedef ExecutionSpace execution_space;
 
-  Kokkos::View< int, Kokkos::LayoutLeft, ExecutionSpace > flag;
+  Kokkos::View<int, Kokkos::LayoutLeft, ExecutionSpace> flag;
 
-  functor_team_for( Kokkos::View< int, Kokkos::LayoutLeft, ExecutionSpace > flag_ ) : flag( flag_ ) {}
+  functor_team_for(Kokkos::View<int, Kokkos::LayoutLeft, ExecutionSpace> flag_)
+      : flag(flag_) {}
 
   typedef typename ExecutionSpace::scratch_memory_space shmem_space;
-  typedef Kokkos::View< Scalar*, shmem_space, Kokkos::MemoryUnmanaged > shared_int;
-  unsigned team_shmem_size( int team_size ) const { return shared_int::shmem_size(team_size*13); }
+  typedef Kokkos::View<Scalar *, shmem_space, Kokkos::MemoryUnmanaged>
+      shared_int;
+  unsigned team_shmem_size(int team_size) const {
+    return shared_int::shmem_size(team_size * 13);
+  }
 
   KOKKOS_INLINE_FUNCTION
-  void operator()( typename policy_type::member_type team ) const {
+  void operator()(typename policy_type::member_type team) const {
     typedef typename shmem_space::size_type size_type;
     const size_type shmemSize = team.team_size() * 13;
-    shared_int values = shared_int( team.team_shmem(), shmemSize );
+    shared_int values         = shared_int(team.team_shmem(), shmemSize);
 
-    if ( values.data() == nullptr || values.extent(0) < shmemSize ) {
-      printf( "FAILED to allocate shared memory of size %u\n",
-              static_cast<unsigned int>( shmemSize ) );
-    }
-    else {
+    if (values.data() == nullptr || values.extent(0) < shmemSize) {
+      printf("FAILED to allocate shared memory of size %u\n",
+             static_cast<unsigned int>(shmemSize));
+    } else {
       // Initialize shared memory.
-      values( team.team_rank() ) = 0;
+      values(team.team_rank()) = 0;
 
       // Accumulate value into per thread shared memory.
       // This is non blocking.
-      Kokkos::parallel_for( Kokkos::TeamThreadRange( team, 131 ), [&] ( int i )
-      {
-        values( team.team_rank() ) += i - team.league_rank() + team.league_size() + team.team_size();
+      Kokkos::parallel_for(Kokkos::TeamThreadRange(team, 131), [&](int i) {
+        values(team.team_rank()) +=
+            i - team.league_rank() + team.league_size() + team.team_size();
       });
 
       // Wait for all memory to be written.
       team.team_barrier();
 
       // One thread per team executes the comparison.
-      Kokkos::single( Kokkos::PerTeam( team ), [&] ()
-      {
-        Scalar test = 0;
+      Kokkos::single(Kokkos::PerTeam(team), [&]() {
+        Scalar test  = 0;
         Scalar value = 0;
 
-        for ( int i = 0; i < 131; ++i ) {
-          test += i - team.league_rank() + team.league_size() + team.team_size();
+        for (int i = 0; i < 131; ++i) {
+          test +=
+              i - team.league_rank() + team.league_size() + team.team_size();
         }
 
-        for ( int i = 0; i < team.team_size(); ++i ) {
-          value += values( i );
+        for (int i = 0; i < team.team_size(); ++i) {
+          value += values(i);
         }
 
-        if ( test != value ) {
-          printf ( "FAILED team_parallel_for %i %i %f %f\n",
-                   team.league_rank(), team.team_rank(),
-                   static_cast<double>( test ), static_cast<double>( value ) );
+        if (test != value) {
+          printf("FAILED team_parallel_for %i %i %f %f\n", team.league_rank(),
+                 team.team_rank(), static_cast<double>(test),
+                 static_cast<double>(value));
           flag() = 1;
         }
       });
@@ -280,58 +284,69 @@ struct functor_team_for {
   }
 };
 
-template< typename Scalar, class ExecutionSpace >
+template <typename Scalar, class ExecutionSpace>
 struct functor_team_reduce {
-  typedef Kokkos::TeamPolicy< ExecutionSpace > policy_type;
+  typedef Kokkos::TeamPolicy<ExecutionSpace> policy_type;
   typedef ExecutionSpace execution_space;
 
-  Kokkos::View< int, Kokkos::LayoutLeft, ExecutionSpace > flag;
+  Kokkos::View<int, Kokkos::LayoutLeft, ExecutionSpace> flag;
 
-  functor_team_reduce( Kokkos::View< int, Kokkos::LayoutLeft, ExecutionSpace > flag_ ) : flag( flag_ ) {}
+  functor_team_reduce(
+      Kokkos::View<int, Kokkos::LayoutLeft, ExecutionSpace> flag_)
+      : flag(flag_) {}
 
   typedef typename ExecutionSpace::scratch_memory_space shmem_space;
-  typedef Kokkos::View< Scalar*, shmem_space, Kokkos::MemoryUnmanaged > shared_scalar_t;
-  unsigned team_shmem_size( int team_size ) const { return shared_scalar_t::shmem_size(team_size*13); }
+  typedef Kokkos::View<Scalar *, shmem_space, Kokkos::MemoryUnmanaged>
+      shared_scalar_t;
+  unsigned team_shmem_size(int team_size) const {
+    return shared_scalar_t::shmem_size(team_size * 13);
+  }
 
   KOKKOS_INLINE_FUNCTION
-  void operator()( typename policy_type::member_type team ) const {
+  void operator()(typename policy_type::member_type team) const {
     Scalar value = Scalar();
-    shared_scalar_t shared_value(team.team_scratch(0),1);
+    shared_scalar_t shared_value(team.team_scratch(0), 1);
 
-    Kokkos::parallel_reduce( Kokkos::TeamThreadRange( team, 131 ), [&] ( int i, Scalar & val )
-    {
-      val += i - team.league_rank() + team.league_size() + team.team_size();
-    }, value );
-    
-    Kokkos::parallel_reduce( Kokkos::TeamThreadRange( team, 131 ), [&] ( int i, Scalar & val )
-    {
-      val += i - team.league_rank() + team.league_size() + team.team_size();
-    }, shared_value(0) );
+    Kokkos::parallel_reduce(
+        Kokkos::TeamThreadRange(team, 131),
+        [&](int i, Scalar &val) {
+          val += i - team.league_rank() + team.league_size() + team.team_size();
+        },
+        value);
+
+    Kokkos::parallel_reduce(
+        Kokkos::TeamThreadRange(team, 131),
+        [&](int i, Scalar &val) {
+          val += i - team.league_rank() + team.league_size() + team.team_size();
+        },
+        shared_value(0));
 
     team.team_barrier();
 
-    Kokkos::single( Kokkos::PerTeam( team ), [&] ()
-    {
+    Kokkos::single(Kokkos::PerTeam(team), [&]() {
       Scalar test = 0;
 
-      for ( int i = 0; i < 131; ++i ) {
+      for (int i = 0; i < 131; ++i) {
         test += i - team.league_rank() + team.league_size() + team.team_size();
       }
 
-      if ( test != value ) {
-        if ( team.league_rank() == 0 ) {
-          printf( "FAILED team_parallel_reduce %i %i %lf %lf %lu\n",
-                  team.league_rank(), team.team_rank(),
-                  static_cast<double>( test ), static_cast<double>( value ), sizeof( Scalar ) );
+      if (test != value) {
+        if (team.league_rank() == 0) {
+          printf("FAILED team_parallel_reduce %i %i %lf %lf %lu\n",
+                 team.league_rank(), team.team_rank(),
+                 static_cast<double>(test), static_cast<double>(value),
+                 sizeof(Scalar));
         }
 
         flag() = 1;
       }
-      if ( test != shared_value(0) ) {
-        if ( team.league_rank() == 0 ) {
-          printf( "FAILED team_parallel_reduce with shared result %i %i %lf %lf %lu\n",
-                  team.league_rank(), team.team_rank(),
-                  static_cast<double>( test ), static_cast<double>( shared_value(0) ), sizeof( Scalar ) );
+      if (test != shared_value(0)) {
+        if (team.league_rank() == 0) {
+          printf(
+              "FAILED team_parallel_reduce with shared result %i %i %lf %lf "
+              "%lu\n",
+              team.league_rank(), team.team_rank(), static_cast<double>(test),
+              static_cast<double>(shared_value(0)), sizeof(Scalar));
         }
 
         flag() = 1;
@@ -340,59 +355,65 @@ struct functor_team_reduce {
   }
 };
 
-template< typename Scalar, class ExecutionSpace >
+template <typename Scalar, class ExecutionSpace>
 struct functor_team_reduce_reducer {
-  typedef Kokkos::TeamPolicy< ExecutionSpace > policy_type;
+  typedef Kokkos::TeamPolicy<ExecutionSpace> policy_type;
   typedef ExecutionSpace execution_space;
 
-  Kokkos::View< int, Kokkos::LayoutLeft, ExecutionSpace > flag;
+  Kokkos::View<int, Kokkos::LayoutLeft, ExecutionSpace> flag;
 
-  functor_team_reduce_reducer( Kokkos::View< int, Kokkos::LayoutLeft, ExecutionSpace > flag_ ) : flag( flag_ ) {}
+  functor_team_reduce_reducer(
+      Kokkos::View<int, Kokkos::LayoutLeft, ExecutionSpace> flag_)
+      : flag(flag_) {}
 
   typedef typename ExecutionSpace::scratch_memory_space shmem_space;
-  typedef Kokkos::View< Scalar*, shmem_space, Kokkos::MemoryUnmanaged > shared_scalar_t;
-  unsigned team_shmem_size( int team_size ) const { return shared_scalar_t::shmem_size(team_size*13); }
+  typedef Kokkos::View<Scalar *, shmem_space, Kokkos::MemoryUnmanaged>
+      shared_scalar_t;
+  unsigned team_shmem_size(int team_size) const {
+    return shared_scalar_t::shmem_size(team_size * 13);
+  }
 
   KOKKOS_INLINE_FUNCTION
-  void operator()( typename policy_type::member_type team ) const {
+  void operator()(typename policy_type::member_type team) const {
     Scalar value = 0;
-    shared_scalar_t shared_value(team.team_scratch(0),1);
+    shared_scalar_t shared_value(team.team_scratch(0), 1);
 
-    Kokkos::parallel_reduce( Kokkos::TeamThreadRange( team, 131 ), [&] ( int i, Scalar & val )
-    {
-      val += i - team.league_rank() + team.league_size() + team.team_size();
-    },
-      Kokkos::Sum<Scalar>(value)
-    );
-    
-    Kokkos::parallel_reduce( Kokkos::TeamThreadRange( team, 131 ), [&] ( int i, Scalar & val )
-    {
-      val += i - team.league_rank() + team.league_size() + team.team_size();
-    },
-      Kokkos::Sum<Scalar>(shared_value(0))
-    );
+    Kokkos::parallel_reduce(
+        Kokkos::TeamThreadRange(team, 131),
+        [&](int i, Scalar &val) {
+          val += i - team.league_rank() + team.league_size() + team.team_size();
+        },
+        Kokkos::Sum<Scalar>(value));
+
+    Kokkos::parallel_reduce(
+        Kokkos::TeamThreadRange(team, 131),
+        [&](int i, Scalar &val) {
+          val += i - team.league_rank() + team.league_size() + team.team_size();
+        },
+        Kokkos::Sum<Scalar>(shared_value(0)));
 
     team.team_barrier();
 
-    Kokkos::single( Kokkos::PerTeam( team ), [&] ()
-    {
+    Kokkos::single(Kokkos::PerTeam(team), [&]() {
       Scalar test = 0;
 
-      for ( int i = 0; i < 131; ++i ) {
+      for (int i = 0; i < 131; ++i) {
         test += i - team.league_rank() + team.league_size() + team.team_size();
       }
 
-      if ( test != value ) {
-        printf( "FAILED team_vector_parallel_reduce_reducer %i %i %lf %lf\n",
-                team.league_rank(), team.team_rank(),
-                static_cast<double>( test ), static_cast<double>( value ) );
+      if (test != value) {
+        printf("FAILED team_vector_parallel_reduce_reducer %i %i %lf %lf\n",
+               team.league_rank(), team.team_rank(), static_cast<double>(test),
+               static_cast<double>(value));
 
         flag() = 1;
       }
-      if ( test != shared_value(0) ) {
-        printf( "FAILED team_vector_parallel_reduce_reducer shared value %i %i %lf %lf\n",
-                team.league_rank(), team.team_rank(),
-                static_cast<double>( test ), static_cast<double>( shared_value(0) ) );
+      if (test != shared_value(0)) {
+        printf(
+            "FAILED team_vector_parallel_reduce_reducer shared value %i %i %lf "
+            "%lf\n",
+            team.league_rank(), team.team_rank(), static_cast<double>(test),
+            static_cast<double>(shared_value(0)));
 
         flag() = 1;
       }
@@ -400,65 +421,66 @@ struct functor_team_reduce_reducer {
   }
 };
 
-template< typename Scalar, class ExecutionSpace >
+template <typename Scalar, class ExecutionSpace>
 struct functor_team_vector_for {
-  typedef Kokkos::TeamPolicy< ExecutionSpace > policy_type;
+  typedef Kokkos::TeamPolicy<ExecutionSpace> policy_type;
   typedef ExecutionSpace execution_space;
 
-  Kokkos::View< int, Kokkos::LayoutLeft, ExecutionSpace > flag;
+  Kokkos::View<int, Kokkos::LayoutLeft, ExecutionSpace> flag;
 
-  functor_team_vector_for( Kokkos::View< int, Kokkos::LayoutLeft, ExecutionSpace > flag_ ) : flag( flag_ ) {}
+  functor_team_vector_for(
+      Kokkos::View<int, Kokkos::LayoutLeft, ExecutionSpace> flag_)
+      : flag(flag_) {}
 
   typedef typename ExecutionSpace::scratch_memory_space shmem_space;
-  typedef Kokkos::View< Scalar*, shmem_space, Kokkos::MemoryUnmanaged > shared_int;
-  unsigned team_shmem_size( int team_size ) const { return shared_int::shmem_size(team_size*13); }
+  typedef Kokkos::View<Scalar *, shmem_space, Kokkos::MemoryUnmanaged>
+      shared_int;
+  unsigned team_shmem_size(int team_size) const {
+    return shared_int::shmem_size(team_size * 13);
+  }
 
   KOKKOS_INLINE_FUNCTION
-  void operator()( typename policy_type::member_type team ) const {
+  void operator()(typename policy_type::member_type team) const {
     typedef typename shared_int::size_type size_type;
 
     const size_type shmemSize = team.team_size() * 13;
-    shared_int values = shared_int( team.team_shmem(), shmemSize );
+    shared_int values         = shared_int(team.team_shmem(), shmemSize);
 
-    if ( values.data() == nullptr || values.extent(0) < shmemSize ) {
-      printf( "FAILED to allocate shared memory of size %u\n",
-              static_cast<unsigned int>( shmemSize ) );
-    }
-    else {
+    if (values.data() == nullptr || values.extent(0) < shmemSize) {
+      printf("FAILED to allocate shared memory of size %u\n",
+             static_cast<unsigned int>(shmemSize));
+    } else {
       team.team_barrier();
 
-      Kokkos::single( Kokkos::PerThread( team ), [&] ()
-      {
-        values( team.team_rank() ) = 0;
-      });
+      Kokkos::single(Kokkos::PerThread(team),
+                     [&]() { values(team.team_rank()) = 0; });
 
-      Kokkos::parallel_for( Kokkos::TeamThreadRange( team, 131 ), [&] ( int i )
-      {
-        Kokkos::single( Kokkos::PerThread( team ), [&] ()
-        {
-          values( team.team_rank() ) += i - team.league_rank() + team.league_size() + team.team_size();
+      Kokkos::parallel_for(Kokkos::TeamThreadRange(team, 131), [&](int i) {
+        Kokkos::single(Kokkos::PerThread(team), [&]() {
+          values(team.team_rank()) +=
+              i - team.league_rank() + team.league_size() + team.team_size();
         });
       });
 
       team.team_barrier();
 
-      Kokkos::single( Kokkos::PerTeam( team ), [&] ()
-      {
-        Scalar test = 0;
+      Kokkos::single(Kokkos::PerTeam(team), [&]() {
+        Scalar test  = 0;
         Scalar value = 0;
 
-        for ( int i = 0; i < 131; ++i ) {
-          test += i - team.league_rank() + team.league_size() + team.team_size();
+        for (int i = 0; i < 131; ++i) {
+          test +=
+              i - team.league_rank() + team.league_size() + team.team_size();
         }
 
-        for ( int i = 0; i < team.team_size(); ++i ) {
-          value += values( i );
+        for (int i = 0; i < team.team_size(); ++i) {
+          value += values(i);
         }
 
-        if ( test != value ) {
-          printf( "FAILED team_vector_parallel_for %i %i %f %f\n",
-                  team.league_rank(), team.team_rank(),
-                  static_cast<double>( test ), static_cast<double>( value ) );
+        if (test != value) {
+          printf("FAILED team_vector_parallel_for %i %i %f %f\n",
+                 team.league_rank(), team.team_rank(),
+                 static_cast<double>(test), static_cast<double>(value));
 
           flag() = 1;
         }
@@ -467,42 +489,49 @@ struct functor_team_vector_for {
   }
 };
 
-template< typename Scalar, class ExecutionSpace >
+template <typename Scalar, class ExecutionSpace>
 struct functor_team_vector_reduce {
-  typedef Kokkos::TeamPolicy< ExecutionSpace > policy_type;
+  typedef Kokkos::TeamPolicy<ExecutionSpace> policy_type;
   typedef ExecutionSpace execution_space;
 
-  Kokkos::View< int, Kokkos::LayoutLeft, ExecutionSpace > flag;
-  functor_team_vector_reduce( Kokkos::View< int, Kokkos::LayoutLeft, ExecutionSpace > flag_ ) : flag( flag_ ) {}
+  Kokkos::View<int, Kokkos::LayoutLeft, ExecutionSpace> flag;
+  functor_team_vector_reduce(
+      Kokkos::View<int, Kokkos::LayoutLeft, ExecutionSpace> flag_)
+      : flag(flag_) {}
 
   typedef typename ExecutionSpace::scratch_memory_space shmem_space;
-  typedef Kokkos::View< Scalar*, shmem_space, Kokkos::MemoryUnmanaged > shared_int;
-  unsigned team_shmem_size( int team_size ) const { return shared_int::shmem_size(team_size*13); }
+  typedef Kokkos::View<Scalar *, shmem_space, Kokkos::MemoryUnmanaged>
+      shared_int;
+  unsigned team_shmem_size(int team_size) const {
+    return shared_int::shmem_size(team_size * 13);
+  }
 
   KOKKOS_INLINE_FUNCTION
-  void operator()( typename policy_type::member_type team ) const {
+  void operator()(typename policy_type::member_type team) const {
     Scalar value = Scalar();
 
-    Kokkos::parallel_reduce( Kokkos::TeamThreadRange( team, 131 ), [&] ( int i, Scalar & val )
-    {
-      val += i - team.league_rank() + team.league_size() + team.team_size();
-    }, value );
+    Kokkos::parallel_reduce(
+        Kokkos::TeamThreadRange(team, 131),
+        [&](int i, Scalar &val) {
+          val += i - team.league_rank() + team.league_size() + team.team_size();
+        },
+        value);
 
     team.team_barrier();
 
-    Kokkos::single( Kokkos::PerTeam( team ), [&] ()
-    {
+    Kokkos::single(Kokkos::PerTeam(team), [&]() {
       Scalar test = 0;
 
-      for ( int i = 0; i < 131; ++i ) {
+      for (int i = 0; i < 131; ++i) {
         test += i - team.league_rank() + team.league_size() + team.team_size();
       }
 
-      if ( test != value ) {
-        if ( team.league_rank() == 0 ) {
-          printf( "FAILED team_vector_parallel_reduce %i %i %f %f %lu\n",
-                  team.league_rank(), team.team_rank(),
-                  static_cast<double>( test ), static_cast<double>( value ), sizeof( Scalar ) );
+      if (test != value) {
+        if (team.league_rank() == 0) {
+          printf("FAILED team_vector_parallel_reduce %i %i %f %f %lu\n",
+                 team.league_rank(), team.team_rank(),
+                 static_cast<double>(test), static_cast<double>(value),
+                 sizeof(Scalar));
         }
 
         flag() = 1;
@@ -511,44 +540,48 @@ struct functor_team_vector_reduce {
   }
 };
 
-template< typename Scalar, class ExecutionSpace >
+template <typename Scalar, class ExecutionSpace>
 struct functor_team_vector_reduce_reducer {
-  typedef Kokkos::TeamPolicy< ExecutionSpace > policy_type;
+  typedef Kokkos::TeamPolicy<ExecutionSpace> policy_type;
   typedef ExecutionSpace execution_space;
 
-  Kokkos::View< int, Kokkos::LayoutLeft, ExecutionSpace > flag;
+  Kokkos::View<int, Kokkos::LayoutLeft, ExecutionSpace> flag;
 
-  functor_team_vector_reduce_reducer( Kokkos::View< int, Kokkos::LayoutLeft, ExecutionSpace > flag_ ) : flag( flag_ ) {}
+  functor_team_vector_reduce_reducer(
+      Kokkos::View<int, Kokkos::LayoutLeft, ExecutionSpace> flag_)
+      : flag(flag_) {}
 
   typedef typename ExecutionSpace::scratch_memory_space shmem_space;
-  typedef Kokkos::View< Scalar*, shmem_space, Kokkos::MemoryUnmanaged > shared_int;
-  unsigned team_shmem_size( int team_size ) const { return shared_int::shmem_size(team_size*13); }
+  typedef Kokkos::View<Scalar *, shmem_space, Kokkos::MemoryUnmanaged>
+      shared_int;
+  unsigned team_shmem_size(int team_size) const {
+    return shared_int::shmem_size(team_size * 13);
+  }
 
   KOKKOS_INLINE_FUNCTION
-  void operator()( typename policy_type::member_type team ) const {
+  void operator()(typename policy_type::member_type team) const {
     Scalar value = 0;
 
-    Kokkos::parallel_reduce( Kokkos::TeamThreadRange( team, 131 ), [&] ( int i, Scalar & val )
-    {
-      val += i - team.league_rank() + team.league_size() + team.team_size();
-    },
-      Kokkos::Sum<Scalar>(value)
-    );
+    Kokkos::parallel_reduce(
+        Kokkos::TeamThreadRange(team, 131),
+        [&](int i, Scalar &val) {
+          val += i - team.league_rank() + team.league_size() + team.team_size();
+        },
+        Kokkos::Sum<Scalar>(value));
 
     team.team_barrier();
 
-    Kokkos::single( Kokkos::PerTeam( team ), [&] ()
-    {
+    Kokkos::single(Kokkos::PerTeam(team), [&]() {
       Scalar test = 0;
 
-      for ( int i = 0; i < 131; ++i ) {
-         test += i - team.league_rank() + team.league_size() + team.team_size();
+      for (int i = 0; i < 131; ++i) {
+        test += i - team.league_rank() + team.league_size() + team.team_size();
       }
 
-      if ( test != value ) {
-        printf( "FAILED team_vector_parallel_reduce_reducer %i %i %f %f\n",
-                team.league_rank(), team.team_rank(),
-                static_cast<double>( test ), static_cast<double>( value ) );
+      if (test != value) {
+        printf("FAILED team_vector_parallel_reduce_reducer %i %i %f %f\n",
+               team.league_rank(), team.team_rank(), static_cast<double>(test),
+               static_cast<double>(value));
 
         flag() = 1;
       }
@@ -556,93 +589,97 @@ struct functor_team_vector_reduce_reducer {
   }
 };
 
-template< typename Scalar, class ExecutionSpace >
+template <typename Scalar, class ExecutionSpace>
 struct functor_vec_single {
-  typedef Kokkos::TeamPolicy< ExecutionSpace > policy_type;
+  typedef Kokkos::TeamPolicy<ExecutionSpace> policy_type;
   typedef ExecutionSpace execution_space;
 
-  Kokkos::View< int, Kokkos::LayoutLeft, ExecutionSpace > flag;
+  Kokkos::View<int, Kokkos::LayoutLeft, ExecutionSpace> flag;
   int nStart;
   int nEnd;
 
-  functor_vec_single( Kokkos::View< int, Kokkos::LayoutLeft, ExecutionSpace > flag_, const int start_, const int end_ ) : 
-                           flag( flag_ ), nStart(start_), nEnd(end_) {}
+  functor_vec_single(
+      Kokkos::View<int, Kokkos::LayoutLeft, ExecutionSpace> flag_,
+      const int start_, const int end_)
+      : flag(flag_), nStart(start_), nEnd(end_) {}
 
   KOKKOS_INLINE_FUNCTION
-  void operator()( typename policy_type::member_type team ) const {
-    // Warning: this test case intentionally violates permissable semantics.
+  void operator()(typename policy_type::member_type team) const {
+    // Warning: this test case intentionally violates permissible semantics.
     // It is not valid to get references to members of the enclosing region
     // inside a parallel_for and write to it.
     Scalar value = 0;
 
-    Kokkos::parallel_for( Kokkos::ThreadVectorRange( team, nStart, nEnd ), [&] ( int i )
-    {
-      value = i; // This write is violating Kokkos semantics for nested parallelism.
-    });
+    Kokkos::parallel_for(Kokkos::ThreadVectorRange(team, nStart, nEnd),
+                         [&](int i) {
+                           value = i;  // This write is violating Kokkos
+                                       // semantics for nested parallelism.
+                         });
 
-    Kokkos::single( Kokkos::PerThread( team ), [&] ( Scalar & val )
-    {
-      val = 1;
-    }, value );
+    Kokkos::single(
+        Kokkos::PerThread(team), [&](Scalar &val) { val = 1; }, value);
 
     Scalar value2 = 0;
-    Kokkos::parallel_reduce( Kokkos::ThreadVectorRange( team, nStart, nEnd ), [&] ( int i, Scalar & val )
-    {
-      val += value;
-    }, value2 );
+    Kokkos::parallel_reduce(
+        Kokkos::ThreadVectorRange(team, nStart, nEnd),
+        [&](int i, Scalar &val) { val += value; }, value2);
 
-    if ( value2 != ( value * (nEnd-nStart) ) ) {
-      printf( "FAILED vector_single broadcast %i %i %f %f\n",
-              team.league_rank(), team.team_rank(), (double) value2, (double) value );
+    if (value2 != (value * (nEnd - nStart))) {
+      printf("FAILED vector_single broadcast %i %i %f %f\n", team.league_rank(),
+             team.team_rank(), (double)value2, (double)value);
 
       flag() = 1;
     }
   }
 };
 
-template< typename Scalar, class ExecutionSpace >
+template <typename Scalar, class ExecutionSpace>
 struct functor_vec_for {
-  typedef Kokkos::TeamPolicy< ExecutionSpace > policy_type;
+  typedef Kokkos::TeamPolicy<ExecutionSpace> policy_type;
   typedef ExecutionSpace execution_space;
 
-  Kokkos::View< int, Kokkos::LayoutLeft, ExecutionSpace > flag;
+  Kokkos::View<int, Kokkos::LayoutLeft, ExecutionSpace> flag;
 
-  functor_vec_for( Kokkos::View< int, Kokkos::LayoutLeft, ExecutionSpace > flag_ ) : flag( flag_ ) {}
+  functor_vec_for(Kokkos::View<int, Kokkos::LayoutLeft, ExecutionSpace> flag_)
+      : flag(flag_) {}
 
   typedef typename ExecutionSpace::scratch_memory_space shmem_space;
-  typedef Kokkos::View< Scalar*, shmem_space, Kokkos::MemoryUnmanaged > shared_int;
-  unsigned team_shmem_size( int team_size ) const { return shared_int::shmem_size(team_size*13); }
+  typedef Kokkos::View<Scalar *, shmem_space, Kokkos::MemoryUnmanaged>
+      shared_int;
+  unsigned team_shmem_size(int team_size) const {
+    return shared_int::shmem_size(team_size * 13);
+  }
 
   KOKKOS_INLINE_FUNCTION
-  void operator()( typename policy_type::member_type team ) const {
+  void operator()(typename policy_type::member_type team) const {
+    shared_int values = shared_int(team.team_shmem(), team.team_size() * 13);
 
-    shared_int values = shared_int( team.team_shmem(), team.team_size() * 13 );
-
-    if ( values.data() == nullptr || values.extent(0) < (unsigned) team.team_size() * 13 ) {
-      printf( "FAILED to allocate memory of size %i\n", static_cast<int>( team.team_size() * 13 ) );
+    if (values.data() == nullptr ||
+        values.extent(0) < (unsigned)team.team_size() * 13) {
+      printf("FAILED to allocate memory of size %i\n",
+             static_cast<int>(team.team_size() * 13));
       flag() = 1;
-    }
-    else {
-      Kokkos::parallel_for( Kokkos::ThreadVectorRange( team, 13 ), [&] ( int i )
-      {
-        values( 13 * team.team_rank() + i ) =
-          i - team.team_rank() - team.league_rank() + team.league_size() + team.team_size();
+    } else {
+      Kokkos::parallel_for(Kokkos::ThreadVectorRange(team, 13), [&](int i) {
+        values(13 * team.team_rank() + i) =
+            i - team.team_rank() - team.league_rank() + team.league_size() +
+            team.team_size();
       });
 
-      Kokkos::single( Kokkos::PerThread( team ), [&] ()
-      {
-        Scalar test = 0;
+      Kokkos::single(Kokkos::PerThread(team), [&]() {
+        Scalar test  = 0;
         Scalar value = 0;
 
-        for ( int i = 0; i < 13; ++i ) {
-          test += i - team.team_rank() - team.league_rank() + team.league_size() + team.team_size();
-          value += values( 13 * team.team_rank() + i );
+        for (int i = 0; i < 13; ++i) {
+          test += i - team.team_rank() - team.league_rank() +
+                  team.league_size() + team.team_size();
+          value += values(13 * team.team_rank() + i);
         }
 
-        if ( test != value ) {
-          printf( "FAILED vector_par_for %i %i %f %f\n",
-                  team.league_rank(), team.team_rank(),
-                  static_cast<double>( test ), static_cast<double>( value ) );
+        if (test != value) {
+          printf("FAILED vector_par_for %i %i %f %f\n", team.league_rank(),
+                 team.team_rank(), static_cast<double>(test),
+                 static_cast<double>(value));
 
           flag() = 1;
         }
@@ -651,34 +688,33 @@ struct functor_vec_for {
   }
 };
 
-template< typename Scalar, class ExecutionSpace >
+template <typename Scalar, class ExecutionSpace>
 struct functor_vec_red {
-  typedef Kokkos::TeamPolicy< ExecutionSpace > policy_type;
+  typedef Kokkos::TeamPolicy<ExecutionSpace> policy_type;
   typedef ExecutionSpace execution_space;
 
-  Kokkos::View< int, Kokkos::LayoutLeft, ExecutionSpace > flag;
+  Kokkos::View<int, Kokkos::LayoutLeft, ExecutionSpace> flag;
 
-  functor_vec_red( Kokkos::View< int, Kokkos::LayoutLeft, ExecutionSpace > flag_ ) : flag( flag_ ) {}
+  functor_vec_red(Kokkos::View<int, Kokkos::LayoutLeft, ExecutionSpace> flag_)
+      : flag(flag_) {}
 
   KOKKOS_INLINE_FUNCTION
-  void operator()( typename policy_type::member_type team ) const {
+  void operator()(typename policy_type::member_type team) const {
     Scalar value = 0;
 
     // When no reducer is given the default is summation.
-    Kokkos::parallel_reduce( Kokkos::ThreadVectorRange( team, 13 ), [&] ( int i, Scalar & val )
-    {
-      val += i;
-    }, value );
+    Kokkos::parallel_reduce(
+        Kokkos::ThreadVectorRange(team, 13),
+        [&](int i, Scalar &val) { val += i; }, value);
 
-    Kokkos::single( Kokkos::PerThread( team ), [&] ()
-    {
+    Kokkos::single(Kokkos::PerThread(team), [&]() {
       Scalar test = 0;
 
-      for ( int i = 0; i < 13; i++ ) test += i;
+      for (int i = 0; i < 13; i++) test += i;
 
-      if ( test != value ) {
-        printf( "FAILED vector_par_reduce %i %i %f %f\n",
-                team.league_rank(), team.team_rank(), (double) test, (double) value );
+      if (test != value) {
+        printf("FAILED vector_par_reduce %i %i %f %f\n", team.league_rank(),
+               team.team_rank(), (double)test, (double)value);
 
         flag() = 1;
       }
@@ -686,37 +722,38 @@ struct functor_vec_red {
   }
 };
 
-template< typename Scalar, class ExecutionSpace >
+template <typename Scalar, class ExecutionSpace>
 struct functor_vec_red_reducer {
-  typedef Kokkos::TeamPolicy< ExecutionSpace > policy_type;
+  typedef Kokkos::TeamPolicy<ExecutionSpace> policy_type;
   typedef ExecutionSpace execution_space;
 
-  Kokkos::View< int, Kokkos::LayoutLeft, ExecutionSpace > flag;
+  Kokkos::View<int, Kokkos::LayoutLeft, ExecutionSpace> flag;
 
-  functor_vec_red_reducer( Kokkos::View< int, Kokkos::LayoutLeft, ExecutionSpace > flag_ ) : flag( flag_ ) {}
+  functor_vec_red_reducer(
+      Kokkos::View<int, Kokkos::LayoutLeft, ExecutionSpace> flag_)
+      : flag(flag_) {}
 
   KOKKOS_INLINE_FUNCTION
-  void operator()( typename policy_type::member_type team ) const {
+  void operator()(typename policy_type::member_type team) const {
     // Must initialize to the identity value for the reduce operation
     // for this test:
     //   ( identity, operation ) = ( 1 , *= )
     Scalar value = 1;
 
-    Kokkos::parallel_reduce( Kokkos::ThreadVectorRange( team, 13 ), [&] ( int i, Scalar & val )
-    {
-      val *= ( i % 5 + 1 );
-    }, Kokkos::Prod<Scalar>(value)
-    );
+    Kokkos::parallel_reduce(
+        Kokkos::ThreadVectorRange(team, 13),
+        [&](int i, Scalar &val) { val *= (i % 5 + 1); },
+        Kokkos::Prod<Scalar>(value));
 
-    Kokkos::single( Kokkos::PerThread( team ), [&] ()
-    {
+    Kokkos::single(Kokkos::PerThread(team), [&]() {
       Scalar test = 1;
 
-      for ( int i = 0; i < 13; i++ ) test *= ( i % 5 + 1 );
+      for (int i = 0; i < 13; i++) test *= (i % 5 + 1);
 
-      if ( test != value ) {
-        printf( "FAILED vector_par_reduce_reducer %i %i %f %f\n",
-                team.league_rank(), team.team_rank(), (double) test, (double) value );
+      if (test != value) {
+        printf("FAILED vector_par_reduce_reducer %i %i %f %f\n",
+               team.league_rank(), team.team_rank(), (double)test,
+               (double)value);
 
         flag() = 1;
       }
@@ -724,288 +761,296 @@ struct functor_vec_red_reducer {
   }
 };
 
-template< typename Scalar, class ExecutionSpace >
+template <typename Scalar, class ExecutionSpace>
 struct functor_vec_scan {
-  typedef Kokkos::TeamPolicy< ExecutionSpace > policy_type;
+  typedef Kokkos::TeamPolicy<ExecutionSpace> policy_type;
   typedef ExecutionSpace execution_space;
 
-  Kokkos::View< int, Kokkos::LayoutLeft, ExecutionSpace > flag;
-  functor_vec_scan( Kokkos::View< int, Kokkos::LayoutLeft, ExecutionSpace > flag_ ) : flag( flag_ ) {}
+  Kokkos::View<int, Kokkos::LayoutLeft, ExecutionSpace> flag;
+  functor_vec_scan(Kokkos::View<int, Kokkos::LayoutLeft, ExecutionSpace> flag_)
+      : flag(flag_) {}
 
   KOKKOS_INLINE_FUNCTION
-  void operator()( typename policy_type::member_type team ) const {
-    Kokkos::parallel_scan( Kokkos::ThreadVectorRange( team, 13 ), [&] ( int i, Scalar & val, bool final )
-    {
-      val += i;
+  void operator()(typename policy_type::member_type team) const {
+    Kokkos::parallel_scan(Kokkos::ThreadVectorRange(team, 13),
+                          [&](int i, Scalar &val, bool final) {
+                            val += i;
 
-      if ( final ) {
-        Scalar test = 0;
-        for ( int k = 0; k <= i; k++ ) test += k;
+                            if (final) {
+                              Scalar test = 0;
+                              for (int k = 0; k <= i; k++) test += k;
 
-        if ( test != val ) {
-          printf( "FAILED vector_par_scan %i %i %f %f\n",
-                  team.league_rank(), team.team_rank(), (double) test, (double) val );
+                              if (test != val) {
+                                printf("FAILED vector_par_scan %i %i %f %f\n",
+                                       team.league_rank(), team.team_rank(),
+                                       (double)test, (double)val);
 
-          flag() = 1;
-        }
-      }
-    });
+                                flag() = 1;
+                              }
+                            }
+                          });
   }
 };
 
-template< typename Scalar, class ExecutionSpace >
+template <typename Scalar, class ExecutionSpace>
 struct functor_reduce {
   typedef double value_type;
-  typedef Kokkos::TeamPolicy< ExecutionSpace > policy_type;
+  typedef Kokkos::TeamPolicy<ExecutionSpace> policy_type;
   typedef ExecutionSpace execution_space;
 
-  Kokkos::View< int, Kokkos::LayoutLeft, ExecutionSpace > flag;
-  functor_reduce( Kokkos::View< int, Kokkos::LayoutLeft, ExecutionSpace > flag_ ) : flag( flag_ ) {}
+  Kokkos::View<int, Kokkos::LayoutLeft, ExecutionSpace> flag;
+  functor_reduce(Kokkos::View<int, Kokkos::LayoutLeft, ExecutionSpace> flag_)
+      : flag(flag_) {}
 
   KOKKOS_INLINE_FUNCTION
-  void operator()( typename policy_type::member_type team, double & sum ) const {
+  void operator()(typename policy_type::member_type team, double &sum) const {
     sum += team.league_rank() * 100 + team.thread_rank();
   }
 };
 
-template< typename Scalar, class ExecutionSpace >
-bool test_scalar( int nteams, int team_size, int test ) {
-  Kokkos::View< int, Kokkos::LayoutLeft, ExecutionSpace > d_flag( "flag" );
-  typename Kokkos::View< int, Kokkos::LayoutLeft, ExecutionSpace >::HostMirror h_flag( "h_flag" );
+template <typename Scalar, class ExecutionSpace>
+bool test_scalar(int nteams, int team_size, int test) {
+  Kokkos::View<int, Kokkos::LayoutLeft, ExecutionSpace> d_flag("flag");
+  typename Kokkos::View<int, Kokkos::LayoutLeft, ExecutionSpace>::HostMirror
+      h_flag("h_flag");
   h_flag() = 0;
-  Kokkos::deep_copy( d_flag, h_flag );
+  Kokkos::deep_copy(d_flag, h_flag);
 
-  if ( test == 0 ) {
-    Kokkos::parallel_for( std::string( "A" ), Kokkos::TeamPolicy< ExecutionSpace >( nteams, team_size, 8 ),
-                          functor_vec_red< Scalar, ExecutionSpace >( d_flag ) );
-  }
-  else if ( test == 1 ) {
-    Kokkos::parallel_for( Kokkos::TeamPolicy< ExecutionSpace >( nteams, team_size, 8 ),
-                          functor_vec_red_reducer< Scalar, ExecutionSpace >( d_flag ) );
-  }
-  else if ( test == 2 ) {
-    Kokkos::parallel_for( Kokkos::TeamPolicy< ExecutionSpace >( nteams, team_size, 8 ),
-                          functor_vec_scan< Scalar, ExecutionSpace >( d_flag ) );
-  }
-  else if ( test == 3 ) {
-    Kokkos::parallel_for( Kokkos::TeamPolicy< ExecutionSpace >( nteams, team_size, 8 ),
-                          functor_vec_for< Scalar, ExecutionSpace >( d_flag ) );
-  }
-  else if ( test == 4 ) {
-    Kokkos::parallel_for( "B", Kokkos::TeamPolicy< ExecutionSpace >( nteams, team_size, 8 ),
-                          functor_vec_single< Scalar, ExecutionSpace >( d_flag, 0, 13 ) );
-  }
-  else if ( test == 5 ) {
-    Kokkos::parallel_for( Kokkos::TeamPolicy< ExecutionSpace >( nteams, team_size ),
-                          functor_team_for< Scalar, ExecutionSpace >( d_flag ) );
-  }
-  else if ( test == 6 ) {
-    Kokkos::parallel_for( Kokkos::TeamPolicy< ExecutionSpace >( nteams, team_size ),
-                          functor_team_reduce< Scalar, ExecutionSpace >( d_flag ) );
-  }
-  else if ( test == 7 ) {
-    Kokkos::parallel_for( Kokkos::TeamPolicy< ExecutionSpace >( nteams, team_size ),
-                          functor_team_reduce_reducer< Scalar, ExecutionSpace >( d_flag ) );
-  }
-  else if ( test == 8 ) {
-    Kokkos::parallel_for( Kokkos::TeamPolicy< ExecutionSpace >( nteams, team_size, 8 ),
-                          functor_team_vector_for< Scalar, ExecutionSpace >( d_flag ) );
-  }
-  else if ( test == 9 ) {
-    Kokkos::parallel_for( Kokkos::TeamPolicy< ExecutionSpace >( nteams, team_size, 8 ),
-                          functor_team_vector_reduce< Scalar, ExecutionSpace >( d_flag ) );
-  }
-  else if ( test == 10 ) {
-    Kokkos::parallel_for( Kokkos::TeamPolicy< ExecutionSpace >( nteams, team_size, 8 ),
-                          functor_team_vector_reduce_reducer< Scalar, ExecutionSpace >( d_flag ) );
-  }
-  else if ( test == 11 ) {
-    Kokkos::parallel_for( "B", Kokkos::TeamPolicy< ExecutionSpace >( nteams, team_size, 8 ),
-                          functor_vec_single< Scalar, ExecutionSpace >( d_flag, 4, 13 ) );
+  if (test == 0) {
+    Kokkos::parallel_for(
+        std::string("A"),
+        Kokkos::TeamPolicy<ExecutionSpace>(nteams, team_size, 8),
+        functor_vec_red<Scalar, ExecutionSpace>(d_flag));
+  } else if (test == 1) {
+    Kokkos::parallel_for(
+        Kokkos::TeamPolicy<ExecutionSpace>(nteams, team_size, 8),
+        functor_vec_red_reducer<Scalar, ExecutionSpace>(d_flag));
+  } else if (test == 2) {
+    Kokkos::parallel_for(
+        Kokkos::TeamPolicy<ExecutionSpace>(nteams, team_size, 8),
+        functor_vec_scan<Scalar, ExecutionSpace>(d_flag));
+  } else if (test == 3) {
+    Kokkos::parallel_for(
+        Kokkos::TeamPolicy<ExecutionSpace>(nteams, team_size, 8),
+        functor_vec_for<Scalar, ExecutionSpace>(d_flag));
+  } else if (test == 4) {
+    Kokkos::parallel_for(
+        "B", Kokkos::TeamPolicy<ExecutionSpace>(nteams, team_size, 8),
+        functor_vec_single<Scalar, ExecutionSpace>(d_flag, 0, 13));
+  } else if (test == 5) {
+    Kokkos::parallel_for(Kokkos::TeamPolicy<ExecutionSpace>(nteams, team_size),
+                         functor_team_for<Scalar, ExecutionSpace>(d_flag));
+  } else if (test == 6) {
+    Kokkos::parallel_for(Kokkos::TeamPolicy<ExecutionSpace>(nteams, team_size),
+                         functor_team_reduce<Scalar, ExecutionSpace>(d_flag));
+  } else if (test == 7) {
+    Kokkos::parallel_for(
+        Kokkos::TeamPolicy<ExecutionSpace>(nteams, team_size),
+        functor_team_reduce_reducer<Scalar, ExecutionSpace>(d_flag));
+  } else if (test == 8) {
+    Kokkos::parallel_for(
+        Kokkos::TeamPolicy<ExecutionSpace>(nteams, team_size, 8),
+        functor_team_vector_for<Scalar, ExecutionSpace>(d_flag));
+  } else if (test == 9) {
+    Kokkos::parallel_for(
+        Kokkos::TeamPolicy<ExecutionSpace>(nteams, team_size, 8),
+        functor_team_vector_reduce<Scalar, ExecutionSpace>(d_flag));
+  } else if (test == 10) {
+    Kokkos::parallel_for(
+        Kokkos::TeamPolicy<ExecutionSpace>(nteams, team_size, 8),
+        functor_team_vector_reduce_reducer<Scalar, ExecutionSpace>(d_flag));
+  } else if (test == 11) {
+    Kokkos::parallel_for(
+        "B", Kokkos::TeamPolicy<ExecutionSpace>(nteams, team_size, 8),
+        functor_vec_single<Scalar, ExecutionSpace>(d_flag, 4, 13));
   }
 
-  Kokkos::deep_copy( h_flag, d_flag );
+  Kokkos::deep_copy(h_flag, d_flag);
 
-  return ( h_flag() == 0 );
+  return (h_flag() == 0);
 }
 
-template< class ExecutionSpace >
-bool Test( int test ) {
+template <class ExecutionSpace>
+bool Test(int test) {
   bool passed = true;
 
   int team_size = 33;
-  if( team_size > int(ExecutionSpace::concurrency()))
+  if (team_size > int(ExecutionSpace::concurrency()))
     team_size = int(ExecutionSpace::concurrency());
-  passed = passed && test_scalar< int, ExecutionSpace >( 317, team_size, test );
-  passed = passed && test_scalar< long long int, ExecutionSpace >( 317, team_size, test );
-  passed = passed && test_scalar< float, ExecutionSpace >( 317, team_size, test );
-  passed = passed && test_scalar< double, ExecutionSpace >( 317, team_size, test );
-  passed = passed && test_scalar< my_complex, ExecutionSpace >( 317, team_size, test );
+  passed = passed && test_scalar<int, ExecutionSpace>(317, team_size, test);
+  passed = passed &&
+           test_scalar<long long int, ExecutionSpace>(317, team_size, test);
+  passed = passed && test_scalar<float, ExecutionSpace>(317, team_size, test);
+  passed = passed && test_scalar<double, ExecutionSpace>(317, team_size, test);
+  passed =
+      passed && test_scalar<my_complex, ExecutionSpace>(317, team_size, test);
 
   return passed;
 }
 
-} // namespace TestTeamVector
+}  // namespace TestTeamVector
 
 namespace Test {
 
 // Computes y^T*A*x
 // ( modified from kokkos-tutorials/GTC2016/Exercises/ThreeLevelPar )
 
-#if ( ! defined( KOKKOS_ENABLE_CUDA ) ) || (defined( KOKKOS_ENABLE_CUDA_LAMBDA ) && (8000 <= CUDA_VERSION))
-template< typename ScalarType, class DeviceType >
-class TestTripleNestedReduce
-{
-public:
+#if (!defined(KOKKOS_ENABLE_CUDA)) || \
+    (defined(KOKKOS_ENABLE_CUDA_LAMBDA) && (8000 <= CUDA_VERSION))
+template <typename ScalarType, class DeviceType>
+class TestTripleNestedReduce {
+ public:
   typedef DeviceType execution_space;
   typedef typename execution_space::size_type size_type;
 
-  TestTripleNestedReduce( const size_type & nrows, const size_type & ncols
-                        , const size_type & team_size, const size_type & vector_length )
-  {
-    run_test( nrows, ncols, team_size, vector_length );
+  TestTripleNestedReduce(const size_type &nrows, const size_type &ncols,
+                         const size_type &team_size,
+                         const size_type &vector_length) {
+    run_test(nrows, ncols, team_size, vector_length);
   }
 
-  void run_test( const size_type & nrows, const size_type & ncols
-               , size_type team_size, const size_type & vector_length )
-  {
-    if( team_size > size_type(DeviceType::execution_space::concurrency()))
+  void run_test(const size_type &nrows, const size_type &ncols,
+                size_type team_size, const size_type &vector_length) {
+    if (team_size > size_type(DeviceType::execution_space::concurrency()))
       team_size = size_type(DeviceType::execution_space::concurrency());
 
 #ifdef KOKKOS_ENABLE_HPX
     team_size = 1;
-    if (!std::is_same<execution_space, Kokkos::Experimental::HPX>::value)
-    {
-        team_size = 1;
+    if (!std::is_same<execution_space, Kokkos::Experimental::HPX>::value) {
+      team_size = 1;
     }
 #endif
 
-    //typedef Kokkos::LayoutLeft Layout;
+    // typedef Kokkos::LayoutLeft Layout;
     typedef Kokkos::LayoutRight Layout;
 
-    typedef Kokkos::View< ScalarType*, DeviceType >            ViewVector;
-    typedef Kokkos::View< ScalarType**, Layout, DeviceType >   ViewMatrix;
+    typedef Kokkos::View<ScalarType *, DeviceType> ViewVector;
+    typedef Kokkos::View<ScalarType **, Layout, DeviceType> ViewMatrix;
 
-    ViewVector y( "y", nrows );
-    ViewVector x( "x", ncols );
-    ViewMatrix A( "A", nrows, ncols );
+    ViewVector y("y", nrows);
+    ViewVector x("x", ncols);
+    ViewMatrix A("A", nrows, ncols);
 
     typedef Kokkos::RangePolicy<DeviceType> range_policy;
 
     // Initialize y vector.
-    Kokkos::parallel_for( range_policy( 0, nrows ), KOKKOS_LAMBDA ( const int i ) { y( i ) = 1; } );
+    Kokkos::parallel_for(
+        range_policy(0, nrows), KOKKOS_LAMBDA(const int i) { y(i) = 1; });
 
     // Initialize x vector.
-    Kokkos::parallel_for( range_policy( 0, ncols ), KOKKOS_LAMBDA ( const int i ) { x( i ) = 1; } );
+    Kokkos::parallel_for(
+        range_policy(0, ncols), KOKKOS_LAMBDA(const int i) { x(i) = 1; });
     Kokkos::fence();
 
-    typedef Kokkos::TeamPolicy< DeviceType >                        team_policy;
-    typedef typename Kokkos::TeamPolicy< DeviceType >::member_type  member_type;
+    typedef Kokkos::TeamPolicy<DeviceType> team_policy;
+    typedef typename Kokkos::TeamPolicy<DeviceType>::member_type member_type;
 
     // Initialize A matrix, note 2D indexing computation.
-    Kokkos::parallel_for( team_policy( nrows, Kokkos::AUTO ), KOKKOS_LAMBDA ( const member_type & teamMember ) {
-      const int j = teamMember.league_rank();
-      Kokkos::parallel_for( Kokkos::TeamThreadRange( teamMember, ncols ), [&] ( const int i ) {
-        A( j, i ) = 1;
-      } );
-    } );
+    Kokkos::parallel_for(
+        team_policy(nrows, Kokkos::AUTO),
+        KOKKOS_LAMBDA(const member_type &teamMember) {
+          const int j = teamMember.league_rank();
+          Kokkos::parallel_for(Kokkos::TeamThreadRange(teamMember, ncols),
+                               [&](const int i) { A(j, i) = 1; });
+        });
     Kokkos::fence();
 
     // Three level parallelism kernel to force caching of vector x.
     ScalarType result = 0.0;
-    int chunk_size = 128;
-    Kokkos::parallel_reduce( team_policy( nrows / chunk_size, team_size, vector_length ),
-                             KOKKOS_LAMBDA ( const member_type & teamMember, double & update ) {
-      const int row_start = teamMember.league_rank() * chunk_size;
-      const int row_end   = row_start + chunk_size;
-      Kokkos::parallel_for( Kokkos::TeamThreadRange( teamMember, row_start, row_end ), [&] ( const int i ) {
-        ScalarType sum_i = 0.0;
-        Kokkos::parallel_reduce( Kokkos::ThreadVectorRange( teamMember, ncols ), [&] ( const int j, ScalarType &innerUpdate ) {
-          innerUpdate += A( i, j ) * x( j );
-        }, sum_i );
-        Kokkos::single( Kokkos::PerThread( teamMember ), [&] () {
-          update += y( i ) * sum_i;
-        } );
-      } );
-    }, result );
+    int chunk_size    = 128;
+    Kokkos::parallel_reduce(
+        team_policy(nrows / chunk_size, team_size, vector_length),
+        KOKKOS_LAMBDA(const member_type &teamMember, double &update) {
+          const int row_start = teamMember.league_rank() * chunk_size;
+          const int row_end   = row_start + chunk_size;
+          Kokkos::parallel_for(
+              Kokkos::TeamThreadRange(teamMember, row_start, row_end),
+              [&](const int i) {
+                ScalarType sum_i = 0.0;
+                Kokkos::parallel_reduce(
+                    Kokkos::ThreadVectorRange(teamMember, ncols),
+                    [&](const int j, ScalarType &innerUpdate) {
+                      innerUpdate += A(i, j) * x(j);
+                    },
+                    sum_i);
+                Kokkos::single(Kokkos::PerThread(teamMember),
+                               [&]() { update += y(i) * sum_i; });
+              });
+        },
+        result);
     Kokkos::fence();
 
-    const ScalarType solution = (ScalarType) nrows * (ScalarType) ncols;
-    if ( int64_t(solution) != int64_t(result) ) {
-      printf( "  TestTripleNestedReduce failed solution(%" PRId64 ") != result(%" PRId64 "),"
-              " nrows(%" PRId32 ") ncols(%" PRId32 ") league_size(%" PRId32 ") team_size(%" PRId32 ")\n"
-            , int64_t(solution)
-            , int64_t(result)
-            , int32_t(nrows)
-            , int32_t(ncols)
-            , int32_t(nrows/chunk_size)
-            , int32_t(team_size)
-            );
+    const ScalarType solution = (ScalarType)nrows * (ScalarType)ncols;
+    if (int64_t(solution) != int64_t(result)) {
+      printf("  TestTripleNestedReduce failed solution(%" PRId64
+             ") != result(%" PRId64
+             "),"
+             " nrows(%" PRId32 ") ncols(%" PRId32 ") league_size(%" PRId32
+             ") team_size(%" PRId32 ")\n",
+             int64_t(solution), int64_t(result), int32_t(nrows), int32_t(ncols),
+             int32_t(nrows / chunk_size), int32_t(team_size));
     }
 
-    ASSERT_EQ( solution, result );
+    ASSERT_EQ(solution, result);
   }
 };
 
-#else // #if ( ! defined( KOKKOS_ENABLE_CUDA ) ) || defined( KOKKOS_ENABLE_CUDA_LAMBDA )
+#else  // #if ( ! defined( KOKKOS_ENABLE_CUDA ) ) || defined(
+       // KOKKOS_ENABLE_CUDA_LAMBDA )
 
-template< typename ScalarType, class DeviceType >
-class TestTripleNestedReduce
-{
-public:
+template <typename ScalarType, class DeviceType>
+class TestTripleNestedReduce {
+ public:
   typedef DeviceType execution_space;
   typedef typename execution_space::size_type size_type;
 
-  TestTripleNestedReduce( const size_type &, const size_type
-                        , const size_type &, const size_type )
-  {}
+  TestTripleNestedReduce(const size_type &, const size_type, const size_type &,
+                         const size_type) {}
 };
 
 #endif
-        
+
 #if !defined(KOKKOS_IMPL_CUDA_CLANG_WORKAROUND)
-TEST_F( TEST_CATEGORY, team_vector )
-{
-  ASSERT_TRUE( ( TestTeamVector::Test< TEST_EXECSPACE >( 0 ) ) );
-  ASSERT_TRUE( ( TestTeamVector::Test< TEST_EXECSPACE >( 1 ) ) );
-  ASSERT_TRUE( ( TestTeamVector::Test< TEST_EXECSPACE >( 2 ) ) );
-  ASSERT_TRUE( ( TestTeamVector::Test< TEST_EXECSPACE >( 3 ) ) );
-  ASSERT_TRUE( ( TestTeamVector::Test< TEST_EXECSPACE >( 4 ) ) );
-  ASSERT_TRUE( ( TestTeamVector::Test< TEST_EXECSPACE >( 5 ) ) );
-  ASSERT_TRUE( ( TestTeamVector::Test< TEST_EXECSPACE >( 6 ) ) );
-  ASSERT_TRUE( ( TestTeamVector::Test< TEST_EXECSPACE >( 7 ) ) );
-  ASSERT_TRUE( ( TestTeamVector::Test< TEST_EXECSPACE >( 8 ) ) );
-  ASSERT_TRUE( ( TestTeamVector::Test< TEST_EXECSPACE >( 9 ) ) );
-  ASSERT_TRUE( ( TestTeamVector::Test< TEST_EXECSPACE >( 10 ) ) );
-  ASSERT_TRUE( ( TestTeamVector::Test< TEST_EXECSPACE >( 11 ) ) );
+TEST(TEST_CATEGORY, team_vector) {
+  ASSERT_TRUE((TestTeamVector::Test<TEST_EXECSPACE>(0)));
+  ASSERT_TRUE((TestTeamVector::Test<TEST_EXECSPACE>(1)));
+  ASSERT_TRUE((TestTeamVector::Test<TEST_EXECSPACE>(2)));
+  ASSERT_TRUE((TestTeamVector::Test<TEST_EXECSPACE>(3)));
+  ASSERT_TRUE((TestTeamVector::Test<TEST_EXECSPACE>(4)));
+  ASSERT_TRUE((TestTeamVector::Test<TEST_EXECSPACE>(5)));
+  ASSERT_TRUE((TestTeamVector::Test<TEST_EXECSPACE>(6)));
+  ASSERT_TRUE((TestTeamVector::Test<TEST_EXECSPACE>(7)));
+  ASSERT_TRUE((TestTeamVector::Test<TEST_EXECSPACE>(8)));
+  ASSERT_TRUE((TestTeamVector::Test<TEST_EXECSPACE>(9)));
+  ASSERT_TRUE((TestTeamVector::Test<TEST_EXECSPACE>(10)));
+  ASSERT_TRUE((TestTeamVector::Test<TEST_EXECSPACE>(11)));
 }
 #endif
 
 #if !defined(KOKKOS_IMPL_CUDA_CLANG_WORKAROUND)
-TEST_F( TEST_CATEGORY, triple_nested_parallelism )
-{
+TEST(TEST_CATEGORY, triple_nested_parallelism) {
 // With KOKKOS_DEBUG enabled, the functor uses too many registers to run
-// with a team size of 32 on GPUs, 16 is the max possible (at least on a K80 GPU)
-// See https://github.com/kokkos/kokkos/issues/1513
+// with a team size of 32 on GPUs, 16 is the max possible (at least on a K80
+// GPU) See https://github.com/kokkos/kokkos/issues/1513
 #if defined(KOKKOS_ENABLE_DEBUG) && defined(KOKKOS_ENABLE_CUDA)
   if (!std::is_same<TEST_EXECSPACE, Kokkos::Cuda>::value) {
 #endif
-#ifdef KOKKOS_ENABLE_ROCM // ROCm doesn't support TeamSize 32x32
-  if (!std::is_same<TEST_EXECSPACE, Kokkos::Experimental::ROCm>::value)
+#ifdef KOKKOS_ENABLE_ROCM  // ROCm doesn't support TeamSize 32x32
+    if (!std::is_same<TEST_EXECSPACE, Kokkos::Experimental::ROCm>::value)
 #endif
-  TestTripleNestedReduce< double, TEST_EXECSPACE >( 8192, 2048, 32, 32 );
-  TestTripleNestedReduce< double, TEST_EXECSPACE >( 8192, 2048, 32, 16 );
+      TestTripleNestedReduce<double, TEST_EXECSPACE>(8192, 2048, 32, 32);
+    TestTripleNestedReduce<double, TEST_EXECSPACE>(8192, 2048, 32, 16);
 #if defined(KOKKOS_ENABLE_DEBUG) && defined(KOKKOS_ENABLE_CUDA)
   }
 #endif
-  TestTripleNestedReduce< double, TEST_EXECSPACE >( 8192, 2048, 16, 16 );
-  TestTripleNestedReduce< double, TEST_EXECSPACE >( 8192, 2048, 16, 33 );
-  TestTripleNestedReduce< double, TEST_EXECSPACE >( 8192, 2048, 16, 19 );
-#ifdef KOKKOS_ENABLE_ROCM // ROCm doesn't support team sizes not powers of two
+  TestTripleNestedReduce<double, TEST_EXECSPACE>(8192, 2048, 16, 16);
+  TestTripleNestedReduce<double, TEST_EXECSPACE>(8192, 2048, 16, 33);
+  TestTripleNestedReduce<double, TEST_EXECSPACE>(8192, 2048, 16, 19);
+#ifdef KOKKOS_ENABLE_ROCM  // ROCm doesn't support team sizes not powers of two
   if (!std::is_same<TEST_EXECSPACE, Kokkos::Experimental::ROCm>::value)
 #endif
-  TestTripleNestedReduce< double, TEST_EXECSPACE >( 8192, 2048, 7, 16 );
+    TestTripleNestedReduce<double, TEST_EXECSPACE>(8192, 2048, 7, 16);
 }
 #endif
 
-}
+}  // namespace Test
diff --git a/lib/kokkos/core/unit_test/TestTeamVectorRange.hpp b/lib/kokkos/core/unit_test/TestTeamVectorRange.hpp
index 86c8dab3ff..71351c1981 100644
--- a/lib/kokkos/core/unit_test/TestTeamVectorRange.hpp
+++ b/lib/kokkos/core/unit_test/TestTeamVectorRange.hpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -57,66 +58,66 @@ struct my_complex {
 
   KOKKOS_INLINE_FUNCTION
   my_complex() {
-    re = 0.0;
-    im = 0.0;
+    re    = 0.0;
+    im    = 0.0;
     dummy = 0;
   }
 
   KOKKOS_INLINE_FUNCTION
-  my_complex( const my_complex & src ) {
-    re = src.re;
-    im = src.im;
+  my_complex(const my_complex& src) {
+    re    = src.re;
+    im    = src.im;
     dummy = src.dummy;
   }
 
   KOKKOS_INLINE_FUNCTION
-  my_complex & operator=( const my_complex & src ) {
-    re = src.re;
-    im = src.im;
+  my_complex& operator=(const my_complex& src) {
+    re    = src.re;
+    im    = src.im;
     dummy = src.dummy;
-    return *this ;
+    return *this;
   }
 
   KOKKOS_INLINE_FUNCTION
-  my_complex & operator=( const volatile my_complex & src ) {
-    re = src.re;
-    im = src.im;
+  my_complex& operator=(const volatile my_complex& src) {
+    re    = src.re;
+    im    = src.im;
     dummy = src.dummy;
-    return *this ;
+    return *this;
   }
 
   KOKKOS_INLINE_FUNCTION
-  volatile my_complex & operator=( const my_complex & src ) volatile {
-    re = src.re;
-    im = src.im;
+  volatile my_complex& operator=(const my_complex& src) volatile {
+    re    = src.re;
+    im    = src.im;
     dummy = src.dummy;
-    return *this ;
+    return *this;
   }
 
   KOKKOS_INLINE_FUNCTION
-  volatile my_complex & operator=( const volatile my_complex & src ) volatile {
-    re = src.re;
-    im = src.im;
+  volatile my_complex& operator=(const volatile my_complex& src) volatile {
+    re    = src.re;
+    im    = src.im;
     dummy = src.dummy;
-    return *this ;
+    return *this;
   }
 
   KOKKOS_INLINE_FUNCTION
-  my_complex( const volatile my_complex & src ) {
-    re = src.re;
-    im = src.im;
+  my_complex(const volatile my_complex& src) {
+    re    = src.re;
+    im    = src.im;
     dummy = src.dummy;
   }
 
   KOKKOS_INLINE_FUNCTION
-  my_complex( const double & val ) {
-    re = val;
-    im = 0.0;
+  my_complex(const double& val) {
+    re    = val;
+    im    = 0.0;
     dummy = 0;
   }
 
   KOKKOS_INLINE_FUNCTION
-  my_complex & operator+=( const my_complex & src ) {
+  my_complex& operator+=(const my_complex& src) {
     re += src.re;
     im += src.im;
     dummy += src.dummy;
@@ -124,14 +125,14 @@ struct my_complex {
   }
 
   KOKKOS_INLINE_FUNCTION
-  void operator+=( const volatile my_complex & src ) volatile {
+  void operator+=(const volatile my_complex& src) volatile {
     re += src.re;
     im += src.im;
     dummy += src.dummy;
   }
 
   KOKKOS_INLINE_FUNCTION
-  my_complex operator +( const my_complex & src ) {
+  my_complex operator+(const my_complex& src) {
     my_complex tmp = *this;
     tmp.re += src.re;
     tmp.im += src.im;
@@ -140,7 +141,7 @@ struct my_complex {
   }
 
   KOKKOS_INLINE_FUNCTION
-  my_complex operator+( const volatile my_complex & src ) volatile {
+  my_complex operator+(const volatile my_complex& src) volatile {
     my_complex tmp = *this;
     tmp.re += src.re;
     tmp.im += src.im;
@@ -149,134 +150,137 @@ struct my_complex {
   }
 
   KOKKOS_INLINE_FUNCTION
-  my_complex & operator*=( const my_complex & src ) {
+  my_complex& operator*=(const my_complex& src) {
     double re_tmp = re * src.re - im * src.im;
     double im_tmp = re * src.im + im * src.re;
-    re = re_tmp;
-    im = im_tmp;
+    re            = re_tmp;
+    im            = im_tmp;
     dummy *= src.dummy;
     return *this;
   }
 
   KOKKOS_INLINE_FUNCTION
-  void operator*=( const volatile my_complex & src ) volatile {
+  void operator*=(const volatile my_complex& src) volatile {
     double re_tmp = re * src.re - im * src.im;
     double im_tmp = re * src.im + im * src.re;
-    re = re_tmp;
-    im = im_tmp;
+    re            = re_tmp;
+    im            = im_tmp;
     dummy *= src.dummy;
   }
 
   KOKKOS_INLINE_FUNCTION
-  bool operator==( const my_complex & src ) {
-    return ( re == src.re ) && ( im == src.im ) && ( dummy == src.dummy );
+  bool operator==(const my_complex& src) {
+    return (re == src.re) && (im == src.im) && (dummy == src.dummy);
   }
 
   KOKKOS_INLINE_FUNCTION
-  bool operator!=( const my_complex & src ) {
-    return ( re != src.re ) || ( im != src.im ) || ( dummy != src.dummy );
+  bool operator!=(const my_complex& src) {
+    return (re != src.re) || (im != src.im) || (dummy != src.dummy);
   }
 
   KOKKOS_INLINE_FUNCTION
-  bool operator!=( const double & val ) {
-    return ( re != val ) || ( im != 0 ) || ( dummy != 0 );
+  bool operator!=(const double& val) {
+    return (re != val) || (im != 0) || (dummy != 0);
   }
 
   KOKKOS_INLINE_FUNCTION
-  my_complex & operator=( const int & val ) {
-    re = val;
-    im = 0.0;
+  my_complex& operator=(const int& val) {
+    re    = val;
+    im    = 0.0;
     dummy = 0;
     return *this;
   }
 
   KOKKOS_INLINE_FUNCTION
-  my_complex & operator=( const double & val ) {
-    re = val;
-    im = 0.0;
+  my_complex& operator=(const double& val) {
+    re    = val;
+    im    = 0.0;
     dummy = 0;
     return *this;
   }
 
   KOKKOS_INLINE_FUNCTION
-  operator double() {
-    return re;
-  }
+  operator double() { return re; }
 };
-}
+}  // namespace TestTeamVectorRange
 
 namespace Kokkos {
-template<>
-struct reduction_identity<TestTeamVectorRange::my_complex > {
+template <>
+struct reduction_identity<TestTeamVectorRange::my_complex> {
   typedef reduction_identity<double> t_red_ident;
-  KOKKOS_FORCEINLINE_FUNCTION static TestTeamVectorRange::my_complex sum()
-      {return TestTeamVectorRange::my_complex(t_red_ident::sum());}
-  KOKKOS_FORCEINLINE_FUNCTION static TestTeamVectorRange::my_complex prod()
-      {return TestTeamVectorRange::my_complex(t_red_ident::prod());}
+  KOKKOS_FORCEINLINE_FUNCTION static TestTeamVectorRange::my_complex sum() {
+    return TestTeamVectorRange::my_complex(t_red_ident::sum());
+  }
+  KOKKOS_FORCEINLINE_FUNCTION static TestTeamVectorRange::my_complex prod() {
+    return TestTeamVectorRange::my_complex(t_red_ident::prod());
+  }
 };
-}
+}  // namespace Kokkos
 
 namespace TestTeamVectorRange {
 
-template< typename Scalar, class ExecutionSpace >
+template <typename Scalar, class ExecutionSpace>
 struct functor_teamvector_for {
-  typedef Kokkos::TeamPolicy< ExecutionSpace > policy_type;
+  typedef Kokkos::TeamPolicy<ExecutionSpace> policy_type;
   typedef ExecutionSpace execution_space;
 
-  Kokkos::View< int, Kokkos::LayoutLeft, ExecutionSpace > flag;
+  Kokkos::View<int, Kokkos::LayoutLeft, ExecutionSpace> flag;
 
-  functor_teamvector_for( Kokkos::View< int, Kokkos::LayoutLeft, ExecutionSpace > flag_ ) : flag( flag_ ) {}
+  functor_teamvector_for(
+      Kokkos::View<int, Kokkos::LayoutLeft, ExecutionSpace> flag_)
+      : flag(flag_) {}
 
   typedef typename ExecutionSpace::scratch_memory_space shmem_space;
-  typedef Kokkos::View< Scalar*, shmem_space, Kokkos::MemoryUnmanaged > shared_int;
-  unsigned team_shmem_size( int team_size ) const { return shared_int::shmem_size(131); }
+  typedef Kokkos::View<Scalar*, shmem_space, Kokkos::MemoryUnmanaged>
+      shared_int;
+  unsigned team_shmem_size(int team_size) const {
+    return shared_int::shmem_size(131);
+  }
 
   KOKKOS_INLINE_FUNCTION
-  void operator()( typename policy_type::member_type team ) const {
+  void operator()(typename policy_type::member_type team) const {
     typedef typename shmem_space::size_type size_type;
     const size_type shmemSize = 131;
-    shared_int values = shared_int( team.team_shmem(), shmemSize );
+    shared_int values         = shared_int(team.team_shmem(), shmemSize);
 
-    if ( values.data() == nullptr || values.extent(0) < shmemSize ) {
-      printf( "FAILED to allocate shared memory of size %u\n",
-              static_cast<unsigned int>( shmemSize ) );
-    }
-    else {
+    if (values.data() == nullptr || values.extent(0) < shmemSize) {
+      printf("FAILED to allocate shared memory of size %u\n",
+             static_cast<unsigned int>(shmemSize));
+    } else {
       // Initialize shared memory.
-      Kokkos::parallel_for( Kokkos::TeamVectorRange( team, 131 ), [&] ( int i ) {
-        values( i ) = 0;
-      });
+      Kokkos::parallel_for(Kokkos::TeamVectorRange(team, 131),
+                           [&](int i) { values(i) = 0; });
       // Wait for all memory to be written.
       team.team_barrier();
 
       // Accumulate value into per thread shared memory.
       // This is non blocking.
-      Kokkos::parallel_for( Kokkos::TeamVectorRange( team, 131 ), [&] ( int i )
-      {
-        values( i ) += i - team.league_rank() + team.league_size() + team.team_size();
+      Kokkos::parallel_for(Kokkos::TeamVectorRange(team, 131), [&](int i) {
+        values(i) +=
+            i - team.league_rank() + team.league_size() + team.team_size();
       });
 
       // Wait for all memory to be written.
       team.team_barrier();
 
       // One thread per team executes the comparison.
-      Kokkos::single( Kokkos::PerTeam( team ), [&] ()
-      {
-        Scalar test = 0;
+      Kokkos::single(Kokkos::PerTeam(team), [&]() {
+        Scalar test  = 0;
         Scalar value = 0;
 
-        for ( int i = 0; i < 131; ++i ) {
-          test += i - team.league_rank() + team.league_size() + team.team_size();
+        for (int i = 0; i < 131; ++i) {
+          test +=
+              i - team.league_rank() + team.league_size() + team.team_size();
         }
 
-        for ( int i = 0; i < 131; ++i ) {
-          value += values( i );
+        for (int i = 0; i < 131; ++i) {
+          value += values(i);
         }
 
-        if ( test != value ) {
-          printf ( "FAILED teamvector_parallel_for %i %i %f %f\n",
-                   team.league_rank(), team.team_rank(),
-                   static_cast<double>( test ), static_cast<double>( value ) );
+        if (test != value) {
+          printf("FAILED teamvector_parallel_for %i %i %f %f\n",
+                 team.league_rank(), team.team_rank(),
+                 static_cast<double>(test), static_cast<double>(value));
           flag() = 1;
         }
       });
@@ -284,64 +288,77 @@ struct functor_teamvector_for {
   }
 };
 
-template< typename Scalar, class ExecutionSpace >
+template <typename Scalar, class ExecutionSpace>
 struct functor_teamvector_reduce {
-  typedef Kokkos::TeamPolicy< ExecutionSpace > policy_type;
+  typedef Kokkos::TeamPolicy<ExecutionSpace> policy_type;
   typedef ExecutionSpace execution_space;
 
-  Kokkos::View< int, Kokkos::LayoutLeft, ExecutionSpace > flag;
+  Kokkos::View<int, Kokkos::LayoutLeft, ExecutionSpace> flag;
 
-  functor_teamvector_reduce( Kokkos::View< int, Kokkos::LayoutLeft, ExecutionSpace > flag_ ) : flag( flag_ ) {}
+  functor_teamvector_reduce(
+      Kokkos::View<int, Kokkos::LayoutLeft, ExecutionSpace> flag_)
+      : flag(flag_) {}
 
   typedef typename ExecutionSpace::scratch_memory_space shmem_space;
-  typedef Kokkos::View< Scalar*, shmem_space, Kokkos::MemoryUnmanaged > shared_scalar_t;
-  unsigned team_shmem_size( int team_size ) const { return shared_scalar_t::shmem_size(team_size*13); }
+  typedef Kokkos::View<Scalar*, shmem_space, Kokkos::MemoryUnmanaged>
+      shared_scalar_t;
+  unsigned team_shmem_size(int team_size) const {
+    return shared_scalar_t::shmem_size(team_size * 13);
+  }
 
   KOKKOS_INLINE_FUNCTION
-  void operator()( typename policy_type::member_type team ) const {
+  void operator()(typename policy_type::member_type team) const {
     Scalar value = Scalar();
-    shared_scalar_t shared_value(team.team_scratch(0),1);
+    shared_scalar_t shared_value(team.team_scratch(0), 1);
 
-    Kokkos::parallel_reduce( Kokkos::TeamVectorRange( team, 131 ), [&] ( int i, Scalar & val )
-    {
-      val += i - team.league_rank() + team.league_size() + team.team_size();
-    }, shared_value(0) );
+    Kokkos::parallel_reduce(
+        Kokkos::TeamVectorRange(team, 131),
+        [&](int i, Scalar& val) {
+          val += i - team.league_rank() + team.league_size() + team.team_size();
+        },
+        shared_value(0));
 
     team.team_barrier();
-    Kokkos::parallel_reduce( Kokkos::TeamVectorRange( team, 131 ), [&] ( int i, Scalar & val )
-    {
-      val += i - team.league_rank() + team.league_size() + team.team_size();
-    }, value );
-    
-//    Kokkos::parallel_reduce( Kokkos::TeamVectorRange( team, 131 ), [&] ( int i, Scalar & val )
-//    {
-//      val += i - team.league_rank() + team.league_size() + team.team_size();
-//    }, shared_value(0) );
+    Kokkos::parallel_reduce(
+        Kokkos::TeamVectorRange(team, 131),
+        [&](int i, Scalar& val) {
+          val += i - team.league_rank() + team.league_size() + team.team_size();
+        },
+        value);
+
+    //    Kokkos::parallel_reduce( Kokkos::TeamVectorRange( team, 131 ), [&] (
+    //    int i, Scalar & val )
+    //    {
+    //      val += i - team.league_rank() + team.league_size() +
+    //      team.team_size();
+    //    }, shared_value(0) );
 
     team.team_barrier();
 
-    Kokkos::single( Kokkos::PerTeam( team ), [&] ()
-    {
+    Kokkos::single(Kokkos::PerTeam(team), [&]() {
       Scalar test = 0;
 
-      for ( int i = 0; i < 131; ++i ) {
+      for (int i = 0; i < 131; ++i) {
         test += i - team.league_rank() + team.league_size() + team.team_size();
       }
 
-      if ( test != value ) {
-        if ( team.league_rank() == 0 ) {
-          printf( "FAILED teamvector_parallel_reduce %i %i %lf %lf %lu\n",
-                  team.league_rank(), team.team_rank(),
-                  static_cast<double>( test ), static_cast<double>( value ), sizeof( Scalar ) );
+      if (test != value) {
+        if (team.league_rank() == 0) {
+          printf("FAILED teamvector_parallel_reduce %i %i %lf %lf %lu\n",
+                 team.league_rank(), team.team_rank(),
+                 static_cast<double>(test), static_cast<double>(value),
+                 sizeof(Scalar));
         }
 
         flag() = 1;
       }
-      if ( test != shared_value(0) ) {
-        if ( team.league_rank() == 0 ) {
-          printf( "FAILED teamvector_parallel_reduce with shared result %i %i %lf %lf %lu\n",
-                  team.league_rank(), team.team_rank(),
-                  static_cast<double>( test ), static_cast<double>( shared_value(0) ), sizeof( Scalar ) );
+      if (test != shared_value(0)) {
+        if (team.league_rank() == 0) {
+          printf(
+              "FAILED teamvector_parallel_reduce with shared result %i %i %lf "
+              "%lf %lu\n",
+              team.league_rank(), team.team_rank(), static_cast<double>(test),
+              static_cast<double>(shared_value(0)), sizeof(Scalar));
         }
 
         flag() = 1;
@@ -350,59 +367,65 @@ struct functor_teamvector_reduce {
   }
 };
 
-template< typename Scalar, class ExecutionSpace >
+template <typename Scalar, class ExecutionSpace>
 struct functor_teamvector_reduce_reducer {
-  typedef Kokkos::TeamPolicy< ExecutionSpace > policy_type;
+  typedef Kokkos::TeamPolicy<ExecutionSpace> policy_type;
   typedef ExecutionSpace execution_space;
 
-  Kokkos::View< int, Kokkos::LayoutLeft, ExecutionSpace > flag;
+  Kokkos::View<int, Kokkos::LayoutLeft, ExecutionSpace> flag;
 
-  functor_teamvector_reduce_reducer( Kokkos::View< int, Kokkos::LayoutLeft, ExecutionSpace > flag_ ) : flag( flag_ ) {}
+  functor_teamvector_reduce_reducer(
+      Kokkos::View<int, Kokkos::LayoutLeft, ExecutionSpace> flag_)
+      : flag(flag_) {}
 
   typedef typename ExecutionSpace::scratch_memory_space shmem_space;
-  typedef Kokkos::View< Scalar*, shmem_space, Kokkos::MemoryUnmanaged > shared_scalar_t;
-  unsigned team_shmem_size( int team_size ) const { return shared_scalar_t::shmem_size(team_size*13); }
+  typedef Kokkos::View<Scalar*, shmem_space, Kokkos::MemoryUnmanaged>
+      shared_scalar_t;
+  unsigned team_shmem_size(int team_size) const {
+    return shared_scalar_t::shmem_size(team_size * 13);
+  }
 
   KOKKOS_INLINE_FUNCTION
-  void operator()( typename policy_type::member_type team ) const {
+  void operator()(typename policy_type::member_type team) const {
     Scalar value = 0;
-    shared_scalar_t shared_value(team.team_scratch(0),1);
+    shared_scalar_t shared_value(team.team_scratch(0), 1);
 
-    Kokkos::parallel_reduce( Kokkos::TeamVectorRange( team, 131 ), [&] ( int i, Scalar & val )
-    {
-      val += i - team.league_rank() + team.league_size() + team.team_size();
-    },
-      Kokkos::Sum<Scalar>(value)
-    );
-    
-    Kokkos::parallel_reduce( Kokkos::TeamVectorRange( team, 131 ), [&] ( int i, Scalar & val )
-    {
-      val += i - team.league_rank() + team.league_size() + team.team_size();
-    },
-      Kokkos::Sum<Scalar>(shared_value(0))
-    );
+    Kokkos::parallel_reduce(
+        Kokkos::TeamVectorRange(team, 131),
+        [&](int i, Scalar& val) {
+          val += i - team.league_rank() + team.league_size() + team.team_size();
+        },
+        Kokkos::Sum<Scalar>(value));
+
+    Kokkos::parallel_reduce(
+        Kokkos::TeamVectorRange(team, 131),
+        [&](int i, Scalar& val) {
+          val += i - team.league_rank() + team.league_size() + team.team_size();
+        },
+        Kokkos::Sum<Scalar>(shared_value(0)));
 
     team.team_barrier();
 
-    Kokkos::single( Kokkos::PerTeam( team ), [&] ()
-    {
+    Kokkos::single(Kokkos::PerTeam(team), [&]() {
       Scalar test = 0;
 
-      for ( int i = 0; i < 131; ++i ) {
+      for (int i = 0; i < 131; ++i) {
         test += i - team.league_rank() + team.league_size() + team.team_size();
       }
 
-      if ( test != value ) {
-        printf( "FAILED teamvector_parallel_reduce_reducer %i %i %lf %lf\n",
-                team.league_rank(), team.team_rank(),
-                static_cast<double>( test ), static_cast<double>( value ) );
+      if (test != value) {
+        printf("FAILED teamvector_parallel_reduce_reducer %i %i %lf %lf\n",
+               team.league_rank(), team.team_rank(), static_cast<double>(test),
+               static_cast<double>(value));
 
         flag() = 1;
       }
-      if ( test != shared_value(0) ) {
-        printf( "FAILED teamvector_parallel_reduce_reducer shared value %i %i %lf %lf\n",
-                team.league_rank(), team.team_rank(),
-                static_cast<double>( test ), static_cast<double>( shared_value(0) ) );
+      if (test != shared_value(0)) {
+        printf(
+            "FAILED teamvector_parallel_reduce_reducer shared value %i %i %lf "
+            "%lf\n",
+            team.league_rank(), team.team_rank(), static_cast<double>(test),
+            static_cast<double>(shared_value(0)));
 
         flag() = 1;
       }
@@ -410,55 +433,61 @@ struct functor_teamvector_reduce_reducer {
   }
 };
 
-template< typename Scalar, class ExecutionSpace >
-bool test_scalar( int nteams, int team_size, int test ) {
-  Kokkos::View< int, Kokkos::LayoutLeft, ExecutionSpace > d_flag( "flag" );
-  typename Kokkos::View< int, Kokkos::LayoutLeft, ExecutionSpace >::HostMirror h_flag( "h_flag" );
+template <typename Scalar, class ExecutionSpace>
+bool test_scalar(int nteams, int team_size, int test) {
+  Kokkos::View<int, Kokkos::LayoutLeft, ExecutionSpace> d_flag("flag");
+  typename Kokkos::View<int, Kokkos::LayoutLeft, ExecutionSpace>::HostMirror
+      h_flag("h_flag");
   h_flag() = 0;
-  Kokkos::deep_copy( d_flag, h_flag );
+  Kokkos::deep_copy(d_flag, h_flag);
 
-  if ( test == 0 ) {
-    Kokkos::parallel_for( "Test::TeamVectorFor", Kokkos::TeamPolicy< ExecutionSpace >( nteams, team_size, 8 ),
-                          functor_teamvector_for< Scalar, ExecutionSpace >( d_flag ) );
-  }
-  else if ( test == 1 ) {
-    Kokkos::parallel_for( "Test::TeamVectorReduce", Kokkos::TeamPolicy< ExecutionSpace >( nteams, team_size, 8 ),
-                          functor_teamvector_reduce< Scalar, ExecutionSpace >( d_flag ) );
-  }
-  else if ( test == 2 ) {
-    Kokkos::parallel_for( "Test::TeamVectorReduceReducer", Kokkos::TeamPolicy< ExecutionSpace >( nteams, team_size, 8 ),
-                          functor_teamvector_reduce_reducer< Scalar, ExecutionSpace >( d_flag ) );
+  if (test == 0) {
+    Kokkos::parallel_for(
+        "Test::TeamVectorFor",
+        Kokkos::TeamPolicy<ExecutionSpace>(nteams, team_size, 8),
+        functor_teamvector_for<Scalar, ExecutionSpace>(d_flag));
+  } else if (test == 1) {
+    Kokkos::parallel_for(
+        "Test::TeamVectorReduce",
+        Kokkos::TeamPolicy<ExecutionSpace>(nteams, team_size, 8),
+        functor_teamvector_reduce<Scalar, ExecutionSpace>(d_flag));
+  } else if (test == 2) {
+    Kokkos::parallel_for(
+        "Test::TeamVectorReduceReducer",
+        Kokkos::TeamPolicy<ExecutionSpace>(nteams, team_size, 8),
+        functor_teamvector_reduce_reducer<Scalar, ExecutionSpace>(d_flag));
   }
 
-  Kokkos::deep_copy( h_flag, d_flag );
+  Kokkos::deep_copy(h_flag, d_flag);
 
-  return ( h_flag() == 0 );
+  return (h_flag() == 0);
 }
 
-template< class ExecutionSpace >
-bool Test( int test ) {
+template <class ExecutionSpace>
+bool Test(int test) {
   bool passed = true;
 
   int team_size = 33;
-  if( team_size > int(ExecutionSpace::concurrency()))
+  if (team_size > int(ExecutionSpace::concurrency()))
     team_size = int(ExecutionSpace::concurrency());
-  passed = passed && test_scalar< int, ExecutionSpace >( 317, team_size, test );
-  passed = passed && test_scalar< long long int, ExecutionSpace >( 317, team_size, test );
-  passed = passed && test_scalar< float, ExecutionSpace >( 317, team_size, test );
-  passed = passed && test_scalar< double, ExecutionSpace >( 317, team_size, test );
-  passed = passed && test_scalar< my_complex, ExecutionSpace >( 317, team_size, test );
+  passed = passed && test_scalar<int, ExecutionSpace>(317, team_size, test);
+  passed = passed &&
+           test_scalar<long long int, ExecutionSpace>(317, team_size, test);
+  passed = passed && test_scalar<float, ExecutionSpace>(317, team_size, test);
+  passed = passed && test_scalar<double, ExecutionSpace>(317, team_size, test);
+  passed =
+      passed && test_scalar<my_complex, ExecutionSpace>(317, team_size, test);
 
   return passed;
 }
 
-} // namespace TestTeamVectorRange
+}  // namespace TestTeamVectorRange
 
 namespace Test {
 
-TEST_F( TEST_CATEGORY, team_teamvector_range )
-{
-  ASSERT_TRUE( ( TestTeamVectorRange::Test< TEST_EXECSPACE >( 0 ) ) );
-  ASSERT_TRUE( ( TestTeamVectorRange::Test< TEST_EXECSPACE >( 1 ) ) );
-  ASSERT_TRUE( ( TestTeamVectorRange::Test< TEST_EXECSPACE >( 2 ) ) );
-}
+TEST(TEST_CATEGORY, team_teamvector_range) {
+  ASSERT_TRUE((TestTeamVectorRange::Test<TEST_EXECSPACE>(0)));
+  ASSERT_TRUE((TestTeamVectorRange::Test<TEST_EXECSPACE>(1)));
+  ASSERT_TRUE((TestTeamVectorRange::Test<TEST_EXECSPACE>(2)));
 }
+}  // namespace Test
diff --git a/lib/kokkos/core/unit_test/TestTemplateMetaFunctions.hpp b/lib/kokkos/core/unit_test/TestTemplateMetaFunctions.hpp
index ac32aeb0be..1e25d46dfe 100644
--- a/lib/kokkos/core/unit_test/TestTemplateMetaFunctions.hpp
+++ b/lib/kokkos/core/unit_test/TestTemplateMetaFunctions.hpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -47,170 +48,168 @@
 
 namespace {
 
-template< class Scalar, class ExecutionSpace >
+template <class Scalar, class ExecutionSpace>
 struct SumPlain {
   typedef ExecutionSpace execution_space;
-  typedef typename Kokkos::View< Scalar*, execution_space > type;
+  typedef typename Kokkos::View<Scalar*, execution_space> type;
 
   type view;
 
-  SumPlain( type view_ ) : view( view_ ) {}
+  SumPlain(type view_) : view(view_) {}
 
   KOKKOS_INLINE_FUNCTION
-  void operator() ( int i, Scalar & val ) {
-    val += Scalar();
-  }
+  void operator()(int i, Scalar& val) { val += Scalar(); }
 };
 
-template< class Scalar, class ExecutionSpace >
+template <class Scalar, class ExecutionSpace>
 struct SumInitJoinFinalValueType {
   typedef ExecutionSpace execution_space;
-  typedef typename Kokkos::View< Scalar*, execution_space > type;
+  typedef typename Kokkos::View<Scalar*, execution_space> type;
   typedef Scalar value_type;
 
   type view;
 
-  SumInitJoinFinalValueType( type view_ ) : view( view_ ) {}
+  SumInitJoinFinalValueType(type view_) : view(view_) {}
 
   KOKKOS_INLINE_FUNCTION
-  void init( value_type & val ) const {
-    val = value_type();
-  }
+  void init(value_type& val) const { val = value_type(); }
 
   KOKKOS_INLINE_FUNCTION
-  void join( volatile value_type & val, volatile value_type & src ) const {
+  void join(volatile value_type& val, volatile value_type& src) const {
     val += src;
   }
 
   KOKKOS_INLINE_FUNCTION
-  void operator()( int i, value_type & val ) const {
-    val += value_type();
-  }
+  void operator()(int i, value_type& val) const { val += value_type(); }
 };
 
-template< class Scalar, class ExecutionSpace >
+template <class Scalar, class ExecutionSpace>
 struct SumInitJoinFinalValueType2 {
   typedef ExecutionSpace execution_space;
-  typedef typename Kokkos::View< Scalar*, execution_space > type;
+  typedef typename Kokkos::View<Scalar*, execution_space> type;
   typedef Scalar value_type;
 
   type view;
 
-  SumInitJoinFinalValueType2( type view_ ) : view( view_ ) {}
+  SumInitJoinFinalValueType2(type view_) : view(view_) {}
 
   KOKKOS_INLINE_FUNCTION
-  void init( volatile value_type & val ) const {
-    val = value_type();
-  }
+  void init(volatile value_type& val) const { val = value_type(); }
 
   KOKKOS_INLINE_FUNCTION
-  void join( volatile value_type & val, const volatile value_type & src ) const {
+  void join(volatile value_type& val, const volatile value_type& src) const {
     val += src;
   }
 
   KOKKOS_INLINE_FUNCTION
-  void operator()( int i, value_type & val ) const {
-    val += value_type();
-  }
+  void operator()(int i, value_type& val) const { val += value_type(); }
 };
 
-template< class Scalar, class ExecutionSpace >
+template <class Scalar, class ExecutionSpace>
 struct SumInitJoinFinalValueTypeArray {
   typedef ExecutionSpace execution_space;
-  typedef typename Kokkos::View< Scalar*, execution_space > type;
+  typedef typename Kokkos::View<Scalar*, execution_space> type;
   typedef Scalar value_type[];
 
   type view;
   int n;
 
-  SumInitJoinFinalValueTypeArray( type view_, int n_ ) : view( view_ ), n( n_ ) {}
+  SumInitJoinFinalValueTypeArray(type view_, int n_) : view(view_), n(n_) {}
 
   KOKKOS_INLINE_FUNCTION
-  void init( value_type val ) const {
-    for ( int k = 0; k < n; k++ ) {
+  void init(value_type val) const {
+    for (int k = 0; k < n; k++) {
       val[k] = 0;
     }
   }
 
   KOKKOS_INLINE_FUNCTION
-  void join( volatile value_type val, const volatile value_type src ) const {
-    for ( int k = 0; k < n; k++ ) {
+  void join(volatile value_type val, const volatile value_type src) const {
+    for (int k = 0; k < n; k++) {
       val[k] += src[k];
     }
   }
 
   KOKKOS_INLINE_FUNCTION
-  void operator()( int i, value_type val ) const {
-    for ( int k = 0; k < n; k++ ) {
+  void operator()(int i, value_type val) const {
+    for (int k = 0; k < n; k++) {
       val[k] += k * i;
     }
   }
 };
 
-template< class Scalar, class ExecutionSpace >
+template <class Scalar, class ExecutionSpace>
 struct SumWrongInitJoinFinalValueType {
   typedef ExecutionSpace execution_space;
-  typedef typename Kokkos::View< Scalar*, execution_space > type;
+  typedef typename Kokkos::View<Scalar*, execution_space> type;
   typedef Scalar value_type;
 
   type view;
 
-  SumWrongInitJoinFinalValueType( type view_ ) : view( view_ ) {}
+  SumWrongInitJoinFinalValueType(type view_) : view(view_) {}
 
   KOKKOS_INLINE_FUNCTION
-  void init( double & val ) const {
-    val = double();
-  }
+  void init(double& val) const { val = double(); }
 
   KOKKOS_INLINE_FUNCTION
-  void join( volatile value_type & val, const value_type & src ) const {
+  void join(volatile value_type& val, const value_type& src) const {
     val += src;
   }
 
   KOKKOS_INLINE_FUNCTION
-  void operator()( int i, value_type & val ) const {
-    val += value_type();
-  }
+  void operator()(int i, value_type& val) const { val += value_type(); }
 };
 
-template< class Scalar, class ExecutionSpace >
+template <class Scalar, class ExecutionSpace>
 void TestTemplateMetaFunctions() {
-  typedef typename Kokkos::View< Scalar*, ExecutionSpace > type;
-  type a( "A", 100 );
-/*
-  int sum_plain_has_init_arg = Kokkos::Impl::FunctorHasInit< SumPlain<Scalar, ExecutionSpace>, Scalar & >::value;
-  ASSERT_EQ( sum_plain_has_init_arg, 0 );
-  int sum_initjoinfinalvaluetype_has_init_arg = Kokkos::Impl::FunctorHasInit< SumInitJoinFinalValueType<Scalar, ExecutionSpace>, Scalar >::value;
-  ASSERT_EQ( sum_initjoinfinalvaluetype_has_init_arg, 1 );
-  int sum_initjoinfinalvaluetype_has_init_arg2 = Kokkos::Impl::FunctorHasInit< SumInitJoinFinalValueType2<Scalar,ExecutionSpace>, Scalar >::value;
-  ASSERT_EQ( sum_initjoinfinalvaluetype_has_init_arg2, 1 );
-  int sum_wronginitjoinfinalvaluetype_has_init_arg = Kokkos::Impl::FunctorHasInit< SumWrongInitJoinFinalValueType<Scalar, ExecutionSpace>, Scalar >::value;
-  ASSERT_EQ( sum_wronginitjoinfinalvaluetype_has_init_arg, 0 );
+  typedef typename Kokkos::View<Scalar*, ExecutionSpace> type;
+  type a("A", 100);
+  /*
+    int sum_plain_has_init_arg = Kokkos::Impl::FunctorHasInit< SumPlain<Scalar,
+    ExecutionSpace>, Scalar & >::value; ASSERT_EQ( sum_plain_has_init_arg, 0 );
+    int sum_initjoinfinalvaluetype_has_init_arg = Kokkos::Impl::FunctorHasInit<
+    SumInitJoinFinalValueType<Scalar, ExecutionSpace>, Scalar >::value;
+    ASSERT_EQ( sum_initjoinfinalvaluetype_has_init_arg, 1 );
+    int sum_initjoinfinalvaluetype_has_init_arg2 = Kokkos::Impl::FunctorHasInit<
+    SumInitJoinFinalValueType2<Scalar,ExecutionSpace>, Scalar >::value;
+    ASSERT_EQ( sum_initjoinfinalvaluetype_has_init_arg2, 1 );
+    int sum_wronginitjoinfinalvaluetype_has_init_arg =
+    Kokkos::Impl::FunctorHasInit< SumWrongInitJoinFinalValueType<Scalar,
+    ExecutionSpace>, Scalar >::value; ASSERT_EQ(
+    sum_wronginitjoinfinalvaluetype_has_init_arg, 0 );
 
-  //int sum_initjoinfinalvaluetypearray_has_init_arg = Kokkos::Impl::FunctorHasInit< SumInitJoinFinalValueTypeArray<Scalar, ExecutionSpace>, Scalar[] >::value;
-  //ASSERT_EQ( sum_initjoinfinalvaluetypearray_has_init_arg, 1 );
+    //int sum_initjoinfinalvaluetypearray_has_init_arg =
+    Kokkos::Impl::FunctorHasInit< SumInitJoinFinalValueTypeArray<Scalar,
+    ExecutionSpace>, Scalar[] >::value;
+    //ASSERT_EQ( sum_initjoinfinalvaluetypearray_has_init_arg, 1 );
 
-  //printf( "Values Init: %i %i %i\n", sum_plain_has_init_arg, sum_initjoinfinalvaluetype_has_init_arg, sum_wronginitjoinfinalvaluetype_has_init_arg );
+    //printf( "Values Init: %i %i %i\n", sum_plain_has_init_arg,
+    sum_initjoinfinalvaluetype_has_init_arg,
+    sum_wronginitjoinfinalvaluetype_has_init_arg );
 
-  int sum_plain_has_join_arg = Kokkos::Impl::FunctorHasJoin< SumPlain<Scalar, ExecutionSpace>, Scalar >::value;
-  ASSERT_EQ( sum_plain_has_join_arg, 0 );
-  int sum_initjoinfinalvaluetype_has_join_arg = Kokkos::Impl::FunctorHasJoin< SumInitJoinFinalValueType<Scalar, ExecutionSpace>, Scalar >::value;
-  ASSERT_EQ( sum_initjoinfinalvaluetype_has_join_arg, 1 );
-  int sum_initjoinfinalvaluetype_has_join_arg2 = Kokkos::Impl::FunctorHasJoin< SumInitJoinFinalValueType2<Scalar, ExecutionSpace>, Scalar >::value;
-  ASSERT_EQ( sum_initjoinfinalvaluetype_has_join_arg2, 1 );
-  int sum_wronginitjoinfinalvaluetype_has_join_arg = Kokkos::Impl::FunctorHasJoin< SumWrongInitJoinFinalValueType<Scalar, ExecutionSpace>, Scalar >::value;
-  ASSERT_EQ( sum_wronginitjoinfinalvaluetype_has_join_arg, 0 );
+    int sum_plain_has_join_arg = Kokkos::Impl::FunctorHasJoin< SumPlain<Scalar,
+    ExecutionSpace>, Scalar >::value; ASSERT_EQ( sum_plain_has_join_arg, 0 );
+    int sum_initjoinfinalvaluetype_has_join_arg = Kokkos::Impl::FunctorHasJoin<
+    SumInitJoinFinalValueType<Scalar, ExecutionSpace>, Scalar >::value;
+    ASSERT_EQ( sum_initjoinfinalvaluetype_has_join_arg, 1 );
+    int sum_initjoinfinalvaluetype_has_join_arg2 = Kokkos::Impl::FunctorHasJoin<
+    SumInitJoinFinalValueType2<Scalar, ExecutionSpace>, Scalar >::value;
+    ASSERT_EQ( sum_initjoinfinalvaluetype_has_join_arg2, 1 );
+    int sum_wronginitjoinfinalvaluetype_has_join_arg =
+    Kokkos::Impl::FunctorHasJoin< SumWrongInitJoinFinalValueType<Scalar,
+    ExecutionSpace>, Scalar >::value; ASSERT_EQ(
+    sum_wronginitjoinfinalvaluetype_has_join_arg, 0 );
 
-  //printf( "Values Join: %i %i %i\n", sum_plain_has_join_arg, sum_initjoinfinalvaluetype_has_join_arg, sum_wronginitjoinfinalvaluetype_has_join_arg );
-*/
+    //printf( "Values Join: %i %i %i\n", sum_plain_has_join_arg,
+    sum_initjoinfinalvaluetype_has_join_arg,
+    sum_wronginitjoinfinalvaluetype_has_join_arg );
+  */
 }
 
-} // namespace
+}  // namespace
 
 namespace Test {
-TEST_F( TEST_CATEGORY, template_meta_functions )
-{
-  TestTemplateMetaFunctions< int, TEST_EXECSPACE >();
+TEST(TEST_CATEGORY, template_meta_functions) {
+  TestTemplateMetaFunctions<int, TEST_EXECSPACE>();
 }
-}
-
+}  // namespace Test
diff --git a/lib/kokkos/core/unit_test/TestTile.hpp b/lib/kokkos/core/unit_test/TestTile.hpp
index a58755dc9b..9e916ef313 100644
--- a/lib/kokkos/core/unit_test/TestTile.hpp
+++ b/lib/kokkos/core/unit_test/TestTile.hpp
@@ -1,10 +1,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -22,10 +23,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -50,68 +51,71 @@
 
 namespace TestTile {
 
-template < typename Device, typename TileLayout >
-struct ReduceTileErrors
-{
+template <typename Device, typename TileLayout>
+struct ReduceTileErrors {
   typedef Device execution_space;
-  typedef Kokkos::View< ptrdiff_t**, TileLayout, Device >  array_type;
-  typedef Kokkos::View< ptrdiff_t[ TileLayout::N0 ][ TileLayout::N1 ], Kokkos::LayoutLeft, Device >  tile_type;
+  typedef Kokkos::View<ptrdiff_t**, TileLayout, Device> array_type;
+  typedef Kokkos::View<ptrdiff_t[TileLayout::N0][TileLayout::N1],
+                       Kokkos::LayoutLeft, Device>
+      tile_type;
   typedef ptrdiff_t value_type;
 
   array_type m_array;
 
-  ReduceTileErrors( array_type a ) : m_array( a ) {}
+  ReduceTileErrors(array_type a) : m_array(a) {}
 
   KOKKOS_INLINE_FUNCTION
-  static void init( value_type & errors ) { errors = 0; }
+  static void init(value_type& errors) { errors = 0; }
 
   KOKKOS_INLINE_FUNCTION
-  static void join( volatile value_type & errors,
-                    const volatile value_type & src_errors )
-  {
+  static void join(volatile value_type& errors,
+                   const volatile value_type& src_errors) {
     errors += src_errors;
   }
 
   // Initialize.
   KOKKOS_INLINE_FUNCTION
-  void operator()( size_t iwork ) const
-  {
+  void operator()(size_t iwork) const {
     const size_t i = iwork % m_array.extent(0);
     const size_t j = iwork / m_array.extent(0);
 
-    if ( j < m_array.extent(1) ) {
-      m_array( i, j ) = &m_array( i, j ) - &m_array( 0, 0 );
+    if (j < m_array.extent(1)) {
+      m_array(i, j) = &m_array(i, j) - &m_array(0, 0);
 
-      //printf( "m_array(%d, %d) = %d\n", int( i ), int( j ), int( m_array( i, j ) ) );
+      // printf( "m_array(%d, %d) = %d\n", int( i ), int( j ), int( m_array( i,
+      // j ) ) );
     }
   }
 
   // Verify:
   KOKKOS_INLINE_FUNCTION
-  void operator()( size_t iwork, value_type & errors ) const
-  {
-    const size_t tile_dim0 = ( m_array.extent(0) + TileLayout::N0 - 1 ) / TileLayout::N0;
-    const size_t tile_dim1 = ( m_array.extent(1) + TileLayout::N1 - 1 ) / TileLayout::N1;
+  void operator()(size_t iwork, value_type& errors) const {
+    const size_t tile_dim0 =
+        (m_array.extent(0) + TileLayout::N0 - 1) / TileLayout::N0;
+    const size_t tile_dim1 =
+        (m_array.extent(1) + TileLayout::N1 - 1) / TileLayout::N1;
 
     const size_t itile = iwork % tile_dim0;
     const size_t jtile = iwork / tile_dim0;
 
-    if ( jtile < tile_dim1 ) {
-      tile_type tile = Kokkos::tile_subview( m_array, itile, jtile );
+    if (jtile < tile_dim1) {
+      tile_type tile = Kokkos::tile_subview(m_array, itile, jtile);
 
-      if ( tile( 0, 0 ) != ptrdiff_t( ( itile + jtile * tile_dim0 ) * TileLayout::N0 * TileLayout::N1 ) ) {
+      if (tile(0, 0) != ptrdiff_t((itile + jtile * tile_dim0) * TileLayout::N0 *
+                                  TileLayout::N1)) {
         ++errors;
-      }
-      else {
-        for ( size_t j = 0; j < size_t( TileLayout::N1 ); ++j ) {
-          for ( size_t i = 0; i < size_t( TileLayout::N0 ); ++i ) {
+      } else {
+        for (size_t j = 0; j < size_t(TileLayout::N1); ++j) {
+          for (size_t i = 0; i < size_t(TileLayout::N0); ++i) {
             const size_t iglobal = i + itile * TileLayout::N0;
             const size_t jglobal = j + jtile * TileLayout::N1;
 
-            if ( iglobal < m_array.extent(0) && jglobal < m_array.extent(1) ) {
-              if ( tile( i, j ) != ptrdiff_t( tile( 0, 0 ) + i + j * TileLayout::N0 ) ) ++errors;
+            if (iglobal < m_array.extent(0) && jglobal < m_array.extent(1)) {
+              if (tile(i, j) != ptrdiff_t(tile(0, 0) + i + j * TileLayout::N0))
+                ++errors;
 
-              //printf( "tile(%d, %d)(%d, %d) = %d\n", int( itile ), int( jtile ), int( i ), int( j ), int( tile( i, j ) ) );
+              // printf( "tile(%d, %d)(%d, %d) = %d\n", int( itile ), int( jtile
+              // ), int( i ), int( j ), int( tile( i, j ) ) );
             }
           }
         }
@@ -120,57 +124,58 @@ struct ReduceTileErrors
   }
 };
 
-template< class Space, unsigned N0, unsigned N1 >
-void test( const size_t dim0, const size_t dim1 )
-{
-  typedef Kokkos::LayoutTileLeft< N0, N1 >  array_layout;
-  typedef ReduceTileErrors< Space, array_layout > functor_type;
+template <class Space, unsigned N0, unsigned N1>
+void test(const size_t dim0, const size_t dim1) {
+  typedef Kokkos::LayoutTileLeft<N0, N1> array_layout;
+  typedef ReduceTileErrors<Space, array_layout> functor_type;
 
-  const size_t tile_dim0 = ( dim0 + N0 - 1 ) / N0;
-  const size_t tile_dim1 = ( dim1 + N1 - 1 ) / N1;
+  const size_t tile_dim0 = (dim0 + N0 - 1) / N0;
+  const size_t tile_dim1 = (dim1 + N1 - 1) / N1;
 
-  typename functor_type::array_type array( "", dim0, dim1 );
+  typename functor_type::array_type array("", dim0, dim1);
 
-  Kokkos::parallel_for( Kokkos::RangePolicy< Space, size_t >( 0, dim0 * dim1 ), functor_type( array ) );
+  Kokkos::parallel_for(Kokkos::RangePolicy<Space, size_t>(0, dim0 * dim1),
+                       functor_type(array));
 
   ptrdiff_t error = 0;
 
-  Kokkos::parallel_reduce( Kokkos::RangePolicy< Space, size_t >( 0, tile_dim0 * tile_dim1 ), functor_type( array ), error );
+  Kokkos::parallel_reduce(
+      Kokkos::RangePolicy<Space, size_t>(0, tile_dim0 * tile_dim1),
+      functor_type(array), error);
 
-  EXPECT_EQ( error, ptrdiff_t( 0 ) );
+  EXPECT_EQ(error, ptrdiff_t(0));
 }
 
-} // namespace TestTile
+}  // namespace TestTile
 
 namespace Test {
-TEST_F( TEST_CATEGORY, tile_layout )
-{
-  TestTile::test< TEST_EXECSPACE, 1, 1 >( 1, 1 );
-  TestTile::test< TEST_EXECSPACE, 1, 1 >( 2, 3 );
-  TestTile::test< TEST_EXECSPACE, 1, 1 >( 9, 10 );
+TEST(TEST_CATEGORY, tile_layout) {
+  TestTile::test<TEST_EXECSPACE, 1, 1>(1, 1);
+  TestTile::test<TEST_EXECSPACE, 1, 1>(2, 3);
+  TestTile::test<TEST_EXECSPACE, 1, 1>(9, 10);
 
-  TestTile::test< TEST_EXECSPACE, 2, 2 >( 1, 1 );
-  TestTile::test< TEST_EXECSPACE, 2, 2 >( 2, 3 );
-  TestTile::test< TEST_EXECSPACE, 2, 2 >( 4, 4 );
-  TestTile::test< TEST_EXECSPACE, 2, 2 >( 9, 9 );
+  TestTile::test<TEST_EXECSPACE, 2, 2>(1, 1);
+  TestTile::test<TEST_EXECSPACE, 2, 2>(2, 3);
+  TestTile::test<TEST_EXECSPACE, 2, 2>(4, 4);
+  TestTile::test<TEST_EXECSPACE, 2, 2>(9, 9);
 
-  TestTile::test< TEST_EXECSPACE, 2, 4 >( 9, 9 );
-  TestTile::test< TEST_EXECSPACE, 4, 2 >( 9, 9 );
+  TestTile::test<TEST_EXECSPACE, 2, 4>(9, 9);
+  TestTile::test<TEST_EXECSPACE, 4, 2>(9, 9);
 
-  TestTile::test< TEST_EXECSPACE, 4, 4 >( 1, 1 );
-  TestTile::test< TEST_EXECSPACE, 4, 4 >( 4, 4 );
-  TestTile::test< TEST_EXECSPACE, 4, 4 >( 9, 9 );
-  TestTile::test< TEST_EXECSPACE, 4, 4 >( 9, 11 );
+  TestTile::test<TEST_EXECSPACE, 4, 4>(1, 1);
+  TestTile::test<TEST_EXECSPACE, 4, 4>(4, 4);
+  TestTile::test<TEST_EXECSPACE, 4, 4>(9, 9);
+  TestTile::test<TEST_EXECSPACE, 4, 4>(9, 11);
 
-  TestTile::test< TEST_EXECSPACE, 8, 8 >( 1, 1 );
-  TestTile::test< TEST_EXECSPACE, 8, 8 >( 4, 4 );
-  TestTile::test< TEST_EXECSPACE, 8, 8 >( 9, 9 );
-  TestTile::test< TEST_EXECSPACE, 8, 8 >( 9, 11 );
+  TestTile::test<TEST_EXECSPACE, 8, 8>(1, 1);
+  TestTile::test<TEST_EXECSPACE, 8, 8>(4, 4);
+  TestTile::test<TEST_EXECSPACE, 8, 8>(9, 9);
+  TestTile::test<TEST_EXECSPACE, 8, 8>(9, 11);
 }
 
-}
+}  // namespace Test
 
-#endif // KOKKOS_ENABLE_DEPRECATED_CODE
+#endif  // KOKKOS_ENABLE_DEPRECATED_CODE
 //=====================================================================
 
-#endif //TEST_TILE_HPP
+#endif  // TEST_TILE_HPP
diff --git a/lib/kokkos/core/unit_test/TestUniqueToken.hpp b/lib/kokkos/core/unit_test/TestUniqueToken.hpp
index 5c8324c63d..c85ba1afc3 100644
--- a/lib/kokkos/core/unit_test/TestUniqueToken.hpp
+++ b/lib/kokkos/core/unit_test/TestUniqueToken.hpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -47,92 +48,87 @@
 
 namespace Test {
 
-template< class Space >
-class TestUniqueToken
-{
-public:
-  typedef typename Space::execution_space  execution_space;
-  typedef Kokkos::View< int * , execution_space > view_type ;
+template <class Space>
+class TestUniqueToken {
+ public:
+  typedef typename Space::execution_space execution_space;
+  typedef Kokkos::View<int*, execution_space> view_type;
 
-  Kokkos::Experimental::UniqueToken< execution_space , Kokkos::Experimental::UniqueTokenScope::Global > tokens ;
+  Kokkos::Experimental::UniqueToken<
+      execution_space, Kokkos::Experimental::UniqueTokenScope::Global>
+      tokens;
 
-  view_type verify ;
-  view_type counts ;
-  view_type errors ;
+  view_type verify;
+  view_type counts;
+  view_type errors;
 
   KOKKOS_INLINE_FUNCTION
-  void operator()( long ) const
-  {
+  void operator()(long) const {
     const int32_t t = tokens.acquire();
 
-    bool ok = true ;
+    bool ok = true;
 
-    ok = ok && 0 <= t ;
+    ok = ok && 0 <= t;
     ok = ok && t < tokens.size();
-    ok = ok && 0 == Kokkos::atomic_fetch_add( & verify(t) , 1 );
+    ok = ok && 0 == Kokkos::atomic_fetch_add(&verify(t), 1);
 
-    Kokkos::atomic_fetch_add( & counts(t) , 1 );
+    Kokkos::atomic_fetch_add(&counts(t), 1);
 
-    ok = ok && 1 == Kokkos::atomic_fetch_add( & verify(t) , -1 );
+    ok = ok && 1 == Kokkos::atomic_fetch_add(&verify(t), -1);
 
-    if ( ! ok ) { Kokkos::atomic_fetch_add( & errors(0) , 1 ) ; }
+    if (!ok) {
+      Kokkos::atomic_fetch_add(&errors(0), 1);
+    }
 
     tokens.release(t);
   }
 
   TestUniqueToken()
-    : tokens( execution_space() )
-    , verify( "TestUniqueTokenVerify" , tokens.size() )
-    , counts( "TestUniqueTokenCounts" , tokens.size() )
-    , errors( "TestUniqueTokenErrors" , 1 )
-    {}
+      : tokens(execution_space()),
+        verify("TestUniqueTokenVerify", tokens.size()),
+        counts("TestUniqueTokenCounts", tokens.size()),
+        errors("TestUniqueTokenErrors", 1) {}
+
+  static void run() {
+    using policy = Kokkos::RangePolicy<execution_space>;
+
+    TestUniqueToken self;
 
-  static void run()
     {
-      using policy = Kokkos::RangePolicy<execution_space> ;
+      const int duplicate = 100;
+      const long n        = duplicate * self.tokens.size();
 
-      TestUniqueToken self ;
-
-      {
-        const int duplicate = 100 ;
-        const long n = duplicate * self.tokens.size();
-
-        Kokkos::parallel_for( policy(0,n) , self );
-        Kokkos::parallel_for( policy(0,n) , self );
-        Kokkos::parallel_for( policy(0,n) , self );
-        Kokkos::fence();
-      }
-
-      typename view_type::HostMirror host_counts =
-        Kokkos::create_mirror_view( self.counts );
-
-      Kokkos::deep_copy( host_counts , self.counts );
-
-      int32_t max = 0 ;
-
-      {
-        const long n = host_counts.extent(0);
-        for ( long i = 0 ; i < n ; ++i ) {
-          if ( max < host_counts[i] ) max = host_counts[i] ;
-        }
-      }
-
-      std::cout << "TestUniqueToken max reuse = " << max << std::endl ;
-
-      typename view_type::HostMirror host_errors =
-        Kokkos::create_mirror_view( self.errors );
-
-      Kokkos::deep_copy( host_errors , self.errors );
-
-      ASSERT_EQ( host_errors(0) , 0 );
+      Kokkos::parallel_for(policy(0, n), self);
+      Kokkos::parallel_for(policy(0, n), self);
+      Kokkos::parallel_for(policy(0, n), self);
+      Kokkos::fence();
     }
+
+    typename view_type::HostMirror host_counts =
+        Kokkos::create_mirror_view(self.counts);
+
+    Kokkos::deep_copy(host_counts, self.counts);
+
+    int32_t max = 0;
+
+    {
+      const long n = host_counts.extent(0);
+      for (long i = 0; i < n; ++i) {
+        if (max < host_counts[i]) max = host_counts[i];
+      }
+    }
+
+    std::cout << "TestUniqueToken max reuse = " << max << std::endl;
+
+    typename view_type::HostMirror host_errors =
+        Kokkos::create_mirror_view(self.errors);
+
+    Kokkos::deep_copy(host_errors, self.errors);
+
+    ASSERT_EQ(host_errors(0), 0);
+  }
 };
 
+TEST(TEST_CATEGORY, unique_token) { TestUniqueToken<TEST_EXECSPACE>::run(); }
 
-TEST_F( TEST_CATEGORY, unique_token )
-{
-  TestUniqueToken< TEST_EXECSPACE >::run();
-}
-
-} // namespace Test
-
+}  // namespace Test
diff --git a/lib/kokkos/core/unit_test/TestUtilities.hpp b/lib/kokkos/core/unit_test/TestUtilities.hpp
index f3deabad03..f5f027a555 100644
--- a/lib/kokkos/core/unit_test/TestUtilities.hpp
+++ b/lib/kokkos/core/unit_test/TestUtilities.hpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -51,251 +52,305 @@
 
 namespace Test {
 
-inline
-void test_utilities()
-{
+inline void test_utilities() {
   using namespace Kokkos::Impl;
 
   {
-    using i = integer_sequence< int >;
-    using j = make_integer_sequence< int, 0 >;
+    using i = integer_sequence<int>;
+    using j = make_integer_sequence<int, 0>;
 
-    static_assert( std::is_same< i, j >::value, "Error: make_integer_sequence" );
-    static_assert( i::size() == 0u, "Error: integer_sequence.size()" );
+    static_assert(std::is_same<i, j>::value, "Error: make_integer_sequence");
+    static_assert(i::size() == 0u, "Error: integer_sequence.size()");
   }
 
   {
-    using i = integer_sequence< int, 0 >;
-    using j = make_integer_sequence< int, 1 >;
+    using i = integer_sequence<int, 0>;
+    using j = make_integer_sequence<int, 1>;
 
-    static_assert( std::is_same< i, j >::value, "Error: make_integer_sequence" );
-    static_assert( i::size() == 1u, "Error: integer_sequence.size()" );
+    static_assert(std::is_same<i, j>::value, "Error: make_integer_sequence");
+    static_assert(i::size() == 1u, "Error: integer_sequence.size()");
 
-    static_assert( integer_sequence_at< 0, i >::value == 0, "Error: integer_sequence_at" );
+    static_assert(integer_sequence_at<0, i>::value == 0,
+                  "Error: integer_sequence_at");
 
-    static_assert( at( 0, i{} ) == 0, "Error: at(unsigned, integer_sequence)" );
+    static_assert(at(0, i{}) == 0, "Error: at(unsigned, integer_sequence)");
   }
 
   {
-    using i = integer_sequence< int, 0, 1 >;
-    using j = make_integer_sequence< int, 2 >;
+    using i = integer_sequence<int, 0, 1>;
+    using j = make_integer_sequence<int, 2>;
 
-    static_assert( std::is_same< i, j >::value, "Error: make_integer_sequence" );
-    static_assert( i::size() == 2u, "Error: integer_sequence.size()" );
+    static_assert(std::is_same<i, j>::value, "Error: make_integer_sequence");
+    static_assert(i::size() == 2u, "Error: integer_sequence.size()");
 
-    static_assert( integer_sequence_at< 0, i >::value == 0, "Error: integer_sequence_at" );
-    static_assert( integer_sequence_at< 1, i >::value == 1, "Error: integer_sequence_at" );
+    static_assert(integer_sequence_at<0, i>::value == 0,
+                  "Error: integer_sequence_at");
+    static_assert(integer_sequence_at<1, i>::value == 1,
+                  "Error: integer_sequence_at");
 
-    static_assert( at( 0, i{} ) == 0, "Error: at(unsigned, integer_sequence)" );
-    static_assert( at( 1, i{} ) == 1, "Error: at(unsigned, integer_sequence)" );
+    static_assert(at(0, i{}) == 0, "Error: at(unsigned, integer_sequence)");
+    static_assert(at(1, i{}) == 1, "Error: at(unsigned, integer_sequence)");
   }
 
   {
-    using i = integer_sequence< int, 0, 1, 2 >;
-    using j = make_integer_sequence< int, 3 >;
+    using i = integer_sequence<int, 0, 1, 2>;
+    using j = make_integer_sequence<int, 3>;
 
-    static_assert( std::is_same< i, j >::value, "Error: make_integer_sequence" );
-    static_assert( i::size() == 3u, "Error: integer_sequence.size()" );
+    static_assert(std::is_same<i, j>::value, "Error: make_integer_sequence");
+    static_assert(i::size() == 3u, "Error: integer_sequence.size()");
 
-    static_assert( integer_sequence_at< 0, i >::value == 0, "Error: integer_sequence_at" );
-    static_assert( integer_sequence_at< 1, i >::value == 1, "Error: integer_sequence_at" );
-    static_assert( integer_sequence_at< 2, i >::value == 2, "Error: integer_sequence_at" );
+    static_assert(integer_sequence_at<0, i>::value == 0,
+                  "Error: integer_sequence_at");
+    static_assert(integer_sequence_at<1, i>::value == 1,
+                  "Error: integer_sequence_at");
+    static_assert(integer_sequence_at<2, i>::value == 2,
+                  "Error: integer_sequence_at");
 
-    static_assert( at( 0, i{} ) == 0, "Error: at(unsigned, integer_sequence)" );
-    static_assert( at( 1, i{} ) == 1, "Error: at(unsigned, integer_sequence)" );
-    static_assert( at( 2, i{} ) == 2, "Error: at(unsigned, integer_sequence)" );
+    static_assert(at(0, i{}) == 0, "Error: at(unsigned, integer_sequence)");
+    static_assert(at(1, i{}) == 1, "Error: at(unsigned, integer_sequence)");
+    static_assert(at(2, i{}) == 2, "Error: at(unsigned, integer_sequence)");
   }
 
   {
-    using i = integer_sequence< int, 0, 1, 2, 3 >;
-    using j = make_integer_sequence< int, 4 >;
+    using i = integer_sequence<int, 0, 1, 2, 3>;
+    using j = make_integer_sequence<int, 4>;
 
-    static_assert( std::is_same< i, j >::value, "Error: make_integer_sequence" );
-    static_assert( i::size() == 4u, "Error: integer_sequence.size()" );
+    static_assert(std::is_same<i, j>::value, "Error: make_integer_sequence");
+    static_assert(i::size() == 4u, "Error: integer_sequence.size()");
 
-    static_assert( integer_sequence_at< 0, i >::value == 0, "Error: integer_sequence_at" );
-    static_assert( integer_sequence_at< 1, i >::value == 1, "Error: integer_sequence_at" );
-    static_assert( integer_sequence_at< 2, i >::value == 2, "Error: integer_sequence_at" );
-    static_assert( integer_sequence_at< 3, i >::value == 3, "Error: integer_sequence_at" );
+    static_assert(integer_sequence_at<0, i>::value == 0,
+                  "Error: integer_sequence_at");
+    static_assert(integer_sequence_at<1, i>::value == 1,
+                  "Error: integer_sequence_at");
+    static_assert(integer_sequence_at<2, i>::value == 2,
+                  "Error: integer_sequence_at");
+    static_assert(integer_sequence_at<3, i>::value == 3,
+                  "Error: integer_sequence_at");
 
-    static_assert( at( 0, i{} ) == 0, "Error: at(unsigned, integer_sequence)" );
-    static_assert( at( 1, i{} ) == 1, "Error: at(unsigned, integer_sequence)" );
-    static_assert( at( 2, i{} ) == 2, "Error: at(unsigned, integer_sequence)" );
-    static_assert( at( 3, i{} ) == 3, "Error: at(unsigned, integer_sequence)" );
+    static_assert(at(0, i{}) == 0, "Error: at(unsigned, integer_sequence)");
+    static_assert(at(1, i{}) == 1, "Error: at(unsigned, integer_sequence)");
+    static_assert(at(2, i{}) == 2, "Error: at(unsigned, integer_sequence)");
+    static_assert(at(3, i{}) == 3, "Error: at(unsigned, integer_sequence)");
   }
 
   {
-    using i = integer_sequence< int, 0, 1, 2, 3, 4 >;
-    using j = make_integer_sequence< int, 5 >;
+    using i = integer_sequence<int, 0, 1, 2, 3, 4>;
+    using j = make_integer_sequence<int, 5>;
 
-    static_assert( std::is_same< i, j >::value, "Error: make_integer_sequence" );
-    static_assert( i::size() == 5u, "Error: integer_sequence.size()" );
+    static_assert(std::is_same<i, j>::value, "Error: make_integer_sequence");
+    static_assert(i::size() == 5u, "Error: integer_sequence.size()");
 
-    static_assert( integer_sequence_at< 0, i >::value == 0, "Error: integer_sequence_at" );
-    static_assert( integer_sequence_at< 1, i >::value == 1, "Error: integer_sequence_at" );
-    static_assert( integer_sequence_at< 2, i >::value == 2, "Error: integer_sequence_at" );
-    static_assert( integer_sequence_at< 3, i >::value == 3, "Error: integer_sequence_at" );
-    static_assert( integer_sequence_at< 4, i >::value == 4, "Error: integer_sequence_at" );
+    static_assert(integer_sequence_at<0, i>::value == 0,
+                  "Error: integer_sequence_at");
+    static_assert(integer_sequence_at<1, i>::value == 1,
+                  "Error: integer_sequence_at");
+    static_assert(integer_sequence_at<2, i>::value == 2,
+                  "Error: integer_sequence_at");
+    static_assert(integer_sequence_at<3, i>::value == 3,
+                  "Error: integer_sequence_at");
+    static_assert(integer_sequence_at<4, i>::value == 4,
+                  "Error: integer_sequence_at");
 
-    static_assert( at( 0, i{} ) == 0, "Error: at(unsigned, integer_sequence)" );
-    static_assert( at( 1, i{} ) == 1, "Error: at(unsigned, integer_sequence)" );
-    static_assert( at( 2, i{} ) == 2, "Error: at(unsigned, integer_sequence)" );
-    static_assert( at( 3, i{} ) == 3, "Error: at(unsigned, integer_sequence)" );
-    static_assert( at( 4, i{} ) == 4, "Error: at(unsigned, integer_sequence)" );
+    static_assert(at(0, i{}) == 0, "Error: at(unsigned, integer_sequence)");
+    static_assert(at(1, i{}) == 1, "Error: at(unsigned, integer_sequence)");
+    static_assert(at(2, i{}) == 2, "Error: at(unsigned, integer_sequence)");
+    static_assert(at(3, i{}) == 3, "Error: at(unsigned, integer_sequence)");
+    static_assert(at(4, i{}) == 4, "Error: at(unsigned, integer_sequence)");
   }
 
   {
-    using i = integer_sequence< int, 0, 1, 2, 3, 4, 5 >;
-    using j = make_integer_sequence< int, 6 >;
+    using i = integer_sequence<int, 0, 1, 2, 3, 4, 5>;
+    using j = make_integer_sequence<int, 6>;
 
-    static_assert( std::is_same< i, j >::value, "Error: make_integer_sequence" );
-    static_assert( i::size() == 6u, "Error: integer_sequence.size()" );
+    static_assert(std::is_same<i, j>::value, "Error: make_integer_sequence");
+    static_assert(i::size() == 6u, "Error: integer_sequence.size()");
 
-    static_assert( integer_sequence_at< 0, i >::value == 0, "Error: integer_sequence_at" );
-    static_assert( integer_sequence_at< 1, i >::value == 1, "Error: integer_sequence_at" );
-    static_assert( integer_sequence_at< 2, i >::value == 2, "Error: integer_sequence_at" );
-    static_assert( integer_sequence_at< 3, i >::value == 3, "Error: integer_sequence_at" );
-    static_assert( integer_sequence_at< 4, i >::value == 4, "Error: integer_sequence_at" );
-    static_assert( integer_sequence_at< 5, i >::value == 5, "Error: integer_sequence_at" );
+    static_assert(integer_sequence_at<0, i>::value == 0,
+                  "Error: integer_sequence_at");
+    static_assert(integer_sequence_at<1, i>::value == 1,
+                  "Error: integer_sequence_at");
+    static_assert(integer_sequence_at<2, i>::value == 2,
+                  "Error: integer_sequence_at");
+    static_assert(integer_sequence_at<3, i>::value == 3,
+                  "Error: integer_sequence_at");
+    static_assert(integer_sequence_at<4, i>::value == 4,
+                  "Error: integer_sequence_at");
+    static_assert(integer_sequence_at<5, i>::value == 5,
+                  "Error: integer_sequence_at");
 
-    static_assert( at( 0, i{} ) == 0, "Error: at(unsigned, integer_sequence)" );
-    static_assert( at( 1, i{} ) == 1, "Error: at(unsigned, integer_sequence)" );
-    static_assert( at( 2, i{} ) == 2, "Error: at(unsigned, integer_sequence)" );
-    static_assert( at( 3, i{} ) == 3, "Error: at(unsigned, integer_sequence)" );
-    static_assert( at( 4, i{} ) == 4, "Error: at(unsigned, integer_sequence)" );
-    static_assert( at( 5, i{} ) == 5, "Error: at(unsigned, integer_sequence)" );
+    static_assert(at(0, i{}) == 0, "Error: at(unsigned, integer_sequence)");
+    static_assert(at(1, i{}) == 1, "Error: at(unsigned, integer_sequence)");
+    static_assert(at(2, i{}) == 2, "Error: at(unsigned, integer_sequence)");
+    static_assert(at(3, i{}) == 3, "Error: at(unsigned, integer_sequence)");
+    static_assert(at(4, i{}) == 4, "Error: at(unsigned, integer_sequence)");
+    static_assert(at(5, i{}) == 5, "Error: at(unsigned, integer_sequence)");
   }
 
   {
-    using i = integer_sequence< int, 0, 1, 2, 3, 4, 5, 6 >;
-    using j = make_integer_sequence< int, 7 >;
+    using i = integer_sequence<int, 0, 1, 2, 3, 4, 5, 6>;
+    using j = make_integer_sequence<int, 7>;
 
-    static_assert( std::is_same< i, j >::value, "Error: make_integer_sequence" );
-    static_assert( i::size() == 7u, "Error: integer_sequence.size()" );
+    static_assert(std::is_same<i, j>::value, "Error: make_integer_sequence");
+    static_assert(i::size() == 7u, "Error: integer_sequence.size()");
 
-    static_assert( integer_sequence_at< 0, i >::value == 0, "Error: integer_sequence_at" );
-    static_assert( integer_sequence_at< 1, i >::value == 1, "Error: integer_sequence_at" );
-    static_assert( integer_sequence_at< 2, i >::value == 2, "Error: integer_sequence_at" );
-    static_assert( integer_sequence_at< 3, i >::value == 3, "Error: integer_sequence_at" );
-    static_assert( integer_sequence_at< 4, i >::value == 4, "Error: integer_sequence_at" );
-    static_assert( integer_sequence_at< 5, i >::value == 5, "Error: integer_sequence_at" );
-    static_assert( integer_sequence_at< 6, i >::value == 6, "Error: integer_sequence_at" );
+    static_assert(integer_sequence_at<0, i>::value == 0,
+                  "Error: integer_sequence_at");
+    static_assert(integer_sequence_at<1, i>::value == 1,
+                  "Error: integer_sequence_at");
+    static_assert(integer_sequence_at<2, i>::value == 2,
+                  "Error: integer_sequence_at");
+    static_assert(integer_sequence_at<3, i>::value == 3,
+                  "Error: integer_sequence_at");
+    static_assert(integer_sequence_at<4, i>::value == 4,
+                  "Error: integer_sequence_at");
+    static_assert(integer_sequence_at<5, i>::value == 5,
+                  "Error: integer_sequence_at");
+    static_assert(integer_sequence_at<6, i>::value == 6,
+                  "Error: integer_sequence_at");
 
-    static_assert( at( 0, i{} ) == 0, "Error: at(unsigned, integer_sequence)" );
-    static_assert( at( 1, i{} ) == 1, "Error: at(unsigned, integer_sequence)" );
-    static_assert( at( 2, i{} ) == 2, "Error: at(unsigned, integer_sequence)" );
-    static_assert( at( 3, i{} ) == 3, "Error: at(unsigned, integer_sequence)" );
-    static_assert( at( 4, i{} ) == 4, "Error: at(unsigned, integer_sequence)" );
-    static_assert( at( 5, i{} ) == 5, "Error: at(unsigned, integer_sequence)" );
-    static_assert( at( 6, i{} ) == 6, "Error: at(unsigned, integer_sequence)" );
+    static_assert(at(0, i{}) == 0, "Error: at(unsigned, integer_sequence)");
+    static_assert(at(1, i{}) == 1, "Error: at(unsigned, integer_sequence)");
+    static_assert(at(2, i{}) == 2, "Error: at(unsigned, integer_sequence)");
+    static_assert(at(3, i{}) == 3, "Error: at(unsigned, integer_sequence)");
+    static_assert(at(4, i{}) == 4, "Error: at(unsigned, integer_sequence)");
+    static_assert(at(5, i{}) == 5, "Error: at(unsigned, integer_sequence)");
+    static_assert(at(6, i{}) == 6, "Error: at(unsigned, integer_sequence)");
   }
 
   {
-    using i = integer_sequence< int, 0, 1, 2, 3, 4, 5, 6, 7 >;
-    using j = make_integer_sequence< int, 8 >;
+    using i = integer_sequence<int, 0, 1, 2, 3, 4, 5, 6, 7>;
+    using j = make_integer_sequence<int, 8>;
 
-    static_assert( std::is_same< i, j >::value, "Error: make_integer_sequence" );
-    static_assert( i::size() == 8u, "Error: integer_sequence.size()" );
+    static_assert(std::is_same<i, j>::value, "Error: make_integer_sequence");
+    static_assert(i::size() == 8u, "Error: integer_sequence.size()");
 
-    static_assert( integer_sequence_at< 0, i >::value == 0, "Error: integer_sequence_at" );
-    static_assert( integer_sequence_at< 1, i >::value == 1, "Error: integer_sequence_at" );
-    static_assert( integer_sequence_at< 2, i >::value == 2, "Error: integer_sequence_at" );
-    static_assert( integer_sequence_at< 3, i >::value == 3, "Error: integer_sequence_at" );
-    static_assert( integer_sequence_at< 4, i >::value == 4, "Error: integer_sequence_at" );
-    static_assert( integer_sequence_at< 5, i >::value == 5, "Error: integer_sequence_at" );
-    static_assert( integer_sequence_at< 6, i >::value == 6, "Error: integer_sequence_at" );
-    static_assert( integer_sequence_at< 7, i >::value == 7, "Error: integer_sequence_at" );
+    static_assert(integer_sequence_at<0, i>::value == 0,
+                  "Error: integer_sequence_at");
+    static_assert(integer_sequence_at<1, i>::value == 1,
+                  "Error: integer_sequence_at");
+    static_assert(integer_sequence_at<2, i>::value == 2,
+                  "Error: integer_sequence_at");
+    static_assert(integer_sequence_at<3, i>::value == 3,
+                  "Error: integer_sequence_at");
+    static_assert(integer_sequence_at<4, i>::value == 4,
+                  "Error: integer_sequence_at");
+    static_assert(integer_sequence_at<5, i>::value == 5,
+                  "Error: integer_sequence_at");
+    static_assert(integer_sequence_at<6, i>::value == 6,
+                  "Error: integer_sequence_at");
+    static_assert(integer_sequence_at<7, i>::value == 7,
+                  "Error: integer_sequence_at");
 
-    static_assert( at( 0, i{} ) == 0, "Error: at(unsigned, integer_sequence)" );
-    static_assert( at( 1, i{} ) == 1, "Error: at(unsigned, integer_sequence)" );
-    static_assert( at( 2, i{} ) == 2, "Error: at(unsigned, integer_sequence)" );
-    static_assert( at( 3, i{} ) == 3, "Error: at(unsigned, integer_sequence)" );
-    static_assert( at( 4, i{} ) == 4, "Error: at(unsigned, integer_sequence)" );
-    static_assert( at( 5, i{} ) == 5, "Error: at(unsigned, integer_sequence)" );
-    static_assert( at( 6, i{} ) == 6, "Error: at(unsigned, integer_sequence)" );
-    static_assert( at( 7, i{} ) == 7, "Error: at(unsigned, integer_sequence)" );
+    static_assert(at(0, i{}) == 0, "Error: at(unsigned, integer_sequence)");
+    static_assert(at(1, i{}) == 1, "Error: at(unsigned, integer_sequence)");
+    static_assert(at(2, i{}) == 2, "Error: at(unsigned, integer_sequence)");
+    static_assert(at(3, i{}) == 3, "Error: at(unsigned, integer_sequence)");
+    static_assert(at(4, i{}) == 4, "Error: at(unsigned, integer_sequence)");
+    static_assert(at(5, i{}) == 5, "Error: at(unsigned, integer_sequence)");
+    static_assert(at(6, i{}) == 6, "Error: at(unsigned, integer_sequence)");
+    static_assert(at(7, i{}) == 7, "Error: at(unsigned, integer_sequence)");
   }
 
   {
-    using i = integer_sequence< int, 0, 1, 2, 3, 4, 5, 6, 7, 8 >;
-    using j = make_integer_sequence< int, 9 >;
+    using i = integer_sequence<int, 0, 1, 2, 3, 4, 5, 6, 7, 8>;
+    using j = make_integer_sequence<int, 9>;
 
-    static_assert( std::is_same< i, j >::value, "Error: make_integer_sequence" );
-    static_assert( i::size() == 9u, "Error: integer_sequence.size()" );
+    static_assert(std::is_same<i, j>::value, "Error: make_integer_sequence");
+    static_assert(i::size() == 9u, "Error: integer_sequence.size()");
 
-    static_assert( integer_sequence_at< 0, i >::value == 0, "Error: integer_sequence_at" );
-    static_assert( integer_sequence_at< 1, i >::value == 1, "Error: integer_sequence_at" );
-    static_assert( integer_sequence_at< 2, i >::value == 2, "Error: integer_sequence_at" );
-    static_assert( integer_sequence_at< 3, i >::value == 3, "Error: integer_sequence_at" );
-    static_assert( integer_sequence_at< 4, i >::value == 4, "Error: integer_sequence_at" );
-    static_assert( integer_sequence_at< 5, i >::value == 5, "Error: integer_sequence_at" );
-    static_assert( integer_sequence_at< 6, i >::value == 6, "Error: integer_sequence_at" );
-    static_assert( integer_sequence_at< 7, i >::value == 7, "Error: integer_sequence_at" );
-    static_assert( integer_sequence_at< 8, i >::value == 8, "Error: integer_sequence_at" );
+    static_assert(integer_sequence_at<0, i>::value == 0,
+                  "Error: integer_sequence_at");
+    static_assert(integer_sequence_at<1, i>::value == 1,
+                  "Error: integer_sequence_at");
+    static_assert(integer_sequence_at<2, i>::value == 2,
+                  "Error: integer_sequence_at");
+    static_assert(integer_sequence_at<3, i>::value == 3,
+                  "Error: integer_sequence_at");
+    static_assert(integer_sequence_at<4, i>::value == 4,
+                  "Error: integer_sequence_at");
+    static_assert(integer_sequence_at<5, i>::value == 5,
+                  "Error: integer_sequence_at");
+    static_assert(integer_sequence_at<6, i>::value == 6,
+                  "Error: integer_sequence_at");
+    static_assert(integer_sequence_at<7, i>::value == 7,
+                  "Error: integer_sequence_at");
+    static_assert(integer_sequence_at<8, i>::value == 8,
+                  "Error: integer_sequence_at");
 
-    static_assert( at( 0, i{} ) == 0, "Error: at(unsigned, integer_sequence)" );
-    static_assert( at( 1, i{} ) == 1, "Error: at(unsigned, integer_sequence)" );
-    static_assert( at( 2, i{} ) == 2, "Error: at(unsigned, integer_sequence)" );
-    static_assert( at( 3, i{} ) == 3, "Error: at(unsigned, integer_sequence)" );
-    static_assert( at( 4, i{} ) == 4, "Error: at(unsigned, integer_sequence)" );
-    static_assert( at( 5, i{} ) == 5, "Error: at(unsigned, integer_sequence)" );
-    static_assert( at( 6, i{} ) == 6, "Error: at(unsigned, integer_sequence)" );
-    static_assert( at( 7, i{} ) == 7, "Error: at(unsigned, integer_sequence)" );
-    static_assert( at( 8, i{} ) == 8, "Error: at(unsigned, integer_sequence)" );
+    static_assert(at(0, i{}) == 0, "Error: at(unsigned, integer_sequence)");
+    static_assert(at(1, i{}) == 1, "Error: at(unsigned, integer_sequence)");
+    static_assert(at(2, i{}) == 2, "Error: at(unsigned, integer_sequence)");
+    static_assert(at(3, i{}) == 3, "Error: at(unsigned, integer_sequence)");
+    static_assert(at(4, i{}) == 4, "Error: at(unsigned, integer_sequence)");
+    static_assert(at(5, i{}) == 5, "Error: at(unsigned, integer_sequence)");
+    static_assert(at(6, i{}) == 6, "Error: at(unsigned, integer_sequence)");
+    static_assert(at(7, i{}) == 7, "Error: at(unsigned, integer_sequence)");
+    static_assert(at(8, i{}) == 8, "Error: at(unsigned, integer_sequence)");
   }
 
   {
-    using i = integer_sequence< int, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9 >;
-    using j = make_integer_sequence< int, 10 >;
+    using i = integer_sequence<int, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9>;
+    using j = make_integer_sequence<int, 10>;
 
-    static_assert( std::is_same< i, j >::value, "Error: make_integer_sequence" );
-    static_assert( i::size() == 10u, "Error: integer_sequence.size()" );
+    static_assert(std::is_same<i, j>::value, "Error: make_integer_sequence");
+    static_assert(i::size() == 10u, "Error: integer_sequence.size()");
 
-    static_assert( integer_sequence_at< 0, i >::value == 0, "Error: integer_sequence_at" );
-    static_assert( integer_sequence_at< 1, i >::value == 1, "Error: integer_sequence_at" );
-    static_assert( integer_sequence_at< 2, i >::value == 2, "Error: integer_sequence_at" );
-    static_assert( integer_sequence_at< 3, i >::value == 3, "Error: integer_sequence_at" );
-    static_assert( integer_sequence_at< 4, i >::value == 4, "Error: integer_sequence_at" );
-    static_assert( integer_sequence_at< 5, i >::value == 5, "Error: integer_sequence_at" );
-    static_assert( integer_sequence_at< 6, i >::value == 6, "Error: integer_sequence_at" );
-    static_assert( integer_sequence_at< 7, i >::value == 7, "Error: integer_sequence_at" );
-    static_assert( integer_sequence_at< 8, i >::value == 8, "Error: integer_sequence_at" );
-    static_assert( integer_sequence_at< 9, i >::value == 9, "Error: integer_sequence_at" );
+    static_assert(integer_sequence_at<0, i>::value == 0,
+                  "Error: integer_sequence_at");
+    static_assert(integer_sequence_at<1, i>::value == 1,
+                  "Error: integer_sequence_at");
+    static_assert(integer_sequence_at<2, i>::value == 2,
+                  "Error: integer_sequence_at");
+    static_assert(integer_sequence_at<3, i>::value == 3,
+                  "Error: integer_sequence_at");
+    static_assert(integer_sequence_at<4, i>::value == 4,
+                  "Error: integer_sequence_at");
+    static_assert(integer_sequence_at<5, i>::value == 5,
+                  "Error: integer_sequence_at");
+    static_assert(integer_sequence_at<6, i>::value == 6,
+                  "Error: integer_sequence_at");
+    static_assert(integer_sequence_at<7, i>::value == 7,
+                  "Error: integer_sequence_at");
+    static_assert(integer_sequence_at<8, i>::value == 8,
+                  "Error: integer_sequence_at");
+    static_assert(integer_sequence_at<9, i>::value == 9,
+                  "Error: integer_sequence_at");
 
-    static_assert( at( 0, i{} ) == 0, "Error: at(unsigned, integer_sequence)" );
-    static_assert( at( 1, i{} ) == 1, "Error: at(unsigned, integer_sequence)" );
-    static_assert( at( 2, i{} ) == 2, "Error: at(unsigned, integer_sequence)" );
-    static_assert( at( 3, i{} ) == 3, "Error: at(unsigned, integer_sequence)" );
-    static_assert( at( 4, i{} ) == 4, "Error: at(unsigned, integer_sequence)" );
-    static_assert( at( 5, i{} ) == 5, "Error: at(unsigned, integer_sequence)" );
-    static_assert( at( 6, i{} ) == 6, "Error: at(unsigned, integer_sequence)" );
-    static_assert( at( 7, i{} ) == 7, "Error: at(unsigned, integer_sequence)" );
-    static_assert( at( 8, i{} ) == 8, "Error: at(unsigned, integer_sequence)" );
-    static_assert( at( 9, i{} ) == 9, "Error: at(unsigned, integer_sequence)" );
+    static_assert(at(0, i{}) == 0, "Error: at(unsigned, integer_sequence)");
+    static_assert(at(1, i{}) == 1, "Error: at(unsigned, integer_sequence)");
+    static_assert(at(2, i{}) == 2, "Error: at(unsigned, integer_sequence)");
+    static_assert(at(3, i{}) == 3, "Error: at(unsigned, integer_sequence)");
+    static_assert(at(4, i{}) == 4, "Error: at(unsigned, integer_sequence)");
+    static_assert(at(5, i{}) == 5, "Error: at(unsigned, integer_sequence)");
+    static_assert(at(6, i{}) == 6, "Error: at(unsigned, integer_sequence)");
+    static_assert(at(7, i{}) == 7, "Error: at(unsigned, integer_sequence)");
+    static_assert(at(8, i{}) == 8, "Error: at(unsigned, integer_sequence)");
+    static_assert(at(9, i{}) == 9, "Error: at(unsigned, integer_sequence)");
   }
 
   {
-    using i = make_integer_sequence< int, 5 >;
-    using r = reverse_integer_sequence< i >;
-    using gr = integer_sequence< int, 4, 3, 2, 1, 0 >;
+    using i  = make_integer_sequence<int, 5>;
+    using r  = reverse_integer_sequence<i>;
+    using gr = integer_sequence<int, 4, 3, 2, 1, 0>;
 
-    static_assert( std::is_same< r, gr >::value, "Error: reverse_integer_sequence" );
+    static_assert(std::is_same<r, gr>::value,
+                  "Error: reverse_integer_sequence");
   }
 
   {
-    using s = make_integer_sequence< int, 10 >;
-    using e = exclusive_scan_integer_sequence< s >;
-    using i = inclusive_scan_integer_sequence< s >;
+    using s = make_integer_sequence<int, 10>;
+    using e = exclusive_scan_integer_sequence<s>;
+    using i = inclusive_scan_integer_sequence<s>;
 
-    using ge = integer_sequence< int, 0, 0, 1, 3, 6, 10, 15, 21, 28, 36 >;
-    using gi = integer_sequence< int, 0, 1, 3, 6, 10, 15, 21, 28, 36, 45 >;
+    using ge = integer_sequence<int, 0, 0, 1, 3, 6, 10, 15, 21, 28, 36>;
+    using gi = integer_sequence<int, 0, 1, 3, 6, 10, 15, 21, 28, 36, 45>;
 
-    static_assert( e::value == 45, "Error: scan value" );
-    static_assert( i::value == 45, "Error: scan value" );
+    static_assert(e::value == 45, "Error: scan value");
+    static_assert(i::value == 45, "Error: scan value");
 
-    static_assert( std::is_same< e::type, ge >::value, "Error: exclusive_scan" );
-    static_assert( std::is_same< i::type, gi >::value, "Error: inclusive_scan" );
+    static_assert(std::is_same<e::type, ge>::value, "Error: exclusive_scan");
+    static_assert(std::is_same<i::type, gi>::value, "Error: inclusive_scan");
   }
 }
 
-} // namespace Test
+}  // namespace Test
diff --git a/lib/kokkos/core/unit_test/TestViewAPI.hpp b/lib/kokkos/core/unit_test/TestViewAPI.hpp
index e332bebff0..36d158d643 100644
--- a/lib/kokkos/core/unit_test/TestViewAPI.hpp
+++ b/lib/kokkos/core/unit_test/TestViewAPI.hpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -50,1054 +51,1075 @@
 
 namespace Test {
 
-template< class T, class ... P >
-size_t allocation_count( const Kokkos::View< T, P... > & view )
-{
+template <class T, class... P>
+size_t allocation_count(const Kokkos::View<T, P...> &view) {
   const size_t card  = view.size();
   const size_t alloc = view.span();
 
-  const int memory_span = Kokkos::View< int* >::required_allocation_size( 100 );
+  const int memory_span = Kokkos::View<int *>::required_allocation_size(100);
 
-  return ( card <= alloc && memory_span == 400 ) ? alloc : 0;
+  return (card <= alloc && memory_span == 400) ? alloc : 0;
 }
 
 /*--------------------------------------------------------------------------*/
 
-template< typename T, class DeviceType >
-struct TestViewOperator
-{
-  typedef typename DeviceType::execution_space  execution_space;
+template <typename T, class DeviceType>
+struct TestViewOperator {
+  typedef typename DeviceType::execution_space execution_space;
 
   enum { N = 1000 };
   enum { D = 3 };
 
-  typedef Kokkos::View< T*[D], execution_space > view_type;
+  typedef Kokkos::View<T * [D], execution_space> view_type;
 
   const view_type v1;
   const view_type v2;
 
-  TestViewOperator()
-    : v1( "v1", N )
-    , v2( "v2", N )
-    {}
+  TestViewOperator() : v1("v1", N), v2("v2", N) {}
 
   KOKKOS_INLINE_FUNCTION
-  void operator()( const unsigned i ) const
-  {
+  void operator()(const unsigned i) const {
     const unsigned X = 0;
     const unsigned Y = 1;
     const unsigned Z = 2;
 
-    v2( i, X ) = v1( i, X );
-    v2( i, Y ) = v1( i, Y );
-    v2( i, Z ) = v1( i, Z );
+    v2(i, X) = v1(i, X);
+    v2(i, Y) = v1(i, Y);
+    v2(i, Z) = v1(i, Z);
   }
 };
 
 /*--------------------------------------------------------------------------*/
 
-template< class DataType,
-          class DeviceType,
-          unsigned Rank = Kokkos::ViewTraits< DataType >::rank >
+template <class DataType, class DeviceType,
+          unsigned Rank = Kokkos::ViewTraits<DataType>::rank>
 struct TestViewOperator_LeftAndRight;
 
-template< class DataType, class DeviceType >
-struct TestViewOperator_LeftAndRight< DataType, DeviceType, 8 >
-{
-  typedef typename DeviceType::execution_space    execution_space;
-  typedef typename DeviceType::memory_space       memory_space;
-  typedef typename execution_space::size_type     size_type;
+template <class DataType, class DeviceType>
+struct TestViewOperator_LeftAndRight<DataType, DeviceType, 8> {
+  typedef typename DeviceType::execution_space execution_space;
+  typedef typename DeviceType::memory_space memory_space;
+  typedef typename execution_space::size_type size_type;
 
   typedef int value_type;
 
   KOKKOS_INLINE_FUNCTION
-  static void join( volatile value_type & update,
-                    const volatile value_type & input )
-  { update |= input; }
-
-  KOKKOS_INLINE_FUNCTION
-  static void init( value_type & update )
-  { update = 0; }
-
-  typedef Kokkos::View< DataType, Kokkos::LayoutLeft, execution_space > left_view;
-  typedef Kokkos::View< DataType, Kokkos::LayoutRight, execution_space > right_view;
-  typedef Kokkos::View< DataType, Kokkos::LayoutStride, execution_space > stride_view;
-
-  left_view    left;
-  right_view   right;
-  stride_view  left_stride;
-  stride_view  right_stride;
-  long         left_alloc;
-  long         right_alloc;
-
-  TestViewOperator_LeftAndRight()
-    : left(  "left" )
-    , right( "right" )
-    , left_stride( left )
-    , right_stride( right )
-    , left_alloc( allocation_count( left ) )
-    , right_alloc( allocation_count( right ) )
-    {}
-
-  void testit()
-  {
-    int error_flag = 0;
-
-    Kokkos::parallel_reduce( 1, *this, error_flag );
-
-    ASSERT_EQ( error_flag, 0 );
+  static void join(volatile value_type &update,
+                   const volatile value_type &input) {
+    update |= input;
   }
 
   KOKKOS_INLINE_FUNCTION
-  void operator()( const size_type, value_type & update ) const
-  {
+  static void init(value_type &update) { update = 0; }
+
+  typedef Kokkos::View<DataType, Kokkos::LayoutLeft, execution_space> left_view;
+  typedef Kokkos::View<DataType, Kokkos::LayoutRight, execution_space>
+      right_view;
+  typedef Kokkos::View<DataType, Kokkos::LayoutStride, execution_space>
+      stride_view;
+
+  left_view left;
+  right_view right;
+  stride_view left_stride;
+  stride_view right_stride;
+  long left_alloc;
+  long right_alloc;
+
+  TestViewOperator_LeftAndRight()
+      : left("left"),
+        right("right"),
+        left_stride(left),
+        right_stride(right),
+        left_alloc(allocation_count(left)),
+        right_alloc(allocation_count(right)) {}
+
+  void testit() {
+    int error_flag = 0;
+
+    Kokkos::parallel_reduce(1, *this, error_flag);
+
+    ASSERT_EQ(error_flag, 0);
+  }
+
+  KOKKOS_INLINE_FUNCTION
+  void operator()(const size_type, value_type &update) const {
     long offset = -1;
 
-    for ( unsigned i7 = 0; i7 < unsigned( left.extent(7) ); ++i7 )
-    for ( unsigned i6 = 0; i6 < unsigned( left.extent(6) ); ++i6 )
-    for ( unsigned i5 = 0; i5 < unsigned( left.extent(5) ); ++i5 )
-    for ( unsigned i4 = 0; i4 < unsigned( left.extent(4) ); ++i4 )
-    for ( unsigned i3 = 0; i3 < unsigned( left.extent(3) ); ++i3 )
-    for ( unsigned i2 = 0; i2 < unsigned( left.extent(2) ); ++i2 )
-    for ( unsigned i1 = 0; i1 < unsigned( left.extent(1) ); ++i1 )
-    for ( unsigned i0 = 0; i0 < unsigned( left.extent(0) ); ++i0 )
-    {
-      const long j = & left( i0, i1, i2, i3, i4, i5, i6, i7 ) -
-                     & left(  0,  0,  0,  0,  0,  0,  0,  0 );
-      if ( j <= offset || left_alloc <= j ) { update |= 1; }
-      offset = j;
+    for (unsigned i7 = 0; i7 < unsigned(left.extent(7)); ++i7)
+      for (unsigned i6 = 0; i6 < unsigned(left.extent(6)); ++i6)
+        for (unsigned i5 = 0; i5 < unsigned(left.extent(5)); ++i5)
+          for (unsigned i4 = 0; i4 < unsigned(left.extent(4)); ++i4)
+            for (unsigned i3 = 0; i3 < unsigned(left.extent(3)); ++i3)
+              for (unsigned i2 = 0; i2 < unsigned(left.extent(2)); ++i2)
+                for (unsigned i1 = 0; i1 < unsigned(left.extent(1)); ++i1)
+                  for (unsigned i0 = 0; i0 < unsigned(left.extent(0)); ++i0) {
+                    const long j = &left(i0, i1, i2, i3, i4, i5, i6, i7) -
+                                   &left(0, 0, 0, 0, 0, 0, 0, 0);
+                    if (j <= offset || left_alloc <= j) {
+                      update |= 1;
+                    }
+                    offset = j;
 
-      if ( & left( i0, i1, i2, i3, i4, i5, i6, i7 ) !=
-           & left_stride( i0, i1, i2, i3, i4, i5, i6, i7 ) ) {
-        update |= 4;
-      }
-    }
+                    if (&left(i0, i1, i2, i3, i4, i5, i6, i7) !=
+                        &left_stride(i0, i1, i2, i3, i4, i5, i6, i7)) {
+                      update |= 4;
+                    }
+                  }
 
     offset = -1;
 
-    for ( unsigned i0 = 0; i0 < unsigned( right.extent(0) ); ++i0 )
-    for ( unsigned i1 = 0; i1 < unsigned( right.extent(1) ); ++i1 )
-    for ( unsigned i2 = 0; i2 < unsigned( right.extent(2) ); ++i2 )
-    for ( unsigned i3 = 0; i3 < unsigned( right.extent(3) ); ++i3 )
-    for ( unsigned i4 = 0; i4 < unsigned( right.extent(4) ); ++i4 )
-    for ( unsigned i5 = 0; i5 < unsigned( right.extent(5) ); ++i5 )
-    for ( unsigned i6 = 0; i6 < unsigned( right.extent(6) ); ++i6 )
-    for ( unsigned i7 = 0; i7 < unsigned( right.extent(7) ); ++i7 )
-    {
-      const long j = & right( i0, i1, i2, i3, i4, i5, i6, i7 ) -
-                     & right(  0,  0,  0,  0,  0,  0,  0,  0 );
-      if ( j <= offset || right_alloc <= j ) { update |= 2; }
-      offset = j;
+    for (unsigned i0 = 0; i0 < unsigned(right.extent(0)); ++i0)
+      for (unsigned i1 = 0; i1 < unsigned(right.extent(1)); ++i1)
+        for (unsigned i2 = 0; i2 < unsigned(right.extent(2)); ++i2)
+          for (unsigned i3 = 0; i3 < unsigned(right.extent(3)); ++i3)
+            for (unsigned i4 = 0; i4 < unsigned(right.extent(4)); ++i4)
+              for (unsigned i5 = 0; i5 < unsigned(right.extent(5)); ++i5)
+                for (unsigned i6 = 0; i6 < unsigned(right.extent(6)); ++i6)
+                  for (unsigned i7 = 0; i7 < unsigned(right.extent(7)); ++i7) {
+                    const long j = &right(i0, i1, i2, i3, i4, i5, i6, i7) -
+                                   &right(0, 0, 0, 0, 0, 0, 0, 0);
+                    if (j <= offset || right_alloc <= j) {
+                      update |= 2;
+                    }
+                    offset = j;
 
-      if ( & right( i0, i1, i2, i3, i4, i5, i6, i7 ) !=
-           & right_stride( i0, i1, i2, i3, i4, i5, i6, i7 ) ) {
+                    if (&right(i0, i1, i2, i3, i4, i5, i6, i7) !=
+                        &right_stride(i0, i1, i2, i3, i4, i5, i6, i7)) {
+                      update |= 8;
+                    }
+                  }
+  }
+};
+
+template <class DataType, class DeviceType>
+struct TestViewOperator_LeftAndRight<DataType, DeviceType, 7> {
+  typedef typename DeviceType::execution_space execution_space;
+  typedef typename DeviceType::memory_space memory_space;
+  typedef typename execution_space::size_type size_type;
+
+  typedef int value_type;
+
+  KOKKOS_INLINE_FUNCTION
+  static void join(volatile value_type &update,
+                   const volatile value_type &input) {
+    update |= input;
+  }
+
+  KOKKOS_INLINE_FUNCTION
+  static void init(value_type &update) { update = 0; }
+
+  typedef Kokkos::View<DataType, Kokkos::LayoutLeft, execution_space> left_view;
+  typedef Kokkos::View<DataType, Kokkos::LayoutRight, execution_space>
+      right_view;
+
+  left_view left;
+  right_view right;
+  long left_alloc;
+  long right_alloc;
+
+  TestViewOperator_LeftAndRight()
+      : left("left"),
+        right("right"),
+        left_alloc(allocation_count(left)),
+        right_alloc(allocation_count(right)) {}
+
+  void testit() {
+    int error_flag = 0;
+
+    Kokkos::parallel_reduce(1, *this, error_flag);
+
+    ASSERT_EQ(error_flag, 0);
+  }
+
+  KOKKOS_INLINE_FUNCTION
+  void operator()(const size_type, value_type &update) const {
+    long offset = -1;
+
+    for (unsigned i6 = 0; i6 < unsigned(left.extent(6)); ++i6)
+      for (unsigned i5 = 0; i5 < unsigned(left.extent(5)); ++i5)
+        for (unsigned i4 = 0; i4 < unsigned(left.extent(4)); ++i4)
+          for (unsigned i3 = 0; i3 < unsigned(left.extent(3)); ++i3)
+            for (unsigned i2 = 0; i2 < unsigned(left.extent(2)); ++i2)
+              for (unsigned i1 = 0; i1 < unsigned(left.extent(1)); ++i1)
+                for (unsigned i0 = 0; i0 < unsigned(left.extent(0)); ++i0) {
+                  const long j = &left(i0, i1, i2, i3, i4, i5, i6) -
+                                 &left(0, 0, 0, 0, 0, 0, 0);
+                  if (j <= offset || left_alloc <= j) {
+                    update |= 1;
+                  }
+                  offset = j;
+                }
+
+    offset = -1;
+
+    for (unsigned i0 = 0; i0 < unsigned(right.extent(0)); ++i0)
+      for (unsigned i1 = 0; i1 < unsigned(right.extent(1)); ++i1)
+        for (unsigned i2 = 0; i2 < unsigned(right.extent(2)); ++i2)
+          for (unsigned i3 = 0; i3 < unsigned(right.extent(3)); ++i3)
+            for (unsigned i4 = 0; i4 < unsigned(right.extent(4)); ++i4)
+              for (unsigned i5 = 0; i5 < unsigned(right.extent(5)); ++i5)
+                for (unsigned i6 = 0; i6 < unsigned(right.extent(6)); ++i6) {
+                  const long j = &right(i0, i1, i2, i3, i4, i5, i6) -
+                                 &right(0, 0, 0, 0, 0, 0, 0);
+                  if (j <= offset || right_alloc <= j) {
+                    update |= 2;
+                  }
+                  offset = j;
+                }
+  }
+};
+
+template <class DataType, class DeviceType>
+struct TestViewOperator_LeftAndRight<DataType, DeviceType, 6> {
+  typedef typename DeviceType::execution_space execution_space;
+  typedef typename DeviceType::memory_space memory_space;
+  typedef typename execution_space::size_type size_type;
+
+  typedef int value_type;
+
+  KOKKOS_INLINE_FUNCTION
+  static void join(volatile value_type &update,
+                   const volatile value_type &input) {
+    update |= input;
+  }
+
+  KOKKOS_INLINE_FUNCTION
+  static void init(value_type &update) { update = 0; }
+
+  typedef Kokkos::View<DataType, Kokkos::LayoutLeft, execution_space> left_view;
+  typedef Kokkos::View<DataType, Kokkos::LayoutRight, execution_space>
+      right_view;
+
+  left_view left;
+  right_view right;
+  long left_alloc;
+  long right_alloc;
+
+  TestViewOperator_LeftAndRight()
+      : left("left"),
+        right("right"),
+        left_alloc(allocation_count(left)),
+        right_alloc(allocation_count(right)) {}
+
+  void testit() {
+    int error_flag = 0;
+
+    Kokkos::parallel_reduce(1, *this, error_flag);
+
+    ASSERT_EQ(error_flag, 0);
+  }
+
+  KOKKOS_INLINE_FUNCTION
+  void operator()(const size_type, value_type &update) const {
+    long offset = -1;
+
+    for (unsigned i5 = 0; i5 < unsigned(left.extent(5)); ++i5)
+      for (unsigned i4 = 0; i4 < unsigned(left.extent(4)); ++i4)
+        for (unsigned i3 = 0; i3 < unsigned(left.extent(3)); ++i3)
+          for (unsigned i2 = 0; i2 < unsigned(left.extent(2)); ++i2)
+            for (unsigned i1 = 0; i1 < unsigned(left.extent(1)); ++i1)
+              for (unsigned i0 = 0; i0 < unsigned(left.extent(0)); ++i0) {
+                const long j =
+                    &left(i0, i1, i2, i3, i4, i5) - &left(0, 0, 0, 0, 0, 0);
+                if (j <= offset || left_alloc <= j) {
+                  update |= 1;
+                }
+                offset = j;
+              }
+
+    offset = -1;
+
+    for (unsigned i0 = 0; i0 < unsigned(right.extent(0)); ++i0)
+      for (unsigned i1 = 0; i1 < unsigned(right.extent(1)); ++i1)
+        for (unsigned i2 = 0; i2 < unsigned(right.extent(2)); ++i2)
+          for (unsigned i3 = 0; i3 < unsigned(right.extent(3)); ++i3)
+            for (unsigned i4 = 0; i4 < unsigned(right.extent(4)); ++i4)
+              for (unsigned i5 = 0; i5 < unsigned(right.extent(5)); ++i5) {
+                const long j =
+                    &right(i0, i1, i2, i3, i4, i5) - &right(0, 0, 0, 0, 0, 0);
+                if (j <= offset || right_alloc <= j) {
+                  update |= 2;
+                }
+                offset = j;
+              }
+  }
+};
+
+template <class DataType, class DeviceType>
+struct TestViewOperator_LeftAndRight<DataType, DeviceType, 5> {
+  typedef typename DeviceType::execution_space execution_space;
+  typedef typename DeviceType::memory_space memory_space;
+  typedef typename execution_space::size_type size_type;
+
+  typedef int value_type;
+
+  KOKKOS_INLINE_FUNCTION
+  static void join(volatile value_type &update,
+                   const volatile value_type &input) {
+    update |= input;
+  }
+
+  KOKKOS_INLINE_FUNCTION
+  static void init(value_type &update) { update = 0; }
+
+  typedef Kokkos::View<DataType, Kokkos::LayoutLeft, execution_space> left_view;
+  typedef Kokkos::View<DataType, Kokkos::LayoutRight, execution_space>
+      right_view;
+  typedef Kokkos::View<DataType, Kokkos::LayoutStride, execution_space>
+      stride_view;
+
+  left_view left;
+  right_view right;
+  stride_view left_stride;
+  stride_view right_stride;
+  long left_alloc;
+  long right_alloc;
+
+  TestViewOperator_LeftAndRight()
+      : left("left"),
+        right("right"),
+        left_stride(left),
+        right_stride(right),
+        left_alloc(allocation_count(left)),
+        right_alloc(allocation_count(right)) {}
+
+  void testit() {
+    int error_flag = 0;
+
+    Kokkos::parallel_reduce(1, *this, error_flag);
+
+    ASSERT_EQ(error_flag, 0);
+  }
+
+  KOKKOS_INLINE_FUNCTION
+  void operator()(const size_type, value_type &update) const {
+    long offset = -1;
+
+    for (unsigned i4 = 0; i4 < unsigned(left.extent(4)); ++i4)
+      for (unsigned i3 = 0; i3 < unsigned(left.extent(3)); ++i3)
+        for (unsigned i2 = 0; i2 < unsigned(left.extent(2)); ++i2)
+          for (unsigned i1 = 0; i1 < unsigned(left.extent(1)); ++i1)
+            for (unsigned i0 = 0; i0 < unsigned(left.extent(0)); ++i0) {
+              const long j = &left(i0, i1, i2, i3, i4) - &left(0, 0, 0, 0, 0);
+              if (j <= offset || left_alloc <= j) {
+                update |= 1;
+              }
+              offset = j;
+
+              if (&left(i0, i1, i2, i3, i4) !=
+                  &left_stride(i0, i1, i2, i3, i4)) {
+                update |= 4;
+              }
+            }
+
+    offset = -1;
+
+    for (unsigned i0 = 0; i0 < unsigned(right.extent(0)); ++i0)
+      for (unsigned i1 = 0; i1 < unsigned(right.extent(1)); ++i1)
+        for (unsigned i2 = 0; i2 < unsigned(right.extent(2)); ++i2)
+          for (unsigned i3 = 0; i3 < unsigned(right.extent(3)); ++i3)
+            for (unsigned i4 = 0; i4 < unsigned(right.extent(4)); ++i4) {
+              const long j = &right(i0, i1, i2, i3, i4) - &right(0, 0, 0, 0, 0);
+              if (j <= offset || right_alloc <= j) {
+                update |= 2;
+              }
+              offset = j;
+
+              if (&right(i0, i1, i2, i3, i4) !=
+                  &right_stride(i0, i1, i2, i3, i4)) {
+                update |= 8;
+              }
+            }
+  }
+};
+
+template <class DataType, class DeviceType>
+struct TestViewOperator_LeftAndRight<DataType, DeviceType, 4> {
+  typedef typename DeviceType::execution_space execution_space;
+  typedef typename DeviceType::memory_space memory_space;
+  typedef typename execution_space::size_type size_type;
+
+  typedef int value_type;
+
+  KOKKOS_INLINE_FUNCTION
+  static void join(volatile value_type &update,
+                   const volatile value_type &input) {
+    update |= input;
+  }
+
+  KOKKOS_INLINE_FUNCTION
+  static void init(value_type &update) { update = 0; }
+
+  typedef Kokkos::View<DataType, Kokkos::LayoutLeft, execution_space> left_view;
+  typedef Kokkos::View<DataType, Kokkos::LayoutRight, execution_space>
+      right_view;
+
+  left_view left;
+  right_view right;
+  long left_alloc;
+  long right_alloc;
+
+  TestViewOperator_LeftAndRight()
+      : left("left"),
+        right("right"),
+        left_alloc(allocation_count(left)),
+        right_alloc(allocation_count(right)) {}
+
+  void testit() {
+    int error_flag = 0;
+
+    Kokkos::parallel_reduce(1, *this, error_flag);
+
+    ASSERT_EQ(error_flag, 0);
+  }
+
+  KOKKOS_INLINE_FUNCTION
+  void operator()(const size_type, value_type &update) const {
+    long offset = -1;
+
+    for (unsigned i3 = 0; i3 < unsigned(left.extent(3)); ++i3)
+      for (unsigned i2 = 0; i2 < unsigned(left.extent(2)); ++i2)
+        for (unsigned i1 = 0; i1 < unsigned(left.extent(1)); ++i1)
+          for (unsigned i0 = 0; i0 < unsigned(left.extent(0)); ++i0) {
+            const long j = &left(i0, i1, i2, i3) - &left(0, 0, 0, 0);
+            if (j <= offset || left_alloc <= j) {
+              update |= 1;
+            }
+            offset = j;
+          }
+
+    offset = -1;
+
+    for (unsigned i0 = 0; i0 < unsigned(right.extent(0)); ++i0)
+      for (unsigned i1 = 0; i1 < unsigned(right.extent(1)); ++i1)
+        for (unsigned i2 = 0; i2 < unsigned(right.extent(2)); ++i2)
+          for (unsigned i3 = 0; i3 < unsigned(right.extent(3)); ++i3) {
+            const long j = &right(i0, i1, i2, i3) - &right(0, 0, 0, 0);
+            if (j <= offset || right_alloc <= j) {
+              update |= 2;
+            }
+            offset = j;
+          }
+  }
+};
+
+template <class DataType, class DeviceType>
+struct TestViewOperator_LeftAndRight<DataType, DeviceType, 3> {
+  typedef typename DeviceType::execution_space execution_space;
+  typedef typename DeviceType::memory_space memory_space;
+  typedef typename execution_space::size_type size_type;
+
+  typedef int value_type;
+
+  KOKKOS_INLINE_FUNCTION
+  static void join(volatile value_type &update,
+                   const volatile value_type &input) {
+    update |= input;
+  }
+
+  KOKKOS_INLINE_FUNCTION
+  static void init(value_type &update) { update = 0; }
+
+  typedef Kokkos::View<DataType, Kokkos::LayoutLeft, execution_space> left_view;
+  typedef Kokkos::View<DataType, Kokkos::LayoutRight, execution_space>
+      right_view;
+  typedef Kokkos::View<DataType, Kokkos::LayoutStride, execution_space>
+      stride_view;
+
+  left_view left;
+  right_view right;
+  stride_view left_stride;
+  stride_view right_stride;
+  long left_alloc;
+  long right_alloc;
+
+  TestViewOperator_LeftAndRight()
+      : left(std::string("left")),
+        right(std::string("right")),
+        left_stride(left),
+        right_stride(right),
+        left_alloc(allocation_count(left)),
+        right_alloc(allocation_count(right)) {}
+
+  void testit() {
+    int error_flag = 0;
+
+    Kokkos::parallel_reduce(1, *this, error_flag);
+
+    ASSERT_EQ(error_flag, 0);
+  }
+
+  KOKKOS_INLINE_FUNCTION
+  void operator()(const size_type, value_type &update) const {
+    long offset = -1;
+
+    for (unsigned i2 = 0; i2 < unsigned(left.extent(2)); ++i2)
+      for (unsigned i1 = 0; i1 < unsigned(left.extent(1)); ++i1)
+        for (unsigned i0 = 0; i0 < unsigned(left.extent(0)); ++i0) {
+          const long j = &left(i0, i1, i2) - &left(0, 0, 0);
+          if (j <= offset || left_alloc <= j) {
+            update |= 1;
+          }
+          offset = j;
+
+          if (&left(i0, i1, i2) != &left_stride(i0, i1, i2)) {
+            update |= 4;
+          }
+        }
+
+    offset = -1;
+
+    for (unsigned i0 = 0; i0 < unsigned(right.extent(0)); ++i0)
+      for (unsigned i1 = 0; i1 < unsigned(right.extent(1)); ++i1)
+        for (unsigned i2 = 0; i2 < unsigned(right.extent(2)); ++i2) {
+          const long j = &right(i0, i1, i2) - &right(0, 0, 0);
+          if (j <= offset || right_alloc <= j) {
+            update |= 2;
+          }
+          offset = j;
+
+          if (&right(i0, i1, i2) != &right_stride(i0, i1, i2)) {
+            update |= 8;
+          }
+        }
+
+    for (unsigned i0 = 0; i0 < unsigned(left.extent(0)); ++i0)
+      for (unsigned i1 = 0; i1 < unsigned(left.extent(1)); ++i1)
+        for (unsigned i2 = 0; i2 < unsigned(left.extent(2)); ++i2) {
+#ifdef KOKKOS_ENABLE_DEPRECATED_CODE
+          if (&left(i0, i1, i2) != &left(i0, i1, i2, 0, 0, 0, 0, 0)) {
+            update |= 3;
+          }
+          if (&right(i0, i1, i2) != &right(i0, i1, i2, 0, 0, 0, 0, 0)) {
+            update |= 3;
+          }
+#else
+          if (&left(i0, i1, i2) != &left.access(i0, i1, i2, 0, 0, 0, 0, 0)) {
+            update |= 3;
+          }
+          if (&right(i0, i1, i2) != &right.access(i0, i1, i2, 0, 0, 0, 0, 0)) {
+            update |= 3;
+          }
+#endif
+        }
+  }
+};
+
+template <class DataType, class DeviceType>
+struct TestViewOperator_LeftAndRight<DataType, DeviceType, 2> {
+  typedef typename DeviceType::execution_space execution_space;
+  typedef typename DeviceType::memory_space memory_space;
+  typedef typename execution_space::size_type size_type;
+
+  typedef int value_type;
+
+  KOKKOS_INLINE_FUNCTION
+  static void join(volatile value_type &update,
+                   const volatile value_type &input) {
+    update |= input;
+  }
+
+  KOKKOS_INLINE_FUNCTION
+  static void init(value_type &update) { update = 0; }
+
+  typedef Kokkos::View<DataType, Kokkos::LayoutLeft, execution_space> left_view;
+  typedef Kokkos::View<DataType, Kokkos::LayoutRight, execution_space>
+      right_view;
+
+  left_view left;
+  right_view right;
+  long left_alloc;
+  long right_alloc;
+
+  TestViewOperator_LeftAndRight()
+      : left("left"),
+        right("right"),
+        left_alloc(allocation_count(left)),
+        right_alloc(allocation_count(right)) {}
+
+  void testit() {
+    int error_flag = 0;
+
+    Kokkos::parallel_reduce(1, *this, error_flag);
+
+    ASSERT_EQ(error_flag, 0);
+  }
+
+  KOKKOS_INLINE_FUNCTION
+  void operator()(const size_type, value_type &update) const {
+    long offset = -1;
+
+    for (unsigned i1 = 0; i1 < unsigned(left.extent(1)); ++i1)
+      for (unsigned i0 = 0; i0 < unsigned(left.extent(0)); ++i0) {
+        const long j = &left(i0, i1) - &left(0, 0);
+        if (j <= offset || left_alloc <= j) {
+          update |= 1;
+        }
+        offset = j;
+      }
+
+    offset = -1;
+
+    for (unsigned i0 = 0; i0 < unsigned(right.extent(0)); ++i0)
+      for (unsigned i1 = 0; i1 < unsigned(right.extent(1)); ++i1) {
+        const long j = &right(i0, i1) - &right(0, 0);
+        if (j <= offset || right_alloc <= j) {
+          update |= 2;
+        }
+        offset = j;
+      }
+
+    for (unsigned i0 = 0; i0 < unsigned(left.extent(0)); ++i0)
+      for (unsigned i1 = 0; i1 < unsigned(left.extent(1)); ++i1) {
+#ifdef KOKKOS_ENABLE_DEPRECATED_CODE
+        if (&left(i0, i1) != &left(i0, i1, 0, 0, 0, 0, 0, 0)) {
+          update |= 3;
+        }
+        if (&right(i0, i1) != &right(i0, i1, 0, 0, 0, 0, 0, 0)) {
+          update |= 3;
+        }
+#else
+        if (&left(i0, i1) != &left.access(i0, i1, 0, 0, 0, 0, 0, 0)) {
+          update |= 3;
+        }
+        if (&right(i0, i1) != &right.access(i0, i1, 0, 0, 0, 0, 0, 0)) {
+          update |= 3;
+        }
+#endif
+      }
+  }
+};
+
+template <class DataType, class DeviceType>
+struct TestViewOperator_LeftAndRight<DataType, DeviceType, 1> {
+  typedef typename DeviceType::execution_space execution_space;
+  typedef typename DeviceType::memory_space memory_space;
+  typedef typename execution_space::size_type size_type;
+
+  typedef int value_type;
+
+  KOKKOS_INLINE_FUNCTION
+  static void join(volatile value_type &update,
+                   const volatile value_type &input) {
+    update |= input;
+  }
+
+  KOKKOS_INLINE_FUNCTION
+  static void init(value_type &update) { update = 0; }
+
+  typedef Kokkos::View<DataType, Kokkos::LayoutLeft, execution_space> left_view;
+  typedef Kokkos::View<DataType, Kokkos::LayoutRight, execution_space>
+      right_view;
+  typedef Kokkos::View<DataType, Kokkos::LayoutStride, execution_space>
+      stride_view;
+
+  left_view left;
+  right_view right;
+  stride_view left_stride;
+  stride_view right_stride;
+  long left_alloc;
+  long right_alloc;
+
+  TestViewOperator_LeftAndRight()
+      : left("left"),
+        right("right"),
+        left_stride(left),
+        right_stride(right),
+        left_alloc(allocation_count(left)),
+        right_alloc(allocation_count(right)) {}
+
+  void testit() {
+    TestViewOperator_LeftAndRight driver;
+
+    int error_flag = 0;
+
+    Kokkos::parallel_reduce(1, *this, error_flag);
+
+    ASSERT_EQ(error_flag, 0);
+  }
+
+  KOKKOS_INLINE_FUNCTION
+  void operator()(const size_type, value_type &update) const {
+    for (unsigned i0 = 0; i0 < unsigned(left.extent(0)); ++i0) {
+#ifdef KOKKOS_ENABLE_DEPRECATED_CODE
+      if (&left(i0) != &left(i0, 0, 0, 0, 0, 0, 0, 0)) {
+        update |= 3;
+      }
+      if (&right(i0) != &right(i0, 0, 0, 0, 0, 0, 0, 0)) {
+        update |= 3;
+      }
+#else
+      if (&left(i0) != &left.access(i0, 0, 0, 0, 0, 0, 0, 0)) {
+        update |= 3;
+      }
+      if (&right(i0) != &right.access(i0, 0, 0, 0, 0, 0, 0, 0)) {
+        update |= 3;
+      }
+#endif
+      if (&left(i0) != &left_stride(i0)) {
+        update |= 4;
+      }
+      if (&right(i0) != &right_stride(i0)) {
         update |= 8;
       }
     }
   }
 };
 
-template< class DataType, class DeviceType >
-struct TestViewOperator_LeftAndRight< DataType, DeviceType, 7 >
-{
-  typedef typename DeviceType::execution_space  execution_space;
-  typedef typename DeviceType::memory_space     memory_space;
-  typedef typename execution_space::size_type   size_type;
-
-  typedef int value_type;
-
-  KOKKOS_INLINE_FUNCTION
-  static void join( volatile value_type & update,
-                    const volatile value_type & input )
-  { update |= input; }
-
-  KOKKOS_INLINE_FUNCTION
-  static void init( value_type & update )
-  { update = 0; }
-
-  typedef Kokkos::View< DataType, Kokkos::LayoutLeft, execution_space > left_view;
-  typedef Kokkos::View< DataType, Kokkos::LayoutRight, execution_space > right_view;
-
-  left_view    left;
-  right_view   right;
-  long         left_alloc;
-  long         right_alloc;
-
-  TestViewOperator_LeftAndRight()
-    : left(  "left" )
-    , right( "right" )
-    , left_alloc( allocation_count( left ) )
-    , right_alloc( allocation_count( right ) )
-    {}
-
-  void testit()
-  {
-
-    int error_flag = 0;
-
-    Kokkos::parallel_reduce( 1, *this, error_flag );
-
-    ASSERT_EQ( error_flag, 0 );
-  }
-
-  KOKKOS_INLINE_FUNCTION
-  void operator()( const size_type, value_type & update ) const
-  {
-    long offset = -1;
-
-    for ( unsigned i6 = 0; i6 < unsigned( left.extent(6) ); ++i6 )
-    for ( unsigned i5 = 0; i5 < unsigned( left.extent(5) ); ++i5 )
-    for ( unsigned i4 = 0; i4 < unsigned( left.extent(4) ); ++i4 )
-    for ( unsigned i3 = 0; i3 < unsigned( left.extent(3) ); ++i3 )
-    for ( unsigned i2 = 0; i2 < unsigned( left.extent(2) ); ++i2 )
-    for ( unsigned i1 = 0; i1 < unsigned( left.extent(1) ); ++i1 )
-    for ( unsigned i0 = 0; i0 < unsigned( left.extent(0) ); ++i0 )
-    {
-      const long j = & left( i0, i1, i2, i3, i4, i5, i6 ) -
-                     & left(  0,  0,  0,  0,  0,  0,  0 );
-      if ( j <= offset || left_alloc <= j ) { update |= 1; }
-      offset = j;
-    }
-
-    offset = -1;
-
-    for ( unsigned i0 = 0; i0 < unsigned( right.extent(0) ); ++i0 )
-    for ( unsigned i1 = 0; i1 < unsigned( right.extent(1) ); ++i1 )
-    for ( unsigned i2 = 0; i2 < unsigned( right.extent(2) ); ++i2 )
-    for ( unsigned i3 = 0; i3 < unsigned( right.extent(3) ); ++i3 )
-    for ( unsigned i4 = 0; i4 < unsigned( right.extent(4) ); ++i4 )
-    for ( unsigned i5 = 0; i5 < unsigned( right.extent(5) ); ++i5 )
-    for ( unsigned i6 = 0; i6 < unsigned( right.extent(6) ); ++i6 )
-    {
-      const long j = & right( i0, i1, i2, i3, i4, i5, i6 ) -
-                     & right(  0,  0,  0,  0,  0,  0,  0 );
-      if ( j <= offset || right_alloc <= j ) { update |= 2; }
-      offset = j;
-    }
-  }
-};
-
-template< class DataType, class DeviceType >
-struct TestViewOperator_LeftAndRight< DataType, DeviceType, 6 >
-{
-  typedef typename DeviceType::execution_space  execution_space;
-  typedef typename DeviceType::memory_space     memory_space;
-  typedef typename execution_space::size_type   size_type;
-
-  typedef int value_type;
-
-  KOKKOS_INLINE_FUNCTION
-  static void join( volatile value_type & update,
-                    const volatile value_type & input )
-  { update |= input; }
-
-  KOKKOS_INLINE_FUNCTION
-  static void init( value_type & update )
-  { update = 0; }
-
-  typedef Kokkos::View< DataType, Kokkos::LayoutLeft, execution_space > left_view;
-  typedef Kokkos::View< DataType, Kokkos::LayoutRight, execution_space > right_view;
-
-  left_view    left;
-  right_view   right;
-  long         left_alloc;
-  long         right_alloc;
-
-  TestViewOperator_LeftAndRight()
-    : left(  "left" )
-    , right( "right" )
-    , left_alloc( allocation_count( left ) )
-    , right_alloc( allocation_count( right ) )
-    {}
-
-  void testit()
-  {
-
-    int error_flag = 0;
-
-    Kokkos::parallel_reduce( 1, *this, error_flag );
-
-    ASSERT_EQ( error_flag, 0 );
-  }
-
-  KOKKOS_INLINE_FUNCTION
-  void operator()( const size_type, value_type & update ) const
-  {
-    long offset = -1;
-
-    for ( unsigned i5 = 0; i5 < unsigned( left.extent(5) ); ++i5 )
-    for ( unsigned i4 = 0; i4 < unsigned( left.extent(4) ); ++i4 )
-    for ( unsigned i3 = 0; i3 < unsigned( left.extent(3) ); ++i3 )
-    for ( unsigned i2 = 0; i2 < unsigned( left.extent(2) ); ++i2 )
-    for ( unsigned i1 = 0; i1 < unsigned( left.extent(1) ); ++i1 )
-    for ( unsigned i0 = 0; i0 < unsigned( left.extent(0) ); ++i0 )
-    {
-      const long j = & left( i0, i1, i2, i3, i4, i5 ) -
-                     & left(  0,  0,  0,  0,  0,  0 );
-      if ( j <= offset || left_alloc <= j ) { update |= 1; }
-      offset = j;
-    }
-
-    offset = -1;
-
-    for ( unsigned i0 = 0; i0 < unsigned( right.extent(0) ); ++i0 )
-    for ( unsigned i1 = 0; i1 < unsigned( right.extent(1) ); ++i1 )
-    for ( unsigned i2 = 0; i2 < unsigned( right.extent(2) ); ++i2 )
-    for ( unsigned i3 = 0; i3 < unsigned( right.extent(3) ); ++i3 )
-    for ( unsigned i4 = 0; i4 < unsigned( right.extent(4) ); ++i4 )
-    for ( unsigned i5 = 0; i5 < unsigned( right.extent(5) ); ++i5 )
-    {
-      const long j = & right( i0, i1, i2, i3, i4, i5 ) -
-                     & right(  0,  0,  0,  0,  0,  0 );
-      if ( j <= offset || right_alloc <= j ) { update |= 2; }
-      offset = j;
-    }
-  }
-};
-
-template< class DataType, class DeviceType >
-struct TestViewOperator_LeftAndRight< DataType, DeviceType, 5 >
-{
-  typedef typename DeviceType::execution_space  execution_space;
-  typedef typename DeviceType::memory_space     memory_space;
-  typedef typename execution_space::size_type   size_type;
-
-  typedef int value_type;
-
-  KOKKOS_INLINE_FUNCTION
-  static void join( volatile value_type & update,
-                    const volatile value_type & input )
-  { update |= input; }
-
-  KOKKOS_INLINE_FUNCTION
-  static void init( value_type & update )
-  { update = 0; }
-
-  typedef Kokkos::View< DataType, Kokkos::LayoutLeft, execution_space > left_view;
-  typedef Kokkos::View< DataType, Kokkos::LayoutRight, execution_space > right_view;
-  typedef Kokkos::View< DataType, Kokkos::LayoutStride, execution_space > stride_view;
-
-  left_view    left;
-  right_view   right;
-  stride_view  left_stride;
-  stride_view  right_stride;
-  long         left_alloc;
-  long         right_alloc;
-
-  TestViewOperator_LeftAndRight()
-    : left(  "left" )
-    , right( "right" )
-    , left_stride( left )
-    , right_stride( right )
-    , left_alloc( allocation_count( left ) )
-    , right_alloc( allocation_count( right ) )
-    {}
-
-  void testit()
-  {
-
-    int error_flag = 0;
-
-    Kokkos::parallel_reduce( 1, *this, error_flag );
-
-    ASSERT_EQ( error_flag, 0 );
-  }
-
-  KOKKOS_INLINE_FUNCTION
-  void operator()( const size_type, value_type & update ) const
-  {
-    long offset = -1;
-
-    for ( unsigned i4 = 0; i4 < unsigned( left.extent(4) ); ++i4 )
-    for ( unsigned i3 = 0; i3 < unsigned( left.extent(3) ); ++i3 )
-    for ( unsigned i2 = 0; i2 < unsigned( left.extent(2) ); ++i2 )
-    for ( unsigned i1 = 0; i1 < unsigned( left.extent(1) ); ++i1 )
-    for ( unsigned i0 = 0; i0 < unsigned( left.extent(0) ); ++i0 )
-    {
-      const long j = & left( i0, i1, i2, i3, i4 ) -
-                     & left(  0,  0,  0,  0,  0 );
-      if ( j <= offset || left_alloc <= j ) { update |= 1; }
-      offset = j;
-
-      if ( & left( i0, i1, i2, i3, i4 ) !=
-           & left_stride( i0, i1, i2, i3, i4 ) ) { update |= 4; }
-    }
-
-    offset = -1;
-
-    for ( unsigned i0 = 0; i0 < unsigned( right.extent(0) ); ++i0 )
-    for ( unsigned i1 = 0; i1 < unsigned( right.extent(1) ); ++i1 )
-    for ( unsigned i2 = 0; i2 < unsigned( right.extent(2) ); ++i2 )
-    for ( unsigned i3 = 0; i3 < unsigned( right.extent(3) ); ++i3 )
-    for ( unsigned i4 = 0; i4 < unsigned( right.extent(4) ); ++i4 )
-    {
-      const long j = & right( i0, i1, i2, i3, i4 ) -
-                     & right(  0,  0,  0,  0,  0 );
-      if ( j <= offset || right_alloc <= j ) { update |= 2; }
-      offset = j;
-
-      if ( & right( i0, i1, i2, i3, i4 ) !=
-           & right_stride( i0, i1, i2, i3, i4 ) ) { update |= 8; }
-    }
-  }
-};
-
-template< class DataType, class DeviceType >
-struct TestViewOperator_LeftAndRight< DataType, DeviceType, 4 >
-{
-  typedef typename DeviceType::execution_space  execution_space;
-  typedef typename DeviceType::memory_space     memory_space;
-  typedef typename execution_space::size_type   size_type;
-
-  typedef int value_type;
-
-  KOKKOS_INLINE_FUNCTION
-  static void join( volatile value_type & update,
-                    const volatile value_type & input )
-  { update |= input; }
-
-  KOKKOS_INLINE_FUNCTION
-  static void init( value_type & update )
-  { update = 0; }
-
-  typedef Kokkos::View< DataType, Kokkos::LayoutLeft, execution_space > left_view;
-  typedef Kokkos::View< DataType, Kokkos::LayoutRight, execution_space > right_view;
-
-  left_view    left;
-  right_view   right;
-  long         left_alloc;
-  long         right_alloc;
-
-  TestViewOperator_LeftAndRight()
-    : left(  "left" )
-    , right( "right" )
-    , left_alloc( allocation_count( left ) )
-    , right_alloc( allocation_count( right ) )
-    {}
-
-  void testit()
-  {
-
-    int error_flag = 0;
-
-    Kokkos::parallel_reduce( 1, *this, error_flag );
-
-    ASSERT_EQ( error_flag, 0 );
-  }
-
-  KOKKOS_INLINE_FUNCTION
-  void operator()( const size_type, value_type & update ) const
-  {
-    long offset = -1;
-
-    for ( unsigned i3 = 0; i3 < unsigned( left.extent(3) ); ++i3 )
-    for ( unsigned i2 = 0; i2 < unsigned( left.extent(2) ); ++i2 )
-    for ( unsigned i1 = 0; i1 < unsigned( left.extent(1) ); ++i1 )
-    for ( unsigned i0 = 0; i0 < unsigned( left.extent(0) ); ++i0 )
-    {
-      const long j = & left( i0, i1, i2, i3 ) -
-                     & left(  0,  0,  0,  0 );
-      if ( j <= offset || left_alloc <= j ) { update |= 1; }
-      offset = j;
-    }
-
-    offset = -1;
-
-    for ( unsigned i0 = 0; i0 < unsigned( right.extent(0) ); ++i0 )
-    for ( unsigned i1 = 0; i1 < unsigned( right.extent(1) ); ++i1 )
-    for ( unsigned i2 = 0; i2 < unsigned( right.extent(2) ); ++i2 )
-    for ( unsigned i3 = 0; i3 < unsigned( right.extent(3) ); ++i3 )
-    {
-      const long j = & right( i0, i1, i2, i3 ) -
-                     & right(  0,  0,  0,  0 );
-      if ( j <= offset || right_alloc <= j ) { update |= 2; }
-      offset = j;
-    }
-  }
-};
-
-template< class DataType, class DeviceType >
-struct TestViewOperator_LeftAndRight< DataType, DeviceType, 3 >
-{
-  typedef typename DeviceType::execution_space  execution_space;
-  typedef typename DeviceType::memory_space     memory_space;
-  typedef typename execution_space::size_type   size_type;
-
-  typedef int value_type;
-
-  KOKKOS_INLINE_FUNCTION
-  static void join( volatile value_type & update,
-                    const volatile value_type & input )
-  { update |= input; }
-
-  KOKKOS_INLINE_FUNCTION
-  static void init( value_type & update )
-  { update = 0; }
-
-  typedef Kokkos::View< DataType, Kokkos::LayoutLeft, execution_space > left_view;
-  typedef Kokkos::View< DataType, Kokkos::LayoutRight, execution_space > right_view;
-  typedef Kokkos::View< DataType, Kokkos::LayoutStride, execution_space > stride_view;
-
-  left_view    left;
-  right_view   right;
-  stride_view  left_stride;
-  stride_view  right_stride;
-  long         left_alloc;
-  long         right_alloc;
-
-  TestViewOperator_LeftAndRight()
-    : left(  std::string( "left" ) )
-    , right( std::string( "right" ) )
-    , left_stride( left )
-    , right_stride( right )
-    , left_alloc( allocation_count( left ) )
-    , right_alloc( allocation_count( right ) )
-    {}
-
-  void testit()
-  {
-
-    int error_flag = 0;
-
-    Kokkos::parallel_reduce( 1, *this, error_flag );
-
-    ASSERT_EQ( error_flag, 0 );
-  }
-
-  KOKKOS_INLINE_FUNCTION
-  void operator()( const size_type, value_type & update ) const
-  {
-    long offset = -1;
-
-    for ( unsigned i2 = 0; i2 < unsigned( left.extent(2) ); ++i2 )
-    for ( unsigned i1 = 0; i1 < unsigned( left.extent(1) ); ++i1 )
-    for ( unsigned i0 = 0; i0 < unsigned( left.extent(0) ); ++i0 )
-    {
-      const long j = & left( i0, i1, i2 ) -
-                     & left(  0,  0,  0 );
-      if ( j <= offset || left_alloc <= j ) { update |= 1; }
-      offset = j;
-
-      if ( & left( i0, i1, i2 ) != & left_stride( i0, i1, i2 ) ) { update |= 4; }
-    }
-
-    offset = -1;
-
-    for ( unsigned i0 = 0; i0 < unsigned( right.extent(0) ); ++i0 )
-    for ( unsigned i1 = 0; i1 < unsigned( right.extent(1) ); ++i1 )
-    for ( unsigned i2 = 0; i2 < unsigned( right.extent(2) ); ++i2 )
-    {
-      const long j = & right( i0, i1, i2 ) -
-                     & right(  0,  0,  0 );
-      if ( j <= offset || right_alloc <= j ) { update |= 2; }
-      offset = j;
-
-      if ( & right( i0, i1, i2 ) != & right_stride( i0, i1, i2 ) ) { update |= 8; }
-    }
-
-    for ( unsigned i0 = 0; i0 < unsigned( left.extent(0) ); ++i0 )
-    for ( unsigned i1 = 0; i1 < unsigned( left.extent(1) ); ++i1 )
-    for ( unsigned i2 = 0; i2 < unsigned( left.extent(2) ); ++i2 )
-    {
-#ifdef KOKKOS_ENABLE_DEPRECATED_CODE
-        if ( & left( i0, i1, i2 )  != & left( i0, i1, i2, 0, 0, 0, 0, 0 ) )  { update |= 3; }
-        if ( & right( i0, i1, i2 ) != & right( i0, i1, i2, 0, 0, 0, 0, 0 ) ) { update |= 3; }
-#else
-        if ( & left( i0, i1, i2 )  != & left.access( i0, i1, i2, 0, 0, 0, 0, 0 ) )  { update |= 3; }
-        if ( & right( i0, i1, i2 ) != & right.access( i0, i1, i2, 0, 0, 0, 0, 0 ) ) { update |= 3; }
-#endif
-    }
-  }
-};
-
-template< class DataType, class DeviceType >
-struct TestViewOperator_LeftAndRight< DataType, DeviceType, 2 >
-{
-  typedef typename DeviceType::execution_space  execution_space;
-  typedef typename DeviceType::memory_space     memory_space;
-  typedef typename execution_space::size_type   size_type;
-
-  typedef int value_type;
-
-  KOKKOS_INLINE_FUNCTION
-  static void join( volatile value_type & update,
-                    const volatile value_type & input )
-  { update |= input; }
-
-  KOKKOS_INLINE_FUNCTION
-  static void init( value_type & update )
-  { update = 0; }
-
-  typedef Kokkos::View< DataType, Kokkos::LayoutLeft, execution_space > left_view;
-  typedef Kokkos::View< DataType, Kokkos::LayoutRight, execution_space > right_view;
-
-  left_view    left;
-  right_view   right;
-  long         left_alloc;
-  long         right_alloc;
-
-  TestViewOperator_LeftAndRight()
-    : left(  "left" )
-    , right( "right" )
-    , left_alloc( allocation_count( left ) )
-    , right_alloc( allocation_count( right ) )
-    {}
-
-  void testit()
-  {
-
-    int error_flag = 0;
-
-    Kokkos::parallel_reduce( 1, *this, error_flag );
-
-    ASSERT_EQ( error_flag, 0 );
-  }
-
-  KOKKOS_INLINE_FUNCTION
-  void operator()( const size_type, value_type & update ) const
-  {
-    long offset = -1;
-
-    for ( unsigned i1 = 0; i1 < unsigned( left.extent(1) ); ++i1 )
-    for ( unsigned i0 = 0; i0 < unsigned( left.extent(0) ); ++i0 )
-    {
-      const long j = & left( i0, i1 ) -
-                     & left(  0,  0 );
-      if ( j <= offset || left_alloc <= j ) { update |= 1; }
-      offset = j;
-    }
-
-    offset = -1;
-
-    for ( unsigned i0 = 0; i0 < unsigned( right.extent(0) ); ++i0 )
-    for ( unsigned i1 = 0; i1 < unsigned( right.extent(1) ); ++i1 )
-    {
-      const long j = & right( i0, i1 ) -
-                     & right(  0,  0 );
-      if ( j <= offset || right_alloc <= j ) { update |= 2; }
-      offset = j;
-    }
-
-    for ( unsigned i0 = 0; i0 < unsigned( left.extent(0) ); ++i0 )
-    for ( unsigned i1 = 0; i1 < unsigned( left.extent(1) ); ++i1 )
-    {
-#ifdef KOKKOS_ENABLE_DEPRECATED_CODE
-      if ( & left( i0, i1 )  != & left( i0, i1, 0, 0, 0, 0, 0, 0 ) )  { update |= 3; }
-      if ( & right( i0, i1 ) != & right( i0, i1, 0, 0, 0, 0, 0, 0 ) ) { update |= 3; }
-#else
-      if ( & left( i0, i1 )  != & left.access( i0, i1, 0, 0, 0, 0, 0, 0 ) )  { update |= 3; }
-      if ( & right( i0, i1 ) != & right.access( i0, i1, 0, 0, 0, 0, 0, 0 ) ) { update |= 3; }
-#endif
-    }
-  }
-};
-
-template< class DataType, class DeviceType >
-struct TestViewOperator_LeftAndRight< DataType, DeviceType, 1 >
-{
-  typedef typename DeviceType::execution_space  execution_space;
-  typedef typename DeviceType::memory_space     memory_space;
-  typedef typename execution_space::size_type   size_type;
-
-  typedef int value_type;
-
-  KOKKOS_INLINE_FUNCTION
-  static void join( volatile value_type & update,
-                    const volatile value_type & input )
-  { update |= input; }
-
-  KOKKOS_INLINE_FUNCTION
-  static void init( value_type & update )
-  { update = 0; }
-
-  typedef Kokkos::View< DataType, Kokkos::LayoutLeft, execution_space > left_view;
-  typedef Kokkos::View< DataType, Kokkos::LayoutRight, execution_space > right_view;
-  typedef Kokkos::View< DataType, Kokkos::LayoutStride, execution_space > stride_view;
-
-  left_view    left;
-  right_view   right;
-  stride_view  left_stride;
-  stride_view  right_stride;
-  long         left_alloc;
-  long         right_alloc;
-
-  TestViewOperator_LeftAndRight()
-    : left(  "left" )
-    , right( "right" )
-    , left_stride( left )
-    , right_stride( right )
-    , left_alloc( allocation_count( left ) )
-    , right_alloc( allocation_count( right ) )
-    {}
-
-  void testit()
-  {
-    TestViewOperator_LeftAndRight driver;
-
-    int error_flag = 0;
-
-    Kokkos::parallel_reduce( 1, *this, error_flag );
-
-    ASSERT_EQ( error_flag, 0 );
-  }
-
-  KOKKOS_INLINE_FUNCTION
-  void operator()( const size_type, value_type & update ) const
-  {
-    for ( unsigned i0 = 0; i0 < unsigned( left.extent(0) ); ++i0 )
-    {
-#ifdef KOKKOS_ENABLE_DEPRECATED_CODE
-      if ( & left( i0 )  != & left( i0, 0, 0, 0, 0, 0, 0, 0 ) )  { update |= 3; }
-      if ( & right( i0 ) != & right( i0, 0, 0, 0, 0, 0, 0, 0 ) ) { update |= 3; }
-#else
-      if ( & left( i0 )  != & left.access( i0, 0, 0, 0, 0, 0, 0, 0 ) )  { update |= 3; }
-      if ( & right( i0 ) != & right.access( i0, 0, 0, 0, 0, 0, 0, 0 ) ) { update |= 3; }
-#endif
-      if ( & left( i0 )  != & left_stride( i0 ) ) { update |= 4; }
-      if ( & right( i0 ) != & right_stride( i0 ) ) { update |= 8; }
-    }
-  }
-};
-
-template< class Layout, class DeviceType >
-struct TestViewMirror
-{
-  template< class MemoryTraits >
+template <class Layout, class DeviceType>
+struct TestViewMirror {
+  template <class MemoryTraits>
   void static test_mirror() {
-    Kokkos::View< double*, Layout, Kokkos::HostSpace > a_org( "A", 1000 );
-    Kokkos::View< double*, Layout, Kokkos::HostSpace, MemoryTraits > a_h = a_org;
-    auto a_h2 = Kokkos::create_mirror( Kokkos::HostSpace(), a_h );
-    auto a_d = Kokkos::create_mirror( DeviceType(), a_h );
+    Kokkos::View<double *, Layout, Kokkos::HostSpace> a_org("A", 1000);
+    Kokkos::View<double *, Layout, Kokkos::HostSpace, MemoryTraits> a_h = a_org;
+    auto a_h2 = Kokkos::create_mirror(Kokkos::HostSpace(), a_h);
+    auto a_d  = Kokkos::create_mirror(DeviceType(), a_h);
 
-    int equal_ptr_h_h2 = ( a_h.data()  == a_h2.data() ) ? 1 : 0;
-    int equal_ptr_h_d  = ( a_h.data()  ==  a_d.data() ) ? 1 : 0;
-    int equal_ptr_h2_d = ( a_h2.data() ==  a_d.data() ) ? 1 : 0;
+    int equal_ptr_h_h2 = (a_h.data() == a_h2.data()) ? 1 : 0;
+    int equal_ptr_h_d  = (a_h.data() == a_d.data()) ? 1 : 0;
+    int equal_ptr_h2_d = (a_h2.data() == a_d.data()) ? 1 : 0;
 
-    ASSERT_EQ( equal_ptr_h_h2, 0 );
-    ASSERT_EQ( equal_ptr_h_d, 0 );
-    ASSERT_EQ( equal_ptr_h2_d, 0 );
+    ASSERT_EQ(equal_ptr_h_h2, 0);
+    ASSERT_EQ(equal_ptr_h_d, 0);
+    ASSERT_EQ(equal_ptr_h2_d, 0);
 
-    ASSERT_EQ( a_h.extent(0), a_h2.extent(0) );
-    ASSERT_EQ( a_h.extent(0), a_d .extent(0) );
+    ASSERT_EQ(a_h.extent(0), a_h2.extent(0));
+    ASSERT_EQ(a_h.extent(0), a_d.extent(0));
   }
 
-  template< class MemoryTraits >
+  template <class MemoryTraits>
   void static test_mirror_view() {
-    Kokkos::View< double*, Layout, Kokkos::HostSpace > a_org( "A", 1000 );
-    Kokkos::View< double*, Layout, Kokkos::HostSpace, MemoryTraits > a_h = a_org;
-    auto a_h2 = Kokkos::create_mirror_view( Kokkos::HostSpace(), a_h );
-    auto a_d = Kokkos::create_mirror_view( DeviceType(), a_h );
+    Kokkos::View<double *, Layout, Kokkos::HostSpace> a_org("A", 1000);
+    Kokkos::View<double *, Layout, Kokkos::HostSpace, MemoryTraits> a_h = a_org;
+    auto a_h2 = Kokkos::create_mirror_view(Kokkos::HostSpace(), a_h);
+    auto a_d  = Kokkos::create_mirror_view(DeviceType(), a_h);
 
-    int equal_ptr_h_h2 = a_h.data()  == a_h2.data() ? 1 : 0;
-    int equal_ptr_h_d  = a_h.data()  ==  a_d.data() ? 1 : 0;
-    int equal_ptr_h2_d = a_h2.data() ==  a_d.data() ? 1 : 0;
+    int equal_ptr_h_h2 = a_h.data() == a_h2.data() ? 1 : 0;
+    int equal_ptr_h_d  = a_h.data() == a_d.data() ? 1 : 0;
+    int equal_ptr_h2_d = a_h2.data() == a_d.data() ? 1 : 0;
 
-    int is_same_memspace = std::is_same< Kokkos::HostSpace, typename DeviceType::memory_space >::value ? 1 : 0;
-    ASSERT_EQ( equal_ptr_h_h2, 1 );
-    ASSERT_EQ( equal_ptr_h_d, is_same_memspace );
-    ASSERT_EQ( equal_ptr_h2_d, is_same_memspace );
+    int is_same_memspace =
+        std::is_same<Kokkos::HostSpace,
+                     typename DeviceType::memory_space>::value
+            ? 1
+            : 0;
+    ASSERT_EQ(equal_ptr_h_h2, 1);
+    ASSERT_EQ(equal_ptr_h_d, is_same_memspace);
+    ASSERT_EQ(equal_ptr_h2_d, is_same_memspace);
 
-    ASSERT_EQ( a_h.extent(0), a_h2.extent(0) );
-    ASSERT_EQ( a_h.extent(0), a_d .extent(0) );
+    ASSERT_EQ(a_h.extent(0), a_h2.extent(0));
+    ASSERT_EQ(a_h.extent(0), a_d.extent(0));
   }
 
-  template< class MemoryTraits >
+  template <class MemoryTraits>
   void static test_mirror_copy() {
-    Kokkos::View< double*, Layout, Kokkos::HostSpace > a_org( "A", 10 );
-    a_org(5) = 42.0;
-    Kokkos::View< double*, Layout, Kokkos::HostSpace, MemoryTraits > a_h = a_org;
-    auto a_h2 = Kokkos::create_mirror_view_and_copy( Kokkos::HostSpace(), a_h );
-    auto a_d = Kokkos::create_mirror_view_and_copy( DeviceType(), a_h );
-    auto a_h3 = Kokkos::create_mirror_view_and_copy( Kokkos::HostSpace(), a_d );
+    Kokkos::View<double *, Layout, Kokkos::HostSpace> a_org("A", 10);
+    a_org(5)                                                            = 42.0;
+    Kokkos::View<double *, Layout, Kokkos::HostSpace, MemoryTraits> a_h = a_org;
+    auto a_h2 = Kokkos::create_mirror_view_and_copy(Kokkos::HostSpace(), a_h);
+    auto a_d  = Kokkos::create_mirror_view_and_copy(DeviceType(), a_h);
+    auto a_h3 = Kokkos::create_mirror_view_and_copy(Kokkos::HostSpace(), a_d);
 
-    int equal_ptr_h_h2 = a_h.data()  == a_h2.data() ? 1 : 0;
-    int equal_ptr_h_d  = a_h.data()  ==  a_d.data() ? 1 : 0;
-    int equal_ptr_h2_d = a_h2.data() ==  a_d.data() ? 1 : 0;
-    int equal_ptr_h3_d = a_h3.data() ==  a_d.data() ? 1 : 0;
+    int equal_ptr_h_h2 = a_h.data() == a_h2.data() ? 1 : 0;
+    int equal_ptr_h_d  = a_h.data() == a_d.data() ? 1 : 0;
+    int equal_ptr_h2_d = a_h2.data() == a_d.data() ? 1 : 0;
+    int equal_ptr_h3_d = a_h3.data() == a_d.data() ? 1 : 0;
 
-    int is_same_memspace = std::is_same< Kokkos::HostSpace, typename DeviceType::memory_space >::value ? 1 : 0;
-    ASSERT_EQ( equal_ptr_h_h2, 1 );
-    ASSERT_EQ( equal_ptr_h_d, is_same_memspace );
-    ASSERT_EQ( equal_ptr_h2_d, is_same_memspace );
-    ASSERT_EQ( equal_ptr_h3_d, is_same_memspace );
+    int is_same_memspace =
+        std::is_same<Kokkos::HostSpace,
+                     typename DeviceType::memory_space>::value
+            ? 1
+            : 0;
+    ASSERT_EQ(equal_ptr_h_h2, 1);
+    ASSERT_EQ(equal_ptr_h_d, is_same_memspace);
+    ASSERT_EQ(equal_ptr_h2_d, is_same_memspace);
+    ASSERT_EQ(equal_ptr_h3_d, is_same_memspace);
 
-    ASSERT_EQ( a_h.extent(0), a_h3.extent(0) );
-    ASSERT_EQ( a_h.extent(0), a_h2.extent(0) );
-    ASSERT_EQ( a_h.extent(0), a_d .extent(0) );
-    ASSERT_EQ( a_org(5), a_h3(5) );
+    ASSERT_EQ(a_h.extent(0), a_h3.extent(0));
+    ASSERT_EQ(a_h.extent(0), a_h2.extent(0));
+    ASSERT_EQ(a_h.extent(0), a_d.extent(0));
+    ASSERT_EQ(a_org(5), a_h3(5));
   }
 
-  template< class MemoryTraits, class Space >
+  template <class MemoryTraits, class Space>
   struct CopyUnInit {
-    typedef typename Kokkos::Impl::MirrorViewType<Space, double*, Layout, Kokkos::HostSpace, MemoryTraits>::view_type mirror_view_type;
+    typedef typename Kokkos::Impl::MirrorViewType<
+        Space, double *, Layout, Kokkos::HostSpace, MemoryTraits>::view_type
+        mirror_view_type;
 
     mirror_view_type a_d;
 
     KOKKOS_INLINE_FUNCTION
-    CopyUnInit( mirror_view_type & a_d_ ) : a_d(a_d_) {
-    }
+    CopyUnInit(mirror_view_type &a_d_) : a_d(a_d_) {}
 
     KOKKOS_INLINE_FUNCTION
-    void operator() (const typename Space::size_type i) const {
-       a_d(i) = (double)(10-i);
+    void operator()(const typename Space::size_type i) const {
+      a_d(i) = (double)(10 - i);
     }
-    
   };
 
-  template< class MemoryTraits >
+  template <class MemoryTraits>
   void static test_mirror_no_initialize() {
-    Kokkos::View< double*, Layout, Kokkos::HostSpace > a_org( "A", 10 );
-    Kokkos::View< double*, Layout, Kokkos::HostSpace, MemoryTraits > a_h = a_org;
+    Kokkos::View<double *, Layout, Kokkos::HostSpace> a_org("A", 10);
+    Kokkos::View<double *, Layout, Kokkos::HostSpace, MemoryTraits> a_h = a_org;
 
-    for (int i = 0; i < 10; i++)
-    {
-       a_h(i) = (double)i;   
+    for (int i = 0; i < 10; i++) {
+      a_h(i) = (double)i;
     }
-    auto a_d = Kokkos::create_mirror_view( DeviceType(), a_h, Kokkos::WithoutInitializing );
-    
+    auto a_d = Kokkos::create_mirror_view(DeviceType(), a_h,
+                                          Kokkos::WithoutInitializing);
+
     int equal_ptr_h_d = (a_h.data() == a_d.data()) ? 1 : 0;
-    constexpr int is_same_memspace = std::is_same< Kokkos::HostSpace, typename DeviceType::memory_space >::value ? 1 : 0;
-    
-    ASSERT_EQ( equal_ptr_h_d, is_same_memspace);
+    constexpr int is_same_memspace =
+        std::is_same<Kokkos::HostSpace,
+                     typename DeviceType::memory_space>::value
+            ? 1
+            : 0;
 
-    Kokkos::parallel_for( Kokkos::RangePolicy< typename DeviceType::execution_space >( 0, int(10)), CopyUnInit< MemoryTraits, DeviceType >(a_d));
+    ASSERT_EQ(equal_ptr_h_d, is_same_memspace);
 
-    Kokkos::deep_copy( a_h, a_d );
+    Kokkos::parallel_for(
+        Kokkos::RangePolicy<typename DeviceType::execution_space>(0, int(10)),
+        CopyUnInit<MemoryTraits, DeviceType>(a_d));
 
-    for (int i = 0; i < 10; i++)
-    {
-       ASSERT_EQ(a_h(i), (double)(10-i));
+    Kokkos::deep_copy(a_h, a_d);
+
+    for (int i = 0; i < 10; i++) {
+      ASSERT_EQ(a_h(i), (double)(10 - i));
     }
   }
 
   void static testit() {
-    test_mirror< Kokkos::MemoryTraits<0> >();
-    test_mirror< Kokkos::MemoryTraits<Kokkos::Unmanaged> >();
-    test_mirror_view< Kokkos::MemoryTraits<0> >();
-    test_mirror_view< Kokkos::MemoryTraits<Kokkos::Unmanaged> >();
-    test_mirror_copy< Kokkos::MemoryTraits<0> >();
-    test_mirror_copy< Kokkos::MemoryTraits<Kokkos::Unmanaged> >();
-    test_mirror_no_initialize< Kokkos::MemoryTraits<0> >();
-    test_mirror_no_initialize< Kokkos::MemoryTraits<Kokkos::Unmanaged> >();
+    test_mirror<Kokkos::MemoryTraits<0> >();
+    test_mirror<Kokkos::MemoryTraits<Kokkos::Unmanaged> >();
+    test_mirror_view<Kokkos::MemoryTraits<0> >();
+    test_mirror_view<Kokkos::MemoryTraits<Kokkos::Unmanaged> >();
+    test_mirror_copy<Kokkos::MemoryTraits<0> >();
+    test_mirror_copy<Kokkos::MemoryTraits<Kokkos::Unmanaged> >();
+    test_mirror_no_initialize<Kokkos::MemoryTraits<0> >();
+    test_mirror_no_initialize<Kokkos::MemoryTraits<Kokkos::Unmanaged> >();
   }
 };
 
 /*--------------------------------------------------------------------------*/
 
-template< typename T, class DeviceType >
-class TestViewAPI
-{
-public:
+template <typename T, class DeviceType>
+class TestViewAPI {
+ public:
   typedef DeviceType device;
 
-  enum { N0 = 1000,
-         N1 = 3,
-         N2 = 5,
-         N3 = 7 };
+  enum { N0 = 1000, N1 = 3, N2 = 5, N3 = 7 };
 
-  typedef Kokkos::View< T, device > dView0;
-  typedef Kokkos::View< T*, device > dView1;
-  typedef Kokkos::View< T*[N1], device > dView2;
-  typedef Kokkos::View< T*[N1][N2], device > dView3;
-  typedef Kokkos::View< T*[N1][N2][N3], device > dView4;
-  typedef Kokkos::View< const T*[N1][N2][N3], device > const_dView4;
-  typedef Kokkos::View< T****, device, Kokkos::MemoryUnmanaged > dView4_unmanaged;
+  typedef Kokkos::View<T, device> dView0;
+  typedef Kokkos::View<T *, device> dView1;
+  typedef Kokkos::View<T * [N1], device> dView2;
+  typedef Kokkos::View<T * [N1][N2], device> dView3;
+  typedef Kokkos::View<T * [N1][N2][N3], device> dView4;
+  typedef Kokkos::View<const T * [N1][N2][N3], device> const_dView4;
+  typedef Kokkos::View<T ****, device, Kokkos::MemoryUnmanaged>
+      dView4_unmanaged;
   typedef typename dView0::host_mirror_space host;
 
-  TestViewAPI()
-  {
-  }
+  TestViewAPI() {}
 
   static void run_test_view_operator_a() {
-    {TestViewOperator< T, device > f; Kokkos::parallel_for(int(N0),f); Kokkos::fence();}
+    {
+      TestViewOperator<T, device> f;
+      Kokkos::parallel_for(int(N0), f);
+      Kokkos::fence();
+    }
 #ifndef KOKKOS_ENABLE_OPENMPTARGET
-    TestViewOperator_LeftAndRight< int[2][3][4][2][3][4], device >f6; f6.testit();
-    TestViewOperator_LeftAndRight< int[2][3][4][2][3], device >f5; f5.testit();
-    TestViewOperator_LeftAndRight< int[2][3][4][2], device >f4; f4.testit();
-    TestViewOperator_LeftAndRight< int[2][3][4], device >f3; f3.testit();
-    TestViewOperator_LeftAndRight< int[2][3], device >f2; f2.testit();
-    TestViewOperator_LeftAndRight< int[2], device >f1; f1.testit();
+    TestViewOperator_LeftAndRight<int[2][3][4][2][3][4], device> f6;
+    f6.testit();
+    TestViewOperator_LeftAndRight<int[2][3][4][2][3], device> f5;
+    f5.testit();
+    TestViewOperator_LeftAndRight<int[2][3][4][2], device> f4;
+    f4.testit();
+    TestViewOperator_LeftAndRight<int[2][3][4], device> f3;
+    f3.testit();
+    TestViewOperator_LeftAndRight<int[2][3], device> f2;
+    f2.testit();
+    TestViewOperator_LeftAndRight<int[2], device> f1;
+    f1.testit();
 #endif
   }
 
   static void run_test_view_operator_b() {
 #ifndef KOKKOS_ENABLE_OPENMPTARGET
-    TestViewOperator_LeftAndRight< int[2][3][4][2][3][4][2], device > f7; f7.testit();
+    TestViewOperator_LeftAndRight<int[2][3][4][2][3][4][2], device> f7;
+    f7.testit();
 #endif
   }
 
   static void run_test_view_operator_c() {
 #ifndef KOKKOS_ENABLE_OPENMPTARGET
-    TestViewOperator_LeftAndRight< int[2][3][4][2][3][4][2][3], device > f8; f8.testit();
+    TestViewOperator_LeftAndRight<int[2][3][4][2][3][4][2][3], device> f8;
+    f8.testit();
 #endif
   }
 
-  static void run_test_mirror()
-  {
-    typedef Kokkos::View< int, host > view_type;
+  static void run_test_mirror() {
+    typedef Kokkos::View<int, host> view_type;
     typedef typename view_type::HostMirror mirror_type;
 
-    static_assert( std::is_same< typename view_type::memory_space, typename mirror_type::memory_space >::value, "" );
+    static_assert(std::is_same<typename view_type::memory_space,
+                               typename mirror_type::memory_space>::value,
+                  "");
 
-    view_type a( "a" );
-    mirror_type am = Kokkos::create_mirror_view( a );
-    mirror_type ax = Kokkos::create_mirror( a );
-    ASSERT_EQ( & a(), & am() );
+    view_type a("a");
+    mirror_type am = Kokkos::create_mirror_view(a);
+    mirror_type ax = Kokkos::create_mirror(a);
+    ASSERT_EQ(&a(), &am());
 
-    TestViewMirror< Kokkos::LayoutLeft, device >::testit();
-    TestViewMirror< Kokkos::LayoutRight, device >::testit();
+    TestViewMirror<Kokkos::LayoutLeft, device>::testit();
+    TestViewMirror<Kokkos::LayoutRight, device>::testit();
   }
 
-  static void run_test_scalar()
-  {
-    typedef typename dView0::HostMirror  hView0;
+  static void run_test_scalar() {
+    typedef typename dView0::HostMirror hView0;
 
     dView0 dx, dy;
     hView0 hx, hy;
 
-    dx = dView0( "dx" );
-    dy = dView0( "dy" );
+    dx = dView0("dx");
+    dy = dView0("dy");
 
-    hx = Kokkos::create_mirror( dx );
-    hy = Kokkos::create_mirror( dy );
+    hx = Kokkos::create_mirror(dx);
+    hy = Kokkos::create_mirror(dy);
 
     hx() = 1;
 
-    Kokkos::deep_copy( dx, hx );
-    Kokkos::deep_copy( dy, dx );
-    Kokkos::deep_copy( hy, dy );
+    Kokkos::deep_copy(dx, hx);
+    Kokkos::deep_copy(dy, dx);
+    Kokkos::deep_copy(hy, dy);
 #ifndef KOKKOS_ENABLE_OPENMPTARGET
-    ASSERT_EQ( hx(), hy() );
+    ASSERT_EQ(hx(), hy());
 #endif
   }
 
-  static void run_test()
-  {
+  static void run_test() {
     // mfh 14 Feb 2014: This test doesn't actually create instances of
     // these types.  In order to avoid "declared but unused typedef"
     // warnings, we declare empty instances of these types, with the
     // usual "(void)" marker to avoid compiler warnings for unused
     // variables.
 
-    typedef typename dView0::HostMirror  hView0;
-    typedef typename dView1::HostMirror  hView1;
-    typedef typename dView2::HostMirror  hView2;
-    typedef typename dView3::HostMirror  hView3;
-    typedef typename dView4::HostMirror  hView4;
+    typedef typename dView0::HostMirror hView0;
+    typedef typename dView1::HostMirror hView1;
+    typedef typename dView2::HostMirror hView2;
+    typedef typename dView3::HostMirror hView3;
+    typedef typename dView4::HostMirror hView4;
 
     {
       hView0 thing;
-      (void) thing;
+      (void)thing;
     }
     {
       hView1 thing;
-      (void) thing;
+      (void)thing;
     }
     {
       hView2 thing;
-      (void) thing;
+      (void)thing;
     }
     {
       hView3 thing;
-      (void) thing;
+      (void)thing;
     }
     {
       hView4 thing;
-      (void) thing;
+      (void)thing;
     }
 
     dView4 dx, dy, dz;
     hView4 hx, hy, hz;
 
-    ASSERT_TRUE( dx.data() == 0 );
-    ASSERT_TRUE( dy.data() == 0 );
-    ASSERT_TRUE( dz.data() == 0 );
-    ASSERT_TRUE( hx.data() == 0 );
-    ASSERT_TRUE( hy.data() == 0 );
-    ASSERT_TRUE( hz.data() == 0 );
-    ASSERT_EQ( dx.extent(0), 0u );
-    ASSERT_EQ( dy.extent(0), 0u );
-    ASSERT_EQ( dz.extent(0), 0u );
-    ASSERT_EQ( hx.extent(0), 0u );
-    ASSERT_EQ( hy.extent(0), 0u );
-    ASSERT_EQ( hz.extent(0), 0u );
-    ASSERT_EQ( dx.extent(1), unsigned( N1 ) );
-    ASSERT_EQ( dy.extent(1), unsigned( N1 ) );
-    ASSERT_EQ( dz.extent(1), unsigned( N1 ) );
-    ASSERT_EQ( hx.extent(1), unsigned( N1 ) );
-    ASSERT_EQ( hy.extent(1), unsigned( N1 ) );
-    ASSERT_EQ( hz.extent(1), unsigned( N1 ) );
+    ASSERT_TRUE(dx.data() == 0);
+    ASSERT_TRUE(dy.data() == 0);
+    ASSERT_TRUE(dz.data() == 0);
+    ASSERT_TRUE(hx.data() == 0);
+    ASSERT_TRUE(hy.data() == 0);
+    ASSERT_TRUE(hz.data() == 0);
+    ASSERT_EQ(dx.extent(0), 0u);
+    ASSERT_EQ(dy.extent(0), 0u);
+    ASSERT_EQ(dz.extent(0), 0u);
+    ASSERT_EQ(hx.extent(0), 0u);
+    ASSERT_EQ(hy.extent(0), 0u);
+    ASSERT_EQ(hz.extent(0), 0u);
+    ASSERT_EQ(dx.extent(1), unsigned(N1));
+    ASSERT_EQ(dy.extent(1), unsigned(N1));
+    ASSERT_EQ(dz.extent(1), unsigned(N1));
+    ASSERT_EQ(hx.extent(1), unsigned(N1));
+    ASSERT_EQ(hy.extent(1), unsigned(N1));
+    ASSERT_EQ(hz.extent(1), unsigned(N1));
 
-    dx = dView4( "dx", N0 );
-    dy = dView4( "dy", N0 );
+    dx = dView4("dx", N0);
+    dy = dView4("dy", N0);
 
-    ASSERT_EQ( dx.use_count(), size_t( 1 ) );
+    ASSERT_EQ(dx.use_count(), size_t(1));
 
     dView4_unmanaged unmanaged_dx = dx;
-    ASSERT_EQ( dx.use_count(), size_t( 1 ) );
+    ASSERT_EQ(dx.use_count(), size_t(1));
 
-    dView4_unmanaged unmanaged_from_ptr_dx = dView4_unmanaged( dx.data(),
-                                                               dx.extent(0),
-                                                               dx.extent(1),
-                                                               dx.extent(2),
-                                                               dx.extent(3) );
+    dView4_unmanaged unmanaged_from_ptr_dx = dView4_unmanaged(
+        dx.data(), dx.extent(0), dx.extent(1), dx.extent(2), dx.extent(3));
 
     {
       // Destruction of this view should be harmless.
 
-      const_dView4 unmanaged_from_ptr_const_dx( dx.data(),
-                                                dx.extent(0)
+      const_dView4 unmanaged_from_ptr_const_dx(dx.data(), dx.extent(0)
 #ifdef KOKKOS_ENABLE_DEPRECATED_CODE
-                                                ,dx.extent(1),
-                                                dx.extent(2),
-                                                dx.extent(3)
+                                                              ,
+                                               dx.extent(1), dx.extent(2),
+                                               dx.extent(3)
 #endif
-                                                );
+      );
     }
 
     const_dView4 const_dx = dx;
-    ASSERT_EQ( dx.use_count(), size_t( 2 ) );
+    ASSERT_EQ(dx.use_count(), size_t(2));
 
     {
       const_dView4 const_dx2;
       const_dx2 = const_dx;
-      ASSERT_EQ( dx.use_count(), size_t( 3 ) );
+      ASSERT_EQ(dx.use_count(), size_t(3));
 
       const_dx2 = dy;
-      ASSERT_EQ( dx.use_count(), size_t( 2 ) );
+      ASSERT_EQ(dx.use_count(), size_t(2));
 
-      const_dView4 const_dx3( dx );
-      ASSERT_EQ( dx.use_count(), size_t( 3 ) );
+      const_dView4 const_dx3(dx);
+      ASSERT_EQ(dx.use_count(), size_t(3));
 
-      dView4_unmanaged dx4_unmanaged( dx );
-      ASSERT_EQ( dx.use_count(), size_t( 3 ) );
+      dView4_unmanaged dx4_unmanaged(dx);
+      ASSERT_EQ(dx.use_count(), size_t(3));
     }
 
-    ASSERT_EQ( dx.use_count(), size_t( 2 ) );
+    ASSERT_EQ(dx.use_count(), size_t(2));
 
-    ASSERT_FALSE( dx.data() == 0 );
-    ASSERT_FALSE( const_dx.data() == 0 );
-    ASSERT_FALSE( unmanaged_dx.data() == 0 );
-    ASSERT_FALSE( unmanaged_from_ptr_dx.data() == 0 );
-    ASSERT_FALSE( dy.data() == 0 );
-    ASSERT_NE( dx, dy );
+    ASSERT_FALSE(dx.data() == 0);
+    ASSERT_FALSE(const_dx.data() == 0);
+    ASSERT_FALSE(unmanaged_dx.data() == 0);
+    ASSERT_FALSE(unmanaged_from_ptr_dx.data() == 0);
+    ASSERT_FALSE(dy.data() == 0);
+    ASSERT_NE(dx, dy);
 
-    ASSERT_EQ( dx.extent(0), unsigned( N0 ) );
-    ASSERT_EQ( dx.extent(1), unsigned( N1 ) );
-    ASSERT_EQ( dx.extent(2), unsigned( N2 ) );
-    ASSERT_EQ( dx.extent(3), unsigned( N3 ) );
+    ASSERT_EQ(dx.extent(0), unsigned(N0));
+    ASSERT_EQ(dx.extent(1), unsigned(N1));
+    ASSERT_EQ(dx.extent(2), unsigned(N2));
+    ASSERT_EQ(dx.extent(3), unsigned(N3));
 
-    ASSERT_EQ( dy.extent(0), unsigned( N0 ) );
-    ASSERT_EQ( dy.extent(1), unsigned( N1 ) );
-    ASSERT_EQ( dy.extent(2), unsigned( N2 ) );
-    ASSERT_EQ( dy.extent(3), unsigned( N3 ) );
+    ASSERT_EQ(dy.extent(0), unsigned(N0));
+    ASSERT_EQ(dy.extent(1), unsigned(N1));
+    ASSERT_EQ(dy.extent(2), unsigned(N2));
+    ASSERT_EQ(dy.extent(3), unsigned(N3));
 
-    ASSERT_EQ( unmanaged_from_ptr_dx.span(), unsigned( N0 ) * unsigned( N1 ) * unsigned( N2 ) * unsigned( N3 ) );
+    ASSERT_EQ(unmanaged_from_ptr_dx.span(),
+              unsigned(N0) * unsigned(N1) * unsigned(N2) * unsigned(N3));
 #ifdef KOKKOS_ENABLE_OPENMPTARGET
-return;
+    return;
 #endif
-    hx = Kokkos::create_mirror( dx );
-    hy = Kokkos::create_mirror( dy );
+    hx = Kokkos::create_mirror(dx);
+    hy = Kokkos::create_mirror(dy);
 
     // T v1 = hx();       // Generates compile error as intended.
     // T v2 = hx( 0, 0 ); // Generates compile error as intended.
@@ -1107,332 +1129,349 @@ return;
     {
       size_t count = 0;
 
-      for ( size_t ip = 0; ip < N0; ++ip )
-      for ( size_t i1 = 0; i1 < hx.extent(1); ++i1 )
-      for ( size_t i2 = 0; i2 < hx.extent(2); ++i2 )
-      for ( size_t i3 = 0; i3 < hx.extent(3); ++i3 )
-      {
-        hx( ip, i1, i2, i3 ) = ++count;
-      }
+      for (size_t ip = 0; ip < N0; ++ip)
+        for (size_t i1 = 0; i1 < hx.extent(1); ++i1)
+          for (size_t i2 = 0; i2 < hx.extent(2); ++i2)
+            for (size_t i3 = 0; i3 < hx.extent(3); ++i3) {
+              hx(ip, i1, i2, i3) = ++count;
+            }
 
-      Kokkos::deep_copy( typename hView4::execution_space(), dx, hx );
-      Kokkos::deep_copy( typename hView4::execution_space(), dy, dx );
-      Kokkos::deep_copy( typename hView4::execution_space(), hy, dy );
+      Kokkos::deep_copy(typename hView4::execution_space(), dx, hx);
+      Kokkos::deep_copy(typename hView4::execution_space(), dy, dx);
+      Kokkos::deep_copy(typename hView4::execution_space(), hy, dy);
 
-      for ( size_t ip = 0; ip < N0; ++ip )
-      for ( size_t i1 = 0; i1 < N1; ++i1 )
-      for ( size_t i2 = 0; i2 < N2; ++i2 )
-      for ( size_t i3 = 0; i3 < N3; ++i3 )
-      {
-        ASSERT_EQ( hx( ip, i1, i2, i3 ), hy( ip, i1, i2, i3 ) );
-      }
+      for (size_t ip = 0; ip < N0; ++ip)
+        for (size_t i1 = 0; i1 < N1; ++i1)
+          for (size_t i2 = 0; i2 < N2; ++i2)
+            for (size_t i3 = 0; i3 < N3; ++i3) {
+              ASSERT_EQ(hx(ip, i1, i2, i3), hy(ip, i1, i2, i3));
+            }
 
-      Kokkos::deep_copy( typename hView4::execution_space(), dx, T( 0 ) );
-      Kokkos::deep_copy( typename hView4::execution_space(), hx, dx );
+      Kokkos::deep_copy(typename hView4::execution_space(), dx, T(0));
+      Kokkos::deep_copy(typename hView4::execution_space(), hx, dx);
 
-      for ( size_t ip = 0; ip < N0; ++ip )
-      for ( size_t i1 = 0; i1 < N1; ++i1 )
-      for ( size_t i2 = 0; i2 < N2; ++i2 )
-      for ( size_t i3 = 0; i3 < N3; ++i3 )
-      {
-        ASSERT_EQ( hx( ip, i1, i2, i3 ), T( 0 ) );
-      }
+      for (size_t ip = 0; ip < N0; ++ip)
+        for (size_t i1 = 0; i1 < N1; ++i1)
+          for (size_t i2 = 0; i2 < N2; ++i2)
+            for (size_t i3 = 0; i3 < N3; ++i3) {
+              ASSERT_EQ(hx(ip, i1, i2, i3), T(0));
+            }
     }
 
     // Testing with asynchronous deep copy with respect to host.
     {
       size_t count = 0;
 
-      for ( size_t ip = 0; ip < N0; ++ip )
-      for ( size_t i1 = 0; i1 < hx.extent(1); ++i1 )
-      for ( size_t i2 = 0; i2 < hx.extent(2); ++i2 )
-      for ( size_t i3 = 0; i3 < hx.extent(3); ++i3 )
-      {
-        hx( ip, i1, i2, i3 ) = ++count;
-      }
+      for (size_t ip = 0; ip < N0; ++ip)
+        for (size_t i1 = 0; i1 < hx.extent(1); ++i1)
+          for (size_t i2 = 0; i2 < hx.extent(2); ++i2)
+            for (size_t i3 = 0; i3 < hx.extent(3); ++i3) {
+              hx(ip, i1, i2, i3) = ++count;
+            }
 
-      Kokkos::deep_copy( typename dView4::execution_space(), dx, hx );
-      Kokkos::deep_copy( typename dView4::execution_space(), dy, dx );
-      Kokkos::deep_copy( typename dView4::execution_space(), hy, dy );
+      Kokkos::deep_copy(typename dView4::execution_space(), dx, hx);
+      Kokkos::deep_copy(typename dView4::execution_space(), dy, dx);
+      Kokkos::deep_copy(typename dView4::execution_space(), hy, dy);
 
-      for ( size_t ip = 0; ip < N0; ++ip )
-      for ( size_t i1 = 0; i1 < N1; ++i1 )
-      for ( size_t i2 = 0; i2 < N2; ++i2 )
-      for ( size_t i3 = 0; i3 < N3; ++i3 )
-      {
-        ASSERT_EQ( hx( ip, i1, i2, i3 ), hy( ip, i1, i2, i3 ) );
-      }
+      for (size_t ip = 0; ip < N0; ++ip)
+        for (size_t i1 = 0; i1 < N1; ++i1)
+          for (size_t i2 = 0; i2 < N2; ++i2)
+            for (size_t i3 = 0; i3 < N3; ++i3) {
+              ASSERT_EQ(hx(ip, i1, i2, i3), hy(ip, i1, i2, i3));
+            }
 
-      Kokkos::deep_copy( typename dView4::execution_space(), dx, T( 0 ) );
-      Kokkos::deep_copy( typename dView4::execution_space(), hx, dx );
+      Kokkos::deep_copy(typename dView4::execution_space(), dx, T(0));
+      Kokkos::deep_copy(typename dView4::execution_space(), hx, dx);
 
-      for ( size_t ip = 0; ip < N0; ++ip )
-      for ( size_t i1 = 0; i1 < N1; ++i1 )
-      for ( size_t i2 = 0; i2 < N2; ++i2 )
-      for ( size_t i3 = 0; i3 < N3; ++i3 )
-      {
-        ASSERT_EQ( hx( ip, i1, i2, i3 ), T( 0 ) );
-      }
+      for (size_t ip = 0; ip < N0; ++ip)
+        for (size_t i1 = 0; i1 < N1; ++i1)
+          for (size_t i2 = 0; i2 < N2; ++i2)
+            for (size_t i3 = 0; i3 < N3; ++i3) {
+              ASSERT_EQ(hx(ip, i1, i2, i3), T(0));
+            }
     }
 
     // Testing with synchronous deep copy.
     {
       size_t count = 0;
 
-      for ( size_t ip = 0; ip < N0; ++ip )
-      for ( size_t i1 = 0; i1 < hx.extent(1); ++i1 )
-      for ( size_t i2 = 0; i2 < hx.extent(2); ++i2 )
-      for ( size_t i3 = 0; i3 < hx.extent(3); ++i3 )
-      {
-        hx( ip, i1, i2, i3 ) = ++count;
-      }
+      for (size_t ip = 0; ip < N0; ++ip)
+        for (size_t i1 = 0; i1 < hx.extent(1); ++i1)
+          for (size_t i2 = 0; i2 < hx.extent(2); ++i2)
+            for (size_t i3 = 0; i3 < hx.extent(3); ++i3) {
+              hx(ip, i1, i2, i3) = ++count;
+            }
 
-      Kokkos::deep_copy( dx, hx );
-      Kokkos::deep_copy( dy, dx );
-      Kokkos::deep_copy( hy, dy );
+      Kokkos::deep_copy(dx, hx);
+      Kokkos::deep_copy(dy, dx);
+      Kokkos::deep_copy(hy, dy);
 
-      for ( size_t ip = 0; ip < N0; ++ip )
-      for ( size_t i1 = 0; i1 < N1; ++i1 )
-      for ( size_t i2 = 0; i2 < N2; ++i2 )
-      for ( size_t i3 = 0; i3 < N3; ++i3 )
-      {
-        ASSERT_EQ( hx( ip, i1, i2, i3 ), hy( ip, i1, i2, i3 ) );
-      }
+      for (size_t ip = 0; ip < N0; ++ip)
+        for (size_t i1 = 0; i1 < N1; ++i1)
+          for (size_t i2 = 0; i2 < N2; ++i2)
+            for (size_t i3 = 0; i3 < N3; ++i3) {
+              ASSERT_EQ(hx(ip, i1, i2, i3), hy(ip, i1, i2, i3));
+            }
 
-      Kokkos::deep_copy( dx, T( 0 ) );
-      Kokkos::deep_copy( hx, dx );
+      Kokkos::deep_copy(dx, T(0));
+      Kokkos::deep_copy(hx, dx);
 
-      for ( size_t ip = 0; ip < N0; ++ip )
-      for ( size_t i1 = 0; i1 < N1; ++i1 )
-      for ( size_t i2 = 0; i2 < N2; ++i2 )
-      for ( size_t i3 = 0; i3 < N3; ++i3 )
-      {
-        ASSERT_EQ( hx( ip, i1, i2, i3 ), T( 0 ) );
-      }
+      for (size_t ip = 0; ip < N0; ++ip)
+        for (size_t i1 = 0; i1 < N1; ++i1)
+          for (size_t i2 = 0; i2 < N2; ++i2)
+            for (size_t i3 = 0; i3 < N3; ++i3) {
+              ASSERT_EQ(hx(ip, i1, i2, i3), T(0));
+            }
     }
 
     dz = dx;
-    ASSERT_EQ( dx, dz );
-    ASSERT_NE( dy, dz );
+    ASSERT_EQ(dx, dz);
+    ASSERT_NE(dy, dz);
 
     dz = dy;
-    ASSERT_EQ( dy, dz );
-    ASSERT_NE( dx, dz );
+    ASSERT_EQ(dy, dz);
+    ASSERT_NE(dx, dz);
 
     dx = dView4();
-    ASSERT_TRUE( dx.data() == 0 );
-    ASSERT_FALSE( dy.data() == 0 );
-    ASSERT_FALSE( dz.data() == 0 );
+    ASSERT_TRUE(dx.data() == 0);
+    ASSERT_FALSE(dy.data() == 0);
+    ASSERT_FALSE(dz.data() == 0);
 
     dy = dView4();
-    ASSERT_TRUE( dx.data() == 0 );
-    ASSERT_TRUE( dy.data() == 0 );
-    ASSERT_FALSE( dz.data() == 0 );
+    ASSERT_TRUE(dx.data() == 0);
+    ASSERT_TRUE(dy.data() == 0);
+    ASSERT_FALSE(dz.data() == 0);
 
     dz = dView4();
-    ASSERT_TRUE( dx.data() == 0 );
-    ASSERT_TRUE( dy.data() == 0 );
-    ASSERT_TRUE( dz.data() == 0 );
+    ASSERT_TRUE(dx.data() == 0);
+    ASSERT_TRUE(dy.data() == 0);
+    ASSERT_TRUE(dz.data() == 0);
   }
 
   static void run_test_deep_copy_empty() {
     // Check Deep Copy of LayoutLeft to LayoutRight
     {
-      Kokkos::View<double*,Kokkos::LayoutLeft> dll("dll",10);
-      Kokkos::View<double*,Kokkos::LayoutRight,Kokkos::HostSpace> hlr("hlr",10);
-      Kokkos::deep_copy(dll,hlr);
-      Kokkos::deep_copy(hlr,dll);
+      Kokkos::View<double *, Kokkos::LayoutLeft> dll("dll", 10);
+      Kokkos::View<double *, Kokkos::LayoutRight, Kokkos::HostSpace> hlr("hlr",
+                                                                         10);
+      Kokkos::deep_copy(dll, hlr);
+      Kokkos::deep_copy(hlr, dll);
     }
 
     // Check Deep Copy of two empty 1D views
     {
-      Kokkos::View<double*> d;
-      Kokkos::View<double*,Kokkos::HostSpace> h;
-      Kokkos::deep_copy(d,h);
-      Kokkos::deep_copy(h,d);
+      Kokkos::View<double *> d;
+      Kokkos::View<double *, Kokkos::HostSpace> h;
+      Kokkos::deep_copy(d, h);
+      Kokkos::deep_copy(h, d);
     }
 
     // Check Deep Copy of two empty 2D views
     {
-      Kokkos::View<double*[3],Kokkos::LayoutRight> d;
-      Kokkos::View<double*[3],Kokkos::LayoutRight,Kokkos::HostSpace> h;
-      Kokkos::deep_copy(d,h);
-      Kokkos::deep_copy(h,d);
+      Kokkos::View<double * [3], Kokkos::LayoutRight> d;
+      Kokkos::View<double * [3], Kokkos::LayoutRight, Kokkos::HostSpace> h;
+      Kokkos::deep_copy(d, h);
+      Kokkos::deep_copy(h, d);
     }
   }
 
   typedef T DataType[2];
 
-  static void
-  check_auto_conversion_to_const(
-     const Kokkos::View< const DataType, device > & arg_const,
-     const Kokkos::View< DataType, device > & arg )
-  {
-    ASSERT_TRUE( arg_const == arg );
+  static void check_auto_conversion_to_const(
+      const Kokkos::View<const DataType, device> &arg_const,
+      const Kokkos::View<DataType, device> &arg) {
+    ASSERT_TRUE(arg_const == arg);
   }
 
-  static void run_test_const()
-  {
-    typedef Kokkos::View< DataType, device > typeX;
-    typedef Kokkos::View< const DataType, device > const_typeX;
-    typedef Kokkos::View< const DataType, device, Kokkos::MemoryRandomAccess > const_typeR;
+  static void run_test_const() {
+    typedef Kokkos::View<DataType, device> typeX;
+    typedef Kokkos::View<const DataType, device> const_typeX;
+    typedef Kokkos::View<const DataType, device, Kokkos::MemoryRandomAccess>
+        const_typeR;
 
-    typeX x( "X" );
+    typeX x("X");
     const_typeX xc = x;
     const_typeR xr = x;
 
-    ASSERT_TRUE( xc == x );
-    ASSERT_TRUE( x == xc );
+    ASSERT_TRUE(xc == x);
+    ASSERT_TRUE(x == xc);
 
     // For CUDA the constant random access View does not return
     // an lvalue reference due to retrieving through texture cache
     // therefore not allowed to query the underlying pointer.
-#if defined( KOKKOS_ENABLE_CUDA )
-    if ( !std::is_same< typename device::execution_space, Kokkos::Cuda >::value )
+#if defined(KOKKOS_ENABLE_CUDA)
+    if (!std::is_same<typename device::execution_space, Kokkos::Cuda>::value)
 #endif
     {
-      ASSERT_TRUE( x.data() == xr.data() );
+      ASSERT_TRUE(x.data() == xr.data());
     }
 
     // typeX xf = xc; // Setting non-const from const must not compile.
 
-    check_auto_conversion_to_const( x, x );
+    check_auto_conversion_to_const(x, x);
   }
 
-  static void run_test_subview()
-  {
-    typedef Kokkos::View< const T, device > sView;
+  static void run_test_subview() {
+    typedef Kokkos::View<const T, device> sView;
 
-    dView0 d0( "d0" );
-    dView1 d1( "d1", N0 );
-    dView2 d2( "d2", N0 );
-    dView3 d3( "d3", N0 );
-    dView4 d4( "d4", N0 );
+    dView0 d0("d0");
+    dView1 d1("d1", N0);
+    dView2 d2("d2", N0);
+    dView3 d3("d3", N0);
+    dView4 d4("d4", N0);
 
     sView s0 = d0;
-    sView s1 = Kokkos::subview( d1, 1 );
-    sView s2 = Kokkos::subview( d2, 1, 1 );
-    sView s3 = Kokkos::subview( d3, 1, 1, 1 );
-    sView s4 = Kokkos::subview( d4, 1, 1, 1, 1 );
+    sView s1 = Kokkos::subview(d1, 1);
+    sView s2 = Kokkos::subview(d2, 1, 1);
+    sView s3 = Kokkos::subview(d3, 1, 1, 1);
+    sView s4 = Kokkos::subview(d4, 1, 1, 1, 1);
   }
 
-  static void run_test_subview_strided()
-  {
-    typedef Kokkos::View< int ****, Kokkos::LayoutLeft , host >  view_left_4;
-    typedef Kokkos::View< int ****, Kokkos::LayoutRight, host >  view_right_4;
-    typedef Kokkos::View< int **  , Kokkos::LayoutLeft , host >  view_left_2;
-    typedef Kokkos::View< int **  , Kokkos::LayoutRight, host >  view_right_2;
+  static void run_test_subview_strided() {
+    typedef Kokkos::View<int ****, Kokkos::LayoutLeft, host> view_left_4;
+    typedef Kokkos::View<int ****, Kokkos::LayoutRight, host> view_right_4;
+    typedef Kokkos::View<int **, Kokkos::LayoutLeft, host> view_left_2;
+    typedef Kokkos::View<int **, Kokkos::LayoutRight, host> view_right_2;
 
-    typedef Kokkos::View< int * ,  Kokkos::LayoutStride, host >  view_stride_1;
-    typedef Kokkos::View< int **,  Kokkos::LayoutStride, host >  view_stride_2;
+    typedef Kokkos::View<int *, Kokkos::LayoutStride, host> view_stride_1;
+    typedef Kokkos::View<int **, Kokkos::LayoutStride, host> view_stride_2;
 
-    view_left_2  xl2( "xl2", 100, 200 );
-    view_right_2 xr2( "xr2", 100, 200 );
-    view_stride_1 yl1 = Kokkos::subview( xl2, 0, Kokkos::ALL() );
-    view_stride_1 yl2 = Kokkos::subview( xl2, 1, Kokkos::ALL() );
-    view_stride_1 yr1 = Kokkos::subview( xr2, 0, Kokkos::ALL() );
-    view_stride_1 yr2 = Kokkos::subview( xr2, 1, Kokkos::ALL() );
+    view_left_2 xl2("xl2", 100, 200);
+    view_right_2 xr2("xr2", 100, 200);
+    view_stride_1 yl1 = Kokkos::subview(xl2, 0, Kokkos::ALL());
+    view_stride_1 yl2 = Kokkos::subview(xl2, 1, Kokkos::ALL());
+    view_stride_1 yr1 = Kokkos::subview(xr2, 0, Kokkos::ALL());
+    view_stride_1 yr2 = Kokkos::subview(xr2, 1, Kokkos::ALL());
 
-    ASSERT_EQ( yl1.extent(0), xl2.extent(1) );
-    ASSERT_EQ( yl2.extent(0), xl2.extent(1) );
-    ASSERT_EQ( yr1.extent(0), xr2.extent(1) );
-    ASSERT_EQ( yr2.extent(0), xr2.extent(1) );
+    ASSERT_EQ(yl1.extent(0), xl2.extent(1));
+    ASSERT_EQ(yl2.extent(0), xl2.extent(1));
+    ASSERT_EQ(yr1.extent(0), xr2.extent(1));
+    ASSERT_EQ(yr2.extent(0), xr2.extent(1));
 
-    ASSERT_EQ( & yl1( 0 ) - & xl2( 0, 0 ), 0 );
-    ASSERT_EQ( & yl2( 0 ) - & xl2( 1, 0 ), 0 );
-    ASSERT_EQ( & yr1( 0 ) - & xr2( 0, 0 ), 0 );
-    ASSERT_EQ( & yr2( 0 ) - & xr2( 1, 0 ), 0 );
+    ASSERT_EQ(&yl1(0) - &xl2(0, 0), 0);
+    ASSERT_EQ(&yl2(0) - &xl2(1, 0), 0);
+    ASSERT_EQ(&yr1(0) - &xr2(0, 0), 0);
+    ASSERT_EQ(&yr2(0) - &xr2(1, 0), 0);
 
-    view_left_4 xl4( "xl4", 10, 20, 30, 40 );
-    view_right_4 xr4( "xr4", 10, 20, 30, 40 );
+    view_left_4 xl4("xl4", 10, 20, 30, 40);
+    view_right_4 xr4("xr4", 10, 20, 30, 40);
 
-    view_stride_2 yl4 = Kokkos::subview( xl4, 1, Kokkos::ALL(), 2, Kokkos::ALL() );
-    view_stride_2 yr4 = Kokkos::subview( xr4, 1, Kokkos::ALL(), 2, Kokkos::ALL() );
+    view_stride_2 yl4 =
+        Kokkos::subview(xl4, 1, Kokkos::ALL(), 2, Kokkos::ALL());
+    view_stride_2 yr4 =
+        Kokkos::subview(xr4, 1, Kokkos::ALL(), 2, Kokkos::ALL());
 
-    ASSERT_EQ( yl4.extent(0), xl4.extent(1) );
-    ASSERT_EQ( yl4.extent(1), xl4.extent(3) );
-    ASSERT_EQ( yr4.extent(0), xr4.extent(1) );
-    ASSERT_EQ( yr4.extent(1), xr4.extent(3) );
+    ASSERT_EQ(yl4.extent(0), xl4.extent(1));
+    ASSERT_EQ(yl4.extent(1), xl4.extent(3));
+    ASSERT_EQ(yr4.extent(0), xr4.extent(1));
+    ASSERT_EQ(yr4.extent(1), xr4.extent(3));
 
-    ASSERT_EQ( & yl4( 4, 4 ) - & xl4( 1, 4, 2, 4 ), 0 );
-    ASSERT_EQ( & yr4( 4, 4 ) - & xr4( 1, 4, 2, 4 ), 0 );
+    ASSERT_EQ(&yl4(4, 4) - &xl4(1, 4, 2, 4), 0);
+    ASSERT_EQ(&yr4(4, 4) - &xr4(1, 4, 2, 4), 0);
   }
 
-  static void run_test_vector()
-  {
+  static void run_test_vector() {
     static const unsigned Length = 1000, Count = 8;
 
-    typedef Kokkos::View< T*,  Kokkos::LayoutLeft, host > vector_type;
-    typedef Kokkos::View< T**, Kokkos::LayoutLeft, host > multivector_type;
+    typedef Kokkos::View<T *, Kokkos::LayoutLeft, host> vector_type;
+    typedef Kokkos::View<T **, Kokkos::LayoutLeft, host> multivector_type;
 
-    typedef Kokkos::View< T*,  Kokkos::LayoutRight, host > vector_right_type;
-    typedef Kokkos::View< T**, Kokkos::LayoutRight, host > multivector_right_type;
+    typedef Kokkos::View<T *, Kokkos::LayoutRight, host> vector_right_type;
+    typedef Kokkos::View<T **, Kokkos::LayoutRight, host>
+        multivector_right_type;
 
-    typedef Kokkos::View< const T*,  Kokkos::LayoutRight, host > const_vector_right_type;
-    typedef Kokkos::View< const T*,  Kokkos::LayoutLeft,  host > const_vector_type;
-    typedef Kokkos::View< const T**, Kokkos::LayoutLeft,  host > const_multivector_type;
+    typedef Kokkos::View<const T *, Kokkos::LayoutRight, host>
+        const_vector_right_type;
+    typedef Kokkos::View<const T *, Kokkos::LayoutLeft, host> const_vector_type;
+    typedef Kokkos::View<const T **, Kokkos::LayoutLeft, host>
+        const_multivector_type;
 
-    multivector_type mv = multivector_type( "mv", Length, Count );
-    multivector_right_type mv_right = multivector_right_type( "mv", Length, Count );
+    multivector_type mv = multivector_type("mv", Length, Count);
+    multivector_right_type mv_right =
+        multivector_right_type("mv", Length, Count);
 
-    vector_type v1 = Kokkos::subview( mv, Kokkos::ALL(), 0 );
-    vector_type v2 = Kokkos::subview( mv, Kokkos::ALL(), 1 );
-    vector_type v3 = Kokkos::subview( mv, Kokkos::ALL(), 2 );
+    vector_type v1 = Kokkos::subview(mv, Kokkos::ALL(), 0);
+    vector_type v2 = Kokkos::subview(mv, Kokkos::ALL(), 1);
+    vector_type v3 = Kokkos::subview(mv, Kokkos::ALL(), 2);
 
-    vector_type rv1 = Kokkos::subview( mv_right, 0, Kokkos::ALL() );
-    vector_type rv2 = Kokkos::subview( mv_right, 1, Kokkos::ALL() );
-    vector_type rv3 = Kokkos::subview( mv_right, 2, Kokkos::ALL() );
+    vector_type rv1 = Kokkos::subview(mv_right, 0, Kokkos::ALL());
+    vector_type rv2 = Kokkos::subview(mv_right, 1, Kokkos::ALL());
+    vector_type rv3 = Kokkos::subview(mv_right, 2, Kokkos::ALL());
 
-    multivector_type mv1 = Kokkos::subview( mv, std::make_pair( 1, 998 ),
-                                                std::make_pair( 2, 5 ) );
+    multivector_type mv1 =
+        Kokkos::subview(mv, std::make_pair(1, 998), std::make_pair(2, 5));
 
-    multivector_right_type mvr1 = Kokkos::subview( mv_right, std::make_pair( 1, 998 ),
-                                                             std::make_pair( 2, 5 ) );
+    multivector_right_type mvr1 =
+        Kokkos::subview(mv_right, std::make_pair(1, 998), std::make_pair(2, 5));
 
-    const_vector_type cv1 = Kokkos::subview( mv, Kokkos::ALL(), 0 );
-    const_vector_type cv2 = Kokkos::subview( mv, Kokkos::ALL(), 1 );
-    const_vector_type cv3 = Kokkos::subview( mv, Kokkos::ALL(), 2 );
+    const_vector_type cv1 = Kokkos::subview(mv, Kokkos::ALL(), 0);
+    const_vector_type cv2 = Kokkos::subview(mv, Kokkos::ALL(), 1);
+    const_vector_type cv3 = Kokkos::subview(mv, Kokkos::ALL(), 2);
 
-    vector_right_type vr1 = Kokkos::subview( mv, Kokkos::ALL(), 0 );
-    vector_right_type vr2 = Kokkos::subview( mv, Kokkos::ALL(), 1 );
-    vector_right_type vr3 = Kokkos::subview( mv, Kokkos::ALL(), 2 );
+    vector_right_type vr1 = Kokkos::subview(mv, Kokkos::ALL(), 0);
+    vector_right_type vr2 = Kokkos::subview(mv, Kokkos::ALL(), 1);
+    vector_right_type vr3 = Kokkos::subview(mv, Kokkos::ALL(), 2);
 
-    const_vector_right_type cvr1 = Kokkos::subview( mv, Kokkos::ALL(), 0 );
-    const_vector_right_type cvr2 = Kokkos::subview( mv, Kokkos::ALL(), 1 );
-    const_vector_right_type cvr3 = Kokkos::subview( mv, Kokkos::ALL(), 2 );
+    const_vector_right_type cvr1 = Kokkos::subview(mv, Kokkos::ALL(), 0);
+    const_vector_right_type cvr2 = Kokkos::subview(mv, Kokkos::ALL(), 1);
+    const_vector_right_type cvr3 = Kokkos::subview(mv, Kokkos::ALL(), 2);
 
-    ASSERT_TRUE( & v1[0] == & v1( 0 ) );
-    ASSERT_TRUE( & v1[0] == & mv( 0, 0 ) );
-    ASSERT_TRUE( & v2[0] == & mv( 0, 1 ) );
-    ASSERT_TRUE( & v3[0] == & mv( 0, 2 ) );
+    ASSERT_TRUE(&v1[0] == &v1(0));
+    ASSERT_TRUE(&v1[0] == &mv(0, 0));
+    ASSERT_TRUE(&v2[0] == &mv(0, 1));
+    ASSERT_TRUE(&v3[0] == &mv(0, 2));
 
-    ASSERT_TRUE( & cv1[0] == & mv( 0, 0 ) );
-    ASSERT_TRUE( & cv2[0] == & mv( 0, 1 ) );
-    ASSERT_TRUE( & cv3[0] == & mv( 0, 2 ) );
+    ASSERT_TRUE(&cv1[0] == &mv(0, 0));
+    ASSERT_TRUE(&cv2[0] == &mv(0, 1));
+    ASSERT_TRUE(&cv3[0] == &mv(0, 2));
 
-    ASSERT_TRUE( & vr1[0] == & mv( 0, 0 ) );
-    ASSERT_TRUE( & vr2[0] == & mv( 0, 1 ) );
-    ASSERT_TRUE( & vr3[0] == & mv( 0, 2 ) );
+    ASSERT_TRUE(&vr1[0] == &mv(0, 0));
+    ASSERT_TRUE(&vr2[0] == &mv(0, 1));
+    ASSERT_TRUE(&vr3[0] == &mv(0, 2));
 
-    ASSERT_TRUE( & cvr1[0] == & mv( 0, 0 ) );
-    ASSERT_TRUE( & cvr2[0] == & mv( 0, 1 ) );
-    ASSERT_TRUE( & cvr3[0] == & mv( 0, 2 ) );
+    ASSERT_TRUE(&cvr1[0] == &mv(0, 0));
+    ASSERT_TRUE(&cvr2[0] == &mv(0, 1));
+    ASSERT_TRUE(&cvr3[0] == &mv(0, 2));
 
-    ASSERT_TRUE( & mv1( 0, 0 ) == & mv( 1, 2 ) );
-    ASSERT_TRUE( & mv1( 1, 1 ) == & mv( 2, 3 ) );
-    ASSERT_TRUE( & mv1( 3, 2 ) == & mv( 4, 4 ) );
-    ASSERT_TRUE( & mvr1( 0, 0 ) == & mv_right( 1, 2 ) );
-    ASSERT_TRUE( & mvr1( 1, 1 ) == & mv_right( 2, 3 ) );
-    ASSERT_TRUE( & mvr1( 3, 2 ) == & mv_right( 4, 4 ) );
+    ASSERT_TRUE(&mv1(0, 0) == &mv(1, 2));
+    ASSERT_TRUE(&mv1(1, 1) == &mv(2, 3));
+    ASSERT_TRUE(&mv1(3, 2) == &mv(4, 4));
+    ASSERT_TRUE(&mvr1(0, 0) == &mv_right(1, 2));
+    ASSERT_TRUE(&mvr1(1, 1) == &mv_right(2, 3));
+    ASSERT_TRUE(&mvr1(3, 2) == &mv_right(4, 4));
 
-    const_vector_type c_cv1( v1 );
-    typename vector_type::const_type c_cv2( v2 );
-    typename const_vector_type::const_type c_ccv2( v2 );
+    const_vector_type c_cv1(v1);
+    typename vector_type::const_type c_cv2(v2);
+    typename const_vector_type::const_type c_ccv2(v2);
 
-    const_multivector_type cmv( mv );
-    typename multivector_type::const_type cmvX( cmv );
-    typename const_multivector_type::const_type ccmvX( cmv );
+    const_multivector_type cmv(mv);
+    typename multivector_type::const_type cmvX(cmv);
+    typename const_multivector_type::const_type ccmvX(cmv);
+  }
+
+  static void run_test_error() {
+    auto alloc_size = std::numeric_limits<size_t>::max() - 42;
+    try {
+      auto should_always_fail = dView1("hello_world_failure", alloc_size);
+    } catch (std::runtime_error const &error) {
+      // TODO once we remove the conversion to std::runtime_error, catch the
+      //      appropriate Kokkos error here
+      std::string msg = error.what();
+      ASSERT_PRED_FORMAT2(::testing::IsSubstring, "hello_world_failure", msg);
+      ASSERT_PRED_FORMAT2(::testing::IsSubstring,
+                          typename device::memory_space{}.name(), msg);
+      // Can't figure out how to make assertions either/or, so we'll just use
+      // an if statement here for now.  Test failure message will be a bit
+      // misleading, but developers should figure out what's going on pretty
+      // quickly.
+      if (msg.find("is not a valid size") != std::string::npos) {
+        ASSERT_PRED_FORMAT2(::testing::IsSubstring, "is not a valid size", msg);
+      } else {
+        // Otherwise, there has to be some sort of "insufficient memory" error
+        ASSERT_PRED_FORMAT2(::testing::IsSubstring, "insufficient memory", msg);
+      }
+    }
   }
 };
 
-} // namespace Test
+}  // namespace Test
diff --git a/lib/kokkos/core/unit_test/TestViewAPI_a.hpp b/lib/kokkos/core/unit_test/TestViewAPI_a.hpp
index ba74331c51..048ba51c17 100644
--- a/lib/kokkos/core/unit_test/TestViewAPI_a.hpp
+++ b/lib/kokkos/core/unit_test/TestViewAPI_a.hpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -41,13 +42,12 @@
 //@HEADER
 */
 
-#include<TestViewAPI.hpp>
+#include <TestViewAPI.hpp>
 
 namespace Test {
 
-TEST_F( TEST_CATEGORY, view_api_a )
-{
-  TestViewAPI< double, TEST_EXECSPACE >::run_test();
+TEST(TEST_CATEGORY, view_api_a) {
+  TestViewAPI<double, TEST_EXECSPACE>::run_test();
 }
 
-}
+}  // namespace Test
diff --git a/lib/kokkos/core/unit_test/TestViewAPI_b.hpp b/lib/kokkos/core/unit_test/TestViewAPI_b.hpp
index 03b41db516..ad9069e397 100644
--- a/lib/kokkos/core/unit_test/TestViewAPI_b.hpp
+++ b/lib/kokkos/core/unit_test/TestViewAPI_b.hpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -41,15 +42,14 @@
 //@HEADER
 */
 
-#include<TestViewAPI.hpp>
+#include <TestViewAPI.hpp>
 
 namespace Test {
 
-TEST_F( TEST_CATEGORY, view_api_b )
-{
-  TestViewAPI< double, TEST_EXECSPACE >::run_test_view_operator_a();
-  TestViewAPI< double, TEST_EXECSPACE >::run_test_mirror();
-  TestViewAPI< double, TEST_EXECSPACE >::run_test_scalar();
+TEST(TEST_CATEGORY, view_api_b) {
+  TestViewAPI<double, TEST_EXECSPACE>::run_test_view_operator_a();
+  TestViewAPI<double, TEST_EXECSPACE>::run_test_mirror();
+  TestViewAPI<double, TEST_EXECSPACE>::run_test_scalar();
 }
 
-}
+}  // namespace Test
diff --git a/lib/kokkos/core/unit_test/TestViewAPI_c.hpp b/lib/kokkos/core/unit_test/TestViewAPI_c.hpp
index d34ae6340e..a70792dc62 100644
--- a/lib/kokkos/core/unit_test/TestViewAPI_c.hpp
+++ b/lib/kokkos/core/unit_test/TestViewAPI_c.hpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -41,14 +42,13 @@
 //@HEADER
 */
 
-#include<TestViewAPI.hpp>
+#include <TestViewAPI.hpp>
 
 namespace Test {
 
-TEST_F( TEST_CATEGORY, view_api_c )
-{
-  TestViewAPI< double, TEST_EXECSPACE >::run_test_deep_copy_empty();
-  TestViewAPI< double, TEST_EXECSPACE >::run_test_view_operator_b();
+TEST(TEST_CATEGORY, view_api_c) {
+  TestViewAPI<double, TEST_EXECSPACE>::run_test_deep_copy_empty();
+  TestViewAPI<double, TEST_EXECSPACE>::run_test_view_operator_b();
 }
 
-}
+}  // namespace Test
diff --git a/lib/kokkos/core/unit_test/TestViewAPI_d.hpp b/lib/kokkos/core/unit_test/TestViewAPI_d.hpp
index 38e10381f2..ecb65804b7 100644
--- a/lib/kokkos/core/unit_test/TestViewAPI_d.hpp
+++ b/lib/kokkos/core/unit_test/TestViewAPI_d.hpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -41,17 +42,20 @@
 //@HEADER
 */
 
-#include<TestViewAPI.hpp>
+#include <TestViewAPI.hpp>
 
 namespace Test {
 
-TEST_F( TEST_CATEGORY, view_api_d )
-{
-  TestViewAPI< double, TEST_EXECSPACE >::run_test_const();
-  TestViewAPI< double, TEST_EXECSPACE >::run_test_subview();
-  TestViewAPI< double, TEST_EXECSPACE >::run_test_subview_strided();
-  TestViewAPI< double, TEST_EXECSPACE >::run_test_vector();
-  TestViewAPI< double, TEST_EXECSPACE >::run_test_view_operator_c();
+TEST(TEST_CATEGORY, view_api_d) {
+  TestViewAPI<double, TEST_EXECSPACE>::run_test_const();
+  TestViewAPI<double, TEST_EXECSPACE>::run_test_subview();
+  TestViewAPI<double, TEST_EXECSPACE>::run_test_subview_strided();
+  TestViewAPI<double, TEST_EXECSPACE>::run_test_vector();
+  TestViewAPI<double, TEST_EXECSPACE>::run_test_view_operator_c();
 }
 
+TEST(TEST_CATEGORY, view_allocation_error) {
+  TestViewAPI<double, TEST_EXECSPACE>::run_test_error();
 }
+
+}  // namespace Test
diff --git a/lib/kokkos/core/unit_test/TestViewAPI_e.hpp b/lib/kokkos/core/unit_test/TestViewAPI_e.hpp
index 76815dc112..e433535236 100644
--- a/lib/kokkos/core/unit_test/TestViewAPI_e.hpp
+++ b/lib/kokkos/core/unit_test/TestViewAPI_e.hpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -50,70 +51,68 @@
 
 namespace Test {
 
-TEST_F( TEST_CATEGORY, view_remap )
-{
+TEST(TEST_CATEGORY, view_remap) {
   enum { N0 = 3, N1 = 2, N2 = 8, N3 = 9 };
 
-  #ifdef KOKKOS_ENABLE_CUDA
-    #define EXECSPACE std::conditional<std::is_same<TEST_EXECSPACE,Kokkos::Cuda>::value,Kokkos::CudaHostPinnedSpace,TEST_EXECSPACE>::type
-  #else
-    #ifdef KOKKOS_ENABLE_ROCM
-      #define EXECSPACE std::conditional<std::is_same<TEST_EXECSPACE,Kokkos::Experimental::ROCm>::value,Kokkos::Experimental::ROCmHostPinnedSpace,TEST_EXECSPACE>::type
-    #else
-      #if defined(KOKKOS_ENABLE_OPENMPTARGET)
-        #define EXECSPACE Kokkos::HostSpace
-      #else
-        #define EXECSPACE TEST_EXECSPACE
-      #endif
-    #endif
-  #endif
+#ifdef KOKKOS_ENABLE_CUDA
+#define EXECSPACE                                                     \
+  std::conditional<std::is_same<TEST_EXECSPACE, Kokkos::Cuda>::value, \
+                   Kokkos::CudaHostPinnedSpace, TEST_EXECSPACE>::type
+#else
+#ifdef KOKKOS_ENABLE_ROCM
+#define EXECSPACE                                                      \
+  std::conditional<                                                    \
+      std::is_same<TEST_EXECSPACE, Kokkos::Experimental::ROCm>::value, \
+      Kokkos::Experimental::ROCmHostPinnedSpace, TEST_EXECSPACE>::type
+#else
+#if defined(KOKKOS_ENABLE_OPENMPTARGET)
+#define EXECSPACE Kokkos::HostSpace
+#else
+#define EXECSPACE TEST_EXECSPACE
+#endif
+#endif
+#endif
 
-  typedef Kokkos::View< double*[N1][N2][N3],
-                        Kokkos::LayoutRight,
-                        EXECSPACE > output_type;
+  typedef Kokkos::View<double * [N1][N2][N3], Kokkos::LayoutRight, EXECSPACE>
+      output_type;
 
-  typedef Kokkos::View< int**[N2][N3],
-                        Kokkos::LayoutLeft,
-                        EXECSPACE > input_type;
+  typedef Kokkos::View<int* * [N2][N3], Kokkos::LayoutLeft, EXECSPACE>
+      input_type;
 
-  typedef Kokkos::View< int*[N0][N2][N3],
-                        Kokkos::LayoutLeft,
-                        EXECSPACE > diff_type;
+  typedef Kokkos::View<int * [N0][N2][N3], Kokkos::LayoutLeft, EXECSPACE>
+      diff_type;
 
-  output_type output( "output", N0 );
-  input_type  input ( "input", N0, N1 );
-  diff_type   diff  ( "diff", N0 );
+  output_type output("output", N0);
+  input_type input("input", N0, N1);
+  diff_type diff("diff", N0);
 
   Kokkos::fence();
   int value = 0;
 
-  for ( size_t i3 = 0; i3 < N3; ++i3 )
-  for ( size_t i2 = 0; i2 < N2; ++i2 )
-  for ( size_t i1 = 0; i1 < N1; ++i1 )
-  for ( size_t i0 = 0; i0 < N0; ++i0 )
-  {
-    input( i0, i1, i2, i3 ) = ++value;
-  }
+  for (size_t i3 = 0; i3 < N3; ++i3)
+    for (size_t i2 = 0; i2 < N2; ++i2)
+      for (size_t i1 = 0; i1 < N1; ++i1)
+        for (size_t i0 = 0; i0 < N0; ++i0) {
+          input(i0, i1, i2, i3) = ++value;
+        }
 
   Kokkos::fence();
   // Kokkos::deep_copy( diff, input ); // Throw with incompatible shape.
-  Kokkos::deep_copy( output, input );
+  Kokkos::deep_copy(output, input);
   Kokkos::fence();
 
   value = 0;
 
-  for ( size_t i3 = 0; i3 < N3; ++i3 )
-  for ( size_t i2 = 0; i2 < N2; ++i2 )
-  for ( size_t i1 = 0; i1 < N1; ++i1 )
-  for ( size_t i0 = 0; i0 < N0; ++i0 )
-  {
-    ++value;
-    ASSERT_EQ( value, ( (int) output( i0, i1, i2, i3 ) ) );
-  }
+  for (size_t i3 = 0; i3 < N3; ++i3)
+    for (size_t i2 = 0; i2 < N2; ++i2)
+      for (size_t i1 = 0; i1 < N1; ++i1)
+        for (size_t i0 = 0; i0 < N0; ++i0) {
+          ++value;
+          ASSERT_EQ(value, ((int)output(i0, i1, i2, i3)));
+        }
 }
 
-TEST_F( TEST_CATEGORY, view_mirror_nonconst )
-{
+TEST(TEST_CATEGORY, view_mirror_nonconst) {
   Kokkos::View<int*, TEST_EXECSPACE> d_view("d_view", 10);
   Kokkos::View<const int*, TEST_EXECSPACE> d_view_const = d_view;
   auto h_view = Kokkos::create_mirror(d_view_const);
@@ -122,9 +121,10 @@ TEST_F( TEST_CATEGORY, view_mirror_nonconst )
   Kokkos::deep_copy(h_view2, d_view_const);
 }
 
-template <typename DataType, typename ... Extents>
-void test_left_stride(Extents ... extents) {
-  using view_type = Kokkos::View<DataType, Kokkos::LayoutLeft, Kokkos::HostSpace>;
+template <typename DataType, typename... Extents>
+void test_left_stride(Extents... extents) {
+  using view_type =
+      Kokkos::View<DataType, Kokkos::LayoutLeft, Kokkos::HostSpace>;
   view_type view("view", extents...);
   size_t expected_stride = 1;
   size_t all_strides[view_type::rank + 1];
@@ -136,9 +136,10 @@ void test_left_stride(Extents ... extents) {
   }
 }
 
-template <typename DataType, typename ... Extents>
-void test_right_stride(Extents ... extents) {
-  using view_type = Kokkos::View<DataType, Kokkos::LayoutRight, Kokkos::HostSpace>;
+template <typename DataType, typename... Extents>
+void test_right_stride(Extents... extents) {
+  using view_type =
+      Kokkos::View<DataType, Kokkos::LayoutRight, Kokkos::HostSpace>;
   view_type view("view", extents...);
   size_t expected_stride = 1;
   size_t all_strides[view_type::rank + 1];
@@ -151,14 +152,13 @@ void test_right_stride(Extents ... extents) {
   }
 }
 
-template <typename DataType, typename ... Extents>
-void test_stride(Extents ... extents) {
+template <typename DataType, typename... Extents>
+void test_stride(Extents... extents) {
   test_right_stride<DataType>(extents...);
   test_left_stride<DataType>(extents...);
 }
 
-TEST_F( TEST_CATEGORY, view_stride_method )
-{
+TEST(TEST_CATEGORY, view_stride_method) {
   test_stride<double[3]>();
   test_stride<double*>(3);
   test_stride<double[3][7][13]>();
@@ -178,69 +178,65 @@ inline void test_anonymous_space() {
   Kokkos::View<int*, Kokkos::AnonymousSpace> host_anon_assign_view = host_view;
   for (int i = 0; i < 10; ++i) {
     host_anon_stat_view(i) = host_anon_dyn_view(i) = 142;
-    host_anon_assign_view(i) = 142;
+    host_anon_assign_view(i)                       = 142;
   }
   Kokkos::View<int**, Kokkos::LayoutRight, ExecSpace> d_view("d_view", 100, 10);
 #ifdef KOKKOS_ENABLE_CXX11_DISPATCH_LAMBDA
-  Kokkos::parallel_for(Kokkos::RangePolicy<ExecSpace, int>(0, 100), KOKKOS_LAMBDA(int i) {
-    int* ptr = &(d_view(i, 0));
-    Kokkos::View<int[10], Kokkos::AnonymousSpace> d_anon_stat_view(ptr);
-    Kokkos::View<int*, Kokkos::AnonymousSpace> d_anon_dyn_view(ptr, 10);
-    auto sub = Kokkos::subview(d_view, i, Kokkos::ALL());
-    Kokkos::View<int*, Kokkos::AnonymousSpace> d_anon_assign_view = sub;
-    for (int j = 0; j < 10; ++j) {
-      d_anon_stat_view(j) = 50;
-      d_anon_assign_view(j) += 50;
-      d_anon_dyn_view(j) += 42;
-    }
-  });
+  Kokkos::parallel_for(
+      Kokkos::RangePolicy<ExecSpace, int>(0, 100), KOKKOS_LAMBDA(int i) {
+        int* ptr = &(d_view(i, 0));
+        Kokkos::View<int[10], Kokkos::AnonymousSpace> d_anon_stat_view(ptr);
+        Kokkos::View<int*, Kokkos::AnonymousSpace> d_anon_dyn_view(ptr, 10);
+        auto sub = Kokkos::subview(d_view, i, Kokkos::ALL());
+        Kokkos::View<int*, Kokkos::AnonymousSpace> d_anon_assign_view = sub;
+        for (int j = 0; j < 10; ++j) {
+          d_anon_stat_view(j) = 50;
+          d_anon_assign_view(j) += 50;
+          d_anon_dyn_view(j) += 42;
+        }
+      });
   Kokkos::fence();
 #endif
 }
 
-TEST_F( TEST_CATEGORY, anonymous_space )
-{
-  test_anonymous_space();
-}
+TEST(TEST_CATEGORY, anonymous_space) { test_anonymous_space(); }
 
-template<class ExecSpace>
+template <class ExecSpace>
 struct TestViewOverloadResolution {
   // Overload based on value_type and rank
-  static int foo(Kokkos::View<const double**,ExecSpace> a) {
-    return 1;
-  }
-  static int foo(Kokkos::View<const int**,ExecSpace> a) {
-    return 2;
-  }
-  static int foo(Kokkos::View<const double***,ExecSpace> a) {
-    return 3;
-  }
+  static int foo(Kokkos::View<const double**, ExecSpace> a) { return 1; }
+  static int foo(Kokkos::View<const int**, ExecSpace> a) { return 2; }
+  static int foo(Kokkos::View<const double***, ExecSpace> a) { return 3; }
 
   // Overload based on compile time dimensions
-  static int bar(Kokkos::View<double*[3],ExecSpace> a) {
-    return 4;
-  }
-  static int bar(Kokkos::View<double*[4],ExecSpace> a) {
-    return 5;
-  }
+  static int bar(Kokkos::View<double * [3], ExecSpace> a) { return 4; }
+  static int bar(Kokkos::View<double * [4], ExecSpace> a) { return 5; }
 
   static void test_function_overload() {
-    Kokkos::View<double**, typename ExecSpace::execution_space::array_layout, ExecSpace> a("A",10,3);
+    Kokkos::View<double**, typename ExecSpace::execution_space::array_layout,
+                 ExecSpace>
+        a("A", 10, 3);
     int data_type_1 = foo(a);
-    int data_type_3 = foo(Kokkos::View<const double**, typename ExecSpace::execution_space::array_layout, ExecSpace>(a));
-    Kokkos::View<double***, typename ExecSpace::execution_space::array_layout, ExecSpace> b("B",10,3,4);
+    int data_type_3 =
+        foo(Kokkos::View<const double**,
+                         typename ExecSpace::execution_space::array_layout,
+                         ExecSpace>(a));
+    Kokkos::View<double***, typename ExecSpace::execution_space::array_layout,
+                 ExecSpace>
+        b("B", 10, 3, 4);
     int data_type_2 = foo(b);
-    Kokkos::View<double*[3], typename ExecSpace::execution_space::array_layout, ExecSpace> c(a);
+    Kokkos::View<double * [3],
+                 typename ExecSpace::execution_space::array_layout, ExecSpace>
+        c(a);
     int static_extent = bar(c);
-    ASSERT_EQ(1,data_type_1);
-    ASSERT_EQ(3,data_type_2);
-    ASSERT_EQ(1,data_type_3);
-    ASSERT_EQ(4,static_extent);
+    ASSERT_EQ(1, data_type_1);
+    ASSERT_EQ(3, data_type_2);
+    ASSERT_EQ(1, data_type_3);
+    ASSERT_EQ(4, static_extent);
   }
 };
 
-TEST_F( TEST_CATEGORY, view_overload_resolution )
-{
+TEST(TEST_CATEGORY, view_overload_resolution) {
   TestViewOverloadResolution<TEST_EXECSPACE>::test_function_overload();
 }
-}
+}  // namespace Test
diff --git a/lib/kokkos/core/unit_test/TestViewCopy.hpp b/lib/kokkos/core/unit_test/TestViewCopy.hpp
index ddcd0ae5ba..27018e7f7b 100644
--- a/lib/kokkos/core/unit_test/TestViewCopy.hpp
+++ b/lib/kokkos/core/unit_test/TestViewCopy.hpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -51,111 +52,122 @@ namespace Test {
 
 namespace {
 
-template < typename ExecSpace >
+template <typename ExecSpace>
 struct TestViewCopy {
-
   using InExecSpace = ExecSpace;
 
-  static void test_view_copy(const int dim0, const int dim1, const int dim2)
-  {
-#if defined( KOKKOS_ENABLE_CUDA ) || defined( KOKKOS_ENABLE_ROCM )
-   // ExecSpace = CudaUVM, CudaHostPinned
-   // This test will fail at runtime with an illegal memory access if something goes wrong
-   // Test 1: deep_copy from host_mirror_space to ExecSpace and ExecSpace back to host_mirror_space
-   {
-    typedef Kokkos::View<double****,InExecSpace> Rank4ViewType;
-    Rank4ViewType view_4;
-    view_4 = Rank4ViewType("view_4", dim0, dim1, dim2, dim2);
+  static void test_view_copy(const int dim0, const int dim1, const int dim2) {
+#if defined(KOKKOS_ENABLE_CUDA) || defined(KOKKOS_ENABLE_ROCM)
+    // ExecSpace = CudaUVM, CudaHostPinned
+    // This test will fail at runtime with an illegal memory access if something
+    // goes wrong Test 1: deep_copy from host_mirror_space to ExecSpace and
+    // ExecSpace back to host_mirror_space
+    {
+      typedef Kokkos::View<double****, InExecSpace> Rank4ViewType;
+      Rank4ViewType view_4;
+      view_4 = Rank4ViewType("view_4", dim0, dim1, dim2, dim2);
 
-    typedef typename Kokkos::Impl::is_space<InExecSpace>::host_mirror_space::execution_space host_space_type;
-    Kokkos::View<double**,Kokkos::LayoutLeft,host_space_type> srcView("srcView", dim2, dim2);
+      typedef typename Kokkos::Impl::is_space<
+          InExecSpace>::host_mirror_space::execution_space host_space_type;
+      Kokkos::View<double**, Kokkos::LayoutLeft, host_space_type> srcView(
+          "srcView", dim2, dim2);
 
-    // Strided dst view
-    auto dstView = Kokkos::subview(view_4, 0, 0, Kokkos::ALL(), Kokkos::ALL());
+      // Strided dst view
+      auto dstView =
+          Kokkos::subview(view_4, 0, 0, Kokkos::ALL(), Kokkos::ALL());
 
-    // host_mirror_space to ExecSpace
-    Kokkos::deep_copy( dstView, srcView );
-    Kokkos::fence();
+      // host_mirror_space to ExecSpace
+      Kokkos::deep_copy(dstView, srcView);
+      Kokkos::fence();
 
-    // ExecSpace to host_mirror_space 
-    Kokkos::deep_copy( srcView, dstView );
-    Kokkos::fence();
-   }
+      // ExecSpace to host_mirror_space
+      Kokkos::deep_copy(srcView, dstView);
+      Kokkos::fence();
+    }
 
-   // Test 2: deep_copy from Cuda to ExecSpace and ExecSpace back to Cuda
-   {
-    typedef Kokkos::View<double****,InExecSpace> Rank4ViewType;
-    Rank4ViewType view_4;
-    view_4 = Rank4ViewType("view_4", dim0, dim1, dim2, dim2);
+    // Test 2: deep_copy from Cuda to ExecSpace and ExecSpace back to Cuda
+    {
+      typedef Kokkos::View<double****, InExecSpace> Rank4ViewType;
+      Rank4ViewType view_4;
+      view_4 = Rank4ViewType("view_4", dim0, dim1, dim2, dim2);
 
-#if defined( KOKKOS_ENABLE_CUDA )
-    typedef typename std::conditional<
-        Kokkos::Impl::MemorySpaceAccess<Kokkos::CudaSpace,typename InExecSpace::memory_space>::accessible,
-        Kokkos::CudaSpace,
-        InExecSpace>::type space_type;
+#if defined(KOKKOS_ENABLE_CUDA)
+      typedef typename std::conditional<
+          Kokkos::Impl::MemorySpaceAccess<
+              Kokkos::CudaSpace,
+              typename InExecSpace::memory_space>::accessible,
+          Kokkos::CudaSpace, InExecSpace>::type space_type;
 #endif
-#if defined( KOKKOS_ENABLE_ROCM )
-    typedef typename std::conditional<
-        Kokkos::Impl::MemorySpaceAccess<Kokkos::ROCmSpace,typename InExecSpace::memory_space>::accessible,
-        Kokkos::ROCmSpace,
-        InExecSpace>::type space_type;
+#if defined(KOKKOS_ENABLE_ROCM)
+      typedef typename std::conditional<
+          Kokkos::Impl::MemorySpaceAccess<
+              Kokkos::ROCmSpace,
+              typename InExecSpace::memory_space>::accessible,
+          Kokkos::ROCmSpace, InExecSpace>::type space_type;
 #endif
-    Kokkos::View<double**,Kokkos::LayoutLeft,space_type> srcView("srcView", dim2, dim2);
+      Kokkos::View<double**, Kokkos::LayoutLeft, space_type> srcView(
+          "srcView", dim2, dim2);
 
-    // Strided dst view
-    auto dstView = Kokkos::subview(view_4, 0, 0, Kokkos::ALL(), Kokkos::ALL());
+      // Strided dst view
+      auto dstView =
+          Kokkos::subview(view_4, 0, 0, Kokkos::ALL(), Kokkos::ALL());
 
-    // Cuda to ExecSpace
-    Kokkos::deep_copy( dstView, srcView );
-    Kokkos::fence();
+      // Cuda to ExecSpace
+      Kokkos::deep_copy(dstView, srcView);
+      Kokkos::fence();
 
-    // ExecSpace to Cuda
-    Kokkos::deep_copy( srcView, dstView );
-    Kokkos::fence();
-   }
+      // ExecSpace to Cuda
+      Kokkos::deep_copy(srcView, dstView);
+      Kokkos::fence();
+    }
 
-   // Test 3: deep_copy from host_space to ExecSpace and ExecSpace back to host_space
-   {
-    typedef Kokkos::View<double****,InExecSpace> Rank4ViewType;
-    Rank4ViewType view_4;
-    view_4 = Rank4ViewType("view_4", dim0, dim1, dim2, dim2);
+    // Test 3: deep_copy from host_space to ExecSpace and ExecSpace back to
+    // host_space
+    {
+      typedef Kokkos::View<double****, InExecSpace> Rank4ViewType;
+      Rank4ViewType view_4;
+      view_4 = Rank4ViewType("view_4", dim0, dim1, dim2, dim2);
 
-    typedef Kokkos::HostSpace host_space_type;
-    Kokkos::View<double**,Kokkos::LayoutLeft,host_space_type> srcView("srcView", dim2, dim2);
+      typedef Kokkos::HostSpace host_space_type;
+      Kokkos::View<double**, Kokkos::LayoutLeft, host_space_type> srcView(
+          "srcView", dim2, dim2);
 
-    // Strided dst view
-    auto dstView = Kokkos::subview(view_4, 0, 0, Kokkos::ALL(), Kokkos::ALL());
+      // Strided dst view
+      auto dstView =
+          Kokkos::subview(view_4, 0, 0, Kokkos::ALL(), Kokkos::ALL());
 
-    // host_space to ExecSpace
-    Kokkos::deep_copy( dstView, srcView );
-    Kokkos::fence();
+      // host_space to ExecSpace
+      Kokkos::deep_copy(dstView, srcView);
+      Kokkos::fence();
 
-    // ExecSpace to host_space 
-    Kokkos::deep_copy( srcView, dstView );
-    Kokkos::fence();
-   }
+      // ExecSpace to host_space
+      Kokkos::deep_copy(srcView, dstView);
+      Kokkos::fence();
+    }
 #endif
-  } // end test_view_copy
+  }  // end test_view_copy
 
-}; // end struct
+};  // end struct
 
-} // namespace
+}  // namespace
 
-TEST_F( TEST_CATEGORY , view_copy_tests ) {
-  //Only include this file to be compiled with CudaUVM and CudaHostPinned
-  TestViewCopy< TEST_EXECSPACE >::test_view_copy(4,2,3);
-  TestViewCopy< TEST_EXECSPACE >::test_view_copy(4,2,0);
+TEST(TEST_CATEGORY, view_copy_tests) {
+  // Only include this file to be compiled with CudaUVM and CudaHostPinned
+  TestViewCopy<TEST_EXECSPACE>::test_view_copy(4, 2, 3);
+  TestViewCopy<TEST_EXECSPACE>::test_view_copy(4, 2, 0);
 }
 
-TEST_F( TEST_CATEGORY , view_copy_degenerated ) {
-  //Only include this file to be compiled with CudaUVM and CudaHostPinned
+TEST(TEST_CATEGORY, view_copy_degenerated) {
+  // Only include this file to be compiled with CudaUVM and CudaHostPinned
   Kokkos::View<int*, Kokkos::MemoryTraits<Kokkos::Unmanaged>> v_um_def_1;
-  Kokkos::View<int*, Kokkos::MemoryTraits<Kokkos::Unmanaged>> v_um_1( reinterpret_cast<int*>(-1), 0 );
+  Kokkos::View<int*, Kokkos::MemoryTraits<Kokkos::Unmanaged>> v_um_1(
+      reinterpret_cast<int*>(-1), 0);
   Kokkos::View<int*> v_m_def_1;
   Kokkos::View<int*> v_m_1("v_m_1", 0);
 
   Kokkos::View<int*, Kokkos::MemoryTraits<Kokkos::Unmanaged>> v_um_def_2;
-  Kokkos::View<int*, Kokkos::MemoryTraits<Kokkos::Unmanaged>> v_um_2( reinterpret_cast<int*>(-1), 0 );
+  Kokkos::View<int*, Kokkos::MemoryTraits<Kokkos::Unmanaged>> v_um_2(
+      reinterpret_cast<int*>(-1), 0);
   Kokkos::View<int*> v_m_def_2;
   Kokkos::View<int*> v_m_2("v_m_2", 0);
 
@@ -180,4 +192,4 @@ TEST_F( TEST_CATEGORY , view_copy_degenerated ) {
   Kokkos::deep_copy(v_m_1, v_m_2);
 }
 
-} // namespace Test
+}  // namespace Test
diff --git a/lib/kokkos/core/unit_test/TestViewCtorPropEmbeddedDim.hpp b/lib/kokkos/core/unit_test/TestViewCtorPropEmbeddedDim.hpp
index 0b88052129..30701b3a4e 100644
--- a/lib/kokkos/core/unit_test/TestViewCtorPropEmbeddedDim.hpp
+++ b/lib/kokkos/core/unit_test/TestViewCtorPropEmbeddedDim.hpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -54,61 +55,59 @@ namespace Test {
 
 namespace {
 
-template <typename ExecSpace >
+template <typename ExecSpace>
 struct TestViewCtorProp_EmbeddedDim {
+  using ViewIntType    = typename Kokkos::View<int**, ExecSpace>;
+  using ViewDoubleType = typename Kokkos::View<double*, ExecSpace>;
 
-  using ViewIntType     = typename Kokkos::View< int**, ExecSpace >;
-  using ViewDoubleType     = typename Kokkos::View< double*, ExecSpace >;
-
-  // Cuda 7.0 has issues with using a lamda in parallel_for to initialize the view - replace with this functor
-  template < class ViewType >
+  // Cuda 7.0 has issues with using a lambda in parallel_for to initialize the
+  // view - replace with this functor
+  template <class ViewType>
   struct Functor {
-
     ViewType v;
 
-    Functor( const ViewType & v_ ) : v(v_) {}
+    Functor(const ViewType& v_) : v(v_) {}
 
     KOKKOS_INLINE_FUNCTION
-    void operator()( const int i ) const {
-      v(i) = i;
-    }
-
+    void operator()(const int i) const { v(i) = i; }
   };
 
-
-  static void test_vcpt( const int N0, const int N1 )
-  {
-
+  static void test_vcpt(const int N0, const int N1) {
     // Create views to test
     {
-      using VIT = typename TestViewCtorProp_EmbeddedDim::ViewIntType ;
-      using VDT = typename TestViewCtorProp_EmbeddedDim::ViewDoubleType ;
+      using VIT = typename TestViewCtorProp_EmbeddedDim::ViewIntType;
+      using VDT = typename TestViewCtorProp_EmbeddedDim::ViewDoubleType;
 
       VIT vi1("vi1", N0, N1);
       VDT vd1("vd1", N0);
 
-      // TEST: Test for common type between two views, one with type double, other with type int
-      // Deduce common value_type and construct a view with that type
+      // TEST: Test for common type between two views, one with type double,
+      // other with type int Deduce common value_type and construct a view with
+      // that type
       {
         // Two views
         auto view_alloc_arg = Kokkos::common_view_alloc_prop(vi1, vd1);
-        typedef typename decltype( view_alloc_arg )::value_type                    CommonViewValueType;
-        typedef typename Kokkos::View< CommonViewValueType*, ExecSpace >  CVT;
-        typedef typename CVT::HostMirror                                           HostCVT;
+        typedef
+            typename decltype(view_alloc_arg)::value_type CommonViewValueType;
+        typedef typename Kokkos::View<CommonViewValueType*, ExecSpace> CVT;
+        typedef typename CVT::HostMirror HostCVT;
 
-        // Construct View using the common type; for case of specialization, an 'embedded_dim' would be stored by view_alloc_arg
-        CVT cv1( Kokkos::view_alloc( "cv1", view_alloc_arg ), N0*N1 );
+        // Construct View using the common type; for case of specialization, an
+        // 'embedded_dim' would be stored by view_alloc_arg
+        CVT cv1(Kokkos::view_alloc("cv1", view_alloc_arg), N0 * N1);
 
-        Kokkos::parallel_for( Kokkos::RangePolicy< ExecSpace >(0, N0*N1), 
-          Functor<CVT>(cv1)
-        );
+        Kokkos::parallel_for(Kokkos::RangePolicy<ExecSpace>(0, N0 * N1),
+                             Functor<CVT>(cv1));
 
-        HostCVT hcv1 = Kokkos::create_mirror_view( cv1 );
-        Kokkos::deep_copy( hcv1, cv1 );
+        HostCVT hcv1 = Kokkos::create_mirror_view(cv1);
+        Kokkos::deep_copy(hcv1, cv1);
 
-        ASSERT_EQ( (std::is_same< CommonViewValueType, double >::value) , true ) ;
-        ASSERT_EQ( (std::is_same< typename decltype(view_alloc_arg)::scalar_array_type, CommonViewValueType>::value) , true ) ;
-      #if 0
+        ASSERT_EQ((std::is_same<CommonViewValueType, double>::value), true);
+        ASSERT_EQ(
+            (std::is_same<typename decltype(view_alloc_arg)::scalar_array_type,
+                          CommonViewValueType>::value),
+            true);
+#if 0
       // debug output
       for ( int i = 0; i < N0*N1; ++i ) {
         printf(" Output check: hcv1(%d) = %lf\n ", i, hcv1(i) );
@@ -123,39 +122,39 @@ struct TestViewCtorProp_EmbeddedDim {
         printf("WRONG common value_type\n");
       }
       // end debug output
-      #endif
+#endif
       }
 
       {
         // Single view
         auto view_alloc_arg = Kokkos::common_view_alloc_prop(vi1);
-        typedef typename decltype( view_alloc_arg )::value_type                    CommonViewValueType;
-        typedef typename Kokkos::View< CommonViewValueType*, ExecSpace >  CVT;
-        typedef typename CVT::HostMirror                                           HostCVT;
+        typedef
+            typename decltype(view_alloc_arg)::value_type CommonViewValueType;
+        typedef typename Kokkos::View<CommonViewValueType*, ExecSpace> CVT;
+        typedef typename CVT::HostMirror HostCVT;
 
-        // Construct View using the common type; for case of specialization, an 'embedded_dim' would be stored by view_alloc_arg
-        CVT cv1( Kokkos::view_alloc( "cv1", view_alloc_arg ), N0*N1 );
+        // Construct View using the common type; for case of specialization, an
+        // 'embedded_dim' would be stored by view_alloc_arg
+        CVT cv1(Kokkos::view_alloc("cv1", view_alloc_arg), N0 * N1);
 
-        Kokkos::parallel_for( Kokkos::RangePolicy< ExecSpace >(0, N0*N1), 
-          Functor<CVT>(cv1)
-        );
+        Kokkos::parallel_for(Kokkos::RangePolicy<ExecSpace>(0, N0 * N1),
+                             Functor<CVT>(cv1));
 
-        HostCVT hcv1 = Kokkos::create_mirror_view( cv1 );
-        Kokkos::deep_copy( hcv1, cv1 );
+        HostCVT hcv1 = Kokkos::create_mirror_view(cv1);
+        Kokkos::deep_copy(hcv1, cv1);
 
-        ASSERT_EQ( (std::is_same< CommonViewValueType, int>::value) , true ) ;
+        ASSERT_EQ((std::is_same<CommonViewValueType, int>::value), true);
       }
-
     }
 
-  } // end test_vcpt
+  }  // end test_vcpt
 
-}; // end struct
+};  // end struct
 
-} // namespace
+}  // namespace
 
-TEST_F( TEST_CATEGORY , viewctorprop_embedded_dim ) {
-  TestViewCtorProp_EmbeddedDim< TEST_EXECSPACE >::test_vcpt( 2, 3 );
+TEST(TEST_CATEGORY, viewctorprop_embedded_dim) {
+  TestViewCtorProp_EmbeddedDim<TEST_EXECSPACE>::test_vcpt(2, 3);
 }
 
-} // namespace Test
+}  // namespace Test
diff --git a/lib/kokkos/core/unit_test/TestViewLayoutStrideAssignment.hpp b/lib/kokkos/core/unit_test/TestViewLayoutStrideAssignment.hpp
index 3185fa5473..5e373dbbc9 100644
--- a/lib/kokkos/core/unit_test/TestViewLayoutStrideAssignment.hpp
+++ b/lib/kokkos/core/unit_test/TestViewLayoutStrideAssignment.hpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -52,689 +53,870 @@
 
 namespace Test {
 
-TEST_F( TEST_CATEGORY , view_layoutstride_left_to_layoutleft_assignment )
-{
-  typedef TEST_EXECSPACE exec_space ;
+TEST(TEST_CATEGORY, view_layoutstride_left_to_layoutleft_assignment) {
+  typedef TEST_EXECSPACE exec_space;
 
   auto t = time(0);
-  srand(t);// Use current time as seed for random generator
-  printf("view_layoutstride_left_to_layoutleft_assignment: srand(%lu)\n",size_t(t));
+  srand(t);  // Use current time as seed for random generator
+  printf("view_layoutstride_left_to_layoutleft_assignment: srand(%lu)\n",
+         size_t(t));
 
-  { // Assignment of rank-1 LayoutLeft = LayoutStride
-    int ndims = 1;
-    int dims [] = {10};
-    int order [] = {0};
-    Kokkos::LayoutStride layout = Kokkos::LayoutStride::order_dimensions(ndims, order, dims);
-    Kokkos::View< double*, Kokkos::LayoutStride, exec_space > src("LayoutStride", layout);
-	
-    Kokkos::View< double*, Kokkos::LayoutStride, exec_space >::HostMirror h_src = Kokkos::create_mirror_view( src );
+  {  // Assignment of rank-1 LayoutLeft = LayoutStride
+    int ndims   = 1;
+    int dims[]  = {10};
+    int order[] = {0};
+    Kokkos::LayoutStride layout =
+        Kokkos::LayoutStride::order_dimensions(ndims, order, dims);
+    Kokkos::View<double*, Kokkos::LayoutStride, exec_space> src("LayoutStride",
+                                                                layout);
 
-    for(size_t i=0; i<src.span(); i++) h_src.data()[i] = (double)rand() / RAND_MAX * (100);
+    Kokkos::View<double*, Kokkos::LayoutStride, exec_space>::HostMirror h_src =
+        Kokkos::create_mirror_view(src);
 
-    Kokkos::deep_copy( src, h_src );
+    for (size_t i = 0; i < src.span(); i++)
+      h_src.data()[i] = (double)rand() / RAND_MAX * (100);
 
-    Kokkos::View< double*, Kokkos::LayoutLeft, exec_space > dst = src;
+    Kokkos::deep_copy(src, h_src);
 
-    Kokkos::View< double*, Kokkos::LayoutLeft, exec_space >::HostMirror h_dst = Kokkos::create_mirror_view( dst );
+    Kokkos::View<double*, Kokkos::LayoutLeft, exec_space> dst = src;
 
-    Kokkos::deep_copy( h_dst, dst );
+    Kokkos::View<double*, Kokkos::LayoutLeft, exec_space>::HostMirror h_dst =
+        Kokkos::create_mirror_view(dst);
+
+    Kokkos::deep_copy(h_dst, dst);
 
     bool test = true;
-    for(size_t i=0; i<src.span();i++){
-      if (h_src.data()[i]!=h_dst.data()[i]) {test = false;break;}
+    for (size_t i = 0; i < src.span(); i++) {
+      if (h_src.data()[i] != h_dst.data()[i]) {
+        test = false;
+        break;
+      }
     }
-    ASSERT_EQ( dst.span(), src.span() );
-    ASSERT_EQ( test, true );
+    ASSERT_EQ(dst.span(), src.span());
+    ASSERT_EQ(test, true);
   }
-  { // Assignment of rank-2 LayoutLeft = LayoutStride
-    int ndims = 2;
-    int dims [] = {10,9};
-    int order [] = {0,1};
-    Kokkos::LayoutStride layout = Kokkos::LayoutStride::order_dimensions(ndims, order, dims);
-    Kokkos::View< double**, Kokkos::LayoutStride, exec_space > src("LayoutStride", layout);  
-  
-    Kokkos::View< double**, Kokkos::LayoutStride, exec_space >::HostMirror h_src = Kokkos::create_mirror_view( src );
+  {  // Assignment of rank-2 LayoutLeft = LayoutStride
+    int ndims   = 2;
+    int dims[]  = {10, 9};
+    int order[] = {0, 1};
+    Kokkos::LayoutStride layout =
+        Kokkos::LayoutStride::order_dimensions(ndims, order, dims);
+    Kokkos::View<double**, Kokkos::LayoutStride, exec_space> src("LayoutStride",
+                                                                 layout);
 
-    for(size_t i=0; i<src.span(); i++) h_src.data()[i] = (double)rand() / RAND_MAX * (100);
+    Kokkos::View<double**, Kokkos::LayoutStride, exec_space>::HostMirror h_src =
+        Kokkos::create_mirror_view(src);
 
-    Kokkos::deep_copy( src, h_src );
+    for (size_t i = 0; i < src.span(); i++)
+      h_src.data()[i] = (double)rand() / RAND_MAX * (100);
 
-    Kokkos::View< double**, Kokkos::LayoutLeft, exec_space > dst = src;
+    Kokkos::deep_copy(src, h_src);
 
-    Kokkos::View< double**, Kokkos::LayoutLeft, exec_space >::HostMirror h_dst = Kokkos::create_mirror_view( dst );
+    Kokkos::View<double**, Kokkos::LayoutLeft, exec_space> dst = src;
 
-    Kokkos::deep_copy( h_dst, dst );
+    Kokkos::View<double**, Kokkos::LayoutLeft, exec_space>::HostMirror h_dst =
+        Kokkos::create_mirror_view(dst);
+
+    Kokkos::deep_copy(h_dst, dst);
 
     bool test = true;
-    for(size_t i=0; i<src.span();i++){
-      if (h_src.data()[i]!=h_dst.data()[i]) {test = false;break;}
+    for (size_t i = 0; i < src.span(); i++) {
+      if (h_src.data()[i] != h_dst.data()[i]) {
+        test = false;
+        break;
+      }
     }
-    ASSERT_EQ( dst.span(), src.span() );
-    ASSERT_EQ( test, true );
+    ASSERT_EQ(dst.span(), src.span());
+    ASSERT_EQ(test, true);
   }
-  { // Assignment of rank-3 LayoutLeft = LayoutStride
-    int ndims = 3;
-    int dims [] = {10,9,8};
-    int order [] = {0,1,2};
-    Kokkos::LayoutStride layout = Kokkos::LayoutStride::order_dimensions(ndims, order, dims);
-    Kokkos::View< double***, Kokkos::LayoutStride, exec_space > src("LayoutStride", layout);
-	
-    Kokkos::View< double***, Kokkos::LayoutStride, exec_space >::HostMirror h_src = Kokkos::create_mirror_view( src );
+  {  // Assignment of rank-3 LayoutLeft = LayoutStride
+    int ndims   = 3;
+    int dims[]  = {10, 9, 8};
+    int order[] = {0, 1, 2};
+    Kokkos::LayoutStride layout =
+        Kokkos::LayoutStride::order_dimensions(ndims, order, dims);
+    Kokkos::View<double***, Kokkos::LayoutStride, exec_space> src(
+        "LayoutStride", layout);
 
-    for(size_t i=0; i<src.span(); i++) h_src.data()[i] = (double)rand() / RAND_MAX * (100);
+    Kokkos::View<double***, Kokkos::LayoutStride, exec_space>::HostMirror
+        h_src = Kokkos::create_mirror_view(src);
 
-    Kokkos::deep_copy( src, h_src );
+    for (size_t i = 0; i < src.span(); i++)
+      h_src.data()[i] = (double)rand() / RAND_MAX * (100);
 
-    Kokkos::View< double***, Kokkos::LayoutLeft, exec_space > dst = src;
+    Kokkos::deep_copy(src, h_src);
 
-    Kokkos::View< double***, Kokkos::LayoutLeft, exec_space >::HostMirror h_dst = Kokkos::create_mirror_view( dst );
+    Kokkos::View<double***, Kokkos::LayoutLeft, exec_space> dst = src;
 
-    Kokkos::deep_copy( h_dst, dst );
+    Kokkos::View<double***, Kokkos::LayoutLeft, exec_space>::HostMirror h_dst =
+        Kokkos::create_mirror_view(dst);
+
+    Kokkos::deep_copy(h_dst, dst);
 
     bool test = true;
-    for(size_t i=0; i<src.span();i++){
-      if (h_src.data()[i]!=h_dst.data()[i]) {test = false;break;}
+    for (size_t i = 0; i < src.span(); i++) {
+      if (h_src.data()[i] != h_dst.data()[i]) {
+        test = false;
+        break;
+      }
     }
-    ASSERT_EQ( dst.span(), src.span() );
-    ASSERT_EQ( test, true );
+    ASSERT_EQ(dst.span(), src.span());
+    ASSERT_EQ(test, true);
   }
-  { // Assignment of rank-4 LayoutLeft = LayoutStride
-    int ndims = 4;
-    int dims [] = {10,9,8,7};
-    int order [] = {0,1,2,3};
-    Kokkos::LayoutStride layout = Kokkos::LayoutStride::order_dimensions(ndims, order, dims);
-    Kokkos::View< double****, Kokkos::LayoutStride, exec_space > src("LayoutStride", layout);
-	
-    Kokkos::View< double****, Kokkos::LayoutStride, exec_space >::HostMirror h_src = Kokkos::create_mirror_view( src );
+  {  // Assignment of rank-4 LayoutLeft = LayoutStride
+    int ndims   = 4;
+    int dims[]  = {10, 9, 8, 7};
+    int order[] = {0, 1, 2, 3};
+    Kokkos::LayoutStride layout =
+        Kokkos::LayoutStride::order_dimensions(ndims, order, dims);
+    Kokkos::View<double****, Kokkos::LayoutStride, exec_space> src(
+        "LayoutStride", layout);
 
-    for(size_t i=0; i<src.span(); i++) h_src.data()[i] = (double)rand() / RAND_MAX * (100);
+    Kokkos::View<double****, Kokkos::LayoutStride, exec_space>::HostMirror
+        h_src = Kokkos::create_mirror_view(src);
 
-    Kokkos::deep_copy( src, h_src );
+    for (size_t i = 0; i < src.span(); i++)
+      h_src.data()[i] = (double)rand() / RAND_MAX * (100);
 
-    Kokkos::View< double****, Kokkos::LayoutLeft, exec_space > dst = src;
+    Kokkos::deep_copy(src, h_src);
 
-    Kokkos::View< double****, Kokkos::LayoutLeft, exec_space >::HostMirror h_dst = Kokkos::create_mirror_view( dst );
+    Kokkos::View<double****, Kokkos::LayoutLeft, exec_space> dst = src;
 
-    Kokkos::deep_copy( h_dst, dst );
+    Kokkos::View<double****, Kokkos::LayoutLeft, exec_space>::HostMirror h_dst =
+        Kokkos::create_mirror_view(dst);
+
+    Kokkos::deep_copy(h_dst, dst);
 
     bool test = true;
-    for(size_t i=0; i<src.span();i++){
-      if (h_src.data()[i]!=h_dst.data()[i]) {test = false;break;}
+    for (size_t i = 0; i < src.span(); i++) {
+      if (h_src.data()[i] != h_dst.data()[i]) {
+        test = false;
+        break;
+      }
     }
-    ASSERT_EQ( dst.span(), src.span() );
-    ASSERT_EQ( test, true );
+    ASSERT_EQ(dst.span(), src.span());
+    ASSERT_EQ(test, true);
   }
-  { // Assignment of rank-5 LayoutLeft = LayoutStride
-    int ndims = 5;
-    int dims [] = {10,9,8,7,6};
-    int order [] = {0,1,2,3,4};
-    Kokkos::LayoutStride layout = Kokkos::LayoutStride::order_dimensions(ndims, order, dims);
-    Kokkos::View< double*****, Kokkos::LayoutStride, exec_space > src("LayoutStride", layout);
-	
-    Kokkos::View< double*****, Kokkos::LayoutStride, exec_space >::HostMirror h_src = Kokkos::create_mirror_view( src );
+  {  // Assignment of rank-5 LayoutLeft = LayoutStride
+    int ndims   = 5;
+    int dims[]  = {10, 9, 8, 7, 6};
+    int order[] = {0, 1, 2, 3, 4};
+    Kokkos::LayoutStride layout =
+        Kokkos::LayoutStride::order_dimensions(ndims, order, dims);
+    Kokkos::View<double*****, Kokkos::LayoutStride, exec_space> src(
+        "LayoutStride", layout);
 
-    for(size_t i=0; i<src.span(); i++) h_src.data()[i] = (double)rand() / RAND_MAX * (100);
+    Kokkos::View<double*****, Kokkos::LayoutStride, exec_space>::HostMirror
+        h_src = Kokkos::create_mirror_view(src);
 
-    Kokkos::deep_copy( src, h_src );
+    for (size_t i = 0; i < src.span(); i++)
+      h_src.data()[i] = (double)rand() / RAND_MAX * (100);
 
-    Kokkos::View< double*****, Kokkos::LayoutLeft, exec_space > dst = src;
+    Kokkos::deep_copy(src, h_src);
 
-    Kokkos::View< double*****, Kokkos::LayoutLeft, exec_space >::HostMirror h_dst = Kokkos::create_mirror_view( dst );
+    Kokkos::View<double*****, Kokkos::LayoutLeft, exec_space> dst = src;
 
-    Kokkos::deep_copy( h_dst, dst );
+    Kokkos::View<double*****, Kokkos::LayoutLeft, exec_space>::HostMirror
+        h_dst = Kokkos::create_mirror_view(dst);
+
+    Kokkos::deep_copy(h_dst, dst);
 
     bool test = true;
-    for(size_t i=0; i<src.span();i++){
-      if (h_src.data()[i]!=h_dst.data()[i]) {test = false;break;}
+    for (size_t i = 0; i < src.span(); i++) {
+      if (h_src.data()[i] != h_dst.data()[i]) {
+        test = false;
+        break;
+      }
     }
-    ASSERT_EQ( dst.span(), src.span() );
-    ASSERT_EQ( test, true );
+    ASSERT_EQ(dst.span(), src.span());
+    ASSERT_EQ(test, true);
   }
-  { // Assignment of rank-6 LayoutLeft = LayoutStride
-    int ndims = 6;
-    int dims [] = {10,9,8,7,6,5};
-    int order [] = {0,1,2,3,4,5};
-    Kokkos::LayoutStride layout = Kokkos::LayoutStride::order_dimensions(ndims, order, dims);
-    Kokkos::View< double******, Kokkos::LayoutStride, exec_space > src("LayoutStride", layout);
-	
-    Kokkos::View< double******, Kokkos::LayoutStride, exec_space >::HostMirror h_src = Kokkos::create_mirror_view( src );
+  {  // Assignment of rank-6 LayoutLeft = LayoutStride
+    int ndims   = 6;
+    int dims[]  = {10, 9, 8, 7, 6, 5};
+    int order[] = {0, 1, 2, 3, 4, 5};
+    Kokkos::LayoutStride layout =
+        Kokkos::LayoutStride::order_dimensions(ndims, order, dims);
+    Kokkos::View<double******, Kokkos::LayoutStride, exec_space> src(
+        "LayoutStride", layout);
 
-    for(size_t i=0; i<src.span(); i++) h_src.data()[i] = (double)rand() / RAND_MAX * (100);
+    Kokkos::View<double******, Kokkos::LayoutStride, exec_space>::HostMirror
+        h_src = Kokkos::create_mirror_view(src);
 
-    Kokkos::deep_copy( src, h_src );
+    for (size_t i = 0; i < src.span(); i++)
+      h_src.data()[i] = (double)rand() / RAND_MAX * (100);
 
-    Kokkos::View< double******, Kokkos::LayoutLeft, exec_space > dst = src;
+    Kokkos::deep_copy(src, h_src);
 
-    Kokkos::View< double******, Kokkos::LayoutLeft, exec_space >::HostMirror h_dst = Kokkos::create_mirror_view( dst );
+    Kokkos::View<double******, Kokkos::LayoutLeft, exec_space> dst = src;
 
-    Kokkos::deep_copy( h_dst, dst );
+    Kokkos::View<double******, Kokkos::LayoutLeft, exec_space>::HostMirror
+        h_dst = Kokkos::create_mirror_view(dst);
+
+    Kokkos::deep_copy(h_dst, dst);
 
     bool test = true;
-    for(size_t i=0; i<src.span();i++){
-      if (h_src.data()[i]!=h_dst.data()[i]) {test = false;break;}
+    for (size_t i = 0; i < src.span(); i++) {
+      if (h_src.data()[i] != h_dst.data()[i]) {
+        test = false;
+        break;
+      }
     }
-    ASSERT_EQ( dst.span(), src.span() );
-    ASSERT_EQ( test, true );
+    ASSERT_EQ(dst.span(), src.span());
+    ASSERT_EQ(test, true);
   }
-  { // Assignment of rank-7 LayoutLeft = LayoutStride
-    int ndims = 7;
-    int dims [] = {10,9,8,7,6,5,4};
-    int order [] = {0,1,2,3,4,5,6};
-    Kokkos::LayoutStride layout = Kokkos::LayoutStride::order_dimensions(ndims, order, dims);
-    Kokkos::View< double*******, Kokkos::LayoutStride, exec_space > src("LayoutStride", layout);
-	
-    Kokkos::View< double*******, Kokkos::LayoutStride, exec_space >::HostMirror h_src = Kokkos::create_mirror_view( src );
+  {  // Assignment of rank-7 LayoutLeft = LayoutStride
+    int ndims   = 7;
+    int dims[]  = {10, 9, 8, 7, 6, 5, 4};
+    int order[] = {0, 1, 2, 3, 4, 5, 6};
+    Kokkos::LayoutStride layout =
+        Kokkos::LayoutStride::order_dimensions(ndims, order, dims);
+    Kokkos::View<double*******, Kokkos::LayoutStride, exec_space> src(
+        "LayoutStride", layout);
 
-    for(size_t i=0; i<src.span(); i++) h_src.data()[i] = (double)rand() / RAND_MAX * (100);
+    Kokkos::View<double*******, Kokkos::LayoutStride, exec_space>::HostMirror
+        h_src = Kokkos::create_mirror_view(src);
 
-    Kokkos::deep_copy( src, h_src );
+    for (size_t i = 0; i < src.span(); i++)
+      h_src.data()[i] = (double)rand() / RAND_MAX * (100);
 
-    Kokkos::View< double*******, Kokkos::LayoutLeft, exec_space > dst = src;
+    Kokkos::deep_copy(src, h_src);
 
-    Kokkos::View< double*******, Kokkos::LayoutLeft, exec_space >::HostMirror h_dst = Kokkos::create_mirror_view( dst );
+    Kokkos::View<double*******, Kokkos::LayoutLeft, exec_space> dst = src;
 
-    Kokkos::deep_copy( h_dst, dst );
+    Kokkos::View<double*******, Kokkos::LayoutLeft, exec_space>::HostMirror
+        h_dst = Kokkos::create_mirror_view(dst);
+
+    Kokkos::deep_copy(h_dst, dst);
 
     bool test = true;
-    for(size_t i=0; i<src.span();i++){
-      if (h_src.data()[i]!=h_dst.data()[i]) {test = false;break;}
+    for (size_t i = 0; i < src.span(); i++) {
+      if (h_src.data()[i] != h_dst.data()[i]) {
+        test = false;
+        break;
+      }
     }
-    ASSERT_EQ( dst.span(), src.span() );
-    ASSERT_EQ( test, true );
+    ASSERT_EQ(dst.span(), src.span());
+    ASSERT_EQ(test, true);
   }
-  { // Assignment of rank-8 LayoutLeft = LayoutStride
-    int ndims = 8;
-    int dims [] = {10,9,8,7,6,5,4,3};
-    int order [] = {0,1,2,3,4,5,6,7};
-    Kokkos::LayoutStride layout = Kokkos::LayoutStride::order_dimensions(ndims, order, dims);
-    Kokkos::View< double********, Kokkos::LayoutStride, exec_space > src("LayoutStride", layout);
-	
-    Kokkos::View< double********, Kokkos::LayoutStride, exec_space >::HostMirror h_src = Kokkos::create_mirror_view( src );
+  {  // Assignment of rank-8 LayoutLeft = LayoutStride
+    int ndims   = 8;
+    int dims[]  = {10, 9, 8, 7, 6, 5, 4, 3};
+    int order[] = {0, 1, 2, 3, 4, 5, 6, 7};
+    Kokkos::LayoutStride layout =
+        Kokkos::LayoutStride::order_dimensions(ndims, order, dims);
+    Kokkos::View<double********, Kokkos::LayoutStride, exec_space> src(
+        "LayoutStride", layout);
 
-    for(size_t i=0; i<src.span(); i++) h_src.data()[i] = (double)rand() / RAND_MAX * (100);
+    Kokkos::View<double********, Kokkos::LayoutStride, exec_space>::HostMirror
+        h_src = Kokkos::create_mirror_view(src);
 
-    Kokkos::deep_copy( src, h_src );
+    for (size_t i = 0; i < src.span(); i++)
+      h_src.data()[i] = (double)rand() / RAND_MAX * (100);
 
-    Kokkos::View< double********, Kokkos::LayoutLeft, exec_space > dst = src;
+    Kokkos::deep_copy(src, h_src);
 
-    Kokkos::View< double********, Kokkos::LayoutLeft, exec_space >::HostMirror h_dst = Kokkos::create_mirror_view( dst );
+    Kokkos::View<double********, Kokkos::LayoutLeft, exec_space> dst = src;
 
-    Kokkos::deep_copy( h_dst, dst );
+    Kokkos::View<double********, Kokkos::LayoutLeft, exec_space>::HostMirror
+        h_dst = Kokkos::create_mirror_view(dst);
+
+    Kokkos::deep_copy(h_dst, dst);
 
     bool test = true;
-    for(size_t i=0; i<src.span();i++){
-      if (h_src.data()[i]!=h_dst.data()[i]) {test = false;break;}
+    for (size_t i = 0; i < src.span(); i++) {
+      if (h_src.data()[i] != h_dst.data()[i]) {
+        test = false;
+        break;
+      }
     }
-    ASSERT_EQ( dst.span(), src.span() );
-    ASSERT_EQ( test, true );
+    ASSERT_EQ(dst.span(), src.span());
+    ASSERT_EQ(test, true);
   }
-
 }
 
-TEST_F( TEST_CATEGORY , view_layoutstride_right_to_layoutright_assignment )
-{
-  typedef TEST_EXECSPACE exec_space ;
+TEST(TEST_CATEGORY, view_layoutstride_right_to_layoutright_assignment) {
+  typedef TEST_EXECSPACE exec_space;
 
   auto t = time(0);
-  srand(t);// Use current time as seed for random generator
-  printf("view_layoutstride_right_to_layoutright_assignment: srand(%lu)\n",size_t(t));
+  srand(t);  // Use current time as seed for random generator
+  printf("view_layoutstride_right_to_layoutright_assignment: srand(%lu)\n",
+         size_t(t));
 
-  { // Assignment of rank-1 LayoutRight = LayoutStride
-    int ndims = 1;
-    int dims [] = {10};
-    int order [] = {0};
-    Kokkos::LayoutStride layout = Kokkos::LayoutStride::order_dimensions(ndims, order, dims);
-    Kokkos::View< double*, Kokkos::LayoutStride, exec_space > src("LayoutStride", layout);
-	
-    Kokkos::View< double*, Kokkos::LayoutStride, exec_space >::HostMirror h_src = Kokkos::create_mirror_view( src );
+  {  // Assignment of rank-1 LayoutRight = LayoutStride
+    int ndims   = 1;
+    int dims[]  = {10};
+    int order[] = {0};
+    Kokkos::LayoutStride layout =
+        Kokkos::LayoutStride::order_dimensions(ndims, order, dims);
+    Kokkos::View<double*, Kokkos::LayoutStride, exec_space> src("LayoutStride",
+                                                                layout);
 
-    for(size_t i=0; i<src.span(); i++) h_src.data()[i] = (double)rand() / RAND_MAX * (100);
+    Kokkos::View<double*, Kokkos::LayoutStride, exec_space>::HostMirror h_src =
+        Kokkos::create_mirror_view(src);
 
-    Kokkos::deep_copy( src, h_src );
+    for (size_t i = 0; i < src.span(); i++)
+      h_src.data()[i] = (double)rand() / RAND_MAX * (100);
 
-    Kokkos::View< double*, Kokkos::LayoutRight, exec_space > dst = src;
+    Kokkos::deep_copy(src, h_src);
 
-    Kokkos::View< double*, Kokkos::LayoutRight, exec_space >::HostMirror h_dst = Kokkos::create_mirror_view( dst );
+    Kokkos::View<double*, Kokkos::LayoutRight, exec_space> dst = src;
 
-    Kokkos::deep_copy( h_dst, dst );
+    Kokkos::View<double*, Kokkos::LayoutRight, exec_space>::HostMirror h_dst =
+        Kokkos::create_mirror_view(dst);
+
+    Kokkos::deep_copy(h_dst, dst);
 
     bool test = true;
-    for(size_t i=0; i<src.span();i++){
-      if (h_src.data()[i]!=h_dst.data()[i]) {test = false;break;}
+    for (size_t i = 0; i < src.span(); i++) {
+      if (h_src.data()[i] != h_dst.data()[i]) {
+        test = false;
+        break;
+      }
     }
-    ASSERT_EQ( dst.span(), src.span() );
-    ASSERT_EQ( test, true );
+    ASSERT_EQ(dst.span(), src.span());
+    ASSERT_EQ(test, true);
   }
-  { // Assignment of rank-2 LayoutRight = LayoutStride
-    int ndims = 2;
-    int dims [] = {10,9};
-    int order [] = {1,0};
-    Kokkos::LayoutStride layout = Kokkos::LayoutStride::order_dimensions(ndims, order, dims);
-    Kokkos::View< double**, Kokkos::LayoutStride, exec_space > src("LayoutStride", layout);
-	
-    Kokkos::View< double**, Kokkos::LayoutStride, exec_space >::HostMirror h_src = Kokkos::create_mirror_view( src );
+  {  // Assignment of rank-2 LayoutRight = LayoutStride
+    int ndims   = 2;
+    int dims[]  = {10, 9};
+    int order[] = {1, 0};
+    Kokkos::LayoutStride layout =
+        Kokkos::LayoutStride::order_dimensions(ndims, order, dims);
+    Kokkos::View<double**, Kokkos::LayoutStride, exec_space> src("LayoutStride",
+                                                                 layout);
 
-    for(size_t i=0; i<src.span(); i++) h_src.data()[i] = (double)rand() / RAND_MAX * (100);
+    Kokkos::View<double**, Kokkos::LayoutStride, exec_space>::HostMirror h_src =
+        Kokkos::create_mirror_view(src);
 
-    Kokkos::deep_copy( src, h_src );
+    for (size_t i = 0; i < src.span(); i++)
+      h_src.data()[i] = (double)rand() / RAND_MAX * (100);
 
-    Kokkos::View< double**, Kokkos::LayoutRight, exec_space > dst = src;
+    Kokkos::deep_copy(src, h_src);
 
-    Kokkos::View< double**, Kokkos::LayoutRight, exec_space >::HostMirror h_dst = Kokkos::create_mirror_view( dst );
+    Kokkos::View<double**, Kokkos::LayoutRight, exec_space> dst = src;
 
-    Kokkos::deep_copy( h_dst, dst );
+    Kokkos::View<double**, Kokkos::LayoutRight, exec_space>::HostMirror h_dst =
+        Kokkos::create_mirror_view(dst);
+
+    Kokkos::deep_copy(h_dst, dst);
 
     bool test = true;
-    for(size_t i=0; i<src.span();i++){
-      if (h_src.data()[i]!=h_dst.data()[i]) {test = false;break;}
+    for (size_t i = 0; i < src.span(); i++) {
+      if (h_src.data()[i] != h_dst.data()[i]) {
+        test = false;
+        break;
+      }
     }
-    ASSERT_EQ( dst.span(), src.span() );
-    ASSERT_EQ( test, true );
+    ASSERT_EQ(dst.span(), src.span());
+    ASSERT_EQ(test, true);
   }
-  { // Assignment of rank-3 LayoutRight = LayoutStride
-    int ndims = 3;
-    int dims [] = {10,9,8};
-    int order [] = {2,1,0};
-    Kokkos::LayoutStride layout = Kokkos::LayoutStride::order_dimensions(ndims, order, dims);
-    Kokkos::View< double***, Kokkos::LayoutStride, exec_space > src("LayoutStride", layout);
-	
-    Kokkos::View< double***, Kokkos::LayoutStride, exec_space >::HostMirror h_src = Kokkos::create_mirror_view( src );
+  {  // Assignment of rank-3 LayoutRight = LayoutStride
+    int ndims   = 3;
+    int dims[]  = {10, 9, 8};
+    int order[] = {2, 1, 0};
+    Kokkos::LayoutStride layout =
+        Kokkos::LayoutStride::order_dimensions(ndims, order, dims);
+    Kokkos::View<double***, Kokkos::LayoutStride, exec_space> src(
+        "LayoutStride", layout);
 
-    for(size_t i=0; i<src.span(); i++) h_src.data()[i] = (double)rand() / RAND_MAX * (100);
+    Kokkos::View<double***, Kokkos::LayoutStride, exec_space>::HostMirror
+        h_src = Kokkos::create_mirror_view(src);
 
-    Kokkos::deep_copy( src, h_src );
+    for (size_t i = 0; i < src.span(); i++)
+      h_src.data()[i] = (double)rand() / RAND_MAX * (100);
 
-    Kokkos::View< double***, Kokkos::LayoutRight, exec_space > dst = src;
+    Kokkos::deep_copy(src, h_src);
 
-    Kokkos::View< double***, Kokkos::LayoutRight, exec_space >::HostMirror h_dst = Kokkos::create_mirror_view( dst );
+    Kokkos::View<double***, Kokkos::LayoutRight, exec_space> dst = src;
 
-    Kokkos::deep_copy( h_dst, dst );
+    Kokkos::View<double***, Kokkos::LayoutRight, exec_space>::HostMirror h_dst =
+        Kokkos::create_mirror_view(dst);
+
+    Kokkos::deep_copy(h_dst, dst);
 
     bool test = true;
-    for(size_t i=0; i<src.span();i++){
-      if (h_src.data()[i]!=h_dst.data()[i]) {test = false;break;}
+    for (size_t i = 0; i < src.span(); i++) {
+      if (h_src.data()[i] != h_dst.data()[i]) {
+        test = false;
+        break;
+      }
     }
-    ASSERT_EQ( dst.span(), src.span() );
-    ASSERT_EQ( test, true );
+    ASSERT_EQ(dst.span(), src.span());
+    ASSERT_EQ(test, true);
   }
-  { // Assignment of rank-4 LayoutRight = LayoutStride
-    int ndims = 4;
-    int dims [] = {10,9,8,7};
-    int order [] = {3,2,1,0};
-    Kokkos::LayoutStride layout = Kokkos::LayoutStride::order_dimensions(ndims, order, dims);
-    Kokkos::View< double****, Kokkos::LayoutStride, exec_space > src("LayoutStride", layout);
-	
-    Kokkos::View< double****, Kokkos::LayoutStride, exec_space >::HostMirror h_src = Kokkos::create_mirror_view( src );
+  {  // Assignment of rank-4 LayoutRight = LayoutStride
+    int ndims   = 4;
+    int dims[]  = {10, 9, 8, 7};
+    int order[] = {3, 2, 1, 0};
+    Kokkos::LayoutStride layout =
+        Kokkos::LayoutStride::order_dimensions(ndims, order, dims);
+    Kokkos::View<double****, Kokkos::LayoutStride, exec_space> src(
+        "LayoutStride", layout);
 
-    for(size_t i=0; i<src.span(); i++) h_src.data()[i] = (double)rand() / RAND_MAX * (100);
+    Kokkos::View<double****, Kokkos::LayoutStride, exec_space>::HostMirror
+        h_src = Kokkos::create_mirror_view(src);
 
-    Kokkos::deep_copy( src, h_src );
+    for (size_t i = 0; i < src.span(); i++)
+      h_src.data()[i] = (double)rand() / RAND_MAX * (100);
 
-    Kokkos::View< double****, Kokkos::LayoutRight, exec_space > dst = src;
+    Kokkos::deep_copy(src, h_src);
 
-    Kokkos::View< double****, Kokkos::LayoutRight, exec_space >::HostMirror h_dst = Kokkos::create_mirror_view( dst );
+    Kokkos::View<double****, Kokkos::LayoutRight, exec_space> dst = src;
 
-    Kokkos::deep_copy( h_dst, dst );
+    Kokkos::View<double****, Kokkos::LayoutRight, exec_space>::HostMirror
+        h_dst = Kokkos::create_mirror_view(dst);
+
+    Kokkos::deep_copy(h_dst, dst);
 
     bool test = true;
-    for(size_t i=0; i<src.span();i++){
-      if (h_src.data()[i]!=h_dst.data()[i]) {test = false;break;}
+    for (size_t i = 0; i < src.span(); i++) {
+      if (h_src.data()[i] != h_dst.data()[i]) {
+        test = false;
+        break;
+      }
     }
-    ASSERT_EQ( dst.span(), src.span() );
-    ASSERT_EQ( test, true );
+    ASSERT_EQ(dst.span(), src.span());
+    ASSERT_EQ(test, true);
   }
-  { // Assignment of rank-5 LayoutRight = LayoutStride
-    int ndims = 5;
-    int dims [] = {10,9,8,7,6};
-    int order [] = {4,3,2,1,0};
-    Kokkos::LayoutStride layout = Kokkos::LayoutStride::order_dimensions(ndims, order, dims);
-    Kokkos::View< double*****, Kokkos::LayoutStride, exec_space > src("LayoutStride", layout);
-	
-    Kokkos::View< double*****, Kokkos::LayoutStride, exec_space >::HostMirror h_src = Kokkos::create_mirror_view( src );
+  {  // Assignment of rank-5 LayoutRight = LayoutStride
+    int ndims   = 5;
+    int dims[]  = {10, 9, 8, 7, 6};
+    int order[] = {4, 3, 2, 1, 0};
+    Kokkos::LayoutStride layout =
+        Kokkos::LayoutStride::order_dimensions(ndims, order, dims);
+    Kokkos::View<double*****, Kokkos::LayoutStride, exec_space> src(
+        "LayoutStride", layout);
 
-    for(size_t i=0; i<src.span(); i++) h_src.data()[i] = (double)rand() / RAND_MAX * (100);
+    Kokkos::View<double*****, Kokkos::LayoutStride, exec_space>::HostMirror
+        h_src = Kokkos::create_mirror_view(src);
 
-    Kokkos::deep_copy( src, h_src );
+    for (size_t i = 0; i < src.span(); i++)
+      h_src.data()[i] = (double)rand() / RAND_MAX * (100);
 
-    Kokkos::View< double*****, Kokkos::LayoutRight, exec_space > dst = src;
+    Kokkos::deep_copy(src, h_src);
 
-    Kokkos::View< double*****, Kokkos::LayoutRight, exec_space >::HostMirror h_dst = Kokkos::create_mirror_view( dst );
+    Kokkos::View<double*****, Kokkos::LayoutRight, exec_space> dst = src;
 
-    Kokkos::deep_copy( h_dst, dst );
+    Kokkos::View<double*****, Kokkos::LayoutRight, exec_space>::HostMirror
+        h_dst = Kokkos::create_mirror_view(dst);
+
+    Kokkos::deep_copy(h_dst, dst);
 
     bool test = true;
-    for(size_t i=0; i<src.span();i++){
-      if (h_src.data()[i]!=h_dst.data()[i]) {test = false;break;}
+    for (size_t i = 0; i < src.span(); i++) {
+      if (h_src.data()[i] != h_dst.data()[i]) {
+        test = false;
+        break;
+      }
     }
-    ASSERT_EQ( dst.span(), src.span() );
-    ASSERT_EQ( test, true );
+    ASSERT_EQ(dst.span(), src.span());
+    ASSERT_EQ(test, true);
   }
-  { // Assignment of rank-6 LayoutRight = LayoutStride
-    int ndims = 6;
-    int dims [] = {10,9,8,7,6,5};
-    int order [] = {5,4,3,2,1,0};
-    Kokkos::LayoutStride layout = Kokkos::LayoutStride::order_dimensions(ndims, order, dims);
-    Kokkos::View< double******, Kokkos::LayoutStride, exec_space > src("LayoutStride", layout);
-	
-    Kokkos::View< double******, Kokkos::LayoutStride, exec_space >::HostMirror h_src = Kokkos::create_mirror_view( src );
+  {  // Assignment of rank-6 LayoutRight = LayoutStride
+    int ndims   = 6;
+    int dims[]  = {10, 9, 8, 7, 6, 5};
+    int order[] = {5, 4, 3, 2, 1, 0};
+    Kokkos::LayoutStride layout =
+        Kokkos::LayoutStride::order_dimensions(ndims, order, dims);
+    Kokkos::View<double******, Kokkos::LayoutStride, exec_space> src(
+        "LayoutStride", layout);
 
-    for(size_t i=0; i<src.span(); i++) h_src.data()[i] = (double)rand() / RAND_MAX * (100);
+    Kokkos::View<double******, Kokkos::LayoutStride, exec_space>::HostMirror
+        h_src = Kokkos::create_mirror_view(src);
 
-    Kokkos::deep_copy( src, h_src );
+    for (size_t i = 0; i < src.span(); i++)
+      h_src.data()[i] = (double)rand() / RAND_MAX * (100);
 
-    Kokkos::View< double******, Kokkos::LayoutRight, exec_space > dst = src;
+    Kokkos::deep_copy(src, h_src);
 
-    Kokkos::View< double******, Kokkos::LayoutRight, exec_space >::HostMirror h_dst = Kokkos::create_mirror_view( dst );
+    Kokkos::View<double******, Kokkos::LayoutRight, exec_space> dst = src;
 
-    Kokkos::deep_copy( h_dst, dst );
+    Kokkos::View<double******, Kokkos::LayoutRight, exec_space>::HostMirror
+        h_dst = Kokkos::create_mirror_view(dst);
+
+    Kokkos::deep_copy(h_dst, dst);
 
     bool test = true;
-    for(size_t i=0; i<src.span();i++){
-      if (h_src.data()[i]!=h_dst.data()[i]) {test = false;break;}
+    for (size_t i = 0; i < src.span(); i++) {
+      if (h_src.data()[i] != h_dst.data()[i]) {
+        test = false;
+        break;
+      }
     }
-    ASSERT_EQ( dst.span(), src.span() );
-    ASSERT_EQ( test, true );
+    ASSERT_EQ(dst.span(), src.span());
+    ASSERT_EQ(test, true);
   }
-  { // Assignment of rank-7 LayoutRight = LayoutStride
-    int ndims = 7;
-    int dims [] = {10,9,8,7,6,5,4};
-    int order [] = {6,5,4,3,2,1,0};
-    Kokkos::LayoutStride layout = Kokkos::LayoutStride::order_dimensions(ndims, order, dims);
-    Kokkos::View< double*******, Kokkos::LayoutStride, exec_space > src("LayoutStride", layout);
-	
-    Kokkos::View< double*******, Kokkos::LayoutStride, exec_space >::HostMirror h_src = Kokkos::create_mirror_view( src );
+  {  // Assignment of rank-7 LayoutRight = LayoutStride
+    int ndims   = 7;
+    int dims[]  = {10, 9, 8, 7, 6, 5, 4};
+    int order[] = {6, 5, 4, 3, 2, 1, 0};
+    Kokkos::LayoutStride layout =
+        Kokkos::LayoutStride::order_dimensions(ndims, order, dims);
+    Kokkos::View<double*******, Kokkos::LayoutStride, exec_space> src(
+        "LayoutStride", layout);
 
-    for(size_t i=0; i<src.span(); i++) h_src.data()[i] = (double)rand() / RAND_MAX * (100);
+    Kokkos::View<double*******, Kokkos::LayoutStride, exec_space>::HostMirror
+        h_src = Kokkos::create_mirror_view(src);
 
-    Kokkos::deep_copy( src, h_src );
+    for (size_t i = 0; i < src.span(); i++)
+      h_src.data()[i] = (double)rand() / RAND_MAX * (100);
 
-    Kokkos::View< double*******, Kokkos::LayoutRight, exec_space > dst = src;
+    Kokkos::deep_copy(src, h_src);
 
-    Kokkos::View< double*******, Kokkos::LayoutRight, exec_space >::HostMirror h_dst = Kokkos::create_mirror_view( dst );
+    Kokkos::View<double*******, Kokkos::LayoutRight, exec_space> dst = src;
 
-    Kokkos::deep_copy( h_dst, dst );
+    Kokkos::View<double*******, Kokkos::LayoutRight, exec_space>::HostMirror
+        h_dst = Kokkos::create_mirror_view(dst);
+
+    Kokkos::deep_copy(h_dst, dst);
 
     bool test = true;
-    for(size_t i=0; i<src.span();i++){
-      if (h_src.data()[i]!=h_dst.data()[i]) {test = false;break;}
+    for (size_t i = 0; i < src.span(); i++) {
+      if (h_src.data()[i] != h_dst.data()[i]) {
+        test = false;
+        break;
+      }
     }
-    ASSERT_EQ( dst.span(), src.span() );
-    ASSERT_EQ( test, true );
+    ASSERT_EQ(dst.span(), src.span());
+    ASSERT_EQ(test, true);
   }
-  { // Assignment of rank-8 LayoutRight = LayoutStride
-    int ndims = 8;
-    int dims [] = {10,9,8,7,6,5,4,3};
-    int order [] = {7,6,5,4,3,2,1,0};
-    Kokkos::LayoutStride layout = Kokkos::LayoutStride::order_dimensions(ndims, order, dims);
-    Kokkos::View< double********, Kokkos::LayoutStride, exec_space > src("LayoutStride", layout);
-	
-    Kokkos::View< double********, Kokkos::LayoutStride, exec_space >::HostMirror h_src = Kokkos::create_mirror_view( src );
+  {  // Assignment of rank-8 LayoutRight = LayoutStride
+    int ndims   = 8;
+    int dims[]  = {10, 9, 8, 7, 6, 5, 4, 3};
+    int order[] = {7, 6, 5, 4, 3, 2, 1, 0};
+    Kokkos::LayoutStride layout =
+        Kokkos::LayoutStride::order_dimensions(ndims, order, dims);
+    Kokkos::View<double********, Kokkos::LayoutStride, exec_space> src(
+        "LayoutStride", layout);
 
-    for(size_t i=0; i<src.span(); i++) h_src.data()[i] = (double)rand() / RAND_MAX * (100);
+    Kokkos::View<double********, Kokkos::LayoutStride, exec_space>::HostMirror
+        h_src = Kokkos::create_mirror_view(src);
 
-    Kokkos::deep_copy( src, h_src );
+    for (size_t i = 0; i < src.span(); i++)
+      h_src.data()[i] = (double)rand() / RAND_MAX * (100);
 
-    Kokkos::View< double********, Kokkos::LayoutRight, exec_space > dst = src;
+    Kokkos::deep_copy(src, h_src);
 
-    Kokkos::View< double********, Kokkos::LayoutRight, exec_space >::HostMirror h_dst = Kokkos::create_mirror_view( dst );
+    Kokkos::View<double********, Kokkos::LayoutRight, exec_space> dst = src;
 
-    Kokkos::deep_copy( h_dst, dst );
+    Kokkos::View<double********, Kokkos::LayoutRight, exec_space>::HostMirror
+        h_dst = Kokkos::create_mirror_view(dst);
+
+    Kokkos::deep_copy(h_dst, dst);
 
     bool test = true;
-    for(size_t i=0; i<src.span();i++){
-      if (h_src.data()[i]!=h_dst.data()[i]) {test = false;break;}
+    for (size_t i = 0; i < src.span(); i++) {
+      if (h_src.data()[i] != h_dst.data()[i]) {
+        test = false;
+        break;
+      }
     }
-    ASSERT_EQ( dst.span(), src.span() );
-    ASSERT_EQ( test, true );
+    ASSERT_EQ(dst.span(), src.span());
+    ASSERT_EQ(test, true);
   }
-
 }
 
-TEST_F( TEST_CATEGORY , view_layoutstride_right_to_layoutleft_assignment )
-{
-  typedef TEST_EXECSPACE exec_space ;
+TEST(TEST_CATEGORY_DEATH, view_layoutstride_right_to_layoutleft_assignment) {
+  typedef TEST_EXECSPACE exec_space;
 
   auto t = time(0);
-  srand(t);// Use current time as seed for random generator
-  printf("view_layoutstride_right_to_layoutleft_assignment: srand(%lu)\n",size_t(t));
+  srand(t);  // Use current time as seed for random generator
+  printf("view_layoutstride_right_to_layoutleft_assignment: srand(%lu)\n",
+         size_t(t));
 
-  { // Assignment of rank-1 LayoutLeft = LayoutStride (LayoutRight compatible)
-    int ndims = 1;
-    int dims [] = {10};
-    int order [] = {0};
-    Kokkos::LayoutStride layout = Kokkos::LayoutStride::order_dimensions(ndims, order, dims);
-    Kokkos::View< double*, Kokkos::LayoutStride, exec_space > src("LayoutStride", layout);
+  {  // Assignment of rank-1 LayoutLeft = LayoutStride (LayoutRight compatible)
+    int ndims   = 1;
+    int dims[]  = {10};
+    int order[] = {0};
+    Kokkos::LayoutStride layout =
+        Kokkos::LayoutStride::order_dimensions(ndims, order, dims);
+    Kokkos::View<double*, Kokkos::LayoutStride, exec_space> src("LayoutStride",
+                                                                layout);
 
-    Kokkos::View< double*, Kokkos::LayoutStride, exec_space >::HostMirror h_src = Kokkos::create_mirror_view( src );
+    Kokkos::View<double*, Kokkos::LayoutStride, exec_space>::HostMirror h_src =
+        Kokkos::create_mirror_view(src);
 
-    for(size_t i=0; i<src.span(); i++) h_src.data()[i] = (double)rand() / RAND_MAX * (100);
+    for (size_t i = 0; i < src.span(); i++)
+      h_src.data()[i] = (double)rand() / RAND_MAX * (100);
 
-    Kokkos::deep_copy( src, h_src );
+    Kokkos::deep_copy(src, h_src);
+
+    Kokkos::View<double*, Kokkos::LayoutLeft, exec_space> dst;
 
-    Kokkos::View< double*, Kokkos::LayoutLeft, exec_space > dst;
-    
     dst = src;
 
-    Kokkos::View< double*, Kokkos::LayoutLeft, exec_space >::HostMirror h_dst = Kokkos::create_mirror_view( dst );
+    Kokkos::View<double*, Kokkos::LayoutLeft, exec_space>::HostMirror h_dst =
+        Kokkos::create_mirror_view(dst);
 
-    Kokkos::deep_copy( h_dst, dst );
+    Kokkos::deep_copy(h_dst, dst);
 
     bool test = true;
-    for(size_t i=0; i<src.span();i++){
-      if (h_src.data()[i]!=h_dst.data()[i]) {test = false;break;}
+    for (size_t i = 0; i < src.span(); i++) {
+      if (h_src.data()[i] != h_dst.data()[i]) {
+        test = false;
+        break;
+      }
     }
-    ASSERT_EQ( dst.span(), src.span() );
-    ASSERT_EQ( test, true );
+    ASSERT_EQ(dst.span(), src.span());
+    ASSERT_EQ(test, true);
   }
-  { // Assignment of rank-2 LayoutLeft = LayoutStride (LayoutRight compatible)
-    int ndims = 2;
-    int dims [] = {10,9};
-    int order [] = {1,0};
-    Kokkos::LayoutStride layout = Kokkos::LayoutStride::order_dimensions(ndims, order, dims);
-    Kokkos::View< double**, Kokkos::LayoutStride, exec_space > src("LayoutStride", layout);
+  {  // Assignment of rank-2 LayoutLeft = LayoutStride (LayoutRight compatible)
+    int ndims   = 2;
+    int dims[]  = {10, 9};
+    int order[] = {1, 0};
+    Kokkos::LayoutStride layout =
+        Kokkos::LayoutStride::order_dimensions(ndims, order, dims);
+    Kokkos::View<double**, Kokkos::LayoutStride, exec_space> src("LayoutStride",
+                                                                 layout);
 
-    Kokkos::View< double**, Kokkos::LayoutLeft, exec_space > dst;
+    Kokkos::View<double**, Kokkos::LayoutLeft, exec_space> dst;
 
     ::testing::FLAGS_gtest_death_test_style = "threadsafe";
-    ASSERT_DEATH({dst=src;}, "View assignment must have compatible layouts");
+    ASSERT_DEATH({ dst = src; },
+                 "View assignment must have compatible layouts");
   }
-  { // Assignment of rank-3 LayoutLeft = LayoutStride (LayoutRight compatible)
-    int ndims = 3;
-    int dims [] = {10,9,8};
-    int order [] = {2,1,0};
-    Kokkos::LayoutStride layout = Kokkos::LayoutStride::order_dimensions(ndims, order, dims);
-    Kokkos::View< double***, Kokkos::LayoutStride, exec_space > src("LayoutStride", layout);
-	
-    Kokkos::View< double***, Kokkos::LayoutLeft, exec_space > dst;
+  {  // Assignment of rank-3 LayoutLeft = LayoutStride (LayoutRight compatible)
+    int ndims   = 3;
+    int dims[]  = {10, 9, 8};
+    int order[] = {2, 1, 0};
+    Kokkos::LayoutStride layout =
+        Kokkos::LayoutStride::order_dimensions(ndims, order, dims);
+    Kokkos::View<double***, Kokkos::LayoutStride, exec_space> src(
+        "LayoutStride", layout);
+
+    Kokkos::View<double***, Kokkos::LayoutLeft, exec_space> dst;
 
     ::testing::FLAGS_gtest_death_test_style = "threadsafe";
-    ASSERT_DEATH({dst=src;}, "View assignment must have compatible layouts");
+    ASSERT_DEATH({ dst = src; },
+                 "View assignment must have compatible layouts");
   }
-  { // Assignment of rank-4 LayoutLeft = LayoutStride (LayoutRight compatible)
-    int ndims = 4;
-    int dims [] = {10,9,8,7};
-    int order [] = {3,2,1,0};
-    Kokkos::LayoutStride layout = Kokkos::LayoutStride::order_dimensions(ndims, order, dims);
-    Kokkos::View< double****, Kokkos::LayoutStride, exec_space > src("LayoutStride", layout);
+  {  // Assignment of rank-4 LayoutLeft = LayoutStride (LayoutRight compatible)
+    int ndims   = 4;
+    int dims[]  = {10, 9, 8, 7};
+    int order[] = {3, 2, 1, 0};
+    Kokkos::LayoutStride layout =
+        Kokkos::LayoutStride::order_dimensions(ndims, order, dims);
+    Kokkos::View<double****, Kokkos::LayoutStride, exec_space> src(
+        "LayoutStride", layout);
 
-    Kokkos::View< double****, Kokkos::LayoutLeft, exec_space > dst;
+    Kokkos::View<double****, Kokkos::LayoutLeft, exec_space> dst;
 
     ::testing::FLAGS_gtest_death_test_style = "threadsafe";
-    ASSERT_DEATH({dst=src;}, "View assignment must have compatible layouts");
+    ASSERT_DEATH({ dst = src; },
+                 "View assignment must have compatible layouts");
   }
-  { // Assignment of rank-5 LayoutLeft = LayoutStride (LayoutRight compatible)
-    int ndims = 5;
-    int dims [] = {10,9,8,7,6};
-    int order [] = {4,3,2,1,0};
-    Kokkos::LayoutStride layout = Kokkos::LayoutStride::order_dimensions(ndims, order, dims);
-    Kokkos::View< double*****, Kokkos::LayoutStride, exec_space > src("LayoutStride", layout);
-	
-    Kokkos::View< double*****, Kokkos::LayoutLeft, exec_space > dst;
+  {  // Assignment of rank-5 LayoutLeft = LayoutStride (LayoutRight compatible)
+    int ndims   = 5;
+    int dims[]  = {10, 9, 8, 7, 6};
+    int order[] = {4, 3, 2, 1, 0};
+    Kokkos::LayoutStride layout =
+        Kokkos::LayoutStride::order_dimensions(ndims, order, dims);
+    Kokkos::View<double*****, Kokkos::LayoutStride, exec_space> src(
+        "LayoutStride", layout);
+
+    Kokkos::View<double*****, Kokkos::LayoutLeft, exec_space> dst;
 
     ::testing::FLAGS_gtest_death_test_style = "threadsafe";
-    ASSERT_DEATH({dst=src;}, "View assignment must have compatible layouts");
+    ASSERT_DEATH({ dst = src; },
+                 "View assignment must have compatible layouts");
   }
-  { // Assignment of rank-6 LayoutLeft = LayoutStride (LayoutRight compatible)
-    int ndims = 6;
-    int dims [] = {10,9,8,7,6,5};
-    int order [] = {5,4,3,2,1,0};
-    Kokkos::LayoutStride layout = Kokkos::LayoutStride::order_dimensions(ndims, order, dims);
-    Kokkos::View< double******, Kokkos::LayoutStride, exec_space > src("LayoutStride", layout);
-	
-    Kokkos::View< double******, Kokkos::LayoutLeft, exec_space > dst;
+  {  // Assignment of rank-6 LayoutLeft = LayoutStride (LayoutRight compatible)
+    int ndims   = 6;
+    int dims[]  = {10, 9, 8, 7, 6, 5};
+    int order[] = {5, 4, 3, 2, 1, 0};
+    Kokkos::LayoutStride layout =
+        Kokkos::LayoutStride::order_dimensions(ndims, order, dims);
+    Kokkos::View<double******, Kokkos::LayoutStride, exec_space> src(
+        "LayoutStride", layout);
+
+    Kokkos::View<double******, Kokkos::LayoutLeft, exec_space> dst;
 
     ::testing::FLAGS_gtest_death_test_style = "threadsafe";
-    ASSERT_DEATH({dst=src;}, "View assignment must have compatible layouts");
+    ASSERT_DEATH({ dst = src; },
+                 "View assignment must have compatible layouts");
   }
-  { // Assignment of rank-7 LayoutLeft = LayoutStride (LayoutRight compatible)
-    int ndims = 7;
-    int dims [] = {10,9,8,7,6,5,4};
-    int order [] = {6,5,4,3,2,1,0};
-    Kokkos::LayoutStride layout = Kokkos::LayoutStride::order_dimensions(ndims, order, dims);
-    Kokkos::View< double*******, Kokkos::LayoutStride, exec_space > src("LayoutStride", layout);
+  {  // Assignment of rank-7 LayoutLeft = LayoutStride (LayoutRight compatible)
+    int ndims   = 7;
+    int dims[]  = {10, 9, 8, 7, 6, 5, 4};
+    int order[] = {6, 5, 4, 3, 2, 1, 0};
+    Kokkos::LayoutStride layout =
+        Kokkos::LayoutStride::order_dimensions(ndims, order, dims);
+    Kokkos::View<double*******, Kokkos::LayoutStride, exec_space> src(
+        "LayoutStride", layout);
 
-    Kokkos::View< double*******, Kokkos::LayoutLeft, exec_space > dst;
+    Kokkos::View<double*******, Kokkos::LayoutLeft, exec_space> dst;
 
     ::testing::FLAGS_gtest_death_test_style = "threadsafe";
-    ASSERT_DEATH({dst=src;}, "View assignment must have compatible layouts");
+    ASSERT_DEATH({ dst = src; },
+                 "View assignment must have compatible layouts");
   }
-  { // Assignment of rank-8 LayoutLeft = LayoutStride (LayoutRight compatible)
-    int ndims = 8;
-    int dims [] = {10,9,8,7,6,5,4,3};
-    int order [] = {7,6,5,4,3,2,1,0};
-    Kokkos::LayoutStride layout = Kokkos::LayoutStride::order_dimensions(ndims, order, dims);
-    Kokkos::View< double********, Kokkos::LayoutStride, exec_space > src("LayoutStride", layout);
+  {  // Assignment of rank-8 LayoutLeft = LayoutStride (LayoutRight compatible)
+    int ndims   = 8;
+    int dims[]  = {10, 9, 8, 7, 6, 5, 4, 3};
+    int order[] = {7, 6, 5, 4, 3, 2, 1, 0};
+    Kokkos::LayoutStride layout =
+        Kokkos::LayoutStride::order_dimensions(ndims, order, dims);
+    Kokkos::View<double********, Kokkos::LayoutStride, exec_space> src(
+        "LayoutStride", layout);
 
-    Kokkos::View< double********, Kokkos::LayoutLeft, exec_space > dst;
+    Kokkos::View<double********, Kokkos::LayoutLeft, exec_space> dst;
 
     ::testing::FLAGS_gtest_death_test_style = "threadsafe";
-    ASSERT_DEATH({dst=src;}, "View assignment must have compatible layouts");
+    ASSERT_DEATH({ dst = src; },
+                 "View assignment must have compatible layouts");
   }
-
 }
 
-TEST_F( TEST_CATEGORY , view_layoutstride_left_to_layoutright_assignment )
-{
-  typedef TEST_EXECSPACE exec_space ;
+TEST(TEST_CATEGORY_DEATH, view_layoutstride_left_to_layoutright_assignment) {
+  typedef TEST_EXECSPACE exec_space;
 
   auto t = time(0);
-  srand(t);// Use current time as seed for random generator
-  printf("view_layoutstride_left_to_layoutright_assignment: srand(%lu)\n",size_t(t));
+  srand(t);  // Use current time as seed for random generator
+  printf("view_layoutstride_left_to_layoutright_assignment: srand(%lu)\n",
+         size_t(t));
 
-  { // Assignment of rank-1 LayoutRight = LayoutStride (LayoutLeft compatible)
-    int ndims = 1;
-    int dims [] = {10};
-    int order [] = {0};
-    Kokkos::LayoutStride layout = Kokkos::LayoutStride::order_dimensions(ndims, order, dims);
-    Kokkos::View< double*, Kokkos::LayoutStride, exec_space > src("LayoutStride", layout);
+  {  // Assignment of rank-1 LayoutRight = LayoutStride (LayoutLeft compatible)
+    int ndims   = 1;
+    int dims[]  = {10};
+    int order[] = {0};
+    Kokkos::LayoutStride layout =
+        Kokkos::LayoutStride::order_dimensions(ndims, order, dims);
+    Kokkos::View<double*, Kokkos::LayoutStride, exec_space> src("LayoutStride",
+                                                                layout);
 
-    Kokkos::View< double*, Kokkos::LayoutStride, exec_space >::HostMirror h_src = Kokkos::create_mirror_view( src );
+    Kokkos::View<double*, Kokkos::LayoutStride, exec_space>::HostMirror h_src =
+        Kokkos::create_mirror_view(src);
 
-    for(size_t i=0; i<src.span(); i++) h_src.data()[i] = (double)rand() / RAND_MAX * (100);
+    for (size_t i = 0; i < src.span(); i++)
+      h_src.data()[i] = (double)rand() / RAND_MAX * (100);
 
-    Kokkos::deep_copy( src, h_src );
+    Kokkos::deep_copy(src, h_src);
+
+    Kokkos::View<double*, Kokkos::LayoutRight, exec_space> dst;
 
-    Kokkos::View< double*, Kokkos::LayoutRight, exec_space > dst;
-    
     dst = src;
 
-    Kokkos::View< double*, Kokkos::LayoutRight, exec_space >::HostMirror h_dst = Kokkos::create_mirror_view( dst );
+    Kokkos::View<double*, Kokkos::LayoutRight, exec_space>::HostMirror h_dst =
+        Kokkos::create_mirror_view(dst);
 
-    Kokkos::deep_copy( h_dst, dst );
+    Kokkos::deep_copy(h_dst, dst);
 
     bool test = true;
-    for(size_t i=0; i<src.span();i++){
-      if (h_src.data()[i]!=h_dst.data()[i]) {test = false;break;}
+    for (size_t i = 0; i < src.span(); i++) {
+      if (h_src.data()[i] != h_dst.data()[i]) {
+        test = false;
+        break;
+      }
     }
-    ASSERT_EQ( dst.span(), src.span() );
-    ASSERT_EQ( test, true );
+    ASSERT_EQ(dst.span(), src.span());
+    ASSERT_EQ(test, true);
   }
-  { // Assignment of rank-2 LayoutRight = LayoutStride (LayoutLeft compatible)
-    int ndims = 2;
-    int dims [] = {10,9};
-    int order [] = {0,1};
-    Kokkos::LayoutStride layout = Kokkos::LayoutStride::order_dimensions(ndims, order, dims);
-    Kokkos::View< double**, Kokkos::LayoutStride, exec_space > src("LayoutStride", layout);
+  {  // Assignment of rank-2 LayoutRight = LayoutStride (LayoutLeft compatible)
+    int ndims   = 2;
+    int dims[]  = {10, 9};
+    int order[] = {0, 1};
+    Kokkos::LayoutStride layout =
+        Kokkos::LayoutStride::order_dimensions(ndims, order, dims);
+    Kokkos::View<double**, Kokkos::LayoutStride, exec_space> src("LayoutStride",
+                                                                 layout);
 
-    Kokkos::View< double**, Kokkos::LayoutRight, exec_space > dst;
+    Kokkos::View<double**, Kokkos::LayoutRight, exec_space> dst;
 
     ::testing::FLAGS_gtest_death_test_style = "threadsafe";
-    ASSERT_DEATH({dst=src;}, "View assignment must have compatible layouts");
+    ASSERT_DEATH({ dst = src; },
+                 "View assignment must have compatible layouts");
   }
-  { // Assignment of rank-3 LayoutRight = LayoutStride (LayoutLeft compatible)
-    int ndims = 3;
-    int dims [] = {10,9,8};
-    int order [] = {0,1,2};
-    Kokkos::LayoutStride layout = Kokkos::LayoutStride::order_dimensions(ndims, order, dims);
-    Kokkos::View< double***, Kokkos::LayoutStride, exec_space > src("LayoutStride", layout);
-	
-    Kokkos::View< double***, Kokkos::LayoutRight, exec_space > dst;
+  {  // Assignment of rank-3 LayoutRight = LayoutStride (LayoutLeft compatible)
+    int ndims   = 3;
+    int dims[]  = {10, 9, 8};
+    int order[] = {0, 1, 2};
+    Kokkos::LayoutStride layout =
+        Kokkos::LayoutStride::order_dimensions(ndims, order, dims);
+    Kokkos::View<double***, Kokkos::LayoutStride, exec_space> src(
+        "LayoutStride", layout);
+
+    Kokkos::View<double***, Kokkos::LayoutRight, exec_space> dst;
 
     ::testing::FLAGS_gtest_death_test_style = "threadsafe";
-    ASSERT_DEATH({dst=src;}, "View assignment must have compatible layouts");
+    ASSERT_DEATH({ dst = src; },
+                 "View assignment must have compatible layouts");
   }
-  { // Assignment of rank-4 LayoutRight = LayoutStride (LayoutLeft compatible)
-    int ndims = 4;
-    int dims [] = {10,9,8,7};
-    int order [] = {0,1,2,3};
-    Kokkos::LayoutStride layout = Kokkos::LayoutStride::order_dimensions(ndims, order, dims);
-    Kokkos::View< double****, Kokkos::LayoutStride, exec_space > src("LayoutStride", layout);
+  {  // Assignment of rank-4 LayoutRight = LayoutStride (LayoutLeft compatible)
+    int ndims   = 4;
+    int dims[]  = {10, 9, 8, 7};
+    int order[] = {0, 1, 2, 3};
+    Kokkos::LayoutStride layout =
+        Kokkos::LayoutStride::order_dimensions(ndims, order, dims);
+    Kokkos::View<double****, Kokkos::LayoutStride, exec_space> src(
+        "LayoutStride", layout);
 
-    Kokkos::View< double****, Kokkos::LayoutRight, exec_space > dst;
+    Kokkos::View<double****, Kokkos::LayoutRight, exec_space> dst;
 
     ::testing::FLAGS_gtest_death_test_style = "threadsafe";
-    ASSERT_DEATH({dst=src;}, "View assignment must have compatible layouts");
+    ASSERT_DEATH({ dst = src; },
+                 "View assignment must have compatible layouts");
   }
-  { // Assignment of rank-5 LayoutRight = LayoutStride (LayoutLeft compatible)
-    int ndims = 5;
-    int dims [] = {10,9,8,7,6};
-    int order [] = {0,1,2,3,4};
-    Kokkos::LayoutStride layout = Kokkos::LayoutStride::order_dimensions(ndims, order, dims);
-    Kokkos::View< double*****, Kokkos::LayoutStride, exec_space > src("LayoutStride", layout);
-	
-    Kokkos::View< double*****, Kokkos::LayoutRight, exec_space > dst;
+  {  // Assignment of rank-5 LayoutRight = LayoutStride (LayoutLeft compatible)
+    int ndims   = 5;
+    int dims[]  = {10, 9, 8, 7, 6};
+    int order[] = {0, 1, 2, 3, 4};
+    Kokkos::LayoutStride layout =
+        Kokkos::LayoutStride::order_dimensions(ndims, order, dims);
+    Kokkos::View<double*****, Kokkos::LayoutStride, exec_space> src(
+        "LayoutStride", layout);
+
+    Kokkos::View<double*****, Kokkos::LayoutRight, exec_space> dst;
 
     ::testing::FLAGS_gtest_death_test_style = "threadsafe";
-    ASSERT_DEATH({dst=src;}, "View assignment must have compatible layouts");
+    ASSERT_DEATH({ dst = src; },
+                 "View assignment must have compatible layouts");
   }
-  { // Assignment of rank-6 LayoutRight = LayoutStride (LayoutLeft compatible)
-    int ndims = 6;
-    int dims [] = {10,9,8,7,6,5};
-    int order [] = {0,1,2,3,4,5};
-    Kokkos::LayoutStride layout = Kokkos::LayoutStride::order_dimensions(ndims, order, dims);
-    Kokkos::View< double******, Kokkos::LayoutStride, exec_space > src("LayoutStride", layout);
-	
-    Kokkos::View< double******, Kokkos::LayoutRight, exec_space > dst;
+  {  // Assignment of rank-6 LayoutRight = LayoutStride (LayoutLeft compatible)
+    int ndims   = 6;
+    int dims[]  = {10, 9, 8, 7, 6, 5};
+    int order[] = {0, 1, 2, 3, 4, 5};
+    Kokkos::LayoutStride layout =
+        Kokkos::LayoutStride::order_dimensions(ndims, order, dims);
+    Kokkos::View<double******, Kokkos::LayoutStride, exec_space> src(
+        "LayoutStride", layout);
+
+    Kokkos::View<double******, Kokkos::LayoutRight, exec_space> dst;
 
     ::testing::FLAGS_gtest_death_test_style = "threadsafe";
-    ASSERT_DEATH({dst=src;}, "View assignment must have compatible layouts");
+    ASSERT_DEATH({ dst = src; },
+                 "View assignment must have compatible layouts");
   }
-  { // Assignment of rank-7 LayoutRight = LayoutStride (LayoutLeft compatible)
-    int ndims = 7;
-    int dims [] = {10,9,8,7,6,5,4};
-    int order [] = {0,1,2,3,4,5,6};
-    Kokkos::LayoutStride layout = Kokkos::LayoutStride::order_dimensions(ndims, order, dims);
-    Kokkos::View< double*******, Kokkos::LayoutStride, exec_space > src("LayoutStride", layout);
+  {  // Assignment of rank-7 LayoutRight = LayoutStride (LayoutLeft compatible)
+    int ndims   = 7;
+    int dims[]  = {10, 9, 8, 7, 6, 5, 4};
+    int order[] = {0, 1, 2, 3, 4, 5, 6};
+    Kokkos::LayoutStride layout =
+        Kokkos::LayoutStride::order_dimensions(ndims, order, dims);
+    Kokkos::View<double*******, Kokkos::LayoutStride, exec_space> src(
+        "LayoutStride", layout);
 
-    Kokkos::View< double*******, Kokkos::LayoutRight, exec_space > dst;
+    Kokkos::View<double*******, Kokkos::LayoutRight, exec_space> dst;
 
     ::testing::FLAGS_gtest_death_test_style = "threadsafe";
-    ASSERT_DEATH({dst=src;}, "View assignment must have compatible layouts");
+    ASSERT_DEATH({ dst = src; },
+                 "View assignment must have compatible layouts");
   }
-  { // Assignment of rank-8 LayoutRight = LayoutStride (LayoutLeft compatible)
-    int ndims = 8;
-    int dims [] = {10,9,8,7,6,5,4,3};
-    int order [] = {0,1,2,3,4,5,6,7};
-    Kokkos::LayoutStride layout = Kokkos::LayoutStride::order_dimensions(ndims, order, dims);
-    Kokkos::View< double********, Kokkos::LayoutStride, exec_space > src("LayoutStride", layout);
+  {  // Assignment of rank-8 LayoutRight = LayoutStride (LayoutLeft compatible)
+    int ndims   = 8;
+    int dims[]  = {10, 9, 8, 7, 6, 5, 4, 3};
+    int order[] = {0, 1, 2, 3, 4, 5, 6, 7};
+    Kokkos::LayoutStride layout =
+        Kokkos::LayoutStride::order_dimensions(ndims, order, dims);
+    Kokkos::View<double********, Kokkos::LayoutStride, exec_space> src(
+        "LayoutStride", layout);
 
-    Kokkos::View< double********, Kokkos::LayoutRight, exec_space > dst;
+    Kokkos::View<double********, Kokkos::LayoutRight, exec_space> dst;
 
     ::testing::FLAGS_gtest_death_test_style = "threadsafe";
-    ASSERT_DEATH({dst=src;}, "View assignment must have compatible layouts");
+    ASSERT_DEATH({ dst = src; },
+                 "View assignment must have compatible layouts");
   }
-
-}
-
 }
 
+}  // namespace Test
diff --git a/lib/kokkos/core/unit_test/TestViewLayoutTiled.hpp b/lib/kokkos/core/unit_test/TestViewLayoutTiled.hpp
index e765e8b06d..2526a3e7e3 100644
--- a/lib/kokkos/core/unit_test/TestViewLayoutTiled.hpp
+++ b/lib/kokkos/core/unit_test/TestViewLayoutTiled.hpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -56,9 +57,8 @@ namespace Test {
 #ifndef KOKKOS_ENABLE_DEPRECATED_CODE
 namespace {
 
-template <typename ExecSpace >
+template <typename ExecSpace>
 struct TestViewLayoutTiled {
-
   typedef double Scalar;
 
   static constexpr int T0 = 2;
@@ -71,939 +71,1372 @@ struct TestViewLayoutTiled {
   static constexpr int T7 = 2;
 
   // Rank 2
-  typedef Kokkos::Experimental::LayoutTiled<Kokkos::Iterate::Left, Kokkos::Iterate::Left, T0, T1>   LayoutLL_2D_2x4;
-  typedef Kokkos::Experimental::LayoutTiled<Kokkos::Iterate::Right, Kokkos::Iterate::Left, T0, T1>  LayoutRL_2D_2x4;
-  typedef Kokkos::Experimental::LayoutTiled<Kokkos::Iterate::Left, Kokkos::Iterate::Right, T0, T1>  LayoutLR_2D_2x4;
-  typedef Kokkos::Experimental::LayoutTiled<Kokkos::Iterate::Right, Kokkos::Iterate::Right, T0, T1> LayoutRR_2D_2x4;
+  typedef Kokkos::Experimental::LayoutTiled<Kokkos::Iterate::Left,
+                                            Kokkos::Iterate::Left, T0, T1>
+      LayoutLL_2D_2x4;
+  typedef Kokkos::Experimental::LayoutTiled<Kokkos::Iterate::Right,
+                                            Kokkos::Iterate::Left, T0, T1>
+      LayoutRL_2D_2x4;
+  typedef Kokkos::Experimental::LayoutTiled<Kokkos::Iterate::Left,
+                                            Kokkos::Iterate::Right, T0, T1>
+      LayoutLR_2D_2x4;
+  typedef Kokkos::Experimental::LayoutTiled<Kokkos::Iterate::Right,
+                                            Kokkos::Iterate::Right, T0, T1>
+      LayoutRR_2D_2x4;
 
   // Rank 3
-  typedef Kokkos::Experimental::LayoutTiled<Kokkos::Iterate::Left, Kokkos::Iterate::Left, T0, T1, T2>   LayoutLL_3D_2x4x4;
-  typedef Kokkos::Experimental::LayoutTiled<Kokkos::Iterate::Right, Kokkos::Iterate::Left, T0, T1, T2>  LayoutRL_3D_2x4x4;
-  typedef Kokkos::Experimental::LayoutTiled<Kokkos::Iterate::Left, Kokkos::Iterate::Right, T0, T1, T2>  LayoutLR_3D_2x4x4;
-  typedef Kokkos::Experimental::LayoutTiled<Kokkos::Iterate::Right, Kokkos::Iterate::Right, T0, T1, T2> LayoutRR_3D_2x4x4;
+  typedef Kokkos::Experimental::LayoutTiled<Kokkos::Iterate::Left,
+                                            Kokkos::Iterate::Left, T0, T1, T2>
+      LayoutLL_3D_2x4x4;
+  typedef Kokkos::Experimental::LayoutTiled<Kokkos::Iterate::Right,
+                                            Kokkos::Iterate::Left, T0, T1, T2>
+      LayoutRL_3D_2x4x4;
+  typedef Kokkos::Experimental::LayoutTiled<Kokkos::Iterate::Left,
+                                            Kokkos::Iterate::Right, T0, T1, T2>
+      LayoutLR_3D_2x4x4;
+  typedef Kokkos::Experimental::LayoutTiled<Kokkos::Iterate::Right,
+                                            Kokkos::Iterate::Right, T0, T1, T2>
+      LayoutRR_3D_2x4x4;
 
   // Rank 4
-  typedef Kokkos::Experimental::LayoutTiled<Kokkos::Iterate::Left, Kokkos::Iterate::Left, T0, T1, T2, T3>   LayoutLL_4D_2x4x4x2;
-  typedef Kokkos::Experimental::LayoutTiled<Kokkos::Iterate::Right, Kokkos::Iterate::Left, T0, T1, T2, T3>  LayoutRL_4D_2x4x4x2;
-  typedef Kokkos::Experimental::LayoutTiled<Kokkos::Iterate::Left, Kokkos::Iterate::Right, T0, T1, T2, T3>  LayoutLR_4D_2x4x4x2;
-  typedef Kokkos::Experimental::LayoutTiled<Kokkos::Iterate::Right, Kokkos::Iterate::Right, T0, T1, T2, T3> LayoutRR_4D_2x4x4x2;
+  typedef Kokkos::Experimental::LayoutTiled<
+      Kokkos::Iterate::Left, Kokkos::Iterate::Left, T0, T1, T2, T3>
+      LayoutLL_4D_2x4x4x2;
+  typedef Kokkos::Experimental::LayoutTiled<
+      Kokkos::Iterate::Right, Kokkos::Iterate::Left, T0, T1, T2, T3>
+      LayoutRL_4D_2x4x4x2;
+  typedef Kokkos::Experimental::LayoutTiled<
+      Kokkos::Iterate::Left, Kokkos::Iterate::Right, T0, T1, T2, T3>
+      LayoutLR_4D_2x4x4x2;
+  typedef Kokkos::Experimental::LayoutTiled<
+      Kokkos::Iterate::Right, Kokkos::Iterate::Right, T0, T1, T2, T3>
+      LayoutRR_4D_2x4x4x2;
 
+  static void test_view_layout_tiled_2d(const int N0, const int N1) {
+#if defined(KOKKOS_ENABLE_CXX11_DISPATCH_LAMBDA)
+#if !defined(KOKKOS_ENABLE_CUDA) || (8000 <= CUDA_VERSION)
+    const int FT = T0 * T1;
 
-  static void test_view_layout_tiled_2d( const int N0, const int N1 )
-  {
-#if defined( KOKKOS_ENABLE_CXX11_DISPATCH_LAMBDA )
-#if !defined(KOKKOS_ENABLE_CUDA) || ( 8000 <= CUDA_VERSION )
-    const int FT = T0*T1;
-
-    const int NT0 = int( std::ceil( N0 / T0 ) );
-    const int NT1 = int( std::ceil( N1 / T1 ) );
+    const int NT0 = int(std::ceil(N0 / T0));
+    const int NT1 = int(std::ceil(N1 / T1));
     // Test create_mirror_view, deep_copy
     // Create LL View
     {
-      typedef typename Kokkos::View< Scalar**, LayoutLL_2D_2x4, ExecSpace > ViewType;
+      typedef typename Kokkos::View<Scalar**, LayoutLL_2D_2x4, ExecSpace>
+          ViewType;
       ViewType v("v", N0, N1);
 
       typename ViewType::HostMirror hv = Kokkos::create_mirror_view(v);
 
       // Initialize host-view
-      for ( int tj = 0; tj < NT1; ++tj ) {
-      for ( int ti = 0; ti < NT0; ++ti ) {
-        for ( int j = 0; j < T1; ++j ) {
-        for ( int i = 0; i < T0; ++i ) {
-          hv(ti*T0 + i, tj*T1+j) = ( ti + tj*NT0 )*FT + ( i + j*T0 );
-        } }
-      } }
+      for (int tj = 0; tj < NT1; ++tj) {
+        for (int ti = 0; ti < NT0; ++ti) {
+          for (int j = 0; j < T1; ++j) {
+            for (int i = 0; i < T0; ++i) {
+              hv(ti * T0 + i, tj * T1 + j) =
+                  (ti + tj * NT0) * FT + (i + j * T0);
+            }
+          }
+        }
+      }
 
       // copy to device
       Kokkos::deep_copy(v, hv);
 
-      Kokkos::MDRangePolicy< Kokkos::Rank<2, Kokkos::Iterate::Left, Kokkos::Iterate::Left>, ExecSpace > mdrangepolicy( {0,0}, {NT0, NT1}, {T0,T1} );
+      Kokkos::MDRangePolicy<
+          Kokkos::Rank<2, Kokkos::Iterate::Left, Kokkos::Iterate::Left>,
+          ExecSpace>
+          mdrangepolicy({0, 0}, {NT0, NT1}, {T0, T1});
 
       // iterate by tile
-      Kokkos::parallel_for( "ViewTile rank 2 LL", mdrangepolicy, 
-        KOKKOS_LAMBDA (const int ti, const int tj) {
-          for ( int j = 0; j < T1; ++j ) {
-          for ( int i = 0; i < T0; ++i ) {
-            if ( (ti*T0 + i < N0) && (tj*T1 + j < N1) ) { v(ti*T0 + i, tj*T1+j) += 1; }
-          } }
-        });
+      Kokkos::parallel_for(
+          "ViewTile rank 2 LL", mdrangepolicy,
+          KOKKOS_LAMBDA(const int ti, const int tj) {
+            for (int j = 0; j < T1; ++j) {
+              for (int i = 0; i < T0; ++i) {
+                if ((ti * T0 + i < N0) && (tj * T1 + j < N1)) {
+                  v(ti * T0 + i, tj * T1 + j) += 1;
+                }
+              }
+            }
+          });
 
       Kokkos::deep_copy(hv, v);
 
       long counter_subview = 0;
-      long counter_inc = 0;
-      for ( int tj = 0; tj < NT1; ++tj ) {
-      for ( int ti = 0; ti < NT0; ++ti ) {
-        auto tile_subview = Kokkos::tile_subview( hv, ti, tj );
-        for ( int j = 0; j < T1; ++j ) {
-        for ( int i = 0; i < T0; ++i ) {
-          if ( tile_subview(i,j) != hv(ti*T0+i, tj*T1+j) ) { ++counter_subview; }
-          if ( tile_subview(i,j) != (( ti + tj*NT0 )*FT + ( i + j*T0 ) + 1 )) { ++counter_inc; }
-        } }
-      } }
+      long counter_inc     = 0;
+      for (int tj = 0; tj < NT1; ++tj) {
+        for (int ti = 0; ti < NT0; ++ti) {
+          auto tile_subview = Kokkos::tile_subview(hv, ti, tj);
+          for (int j = 0; j < T1; ++j) {
+            for (int i = 0; i < T0; ++i) {
+              if (tile_subview(i, j) != hv(ti * T0 + i, tj * T1 + j)) {
+                ++counter_subview;
+              }
+              if (tile_subview(i, j) !=
+                  ((ti + tj * NT0) * FT + (i + j * T0) + 1)) {
+                ++counter_inc;
+              }
+            }
+          }
+        }
+      }
       ASSERT_EQ(counter_subview, long(0));
       ASSERT_EQ(counter_inc, long(0));
     }
 
     // Create RL View
     {
-      typedef typename Kokkos::View< Scalar**, LayoutRL_2D_2x4, ExecSpace > ViewType;
-      Kokkos::View< Scalar**, LayoutRL_2D_2x4, ExecSpace > v("v", N0, N1);
+      typedef typename Kokkos::View<Scalar**, LayoutRL_2D_2x4, ExecSpace>
+          ViewType;
+      Kokkos::View<Scalar**, LayoutRL_2D_2x4, ExecSpace> v("v", N0, N1);
 
       typename ViewType::HostMirror hv = Kokkos::create_mirror_view(v);
 
       // Initialize host-view
-      for ( int ti = 0; ti < NT0; ++ti ) {
-      for ( int tj = 0; tj < NT1; ++tj ) {
-        for ( int j = 0; j < T1; ++j ) {
-        for ( int i = 0; i < T0; ++i ) {
-          hv(ti*T0 + i, tj*T1+j) = ( ti*NT1 + tj )*FT + ( i + j*T0 );
-        } }
-      } }
+      for (int ti = 0; ti < NT0; ++ti) {
+        for (int tj = 0; tj < NT1; ++tj) {
+          for (int j = 0; j < T1; ++j) {
+            for (int i = 0; i < T0; ++i) {
+              hv(ti * T0 + i, tj * T1 + j) =
+                  (ti * NT1 + tj) * FT + (i + j * T0);
+            }
+          }
+        }
+      }
 
       // copy to device
       Kokkos::deep_copy(v, hv);
 
-      Kokkos::MDRangePolicy< Kokkos::Rank<2, Kokkos::Iterate::Right, Kokkos::Iterate::Left>, ExecSpace > mdrangepolicy( {0,0}, {NT0, NT1}, {T0,T1} );
+      Kokkos::MDRangePolicy<
+          Kokkos::Rank<2, Kokkos::Iterate::Right, Kokkos::Iterate::Left>,
+          ExecSpace>
+          mdrangepolicy({0, 0}, {NT0, NT1}, {T0, T1});
 
       // iterate by tile
-      Kokkos::parallel_for( "ViewTile rank 2 RL", mdrangepolicy, 
-        KOKKOS_LAMBDA (const int ti, const int tj) {
-          for ( int j = 0; j < T1; ++j ) {
-          for ( int i = 0; i < T0; ++i ) {
-            if ( (ti*T0 + i < N0) && (tj*T1 + j < N1) ) { v(ti*T0 + i, tj*T1+j) += 1; }
-          } }
-        });
+      Kokkos::parallel_for(
+          "ViewTile rank 2 RL", mdrangepolicy,
+          KOKKOS_LAMBDA(const int ti, const int tj) {
+            for (int j = 0; j < T1; ++j) {
+              for (int i = 0; i < T0; ++i) {
+                if ((ti * T0 + i < N0) && (tj * T1 + j < N1)) {
+                  v(ti * T0 + i, tj * T1 + j) += 1;
+                }
+              }
+            }
+          });
 
       Kokkos::deep_copy(hv, v);
 
       long counter_subview = 0;
-      long counter_inc = 0;
+      long counter_inc     = 0;
 
-      for ( int ti = 0; ti < NT0; ++ti ) {
-      for ( int tj = 0; tj < NT1; ++tj ) {
-        auto tile_subview = Kokkos::tile_subview( hv, ti, tj );
-        for ( int j = 0; j < T1; ++j ) {
-        for ( int i = 0; i < T0; ++i ) {
-          if ( tile_subview(i,j) != hv(ti*T0+i, tj*T1+j) ) { ++counter_subview; }
-          if ( tile_subview(i,j) != (( ti*NT1 + tj )*FT + ( i + j*T0 ) + 1 )) { ++counter_inc; }
-        } }
-      } }
+      for (int ti = 0; ti < NT0; ++ti) {
+        for (int tj = 0; tj < NT1; ++tj) {
+          auto tile_subview = Kokkos::tile_subview(hv, ti, tj);
+          for (int j = 0; j < T1; ++j) {
+            for (int i = 0; i < T0; ++i) {
+              if (tile_subview(i, j) != hv(ti * T0 + i, tj * T1 + j)) {
+                ++counter_subview;
+              }
+              if (tile_subview(i, j) !=
+                  ((ti * NT1 + tj) * FT + (i + j * T0) + 1)) {
+                ++counter_inc;
+              }
+            }
+          }
+        }
+      }
       ASSERT_EQ(counter_subview, long(0));
       ASSERT_EQ(counter_inc, long(0));
-    } // end scope
+    }  // end scope
 
     // Create LR View
     {
-      typedef typename Kokkos::View< Scalar**, LayoutLR_2D_2x4, ExecSpace > ViewType;
-      Kokkos::View< Scalar**, LayoutLR_2D_2x4, ExecSpace > v("v", N0, N1);
+      typedef typename Kokkos::View<Scalar**, LayoutLR_2D_2x4, ExecSpace>
+          ViewType;
+      Kokkos::View<Scalar**, LayoutLR_2D_2x4, ExecSpace> v("v", N0, N1);
 
       typename ViewType::HostMirror hv = Kokkos::create_mirror_view(v);
 
       // Initialize host-view
-      for ( int tj = 0; tj < NT1; ++tj ) {
-      for ( int ti = 0; ti < NT0; ++ti ) {
-        for ( int i = 0; i < T0; ++i ) {
-        for ( int j = 0; j < T1; ++j ) {
-          hv(ti*T0 + i, tj*T1+j) = ( ti + tj*NT0 )*FT + ( i*T1 + j );
-        } }
-      } }
+      for (int tj = 0; tj < NT1; ++tj) {
+        for (int ti = 0; ti < NT0; ++ti) {
+          for (int i = 0; i < T0; ++i) {
+            for (int j = 0; j < T1; ++j) {
+              hv(ti * T0 + i, tj * T1 + j) =
+                  (ti + tj * NT0) * FT + (i * T1 + j);
+            }
+          }
+        }
+      }
 
       // copy to device
       Kokkos::deep_copy(v, hv);
 
-      Kokkos::MDRangePolicy< Kokkos::Rank<2, Kokkos::Iterate::Left, Kokkos::Iterate::Right>, ExecSpace > mdrangepolicy( {0,0}, {NT0, NT1}, {T0,T1} );
+      Kokkos::MDRangePolicy<
+          Kokkos::Rank<2, Kokkos::Iterate::Left, Kokkos::Iterate::Right>,
+          ExecSpace>
+          mdrangepolicy({0, 0}, {NT0, NT1}, {T0, T1});
 
       // iterate by tile
-      Kokkos::parallel_for( "ViewTile rank 2 LR", mdrangepolicy, 
-        KOKKOS_LAMBDA (const int ti, const int tj) {
-          for ( int j = 0; j < T1; ++j ) {
-          for ( int i = 0; i < T0; ++i ) {
-            if ( (ti*T0 + i < N0) && (tj*T1 + j < N1) ) { v(ti*T0 + i, tj*T1+j) += 1; }
-          } }
-        });
+      Kokkos::parallel_for(
+          "ViewTile rank 2 LR", mdrangepolicy,
+          KOKKOS_LAMBDA(const int ti, const int tj) {
+            for (int j = 0; j < T1; ++j) {
+              for (int i = 0; i < T0; ++i) {
+                if ((ti * T0 + i < N0) && (tj * T1 + j < N1)) {
+                  v(ti * T0 + i, tj * T1 + j) += 1;
+                }
+              }
+            }
+          });
 
       Kokkos::deep_copy(hv, v);
 
       long counter_subview = 0;
-      long counter_inc = 0;
+      long counter_inc     = 0;
 
-      for ( int tj = 0; tj < NT1; ++tj ) {
-      for ( int ti = 0; ti < NT0; ++ti ) {
-        auto tile_subview = Kokkos::tile_subview( hv, ti, tj );
-        for ( int i = 0; i < T0; ++i ) {
-        for ( int j = 0; j < T1; ++j ) {
-          if ( tile_subview(i,j) != hv(ti*T0+i, tj*T1+j) ) { ++counter_subview; }
-          if ( tile_subview(i,j) != ( ( ti + tj*NT0 )*FT + ( i*T1 + j ) + 1 ) ) { ++counter_inc; }
-        } }
-      } }
+      for (int tj = 0; tj < NT1; ++tj) {
+        for (int ti = 0; ti < NT0; ++ti) {
+          auto tile_subview = Kokkos::tile_subview(hv, ti, tj);
+          for (int i = 0; i < T0; ++i) {
+            for (int j = 0; j < T1; ++j) {
+              if (tile_subview(i, j) != hv(ti * T0 + i, tj * T1 + j)) {
+                ++counter_subview;
+              }
+              if (tile_subview(i, j) !=
+                  ((ti + tj * NT0) * FT + (i * T1 + j) + 1)) {
+                ++counter_inc;
+              }
+            }
+          }
+        }
+      }
       ASSERT_EQ(counter_subview, long(0));
       ASSERT_EQ(counter_inc, long(0));
-    } // end scope
+    }  // end scope
 
     // Create RR View
     {
-      typedef typename Kokkos::View< Scalar**, LayoutRR_2D_2x4, ExecSpace > ViewType;
-      Kokkos::View< Scalar**, LayoutRR_2D_2x4, ExecSpace > v("v", N0, N1);
+      typedef typename Kokkos::View<Scalar**, LayoutRR_2D_2x4, ExecSpace>
+          ViewType;
+      Kokkos::View<Scalar**, LayoutRR_2D_2x4, ExecSpace> v("v", N0, N1);
 
       typename ViewType::HostMirror hv = Kokkos::create_mirror_view(v);
 
       // Initialize host-view
-      for ( int ti = 0; ti < NT0; ++ti ) {
-      for ( int tj = 0; tj < NT1; ++tj ) {
-        for ( int i = 0; i < T0; ++i ) {
-        for ( int j = 0; j < T1; ++j ) {
-          hv(ti*T0 + i, tj*T1+j) = ( ti*NT1 + tj )*FT + ( i*T1 + j );
-        } }
-      } }
+      for (int ti = 0; ti < NT0; ++ti) {
+        for (int tj = 0; tj < NT1; ++tj) {
+          for (int i = 0; i < T0; ++i) {
+            for (int j = 0; j < T1; ++j) {
+              hv(ti * T0 + i, tj * T1 + j) =
+                  (ti * NT1 + tj) * FT + (i * T1 + j);
+            }
+          }
+        }
+      }
 
       // copy to device
       Kokkos::deep_copy(v, hv);
 
-      Kokkos::MDRangePolicy< Kokkos::Rank<2, Kokkos::Iterate::Left, Kokkos::Iterate::Right>, ExecSpace > mdrangepolicy( {0,0}, {NT0, NT1}, {T0,T1} );
+      Kokkos::MDRangePolicy<
+          Kokkos::Rank<2, Kokkos::Iterate::Left, Kokkos::Iterate::Right>,
+          ExecSpace>
+          mdrangepolicy({0, 0}, {NT0, NT1}, {T0, T1});
 
       // iterate by tile
-      Kokkos::parallel_for( "ViewTile rank 2 LR", mdrangepolicy, 
-        KOKKOS_LAMBDA (const int ti, const int tj) {
-          for ( int j = 0; j < T1; ++j ) {
-          for ( int i = 0; i < T0; ++i ) {
-            if ( (ti*T0 + i < N0) && (tj*T1 + j < N1) ) { v(ti*T0 + i, tj*T1+j) += 1; }
-          } }
-        });
+      Kokkos::parallel_for(
+          "ViewTile rank 2 LR", mdrangepolicy,
+          KOKKOS_LAMBDA(const int ti, const int tj) {
+            for (int j = 0; j < T1; ++j) {
+              for (int i = 0; i < T0; ++i) {
+                if ((ti * T0 + i < N0) && (tj * T1 + j < N1)) {
+                  v(ti * T0 + i, tj * T1 + j) += 1;
+                }
+              }
+            }
+          });
 
       Kokkos::deep_copy(hv, v);
 
       long counter_subview = 0;
-      long counter_inc = 0;
+      long counter_inc     = 0;
 
-      for ( int ti = 0; ti < NT0; ++ti ) {
-      for ( int tj = 0; tj < NT1; ++tj ) {
-        auto tile_subview = Kokkos::tile_subview( hv, ti, tj );
-        for ( int i = 0; i < T0; ++i ) {
-        for ( int j = 0; j < T1; ++j ) {
-          if ( tile_subview(i,j) != hv(ti*T0+i, tj*T1+j) ) { ++counter_subview; }
-          if ( tile_subview(i,j) != ( ( ti*NT1 + tj )*FT + ( i*T1 + j ) + 1 ) ) { ++counter_inc; }
-        } }
-      } }
+      for (int ti = 0; ti < NT0; ++ti) {
+        for (int tj = 0; tj < NT1; ++tj) {
+          auto tile_subview = Kokkos::tile_subview(hv, ti, tj);
+          for (int i = 0; i < T0; ++i) {
+            for (int j = 0; j < T1; ++j) {
+              if (tile_subview(i, j) != hv(ti * T0 + i, tj * T1 + j)) {
+                ++counter_subview;
+              }
+              if (tile_subview(i, j) !=
+                  ((ti * NT1 + tj) * FT + (i * T1 + j) + 1)) {
+                ++counter_inc;
+              }
+            }
+          }
+        }
+      }
       ASSERT_EQ(counter_subview, long(0));
       ASSERT_EQ(counter_inc, long(0));
-    } // end scope
+    }  // end scope
 #endif
 #endif
-  } // end test_view_layout_tiled_2d
+  }  // end test_view_layout_tiled_2d
 
+  static void test_view_layout_tiled_3d(const int N0, const int N1,
+                                        const int N2) {
+#if defined(KOKKOS_ENABLE_CXX11_DISPATCH_LAMBDA)
+#if !defined(KOKKOS_ENABLE_CUDA) || (8000 <= CUDA_VERSION)
 
-  static void test_view_layout_tiled_3d( const int N0, const int N1, const int N2 )
-  {
-#if defined( KOKKOS_ENABLE_CXX11_DISPATCH_LAMBDA )
-#if !defined(KOKKOS_ENABLE_CUDA) || ( 8000 <= CUDA_VERSION )
+    const int FT = T0 * T1 * T2;
 
-    const int FT = T0*T1*T2;
-
-    const int NT0 = int( std::ceil( N0 / T0 ) );
-    const int NT1 = int( std::ceil( N1 / T1 ) );
-    const int NT2 = int( std::ceil( N2 / T2 ) );
+    const int NT0 = int(std::ceil(N0 / T0));
+    const int NT1 = int(std::ceil(N1 / T1));
+    const int NT2 = int(std::ceil(N2 / T2));
 
     // Create LL View
     {
-      typedef Kokkos::View< Scalar***, LayoutLL_3D_2x4x4, ExecSpace > ViewType;
-      Kokkos::View< Scalar***, LayoutLL_3D_2x4x4, ExecSpace > dv("dv", N0, N1, N2);
+      typedef Kokkos::View<Scalar***, LayoutLL_3D_2x4x4, ExecSpace> ViewType;
+      Kokkos::View<Scalar***, LayoutLL_3D_2x4x4, ExecSpace> dv("dv", N0, N1,
+                                                               N2);
 
       typename ViewType::HostMirror v = Kokkos::create_mirror_view(dv);
 
       // Initialize on host
-      for ( int tk = 0; tk < NT2; ++tk ) {
-      for ( int tj = 0; tj < NT1; ++tj ) {
-      for ( int ti = 0; ti < NT0; ++ti ) {
-        for ( int k = 0; k < T2; ++k ) {
-        for ( int j = 0; j < T1; ++j ) {
-        for ( int i = 0; i < T0; ++i ) {
-          v(ti*T0 + i, tj*T1+j, tk*T2 + k) = ( ti + tj*NT0 + tk*N0*N1 )*FT + ( i + j*T0 + k*T0*T1 );
-        } } }
-      } } }
+      for (int tk = 0; tk < NT2; ++tk) {
+        for (int tj = 0; tj < NT1; ++tj) {
+          for (int ti = 0; ti < NT0; ++ti) {
+            for (int k = 0; k < T2; ++k) {
+              for (int j = 0; j < T1; ++j) {
+                for (int i = 0; i < T0; ++i) {
+                  v(ti * T0 + i, tj * T1 + j, tk * T2 + k) =
+                      (ti + tj * NT0 + tk * N0 * N1) * FT +
+                      (i + j * T0 + k * T0 * T1);
+                }
+              }
+            }
+          }
+        }
+      }
 
       // copy to device
       Kokkos::deep_copy(dv, v);
 
-      Kokkos::MDRangePolicy< Kokkos::Rank<3, Kokkos::Iterate::Left, Kokkos::Iterate::Left>, ExecSpace > mdrangepolicy( {0,0,0}, {N0,N1,N2}, {T0,T1,T2} );
+      Kokkos::MDRangePolicy<
+          Kokkos::Rank<3, Kokkos::Iterate::Left, Kokkos::Iterate::Left>,
+          ExecSpace>
+          mdrangepolicy({0, 0, 0}, {N0, N1, N2}, {T0, T1, T2});
 
       // iterate by tile
-      Kokkos::parallel_for( "ViewTile rank 3 LL", mdrangepolicy, 
-        KOKKOS_LAMBDA (const int i, const int j, const int k) {
-          dv(i,j,k) += 1;
-        });
+      Kokkos::parallel_for(
+          "ViewTile rank 3 LL", mdrangepolicy,
+          KOKKOS_LAMBDA(const int i, const int j, const int k) {
+            dv(i, j, k) += 1;
+          });
 
       Kokkos::deep_copy(v, dv);
 
       long counter_subview = 0;
-      long counter_inc = 0;
+      long counter_inc     = 0;
 
-      for ( int tk = 0; tk < NT2; ++tk ) {
-      for ( int tj = 0; tj < NT1; ++tj ) {
-      for ( int ti = 0; ti < NT0; ++ti ) {
-        auto tile_subview = Kokkos::tile_subview( v, ti, tj, tk );
-        for ( int k = 0; k < T2; ++k ) {
-        for ( int j = 0; j < T1; ++j ) {
-        for ( int i = 0; i < T0; ++i ) {
-          if ( tile_subview(i,j,k) != v(ti*T0+i, tj*T1+j, tk*T2+k) ) { ++counter_subview; }
-          if ( tile_subview(i,j,k) != ( ( ti + tj*NT0 + tk*N0*N1 )*FT + ( i + j*T0 + k*T0*T1 ) +  1 ) ) { ++counter_inc; }
-        } } }
-      } } }
+      for (int tk = 0; tk < NT2; ++tk) {
+        for (int tj = 0; tj < NT1; ++tj) {
+          for (int ti = 0; ti < NT0; ++ti) {
+            auto tile_subview = Kokkos::tile_subview(v, ti, tj, tk);
+            for (int k = 0; k < T2; ++k) {
+              for (int j = 0; j < T1; ++j) {
+                for (int i = 0; i < T0; ++i) {
+                  if (tile_subview(i, j, k) !=
+                      v(ti * T0 + i, tj * T1 + j, tk * T2 + k)) {
+                    ++counter_subview;
+                  }
+                  if (tile_subview(i, j, k) !=
+                      ((ti + tj * NT0 + tk * N0 * N1) * FT +
+                       (i + j * T0 + k * T0 * T1) + 1)) {
+                    ++counter_inc;
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
       ASSERT_EQ(counter_subview, long(0));
       ASSERT_EQ(counter_inc, long(0));
-    } // end scope
+    }  // end scope
 
     // Create RL View
     {
-      typedef Kokkos::View< Scalar***, LayoutRL_3D_2x4x4, ExecSpace > ViewType;
-      Kokkos::View< Scalar***, LayoutRL_3D_2x4x4, ExecSpace > dv("dv", N0, N1, N2);
+      typedef Kokkos::View<Scalar***, LayoutRL_3D_2x4x4, ExecSpace> ViewType;
+      Kokkos::View<Scalar***, LayoutRL_3D_2x4x4, ExecSpace> dv("dv", N0, N1,
+                                                               N2);
 
       typename ViewType::HostMirror v = Kokkos::create_mirror_view(dv);
 
       // Initialize on host
-      for ( int ti = 0; ti < NT0; ++ti ) {
-      for ( int tj = 0; tj < NT1; ++tj ) {
-      for ( int tk = 0; tk < NT2; ++tk ) {
-        for ( int k = 0; k < T2; ++k ) {
-        for ( int j = 0; j < T1; ++j ) {
-        for ( int i = 0; i < T0; ++i ) {
-          v(ti*T0 + i, tj*T1+j, tk*T2 + k) = ( ti*NT1*NT2 + tj*NT2 + tk )*FT + ( i + j*T0 + k*T0*T1 );
-        } } }
-      } } }
+      for (int ti = 0; ti < NT0; ++ti) {
+        for (int tj = 0; tj < NT1; ++tj) {
+          for (int tk = 0; tk < NT2; ++tk) {
+            for (int k = 0; k < T2; ++k) {
+              for (int j = 0; j < T1; ++j) {
+                for (int i = 0; i < T0; ++i) {
+                  v(ti * T0 + i, tj * T1 + j, tk * T2 + k) =
+                      (ti * NT1 * NT2 + tj * NT2 + tk) * FT +
+                      (i + j * T0 + k * T0 * T1);
+                }
+              }
+            }
+          }
+        }
+      }
 
       // copy to device
       Kokkos::deep_copy(dv, v);
 
-      Kokkos::MDRangePolicy< Kokkos::Rank<3, Kokkos::Iterate::Right, Kokkos::Iterate::Left>, ExecSpace > mdrangepolicy( {0,0,0}, {N0,N1,N2}, {T0,T1,T2} );
+      Kokkos::MDRangePolicy<
+          Kokkos::Rank<3, Kokkos::Iterate::Right, Kokkos::Iterate::Left>,
+          ExecSpace>
+          mdrangepolicy({0, 0, 0}, {N0, N1, N2}, {T0, T1, T2});
 
       // iterate by tile
-      Kokkos::parallel_for( "ViewTile rank 3 RL", mdrangepolicy, 
-        KOKKOS_LAMBDA (const int i, const int j, const int k) {
-          dv(i,j,k) += 1;
-        });
+      Kokkos::parallel_for(
+          "ViewTile rank 3 RL", mdrangepolicy,
+          KOKKOS_LAMBDA(const int i, const int j, const int k) {
+            dv(i, j, k) += 1;
+          });
 
       Kokkos::deep_copy(v, dv);
 
       long counter_subview = 0;
-      long counter_inc = 0;
+      long counter_inc     = 0;
 
-      for ( int ti = 0; ti < NT0; ++ti ) {
-      for ( int tj = 0; tj < NT1; ++tj ) {
-      for ( int tk = 0; tk < NT2; ++tk ) {
-        auto tile_subview = Kokkos::tile_subview( v, ti, tj, tk );
-        for ( int k = 0; k < T2; ++k ) {
-        for ( int j = 0; j < T1; ++j ) {
-        for ( int i = 0; i < T0; ++i ) {
-          if ( tile_subview(i,j,k) != v(ti*T0+i, tj*T1+j, tk*T2+k) ) { ++counter_subview; }
-          if ( tile_subview(i,j,k) != ( ( ti*NT1*NT2 + tj*NT2 + tk )*FT + ( i + j*T0 + k*T0*T1 ) + 1 ) ) { ++counter_inc; }
-        } } }
-      } } }
+      for (int ti = 0; ti < NT0; ++ti) {
+        for (int tj = 0; tj < NT1; ++tj) {
+          for (int tk = 0; tk < NT2; ++tk) {
+            auto tile_subview = Kokkos::tile_subview(v, ti, tj, tk);
+            for (int k = 0; k < T2; ++k) {
+              for (int j = 0; j < T1; ++j) {
+                for (int i = 0; i < T0; ++i) {
+                  if (tile_subview(i, j, k) !=
+                      v(ti * T0 + i, tj * T1 + j, tk * T2 + k)) {
+                    ++counter_subview;
+                  }
+                  if (tile_subview(i, j, k) !=
+                      ((ti * NT1 * NT2 + tj * NT2 + tk) * FT +
+                       (i + j * T0 + k * T0 * T1) + 1)) {
+                    ++counter_inc;
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
       ASSERT_EQ(counter_subview, long(0));
       ASSERT_EQ(counter_inc, long(0));
-    } // end scope
+    }  // end scope
 
     // Create LR View
     {
-      typedef Kokkos::View< Scalar***, LayoutLR_3D_2x4x4, ExecSpace > ViewType;
-      Kokkos::View< Scalar***, LayoutLR_3D_2x4x4, ExecSpace > dv("dv", N0, N1, N2);
+      typedef Kokkos::View<Scalar***, LayoutLR_3D_2x4x4, ExecSpace> ViewType;
+      Kokkos::View<Scalar***, LayoutLR_3D_2x4x4, ExecSpace> dv("dv", N0, N1,
+                                                               N2);
 
       typename ViewType::HostMirror v = Kokkos::create_mirror_view(dv);
 
       // Initialize on host
-      for ( int tk = 0; tk < NT2; ++tk ) {
-      for ( int tj = 0; tj < NT1; ++tj ) {
-      for ( int ti = 0; ti < NT0; ++ti ) {
-        for ( int i = 0; i < T0; ++i ) {
-        for ( int j = 0; j < T1; ++j ) {
-        for ( int k = 0; k < T2; ++k ) {
-          v(ti*T0 + i, tj*T1+j, tk*T2 + k) = ( ti + tj*NT0 + tk*NT0*NT1 )*FT + ( i*T1*T2 + j*T2 + k );
-        } } }
-      } } }
+      for (int tk = 0; tk < NT2; ++tk) {
+        for (int tj = 0; tj < NT1; ++tj) {
+          for (int ti = 0; ti < NT0; ++ti) {
+            for (int i = 0; i < T0; ++i) {
+              for (int j = 0; j < T1; ++j) {
+                for (int k = 0; k < T2; ++k) {
+                  v(ti * T0 + i, tj * T1 + j, tk * T2 + k) =
+                      (ti + tj * NT0 + tk * NT0 * NT1) * FT +
+                      (i * T1 * T2 + j * T2 + k);
+                }
+              }
+            }
+          }
+        }
+      }
 
       // copy to device
       Kokkos::deep_copy(dv, v);
 
-      Kokkos::MDRangePolicy< Kokkos::Rank<3, Kokkos::Iterate::Left, Kokkos::Iterate::Right>, ExecSpace > mdrangepolicy( {0,0,0}, {N0,N1,N2}, {T0,T1,T2} );
+      Kokkos::MDRangePolicy<
+          Kokkos::Rank<3, Kokkos::Iterate::Left, Kokkos::Iterate::Right>,
+          ExecSpace>
+          mdrangepolicy({0, 0, 0}, {N0, N1, N2}, {T0, T1, T2});
 
       // iterate by tile
-      Kokkos::parallel_for( "ViewTile rank 3 LR", mdrangepolicy, 
-        KOKKOS_LAMBDA (const int i, const int j, const int k) {
-          dv(i,j,k) += 1;
-        });
+      Kokkos::parallel_for(
+          "ViewTile rank 3 LR", mdrangepolicy,
+          KOKKOS_LAMBDA(const int i, const int j, const int k) {
+            dv(i, j, k) += 1;
+          });
 
       Kokkos::deep_copy(v, dv);
 
       long counter_subview = 0;
-      long counter_inc = 0;
+      long counter_inc     = 0;
 
-      for ( int tk = 0; tk < NT2; ++tk ) {
-      for ( int tj = 0; tj < NT1; ++tj ) {
-      for ( int ti = 0; ti < NT0; ++ti ) {
-        auto tile_subview = Kokkos::tile_subview( v, ti, tj, tk );
-        for ( int i = 0; i < T0; ++i ) {
-        for ( int j = 0; j < T1; ++j ) {
-        for ( int k = 0; k < T2; ++k ) {
-          if ( tile_subview(i,j,k) != v(ti*T0+i, tj*T1+j, tk*T2+k) ) { ++counter_subview; }
-          if ( tile_subview(i,j,k) != ( ( ti + tj*NT0 + tk*NT0*NT1 )*FT + ( i*T1*T2 + j*T2 + k ) + 1 ) ) { ++counter_inc; }
-        } } }
-      } } }
+      for (int tk = 0; tk < NT2; ++tk) {
+        for (int tj = 0; tj < NT1; ++tj) {
+          for (int ti = 0; ti < NT0; ++ti) {
+            auto tile_subview = Kokkos::tile_subview(v, ti, tj, tk);
+            for (int i = 0; i < T0; ++i) {
+              for (int j = 0; j < T1; ++j) {
+                for (int k = 0; k < T2; ++k) {
+                  if (tile_subview(i, j, k) !=
+                      v(ti * T0 + i, tj * T1 + j, tk * T2 + k)) {
+                    ++counter_subview;
+                  }
+                  if (tile_subview(i, j, k) !=
+                      ((ti + tj * NT0 + tk * NT0 * NT1) * FT +
+                       (i * T1 * T2 + j * T2 + k) + 1)) {
+                    ++counter_inc;
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
       ASSERT_EQ(counter_subview, long(0));
       ASSERT_EQ(counter_inc, long(0));
-    } // end scope
+    }  // end scope
 
     // Create RR View
     {
-      typedef Kokkos::View< Scalar***, LayoutRR_3D_2x4x4, ExecSpace > ViewType;
-      Kokkos::View< Scalar***, LayoutRR_3D_2x4x4, ExecSpace > dv("dv", N0, N1, N2);
+      typedef Kokkos::View<Scalar***, LayoutRR_3D_2x4x4, ExecSpace> ViewType;
+      Kokkos::View<Scalar***, LayoutRR_3D_2x4x4, ExecSpace> dv("dv", N0, N1,
+                                                               N2);
 
       typename ViewType::HostMirror v = Kokkos::create_mirror_view(dv);
 
       // Initialize on host
-      for ( int ti = 0; ti < NT0; ++ti ) {
-      for ( int tj = 0; tj < NT1; ++tj ) {
-      for ( int tk = 0; tk < NT2; ++tk ) {
-        for ( int i = 0; i < T0; ++i ) {
-        for ( int j = 0; j < T1; ++j ) {
-        for ( int k = 0; k < T2; ++k ) {
-          v(ti*T0 + i, tj*T1+j, tk*T2 + k) = ( ti*NT1*NT2 + tj*NT2 + tk )*FT + ( i*T1*T2 + j*T2 + k );
-        } } }
-      } } }
+      for (int ti = 0; ti < NT0; ++ti) {
+        for (int tj = 0; tj < NT1; ++tj) {
+          for (int tk = 0; tk < NT2; ++tk) {
+            for (int i = 0; i < T0; ++i) {
+              for (int j = 0; j < T1; ++j) {
+                for (int k = 0; k < T2; ++k) {
+                  v(ti * T0 + i, tj * T1 + j, tk * T2 + k) =
+                      (ti * NT1 * NT2 + tj * NT2 + tk) * FT +
+                      (i * T1 * T2 + j * T2 + k);
+                }
+              }
+            }
+          }
+        }
+      }
 
       // copy to device
       Kokkos::deep_copy(dv, v);
 
-      Kokkos::MDRangePolicy< Kokkos::Rank<3, Kokkos::Iterate::Right, Kokkos::Iterate::Right>, ExecSpace > mdrangepolicy( {0,0,0}, {N0,N1,N2}, {T0,T1,T2} );
+      Kokkos::MDRangePolicy<
+          Kokkos::Rank<3, Kokkos::Iterate::Right, Kokkos::Iterate::Right>,
+          ExecSpace>
+          mdrangepolicy({0, 0, 0}, {N0, N1, N2}, {T0, T1, T2});
 
       // iterate by tile
-      Kokkos::parallel_for( "ViewTile rank 3 RR", mdrangepolicy, 
-        KOKKOS_LAMBDA (const int i, const int j, const int k) {
-          dv(i,j,k) += 1;
-        });
+      Kokkos::parallel_for(
+          "ViewTile rank 3 RR", mdrangepolicy,
+          KOKKOS_LAMBDA(const int i, const int j, const int k) {
+            dv(i, j, k) += 1;
+          });
 
       Kokkos::deep_copy(v, dv);
 
       long counter_subview = 0;
-      long counter_inc = 0;
+      long counter_inc     = 0;
 
-      for ( int ti = 0; ti < NT0; ++ti ) {
-      for ( int tj = 0; tj < NT1; ++tj ) {
-      for ( int tk = 0; tk < NT2; ++tk ) {
-        auto tile_subview = Kokkos::tile_subview( v, ti, tj, tk );
-        for ( int i = 0; i < T0; ++i ) {
-        for ( int j = 0; j < T1; ++j ) {
-        for ( int k = 0; k < T2; ++k ) {
-          if ( tile_subview(i,j,k) != v(ti*T0+i, tj*T1+j, tk*T2+k) ) { ++counter_subview; }
-          if ( tile_subview(i,j,k) != ( ( ti*NT1*NT2 + tj*NT2 + tk )*FT + ( i*T1*T2 + j*T2 + k ) + 1 ) ) { ++counter_inc; }
-        } } }
-      } } }
+      for (int ti = 0; ti < NT0; ++ti) {
+        for (int tj = 0; tj < NT1; ++tj) {
+          for (int tk = 0; tk < NT2; ++tk) {
+            auto tile_subview = Kokkos::tile_subview(v, ti, tj, tk);
+            for (int i = 0; i < T0; ++i) {
+              for (int j = 0; j < T1; ++j) {
+                for (int k = 0; k < T2; ++k) {
+                  if (tile_subview(i, j, k) !=
+                      v(ti * T0 + i, tj * T1 + j, tk * T2 + k)) {
+                    ++counter_subview;
+                  }
+                  if (tile_subview(i, j, k) !=
+                      ((ti * NT1 * NT2 + tj * NT2 + tk) * FT +
+                       (i * T1 * T2 + j * T2 + k) + 1)) {
+                    ++counter_inc;
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
       ASSERT_EQ(counter_subview, long(0));
       ASSERT_EQ(counter_inc, long(0));
-    } // end scope
+    }  // end scope
 #endif
 #endif
-  } // end test_view_layout_tiled_3d
+  }  // end test_view_layout_tiled_3d
 
+  static void test_view_layout_tiled_4d(const int N0, const int N1,
+                                        const int N2, const int N3) {
+#if defined(KOKKOS_ENABLE_CXX11_DISPATCH_LAMBDA)
+#if !defined(KOKKOS_ENABLE_CUDA) || (8000 <= CUDA_VERSION)
+    const int FT = T0 * T1 * T2 * T3;
 
-  static void test_view_layout_tiled_4d( const int N0, const int N1, const int N2, const int N3 )
-  {
-#if defined( KOKKOS_ENABLE_CXX11_DISPATCH_LAMBDA )
-#if !defined(KOKKOS_ENABLE_CUDA) || ( 8000 <= CUDA_VERSION )
-    const int FT = T0*T1*T2*T3;
-
-    const int NT0 = int( std::ceil( N0 / T0 ) );
-    const int NT1 = int( std::ceil( N1 / T1 ) );
-    const int NT2 = int( std::ceil( N2 / T2 ) );
-    const int NT3 = int( std::ceil( N3 / T3 ) );
+    const int NT0 = int(std::ceil(N0 / T0));
+    const int NT1 = int(std::ceil(N1 / T1));
+    const int NT2 = int(std::ceil(N2 / T2));
+    const int NT3 = int(std::ceil(N3 / T3));
 
     // Create LL View
     {
-      typedef Kokkos::View< Scalar****, LayoutLL_4D_2x4x4x2, ExecSpace > ViewType;
-      Kokkos::View< Scalar****, LayoutLL_4D_2x4x4x2, ExecSpace > dv("dv", N0, N1, N2, N3);
+      typedef Kokkos::View<Scalar****, LayoutLL_4D_2x4x4x2, ExecSpace> ViewType;
+      Kokkos::View<Scalar****, LayoutLL_4D_2x4x4x2, ExecSpace> dv("dv", N0, N1,
+                                                                  N2, N3);
 
       typename ViewType::HostMirror v = Kokkos::create_mirror_view(dv);
 
       // Initialize on host
-      for ( int tl = 0; tl < NT3; ++tl ) {
-      for ( int tk = 0; tk < NT2; ++tk ) {
-      for ( int tj = 0; tj < NT1; ++tj ) {
-      for ( int ti = 0; ti < NT0; ++ti ) {
-        for ( int l = 0; l < T3; ++l ) {
-        for ( int k = 0; k < T2; ++k ) {
-        for ( int j = 0; j < T1; ++j ) {
-        for ( int i = 0; i < T0; ++i ) {
-          v(ti*T0 + i, tj*T1+j, tk*T2 + k, tl*T3 + l) = ( ti + tj*NT0 + tk*N0*N1 + tl*N0*N1*N2 )*FT + ( i + j*T0 + k*T0*T1 + l*T0*T1*T2 );
-        } } } }
-      } } } }
+      for (int tl = 0; tl < NT3; ++tl) {
+        for (int tk = 0; tk < NT2; ++tk) {
+          for (int tj = 0; tj < NT1; ++tj) {
+            for (int ti = 0; ti < NT0; ++ti) {
+              for (int l = 0; l < T3; ++l) {
+                for (int k = 0; k < T2; ++k) {
+                  for (int j = 0; j < T1; ++j) {
+                    for (int i = 0; i < T0; ++i) {
+                      v(ti * T0 + i, tj * T1 + j, tk * T2 + k, tl * T3 + l) =
+                          (ti + tj * NT0 + tk * N0 * N1 + tl * N0 * N1 * N2) *
+                              FT +
+                          (i + j * T0 + k * T0 * T1 + l * T0 * T1 * T2);
+                    }
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
 
       // copy to device
       Kokkos::deep_copy(dv, v);
 
-      Kokkos::MDRangePolicy< Kokkos::Rank<4, Kokkos::Iterate::Left, Kokkos::Iterate::Left>, ExecSpace > mdrangepolicy( {0,0,0,0}, {N0,N1,N2,N3}, {T0,T1,T2,T3} );
+      Kokkos::MDRangePolicy<
+          Kokkos::Rank<4, Kokkos::Iterate::Left, Kokkos::Iterate::Left>,
+          ExecSpace>
+          mdrangepolicy({0, 0, 0, 0}, {N0, N1, N2, N3}, {T0, T1, T2, T3});
 
       // iterate by tile
-      Kokkos::parallel_for( "ViewTile rank 4 LL", mdrangepolicy, 
-        KOKKOS_LAMBDA (const int i, const int j, const int k, const int l) {
-          dv(i,j,k,l) += 1;
-        });
+      Kokkos::parallel_for(
+          "ViewTile rank 4 LL", mdrangepolicy,
+          KOKKOS_LAMBDA(const int i, const int j, const int k, const int l) {
+            dv(i, j, k, l) += 1;
+          });
 
       Kokkos::deep_copy(v, dv);
 
       long counter_subview = 0;
-      long counter_inc = 0;
+      long counter_inc     = 0;
 
-      for ( int tl = 0; tl < NT3; ++tl ) {
-      for ( int tk = 0; tk < NT2; ++tk ) {
-      for ( int tj = 0; tj < NT1; ++tj ) {
-      for ( int ti = 0; ti < NT0; ++ti ) {
-        auto tile_subview = Kokkos::tile_subview( v, ti, tj, tk, tl );
-        for ( int l = 0; l < T3; ++l ) {
-        for ( int k = 0; k < T2; ++k ) {
-        for ( int j = 0; j < T1; ++j ) {
-        for ( int i = 0; i < T0; ++i ) {
-          if ( tile_subview(i,j,k,l) != v(ti*T0+i, tj*T1+j, tk*T2+k, tl*T3 + l) ) { ++counter_subview; }
-          if ( tile_subview(i,j,k,l) != ( ( ti + tj*NT0 + tk*N0*N1 + tl*N0*N1*N2 )*FT + ( i + j*T0 + k*T0*T1 + l*T0*T1*T2 ) + 1 ) ) { ++counter_inc; }
-        } } } }
-      } } } }
+      for (int tl = 0; tl < NT3; ++tl) {
+        for (int tk = 0; tk < NT2; ++tk) {
+          for (int tj = 0; tj < NT1; ++tj) {
+            for (int ti = 0; ti < NT0; ++ti) {
+              auto tile_subview = Kokkos::tile_subview(v, ti, tj, tk, tl);
+              for (int l = 0; l < T3; ++l) {
+                for (int k = 0; k < T2; ++k) {
+                  for (int j = 0; j < T1; ++j) {
+                    for (int i = 0; i < T0; ++i) {
+                      if (tile_subview(i, j, k, l) !=
+                          v(ti * T0 + i, tj * T1 + j, tk * T2 + k,
+                            tl * T3 + l)) {
+                        ++counter_subview;
+                      }
+                      if (tile_subview(i, j, k, l) !=
+                          ((ti + tj * NT0 + tk * N0 * N1 + tl * N0 * N1 * N2) *
+                               FT +
+                           (i + j * T0 + k * T0 * T1 + l * T0 * T1 * T2) + 1)) {
+                        ++counter_inc;
+                      }
+                    }
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
       ASSERT_EQ(counter_subview, long(0));
       ASSERT_EQ(counter_inc, long(0));
-    } // end scope
+    }  // end scope
 
     // Create RL View
     {
-      typedef Kokkos::View< Scalar****, LayoutRL_4D_2x4x4x2, ExecSpace > ViewType;
-      Kokkos::View< Scalar****, LayoutRL_4D_2x4x4x2, ExecSpace > dv("dv", N0, N1, N2, N3);
+      typedef Kokkos::View<Scalar****, LayoutRL_4D_2x4x4x2, ExecSpace> ViewType;
+      Kokkos::View<Scalar****, LayoutRL_4D_2x4x4x2, ExecSpace> dv("dv", N0, N1,
+                                                                  N2, N3);
 
       typename ViewType::HostMirror v = Kokkos::create_mirror_view(dv);
 
       // Initialize on host
-      for ( int ti = 0; ti < NT0; ++ti ) {
-      for ( int tj = 0; tj < NT1; ++tj ) {
-      for ( int tk = 0; tk < NT2; ++tk ) {
-      for ( int tl = 0; tl < NT3; ++tl ) {
-        for ( int l = 0; l < T3; ++l ) {
-        for ( int k = 0; k < T2; ++k ) {
-        for ( int j = 0; j < T1; ++j ) {
-        for ( int i = 0; i < T0; ++i ) {
-          v(ti*T0 + i, tj*T1+j, tk*T2 + k, tl*T3 + l) = ( ti*NT1*NT2*N3 + tj*NT2*N3 + tk*N3 + tl )*FT + ( i + j*T0 + k*T0*T1 + l*T0*T1*T2 );
-        } } } }
-      } } } }
+      for (int ti = 0; ti < NT0; ++ti) {
+        for (int tj = 0; tj < NT1; ++tj) {
+          for (int tk = 0; tk < NT2; ++tk) {
+            for (int tl = 0; tl < NT3; ++tl) {
+              for (int l = 0; l < T3; ++l) {
+                for (int k = 0; k < T2; ++k) {
+                  for (int j = 0; j < T1; ++j) {
+                    for (int i = 0; i < T0; ++i) {
+                      v(ti * T0 + i, tj * T1 + j, tk * T2 + k, tl * T3 + l) =
+                          (ti * NT1 * NT2 * N3 + tj * NT2 * N3 + tk * N3 + tl) *
+                              FT +
+                          (i + j * T0 + k * T0 * T1 + l * T0 * T1 * T2);
+                    }
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
 
       // copy to device
       Kokkos::deep_copy(dv, v);
 
-      Kokkos::MDRangePolicy< Kokkos::Rank<4, Kokkos::Iterate::Right, Kokkos::Iterate::Left>, ExecSpace > mdrangepolicy( {0,0,0,0}, {N0,N1,N2,N3}, {T0,T1,T2,T3} );
+      Kokkos::MDRangePolicy<
+          Kokkos::Rank<4, Kokkos::Iterate::Right, Kokkos::Iterate::Left>,
+          ExecSpace>
+          mdrangepolicy({0, 0, 0, 0}, {N0, N1, N2, N3}, {T0, T1, T2, T3});
 
       // iterate by tile
-      Kokkos::parallel_for( "ViewTile rank 4 RL", mdrangepolicy, 
-        KOKKOS_LAMBDA (const int i, const int j, const int k, const int l) {
-          dv(i,j,k,l) += 1;
-        });
+      Kokkos::parallel_for(
+          "ViewTile rank 4 RL", mdrangepolicy,
+          KOKKOS_LAMBDA(const int i, const int j, const int k, const int l) {
+            dv(i, j, k, l) += 1;
+          });
 
       Kokkos::deep_copy(v, dv);
 
       long counter_subview = 0;
-      long counter_inc = 0;
+      long counter_inc     = 0;
 
-      for ( int ti = 0; ti < NT0; ++ti ) {
-      for ( int tj = 0; tj < NT1; ++tj ) {
-      for ( int tk = 0; tk < NT2; ++tk ) {
-      for ( int tl = 0; tl < NT3; ++tl ) {
-        auto tile_subview = Kokkos::tile_subview( v, ti, tj, tk, tl );
-        for ( int l = 0; l < T3; ++l ) {
-        for ( int k = 0; k < T2; ++k ) {
-        for ( int j = 0; j < T1; ++j ) {
-        for ( int i = 0; i < T0; ++i ) {
-          if ( tile_subview(i,j,k,l) != v(ti*T0+i, tj*T1+j, tk*T2+k, tl*T3 + l) ) { ++counter_subview; }
-          if ( tile_subview(i,j,k,l) != ( ( ti*NT1*NT2*N3 + tj*NT2*N3 + tk*N3 + tl )*FT + ( i + j*T0 + k*T0*T1 + l*T0*T1*T2 ) + 1 ) ) { ++counter_inc; }
-        } } } }
-      } } } }
+      for (int ti = 0; ti < NT0; ++ti) {
+        for (int tj = 0; tj < NT1; ++tj) {
+          for (int tk = 0; tk < NT2; ++tk) {
+            for (int tl = 0; tl < NT3; ++tl) {
+              auto tile_subview = Kokkos::tile_subview(v, ti, tj, tk, tl);
+              for (int l = 0; l < T3; ++l) {
+                for (int k = 0; k < T2; ++k) {
+                  for (int j = 0; j < T1; ++j) {
+                    for (int i = 0; i < T0; ++i) {
+                      if (tile_subview(i, j, k, l) !=
+                          v(ti * T0 + i, tj * T1 + j, tk * T2 + k,
+                            tl * T3 + l)) {
+                        ++counter_subview;
+                      }
+                      if (tile_subview(i, j, k, l) !=
+                          ((ti * NT1 * NT2 * N3 + tj * NT2 * N3 + tk * N3 +
+                            tl) *
+                               FT +
+                           (i + j * T0 + k * T0 * T1 + l * T0 * T1 * T2) + 1)) {
+                        ++counter_inc;
+                      }
+                    }
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
       ASSERT_EQ(counter_subview, long(0));
       ASSERT_EQ(counter_inc, long(0));
-    } // end scope
+    }  // end scope
 
     // Create LR View
     {
-      typedef Kokkos::View< Scalar****, LayoutLR_4D_2x4x4x2, ExecSpace > ViewType;
-      Kokkos::View< Scalar****, LayoutLR_4D_2x4x4x2, ExecSpace > dv("dv", N0, N1, N2, N3);
+      typedef Kokkos::View<Scalar****, LayoutLR_4D_2x4x4x2, ExecSpace> ViewType;
+      Kokkos::View<Scalar****, LayoutLR_4D_2x4x4x2, ExecSpace> dv("dv", N0, N1,
+                                                                  N2, N3);
 
       typename ViewType::HostMirror v = Kokkos::create_mirror_view(dv);
 
       // Initialize on host
-      for ( int tl = 0; tl < NT3; ++tl ) {
-      for ( int tk = 0; tk < NT2; ++tk ) {
-      for ( int tj = 0; tj < NT1; ++tj ) {
-      for ( int ti = 0; ti < NT0; ++ti ) {
-        for ( int i = 0; i < T0; ++i ) {
-        for ( int j = 0; j < T1; ++j ) {
-        for ( int k = 0; k < T2; ++k ) {
-        for ( int l = 0; l < T3; ++l ) {
-          v(ti*T0 + i, tj*T1+j, tk*T2 + k, tl*T3 + l) = ( ti + tj*NT0 + tk*NT0*NT1 + tl*NT0*NT1*NT2 )*FT + ( i*T1*T2*T3 + j*T2*T3 + k*T3 + l );
-        } } } }
-      } } } }
+      for (int tl = 0; tl < NT3; ++tl) {
+        for (int tk = 0; tk < NT2; ++tk) {
+          for (int tj = 0; tj < NT1; ++tj) {
+            for (int ti = 0; ti < NT0; ++ti) {
+              for (int i = 0; i < T0; ++i) {
+                for (int j = 0; j < T1; ++j) {
+                  for (int k = 0; k < T2; ++k) {
+                    for (int l = 0; l < T3; ++l) {
+                      v(ti * T0 + i, tj * T1 + j, tk * T2 + k, tl * T3 + l) =
+                          (ti + tj * NT0 + tk * NT0 * NT1 +
+                           tl * NT0 * NT1 * NT2) *
+                              FT +
+                          (i * T1 * T2 * T3 + j * T2 * T3 + k * T3 + l);
+                    }
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
 
       // copy to device
       Kokkos::deep_copy(dv, v);
 
-      Kokkos::MDRangePolicy< Kokkos::Rank<4, Kokkos::Iterate::Left, Kokkos::Iterate::Right>, ExecSpace > mdrangepolicy( {0,0,0,0}, {N0,N1,N2,N3}, {T0,T1,T2,T3} );
+      Kokkos::MDRangePolicy<
+          Kokkos::Rank<4, Kokkos::Iterate::Left, Kokkos::Iterate::Right>,
+          ExecSpace>
+          mdrangepolicy({0, 0, 0, 0}, {N0, N1, N2, N3}, {T0, T1, T2, T3});
 
       // iterate by tile
-      Kokkos::parallel_for( "ViewTile rank 4 LR", mdrangepolicy, 
-        KOKKOS_LAMBDA (const int i, const int j, const int k, const int l) {
-          dv(i,j,k,l) += 1;
-        });
+      Kokkos::parallel_for(
+          "ViewTile rank 4 LR", mdrangepolicy,
+          KOKKOS_LAMBDA(const int i, const int j, const int k, const int l) {
+            dv(i, j, k, l) += 1;
+          });
 
       Kokkos::deep_copy(v, dv);
 
       long counter_subview = 0;
-      long counter_inc = 0;
+      long counter_inc     = 0;
 
-      for ( int tl = 0; tl < NT3; ++tl ) {
-      for ( int tk = 0; tk < NT2; ++tk ) {
-      for ( int tj = 0; tj < NT1; ++tj ) {
-      for ( int ti = 0; ti < NT0; ++ti ) {
-        auto tile_subview = Kokkos::tile_subview( v, ti, tj, tk, tl );
-        for ( int i = 0; i < T0; ++i ) {
-        for ( int j = 0; j < T1; ++j ) {
-        for ( int k = 0; k < T2; ++k ) {
-        for ( int l = 0; l < T3; ++l ) {
-          if ( tile_subview(i,j,k,l) != v(ti*T0+i, tj*T1+j, tk*T2+k, tl*T3 + l) ) { ++counter_subview; }
-          if ( tile_subview(i,j,k,l) != ( ( ti + tj*NT0 + tk*NT0*NT1 + tl*NT0*NT1*NT2 )*FT + ( i*T1*T2*T3 + j*T2*T3 + k*T3 + l ) + 1 ) ) { ++counter_inc; }
-        } } } }
-      } } } }
+      for (int tl = 0; tl < NT3; ++tl) {
+        for (int tk = 0; tk < NT2; ++tk) {
+          for (int tj = 0; tj < NT1; ++tj) {
+            for (int ti = 0; ti < NT0; ++ti) {
+              auto tile_subview = Kokkos::tile_subview(v, ti, tj, tk, tl);
+              for (int i = 0; i < T0; ++i) {
+                for (int j = 0; j < T1; ++j) {
+                  for (int k = 0; k < T2; ++k) {
+                    for (int l = 0; l < T3; ++l) {
+                      if (tile_subview(i, j, k, l) !=
+                          v(ti * T0 + i, tj * T1 + j, tk * T2 + k,
+                            tl * T3 + l)) {
+                        ++counter_subview;
+                      }
+                      if (tile_subview(i, j, k, l) !=
+                          ((ti + tj * NT0 + tk * NT0 * NT1 +
+                            tl * NT0 * NT1 * NT2) *
+                               FT +
+                           (i * T1 * T2 * T3 + j * T2 * T3 + k * T3 + l) + 1)) {
+                        ++counter_inc;
+                      }
+                    }
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
       ASSERT_EQ(counter_subview, long(0));
       ASSERT_EQ(counter_inc, long(0));
-    } // end scope
+    }  // end scope
 
     // Create RR View
     {
-      typedef Kokkos::View< Scalar****, LayoutRR_4D_2x4x4x2, ExecSpace > ViewType;
-      Kokkos::View< Scalar****, LayoutRR_4D_2x4x4x2, ExecSpace > dv("dv", N0, N1, N2, N3);
+      typedef Kokkos::View<Scalar****, LayoutRR_4D_2x4x4x2, ExecSpace> ViewType;
+      Kokkos::View<Scalar****, LayoutRR_4D_2x4x4x2, ExecSpace> dv("dv", N0, N1,
+                                                                  N2, N3);
 
       typename ViewType::HostMirror v = Kokkos::create_mirror_view(dv);
 
       // Initialize on host
-      for ( int ti = 0; ti < NT0; ++ti ) {
-      for ( int tj = 0; tj < NT1; ++tj ) {
-      for ( int tk = 0; tk < NT2; ++tk ) {
-      for ( int tl = 0; tl < NT3; ++tl ) {
-        for ( int i = 0; i < T0; ++i ) {
-        for ( int j = 0; j < T1; ++j ) {
-        for ( int k = 0; k < T2; ++k ) {
-        for ( int l = 0; l < T3; ++l ) {
-          v(ti*T0 + i, tj*T1+j, tk*T2 + k, tl*T3 + l) = ( ti*NT1*NT2*NT3 + tj*NT2*NT3 + tk*NT3 + tl )*FT + ( i*T1*T2*T3 + j*T2*T3 + k*T3 + l );
-        } } } }
-      } } } }
+      for (int ti = 0; ti < NT0; ++ti) {
+        for (int tj = 0; tj < NT1; ++tj) {
+          for (int tk = 0; tk < NT2; ++tk) {
+            for (int tl = 0; tl < NT3; ++tl) {
+              for (int i = 0; i < T0; ++i) {
+                for (int j = 0; j < T1; ++j) {
+                  for (int k = 0; k < T2; ++k) {
+                    for (int l = 0; l < T3; ++l) {
+                      v(ti * T0 + i, tj * T1 + j, tk * T2 + k, tl * T3 + l) =
+                          (ti * NT1 * NT2 * NT3 + tj * NT2 * NT3 + tk * NT3 +
+                           tl) *
+                              FT +
+                          (i * T1 * T2 * T3 + j * T2 * T3 + k * T3 + l);
+                    }
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
 
       // copy to device
       Kokkos::deep_copy(dv, v);
 
-      Kokkos::MDRangePolicy< Kokkos::Rank<4, Kokkos::Iterate::Right, Kokkos::Iterate::Right>, ExecSpace > mdrangepolicy( {0,0,0,0}, {N0,N1,N2,N3}, {T0,T1,T2,T3} );
+      Kokkos::MDRangePolicy<
+          Kokkos::Rank<4, Kokkos::Iterate::Right, Kokkos::Iterate::Right>,
+          ExecSpace>
+          mdrangepolicy({0, 0, 0, 0}, {N0, N1, N2, N3}, {T0, T1, T2, T3});
 
       // iterate by tile
-      Kokkos::parallel_for( "ViewTile rank 4 RR", mdrangepolicy, 
-        KOKKOS_LAMBDA (const int i, const int j, const int k, const int l) {
-          dv(i,j,k,l) += 1;
-        });
+      Kokkos::parallel_for(
+          "ViewTile rank 4 RR", mdrangepolicy,
+          KOKKOS_LAMBDA(const int i, const int j, const int k, const int l) {
+            dv(i, j, k, l) += 1;
+          });
 
       Kokkos::deep_copy(v, dv);
 
       long counter_subview = 0;
-      long counter_inc = 0;
+      long counter_inc     = 0;
 
-
-      for ( int ti = 0; ti < NT0; ++ti ) {
-      for ( int tj = 0; tj < NT1; ++tj ) {
-      for ( int tk = 0; tk < NT2; ++tk ) {
-      for ( int tl = 0; tl < NT3; ++tl ) {
-        auto tile_subview = Kokkos::tile_subview( v, ti, tj, tk, tl );
-        for ( int i = 0; i < T0; ++i ) {
-        for ( int j = 0; j < T1; ++j ) {
-        for ( int k = 0; k < T2; ++k ) {
-        for ( int l = 0; l < T3; ++l ) {
-          if ( tile_subview(i,j,k,l) != v(ti*T0+i, tj*T1+j, tk*T2+k, tl*T3 + l) ) { ++counter_subview; }
-          if ( tile_subview(i,j,k,l) != ( ( ti*NT1*NT2*NT3 + tj*NT2*NT3 + tk*NT3 + tl )*FT + ( i*T1*T2*T3 + j*T2*T3 + k*T3 + l ) + 1 ) ) { ++counter_inc; }
-        } } } }
-      } } } }
+      for (int ti = 0; ti < NT0; ++ti) {
+        for (int tj = 0; tj < NT1; ++tj) {
+          for (int tk = 0; tk < NT2; ++tk) {
+            for (int tl = 0; tl < NT3; ++tl) {
+              auto tile_subview = Kokkos::tile_subview(v, ti, tj, tk, tl);
+              for (int i = 0; i < T0; ++i) {
+                for (int j = 0; j < T1; ++j) {
+                  for (int k = 0; k < T2; ++k) {
+                    for (int l = 0; l < T3; ++l) {
+                      if (tile_subview(i, j, k, l) !=
+                          v(ti * T0 + i, tj * T1 + j, tk * T2 + k,
+                            tl * T3 + l)) {
+                        ++counter_subview;
+                      }
+                      if (tile_subview(i, j, k, l) !=
+                          ((ti * NT1 * NT2 * NT3 + tj * NT2 * NT3 + tk * NT3 +
+                            tl) *
+                               FT +
+                           (i * T1 * T2 * T3 + j * T2 * T3 + k * T3 + l) + 1)) {
+                        ++counter_inc;
+                      }
+                    }
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
       ASSERT_EQ(counter_subview, long(0));
       ASSERT_EQ(counter_inc, long(0));
-    } // end scope
+    }  // end scope
 #endif
 #endif
-  } // end test_view_layout_tiled_4d
+  }  // end test_view_layout_tiled_4d
 
+  static void test_view_layout_tiled_subtile_2d(const int N0, const int N1) {
+    const int FT = T0 * T1;
 
-  static void test_view_layout_tiled_subtile_2d( const int N0, const int N1 )
-  {
-    const int FT = T0*T1;
-
-    const int NT0 = int( std::ceil( N0 / T0 ) );
-    const int NT1 = int( std::ceil( N1 / T1 ) );
+    const int NT0 = int(std::ceil(N0 / T0));
+    const int NT1 = int(std::ceil(N1 / T1));
 
     // Counter to check for errors at the end
     long counter[4] = {0};
 
     // Create LL View
     {
-      Kokkos::View< Scalar**, LayoutLL_2D_2x4, Kokkos::HostSpace > v("v", N0, N1);
-      for ( int tj = 0; tj < NT1; ++tj ) {
-      for ( int ti = 0; ti < NT0; ++ti ) {
-        for ( int j = 0; j < T1; ++j ) {
-        for ( int i = 0; i < T0; ++i ) {
-          v(ti*T0 + i, tj*T1+j) = ( ti + tj*NT0 )*FT + ( i + j*T0 );
-        } }
-      } }
+      Kokkos::View<Scalar**, LayoutLL_2D_2x4, Kokkos::HostSpace> v("v", N0, N1);
+      for (int tj = 0; tj < NT1; ++tj) {
+        for (int ti = 0; ti < NT0; ++ti) {
+          for (int j = 0; j < T1; ++j) {
+            for (int i = 0; i < T0; ++i) {
+              v(ti * T0 + i, tj * T1 + j) = (ti + tj * NT0) * FT + (i + j * T0);
+            }
+          }
+        }
+      }
 
-      for ( int tj = 0; tj < NT1; ++tj ) {
-      for ( int ti = 0; ti < NT0; ++ti ) {
-        auto tile_subview = Kokkos::tile_subview( v, ti, tj );
-        for ( int j = 0; j < T1; ++j ) {
-        for ( int i = 0; i < T0; ++i ) {
-          if ( tile_subview(i,j) != v(ti*T0+i, tj*T1+j) ) { ++counter[0]; }
+      for (int tj = 0; tj < NT1; ++tj) {
+        for (int ti = 0; ti < NT0; ++ti) {
+          auto tile_subview = Kokkos::tile_subview(v, ti, tj);
+          for (int j = 0; j < T1; ++j) {
+            for (int i = 0; i < T0; ++i) {
+              if (tile_subview(i, j) != v(ti * T0 + i, tj * T1 + j)) {
+                ++counter[0];
+              }
 #ifdef KOKKOS_VERBOSE_LAYOUTTILED_OUTPUT
-          std::cout << "idx0,idx1 = " << ti*T0 + i << "," << tj*T1 + j << std::endl;
-          std::cout << "ti,tj,i,j: " << ti << "," << tj << "," << i << "," << j << "  v = " << v(ti*T0 + i, tj*T1+j) << "  flat idx = " << ( ti + tj*NT0 )*FT + ( i + j*T0 ) << std::endl;
-          std::cout << "subview_tile output = " << tile_subview(i,j) << std::endl;
+              std::cout << "idx0,idx1 = " << ti * T0 + i << "," << tj * T1 + j
+                        << std::endl;
+              std::cout << "ti,tj,i,j: " << ti << "," << tj << "," << i << ","
+                        << j << "  v = " << v(ti * T0 + i, tj * T1 + j)
+                        << "  flat idx = "
+                        << (ti + tj * NT0) * FT + (i + j * T0) << std::endl;
+              std::cout << "subview_tile output = " << tile_subview(i, j)
+                        << std::endl;
 #endif
-        } }
-      } }
-    } // end scope
+            }
+          }
+        }
+      }
+    }  // end scope
 
     // Create RL View
     {
-      Kokkos::View< Scalar**, LayoutRL_2D_2x4, Kokkos::HostSpace > v("v", N0, N1);
-      for ( int ti = 0; ti < NT0; ++ti ) {
-      for ( int tj = 0; tj < NT1; ++tj ) {
-        for ( int j = 0; j < T1; ++j ) {
-        for ( int i = 0; i < T0; ++i ) {
-          v(ti*T0 + i, tj*T1+j) = ( ti*NT1 + tj )*FT + ( i + j*T0 );
-        } }
-      } }
+      Kokkos::View<Scalar**, LayoutRL_2D_2x4, Kokkos::HostSpace> v("v", N0, N1);
+      for (int ti = 0; ti < NT0; ++ti) {
+        for (int tj = 0; tj < NT1; ++tj) {
+          for (int j = 0; j < T1; ++j) {
+            for (int i = 0; i < T0; ++i) {
+              v(ti * T0 + i, tj * T1 + j) = (ti * NT1 + tj) * FT + (i + j * T0);
+            }
+          }
+        }
+      }
 
-      for ( int ti = 0; ti < NT0; ++ti ) {
-      for ( int tj = 0; tj < NT1; ++tj ) {
-        auto tile_subview = Kokkos::tile_subview( v, ti, tj );
-        for ( int j = 0; j < T1; ++j ) {
-        for ( int i = 0; i < T0; ++i ) {
-          if ( tile_subview(i,j) != v(ti*T0+i, tj*T1+j) ) { ++counter[1]; }
+      for (int ti = 0; ti < NT0; ++ti) {
+        for (int tj = 0; tj < NT1; ++tj) {
+          auto tile_subview = Kokkos::tile_subview(v, ti, tj);
+          for (int j = 0; j < T1; ++j) {
+            for (int i = 0; i < T0; ++i) {
+              if (tile_subview(i, j) != v(ti * T0 + i, tj * T1 + j)) {
+                ++counter[1];
+              }
 #ifdef KOKKOS_VERBOSE_LAYOUTTILED_OUTPUT
-          std::cout << "idx0,idx1 = " << ti*T0 + i << "," << tj*T1 + j << std::endl;
-          std::cout << "ti,tj,i,j: " << ti << "," << tj << "," << i << "," << j << "  v = " << v(ti*T0 + i, tj*T1+j) << "  flat idx = " << ( ti*NT1 + tj )*FT + ( i + j*T0 ) << std::endl;
-          std::cout << "subview_tile output = " << tile_subview(i,j) << std::endl;
+              std::cout << "idx0,idx1 = " << ti * T0 + i << "," << tj * T1 + j
+                        << std::endl;
+              std::cout << "ti,tj,i,j: " << ti << "," << tj << "," << i << ","
+                        << j << "  v = " << v(ti * T0 + i, tj * T1 + j)
+                        << "  flat idx = "
+                        << (ti * NT1 + tj) * FT + (i + j * T0) << std::endl;
+              std::cout << "subview_tile output = " << tile_subview(i, j)
+                        << std::endl;
 #endif
-        } }
-      } }
-    } // end scope
+            }
+          }
+        }
+      }
+    }  // end scope
 
     // Create LR View
     {
-      Kokkos::View< Scalar**, LayoutLR_2D_2x4, Kokkos::HostSpace > v("v", N0, N1);
-      for ( int tj = 0; tj < NT1; ++tj ) {
-      for ( int ti = 0; ti < NT0; ++ti ) {
-        for ( int i = 0; i < T0; ++i ) {
-        for ( int j = 0; j < T1; ++j ) {
-          v(ti*T0 + i, tj*T1+j) = ( ti + tj*NT0 )*FT + ( i*T1 + j );
-        } }
-      } }
+      Kokkos::View<Scalar**, LayoutLR_2D_2x4, Kokkos::HostSpace> v("v", N0, N1);
+      for (int tj = 0; tj < NT1; ++tj) {
+        for (int ti = 0; ti < NT0; ++ti) {
+          for (int i = 0; i < T0; ++i) {
+            for (int j = 0; j < T1; ++j) {
+              v(ti * T0 + i, tj * T1 + j) = (ti + tj * NT0) * FT + (i * T1 + j);
+            }
+          }
+        }
+      }
 
-      for ( int tj = 0; tj < NT1; ++tj ) {
-      for ( int ti = 0; ti < NT0; ++ti ) {
-        auto tile_subview = Kokkos::tile_subview( v, ti, tj );
-        for ( int i = 0; i < T0; ++i ) {
-        for ( int j = 0; j < T1; ++j ) {
-          if ( tile_subview(i,j) != v(ti*T0+i, tj*T1+j) ) { ++counter[2]; }
+      for (int tj = 0; tj < NT1; ++tj) {
+        for (int ti = 0; ti < NT0; ++ti) {
+          auto tile_subview = Kokkos::tile_subview(v, ti, tj);
+          for (int i = 0; i < T0; ++i) {
+            for (int j = 0; j < T1; ++j) {
+              if (tile_subview(i, j) != v(ti * T0 + i, tj * T1 + j)) {
+                ++counter[2];
+              }
 #ifdef KOKKOS_VERBOSE_LAYOUTTILED_OUTPUT
-          std::cout << "idx0,idx1 = " << ti*T0 + i << "," << tj*T1 + j << std::endl;
-          std::cout << "ti,tj,i,j: " << ti << "," << tj << "," << i << "," << j << "  v = " << v(ti*T0 + i, tj*T1+j) << "  flat idx = " << ( ti + tj*NT0 )*FT + ( i*T1 + j ) << std::endl;
-          std::cout << "subview_tile output = " << tile_subview(i,j) << std::endl;
+              std::cout << "idx0,idx1 = " << ti * T0 + i << "," << tj * T1 + j
+                        << std::endl;
+              std::cout << "ti,tj,i,j: " << ti << "," << tj << "," << i << ","
+                        << j << "  v = " << v(ti * T0 + i, tj * T1 + j)
+                        << "  flat idx = "
+                        << (ti + tj * NT0) * FT + (i * T1 + j) << std::endl;
+              std::cout << "subview_tile output = " << tile_subview(i, j)
+                        << std::endl;
 #endif
-        } }
-      } }
-    } // end scope
+            }
+          }
+        }
+      }
+    }  // end scope
 
     // Create RR View
     {
-      Kokkos::View< Scalar**, LayoutRR_2D_2x4, Kokkos::HostSpace > v("v", N0, N1);
-      for ( int ti = 0; ti < NT0; ++ti ) {
-      for ( int tj = 0; tj < NT1; ++tj ) {
-        for ( int i = 0; i < T0; ++i ) {
-        for ( int j = 0; j < T1; ++j ) {
-          v(ti*T0 + i, tj*T1+j) = ( ti*NT1 + tj )*FT + ( i*T1 + j );
-        } }
-      } }
+      Kokkos::View<Scalar**, LayoutRR_2D_2x4, Kokkos::HostSpace> v("v", N0, N1);
+      for (int ti = 0; ti < NT0; ++ti) {
+        for (int tj = 0; tj < NT1; ++tj) {
+          for (int i = 0; i < T0; ++i) {
+            for (int j = 0; j < T1; ++j) {
+              v(ti * T0 + i, tj * T1 + j) = (ti * NT1 + tj) * FT + (i * T1 + j);
+            }
+          }
+        }
+      }
 
-      for ( int ti = 0; ti < NT0; ++ti ) {
-      for ( int tj = 0; tj < NT1; ++tj ) {
-        auto tile_subview = Kokkos::tile_subview( v, ti, tj );
-        for ( int i = 0; i < T0; ++i ) {
-        for ( int j = 0; j < T1; ++j ) {
-          if ( tile_subview(i,j) != v(ti*T0+i, tj*T1+j) ) { ++counter[3]; }
+      for (int ti = 0; ti < NT0; ++ti) {
+        for (int tj = 0; tj < NT1; ++tj) {
+          auto tile_subview = Kokkos::tile_subview(v, ti, tj);
+          for (int i = 0; i < T0; ++i) {
+            for (int j = 0; j < T1; ++j) {
+              if (tile_subview(i, j) != v(ti * T0 + i, tj * T1 + j)) {
+                ++counter[3];
+              }
 #ifdef KOKKOS_VERBOSE_LAYOUTTILED_OUTPUT
-          std::cout << "idx0,idx1 = " << ti*T0 + i << "," << tj*T1 + j << std::endl;
-          std::cout << "ti,tj,i,j: " << ti << "," << tj << "," << i << "," << j << "  v = " << v(ti*T0 + i, tj*T1+j) << "  flat idx = " << ( ti*NT1 + tj )*FT + ( i*T1 + j ) << std::endl;
-          std::cout << "subview_tile output = " << tile_subview(i,j) << std::endl;
-          std::cout << "subview tile rank = " << Kokkos::rank(tile_subview) << std::endl;
+              std::cout << "idx0,idx1 = " << ti * T0 + i << "," << tj * T1 + j
+                        << std::endl;
+              std::cout << "ti,tj,i,j: " << ti << "," << tj << "," << i << ","
+                        << j << "  v = " << v(ti * T0 + i, tj * T1 + j)
+                        << "  flat idx = "
+                        << (ti * NT1 + tj) * FT + (i * T1 + j) << std::endl;
+              std::cout << "subview_tile output = " << tile_subview(i, j)
+                        << std::endl;
+              std::cout << "subview tile rank = " << Kokkos::rank(tile_subview)
+                        << std::endl;
 #endif
-        } }
-      } }
-    } // end scope
+            }
+          }
+        }
+      }
+    }  // end scope
 
 #ifdef KOKKOS_VERBOSE_LAYOUTTILED_OUTPUT
     std::cout << "subview_tile vs view errors:\n"
-      << " LL: " << counter[0]
-      << " RL: " << counter[1]
-      << " LR: " << counter[2]
-      << " RR: " << counter[3] 
-      << std::endl;
+              << " LL: " << counter[0] << " RL: " << counter[1]
+              << " LR: " << counter[2] << " RR: " << counter[3] << std::endl;
 #endif
 
     ASSERT_EQ(counter[0], long(0));
     ASSERT_EQ(counter[1], long(0));
     ASSERT_EQ(counter[2], long(0));
     ASSERT_EQ(counter[3], long(0));
-  } // end test_view_layout_tiled_subtile_2d
+  }  // end test_view_layout_tiled_subtile_2d
 
+  static void test_view_layout_tiled_subtile_3d(const int N0, const int N1,
+                                                const int N2) {
+    const int FT = T0 * T1 * T2;
 
-  static void test_view_layout_tiled_subtile_3d( const int N0, const int N1, const int N2 )
-  {
-
-    const int FT = T0*T1*T2;
-
-    const int NT0 = int( std::ceil( N0 / T0 ) );
-    const int NT1 = int( std::ceil( N1 / T1 ) );
-    const int NT2 = int( std::ceil( N2 / T2 ) );
+    const int NT0 = int(std::ceil(N0 / T0));
+    const int NT1 = int(std::ceil(N1 / T1));
+    const int NT2 = int(std::ceil(N2 / T2));
 
     // Counter to check for errors at the end
     long counter[4] = {0};
     // Create LL View
     {
-      Kokkos::View< Scalar***, LayoutLL_3D_2x4x4, Kokkos::HostSpace > v("v", N0, N1, N2);
-      for ( int tk = 0; tk < NT2; ++tk ) {
-      for ( int tj = 0; tj < NT1; ++tj ) {
-      for ( int ti = 0; ti < NT0; ++ti ) {
-        for ( int k = 0; k < T2; ++k ) {
-        for ( int j = 0; j < T1; ++j ) {
-        for ( int i = 0; i < T0; ++i ) {
-          v(ti*T0 + i, tj*T1+j, tk*T2 + k) = ( ti + tj*NT0 + tk*N0*N1 )*FT + ( i + j*T0 + k*T0*T1 );
-        } } }
-      } } }
+      Kokkos::View<Scalar***, LayoutLL_3D_2x4x4, Kokkos::HostSpace> v("v", N0,
+                                                                      N1, N2);
+      for (int tk = 0; tk < NT2; ++tk) {
+        for (int tj = 0; tj < NT1; ++tj) {
+          for (int ti = 0; ti < NT0; ++ti) {
+            for (int k = 0; k < T2; ++k) {
+              for (int j = 0; j < T1; ++j) {
+                for (int i = 0; i < T0; ++i) {
+                  v(ti * T0 + i, tj * T1 + j, tk * T2 + k) =
+                      (ti + tj * NT0 + tk * N0 * N1) * FT +
+                      (i + j * T0 + k * T0 * T1);
+                }
+              }
+            }
+          }
+        }
+      }
 
-      for ( int tk = 0; tk < NT2; ++tk ) {
-      for ( int tj = 0; tj < NT1; ++tj ) {
-      for ( int ti = 0; ti < NT0; ++ti ) {
-        auto tile_subview = Kokkos::tile_subview( v, ti, tj, tk );
-        for ( int k = 0; k < T2; ++k ) {
-        for ( int j = 0; j < T1; ++j ) {
-        for ( int i = 0; i < T0; ++i ) {
-          if ( tile_subview(i,j,k) != v(ti*T0+i, tj*T1+j, tk*T2+k) ) { ++counter[0]; }
+      for (int tk = 0; tk < NT2; ++tk) {
+        for (int tj = 0; tj < NT1; ++tj) {
+          for (int ti = 0; ti < NT0; ++ti) {
+            auto tile_subview = Kokkos::tile_subview(v, ti, tj, tk);
+            for (int k = 0; k < T2; ++k) {
+              for (int j = 0; j < T1; ++j) {
+                for (int i = 0; i < T0; ++i) {
+                  if (tile_subview(i, j, k) !=
+                      v(ti * T0 + i, tj * T1 + j, tk * T2 + k)) {
+                    ++counter[0];
+                  }
 #ifdef KOKKOS_VERBOSE_LAYOUTTILED_OUTPUT
-          std::cout << "idx0,idx1,idx2 = " << ti*T0 + i << "," << tj*T1 + j << "," << tk*T2 + k << std::endl;
-          std::cout << "ti,tj,tk,i,j,k: " << ti << "," << tj << "," << tk << "," << i << "," << j << "," << k << "  v = " << v(ti*T0 + i, tj*T1+j, tk*T2 + k) << "  flat idx = " << ( ti + tj*NT0 + tk*N0*N1 )*FT + ( i + j*T0 + k*T0*T1 ) << std::endl;
-          std::cout << "subview_tile output = " << tile_subview(i,j,k) << std::endl;
-          std::cout << "subview tile rank = " << Kokkos::rank(tile_subview) << std::endl;
+                  std::cout << "idx0,idx1,idx2 = " << ti * T0 + i << ","
+                            << tj * T1 + j << "," << tk * T2 + k << std::endl;
+                  std::cout
+                      << "ti,tj,tk,i,j,k: " << ti << "," << tj << "," << tk
+                      << "," << i << "," << j << "," << k
+                      << "  v = " << v(ti * T0 + i, tj * T1 + j, tk * T2 + k)
+                      << "  flat idx = "
+                      << (ti + tj * NT0 + tk * N0 * N1) * FT +
+                             (i + j * T0 + k * T0 * T1)
+                      << std::endl;
+                  std::cout << "subview_tile output = " << tile_subview(i, j, k)
+                            << std::endl;
+                  std::cout
+                      << "subview tile rank = " << Kokkos::rank(tile_subview)
+                      << std::endl;
 #endif
-        } } }
-      } } }
-    } // end scope
+                }
+              }
+            }
+          }
+        }
+      }
+    }  // end scope
 
     // Create RL View
     {
-      Kokkos::View< Scalar***, LayoutRL_3D_2x4x4, Kokkos::HostSpace > v("v", N0, N1, N2);
-      for ( int ti = 0; ti < NT0; ++ti ) {
-      for ( int tj = 0; tj < NT1; ++tj ) {
-      for ( int tk = 0; tk < NT2; ++tk ) {
-        for ( int k = 0; k < T2; ++k ) {
-        for ( int j = 0; j < T1; ++j ) {
-        for ( int i = 0; i < T0; ++i ) {
-          v(ti*T0 + i, tj*T1+j, tk*T2 + k) = ( ti*NT1*NT2 + tj*NT2 + tk )*FT + ( i + j*T0 + k*T0*T1 );
-        } } }
-      } } }
+      Kokkos::View<Scalar***, LayoutRL_3D_2x4x4, Kokkos::HostSpace> v("v", N0,
+                                                                      N1, N2);
+      for (int ti = 0; ti < NT0; ++ti) {
+        for (int tj = 0; tj < NT1; ++tj) {
+          for (int tk = 0; tk < NT2; ++tk) {
+            for (int k = 0; k < T2; ++k) {
+              for (int j = 0; j < T1; ++j) {
+                for (int i = 0; i < T0; ++i) {
+                  v(ti * T0 + i, tj * T1 + j, tk * T2 + k) =
+                      (ti * NT1 * NT2 + tj * NT2 + tk) * FT +
+                      (i + j * T0 + k * T0 * T1);
+                }
+              }
+            }
+          }
+        }
+      }
 
-      for ( int ti = 0; ti < NT0; ++ti ) {
-      for ( int tj = 0; tj < NT1; ++tj ) {
-      for ( int tk = 0; tk < NT2; ++tk ) {
-        auto tile_subview = Kokkos::tile_subview( v, ti, tj, tk );
-        for ( int k = 0; k < T2; ++k ) {
-        for ( int j = 0; j < T1; ++j ) {
-        for ( int i = 0; i < T0; ++i ) {
-          if ( tile_subview(i,j,k) != v(ti*T0+i, tj*T1+j, tk*T2+k) ) { ++counter[1]; }
+      for (int ti = 0; ti < NT0; ++ti) {
+        for (int tj = 0; tj < NT1; ++tj) {
+          for (int tk = 0; tk < NT2; ++tk) {
+            auto tile_subview = Kokkos::tile_subview(v, ti, tj, tk);
+            for (int k = 0; k < T2; ++k) {
+              for (int j = 0; j < T1; ++j) {
+                for (int i = 0; i < T0; ++i) {
+                  if (tile_subview(i, j, k) !=
+                      v(ti * T0 + i, tj * T1 + j, tk * T2 + k)) {
+                    ++counter[1];
+                  }
 #ifdef KOKKOS_VERBOSE_LAYOUTTILED_OUTPUT
-          std::cout << "idx0,idx1,idx2 = " << ti*T0 + i << "," << tj*T1 + j << "," << tk*T2 + k << std::endl;
-          std::cout << "ti,tj,tk,i,j,k: " << ti << "," << tj << "," << tk << "," << i << "," << j << "," << k << "  v = " << v(ti*T0 + i, tj*T1+j, tk*T2 + k) << "  flat idx = " << ( ti*NT1*NT2 + tj*NT2 + tk )*FT + ( i + j*T0 + k*T0*T1 ) << std::endl;
-          std::cout << "subview_tile output = " << tile_subview(i,j,k) << std::endl;
+                  std::cout << "idx0,idx1,idx2 = " << ti * T0 + i << ","
+                            << tj * T1 + j << "," << tk * T2 + k << std::endl;
+                  std::cout
+                      << "ti,tj,tk,i,j,k: " << ti << "," << tj << "," << tk
+                      << "," << i << "," << j << "," << k
+                      << "  v = " << v(ti * T0 + i, tj * T1 + j, tk * T2 + k)
+                      << "  flat idx = "
+                      << (ti * NT1 * NT2 + tj * NT2 + tk) * FT +
+                             (i + j * T0 + k * T0 * T1)
+                      << std::endl;
+                  std::cout << "subview_tile output = " << tile_subview(i, j, k)
+                            << std::endl;
 #endif
-        } } }
-      } } }
-    } // end scope
+                }
+              }
+            }
+          }
+        }
+      }
+    }  // end scope
 
     // Create LR View
     {
-      Kokkos::View< Scalar***, LayoutLR_3D_2x4x4, Kokkos::HostSpace > v("v", N0, N1, N2);
-      for ( int tk = 0; tk < NT2; ++tk ) {
-      for ( int tj = 0; tj < NT1; ++tj ) {
-      for ( int ti = 0; ti < NT0; ++ti ) {
-        for ( int i = 0; i < T0; ++i ) {
-        for ( int j = 0; j < T1; ++j ) {
-        for ( int k = 0; k < T2; ++k ) {
-          v(ti*T0 + i, tj*T1+j, tk*T2 + k) = ( ti + tj*NT0 + tk*NT0*NT1 )*FT + ( i*T1*T2 + j*T2 + k );
-        } } }
-      } } }
+      Kokkos::View<Scalar***, LayoutLR_3D_2x4x4, Kokkos::HostSpace> v("v", N0,
+                                                                      N1, N2);
+      for (int tk = 0; tk < NT2; ++tk) {
+        for (int tj = 0; tj < NT1; ++tj) {
+          for (int ti = 0; ti < NT0; ++ti) {
+            for (int i = 0; i < T0; ++i) {
+              for (int j = 0; j < T1; ++j) {
+                for (int k = 0; k < T2; ++k) {
+                  v(ti * T0 + i, tj * T1 + j, tk * T2 + k) =
+                      (ti + tj * NT0 + tk * NT0 * NT1) * FT +
+                      (i * T1 * T2 + j * T2 + k);
+                }
+              }
+            }
+          }
+        }
+      }
 
-      for ( int tk = 0; tk < NT2; ++tk ) {
-      for ( int tj = 0; tj < NT1; ++tj ) {
-      for ( int ti = 0; ti < NT0; ++ti ) {
-        auto tile_subview = Kokkos::tile_subview( v, ti, tj, tk );
-        for ( int i = 0; i < T0; ++i ) {
-        for ( int j = 0; j < T1; ++j ) {
-        for ( int k = 0; k < T2; ++k ) {
-          if ( tile_subview(i,j,k) != v(ti*T0+i, tj*T1+j, tk*T2+k) ) { ++counter[2]; }
+      for (int tk = 0; tk < NT2; ++tk) {
+        for (int tj = 0; tj < NT1; ++tj) {
+          for (int ti = 0; ti < NT0; ++ti) {
+            auto tile_subview = Kokkos::tile_subview(v, ti, tj, tk);
+            for (int i = 0; i < T0; ++i) {
+              for (int j = 0; j < T1; ++j) {
+                for (int k = 0; k < T2; ++k) {
+                  if (tile_subview(i, j, k) !=
+                      v(ti * T0 + i, tj * T1 + j, tk * T2 + k)) {
+                    ++counter[2];
+                  }
 #ifdef KOKKOS_VERBOSE_LAYOUTTILED_OUTPUT
-          std::cout << "idx0,idx1,idx2 = " << ti*T0 + i << "," << tj*T1 + j << "," << tk*T2 + k << std::endl;
-          std::cout << "ti,tj,tk,i,j,k: " << ti << "," << tj << "," << tk << "," << i << "," << j << "," << k << "  v = " << v(ti*T0 + i, tj*T1+j, tk*T2 + k) << "  flat idx = " << ( ti + tj*NT0 + tk*NT0*NT1 )*FT + ( i*T1*T2 + j*T2 + k ) << std::endl;
-          std::cout << "subview_tile output = " << tile_subview(i,j,k) << std::endl;
-          std::cout << "subview tile rank = " << Kokkos::rank(tile_subview) << std::endl;
+                  std::cout << "idx0,idx1,idx2 = " << ti * T0 + i << ","
+                            << tj * T1 + j << "," << tk * T2 + k << std::endl;
+                  std::cout
+                      << "ti,tj,tk,i,j,k: " << ti << "," << tj << "," << tk
+                      << "," << i << "," << j << "," << k
+                      << "  v = " << v(ti * T0 + i, tj * T1 + j, tk * T2 + k)
+                      << "  flat idx = "
+                      << (ti + tj * NT0 + tk * NT0 * NT1) * FT +
+                             (i * T1 * T2 + j * T2 + k)
+                      << std::endl;
+                  std::cout << "subview_tile output = " << tile_subview(i, j, k)
+                            << std::endl;
+                  std::cout
+                      << "subview tile rank = " << Kokkos::rank(tile_subview)
+                      << std::endl;
 #endif
-        } } }
-      } } }
-    } // end scope
+                }
+              }
+            }
+          }
+        }
+      }
+    }  // end scope
 
     // Create RR View
     {
-      Kokkos::View< Scalar***, LayoutRR_3D_2x4x4, Kokkos::HostSpace > v("v", N0, N1, N2);
-      for ( int ti = 0; ti < NT0; ++ti ) {
-      for ( int tj = 0; tj < NT1; ++tj ) {
-      for ( int tk = 0; tk < NT2; ++tk ) {
-        for ( int i = 0; i < T0; ++i ) {
-        for ( int j = 0; j < T1; ++j ) {
-        for ( int k = 0; k < T2; ++k ) {
-          v(ti*T0 + i, tj*T1+j, tk*T2 + k) = ( ti*NT1*NT2 + tj*NT2 + tk )*FT + ( i*T1*T2 + j*T2 + k );
-        } } }
-      } } }
+      Kokkos::View<Scalar***, LayoutRR_3D_2x4x4, Kokkos::HostSpace> v("v", N0,
+                                                                      N1, N2);
+      for (int ti = 0; ti < NT0; ++ti) {
+        for (int tj = 0; tj < NT1; ++tj) {
+          for (int tk = 0; tk < NT2; ++tk) {
+            for (int i = 0; i < T0; ++i) {
+              for (int j = 0; j < T1; ++j) {
+                for (int k = 0; k < T2; ++k) {
+                  v(ti * T0 + i, tj * T1 + j, tk * T2 + k) =
+                      (ti * NT1 * NT2 + tj * NT2 + tk) * FT +
+                      (i * T1 * T2 + j * T2 + k);
+                }
+              }
+            }
+          }
+        }
+      }
 
-      for ( int ti = 0; ti < NT0; ++ti ) {
-      for ( int tj = 0; tj < NT1; ++tj ) {
-      for ( int tk = 0; tk < NT2; ++tk ) {
-        auto tile_subview = Kokkos::tile_subview( v, ti, tj, tk );
-        for ( int i = 0; i < T0; ++i ) {
-        for ( int j = 0; j < T1; ++j ) {
-        for ( int k = 0; k < T2; ++k ) {
-          if ( tile_subview(i,j,k) != v(ti*T0+i, tj*T1+j, tk*T2+k) ) { ++counter[3]; }
+      for (int ti = 0; ti < NT0; ++ti) {
+        for (int tj = 0; tj < NT1; ++tj) {
+          for (int tk = 0; tk < NT2; ++tk) {
+            auto tile_subview = Kokkos::tile_subview(v, ti, tj, tk);
+            for (int i = 0; i < T0; ++i) {
+              for (int j = 0; j < T1; ++j) {
+                for (int k = 0; k < T2; ++k) {
+                  if (tile_subview(i, j, k) !=
+                      v(ti * T0 + i, tj * T1 + j, tk * T2 + k)) {
+                    ++counter[3];
+                  }
 #ifdef KOKKOS_VERBOSE_LAYOUTTILED_OUTPUT
-          std::cout << "idx0,idx1,idx2 = " << ti*T0 + i << "," << tj*T1 + j << "," << tk*T2 + k << std::endl;
-          std::cout << "ti,tj,tk,i,j,k: " << ti << "," << tj << "," << tk << "," << i << "," << j << "," << k << "  v = " << v(ti*T0 + i, tj*T1+j, tk*T2 + k) << "  flat idx = " << ( ti*NT1*NT2 + tj*NT2 + tk )*FT + ( i*T1*T2 + j*T2 + k ) << std::endl;
-          std::cout << "subview_tile output = " << tile_subview(i,j,k) << std::endl;
-          std::cout << "subview tile rank = " << Kokkos::rank(tile_subview) << std::endl;
+                  std::cout << "idx0,idx1,idx2 = " << ti * T0 + i << ","
+                            << tj * T1 + j << "," << tk * T2 + k << std::endl;
+                  std::cout
+                      << "ti,tj,tk,i,j,k: " << ti << "," << tj << "," << tk
+                      << "," << i << "," << j << "," << k
+                      << "  v = " << v(ti * T0 + i, tj * T1 + j, tk * T2 + k)
+                      << "  flat idx = "
+                      << (ti * NT1 * NT2 + tj * NT2 + tk) * FT +
+                             (i * T1 * T2 + j * T2 + k)
+                      << std::endl;
+                  std::cout << "subview_tile output = " << tile_subview(i, j, k)
+                            << std::endl;
+                  std::cout
+                      << "subview tile rank = " << Kokkos::rank(tile_subview)
+                      << std::endl;
 #endif
-        } } }
-      } } }
-    } // end scope
+                }
+              }
+            }
+          }
+        }
+      }
+    }  // end scope
 
 #ifdef KOKKOS_VERBOSE_LAYOUTTILED_OUTPUT
     std::cout << "subview_tile vs view errors:\n"
-      << " LL: " << counter[0]
-      << " RL: " << counter[1]
-      << " LR: " << counter[2]
-      << " RR: " << counter[3] 
-      << std::endl;
+              << " LL: " << counter[0] << " RL: " << counter[1]
+              << " LR: " << counter[2] << " RR: " << counter[3] << std::endl;
 #endif
 
     ASSERT_EQ(counter[0], long(0));
@@ -1011,179 +1444,307 @@ struct TestViewLayoutTiled {
     ASSERT_EQ(counter[2], long(0));
     ASSERT_EQ(counter[3], long(0));
 
-  } // end test_view_layout_tiled_subtile_3d
+  }  // end test_view_layout_tiled_subtile_3d
 
+  static void test_view_layout_tiled_subtile_4d(const int N0, const int N1,
+                                                const int N2, const int N3) {
+    const int FT = T0 * T1 * T2 * T3;
 
-  static void test_view_layout_tiled_subtile_4d( const int N0, const int N1, const int N2, const int N3 )
-  {
-    const int FT = T0*T1*T2*T3;
-
-    const int NT0 = int( std::ceil( N0 / T0 ) );
-    const int NT1 = int( std::ceil( N1 / T1 ) );
-    const int NT2 = int( std::ceil( N2 / T2 ) );
-    const int NT3 = int( std::ceil( N3 / T3 ) );
+    const int NT0 = int(std::ceil(N0 / T0));
+    const int NT1 = int(std::ceil(N1 / T1));
+    const int NT2 = int(std::ceil(N2 / T2));
+    const int NT3 = int(std::ceil(N3 / T3));
 
     // Counter to check for errors at the end
     long counter[4] = {0};
     // Create LL View
     {
-      Kokkos::View< Scalar****, LayoutLL_4D_2x4x4x2, Kokkos::HostSpace > v("v", N0, N1, N2, N3);
-      for ( int tl = 0; tl < NT3; ++tl ) {
-      for ( int tk = 0; tk < NT2; ++tk ) {
-      for ( int tj = 0; tj < NT1; ++tj ) {
-      for ( int ti = 0; ti < NT0; ++ti ) {
-        for ( int l = 0; l < T3; ++l ) {
-        for ( int k = 0; k < T2; ++k ) {
-        for ( int j = 0; j < T1; ++j ) {
-        for ( int i = 0; i < T0; ++i ) {
-          v(ti*T0 + i, tj*T1+j, tk*T2 + k, tl*T3 + l) = ( ti + tj*NT0 + tk*N0*N1 + tl*N0*N1*N2 )*FT + ( i + j*T0 + k*T0*T1 + l*T0*T1*T2 );
-        } } } }
-      } } } }
+      Kokkos::View<Scalar****, LayoutLL_4D_2x4x4x2, Kokkos::HostSpace> v(
+          "v", N0, N1, N2, N3);
+      for (int tl = 0; tl < NT3; ++tl) {
+        for (int tk = 0; tk < NT2; ++tk) {
+          for (int tj = 0; tj < NT1; ++tj) {
+            for (int ti = 0; ti < NT0; ++ti) {
+              for (int l = 0; l < T3; ++l) {
+                for (int k = 0; k < T2; ++k) {
+                  for (int j = 0; j < T1; ++j) {
+                    for (int i = 0; i < T0; ++i) {
+                      v(ti * T0 + i, tj * T1 + j, tk * T2 + k, tl * T3 + l) =
+                          (ti + tj * NT0 + tk * N0 * N1 + tl * N0 * N1 * N2) *
+                              FT +
+                          (i + j * T0 + k * T0 * T1 + l * T0 * T1 * T2);
+                    }
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
 
-      for ( int tl = 0; tl < NT3; ++tl ) {
-      for ( int tk = 0; tk < NT2; ++tk ) {
-      for ( int tj = 0; tj < NT1; ++tj ) {
-      for ( int ti = 0; ti < NT0; ++ti ) {
-        auto tile_subview = Kokkos::tile_subview( v, ti, tj, tk, tl );
-        for ( int l = 0; l < T3; ++l ) {
-        for ( int k = 0; k < T2; ++k ) {
-        for ( int j = 0; j < T1; ++j ) {
-        for ( int i = 0; i < T0; ++i ) {
-          if ( tile_subview(i,j,k,l) != v(ti*T0+i, tj*T1+j, tk*T2+k, tl*T3 + l) ) { ++counter[0]; }
+      for (int tl = 0; tl < NT3; ++tl) {
+        for (int tk = 0; tk < NT2; ++tk) {
+          for (int tj = 0; tj < NT1; ++tj) {
+            for (int ti = 0; ti < NT0; ++ti) {
+              auto tile_subview = Kokkos::tile_subview(v, ti, tj, tk, tl);
+              for (int l = 0; l < T3; ++l) {
+                for (int k = 0; k < T2; ++k) {
+                  for (int j = 0; j < T1; ++j) {
+                    for (int i = 0; i < T0; ++i) {
+                      if (tile_subview(i, j, k, l) !=
+                          v(ti * T0 + i, tj * T1 + j, tk * T2 + k,
+                            tl * T3 + l)) {
+                        ++counter[0];
+                      }
 #ifdef KOKKOS_VERBOSE_LAYOUTTILED_OUTPUT
-          std::cout << "idx0,idx1,idx2,idx3 = " << ti*T0 + i << "," << tj*T1 + j << "," << tk*T2 + k << "," << tl*T3 + l<< std::endl;
-          std::cout << "ti,tj,tk,tl: " << ti << "," << tj << "," << tk << "," << tl << ","
-          << "  i,j,k,l: " <<  i << "," << j << "," << k << "," << l
-          << "  v = " << v(ti*T0 + i, tj*T1+j, tk*T2 + k, tl*T3 + l) 
-          << "  flat idx = " << ( ti + tj*NT0 + tk*N0*N1 + tl*N0*N1*N2 )*FT + ( i + j*T0 + k*T0*T1 + l*T0*T1*T2 ) << std::endl;
-          std::cout << "subview_tile output = " << tile_subview(i,j,k,l) << std::endl;
-          std::cout << "subview tile rank = " << Kokkos::rank(tile_subview) << std::endl;
+                      std::cout << "idx0,idx1,idx2,idx3 = " << ti * T0 + i
+                                << "," << tj * T1 + j << "," << tk * T2 + k
+                                << "," << tl * T3 + l << std::endl;
+                      std::cout
+                          << "ti,tj,tk,tl: " << ti << "," << tj << "," << tk
+                          << "," << tl << ","
+                          << "  i,j,k,l: " << i << "," << j << "," << k << ","
+                          << l << "  v = "
+                          << v(ti * T0 + i, tj * T1 + j, tk * T2 + k,
+                               tl * T3 + l)
+                          << "  flat idx = "
+                          << (ti + tj * NT0 + tk * N0 * N1 +
+                              tl * N0 * N1 * N2) *
+                                     FT +
+                                 (i + j * T0 + k * T0 * T1 + l * T0 * T1 * T2)
+                          << std::endl;
+                      std::cout << "subview_tile output = "
+                                << tile_subview(i, j, k, l) << std::endl;
+                      std::cout << "subview tile rank = "
+                                << Kokkos::rank(tile_subview) << std::endl;
 #endif
-        } } } }
-      } } } }
-    } // end scope
+                    }
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
+    }  // end scope
 
     // Create RL View
     {
-      Kokkos::View< Scalar****, LayoutRL_4D_2x4x4x2, Kokkos::HostSpace > v("v", N0, N1, N2, N3);
-      for ( int ti = 0; ti < NT0; ++ti ) {
-      for ( int tj = 0; tj < NT1; ++tj ) {
-      for ( int tk = 0; tk < NT2; ++tk ) {
-      for ( int tl = 0; tl < NT3; ++tl ) {
-        for ( int l = 0; l < T3; ++l ) {
-        for ( int k = 0; k < T2; ++k ) {
-        for ( int j = 0; j < T1; ++j ) {
-        for ( int i = 0; i < T0; ++i ) {
-          v(ti*T0 + i, tj*T1+j, tk*T2 + k, tl*T3 + l) = ( ti*NT1*NT2*N3 + tj*NT2*N3 + tk*N3 + tl )*FT + ( i + j*T0 + k*T0*T1 + l*T0*T1*T2 );
-        } } } }
-      } } } }
+      Kokkos::View<Scalar****, LayoutRL_4D_2x4x4x2, Kokkos::HostSpace> v(
+          "v", N0, N1, N2, N3);
+      for (int ti = 0; ti < NT0; ++ti) {
+        for (int tj = 0; tj < NT1; ++tj) {
+          for (int tk = 0; tk < NT2; ++tk) {
+            for (int tl = 0; tl < NT3; ++tl) {
+              for (int l = 0; l < T3; ++l) {
+                for (int k = 0; k < T2; ++k) {
+                  for (int j = 0; j < T1; ++j) {
+                    for (int i = 0; i < T0; ++i) {
+                      v(ti * T0 + i, tj * T1 + j, tk * T2 + k, tl * T3 + l) =
+                          (ti * NT1 * NT2 * N3 + tj * NT2 * N3 + tk * N3 + tl) *
+                              FT +
+                          (i + j * T0 + k * T0 * T1 + l * T0 * T1 * T2);
+                    }
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
 
-      for ( int ti = 0; ti < NT0; ++ti ) {
-      for ( int tj = 0; tj < NT1; ++tj ) {
-      for ( int tk = 0; tk < NT2; ++tk ) {
-      for ( int tl = 0; tl < NT3; ++tl ) {
-        auto tile_subview = Kokkos::tile_subview( v, ti, tj, tk, tl );
-        for ( int l = 0; l < T3; ++l ) {
-        for ( int k = 0; k < T2; ++k ) {
-        for ( int j = 0; j < T1; ++j ) {
-        for ( int i = 0; i < T0; ++i ) {
-          if ( tile_subview(i,j,k,l) != v(ti*T0+i, tj*T1+j, tk*T2+k, tl*T3 + l) ) { ++counter[1]; }
+      for (int ti = 0; ti < NT0; ++ti) {
+        for (int tj = 0; tj < NT1; ++tj) {
+          for (int tk = 0; tk < NT2; ++tk) {
+            for (int tl = 0; tl < NT3; ++tl) {
+              auto tile_subview = Kokkos::tile_subview(v, ti, tj, tk, tl);
+              for (int l = 0; l < T3; ++l) {
+                for (int k = 0; k < T2; ++k) {
+                  for (int j = 0; j < T1; ++j) {
+                    for (int i = 0; i < T0; ++i) {
+                      if (tile_subview(i, j, k, l) !=
+                          v(ti * T0 + i, tj * T1 + j, tk * T2 + k,
+                            tl * T3 + l)) {
+                        ++counter[1];
+                      }
 #ifdef KOKKOS_VERBOSE_LAYOUTTILED_OUTPUT
-          std::cout << "idx0,idx1,idx2,idx3 = " << ti*T0 + i << "," << tj*T1 + j << "," << tk*T2 + k << "," << tl*T3 + l<< std::endl;
-          std::cout << "ti,tj,tk,tl: " << ti << "," << tj << "," << tk << "," << tl << ","
-          << "  i,j,k,l: " <<  i << "," << j << "," << k << "," << l
-          << "  v = " << v(ti*T0 + i, tj*T1+j, tk*T2 + k, tl*T3 + l) 
-          << "  flat idx = " << ( ti*NT1*NT2*N3 + tj*NT2*N3 + tk*N3 + tl )*FT + ( i + j*T0 + k*T0*T1 + l*T0*T1*T2 ) << std::endl;
-          std::cout << "subview_tile output = " << tile_subview(i,j,k,l) << std::endl;
-          std::cout << "subview tile rank = " << Kokkos::rank(tile_subview) << std::endl;
+                      std::cout << "idx0,idx1,idx2,idx3 = " << ti * T0 + i
+                                << "," << tj * T1 + j << "," << tk * T2 + k
+                                << "," << tl * T3 + l << std::endl;
+                      std::cout
+                          << "ti,tj,tk,tl: " << ti << "," << tj << "," << tk
+                          << "," << tl << ","
+                          << "  i,j,k,l: " << i << "," << j << "," << k << ","
+                          << l << "  v = "
+                          << v(ti * T0 + i, tj * T1 + j, tk * T2 + k,
+                               tl * T3 + l)
+                          << "  flat idx = "
+                          << (ti * NT1 * NT2 * N3 + tj * NT2 * N3 + tk * N3 +
+                              tl) * FT +
+                                 (i + j * T0 + k * T0 * T1 + l * T0 * T1 * T2)
+                          << std::endl;
+                      std::cout << "subview_tile output = "
+                                << tile_subview(i, j, k, l) << std::endl;
+                      std::cout << "subview tile rank = "
+                                << Kokkos::rank(tile_subview) << std::endl;
 #endif
-        } } } }
-      } } } }
-    } // end scope
+                    }
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
+    }  // end scope
 
     // Create LR View
     {
-      Kokkos::View< Scalar****, LayoutLR_4D_2x4x4x2, Kokkos::HostSpace > v("v", N0, N1, N2, N3);
-      for ( int tl = 0; tl < NT3; ++tl ) {
-      for ( int tk = 0; tk < NT2; ++tk ) {
-      for ( int tj = 0; tj < NT1; ++tj ) {
-      for ( int ti = 0; ti < NT0; ++ti ) {
-        for ( int i = 0; i < T0; ++i ) {
-        for ( int j = 0; j < T1; ++j ) {
-        for ( int k = 0; k < T2; ++k ) {
-        for ( int l = 0; l < T3; ++l ) {
-          v(ti*T0 + i, tj*T1+j, tk*T2 + k, tl*T3 + l) = ( ti + tj*NT0 + tk*NT0*NT1 + tl*NT0*NT1*NT2 )*FT + ( i*T1*T2*T3 + j*T2*T3 + k*T3 + l );
-        } } } }
-      } } } }
+      Kokkos::View<Scalar****, LayoutLR_4D_2x4x4x2, Kokkos::HostSpace> v(
+          "v", N0, N1, N2, N3);
+      for (int tl = 0; tl < NT3; ++tl) {
+        for (int tk = 0; tk < NT2; ++tk) {
+          for (int tj = 0; tj < NT1; ++tj) {
+            for (int ti = 0; ti < NT0; ++ti) {
+              for (int i = 0; i < T0; ++i) {
+                for (int j = 0; j < T1; ++j) {
+                  for (int k = 0; k < T2; ++k) {
+                    for (int l = 0; l < T3; ++l) {
+                      v(ti * T0 + i, tj * T1 + j, tk * T2 + k, tl * T3 + l) =
+                          (ti + tj * NT0 + tk * NT0 * NT1 +
+                           tl * NT0 * NT1 * NT2) *
+                              FT +
+                          (i * T1 * T2 * T3 + j * T2 * T3 + k * T3 + l);
+                    }
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
 
-      for ( int tl = 0; tl < NT3; ++tl ) {
-      for ( int tk = 0; tk < NT2; ++tk ) {
-      for ( int tj = 0; tj < NT1; ++tj ) {
-      for ( int ti = 0; ti < NT0; ++ti ) {
-        auto tile_subview = Kokkos::tile_subview( v, ti, tj, tk, tl );
-        for ( int i = 0; i < T0; ++i ) {
-        for ( int j = 0; j < T1; ++j ) {
-        for ( int k = 0; k < T2; ++k ) {
-        for ( int l = 0; l < T3; ++l ) {
-          if ( tile_subview(i,j,k,l) != v(ti*T0+i, tj*T1+j, tk*T2+k, tl*T3 + l) ) { ++counter[2]; }
+      for (int tl = 0; tl < NT3; ++tl) {
+        for (int tk = 0; tk < NT2; ++tk) {
+          for (int tj = 0; tj < NT1; ++tj) {
+            for (int ti = 0; ti < NT0; ++ti) {
+              auto tile_subview = Kokkos::tile_subview(v, ti, tj, tk, tl);
+              for (int i = 0; i < T0; ++i) {
+                for (int j = 0; j < T1; ++j) {
+                  for (int k = 0; k < T2; ++k) {
+                    for (int l = 0; l < T3; ++l) {
+                      if (tile_subview(i, j, k, l) !=
+                          v(ti * T0 + i, tj * T1 + j, tk * T2 + k,
+                            tl * T3 + l)) {
+                        ++counter[2];
+                      }
 #ifdef KOKKOS_VERBOSE_LAYOUTTILED_OUTPUT
-          std::cout << "idx0,idx1,idx2,idx3 = " << ti*T0 + i << "," << tj*T1 + j << "," << tk*T2 + k << "," << tl*T3 + l<< std::endl;
-          std::cout << "ti,tj,tk,tl: " << ti << "," << tj << "," << tk << "," << tl << ","
-          << "  i,j,k,l: " <<  i << "," << j << "," << k << "," << l
-          << "  v = " << v(ti*T0 + i, tj*T1+j, tk*T2 + k, tl*T3 + l) 
-          << "  flat idx = " << ( ti + tj*NT0 + tk*NT0*NT1 + tl*NT0*NT1*NT2 )*FT + ( i*T1*T2*T3 + j*T2*T3 + k*T3 + l ) << std::endl;
-          std::cout << "subview_tile output = " << tile_subview(i,j,k,l) << std::endl;
-          std::cout << "subview tile rank = " << Kokkos::rank(tile_subview) << std::endl;
+                      std::cout << "idx0,idx1,idx2,idx3 = " << ti * T0 + i
+                                << "," << tj * T1 + j << "," << tk * T2 + k
+                                << "," << tl * T3 + l << std::endl;
+                      std::cout
+                          << "ti,tj,tk,tl: " << ti << "," << tj << "," << tk
+                          << "," << tl << ","
+                          << "  i,j,k,l: " << i << "," << j << "," << k << ","
+                          << l << "  v = "
+                          << v(ti * T0 + i, tj * T1 + j, tk * T2 + k,
+                               tl * T3 + l)
+                          << "  flat idx = "
+                          << (ti + tj * NT0 + tk * NT0 * NT1 +
+                              tl * NT0 * NT1 * NT2) *
+                                     FT +
+                                 (i * T1 * T2 * T3 + j * T2 * T3 + k * T3 + l)
+                          << std::endl;
+                      std::cout << "subview_tile output = "
+                                << tile_subview(i, j, k, l) << std::endl;
+                      std::cout << "subview tile rank = "
+                                << Kokkos::rank(tile_subview) << std::endl;
 #endif
-        } } } }
-      } } } }
-    } // end scope
+                    }
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
+    }  // end scope
 
     // Create RR View
     {
-      Kokkos::View< Scalar****, LayoutRR_4D_2x4x4x2, Kokkos::HostSpace > v("v", N0, N1, N2, N3);
-      for ( int ti = 0; ti < NT0; ++ti ) {
-      for ( int tj = 0; tj < NT1; ++tj ) {
-      for ( int tk = 0; tk < NT2; ++tk ) {
-      for ( int tl = 0; tl < NT3; ++tl ) {
-        for ( int i = 0; i < T0; ++i ) {
-        for ( int j = 0; j < T1; ++j ) {
-        for ( int k = 0; k < T2; ++k ) {
-        for ( int l = 0; l < T3; ++l ) {
-          v(ti*T0 + i, tj*T1+j, tk*T2 + k, tl*T3 + l) = ( ti*NT1*NT2*NT3 + tj*NT2*NT3 + tk*NT3 + tl )*FT + ( i*T1*T2*T3 + j*T2*T3 + k*T3 + l );
-        } } } }
-      } } } }
+      Kokkos::View<Scalar****, LayoutRR_4D_2x4x4x2, Kokkos::HostSpace> v(
+          "v", N0, N1, N2, N3);
+      for (int ti = 0; ti < NT0; ++ti) {
+        for (int tj = 0; tj < NT1; ++tj) {
+          for (int tk = 0; tk < NT2; ++tk) {
+            for (int tl = 0; tl < NT3; ++tl) {
+              for (int i = 0; i < T0; ++i) {
+                for (int j = 0; j < T1; ++j) {
+                  for (int k = 0; k < T2; ++k) {
+                    for (int l = 0; l < T3; ++l) {
+                      v(ti * T0 + i, tj * T1 + j, tk * T2 + k, tl * T3 + l) =
+                          (ti * NT1 * NT2 * NT3 + tj * NT2 * NT3 + tk * NT3 +
+                           tl) *
+                              FT +
+                          (i * T1 * T2 * T3 + j * T2 * T3 + k * T3 + l);
+                    }
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
 
-      for ( int ti = 0; ti < NT0; ++ti ) {
-      for ( int tj = 0; tj < NT1; ++tj ) {
-      for ( int tk = 0; tk < NT2; ++tk ) {
-      for ( int tl = 0; tl < NT3; ++tl ) {
-        auto tile_subview = Kokkos::tile_subview( v, ti, tj, tk, tl );
-        for ( int i = 0; i < T0; ++i ) {
-        for ( int j = 0; j < T1; ++j ) {
-        for ( int k = 0; k < T2; ++k ) {
-        for ( int l = 0; l < T3; ++l ) {
-          if ( tile_subview(i,j,k,l) != v(ti*T0+i, tj*T1+j, tk*T2+k, tl*T3 + l) ) { ++counter[3]; }
+      for (int ti = 0; ti < NT0; ++ti) {
+        for (int tj = 0; tj < NT1; ++tj) {
+          for (int tk = 0; tk < NT2; ++tk) {
+            for (int tl = 0; tl < NT3; ++tl) {
+              auto tile_subview = Kokkos::tile_subview(v, ti, tj, tk, tl);
+              for (int i = 0; i < T0; ++i) {
+                for (int j = 0; j < T1; ++j) {
+                  for (int k = 0; k < T2; ++k) {
+                    for (int l = 0; l < T3; ++l) {
+                      if (tile_subview(i, j, k, l) !=
+                          v(ti * T0 + i, tj * T1 + j, tk * T2 + k,
+                            tl * T3 + l)) {
+                        ++counter[3];
+                      }
 #ifdef KOKKOS_VERBOSE_LAYOUTTILED_OUTPUT
-          std::cout << "idx0,idx1,idx2,idx3 = " << ti*T0 + i << "," << tj*T1 + j << "," << tk*T2 + k << "," << tl*T3 + l<< std::endl;
-          std::cout << "ti,tj,tk,tl: " << ti << "," << tj << "," << tk << "," << tl << ","
-          << "  i,j,k,l: " <<  i << "," << j << "," << k << "," << l
-          << "  v = " << v(ti*T0 + i, tj*T1+j, tk*T2 + k, tl*T3 + l) 
-          << "  flat idx = " << ( ti*NT1*NT2*NT3 + tj*NT2*NT3 + tk*NT3 + tl )*FT + ( i*T1*T2*T3 + j*T2*T3 + k*T3 + l ) << std::endl;
-          std::cout << "subview_tile output = " << tile_subview(i,j,k,l) << std::endl;
-          std::cout << "subview tile rank = " << Kokkos::rank(tile_subview) << std::endl;
+                      std::cout << "idx0,idx1,idx2,idx3 = " << ti * T0 + i
+                                << "," << tj * T1 + j << "," << tk * T2 + k
+                                << "," << tl * T3 + l << std::endl;
+                      std::cout
+                          << "ti,tj,tk,tl: " << ti << "," << tj << "," << tk
+                          << "," << tl << ","
+                          << "  i,j,k,l: " << i << "," << j << "," << k << ","
+                          << l << "  v = "
+                          << v(ti * T0 + i, tj * T1 + j, tk * T2 + k,
+                               tl * T3 + l)
+                          << "  flat idx = "
+                          << (ti * NT1 * NT2 * NT3 + tj * NT2 * NT3 + tk * NT3 +
+                              tl) * FT +
+                                 (i * T1 * T2 * T3 + j * T2 * T3 + k * T3 + l)
+                          << std::endl;
+                      std::cout << "subview_tile output = "
+                                << tile_subview(i, j, k, l) << std::endl;
+                      std::cout << "subview tile rank = "
+                                << Kokkos::rank(tile_subview) << std::endl;
 #endif
-        } } } }
-      } } } }
-    } // end scope
+                    }
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
+    }  // end scope
 
 #ifdef KOKKOS_VERBOSE_LAYOUTTILED_OUTPUT
     std::cout << "subview_tile vs view errors:\n"
-      << " LL: " << counter[0]
-      << " RL: " << counter[1]
-      << " LR: " << counter[2]
-      << " RR: " << counter[3] 
-      << std::endl;
+              << " LL: " << counter[0] << " RL: " << counter[1]
+              << " LR: " << counter[2] << " RR: " << counter[3] << std::endl;
 #endif
 
     ASSERT_EQ(counter[0], long(0));
@@ -1191,25 +1752,29 @@ struct TestViewLayoutTiled {
     ASSERT_EQ(counter[2], long(0));
     ASSERT_EQ(counter[3], long(0));
 
-  } // end test_view_layout_tiled_subtile_4d
+  }  // end test_view_layout_tiled_subtile_4d
 
-}; // end TestViewLayoutTiled struct
+};  // end TestViewLayoutTiled struct
 
-} // namespace
+}  // namespace
 
-TEST_F( TEST_CATEGORY , view_layouttiled) {
-  // These two examples are iterating by tile, then within a tile - not by extents
-  // If N# is not a power of two, but want to iterate by tile then within a tile, need to check that mapped index is within extent
-  TestViewLayoutTiled< TEST_EXECSPACE >::test_view_layout_tiled_2d( 4, 12 );
-  TestViewLayoutTiled< TEST_EXECSPACE >::test_view_layout_tiled_3d( 4, 12, 16 );
-  TestViewLayoutTiled< TEST_EXECSPACE >::test_view_layout_tiled_4d( 4, 12, 16, 12 );
+TEST(TEST_CATEGORY, view_layouttiled) {
+  // These two examples are iterating by tile, then within a tile - not by
+  // extents If N# is not a power of two, but want to iterate by tile then
+  // within a tile, need to check that mapped index is within extent
+  TestViewLayoutTiled<TEST_EXECSPACE>::test_view_layout_tiled_2d(4, 12);
+  TestViewLayoutTiled<TEST_EXECSPACE>::test_view_layout_tiled_3d(4, 12, 16);
+  TestViewLayoutTiled<TEST_EXECSPACE>::test_view_layout_tiled_4d(4, 12, 16, 12);
 }
-TEST_F( TEST_CATEGORY , view_layouttiled_subtile) {
-  // These two examples are iterating by tile, then within a tile - not by extents
-  // If N# is not a power of two, but want to iterate by tile then within a tile, need to check that mapped index is within extent
-  TestViewLayoutTiled< TEST_EXECSPACE >::test_view_layout_tiled_subtile_2d( 4, 12 );
-  TestViewLayoutTiled< TEST_EXECSPACE >::test_view_layout_tiled_subtile_3d( 4, 12, 16 );
-  TestViewLayoutTiled< TEST_EXECSPACE >::test_view_layout_tiled_subtile_4d( 4, 12, 16, 12 );
+TEST(TEST_CATEGORY, view_layouttiled_subtile) {
+  // These two examples are iterating by tile, then within a tile - not by
+  // extents If N# is not a power of two, but want to iterate by tile then
+  // within a tile, need to check that mapped index is within extent
+  TestViewLayoutTiled<TEST_EXECSPACE>::test_view_layout_tiled_subtile_2d(4, 12);
+  TestViewLayoutTiled<TEST_EXECSPACE>::test_view_layout_tiled_subtile_3d(4, 12,
+                                                                         16);
+  TestViewLayoutTiled<TEST_EXECSPACE>::test_view_layout_tiled_subtile_4d(
+      4, 12, 16, 12);
 }
 #endif
-} // namespace Test
+}  // namespace Test
diff --git a/lib/kokkos/core/unit_test/TestViewMapping_a.hpp b/lib/kokkos/core/unit_test/TestViewMapping_a.hpp
index 69247902cd..5e27cc5e51 100644
--- a/lib/kokkos/core/unit_test/TestViewMapping_a.hpp
+++ b/lib/kokkos/core/unit_test/TestViewMapping_a.hpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -51,222 +52,224 @@
 
 namespace Test {
 
-template< class Space >
-void test_view_mapping()
-{
+template <class Space>
+void test_view_mapping() {
   typedef typename Space::execution_space ExecSpace;
 
-  typedef Kokkos::Impl::ViewDimension<>  dim_0;
-  typedef Kokkos::Impl::ViewDimension< 2 > dim_s2;
-  typedef Kokkos::Impl::ViewDimension< 2, 3 > dim_s2_s3;
-  typedef Kokkos::Impl::ViewDimension< 2, 3, 4 > dim_s2_s3_s4;
+  typedef Kokkos::Impl::ViewDimension<> dim_0;
+  typedef Kokkos::Impl::ViewDimension<2> dim_s2;
+  typedef Kokkos::Impl::ViewDimension<2, 3> dim_s2_s3;
+  typedef Kokkos::Impl::ViewDimension<2, 3, 4> dim_s2_s3_s4;
 
-  typedef Kokkos::Impl::ViewDimension< 0 > dim_s0;
-  typedef Kokkos::Impl::ViewDimension< 0, 3 > dim_s0_s3;
-  typedef Kokkos::Impl::ViewDimension< 0, 3, 4 > dim_s0_s3_s4;
+  typedef Kokkos::Impl::ViewDimension<0> dim_s0;
+  typedef Kokkos::Impl::ViewDimension<0, 3> dim_s0_s3;
+  typedef Kokkos::Impl::ViewDimension<0, 3, 4> dim_s0_s3_s4;
 
-  typedef Kokkos::Impl::ViewDimension< 0, 0 > dim_s0_s0;
-  typedef Kokkos::Impl::ViewDimension< 0, 0, 4 > dim_s0_s0_s4;
+  typedef Kokkos::Impl::ViewDimension<0, 0> dim_s0_s0;
+  typedef Kokkos::Impl::ViewDimension<0, 0, 4> dim_s0_s0_s4;
 
-  typedef Kokkos::Impl::ViewDimension< 0, 0, 0 > dim_s0_s0_s0;
-  typedef Kokkos::Impl::ViewDimension< 0, 0, 0, 0 > dim_s0_s0_s0_s0;
-  typedef Kokkos::Impl::ViewDimension< 0, 0, 0, 0, 0 > dim_s0_s0_s0_s0_s0;
-  typedef Kokkos::Impl::ViewDimension< 0, 0, 0, 0, 0, 0 > dim_s0_s0_s0_s0_s0_s0;
-  typedef Kokkos::Impl::ViewDimension< 0, 0, 0, 0, 0, 0, 0 > dim_s0_s0_s0_s0_s0_s0_s0;
-  typedef Kokkos::Impl::ViewDimension< 0, 0, 0, 0, 0, 0, 0, 0 > dim_s0_s0_s0_s0_s0_s0_s0_s0;
+  typedef Kokkos::Impl::ViewDimension<0, 0, 0> dim_s0_s0_s0;
+  typedef Kokkos::Impl::ViewDimension<0, 0, 0, 0> dim_s0_s0_s0_s0;
+  typedef Kokkos::Impl::ViewDimension<0, 0, 0, 0, 0> dim_s0_s0_s0_s0_s0;
+  typedef Kokkos::Impl::ViewDimension<0, 0, 0, 0, 0, 0> dim_s0_s0_s0_s0_s0_s0;
+  typedef Kokkos::Impl::ViewDimension<0, 0, 0, 0, 0, 0, 0>
+      dim_s0_s0_s0_s0_s0_s0_s0;
+  typedef Kokkos::Impl::ViewDimension<0, 0, 0, 0, 0, 0, 0, 0>
+      dim_s0_s0_s0_s0_s0_s0_s0_s0;
 
   // Fully static dimensions should not be larger than an int.
-  ASSERT_LE( sizeof( dim_0 ), sizeof( int ) );
-  ASSERT_LE( sizeof( dim_s2 ), sizeof( int ) );
-  ASSERT_LE( sizeof( dim_s2_s3 ), sizeof( int ) );
-  ASSERT_LE( sizeof( dim_s2_s3_s4 ), sizeof( int ) );
+  ASSERT_LE(sizeof(dim_0), sizeof(int));
+  ASSERT_LE(sizeof(dim_s2), sizeof(int));
+  ASSERT_LE(sizeof(dim_s2_s3), sizeof(int));
+  ASSERT_LE(sizeof(dim_s2_s3_s4), sizeof(int));
 
   // Rank 1 is size_t.
-  ASSERT_EQ( sizeof( dim_s0 ), sizeof( size_t ) );
-  ASSERT_EQ( sizeof( dim_s0_s3 ), sizeof( size_t ) );
-  ASSERT_EQ( sizeof( dim_s0_s3_s4 ), sizeof( size_t ) );
+  ASSERT_EQ(sizeof(dim_s0), sizeof(size_t));
+  ASSERT_EQ(sizeof(dim_s0_s3), sizeof(size_t));
+  ASSERT_EQ(sizeof(dim_s0_s3_s4), sizeof(size_t));
 
   // Allow for padding.
-  ASSERT_LE( sizeof( dim_s0_s0 ), 2 * sizeof( size_t ) );
-  ASSERT_LE( sizeof( dim_s0_s0_s4 ), 2 * sizeof( size_t ) );
+  ASSERT_LE(sizeof(dim_s0_s0), 2 * sizeof(size_t));
+  ASSERT_LE(sizeof(dim_s0_s0_s4), 2 * sizeof(size_t));
 
-  ASSERT_LE( sizeof( dim_s0_s0_s0 ), 4 * sizeof( size_t ) );
-  ASSERT_EQ( sizeof( dim_s0_s0_s0_s0 ), 4 * sizeof( unsigned ) );
-  ASSERT_LE( sizeof( dim_s0_s0_s0_s0_s0 ), 6 * sizeof( unsigned ) );
-  ASSERT_EQ( sizeof( dim_s0_s0_s0_s0_s0_s0 ), 6 * sizeof( unsigned ) );
-  ASSERT_LE( sizeof( dim_s0_s0_s0_s0_s0_s0_s0 ), 8 * sizeof( unsigned ) );
-  ASSERT_EQ( sizeof( dim_s0_s0_s0_s0_s0_s0_s0_s0 ), 8 * sizeof( unsigned ) );
+  ASSERT_LE(sizeof(dim_s0_s0_s0), 4 * sizeof(size_t));
+  ASSERT_EQ(sizeof(dim_s0_s0_s0_s0), 4 * sizeof(unsigned));
+  ASSERT_LE(sizeof(dim_s0_s0_s0_s0_s0), 6 * sizeof(unsigned));
+  ASSERT_EQ(sizeof(dim_s0_s0_s0_s0_s0_s0), 6 * sizeof(unsigned));
+  ASSERT_LE(sizeof(dim_s0_s0_s0_s0_s0_s0_s0), 8 * sizeof(unsigned));
+  ASSERT_EQ(sizeof(dim_s0_s0_s0_s0_s0_s0_s0_s0), 8 * sizeof(unsigned));
 
-  static_assert( int( dim_0::rank ) == int( 0 ), "" );
-  static_assert( int( dim_0::rank_dynamic ) == int( 0 ), "" );
-  static_assert( int( dim_0::ArgN0 ) == 1, "" );
-  static_assert( int( dim_0::ArgN1 ) == 1, "" );
-  static_assert( int( dim_0::ArgN2 ) == 1, "" );
+  static_assert(int(dim_0::rank) == int(0), "");
+  static_assert(int(dim_0::rank_dynamic) == int(0), "");
+  static_assert(int(dim_0::ArgN0) == 1, "");
+  static_assert(int(dim_0::ArgN1) == 1, "");
+  static_assert(int(dim_0::ArgN2) == 1, "");
 
-  static_assert( int( dim_s2::rank ) == int( 1 ), "" );
-  static_assert( int( dim_s2::rank_dynamic ) == int( 0 ), "" );
-  static_assert( int( dim_s2::ArgN0 ) == 2, "" );
-  static_assert( int( dim_s2::ArgN1 ) == 1, "" );
+  static_assert(int(dim_s2::rank) == int(1), "");
+  static_assert(int(dim_s2::rank_dynamic) == int(0), "");
+  static_assert(int(dim_s2::ArgN0) == 2, "");
+  static_assert(int(dim_s2::ArgN1) == 1, "");
 
-  static_assert( int( dim_s2_s3::rank ) == int( 2 ), "" );
-  static_assert( int( dim_s2_s3::rank_dynamic ) == int( 0 ), "" );
-  static_assert( int( dim_s2_s3::ArgN0 ) == 2, "" );
-  static_assert( int( dim_s2_s3::ArgN1 ) == 3, "" );
-  static_assert( int( dim_s2_s3::ArgN2 ) == 1, "" );
+  static_assert(int(dim_s2_s3::rank) == int(2), "");
+  static_assert(int(dim_s2_s3::rank_dynamic) == int(0), "");
+  static_assert(int(dim_s2_s3::ArgN0) == 2, "");
+  static_assert(int(dim_s2_s3::ArgN1) == 3, "");
+  static_assert(int(dim_s2_s3::ArgN2) == 1, "");
 
-  static_assert( int( dim_s2_s3_s4::rank ) == int( 3 ), "" );
-  static_assert( int( dim_s2_s3_s4::rank_dynamic ) == int( 0 ), "" );
-  static_assert( int( dim_s2_s3_s4::ArgN0 ) == 2, "" );
-  static_assert( int( dim_s2_s3_s4::ArgN1 ) == 3, "" );
-  static_assert( int( dim_s2_s3_s4::ArgN2 ) == 4, "" );
-  static_assert( int( dim_s2_s3_s4::ArgN3 ) == 1, "" );
+  static_assert(int(dim_s2_s3_s4::rank) == int(3), "");
+  static_assert(int(dim_s2_s3_s4::rank_dynamic) == int(0), "");
+  static_assert(int(dim_s2_s3_s4::ArgN0) == 2, "");
+  static_assert(int(dim_s2_s3_s4::ArgN1) == 3, "");
+  static_assert(int(dim_s2_s3_s4::ArgN2) == 4, "");
+  static_assert(int(dim_s2_s3_s4::ArgN3) == 1, "");
 
-  static_assert( int( dim_s0::rank ) == int( 1 ), "" );
-  static_assert( int( dim_s0::rank_dynamic ) == int( 1 ), "" );
+  static_assert(int(dim_s0::rank) == int(1), "");
+  static_assert(int(dim_s0::rank_dynamic) == int(1), "");
 
-  static_assert( int( dim_s0_s3::rank ) == int( 2 ), "" );
-  static_assert( int( dim_s0_s3::rank_dynamic ) == int( 1 ), "" );
-  static_assert( int( dim_s0_s3::ArgN0 ) == 0, "" );
-  static_assert( int( dim_s0_s3::ArgN1 ) == 3, "" );
+  static_assert(int(dim_s0_s3::rank) == int(2), "");
+  static_assert(int(dim_s0_s3::rank_dynamic) == int(1), "");
+  static_assert(int(dim_s0_s3::ArgN0) == 0, "");
+  static_assert(int(dim_s0_s3::ArgN1) == 3, "");
 
-  static_assert( int( dim_s0_s3_s4::rank ) == int( 3 ), "" );
-  static_assert( int( dim_s0_s3_s4::rank_dynamic ) == int( 1 ), "" );
-  static_assert( int( dim_s0_s3_s4::ArgN0 ) == 0, "" );
-  static_assert( int( dim_s0_s3_s4::ArgN1 ) == 3, "" );
-  static_assert( int( dim_s0_s3_s4::ArgN2 ) == 4, "" );
+  static_assert(int(dim_s0_s3_s4::rank) == int(3), "");
+  static_assert(int(dim_s0_s3_s4::rank_dynamic) == int(1), "");
+  static_assert(int(dim_s0_s3_s4::ArgN0) == 0, "");
+  static_assert(int(dim_s0_s3_s4::ArgN1) == 3, "");
+  static_assert(int(dim_s0_s3_s4::ArgN2) == 4, "");
 
-  static_assert( int( dim_s0_s0_s4::rank ) == int( 3 ), "" );
-  static_assert( int( dim_s0_s0_s4::rank_dynamic ) == int( 2 ), "" );
-  static_assert( int( dim_s0_s0_s4::ArgN0 ) == 0, "" );
-  static_assert( int( dim_s0_s0_s4::ArgN1 ) == 0, "" );
-  static_assert( int( dim_s0_s0_s4::ArgN2 ) == 4, "" );
+  static_assert(int(dim_s0_s0_s4::rank) == int(3), "");
+  static_assert(int(dim_s0_s0_s4::rank_dynamic) == int(2), "");
+  static_assert(int(dim_s0_s0_s4::ArgN0) == 0, "");
+  static_assert(int(dim_s0_s0_s4::ArgN1) == 0, "");
+  static_assert(int(dim_s0_s0_s4::ArgN2) == 4, "");
 
-  static_assert( int( dim_s0_s0_s0::rank ) == int( 3 ), "" );
-  static_assert( int( dim_s0_s0_s0::rank_dynamic ) == int( 3 ), "" );
+  static_assert(int(dim_s0_s0_s0::rank) == int(3), "");
+  static_assert(int(dim_s0_s0_s0::rank_dynamic) == int(3), "");
 
-  static_assert( int( dim_s0_s0_s0_s0::rank ) == int( 4 ), "" );
-  static_assert( int( dim_s0_s0_s0_s0::rank_dynamic ) == int( 4 ), "" );
+  static_assert(int(dim_s0_s0_s0_s0::rank) == int(4), "");
+  static_assert(int(dim_s0_s0_s0_s0::rank_dynamic) == int(4), "");
 
-  static_assert( int( dim_s0_s0_s0_s0_s0::rank ) == int( 5 ), "" );
-  static_assert( int( dim_s0_s0_s0_s0_s0::rank_dynamic ) == int( 5 ), "" );
+  static_assert(int(dim_s0_s0_s0_s0_s0::rank) == int(5), "");
+  static_assert(int(dim_s0_s0_s0_s0_s0::rank_dynamic) == int(5), "");
 
-  static_assert( int( dim_s0_s0_s0_s0_s0_s0::rank ) == int( 6 ), "" );
-  static_assert( int( dim_s0_s0_s0_s0_s0_s0::rank_dynamic ) == int( 6 ), "" );
+  static_assert(int(dim_s0_s0_s0_s0_s0_s0::rank) == int(6), "");
+  static_assert(int(dim_s0_s0_s0_s0_s0_s0::rank_dynamic) == int(6), "");
 
-  static_assert( int( dim_s0_s0_s0_s0_s0_s0_s0::rank ) == int( 7 ), "" );
-  static_assert( int( dim_s0_s0_s0_s0_s0_s0_s0::rank_dynamic ) == int( 7 ), "" );
+  static_assert(int(dim_s0_s0_s0_s0_s0_s0_s0::rank) == int(7), "");
+  static_assert(int(dim_s0_s0_s0_s0_s0_s0_s0::rank_dynamic) == int(7), "");
 
-  static_assert( int( dim_s0_s0_s0_s0_s0_s0_s0_s0::rank ) == int( 8 ), "" );
-  static_assert( int( dim_s0_s0_s0_s0_s0_s0_s0_s0::rank_dynamic ) == int( 8 ), "" );
+  static_assert(int(dim_s0_s0_s0_s0_s0_s0_s0_s0::rank) == int(8), "");
+  static_assert(int(dim_s0_s0_s0_s0_s0_s0_s0_s0::rank_dynamic) == int(8), "");
 
-  dim_s0          d1( 2, 3, 4, 5, 6, 7, 8, 9 );
-  dim_s0_s0       d2( 2, 3, 4, 5, 6, 7, 8, 9 );
-  dim_s0_s0_s0    d3( 2, 3, 4, 5, 6, 7, 8, 9 );
-  dim_s0_s0_s0_s0 d4( 2, 3, 4, 5, 6, 7, 8, 9 );
+  dim_s0 d1(2, 3, 4, 5, 6, 7, 8, 9);
+  dim_s0_s0 d2(2, 3, 4, 5, 6, 7, 8, 9);
+  dim_s0_s0_s0 d3(2, 3, 4, 5, 6, 7, 8, 9);
+  dim_s0_s0_s0_s0 d4(2, 3, 4, 5, 6, 7, 8, 9);
 
-  ASSERT_EQ( d1.N0, 2 );
-  ASSERT_EQ( d2.N0, 2 );
-  ASSERT_EQ( d3.N0, 2 );
-  ASSERT_EQ( d4.N0, 2 );
+  ASSERT_EQ(d1.N0, 2);
+  ASSERT_EQ(d2.N0, 2);
+  ASSERT_EQ(d3.N0, 2);
+  ASSERT_EQ(d4.N0, 2);
 
-  ASSERT_EQ( d1.N1, 1 );
-  ASSERT_EQ( d2.N1, 3 );
-  ASSERT_EQ( d3.N1, 3 );
-  ASSERT_EQ( d4.N1, 3 );
+  ASSERT_EQ(d1.N1, 1);
+  ASSERT_EQ(d2.N1, 3);
+  ASSERT_EQ(d3.N1, 3);
+  ASSERT_EQ(d4.N1, 3);
 
-  ASSERT_EQ( d1.N2, 1 );
-  ASSERT_EQ( d2.N2, 1 );
-  ASSERT_EQ( d3.N2, 4 );
-  ASSERT_EQ( d4.N2, 4 );
+  ASSERT_EQ(d1.N2, 1);
+  ASSERT_EQ(d2.N2, 1);
+  ASSERT_EQ(d3.N2, 4);
+  ASSERT_EQ(d4.N2, 4);
 
-  ASSERT_EQ( d1.N3, 1 );
-  ASSERT_EQ( d2.N3, 1 );
-  ASSERT_EQ( d3.N3, 1 );
-  ASSERT_EQ( d4.N3, 5 );
+  ASSERT_EQ(d1.N3, 1);
+  ASSERT_EQ(d2.N3, 1);
+  ASSERT_EQ(d3.N3, 1);
+  ASSERT_EQ(d4.N3, 5);
 
   //----------------------------------------
 
-  typedef Kokkos::Impl::ViewOffset< dim_s0_s0_s0, Kokkos::LayoutStride > stride_s0_s0_s0;
+  typedef Kokkos::Impl::ViewOffset<dim_s0_s0_s0, Kokkos::LayoutStride>
+      stride_s0_s0_s0;
 
   //----------------------------------------
   // Static dimension.
   {
-    typedef Kokkos::Impl::ViewOffset< dim_s2_s3_s4, Kokkos::LayoutLeft > left_s2_s3_s4;
+    typedef Kokkos::Impl::ViewOffset<dim_s2_s3_s4, Kokkos::LayoutLeft>
+        left_s2_s3_s4;
 
-    ASSERT_EQ( sizeof( left_s2_s3_s4 ), sizeof( dim_s2_s3_s4 ) );
+    ASSERT_EQ(sizeof(left_s2_s3_s4), sizeof(dim_s2_s3_s4));
 
     left_s2_s3_s4 off3;
 
-    stride_s0_s0_s0 stride3( off3 );
+    stride_s0_s0_s0 stride3(off3);
 
-    ASSERT_EQ( off3.stride_0(), 1 );
-    ASSERT_EQ( off3.stride_1(), 2 );
-    ASSERT_EQ( off3.stride_2(), 6 );
-    ASSERT_EQ( off3.span(), 24 );
+    ASSERT_EQ(off3.stride_0(), 1);
+    ASSERT_EQ(off3.stride_1(), 2);
+    ASSERT_EQ(off3.stride_2(), 6);
+    ASSERT_EQ(off3.span(), 24);
 
-    ASSERT_EQ( off3.stride_0(), stride3.stride_0() );
-    ASSERT_EQ( off3.stride_1(), stride3.stride_1() );
-    ASSERT_EQ( off3.stride_2(), stride3.stride_2() );
-    ASSERT_EQ( off3.span(), stride3.span() );
+    ASSERT_EQ(off3.stride_0(), stride3.stride_0());
+    ASSERT_EQ(off3.stride_1(), stride3.stride_1());
+    ASSERT_EQ(off3.stride_2(), stride3.stride_2());
+    ASSERT_EQ(off3.span(), stride3.span());
 
     int offset = 0;
 
-    for ( int k = 0; k < 4; ++k )
-    for ( int j = 0; j < 3; ++j )
-    for ( int i = 0; i < 2; ++i, ++offset )
-    {
-      ASSERT_EQ( off3( i, j, k ), offset );
-      ASSERT_EQ( stride3( i, j, k ), off3( i, j, k ) );
-    }
+    for (int k = 0; k < 4; ++k)
+      for (int j = 0; j < 3; ++j)
+        for (int i = 0; i < 2; ++i, ++offset) {
+          ASSERT_EQ(off3(i, j, k), offset);
+          ASSERT_EQ(stride3(i, j, k), off3(i, j, k));
+        }
   }
 
   //----------------------------------------
   // Small dimension is unpadded.
   {
-    typedef Kokkos::Impl::ViewOffset< dim_s0_s0_s4, Kokkos::LayoutLeft > left_s0_s0_s4;
+    typedef Kokkos::Impl::ViewOffset<dim_s0_s0_s4, Kokkos::LayoutLeft>
+        left_s0_s0_s4;
 
-    left_s0_s0_s4 dyn_off3( std::integral_constant< unsigned, sizeof( int ) >()
-                          , Kokkos::LayoutLeft( 2, 3, 0, 0, 0, 0, 0, 0 ) );
+    left_s0_s0_s4 dyn_off3(std::integral_constant<unsigned, sizeof(int)>(),
+                           Kokkos::LayoutLeft(2, 3, 0, 0, 0, 0, 0, 0));
 
-    stride_s0_s0_s0  stride3( dyn_off3 );
+    stride_s0_s0_s0 stride3(dyn_off3);
 
-    ASSERT_EQ( dyn_off3.m_dim.rank, 3 );
-    ASSERT_EQ( dyn_off3.m_dim.N0, 2 );
-    ASSERT_EQ( dyn_off3.m_dim.N1, 3 );
-    ASSERT_EQ( dyn_off3.m_dim.N2, 4 );
-    ASSERT_EQ( dyn_off3.m_dim.N3, 1 );
-    ASSERT_EQ( dyn_off3.size(), 2 * 3 * 4 );
+    ASSERT_EQ(dyn_off3.m_dim.rank, 3);
+    ASSERT_EQ(dyn_off3.m_dim.N0, 2);
+    ASSERT_EQ(dyn_off3.m_dim.N1, 3);
+    ASSERT_EQ(dyn_off3.m_dim.N2, 4);
+    ASSERT_EQ(dyn_off3.m_dim.N3, 1);
+    ASSERT_EQ(dyn_off3.size(), 2 * 3 * 4);
 
     const Kokkos::LayoutLeft layout = dyn_off3.layout();
 
-    ASSERT_EQ( layout.dimension[0], 2 );
-    ASSERT_EQ( layout.dimension[1], 3 );
-    ASSERT_EQ( layout.dimension[2], 4 );
-    ASSERT_EQ( layout.dimension[3], 1 );
-    ASSERT_EQ( layout.dimension[4], 1 );
-    ASSERT_EQ( layout.dimension[5], 1 );
-    ASSERT_EQ( layout.dimension[6], 1 );
-    ASSERT_EQ( layout.dimension[7], 1 );
+    ASSERT_EQ(layout.dimension[0], 2);
+    ASSERT_EQ(layout.dimension[1], 3);
+    ASSERT_EQ(layout.dimension[2], 4);
+    ASSERT_EQ(layout.dimension[3], 1);
+    ASSERT_EQ(layout.dimension[4], 1);
+    ASSERT_EQ(layout.dimension[5], 1);
+    ASSERT_EQ(layout.dimension[6], 1);
+    ASSERT_EQ(layout.dimension[7], 1);
 
-    ASSERT_EQ( stride3.m_dim.rank, 3 );
-    ASSERT_EQ( stride3.m_dim.N0, 2 );
-    ASSERT_EQ( stride3.m_dim.N1, 3 );
-    ASSERT_EQ( stride3.m_dim.N2, 4 );
-    ASSERT_EQ( stride3.m_dim.N3, 1 );
-    ASSERT_EQ( stride3.size(), 2 * 3 * 4 );
+    ASSERT_EQ(stride3.m_dim.rank, 3);
+    ASSERT_EQ(stride3.m_dim.N0, 2);
+    ASSERT_EQ(stride3.m_dim.N1, 3);
+    ASSERT_EQ(stride3.m_dim.N2, 4);
+    ASSERT_EQ(stride3.m_dim.N3, 1);
+    ASSERT_EQ(stride3.size(), 2 * 3 * 4);
 
     int offset = 0;
 
-    for ( int k = 0; k < 4; ++k )
-    for ( int j = 0; j < 3; ++j )
-    for ( int i = 0; i < 2; ++i, ++offset )
-    {
-      ASSERT_EQ( offset, dyn_off3( i, j, k ) );
-      ASSERT_EQ( stride3( i, j, k ), dyn_off3( i, j, k ) );
-    }
+    for (int k = 0; k < 4; ++k)
+      for (int j = 0; j < 3; ++j)
+        for (int i = 0; i < 2; ++i, ++offset) {
+          ASSERT_EQ(offset, dyn_off3(i, j, k));
+          ASSERT_EQ(stride3(i, j, k), dyn_off3(i, j, k));
+        }
 
-    ASSERT_EQ( dyn_off3.span(), offset );
-    ASSERT_EQ( stride3.span(), dyn_off3.span() );
+    ASSERT_EQ(dyn_off3.span(), offset);
+    ASSERT_EQ(stride3.span(), dyn_off3.span());
   }
 
   //----------------------------------------
@@ -275,114 +278,114 @@ void test_view_mapping()
     constexpr int N0 = 2000;
     constexpr int N1 = 300;
 
-    typedef Kokkos::Impl::ViewOffset< dim_s0_s0_s4, Kokkos::LayoutLeft > left_s0_s0_s4;
+    typedef Kokkos::Impl::ViewOffset<dim_s0_s0_s4, Kokkos::LayoutLeft>
+        left_s0_s0_s4;
 
-    left_s0_s0_s4 dyn_off3( std::integral_constant< unsigned, sizeof( int ) >()
-                          , Kokkos::LayoutLeft( N0, N1, 0, 0, 0, 0, 0, 0 ) );
+    left_s0_s0_s4 dyn_off3(std::integral_constant<unsigned, sizeof(int)>(),
+                           Kokkos::LayoutLeft(N0, N1, 0, 0, 0, 0, 0, 0));
 
-    stride_s0_s0_s0  stride3( dyn_off3 );
+    stride_s0_s0_s0 stride3(dyn_off3);
 
-    ASSERT_EQ( dyn_off3.m_dim.rank, 3 );
-    ASSERT_EQ( dyn_off3.m_dim.N0, N0 );
-    ASSERT_EQ( dyn_off3.m_dim.N1, N1 );
-    ASSERT_EQ( dyn_off3.m_dim.N2, 4 );
-    ASSERT_EQ( dyn_off3.m_dim.N3, 1 );
-    ASSERT_EQ( dyn_off3.size(), N0 * N1 * 4 );
+    ASSERT_EQ(dyn_off3.m_dim.rank, 3);
+    ASSERT_EQ(dyn_off3.m_dim.N0, N0);
+    ASSERT_EQ(dyn_off3.m_dim.N1, N1);
+    ASSERT_EQ(dyn_off3.m_dim.N2, 4);
+    ASSERT_EQ(dyn_off3.m_dim.N3, 1);
+    ASSERT_EQ(dyn_off3.size(), N0 * N1 * 4);
 
-    ASSERT_EQ( stride3.m_dim.rank, 3 );
-    ASSERT_EQ( stride3.m_dim.N0, N0 );
-    ASSERT_EQ( stride3.m_dim.N1, N1 );
-    ASSERT_EQ( stride3.m_dim.N2, 4 );
-    ASSERT_EQ( stride3.m_dim.N3, 1 );
-    ASSERT_EQ( stride3.size(), N0 * N1 * 4 );
-    ASSERT_EQ( stride3.span(), dyn_off3.span() );
+    ASSERT_EQ(stride3.m_dim.rank, 3);
+    ASSERT_EQ(stride3.m_dim.N0, N0);
+    ASSERT_EQ(stride3.m_dim.N1, N1);
+    ASSERT_EQ(stride3.m_dim.N2, 4);
+    ASSERT_EQ(stride3.m_dim.N3, 1);
+    ASSERT_EQ(stride3.size(), N0 * N1 * 4);
+    ASSERT_EQ(stride3.span(), dyn_off3.span());
 
     int offset = 0;
 
-    for ( int k = 0; k < 4; ++k )
-    for ( int j = 0; j < N1; ++j )
-    for ( int i = 0; i < N0; ++i )
-    {
-      ASSERT_LE( offset, dyn_off3( i, j, k ) );
-      ASSERT_EQ( stride3( i, j, k ), dyn_off3( i, j, k ) );
-      offset = dyn_off3( i, j, k ) + 1;
-    }
+    for (int k = 0; k < 4; ++k)
+      for (int j = 0; j < N1; ++j)
+        for (int i = 0; i < N0; ++i) {
+          ASSERT_LE(offset, dyn_off3(i, j, k));
+          ASSERT_EQ(stride3(i, j, k), dyn_off3(i, j, k));
+          offset = dyn_off3(i, j, k) + 1;
+        }
 
-    ASSERT_LE( offset, dyn_off3.span() );
+    ASSERT_LE(offset, dyn_off3.span());
   }
 
   //----------------------------------------
   // Static dimension.
   {
-    typedef Kokkos::Impl::ViewOffset< dim_s2_s3_s4, Kokkos::LayoutRight > right_s2_s3_s4;
+    typedef Kokkos::Impl::ViewOffset<dim_s2_s3_s4, Kokkos::LayoutRight>
+        right_s2_s3_s4;
 
-    ASSERT_EQ( sizeof( right_s2_s3_s4 ), sizeof( dim_s2_s3_s4 ) );
+    ASSERT_EQ(sizeof(right_s2_s3_s4), sizeof(dim_s2_s3_s4));
 
     right_s2_s3_s4 off3;
 
-    stride_s0_s0_s0  stride3( off3 );
+    stride_s0_s0_s0 stride3(off3);
 
-    ASSERT_EQ( off3.stride_0(), 12 );
-    ASSERT_EQ( off3.stride_1(), 4 );
-    ASSERT_EQ( off3.stride_2(), 1 );
+    ASSERT_EQ(off3.stride_0(), 12);
+    ASSERT_EQ(off3.stride_1(), 4);
+    ASSERT_EQ(off3.stride_2(), 1);
 
-    ASSERT_EQ( off3.dimension_0(), stride3.dimension_0() );
-    ASSERT_EQ( off3.dimension_1(), stride3.dimension_1() );
-    ASSERT_EQ( off3.dimension_2(), stride3.dimension_2() );
-    ASSERT_EQ( off3.stride_0(), stride3.stride_0() );
-    ASSERT_EQ( off3.stride_1(), stride3.stride_1() );
-    ASSERT_EQ( off3.stride_2(), stride3.stride_2() );
-    ASSERT_EQ( off3.span(), stride3.span() );
+    ASSERT_EQ(off3.dimension_0(), stride3.dimension_0());
+    ASSERT_EQ(off3.dimension_1(), stride3.dimension_1());
+    ASSERT_EQ(off3.dimension_2(), stride3.dimension_2());
+    ASSERT_EQ(off3.stride_0(), stride3.stride_0());
+    ASSERT_EQ(off3.stride_1(), stride3.stride_1());
+    ASSERT_EQ(off3.stride_2(), stride3.stride_2());
+    ASSERT_EQ(off3.span(), stride3.span());
 
     int offset = 0;
 
-    for ( int i = 0; i < 2; ++i )
-    for ( int j = 0; j < 3; ++j )
-    for ( int k = 0; k < 4; ++k, ++offset )
-    {
-      ASSERT_EQ( off3( i, j, k ), offset );
-      ASSERT_EQ( off3( i, j, k ), stride3( i, j, k ) );
-    }
+    for (int i = 0; i < 2; ++i)
+      for (int j = 0; j < 3; ++j)
+        for (int k = 0; k < 4; ++k, ++offset) {
+          ASSERT_EQ(off3(i, j, k), offset);
+          ASSERT_EQ(off3(i, j, k), stride3(i, j, k));
+        }
 
-    ASSERT_EQ( off3.span(), offset );
+    ASSERT_EQ(off3.span(), offset);
   }
 
   //----------------------------------------
   // Small dimension is unpadded.
   {
-    typedef Kokkos::Impl::ViewOffset< dim_s0_s0_s4, Kokkos::LayoutRight > right_s0_s0_s4;
+    typedef Kokkos::Impl::ViewOffset<dim_s0_s0_s4, Kokkos::LayoutRight>
+        right_s0_s0_s4;
 
-    right_s0_s0_s4 dyn_off3( std::integral_constant< unsigned, sizeof( int ) >()
-                           , Kokkos::LayoutRight( 2, 3, 0, 0, 0, 0, 0, 0 ) );
+    right_s0_s0_s4 dyn_off3(std::integral_constant<unsigned, sizeof(int)>(),
+                            Kokkos::LayoutRight(2, 3, 0, 0, 0, 0, 0, 0));
 
-    stride_s0_s0_s0  stride3( dyn_off3 );
+    stride_s0_s0_s0 stride3(dyn_off3);
 
-    ASSERT_EQ( dyn_off3.m_dim.rank, 3 );
-    ASSERT_EQ( dyn_off3.m_dim.N0, 2 );
-    ASSERT_EQ( dyn_off3.m_dim.N1, 3 );
-    ASSERT_EQ( dyn_off3.m_dim.N2, 4 );
-    ASSERT_EQ( dyn_off3.m_dim.N3, 1 );
-    ASSERT_EQ( dyn_off3.size(), 2 * 3 * 4 );
+    ASSERT_EQ(dyn_off3.m_dim.rank, 3);
+    ASSERT_EQ(dyn_off3.m_dim.N0, 2);
+    ASSERT_EQ(dyn_off3.m_dim.N1, 3);
+    ASSERT_EQ(dyn_off3.m_dim.N2, 4);
+    ASSERT_EQ(dyn_off3.m_dim.N3, 1);
+    ASSERT_EQ(dyn_off3.size(), 2 * 3 * 4);
 
-    ASSERT_EQ( dyn_off3.dimension_0(), stride3.dimension_0() );
-    ASSERT_EQ( dyn_off3.dimension_1(), stride3.dimension_1() );
-    ASSERT_EQ( dyn_off3.dimension_2(), stride3.dimension_2() );
-    ASSERT_EQ( dyn_off3.stride_0(), stride3.stride_0() );
-    ASSERT_EQ( dyn_off3.stride_1(), stride3.stride_1() );
-    ASSERT_EQ( dyn_off3.stride_2(), stride3.stride_2() );
-    ASSERT_EQ( dyn_off3.span(), stride3.span() );
+    ASSERT_EQ(dyn_off3.dimension_0(), stride3.dimension_0());
+    ASSERT_EQ(dyn_off3.dimension_1(), stride3.dimension_1());
+    ASSERT_EQ(dyn_off3.dimension_2(), stride3.dimension_2());
+    ASSERT_EQ(dyn_off3.stride_0(), stride3.stride_0());
+    ASSERT_EQ(dyn_off3.stride_1(), stride3.stride_1());
+    ASSERT_EQ(dyn_off3.stride_2(), stride3.stride_2());
+    ASSERT_EQ(dyn_off3.span(), stride3.span());
 
     int offset = 0;
 
-    for ( int i = 0; i < 2; ++i )
-    for ( int j = 0; j < 3; ++j )
-    for ( int k = 0; k < 4; ++k, ++offset )
-    {
-      ASSERT_EQ( offset, dyn_off3( i, j, k ) );
-      ASSERT_EQ( dyn_off3( i, j, k ), stride3( i, j, k ) );
-    }
+    for (int i = 0; i < 2; ++i)
+      for (int j = 0; j < 3; ++j)
+        for (int k = 0; k < 4; ++k, ++offset) {
+          ASSERT_EQ(offset, dyn_off3(i, j, k));
+          ASSERT_EQ(dyn_off3(i, j, k), stride3(i, j, k));
+        }
 
-    ASSERT_EQ( dyn_off3.span(), offset );
+    ASSERT_EQ(dyn_off3.span(), offset);
   }
 
   //----------------------------------------
@@ -391,74 +394,71 @@ void test_view_mapping()
     constexpr int N0 = 2000;
     constexpr int N1 = 300;
 
-    typedef Kokkos::Impl::ViewOffset< dim_s0_s0_s4, Kokkos::LayoutRight > right_s0_s0_s4;
+    typedef Kokkos::Impl::ViewOffset<dim_s0_s0_s4, Kokkos::LayoutRight>
+        right_s0_s0_s4;
 
-    right_s0_s0_s4 dyn_off3( std::integral_constant< unsigned, sizeof( int ) >()
-                           , Kokkos::LayoutRight( N0, N1, 0, 0, 0, 0, 0, 0 ) );
+    right_s0_s0_s4 dyn_off3(std::integral_constant<unsigned, sizeof(int)>(),
+                            Kokkos::LayoutRight(N0, N1, 0, 0, 0, 0, 0, 0));
 
-    stride_s0_s0_s0  stride3( dyn_off3 );
+    stride_s0_s0_s0 stride3(dyn_off3);
 
-    ASSERT_EQ( dyn_off3.m_dim.rank, 3 );
-    ASSERT_EQ( dyn_off3.m_dim.N0, N0 );
-    ASSERT_EQ( dyn_off3.m_dim.N1, N1 );
-    ASSERT_EQ( dyn_off3.m_dim.N2, 4 );
-    ASSERT_EQ( dyn_off3.m_dim.N3, 1 );
-    ASSERT_EQ( dyn_off3.size(), N0 * N1 * 4 );
+    ASSERT_EQ(dyn_off3.m_dim.rank, 3);
+    ASSERT_EQ(dyn_off3.m_dim.N0, N0);
+    ASSERT_EQ(dyn_off3.m_dim.N1, N1);
+    ASSERT_EQ(dyn_off3.m_dim.N2, 4);
+    ASSERT_EQ(dyn_off3.m_dim.N3, 1);
+    ASSERT_EQ(dyn_off3.size(), N0 * N1 * 4);
 
-    ASSERT_EQ( dyn_off3.dimension_0(), stride3.dimension_0() );
-    ASSERT_EQ( dyn_off3.dimension_1(), stride3.dimension_1() );
-    ASSERT_EQ( dyn_off3.dimension_2(), stride3.dimension_2() );
-    ASSERT_EQ( dyn_off3.stride_0(), stride3.stride_0() );
-    ASSERT_EQ( dyn_off3.stride_1(), stride3.stride_1() );
-    ASSERT_EQ( dyn_off3.stride_2(), stride3.stride_2() );
-    ASSERT_EQ( dyn_off3.span(), stride3.span() );
+    ASSERT_EQ(dyn_off3.dimension_0(), stride3.dimension_0());
+    ASSERT_EQ(dyn_off3.dimension_1(), stride3.dimension_1());
+    ASSERT_EQ(dyn_off3.dimension_2(), stride3.dimension_2());
+    ASSERT_EQ(dyn_off3.stride_0(), stride3.stride_0());
+    ASSERT_EQ(dyn_off3.stride_1(), stride3.stride_1());
+    ASSERT_EQ(dyn_off3.stride_2(), stride3.stride_2());
+    ASSERT_EQ(dyn_off3.span(), stride3.span());
 
     int offset = 0;
 
-    for ( int i = 0; i < N0; ++i )
-    for ( int j = 0; j < N1; ++j )
-    for ( int k = 0; k < 4; ++k )
-    {
-      ASSERT_LE( offset, dyn_off3( i, j, k ) );
-      ASSERT_EQ( dyn_off3( i, j, k ), stride3( i, j, k ) );
-      offset = dyn_off3( i, j, k ) + 1;
-    }
+    for (int i = 0; i < N0; ++i)
+      for (int j = 0; j < N1; ++j)
+        for (int k = 0; k < 4; ++k) {
+          ASSERT_LE(offset, dyn_off3(i, j, k));
+          ASSERT_EQ(dyn_off3(i, j, k), stride3(i, j, k));
+          offset = dyn_off3(i, j, k) + 1;
+        }
 
-    ASSERT_LE( offset, dyn_off3.span() );
+    ASSERT_LE(offset, dyn_off3.span());
   }
 
   //----------------------------------------
   // Subview.
   {
     // Mapping rank 4 to rank 3
-    typedef Kokkos::Impl::SubviewExtents< 4, 3 > SubviewExtents;
+    typedef Kokkos::Impl::SubviewExtents<4, 3> SubviewExtents;
 
     constexpr int N0 = 1000;
     constexpr int N1 = 2000;
     constexpr int N2 = 3000;
     constexpr int N3 = 4000;
 
-    Kokkos::Impl::ViewDimension< N0, N1, N2, N3 > dim;
+    Kokkos::Impl::ViewDimension<N0, N1, N2, N3> dim;
 
-    SubviewExtents tmp( dim
-                      , N0 / 2
-                      , Kokkos::ALL
-                      , std::pair< int, int >( N2 / 4, 10 + N2 / 4 )
-                      , Kokkos::pair< int, int >( N3 / 4, 20 + N3 / 4 )
-                      );
+    SubviewExtents tmp(dim, N0 / 2, Kokkos::ALL,
+                       std::pair<int, int>(N2 / 4, 10 + N2 / 4),
+                       Kokkos::pair<int, int>(N3 / 4, 20 + N3 / 4));
 
-    ASSERT_EQ( tmp.domain_offset( 0 ), N0 / 2 );
-    ASSERT_EQ( tmp.domain_offset( 1 ), 0 );
-    ASSERT_EQ( tmp.domain_offset( 2 ), N2 / 4 );
-    ASSERT_EQ( tmp.domain_offset( 3 ), N3 / 4 );
+    ASSERT_EQ(tmp.domain_offset(0), N0 / 2);
+    ASSERT_EQ(tmp.domain_offset(1), 0);
+    ASSERT_EQ(tmp.domain_offset(2), N2 / 4);
+    ASSERT_EQ(tmp.domain_offset(3), N3 / 4);
 
-    ASSERT_EQ( tmp.range_index( 0 ), 1 );
-    ASSERT_EQ( tmp.range_index( 1 ), 2 );
-    ASSERT_EQ( tmp.range_index( 2 ), 3 );
+    ASSERT_EQ(tmp.range_index(0), 1);
+    ASSERT_EQ(tmp.range_index(1), 2);
+    ASSERT_EQ(tmp.range_index(2), 3);
 
-    ASSERT_EQ( tmp.range_extent( 0 ), N1 );
-    ASSERT_EQ( tmp.range_extent( 1 ), 10 );
-    ASSERT_EQ( tmp.range_extent( 2 ), 20 );
+    ASSERT_EQ(tmp.range_extent(0), N1);
+    ASSERT_EQ(tmp.range_extent(1), 10);
+    ASSERT_EQ(tmp.range_extent(2), 20);
   }
 
   {
@@ -469,36 +469,33 @@ void test_view_mapping()
     constexpr int sub_N1 = 200;
     constexpr int sub_N2 = 4;
 
-    typedef Kokkos::Impl::ViewOffset< dim_s0_s0_s4, Kokkos::LayoutLeft > left_s0_s0_s4;
+    typedef Kokkos::Impl::ViewOffset<dim_s0_s0_s4, Kokkos::LayoutLeft>
+        left_s0_s0_s4;
 
-    left_s0_s0_s4 dyn_off3( std::integral_constant< unsigned, sizeof( int ) >()
-                          , Kokkos::LayoutLeft( N0, N1, 0, 0, 0, 0, 0, 0 ) );
+    left_s0_s0_s4 dyn_off3(std::integral_constant<unsigned, sizeof(int)>(),
+                           Kokkos::LayoutLeft(N0, N1, 0, 0, 0, 0, 0, 0));
 
-    Kokkos::Impl::SubviewExtents< 3, 3 >
-      sub( dyn_off3.m_dim
-         , Kokkos::pair< int, int >( 0, sub_N0 )
-         , Kokkos::pair< int, int >( 0, sub_N1 )
-         , Kokkos::pair< int, int >( 0, sub_N2 )
-         );
+    Kokkos::Impl::SubviewExtents<3, 3> sub(
+        dyn_off3.m_dim, Kokkos::pair<int, int>(0, sub_N0),
+        Kokkos::pair<int, int>(0, sub_N1), Kokkos::pair<int, int>(0, sub_N2));
 
-    stride_s0_s0_s0  stride3( dyn_off3, sub );
+    stride_s0_s0_s0 stride3(dyn_off3, sub);
 
-    ASSERT_EQ( stride3.dimension_0(), sub_N0 );
-    ASSERT_EQ( stride3.dimension_1(), sub_N1 );
-    ASSERT_EQ( stride3.dimension_2(), sub_N2 );
-    ASSERT_EQ( stride3.size(), sub_N0 * sub_N1 * sub_N2 );
+    ASSERT_EQ(stride3.dimension_0(), sub_N0);
+    ASSERT_EQ(stride3.dimension_1(), sub_N1);
+    ASSERT_EQ(stride3.dimension_2(), sub_N2);
+    ASSERT_EQ(stride3.size(), sub_N0 * sub_N1 * sub_N2);
 
-    ASSERT_EQ( dyn_off3.stride_0(), stride3.stride_0() );
-    ASSERT_EQ( dyn_off3.stride_1(), stride3.stride_1() );
-    ASSERT_EQ( dyn_off3.stride_2(), stride3.stride_2() );
-    ASSERT_GE( dyn_off3.span()    , stride3.span() );
+    ASSERT_EQ(dyn_off3.stride_0(), stride3.stride_0());
+    ASSERT_EQ(dyn_off3.stride_1(), stride3.stride_1());
+    ASSERT_EQ(dyn_off3.stride_2(), stride3.stride_2());
+    ASSERT_GE(dyn_off3.span(), stride3.span());
 
-    for ( int k = 0; k < sub_N2; ++k )
-    for ( int j = 0; j < sub_N1; ++j )
-    for ( int i = 0; i < sub_N0; ++i )
-    {
-      ASSERT_EQ( stride3( i, j, k ), dyn_off3( i, j, k ) );
-    }
+    for (int k = 0; k < sub_N2; ++k)
+      for (int j = 0; j < sub_N1; ++j)
+        for (int i = 0; i < sub_N0; ++i) {
+          ASSERT_EQ(stride3(i, j, k), dyn_off3(i, j, k));
+        }
   }
 
   {
@@ -509,36 +506,33 @@ void test_view_mapping()
     constexpr int sub_N1 = 200;
     constexpr int sub_N2 = 4;
 
-    typedef Kokkos::Impl::ViewOffset< dim_s0_s0_s4, Kokkos::LayoutRight > right_s0_s0_s4;
+    typedef Kokkos::Impl::ViewOffset<dim_s0_s0_s4, Kokkos::LayoutRight>
+        right_s0_s0_s4;
 
-    right_s0_s0_s4 dyn_off3( std::integral_constant< unsigned, sizeof( int ) >()
-                           , Kokkos::LayoutRight( N0, N1, 0, 0, 0, 0, 0, 0 ) );
+    right_s0_s0_s4 dyn_off3(std::integral_constant<unsigned, sizeof(int)>(),
+                            Kokkos::LayoutRight(N0, N1, 0, 0, 0, 0, 0, 0));
 
-    Kokkos::Impl::SubviewExtents< 3, 3 >
-      sub( dyn_off3.m_dim
-         , Kokkos::pair< int, int >( 0, sub_N0 )
-         , Kokkos::pair< int, int >( 0, sub_N1 )
-         , Kokkos::pair< int, int >( 0, sub_N2 )
-         );
+    Kokkos::Impl::SubviewExtents<3, 3> sub(
+        dyn_off3.m_dim, Kokkos::pair<int, int>(0, sub_N0),
+        Kokkos::pair<int, int>(0, sub_N1), Kokkos::pair<int, int>(0, sub_N2));
 
-    stride_s0_s0_s0  stride3( dyn_off3, sub );
+    stride_s0_s0_s0 stride3(dyn_off3, sub);
 
-    ASSERT_EQ( stride3.dimension_0(), sub_N0 );
-    ASSERT_EQ( stride3.dimension_1(), sub_N1 );
-    ASSERT_EQ( stride3.dimension_2(), sub_N2 );
-    ASSERT_EQ( stride3.size(), sub_N0 * sub_N1 * sub_N2 );
+    ASSERT_EQ(stride3.dimension_0(), sub_N0);
+    ASSERT_EQ(stride3.dimension_1(), sub_N1);
+    ASSERT_EQ(stride3.dimension_2(), sub_N2);
+    ASSERT_EQ(stride3.size(), sub_N0 * sub_N1 * sub_N2);
 
-    ASSERT_EQ( dyn_off3.stride_0(), stride3.stride_0() );
-    ASSERT_EQ( dyn_off3.stride_1(), stride3.stride_1() );
-    ASSERT_EQ( dyn_off3.stride_2(), stride3.stride_2() );
-    ASSERT_GE( dyn_off3.span()    , stride3.span() );
+    ASSERT_EQ(dyn_off3.stride_0(), stride3.stride_0());
+    ASSERT_EQ(dyn_off3.stride_1(), stride3.stride_1());
+    ASSERT_EQ(dyn_off3.stride_2(), stride3.stride_2());
+    ASSERT_GE(dyn_off3.span(), stride3.span());
 
-    for ( int i = 0; i < sub_N0; ++i )
-    for ( int j = 0; j < sub_N1; ++j )
-    for ( int k = 0; k < sub_N2; ++k )
-    {
-      ASSERT_EQ( stride3( i, j, k ), dyn_off3( i, j, k ) );
-    }
+    for (int i = 0; i < sub_N0; ++i)
+      for (int j = 0; j < sub_N1; ++j)
+        for (int k = 0; k < sub_N2; ++k) {
+          ASSERT_EQ(stride3(i, j, k), dyn_off3(i, j, k));
+        }
   }
 
   //----------------------------------------
@@ -546,55 +540,69 @@ void test_view_mapping()
   {
     using namespace Kokkos::Impl;
 
-    static_assert( rank_dynamic<>::value == 0, "" );
-    static_assert( rank_dynamic< 1 >::value == 0, "" );
-    static_assert( rank_dynamic< 0 >::value == 1, "" );
-    static_assert( rank_dynamic< 0, 1 >::value == 1, "" );
-    static_assert( rank_dynamic< 0, 0, 1 >::value == 2, "" );
+    static_assert(rank_dynamic<>::value == 0, "");
+    static_assert(rank_dynamic<1>::value == 0, "");
+    static_assert(rank_dynamic<0>::value == 1, "");
+    static_assert(rank_dynamic<0, 1>::value == 1, "");
+    static_assert(rank_dynamic<0, 0, 1>::value == 2, "");
   }
 
   {
     using namespace Kokkos::Impl;
 
-    typedef ViewArrayAnalysis< int[] >                 a_int_r1;
-    typedef ViewArrayAnalysis< int**[4][5][6] >        a_int_r5;
-    typedef ViewArrayAnalysis< const int[] >           a_const_int_r1;
-    typedef ViewArrayAnalysis< const int**[4][5][6] >  a_const_int_r5;
+    typedef ViewArrayAnalysis<int[]> a_int_r1;
+    typedef ViewArrayAnalysis<int* * [4][5][6]> a_int_r5;
+    typedef ViewArrayAnalysis<const int[]> a_const_int_r1;
+    typedef ViewArrayAnalysis<const int* * [4][5][6]> a_const_int_r5;
 
-    static_assert( a_int_r1::dimension::rank == 1, "" );
-    static_assert( a_int_r1::dimension::rank_dynamic == 1, "" );
-    static_assert( a_int_r5::dimension::ArgN0 == 0, "" );
-    static_assert( a_int_r5::dimension::ArgN1 == 0, "" );
-    static_assert( a_int_r5::dimension::ArgN2 == 4, "" );
-    static_assert( a_int_r5::dimension::ArgN3 == 5, "" );
-    static_assert( a_int_r5::dimension::ArgN4 == 6, "" );
-    static_assert( a_int_r5::dimension::ArgN5 == 1, "" );
+    static_assert(a_int_r1::dimension::rank == 1, "");
+    static_assert(a_int_r1::dimension::rank_dynamic == 1, "");
+    static_assert(a_int_r5::dimension::ArgN0 == 0, "");
+    static_assert(a_int_r5::dimension::ArgN1 == 0, "");
+    static_assert(a_int_r5::dimension::ArgN2 == 4, "");
+    static_assert(a_int_r5::dimension::ArgN3 == 5, "");
+    static_assert(a_int_r5::dimension::ArgN4 == 6, "");
+    static_assert(a_int_r5::dimension::ArgN5 == 1, "");
 
-    static_assert( std::is_same< typename a_int_r1::dimension, ViewDimension<0> >::value, "" );
-    static_assert( std::is_same< typename a_int_r1::non_const_value_type, int >::value, "" );
+    static_assert(
+        std::is_same<typename a_int_r1::dimension, ViewDimension<0> >::value,
+        "");
+    static_assert(
+        std::is_same<typename a_int_r1::non_const_value_type, int>::value, "");
 
-    static_assert( a_const_int_r1::dimension::rank == 1, "" );
-    static_assert( a_const_int_r1::dimension::rank_dynamic == 1, "" );
-    static_assert( std::is_same< typename a_const_int_r1::dimension, ViewDimension<0> >::value, "" );
-    static_assert( std::is_same< typename a_const_int_r1::non_const_value_type, int >::value, "" );
+    static_assert(a_const_int_r1::dimension::rank == 1, "");
+    static_assert(a_const_int_r1::dimension::rank_dynamic == 1, "");
+    static_assert(std::is_same<typename a_const_int_r1::dimension,
+                               ViewDimension<0> >::value,
+                  "");
+    static_assert(
+        std::is_same<typename a_const_int_r1::non_const_value_type, int>::value,
+        "");
 
-    static_assert( a_const_int_r5::dimension::rank == 5, "" );
-    static_assert( a_const_int_r5::dimension::rank_dynamic == 2, "" );
+    static_assert(a_const_int_r5::dimension::rank == 5, "");
+    static_assert(a_const_int_r5::dimension::rank_dynamic == 2, "");
 
-    static_assert( a_const_int_r5::dimension::ArgN0 == 0, "" );
-    static_assert( a_const_int_r5::dimension::ArgN1 == 0, "" );
-    static_assert( a_const_int_r5::dimension::ArgN2 == 4, "" );
-    static_assert( a_const_int_r5::dimension::ArgN3 == 5, "" );
-    static_assert( a_const_int_r5::dimension::ArgN4 == 6, "" );
-    static_assert( a_const_int_r5::dimension::ArgN5 == 1, "" );
+    static_assert(a_const_int_r5::dimension::ArgN0 == 0, "");
+    static_assert(a_const_int_r5::dimension::ArgN1 == 0, "");
+    static_assert(a_const_int_r5::dimension::ArgN2 == 4, "");
+    static_assert(a_const_int_r5::dimension::ArgN3 == 5, "");
+    static_assert(a_const_int_r5::dimension::ArgN4 == 6, "");
+    static_assert(a_const_int_r5::dimension::ArgN5 == 1, "");
 
-    static_assert( std::is_same< typename a_const_int_r5::dimension, ViewDimension<0, 0, 4, 5, 6> >::value, "" );
-    static_assert( std::is_same< typename a_const_int_r5::non_const_value_type, int >::value, "" );
+    static_assert(std::is_same<typename a_const_int_r5::dimension,
+                               ViewDimension<0, 0, 4, 5, 6> >::value,
+                  "");
+    static_assert(
+        std::is_same<typename a_const_int_r5::non_const_value_type, int>::value,
+        "");
 
-    static_assert( a_int_r5::dimension::rank == 5, "" );
-    static_assert( a_int_r5::dimension::rank_dynamic == 2, "" );
-    static_assert( std::is_same< typename a_int_r5::dimension, ViewDimension<0, 0, 4, 5, 6> >::value, "" );
-    static_assert( std::is_same< typename a_int_r5::non_const_value_type, int >::value, "" );
+    static_assert(a_int_r5::dimension::rank == 5, "");
+    static_assert(a_int_r5::dimension::rank_dynamic == 2, "");
+    static_assert(std::is_same<typename a_int_r5::dimension,
+                               ViewDimension<0, 0, 4, 5, 6> >::value,
+                  "");
+    static_assert(
+        std::is_same<typename a_int_r5::non_const_value_type, int>::value, "");
   }
 
   {
@@ -603,53 +611,94 @@ void test_view_mapping()
     typedef int t_i4[4];
 
     // Dimensions of t_i4 are appended to the multdimensional array.
-    typedef ViewArrayAnalysis< t_i4 ***[3] > a_int_r5;
+    typedef ViewArrayAnalysis<t_i4** * [3]> a_int_r5;
 
-    static_assert( a_int_r5::dimension::rank == 5, "" );
-    static_assert( a_int_r5::dimension::rank_dynamic == 3, "" );
-    static_assert( a_int_r5::dimension::ArgN0 == 0, "" );
-    static_assert( a_int_r5::dimension::ArgN1 == 0, "" );
-    static_assert( a_int_r5::dimension::ArgN2 == 0, "" );
-    static_assert( a_int_r5::dimension::ArgN3 == 3, "" );
-    static_assert( a_int_r5::dimension::ArgN4 == 4, "" );
-    static_assert( std::is_same< typename a_int_r5::non_const_value_type, int >::value, "" );
+    static_assert(a_int_r5::dimension::rank == 5, "");
+    static_assert(a_int_r5::dimension::rank_dynamic == 3, "");
+    static_assert(a_int_r5::dimension::ArgN0 == 0, "");
+    static_assert(a_int_r5::dimension::ArgN1 == 0, "");
+    static_assert(a_int_r5::dimension::ArgN2 == 0, "");
+    static_assert(a_int_r5::dimension::ArgN3 == 3, "");
+    static_assert(a_int_r5::dimension::ArgN4 == 4, "");
+    static_assert(
+        std::is_same<typename a_int_r5::non_const_value_type, int>::value, "");
   }
 
   {
     using namespace Kokkos::Impl;
 
-    typedef ViewDataAnalysis< const int[], void >  a_const_int_r1;
+    typedef ViewDataAnalysis<const int[], void> a_const_int_r1;
 
-    static_assert( std::is_same< typename a_const_int_r1::specialize, void >::value, "" );
-    static_assert( std::is_same< typename a_const_int_r1::dimension, Kokkos::Impl::ViewDimension<0> >::value, "" );
+    static_assert(
+        std::is_same<typename a_const_int_r1::specialize, void>::value, "");
+    static_assert(std::is_same<typename a_const_int_r1::dimension,
+                               Kokkos::Impl::ViewDimension<0> >::value,
+                  "");
 
-    static_assert( std::is_same< typename a_const_int_r1::type, const int * >::value, "" );
-    static_assert( std::is_same< typename a_const_int_r1::value_type, const int >::value, "" );
+    static_assert(
+        std::is_same<typename a_const_int_r1::type, const int*>::value, "");
+    static_assert(
+        std::is_same<typename a_const_int_r1::value_type, const int>::value,
+        "");
 
-    static_assert( std::is_same< typename a_const_int_r1::scalar_array_type, const int * >::value, "" );
-    static_assert( std::is_same< typename a_const_int_r1::const_type, const int * >::value, "" );
-    static_assert( std::is_same< typename a_const_int_r1::const_value_type, const int >::value, "" );
-    static_assert( std::is_same< typename a_const_int_r1::const_scalar_array_type, const int * >::value, "" );
-    static_assert( std::is_same< typename a_const_int_r1::non_const_type, int * >::value, "" );
-    static_assert( std::is_same< typename a_const_int_r1::non_const_value_type, int >::value, "" );
+    static_assert(std::is_same<typename a_const_int_r1::scalar_array_type,
+                               const int*>::value,
+                  "");
+    static_assert(
+        std::is_same<typename a_const_int_r1::const_type, const int*>::value,
+        "");
+    static_assert(std::is_same<typename a_const_int_r1::const_value_type,
+                               const int>::value,
+                  "");
+    static_assert(std::is_same<typename a_const_int_r1::const_scalar_array_type,
+                               const int*>::value,
+                  "");
+    static_assert(
+        std::is_same<typename a_const_int_r1::non_const_type, int*>::value, "");
+    static_assert(
+        std::is_same<typename a_const_int_r1::non_const_value_type, int>::value,
+        "");
 
-    typedef ViewDataAnalysis< const int**[4], void >  a_const_int_r3;
+    typedef ViewDataAnalysis<const int* * [4], void> a_const_int_r3;
 
-    static_assert( std::is_same< typename a_const_int_r3::specialize, void >::value, "" );
+    static_assert(
+        std::is_same<typename a_const_int_r3::specialize, void>::value, "");
 
-    static_assert( std::is_same< typename a_const_int_r3::dimension, Kokkos::Impl::ViewDimension<0, 0, 4> >::value, "" );
+    static_assert(std::is_same<typename a_const_int_r3::dimension,
+                               Kokkos::Impl::ViewDimension<0, 0, 4> >::value,
+                  "");
 
-    static_assert( std::is_same< typename a_const_int_r3::type, const int**[4] >::value, "" );
-    static_assert( std::is_same< typename a_const_int_r3::value_type, const int >::value, "" );
-    static_assert( std::is_same< typename a_const_int_r3::scalar_array_type, const int**[4] >::value, "" );
-    static_assert( std::is_same< typename a_const_int_r3::const_type, const int**[4] >::value, "" );
-    static_assert( std::is_same< typename a_const_int_r3::const_value_type, const int >::value, "" );
-    static_assert( std::is_same< typename a_const_int_r3::const_scalar_array_type, const int**[4] >::value, "" );
-    static_assert( std::is_same< typename a_const_int_r3::non_const_type, int**[4] >::value, "" );
-    static_assert( std::is_same< typename a_const_int_r3::non_const_value_type, int >::value, "" );
-    static_assert( std::is_same< typename a_const_int_r3::non_const_scalar_array_type, int**[4] >::value, "" );
+    static_assert(
+        std::is_same<typename a_const_int_r3::type, const int* * [4]>::value,
+        "");
+    static_assert(
+        std::is_same<typename a_const_int_r3::value_type, const int>::value,
+        "");
+    static_assert(std::is_same<typename a_const_int_r3::scalar_array_type,
+                               const int* * [4]>::value,
+                  "");
+    static_assert(std::is_same<typename a_const_int_r3::const_type,
+                               const int* * [4]>::value,
+                  "");
+    static_assert(std::is_same<typename a_const_int_r3::const_value_type,
+                               const int>::value,
+                  "");
+    static_assert(std::is_same<typename a_const_int_r3::const_scalar_array_type,
+                               const int* * [4]>::value,
+                  "");
+    static_assert(std::is_same<typename a_const_int_r3::non_const_type,
+                               int* * [4]>::value,
+                  "");
+    static_assert(
+        std::is_same<typename a_const_int_r3::non_const_value_type, int>::value,
+        "");
+    static_assert(
+        std::is_same<typename a_const_int_r3::non_const_scalar_array_type,
+                     int* * [4]>::value,
+        "");
 
-    // std::cout << "typeid( const int**[4] ).name() = " << typeid( const int**[4] ).name() << std::endl;
+    // std::cout << "typeid( const int**[4] ).name() = " << typeid( const
+    // int**[4] ).name() << std::endl;
   }
 
   //----------------------------------------
@@ -657,393 +706,398 @@ void test_view_mapping()
   {
     constexpr int N = 10;
 
-    typedef Kokkos::View< int*, Space >        T;
-    typedef Kokkos::View< const int*, Space >  C;
+    typedef Kokkos::View<int*, Space> T;
+    typedef Kokkos::View<const int*, Space> C;
 
     int data[N];
 
-    T vr1( data, N ); // View of non-const.
-    C cr1( vr1 );     // View of const from view of non-const.
-    C cr2( (const int *) data, N );
+    T vr1(data, N);  // View of non-const.
+    C cr1(vr1);      // View of const from view of non-const.
+    C cr2((const int*)data, N);
 
     // Generate static_assert error:
     // T tmp( cr1 );
 
-    ASSERT_EQ( vr1.span(), N );
-    ASSERT_EQ( cr1.span(), N );
-    ASSERT_EQ( vr1.data(), & data[0] );
-    ASSERT_EQ( cr1.data(), & data[0] );
+    ASSERT_EQ(vr1.span(), N);
+    ASSERT_EQ(cr1.span(), N);
+    ASSERT_EQ(vr1.data(), &data[0]);
+    ASSERT_EQ(cr1.data(), &data[0]);
 
-    ASSERT_TRUE( ( std::is_same< typename T::data_type          , int* >::value ) );
-    ASSERT_TRUE( ( std::is_same< typename T::const_data_type    , const int* >::value ) );
-    ASSERT_TRUE( ( std::is_same< typename T::non_const_data_type, int* >::value ) );
+    ASSERT_TRUE((std::is_same<typename T::data_type, int*>::value));
+    ASSERT_TRUE((std::is_same<typename T::const_data_type, const int*>::value));
+    ASSERT_TRUE((std::is_same<typename T::non_const_data_type, int*>::value));
 
-    ASSERT_TRUE( ( std::is_same< typename T::scalar_array_type          , int* >::value ) );
-    ASSERT_TRUE( ( std::is_same< typename T::const_scalar_array_type    , const int* >::value ) );
-    ASSERT_TRUE( ( std::is_same< typename T::non_const_scalar_array_type, int* >::value ) );
+    ASSERT_TRUE((std::is_same<typename T::scalar_array_type, int*>::value));
+    ASSERT_TRUE(
+        (std::is_same<typename T::const_scalar_array_type, const int*>::value));
+    ASSERT_TRUE(
+        (std::is_same<typename T::non_const_scalar_array_type, int*>::value));
 
-    ASSERT_TRUE( ( std::is_same< typename T::value_type          , int >::value ) );
-    ASSERT_TRUE( ( std::is_same< typename T::const_value_type    , const int >::value ) );
-    ASSERT_TRUE( ( std::is_same< typename T::non_const_value_type, int >::value ) );
+    ASSERT_TRUE((std::is_same<typename T::value_type, int>::value));
+    ASSERT_TRUE((std::is_same<typename T::const_value_type, const int>::value));
+    ASSERT_TRUE((std::is_same<typename T::non_const_value_type, int>::value));
 
-    ASSERT_TRUE( ( std::is_same< typename T::memory_space, typename Space::memory_space >::value ) );
-    ASSERT_TRUE( ( std::is_same< typename T::reference_type, int & >::value ) );
+    ASSERT_TRUE((std::is_same<typename T::memory_space,
+                              typename Space::memory_space>::value));
+    ASSERT_TRUE((std::is_same<typename T::reference_type, int&>::value));
 
-    ASSERT_EQ( T::Rank, 1 );
+    ASSERT_EQ(T::Rank, 1);
 
-    ASSERT_TRUE( ( std::is_same< typename C::data_type          , const int* >::value ) );
-    ASSERT_TRUE( ( std::is_same< typename C::const_data_type    , const int* >::value ) );
-    ASSERT_TRUE( ( std::is_same< typename C::non_const_data_type, int* >::value ) );
+    ASSERT_TRUE((std::is_same<typename C::data_type, const int*>::value));
+    ASSERT_TRUE((std::is_same<typename C::const_data_type, const int*>::value));
+    ASSERT_TRUE((std::is_same<typename C::non_const_data_type, int*>::value));
 
-    ASSERT_TRUE( ( std::is_same< typename C::scalar_array_type          , const int* >::value ) );
-    ASSERT_TRUE( ( std::is_same< typename C::const_scalar_array_type    , const int* >::value ) );
-    ASSERT_TRUE( ( std::is_same< typename C::non_const_scalar_array_type, int* >::value ) );
+    ASSERT_TRUE(
+        (std::is_same<typename C::scalar_array_type, const int*>::value));
+    ASSERT_TRUE(
+        (std::is_same<typename C::const_scalar_array_type, const int*>::value));
+    ASSERT_TRUE(
+        (std::is_same<typename C::non_const_scalar_array_type, int*>::value));
 
-    ASSERT_TRUE( ( std::is_same< typename C::value_type          , const int >::value ) );
-    ASSERT_TRUE( ( std::is_same< typename C::const_value_type    , const int >::value ) );
-    ASSERT_TRUE( ( std::is_same< typename C::non_const_value_type, int >::value ) );
+    ASSERT_TRUE((std::is_same<typename C::value_type, const int>::value));
+    ASSERT_TRUE((std::is_same<typename C::const_value_type, const int>::value));
+    ASSERT_TRUE((std::is_same<typename C::non_const_value_type, int>::value));
 
-    ASSERT_TRUE( ( std::is_same< typename C::memory_space, typename Space::memory_space >::value ) );
-    ASSERT_TRUE( ( std::is_same< typename C::reference_type, const int & >::value ) );
+    ASSERT_TRUE((std::is_same<typename C::memory_space,
+                              typename Space::memory_space>::value));
+    ASSERT_TRUE((std::is_same<typename C::reference_type, const int&>::value));
 
-    ASSERT_EQ( C::Rank, 1 );
+    ASSERT_EQ(C::Rank, 1);
 
-    ASSERT_EQ( vr1.extent(0), N );
+    ASSERT_EQ(vr1.extent(0), N);
 
-    if ( Kokkos::Impl::SpaceAccessibility< Kokkos::HostSpace, typename Space::memory_space >::accessible ) {
-      for ( int i = 0; i < N; ++i ) data[i] = i + 1;
-      for ( int i = 0; i < N; ++i ) ASSERT_EQ( vr1[i], i + 1 );
-      for ( int i = 0; i < N; ++i ) ASSERT_EQ( cr1[i], i + 1 );
+    if (Kokkos::Impl::SpaceAccessibility<
+            Kokkos::HostSpace, typename Space::memory_space>::accessible) {
+      for (int i = 0; i < N; ++i) data[i] = i + 1;
+      for (int i = 0; i < N; ++i) ASSERT_EQ(vr1[i], i + 1);
+      for (int i = 0; i < N; ++i) ASSERT_EQ(cr1[i], i + 1);
 
       {
-        T tmp( vr1 );
+        T tmp(vr1);
 
-        for ( int i = 0; i < N; ++i ) ASSERT_EQ( tmp[i], i + 1 );
-        for ( int i = 0; i < N; ++i ) vr1( i ) = i + 2;
-        for ( int i = 0; i < N; ++i ) ASSERT_EQ( tmp[i], i + 2 );
+        for (int i = 0; i < N; ++i) ASSERT_EQ(tmp[i], i + 1);
+        for (int i = 0; i < N; ++i) vr1(i) = i + 2;
+        for (int i = 0; i < N; ++i) ASSERT_EQ(tmp[i], i + 2);
       }
 
-      for ( int i = 0; i < N; ++i ) ASSERT_EQ( vr1[i], i + 2 );
+      for (int i = 0; i < N; ++i) ASSERT_EQ(vr1[i], i + 2);
     }
   }
 
   {
     constexpr int N = 10;
-    typedef Kokkos::View< int*, Space >        T;
-    typedef Kokkos::View< const int*, Space >  C;
+    typedef Kokkos::View<int*, Space> T;
+    typedef Kokkos::View<const int*, Space> C;
 
-    T vr1( "vr1", N );
-    C cr1( vr1 );
+    T vr1("vr1", N);
+    C cr1(vr1);
 
-    ASSERT_TRUE( ( std::is_same< typename T::data_type          , int* >::value ) );
-    ASSERT_TRUE( ( std::is_same< typename T::const_data_type    , const int* >::value ) );
-    ASSERT_TRUE( ( std::is_same< typename T::non_const_data_type, int* >::value ) );
+    ASSERT_TRUE((std::is_same<typename T::data_type, int*>::value));
+    ASSERT_TRUE((std::is_same<typename T::const_data_type, const int*>::value));
+    ASSERT_TRUE((std::is_same<typename T::non_const_data_type, int*>::value));
 
-    ASSERT_TRUE( ( std::is_same< typename T::scalar_array_type          , int* >::value ) );
-    ASSERT_TRUE( ( std::is_same< typename T::const_scalar_array_type    , const int* >::value ) );
-    ASSERT_TRUE( ( std::is_same< typename T::non_const_scalar_array_type, int* >::value ) );
+    ASSERT_TRUE((std::is_same<typename T::scalar_array_type, int*>::value));
+    ASSERT_TRUE(
+        (std::is_same<typename T::const_scalar_array_type, const int*>::value));
+    ASSERT_TRUE(
+        (std::is_same<typename T::non_const_scalar_array_type, int*>::value));
 
-    ASSERT_TRUE( ( std::is_same< typename T::value_type          , int >::value ) );
-    ASSERT_TRUE( ( std::is_same< typename T::const_value_type    , const int >::value ) );
-    ASSERT_TRUE( ( std::is_same< typename T::non_const_value_type, int >::value ) );
+    ASSERT_TRUE((std::is_same<typename T::value_type, int>::value));
+    ASSERT_TRUE((std::is_same<typename T::const_value_type, const int>::value));
+    ASSERT_TRUE((std::is_same<typename T::non_const_value_type, int>::value));
 
-    ASSERT_TRUE( ( std::is_same< typename T::memory_space, typename Space::memory_space >::value ) );
-    ASSERT_TRUE( ( std::is_same< typename T::reference_type, int & >::value ) );
-    ASSERT_EQ( T::Rank, 1 );
+    ASSERT_TRUE((std::is_same<typename T::memory_space,
+                              typename Space::memory_space>::value));
+    ASSERT_TRUE((std::is_same<typename T::reference_type, int&>::value));
+    ASSERT_EQ(T::Rank, 1);
 
-    ASSERT_EQ( vr1.extent(0), N );
+    ASSERT_EQ(vr1.extent(0), N);
 
-    if ( Kokkos::Impl::SpaceAccessibility< Kokkos::HostSpace, typename Space::memory_space >::accessible ) {
-      for ( int i = 0; i < N; ++i ) vr1( i ) = i + 1;
-      for ( int i = 0; i < N; ++i ) ASSERT_EQ( vr1[i], i + 1 );
-      for ( int i = 0; i < N; ++i ) ASSERT_EQ( cr1[i], i + 1 );
+    if (Kokkos::Impl::SpaceAccessibility<
+            Kokkos::HostSpace, typename Space::memory_space>::accessible) {
+      for (int i = 0; i < N; ++i) vr1(i) = i + 1;
+      for (int i = 0; i < N; ++i) ASSERT_EQ(vr1[i], i + 1);
+      for (int i = 0; i < N; ++i) ASSERT_EQ(cr1[i], i + 1);
 
       {
-        T tmp( vr1 );
-        for ( int i = 0; i < N; ++i ) ASSERT_EQ( tmp[i], i + 1 );
-        for ( int i = 0; i < N; ++i ) vr1( i ) = i + 2;
-        for ( int i = 0; i < N; ++i ) ASSERT_EQ( tmp[i], i + 2 );
+        T tmp(vr1);
+        for (int i = 0; i < N; ++i) ASSERT_EQ(tmp[i], i + 1);
+        for (int i = 0; i < N; ++i) vr1(i) = i + 2;
+        for (int i = 0; i < N; ++i) ASSERT_EQ(tmp[i], i + 2);
       }
 
-      for ( int i = 0; i < N; ++i ) ASSERT_EQ( vr1[i], i + 2 );
+      for (int i = 0; i < N; ++i) ASSERT_EQ(vr1[i], i + 2);
     }
   }
 
   // Testing proper handling of zero-length allocations.
   {
     constexpr int N = 0;
-    typedef Kokkos::View< int*, Space >        T;
-    typedef Kokkos::View< const int*, Space >  C;
+    typedef Kokkos::View<int*, Space> T;
+    typedef Kokkos::View<const int*, Space> C;
 
-    T vr1( "vr1", N );
-    C cr1( vr1 );
+    T vr1("vr1", N);
+    C cr1(vr1);
 
-    ASSERT_EQ( vr1.extent(0), 0 );
-    ASSERT_EQ( cr1.extent(0), 0 );
+    ASSERT_EQ(vr1.extent(0), 0);
+    ASSERT_EQ(cr1.extent(0), 0);
   }
 
   // Testing using space instance for allocation.
-  // The execution space of the memory space must be available for view data initialization.
-  if ( std::is_same< ExecSpace, typename ExecSpace::memory_space::execution_space >::value ) {
-
+  // The execution space of the memory space must be available for view data
+  // initialization.
+  if (std::is_same<ExecSpace,
+                   typename ExecSpace::memory_space::execution_space>::value) {
     using namespace Kokkos;
 
-    typedef typename ExecSpace::memory_space  memory_space;
-    typedef View< int*, memory_space >        V;
+    typedef typename ExecSpace::memory_space memory_space;
+    typedef View<int*, memory_space> V;
 
     constexpr int N = 10;
 
     memory_space mem_space;
 
-    V v( "v", N );
-    V va( view_alloc(), N );
-    V vb( view_alloc( "vb" ), N );
-    V vc( view_alloc( "vc", AllowPadding ), N );
-    V vd( view_alloc( "vd", WithoutInitializing ), N );
-    V ve( view_alloc( "ve", WithoutInitializing, AllowPadding ), N );
-    V vf( view_alloc( "vf", mem_space, WithoutInitializing, AllowPadding ), N );
-    V vg( view_alloc( mem_space, "vg", WithoutInitializing, AllowPadding ), N );
-    V vh( view_alloc( WithoutInitializing, AllowPadding ), N );
-    V vi( view_alloc( WithoutInitializing ), N );
-    V vj( view_alloc( std::string( "vj" ), AllowPadding ), N );
-    V vk( view_alloc( mem_space, std::string( "vk" ), AllowPadding ), N );
+    V v("v", N);
+    V va(view_alloc(), N);
+    V vb(view_alloc("vb"), N);
+    V vc(view_alloc("vc", AllowPadding), N);
+    V vd(view_alloc("vd", WithoutInitializing), N);
+    V ve(view_alloc("ve", WithoutInitializing, AllowPadding), N);
+    V vf(view_alloc("vf", mem_space, WithoutInitializing, AllowPadding), N);
+    V vg(view_alloc(mem_space, "vg", WithoutInitializing, AllowPadding), N);
+    V vh(view_alloc(WithoutInitializing, AllowPadding), N);
+    V vi(view_alloc(WithoutInitializing), N);
+    V vj(view_alloc(std::string("vj"), AllowPadding), N);
+    V vk(view_alloc(mem_space, std::string("vk"), AllowPadding), N);
   }
 
   {
-    typedef Kokkos::ViewTraits< int***, Kokkos::LayoutStride, ExecSpace >           traits_t;
-    typedef Kokkos::Impl::ViewDimension< 0, 0, 0 >                    dims_t;
-    typedef Kokkos::Impl::ViewOffset< dims_t, Kokkos::LayoutStride >  offset_t;
+    typedef Kokkos::ViewTraits<int***, Kokkos::LayoutStride, ExecSpace>
+        traits_t;
+    typedef Kokkos::Impl::ViewDimension<0, 0, 0> dims_t;
+    typedef Kokkos::Impl::ViewOffset<dims_t, Kokkos::LayoutStride> offset_t;
 
     Kokkos::LayoutStride stride;
 
     stride.dimension[0] = 3;
     stride.dimension[1] = 4;
     stride.dimension[2] = 5;
-    stride.stride[0] = 4;
-    stride.stride[1] = 1;
-    stride.stride[2] = 12;
+    stride.stride[0]    = 4;
+    stride.stride[1]    = 1;
+    stride.stride[2]    = 12;
 
-    const offset_t offset( std::integral_constant< unsigned, 0 >(), stride );
+    const offset_t offset(std::integral_constant<unsigned, 0>(), stride);
 
-    ASSERT_EQ( offset.dimension_0(), 3 );
-    ASSERT_EQ( offset.dimension_1(), 4 );
-    ASSERT_EQ( offset.dimension_2(), 5 );
+    ASSERT_EQ(offset.dimension_0(), 3);
+    ASSERT_EQ(offset.dimension_1(), 4);
+    ASSERT_EQ(offset.dimension_2(), 5);
 
-    ASSERT_EQ( offset.stride_0(), 4 );
-    ASSERT_EQ( offset.stride_1(), 1 );
-    ASSERT_EQ( offset.stride_2(), 12 );
+    ASSERT_EQ(offset.stride_0(), 4);
+    ASSERT_EQ(offset.stride_1(), 1);
+    ASSERT_EQ(offset.stride_2(), 12);
 
-    ASSERT_EQ( offset.span(), 60 );
-    ASSERT_TRUE( offset.span_is_contiguous() );
+    ASSERT_EQ(offset.span(), 60);
+    ASSERT_TRUE(offset.span_is_contiguous());
 
-    Kokkos::Impl::ViewMapping< traits_t, void >
-      v( Kokkos::Impl::ViewCtorProp< int* >( (int*) 0 ), stride );
+    Kokkos::Impl::ViewMapping<traits_t, void> v(
+        Kokkos::Impl::ViewCtorProp<int*>((int*)0), stride);
   }
 
   {
-    typedef Kokkos::View< int**, Space > V;
+    typedef Kokkos::View<int**, Space> V;
     typedef typename V::HostMirror M;
-    typedef typename Kokkos::View< int**, Space >::array_layout layout_type;
+    typedef typename Kokkos::View<int**, Space>::array_layout layout_type;
 
     constexpr int N0 = 10;
     constexpr int N1 = 11;
 
-    V a( "a", N0, N1 );
-    M b = Kokkos::create_mirror( a );
-    M c = Kokkos::create_mirror_view( a );
+    V a("a", N0, N1);
+    M b = Kokkos::create_mirror(a);
+    M c = Kokkos::create_mirror_view(a);
     M d;
 
-    for ( int i0 = 0; i0 < N0; ++i0 )
-    for ( int i1 = 0; i1 < N1; ++i1 )
-    {
-      b( i0, i1 ) = 1 + i0 + i1 * N0;
-    }
+    for (int i0 = 0; i0 < N0; ++i0)
+      for (int i1 = 0; i1 < N1; ++i1) {
+        b(i0, i1) = 1 + i0 + i1 * N0;
+      }
 
-    Kokkos::deep_copy( a, b );
-    Kokkos::deep_copy( c, a );
+    Kokkos::deep_copy(a, b);
+    Kokkos::deep_copy(c, a);
 
-    for ( int i0 = 0; i0 < N0; ++i0 )
-    for ( int i1 = 0; i1 < N1; ++i1 )
-    {
-      ASSERT_EQ( b( i0, i1 ), c( i0, i1 ) );
-    }
+    for (int i0 = 0; i0 < N0; ++i0)
+      for (int i1 = 0; i1 < N1; ++i1) {
+        ASSERT_EQ(b(i0, i1), c(i0, i1));
+      }
 
-    Kokkos::resize( b, 5, 6 );
+    Kokkos::resize(b, 5, 6);
 
-    for ( int i0 = 0; i0 < 5; ++i0 )
-    for ( int i1 = 0; i1 < 6; ++i1 )
-    {
-      int val = 1 + i0 + i1 * N0;
-      ASSERT_EQ( b( i0, i1 ), c( i0, i1 ) );
-      ASSERT_EQ( b( i0, i1 ), val );
-    }
+    for (int i0 = 0; i0 < 5; ++i0)
+      for (int i1 = 0; i1 < 6; ++i1) {
+        int val = 1 + i0 + i1 * N0;
+        ASSERT_EQ(b(i0, i1), c(i0, i1));
+        ASSERT_EQ(b(i0, i1), val);
+      }
 
-    Kokkos::realloc( c, 5, 6 );
-    Kokkos::realloc( d, 5, 6 );
+    Kokkos::realloc(c, 5, 6);
+    Kokkos::realloc(d, 5, 6);
 
-    ASSERT_EQ( b.extent(0), 5 );
-    ASSERT_EQ( b.extent(1), 6 );
-    ASSERT_EQ( c.extent(0), 5 );
-    ASSERT_EQ( c.extent(1), 6 );
-    ASSERT_EQ( d.extent(0), 5 );
-    ASSERT_EQ( d.extent(1), 6 );
+    ASSERT_EQ(b.extent(0), 5);
+    ASSERT_EQ(b.extent(1), 6);
+    ASSERT_EQ(c.extent(0), 5);
+    ASSERT_EQ(c.extent(1), 6);
+    ASSERT_EQ(d.extent(0), 5);
+    ASSERT_EQ(d.extent(1), 6);
 
-    layout_type layout( 7, 8 );
-    Kokkos::resize( b, layout );
-    for ( int i0 = 0; i0 < 7; ++i0 )
-    for ( int i1 = 6; i1 < 8; ++i1 )
-    {
-      b( i0, i1 ) = 1 + i0 + i1 * N0;
-    }
+    layout_type layout(7, 8);
+    Kokkos::resize(b, layout);
+    for (int i0 = 0; i0 < 7; ++i0)
+      for (int i1 = 6; i1 < 8; ++i1) {
+        b(i0, i1) = 1 + i0 + i1 * N0;
+      }
 
-    for ( int i0 = 5; i0 < 7; ++i0 )
-    for ( int i1 = 0; i1 < 8; ++i1 )
-    {
-      b( i0, i1 ) = 1 + i0 + i1 * N0;
-    }
+    for (int i0 = 5; i0 < 7; ++i0)
+      for (int i1 = 0; i1 < 8; ++i1) {
+        b(i0, i1) = 1 + i0 + i1 * N0;
+      }
 
-    for ( int i0 = 0; i0 < 7; ++i0 )
-    for ( int i1 = 0; i1 < 8; ++i1 )
-    {
-       int val = 1 + i0 + i1 * N0;
-       ASSERT_EQ( b( i0, i1 ), val );
-    }
+    for (int i0 = 0; i0 < 7; ++i0)
+      for (int i1 = 0; i1 < 8; ++i1) {
+        int val = 1 + i0 + i1 * N0;
+        ASSERT_EQ(b(i0, i1), val);
+      }
 
-    Kokkos::realloc( c, layout );
-    Kokkos::realloc( d, layout );
+    Kokkos::realloc(c, layout);
+    Kokkos::realloc(d, layout);
 
-    ASSERT_EQ( b.extent(0), 7 );
-    ASSERT_EQ( b.extent(1), 8 );
-    ASSERT_EQ( c.extent(0), 7 );
-    ASSERT_EQ( c.extent(1), 8 );
-    ASSERT_EQ( d.extent(0), 7 );
-    ASSERT_EQ( d.extent(1), 8 );
+    ASSERT_EQ(b.extent(0), 7);
+    ASSERT_EQ(b.extent(1), 8);
+    ASSERT_EQ(c.extent(0), 7);
+    ASSERT_EQ(c.extent(1), 8);
+    ASSERT_EQ(d.extent(0), 7);
+    ASSERT_EQ(d.extent(1), 8);
   }
 
   {
-    typedef Kokkos::View< int**, Kokkos::LayoutStride, Space > V;
+    typedef Kokkos::View<int**, Kokkos::LayoutStride, Space> V;
     typedef typename V::HostMirror M;
-    typedef typename Kokkos::View< int**, Kokkos::LayoutStride, Space >::array_layout layout_type;
+    typedef
+        typename Kokkos::View<int**, Kokkos::LayoutStride, Space>::array_layout
+            layout_type;
 
     constexpr int N0 = 10;
     constexpr int N1 = 11;
 
-    const int dimensions[] = { N0, N1 };
-    const int order[] = { 1, 0 };
+    const int dimensions[] = {N0, N1};
+    const int order[]      = {1, 0};
 
-    V a( "a", Kokkos::LayoutStride::order_dimensions( 2, order, dimensions ) );
-    M b = Kokkos::create_mirror( a );
-    M c = Kokkos::create_mirror_view( a );
+    V a("a", Kokkos::LayoutStride::order_dimensions(2, order, dimensions));
+    M b = Kokkos::create_mirror(a);
+    M c = Kokkos::create_mirror_view(a);
     M d;
 
-    for ( int i0 = 0; i0 < N0; ++i0 )
-    for ( int i1 = 0; i1 < N1; ++i1 )
-    {
-      b( i0, i1 ) = 1 + i0 + i1 * N0;
-    }
+    for (int i0 = 0; i0 < N0; ++i0)
+      for (int i1 = 0; i1 < N1; ++i1) {
+        b(i0, i1) = 1 + i0 + i1 * N0;
+      }
 
-    Kokkos::deep_copy( a, b );
-    Kokkos::deep_copy( c, a );
+    Kokkos::deep_copy(a, b);
+    Kokkos::deep_copy(c, a);
 
-    for ( int i0 = 0; i0 < N0; ++i0 )
-    for ( int i1 = 0; i1 < N1; ++i1 )
-    {
-      ASSERT_EQ( b( i0, i1 ), c( i0, i1 ) );
-    }
+    for (int i0 = 0; i0 < N0; ++i0)
+      for (int i1 = 0; i1 < N1; ++i1) {
+        ASSERT_EQ(b(i0, i1), c(i0, i1));
+      }
 
-    const int dimensions2[] = { 7, 8 };
-    const int order2[] = { 1, 0 };
-    layout_type layout = layout_type::order_dimensions( 2, order2, dimensions2 );
-    Kokkos::resize( b, layout );
+    const int dimensions2[] = {7, 8};
+    const int order2[]      = {1, 0};
+    layout_type layout = layout_type::order_dimensions(2, order2, dimensions2);
+    Kokkos::resize(b, layout);
 
-    for ( int i0 = 0; i0 < 7; ++i0 )
-    for ( int i1 = 0; i1 < 8; ++i1 )
-    {
-       int val = 1 + i0 + i1 * N0;
-       ASSERT_EQ( b( i0, i1 ), c( i0, i1 ) );
-       ASSERT_EQ( b( i0, i1 ), val );
-    }
+    for (int i0 = 0; i0 < 7; ++i0)
+      for (int i1 = 0; i1 < 8; ++i1) {
+        int val = 1 + i0 + i1 * N0;
+        ASSERT_EQ(b(i0, i1), c(i0, i1));
+        ASSERT_EQ(b(i0, i1), val);
+      }
 
-    Kokkos::realloc( c, layout );
-    Kokkos::realloc( d, layout );
-
-    ASSERT_EQ( b.extent(0), 7 );
-    ASSERT_EQ( b.extent(1), 8 );
-    ASSERT_EQ( c.extent(0), 7 );
-    ASSERT_EQ( c.extent(1), 8 );
-    ASSERT_EQ( d.extent(0), 7 );
-    ASSERT_EQ( d.extent(1), 8 );
+    Kokkos::realloc(c, layout);
+    Kokkos::realloc(d, layout);
 
+    ASSERT_EQ(b.extent(0), 7);
+    ASSERT_EQ(b.extent(1), 8);
+    ASSERT_EQ(c.extent(0), 7);
+    ASSERT_EQ(c.extent(1), 8);
+    ASSERT_EQ(d.extent(0), 7);
+    ASSERT_EQ(d.extent(1), 8);
   }
 
   {
-    typedef Kokkos::View< int*, Space > V;
-    typedef Kokkos::View< int*, Space, Kokkos::MemoryUnmanaged > U;
+    typedef Kokkos::View<int*, Space> V;
+    typedef Kokkos::View<int*, Space, Kokkos::MemoryUnmanaged> U;
 
-    V a( "a", 10 );
+    V a("a", 10);
 
-    ASSERT_EQ( a.use_count(), 1 );
+    ASSERT_EQ(a.use_count(), 1);
 
     V b = a;
 
-    ASSERT_EQ( a.use_count(), 2 );
-    ASSERT_EQ( b.use_count(), 2 );
+    ASSERT_EQ(a.use_count(), 2);
+    ASSERT_EQ(b.use_count(), 2);
 
     {
-      U c = b; // 'c' is compile-time unmanaged.
+      U c = b;  // 'c' is compile-time unmanaged.
 
-      ASSERT_EQ( a.use_count(), 2 );
-      ASSERT_EQ( b.use_count(), 2 );
-      ASSERT_EQ( c.use_count(), 2 );
+      ASSERT_EQ(a.use_count(), 2);
+      ASSERT_EQ(b.use_count(), 2);
+      ASSERT_EQ(c.use_count(), 2);
 
-      V d = c; // 'd' is run-time unmanaged.
+      V d = c;  // 'd' is run-time unmanaged.
 
-      ASSERT_EQ( a.use_count(), 2 );
-      ASSERT_EQ( b.use_count(), 2 );
-      ASSERT_EQ( c.use_count(), 2 );
-      ASSERT_EQ( d.use_count(), 2 );
+      ASSERT_EQ(a.use_count(), 2);
+      ASSERT_EQ(b.use_count(), 2);
+      ASSERT_EQ(c.use_count(), 2);
+      ASSERT_EQ(d.use_count(), 2);
     }
 
-    ASSERT_EQ( a.use_count(), 2 );
-    ASSERT_EQ( b.use_count(), 2 );
+    ASSERT_EQ(a.use_count(), 2);
+    ASSERT_EQ(b.use_count(), 2);
 
     b = V();
 
-    ASSERT_EQ( a.use_count(), 1 );
-    ASSERT_EQ( b.use_count(), 0 );
+    ASSERT_EQ(a.use_count(), 1);
+    ASSERT_EQ(b.use_count(), 0);
 
-// TODO: a.use_count() and x.use_count() are 0 with the asynchronous HPX backend. Why?
-#if !defined( KOKKOS_ENABLE_CUDA_LAMBDA ) && !defined( KOKKOS_ENABLE_ROCM ) && \
-    !(defined( KOKKOS_ENABLE_HPX ) && defined( KOKKOS_ENABLE_HPX_ASYNC_DISPATCH ))
+// TODO: a.use_count() and x.use_count() are 0 with the asynchronous HPX
+// backend. Why?
+#if !defined(KOKKOS_ENABLE_CUDA_LAMBDA) && !defined(KOKKOS_ENABLE_ROCM) && \
+    !(defined(KOKKOS_ENABLE_HPX) && defined(KOKKOS_ENABLE_HPX_ASYNC_DISPATCH))
     // Cannot launch host lambda when CUDA lambda is enabled.
 
-    typedef typename Kokkos::Impl::HostMirror< Space >::Space::execution_space host_exec_space;
+    typedef typename Kokkos::Impl::HostMirror<Space>::Space::execution_space
+        host_exec_space;
 
-    Kokkos::parallel_for( Kokkos::RangePolicy< host_exec_space >( 0, 10 ), KOKKOS_LAMBDA ( int ) {
-      // 'a' is captured by copy, and the capture mechanism converts 'a' to an
-      // unmanaged copy.  When the parallel dispatch accepts a move for the
-      // lambda, this count should become 1.
- 
-      ASSERT_EQ( a.use_count(), 2 );
-      V x = a;
-      ASSERT_EQ( a.use_count(), 2 );
-      ASSERT_EQ( x.use_count(), 2 );
-    });
-#endif // #if !defined( KOKKOS_ENABLE_CUDA_LAMBDA )
+    Kokkos::parallel_for(
+        Kokkos::RangePolicy<host_exec_space>(0, 10), KOKKOS_LAMBDA(int) {
+          // 'a' is captured by copy, and the capture mechanism converts 'a' to
+          // an unmanaged copy.  When the parallel dispatch accepts a move for
+          // the lambda, this count should become 1.
+
+          ASSERT_EQ(a.use_count(), 2);
+          V x = a;
+          ASSERT_EQ(a.use_count(), 2);
+          ASSERT_EQ(x.use_count(), 2);
+        });
+#endif  // #if !defined( KOKKOS_ENABLE_CUDA_LAMBDA )
   }
 }
 
-TEST_F( TEST_CATEGORY , view_mapping )
-{
-   test_view_mapping< TEST_EXECSPACE >();
-}
+TEST(TEST_CATEGORY, view_mapping) { test_view_mapping<TEST_EXECSPACE>(); }
 /*--------------------------------------------------------------------------*/
 
-template< class ViewType >
+template <class ViewType>
 struct TestViewMapOperator {
-
-  static_assert( ViewType::reference_type_is_lvalue_reference
-               , "Test only valid for lvalue reference type" );
+  static_assert(ViewType::reference_type_is_lvalue_reference,
+                "Test only valid for lvalue reference type");
 
 #ifdef KOKKOS_ENABLE_DEPRECATED_CODE
   const ViewType v;
@@ -1052,12 +1106,12 @@ struct TestViewMapOperator {
 #endif
 
   KOKKOS_INLINE_FUNCTION
-  void test_left( size_t i0, long & error_count ) const
-  {
+  void test_left(size_t i0, long& error_count) const {
 #ifdef KOKKOS_ENABLE_DEPPRECATED_CODE
-    typename ViewType::value_type * const base_ptr = & v( 0, 0, 0, 0, 0, 0, 0, 0 );
+    typename ViewType::value_type* const base_ptr = &v(0, 0, 0, 0, 0, 0, 0, 0);
 #else
-    typename ViewType::value_type * const base_ptr = & v.access( 0, 0, 0, 0, 0, 0, 0, 0 );
+    typename ViewType::value_type* const base_ptr =
+        &v.access(0, 0, 0, 0, 0, 0, 0, 0);
 #endif
     const size_t n1 = v.extent(1);
     const size_t n2 = v.extent(2);
@@ -1069,33 +1123,33 @@ struct TestViewMapOperator {
 
     long offset = 0;
 
-    for ( size_t i7 = 0; i7 < n7; ++i7 )
-    for ( size_t i6 = 0; i6 < n6; ++i6 )
-    for ( size_t i5 = 0; i5 < n5; ++i5 )
-    for ( size_t i4 = 0; i4 < n4; ++i4 )
-    for ( size_t i3 = 0; i3 < n3; ++i3 )
-    for ( size_t i2 = 0; i2 < n2; ++i2 )
-    for ( size_t i1 = 0; i1 < n1; ++i1 )
-    {
+    for (size_t i7 = 0; i7 < n7; ++i7)
+      for (size_t i6 = 0; i6 < n6; ++i6)
+        for (size_t i5 = 0; i5 < n5; ++i5)
+          for (size_t i4 = 0; i4 < n4; ++i4)
+            for (size_t i3 = 0; i3 < n3; ++i3)
+              for (size_t i2 = 0; i2 < n2; ++i2)
+                for (size_t i1 = 0; i1 < n1; ++i1) {
 #ifdef KOKKOS_ENABLE_DEPRECATED_CODE
-        const long d = & v( i0, i1, i2, i3, i4, i5, i6, i7 ) - base_ptr;
+                  const long d = &v(i0, i1, i2, i3, i4, i5, i6, i7) - base_ptr;
 #else
-        const long d = & v.access( i0, i1, i2, i3, i4, i5, i6, i7 ) - base_ptr;
+                  const long d =
+                      &v.access(i0, i1, i2, i3, i4, i5, i6, i7) - base_ptr;
 #endif
-        if ( d < offset ) ++error_count;
-      offset = d;
-    }
+                  if (d < offset) ++error_count;
+                  offset = d;
+                }
 
-    if ( v.span() <= size_t( offset ) ) ++error_count;
+    if (v.span() <= size_t(offset)) ++error_count;
   }
 
   KOKKOS_INLINE_FUNCTION
-  void test_right( size_t i0, long & error_count ) const
-  {
+  void test_right(size_t i0, long& error_count) const {
 #ifdef KOKKOS_ENABLE_DEPRECATED_CODE
-    typename ViewType::value_type * const base_ptr = & v( 0, 0, 0, 0, 0, 0, 0, 0 );
+    typename ViewType::value_type* const base_ptr = &v(0, 0, 0, 0, 0, 0, 0, 0);
 #else
-    typename ViewType::value_type * const base_ptr = & v.access( 0, 0, 0, 0, 0, 0, 0, 0 );
+    typename ViewType::value_type* const base_ptr =
+        &v.access(0, 0, 0, 0, 0, 0, 0, 0);
 #endif
     const size_t n1 = v.extent(1);
     const size_t n2 = v.extent(2);
@@ -1107,34 +1161,34 @@ struct TestViewMapOperator {
 
     long offset = 0;
 
-    for ( size_t i1 = 0; i1 < n1; ++i1 )
-    for ( size_t i2 = 0; i2 < n2; ++i2 )
-    for ( size_t i3 = 0; i3 < n3; ++i3 )
-    for ( size_t i4 = 0; i4 < n4; ++i4 )
-    for ( size_t i5 = 0; i5 < n5; ++i5 )
-    for ( size_t i6 = 0; i6 < n6; ++i6 )
-    for ( size_t i7 = 0; i7 < n7; ++i7 )
-    {
+    for (size_t i1 = 0; i1 < n1; ++i1)
+      for (size_t i2 = 0; i2 < n2; ++i2)
+        for (size_t i3 = 0; i3 < n3; ++i3)
+          for (size_t i4 = 0; i4 < n4; ++i4)
+            for (size_t i5 = 0; i5 < n5; ++i5)
+              for (size_t i6 = 0; i6 < n6; ++i6)
+                for (size_t i7 = 0; i7 < n7; ++i7) {
 #ifdef KOKKOS_ENABLE_DEPRECATED_CODE
-        const long d = & v( i0, i1, i2, i3, i4, i5, i6, i7 ) - base_ptr;
+                  const long d = &v(i0, i1, i2, i3, i4, i5, i6, i7) - base_ptr;
 #else
-        const long d = & v.access( i0, i1, i2, i3, i4, i5, i6, i7 ) - base_ptr;
+                  const long d =
+                      &v.access(i0, i1, i2, i3, i4, i5, i6, i7) - base_ptr;
 #endif
-        if ( d < offset ) ++error_count;
-      offset = d;
-    }
+                  if (d < offset) ++error_count;
+                  offset = d;
+                }
 
-    if ( v.span() <= size_t( offset ) ) ++error_count;
+    if (v.span() <= size_t(offset)) ++error_count;
   }
 
   KOKKOS_INLINE_FUNCTION
-  void operator()( size_t i, long & error_count ) const
-  {
-    if ( std::is_same< typename ViewType::array_layout, Kokkos::LayoutLeft >::value ) {
-      test_left( i, error_count );
-    }
-    else if ( std::is_same< typename ViewType::array_layout, Kokkos::LayoutRight >::value ) {
-      test_right( i, error_count );
+  void operator()(size_t i, long& error_count) const {
+    if (std::is_same<typename ViewType::array_layout,
+                     Kokkos::LayoutLeft>::value) {
+      test_left(i, error_count);
+    } else if (std::is_same<typename ViewType::array_layout,
+                            Kokkos::LayoutRight>::value) {
+      test_right(i, error_count);
     }
   }
 
@@ -1148,111 +1202,148 @@ struct TestViewMapOperator {
   enum { N7 = 3 };
 
 #ifdef KOKKOS_ENABLE_DEPRECATED_CODE
-  TestViewMapOperator() : v( "Test", N0, N1, N2, N3, N4, N5, N6, N7 ) {}
+  TestViewMapOperator() : v("Test", N0, N1, N2, N3, N4, N5, N6, N7) {}
 
- #else
+#else
   TestViewMapOperator() {
-
     const size_t dyn_rank = v.rank_dynamic;
     const std::string label("Test");
-    switch(dyn_rank) {
-      case 0:
-        v = ViewType(label);
-        break;
-      case 1:
-        v = ViewType(label, N0);
-        break;
-      case 2:
-        v = ViewType(label, N0, N1);
-        break;
-      case 3:
-        v = ViewType(label, N0, N1, N2);
-        break;
-      case 4:
-        v = ViewType(label, N0, N1, N2, N3);
-        break;
-      case 5:
-        v = ViewType(label, N0, N1, N2, N3, N4);
-        break;
-      case 6:
-        v = ViewType(label, N0, N1, N2, N3, N4, N5);
-        break;
-      case 7:
-        v = ViewType(label, N0, N1, N2, N3, N4, N5, N6);
-        break;
+    switch (dyn_rank) {
+      case 0: v = ViewType(label); break;
+      case 1: v = ViewType(label, N0); break;
+      case 2: v = ViewType(label, N0, N1); break;
+      case 3: v = ViewType(label, N0, N1, N2); break;
+      case 4: v = ViewType(label, N0, N1, N2, N3); break;
+      case 5: v = ViewType(label, N0, N1, N2, N3, N4); break;
+      case 6: v = ViewType(label, N0, N1, N2, N3, N4, N5); break;
+      case 7: v = ViewType(label, N0, N1, N2, N3, N4, N5, N6); break;
       case 8:
-      default:
-        v = ViewType(label, N0, N1, N2, N3, N4, N5, N6, N7);
-
+      default: v = ViewType(label, N0, N1, N2, N3, N4, N5, N6, N7);
     }
-
   }
 
-
 #endif
-  void run()
-  {
-    ASSERT_EQ( v.extent(0), ( 0 < ViewType::rank ? TestViewMapOperator<ViewType>::N0 : 1 ) );
-    ASSERT_EQ( v.extent(1), ( 1 < ViewType::rank ? TestViewMapOperator<ViewType>::N1 : 1 ) );
-    ASSERT_EQ( v.extent(2), ( 2 < ViewType::rank ? TestViewMapOperator<ViewType>::N2 : 1 ) );
-    ASSERT_EQ( v.extent(3), ( 3 < ViewType::rank ? TestViewMapOperator<ViewType>::N3 : 1 ) );
-    ASSERT_EQ( v.extent(4), ( 4 < ViewType::rank ? TestViewMapOperator<ViewType>::N4 : 1 ) );
-    ASSERT_EQ( v.extent(5), ( 5 < ViewType::rank ? TestViewMapOperator<ViewType>::N5 : 1 ) );
-    ASSERT_EQ( v.extent(6), ( 6 < ViewType::rank ? TestViewMapOperator<ViewType>::N6 : 1 ) );
-    ASSERT_EQ( v.extent(7), ( 7 < ViewType::rank ? TestViewMapOperator<ViewType>::N7 : 1 ) );
+  void run() {
+    ASSERT_EQ(v.extent(0),
+              (0 < ViewType::rank ? TestViewMapOperator<ViewType>::N0 : 1));
+    ASSERT_EQ(v.extent(1),
+              (1 < ViewType::rank ? TestViewMapOperator<ViewType>::N1 : 1));
+    ASSERT_EQ(v.extent(2),
+              (2 < ViewType::rank ? TestViewMapOperator<ViewType>::N2 : 1));
+    ASSERT_EQ(v.extent(3),
+              (3 < ViewType::rank ? TestViewMapOperator<ViewType>::N3 : 1));
+    ASSERT_EQ(v.extent(4),
+              (4 < ViewType::rank ? TestViewMapOperator<ViewType>::N4 : 1));
+    ASSERT_EQ(v.extent(5),
+              (5 < ViewType::rank ? TestViewMapOperator<ViewType>::N5 : 1));
+    ASSERT_EQ(v.extent(6),
+              (6 < ViewType::rank ? TestViewMapOperator<ViewType>::N6 : 1));
+    ASSERT_EQ(v.extent(7),
+              (7 < ViewType::rank ? TestViewMapOperator<ViewType>::N7 : 1));
 
-    ASSERT_LE( v.extent(0) *
-               v.extent(1) *
-               v.extent(2) *
-               v.extent(3) *
-               v.extent(4) *
-               v.extent(5) *
-               v.extent(6) *
-               v.extent(7)
-             , v.span() );
+    ASSERT_LE(v.extent(0) * v.extent(1) * v.extent(2) * v.extent(3) *
+                  v.extent(4) * v.extent(5) * v.extent(6) * v.extent(7),
+              v.span());
 
     long error_count;
-    Kokkos::RangePolicy< typename ViewType::execution_space > range( 0, v.extent(0) );
-    Kokkos::parallel_reduce( range, *this, error_count );
-    ASSERT_EQ( 0, error_count );
-}
+    Kokkos::RangePolicy<typename ViewType::execution_space> range(0,
+                                                                  v.extent(0));
+    Kokkos::parallel_reduce(range, *this, error_count);
+    ASSERT_EQ(0, error_count);
+  }
 };
 
-template< class Space >
-void test_view_mapping_operator()
-{
+template <class Space>
+void test_view_mapping_operator() {
   typedef typename Space::execution_space ExecSpace;
 
-  { TestViewMapOperator< Kokkos::View<int, Kokkos::LayoutLeft, ExecSpace> > f; f.run(); }
-  { TestViewMapOperator< Kokkos::View<int*, Kokkos::LayoutLeft, ExecSpace> > f; f.run(); }
-  { TestViewMapOperator< Kokkos::View<int**, Kokkos::LayoutLeft, ExecSpace> > f; f.run(); }
-  { TestViewMapOperator< Kokkos::View<int***, Kokkos::LayoutLeft, ExecSpace> > f; f.run(); }
-  { TestViewMapOperator< Kokkos::View<int****, Kokkos::LayoutLeft, ExecSpace> > f; f.run(); }
-  { TestViewMapOperator< Kokkos::View<int*****, Kokkos::LayoutLeft, ExecSpace> > f; f.run(); }
-  { TestViewMapOperator< Kokkos::View<int******, Kokkos::LayoutLeft, ExecSpace> > f; f.run(); }
-  { TestViewMapOperator< Kokkos::View<int*******, Kokkos::LayoutLeft, ExecSpace> > f; f.run(); }
+  {
+    TestViewMapOperator<Kokkos::View<int, Kokkos::LayoutLeft, ExecSpace> > f;
+    f.run();
+  }
+  {
+    TestViewMapOperator<Kokkos::View<int*, Kokkos::LayoutLeft, ExecSpace> > f;
+    f.run();
+  }
+  {
+    TestViewMapOperator<Kokkos::View<int**, Kokkos::LayoutLeft, ExecSpace> > f;
+    f.run();
+  }
+  {
+    TestViewMapOperator<Kokkos::View<int***, Kokkos::LayoutLeft, ExecSpace> > f;
+    f.run();
+  }
+  {
+    TestViewMapOperator<Kokkos::View<int****, Kokkos::LayoutLeft, ExecSpace> >
+        f;
+    f.run();
+  }
+  {
+    TestViewMapOperator<Kokkos::View<int*****, Kokkos::LayoutLeft, ExecSpace> >
+        f;
+    f.run();
+  }
+  {
+    TestViewMapOperator<Kokkos::View<int******, Kokkos::LayoutLeft, ExecSpace> >
+        f;
+    f.run();
+  }
+  {
+    TestViewMapOperator<
+        Kokkos::View<int*******, Kokkos::LayoutLeft, ExecSpace> >
+        f;
+    f.run();
+  }
 
-  { TestViewMapOperator< Kokkos::View<int, Kokkos::LayoutRight, ExecSpace> > f; f.run(); }
-  { TestViewMapOperator< Kokkos::View<int*, Kokkos::LayoutRight, ExecSpace> > f; f.run(); }
-  { TestViewMapOperator< Kokkos::View<int**, Kokkos::LayoutRight, ExecSpace> > f; f.run(); }
-  { TestViewMapOperator< Kokkos::View<int***, Kokkos::LayoutRight, ExecSpace> > f; f.run(); }
-  { TestViewMapOperator< Kokkos::View<int****, Kokkos::LayoutRight, ExecSpace> > f; f.run(); }
-  { TestViewMapOperator< Kokkos::View<int*****, Kokkos::LayoutRight, ExecSpace> > f; f.run(); }
-  { TestViewMapOperator< Kokkos::View<int******, Kokkos::LayoutRight, ExecSpace> > f; f.run(); }
-  { TestViewMapOperator< Kokkos::View<int*******, Kokkos::LayoutRight, ExecSpace> > f; f.run(); }
+  {
+    TestViewMapOperator<Kokkos::View<int, Kokkos::LayoutRight, ExecSpace> > f;
+    f.run();
+  }
+  {
+    TestViewMapOperator<Kokkos::View<int*, Kokkos::LayoutRight, ExecSpace> > f;
+    f.run();
+  }
+  {
+    TestViewMapOperator<Kokkos::View<int**, Kokkos::LayoutRight, ExecSpace> > f;
+    f.run();
+  }
+  {
+    TestViewMapOperator<Kokkos::View<int***, Kokkos::LayoutRight, ExecSpace> >
+        f;
+    f.run();
+  }
+  {
+    TestViewMapOperator<Kokkos::View<int****, Kokkos::LayoutRight, ExecSpace> >
+        f;
+    f.run();
+  }
+  {
+    TestViewMapOperator<Kokkos::View<int*****, Kokkos::LayoutRight, ExecSpace> >
+        f;
+    f.run();
+  }
+  {
+    TestViewMapOperator<
+        Kokkos::View<int******, Kokkos::LayoutRight, ExecSpace> >
+        f;
+    f.run();
+  }
+  {
+    TestViewMapOperator<
+        Kokkos::View<int*******, Kokkos::LayoutRight, ExecSpace> >
+        f;
+    f.run();
+  }
 }
 
-TEST_F( TEST_CATEGORY , view_mapping_operator )
-{
-  test_view_mapping_operator< TEST_EXECSPACE >();
-}
-
-TEST_F( TEST_CATEGORY , static_extent )
-{
-  using T = Kokkos::View<double*[2][3]>;
-  ASSERT_EQ( T::static_extent(1), 2 );
-  ASSERT_EQ( T::static_extent(2), 3 );
+TEST(TEST_CATEGORY, view_mapping_operator) {
+  test_view_mapping_operator<TEST_EXECSPACE>();
 }
 
+TEST(TEST_CATEGORY, static_extent) {
+  using T = Kokkos::View<double * [2][3]>;
+  ASSERT_EQ(T::static_extent(1), 2);
+  ASSERT_EQ(T::static_extent(2), 3);
 }
 
+}  // namespace Test
diff --git a/lib/kokkos/core/unit_test/TestViewMapping_b.hpp b/lib/kokkos/core/unit_test/TestViewMapping_b.hpp
index 36fc0461a4..63ec635323 100644
--- a/lib/kokkos/core/unit_test/TestViewMapping_b.hpp
+++ b/lib/kokkos/core/unit_test/TestViewMapping_b.hpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -53,208 +54,206 @@ namespace Test {
 
 /*--------------------------------------------------------------------------*/
 
-template< class Space >
+template <class Space>
 struct TestViewMappingAtomic {
   typedef typename Space::execution_space ExecSpace;
-  typedef typename Space::memory_space    MemSpace;
+  typedef typename Space::memory_space MemSpace;
 
-  typedef Kokkos::MemoryTraits< Kokkos::Atomic >  mem_trait;
+  typedef Kokkos::MemoryTraits<Kokkos::Atomic> mem_trait;
 
-  typedef Kokkos::View< int *, ExecSpace > T;
-  typedef Kokkos::View< int *, ExecSpace, mem_trait >  T_atom;
+  typedef Kokkos::View<int *, ExecSpace> T;
+  typedef Kokkos::View<int *, ExecSpace, mem_trait> T_atom;
 
-  T      x;
+  T x;
   T_atom x_atom;
 
-  enum { N = 100000};
+  enum { N = 100000 };
 
   struct TagInit {};
   struct TagUpdate {};
   struct TagVerify {};
 
   KOKKOS_INLINE_FUNCTION
-  void operator()( const TagInit &, const int i ) const
-  { x( i ) = i; }
+  void operator()(const TagInit &, const int i) const { x(i) = i; }
 
   KOKKOS_INLINE_FUNCTION
-  void operator()( const TagUpdate &, const int i ) const
-  { x_atom( i % 2 ) += 1; }
+  void operator()(const TagUpdate &, const int i) const { x_atom(i % 2) += 1; }
 
   KOKKOS_INLINE_FUNCTION
-  void operator()( const TagVerify &, const int i, long & error_count ) const
-  {
-     if ( i < 2 ) { if ( x( i ) != int( i + N / 2 ) ) ++error_count; }
-     else         { if ( x( i ) != int( i ) ) ++error_count; }
+  void operator()(const TagVerify &, const int i, long &error_count) const {
+    if (i < 2) {
+      if (x(i) != int(i + N / 2)) ++error_count;
+    } else {
+      if (x(i) != int(i)) ++error_count;
+    }
   }
 
-  TestViewMappingAtomic()
-    : x( "x", N )
-    , x_atom( x )
-    {}
+  TestViewMappingAtomic() : x("x", N), x_atom(x) {}
 
   void run() {
+    ASSERT_TRUE(T::reference_type_is_lvalue_reference);
+    ASSERT_FALSE(T_atom::reference_type_is_lvalue_reference);
 
-    ASSERT_TRUE( T::reference_type_is_lvalue_reference );
-    ASSERT_FALSE( T_atom::reference_type_is_lvalue_reference );
-
-    Kokkos::parallel_for( Kokkos::RangePolicy< ExecSpace, TagInit >  ( 0, N ), *this );
-    Kokkos::parallel_for( Kokkos::RangePolicy< ExecSpace, TagUpdate >( 0, N ), *this );
+    Kokkos::parallel_for(Kokkos::RangePolicy<ExecSpace, TagInit>(0, N), *this);
+    Kokkos::parallel_for(Kokkos::RangePolicy<ExecSpace, TagUpdate>(0, N),
+                         *this);
 
     long error_count = -1;
 
-    Kokkos::parallel_reduce( Kokkos::RangePolicy< ExecSpace, TagVerify >( 0, N ), *this, error_count );
+    Kokkos::parallel_reduce(Kokkos::RangePolicy<ExecSpace, TagVerify>(0, N),
+                            *this, error_count);
 
-    ASSERT_EQ( 0, error_count );
+    ASSERT_EQ(0, error_count);
 
-    typename T_atom::HostMirror x_host = Kokkos::create_mirror_view( x );
-    Kokkos::deep_copy( x_host, x );
+    typename T_atom::HostMirror x_host = Kokkos::create_mirror_view(x);
+    Kokkos::deep_copy(x_host, x);
 
     error_count = -1;
 
-    Kokkos::parallel_reduce( Kokkos::RangePolicy< Kokkos::DefaultHostExecutionSpace, TagVerify >( 0, N ), 
-      [=] ( const TagVerify &, const int i, long & tmp_error_count )
-    {
-      if ( i < 2 ) {
-        if ( x_host( i ) != int( i + N / 2 ) ) ++tmp_error_count ;
-      }
-      else {
-        if ( x_host( i ) != int( i ) ) ++tmp_error_count ;
-      }
-    }, error_count);
+    Kokkos::parallel_reduce(
+        Kokkos::RangePolicy<Kokkos::DefaultHostExecutionSpace, TagVerify>(0, N),
+        [=](const TagVerify &, const int i, long &tmp_error_count) {
+          if (i < 2) {
+            if (x_host(i) != int(i + N / 2)) ++tmp_error_count;
+          } else {
+            if (x_host(i) != int(i)) ++tmp_error_count;
+          }
+        },
+        error_count);
 
-    ASSERT_EQ( 0 , error_count );
-    Kokkos::deep_copy( x, x_host );
+    ASSERT_EQ(0, error_count);
+    Kokkos::deep_copy(x, x_host);
   }
 };
 
-TEST_F( TEST_CATEGORY , view_mapping_atomic )
-{
-  TestViewMappingAtomic< TEST_EXECSPACE > f;
+TEST(TEST_CATEGORY, view_mapping_atomic) {
+  TestViewMappingAtomic<TEST_EXECSPACE> f;
   f.run();
 }
 
-}
+}  // namespace Test
 
 /*--------------------------------------------------------------------------*/
 
 namespace Test {
 
 struct MappingClassValueType {
-    KOKKOS_INLINE_FUNCTION
-    MappingClassValueType() 
-    {
+  KOKKOS_INLINE_FUNCTION
+  MappingClassValueType() {
 #if 0
-#if defined( KOKKOS_ACTIVE_EXECUTION_MEMORY_SPACE_CUDA )
+#if defined(KOKKOS_ACTIVE_EXECUTION_MEMORY_SPACE_CUDA)
       printf( "TestViewMappingClassValue construct on Cuda\n" );
-#elif defined( KOKKOS_ACTIVE_EXECUTION_MEMORY_SPACE_HOST )
+#elif defined(KOKKOS_ACTIVE_EXECUTION_MEMORY_SPACE_HOST)
       printf( "TestViewMappingClassValue construct on Host\n" );
 #else
       printf( "TestViewMappingClassValue construct unknown\n" );
 #endif
 #endif
-    }
-    KOKKOS_INLINE_FUNCTION
-    ~MappingClassValueType()
-    {
+  }
+  KOKKOS_INLINE_FUNCTION
+  ~MappingClassValueType() {
 #if 0
-#if defined( KOKKOS_ACTIVE_EXECUTION_MEMORY_SPACE_CUDA )
+#if defined(KOKKOS_ACTIVE_EXECUTION_MEMORY_SPACE_CUDA)
       printf( "TestViewMappingClassValue destruct on Cuda\n" );
-#elif defined( KOKKOS_ACTIVE_EXECUTION_MEMORY_SPACE_HOST )
+#elif defined(KOKKOS_ACTIVE_EXECUTION_MEMORY_SPACE_HOST)
       printf( "TestViewMappingClassValue destruct on Host\n" );
 #else
       printf( "TestViewMappingClassValue destruct unknown\n" );
 #endif
 #endif
-    }
-  };
+  }
+};
 
-template< class Space >
-void test_view_mapping_class_value()
-{
+template <class Space>
+void test_view_mapping_class_value() {
   typedef typename Space::execution_space ExecSpace;
 
   ExecSpace().fence();
   {
-    Kokkos::View< MappingClassValueType, ExecSpace > a( "a" );
+    Kokkos::View<MappingClassValueType, ExecSpace> a("a");
     ExecSpace().fence();
   }
   ExecSpace().fence();
 }
 
-TEST_F( TEST_CATEGORY , view_mapping_class_value )
-{
-  test_view_mapping_class_value< TEST_EXECSPACE >();
+TEST(TEST_CATEGORY, view_mapping_class_value) {
+  test_view_mapping_class_value<TEST_EXECSPACE>();
 }
 
-}
+}  // namespace Test
 
 /*--------------------------------------------------------------------------*/
 
 namespace Test {
 
-TEST_F( TEST_CATEGORY , view_mapping_assignable )
-{
-  typedef TEST_EXECSPACE exec_space ;
+TEST(TEST_CATEGORY, view_mapping_assignable) {
+  typedef TEST_EXECSPACE exec_space;
 
-  { // Assignment of rank-0 Left = Right
-    typedef Kokkos::ViewTraits<int,Kokkos::LayoutLeft, exec_space> dst_traits ;
-    typedef Kokkos::ViewTraits<int,Kokkos::LayoutRight,exec_space> src_traits ;
-    typedef Kokkos::Impl::ViewMapping<dst_traits,src_traits,void> mapping ;
-    static_assert( mapping::is_assignable , "" );
+  {  // Assignment of rank-0 Left = Right
+    typedef Kokkos::ViewTraits<int, Kokkos::LayoutLeft, exec_space> dst_traits;
+    typedef Kokkos::ViewTraits<int, Kokkos::LayoutRight, exec_space> src_traits;
+    typedef Kokkos::Impl::ViewMapping<dst_traits, src_traits, void> mapping;
+    static_assert(mapping::is_assignable, "");
 
-    Kokkos::View<int,Kokkos::LayoutRight,exec_space> src ;
-    Kokkos::View<int,Kokkos::LayoutLeft,exec_space> dst( src );
-    dst = src ;
+    Kokkos::View<int, Kokkos::LayoutRight, exec_space> src;
+    Kokkos::View<int, Kokkos::LayoutLeft, exec_space> dst(src);
+    dst = src;
   }
 
-  { // Assignment of rank-0 Right = Left
-    typedef Kokkos::ViewTraits<int,Kokkos::LayoutRight,exec_space> dst_traits ;
-    typedef Kokkos::ViewTraits<int,Kokkos::LayoutLeft, exec_space> src_traits ;
-    typedef Kokkos::Impl::ViewMapping<dst_traits,src_traits,void> mapping ;
-    static_assert( mapping::is_assignable , "" );
+  {  // Assignment of rank-0 Right = Left
+    typedef Kokkos::ViewTraits<int, Kokkos::LayoutRight, exec_space> dst_traits;
+    typedef Kokkos::ViewTraits<int, Kokkos::LayoutLeft, exec_space> src_traits;
+    typedef Kokkos::Impl::ViewMapping<dst_traits, src_traits, void> mapping;
+    static_assert(mapping::is_assignable, "");
 
-    Kokkos::View<int,Kokkos::LayoutLeft,exec_space> src ;
-    Kokkos::View<int,Kokkos::LayoutRight,exec_space> dst( src );
-    dst = src ;
+    Kokkos::View<int, Kokkos::LayoutLeft, exec_space> src;
+    Kokkos::View<int, Kokkos::LayoutRight, exec_space> dst(src);
+    dst = src;
   }
 
-  { // Assignment of rank-1 Left = Right
-    typedef Kokkos::ViewTraits<int*,Kokkos::LayoutLeft, exec_space> dst_traits ;
-    typedef Kokkos::ViewTraits<int*,Kokkos::LayoutRight,exec_space> src_traits ;
-    typedef Kokkos::Impl::ViewMapping<dst_traits,src_traits,void> mapping ;
-    static_assert( mapping::is_assignable , "" );
+  {  // Assignment of rank-1 Left = Right
+    typedef Kokkos::ViewTraits<int *, Kokkos::LayoutLeft, exec_space>
+        dst_traits;
+    typedef Kokkos::ViewTraits<int *, Kokkos::LayoutRight, exec_space>
+        src_traits;
+    typedef Kokkos::Impl::ViewMapping<dst_traits, src_traits, void> mapping;
+    static_assert(mapping::is_assignable, "");
 
-    Kokkos::View<int*,Kokkos::LayoutRight,exec_space> src ;
-    Kokkos::View<int*,Kokkos::LayoutLeft,exec_space> dst( src );
-    dst = src ;
+    Kokkos::View<int *, Kokkos::LayoutRight, exec_space> src;
+    Kokkos::View<int *, Kokkos::LayoutLeft, exec_space> dst(src);
+    dst = src;
   }
 
-  { // Assignment of rank-1 Right = Left
-    typedef Kokkos::ViewTraits<int*,Kokkos::LayoutRight,exec_space> dst_traits ;
-    typedef Kokkos::ViewTraits<int*,Kokkos::LayoutLeft, exec_space> src_traits ;
-    typedef Kokkos::Impl::ViewMapping<dst_traits,src_traits,void> mapping ;
-    static_assert( mapping::is_assignable , "" );
+  {  // Assignment of rank-1 Right = Left
+    typedef Kokkos::ViewTraits<int *, Kokkos::LayoutRight, exec_space>
+        dst_traits;
+    typedef Kokkos::ViewTraits<int *, Kokkos::LayoutLeft, exec_space>
+        src_traits;
+    typedef Kokkos::Impl::ViewMapping<dst_traits, src_traits, void> mapping;
+    static_assert(mapping::is_assignable, "");
 
-    Kokkos::View<int*,Kokkos::LayoutLeft,exec_space> src ;
-    Kokkos::View<int*,Kokkos::LayoutRight,exec_space> dst( src );
-    dst = src ;
+    Kokkos::View<int *, Kokkos::LayoutLeft, exec_space> src;
+    Kokkos::View<int *, Kokkos::LayoutRight, exec_space> dst(src);
+    dst = src;
   }
 
-  { // Assignment of rank-2 Left = Right
-    typedef Kokkos::ViewTraits<int**,Kokkos::LayoutLeft, exec_space> dst_traits ;
-    typedef Kokkos::ViewTraits<int**,Kokkos::LayoutRight,exec_space> src_traits ;
-    typedef Kokkos::Impl::ViewMapping<dst_traits,src_traits,void> mapping ;
-    static_assert( ! mapping::is_assignable , "" );
+  {  // Assignment of rank-2 Left = Right
+    typedef Kokkos::ViewTraits<int **, Kokkos::LayoutLeft, exec_space>
+        dst_traits;
+    typedef Kokkos::ViewTraits<int **, Kokkos::LayoutRight, exec_space>
+        src_traits;
+    typedef Kokkos::Impl::ViewMapping<dst_traits, src_traits, void> mapping;
+    static_assert(!mapping::is_assignable, "");
   }
 
-  { // Assignment of rank-2 Right = Left
-    typedef Kokkos::ViewTraits<int**,Kokkos::LayoutRight,exec_space> dst_traits ;
-    typedef Kokkos::ViewTraits<int**,Kokkos::LayoutLeft, exec_space> src_traits ;
-    typedef Kokkos::Impl::ViewMapping<dst_traits,src_traits,void> mapping ;
-    static_assert( ! mapping::is_assignable , "" );
+  {  // Assignment of rank-2 Right = Left
+    typedef Kokkos::ViewTraits<int **, Kokkos::LayoutRight, exec_space>
+        dst_traits;
+    typedef Kokkos::ViewTraits<int **, Kokkos::LayoutLeft, exec_space>
+        src_traits;
+    typedef Kokkos::Impl::ViewMapping<dst_traits, src_traits, void> mapping;
+    static_assert(!mapping::is_assignable, "");
   }
-
-}
-
 }
 
+}  // namespace Test
diff --git a/lib/kokkos/core/unit_test/TestViewMapping_subview.hpp b/lib/kokkos/core/unit_test/TestViewMapping_subview.hpp
index 62bd582871..d5e9ce7de1 100644
--- a/lib/kokkos/core/unit_test/TestViewMapping_subview.hpp
+++ b/lib/kokkos/core/unit_test/TestViewMapping_subview.hpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -51,46 +52,51 @@
 
 namespace Test {
 
-template< class Space >
-struct TestViewMappingSubview
-{
+template <class Space>
+struct TestViewMappingSubview {
   typedef typename Space::execution_space ExecSpace;
-  typedef typename Space::memory_space    MemSpace;
+  typedef typename Space::memory_space MemSpace;
 
-  typedef Kokkos::pair< int, int > range;
+  typedef Kokkos::pair<int, int> range;
 
   enum { AN = 10 };
-  typedef Kokkos::View< int*, ExecSpace >  AT;
-  typedef Kokkos::View< const int*, ExecSpace >  ACT;
-  typedef Kokkos::Subview< AT, range >  AS;
+  typedef Kokkos::View<int*, ExecSpace> AT;
+  typedef Kokkos::View<const int*, ExecSpace> ACT;
+  typedef Kokkos::Subview<AT, range> AS;
 
   enum { BN0 = 10, BN1 = 11, BN2 = 12 };
-  typedef Kokkos::View< int***, ExecSpace >  BT;
-  typedef Kokkos::Subview< BT, range, range, range >  BS;
+  typedef Kokkos::View<int***, ExecSpace> BT;
+  typedef Kokkos::Subview<BT, range, range, range> BS;
 
   enum { CN0 = 10, CN1 = 11, CN2 = 12 };
-  typedef Kokkos::View< int***[13][14], ExecSpace >  CT;
-  typedef Kokkos::Subview< CT, range, range, range, int, int >  CS;
+  typedef Kokkos::View<int** * [13][14], ExecSpace> CT;
+  typedef Kokkos::Subview<CT, range, range, range, int, int> CS;
 
   enum { DN0 = 10, DN1 = 11, DN2 = 12, DN3 = 13, DN4 = 14 };
-  typedef Kokkos::View< int***[DN3][DN4], ExecSpace >  DT;
-  typedef Kokkos::Subview< DT, int, range, range, range, int >  DS;
+  typedef Kokkos::View<int** * [DN3][DN4], ExecSpace> DT;
+  typedef Kokkos::Subview<DT, int, range, range, range, int> DS;
 
-  typedef Kokkos::View< int***[13][14], Kokkos::LayoutLeft, ExecSpace >  DLT;
-  typedef Kokkos::Subview< DLT, range, int, int, int, int >  DLS1;
+  typedef Kokkos::View<int** * [13][14], Kokkos::LayoutLeft, ExecSpace> DLT;
+  typedef Kokkos::Subview<DLT, range, int, int, int, int> DLS1;
 
-  #if !defined(KOKKOS_IMPL_CUDA_VERSION_9_WORKAROUND)
-  static_assert( DLS1::rank == 1 && std::is_same< typename DLS1::array_layout, Kokkos::LayoutLeft >::value
-               , "Subview layout error for rank 1 subview of left-most range of LayoutLeft" );
-  #endif
+#if !defined(KOKKOS_IMPL_CUDA_VERSION_9_WORKAROUND)
+  static_assert(
+      DLS1::rank == 1 &&
+          std::is_same<typename DLS1::array_layout, Kokkos::LayoutLeft>::value,
+      "Subview layout error for rank 1 subview of left-most range of "
+      "LayoutLeft");
+#endif
 
-  typedef Kokkos::View< int***[13][14], Kokkos::LayoutRight, ExecSpace >  DRT;
-  typedef Kokkos::Subview< DRT, int, int, int, int, range >  DRS1;
+  typedef Kokkos::View<int** * [13][14], Kokkos::LayoutRight, ExecSpace> DRT;
+  typedef Kokkos::Subview<DRT, int, int, int, int, range> DRS1;
 
-  #if !defined(KOKKOS_IMPL_CUDA_VERSION_9_WORKAROUND)
-  static_assert( DRS1::rank == 1 && std::is_same< typename DRS1::array_layout, Kokkos::LayoutRight >::value
-               , "Subview layout error for rank 1 subview of right-most range of LayoutRight" );
-  #endif
+#if !defined(KOKKOS_IMPL_CUDA_VERSION_9_WORKAROUND)
+  static_assert(
+      DRS1::rank == 1 &&
+          std::is_same<typename DRS1::array_layout, Kokkos::LayoutRight>::value,
+      "Subview layout error for rank 1 subview of right-most range of "
+      "LayoutRight");
+#endif
 
   AT Aa;
   AS Ab;
@@ -103,113 +109,102 @@ struct TestViewMappingSubview
   DS Db;
 
   TestViewMappingSubview()
-    : Aa( "Aa", AN )
-    , Ab( Kokkos::subview( Aa, std::pair< int, int >( 1, AN - 1 ) ) )
-    , Ac( Aa, std::pair< int, int >( 1, AN - 1 ) )
-    , Ba( "Ba", BN0, BN1, BN2 )
-    , Bb( Kokkos::subview( Ba
-                                        , std::pair< int, int >( 1, BN0 - 1 )
-                                        , std::pair< int, int >( 1, BN1 - 1 )
-                                        , std::pair< int, int >( 1, BN2 - 1 )
-                                        ) )
-    , Ca( "Ca", CN0, CN1, CN2 )
-    , Cb( Kokkos::subview( Ca
-                                        , std::pair< int, int >( 1, CN0 - 1 )
-                                        , std::pair< int, int >( 1, CN1 - 1 )
-                                        , std::pair< int, int >( 1, CN2 - 1 )
-                                        , 1
-                                        , 2
-                                        ) )
-    , Da( "Da", DN0, DN1, DN2 )
-    , Db( Kokkos::subview( Da
-                                        , 1
-                                        , std::pair< int, int >( 1, DN1 - 1 )
-                                        , std::pair< int, int >( 1, DN2 - 1 )
-                                        , std::pair< int, int >( 1, DN3 - 1 )
-                                        , 2
-                                        ) )
-    {}
+      : Aa("Aa", AN),
+        Ab(Kokkos::subview(Aa, std::pair<int, int>(1, AN - 1))),
+        Ac(Aa, std::pair<int, int>(1, AN - 1)),
+        Ba("Ba", BN0, BN1, BN2),
+        Bb(Kokkos::subview(Ba, std::pair<int, int>(1, BN0 - 1),
+                           std::pair<int, int>(1, BN1 - 1),
+                           std::pair<int, int>(1, BN2 - 1))),
+        Ca("Ca", CN0, CN1, CN2),
+        Cb(Kokkos::subview(Ca, std::pair<int, int>(1, CN0 - 1),
+                           std::pair<int, int>(1, CN1 - 1),
+                           std::pair<int, int>(1, CN2 - 1), 1, 2)),
+        Da("Da", DN0, DN1, DN2),
+        Db(Kokkos::subview(Da, 1, std::pair<int, int>(1, DN1 - 1),
+                           std::pair<int, int>(1, DN2 - 1),
+                           std::pair<int, int>(1, DN3 - 1), 2)) {}
 
   KOKKOS_INLINE_FUNCTION
-  void operator()( const int, long & error_count ) const
-  {
-    auto Ad = Kokkos::subview< Kokkos::MemoryUnmanaged >( Aa, Kokkos::pair< int, int >( 1, AN - 1 ) );
+  void operator()(const int, long& error_count) const {
+    auto Ad = Kokkos::subview<Kokkos::MemoryUnmanaged>(
+        Aa, Kokkos::pair<int, int>(1, AN - 1));
 
-    for ( int i = 1; i < AN - 1; ++i ) if( & Aa[i] != & Ab[i - 1] ) ++error_count;
-    for ( int i = 1; i < AN - 1; ++i ) if( & Aa[i] != & Ac[i - 1] ) ++error_count;
-    for ( int i = 1; i < AN - 1; ++i ) if( & Aa[i] != & Ad[i - 1] ) ++error_count;
+    for (int i = 1; i < AN - 1; ++i)
+      if (&Aa[i] != &Ab[i - 1]) ++error_count;
+    for (int i = 1; i < AN - 1; ++i)
+      if (&Aa[i] != &Ac[i - 1]) ++error_count;
+    for (int i = 1; i < AN - 1; ++i)
+      if (&Aa[i] != &Ad[i - 1]) ++error_count;
 
-    for ( int i2 = 1; i2 < BN2 - 1; ++i2 )
-    for ( int i1 = 1; i1 < BN1 - 1; ++i1 )
-    for ( int i0 = 1; i0 < BN0 - 1; ++i0 )
-    {
-      if ( & Ba( i0, i1, i2 ) != & Bb( i0 - 1, i1 - 1, i2 - 1 ) ) ++error_count;
-    }
+    for (int i2 = 1; i2 < BN2 - 1; ++i2)
+      for (int i1 = 1; i1 < BN1 - 1; ++i1)
+        for (int i0 = 1; i0 < BN0 - 1; ++i0) {
+          if (&Ba(i0, i1, i2) != &Bb(i0 - 1, i1 - 1, i2 - 1)) ++error_count;
+        }
 
-    for ( int i2 = 1; i2 < CN2 - 1; ++i2 )
-    for ( int i1 = 1; i1 < CN1 - 1; ++i1 )
-    for ( int i0 = 1; i0 < CN0 - 1; ++i0 )
-    {
-      if ( & Ca( i0, i1, i2, 1, 2 ) != & Cb( i0 - 1, i1 - 1, i2 - 1 ) ) ++error_count;
-    }
+    for (int i2 = 1; i2 < CN2 - 1; ++i2)
+      for (int i1 = 1; i1 < CN1 - 1; ++i1)
+        for (int i0 = 1; i0 < CN0 - 1; ++i0) {
+          if (&Ca(i0, i1, i2, 1, 2) != &Cb(i0 - 1, i1 - 1, i2 - 1))
+            ++error_count;
+        }
 
-    for ( int i2 = 1; i2 < DN3 - 1; ++i2 )
-    for ( int i1 = 1; i1 < DN2 - 1; ++i1 )
-    for ( int i0 = 1; i0 < DN1 - 1; ++i0 )
-    {
-      if ( & Da( 1, i0, i1, i2, 2 ) != & Db( i0 - 1, i1 - 1, i2 - 1 ) ) ++error_count;
-    }
+    for (int i2 = 1; i2 < DN3 - 1; ++i2)
+      for (int i1 = 1; i1 < DN2 - 1; ++i1)
+        for (int i0 = 1; i0 < DN1 - 1; ++i0) {
+          if (&Da(1, i0, i1, i2, 2) != &Db(i0 - 1, i1 - 1, i2 - 1))
+            ++error_count;
+        }
   }
 
-  void run()
-  {
+  void run() {
+    TestViewMappingSubview<ExecSpace> self;
 
-    TestViewMappingSubview< ExecSpace > self;
+    ASSERT_EQ(Aa.extent(0), AN);
+    ASSERT_EQ(Ab.extent(0), AN - 2);
+    ASSERT_EQ(Ac.extent(0), AN - 2);
+    ASSERT_EQ(Ba.extent(0), BN0);
+    ASSERT_EQ(Ba.extent(1), BN1);
+    ASSERT_EQ(Ba.extent(2), BN2);
+    ASSERT_EQ(Bb.extent(0), BN0 - 2);
+    ASSERT_EQ(Bb.extent(1), BN1 - 2);
+    ASSERT_EQ(Bb.extent(2), BN2 - 2);
 
-    ASSERT_EQ( Aa.extent(0), AN );
-    ASSERT_EQ( Ab.extent(0), AN - 2 );
-    ASSERT_EQ( Ac.extent(0), AN - 2 );
-    ASSERT_EQ( Ba.extent(0), BN0 );
-    ASSERT_EQ( Ba.extent(1), BN1 );
-    ASSERT_EQ( Ba.extent(2), BN2 );
-    ASSERT_EQ( Bb.extent(0), BN0 - 2 );
-    ASSERT_EQ( Bb.extent(1), BN1 - 2 );
-    ASSERT_EQ( Bb.extent(2), BN2 - 2 );
+    ASSERT_EQ(Ca.extent(0), CN0);
+    ASSERT_EQ(Ca.extent(1), CN1);
+    ASSERT_EQ(Ca.extent(2), CN2);
+    ASSERT_EQ(Ca.extent(3), 13);
+    ASSERT_EQ(Ca.extent(4), 14);
+    ASSERT_EQ(Cb.extent(0), CN0 - 2);
+    ASSERT_EQ(Cb.extent(1), CN1 - 2);
+    ASSERT_EQ(Cb.extent(2), CN2 - 2);
 
-    ASSERT_EQ( Ca.extent(0), CN0 );
-    ASSERT_EQ( Ca.extent(1), CN1 );
-    ASSERT_EQ( Ca.extent(2), CN2 );
-    ASSERT_EQ( Ca.extent(3), 13 ); 
-    ASSERT_EQ( Ca.extent(4), 14 );
-    ASSERT_EQ( Cb.extent(0), CN0 - 2 );
-    ASSERT_EQ( Cb.extent(1), CN1 - 2 );
-    ASSERT_EQ( Cb.extent(2), CN2 - 2 );
+    ASSERT_EQ(Da.extent(0), DN0);
+    ASSERT_EQ(Da.extent(1), DN1);
+    ASSERT_EQ(Da.extent(2), DN2);
+    ASSERT_EQ(Da.extent(3), DN3);
+    ASSERT_EQ(Da.extent(4), DN4);
 
-    ASSERT_EQ( Da.extent(0), DN0 );
-    ASSERT_EQ( Da.extent(1), DN1 );
-    ASSERT_EQ( Da.extent(2), DN2 );
-    ASSERT_EQ( Da.extent(3), DN3 );
-    ASSERT_EQ( Da.extent(4), DN4 );
+    ASSERT_EQ(Db.extent(0), DN1 - 2);
+    ASSERT_EQ(Db.extent(1), DN2 - 2);
+    ASSERT_EQ(Db.extent(2), DN3 - 2);
 
-    ASSERT_EQ( Db.extent(0), DN1 - 2 );
-    ASSERT_EQ( Db.extent(1), DN2 - 2 );
-    ASSERT_EQ( Db.extent(2), DN3 - 2 );
-
-    ASSERT_EQ( Da.stride_1(), Db.stride_0() );
-    ASSERT_EQ( Da.stride_2(), Db.stride_1() );
-    ASSERT_EQ( Da.stride_3(), Db.stride_2() );
+    ASSERT_EQ(Da.stride_1(), Db.stride_0());
+    ASSERT_EQ(Da.stride_2(), Db.stride_1());
+    ASSERT_EQ(Da.stride_3(), Db.stride_2());
 
     long error_count = -1;
-    Kokkos::parallel_reduce( Kokkos::RangePolicy< ExecSpace >( 0, 1 ), *this, error_count );
+    Kokkos::parallel_reduce(Kokkos::RangePolicy<ExecSpace>(0, 1), *this,
+                            error_count);
 
-    ASSERT_EQ( error_count, 0 );
+    ASSERT_EQ(error_count, 0);
   }
 };
 
-TEST_F( TEST_CATEGORY , view_mapping_subview )
-{
-  TestViewMappingSubview< TEST_EXECSPACE > f;
+TEST(TEST_CATEGORY, view_mapping_subview) {
+  TestViewMappingSubview<TEST_EXECSPACE> f;
   f.run();
 }
 
-}
+}  // namespace Test
diff --git a/lib/kokkos/core/unit_test/TestViewOfClass.hpp b/lib/kokkos/core/unit_test/TestViewOfClass.hpp
index 7198b4c140..634f1da730 100644
--- a/lib/kokkos/core/unit_test/TestViewOfClass.hpp
+++ b/lib/kokkos/core/unit_test/TestViewOfClass.hpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -50,77 +51,69 @@
 
 namespace Test {
 
-template< class Space >
+template <class Space>
 struct NestedView {
-  Kokkos::View< int*, Space > member;
+  Kokkos::View<int *, Space> member;
 
-public:
+ public:
   KOKKOS_INLINE_FUNCTION
   NestedView() : member() {}
 
   KOKKOS_INLINE_FUNCTION
-  NestedView & operator=( const Kokkos::View< int*, Space > & lhs )
-  {
+  NestedView &operator=(const Kokkos::View<int *, Space> &lhs) {
     member = lhs;
-    if ( member.extent(0) ) Kokkos::atomic_add( & member( 0 ), 1 );
+    if (member.extent(0)) Kokkos::atomic_add(&member(0), 1);
     return *this;
   }
 
   KOKKOS_INLINE_FUNCTION
-  ~NestedView()
-  {
-    if ( member.extent(0) ) {
-      Kokkos::atomic_add( & member( 0 ), -1 );
+  ~NestedView() {
+    if (member.extent(0)) {
+      Kokkos::atomic_add(&member(0), -1);
     }
   }
 };
 
-template< class Space >
+template <class Space>
 struct NestedViewFunctor {
+  Kokkos::View<NestedView<Space> *, Space> nested;
+  Kokkos::View<int *, Space> array;
 
-  Kokkos::View< NestedView<Space> *, Space > nested;
-  Kokkos::View< int*, Space >                array;
-
-  NestedViewFunctor(
-    const Kokkos::View< NestedView<Space> *, Space > & arg_nested,
-    const Kokkos::View< int*, Space >                & arg_array )
-  : nested( arg_nested )
-  , array(  arg_array )
-  {}
+  NestedViewFunctor(const Kokkos::View<NestedView<Space> *, Space> &arg_nested,
+                    const Kokkos::View<int *, Space> &arg_array)
+      : nested(arg_nested), array(arg_array) {}
 
   KOKKOS_INLINE_FUNCTION
-  void operator()( int i ) const { nested[i] = array; }
+  void operator()(int i) const { nested[i] = array; }
 };
 
-template< class Space >
-void view_nested_view()
-{
-  Kokkos::View< int*, Space > tracking( "tracking", 1 );
+template <class Space>
+void view_nested_view() {
+  Kokkos::View<int *, Space> tracking("tracking", 1);
 
-  typename Kokkos::View< int*, Space >::HostMirror host_tracking = Kokkos::create_mirror( tracking );
+  typename Kokkos::View<int *, Space>::HostMirror host_tracking =
+      Kokkos::create_mirror(tracking);
 
   {
-    Kokkos::View< NestedView<Space> *, Space > a( "a_nested_view", 2 );
+    Kokkos::View<NestedView<Space> *, Space> a("a_nested_view", 2);
 
-    Kokkos::parallel_for( Kokkos::RangePolicy< Space >( 0, 2 ), NestedViewFunctor< Space >( a, tracking ) );
-    Kokkos::deep_copy( host_tracking, tracking );
-    ASSERT_EQ( 2, host_tracking( 0 ) );
-
-    Kokkos::View< NestedView<Space> *, Space > b( "b_nested_view", 2 );
-    Kokkos::parallel_for( Kokkos::RangePolicy< Space >( 0, 2 ), NestedViewFunctor< Space >( b, tracking ) );
-    Kokkos::deep_copy( host_tracking, tracking );
-    ASSERT_EQ( 4, host_tracking( 0 ) );
+    Kokkos::parallel_for(Kokkos::RangePolicy<Space>(0, 2),
+                         NestedViewFunctor<Space>(a, tracking));
+    Kokkos::deep_copy(host_tracking, tracking);
+    ASSERT_EQ(2, host_tracking(0));
 
+    Kokkos::View<NestedView<Space> *, Space> b("b_nested_view", 2);
+    Kokkos::parallel_for(Kokkos::RangePolicy<Space>(0, 2),
+                         NestedViewFunctor<Space>(b, tracking));
+    Kokkos::deep_copy(host_tracking, tracking);
+    ASSERT_EQ(4, host_tracking(0));
   }
 
-  Kokkos::deep_copy( host_tracking, tracking );
+  Kokkos::deep_copy(host_tracking, tracking);
 
-  ASSERT_EQ( 0, host_tracking( 0 ) );
+  ASSERT_EQ(0, host_tracking(0));
 }
 
-TEST_F( TEST_CATEGORY, view_nested_view )
-{
-  view_nested_view< TEST_EXECSPACE >();
-}
+TEST(TEST_CATEGORY, view_nested_view) { view_nested_view<TEST_EXECSPACE>(); }
 
-} // namespace Test
+}  // namespace Test
diff --git a/lib/kokkos/core/unit_test/TestViewResize.hpp b/lib/kokkos/core/unit_test/TestViewResize.hpp
new file mode 100644
index 0000000000..0f1e5188c8
--- /dev/null
+++ b/lib/kokkos/core/unit_test/TestViewResize.hpp
@@ -0,0 +1,58 @@
+/*
+//@HEADER
+// ************************************************************************
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
+// the U.S. Government retains certain rights in this software.
+//
+// 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 Corporation nor the names of the
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 NTESS OR THE
+// 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.
+//
+// Questions? Contact Christian R. Trott (crtrott@sandia.gov)
+//
+// ************************************************************************
+//@HEADER
+*/
+#ifndef TESTVIEWRESIZE_HPP_
+#define TESTVIEWRESIZE_HPP_
+
+#include <gtest/gtest.h>
+#include "TestResize.hpp"
+
+namespace Test {
+
+TEST(TEST_CATEGORY, view_resize) {
+  typedef TEST_EXECSPACE ExecSpace;
+  TestViewResize::testResize<ExecSpace>();
+}
+
+}  // namespace Test
+#endif  // TESTVIEWRESIZE_HPP_
diff --git a/lib/kokkos/core/unit_test/TestViewSpaceAssign.hpp b/lib/kokkos/core/unit_test/TestViewSpaceAssign.hpp
index ecec47d7ba..d1dfb7c512 100644
--- a/lib/kokkos/core/unit_test/TestViewSpaceAssign.hpp
+++ b/lib/kokkos/core/unit_test/TestViewSpaceAssign.hpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -50,27 +51,26 @@
 
 namespace Test {
 
-template< typename SpaceDst, typename SpaceSrc >
-void view_space_assign()
-{
-  Kokkos::View< double*, SpaceDst > a =
-    Kokkos::View< double*, SpaceSrc >( "a", 1 );
+template <typename SpaceDst, typename SpaceSrc>
+void view_space_assign() {
+  Kokkos::View<double*, SpaceDst> a = Kokkos::View<double*, SpaceSrc>("a", 1);
 
-  Kokkos::View< double*, Kokkos::LayoutLeft, SpaceDst > b =
-    Kokkos::View< double*, Kokkos::LayoutLeft, SpaceSrc >( "b", 1 );
+  Kokkos::View<double*, Kokkos::LayoutLeft, SpaceDst> b =
+      Kokkos::View<double*, Kokkos::LayoutLeft, SpaceSrc>("b", 1);
 
-  Kokkos::View< double*, Kokkos::LayoutRight, SpaceDst > c =
-    Kokkos::View< double*, Kokkos::LayoutRight, SpaceSrc >( "c", 1 );
+  Kokkos::View<double*, Kokkos::LayoutRight, SpaceDst> c =
+      Kokkos::View<double*, Kokkos::LayoutRight, SpaceSrc>("c", 1);
 
-  Kokkos::View< double*, SpaceDst, Kokkos::MemoryRandomAccess > d =
-    Kokkos::View< double*, SpaceSrc >( "d", 1 );
+  Kokkos::View<double*, SpaceDst, Kokkos::MemoryRandomAccess> d =
+      Kokkos::View<double*, SpaceSrc>("d", 1);
 
-  Kokkos::View< double*, Kokkos::LayoutLeft, SpaceDst, Kokkos::MemoryRandomAccess > e =
-    Kokkos::View< double*, Kokkos::LayoutLeft, SpaceSrc >( "e", 1 );
+  Kokkos::View<double*, Kokkos::LayoutLeft, SpaceDst,
+               Kokkos::MemoryRandomAccess>
+      e = Kokkos::View<double*, Kokkos::LayoutLeft, SpaceSrc>("e", 1);
 
   // Rank-one layout can assign:
-  Kokkos::View< double*, Kokkos::LayoutRight, SpaceDst > f =
-  Kokkos::View< double*, Kokkos::LayoutLeft, SpaceSrc >( "f", 1 );
+  Kokkos::View<double*, Kokkos::LayoutRight, SpaceDst> f =
+      Kokkos::View<double*, Kokkos::LayoutLeft, SpaceSrc>("f", 1);
 }
 
-} // namespace Test
+}  // namespace Test
diff --git a/lib/kokkos/core/unit_test/TestViewSubview.hpp b/lib/kokkos/core/unit_test/TestViewSubview.hpp
index bffc77181f..48be58c2e9 100644
--- a/lib/kokkos/core/unit_test/TestViewSubview.hpp
+++ b/lib/kokkos/core/unit_test/TestViewSubview.hpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -67,43 +68,29 @@ struct static_assert_predicate_true_impl;
 
 template <template <class...> class predicate, class... message, class... args>
 struct static_assert_predicate_true_impl<
-  typename std::enable_if<predicate<args...>::type::value>::type,
-  predicate,
-  static_predicate_message<message...>,
-  args...
-> {
+    typename std::enable_if<predicate<args...>::type::value>::type, predicate,
+    static_predicate_message<message...>, args...> {
   using type = int;
 };
 
 template <template <class...> class predicate, class... message, class... args>
 struct static_assert_predicate_true_impl<
-  typename std::enable_if<!predicate<args...>::type::value>::type,
-  predicate,
-  static_predicate_message<message...>,
-  args...
->
-{
-  using type = typename _kokkos____________________static_test_failure_____<message...>::type;
+    typename std::enable_if<!predicate<args...>::type::value>::type, predicate,
+    static_predicate_message<message...>, args...> {
+  using type = typename _kokkos____________________static_test_failure_____<
+      message...>::type;
 };
 
 template <template <class...> class predicate, class... args>
 struct static_assert_predicate_true
-  : static_assert_predicate_true_impl<void,
-      predicate, static_predicate_message<>,
-      args...
-    >
-{ };
+    : static_assert_predicate_true_impl<void, predicate,
+                                        static_predicate_message<>, args...> {};
 
 template <template <class...> class predicate, class... message, class... args>
 struct static_assert_predicate_true<
-  predicate, static_predicate_message<message...>,
-  args...
->
-  : static_assert_predicate_true_impl<void,
-      predicate, static_predicate_message<message...>,
-      args...
-    >
-{ };
+    predicate, static_predicate_message<message...>, args...>
+    : static_assert_predicate_true_impl<
+          void, predicate, static_predicate_message<message...>, args...> {};
 
 //------------------------------------------------------------------------------
 
@@ -111,48 +98,40 @@ struct static_assert_predicate_true<
 struct _kokkos__________types_should_be_the_same_____expected_type__ {};
 struct _kokkos__________actual_type_was__ {};
 template <class Expected, class Actual>
-struct static_expect_same
-{
-  using type =
-    typename static_assert_predicate_true<
+struct static_expect_same {
+  using type = typename static_assert_predicate_true<
       std::is_same,
       static_predicate_message<
-        _kokkos__________types_should_be_the_same_____expected_type__,
-        Expected,
-        _kokkos__________actual_type_was__,
-        Actual
-      >,
-      Expected, Actual
-    >::type;
+          _kokkos__________types_should_be_the_same_____expected_type__,
+          Expected, _kokkos__________actual_type_was__, Actual>,
+      Expected, Actual>::type;
 };
 
 //------------------------------------------------------------------------------
 
-
 namespace TestViewSubview {
 
-template< class Layout, class Space >
+template <class Layout, class Space>
 struct getView {
-  static
-    Kokkos::View< double**, Layout, Space > get( int n, int m ) {
-      return Kokkos::View< double**, Layout, Space >( "G", n, m );
+  static Kokkos::View<double**, Layout, Space> get(int n, int m) {
+    return Kokkos::View<double**, Layout, Space>("G", n, m);
   }
 };
 
-template< class Space >
-struct getView< Kokkos::LayoutStride, Space > {
-  static
-    Kokkos::View< double**, Kokkos::LayoutStride, Space > get( int n, int m ) {
-      const int rank = 2;
-      const int order[] = { 0, 1 };
-      const unsigned dim[] = { unsigned( n ), unsigned( m ) };
-      Kokkos::LayoutStride stride = Kokkos::LayoutStride::order_dimensions( rank, order, dim );
+template <class Space>
+struct getView<Kokkos::LayoutStride, Space> {
+  static Kokkos::View<double**, Kokkos::LayoutStride, Space> get(int n, int m) {
+    const int rank       = 2;
+    const int order[]    = {0, 1};
+    const unsigned dim[] = {unsigned(n), unsigned(m)};
+    Kokkos::LayoutStride stride =
+        Kokkos::LayoutStride::order_dimensions(rank, order, dim);
 
-      return Kokkos::View< double**, Kokkos::LayoutStride, Space >( "G", stride );
+    return Kokkos::View<double**, Kokkos::LayoutStride, Space>("G", stride);
   }
 };
 
-template< class ViewType, class Space >
+template <class ViewType, class Space>
 struct fill_1D {
   typedef typename Space::execution_space execution_space;
   typedef typename ViewType::size_type size_type;
@@ -160,13 +139,13 @@ struct fill_1D {
   ViewType a;
   double val;
 
-  fill_1D( ViewType a_, double val_ ) : a( a_ ), val( val_ ) {}
+  fill_1D(ViewType a_, double val_) : a(a_), val(val_) {}
 
   KOKKOS_INLINE_FUNCTION
-  void operator()( const int i ) const { a( i ) = val; }
+  void operator()(const int i) const { a(i) = val; }
 };
 
-template< class ViewType, class Space >
+template <class ViewType, class Space>
 struct fill_2D {
   typedef typename Space::execution_space execution_space;
   typedef typename ViewType::size_type size_type;
@@ -174,562 +153,603 @@ struct fill_2D {
   ViewType a;
   double val;
 
-  fill_2D( ViewType a_, double val_ ) : a( a_ ), val( val_ ) {}
+  fill_2D(ViewType a_, double val_) : a(a_), val(val_) {}
 
   KOKKOS_INLINE_FUNCTION
-  void operator()( const int i ) const
-  {
-    for ( int j = 0; j < static_cast< int >( a.extent(1) ); j++ ) {
-      a( i, j ) = val;
+  void operator()(const int i) const {
+    for (int j = 0; j < static_cast<int>(a.extent(1)); j++) {
+      a(i, j) = val;
     }
   }
 };
 
-template< class Layout, class Space >
-void test_auto_1d ()
-{
-  typedef Kokkos::View< double**, Layout, Space > mv_type;
+template <class Layout, class Space>
+void test_auto_1d() {
+  typedef Kokkos::View<double**, Layout, Space> mv_type;
   typedef typename mv_type::size_type size_type;
 
   const double ZERO = 0.0;
-  const double ONE = 1.0;
-  const double TWO = 2.0;
+  const double ONE  = 1.0;
+  const double TWO  = 2.0;
 
   const size_type numRows = 10;
   const size_type numCols = 3;
 
-  mv_type X = getView< Layout, Space >::get( numRows, numCols );
-  typename mv_type::HostMirror X_h = Kokkos::create_mirror_view( X );
+  mv_type X = getView<Layout, Space>::get(numRows, numCols);
+  typename mv_type::HostMirror X_h = Kokkos::create_mirror_view(X);
 
-  fill_2D< mv_type, Space > f1( X, ONE );
-  Kokkos::parallel_for( X.extent(0), f1 );
+  fill_2D<mv_type, Space> f1(X, ONE);
+  Kokkos::parallel_for(X.extent(0), f1);
   Kokkos::fence();
-  Kokkos::deep_copy( X_h, X );
-  for ( size_type j = 0; j < numCols; ++j ) {
-    for ( size_type i = 0; i < numRows; ++i ) {
-      ASSERT_TRUE( X_h( i, j ) == ONE );
+  Kokkos::deep_copy(X_h, X);
+  for (size_type j = 0; j < numCols; ++j) {
+    for (size_type i = 0; i < numRows; ++i) {
+      ASSERT_TRUE(X_h(i, j) == ONE);
     }
   }
 
-  fill_2D< mv_type, Space > f2( X, 0.0 );
-  Kokkos::parallel_for( X.extent(0), f2 );
+  fill_2D<mv_type, Space> f2(X, 0.0);
+  Kokkos::parallel_for(X.extent(0), f2);
   Kokkos::fence();
-  Kokkos::deep_copy( X_h, X );
-  for ( size_type j = 0; j < numCols; ++j ) {
-    for ( size_type i = 0; i < numRows; ++i ) {
-      ASSERT_TRUE( X_h( i, j ) == ZERO );
+  Kokkos::deep_copy(X_h, X);
+  for (size_type j = 0; j < numCols; ++j) {
+    for (size_type i = 0; i < numRows; ++i) {
+      ASSERT_TRUE(X_h(i, j) == ZERO);
     }
   }
 
-  fill_2D< mv_type, Space > f3( X, TWO );
-  Kokkos::parallel_for( X.extent(0), f3 );
+  fill_2D<mv_type, Space> f3(X, TWO);
+  Kokkos::parallel_for(X.extent(0), f3);
   Kokkos::fence();
-  Kokkos::deep_copy( X_h, X );
-  for ( size_type j = 0; j < numCols; ++j ) {
-    for ( size_type i = 0; i < numRows; ++i ) {
-      ASSERT_TRUE( X_h( i, j ) == TWO );
+  Kokkos::deep_copy(X_h, X);
+  for (size_type j = 0; j < numCols; ++j) {
+    for (size_type i = 0; i < numRows; ++i) {
+      ASSERT_TRUE(X_h(i, j) == TWO);
     }
   }
 
-  for ( size_type j = 0; j < numCols; ++j ) {
-    auto X_j = Kokkos::subview( X, Kokkos::ALL, j );
+  for (size_type j = 0; j < numCols; ++j) {
+    auto X_j = Kokkos::subview(X, Kokkos::ALL, j);
 
-    fill_1D< decltype( X_j ), Space > f4( X_j, ZERO );
-    Kokkos::parallel_for( X_j.extent(0), f4 );
+    fill_1D<decltype(X_j), Space> f4(X_j, ZERO);
+    Kokkos::parallel_for(X_j.extent(0), f4);
     Kokkos::fence();
-    Kokkos::deep_copy( X_h, X );
-    for ( size_type i = 0; i < numRows; ++i ) {
-      ASSERT_TRUE( X_h( i, j ) == ZERO );
+    Kokkos::deep_copy(X_h, X);
+    for (size_type i = 0; i < numRows; ++i) {
+      ASSERT_TRUE(X_h(i, j) == ZERO);
     }
 
-    for ( size_type jj = 0; jj < numCols; ++jj ) {
-      auto X_jj = Kokkos::subview ( X, Kokkos::ALL, jj );
-      fill_1D< decltype( X_jj ), Space > f5( X_jj, ONE );
-      Kokkos::parallel_for( X_jj.extent(0), f5 );
+    for (size_type jj = 0; jj < numCols; ++jj) {
+      auto X_jj = Kokkos::subview(X, Kokkos::ALL, jj);
+      fill_1D<decltype(X_jj), Space> f5(X_jj, ONE);
+      Kokkos::parallel_for(X_jj.extent(0), f5);
       Kokkos::fence();
-      Kokkos::deep_copy( X_h, X );
-      for ( size_type i = 0; i < numRows; ++i ) {
-        ASSERT_TRUE( X_h( i, jj ) == ONE );
+      Kokkos::deep_copy(X_h, X);
+      for (size_type i = 0; i < numRows; ++i) {
+        ASSERT_TRUE(X_h(i, jj) == ONE);
       }
     }
   }
 }
 
-template< class LD, class LS, class Space >
-void test_1d_strided_assignment_impl( bool a, bool b, bool c, bool d, int n, int m ) {
-  Kokkos::View< double**, LS, Space > l2d( "l2d", n, m );
+template <class LD, class LS, class Space>
+void test_1d_strided_assignment_impl(bool a, bool b, bool c, bool d, int n,
+                                     int m) {
+  Kokkos::View<double**, LS, Space> l2d("l2d", n, m);
 
   int col = n > 2 ? 2 : 0;
   int row = m > 2 ? 2 : 0;
 
-  if ( Kokkos::Impl::SpaceAccessibility< Kokkos::HostSpace, typename Space::memory_space >::accessible ) {
-    if ( a ) {
-      Kokkos::View< double*, LD, Space > l1da = Kokkos::subview( l2d, Kokkos::ALL, row );
-      ASSERT_TRUE( & l1da( 0 ) == & l2d( 0, row ) );
-      if ( n > 1 ) {
-        ASSERT_TRUE( & l1da( 1 ) == & l2d( 1, row ) );
+  if (Kokkos::Impl::SpaceAccessibility<
+          Kokkos::HostSpace, typename Space::memory_space>::accessible) {
+    if (a) {
+      Kokkos::View<double*, LD, Space> l1da =
+          Kokkos::subview(l2d, Kokkos::ALL, row);
+      ASSERT_TRUE(&l1da(0) == &l2d(0, row));
+      if (n > 1) {
+        ASSERT_TRUE(&l1da(1) == &l2d(1, row));
       }
     }
 
-    if ( b && n > 13 ) {
-      Kokkos::View< double*, LD, Space > l1db = Kokkos::subview( l2d, std::pair< unsigned, unsigned >( 2, 13 ), row );
-      ASSERT_TRUE( & l1db( 0 ) == & l2d( 2, row ) );
-      ASSERT_TRUE( & l1db( 1 ) == & l2d( 3, row ) );
+    if (b && n > 13) {
+      Kokkos::View<double*, LD, Space> l1db =
+          Kokkos::subview(l2d, std::pair<unsigned, unsigned>(2, 13), row);
+      ASSERT_TRUE(&l1db(0) == &l2d(2, row));
+      ASSERT_TRUE(&l1db(1) == &l2d(3, row));
     }
 
-    if ( c ) {
-      Kokkos::View< double*, LD, Space > l1dc = Kokkos::subview( l2d, col, Kokkos::ALL );
-      ASSERT_TRUE( & l1dc( 0 ) == & l2d( col, 0 ) );
-      if( m > 1 ) {
-        ASSERT_TRUE( & l1dc( 1 ) == & l2d( col, 1 ) );
+    if (c) {
+      Kokkos::View<double*, LD, Space> l1dc =
+          Kokkos::subview(l2d, col, Kokkos::ALL);
+      ASSERT_TRUE(&l1dc(0) == &l2d(col, 0));
+      if (m > 1) {
+        ASSERT_TRUE(&l1dc(1) == &l2d(col, 1));
       }
     }
 
-    if ( d && m > 13 ) {
-      Kokkos::View< double*, LD, Space > l1dd = Kokkos::subview( l2d, col, std::pair< unsigned, unsigned >( 2, 13 ) );
-      ASSERT_TRUE( & l1dd( 0 ) == & l2d( col, 2 ) );
-      ASSERT_TRUE( & l1dd( 1 ) == & l2d( col, 3 ) );
+    if (d && m > 13) {
+      Kokkos::View<double*, LD, Space> l1dd =
+          Kokkos::subview(l2d, col, std::pair<unsigned, unsigned>(2, 13));
+      ASSERT_TRUE(&l1dd(0) == &l2d(col, 2));
+      ASSERT_TRUE(&l1dd(1) == &l2d(col, 3));
     }
   }
-
 }
 
-template< class Space >
+template <class Space>
 void test_1d_strided_assignment() {
-  test_1d_strided_assignment_impl< Kokkos::LayoutStride, Kokkos::LayoutLeft, Space >( true, true, true, true, 17, 3 );
-  test_1d_strided_assignment_impl< Kokkos::LayoutStride, Kokkos::LayoutRight, Space >( true, true, true, true, 17, 3 );
+  test_1d_strided_assignment_impl<Kokkos::LayoutStride, Kokkos::LayoutLeft,
+                                  Space>(true, true, true, true, 17, 3);
+  test_1d_strided_assignment_impl<Kokkos::LayoutStride, Kokkos::LayoutRight,
+                                  Space>(true, true, true, true, 17, 3);
 
-  test_1d_strided_assignment_impl< Kokkos::LayoutLeft, Kokkos::LayoutLeft, Space >( true, true, false, false, 17, 3 );
-  test_1d_strided_assignment_impl< Kokkos::LayoutRight, Kokkos::LayoutLeft, Space >( true, true, false, false, 17, 3 );
-  test_1d_strided_assignment_impl< Kokkos::LayoutLeft, Kokkos::LayoutRight, Space >( false, false, true, true, 17, 3 );
-  test_1d_strided_assignment_impl< Kokkos::LayoutRight, Kokkos::LayoutRight, Space >( false, false, true, true, 17, 3 );
+  test_1d_strided_assignment_impl<Kokkos::LayoutLeft, Kokkos::LayoutLeft,
+                                  Space>(true, true, false, false, 17, 3);
+  test_1d_strided_assignment_impl<Kokkos::LayoutRight, Kokkos::LayoutLeft,
+                                  Space>(true, true, false, false, 17, 3);
+  test_1d_strided_assignment_impl<Kokkos::LayoutLeft, Kokkos::LayoutRight,
+                                  Space>(false, false, true, true, 17, 3);
+  test_1d_strided_assignment_impl<Kokkos::LayoutRight, Kokkos::LayoutRight,
+                                  Space>(false, false, true, true, 17, 3);
 
-  test_1d_strided_assignment_impl< Kokkos::LayoutLeft, Kokkos::LayoutLeft, Space >( true, true, false, false, 17, 1 );
-  test_1d_strided_assignment_impl< Kokkos::LayoutLeft, Kokkos::LayoutLeft, Space >( true, true, true, true, 1, 17 );
-  test_1d_strided_assignment_impl< Kokkos::LayoutRight, Kokkos::LayoutLeft, Space >( true, true, true, true, 1, 17 );
-  test_1d_strided_assignment_impl< Kokkos::LayoutRight, Kokkos::LayoutLeft, Space >( true, true, false, false, 17, 1 );
+  test_1d_strided_assignment_impl<Kokkos::LayoutLeft, Kokkos::LayoutLeft,
+                                  Space>(true, true, false, false, 17, 1);
+  test_1d_strided_assignment_impl<Kokkos::LayoutLeft, Kokkos::LayoutLeft,
+                                  Space>(true, true, true, true, 1, 17);
+  test_1d_strided_assignment_impl<Kokkos::LayoutRight, Kokkos::LayoutLeft,
+                                  Space>(true, true, true, true, 1, 17);
+  test_1d_strided_assignment_impl<Kokkos::LayoutRight, Kokkos::LayoutLeft,
+                                  Space>(true, true, false, false, 17, 1);
 
-  test_1d_strided_assignment_impl< Kokkos::LayoutLeft, Kokkos::LayoutRight, Space >( true, true, true, true, 17, 1 );
-  test_1d_strided_assignment_impl< Kokkos::LayoutLeft, Kokkos::LayoutRight, Space >( false, false, true, true, 1, 17 );
-  test_1d_strided_assignment_impl< Kokkos::LayoutRight, Kokkos::LayoutRight, Space >( false, false, true, true, 1, 17 );
-  test_1d_strided_assignment_impl< Kokkos::LayoutRight, Kokkos::LayoutRight, Space >( true, true, true, true, 17, 1 );
+  test_1d_strided_assignment_impl<Kokkos::LayoutLeft, Kokkos::LayoutRight,
+                                  Space>(true, true, true, true, 17, 1);
+  test_1d_strided_assignment_impl<Kokkos::LayoutLeft, Kokkos::LayoutRight,
+                                  Space>(false, false, true, true, 1, 17);
+  test_1d_strided_assignment_impl<Kokkos::LayoutRight, Kokkos::LayoutRight,
+                                  Space>(false, false, true, true, 1, 17);
+  test_1d_strided_assignment_impl<Kokkos::LayoutRight, Kokkos::LayoutRight,
+                                  Space>(true, true, true, true, 17, 1);
 }
 
-template< class Space >
-void test_left_0()
-{
-  typedef Kokkos::View< int [2][3][4][5][2][3][4][5], Kokkos::LayoutLeft, Space > view_static_8_type;
+template <class Space>
+void test_left_0() {
+  typedef Kokkos::View<int[2][3][4][5][2][3][4][5], Kokkos::LayoutLeft, Space>
+      view_static_8_type;
 
-  if ( Kokkos::Impl::SpaceAccessibility< Kokkos::HostSpace, typename Space::memory_space >::accessible ) {
-    view_static_8_type x_static_8( "x_static_left_8" );
+  if (Kokkos::Impl::SpaceAccessibility<
+          Kokkos::HostSpace, typename Space::memory_space>::accessible) {
+    view_static_8_type x_static_8("x_static_left_8");
 
-    ASSERT_TRUE( x_static_8.span_is_contiguous() );
+    ASSERT_TRUE(x_static_8.span_is_contiguous());
 
-    Kokkos::View< int, Kokkos::LayoutLeft, Space > x0 = Kokkos::subview( x_static_8, 0, 0, 0, 0, 0, 0, 0, 0 );
+    Kokkos::View<int, Kokkos::LayoutLeft, Space> x0 =
+        Kokkos::subview(x_static_8, 0, 0, 0, 0, 0, 0, 0, 0);
 
-    ASSERT_TRUE( x0.span_is_contiguous() );
-    ASSERT_TRUE( & x0() == & x_static_8( 0, 0, 0, 0, 0, 0, 0, 0 ) );
+    ASSERT_TRUE(x0.span_is_contiguous());
+    ASSERT_TRUE(&x0() == &x_static_8(0, 0, 0, 0, 0, 0, 0, 0));
 
-    Kokkos::View< int*, Kokkos::LayoutLeft, Space > x1 =
-      Kokkos::subview( x_static_8, Kokkos::pair< int, int >( 0, 2 ), 1, 2, 3, 0, 1, 2, 3 );
+    Kokkos::View<int*, Kokkos::LayoutLeft, Space> x1 = Kokkos::subview(
+        x_static_8, Kokkos::pair<int, int>(0, 2), 1, 2, 3, 0, 1, 2, 3);
 
-    ASSERT_TRUE( x1.span_is_contiguous() );
-    ASSERT_TRUE( & x1( 0 ) == & x_static_8( 0, 1, 2, 3, 0, 1, 2, 3 ) );
-    ASSERT_TRUE( & x1( 1 ) == & x_static_8( 1, 1, 2, 3, 0, 1, 2, 3 ) );
+    ASSERT_TRUE(x1.span_is_contiguous());
+    ASSERT_TRUE(&x1(0) == &x_static_8(0, 1, 2, 3, 0, 1, 2, 3));
+    ASSERT_TRUE(&x1(1) == &x_static_8(1, 1, 2, 3, 0, 1, 2, 3));
 
-    Kokkos::View< int**, Kokkos::LayoutLeft, Space > x2 =
-      Kokkos::subview( x_static_8, Kokkos::pair< int, int >( 0, 2 ), 1, 2, 3
-                                 , Kokkos::pair< int, int >( 0, 2 ), 1, 2, 3 );
+    Kokkos::View<int**, Kokkos::LayoutLeft, Space> x2 =
+        Kokkos::subview(x_static_8, Kokkos::pair<int, int>(0, 2), 1, 2, 3,
+                        Kokkos::pair<int, int>(0, 2), 1, 2, 3);
 
-    ASSERT_TRUE( ! x2.span_is_contiguous() );
-    ASSERT_TRUE( & x2( 0, 0 ) == & x_static_8( 0, 1, 2, 3, 0, 1, 2, 3 ) );
-    ASSERT_TRUE( & x2( 1, 0 ) == & x_static_8( 1, 1, 2, 3, 0, 1, 2, 3 ) );
-    ASSERT_TRUE( & x2( 0, 1 ) == & x_static_8( 0, 1, 2, 3, 1, 1, 2, 3 ) );
-    ASSERT_TRUE( & x2( 1, 1 ) == & x_static_8( 1, 1, 2, 3, 1, 1, 2, 3 ) );
+    ASSERT_TRUE(!x2.span_is_contiguous());
+    ASSERT_TRUE(&x2(0, 0) == &x_static_8(0, 1, 2, 3, 0, 1, 2, 3));
+    ASSERT_TRUE(&x2(1, 0) == &x_static_8(1, 1, 2, 3, 0, 1, 2, 3));
+    ASSERT_TRUE(&x2(0, 1) == &x_static_8(0, 1, 2, 3, 1, 1, 2, 3));
+    ASSERT_TRUE(&x2(1, 1) == &x_static_8(1, 1, 2, 3, 1, 1, 2, 3));
 
     // Kokkos::View< int**, Kokkos::LayoutLeft, Space > error_2 =
-    Kokkos::View< int**, Kokkos::LayoutStride, Space > sx2 =
-      Kokkos::subview( x_static_8, 1, Kokkos::pair< int, int >( 0, 2 ), 2, 3
-                                    , Kokkos::pair< int, int >( 0, 2 ), 1, 2, 3 );
+    Kokkos::View<int**, Kokkos::LayoutStride, Space> sx2 =
+        Kokkos::subview(x_static_8, 1, Kokkos::pair<int, int>(0, 2), 2, 3,
+                        Kokkos::pair<int, int>(0, 2), 1, 2, 3);
 
-    ASSERT_TRUE( ! sx2.span_is_contiguous() );
-    ASSERT_TRUE( & sx2( 0, 0 ) == & x_static_8( 1, 0, 2, 3, 0, 1, 2, 3 ) );
-    ASSERT_TRUE( & sx2( 1, 0 ) == & x_static_8( 1, 1, 2, 3, 0, 1, 2, 3 ) );
-    ASSERT_TRUE( & sx2( 0, 1 ) == & x_static_8( 1, 0, 2, 3, 1, 1, 2, 3 ) );
-    ASSERT_TRUE( & sx2( 1, 1 ) == & x_static_8( 1, 1, 2, 3, 1, 1, 2, 3 ) );
+    ASSERT_TRUE(!sx2.span_is_contiguous());
+    ASSERT_TRUE(&sx2(0, 0) == &x_static_8(1, 0, 2, 3, 0, 1, 2, 3));
+    ASSERT_TRUE(&sx2(1, 0) == &x_static_8(1, 1, 2, 3, 0, 1, 2, 3));
+    ASSERT_TRUE(&sx2(0, 1) == &x_static_8(1, 0, 2, 3, 1, 1, 2, 3));
+    ASSERT_TRUE(&sx2(1, 1) == &x_static_8(1, 1, 2, 3, 1, 1, 2, 3));
 
-    Kokkos::View< int****, Kokkos::LayoutStride, Space > sx4 =
-      Kokkos::subview( x_static_8, 0, Kokkos::pair< int, int >( 0, 2 ) /* of [3] */
-                                 , 1, Kokkos::pair< int, int >( 1, 3 ) /* of [5] */
-                                 , 1, Kokkos::pair< int, int >( 0, 2 ) /* of [3] */
-                                 , 2, Kokkos::pair< int, int >( 2, 4 ) /* of [5] */
-                     );
+    Kokkos::View<int****, Kokkos::LayoutStride, Space> sx4 =
+        Kokkos::subview(x_static_8, 0, Kokkos::pair<int, int>(0, 2) /* of [3] */
+                        ,
+                        1, Kokkos::pair<int, int>(1, 3) /* of [5] */
+                        ,
+                        1, Kokkos::pair<int, int>(0, 2) /* of [3] */
+                        ,
+                        2, Kokkos::pair<int, int>(2, 4) /* of [5] */
+        );
 
-    ASSERT_TRUE( ! sx4.span_is_contiguous() );
+    ASSERT_TRUE(!sx4.span_is_contiguous());
 
-    for ( int i0 = 0; i0 < (int) sx4.extent(0); ++i0 )
-    for ( int i1 = 0; i1 < (int) sx4.extent(1); ++i1 )
-    for ( int i2 = 0; i2 < (int) sx4.extent(2); ++i2 )
-    for ( int i3 = 0; i3 < (int) sx4.extent(3); ++i3 )
-    {
-      ASSERT_TRUE( & sx4( i0, i1, i2, i3 ) == & x_static_8( 0, 0 + i0, 1, 1 + i1, 1, 0 + i2, 2, 2 + i3 ) );
-    }
+    for (int i0 = 0; i0 < (int)sx4.extent(0); ++i0)
+      for (int i1 = 0; i1 < (int)sx4.extent(1); ++i1)
+        for (int i2 = 0; i2 < (int)sx4.extent(2); ++i2)
+          for (int i3 = 0; i3 < (int)sx4.extent(3); ++i3) {
+            ASSERT_TRUE(&sx4(i0, i1, i2, i3) == &x_static_8(0, 0 + i0, 1,
+                                                            1 + i1, 1, 0 + i2,
+                                                            2, 2 + i3));
+          }
   }
 }
 
-template< class Space >
-void test_left_1()
-{
-  typedef Kokkos::View< int ****[2][3][4][5], Kokkos::LayoutLeft, Space > view_type;
+template <class Space>
+void test_left_1() {
+  typedef Kokkos::View<int*** * [2][3][4][5], Kokkos::LayoutLeft, Space>
+      view_type;
 
-  if ( Kokkos::Impl::SpaceAccessibility< Kokkos::HostSpace, typename Space::memory_space >::accessible ) {
-    view_type x8( "x_left_8", 2, 3, 4, 5 );
+  if (Kokkos::Impl::SpaceAccessibility<
+          Kokkos::HostSpace, typename Space::memory_space>::accessible) {
+    view_type x8("x_left_8", 2, 3, 4, 5);
 
-    ASSERT_TRUE( x8.span_is_contiguous() );
+    ASSERT_TRUE(x8.span_is_contiguous());
 
-    Kokkos::View< int, Kokkos::LayoutLeft, Space > x0 = Kokkos::subview( x8, 0, 0, 0, 0, 0, 0, 0, 0 );
+    Kokkos::View<int, Kokkos::LayoutLeft, Space> x0 =
+        Kokkos::subview(x8, 0, 0, 0, 0, 0, 0, 0, 0);
 
-    ASSERT_TRUE( x0.span_is_contiguous() );
-    ASSERT_TRUE( & x0() == & x8( 0, 0, 0, 0, 0, 0, 0, 0 ) );
+    ASSERT_TRUE(x0.span_is_contiguous());
+    ASSERT_TRUE(&x0() == &x8(0, 0, 0, 0, 0, 0, 0, 0));
 
-    Kokkos::View< int*, Kokkos::LayoutLeft, Space > x1 =
-      Kokkos::subview( x8, Kokkos::pair< int, int >( 0, 2 ), 1, 2, 3, 0, 1, 2, 3 );
+    Kokkos::View<int*, Kokkos::LayoutLeft, Space> x1 =
+        Kokkos::subview(x8, Kokkos::pair<int, int>(0, 2), 1, 2, 3, 0, 1, 2, 3);
 
-    ASSERT_TRUE( x1.span_is_contiguous() );
-    ASSERT_TRUE( & x1( 0 ) == & x8( 0, 1, 2, 3, 0, 1, 2, 3 ) );
-    ASSERT_TRUE( & x1( 1 ) == & x8( 1, 1, 2, 3, 0, 1, 2, 3 ) );
+    ASSERT_TRUE(x1.span_is_contiguous());
+    ASSERT_TRUE(&x1(0) == &x8(0, 1, 2, 3, 0, 1, 2, 3));
+    ASSERT_TRUE(&x1(1) == &x8(1, 1, 2, 3, 0, 1, 2, 3));
 
-    Kokkos::View< int**, Kokkos::LayoutLeft, Space > x2 =
-      Kokkos::subview( x8, Kokkos::pair< int, int >( 0, 2 ), 1, 2, 3
-                         , Kokkos::pair< int, int >( 0, 2 ), 1, 2, 3 );
+    Kokkos::View<int**, Kokkos::LayoutLeft, Space> x2 =
+        Kokkos::subview(x8, Kokkos::pair<int, int>(0, 2), 1, 2, 3,
+                        Kokkos::pair<int, int>(0, 2), 1, 2, 3);
 
-    ASSERT_TRUE( ! x2.span_is_contiguous() );
-    ASSERT_TRUE( & x2( 0, 0 ) == & x8( 0, 1, 2, 3, 0, 1, 2, 3 ) );
-    ASSERT_TRUE( & x2( 1, 0 ) == & x8( 1, 1, 2, 3, 0, 1, 2, 3 ) );
-    ASSERT_TRUE( & x2( 0, 1 ) == & x8( 0, 1, 2, 3, 1, 1, 2, 3 ) );
-    ASSERT_TRUE( & x2( 1, 1 ) == & x8( 1, 1, 2, 3, 1, 1, 2, 3 ) );
+    ASSERT_TRUE(!x2.span_is_contiguous());
+    ASSERT_TRUE(&x2(0, 0) == &x8(0, 1, 2, 3, 0, 1, 2, 3));
+    ASSERT_TRUE(&x2(1, 0) == &x8(1, 1, 2, 3, 0, 1, 2, 3));
+    ASSERT_TRUE(&x2(0, 1) == &x8(0, 1, 2, 3, 1, 1, 2, 3));
+    ASSERT_TRUE(&x2(1, 1) == &x8(1, 1, 2, 3, 1, 1, 2, 3));
 
     // Kokkos::View< int**, Kokkos::LayoutLeft, Space > error_2 =
-    Kokkos::View< int**, Kokkos::LayoutStride, Space > sx2 =
-      Kokkos::subview( x8, 1, Kokkos::pair< int, int >( 0, 2 ), 2, 3
-                            , Kokkos::pair< int, int >( 0, 2 ), 1, 2, 3 );
+    Kokkos::View<int**, Kokkos::LayoutStride, Space> sx2 =
+        Kokkos::subview(x8, 1, Kokkos::pair<int, int>(0, 2), 2, 3,
+                        Kokkos::pair<int, int>(0, 2), 1, 2, 3);
 
-    ASSERT_TRUE( ! sx2.span_is_contiguous() );
-    ASSERT_TRUE( & sx2( 0, 0 ) == & x8( 1, 0, 2, 3, 0, 1, 2, 3 ) );
-    ASSERT_TRUE( & sx2( 1, 0 ) == & x8( 1, 1, 2, 3, 0, 1, 2, 3 ) );
-    ASSERT_TRUE( & sx2( 0, 1 ) == & x8( 1, 0, 2, 3, 1, 1, 2, 3 ) );
-    ASSERT_TRUE( & sx2( 1, 1 ) == & x8( 1, 1, 2, 3, 1, 1, 2, 3 ) );
+    ASSERT_TRUE(!sx2.span_is_contiguous());
+    ASSERT_TRUE(&sx2(0, 0) == &x8(1, 0, 2, 3, 0, 1, 2, 3));
+    ASSERT_TRUE(&sx2(1, 0) == &x8(1, 1, 2, 3, 0, 1, 2, 3));
+    ASSERT_TRUE(&sx2(0, 1) == &x8(1, 0, 2, 3, 1, 1, 2, 3));
+    ASSERT_TRUE(&sx2(1, 1) == &x8(1, 1, 2, 3, 1, 1, 2, 3));
 
-    Kokkos::View< int****, Kokkos::LayoutStride, Space > sx4 =
-      Kokkos::subview( x8, 0, Kokkos::pair< int, int >( 0, 2 ) /* of [3] */
-                         , 1, Kokkos::pair< int, int >( 1, 3 ) /* of [5] */
-                         , 1, Kokkos::pair< int, int >( 0, 2 ) /* of [3] */
-                         , 2, Kokkos::pair< int, int >( 2, 4 ) /* of [5] */
-                     );
+    Kokkos::View<int****, Kokkos::LayoutStride, Space> sx4 =
+        Kokkos::subview(x8, 0, Kokkos::pair<int, int>(0, 2) /* of [3] */
+                        ,
+                        1, Kokkos::pair<int, int>(1, 3) /* of [5] */
+                        ,
+                        1, Kokkos::pair<int, int>(0, 2) /* of [3] */
+                        ,
+                        2, Kokkos::pair<int, int>(2, 4) /* of [5] */
+        );
 
-    ASSERT_TRUE( ! sx4.span_is_contiguous() );
+    ASSERT_TRUE(!sx4.span_is_contiguous());
 
-    for ( int i0 = 0; i0 < (int) sx4.extent(0); ++i0 )
-    for ( int i1 = 0; i1 < (int) sx4.extent(1); ++i1 )
-    for ( int i2 = 0; i2 < (int) sx4.extent(2); ++i2 )
-    for ( int i3 = 0; i3 < (int) sx4.extent(3); ++i3 )
-    {
-      ASSERT_TRUE( & sx4( i0, i1, i2, i3 ) == & x8( 0, 0 + i0, 1, 1 + i1, 1, 0 + i2, 2, 2 + i3 ) );
-    }
+    for (int i0 = 0; i0 < (int)sx4.extent(0); ++i0)
+      for (int i1 = 0; i1 < (int)sx4.extent(1); ++i1)
+        for (int i2 = 0; i2 < (int)sx4.extent(2); ++i2)
+          for (int i3 = 0; i3 < (int)sx4.extent(3); ++i3) {
+            ASSERT_TRUE(&sx4(i0, i1, i2, i3) ==
+                        &x8(0, 0 + i0, 1, 1 + i1, 1, 0 + i2, 2, 2 + i3));
+          }
   }
 }
 
-template< class Space >
-void test_left_2()
-{
-  typedef Kokkos::View< int ****, Kokkos::LayoutLeft, Space > view_type;
+template <class Space>
+void test_left_2() {
+  typedef Kokkos::View<int****, Kokkos::LayoutLeft, Space> view_type;
 
-  if ( Kokkos::Impl::SpaceAccessibility<Kokkos::HostSpace, typename Space::memory_space>::accessible ) {
-    view_type x4( "x4", 2, 3, 4, 5 );
+  if (Kokkos::Impl::SpaceAccessibility<
+          Kokkos::HostSpace, typename Space::memory_space>::accessible) {
+    view_type x4("x4", 2, 3, 4, 5);
 
-    ASSERT_TRUE( x4.span_is_contiguous() );
+    ASSERT_TRUE(x4.span_is_contiguous());
 
-    Kokkos::View< int, Kokkos::LayoutLeft, Space > x0 = Kokkos::subview( x4, 0, 0, 0, 0 );
+    Kokkos::View<int, Kokkos::LayoutLeft, Space> x0 =
+        Kokkos::subview(x4, 0, 0, 0, 0);
 
-    ASSERT_TRUE( x0.span_is_contiguous() );
-    ASSERT_TRUE( & x0() == & x4( 0, 0, 0, 0 ) );
+    ASSERT_TRUE(x0.span_is_contiguous());
+    ASSERT_TRUE(&x0() == &x4(0, 0, 0, 0));
 
-    Kokkos::View< int*, Kokkos::LayoutLeft, Space > x1 =
-      Kokkos::subview( x4, Kokkos::pair< int, int >( 0, 2 ), 1, 2, 3 );
+    Kokkos::View<int*, Kokkos::LayoutLeft, Space> x1 =
+        Kokkos::subview(x4, Kokkos::pair<int, int>(0, 2), 1, 2, 3);
 
-    ASSERT_TRUE( x1.span_is_contiguous() );
-    ASSERT_TRUE( & x1( 0 ) == & x4( 0, 1, 2, 3 ) );
-    ASSERT_TRUE( & x1( 1 ) == & x4( 1, 1, 2, 3 ) );
+    ASSERT_TRUE(x1.span_is_contiguous());
+    ASSERT_TRUE(&x1(0) == &x4(0, 1, 2, 3));
+    ASSERT_TRUE(&x1(1) == &x4(1, 1, 2, 3));
 
-    Kokkos::View< int**, Kokkos::LayoutLeft, Space > x2 =
-      Kokkos::subview( x4, Kokkos::pair< int, int >( 0, 2 ), 1
-                         , Kokkos::pair< int, int >( 1, 3 ), 2 );
+    Kokkos::View<int**, Kokkos::LayoutLeft, Space> x2 = Kokkos::subview(
+        x4, Kokkos::pair<int, int>(0, 2), 1, Kokkos::pair<int, int>(1, 3), 2);
 
-    ASSERT_TRUE( ! x2.span_is_contiguous() );
-    ASSERT_TRUE( & x2( 0, 0 ) == & x4( 0, 1, 1, 2 ) );
-    ASSERT_TRUE( & x2( 1, 0 ) == & x4( 1, 1, 1, 2 ) );
-    ASSERT_TRUE( & x2( 0, 1 ) == & x4( 0, 1, 2, 2 ) );
-    ASSERT_TRUE( & x2( 1, 1 ) == & x4( 1, 1, 2, 2 ) );
+    ASSERT_TRUE(!x2.span_is_contiguous());
+    ASSERT_TRUE(&x2(0, 0) == &x4(0, 1, 1, 2));
+    ASSERT_TRUE(&x2(1, 0) == &x4(1, 1, 1, 2));
+    ASSERT_TRUE(&x2(0, 1) == &x4(0, 1, 2, 2));
+    ASSERT_TRUE(&x2(1, 1) == &x4(1, 1, 2, 2));
 
     // Kokkos::View< int**, Kokkos::LayoutLeft, Space > error_2 =
-    Kokkos::View< int**, Kokkos::LayoutStride, Space > sx2 =
-      Kokkos::subview( x4, 1, Kokkos::pair< int, int >( 0, 2 )
-                         , 2, Kokkos::pair< int, int >( 1, 4 ) );
+    Kokkos::View<int**, Kokkos::LayoutStride, Space> sx2 = Kokkos::subview(
+        x4, 1, Kokkos::pair<int, int>(0, 2), 2, Kokkos::pair<int, int>(1, 4));
 
-    ASSERT_TRUE( ! sx2.span_is_contiguous() );
-    ASSERT_TRUE( & sx2( 0, 0 ) == & x4( 1, 0, 2, 1 ) );
-    ASSERT_TRUE( & sx2( 1, 0 ) == & x4( 1, 1, 2, 1 ) );
-    ASSERT_TRUE( & sx2( 0, 1 ) == & x4( 1, 0, 2, 2 ) );
-    ASSERT_TRUE( & sx2( 1, 1 ) == & x4( 1, 1, 2, 2 ) );
-    ASSERT_TRUE( & sx2( 0, 2 ) == & x4( 1, 0, 2, 3 ) );
-    ASSERT_TRUE( & sx2( 1, 2 ) == & x4( 1, 1, 2, 3 ) );
+    ASSERT_TRUE(!sx2.span_is_contiguous());
+    ASSERT_TRUE(&sx2(0, 0) == &x4(1, 0, 2, 1));
+    ASSERT_TRUE(&sx2(1, 0) == &x4(1, 1, 2, 1));
+    ASSERT_TRUE(&sx2(0, 1) == &x4(1, 0, 2, 2));
+    ASSERT_TRUE(&sx2(1, 1) == &x4(1, 1, 2, 2));
+    ASSERT_TRUE(&sx2(0, 2) == &x4(1, 0, 2, 3));
+    ASSERT_TRUE(&sx2(1, 2) == &x4(1, 1, 2, 3));
 
-    Kokkos::View< int****, Kokkos::LayoutStride, Space > sx4 =
-      Kokkos::subview( x4, Kokkos::pair< int, int >( 1, 2 ) /* of [2] */
-                         , Kokkos::pair< int, int >( 1, 3 ) /* of [3] */
-                         , Kokkos::pair< int, int >( 0, 4 ) /* of [4] */
-                         , Kokkos::pair< int, int >( 2, 4 ) /* of [5] */
-                     );
+    Kokkos::View<int****, Kokkos::LayoutStride, Space> sx4 =
+        Kokkos::subview(x4, Kokkos::pair<int, int>(1, 2) /* of [2] */
+                        ,
+                        Kokkos::pair<int, int>(1, 3) /* of [3] */
+                        ,
+                        Kokkos::pair<int, int>(0, 4) /* of [4] */
+                        ,
+                        Kokkos::pair<int, int>(2, 4) /* of [5] */
+        );
 
-    ASSERT_TRUE( ! sx4.span_is_contiguous() );
+    ASSERT_TRUE(!sx4.span_is_contiguous());
 
-    for ( int i0 = 0; i0 < (int) sx4.extent(0); ++i0 )
-    for ( int i1 = 0; i1 < (int) sx4.extent(1); ++i1 )
-    for ( int i2 = 0; i2 < (int) sx4.extent(2); ++i2 )
-    for ( int i3 = 0; i3 < (int) sx4.extent(3); ++i3 )
-    {
-      ASSERT_TRUE( & sx4( i0, i1, i2, i3 ) == & x4( 1 + i0, 1 + i1, 0 + i2, 2 + i3 ) );
-    }
+    for (int i0 = 0; i0 < (int)sx4.extent(0); ++i0)
+      for (int i1 = 0; i1 < (int)sx4.extent(1); ++i1)
+        for (int i2 = 0; i2 < (int)sx4.extent(2); ++i2)
+          for (int i3 = 0; i3 < (int)sx4.extent(3); ++i3) {
+            ASSERT_TRUE(&sx4(i0, i1, i2, i3) ==
+                        &x4(1 + i0, 1 + i1, 0 + i2, 2 + i3));
+          }
   }
 }
 
-template< class Space >
-void test_left_3()
-{
-  typedef Kokkos::View< int **, Kokkos::LayoutLeft, Space > view_type;
+template <class Space>
+void test_left_3() {
+  typedef Kokkos::View<int**, Kokkos::LayoutLeft, Space> view_type;
 
-  if ( Kokkos::Impl::SpaceAccessibility< Kokkos::HostSpace, typename Space::memory_space >::accessible ) {
-    view_type xm( "x4", 10, 5 );
+  if (Kokkos::Impl::SpaceAccessibility<
+          Kokkos::HostSpace, typename Space::memory_space>::accessible) {
+    view_type xm("x4", 10, 5);
 
-    ASSERT_TRUE( xm.span_is_contiguous() );
+    ASSERT_TRUE(xm.span_is_contiguous());
 
-    Kokkos::View< int, Kokkos::LayoutLeft, Space > x0 = Kokkos::subview( xm, 5, 3 );
+    Kokkos::View<int, Kokkos::LayoutLeft, Space> x0 = Kokkos::subview(xm, 5, 3);
 
-    ASSERT_TRUE( x0.span_is_contiguous() );
-    ASSERT_TRUE( & x0() == & xm( 5, 3 ) );
+    ASSERT_TRUE(x0.span_is_contiguous());
+    ASSERT_TRUE(&x0() == &xm(5, 3));
 
-    Kokkos::View< int*, Kokkos::LayoutLeft, Space > x1 = Kokkos::subview( xm, Kokkos::ALL, 3 );
+    Kokkos::View<int*, Kokkos::LayoutLeft, Space> x1 =
+        Kokkos::subview(xm, Kokkos::ALL, 3);
 
-    ASSERT_TRUE( x1.span_is_contiguous() );
-    for ( int i = 0; i < int( xm.extent(0) ); ++i ) {
-      ASSERT_TRUE( & x1( i ) == & xm( i, 3 ) );
+    ASSERT_TRUE(x1.span_is_contiguous());
+    for (int i = 0; i < int(xm.extent(0)); ++i) {
+      ASSERT_TRUE(&x1(i) == &xm(i, 3));
     }
 
-    Kokkos::View< int**, Kokkos::LayoutLeft, Space > x2 =
-      Kokkos::subview( xm, Kokkos::pair< int, int >( 1, 9 ), Kokkos::ALL );
+    Kokkos::View<int**, Kokkos::LayoutLeft, Space> x2 =
+        Kokkos::subview(xm, Kokkos::pair<int, int>(1, 9), Kokkos::ALL);
 
-    ASSERT_TRUE( ! x2.span_is_contiguous() );
-    for ( int j = 0; j < int( x2.extent(1) ); ++j )
-    for ( int i = 0; i < int( x2.extent(0) ); ++i )
-    {
-      ASSERT_TRUE( & x2( i, j ) == & xm( 1 + i, j ) );
-    }
+    ASSERT_TRUE(!x2.span_is_contiguous());
+    for (int j = 0; j < int(x2.extent(1)); ++j)
+      for (int i = 0; i < int(x2.extent(0)); ++i) {
+        ASSERT_TRUE(&x2(i, j) == &xm(1 + i, j));
+      }
 
-    Kokkos::View< int**, Kokkos::LayoutLeft, Space > x2c =
-      Kokkos::subview( xm, Kokkos::ALL, std::pair< int, int >( 2, 4 ) );
+    Kokkos::View<int**, Kokkos::LayoutLeft, Space> x2c =
+        Kokkos::subview(xm, Kokkos::ALL, std::pair<int, int>(2, 4));
 
-    ASSERT_TRUE( x2c.span_is_contiguous() );
-    for ( int j = 0; j < int( x2c.extent(1) ); ++j )
-    for ( int i = 0; i < int( x2c.extent(0) ); ++i )
-    {
-      ASSERT_TRUE( & x2c( i, j ) == & xm( i, 2 + j ) );
-    }
+    ASSERT_TRUE(x2c.span_is_contiguous());
+    for (int j = 0; j < int(x2c.extent(1)); ++j)
+      for (int i = 0; i < int(x2c.extent(0)); ++i) {
+        ASSERT_TRUE(&x2c(i, j) == &xm(i, 2 + j));
+      }
 
-    Kokkos::View< int**, Kokkos::LayoutLeft, Space > x2_n1 =
-      Kokkos::subview( xm, std::pair< int, int >( 1, 1 ), Kokkos::ALL );
+    Kokkos::View<int**, Kokkos::LayoutLeft, Space> x2_n1 =
+        Kokkos::subview(xm, std::pair<int, int>(1, 1), Kokkos::ALL);
 
-    ASSERT_TRUE( x2_n1.extent(0) == 0 );
-    ASSERT_TRUE( x2_n1.extent(1) == xm.extent(1) );
+    ASSERT_TRUE(x2_n1.extent(0) == 0);
+    ASSERT_TRUE(x2_n1.extent(1) == xm.extent(1));
 
-    Kokkos::View< int**, Kokkos::LayoutLeft, Space > x2_n2 =
-      Kokkos::subview( xm, Kokkos::ALL, std::pair< int, int >( 1, 1 ) );
+    Kokkos::View<int**, Kokkos::LayoutLeft, Space> x2_n2 =
+        Kokkos::subview(xm, Kokkos::ALL, std::pair<int, int>(1, 1));
 
-    ASSERT_TRUE( x2_n2.extent(0) == xm.extent(0) );
-    ASSERT_TRUE( x2_n2.extent(1) == 0 );
+    ASSERT_TRUE(x2_n2.extent(0) == xm.extent(0));
+    ASSERT_TRUE(x2_n2.extent(1) == 0);
   }
 }
 
 //----------------------------------------------------------------------------
 
-template< class Space >
-void test_right_0()
-{
-  typedef Kokkos::View< int [2][3][4][5][2][3][4][5], Kokkos::LayoutRight, Space > view_static_8_type;
+template <class Space>
+void test_right_0() {
+  typedef Kokkos::View<int[2][3][4][5][2][3][4][5], Kokkos::LayoutRight, Space>
+      view_static_8_type;
 
-  if ( Kokkos::Impl::SpaceAccessibility<Kokkos::HostSpace, typename Space::memory_space>::accessible ) {
-    view_static_8_type x_static_8( "x_static_right_8" );
+  if (Kokkos::Impl::SpaceAccessibility<
+          Kokkos::HostSpace, typename Space::memory_space>::accessible) {
+    view_static_8_type x_static_8("x_static_right_8");
 
-    Kokkos::View< int, Kokkos::LayoutRight, Space > x0 = Kokkos::subview( x_static_8, 0, 0, 0, 0, 0, 0, 0, 0 );
+    Kokkos::View<int, Kokkos::LayoutRight, Space> x0 =
+        Kokkos::subview(x_static_8, 0, 0, 0, 0, 0, 0, 0, 0);
 
-    ASSERT_TRUE( & x0() == & x_static_8( 0, 0, 0, 0, 0, 0, 0, 0 ) );
+    ASSERT_TRUE(&x0() == &x_static_8(0, 0, 0, 0, 0, 0, 0, 0));
 
-    Kokkos::View< int*, Kokkos::LayoutRight, Space > x1 =
-      Kokkos::subview( x_static_8, 0, 1, 2, 3, 0, 1, 2, Kokkos::pair< int, int >( 1, 3 ) );
+    Kokkos::View<int*, Kokkos::LayoutRight, Space> x1 = Kokkos::subview(
+        x_static_8, 0, 1, 2, 3, 0, 1, 2, Kokkos::pair<int, int>(1, 3));
 
-    ASSERT_TRUE( x1.extent(0) == 2 );
-    ASSERT_TRUE( & x1( 0 ) == & x_static_8( 0, 1, 2, 3, 0, 1, 2, 1 ) );
-    ASSERT_TRUE( & x1( 1 ) == & x_static_8( 0, 1, 2, 3, 0, 1, 2, 2 ) );
+    ASSERT_TRUE(x1.extent(0) == 2);
+    ASSERT_TRUE(&x1(0) == &x_static_8(0, 1, 2, 3, 0, 1, 2, 1));
+    ASSERT_TRUE(&x1(1) == &x_static_8(0, 1, 2, 3, 0, 1, 2, 2));
 
-    Kokkos::View< int**, Kokkos::LayoutRight, Space > x2 =
-      Kokkos::subview( x_static_8, 0, 1, 2, Kokkos::pair< int, int >( 1, 3 )
-                                 , 0, 1, 2, Kokkos::pair< int, int >( 1, 3 ) );
+    Kokkos::View<int**, Kokkos::LayoutRight, Space> x2 =
+        Kokkos::subview(x_static_8, 0, 1, 2, Kokkos::pair<int, int>(1, 3), 0, 1,
+                        2, Kokkos::pair<int, int>(1, 3));
 
-    ASSERT_TRUE( x2.extent(0) == 2 );
-    ASSERT_TRUE( x2.extent(1) == 2 );
-    ASSERT_TRUE( & x2( 0, 0 ) == & x_static_8( 0, 1, 2, 1, 0, 1, 2, 1 ) );
-    ASSERT_TRUE( & x2( 1, 0 ) == & x_static_8( 0, 1, 2, 2, 0, 1, 2, 1 ) );
-    ASSERT_TRUE( & x2( 0, 1 ) == & x_static_8( 0, 1, 2, 1, 0, 1, 2, 2 ) );
-    ASSERT_TRUE( & x2( 1, 1 ) == & x_static_8( 0, 1, 2, 2, 0, 1, 2, 2 ) );
+    ASSERT_TRUE(x2.extent(0) == 2);
+    ASSERT_TRUE(x2.extent(1) == 2);
+    ASSERT_TRUE(&x2(0, 0) == &x_static_8(0, 1, 2, 1, 0, 1, 2, 1));
+    ASSERT_TRUE(&x2(1, 0) == &x_static_8(0, 1, 2, 2, 0, 1, 2, 1));
+    ASSERT_TRUE(&x2(0, 1) == &x_static_8(0, 1, 2, 1, 0, 1, 2, 2));
+    ASSERT_TRUE(&x2(1, 1) == &x_static_8(0, 1, 2, 2, 0, 1, 2, 2));
 
     // Kokkos::View< int**, Kokkos::LayoutRight, Space > error_2 =
-    Kokkos::View< int**, Kokkos::LayoutStride, Space > sx2 =
-      Kokkos::subview( x_static_8, 1, Kokkos::pair< int, int >( 0, 2 ), 2, 3
-                                    , Kokkos::pair< int, int >( 0, 2 ), 1, 2, 3 );
+    Kokkos::View<int**, Kokkos::LayoutStride, Space> sx2 =
+        Kokkos::subview(x_static_8, 1, Kokkos::pair<int, int>(0, 2), 2, 3,
+                        Kokkos::pair<int, int>(0, 2), 1, 2, 3);
 
-    ASSERT_TRUE( sx2.extent(0) == 2 );
-    ASSERT_TRUE( sx2.extent(1) == 2 );
-    ASSERT_TRUE( & sx2( 0, 0 ) == & x_static_8( 1, 0, 2, 3, 0, 1, 2, 3 ) );
-    ASSERT_TRUE( & sx2( 1, 0 ) == & x_static_8( 1, 1, 2, 3, 0, 1, 2, 3 ) );
-    ASSERT_TRUE( & sx2( 0, 1 ) == & x_static_8( 1, 0, 2, 3, 1, 1, 2, 3 ) );
-    ASSERT_TRUE( & sx2( 1, 1 ) == & x_static_8( 1, 1, 2, 3, 1, 1, 2, 3 ) );
+    ASSERT_TRUE(sx2.extent(0) == 2);
+    ASSERT_TRUE(sx2.extent(1) == 2);
+    ASSERT_TRUE(&sx2(0, 0) == &x_static_8(1, 0, 2, 3, 0, 1, 2, 3));
+    ASSERT_TRUE(&sx2(1, 0) == &x_static_8(1, 1, 2, 3, 0, 1, 2, 3));
+    ASSERT_TRUE(&sx2(0, 1) == &x_static_8(1, 0, 2, 3, 1, 1, 2, 3));
+    ASSERT_TRUE(&sx2(1, 1) == &x_static_8(1, 1, 2, 3, 1, 1, 2, 3));
 
-    Kokkos::View< int****, Kokkos::LayoutStride, Space > sx4 =
-      Kokkos::subview( x_static_8, 0, Kokkos::pair< int, int >( 0, 2 ) /* of [3] */
-                                 , 1, Kokkos::pair< int, int >( 1, 3 ) /* of [5] */
-                                 , 1, Kokkos::pair< int, int >( 0, 2 ) /* of [3] */
-                                 , 2, Kokkos::pair< int, int >( 2, 4 ) /* of [5] */
-                     );
+    Kokkos::View<int****, Kokkos::LayoutStride, Space> sx4 =
+        Kokkos::subview(x_static_8, 0, Kokkos::pair<int, int>(0, 2) /* of [3] */
+                        ,
+                        1, Kokkos::pair<int, int>(1, 3) /* of [5] */
+                        ,
+                        1, Kokkos::pair<int, int>(0, 2) /* of [3] */
+                        ,
+                        2, Kokkos::pair<int, int>(2, 4) /* of [5] */
+        );
 
-    ASSERT_TRUE( sx4.extent(0) == 2 );
-    ASSERT_TRUE( sx4.extent(1) == 2 );
-    ASSERT_TRUE( sx4.extent(2) == 2 );
-    ASSERT_TRUE( sx4.extent(3) == 2 );
-    for ( int i0 = 0; i0 < (int) sx4.extent(0); ++i0 )
-    for ( int i1 = 0; i1 < (int) sx4.extent(1); ++i1 )
-    for ( int i2 = 0; i2 < (int) sx4.extent(2); ++i2 )
-    for ( int i3 = 0; i3 < (int) sx4.extent(3); ++i3 )
-    {
-      ASSERT_TRUE( & sx4( i0, i1, i2, i3 ) == & x_static_8( 0, 0 + i0, 1, 1 + i1, 1, 0 + i2, 2, 2 + i3 ) );
-    }
+    ASSERT_TRUE(sx4.extent(0) == 2);
+    ASSERT_TRUE(sx4.extent(1) == 2);
+    ASSERT_TRUE(sx4.extent(2) == 2);
+    ASSERT_TRUE(sx4.extent(3) == 2);
+    for (int i0 = 0; i0 < (int)sx4.extent(0); ++i0)
+      for (int i1 = 0; i1 < (int)sx4.extent(1); ++i1)
+        for (int i2 = 0; i2 < (int)sx4.extent(2); ++i2)
+          for (int i3 = 0; i3 < (int)sx4.extent(3); ++i3) {
+            ASSERT_TRUE(&sx4(i0, i1, i2, i3) == &x_static_8(0, 0 + i0, 1,
+                                                            1 + i1, 1, 0 + i2,
+                                                            2, 2 + i3));
+          }
   }
 }
 
-template< class Space >
-void test_right_1()
-{
-  typedef Kokkos::View< int ****[2][3][4][5], Kokkos::LayoutRight, Space > view_type;
+template <class Space>
+void test_right_1() {
+  typedef Kokkos::View<int*** * [2][3][4][5], Kokkos::LayoutRight, Space>
+      view_type;
 
-  if ( Kokkos::Impl::SpaceAccessibility<Kokkos::HostSpace, typename Space::memory_space>::accessible ) {
-    view_type x8( "x_right_8", 2, 3, 4, 5 );
+  if (Kokkos::Impl::SpaceAccessibility<
+          Kokkos::HostSpace, typename Space::memory_space>::accessible) {
+    view_type x8("x_right_8", 2, 3, 4, 5);
 
-    Kokkos::View< int, Kokkos::LayoutRight, Space > x0 = Kokkos::subview( x8, 0, 0, 0, 0, 0, 0, 0, 0 );
+    Kokkos::View<int, Kokkos::LayoutRight, Space> x0 =
+        Kokkos::subview(x8, 0, 0, 0, 0, 0, 0, 0, 0);
 
-    ASSERT_TRUE( & x0() == & x8( 0, 0, 0, 0, 0, 0, 0, 0 ) );
+    ASSERT_TRUE(&x0() == &x8(0, 0, 0, 0, 0, 0, 0, 0));
 
-    Kokkos::View< int*, Kokkos::LayoutRight, Space > x1 =
-      Kokkos::subview( x8, 0, 1, 2, 3, 0, 1, 2, Kokkos::pair< int, int >( 1, 3 ) );
+    Kokkos::View<int*, Kokkos::LayoutRight, Space> x1 =
+        Kokkos::subview(x8, 0, 1, 2, 3, 0, 1, 2, Kokkos::pair<int, int>(1, 3));
 
-    ASSERT_TRUE( & x1( 0 ) == & x8( 0, 1, 2, 3, 0, 1, 2, 1 ) );
-    ASSERT_TRUE( & x1( 1 ) == & x8( 0, 1, 2, 3, 0, 1, 2, 2 ) );
+    ASSERT_TRUE(&x1(0) == &x8(0, 1, 2, 3, 0, 1, 2, 1));
+    ASSERT_TRUE(&x1(1) == &x8(0, 1, 2, 3, 0, 1, 2, 2));
 
-    Kokkos::View< int**, Kokkos::LayoutRight, Space > x2 =
-      Kokkos::subview( x8, 0, 1, 2, Kokkos::pair< int, int >( 1, 3 )
-                         , 0, 1, 2, Kokkos::pair< int, int >( 1, 3 ) );
+    Kokkos::View<int**, Kokkos::LayoutRight, Space> x2 =
+        Kokkos::subview(x8, 0, 1, 2, Kokkos::pair<int, int>(1, 3), 0, 1, 2,
+                        Kokkos::pair<int, int>(1, 3));
 
-    ASSERT_TRUE( & x2( 0, 0 ) == & x8( 0, 1, 2, 1, 0, 1, 2, 1 ) );
-    ASSERT_TRUE( & x2( 1, 0 ) == & x8( 0, 1, 2, 2, 0, 1, 2, 1 ) );
-    ASSERT_TRUE( & x2( 0, 1 ) == & x8( 0, 1, 2, 1, 0, 1, 2, 2 ) );
-    ASSERT_TRUE( & x2( 1, 1 ) == & x8( 0, 1, 2, 2, 0, 1, 2, 2 ) );
+    ASSERT_TRUE(&x2(0, 0) == &x8(0, 1, 2, 1, 0, 1, 2, 1));
+    ASSERT_TRUE(&x2(1, 0) == &x8(0, 1, 2, 2, 0, 1, 2, 1));
+    ASSERT_TRUE(&x2(0, 1) == &x8(0, 1, 2, 1, 0, 1, 2, 2));
+    ASSERT_TRUE(&x2(1, 1) == &x8(0, 1, 2, 2, 0, 1, 2, 2));
 
     // Kokkos::View< int**, Kokkos::LayoutRight, Space > error_2 =
-    Kokkos::View< int**, Kokkos::LayoutStride, Space > sx2 =
-      Kokkos::subview( x8, 1, Kokkos::pair< int, int >( 0, 2 ), 2, 3
-                            , Kokkos::pair< int, int >( 0, 2 ), 1, 2, 3 );
+    Kokkos::View<int**, Kokkos::LayoutStride, Space> sx2 =
+        Kokkos::subview(x8, 1, Kokkos::pair<int, int>(0, 2), 2, 3,
+                        Kokkos::pair<int, int>(0, 2), 1, 2, 3);
 
-    ASSERT_TRUE( & sx2( 0, 0 ) == & x8( 1, 0, 2, 3, 0, 1, 2, 3 ) );
-    ASSERT_TRUE( & sx2( 1, 0 ) == & x8( 1, 1, 2, 3, 0, 1, 2, 3 ) );
-    ASSERT_TRUE( & sx2( 0, 1 ) == & x8( 1, 0, 2, 3, 1, 1, 2, 3 ) );
-    ASSERT_TRUE( & sx2( 1, 1 ) == & x8( 1, 1, 2, 3, 1, 1, 2, 3 ) );
+    ASSERT_TRUE(&sx2(0, 0) == &x8(1, 0, 2, 3, 0, 1, 2, 3));
+    ASSERT_TRUE(&sx2(1, 0) == &x8(1, 1, 2, 3, 0, 1, 2, 3));
+    ASSERT_TRUE(&sx2(0, 1) == &x8(1, 0, 2, 3, 1, 1, 2, 3));
+    ASSERT_TRUE(&sx2(1, 1) == &x8(1, 1, 2, 3, 1, 1, 2, 3));
 
-    Kokkos::View< int****, Kokkos::LayoutStride, Space > sx4 =
-      Kokkos::subview( x8, 0, Kokkos::pair< int, int >( 0, 2 ) /* of [3] */
-                         , 1, Kokkos::pair< int, int >( 1, 3 ) /* of [5] */
-                         , 1, Kokkos::pair< int, int >( 0, 2 ) /* of [3] */
-                         , 2, Kokkos::pair< int, int >( 2, 4 ) /* of [5] */
-                     );
+    Kokkos::View<int****, Kokkos::LayoutStride, Space> sx4 =
+        Kokkos::subview(x8, 0, Kokkos::pair<int, int>(0, 2) /* of [3] */
+                        ,
+                        1, Kokkos::pair<int, int>(1, 3) /* of [5] */
+                        ,
+                        1, Kokkos::pair<int, int>(0, 2) /* of [3] */
+                        ,
+                        2, Kokkos::pair<int, int>(2, 4) /* of [5] */
+        );
 
-    for ( int i0 = 0; i0 < (int) sx4.extent(0); ++i0 )
-    for ( int i1 = 0; i1 < (int) sx4.extent(1); ++i1 )
-    for ( int i2 = 0; i2 < (int) sx4.extent(2); ++i2 )
-    for ( int i3 = 0; i3 < (int) sx4.extent(3); ++i3 )
-    {
-      ASSERT_TRUE( & sx4( i0, i1, i2, i3 ) == & x8( 0, 0 + i0, 1, 1 + i1, 1, 0 + i2, 2, 2 + i3 ) );
-    }
+    for (int i0 = 0; i0 < (int)sx4.extent(0); ++i0)
+      for (int i1 = 0; i1 < (int)sx4.extent(1); ++i1)
+        for (int i2 = 0; i2 < (int)sx4.extent(2); ++i2)
+          for (int i3 = 0; i3 < (int)sx4.extent(3); ++i3) {
+            ASSERT_TRUE(&sx4(i0, i1, i2, i3) ==
+                        &x8(0, 0 + i0, 1, 1 + i1, 1, 0 + i2, 2, 2 + i3));
+          }
   }
 }
 
-template< class Space >
-void test_right_3()
-{
-  typedef Kokkos::View< int **, Kokkos::LayoutRight, Space > view_type;
+template <class Space>
+void test_right_3() {
+  typedef Kokkos::View<int**, Kokkos::LayoutRight, Space> view_type;
 
-  if ( Kokkos::Impl::SpaceAccessibility< Kokkos::HostSpace, typename Space::memory_space >::accessible ) {
-    view_type xm( "x4", 10, 5 );
+  if (Kokkos::Impl::SpaceAccessibility<
+          Kokkos::HostSpace, typename Space::memory_space>::accessible) {
+    view_type xm("x4", 10, 5);
 
-    ASSERT_TRUE( xm.span_is_contiguous() );
+    ASSERT_TRUE(xm.span_is_contiguous());
 
-    Kokkos::View< int, Kokkos::LayoutRight, Space > x0 = Kokkos::subview( xm, 5, 3 );
+    Kokkos::View<int, Kokkos::LayoutRight, Space> x0 =
+        Kokkos::subview(xm, 5, 3);
 
-    ASSERT_TRUE( x0.span_is_contiguous() );
-    ASSERT_TRUE( & x0() == & xm( 5, 3 ) );
+    ASSERT_TRUE(x0.span_is_contiguous());
+    ASSERT_TRUE(&x0() == &xm(5, 3));
 
-    Kokkos::View< int*, Kokkos::LayoutRight, Space > x1 = Kokkos::subview( xm, 3, Kokkos::ALL );
+    Kokkos::View<int*, Kokkos::LayoutRight, Space> x1 =
+        Kokkos::subview(xm, 3, Kokkos::ALL);
 
-    ASSERT_TRUE( x1.span_is_contiguous() );
-    for ( int i = 0; i < int( xm.extent(1) ); ++i ) {
-      ASSERT_TRUE( & x1( i ) == & xm( 3, i ) );
+    ASSERT_TRUE(x1.span_is_contiguous());
+    for (int i = 0; i < int(xm.extent(1)); ++i) {
+      ASSERT_TRUE(&x1(i) == &xm(3, i));
     }
 
-    Kokkos::View< int**, Kokkos::LayoutRight, Space > x2c =
-      Kokkos::subview( xm, Kokkos::pair< int, int >( 1, 9 ), Kokkos::ALL );
+    Kokkos::View<int**, Kokkos::LayoutRight, Space> x2c =
+        Kokkos::subview(xm, Kokkos::pair<int, int>(1, 9), Kokkos::ALL);
 
-    ASSERT_TRUE( x2c.span_is_contiguous() );
-    for ( int j = 0; j < int( x2c.extent(1) ); ++j )
-    for ( int i = 0; i < int( x2c.extent(0) ); ++i ) {
-      ASSERT_TRUE( & x2c( i, j ) == & xm( 1 + i, j ) );
-    }
+    ASSERT_TRUE(x2c.span_is_contiguous());
+    for (int j = 0; j < int(x2c.extent(1)); ++j)
+      for (int i = 0; i < int(x2c.extent(0)); ++i) {
+        ASSERT_TRUE(&x2c(i, j) == &xm(1 + i, j));
+      }
 
-    Kokkos::View< int**, Kokkos::LayoutRight, Space > x2 =
-      Kokkos::subview( xm, Kokkos::ALL, std::pair< int, int >( 2, 4 ) );
+    Kokkos::View<int**, Kokkos::LayoutRight, Space> x2 =
+        Kokkos::subview(xm, Kokkos::ALL, std::pair<int, int>(2, 4));
 
-    ASSERT_TRUE( ! x2.span_is_contiguous() );
-    for ( int j = 0; j < int( x2.extent(1) ); ++j )
-    for ( int i = 0; i < int( x2.extent(0) ); ++i )
-    {
-      ASSERT_TRUE( & x2( i, j ) == & xm( i, 2 + j ) );
-    }
+    ASSERT_TRUE(!x2.span_is_contiguous());
+    for (int j = 0; j < int(x2.extent(1)); ++j)
+      for (int i = 0; i < int(x2.extent(0)); ++i) {
+        ASSERT_TRUE(&x2(i, j) == &xm(i, 2 + j));
+      }
 
-    Kokkos::View< int**, Kokkos::LayoutRight, Space > x2_n1 =
-      Kokkos::subview( xm, std::pair< int, int >( 1, 1 ), Kokkos::ALL );
+    Kokkos::View<int**, Kokkos::LayoutRight, Space> x2_n1 =
+        Kokkos::subview(xm, std::pair<int, int>(1, 1), Kokkos::ALL);
 
-    ASSERT_TRUE( x2_n1.extent(0) == 0 );
-    ASSERT_TRUE( x2_n1.extent(1) == xm.extent(1) );
+    ASSERT_TRUE(x2_n1.extent(0) == 0);
+    ASSERT_TRUE(x2_n1.extent(1) == xm.extent(1));
 
-    Kokkos::View< int**, Kokkos::LayoutRight, Space > x2_n2 =
-      Kokkos::subview( xm, Kokkos::ALL, std::pair< int, int >( 1, 1 ) );
+    Kokkos::View<int**, Kokkos::LayoutRight, Space> x2_n2 =
+        Kokkos::subview(xm, Kokkos::ALL, std::pair<int, int>(1, 1));
 
-    ASSERT_TRUE( x2_n2.extent(0) == xm.extent(0) );
-    ASSERT_TRUE( x2_n2.extent(1) == 0 );
+    ASSERT_TRUE(x2_n2.extent(0) == xm.extent(0));
+    ASSERT_TRUE(x2_n2.extent(1) == 0);
   }
 }
 
@@ -741,676 +761,1177 @@ constexpr int N2 = 17;
 constexpr int N3 = 5;
 constexpr int N4 = 7;
 
-template< class SubView, class View >
-void test_Check1D( SubView a, View b, std::pair< int, int > range ) {
+template <class SubView, class View>
+void test_Check1D(SubView a, View b, std::pair<int, int> range) {
   int errors = 0;
 
-  for ( int i = 0; i < range.second - range.first; i++ ) {
-    if ( a( i ) != b( i + range.first ) ) errors++;
+  for (int i = 0; i < range.second - range.first; i++) {
+    if (a(i) != b(i + range.first)) errors++;
   }
 
-  if ( errors > 0 ) {
+  if (errors > 0) {
     std::cout << "Error Suviews test_Check1D: " << errors << std::endl;
   }
 
-  ASSERT_TRUE( errors == 0 );
+  ASSERT_TRUE(errors == 0);
 }
 
-template< class SubView, class View >
-void test_Check1D2D( SubView a, View b, int i0, std::pair< int, int > range ) {
+template <class SubView, class View>
+void test_Check1D2D(SubView a, View b, int i0, std::pair<int, int> range) {
   int errors = 0;
 
-  for ( int i1 = 0; i1 < range.second - range.first; i1++ ) {
-    if ( a( i1 ) != b( i0, i1 + range.first ) ) errors++;
+  for (int i1 = 0; i1 < range.second - range.first; i1++) {
+    if (a(i1) != b(i0, i1 + range.first)) errors++;
   }
 
-  if ( errors > 0 ) {
+  if (errors > 0) {
     std::cout << "Error Suviews test_Check1D2D: " << errors << std::endl;
   }
 
-  ASSERT_TRUE( errors == 0 );
+  ASSERT_TRUE(errors == 0);
 }
 
-template< class SubView, class View >
-void test_Check2D3D( SubView a, View b, int i0, std::pair< int, int > range1
-                   , std::pair< int, int > range2 )
-{
+template <class SubView, class View>
+void test_Check2D3D(SubView a, View b, int i0, std::pair<int, int> range1,
+                    std::pair<int, int> range2) {
   int errors = 0;
 
-  for ( int i1 = 0; i1 < range1.second - range1.first; i1++ ) {
-    for ( int i2 = 0; i2 < range2.second - range2.first; i2++ ) {
-      if ( a( i1, i2 ) != b( i0, i1 + range1.first, i2 + range2.first ) ) errors++;
+  for (int i1 = 0; i1 < range1.second - range1.first; i1++) {
+    for (int i2 = 0; i2 < range2.second - range2.first; i2++) {
+      if (a(i1, i2) != b(i0, i1 + range1.first, i2 + range2.first)) errors++;
     }
   }
 
-  if ( errors > 0 ) {
+  if (errors > 0) {
     std::cout << "Error Suviews test_Check2D3D: " << errors << std::endl;
   }
 
-  ASSERT_TRUE( errors == 0 );
+  ASSERT_TRUE(errors == 0);
 }
 
-template<class SubView, class View>
-void test_Check3D5D( SubView a, View b, int i0, int i1, std::pair< int, int > range2
-                   , std::pair< int, int > range3, std::pair< int, int > range4 )
-{
+template <class SubView, class View>
+void test_Check3D5D(SubView a, View b, int i0, int i1,
+                    std::pair<int, int> range2, std::pair<int, int> range3,
+                    std::pair<int, int> range4) {
   int errors = 0;
 
-  for ( int i2 = 0; i2 < range2.second - range2.first; i2++ ) {
-    for ( int i3 = 0; i3 < range3.second - range3.first; i3++ ) {
-      for ( int i4 = 0; i4 < range4.second - range4.first; i4++ ) {
-        if ( a( i2, i3, i4 ) != b( i0, i1, i2 + range2.first, i3 + range3.first, i4 + range4.first ) ) {
+  for (int i2 = 0; i2 < range2.second - range2.first; i2++) {
+    for (int i3 = 0; i3 < range3.second - range3.first; i3++) {
+      for (int i4 = 0; i4 < range4.second - range4.first; i4++) {
+        if (a(i2, i3, i4) != b(i0, i1, i2 + range2.first, i3 + range3.first,
+                               i4 + range4.first)) {
           errors++;
         }
       }
     }
   }
 
-  if ( errors > 0 ) {
+  if (errors > 0) {
     std::cout << "Error Suviews test_Check3D5D: " << errors << std::endl;
   }
 
-  ASSERT_TRUE( errors == 0 );
+  ASSERT_TRUE(errors == 0);
 }
 
-template< class Space, class LayoutSub, class Layout, class LayoutOrg, class MemTraits >
+template <class Space, class LayoutSub, class Layout, class LayoutOrg,
+          class MemTraits>
 void test_1d_assign_impl() {
-  { // Breaks.
-    Kokkos::View< int*, LayoutOrg, Space > a_org( "A", N0 );
-    Kokkos::View< int*, LayoutOrg, Space, MemTraits > a( a_org );
+  {  // Breaks.
+    Kokkos::View<int*, LayoutOrg, Space> a_org("A", N0);
+    Kokkos::View<int*, LayoutOrg, Space, MemTraits> a(a_org);
     Kokkos::fence();
-    for ( int i = 0; i < N0; i++ ) a_org( i ) = i;
+    for (int i = 0; i < N0; i++) a_org(i) = i;
 
-    Kokkos::View< int[N0], Layout, Space, MemTraits > a1( a );
+    Kokkos::View<int[N0], Layout, Space, MemTraits> a1(a);
     Kokkos::fence();
-    test_Check1D( a1, a, std::pair< int, int >( 0, N0 ) );
+    test_Check1D(a1, a, std::pair<int, int>(0, N0));
 
-    Kokkos::View< int[N0], LayoutSub, Space, MemTraits > a2( a1 );
+    Kokkos::View<int[N0], LayoutSub, Space, MemTraits> a2(a1);
     Kokkos::fence();
-    test_Check1D( a2, a, std::pair< int, int >( 0, N0 ) );
+    test_Check1D(a2, a, std::pair<int, int>(0, N0));
     a1 = a;
-    test_Check1D( a1, a, std::pair< int, int >( 0, N0 ) );
+    test_Check1D(a1, a, std::pair<int, int>(0, N0));
 
     // Runtime Fail expected.
-    //Kokkos::View< int[N1] > afail1( a );
+    // Kokkos::View< int[N1] > afail1( a );
 
     // Compile Time Fail expected.
-    //Kokkos::View< int[N1] > afail2( a1 );
+    // Kokkos::View< int[N1] > afail2( a1 );
   }
 
-  { // Works.
-    Kokkos::View< int[N0], LayoutOrg, Space, MemTraits > a( "A" );
-    Kokkos::View< int*, Layout, Space, MemTraits > a1( a );
+  {  // Works.
+    Kokkos::View<int[N0], LayoutOrg, Space, MemTraits> a("A");
+    Kokkos::View<int*, Layout, Space, MemTraits> a1(a);
     Kokkos::fence();
-    test_Check1D( a1, a, std::pair< int, int >( 0, N0 ) );
+    test_Check1D(a1, a, std::pair<int, int>(0, N0));
     a1 = a;
     Kokkos::fence();
-    test_Check1D( a1, a, std::pair< int, int >( 0, N0 ) );
+    test_Check1D(a1, a, std::pair<int, int>(0, N0));
   }
 }
 
-template< class Space, class Type, class TypeSub, class LayoutSub, class Layout, class LayoutOrg, class MemTraits >
+template <class Space, class Type, class TypeSub, class LayoutSub, class Layout,
+          class LayoutOrg, class MemTraits>
 void test_2d_subview_3d_impl_type() {
-  Kokkos::View< int***, LayoutOrg, Space > a_org( "A", N0, N1, N2 );
-  Kokkos::View< Type, Layout, Space, MemTraits > a( a_org );
+  Kokkos::View<int***, LayoutOrg, Space> a_org("A", N0, N1, N2);
+  Kokkos::View<Type, Layout, Space, MemTraits> a(a_org);
 
-  for ( int i0 = 0; i0 < N0; i0++ )
-  for ( int i1 = 0; i1 < N1; i1++ )
-  for ( int i2 = 0; i2 < N2; i2++ )
-  {
-    a_org( i0, i1, i2 ) = i0 * 1000000 + i1 * 1000 + i2;
-  }
+  for (int i0 = 0; i0 < N0; i0++)
+    for (int i1 = 0; i1 < N1; i1++)
+      for (int i2 = 0; i2 < N2; i2++) {
+        a_org(i0, i1, i2) = i0 * 1000000 + i1 * 1000 + i2;
+      }
 
-  Kokkos::View< TypeSub, LayoutSub, Space, MemTraits > a1;
-  a1 = Kokkos::subview( a, 3, Kokkos::ALL, Kokkos::ALL );
+  Kokkos::View<TypeSub, LayoutSub, Space, MemTraits> a1;
+  a1 = Kokkos::subview(a, 3, Kokkos::ALL, Kokkos::ALL);
   Kokkos::fence();
-  test_Check2D3D( a1, a, 3, std::pair< int, int >( 0, N1 ), std::pair< int, int >( 0, N2 ) );
+  test_Check2D3D(a1, a, 3, std::pair<int, int>(0, N1),
+                 std::pair<int, int>(0, N2));
 
-  Kokkos::View< TypeSub, LayoutSub, Space, MemTraits > a2( a, 3, Kokkos::ALL, Kokkos::ALL );
+  Kokkos::View<TypeSub, LayoutSub, Space, MemTraits> a2(a, 3, Kokkos::ALL,
+                                                        Kokkos::ALL);
   Kokkos::fence();
-  test_Check2D3D( a2, a, 3, std::pair< int, int >( 0, N1 ), std::pair< int, int >( 0, N2 ) );
+  test_Check2D3D(a2, a, 3, std::pair<int, int>(0, N1),
+                 std::pair<int, int>(0, N2));
 }
 
-template< class Space, class LayoutSub, class Layout, class LayoutOrg, class MemTraits >
+template <class Space, class LayoutSub, class Layout, class LayoutOrg,
+          class MemTraits>
 void test_2d_subview_3d_impl_layout() {
-  test_2d_subview_3d_impl_type< Space, int[N0][N1][N2], int[N1][N2], LayoutSub, Layout, LayoutOrg, MemTraits >();
-  test_2d_subview_3d_impl_type< Space, int[N0][N1][N2], int*   [N2], LayoutSub, Layout, LayoutOrg, MemTraits >();
-  test_2d_subview_3d_impl_type< Space, int[N0][N1][N2], int**      , LayoutSub, Layout, LayoutOrg, MemTraits >();
+  test_2d_subview_3d_impl_type<Space, int[N0][N1][N2], int[N1][N2], LayoutSub,
+                               Layout, LayoutOrg, MemTraits>();
+  test_2d_subview_3d_impl_type<Space, int[N0][N1][N2], int * [N2], LayoutSub,
+                               Layout, LayoutOrg, MemTraits>();
+  test_2d_subview_3d_impl_type<Space, int[N0][N1][N2], int**, LayoutSub, Layout,
+                               LayoutOrg, MemTraits>();
 
-  test_2d_subview_3d_impl_type< Space, int*   [N1][N2], int[N1][N2], LayoutSub, Layout, LayoutOrg, MemTraits >();
-  test_2d_subview_3d_impl_type< Space, int*   [N1][N2], int*   [N2], LayoutSub, Layout, LayoutOrg, MemTraits >();
-  test_2d_subview_3d_impl_type< Space, int*   [N1][N2], int**      , LayoutSub, Layout, LayoutOrg, MemTraits >();
+  test_2d_subview_3d_impl_type<Space, int * [N1][N2], int[N1][N2], LayoutSub,
+                               Layout, LayoutOrg, MemTraits>();
+  test_2d_subview_3d_impl_type<Space, int * [N1][N2], int * [N2], LayoutSub,
+                               Layout, LayoutOrg, MemTraits>();
+  test_2d_subview_3d_impl_type<Space, int * [N1][N2], int**, LayoutSub, Layout,
+                               LayoutOrg, MemTraits>();
 
-  test_2d_subview_3d_impl_type< Space, int**      [N2], int[N1][N2], LayoutSub, Layout, LayoutOrg, MemTraits >();
-  test_2d_subview_3d_impl_type< Space, int**      [N2], int*   [N2], LayoutSub, Layout, LayoutOrg, MemTraits >();
-  test_2d_subview_3d_impl_type< Space, int**      [N2], int**      , LayoutSub, Layout, LayoutOrg, MemTraits >();
+  test_2d_subview_3d_impl_type<Space, int* * [N2], int[N1][N2], LayoutSub,
+                               Layout, LayoutOrg, MemTraits>();
+  test_2d_subview_3d_impl_type<Space, int* * [N2], int * [N2], LayoutSub,
+                               Layout, LayoutOrg, MemTraits>();
+  test_2d_subview_3d_impl_type<Space, int* * [N2], int**, LayoutSub, Layout,
+                               LayoutOrg, MemTraits>();
 
-  test_2d_subview_3d_impl_type< Space, int***         , int[N1][N2], LayoutSub, Layout, LayoutOrg, MemTraits >();
-  test_2d_subview_3d_impl_type< Space, int***         , int*   [N2], LayoutSub, Layout, LayoutOrg, MemTraits >();
-  test_2d_subview_3d_impl_type< Space, int***         , int**      , LayoutSub, Layout, LayoutOrg, MemTraits >();
+  test_2d_subview_3d_impl_type<Space, int***, int[N1][N2], LayoutSub, Layout,
+                               LayoutOrg, MemTraits>();
+  test_2d_subview_3d_impl_type<Space, int***, int * [N2], LayoutSub, Layout,
+                               LayoutOrg, MemTraits>();
+  test_2d_subview_3d_impl_type<Space, int***, int**, LayoutSub, Layout,
+                               LayoutOrg, MemTraits>();
 
-  test_2d_subview_3d_impl_type< Space, const int[N0][N1][N2], const int[N1][N2], LayoutSub, Layout, LayoutOrg, MemTraits >();
-  test_2d_subview_3d_impl_type< Space, const int[N0][N1][N2], const int*   [N2], LayoutSub, Layout, LayoutOrg, MemTraits >();
-  test_2d_subview_3d_impl_type< Space, const int[N0][N1][N2], const int**      , LayoutSub, Layout, LayoutOrg, MemTraits >();
+  test_2d_subview_3d_impl_type<Space, const int[N0][N1][N2], const int[N1][N2],
+                               LayoutSub, Layout, LayoutOrg, MemTraits>();
+  test_2d_subview_3d_impl_type<Space, const int[N0][N1][N2], const int * [N2],
+                               LayoutSub, Layout, LayoutOrg, MemTraits>();
+  test_2d_subview_3d_impl_type<Space, const int[N0][N1][N2], const int**,
+                               LayoutSub, Layout, LayoutOrg, MemTraits>();
 
-  test_2d_subview_3d_impl_type< Space, const int*   [N1][N2], const int[N1][N2], LayoutSub, Layout, LayoutOrg, MemTraits >();
-  test_2d_subview_3d_impl_type< Space, const int*   [N1][N2], const int*   [N2], LayoutSub, Layout, LayoutOrg, MemTraits >();
-  test_2d_subview_3d_impl_type< Space, const int*   [N1][N2], const int**      , LayoutSub, Layout, LayoutOrg, MemTraits >();
+  test_2d_subview_3d_impl_type<Space, const int * [N1][N2], const int[N1][N2],
+                               LayoutSub, Layout, LayoutOrg, MemTraits>();
+  test_2d_subview_3d_impl_type<Space, const int * [N1][N2], const int * [N2],
+                               LayoutSub, Layout, LayoutOrg, MemTraits>();
+  test_2d_subview_3d_impl_type<Space, const int * [N1][N2], const int**,
+                               LayoutSub, Layout, LayoutOrg, MemTraits>();
 
-  test_2d_subview_3d_impl_type< Space, const int**      [N2], const int[N1][N2], LayoutSub, Layout, LayoutOrg, MemTraits >();
-  test_2d_subview_3d_impl_type< Space, const int**      [N2], const int*   [N2], LayoutSub, Layout, LayoutOrg, MemTraits >();
-  test_2d_subview_3d_impl_type< Space, const int**      [N2], const int**      , LayoutSub, Layout, LayoutOrg, MemTraits >();
+  test_2d_subview_3d_impl_type<Space, const int* * [N2], const int[N1][N2],
+                               LayoutSub, Layout, LayoutOrg, MemTraits>();
+  test_2d_subview_3d_impl_type<Space, const int* * [N2], const int * [N2],
+                               LayoutSub, Layout, LayoutOrg, MemTraits>();
+  test_2d_subview_3d_impl_type<Space, const int* * [N2], const int**, LayoutSub,
+                               Layout, LayoutOrg, MemTraits>();
 
-  test_2d_subview_3d_impl_type< Space, const int***         , const int[N1][N2], LayoutSub, Layout, LayoutOrg, MemTraits >();
-  test_2d_subview_3d_impl_type< Space, const int***         , const int*   [N2], LayoutSub, Layout, LayoutOrg, MemTraits >();
-  test_2d_subview_3d_impl_type< Space, const int***         , const int**      , LayoutSub, Layout, LayoutOrg, MemTraits >();
+  test_2d_subview_3d_impl_type<Space, const int***, const int[N1][N2],
+                               LayoutSub, Layout, LayoutOrg, MemTraits>();
+  test_2d_subview_3d_impl_type<Space, const int***, const int * [N2], LayoutSub,
+                               Layout, LayoutOrg, MemTraits>();
+  test_2d_subview_3d_impl_type<Space, const int***, const int**, LayoutSub,
+                               Layout, LayoutOrg, MemTraits>();
 }
 
-template< class Space, class Type, class TypeSub, class LayoutSub, class Layout, class LayoutOrg, class MemTraits >
+template <class Space, class Type, class TypeSub, class LayoutSub, class Layout,
+          class LayoutOrg, class MemTraits>
 void test_3d_subview_5d_impl_type() {
-  Kokkos::View< int*****, LayoutOrg, Space > a_org( "A", N0, N1, N2, N3, N4 );
-  Kokkos::View< Type, Layout, Space, MemTraits > a( a_org );
+  Kokkos::View<int*****, LayoutOrg, Space> a_org("A", N0, N1, N2, N3, N4);
+  Kokkos::View<Type, Layout, Space, MemTraits> a(a_org);
 
-  for ( int i0 = 0; i0 < N0; i0++ )
-  for ( int i1 = 0; i1 < N1; i1++ )
-  for ( int i2 = 0; i2 < N2; i2++ )
-  for ( int i3 = 0; i3 < N3; i3++ )
-  for ( int i4 = 0; i4 < N4; i4++ )
-  {
-    a_org( i0, i1, i2, i3, i4 ) = i0 * 1000000 + i1 * 10000 + i2 * 100 + i3 * 10 + i4;
-  }
+  for (int i0 = 0; i0 < N0; i0++)
+    for (int i1 = 0; i1 < N1; i1++)
+      for (int i2 = 0; i2 < N2; i2++)
+        for (int i3 = 0; i3 < N3; i3++)
+          for (int i4 = 0; i4 < N4; i4++) {
+            a_org(i0, i1, i2, i3, i4) =
+                i0 * 1000000 + i1 * 10000 + i2 * 100 + i3 * 10 + i4;
+          }
 
-  Kokkos::View< TypeSub, LayoutSub, Space, MemTraits > a1;
-  a1 = Kokkos::subview( a, 3, 5, Kokkos::ALL, Kokkos::ALL, Kokkos::ALL );
+  Kokkos::View<TypeSub, LayoutSub, Space, MemTraits> a1;
+  a1 = Kokkos::subview(a, 3, 5, Kokkos::ALL, Kokkos::ALL, Kokkos::ALL);
   Kokkos::fence();
-  test_Check3D5D( a1, a, 3, 5, std::pair< int, int >( 0, N2 ), std::pair< int, int >( 0, N3 ), std::pair< int, int >( 0, N4 ) );
+  test_Check3D5D(a1, a, 3, 5, std::pair<int, int>(0, N2),
+                 std::pair<int, int>(0, N3), std::pair<int, int>(0, N4));
 
-  Kokkos::View< TypeSub, LayoutSub, Space, MemTraits > a2( a, 3, 5, Kokkos::ALL, Kokkos::ALL, Kokkos::ALL );
+  Kokkos::View<TypeSub, LayoutSub, Space, MemTraits> a2(
+      a, 3, 5, Kokkos::ALL, Kokkos::ALL, Kokkos::ALL);
   Kokkos::fence();
-  test_Check3D5D( a2, a, 3, 5, std::pair< int, int >( 0, N2 ), std::pair< int, int >( 0, N3 ), std::pair< int, int >( 0, N4 ) );
+  test_Check3D5D(a2, a, 3, 5, std::pair<int, int>(0, N2),
+                 std::pair<int, int>(0, N3), std::pair<int, int>(0, N4));
 }
 
-template< class Space, class LayoutSub, class Layout, class LayoutOrg, class MemTraits >
+template <class Space, class LayoutSub, class Layout, class LayoutOrg,
+          class MemTraits>
 void test_3d_subview_5d_impl_layout() {
-  test_3d_subview_5d_impl_type< Space, int[N0][N1][N2][N3][N4], int[N2][N3][N4], LayoutSub, Layout, LayoutOrg, MemTraits >();
-  test_3d_subview_5d_impl_type< Space, int[N0][N1][N2][N3][N4], int*   [N3][N4], LayoutSub, Layout, LayoutOrg, MemTraits >();
-  test_3d_subview_5d_impl_type< Space, int[N0][N1][N2][N3][N4], int**      [N4], LayoutSub, Layout, LayoutOrg, MemTraits >();
-  test_3d_subview_5d_impl_type< Space, int[N0][N1][N2][N3][N4], int***         , LayoutSub, Layout, LayoutOrg, MemTraits >();
+  test_3d_subview_5d_impl_type<Space, int[N0][N1][N2][N3][N4], int[N2][N3][N4],
+                               LayoutSub, Layout, LayoutOrg, MemTraits>();
+  test_3d_subview_5d_impl_type<Space, int[N0][N1][N2][N3][N4], int * [N3][N4],
+                               LayoutSub, Layout, LayoutOrg, MemTraits>();
+  test_3d_subview_5d_impl_type<Space, int[N0][N1][N2][N3][N4], int* * [N4],
+                               LayoutSub, Layout, LayoutOrg, MemTraits>();
+  test_3d_subview_5d_impl_type<Space, int[N0][N1][N2][N3][N4], int***,
+                               LayoutSub, Layout, LayoutOrg, MemTraits>();
 
-  test_3d_subview_5d_impl_type< Space, int*   [N1][N2][N3][N4], int[N2][N3][N4], LayoutSub, Layout, LayoutOrg, MemTraits >();
-  test_3d_subview_5d_impl_type< Space, int*   [N1][N2][N3][N4], int*   [N3][N4], LayoutSub, Layout, LayoutOrg, MemTraits >();
-  test_3d_subview_5d_impl_type< Space, int*   [N1][N2][N3][N4], int**      [N4], LayoutSub, Layout, LayoutOrg, MemTraits >();
-  test_3d_subview_5d_impl_type< Space, int*   [N1][N2][N3][N4], int***         , LayoutSub, Layout, LayoutOrg, MemTraits >();
+  test_3d_subview_5d_impl_type<Space, int * [N1][N2][N3][N4], int[N2][N3][N4],
+                               LayoutSub, Layout, LayoutOrg, MemTraits>();
+  test_3d_subview_5d_impl_type<Space, int * [N1][N2][N3][N4], int * [N3][N4],
+                               LayoutSub, Layout, LayoutOrg, MemTraits>();
+  test_3d_subview_5d_impl_type<Space, int * [N1][N2][N3][N4], int* * [N4],
+                               LayoutSub, Layout, LayoutOrg, MemTraits>();
+  test_3d_subview_5d_impl_type<Space, int * [N1][N2][N3][N4], int***, LayoutSub,
+                               Layout, LayoutOrg, MemTraits>();
 
-  test_3d_subview_5d_impl_type< Space, int**      [N2][N3][N4], int[N2][N3][N4], LayoutSub, Layout, LayoutOrg, MemTraits >();
-  test_3d_subview_5d_impl_type< Space, int**      [N2][N3][N4], int*   [N3][N4], LayoutSub, Layout, LayoutOrg, MemTraits >();
-  test_3d_subview_5d_impl_type< Space, int**      [N2][N3][N4], int**      [N4], LayoutSub, Layout, LayoutOrg, MemTraits >();
-  test_3d_subview_5d_impl_type< Space, int**      [N2][N3][N4], int***         , LayoutSub, Layout, LayoutOrg, MemTraits >();
+  test_3d_subview_5d_impl_type<Space, int* * [N2][N3][N4], int[N2][N3][N4],
+                               LayoutSub, Layout, LayoutOrg, MemTraits>();
+  test_3d_subview_5d_impl_type<Space, int* * [N2][N3][N4], int * [N3][N4],
+                               LayoutSub, Layout, LayoutOrg, MemTraits>();
+  test_3d_subview_5d_impl_type<Space, int* * [N2][N3][N4], int* * [N4],
+                               LayoutSub, Layout, LayoutOrg, MemTraits>();
+  test_3d_subview_5d_impl_type<Space, int* * [N2][N3][N4], int***, LayoutSub,
+                               Layout, LayoutOrg, MemTraits>();
 
-  test_3d_subview_5d_impl_type< Space, int***         [N3][N4], int[N2][N3][N4], LayoutSub, Layout, LayoutOrg, MemTraits >();
-  test_3d_subview_5d_impl_type< Space, int***         [N3][N4], int*   [N3][N4], LayoutSub, Layout, LayoutOrg, MemTraits >();
-  test_3d_subview_5d_impl_type< Space, int***         [N3][N4], int**      [N4], LayoutSub, Layout, LayoutOrg, MemTraits >();
-  test_3d_subview_5d_impl_type< Space, int***         [N3][N4], int***         , LayoutSub, Layout, LayoutOrg, MemTraits >();
+  test_3d_subview_5d_impl_type<Space, int** * [N3][N4], int[N2][N3][N4],
+                               LayoutSub, Layout, LayoutOrg, MemTraits>();
+  test_3d_subview_5d_impl_type<Space, int** * [N3][N4], int * [N3][N4],
+                               LayoutSub, Layout, LayoutOrg, MemTraits>();
+  test_3d_subview_5d_impl_type<Space, int** * [N3][N4], int* * [N4], LayoutSub,
+                               Layout, LayoutOrg, MemTraits>();
+  test_3d_subview_5d_impl_type<Space, int** * [N3][N4], int***, LayoutSub,
+                               Layout, LayoutOrg, MemTraits>();
 
-  test_3d_subview_5d_impl_type< Space, int****            [N4], int[N2][N3][N4], LayoutSub, Layout, LayoutOrg, MemTraits >();
-  test_3d_subview_5d_impl_type< Space, int****            [N4], int*   [N3][N4], LayoutSub, Layout, LayoutOrg, MemTraits >();
-  test_3d_subview_5d_impl_type< Space, int****            [N4], int**      [N4], LayoutSub, Layout, LayoutOrg, MemTraits >();
-  test_3d_subview_5d_impl_type< Space, int****            [N4], int***         , LayoutSub, Layout, LayoutOrg, MemTraits >();
+  test_3d_subview_5d_impl_type<Space, int*** * [N4], int[N2][N3][N4], LayoutSub,
+                               Layout, LayoutOrg, MemTraits>();
+  test_3d_subview_5d_impl_type<Space, int*** * [N4], int * [N3][N4], LayoutSub,
+                               Layout, LayoutOrg, MemTraits>();
+  test_3d_subview_5d_impl_type<Space, int*** * [N4], int* * [N4], LayoutSub,
+                               Layout, LayoutOrg, MemTraits>();
+  test_3d_subview_5d_impl_type<Space, int*** * [N4], int***, LayoutSub, Layout,
+                               LayoutOrg, MemTraits>();
 
-  test_3d_subview_5d_impl_type< Space, int*****               , int[N2][N3][N4], LayoutSub, Layout, LayoutOrg, MemTraits >();
-  test_3d_subview_5d_impl_type< Space, int*****               , int*   [N3][N4], LayoutSub, Layout, LayoutOrg, MemTraits >();
-  test_3d_subview_5d_impl_type< Space, int*****               , int**      [N4], LayoutSub, Layout, LayoutOrg, MemTraits >();
-  test_3d_subview_5d_impl_type< Space, int*****               , int***         , LayoutSub, Layout, LayoutOrg, MemTraits >();
+  test_3d_subview_5d_impl_type<Space, int*****, int[N2][N3][N4], LayoutSub,
+                               Layout, LayoutOrg, MemTraits>();
+  test_3d_subview_5d_impl_type<Space, int*****, int * [N3][N4], LayoutSub,
+                               Layout, LayoutOrg, MemTraits>();
+  test_3d_subview_5d_impl_type<Space, int*****, int* * [N4], LayoutSub, Layout,
+                               LayoutOrg, MemTraits>();
+  test_3d_subview_5d_impl_type<Space, int*****, int***, LayoutSub, Layout,
+                               LayoutOrg, MemTraits>();
 
-  test_3d_subview_5d_impl_type< Space, const int[N0][N1][N2][N3][N4], const int[N2][N3][N4], LayoutSub, Layout, LayoutOrg, MemTraits >();
-  test_3d_subview_5d_impl_type< Space, const int[N0][N1][N2][N3][N4], const int*   [N3][N4], LayoutSub, Layout, LayoutOrg, MemTraits >();
-  test_3d_subview_5d_impl_type< Space, const int[N0][N1][N2][N3][N4], const int**      [N4], LayoutSub, Layout, LayoutOrg, MemTraits >();
-  test_3d_subview_5d_impl_type< Space, const int[N0][N1][N2][N3][N4], const int***         , LayoutSub, Layout, LayoutOrg, MemTraits >();
+  test_3d_subview_5d_impl_type<Space, const int[N0][N1][N2][N3][N4],
+                               const int[N2][N3][N4], LayoutSub, Layout,
+                               LayoutOrg, MemTraits>();
+  test_3d_subview_5d_impl_type<Space, const int[N0][N1][N2][N3][N4],
+                               const int * [N3][N4], LayoutSub, Layout,
+                               LayoutOrg, MemTraits>();
+  test_3d_subview_5d_impl_type<Space, const int[N0][N1][N2][N3][N4],
+                               const int* * [N4], LayoutSub, Layout, LayoutOrg,
+                               MemTraits>();
+  test_3d_subview_5d_impl_type<Space, const int[N0][N1][N2][N3][N4],
+                               const int***, LayoutSub, Layout, LayoutOrg,
+                               MemTraits>();
 
-  test_3d_subview_5d_impl_type< Space, const int*   [N1][N2][N3][N4], const int[N2][N3][N4], LayoutSub, Layout, LayoutOrg, MemTraits >();
-  test_3d_subview_5d_impl_type< Space, const int*   [N1][N2][N3][N4], const int*   [N3][N4], LayoutSub, Layout, LayoutOrg, MemTraits >();
-  test_3d_subview_5d_impl_type< Space, const int*   [N1][N2][N3][N4], const int**      [N4], LayoutSub, Layout, LayoutOrg, MemTraits >();
-  test_3d_subview_5d_impl_type< Space, const int*   [N1][N2][N3][N4], const int***         , LayoutSub, Layout, LayoutOrg, MemTraits >();
+  test_3d_subview_5d_impl_type<Space, const int * [N1][N2][N3][N4],
+                               const int[N2][N3][N4], LayoutSub, Layout,
+                               LayoutOrg, MemTraits>();
+  test_3d_subview_5d_impl_type<Space, const int * [N1][N2][N3][N4],
+                               const int * [N3][N4], LayoutSub, Layout,
+                               LayoutOrg, MemTraits>();
+  test_3d_subview_5d_impl_type<Space, const int * [N1][N2][N3][N4],
+                               const int* * [N4], LayoutSub, Layout, LayoutOrg,
+                               MemTraits>();
+  test_3d_subview_5d_impl_type<Space, const int * [N1][N2][N3][N4],
+                               const int***, LayoutSub, Layout, LayoutOrg,
+                               MemTraits>();
 
-  test_3d_subview_5d_impl_type< Space, const int**      [N2][N3][N4], const int[N2][N3][N4], LayoutSub, Layout, LayoutOrg, MemTraits >();
-  test_3d_subview_5d_impl_type< Space, const int**      [N2][N3][N4], const int*   [N3][N4], LayoutSub, Layout, LayoutOrg, MemTraits >();
-  test_3d_subview_5d_impl_type< Space, const int**      [N2][N3][N4], const int**      [N4], LayoutSub, Layout, LayoutOrg, MemTraits >();
-  test_3d_subview_5d_impl_type< Space, const int**      [N2][N3][N4], const int***         , LayoutSub, Layout, LayoutOrg, MemTraits >();
+  test_3d_subview_5d_impl_type<Space, const int* * [N2][N3][N4],
+                               const int[N2][N3][N4], LayoutSub, Layout,
+                               LayoutOrg, MemTraits>();
+  test_3d_subview_5d_impl_type<Space, const int* * [N2][N3][N4],
+                               const int * [N3][N4], LayoutSub, Layout,
+                               LayoutOrg, MemTraits>();
+  test_3d_subview_5d_impl_type<Space, const int* * [N2][N3][N4],
+                               const int* * [N4], LayoutSub, Layout, LayoutOrg,
+                               MemTraits>();
+  test_3d_subview_5d_impl_type<Space, const int* * [N2][N3][N4], const int***,
+                               LayoutSub, Layout, LayoutOrg, MemTraits>();
 
-  test_3d_subview_5d_impl_type< Space, const int***         [N3][N4], const int[N2][N3][N4], LayoutSub, Layout, LayoutOrg, MemTraits >();
-  test_3d_subview_5d_impl_type< Space, const int***         [N3][N4], const int*   [N3][N4], LayoutSub, Layout, LayoutOrg, MemTraits >();
-  test_3d_subview_5d_impl_type< Space, const int***         [N3][N4], const int**      [N4], LayoutSub, Layout, LayoutOrg, MemTraits >();
-  test_3d_subview_5d_impl_type< Space, const int***         [N3][N4], const int***         , LayoutSub, Layout, LayoutOrg, MemTraits >();
+  test_3d_subview_5d_impl_type<Space, const int** * [N3][N4],
+                               const int[N2][N3][N4], LayoutSub, Layout,
+                               LayoutOrg, MemTraits>();
+  test_3d_subview_5d_impl_type<Space, const int** * [N3][N4],
+                               const int * [N3][N4], LayoutSub, Layout,
+                               LayoutOrg, MemTraits>();
+  test_3d_subview_5d_impl_type<Space, const int** * [N3][N4], const int* * [N4],
+                               LayoutSub, Layout, LayoutOrg, MemTraits>();
+  test_3d_subview_5d_impl_type<Space, const int** * [N3][N4], const int***,
+                               LayoutSub, Layout, LayoutOrg, MemTraits>();
 
-  test_3d_subview_5d_impl_type< Space, const int****            [N4], const int[N2][N3][N4], LayoutSub, Layout, LayoutOrg, MemTraits >();
-  test_3d_subview_5d_impl_type< Space, const int****            [N4], const int*   [N3][N4], LayoutSub, Layout, LayoutOrg, MemTraits >();
-  test_3d_subview_5d_impl_type< Space, const int****            [N4], const int**      [N4], LayoutSub, Layout, LayoutOrg, MemTraits >();
-  test_3d_subview_5d_impl_type< Space, const int****            [N4], const int***         , LayoutSub, Layout, LayoutOrg, MemTraits >();
+  test_3d_subview_5d_impl_type<Space, const int*** * [N4],
+                               const int[N2][N3][N4], LayoutSub, Layout,
+                               LayoutOrg, MemTraits>();
+  test_3d_subview_5d_impl_type<Space, const int*** * [N4], const int * [N3][N4],
+                               LayoutSub, Layout, LayoutOrg, MemTraits>();
+  test_3d_subview_5d_impl_type<Space, const int*** * [N4], const int* * [N4],
+                               LayoutSub, Layout, LayoutOrg, MemTraits>();
+  test_3d_subview_5d_impl_type<Space, const int*** * [N4], const int***,
+                               LayoutSub, Layout, LayoutOrg, MemTraits>();
 
-  test_3d_subview_5d_impl_type< Space, const int*****               , const int[N2][N3][N4], LayoutSub, Layout, LayoutOrg, MemTraits >();
-  test_3d_subview_5d_impl_type< Space, const int*****               , const int*   [N3][N4], LayoutSub, Layout, LayoutOrg, MemTraits >();
-  test_3d_subview_5d_impl_type< Space, const int*****               , const int**      [N4], LayoutSub, Layout, LayoutOrg, MemTraits >();
-  test_3d_subview_5d_impl_type< Space, const int*****               , const int***         , LayoutSub, Layout, LayoutOrg, MemTraits >();
+  test_3d_subview_5d_impl_type<Space, const int*****, const int[N2][N3][N4],
+                               LayoutSub, Layout, LayoutOrg, MemTraits>();
+  test_3d_subview_5d_impl_type<Space, const int*****, const int * [N3][N4],
+                               LayoutSub, Layout, LayoutOrg, MemTraits>();
+  test_3d_subview_5d_impl_type<Space, const int*****, const int* * [N4],
+                               LayoutSub, Layout, LayoutOrg, MemTraits>();
+  test_3d_subview_5d_impl_type<Space, const int*****, const int***, LayoutSub,
+                               Layout, LayoutOrg, MemTraits>();
 }
 
-inline
-void test_subview_legal_args_right() {
-  ASSERT_EQ( 0, ( Kokkos::Impl::SubviewLegalArgsCompileTime< Kokkos::LayoutRight, Kokkos::LayoutRight, 3, 5, 0, Kokkos::Impl::ALL_t, Kokkos::Impl::ALL_t, Kokkos::pair<int, int>, int, int >::value ) );
-  ASSERT_EQ( 0, ( Kokkos::Impl::SubviewLegalArgsCompileTime< Kokkos::LayoutRight, Kokkos::LayoutRight, 3, 5, 0, Kokkos::Impl::ALL_t, Kokkos::Impl::ALL_t, Kokkos::Impl::ALL_t, int, int >::value ) );
-  ASSERT_EQ( 0, ( Kokkos::Impl::SubviewLegalArgsCompileTime< Kokkos::LayoutRight, Kokkos::LayoutRight, 3, 5, 0, Kokkos::Impl::ALL_t, Kokkos::pair<int, int>, Kokkos::pair<int, int>, int, int >::value ) );
-  ASSERT_EQ( 0, ( Kokkos::Impl::SubviewLegalArgsCompileTime< Kokkos::LayoutRight, Kokkos::LayoutRight, 3, 5, 0, Kokkos::Impl::ALL_t, Kokkos::pair<int, int>, Kokkos::Impl::ALL_t, int, int >::value ) );
-  ASSERT_EQ( 0, ( Kokkos::Impl::SubviewLegalArgsCompileTime< Kokkos::LayoutRight, Kokkos::LayoutRight, 3, 5, 0, Kokkos::pair<int, int>, Kokkos::Impl::ALL_t, Kokkos::pair<int, int>, int, int >::value ) );
-  ASSERT_EQ( 0, ( Kokkos::Impl::SubviewLegalArgsCompileTime< Kokkos::LayoutRight, Kokkos::LayoutRight, 3, 5, 0, Kokkos::pair<int, int>, Kokkos::Impl::ALL_t, Kokkos::Impl::ALL_t, int, int >::value ) );
-  ASSERT_EQ( 0, ( Kokkos::Impl::SubviewLegalArgsCompileTime< Kokkos::LayoutRight, Kokkos::LayoutRight, 3, 5, 0, Kokkos::pair<int, int>, Kokkos::pair<int, int>, Kokkos::pair<int, int>, int, int >::value ) );
-  ASSERT_EQ( 0, ( Kokkos::Impl::SubviewLegalArgsCompileTime< Kokkos::LayoutRight, Kokkos::LayoutRight, 3, 5, 0, Kokkos::pair<int, int>, Kokkos::pair<int, int>, Kokkos::Impl::ALL_t, int, int >::value ) );
+inline void test_subview_legal_args_right() {
+  ASSERT_EQ(0, (Kokkos::Impl::SubviewLegalArgsCompileTime<
+                   Kokkos::LayoutRight, Kokkos::LayoutRight, 3, 5, 0,
+                   Kokkos::Impl::ALL_t, Kokkos::Impl::ALL_t,
+                   Kokkos::pair<int, int>, int, int>::value));
+  ASSERT_EQ(0, (Kokkos::Impl::SubviewLegalArgsCompileTime<
+                   Kokkos::LayoutRight, Kokkos::LayoutRight, 3, 5, 0,
+                   Kokkos::Impl::ALL_t, Kokkos::Impl::ALL_t,
+                   Kokkos::Impl::ALL_t, int, int>::value));
+  ASSERT_EQ(0, (Kokkos::Impl::SubviewLegalArgsCompileTime<
+                   Kokkos::LayoutRight, Kokkos::LayoutRight, 3, 5, 0,
+                   Kokkos::Impl::ALL_t, Kokkos::pair<int, int>,
+                   Kokkos::pair<int, int>, int, int>::value));
+  ASSERT_EQ(0, (Kokkos::Impl::SubviewLegalArgsCompileTime<
+                   Kokkos::LayoutRight, Kokkos::LayoutRight, 3, 5, 0,
+                   Kokkos::Impl::ALL_t, Kokkos::pair<int, int>,
+                   Kokkos::Impl::ALL_t, int, int>::value));
+  ASSERT_EQ(0, (Kokkos::Impl::SubviewLegalArgsCompileTime<
+                   Kokkos::LayoutRight, Kokkos::LayoutRight, 3, 5, 0,
+                   Kokkos::pair<int, int>, Kokkos::Impl::ALL_t,
+                   Kokkos::pair<int, int>, int, int>::value));
+  ASSERT_EQ(0, (Kokkos::Impl::SubviewLegalArgsCompileTime<
+                   Kokkos::LayoutRight, Kokkos::LayoutRight, 3, 5, 0,
+                   Kokkos::pair<int, int>, Kokkos::Impl::ALL_t,
+                   Kokkos::Impl::ALL_t, int, int>::value));
+  ASSERT_EQ(0, (Kokkos::Impl::SubviewLegalArgsCompileTime<
+                   Kokkos::LayoutRight, Kokkos::LayoutRight, 3, 5, 0,
+                   Kokkos::pair<int, int>, Kokkos::pair<int, int>,
+                   Kokkos::pair<int, int>, int, int>::value));
+  ASSERT_EQ(0, (Kokkos::Impl::SubviewLegalArgsCompileTime<
+                   Kokkos::LayoutRight, Kokkos::LayoutRight, 3, 5, 0,
+                   Kokkos::pair<int, int>, Kokkos::pair<int, int>,
+                   Kokkos::Impl::ALL_t, int, int>::value));
 
-  ASSERT_EQ( 0, ( Kokkos::Impl::SubviewLegalArgsCompileTime< Kokkos::LayoutRight, Kokkos::LayoutRight, 3, 5, 0, Kokkos::Impl::ALL_t, int, Kokkos::Impl::ALL_t, Kokkos::pair<int, int>, int >::value ) );
-  ASSERT_EQ( 0, ( Kokkos::Impl::SubviewLegalArgsCompileTime< Kokkos::LayoutRight, Kokkos::LayoutRight, 3, 5, 0, Kokkos::Impl::ALL_t, int, Kokkos::Impl::ALL_t, Kokkos::Impl::ALL_t, int >::value ) );
-  ASSERT_EQ( 0, ( Kokkos::Impl::SubviewLegalArgsCompileTime< Kokkos::LayoutRight, Kokkos::LayoutRight, 3, 5, 0, Kokkos::Impl::ALL_t, int, Kokkos::pair<int, int>, Kokkos::pair<int, int>, int >::value ) );
-  ASSERT_EQ( 0, ( Kokkos::Impl::SubviewLegalArgsCompileTime< Kokkos::LayoutRight, Kokkos::LayoutRight, 3, 5, 0, Kokkos::Impl::ALL_t, int, Kokkos::pair<int, int>, Kokkos::Impl::ALL_t, int >::value ) );
-  ASSERT_EQ( 0, ( Kokkos::Impl::SubviewLegalArgsCompileTime< Kokkos::LayoutRight, Kokkos::LayoutRight, 3, 5, 0, Kokkos::pair<int, int>, int, Kokkos::Impl::ALL_t, Kokkos::pair<int, int>, int >::value ) );
-  ASSERT_EQ( 0, ( Kokkos::Impl::SubviewLegalArgsCompileTime< Kokkos::LayoutRight, Kokkos::LayoutRight, 3, 5, 0, Kokkos::pair<int, int>, int, Kokkos::Impl::ALL_t, Kokkos::Impl::ALL_t, int >::value ) );
-  ASSERT_EQ( 0, ( Kokkos::Impl::SubviewLegalArgsCompileTime< Kokkos::LayoutRight, Kokkos::LayoutRight, 3, 5, 0, Kokkos::pair<int, int>, int, Kokkos::pair<int, int>, Kokkos::pair<int, int>, int >::value ) );
-  ASSERT_EQ( 0, ( Kokkos::Impl::SubviewLegalArgsCompileTime< Kokkos::LayoutRight, Kokkos::LayoutRight, 3, 5, 0, Kokkos::pair<int, int>, int, Kokkos::Impl::ALL_t, Kokkos::pair<int, int>, int >::value ) );
+  ASSERT_EQ(0, (Kokkos::Impl::SubviewLegalArgsCompileTime<
+                   Kokkos::LayoutRight, Kokkos::LayoutRight, 3, 5, 0,
+                   Kokkos::Impl::ALL_t, int, Kokkos::Impl::ALL_t,
+                   Kokkos::pair<int, int>, int>::value));
+  ASSERT_EQ(0, (Kokkos::Impl::SubviewLegalArgsCompileTime<
+                   Kokkos::LayoutRight, Kokkos::LayoutRight, 3, 5, 0,
+                   Kokkos::Impl::ALL_t, int, Kokkos::Impl::ALL_t,
+                   Kokkos::Impl::ALL_t, int>::value));
+  ASSERT_EQ(0, (Kokkos::Impl::SubviewLegalArgsCompileTime<
+                   Kokkos::LayoutRight, Kokkos::LayoutRight, 3, 5, 0,
+                   Kokkos::Impl::ALL_t, int, Kokkos::pair<int, int>,
+                   Kokkos::pair<int, int>, int>::value));
+  ASSERT_EQ(0, (Kokkos::Impl::SubviewLegalArgsCompileTime<
+                   Kokkos::LayoutRight, Kokkos::LayoutRight, 3, 5, 0,
+                   Kokkos::Impl::ALL_t, int, Kokkos::pair<int, int>,
+                   Kokkos::Impl::ALL_t, int>::value));
+  ASSERT_EQ(0, (Kokkos::Impl::SubviewLegalArgsCompileTime<
+                   Kokkos::LayoutRight, Kokkos::LayoutRight, 3, 5, 0,
+                   Kokkos::pair<int, int>, int, Kokkos::Impl::ALL_t,
+                   Kokkos::pair<int, int>, int>::value));
+  ASSERT_EQ(0, (Kokkos::Impl::SubviewLegalArgsCompileTime<
+                   Kokkos::LayoutRight, Kokkos::LayoutRight, 3, 5, 0,
+                   Kokkos::pair<int, int>, int, Kokkos::Impl::ALL_t,
+                   Kokkos::Impl::ALL_t, int>::value));
+  ASSERT_EQ(0, (Kokkos::Impl::SubviewLegalArgsCompileTime<
+                   Kokkos::LayoutRight, Kokkos::LayoutRight, 3, 5, 0,
+                   Kokkos::pair<int, int>, int, Kokkos::pair<int, int>,
+                   Kokkos::pair<int, int>, int>::value));
+  ASSERT_EQ(0, (Kokkos::Impl::SubviewLegalArgsCompileTime<
+                   Kokkos::LayoutRight, Kokkos::LayoutRight, 3, 5, 0,
+                   Kokkos::pair<int, int>, int, Kokkos::Impl::ALL_t,
+                   Kokkos::pair<int, int>, int>::value));
 
-  ASSERT_EQ( 0, ( Kokkos::Impl::SubviewLegalArgsCompileTime< Kokkos::LayoutRight, Kokkos::LayoutRight, 3, 5, 0, Kokkos::Impl::ALL_t, Kokkos::Impl::ALL_t, int, Kokkos::pair<int, int>, int >::value ) );
-  ASSERT_EQ( 0, ( Kokkos::Impl::SubviewLegalArgsCompileTime< Kokkos::LayoutRight, Kokkos::LayoutRight, 3, 5, 0, Kokkos::Impl::ALL_t, Kokkos::Impl::ALL_t, int, Kokkos::Impl::ALL_t, int >::value ) );
-  ASSERT_EQ( 0, ( Kokkos::Impl::SubviewLegalArgsCompileTime< Kokkos::LayoutRight, Kokkos::LayoutRight, 3, 5, 0, Kokkos::Impl::ALL_t, Kokkos::pair<int, int>, int, Kokkos::pair<int, int>, int >::value ) );
-  ASSERT_EQ( 0, ( Kokkos::Impl::SubviewLegalArgsCompileTime< Kokkos::LayoutRight, Kokkos::LayoutRight, 3, 5, 0, Kokkos::Impl::ALL_t, Kokkos::pair<int, int>, int, Kokkos::Impl::ALL_t, int >::value ) );
-  ASSERT_EQ( 0, ( Kokkos::Impl::SubviewLegalArgsCompileTime< Kokkos::LayoutRight, Kokkos::LayoutRight, 3, 5, 0, Kokkos::pair<int, int>, Kokkos::Impl::ALL_t, int, Kokkos::pair<int, int>, int >::value ) );
-  ASSERT_EQ( 0, ( Kokkos::Impl::SubviewLegalArgsCompileTime< Kokkos::LayoutRight, Kokkos::LayoutRight, 3, 5, 0, Kokkos::pair<int, int>, Kokkos::Impl::ALL_t, int, Kokkos::Impl::ALL_t, int >::value ) );
-  ASSERT_EQ( 0, ( Kokkos::Impl::SubviewLegalArgsCompileTime< Kokkos::LayoutRight, Kokkos::LayoutRight, 3, 5, 0, Kokkos::pair<int, int>, Kokkos::pair<int, int>, int, Kokkos::pair<int, int>, int >::value ) );
-  ASSERT_EQ( 0, ( Kokkos::Impl::SubviewLegalArgsCompileTime< Kokkos::LayoutRight, Kokkos::LayoutRight, 3, 5, 0, Kokkos::pair<int, int>, Kokkos::Impl::ALL_t, int, Kokkos::pair<int, int>, int >::value ) );
+  ASSERT_EQ(0, (Kokkos::Impl::SubviewLegalArgsCompileTime<
+                   Kokkos::LayoutRight, Kokkos::LayoutRight, 3, 5, 0,
+                   Kokkos::Impl::ALL_t, Kokkos::Impl::ALL_t, int,
+                   Kokkos::pair<int, int>, int>::value));
+  ASSERT_EQ(0, (Kokkos::Impl::SubviewLegalArgsCompileTime<
+                   Kokkos::LayoutRight, Kokkos::LayoutRight, 3, 5, 0,
+                   Kokkos::Impl::ALL_t, Kokkos::Impl::ALL_t, int,
+                   Kokkos::Impl::ALL_t, int>::value));
+  ASSERT_EQ(0, (Kokkos::Impl::SubviewLegalArgsCompileTime<
+                   Kokkos::LayoutRight, Kokkos::LayoutRight, 3, 5, 0,
+                   Kokkos::Impl::ALL_t, Kokkos::pair<int, int>, int,
+                   Kokkos::pair<int, int>, int>::value));
+  ASSERT_EQ(0, (Kokkos::Impl::SubviewLegalArgsCompileTime<
+                   Kokkos::LayoutRight, Kokkos::LayoutRight, 3, 5, 0,
+                   Kokkos::Impl::ALL_t, Kokkos::pair<int, int>, int,
+                   Kokkos::Impl::ALL_t, int>::value));
+  ASSERT_EQ(0, (Kokkos::Impl::SubviewLegalArgsCompileTime<
+                   Kokkos::LayoutRight, Kokkos::LayoutRight, 3, 5, 0,
+                   Kokkos::pair<int, int>, Kokkos::Impl::ALL_t, int,
+                   Kokkos::pair<int, int>, int>::value));
+  ASSERT_EQ(0, (Kokkos::Impl::SubviewLegalArgsCompileTime<
+                   Kokkos::LayoutRight, Kokkos::LayoutRight, 3, 5, 0,
+                   Kokkos::pair<int, int>, Kokkos::Impl::ALL_t, int,
+                   Kokkos::Impl::ALL_t, int>::value));
+  ASSERT_EQ(0, (Kokkos::Impl::SubviewLegalArgsCompileTime<
+                   Kokkos::LayoutRight, Kokkos::LayoutRight, 3, 5, 0,
+                   Kokkos::pair<int, int>, Kokkos::pair<int, int>, int,
+                   Kokkos::pair<int, int>, int>::value));
+  ASSERT_EQ(0, (Kokkos::Impl::SubviewLegalArgsCompileTime<
+                   Kokkos::LayoutRight, Kokkos::LayoutRight, 3, 5, 0,
+                   Kokkos::pair<int, int>, Kokkos::Impl::ALL_t, int,
+                   Kokkos::pair<int, int>, int>::value));
 
-  ASSERT_EQ( 0, ( Kokkos::Impl::SubviewLegalArgsCompileTime< Kokkos::LayoutRight, Kokkos::LayoutRight, 3, 5, 0, int, Kokkos::Impl::ALL_t, Kokkos::Impl::ALL_t, Kokkos::pair<int, int>, int >::value ) );
-  ASSERT_EQ( 0, ( Kokkos::Impl::SubviewLegalArgsCompileTime< Kokkos::LayoutRight, Kokkos::LayoutRight, 3, 5, 0, int, Kokkos::Impl::ALL_t, Kokkos::Impl::ALL_t, Kokkos::Impl::ALL_t, int >::value ) );
-  ASSERT_EQ( 0, ( Kokkos::Impl::SubviewLegalArgsCompileTime< Kokkos::LayoutRight, Kokkos::LayoutRight, 3, 5, 0, int, Kokkos::Impl::ALL_t, Kokkos::pair<int, int>, Kokkos::pair<int, int>, int >::value ) );
-  ASSERT_EQ( 0, ( Kokkos::Impl::SubviewLegalArgsCompileTime< Kokkos::LayoutRight, Kokkos::LayoutRight, 3, 5, 0, int, Kokkos::Impl::ALL_t, Kokkos::pair<int, int>, Kokkos::Impl::ALL_t, int >::value ) );
-  ASSERT_EQ( 0, ( Kokkos::Impl::SubviewLegalArgsCompileTime< Kokkos::LayoutRight, Kokkos::LayoutRight, 3, 5, 0, int, Kokkos::pair<int, int>, Kokkos::Impl::ALL_t, Kokkos::pair<int, int>, int >::value ) );
-  ASSERT_EQ( 0, ( Kokkos::Impl::SubviewLegalArgsCompileTime< Kokkos::LayoutRight, Kokkos::LayoutRight, 3, 5, 0, int, Kokkos::pair<int, int>, Kokkos::Impl::ALL_t, Kokkos::Impl::ALL_t, int >::value ) );
-  ASSERT_EQ( 0, ( Kokkos::Impl::SubviewLegalArgsCompileTime< Kokkos::LayoutRight, Kokkos::LayoutRight, 3, 5, 0, int, Kokkos::pair<int, int>, Kokkos::pair<int, int>, Kokkos::pair<int, int>, int >::value ) );
-  ASSERT_EQ( 0, ( Kokkos::Impl::SubviewLegalArgsCompileTime< Kokkos::LayoutRight, Kokkos::LayoutRight, 3, 5, 0, int, Kokkos::pair<int, int>, Kokkos::pair<int, int>, Kokkos::Impl::ALL_t, int >::value ) );
+  ASSERT_EQ(0, (Kokkos::Impl::SubviewLegalArgsCompileTime<
+                   Kokkos::LayoutRight, Kokkos::LayoutRight, 3, 5, 0, int,
+                   Kokkos::Impl::ALL_t, Kokkos::Impl::ALL_t,
+                   Kokkos::pair<int, int>, int>::value));
+  ASSERT_EQ(0, (Kokkos::Impl::SubviewLegalArgsCompileTime<
+                   Kokkos::LayoutRight, Kokkos::LayoutRight, 3, 5, 0, int,
+                   Kokkos::Impl::ALL_t, Kokkos::Impl::ALL_t,
+                   Kokkos::Impl::ALL_t, int>::value));
+  ASSERT_EQ(0, (Kokkos::Impl::SubviewLegalArgsCompileTime<
+                   Kokkos::LayoutRight, Kokkos::LayoutRight, 3, 5, 0, int,
+                   Kokkos::Impl::ALL_t, Kokkos::pair<int, int>,
+                   Kokkos::pair<int, int>, int>::value));
+  ASSERT_EQ(0, (Kokkos::Impl::SubviewLegalArgsCompileTime<
+                   Kokkos::LayoutRight, Kokkos::LayoutRight, 3, 5, 0, int,
+                   Kokkos::Impl::ALL_t, Kokkos::pair<int, int>,
+                   Kokkos::Impl::ALL_t, int>::value));
+  ASSERT_EQ(0, (Kokkos::Impl::SubviewLegalArgsCompileTime<
+                   Kokkos::LayoutRight, Kokkos::LayoutRight, 3, 5, 0, int,
+                   Kokkos::pair<int, int>, Kokkos::Impl::ALL_t,
+                   Kokkos::pair<int, int>, int>::value));
+  ASSERT_EQ(0, (Kokkos::Impl::SubviewLegalArgsCompileTime<
+                   Kokkos::LayoutRight, Kokkos::LayoutRight, 3, 5, 0, int,
+                   Kokkos::pair<int, int>, Kokkos::Impl::ALL_t,
+                   Kokkos::Impl::ALL_t, int>::value));
+  ASSERT_EQ(0, (Kokkos::Impl::SubviewLegalArgsCompileTime<
+                   Kokkos::LayoutRight, Kokkos::LayoutRight, 3, 5, 0, int,
+                   Kokkos::pair<int, int>, Kokkos::pair<int, int>,
+                   Kokkos::pair<int, int>, int>::value));
+  ASSERT_EQ(0, (Kokkos::Impl::SubviewLegalArgsCompileTime<
+                   Kokkos::LayoutRight, Kokkos::LayoutRight, 3, 5, 0, int,
+                   Kokkos::pair<int, int>, Kokkos::pair<int, int>,
+                   Kokkos::Impl::ALL_t, int>::value));
 
-  ASSERT_EQ( 0, ( Kokkos::Impl::SubviewLegalArgsCompileTime< Kokkos::LayoutRight, Kokkos::LayoutRight, 3, 5, 0, int, Kokkos::Impl::ALL_t, Kokkos::Impl::ALL_t, int, Kokkos::pair<int, int> >::value ) );
-  ASSERT_EQ( 0, ( Kokkos::Impl::SubviewLegalArgsCompileTime< Kokkos::LayoutRight, Kokkos::LayoutRight, 3, 5, 0, int, Kokkos::Impl::ALL_t, Kokkos::Impl::ALL_t, int, Kokkos::Impl::ALL_t >::value ) );
-  ASSERT_EQ( 0, ( Kokkos::Impl::SubviewLegalArgsCompileTime< Kokkos::LayoutRight, Kokkos::LayoutRight, 3, 5, 0, int, Kokkos::Impl::ALL_t, Kokkos::pair<int, int>, int, Kokkos::pair<int, int> >::value ) );
-  ASSERT_EQ( 0, ( Kokkos::Impl::SubviewLegalArgsCompileTime< Kokkos::LayoutRight, Kokkos::LayoutRight, 3, 5, 0, int, Kokkos::Impl::ALL_t, Kokkos::pair<int, int>, int, Kokkos::Impl::ALL_t >::value ) );
-  ASSERT_EQ( 0, ( Kokkos::Impl::SubviewLegalArgsCompileTime< Kokkos::LayoutRight, Kokkos::LayoutRight, 3, 5, 0, int, Kokkos::pair<int, int>, Kokkos::Impl::ALL_t, int, Kokkos::pair<int, int> >::value ) );
-  ASSERT_EQ( 0, ( Kokkos::Impl::SubviewLegalArgsCompileTime< Kokkos::LayoutRight, Kokkos::LayoutRight, 3, 5, 0, int, Kokkos::pair<int, int>, Kokkos::Impl::ALL_t, int, Kokkos::Impl::ALL_t >::value ) );
-  ASSERT_EQ( 0, ( Kokkos::Impl::SubviewLegalArgsCompileTime< Kokkos::LayoutRight, Kokkos::LayoutRight, 3, 5, 0, int, Kokkos::pair<int, int>, Kokkos::pair<int, int>, int, Kokkos::pair<int, int> >::value ) );
-  ASSERT_EQ( 0, ( Kokkos::Impl::SubviewLegalArgsCompileTime< Kokkos::LayoutRight, Kokkos::LayoutRight, 3, 5, 0, int, Kokkos::pair<int, int>, Kokkos::pair<int, int>, int, Kokkos::Impl::ALL_t >::value ) );
+  ASSERT_EQ(0, (Kokkos::Impl::SubviewLegalArgsCompileTime<
+                   Kokkos::LayoutRight, Kokkos::LayoutRight, 3, 5, 0, int,
+                   Kokkos::Impl::ALL_t, Kokkos::Impl::ALL_t, int,
+                   Kokkos::pair<int, int> >::value));
+  ASSERT_EQ(0, (Kokkos::Impl::SubviewLegalArgsCompileTime<
+                   Kokkos::LayoutRight, Kokkos::LayoutRight, 3, 5, 0, int,
+                   Kokkos::Impl::ALL_t, Kokkos::Impl::ALL_t, int,
+                   Kokkos::Impl::ALL_t>::value));
+  ASSERT_EQ(0, (Kokkos::Impl::SubviewLegalArgsCompileTime<
+                   Kokkos::LayoutRight, Kokkos::LayoutRight, 3, 5, 0, int,
+                   Kokkos::Impl::ALL_t, Kokkos::pair<int, int>, int,
+                   Kokkos::pair<int, int> >::value));
+  ASSERT_EQ(0, (Kokkos::Impl::SubviewLegalArgsCompileTime<
+                   Kokkos::LayoutRight, Kokkos::LayoutRight, 3, 5, 0, int,
+                   Kokkos::Impl::ALL_t, Kokkos::pair<int, int>, int,
+                   Kokkos::Impl::ALL_t>::value));
+  ASSERT_EQ(0, (Kokkos::Impl::SubviewLegalArgsCompileTime<
+                   Kokkos::LayoutRight, Kokkos::LayoutRight, 3, 5, 0, int,
+                   Kokkos::pair<int, int>, Kokkos::Impl::ALL_t, int,
+                   Kokkos::pair<int, int> >::value));
+  ASSERT_EQ(0, (Kokkos::Impl::SubviewLegalArgsCompileTime<
+                   Kokkos::LayoutRight, Kokkos::LayoutRight, 3, 5, 0, int,
+                   Kokkos::pair<int, int>, Kokkos::Impl::ALL_t, int,
+                   Kokkos::Impl::ALL_t>::value));
+  ASSERT_EQ(0, (Kokkos::Impl::SubviewLegalArgsCompileTime<
+                   Kokkos::LayoutRight, Kokkos::LayoutRight, 3, 5, 0, int,
+                   Kokkos::pair<int, int>, Kokkos::pair<int, int>, int,
+                   Kokkos::pair<int, int> >::value));
+  ASSERT_EQ(0, (Kokkos::Impl::SubviewLegalArgsCompileTime<
+                   Kokkos::LayoutRight, Kokkos::LayoutRight, 3, 5, 0, int,
+                   Kokkos::pair<int, int>, Kokkos::pair<int, int>, int,
+                   Kokkos::Impl::ALL_t>::value));
 
-  ASSERT_EQ( 0, ( Kokkos::Impl::SubviewLegalArgsCompileTime< Kokkos::LayoutRight, Kokkos::LayoutRight, 3, 5, 0, int, int, Kokkos::Impl::ALL_t, Kokkos::Impl::ALL_t, Kokkos::pair<int, int> >::value ) );
-  ASSERT_EQ( 1, ( Kokkos::Impl::SubviewLegalArgsCompileTime< Kokkos::LayoutRight, Kokkos::LayoutRight, 3, 5, 0, int, int, Kokkos::Impl::ALL_t, Kokkos::Impl::ALL_t, Kokkos::Impl::ALL_t >::value ) );
-  ASSERT_EQ( 0, ( Kokkos::Impl::SubviewLegalArgsCompileTime< Kokkos::LayoutRight, Kokkos::LayoutRight, 3, 5, 0, int, int, Kokkos::Impl::ALL_t, Kokkos::pair<int, int>, Kokkos::pair<int, int> >::value ) );
-  ASSERT_EQ( 0, ( Kokkos::Impl::SubviewLegalArgsCompileTime< Kokkos::LayoutRight, Kokkos::LayoutRight, 3, 5, 0, int, int, Kokkos::Impl::ALL_t, Kokkos::pair<int, int>, Kokkos::Impl::ALL_t >::value ) );
-  ASSERT_EQ( 0, ( Kokkos::Impl::SubviewLegalArgsCompileTime< Kokkos::LayoutRight, Kokkos::LayoutRight, 3, 5, 0, int, int, Kokkos::pair<int, int>, Kokkos::Impl::ALL_t, Kokkos::pair<int, int> >::value ) );
-  ASSERT_EQ( 1, ( Kokkos::Impl::SubviewLegalArgsCompileTime< Kokkos::LayoutRight, Kokkos::LayoutRight, 3, 5, 0, int, int, Kokkos::pair<int, int>, Kokkos::Impl::ALL_t, Kokkos::Impl::ALL_t >::value ) );
-  ASSERT_EQ( 0, ( Kokkos::Impl::SubviewLegalArgsCompileTime< Kokkos::LayoutRight, Kokkos::LayoutRight, 3, 5, 0, int, int, Kokkos::pair<int, int>, Kokkos::pair<int, int>, Kokkos::pair<int, int> >::value ) );
-  ASSERT_EQ( 0, ( Kokkos::Impl::SubviewLegalArgsCompileTime< Kokkos::LayoutRight, Kokkos::LayoutRight, 3, 5, 0, int, int, Kokkos::pair<int, int>, Kokkos::pair<int, int>, Kokkos::Impl::ALL_t >::value ) );
+  ASSERT_EQ(0, (Kokkos::Impl::SubviewLegalArgsCompileTime<
+                   Kokkos::LayoutRight, Kokkos::LayoutRight, 3, 5, 0, int, int,
+                   Kokkos::Impl::ALL_t, Kokkos::Impl::ALL_t,
+                   Kokkos::pair<int, int> >::value));
+  ASSERT_EQ(1, (Kokkos::Impl::SubviewLegalArgsCompileTime<
+                   Kokkos::LayoutRight, Kokkos::LayoutRight, 3, 5, 0, int, int,
+                   Kokkos::Impl::ALL_t, Kokkos::Impl::ALL_t,
+                   Kokkos::Impl::ALL_t>::value));
+  ASSERT_EQ(0, (Kokkos::Impl::SubviewLegalArgsCompileTime<
+                   Kokkos::LayoutRight, Kokkos::LayoutRight, 3, 5, 0, int, int,
+                   Kokkos::Impl::ALL_t, Kokkos::pair<int, int>,
+                   Kokkos::pair<int, int> >::value));
+  ASSERT_EQ(0, (Kokkos::Impl::SubviewLegalArgsCompileTime<
+                   Kokkos::LayoutRight, Kokkos::LayoutRight, 3, 5, 0, int, int,
+                   Kokkos::Impl::ALL_t, Kokkos::pair<int, int>,
+                   Kokkos::Impl::ALL_t>::value));
+  ASSERT_EQ(0, (Kokkos::Impl::SubviewLegalArgsCompileTime<
+                   Kokkos::LayoutRight, Kokkos::LayoutRight, 3, 5, 0, int, int,
+                   Kokkos::pair<int, int>, Kokkos::Impl::ALL_t,
+                   Kokkos::pair<int, int> >::value));
+  ASSERT_EQ(1, (Kokkos::Impl::SubviewLegalArgsCompileTime<
+                   Kokkos::LayoutRight, Kokkos::LayoutRight, 3, 5, 0, int, int,
+                   Kokkos::pair<int, int>, Kokkos::Impl::ALL_t,
+                   Kokkos::Impl::ALL_t>::value));
+  ASSERT_EQ(0, (Kokkos::Impl::SubviewLegalArgsCompileTime<
+                   Kokkos::LayoutRight, Kokkos::LayoutRight, 3, 5, 0, int, int,
+                   Kokkos::pair<int, int>, Kokkos::pair<int, int>,
+                   Kokkos::pair<int, int> >::value));
+  ASSERT_EQ(0, (Kokkos::Impl::SubviewLegalArgsCompileTime<
+                   Kokkos::LayoutRight, Kokkos::LayoutRight, 3, 5, 0, int, int,
+                   Kokkos::pair<int, int>, Kokkos::pair<int, int>,
+                   Kokkos::Impl::ALL_t>::value));
 
-  ASSERT_EQ( 1, ( Kokkos::Impl::SubviewLegalArgsCompileTime< Kokkos::LayoutRight, Kokkos::LayoutRight, 3, 3, 0, Kokkos::Impl::ALL_t, Kokkos::Impl::ALL_t, Kokkos::Impl::ALL_t >::value ) );
-  ASSERT_EQ( 0, ( Kokkos::Impl::SubviewLegalArgsCompileTime< Kokkos::LayoutRight, Kokkos::LayoutRight, 3, 3, 0, Kokkos::Impl::ALL_t, Kokkos::Impl::ALL_t, Kokkos::pair<int, int> >::value ) );
-  ASSERT_EQ( 1, ( Kokkos::Impl::SubviewLegalArgsCompileTime< Kokkos::LayoutRight, Kokkos::LayoutRight, 3, 3, 0, Kokkos::pair<int, int>, Kokkos::Impl::ALL_t, Kokkos::Impl::ALL_t >::value ) );
-  ASSERT_EQ( 0, ( Kokkos::Impl::SubviewLegalArgsCompileTime< Kokkos::LayoutRight, Kokkos::LayoutRight, 3, 3, 0, Kokkos::pair<int, int>, Kokkos::Impl::ALL_t, Kokkos::pair<int, int> >::value ) );
-  ASSERT_EQ( 0, ( Kokkos::Impl::SubviewLegalArgsCompileTime< Kokkos::LayoutRight, Kokkos::LayoutRight, 3, 3, 0, Kokkos::Impl::ALL_t, Kokkos::pair<int, int>, Kokkos::Impl::ALL_t >::value ) );
-  ASSERT_EQ( 0, ( Kokkos::Impl::SubviewLegalArgsCompileTime< Kokkos::LayoutRight, Kokkos::LayoutRight, 3, 3, 0, Kokkos::Impl::ALL_t, Kokkos::pair<int, int>, Kokkos::pair<int, int> >::value ) );
-  ASSERT_EQ( 0, ( Kokkos::Impl::SubviewLegalArgsCompileTime< Kokkos::LayoutRight, Kokkos::LayoutRight, 3, 3, 0, Kokkos::pair<int, int>, Kokkos::pair<int, int>, Kokkos::Impl::ALL_t >::value ) );
-  ASSERT_EQ( 0, ( Kokkos::Impl::SubviewLegalArgsCompileTime< Kokkos::LayoutRight, Kokkos::LayoutRight, 3, 3, 0, Kokkos::pair<int, int>, Kokkos::pair<int, int>, Kokkos::pair<int, int> >::value ) );
+  ASSERT_EQ(1, (Kokkos::Impl::SubviewLegalArgsCompileTime<
+                   Kokkos::LayoutRight, Kokkos::LayoutRight, 3, 3, 0,
+                   Kokkos::Impl::ALL_t, Kokkos::Impl::ALL_t,
+                   Kokkos::Impl::ALL_t>::value));
+  ASSERT_EQ(0, (Kokkos::Impl::SubviewLegalArgsCompileTime<
+                   Kokkos::LayoutRight, Kokkos::LayoutRight, 3, 3, 0,
+                   Kokkos::Impl::ALL_t, Kokkos::Impl::ALL_t,
+                   Kokkos::pair<int, int> >::value));
+  ASSERT_EQ(1, (Kokkos::Impl::SubviewLegalArgsCompileTime<
+                   Kokkos::LayoutRight, Kokkos::LayoutRight, 3, 3, 0,
+                   Kokkos::pair<int, int>, Kokkos::Impl::ALL_t,
+                   Kokkos::Impl::ALL_t>::value));
+  ASSERT_EQ(0, (Kokkos::Impl::SubviewLegalArgsCompileTime<
+                   Kokkos::LayoutRight, Kokkos::LayoutRight, 3, 3, 0,
+                   Kokkos::pair<int, int>, Kokkos::Impl::ALL_t,
+                   Kokkos::pair<int, int> >::value));
+  ASSERT_EQ(0, (Kokkos::Impl::SubviewLegalArgsCompileTime<
+                   Kokkos::LayoutRight, Kokkos::LayoutRight, 3, 3, 0,
+                   Kokkos::Impl::ALL_t, Kokkos::pair<int, int>,
+                   Kokkos::Impl::ALL_t>::value));
+  ASSERT_EQ(0, (Kokkos::Impl::SubviewLegalArgsCompileTime<
+                   Kokkos::LayoutRight, Kokkos::LayoutRight, 3, 3, 0,
+                   Kokkos::Impl::ALL_t, Kokkos::pair<int, int>,
+                   Kokkos::pair<int, int> >::value));
+  ASSERT_EQ(0, (Kokkos::Impl::SubviewLegalArgsCompileTime<
+                   Kokkos::LayoutRight, Kokkos::LayoutRight, 3, 3, 0,
+                   Kokkos::pair<int, int>, Kokkos::pair<int, int>,
+                   Kokkos::Impl::ALL_t>::value));
+  ASSERT_EQ(0, (Kokkos::Impl::SubviewLegalArgsCompileTime<
+                   Kokkos::LayoutRight, Kokkos::LayoutRight, 3, 3, 0,
+                   Kokkos::pair<int, int>, Kokkos::pair<int, int>,
+                   Kokkos::pair<int, int> >::value));
 }
 
-inline
-void test_subview_legal_args_left() {
-  ASSERT_EQ( 1, ( Kokkos::Impl::SubviewLegalArgsCompileTime< Kokkos::LayoutLeft, Kokkos::LayoutLeft, 3, 5, 0, Kokkos::Impl::ALL_t, Kokkos::Impl::ALL_t, Kokkos::pair<int, int>, int, int >::value ) );
-  ASSERT_EQ( 1, ( Kokkos::Impl::SubviewLegalArgsCompileTime< Kokkos::LayoutLeft, Kokkos::LayoutLeft, 3, 5, 0, Kokkos::Impl::ALL_t, Kokkos::Impl::ALL_t, Kokkos::Impl::ALL_t, int, int >::value ) );
-  ASSERT_EQ( 0, ( Kokkos::Impl::SubviewLegalArgsCompileTime< Kokkos::LayoutLeft, Kokkos::LayoutLeft, 3, 5, 0, Kokkos::Impl::ALL_t, Kokkos::pair<int, int>, Kokkos::pair<int, int>, int, int >::value ) );
-  ASSERT_EQ( 0, ( Kokkos::Impl::SubviewLegalArgsCompileTime< Kokkos::LayoutLeft, Kokkos::LayoutLeft, 3, 5, 0, Kokkos::Impl::ALL_t, Kokkos::pair<int, int>, Kokkos::Impl::ALL_t, int, int >::value ) );
-  ASSERT_EQ( 1, ( Kokkos::Impl::SubviewLegalArgsCompileTime< Kokkos::LayoutLeft, Kokkos::LayoutLeft, 3, 5, 0, Kokkos::pair<int, int>, Kokkos::Impl::ALL_t, Kokkos::pair<int, int>, int, int >::value ) );
-  ASSERT_EQ( 1, ( Kokkos::Impl::SubviewLegalArgsCompileTime< Kokkos::LayoutLeft, Kokkos::LayoutLeft, 3, 5, 0, Kokkos::pair<int, int>, Kokkos::Impl::ALL_t, Kokkos::Impl::ALL_t, int, int >::value ) );
-  ASSERT_EQ( 0, ( Kokkos::Impl::SubviewLegalArgsCompileTime< Kokkos::LayoutLeft, Kokkos::LayoutLeft, 3, 5, 0, Kokkos::pair<int, int>, Kokkos::pair<int, int>, Kokkos::pair<int, int>, int, int >::value ) );
-  ASSERT_EQ( 0, ( Kokkos::Impl::SubviewLegalArgsCompileTime< Kokkos::LayoutLeft, Kokkos::LayoutLeft, 3, 5, 0, Kokkos::pair<int, int>, Kokkos::pair<int, int>, Kokkos::Impl::ALL_t, int, int >::value ) );
+inline void test_subview_legal_args_left() {
+  ASSERT_EQ(
+      1,
+      (Kokkos::Impl::SubviewLegalArgsCompileTime<
+          Kokkos::LayoutLeft, Kokkos::LayoutLeft, 3, 5, 0, Kokkos::Impl::ALL_t,
+          Kokkos::Impl::ALL_t, Kokkos::pair<int, int>, int, int>::value));
+  ASSERT_EQ(
+      1,
+      (Kokkos::Impl::SubviewLegalArgsCompileTime<
+          Kokkos::LayoutLeft, Kokkos::LayoutLeft, 3, 5, 0, Kokkos::Impl::ALL_t,
+          Kokkos::Impl::ALL_t, Kokkos::Impl::ALL_t, int, int>::value));
+  ASSERT_EQ(
+      0,
+      (Kokkos::Impl::SubviewLegalArgsCompileTime<
+          Kokkos::LayoutLeft, Kokkos::LayoutLeft, 3, 5, 0, Kokkos::Impl::ALL_t,
+          Kokkos::pair<int, int>, Kokkos::pair<int, int>, int, int>::value));
+  ASSERT_EQ(
+      0,
+      (Kokkos::Impl::SubviewLegalArgsCompileTime<
+          Kokkos::LayoutLeft, Kokkos::LayoutLeft, 3, 5, 0, Kokkos::Impl::ALL_t,
+          Kokkos::pair<int, int>, Kokkos::Impl::ALL_t, int, int>::value));
+  ASSERT_EQ(1, (Kokkos::Impl::SubviewLegalArgsCompileTime<
+                   Kokkos::LayoutLeft, Kokkos::LayoutLeft, 3, 5, 0,
+                   Kokkos::pair<int, int>, Kokkos::Impl::ALL_t,
+                   Kokkos::pair<int, int>, int, int>::value));
+  ASSERT_EQ(1, (Kokkos::Impl::SubviewLegalArgsCompileTime<
+                   Kokkos::LayoutLeft, Kokkos::LayoutLeft, 3, 5, 0,
+                   Kokkos::pair<int, int>, Kokkos::Impl::ALL_t,
+                   Kokkos::Impl::ALL_t, int, int>::value));
+  ASSERT_EQ(0, (Kokkos::Impl::SubviewLegalArgsCompileTime<
+                   Kokkos::LayoutLeft, Kokkos::LayoutLeft, 3, 5, 0,
+                   Kokkos::pair<int, int>, Kokkos::pair<int, int>,
+                   Kokkos::pair<int, int>, int, int>::value));
+  ASSERT_EQ(0, (Kokkos::Impl::SubviewLegalArgsCompileTime<
+                   Kokkos::LayoutLeft, Kokkos::LayoutLeft, 3, 5, 0,
+                   Kokkos::pair<int, int>, Kokkos::pair<int, int>,
+                   Kokkos::Impl::ALL_t, int, int>::value));
 
-  ASSERT_EQ( 0, ( Kokkos::Impl::SubviewLegalArgsCompileTime< Kokkos::LayoutLeft, Kokkos::LayoutLeft, 3, 5, 0, Kokkos::Impl::ALL_t, int, Kokkos::Impl::ALL_t, Kokkos::pair<int, int>, int >::value ) );
-  ASSERT_EQ( 0, ( Kokkos::Impl::SubviewLegalArgsCompileTime< Kokkos::LayoutLeft, Kokkos::LayoutLeft, 3, 5, 0, Kokkos::Impl::ALL_t, int, Kokkos::Impl::ALL_t, Kokkos::Impl::ALL_t, int >::value ) );
-  ASSERT_EQ( 0, ( Kokkos::Impl::SubviewLegalArgsCompileTime< Kokkos::LayoutLeft, Kokkos::LayoutLeft, 3, 5, 0, Kokkos::Impl::ALL_t, int, Kokkos::pair<int, int>, Kokkos::pair<int, int>, int >::value ) );
-  ASSERT_EQ( 0, ( Kokkos::Impl::SubviewLegalArgsCompileTime< Kokkos::LayoutLeft, Kokkos::LayoutLeft, 3, 5, 0, Kokkos::Impl::ALL_t, int, Kokkos::pair<int, int>, Kokkos::Impl::ALL_t, int >::value ) );
-  ASSERT_EQ( 0, ( Kokkos::Impl::SubviewLegalArgsCompileTime< Kokkos::LayoutLeft, Kokkos::LayoutLeft, 3, 5, 0, Kokkos::pair<int, int>, int, Kokkos::Impl::ALL_t, Kokkos::pair<int, int>, int >::value ) );
-  ASSERT_EQ( 0, ( Kokkos::Impl::SubviewLegalArgsCompileTime< Kokkos::LayoutLeft, Kokkos::LayoutLeft, 3, 5, 0, Kokkos::pair<int, int>, int, Kokkos::Impl::ALL_t, Kokkos::Impl::ALL_t, int >::value ) );
-  ASSERT_EQ( 0, ( Kokkos::Impl::SubviewLegalArgsCompileTime< Kokkos::LayoutLeft, Kokkos::LayoutLeft, 3, 5, 0, Kokkos::pair<int, int>, int, Kokkos::pair<int, int>, Kokkos::pair<int, int>, int >::value ) );
-  ASSERT_EQ( 0, ( Kokkos::Impl::SubviewLegalArgsCompileTime< Kokkos::LayoutLeft, Kokkos::LayoutLeft, 3, 5, 0, Kokkos::pair<int, int>, int, Kokkos::Impl::ALL_t, Kokkos::pair<int, int>, int >::value ) );
+  ASSERT_EQ(
+      0,
+      (Kokkos::Impl::SubviewLegalArgsCompileTime<
+          Kokkos::LayoutLeft, Kokkos::LayoutLeft, 3, 5, 0, Kokkos::Impl::ALL_t,
+          int, Kokkos::Impl::ALL_t, Kokkos::pair<int, int>, int>::value));
+  ASSERT_EQ(
+      0,
+      (Kokkos::Impl::SubviewLegalArgsCompileTime<
+          Kokkos::LayoutLeft, Kokkos::LayoutLeft, 3, 5, 0, Kokkos::Impl::ALL_t,
+          int, Kokkos::Impl::ALL_t, Kokkos::Impl::ALL_t, int>::value));
+  ASSERT_EQ(
+      0,
+      (Kokkos::Impl::SubviewLegalArgsCompileTime<
+          Kokkos::LayoutLeft, Kokkos::LayoutLeft, 3, 5, 0, Kokkos::Impl::ALL_t,
+          int, Kokkos::pair<int, int>, Kokkos::pair<int, int>, int>::value));
+  ASSERT_EQ(
+      0,
+      (Kokkos::Impl::SubviewLegalArgsCompileTime<
+          Kokkos::LayoutLeft, Kokkos::LayoutLeft, 3, 5, 0, Kokkos::Impl::ALL_t,
+          int, Kokkos::pair<int, int>, Kokkos::Impl::ALL_t, int>::value));
+  ASSERT_EQ(0, (Kokkos::Impl::SubviewLegalArgsCompileTime<
+                   Kokkos::LayoutLeft, Kokkos::LayoutLeft, 3, 5, 0,
+                   Kokkos::pair<int, int>, int, Kokkos::Impl::ALL_t,
+                   Kokkos::pair<int, int>, int>::value));
+  ASSERT_EQ(0, (Kokkos::Impl::SubviewLegalArgsCompileTime<
+                   Kokkos::LayoutLeft, Kokkos::LayoutLeft, 3, 5, 0,
+                   Kokkos::pair<int, int>, int, Kokkos::Impl::ALL_t,
+                   Kokkos::Impl::ALL_t, int>::value));
+  ASSERT_EQ(0, (Kokkos::Impl::SubviewLegalArgsCompileTime<
+                   Kokkos::LayoutLeft, Kokkos::LayoutLeft, 3, 5, 0,
+                   Kokkos::pair<int, int>, int, Kokkos::pair<int, int>,
+                   Kokkos::pair<int, int>, int>::value));
+  ASSERT_EQ(0, (Kokkos::Impl::SubviewLegalArgsCompileTime<
+                   Kokkos::LayoutLeft, Kokkos::LayoutLeft, 3, 5, 0,
+                   Kokkos::pair<int, int>, int, Kokkos::Impl::ALL_t,
+                   Kokkos::pair<int, int>, int>::value));
 
-  ASSERT_EQ( 0, ( Kokkos::Impl::SubviewLegalArgsCompileTime< Kokkos::LayoutLeft, Kokkos::LayoutLeft, 3, 5, 0, Kokkos::Impl::ALL_t, Kokkos::Impl::ALL_t, int, Kokkos::pair<int, int>, int >::value ) );
-  ASSERT_EQ( 0, ( Kokkos::Impl::SubviewLegalArgsCompileTime< Kokkos::LayoutLeft, Kokkos::LayoutLeft, 3, 5, 0, Kokkos::Impl::ALL_t, Kokkos::Impl::ALL_t, int, Kokkos::Impl::ALL_t, int >::value ) );
-  ASSERT_EQ( 0, ( Kokkos::Impl::SubviewLegalArgsCompileTime< Kokkos::LayoutLeft, Kokkos::LayoutLeft, 3, 5, 0, Kokkos::Impl::ALL_t, Kokkos::pair<int, int>, int, Kokkos::pair<int, int>, int >::value ) );
-  ASSERT_EQ( 0, ( Kokkos::Impl::SubviewLegalArgsCompileTime< Kokkos::LayoutLeft, Kokkos::LayoutLeft, 3, 5, 0, Kokkos::Impl::ALL_t, Kokkos::pair<int, int>, int, Kokkos::Impl::ALL_t, int >::value ) );
-  ASSERT_EQ( 0, ( Kokkos::Impl::SubviewLegalArgsCompileTime< Kokkos::LayoutLeft, Kokkos::LayoutLeft, 3, 5, 0, Kokkos::pair<int, int>, Kokkos::Impl::ALL_t, int, Kokkos::pair<int, int>, int >::value ) );
-  ASSERT_EQ( 0, ( Kokkos::Impl::SubviewLegalArgsCompileTime< Kokkos::LayoutLeft, Kokkos::LayoutLeft, 3, 5, 0, Kokkos::pair<int, int>, Kokkos::Impl::ALL_t, int, Kokkos::Impl::ALL_t, int >::value ) );
-  ASSERT_EQ( 0, ( Kokkos::Impl::SubviewLegalArgsCompileTime< Kokkos::LayoutLeft, Kokkos::LayoutLeft, 3, 5, 0, Kokkos::pair<int, int>, Kokkos::pair<int, int>, int, Kokkos::pair<int, int>, int >::value ) );
-  ASSERT_EQ( 0, ( Kokkos::Impl::SubviewLegalArgsCompileTime< Kokkos::LayoutLeft, Kokkos::LayoutLeft, 3, 5, 0, Kokkos::pair<int, int>, Kokkos::Impl::ALL_t, int, Kokkos::pair<int, int>, int >::value ) );
+  ASSERT_EQ(
+      0,
+      (Kokkos::Impl::SubviewLegalArgsCompileTime<
+          Kokkos::LayoutLeft, Kokkos::LayoutLeft, 3, 5, 0, Kokkos::Impl::ALL_t,
+          Kokkos::Impl::ALL_t, int, Kokkos::pair<int, int>, int>::value));
+  ASSERT_EQ(
+      0,
+      (Kokkos::Impl::SubviewLegalArgsCompileTime<
+          Kokkos::LayoutLeft, Kokkos::LayoutLeft, 3, 5, 0, Kokkos::Impl::ALL_t,
+          Kokkos::Impl::ALL_t, int, Kokkos::Impl::ALL_t, int>::value));
+  ASSERT_EQ(
+      0,
+      (Kokkos::Impl::SubviewLegalArgsCompileTime<
+          Kokkos::LayoutLeft, Kokkos::LayoutLeft, 3, 5, 0, Kokkos::Impl::ALL_t,
+          Kokkos::pair<int, int>, int, Kokkos::pair<int, int>, int>::value));
+  ASSERT_EQ(
+      0,
+      (Kokkos::Impl::SubviewLegalArgsCompileTime<
+          Kokkos::LayoutLeft, Kokkos::LayoutLeft, 3, 5, 0, Kokkos::Impl::ALL_t,
+          Kokkos::pair<int, int>, int, Kokkos::Impl::ALL_t, int>::value));
+  ASSERT_EQ(0, (Kokkos::Impl::SubviewLegalArgsCompileTime<
+                   Kokkos::LayoutLeft, Kokkos::LayoutLeft, 3, 5, 0,
+                   Kokkos::pair<int, int>, Kokkos::Impl::ALL_t, int,
+                   Kokkos::pair<int, int>, int>::value));
+  ASSERT_EQ(0, (Kokkos::Impl::SubviewLegalArgsCompileTime<
+                   Kokkos::LayoutLeft, Kokkos::LayoutLeft, 3, 5, 0,
+                   Kokkos::pair<int, int>, Kokkos::Impl::ALL_t, int,
+                   Kokkos::Impl::ALL_t, int>::value));
+  ASSERT_EQ(0, (Kokkos::Impl::SubviewLegalArgsCompileTime<
+                   Kokkos::LayoutLeft, Kokkos::LayoutLeft, 3, 5, 0,
+                   Kokkos::pair<int, int>, Kokkos::pair<int, int>, int,
+                   Kokkos::pair<int, int>, int>::value));
+  ASSERT_EQ(0, (Kokkos::Impl::SubviewLegalArgsCompileTime<
+                   Kokkos::LayoutLeft, Kokkos::LayoutLeft, 3, 5, 0,
+                   Kokkos::pair<int, int>, Kokkos::Impl::ALL_t, int,
+                   Kokkos::pair<int, int>, int>::value));
 
-  ASSERT_EQ( 0, ( Kokkos::Impl::SubviewLegalArgsCompileTime< Kokkos::LayoutLeft, Kokkos::LayoutLeft, 3, 5, 0, int, Kokkos::Impl::ALL_t, Kokkos::Impl::ALL_t, Kokkos::pair<int, int>, int >::value ) );
-  ASSERT_EQ( 0, ( Kokkos::Impl::SubviewLegalArgsCompileTime< Kokkos::LayoutLeft, Kokkos::LayoutLeft, 3, 5, 0, int, Kokkos::Impl::ALL_t, Kokkos::Impl::ALL_t, Kokkos::Impl::ALL_t, int >::value ) );
-  ASSERT_EQ( 0, ( Kokkos::Impl::SubviewLegalArgsCompileTime< Kokkos::LayoutLeft, Kokkos::LayoutLeft, 3, 5, 0, int, Kokkos::Impl::ALL_t, Kokkos::pair<int, int>, Kokkos::pair<int, int>, int >::value ) );
-  ASSERT_EQ( 0, ( Kokkos::Impl::SubviewLegalArgsCompileTime< Kokkos::LayoutLeft, Kokkos::LayoutLeft, 3, 5, 0, int, Kokkos::Impl::ALL_t, Kokkos::pair<int, int>, Kokkos::Impl::ALL_t, int >::value ) );
-  ASSERT_EQ( 0, ( Kokkos::Impl::SubviewLegalArgsCompileTime< Kokkos::LayoutLeft, Kokkos::LayoutLeft, 3, 5, 0, int, Kokkos::pair<int, int>, Kokkos::Impl::ALL_t, Kokkos::pair<int, int>, int >::value ) );
-  ASSERT_EQ( 0, ( Kokkos::Impl::SubviewLegalArgsCompileTime< Kokkos::LayoutLeft, Kokkos::LayoutLeft, 3, 5, 0, int, Kokkos::pair<int, int>, Kokkos::Impl::ALL_t, Kokkos::Impl::ALL_t, int >::value ) );
-  ASSERT_EQ( 0, ( Kokkos::Impl::SubviewLegalArgsCompileTime< Kokkos::LayoutLeft, Kokkos::LayoutLeft, 3, 5, 0, int, Kokkos::pair<int, int>, Kokkos::pair<int, int>, Kokkos::pair<int, int>, int >::value ) );
-  ASSERT_EQ( 0, ( Kokkos::Impl::SubviewLegalArgsCompileTime< Kokkos::LayoutLeft, Kokkos::LayoutLeft, 3, 5, 0, int, Kokkos::pair<int, int>, Kokkos::pair<int, int>, Kokkos::Impl::ALL_t, int >::value ) );
+  ASSERT_EQ(0, (Kokkos::Impl::SubviewLegalArgsCompileTime<
+                   Kokkos::LayoutLeft, Kokkos::LayoutLeft, 3, 5, 0, int,
+                   Kokkos::Impl::ALL_t, Kokkos::Impl::ALL_t,
+                   Kokkos::pair<int, int>, int>::value));
+  ASSERT_EQ(0, (Kokkos::Impl::SubviewLegalArgsCompileTime<
+                   Kokkos::LayoutLeft, Kokkos::LayoutLeft, 3, 5, 0, int,
+                   Kokkos::Impl::ALL_t, Kokkos::Impl::ALL_t,
+                   Kokkos::Impl::ALL_t, int>::value));
+  ASSERT_EQ(0, (Kokkos::Impl::SubviewLegalArgsCompileTime<
+                   Kokkos::LayoutLeft, Kokkos::LayoutLeft, 3, 5, 0, int,
+                   Kokkos::Impl::ALL_t, Kokkos::pair<int, int>,
+                   Kokkos::pair<int, int>, int>::value));
+  ASSERT_EQ(0, (Kokkos::Impl::SubviewLegalArgsCompileTime<
+                   Kokkos::LayoutLeft, Kokkos::LayoutLeft, 3, 5, 0, int,
+                   Kokkos::Impl::ALL_t, Kokkos::pair<int, int>,
+                   Kokkos::Impl::ALL_t, int>::value));
+  ASSERT_EQ(0, (Kokkos::Impl::SubviewLegalArgsCompileTime<
+                   Kokkos::LayoutLeft, Kokkos::LayoutLeft, 3, 5, 0, int,
+                   Kokkos::pair<int, int>, Kokkos::Impl::ALL_t,
+                   Kokkos::pair<int, int>, int>::value));
+  ASSERT_EQ(0, (Kokkos::Impl::SubviewLegalArgsCompileTime<
+                   Kokkos::LayoutLeft, Kokkos::LayoutLeft, 3, 5, 0, int,
+                   Kokkos::pair<int, int>, Kokkos::Impl::ALL_t,
+                   Kokkos::Impl::ALL_t, int>::value));
+  ASSERT_EQ(0, (Kokkos::Impl::SubviewLegalArgsCompileTime<
+                   Kokkos::LayoutLeft, Kokkos::LayoutLeft, 3, 5, 0, int,
+                   Kokkos::pair<int, int>, Kokkos::pair<int, int>,
+                   Kokkos::pair<int, int>, int>::value));
+  ASSERT_EQ(0, (Kokkos::Impl::SubviewLegalArgsCompileTime<
+                   Kokkos::LayoutLeft, Kokkos::LayoutLeft, 3, 5, 0, int,
+                   Kokkos::pair<int, int>, Kokkos::pair<int, int>,
+                   Kokkos::Impl::ALL_t, int>::value));
 
-  ASSERT_EQ( 0, ( Kokkos::Impl::SubviewLegalArgsCompileTime< Kokkos::LayoutLeft, Kokkos::LayoutLeft, 3, 5, 0, int, Kokkos::Impl::ALL_t, Kokkos::Impl::ALL_t, int, Kokkos::pair<int, int> >::value ) );
-  ASSERT_EQ( 0, ( Kokkos::Impl::SubviewLegalArgsCompileTime< Kokkos::LayoutLeft, Kokkos::LayoutLeft, 3, 5, 0, int, Kokkos::Impl::ALL_t, Kokkos::Impl::ALL_t, int, Kokkos::Impl::ALL_t >::value ) );
-  ASSERT_EQ( 0, ( Kokkos::Impl::SubviewLegalArgsCompileTime< Kokkos::LayoutLeft, Kokkos::LayoutLeft, 3, 5, 0, int, Kokkos::Impl::ALL_t, Kokkos::pair<int, int>, int, Kokkos::pair<int, int> >::value ) );
-  ASSERT_EQ( 0, ( Kokkos::Impl::SubviewLegalArgsCompileTime< Kokkos::LayoutLeft, Kokkos::LayoutLeft, 3, 5, 0, int, Kokkos::Impl::ALL_t, Kokkos::pair<int, int>, int, Kokkos::Impl::ALL_t >::value ) );
-  ASSERT_EQ( 0, ( Kokkos::Impl::SubviewLegalArgsCompileTime< Kokkos::LayoutLeft, Kokkos::LayoutLeft, 3, 5, 0, int, Kokkos::pair<int, int>, Kokkos::Impl::ALL_t, int, Kokkos::pair<int, int> >::value ) );
-  ASSERT_EQ( 0, ( Kokkos::Impl::SubviewLegalArgsCompileTime< Kokkos::LayoutLeft, Kokkos::LayoutLeft, 3, 5, 0, int, Kokkos::pair<int, int>, Kokkos::Impl::ALL_t, int, Kokkos::Impl::ALL_t >::value ) );
-  ASSERT_EQ( 0, ( Kokkos::Impl::SubviewLegalArgsCompileTime< Kokkos::LayoutLeft, Kokkos::LayoutLeft, 3, 5, 0, int, Kokkos::pair<int, int>, Kokkos::pair<int, int>, int, Kokkos::pair<int, int> >::value ) );
-  ASSERT_EQ( 0, ( Kokkos::Impl::SubviewLegalArgsCompileTime< Kokkos::LayoutLeft, Kokkos::LayoutLeft, 3, 5, 0, int, Kokkos::pair<int, int>, Kokkos::pair<int, int>, int, Kokkos::Impl::ALL_t >::value ) );
+  ASSERT_EQ(0, (Kokkos::Impl::SubviewLegalArgsCompileTime<
+                   Kokkos::LayoutLeft, Kokkos::LayoutLeft, 3, 5, 0, int,
+                   Kokkos::Impl::ALL_t, Kokkos::Impl::ALL_t, int,
+                   Kokkos::pair<int, int> >::value));
+  ASSERT_EQ(0, (Kokkos::Impl::SubviewLegalArgsCompileTime<
+                   Kokkos::LayoutLeft, Kokkos::LayoutLeft, 3, 5, 0, int,
+                   Kokkos::Impl::ALL_t, Kokkos::Impl::ALL_t, int,
+                   Kokkos::Impl::ALL_t>::value));
+  ASSERT_EQ(0, (Kokkos::Impl::SubviewLegalArgsCompileTime<
+                   Kokkos::LayoutLeft, Kokkos::LayoutLeft, 3, 5, 0, int,
+                   Kokkos::Impl::ALL_t, Kokkos::pair<int, int>, int,
+                   Kokkos::pair<int, int> >::value));
+  ASSERT_EQ(0, (Kokkos::Impl::SubviewLegalArgsCompileTime<
+                   Kokkos::LayoutLeft, Kokkos::LayoutLeft, 3, 5, 0, int,
+                   Kokkos::Impl::ALL_t, Kokkos::pair<int, int>, int,
+                   Kokkos::Impl::ALL_t>::value));
+  ASSERT_EQ(0, (Kokkos::Impl::SubviewLegalArgsCompileTime<
+                   Kokkos::LayoutLeft, Kokkos::LayoutLeft, 3, 5, 0, int,
+                   Kokkos::pair<int, int>, Kokkos::Impl::ALL_t, int,
+                   Kokkos::pair<int, int> >::value));
+  ASSERT_EQ(0, (Kokkos::Impl::SubviewLegalArgsCompileTime<
+                   Kokkos::LayoutLeft, Kokkos::LayoutLeft, 3, 5, 0, int,
+                   Kokkos::pair<int, int>, Kokkos::Impl::ALL_t, int,
+                   Kokkos::Impl::ALL_t>::value));
+  ASSERT_EQ(0, (Kokkos::Impl::SubviewLegalArgsCompileTime<
+                   Kokkos::LayoutLeft, Kokkos::LayoutLeft, 3, 5, 0, int,
+                   Kokkos::pair<int, int>, Kokkos::pair<int, int>, int,
+                   Kokkos::pair<int, int> >::value));
+  ASSERT_EQ(0, (Kokkos::Impl::SubviewLegalArgsCompileTime<
+                   Kokkos::LayoutLeft, Kokkos::LayoutLeft, 3, 5, 0, int,
+                   Kokkos::pair<int, int>, Kokkos::pair<int, int>, int,
+                   Kokkos::Impl::ALL_t>::value));
 
-  ASSERT_EQ( 0, ( Kokkos::Impl::SubviewLegalArgsCompileTime< Kokkos::LayoutLeft, Kokkos::LayoutLeft, 3, 5, 0, int, int, Kokkos::Impl::ALL_t, Kokkos::Impl::ALL_t, Kokkos::pair<int, int> >::value ) );
-  ASSERT_EQ( 0, ( Kokkos::Impl::SubviewLegalArgsCompileTime< Kokkos::LayoutLeft, Kokkos::LayoutLeft, 3, 5, 0, int, int, Kokkos::Impl::ALL_t, Kokkos::Impl::ALL_t, Kokkos::Impl::ALL_t >::value ) );
-  ASSERT_EQ( 0, ( Kokkos::Impl::SubviewLegalArgsCompileTime< Kokkos::LayoutLeft, Kokkos::LayoutLeft, 3, 5, 0, int, int, Kokkos::Impl::ALL_t, Kokkos::pair<int, int>, Kokkos::pair<int, int> >::value ) );
-  ASSERT_EQ( 0, ( Kokkos::Impl::SubviewLegalArgsCompileTime< Kokkos::LayoutLeft, Kokkos::LayoutLeft, 3, 5, 0, int, int, Kokkos::Impl::ALL_t, Kokkos::pair<int, int>, Kokkos::Impl::ALL_t >::value ) );
-  ASSERT_EQ( 0, ( Kokkos::Impl::SubviewLegalArgsCompileTime< Kokkos::LayoutLeft, Kokkos::LayoutLeft, 3, 5, 0, int, int, Kokkos::pair<int, int>, Kokkos::Impl::ALL_t, Kokkos::pair<int, int> >::value ) );
-  ASSERT_EQ( 0, ( Kokkos::Impl::SubviewLegalArgsCompileTime< Kokkos::LayoutLeft, Kokkos::LayoutLeft, 3, 5, 0, int, int, Kokkos::pair<int, int>, Kokkos::Impl::ALL_t, Kokkos::Impl::ALL_t >::value ) );
-  ASSERT_EQ( 0, ( Kokkos::Impl::SubviewLegalArgsCompileTime< Kokkos::LayoutLeft, Kokkos::LayoutLeft, 3, 5, 0, int, int, Kokkos::pair<int, int>, Kokkos::pair<int, int>, Kokkos::pair<int, int> >::value ) );
-  ASSERT_EQ( 0, ( Kokkos::Impl::SubviewLegalArgsCompileTime< Kokkos::LayoutLeft, Kokkos::LayoutLeft, 3, 5, 0, int, int, Kokkos::pair<int, int>, Kokkos::pair<int, int>, Kokkos::Impl::ALL_t >::value ) );
+  ASSERT_EQ(0, (Kokkos::Impl::SubviewLegalArgsCompileTime<
+                   Kokkos::LayoutLeft, Kokkos::LayoutLeft, 3, 5, 0, int, int,
+                   Kokkos::Impl::ALL_t, Kokkos::Impl::ALL_t,
+                   Kokkos::pair<int, int> >::value));
+  ASSERT_EQ(0, (Kokkos::Impl::SubviewLegalArgsCompileTime<
+                   Kokkos::LayoutLeft, Kokkos::LayoutLeft, 3, 5, 0, int, int,
+                   Kokkos::Impl::ALL_t, Kokkos::Impl::ALL_t,
+                   Kokkos::Impl::ALL_t>::value));
+  ASSERT_EQ(0, (Kokkos::Impl::SubviewLegalArgsCompileTime<
+                   Kokkos::LayoutLeft, Kokkos::LayoutLeft, 3, 5, 0, int, int,
+                   Kokkos::Impl::ALL_t, Kokkos::pair<int, int>,
+                   Kokkos::pair<int, int> >::value));
+  ASSERT_EQ(0, (Kokkos::Impl::SubviewLegalArgsCompileTime<
+                   Kokkos::LayoutLeft, Kokkos::LayoutLeft, 3, 5, 0, int, int,
+                   Kokkos::Impl::ALL_t, Kokkos::pair<int, int>,
+                   Kokkos::Impl::ALL_t>::value));
+  ASSERT_EQ(0, (Kokkos::Impl::SubviewLegalArgsCompileTime<
+                   Kokkos::LayoutLeft, Kokkos::LayoutLeft, 3, 5, 0, int, int,
+                   Kokkos::pair<int, int>, Kokkos::Impl::ALL_t,
+                   Kokkos::pair<int, int> >::value));
+  ASSERT_EQ(0, (Kokkos::Impl::SubviewLegalArgsCompileTime<
+                   Kokkos::LayoutLeft, Kokkos::LayoutLeft, 3, 5, 0, int, int,
+                   Kokkos::pair<int, int>, Kokkos::Impl::ALL_t,
+                   Kokkos::Impl::ALL_t>::value));
+  ASSERT_EQ(0, (Kokkos::Impl::SubviewLegalArgsCompileTime<
+                   Kokkos::LayoutLeft, Kokkos::LayoutLeft, 3, 5, 0, int, int,
+                   Kokkos::pair<int, int>, Kokkos::pair<int, int>,
+                   Kokkos::pair<int, int> >::value));
+  ASSERT_EQ(0, (Kokkos::Impl::SubviewLegalArgsCompileTime<
+                   Kokkos::LayoutLeft, Kokkos::LayoutLeft, 3, 5, 0, int, int,
+                   Kokkos::pair<int, int>, Kokkos::pair<int, int>,
+                   Kokkos::Impl::ALL_t>::value));
 
-  ASSERT_EQ( 1, ( Kokkos::Impl::SubviewLegalArgsCompileTime< Kokkos::LayoutLeft, Kokkos::LayoutLeft, 3, 3, 0, Kokkos::Impl::ALL_t, Kokkos::Impl::ALL_t, Kokkos::pair<int, int> >::value ) );
-  ASSERT_EQ( 1, ( Kokkos::Impl::SubviewLegalArgsCompileTime< Kokkos::LayoutLeft, Kokkos::LayoutLeft, 3, 3, 0, Kokkos::Impl::ALL_t, Kokkos::Impl::ALL_t, Kokkos::Impl::ALL_t >::value ) );
-  ASSERT_EQ( 1, ( Kokkos::Impl::SubviewLegalArgsCompileTime< Kokkos::LayoutLeft, Kokkos::LayoutLeft, 3, 3, 0, Kokkos::pair<int, int>, Kokkos::Impl::ALL_t, Kokkos::pair<int, int> >::value ) );
-  ASSERT_EQ( 1, ( Kokkos::Impl::SubviewLegalArgsCompileTime< Kokkos::LayoutLeft, Kokkos::LayoutLeft, 3, 3, 0, Kokkos::pair<int, int>, Kokkos::Impl::ALL_t, Kokkos::Impl::ALL_t >::value ) );
-  ASSERT_EQ( 0, ( Kokkos::Impl::SubviewLegalArgsCompileTime< Kokkos::LayoutLeft, Kokkos::LayoutLeft, 3, 3, 0, Kokkos::Impl::ALL_t, Kokkos::pair<int, int>, Kokkos::Impl::ALL_t >::value ) );
-  ASSERT_EQ( 0, ( Kokkos::Impl::SubviewLegalArgsCompileTime< Kokkos::LayoutLeft, Kokkos::LayoutLeft, 3, 3, 0, Kokkos::Impl::ALL_t, Kokkos::pair<int, int>, Kokkos::pair<int, int> >::value ) );
-  ASSERT_EQ( 0, (  Kokkos::Impl::SubviewLegalArgsCompileTime< Kokkos::LayoutLeft, Kokkos::LayoutLeft, 3, 3, 0, Kokkos::pair<int, int>, Kokkos::pair<int, int>, Kokkos::Impl::ALL_t >::value ) );
-  ASSERT_EQ( 0, ( Kokkos::Impl::SubviewLegalArgsCompileTime< Kokkos::LayoutLeft, Kokkos::LayoutLeft, 3, 3, 0, Kokkos::pair<int, int>, Kokkos::pair<int, int>, Kokkos::pair<int, int> >::value ) );
+  ASSERT_EQ(
+      1,
+      (Kokkos::Impl::SubviewLegalArgsCompileTime<
+          Kokkos::LayoutLeft, Kokkos::LayoutLeft, 3, 3, 0, Kokkos::Impl::ALL_t,
+          Kokkos::Impl::ALL_t, Kokkos::pair<int, int> >::value));
+  ASSERT_EQ(
+      1,
+      (Kokkos::Impl::SubviewLegalArgsCompileTime<
+          Kokkos::LayoutLeft, Kokkos::LayoutLeft, 3, 3, 0, Kokkos::Impl::ALL_t,
+          Kokkos::Impl::ALL_t, Kokkos::Impl::ALL_t>::value));
+  ASSERT_EQ(1, (Kokkos::Impl::SubviewLegalArgsCompileTime<
+                   Kokkos::LayoutLeft, Kokkos::LayoutLeft, 3, 3, 0,
+                   Kokkos::pair<int, int>, Kokkos::Impl::ALL_t,
+                   Kokkos::pair<int, int> >::value));
+  ASSERT_EQ(1, (Kokkos::Impl::SubviewLegalArgsCompileTime<
+                   Kokkos::LayoutLeft, Kokkos::LayoutLeft, 3, 3, 0,
+                   Kokkos::pair<int, int>, Kokkos::Impl::ALL_t,
+                   Kokkos::Impl::ALL_t>::value));
+  ASSERT_EQ(
+      0,
+      (Kokkos::Impl::SubviewLegalArgsCompileTime<
+          Kokkos::LayoutLeft, Kokkos::LayoutLeft, 3, 3, 0, Kokkos::Impl::ALL_t,
+          Kokkos::pair<int, int>, Kokkos::Impl::ALL_t>::value));
+  ASSERT_EQ(
+      0,
+      (Kokkos::Impl::SubviewLegalArgsCompileTime<
+          Kokkos::LayoutLeft, Kokkos::LayoutLeft, 3, 3, 0, Kokkos::Impl::ALL_t,
+          Kokkos::pair<int, int>, Kokkos::pair<int, int> >::value));
+  ASSERT_EQ(0, (Kokkos::Impl::SubviewLegalArgsCompileTime<
+                   Kokkos::LayoutLeft, Kokkos::LayoutLeft, 3, 3, 0,
+                   Kokkos::pair<int, int>, Kokkos::pair<int, int>,
+                   Kokkos::Impl::ALL_t>::value));
+  ASSERT_EQ(0, (Kokkos::Impl::SubviewLegalArgsCompileTime<
+                   Kokkos::LayoutLeft, Kokkos::LayoutLeft, 3, 3, 0,
+                   Kokkos::pair<int, int>, Kokkos::pair<int, int>,
+                   Kokkos::pair<int, int> >::value));
 }
 
-} // namespace Impl
+}  // namespace Impl
 
-template< class Space, class MemTraits = void >
+template <class Space, class MemTraits = void>
 void test_1d_assign() {
-  Impl::test_1d_assign_impl< Space, Kokkos::LayoutLeft, Kokkos::LayoutLeft, Kokkos::LayoutLeft, MemTraits >();
-  //Impl::test_1d_assign_impl< Space, Kokkos::LayoutRight, Kokkos::LayoutLeft, Kokkos::LayoutLeft >();
-  Impl::test_1d_assign_impl< Space, Kokkos::LayoutStride, Kokkos::LayoutLeft, Kokkos::LayoutLeft, MemTraits >();
-  //Impl::test_1d_assign_impl< Space, Kokkos::LayoutLeft, Kokkos::LayoutRight, Kokkos::LayoutLeft >();
-  Impl::test_1d_assign_impl< Space, Kokkos::LayoutRight, Kokkos::LayoutRight, Kokkos::LayoutRight, MemTraits >();
-  Impl::test_1d_assign_impl< Space, Kokkos::LayoutStride, Kokkos::LayoutRight, Kokkos::LayoutRight, MemTraits >();
-  //Impl::test_1d_assign_impl< Space, Kokkos::LayoutLeft, Kokkos::LayoutStride, Kokkos::LayoutLeft >();
-  //Impl::test_1d_assign_impl< Space, Kokkos::LayoutRight, Kokkos::LayoutStride, Kokkos::LayoutLeft >();
-  Impl::test_1d_assign_impl< Space, Kokkos::LayoutStride, Kokkos::LayoutStride, Kokkos::LayoutLeft, MemTraits >();
+  Impl::test_1d_assign_impl<Space, Kokkos::LayoutLeft, Kokkos::LayoutLeft,
+                            Kokkos::LayoutLeft, MemTraits>();
+  // Impl::test_1d_assign_impl< Space, Kokkos::LayoutRight, Kokkos::LayoutLeft,
+  // Kokkos::LayoutLeft >();
+  Impl::test_1d_assign_impl<Space, Kokkos::LayoutStride, Kokkos::LayoutLeft,
+                            Kokkos::LayoutLeft, MemTraits>();
+  // Impl::test_1d_assign_impl< Space, Kokkos::LayoutLeft, Kokkos::LayoutRight,
+  // Kokkos::LayoutLeft >();
+  Impl::test_1d_assign_impl<Space, Kokkos::LayoutRight, Kokkos::LayoutRight,
+                            Kokkos::LayoutRight, MemTraits>();
+  Impl::test_1d_assign_impl<Space, Kokkos::LayoutStride, Kokkos::LayoutRight,
+                            Kokkos::LayoutRight, MemTraits>();
+  // Impl::test_1d_assign_impl< Space, Kokkos::LayoutLeft, Kokkos::LayoutStride,
+  // Kokkos::LayoutLeft >(); Impl::test_1d_assign_impl< Space,
+  // Kokkos::LayoutRight, Kokkos::LayoutStride, Kokkos::LayoutLeft >();
+  Impl::test_1d_assign_impl<Space, Kokkos::LayoutStride, Kokkos::LayoutStride,
+                            Kokkos::LayoutLeft, MemTraits>();
 }
 
-template< class Space, class MemTraits = void >
+template <class Space, class MemTraits = void>
 void test_2d_subview_3d() {
-  Impl::test_2d_subview_3d_impl_layout< Space, Kokkos::LayoutRight, Kokkos::LayoutRight, Kokkos::LayoutRight, MemTraits >();
-  Impl::test_2d_subview_3d_impl_layout< Space, Kokkos::LayoutStride, Kokkos::LayoutRight, Kokkos::LayoutRight, MemTraits >();
-  Impl::test_2d_subview_3d_impl_layout< Space, Kokkos::LayoutStride, Kokkos::LayoutStride, Kokkos::LayoutRight, MemTraits >();
-  Impl::test_2d_subview_3d_impl_layout< Space, Kokkos::LayoutStride, Kokkos::LayoutLeft,  Kokkos::LayoutLeft,  MemTraits >();
-  Impl::test_2d_subview_3d_impl_layout< Space, Kokkos::LayoutStride, Kokkos::LayoutStride, Kokkos::LayoutLeft,  MemTraits >();
+  Impl::test_2d_subview_3d_impl_layout<Space, Kokkos::LayoutRight,
+                                       Kokkos::LayoutRight, Kokkos::LayoutRight,
+                                       MemTraits>();
+  Impl::test_2d_subview_3d_impl_layout<Space, Kokkos::LayoutStride,
+                                       Kokkos::LayoutRight, Kokkos::LayoutRight,
+                                       MemTraits>();
+  Impl::test_2d_subview_3d_impl_layout<Space, Kokkos::LayoutStride,
+                                       Kokkos::LayoutStride,
+                                       Kokkos::LayoutRight, MemTraits>();
+  Impl::test_2d_subview_3d_impl_layout<Space, Kokkos::LayoutStride,
+                                       Kokkos::LayoutLeft, Kokkos::LayoutLeft,
+                                       MemTraits>();
+  Impl::test_2d_subview_3d_impl_layout<Space, Kokkos::LayoutStride,
+                                       Kokkos::LayoutStride, Kokkos::LayoutLeft,
+                                       MemTraits>();
 }
 
-template< class Space, class MemTraits = void >
+template <class Space, class MemTraits = void>
 void test_3d_subview_5d_right() {
-  Impl::test_3d_subview_5d_impl_layout< Space, Kokkos::LayoutStride, Kokkos::LayoutRight, Kokkos::LayoutRight, MemTraits >();
-  Impl::test_3d_subview_5d_impl_layout< Space, Kokkos::LayoutStride, Kokkos::LayoutStride, Kokkos::LayoutRight, MemTraits >();
+  Impl::test_3d_subview_5d_impl_layout<Space, Kokkos::LayoutStride,
+                                       Kokkos::LayoutRight, Kokkos::LayoutRight,
+                                       MemTraits>();
+  Impl::test_3d_subview_5d_impl_layout<Space, Kokkos::LayoutStride,
+                                       Kokkos::LayoutStride,
+                                       Kokkos::LayoutRight, MemTraits>();
 }
 
-template< class Space, class MemTraits = void >
+template <class Space, class MemTraits = void>
 void test_3d_subview_5d_left() {
-  Impl::test_3d_subview_5d_impl_layout< Space, Kokkos::LayoutStride, Kokkos::LayoutLeft,  Kokkos::LayoutLeft,  MemTraits >();
-  Impl::test_3d_subview_5d_impl_layout< Space, Kokkos::LayoutStride, Kokkos::LayoutStride, Kokkos::LayoutLeft,  MemTraits >();
+  Impl::test_3d_subview_5d_impl_layout<Space, Kokkos::LayoutStride,
+                                       Kokkos::LayoutLeft, Kokkos::LayoutLeft,
+                                       MemTraits>();
+  Impl::test_3d_subview_5d_impl_layout<Space, Kokkos::LayoutStride,
+                                       Kokkos::LayoutStride, Kokkos::LayoutLeft,
+                                       MemTraits>();
 }
 
 namespace Impl {
 
-template< class Layout, class Space >
+template <class Layout, class Space>
 struct FillView_3D {
-  Kokkos::View< int***, Layout, Space > a;
+  Kokkos::View<int***, Layout, Space> a;
 
   KOKKOS_INLINE_FUNCTION
-  void operator()( const int & ii ) const
-  {
-    const int i = std::is_same< Layout, Kokkos::LayoutLeft >::value
-                ? ii % a.extent(0)
-                : ii / ( a.extent(1) * a.extent(2) );
+  void operator()(const int& ii) const {
+    const int i = std::is_same<Layout, Kokkos::LayoutLeft>::value
+                      ? ii % a.extent(0)
+                      : ii / (a.extent(1) * a.extent(2));
 
-    const int j = std::is_same< Layout, Kokkos::LayoutLeft >::value
-                ? ( ii / a.extent(0) ) % a.extent(1)
-                : ( ii / a.extent(2) ) % a.extent(1);
+    const int j = std::is_same<Layout, Kokkos::LayoutLeft>::value
+                      ? (ii / a.extent(0)) % a.extent(1)
+                      : (ii / a.extent(2)) % a.extent(1);
 
-    const int k = std::is_same< Layout, Kokkos::LayoutRight >::value
-                ? ii / ( a.extent(0) * a.extent(1) )
-                : ii % a.extent(2);
+    const int k = std::is_same<Layout, Kokkos::LayoutLeft>::value
+                      ? ii / (a.extent(0) * a.extent(1))
+                      : ii % a.extent(2);
 
-    a( i, j, k ) = 1000000 * i + 1000 * j + k;
+    a(i, j, k) = 1000000 * i + 1000 * j + k;
   }
 };
 
-template< class Layout, class Space >
+template <class Layout, class Space>
 struct FillView_4D {
-  Kokkos::View< int****, Layout, Space > a;
+  Kokkos::View<int****, Layout, Space> a;
 
   KOKKOS_INLINE_FUNCTION
-  void operator()( const int & ii ) const {
-    const int i = std::is_same< Layout, Kokkos::LayoutLeft >::value
-              ? ii % a.extent(0)
-              : ii / ( a.extent(1) * a.extent(2) * a.extent(3) );
+  void operator()(const int& ii) const {
+    const int i = std::is_same<Layout, Kokkos::LayoutLeft>::value
+                      ? ii % a.extent(0)
+                      : ii / (a.extent(1) * a.extent(2) * a.extent(3));
 
-    const int j = std::is_same< Layout, Kokkos::LayoutLeft >::value
-              ? ( ii / a.extent(0) ) % a.extent(1)
-              : ( ii / ( a.extent(2) * a.extent(3) ) % a.extent(1) );
+    const int j = std::is_same<Layout, Kokkos::LayoutLeft>::value
+                      ? (ii / a.extent(0)) % a.extent(1)
+                      : (ii / (a.extent(2) * a.extent(3)) % a.extent(1));
 
-    const int k = std::is_same< Layout, Kokkos::LayoutRight >::value
-              ? ( ii / ( a.extent(0) * a.extent(1) ) ) % a.extent(2)
-              : ( ii / a.extent(3) ) % a.extent(2);
+    const int k = std::is_same<Layout, Kokkos::LayoutLeft>::value
+                      ? (ii / (a.extent(0) * a.extent(1))) % a.extent(2)
+                      : (ii / a.extent(3)) % a.extent(2);
 
-    const int l = std::is_same< Layout, Kokkos::LayoutRight >::value
-                ? ii / ( a.extent(0) * a.extent(1) * a.extent(2) )
-                : ii % a.extent(3);
+    const int l = std::is_same<Layout, Kokkos::LayoutLeft>::value
+                      ? ii / (a.extent(0) * a.extent(1) * a.extent(2))
+                      : ii % a.extent(3);
 
-    a( i, j, k, l ) = 1000000 * i + 10000 * j + 100 * k + l;
+    a(i, j, k, l) = 1000000 * i + 10000 * j + 100 * k + l;
   }
 };
 
-template< class Layout, class Space, class MemTraits >
+template <class Layout, class Space, class MemTraits>
 struct CheckSubviewCorrectness_3D_3D {
-  Kokkos::View< const int***, Layout, Space, MemTraits > a;
-  Kokkos::View< const int***, Layout, Space, MemTraits > b;
+  Kokkos::View<const int***, Layout, Space, MemTraits> a;
+  Kokkos::View<const int***, Layout, Space, MemTraits> b;
   int offset_0, offset_2;
 
   KOKKOS_INLINE_FUNCTION
-  void operator()( const int & ii ) const
-  {
-    const int i = std::is_same< Layout, Kokkos::LayoutLeft >::value
-                ? ii % b.extent(0)
-                : ii / ( b.extent(1) * b.extent(2) );
+  void operator()(const int& ii) const {
+    const int i = std::is_same<Layout, Kokkos::LayoutLeft>::value
+                      ? ii % b.extent(0)
+                      : ii / (b.extent(1) * b.extent(2));
 
-    const int j = std::is_same< Layout, Kokkos::LayoutLeft >::value
-                ? ( ii / b.extent(0) ) % b.extent(1)
-                : ( ii / b.extent(2) ) % b.extent(1);
+    const int j = std::is_same<Layout, Kokkos::LayoutLeft>::value
+                      ? (ii / b.extent(0)) % b.extent(1)
+                      : (ii / b.extent(2)) % b.extent(1);
 
-    const int k = std::is_same< Layout, Kokkos::LayoutRight >::value
-                ? ii / ( b.extent(0) * b.extent(1) )
-                : ii % b.extent(2);
+    const int k = std::is_same<Layout, Kokkos::LayoutLeft>::value
+                      ? ii / (b.extent(0) * b.extent(1))
+                      : ii % b.extent(2);
 
-    if ( a( i + offset_0, j, k + offset_2 ) != b( i, j, k ) ) {
-      Kokkos::abort( "Error: check_subview_correctness 3D-3D (LayoutLeft -> LayoutLeft or LayoutRight -> LayoutRight)" );
+    if (a(i + offset_0, j, k + offset_2) != b(i, j, k)) {
+      Kokkos::abort(
+          "Error: check_subview_correctness 3D-3D (LayoutLeft -> LayoutLeft or "
+          "LayoutRight -> LayoutRight)");
     }
   }
 };
 
-template< class Layout, class Space, class MemTraits >
+template <class Layout, class Space, class MemTraits>
 struct CheckSubviewCorrectness_3D_4D {
-  Kokkos::View< const int****, Layout, Space, MemTraits > a;
-  Kokkos::View< const int***, Layout, Space, MemTraits > b;
+  Kokkos::View<const int****, Layout, Space, MemTraits> a;
+  Kokkos::View<const int***, Layout, Space, MemTraits> b;
   int offset_0, offset_2, index;
 
   KOKKOS_INLINE_FUNCTION
-  void operator()( const int & ii ) const {
-    const int i = std::is_same< Layout, Kokkos::LayoutLeft >::value
-                ? ii % b.extent(0)
-                : ii / ( b.extent(1) * b.extent(2) );
+  void operator()(const int& ii) const {
+    const int i = std::is_same<Layout, Kokkos::LayoutLeft>::value
+                      ? ii % b.extent(0)
+                      : ii / (b.extent(1) * b.extent(2));
 
-    const int j = std::is_same< Layout, Kokkos::LayoutLeft >::value
-                ? ( ii / b.extent(0) ) % b.extent(1)
-                : ( ii / b.extent(2) ) % b.extent(1);
+    const int j = std::is_same<Layout, Kokkos::LayoutLeft>::value
+                      ? (ii / b.extent(0)) % b.extent(1)
+                      : (ii / b.extent(2)) % b.extent(1);
 
-    const int k = std::is_same< Layout, Kokkos::LayoutRight >::value
-                ? ii / ( b.extent(0) * b.extent(1) )
-                : ii % b.extent(2);
+    const int k = std::is_same<Layout, Kokkos::LayoutLeft>::value
+                      ? ii / (b.extent(0) * b.extent(1))
+                      : ii % b.extent(2);
 
     int i0, i1, i2, i3;
 
-    if ( std::is_same< Layout, Kokkos::LayoutLeft >::value ) {
+    if (std::is_same<Layout, Kokkos::LayoutLeft>::value) {
       i0 = i + offset_0;
       i1 = j;
       i2 = k + offset_2;
       i3 = index;
-    }
-    else {
+    } else {
       i0 = index;
       i1 = i + offset_0;
       i2 = j;
       i3 = k + offset_2;
     }
 
-    if ( a( i0, i1, i2, i3 ) != b( i, j, k ) ) {
-      Kokkos::abort( "Error: check_subview_correctness 3D-4D (LayoutLeft -> LayoutLeft or LayoutRight -> LayoutRight)" );
+    if (a(i0, i1, i2, i3) != b(i, j, k)) {
+      Kokkos::abort(
+          "Error: check_subview_correctness 3D-4D (LayoutLeft -> LayoutLeft or "
+          "LayoutRight -> LayoutRight)");
     }
   }
 };
 
-} // namespace Impl
+}  // namespace Impl
 
-template< class Space, class MemTraits = void >
+template <class Space, class MemTraits = void>
 void test_layoutleft_to_layoutleft() {
   Impl::test_subview_legal_args_left();
 
   {
-    Kokkos::View< int***, Kokkos::LayoutLeft, Space > a( "A", 100, 4, 3 );
-    Kokkos::View< int***, Kokkos::LayoutLeft, Space > b( a, Kokkos::pair< int, int >( 16, 32 ), Kokkos::ALL, Kokkos::ALL );
-
-    Impl::FillView_3D< Kokkos::LayoutLeft, Space > fill;
-    fill.a = a;
-    Kokkos::parallel_for( Kokkos::RangePolicy< typename Space::execution_space >( 0, a.extent( 0 ) * a.extent( 1 ) * a.extent( 2 ) ), fill );
-
-    Impl::CheckSubviewCorrectness_3D_3D< Kokkos::LayoutLeft, Space, MemTraits > check;
-    check.a = a;
-    check.b = b;
-    check.offset_0 = 16;
-    check.offset_2 = 0;
-    Kokkos::parallel_for( Kokkos::RangePolicy< typename Space::execution_space >( 0, b.extent( 0 ) * b.extent( 1 ) * b.extent( 2 ) ), check );
-    Kokkos::fence();
-  }
-
-  {
-    Kokkos::View< int***, Kokkos::LayoutLeft, Space > a( "A", 100, 4, 5 );
-    Kokkos::View< int***, Kokkos::LayoutLeft, Space > b( a, Kokkos::pair< int, int >( 16, 32 ), Kokkos::ALL, Kokkos::pair< int, int >( 1, 3 ) );
+    Kokkos::View<int***, Kokkos::LayoutLeft, Space> a("A", 100, 4, 3);
+    Kokkos::View<int***, Kokkos::LayoutLeft, Space> b(
+        a, Kokkos::pair<int, int>(16, 32), Kokkos::ALL, Kokkos::ALL);
 
     Impl::FillView_3D<Kokkos::LayoutLeft, Space> fill;
     fill.a = a;
-    Kokkos::parallel_for( Kokkos::RangePolicy< typename Space::execution_space >( 0, a.extent( 0 ) * a.extent( 1 ) * a.extent( 2 ) ), fill );
+    Kokkos::parallel_for(Kokkos::RangePolicy<typename Space::execution_space>(
+                             0, a.extent(0) * a.extent(1) * a.extent(2)),
+                         fill);
 
-    Impl::CheckSubviewCorrectness_3D_3D< Kokkos::LayoutLeft, Space, MemTraits > check;
-    check.a = a;
-    check.b = b;
+    Impl::CheckSubviewCorrectness_3D_3D<Kokkos::LayoutLeft, Space, MemTraits>
+        check;
+    check.a        = a;
+    check.b        = b;
     check.offset_0 = 16;
-    check.offset_2 = 1;
-    Kokkos::parallel_for( Kokkos::RangePolicy< typename Space::execution_space >( 0, b.extent( 0 ) * b.extent( 1 ) * b.extent( 2 ) ), check );
+    check.offset_2 = 0;
+    Kokkos::parallel_for(Kokkos::RangePolicy<typename Space::execution_space>(
+                             0, b.extent(0) * b.extent(1) * b.extent(2)),
+                         check);
     Kokkos::fence();
   }
 
   {
-    Kokkos::View< int****, Kokkos::LayoutLeft, Space > a( "A", 100, 4, 5, 3 );
-    Kokkos::View< int***, Kokkos::LayoutLeft, Space > b( a, Kokkos::pair< int, int >( 16, 32 ), Kokkos::ALL, Kokkos::pair< int, int >( 1, 3 ), 1 );
+    Kokkos::View<int***, Kokkos::LayoutLeft, Space> a("A", 100, 4, 5);
+    Kokkos::View<int***, Kokkos::LayoutLeft, Space> b(
+        a, Kokkos::pair<int, int>(16, 32), Kokkos::ALL,
+        Kokkos::pair<int, int>(1, 3));
 
-    Impl::FillView_4D< Kokkos::LayoutLeft, Space > fill;
+    Impl::FillView_3D<Kokkos::LayoutLeft, Space> fill;
     fill.a = a;
-    Kokkos::parallel_for( Kokkos::RangePolicy< typename Space::execution_space >( 0, a.extent( 0 ) * a.extent( 1 ) * a.extent( 2 ) * a.extent( 3 ) ), fill );
+    Kokkos::parallel_for(Kokkos::RangePolicy<typename Space::execution_space>(
+                             0, a.extent(0) * a.extent(1) * a.extent(2)),
+                         fill);
 
-    Impl::CheckSubviewCorrectness_3D_4D< Kokkos::LayoutLeft, Space, MemTraits > check;
-    check.a = a;
-    check.b = b;
+    Impl::CheckSubviewCorrectness_3D_3D<Kokkos::LayoutLeft, Space, MemTraits>
+        check;
+    check.a        = a;
+    check.b        = b;
     check.offset_0 = 16;
     check.offset_2 = 1;
-    check.index = 1;
-    Kokkos::parallel_for( Kokkos::RangePolicy< typename Space::execution_space >( 0, b.extent( 0 ) * b.extent( 1 ) * b.extent( 2 ) ), check );
+    Kokkos::parallel_for(Kokkos::RangePolicy<typename Space::execution_space>(
+                             0, b.extent(0) * b.extent(1) * b.extent(2)),
+                         check);
+    Kokkos::fence();
+  }
+
+  {
+    Kokkos::View<int****, Kokkos::LayoutLeft, Space> a("A", 100, 4, 5, 3);
+    Kokkos::View<int***, Kokkos::LayoutLeft, Space> b(
+        a, Kokkos::pair<int, int>(16, 32), Kokkos::ALL,
+        Kokkos::pair<int, int>(1, 3), 1);
+
+    Impl::FillView_4D<Kokkos::LayoutLeft, Space> fill;
+    fill.a = a;
+    Kokkos::parallel_for(
+        Kokkos::RangePolicy<typename Space::execution_space>(
+            0, a.extent(0) * a.extent(1) * a.extent(2) * a.extent(3)),
+        fill);
+
+    Impl::CheckSubviewCorrectness_3D_4D<Kokkos::LayoutLeft, Space, MemTraits>
+        check;
+    check.a        = a;
+    check.b        = b;
+    check.offset_0 = 16;
+    check.offset_2 = 1;
+    check.index    = 1;
+    Kokkos::parallel_for(Kokkos::RangePolicy<typename Space::execution_space>(
+                             0, b.extent(0) * b.extent(1) * b.extent(2)),
+                         check);
     Kokkos::fence();
   }
 }
 
-template< class Space, class MemTraits = void >
+template <class Space, class MemTraits = void>
 void test_layoutright_to_layoutright() {
   Impl::test_subview_legal_args_right();
 
   {
-    Kokkos::View< int***, Kokkos::LayoutRight, Space > a( "A", 100, 4, 3 );
-    Kokkos::View< int***, Kokkos::LayoutRight, Space > b( a, Kokkos::pair< int, int >( 16, 32 ), Kokkos::ALL, Kokkos::ALL );
+    Kokkos::View<int***, Kokkos::LayoutRight, Space> a("A", 100, 4, 3);
+    Kokkos::View<int***, Kokkos::LayoutRight, Space> b(
+        a, Kokkos::pair<int, int>(16, 32), Kokkos::ALL, Kokkos::ALL);
 
     Impl::FillView_3D<Kokkos::LayoutRight, Space> fill;
     fill.a = a;
-    Kokkos::parallel_for( Kokkos::RangePolicy< typename Space::execution_space >( 0, a.extent( 0 ) * a.extent( 1 ) * a.extent( 2 ) ), fill );
+    Kokkos::parallel_for(Kokkos::RangePolicy<typename Space::execution_space>(
+                             0, a.extent(0) * a.extent(1) * a.extent(2)),
+                         fill);
 
-    Impl::CheckSubviewCorrectness_3D_3D< Kokkos::LayoutRight, Space, MemTraits > check;
-    check.a = a;
-    check.b = b;
+    Impl::CheckSubviewCorrectness_3D_3D<Kokkos::LayoutRight, Space, MemTraits>
+        check;
+    check.a        = a;
+    check.b        = b;
     check.offset_0 = 16;
     check.offset_2 = 0;
-    Kokkos::parallel_for( Kokkos::RangePolicy< typename Space::execution_space >( 0, b.extent( 0 ) * b.extent( 1 ) * b.extent( 2 ) ), check );
+    Kokkos::parallel_for(Kokkos::RangePolicy<typename Space::execution_space>(
+                             0, b.extent(0) * b.extent(1) * b.extent(2)),
+                         check);
     Kokkos::fence();
   }
 
   {
-    Kokkos::View< int****, Kokkos::LayoutRight, Space > a( "A", 3, 4, 5, 100 );
-    Kokkos::View< int***, Kokkos::LayoutRight, Space > b( a, 1, Kokkos::pair< int, int >( 1, 3 ), Kokkos::ALL, Kokkos::ALL );
+    Kokkos::View<int****, Kokkos::LayoutRight, Space> a("A", 3, 4, 5, 100);
+    Kokkos::View<int***, Kokkos::LayoutRight, Space> b(
+        a, 1, Kokkos::pair<int, int>(1, 3), Kokkos::ALL, Kokkos::ALL);
 
-    Impl::FillView_4D< Kokkos::LayoutRight, Space > fill;
+    Impl::FillView_4D<Kokkos::LayoutRight, Space> fill;
     fill.a = a;
-    Kokkos::parallel_for( Kokkos::RangePolicy< typename Space::execution_space >( 0, a.extent( 0 ) * a.extent( 1 ) * a.extent( 2 ) * a.extent( 3 ) ), fill );
+    Kokkos::parallel_for(
+        Kokkos::RangePolicy<typename Space::execution_space>(
+            0, a.extent(0) * a.extent(1) * a.extent(2) * a.extent(3)),
+        fill);
 
-    Impl::CheckSubviewCorrectness_3D_4D< Kokkos::LayoutRight, Space, MemTraits > check;
-    check.a = a;
-    check.b = b;
+    Impl::CheckSubviewCorrectness_3D_4D<Kokkos::LayoutRight, Space, MemTraits>
+        check;
+    check.a        = a;
+    check.b        = b;
     check.offset_0 = 1;
     check.offset_2 = 0;
-    check.index = 1;
-    Kokkos::parallel_for( Kokkos::RangePolicy< typename Space::execution_space >( 0, b.extent( 0 ) * b.extent( 1 ) * b.extent( 2 ) ), check );
+    check.index    = 1;
+    Kokkos::parallel_for(Kokkos::RangePolicy<typename Space::execution_space>(
+                             0, b.extent(0) * b.extent(1) * b.extent(2)),
+                         check);
     Kokkos::fence();
   }
 }
 
 //----------------------------------------------------------------------------
 
-template< class Space >
-struct TestUnmanagedSubviewReset
-{
-  Kokkos::View<int****,Space> a ;
+template <class Space>
+struct TestUnmanagedSubviewReset {
+  Kokkos::View<int****, Space> a;
 
   KOKKOS_INLINE_FUNCTION
-  void operator()( int ) const noexcept
-    {
-      auto sub_a = Kokkos::subview(a,0,Kokkos::ALL,Kokkos::ALL,Kokkos::ALL);
+  void operator()(int) const noexcept {
+    auto sub_a = Kokkos::subview(a, 0, Kokkos::ALL, Kokkos::ALL, Kokkos::ALL);
 
-      for ( int i = 0 ; i < int(a.extent(0)) ; ++i ) {
-        sub_a.assign_data( & a(i,0,0,0) );
-        if ( & sub_a(1,1,1) != & a(i,1,1,1) ) {
-          Kokkos::abort("TestUnmanagedSubviewReset");
-        }
+    for (int i = 0; i < int(a.extent(0)); ++i) {
+      sub_a.assign_data(&a(i, 0, 0, 0));
+      if (&sub_a(1, 1, 1) != &a(i, 1, 1, 1)) {
+        Kokkos::abort("TestUnmanagedSubviewReset");
       }
     }
+  }
 
-  TestUnmanagedSubviewReset()
-    : a( Kokkos::view_alloc() , 20 , 10 , 5 , 2 )
-    {}
+  TestUnmanagedSubviewReset() : a(Kokkos::view_alloc(), 20, 10, 5, 2) {}
 };
 
-template< class Space >
-void test_unmanaged_subview_reset()
-{
-  Kokkos::parallel_for
-    ( Kokkos::RangePolicy< typename Space::execution_space >(0,1)
-    , TestUnmanagedSubviewReset<Space>()
-    );
+template <class Space>
+void test_unmanaged_subview_reset() {
+  Kokkos::parallel_for(
+      Kokkos::RangePolicy<typename Space::execution_space>(0, 1),
+      TestUnmanagedSubviewReset<Space>());
 }
 
 //----------------------------------------------------------------------------
@@ -1419,120 +1940,134 @@ template <class T>
 struct get_view_type;
 
 template <class T, class... Args>
-struct get_view_type<
-  Kokkos::View<T, Args...>
-> {
+struct get_view_type<Kokkos::View<T, Args...> > {
   using type = T;
 };
 
 template <class T>
-struct ___________________________________TYPE_DISPLAY________________________________________;
-#define TYPE_DISPLAY(...) typename ___________________________________TYPE_DISPLAY________________________________________<__VA_ARGS__>::type notdefined;
+struct
+    ___________________________________TYPE_DISPLAY________________________________________;
+#define TYPE_DISPLAY(...)                                                                           \
+  typename ___________________________________TYPE_DISPLAY________________________________________< \
+      __VA_ARGS__>::type notdefined;
 
 template <class Space, class Layout>
-struct TestSubviewStaticSizes
-{
-  Kokkos::View<int*[10][5][2], Layout, Space> a;
+struct TestSubviewStaticSizes {
+  Kokkos::View<int * [10][5][2], Layout, Space> a;
+  Kokkos::View<int[6][7][8], Layout, Space> b;
 
   KOKKOS_INLINE_FUNCTION
-  int operator()() const noexcept
-  {
+  int operator()() const noexcept {
     /* Doesn't actually do anything; just static assertions */
 
     auto sub_a = Kokkos::subview(a, 0, Kokkos::ALL, Kokkos::ALL, Kokkos::ALL);
     typename static_expect_same<
-      /* expected */ int[10][5][2],
-      /*  actual  */ typename get_view_type<decltype(sub_a)>::type
-    >::type test_1 = 0;
+        /* expected */ int[10][5][2],
+        /*  actual  */ typename get_view_type<decltype(sub_a)>::type>::type
+        test_1 = 0;
 
     auto sub_a_2 = Kokkos::subview(a, 0, 0, Kokkos::ALL, Kokkos::ALL);
     typename static_expect_same<
-      /* expected */ int[5][2],
-      /*  actual  */ typename get_view_type<decltype(sub_a_2)>::type
-    >::type test_2 = 0;
+        /* expected */ int[5][2],
+        /*  actual  */ typename get_view_type<decltype(sub_a_2)>::type>::type
+        test_2 = 0;
 
     auto sub_a_3 = Kokkos::subview(a, 0, 0, Kokkos::ALL, 0);
     typename static_expect_same<
-      /* expected */ int[5],
-      /*  actual  */ typename get_view_type<decltype(sub_a_3)>::type
-    >::type test_3 = 0;
+        /* expected */ int[5],
+        /*  actual  */ typename get_view_type<decltype(sub_a_3)>::type>::type
+        test_3 = 0;
 
     auto sub_a_4 = Kokkos::subview(a, Kokkos::ALL, 0, Kokkos::ALL, Kokkos::ALL);
     typename static_expect_same<
-      /* expected */ int*[5][2],
-      /*  actual  */ typename get_view_type<decltype(sub_a_4)>::type
-    >::type test_4 = 0;
+        /* expected */ int * [5][2],
+        /*  actual  */ typename get_view_type<decltype(sub_a_4)>::type>::type
+        test_4 = 0;
 
-    // TODO we'll need to update this test once we allow interleaving of static and dynamic
-    auto sub_a_5 = Kokkos::subview(a, Kokkos::ALL, 0, Kokkos::ALL, Kokkos::make_pair(0, 1));
+    // TODO we'll need to update this test once we allow interleaving of static
+    // and dynamic
+    auto sub_a_5 = Kokkos::subview(a, Kokkos::ALL, 0, Kokkos::ALL,
+                                   Kokkos::make_pair(0, 1));
     typename static_expect_same<
-      /* expected */ int***,
-      /*  actual  */ typename get_view_type<decltype(sub_a_5)>::type
-    >::type test_5 = 0;
+        /* expected */ int***,
+        /*  actual  */ typename get_view_type<decltype(sub_a_5)>::type>::type
+        test_5 = 0;
 
     auto sub_a_sub = Kokkos::subview(sub_a_5, 0, Kokkos::ALL, 0);
     typename static_expect_same<
-      /* expected */ int*,
-      /*  actual  */ typename get_view_type<decltype(sub_a_sub)>::type
-    >::type test_sub = 0;
+        /* expected */ int*,
+        /*  actual  */ typename get_view_type<decltype(sub_a_sub)>::type>::type
+        test_sub = 0;
 
-    auto sub_a_7 = Kokkos::subview(a, Kokkos::ALL, 0, Kokkos::make_pair(0, 1), Kokkos::ALL);
+    auto sub_a_7 = Kokkos::subview(a, Kokkos::ALL, 0, Kokkos::make_pair(0, 1),
+                                   Kokkos::ALL);
     typename static_expect_same<
-      /* expected */ int**[2],
-      /*  actual  */ typename get_view_type<decltype(sub_a_7)>::type
-    >::type test_7 = 0;
+        /* expected */ int* * [2],
+        /*  actual  */ typename get_view_type<decltype(sub_a_7)>::type>::type
+        test_7 = 0;
 
+    auto sub_a_8 =
+        Kokkos::subview(a, Kokkos::ALL, Kokkos::ALL, Kokkos::ALL, Kokkos::ALL);
+    typename static_expect_same<
+        /* expected */ int * [10][5][2],
+        /*  actual  */ typename get_view_type<decltype(sub_a_8)>::type>::type
+        test_8 = 0;
 
-    return test_1 + test_2 + test_3 + test_4 + test_5 + test_sub + test_7;
+    auto sub_b = Kokkos::subview(b, Kokkos::ALL, Kokkos::ALL, Kokkos::ALL);
+    typename static_expect_same<
+        /* expected */ int[6][7][8],
+        /*  actual  */ typename get_view_type<decltype(sub_b)>::type>::type
+        test_9 = 0;
+
+    auto sub_b_2 = Kokkos::subview(b, 0, Kokkos::ALL, Kokkos::ALL);
+    typename static_expect_same<
+        /* expected */ int[7][8],
+        /*  actual  */ typename get_view_type<decltype(sub_b_2)>::type>::type
+        test_10 = 0;
+
+    auto sub_b_3 =
+        Kokkos::subview(b, Kokkos::make_pair(2, 3), Kokkos::ALL, Kokkos::ALL);
+    typename static_expect_same<
+        /* expected */ int * [7][8],
+        /*  actual  */ typename get_view_type<decltype(sub_b_3)>::type>::type
+        test_11 = 0;
+
+    return test_1 + test_2 + test_3 + test_4 + test_5 + test_sub + test_7 +
+           test_8 + test_9 + test_10 + test_11;
   }
 
-  TestSubviewStaticSizes()
-    : a( Kokkos::view_alloc() , 20 )
-  {}
+  TestSubviewStaticSizes() : a(Kokkos::view_alloc(), 20), b() {}
 };
 
-
 template <class Space>
 struct TestExtentsStaticTests {
-
-  using test1 = typename
-    static_expect_same<
+  using test1 = typename static_expect_same<
       /* expected */
-      Kokkos::Experimental::Extents<
-        Kokkos::Experimental::dynamic_extent,
-        Kokkos::Experimental::dynamic_extent,
-        1, 2, 3
-      >,
+      Kokkos::Experimental::Extents<Kokkos::Experimental::dynamic_extent,
+                                    Kokkos::Experimental::dynamic_extent, 1, 2,
+                                    3>,
       /* actual */
-      typename Kokkos::Impl::ParseViewExtents<double**[1][2][3]>::type
-    >::type;
+      typename Kokkos::Impl::ParseViewExtents<double* * [1][2][3]>::type>::type;
 
-  using test2 = typename
-    static_expect_same<
+  using test2 = typename static_expect_same<
       /* expected */
       Kokkos::Experimental::Extents<1, 2, 3>,
       /* actual */
-      typename Kokkos::Impl::ParseViewExtents<double[1][2][3]>::type
-    >::type;
+      typename Kokkos::Impl::ParseViewExtents<double[1][2][3]>::type>::type;
 
-  using test3 = typename
-    static_expect_same<
+  using test3 = typename static_expect_same<
       /* expected */
       Kokkos::Experimental::Extents<3>,
       /* actual */
-      typename Kokkos::Impl::ParseViewExtents<double[3]>::type
-    >::type;
+      typename Kokkos::Impl::ParseViewExtents<double[3]>::type>::type;
 
-  using test4 = typename
-    static_expect_same<
+  using test4 = typename static_expect_same<
       /* expected */
       Kokkos::Experimental::Extents<>,
       /* actual */
-      typename Kokkos::Impl::ParseViewExtents<double>::type
-    >::type;
+      typename Kokkos::Impl::ParseViewExtents<double>::type>::type;
 };
 
-} // namespace TestViewSubview
+}  // namespace TestViewSubview
 
 #endif
-
diff --git a/lib/kokkos/core/unit_test/TestView_64bit.hpp b/lib/kokkos/core/unit_test/TestView_64bit.hpp
index e2cb2f6b69..0b7b9d425a 100644
--- a/lib/kokkos/core/unit_test/TestView_64bit.hpp
+++ b/lib/kokkos/core/unit_test/TestView_64bit.hpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -41,85 +42,93 @@
 //@HEADER
 */
 
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 
 namespace Test {
 
-template<class Device>
-void test_64bit(){
-#if defined( KOKKOS_ENABLE_CXX11_DISPATCH_LAMBDA )
-  int64_t N = 5000000000;
+template <class Device>
+void test_64bit() {
+#if defined(KOKKOS_ENABLE_CXX11_DISPATCH_LAMBDA)
+  int64_t N   = 5000000000;
   int64_t sum = 0;
   {
     Kokkos::parallel_reduce(
-      Kokkos::RangePolicy<typename Device::execution_space,Kokkos::IndexType<int64_t>>(0,N),
-      KOKKOS_LAMBDA(const int64_t& i, int64_t& lsum) {
-      lsum += 1;
-    },sum);
-    ASSERT_EQ(N,sum);
+        Kokkos::RangePolicy<typename Device::execution_space,
+                            Kokkos::IndexType<int64_t>>(0, N),
+        KOKKOS_LAMBDA(const int64_t& i, int64_t& lsum) { lsum += 1; }, sum);
+    ASSERT_EQ(N, sum);
   }
   {
-    Kokkos::View<char*,Device> a("A",N);
-    Kokkos::deep_copy(a,char(1));
+    Kokkos::View<char*, Device> a("A", N);
+    Kokkos::deep_copy(a, char(1));
     Kokkos::parallel_reduce(
-        Kokkos::RangePolicy<typename Device::execution_space,Kokkos::IndexType<int64_t>>(0,N),
+        Kokkos::RangePolicy<typename Device::execution_space,
+                            Kokkos::IndexType<int64_t>>(0, N),
         KOKKOS_LAMBDA(const int64_t& i, int64_t& lsum) {
-      lsum += int64_t(a(i));
-    },sum);
-    ASSERT_EQ(N,sum);
+          lsum += int64_t(a(i));
+        },
+        sum);
+    ASSERT_EQ(N, sum);
     Kokkos::parallel_for(
-        Kokkos::RangePolicy<typename Device::execution_space,Kokkos::IndexType<int64_t>>(0,N),
-        KOKKOS_LAMBDA(const int64_t& i) {
-      a(i) = 3;
-    });
+        Kokkos::RangePolicy<typename Device::execution_space,
+                            Kokkos::IndexType<int64_t>>(0, N),
+        KOKKOS_LAMBDA(const int64_t& i) { a(i) = 3; });
     Kokkos::parallel_reduce(
-        Kokkos::RangePolicy<typename Device::execution_space,Kokkos::IndexType<int64_t>>(0,N),
+        Kokkos::RangePolicy<typename Device::execution_space,
+                            Kokkos::IndexType<int64_t>>(0, N),
         KOKKOS_LAMBDA(const int64_t& i, int64_t& lsum) {
-      lsum += int64_t(a(i));
-    },sum);
-    ASSERT_EQ(N*3,sum);
+          lsum += int64_t(a(i));
+        },
+        sum);
+    ASSERT_EQ(N * 3, sum);
   }
   {
     int64_t N0 = 56925;
     int64_t N1 = 56927;
 
-    Kokkos::View<char**,Device> m("Matrix", N0,N1);
-    Kokkos::deep_copy(m,char(1));
+    Kokkos::View<char**, Device> m("Matrix", N0, N1);
+    Kokkos::deep_copy(m, char(1));
     Kokkos::parallel_reduce(
-        Kokkos::RangePolicy<typename Device::execution_space,Kokkos::IndexType<int64_t>>(0,N0*N1),
+        Kokkos::RangePolicy<typename Device::execution_space,
+                            Kokkos::IndexType<int64_t>>(0, N0 * N1),
         KOKKOS_LAMBDA(const int64_t& i, int64_t& lsum) {
-      lsum += int64_t(m(i%N0,i/N0));
-    },sum);
-    ASSERT_EQ(N0*N1,sum);
+          lsum += int64_t(m(i % N0, i / N0));
+        },
+        sum);
+    ASSERT_EQ(N0 * N1, sum);
     Kokkos::parallel_reduce(
-        Kokkos::MDRangePolicy<typename Device::execution_space,Kokkos::Rank<2>,Kokkos::IndexType<int64_t>>({0,0},{N0,N1}),
+        Kokkos::MDRangePolicy<typename Device::execution_space, Kokkos::Rank<2>,
+                              Kokkos::IndexType<int64_t>>({0, 0}, {N0, N1}),
         KOKKOS_LAMBDA(const int64_t& i0, const int64_t& i1, int64_t& lsum) {
-      lsum += int64_t(m(i0,i1));
-    },sum);
-    ASSERT_EQ(N0*N1,sum);
+          lsum += int64_t(m(i0, i1));
+        },
+        sum);
+    ASSERT_EQ(N0 * N1, sum);
   }
   {
-    int N0 = 1024*1024*1500;
+    int N0    = 1024 * 1024 * 1500;
     int64_t P = 1713091;
-    Kokkos::View<int*, Device> a("A",N0);
-    Kokkos::parallel_for("FillA",Kokkos::RangePolicy<typename Device::execution_space, Kokkos::IndexType<int>>(0,N0), KOKKOS_LAMBDA(const int& i) {
-      a(i) = i%P;
-    });
-    int64_t sum0=0;
-    Kokkos::parallel_reduce("FillA",Kokkos::RangePolicy<typename Device::execution_space, Kokkos::IndexType<int>>(0,N0), KOKKOS_LAMBDA(const int& i,int64_t& lsum) {
-      lsum += a(i);
-    },sum0);
-    int64_t expected = (P*(P-1)/2) * int64_t(N0/P) + (N0%P)*(N0%P-1)/2;
-    ASSERT_EQ(expected,sum0);
+    Kokkos::View<int*, Device> a("A", N0);
+    Kokkos::parallel_for(
+        "FillA",
+        Kokkos::RangePolicy<typename Device::execution_space,
+                            Kokkos::IndexType<int>>(0, N0),
+        KOKKOS_LAMBDA(const int& i) { a(i) = i % P; });
+    int64_t sum0 = 0;
+    Kokkos::parallel_reduce(
+        "FillA",
+        Kokkos::RangePolicy<typename Device::execution_space,
+                            Kokkos::IndexType<int>>(0, N0),
+        KOKKOS_LAMBDA(const int& i, int64_t& lsum) { lsum += a(i); }, sum0);
+    int64_t expected =
+        (P * (P - 1) / 2) * int64_t(N0 / P) + (N0 % P) * (N0 % P - 1) / 2;
+    ASSERT_EQ(expected, sum0);
   }
 #endif
 }
 
 #ifdef KOKKOS_ENABLE_LARGE_MEM_TESTS
-TEST_F( TEST_CATEGORY, view_64bit )
-{
-  test_64bit< TEST_EXECSPACE >();
-}
+TEST(TEST_CATEGORY, view_64bit) { test_64bit<TEST_EXECSPACE>(); }
 #endif
 
-}
+}  // namespace Test
diff --git a/lib/kokkos/core/unit_test/TestWorkGraph.hpp b/lib/kokkos/core/unit_test/TestWorkGraph.hpp
index 248733420b..5483051645 100644
--- a/lib/kokkos/core/unit_test/TestWorkGraph.hpp
+++ b/lib/kokkos/core/unit_test/TestWorkGraph.hpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -50,47 +51,45 @@ namespace Test {
 
 namespace {
 
-/* This test is meant to be the WorkGraph equivalent of the Task DAG Scheduler test,
-   please see TestTaskScheduler.hpp for that test.
-   The algorithm computes the N-th fibonacci number as follows:
+/* This test is meant to be the WorkGraph equivalent of the Task DAG Scheduler
+   test, please see TestTaskScheduler.hpp for that test. The algorithm computes
+   the N-th fibonacci number as follows:
     - Each "task" or "work item" computes the i-th fibonacci number
     - If a task as (i < 2), it will record the known answer ahead of time.
-    - If a taks has (i >= 2), it will "spawn" two more tasks to compute
+    - If a task has (i >= 2), it will "spawn" two more tasks to compute
       the (i - 1) and (i - 2) fibonacci numbers.
       We do NOT do any de-duplication of these tasks.
-      De-duplication would result in only (N - 2) tasks which must be run in serial.
-      We allow duplicates both to increase the number of tasks and to increase the
-      amount of available parallelism.
+      De-duplication would result in only (N - 2) tasks which must be run in
+   serial. We allow duplicates both to increase the number of tasks and to
+   increase the amount of available parallelism.
  */
 
-template< class ExecSpace >
+template <class ExecSpace>
 struct TestWorkGraph {
-
   using MemorySpace = typename ExecSpace::memory_space;
-  using Policy = Kokkos::WorkGraphPolicy<std::int32_t, ExecSpace>;
-  using Graph = typename Policy::graph_type;
-  using RowMap = typename Graph::row_map_type;
-  using Entries = typename Graph::entries_type;
-  using Values = Kokkos::View<long*, MemorySpace>;
+  using Policy      = Kokkos::WorkGraphPolicy<std::int32_t, ExecSpace>;
+  using Graph       = typename Policy::graph_type;
+  using RowMap      = typename Graph::row_map_type;
+  using Entries     = typename Graph::entries_type;
+  using Values      = Kokkos::View<long*, MemorySpace>;
 
   long m_input;
   Graph m_graph;
   Graph m_transpose;
   Values m_values;
 
-  TestWorkGraph(long arg_input):m_input(arg_input) {
+  TestWorkGraph(long arg_input) : m_input(arg_input) {
     form_graph();
     transpose_crs(m_transpose, m_graph);
   }
 
-  inline
-  long full_fibonacci( long n ) {
+  inline long full_fibonacci(long n) {
     constexpr long mask = 0x03;
-    long fib[4] = { 0, 1, 1, 2 };
-    for ( long i = 2; i <= n; ++i ) {
-      fib[ i & mask ] = fib[ ( i - 1 ) & mask ] + fib[ ( i - 2 ) & mask ];
+    long fib[4]         = {0, 1, 1, 2};
+    for (long i = 2; i <= n; ++i) {
+      fib[i & mask] = fib[(i - 1) & mask] + fib[(i - 2) & mask];
     }
-    return fib[ n & mask ];
+    return fib[n & mask];
   }
 
   struct HostEntry {
@@ -99,31 +98,33 @@ struct TestWorkGraph {
   };
   std::vector<HostEntry> form_host_graph() {
     std::vector<HostEntry> g;
-    g.push_back({ m_input , -1 });
+    g.push_back({m_input, -1});
     for (std::int32_t i = 0; i < std::int32_t(g.size()); ++i) {
       auto e = g.at(std::size_t(i));
       if (e.input < 2) continue;
-      /* This part of the host graph formation is the equivalent of task spawning
-         in the Task DAG system. Notice how each task which is not a base case
-         spawns two more tasks, without any de-duplication */
-      g.push_back({ e.input - 1, i });
-      g.push_back({ e.input - 2, i });
+      /* This part of the host graph formation is the equivalent of task
+         spawning in the Task DAG system. Notice how each task which is not a
+         base case spawns two more tasks, without any de-duplication */
+      g.push_back({e.input - 1, i});
+      g.push_back({e.input - 2, i});
     }
     return g;
   }
 
   void form_graph() {
     auto hg = form_host_graph();
-    m_graph.row_map = RowMap("row_map", hg.size() + 1); // row map always has one more
-    m_graph.entries = Entries("entries", hg.size() - 1); // all but the first have a parent
+    m_graph.row_map =
+        RowMap("row_map", hg.size() + 1);  // row map always has one more
+    m_graph.entries =
+        Entries("entries", hg.size() - 1);  // all but the first have a parent
     m_values = Values("values", hg.size());
-    //printf("%zu work items\n", hg.size());
+    // printf("%zu work items\n", hg.size());
     auto h_row_map = Kokkos::create_mirror_view(m_graph.row_map);
     auto h_entries = Kokkos::create_mirror_view(m_graph.entries);
-    auto h_values = Kokkos::create_mirror_view(m_values);
-    h_row_map(0) = 0;
+    auto h_values  = Kokkos::create_mirror_view(m_values);
+    h_row_map(0)   = 0;
     for (std::int32_t i = 0; i < std::int32_t(hg.size()); ++i) {
-      auto& e = hg.at(std::size_t(i));
+      auto& e          = hg.at(std::size_t(i));
       h_row_map(i + 1) = i;
       if (e.input < 2) {
         h_values(i) = e.input;
@@ -139,10 +140,10 @@ struct TestWorkGraph {
   KOKKOS_INLINE_FUNCTION
   void operator()(std::int32_t i) const {
     auto begin = m_transpose.row_map(i);
-    auto end = m_transpose.row_map(i + 1);
+    auto end   = m_transpose.row_map(i + 1);
     for (auto j = begin; j < end; ++j) {
       auto k = m_transpose.entries(j);
-      m_values(i) += m_values( k );
+      m_values(i) += m_values(k);
     }
   }
 
@@ -151,22 +152,20 @@ struct TestWorkGraph {
     Kokkos::fence();
     auto h_values = Kokkos::create_mirror_view(m_values);
     Kokkos::deep_copy(h_values, m_values);
-    ASSERT_EQ( h_values(0), full_fibonacci(m_input) );
+    ASSERT_EQ(h_values(0), full_fibonacci(m_input));
   }
-
 };
 
-} // anonymous namespace
+}  // anonymous namespace
 
-TEST_F( TEST_CATEGORY, workgraph_fib )
-{
+TEST(TEST_CATEGORY, workgraph_fib) {
   int limit = 27;
-  for ( int i = 0; i < limit; ++i) {
-    TestWorkGraph< TEST_EXECSPACE > f(i);
+  for (int i = 0; i < limit; ++i) {
+    TestWorkGraph<TEST_EXECSPACE> f(i);
     f.test_for();
   }
-  //TestWorkGraph< TEST_EXECSPACE > f(2);
-  //f.test_for();
+  // TestWorkGraph< TEST_EXECSPACE > f(2);
+  // f.test_for();
 }
 
-} // namespace Test
+}  // namespace Test
diff --git a/lib/kokkos/core/unit_test/UnitTestMain.cpp b/lib/kokkos/core/unit_test/UnitTestMain.cpp
index 5f9091eced..a70409105f 100644
--- a/lib/kokkos/core/unit_test/UnitTestMain.cpp
+++ b/lib/kokkos/core/unit_test/UnitTestMain.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -44,7 +45,7 @@
 #include <gtest/gtest.h>
 #include <cstdlib>
 
-int main( int argc, char *argv[] ) {
-  ::testing::InitGoogleTest( &argc, argv );
+int main(int argc, char *argv[]) {
+  ::testing::InitGoogleTest(&argc, argv);
   return RUN_ALL_TESTS();
 }
diff --git a/lib/kokkos/core/unit_test/UnitTestMainInit.cpp b/lib/kokkos/core/unit_test/UnitTestMainInit.cpp
index 82c8ee8995..140ba418fd 100644
--- a/lib/kokkos/core/unit_test/UnitTestMainInit.cpp
+++ b/lib/kokkos/core/unit_test/UnitTestMainInit.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -46,11 +47,11 @@
 
 #include <Kokkos_Core.hpp>
 
-int main( int argc, char *argv[] ) {
-  Kokkos::initialize(argc,argv);
-  ::testing::InitGoogleTest( &argc, argv );
+int main(int argc, char *argv[]) {
+  Kokkos::initialize(argc, argv);
+  ::testing::InitGoogleTest(&argc, argv);
 
-  int result =  RUN_ALL_TESTS();
+  int result = RUN_ALL_TESTS();
   Kokkos::finalize();
   return result;
 }
diff --git a/lib/kokkos/core/unit_test/UnitTest_PushFinalizeHook.cpp b/lib/kokkos/core/unit_test/UnitTest_PushFinalizeHook.cpp
index 97a7f9df26..1b99691e6d 100644
--- a/lib/kokkos/core/unit_test/UnitTest_PushFinalizeHook.cpp
+++ b/lib/kokkos/core/unit_test/UnitTest_PushFinalizeHook.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -47,7 +48,7 @@
 #include <sstream>
 #include <Kokkos_Core.hpp>
 
-namespace { // (anonymous)
+namespace {  // (anonymous)
 
 // Output for the finalize hooks.  Use this to make sure that all the
 // hooks ran, and that they ran in the correct order.
@@ -58,7 +59,7 @@ const char hook2str[] = "Yea verily, I am Hook 2.";
 const char hook3str[] = "Indeed, I am Hook 3.";
 const char hook4str[] = "Last but not least, I am Hook 4.";
 
-} // namespace (anonymous)
+}  // namespace
 
 // Don't just have all the hooks print the same thing except for a
 // number.  Have them print different things, so we can detect
@@ -73,62 +74,52 @@ const char hook4str[] = "Last but not least, I am Hook 4.";
 //    unfortunately like to call "functor," even though this word
 //    means something different in other languages.
 
-void hook1 () {
-  hookOutput << hook1str << std::endl;
-}
+void hook1() { hookOutput << hook1str << std::endl; }
 
 struct Hook4 {
-  void operator () () const {
-    hookOutput << hook4str << std::endl;
-  }
+  void operator()() const { hookOutput << hook4str << std::endl; }
 };
 
-int main( int argc, char *argv[] ) {
+int main(int argc, char* argv[]) {
   using std::cout;
   using std::endl;
 
-  const std::string expectedOutput ([] {
-      std::ostringstream os;
-      os << hook4str << endl
-         << hook3str << endl
-         << hook2str << endl
-         << hook1str << endl;
-      return os.str();
-    }());
+  const std::string expectedOutput([] {
+    std::ostringstream os;
+    os << hook4str << endl
+       << hook3str << endl
+       << hook2str << endl
+       << hook1str << endl;
+    return os.str();
+  }());
 
   Kokkos::initialize(argc, argv);
 
-  Kokkos::push_finalize_hook(hook1); // plain old function
-  Kokkos::push_finalize_hook ([] {
-      hookOutput << hook2str << endl;
-    }); // lambda
-  std::function<void()> hook3 = [] {
-    hookOutput << hook3str << endl;
-  };
-  Kokkos::push_finalize_hook(hook3); // actual std::function
+  Kokkos::push_finalize_hook(hook1);  // plain old function
+  Kokkos::push_finalize_hook([] { hookOutput << hook2str << endl; });  // lambda
+  std::function<void()> hook3 = [] { hookOutput << hook3str << endl; };
+  Kokkos::push_finalize_hook(hook3);  // actual std::function
   Hook4 hook4;
-  Kokkos::push_finalize_hook(hook4); // function object instance
+  Kokkos::push_finalize_hook(hook4);  // function object instance
 
   // This should invoke the finalize hooks in reverse order.
   // Furthermore, it should not throw an exception.
   try {
     Kokkos::finalize();
-  }
-  catch (std::exception& e) {
+  } catch (std::exception& e) {
     cout << "FAILED: Kokkos::finalize threw an exception: " << e.what() << endl;
     return EXIT_FAILURE;
-  }
-  catch (...) {
+  } catch (...) {
     cout << "FAILED: Kokkos::finalize threw an exception whose base class "
-      "is not std::exception." << endl;
+            "is not std::exception."
+         << endl;
     return EXIT_FAILURE;
   }
 
   const bool success = (hookOutput.str() == expectedOutput);
   if (success) {
     cout << "SUCCESS" << endl;
-  }
-  else {
+  } else {
     cout << "FAILED:" << endl
          << "  Expected output:" << endl
          << expectedOutput << endl
diff --git a/lib/kokkos/core/unit_test/UnitTest_PushFinalizeHook_terminate.cpp b/lib/kokkos/core/unit_test/UnitTest_PushFinalizeHook_terminate.cpp
index 50b7a3f285..442310542b 100644
--- a/lib/kokkos/core/unit_test/UnitTest_PushFinalizeHook_terminate.cpp
+++ b/lib/kokkos/core/unit_test/UnitTest_PushFinalizeHook_terminate.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -50,30 +51,28 @@
 // throws but does not catch an exception, make sure that
 // Kokkos::finalize calls std::terminate.
 
-namespace { // (anonymous)
+namespace {  // (anonymous)
 
 // If you change this, change CMakeLists.txt in this directory too!
 // I verified that changing this string makes the test fail.
-const char my_terminate_str[] = "PASSED: I am the custom std::terminate handler.";
+const char my_terminate_str[] =
+    "PASSED: I am the custom std::terminate handler.";
 
 // Tell compilers not to complain that this function doesn't return.
-[[ noreturn ]] void my_terminate_handler ()
-{
+[[noreturn]] void my_terminate_handler() {
   std::cerr << my_terminate_str << std::endl;
-  std::abort(); // terminate handlers normally would end by calling this
+  std::abort();  // terminate handlers normally would end by calling this
 }
 
-} // namespace (anonymous)
+}  // namespace
 
-int main(int argc, char *argv[])
-{
+int main(int argc, char *argv[]) {
   // If std::terminate is called, it will call my_terminate_handler.
-  std::set_terminate (my_terminate_handler);
+  std::set_terminate(my_terminate_handler);
 
   Kokkos::initialize(argc, argv);
-  Kokkos::push_finalize_hook([] {
-      throw std::runtime_error ("I am an uncaught exception!");
-    });
+  Kokkos::push_finalize_hook(
+      [] { throw std::runtime_error("I am an uncaught exception!"); });
 
   // This should call std::terminate, which in turn will call
   // my_terminate_handler above.  That will print the message that
diff --git a/lib/kokkos/core/unit_test/config/cmaketest/CMakeLists.txt b/lib/kokkos/core/unit_test/config/cmaketest/CMakeLists.txt
index 54a4c4a74a..72fef0a3e8 100644
--- a/lib/kokkos/core/unit_test/config/cmaketest/CMakeLists.txt
+++ b/lib/kokkos/core/unit_test/config/cmaketest/CMakeLists.txt
@@ -19,7 +19,6 @@ set(KOKKOS_CMAKEFILE kokkos_generated_settings.cmake)
 set(KOKKOS_INTERNAL_CONFIG_TMP KokkosCore_config.tmp)
 set(KOKKOS_CONFIG_HEADER KokkosCore_config.h)
 
-set(KOKKOS_CMAKE_VERBOSE False)
 include(${KOKKOS_SRCDIR}/cmake/kokkos_options.cmake)
 foreach(KOKKOS_DEV ${KOKKOS_DEVICES_LIST})
 # Do some initialization: Want to turn everything off for testing
diff --git a/lib/kokkos/core/unit_test/configuration/test-code/CMakeLists.txt b/lib/kokkos/core/unit_test/configuration/test-code/CMakeLists.txt
new file mode 100644
index 0000000000..49f36c086a
--- /dev/null
+++ b/lib/kokkos/core/unit_test/configuration/test-code/CMakeLists.txt
@@ -0,0 +1,44 @@
+# Kokkos requires CMake version 3.1 or higher and that you have the following
+# line with a version of 3.1 or higher as the first line of your project:
+#   cmake_minimum_required(VERSION 3.1)
+#
+# The other CMake commands required to build Kokkos as part of your application
+# are:
+#   add_subdirectory(path/to/kokkos)
+#   target_link_libraries(executable or library)
+#
+# If Kokkos is not a subdirectory of your project, you will also need to pass a
+# binary directory to add_subdirectory().  We had to pass the binary directory
+# for this example for that reason.  Note that target_link_libraries() can be
+# called on a target added by add_executable(), add_library(), or another
+# similar command.
+#
+# All the flags, etc. required to build using the Kokkos library are
+# transitively added to targets which depend on the library.
+#
+# The CMake variables CMAKE_CXX_STANDARD and CMAKE_CXX_EXTENSIONS are
+# respected.  We recommend that you set CMAKE_CXX_EXTENSIONS to OFF.
+# Otherwise, CMake defaults to using extensions for the C++ standard, and the
+# GNU extensions (-std=gnu++11) will be used for compilers that support it
+# instead of standard C++11 (-std=c++11).
+#
+# A bunch of build options are added as variables (all starting with KOKKOS_)
+# to the build.  Check them out using ccmake or the CMake GUI.
+#
+# Building this example:
+#   1. Create a build directory.
+#   2. cd /path/to/build/directory
+#   3. cmake /path/to/example
+#   4. make
+
+cmake_minimum_required(VERSION 3.10)
+project(Example CXX C Fortran)
+
+list(APPEND CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS} -O3)
+
+add_subdirectory(${Example_SOURCE_DIR}/../../../.. ${Example_BINARY_DIR}/kokkos)
+
+include_directories(${Kokkos_INCLUDE_DIRS_RET})
+
+add_executable(test_cmake.exe main.cpp)
+target_link_libraries(test_cmake.exe kokkos)
diff --git a/lib/kokkos/core/unit_test/configuration/test-code/Makefile b/lib/kokkos/core/unit_test/configuration/test-code/Makefile
new file mode 100644
index 0000000000..8ca5f34990
--- /dev/null
+++ b/lib/kokkos/core/unit_test/configuration/test-code/Makefile
@@ -0,0 +1,46 @@
+KOKKOS_DEVICES=Serial
+KOKKOS_CUDA_OPTIONS=enable_lambda
+KOKKOS_ARCH = "SNB,Kepler35"
+
+
+MAKEFILE_PATH := $(subst Makefile,,$(abspath $(lastword $(MAKEFILE_LIST))))
+
+ifndef KOKKOS_PATH
+  KOKKOS_PATH = $(MAKEFILE_PATH)../../../..
+endif
+
+SRC = $(wildcard $(MAKEFILE_PATH)*.cpp)
+HEADERS = $(wildcard $(MAKEFILE_PATH)*.hpp)
+
+vpath %.cpp $(sort $(dir $(SRC)))
+
+default: build
+	echo "Start Build"
+
+CXX = g++
+EXE = test_config.exe
+
+CXXFLAGS ?= -O3 -g
+override CXXFLAGS += -I$(MAKEFILE_PATH)
+
+DEPFLAGS = -M
+LINK = ${CXX}
+LINKFLAGS =
+
+OBJ = $(notdir $(SRC:.cpp=.o))
+LIB =
+
+include $(KOKKOS_PATH)/Makefile.kokkos
+
+build: $(EXE)
+
+$(EXE): $(OBJ) $(KOKKOS_LINK_DEPENDS)
+	$(LINK) $(KOKKOS_LDFLAGS) $(LINKFLAGS) $(EXTRA_PATH) $(OBJ) $(KOKKOS_LIBS) $(LIB) -o $(EXE)
+
+clean: kokkos-clean
+	rm -f *.o *.cuda *.host
+
+# Compilation rules
+
+%.o:%.cpp $(KOKKOS_CPP_DEPENDS) $(HEADERS)
+	$(CXX) $(KOKKOS_CPPFLAGS) $(KOKKOS_CXXFLAGS) $(CXXFLAGS) $(EXTRA_INC) -c $< -o $(notdir $@)
diff --git a/lib/kokkos/core/unit_test/configuration/test-code/main.cpp b/lib/kokkos/core/unit_test/configuration/test-code/main.cpp
new file mode 100644
index 0000000000..0d2f6de3a9
--- /dev/null
+++ b/lib/kokkos/core/unit_test/configuration/test-code/main.cpp
@@ -0,0 +1,6 @@
+#include <Kokkos_Core.hpp>
+
+int main(int argc, char* argv[]) {
+  Kokkos::initialize(argc, argv);
+  Kokkos::finalize();
+}
diff --git a/lib/kokkos/core/unit_test/configuration/test-code/test_config.bash b/lib/kokkos/core/unit_test/configuration/test-code/test_config.bash
new file mode 100755
index 0000000000..0edb113933
--- /dev/null
+++ b/lib/kokkos/core/unit_test/configuration/test-code/test_config.bash
@@ -0,0 +1,7 @@
+
+mkdir -p gnu-make
+mkdir -p cmake
+export KOKKOS_PATH=$1
+KOKKOS_PATH=$1
+${KOKKOS_PATH}/core/unit_test/configuration/test-code/test_config_device_list.bash
+
diff --git a/lib/kokkos/core/unit_test/configuration/test-code/test_config_arch_list.bash b/lib/kokkos/core/unit_test/configuration/test-code/test_config_arch_list.bash
new file mode 100755
index 0000000000..696d345ff9
--- /dev/null
+++ b/lib/kokkos/core/unit_test/configuration/test-code/test_config_arch_list.bash
@@ -0,0 +1,45 @@
+
+# List of parallel device types 
+HostArch=(SNB HSW SKX KNL)
+DeviceArch=(Kepler35 Kepler37 Pascal60 Pascal61 Volta70)
+if [ ! -z "$KOKKOS_HOST_ARCH_TEST" ]; then
+  export KOKKOS_ARCH_TEST=1
+  HostArch=(WSM SNB HSW SKX WSM AMDAVX ARMv80 ARMv81 BDW KNC KNL BGQ Power7 Power8 Power9 Ryzen EPYC ARMv8_ThunderX ARMv8_ThunderX2)
+  DeviceArch=()
+fi
+
+if [ ! -z "$KOKKOS_DEVICE_ARCH_TEST" ]; then
+  export KOKKOS_ARCH_TEST=1
+  HostArch=(SNB)
+  DeviceArch=(Kepler30 Kepler32 Kepler35 Kepler37 Maxwell50 Maxwell52 Maxwell53 Pascal60 Pascal61 Volta70 Volta72)
+fi
+
+MakeDevices=$1
+CMakeDevices=$2
+
+SRC_DIR=${KOKKOS_PATH}/core/unit_test/configuration/test-code
+
+for harch in "${HostArch[@]}"
+do
+  harch_up=`echo $harch | tr a-z A-Z`
+  CMAKE_HARCH="-DKokkos_ARCH_${harch_up}=ON"
+
+  if [ "$harch" == "ARMv8_ThunderX2" ]; then
+    harch="ARMv8-TX2"
+  elif [ "$harch" == "ARMv8_ThunderX" ]; then
+    harch="ARMv8-ThunderX"
+  fi
+
+  if [ ! -z "$DeviceArch" ]
+  then
+    for darch in "${DeviceArch[@]}"
+    do
+      darch_up=`echo $darch | tr a-z A-Z`
+      CMAKE_DARCH="-DKokkos_ARCH_${darch_up}=ON"
+      ${SRC_DIR}/test_config_options_list.bash "$MakeDevices" "$CMakeDevices" "$harch,$darch" "${CMAKE_HARCH} ${CMAKE_DARCH}"
+    done
+  else
+    ${SRC_DIR}/test_config_options_list.bash "$MakeDevices" "$CMakeDevices" "$harch" "${CMAKE_HARCH}"
+  fi 
+done
+
diff --git a/lib/kokkos/core/unit_test/configuration/test-code/test_config_device_list.bash b/lib/kokkos/core/unit_test/configuration/test-code/test_config_device_list.bash
new file mode 100755
index 0000000000..e96f567fe2
--- /dev/null
+++ b/lib/kokkos/core/unit_test/configuration/test-code/test_config_device_list.bash
@@ -0,0 +1,45 @@
+
+SRC_DIR=${KOKKOS_PATH}/core/unit_test/configuration/test-code
+# List of parallel device types 
+HostPDevices=(OpenMP Threads)
+if [ ! -z "$KOKKOS_ARCH_TEST" ]; then
+  HostPDevices=(OpenMP)
+fi
+
+if [ ! -z "$HPX_ROOT" ]
+then 
+  HostPDevices=(${HostPDevices[@]} HPX)
+fi
+
+if [ ! -z "$CUDA_ROOT" ]
+then
+  AccDevices=(${AccDevices[@]} Cuda)
+  export CXX=${KOKKOS_PATH}/bin/nvcc_wrapper
+fi
+if [ ! -z "$HIP_ROOT" ]
+then
+  AccDevices=(${AccDevices[@]} HIP)
+fi
+
+for hpdevice in "${HostPDevices[@]}"
+do
+  hpdevice_up=`echo $hpdevice | tr a-z A-Z`
+  CMAKE_HPDEVICE="-DKokkos_ENABLE_${hpdevice_up}=ON"
+
+  if [ ! -z "$AccDevices" ]
+  then
+    for accdevice in "${AccDevices[@]}"
+    do
+      accdevice_up=`echo $accdevice | tr a-z A-Z`
+      CMAKE_ACCDEVICE="-DKokkos_ENABLE_${accdevice_up}=ON"
+      ${SRC_DIR}/test_config_arch_list.bash "$hpdevice,$accdevice" "${CMAKE_HPDEVICE} ${CMAKE_ACCDEVICE}"
+      ${SRC_DIR}/test_config_arch_list.bash "$hpdevice,$accdevice,Serial" "${CMAKE_HPDEVICE} ${CMAKE_ACCDEVICE} -DKokkos_ENABLE_SERIAL=ON"
+    done
+  else
+    #no, I need to be able to specify this
+    #export CXX=g++
+    ${SRC_DIR}/test_config_arch_list.bash "$hpdevice" "${CMAKE_HPDEVICE}"
+    ${SRC_DIR}/test_config_arch_list.bash "$hpdevice,Serial" "${CMAKE_HPDEVICE} -DKokkos_ENABLE_SERIAL=ON"
+  fi 
+done
+
diff --git a/lib/kokkos/core/unit_test/configuration/test-code/test_config_options_list.bash b/lib/kokkos/core/unit_test/configuration/test-code/test_config_options_list.bash
new file mode 100755
index 0000000000..1d72f28d23
--- /dev/null
+++ b/lib/kokkos/core/unit_test/configuration/test-code/test_config_options_list.bash
@@ -0,0 +1,49 @@
+SRC_DIR=${KOKKOS_PATH}/core/unit_test/configuration/test-code
+
+# List of parallel device types 
+Options=(deprecated_code aggressive_vectorization disable_profiling large_mem_tests)
+CudaOptions=(lambda relocatable_device_code uvm constexpr)
+
+if [ ! -z "$KOKKOS_ARCH_TEST" ]; then
+  Options=(disable_profiling)
+  CudaOptions=(uvm)
+fi
+
+MakeDevices=$1
+CMakeDevices=$2
+MakeArch=$3
+CMakeArch=$4
+
+for option in "${Options[@]}"
+do
+  option_up=`echo $option | tr a-z A-Z`
+  if [[ $option_up == *"DISABLE"* ]]; then
+    new_option_up=${option_up/DISABLE_/}
+    CMAKE_OPTION="-DKokkos_ENABLE_${new_option_up}=OFF"
+  else
+    CMAKE_OPTION="-DKokkos_ENABLE_${option_up}=ON"
+  fi
+
+  #Renaming options as GNU Make expects them
+  option=${option/deprecated_code/enable_deprecated_code}
+  option=${option/large_mem_tests/enable_large_mem_tests}
+
+  if [ ! -z $CudaOptions ]; then 
+    for cuda_option in "${CudaOptions[@]}"
+    do
+      cuda_option_up=`echo $cuda_option | tr a-z A-Z`
+      CMAKE_CUDA_OPTION="-DKokkos_ENABLE_CUDA_${cuda_option_up}=ON"
+
+      #Renaming options as GNU Make expects them
+      cuda_option=${cuda_option/lambda/enable_lambda}
+      cuda_option=${cuda_option/constexpr/enable_constexpr}
+      cuda_option=${cuda_option/relocatable_device_code/rdc}
+      cuda_option=${cuda_option/uvm/force_uvm}
+
+      ${SRC_DIR}/test_config_run.bash "$MakeDevices" "$CMakeDevices" "$MakeArch" "$CMakeArch" "KOKKOS_OPTIONS=$option KOKKOS_CUDA_OPTIONS=$cuda_option" "$CMAKE_OPTION $CMAKE_CUDA_OPTION"
+    done
+  else  
+    ${SRC_DIR}/test_config_run.bash "$MakeDevices" "$CMakeDevices" "$MakeArch" "$CMakeArch" "KOKKOS_OPTIONS=$option" "$CMAKE_OPTION"
+  fi
+done
+
diff --git a/lib/kokkos/core/unit_test/configuration/test-code/test_config_run.bash b/lib/kokkos/core/unit_test/configuration/test-code/test_config_run.bash
new file mode 100755
index 0000000000..4750c843c2
--- /dev/null
+++ b/lib/kokkos/core/unit_test/configuration/test-code/test_config_run.bash
@@ -0,0 +1,111 @@
+
+SRC_DIR=${KOKKOS_PATH}/core/unit_test/configuration/test-code
+
+# List of parallel device types 
+MakeDevices=$1
+CMakeDevices=$2
+MakeArch=$3
+CMakeArch=$4
+MakeOptions=$5
+CMakeOptions=$6
+
+cd gnu-make
+rm -rf *
+make -f ${SRC_DIR}/Makefile KOKKOS_DEVICES=$MakeDevices KOKKOS_ARCH=$MakeArch $MakeOptions CXX=$CXX KokkosCore_config.h &>out
+make -f ${SRC_DIR}/Makefile KOKKOS_DEVICES=$MakeDevices KOKKOS_ARCH=$MakeArch $MakeOptions CXX=$CXX print-cxx-flags &> cxxflags
+
+cd ../cmake
+rm -rf *
+cmake -DKokkos_SKIP_VALIDATION=ON \
+      -DCMAKE_CXX_COMPILER=$CXX \
+      $CMakeDevices \
+      $CMakeArch \
+      $CMakeOptions \
+      $SRC_DIR &> config_out
+cd ..
+grep define gnu-make/KokkosCore_config.h | sort -u &> make_config_defines
+grep define cmake/kokkos/KokkosCore_config.h | sort -u &> cmake_config_defines
+
+diff make_config_defines cmake_config_defines &> config_defines_diff
+diff_exists=`cat config_defines_diff | wc -l`
+if [ $diff_exists -gt 0 ]
+then
+  echo ""
+  echo ""
+  echo "Failed #define test"
+  echo Make: "make -f ${SRC_DIR}/Makefile KOKKOS_DEVICES=$MakeDevices KOKKOS_ARCH=$MakeArch $MakeOptions CXX=$CXX KokkosCore_config.h"
+  echo CMake: "cmake -DCMAKE_CXX_COMPILER=$CXX $CMakeDevices $CMakeArch $CMakeOptions $SRC_DIR"
+  cat config_defines_diff
+  echo "Sleeping for 3 seconds if you want to stop and explore..."
+  echo ""
+  sleep 3
+else
+  echo ""
+  echo ""
+  echo "Passed #define test"
+  echo Make: "make -f ${SRC_DIR}/Makefile KOKKOS_DEVICES=$MakeDevices KOKKOS_ARCH=$MakeArch $MakeOptions CXX=$CXX KokkosCore_config.h"
+  echo CMake: "cmake -DCMAKE_CXX_COMPILER=$CXX $CMakeDevices $CMakeArch $CMakeOptions $SRC_DIR"
+fi
+
+#find because it goes in different locations
+#grep out compiler warnings
+#head multiple matches
+#sed a bunch of stuff to clean up cmake garbage
+#awk trim whitespace
+#awk print each on new line
+#grep remove empty lines
+#grep don't consider -std flags in the comparison
+#sort and print unique flags
+find cmake/kokkos -name KokkosTargets.cmake -exec grep -h INTERFACE_COMPILE_OPTIONS {} \; \
+  | grep -v skew \
+  | head -n 1 \
+  | sed 's/INTERFACE_COMPILE_OPTIONS//g' \
+  | sed 's/;/ /g' \
+  | sed 's/"//g' \
+  | sed 's/\\$<\\$<//g' \
+  | sed 's/COMPILE_LANGUAGE:CXX>://g' \
+  | sed 's/> / /g' \
+  | sed 's/>$//g' \
+  | awk '{$1=$1;print}' \
+  | awk -v RS=" " '{print}' \
+  | grep -v -e '^$' \
+  | grep -v '\-std' \
+  | sort | uniq > cmake_cxx_flags
+
+#-I flags and -std= flags are not part of CMake's compile options
+#that's fine, let's ignore thse below
+#redundant lines - tail the last one
+#awk print each on new line
+#grep out blank lines
+#grep out include flags
+#grep out -std flags
+#sort and print unique flags
+tail -n 1 gnu-make/cxxflags \
+  | awk -v RS=" " '{print}' \
+  | grep -v -e '^$' \
+  | grep -v '\-I' \
+  | grep -v '\-std=' \
+  | grep -v 'gcc-toolchain' \
+  | sort | uniq > gnu_make_cxx_flags
+diff gnu_make_cxx_flags cmake_cxx_flags &> config_cxxflags_diff
+diff_exists=`cat config_cxxflags_diff | wc -l`
+
+if [ $diff_exists -gt 0 ]
+then
+  echo ""
+  echo ""
+  echo "Failed CXXFLAGS test"
+  echo Make: "make -f ${SRC_DIR}/Makefile KOKKOS_DEVICES=$MakeDevices KOKKOS_ARCH=$MakeArch $MakeOptions CXX=$CXX KokkosCore_config.h"
+  echo CMake: "cmake -DCMAKE_CXX_COMPILER=$CXX $CMakeDevices $CMakeArch $CMakeOptions $SRC_DIR"
+  cat config_cxxflags_diff
+  echo "Sleeping for 3 seconds if you want to stop and explore..."
+  echo ""
+  sleep 3
+else
+  echo ""
+  echo ""
+  echo "Passed CXXFLAGS test"
+  echo Make: "make -f ${SRC_DIR}/Makefile KOKKOS_DEVICES=$MakeDevices KOKKOS_ARCH=$MakeArch $MakeOptions CXX=$CXX KokkosCore_config.h"
+  echo CMake: "cmake -DCMAKE_CXX_COMPILER=$CXX $CMakeDevices $CMakeArch $CMakeOptions $SRC_DIR"
+fi
+
diff --git a/lib/kokkos/core/unit_test/cuda/TestCudaHostPinned_Category.hpp b/lib/kokkos/core/unit_test/cuda/TestCudaHostPinned_Category.hpp
index 23c5eb4fe7..3f8ec6bacf 100644
--- a/lib/kokkos/core/unit_test/cuda/TestCudaHostPinned_Category.hpp
+++ b/lib/kokkos/core/unit_test/cuda/TestCudaHostPinned_Category.hpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -46,21 +47,10 @@
 
 #include <gtest/gtest.h>
 
-namespace Test {
-
-class cuda_hostpinned : public ::testing::Test {
-protected:
-  static void SetUpTestCase() {
-  }
-
-  static void TearDownTestCase() {
-  }
-};
-
-} // namespace Test
-
 #define TEST_CATEGORY cuda_hostpinned
-//#define TEST_EXECSPACE Kokkos::Device<Kokkos::Cuda,Kokkos::CudaHostPinnedSpace>
+#define TEST_CATEGORY_DEATH cuda_hostpinned_DeathTest
+//#define TEST_EXECSPACE
+// Kokkos::Device<Kokkos::Cuda,Kokkos::CudaHostPinnedSpace>
 #define TEST_EXECSPACE Kokkos::CudaHostPinnedSpace
 
 #endif
diff --git a/lib/kokkos/core/unit_test/cuda/TestCudaHostPinned_SharedAlloc.cpp b/lib/kokkos/core/unit_test/cuda/TestCudaHostPinned_SharedAlloc.cpp
index 8a8a758e67..18780c09a7 100644
--- a/lib/kokkos/core/unit_test/cuda/TestCudaHostPinned_SharedAlloc.cpp
+++ b/lib/kokkos/core/unit_test/cuda/TestCudaHostPinned_SharedAlloc.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -46,10 +47,8 @@
 
 namespace Test {
 
-
-TEST_F( TEST_CATEGORY, impl_shared_alloc )
-{
-  test_shared_alloc< TEST_EXECSPACE, Kokkos::DefaultHostExecutionSpace >();
+TEST(TEST_CATEGORY, impl_shared_alloc) {
+  test_shared_alloc<TEST_EXECSPACE, Kokkos::DefaultHostExecutionSpace>();
 }
 
-} // namespace Test
+}  // namespace Test
diff --git a/lib/kokkos/core/unit_test/cuda/TestCudaHostPinned_ViewAPI_a.cpp b/lib/kokkos/core/unit_test/cuda/TestCudaHostPinned_ViewAPI_a.cpp
index 3b27b544a5..eeb9f3fa3a 100644
--- a/lib/kokkos/core/unit_test/cuda/TestCudaHostPinned_ViewAPI_a.cpp
+++ b/lib/kokkos/core/unit_test/cuda/TestCudaHostPinned_ViewAPI_a.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
diff --git a/lib/kokkos/core/unit_test/cuda/TestCudaHostPinned_ViewAPI_b.cpp b/lib/kokkos/core/unit_test/cuda/TestCudaHostPinned_ViewAPI_b.cpp
index 4b89d288c7..04949cf573 100644
--- a/lib/kokkos/core/unit_test/cuda/TestCudaHostPinned_ViewAPI_b.cpp
+++ b/lib/kokkos/core/unit_test/cuda/TestCudaHostPinned_ViewAPI_b.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
diff --git a/lib/kokkos/core/unit_test/cuda/TestCudaHostPinned_ViewAPI_c.cpp b/lib/kokkos/core/unit_test/cuda/TestCudaHostPinned_ViewAPI_c.cpp
index 3f82f8f778..bf259ef734 100644
--- a/lib/kokkos/core/unit_test/cuda/TestCudaHostPinned_ViewAPI_c.cpp
+++ b/lib/kokkos/core/unit_test/cuda/TestCudaHostPinned_ViewAPI_c.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
diff --git a/lib/kokkos/core/unit_test/cuda/TestCudaHostPinned_ViewAPI_d.cpp b/lib/kokkos/core/unit_test/cuda/TestCudaHostPinned_ViewAPI_d.cpp
index 2fd2cfac8e..84d81e3b41 100644
--- a/lib/kokkos/core/unit_test/cuda/TestCudaHostPinned_ViewAPI_d.cpp
+++ b/lib/kokkos/core/unit_test/cuda/TestCudaHostPinned_ViewAPI_d.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
diff --git a/lib/kokkos/core/unit_test/cuda/TestCudaHostPinned_ViewAPI_e.cpp b/lib/kokkos/core/unit_test/cuda/TestCudaHostPinned_ViewAPI_e.cpp
index 924b6b4833..db9e990ae5 100644
--- a/lib/kokkos/core/unit_test/cuda/TestCudaHostPinned_ViewAPI_e.cpp
+++ b/lib/kokkos/core/unit_test/cuda/TestCudaHostPinned_ViewAPI_e.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
diff --git a/lib/kokkos/core/unit_test/cuda/TestCudaHostPinned_ViewCopy.cpp b/lib/kokkos/core/unit_test/cuda/TestCudaHostPinned_ViewCopy.cpp
index 3748592355..04b43cf9ab 100644
--- a/lib/kokkos/core/unit_test/cuda/TestCudaHostPinned_ViewCopy.cpp
+++ b/lib/kokkos/core/unit_test/cuda/TestCudaHostPinned_ViewCopy.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
diff --git a/lib/kokkos/core/unit_test/cuda/TestCudaHostPinned_ViewMapping_a.cpp b/lib/kokkos/core/unit_test/cuda/TestCudaHostPinned_ViewMapping_a.cpp
index 21ed986b7f..923f4df965 100644
--- a/lib/kokkos/core/unit_test/cuda/TestCudaHostPinned_ViewMapping_a.cpp
+++ b/lib/kokkos/core/unit_test/cuda/TestCudaHostPinned_ViewMapping_a.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -43,4 +44,3 @@
 
 #include <cuda/TestCudaHostPinned_Category.hpp>
 #include <TestViewMapping_a.hpp>
-
diff --git a/lib/kokkos/core/unit_test/cuda/TestCudaHostPinned_ViewMapping_b.cpp b/lib/kokkos/core/unit_test/cuda/TestCudaHostPinned_ViewMapping_b.cpp
index 3024cf6e41..1efe65b21d 100644
--- a/lib/kokkos/core/unit_test/cuda/TestCudaHostPinned_ViewMapping_b.cpp
+++ b/lib/kokkos/core/unit_test/cuda/TestCudaHostPinned_ViewMapping_b.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -43,4 +44,3 @@
 
 #include <cuda/TestCudaHostPinned_Category.hpp>
 #include <TestViewMapping_b.hpp>
-
diff --git a/lib/kokkos/core/unit_test/cuda/TestCudaHostPinned_ViewMapping_subview.cpp b/lib/kokkos/core/unit_test/cuda/TestCudaHostPinned_ViewMapping_subview.cpp
index 56c1ee013d..9e1034c5b7 100644
--- a/lib/kokkos/core/unit_test/cuda/TestCudaHostPinned_ViewMapping_subview.cpp
+++ b/lib/kokkos/core/unit_test/cuda/TestCudaHostPinned_ViewMapping_subview.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -43,4 +44,3 @@
 
 #include <cuda/TestCudaHostPinned_Category.hpp>
 #include <TestViewMapping_subview.hpp>
-
diff --git a/lib/kokkos/core/unit_test/cuda/TestCudaUVM_Category.hpp b/lib/kokkos/core/unit_test/cuda/TestCudaUVM_Category.hpp
index 36320ebd39..ff53e5a719 100644
--- a/lib/kokkos/core/unit_test/cuda/TestCudaUVM_Category.hpp
+++ b/lib/kokkos/core/unit_test/cuda/TestCudaUVM_Category.hpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -46,20 +47,8 @@
 
 #include <gtest/gtest.h>
 
-namespace Test {
-
-class cuda_uvm : public ::testing::Test {
-protected:
-  static void SetUpTestCase() {
-  }
-
-  static void TearDownTestCase() {
-  }
-};
-
-} // namespace Test
-
 #define TEST_CATEGORY cuda_uvm
+#define TEST_CATEGORY_DEATH cuda_uvm_DeathTest
 #define TEST_EXECSPACE Kokkos::CudaUVMSpace
 
 #endif
diff --git a/lib/kokkos/core/unit_test/cuda/TestCudaUVM_SharedAlloc.cpp b/lib/kokkos/core/unit_test/cuda/TestCudaUVM_SharedAlloc.cpp
index 57a0848527..81e43da34c 100644
--- a/lib/kokkos/core/unit_test/cuda/TestCudaUVM_SharedAlloc.cpp
+++ b/lib/kokkos/core/unit_test/cuda/TestCudaUVM_SharedAlloc.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -46,10 +47,8 @@
 
 namespace Test {
 
-
-TEST_F( TEST_CATEGORY, impl_shared_alloc )
-{
-  test_shared_alloc< TEST_EXECSPACE, Kokkos::DefaultHostExecutionSpace >();
+TEST(TEST_CATEGORY, impl_shared_alloc) {
+  test_shared_alloc<TEST_EXECSPACE, Kokkos::DefaultHostExecutionSpace>();
 }
 
-} // namespace Test
+}  // namespace Test
diff --git a/lib/kokkos/core/unit_test/cuda/TestCudaUVM_ViewAPI_a.cpp b/lib/kokkos/core/unit_test/cuda/TestCudaUVM_ViewAPI_a.cpp
index cd535e605f..3a48b2495e 100644
--- a/lib/kokkos/core/unit_test/cuda/TestCudaUVM_ViewAPI_a.cpp
+++ b/lib/kokkos/core/unit_test/cuda/TestCudaUVM_ViewAPI_a.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
diff --git a/lib/kokkos/core/unit_test/cuda/TestCudaUVM_ViewAPI_b.cpp b/lib/kokkos/core/unit_test/cuda/TestCudaUVM_ViewAPI_b.cpp
index b3da2b581e..7f0effb5e8 100644
--- a/lib/kokkos/core/unit_test/cuda/TestCudaUVM_ViewAPI_b.cpp
+++ b/lib/kokkos/core/unit_test/cuda/TestCudaUVM_ViewAPI_b.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
diff --git a/lib/kokkos/core/unit_test/cuda/TestCudaUVM_ViewAPI_c.cpp b/lib/kokkos/core/unit_test/cuda/TestCudaUVM_ViewAPI_c.cpp
index 2e53e7a81b..9d8cbf0c77 100644
--- a/lib/kokkos/core/unit_test/cuda/TestCudaUVM_ViewAPI_c.cpp
+++ b/lib/kokkos/core/unit_test/cuda/TestCudaUVM_ViewAPI_c.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
diff --git a/lib/kokkos/core/unit_test/cuda/TestCudaUVM_ViewAPI_d.cpp b/lib/kokkos/core/unit_test/cuda/TestCudaUVM_ViewAPI_d.cpp
index f9dea646f7..8d2b5268bf 100644
--- a/lib/kokkos/core/unit_test/cuda/TestCudaUVM_ViewAPI_d.cpp
+++ b/lib/kokkos/core/unit_test/cuda/TestCudaUVM_ViewAPI_d.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
diff --git a/lib/kokkos/core/unit_test/cuda/TestCudaUVM_ViewAPI_e.cpp b/lib/kokkos/core/unit_test/cuda/TestCudaUVM_ViewAPI_e.cpp
index 5a8399c484..5c11b2a322 100644
--- a/lib/kokkos/core/unit_test/cuda/TestCudaUVM_ViewAPI_e.cpp
+++ b/lib/kokkos/core/unit_test/cuda/TestCudaUVM_ViewAPI_e.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
diff --git a/lib/kokkos/core/unit_test/cuda/TestCudaUVM_ViewCopy.cpp b/lib/kokkos/core/unit_test/cuda/TestCudaUVM_ViewCopy.cpp
index b0ea67a1b5..774bf010dc 100644
--- a/lib/kokkos/core/unit_test/cuda/TestCudaUVM_ViewCopy.cpp
+++ b/lib/kokkos/core/unit_test/cuda/TestCudaUVM_ViewCopy.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
diff --git a/lib/kokkos/core/unit_test/cuda/TestCudaUVM_ViewMapping_a.cpp b/lib/kokkos/core/unit_test/cuda/TestCudaUVM_ViewMapping_a.cpp
index 5be4404c9e..aa9b513d7a 100644
--- a/lib/kokkos/core/unit_test/cuda/TestCudaUVM_ViewMapping_a.cpp
+++ b/lib/kokkos/core/unit_test/cuda/TestCudaUVM_ViewMapping_a.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -43,4 +44,3 @@
 
 #include <cuda/TestCudaUVM_Category.hpp>
 #include <TestViewMapping_a.hpp>
-
diff --git a/lib/kokkos/core/unit_test/cuda/TestCudaUVM_ViewMapping_b.cpp b/lib/kokkos/core/unit_test/cuda/TestCudaUVM_ViewMapping_b.cpp
index 2664c472e6..f24e9ba4f1 100644
--- a/lib/kokkos/core/unit_test/cuda/TestCudaUVM_ViewMapping_b.cpp
+++ b/lib/kokkos/core/unit_test/cuda/TestCudaUVM_ViewMapping_b.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -43,4 +44,3 @@
 
 #include <cuda/TestCudaUVM_Category.hpp>
 #include <TestViewMapping_b.hpp>
-
diff --git a/lib/kokkos/core/unit_test/cuda/TestCudaUVM_ViewMapping_subview.cpp b/lib/kokkos/core/unit_test/cuda/TestCudaUVM_ViewMapping_subview.cpp
index c08e00ba49..47b7d1f46c 100644
--- a/lib/kokkos/core/unit_test/cuda/TestCudaUVM_ViewMapping_subview.cpp
+++ b/lib/kokkos/core/unit_test/cuda/TestCudaUVM_ViewMapping_subview.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -43,4 +44,3 @@
 
 #include <cuda/TestCudaUVM_Category.hpp>
 #include <TestViewMapping_subview.hpp>
-
diff --git a/lib/kokkos/core/unit_test/cuda/TestCuda_AtomicOperations_complexdouble.cpp b/lib/kokkos/core/unit_test/cuda/TestCuda_AtomicOperations_complexdouble.cpp
index 6fb9ad0628..813eb919c8 100644
--- a/lib/kokkos/core/unit_test/cuda/TestCuda_AtomicOperations_complexdouble.cpp
+++ b/lib/kokkos/core/unit_test/cuda/TestCuda_AtomicOperations_complexdouble.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -41,6 +42,5 @@
 //@HEADER
 */
 
-#include<cuda/TestCuda_Category.hpp>
-#include<TestAtomicOperations_complexdouble.hpp>
-
+#include <cuda/TestCuda_Category.hpp>
+#include <TestAtomicOperations_complexdouble.hpp>
diff --git a/lib/kokkos/core/unit_test/cuda/TestCuda_AtomicOperations_complexfloat.cpp b/lib/kokkos/core/unit_test/cuda/TestCuda_AtomicOperations_complexfloat.cpp
index 3170bbc530..ea8447cb28 100644
--- a/lib/kokkos/core/unit_test/cuda/TestCuda_AtomicOperations_complexfloat.cpp
+++ b/lib/kokkos/core/unit_test/cuda/TestCuda_AtomicOperations_complexfloat.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -41,6 +42,5 @@
 //@HEADER
 */
 
-#include<cuda/TestCuda_Category.hpp>
-#include<TestAtomicOperations_complexfloat.hpp>
-
+#include <cuda/TestCuda_Category.hpp>
+#include <TestAtomicOperations_complexfloat.hpp>
diff --git a/lib/kokkos/core/unit_test/cuda/TestCuda_AtomicOperations_double.cpp b/lib/kokkos/core/unit_test/cuda/TestCuda_AtomicOperations_double.cpp
index 356d1d6ad8..008dcdcadb 100644
--- a/lib/kokkos/core/unit_test/cuda/TestCuda_AtomicOperations_double.cpp
+++ b/lib/kokkos/core/unit_test/cuda/TestCuda_AtomicOperations_double.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -41,6 +42,5 @@
 //@HEADER
 */
 
-#include<cuda/TestCuda_Category.hpp>
-#include<TestAtomicOperations_double.hpp>
-
+#include <cuda/TestCuda_Category.hpp>
+#include <TestAtomicOperations_double.hpp>
diff --git a/lib/kokkos/core/unit_test/cuda/TestCuda_AtomicOperations_float.cpp b/lib/kokkos/core/unit_test/cuda/TestCuda_AtomicOperations_float.cpp
index 8866f21a11..3fde849b3f 100644
--- a/lib/kokkos/core/unit_test/cuda/TestCuda_AtomicOperations_float.cpp
+++ b/lib/kokkos/core/unit_test/cuda/TestCuda_AtomicOperations_float.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -41,6 +42,5 @@
 //@HEADER
 */
 
-#include<cuda/TestCuda_Category.hpp>
-#include<TestAtomicOperations_float.hpp>
-
+#include <cuda/TestCuda_Category.hpp>
+#include <TestAtomicOperations_float.hpp>
diff --git a/lib/kokkos/core/unit_test/cuda/TestCuda_AtomicOperations_int.cpp b/lib/kokkos/core/unit_test/cuda/TestCuda_AtomicOperations_int.cpp
index 5cc832ee39..8746add7b2 100644
--- a/lib/kokkos/core/unit_test/cuda/TestCuda_AtomicOperations_int.cpp
+++ b/lib/kokkos/core/unit_test/cuda/TestCuda_AtomicOperations_int.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -41,6 +42,5 @@
 //@HEADER
 */
 
-#include<cuda/TestCuda_Category.hpp>
-#include<TestAtomicOperations_int.hpp>
-
+#include <cuda/TestCuda_Category.hpp>
+#include <TestAtomicOperations_int.hpp>
diff --git a/lib/kokkos/core/unit_test/cuda/TestCuda_AtomicOperations_longint.cpp b/lib/kokkos/core/unit_test/cuda/TestCuda_AtomicOperations_longint.cpp
index cd12fba02b..9cd133b3b2 100644
--- a/lib/kokkos/core/unit_test/cuda/TestCuda_AtomicOperations_longint.cpp
+++ b/lib/kokkos/core/unit_test/cuda/TestCuda_AtomicOperations_longint.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -41,6 +42,5 @@
 //@HEADER
 */
 
-#include<cuda/TestCuda_Category.hpp>
-#include<TestAtomicOperations_longint.hpp>
-
+#include <cuda/TestCuda_Category.hpp>
+#include <TestAtomicOperations_longint.hpp>
diff --git a/lib/kokkos/core/unit_test/cuda/TestCuda_AtomicOperations_longlongint.cpp b/lib/kokkos/core/unit_test/cuda/TestCuda_AtomicOperations_longlongint.cpp
index 471e8d1765..658374ac60 100644
--- a/lib/kokkos/core/unit_test/cuda/TestCuda_AtomicOperations_longlongint.cpp
+++ b/lib/kokkos/core/unit_test/cuda/TestCuda_AtomicOperations_longlongint.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -41,6 +42,5 @@
 //@HEADER
 */
 
-#include<cuda/TestCuda_Category.hpp>
-#include<TestAtomicOperations_longlongint.hpp>
-
+#include <cuda/TestCuda_Category.hpp>
+#include <TestAtomicOperations_longlongint.hpp>
diff --git a/lib/kokkos/core/unit_test/cuda/TestCuda_AtomicOperations_unsignedint.cpp b/lib/kokkos/core/unit_test/cuda/TestCuda_AtomicOperations_unsignedint.cpp
index 1f6f94c2bc..7d79f589e3 100644
--- a/lib/kokkos/core/unit_test/cuda/TestCuda_AtomicOperations_unsignedint.cpp
+++ b/lib/kokkos/core/unit_test/cuda/TestCuda_AtomicOperations_unsignedint.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -41,6 +42,5 @@
 //@HEADER
 */
 
-#include<cuda/TestCuda_Category.hpp>
-#include<TestAtomicOperations_unsignedint.hpp>
-
+#include <cuda/TestCuda_Category.hpp>
+#include <TestAtomicOperations_unsignedint.hpp>
diff --git a/lib/kokkos/core/unit_test/cuda/TestCuda_AtomicOperations_unsignedlongint.cpp b/lib/kokkos/core/unit_test/cuda/TestCuda_AtomicOperations_unsignedlongint.cpp
index d373c07c1d..29335d0f54 100644
--- a/lib/kokkos/core/unit_test/cuda/TestCuda_AtomicOperations_unsignedlongint.cpp
+++ b/lib/kokkos/core/unit_test/cuda/TestCuda_AtomicOperations_unsignedlongint.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -41,6 +42,5 @@
 //@HEADER
 */
 
-#include<cuda/TestCuda_Category.hpp>
-#include<TestAtomicOperations_unsignedlongint.hpp>
-
+#include <cuda/TestCuda_Category.hpp>
+#include <TestAtomicOperations_unsignedlongint.hpp>
diff --git a/lib/kokkos/core/unit_test/cuda/TestCuda_AtomicViews.cpp b/lib/kokkos/core/unit_test/cuda/TestCuda_AtomicViews.cpp
index debbc10ea7..56c5fe6f3e 100644
--- a/lib/kokkos/core/unit_test/cuda/TestCuda_AtomicViews.cpp
+++ b/lib/kokkos/core/unit_test/cuda/TestCuda_AtomicViews.cpp
@@ -3,10 +3,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -42,6 +43,5 @@
 //@HEADER
 */
 
-#include<cuda/TestCuda_Category.hpp>
-#include<TestAtomicViews.hpp>
-
+#include <cuda/TestCuda_Category.hpp>
+#include <TestAtomicViews.hpp>
diff --git a/lib/kokkos/core/unit_test/cuda/TestCuda_Atomics.cpp b/lib/kokkos/core/unit_test/cuda/TestCuda_Atomics.cpp
index 1875143f32..e68222ca3a 100644
--- a/lib/kokkos/core/unit_test/cuda/TestCuda_Atomics.cpp
+++ b/lib/kokkos/core/unit_test/cuda/TestCuda_Atomics.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -43,4 +44,3 @@
 
 #include <cuda/TestCuda_Category.hpp>
 #include <TestAtomic.hpp>
-
diff --git a/lib/kokkos/core/unit_test/cuda/TestCuda_Category.hpp b/lib/kokkos/core/unit_test/cuda/TestCuda_Category.hpp
index 3e0d142480..7e7b7c77e1 100644
--- a/lib/kokkos/core/unit_test/cuda/TestCuda_Category.hpp
+++ b/lib/kokkos/core/unit_test/cuda/TestCuda_Category.hpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -46,20 +47,8 @@
 
 #include <gtest/gtest.h>
 
-namespace Test {
-
-class cuda : public ::testing::Test {
-protected:
-  static void SetUpTestCase() {
-  }
-
-  static void TearDownTestCase() {
-  }
-};
-
-} // namespace Test
-
 #define TEST_CATEGORY cuda
+#define TEST_CATEGORY_DEATH cuda_DeathTest
 #define TEST_EXECSPACE Kokkos::Cuda
 
 #endif
diff --git a/lib/kokkos/core/unit_test/cuda/TestCuda_Complex.cpp b/lib/kokkos/core/unit_test/cuda/TestCuda_Complex.cpp
index 7c92f111fc..af44310481 100644
--- a/lib/kokkos/core/unit_test/cuda/TestCuda_Complex.cpp
+++ b/lib/kokkos/core/unit_test/cuda/TestCuda_Complex.cpp
@@ -3,10 +3,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -42,6 +43,5 @@
 //@HEADER
 */
 
-#include<cuda/TestCuda_Category.hpp>
-#include<TestComplex.hpp>
-
+#include <cuda/TestCuda_Category.hpp>
+#include <TestComplex.hpp>
diff --git a/lib/kokkos/core/unit_test/cuda/TestCuda_Crs.cpp b/lib/kokkos/core/unit_test/cuda/TestCuda_Crs.cpp
index 98f5e3793a..2ae1ee1382 100644
--- a/lib/kokkos/core/unit_test/cuda/TestCuda_Crs.cpp
+++ b/lib/kokkos/core/unit_test/cuda/TestCuda_Crs.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
diff --git a/lib/kokkos/core/unit_test/cuda/TestCuda_DebugPinUVMSpace.cpp b/lib/kokkos/core/unit_test/cuda/TestCuda_DebugPinUVMSpace.cpp
new file mode 100644
index 0000000000..4313cece0c
--- /dev/null
+++ b/lib/kokkos/core/unit_test/cuda/TestCuda_DebugPinUVMSpace.cpp
@@ -0,0 +1,131 @@
+/*
+//@HEADER
+// ************************************************************************
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
+// the U.S. Government retains certain rights in this software.
+//
+// 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 Corporation nor the names of the
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 NTESS OR THE
+// 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.
+//
+// Questions? Contact Christian R. Trott (crtrott@sandia.gov)
+//
+// ************************************************************************
+//@HEADER
+*/
+
+#include <Kokkos_Core.hpp>
+#include <cuda/TestCuda_Category.hpp>
+
+namespace Test {
+
+template <class View>
+struct CopyFunctor {
+  View a;
+  View b;
+
+  CopyFunctor(int N) : a(View("A", N)), b(View("B", N)) {}
+
+  KOKKOS_INLINE_FUNCTION
+  void operator()(int i) const { a(i) = b(i); }
+
+  double time_copy(int R) {
+    Kokkos::parallel_for("CopyFunctor::time_copy", a.extent(0), *this);
+    Kokkos::fence();
+
+    Kokkos::Timer timer;
+    for (int r = 0; r < R; r++)
+      Kokkos::parallel_for("CopyFunctor::time_copy", a.extent(0), *this);
+    Kokkos::fence();
+    return timer.seconds();
+  }
+};
+
+TEST(cuda, debug_pin_um_to_host) {
+  double time_cuda_space;
+  double time_cuda_host_pinned_space;
+  double time_cuda_uvm_space_not_pinned_1;
+  double time_cuda_uvm_space_pinned;
+  double time_cuda_uvm_space_not_pinned_2;
+
+  int N = 10000000;
+  int R = 100;
+  {
+    CopyFunctor<Kokkos::View<int*, Kokkos::CudaSpace>> f(N);
+    time_cuda_space = f.time_copy(R);
+  }
+  {
+    CopyFunctor<Kokkos::View<int*, Kokkos::CudaHostPinnedSpace>> f(N);
+    time_cuda_host_pinned_space = f.time_copy(R);
+  }
+  {
+    CopyFunctor<Kokkos::View<int*, Kokkos::CudaUVMSpace>> f(N);
+    time_cuda_uvm_space_not_pinned_1 = f.time_copy(R);
+  }
+  {
+#ifdef KOKKOS_IMPL_DEBUG_CUDA_PIN_UVM_TO_HOST
+    kokkos_impl_cuda_set_pin_uvm_to_host(true);
+#endif
+    CopyFunctor<Kokkos::View<int*, Kokkos::CudaUVMSpace>> f(N);
+    time_cuda_uvm_space_pinned = f.time_copy(R);
+#ifdef KOKKOS_IMPL_DEBUG_CUDA_PIN_UVM_TO_HOST
+    kokkos_impl_cuda_set_pin_uvm_to_host(false);
+#endif
+  }
+  {
+    CopyFunctor<Kokkos::View<int*, Kokkos::CudaUVMSpace>> f(N);
+    time_cuda_uvm_space_not_pinned_2 = f.time_copy(R);
+  }
+  bool uvm_approx_cuda_1 =
+      time_cuda_uvm_space_not_pinned_1 < time_cuda_space * 2.0;
+  bool uvm_approx_cuda_2 =
+      time_cuda_uvm_space_not_pinned_2 < time_cuda_space * 2.0;
+  bool pinned_slower_cuda = time_cuda_host_pinned_space > time_cuda_space * 2.0;
+  bool uvm_pinned_slower_cuda =
+      time_cuda_uvm_space_pinned > time_cuda_space * 2.0;
+
+  bool passed = uvm_approx_cuda_1 && uvm_approx_cuda_2 && pinned_slower_cuda &&
+#ifdef KOKKOS_IMPL_DEBUG_CUDA_PIN_UVM_TO_HOST
+                uvm_pinned_slower_cuda;
+#else
+                !uvm_pinned_slower_cuda;
+#endif
+  if (!passed)
+    printf(
+        "Time CudaSpace: %lf CudaUVMSpace_1: %lf CudaUVMSpace_2: %lf "
+        "CudaPinnedHostSpace: %lf CudaUVMSpace_Pinned: %lf\n",
+        time_cuda_space, time_cuda_uvm_space_not_pinned_1,
+        time_cuda_uvm_space_not_pinned_2, time_cuda_host_pinned_space,
+        time_cuda_uvm_space_pinned);
+  ASSERT_TRUE(passed);
+}
+
+}  // namespace Test
diff --git a/lib/kokkos/core/unit_test/cuda/TestCuda_DebugSerialExecution.cpp b/lib/kokkos/core/unit_test/cuda/TestCuda_DebugSerialExecution.cpp
new file mode 100644
index 0000000000..5472ef9fd1
--- /dev/null
+++ b/lib/kokkos/core/unit_test/cuda/TestCuda_DebugSerialExecution.cpp
@@ -0,0 +1,197 @@
+/*
+//@HEADER
+// ************************************************************************
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
+// the U.S. Government retains certain rights in this software.
+//
+// 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 Corporation nor the names of the
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 NTESS OR THE
+// 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.
+//
+// Questions? Contact Christian R. Trott (crtrott@sandia.gov)
+//
+// ************************************************************************
+//@HEADER
+*/
+
+#include <Kokkos_Core.hpp>
+#include <cuda/TestCuda_Category.hpp>
+
+namespace Test {
+
+using ViewType = Kokkos::View<double*>;
+
+struct TestForFunctor {
+  ViewType a;
+  ViewType b;
+
+  TestForFunctor(int N) : a(ViewType("A", N)), b(ViewType("B", N)) {}
+
+  KOKKOS_INLINE_FUNCTION
+  void operator()(int i) const { a(i) = b(i); }
+
+  double time_par_for() {
+    Kokkos::Timer timer;
+    Kokkos::parallel_for("CudaDebugSerialExecution::par_for", a.extent(0),
+                         *this);
+    Kokkos::fence();
+    return timer.seconds();
+  }
+};
+
+struct TestRedFunctor {
+  ViewType a;
+  ViewType b;
+
+  TestRedFunctor(int N) : a(ViewType("A", N)), b(ViewType("B", N)) {}
+
+  KOKKOS_INLINE_FUNCTION
+  void operator()(int i, double& val) const { val += a(i) * b(i); }
+
+  double time_par_red() {
+    Kokkos::Timer timer;
+    double dot;
+    Kokkos::parallel_reduce("CudaDebugSerialExecution::par_red", a.extent(0),
+                            *this, dot);
+    Kokkos::fence();
+    return timer.seconds();
+  }
+};
+
+struct TestScanFunctor {
+  ViewType a;
+  ViewType b;
+
+  TestScanFunctor(int N) : a(ViewType("A", N)), b(ViewType("B", N)) {}
+
+  KOKKOS_INLINE_FUNCTION
+  void operator()(int i, double& val, bool final) const {
+    val += b(i);
+    if (final) a(i) = val;
+  }
+
+  double time_par_scan() {
+    Kokkos::Timer timer;
+    double dot;
+    Kokkos::parallel_scan("CudaDebugSerialExecution::par_scan", a.extent(0),
+                          *this, dot);
+    Kokkos::fence();
+    return timer.seconds();
+  }
+};
+
+TEST(cuda, debug_serial_execution) {
+  double time_par_for_1, time_par_for_2, time_par_for_serial;
+  double time_par_red_1, time_par_red_2, time_par_red_serial;
+  double time_par_scan_1, time_par_scan_2, time_par_scan_serial;
+
+  int N = 10000000;
+  {
+    TestForFunctor f(N);
+    f.time_par_for();
+    time_par_for_1 = f.time_par_for();
+#ifdef KOKKOS_IMPL_DEBUG_CUDA_SERIAL_EXECUTION
+    kokkos_impl_cuda_set_serial_execution(true);
+#endif
+    time_par_for_serial = f.time_par_for();
+#ifdef KOKKOS_IMPL_DEBUG_CUDA_SERIAL_EXECUTION
+    kokkos_impl_cuda_set_serial_execution(false);
+#endif
+    time_par_for_2 = f.time_par_for();
+
+    bool passed_par_for =
+#ifdef KOKKOS_IMPL_DEBUG_CUDA_SERIAL_EXECUTION
+        (time_par_for_serial > time_par_for_1 * 20.0) &&
+        (time_par_for_serial > time_par_for_2 * 20.0);
+#else
+        (time_par_for_serial < time_par_for_1 * 2.0) &&
+        (time_par_for_serial < time_par_for_2 * 2.0);
+#endif
+    if (!passed_par_for)
+      printf("Time For1: %lf For2: %lf ForSerial: %lf\n", time_par_for_1,
+             time_par_for_2, time_par_for_serial);
+    ASSERT_TRUE(passed_par_for);
+  }
+  {
+    TestRedFunctor f(N);
+    f.time_par_red();
+    time_par_red_1 = f.time_par_red();
+#ifdef KOKKOS_IMPL_DEBUG_CUDA_SERIAL_EXECUTION
+    kokkos_impl_cuda_set_serial_execution(true);
+#endif
+    time_par_red_serial = f.time_par_red();
+#ifdef KOKKOS_IMPL_DEBUG_CUDA_SERIAL_EXECUTION
+    kokkos_impl_cuda_set_serial_execution(false);
+#endif
+    time_par_red_2 = f.time_par_red();
+
+    bool passed_par_red =
+#ifdef KOKKOS_IMPL_DEBUG_CUDA_SERIAL_EXECUTION
+        (time_par_red_serial > time_par_red_1 * 2.0) &&
+        (time_par_red_serial > time_par_red_2 * 2.0);
+#else
+        (time_par_red_serial < time_par_red_1 * 2.0) &&
+        (time_par_red_serial < time_par_red_2 * 2.0);
+#endif
+    if (!passed_par_red)
+      printf("Time Red1: %lf Red2: %lf RedSerial: %lf\n", time_par_red_1,
+             time_par_red_2, time_par_red_serial);
+    ASSERT_TRUE(passed_par_red);
+  }
+  {
+    TestScanFunctor f(N);
+    f.time_par_scan();
+    time_par_scan_1 = f.time_par_scan();
+#ifdef KOKKOS_IMPL_DEBUG_CUDA_SERIAL_EXECUTION
+    kokkos_impl_cuda_set_serial_execution(true);
+#endif
+    time_par_scan_serial = f.time_par_scan();
+#ifdef KOKKOS_IMPL_DEBUG_CUDA_SERIAL_EXECUTION
+    kokkos_impl_cuda_set_serial_execution(false);
+#endif
+    time_par_scan_2 = f.time_par_scan();
+
+    bool passed_par_scan =
+#ifdef KOKKOS_IMPL_DEBUG_CUDA_SERIAL_EXECUTION
+        (time_par_scan_serial > time_par_scan_1 * 2.0) &&
+        (time_par_scan_serial > time_par_scan_2 * 2.0);
+#else
+        (time_par_scan_serial < time_par_scan_1 * 2.0) &&
+        (time_par_scan_serial < time_par_scan_2 * 2.0);
+#endif
+    if (!passed_par_scan)
+      printf("Time Scan1: %lf Scan2: %lf ScanSerial: %lf\n", time_par_scan_1,
+             time_par_scan_2, time_par_scan_serial);
+    ASSERT_TRUE(passed_par_scan);
+  }
+}
+
+}  // namespace Test
diff --git a/lib/kokkos/core/unit_test/cuda/TestCuda_DeepCopyAlignment.cpp b/lib/kokkos/core/unit_test/cuda/TestCuda_DeepCopyAlignment.cpp
index f28a6fcbe9..16793abe08 100644
--- a/lib/kokkos/core/unit_test/cuda/TestCuda_DeepCopyAlignment.cpp
+++ b/lib/kokkos/core/unit_test/cuda/TestCuda_DeepCopyAlignment.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -42,7 +43,6 @@
 */
 
 #include <cuda/TestCuda_Category.hpp>
-#if defined(KOKKOS_ENABLE_CXX11_DISPATCH_LAMBDA) 
+#if defined(KOKKOS_ENABLE_CXX11_DISPATCH_LAMBDA)
 #include <TestDeepCopy.hpp>
 #endif
-
diff --git a/lib/kokkos/core/unit_test/cuda/TestCuda_FunctorAnalysis.cpp b/lib/kokkos/core/unit_test/cuda/TestCuda_FunctorAnalysis.cpp
new file mode 100644
index 0000000000..036806d8db
--- /dev/null
+++ b/lib/kokkos/core/unit_test/cuda/TestCuda_FunctorAnalysis.cpp
@@ -0,0 +1,47 @@
+
+/*
+//@HEADER
+// ************************************************************************
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
+// the U.S. Government retains certain rights in this software.
+//
+// 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 Corporation nor the names of the
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 NTESS OR THE
+// 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.
+//
+// Questions? Contact Christian R. Trott (crtrott@sandia.gov)
+//
+// ************************************************************************
+//@HEADER
+*/
+
+#include <cuda/TestCuda_Category.hpp>
+#include <TestFunctorAnalysis.hpp>
diff --git a/lib/kokkos/core/unit_test/cuda/TestCuda_Init.cpp b/lib/kokkos/core/unit_test/cuda/TestCuda_Init.cpp
index 97e2867ddc..bc5f6cf9e8 100644
--- a/lib/kokkos/core/unit_test/cuda/TestCuda_Init.cpp
+++ b/lib/kokkos/core/unit_test/cuda/TestCuda_Init.cpp
@@ -3,10 +3,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -42,9 +43,7 @@
 //@HEADER
 */
 
-#include<cuda/TestCuda_Category.hpp>
-#include<TestInit.hpp>
-#include<TestCompilerMacros.hpp>
-#include<TestPolicyConstruction.hpp>
-
-
+#include <cuda/TestCuda_Category.hpp>
+#include <TestInit.hpp>
+#include <TestCompilerMacros.hpp>
+#include <TestPolicyConstruction.hpp>
diff --git a/lib/kokkos/core/unit_test/cuda/TestCuda_InterOp_Init.cpp b/lib/kokkos/core/unit_test/cuda/TestCuda_InterOp_Init.cpp
index 963a7194b3..6073b9cd7e 100644
--- a/lib/kokkos/core/unit_test/cuda/TestCuda_InterOp_Init.cpp
+++ b/lib/kokkos/core/unit_test/cuda/TestCuda_InterOp_Init.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -47,39 +48,38 @@
 namespace Test {
 
 __global__ void offset(int* p) {
-  int idx = blockIdx.x*blockDim.x + threadIdx.x;
-  if(idx<100) {
-    p[idx]+=idx;
+  int idx = blockIdx.x * blockDim.x + threadIdx.x;
+  if (idx < 100) {
+    p[idx] += idx;
   }
 }
 
-// Test whether allocations survive Kokkos initialize/finalize if done via Raw Cuda.
-TEST_F( cuda, raw_cuda_interop )
-{
+// Test whether allocations survive Kokkos initialize/finalize if done via Raw
+// Cuda.
+TEST(cuda, raw_cuda_interop) {
   int* p;
-  cudaMalloc(&p,sizeof(int)*100);
-  Kokkos::InitArguments arguments{-1,-1,-1, false};
+  cudaMalloc(&p, sizeof(int) * 100);
+  Kokkos::InitArguments arguments{-1, -1, -1, false};
   Kokkos::initialize(arguments);
 
-  Kokkos::View<int*,Kokkos::MemoryTraits<Kokkos::Unmanaged>>
-    v(p,100);
-  Kokkos::deep_copy(v,5);
+  Kokkos::View<int*, Kokkos::MemoryTraits<Kokkos::Unmanaged>> v(p, 100);
+  Kokkos::deep_copy(v, 5);
 
   Kokkos::finalize();
 
-  offset<<<100,64>>>(p);
-  CUDA_SAFE_CALL( cudaDeviceSynchronize());
+  offset<<<100, 64>>>(p);
+  CUDA_SAFE_CALL(cudaDeviceSynchronize());
 
   int* h_p = new int[100];
-  cudaMemcpy( h_p , p , sizeof(int)*100 , cudaMemcpyDefault );
-  CUDA_SAFE_CALL( cudaDeviceSynchronize());
-  int64_t sum = 0;
+  cudaMemcpy(h_p, p, sizeof(int) * 100, cudaMemcpyDefault);
+  CUDA_SAFE_CALL(cudaDeviceSynchronize());
+  int64_t sum        = 0;
   int64_t sum_expect = 0;
-  for(int i=0; i<100; i++) {
+  for (int i = 0; i < 100; i++) {
     sum += h_p[i];
-    sum_expect += 5+i;
+    sum_expect += 5 + i;
   }
 
-  ASSERT_EQ(sum,sum_expect);
-}
+  ASSERT_EQ(sum, sum_expect);
 }
+}  // namespace Test
diff --git a/lib/kokkos/core/unit_test/cuda/TestCuda_InterOp_Streams.cpp b/lib/kokkos/core/unit_test/cuda/TestCuda_InterOp_Streams.cpp
index 4969e27040..3753ad9aec 100644
--- a/lib/kokkos/core/unit_test/cuda/TestCuda_InterOp_Streams.cpp
+++ b/lib/kokkos/core/unit_test/cuda/TestCuda_InterOp_Streams.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -47,134 +48,161 @@
 namespace Test {
 
 __global__ void offset_streams(int* p) {
-  int idx = blockIdx.x*blockDim.x + threadIdx.x;
-  if(idx<100) {
-    p[idx]+=idx;
+  int idx = blockIdx.x * blockDim.x + threadIdx.x;
+  if (idx < 100) {
+    p[idx] += idx;
   }
 }
 
 namespace {
-  struct FunctorRange {
-    Kokkos::View<int*,Kokkos::CudaSpace,Kokkos::MemoryTraits<Kokkos::Unmanaged>> a;
-    FunctorRange(Kokkos::View<int*,Kokkos::CudaSpace,Kokkos::MemoryTraits<Kokkos::Unmanaged>> a_):a(a_) {}
+struct FunctorRange {
+  Kokkos::View<int*, Kokkos::CudaSpace, Kokkos::MemoryTraits<Kokkos::Unmanaged>>
+      a;
+  FunctorRange(Kokkos::View<int*, Kokkos::CudaSpace,
+                            Kokkos::MemoryTraits<Kokkos::Unmanaged>>
+                   a_)
+      : a(a_) {}
 
-    KOKKOS_INLINE_FUNCTION
-    void operator() (const int i) const {
-      a(i)+=1;
-    }
-  };
-  struct FunctorRangeReduce {
-    Kokkos::View<int*,Kokkos::CudaSpace,Kokkos::MemoryTraits<Kokkos::Unmanaged>> a;
-    FunctorRangeReduce(Kokkos::View<int*,Kokkos::CudaSpace,Kokkos::MemoryTraits<Kokkos::Unmanaged>> a_):a(a_) {}
+  KOKKOS_INLINE_FUNCTION
+  void operator()(const int i) const { a(i) += 1; }
+};
+struct FunctorRangeReduce {
+  Kokkos::View<int*, Kokkos::CudaSpace, Kokkos::MemoryTraits<Kokkos::Unmanaged>>
+      a;
+  FunctorRangeReduce(Kokkos::View<int*, Kokkos::CudaSpace,
+                                  Kokkos::MemoryTraits<Kokkos::Unmanaged>>
+                         a_)
+      : a(a_) {}
 
-    KOKKOS_INLINE_FUNCTION
-    void operator() (const int i, int& lsum) const {
-      lsum += a(i);
-    }
-  };
-  struct FunctorMDRange {
-    Kokkos::View<int*,Kokkos::CudaSpace,Kokkos::MemoryTraits<Kokkos::Unmanaged>> a;
-    FunctorMDRange(Kokkos::View<int*,Kokkos::CudaSpace,Kokkos::MemoryTraits<Kokkos::Unmanaged>> a_):a(a_) {}
+  KOKKOS_INLINE_FUNCTION
+  void operator()(const int i, int& lsum) const { lsum += a(i); }
+};
+struct FunctorMDRange {
+  Kokkos::View<int*, Kokkos::CudaSpace, Kokkos::MemoryTraits<Kokkos::Unmanaged>>
+      a;
+  FunctorMDRange(Kokkos::View<int*, Kokkos::CudaSpace,
+                              Kokkos::MemoryTraits<Kokkos::Unmanaged>>
+                     a_)
+      : a(a_) {}
 
-    KOKKOS_INLINE_FUNCTION
-    void operator() (const int i, const int j) const {
-      a(i*10+j)+=1;
-    }
-  };
-  struct FunctorMDRangeReduce {
-    Kokkos::View<int*,Kokkos::CudaSpace,Kokkos::MemoryTraits<Kokkos::Unmanaged>> a;
-    FunctorMDRangeReduce(Kokkos::View<int*,Kokkos::CudaSpace,Kokkos::MemoryTraits<Kokkos::Unmanaged>> a_):a(a_) {}
+  KOKKOS_INLINE_FUNCTION
+  void operator()(const int i, const int j) const { a(i * 10 + j) += 1; }
+};
+struct FunctorMDRangeReduce {
+  Kokkos::View<int*, Kokkos::CudaSpace, Kokkos::MemoryTraits<Kokkos::Unmanaged>>
+      a;
+  FunctorMDRangeReduce(Kokkos::View<int*, Kokkos::CudaSpace,
+                                    Kokkos::MemoryTraits<Kokkos::Unmanaged>>
+                           a_)
+      : a(a_) {}
 
-    KOKKOS_INLINE_FUNCTION
-    void operator() (const int i, const int j, int& lsum) const {
-      lsum += a(i*10+j);
-    }
-  };
-  struct FunctorTeam {
-    Kokkos::View<int*,Kokkos::CudaSpace,Kokkos::MemoryTraits<Kokkos::Unmanaged>> a;
-    FunctorTeam(Kokkos::View<int*,Kokkos::CudaSpace,Kokkos::MemoryTraits<Kokkos::Unmanaged>> a_):a(a_) {}
+  KOKKOS_INLINE_FUNCTION
+  void operator()(const int i, const int j, int& lsum) const {
+    lsum += a(i * 10 + j);
+  }
+};
+struct FunctorTeam {
+  Kokkos::View<int*, Kokkos::CudaSpace, Kokkos::MemoryTraits<Kokkos::Unmanaged>>
+      a;
+  FunctorTeam(Kokkos::View<int*, Kokkos::CudaSpace,
+                           Kokkos::MemoryTraits<Kokkos::Unmanaged>>
+                  a_)
+      : a(a_) {}
 
-    KOKKOS_INLINE_FUNCTION
-    void operator() (const Kokkos::TeamPolicy<Kokkos::Cuda>::member_type& team) const {
-      int i = team.league_rank();
-      Kokkos::parallel_for(Kokkos::TeamThreadRange(team,10),[&](const int j){
-        a(i*10+j)+=1;
-      });
-    }
-  };
+  KOKKOS_INLINE_FUNCTION
+  void operator()(
+      const Kokkos::TeamPolicy<Kokkos::Cuda>::member_type& team) const {
+    int i = team.league_rank();
+    Kokkos::parallel_for(Kokkos::TeamThreadRange(team, 10),
+                         [&](const int j) { a(i * 10 + j) += 1; });
+  }
+};
 
-  struct FunctorTeamReduce {
-    Kokkos::View<int*,Kokkos::CudaSpace,Kokkos::MemoryTraits<Kokkos::Unmanaged>> a;
-    FunctorTeamReduce(Kokkos::View<int*,Kokkos::CudaSpace,Kokkos::MemoryTraits<Kokkos::Unmanaged>> a_):a(a_) {}
+struct FunctorTeamReduce {
+  Kokkos::View<int*, Kokkos::CudaSpace, Kokkos::MemoryTraits<Kokkos::Unmanaged>>
+      a;
+  FunctorTeamReduce(Kokkos::View<int*, Kokkos::CudaSpace,
+                                 Kokkos::MemoryTraits<Kokkos::Unmanaged>>
+                        a_)
+      : a(a_) {}
 
-    KOKKOS_INLINE_FUNCTION
-    void operator() (const Kokkos::TeamPolicy<Kokkos::Cuda>::member_type& team, int& lsum) const {
-      int i = team.league_rank();
-      int team_sum;
-      Kokkos::parallel_reduce(Kokkos::TeamThreadRange(team,10),[&](const int j, int& tsum){
-        tsum += a(i*10+j);
-      },team_sum);
-      Kokkos::single(Kokkos::PerTeam(team),[&]() {
-        lsum += team_sum;
-      });
-    }
-  };
-}
+  KOKKOS_INLINE_FUNCTION
+  void operator()(const Kokkos::TeamPolicy<Kokkos::Cuda>::member_type& team,
+                  int& lsum) const {
+    int i = team.league_rank();
+    int team_sum;
+    Kokkos::parallel_reduce(
+        Kokkos::TeamThreadRange(team, 10),
+        [&](const int j, int& tsum) { tsum += a(i * 10 + j); }, team_sum);
+    Kokkos::single(Kokkos::PerTeam(team), [&]() { lsum += team_sum; });
+  }
+};
+}  // namespace
 
 // Test Interoperability with Cuda Streams
-TEST_F( cuda, raw_cuda_streams )
-{
+TEST(cuda, raw_cuda_streams) {
   cudaStream_t stream;
   cudaStreamCreate(&stream);
-  Kokkos::InitArguments arguments{-1,-1,-1, false};
+  Kokkos::InitArguments arguments{-1, -1, -1, false};
   Kokkos::initialize(arguments);
   int* p;
-  cudaMalloc(&p,sizeof(int)*100);
+  cudaMalloc(&p, sizeof(int) * 100);
 
   {
-  Kokkos::Cuda cuda0(stream);
-  Kokkos::View<int*,Kokkos::CudaSpace>
-    v(p,100);
-  Kokkos::deep_copy(cuda0,v,5);
-  int sum;
+    Kokkos::Cuda cuda0(stream);
+    Kokkos::View<int*, Kokkos::CudaSpace> v(p, 100);
+    Kokkos::deep_copy(cuda0, v, 5);
+    int sum;
 
-  Kokkos::parallel_for("Test::cuda::raw_cuda_stream::Range",
-      Kokkos::RangePolicy<Kokkos::Cuda>(cuda0,0,100),FunctorRange(v));
-  Kokkos::parallel_reduce("Test::cuda::raw_cuda_stream::RangeReduce",
-      Kokkos::RangePolicy<Kokkos::Cuda,Kokkos::LaunchBounds<128,2>>(cuda0,0,100),FunctorRangeReduce(v),sum);
-  cuda0.fence();
-  ASSERT_EQ(600,sum);
+    Kokkos::parallel_for("Test::cuda::raw_cuda_stream::Range",
+                         Kokkos::RangePolicy<Kokkos::Cuda>(cuda0, 0, 100),
+                         FunctorRange(v));
+    Kokkos::parallel_reduce(
+        "Test::cuda::raw_cuda_stream::RangeReduce",
+        Kokkos::RangePolicy<Kokkos::Cuda, Kokkos::LaunchBounds<128, 2>>(cuda0,
+                                                                        0, 100),
+        FunctorRangeReduce(v), sum);
+    cuda0.fence();
+    ASSERT_EQ(600, sum);
 
-  Kokkos::parallel_for("Test::cuda::raw_cuda_stream::MDRange",
-      Kokkos::MDRangePolicy<Kokkos::Cuda,Kokkos::Rank<2>>(cuda0,{0,0},{10,10}),FunctorMDRange(v));
-  Kokkos::parallel_reduce("Test::cuda::raw_cuda_stream::MDRangeReduce",
-      Kokkos::MDRangePolicy<Kokkos::Cuda,Kokkos::Rank<2>,Kokkos::LaunchBounds<128,2>>(cuda0,{0,0},{10,10}),FunctorMDRangeReduce(v),sum);
-  cuda0.fence();
-  ASSERT_EQ(700,sum);
-
-  Kokkos::parallel_for("Test::cuda::raw_cuda_stream::Team",
-      Kokkos::TeamPolicy<Kokkos::Cuda>(cuda0,10,10),FunctorTeam(v));
-  Kokkos::parallel_reduce("Test::cuda::raw_cuda_stream::Team",
-      Kokkos::TeamPolicy<Kokkos::Cuda,Kokkos::LaunchBounds<128,2>>(cuda0,10,10),FunctorTeamReduce(v),sum);
-  cuda0.fence();
-  ASSERT_EQ(800,sum);
+    Kokkos::parallel_for("Test::cuda::raw_cuda_stream::MDRange",
+                         Kokkos::MDRangePolicy<Kokkos::Cuda, Kokkos::Rank<2>>(
+                             cuda0, {0, 0}, {10, 10}),
+                         FunctorMDRange(v));
+    Kokkos::parallel_reduce("Test::cuda::raw_cuda_stream::MDRangeReduce",
+                            Kokkos::MDRangePolicy<Kokkos::Cuda, Kokkos::Rank<2>,
+                                                  Kokkos::LaunchBounds<128, 2>>(
+                                cuda0, {0, 0}, {10, 10}),
+                            FunctorMDRangeReduce(v), sum);
+    cuda0.fence();
+    ASSERT_EQ(700, sum);
 
+    Kokkos::parallel_for("Test::cuda::raw_cuda_stream::Team",
+                         Kokkos::TeamPolicy<Kokkos::Cuda>(cuda0, 10, 10),
+                         FunctorTeam(v));
+    Kokkos::parallel_reduce(
+        "Test::cuda::raw_cuda_stream::Team",
+        Kokkos::TeamPolicy<Kokkos::Cuda, Kokkos::LaunchBounds<128, 2>>(cuda0,
+                                                                       10, 10),
+        FunctorTeamReduce(v), sum);
+    cuda0.fence();
+    ASSERT_EQ(800, sum);
   }
   Kokkos::finalize();
-  offset_streams<<<100,64,0,stream>>>(p);
-  CUDA_SAFE_CALL( cudaDeviceSynchronize());
+  offset_streams<<<100, 64, 0, stream>>>(p);
+  CUDA_SAFE_CALL(cudaDeviceSynchronize());
   cudaStreamDestroy(stream);
 
   int* h_p = new int[100];
-  cudaMemcpy( h_p , p , sizeof(int)*100 , cudaMemcpyDefault );
-  CUDA_SAFE_CALL( cudaDeviceSynchronize());
-  int64_t sum = 0;
+  cudaMemcpy(h_p, p, sizeof(int) * 100, cudaMemcpyDefault);
+  CUDA_SAFE_CALL(cudaDeviceSynchronize());
+  int64_t sum        = 0;
   int64_t sum_expect = 0;
-  for(int i=0; i<100; i++) {
+  for (int i = 0; i < 100; i++) {
     sum += h_p[i];
-    sum_expect += 8+i;
+    sum_expect += 8 + i;
   }
 
-  ASSERT_EQ(sum,sum_expect);
-}
+  ASSERT_EQ(sum, sum_expect);
 }
+}  // namespace Test
diff --git a/lib/kokkos/core/unit_test/cuda/TestCuda_LocalDeepCopy.cpp b/lib/kokkos/core/unit_test/cuda/TestCuda_LocalDeepCopy.cpp
index 1a9940ed70..20e32ff384 100644
--- a/lib/kokkos/core/unit_test/cuda/TestCuda_LocalDeepCopy.cpp
+++ b/lib/kokkos/core/unit_test/cuda/TestCuda_LocalDeepCopy.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -43,4 +44,3 @@
 
 #include <cuda/TestCuda_Category.hpp>
 #include <TestLocalDeepCopy.hpp>
-
diff --git a/lib/kokkos/core/unit_test/cuda/TestCuda_MDRange_a.cpp b/lib/kokkos/core/unit_test/cuda/TestCuda_MDRange_a.cpp
index 8114a32b0f..5e339b9a0e 100644
--- a/lib/kokkos/core/unit_test/cuda/TestCuda_MDRange_a.cpp
+++ b/lib/kokkos/core/unit_test/cuda/TestCuda_MDRange_a.cpp
@@ -3,10 +3,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -42,6 +43,5 @@
 //@HEADER
 */
 
-#include<cuda/TestCuda_Category.hpp>
-#include<TestMDRange_a.hpp>
-
+#include <cuda/TestCuda_Category.hpp>
+#include <TestMDRange_a.hpp>
diff --git a/lib/kokkos/core/unit_test/cuda/TestCuda_MDRange_b.cpp b/lib/kokkos/core/unit_test/cuda/TestCuda_MDRange_b.cpp
index 9fb92b7e31..16974ed264 100644
--- a/lib/kokkos/core/unit_test/cuda/TestCuda_MDRange_b.cpp
+++ b/lib/kokkos/core/unit_test/cuda/TestCuda_MDRange_b.cpp
@@ -3,10 +3,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -42,6 +43,5 @@
 //@HEADER
 */
 
-#include<cuda/TestCuda_Category.hpp>
-#include<TestMDRange_b.hpp>
-
+#include <cuda/TestCuda_Category.hpp>
+#include <TestMDRange_b.hpp>
diff --git a/lib/kokkos/core/unit_test/cuda/TestCuda_MDRange_c.cpp b/lib/kokkos/core/unit_test/cuda/TestCuda_MDRange_c.cpp
index bc3d62ee1b..ebc4dfee64 100644
--- a/lib/kokkos/core/unit_test/cuda/TestCuda_MDRange_c.cpp
+++ b/lib/kokkos/core/unit_test/cuda/TestCuda_MDRange_c.cpp
@@ -3,10 +3,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -42,6 +43,5 @@
 //@HEADER
 */
 
-#include<cuda/TestCuda_Category.hpp>
-#include<TestMDRange_c.hpp>
-
+#include <cuda/TestCuda_Category.hpp>
+#include <TestMDRange_c.hpp>
diff --git a/lib/kokkos/core/unit_test/cuda/TestCuda_MDRange_d.cpp b/lib/kokkos/core/unit_test/cuda/TestCuda_MDRange_d.cpp
index 6d9069119a..2e7392613e 100644
--- a/lib/kokkos/core/unit_test/cuda/TestCuda_MDRange_d.cpp
+++ b/lib/kokkos/core/unit_test/cuda/TestCuda_MDRange_d.cpp
@@ -3,10 +3,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -42,6 +43,5 @@
 //@HEADER
 */
 
-#include<cuda/TestCuda_Category.hpp>
-#include<TestMDRange_d.hpp>
-
+#include <cuda/TestCuda_Category.hpp>
+#include <TestMDRange_d.hpp>
diff --git a/lib/kokkos/core/unit_test/cuda/TestCuda_MDRange_e.cpp b/lib/kokkos/core/unit_test/cuda/TestCuda_MDRange_e.cpp
index 497ffbdccd..92ec05a47b 100644
--- a/lib/kokkos/core/unit_test/cuda/TestCuda_MDRange_e.cpp
+++ b/lib/kokkos/core/unit_test/cuda/TestCuda_MDRange_e.cpp
@@ -3,10 +3,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -42,6 +43,5 @@
 //@HEADER
 */
 
-#include<cuda/TestCuda_Category.hpp>
-#include<TestMDRange_e.hpp>
-
+#include <cuda/TestCuda_Category.hpp>
+#include <TestMDRange_e.hpp>
diff --git a/lib/kokkos/core/unit_test/cuda/TestCuda_Other.cpp b/lib/kokkos/core/unit_test/cuda/TestCuda_Other.cpp
index 788e458eea..1552261787 100644
--- a/lib/kokkos/core/unit_test/cuda/TestCuda_Other.cpp
+++ b/lib/kokkos/core/unit_test/cuda/TestCuda_Other.cpp
@@ -3,10 +3,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -42,12 +43,12 @@
 //@HEADER
 */
 
-#include<cuda/TestCuda_Category.hpp>
-#include<TestTemplateMetaFunctions.hpp>
-#include<TestAggregate.hpp>
-#include<TestMemoryPool.hpp>
-#include<TestCXX11.hpp>
-#include<TestTile.hpp>
+#include <cuda/TestCuda_Category.hpp>
+#include <TestTemplateMetaFunctions.hpp>
+#include <TestAggregate.hpp>
+#include <TestMemoryPool.hpp>
+#include <TestCXX11.hpp>
+#include <TestTile.hpp>
 
-#include<TestViewCtorPropEmbeddedDim.hpp>
-#include<TestViewLayoutTiled.hpp>
+#include <TestViewCtorPropEmbeddedDim.hpp>
+#include <TestViewLayoutTiled.hpp>
diff --git a/lib/kokkos/core/unit_test/cuda/TestCuda_RangePolicy.cpp b/lib/kokkos/core/unit_test/cuda/TestCuda_RangePolicy.cpp
index b671929d84..730978c35e 100644
--- a/lib/kokkos/core/unit_test/cuda/TestCuda_RangePolicy.cpp
+++ b/lib/kokkos/core/unit_test/cuda/TestCuda_RangePolicy.cpp
@@ -3,10 +3,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -42,6 +43,5 @@
 //@HEADER
 */
 
-#include<cuda/TestCuda_Category.hpp>
-#include<TestRange.hpp>
-
+#include <cuda/TestCuda_Category.hpp>
+#include <TestRange.hpp>
diff --git a/lib/kokkos/core/unit_test/cuda/TestCuda_Reducers_a.cpp b/lib/kokkos/core/unit_test/cuda/TestCuda_Reducers_a.cpp
index c26b8a63e2..ab4446f964 100644
--- a/lib/kokkos/core/unit_test/cuda/TestCuda_Reducers_a.cpp
+++ b/lib/kokkos/core/unit_test/cuda/TestCuda_Reducers_a.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
diff --git a/lib/kokkos/core/unit_test/cuda/TestCuda_Reducers_b.cpp b/lib/kokkos/core/unit_test/cuda/TestCuda_Reducers_b.cpp
index 17959930d3..4c7f111821 100644
--- a/lib/kokkos/core/unit_test/cuda/TestCuda_Reducers_b.cpp
+++ b/lib/kokkos/core/unit_test/cuda/TestCuda_Reducers_b.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
diff --git a/lib/kokkos/core/unit_test/cuda/TestCuda_Reducers_c.cpp b/lib/kokkos/core/unit_test/cuda/TestCuda_Reducers_c.cpp
index add28b5b2b..0e10c7093b 100644
--- a/lib/kokkos/core/unit_test/cuda/TestCuda_Reducers_c.cpp
+++ b/lib/kokkos/core/unit_test/cuda/TestCuda_Reducers_c.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
diff --git a/lib/kokkos/core/unit_test/cuda/TestCuda_Reducers_d.cpp b/lib/kokkos/core/unit_test/cuda/TestCuda_Reducers_d.cpp
index 5fb1c1f2e3..ba2ae62330 100644
--- a/lib/kokkos/core/unit_test/cuda/TestCuda_Reducers_d.cpp
+++ b/lib/kokkos/core/unit_test/cuda/TestCuda_Reducers_d.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
diff --git a/lib/kokkos/core/unit_test/cuda/TestCuda_Reductions.cpp b/lib/kokkos/core/unit_test/cuda/TestCuda_Reductions.cpp
index fe719c422e..afa361c48b 100644
--- a/lib/kokkos/core/unit_test/cuda/TestCuda_Reductions.cpp
+++ b/lib/kokkos/core/unit_test/cuda/TestCuda_Reductions.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
diff --git a/lib/kokkos/core/unit_test/cuda/TestCuda_Reductions_DeviceView.cpp b/lib/kokkos/core/unit_test/cuda/TestCuda_Reductions_DeviceView.cpp
index 5b34090149..e2abf881a9 100644
--- a/lib/kokkos/core/unit_test/cuda/TestCuda_Reductions_DeviceView.cpp
+++ b/lib/kokkos/core/unit_test/cuda/TestCuda_Reductions_DeviceView.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
diff --git a/lib/kokkos/core/unit_test/cuda/TestCuda_Scan.cpp b/lib/kokkos/core/unit_test/cuda/TestCuda_Scan.cpp
index 57f9857a87..e8364464ee 100644
--- a/lib/kokkos/core/unit_test/cuda/TestCuda_Scan.cpp
+++ b/lib/kokkos/core/unit_test/cuda/TestCuda_Scan.cpp
@@ -3,10 +3,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -42,6 +43,5 @@
 //@HEADER
 */
 
-#include<cuda/TestCuda_Category.hpp>
-#include<TestScan.hpp>
-
+#include <cuda/TestCuda_Category.hpp>
+#include <TestScan.hpp>
diff --git a/lib/kokkos/core/unit_test/cuda/TestCuda_SharedAlloc.cpp b/lib/kokkos/core/unit_test/cuda/TestCuda_SharedAlloc.cpp
index fc0b02505d..a09ea3f1b8 100644
--- a/lib/kokkos/core/unit_test/cuda/TestCuda_SharedAlloc.cpp
+++ b/lib/kokkos/core/unit_test/cuda/TestCuda_SharedAlloc.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -46,10 +47,8 @@
 
 namespace Test {
 
-
-TEST_F( TEST_CATEGORY, impl_shared_alloc )
-{
-  test_shared_alloc< Kokkos::CudaSpace, Kokkos::DefaultHostExecutionSpace >();
+TEST(TEST_CATEGORY, impl_shared_alloc) {
+  test_shared_alloc<Kokkos::CudaSpace, Kokkos::DefaultHostExecutionSpace>();
 }
 
-} // namespace Test
+}  // namespace Test
diff --git a/lib/kokkos/core/unit_test/cuda/TestCuda_Spaces.cpp b/lib/kokkos/core/unit_test/cuda/TestCuda_Spaces.cpp
index afe18bdad4..800d589e94 100644
--- a/lib/kokkos/core/unit_test/cuda/TestCuda_Spaces.cpp
+++ b/lib/kokkos/core/unit_test/cuda/TestCuda_Spaces.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -46,193 +47,244 @@
 
 namespace Test {
 
-__global__
-void test_abort()
-{
-  Kokkos::abort( "test_abort" );
+__global__ void test_abort() { Kokkos::abort("test_abort"); }
+
+__global__ void test_cuda_spaces_int_value(int *ptr) {
+  if (*ptr == 42) {
+    *ptr = 2 * 42;
+  }
 }
 
-__global__
-void test_cuda_spaces_int_value( int * ptr )
-{
-  if ( *ptr == 42 ) { *ptr = 2 * 42; }
+TEST(cuda, space_access) {
+  static_assert(Kokkos::Impl::MemorySpaceAccess<Kokkos::HostSpace,
+                                                Kokkos::HostSpace>::assignable,
+                "");
+
+  static_assert(
+      Kokkos::Impl::MemorySpaceAccess<Kokkos::HostSpace,
+                                      Kokkos::CudaHostPinnedSpace>::assignable,
+      "");
+
+  static_assert(!Kokkos::Impl::MemorySpaceAccess<Kokkos::HostSpace,
+                                                 Kokkos::CudaSpace>::assignable,
+                "");
+
+  static_assert(!Kokkos::Impl::MemorySpaceAccess<Kokkos::HostSpace,
+                                                 Kokkos::CudaSpace>::accessible,
+                "");
+
+  static_assert(
+      !Kokkos::Impl::MemorySpaceAccess<Kokkos::HostSpace,
+                                       Kokkos::CudaUVMSpace>::assignable,
+      "");
+
+  static_assert(
+      Kokkos::Impl::MemorySpaceAccess<Kokkos::HostSpace,
+                                      Kokkos::CudaUVMSpace>::accessible,
+      "");
+
+  //--------------------------------------
+
+  static_assert(Kokkos::Impl::MemorySpaceAccess<Kokkos::CudaSpace,
+                                                Kokkos::CudaSpace>::assignable,
+                "");
+
+  static_assert(
+      Kokkos::Impl::MemorySpaceAccess<Kokkos::CudaSpace,
+                                      Kokkos::CudaUVMSpace>::assignable,
+      "");
+
+  static_assert(
+      !Kokkos::Impl::MemorySpaceAccess<Kokkos::CudaSpace,
+                                       Kokkos::CudaHostPinnedSpace>::assignable,
+      "");
+
+  static_assert(
+      Kokkos::Impl::MemorySpaceAccess<Kokkos::CudaSpace,
+                                      Kokkos::CudaHostPinnedSpace>::accessible,
+      "");
+
+  static_assert(!Kokkos::Impl::MemorySpaceAccess<Kokkos::CudaSpace,
+                                                 Kokkos::HostSpace>::assignable,
+                "");
+
+  static_assert(!Kokkos::Impl::MemorySpaceAccess<Kokkos::CudaSpace,
+                                                 Kokkos::HostSpace>::accessible,
+                "");
+
+  //--------------------------------------
+
+  static_assert(
+      Kokkos::Impl::MemorySpaceAccess<Kokkos::CudaUVMSpace,
+                                      Kokkos::CudaUVMSpace>::assignable,
+      "");
+
+  static_assert(!Kokkos::Impl::MemorySpaceAccess<Kokkos::CudaUVMSpace,
+                                                 Kokkos::CudaSpace>::assignable,
+                "");
+
+  static_assert(Kokkos::Impl::MemorySpaceAccess<Kokkos::CudaUVMSpace,
+                                                Kokkos::CudaSpace>::accessible,
+                "");
+
+  static_assert(!Kokkos::Impl::MemorySpaceAccess<Kokkos::CudaUVMSpace,
+                                                 Kokkos::HostSpace>::assignable,
+                "");
+
+  static_assert(!Kokkos::Impl::MemorySpaceAccess<Kokkos::CudaUVMSpace,
+                                                 Kokkos::HostSpace>::accessible,
+                "");
+
+  static_assert(
+      !Kokkos::Impl::MemorySpaceAccess<Kokkos::CudaUVMSpace,
+                                       Kokkos::CudaHostPinnedSpace>::assignable,
+      "");
+
+  static_assert(
+      Kokkos::Impl::MemorySpaceAccess<Kokkos::CudaUVMSpace,
+                                      Kokkos::CudaHostPinnedSpace>::accessible,
+      "");
+
+  //--------------------------------------
+
+  static_assert(
+      Kokkos::Impl::MemorySpaceAccess<Kokkos::CudaHostPinnedSpace,
+                                      Kokkos::CudaHostPinnedSpace>::assignable,
+      "");
+
+  static_assert(!Kokkos::Impl::MemorySpaceAccess<Kokkos::CudaHostPinnedSpace,
+                                                 Kokkos::HostSpace>::assignable,
+                "");
+
+  static_assert(Kokkos::Impl::MemorySpaceAccess<Kokkos::CudaHostPinnedSpace,
+                                                Kokkos::HostSpace>::accessible,
+                "");
+
+  static_assert(!Kokkos::Impl::MemorySpaceAccess<Kokkos::CudaHostPinnedSpace,
+                                                 Kokkos::CudaSpace>::assignable,
+                "");
+
+  static_assert(!Kokkos::Impl::MemorySpaceAccess<Kokkos::CudaHostPinnedSpace,
+                                                 Kokkos::CudaSpace>::accessible,
+                "");
+
+  static_assert(
+      !Kokkos::Impl::MemorySpaceAccess<Kokkos::CudaHostPinnedSpace,
+                                       Kokkos::CudaUVMSpace>::assignable,
+      "");
+
+  static_assert(
+      Kokkos::Impl::MemorySpaceAccess<Kokkos::CudaHostPinnedSpace,
+                                      Kokkos::CudaUVMSpace>::accessible,
+      "");
+
+  //--------------------------------------
+
+  static_assert(
+      !Kokkos::Impl::SpaceAccessibility<Kokkos::Cuda,
+                                        Kokkos::HostSpace>::accessible,
+      "");
+
+  static_assert(Kokkos::Impl::SpaceAccessibility<Kokkos::Cuda,
+                                                 Kokkos::CudaSpace>::accessible,
+                "");
+
+  static_assert(
+      Kokkos::Impl::SpaceAccessibility<Kokkos::Cuda,
+                                       Kokkos::CudaUVMSpace>::accessible,
+      "");
+
+  static_assert(
+      Kokkos::Impl::SpaceAccessibility<Kokkos::Cuda,
+                                       Kokkos::CudaHostPinnedSpace>::accessible,
+      "");
+
+  static_assert(
+      !Kokkos::Impl::SpaceAccessibility<Kokkos::HostSpace,
+                                        Kokkos::CudaSpace>::accessible,
+      "");
+
+  static_assert(
+      Kokkos::Impl::SpaceAccessibility<Kokkos::HostSpace,
+                                       Kokkos::CudaUVMSpace>::accessible,
+      "");
+
+  static_assert(
+      Kokkos::Impl::SpaceAccessibility<Kokkos::HostSpace,
+                                       Kokkos::CudaHostPinnedSpace>::accessible,
+      "");
+
+  static_assert(std::is_same<Kokkos::Impl::HostMirror<Kokkos::CudaSpace>::Space,
+                             Kokkos::HostSpace>::value,
+                "");
+
+  static_assert(
+      std::is_same<Kokkos::Impl::HostMirror<Kokkos::CudaUVMSpace>::Space,
+                   Kokkos::Device<Kokkos::HostSpace::execution_space,
+                                  Kokkos::CudaUVMSpace>>::value,
+      "");
+
+  static_assert(
+      std::is_same<Kokkos::Impl::HostMirror<Kokkos::CudaHostPinnedSpace>::Space,
+                   Kokkos::CudaHostPinnedSpace>::value,
+      "");
+
+  static_assert(std::is_same<Kokkos::Device<Kokkos::HostSpace::execution_space,
+                                            Kokkos::CudaUVMSpace>,
+                             Kokkos::Device<Kokkos::HostSpace::execution_space,
+                                            Kokkos::CudaUVMSpace>>::value,
+                "");
+
+  static_assert(Kokkos::Impl::SpaceAccessibility<
+                    Kokkos::Impl::HostMirror<Kokkos::Cuda>::Space,
+                    Kokkos::HostSpace>::accessible,
+                "");
+
+  static_assert(Kokkos::Impl::SpaceAccessibility<
+                    Kokkos::Impl::HostMirror<Kokkos::CudaSpace>::Space,
+                    Kokkos::HostSpace>::accessible,
+                "");
+
+  static_assert(Kokkos::Impl::SpaceAccessibility<
+                    Kokkos::Impl::HostMirror<Kokkos::CudaUVMSpace>::Space,
+                    Kokkos::HostSpace>::accessible,
+                "");
+
+  static_assert(
+      Kokkos::Impl::SpaceAccessibility<
+          Kokkos::Impl::HostMirror<Kokkos::CudaHostPinnedSpace>::Space,
+          Kokkos::HostSpace>::accessible,
+      "");
+#ifdef KOKKOS_ENABLE_CUDA_UVM
+  using uvm_view = Kokkos::View<double *, Kokkos::CudaUVMSpace>;
+  static_assert(std::is_same<uvm_view::HostMirror::execution_space,
+                             Kokkos::DefaultHostExecutionSpace>::value,
+                "Verify HostMirror execution space is really a host space");
+#endif
 }
 
-TEST_F( cuda, space_access )
-{
-  static_assert(
-    Kokkos::Impl::MemorySpaceAccess< Kokkos::HostSpace, Kokkos::HostSpace >::assignable, "" );
-
-  static_assert(
-    Kokkos::Impl::MemorySpaceAccess< Kokkos::HostSpace, Kokkos::CudaHostPinnedSpace >::assignable, "" );
-
-  static_assert(
-    ! Kokkos::Impl::MemorySpaceAccess< Kokkos::HostSpace, Kokkos::CudaSpace >::assignable, "" );
-
-  static_assert(
-    ! Kokkos::Impl::MemorySpaceAccess< Kokkos::HostSpace, Kokkos::CudaSpace >::accessible, "" );
-
-  static_assert(
-    ! Kokkos::Impl::MemorySpaceAccess< Kokkos::HostSpace, Kokkos::CudaUVMSpace >::assignable, "" );
-
-  static_assert(
-    Kokkos::Impl::MemorySpaceAccess< Kokkos::HostSpace, Kokkos::CudaUVMSpace >::accessible, "" );
-
-  //--------------------------------------
-
-  static_assert(
-    Kokkos::Impl::MemorySpaceAccess< Kokkos::CudaSpace, Kokkos::CudaSpace >::assignable, "" );
-
-  static_assert(
-    Kokkos::Impl::MemorySpaceAccess< Kokkos::CudaSpace, Kokkos::CudaUVMSpace >::assignable, "" );
-
-  static_assert(
-    ! Kokkos::Impl::MemorySpaceAccess< Kokkos::CudaSpace, Kokkos::CudaHostPinnedSpace >::assignable, "" );
-
-  static_assert(
-    Kokkos::Impl::MemorySpaceAccess< Kokkos::CudaSpace, Kokkos::CudaHostPinnedSpace >::accessible, "" );
-
-  static_assert(
-    ! Kokkos::Impl::MemorySpaceAccess< Kokkos::CudaSpace, Kokkos::HostSpace >::assignable, "" );
-
-  static_assert(
-    ! Kokkos::Impl::MemorySpaceAccess< Kokkos::CudaSpace, Kokkos::HostSpace >::accessible, "" );
-
-  //--------------------------------------
-
-  static_assert(
-    Kokkos::Impl::MemorySpaceAccess< Kokkos::CudaUVMSpace, Kokkos::CudaUVMSpace >::assignable, "" );
-
-  static_assert(
-    ! Kokkos::Impl::MemorySpaceAccess< Kokkos::CudaUVMSpace, Kokkos::CudaSpace >::assignable, "" );
-
-  static_assert(
-    Kokkos::Impl::MemorySpaceAccess< Kokkos::CudaUVMSpace, Kokkos::CudaSpace >::accessible, "" );
-
-  static_assert(
-    ! Kokkos::Impl::MemorySpaceAccess< Kokkos::CudaUVMSpace, Kokkos::HostSpace >::assignable, "" );
-
-  static_assert(
-    ! Kokkos::Impl::MemorySpaceAccess< Kokkos::CudaUVMSpace, Kokkos::HostSpace >::accessible, "" );
-
-  static_assert(
-    ! Kokkos::Impl::MemorySpaceAccess< Kokkos::CudaUVMSpace, Kokkos::CudaHostPinnedSpace >::assignable, "" );
-
-  static_assert(
-    Kokkos::Impl::MemorySpaceAccess< Kokkos::CudaUVMSpace, Kokkos::CudaHostPinnedSpace >::accessible, "" );
-
-  //--------------------------------------
-
-  static_assert(
-    Kokkos::Impl::MemorySpaceAccess< Kokkos::CudaHostPinnedSpace, Kokkos::CudaHostPinnedSpace >::assignable, "" );
-
-  static_assert(
-    ! Kokkos::Impl::MemorySpaceAccess< Kokkos::CudaHostPinnedSpace, Kokkos::HostSpace >::assignable, "" );
-
-  static_assert(
-    Kokkos::Impl::MemorySpaceAccess< Kokkos::CudaHostPinnedSpace, Kokkos::HostSpace >::accessible, "" );
-
-  static_assert(
-    ! Kokkos::Impl::MemorySpaceAccess< Kokkos::CudaHostPinnedSpace, Kokkos::CudaSpace >::assignable, "" );
-
-  static_assert(
-    ! Kokkos::Impl::MemorySpaceAccess< Kokkos::CudaHostPinnedSpace, Kokkos::CudaSpace >::accessible, "" );
-
-  static_assert(
-    ! Kokkos::Impl::MemorySpaceAccess< Kokkos::CudaHostPinnedSpace, Kokkos::CudaUVMSpace >::assignable, "" );
-
-  static_assert(
-    Kokkos::Impl::MemorySpaceAccess< Kokkos::CudaHostPinnedSpace, Kokkos::CudaUVMSpace >::accessible, "" );
-
-  //--------------------------------------
-
-  static_assert(
-    ! Kokkos::Impl::SpaceAccessibility< Kokkos::Cuda, Kokkos::HostSpace >::accessible, "" );
-
-  static_assert(
-    Kokkos::Impl::SpaceAccessibility< Kokkos::Cuda, Kokkos::CudaSpace >::accessible, "" );
-
-  static_assert(
-    Kokkos::Impl::SpaceAccessibility< Kokkos::Cuda, Kokkos::CudaUVMSpace >::accessible, "" );
-
-  static_assert(
-    Kokkos::Impl::SpaceAccessibility< Kokkos::Cuda, Kokkos::CudaHostPinnedSpace >::accessible, "" );
-
-  static_assert(
-    ! Kokkos::Impl::SpaceAccessibility< Kokkos::HostSpace, Kokkos::CudaSpace >::accessible, "" );
-
-  static_assert(
-    Kokkos::Impl::SpaceAccessibility< Kokkos::HostSpace, Kokkos::CudaUVMSpace >::accessible, "" );
-
-  static_assert(
-    Kokkos::Impl::SpaceAccessibility< Kokkos::HostSpace, Kokkos::CudaHostPinnedSpace >::accessible, "" );
-
-  static_assert(
-    std::is_same< Kokkos::Impl::HostMirror< Kokkos::CudaSpace >::Space
-                , Kokkos::HostSpace >::value, "" );
-
-  static_assert(
-    std::is_same< Kokkos::Impl::HostMirror< Kokkos::CudaUVMSpace >::Space
-                , Kokkos::Device< Kokkos::HostSpace::execution_space
-                                , Kokkos::CudaUVMSpace > >::value, "" );
-
-  static_assert(
-    std::is_same< Kokkos::Impl::HostMirror< Kokkos::CudaHostPinnedSpace >::Space
-                , Kokkos::CudaHostPinnedSpace >::value, "" );
-
-  static_assert(
-    std::is_same< Kokkos::Device< Kokkos::HostSpace::execution_space
-                                , Kokkos::CudaUVMSpace >
-                , Kokkos::Device< Kokkos::HostSpace::execution_space
-                                , Kokkos::CudaUVMSpace > >::value, "" );
-
-  static_assert(
-    Kokkos::Impl::SpaceAccessibility
-      < Kokkos::Impl::HostMirror< Kokkos::Cuda >::Space
-      , Kokkos::HostSpace
-      >::accessible, "" );
-
-  static_assert(
-    Kokkos::Impl::SpaceAccessibility
-      < Kokkos::Impl::HostMirror< Kokkos::CudaSpace >::Space
-      , Kokkos::HostSpace
-      >::accessible, "" );
-
-  static_assert(
-    Kokkos::Impl::SpaceAccessibility
-      < Kokkos::Impl::HostMirror< Kokkos::CudaUVMSpace >::Space
-      , Kokkos::HostSpace
-      >::accessible, "" );
-
-  static_assert(
-    Kokkos::Impl::SpaceAccessibility
-      < Kokkos::Impl::HostMirror< Kokkos::CudaHostPinnedSpace >::Space
-      , Kokkos::HostSpace
-      >::accessible, "" );
-}
-
-TEST_F( cuda, uvm )
-{
-  if ( Kokkos::CudaUVMSpace::available() ) {
-    int * uvm_ptr = (int*) Kokkos::kokkos_malloc< Kokkos::CudaUVMSpace >( "uvm_ptr", sizeof( int ) );
+TEST(cuda, uvm) {
+  if (Kokkos::CudaUVMSpace::available()) {
+    int *uvm_ptr = (int *)Kokkos::kokkos_malloc<Kokkos::CudaUVMSpace>(
+        "uvm_ptr", sizeof(int));
 
     *uvm_ptr = 42;
 
     Kokkos::Cuda().fence();
-    test_cuda_spaces_int_value<<< 1, 1 >>>( uvm_ptr );
+    test_cuda_spaces_int_value<<<1, 1>>>(uvm_ptr);
     Kokkos::Cuda().fence();
 
-    EXPECT_EQ( *uvm_ptr, int( 2 * 42 ) );
+    EXPECT_EQ(*uvm_ptr, int(2 * 42));
 
-    Kokkos::kokkos_free< Kokkos::CudaUVMSpace >( uvm_ptr );
+    Kokkos::kokkos_free<Kokkos::CudaUVMSpace>(uvm_ptr);
   }
 }
 
 /* Removing UVM Allocs Test due to added time to complete overall unit test
- * The issue verified with this unit test appears to no longer be an 
+ * The issue verified with this unit test appears to no longer be an
  * problem.  Refer to github issue 1880 for more details
  *
-TEST_F( cuda, uvm_num_allocs )
+TEST( cuda, uvm_num_allocs )
 {
   // The max number of UVM allocations allowed is 65536.
   #define MAX_NUM_ALLOCS 65536
@@ -251,21 +303,22 @@ TEST_F( cuda, uvm_num_allocs )
           // Kokkos will throw a runtime exception if an attempt is made to
           // allocate more than the maximum number of uvm allocations.
 
-          // In this test, the max num of allocs occurs when i = MAX_NUM_ALLOCS - 1
+          // In this test, the max num of allocs occurs when i = MAX_NUM_ALLOCS
+- 1
           // since the 'outer' view counts as one UVM allocation, leaving
           // 65535 possible UVM allocations, that is 'i in [0, 65535)'.
 
           // The test will catch the exception thrown in this case and continue.
 
           if ( i == ( MAX_NUM_ALLOCS - 1 ) ) {
-            EXPECT_ANY_THROW( { view_allocs_test( i ) = view_type( "inner_view", 1 ); } );
+            EXPECT_ANY_THROW( { view_allocs_test( i ) = view_type( "inner_view",
+1 ); } );
           }
           else {
             if ( i < MAX_NUM_ALLOCS - 1000 ) {
-              EXPECT_NO_THROW( { view_allocs_test( i ) = view_type( "inner_view", 1 ); } );
-            } else { // This might or might not throw depending on compilation options.
-              try {
-                view_allocs_test( i ) = view_type( "inner_view", 1 );
+              EXPECT_NO_THROW( { view_allocs_test( i ) = view_type(
+"inner_view", 1 ); } ); } else { // This might or might not throw depending on
+compilation options. try { view_allocs_test( i ) = view_type( "inner_view", 1 );
               }
               catch ( ... ) {}
             }
@@ -294,11 +347,11 @@ TEST_F( cuda, uvm_num_allocs )
 }
 */
 
-template< class MemSpace, class ExecSpace >
+template <class MemSpace, class ExecSpace>
 struct TestViewCudaAccessible {
   enum { N = 1000 };
 
-  using V = Kokkos::View< double*, MemSpace >;
+  using V = Kokkos::View<double *, MemSpace>;
 
   V m_base;
 
@@ -306,46 +359,48 @@ struct TestViewCudaAccessible {
   struct TagTest {};
 
   KOKKOS_INLINE_FUNCTION
-  void operator()( const TagInit &, const int i ) const { m_base[i] = i + 1; }
+  void operator()(const TagInit &, const int i) const { m_base[i] = i + 1; }
 
   KOKKOS_INLINE_FUNCTION
-  void operator()( const TagTest &, const int i, long & error_count ) const
-  { if ( m_base[i] != i + 1 ) ++error_count; }
+  void operator()(const TagTest &, const int i, long &error_count) const {
+    if (m_base[i] != i + 1) ++error_count;
+  }
 
-  TestViewCudaAccessible()
-    : m_base( "base", N )
-    {}
+  TestViewCudaAccessible() : m_base("base", N) {}
 
-  static void run()
-  {
+  static void run() {
     TestViewCudaAccessible self;
-    Kokkos::parallel_for( Kokkos::RangePolicy< typename MemSpace::execution_space, TagInit >( 0, N ), self );
+    Kokkos::parallel_for(
+        Kokkos::RangePolicy<typename MemSpace::execution_space, TagInit>(0, N),
+        self);
     typename MemSpace::execution_space().fence();
 
     // Next access is a different execution space, must complete prior kernel.
     long error_count = -1;
-    Kokkos::parallel_reduce( Kokkos::RangePolicy< ExecSpace, TagTest >( 0, N ), self, error_count );
-    EXPECT_EQ( error_count, 0 );
+    Kokkos::parallel_reduce(Kokkos::RangePolicy<ExecSpace, TagTest>(0, N), self,
+                            error_count);
+    EXPECT_EQ(error_count, 0);
   }
 };
 
-TEST_F( cuda, impl_view_accessible )
-{
-  TestViewCudaAccessible< Kokkos::CudaSpace, Kokkos::Cuda >::run();
+TEST(cuda, impl_view_accessible) {
+  TestViewCudaAccessible<Kokkos::CudaSpace, Kokkos::Cuda>::run();
 
-  TestViewCudaAccessible< Kokkos::CudaUVMSpace, Kokkos::Cuda >::run();
-  TestViewCudaAccessible< Kokkos::CudaUVMSpace, Kokkos::HostSpace::execution_space >::run();
+  TestViewCudaAccessible<Kokkos::CudaUVMSpace, Kokkos::Cuda>::run();
+  TestViewCudaAccessible<Kokkos::CudaUVMSpace,
+                         Kokkos::HostSpace::execution_space>::run();
 
-  TestViewCudaAccessible< Kokkos::CudaHostPinnedSpace, Kokkos::Cuda >::run();
-  TestViewCudaAccessible< Kokkos::CudaHostPinnedSpace, Kokkos::HostSpace::execution_space >::run();
+  TestViewCudaAccessible<Kokkos::CudaHostPinnedSpace, Kokkos::Cuda>::run();
+  TestViewCudaAccessible<Kokkos::CudaHostPinnedSpace,
+                         Kokkos::HostSpace::execution_space>::run();
 }
 
-template< class MemSpace >
+template <class MemSpace>
 struct TestViewCudaTexture {
   enum { N = 1000 };
 
-  using V = Kokkos::View< double*, MemSpace >;
-  using T = Kokkos::View< const double*, MemSpace, Kokkos::MemoryRandomAccess >;
+  using V = Kokkos::View<double *, MemSpace>;
+  using T = Kokkos::View<const double *, MemSpace, Kokkos::MemoryRandomAccess>;
 
   V m_base;
   T m_tex;
@@ -354,38 +409,38 @@ struct TestViewCudaTexture {
   struct TagTest {};
 
   KOKKOS_INLINE_FUNCTION
-  void operator()( const TagInit &, const int i ) const { m_base[i] = i + 1; }
+  void operator()(const TagInit &, const int i) const { m_base[i] = i + 1; }
 
   KOKKOS_INLINE_FUNCTION
-  void operator()( const TagTest &, const int i, long & error_count ) const
-  { if ( m_tex[i] != i + 1 ) ++error_count; }
+  void operator()(const TagTest &, const int i, long &error_count) const {
+    if (m_tex[i] != i + 1) ++error_count;
+  }
 
-  TestViewCudaTexture()
-    : m_base( "base", N )
-    , m_tex( m_base )
-    {}
+  TestViewCudaTexture() : m_base("base", N), m_tex(m_base) {}
 
-  static void run()
-  {
-    EXPECT_TRUE( ( std::is_same< typename V::reference_type, double & >::value ) );
-    EXPECT_TRUE( ( std::is_same< typename T::reference_type, const double >::value ) );
+  static void run() {
+    EXPECT_TRUE((std::is_same<typename V::reference_type, double &>::value));
+    EXPECT_TRUE(
+        (std::is_same<typename T::reference_type, const double>::value));
 
-    EXPECT_TRUE(  V::reference_type_is_lvalue_reference ); // An ordinary view.
-    EXPECT_FALSE( T::reference_type_is_lvalue_reference ); // Texture fetch returns by value.
+    EXPECT_TRUE(V::reference_type_is_lvalue_reference);   // An ordinary view.
+    EXPECT_FALSE(T::reference_type_is_lvalue_reference);  // Texture fetch
+                                                          // returns by value.
 
     TestViewCudaTexture self;
-    Kokkos::parallel_for( Kokkos::RangePolicy< Kokkos::Cuda, TagInit >( 0, N ), self );
+    Kokkos::parallel_for(Kokkos::RangePolicy<Kokkos::Cuda, TagInit>(0, N),
+                         self);
 
     long error_count = -1;
-    Kokkos::parallel_reduce( Kokkos::RangePolicy< Kokkos::Cuda, TagTest >( 0, N ), self, error_count );
-    EXPECT_EQ( error_count, 0 );
+    Kokkos::parallel_reduce(Kokkos::RangePolicy<Kokkos::Cuda, TagTest>(0, N),
+                            self, error_count);
+    EXPECT_EQ(error_count, 0);
   }
 };
 
-TEST_F( cuda, impl_view_texture )
-{
-  TestViewCudaTexture< Kokkos::CudaSpace >::run();
-  TestViewCudaTexture< Kokkos::CudaUVMSpace >::run();
+TEST(cuda, impl_view_texture) {
+  TestViewCudaTexture<Kokkos::CudaSpace>::run();
+  TestViewCudaTexture<Kokkos::CudaUVMSpace>::run();
 }
 
-} // namespace Test
+}  // namespace Test
diff --git a/lib/kokkos/core/unit_test/cuda/TestCuda_SubView_a.cpp b/lib/kokkos/core/unit_test/cuda/TestCuda_SubView_a.cpp
index 81f83c105c..6ac2fa8f08 100644
--- a/lib/kokkos/core/unit_test/cuda/TestCuda_SubView_a.cpp
+++ b/lib/kokkos/core/unit_test/cuda/TestCuda_SubView_a.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -46,66 +47,56 @@
 
 namespace Test {
 
-TEST_F( TEST_CATEGORY, view_subview_auto_1d_left )
-{
-  TestViewSubview::test_auto_1d< Kokkos::LayoutLeft, TEST_EXECSPACE >();
+TEST(TEST_CATEGORY, view_subview_auto_1d_left) {
+  TestViewSubview::test_auto_1d<Kokkos::LayoutLeft, TEST_EXECSPACE>();
 }
 
-TEST_F( TEST_CATEGORY, view_subview_auto_1d_right )
-{
-  TestViewSubview::test_auto_1d< Kokkos::LayoutRight, TEST_EXECSPACE >();
+TEST(TEST_CATEGORY, view_subview_auto_1d_right) {
+  TestViewSubview::test_auto_1d<Kokkos::LayoutRight, TEST_EXECSPACE>();
 }
 
-TEST_F( TEST_CATEGORY, view_subview_auto_1d_stride )
-{
-  TestViewSubview::test_auto_1d< Kokkos::LayoutStride, TEST_EXECSPACE >();
+TEST(TEST_CATEGORY, view_subview_auto_1d_stride) {
+  TestViewSubview::test_auto_1d<Kokkos::LayoutStride, TEST_EXECSPACE>();
 }
 
-TEST_F( TEST_CATEGORY, view_subview_assign_strided )
-{
-  TestViewSubview::test_1d_strided_assignment< TEST_EXECSPACE >();
+TEST(TEST_CATEGORY, view_subview_assign_strided) {
+  TestViewSubview::test_1d_strided_assignment<TEST_EXECSPACE>();
 }
 
-TEST_F( TEST_CATEGORY, view_subview_left_0 )
-{
-  TestViewSubview::test_left_0< TEST_EXECSPACE >();
+TEST(TEST_CATEGORY, view_subview_left_0) {
+  TestViewSubview::test_left_0<TEST_EXECSPACE>();
 }
 
-TEST_F( TEST_CATEGORY, view_subview_left_1 )
-{
-  TestViewSubview::test_left_1< TEST_EXECSPACE >();
+TEST(TEST_CATEGORY, view_subview_left_1) {
+  TestViewSubview::test_left_1<TEST_EXECSPACE>();
 }
 
-TEST_F( TEST_CATEGORY, view_subview_left_2 )
-{
-  TestViewSubview::test_left_2< TEST_EXECSPACE >();
+TEST(TEST_CATEGORY, view_subview_left_2) {
+  TestViewSubview::test_left_2<TEST_EXECSPACE>();
 }
 
-TEST_F( TEST_CATEGORY, view_subview_left_3 )
-{
-  TestViewSubview::test_left_3< TEST_EXECSPACE >();
+TEST(TEST_CATEGORY, view_subview_left_3) {
+  TestViewSubview::test_left_3<TEST_EXECSPACE>();
 }
 
-TEST_F( TEST_CATEGORY, view_subview_right_0 )
-{
-  TestViewSubview::test_right_0< TEST_EXECSPACE >();
+TEST(TEST_CATEGORY, view_subview_right_0) {
+  TestViewSubview::test_right_0<TEST_EXECSPACE>();
 }
 
-TEST_F( TEST_CATEGORY, view_subview_right_1 )
-{
-  TestViewSubview::test_right_1< TEST_EXECSPACE >();
+TEST(TEST_CATEGORY, view_subview_right_1) {
+  TestViewSubview::test_right_1<TEST_EXECSPACE>();
 }
 
-TEST_F( TEST_CATEGORY, view_subview_right_3 )
-{
-  TestViewSubview::test_right_3< TEST_EXECSPACE >();
+TEST(TEST_CATEGORY, view_subview_right_3) {
+  TestViewSubview::test_right_3<TEST_EXECSPACE>();
 }
 
-TEST_F(TEST_CATEGORY, view_static_tests)
-{
-  TestViewSubview::TestSubviewStaticSizes<TEST_EXECSPACE, Kokkos::LayoutLeft>()();
-  TestViewSubview::TestSubviewStaticSizes<TEST_EXECSPACE, Kokkos::LayoutRight>()();
+TEST(TEST_CATEGORY, view_static_tests) {
+  TestViewSubview::TestSubviewStaticSizes<TEST_EXECSPACE,
+                                          Kokkos::LayoutLeft>()();
+  TestViewSubview::TestSubviewStaticSizes<TEST_EXECSPACE,
+                                          Kokkos::LayoutRight>()();
   TestViewSubview::TestExtentsStaticTests<TEST_EXECSPACE>();
 }
 
-} // namespace Test
+}  // namespace Test
diff --git a/lib/kokkos/core/unit_test/cuda/TestCuda_SubView_b.cpp b/lib/kokkos/core/unit_test/cuda/TestCuda_SubView_b.cpp
index a2018fc5c8..c53904559c 100644
--- a/lib/kokkos/core/unit_test/cuda/TestCuda_SubView_b.cpp
+++ b/lib/kokkos/core/unit_test/cuda/TestCuda_SubView_b.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -46,18 +47,20 @@
 
 namespace Test {
 
-TEST_F( TEST_CATEGORY, view_subview_layoutleft_to_layoutleft )
-{
-  TestViewSubview::test_layoutleft_to_layoutleft< TEST_EXECSPACE >();
-  TestViewSubview::test_layoutleft_to_layoutleft< TEST_EXECSPACE, Kokkos::MemoryTraits<Kokkos::Atomic> >();
-  TestViewSubview::test_layoutleft_to_layoutleft< TEST_EXECSPACE, Kokkos::MemoryTraits<Kokkos::RandomAccess> >();
+TEST(TEST_CATEGORY, view_subview_layoutleft_to_layoutleft) {
+  TestViewSubview::test_layoutleft_to_layoutleft<TEST_EXECSPACE>();
+  TestViewSubview::test_layoutleft_to_layoutleft<
+      TEST_EXECSPACE, Kokkos::MemoryTraits<Kokkos::Atomic> >();
+  TestViewSubview::test_layoutleft_to_layoutleft<
+      TEST_EXECSPACE, Kokkos::MemoryTraits<Kokkos::RandomAccess> >();
 }
 
-TEST_F( TEST_CATEGORY, view_subview_layoutright_to_layoutright )
-{
-  TestViewSubview::test_layoutright_to_layoutright< TEST_EXECSPACE >();
-  TestViewSubview::test_layoutright_to_layoutright< TEST_EXECSPACE, Kokkos::MemoryTraits<Kokkos::Atomic> >();
-  TestViewSubview::test_layoutright_to_layoutright< TEST_EXECSPACE, Kokkos::MemoryTraits<Kokkos::RandomAccess> >();
+TEST(TEST_CATEGORY, view_subview_layoutright_to_layoutright) {
+  TestViewSubview::test_layoutright_to_layoutright<TEST_EXECSPACE>();
+  TestViewSubview::test_layoutright_to_layoutright<
+      TEST_EXECSPACE, Kokkos::MemoryTraits<Kokkos::Atomic> >();
+  TestViewSubview::test_layoutright_to_layoutright<
+      TEST_EXECSPACE, Kokkos::MemoryTraits<Kokkos::RandomAccess> >();
 }
 
-} // namespace Test
+}  // namespace Test
diff --git a/lib/kokkos/core/unit_test/cuda/TestCuda_SubView_c01.cpp b/lib/kokkos/core/unit_test/cuda/TestCuda_SubView_c01.cpp
index 946de0e111..2a1286281a 100644
--- a/lib/kokkos/core/unit_test/cuda/TestCuda_SubView_c01.cpp
+++ b/lib/kokkos/core/unit_test/cuda/TestCuda_SubView_c01.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -46,9 +47,8 @@
 
 namespace Test {
 
-TEST_F( TEST_CATEGORY, view_subview_1d_assign )
-{
-  TestViewSubview::test_1d_assign< TEST_EXECSPACE >();
+TEST(TEST_CATEGORY, view_subview_1d_assign) {
+  TestViewSubview::test_1d_assign<TEST_EXECSPACE>();
 }
 
-} // namespace Test
+}  // namespace Test
diff --git a/lib/kokkos/core/unit_test/cuda/TestCuda_SubView_c02.cpp b/lib/kokkos/core/unit_test/cuda/TestCuda_SubView_c02.cpp
index 7a1c895583..d34a3ab59e 100644
--- a/lib/kokkos/core/unit_test/cuda/TestCuda_SubView_c02.cpp
+++ b/lib/kokkos/core/unit_test/cuda/TestCuda_SubView_c02.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -46,9 +47,9 @@
 
 namespace Test {
 
-TEST_F( TEST_CATEGORY, view_subview_1d_assign_atomic )
-{
-  TestViewSubview::test_1d_assign< TEST_EXECSPACE, Kokkos::MemoryTraits<Kokkos::Atomic> >();
+TEST(TEST_CATEGORY, view_subview_1d_assign_atomic) {
+  TestViewSubview::test_1d_assign<TEST_EXECSPACE,
+                                  Kokkos::MemoryTraits<Kokkos::Atomic> >();
 }
 
-} // namespace Test
+}  // namespace Test
diff --git a/lib/kokkos/core/unit_test/cuda/TestCuda_SubView_c03.cpp b/lib/kokkos/core/unit_test/cuda/TestCuda_SubView_c03.cpp
index 8c27d66a83..79235f96a4 100644
--- a/lib/kokkos/core/unit_test/cuda/TestCuda_SubView_c03.cpp
+++ b/lib/kokkos/core/unit_test/cuda/TestCuda_SubView_c03.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -46,9 +47,9 @@
 
 namespace Test {
 
-TEST_F( TEST_CATEGORY, view_subview_1d_assign_randomaccess )
-{
-  TestViewSubview::test_1d_assign< TEST_EXECSPACE, Kokkos::MemoryTraits<Kokkos::RandomAccess> >();
+TEST(TEST_CATEGORY, view_subview_1d_assign_randomaccess) {
+  TestViewSubview::test_1d_assign<
+      TEST_EXECSPACE, Kokkos::MemoryTraits<Kokkos::RandomAccess> >();
 }
 
-} // namespace Test
+}  // namespace Test
diff --git a/lib/kokkos/core/unit_test/cuda/TestCuda_SubView_c04.cpp b/lib/kokkos/core/unit_test/cuda/TestCuda_SubView_c04.cpp
index 704bab5a0d..d0f5a7bc01 100644
--- a/lib/kokkos/core/unit_test/cuda/TestCuda_SubView_c04.cpp
+++ b/lib/kokkos/core/unit_test/cuda/TestCuda_SubView_c04.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -46,9 +47,8 @@
 
 namespace Test {
 
-TEST_F( TEST_CATEGORY, view_subview_2d_from_3d )
-{
-  TestViewSubview::test_2d_subview_3d< TEST_EXECSPACE >();
+TEST(TEST_CATEGORY, view_subview_2d_from_3d) {
+  TestViewSubview::test_2d_subview_3d<TEST_EXECSPACE>();
 }
 
-} // namespace Test
+}  // namespace Test
diff --git a/lib/kokkos/core/unit_test/cuda/TestCuda_SubView_c05.cpp b/lib/kokkos/core/unit_test/cuda/TestCuda_SubView_c05.cpp
index 7510ba2afc..2ae07aa178 100644
--- a/lib/kokkos/core/unit_test/cuda/TestCuda_SubView_c05.cpp
+++ b/lib/kokkos/core/unit_test/cuda/TestCuda_SubView_c05.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -46,9 +47,9 @@
 
 namespace Test {
 
-TEST_F( TEST_CATEGORY, view_subview_2d_from_3d_atomic )
-{
-  TestViewSubview::test_2d_subview_3d< TEST_EXECSPACE, Kokkos::MemoryTraits<Kokkos::Atomic> >();
+TEST(TEST_CATEGORY, view_subview_2d_from_3d_atomic) {
+  TestViewSubview::test_2d_subview_3d<TEST_EXECSPACE,
+                                      Kokkos::MemoryTraits<Kokkos::Atomic> >();
 }
 
-} // namespace Test
+}  // namespace Test
diff --git a/lib/kokkos/core/unit_test/cuda/TestCuda_SubView_c06.cpp b/lib/kokkos/core/unit_test/cuda/TestCuda_SubView_c06.cpp
index 0b580f7dcd..973ecb57ec 100644
--- a/lib/kokkos/core/unit_test/cuda/TestCuda_SubView_c06.cpp
+++ b/lib/kokkos/core/unit_test/cuda/TestCuda_SubView_c06.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -46,9 +47,9 @@
 
 namespace Test {
 
-TEST_F( TEST_CATEGORY, view_subview_2d_from_3d_randomaccess )
-{
-  TestViewSubview::test_2d_subview_3d< TEST_EXECSPACE, Kokkos::MemoryTraits<Kokkos::RandomAccess> >();
+TEST(TEST_CATEGORY, view_subview_2d_from_3d_randomaccess) {
+  TestViewSubview::test_2d_subview_3d<
+      TEST_EXECSPACE, Kokkos::MemoryTraits<Kokkos::RandomAccess> >();
 }
 
-} // namespace Test
+}  // namespace Test
diff --git a/lib/kokkos/core/unit_test/cuda/TestCuda_SubView_c07.cpp b/lib/kokkos/core/unit_test/cuda/TestCuda_SubView_c07.cpp
index 5d8484c352..268ffd9755 100644
--- a/lib/kokkos/core/unit_test/cuda/TestCuda_SubView_c07.cpp
+++ b/lib/kokkos/core/unit_test/cuda/TestCuda_SubView_c07.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -46,9 +47,8 @@
 
 namespace Test {
 
-TEST_F( TEST_CATEGORY, view_subview_3d_from_5d_left )
-{
-  TestViewSubview::test_3d_subview_5d_left< TEST_EXECSPACE >();
+TEST(TEST_CATEGORY, view_subview_3d_from_5d_left) {
+  TestViewSubview::test_3d_subview_5d_left<TEST_EXECSPACE>();
 }
 
-} // namespace Test
+}  // namespace Test
diff --git a/lib/kokkos/core/unit_test/cuda/TestCuda_SubView_c08.cpp b/lib/kokkos/core/unit_test/cuda/TestCuda_SubView_c08.cpp
index e896470e85..37a5cc0af6 100644
--- a/lib/kokkos/core/unit_test/cuda/TestCuda_SubView_c08.cpp
+++ b/lib/kokkos/core/unit_test/cuda/TestCuda_SubView_c08.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -46,9 +47,9 @@
 
 namespace Test {
 
-TEST_F( TEST_CATEGORY, view_subview_3d_from_5d_left_atomic )
-{
-  TestViewSubview::test_3d_subview_5d_left< TEST_EXECSPACE, Kokkos::MemoryTraits<Kokkos::Atomic> >();
+TEST(TEST_CATEGORY, view_subview_3d_from_5d_left_atomic) {
+  TestViewSubview::test_3d_subview_5d_left<
+      TEST_EXECSPACE, Kokkos::MemoryTraits<Kokkos::Atomic> >();
 }
 
-} // namespace Test
+}  // namespace Test
diff --git a/lib/kokkos/core/unit_test/cuda/TestCuda_SubView_c09.cpp b/lib/kokkos/core/unit_test/cuda/TestCuda_SubView_c09.cpp
index 61c8e0ff73..7a60168b97 100644
--- a/lib/kokkos/core/unit_test/cuda/TestCuda_SubView_c09.cpp
+++ b/lib/kokkos/core/unit_test/cuda/TestCuda_SubView_c09.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -46,9 +47,9 @@
 
 namespace Test {
 
-TEST_F( TEST_CATEGORY, view_subview_3d_from_5d_left_randomaccess )
-{
-  TestViewSubview::test_3d_subview_5d_left< TEST_EXECSPACE, Kokkos::MemoryTraits<Kokkos::RandomAccess> >();
+TEST(TEST_CATEGORY, view_subview_3d_from_5d_left_randomaccess) {
+  TestViewSubview::test_3d_subview_5d_left<
+      TEST_EXECSPACE, Kokkos::MemoryTraits<Kokkos::RandomAccess> >();
 }
 
-} // namespace Test
+}  // namespace Test
diff --git a/lib/kokkos/core/unit_test/cuda/TestCuda_SubView_c10.cpp b/lib/kokkos/core/unit_test/cuda/TestCuda_SubView_c10.cpp
index 9ce886295f..705899567d 100644
--- a/lib/kokkos/core/unit_test/cuda/TestCuda_SubView_c10.cpp
+++ b/lib/kokkos/core/unit_test/cuda/TestCuda_SubView_c10.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -46,9 +47,8 @@
 
 namespace Test {
 
-TEST_F( TEST_CATEGORY, view_subview_3d_from_5d_right )
-{
-  TestViewSubview::test_3d_subview_5d_right< TEST_EXECSPACE >();
+TEST(TEST_CATEGORY, view_subview_3d_from_5d_right) {
+  TestViewSubview::test_3d_subview_5d_right<TEST_EXECSPACE>();
 }
 
-} // namespace Test
+}  // namespace Test
diff --git a/lib/kokkos/core/unit_test/cuda/TestCuda_SubView_c11.cpp b/lib/kokkos/core/unit_test/cuda/TestCuda_SubView_c11.cpp
index 8b49f36946..2a2c4ceb08 100644
--- a/lib/kokkos/core/unit_test/cuda/TestCuda_SubView_c11.cpp
+++ b/lib/kokkos/core/unit_test/cuda/TestCuda_SubView_c11.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -46,9 +47,9 @@
 
 namespace Test {
 
-TEST_F( TEST_CATEGORY, view_subview_3d_from_5d_right_atomic )
-{
-  TestViewSubview::test_3d_subview_5d_right< TEST_EXECSPACE, Kokkos::MemoryTraits<Kokkos::Atomic> >();
+TEST(TEST_CATEGORY, view_subview_3d_from_5d_right_atomic) {
+  TestViewSubview::test_3d_subview_5d_right<
+      TEST_EXECSPACE, Kokkos::MemoryTraits<Kokkos::Atomic> >();
 }
 
-} // namespace Test
+}  // namespace Test
diff --git a/lib/kokkos/core/unit_test/cuda/TestCuda_SubView_c12.cpp b/lib/kokkos/core/unit_test/cuda/TestCuda_SubView_c12.cpp
index 8132cb3469..747df8836e 100644
--- a/lib/kokkos/core/unit_test/cuda/TestCuda_SubView_c12.cpp
+++ b/lib/kokkos/core/unit_test/cuda/TestCuda_SubView_c12.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -46,9 +47,9 @@
 
 namespace Test {
 
-TEST_F( TEST_CATEGORY, view_subview_3d_from_5d_right_randomaccess )
-{
-  TestViewSubview::test_3d_subview_5d_right< TEST_EXECSPACE, Kokkos::MemoryTraits<Kokkos::RandomAccess> >();
+TEST(TEST_CATEGORY, view_subview_3d_from_5d_right_randomaccess) {
+  TestViewSubview::test_3d_subview_5d_right<
+      TEST_EXECSPACE, Kokkos::MemoryTraits<Kokkos::RandomAccess> >();
 }
 
-} // namespace Test
+}  // namespace Test
diff --git a/lib/kokkos/core/unit_test/cuda/TestCuda_SubView_c13.cpp b/lib/kokkos/core/unit_test/cuda/TestCuda_SubView_c13.cpp
index f397eb6b7b..3de6595f3a 100644
--- a/lib/kokkos/core/unit_test/cuda/TestCuda_SubView_c13.cpp
+++ b/lib/kokkos/core/unit_test/cuda/TestCuda_SubView_c13.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -46,9 +47,8 @@
 
 namespace Test {
 
-TEST_F( TEST_CATEGORY, view_test_unmanaged_subview_reset )
-{
-  TestViewSubview::test_unmanaged_subview_reset< TEST_EXECSPACE >();
+TEST(TEST_CATEGORY, view_test_unmanaged_subview_reset) {
+  TestViewSubview::test_unmanaged_subview_reset<TEST_EXECSPACE>();
 }
 
-} // namespace Test
+}  // namespace Test
diff --git a/lib/kokkos/core/unit_test/cuda/TestCuda_Task.cpp b/lib/kokkos/core/unit_test/cuda/TestCuda_Task.cpp
index 3d93266981..e2591c9b12 100644
--- a/lib/kokkos/core/unit_test/cuda/TestCuda_Task.cpp
+++ b/lib/kokkos/core/unit_test/cuda/TestCuda_Task.cpp
@@ -3,10 +3,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -42,6 +43,5 @@
 //@HEADER
 */
 
-#include<cuda/TestCuda_Category.hpp>
-#include<TestTaskScheduler.hpp>
-
+#include <cuda/TestCuda_Category.hpp>
+#include <TestTaskScheduler.hpp>
diff --git a/lib/kokkos/core/unit_test/cuda/TestCuda_Team.cpp b/lib/kokkos/core/unit_test/cuda/TestCuda_Team.cpp
index 3740683450..93aae95bac 100644
--- a/lib/kokkos/core/unit_test/cuda/TestCuda_Team.cpp
+++ b/lib/kokkos/core/unit_test/cuda/TestCuda_Team.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -46,46 +47,60 @@
 
 namespace Test {
 
-TEST_F( TEST_CATEGORY, team_for )
-{
-  TestTeamPolicy< TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Static> >::test_for( 0 );
-  TestTeamPolicy< TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Dynamic> >::test_for( 0 );
+TEST(TEST_CATEGORY, team_for) {
+  TestTeamPolicy<TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Static> >::test_for(
+      0);
+  TestTeamPolicy<TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Dynamic> >::test_for(
+      0);
 
-  TestTeamPolicy< TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Static> >::test_for( 2 );
-  TestTeamPolicy< TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Dynamic> >::test_for( 2 );
+  TestTeamPolicy<TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Static> >::test_for(
+      2);
+  TestTeamPolicy<TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Dynamic> >::test_for(
+      2);
 
-  TestTeamPolicy< TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Static> >::test_for( 1000 );
-  TestTeamPolicy< TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Dynamic> >::test_for( 1000 );
+  TestTeamPolicy<TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Static> >::test_for(
+      1000);
+  TestTeamPolicy<TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Dynamic> >::test_for(
+      1000);
 }
 
-
-TEST_F( TEST_CATEGORY, team_reduce )
-{
-  TestTeamPolicy< TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Static> >::test_reduce( 0 );
-  TestTeamPolicy< TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Dynamic> >::test_reduce( 0 );
-  TestTeamPolicy< TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Static> >::test_reduce( 2 );
-  TestTeamPolicy< TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Dynamic> >::test_reduce( 2 );
-  TestTeamPolicy< TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Static> >::test_reduce( 1000 );
-  TestTeamPolicy< TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Dynamic> >::test_reduce( 1000 );
+TEST(TEST_CATEGORY, team_reduce) {
+  TestTeamPolicy<TEST_EXECSPACE,
+                 Kokkos::Schedule<Kokkos::Static> >::test_reduce(0);
+  TestTeamPolicy<TEST_EXECSPACE,
+                 Kokkos::Schedule<Kokkos::Dynamic> >::test_reduce(0);
+  TestTeamPolicy<TEST_EXECSPACE,
+                 Kokkos::Schedule<Kokkos::Static> >::test_reduce(2);
+  TestTeamPolicy<TEST_EXECSPACE,
+                 Kokkos::Schedule<Kokkos::Dynamic> >::test_reduce(2);
+  TestTeamPolicy<TEST_EXECSPACE,
+                 Kokkos::Schedule<Kokkos::Static> >::test_reduce(1000);
+  TestTeamPolicy<TEST_EXECSPACE,
+                 Kokkos::Schedule<Kokkos::Dynamic> >::test_reduce(1000);
 }
 
-TEST_F( TEST_CATEGORY, team_broadcast )
-{
-  TestTeamBroadcast< TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Static> >::test_teambroadcast( 0 );
-  TestTeamBroadcast< TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Dynamic> >::test_teambroadcast( 0 );
+TEST(TEST_CATEGORY, team_broadcast) {
+  TestTeamBroadcast<TEST_EXECSPACE,
+                    Kokkos::Schedule<Kokkos::Static> >::test_teambroadcast(0);
+  TestTeamBroadcast<TEST_EXECSPACE,
+                    Kokkos::Schedule<Kokkos::Dynamic> >::test_teambroadcast(0);
 
-  TestTeamBroadcast< TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Static> >::test_teambroadcast( 2 );
-  TestTeamBroadcast< TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Dynamic> >::test_teambroadcast( 2 );
+  TestTeamBroadcast<TEST_EXECSPACE,
+                    Kokkos::Schedule<Kokkos::Static> >::test_teambroadcast(2);
+  TestTeamBroadcast<TEST_EXECSPACE,
+                    Kokkos::Schedule<Kokkos::Dynamic> >::test_teambroadcast(2);
 
-  TestTeamBroadcast< TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Static> >::test_teambroadcast( 16 );
-  TestTeamBroadcast< TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Dynamic> >::test_teambroadcast( 16 );
+  TestTeamBroadcast<TEST_EXECSPACE,
+                    Kokkos::Schedule<Kokkos::Static> >::test_teambroadcast(16);
+  TestTeamBroadcast<TEST_EXECSPACE,
+                    Kokkos::Schedule<Kokkos::Dynamic> >::test_teambroadcast(16);
 
-  TestTeamBroadcast< TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Static> >::test_teambroadcast( 1000 );
-  TestTeamBroadcast< TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Dynamic> >::test_teambroadcast( 1000 );
+  TestTeamBroadcast<TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Static> >::
+      test_teambroadcast(1000);
+  TestTeamBroadcast<TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Dynamic> >::
+      test_teambroadcast(1000);
 }
 
-}
+}  // namespace Test
 
 #include <TestTeamVector.hpp>
-
-
diff --git a/lib/kokkos/core/unit_test/cuda/TestCuda_TeamReductionScan.cpp b/lib/kokkos/core/unit_test/cuda/TestCuda_TeamReductionScan.cpp
index eef8977da0..4495108dc9 100644
--- a/lib/kokkos/core/unit_test/cuda/TestCuda_TeamReductionScan.cpp
+++ b/lib/kokkos/core/unit_test/cuda/TestCuda_TeamReductionScan.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -47,36 +48,36 @@
 namespace Test {
 
 #if !defined(KOKKOS_IMPL_CUDA_CLANG_WORKAROUND)
-TEST_F( TEST_CATEGORY, team_scan )
-{
-  TestScanTeam< TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Static> >( 0 );
-  TestScanTeam< TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Dynamic> >( 0 );
-  TestScanTeam< TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Static> >( 10 );
-  TestScanTeam< TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Dynamic> >( 10 );
-  TestScanTeam< TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Static> >( 10000 );
-  TestScanTeam< TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Dynamic> >( 10000 );
+TEST(TEST_CATEGORY, team_scan) {
+  TestScanTeam<TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Static> >(0);
+  TestScanTeam<TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Dynamic> >(0);
+  TestScanTeam<TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Static> >(10);
+  TestScanTeam<TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Dynamic> >(10);
+  TestScanTeam<TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Static> >(10000);
+  TestScanTeam<TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Dynamic> >(10000);
 }
 #endif
 
-TEST_F( TEST_CATEGORY, team_long_reduce )
-{
-  TestReduceTeam< long, TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Static> >( 0 );
-  TestReduceTeam< long, TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Dynamic> >( 0 );
-  TestReduceTeam< long, TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Static> >( 3 );
-  TestReduceTeam< long, TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Dynamic> >( 3 );
-  TestReduceTeam< long, TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Static> >( 100000 );
-  TestReduceTeam< long, TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Dynamic> >( 100000 );
+TEST(TEST_CATEGORY, team_long_reduce) {
+  TestReduceTeam<long, TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Static> >(0);
+  TestReduceTeam<long, TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Dynamic> >(0);
+  TestReduceTeam<long, TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Static> >(3);
+  TestReduceTeam<long, TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Dynamic> >(3);
+  TestReduceTeam<long, TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Static> >(
+      100000);
+  TestReduceTeam<long, TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Dynamic> >(
+      100000);
 }
 
-TEST_F( TEST_CATEGORY, team_double_reduce )
-{
-  TestReduceTeam< double, TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Static> >( 0 );
-  TestReduceTeam< double, TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Dynamic> >( 0 );
-  TestReduceTeam< double, TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Static> >( 3 );
-  TestReduceTeam< double, TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Dynamic> >( 3 );
-  TestReduceTeam< double, TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Static> >( 100000 );
-  TestReduceTeam< double, TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Dynamic> >( 100000 );
+TEST(TEST_CATEGORY, team_double_reduce) {
+  TestReduceTeam<double, TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Static> >(0);
+  TestReduceTeam<double, TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Dynamic> >(0);
+  TestReduceTeam<double, TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Static> >(3);
+  TestReduceTeam<double, TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Dynamic> >(3);
+  TestReduceTeam<double, TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Static> >(
+      100000);
+  TestReduceTeam<double, TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Dynamic> >(
+      100000);
 }
 
-} // namespace Test
-
+}  // namespace Test
diff --git a/lib/kokkos/core/unit_test/cuda/TestCuda_TeamScratch.cpp b/lib/kokkos/core/unit_test/cuda/TestCuda_TeamScratch.cpp
index dcb6896b8f..858bf599b5 100644
--- a/lib/kokkos/core/unit_test/cuda/TestCuda_TeamScratch.cpp
+++ b/lib/kokkos/core/unit_test/cuda/TestCuda_TeamScratch.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -46,42 +47,36 @@
 
 namespace Test {
 
-TEST_F( TEST_CATEGORY, team_shared_request )
-{
-  TestSharedTeam< TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Static> >();
-  TestSharedTeam< TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Dynamic> >();
+TEST(TEST_CATEGORY, team_shared_request) {
+  TestSharedTeam<TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Static> >();
+  TestSharedTeam<TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Dynamic> >();
 }
 
-TEST_F( TEST_CATEGORY, team_scratch_request )
-{
-  TestScratchTeam< TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Static> >();
-  TestScratchTeam< TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Dynamic> >();
+TEST(TEST_CATEGORY, team_scratch_request) {
+  TestScratchTeam<TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Static> >();
+  TestScratchTeam<TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Dynamic> >();
 }
 
-#if defined( KOKKOS_ENABLE_CXX11_DISPATCH_LAMBDA )
-#if !defined(KOKKOS_ENABLE_CUDA) || ( 8000 <= CUDA_VERSION )
-TEST_F( TEST_CATEGORY, team_lambda_shared_request )
-{
-  TestLambdaSharedTeam< Kokkos::HostSpace, TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Static> >();
-  TestLambdaSharedTeam< Kokkos::HostSpace, TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Dynamic> >();
+#if defined(KOKKOS_ENABLE_CXX11_DISPATCH_LAMBDA)
+#if !defined(KOKKOS_ENABLE_CUDA) || (8000 <= CUDA_VERSION)
+TEST(TEST_CATEGORY, team_lambda_shared_request) {
+  TestLambdaSharedTeam<Kokkos::HostSpace, TEST_EXECSPACE,
+                       Kokkos::Schedule<Kokkos::Static> >();
+  TestLambdaSharedTeam<Kokkos::HostSpace, TEST_EXECSPACE,
+                       Kokkos::Schedule<Kokkos::Dynamic> >();
 }
 
-TEST_F( TEST_CATEGORY, scratch_align) {
-  TestScratchAlignment< TEST_EXECSPACE >();
-}
+TEST(TEST_CATEGORY, scratch_align) { TestScratchAlignment<TEST_EXECSPACE>(); }
 #endif
 #endif
 
-TEST_F( TEST_CATEGORY, shmem_size )
-{
-  TestShmemSize< TEST_EXECSPACE >();
+TEST(TEST_CATEGORY, shmem_size) { TestShmemSize<TEST_EXECSPACE>(); }
+
+TEST(TEST_CATEGORY, multi_level_scratch) {
+  TestMultiLevelScratchTeam<TEST_EXECSPACE,
+                            Kokkos::Schedule<Kokkos::Static> >();
+  TestMultiLevelScratchTeam<TEST_EXECSPACE,
+                            Kokkos::Schedule<Kokkos::Dynamic> >();
 }
 
-TEST_F( TEST_CATEGORY, multi_level_scratch )
-{
-  TestMultiLevelScratchTeam< TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Static> >();
-  TestMultiLevelScratchTeam< TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Dynamic> >();
-}
-
-} // namespace Test
-
+}  // namespace Test
diff --git a/lib/kokkos/core/unit_test/cuda/TestCuda_TeamTeamSize.cpp b/lib/kokkos/core/unit_test/cuda/TestCuda_TeamTeamSize.cpp
index 7e61e0810b..1d60d27277 100644
--- a/lib/kokkos/core/unit_test/cuda/TestCuda_TeamTeamSize.cpp
+++ b/lib/kokkos/core/unit_test/cuda/TestCuda_TeamTeamSize.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
diff --git a/lib/kokkos/core/unit_test/cuda/TestCuda_TeamVectorRange.cpp b/lib/kokkos/core/unit_test/cuda/TestCuda_TeamVectorRange.cpp
index af6ef9cfd1..f0b7496ed0 100644
--- a/lib/kokkos/core/unit_test/cuda/TestCuda_TeamVectorRange.cpp
+++ b/lib/kokkos/core/unit_test/cuda/TestCuda_TeamVectorRange.cpp
@@ -3,10 +3,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -42,7 +43,5 @@
 //@HEADER
 */
 
-#include<cuda/TestCuda_Category.hpp>
-#include<TestTeamVectorRange.hpp>
-
-
+#include <cuda/TestCuda_Category.hpp>
+#include <TestTeamVectorRange.hpp>
diff --git a/lib/kokkos/core/unit_test/cuda/TestCuda_UniqueToken.cpp b/lib/kokkos/core/unit_test/cuda/TestCuda_UniqueToken.cpp
index a04ee57a96..186e9e155d 100644
--- a/lib/kokkos/core/unit_test/cuda/TestCuda_UniqueToken.cpp
+++ b/lib/kokkos/core/unit_test/cuda/TestCuda_UniqueToken.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -41,6 +42,5 @@
 //@HEADER
 */
 
-#include<cuda/TestCuda_Category.hpp>
-#include<TestUniqueToken.hpp>
-
+#include <cuda/TestCuda_Category.hpp>
+#include <TestUniqueToken.hpp>
diff --git a/lib/kokkos/core/unit_test/cuda/TestCuda_ViewAPI_a.cpp b/lib/kokkos/core/unit_test/cuda/TestCuda_ViewAPI_a.cpp
index 2fb4e9e781..ed9089f4c5 100644
--- a/lib/kokkos/core/unit_test/cuda/TestCuda_ViewAPI_a.cpp
+++ b/lib/kokkos/core/unit_test/cuda/TestCuda_ViewAPI_a.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
diff --git a/lib/kokkos/core/unit_test/cuda/TestCuda_ViewAPI_b.cpp b/lib/kokkos/core/unit_test/cuda/TestCuda_ViewAPI_b.cpp
index 080002dab0..1a90564628 100644
--- a/lib/kokkos/core/unit_test/cuda/TestCuda_ViewAPI_b.cpp
+++ b/lib/kokkos/core/unit_test/cuda/TestCuda_ViewAPI_b.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
diff --git a/lib/kokkos/core/unit_test/cuda/TestCuda_ViewAPI_c.cpp b/lib/kokkos/core/unit_test/cuda/TestCuda_ViewAPI_c.cpp
index 536b24fb33..0feca1b1ca 100644
--- a/lib/kokkos/core/unit_test/cuda/TestCuda_ViewAPI_c.cpp
+++ b/lib/kokkos/core/unit_test/cuda/TestCuda_ViewAPI_c.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
diff --git a/lib/kokkos/core/unit_test/cuda/TestCuda_ViewAPI_d.cpp b/lib/kokkos/core/unit_test/cuda/TestCuda_ViewAPI_d.cpp
index 5bcf5407d9..fd5ff11980 100644
--- a/lib/kokkos/core/unit_test/cuda/TestCuda_ViewAPI_d.cpp
+++ b/lib/kokkos/core/unit_test/cuda/TestCuda_ViewAPI_d.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
diff --git a/lib/kokkos/core/unit_test/cuda/TestCuda_ViewAPI_e.cpp b/lib/kokkos/core/unit_test/cuda/TestCuda_ViewAPI_e.cpp
index b2e00dba47..a15bdbd8d3 100644
--- a/lib/kokkos/core/unit_test/cuda/TestCuda_ViewAPI_e.cpp
+++ b/lib/kokkos/core/unit_test/cuda/TestCuda_ViewAPI_e.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
diff --git a/lib/kokkos/core/unit_test/cuda/TestCuda_ViewLayoutStrideAssignment.cpp b/lib/kokkos/core/unit_test/cuda/TestCuda_ViewLayoutStrideAssignment.cpp
index 2732cd4baa..9b14ed7e82 100644
--- a/lib/kokkos/core/unit_test/cuda/TestCuda_ViewLayoutStrideAssignment.cpp
+++ b/lib/kokkos/core/unit_test/cuda/TestCuda_ViewLayoutStrideAssignment.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -43,4 +44,3 @@
 
 #include <cuda/TestCuda_Category.hpp>
 #include <TestViewLayoutStrideAssignment.hpp>
-
diff --git a/lib/kokkos/core/unit_test/cuda/TestCuda_ViewMapping_a.cpp b/lib/kokkos/core/unit_test/cuda/TestCuda_ViewMapping_a.cpp
index e8e3d18fc0..5eaa95a59b 100644
--- a/lib/kokkos/core/unit_test/cuda/TestCuda_ViewMapping_a.cpp
+++ b/lib/kokkos/core/unit_test/cuda/TestCuda_ViewMapping_a.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -43,4 +44,3 @@
 
 #include <cuda/TestCuda_Category.hpp>
 #include <TestViewMapping_a.hpp>
-
diff --git a/lib/kokkos/core/unit_test/cuda/TestCuda_ViewMapping_b.cpp b/lib/kokkos/core/unit_test/cuda/TestCuda_ViewMapping_b.cpp
index 0a3b6c0beb..5cd8f6c395 100644
--- a/lib/kokkos/core/unit_test/cuda/TestCuda_ViewMapping_b.cpp
+++ b/lib/kokkos/core/unit_test/cuda/TestCuda_ViewMapping_b.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -43,4 +44,3 @@
 
 #include <cuda/TestCuda_Category.hpp>
 #include <TestViewMapping_b.hpp>
-
diff --git a/lib/kokkos/core/unit_test/cuda/TestCuda_ViewMapping_subview.cpp b/lib/kokkos/core/unit_test/cuda/TestCuda_ViewMapping_subview.cpp
index caddacb07b..2f8888a055 100644
--- a/lib/kokkos/core/unit_test/cuda/TestCuda_ViewMapping_subview.cpp
+++ b/lib/kokkos/core/unit_test/cuda/TestCuda_ViewMapping_subview.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -43,4 +44,3 @@
 
 #include <cuda/TestCuda_Category.hpp>
 #include <TestViewMapping_subview.hpp>
-
diff --git a/lib/kokkos/core/unit_test/cuda/TestCuda_ViewOfClass.cpp b/lib/kokkos/core/unit_test/cuda/TestCuda_ViewOfClass.cpp
index c457098ed5..86315de374 100644
--- a/lib/kokkos/core/unit_test/cuda/TestCuda_ViewOfClass.cpp
+++ b/lib/kokkos/core/unit_test/cuda/TestCuda_ViewOfClass.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -43,4 +44,3 @@
 
 #include <cuda/TestCuda_Category.hpp>
 #include <TestViewOfClass.hpp>
-
diff --git a/lib/kokkos/core/unit_test/cuda/TestCuda_ViewResize.cpp b/lib/kokkos/core/unit_test/cuda/TestCuda_ViewResize.cpp
new file mode 100644
index 0000000000..49b8b17dea
--- /dev/null
+++ b/lib/kokkos/core/unit_test/cuda/TestCuda_ViewResize.cpp
@@ -0,0 +1,46 @@
+/*
+//@HEADER
+// ************************************************************************
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
+// the U.S. Government retains certain rights in this software.
+//
+// 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 Corporation nor the names of the
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 NTESS OR THE
+// 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.
+//
+// Questions? Contact Christian R. Trott (crtrott@sandia.gov)
+//
+// ************************************************************************
+//@HEADER
+*/
+
+#include <cuda/TestCuda_Category.hpp>
+#include <TestViewResize.hpp>
diff --git a/lib/kokkos/core/unit_test/cuda/TestCuda_View_64bit.cpp b/lib/kokkos/core/unit_test/cuda/TestCuda_View_64bit.cpp
index 1f5d6f697a..ead4c29be9 100644
--- a/lib/kokkos/core/unit_test/cuda/TestCuda_View_64bit.cpp
+++ b/lib/kokkos/core/unit_test/cuda/TestCuda_View_64bit.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
diff --git a/lib/kokkos/core/unit_test/cuda/TestCuda_WorkGraph.cpp b/lib/kokkos/core/unit_test/cuda/TestCuda_WorkGraph.cpp
index c51f95810a..0ae3a66195 100644
--- a/lib/kokkos/core/unit_test/cuda/TestCuda_WorkGraph.cpp
+++ b/lib/kokkos/core/unit_test/cuda/TestCuda_WorkGraph.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -41,5 +42,5 @@
 //@HEADER
 */
 
-#include<cuda/TestCuda_Category.hpp>
-#include<TestWorkGraph.hpp>
+#include <cuda/TestCuda_Category.hpp>
+#include <TestWorkGraph.hpp>
diff --git a/lib/kokkos/core/unit_test/default/TestDefaultDeviceType.cpp b/lib/kokkos/core/unit_test/default/TestDefaultDeviceType.cpp
index 515cd54129..02f3f7272a 100644
--- a/lib/kokkos/core/unit_test/default/TestDefaultDeviceType.cpp
+++ b/lib/kokkos/core/unit_test/default/TestDefaultDeviceType.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -46,27 +47,29 @@
 #include <Kokkos_Core.hpp>
 #include <default/TestDefaultDeviceType_Category.hpp>
 
-#if !defined( KOKKOS_ENABLE_CUDA ) || defined( __CUDACC__ )
+#if !defined(KOKKOS_ENABLE_CUDA) || defined(__CUDACC__)
 
 namespace Test {
 
-
-TEST_F( TEST_CATEGORY, host_space_access )
-{
+TEST(TEST_CATEGORY, host_space_access) {
   typedef Kokkos::HostSpace::execution_space host_exec_space;
-  typedef Kokkos::Device< host_exec_space, Kokkos::HostSpace > device_space;
-  typedef Kokkos::Impl::HostMirror< Kokkos::DefaultExecutionSpace >::Space mirror_space;
+  typedef Kokkos::Device<host_exec_space, Kokkos::HostSpace> device_space;
+  typedef Kokkos::Impl::HostMirror<Kokkos::DefaultExecutionSpace>::Space
+      mirror_space;
 
-  static_assert(
-    Kokkos::Impl::SpaceAccessibility< host_exec_space, Kokkos::HostSpace >::accessible, "" );
+  static_assert(Kokkos::Impl::SpaceAccessibility<host_exec_space,
+                                                 Kokkos::HostSpace>::accessible,
+                "");
 
-  static_assert(
-    Kokkos::Impl::SpaceAccessibility< device_space, Kokkos::HostSpace >::accessible, "" );
+  static_assert(Kokkos::Impl::SpaceAccessibility<device_space,
+                                                 Kokkos::HostSpace>::accessible,
+                "");
 
-  static_assert(
-    Kokkos::Impl::SpaceAccessibility< mirror_space, Kokkos::HostSpace >::accessible, "" );
+  static_assert(Kokkos::Impl::SpaceAccessibility<mirror_space,
+                                                 Kokkos::HostSpace>::accessible,
+                "");
 }
 
-} // namespace Test
+}  // namespace Test
 
 #endif
diff --git a/lib/kokkos/core/unit_test/default/TestDefaultDeviceTypeInit_1.cpp b/lib/kokkos/core/unit_test/default/TestDefaultDeviceTypeInit_1.cpp
index 40a773b3b8..0f53cf8de7 100644
--- a/lib/kokkos/core/unit_test/default/TestDefaultDeviceTypeInit_1.cpp
+++ b/lib/kokkos/core/unit_test/default/TestDefaultDeviceTypeInit_1.cpp
@@ -1,2 +1,2 @@
 #define KOKKOS_DEFAULTDEVICETYPE_INIT_TEST_01
-#include<TestDefaultDeviceTypeInit.hpp>
+#include <TestDefaultDeviceTypeInit.hpp>
diff --git a/lib/kokkos/core/unit_test/default/TestDefaultDeviceTypeInit_10.cpp b/lib/kokkos/core/unit_test/default/TestDefaultDeviceTypeInit_10.cpp
index f12c4f62b2..c4691edd9b 100644
--- a/lib/kokkos/core/unit_test/default/TestDefaultDeviceTypeInit_10.cpp
+++ b/lib/kokkos/core/unit_test/default/TestDefaultDeviceTypeInit_10.cpp
@@ -1,2 +1,2 @@
 #define KOKKOS_DEFAULTDEVICETYPE_INIT_TEST_10
-#include<TestDefaultDeviceTypeInit.hpp>
+#include <TestDefaultDeviceTypeInit.hpp>
diff --git a/lib/kokkos/core/unit_test/default/TestDefaultDeviceTypeInit_11.cpp b/lib/kokkos/core/unit_test/default/TestDefaultDeviceTypeInit_11.cpp
index c7ffd7b94e..6d999e6cca 100644
--- a/lib/kokkos/core/unit_test/default/TestDefaultDeviceTypeInit_11.cpp
+++ b/lib/kokkos/core/unit_test/default/TestDefaultDeviceTypeInit_11.cpp
@@ -1,2 +1,2 @@
 #define KOKKOS_DEFAULTDEVICETYPE_INIT_TEST_11
-#include<TestDefaultDeviceTypeInit.hpp>
+#include <TestDefaultDeviceTypeInit.hpp>
diff --git a/lib/kokkos/core/unit_test/default/TestDefaultDeviceTypeInit_12.cpp b/lib/kokkos/core/unit_test/default/TestDefaultDeviceTypeInit_12.cpp
index 24e2b15201..8b60a704af 100644
--- a/lib/kokkos/core/unit_test/default/TestDefaultDeviceTypeInit_12.cpp
+++ b/lib/kokkos/core/unit_test/default/TestDefaultDeviceTypeInit_12.cpp
@@ -1,2 +1,2 @@
 #define KOKKOS_DEFAULTDEVICETYPE_INIT_TEST_12
-#include<TestDefaultDeviceTypeInit.hpp>
+#include <TestDefaultDeviceTypeInit.hpp>
diff --git a/lib/kokkos/core/unit_test/default/TestDefaultDeviceTypeInit_13.cpp b/lib/kokkos/core/unit_test/default/TestDefaultDeviceTypeInit_13.cpp
index 7968c13b66..22af90b952 100644
--- a/lib/kokkos/core/unit_test/default/TestDefaultDeviceTypeInit_13.cpp
+++ b/lib/kokkos/core/unit_test/default/TestDefaultDeviceTypeInit_13.cpp
@@ -1,2 +1,2 @@
 #define KOKKOS_DEFAULTDEVICETYPE_INIT_TEST_13
-#include<TestDefaultDeviceTypeInit.hpp>
+#include <TestDefaultDeviceTypeInit.hpp>
diff --git a/lib/kokkos/core/unit_test/default/TestDefaultDeviceTypeInit_14.cpp b/lib/kokkos/core/unit_test/default/TestDefaultDeviceTypeInit_14.cpp
index ab0563c6dc..cbe7aa34c7 100644
--- a/lib/kokkos/core/unit_test/default/TestDefaultDeviceTypeInit_14.cpp
+++ b/lib/kokkos/core/unit_test/default/TestDefaultDeviceTypeInit_14.cpp
@@ -1,2 +1,2 @@
 #define KOKKOS_DEFAULTDEVICETYPE_INIT_TEST_14
-#include<TestDefaultDeviceTypeInit.hpp>
+#include <TestDefaultDeviceTypeInit.hpp>
diff --git a/lib/kokkos/core/unit_test/default/TestDefaultDeviceTypeInit_15.cpp b/lib/kokkos/core/unit_test/default/TestDefaultDeviceTypeInit_15.cpp
index 70a8ca1727..8aefe0b77a 100644
--- a/lib/kokkos/core/unit_test/default/TestDefaultDeviceTypeInit_15.cpp
+++ b/lib/kokkos/core/unit_test/default/TestDefaultDeviceTypeInit_15.cpp
@@ -1,2 +1,2 @@
 #define KOKKOS_DEFAULTDEVICETYPE_INIT_TEST_15
-#include<TestDefaultDeviceTypeInit.hpp>
+#include <TestDefaultDeviceTypeInit.hpp>
diff --git a/lib/kokkos/core/unit_test/default/TestDefaultDeviceTypeInit_16.cpp b/lib/kokkos/core/unit_test/default/TestDefaultDeviceTypeInit_16.cpp
index 727c7a95eb..0023c903be 100644
--- a/lib/kokkos/core/unit_test/default/TestDefaultDeviceTypeInit_16.cpp
+++ b/lib/kokkos/core/unit_test/default/TestDefaultDeviceTypeInit_16.cpp
@@ -1,2 +1,2 @@
 #define KOKKOS_DEFAULTDEVICETYPE_INIT_TEST_16
-#include<TestDefaultDeviceTypeInit.hpp>
+#include <TestDefaultDeviceTypeInit.hpp>
diff --git a/lib/kokkos/core/unit_test/default/TestDefaultDeviceTypeInit_2.cpp b/lib/kokkos/core/unit_test/default/TestDefaultDeviceTypeInit_2.cpp
index 88fba34c50..da3c5d381c 100644
--- a/lib/kokkos/core/unit_test/default/TestDefaultDeviceTypeInit_2.cpp
+++ b/lib/kokkos/core/unit_test/default/TestDefaultDeviceTypeInit_2.cpp
@@ -1,2 +1,2 @@
 #define KOKKOS_DEFAULTDEVICETYPE_INIT_TEST_02
-#include<TestDefaultDeviceTypeInit.hpp>
+#include <TestDefaultDeviceTypeInit.hpp>
diff --git a/lib/kokkos/core/unit_test/default/TestDefaultDeviceTypeInit_3.cpp b/lib/kokkos/core/unit_test/default/TestDefaultDeviceTypeInit_3.cpp
index b3562cc53d..ab55bf93aa 100644
--- a/lib/kokkos/core/unit_test/default/TestDefaultDeviceTypeInit_3.cpp
+++ b/lib/kokkos/core/unit_test/default/TestDefaultDeviceTypeInit_3.cpp
@@ -1,2 +1,2 @@
 #define KOKKOS_DEFAULTDEVICETYPE_INIT_TEST_03
-#include<TestDefaultDeviceTypeInit.hpp>
+#include <TestDefaultDeviceTypeInit.hpp>
diff --git a/lib/kokkos/core/unit_test/default/TestDefaultDeviceTypeInit_4.cpp b/lib/kokkos/core/unit_test/default/TestDefaultDeviceTypeInit_4.cpp
index 0d4983319c..02b637d6cd 100644
--- a/lib/kokkos/core/unit_test/default/TestDefaultDeviceTypeInit_4.cpp
+++ b/lib/kokkos/core/unit_test/default/TestDefaultDeviceTypeInit_4.cpp
@@ -1,2 +1,2 @@
 #define KOKKOS_DEFAULTDEVICETYPE_INIT_TEST_04
-#include<TestDefaultDeviceTypeInit.hpp>
+#include <TestDefaultDeviceTypeInit.hpp>
diff --git a/lib/kokkos/core/unit_test/default/TestDefaultDeviceTypeInit_5.cpp b/lib/kokkos/core/unit_test/default/TestDefaultDeviceTypeInit_5.cpp
index 026fb01f88..0d6dbc5223 100644
--- a/lib/kokkos/core/unit_test/default/TestDefaultDeviceTypeInit_5.cpp
+++ b/lib/kokkos/core/unit_test/default/TestDefaultDeviceTypeInit_5.cpp
@@ -1,2 +1,2 @@
 #define KOKKOS_DEFAULTDEVICETYPE_INIT_TEST_05
-#include<TestDefaultDeviceTypeInit.hpp>
+#include <TestDefaultDeviceTypeInit.hpp>
diff --git a/lib/kokkos/core/unit_test/default/TestDefaultDeviceTypeInit_6.cpp b/lib/kokkos/core/unit_test/default/TestDefaultDeviceTypeInit_6.cpp
index 937a13160e..148153944d 100644
--- a/lib/kokkos/core/unit_test/default/TestDefaultDeviceTypeInit_6.cpp
+++ b/lib/kokkos/core/unit_test/default/TestDefaultDeviceTypeInit_6.cpp
@@ -1,2 +1,2 @@
 #define KOKKOS_DEFAULTDEVICETYPE_INIT_TEST_06
-#include<TestDefaultDeviceTypeInit.hpp>
+#include <TestDefaultDeviceTypeInit.hpp>
diff --git a/lib/kokkos/core/unit_test/default/TestDefaultDeviceTypeInit_7.cpp b/lib/kokkos/core/unit_test/default/TestDefaultDeviceTypeInit_7.cpp
index 992c854c1a..d7366577e9 100644
--- a/lib/kokkos/core/unit_test/default/TestDefaultDeviceTypeInit_7.cpp
+++ b/lib/kokkos/core/unit_test/default/TestDefaultDeviceTypeInit_7.cpp
@@ -1,2 +1,2 @@
 #define KOKKOS_DEFAULTDEVICETYPE_INIT_TEST_07
-#include<TestDefaultDeviceTypeInit.hpp>
+#include <TestDefaultDeviceTypeInit.hpp>
diff --git a/lib/kokkos/core/unit_test/default/TestDefaultDeviceTypeInit_8.cpp b/lib/kokkos/core/unit_test/default/TestDefaultDeviceTypeInit_8.cpp
index 07a8b1cb7c..72404d4328 100644
--- a/lib/kokkos/core/unit_test/default/TestDefaultDeviceTypeInit_8.cpp
+++ b/lib/kokkos/core/unit_test/default/TestDefaultDeviceTypeInit_8.cpp
@@ -1,2 +1,2 @@
 #define KOKKOS_DEFAULTDEVICETYPE_INIT_TEST_08
-#include<TestDefaultDeviceTypeInit.hpp>
+#include <TestDefaultDeviceTypeInit.hpp>
diff --git a/lib/kokkos/core/unit_test/default/TestDefaultDeviceTypeInit_9.cpp b/lib/kokkos/core/unit_test/default/TestDefaultDeviceTypeInit_9.cpp
index 4d8c05be2d..7e32767719 100644
--- a/lib/kokkos/core/unit_test/default/TestDefaultDeviceTypeInit_9.cpp
+++ b/lib/kokkos/core/unit_test/default/TestDefaultDeviceTypeInit_9.cpp
@@ -1,2 +1,2 @@
 #define KOKKOS_DEFAULTDEVICETYPE_INIT_TEST_09
-#include<TestDefaultDeviceTypeInit.hpp>
+#include <TestDefaultDeviceTypeInit.hpp>
diff --git a/lib/kokkos/core/unit_test/default/TestDefaultDeviceTypeResize.cpp b/lib/kokkos/core/unit_test/default/TestDefaultDeviceTypeResize.cpp
index fd8224ce34..df2bc44aa6 100644
--- a/lib/kokkos/core/unit_test/default/TestDefaultDeviceTypeResize.cpp
+++ b/lib/kokkos/core/unit_test/default/TestDefaultDeviceTypeResize.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -46,12 +47,11 @@
 
 namespace Test {
 
-TEST( kokkosresize, host_space_access )
-{
+TEST(kokkosresize, host_space_access) {
   // Test with the default device type.
   using TestViewResize::testResize;
   typedef Kokkos::View<int*>::device_type device_type;
-  testResize<device_type> ();
+  testResize<device_type>();
 }
 
-} // namespace Test
+}  // namespace Test
diff --git a/lib/kokkos/core/unit_test/default/TestDefaultDeviceType_Category.hpp b/lib/kokkos/core/unit_test/default/TestDefaultDeviceType_Category.hpp
index b7e3fa3b93..57a0e0ee00 100644
--- a/lib/kokkos/core/unit_test/default/TestDefaultDeviceType_Category.hpp
+++ b/lib/kokkos/core/unit_test/default/TestDefaultDeviceType_Category.hpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -46,22 +47,8 @@
 
 #include <gtest/gtest.h>
 
-namespace Test {
-
-class defaultdevicetype : public ::testing::Test {
-protected:
-  static void SetUpTestCase()
-  {
-  }
-
-  static void TearDownTestCase()
-  {
-  }
-};
-
-} // namespace Test
-
 #define TEST_CATEGORY defaultdevicetype
+#define TEST_CATEGORY_DEATH defaultdevicetype_DeathTest
 #define TEST_EXECSPACE Kokkos::DefaultExecutionSpace
 
 #endif
diff --git a/lib/kokkos/core/unit_test/default/TestDefaultDeviceType_a1.cpp b/lib/kokkos/core/unit_test/default/TestDefaultDeviceType_a1.cpp
index fc1a09d34f..a49ff677de 100644
--- a/lib/kokkos/core/unit_test/default/TestDefaultDeviceType_a1.cpp
+++ b/lib/kokkos/core/unit_test/default/TestDefaultDeviceType_a1.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -45,19 +46,17 @@
 
 #include <Kokkos_Core.hpp>
 
-#if !defined( KOKKOS_ENABLE_CUDA ) || defined( __CUDACC__ )
+#if !defined(KOKKOS_ENABLE_CUDA) || defined(__CUDACC__)
 
 #include <default/TestDefaultDeviceType_Category.hpp>
 #include <TestReduceCombinatorical.hpp>
 
 namespace Test {
 
-
-TEST_F( defaultdevicetype, reduce_instantiation_a1 )
-{
+TEST(defaultdevicetype, reduce_instantiation_a1) {
   TestReduceCombinatoricalInstantiation<>::execute_a1();
 }
 
-} // namespace Test
+}  // namespace Test
 
 #endif
diff --git a/lib/kokkos/core/unit_test/default/TestDefaultDeviceType_a2.cpp b/lib/kokkos/core/unit_test/default/TestDefaultDeviceType_a2.cpp
index 75843fc5ac..816ec60ec0 100644
--- a/lib/kokkos/core/unit_test/default/TestDefaultDeviceType_a2.cpp
+++ b/lib/kokkos/core/unit_test/default/TestDefaultDeviceType_a2.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -45,19 +46,17 @@
 
 #include <Kokkos_Core.hpp>
 
-#if !defined( KOKKOS_ENABLE_CUDA ) || defined( __CUDACC__ )
+#if !defined(KOKKOS_ENABLE_CUDA) || defined(__CUDACC__)
 
 #include <default/TestDefaultDeviceType_Category.hpp>
 #include <TestReduceCombinatorical.hpp>
 
 namespace Test {
 
-
-TEST_F( defaultdevicetype, reduce_instantiation_a2 )
-{
+TEST(defaultdevicetype, reduce_instantiation_a2) {
   TestReduceCombinatoricalInstantiation<>::execute_a2();
 }
 
-} // namespace Test
+}  // namespace Test
 
 #endif
diff --git a/lib/kokkos/core/unit_test/default/TestDefaultDeviceType_a3.cpp b/lib/kokkos/core/unit_test/default/TestDefaultDeviceType_a3.cpp
index 9f1ca5f23a..49c98268fc 100644
--- a/lib/kokkos/core/unit_test/default/TestDefaultDeviceType_a3.cpp
+++ b/lib/kokkos/core/unit_test/default/TestDefaultDeviceType_a3.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -45,19 +46,17 @@
 
 #include <Kokkos_Core.hpp>
 
-#if !defined( KOKKOS_ENABLE_CUDA ) || defined( __CUDACC__ )
+#if !defined(KOKKOS_ENABLE_CUDA) || defined(__CUDACC__)
 
 #include <default/TestDefaultDeviceType_Category.hpp>
 #include <TestReduceCombinatorical.hpp>
 
 namespace Test {
 
-
-TEST_F( defaultdevicetype, reduce_instantiation_a3 )
-{
+TEST(defaultdevicetype, reduce_instantiation_a3) {
   TestReduceCombinatoricalInstantiation<>::execute_a3();
 }
 
-} // namespace Test
+}  // namespace Test
 
 #endif
diff --git a/lib/kokkos/core/unit_test/default/TestDefaultDeviceType_b1.cpp b/lib/kokkos/core/unit_test/default/TestDefaultDeviceType_b1.cpp
index 94604a7733..fae6a72e72 100644
--- a/lib/kokkos/core/unit_test/default/TestDefaultDeviceType_b1.cpp
+++ b/lib/kokkos/core/unit_test/default/TestDefaultDeviceType_b1.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -45,18 +46,17 @@
 
 #include <Kokkos_Core.hpp>
 
-#if !defined( KOKKOS_ENABLE_CUDA ) || defined( __CUDACC__ )
+#if !defined(KOKKOS_ENABLE_CUDA) || defined(__CUDACC__)
 
 #include <default/TestDefaultDeviceType_Category.hpp>
 #include <TestReduceCombinatorical.hpp>
 
 namespace Test {
 
-TEST_F( defaultdevicetype, reduce_instantiation_b1 )
-{
+TEST(defaultdevicetype, reduce_instantiation_b1) {
   TestReduceCombinatoricalInstantiation<>::execute_b1();
 }
 
-} // namespace Test
+}  // namespace Test
 
 #endif
diff --git a/lib/kokkos/core/unit_test/default/TestDefaultDeviceType_b2.cpp b/lib/kokkos/core/unit_test/default/TestDefaultDeviceType_b2.cpp
index 77ffa39f3b..8a1d4eff2a 100644
--- a/lib/kokkos/core/unit_test/default/TestDefaultDeviceType_b2.cpp
+++ b/lib/kokkos/core/unit_test/default/TestDefaultDeviceType_b2.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -45,18 +46,17 @@
 
 #include <Kokkos_Core.hpp>
 
-#if !defined( KOKKOS_ENABLE_CUDA ) || defined( __CUDACC__ )
+#if !defined(KOKKOS_ENABLE_CUDA) || defined(__CUDACC__)
 
 #include <default/TestDefaultDeviceType_Category.hpp>
 #include <TestReduceCombinatorical.hpp>
 
 namespace Test {
 
-TEST_F( defaultdevicetype, reduce_instantiation_b2 )
-{
+TEST(defaultdevicetype, reduce_instantiation_b2) {
   TestReduceCombinatoricalInstantiation<>::execute_b2();
 }
 
-} // namespace Test
+}  // namespace Test
 
 #endif
diff --git a/lib/kokkos/core/unit_test/default/TestDefaultDeviceType_b3.cpp b/lib/kokkos/core/unit_test/default/TestDefaultDeviceType_b3.cpp
index 9d86f6caa2..6a980c492a 100644
--- a/lib/kokkos/core/unit_test/default/TestDefaultDeviceType_b3.cpp
+++ b/lib/kokkos/core/unit_test/default/TestDefaultDeviceType_b3.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -45,18 +46,17 @@
 
 #include <Kokkos_Core.hpp>
 
-#if !defined( KOKKOS_ENABLE_CUDA ) || defined( __CUDACC__ )
+#if !defined(KOKKOS_ENABLE_CUDA) || defined(__CUDACC__)
 
 #include <default/TestDefaultDeviceType_Category.hpp>
 #include <TestReduceCombinatorical.hpp>
 
 namespace Test {
 
-TEST_F( defaultdevicetype, reduce_instantiation_b3 )
-{
+TEST(defaultdevicetype, reduce_instantiation_b3) {
   TestReduceCombinatoricalInstantiation<>::execute_b3();
 }
 
-} // namespace Test
+}  // namespace Test
 
 #endif
diff --git a/lib/kokkos/core/unit_test/default/TestDefaultDeviceType_c1.cpp b/lib/kokkos/core/unit_test/default/TestDefaultDeviceType_c1.cpp
index 17e49b1ee7..2c807582b3 100644
--- a/lib/kokkos/core/unit_test/default/TestDefaultDeviceType_c1.cpp
+++ b/lib/kokkos/core/unit_test/default/TestDefaultDeviceType_c1.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -45,20 +46,19 @@
 
 #include <Kokkos_Core.hpp>
 
-#if !defined( KOKKOS_ENABLE_CUDA ) || defined( __CUDACC__ )
-#if !defined( KOKKOS_ENABLE_ROCM ) 
+#if !defined(KOKKOS_ENABLE_CUDA) || defined(__CUDACC__)
+#if !defined(KOKKOS_ENABLE_ROCM)
 
 #include <default/TestDefaultDeviceType_Category.hpp>
 #include <TestReduceCombinatorical.hpp>
 
 namespace Test {
 
-TEST_F( defaultdevicetype, reduce_instantiation_c1 )
-{
+TEST(defaultdevicetype, reduce_instantiation_c1) {
   TestReduceCombinatoricalInstantiation<>::execute_c1();
 }
 
-} // namespace Test
+}  // namespace Test
 
 #endif
 #endif
diff --git a/lib/kokkos/core/unit_test/default/TestDefaultDeviceType_c2.cpp b/lib/kokkos/core/unit_test/default/TestDefaultDeviceType_c2.cpp
index 5af1e0e361..f940810a5d 100644
--- a/lib/kokkos/core/unit_test/default/TestDefaultDeviceType_c2.cpp
+++ b/lib/kokkos/core/unit_test/default/TestDefaultDeviceType_c2.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -45,20 +46,19 @@
 
 #include <Kokkos_Core.hpp>
 
-#if !defined( KOKKOS_ENABLE_CUDA ) || defined( __CUDACC__ )
-#if !defined( KOKKOS_ENABLE_ROCM ) 
+#if !defined(KOKKOS_ENABLE_CUDA) || defined(__CUDACC__)
+#if !defined(KOKKOS_ENABLE_ROCM)
 
 #include <default/TestDefaultDeviceType_Category.hpp>
 #include <TestReduceCombinatorical.hpp>
 
 namespace Test {
 
-TEST_F( defaultdevicetype, reduce_instantiation_c2 )
-{
+TEST(defaultdevicetype, reduce_instantiation_c2) {
   TestReduceCombinatoricalInstantiation<>::execute_c2();
 }
 
-} // namespace Test
+}  // namespace Test
 
 #endif
 #endif
diff --git a/lib/kokkos/core/unit_test/default/TestDefaultDeviceType_c3.cpp b/lib/kokkos/core/unit_test/default/TestDefaultDeviceType_c3.cpp
index 0281754e58..c03d843024 100644
--- a/lib/kokkos/core/unit_test/default/TestDefaultDeviceType_c3.cpp
+++ b/lib/kokkos/core/unit_test/default/TestDefaultDeviceType_c3.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -45,20 +46,19 @@
 
 #include <Kokkos_Core.hpp>
 
-#if !defined( KOKKOS_ENABLE_CUDA ) || defined( __CUDACC__ )
-#if !defined( KOKKOS_ENABLE_ROCM ) 
+#if !defined(KOKKOS_ENABLE_CUDA) || defined(__CUDACC__)
+#if !defined(KOKKOS_ENABLE_ROCM)
 
 #include <default/TestDefaultDeviceType_Category.hpp>
 #include <TestReduceCombinatorical.hpp>
 
 namespace Test {
 
-TEST_F( defaultdevicetype, reduce_instantiation_c3 )
-{
+TEST(defaultdevicetype, reduce_instantiation_c3) {
   TestReduceCombinatoricalInstantiation<>::execute_c3();
 }
 
-} // namespace Test
+}  // namespace Test
 
 #endif
 #endif
diff --git a/lib/kokkos/core/unit_test/default/TestDefaultDeviceType_d.cpp b/lib/kokkos/core/unit_test/default/TestDefaultDeviceType_d.cpp
index 21a4df25ec..3502e1762f 100644
--- a/lib/kokkos/core/unit_test/default/TestDefaultDeviceType_d.cpp
+++ b/lib/kokkos/core/unit_test/default/TestDefaultDeviceType_d.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -45,29 +46,25 @@
 
 #include <Kokkos_Core.hpp>
 
-#if !defined( KOKKOS_ENABLE_CUDA ) || defined( __CUDACC__ )
+#if !defined(KOKKOS_ENABLE_CUDA) || defined(__CUDACC__)
 
 #include <default/TestDefaultDeviceType_Category.hpp>
 #include <TestUtilities.hpp>
 
 namespace Test {
 
-TEST_F( defaultdevicetype, test_utilities )
-{
-  test_utilities();
+TEST(defaultdevicetype, test_utilities) { test_utilities(); }
+
+TEST(defaultdevicetype, malloc) {
+  int* data = (int*)Kokkos::kokkos_malloc(100 * sizeof(int));
+  ASSERT_NO_THROW(data = (int*)Kokkos::kokkos_realloc(data, 120 * sizeof(int)));
+  Kokkos::kokkos_free(data);
+
+  int* data2 = (int*)Kokkos::kokkos_malloc(0);
+  ASSERT_TRUE(data2 == NULL);
+  Kokkos::kokkos_free(data2);
 }
 
-TEST_F( defaultdevicetype, malloc )
-{
-  int* data = (int*) Kokkos::kokkos_malloc( 100 * sizeof( int ) );
-  ASSERT_NO_THROW( data = (int*) Kokkos::kokkos_realloc( data, 120 * sizeof( int ) ) );
-  Kokkos::kokkos_free( data );
-
-  int* data2 = (int*) Kokkos::kokkos_malloc( 0 );
-  ASSERT_TRUE( data2 == NULL );
-  Kokkos::kokkos_free( data2 );
-}
-
-} // namespace Test
+}  // namespace Test
 
 #endif
diff --git a/lib/kokkos/core/unit_test/hpx/TestHPX_AtomicOperations_complexdouble.cpp b/lib/kokkos/core/unit_test/hpx/TestHPX_AtomicOperations_complexdouble.cpp
new file mode 100644
index 0000000000..51007d7b69
--- /dev/null
+++ b/lib/kokkos/core/unit_test/hpx/TestHPX_AtomicOperations_complexdouble.cpp
@@ -0,0 +1,46 @@
+/*
+//@HEADER
+// ************************************************************************
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
+// the U.S. Government retains certain rights in this software.
+//
+// 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 Corporation nor the names of the
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 NTESS OR THE
+// 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.
+//
+// Questions? Contact Christian R. Trott (crtrott@sandia.gov)
+//
+// ************************************************************************
+//@HEADER
+*/
+
+#include <hpx/TestHPX_Category.hpp>
+#include <TestAtomicOperations_complexdouble.hpp>
diff --git a/lib/kokkos/core/unit_test/hpx/TestHPX_AtomicOperations_complexfloat.cpp b/lib/kokkos/core/unit_test/hpx/TestHPX_AtomicOperations_complexfloat.cpp
new file mode 100644
index 0000000000..3bc3573127
--- /dev/null
+++ b/lib/kokkos/core/unit_test/hpx/TestHPX_AtomicOperations_complexfloat.cpp
@@ -0,0 +1,46 @@
+/*
+//@HEADER
+// ************************************************************************
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
+// the U.S. Government retains certain rights in this software.
+//
+// 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 Corporation nor the names of the
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 NTESS OR THE
+// 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.
+//
+// Questions? Contact Christian R. Trott (crtrott@sandia.gov)
+//
+// ************************************************************************
+//@HEADER
+*/
+
+#include <hpx/TestHPX_Category.hpp>
+#include <TestAtomicOperations_complexfloat.hpp>
diff --git a/lib/kokkos/core/unit_test/hpx/TestHPX_AtomicOperations_double.cpp b/lib/kokkos/core/unit_test/hpx/TestHPX_AtomicOperations_double.cpp
index 6f4d5de5c1..f0eb44759f 100644
--- a/lib/kokkos/core/unit_test/hpx/TestHPX_AtomicOperations_double.cpp
+++ b/lib/kokkos/core/unit_test/hpx/TestHPX_AtomicOperations_double.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -41,6 +42,5 @@
 //@HEADER
 */
 
-#include<hpx/TestHPX_Category.hpp>
-#include<TestAtomicOperations_double.hpp>
-
+#include <hpx/TestHPX_Category.hpp>
+#include <TestAtomicOperations_double.hpp>
diff --git a/lib/kokkos/core/unit_test/hpx/TestHPX_AtomicOperations_float.cpp b/lib/kokkos/core/unit_test/hpx/TestHPX_AtomicOperations_float.cpp
index 5b859989cb..38551eabb5 100644
--- a/lib/kokkos/core/unit_test/hpx/TestHPX_AtomicOperations_float.cpp
+++ b/lib/kokkos/core/unit_test/hpx/TestHPX_AtomicOperations_float.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -41,6 +42,5 @@
 //@HEADER
 */
 
-#include<hpx/TestHPX_Category.hpp>
-#include<TestAtomicOperations_float.hpp>
-
+#include <hpx/TestHPX_Category.hpp>
+#include <TestAtomicOperations_float.hpp>
diff --git a/lib/kokkos/core/unit_test/hpx/TestHPX_AtomicOperations_int.cpp b/lib/kokkos/core/unit_test/hpx/TestHPX_AtomicOperations_int.cpp
index 1e7b098322..3005c36913 100644
--- a/lib/kokkos/core/unit_test/hpx/TestHPX_AtomicOperations_int.cpp
+++ b/lib/kokkos/core/unit_test/hpx/TestHPX_AtomicOperations_int.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -41,6 +42,5 @@
 //@HEADER
 */
 
-#include<hpx/TestHPX_Category.hpp>
-#include<TestAtomicOperations_int.hpp>
-
+#include <hpx/TestHPX_Category.hpp>
+#include <TestAtomicOperations_int.hpp>
diff --git a/lib/kokkos/core/unit_test/hpx/TestHPX_AtomicOperations_longint.cpp b/lib/kokkos/core/unit_test/hpx/TestHPX_AtomicOperations_longint.cpp
index a6d76339f1..4bbc1e0713 100644
--- a/lib/kokkos/core/unit_test/hpx/TestHPX_AtomicOperations_longint.cpp
+++ b/lib/kokkos/core/unit_test/hpx/TestHPX_AtomicOperations_longint.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -41,6 +42,5 @@
 //@HEADER
 */
 
-#include<hpx/TestHPX_Category.hpp>
-#include<TestAtomicOperations_longint.hpp>
-
+#include <hpx/TestHPX_Category.hpp>
+#include <TestAtomicOperations_longint.hpp>
diff --git a/lib/kokkos/core/unit_test/hpx/TestHPX_AtomicOperations_longlongint.cpp b/lib/kokkos/core/unit_test/hpx/TestHPX_AtomicOperations_longlongint.cpp
index e8907bb648..9abc860c73 100644
--- a/lib/kokkos/core/unit_test/hpx/TestHPX_AtomicOperations_longlongint.cpp
+++ b/lib/kokkos/core/unit_test/hpx/TestHPX_AtomicOperations_longlongint.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -41,6 +42,5 @@
 //@HEADER
 */
 
-#include<hpx/TestHPX_Category.hpp>
-#include<TestAtomicOperations_longlongint.hpp>
-
+#include <hpx/TestHPX_Category.hpp>
+#include <TestAtomicOperations_longlongint.hpp>
diff --git a/lib/kokkos/core/unit_test/hpx/TestHPX_AtomicOperations_unsignedint.cpp b/lib/kokkos/core/unit_test/hpx/TestHPX_AtomicOperations_unsignedint.cpp
index ce54e31f96..6195d493e3 100644
--- a/lib/kokkos/core/unit_test/hpx/TestHPX_AtomicOperations_unsignedint.cpp
+++ b/lib/kokkos/core/unit_test/hpx/TestHPX_AtomicOperations_unsignedint.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -41,6 +42,5 @@
 //@HEADER
 */
 
-#include<hpx/TestHPX_Category.hpp>
-#include<TestAtomicOperations_unsignedint.hpp>
-
+#include <hpx/TestHPX_Category.hpp>
+#include <TestAtomicOperations_unsignedint.hpp>
diff --git a/lib/kokkos/core/unit_test/hpx/TestHPX_AtomicOperations_unsignedlongint.cpp b/lib/kokkos/core/unit_test/hpx/TestHPX_AtomicOperations_unsignedlongint.cpp
index cb8193c9e8..a488983ec7 100644
--- a/lib/kokkos/core/unit_test/hpx/TestHPX_AtomicOperations_unsignedlongint.cpp
+++ b/lib/kokkos/core/unit_test/hpx/TestHPX_AtomicOperations_unsignedlongint.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -41,6 +42,5 @@
 //@HEADER
 */
 
-#include<hpx/TestHPX_Category.hpp>
-#include<TestAtomicOperations_unsignedlongint.hpp>
-
+#include <hpx/TestHPX_Category.hpp>
+#include <TestAtomicOperations_unsignedlongint.hpp>
diff --git a/lib/kokkos/core/unit_test/hpx/TestHPX_AtomicViews.cpp b/lib/kokkos/core/unit_test/hpx/TestHPX_AtomicViews.cpp
index 59f4b05d5f..723f513d8e 100644
--- a/lib/kokkos/core/unit_test/hpx/TestHPX_AtomicViews.cpp
+++ b/lib/kokkos/core/unit_test/hpx/TestHPX_AtomicViews.cpp
@@ -3,10 +3,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -42,6 +43,5 @@
 //@HEADER
 */
 
-#include<hpx/TestHPX_Category.hpp>
-#include<TestAtomicViews.hpp>
-
+#include <hpx/TestHPX_Category.hpp>
+#include <TestAtomicViews.hpp>
diff --git a/lib/kokkos/core/unit_test/hpx/TestHPX_Atomics.cpp b/lib/kokkos/core/unit_test/hpx/TestHPX_Atomics.cpp
index c9301446b9..71729e9617 100644
--- a/lib/kokkos/core/unit_test/hpx/TestHPX_Atomics.cpp
+++ b/lib/kokkos/core/unit_test/hpx/TestHPX_Atomics.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -43,4 +44,3 @@
 
 #include <hpx/TestHPX_Category.hpp>
 #include <TestAtomic.hpp>
-
diff --git a/lib/kokkos/core/unit_test/hpx/TestHPX_Category.hpp b/lib/kokkos/core/unit_test/hpx/TestHPX_Category.hpp
index 358b42d1aa..bbdcfba5c7 100644
--- a/lib/kokkos/core/unit_test/hpx/TestHPX_Category.hpp
+++ b/lib/kokkos/core/unit_test/hpx/TestHPX_Category.hpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -46,20 +47,8 @@
 
 #include <gtest/gtest.h>
 
-namespace Test {
-
-class hpx : public ::testing::Test {
-protected:
-  static void SetUpTestCase() {
-  }
-
-  static void TearDownTestCase() {
-  }
-};
-
-} // namespace Test
-
 #define TEST_CATEGORY hpx
+#define TEST_CATEGORY_DEATH hpx_DeathTest
 #define TEST_EXECSPACE Kokkos::Experimental::HPX
 
 #endif
diff --git a/lib/kokkos/core/unit_test/hpx/TestHPX_Complex.cpp b/lib/kokkos/core/unit_test/hpx/TestHPX_Complex.cpp
index 6edcda6c68..91de03dcc6 100644
--- a/lib/kokkos/core/unit_test/hpx/TestHPX_Complex.cpp
+++ b/lib/kokkos/core/unit_test/hpx/TestHPX_Complex.cpp
@@ -3,10 +3,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -42,6 +43,5 @@
 //@HEADER
 */
 
-#include<hpx/TestHPX_Category.hpp>
-#include<TestComplex.hpp>
-
+#include <hpx/TestHPX_Category.hpp>
+#include <TestComplex.hpp>
diff --git a/lib/kokkos/core/unit_test/hpx/TestHPX_Crs.cpp b/lib/kokkos/core/unit_test/hpx/TestHPX_Crs.cpp
index 33f4262b83..d82f449c8c 100644
--- a/lib/kokkos/core/unit_test/hpx/TestHPX_Crs.cpp
+++ b/lib/kokkos/core/unit_test/hpx/TestHPX_Crs.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
diff --git a/lib/kokkos/core/unit_test/hpx/TestHPX_DeepCopyAlignment.cpp b/lib/kokkos/core/unit_test/hpx/TestHPX_DeepCopyAlignment.cpp
new file mode 100644
index 0000000000..29e04eda1e
--- /dev/null
+++ b/lib/kokkos/core/unit_test/hpx/TestHPX_DeepCopyAlignment.cpp
@@ -0,0 +1,46 @@
+/*
+//@HEADER
+// ************************************************************************
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
+// the U.S. Government retains certain rights in this software.
+//
+// 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 Corporation nor the names of the
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 NTESS OR THE
+// 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.
+//
+// Questions? Contact Christian R. Trott (crtrott@sandia.gov)
+//
+// ************************************************************************
+//@HEADER
+*/
+
+#include <hpx/TestHPX_Category.hpp>
+#include <TestDeepCopy.hpp>
diff --git a/lib/kokkos/core/unit_test/hpx/TestHPX_FunctorAnalysis.cpp b/lib/kokkos/core/unit_test/hpx/TestHPX_FunctorAnalysis.cpp
new file mode 100644
index 0000000000..fa66cb49f0
--- /dev/null
+++ b/lib/kokkos/core/unit_test/hpx/TestHPX_FunctorAnalysis.cpp
@@ -0,0 +1,47 @@
+
+/*
+//@HEADER
+// ************************************************************************
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
+// the U.S. Government retains certain rights in this software.
+//
+// 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 Corporation nor the names of the
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 NTESS OR THE
+// 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.
+//
+// Questions? Contact Christian R. Trott (crtrott@sandia.gov)
+//
+// ************************************************************************
+//@HEADER
+*/
+
+#include <hpx/TestHPX_Category.hpp>
+#include <TestFunctorAnalysis.hpp>
diff --git a/lib/kokkos/core/unit_test/hpx/TestHPX_Init.cpp b/lib/kokkos/core/unit_test/hpx/TestHPX_Init.cpp
index f7cf44128c..9a320c6373 100644
--- a/lib/kokkos/core/unit_test/hpx/TestHPX_Init.cpp
+++ b/lib/kokkos/core/unit_test/hpx/TestHPX_Init.cpp
@@ -3,10 +3,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -42,9 +43,7 @@
 //@HEADER
 */
 
-#include<hpx/TestHPX_Category.hpp>
-#include<TestInit.hpp>
-#include<TestCompilerMacros.hpp>
-#include<TestPolicyConstruction.hpp>
-
-
+#include <hpx/TestHPX_Category.hpp>
+#include <TestInit.hpp>
+#include <TestCompilerMacros.hpp>
+#include <TestPolicyConstruction.hpp>
diff --git a/lib/kokkos/core/unit_test/hpx/TestHPX_InterOp.cpp b/lib/kokkos/core/unit_test/hpx/TestHPX_InterOp.cpp
index 72e440c19e..872d1a0383 100644
--- a/lib/kokkos/core/unit_test/hpx/TestHPX_InterOp.cpp
+++ b/lib/kokkos/core/unit_test/hpx/TestHPX_InterOp.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -46,11 +47,11 @@
 
 namespace Test {
 
-// Test whether allocations survive Kokkos initialize/finalize if done via Raw Cuda.
-TEST_F( hpx, raw_hpx_interop )
-{
-  Kokkos::InitArguments arguments{-1,-1,-1, false};
+// Test whether allocations survive Kokkos initialize/finalize if done via Raw
+// Cuda.
+TEST(hpx, raw_hpx_interop) {
+  Kokkos::InitArguments arguments{-1, -1, -1, false};
   Kokkos::initialize(arguments);
   Kokkos::finalize();
 }
-}
+}  // namespace Test
diff --git a/lib/kokkos/core/unit_test/hpx/TestHPX_LocalDeepCopy.cpp b/lib/kokkos/core/unit_test/hpx/TestHPX_LocalDeepCopy.cpp
new file mode 100644
index 0000000000..da48849b99
--- /dev/null
+++ b/lib/kokkos/core/unit_test/hpx/TestHPX_LocalDeepCopy.cpp
@@ -0,0 +1,46 @@
+/*
+//@HEADER
+// ************************************************************************
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
+// the U.S. Government retains certain rights in this software.
+//
+// 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 Corporation nor the names of the
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 NTESS OR THE
+// 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.
+//
+// Questions? Contact Christian R. Trott (crtrott@sandia.gov)
+//
+// ************************************************************************
+//@HEADER
+*/
+
+#include <hpx/TestHPX_Category.hpp>
+#include <TestLocalDeepCopy.hpp>
diff --git a/lib/kokkos/core/unit_test/hpx/TestHPX_MDRange_a.cpp b/lib/kokkos/core/unit_test/hpx/TestHPX_MDRange_a.cpp
index 5410402e1d..59f97ef346 100644
--- a/lib/kokkos/core/unit_test/hpx/TestHPX_MDRange_a.cpp
+++ b/lib/kokkos/core/unit_test/hpx/TestHPX_MDRange_a.cpp
@@ -3,10 +3,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -42,6 +43,5 @@
 //@HEADER
 */
 
-#include<hpx/TestHPX_Category.hpp>
-#include<TestMDRange_a.hpp>
-
+#include <hpx/TestHPX_Category.hpp>
+#include <TestMDRange_a.hpp>
diff --git a/lib/kokkos/core/unit_test/hpx/TestHPX_MDRange_b.cpp b/lib/kokkos/core/unit_test/hpx/TestHPX_MDRange_b.cpp
index be15ba1b8c..eb2c9a04ee 100644
--- a/lib/kokkos/core/unit_test/hpx/TestHPX_MDRange_b.cpp
+++ b/lib/kokkos/core/unit_test/hpx/TestHPX_MDRange_b.cpp
@@ -3,10 +3,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -42,6 +43,5 @@
 //@HEADER
 */
 
-#include<hpx/TestHPX_Category.hpp>
-#include<TestMDRange_b.hpp>
-
+#include <hpx/TestHPX_Category.hpp>
+#include <TestMDRange_b.hpp>
diff --git a/lib/kokkos/core/unit_test/hpx/TestHPX_MDRange_c.cpp b/lib/kokkos/core/unit_test/hpx/TestHPX_MDRange_c.cpp
index e0afafab75..8cbe4d56e6 100644
--- a/lib/kokkos/core/unit_test/hpx/TestHPX_MDRange_c.cpp
+++ b/lib/kokkos/core/unit_test/hpx/TestHPX_MDRange_c.cpp
@@ -3,10 +3,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -42,6 +43,5 @@
 //@HEADER
 */
 
-#include<hpx/TestHPX_Category.hpp>
-#include<TestMDRange_c.hpp>
-
+#include <hpx/TestHPX_Category.hpp>
+#include <TestMDRange_c.hpp>
diff --git a/lib/kokkos/core/unit_test/hpx/TestHPX_MDRange_d.cpp b/lib/kokkos/core/unit_test/hpx/TestHPX_MDRange_d.cpp
index f9e0a0c884..0ee7e7f649 100644
--- a/lib/kokkos/core/unit_test/hpx/TestHPX_MDRange_d.cpp
+++ b/lib/kokkos/core/unit_test/hpx/TestHPX_MDRange_d.cpp
@@ -3,10 +3,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -42,6 +43,5 @@
 //@HEADER
 */
 
-#include<hpx/TestHPX_Category.hpp>
-#include<TestMDRange_d.hpp>
-
+#include <hpx/TestHPX_Category.hpp>
+#include <TestMDRange_d.hpp>
diff --git a/lib/kokkos/core/unit_test/hpx/TestHPX_MDRange_e.cpp b/lib/kokkos/core/unit_test/hpx/TestHPX_MDRange_e.cpp
index 9fbbfb6238..a731f97f25 100644
--- a/lib/kokkos/core/unit_test/hpx/TestHPX_MDRange_e.cpp
+++ b/lib/kokkos/core/unit_test/hpx/TestHPX_MDRange_e.cpp
@@ -3,10 +3,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -42,6 +43,5 @@
 //@HEADER
 */
 
-#include<hpx/TestHPX_Category.hpp>
-#include<TestMDRange_e.hpp>
-
+#include <hpx/TestHPX_Category.hpp>
+#include <TestMDRange_e.hpp>
diff --git a/lib/kokkos/core/unit_test/hpx/TestHPX_Other.cpp b/lib/kokkos/core/unit_test/hpx/TestHPX_Other.cpp
index 3f74ceb7e6..34153174bd 100644
--- a/lib/kokkos/core/unit_test/hpx/TestHPX_Other.cpp
+++ b/lib/kokkos/core/unit_test/hpx/TestHPX_Other.cpp
@@ -3,10 +3,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
diff --git a/lib/kokkos/core/unit_test/hpx/TestHPX_RangePolicy.cpp b/lib/kokkos/core/unit_test/hpx/TestHPX_RangePolicy.cpp
index ee1124ec8a..009f4cbbcb 100644
--- a/lib/kokkos/core/unit_test/hpx/TestHPX_RangePolicy.cpp
+++ b/lib/kokkos/core/unit_test/hpx/TestHPX_RangePolicy.cpp
@@ -3,10 +3,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -42,6 +43,5 @@
 //@HEADER
 */
 
-#include<hpx/TestHPX_Category.hpp>
-#include<TestRange.hpp>
-
+#include <hpx/TestHPX_Category.hpp>
+#include <TestRange.hpp>
diff --git a/lib/kokkos/core/unit_test/hpx/TestHPX_Reducers_a.cpp b/lib/kokkos/core/unit_test/hpx/TestHPX_Reducers_a.cpp
index 5fbe0ff999..9c10dc0aa0 100644
--- a/lib/kokkos/core/unit_test/hpx/TestHPX_Reducers_a.cpp
+++ b/lib/kokkos/core/unit_test/hpx/TestHPX_Reducers_a.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
diff --git a/lib/kokkos/core/unit_test/hpx/TestHPX_Reducers_b.cpp b/lib/kokkos/core/unit_test/hpx/TestHPX_Reducers_b.cpp
index d4ed60f1ac..1b3bdb53ba 100644
--- a/lib/kokkos/core/unit_test/hpx/TestHPX_Reducers_b.cpp
+++ b/lib/kokkos/core/unit_test/hpx/TestHPX_Reducers_b.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
diff --git a/lib/kokkos/core/unit_test/hpx/TestHPX_Reducers_c.cpp b/lib/kokkos/core/unit_test/hpx/TestHPX_Reducers_c.cpp
index 87704c4404..385b2ccf96 100644
--- a/lib/kokkos/core/unit_test/hpx/TestHPX_Reducers_c.cpp
+++ b/lib/kokkos/core/unit_test/hpx/TestHPX_Reducers_c.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
diff --git a/lib/kokkos/core/unit_test/hpx/TestHPX_Reducers_d.cpp b/lib/kokkos/core/unit_test/hpx/TestHPX_Reducers_d.cpp
index 86895358fb..e5460792ea 100644
--- a/lib/kokkos/core/unit_test/hpx/TestHPX_Reducers_d.cpp
+++ b/lib/kokkos/core/unit_test/hpx/TestHPX_Reducers_d.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
diff --git a/lib/kokkos/core/unit_test/hpx/TestHPX_Reductions.cpp b/lib/kokkos/core/unit_test/hpx/TestHPX_Reductions.cpp
index d8cf6f3da2..e10b1761a6 100644
--- a/lib/kokkos/core/unit_test/hpx/TestHPX_Reductions.cpp
+++ b/lib/kokkos/core/unit_test/hpx/TestHPX_Reductions.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
diff --git a/lib/kokkos/core/unit_test/hpx/TestHPX_Reductions_DeviceView.cpp b/lib/kokkos/core/unit_test/hpx/TestHPX_Reductions_DeviceView.cpp
new file mode 100644
index 0000000000..7363c21b1d
--- /dev/null
+++ b/lib/kokkos/core/unit_test/hpx/TestHPX_Reductions_DeviceView.cpp
@@ -0,0 +1,46 @@
+/*
+//@HEADER
+// ************************************************************************
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
+// the U.S. Government retains certain rights in this software.
+//
+// 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 Corporation nor the names of the
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 NTESS OR THE
+// 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.
+//
+// Questions? Contact Christian R. Trott (crtrott@sandia.gov)
+//
+// ************************************************************************
+//@HEADER
+*/
+
+#include <hpx/TestHPX_Category.hpp>
+#include <TestReduceDeviceView.hpp>
diff --git a/lib/kokkos/core/unit_test/hpx/TestHPX_Scan.cpp b/lib/kokkos/core/unit_test/hpx/TestHPX_Scan.cpp
index 526cd990ce..66bd71db5a 100644
--- a/lib/kokkos/core/unit_test/hpx/TestHPX_Scan.cpp
+++ b/lib/kokkos/core/unit_test/hpx/TestHPX_Scan.cpp
@@ -3,10 +3,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -42,6 +43,5 @@
 //@HEADER
 */
 
-#include<hpx/TestHPX_Category.hpp>
-#include<TestScan.hpp>
-
+#include <hpx/TestHPX_Category.hpp>
+#include <TestScan.hpp>
diff --git a/lib/kokkos/core/unit_test/hpx/TestHPX_SharedAlloc.cpp b/lib/kokkos/core/unit_test/hpx/TestHPX_SharedAlloc.cpp
index 417fd0ee57..48a40aaaef 100644
--- a/lib/kokkos/core/unit_test/hpx/TestHPX_SharedAlloc.cpp
+++ b/lib/kokkos/core/unit_test/hpx/TestHPX_SharedAlloc.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -46,10 +47,8 @@
 
 namespace Test {
 
-
-TEST_F( TEST_CATEGORY, impl_shared_alloc )
-{
-  test_shared_alloc< Kokkos::HostSpace, TEST_EXECSPACE >();
+TEST(TEST_CATEGORY, impl_shared_alloc) {
+  test_shared_alloc<Kokkos::HostSpace, TEST_EXECSPACE>();
 }
 
-} // namespace Test
+}  // namespace Test
diff --git a/lib/kokkos/core/unit_test/hpx/TestHPX_SubView_a.cpp b/lib/kokkos/core/unit_test/hpx/TestHPX_SubView_a.cpp
index 8e2443b5a4..9f697c16ed 100644
--- a/lib/kokkos/core/unit_test/hpx/TestHPX_SubView_a.cpp
+++ b/lib/kokkos/core/unit_test/hpx/TestHPX_SubView_a.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -46,59 +47,48 @@
 
 namespace Test {
 
-TEST_F( TEST_CATEGORY, view_subview_auto_1d_left )
-{
-  TestViewSubview::test_auto_1d< Kokkos::LayoutLeft, TEST_EXECSPACE >();
+TEST(TEST_CATEGORY, view_subview_auto_1d_left) {
+  TestViewSubview::test_auto_1d<Kokkos::LayoutLeft, TEST_EXECSPACE>();
 }
 
-TEST_F( TEST_CATEGORY, view_subview_auto_1d_right )
-{
-  TestViewSubview::test_auto_1d< Kokkos::LayoutRight, TEST_EXECSPACE >();
+TEST(TEST_CATEGORY, view_subview_auto_1d_right) {
+  TestViewSubview::test_auto_1d<Kokkos::LayoutRight, TEST_EXECSPACE>();
 }
 
-TEST_F( TEST_CATEGORY, view_subview_auto_1d_stride )
-{
-  TestViewSubview::test_auto_1d< Kokkos::LayoutStride, TEST_EXECSPACE >();
+TEST(TEST_CATEGORY, view_subview_auto_1d_stride) {
+  TestViewSubview::test_auto_1d<Kokkos::LayoutStride, TEST_EXECSPACE>();
 }
 
-TEST_F( TEST_CATEGORY, view_subview_assign_strided )
-{
-  TestViewSubview::test_1d_strided_assignment< TEST_EXECSPACE >();
+TEST(TEST_CATEGORY, view_subview_assign_strided) {
+  TestViewSubview::test_1d_strided_assignment<TEST_EXECSPACE>();
 }
 
-TEST_F( TEST_CATEGORY, view_subview_left_0 )
-{
-  TestViewSubview::test_left_0< TEST_EXECSPACE >();
+TEST(TEST_CATEGORY, view_subview_left_0) {
+  TestViewSubview::test_left_0<TEST_EXECSPACE>();
 }
 
-TEST_F( TEST_CATEGORY, view_subview_left_1 )
-{
-  TestViewSubview::test_left_1< TEST_EXECSPACE >();
+TEST(TEST_CATEGORY, view_subview_left_1) {
+  TestViewSubview::test_left_1<TEST_EXECSPACE>();
 }
 
-TEST_F( TEST_CATEGORY, view_subview_left_2 )
-{
-  TestViewSubview::test_left_2< TEST_EXECSPACE >();
+TEST(TEST_CATEGORY, view_subview_left_2) {
+  TestViewSubview::test_left_2<TEST_EXECSPACE>();
 }
 
-TEST_F( TEST_CATEGORY, view_subview_left_3 )
-{
-  TestViewSubview::test_left_3< TEST_EXECSPACE >();
+TEST(TEST_CATEGORY, view_subview_left_3) {
+  TestViewSubview::test_left_3<TEST_EXECSPACE>();
 }
 
-TEST_F( TEST_CATEGORY, view_subview_right_0 )
-{
-  TestViewSubview::test_right_0< TEST_EXECSPACE >();
+TEST(TEST_CATEGORY, view_subview_right_0) {
+  TestViewSubview::test_right_0<TEST_EXECSPACE>();
 }
 
-TEST_F( TEST_CATEGORY, view_subview_right_1 )
-{
-  TestViewSubview::test_right_1< TEST_EXECSPACE >();
+TEST(TEST_CATEGORY, view_subview_right_1) {
+  TestViewSubview::test_right_1<TEST_EXECSPACE>();
 }
 
-TEST_F( TEST_CATEGORY, view_subview_right_3 )
-{
-  TestViewSubview::test_right_3< TEST_EXECSPACE >();
+TEST(TEST_CATEGORY, view_subview_right_3) {
+  TestViewSubview::test_right_3<TEST_EXECSPACE>();
 }
 
-} // namespace Test
+}  // namespace Test
diff --git a/lib/kokkos/core/unit_test/hpx/TestHPX_SubView_b.cpp b/lib/kokkos/core/unit_test/hpx/TestHPX_SubView_b.cpp
index 5d25fcc257..eb625fd832 100644
--- a/lib/kokkos/core/unit_test/hpx/TestHPX_SubView_b.cpp
+++ b/lib/kokkos/core/unit_test/hpx/TestHPX_SubView_b.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -46,18 +47,20 @@
 
 namespace Test {
 
-TEST_F( TEST_CATEGORY, view_subview_layoutleft_to_layoutleft )
-{
-  TestViewSubview::test_layoutleft_to_layoutleft< TEST_EXECSPACE >();
-  TestViewSubview::test_layoutleft_to_layoutleft< TEST_EXECSPACE, Kokkos::MemoryTraits<Kokkos::Atomic> >();
-  TestViewSubview::test_layoutleft_to_layoutleft< TEST_EXECSPACE, Kokkos::MemoryTraits<Kokkos::RandomAccess> >();
+TEST(TEST_CATEGORY, view_subview_layoutleft_to_layoutleft) {
+  TestViewSubview::test_layoutleft_to_layoutleft<TEST_EXECSPACE>();
+  TestViewSubview::test_layoutleft_to_layoutleft<
+      TEST_EXECSPACE, Kokkos::MemoryTraits<Kokkos::Atomic> >();
+  TestViewSubview::test_layoutleft_to_layoutleft<
+      TEST_EXECSPACE, Kokkos::MemoryTraits<Kokkos::RandomAccess> >();
 }
 
-TEST_F( TEST_CATEGORY, view_subview_layoutright_to_layoutright )
-{
-  TestViewSubview::test_layoutright_to_layoutright< TEST_EXECSPACE >();
-  TestViewSubview::test_layoutright_to_layoutright< TEST_EXECSPACE, Kokkos::MemoryTraits<Kokkos::Atomic> >();
-  TestViewSubview::test_layoutright_to_layoutright< TEST_EXECSPACE, Kokkos::MemoryTraits<Kokkos::RandomAccess> >();
+TEST(TEST_CATEGORY, view_subview_layoutright_to_layoutright) {
+  TestViewSubview::test_layoutright_to_layoutright<TEST_EXECSPACE>();
+  TestViewSubview::test_layoutright_to_layoutright<
+      TEST_EXECSPACE, Kokkos::MemoryTraits<Kokkos::Atomic> >();
+  TestViewSubview::test_layoutright_to_layoutright<
+      TEST_EXECSPACE, Kokkos::MemoryTraits<Kokkos::RandomAccess> >();
 }
 
-} // namespace Test
+}  // namespace Test
diff --git a/lib/kokkos/core/unit_test/hpx/TestHPX_SubView_c01.cpp b/lib/kokkos/core/unit_test/hpx/TestHPX_SubView_c01.cpp
index 36d2ab1bdb..7bd179ba68 100644
--- a/lib/kokkos/core/unit_test/hpx/TestHPX_SubView_c01.cpp
+++ b/lib/kokkos/core/unit_test/hpx/TestHPX_SubView_c01.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -46,9 +47,8 @@
 
 namespace Test {
 
-TEST_F( TEST_CATEGORY, view_subview_1d_assign )
-{
-  TestViewSubview::test_1d_assign< TEST_EXECSPACE >();
+TEST(TEST_CATEGORY, view_subview_1d_assign) {
+  TestViewSubview::test_1d_assign<TEST_EXECSPACE>();
 }
 
-} // namespace Test
+}  // namespace Test
diff --git a/lib/kokkos/core/unit_test/hpx/TestHPX_SubView_c02.cpp b/lib/kokkos/core/unit_test/hpx/TestHPX_SubView_c02.cpp
index 19e70fbfba..b490503b3c 100644
--- a/lib/kokkos/core/unit_test/hpx/TestHPX_SubView_c02.cpp
+++ b/lib/kokkos/core/unit_test/hpx/TestHPX_SubView_c02.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -46,9 +47,9 @@
 
 namespace Test {
 
-TEST_F( TEST_CATEGORY, view_subview_1d_assign_atomic )
-{
-  TestViewSubview::test_1d_assign< TEST_EXECSPACE, Kokkos::MemoryTraits<Kokkos::Atomic> >();
+TEST(TEST_CATEGORY, view_subview_1d_assign_atomic) {
+  TestViewSubview::test_1d_assign<TEST_EXECSPACE,
+                                  Kokkos::MemoryTraits<Kokkos::Atomic> >();
 }
 
-} // namespace Test
+}  // namespace Test
diff --git a/lib/kokkos/core/unit_test/hpx/TestHPX_SubView_c03.cpp b/lib/kokkos/core/unit_test/hpx/TestHPX_SubView_c03.cpp
index 45b07e43b0..f36a25e8ee 100644
--- a/lib/kokkos/core/unit_test/hpx/TestHPX_SubView_c03.cpp
+++ b/lib/kokkos/core/unit_test/hpx/TestHPX_SubView_c03.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -46,9 +47,9 @@
 
 namespace Test {
 
-TEST_F( TEST_CATEGORY, view_subview_1d_assign_randomaccess )
-{
-  TestViewSubview::test_1d_assign< TEST_EXECSPACE, Kokkos::MemoryTraits<Kokkos::RandomAccess> >();
+TEST(TEST_CATEGORY, view_subview_1d_assign_randomaccess) {
+  TestViewSubview::test_1d_assign<
+      TEST_EXECSPACE, Kokkos::MemoryTraits<Kokkos::RandomAccess> >();
 }
 
-} // namespace Test
+}  // namespace Test
diff --git a/lib/kokkos/core/unit_test/hpx/TestHPX_SubView_c04.cpp b/lib/kokkos/core/unit_test/hpx/TestHPX_SubView_c04.cpp
index 484b025608..3bc96cd57e 100644
--- a/lib/kokkos/core/unit_test/hpx/TestHPX_SubView_c04.cpp
+++ b/lib/kokkos/core/unit_test/hpx/TestHPX_SubView_c04.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -46,9 +47,8 @@
 
 namespace Test {
 
-TEST_F( TEST_CATEGORY, view_subview_2d_from_3d )
-{
-  TestViewSubview::test_2d_subview_3d< TEST_EXECSPACE >();
+TEST(TEST_CATEGORY, view_subview_2d_from_3d) {
+  TestViewSubview::test_2d_subview_3d<TEST_EXECSPACE>();
 }
 
-} // namespace Test
+}  // namespace Test
diff --git a/lib/kokkos/core/unit_test/hpx/TestHPX_SubView_c05.cpp b/lib/kokkos/core/unit_test/hpx/TestHPX_SubView_c05.cpp
index cbfa024553..a102141b7d 100644
--- a/lib/kokkos/core/unit_test/hpx/TestHPX_SubView_c05.cpp
+++ b/lib/kokkos/core/unit_test/hpx/TestHPX_SubView_c05.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -46,9 +47,9 @@
 
 namespace Test {
 
-TEST_F( hpx, view_subview_2d_from_3d_atomic )
-{
-  TestViewSubview::test_2d_subview_3d< TEST_EXECSPACE, Kokkos::MemoryTraits<Kokkos::Atomic> >();
+TEST(hpx, view_subview_2d_from_3d_atomic) {
+  TestViewSubview::test_2d_subview_3d<TEST_EXECSPACE,
+                                      Kokkos::MemoryTraits<Kokkos::Atomic> >();
 }
 
-} // namespace Test
+}  // namespace Test
diff --git a/lib/kokkos/core/unit_test/hpx/TestHPX_SubView_c06.cpp b/lib/kokkos/core/unit_test/hpx/TestHPX_SubView_c06.cpp
index ba2f8e5693..18ba861113 100644
--- a/lib/kokkos/core/unit_test/hpx/TestHPX_SubView_c06.cpp
+++ b/lib/kokkos/core/unit_test/hpx/TestHPX_SubView_c06.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -46,9 +47,9 @@
 
 namespace Test {
 
-TEST_F( TEST_CATEGORY, view_subview_2d_from_3d_randomaccess )
-{
-  TestViewSubview::test_2d_subview_3d< TEST_EXECSPACE, Kokkos::MemoryTraits<Kokkos::RandomAccess> >();
+TEST(TEST_CATEGORY, view_subview_2d_from_3d_randomaccess) {
+  TestViewSubview::test_2d_subview_3d<
+      TEST_EXECSPACE, Kokkos::MemoryTraits<Kokkos::RandomAccess> >();
 }
 
-} // namespace Test
+}  // namespace Test
diff --git a/lib/kokkos/core/unit_test/hpx/TestHPX_SubView_c07.cpp b/lib/kokkos/core/unit_test/hpx/TestHPX_SubView_c07.cpp
index 3cabfebc61..d1e136fdf5 100644
--- a/lib/kokkos/core/unit_test/hpx/TestHPX_SubView_c07.cpp
+++ b/lib/kokkos/core/unit_test/hpx/TestHPX_SubView_c07.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -46,9 +47,8 @@
 
 namespace Test {
 
-TEST_F( TEST_CATEGORY, view_subview_3d_from_5d_left )
-{
-  TestViewSubview::test_3d_subview_5d_left< TEST_EXECSPACE >();
+TEST(TEST_CATEGORY, view_subview_3d_from_5d_left) {
+  TestViewSubview::test_3d_subview_5d_left<TEST_EXECSPACE>();
 }
 
-} // namespace Test
+}  // namespace Test
diff --git a/lib/kokkos/core/unit_test/hpx/TestHPX_SubView_c08.cpp b/lib/kokkos/core/unit_test/hpx/TestHPX_SubView_c08.cpp
index bc78ba83eb..6bee531a71 100644
--- a/lib/kokkos/core/unit_test/hpx/TestHPX_SubView_c08.cpp
+++ b/lib/kokkos/core/unit_test/hpx/TestHPX_SubView_c08.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -46,9 +47,9 @@
 
 namespace Test {
 
-TEST_F( TEST_CATEGORY, view_subview_3d_from_5d_left_atomic )
-{
-  TestViewSubview::test_3d_subview_5d_left< TEST_EXECSPACE, Kokkos::MemoryTraits<Kokkos::Atomic> >();
+TEST(TEST_CATEGORY, view_subview_3d_from_5d_left_atomic) {
+  TestViewSubview::test_3d_subview_5d_left<
+      TEST_EXECSPACE, Kokkos::MemoryTraits<Kokkos::Atomic> >();
 }
 
-} // namespace Test
+}  // namespace Test
diff --git a/lib/kokkos/core/unit_test/hpx/TestHPX_SubView_c09.cpp b/lib/kokkos/core/unit_test/hpx/TestHPX_SubView_c09.cpp
index bb3381a9e8..a9c88d0e75 100644
--- a/lib/kokkos/core/unit_test/hpx/TestHPX_SubView_c09.cpp
+++ b/lib/kokkos/core/unit_test/hpx/TestHPX_SubView_c09.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -46,9 +47,9 @@
 
 namespace Test {
 
-TEST_F( TEST_CATEGORY, view_subview_3d_from_5d_left_randomaccess )
-{
-  TestViewSubview::test_3d_subview_5d_left< TEST_EXECSPACE, Kokkos::MemoryTraits<Kokkos::RandomAccess> >();
+TEST(TEST_CATEGORY, view_subview_3d_from_5d_left_randomaccess) {
+  TestViewSubview::test_3d_subview_5d_left<
+      TEST_EXECSPACE, Kokkos::MemoryTraits<Kokkos::RandomAccess> >();
 }
 
-} // namespace Test
+}  // namespace Test
diff --git a/lib/kokkos/core/unit_test/hpx/TestHPX_SubView_c10.cpp b/lib/kokkos/core/unit_test/hpx/TestHPX_SubView_c10.cpp
index 58ae45a7a0..c2b9d4ffda 100644
--- a/lib/kokkos/core/unit_test/hpx/TestHPX_SubView_c10.cpp
+++ b/lib/kokkos/core/unit_test/hpx/TestHPX_SubView_c10.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -46,9 +47,8 @@
 
 namespace Test {
 
-TEST_F( TEST_CATEGORY, view_subview_3d_from_5d_right )
-{
-  TestViewSubview::test_3d_subview_5d_right< TEST_EXECSPACE >();
+TEST(TEST_CATEGORY, view_subview_3d_from_5d_right) {
+  TestViewSubview::test_3d_subview_5d_right<TEST_EXECSPACE>();
 }
 
-} // namespace Test
+}  // namespace Test
diff --git a/lib/kokkos/core/unit_test/hpx/TestHPX_SubView_c11.cpp b/lib/kokkos/core/unit_test/hpx/TestHPX_SubView_c11.cpp
index 19649fbd56..429564d91c 100644
--- a/lib/kokkos/core/unit_test/hpx/TestHPX_SubView_c11.cpp
+++ b/lib/kokkos/core/unit_test/hpx/TestHPX_SubView_c11.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -46,9 +47,9 @@
 
 namespace Test {
 
-TEST_F( TEST_CATEGORY, view_subview_3d_from_5d_right_atomic )
-{
-  TestViewSubview::test_3d_subview_5d_right< TEST_EXECSPACE, Kokkos::MemoryTraits<Kokkos::Atomic> >();
+TEST(TEST_CATEGORY, view_subview_3d_from_5d_right_atomic) {
+  TestViewSubview::test_3d_subview_5d_right<
+      TEST_EXECSPACE, Kokkos::MemoryTraits<Kokkos::Atomic> >();
 }
 
-} // namespace Test
+}  // namespace Test
diff --git a/lib/kokkos/core/unit_test/hpx/TestHPX_SubView_c12.cpp b/lib/kokkos/core/unit_test/hpx/TestHPX_SubView_c12.cpp
index dc354dc21e..bb7f69b1f1 100644
--- a/lib/kokkos/core/unit_test/hpx/TestHPX_SubView_c12.cpp
+++ b/lib/kokkos/core/unit_test/hpx/TestHPX_SubView_c12.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -46,9 +47,9 @@
 
 namespace Test {
 
-TEST_F( TEST_CATEGORY, view_subview_3d_from_5d_right_randomaccess )
-{
-  TestViewSubview::test_3d_subview_5d_right< TEST_EXECSPACE, Kokkos::MemoryTraits<Kokkos::RandomAccess> >();
+TEST(TEST_CATEGORY, view_subview_3d_from_5d_right_randomaccess) {
+  TestViewSubview::test_3d_subview_5d_right<
+      TEST_EXECSPACE, Kokkos::MemoryTraits<Kokkos::RandomAccess> >();
 }
 
-} // namespace Test
+}  // namespace Test
diff --git a/lib/kokkos/core/unit_test/hpx/TestHPX_SubView_c13.cpp b/lib/kokkos/core/unit_test/hpx/TestHPX_SubView_c13.cpp
index 8b4955c4c7..6f1e2cd0aa 100644
--- a/lib/kokkos/core/unit_test/hpx/TestHPX_SubView_c13.cpp
+++ b/lib/kokkos/core/unit_test/hpx/TestHPX_SubView_c13.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -46,9 +47,8 @@
 
 namespace Test {
 
-TEST_F( TEST_CATEGORY, view_test_unmanaged_subview_reset )
-{
-  TestViewSubview::test_unmanaged_subview_reset< TEST_EXECSPACE >();
+TEST(TEST_CATEGORY, view_test_unmanaged_subview_reset) {
+  TestViewSubview::test_unmanaged_subview_reset<TEST_EXECSPACE>();
 }
 
-} // namespace Test
+}  // namespace Test
diff --git a/lib/kokkos/core/unit_test/hpx/TestHPX_Task.cpp b/lib/kokkos/core/unit_test/hpx/TestHPX_Task.cpp
index 754e059c57..4e059beef4 100644
--- a/lib/kokkos/core/unit_test/hpx/TestHPX_Task.cpp
+++ b/lib/kokkos/core/unit_test/hpx/TestHPX_Task.cpp
@@ -3,10 +3,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -42,6 +43,5 @@
 //@HEADER
 */
 
-#include<hpx/TestHPX_Category.hpp>
-#include<TestTaskScheduler.hpp>
-
+#include <hpx/TestHPX_Category.hpp>
+#include <TestTaskScheduler.hpp>
diff --git a/lib/kokkos/core/unit_test/hpx/TestHPX_Team.cpp b/lib/kokkos/core/unit_test/hpx/TestHPX_Team.cpp
index 9851133d03..f5278971bc 100644
--- a/lib/kokkos/core/unit_test/hpx/TestHPX_Team.cpp
+++ b/lib/kokkos/core/unit_test/hpx/TestHPX_Team.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -46,30 +47,37 @@
 
 namespace Test {
 
-TEST_F( TEST_CATEGORY, team_for )
-{
-  TestTeamPolicy< TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Static> >::test_for( 0 );
-  TestTeamPolicy< TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Dynamic> >::test_for( 0 );
+TEST(TEST_CATEGORY, team_for) {
+  TestTeamPolicy<TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Static> >::test_for(
+      0);
+  TestTeamPolicy<TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Dynamic> >::test_for(
+      0);
 
-  TestTeamPolicy< TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Static> >::test_for( 2 );
-  TestTeamPolicy< TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Dynamic> >::test_for( 2 );
+  TestTeamPolicy<TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Static> >::test_for(
+      2);
+  TestTeamPolicy<TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Dynamic> >::test_for(
+      2);
 
-  TestTeamPolicy< TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Static> >::test_for( 1000 );
-  TestTeamPolicy< TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Dynamic> >::test_for( 1000 );
+  TestTeamPolicy<TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Static> >::test_for(
+      1000);
+  TestTeamPolicy<TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Dynamic> >::test_for(
+      1000);
 }
 
-
-TEST_F( TEST_CATEGORY, team_reduce )
-{
-  TestTeamPolicy< TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Static> >::test_reduce( 0 );
-  TestTeamPolicy< TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Dynamic> >::test_reduce( 0 );
-  TestTeamPolicy< TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Static> >::test_reduce( 2 );
-  TestTeamPolicy< TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Dynamic> >::test_reduce( 2 );
-  TestTeamPolicy< TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Static> >::test_reduce( 1000 );
-  TestTeamPolicy< TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Dynamic> >::test_reduce( 1000 );
-}
+TEST(TEST_CATEGORY, team_reduce) {
+  TestTeamPolicy<TEST_EXECSPACE,
+                 Kokkos::Schedule<Kokkos::Static> >::test_reduce(0);
+  TestTeamPolicy<TEST_EXECSPACE,
+                 Kokkos::Schedule<Kokkos::Dynamic> >::test_reduce(0);
+  TestTeamPolicy<TEST_EXECSPACE,
+                 Kokkos::Schedule<Kokkos::Static> >::test_reduce(2);
+  TestTeamPolicy<TEST_EXECSPACE,
+                 Kokkos::Schedule<Kokkos::Dynamic> >::test_reduce(2);
+  TestTeamPolicy<TEST_EXECSPACE,
+                 Kokkos::Schedule<Kokkos::Static> >::test_reduce(1000);
+  TestTeamPolicy<TEST_EXECSPACE,
+                 Kokkos::Schedule<Kokkos::Dynamic> >::test_reduce(1000);
 }
+}  // namespace Test
 
 #include <TestTeamVector.hpp>
-
-
diff --git a/lib/kokkos/core/unit_test/hpx/TestHPX_TeamReductionScan.cpp b/lib/kokkos/core/unit_test/hpx/TestHPX_TeamReductionScan.cpp
index ea9e9087ba..971e12f3ff 100644
--- a/lib/kokkos/core/unit_test/hpx/TestHPX_TeamReductionScan.cpp
+++ b/lib/kokkos/core/unit_test/hpx/TestHPX_TeamReductionScan.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -46,36 +47,35 @@
 
 namespace Test {
 
-
-TEST_F( TEST_CATEGORY, team_scan )
-{
-  TestScanTeam< TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Static> >( 0 );
-  TestScanTeam< TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Dynamic> >( 0 );
-  TestScanTeam< TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Static> >( 10 );
-  TestScanTeam< TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Dynamic> >( 10 );
-  TestScanTeam< TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Static> >( 10000 );
-  TestScanTeam< TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Dynamic> >( 10000 );
+TEST(TEST_CATEGORY, team_scan) {
+  TestScanTeam<TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Static> >(0);
+  TestScanTeam<TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Dynamic> >(0);
+  TestScanTeam<TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Static> >(10);
+  TestScanTeam<TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Dynamic> >(10);
+  TestScanTeam<TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Static> >(10000);
+  TestScanTeam<TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Dynamic> >(10000);
 }
 
-TEST_F( TEST_CATEGORY, team_long_reduce )
-{
-  TestReduceTeam< long, TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Static> >( 0 );
-  TestReduceTeam< long, TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Dynamic> >( 0 );
-  TestReduceTeam< long, TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Static> >( 3 );
-  TestReduceTeam< long, TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Dynamic> >( 3 );
-  TestReduceTeam< long, TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Static> >( 100000 );
-  TestReduceTeam< long, TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Dynamic> >( 100000 );
+TEST(TEST_CATEGORY, team_long_reduce) {
+  TestReduceTeam<long, TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Static> >(0);
+  TestReduceTeam<long, TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Dynamic> >(0);
+  TestReduceTeam<long, TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Static> >(3);
+  TestReduceTeam<long, TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Dynamic> >(3);
+  TestReduceTeam<long, TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Static> >(
+      100000);
+  TestReduceTeam<long, TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Dynamic> >(
+      100000);
 }
 
-TEST_F( TEST_CATEGORY, team_double_reduce )
-{
-  TestReduceTeam< double, TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Static> >( 0 );
-  TestReduceTeam< double, TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Dynamic> >( 0 );
-  TestReduceTeam< double, TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Static> >( 3 );
-  TestReduceTeam< double, TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Dynamic> >( 3 );
-  TestReduceTeam< double, TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Static> >( 100000 );
-  TestReduceTeam< double, TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Dynamic> >( 100000 );
+TEST(TEST_CATEGORY, team_double_reduce) {
+  TestReduceTeam<double, TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Static> >(0);
+  TestReduceTeam<double, TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Dynamic> >(0);
+  TestReduceTeam<double, TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Static> >(3);
+  TestReduceTeam<double, TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Dynamic> >(3);
+  TestReduceTeam<double, TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Static> >(
+      100000);
+  TestReduceTeam<double, TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Dynamic> >(
+      100000);
 }
 
-} // namespace Test
-
+}  // namespace Test
diff --git a/lib/kokkos/core/unit_test/hpx/TestHPX_TeamScratch.cpp b/lib/kokkos/core/unit_test/hpx/TestHPX_TeamScratch.cpp
index d51d380413..14cbfb8f41 100644
--- a/lib/kokkos/core/unit_test/hpx/TestHPX_TeamScratch.cpp
+++ b/lib/kokkos/core/unit_test/hpx/TestHPX_TeamScratch.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -46,38 +47,34 @@
 
 namespace Test {
 
-TEST_F( TEST_CATEGORY, team_shared_request )
-{
-  TestSharedTeam< TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Static> >();
-  TestSharedTeam< TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Dynamic> >();
+TEST(TEST_CATEGORY, team_shared_request) {
+  TestSharedTeam<TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Static> >();
+  TestSharedTeam<TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Dynamic> >();
 }
 
-TEST_F( TEST_CATEGORY, team_scratch_request )
-{
-  TestScratchTeam< TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Static> >();
-  TestScratchTeam< TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Dynamic> >();
+TEST(TEST_CATEGORY, team_scratch_request) {
+  TestScratchTeam<TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Static> >();
+  TestScratchTeam<TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Dynamic> >();
 }
 
-#if defined( KOKKOS_ENABLE_CXX11_DISPATCH_LAMBDA )
-#if !defined(KOKKOS_ENABLE_CUDA) || ( 8000 <= CUDA_VERSION )
-TEST_F( TEST_CATEGORY, team_lambda_shared_request )
-{
-  TestLambdaSharedTeam< Kokkos::HostSpace, TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Static> >();
-  TestLambdaSharedTeam< Kokkos::HostSpace, TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Dynamic> >();
+#if defined(KOKKOS_ENABLE_CXX11_DISPATCH_LAMBDA)
+#if !defined(KOKKOS_ENABLE_CUDA) || (8000 <= CUDA_VERSION)
+TEST(TEST_CATEGORY, team_lambda_shared_request) {
+  TestLambdaSharedTeam<Kokkos::HostSpace, TEST_EXECSPACE,
+                       Kokkos::Schedule<Kokkos::Static> >();
+  TestLambdaSharedTeam<Kokkos::HostSpace, TEST_EXECSPACE,
+                       Kokkos::Schedule<Kokkos::Dynamic> >();
 }
 #endif
 #endif
 
-TEST_F( TEST_CATEGORY, shmem_size )
-{
-  TestShmemSize< TEST_EXECSPACE >();
+TEST(TEST_CATEGORY, shmem_size) { TestShmemSize<TEST_EXECSPACE>(); }
+
+TEST(TEST_CATEGORY, multi_level_scratch) {
+  TestMultiLevelScratchTeam<TEST_EXECSPACE,
+                            Kokkos::Schedule<Kokkos::Static> >();
+  TestMultiLevelScratchTeam<TEST_EXECSPACE,
+                            Kokkos::Schedule<Kokkos::Dynamic> >();
 }
 
-TEST_F( TEST_CATEGORY, multi_level_scratch )
-{
-  TestMultiLevelScratchTeam< TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Static> >();
-  TestMultiLevelScratchTeam< TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Dynamic> >();
-}
-
-} // namespace Test
-
+}  // namespace Test
diff --git a/lib/kokkos/core/unit_test/hpx/TestHPX_TeamTeamSize.cpp b/lib/kokkos/core/unit_test/hpx/TestHPX_TeamTeamSize.cpp
new file mode 100644
index 0000000000..68577d065e
--- /dev/null
+++ b/lib/kokkos/core/unit_test/hpx/TestHPX_TeamTeamSize.cpp
@@ -0,0 +1,46 @@
+/*
+//@HEADER
+// ************************************************************************
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
+// the U.S. Government retains certain rights in this software.
+//
+// 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 Corporation nor the names of the
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 NTESS OR THE
+// 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.
+//
+// Questions? Contact Christian R. Trott (crtrott@sandia.gov)
+//
+// ************************************************************************
+//@HEADER
+*/
+
+#include <hpx/TestHPX_Category.hpp>
+#include <TestTeamTeamSize.hpp>
diff --git a/lib/kokkos/core/unit_test/hpx/TestHPX_TeamVectorRange.cpp b/lib/kokkos/core/unit_test/hpx/TestHPX_TeamVectorRange.cpp
index 21f448f20a..2bf586ec26 100644
--- a/lib/kokkos/core/unit_test/hpx/TestHPX_TeamVectorRange.cpp
+++ b/lib/kokkos/core/unit_test/hpx/TestHPX_TeamVectorRange.cpp
@@ -3,10 +3,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -42,7 +43,5 @@
 //@HEADER
 */
 
-#include<hpx/TestHPX_Category.hpp>
-#include<TestTeamVectorRange.hpp>
-
-
+#include <hpx/TestHPX_Category.hpp>
+#include <TestTeamVectorRange.hpp>
diff --git a/lib/kokkos/core/unit_test/hpx/TestHPX_UniqueToken.cpp b/lib/kokkos/core/unit_test/hpx/TestHPX_UniqueToken.cpp
index 4f25782237..9e88419e77 100644
--- a/lib/kokkos/core/unit_test/hpx/TestHPX_UniqueToken.cpp
+++ b/lib/kokkos/core/unit_test/hpx/TestHPX_UniqueToken.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -41,6 +42,5 @@
 //@HEADER
 */
 
-#include<hpx/TestHPX_Category.hpp>
-#include<TestUniqueToken.hpp>
-
+#include <hpx/TestHPX_Category.hpp>
+#include <TestUniqueToken.hpp>
diff --git a/lib/kokkos/core/unit_test/hpx/TestHPX_ViewAPI_a.cpp b/lib/kokkos/core/unit_test/hpx/TestHPX_ViewAPI_a.cpp
index 198aaba0f7..7342cfac8c 100644
--- a/lib/kokkos/core/unit_test/hpx/TestHPX_ViewAPI_a.cpp
+++ b/lib/kokkos/core/unit_test/hpx/TestHPX_ViewAPI_a.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
diff --git a/lib/kokkos/core/unit_test/hpx/TestHPX_ViewAPI_b.cpp b/lib/kokkos/core/unit_test/hpx/TestHPX_ViewAPI_b.cpp
index bafc735664..82fd177ad2 100644
--- a/lib/kokkos/core/unit_test/hpx/TestHPX_ViewAPI_b.cpp
+++ b/lib/kokkos/core/unit_test/hpx/TestHPX_ViewAPI_b.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
diff --git a/lib/kokkos/core/unit_test/hpx/TestHPX_ViewAPI_c.cpp b/lib/kokkos/core/unit_test/hpx/TestHPX_ViewAPI_c.cpp
index 0397558645..e5d920de4e 100644
--- a/lib/kokkos/core/unit_test/hpx/TestHPX_ViewAPI_c.cpp
+++ b/lib/kokkos/core/unit_test/hpx/TestHPX_ViewAPI_c.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
diff --git a/lib/kokkos/core/unit_test/hpx/TestHPX_ViewAPI_d.cpp b/lib/kokkos/core/unit_test/hpx/TestHPX_ViewAPI_d.cpp
index aec887189c..56bfb6ffcc 100644
--- a/lib/kokkos/core/unit_test/hpx/TestHPX_ViewAPI_d.cpp
+++ b/lib/kokkos/core/unit_test/hpx/TestHPX_ViewAPI_d.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
diff --git a/lib/kokkos/core/unit_test/hpx/TestHPX_ViewAPI_e.cpp b/lib/kokkos/core/unit_test/hpx/TestHPX_ViewAPI_e.cpp
index 3cc3f0cddd..3dc492355b 100644
--- a/lib/kokkos/core/unit_test/hpx/TestHPX_ViewAPI_e.cpp
+++ b/lib/kokkos/core/unit_test/hpx/TestHPX_ViewAPI_e.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
diff --git a/lib/kokkos/core/unit_test/hpx/TestHPX_ViewLayoutStrideAssignment.cpp b/lib/kokkos/core/unit_test/hpx/TestHPX_ViewLayoutStrideAssignment.cpp
new file mode 100644
index 0000000000..eb91b558ef
--- /dev/null
+++ b/lib/kokkos/core/unit_test/hpx/TestHPX_ViewLayoutStrideAssignment.cpp
@@ -0,0 +1,46 @@
+/*
+//@HEADER
+// ************************************************************************
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
+// the U.S. Government retains certain rights in this software.
+//
+// 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 Corporation nor the names of the
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 NTESS OR THE
+// 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.
+//
+// Questions? Contact Christian R. Trott (crtrott@sandia.gov)
+//
+// ************************************************************************
+//@HEADER
+*/
+
+#include <hpx/TestHPX_Category.hpp>
+#include <TestViewLayoutStrideAssignment.hpp>
diff --git a/lib/kokkos/core/unit_test/hpx/TestHPX_ViewMapping_a.cpp b/lib/kokkos/core/unit_test/hpx/TestHPX_ViewMapping_a.cpp
index 15b069f112..5ad3d97197 100644
--- a/lib/kokkos/core/unit_test/hpx/TestHPX_ViewMapping_a.cpp
+++ b/lib/kokkos/core/unit_test/hpx/TestHPX_ViewMapping_a.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -43,4 +44,3 @@
 
 #include <hpx/TestHPX_Category.hpp>
 #include <TestViewMapping_a.hpp>
-
diff --git a/lib/kokkos/core/unit_test/hpx/TestHPX_ViewMapping_b.cpp b/lib/kokkos/core/unit_test/hpx/TestHPX_ViewMapping_b.cpp
index c1ffc79db2..10f49a93d2 100644
--- a/lib/kokkos/core/unit_test/hpx/TestHPX_ViewMapping_b.cpp
+++ b/lib/kokkos/core/unit_test/hpx/TestHPX_ViewMapping_b.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -43,4 +44,3 @@
 
 #include <hpx/TestHPX_Category.hpp>
 #include <TestViewMapping_b.hpp>
-
diff --git a/lib/kokkos/core/unit_test/hpx/TestHPX_ViewMapping_subview.cpp b/lib/kokkos/core/unit_test/hpx/TestHPX_ViewMapping_subview.cpp
index 1e6dd240ff..e79965acfe 100644
--- a/lib/kokkos/core/unit_test/hpx/TestHPX_ViewMapping_subview.cpp
+++ b/lib/kokkos/core/unit_test/hpx/TestHPX_ViewMapping_subview.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -43,4 +44,3 @@
 
 #include <hpx/TestHPX_Category.hpp>
 #include <TestViewMapping_subview.hpp>
-
diff --git a/lib/kokkos/core/unit_test/hpx/TestHPX_ViewOfClass.cpp b/lib/kokkos/core/unit_test/hpx/TestHPX_ViewOfClass.cpp
index 525fa09bf3..cfc9ea23a9 100644
--- a/lib/kokkos/core/unit_test/hpx/TestHPX_ViewOfClass.cpp
+++ b/lib/kokkos/core/unit_test/hpx/TestHPX_ViewOfClass.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -43,4 +44,3 @@
 
 #include <hpx/TestHPX_Category.hpp>
 #include <TestViewOfClass.hpp>
-
diff --git a/lib/kokkos/core/unit_test/hpx/TestHPX_ViewResize.cpp b/lib/kokkos/core/unit_test/hpx/TestHPX_ViewResize.cpp
new file mode 100644
index 0000000000..cc14030dcd
--- /dev/null
+++ b/lib/kokkos/core/unit_test/hpx/TestHPX_ViewResize.cpp
@@ -0,0 +1,46 @@
+/*
+//@HEADER
+// ************************************************************************
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
+// the U.S. Government retains certain rights in this software.
+//
+// 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 Corporation nor the names of the
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 NTESS OR THE
+// 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.
+//
+// Questions? Contact Christian R. Trott (crtrott@sandia.gov)
+//
+// ************************************************************************
+//@HEADER
+*/
+
+#include <hpx/TestHPX_Category.hpp>
+#include <TestViewResize.hpp>
diff --git a/lib/kokkos/core/unit_test/hpx/TestHPX_View_64bit.cpp b/lib/kokkos/core/unit_test/hpx/TestHPX_View_64bit.cpp
index 18d08cedaa..8672c23d7b 100644
--- a/lib/kokkos/core/unit_test/hpx/TestHPX_View_64bit.cpp
+++ b/lib/kokkos/core/unit_test/hpx/TestHPX_View_64bit.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
diff --git a/lib/kokkos/core/unit_test/hpx/TestHPX_WorkGraph.cpp b/lib/kokkos/core/unit_test/hpx/TestHPX_WorkGraph.cpp
index ca980b8a74..1e497b344b 100644
--- a/lib/kokkos/core/unit_test/hpx/TestHPX_WorkGraph.cpp
+++ b/lib/kokkos/core/unit_test/hpx/TestHPX_WorkGraph.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -41,5 +42,5 @@
 //@HEADER
 */
 
-#include<hpx/TestHPX_Category.hpp>
-#include<TestWorkGraph.hpp>
+#include <hpx/TestHPX_Category.hpp>
+#include <TestWorkGraph.hpp>
diff --git a/lib/kokkos/core/unit_test/openmp/TestOpenMP.hpp b/lib/kokkos/core/unit_test/openmp/TestOpenMP.hpp
index 9fdf627001..082657c28f 100644
--- a/lib/kokkos/core/unit_test/openmp/TestOpenMP.hpp
+++ b/lib/kokkos/core/unit_test/openmp/TestOpenMP.hpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -83,13 +84,12 @@
 namespace Test {
 
 class openmp : public ::testing::Test {
-protected:
-  static void SetUpTestCase()
-  {
+ protected:
+  static void SetUpTestCase() {
     int threads_count = 0;
-    #pragma omp parallel
+#pragma omp parallel
     {
-      #pragma omp atomic
+#pragma omp atomic
       ++threads_count;
     }
 
@@ -97,18 +97,15 @@ protected:
       threads_count /= 2;
     }
 
-    Kokkos::OpenMP::initialize( threads_count );
-    Kokkos::print_configuration( std::cout, true );
+    Kokkos::OpenMP::initialize(threads_count);
+    Kokkos::print_configuration(std::cout, true);
 
-    srand( 10231 );
+    srand(10231);
   }
 
-  static void TearDownTestCase()
-  {
-    Kokkos::OpenMP::finalize();
-  }
+  static void TearDownTestCase() { Kokkos::OpenMP::finalize(); }
 };
 
-} // namespace Test
+}  // namespace Test
 
 #endif
diff --git a/lib/kokkos/core/unit_test/openmp/TestOpenMP_AtomicOperations_complexdouble.cpp b/lib/kokkos/core/unit_test/openmp/TestOpenMP_AtomicOperations_complexdouble.cpp
index 8d38e398ca..50514e3503 100644
--- a/lib/kokkos/core/unit_test/openmp/TestOpenMP_AtomicOperations_complexdouble.cpp
+++ b/lib/kokkos/core/unit_test/openmp/TestOpenMP_AtomicOperations_complexdouble.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -41,6 +42,5 @@
 //@HEADER
 */
 
-#include<openmp/TestOpenMP_Category.hpp>
-#include<TestAtomicOperations_complexdouble.hpp>
-
+#include <openmp/TestOpenMP_Category.hpp>
+#include <TestAtomicOperations_complexdouble.hpp>
diff --git a/lib/kokkos/core/unit_test/openmp/TestOpenMP_AtomicOperations_complexfloat.cpp b/lib/kokkos/core/unit_test/openmp/TestOpenMP_AtomicOperations_complexfloat.cpp
index cbaf47683a..a9decbad99 100644
--- a/lib/kokkos/core/unit_test/openmp/TestOpenMP_AtomicOperations_complexfloat.cpp
+++ b/lib/kokkos/core/unit_test/openmp/TestOpenMP_AtomicOperations_complexfloat.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -41,6 +42,5 @@
 //@HEADER
 */
 
-#include<openmp/TestOpenMP_Category.hpp>
-#include<TestAtomicOperations_complexfloat.hpp>
-
+#include <openmp/TestOpenMP_Category.hpp>
+#include <TestAtomicOperations_complexfloat.hpp>
diff --git a/lib/kokkos/core/unit_test/openmp/TestOpenMP_AtomicOperations_double.cpp b/lib/kokkos/core/unit_test/openmp/TestOpenMP_AtomicOperations_double.cpp
index 234e0bb007..9de85e155b 100644
--- a/lib/kokkos/core/unit_test/openmp/TestOpenMP_AtomicOperations_double.cpp
+++ b/lib/kokkos/core/unit_test/openmp/TestOpenMP_AtomicOperations_double.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -41,6 +42,5 @@
 //@HEADER
 */
 
-#include<openmp/TestOpenMP_Category.hpp>
-#include<TestAtomicOperations_double.hpp>
-
+#include <openmp/TestOpenMP_Category.hpp>
+#include <TestAtomicOperations_double.hpp>
diff --git a/lib/kokkos/core/unit_test/openmp/TestOpenMP_AtomicOperations_float.cpp b/lib/kokkos/core/unit_test/openmp/TestOpenMP_AtomicOperations_float.cpp
index ce0950210d..8248ee68c0 100644
--- a/lib/kokkos/core/unit_test/openmp/TestOpenMP_AtomicOperations_float.cpp
+++ b/lib/kokkos/core/unit_test/openmp/TestOpenMP_AtomicOperations_float.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -41,6 +42,5 @@
 //@HEADER
 */
 
-#include<openmp/TestOpenMP_Category.hpp>
-#include<TestAtomicOperations_float.hpp>
-
+#include <openmp/TestOpenMP_Category.hpp>
+#include <TestAtomicOperations_float.hpp>
diff --git a/lib/kokkos/core/unit_test/openmp/TestOpenMP_AtomicOperations_int.cpp b/lib/kokkos/core/unit_test/openmp/TestOpenMP_AtomicOperations_int.cpp
index fe68158c93..524305f3a3 100644
--- a/lib/kokkos/core/unit_test/openmp/TestOpenMP_AtomicOperations_int.cpp
+++ b/lib/kokkos/core/unit_test/openmp/TestOpenMP_AtomicOperations_int.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -41,6 +42,5 @@
 //@HEADER
 */
 
-#include<openmp/TestOpenMP_Category.hpp>
-#include<TestAtomicOperations_int.hpp>
-
+#include <openmp/TestOpenMP_Category.hpp>
+#include <TestAtomicOperations_int.hpp>
diff --git a/lib/kokkos/core/unit_test/openmp/TestOpenMP_AtomicOperations_longint.cpp b/lib/kokkos/core/unit_test/openmp/TestOpenMP_AtomicOperations_longint.cpp
index 9a8d881e24..06375942e0 100644
--- a/lib/kokkos/core/unit_test/openmp/TestOpenMP_AtomicOperations_longint.cpp
+++ b/lib/kokkos/core/unit_test/openmp/TestOpenMP_AtomicOperations_longint.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -41,6 +42,5 @@
 //@HEADER
 */
 
-#include<openmp/TestOpenMP_Category.hpp>
-#include<TestAtomicOperations_longint.hpp>
-
+#include <openmp/TestOpenMP_Category.hpp>
+#include <TestAtomicOperations_longint.hpp>
diff --git a/lib/kokkos/core/unit_test/openmp/TestOpenMP_AtomicOperations_longlongint.cpp b/lib/kokkos/core/unit_test/openmp/TestOpenMP_AtomicOperations_longlongint.cpp
index 4418850e42..4e72e64335 100644
--- a/lib/kokkos/core/unit_test/openmp/TestOpenMP_AtomicOperations_longlongint.cpp
+++ b/lib/kokkos/core/unit_test/openmp/TestOpenMP_AtomicOperations_longlongint.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -41,6 +42,5 @@
 //@HEADER
 */
 
-#include<openmp/TestOpenMP_Category.hpp>
-#include<TestAtomicOperations_longlongint.hpp>
-
+#include <openmp/TestOpenMP_Category.hpp>
+#include <TestAtomicOperations_longlongint.hpp>
diff --git a/lib/kokkos/core/unit_test/openmp/TestOpenMP_AtomicOperations_unsignedint.cpp b/lib/kokkos/core/unit_test/openmp/TestOpenMP_AtomicOperations_unsignedint.cpp
index 62afa02bb3..485770898b 100644
--- a/lib/kokkos/core/unit_test/openmp/TestOpenMP_AtomicOperations_unsignedint.cpp
+++ b/lib/kokkos/core/unit_test/openmp/TestOpenMP_AtomicOperations_unsignedint.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -41,6 +42,5 @@
 //@HEADER
 */
 
-#include<openmp/TestOpenMP_Category.hpp>
-#include<TestAtomicOperations_unsignedint.hpp>
-
+#include <openmp/TestOpenMP_Category.hpp>
+#include <TestAtomicOperations_unsignedint.hpp>
diff --git a/lib/kokkos/core/unit_test/openmp/TestOpenMP_AtomicOperations_unsignedlongint.cpp b/lib/kokkos/core/unit_test/openmp/TestOpenMP_AtomicOperations_unsignedlongint.cpp
index 6afa317b63..c0922e7849 100644
--- a/lib/kokkos/core/unit_test/openmp/TestOpenMP_AtomicOperations_unsignedlongint.cpp
+++ b/lib/kokkos/core/unit_test/openmp/TestOpenMP_AtomicOperations_unsignedlongint.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -41,6 +42,5 @@
 //@HEADER
 */
 
-#include<openmp/TestOpenMP_Category.hpp>
-#include<TestAtomicOperations_unsignedlongint.hpp>
-
+#include <openmp/TestOpenMP_Category.hpp>
+#include <TestAtomicOperations_unsignedlongint.hpp>
diff --git a/lib/kokkos/core/unit_test/openmp/TestOpenMP_AtomicViews.cpp b/lib/kokkos/core/unit_test/openmp/TestOpenMP_AtomicViews.cpp
index 6e7355ff59..8b495b962b 100644
--- a/lib/kokkos/core/unit_test/openmp/TestOpenMP_AtomicViews.cpp
+++ b/lib/kokkos/core/unit_test/openmp/TestOpenMP_AtomicViews.cpp
@@ -3,10 +3,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -42,6 +43,5 @@
 //@HEADER
 */
 
-#include<openmp/TestOpenMP_Category.hpp>
-#include<TestAtomicViews.hpp>
-
+#include <openmp/TestOpenMP_Category.hpp>
+#include <TestAtomicViews.hpp>
diff --git a/lib/kokkos/core/unit_test/openmp/TestOpenMP_Atomics.cpp b/lib/kokkos/core/unit_test/openmp/TestOpenMP_Atomics.cpp
index ea062b4c0a..123f6f1567 100644
--- a/lib/kokkos/core/unit_test/openmp/TestOpenMP_Atomics.cpp
+++ b/lib/kokkos/core/unit_test/openmp/TestOpenMP_Atomics.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -43,4 +44,3 @@
 
 #include <openmp/TestOpenMP_Category.hpp>
 #include <TestAtomic.hpp>
-
diff --git a/lib/kokkos/core/unit_test/openmp/TestOpenMP_Category.hpp b/lib/kokkos/core/unit_test/openmp/TestOpenMP_Category.hpp
index 96f35ddd18..2cdb378e06 100644
--- a/lib/kokkos/core/unit_test/openmp/TestOpenMP_Category.hpp
+++ b/lib/kokkos/core/unit_test/openmp/TestOpenMP_Category.hpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -46,20 +47,8 @@
 
 #include <gtest/gtest.h>
 
-namespace Test {
-
-class openmp : public ::testing::Test {
-protected:
-  static void SetUpTestCase() {
-  }
-
-  static void TearDownTestCase() {
-  }
-};
-
-} // namespace Test
-
 #define TEST_CATEGORY openmp
+#define TEST_CATEGORY_DEATH openmp_DeathTest
 #define TEST_EXECSPACE Kokkos::OpenMP
 
 #endif
diff --git a/lib/kokkos/core/unit_test/openmp/TestOpenMP_Complex.cpp b/lib/kokkos/core/unit_test/openmp/TestOpenMP_Complex.cpp
index 9040ea5636..e702a2508f 100644
--- a/lib/kokkos/core/unit_test/openmp/TestOpenMP_Complex.cpp
+++ b/lib/kokkos/core/unit_test/openmp/TestOpenMP_Complex.cpp
@@ -3,10 +3,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -42,6 +43,5 @@
 //@HEADER
 */
 
-#include<openmp/TestOpenMP_Category.hpp>
-#include<TestComplex.hpp>
-
+#include <openmp/TestOpenMP_Category.hpp>
+#include <TestComplex.hpp>
diff --git a/lib/kokkos/core/unit_test/openmp/TestOpenMP_Crs.cpp b/lib/kokkos/core/unit_test/openmp/TestOpenMP_Crs.cpp
index 1f97bb95d1..49615f955e 100644
--- a/lib/kokkos/core/unit_test/openmp/TestOpenMP_Crs.cpp
+++ b/lib/kokkos/core/unit_test/openmp/TestOpenMP_Crs.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
diff --git a/lib/kokkos/core/unit_test/openmp/TestOpenMP_DeepCopyAlignment.cpp b/lib/kokkos/core/unit_test/openmp/TestOpenMP_DeepCopyAlignment.cpp
index bd628e6958..a15f5dcf1f 100644
--- a/lib/kokkos/core/unit_test/openmp/TestOpenMP_DeepCopyAlignment.cpp
+++ b/lib/kokkos/core/unit_test/openmp/TestOpenMP_DeepCopyAlignment.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
diff --git a/lib/kokkos/core/unit_test/openmp/TestOpenMP_FunctorAnalysis.cpp b/lib/kokkos/core/unit_test/openmp/TestOpenMP_FunctorAnalysis.cpp
new file mode 100644
index 0000000000..ae4b1d0b2d
--- /dev/null
+++ b/lib/kokkos/core/unit_test/openmp/TestOpenMP_FunctorAnalysis.cpp
@@ -0,0 +1,47 @@
+
+/*
+//@HEADER
+// ************************************************************************
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
+// the U.S. Government retains certain rights in this software.
+//
+// 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 Corporation nor the names of the
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 NTESS OR THE
+// 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.
+//
+// Questions? Contact Christian R. Trott (crtrott@sandia.gov)
+//
+// ************************************************************************
+//@HEADER
+*/
+
+#include <openmp/TestOpenMP_Category.hpp>
+#include <TestFunctorAnalysis.hpp>
diff --git a/lib/kokkos/core/unit_test/openmp/TestOpenMP_Init.cpp b/lib/kokkos/core/unit_test/openmp/TestOpenMP_Init.cpp
index 48c033a735..8c49b6692d 100644
--- a/lib/kokkos/core/unit_test/openmp/TestOpenMP_Init.cpp
+++ b/lib/kokkos/core/unit_test/openmp/TestOpenMP_Init.cpp
@@ -3,10 +3,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -42,9 +43,7 @@
 //@HEADER
 */
 
-#include<openmp/TestOpenMP_Category.hpp>
-#include<TestInit.hpp>
-#include<TestCompilerMacros.hpp>
-#include<TestPolicyConstruction.hpp>
-
-
+#include <openmp/TestOpenMP_Category.hpp>
+#include <TestInit.hpp>
+#include <TestCompilerMacros.hpp>
+#include <TestPolicyConstruction.hpp>
diff --git a/lib/kokkos/core/unit_test/openmp/TestOpenMP_InterOp.cpp b/lib/kokkos/core/unit_test/openmp/TestOpenMP_InterOp.cpp
index 148366bc0d..083c94860b 100644
--- a/lib/kokkos/core/unit_test/openmp/TestOpenMP_InterOp.cpp
+++ b/lib/kokkos/core/unit_test/openmp/TestOpenMP_InterOp.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -47,44 +48,42 @@
 
 namespace Test {
 
-// Test whether allocations survive Kokkos initialize/finalize if done via Raw Cuda.
-TEST_F( openmp, raw_openmp_interop )
-{
+// Test whether allocations survive Kokkos initialize/finalize if done via Raw
+// Cuda.
+TEST(openmp, raw_openmp_interop) {
   int count = 0;
-  int num_threads,concurrency;
-  #pragma omp parallel
+  int num_threads, concurrency;
+#pragma omp parallel
   {
-    #pragma omp atomic
+#pragma omp atomic
     count++;
-    if(omp_get_thread_num()==0)
-      num_threads = omp_get_num_threads();
+    if (omp_get_thread_num() == 0) num_threads = omp_get_num_threads();
   }
 
-  ASSERT_EQ(count,num_threads);
+  ASSERT_EQ(count, num_threads);
 
-  Kokkos::InitArguments arguments{-1,-1,-1, false};
+  Kokkos::InitArguments arguments{-1, -1, -1, false};
   Kokkos::initialize(arguments);
 
   count = 0;
-  #pragma omp parallel
+#pragma omp parallel
   {
-    #pragma omp atomic
+#pragma omp atomic
     count++;
   }
 
   concurrency = Kokkos::OpenMP::concurrency();
-  ASSERT_EQ(count,concurrency);
+  ASSERT_EQ(count, concurrency);
 
   Kokkos::finalize();
 
   count = 0;
-  #pragma omp parallel
+#pragma omp parallel
   {
-    #pragma omp atomic
+#pragma omp atomic
     count++;
   }
 
-  ASSERT_EQ(count,concurrency);
-
-}
+  ASSERT_EQ(count, concurrency);
 }
+}  // namespace Test
diff --git a/lib/kokkos/core/unit_test/openmp/TestOpenMP_LocalDeepCopy.cpp b/lib/kokkos/core/unit_test/openmp/TestOpenMP_LocalDeepCopy.cpp
index 8b135ad4a1..6670faf0c2 100644
--- a/lib/kokkos/core/unit_test/openmp/TestOpenMP_LocalDeepCopy.cpp
+++ b/lib/kokkos/core/unit_test/openmp/TestOpenMP_LocalDeepCopy.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -43,4 +44,3 @@
 
 #include <openmp/TestOpenMP_Category.hpp>
 #include <TestLocalDeepCopy.hpp>
-
diff --git a/lib/kokkos/core/unit_test/openmp/TestOpenMP_MDRange_a.cpp b/lib/kokkos/core/unit_test/openmp/TestOpenMP_MDRange_a.cpp
index 40cb88c8c9..6f421e1ac5 100644
--- a/lib/kokkos/core/unit_test/openmp/TestOpenMP_MDRange_a.cpp
+++ b/lib/kokkos/core/unit_test/openmp/TestOpenMP_MDRange_a.cpp
@@ -3,10 +3,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -42,6 +43,5 @@
 //@HEADER
 */
 
-#include<openmp/TestOpenMP_Category.hpp>
-#include<TestMDRange_a.hpp>
-
+#include <openmp/TestOpenMP_Category.hpp>
+#include <TestMDRange_a.hpp>
diff --git a/lib/kokkos/core/unit_test/openmp/TestOpenMP_MDRange_b.cpp b/lib/kokkos/core/unit_test/openmp/TestOpenMP_MDRange_b.cpp
index 0c88b52076..4119ed8a59 100644
--- a/lib/kokkos/core/unit_test/openmp/TestOpenMP_MDRange_b.cpp
+++ b/lib/kokkos/core/unit_test/openmp/TestOpenMP_MDRange_b.cpp
@@ -3,10 +3,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -42,6 +43,5 @@
 //@HEADER
 */
 
-#include<openmp/TestOpenMP_Category.hpp>
-#include<TestMDRange_b.hpp>
-
+#include <openmp/TestOpenMP_Category.hpp>
+#include <TestMDRange_b.hpp>
diff --git a/lib/kokkos/core/unit_test/openmp/TestOpenMP_MDRange_c.cpp b/lib/kokkos/core/unit_test/openmp/TestOpenMP_MDRange_c.cpp
index 372c84c86f..b1d5dd43d4 100644
--- a/lib/kokkos/core/unit_test/openmp/TestOpenMP_MDRange_c.cpp
+++ b/lib/kokkos/core/unit_test/openmp/TestOpenMP_MDRange_c.cpp
@@ -3,10 +3,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -42,6 +43,5 @@
 //@HEADER
 */
 
-#include<openmp/TestOpenMP_Category.hpp>
-#include<TestMDRange_c.hpp>
-
+#include <openmp/TestOpenMP_Category.hpp>
+#include <TestMDRange_c.hpp>
diff --git a/lib/kokkos/core/unit_test/openmp/TestOpenMP_MDRange_d.cpp b/lib/kokkos/core/unit_test/openmp/TestOpenMP_MDRange_d.cpp
index 2e9725c0cd..52c807255d 100644
--- a/lib/kokkos/core/unit_test/openmp/TestOpenMP_MDRange_d.cpp
+++ b/lib/kokkos/core/unit_test/openmp/TestOpenMP_MDRange_d.cpp
@@ -3,10 +3,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -42,6 +43,5 @@
 //@HEADER
 */
 
-#include<openmp/TestOpenMP_Category.hpp>
-#include<TestMDRange_d.hpp>
-
+#include <openmp/TestOpenMP_Category.hpp>
+#include <TestMDRange_d.hpp>
diff --git a/lib/kokkos/core/unit_test/openmp/TestOpenMP_MDRange_e.cpp b/lib/kokkos/core/unit_test/openmp/TestOpenMP_MDRange_e.cpp
index 343ff583b5..011579b551 100644
--- a/lib/kokkos/core/unit_test/openmp/TestOpenMP_MDRange_e.cpp
+++ b/lib/kokkos/core/unit_test/openmp/TestOpenMP_MDRange_e.cpp
@@ -3,10 +3,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -42,6 +43,5 @@
 //@HEADER
 */
 
-#include<openmp/TestOpenMP_Category.hpp>
-#include<TestMDRange_e.hpp>
-
+#include <openmp/TestOpenMP_Category.hpp>
+#include <TestMDRange_e.hpp>
diff --git a/lib/kokkos/core/unit_test/openmp/TestOpenMP_Other.cpp b/lib/kokkos/core/unit_test/openmp/TestOpenMP_Other.cpp
index 0ddd67acf9..6e7463a33f 100644
--- a/lib/kokkos/core/unit_test/openmp/TestOpenMP_Other.cpp
+++ b/lib/kokkos/core/unit_test/openmp/TestOpenMP_Other.cpp
@@ -3,10 +3,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -42,22 +43,21 @@
 //@HEADER
 */
 
-#include<openmp/TestOpenMP_Category.hpp>
-#include<TestTemplateMetaFunctions.hpp>
-#include<TestAggregate.hpp>
-#include<TestMemoryPool.hpp>
-#include<TestCXX11.hpp>
-#include<TestTile.hpp>
+#include <openmp/TestOpenMP_Category.hpp>
+#include <TestTemplateMetaFunctions.hpp>
+#include <TestAggregate.hpp>
+#include <TestMemoryPool.hpp>
+#include <TestCXX11.hpp>
+#include <TestTile.hpp>
 
-#include<TestViewCtorPropEmbeddedDim.hpp>
-#include<TestViewLayoutTiled.hpp>
+#include <TestViewCtorPropEmbeddedDim.hpp>
+#include <TestViewLayoutTiled.hpp>
 
 #include <mutex>
 
 namespace Test {
 
-TEST_F( openmp, partition_master )
-{
+TEST(openmp, partition_master) {
   using Mutex = Kokkos::Experimental::MasterLock<Kokkos::OpenMP>;
 
   Mutex mtx;
@@ -73,13 +73,13 @@ TEST_F( openmp, partition_master )
 
     {
       std::unique_lock<Mutex> lock(mtx);
-      if ( Kokkos::OpenMP::in_parallel() ) {
+      if (Kokkos::OpenMP::in_parallel()) {
         ++errors;
       }
 #ifdef KOKKOS_ENABLE_DEPRECATED_CODE
-      if ( Kokkos::OpenMP::thread_pool_rank() != 0 )
+      if (Kokkos::OpenMP::thread_pool_rank() != 0)
 #else
-      if ( Kokkos::OpenMP::impl_thread_pool_rank() != 0 )
+      if (Kokkos::OpenMP::impl_thread_pool_rank() != 0)
 #endif
       {
         ++errors;
@@ -88,68 +88,67 @@ TEST_F( openmp, partition_master )
 
     {
       int local_errors = 0;
-      Kokkos::parallel_reduce( Kokkos::RangePolicy<Kokkos::OpenMP>(0,1000)
-                           , [pool_size]( const int , int & errs ) {
+      Kokkos::parallel_reduce(
+          Kokkos::RangePolicy<Kokkos::OpenMP>(0, 1000),
+          [pool_size](const int, int& errs) {
 #ifdef KOKKOS_ENABLE_DEPRECATED_CODE
-          if ( Kokkos::OpenMP::thread_pool_size() != pool_size )
+            if (Kokkos::OpenMP::thread_pool_size() != pool_size)
 #else
-          if ( Kokkos::OpenMP::impl_thread_pool_size() != pool_size )
+            if (Kokkos::OpenMP::impl_thread_pool_size() != pool_size)
 #endif
-          {
-            ++errs;
-          }
-        }
-        , local_errors
-      );
-      Kokkos::atomic_add( &errors, local_errors );
+            {
+              ++errs;
+            }
+          },
+          local_errors);
+      Kokkos::atomic_add(&errors, local_errors);
     }
 
-    Kokkos::Experimental::UniqueToken< Kokkos::OpenMP > token;
+    Kokkos::Experimental::UniqueToken<Kokkos::OpenMP> token;
 
-    Kokkos::View<int*, Kokkos::OpenMP> count( "",  token.size() );
+    Kokkos::View<int*, Kokkos::OpenMP> count("", token.size());
 
-    Kokkos::parallel_for( Kokkos::RangePolicy<Kokkos::OpenMP>(0,1000),
-        [=] ( const int ) {
-      int i = token.acquire();
-      ++count[i];
-      token.release(i);
-    });
+    Kokkos::parallel_for(Kokkos::RangePolicy<Kokkos::OpenMP>(0, 1000),
+                         [=](const int) {
+                           int i = token.acquire();
+                           ++count[i];
+                           token.release(i);
+                         });
 
-    Kokkos::View<int,Kokkos::OpenMP> sum ("");
-    Kokkos::parallel_for( Kokkos::RangePolicy<Kokkos::OpenMP>(0,token.size()),
-        [=] ( const int i ) {
-      Kokkos::atomic_add( sum.data(), count[i] );
-    });
+    Kokkos::View<int, Kokkos::OpenMP> sum("");
+    Kokkos::parallel_for(
+        Kokkos::RangePolicy<Kokkos::OpenMP>(0, token.size()),
+        [=](const int i) { Kokkos::atomic_add(sum.data(), count[i]); });
 
     if (sum() != 1000) {
-      Kokkos::atomic_add( &errors, 1 );
+      Kokkos::atomic_add(&errors, 1);
     }
   };
 
-  master(0,1);
+  master(0, 1);
 
-  ASSERT_EQ( errors, 0 );
+  ASSERT_EQ(errors, 0);
 
-  Kokkos::OpenMP::partition_master( master );
-  ASSERT_EQ( errors, 0 );
+  Kokkos::OpenMP::partition_master(master);
+  ASSERT_EQ(errors, 0);
 
-  Kokkos::OpenMP::partition_master( master, 4, 0 );
-  ASSERT_EQ( errors, 0 );
+  Kokkos::OpenMP::partition_master(master, 4, 0);
+  ASSERT_EQ(errors, 0);
 
-  Kokkos::OpenMP::partition_master( master, 0, 4 );
-  ASSERT_EQ( errors, 0 );
+  Kokkos::OpenMP::partition_master(master, 0, 4);
+  ASSERT_EQ(errors, 0);
 
-  Kokkos::OpenMP::partition_master( master, 2, 2 );
-  ASSERT_EQ( errors, 0 );
+  Kokkos::OpenMP::partition_master(master, 2, 2);
+  ASSERT_EQ(errors, 0);
 
-  Kokkos::OpenMP::partition_master( master, 8, 0 );
-  ASSERT_EQ( errors, 0 );
+  Kokkos::OpenMP::partition_master(master, 8, 0);
+  ASSERT_EQ(errors, 0);
 
-  Kokkos::OpenMP::partition_master( master, 0, 8 );
-  ASSERT_EQ( errors, 0 );
+  Kokkos::OpenMP::partition_master(master, 0, 8);
+  ASSERT_EQ(errors, 0);
 
-  Kokkos::OpenMP::partition_master( master, 8, 8 );
-  ASSERT_EQ( errors, 0 );
+  Kokkos::OpenMP::partition_master(master, 8, 8);
+  ASSERT_EQ(errors, 0);
 }
 
-} // namespace Test
+}  // namespace Test
diff --git a/lib/kokkos/core/unit_test/openmp/TestOpenMP_RangePolicy.cpp b/lib/kokkos/core/unit_test/openmp/TestOpenMP_RangePolicy.cpp
index 4fd097c84d..a19697393d 100644
--- a/lib/kokkos/core/unit_test/openmp/TestOpenMP_RangePolicy.cpp
+++ b/lib/kokkos/core/unit_test/openmp/TestOpenMP_RangePolicy.cpp
@@ -3,10 +3,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -42,6 +43,5 @@
 //@HEADER
 */
 
-#include<openmp/TestOpenMP_Category.hpp>
-#include<TestRange.hpp>
-
+#include <openmp/TestOpenMP_Category.hpp>
+#include <TestRange.hpp>
diff --git a/lib/kokkos/core/unit_test/openmp/TestOpenMP_Reducers_a.cpp b/lib/kokkos/core/unit_test/openmp/TestOpenMP_Reducers_a.cpp
index 61537ac934..539720c7a1 100644
--- a/lib/kokkos/core/unit_test/openmp/TestOpenMP_Reducers_a.cpp
+++ b/lib/kokkos/core/unit_test/openmp/TestOpenMP_Reducers_a.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
diff --git a/lib/kokkos/core/unit_test/openmp/TestOpenMP_Reducers_b.cpp b/lib/kokkos/core/unit_test/openmp/TestOpenMP_Reducers_b.cpp
index 686e5a02db..e4a7b029c2 100644
--- a/lib/kokkos/core/unit_test/openmp/TestOpenMP_Reducers_b.cpp
+++ b/lib/kokkos/core/unit_test/openmp/TestOpenMP_Reducers_b.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
diff --git a/lib/kokkos/core/unit_test/openmp/TestOpenMP_Reducers_c.cpp b/lib/kokkos/core/unit_test/openmp/TestOpenMP_Reducers_c.cpp
index 1bed6ce9a7..62f3a1c962 100644
--- a/lib/kokkos/core/unit_test/openmp/TestOpenMP_Reducers_c.cpp
+++ b/lib/kokkos/core/unit_test/openmp/TestOpenMP_Reducers_c.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
diff --git a/lib/kokkos/core/unit_test/openmp/TestOpenMP_Reducers_d.cpp b/lib/kokkos/core/unit_test/openmp/TestOpenMP_Reducers_d.cpp
index 12c7cdd8f2..c8a34e5438 100644
--- a/lib/kokkos/core/unit_test/openmp/TestOpenMP_Reducers_d.cpp
+++ b/lib/kokkos/core/unit_test/openmp/TestOpenMP_Reducers_d.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
diff --git a/lib/kokkos/core/unit_test/openmp/TestOpenMP_Reductions.cpp b/lib/kokkos/core/unit_test/openmp/TestOpenMP_Reductions.cpp
index c4554f2c4e..1eb20ea09e 100644
--- a/lib/kokkos/core/unit_test/openmp/TestOpenMP_Reductions.cpp
+++ b/lib/kokkos/core/unit_test/openmp/TestOpenMP_Reductions.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
diff --git a/lib/kokkos/core/unit_test/openmp/TestOpenMP_Reductions_DeviceView.cpp b/lib/kokkos/core/unit_test/openmp/TestOpenMP_Reductions_DeviceView.cpp
index 99fe5842cb..bd3a059578 100644
--- a/lib/kokkos/core/unit_test/openmp/TestOpenMP_Reductions_DeviceView.cpp
+++ b/lib/kokkos/core/unit_test/openmp/TestOpenMP_Reductions_DeviceView.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
diff --git a/lib/kokkos/core/unit_test/openmp/TestOpenMP_Scan.cpp b/lib/kokkos/core/unit_test/openmp/TestOpenMP_Scan.cpp
index 04a38163a4..f8c58ecfdd 100644
--- a/lib/kokkos/core/unit_test/openmp/TestOpenMP_Scan.cpp
+++ b/lib/kokkos/core/unit_test/openmp/TestOpenMP_Scan.cpp
@@ -3,10 +3,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -42,6 +43,5 @@
 //@HEADER
 */
 
-#include<openmp/TestOpenMP_Category.hpp>
-#include<TestScan.hpp>
-
+#include <openmp/TestOpenMP_Category.hpp>
+#include <TestScan.hpp>
diff --git a/lib/kokkos/core/unit_test/openmp/TestOpenMP_SharedAlloc.cpp b/lib/kokkos/core/unit_test/openmp/TestOpenMP_SharedAlloc.cpp
index 82e9cf6e33..8e386391a8 100644
--- a/lib/kokkos/core/unit_test/openmp/TestOpenMP_SharedAlloc.cpp
+++ b/lib/kokkos/core/unit_test/openmp/TestOpenMP_SharedAlloc.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -46,10 +47,8 @@
 
 namespace Test {
 
-
-TEST_F( TEST_CATEGORY, impl_shared_alloc )
-{
-  test_shared_alloc< Kokkos::HostSpace, TEST_EXECSPACE >();
+TEST(TEST_CATEGORY, impl_shared_alloc) {
+  test_shared_alloc<Kokkos::HostSpace, TEST_EXECSPACE>();
 }
 
-} // namespace Test
+}  // namespace Test
diff --git a/lib/kokkos/core/unit_test/openmp/TestOpenMP_SubView_a.cpp b/lib/kokkos/core/unit_test/openmp/TestOpenMP_SubView_a.cpp
index 8cea3a76cf..a12095720e 100644
--- a/lib/kokkos/core/unit_test/openmp/TestOpenMP_SubView_a.cpp
+++ b/lib/kokkos/core/unit_test/openmp/TestOpenMP_SubView_a.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -46,66 +47,56 @@
 
 namespace Test {
 
-TEST_F( TEST_CATEGORY, view_subview_auto_1d_left )
-{
-  TestViewSubview::test_auto_1d< Kokkos::LayoutLeft, TEST_EXECSPACE >();
+TEST(TEST_CATEGORY, view_subview_auto_1d_left) {
+  TestViewSubview::test_auto_1d<Kokkos::LayoutLeft, TEST_EXECSPACE>();
 }
 
-TEST_F( TEST_CATEGORY, view_subview_auto_1d_right )
-{
-  TestViewSubview::test_auto_1d< Kokkos::LayoutRight, TEST_EXECSPACE >();
+TEST(TEST_CATEGORY, view_subview_auto_1d_right) {
+  TestViewSubview::test_auto_1d<Kokkos::LayoutRight, TEST_EXECSPACE>();
 }
 
-TEST_F( TEST_CATEGORY, view_subview_auto_1d_stride )
-{
-  TestViewSubview::test_auto_1d< Kokkos::LayoutStride, TEST_EXECSPACE >();
+TEST(TEST_CATEGORY, view_subview_auto_1d_stride) {
+  TestViewSubview::test_auto_1d<Kokkos::LayoutStride, TEST_EXECSPACE>();
 }
 
-TEST_F( TEST_CATEGORY, view_subview_assign_strided )
-{
-  TestViewSubview::test_1d_strided_assignment< TEST_EXECSPACE >();
+TEST(TEST_CATEGORY, view_subview_assign_strided) {
+  TestViewSubview::test_1d_strided_assignment<TEST_EXECSPACE>();
 }
 
-TEST_F( TEST_CATEGORY, view_subview_left_0 )
-{
-  TestViewSubview::test_left_0< TEST_EXECSPACE >();
+TEST(TEST_CATEGORY, view_subview_left_0) {
+  TestViewSubview::test_left_0<TEST_EXECSPACE>();
 }
 
-TEST_F( TEST_CATEGORY, view_subview_left_1 )
-{
-  TestViewSubview::test_left_1< TEST_EXECSPACE >();
+TEST(TEST_CATEGORY, view_subview_left_1) {
+  TestViewSubview::test_left_1<TEST_EXECSPACE>();
 }
 
-TEST_F( TEST_CATEGORY, view_subview_left_2 )
-{
-  TestViewSubview::test_left_2< TEST_EXECSPACE >();
+TEST(TEST_CATEGORY, view_subview_left_2) {
+  TestViewSubview::test_left_2<TEST_EXECSPACE>();
 }
 
-TEST_F( TEST_CATEGORY, view_subview_left_3 )
-{
-  TestViewSubview::test_left_3< TEST_EXECSPACE >();
+TEST(TEST_CATEGORY, view_subview_left_3) {
+  TestViewSubview::test_left_3<TEST_EXECSPACE>();
 }
 
-TEST_F( TEST_CATEGORY, view_subview_right_0 )
-{
-  TestViewSubview::test_right_0< TEST_EXECSPACE >();
+TEST(TEST_CATEGORY, view_subview_right_0) {
+  TestViewSubview::test_right_0<TEST_EXECSPACE>();
 }
 
-TEST_F( TEST_CATEGORY, view_subview_right_1 )
-{
-  TestViewSubview::test_right_1< TEST_EXECSPACE >();
+TEST(TEST_CATEGORY, view_subview_right_1) {
+  TestViewSubview::test_right_1<TEST_EXECSPACE>();
 }
 
-TEST_F( TEST_CATEGORY, view_subview_right_3 )
-{
-  TestViewSubview::test_right_3< TEST_EXECSPACE >();
+TEST(TEST_CATEGORY, view_subview_right_3) {
+  TestViewSubview::test_right_3<TEST_EXECSPACE>();
 }
 
-TEST_F(TEST_CATEGORY, view_static_tests)
-{
-  TestViewSubview::TestSubviewStaticSizes<TEST_EXECSPACE, Kokkos::LayoutLeft>()();
-  TestViewSubview::TestSubviewStaticSizes<TEST_EXECSPACE, Kokkos::LayoutRight>()();
+TEST(TEST_CATEGORY, view_static_tests) {
+  TestViewSubview::TestSubviewStaticSizes<TEST_EXECSPACE,
+                                          Kokkos::LayoutLeft>()();
+  TestViewSubview::TestSubviewStaticSizes<TEST_EXECSPACE,
+                                          Kokkos::LayoutRight>()();
   TestViewSubview::TestExtentsStaticTests<TEST_EXECSPACE>();
 }
 
-} // namespace Test
+}  // namespace Test
diff --git a/lib/kokkos/core/unit_test/openmp/TestOpenMP_SubView_b.cpp b/lib/kokkos/core/unit_test/openmp/TestOpenMP_SubView_b.cpp
index 3bf63b641a..fc34c149f2 100644
--- a/lib/kokkos/core/unit_test/openmp/TestOpenMP_SubView_b.cpp
+++ b/lib/kokkos/core/unit_test/openmp/TestOpenMP_SubView_b.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -46,18 +47,20 @@
 
 namespace Test {
 
-TEST_F( TEST_CATEGORY, view_subview_layoutleft_to_layoutleft )
-{
-  TestViewSubview::test_layoutleft_to_layoutleft< TEST_EXECSPACE >();
-  TestViewSubview::test_layoutleft_to_layoutleft< TEST_EXECSPACE, Kokkos::MemoryTraits<Kokkos::Atomic> >();
-  TestViewSubview::test_layoutleft_to_layoutleft< TEST_EXECSPACE, Kokkos::MemoryTraits<Kokkos::RandomAccess> >();
+TEST(TEST_CATEGORY, view_subview_layoutleft_to_layoutleft) {
+  TestViewSubview::test_layoutleft_to_layoutleft<TEST_EXECSPACE>();
+  TestViewSubview::test_layoutleft_to_layoutleft<
+      TEST_EXECSPACE, Kokkos::MemoryTraits<Kokkos::Atomic> >();
+  TestViewSubview::test_layoutleft_to_layoutleft<
+      TEST_EXECSPACE, Kokkos::MemoryTraits<Kokkos::RandomAccess> >();
 }
 
-TEST_F( TEST_CATEGORY, view_subview_layoutright_to_layoutright )
-{
-  TestViewSubview::test_layoutright_to_layoutright< TEST_EXECSPACE >();
-  TestViewSubview::test_layoutright_to_layoutright< TEST_EXECSPACE, Kokkos::MemoryTraits<Kokkos::Atomic> >();
-  TestViewSubview::test_layoutright_to_layoutright< TEST_EXECSPACE, Kokkos::MemoryTraits<Kokkos::RandomAccess> >();
+TEST(TEST_CATEGORY, view_subview_layoutright_to_layoutright) {
+  TestViewSubview::test_layoutright_to_layoutright<TEST_EXECSPACE>();
+  TestViewSubview::test_layoutright_to_layoutright<
+      TEST_EXECSPACE, Kokkos::MemoryTraits<Kokkos::Atomic> >();
+  TestViewSubview::test_layoutright_to_layoutright<
+      TEST_EXECSPACE, Kokkos::MemoryTraits<Kokkos::RandomAccess> >();
 }
 
-} // namespace Test
+}  // namespace Test
diff --git a/lib/kokkos/core/unit_test/openmp/TestOpenMP_SubView_c01.cpp b/lib/kokkos/core/unit_test/openmp/TestOpenMP_SubView_c01.cpp
index 676ef18a38..402072b680 100644
--- a/lib/kokkos/core/unit_test/openmp/TestOpenMP_SubView_c01.cpp
+++ b/lib/kokkos/core/unit_test/openmp/TestOpenMP_SubView_c01.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -46,9 +47,8 @@
 
 namespace Test {
 
-TEST_F( TEST_CATEGORY, view_subview_1d_assign )
-{
-  TestViewSubview::test_1d_assign< TEST_EXECSPACE >();
+TEST(TEST_CATEGORY, view_subview_1d_assign) {
+  TestViewSubview::test_1d_assign<TEST_EXECSPACE>();
 }
 
-} // namespace Test
+}  // namespace Test
diff --git a/lib/kokkos/core/unit_test/openmp/TestOpenMP_SubView_c02.cpp b/lib/kokkos/core/unit_test/openmp/TestOpenMP_SubView_c02.cpp
index f1af02c73a..9aba989f59 100644
--- a/lib/kokkos/core/unit_test/openmp/TestOpenMP_SubView_c02.cpp
+++ b/lib/kokkos/core/unit_test/openmp/TestOpenMP_SubView_c02.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -46,9 +47,9 @@
 
 namespace Test {
 
-TEST_F( TEST_CATEGORY, view_subview_1d_assign_atomic )
-{
-  TestViewSubview::test_1d_assign< TEST_EXECSPACE, Kokkos::MemoryTraits<Kokkos::Atomic> >();
+TEST(TEST_CATEGORY, view_subview_1d_assign_atomic) {
+  TestViewSubview::test_1d_assign<TEST_EXECSPACE,
+                                  Kokkos::MemoryTraits<Kokkos::Atomic> >();
 }
 
-} // namespace Test
+}  // namespace Test
diff --git a/lib/kokkos/core/unit_test/openmp/TestOpenMP_SubView_c03.cpp b/lib/kokkos/core/unit_test/openmp/TestOpenMP_SubView_c03.cpp
index b5dc8b4f84..49db066f44 100644
--- a/lib/kokkos/core/unit_test/openmp/TestOpenMP_SubView_c03.cpp
+++ b/lib/kokkos/core/unit_test/openmp/TestOpenMP_SubView_c03.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -46,9 +47,9 @@
 
 namespace Test {
 
-TEST_F( TEST_CATEGORY, view_subview_1d_assign_randomaccess )
-{
-  TestViewSubview::test_1d_assign< TEST_EXECSPACE, Kokkos::MemoryTraits<Kokkos::RandomAccess> >();
+TEST(TEST_CATEGORY, view_subview_1d_assign_randomaccess) {
+  TestViewSubview::test_1d_assign<
+      TEST_EXECSPACE, Kokkos::MemoryTraits<Kokkos::RandomAccess> >();
 }
 
-} // namespace Test
+}  // namespace Test
diff --git a/lib/kokkos/core/unit_test/openmp/TestOpenMP_SubView_c04.cpp b/lib/kokkos/core/unit_test/openmp/TestOpenMP_SubView_c04.cpp
index 7c008a6bb2..a4112f4420 100644
--- a/lib/kokkos/core/unit_test/openmp/TestOpenMP_SubView_c04.cpp
+++ b/lib/kokkos/core/unit_test/openmp/TestOpenMP_SubView_c04.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -46,9 +47,8 @@
 
 namespace Test {
 
-TEST_F( TEST_CATEGORY, view_subview_2d_from_3d )
-{
-  TestViewSubview::test_2d_subview_3d< TEST_EXECSPACE >();
+TEST(TEST_CATEGORY, view_subview_2d_from_3d) {
+  TestViewSubview::test_2d_subview_3d<TEST_EXECSPACE>();
 }
 
-} // namespace Test
+}  // namespace Test
diff --git a/lib/kokkos/core/unit_test/openmp/TestOpenMP_SubView_c05.cpp b/lib/kokkos/core/unit_test/openmp/TestOpenMP_SubView_c05.cpp
index 4f43cbc877..691ddbb961 100644
--- a/lib/kokkos/core/unit_test/openmp/TestOpenMP_SubView_c05.cpp
+++ b/lib/kokkos/core/unit_test/openmp/TestOpenMP_SubView_c05.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -46,9 +47,9 @@
 
 namespace Test {
 
-TEST_F( openmp, view_subview_2d_from_3d_atomic )
-{
-  TestViewSubview::test_2d_subview_3d< TEST_EXECSPACE, Kokkos::MemoryTraits<Kokkos::Atomic> >();
+TEST(openmp, view_subview_2d_from_3d_atomic) {
+  TestViewSubview::test_2d_subview_3d<TEST_EXECSPACE,
+                                      Kokkos::MemoryTraits<Kokkos::Atomic> >();
 }
 
-} // namespace Test
+}  // namespace Test
diff --git a/lib/kokkos/core/unit_test/openmp/TestOpenMP_SubView_c06.cpp b/lib/kokkos/core/unit_test/openmp/TestOpenMP_SubView_c06.cpp
index fbb55ee7c7..b65b1e228c 100644
--- a/lib/kokkos/core/unit_test/openmp/TestOpenMP_SubView_c06.cpp
+++ b/lib/kokkos/core/unit_test/openmp/TestOpenMP_SubView_c06.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -46,9 +47,9 @@
 
 namespace Test {
 
-TEST_F( TEST_CATEGORY, view_subview_2d_from_3d_randomaccess )
-{
-  TestViewSubview::test_2d_subview_3d< TEST_EXECSPACE, Kokkos::MemoryTraits<Kokkos::RandomAccess> >();
+TEST(TEST_CATEGORY, view_subview_2d_from_3d_randomaccess) {
+  TestViewSubview::test_2d_subview_3d<
+      TEST_EXECSPACE, Kokkos::MemoryTraits<Kokkos::RandomAccess> >();
 }
 
-} // namespace Test
+}  // namespace Test
diff --git a/lib/kokkos/core/unit_test/openmp/TestOpenMP_SubView_c07.cpp b/lib/kokkos/core/unit_test/openmp/TestOpenMP_SubView_c07.cpp
index 503997cfca..1b81dc9450 100644
--- a/lib/kokkos/core/unit_test/openmp/TestOpenMP_SubView_c07.cpp
+++ b/lib/kokkos/core/unit_test/openmp/TestOpenMP_SubView_c07.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -46,9 +47,8 @@
 
 namespace Test {
 
-TEST_F( TEST_CATEGORY, view_subview_3d_from_5d_left )
-{
-  TestViewSubview::test_3d_subview_5d_left< TEST_EXECSPACE >();
+TEST(TEST_CATEGORY, view_subview_3d_from_5d_left) {
+  TestViewSubview::test_3d_subview_5d_left<TEST_EXECSPACE>();
 }
 
-} // namespace Test
+}  // namespace Test
diff --git a/lib/kokkos/core/unit_test/openmp/TestOpenMP_SubView_c08.cpp b/lib/kokkos/core/unit_test/openmp/TestOpenMP_SubView_c08.cpp
index 34133feb1b..5dd92f1c02 100644
--- a/lib/kokkos/core/unit_test/openmp/TestOpenMP_SubView_c08.cpp
+++ b/lib/kokkos/core/unit_test/openmp/TestOpenMP_SubView_c08.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -46,9 +47,9 @@
 
 namespace Test {
 
-TEST_F( TEST_CATEGORY, view_subview_3d_from_5d_left_atomic )
-{
-  TestViewSubview::test_3d_subview_5d_left< TEST_EXECSPACE, Kokkos::MemoryTraits<Kokkos::Atomic> >();
+TEST(TEST_CATEGORY, view_subview_3d_from_5d_left_atomic) {
+  TestViewSubview::test_3d_subview_5d_left<
+      TEST_EXECSPACE, Kokkos::MemoryTraits<Kokkos::Atomic> >();
 }
 
-} // namespace Test
+}  // namespace Test
diff --git a/lib/kokkos/core/unit_test/openmp/TestOpenMP_SubView_c09.cpp b/lib/kokkos/core/unit_test/openmp/TestOpenMP_SubView_c09.cpp
index d70cb0bd25..9216956ede 100644
--- a/lib/kokkos/core/unit_test/openmp/TestOpenMP_SubView_c09.cpp
+++ b/lib/kokkos/core/unit_test/openmp/TestOpenMP_SubView_c09.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -46,9 +47,9 @@
 
 namespace Test {
 
-TEST_F( TEST_CATEGORY, view_subview_3d_from_5d_left_randomaccess )
-{
-  TestViewSubview::test_3d_subview_5d_left< TEST_EXECSPACE, Kokkos::MemoryTraits<Kokkos::RandomAccess> >();
+TEST(TEST_CATEGORY, view_subview_3d_from_5d_left_randomaccess) {
+  TestViewSubview::test_3d_subview_5d_left<
+      TEST_EXECSPACE, Kokkos::MemoryTraits<Kokkos::RandomAccess> >();
 }
 
-} // namespace Test
+}  // namespace Test
diff --git a/lib/kokkos/core/unit_test/openmp/TestOpenMP_SubView_c10.cpp b/lib/kokkos/core/unit_test/openmp/TestOpenMP_SubView_c10.cpp
index 72bbb2c36b..b8252d3cb7 100644
--- a/lib/kokkos/core/unit_test/openmp/TestOpenMP_SubView_c10.cpp
+++ b/lib/kokkos/core/unit_test/openmp/TestOpenMP_SubView_c10.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -46,9 +47,8 @@
 
 namespace Test {
 
-TEST_F( TEST_CATEGORY, view_subview_3d_from_5d_right )
-{
-  TestViewSubview::test_3d_subview_5d_right< TEST_EXECSPACE >();
+TEST(TEST_CATEGORY, view_subview_3d_from_5d_right) {
+  TestViewSubview::test_3d_subview_5d_right<TEST_EXECSPACE>();
 }
 
-} // namespace Test
+}  // namespace Test
diff --git a/lib/kokkos/core/unit_test/openmp/TestOpenMP_SubView_c11.cpp b/lib/kokkos/core/unit_test/openmp/TestOpenMP_SubView_c11.cpp
index f715f70e77..4b9485357e 100644
--- a/lib/kokkos/core/unit_test/openmp/TestOpenMP_SubView_c11.cpp
+++ b/lib/kokkos/core/unit_test/openmp/TestOpenMP_SubView_c11.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -46,9 +47,9 @@
 
 namespace Test {
 
-TEST_F( TEST_CATEGORY, view_subview_3d_from_5d_right_atomic )
-{
-  TestViewSubview::test_3d_subview_5d_right< TEST_EXECSPACE, Kokkos::MemoryTraits<Kokkos::Atomic> >();
+TEST(TEST_CATEGORY, view_subview_3d_from_5d_right_atomic) {
+  TestViewSubview::test_3d_subview_5d_right<
+      TEST_EXECSPACE, Kokkos::MemoryTraits<Kokkos::Atomic> >();
 }
 
-} // namespace Test
+}  // namespace Test
diff --git a/lib/kokkos/core/unit_test/openmp/TestOpenMP_SubView_c12.cpp b/lib/kokkos/core/unit_test/openmp/TestOpenMP_SubView_c12.cpp
index c93581112a..c1a7250eb7 100644
--- a/lib/kokkos/core/unit_test/openmp/TestOpenMP_SubView_c12.cpp
+++ b/lib/kokkos/core/unit_test/openmp/TestOpenMP_SubView_c12.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -46,9 +47,9 @@
 
 namespace Test {
 
-TEST_F( TEST_CATEGORY, view_subview_3d_from_5d_right_randomaccess )
-{
-  TestViewSubview::test_3d_subview_5d_right< TEST_EXECSPACE, Kokkos::MemoryTraits<Kokkos::RandomAccess> >();
+TEST(TEST_CATEGORY, view_subview_3d_from_5d_right_randomaccess) {
+  TestViewSubview::test_3d_subview_5d_right<
+      TEST_EXECSPACE, Kokkos::MemoryTraits<Kokkos::RandomAccess> >();
 }
 
-} // namespace Test
+}  // namespace Test
diff --git a/lib/kokkos/core/unit_test/openmp/TestOpenMP_SubView_c13.cpp b/lib/kokkos/core/unit_test/openmp/TestOpenMP_SubView_c13.cpp
index 594c62d145..ab9f668e65 100644
--- a/lib/kokkos/core/unit_test/openmp/TestOpenMP_SubView_c13.cpp
+++ b/lib/kokkos/core/unit_test/openmp/TestOpenMP_SubView_c13.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -46,9 +47,8 @@
 
 namespace Test {
 
-TEST_F( TEST_CATEGORY, view_test_unmanaged_subview_reset )
-{
-  TestViewSubview::test_unmanaged_subview_reset< TEST_EXECSPACE >();
+TEST(TEST_CATEGORY, view_test_unmanaged_subview_reset) {
+  TestViewSubview::test_unmanaged_subview_reset<TEST_EXECSPACE>();
 }
 
-} // namespace Test
+}  // namespace Test
diff --git a/lib/kokkos/core/unit_test/openmp/TestOpenMP_Task.cpp b/lib/kokkos/core/unit_test/openmp/TestOpenMP_Task.cpp
index 95a6cbdf9b..5e67a34710 100644
--- a/lib/kokkos/core/unit_test/openmp/TestOpenMP_Task.cpp
+++ b/lib/kokkos/core/unit_test/openmp/TestOpenMP_Task.cpp
@@ -3,10 +3,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -42,6 +43,5 @@
 //@HEADER
 */
 
-#include<openmp/TestOpenMP_Category.hpp>
-#include<TestTaskScheduler.hpp>
-
+#include <openmp/TestOpenMP_Category.hpp>
+#include <TestTaskScheduler.hpp>
diff --git a/lib/kokkos/core/unit_test/openmp/TestOpenMP_Team.cpp b/lib/kokkos/core/unit_test/openmp/TestOpenMP_Team.cpp
index e5b900ac58..c389ebac37 100644
--- a/lib/kokkos/core/unit_test/openmp/TestOpenMP_Team.cpp
+++ b/lib/kokkos/core/unit_test/openmp/TestOpenMP_Team.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -46,45 +47,59 @@
 
 namespace Test {
 
-TEST_F( TEST_CATEGORY, team_for )
-{
-  TestTeamPolicy< TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Static> >::test_for( 0 );
-  TestTeamPolicy< TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Dynamic> >::test_for( 0 );
+TEST(TEST_CATEGORY, team_for) {
+  TestTeamPolicy<TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Static> >::test_for(
+      0);
+  TestTeamPolicy<TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Dynamic> >::test_for(
+      0);
 
-  TestTeamPolicy< TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Static> >::test_for( 2 );
-  TestTeamPolicy< TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Dynamic> >::test_for( 2 );
+  TestTeamPolicy<TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Static> >::test_for(
+      2);
+  TestTeamPolicy<TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Dynamic> >::test_for(
+      2);
 
-  TestTeamPolicy< TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Static> >::test_for( 1000 );
-  TestTeamPolicy< TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Dynamic> >::test_for( 1000 );
+  TestTeamPolicy<TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Static> >::test_for(
+      1000);
+  TestTeamPolicy<TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Dynamic> >::test_for(
+      1000);
 }
 
-
-TEST_F( TEST_CATEGORY, team_reduce )
-{
-  TestTeamPolicy< TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Static> >::test_reduce( 0 );
-  TestTeamPolicy< TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Dynamic> >::test_reduce( 0 );
-  TestTeamPolicy< TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Static> >::test_reduce( 2 );
-  TestTeamPolicy< TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Dynamic> >::test_reduce( 2 );
-  TestTeamPolicy< TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Static> >::test_reduce( 1000 );
-  TestTeamPolicy< TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Dynamic> >::test_reduce( 1000 );
+TEST(TEST_CATEGORY, team_reduce) {
+  TestTeamPolicy<TEST_EXECSPACE,
+                 Kokkos::Schedule<Kokkos::Static> >::test_reduce(0);
+  TestTeamPolicy<TEST_EXECSPACE,
+                 Kokkos::Schedule<Kokkos::Dynamic> >::test_reduce(0);
+  TestTeamPolicy<TEST_EXECSPACE,
+                 Kokkos::Schedule<Kokkos::Static> >::test_reduce(2);
+  TestTeamPolicy<TEST_EXECSPACE,
+                 Kokkos::Schedule<Kokkos::Dynamic> >::test_reduce(2);
+  TestTeamPolicy<TEST_EXECSPACE,
+                 Kokkos::Schedule<Kokkos::Static> >::test_reduce(1000);
+  TestTeamPolicy<TEST_EXECSPACE,
+                 Kokkos::Schedule<Kokkos::Dynamic> >::test_reduce(1000);
 }
 
-TEST_F( TEST_CATEGORY, team_broadcast )
-{
-  TestTeamBroadcast< TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Static> >::test_teambroadcast( 0 );
-  TestTeamBroadcast< TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Dynamic> >::test_teambroadcast( 0 );
+TEST(TEST_CATEGORY, team_broadcast) {
+  TestTeamBroadcast<TEST_EXECSPACE,
+                    Kokkos::Schedule<Kokkos::Static> >::test_teambroadcast(0);
+  TestTeamBroadcast<TEST_EXECSPACE,
+                    Kokkos::Schedule<Kokkos::Dynamic> >::test_teambroadcast(0);
 
-  TestTeamBroadcast< TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Static> >::test_teambroadcast( 2 );
-  TestTeamBroadcast< TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Dynamic> >::test_teambroadcast( 2 );
+  TestTeamBroadcast<TEST_EXECSPACE,
+                    Kokkos::Schedule<Kokkos::Static> >::test_teambroadcast(2);
+  TestTeamBroadcast<TEST_EXECSPACE,
+                    Kokkos::Schedule<Kokkos::Dynamic> >::test_teambroadcast(2);
 
-  TestTeamBroadcast< TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Static> >::test_teambroadcast( 16 );
-  TestTeamBroadcast< TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Dynamic> >::test_teambroadcast( 16 );
+  TestTeamBroadcast<TEST_EXECSPACE,
+                    Kokkos::Schedule<Kokkos::Static> >::test_teambroadcast(16);
+  TestTeamBroadcast<TEST_EXECSPACE,
+                    Kokkos::Schedule<Kokkos::Dynamic> >::test_teambroadcast(16);
 
-  TestTeamBroadcast< TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Static> >::test_teambroadcast( 1000 );
-  TestTeamBroadcast< TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Dynamic> >::test_teambroadcast( 1000 );
-}
+  TestTeamBroadcast<TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Static> >::
+      test_teambroadcast(1000);
+  TestTeamBroadcast<TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Dynamic> >::
+      test_teambroadcast(1000);
 }
+}  // namespace Test
 
 #include <TestTeamVector.hpp>
-
-
diff --git a/lib/kokkos/core/unit_test/openmp/TestOpenMP_TeamReductionScan.cpp b/lib/kokkos/core/unit_test/openmp/TestOpenMP_TeamReductionScan.cpp
index 482005c883..f6f386032b 100644
--- a/lib/kokkos/core/unit_test/openmp/TestOpenMP_TeamReductionScan.cpp
+++ b/lib/kokkos/core/unit_test/openmp/TestOpenMP_TeamReductionScan.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -46,36 +47,35 @@
 
 namespace Test {
 
-
-TEST_F( TEST_CATEGORY, team_scan )
-{
-  TestScanTeam< TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Static> >( 0 );
-  TestScanTeam< TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Dynamic> >( 0 );
-  TestScanTeam< TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Static> >( 10 );
-  TestScanTeam< TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Dynamic> >( 10 );
-  TestScanTeam< TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Static> >( 10000 );
-  TestScanTeam< TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Dynamic> >( 10000 );
+TEST(TEST_CATEGORY, team_scan) {
+  TestScanTeam<TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Static> >(0);
+  TestScanTeam<TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Dynamic> >(0);
+  TestScanTeam<TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Static> >(10);
+  TestScanTeam<TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Dynamic> >(10);
+  TestScanTeam<TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Static> >(10000);
+  TestScanTeam<TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Dynamic> >(10000);
 }
 
-TEST_F( TEST_CATEGORY, team_long_reduce )
-{
-  TestReduceTeam< long, TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Static> >( 0 );
-  TestReduceTeam< long, TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Dynamic> >( 0 );
-  TestReduceTeam< long, TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Static> >( 3 );
-  TestReduceTeam< long, TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Dynamic> >( 3 );
-  TestReduceTeam< long, TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Static> >( 100000 );
-  TestReduceTeam< long, TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Dynamic> >( 100000 );
+TEST(TEST_CATEGORY, team_long_reduce) {
+  TestReduceTeam<long, TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Static> >(0);
+  TestReduceTeam<long, TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Dynamic> >(0);
+  TestReduceTeam<long, TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Static> >(3);
+  TestReduceTeam<long, TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Dynamic> >(3);
+  TestReduceTeam<long, TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Static> >(
+      100000);
+  TestReduceTeam<long, TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Dynamic> >(
+      100000);
 }
 
-TEST_F( TEST_CATEGORY, team_double_reduce )
-{
-  TestReduceTeam< double, TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Static> >( 0 );
-  TestReduceTeam< double, TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Dynamic> >( 0 );
-  TestReduceTeam< double, TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Static> >( 3 );
-  TestReduceTeam< double, TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Dynamic> >( 3 );
-  TestReduceTeam< double, TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Static> >( 100000 );
-  TestReduceTeam< double, TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Dynamic> >( 100000 );
+TEST(TEST_CATEGORY, team_double_reduce) {
+  TestReduceTeam<double, TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Static> >(0);
+  TestReduceTeam<double, TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Dynamic> >(0);
+  TestReduceTeam<double, TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Static> >(3);
+  TestReduceTeam<double, TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Dynamic> >(3);
+  TestReduceTeam<double, TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Static> >(
+      100000);
+  TestReduceTeam<double, TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Dynamic> >(
+      100000);
 }
 
-} // namespace Test
-
+}  // namespace Test
diff --git a/lib/kokkos/core/unit_test/openmp/TestOpenMP_TeamScratch.cpp b/lib/kokkos/core/unit_test/openmp/TestOpenMP_TeamScratch.cpp
index 64d7575339..5c283a6226 100644
--- a/lib/kokkos/core/unit_test/openmp/TestOpenMP_TeamScratch.cpp
+++ b/lib/kokkos/core/unit_test/openmp/TestOpenMP_TeamScratch.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -46,41 +47,35 @@
 
 namespace Test {
 
-TEST_F( TEST_CATEGORY, team_shared_request )
-{
-  TestSharedTeam< TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Static> >();
-  TestSharedTeam< TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Dynamic> >();
+TEST(TEST_CATEGORY, team_shared_request) {
+  TestSharedTeam<TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Static> >();
+  TestSharedTeam<TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Dynamic> >();
 }
 
-TEST_F( TEST_CATEGORY, team_scratch_request )
-{
-  TestScratchTeam< TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Static> >();
-  TestScratchTeam< TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Dynamic> >();
+TEST(TEST_CATEGORY, team_scratch_request) {
+  TestScratchTeam<TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Static> >();
+  TestScratchTeam<TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Dynamic> >();
 }
 
-#if defined( KOKKOS_ENABLE_CXX11_DISPATCH_LAMBDA )
-#if !defined(KOKKOS_ENABLE_CUDA) || ( 8000 <= CUDA_VERSION )
-TEST_F( TEST_CATEGORY, team_lambda_shared_request )
-{
-  TestLambdaSharedTeam< Kokkos::HostSpace, TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Static> >();
-  TestLambdaSharedTeam< Kokkos::HostSpace, TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Dynamic> >();
-}
-TEST_F( TEST_CATEGORY, scratch_align) {
-  TestScratchAlignment< TEST_EXECSPACE >();
+#if defined(KOKKOS_ENABLE_CXX11_DISPATCH_LAMBDA)
+#if !defined(KOKKOS_ENABLE_CUDA) || (8000 <= CUDA_VERSION)
+TEST(TEST_CATEGORY, team_lambda_shared_request) {
+  TestLambdaSharedTeam<Kokkos::HostSpace, TEST_EXECSPACE,
+                       Kokkos::Schedule<Kokkos::Static> >();
+  TestLambdaSharedTeam<Kokkos::HostSpace, TEST_EXECSPACE,
+                       Kokkos::Schedule<Kokkos::Dynamic> >();
 }
+TEST(TEST_CATEGORY, scratch_align) { TestScratchAlignment<TEST_EXECSPACE>(); }
 #endif
 #endif
 
-TEST_F( TEST_CATEGORY, shmem_size )
-{
-  TestShmemSize< TEST_EXECSPACE >();
+TEST(TEST_CATEGORY, shmem_size) { TestShmemSize<TEST_EXECSPACE>(); }
+
+TEST(TEST_CATEGORY, multi_level_scratch) {
+  TestMultiLevelScratchTeam<TEST_EXECSPACE,
+                            Kokkos::Schedule<Kokkos::Static> >();
+  TestMultiLevelScratchTeam<TEST_EXECSPACE,
+                            Kokkos::Schedule<Kokkos::Dynamic> >();
 }
 
-TEST_F( TEST_CATEGORY, multi_level_scratch )
-{
-  TestMultiLevelScratchTeam< TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Static> >();
-  TestMultiLevelScratchTeam< TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Dynamic> >();
-}
-
-} // namespace Test
-
+}  // namespace Test
diff --git a/lib/kokkos/core/unit_test/openmp/TestOpenMP_TeamTeamSize.cpp b/lib/kokkos/core/unit_test/openmp/TestOpenMP_TeamTeamSize.cpp
index a98728f02c..df935a0ad1 100644
--- a/lib/kokkos/core/unit_test/openmp/TestOpenMP_TeamTeamSize.cpp
+++ b/lib/kokkos/core/unit_test/openmp/TestOpenMP_TeamTeamSize.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -43,4 +44,3 @@
 
 #include <openmp/TestOpenMP_Category.hpp>
 #include <TestTeamTeamSize.hpp>
-
diff --git a/lib/kokkos/core/unit_test/openmp/TestOpenMP_TeamVectorRange.cpp b/lib/kokkos/core/unit_test/openmp/TestOpenMP_TeamVectorRange.cpp
index eff8c73182..9fe7a0c0ca 100644
--- a/lib/kokkos/core/unit_test/openmp/TestOpenMP_TeamVectorRange.cpp
+++ b/lib/kokkos/core/unit_test/openmp/TestOpenMP_TeamVectorRange.cpp
@@ -3,10 +3,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -42,7 +43,5 @@
 //@HEADER
 */
 
-#include<openmp/TestOpenMP_Category.hpp>
-#include<TestTeamVectorRange.hpp>
-
-
+#include <openmp/TestOpenMP_Category.hpp>
+#include <TestTeamVectorRange.hpp>
diff --git a/lib/kokkos/core/unit_test/openmp/TestOpenMP_UniqueToken.cpp b/lib/kokkos/core/unit_test/openmp/TestOpenMP_UniqueToken.cpp
index 473ec73a2f..eed863e5f9 100644
--- a/lib/kokkos/core/unit_test/openmp/TestOpenMP_UniqueToken.cpp
+++ b/lib/kokkos/core/unit_test/openmp/TestOpenMP_UniqueToken.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -41,6 +42,5 @@
 //@HEADER
 */
 
-#include<openmp/TestOpenMP_Category.hpp>
-#include<TestUniqueToken.hpp>
-
+#include <openmp/TestOpenMP_Category.hpp>
+#include <TestUniqueToken.hpp>
diff --git a/lib/kokkos/core/unit_test/openmp/TestOpenMP_ViewAPI_a.cpp b/lib/kokkos/core/unit_test/openmp/TestOpenMP_ViewAPI_a.cpp
index a7a441c8ec..f0066d82dc 100644
--- a/lib/kokkos/core/unit_test/openmp/TestOpenMP_ViewAPI_a.cpp
+++ b/lib/kokkos/core/unit_test/openmp/TestOpenMP_ViewAPI_a.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
diff --git a/lib/kokkos/core/unit_test/openmp/TestOpenMP_ViewAPI_b.cpp b/lib/kokkos/core/unit_test/openmp/TestOpenMP_ViewAPI_b.cpp
index 97aaee46ea..d9eb1b9053 100644
--- a/lib/kokkos/core/unit_test/openmp/TestOpenMP_ViewAPI_b.cpp
+++ b/lib/kokkos/core/unit_test/openmp/TestOpenMP_ViewAPI_b.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
diff --git a/lib/kokkos/core/unit_test/openmp/TestOpenMP_ViewAPI_c.cpp b/lib/kokkos/core/unit_test/openmp/TestOpenMP_ViewAPI_c.cpp
index 6fcbdd319d..ecdb7318fa 100644
--- a/lib/kokkos/core/unit_test/openmp/TestOpenMP_ViewAPI_c.cpp
+++ b/lib/kokkos/core/unit_test/openmp/TestOpenMP_ViewAPI_c.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
diff --git a/lib/kokkos/core/unit_test/openmp/TestOpenMP_ViewAPI_d.cpp b/lib/kokkos/core/unit_test/openmp/TestOpenMP_ViewAPI_d.cpp
index dbfcd9ff28..4a9a6513c1 100644
--- a/lib/kokkos/core/unit_test/openmp/TestOpenMP_ViewAPI_d.cpp
+++ b/lib/kokkos/core/unit_test/openmp/TestOpenMP_ViewAPI_d.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
diff --git a/lib/kokkos/core/unit_test/openmp/TestOpenMP_ViewAPI_e.cpp b/lib/kokkos/core/unit_test/openmp/TestOpenMP_ViewAPI_e.cpp
index 2e8134aac4..e5ddee77d8 100644
--- a/lib/kokkos/core/unit_test/openmp/TestOpenMP_ViewAPI_e.cpp
+++ b/lib/kokkos/core/unit_test/openmp/TestOpenMP_ViewAPI_e.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
diff --git a/lib/kokkos/core/unit_test/openmp/TestOpenMP_ViewLayoutStrideAssignment.cpp b/lib/kokkos/core/unit_test/openmp/TestOpenMP_ViewLayoutStrideAssignment.cpp
index 81b296d15d..90e90139c1 100644
--- a/lib/kokkos/core/unit_test/openmp/TestOpenMP_ViewLayoutStrideAssignment.cpp
+++ b/lib/kokkos/core/unit_test/openmp/TestOpenMP_ViewLayoutStrideAssignment.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -43,4 +44,3 @@
 
 #include <openmp/TestOpenMP_Category.hpp>
 #include <TestViewLayoutStrideAssignment.hpp>
-
diff --git a/lib/kokkos/core/unit_test/openmp/TestOpenMP_ViewMapping_a.cpp b/lib/kokkos/core/unit_test/openmp/TestOpenMP_ViewMapping_a.cpp
index 781dabeeed..0f2dd07e5b 100644
--- a/lib/kokkos/core/unit_test/openmp/TestOpenMP_ViewMapping_a.cpp
+++ b/lib/kokkos/core/unit_test/openmp/TestOpenMP_ViewMapping_a.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -43,4 +44,3 @@
 
 #include <openmp/TestOpenMP_Category.hpp>
 #include <TestViewMapping_a.hpp>
-
diff --git a/lib/kokkos/core/unit_test/openmp/TestOpenMP_ViewMapping_b.cpp b/lib/kokkos/core/unit_test/openmp/TestOpenMP_ViewMapping_b.cpp
index 910d043fb3..13be940425 100644
--- a/lib/kokkos/core/unit_test/openmp/TestOpenMP_ViewMapping_b.cpp
+++ b/lib/kokkos/core/unit_test/openmp/TestOpenMP_ViewMapping_b.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -43,4 +44,3 @@
 
 #include <openmp/TestOpenMP_Category.hpp>
 #include <TestViewMapping_b.hpp>
-
diff --git a/lib/kokkos/core/unit_test/openmp/TestOpenMP_ViewMapping_subview.cpp b/lib/kokkos/core/unit_test/openmp/TestOpenMP_ViewMapping_subview.cpp
index 900e760979..47250070b5 100644
--- a/lib/kokkos/core/unit_test/openmp/TestOpenMP_ViewMapping_subview.cpp
+++ b/lib/kokkos/core/unit_test/openmp/TestOpenMP_ViewMapping_subview.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -43,4 +44,3 @@
 
 #include <openmp/TestOpenMP_Category.hpp>
 #include <TestViewMapping_subview.hpp>
-
diff --git a/lib/kokkos/core/unit_test/openmp/TestOpenMP_ViewOfClass.cpp b/lib/kokkos/core/unit_test/openmp/TestOpenMP_ViewOfClass.cpp
index 87a49902f4..78315c45aa 100644
--- a/lib/kokkos/core/unit_test/openmp/TestOpenMP_ViewOfClass.cpp
+++ b/lib/kokkos/core/unit_test/openmp/TestOpenMP_ViewOfClass.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -43,4 +44,3 @@
 
 #include <openmp/TestOpenMP_Category.hpp>
 #include <TestViewOfClass.hpp>
-
diff --git a/lib/kokkos/core/unit_test/openmp/TestOpenMP_ViewResize.cpp b/lib/kokkos/core/unit_test/openmp/TestOpenMP_ViewResize.cpp
new file mode 100644
index 0000000000..cacd2b3e80
--- /dev/null
+++ b/lib/kokkos/core/unit_test/openmp/TestOpenMP_ViewResize.cpp
@@ -0,0 +1,46 @@
+/*
+//@HEADER
+// ************************************************************************
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
+// the U.S. Government retains certain rights in this software.
+//
+// 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 Corporation nor the names of the
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 NTESS OR THE
+// 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.
+//
+// Questions? Contact Christian R. Trott (crtrott@sandia.gov)
+//
+// ************************************************************************
+//@HEADER
+*/
+
+#include <openmp/TestOpenMP_Category.hpp>
+#include <TestViewResize.hpp>
diff --git a/lib/kokkos/core/unit_test/openmp/TestOpenMP_View_64bit.cpp b/lib/kokkos/core/unit_test/openmp/TestOpenMP_View_64bit.cpp
index a1afbaba72..80f52abafb 100644
--- a/lib/kokkos/core/unit_test/openmp/TestOpenMP_View_64bit.cpp
+++ b/lib/kokkos/core/unit_test/openmp/TestOpenMP_View_64bit.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
diff --git a/lib/kokkos/core/unit_test/openmp/TestOpenMP_WorkGraph.cpp b/lib/kokkos/core/unit_test/openmp/TestOpenMP_WorkGraph.cpp
index 916257e203..f76f612f2c 100644
--- a/lib/kokkos/core/unit_test/openmp/TestOpenMP_WorkGraph.cpp
+++ b/lib/kokkos/core/unit_test/openmp/TestOpenMP_WorkGraph.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -41,5 +42,5 @@
 //@HEADER
 */
 
-#include<openmp/TestOpenMP_Category.hpp>
-#include<TestWorkGraph.hpp>
+#include <openmp/TestOpenMP_Category.hpp>
+#include <TestWorkGraph.hpp>
diff --git a/lib/kokkos/core/unit_test/openmptarget/TestOpenMPTarget.hpp b/lib/kokkos/core/unit_test/openmptarget/TestOpenMPTarget.hpp
index 3ebbf5204c..0e9ad3e24f 100644
--- a/lib/kokkos/core/unit_test/openmptarget/TestOpenMPTarget.hpp
+++ b/lib/kokkos/core/unit_test/openmptarget/TestOpenMPTarget.hpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -70,7 +71,7 @@
 //#include <TestAggregate.hpp>
 //#include <TestCompilerMacros.hpp>
 
-//TODO enable task scheduler tests for openmptarget
+// TODO enable task scheduler tests for openmptarget
 //#include <TestTaskScheduler.hpp>
 
 //#include <TestMemoryPool.hpp>
@@ -84,28 +85,26 @@
 namespace Test {
 
 class openmptarget : public ::testing::Test {
-protected:
-  static void SetUpTestCase()
-  {
-    const unsigned numa_count       = Kokkos::hwloc::get_available_numa_count();
-    const unsigned cores_per_numa   = Kokkos::hwloc::get_available_cores_per_numa();
-    const unsigned openmptarget_per_core = Kokkos::hwloc::get_available_openmptarget_per_core();
+ protected:
+  static void SetUpTestCase() {
+    const unsigned numa_count = Kokkos::hwloc::get_available_numa_count();
+    const unsigned cores_per_numa =
+        Kokkos::hwloc::get_available_cores_per_numa();
+    const unsigned openmptarget_per_core =
+        Kokkos::hwloc::get_available_openmptarget_per_core();
 
     unsigned openmptarget_count = 0;
 
-    openmptarget_count = std::max( 1u, numa_count )
-                  * std::max( 2u, cores_per_numa * openmptarget_per_core );
+    openmptarget_count = std::max(1u, numa_count) *
+                         std::max(2u, cores_per_numa * openmptarget_per_core);
 
-    Kokkos::OpenMPTarget::initialize( openmptarget_count );
-    Kokkos::print_configuration( std::cout, true /* detailed */ );
+    Kokkos::OpenMPTarget::initialize(openmptarget_count);
+    Kokkos::print_configuration(std::cout, true /* detailed */);
   }
 
-  static void TearDownTestCase()
-  {
-    Kokkos::OpenMPTarget::finalize();
-  }
+  static void TearDownTestCase() { Kokkos::OpenMPTarget::finalize(); }
 };
 
-} // namespace Test
+}  // namespace Test
 
 #endif
diff --git a/lib/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_AtomicOperations_complexdouble.cpp b/lib/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_AtomicOperations_complexdouble.cpp
index b2096073d0..e323124a64 100644
--- a/lib/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_AtomicOperations_complexdouble.cpp
+++ b/lib/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_AtomicOperations_complexdouble.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -41,6 +42,5 @@
 //@HEADER
 */
 
-#include<openmptarget/TestOpenMPTarget_Category.hpp>
-#include<TestAtomicOperations_complexdouble.hpp>
-
+#include <openmptarget/TestOpenMPTarget_Category.hpp>
+#include <TestAtomicOperations_complexdouble.hpp>
diff --git a/lib/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_AtomicOperations_complexfloat.cpp b/lib/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_AtomicOperations_complexfloat.cpp
index da4d5d3c77..c45d6fd5d1 100644
--- a/lib/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_AtomicOperations_complexfloat.cpp
+++ b/lib/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_AtomicOperations_complexfloat.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -41,6 +42,5 @@
 //@HEADER
 */
 
-#include<openmptarget/TestOpenMPTarget_Category.hpp>
-#include<TestAtomicOperations_complexfloat.hpp>
-
+#include <openmptarget/TestOpenMPTarget_Category.hpp>
+#include <TestAtomicOperations_complexfloat.hpp>
diff --git a/lib/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_AtomicOperations_double.cpp b/lib/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_AtomicOperations_double.cpp
index 2758945924..54d4670e08 100644
--- a/lib/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_AtomicOperations_double.cpp
+++ b/lib/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_AtomicOperations_double.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -41,6 +42,5 @@
 //@HEADER
 */
 
-#include<openmptarget/TestOpenMPTarget_Category.hpp>
-#include<TestAtomicOperations_double.hpp>
-
+#include <openmptarget/TestOpenMPTarget_Category.hpp>
+#include <TestAtomicOperations_double.hpp>
diff --git a/lib/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_AtomicOperations_float.cpp b/lib/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_AtomicOperations_float.cpp
index 737ef3d3b5..399bf0fcac 100644
--- a/lib/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_AtomicOperations_float.cpp
+++ b/lib/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_AtomicOperations_float.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -41,6 +42,5 @@
 //@HEADER
 */
 
-#include<openmptarget/TestOpenMPTarget_Category.hpp>
-#include<TestAtomicOperations_float.hpp>
-
+#include <openmptarget/TestOpenMPTarget_Category.hpp>
+#include <TestAtomicOperations_float.hpp>
diff --git a/lib/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_AtomicOperations_int.cpp b/lib/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_AtomicOperations_int.cpp
index 01d2310c41..6091ff0f76 100644
--- a/lib/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_AtomicOperations_int.cpp
+++ b/lib/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_AtomicOperations_int.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -41,6 +42,5 @@
 //@HEADER
 */
 
-#include<openmptarget/TestOpenMPTarget_Category.hpp>
-#include<TestAtomicOperations_int.hpp>
-
+#include <openmptarget/TestOpenMPTarget_Category.hpp>
+#include <TestAtomicOperations_int.hpp>
diff --git a/lib/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_AtomicOperations_longint.cpp b/lib/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_AtomicOperations_longint.cpp
index de5c0882f7..b877ff011d 100644
--- a/lib/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_AtomicOperations_longint.cpp
+++ b/lib/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_AtomicOperations_longint.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -41,6 +42,5 @@
 //@HEADER
 */
 
-#include<openmptarget/TestOpenMPTarget_Category.hpp>
-#include<TestAtomicOperations_longint.hpp>
-
+#include <openmptarget/TestOpenMPTarget_Category.hpp>
+#include <TestAtomicOperations_longint.hpp>
diff --git a/lib/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_AtomicOperations_longlongint.cpp b/lib/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_AtomicOperations_longlongint.cpp
index 9ca025a40a..8234e356f2 100644
--- a/lib/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_AtomicOperations_longlongint.cpp
+++ b/lib/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_AtomicOperations_longlongint.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -41,6 +42,5 @@
 //@HEADER
 */
 
-#include<openmptarget/TestOpenMPTarget_Category.hpp>
-#include<TestAtomicOperations_longlongint.hpp>
-
+#include <openmptarget/TestOpenMPTarget_Category.hpp>
+#include <TestAtomicOperations_longlongint.hpp>
diff --git a/lib/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_AtomicOperations_unsignedint.cpp b/lib/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_AtomicOperations_unsignedint.cpp
index 12158f128c..86cfac901c 100644
--- a/lib/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_AtomicOperations_unsignedint.cpp
+++ b/lib/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_AtomicOperations_unsignedint.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -41,6 +42,5 @@
 //@HEADER
 */
 
-#include<openmptarget/TestOpenMPTarget_Category.hpp>
-#include<TestAtomicOperations_unsignedint.hpp>
-
+#include <openmptarget/TestOpenMPTarget_Category.hpp>
+#include <TestAtomicOperations_unsignedint.hpp>
diff --git a/lib/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_AtomicOperations_unsignedlongint.cpp b/lib/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_AtomicOperations_unsignedlongint.cpp
index a06d4099d8..fe5c3f085b 100644
--- a/lib/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_AtomicOperations_unsignedlongint.cpp
+++ b/lib/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_AtomicOperations_unsignedlongint.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -41,6 +42,5 @@
 //@HEADER
 */
 
-#include<openmptarget/TestOpenMPTarget_Category.hpp>
-#include<TestAtomicOperations_unsignedlongint.hpp>
-
+#include <openmptarget/TestOpenMPTarget_Category.hpp>
+#include <TestAtomicOperations_unsignedlongint.hpp>
diff --git a/lib/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_AtomicViews.cpp b/lib/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_AtomicViews.cpp
index a9232540e8..b38c7cafb2 100644
--- a/lib/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_AtomicViews.cpp
+++ b/lib/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_AtomicViews.cpp
@@ -3,10 +3,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -42,6 +43,5 @@
 //@HEADER
 */
 
-#include<openmptarget/TestOpenMPTarget_Category.hpp>
-#include<TestAtomicViews.hpp>
-
+#include <openmptarget/TestOpenMPTarget_Category.hpp>
+#include <TestAtomicViews.hpp>
diff --git a/lib/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_Atomics.cpp b/lib/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_Atomics.cpp
index 8285bc97f7..1bcbd3a625 100644
--- a/lib/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_Atomics.cpp
+++ b/lib/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_Atomics.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -43,4 +44,3 @@
 
 #include <openmptarget/TestOpenMPTarget_Category.hpp>
 #include <TestAtomic.hpp>
-
diff --git a/lib/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_Category.hpp b/lib/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_Category.hpp
index 263e607524..58aa0cc782 100644
--- a/lib/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_Category.hpp
+++ b/lib/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_Category.hpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -46,20 +47,8 @@
 
 #include <gtest/gtest.h>
 
-namespace Test {
-
-class openmptarget : public ::testing::Test {
-protected:
-  static void SetUpTestCase() {
-  }
-
-  static void TearDownTestCase() {
-  }
-};
-
-} // namespace Test
-
 #define TEST_CATEGORY openmptarget
+#define TEST_CATEGORY_DEATH openmptarget_DeathTest
 #define TEST_EXECSPACE Kokkos::Experimental::OpenMPTarget
 
 #endif
diff --git a/lib/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_Complex.cpp b/lib/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_Complex.cpp
index 5d0525f1b0..5e62bc85be 100644
--- a/lib/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_Complex.cpp
+++ b/lib/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_Complex.cpp
@@ -3,10 +3,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -42,6 +43,5 @@
 //@HEADER
 */
 
-#include<openmptarget/TestOpenMPTarget_Category.hpp>
-#include<TestComplex.hpp>
-
+#include <openmptarget/TestOpenMPTarget_Category.hpp>
+#include <TestComplex.hpp>
diff --git a/lib/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_DeepCopyAlignment.cpp b/lib/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_DeepCopyAlignment.cpp
index 62af98a731..01885d0d82 100644
--- a/lib/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_DeepCopyAlignment.cpp
+++ b/lib/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_DeepCopyAlignment.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
diff --git a/lib/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_Init.cpp b/lib/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_Init.cpp
index 957bfe359a..ebcbbb3aef 100644
--- a/lib/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_Init.cpp
+++ b/lib/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_Init.cpp
@@ -3,10 +3,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -42,9 +43,7 @@
 //@HEADER
 */
 
-#include<openmptarget/TestOpenMPTarget_Category.hpp>
-#include<TestInit.hpp>
-#include<TestCompilerMacros.hpp>
-#include<TestPolicyConstruction.hpp>
-
-
+#include <openmptarget/TestOpenMPTarget_Category.hpp>
+#include <TestInit.hpp>
+#include <TestCompilerMacros.hpp>
+#include <TestPolicyConstruction.hpp>
diff --git a/lib/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_MDRange_a.cpp b/lib/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_MDRange_a.cpp
index 9b0a1f26c6..4f4f8b06c5 100644
--- a/lib/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_MDRange_a.cpp
+++ b/lib/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_MDRange_a.cpp
@@ -3,10 +3,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -42,6 +43,5 @@
 //@HEADER
 */
 
-#include<openmptarget/TestOpenMPTarget_Category.hpp>
-#include<TestMDRange_a.hpp>
-
+#include <openmptarget/TestOpenMPTarget_Category.hpp>
+#include <TestMDRange_a.hpp>
diff --git a/lib/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_MDRange_b.cpp b/lib/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_MDRange_b.cpp
index 05b5ad4566..1032d82210 100644
--- a/lib/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_MDRange_b.cpp
+++ b/lib/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_MDRange_b.cpp
@@ -3,10 +3,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -42,6 +43,5 @@
 //@HEADER
 */
 
-#include<openmptarget/TestOpenMPTarget_Category.hpp>
-#include<TestMDRange_b.hpp>
-
+#include <openmptarget/TestOpenMPTarget_Category.hpp>
+#include <TestMDRange_b.hpp>
diff --git a/lib/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_MDRange_c.cpp b/lib/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_MDRange_c.cpp
index 14a9d8ad61..59d165ab47 100644
--- a/lib/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_MDRange_c.cpp
+++ b/lib/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_MDRange_c.cpp
@@ -3,10 +3,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -42,6 +43,5 @@
 //@HEADER
 */
 
-#include<openmptarget/TestOpenMPTarget_Category.hpp>
-#include<TestMDRange_c.hpp>
-
+#include <openmptarget/TestOpenMPTarget_Category.hpp>
+#include <TestMDRange_c.hpp>
diff --git a/lib/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_MDRange_d.cpp b/lib/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_MDRange_d.cpp
index 0033144403..49603de6f4 100644
--- a/lib/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_MDRange_d.cpp
+++ b/lib/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_MDRange_d.cpp
@@ -3,10 +3,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -42,6 +43,5 @@
 //@HEADER
 */
 
-#include<openmptarget/TestOpenMPTarget_Category.hpp>
-#include<TestMDRange_d.hpp>
-
+#include <openmptarget/TestOpenMPTarget_Category.hpp>
+#include <TestMDRange_d.hpp>
diff --git a/lib/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_MDRange_e.cpp b/lib/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_MDRange_e.cpp
index 4098d8c7ea..dd6d96630b 100644
--- a/lib/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_MDRange_e.cpp
+++ b/lib/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_MDRange_e.cpp
@@ -3,10 +3,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -42,6 +43,5 @@
 //@HEADER
 */
 
-#include<openmptarget/TestOpenMPTarget_Category.hpp>
-#include<TestMDRange_e.hpp>
-
+#include <openmptarget/TestOpenMPTarget_Category.hpp>
+#include <TestMDRange_e.hpp>
diff --git a/lib/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_Other.cpp b/lib/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_Other.cpp
index fce37dd719..aba91aee2b 100644
--- a/lib/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_Other.cpp
+++ b/lib/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_Other.cpp
@@ -3,10 +3,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -42,9 +43,9 @@
 //@HEADER
 */
 
-#include<openmptarget/TestOpenMPTarget_Category.hpp>
-#include<TestTemplateMetaFunctions.hpp>
-#include<TestAggregate.hpp>
-#include<TestMemoryPool.hpp>
-#include<TestCXX11.hpp>
-#include<TestTile.hpp>
+#include <openmptarget/TestOpenMPTarget_Category.hpp>
+#include <TestTemplateMetaFunctions.hpp>
+#include <TestAggregate.hpp>
+#include <TestMemoryPool.hpp>
+#include <TestCXX11.hpp>
+#include <TestTile.hpp>
diff --git a/lib/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_RangePolicy.cpp b/lib/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_RangePolicy.cpp
index 4fea6a32b4..d9a5bac68f 100644
--- a/lib/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_RangePolicy.cpp
+++ b/lib/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_RangePolicy.cpp
@@ -3,10 +3,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -42,6 +43,5 @@
 //@HEADER
 */
 
-#include<openmptarget/TestOpenMPTarget_Category.hpp>
-#include<TestRange.hpp>
-
+#include <openmptarget/TestOpenMPTarget_Category.hpp>
+#include <TestRange.hpp>
diff --git a/lib/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_Reducers_a.cpp b/lib/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_Reducers_a.cpp
index bee82e6317..311c7a93b4 100644
--- a/lib/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_Reducers_a.cpp
+++ b/lib/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_Reducers_a.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
diff --git a/lib/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_Reducers_b.cpp b/lib/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_Reducers_b.cpp
index 1ac4db8406..d5f6b8bc4d 100644
--- a/lib/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_Reducers_b.cpp
+++ b/lib/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_Reducers_b.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
diff --git a/lib/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_Reducers_c.cpp b/lib/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_Reducers_c.cpp
index f2c0f0d1dc..e421033e06 100644
--- a/lib/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_Reducers_c.cpp
+++ b/lib/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_Reducers_c.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
diff --git a/lib/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_Reducers_d.cpp b/lib/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_Reducers_d.cpp
index 079c05320d..ec30e97d3b 100644
--- a/lib/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_Reducers_d.cpp
+++ b/lib/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_Reducers_d.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
diff --git a/lib/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_Reductions.cpp b/lib/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_Reductions.cpp
index 1052fea301..af1d06f0c1 100644
--- a/lib/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_Reductions.cpp
+++ b/lib/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_Reductions.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
diff --git a/lib/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_Scan.cpp b/lib/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_Scan.cpp
index 56fc1a00a5..50cc88914f 100644
--- a/lib/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_Scan.cpp
+++ b/lib/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_Scan.cpp
@@ -3,10 +3,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -42,6 +43,5 @@
 //@HEADER
 */
 
-#include<openmptarget/TestOpenMPTarget_Category.hpp>
-#include<TestScan.hpp>
-
+#include <openmptarget/TestOpenMPTarget_Category.hpp>
+#include <TestScan.hpp>
diff --git a/lib/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_SharedAlloc.cpp b/lib/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_SharedAlloc.cpp
index e3e8ac2814..aa0d9cfe27 100644
--- a/lib/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_SharedAlloc.cpp
+++ b/lib/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_SharedAlloc.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -46,10 +47,9 @@
 
 namespace Test {
 
-
-TEST_F( TEST_CATEGORY, impl_shared_alloc )
-{
-  test_shared_alloc< Kokkos::Experimental::OpenMPTargetSpace, Kokkos::DefaultHostExecutionSpace >();
+TEST_F(TEST_CATEGORY, impl_shared_alloc) {
+  test_shared_alloc<Kokkos::Experimental::OpenMPTargetSpace,
+                    Kokkos::DefaultHostExecutionSpace>();
 }
 
-} // namespace Test
+}  // namespace Test
diff --git a/lib/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_SubView_a.cpp b/lib/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_SubView_a.cpp
index 7a273446a5..6f6255af87 100644
--- a/lib/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_SubView_a.cpp
+++ b/lib/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_SubView_a.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -46,66 +47,56 @@
 
 namespace Test {
 
-TEST_F( TEST_CATEGORY, view_subview_auto_1d_left )
-{
-  TestViewSubview::test_auto_1d< Kokkos::LayoutLeft, TEST_EXECSPACE >();
+TEST_F(TEST_CATEGORY, view_subview_auto_1d_left) {
+  TestViewSubview::test_auto_1d<Kokkos::LayoutLeft, TEST_EXECSPACE>();
 }
 
-TEST_F( TEST_CATEGORY, view_subview_auto_1d_right )
-{
-  TestViewSubview::test_auto_1d< Kokkos::LayoutRight, TEST_EXECSPACE >();
+TEST_F(TEST_CATEGORY, view_subview_auto_1d_right) {
+  TestViewSubview::test_auto_1d<Kokkos::LayoutRight, TEST_EXECSPACE>();
 }
 
-TEST_F( TEST_CATEGORY, view_subview_auto_1d_stride )
-{
-  TestViewSubview::test_auto_1d< Kokkos::LayoutStride, TEST_EXECSPACE >();
+TEST_F(TEST_CATEGORY, view_subview_auto_1d_stride) {
+  TestViewSubview::test_auto_1d<Kokkos::LayoutStride, TEST_EXECSPACE>();
 }
 
-TEST_F( TEST_CATEGORY, view_subview_assign_strided )
-{
-  TestViewSubview::test_1d_strided_assignment< TEST_EXECSPACE >();
+TEST_F(TEST_CATEGORY, view_subview_assign_strided) {
+  TestViewSubview::test_1d_strided_assignment<TEST_EXECSPACE>();
 }
 
-TEST_F( TEST_CATEGORY, view_subview_left_0 )
-{
-  TestViewSubview::test_left_0< TEST_EXECSPACE >();
+TEST_F(TEST_CATEGORY, view_subview_left_0) {
+  TestViewSubview::test_left_0<TEST_EXECSPACE>();
 }
 
-TEST_F( TEST_CATEGORY, view_subview_left_1 )
-{
-  TestViewSubview::test_left_1< TEST_EXECSPACE >();
+TEST_F(TEST_CATEGORY, view_subview_left_1) {
+  TestViewSubview::test_left_1<TEST_EXECSPACE>();
 }
 
-TEST_F( TEST_CATEGORY, view_subview_left_2 )
-{
-  TestViewSubview::test_left_2< TEST_EXECSPACE >();
+TEST_F(TEST_CATEGORY, view_subview_left_2) {
+  TestViewSubview::test_left_2<TEST_EXECSPACE>();
 }
 
-TEST_F( TEST_CATEGORY, view_subview_left_3 )
-{
-  TestViewSubview::test_left_3< TEST_EXECSPACE >();
+TEST_F(TEST_CATEGORY, view_subview_left_3) {
+  TestViewSubview::test_left_3<TEST_EXECSPACE>();
 }
 
-TEST_F( TEST_CATEGORY, view_subview_right_0 )
-{
-  TestViewSubview::test_right_0< TEST_EXECSPACE >();
+TEST_F(TEST_CATEGORY, view_subview_right_0) {
+  TestViewSubview::test_right_0<TEST_EXECSPACE>();
 }
 
-TEST_F( TEST_CATEGORY, view_subview_right_1 )
-{
-  TestViewSubview::test_right_1< TEST_EXECSPACE >();
+TEST_F(TEST_CATEGORY, view_subview_right_1) {
+  TestViewSubview::test_right_1<TEST_EXECSPACE>();
 }
 
-TEST_F( TEST_CATEGORY, view_subview_right_3 )
-{
-  TestViewSubview::test_right_3< TEST_EXECSPACE >();
+TEST_F(TEST_CATEGORY, view_subview_right_3) {
+  TestViewSubview::test_right_3<TEST_EXECSPACE>();
 }
 
-TEST_F(TEST_CATEGORY, view_static_tests)
-{
-  TestViewSubview::TestSubviewStaticSizes<TEST_EXECSPACE, Kokkos::LayoutLeft>()();
-  TestViewSubview::TestSubviewStaticSizes<TEST_EXECSPACE, Kokkos::LayoutRight>()();
+TEST_F(TEST_CATEGORY, view_static_tests) {
+  TestViewSubview::TestSubviewStaticSizes<TEST_EXECSPACE,
+                                          Kokkos::LayoutLeft>()();
+  TestViewSubview::TestSubviewStaticSizes<TEST_EXECSPACE,
+                                          Kokkos::LayoutRight>()();
   TestViewSubview::TestExtentsStaticTests<TEST_EXECSPACE>();
 }
 
-} // namespace Test
+}  // namespace Test
diff --git a/lib/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_SubView_b.cpp b/lib/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_SubView_b.cpp
index 5b84bc623f..7f0751e6cb 100644
--- a/lib/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_SubView_b.cpp
+++ b/lib/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_SubView_b.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -46,18 +47,20 @@
 
 namespace Test {
 
-TEST_F( TEST_CATEGORY, view_subview_layoutleft_to_layoutleft )
-{
-  TestViewSubview::test_layoutleft_to_layoutleft< TEST_EXECSPACE >();
-  TestViewSubview::test_layoutleft_to_layoutleft< TEST_EXECSPACE, Kokkos::MemoryTraits<Kokkos::Atomic> >();
-  TestViewSubview::test_layoutleft_to_layoutleft< TEST_EXECSPACE, Kokkos::MemoryTraits<Kokkos::RandomAccess> >();
+TEST_F(TEST_CATEGORY, view_subview_layoutleft_to_layoutleft) {
+  TestViewSubview::test_layoutleft_to_layoutleft<TEST_EXECSPACE>();
+  TestViewSubview::test_layoutleft_to_layoutleft<
+      TEST_EXECSPACE, Kokkos::MemoryTraits<Kokkos::Atomic> >();
+  TestViewSubview::test_layoutleft_to_layoutleft<
+      TEST_EXECSPACE, Kokkos::MemoryTraits<Kokkos::RandomAccess> >();
 }
 
-TEST_F( TEST_CATEGORY, view_subview_layoutright_to_layoutright )
-{
-  TestViewSubview::test_layoutright_to_layoutright< TEST_EXECSPACE >();
-  TestViewSubview::test_layoutright_to_layoutright< TEST_EXECSPACE, Kokkos::MemoryTraits<Kokkos::Atomic> >();
-  TestViewSubview::test_layoutright_to_layoutright< TEST_EXECSPACE, Kokkos::MemoryTraits<Kokkos::RandomAccess> >();
+TEST_F(TEST_CATEGORY, view_subview_layoutright_to_layoutright) {
+  TestViewSubview::test_layoutright_to_layoutright<TEST_EXECSPACE>();
+  TestViewSubview::test_layoutright_to_layoutright<
+      TEST_EXECSPACE, Kokkos::MemoryTraits<Kokkos::Atomic> >();
+  TestViewSubview::test_layoutright_to_layoutright<
+      TEST_EXECSPACE, Kokkos::MemoryTraits<Kokkos::RandomAccess> >();
 }
 
-} // namespace Test
+}  // namespace Test
diff --git a/lib/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_SubView_c01.cpp b/lib/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_SubView_c01.cpp
index 8b8d3fd5e7..953c383bf9 100644
--- a/lib/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_SubView_c01.cpp
+++ b/lib/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_SubView_c01.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -46,9 +47,8 @@
 
 namespace Test {
 
-TEST_F( TEST_CATEGORY, view_subview_1d_assign )
-{
-  TestViewSubview::test_1d_assign< TEST_EXECSPACE >();
+TEST_F(TEST_CATEGORY, view_subview_1d_assign) {
+  TestViewSubview::test_1d_assign<TEST_EXECSPACE>();
 }
 
-} // namespace Test
+}  // namespace Test
diff --git a/lib/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_SubView_c02.cpp b/lib/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_SubView_c02.cpp
index bb1d024367..3a6245e258 100644
--- a/lib/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_SubView_c02.cpp
+++ b/lib/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_SubView_c02.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -46,9 +47,9 @@
 
 namespace Test {
 
-TEST_F( TEST_CATEGORY, view_subview_1d_assign_atomic )
-{
-  TestViewSubview::test_1d_assign< TEST_EXECSPACE, Kokkos::MemoryTraits<Kokkos::Atomic> >();
+TEST_F(TEST_CATEGORY, view_subview_1d_assign_atomic) {
+  TestViewSubview::test_1d_assign<TEST_EXECSPACE,
+                                  Kokkos::MemoryTraits<Kokkos::Atomic> >();
 }
 
-} // namespace Test
+}  // namespace Test
diff --git a/lib/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_SubView_c03.cpp b/lib/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_SubView_c03.cpp
index ec31b3688e..e9e912dd0e 100644
--- a/lib/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_SubView_c03.cpp
+++ b/lib/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_SubView_c03.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -46,9 +47,9 @@
 
 namespace Test {
 
-TEST_F( TEST_CATEGORY, view_subview_1d_assign_randomaccess )
-{
-  TestViewSubview::test_1d_assign< TEST_EXECSPACE, Kokkos::MemoryTraits<Kokkos::RandomAccess> >();
+TEST_F(TEST_CATEGORY, view_subview_1d_assign_randomaccess) {
+  TestViewSubview::test_1d_assign<
+      TEST_EXECSPACE, Kokkos::MemoryTraits<Kokkos::RandomAccess> >();
 }
 
-} // namespace Test
+}  // namespace Test
diff --git a/lib/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_SubView_c04.cpp b/lib/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_SubView_c04.cpp
index c1db2cf0ec..0c5b9c8c01 100644
--- a/lib/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_SubView_c04.cpp
+++ b/lib/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_SubView_c04.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -46,9 +47,8 @@
 
 namespace Test {
 
-TEST_F( TEST_CATEGORY, view_subview_2d_from_3d )
-{
-  TestViewSubview::test_2d_subview_3d< TEST_EXECSPACE >();
+TEST_F(TEST_CATEGORY, view_subview_2d_from_3d) {
+  TestViewSubview::test_2d_subview_3d<TEST_EXECSPACE>();
 }
 
-} // namespace Test
+}  // namespace Test
diff --git a/lib/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_SubView_c05.cpp b/lib/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_SubView_c05.cpp
index a4d30f68b8..0e11c637e6 100644
--- a/lib/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_SubView_c05.cpp
+++ b/lib/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_SubView_c05.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -46,9 +47,9 @@
 
 namespace Test {
 
-TEST_F( openmptarget, view_subview_2d_from_3d_atomic )
-{
-  TestViewSubview::test_2d_subview_3d< TEST_EXECSPACE, Kokkos::MemoryTraits<Kokkos::Atomic> >();
+TEST_F(openmptarget, view_subview_2d_from_3d_atomic) {
+  TestViewSubview::test_2d_subview_3d<TEST_EXECSPACE,
+                                      Kokkos::MemoryTraits<Kokkos::Atomic> >();
 }
 
-} // namespace Test
+}  // namespace Test
diff --git a/lib/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_SubView_c06.cpp b/lib/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_SubView_c06.cpp
index 34b4dfb409..e9a30a1835 100644
--- a/lib/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_SubView_c06.cpp
+++ b/lib/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_SubView_c06.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -46,9 +47,9 @@
 
 namespace Test {
 
-TEST_F( TEST_CATEGORY, view_subview_2d_from_3d_randomaccess )
-{
-  TestViewSubview::test_2d_subview_3d< TEST_EXECSPACE, Kokkos::MemoryTraits<Kokkos::RandomAccess> >();
+TEST_F(TEST_CATEGORY, view_subview_2d_from_3d_randomaccess) {
+  TestViewSubview::test_2d_subview_3d<
+      TEST_EXECSPACE, Kokkos::MemoryTraits<Kokkos::RandomAccess> >();
 }
 
-} // namespace Test
+}  // namespace Test
diff --git a/lib/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_SubView_c07.cpp b/lib/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_SubView_c07.cpp
index 50ac0b06ac..7d230d7e85 100644
--- a/lib/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_SubView_c07.cpp
+++ b/lib/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_SubView_c07.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -46,9 +47,8 @@
 
 namespace Test {
 
-TEST_F( TEST_CATEGORY, view_subview_3d_from_5d_left )
-{
-  TestViewSubview::test_3d_subview_5d_left< TEST_EXECSPACE >();
+TEST_F(TEST_CATEGORY, view_subview_3d_from_5d_left) {
+  TestViewSubview::test_3d_subview_5d_left<TEST_EXECSPACE>();
 }
 
-} // namespace Test
+}  // namespace Test
diff --git a/lib/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_SubView_c08.cpp b/lib/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_SubView_c08.cpp
index 5da4797472..e0b1f17a98 100644
--- a/lib/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_SubView_c08.cpp
+++ b/lib/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_SubView_c08.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -46,9 +47,9 @@
 
 namespace Test {
 
-TEST_F( TEST_CATEGORY, view_subview_3d_from_5d_left_atomic )
-{
-  TestViewSubview::test_3d_subview_5d_left< TEST_EXECSPACE, Kokkos::MemoryTraits<Kokkos::Atomic> >();
+TEST_F(TEST_CATEGORY, view_subview_3d_from_5d_left_atomic) {
+  TestViewSubview::test_3d_subview_5d_left<
+      TEST_EXECSPACE, Kokkos::MemoryTraits<Kokkos::Atomic> >();
 }
 
-} // namespace Test
+}  // namespace Test
diff --git a/lib/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_SubView_c09.cpp b/lib/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_SubView_c09.cpp
index 9041e5121d..0b5d94b527 100644
--- a/lib/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_SubView_c09.cpp
+++ b/lib/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_SubView_c09.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -46,9 +47,9 @@
 
 namespace Test {
 
-TEST_F( TEST_CATEGORY, view_subview_3d_from_5d_left_randomaccess )
-{
-  TestViewSubview::test_3d_subview_5d_left< TEST_EXECSPACE, Kokkos::MemoryTraits<Kokkos::RandomAccess> >();
+TEST_F(TEST_CATEGORY, view_subview_3d_from_5d_left_randomaccess) {
+  TestViewSubview::test_3d_subview_5d_left<
+      TEST_EXECSPACE, Kokkos::MemoryTraits<Kokkos::RandomAccess> >();
 }
 
-} // namespace Test
+}  // namespace Test
diff --git a/lib/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_SubView_c10.cpp b/lib/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_SubView_c10.cpp
index 3887d2b708..da2605da03 100644
--- a/lib/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_SubView_c10.cpp
+++ b/lib/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_SubView_c10.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -46,9 +47,8 @@
 
 namespace Test {
 
-TEST_F( TEST_CATEGORY, view_subview_3d_from_5d_right )
-{
-  TestViewSubview::test_3d_subview_5d_right< TEST_EXECSPACE >();
+TEST_F(TEST_CATEGORY, view_subview_3d_from_5d_right) {
+  TestViewSubview::test_3d_subview_5d_right<TEST_EXECSPACE>();
 }
 
-} // namespace Test
+}  // namespace Test
diff --git a/lib/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_SubView_c11.cpp b/lib/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_SubView_c11.cpp
index 4e36841887..3aa927190c 100644
--- a/lib/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_SubView_c11.cpp
+++ b/lib/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_SubView_c11.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -46,9 +47,9 @@
 
 namespace Test {
 
-TEST_F( TEST_CATEGORY, view_subview_3d_from_5d_right_atomic )
-{
-  TestViewSubview::test_3d_subview_5d_right< TEST_EXECSPACE, Kokkos::MemoryTraits<Kokkos::Atomic> >();
+TEST_F(TEST_CATEGORY, view_subview_3d_from_5d_right_atomic) {
+  TestViewSubview::test_3d_subview_5d_right<
+      TEST_EXECSPACE, Kokkos::MemoryTraits<Kokkos::Atomic> >();
 }
 
-} // namespace Test
+}  // namespace Test
diff --git a/lib/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_SubView_c12.cpp b/lib/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_SubView_c12.cpp
index dc33f1e0a9..dde0db7dd8 100644
--- a/lib/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_SubView_c12.cpp
+++ b/lib/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_SubView_c12.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -46,9 +47,9 @@
 
 namespace Test {
 
-TEST_F( TEST_CATEGORY, view_subview_3d_from_5d_right_randomaccess )
-{
-  TestViewSubview::test_3d_subview_5d_right< TEST_EXECSPACE, Kokkos::MemoryTraits<Kokkos::RandomAccess> >();
+TEST_F(TEST_CATEGORY, view_subview_3d_from_5d_right_randomaccess) {
+  TestViewSubview::test_3d_subview_5d_right<
+      TEST_EXECSPACE, Kokkos::MemoryTraits<Kokkos::RandomAccess> >();
 }
 
-} // namespace Test
+}  // namespace Test
diff --git a/lib/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_Team.cpp b/lib/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_Team.cpp
index 4eef325ea1..f2d063c25f 100644
--- a/lib/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_Team.cpp
+++ b/lib/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_Team.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -46,30 +47,37 @@
 
 namespace Test {
 
-TEST_F( TEST_CATEGORY, team_for )
-{
-  TestTeamPolicy< TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Static> >::test_for( 0 );
-  TestTeamPolicy< TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Dynamic> >::test_for( 0 );
+TEST_F(TEST_CATEGORY, team_for) {
+  TestTeamPolicy<TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Static> >::test_for(
+      0);
+  TestTeamPolicy<TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Dynamic> >::test_for(
+      0);
 
-  TestTeamPolicy< TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Static> >::test_for( 2 );
-  TestTeamPolicy< TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Dynamic> >::test_for( 2 );
+  TestTeamPolicy<TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Static> >::test_for(
+      2);
+  TestTeamPolicy<TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Dynamic> >::test_for(
+      2);
 
-  TestTeamPolicy< TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Static> >::test_for( 1000 );
-  TestTeamPolicy< TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Dynamic> >::test_for( 1000 );
+  TestTeamPolicy<TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Static> >::test_for(
+      1000);
+  TestTeamPolicy<TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Dynamic> >::test_for(
+      1000);
 }
 
-
-TEST_F( TEST_CATEGORY, team_reduce )
-{
-  TestTeamPolicy< TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Static> >::test_reduce( 0 );
-  TestTeamPolicy< TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Dynamic> >::test_reduce( 0 );
-  TestTeamPolicy< TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Static> >::test_reduce( 2 );
-  TestTeamPolicy< TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Dynamic> >::test_reduce( 2 );
-  TestTeamPolicy< TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Static> >::test_reduce( 1000 );
-  TestTeamPolicy< TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Dynamic> >::test_reduce( 1000 );
-}
+TEST_F(TEST_CATEGORY, team_reduce) {
+  TestTeamPolicy<TEST_EXECSPACE,
+                 Kokkos::Schedule<Kokkos::Static> >::test_reduce(0);
+  TestTeamPolicy<TEST_EXECSPACE,
+                 Kokkos::Schedule<Kokkos::Dynamic> >::test_reduce(0);
+  TestTeamPolicy<TEST_EXECSPACE,
+                 Kokkos::Schedule<Kokkos::Static> >::test_reduce(2);
+  TestTeamPolicy<TEST_EXECSPACE,
+                 Kokkos::Schedule<Kokkos::Dynamic> >::test_reduce(2);
+  TestTeamPolicy<TEST_EXECSPACE,
+                 Kokkos::Schedule<Kokkos::Static> >::test_reduce(1000);
+  TestTeamPolicy<TEST_EXECSPACE,
+                 Kokkos::Schedule<Kokkos::Dynamic> >::test_reduce(1000);
 }
+}  // namespace Test
 
 #include <TestTeamVector.hpp>
-
-
diff --git a/lib/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_TeamReductionScan.cpp b/lib/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_TeamReductionScan.cpp
index b8ea6ce7ae..233fd9d861 100644
--- a/lib/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_TeamReductionScan.cpp
+++ b/lib/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_TeamReductionScan.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -46,36 +47,35 @@
 
 namespace Test {
 
-
-TEST_F( TEST_CATEGORY, team_scan )
-{
-  TestScanTeam< TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Static> >( 0 );
-  TestScanTeam< TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Dynamic> >( 0 );
-  TestScanTeam< TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Static> >( 10 );
-  TestScanTeam< TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Dynamic> >( 10 );
-  TestScanTeam< TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Static> >( 10000 );
-  TestScanTeam< TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Dynamic> >( 10000 );
+TEST_F(TEST_CATEGORY, team_scan) {
+  TestScanTeam<TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Static> >(0);
+  TestScanTeam<TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Dynamic> >(0);
+  TestScanTeam<TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Static> >(10);
+  TestScanTeam<TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Dynamic> >(10);
+  TestScanTeam<TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Static> >(10000);
+  TestScanTeam<TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Dynamic> >(10000);
 }
 
-TEST_F( TEST_CATEGORY, team_long_reduce )
-{
-  TestReduceTeam< long, TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Static> >( 0 );
-  TestReduceTeam< long, TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Dynamic> >( 0 );
-  TestReduceTeam< long, TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Static> >( 3 );
-  TestReduceTeam< long, TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Dynamic> >( 3 );
-  TestReduceTeam< long, TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Static> >( 100000 );
-  TestReduceTeam< long, TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Dynamic> >( 100000 );
+TEST_F(TEST_CATEGORY, team_long_reduce) {
+  TestReduceTeam<long, TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Static> >(0);
+  TestReduceTeam<long, TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Dynamic> >(0);
+  TestReduceTeam<long, TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Static> >(3);
+  TestReduceTeam<long, TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Dynamic> >(3);
+  TestReduceTeam<long, TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Static> >(
+      100000);
+  TestReduceTeam<long, TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Dynamic> >(
+      100000);
 }
 
-TEST_F( TEST_CATEGORY, team_double_reduce )
-{
-  TestReduceTeam< double, TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Static> >( 0 );
-  TestReduceTeam< double, TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Dynamic> >( 0 );
-  TestReduceTeam< double, TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Static> >( 3 );
-  TestReduceTeam< double, TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Dynamic> >( 3 );
-  TestReduceTeam< double, TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Static> >( 100000 );
-  TestReduceTeam< double, TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Dynamic> >( 100000 );
+TEST_F(TEST_CATEGORY, team_double_reduce) {
+  TestReduceTeam<double, TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Static> >(0);
+  TestReduceTeam<double, TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Dynamic> >(0);
+  TestReduceTeam<double, TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Static> >(3);
+  TestReduceTeam<double, TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Dynamic> >(3);
+  TestReduceTeam<double, TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Static> >(
+      100000);
+  TestReduceTeam<double, TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Dynamic> >(
+      100000);
 }
 
-} // namespace Test
-
+}  // namespace Test
diff --git a/lib/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_TeamScratch.cpp b/lib/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_TeamScratch.cpp
index f13bfd2dcb..b0a75432d7 100644
--- a/lib/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_TeamScratch.cpp
+++ b/lib/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_TeamScratch.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -46,38 +47,34 @@
 
 namespace Test {
 
-TEST_F( TEST_CATEGORY, team_shared_request )
-{
-  TestSharedTeam< TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Static> >();
-  TestSharedTeam< TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Dynamic> >();
+TEST_F(TEST_CATEGORY, team_shared_request) {
+  TestSharedTeam<TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Static> >();
+  TestSharedTeam<TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Dynamic> >();
 }
 
-TEST_F( TEST_CATEGORY, team_scratch_request )
-{
-  TestScratchTeam< TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Static> >();
-  TestScratchTeam< TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Dynamic> >();
+TEST_F(TEST_CATEGORY, team_scratch_request) {
+  TestScratchTeam<TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Static> >();
+  TestScratchTeam<TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Dynamic> >();
 }
 
-#if defined( KOKKOS_ENABLE_CXX11_DISPATCH_LAMBDA )
-#if !defined(KOKKOS_ENABLE_CUDA) || ( 8000 <= CUDA_VERSION )
-TEST_F( TEST_CATEGORY, team_lambda_shared_request )
-{
-  TestLambdaSharedTeam< Kokkos::HostSpace, TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Static> >();
-  TestLambdaSharedTeam< Kokkos::HostSpace, TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Dynamic> >();
+#if defined(KOKKOS_ENABLE_CXX11_DISPATCH_LAMBDA)
+#if !defined(KOKKOS_ENABLE_CUDA) || (8000 <= CUDA_VERSION)
+TEST_F(TEST_CATEGORY, team_lambda_shared_request) {
+  TestLambdaSharedTeam<Kokkos::HostSpace, TEST_EXECSPACE,
+                       Kokkos::Schedule<Kokkos::Static> >();
+  TestLambdaSharedTeam<Kokkos::HostSpace, TEST_EXECSPACE,
+                       Kokkos::Schedule<Kokkos::Dynamic> >();
 }
 #endif
 #endif
 
-TEST_F( TEST_CATEGORY, shmem_size )
-{
-  TestShmemSize< TEST_EXECSPACE >();
+TEST_F(TEST_CATEGORY, shmem_size) { TestShmemSize<TEST_EXECSPACE>(); }
+
+TEST_F(TEST_CATEGORY, multi_level_scratch) {
+  TestMultiLevelScratchTeam<TEST_EXECSPACE,
+                            Kokkos::Schedule<Kokkos::Static> >();
+  TestMultiLevelScratchTeam<TEST_EXECSPACE,
+                            Kokkos::Schedule<Kokkos::Dynamic> >();
 }
 
-TEST_F( TEST_CATEGORY, multi_level_scratch )
-{
-  TestMultiLevelScratchTeam< TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Static> >();
-  TestMultiLevelScratchTeam< TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Dynamic> >();
-}
-
-} // namespace Test
-
+}  // namespace Test
diff --git a/lib/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_ViewAPI_a.cpp b/lib/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_ViewAPI_a.cpp
index afa9631a88..697c374b88 100644
--- a/lib/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_ViewAPI_a.cpp
+++ b/lib/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_ViewAPI_a.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
diff --git a/lib/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_ViewAPI_b.cpp b/lib/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_ViewAPI_b.cpp
index bb5272d2ce..5290d9e7b8 100644
--- a/lib/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_ViewAPI_b.cpp
+++ b/lib/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_ViewAPI_b.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
diff --git a/lib/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_ViewAPI_c.cpp b/lib/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_ViewAPI_c.cpp
index bc34437c0e..b882c5e423 100644
--- a/lib/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_ViewAPI_c.cpp
+++ b/lib/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_ViewAPI_c.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
diff --git a/lib/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_ViewAPI_d.cpp b/lib/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_ViewAPI_d.cpp
index 48478f52ad..7f85ddbc5a 100644
--- a/lib/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_ViewAPI_d.cpp
+++ b/lib/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_ViewAPI_d.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
diff --git a/lib/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_ViewAPI_e.cpp b/lib/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_ViewAPI_e.cpp
index 27f9702ff2..ff9d7fe2bc 100644
--- a/lib/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_ViewAPI_e.cpp
+++ b/lib/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_ViewAPI_e.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
diff --git a/lib/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_ViewMapping_a.cpp b/lib/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_ViewMapping_a.cpp
index b9a84fdc1f..bbacbeda7a 100644
--- a/lib/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_ViewMapping_a.cpp
+++ b/lib/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_ViewMapping_a.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -43,4 +44,3 @@
 
 #include <openmptarget/TestOpenMPTarget_Category.hpp>
 #include <TestViewMapping_a.hpp>
-
diff --git a/lib/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_ViewMapping_b.cpp b/lib/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_ViewMapping_b.cpp
index a749270ed1..87ce963598 100644
--- a/lib/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_ViewMapping_b.cpp
+++ b/lib/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_ViewMapping_b.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -43,4 +44,3 @@
 
 #include <openmptarget/TestOpenMPTarget_Category.hpp>
 #include <TestViewMapping_b.hpp>
-
diff --git a/lib/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_ViewMapping_subview.cpp b/lib/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_ViewMapping_subview.cpp
index 5dc6517529..b187afe400 100644
--- a/lib/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_ViewMapping_subview.cpp
+++ b/lib/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_ViewMapping_subview.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -43,4 +44,3 @@
 
 #include <openmptarget/TestOpenMPTarget_Category.hpp>
 #include <TestViewMapping_subview.hpp>
-
diff --git a/lib/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_ViewOfClass.cpp b/lib/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_ViewOfClass.cpp
index 9d7c49ee46..c2b40a3020 100644
--- a/lib/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_ViewOfClass.cpp
+++ b/lib/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_ViewOfClass.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -43,4 +44,3 @@
 
 #include <openmptarget/TestOpenMPTarget_Category.hpp>
 #include <TestViewOfClass.hpp>
-
diff --git a/lib/kokkos/core/unit_test/qthreads/TestQqthreads_AtomicOperations_complexdouble.cpp b/lib/kokkos/core/unit_test/qthreads/TestQqthreads_AtomicOperations_complexdouble.cpp
index f579ff2e5a..9c6589539a 100644
--- a/lib/kokkos/core/unit_test/qthreads/TestQqthreads_AtomicOperations_complexdouble.cpp
+++ b/lib/kokkos/core/unit_test/qthreads/TestQqthreads_AtomicOperations_complexdouble.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -41,6 +42,5 @@
 //@HEADER
 */
 
-#include<qthreads/TestQqthreads_Category.hpp>
-#include<TestAtomicOperations_complexdouble.hpp>
-
+#include <qthreads/TestQqthreads_Category.hpp>
+#include <TestAtomicOperations_complexdouble.hpp>
diff --git a/lib/kokkos/core/unit_test/qthreads/TestQqthreads_AtomicOperations_complexfloat.cpp b/lib/kokkos/core/unit_test/qthreads/TestQqthreads_AtomicOperations_complexfloat.cpp
index c5d1ab922c..1163da7285 100644
--- a/lib/kokkos/core/unit_test/qthreads/TestQqthreads_AtomicOperations_complexfloat.cpp
+++ b/lib/kokkos/core/unit_test/qthreads/TestQqthreads_AtomicOperations_complexfloat.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -41,6 +42,5 @@
 //@HEADER
 */
 
-#include<qthreads/TestQqthreads_Category.hpp>
-#include<TestAtomicOperations_complexfloat.hpp>
-
+#include <qthreads/TestQqthreads_Category.hpp>
+#include <TestAtomicOperations_complexfloat.hpp>
diff --git a/lib/kokkos/core/unit_test/qthreads/TestQqthreads_AtomicOperations_double.cpp b/lib/kokkos/core/unit_test/qthreads/TestQqthreads_AtomicOperations_double.cpp
index 88b50511d9..aee8ccde7f 100644
--- a/lib/kokkos/core/unit_test/qthreads/TestQqthreads_AtomicOperations_double.cpp
+++ b/lib/kokkos/core/unit_test/qthreads/TestQqthreads_AtomicOperations_double.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -41,6 +42,5 @@
 //@HEADER
 */
 
-#include<qthreads/TestQqthreads_Category.hpp>
-#include<TestAtomicOperations_double.hpp>
-
+#include <qthreads/TestQqthreads_Category.hpp>
+#include <TestAtomicOperations_double.hpp>
diff --git a/lib/kokkos/core/unit_test/qthreads/TestQqthreads_AtomicOperations_float.cpp b/lib/kokkos/core/unit_test/qthreads/TestQqthreads_AtomicOperations_float.cpp
index 683c210ffb..0bfa8d43d6 100644
--- a/lib/kokkos/core/unit_test/qthreads/TestQqthreads_AtomicOperations_float.cpp
+++ b/lib/kokkos/core/unit_test/qthreads/TestQqthreads_AtomicOperations_float.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -41,6 +42,5 @@
 //@HEADER
 */
 
-#include<qthreads/TestQqthreads_Category.hpp>
-#include<TestAtomicOperations_float.hpp>
-
+#include <qthreads/TestQqthreads_Category.hpp>
+#include <TestAtomicOperations_float.hpp>
diff --git a/lib/kokkos/core/unit_test/qthreads/TestQqthreads_AtomicOperations_int.cpp b/lib/kokkos/core/unit_test/qthreads/TestQqthreads_AtomicOperations_int.cpp
index 0fd097b765..8900daf81e 100644
--- a/lib/kokkos/core/unit_test/qthreads/TestQqthreads_AtomicOperations_int.cpp
+++ b/lib/kokkos/core/unit_test/qthreads/TestQqthreads_AtomicOperations_int.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -41,6 +42,5 @@
 //@HEADER
 */
 
-#include<qthreads/TestQqthreads_Category.hpp>
-#include<TestAtomicOperations_int.hpp>
-
+#include <qthreads/TestQqthreads_Category.hpp>
+#include <TestAtomicOperations_int.hpp>
diff --git a/lib/kokkos/core/unit_test/qthreads/TestQqthreads_AtomicOperations_longint.cpp b/lib/kokkos/core/unit_test/qthreads/TestQqthreads_AtomicOperations_longint.cpp
index 6bf510e383..9dcff92312 100644
--- a/lib/kokkos/core/unit_test/qthreads/TestQqthreads_AtomicOperations_longint.cpp
+++ b/lib/kokkos/core/unit_test/qthreads/TestQqthreads_AtomicOperations_longint.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -41,6 +42,5 @@
 //@HEADER
 */
 
-#include<qthreads/TestQqthreads_Category.hpp>
-#include<TestAtomicOperations_longint.hpp>
-
+#include <qthreads/TestQqthreads_Category.hpp>
+#include <TestAtomicOperations_longint.hpp>
diff --git a/lib/kokkos/core/unit_test/qthreads/TestQqthreads_AtomicOperations_longlongint.cpp b/lib/kokkos/core/unit_test/qthreads/TestQqthreads_AtomicOperations_longlongint.cpp
index c230e5176d..0f5a0b7df7 100644
--- a/lib/kokkos/core/unit_test/qthreads/TestQqthreads_AtomicOperations_longlongint.cpp
+++ b/lib/kokkos/core/unit_test/qthreads/TestQqthreads_AtomicOperations_longlongint.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -41,6 +42,5 @@
 //@HEADER
 */
 
-#include<qthreads/TestQqthreads_Category.hpp>
-#include<TestAtomicOperations_longlongint.hpp>
-
+#include <qthreads/TestQqthreads_Category.hpp>
+#include <TestAtomicOperations_longlongint.hpp>
diff --git a/lib/kokkos/core/unit_test/qthreads/TestQqthreads_AtomicOperations_unsignedint.cpp b/lib/kokkos/core/unit_test/qthreads/TestQqthreads_AtomicOperations_unsignedint.cpp
index 7f4a2bcdd0..eee44e84a3 100644
--- a/lib/kokkos/core/unit_test/qthreads/TestQqthreads_AtomicOperations_unsignedint.cpp
+++ b/lib/kokkos/core/unit_test/qthreads/TestQqthreads_AtomicOperations_unsignedint.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -41,6 +42,5 @@
 //@HEADER
 */
 
-#include<qthreads/TestQqthreads_Category.hpp>
-#include<TestAtomicOperations_unsignedint.hpp>
-
+#include <qthreads/TestQqthreads_Category.hpp>
+#include <TestAtomicOperations_unsignedint.hpp>
diff --git a/lib/kokkos/core/unit_test/qthreads/TestQqthreads_AtomicOperations_unsignedlongint.cpp b/lib/kokkos/core/unit_test/qthreads/TestQqthreads_AtomicOperations_unsignedlongint.cpp
index be953718ee..9379a6efa8 100644
--- a/lib/kokkos/core/unit_test/qthreads/TestQqthreads_AtomicOperations_unsignedlongint.cpp
+++ b/lib/kokkos/core/unit_test/qthreads/TestQqthreads_AtomicOperations_unsignedlongint.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -41,6 +42,5 @@
 //@HEADER
 */
 
-#include<qthreads/TestQqthreads_Category.hpp>
-#include<TestAtomicOperations_unsignedlongint.hpp>
-
+#include <qthreads/TestQqthreads_Category.hpp>
+#include <TestAtomicOperations_unsignedlongint.hpp>
diff --git a/lib/kokkos/core/unit_test/qthreads/TestQqthreads_MDRange_a.cpp b/lib/kokkos/core/unit_test/qthreads/TestQqthreads_MDRange_a.cpp
index c628c7b8c4..7067d841e3 100644
--- a/lib/kokkos/core/unit_test/qthreads/TestQqthreads_MDRange_a.cpp
+++ b/lib/kokkos/core/unit_test/qthreads/TestQqthreads_MDRange_a.cpp
@@ -3,10 +3,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -42,6 +43,5 @@
 //@HEADER
 */
 
-#include<qthreads/TestQqthreads_Category.hpp>
-#include<TestMDRange_a.hpp>
-
+#include <qthreads/TestQqthreads_Category.hpp>
+#include <TestMDRange_a.hpp>
diff --git a/lib/kokkos/core/unit_test/qthreads/TestQqthreads_MDRange_b.cpp b/lib/kokkos/core/unit_test/qthreads/TestQqthreads_MDRange_b.cpp
index 578b317944..1f4ba9c984 100644
--- a/lib/kokkos/core/unit_test/qthreads/TestQqthreads_MDRange_b.cpp
+++ b/lib/kokkos/core/unit_test/qthreads/TestQqthreads_MDRange_b.cpp
@@ -3,10 +3,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -42,6 +43,5 @@
 //@HEADER
 */
 
-#include<qthreads/TestQqthreads_Category.hpp>
-#include<TestMDRange_b.hpp>
-
+#include <qthreads/TestQqthreads_Category.hpp>
+#include <TestMDRange_b.hpp>
diff --git a/lib/kokkos/core/unit_test/qthreads/TestQqthreads_MDRange_c.cpp b/lib/kokkos/core/unit_test/qthreads/TestQqthreads_MDRange_c.cpp
index 2bfa00b55a..37b4671d05 100644
--- a/lib/kokkos/core/unit_test/qthreads/TestQqthreads_MDRange_c.cpp
+++ b/lib/kokkos/core/unit_test/qthreads/TestQqthreads_MDRange_c.cpp
@@ -3,10 +3,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -42,6 +43,5 @@
 //@HEADER
 */
 
-#include<qthreads/TestQqthreads_Category.hpp>
-#include<TestMDRange_c.hpp>
-
+#include <qthreads/TestQqthreads_Category.hpp>
+#include <TestMDRange_c.hpp>
diff --git a/lib/kokkos/core/unit_test/qthreads/TestQqthreads_MDRange_d.cpp b/lib/kokkos/core/unit_test/qthreads/TestQqthreads_MDRange_d.cpp
index 6e167b343d..2bd1fbbfd5 100644
--- a/lib/kokkos/core/unit_test/qthreads/TestQqthreads_MDRange_d.cpp
+++ b/lib/kokkos/core/unit_test/qthreads/TestQqthreads_MDRange_d.cpp
@@ -3,10 +3,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -42,6 +43,5 @@
 //@HEADER
 */
 
-#include<qthreads/TestQqthreads_Category.hpp>
-#include<TestMDRange_d.hpp>
-
+#include <qthreads/TestQqthreads_Category.hpp>
+#include <TestMDRange_d.hpp>
diff --git a/lib/kokkos/core/unit_test/qthreads/TestQqthreads_MDRange_e.cpp b/lib/kokkos/core/unit_test/qthreads/TestQqthreads_MDRange_e.cpp
index 1045fa1191..659dd23d7f 100644
--- a/lib/kokkos/core/unit_test/qthreads/TestQqthreads_MDRange_e.cpp
+++ b/lib/kokkos/core/unit_test/qthreads/TestQqthreads_MDRange_e.cpp
@@ -3,10 +3,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -42,6 +43,5 @@
 //@HEADER
 */
 
-#include<qthreads/TestQqthreads_Category.hpp>
-#include<TestMDRange_e.hpp>
-
+#include <qthreads/TestQqthreads_Category.hpp>
+#include <TestMDRange_e.hpp>
diff --git a/lib/kokkos/core/unit_test/qthreads/TestQqthreads_ViewAPI_a.cpp b/lib/kokkos/core/unit_test/qthreads/TestQqthreads_ViewAPI_a.cpp
index 1b99fda819..4339c1b5a0 100644
--- a/lib/kokkos/core/unit_test/qthreads/TestQqthreads_ViewAPI_a.cpp
+++ b/lib/kokkos/core/unit_test/qthreads/TestQqthreads_ViewAPI_a.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
diff --git a/lib/kokkos/core/unit_test/qthreads/TestQqthreads_ViewAPI_b.cpp b/lib/kokkos/core/unit_test/qthreads/TestQqthreads_ViewAPI_b.cpp
index 2f8ab0e1c1..bcbef94ab7 100644
--- a/lib/kokkos/core/unit_test/qthreads/TestQqthreads_ViewAPI_b.cpp
+++ b/lib/kokkos/core/unit_test/qthreads/TestQqthreads_ViewAPI_b.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
diff --git a/lib/kokkos/core/unit_test/qthreads/TestQqthreads_ViewAPI_c.cpp b/lib/kokkos/core/unit_test/qthreads/TestQqthreads_ViewAPI_c.cpp
index dd5f532c10..21c9fd890c 100644
--- a/lib/kokkos/core/unit_test/qthreads/TestQqthreads_ViewAPI_c.cpp
+++ b/lib/kokkos/core/unit_test/qthreads/TestQqthreads_ViewAPI_c.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
diff --git a/lib/kokkos/core/unit_test/qthreads/TestQqthreads_ViewAPI_d.cpp b/lib/kokkos/core/unit_test/qthreads/TestQqthreads_ViewAPI_d.cpp
index 11076b82bd..ef4bddc572 100644
--- a/lib/kokkos/core/unit_test/qthreads/TestQqthreads_ViewAPI_d.cpp
+++ b/lib/kokkos/core/unit_test/qthreads/TestQqthreads_ViewAPI_d.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
diff --git a/lib/kokkos/core/unit_test/qthreads/TestQqthreads_ViewAPI_e.cpp b/lib/kokkos/core/unit_test/qthreads/TestQqthreads_ViewAPI_e.cpp
index a81e0b0062..bba5916a5a 100644
--- a/lib/kokkos/core/unit_test/qthreads/TestQqthreads_ViewAPI_e.cpp
+++ b/lib/kokkos/core/unit_test/qthreads/TestQqthreads_ViewAPI_e.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
diff --git a/lib/kokkos/core/unit_test/qthreads/TestQthreads.hpp b/lib/kokkos/core/unit_test/qthreads/TestQthreads.hpp
index 989ea48ce6..c45433d77d 100644
--- a/lib/kokkos/core/unit_test/qthreads/TestQthreads.hpp
+++ b/lib/kokkos/core/unit_test/qthreads/TestQthreads.hpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -82,28 +83,27 @@
 namespace Test {
 
 class qthreads : public ::testing::Test {
-protected:
-  static void SetUpTestCase()
-  {
-    const unsigned numa_count       = Kokkos::hwloc::get_available_numa_count();
-    const unsigned cores_per_numa   = Kokkos::hwloc::get_available_cores_per_numa();
-    const unsigned threads_per_core = Kokkos::hwloc::get_available_threads_per_core();
+ protected:
+  static void SetUpTestCase() {
+    const unsigned numa_count = Kokkos::hwloc::get_available_numa_count();
+    const unsigned cores_per_numa =
+        Kokkos::hwloc::get_available_cores_per_numa();
+    const unsigned threads_per_core =
+        Kokkos::hwloc::get_available_threads_per_core();
 
-    const unsigned threads_count = std::max( 1u, numa_count ) *
-                                   std::max( 2u, ( cores_per_numa * threads_per_core ) / 2 );
+    const unsigned threads_count =
+        std::max(1u, numa_count) *
+        std::max(2u, (cores_per_numa * threads_per_core) / 2);
 
-    Kokkos::Qthreads::initialize( threads_count );
-    Kokkos::print_configuration( std::cout, true );
+    Kokkos::Qthreads::initialize(threads_count);
+    Kokkos::print_configuration(std::cout, true);
 
-    srand( 10231 );
+    srand(10231);
   }
 
-  static void TearDownTestCase()
-  {
-    Kokkos::Qthreads::finalize();
-  }
+  static void TearDownTestCase() { Kokkos::Qthreads::finalize(); }
 };
 
-} // namespace Test
+}  // namespace Test
 
 #endif
diff --git a/lib/kokkos/core/unit_test/qthreads/TestQthreads_Atomics.cpp b/lib/kokkos/core/unit_test/qthreads/TestQthreads_Atomics.cpp
index 199dbdcb9c..5642bad262 100644
--- a/lib/kokkos/core/unit_test/qthreads/TestQthreads_Atomics.cpp
+++ b/lib/kokkos/core/unit_test/qthreads/TestQthreads_Atomics.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -45,8 +46,7 @@
 
 namespace Test {
 
-TEST_F( qthreads, atomics )
-{
+TEST_F(qthreads, atomics) {
 #if 0
   const int loop_count = 1e4;
 
@@ -88,8 +88,7 @@ TEST_F( qthreads, atomics )
 #endif
 }
 
-TEST_F( qthreads, atomic_operations )
-{
+TEST_F(qthreads, atomic_operations) {
 #if 0
   const int start = 1; // Avoid zero for division.
   const int end = 11;
@@ -169,8 +168,7 @@ TEST_F( qthreads, atomic_operations )
 #endif
 }
 
-TEST_F( qthreads, atomic_views_integral )
-{
+TEST_F(qthreads, atomic_views_integral) {
 #if 0
   const long length = 1000000;
 
@@ -188,8 +186,7 @@ TEST_F( qthreads, atomic_views_integral )
 #endif
 }
 
-TEST_F( qthreads, atomic_views_nonintegral )
-{
+TEST_F(qthreads, atomic_views_nonintegral) {
 #if 0
   const long length = 1000000;
 
@@ -203,11 +200,10 @@ TEST_F( qthreads, atomic_views_nonintegral )
 #endif
 }
 
-TEST_F( qthreads, atomic_view_api )
-{
+TEST_F(qthreads, atomic_view_api) {
 #if 0
   TestAtomicViews::TestAtomicViewAPI< int, Kokkos::Qthreads >();
 #endif
 }
 
-} // namespace Test
+}  // namespace Test
diff --git a/lib/kokkos/core/unit_test/qthreads/TestQthreads_Category.hpp b/lib/kokkos/core/unit_test/qthreads/TestQthreads_Category.hpp
index fdbb88a979..fc0a088700 100644
--- a/lib/kokkos/core/unit_test/qthreads/TestQthreads_Category.hpp
+++ b/lib/kokkos/core/unit_test/qthreads/TestQthreads_Category.hpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -46,20 +47,8 @@
 
 #include <gtest/gtest.h>
 
-namespace Test {
-
-class qthreads : public ::testing::Test {
-protected:
-  static void SetUpTestCase() {
-  }
-
-  static void TearDownTestCase() {
-  }
-};
-
-} // namespace Test
-
 #define TEST_CATEGORY qthreads
+#define TEST_CATEGORY_DEATH qthreads_DeathTest
 #define TEST_EXECSPACE Kokkos::Qthreads
 
 #endif
diff --git a/lib/kokkos/core/unit_test/qthreads/TestQthreads_Complex.cpp b/lib/kokkos/core/unit_test/qthreads/TestQthreads_Complex.cpp
index 799b8454f8..09e1ca3e24 100644
--- a/lib/kokkos/core/unit_test/qthreads/TestQthreads_Complex.cpp
+++ b/lib/kokkos/core/unit_test/qthreads/TestQthreads_Complex.cpp
@@ -1,3 +1,2 @@
-#include<qthreads/TestQthreads_Category.hpp>
-#include<TestComplex.hpp>
-
+#include <qthreads/TestQthreads_Category.hpp>
+#include <TestComplex.hpp>
diff --git a/lib/kokkos/core/unit_test/qthreads/TestQthreads_DeepCopyAlignment.cpp b/lib/kokkos/core/unit_test/qthreads/TestQthreads_DeepCopyAlignment.cpp
index 22d9dbb2f1..edfaa08d29 100644
--- a/lib/kokkos/core/unit_test/qthreads/TestQthreads_DeepCopyAlignment.cpp
+++ b/lib/kokkos/core/unit_test/qthreads/TestQthreads_DeepCopyAlignment.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
diff --git a/lib/kokkos/core/unit_test/qthreads/TestQthreads_Other.cpp b/lib/kokkos/core/unit_test/qthreads/TestQthreads_Other.cpp
index a4c1ec2278..7d54616613 100644
--- a/lib/kokkos/core/unit_test/qthreads/TestQthreads_Other.cpp
+++ b/lib/kokkos/core/unit_test/qthreads/TestQthreads_Other.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -45,29 +46,23 @@
 
 namespace Test {
 
-TEST_F( qthreads, init )
-{
-  ;
-}
+TEST_F(qthreads, init) { ; }
 
-TEST_F( qthreads, md_range )
-{
+TEST_F(qthreads, md_range) {
 #if 0
   TestMDRange_2D< Kokkos::Qthreads >::test_for2( 100, 100 );
   TestMDRange_3D< Kokkos::Qthreads >::test_for3( 100, 100, 100 );
 #endif
 }
 
-TEST_F( qthreads, policy_construction )
-{
+TEST_F(qthreads, policy_construction) {
 #if 0
   TestRangePolicyConstruction< Kokkos::Qthreads >();
   TestTeamPolicyConstruction< Kokkos::Qthreads >();
 #endif
 }
 
-TEST_F( qthreads, range_tag )
-{
+TEST_F(qthreads, range_tag) {
 #if 0
   TestRange< Kokkos::Qthreads, Kokkos::Schedule<Kokkos::Static> >::test_for( 0 );
   TestRange< Kokkos::Qthreads, Kokkos::Schedule<Kokkos::Static> >::test_reduce( 0 );
@@ -99,8 +94,7 @@ TEST_F( qthreads, range_tag )
 
 //----------------------------------------------------------------------------
 
-TEST_F( qthreads, compiler_macros )
-{
+TEST_F(qthreads, compiler_macros) {
 #if 0
   ASSERT_TRUE( ( TestCompilerMacros::Test< Kokkos::Qthreads >() ) );
 #endif
@@ -108,8 +102,7 @@ TEST_F( qthreads, compiler_macros )
 
 //----------------------------------------------------------------------------
 
-TEST_F( qthreads, memory_pool )
-{
+TEST_F(qthreads, memory_pool) {
 #if 0
 
 #endif
@@ -117,10 +110,9 @@ TEST_F( qthreads, memory_pool )
 
 //----------------------------------------------------------------------------
 
-#if defined( KOKKOS_ENABLE_TASKDAG )
+#if defined(KOKKOS_ENABLE_TASKDAG)
 
-TEST_F( qthreads, task_fib )
-{
+TEST_F(qthreads, task_fib) {
 #if 0
   const int N = 24 ; // 25 triggers tbd bug on Cuda/Pascal
   for ( int i = 0; i < N; ++i ) {
@@ -129,8 +121,7 @@ TEST_F( qthreads, task_fib )
 #endif
 }
 
-TEST_F( qthreads, task_depend )
-{
+TEST_F(qthreads, task_depend) {
 #if 0
   for ( int i = 0; i < 25; ++i ) {
     TestTaskScheduler::TestTaskDependence< Kokkos::Qthreads >::run( i );
@@ -138,22 +129,20 @@ TEST_F( qthreads, task_depend )
 #endif
 }
 
-TEST_F( qthreads, task_team )
-{
+TEST_F(qthreads, task_team) {
 #if 0
   TestTaskScheduler::TestTaskTeam< Kokkos::Qthreads >::run( 1000 );
   //TestTaskScheduler::TestTaskTeamValue< Kokkos::Qthreads >::run( 1000 ); // Put back after testing.
 #endif
 }
 
-#endif // #if defined( KOKKOS_ENABLE_TASKDAG )
+#endif  // #if defined( KOKKOS_ENABLE_TASKDAG )
 
 //----------------------------------------------------------------------------
 
-#if defined( KOKKOS_ENABLE_DEFAULT_DEVICE_TYPE_QTHREADS )
+#if defined(KOKKOS_ENABLE_DEFAULT_DEVICE_TYPE_QTHREADS)
 
-TEST_F( qthreads, cxx11 )
-{
+TEST_F(qthreads, cxx11) {
 #if 0
   if ( std::is_same< Kokkos::DefaultExecutionSpace, Kokkos::Qthreads >::value ) {
     ASSERT_TRUE( ( TestCXX11::Test< Kokkos::Qthreads >( 1 ) ) );
@@ -166,8 +155,7 @@ TEST_F( qthreads, cxx11 )
 
 #endif
 
-TEST_F( qthreads, tile_layout )
-{
+TEST_F(qthreads, tile_layout) {
 #if 0
   TestTile::test< Kokkos::Qthreads, 1, 1 >( 1, 1 );
   TestTile::test< Kokkos::Qthreads, 1, 1 >( 2, 3 );
@@ -193,8 +181,7 @@ TEST_F( qthreads, tile_layout )
 #endif
 }
 
-TEST_F( qthreads, dispatch )
-{
+TEST_F(qthreads, dispatch) {
 #if 0
   const int repeat = 100;
   for ( int i = 0; i < repeat; ++i ) {
@@ -206,4 +193,4 @@ TEST_F( qthreads, dispatch )
 #endif
 }
 
-} // namespace Test
+}  // namespace Test
diff --git a/lib/kokkos/core/unit_test/qthreads/TestQthreads_Reductions.cpp b/lib/kokkos/core/unit_test/qthreads/TestQthreads_Reductions.cpp
index 6b8e001720..9e60ad123f 100644
--- a/lib/kokkos/core/unit_test/qthreads/TestQthreads_Reductions.cpp
+++ b/lib/kokkos/core/unit_test/qthreads/TestQthreads_Reductions.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -45,24 +46,21 @@
 
 namespace Test {
 
-TEST_F( qthreads, long_reduce )
-{
+TEST_F(qthreads, long_reduce) {
 #if 0
   TestReduce< long, Kokkos::Qthreads >( 0 );
   TestReduce< long, Kokkos::Qthreads >( 1000000 );
 #endif
 }
 
-TEST_F( qthreads, double_reduce )
-{
+TEST_F(qthreads, double_reduce) {
 #if 0
   TestReduce< double, Kokkos::Qthreads >( 0 );
   TestReduce< double, Kokkos::Qthreads >( 1000000 );
 #endif
 }
 
-TEST_F( qthreads, reducers )
-{
+TEST_F(qthreads, reducers) {
 #if 0
   TestReducers< int, Kokkos::Qthreads >::execute_integer();
   TestReducers< size_t, Kokkos::Qthreads >::execute_integer();
@@ -71,32 +69,28 @@ TEST_F( qthreads, reducers )
 #endif
 }
 
-TEST_F( qthreads, long_reduce_dynamic )
-{
+TEST_F(qthreads, long_reduce_dynamic) {
 #if 0
   TestReduceDynamic< long, Kokkos::Qthreads >( 0 );
   TestReduceDynamic< long, Kokkos::Qthreads >( 1000000 );
 #endif
 }
 
-TEST_F( qthreads, double_reduce_dynamic )
-{
+TEST_F(qthreads, double_reduce_dynamic) {
 #if 0
   TestReduceDynamic< double, Kokkos::Qthreads >( 0 );
   TestReduceDynamic< double, Kokkos::Qthreads >( 1000000 );
 #endif
 }
 
-TEST_F( qthreads, long_reduce_dynamic_view )
-{
+TEST_F(qthreads, long_reduce_dynamic_view) {
 #if 0
   TestReduceDynamicView< long, Kokkos::Qthreads >( 0 );
   TestReduceDynamicView< long, Kokkos::Qthreads >( 1000000 );
 #endif
 }
 
-TEST_F( qthreads, scan )
-{
+TEST_F(qthreads, scan) {
 #if 0
   TestScan< Kokkos::Qthreads >::test_range( 1, 1000 );
   TestScan< Kokkos::Qthreads >( 0 );
@@ -106,8 +100,7 @@ TEST_F( qthreads, scan )
 #endif
 }
 
-TEST_F( qthreads, scan_small )
-{
+TEST_F(qthreads, scan_small) {
 #if 0
   typedef TestScan< Kokkos::Qthreads, Kokkos::Impl::QthreadsExecUseScanSmall > TestScanFunctor;
 
@@ -122,8 +115,7 @@ TEST_F( qthreads, scan_small )
 #endif
 }
 
-TEST_F( qthreads, team_scan )
-{
+TEST_F(qthreads, team_scan) {
 #if 0
   TestScanTeam< Kokkos::Qthreads, Kokkos::Schedule<Kokkos::Static> >( 0 );
   TestScanTeam< Kokkos::Qthreads, Kokkos::Schedule<Kokkos::Dynamic> >( 0 );
@@ -134,8 +126,7 @@ TEST_F( qthreads, team_scan )
 #endif
 }
 
-TEST_F( qthreads, team_long_reduce )
-{
+TEST_F(qthreads, team_long_reduce) {
 #if 0
   TestReduceTeam< long, Kokkos::Qthreads, Kokkos::Schedule<Kokkos::Static> >( 0 );
   TestReduceTeam< long, Kokkos::Qthreads, Kokkos::Schedule<Kokkos::Dynamic> >( 0 );
@@ -146,8 +137,7 @@ TEST_F( qthreads, team_long_reduce )
 #endif
 }
 
-TEST_F( qthreads, team_double_reduce )
-{
+TEST_F(qthreads, team_double_reduce) {
 #if 0
   TestReduceTeam< double, Kokkos::Qthreads, Kokkos::Schedule<Kokkos::Static> >( 0 );
   TestReduceTeam< double, Kokkos::Qthreads, Kokkos::Schedule<Kokkos::Dynamic> >( 0 );
@@ -158,11 +148,10 @@ TEST_F( qthreads, team_double_reduce )
 #endif
 }
 
-TEST_F( qthreads, reduction_deduction )
-{
+TEST_F(qthreads, reduction_deduction) {
 #if 0
   TestCXX11::test_reduction_deduction< Kokkos::Qthreads >();
 #endif
 }
 
-} // namespace Test
+}  // namespace Test
diff --git a/lib/kokkos/core/unit_test/qthreads/TestQthreads_SubView_a.cpp b/lib/kokkos/core/unit_test/qthreads/TestQthreads_SubView_a.cpp
index 8fdee75d86..f3d3396520 100644
--- a/lib/kokkos/core/unit_test/qthreads/TestQthreads_SubView_a.cpp
+++ b/lib/kokkos/core/unit_test/qthreads/TestQthreads_SubView_a.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -45,81 +46,70 @@
 
 namespace Test {
 
-TEST_F( qthreads, view_subview_auto_1d_left )
-{
+TEST_F(qthreads, view_subview_auto_1d_left) {
 #if 0
   TestViewSubview::test_auto_1d< Kokkos::LayoutLeft, Kokkos::Qthreads >();
 #endif
 }
 
-TEST_F( qthreads, view_subview_auto_1d_right )
-{
+TEST_F(qthreads, view_subview_auto_1d_right) {
 #if 0
   TestViewSubview::test_auto_1d< Kokkos::LayoutRight, Kokkos::Qthreads >();
 #endif
 }
 
-TEST_F( qthreads, view_subview_auto_1d_stride )
-{
+TEST_F(qthreads, view_subview_auto_1d_stride) {
 #if 0
   TestViewSubview::test_auto_1d< Kokkos::LayoutStride, Kokkos::Qthreads >();
 #endif
 }
 
-TEST_F( qthreads, view_subview_assign_strided )
-{
+TEST_F(qthreads, view_subview_assign_strided) {
 #if 0
   TestViewSubview::test_1d_strided_assignment< Kokkos::Qthreads >();
 #endif
 }
 
-TEST_F( qthreads, view_subview_left_0 )
-{
+TEST_F(qthreads, view_subview_left_0) {
 #if 0
   TestViewSubview::test_left_0< Kokkos::Qthreads >();
 #endif
 }
 
-TEST_F( qthreads, view_subview_left_1 )
-{
+TEST_F(qthreads, view_subview_left_1) {
 #if 0
   TestViewSubview::test_left_1< Kokkos::Qthreads >();
 #endif
 }
 
-TEST_F( qthreads, view_subview_left_2 )
-{
+TEST_F(qthreads, view_subview_left_2) {
 #if 0
   TestViewSubview::test_left_2< Kokkos::Qthreads >();
 #endif
 }
 
-TEST_F( qthreads, view_subview_left_3 )
-{
+TEST_F(qthreads, view_subview_left_3) {
 #if 0
   TestViewSubview::test_left_3< Kokkos::Qthreads >();
 #endif
 }
 
-TEST_F( qthreads, view_subview_right_0 )
-{
+TEST_F(qthreads, view_subview_right_0) {
 #if 0
   TestViewSubview::test_right_0< Kokkos::Qthreads >();
 #endif
 }
 
-TEST_F( qthreads, view_subview_right_1 )
-{
+TEST_F(qthreads, view_subview_right_1) {
 #if 0
   TestViewSubview::test_right_1< Kokkos::Qthreads >();
 #endif
 }
 
-TEST_F( qthreads, view_subview_right_3 )
-{
+TEST_F(qthreads, view_subview_right_3) {
 #if 0
   TestViewSubview::test_right_3< Kokkos::Qthreads >();
 #endif
 }
 
-} // namespace Test
+}  // namespace Test
diff --git a/lib/kokkos/core/unit_test/qthreads/TestQthreads_SubView_b.cpp b/lib/kokkos/core/unit_test/qthreads/TestQthreads_SubView_b.cpp
index e32a42461b..6ef5dc4cf1 100644
--- a/lib/kokkos/core/unit_test/qthreads/TestQthreads_SubView_b.cpp
+++ b/lib/kokkos/core/unit_test/qthreads/TestQthreads_SubView_b.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -45,8 +46,7 @@
 
 namespace Test {
 
-TEST_F( qthreads, view_subview_layoutleft_to_layoutleft )
-{
+TEST_F(qthreads, view_subview_layoutleft_to_layoutleft) {
 #if 0
   TestViewSubview::test_layoutleft_to_layoutleft< Kokkos::Qthreads >();
   TestViewSubview::test_layoutleft_to_layoutleft< Kokkos::Qthreads, Kokkos::MemoryTraits<Kokkos::Atomic> >();
@@ -54,8 +54,7 @@ TEST_F( qthreads, view_subview_layoutleft_to_layoutleft )
 #endif
 }
 
-TEST_F( qthreads, view_subview_layoutright_to_layoutright )
-{
+TEST_F(qthreads, view_subview_layoutright_to_layoutright) {
 #if 0
   TestViewSubview::test_layoutright_to_layoutright< Kokkos::Qthreads >();
   TestViewSubview::test_layoutright_to_layoutright< Kokkos::Qthreads, Kokkos::MemoryTraits<Kokkos::Atomic> >();
@@ -63,4 +62,4 @@ TEST_F( qthreads, view_subview_layoutright_to_layoutright )
 #endif
 }
 
-} // namespace Test
+}  // namespace Test
diff --git a/lib/kokkos/core/unit_test/qthreads/TestQthreads_SubView_c01.cpp b/lib/kokkos/core/unit_test/qthreads/TestQthreads_SubView_c01.cpp
index a0ada2859d..1f560c24f6 100644
--- a/lib/kokkos/core/unit_test/qthreads/TestQthreads_SubView_c01.cpp
+++ b/lib/kokkos/core/unit_test/qthreads/TestQthreads_SubView_c01.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -45,11 +46,10 @@
 
 namespace Test {
 
-TEST_F( qthreads, view_subview_1d_assign )
-{
+TEST_F(qthreads, view_subview_1d_assign) {
 #if 0
   TestViewSubview::test_1d_assign< Kokkos::Qthreads >();
 #endif
 }
 
-} // namespace Test
+}  // namespace Test
diff --git a/lib/kokkos/core/unit_test/qthreads/TestQthreads_SubView_c02.cpp b/lib/kokkos/core/unit_test/qthreads/TestQthreads_SubView_c02.cpp
index 1b0e098113..e4065d22b2 100644
--- a/lib/kokkos/core/unit_test/qthreads/TestQthreads_SubView_c02.cpp
+++ b/lib/kokkos/core/unit_test/qthreads/TestQthreads_SubView_c02.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -45,11 +46,10 @@
 
 namespace Test {
 
-TEST_F( qthreads, view_subview_1d_assign_atomic )
-{
+TEST_F(qthreads, view_subview_1d_assign_atomic) {
 #if 0
   TestViewSubview::test_1d_assign< Kokkos::Qthreads, Kokkos::MemoryTraits<Kokkos::Atomic> >();
 #endif
 }
 
-} // namespace Test
+}  // namespace Test
diff --git a/lib/kokkos/core/unit_test/qthreads/TestQthreads_SubView_c03.cpp b/lib/kokkos/core/unit_test/qthreads/TestQthreads_SubView_c03.cpp
index 2062fbeaf0..89b68ae42c 100644
--- a/lib/kokkos/core/unit_test/qthreads/TestQthreads_SubView_c03.cpp
+++ b/lib/kokkos/core/unit_test/qthreads/TestQthreads_SubView_c03.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -45,11 +46,10 @@
 
 namespace Test {
 
-TEST_F( qthreads, view_subview_1d_assign_randomaccess )
-{
+TEST_F(qthreads, view_subview_1d_assign_randomaccess) {
 #if 0
   TestViewSubview::test_1d_assign< Kokkos::Qthreads, Kokkos::MemoryTraits<Kokkos::RandomAccess> >();
 #endif
 }
 
-} // namespace Test
+}  // namespace Test
diff --git a/lib/kokkos/core/unit_test/qthreads/TestQthreads_SubView_c04.cpp b/lib/kokkos/core/unit_test/qthreads/TestQthreads_SubView_c04.cpp
index 07b84de90e..0ee4d6887c 100644
--- a/lib/kokkos/core/unit_test/qthreads/TestQthreads_SubView_c04.cpp
+++ b/lib/kokkos/core/unit_test/qthreads/TestQthreads_SubView_c04.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -45,11 +46,10 @@
 
 namespace Test {
 
-TEST_F( qthreads, view_subview_2d_from_3d )
-{
+TEST_F(qthreads, view_subview_2d_from_3d) {
 #if 0
   TestViewSubview::test_2d_subview_3d< Kokkos::Qthreads >();
 #endif
 }
 
-} // namespace Test
+}  // namespace Test
diff --git a/lib/kokkos/core/unit_test/qthreads/TestQthreads_SubView_c05.cpp b/lib/kokkos/core/unit_test/qthreads/TestQthreads_SubView_c05.cpp
index 4d5d2a9915..1e6b673662 100644
--- a/lib/kokkos/core/unit_test/qthreads/TestQthreads_SubView_c05.cpp
+++ b/lib/kokkos/core/unit_test/qthreads/TestQthreads_SubView_c05.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -45,11 +46,10 @@
 
 namespace Test {
 
-TEST_F( qthreads, view_subview_2d_from_3d_atomic )
-{
+TEST_F(qthreads, view_subview_2d_from_3d_atomic) {
 #if 0
   TestViewSubview::test_2d_subview_3d< Kokkos::Qthreads, Kokkos::MemoryTraits<Kokkos::Atomic> >();
 #endif
 }
 
-} // namespace Test
+}  // namespace Test
diff --git a/lib/kokkos/core/unit_test/qthreads/TestQthreads_SubView_c06.cpp b/lib/kokkos/core/unit_test/qthreads/TestQthreads_SubView_c06.cpp
index 4330f00a62..b2ef924f87 100644
--- a/lib/kokkos/core/unit_test/qthreads/TestQthreads_SubView_c06.cpp
+++ b/lib/kokkos/core/unit_test/qthreads/TestQthreads_SubView_c06.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -45,11 +46,10 @@
 
 namespace Test {
 
-TEST_F( qthreads, view_subview_2d_from_3d_randomaccess )
-{
+TEST_F(qthreads, view_subview_2d_from_3d_randomaccess) {
 #if 0
   TestViewSubview::test_2d_subview_3d< Kokkos::Qthreads, Kokkos::MemoryTraits<Kokkos::RandomAccess> >();
 #endif
 }
 
-} // namespace Test
+}  // namespace Test
diff --git a/lib/kokkos/core/unit_test/qthreads/TestQthreads_SubView_c07.cpp b/lib/kokkos/core/unit_test/qthreads/TestQthreads_SubView_c07.cpp
index 154f5de694..5857f67d19 100644
--- a/lib/kokkos/core/unit_test/qthreads/TestQthreads_SubView_c07.cpp
+++ b/lib/kokkos/core/unit_test/qthreads/TestQthreads_SubView_c07.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -45,11 +46,10 @@
 
 namespace Test {
 
-TEST_F( qthreads, view_subview_3d_from_5d_left )
-{
+TEST_F(qthreads, view_subview_3d_from_5d_left) {
 #if 0
   TestViewSubview::test_3d_subview_5d_left< Kokkos::Qthreads >();
 #endif
 }
 
-} // namespace Test
+}  // namespace Test
diff --git a/lib/kokkos/core/unit_test/qthreads/TestQthreads_SubView_c08.cpp b/lib/kokkos/core/unit_test/qthreads/TestQthreads_SubView_c08.cpp
index 66832558de..0bc591c128 100644
--- a/lib/kokkos/core/unit_test/qthreads/TestQthreads_SubView_c08.cpp
+++ b/lib/kokkos/core/unit_test/qthreads/TestQthreads_SubView_c08.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -45,11 +46,10 @@
 
 namespace Test {
 
-TEST_F( qthreads, view_subview_3d_from_5d_left_atomic )
-{
+TEST_F(qthreads, view_subview_3d_from_5d_left_atomic) {
 #if 0
   TestViewSubview::test_3d_subview_5d_left< Kokkos::Qthreads, Kokkos::MemoryTraits<Kokkos::Atomic> >();
 #endif
 }
 
-} // namespace Test
+}  // namespace Test
diff --git a/lib/kokkos/core/unit_test/qthreads/TestQthreads_SubView_c09.cpp b/lib/kokkos/core/unit_test/qthreads/TestQthreads_SubView_c09.cpp
index 5305ce1def..45d878fcea 100644
--- a/lib/kokkos/core/unit_test/qthreads/TestQthreads_SubView_c09.cpp
+++ b/lib/kokkos/core/unit_test/qthreads/TestQthreads_SubView_c09.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -45,11 +46,10 @@
 
 namespace Test {
 
-TEST_F( qthreads, view_subview_3d_from_5d_left_randomaccess )
-{
+TEST_F(qthreads, view_subview_3d_from_5d_left_randomaccess) {
 #if 0
   TestViewSubview::test_3d_subview_5d_left< Kokkos::Qthreads, Kokkos::MemoryTraits<Kokkos::RandomAccess> >();
 #endif
 }
 
-} // namespace Test
+}  // namespace Test
diff --git a/lib/kokkos/core/unit_test/qthreads/TestQthreads_SubView_c10.cpp b/lib/kokkos/core/unit_test/qthreads/TestQthreads_SubView_c10.cpp
index 039414a681..e42c464020 100644
--- a/lib/kokkos/core/unit_test/qthreads/TestQthreads_SubView_c10.cpp
+++ b/lib/kokkos/core/unit_test/qthreads/TestQthreads_SubView_c10.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -45,11 +46,10 @@
 
 namespace Test {
 
-TEST_F( qthreads, view_subview_3d_from_5d_right )
-{
+TEST_F(qthreads, view_subview_3d_from_5d_right) {
 #if 0
   TestViewSubview::test_3d_subview_5d_right< Kokkos::Qthreads >();
 #endif
 }
 
-} // namespace Test
+}  // namespace Test
diff --git a/lib/kokkos/core/unit_test/qthreads/TestQthreads_SubView_c11.cpp b/lib/kokkos/core/unit_test/qthreads/TestQthreads_SubView_c11.cpp
index 05dcde77e2..6bfd19ad65 100644
--- a/lib/kokkos/core/unit_test/qthreads/TestQthreads_SubView_c11.cpp
+++ b/lib/kokkos/core/unit_test/qthreads/TestQthreads_SubView_c11.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -45,11 +46,10 @@
 
 namespace Test {
 
-TEST_F( qthreads, view_subview_3d_from_5d_right_atomic )
-{
+TEST_F(qthreads, view_subview_3d_from_5d_right_atomic) {
 #if 0
   TestViewSubview::test_3d_subview_5d_right< Kokkos::Qthreads, Kokkos::MemoryTraits<Kokkos::Atomic> >();
 #endif
 }
 
-} // namespace Test
+}  // namespace Test
diff --git a/lib/kokkos/core/unit_test/qthreads/TestQthreads_SubView_c12.cpp b/lib/kokkos/core/unit_test/qthreads/TestQthreads_SubView_c12.cpp
index 58d79d609d..9b6896d3ee 100644
--- a/lib/kokkos/core/unit_test/qthreads/TestQthreads_SubView_c12.cpp
+++ b/lib/kokkos/core/unit_test/qthreads/TestQthreads_SubView_c12.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -45,11 +46,10 @@
 
 namespace Test {
 
-TEST_F( qthreads, view_subview_3d_from_5d_right_randomaccess )
-{
+TEST_F(qthreads, view_subview_3d_from_5d_right_randomaccess) {
 #if 0
   TestViewSubview::test_3d_subview_5d_right< Kokkos::Qthreads, Kokkos::MemoryTraits<Kokkos::RandomAccess> >();
 #endif
 }
 
-} // namespace Test
+}  // namespace Test
diff --git a/lib/kokkos/core/unit_test/qthreads/TestQthreads_SubView_c13.cpp b/lib/kokkos/core/unit_test/qthreads/TestQthreads_SubView_c13.cpp
index 347c4a5b86..e03190d514 100644
--- a/lib/kokkos/core/unit_test/qthreads/TestQthreads_SubView_c13.cpp
+++ b/lib/kokkos/core/unit_test/qthreads/TestQthreads_SubView_c13.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -45,11 +46,10 @@
 
 namespace Test {
 
-TEST_F( qthreads, view_test_unmanaged_subview_reset )
-{
+TEST_F(qthreads, view_test_unmanaged_subview_reset) {
 #if 0
   TestViewSubview::test_unmanaged_subview_reset< TEST_EXECSPACE >();
 #endif
 }
 
-} // namespace Test
+}  // namespace Test
diff --git a/lib/kokkos/core/unit_test/qthreads/TestQthreads_Team.cpp b/lib/kokkos/core/unit_test/qthreads/TestQthreads_Team.cpp
index 2b0d397804..6a4d9323a7 100644
--- a/lib/kokkos/core/unit_test/qthreads/TestQthreads_Team.cpp
+++ b/lib/kokkos/core/unit_test/qthreads/TestQthreads_Team.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -45,8 +46,7 @@
 
 namespace Test {
 
-TEST_F( qthreads, team_tag )
-{
+TEST_F(qthreads, team_tag) {
 #if 0
   TestTeamPolicy< Kokkos::Qthreads, Kokkos::Schedule<Kokkos::Static> >::test_for( 0 );
   TestTeamPolicy< Kokkos::Qthreads, Kokkos::Schedule<Kokkos::Static> >::test_reduce( 0 );
@@ -65,25 +65,22 @@ TEST_F( qthreads, team_tag )
 #endif
 }
 
-TEST_F( qthreads, team_shared_request )
-{
+TEST_F(qthreads, team_shared_request) {
 #if 0
   TestSharedTeam< Kokkos::Qthreads, Kokkos::Schedule<Kokkos::Static> >();
   TestSharedTeam< Kokkos::Qthreads, Kokkos::Schedule<Kokkos::Dynamic> >();
 #endif
 }
 
-TEST_F( qthreads, team_scratch_request )
-{
+TEST_F(qthreads, team_scratch_request) {
 #if 0
   TestScratchTeam< Kokkos::Qthreads, Kokkos::Schedule<Kokkos::Static> >();
   TestScratchTeam< Kokkos::Qthreads, Kokkos::Schedule<Kokkos::Dynamic> >();
 #endif
 }
 
-#if defined( KOKKOS_ENABLE_CXX11_DISPATCH_LAMBDA )
-TEST_F( qthreads, team_lambda_shared_request )
-{
+#if defined(KOKKOS_ENABLE_CXX11_DISPATCH_LAMBDA)
+TEST_F(qthreads, team_lambda_shared_request) {
 #if 0
   TestLambdaSharedTeam< Kokkos::HostSpace, Kokkos::Qthreads, Kokkos::Schedule<Kokkos::Static> >();
   TestLambdaSharedTeam< Kokkos::HostSpace, Kokkos::Qthreads, Kokkos::Schedule<Kokkos::Dynamic> >();
@@ -91,23 +88,20 @@ TEST_F( qthreads, team_lambda_shared_request )
 }
 #endif
 
-TEST_F( qthreads, shmem_size )
-{
+TEST_F(qthreads, shmem_size) {
 #if 0
   TestShmemSize< Kokkos::Qthreads >();
 #endif
 }
 
-TEST_F( qthreads, multi_level_scratch )
-{
+TEST_F(qthreads, multi_level_scratch) {
 #if 0
   TestMultiLevelScratchTeam< Kokkos::Qthreads, Kokkos::Schedule<Kokkos::Static> >();
   TestMultiLevelScratchTeam< Kokkos::Qthreads, Kokkos::Schedule<Kokkos::Dynamic> >();
 #endif
 }
 
-TEST_F( qthreads, team_vector )
-{
+TEST_F(qthreads, team_vector) {
 #if 0
   ASSERT_TRUE( ( TestTeamVector::Test< Kokkos::Qthreads >( 0 ) ) );
   ASSERT_TRUE( ( TestTeamVector::Test< Kokkos::Qthreads >( 1 ) ) );
@@ -124,14 +118,13 @@ TEST_F( qthreads, team_vector )
 }
 
 #ifdef KOKKOS_COMPILER_GNU
-#if ( KOKKOS_COMPILER_GNU == 472 )
+#if (KOKKOS_COMPILER_GNU == 472)
 #define SKIP_TEST
 #endif
 #endif
 
 #ifndef SKIP_TEST
-TEST_F( qthreads, triple_nested_parallelism )
-{
+TEST_F(qthreads, triple_nested_parallelism) {
 #if 0
   TestTripleNestedReduce< double, Kokkos::Qthreads >( 8192, 2048, 32, 32 );
   TestTripleNestedReduce< double, Kokkos::Qthreads >( 8192, 2048, 32, 16 );
@@ -140,4 +133,4 @@ TEST_F( qthreads, triple_nested_parallelism )
 }
 #endif
 
-} // namespace Test
+}  // namespace Test
diff --git a/lib/kokkos/core/unit_test/qthreads/TestQthreads_ViewAPI_a.cpp b/lib/kokkos/core/unit_test/qthreads/TestQthreads_ViewAPI_a.cpp
index a68049e79d..fad6473d20 100644
--- a/lib/kokkos/core/unit_test/qthreads/TestQthreads_ViewAPI_a.cpp
+++ b/lib/kokkos/core/unit_test/qthreads/TestQthreads_ViewAPI_a.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -45,12 +46,11 @@
 
 namespace Test {
 
-TEST_F( qthreads, impl_view_mapping_a )
-{
+TEST_F(qthreads, impl_view_mapping_a) {
 #if 0
   test_view_mapping< Kokkos::Qthreads >();
   test_view_mapping_operator< Kokkos::Qthreads >();
 #endif
 }
 
-} // namespace Test
+}  // namespace Test
diff --git a/lib/kokkos/core/unit_test/qthreads/TestQthreads_ViewAPI_b.cpp b/lib/kokkos/core/unit_test/qthreads/TestQthreads_ViewAPI_b.cpp
index 3bfd1763b8..b37937369a 100644
--- a/lib/kokkos/core/unit_test/qthreads/TestQthreads_ViewAPI_b.cpp
+++ b/lib/kokkos/core/unit_test/qthreads/TestQthreads_ViewAPI_b.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -45,37 +46,32 @@
 
 namespace Test {
 
-TEST_F( qthreads, impl_shared_alloc )
-{
+TEST_F(qthreads, impl_shared_alloc) {
 #if 0
   test_shared_alloc< Kokkos::HostSpace, Kokkos::Qthreads >();
 #endif
 }
 
-TEST_F( qthreads, impl_view_mapping_b )
-{
+TEST_F(qthreads, impl_view_mapping_b) {
 #if 0
   test_view_mapping_subview< Kokkos::Qthreads >();
   TestViewMappingAtomic< Kokkos::Qthreads >::run();
 #endif
 }
 
-TEST_F( qthreads, view_api )
-{
+TEST_F(qthreads, view_api) {
 #if 0
   TestViewAPI< double, Kokkos::Qthreads >();
 #endif
 }
 
-TEST_F( qthreads, view_nested_view )
-{
+TEST_F(qthreads, view_nested_view) {
 #if 0
   ::Test::view_nested_view< Kokkos::Qthreads >();
 #endif
 }
 
-TEST_F( qthreads, view_remap )
-{
+TEST_F(qthreads, view_remap) {
 #if 0
   enum { N0 = 3, N1 = 2, N2 = 8, N3 = 9 };
 
@@ -121,18 +117,16 @@ TEST_F( qthreads, view_remap )
 #endif
 }
 
-TEST_F( qthreads, view_aggregate )
-{
+TEST_F(qthreads, view_aggregate) {
 #if 0
   TestViewAggregate< Kokkos::Qthreads >();
 #endif
 }
 
-TEST_F( qthreads, template_meta_functions )
-{
+TEST_F(qthreads, template_meta_functions) {
 #if 0
   TestTemplateMetaFunctions< int, Kokkos::Qthreads >();
 #endif
 }
 
-} // namespace Test
+}  // namespace Test
diff --git a/lib/kokkos/core/unit_test/rocm/TestROCmHostPinned_Category.hpp b/lib/kokkos/core/unit_test/rocm/TestROCmHostPinned_Category.hpp
index 208de62e07..fc74d52b44 100644
--- a/lib/kokkos/core/unit_test/rocm/TestROCmHostPinned_Category.hpp
+++ b/lib/kokkos/core/unit_test/rocm/TestROCmHostPinned_Category.hpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -46,20 +47,8 @@
 
 #include <gtest/gtest.h>
 
-namespace Test {
-
-class rocm_hostpinned : public ::testing::Test {
-protected:
-  static void SetUpTestCase() {
-  }
-
-  static void TearDownTestCase() {
-  }
-};
-
-} // namespace Test
-
 #define TEST_CATEGORY rocm_hostpinned
+#define TEST_CATEGORY_DEATH rocm_hostpinned_DeathTest
 #define TEST_EXECSPACE Kokkos::Experimental::ROCmHostPinnedSpace
 
 #endif
diff --git a/lib/kokkos/core/unit_test/rocm/TestROCmHostPinned_SharedAlloc.cpp b/lib/kokkos/core/unit_test/rocm/TestROCmHostPinned_SharedAlloc.cpp
index de058aaead..091cd74991 100644
--- a/lib/kokkos/core/unit_test/rocm/TestROCmHostPinned_SharedAlloc.cpp
+++ b/lib/kokkos/core/unit_test/rocm/TestROCmHostPinned_SharedAlloc.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -46,10 +47,8 @@
 
 namespace Test {
 
-
-TEST_F( TEST_CATEGORY, impl_shared_alloc )
-{
-  test_shared_alloc< TEST_EXECSPACE, Kokkos::DefaultHostExecutionSpace >();
+TEST_F(TEST_CATEGORY, impl_shared_alloc) {
+  test_shared_alloc<TEST_EXECSPACE, Kokkos::DefaultHostExecutionSpace>();
 }
 
-} // namespace Test
+}  // namespace Test
diff --git a/lib/kokkos/core/unit_test/rocm/TestROCmHostPinned_ViewAPI_a.cpp b/lib/kokkos/core/unit_test/rocm/TestROCmHostPinned_ViewAPI_a.cpp
index 611f99c2dc..b3cce0daf6 100644
--- a/lib/kokkos/core/unit_test/rocm/TestROCmHostPinned_ViewAPI_a.cpp
+++ b/lib/kokkos/core/unit_test/rocm/TestROCmHostPinned_ViewAPI_a.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
diff --git a/lib/kokkos/core/unit_test/rocm/TestROCmHostPinned_ViewAPI_b.cpp b/lib/kokkos/core/unit_test/rocm/TestROCmHostPinned_ViewAPI_b.cpp
index 4a391406b7..edebed6961 100644
--- a/lib/kokkos/core/unit_test/rocm/TestROCmHostPinned_ViewAPI_b.cpp
+++ b/lib/kokkos/core/unit_test/rocm/TestROCmHostPinned_ViewAPI_b.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
diff --git a/lib/kokkos/core/unit_test/rocm/TestROCmHostPinned_ViewAPI_c.cpp b/lib/kokkos/core/unit_test/rocm/TestROCmHostPinned_ViewAPI_c.cpp
index e121ba68ed..e2ffbd16a3 100644
--- a/lib/kokkos/core/unit_test/rocm/TestROCmHostPinned_ViewAPI_c.cpp
+++ b/lib/kokkos/core/unit_test/rocm/TestROCmHostPinned_ViewAPI_c.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
diff --git a/lib/kokkos/core/unit_test/rocm/TestROCmHostPinned_ViewAPI_d.cpp b/lib/kokkos/core/unit_test/rocm/TestROCmHostPinned_ViewAPI_d.cpp
index 00eb98dc48..c88b1ecd3d 100644
--- a/lib/kokkos/core/unit_test/rocm/TestROCmHostPinned_ViewAPI_d.cpp
+++ b/lib/kokkos/core/unit_test/rocm/TestROCmHostPinned_ViewAPI_d.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
diff --git a/lib/kokkos/core/unit_test/rocm/TestROCmHostPinned_ViewAPI_e.cpp b/lib/kokkos/core/unit_test/rocm/TestROCmHostPinned_ViewAPI_e.cpp
index c62ec627d0..216f72bd6b 100644
--- a/lib/kokkos/core/unit_test/rocm/TestROCmHostPinned_ViewAPI_e.cpp
+++ b/lib/kokkos/core/unit_test/rocm/TestROCmHostPinned_ViewAPI_e.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
diff --git a/lib/kokkos/core/unit_test/rocm/TestROCmHostPinned_ViewCopy.cpp b/lib/kokkos/core/unit_test/rocm/TestROCmHostPinned_ViewCopy.cpp
index 4636691d99..197c4c6794 100644
--- a/lib/kokkos/core/unit_test/rocm/TestROCmHostPinned_ViewCopy.cpp
+++ b/lib/kokkos/core/unit_test/rocm/TestROCmHostPinned_ViewCopy.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
diff --git a/lib/kokkos/core/unit_test/rocm/TestROCmHostPinned_ViewMapping_a.cpp b/lib/kokkos/core/unit_test/rocm/TestROCmHostPinned_ViewMapping_a.cpp
index 1e44f51778..d1cb384b10 100644
--- a/lib/kokkos/core/unit_test/rocm/TestROCmHostPinned_ViewMapping_a.cpp
+++ b/lib/kokkos/core/unit_test/rocm/TestROCmHostPinned_ViewMapping_a.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -43,4 +44,3 @@
 
 #include <rocm/TestROCmHostPinned_Category.hpp>
 #include <TestViewMapping_a.hpp>
-
diff --git a/lib/kokkos/core/unit_test/rocm/TestROCmHostPinned_ViewMapping_b.cpp b/lib/kokkos/core/unit_test/rocm/TestROCmHostPinned_ViewMapping_b.cpp
index a5d68a0c61..cde6d74509 100644
--- a/lib/kokkos/core/unit_test/rocm/TestROCmHostPinned_ViewMapping_b.cpp
+++ b/lib/kokkos/core/unit_test/rocm/TestROCmHostPinned_ViewMapping_b.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -43,4 +44,3 @@
 
 #include <rocm/TestROCmHostPinned_Category.hpp>
 #include <TestViewMapping_b.hpp>
-
diff --git a/lib/kokkos/core/unit_test/rocm/TestROCmHostPinned_ViewMapping_subview.cpp b/lib/kokkos/core/unit_test/rocm/TestROCmHostPinned_ViewMapping_subview.cpp
index ef9b8e3702..77deaedde3 100644
--- a/lib/kokkos/core/unit_test/rocm/TestROCmHostPinned_ViewMapping_subview.cpp
+++ b/lib/kokkos/core/unit_test/rocm/TestROCmHostPinned_ViewMapping_subview.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -43,4 +44,3 @@
 
 #include <rocm/TestROCmHostPinned_Category.hpp>
 #include <TestViewMapping_subview.hpp>
-
diff --git a/lib/kokkos/core/unit_test/rocm/TestROCmHostPinned_View_64bit.cpp b/lib/kokkos/core/unit_test/rocm/TestROCmHostPinned_View_64bit.cpp
index d304f53cf7..e21aeafe7b 100644
--- a/lib/kokkos/core/unit_test/rocm/TestROCmHostPinned_View_64bit.cpp
+++ b/lib/kokkos/core/unit_test/rocm/TestROCmHostPinned_View_64bit.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
diff --git a/lib/kokkos/core/unit_test/rocm/TestROCm_AtomicOperations_double.cpp b/lib/kokkos/core/unit_test/rocm/TestROCm_AtomicOperations_double.cpp
index d5d97a4584..98bda06278 100644
--- a/lib/kokkos/core/unit_test/rocm/TestROCm_AtomicOperations_double.cpp
+++ b/lib/kokkos/core/unit_test/rocm/TestROCm_AtomicOperations_double.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -41,6 +42,5 @@
 //@HEADER
 */
 
-#include<rocm/TestROCm_Category.hpp>
-#include<TestAtomicOperations_double.hpp>
-
+#include <rocm/TestROCm_Category.hpp>
+#include <TestAtomicOperations_double.hpp>
diff --git a/lib/kokkos/core/unit_test/rocm/TestROCm_AtomicOperations_float.cpp b/lib/kokkos/core/unit_test/rocm/TestROCm_AtomicOperations_float.cpp
index c7aef83a2c..c8f85dccf2 100644
--- a/lib/kokkos/core/unit_test/rocm/TestROCm_AtomicOperations_float.cpp
+++ b/lib/kokkos/core/unit_test/rocm/TestROCm_AtomicOperations_float.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -41,6 +42,5 @@
 //@HEADER
 */
 
-#include<rocm/TestROCm_Category.hpp>
-#include<TestAtomicOperations_float.hpp>
-
+#include <rocm/TestROCm_Category.hpp>
+#include <TestAtomicOperations_float.hpp>
diff --git a/lib/kokkos/core/unit_test/rocm/TestROCm_AtomicOperations_int.cpp b/lib/kokkos/core/unit_test/rocm/TestROCm_AtomicOperations_int.cpp
index 282741f224..83d36857ec 100644
--- a/lib/kokkos/core/unit_test/rocm/TestROCm_AtomicOperations_int.cpp
+++ b/lib/kokkos/core/unit_test/rocm/TestROCm_AtomicOperations_int.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -41,6 +42,5 @@
 //@HEADER
 */
 
-#include<rocm/TestROCm_Category.hpp>
-#include<TestAtomicOperations_int.hpp>
-
+#include <rocm/TestROCm_Category.hpp>
+#include <TestAtomicOperations_int.hpp>
diff --git a/lib/kokkos/core/unit_test/rocm/TestROCm_AtomicOperations_longint.cpp b/lib/kokkos/core/unit_test/rocm/TestROCm_AtomicOperations_longint.cpp
index cd179d8bed..a0e02160f5 100644
--- a/lib/kokkos/core/unit_test/rocm/TestROCm_AtomicOperations_longint.cpp
+++ b/lib/kokkos/core/unit_test/rocm/TestROCm_AtomicOperations_longint.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -41,6 +42,5 @@
 //@HEADER
 */
 
-#include<rocm/TestROCm_Category.hpp>
-#include<TestAtomicOperations_longint.hpp>
-
+#include <rocm/TestROCm_Category.hpp>
+#include <TestAtomicOperations_longint.hpp>
diff --git a/lib/kokkos/core/unit_test/rocm/TestROCm_AtomicOperations_longlongint.cpp b/lib/kokkos/core/unit_test/rocm/TestROCm_AtomicOperations_longlongint.cpp
index 636d51a4b1..d7dac704e7 100644
--- a/lib/kokkos/core/unit_test/rocm/TestROCm_AtomicOperations_longlongint.cpp
+++ b/lib/kokkos/core/unit_test/rocm/TestROCm_AtomicOperations_longlongint.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -41,6 +42,5 @@
 //@HEADER
 */
 
-#include<rocm/TestROCm_Category.hpp>
-#include<TestAtomicOperations_longlongint.hpp>
-
+#include <rocm/TestROCm_Category.hpp>
+#include <TestAtomicOperations_longlongint.hpp>
diff --git a/lib/kokkos/core/unit_test/rocm/TestROCm_AtomicOperations_unsignedint.cpp b/lib/kokkos/core/unit_test/rocm/TestROCm_AtomicOperations_unsignedint.cpp
index f10ddde877..b3c4cf271b 100644
--- a/lib/kokkos/core/unit_test/rocm/TestROCm_AtomicOperations_unsignedint.cpp
+++ b/lib/kokkos/core/unit_test/rocm/TestROCm_AtomicOperations_unsignedint.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -41,6 +42,5 @@
 //@HEADER
 */
 
-#include<rocm/TestROCm_Category.hpp>
-#include<TestAtomicOperations_unsignedint.hpp>
-
+#include <rocm/TestROCm_Category.hpp>
+#include <TestAtomicOperations_unsignedint.hpp>
diff --git a/lib/kokkos/core/unit_test/rocm/TestROCm_AtomicOperations_unsignedlongint.cpp b/lib/kokkos/core/unit_test/rocm/TestROCm_AtomicOperations_unsignedlongint.cpp
index 4e9bd8a86e..0e6873ed44 100644
--- a/lib/kokkos/core/unit_test/rocm/TestROCm_AtomicOperations_unsignedlongint.cpp
+++ b/lib/kokkos/core/unit_test/rocm/TestROCm_AtomicOperations_unsignedlongint.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -41,6 +42,5 @@
 //@HEADER
 */
 
-#include<rocm/TestROCm_Category.hpp>
-#include<TestAtomicOperations_unsignedlongint.hpp>
-
+#include <rocm/TestROCm_Category.hpp>
+#include <TestAtomicOperations_unsignedlongint.hpp>
diff --git a/lib/kokkos/core/unit_test/rocm/TestROCm_AtomicViews.cpp b/lib/kokkos/core/unit_test/rocm/TestROCm_AtomicViews.cpp
index 385fbe8bbb..393562b88e 100644
--- a/lib/kokkos/core/unit_test/rocm/TestROCm_AtomicViews.cpp
+++ b/lib/kokkos/core/unit_test/rocm/TestROCm_AtomicViews.cpp
@@ -3,10 +3,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -42,6 +43,5 @@
 //@HEADER
 */
 
-#include<rocm/TestROCm_Category.hpp>
-#include<TestAtomicViews.hpp>
-
+#include <rocm/TestROCm_Category.hpp>
+#include <TestAtomicViews.hpp>
diff --git a/lib/kokkos/core/unit_test/rocm/TestROCm_Atomics.cpp b/lib/kokkos/core/unit_test/rocm/TestROCm_Atomics.cpp
index a7cbc3de2f..2de70cd9ff 100644
--- a/lib/kokkos/core/unit_test/rocm/TestROCm_Atomics.cpp
+++ b/lib/kokkos/core/unit_test/rocm/TestROCm_Atomics.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -43,4 +44,3 @@
 
 #include <rocm/TestROCm_Category.hpp>
 #include <TestAtomic.hpp>
-
diff --git a/lib/kokkos/core/unit_test/rocm/TestROCm_Category.hpp b/lib/kokkos/core/unit_test/rocm/TestROCm_Category.hpp
index d520bbc5a7..f89b18f498 100644
--- a/lib/kokkos/core/unit_test/rocm/TestROCm_Category.hpp
+++ b/lib/kokkos/core/unit_test/rocm/TestROCm_Category.hpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -46,20 +47,8 @@
 
 #include <gtest/gtest.h>
 
-namespace Test {
-
-class rocm : public ::testing::Test {
-protected:
-  static void SetUpTestCase() {
-  }
-
-  static void TearDownTestCase() {
-  }
-};
-
-} // namespace Test
-
 #define TEST_CATEGORY rocm
+#define TEST_CATEGORY_DEATH rocm_DeathTest
 #define TEST_EXECSPACE Kokkos::Experimental::ROCm
 
 #endif
diff --git a/lib/kokkos/core/unit_test/rocm/TestROCm_Complex.cpp b/lib/kokkos/core/unit_test/rocm/TestROCm_Complex.cpp
index 5488925a5d..0e9e92addc 100644
--- a/lib/kokkos/core/unit_test/rocm/TestROCm_Complex.cpp
+++ b/lib/kokkos/core/unit_test/rocm/TestROCm_Complex.cpp
@@ -3,10 +3,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -42,6 +43,5 @@
 //@HEADER
 */
 
-#include<rocm/TestROCm_Category.hpp>
-#include<TestComplex.hpp>
-
+#include <rocm/TestROCm_Category.hpp>
+#include <TestComplex.hpp>
diff --git a/lib/kokkos/core/unit_test/rocm/TestROCm_Crs.cpp b/lib/kokkos/core/unit_test/rocm/TestROCm_Crs.cpp
index 05a90da83b..7dc9f71b7a 100644
--- a/lib/kokkos/core/unit_test/rocm/TestROCm_Crs.cpp
+++ b/lib/kokkos/core/unit_test/rocm/TestROCm_Crs.cpp
@@ -3,10 +3,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -42,6 +43,5 @@
 //@HEADER
 */
 
-#include<rocm/TestROCm_Category.hpp>
-#include<TestCrs.hpp>
-
+#include <rocm/TestROCm_Category.hpp>
+#include <TestCrs.hpp>
diff --git a/lib/kokkos/core/unit_test/rocm/TestROCm_DeepCopyAlignment.cpp b/lib/kokkos/core/unit_test/rocm/TestROCm_DeepCopyAlignment.cpp
index 85fd89fb26..e31c219802 100644
--- a/lib/kokkos/core/unit_test/rocm/TestROCm_DeepCopyAlignment.cpp
+++ b/lib/kokkos/core/unit_test/rocm/TestROCm_DeepCopyAlignment.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
diff --git a/lib/kokkos/core/unit_test/rocm/TestROCm_Init.cpp b/lib/kokkos/core/unit_test/rocm/TestROCm_Init.cpp
index a1d47810bf..d3a4addc19 100644
--- a/lib/kokkos/core/unit_test/rocm/TestROCm_Init.cpp
+++ b/lib/kokkos/core/unit_test/rocm/TestROCm_Init.cpp
@@ -3,10 +3,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -42,9 +43,7 @@
 //@HEADER
 */
 
-#include<rocm/TestROCm_Category.hpp>
-#include<TestInit.hpp>
-#include<TestCompilerMacros.hpp>
-#include<TestPolicyConstruction.hpp>
-
-
+#include <rocm/TestROCm_Category.hpp>
+#include <TestInit.hpp>
+#include <TestCompilerMacros.hpp>
+#include <TestPolicyConstruction.hpp>
diff --git a/lib/kokkos/core/unit_test/rocm/TestROCm_MDRangeReduce_a.cpp b/lib/kokkos/core/unit_test/rocm/TestROCm_MDRangeReduce_a.cpp
index 23edcbcc31..13b1b73852 100644
--- a/lib/kokkos/core/unit_test/rocm/TestROCm_MDRangeReduce_a.cpp
+++ b/lib/kokkos/core/unit_test/rocm/TestROCm_MDRangeReduce_a.cpp
@@ -3,10 +3,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -42,13 +43,12 @@
 //@HEADER
 */
 
-#include<rocm/TestROCm_Category.hpp>
-#include<TestMDRange.hpp>
+#include <rocm/TestROCm_Category.hpp>
+#include <TestMDRange.hpp>
 namespace Test {
 
-TEST_F( TEST_CATEGORY , mdrange_5d_reduce ) {
-  TestMDRange_5D< TEST_EXECSPACE >::test_reduce5( 100, 10, 10, 10, 5 );
-}
-
+TEST_F(TEST_CATEGORY, mdrange_5d_reduce) {
+  TestMDRange_5D<TEST_EXECSPACE>::test_reduce5(100, 10, 10, 10, 5);
 }
 
+}  // namespace Test
diff --git a/lib/kokkos/core/unit_test/rocm/TestROCm_MDRangeReduce_b.cpp b/lib/kokkos/core/unit_test/rocm/TestROCm_MDRangeReduce_b.cpp
index 5f02e893a9..9181caaaf5 100644
--- a/lib/kokkos/core/unit_test/rocm/TestROCm_MDRangeReduce_b.cpp
+++ b/lib/kokkos/core/unit_test/rocm/TestROCm_MDRangeReduce_b.cpp
@@ -3,10 +3,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -42,13 +43,12 @@
 //@HEADER
 */
 
-#include<rocm/TestROCm_Category.hpp>
-#include<TestMDRange.hpp>
+#include <rocm/TestROCm_Category.hpp>
+#include <TestMDRange.hpp>
 namespace Test {
 
-TEST_F( TEST_CATEGORY , mdrange_6d_reduce ) {
-  TestMDRange_6D< TEST_EXECSPACE >::test_reduce6( 10, 10, 10, 10, 10, 5 );
-}
-
+TEST_F(TEST_CATEGORY, mdrange_6d_reduce) {
+  TestMDRange_6D<TEST_EXECSPACE>::test_reduce6(10, 10, 10, 10, 10, 5);
 }
 
+}  // namespace Test
diff --git a/lib/kokkos/core/unit_test/rocm/TestROCm_MDRangeReduce_c.cpp b/lib/kokkos/core/unit_test/rocm/TestROCm_MDRangeReduce_c.cpp
index 6a84962d16..e9cdb6fe94 100644
--- a/lib/kokkos/core/unit_test/rocm/TestROCm_MDRangeReduce_c.cpp
+++ b/lib/kokkos/core/unit_test/rocm/TestROCm_MDRangeReduce_c.cpp
@@ -3,10 +3,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -42,13 +43,12 @@
 //@HEADER
 */
 
-#include<rocm/TestROCm_Category.hpp>
-#include<TestMDRange.hpp>
+#include <rocm/TestROCm_Category.hpp>
+#include <TestMDRange.hpp>
 namespace Test {
 
-TEST_F( TEST_CATEGORY , mdrange_2d_reduce ) {
-  TestMDRange_2D< TEST_EXECSPACE >::test_reduce2( 100, 100 );
-}
-
+TEST_F(TEST_CATEGORY, mdrange_2d_reduce) {
+  TestMDRange_2D<TEST_EXECSPACE>::test_reduce2(100, 100);
 }
 
+}  // namespace Test
diff --git a/lib/kokkos/core/unit_test/rocm/TestROCm_MDRangeReduce_d.cpp b/lib/kokkos/core/unit_test/rocm/TestROCm_MDRangeReduce_d.cpp
index c6c6ba2918..ecff8c39b4 100644
--- a/lib/kokkos/core/unit_test/rocm/TestROCm_MDRangeReduce_d.cpp
+++ b/lib/kokkos/core/unit_test/rocm/TestROCm_MDRangeReduce_d.cpp
@@ -3,10 +3,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -42,13 +43,12 @@
 //@HEADER
 */
 
-#include<rocm/TestROCm_Category.hpp>
-#include<TestMDRange.hpp>
+#include <rocm/TestROCm_Category.hpp>
+#include <TestMDRange.hpp>
 namespace Test {
 
-TEST_F( TEST_CATEGORY , mdrange_3d_reduce ) {
-  TestMDRange_3D< TEST_EXECSPACE >::test_reduce3( 100, 100, 5 );
-}
-
+TEST_F(TEST_CATEGORY, mdrange_3d_reduce) {
+  TestMDRange_3D<TEST_EXECSPACE>::test_reduce3(100, 100, 5);
 }
 
+}  // namespace Test
diff --git a/lib/kokkos/core/unit_test/rocm/TestROCm_MDRangeReduce_e.cpp b/lib/kokkos/core/unit_test/rocm/TestROCm_MDRangeReduce_e.cpp
index 6afd8b8ece..a773ca17b8 100644
--- a/lib/kokkos/core/unit_test/rocm/TestROCm_MDRangeReduce_e.cpp
+++ b/lib/kokkos/core/unit_test/rocm/TestROCm_MDRangeReduce_e.cpp
@@ -3,10 +3,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -42,13 +43,12 @@
 //@HEADER
 */
 
-#include<rocm/TestROCm_Category.hpp>
-#include<TestMDRange.hpp>
+#include <rocm/TestROCm_Category.hpp>
+#include <TestMDRange.hpp>
 namespace Test {
 
-TEST_F( TEST_CATEGORY , mdrange_4d_reduce ) {
-  TestMDRange_4D< TEST_EXECSPACE >::test_reduce4( 100, 100, 10, 5 );
-}
-
+TEST_F(TEST_CATEGORY, mdrange_4d_reduce) {
+  TestMDRange_4D<TEST_EXECSPACE>::test_reduce4(100, 100, 10, 5);
 }
 
+}  // namespace Test
diff --git a/lib/kokkos/core/unit_test/rocm/TestROCm_MDRange_a.cpp b/lib/kokkos/core/unit_test/rocm/TestROCm_MDRange_a.cpp
index 66d6de3bd5..8f3c6544be 100644
--- a/lib/kokkos/core/unit_test/rocm/TestROCm_MDRange_a.cpp
+++ b/lib/kokkos/core/unit_test/rocm/TestROCm_MDRange_a.cpp
@@ -3,10 +3,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -42,6 +43,5 @@
 //@HEADER
 */
 
-#include<rocm/TestROCm_Category.hpp>
-#include<TestMDRange_a.hpp>
-
+#include <rocm/TestROCm_Category.hpp>
+#include <TestMDRange_a.hpp>
diff --git a/lib/kokkos/core/unit_test/rocm/TestROCm_MDRange_b.cpp b/lib/kokkos/core/unit_test/rocm/TestROCm_MDRange_b.cpp
index 6eb4a9eee3..40efabf2a5 100644
--- a/lib/kokkos/core/unit_test/rocm/TestROCm_MDRange_b.cpp
+++ b/lib/kokkos/core/unit_test/rocm/TestROCm_MDRange_b.cpp
@@ -3,10 +3,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -42,6 +43,5 @@
 //@HEADER
 */
 
-#include<rocm/TestROCm_Category.hpp>
-#include<TestMDRange_b.hpp>
-
+#include <rocm/TestROCm_Category.hpp>
+#include <TestMDRange_b.hpp>
diff --git a/lib/kokkos/core/unit_test/rocm/TestROCm_MDRange_c.cpp b/lib/kokkos/core/unit_test/rocm/TestROCm_MDRange_c.cpp
index 2d604dfbc7..63c02857d6 100644
--- a/lib/kokkos/core/unit_test/rocm/TestROCm_MDRange_c.cpp
+++ b/lib/kokkos/core/unit_test/rocm/TestROCm_MDRange_c.cpp
@@ -3,10 +3,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -42,6 +43,5 @@
 //@HEADER
 */
 
-#include<rocm/TestROCm_Category.hpp>
-#include<TestMDRange_c.hpp>
-
+#include <rocm/TestROCm_Category.hpp>
+#include <TestMDRange_c.hpp>
diff --git a/lib/kokkos/core/unit_test/rocm/TestROCm_MDRange_d.cpp b/lib/kokkos/core/unit_test/rocm/TestROCm_MDRange_d.cpp
index 75f02c9f0d..ff559b66f0 100644
--- a/lib/kokkos/core/unit_test/rocm/TestROCm_MDRange_d.cpp
+++ b/lib/kokkos/core/unit_test/rocm/TestROCm_MDRange_d.cpp
@@ -3,10 +3,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -42,6 +43,5 @@
 //@HEADER
 */
 
-#include<rocm/TestROCm_Category.hpp>
-#include<TestMDRange_d.hpp>
-
+#include <rocm/TestROCm_Category.hpp>
+#include <TestMDRange_d.hpp>
diff --git a/lib/kokkos/core/unit_test/rocm/TestROCm_MDRange_e.cpp b/lib/kokkos/core/unit_test/rocm/TestROCm_MDRange_e.cpp
index b56167d746..57c383d11a 100644
--- a/lib/kokkos/core/unit_test/rocm/TestROCm_MDRange_e.cpp
+++ b/lib/kokkos/core/unit_test/rocm/TestROCm_MDRange_e.cpp
@@ -3,10 +3,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -42,6 +43,5 @@
 //@HEADER
 */
 
-#include<rocm/TestROCm_Category.hpp>
-#include<TestMDRange_e.hpp>
-
+#include <rocm/TestROCm_Category.hpp>
+#include <TestMDRange_e.hpp>
diff --git a/lib/kokkos/core/unit_test/rocm/TestROCm_Other.cpp b/lib/kokkos/core/unit_test/rocm/TestROCm_Other.cpp
index 3396265b0f..b6240a1b5a 100644
--- a/lib/kokkos/core/unit_test/rocm/TestROCm_Other.cpp
+++ b/lib/kokkos/core/unit_test/rocm/TestROCm_Other.cpp
@@ -3,10 +3,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -42,11 +43,11 @@
 //@HEADER
 */
 
-#include<rocm/TestROCm_Category.hpp>
-#include<TestTemplateMetaFunctions.hpp>
-#include<TestAggregate.hpp>
-//include<TestMemoryPool.hpp>
-#include<TestCXX11.hpp>
-#include<TestTile.hpp>
+#include <rocm/TestROCm_Category.hpp>
+#include <TestTemplateMetaFunctions.hpp>
+#include <TestAggregate.hpp>
+// include<TestMemoryPool.hpp>
+#include <TestCXX11.hpp>
+#include <TestTile.hpp>
 
-#include<TestViewCtorPropEmbeddedDim.hpp>
+#include <TestViewCtorPropEmbeddedDim.hpp>
diff --git a/lib/kokkos/core/unit_test/rocm/TestROCm_RangePolicy.cpp b/lib/kokkos/core/unit_test/rocm/TestROCm_RangePolicy.cpp
index dd390a0a3d..bd85458b6c 100644
--- a/lib/kokkos/core/unit_test/rocm/TestROCm_RangePolicy.cpp
+++ b/lib/kokkos/core/unit_test/rocm/TestROCm_RangePolicy.cpp
@@ -3,10 +3,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -42,6 +43,5 @@
 //@HEADER
 */
 
-#include<rocm/TestROCm_Category.hpp>
-#include<TestRange.hpp>
-
+#include <rocm/TestROCm_Category.hpp>
+#include <TestRange.hpp>
diff --git a/lib/kokkos/core/unit_test/rocm/TestROCm_Reducers_a.cpp b/lib/kokkos/core/unit_test/rocm/TestROCm_Reducers_a.cpp
index 14a199a713..28cffad683 100644
--- a/lib/kokkos/core/unit_test/rocm/TestROCm_Reducers_a.cpp
+++ b/lib/kokkos/core/unit_test/rocm/TestROCm_Reducers_a.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
diff --git a/lib/kokkos/core/unit_test/rocm/TestROCm_Reducers_b.cpp b/lib/kokkos/core/unit_test/rocm/TestROCm_Reducers_b.cpp
index 9f809eabbf..0efece4d0d 100644
--- a/lib/kokkos/core/unit_test/rocm/TestROCm_Reducers_b.cpp
+++ b/lib/kokkos/core/unit_test/rocm/TestROCm_Reducers_b.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
diff --git a/lib/kokkos/core/unit_test/rocm/TestROCm_Reducers_c.cpp b/lib/kokkos/core/unit_test/rocm/TestROCm_Reducers_c.cpp
index f0cdb520f5..929bf35a1b 100644
--- a/lib/kokkos/core/unit_test/rocm/TestROCm_Reducers_c.cpp
+++ b/lib/kokkos/core/unit_test/rocm/TestROCm_Reducers_c.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
diff --git a/lib/kokkos/core/unit_test/rocm/TestROCm_Reducers_d.cpp b/lib/kokkos/core/unit_test/rocm/TestROCm_Reducers_d.cpp
index b8ad8897c9..4a63aa0248 100644
--- a/lib/kokkos/core/unit_test/rocm/TestROCm_Reducers_d.cpp
+++ b/lib/kokkos/core/unit_test/rocm/TestROCm_Reducers_d.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
diff --git a/lib/kokkos/core/unit_test/rocm/TestROCm_Reductions.cpp b/lib/kokkos/core/unit_test/rocm/TestROCm_Reductions.cpp
index 70d6ee7382..6b79b95927 100644
--- a/lib/kokkos/core/unit_test/rocm/TestROCm_Reductions.cpp
+++ b/lib/kokkos/core/unit_test/rocm/TestROCm_Reductions.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
diff --git a/lib/kokkos/core/unit_test/rocm/TestROCm_Scan.cpp b/lib/kokkos/core/unit_test/rocm/TestROCm_Scan.cpp
index f13a983311..7987447253 100644
--- a/lib/kokkos/core/unit_test/rocm/TestROCm_Scan.cpp
+++ b/lib/kokkos/core/unit_test/rocm/TestROCm_Scan.cpp
@@ -3,10 +3,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -42,6 +43,5 @@
 //@HEADER
 */
 
-#include<rocm/TestROCm_Category.hpp>
-#include<TestScan.hpp>
-
+#include <rocm/TestROCm_Category.hpp>
+#include <TestScan.hpp>
diff --git a/lib/kokkos/core/unit_test/rocm/TestROCm_SharedAlloc.cpp b/lib/kokkos/core/unit_test/rocm/TestROCm_SharedAlloc.cpp
index c2c68d021c..041d0a82bc 100644
--- a/lib/kokkos/core/unit_test/rocm/TestROCm_SharedAlloc.cpp
+++ b/lib/kokkos/core/unit_test/rocm/TestROCm_SharedAlloc.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -46,10 +47,9 @@
 
 namespace Test {
 
-
-TEST_F( TEST_CATEGORY, impl_shared_alloc )
-{
-  test_shared_alloc< Kokkos::Experimental::ROCmSpace, Kokkos::DefaultHostExecutionSpace >();
+TEST_F(TEST_CATEGORY, impl_shared_alloc) {
+  test_shared_alloc<Kokkos::Experimental::ROCmSpace,
+                    Kokkos::DefaultHostExecutionSpace>();
 }
 
-} // namespace Test
+}  // namespace Test
diff --git a/lib/kokkos/core/unit_test/rocm/TestROCm_Spaces.cpp b/lib/kokkos/core/unit_test/rocm/TestROCm_Spaces.cpp
index 637cdd9a7f..fe84da5916 100644
--- a/lib/kokkos/core/unit_test/rocm/TestROCm_Spaces.cpp
+++ b/lib/kokkos/core/unit_test/rocm/TestROCm_Spaces.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -47,114 +48,151 @@
 namespace Test {
 
 KOKKOS_INLINE_FUNCTION
-void test_abort()
-{
-  Kokkos::abort( "test_abort" );
-}
+void test_abort() { Kokkos::abort("test_abort"); }
 
 KOKKOS_INLINE_FUNCTION
-void test_rocm_spaces_int_value( int * ptr )
-{
-  if ( *ptr == 42 ) { *ptr = 2 * 42; }
+void test_rocm_spaces_int_value(int *ptr) {
+  if (*ptr == 42) {
+    *ptr = 2 * 42;
+  }
 }
 
-TEST_F( rocm, space_access )
-{
-  static_assert(
-    Kokkos::Impl::MemorySpaceAccess< Kokkos::HostSpace, Kokkos::HostSpace >::assignable, "" );
+TEST_F(rocm, space_access) {
+  static_assert(Kokkos::Impl::MemorySpaceAccess<Kokkos::HostSpace,
+                                                Kokkos::HostSpace>::assignable,
+                "");
+
+  static_assert(Kokkos::Impl::MemorySpaceAccess<
+                    Kokkos::HostSpace,
+                    Kokkos::Experimental::ROCmHostPinnedSpace>::assignable,
+                "");
 
   static_assert(
-    Kokkos::Impl::MemorySpaceAccess< Kokkos::HostSpace, Kokkos::Experimental::ROCmHostPinnedSpace >::assignable, "" );
+      !Kokkos::Impl::MemorySpaceAccess<
+          Kokkos::HostSpace, Kokkos::Experimental::ROCmSpace>::assignable,
+      "");
 
   static_assert(
-    ! Kokkos::Impl::MemorySpaceAccess< Kokkos::HostSpace, Kokkos::Experimental::ROCmSpace >::assignable, "" );
+      !Kokkos::Impl::MemorySpaceAccess<
+          Kokkos::HostSpace, Kokkos::Experimental::ROCmSpace>::accessible,
+      "");
+
+  //--------------------------------------
+
+  static_assert(Kokkos::Impl::MemorySpaceAccess<
+                    Kokkos::Experimental::ROCmSpace,
+                    Kokkos::Experimental::ROCmSpace>::assignable,
+                "");
+
+  static_assert(!Kokkos::Impl::MemorySpaceAccess<
+                    Kokkos::Experimental::ROCmSpace,
+                    Kokkos::Experimental::ROCmHostPinnedSpace>::assignable,
+                "");
+
+  static_assert(Kokkos::Impl::MemorySpaceAccess<
+                    Kokkos::Experimental::ROCmSpace,
+                    Kokkos::Experimental::ROCmHostPinnedSpace>::accessible,
+                "");
 
   static_assert(
-    ! Kokkos::Impl::MemorySpaceAccess< Kokkos::HostSpace, Kokkos::Experimental::ROCmSpace >::accessible, "" );
+      !Kokkos::Impl::MemorySpaceAccess<Kokkos::Experimental::ROCmSpace,
+                                       Kokkos::HostSpace>::assignable,
+      "");
+
+  static_assert(
+      !Kokkos::Impl::MemorySpaceAccess<Kokkos::Experimental::ROCmSpace,
+                                       Kokkos::HostSpace>::accessible,
+      "");
+
+  //--------------------------------------
+
+  static_assert(Kokkos::Impl::MemorySpaceAccess<
+                    Kokkos::Experimental::ROCmHostPinnedSpace,
+                    Kokkos::Experimental::ROCmHostPinnedSpace>::assignable,
+                "");
+
+  static_assert(!Kokkos::Impl::MemorySpaceAccess<
+                    Kokkos::Experimental::ROCmHostPinnedSpace,
+                    Kokkos::HostSpace>::assignable,
+                "");
+
+  static_assert(
+      Kokkos::Impl::MemorySpaceAccess<Kokkos::Experimental::ROCmHostPinnedSpace,
+                                      Kokkos::HostSpace>::accessible,
+      "");
+
+  static_assert(!Kokkos::Impl::MemorySpaceAccess<
+                    Kokkos::Experimental::ROCmHostPinnedSpace,
+                    Kokkos::Experimental::ROCmSpace>::assignable,
+                "");
+
+  static_assert(!Kokkos::Impl::MemorySpaceAccess<
+                    Kokkos::Experimental::ROCmHostPinnedSpace,
+                    Kokkos::Experimental::ROCmSpace>::accessible,
+                "");
 
   //--------------------------------------
 
   static_assert(
-    Kokkos::Impl::MemorySpaceAccess< Kokkos::Experimental::ROCmSpace, Kokkos::Experimental::ROCmSpace >::assignable, "" );
+      !Kokkos::Impl::SpaceAccessibility<Kokkos::Experimental::ROCm,
+                                        Kokkos::HostSpace>::accessible,
+      "");
+
+  static_assert(Kokkos::Impl::SpaceAccessibility<
+                    Kokkos::Experimental::ROCm,
+                    Kokkos::Experimental::ROCmSpace>::accessible,
+                "");
+
+  static_assert(Kokkos::Impl::SpaceAccessibility<
+                    Kokkos::Experimental::ROCm,
+                    Kokkos::Experimental::ROCmHostPinnedSpace>::accessible,
+                "");
 
   static_assert(
-    ! Kokkos::Impl::MemorySpaceAccess< Kokkos::Experimental::ROCmSpace, Kokkos::Experimental::ROCmHostPinnedSpace >::assignable, "" );
+      !Kokkos::Impl::SpaceAccessibility<
+          Kokkos::HostSpace, Kokkos::Experimental::ROCmSpace>::accessible,
+      "");
+
+  static_assert(Kokkos::Impl::SpaceAccessibility<
+                    Kokkos::HostSpace,
+                    Kokkos::Experimental::ROCmHostPinnedSpace>::accessible,
+                "");
 
   static_assert(
-    Kokkos::Impl::MemorySpaceAccess< Kokkos::Experimental::ROCmSpace, Kokkos::Experimental::ROCmHostPinnedSpace >::accessible, "" );
+      std::is_same<
+          Kokkos::Impl::HostMirror<Kokkos::Experimental::ROCmSpace>::Space,
+          Kokkos::HostSpace>::value,
+      "");
 
   static_assert(
-    ! Kokkos::Impl::MemorySpaceAccess< Kokkos::Experimental::ROCmSpace, Kokkos::HostSpace >::assignable, "" );
+      std::is_same<Kokkos::Impl::HostMirror<
+                       Kokkos::Experimental::ROCmHostPinnedSpace>::Space,
+                   Kokkos::Experimental::ROCmHostPinnedSpace>::value,
+      "");
+
+  static_assert(Kokkos::Impl::SpaceAccessibility<
+                    Kokkos::Impl::HostMirror<Kokkos::Experimental::ROCm>::Space,
+                    Kokkos::HostSpace>::accessible,
+                "");
 
   static_assert(
-    ! Kokkos::Impl::MemorySpaceAccess< Kokkos::Experimental::ROCmSpace, Kokkos::HostSpace >::accessible, "" );
+      Kokkos::Impl::SpaceAccessibility<
+          Kokkos::Impl::HostMirror<Kokkos::Experimental::ROCmSpace>::Space,
+          Kokkos::HostSpace>::accessible,
+      "");
 
-  //--------------------------------------
-
-  static_assert(
-    Kokkos::Impl::MemorySpaceAccess< Kokkos::Experimental::ROCmHostPinnedSpace, Kokkos::Experimental::ROCmHostPinnedSpace >::assignable, "" );
-
-  static_assert(
-    ! Kokkos::Impl::MemorySpaceAccess< Kokkos::Experimental::ROCmHostPinnedSpace, Kokkos::HostSpace >::assignable, "" );
-
-  static_assert(
-    Kokkos::Impl::MemorySpaceAccess< Kokkos::Experimental::ROCmHostPinnedSpace, Kokkos::HostSpace >::accessible, "" );
-
-  static_assert(
-    ! Kokkos::Impl::MemorySpaceAccess< Kokkos::Experimental::ROCmHostPinnedSpace, Kokkos::Experimental::ROCmSpace >::assignable, "" );
-
-  static_assert(
-    ! Kokkos::Impl::MemorySpaceAccess< Kokkos::Experimental::ROCmHostPinnedSpace, Kokkos::Experimental::ROCmSpace >::accessible, "" );
-
-  //--------------------------------------
-
-  static_assert(
-    ! Kokkos::Impl::SpaceAccessibility< Kokkos::Experimental::ROCm, Kokkos::HostSpace >::accessible, "" );
-
-  static_assert(
-    Kokkos::Impl::SpaceAccessibility< Kokkos::Experimental::ROCm, Kokkos::Experimental::ROCmSpace >::accessible, "" );
-
-  static_assert(
-    Kokkos::Impl::SpaceAccessibility< Kokkos::Experimental::ROCm, Kokkos::Experimental::ROCmHostPinnedSpace >::accessible, "" );
-
-  static_assert(
-    ! Kokkos::Impl::SpaceAccessibility< Kokkos::HostSpace, Kokkos::Experimental::ROCmSpace >::accessible, "" );
-
-  static_assert(
-    Kokkos::Impl::SpaceAccessibility< Kokkos::HostSpace, Kokkos::Experimental::ROCmHostPinnedSpace >::accessible, "" );
-
-  static_assert(
-    std::is_same< Kokkos::Impl::HostMirror< Kokkos::Experimental::ROCmSpace >::Space
-                , Kokkos::HostSpace >::value, "" );
-
-  static_assert(
-    std::is_same< Kokkos::Impl::HostMirror< Kokkos::Experimental::ROCmHostPinnedSpace >::Space
-                , Kokkos::Experimental::ROCmHostPinnedSpace >::value, "" );
-
-  static_assert(
-    Kokkos::Impl::SpaceAccessibility
-      < Kokkos::Impl::HostMirror< Kokkos::Experimental::ROCm >::Space
-      , Kokkos::HostSpace
-      >::accessible, "" );
-
-  static_assert(
-    Kokkos::Impl::SpaceAccessibility
-      < Kokkos::Impl::HostMirror< Kokkos::Experimental::ROCmSpace >::Space
-      , Kokkos::HostSpace
-      >::accessible, "" );
-
-  static_assert(
-    Kokkos::Impl::SpaceAccessibility
-      < Kokkos::Impl::HostMirror< Kokkos::Experimental::ROCmHostPinnedSpace >::Space
-      , Kokkos::HostSpace
-      >::accessible, "" );
+  static_assert(Kokkos::Impl::SpaceAccessibility<
+                    Kokkos::Impl::HostMirror<
+                        Kokkos::Experimental::ROCmHostPinnedSpace>::Space,
+                    Kokkos::HostSpace>::accessible,
+                "");
 }
 
-template< class MemSpace, class ExecSpace >
+template <class MemSpace, class ExecSpace>
 struct TestViewROCmAccessible {
   enum { N = 1000 };
 
-  using V = Kokkos::View< double*, MemSpace >;
+  using V = Kokkos::View<double *, MemSpace>;
 
   V m_base;
 
@@ -162,35 +200,38 @@ struct TestViewROCmAccessible {
   struct TagTest {};
 
   KOKKOS_INLINE_FUNCTION
-  void operator()( const TagInit &, const int i ) const { m_base[i] = i + 1; }
+  void operator()(const TagInit &, const int i) const { m_base[i] = i + 1; }
 
   KOKKOS_INLINE_FUNCTION
-  void operator()( const TagTest &, const int i, long & error_count ) const
-  { if ( m_base[i] != i + 1 ) ++error_count; }
+  void operator()(const TagTest &, const int i, long &error_count) const {
+    if (m_base[i] != i + 1) ++error_count;
+  }
 
-  TestViewROCmAccessible()
-    : m_base( "base", N )
-    {}
+  TestViewROCmAccessible() : m_base("base", N) {}
 
-  static void run()
-  {
+  static void run() {
     TestViewROCmAccessible self;
-    Kokkos::parallel_for( Kokkos::RangePolicy< typename MemSpace::execution_space, TagInit >( 0, N ), self );
+    Kokkos::parallel_for(
+        Kokkos::RangePolicy<typename MemSpace::execution_space, TagInit>(0, N),
+        self);
     typename MemSpace::execution_space().fence();
 
     // Next access is a different execution space, must complete prior kernel.
     long error_count = -1;
-    Kokkos::parallel_reduce( Kokkos::RangePolicy< ExecSpace, TagTest >( 0, N ), self, error_count );
-    EXPECT_EQ( error_count, 0 );
+    Kokkos::parallel_reduce(Kokkos::RangePolicy<ExecSpace, TagTest>(0, N), self,
+                            error_count);
+    EXPECT_EQ(error_count, 0);
   }
 };
 
-TEST_F( rocm, impl_view_accessible )
-{
-  TestViewROCmAccessible< Kokkos::Experimental::ROCmSpace, Kokkos::Experimental::ROCm >::run();
+TEST_F(rocm, impl_view_accessible) {
+  TestViewROCmAccessible<Kokkos::Experimental::ROCmSpace,
+                         Kokkos::Experimental::ROCm>::run();
 
-  TestViewROCmAccessible< Kokkos::Experimental::ROCmHostPinnedSpace, Kokkos::Experimental::ROCm >::run();
-  TestViewROCmAccessible< Kokkos::Experimental::ROCmHostPinnedSpace, Kokkos::HostSpace::execution_space >::run();
+  TestViewROCmAccessible<Kokkos::Experimental::ROCmHostPinnedSpace,
+                         Kokkos::Experimental::ROCm>::run();
+  TestViewROCmAccessible<Kokkos::Experimental::ROCmHostPinnedSpace,
+                         Kokkos::HostSpace::execution_space>::run();
 }
 
-} // namespace Test
+}  // namespace Test
diff --git a/lib/kokkos/core/unit_test/rocm/TestROCm_SubView_a.cpp b/lib/kokkos/core/unit_test/rocm/TestROCm_SubView_a.cpp
index 4d7e1a8ef2..f766921ffb 100644
--- a/lib/kokkos/core/unit_test/rocm/TestROCm_SubView_a.cpp
+++ b/lib/kokkos/core/unit_test/rocm/TestROCm_SubView_a.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -46,66 +47,56 @@
 
 namespace Test {
 
-TEST_F( TEST_CATEGORY, view_subview_auto_1d_left )
-{
-  TestViewSubview::test_auto_1d< Kokkos::LayoutLeft, TEST_EXECSPACE >();
+TEST_F(TEST_CATEGORY, view_subview_auto_1d_left) {
+  TestViewSubview::test_auto_1d<Kokkos::LayoutLeft, TEST_EXECSPACE>();
 }
 
-TEST_F( TEST_CATEGORY, view_subview_auto_1d_right )
-{
-  TestViewSubview::test_auto_1d< Kokkos::LayoutRight, TEST_EXECSPACE >();
+TEST_F(TEST_CATEGORY, view_subview_auto_1d_right) {
+  TestViewSubview::test_auto_1d<Kokkos::LayoutRight, TEST_EXECSPACE>();
 }
 
-TEST_F( TEST_CATEGORY, view_subview_auto_1d_stride )
-{
-  TestViewSubview::test_auto_1d< Kokkos::LayoutStride, TEST_EXECSPACE >();
+TEST_F(TEST_CATEGORY, view_subview_auto_1d_stride) {
+  TestViewSubview::test_auto_1d<Kokkos::LayoutStride, TEST_EXECSPACE>();
 }
 
-TEST_F( TEST_CATEGORY, view_subview_assign_strided )
-{
-  TestViewSubview::test_1d_strided_assignment< TEST_EXECSPACE >();
+TEST_F(TEST_CATEGORY, view_subview_assign_strided) {
+  TestViewSubview::test_1d_strided_assignment<TEST_EXECSPACE>();
 }
 
-TEST_F( TEST_CATEGORY, view_subview_left_0 )
-{
-  TestViewSubview::test_left_0< TEST_EXECSPACE >();
+TEST_F(TEST_CATEGORY, view_subview_left_0) {
+  TestViewSubview::test_left_0<TEST_EXECSPACE>();
 }
 
-TEST_F( TEST_CATEGORY, view_subview_left_1 )
-{
-  TestViewSubview::test_left_1< TEST_EXECSPACE >();
+TEST_F(TEST_CATEGORY, view_subview_left_1) {
+  TestViewSubview::test_left_1<TEST_EXECSPACE>();
 }
 
-TEST_F( TEST_CATEGORY, view_subview_left_2 )
-{
-  TestViewSubview::test_left_2< TEST_EXECSPACE >();
+TEST_F(TEST_CATEGORY, view_subview_left_2) {
+  TestViewSubview::test_left_2<TEST_EXECSPACE>();
 }
 
-TEST_F( TEST_CATEGORY, view_subview_left_3 )
-{
-  TestViewSubview::test_left_3< TEST_EXECSPACE >();
+TEST_F(TEST_CATEGORY, view_subview_left_3) {
+  TestViewSubview::test_left_3<TEST_EXECSPACE>();
 }
 
-TEST_F( TEST_CATEGORY, view_subview_right_0 )
-{
-  TestViewSubview::test_right_0< TEST_EXECSPACE >();
+TEST_F(TEST_CATEGORY, view_subview_right_0) {
+  TestViewSubview::test_right_0<TEST_EXECSPACE>();
 }
 
-TEST_F( TEST_CATEGORY, view_subview_right_1 )
-{
-  TestViewSubview::test_right_1< TEST_EXECSPACE >();
+TEST_F(TEST_CATEGORY, view_subview_right_1) {
+  TestViewSubview::test_right_1<TEST_EXECSPACE>();
 }
 
-TEST_F( TEST_CATEGORY, view_subview_right_3 )
-{
-  TestViewSubview::test_right_3< TEST_EXECSPACE >();
+TEST_F(TEST_CATEGORY, view_subview_right_3) {
+  TestViewSubview::test_right_3<TEST_EXECSPACE>();
 }
 
-TEST_F(TEST_CATEGORY, view_static_tests)
-{
-  TestViewSubview::TestSubviewStaticSizes<TEST_EXECSPACE, Kokkos::LayoutLeft>()();
-  TestViewSubview::TestSubviewStaticSizes<TEST_EXECSPACE, Kokkos::LayoutRight>()();
+TEST_F(TEST_CATEGORY, view_static_tests) {
+  TestViewSubview::TestSubviewStaticSizes<TEST_EXECSPACE,
+                                          Kokkos::LayoutLeft>()();
+  TestViewSubview::TestSubviewStaticSizes<TEST_EXECSPACE,
+                                          Kokkos::LayoutRight>()();
   TestViewSubview::TestExtentsStaticTests<TEST_EXECSPACE>();
 }
 
-} // namespace Test
+}  // namespace Test
diff --git a/lib/kokkos/core/unit_test/rocm/TestROCm_SubView_b.cpp b/lib/kokkos/core/unit_test/rocm/TestROCm_SubView_b.cpp
index 5b64dbf214..798ff06b7e 100644
--- a/lib/kokkos/core/unit_test/rocm/TestROCm_SubView_b.cpp
+++ b/lib/kokkos/core/unit_test/rocm/TestROCm_SubView_b.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -46,18 +47,20 @@
 
 namespace Test {
 
-TEST_F( TEST_CATEGORY, view_subview_layoutleft_to_layoutleft )
-{
-  TestViewSubview::test_layoutleft_to_layoutleft< TEST_EXECSPACE >();
-  TestViewSubview::test_layoutleft_to_layoutleft< TEST_EXECSPACE, Kokkos::MemoryTraits<Kokkos::Atomic> >();
-  TestViewSubview::test_layoutleft_to_layoutleft< TEST_EXECSPACE, Kokkos::MemoryTraits<Kokkos::RandomAccess> >();
+TEST_F(TEST_CATEGORY, view_subview_layoutleft_to_layoutleft) {
+  TestViewSubview::test_layoutleft_to_layoutleft<TEST_EXECSPACE>();
+  TestViewSubview::test_layoutleft_to_layoutleft<
+      TEST_EXECSPACE, Kokkos::MemoryTraits<Kokkos::Atomic> >();
+  TestViewSubview::test_layoutleft_to_layoutleft<
+      TEST_EXECSPACE, Kokkos::MemoryTraits<Kokkos::RandomAccess> >();
 }
 
-TEST_F( TEST_CATEGORY, view_subview_layoutright_to_layoutright )
-{
-  TestViewSubview::test_layoutright_to_layoutright< TEST_EXECSPACE >();
-  TestViewSubview::test_layoutright_to_layoutright< TEST_EXECSPACE, Kokkos::MemoryTraits<Kokkos::Atomic> >();
-  TestViewSubview::test_layoutright_to_layoutright< TEST_EXECSPACE, Kokkos::MemoryTraits<Kokkos::RandomAccess> >();
+TEST_F(TEST_CATEGORY, view_subview_layoutright_to_layoutright) {
+  TestViewSubview::test_layoutright_to_layoutright<TEST_EXECSPACE>();
+  TestViewSubview::test_layoutright_to_layoutright<
+      TEST_EXECSPACE, Kokkos::MemoryTraits<Kokkos::Atomic> >();
+  TestViewSubview::test_layoutright_to_layoutright<
+      TEST_EXECSPACE, Kokkos::MemoryTraits<Kokkos::RandomAccess> >();
 }
 
-} // namespace Test
+}  // namespace Test
diff --git a/lib/kokkos/core/unit_test/rocm/TestROCm_SubView_c01.cpp b/lib/kokkos/core/unit_test/rocm/TestROCm_SubView_c01.cpp
index b3fb40ec4a..b70923027d 100644
--- a/lib/kokkos/core/unit_test/rocm/TestROCm_SubView_c01.cpp
+++ b/lib/kokkos/core/unit_test/rocm/TestROCm_SubView_c01.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -46,9 +47,8 @@
 
 namespace Test {
 
-TEST_F( TEST_CATEGORY, view_subview_1d_assign )
-{
-  TestViewSubview::test_1d_assign< TEST_EXECSPACE >();
+TEST_F(TEST_CATEGORY, view_subview_1d_assign) {
+  TestViewSubview::test_1d_assign<TEST_EXECSPACE>();
 }
 
-} // namespace Test
+}  // namespace Test
diff --git a/lib/kokkos/core/unit_test/rocm/TestROCm_SubView_c02.cpp b/lib/kokkos/core/unit_test/rocm/TestROCm_SubView_c02.cpp
index aef28e022b..e28dfed7f2 100644
--- a/lib/kokkos/core/unit_test/rocm/TestROCm_SubView_c02.cpp
+++ b/lib/kokkos/core/unit_test/rocm/TestROCm_SubView_c02.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -46,9 +47,9 @@
 
 namespace Test {
 
-TEST_F( TEST_CATEGORY, view_subview_1d_assign_atomic )
-{
-  TestViewSubview::test_1d_assign< TEST_EXECSPACE, Kokkos::MemoryTraits<Kokkos::Atomic> >();
+TEST_F(TEST_CATEGORY, view_subview_1d_assign_atomic) {
+  TestViewSubview::test_1d_assign<TEST_EXECSPACE,
+                                  Kokkos::MemoryTraits<Kokkos::Atomic> >();
 }
 
-} // namespace Test
+}  // namespace Test
diff --git a/lib/kokkos/core/unit_test/rocm/TestROCm_SubView_c03.cpp b/lib/kokkos/core/unit_test/rocm/TestROCm_SubView_c03.cpp
index d6e6329a75..bd8afc4724 100644
--- a/lib/kokkos/core/unit_test/rocm/TestROCm_SubView_c03.cpp
+++ b/lib/kokkos/core/unit_test/rocm/TestROCm_SubView_c03.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -46,9 +47,9 @@
 
 namespace Test {
 
-TEST_F( TEST_CATEGORY, view_subview_1d_assign_randomaccess )
-{
-  TestViewSubview::test_1d_assign< TEST_EXECSPACE, Kokkos::MemoryTraits<Kokkos::RandomAccess> >();
+TEST_F(TEST_CATEGORY, view_subview_1d_assign_randomaccess) {
+  TestViewSubview::test_1d_assign<
+      TEST_EXECSPACE, Kokkos::MemoryTraits<Kokkos::RandomAccess> >();
 }
 
-} // namespace Test
+}  // namespace Test
diff --git a/lib/kokkos/core/unit_test/rocm/TestROCm_SubView_c04.cpp b/lib/kokkos/core/unit_test/rocm/TestROCm_SubView_c04.cpp
index f91820e258..f2c5c3674c 100644
--- a/lib/kokkos/core/unit_test/rocm/TestROCm_SubView_c04.cpp
+++ b/lib/kokkos/core/unit_test/rocm/TestROCm_SubView_c04.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -46,9 +47,8 @@
 
 namespace Test {
 
-TEST_F( TEST_CATEGORY, view_subview_2d_from_3d )
-{
-  TestViewSubview::test_2d_subview_3d< TEST_EXECSPACE >();
+TEST_F(TEST_CATEGORY, view_subview_2d_from_3d) {
+  TestViewSubview::test_2d_subview_3d<TEST_EXECSPACE>();
 }
 
-} // namespace Test
+}  // namespace Test
diff --git a/lib/kokkos/core/unit_test/rocm/TestROCm_SubView_c05.cpp b/lib/kokkos/core/unit_test/rocm/TestROCm_SubView_c05.cpp
index 9580d5c4f7..43ef57350d 100644
--- a/lib/kokkos/core/unit_test/rocm/TestROCm_SubView_c05.cpp
+++ b/lib/kokkos/core/unit_test/rocm/TestROCm_SubView_c05.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -46,9 +47,9 @@
 
 namespace Test {
 
-TEST_F( TEST_CATEGORY, view_subview_2d_from_3d_atomic )
-{
-  TestViewSubview::test_2d_subview_3d< TEST_EXECSPACE, Kokkos::MemoryTraits<Kokkos::Atomic> >();
+TEST_F(TEST_CATEGORY, view_subview_2d_from_3d_atomic) {
+  TestViewSubview::test_2d_subview_3d<TEST_EXECSPACE,
+                                      Kokkos::MemoryTraits<Kokkos::Atomic> >();
 }
 
-} // namespace Test
+}  // namespace Test
diff --git a/lib/kokkos/core/unit_test/rocm/TestROCm_SubView_c06.cpp b/lib/kokkos/core/unit_test/rocm/TestROCm_SubView_c06.cpp
index 68a2a556cd..985c228436 100644
--- a/lib/kokkos/core/unit_test/rocm/TestROCm_SubView_c06.cpp
+++ b/lib/kokkos/core/unit_test/rocm/TestROCm_SubView_c06.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -46,9 +47,9 @@
 
 namespace Test {
 
-TEST_F( TEST_CATEGORY, view_subview_2d_from_3d_randomaccess )
-{
-  TestViewSubview::test_2d_subview_3d< TEST_EXECSPACE, Kokkos::MemoryTraits<Kokkos::RandomAccess> >();
+TEST_F(TEST_CATEGORY, view_subview_2d_from_3d_randomaccess) {
+  TestViewSubview::test_2d_subview_3d<
+      TEST_EXECSPACE, Kokkos::MemoryTraits<Kokkos::RandomAccess> >();
 }
 
-} // namespace Test
+}  // namespace Test
diff --git a/lib/kokkos/core/unit_test/rocm/TestROCm_SubView_c07.cpp b/lib/kokkos/core/unit_test/rocm/TestROCm_SubView_c07.cpp
index 9f3a6d9369..1ddcec5709 100644
--- a/lib/kokkos/core/unit_test/rocm/TestROCm_SubView_c07.cpp
+++ b/lib/kokkos/core/unit_test/rocm/TestROCm_SubView_c07.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -46,9 +47,8 @@
 
 namespace Test {
 
-TEST_F( TEST_CATEGORY, view_subview_3d_from_5d_left )
-{
-  TestViewSubview::test_3d_subview_5d_left< TEST_EXECSPACE >();
+TEST_F(TEST_CATEGORY, view_subview_3d_from_5d_left) {
+  TestViewSubview::test_3d_subview_5d_left<TEST_EXECSPACE>();
 }
 
-} // namespace Test
+}  // namespace Test
diff --git a/lib/kokkos/core/unit_test/rocm/TestROCm_SubView_c08.cpp b/lib/kokkos/core/unit_test/rocm/TestROCm_SubView_c08.cpp
index a943341878..a641bdbdfb 100644
--- a/lib/kokkos/core/unit_test/rocm/TestROCm_SubView_c08.cpp
+++ b/lib/kokkos/core/unit_test/rocm/TestROCm_SubView_c08.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -46,9 +47,9 @@
 
 namespace Test {
 
-TEST_F( TEST_CATEGORY, view_subview_3d_from_5d_left_atomic )
-{
-  TestViewSubview::test_3d_subview_5d_left< TEST_EXECSPACE, Kokkos::MemoryTraits<Kokkos::Atomic> >();
+TEST_F(TEST_CATEGORY, view_subview_3d_from_5d_left_atomic) {
+  TestViewSubview::test_3d_subview_5d_left<
+      TEST_EXECSPACE, Kokkos::MemoryTraits<Kokkos::Atomic> >();
 }
 
-} // namespace Test
+}  // namespace Test
diff --git a/lib/kokkos/core/unit_test/rocm/TestROCm_SubView_c09.cpp b/lib/kokkos/core/unit_test/rocm/TestROCm_SubView_c09.cpp
index aea1d4945c..bc2a2d5995 100644
--- a/lib/kokkos/core/unit_test/rocm/TestROCm_SubView_c09.cpp
+++ b/lib/kokkos/core/unit_test/rocm/TestROCm_SubView_c09.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -46,9 +47,9 @@
 
 namespace Test {
 
-TEST_F( TEST_CATEGORY, view_subview_3d_from_5d_left_randomaccess )
-{
-  TestViewSubview::test_3d_subview_5d_left< TEST_EXECSPACE, Kokkos::MemoryTraits<Kokkos::RandomAccess> >();
+TEST_F(TEST_CATEGORY, view_subview_3d_from_5d_left_randomaccess) {
+  TestViewSubview::test_3d_subview_5d_left<
+      TEST_EXECSPACE, Kokkos::MemoryTraits<Kokkos::RandomAccess> >();
 }
 
-} // namespace Test
+}  // namespace Test
diff --git a/lib/kokkos/core/unit_test/rocm/TestROCm_SubView_c10.cpp b/lib/kokkos/core/unit_test/rocm/TestROCm_SubView_c10.cpp
index 83d0d0a66a..59f3bb22d8 100644
--- a/lib/kokkos/core/unit_test/rocm/TestROCm_SubView_c10.cpp
+++ b/lib/kokkos/core/unit_test/rocm/TestROCm_SubView_c10.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -46,9 +47,8 @@
 
 namespace Test {
 
-TEST_F( TEST_CATEGORY, view_subview_3d_from_5d_right )
-{
-  TestViewSubview::test_3d_subview_5d_right< TEST_EXECSPACE >();
+TEST_F(TEST_CATEGORY, view_subview_3d_from_5d_right) {
+  TestViewSubview::test_3d_subview_5d_right<TEST_EXECSPACE>();
 }
 
-} // namespace Test
+}  // namespace Test
diff --git a/lib/kokkos/core/unit_test/rocm/TestROCm_SubView_c11.cpp b/lib/kokkos/core/unit_test/rocm/TestROCm_SubView_c11.cpp
index 643eada263..29c6f181fd 100644
--- a/lib/kokkos/core/unit_test/rocm/TestROCm_SubView_c11.cpp
+++ b/lib/kokkos/core/unit_test/rocm/TestROCm_SubView_c11.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -46,9 +47,9 @@
 
 namespace Test {
 
-TEST_F( TEST_CATEGORY, view_subview_3d_from_5d_right_atomic )
-{
-  TestViewSubview::test_3d_subview_5d_right< TEST_EXECSPACE, Kokkos::MemoryTraits<Kokkos::Atomic> >();
+TEST_F(TEST_CATEGORY, view_subview_3d_from_5d_right_atomic) {
+  TestViewSubview::test_3d_subview_5d_right<
+      TEST_EXECSPACE, Kokkos::MemoryTraits<Kokkos::Atomic> >();
 }
 
-} // namespace Test
+}  // namespace Test
diff --git a/lib/kokkos/core/unit_test/rocm/TestROCm_SubView_c12.cpp b/lib/kokkos/core/unit_test/rocm/TestROCm_SubView_c12.cpp
index 9d46a556b7..4fcdcc3978 100644
--- a/lib/kokkos/core/unit_test/rocm/TestROCm_SubView_c12.cpp
+++ b/lib/kokkos/core/unit_test/rocm/TestROCm_SubView_c12.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -46,9 +47,9 @@
 
 namespace Test {
 
-TEST_F( TEST_CATEGORY, view_subview_3d_from_5d_right_randomaccess )
-{
-  TestViewSubview::test_3d_subview_5d_right< TEST_EXECSPACE, Kokkos::MemoryTraits<Kokkos::RandomAccess> >();
+TEST_F(TEST_CATEGORY, view_subview_3d_from_5d_right_randomaccess) {
+  TestViewSubview::test_3d_subview_5d_right<
+      TEST_EXECSPACE, Kokkos::MemoryTraits<Kokkos::RandomAccess> >();
 }
 
-} // namespace Test
+}  // namespace Test
diff --git a/lib/kokkos/core/unit_test/rocm/TestROCm_SubView_c13.cpp b/lib/kokkos/core/unit_test/rocm/TestROCm_SubView_c13.cpp
index 03b39972a3..f8d52f243d 100644
--- a/lib/kokkos/core/unit_test/rocm/TestROCm_SubView_c13.cpp
+++ b/lib/kokkos/core/unit_test/rocm/TestROCm_SubView_c13.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -46,9 +47,8 @@
 
 namespace Test {
 
-TEST_F( TEST_CATEGORY, view_test_unmanaged_subview_reset )
-{
-  TestViewSubview::test_unmanaged_subview_reset< TEST_EXECSPACE >();
+TEST_F(TEST_CATEGORY, view_test_unmanaged_subview_reset) {
+  TestViewSubview::test_unmanaged_subview_reset<TEST_EXECSPACE>();
 }
 
-} // namespace Test
+}  // namespace Test
diff --git a/lib/kokkos/core/unit_test/rocm/TestROCm_Team.cpp b/lib/kokkos/core/unit_test/rocm/TestROCm_Team.cpp
index 4f35ab77d3..85aeb6637c 100644
--- a/lib/kokkos/core/unit_test/rocm/TestROCm_Team.cpp
+++ b/lib/kokkos/core/unit_test/rocm/TestROCm_Team.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -46,30 +47,37 @@
 
 namespace Test {
 
-TEST_F( TEST_CATEGORY, team_for )
-{
-  TestTeamPolicy< TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Static> >::test_for( 0 );
-  TestTeamPolicy< TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Dynamic> >::test_for( 0 );
+TEST_F(TEST_CATEGORY, team_for) {
+  TestTeamPolicy<TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Static> >::test_for(
+      0);
+  TestTeamPolicy<TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Dynamic> >::test_for(
+      0);
 
-  TestTeamPolicy< TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Static> >::test_for( 2 );
-  TestTeamPolicy< TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Dynamic> >::test_for( 2 );
+  TestTeamPolicy<TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Static> >::test_for(
+      2);
+  TestTeamPolicy<TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Dynamic> >::test_for(
+      2);
 
-  TestTeamPolicy< TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Static> >::test_for( 1000 );
-  TestTeamPolicy< TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Dynamic> >::test_for( 1000 );
+  TestTeamPolicy<TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Static> >::test_for(
+      1000);
+  TestTeamPolicy<TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Dynamic> >::test_for(
+      1000);
 }
 
-
-TEST_F( TEST_CATEGORY, team_reduce )
-{
-  TestTeamPolicy< TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Static> >::test_reduce( 0 );
-  TestTeamPolicy< TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Dynamic> >::test_reduce( 0 );
-  TestTeamPolicy< TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Static> >::test_reduce( 2 );
-  TestTeamPolicy< TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Dynamic> >::test_reduce( 2 );
-  TestTeamPolicy< TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Static> >::test_reduce( 1000 );
-  TestTeamPolicy< TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Dynamic> >::test_reduce( 1000 );
-}
+TEST_F(TEST_CATEGORY, team_reduce) {
+  TestTeamPolicy<TEST_EXECSPACE,
+                 Kokkos::Schedule<Kokkos::Static> >::test_reduce(0);
+  TestTeamPolicy<TEST_EXECSPACE,
+                 Kokkos::Schedule<Kokkos::Dynamic> >::test_reduce(0);
+  TestTeamPolicy<TEST_EXECSPACE,
+                 Kokkos::Schedule<Kokkos::Static> >::test_reduce(2);
+  TestTeamPolicy<TEST_EXECSPACE,
+                 Kokkos::Schedule<Kokkos::Dynamic> >::test_reduce(2);
+  TestTeamPolicy<TEST_EXECSPACE,
+                 Kokkos::Schedule<Kokkos::Static> >::test_reduce(1000);
+  TestTeamPolicy<TEST_EXECSPACE,
+                 Kokkos::Schedule<Kokkos::Dynamic> >::test_reduce(1000);
 }
+}  // namespace Test
 
 #include <TestTeamVector.hpp>
-
-
diff --git a/lib/kokkos/core/unit_test/rocm/TestROCm_TeamReductionScan.cpp b/lib/kokkos/core/unit_test/rocm/TestROCm_TeamReductionScan.cpp
index 57887450e2..b82fbf911c 100644
--- a/lib/kokkos/core/unit_test/rocm/TestROCm_TeamReductionScan.cpp
+++ b/lib/kokkos/core/unit_test/rocm/TestROCm_TeamReductionScan.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -46,35 +47,35 @@
 
 namespace Test {
 
-TEST_F( TEST_CATEGORY, team_scan )
-{
-  TestScanTeam< TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Static> >( 0 );
-  TestScanTeam< TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Dynamic> >( 0 );
-  TestScanTeam< TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Static> >( 10 );
-  TestScanTeam< TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Dynamic> >( 10 );
-  TestScanTeam< TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Static> >( 10000 );
-  TestScanTeam< TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Dynamic> >( 10000 );
+TEST_F(TEST_CATEGORY, team_scan) {
+  TestScanTeam<TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Static> >(0);
+  TestScanTeam<TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Dynamic> >(0);
+  TestScanTeam<TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Static> >(10);
+  TestScanTeam<TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Dynamic> >(10);
+  TestScanTeam<TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Static> >(10000);
+  TestScanTeam<TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Dynamic> >(10000);
 }
 
-TEST_F( TEST_CATEGORY, team_long_reduce )
-{
-  TestReduceTeam< long, TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Static> >( 0 );
-  TestReduceTeam< long, TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Dynamic> >( 0 );
-  TestReduceTeam< long, TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Static> >( 3 );
-  TestReduceTeam< long, TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Dynamic> >( 3 );
-  TestReduceTeam< long, TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Static> >( 100000 );
-  TestReduceTeam< long, TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Dynamic> >( 100000 );
+TEST_F(TEST_CATEGORY, team_long_reduce) {
+  TestReduceTeam<long, TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Static> >(0);
+  TestReduceTeam<long, TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Dynamic> >(0);
+  TestReduceTeam<long, TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Static> >(3);
+  TestReduceTeam<long, TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Dynamic> >(3);
+  TestReduceTeam<long, TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Static> >(
+      100000);
+  TestReduceTeam<long, TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Dynamic> >(
+      100000);
 }
 
-TEST_F( TEST_CATEGORY, team_double_reduce )
-{
-  TestReduceTeam< double, TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Static> >( 0 );
-  TestReduceTeam< double, TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Dynamic> >( 0 );
-  TestReduceTeam< double, TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Static> >( 3 );
-  TestReduceTeam< double, TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Dynamic> >( 3 );
-  TestReduceTeam< double, TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Static> >( 100000 );
-  TestReduceTeam< double, TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Dynamic> >( 100000 );
+TEST_F(TEST_CATEGORY, team_double_reduce) {
+  TestReduceTeam<double, TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Static> >(0);
+  TestReduceTeam<double, TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Dynamic> >(0);
+  TestReduceTeam<double, TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Static> >(3);
+  TestReduceTeam<double, TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Dynamic> >(3);
+  TestReduceTeam<double, TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Static> >(
+      100000);
+  TestReduceTeam<double, TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Dynamic> >(
+      100000);
 }
 
-} // namespace Test
-
+}  // namespace Test
diff --git a/lib/kokkos/core/unit_test/rocm/TestROCm_TeamScratch.cpp b/lib/kokkos/core/unit_test/rocm/TestROCm_TeamScratch.cpp
index c7255919d9..8ec583c23a 100644
--- a/lib/kokkos/core/unit_test/rocm/TestROCm_TeamScratch.cpp
+++ b/lib/kokkos/core/unit_test/rocm/TestROCm_TeamScratch.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -46,42 +47,36 @@
 
 namespace Test {
 
-TEST_F( TEST_CATEGORY, team_shared_request )
-{
-  TestSharedTeam< TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Static> >();
-  TestSharedTeam< TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Dynamic> >();
+TEST_F(TEST_CATEGORY, team_shared_request) {
+  TestSharedTeam<TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Static> >();
+  TestSharedTeam<TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Dynamic> >();
 }
 
-TEST_F( TEST_CATEGORY, team_scratch_request )
-{
-  TestScratchTeam< TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Static> >();
-  TestScratchTeam< TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Dynamic> >();
+TEST_F(TEST_CATEGORY, team_scratch_request) {
+  TestScratchTeam<TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Static> >();
+  TestScratchTeam<TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Dynamic> >();
 }
 
-#if defined( KOKKOS_ENABLE_CXX11_DISPATCH_LAMBDA )
-#if !defined(KOKKOS_ENABLE_ROCM) || ( 8000 <= ROCM_VERSION )
-TEST_F( TEST_CATEGORY, team_lambda_shared_request )
-{
-  TestLambdaSharedTeam< Kokkos::HostSpace, TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Static> >();
-  TestLambdaSharedTeam< Kokkos::HostSpace, TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Dynamic> >();
+#if defined(KOKKOS_ENABLE_CXX11_DISPATCH_LAMBDA)
+#if !defined(KOKKOS_ENABLE_ROCM) || (8000 <= ROCM_VERSION)
+TEST_F(TEST_CATEGORY, team_lambda_shared_request) {
+  TestLambdaSharedTeam<Kokkos::HostSpace, TEST_EXECSPACE,
+                       Kokkos::Schedule<Kokkos::Static> >();
+  TestLambdaSharedTeam<Kokkos::HostSpace, TEST_EXECSPACE,
+                       Kokkos::Schedule<Kokkos::Dynamic> >();
 }
 
-TEST_F( TEST_CATEGORY, scratch_align) {
-  TestScratchAlignment< TEST_EXECSPACE >();
-}
+TEST_F(TEST_CATEGORY, scratch_align) { TestScratchAlignment<TEST_EXECSPACE>(); }
 #endif
 #endif
 
-TEST_F( TEST_CATEGORY, shmem_size )
-{
-  TestShmemSize< TEST_EXECSPACE >();
+TEST_F(TEST_CATEGORY, shmem_size) { TestShmemSize<TEST_EXECSPACE>(); }
+
+TEST_F(TEST_CATEGORY, multi_level_scratch) {
+  TestMultiLevelScratchTeam<TEST_EXECSPACE,
+                            Kokkos::Schedule<Kokkos::Static> >();
+  TestMultiLevelScratchTeam<TEST_EXECSPACE,
+                            Kokkos::Schedule<Kokkos::Dynamic> >();
 }
 
-TEST_F( TEST_CATEGORY, multi_level_scratch )
-{
-  TestMultiLevelScratchTeam< TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Static> >();
-  TestMultiLevelScratchTeam< TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Dynamic> >();
-}
-
-} // namespace Test
-
+}  // namespace Test
diff --git a/lib/kokkos/core/unit_test/rocm/TestROCm_TeamTeamSize.cpp b/lib/kokkos/core/unit_test/rocm/TestROCm_TeamTeamSize.cpp
index 583e01fcb6..3ddbe901b8 100644
--- a/lib/kokkos/core/unit_test/rocm/TestROCm_TeamTeamSize.cpp
+++ b/lib/kokkos/core/unit_test/rocm/TestROCm_TeamTeamSize.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
diff --git a/lib/kokkos/core/unit_test/rocm/TestROCm_ViewAPI_a.cpp b/lib/kokkos/core/unit_test/rocm/TestROCm_ViewAPI_a.cpp
index d0a7caad73..5740dedf32 100644
--- a/lib/kokkos/core/unit_test/rocm/TestROCm_ViewAPI_a.cpp
+++ b/lib/kokkos/core/unit_test/rocm/TestROCm_ViewAPI_a.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
diff --git a/lib/kokkos/core/unit_test/rocm/TestROCm_ViewAPI_b.cpp b/lib/kokkos/core/unit_test/rocm/TestROCm_ViewAPI_b.cpp
index cef3ad6064..775908043f 100644
--- a/lib/kokkos/core/unit_test/rocm/TestROCm_ViewAPI_b.cpp
+++ b/lib/kokkos/core/unit_test/rocm/TestROCm_ViewAPI_b.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
diff --git a/lib/kokkos/core/unit_test/rocm/TestROCm_ViewAPI_c.cpp b/lib/kokkos/core/unit_test/rocm/TestROCm_ViewAPI_c.cpp
index 624fda5a77..bf28aff302 100644
--- a/lib/kokkos/core/unit_test/rocm/TestROCm_ViewAPI_c.cpp
+++ b/lib/kokkos/core/unit_test/rocm/TestROCm_ViewAPI_c.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
diff --git a/lib/kokkos/core/unit_test/rocm/TestROCm_ViewAPI_d.cpp b/lib/kokkos/core/unit_test/rocm/TestROCm_ViewAPI_d.cpp
index fbb169828c..3dabcdfabb 100644
--- a/lib/kokkos/core/unit_test/rocm/TestROCm_ViewAPI_d.cpp
+++ b/lib/kokkos/core/unit_test/rocm/TestROCm_ViewAPI_d.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
diff --git a/lib/kokkos/core/unit_test/rocm/TestROCm_ViewAPI_e.cpp b/lib/kokkos/core/unit_test/rocm/TestROCm_ViewAPI_e.cpp
index 1a9f993e7e..45633ebab9 100644
--- a/lib/kokkos/core/unit_test/rocm/TestROCm_ViewAPI_e.cpp
+++ b/lib/kokkos/core/unit_test/rocm/TestROCm_ViewAPI_e.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
diff --git a/lib/kokkos/core/unit_test/rocm/TestROCm_ViewMapping_a.cpp b/lib/kokkos/core/unit_test/rocm/TestROCm_ViewMapping_a.cpp
index 1d79e6a63d..0ecaacaea7 100644
--- a/lib/kokkos/core/unit_test/rocm/TestROCm_ViewMapping_a.cpp
+++ b/lib/kokkos/core/unit_test/rocm/TestROCm_ViewMapping_a.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -43,4 +44,3 @@
 
 #include <rocm/TestROCm_Category.hpp>
 #include <TestViewMapping_a.hpp>
-
diff --git a/lib/kokkos/core/unit_test/rocm/TestROCm_ViewMapping_b.cpp b/lib/kokkos/core/unit_test/rocm/TestROCm_ViewMapping_b.cpp
index 15bf92affe..7af6e2ff4e 100644
--- a/lib/kokkos/core/unit_test/rocm/TestROCm_ViewMapping_b.cpp
+++ b/lib/kokkos/core/unit_test/rocm/TestROCm_ViewMapping_b.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -43,4 +44,3 @@
 
 #include <rocm/TestROCm_Category.hpp>
 #include <TestViewMapping_b.hpp>
-
diff --git a/lib/kokkos/core/unit_test/rocm/TestROCm_ViewMapping_subview.cpp b/lib/kokkos/core/unit_test/rocm/TestROCm_ViewMapping_subview.cpp
index 7e35355215..f8f2e40979 100644
--- a/lib/kokkos/core/unit_test/rocm/TestROCm_ViewMapping_subview.cpp
+++ b/lib/kokkos/core/unit_test/rocm/TestROCm_ViewMapping_subview.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -43,4 +44,3 @@
 
 #include <rocm/TestROCm_Category.hpp>
 #include <TestViewMapping_subview.hpp>
-
diff --git a/lib/kokkos/core/unit_test/rocm/TestROCm_ViewOfClass.cpp b/lib/kokkos/core/unit_test/rocm/TestROCm_ViewOfClass.cpp
index c03385b64e..2f917ac612 100644
--- a/lib/kokkos/core/unit_test/rocm/TestROCm_ViewOfClass.cpp
+++ b/lib/kokkos/core/unit_test/rocm/TestROCm_ViewOfClass.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -43,4 +44,3 @@
 
 #include <rocm/TestROCm_Category.hpp>
 #include <TestViewOfClass.hpp>
-
diff --git a/lib/kokkos/core/unit_test/serial/TestSerial_AtomicOperations_complexdouble.cpp b/lib/kokkos/core/unit_test/serial/TestSerial_AtomicOperations_complexdouble.cpp
index e7354cb116..fc26bb578a 100644
--- a/lib/kokkos/core/unit_test/serial/TestSerial_AtomicOperations_complexdouble.cpp
+++ b/lib/kokkos/core/unit_test/serial/TestSerial_AtomicOperations_complexdouble.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -41,6 +42,5 @@
 //@HEADER
 */
 
-#include<serial/TestSerial_Category.hpp>
-#include<TestAtomicOperations_complexdouble.hpp>
-
+#include <serial/TestSerial_Category.hpp>
+#include <TestAtomicOperations_complexdouble.hpp>
diff --git a/lib/kokkos/core/unit_test/serial/TestSerial_AtomicOperations_complexfloat.cpp b/lib/kokkos/core/unit_test/serial/TestSerial_AtomicOperations_complexfloat.cpp
index 50227db29f..db5a4a000c 100644
--- a/lib/kokkos/core/unit_test/serial/TestSerial_AtomicOperations_complexfloat.cpp
+++ b/lib/kokkos/core/unit_test/serial/TestSerial_AtomicOperations_complexfloat.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -41,6 +42,5 @@
 //@HEADER
 */
 
-#include<serial/TestSerial_Category.hpp>
-#include<TestAtomicOperations_complexfloat.hpp>
-
+#include <serial/TestSerial_Category.hpp>
+#include <TestAtomicOperations_complexfloat.hpp>
diff --git a/lib/kokkos/core/unit_test/serial/TestSerial_AtomicOperations_double.cpp b/lib/kokkos/core/unit_test/serial/TestSerial_AtomicOperations_double.cpp
index da515c8567..2ce675afd9 100644
--- a/lib/kokkos/core/unit_test/serial/TestSerial_AtomicOperations_double.cpp
+++ b/lib/kokkos/core/unit_test/serial/TestSerial_AtomicOperations_double.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -41,6 +42,5 @@
 //@HEADER
 */
 
-#include<serial/TestSerial_Category.hpp>
-#include<TestAtomicOperations_double.hpp>
-
+#include <serial/TestSerial_Category.hpp>
+#include <TestAtomicOperations_double.hpp>
diff --git a/lib/kokkos/core/unit_test/serial/TestSerial_AtomicOperations_float.cpp b/lib/kokkos/core/unit_test/serial/TestSerial_AtomicOperations_float.cpp
index ae914b6f5e..328bc37f79 100644
--- a/lib/kokkos/core/unit_test/serial/TestSerial_AtomicOperations_float.cpp
+++ b/lib/kokkos/core/unit_test/serial/TestSerial_AtomicOperations_float.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -41,6 +42,5 @@
 //@HEADER
 */
 
-#include<serial/TestSerial_Category.hpp>
-#include<TestAtomicOperations_float.hpp>
-
+#include <serial/TestSerial_Category.hpp>
+#include <TestAtomicOperations_float.hpp>
diff --git a/lib/kokkos/core/unit_test/serial/TestSerial_AtomicOperations_int.cpp b/lib/kokkos/core/unit_test/serial/TestSerial_AtomicOperations_int.cpp
index 403d993129..5da7f7c3f2 100644
--- a/lib/kokkos/core/unit_test/serial/TestSerial_AtomicOperations_int.cpp
+++ b/lib/kokkos/core/unit_test/serial/TestSerial_AtomicOperations_int.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -41,6 +42,5 @@
 //@HEADER
 */
 
-#include<serial/TestSerial_Category.hpp>
-#include<TestAtomicOperations_int.hpp>
-
+#include <serial/TestSerial_Category.hpp>
+#include <TestAtomicOperations_int.hpp>
diff --git a/lib/kokkos/core/unit_test/serial/TestSerial_AtomicOperations_longint.cpp b/lib/kokkos/core/unit_test/serial/TestSerial_AtomicOperations_longint.cpp
index e4fbadc8f5..12cfb1d34a 100644
--- a/lib/kokkos/core/unit_test/serial/TestSerial_AtomicOperations_longint.cpp
+++ b/lib/kokkos/core/unit_test/serial/TestSerial_AtomicOperations_longint.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -41,6 +42,5 @@
 //@HEADER
 */
 
-#include<serial/TestSerial_Category.hpp>
-#include<TestAtomicOperations_longint.hpp>
-
+#include <serial/TestSerial_Category.hpp>
+#include <TestAtomicOperations_longint.hpp>
diff --git a/lib/kokkos/core/unit_test/serial/TestSerial_AtomicOperations_longlongint.cpp b/lib/kokkos/core/unit_test/serial/TestSerial_AtomicOperations_longlongint.cpp
index 8020775801..884a75e176 100644
--- a/lib/kokkos/core/unit_test/serial/TestSerial_AtomicOperations_longlongint.cpp
+++ b/lib/kokkos/core/unit_test/serial/TestSerial_AtomicOperations_longlongint.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -41,6 +42,5 @@
 //@HEADER
 */
 
-#include<serial/TestSerial_Category.hpp>
-#include<TestAtomicOperations_longlongint.hpp>
-
+#include <serial/TestSerial_Category.hpp>
+#include <TestAtomicOperations_longlongint.hpp>
diff --git a/lib/kokkos/core/unit_test/serial/TestSerial_AtomicOperations_unsignedint.cpp b/lib/kokkos/core/unit_test/serial/TestSerial_AtomicOperations_unsignedint.cpp
index af5a1979ee..771730d708 100644
--- a/lib/kokkos/core/unit_test/serial/TestSerial_AtomicOperations_unsignedint.cpp
+++ b/lib/kokkos/core/unit_test/serial/TestSerial_AtomicOperations_unsignedint.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -41,6 +42,5 @@
 //@HEADER
 */
 
-#include<serial/TestSerial_Category.hpp>
-#include<TestAtomicOperations_unsignedint.hpp>
-
+#include <serial/TestSerial_Category.hpp>
+#include <TestAtomicOperations_unsignedint.hpp>
diff --git a/lib/kokkos/core/unit_test/serial/TestSerial_AtomicOperations_unsignedlongint.cpp b/lib/kokkos/core/unit_test/serial/TestSerial_AtomicOperations_unsignedlongint.cpp
index 8a06e4a2aa..7eeea84f73 100644
--- a/lib/kokkos/core/unit_test/serial/TestSerial_AtomicOperations_unsignedlongint.cpp
+++ b/lib/kokkos/core/unit_test/serial/TestSerial_AtomicOperations_unsignedlongint.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -41,6 +42,5 @@
 //@HEADER
 */
 
-#include<serial/TestSerial_Category.hpp>
-#include<TestAtomicOperations_unsignedlongint.hpp>
-
+#include <serial/TestSerial_Category.hpp>
+#include <TestAtomicOperations_unsignedlongint.hpp>
diff --git a/lib/kokkos/core/unit_test/serial/TestSerial_AtomicViews.cpp b/lib/kokkos/core/unit_test/serial/TestSerial_AtomicViews.cpp
index a03c74a008..be0b58d33c 100644
--- a/lib/kokkos/core/unit_test/serial/TestSerial_AtomicViews.cpp
+++ b/lib/kokkos/core/unit_test/serial/TestSerial_AtomicViews.cpp
@@ -3,10 +3,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -42,6 +43,5 @@
 //@HEADER
 */
 
-#include<serial/TestSerial_Category.hpp>
-#include<TestAtomicViews.hpp>
-
+#include <serial/TestSerial_Category.hpp>
+#include <TestAtomicViews.hpp>
diff --git a/lib/kokkos/core/unit_test/serial/TestSerial_Atomics.cpp b/lib/kokkos/core/unit_test/serial/TestSerial_Atomics.cpp
index 398ab10ccf..88e3d0b925 100644
--- a/lib/kokkos/core/unit_test/serial/TestSerial_Atomics.cpp
+++ b/lib/kokkos/core/unit_test/serial/TestSerial_Atomics.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -43,4 +44,3 @@
 
 #include <serial/TestSerial_Category.hpp>
 #include <TestAtomic.hpp>
-
diff --git a/lib/kokkos/core/unit_test/serial/TestSerial_Category.hpp b/lib/kokkos/core/unit_test/serial/TestSerial_Category.hpp
index 858b669286..0989af7f51 100644
--- a/lib/kokkos/core/unit_test/serial/TestSerial_Category.hpp
+++ b/lib/kokkos/core/unit_test/serial/TestSerial_Category.hpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -46,20 +47,8 @@
 
 #include <gtest/gtest.h>
 
-namespace Test {
-
-class serial : public ::testing::Test {
-protected:
-  static void SetUpTestCase() {
-  }
-
-  static void TearDownTestCase() {
-  }
-};
-
-} // namespace Test
-
 #define TEST_CATEGORY serial
+#define TEST_CATEGORY_DEATH serial_DeathTest
 #define TEST_EXECSPACE Kokkos::Serial
 
 #endif
diff --git a/lib/kokkos/core/unit_test/serial/TestSerial_Complex.cpp b/lib/kokkos/core/unit_test/serial/TestSerial_Complex.cpp
index fa9eacd2b3..f0cce7a729 100644
--- a/lib/kokkos/core/unit_test/serial/TestSerial_Complex.cpp
+++ b/lib/kokkos/core/unit_test/serial/TestSerial_Complex.cpp
@@ -3,10 +3,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -42,6 +43,5 @@
 //@HEADER
 */
 
-#include<serial/TestSerial_Category.hpp>
-#include<TestComplex.hpp>
-
+#include <serial/TestSerial_Category.hpp>
+#include <TestComplex.hpp>
diff --git a/lib/kokkos/core/unit_test/serial/TestSerial_Crs.cpp b/lib/kokkos/core/unit_test/serial/TestSerial_Crs.cpp
index 367c1028a8..cac55fe01e 100644
--- a/lib/kokkos/core/unit_test/serial/TestSerial_Crs.cpp
+++ b/lib/kokkos/core/unit_test/serial/TestSerial_Crs.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
diff --git a/lib/kokkos/core/unit_test/serial/TestSerial_DeepCopyAlignment.cpp b/lib/kokkos/core/unit_test/serial/TestSerial_DeepCopyAlignment.cpp
index 8280b49fe2..812a4fd997 100644
--- a/lib/kokkos/core/unit_test/serial/TestSerial_DeepCopyAlignment.cpp
+++ b/lib/kokkos/core/unit_test/serial/TestSerial_DeepCopyAlignment.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
diff --git a/lib/kokkos/core/unit_test/serial/TestSerial_FunctorAnalysis.cpp b/lib/kokkos/core/unit_test/serial/TestSerial_FunctorAnalysis.cpp
new file mode 100644
index 0000000000..403bdb922d
--- /dev/null
+++ b/lib/kokkos/core/unit_test/serial/TestSerial_FunctorAnalysis.cpp
@@ -0,0 +1,47 @@
+
+/*
+//@HEADER
+// ************************************************************************
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
+// the U.S. Government retains certain rights in this software.
+//
+// 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 Corporation nor the names of the
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 NTESS OR THE
+// 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.
+//
+// Questions? Contact Christian R. Trott (crtrott@sandia.gov)
+//
+// ************************************************************************
+//@HEADER
+*/
+
+#include <serial/TestSerial_Category.hpp>
+#include <TestFunctorAnalysis.hpp>
diff --git a/lib/kokkos/core/unit_test/serial/TestSerial_Init.cpp b/lib/kokkos/core/unit_test/serial/TestSerial_Init.cpp
index ccadb041ce..2cda827a56 100644
--- a/lib/kokkos/core/unit_test/serial/TestSerial_Init.cpp
+++ b/lib/kokkos/core/unit_test/serial/TestSerial_Init.cpp
@@ -3,10 +3,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -42,9 +43,7 @@
 //@HEADER
 */
 
-#include<serial/TestSerial_Category.hpp>
-#include<TestInit.hpp>
-#include<TestCompilerMacros.hpp>
-#include<TestPolicyConstruction.hpp>
-
-
+#include <serial/TestSerial_Category.hpp>
+#include <TestInit.hpp>
+#include <TestCompilerMacros.hpp>
+#include <TestPolicyConstruction.hpp>
diff --git a/lib/kokkos/core/unit_test/serial/TestSerial_LocalDeepCopy.cpp b/lib/kokkos/core/unit_test/serial/TestSerial_LocalDeepCopy.cpp
index a7cbcc171e..809473487a 100644
--- a/lib/kokkos/core/unit_test/serial/TestSerial_LocalDeepCopy.cpp
+++ b/lib/kokkos/core/unit_test/serial/TestSerial_LocalDeepCopy.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -43,4 +44,3 @@
 
 #include <serial/TestSerial_Category.hpp>
 #include <TestLocalDeepCopy.hpp>
-
diff --git a/lib/kokkos/core/unit_test/serial/TestSerial_MDRange_a.cpp b/lib/kokkos/core/unit_test/serial/TestSerial_MDRange_a.cpp
index a09ac9c2a6..863c910067 100644
--- a/lib/kokkos/core/unit_test/serial/TestSerial_MDRange_a.cpp
+++ b/lib/kokkos/core/unit_test/serial/TestSerial_MDRange_a.cpp
@@ -3,10 +3,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -42,6 +43,5 @@
 //@HEADER
 */
 
-#include<serial/TestSerial_Category.hpp>
-#include<TestMDRange_a.hpp>
-
+#include <serial/TestSerial_Category.hpp>
+#include <TestMDRange_a.hpp>
diff --git a/lib/kokkos/core/unit_test/serial/TestSerial_MDRange_b.cpp b/lib/kokkos/core/unit_test/serial/TestSerial_MDRange_b.cpp
index 3f46e0e64a..defe86f109 100644
--- a/lib/kokkos/core/unit_test/serial/TestSerial_MDRange_b.cpp
+++ b/lib/kokkos/core/unit_test/serial/TestSerial_MDRange_b.cpp
@@ -3,10 +3,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -42,6 +43,5 @@
 //@HEADER
 */
 
-#include<serial/TestSerial_Category.hpp>
-#include<TestMDRange_b.hpp>
-
+#include <serial/TestSerial_Category.hpp>
+#include <TestMDRange_b.hpp>
diff --git a/lib/kokkos/core/unit_test/serial/TestSerial_MDRange_c.cpp b/lib/kokkos/core/unit_test/serial/TestSerial_MDRange_c.cpp
index 9a1363b805..30f7af2bc6 100644
--- a/lib/kokkos/core/unit_test/serial/TestSerial_MDRange_c.cpp
+++ b/lib/kokkos/core/unit_test/serial/TestSerial_MDRange_c.cpp
@@ -3,10 +3,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -42,6 +43,5 @@
 //@HEADER
 */
 
-#include<serial/TestSerial_Category.hpp>
-#include<TestMDRange_c.hpp>
-
+#include <serial/TestSerial_Category.hpp>
+#include <TestMDRange_c.hpp>
diff --git a/lib/kokkos/core/unit_test/serial/TestSerial_MDRange_d.cpp b/lib/kokkos/core/unit_test/serial/TestSerial_MDRange_d.cpp
index f6f5d0f92b..c9341ccb5c 100644
--- a/lib/kokkos/core/unit_test/serial/TestSerial_MDRange_d.cpp
+++ b/lib/kokkos/core/unit_test/serial/TestSerial_MDRange_d.cpp
@@ -3,10 +3,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -42,6 +43,5 @@
 //@HEADER
 */
 
-#include<serial/TestSerial_Category.hpp>
-#include<TestMDRange_d.hpp>
-
+#include <serial/TestSerial_Category.hpp>
+#include <TestMDRange_d.hpp>
diff --git a/lib/kokkos/core/unit_test/serial/TestSerial_MDRange_e.cpp b/lib/kokkos/core/unit_test/serial/TestSerial_MDRange_e.cpp
index 601b19468f..ad12bb26cb 100644
--- a/lib/kokkos/core/unit_test/serial/TestSerial_MDRange_e.cpp
+++ b/lib/kokkos/core/unit_test/serial/TestSerial_MDRange_e.cpp
@@ -3,10 +3,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -42,6 +43,5 @@
 //@HEADER
 */
 
-#include<serial/TestSerial_Category.hpp>
-#include<TestMDRange_e.hpp>
-
+#include <serial/TestSerial_Category.hpp>
+#include <TestMDRange_e.hpp>
diff --git a/lib/kokkos/core/unit_test/serial/TestSerial_Other.cpp b/lib/kokkos/core/unit_test/serial/TestSerial_Other.cpp
index 26a218c5c1..ea4ac4e4cb 100644
--- a/lib/kokkos/core/unit_test/serial/TestSerial_Other.cpp
+++ b/lib/kokkos/core/unit_test/serial/TestSerial_Other.cpp
@@ -3,10 +3,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -42,12 +43,12 @@
 //@HEADER
 */
 
-#include<serial/TestSerial_Category.hpp>
-#include<TestTemplateMetaFunctions.hpp>
-#include<TestAggregate.hpp>
-#include<TestMemoryPool.hpp>
-#include<TestCXX11.hpp>
-#include<TestTile.hpp>
+#include <serial/TestSerial_Category.hpp>
+#include <TestTemplateMetaFunctions.hpp>
+#include <TestAggregate.hpp>
+#include <TestMemoryPool.hpp>
+#include <TestCXX11.hpp>
+#include <TestTile.hpp>
 
-#include<TestViewCtorPropEmbeddedDim.hpp>
-#include<TestViewLayoutTiled.hpp>
+#include <TestViewCtorPropEmbeddedDim.hpp>
+#include <TestViewLayoutTiled.hpp>
diff --git a/lib/kokkos/core/unit_test/serial/TestSerial_RangePolicy.cpp b/lib/kokkos/core/unit_test/serial/TestSerial_RangePolicy.cpp
index 5740eb74fc..f92daad51e 100644
--- a/lib/kokkos/core/unit_test/serial/TestSerial_RangePolicy.cpp
+++ b/lib/kokkos/core/unit_test/serial/TestSerial_RangePolicy.cpp
@@ -3,10 +3,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -42,6 +43,5 @@
 //@HEADER
 */
 
-#include<serial/TestSerial_Category.hpp>
-#include<TestRange.hpp>
-
+#include <serial/TestSerial_Category.hpp>
+#include <TestRange.hpp>
diff --git a/lib/kokkos/core/unit_test/serial/TestSerial_Reducers_a.cpp b/lib/kokkos/core/unit_test/serial/TestSerial_Reducers_a.cpp
index 2c65bb9bdb..2dc48e98e3 100644
--- a/lib/kokkos/core/unit_test/serial/TestSerial_Reducers_a.cpp
+++ b/lib/kokkos/core/unit_test/serial/TestSerial_Reducers_a.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
diff --git a/lib/kokkos/core/unit_test/serial/TestSerial_Reducers_b.cpp b/lib/kokkos/core/unit_test/serial/TestSerial_Reducers_b.cpp
index f1fa814010..2cd85bee1c 100644
--- a/lib/kokkos/core/unit_test/serial/TestSerial_Reducers_b.cpp
+++ b/lib/kokkos/core/unit_test/serial/TestSerial_Reducers_b.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
diff --git a/lib/kokkos/core/unit_test/serial/TestSerial_Reducers_c.cpp b/lib/kokkos/core/unit_test/serial/TestSerial_Reducers_c.cpp
index 4730a27302..979ea8b410 100644
--- a/lib/kokkos/core/unit_test/serial/TestSerial_Reducers_c.cpp
+++ b/lib/kokkos/core/unit_test/serial/TestSerial_Reducers_c.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
diff --git a/lib/kokkos/core/unit_test/serial/TestSerial_Reducers_d.cpp b/lib/kokkos/core/unit_test/serial/TestSerial_Reducers_d.cpp
index 26ea6f7e24..a6bdb8129d 100644
--- a/lib/kokkos/core/unit_test/serial/TestSerial_Reducers_d.cpp
+++ b/lib/kokkos/core/unit_test/serial/TestSerial_Reducers_d.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
diff --git a/lib/kokkos/core/unit_test/serial/TestSerial_Reductions.cpp b/lib/kokkos/core/unit_test/serial/TestSerial_Reductions.cpp
index acec0edd6e..a5961fbdf6 100644
--- a/lib/kokkos/core/unit_test/serial/TestSerial_Reductions.cpp
+++ b/lib/kokkos/core/unit_test/serial/TestSerial_Reductions.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
diff --git a/lib/kokkos/core/unit_test/serial/TestSerial_Reductions_DeviceView.cpp b/lib/kokkos/core/unit_test/serial/TestSerial_Reductions_DeviceView.cpp
index 1c20670c28..6e6c47024e 100644
--- a/lib/kokkos/core/unit_test/serial/TestSerial_Reductions_DeviceView.cpp
+++ b/lib/kokkos/core/unit_test/serial/TestSerial_Reductions_DeviceView.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
diff --git a/lib/kokkos/core/unit_test/serial/TestSerial_Scan.cpp b/lib/kokkos/core/unit_test/serial/TestSerial_Scan.cpp
index 23ca25d48c..287c05e17a 100644
--- a/lib/kokkos/core/unit_test/serial/TestSerial_Scan.cpp
+++ b/lib/kokkos/core/unit_test/serial/TestSerial_Scan.cpp
@@ -3,10 +3,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -42,6 +43,5 @@
 //@HEADER
 */
 
-#include<serial/TestSerial_Category.hpp>
-#include<TestScan.hpp>
-
+#include <serial/TestSerial_Category.hpp>
+#include <TestScan.hpp>
diff --git a/lib/kokkos/core/unit_test/serial/TestSerial_SharedAlloc.cpp b/lib/kokkos/core/unit_test/serial/TestSerial_SharedAlloc.cpp
index 348ce65428..1b5f2f2dd8 100644
--- a/lib/kokkos/core/unit_test/serial/TestSerial_SharedAlloc.cpp
+++ b/lib/kokkos/core/unit_test/serial/TestSerial_SharedAlloc.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -46,10 +47,8 @@
 
 namespace Test {
 
-
-TEST_F( TEST_CATEGORY, impl_shared_alloc )
-{
-  test_shared_alloc< Kokkos::HostSpace, TEST_EXECSPACE >();
+TEST(TEST_CATEGORY, impl_shared_alloc) {
+  test_shared_alloc<Kokkos::HostSpace, TEST_EXECSPACE>();
 }
 
-} // namespace Test
+}  // namespace Test
diff --git a/lib/kokkos/core/unit_test/serial/TestSerial_SubView_a.cpp b/lib/kokkos/core/unit_test/serial/TestSerial_SubView_a.cpp
index 6ca6b92f05..b2a33a7bdc 100644
--- a/lib/kokkos/core/unit_test/serial/TestSerial_SubView_a.cpp
+++ b/lib/kokkos/core/unit_test/serial/TestSerial_SubView_a.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -46,66 +47,56 @@
 
 namespace Test {
 
-TEST_F( TEST_CATEGORY, view_subview_auto_1d_left )
-{
-  TestViewSubview::test_auto_1d< Kokkos::LayoutLeft, TEST_EXECSPACE >();
+TEST(TEST_CATEGORY, view_subview_auto_1d_left) {
+  TestViewSubview::test_auto_1d<Kokkos::LayoutLeft, TEST_EXECSPACE>();
 }
 
-TEST_F( TEST_CATEGORY, view_subview_auto_1d_right )
-{
-  TestViewSubview::test_auto_1d< Kokkos::LayoutRight, TEST_EXECSPACE >();
+TEST(TEST_CATEGORY, view_subview_auto_1d_right) {
+  TestViewSubview::test_auto_1d<Kokkos::LayoutRight, TEST_EXECSPACE>();
 }
 
-TEST_F( TEST_CATEGORY, view_subview_auto_1d_stride )
-{
-  TestViewSubview::test_auto_1d< Kokkos::LayoutStride, TEST_EXECSPACE >();
+TEST(TEST_CATEGORY, view_subview_auto_1d_stride) {
+  TestViewSubview::test_auto_1d<Kokkos::LayoutStride, TEST_EXECSPACE>();
 }
 
-TEST_F( TEST_CATEGORY, view_subview_assign_strided )
-{
-  TestViewSubview::test_1d_strided_assignment< TEST_EXECSPACE >();
+TEST(TEST_CATEGORY, view_subview_assign_strided) {
+  TestViewSubview::test_1d_strided_assignment<TEST_EXECSPACE>();
 }
 
-TEST_F( TEST_CATEGORY, view_subview_left_0 )
-{
-  TestViewSubview::test_left_0< TEST_EXECSPACE >();
+TEST(TEST_CATEGORY, view_subview_left_0) {
+  TestViewSubview::test_left_0<TEST_EXECSPACE>();
 }
 
-TEST_F( TEST_CATEGORY, view_subview_left_1 )
-{
-  TestViewSubview::test_left_1< TEST_EXECSPACE >();
+TEST(TEST_CATEGORY, view_subview_left_1) {
+  TestViewSubview::test_left_1<TEST_EXECSPACE>();
 }
 
-TEST_F( TEST_CATEGORY, view_subview_left_2 )
-{
-  TestViewSubview::test_left_2< TEST_EXECSPACE >();
+TEST(TEST_CATEGORY, view_subview_left_2) {
+  TestViewSubview::test_left_2<TEST_EXECSPACE>();
 }
 
-TEST_F( TEST_CATEGORY, view_subview_left_3 )
-{
-  TestViewSubview::test_left_3< TEST_EXECSPACE >();
+TEST(TEST_CATEGORY, view_subview_left_3) {
+  TestViewSubview::test_left_3<TEST_EXECSPACE>();
 }
 
-TEST_F( TEST_CATEGORY, view_subview_right_0 )
-{
-  TestViewSubview::test_right_0< TEST_EXECSPACE >();
+TEST(TEST_CATEGORY, view_subview_right_0) {
+  TestViewSubview::test_right_0<TEST_EXECSPACE>();
 }
 
-TEST_F( TEST_CATEGORY, view_subview_right_1 )
-{
-  TestViewSubview::test_right_1< TEST_EXECSPACE >();
+TEST(TEST_CATEGORY, view_subview_right_1) {
+  TestViewSubview::test_right_1<TEST_EXECSPACE>();
 }
 
-TEST_F( TEST_CATEGORY, view_subview_right_3 )
-{
-  TestViewSubview::test_right_3< TEST_EXECSPACE >();
+TEST(TEST_CATEGORY, view_subview_right_3) {
+  TestViewSubview::test_right_3<TEST_EXECSPACE>();
 }
 
-TEST_F(TEST_CATEGORY, view_static_tests)
-{
-  TestViewSubview::TestSubviewStaticSizes<TEST_EXECSPACE, Kokkos::LayoutLeft>()();
-  TestViewSubview::TestSubviewStaticSizes<TEST_EXECSPACE, Kokkos::LayoutRight>()();
+TEST(TEST_CATEGORY, view_static_tests) {
+  TestViewSubview::TestSubviewStaticSizes<TEST_EXECSPACE,
+                                          Kokkos::LayoutLeft>()();
+  TestViewSubview::TestSubviewStaticSizes<TEST_EXECSPACE,
+                                          Kokkos::LayoutRight>()();
   TestViewSubview::TestExtentsStaticTests<TEST_EXECSPACE>();
 }
 
-} // namespace Test
+}  // namespace Test
diff --git a/lib/kokkos/core/unit_test/serial/TestSerial_SubView_b.cpp b/lib/kokkos/core/unit_test/serial/TestSerial_SubView_b.cpp
index b6869f95f1..5ea7c7e91a 100644
--- a/lib/kokkos/core/unit_test/serial/TestSerial_SubView_b.cpp
+++ b/lib/kokkos/core/unit_test/serial/TestSerial_SubView_b.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -46,18 +47,20 @@
 
 namespace Test {
 
-TEST_F( TEST_CATEGORY, view_subview_layoutleft_to_layoutleft )
-{
-  TestViewSubview::test_layoutleft_to_layoutleft< TEST_EXECSPACE >();
-  TestViewSubview::test_layoutleft_to_layoutleft< TEST_EXECSPACE, Kokkos::MemoryTraits<Kokkos::Atomic> >();
-  TestViewSubview::test_layoutleft_to_layoutleft< TEST_EXECSPACE, Kokkos::MemoryTraits<Kokkos::RandomAccess> >();
+TEST(TEST_CATEGORY, view_subview_layoutleft_to_layoutleft) {
+  TestViewSubview::test_layoutleft_to_layoutleft<TEST_EXECSPACE>();
+  TestViewSubview::test_layoutleft_to_layoutleft<
+      TEST_EXECSPACE, Kokkos::MemoryTraits<Kokkos::Atomic> >();
+  TestViewSubview::test_layoutleft_to_layoutleft<
+      TEST_EXECSPACE, Kokkos::MemoryTraits<Kokkos::RandomAccess> >();
 }
 
-TEST_F( TEST_CATEGORY, view_subview_layoutright_to_layoutright )
-{
-  TestViewSubview::test_layoutright_to_layoutright< TEST_EXECSPACE >();
-  TestViewSubview::test_layoutright_to_layoutright< TEST_EXECSPACE, Kokkos::MemoryTraits<Kokkos::Atomic> >();
-  TestViewSubview::test_layoutright_to_layoutright< TEST_EXECSPACE, Kokkos::MemoryTraits<Kokkos::RandomAccess> >();
+TEST(TEST_CATEGORY, view_subview_layoutright_to_layoutright) {
+  TestViewSubview::test_layoutright_to_layoutright<TEST_EXECSPACE>();
+  TestViewSubview::test_layoutright_to_layoutright<
+      TEST_EXECSPACE, Kokkos::MemoryTraits<Kokkos::Atomic> >();
+  TestViewSubview::test_layoutright_to_layoutright<
+      TEST_EXECSPACE, Kokkos::MemoryTraits<Kokkos::RandomAccess> >();
 }
 
-} // namespace Test
+}  // namespace Test
diff --git a/lib/kokkos/core/unit_test/serial/TestSerial_SubView_c01.cpp b/lib/kokkos/core/unit_test/serial/TestSerial_SubView_c01.cpp
index 395880493f..bced0bf2e6 100644
--- a/lib/kokkos/core/unit_test/serial/TestSerial_SubView_c01.cpp
+++ b/lib/kokkos/core/unit_test/serial/TestSerial_SubView_c01.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -46,9 +47,8 @@
 
 namespace Test {
 
-TEST_F( TEST_CATEGORY, view_subview_1d_assign )
-{
-  TestViewSubview::test_1d_assign< TEST_EXECSPACE >();
+TEST(TEST_CATEGORY, view_subview_1d_assign) {
+  TestViewSubview::test_1d_assign<TEST_EXECSPACE>();
 }
 
-} // namespace Test
+}  // namespace Test
diff --git a/lib/kokkos/core/unit_test/serial/TestSerial_SubView_c02.cpp b/lib/kokkos/core/unit_test/serial/TestSerial_SubView_c02.cpp
index 5bb21aba7b..d2a3d035b8 100644
--- a/lib/kokkos/core/unit_test/serial/TestSerial_SubView_c02.cpp
+++ b/lib/kokkos/core/unit_test/serial/TestSerial_SubView_c02.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -46,9 +47,9 @@
 
 namespace Test {
 
-TEST_F( TEST_CATEGORY, view_subview_1d_assign_atomic )
-{
-  TestViewSubview::test_1d_assign< TEST_EXECSPACE, Kokkos::MemoryTraits<Kokkos::Atomic> >();
+TEST(TEST_CATEGORY, view_subview_1d_assign_atomic) {
+  TestViewSubview::test_1d_assign<TEST_EXECSPACE,
+                                  Kokkos::MemoryTraits<Kokkos::Atomic> >();
 }
 
-} // namespace Test
+}  // namespace Test
diff --git a/lib/kokkos/core/unit_test/serial/TestSerial_SubView_c03.cpp b/lib/kokkos/core/unit_test/serial/TestSerial_SubView_c03.cpp
index 7f112ea326..7b531b9f72 100644
--- a/lib/kokkos/core/unit_test/serial/TestSerial_SubView_c03.cpp
+++ b/lib/kokkos/core/unit_test/serial/TestSerial_SubView_c03.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -46,9 +47,9 @@
 
 namespace Test {
 
-TEST_F( TEST_CATEGORY, view_subview_1d_assign_randomaccess )
-{
-  TestViewSubview::test_1d_assign< TEST_EXECSPACE, Kokkos::MemoryTraits<Kokkos::RandomAccess> >();
+TEST(TEST_CATEGORY, view_subview_1d_assign_randomaccess) {
+  TestViewSubview::test_1d_assign<
+      TEST_EXECSPACE, Kokkos::MemoryTraits<Kokkos::RandomAccess> >();
 }
 
-} // namespace Test
+}  // namespace Test
diff --git a/lib/kokkos/core/unit_test/serial/TestSerial_SubView_c04.cpp b/lib/kokkos/core/unit_test/serial/TestSerial_SubView_c04.cpp
index fdcc3b90fa..215fa645b1 100644
--- a/lib/kokkos/core/unit_test/serial/TestSerial_SubView_c04.cpp
+++ b/lib/kokkos/core/unit_test/serial/TestSerial_SubView_c04.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -46,9 +47,8 @@
 
 namespace Test {
 
-TEST_F( TEST_CATEGORY, view_subview_2d_from_3d )
-{
-  TestViewSubview::test_2d_subview_3d< TEST_EXECSPACE >();
+TEST(TEST_CATEGORY, view_subview_2d_from_3d) {
+  TestViewSubview::test_2d_subview_3d<TEST_EXECSPACE>();
 }
 
-} // namespace Test
+}  // namespace Test
diff --git a/lib/kokkos/core/unit_test/serial/TestSerial_SubView_c05.cpp b/lib/kokkos/core/unit_test/serial/TestSerial_SubView_c05.cpp
index 4df5e8508b..4e066f945a 100644
--- a/lib/kokkos/core/unit_test/serial/TestSerial_SubView_c05.cpp
+++ b/lib/kokkos/core/unit_test/serial/TestSerial_SubView_c05.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -46,9 +47,9 @@
 
 namespace Test {
 
-TEST_F( serial, view_subview_2d_from_3d_atomic )
-{
-  TestViewSubview::test_2d_subview_3d< TEST_EXECSPACE, Kokkos::MemoryTraits<Kokkos::Atomic> >();
+TEST(serial, view_subview_2d_from_3d_atomic) {
+  TestViewSubview::test_2d_subview_3d<TEST_EXECSPACE,
+                                      Kokkos::MemoryTraits<Kokkos::Atomic> >();
 }
 
-} // namespace Test
+}  // namespace Test
diff --git a/lib/kokkos/core/unit_test/serial/TestSerial_SubView_c06.cpp b/lib/kokkos/core/unit_test/serial/TestSerial_SubView_c06.cpp
index 1e715eccf6..803fa75aa8 100644
--- a/lib/kokkos/core/unit_test/serial/TestSerial_SubView_c06.cpp
+++ b/lib/kokkos/core/unit_test/serial/TestSerial_SubView_c06.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -46,9 +47,9 @@
 
 namespace Test {
 
-TEST_F( TEST_CATEGORY, view_subview_2d_from_3d_randomaccess )
-{
-  TestViewSubview::test_2d_subview_3d< TEST_EXECSPACE, Kokkos::MemoryTraits<Kokkos::RandomAccess> >();
+TEST(TEST_CATEGORY, view_subview_2d_from_3d_randomaccess) {
+  TestViewSubview::test_2d_subview_3d<
+      TEST_EXECSPACE, Kokkos::MemoryTraits<Kokkos::RandomAccess> >();
 }
 
-} // namespace Test
+}  // namespace Test
diff --git a/lib/kokkos/core/unit_test/serial/TestSerial_SubView_c07.cpp b/lib/kokkos/core/unit_test/serial/TestSerial_SubView_c07.cpp
index a5189fc7d8..6bf64ba06f 100644
--- a/lib/kokkos/core/unit_test/serial/TestSerial_SubView_c07.cpp
+++ b/lib/kokkos/core/unit_test/serial/TestSerial_SubView_c07.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -46,9 +47,8 @@
 
 namespace Test {
 
-TEST_F( TEST_CATEGORY, view_subview_3d_from_5d_left )
-{
-  TestViewSubview::test_3d_subview_5d_left< TEST_EXECSPACE >();
+TEST(TEST_CATEGORY, view_subview_3d_from_5d_left) {
+  TestViewSubview::test_3d_subview_5d_left<TEST_EXECSPACE>();
 }
 
-} // namespace Test
+}  // namespace Test
diff --git a/lib/kokkos/core/unit_test/serial/TestSerial_SubView_c08.cpp b/lib/kokkos/core/unit_test/serial/TestSerial_SubView_c08.cpp
index 96ae5d7374..691fe1a965 100644
--- a/lib/kokkos/core/unit_test/serial/TestSerial_SubView_c08.cpp
+++ b/lib/kokkos/core/unit_test/serial/TestSerial_SubView_c08.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -46,9 +47,9 @@
 
 namespace Test {
 
-TEST_F( TEST_CATEGORY, view_subview_3d_from_5d_left_atomic )
-{
-  TestViewSubview::test_3d_subview_5d_left< TEST_EXECSPACE, Kokkos::MemoryTraits<Kokkos::Atomic> >();
+TEST(TEST_CATEGORY, view_subview_3d_from_5d_left_atomic) {
+  TestViewSubview::test_3d_subview_5d_left<
+      TEST_EXECSPACE, Kokkos::MemoryTraits<Kokkos::Atomic> >();
 }
 
-} // namespace Test
+}  // namespace Test
diff --git a/lib/kokkos/core/unit_test/serial/TestSerial_SubView_c09.cpp b/lib/kokkos/core/unit_test/serial/TestSerial_SubView_c09.cpp
index f4d716540a..cfbe075c83 100644
--- a/lib/kokkos/core/unit_test/serial/TestSerial_SubView_c09.cpp
+++ b/lib/kokkos/core/unit_test/serial/TestSerial_SubView_c09.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -46,9 +47,9 @@
 
 namespace Test {
 
-TEST_F( TEST_CATEGORY, view_subview_3d_from_5d_left_randomaccess )
-{
-  TestViewSubview::test_3d_subview_5d_left< TEST_EXECSPACE, Kokkos::MemoryTraits<Kokkos::RandomAccess> >();
+TEST(TEST_CATEGORY, view_subview_3d_from_5d_left_randomaccess) {
+  TestViewSubview::test_3d_subview_5d_left<
+      TEST_EXECSPACE, Kokkos::MemoryTraits<Kokkos::RandomAccess> >();
 }
 
-} // namespace Test
+}  // namespace Test
diff --git a/lib/kokkos/core/unit_test/serial/TestSerial_SubView_c10.cpp b/lib/kokkos/core/unit_test/serial/TestSerial_SubView_c10.cpp
index e393e5d4d3..1886532123 100644
--- a/lib/kokkos/core/unit_test/serial/TestSerial_SubView_c10.cpp
+++ b/lib/kokkos/core/unit_test/serial/TestSerial_SubView_c10.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -46,9 +47,8 @@
 
 namespace Test {
 
-TEST_F( TEST_CATEGORY, view_subview_3d_from_5d_right )
-{
-  TestViewSubview::test_3d_subview_5d_right< TEST_EXECSPACE >();
+TEST(TEST_CATEGORY, view_subview_3d_from_5d_right) {
+  TestViewSubview::test_3d_subview_5d_right<TEST_EXECSPACE>();
 }
 
-} // namespace Test
+}  // namespace Test
diff --git a/lib/kokkos/core/unit_test/serial/TestSerial_SubView_c11.cpp b/lib/kokkos/core/unit_test/serial/TestSerial_SubView_c11.cpp
index e9ea9a6010..264d919e25 100644
--- a/lib/kokkos/core/unit_test/serial/TestSerial_SubView_c11.cpp
+++ b/lib/kokkos/core/unit_test/serial/TestSerial_SubView_c11.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -46,9 +47,9 @@
 
 namespace Test {
 
-TEST_F( TEST_CATEGORY, view_subview_3d_from_5d_right_atomic )
-{
-  TestViewSubview::test_3d_subview_5d_right< TEST_EXECSPACE, Kokkos::MemoryTraits<Kokkos::Atomic> >();
+TEST(TEST_CATEGORY, view_subview_3d_from_5d_right_atomic) {
+  TestViewSubview::test_3d_subview_5d_right<
+      TEST_EXECSPACE, Kokkos::MemoryTraits<Kokkos::Atomic> >();
 }
 
-} // namespace Test
+}  // namespace Test
diff --git a/lib/kokkos/core/unit_test/serial/TestSerial_SubView_c12.cpp b/lib/kokkos/core/unit_test/serial/TestSerial_SubView_c12.cpp
index 01b57903cf..53dd79c1ed 100644
--- a/lib/kokkos/core/unit_test/serial/TestSerial_SubView_c12.cpp
+++ b/lib/kokkos/core/unit_test/serial/TestSerial_SubView_c12.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -46,9 +47,9 @@
 
 namespace Test {
 
-TEST_F( TEST_CATEGORY, view_subview_3d_from_5d_right_randomaccess )
-{
-  TestViewSubview::test_3d_subview_5d_right< TEST_EXECSPACE, Kokkos::MemoryTraits<Kokkos::RandomAccess> >();
+TEST(TEST_CATEGORY, view_subview_3d_from_5d_right_randomaccess) {
+  TestViewSubview::test_3d_subview_5d_right<
+      TEST_EXECSPACE, Kokkos::MemoryTraits<Kokkos::RandomAccess> >();
 }
 
-} // namespace Test
+}  // namespace Test
diff --git a/lib/kokkos/core/unit_test/serial/TestSerial_SubView_c13.cpp b/lib/kokkos/core/unit_test/serial/TestSerial_SubView_c13.cpp
index f50d28b251..a0b1f36a00 100644
--- a/lib/kokkos/core/unit_test/serial/TestSerial_SubView_c13.cpp
+++ b/lib/kokkos/core/unit_test/serial/TestSerial_SubView_c13.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -46,9 +47,8 @@
 
 namespace Test {
 
-TEST_F( TEST_CATEGORY, view_test_unmanaged_subview_reset )
-{
-  TestViewSubview::test_unmanaged_subview_reset< TEST_EXECSPACE >();
+TEST(TEST_CATEGORY, view_test_unmanaged_subview_reset) {
+  TestViewSubview::test_unmanaged_subview_reset<TEST_EXECSPACE>();
 }
 
-} // namespace Test
+}  // namespace Test
diff --git a/lib/kokkos/core/unit_test/serial/TestSerial_Task.cpp b/lib/kokkos/core/unit_test/serial/TestSerial_Task.cpp
index d2d748d942..02f686e069 100644
--- a/lib/kokkos/core/unit_test/serial/TestSerial_Task.cpp
+++ b/lib/kokkos/core/unit_test/serial/TestSerial_Task.cpp
@@ -3,10 +3,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -42,6 +43,5 @@
 //@HEADER
 */
 
-#include<serial/TestSerial_Category.hpp>
-#include<TestTaskScheduler.hpp>
-
+#include <serial/TestSerial_Category.hpp>
+#include <TestTaskScheduler.hpp>
diff --git a/lib/kokkos/core/unit_test/serial/TestSerial_Team.cpp b/lib/kokkos/core/unit_test/serial/TestSerial_Team.cpp
index 47d02f7001..e85ea86f3f 100644
--- a/lib/kokkos/core/unit_test/serial/TestSerial_Team.cpp
+++ b/lib/kokkos/core/unit_test/serial/TestSerial_Team.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -46,45 +47,59 @@
 
 namespace Test {
 
-TEST_F( TEST_CATEGORY, team_for )
-{
-  TestTeamPolicy< TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Static> >::test_for( 0 );
-  TestTeamPolicy< TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Dynamic> >::test_for( 0 );
+TEST(TEST_CATEGORY, team_for) {
+  TestTeamPolicy<TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Static> >::test_for(
+      0);
+  TestTeamPolicy<TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Dynamic> >::test_for(
+      0);
 
-  TestTeamPolicy< TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Static> >::test_for( 2 );
-  TestTeamPolicy< TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Dynamic> >::test_for( 2 );
+  TestTeamPolicy<TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Static> >::test_for(
+      2);
+  TestTeamPolicy<TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Dynamic> >::test_for(
+      2);
 
-  TestTeamPolicy< TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Static> >::test_for( 1000 );
-  TestTeamPolicy< TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Dynamic> >::test_for( 1000 );
+  TestTeamPolicy<TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Static> >::test_for(
+      1000);
+  TestTeamPolicy<TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Dynamic> >::test_for(
+      1000);
 }
 
-
-TEST_F( TEST_CATEGORY, team_reduce )
-{
-  TestTeamPolicy< TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Static> >::test_reduce( 0 );
-  TestTeamPolicy< TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Dynamic> >::test_reduce( 0 );
-  TestTeamPolicy< TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Static> >::test_reduce( 2 );
-  TestTeamPolicy< TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Dynamic> >::test_reduce( 2 );
-  TestTeamPolicy< TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Static> >::test_reduce( 1000 );
-  TestTeamPolicy< TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Dynamic> >::test_reduce( 1000 );
+TEST(TEST_CATEGORY, team_reduce) {
+  TestTeamPolicy<TEST_EXECSPACE,
+                 Kokkos::Schedule<Kokkos::Static> >::test_reduce(0);
+  TestTeamPolicy<TEST_EXECSPACE,
+                 Kokkos::Schedule<Kokkos::Dynamic> >::test_reduce(0);
+  TestTeamPolicy<TEST_EXECSPACE,
+                 Kokkos::Schedule<Kokkos::Static> >::test_reduce(2);
+  TestTeamPolicy<TEST_EXECSPACE,
+                 Kokkos::Schedule<Kokkos::Dynamic> >::test_reduce(2);
+  TestTeamPolicy<TEST_EXECSPACE,
+                 Kokkos::Schedule<Kokkos::Static> >::test_reduce(1000);
+  TestTeamPolicy<TEST_EXECSPACE,
+                 Kokkos::Schedule<Kokkos::Dynamic> >::test_reduce(1000);
 }
 
-TEST_F( TEST_CATEGORY, team_broadcast )
-{
-  TestTeamBroadcast< TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Static> >::test_teambroadcast( 0 );
-  TestTeamBroadcast< TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Dynamic> >::test_teambroadcast( 0 );
+TEST(TEST_CATEGORY, team_broadcast) {
+  TestTeamBroadcast<TEST_EXECSPACE,
+                    Kokkos::Schedule<Kokkos::Static> >::test_teambroadcast(0);
+  TestTeamBroadcast<TEST_EXECSPACE,
+                    Kokkos::Schedule<Kokkos::Dynamic> >::test_teambroadcast(0);
 
-  TestTeamBroadcast< TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Static> >::test_teambroadcast( 2 );
-  TestTeamBroadcast< TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Dynamic> >::test_teambroadcast( 2 );
+  TestTeamBroadcast<TEST_EXECSPACE,
+                    Kokkos::Schedule<Kokkos::Static> >::test_teambroadcast(2);
+  TestTeamBroadcast<TEST_EXECSPACE,
+                    Kokkos::Schedule<Kokkos::Dynamic> >::test_teambroadcast(2);
 
-  TestTeamBroadcast< TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Static> >::test_teambroadcast( 16 );
-  TestTeamBroadcast< TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Dynamic> >::test_teambroadcast( 16 );
+  TestTeamBroadcast<TEST_EXECSPACE,
+                    Kokkos::Schedule<Kokkos::Static> >::test_teambroadcast(16);
+  TestTeamBroadcast<TEST_EXECSPACE,
+                    Kokkos::Schedule<Kokkos::Dynamic> >::test_teambroadcast(16);
 
-  TestTeamBroadcast< TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Static> >::test_teambroadcast( 1000 );
-  TestTeamBroadcast< TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Dynamic> >::test_teambroadcast( 1000 );
-}
+  TestTeamBroadcast<TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Static> >::
+      test_teambroadcast(1000);
+  TestTeamBroadcast<TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Dynamic> >::
+      test_teambroadcast(1000);
 }
+}  // namespace Test
 
 #include <TestTeamVector.hpp>
-
-
diff --git a/lib/kokkos/core/unit_test/serial/TestSerial_TeamReductionScan.cpp b/lib/kokkos/core/unit_test/serial/TestSerial_TeamReductionScan.cpp
index e626beaeb6..29f77d35aa 100644
--- a/lib/kokkos/core/unit_test/serial/TestSerial_TeamReductionScan.cpp
+++ b/lib/kokkos/core/unit_test/serial/TestSerial_TeamReductionScan.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -46,36 +47,35 @@
 
 namespace Test {
 
-
-TEST_F( TEST_CATEGORY, team_scan )
-{
-  TestScanTeam< TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Static> >( 0 );
-  TestScanTeam< TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Dynamic> >( 0 );
-  TestScanTeam< TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Static> >( 10 );
-  TestScanTeam< TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Dynamic> >( 10 );
-  TestScanTeam< TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Static> >( 10000 );
-  TestScanTeam< TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Dynamic> >( 10000 );
+TEST(TEST_CATEGORY, team_scan) {
+  TestScanTeam<TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Static> >(0);
+  TestScanTeam<TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Dynamic> >(0);
+  TestScanTeam<TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Static> >(10);
+  TestScanTeam<TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Dynamic> >(10);
+  TestScanTeam<TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Static> >(10000);
+  TestScanTeam<TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Dynamic> >(10000);
 }
 
-TEST_F( TEST_CATEGORY, team_long_reduce )
-{
-  TestReduceTeam< long, TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Static> >( 0 );
-  TestReduceTeam< long, TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Dynamic> >( 0 );
-  TestReduceTeam< long, TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Static> >( 3 );
-  TestReduceTeam< long, TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Dynamic> >( 3 );
-  TestReduceTeam< long, TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Static> >( 100000 );
-  TestReduceTeam< long, TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Dynamic> >( 100000 );
+TEST(TEST_CATEGORY, team_long_reduce) {
+  TestReduceTeam<long, TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Static> >(0);
+  TestReduceTeam<long, TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Dynamic> >(0);
+  TestReduceTeam<long, TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Static> >(3);
+  TestReduceTeam<long, TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Dynamic> >(3);
+  TestReduceTeam<long, TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Static> >(
+      100000);
+  TestReduceTeam<long, TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Dynamic> >(
+      100000);
 }
 
-TEST_F( TEST_CATEGORY, team_double_reduce )
-{
-  TestReduceTeam< double, TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Static> >( 0 );
-  TestReduceTeam< double, TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Dynamic> >( 0 );
-  TestReduceTeam< double, TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Static> >( 3 );
-  TestReduceTeam< double, TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Dynamic> >( 3 );
-  TestReduceTeam< double, TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Static> >( 100000 );
-  TestReduceTeam< double, TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Dynamic> >( 100000 );
+TEST(TEST_CATEGORY, team_double_reduce) {
+  TestReduceTeam<double, TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Static> >(0);
+  TestReduceTeam<double, TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Dynamic> >(0);
+  TestReduceTeam<double, TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Static> >(3);
+  TestReduceTeam<double, TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Dynamic> >(3);
+  TestReduceTeam<double, TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Static> >(
+      100000);
+  TestReduceTeam<double, TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Dynamic> >(
+      100000);
 }
 
-} // namespace Test
-
+}  // namespace Test
diff --git a/lib/kokkos/core/unit_test/serial/TestSerial_TeamScratch.cpp b/lib/kokkos/core/unit_test/serial/TestSerial_TeamScratch.cpp
index 029999ab72..e70b3e34d6 100644
--- a/lib/kokkos/core/unit_test/serial/TestSerial_TeamScratch.cpp
+++ b/lib/kokkos/core/unit_test/serial/TestSerial_TeamScratch.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -46,42 +47,36 @@
 
 namespace Test {
 
-TEST_F( TEST_CATEGORY, team_shared_request )
-{
-  TestSharedTeam< TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Static> >();
-  TestSharedTeam< TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Dynamic> >();
+TEST(TEST_CATEGORY, team_shared_request) {
+  TestSharedTeam<TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Static> >();
+  TestSharedTeam<TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Dynamic> >();
 }
 
-TEST_F( TEST_CATEGORY, team_scratch_request )
-{
-  TestScratchTeam< TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Static> >();
-  TestScratchTeam< TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Dynamic> >();
+TEST(TEST_CATEGORY, team_scratch_request) {
+  TestScratchTeam<TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Static> >();
+  TestScratchTeam<TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Dynamic> >();
 }
 
-#if defined( KOKKOS_ENABLE_CXX11_DISPATCH_LAMBDA )
-#if !defined(KOKKOS_ENABLE_CUDA) || ( 8000 <= CUDA_VERSION )
-TEST_F( TEST_CATEGORY, team_lambda_shared_request )
-{
-  TestLambdaSharedTeam< Kokkos::HostSpace, TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Static> >();
-  TestLambdaSharedTeam< Kokkos::HostSpace, TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Dynamic> >();
+#if defined(KOKKOS_ENABLE_CXX11_DISPATCH_LAMBDA)
+#if !defined(KOKKOS_ENABLE_CUDA) || (8000 <= CUDA_VERSION)
+TEST(TEST_CATEGORY, team_lambda_shared_request) {
+  TestLambdaSharedTeam<Kokkos::HostSpace, TEST_EXECSPACE,
+                       Kokkos::Schedule<Kokkos::Static> >();
+  TestLambdaSharedTeam<Kokkos::HostSpace, TEST_EXECSPACE,
+                       Kokkos::Schedule<Kokkos::Dynamic> >();
 }
 
-TEST_F( TEST_CATEGORY, scratch_align) {
-  TestScratchAlignment< TEST_EXECSPACE >();
-}
+TEST(TEST_CATEGORY, scratch_align) { TestScratchAlignment<TEST_EXECSPACE>(); }
 #endif
 #endif
 
-TEST_F( TEST_CATEGORY, shmem_size )
-{
-  TestShmemSize< TEST_EXECSPACE >();
+TEST(TEST_CATEGORY, shmem_size) { TestShmemSize<TEST_EXECSPACE>(); }
+
+TEST(TEST_CATEGORY, multi_level_scratch) {
+  TestMultiLevelScratchTeam<TEST_EXECSPACE,
+                            Kokkos::Schedule<Kokkos::Static> >();
+  TestMultiLevelScratchTeam<TEST_EXECSPACE,
+                            Kokkos::Schedule<Kokkos::Dynamic> >();
 }
 
-TEST_F( TEST_CATEGORY, multi_level_scratch )
-{
-  TestMultiLevelScratchTeam< TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Static> >();
-  TestMultiLevelScratchTeam< TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Dynamic> >();
-}
-
-} // namespace Test
-
+}  // namespace Test
diff --git a/lib/kokkos/core/unit_test/serial/TestSerial_TeamTeamSize.cpp b/lib/kokkos/core/unit_test/serial/TestSerial_TeamTeamSize.cpp
index 53451b30c9..82f90b13b7 100644
--- a/lib/kokkos/core/unit_test/serial/TestSerial_TeamTeamSize.cpp
+++ b/lib/kokkos/core/unit_test/serial/TestSerial_TeamTeamSize.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
diff --git a/lib/kokkos/core/unit_test/serial/TestSerial_TeamVectorRange.cpp b/lib/kokkos/core/unit_test/serial/TestSerial_TeamVectorRange.cpp
index f8d8328f78..a41f71c95b 100644
--- a/lib/kokkos/core/unit_test/serial/TestSerial_TeamVectorRange.cpp
+++ b/lib/kokkos/core/unit_test/serial/TestSerial_TeamVectorRange.cpp
@@ -3,10 +3,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -42,7 +43,5 @@
 //@HEADER
 */
 
-#include<serial/TestSerial_Category.hpp>
-#include<TestTeamVectorRange.hpp>
-
-
+#include <serial/TestSerial_Category.hpp>
+#include <TestTeamVectorRange.hpp>
diff --git a/lib/kokkos/core/unit_test/serial/TestSerial_UniqueToken.cpp b/lib/kokkos/core/unit_test/serial/TestSerial_UniqueToken.cpp
new file mode 100644
index 0000000000..859918a7a6
--- /dev/null
+++ b/lib/kokkos/core/unit_test/serial/TestSerial_UniqueToken.cpp
@@ -0,0 +1,46 @@
+/*
+//@HEADER
+// ************************************************************************
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
+// the U.S. Government retains certain rights in this software.
+//
+// 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 Corporation nor the names of the
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 NTESS OR THE
+// 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.
+//
+// Questions? Contact Christian R. Trott (crtrott@sandia.gov)
+//
+// ************************************************************************
+//@HEADER
+*/
+
+#include <serial/TestSerial_Category.hpp>
+#include <TestUniqueToken.hpp>
diff --git a/lib/kokkos/core/unit_test/serial/TestSerial_ViewAPI_a.cpp b/lib/kokkos/core/unit_test/serial/TestSerial_ViewAPI_a.cpp
index e29363456a..872944f886 100644
--- a/lib/kokkos/core/unit_test/serial/TestSerial_ViewAPI_a.cpp
+++ b/lib/kokkos/core/unit_test/serial/TestSerial_ViewAPI_a.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
diff --git a/lib/kokkos/core/unit_test/serial/TestSerial_ViewAPI_b.cpp b/lib/kokkos/core/unit_test/serial/TestSerial_ViewAPI_b.cpp
index 09c0049d6b..2a63f94faa 100644
--- a/lib/kokkos/core/unit_test/serial/TestSerial_ViewAPI_b.cpp
+++ b/lib/kokkos/core/unit_test/serial/TestSerial_ViewAPI_b.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
diff --git a/lib/kokkos/core/unit_test/serial/TestSerial_ViewAPI_c.cpp b/lib/kokkos/core/unit_test/serial/TestSerial_ViewAPI_c.cpp
index fdf7f53872..f4420ae773 100644
--- a/lib/kokkos/core/unit_test/serial/TestSerial_ViewAPI_c.cpp
+++ b/lib/kokkos/core/unit_test/serial/TestSerial_ViewAPI_c.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
diff --git a/lib/kokkos/core/unit_test/serial/TestSerial_ViewAPI_d.cpp b/lib/kokkos/core/unit_test/serial/TestSerial_ViewAPI_d.cpp
index 6380a28db5..ede25aa6e5 100644
--- a/lib/kokkos/core/unit_test/serial/TestSerial_ViewAPI_d.cpp
+++ b/lib/kokkos/core/unit_test/serial/TestSerial_ViewAPI_d.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
diff --git a/lib/kokkos/core/unit_test/serial/TestSerial_ViewAPI_e.cpp b/lib/kokkos/core/unit_test/serial/TestSerial_ViewAPI_e.cpp
index 5082729789..eca9c3f9f2 100644
--- a/lib/kokkos/core/unit_test/serial/TestSerial_ViewAPI_e.cpp
+++ b/lib/kokkos/core/unit_test/serial/TestSerial_ViewAPI_e.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -44,4 +45,3 @@
 #include <serial/TestSerial_Category.hpp>
 #include <TestViewAPI_e.hpp>
 #include <TestViewCopy.hpp>
-
diff --git a/lib/kokkos/core/unit_test/serial/TestSerial_ViewLayoutStrideAssignment.cpp b/lib/kokkos/core/unit_test/serial/TestSerial_ViewLayoutStrideAssignment.cpp
index 64c5b642d8..37c3126c50 100644
--- a/lib/kokkos/core/unit_test/serial/TestSerial_ViewLayoutStrideAssignment.cpp
+++ b/lib/kokkos/core/unit_test/serial/TestSerial_ViewLayoutStrideAssignment.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -43,4 +44,3 @@
 
 #include <serial/TestSerial_Category.hpp>
 #include <TestViewLayoutStrideAssignment.hpp>
-
diff --git a/lib/kokkos/core/unit_test/serial/TestSerial_ViewMapping_a.cpp b/lib/kokkos/core/unit_test/serial/TestSerial_ViewMapping_a.cpp
index f9f89d714c..431485a315 100644
--- a/lib/kokkos/core/unit_test/serial/TestSerial_ViewMapping_a.cpp
+++ b/lib/kokkos/core/unit_test/serial/TestSerial_ViewMapping_a.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -43,4 +44,3 @@
 
 #include <serial/TestSerial_Category.hpp>
 #include <TestViewMapping_a.hpp>
-
diff --git a/lib/kokkos/core/unit_test/serial/TestSerial_ViewMapping_b.cpp b/lib/kokkos/core/unit_test/serial/TestSerial_ViewMapping_b.cpp
index 69024441ac..1e5ce94322 100644
--- a/lib/kokkos/core/unit_test/serial/TestSerial_ViewMapping_b.cpp
+++ b/lib/kokkos/core/unit_test/serial/TestSerial_ViewMapping_b.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -43,4 +44,3 @@
 
 #include <serial/TestSerial_Category.hpp>
 #include <TestViewMapping_b.hpp>
-
diff --git a/lib/kokkos/core/unit_test/serial/TestSerial_ViewMapping_subview.cpp b/lib/kokkos/core/unit_test/serial/TestSerial_ViewMapping_subview.cpp
index d7fb364291..9178b054c5 100644
--- a/lib/kokkos/core/unit_test/serial/TestSerial_ViewMapping_subview.cpp
+++ b/lib/kokkos/core/unit_test/serial/TestSerial_ViewMapping_subview.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -43,4 +44,3 @@
 
 #include <serial/TestSerial_Category.hpp>
 #include <TestViewMapping_subview.hpp>
-
diff --git a/lib/kokkos/core/unit_test/serial/TestSerial_ViewOfClass.cpp b/lib/kokkos/core/unit_test/serial/TestSerial_ViewOfClass.cpp
index d3e10238df..a3813eaffb 100644
--- a/lib/kokkos/core/unit_test/serial/TestSerial_ViewOfClass.cpp
+++ b/lib/kokkos/core/unit_test/serial/TestSerial_ViewOfClass.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -43,4 +44,3 @@
 
 #include <serial/TestSerial_Category.hpp>
 #include <TestViewOfClass.hpp>
-
diff --git a/lib/kokkos/core/unit_test/serial/TestSerial_ViewResize.cpp b/lib/kokkos/core/unit_test/serial/TestSerial_ViewResize.cpp
new file mode 100644
index 0000000000..46f1deb1e1
--- /dev/null
+++ b/lib/kokkos/core/unit_test/serial/TestSerial_ViewResize.cpp
@@ -0,0 +1,46 @@
+/*
+//@HEADER
+// ************************************************************************
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
+// the U.S. Government retains certain rights in this software.
+//
+// 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 Corporation nor the names of the
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 NTESS OR THE
+// 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.
+//
+// Questions? Contact Christian R. Trott (crtrott@sandia.gov)
+//
+// ************************************************************************
+//@HEADER
+*/
+
+#include <serial/TestSerial_Category.hpp>
+#include <TestViewResize.hpp>
diff --git a/lib/kokkos/core/unit_test/serial/TestSerial_View_64bit.cpp b/lib/kokkos/core/unit_test/serial/TestSerial_View_64bit.cpp
index ac2edde25f..98e836db02 100644
--- a/lib/kokkos/core/unit_test/serial/TestSerial_View_64bit.cpp
+++ b/lib/kokkos/core/unit_test/serial/TestSerial_View_64bit.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
diff --git a/lib/kokkos/core/unit_test/serial/TestSerial_WorkGraph.cpp b/lib/kokkos/core/unit_test/serial/TestSerial_WorkGraph.cpp
index 80925cb9df..1192e1fa92 100644
--- a/lib/kokkos/core/unit_test/serial/TestSerial_WorkGraph.cpp
+++ b/lib/kokkos/core/unit_test/serial/TestSerial_WorkGraph.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -41,5 +42,5 @@
 //@HEADER
 */
 
-#include<serial/TestSerial_Category.hpp>
-#include<TestWorkGraph.hpp>
+#include <serial/TestSerial_Category.hpp>
+#include <TestWorkGraph.hpp>
diff --git a/lib/kokkos/core/unit_test/standalone/Makefile b/lib/kokkos/core/unit_test/standalone/Makefile
index f8a75616c5..c910cc5fd1 100644
--- a/lib/kokkos/core/unit_test/standalone/Makefile
+++ b/lib/kokkos/core/unit_test/standalone/Makefile
@@ -1,4 +1,4 @@
-KOKKOS_DEVICES=Cuda
+KOKKOS_DEVICES=OpenMP
 KOKKOS_CUDA_OPTIONS=enable_lambda
 KOKKOS_ARCH = "SNB,Kepler35"
 
@@ -9,6 +9,7 @@ ifndef KOKKOS_PATH
 endif
 
 SRC = $(wildcard $(MAKEFILE_PATH)*.cpp)
+SRC += $(MAKEFILE_PATH)/../TestStackTrace.cpp
 HEADERS = $(wildcard $(MAKEFILE_PATH)*.hpp)
 HEADERS = $(wildcard $(MAKEFILE_PATH)/../*.hpp)
 
@@ -25,13 +26,13 @@ CXX = g++
 EXE = test.host
 endif
 
-CXXFLAGS ?= -O3 -g
+CXXFLAGS ?= -O0 -g -rdynamic
 override CXXFLAGS += -I$(MAKEFILE_PATH) -I$(KOKKOS_PATH)/core/unit_test -I$(KOKKOS_PATH)/tpls/gtest -DTESTFILE=$(TESTFILE)
 #SRC += $(KOKKOS_PATH)/tpls/gtest/gtest/gtest-all.cc
 
 DEPFLAGS = -M
 LINK = ${CXX}
-LINKFLAGS =
+LINKFLAGS = -rdynamic
 
 OBJ = $(notdir $(SRC:.cpp=.o))
 LIB =
diff --git a/lib/kokkos/core/unit_test/standalone/UnitTestMainInit.cpp b/lib/kokkos/core/unit_test/standalone/UnitTestMainInit.cpp
index 6de5fc7736..8f8bac7b23 100644
--- a/lib/kokkos/core/unit_test/standalone/UnitTestMainInit.cpp
+++ b/lib/kokkos/core/unit_test/standalone/UnitTestMainInit.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -65,14 +66,14 @@
 #ifdef KOKKOS_ENABLE_SERIAL
 #include <serial/TestSerial_Category.hpp>
 #endif
-#endif 
-#include <TestReduceDeviceView.hpp>
+#endif
+#include <TestStackTrace.hpp>
 
-int main( int argc, char *argv[] ) {
-  Kokkos::initialize(argc,argv);
-  ::testing::InitGoogleTest( &argc, argv );
+int main(int argc, char *argv[]) {
+  Kokkos::initialize(argc, argv);
+  ::testing::InitGoogleTest(&argc, argv);
 
-  int result =  RUN_ALL_TESTS();
+  int result = RUN_ALL_TESTS();
   Kokkos::finalize();
   return result;
 }
diff --git a/lib/kokkos/core/unit_test/threads/TestThreads_AtomicOperations_complexdouble.cpp b/lib/kokkos/core/unit_test/threads/TestThreads_AtomicOperations_complexdouble.cpp
index 5201cbdbdb..7fe140573e 100644
--- a/lib/kokkos/core/unit_test/threads/TestThreads_AtomicOperations_complexdouble.cpp
+++ b/lib/kokkos/core/unit_test/threads/TestThreads_AtomicOperations_complexdouble.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -41,6 +42,5 @@
 //@HEADER
 */
 
-#include<threads/TestThreads_Category.hpp>
-#include<TestAtomicOperations_complexdouble.hpp>
-
+#include <threads/TestThreads_Category.hpp>
+#include <TestAtomicOperations_complexdouble.hpp>
diff --git a/lib/kokkos/core/unit_test/threads/TestThreads_AtomicOperations_complexfloat.cpp b/lib/kokkos/core/unit_test/threads/TestThreads_AtomicOperations_complexfloat.cpp
index bede254243..7cac4fa6b8 100644
--- a/lib/kokkos/core/unit_test/threads/TestThreads_AtomicOperations_complexfloat.cpp
+++ b/lib/kokkos/core/unit_test/threads/TestThreads_AtomicOperations_complexfloat.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -41,6 +42,5 @@
 //@HEADER
 */
 
-#include<threads/TestThreads_Category.hpp>
-#include<TestAtomicOperations_complexfloat.hpp>
-
+#include <threads/TestThreads_Category.hpp>
+#include <TestAtomicOperations_complexfloat.hpp>
diff --git a/lib/kokkos/core/unit_test/threads/TestThreads_AtomicOperations_double.cpp b/lib/kokkos/core/unit_test/threads/TestThreads_AtomicOperations_double.cpp
index 14e1910013..c6136e9d27 100644
--- a/lib/kokkos/core/unit_test/threads/TestThreads_AtomicOperations_double.cpp
+++ b/lib/kokkos/core/unit_test/threads/TestThreads_AtomicOperations_double.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -41,6 +42,5 @@
 //@HEADER
 */
 
-#include<threads/TestThreads_Category.hpp>
-#include<TestAtomicOperations_double.hpp>
-
+#include <threads/TestThreads_Category.hpp>
+#include <TestAtomicOperations_double.hpp>
diff --git a/lib/kokkos/core/unit_test/threads/TestThreads_AtomicOperations_float.cpp b/lib/kokkos/core/unit_test/threads/TestThreads_AtomicOperations_float.cpp
index f42040e176..e3bca7e3c6 100644
--- a/lib/kokkos/core/unit_test/threads/TestThreads_AtomicOperations_float.cpp
+++ b/lib/kokkos/core/unit_test/threads/TestThreads_AtomicOperations_float.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -41,6 +42,5 @@
 //@HEADER
 */
 
-#include<threads/TestThreads_Category.hpp>
-#include<TestAtomicOperations_float.hpp>
-
+#include <threads/TestThreads_Category.hpp>
+#include <TestAtomicOperations_float.hpp>
diff --git a/lib/kokkos/core/unit_test/threads/TestThreads_AtomicOperations_int.cpp b/lib/kokkos/core/unit_test/threads/TestThreads_AtomicOperations_int.cpp
index 0ee8adddec..0acc4c5435 100644
--- a/lib/kokkos/core/unit_test/threads/TestThreads_AtomicOperations_int.cpp
+++ b/lib/kokkos/core/unit_test/threads/TestThreads_AtomicOperations_int.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -41,6 +42,5 @@
 //@HEADER
 */
 
-#include<threads/TestThreads_Category.hpp>
-#include<TestAtomicOperations_int.hpp>
-
+#include <threads/TestThreads_Category.hpp>
+#include <TestAtomicOperations_int.hpp>
diff --git a/lib/kokkos/core/unit_test/threads/TestThreads_AtomicOperations_longint.cpp b/lib/kokkos/core/unit_test/threads/TestThreads_AtomicOperations_longint.cpp
index 4fb86162d7..ffd2e17d0c 100644
--- a/lib/kokkos/core/unit_test/threads/TestThreads_AtomicOperations_longint.cpp
+++ b/lib/kokkos/core/unit_test/threads/TestThreads_AtomicOperations_longint.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -41,6 +42,5 @@
 //@HEADER
 */
 
-#include<threads/TestThreads_Category.hpp>
-#include<TestAtomicOperations_longint.hpp>
-
+#include <threads/TestThreads_Category.hpp>
+#include <TestAtomicOperations_longint.hpp>
diff --git a/lib/kokkos/core/unit_test/threads/TestThreads_AtomicOperations_longlongint.cpp b/lib/kokkos/core/unit_test/threads/TestThreads_AtomicOperations_longlongint.cpp
index b4633210cd..8c73b8fc22 100644
--- a/lib/kokkos/core/unit_test/threads/TestThreads_AtomicOperations_longlongint.cpp
+++ b/lib/kokkos/core/unit_test/threads/TestThreads_AtomicOperations_longlongint.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -41,6 +42,5 @@
 //@HEADER
 */
 
-#include<threads/TestThreads_Category.hpp>
-#include<TestAtomicOperations_longlongint.hpp>
-
+#include <threads/TestThreads_Category.hpp>
+#include <TestAtomicOperations_longlongint.hpp>
diff --git a/lib/kokkos/core/unit_test/threads/TestThreads_AtomicOperations_unsignedint.cpp b/lib/kokkos/core/unit_test/threads/TestThreads_AtomicOperations_unsignedint.cpp
index 9261e43f30..5b304f138f 100644
--- a/lib/kokkos/core/unit_test/threads/TestThreads_AtomicOperations_unsignedint.cpp
+++ b/lib/kokkos/core/unit_test/threads/TestThreads_AtomicOperations_unsignedint.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -41,6 +42,5 @@
 //@HEADER
 */
 
-#include<threads/TestThreads_Category.hpp>
-#include<TestAtomicOperations_unsignedint.hpp>
-
+#include <threads/TestThreads_Category.hpp>
+#include <TestAtomicOperations_unsignedint.hpp>
diff --git a/lib/kokkos/core/unit_test/threads/TestThreads_AtomicOperations_unsignedlongint.cpp b/lib/kokkos/core/unit_test/threads/TestThreads_AtomicOperations_unsignedlongint.cpp
index 1cd6da3d9e..06f99f54e5 100644
--- a/lib/kokkos/core/unit_test/threads/TestThreads_AtomicOperations_unsignedlongint.cpp
+++ b/lib/kokkos/core/unit_test/threads/TestThreads_AtomicOperations_unsignedlongint.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -41,6 +42,5 @@
 //@HEADER
 */
 
-#include<threads/TestThreads_Category.hpp>
-#include<TestAtomicOperations_unsignedlongint.hpp>
-
+#include <threads/TestThreads_Category.hpp>
+#include <TestAtomicOperations_unsignedlongint.hpp>
diff --git a/lib/kokkos/core/unit_test/threads/TestThreads_AtomicViews.cpp b/lib/kokkos/core/unit_test/threads/TestThreads_AtomicViews.cpp
index d71baf8fc2..1625434483 100644
--- a/lib/kokkos/core/unit_test/threads/TestThreads_AtomicViews.cpp
+++ b/lib/kokkos/core/unit_test/threads/TestThreads_AtomicViews.cpp
@@ -3,10 +3,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -42,6 +43,5 @@
 //@HEADER
 */
 
-#include<threads/TestThreads_Category.hpp>
-#include<TestAtomicViews.hpp>
-
+#include <threads/TestThreads_Category.hpp>
+#include <TestAtomicViews.hpp>
diff --git a/lib/kokkos/core/unit_test/threads/TestThreads_Atomics.cpp b/lib/kokkos/core/unit_test/threads/TestThreads_Atomics.cpp
index 350a8d90fd..84b3a1782c 100644
--- a/lib/kokkos/core/unit_test/threads/TestThreads_Atomics.cpp
+++ b/lib/kokkos/core/unit_test/threads/TestThreads_Atomics.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -43,4 +44,3 @@
 
 #include <threads/TestThreads_Category.hpp>
 #include <TestAtomic.hpp>
-
diff --git a/lib/kokkos/core/unit_test/threads/TestThreads_Category.hpp b/lib/kokkos/core/unit_test/threads/TestThreads_Category.hpp
index c4d0ed6da2..800772b42d 100644
--- a/lib/kokkos/core/unit_test/threads/TestThreads_Category.hpp
+++ b/lib/kokkos/core/unit_test/threads/TestThreads_Category.hpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -46,20 +47,8 @@
 
 #include <gtest/gtest.h>
 
-namespace Test {
-
-class threads : public ::testing::Test {
-protected:
-  static void SetUpTestCase() {
-  }
-
-  static void TearDownTestCase() {
-  }
-};
-
-} // namespace Test
-
 #define TEST_CATEGORY threads
+#define TEST_CATEGORY_DEATH threads_DeathTest
 #define TEST_EXECSPACE Kokkos::Threads
 
 #endif
diff --git a/lib/kokkos/core/unit_test/threads/TestThreads_Complex.cpp b/lib/kokkos/core/unit_test/threads/TestThreads_Complex.cpp
index a19aaea9ea..1322a4170c 100644
--- a/lib/kokkos/core/unit_test/threads/TestThreads_Complex.cpp
+++ b/lib/kokkos/core/unit_test/threads/TestThreads_Complex.cpp
@@ -3,10 +3,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -42,6 +43,5 @@
 //@HEADER
 */
 
-#include<threads/TestThreads_Category.hpp>
-#include<TestComplex.hpp>
-
+#include <threads/TestThreads_Category.hpp>
+#include <TestComplex.hpp>
diff --git a/lib/kokkos/core/unit_test/threads/TestThreads_Crs.cpp b/lib/kokkos/core/unit_test/threads/TestThreads_Crs.cpp
index f5a1de15fa..61468d8744 100644
--- a/lib/kokkos/core/unit_test/threads/TestThreads_Crs.cpp
+++ b/lib/kokkos/core/unit_test/threads/TestThreads_Crs.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -41,5 +42,5 @@
 //@HEADER
 */
 
-#include<threads/TestThreads_Category.hpp>
-#include<TestCrs.hpp>
+#include <threads/TestThreads_Category.hpp>
+#include <TestCrs.hpp>
diff --git a/lib/kokkos/core/unit_test/threads/TestThreads_DeepCopyAlignment.cpp b/lib/kokkos/core/unit_test/threads/TestThreads_DeepCopyAlignment.cpp
index e0f76af4e9..8013087d6d 100644
--- a/lib/kokkos/core/unit_test/threads/TestThreads_DeepCopyAlignment.cpp
+++ b/lib/kokkos/core/unit_test/threads/TestThreads_DeepCopyAlignment.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
diff --git a/lib/kokkos/core/unit_test/threads/TestThreads_FunctorAnalysis.cpp b/lib/kokkos/core/unit_test/threads/TestThreads_FunctorAnalysis.cpp
new file mode 100644
index 0000000000..5dd1cdde16
--- /dev/null
+++ b/lib/kokkos/core/unit_test/threads/TestThreads_FunctorAnalysis.cpp
@@ -0,0 +1,47 @@
+
+/*
+//@HEADER
+// ************************************************************************
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
+// the U.S. Government retains certain rights in this software.
+//
+// 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 Corporation nor the names of the
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 NTESS OR THE
+// 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.
+//
+// Questions? Contact Christian R. Trott (crtrott@sandia.gov)
+//
+// ************************************************************************
+//@HEADER
+*/
+
+#include <threads/TestThreads_Category.hpp>
+#include <TestFunctorAnalysis.hpp>
diff --git a/lib/kokkos/core/unit_test/threads/TestThreads_Init.cpp b/lib/kokkos/core/unit_test/threads/TestThreads_Init.cpp
index 39ded8fae0..8a33009293 100644
--- a/lib/kokkos/core/unit_test/threads/TestThreads_Init.cpp
+++ b/lib/kokkos/core/unit_test/threads/TestThreads_Init.cpp
@@ -3,10 +3,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -42,9 +43,7 @@
 //@HEADER
 */
 
-#include<threads/TestThreads_Category.hpp>
-#include<TestInit.hpp>
-#include<TestCompilerMacros.hpp>
-#include<TestPolicyConstruction.hpp>
-
-
+#include <threads/TestThreads_Category.hpp>
+#include <TestInit.hpp>
+#include <TestCompilerMacros.hpp>
+#include <TestPolicyConstruction.hpp>
diff --git a/lib/kokkos/core/unit_test/threads/TestThreads_LocalDeepCopy.cpp b/lib/kokkos/core/unit_test/threads/TestThreads_LocalDeepCopy.cpp
index cd0aad7f2e..32735603a1 100644
--- a/lib/kokkos/core/unit_test/threads/TestThreads_LocalDeepCopy.cpp
+++ b/lib/kokkos/core/unit_test/threads/TestThreads_LocalDeepCopy.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -43,4 +44,3 @@
 
 #include <threads/TestThreads_Category.hpp>
 #include <TestLocalDeepCopy.hpp>
-
diff --git a/lib/kokkos/core/unit_test/threads/TestThreads_MDRange_a.cpp b/lib/kokkos/core/unit_test/threads/TestThreads_MDRange_a.cpp
index 1ed47faad8..3d0ee34306 100644
--- a/lib/kokkos/core/unit_test/threads/TestThreads_MDRange_a.cpp
+++ b/lib/kokkos/core/unit_test/threads/TestThreads_MDRange_a.cpp
@@ -3,10 +3,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -42,6 +43,5 @@
 //@HEADER
 */
 
-#include<threads/TestThreads_Category.hpp>
-#include<TestMDRange_a.hpp>
-
+#include <threads/TestThreads_Category.hpp>
+#include <TestMDRange_a.hpp>
diff --git a/lib/kokkos/core/unit_test/threads/TestThreads_MDRange_b.cpp b/lib/kokkos/core/unit_test/threads/TestThreads_MDRange_b.cpp
index 3dccfbf432..0fa4fcf628 100644
--- a/lib/kokkos/core/unit_test/threads/TestThreads_MDRange_b.cpp
+++ b/lib/kokkos/core/unit_test/threads/TestThreads_MDRange_b.cpp
@@ -3,10 +3,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -42,6 +43,5 @@
 //@HEADER
 */
 
-#include<threads/TestThreads_Category.hpp>
-#include<TestMDRange_b.hpp>
-
+#include <threads/TestThreads_Category.hpp>
+#include <TestMDRange_b.hpp>
diff --git a/lib/kokkos/core/unit_test/threads/TestThreads_MDRange_c.cpp b/lib/kokkos/core/unit_test/threads/TestThreads_MDRange_c.cpp
index 6b709a893e..0b21cda75c 100644
--- a/lib/kokkos/core/unit_test/threads/TestThreads_MDRange_c.cpp
+++ b/lib/kokkos/core/unit_test/threads/TestThreads_MDRange_c.cpp
@@ -3,10 +3,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -42,6 +43,5 @@
 //@HEADER
 */
 
-#include<threads/TestThreads_Category.hpp>
-#include<TestMDRange_c.hpp>
-
+#include <threads/TestThreads_Category.hpp>
+#include <TestMDRange_c.hpp>
diff --git a/lib/kokkos/core/unit_test/threads/TestThreads_MDRange_d.cpp b/lib/kokkos/core/unit_test/threads/TestThreads_MDRange_d.cpp
index 9cdfec1556..04bc98b040 100644
--- a/lib/kokkos/core/unit_test/threads/TestThreads_MDRange_d.cpp
+++ b/lib/kokkos/core/unit_test/threads/TestThreads_MDRange_d.cpp
@@ -3,10 +3,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -42,6 +43,5 @@
 //@HEADER
 */
 
-#include<threads/TestThreads_Category.hpp>
-#include<TestMDRange_d.hpp>
-
+#include <threads/TestThreads_Category.hpp>
+#include <TestMDRange_d.hpp>
diff --git a/lib/kokkos/core/unit_test/threads/TestThreads_MDRange_e.cpp b/lib/kokkos/core/unit_test/threads/TestThreads_MDRange_e.cpp
index 1c4cbe7eb9..5267ae847a 100644
--- a/lib/kokkos/core/unit_test/threads/TestThreads_MDRange_e.cpp
+++ b/lib/kokkos/core/unit_test/threads/TestThreads_MDRange_e.cpp
@@ -3,10 +3,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -42,6 +43,5 @@
 //@HEADER
 */
 
-#include<threads/TestThreads_Category.hpp>
-#include<TestMDRange_e.hpp>
-
+#include <threads/TestThreads_Category.hpp>
+#include <TestMDRange_e.hpp>
diff --git a/lib/kokkos/core/unit_test/threads/TestThreads_Other.cpp b/lib/kokkos/core/unit_test/threads/TestThreads_Other.cpp
index 13786aa4a6..01a07896b3 100644
--- a/lib/kokkos/core/unit_test/threads/TestThreads_Other.cpp
+++ b/lib/kokkos/core/unit_test/threads/TestThreads_Other.cpp
@@ -3,10 +3,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -42,12 +43,12 @@
 //@HEADER
 */
 
-#include<threads/TestThreads_Category.hpp>
-#include<TestTemplateMetaFunctions.hpp>
-#include<TestAggregate.hpp>
-#include<TestMemoryPool.hpp>
-#include<TestCXX11.hpp>
-#include<TestTile.hpp>
+#include <threads/TestThreads_Category.hpp>
+#include <TestTemplateMetaFunctions.hpp>
+#include <TestAggregate.hpp>
+#include <TestMemoryPool.hpp>
+#include <TestCXX11.hpp>
+#include <TestTile.hpp>
 
-#include<TestViewCtorPropEmbeddedDim.hpp>
-#include<TestViewLayoutTiled.hpp>
+#include <TestViewCtorPropEmbeddedDim.hpp>
+#include <TestViewLayoutTiled.hpp>
diff --git a/lib/kokkos/core/unit_test/threads/TestThreads_RangePolicy.cpp b/lib/kokkos/core/unit_test/threads/TestThreads_RangePolicy.cpp
index 7404cae786..785469346a 100644
--- a/lib/kokkos/core/unit_test/threads/TestThreads_RangePolicy.cpp
+++ b/lib/kokkos/core/unit_test/threads/TestThreads_RangePolicy.cpp
@@ -3,10 +3,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -42,6 +43,5 @@
 //@HEADER
 */
 
-#include<threads/TestThreads_Category.hpp>
-#include<TestRange.hpp>
-
+#include <threads/TestThreads_Category.hpp>
+#include <TestRange.hpp>
diff --git a/lib/kokkos/core/unit_test/threads/TestThreads_Reducers_a.cpp b/lib/kokkos/core/unit_test/threads/TestThreads_Reducers_a.cpp
index 6dcf1c8adf..8b79d74e8c 100644
--- a/lib/kokkos/core/unit_test/threads/TestThreads_Reducers_a.cpp
+++ b/lib/kokkos/core/unit_test/threads/TestThreads_Reducers_a.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
diff --git a/lib/kokkos/core/unit_test/threads/TestThreads_Reducers_b.cpp b/lib/kokkos/core/unit_test/threads/TestThreads_Reducers_b.cpp
index 1893c3d5fb..b556c43948 100644
--- a/lib/kokkos/core/unit_test/threads/TestThreads_Reducers_b.cpp
+++ b/lib/kokkos/core/unit_test/threads/TestThreads_Reducers_b.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
diff --git a/lib/kokkos/core/unit_test/threads/TestThreads_Reducers_c.cpp b/lib/kokkos/core/unit_test/threads/TestThreads_Reducers_c.cpp
index 799de27068..e2c23030a2 100644
--- a/lib/kokkos/core/unit_test/threads/TestThreads_Reducers_c.cpp
+++ b/lib/kokkos/core/unit_test/threads/TestThreads_Reducers_c.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
diff --git a/lib/kokkos/core/unit_test/threads/TestThreads_Reducers_d.cpp b/lib/kokkos/core/unit_test/threads/TestThreads_Reducers_d.cpp
index 696ae7221f..aa37b6eb56 100644
--- a/lib/kokkos/core/unit_test/threads/TestThreads_Reducers_d.cpp
+++ b/lib/kokkos/core/unit_test/threads/TestThreads_Reducers_d.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
diff --git a/lib/kokkos/core/unit_test/threads/TestThreads_Reductions.cpp b/lib/kokkos/core/unit_test/threads/TestThreads_Reductions.cpp
index 33788b9ca5..9384590dcb 100644
--- a/lib/kokkos/core/unit_test/threads/TestThreads_Reductions.cpp
+++ b/lib/kokkos/core/unit_test/threads/TestThreads_Reductions.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
diff --git a/lib/kokkos/core/unit_test/threads/TestThreads_Reductions_DeviceView.cpp b/lib/kokkos/core/unit_test/threads/TestThreads_Reductions_DeviceView.cpp
index 28f4b7d579..e5ebb6e8a2 100644
--- a/lib/kokkos/core/unit_test/threads/TestThreads_Reductions_DeviceView.cpp
+++ b/lib/kokkos/core/unit_test/threads/TestThreads_Reductions_DeviceView.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
diff --git a/lib/kokkos/core/unit_test/threads/TestThreads_Scan.cpp b/lib/kokkos/core/unit_test/threads/TestThreads_Scan.cpp
index 9d9583e965..12648bf305 100644
--- a/lib/kokkos/core/unit_test/threads/TestThreads_Scan.cpp
+++ b/lib/kokkos/core/unit_test/threads/TestThreads_Scan.cpp
@@ -3,10 +3,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -42,6 +43,5 @@
 //@HEADER
 */
 
-#include<threads/TestThreads_Category.hpp>
-#include<TestScan.hpp>
-
+#include <threads/TestThreads_Category.hpp>
+#include <TestScan.hpp>
diff --git a/lib/kokkos/core/unit_test/threads/TestThreads_SharedAlloc.cpp b/lib/kokkos/core/unit_test/threads/TestThreads_SharedAlloc.cpp
index a028728ecb..837334c999 100644
--- a/lib/kokkos/core/unit_test/threads/TestThreads_SharedAlloc.cpp
+++ b/lib/kokkos/core/unit_test/threads/TestThreads_SharedAlloc.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -46,10 +47,8 @@
 
 namespace Test {
 
-
-TEST_F( TEST_CATEGORY, impl_shared_alloc )
-{
-  test_shared_alloc< Kokkos::HostSpace, TEST_EXECSPACE >();
+TEST(TEST_CATEGORY, impl_shared_alloc) {
+  test_shared_alloc<Kokkos::HostSpace, TEST_EXECSPACE>();
 }
 
-} // namespace Test
+}  // namespace Test
diff --git a/lib/kokkos/core/unit_test/threads/TestThreads_SubView_a.cpp b/lib/kokkos/core/unit_test/threads/TestThreads_SubView_a.cpp
index 983a6ddb66..7298d4cde3 100644
--- a/lib/kokkos/core/unit_test/threads/TestThreads_SubView_a.cpp
+++ b/lib/kokkos/core/unit_test/threads/TestThreads_SubView_a.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -46,66 +47,56 @@
 
 namespace Test {
 
-TEST_F( TEST_CATEGORY, view_subview_auto_1d_left )
-{
-  TestViewSubview::test_auto_1d< Kokkos::LayoutLeft, TEST_EXECSPACE >();
+TEST(TEST_CATEGORY, view_subview_auto_1d_left) {
+  TestViewSubview::test_auto_1d<Kokkos::LayoutLeft, TEST_EXECSPACE>();
 }
 
-TEST_F( TEST_CATEGORY, view_subview_auto_1d_right )
-{
-  TestViewSubview::test_auto_1d< Kokkos::LayoutRight, TEST_EXECSPACE >();
+TEST(TEST_CATEGORY, view_subview_auto_1d_right) {
+  TestViewSubview::test_auto_1d<Kokkos::LayoutRight, TEST_EXECSPACE>();
 }
 
-TEST_F( TEST_CATEGORY, view_subview_auto_1d_stride )
-{
-  TestViewSubview::test_auto_1d< Kokkos::LayoutStride, TEST_EXECSPACE >();
+TEST(TEST_CATEGORY, view_subview_auto_1d_stride) {
+  TestViewSubview::test_auto_1d<Kokkos::LayoutStride, TEST_EXECSPACE>();
 }
 
-TEST_F( TEST_CATEGORY, view_subview_assign_strided )
-{
-  TestViewSubview::test_1d_strided_assignment< TEST_EXECSPACE >();
+TEST(TEST_CATEGORY, view_subview_assign_strided) {
+  TestViewSubview::test_1d_strided_assignment<TEST_EXECSPACE>();
 }
 
-TEST_F( TEST_CATEGORY, view_subview_left_0 )
-{
-  TestViewSubview::test_left_0< TEST_EXECSPACE >();
+TEST(TEST_CATEGORY, view_subview_left_0) {
+  TestViewSubview::test_left_0<TEST_EXECSPACE>();
 }
 
-TEST_F( TEST_CATEGORY, view_subview_left_1 )
-{
-  TestViewSubview::test_left_1< TEST_EXECSPACE >();
+TEST(TEST_CATEGORY, view_subview_left_1) {
+  TestViewSubview::test_left_1<TEST_EXECSPACE>();
 }
 
-TEST_F( TEST_CATEGORY, view_subview_left_2 )
-{
-  TestViewSubview::test_left_2< TEST_EXECSPACE >();
+TEST(TEST_CATEGORY, view_subview_left_2) {
+  TestViewSubview::test_left_2<TEST_EXECSPACE>();
 }
 
-TEST_F( TEST_CATEGORY, view_subview_left_3 )
-{
-  TestViewSubview::test_left_3< TEST_EXECSPACE >();
+TEST(TEST_CATEGORY, view_subview_left_3) {
+  TestViewSubview::test_left_3<TEST_EXECSPACE>();
 }
 
-TEST_F( TEST_CATEGORY, view_subview_right_0 )
-{
-  TestViewSubview::test_right_0< TEST_EXECSPACE >();
+TEST(TEST_CATEGORY, view_subview_right_0) {
+  TestViewSubview::test_right_0<TEST_EXECSPACE>();
 }
 
-TEST_F( TEST_CATEGORY, view_subview_right_1 )
-{
-  TestViewSubview::test_right_1< TEST_EXECSPACE >();
+TEST(TEST_CATEGORY, view_subview_right_1) {
+  TestViewSubview::test_right_1<TEST_EXECSPACE>();
 }
 
-TEST_F( TEST_CATEGORY, view_subview_right_3 )
-{
-  TestViewSubview::test_right_3< TEST_EXECSPACE >();
+TEST(TEST_CATEGORY, view_subview_right_3) {
+  TestViewSubview::test_right_3<TEST_EXECSPACE>();
 }
 
-TEST_F(TEST_CATEGORY, view_static_tests)
-{
-  TestViewSubview::TestSubviewStaticSizes<TEST_EXECSPACE, Kokkos::LayoutLeft>()();
-  TestViewSubview::TestSubviewStaticSizes<TEST_EXECSPACE, Kokkos::LayoutRight>()();
+TEST(TEST_CATEGORY, view_static_tests) {
+  TestViewSubview::TestSubviewStaticSizes<TEST_EXECSPACE,
+                                          Kokkos::LayoutLeft>()();
+  TestViewSubview::TestSubviewStaticSizes<TEST_EXECSPACE,
+                                          Kokkos::LayoutRight>()();
   TestViewSubview::TestExtentsStaticTests<TEST_EXECSPACE>();
 }
 
-} // namespace Test
+}  // namespace Test
diff --git a/lib/kokkos/core/unit_test/threads/TestThreads_SubView_b.cpp b/lib/kokkos/core/unit_test/threads/TestThreads_SubView_b.cpp
index ab1aa3df4f..a6f22a0828 100644
--- a/lib/kokkos/core/unit_test/threads/TestThreads_SubView_b.cpp
+++ b/lib/kokkos/core/unit_test/threads/TestThreads_SubView_b.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -46,18 +47,20 @@
 
 namespace Test {
 
-TEST_F( TEST_CATEGORY, view_subview_layoutleft_to_layoutleft )
-{
-  TestViewSubview::test_layoutleft_to_layoutleft< TEST_EXECSPACE >();
-  TestViewSubview::test_layoutleft_to_layoutleft< TEST_EXECSPACE, Kokkos::MemoryTraits<Kokkos::Atomic> >();
-  TestViewSubview::test_layoutleft_to_layoutleft< TEST_EXECSPACE, Kokkos::MemoryTraits<Kokkos::RandomAccess> >();
+TEST(TEST_CATEGORY, view_subview_layoutleft_to_layoutleft) {
+  TestViewSubview::test_layoutleft_to_layoutleft<TEST_EXECSPACE>();
+  TestViewSubview::test_layoutleft_to_layoutleft<
+      TEST_EXECSPACE, Kokkos::MemoryTraits<Kokkos::Atomic> >();
+  TestViewSubview::test_layoutleft_to_layoutleft<
+      TEST_EXECSPACE, Kokkos::MemoryTraits<Kokkos::RandomAccess> >();
 }
 
-TEST_F( TEST_CATEGORY, view_subview_layoutright_to_layoutright )
-{
-  TestViewSubview::test_layoutright_to_layoutright< TEST_EXECSPACE >();
-  TestViewSubview::test_layoutright_to_layoutright< TEST_EXECSPACE, Kokkos::MemoryTraits<Kokkos::Atomic> >();
-  TestViewSubview::test_layoutright_to_layoutright< TEST_EXECSPACE, Kokkos::MemoryTraits<Kokkos::RandomAccess> >();
+TEST(TEST_CATEGORY, view_subview_layoutright_to_layoutright) {
+  TestViewSubview::test_layoutright_to_layoutright<TEST_EXECSPACE>();
+  TestViewSubview::test_layoutright_to_layoutright<
+      TEST_EXECSPACE, Kokkos::MemoryTraits<Kokkos::Atomic> >();
+  TestViewSubview::test_layoutright_to_layoutright<
+      TEST_EXECSPACE, Kokkos::MemoryTraits<Kokkos::RandomAccess> >();
 }
 
-} // namespace Test
+}  // namespace Test
diff --git a/lib/kokkos/core/unit_test/threads/TestThreads_SubView_c01.cpp b/lib/kokkos/core/unit_test/threads/TestThreads_SubView_c01.cpp
index 3000d4c717..a568569b45 100644
--- a/lib/kokkos/core/unit_test/threads/TestThreads_SubView_c01.cpp
+++ b/lib/kokkos/core/unit_test/threads/TestThreads_SubView_c01.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -46,9 +47,8 @@
 
 namespace Test {
 
-TEST_F( TEST_CATEGORY, view_subview_1d_assign )
-{
-  TestViewSubview::test_1d_assign< TEST_EXECSPACE >();
+TEST(TEST_CATEGORY, view_subview_1d_assign) {
+  TestViewSubview::test_1d_assign<TEST_EXECSPACE>();
 }
 
-} // namespace Test
+}  // namespace Test
diff --git a/lib/kokkos/core/unit_test/threads/TestThreads_SubView_c02.cpp b/lib/kokkos/core/unit_test/threads/TestThreads_SubView_c02.cpp
index 84f1907576..3ea141576d 100644
--- a/lib/kokkos/core/unit_test/threads/TestThreads_SubView_c02.cpp
+++ b/lib/kokkos/core/unit_test/threads/TestThreads_SubView_c02.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -46,9 +47,9 @@
 
 namespace Test {
 
-TEST_F( TEST_CATEGORY, view_subview_1d_assign_atomic )
-{
-  TestViewSubview::test_1d_assign< TEST_EXECSPACE, Kokkos::MemoryTraits<Kokkos::Atomic> >();
+TEST(TEST_CATEGORY, view_subview_1d_assign_atomic) {
+  TestViewSubview::test_1d_assign<TEST_EXECSPACE,
+                                  Kokkos::MemoryTraits<Kokkos::Atomic> >();
 }
 
-} // namespace Test
+}  // namespace Test
diff --git a/lib/kokkos/core/unit_test/threads/TestThreads_SubView_c03.cpp b/lib/kokkos/core/unit_test/threads/TestThreads_SubView_c03.cpp
index 8076ecf1f9..eaaf11f1bc 100644
--- a/lib/kokkos/core/unit_test/threads/TestThreads_SubView_c03.cpp
+++ b/lib/kokkos/core/unit_test/threads/TestThreads_SubView_c03.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -46,9 +47,9 @@
 
 namespace Test {
 
-TEST_F( TEST_CATEGORY, view_subview_1d_assign_randomaccess )
-{
-  TestViewSubview::test_1d_assign< TEST_EXECSPACE, Kokkos::MemoryTraits<Kokkos::RandomAccess> >();
+TEST(TEST_CATEGORY, view_subview_1d_assign_randomaccess) {
+  TestViewSubview::test_1d_assign<
+      TEST_EXECSPACE, Kokkos::MemoryTraits<Kokkos::RandomAccess> >();
 }
 
-} // namespace Test
+}  // namespace Test
diff --git a/lib/kokkos/core/unit_test/threads/TestThreads_SubView_c04.cpp b/lib/kokkos/core/unit_test/threads/TestThreads_SubView_c04.cpp
index bd354fa1f2..5a5a7962c5 100644
--- a/lib/kokkos/core/unit_test/threads/TestThreads_SubView_c04.cpp
+++ b/lib/kokkos/core/unit_test/threads/TestThreads_SubView_c04.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -46,9 +47,8 @@
 
 namespace Test {
 
-TEST_F( TEST_CATEGORY, view_subview_2d_from_3d )
-{
-  TestViewSubview::test_2d_subview_3d< TEST_EXECSPACE >();
+TEST(TEST_CATEGORY, view_subview_2d_from_3d) {
+  TestViewSubview::test_2d_subview_3d<TEST_EXECSPACE>();
 }
 
-} // namespace Test
+}  // namespace Test
diff --git a/lib/kokkos/core/unit_test/threads/TestThreads_SubView_c05.cpp b/lib/kokkos/core/unit_test/threads/TestThreads_SubView_c05.cpp
index 88286df275..3ab975ebc4 100644
--- a/lib/kokkos/core/unit_test/threads/TestThreads_SubView_c05.cpp
+++ b/lib/kokkos/core/unit_test/threads/TestThreads_SubView_c05.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -46,9 +47,9 @@
 
 namespace Test {
 
-TEST_F( threads, view_subview_2d_from_3d_atomic )
-{
-  TestViewSubview::test_2d_subview_3d< TEST_EXECSPACE, Kokkos::MemoryTraits<Kokkos::Atomic> >();
+TEST(threads, view_subview_2d_from_3d_atomic) {
+  TestViewSubview::test_2d_subview_3d<TEST_EXECSPACE,
+                                      Kokkos::MemoryTraits<Kokkos::Atomic> >();
 }
 
-} // namespace Test
+}  // namespace Test
diff --git a/lib/kokkos/core/unit_test/threads/TestThreads_SubView_c06.cpp b/lib/kokkos/core/unit_test/threads/TestThreads_SubView_c06.cpp
index 12c3bbcbde..bcc9c11ad5 100644
--- a/lib/kokkos/core/unit_test/threads/TestThreads_SubView_c06.cpp
+++ b/lib/kokkos/core/unit_test/threads/TestThreads_SubView_c06.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -46,9 +47,9 @@
 
 namespace Test {
 
-TEST_F( TEST_CATEGORY, view_subview_2d_from_3d_randomaccess )
-{
-  TestViewSubview::test_2d_subview_3d< TEST_EXECSPACE, Kokkos::MemoryTraits<Kokkos::RandomAccess> >();
+TEST(TEST_CATEGORY, view_subview_2d_from_3d_randomaccess) {
+  TestViewSubview::test_2d_subview_3d<
+      TEST_EXECSPACE, Kokkos::MemoryTraits<Kokkos::RandomAccess> >();
 }
 
-} // namespace Test
+}  // namespace Test
diff --git a/lib/kokkos/core/unit_test/threads/TestThreads_SubView_c07.cpp b/lib/kokkos/core/unit_test/threads/TestThreads_SubView_c07.cpp
index 17a0804dd6..2b07bd5d69 100644
--- a/lib/kokkos/core/unit_test/threads/TestThreads_SubView_c07.cpp
+++ b/lib/kokkos/core/unit_test/threads/TestThreads_SubView_c07.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -46,9 +47,8 @@
 
 namespace Test {
 
-TEST_F( TEST_CATEGORY, view_subview_3d_from_5d_left )
-{
-  TestViewSubview::test_3d_subview_5d_left< TEST_EXECSPACE >();
+TEST(TEST_CATEGORY, view_subview_3d_from_5d_left) {
+  TestViewSubview::test_3d_subview_5d_left<TEST_EXECSPACE>();
 }
 
-} // namespace Test
+}  // namespace Test
diff --git a/lib/kokkos/core/unit_test/threads/TestThreads_SubView_c08.cpp b/lib/kokkos/core/unit_test/threads/TestThreads_SubView_c08.cpp
index 76b9dc3994..02f68015ae 100644
--- a/lib/kokkos/core/unit_test/threads/TestThreads_SubView_c08.cpp
+++ b/lib/kokkos/core/unit_test/threads/TestThreads_SubView_c08.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -46,9 +47,9 @@
 
 namespace Test {
 
-TEST_F( TEST_CATEGORY, view_subview_3d_from_5d_left_atomic )
-{
-  TestViewSubview::test_3d_subview_5d_left< TEST_EXECSPACE, Kokkos::MemoryTraits<Kokkos::Atomic> >();
+TEST(TEST_CATEGORY, view_subview_3d_from_5d_left_atomic) {
+  TestViewSubview::test_3d_subview_5d_left<
+      TEST_EXECSPACE, Kokkos::MemoryTraits<Kokkos::Atomic> >();
 }
 
-} // namespace Test
+}  // namespace Test
diff --git a/lib/kokkos/core/unit_test/threads/TestThreads_SubView_c09.cpp b/lib/kokkos/core/unit_test/threads/TestThreads_SubView_c09.cpp
index efa1f516cb..cd8fbe8bb3 100644
--- a/lib/kokkos/core/unit_test/threads/TestThreads_SubView_c09.cpp
+++ b/lib/kokkos/core/unit_test/threads/TestThreads_SubView_c09.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -46,9 +47,9 @@
 
 namespace Test {
 
-TEST_F( TEST_CATEGORY, view_subview_3d_from_5d_left_randomaccess )
-{
-  TestViewSubview::test_3d_subview_5d_left< TEST_EXECSPACE, Kokkos::MemoryTraits<Kokkos::RandomAccess> >();
+TEST(TEST_CATEGORY, view_subview_3d_from_5d_left_randomaccess) {
+  TestViewSubview::test_3d_subview_5d_left<
+      TEST_EXECSPACE, Kokkos::MemoryTraits<Kokkos::RandomAccess> >();
 }
 
-} // namespace Test
+}  // namespace Test
diff --git a/lib/kokkos/core/unit_test/threads/TestThreads_SubView_c10.cpp b/lib/kokkos/core/unit_test/threads/TestThreads_SubView_c10.cpp
index 90f56d2573..6f0995bc58 100644
--- a/lib/kokkos/core/unit_test/threads/TestThreads_SubView_c10.cpp
+++ b/lib/kokkos/core/unit_test/threads/TestThreads_SubView_c10.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -46,9 +47,8 @@
 
 namespace Test {
 
-TEST_F( TEST_CATEGORY, view_subview_3d_from_5d_right )
-{
-  TestViewSubview::test_3d_subview_5d_right< TEST_EXECSPACE >();
+TEST(TEST_CATEGORY, view_subview_3d_from_5d_right) {
+  TestViewSubview::test_3d_subview_5d_right<TEST_EXECSPACE>();
 }
 
-} // namespace Test
+}  // namespace Test
diff --git a/lib/kokkos/core/unit_test/threads/TestThreads_SubView_c11.cpp b/lib/kokkos/core/unit_test/threads/TestThreads_SubView_c11.cpp
index 35f4994ba2..7ba93d051b 100644
--- a/lib/kokkos/core/unit_test/threads/TestThreads_SubView_c11.cpp
+++ b/lib/kokkos/core/unit_test/threads/TestThreads_SubView_c11.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -46,9 +47,9 @@
 
 namespace Test {
 
-TEST_F( TEST_CATEGORY, view_subview_3d_from_5d_right_atomic )
-{
-  TestViewSubview::test_3d_subview_5d_right< TEST_EXECSPACE, Kokkos::MemoryTraits<Kokkos::Atomic> >();
+TEST(TEST_CATEGORY, view_subview_3d_from_5d_right_atomic) {
+  TestViewSubview::test_3d_subview_5d_right<
+      TEST_EXECSPACE, Kokkos::MemoryTraits<Kokkos::Atomic> >();
 }
 
-} // namespace Test
+}  // namespace Test
diff --git a/lib/kokkos/core/unit_test/threads/TestThreads_SubView_c12.cpp b/lib/kokkos/core/unit_test/threads/TestThreads_SubView_c12.cpp
index 05b5dc2cc5..91b7d67aa7 100644
--- a/lib/kokkos/core/unit_test/threads/TestThreads_SubView_c12.cpp
+++ b/lib/kokkos/core/unit_test/threads/TestThreads_SubView_c12.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -46,9 +47,9 @@
 
 namespace Test {
 
-TEST_F( TEST_CATEGORY, view_subview_3d_from_5d_right_randomaccess )
-{
-  TestViewSubview::test_3d_subview_5d_right< TEST_EXECSPACE, Kokkos::MemoryTraits<Kokkos::RandomAccess> >();
+TEST(TEST_CATEGORY, view_subview_3d_from_5d_right_randomaccess) {
+  TestViewSubview::test_3d_subview_5d_right<
+      TEST_EXECSPACE, Kokkos::MemoryTraits<Kokkos::RandomAccess> >();
 }
 
-} // namespace Test
+}  // namespace Test
diff --git a/lib/kokkos/core/unit_test/threads/TestThreads_SubView_c13.cpp b/lib/kokkos/core/unit_test/threads/TestThreads_SubView_c13.cpp
index 50cd7cecd9..4814f206d1 100644
--- a/lib/kokkos/core/unit_test/threads/TestThreads_SubView_c13.cpp
+++ b/lib/kokkos/core/unit_test/threads/TestThreads_SubView_c13.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -46,9 +47,8 @@
 
 namespace Test {
 
-TEST_F( TEST_CATEGORY, view_test_unmanaged_subview_reset )
-{
-  TestViewSubview::test_unmanaged_subview_reset< TEST_EXECSPACE >();
+TEST(TEST_CATEGORY, view_test_unmanaged_subview_reset) {
+  TestViewSubview::test_unmanaged_subview_reset<TEST_EXECSPACE>();
 }
 
-} // namespace Test
+}  // namespace Test
diff --git a/lib/kokkos/core/unit_test/threads/TestThreads_Team.cpp b/lib/kokkos/core/unit_test/threads/TestThreads_Team.cpp
index 63d2509355..b931c5cb61 100644
--- a/lib/kokkos/core/unit_test/threads/TestThreads_Team.cpp
+++ b/lib/kokkos/core/unit_test/threads/TestThreads_Team.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -46,45 +47,59 @@
 
 namespace Test {
 
-TEST_F( TEST_CATEGORY, team_for )
-{
-  TestTeamPolicy< TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Static> >::test_for( 0 );
-  TestTeamPolicy< TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Dynamic> >::test_for( 0 );
+TEST(TEST_CATEGORY, team_for) {
+  TestTeamPolicy<TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Static> >::test_for(
+      0);
+  TestTeamPolicy<TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Dynamic> >::test_for(
+      0);
 
-  TestTeamPolicy< TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Static> >::test_for( 2 );
-  TestTeamPolicy< TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Dynamic> >::test_for( 2 );
+  TestTeamPolicy<TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Static> >::test_for(
+      2);
+  TestTeamPolicy<TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Dynamic> >::test_for(
+      2);
 
-  TestTeamPolicy< TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Static> >::test_for( 1000 );
-  TestTeamPolicy< TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Dynamic> >::test_for( 1000 );
+  TestTeamPolicy<TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Static> >::test_for(
+      1000);
+  TestTeamPolicy<TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Dynamic> >::test_for(
+      1000);
 }
 
-
-TEST_F( TEST_CATEGORY, team_reduce )
-{
-  TestTeamPolicy< TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Static> >::test_reduce( 0 );
-  TestTeamPolicy< TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Dynamic> >::test_reduce( 0 );
-  TestTeamPolicy< TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Static> >::test_reduce( 2 );
-  TestTeamPolicy< TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Dynamic> >::test_reduce( 2 );
-  TestTeamPolicy< TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Static> >::test_reduce( 1000 );
-  TestTeamPolicy< TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Dynamic> >::test_reduce( 1000 );
+TEST(TEST_CATEGORY, team_reduce) {
+  TestTeamPolicy<TEST_EXECSPACE,
+                 Kokkos::Schedule<Kokkos::Static> >::test_reduce(0);
+  TestTeamPolicy<TEST_EXECSPACE,
+                 Kokkos::Schedule<Kokkos::Dynamic> >::test_reduce(0);
+  TestTeamPolicy<TEST_EXECSPACE,
+                 Kokkos::Schedule<Kokkos::Static> >::test_reduce(2);
+  TestTeamPolicy<TEST_EXECSPACE,
+                 Kokkos::Schedule<Kokkos::Dynamic> >::test_reduce(2);
+  TestTeamPolicy<TEST_EXECSPACE,
+                 Kokkos::Schedule<Kokkos::Static> >::test_reduce(1000);
+  TestTeamPolicy<TEST_EXECSPACE,
+                 Kokkos::Schedule<Kokkos::Dynamic> >::test_reduce(1000);
 }
 
-TEST_F( TEST_CATEGORY, team_broadcast )
-{
-  TestTeamBroadcast< TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Static> >::test_teambroadcast( 0 );
-  TestTeamBroadcast< TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Dynamic> >::test_teambroadcast( 0 );
+TEST(TEST_CATEGORY, team_broadcast) {
+  TestTeamBroadcast<TEST_EXECSPACE,
+                    Kokkos::Schedule<Kokkos::Static> >::test_teambroadcast(0);
+  TestTeamBroadcast<TEST_EXECSPACE,
+                    Kokkos::Schedule<Kokkos::Dynamic> >::test_teambroadcast(0);
 
-  TestTeamBroadcast< TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Static> >::test_teambroadcast( 2 );
-  TestTeamBroadcast< TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Dynamic> >::test_teambroadcast( 2 );
+  TestTeamBroadcast<TEST_EXECSPACE,
+                    Kokkos::Schedule<Kokkos::Static> >::test_teambroadcast(2);
+  TestTeamBroadcast<TEST_EXECSPACE,
+                    Kokkos::Schedule<Kokkos::Dynamic> >::test_teambroadcast(2);
 
-  TestTeamBroadcast< TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Static> >::test_teambroadcast( 16 );
-  TestTeamBroadcast< TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Dynamic> >::test_teambroadcast( 16 );
+  TestTeamBroadcast<TEST_EXECSPACE,
+                    Kokkos::Schedule<Kokkos::Static> >::test_teambroadcast(16);
+  TestTeamBroadcast<TEST_EXECSPACE,
+                    Kokkos::Schedule<Kokkos::Dynamic> >::test_teambroadcast(16);
 
-  TestTeamBroadcast< TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Static> >::test_teambroadcast( 1000 );
-  TestTeamBroadcast< TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Dynamic> >::test_teambroadcast( 1000 );
-}
+  TestTeamBroadcast<TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Static> >::
+      test_teambroadcast(1000);
+  TestTeamBroadcast<TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Dynamic> >::
+      test_teambroadcast(1000);
 }
+}  // namespace Test
 
 #include <TestTeamVector.hpp>
-
-
diff --git a/lib/kokkos/core/unit_test/threads/TestThreads_TeamReductionScan.cpp b/lib/kokkos/core/unit_test/threads/TestThreads_TeamReductionScan.cpp
index 1df976f10d..2c382c80ae 100644
--- a/lib/kokkos/core/unit_test/threads/TestThreads_TeamReductionScan.cpp
+++ b/lib/kokkos/core/unit_test/threads/TestThreads_TeamReductionScan.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -46,36 +47,35 @@
 
 namespace Test {
 
-
-TEST_F( TEST_CATEGORY, team_scan )
-{
-  TestScanTeam< TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Static> >( 0 );
-  TestScanTeam< TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Dynamic> >( 0 );
-  TestScanTeam< TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Static> >( 10 );
-  TestScanTeam< TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Dynamic> >( 10 );
-  TestScanTeam< TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Static> >( 10000 );
-  TestScanTeam< TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Dynamic> >( 10000 );
+TEST(TEST_CATEGORY, team_scan) {
+  TestScanTeam<TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Static> >(0);
+  TestScanTeam<TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Dynamic> >(0);
+  TestScanTeam<TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Static> >(10);
+  TestScanTeam<TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Dynamic> >(10);
+  TestScanTeam<TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Static> >(10000);
+  TestScanTeam<TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Dynamic> >(10000);
 }
 
-TEST_F( TEST_CATEGORY, team_long_reduce )
-{
-  TestReduceTeam< long, TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Static> >( 0 );
-  TestReduceTeam< long, TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Dynamic> >( 0 );
-  TestReduceTeam< long, TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Static> >( 3 );
-  TestReduceTeam< long, TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Dynamic> >( 3 );
-  TestReduceTeam< long, TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Static> >( 100000 );
-  TestReduceTeam< long, TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Dynamic> >( 100000 );
+TEST(TEST_CATEGORY, team_long_reduce) {
+  TestReduceTeam<long, TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Static> >(0);
+  TestReduceTeam<long, TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Dynamic> >(0);
+  TestReduceTeam<long, TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Static> >(3);
+  TestReduceTeam<long, TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Dynamic> >(3);
+  TestReduceTeam<long, TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Static> >(
+      100000);
+  TestReduceTeam<long, TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Dynamic> >(
+      100000);
 }
 
-TEST_F( TEST_CATEGORY, team_double_reduce )
-{
-  TestReduceTeam< double, TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Static> >( 0 );
-  TestReduceTeam< double, TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Dynamic> >( 0 );
-  TestReduceTeam< double, TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Static> >( 3 );
-  TestReduceTeam< double, TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Dynamic> >( 3 );
-  TestReduceTeam< double, TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Static> >( 100000 );
-  TestReduceTeam< double, TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Dynamic> >( 100000 );
+TEST(TEST_CATEGORY, team_double_reduce) {
+  TestReduceTeam<double, TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Static> >(0);
+  TestReduceTeam<double, TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Dynamic> >(0);
+  TestReduceTeam<double, TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Static> >(3);
+  TestReduceTeam<double, TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Dynamic> >(3);
+  TestReduceTeam<double, TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Static> >(
+      100000);
+  TestReduceTeam<double, TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Dynamic> >(
+      100000);
 }
 
-} // namespace Test
-
+}  // namespace Test
diff --git a/lib/kokkos/core/unit_test/threads/TestThreads_TeamScratch.cpp b/lib/kokkos/core/unit_test/threads/TestThreads_TeamScratch.cpp
index d171195798..d793a9050f 100644
--- a/lib/kokkos/core/unit_test/threads/TestThreads_TeamScratch.cpp
+++ b/lib/kokkos/core/unit_test/threads/TestThreads_TeamScratch.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -46,42 +47,36 @@
 
 namespace Test {
 
-TEST_F( TEST_CATEGORY, team_shared_request )
-{
-  TestSharedTeam< TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Static> >();
-  TestSharedTeam< TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Dynamic> >();
+TEST(TEST_CATEGORY, team_shared_request) {
+  TestSharedTeam<TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Static> >();
+  TestSharedTeam<TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Dynamic> >();
 }
 
-TEST_F( TEST_CATEGORY, team_scratch_request )
-{
-  TestScratchTeam< TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Static> >();
-  TestScratchTeam< TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Dynamic> >();
+TEST(TEST_CATEGORY, team_scratch_request) {
+  TestScratchTeam<TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Static> >();
+  TestScratchTeam<TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Dynamic> >();
 }
 
-#if defined( KOKKOS_ENABLE_CXX11_DISPATCH_LAMBDA )
-#if !defined(KOKKOS_ENABLE_CUDA) || ( 8000 <= CUDA_VERSION )
-TEST_F( TEST_CATEGORY, team_lambda_shared_request )
-{
-  TestLambdaSharedTeam< Kokkos::HostSpace, TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Static> >();
-  TestLambdaSharedTeam< Kokkos::HostSpace, TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Dynamic> >();
+#if defined(KOKKOS_ENABLE_CXX11_DISPATCH_LAMBDA)
+#if !defined(KOKKOS_ENABLE_CUDA) || (8000 <= CUDA_VERSION)
+TEST(TEST_CATEGORY, team_lambda_shared_request) {
+  TestLambdaSharedTeam<Kokkos::HostSpace, TEST_EXECSPACE,
+                       Kokkos::Schedule<Kokkos::Static> >();
+  TestLambdaSharedTeam<Kokkos::HostSpace, TEST_EXECSPACE,
+                       Kokkos::Schedule<Kokkos::Dynamic> >();
 }
 
-TEST_F( TEST_CATEGORY, scratch_align) {
-  TestScratchAlignment< TEST_EXECSPACE >();
-}
+TEST(TEST_CATEGORY, scratch_align) { TestScratchAlignment<TEST_EXECSPACE>(); }
 #endif
 #endif
 
-TEST_F( TEST_CATEGORY, shmem_size )
-{
-  TestShmemSize< TEST_EXECSPACE >();
+TEST(TEST_CATEGORY, shmem_size) { TestShmemSize<TEST_EXECSPACE>(); }
+
+TEST(TEST_CATEGORY, multi_level_scratch) {
+  TestMultiLevelScratchTeam<TEST_EXECSPACE,
+                            Kokkos::Schedule<Kokkos::Static> >();
+  TestMultiLevelScratchTeam<TEST_EXECSPACE,
+                            Kokkos::Schedule<Kokkos::Dynamic> >();
 }
 
-TEST_F( TEST_CATEGORY, multi_level_scratch )
-{
-  TestMultiLevelScratchTeam< TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Static> >();
-  TestMultiLevelScratchTeam< TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Dynamic> >();
-}
-
-} // namespace Test
-
+}  // namespace Test
diff --git a/lib/kokkos/core/unit_test/threads/TestThreads_TeamTeamSize.cpp b/lib/kokkos/core/unit_test/threads/TestThreads_TeamTeamSize.cpp
index b1cf4ec875..d5e16dcbd3 100644
--- a/lib/kokkos/core/unit_test/threads/TestThreads_TeamTeamSize.cpp
+++ b/lib/kokkos/core/unit_test/threads/TestThreads_TeamTeamSize.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -43,5 +44,3 @@
 
 #include <threads/TestThreads_Category.hpp>
 #include <TestTeamTeamSize.hpp>
-
-
diff --git a/lib/kokkos/core/unit_test/threads/TestThreads_TeamVectorRange.cpp b/lib/kokkos/core/unit_test/threads/TestThreads_TeamVectorRange.cpp
index 62b0d666ce..4e216d75d0 100644
--- a/lib/kokkos/core/unit_test/threads/TestThreads_TeamVectorRange.cpp
+++ b/lib/kokkos/core/unit_test/threads/TestThreads_TeamVectorRange.cpp
@@ -3,10 +3,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -24,10 +25,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -42,7 +43,5 @@
 //@HEADER
 */
 
-#include<threads/TestThreads_Category.hpp>
-#include<TestTeamVectorRange.hpp>
-
-
+#include <threads/TestThreads_Category.hpp>
+#include <TestTeamVectorRange.hpp>
diff --git a/lib/kokkos/core/unit_test/threads/TestThreads_UniqueToken.cpp b/lib/kokkos/core/unit_test/threads/TestThreads_UniqueToken.cpp
new file mode 100644
index 0000000000..f8391af88a
--- /dev/null
+++ b/lib/kokkos/core/unit_test/threads/TestThreads_UniqueToken.cpp
@@ -0,0 +1,46 @@
+/*
+//@HEADER
+// ************************************************************************
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
+// the U.S. Government retains certain rights in this software.
+//
+// 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 Corporation nor the names of the
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 NTESS OR THE
+// 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.
+//
+// Questions? Contact Christian R. Trott (crtrott@sandia.gov)
+//
+// ************************************************************************
+//@HEADER
+*/
+
+#include <threads/TestThreads_Category.hpp>
+#include <TestUniqueToken.hpp>
diff --git a/lib/kokkos/core/unit_test/threads/TestThreads_ViewAPI_a.cpp b/lib/kokkos/core/unit_test/threads/TestThreads_ViewAPI_a.cpp
index 9b8ce44682..91bbd2d16a 100644
--- a/lib/kokkos/core/unit_test/threads/TestThreads_ViewAPI_a.cpp
+++ b/lib/kokkos/core/unit_test/threads/TestThreads_ViewAPI_a.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
diff --git a/lib/kokkos/core/unit_test/threads/TestThreads_ViewAPI_b.cpp b/lib/kokkos/core/unit_test/threads/TestThreads_ViewAPI_b.cpp
index 454ec90178..aaee8e5795 100644
--- a/lib/kokkos/core/unit_test/threads/TestThreads_ViewAPI_b.cpp
+++ b/lib/kokkos/core/unit_test/threads/TestThreads_ViewAPI_b.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
diff --git a/lib/kokkos/core/unit_test/threads/TestThreads_ViewAPI_c.cpp b/lib/kokkos/core/unit_test/threads/TestThreads_ViewAPI_c.cpp
index c63ad3cff6..074344d127 100644
--- a/lib/kokkos/core/unit_test/threads/TestThreads_ViewAPI_c.cpp
+++ b/lib/kokkos/core/unit_test/threads/TestThreads_ViewAPI_c.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
diff --git a/lib/kokkos/core/unit_test/threads/TestThreads_ViewAPI_d.cpp b/lib/kokkos/core/unit_test/threads/TestThreads_ViewAPI_d.cpp
index 2b31591569..995bb56665 100644
--- a/lib/kokkos/core/unit_test/threads/TestThreads_ViewAPI_d.cpp
+++ b/lib/kokkos/core/unit_test/threads/TestThreads_ViewAPI_d.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
diff --git a/lib/kokkos/core/unit_test/threads/TestThreads_ViewAPI_e.cpp b/lib/kokkos/core/unit_test/threads/TestThreads_ViewAPI_e.cpp
index 616a923496..879f075db2 100644
--- a/lib/kokkos/core/unit_test/threads/TestThreads_ViewAPI_e.cpp
+++ b/lib/kokkos/core/unit_test/threads/TestThreads_ViewAPI_e.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
diff --git a/lib/kokkos/core/unit_test/threads/TestThreads_ViewLayoutStrideAssignment.cpp b/lib/kokkos/core/unit_test/threads/TestThreads_ViewLayoutStrideAssignment.cpp
index 5ddd07108b..0b54784d95 100644
--- a/lib/kokkos/core/unit_test/threads/TestThreads_ViewLayoutStrideAssignment.cpp
+++ b/lib/kokkos/core/unit_test/threads/TestThreads_ViewLayoutStrideAssignment.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -43,4 +44,3 @@
 
 #include <threads/TestThreads_Category.hpp>
 #include <TestViewLayoutStrideAssignment.hpp>
-
diff --git a/lib/kokkos/core/unit_test/threads/TestThreads_ViewMapping_a.cpp b/lib/kokkos/core/unit_test/threads/TestThreads_ViewMapping_a.cpp
index d67f376fc6..22f849a0c9 100644
--- a/lib/kokkos/core/unit_test/threads/TestThreads_ViewMapping_a.cpp
+++ b/lib/kokkos/core/unit_test/threads/TestThreads_ViewMapping_a.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -43,4 +44,3 @@
 
 #include <threads/TestThreads_Category.hpp>
 #include <TestViewMapping_a.hpp>
-
diff --git a/lib/kokkos/core/unit_test/threads/TestThreads_ViewMapping_b.cpp b/lib/kokkos/core/unit_test/threads/TestThreads_ViewMapping_b.cpp
index 49c7f6d3d7..d18b9b899e 100644
--- a/lib/kokkos/core/unit_test/threads/TestThreads_ViewMapping_b.cpp
+++ b/lib/kokkos/core/unit_test/threads/TestThreads_ViewMapping_b.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -43,4 +44,3 @@
 
 #include <threads/TestThreads_Category.hpp>
 #include <TestViewMapping_b.hpp>
-
diff --git a/lib/kokkos/core/unit_test/threads/TestThreads_ViewMapping_subview.cpp b/lib/kokkos/core/unit_test/threads/TestThreads_ViewMapping_subview.cpp
index 6c4f14873e..3e9ce21027 100644
--- a/lib/kokkos/core/unit_test/threads/TestThreads_ViewMapping_subview.cpp
+++ b/lib/kokkos/core/unit_test/threads/TestThreads_ViewMapping_subview.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -43,4 +44,3 @@
 
 #include <threads/TestThreads_Category.hpp>
 #include <TestViewMapping_subview.hpp>
-
diff --git a/lib/kokkos/core/unit_test/threads/TestThreads_ViewOfClass.cpp b/lib/kokkos/core/unit_test/threads/TestThreads_ViewOfClass.cpp
index d9a9c17fea..3018023cb5 100644
--- a/lib/kokkos/core/unit_test/threads/TestThreads_ViewOfClass.cpp
+++ b/lib/kokkos/core/unit_test/threads/TestThreads_ViewOfClass.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -43,4 +44,3 @@
 
 #include <threads/TestThreads_Category.hpp>
 #include <TestViewOfClass.hpp>
-
diff --git a/lib/kokkos/core/unit_test/threads/TestThreads_ViewResize.cpp b/lib/kokkos/core/unit_test/threads/TestThreads_ViewResize.cpp
new file mode 100644
index 0000000000..a143e3f4df
--- /dev/null
+++ b/lib/kokkos/core/unit_test/threads/TestThreads_ViewResize.cpp
@@ -0,0 +1,46 @@
+/*
+//@HEADER
+// ************************************************************************
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
+// the U.S. Government retains certain rights in this software.
+//
+// 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 Corporation nor the names of the
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 NTESS OR THE
+// 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.
+//
+// Questions? Contact Christian R. Trott (crtrott@sandia.gov)
+//
+// ************************************************************************
+//@HEADER
+*/
+
+#include <threads/TestThreads_Category.hpp>
+#include <TestViewResize.hpp>
diff --git a/lib/kokkos/core/unit_test/threads/TestThreads_View_64bit.cpp b/lib/kokkos/core/unit_test/threads/TestThreads_View_64bit.cpp
index 5c2d727a4a..b347b441ef 100644
--- a/lib/kokkos/core/unit_test/threads/TestThreads_View_64bit.cpp
+++ b/lib/kokkos/core/unit_test/threads/TestThreads_View_64bit.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
diff --git a/lib/kokkos/core/unit_test/threads/TestThreads_WorkGraph.cpp b/lib/kokkos/core/unit_test/threads/TestThreads_WorkGraph.cpp
index e7801d1179..1ebc7d896a 100644
--- a/lib/kokkos/core/unit_test/threads/TestThreads_WorkGraph.cpp
+++ b/lib/kokkos/core/unit_test/threads/TestThreads_WorkGraph.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -41,5 +42,5 @@
 //@HEADER
 */
 
-#include<threads/TestThreads_Category.hpp>
-#include<TestWorkGraph.hpp>
+#include <threads/TestThreads_Category.hpp>
+#include <TestWorkGraph.hpp>
diff --git a/lib/kokkos/example/CMakeLists.txt b/lib/kokkos/example/CMakeLists.txt
index 3809cc2ea5..c7d6099546 100644
--- a/lib/kokkos/example/CMakeLists.txt
+++ b/lib/kokkos/example/CMakeLists.txt
@@ -2,19 +2,19 @@
 
 # Subpackage name must match what appears in kokkos/cmake/Dependencies.cmake
 #
-TRIBITS_SUBPACKAGE(Example)
+#KOKKOS_SUBPACKAGE(Example)
 
-TRIBITS_ADD_EXAMPLE_DIRECTORIES(query_device)
-TRIBITS_ADD_EXAMPLE_DIRECTORIES(fixture)
-TRIBITS_ADD_EXAMPLE_DIRECTORIES(feint)
-TRIBITS_ADD_EXAMPLE_DIRECTORIES(fenl)
-TRIBITS_ADD_EXAMPLE_DIRECTORIES(multi_fem)
-TRIBITS_ADD_EXAMPLE_DIRECTORIES(md_skeleton)
-TRIBITS_ADD_EXAMPLE_DIRECTORIES(global_2_local_ids)
-TRIBITS_ADD_EXAMPLE_DIRECTORIES(grow_array)
-TRIBITS_ADD_EXAMPLE_DIRECTORIES(sort_array)
-if(NOT Kokkos_ENABLE_Cuda)
-TRIBITS_ADD_EXAMPLE_DIRECTORIES(tutorial)
-endif()
-TRIBITS_SUBPACKAGE_POSTPROCESS()
+#KOKKOS_ADD_EXAMPLE_DIRECTORIES(query_device)
+#KOKKOS_ADD_EXAMPLE_DIRECTORIES(fixture)
+#KOKKOS_ADD_EXAMPLE_DIRECTORIES(feint)
+#KOKKOS_ADD_EXAMPLE_DIRECTORIES(fenl)
+#KOKKOS_ADD_EXAMPLE_DIRECTORIES(multi_fem)
+#KOKKOS_ADD_EXAMPLE_DIRECTORIES(md_skeleton)
+#KOKKOS_ADD_EXAMPLE_DIRECTORIES(global_2_local_ids)
+#KOKKOS_ADD_EXAMPLE_DIRECTORIES(grow_array)
+#KOKKOS_ADD_EXAMPLE_DIRECTORIES(sort_array)
+#if(NOT Kokkos_ENABLE_CUDA)
+#KOKKOS_ADD_EXAMPLE_DIRECTORIES(tutorial)
+#endif()
+#KOKKOS_SUBPACKAGE_POSTPROCESS()
 
diff --git a/lib/kokkos/example/cmake_build/CMakeLists.txt b/lib/kokkos/example/build_cmake_in_tree/CMakeLists.txt
similarity index 100%
rename from lib/kokkos/example/cmake_build/CMakeLists.txt
rename to lib/kokkos/example/build_cmake_in_tree/CMakeLists.txt
diff --git a/lib/kokkos/example/cmake_build/cmake_example.cpp b/lib/kokkos/example/build_cmake_in_tree/cmake_example.cpp
similarity index 85%
rename from lib/kokkos/example/cmake_build/cmake_example.cpp
rename to lib/kokkos/example/build_cmake_in_tree/cmake_example.cpp
index a73b65abf0..c6bbaeca81 100644
--- a/lib/kokkos/example/cmake_build/cmake_example.cpp
+++ b/lib/kokkos/example/build_cmake_in_tree/cmake_example.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -65,9 +66,9 @@ int main(int argc, char* argv[]) {
 
   // Compute the number of even integers from 0 to n-1, in parallel.
   long count = 0;
-  Kokkos::parallel_reduce(n, KOKKOS_LAMBDA (const long i, long& lcount) {
-    lcount += (i % 2) == 0;
-  }, count);
+  Kokkos::parallel_reduce(
+      n, KOKKOS_LAMBDA(const long i, long& lcount) { lcount += (i % 2) == 0; },
+      count);
 
   double count_time = timer.seconds();
   printf("  Parallel: %ld    %10.6f\n", count, count_time);
diff --git a/lib/kokkos/example/cmake_build/foo.f b/lib/kokkos/example/build_cmake_in_tree/foo.f
similarity index 100%
rename from lib/kokkos/example/cmake_build/foo.f
rename to lib/kokkos/example/build_cmake_in_tree/foo.f
diff --git a/lib/kokkos/example/build_cmake_installed/CMakeLists.txt b/lib/kokkos/example/build_cmake_installed/CMakeLists.txt
new file mode 100644
index 0000000000..7fdb94d454
--- /dev/null
+++ b/lib/kokkos/example/build_cmake_installed/CMakeLists.txt
@@ -0,0 +1,42 @@
+# Kokkos requires CMake version 3.1 or higher and that you have the following
+# line with a version of 3.1 or higher as the first line of your project:
+#   cmake_minimum_required(VERSION 3.1)
+#
+# The other CMake commands required to build Kokkos as part of your application
+# are:
+#   add_subdirectory(path/to/kokkos)
+#   target_link_libraries(executable or library)
+#
+# If Kokkos is not a subdirectory of your project, you will also need to pass a
+# binary directory to add_subdirectory().  We had to pass the binary directory
+# for this example for that reason.  Note that target_link_libraries() can be
+# called on a target added by add_executable(), add_library(), or another
+# similar command.
+#
+# All the flags, etc. required to build using the Kokkos library are
+# transitively added to targets which depend on the library.
+#
+# The CMake variables CMAKE_CXX_STANDARD and CMAKE_CXX_EXTENSIONS are
+# respected.  We recommend that you set CMAKE_CXX_EXTENSIONS to OFF.
+# Otherwise, CMake defaults to using extensions for the C++ standard, and the
+# GNU extensions (-std=gnu++11) will be used for compilers that support it
+# instead of standard C++11 (-std=c++11).
+#
+# A bunch of build options are added as variables (all starting with KOKKOS_)
+# to the build.  Check them out using ccmake or the CMake GUI.
+#
+# Building this example:
+#   1. Create a build directory.
+#   2. cd /path/to/build/directory
+#   3. cmake /path/to/example
+#   4. make
+
+cmake_minimum_required(VERSION 3.12)
+project(Example CXX C Fortran)
+
+list(APPEND CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS} -O3)
+
+find_package(Kokkos)
+
+add_executable(example cmake_example.cpp foo.f)
+target_link_libraries(example Kokkos::kokkos)
diff --git a/lib/kokkos/example/feint/main.cpp b/lib/kokkos/example/build_cmake_installed/cmake_example.cpp
similarity index 55%
rename from lib/kokkos/example/feint/main.cpp
rename to lib/kokkos/example/build_cmake_installed/cmake_example.cpp
index df61f3e266..c6bbaeca81 100644
--- a/lib/kokkos/example/feint/main.cpp
+++ b/lib/kokkos/example/build_cmake_installed/cmake_example.cpp
@@ -1,10 +1,12 @@
+/*
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -22,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -38,23 +40,53 @@
 //
 // ************************************************************************
 //@HEADER
-
-#include <utility>
-#include <iostream>
+*/
 
 #include <Kokkos_Core.hpp>
+#include <cstdio>
 
-#include <feint_fwd.hpp>
+extern "C" void print_fortran_();
 
-int main(int argc, char* argv[])
-{
-  Kokkos::initialize(argc,argv);
-  {
-    std::cout << "feint< " << Kokkos::DefaultExecutionSpace::name() << " , NotUsingAtomic >" << std::endl ;
-    Kokkos::Example::feint< Kokkos::DefaultExecutionSpace , false >();
-    std::cout << "feint< " << Kokkos::DefaultExecutionSpace::name() << " , UsingAtomic >" << std::endl ;
-    Kokkos::Example::feint< Kokkos::DefaultExecutionSpace , true >();
+int main(int argc, char* argv[]) {
+  Kokkos::initialize(argc, argv);
+  Kokkos::DefaultExecutionSpace::print_configuration(std::cout);
+
+  if (argc < 2) {
+    fprintf(stderr, "Usage: %s [<kokkos_options>] <size>\n", argv[0]);
+    Kokkos::finalize();
+    exit(1);
   }
-  Kokkos::finalize();
-}
 
+  const long n = strtol(argv[1], NULL, 10);
+
+  printf("Number of even integers from 0 to %ld\n", n - 1);
+
+  Kokkos::Timer timer;
+  timer.reset();
+
+  // Compute the number of even integers from 0 to n-1, in parallel.
+  long count = 0;
+  Kokkos::parallel_reduce(
+      n, KOKKOS_LAMBDA(const long i, long& lcount) { lcount += (i % 2) == 0; },
+      count);
+
+  double count_time = timer.seconds();
+  printf("  Parallel: %ld    %10.6f\n", count, count_time);
+
+  timer.reset();
+
+  // Compare to a sequential loop.
+  long seq_count = 0;
+  for (long i = 0; i < n; ++i) {
+    seq_count += (i % 2) == 0;
+  }
+
+  count_time = timer.seconds();
+  printf("Sequential: %ld    %10.6f\n", seq_count, count_time);
+
+  print_fortran_();
+
+  Kokkos::finalize();
+
+  return (count == seq_count) ? 0 : -1;
+}
diff --git a/lib/kokkos/example/build_cmake_installed/foo.f b/lib/kokkos/example/build_cmake_installed/foo.f
new file mode 100644
index 0000000000..e618455283
--- /dev/null
+++ b/lib/kokkos/example/build_cmake_installed/foo.f
@@ -0,0 +1,4 @@
+        FUNCTION print_fortran()
+          PRINT *, 'Hello World from Fortran'
+          RETURN
+        END
diff --git a/lib/kokkos/example/common/VectorImport.hpp b/lib/kokkos/example/common/VectorImport.hpp
deleted file mode 100644
index dd35bd5687..0000000000
--- a/lib/kokkos/example/common/VectorImport.hpp
+++ /dev/null
@@ -1,294 +0,0 @@
-/*
-//@HEADER
-// ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
-// the U.S. Government retains certain rights in this software.
-// 
-// 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 Corporation nor the names of the
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "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 SANDIA CORPORATION OR THE
-// 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.
-//
-// Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
-// ************************************************************************
-//@HEADER
-*/
-
-#ifndef KOKKOS_VECTORIMPORT_HPP
-#define KOKKOS_VECTORIMPORT_HPP
-
-#include <utility>
-#include <limits>
-#include <iostream>
-#include <sstream>
-#include <stdexcept>
-
-#include <Kokkos_Core.hpp>
-
-#include <WrapMPI.hpp>
-
-namespace Kokkos {
-namespace Example {
-
-template< class CommMessageType , class CommIdentType , class VectorType >
-struct VectorImport ;
-
-} // namespace Example
-} // namespace Kokkos
-
-#if ! defined( KOKKOS_ENABLE_MPI )
-
-//----------------------------------------------------------------------------
-//----------------------------------------------------------------------------
-
-namespace Kokkos {
-namespace Example {
-
-template< class CommMessageType , class CommIdentType , class VectorType >
-struct VectorImport {
-
-  const MPI_Comm comm ;
-  const unsigned count_owned ;
-  const unsigned count_receive ;
-
-  VectorImport( MPI_Comm arg_comm ,
-                const CommMessageType & ,
-                const CommMessageType & ,
-                const CommIdentType   & ,
-                const unsigned arg_count_owned ,
-                const unsigned arg_count_receive )
-    : comm( arg_comm )
-    , count_owned( arg_count_owned )
-    , count_receive( arg_count_receive )
-    {}
-
-  inline
-  void operator()( const VectorType & ) const {}
-};
-
-
-} // namespace Example
-} // namespace Kokkos
-
-//----------------------------------------------------------------------------
-//----------------------------------------------------------------------------
-
-#else /* defined( KOKKOS_ENABLE_MPI ) */
-
-namespace Kokkos {
-namespace Example {
-
-template< class CommMessageType , class CommIdentType , class VectorType >
-class VectorImport {
-private:
-
-  // rank == 1 or array_layout == LayoutRight
-  static_assert(
-             ( VectorType::rank == 1 ) ||
-             std::is_same< typename VectorType::array_layout , Kokkos::LayoutRight >::value,
-             "Kokkos::Example::VectorImport Assert Fail: rank != 1 or array_layout != LayoutRight" );
-
-  typedef typename VectorType::HostMirror HostVectorType ;
-
-  enum { ReceiveInPlace =
-    std::is_same< typename VectorType::memory_space ,
-                           typename HostVectorType::memory_space >::value };
-
-  const CommMessageType  recv_msg ;
-  const CommMessageType  send_msg ;
-  const CommIdentType    send_nodeid ;
-  VectorType             send_buffer ;
-  HostVectorType         host_send_buffer ;
-  HostVectorType         host_recv_buffer ;
-  unsigned               chunk ;
-
-public:
-
-  const MPI_Comm         comm ;
-  const unsigned         count_owned ;
-  const unsigned         count_receive ;
-
-  struct Pack {
-    typedef typename VectorType::execution_space execution_space ;
-    const CommIdentType  index ;
-    const VectorType     source ;
-    const VectorType     buffer ;
-
-    KOKKOS_INLINE_FUNCTION
-    void operator()( const unsigned i ) const
-      { buffer( i ) = source( index(i) ); }
-
-    Pack( const CommIdentType  & arg_index ,
-          const VectorType     & arg_source ,
-          const VectorType     & arg_buffer )
-      : index( arg_index )
-      , source( arg_source )
-      , buffer( arg_buffer )
-    {
-      Kokkos::parallel_for( index.dimension_0() , *this );
-      execution_space().fence();
-    }
-  };
-
-  VectorImport( MPI_Comm arg_comm ,
-                const CommMessageType & arg_recv_msg ,
-                const CommMessageType & arg_send_msg ,
-                const CommIdentType   & arg_send_nodeid ,
-                const unsigned arg_count_owned ,
-                const unsigned arg_count_receive )
-    : recv_msg( arg_recv_msg )
-    , send_msg( arg_send_msg )
-    , send_nodeid( arg_send_nodeid )
-    , send_buffer()
-    , host_send_buffer()
-    , host_recv_buffer()
-    , comm( arg_comm )
-    , count_owned( arg_count_owned )
-    , count_receive( arg_count_receive )
-    {
-      if ( ! ReceiveInPlace ) {
-        host_recv_buffer = HostVectorType("recv_buffer",count_receive);
-      }
-
-      unsigned send_count = 0 ;
-      for ( unsigned i = 0 ; i < send_msg.dimension_0() ; ++i ) { send_count += send_msg(i,1); }
-      send_buffer      = VectorType("send_buffer",send_count);
-      host_send_buffer = Kokkos::create_mirror_view( send_buffer );
-    }
-
-  inline
-  void operator()( const VectorType & v ) const
-  {
-    typedef typename VectorType::value_type  scalar_type ;
-
-    const int mpi_tag = 42 ;
-    const unsigned chunk = v.dimension_1();
-
-    // Subvector for receives
-    const std::pair<unsigned,unsigned> recv_range( count_owned , count_owned + count_receive );
-    const VectorType recv_vector = Kokkos::subview( v , recv_range );
-
-    std::vector< MPI_Request > recv_request( recv_msg.dimension_0() , MPI_REQUEST_NULL );
-
-    { // Post receives
-      scalar_type * ptr =
-        ReceiveInPlace ? recv_vector.ptr_on_device() : host_recv_buffer.ptr_on_device();
-
-      for ( size_t i = 0 ; i < recv_msg.dimension_0() ; ++i ) {
-        const int proc  = recv_msg(i,0);
-        const int count = recv_msg(i,1) * chunk ;
-
-        MPI_Irecv( ptr , count * sizeof(scalar_type) , MPI_BYTE ,
-                   proc , mpi_tag , comm , & recv_request[i] );
-
-        ptr += count ;
-      }
-    }
-
-    MPI_Barrier( comm );
-
-    { // Pack and send 
-      const Pack pack( send_nodeid , v , send_buffer );
-
-      Kokkos::deep_copy( host_send_buffer , send_buffer );
-
-      scalar_type * ptr = host_send_buffer.ptr_on_device();
-
-      for ( size_t i = 0 ; i < send_msg.dimension_0() ; ++i ) {
-        const int proc  = send_msg(i,0);
-        const int count = send_msg(i,1) * chunk ;
-
-        // MPI_Ssend blocks until
-        // (1) a receive is matched for the message and
-        // (2) the send buffer can be re-used.
-        //
-        // It is suggested that MPI_Ssend will have the best performance:
-        // http://www.mcs.anl.gov/research/projects/mpi/sendmode.html .
-
-        MPI_Ssend( ptr ,
-                   count * sizeof(scalar_type) , MPI_BYTE ,
-                   proc , mpi_tag , comm );
-
-        ptr += count ;
-      }
-    }
-
-    // Wait for receives and verify:
-
-    for ( size_t i = 0 ; i < recv_msg.dimension_0() ; ++i ) {
-      MPI_Status recv_status ;
-      int recv_which = 0 ;
-      int recv_size  = 0 ;
-
-      MPI_Waitany( recv_msg.dimension_0() , & recv_request[0] , & recv_which , & recv_status );
-
-      const int recv_proc = recv_status.MPI_SOURCE ;
-
-      MPI_Get_count( & recv_status , MPI_BYTE , & recv_size );
-
-      // Verify message properly received:
-
-      const int  expected_proc = recv_msg(recv_which,0);
-      const int  expected_size = recv_msg(recv_which,1) * chunk * sizeof(scalar_type);
-
-      if ( ( expected_proc != recv_proc ) ||
-           ( expected_size != recv_size ) ) {
-
-        int local_rank  = 0 ;
-
-        MPI_Comm_rank( comm , & local_rank );
-
-        std::ostringstream msg ;
-        msg << "VectorImport error:"
-            << " P" << local_rank
-            << " received from P" << recv_proc
-            << " size "     << recv_size
-            << " expected " << expected_size
-            << " from P"    << expected_proc ;
-        throw std::runtime_error( msg.str() );
-      }
-    }
-
-    // Copy received data to device memory.
-
-    if ( ! ReceiveInPlace ) { Kokkos::deep_copy( recv_vector , host_recv_buffer ); }
-  }
-};
-
-} // namespace Example
-} // namespace Kokkos
-
-#endif
-
-//----------------------------------------------------------------------------
-
-#endif /* #ifndef KOKKOS_VECTORIMPORT_HPP */
-
-
diff --git a/lib/kokkos/example/common/WrapMPI.hpp b/lib/kokkos/example/common/WrapMPI.hpp
deleted file mode 100644
index cad2bb5cdf..0000000000
--- a/lib/kokkos/example/common/WrapMPI.hpp
+++ /dev/null
@@ -1,103 +0,0 @@
-/*
-//@HEADER
-// ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
-// the U.S. Government retains certain rights in this software.
-// 
-// 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 Corporation nor the names of the
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "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 SANDIA CORPORATION OR THE
-// 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.
-//
-// Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
-// ************************************************************************
-//@HEADER
-*/
-
-#ifndef KOKKOS_EXAMPLE_WRAP_MPI
-#define KOKKOS_EXAMPLE_WRAP_MPI
-
-#include <Kokkos_Macros.hpp>
-#include <string>
-
-#if defined( KOKKOS_ENABLE_MPI )
-
-#include <mpi.h>
-
-namespace Kokkos {
-namespace Example {
-
-inline
-double all_reduce( double value , MPI_Comm comm )
-{
-  double local = value ;
-  MPI_Allreduce( & local , & value , 1 , MPI_DOUBLE , MPI_SUM , comm );
-  return value ;
-}
-
-inline
-double all_reduce_max( double value , MPI_Comm comm )
-{
-  double local = value ;
-  MPI_Allreduce( & local , & value , 1 , MPI_DOUBLE , MPI_MAX , comm );
-  return value ;
-}
-
-} // namespace Example
-} // namespace Kokkos
-
-#elif ! defined( KOKKOS_ENABLE_MPI )
-
-/* Wrap the the MPI_Comm type and heavily used MPI functions
- * to reduce the number of '#if defined( KOKKOS_ENABLE_MPI )'
- * blocks which have to be sprinkled throughout the examples.
- */
-
-typedef int MPI_Comm ;
-
-inline int MPI_Comm_size( MPI_Comm , int * size ) { *size = 1 ; return 0 ; }
-inline int MPI_Comm_rank( MPI_Comm , int * rank ) { *rank = 0 ; return 0 ; }
-inline int MPI_Barrier( MPI_Comm ) { return 0; }
-
-namespace Kokkos {
-namespace Example {
-
-inline
-double all_reduce( double value , MPI_Comm ) { return value ; }
-
-inline
-double all_reduce_max( double value , MPI_Comm ) { return value ; }
-
-} // namespace Example
-} // namespace Kokkos
-
-#endif /* ! defined( KOKKOS_ENABLE_MPI ) */
-#endif /* #ifndef KOKKOS_EXAMPLE_WRAP_MPI */
-
diff --git a/lib/kokkos/example/feint/CMakeLists.txt b/lib/kokkos/example/feint/CMakeLists.txt
deleted file mode 100644
index 0018b9f9f5..0000000000
--- a/lib/kokkos/example/feint/CMakeLists.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-
-INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR})
-INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR})
-INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../common)
-INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../fixture)
-
-SET(SOURCES "")
-
-FILE(GLOB SOURCES *.cpp)
-
-LIST( APPEND SOURCES ../fixture/BoxElemPart.cpp)
-
-TRIBITS_ADD_EXECUTABLE(
-  feint
-  SOURCES ${SOURCES}
-  COMM serial mpi
-  )
-
diff --git a/lib/kokkos/example/feint/ElemFunctor.hpp b/lib/kokkos/example/feint/ElemFunctor.hpp
deleted file mode 100644
index eebe777d98..0000000000
--- a/lib/kokkos/example/feint/ElemFunctor.hpp
+++ /dev/null
@@ -1,485 +0,0 @@
-/*
-//@HEADER
-// ************************************************************************
-//
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
-// the U.S. Government retains certain rights in this software.
-//
-// 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 Corporation nor the names of the
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "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 SANDIA CORPORATION OR THE
-// 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.
-//
-// Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-//
-// ************************************************************************
-//@HEADER
-*/
-
-#ifndef KOKKOS_EXAMPLE_FEINT_FUNCTORS_HPP
-#define KOKKOS_EXAMPLE_FEINT_FUNCTORS_HPP
-
-#include <cstdio>
-#include <Kokkos_Core.hpp>
-#include <BoxElemFixture.hpp>
-
-namespace Kokkos {
-namespace Example {
-
-/** \brief  Numerically integrate a function on a finite element mesh and
- *          project the integrated values to nodes.
- */
-template< class FixtureType ,
-          class FunctionType ,
-          bool PerformScatterAddWithAtomic >
-struct FiniteElementIntegration ;
-
-// Specialized for an 'Example::BoxElemFixture' finite element mesh
-template< class Device , BoxElemPart::ElemOrder ElemOrder , class GridMap ,
-          class FunctionType ,
-          bool PerformScatterAddWithAtomic >
-struct FiniteElementIntegration<
-  Kokkos::Example::BoxElemFixture< Device , ElemOrder , GridMap > ,
-  FunctionType ,
-  PerformScatterAddWithAtomic >
-{
-  // Element mesh types:
-  typedef Kokkos::Example::BoxElemFixture< Device , ElemOrder >
-    BoxFixtureType ;
-
-  typedef Kokkos::Example::HexElement_Data< BoxFixtureType::ElemNode >
-    HexElemDataType ;
-
-  enum { ElemNodeCount    = HexElemDataType::element_node_count  };
-  enum { IntegrationCount = HexElemDataType::integration_count };
-  enum { ValueCount       = FunctionType::value_count };
-
-  // Dictionary of view types:
-  typedef View<int*,                              Device> ElemErrorType ;
-  typedef View<double*[ElemNodeCount][ValueCount],Device> ElemValueType ;
-  typedef View<double*[ValueCount],               Device> NodeValueType ;
-
-  // Data members for this Functor:
-  const HexElemDataType  m_hex_elem_data ; ///< Master element
-  const BoxFixtureType   m_box_fixture ;   ///< Unstructured mesh data
-  const FunctionType     m_function ;      ///< Function to integrate
-  const ElemErrorType    m_elem_error ;    ///< Flags for element errors
-  const ElemValueType    m_elem_integral ; ///< Per-element quantities
-  const NodeValueType    m_node_lumped ;   ///< Quantities lumped to nodes
-
-  //----------------------------------------
-
-  FiniteElementIntegration(
-    const BoxFixtureType & box_fixture ,
-    const FunctionType   & function )
-    : m_hex_elem_data()
-    , m_box_fixture( box_fixture ) // Shallow copy of the mesh fixture
-    , m_function( function )
-    , m_elem_error(    "elem_error"    , box_fixture.elem_count() )
-    , m_elem_integral( "elem_integral" , box_fixture.elem_count() )
-    , m_node_lumped(   "node_lumped"   , box_fixture.node_count() )
-    {}
-
-  //----------------------------------------
-  // Device for parallel dispatch.
-  typedef typename Device::execution_space execution_space;
-
-  // Value type for global parallel reduction.
-  struct value_type {
-    double value[ ValueCount ]; ///< Integrated quantitie
-    int    error ;              ///< Element inversion flag
-  };
-
-  //----------------------------------------
-  // Transform element interpolation function gradients and
-  // compute determinant of spatial jacobian.
-  KOKKOS_INLINE_FUNCTION
-  float transform_gradients(
-    const float  grad[][  ElemNodeCount ] , // Gradient of bases master element
-    const double coord[][ ElemNodeCount ] ,
-          float  dpsi[][  ElemNodeCount ] ) const
-  {
-    enum { TensorDim = 9 };
-    enum { j11 = 0 , j12 = 1 , j13 = 2 ,
-           j21 = 3 , j22 = 4 , j23 = 5 ,
-           j31 = 6 , j32 = 7 , j33 = 8 };
-
-    // Temporary for jacobian accumulation is double for summation accuracy.
-    double J[ TensorDim ] = { 0, 0, 0,  0, 0, 0,  0, 0, 0 };
-
-    for( int i = 0; i < ElemNodeCount ; ++i ) {
-      J[j11] += grad[0][i] * coord[0][i] ;
-      J[j12] += grad[0][i] * coord[1][i] ;
-      J[j13] += grad[0][i] * coord[2][i] ;
-
-      J[j21] += grad[1][i] * coord[0][i] ;
-      J[j22] += grad[1][i] * coord[1][i] ;
-      J[j23] += grad[1][i] * coord[2][i] ;
-
-      J[j31] += grad[2][i] * coord[0][i] ;
-      J[j32] += grad[2][i] * coord[1][i] ;
-      J[j33] += grad[2][i] * coord[2][i] ;
-    }
-
-    // Inverse jacobian, compute as double and store as float.
-    float invJ[ TensorDim ] = {
-      float( J[j22] * J[j33] - J[j23] * J[j32] ) ,
-      float( J[j13] * J[j32] - J[j12] * J[j33] ) ,
-      float( J[j12] * J[j23] - J[j13] * J[j22] ) ,
-
-      float( J[j23] * J[j31] - J[j21] * J[j33] ) ,
-      float( J[j11] * J[j33] - J[j13] * J[j31] ) ,
-      float( J[j13] * J[j21] - J[j11] * J[j23] ) ,
-
-      float( J[j21] * J[j32] - J[j22] * J[j31] ) ,
-      float( J[j12] * J[j31] - J[j11] * J[j32] ) ,
-      float( J[j11] * J[j22] - J[j12] * J[j21] ) };
-
-    const float detJ = J[j11] * invJ[j11] +
-                       J[j21] * invJ[j12] +
-                       J[j31] * invJ[j13] ;
-
-    {
-      const float detJinv = 1.0 / detJ ;
-      for ( int i = 0 ; i < TensorDim ; ++i ) { invJ[i] *= detJinv ; }
-    }
-
-    // Transform gradients:
-    for ( int i = 0; i < ElemNodeCount ; ++i ) {
-      dpsi[0][i] = grad[0][i] * invJ[j11] +
-                   grad[1][i] * invJ[j12] +
-                   grad[2][i] * invJ[j13];
-      dpsi[1][i] = grad[0][i] * invJ[j21] +
-                   grad[1][i] * invJ[j22] +
-                   grad[2][i] * invJ[j23];
-      dpsi[2][i] = grad[0][i] * invJ[j31] +
-                   grad[1][i] * invJ[j32] +
-                   grad[2][i] * invJ[j33];
-    }
-
-    return detJ ;
-  }
-
-  // Functor's function called for each element in the mesh
-  // to numerically integrate the function and add element quantities
-  // to the global integral.
-  KOKKOS_INLINE_FUNCTION
-  void operator()( const int ielem , value_type & update ) const
-  {
-    // Local temporaries for gathering nodal data.
-    double node_coord[3][ ElemNodeCount ];
-
-    int inode[ ElemNodeCount ] ;
-
-    // Gather indices of element's node from global memory to local memory.
-    for ( int i = 0 ; i < ElemNodeCount ; ++i ) {
-      inode[i] = m_box_fixture.elem_node( ielem , i );
-    }
-
-    // Gather coordinates of element's nodes from global memory to local memory.
-    for ( int i = 0 ; i < ElemNodeCount ; ++i ) {
-      node_coord[0][i] = m_box_fixture.node_coord( inode[i] , 0 );
-      node_coord[1][i] = m_box_fixture.node_coord( inode[i] , 1 );
-      node_coord[2][i] = m_box_fixture.node_coord( inode[i] , 2 );
-    }
-
-    // Local temporary to accumulate numerical integration
-    // of vector valued function.
-    double accum[ ValueCount ];
-
-    for ( int j = 0 ; j < ValueCount ; ++j ) { accum[j] = 0 ; }
-
-    int error = 0 ;
-
-    // Numerical integration loop for this element:
-    for ( int k = 0 ; k < IntegrationCount ; ++k ) {
-
-      // Integration point in space as interpolated from nodal coordinates:
-      double point[3] = { 0 , 0 , 0 };
-      for ( int i = 0 ; i < ElemNodeCount ; ++i ) {
-        point[0] += node_coord[0][i] * m_hex_elem_data.values[k][i] ;
-        point[1] += node_coord[1][i] * m_hex_elem_data.values[k][i] ;
-        point[2] += node_coord[2][i] * m_hex_elem_data.values[k][i] ;
-      }
-
-      // Example function vector value at cubature point:
-      double val_at_pt[ ValueCount ];
-      m_function( point , val_at_pt );
-
-      // Temporary array for transformed element basis functions' gradient.
-      // Not used in this example, but computed anyway by the more general
-      // deformation function.
-      float dpsi[3][ ElemNodeCount ];
-
-      // Compute deformation jacobian, transform basis function gradient,
-      // and return determinant of deformation jacobian.
-      float detJ = transform_gradients( m_hex_elem_data.gradients[k] ,
-                                        node_coord , dpsi );
-
-      // Check for inverted spatial jacobian
-      if ( detJ <= 0 ) { error = 1 ; detJ = 0 ; }
-
-      // Integration weight.
-      const float w = m_hex_elem_data.weights[k] * detJ ;
-
-      // Cubature of function.
-      for ( int j = 0 ; j < ValueCount ; ++j ) {
-        accum[j] += val_at_pt[j] * w ;
-      }
-    }
-
-    m_elem_error(ielem) = error ;
-
-
-    // Element contribution to global integral:
-
-    if ( error ) { update.error = 1 ; }
-
-    for ( int j = 0 ; j < ValueCount ; ++j ) { update.value[j] += accum[j] ; }
-
-    // Element-node quantity for lumping to nodes:
-    for ( int i = 0 ; i < ElemNodeCount ; ++i ) {
-      for ( int j = 0 ; j < ValueCount ; ++j ) {
-        // Save element's integral apportionment to nodes to global memory
-        m_elem_integral( ielem , i , j ) = accum[j] / ElemNodeCount ;
-      }
-    }
-
-    if ( PerformScatterAddWithAtomic ) {
-      // Option to immediately scatter-add the integrated quantities to nodes.
-      // This is a race condition as two or more threads could attempt
-      // concurrent update of nodal values.  The atomic_fetch_add (+=)
-      // function guarantees that the summation will occur correctly;
-      // however, there can be no guarantee for the order of summation.
-      // Due to non-associativity of floating point arithmetic the result
-      // is non-deterministic within bounds of floating point round-off.
-
-      for ( int i = 0 ; i < ElemNodeCount ; ++i ) {
-        for ( int j = 0 ; j < ValueCount ; ++j ) {
-          Kokkos::atomic_fetch_add( & m_node_lumped( inode[i] , j ) ,
-                                    m_elem_integral( ielem , i , j ) );
-        }
-      }
-    }
-  }
-  //--------------------------------------------------------------------------
-
-  // Initialization of the global reduction value.
-  KOKKOS_INLINE_FUNCTION
-  void init( value_type & update ) const
-  {
-    for ( int j = 0 ; j < ValueCount ; ++j ) update.value[j] = 0 ;
-    update.error = 0 ;
-  }
-
-  // Join two contributions to global reduction value.
-  KOKKOS_INLINE_FUNCTION
-  void join( volatile       value_type & update ,
-             volatile const value_type & input ) const
-  {
-    for ( int j = 0 ; j < ValueCount ; ++j ) update.value[j] += input.value[j] ;
-    if ( input.error ) update.error = 1 ;
-  }
-};
-
-} /* namespace Example */
-} /* namespace Kokkos */
-
-//----------------------------------------------------------------------------
-//----------------------------------------------------------------------------
-
-namespace Kokkos {
-namespace Example {
-
-template< class ViewElemNode ,
-          class ViewNodeScan ,
-          class ViewNodeElem >
-void map_node_to_elem( const ViewElemNode & elem_node ,
-                       const ViewNodeScan & node_scan ,
-                       const ViewNodeElem & node_elem );
-
-/** \brief  Functor to gather-sum elements' per-node quantities
- *          to element nodes.  Gather-sum is thread safe and
- *          does not require atomic updates.
- */
-template< class ViewNodeValue ,
-          class ViewElemValue ,
-          bool  AlreadyUsedAtomic >
-struct LumpElemToNode {
-
-  typedef typename ViewElemValue::execution_space execution_space ;
-
-  // In this example we know that the ViewElemValue
-  // array specification is < double*[nNode][nValue] >
-
-  enum { value_count = ViewElemValue::dimension::N2 };
-
-  ViewNodeValue             m_node_value ; ///< Integrated values at nodes
-  ViewElemValue             m_elem_value ; ///< Values apportioned to nodes
-  View<int*,   execution_space> m_node_scan ;  ///< Offsets for nodes->element
-  View<int*[2],execution_space> m_node_elem ;  ///< Node->element connectivity
-
-  // Only allocate node->element connectivity if have
-  // not already used atomic updates for the nodes.
-  template< class ViewElemNode >
-  LumpElemToNode( const ViewNodeValue & node_value ,
-                  const ViewElemValue & elem_value ,
-                  const ViewElemNode  & elem_node )
-    : m_node_value( node_value )
-    , m_elem_value( elem_value )
-    , m_node_scan( "node_scan" ,
-                   AlreadyUsedAtomic ? 0 : node_value.extent(0) + 1 )
-    , m_node_elem( "node_elem" ,
-                   AlreadyUsedAtomic ? 0 : elem_node.extent(0) *
-                                           elem_node.extent(1) )
-    {
-      if ( ! AlreadyUsedAtomic ) {
-        map_node_to_elem( elem_node , m_node_scan , m_node_elem );
-      }
-    }
-
-  //----------------------------------------
-
-  struct value_type { double value[ value_count ]; };
-
-  KOKKOS_INLINE_FUNCTION
-  void operator()( const int inode , value_type & update ) const
-  {
-    if ( ! AlreadyUsedAtomic ) {
-      // Sum element quantities to a local variable.
-      value_type local ;
-      for ( int j = 0 ; j < value_count ; ++j ) { local.value[j] = 0 ; }
-
-      {
-        // nodes' element ids span [i,end)
-        int i = m_node_scan(inode);
-        const int end = m_node_scan(inode+1);
-
-        for ( ; i < end ; ++i ) {
-          // element #ielem , local node #ielem_node is this node:
-          const int ielem      = m_node_elem(i,0);
-          const int ielem_node = m_node_elem(i,1);
-          // Sum the vector-values quantity
-          for ( int j = 0 ; j < value_count ; ++j ) {
-            local.value[j] += m_elem_value( ielem , ielem_node , j );
-          }
-        }
-      }
-
-      // Assign nodal quantity (no race condition).
-      // Sum global value.
-      for ( int j = 0 ; j < value_count ; ++j ) {
-        m_node_value( inode , j ) = local.value[j] ;
-        update.value[j] += local.value[j] ;
-      }
-    }
-    else {
-      // Already used atomic update of the nodal quantity,
-      // query and sum the value.
-      for ( int j = 0 ; j < value_count ; ++j ) {
-        update.value[j] += m_node_value( inode , j );
-      }
-    }
-  }
-
-  KOKKOS_INLINE_FUNCTION
-  void init( value_type & update ) const
-    { for ( int j = 0 ; j < value_count ; ++j ) { update.value[j] = 0 ; } }
-
-  KOKKOS_INLINE_FUNCTION
-  void join( volatile       value_type & update ,
-             volatile const value_type & input ) const
-    {
-      for ( int j = 0 ; j < value_count ; ++j ) {
-        update.value[j] += input.value[j] ;
-      }
-    }
-};
-
-//----------------------------------------------------------------------------
-//----------------------------------------------------------------------------
-
-template< class ViewElemNode ,
-          class ViewNodeScan ,
-          class ViewNodeElem >
-void map_node_to_elem( const ViewElemNode & elem_node ,
-                       const ViewNodeScan & node_scan ,
-                       const ViewNodeElem & node_elem )
-{
-  typedef typename ViewElemNode::host_mirror_space host_mirror_space ;
-
-  const typename ViewElemNode::HostMirror host_elem_node =
-    Kokkos::create_mirror_view(elem_node);
-
-  const typename ViewNodeScan::HostMirror host_node_scan =
-    Kokkos::create_mirror_view(node_scan);
-
-  const typename ViewNodeElem::HostMirror host_node_elem =
-    Kokkos::create_mirror_view(node_elem);
-
-  const int elem_count      = host_elem_node.extent(0);
-  const int elem_node_count = host_elem_node.extent(1);
-  const int node_count      = host_node_scan.extent(0) - 1 ;
-
-  const View<int*, host_mirror_space >
-    node_elem_count( "node_elem_count" , node_count );
-
-  Kokkos::deep_copy( host_elem_node , elem_node );
-
-  for ( int i = 0 ; i < elem_count ; ++i ) {
-    for ( int j = 0 ; j < elem_node_count ; ++j ) {
-      ++node_elem_count( host_elem_node(i,j) );
-    }
-  }
-
-  for ( int i = 0 ; i < node_count ; ++i ) {
-    host_node_scan(i+1) += host_node_scan(i) + node_elem_count(i);
-    node_elem_count(i) = 0 ;
-  }
-
-  for ( int i = 0 ; i < elem_count ; ++i ) {
-    for ( int j = 0 ; j < elem_node_count ; ++j ) {
-      const int inode  = host_elem_node(i,j);
-      const int offset = host_node_scan(inode) + node_elem_count(inode);
-
-      host_node_elem( offset , 0 ) = i ;
-      host_node_elem( offset , 1 ) = j ;
-
-      ++node_elem_count(inode);
-    }
-  }
-
-  Kokkos::deep_copy( node_scan , host_node_scan );
-  Kokkos::deep_copy( node_elem , host_node_elem );
-}
-
-} /* namespace Example */
-} /* namespace Kokkos */
-
-#endif /* #ifndef KOKKOS_EXAMPLE_FEINT_FUNCTORS_HPP */
-
diff --git a/lib/kokkos/example/feint/Makefile b/lib/kokkos/example/feint/Makefile
deleted file mode 100644
index 61ddb3e276..0000000000
--- a/lib/kokkos/example/feint/Makefile
+++ /dev/null
@@ -1,71 +0,0 @@
-KOKKOS_PATH = ../..
-KOKKOS_SRC_PATH = ${KOKKOS_PATH}
-vpath %.cpp ${KOKKOS_SRC_PATH}/example/fixture ${KOKKOS_SRC_PATH}/example/feint
-
-EXAMPLE_HEADERS = $(wildcard $(KOKKOS_SRC_PATH)/example/common/*.hpp ${KOKKOS_SRC_PATH}/example/fixture/*.hpp ${KOKKOS_SRC_PATH}/example/feint/*.hpp)
-
-default: build_all
-	echo "End Build"
-
-ifneq (,$(findstring Cuda,$(KOKKOS_DEVICES)))
-  CXX = $(KOKKOS_PATH)/bin/nvcc_wrapper
-else
-  CXX = g++
-endif
-
-CXXFLAGS = -O3
-LINK ?= $(CXX)
-LDFLAGS ?= 
-
-include $(KOKKOS_PATH)/Makefile.kokkos        
-
-KOKKOS_CXXFLAGS +=	\
-	-I${KOKKOS_SRC_PATH}/example/common	\
-	-I${KOKKOS_SRC_PATH}/example/fixture	\
-	-I${KOKKOS_SRC_PATH}/example/feint
-
-EXE_EXAMPLE_FEINT = KokkosExample_Feint
-OBJ_EXAMPLE_FEINT = BoxElemPart.o main.o
-
-ifeq ($(KOKKOS_INTERNAL_USE_SERIAL), 1)
-  OBJ_EXAMPLE_FEINT += feint_serial.o
-endif
-
-ifeq ($(KOKKOS_INTERNAL_USE_CUDA), 1)
-  OBJ_EXAMPLE_FEINT += feint_cuda.o
-endif
-
-ifeq ($(KOKKOS_INTERNAL_USE_ROCM), 1)
-  OBJ_EXAMPLE_FEINT += feint_rocm.o
-endif
-
-ifeq ($(KOKKOS_INTERNAL_USE_PTHREADS), 1)
-  OBJ_EXAMPLE_FEINT += feint_threads.o
-endif
-
-ifeq ($(KOKKOS_INTERNAL_USE_OPENMP), 1)
-  OBJ_EXAMPLE_FEINT += feint_openmp.o
-endif
-
-ifeq ($(KOKKOS_INTERNAL_USE_HPX), 1)
-  OBJ_EXAMPLE_FEINT += feint_hpx.o
-endif
-
-TARGETS = $(EXE_EXAMPLE_FEINT)
-
-#TEST_TARGETS =
-
-$(EXE_EXAMPLE_FEINT) : $(OBJ_EXAMPLE_FEINT) $(KOKKOS_LINK_DEPENDS)
-	$(LINK) $(KOKKOS_LDFLAGS) $(LDFLAGS) $(EXTRA_PATH) $(OBJ_EXAMPLE_FEINT) $(KOKKOS_LIBS) $(LIB) -o $(EXE_EXAMPLE_FEINT)
-
-build_all : $(TARGETS)
-
-test : build_all
-
-clean: kokkos-clean
-	rm -f *.o $(TARGETS)
-
-# Compilation rules
-
-%.o:%.cpp $(KOKKOS_CPP_DEPENDS) $(EXAMPLE_HEADERS)
-	$(CXX) $(KOKKOS_CPPFLAGS) $(KOKKOS_CXXFLAGS) $(CXXFLAGS) $(EXTRA_INC) -c $<
diff --git a/lib/kokkos/example/feint/feint.hpp b/lib/kokkos/example/feint/feint.hpp
deleted file mode 100644
index 1be8762a85..0000000000
--- a/lib/kokkos/example/feint/feint.hpp
+++ /dev/null
@@ -1,165 +0,0 @@
-/*
-//@HEADER
-// ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
-// the U.S. Government retains certain rights in this software.
-// 
-// 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 Corporation nor the names of the
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "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 SANDIA CORPORATION OR THE
-// 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.
-//
-// Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
-// ************************************************************************
-//@HEADER
-*/
-
-#ifndef KOKKOS_EXAMPLE_FEINT_HPP
-#define KOKKOS_EXAMPLE_FEINT_HPP
-
-#include <iostream>
-#include <BoxElemFixture.hpp>
-#include <ElemFunctor.hpp>
-#include <feint_fwd.hpp>
-
-namespace Kokkos {
-namespace Example {
-
-/** \brief  Vector valued function to numerically integrate.
- *
- *  F(X) = { 1 , x , y , z , x*y , y*z , z*x , x*y*z }
- *
- *  Integrates on a unit cube to:
- *    { 1 , 1/2 , 1/2 , 1/2 , 1/4 , 1/4 , 1/4 , 1/8 }
- */
-struct MyFunctionType {
-
-  enum { value_count = 8 };
-
-  // Evaluate function at coordinate.
-  template< typename CoordType , typename ValueType >
-  KOKKOS_INLINE_FUNCTION
-  void operator()( const CoordType point[] , ValueType value[] ) const
-    {
-      value[0] = 1 ;
-      value[1] = point[0] ;
-      value[2] = point[1] ;
-      value[3] = point[2] ;
-      value[4] = point[0] * point[1] ;
-      value[5] = point[1] * point[2] ;
-      value[6] = point[2] * point[0] ;
-      value[7] = point[0] * point[1] * point[2] ;
-    }
-};
-
-template < class Device , bool UseAtomic >
-void feint(
-  const unsigned global_elem_nx ,
-  const unsigned global_elem_ny ,
-  const unsigned global_elem_nz )
-{
-  //----------------------------------------
-  // Create the unstructured finite element mesh box fixture on the device:
-
-  typedef Kokkos::Example::
-    BoxElemFixture< Device , Kokkos::Example::BoxElemPart::ElemLinear >
-    // BoxElemFixture< Device , Kokkos::Example::BoxElemPart::ElemQuadratic >
-      BoxFixtureType ;
-
-  // MPI distributed parallel domain decomposition of the fixture.
-  // Either by element (DecomposeElem) or by node (DecomposeNode)
-  // with ghosted elements.
-
-  static const Kokkos::Example::BoxElemPart::Decompose
-    decompose = Kokkos::Example::BoxElemPart:: DecomposeElem ;
-    // decompose = Kokkos::Example::BoxElemPart:: DecomposeNode ;
-
-  // Not using MPI in this example.
-  const unsigned mpi_rank = 0 ;
-  const unsigned mpi_size = 1 ;
-
-  const BoxFixtureType fixture( decompose , mpi_size , mpi_rank ,
-                                global_elem_nx ,
-                                global_elem_ny ,
-                                global_elem_nz );
-
-  //----------------------------------------
-  // Create and execute the numerical integration functor on the device:
-
-  typedef Kokkos::Example::
-    FiniteElementIntegration< BoxFixtureType , MyFunctionType , UseAtomic >
-      FeintType ;
-
-  const FeintType feint( fixture , MyFunctionType() );
-
-  typename FeintType::value_type elem_integral ;
-
-  // A reduction for the global integral:
-  Kokkos::parallel_reduce( fixture.elem_count() , feint , elem_integral );
-
-  if ( elem_integral.error ) {
-    std::cout << "An element had a spatial jacobian error" << std::endl ;
-    return ;
-  }
-
-  std::cout << "Elem integral =" ;
-  for ( int i = 0 ; i < MyFunctionType::value_count ; ++i ) {
-    std::cout << " " << elem_integral.value[i] ;
-  }
-  std::cout << std::endl ;
- 
-  //----------------------------------------
-  // Create and execute the nodal lumped value projection and reduction functor:
-
-  typedef Kokkos::Example::
-    LumpElemToNode< typename FeintType::NodeValueType ,
-                    typename FeintType::ElemValueType ,
-                    UseAtomic > LumpType ;
-
-  const LumpType lump( feint.m_node_lumped ,
-                       feint.m_elem_integral ,
-                       fixture.elem_node() );
-
-  typename LumpType ::value_type node_sum ;
-
-  Kokkos::parallel_reduce( fixture.node_count() , lump , node_sum );
-
-  std::cout << "Node lumped sum =" ;
-  for ( int i = 0 ; i < MyFunctionType::value_count ; ++i ) {
-    std::cout << " " << node_sum.value[i] ;
-  }
-  std::cout << std::endl ;
-}
-
-} /* namespace Example */
-} /* namespace Kokkos */
-
-#endif /* #ifndef KOKKOS_EXAMPLE_FEINT_HPP */
-
diff --git a/lib/kokkos/example/feint/feint_cuda.cpp b/lib/kokkos/example/feint/feint_cuda.cpp
deleted file mode 100644
index c2f4a68e42..0000000000
--- a/lib/kokkos/example/feint/feint_cuda.cpp
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
-//@HEADER
-// ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
-// the U.S. Government retains certain rights in this software.
-// 
-// 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 Corporation nor the names of the
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "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 SANDIA CORPORATION OR THE
-// 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.
-//
-// Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
-// ************************************************************************
-//@HEADER
-*/
-
-#include <Kokkos_Core.hpp>
-
-#if defined( KOKKOS_ENABLE_CUDA )
-
-#include <feint.hpp>
-
-namespace Kokkos {
-namespace Example {
-
-template void feint<Kokkos::Cuda,false>(
-  const unsigned global_elem_nx ,
-  const unsigned global_elem_ny ,
-  const unsigned global_elem_nz );
-
-template void feint<Kokkos::Cuda,true>(
-  const unsigned global_elem_nx ,
-  const unsigned global_elem_ny ,
-  const unsigned global_elem_nz );
-
-} /* namespace Example */
-} /* namespace Kokkos */
-
-#endif
-
diff --git a/lib/kokkos/example/feint/feint_hpx.cpp b/lib/kokkos/example/feint/feint_hpx.cpp
deleted file mode 100644
index 12e1a5af4e..0000000000
--- a/lib/kokkos/example/feint/feint_hpx.cpp
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
-//@HEADER
-// ************************************************************************
-//
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
-// the U.S. Government retains certain rights in this software.
-//
-// 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 Corporation nor the names of the
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "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 SANDIA CORPORATION OR THE
-// 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.
-//
-// Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-//
-// ************************************************************************
-//@HEADER
-*/
-
-#include <Kokkos_Core.hpp>
-
-#if defined(KOKKOS_ENABLE_HPX)
-
-#include <feint.hpp>
-
-namespace Kokkos {
-namespace Example {
-
-template void feint<Kokkos::Experimental::HPX, false>(
-  const unsigned global_elem_nx ,
-  const unsigned global_elem_ny ,
-  const unsigned global_elem_nz );
-
-template void feint<Kokkos::Experimental::HPX, true>(
-  const unsigned global_elem_nx ,
-  const unsigned global_elem_ny ,
-  const unsigned global_elem_nz );
-
-} /* namespace Example */
-} /* namespace Kokkos */
-
-#endif /* #if defined( KOKKOS_ENABLE_HPX ) */
-
diff --git a/lib/kokkos/example/feint/feint_rocm.cpp b/lib/kokkos/example/feint/feint_rocm.cpp
deleted file mode 100644
index 65debe44d1..0000000000
--- a/lib/kokkos/example/feint/feint_rocm.cpp
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
-//@HEADER
-// ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
-// the U.S. Government retains certain rights in this software.
-// 
-// 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 Corporation nor the names of the
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "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 SANDIA CORPORATION OR THE
-// 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.
-//
-// Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
-// ************************************************************************
-//@HEADER
-*/
-
-#include <Kokkos_Core.hpp>
-
-#if defined( KOKKOS_ENABLE_ROCM )
-
-#include <feint.hpp>
-
-namespace Kokkos {
-namespace Example {
-
-template void feint<Kokkos::Experimental::ROCm,false>(
-  const unsigned global_elem_nx ,
-  const unsigned global_elem_ny ,
-  const unsigned global_elem_nz );
-
-template void feint<Kokkos::Experimental::ROCm,true>(
-  const unsigned global_elem_nx ,
-  const unsigned global_elem_ny ,
-  const unsigned global_elem_nz );
-
-} /* namespace Example */
-} /* namespace Kokkos */
-
-#endif
-
diff --git a/lib/kokkos/example/feint/feint_threads.cpp b/lib/kokkos/example/feint/feint_threads.cpp
deleted file mode 100644
index 560dbf8874..0000000000
--- a/lib/kokkos/example/feint/feint_threads.cpp
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
-//@HEADER
-// ************************************************************************
-//
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
-// the U.S. Government retains certain rights in this software.
-//
-// 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 Corporation nor the names of the
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "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 SANDIA CORPORATION OR THE
-// 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.
-//
-// Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-//
-// ************************************************************************
-//@HEADER
-*/
-
-#include <Kokkos_Core.hpp>
-
-#if defined( KOKKOS_ENABLE_THREADS )
-
-#include <feint.hpp>
-
-namespace Kokkos {
-namespace Example {
-
-template void feint< Kokkos::Threads ,false>(
-  const unsigned global_elem_nx ,
-  const unsigned global_elem_ny ,
-  const unsigned global_elem_nz );
-
-template void feint< Kokkos::Threads ,true>(
-  const unsigned global_elem_nx ,
-  const unsigned global_elem_ny ,
-  const unsigned global_elem_nz );
-
-} /* namespace Example */
-} /* namespace Kokkos */
-
-#endif /* #if defined( KOKKOS_ENABLE_THREADS ) */
-
diff --git a/lib/kokkos/example/fenl/CGSolve.hpp b/lib/kokkos/example/fenl/CGSolve.hpp
deleted file mode 100644
index 276c18e4d7..0000000000
--- a/lib/kokkos/example/fenl/CGSolve.hpp
+++ /dev/null
@@ -1,300 +0,0 @@
-/*
-//@HEADER
-// ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
-// the U.S. Government retains certain rights in this software.
-// 
-// 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 Corporation nor the names of the
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "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 SANDIA CORPORATION OR THE
-// 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.
-//
-// Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
-// ************************************************************************
-//@HEADER
-*/
-
-#ifndef KOKKOS_EXAMPLE_CG_SOLVE
-#define KOKKOS_EXAMPLE_CG_SOLVE
-
-#include <cmath>
-#include <limits>
-#include <Kokkos_Core.hpp>
-#include <impl/Kokkos_Timer.hpp>
-
-#include <WrapMPI.hpp>
-
-//----------------------------------------------------------------------------
-//----------------------------------------------------------------------------
-
-namespace Kokkos {
-namespace Example {
-
-template< typename ValueType , class Space >
-struct CrsMatrix {
-#ifdef KOKKOS_ENABLE_DEPRECATED_CODE
-  typedef Kokkos::StaticCrsGraph< unsigned , Space , void , unsigned , void >  StaticCrsGraphType ;
-#else
-  typedef Kokkos::StaticCrsGraph< unsigned , Space , void , void , unsigned >  StaticCrsGraphType ;
-#endif
-  typedef View< ValueType * , Space > coeff_type ;
-
-  StaticCrsGraphType  graph ;
-  coeff_type          coeff ;
-
-  CrsMatrix() : graph(), coeff() {}
-
-  CrsMatrix( const StaticCrsGraphType & arg_graph )
-    : graph( arg_graph )
-    , coeff( "crs_matrix_coeff" , arg_graph.entries.extent(0) )
-    {}
-};
-
-template< typename MScalar 
-        , typename VScalar
-        , class Space >
-struct Multiply {
-
-  const Example::CrsMatrix< MScalar , Space >    m_A ;
-  const Kokkos::View< const VScalar * , Space > m_x ;
-  const Kokkos::View<       VScalar * , Space > m_y ;
-
-  KOKKOS_INLINE_FUNCTION
-  void operator()( const int iRow ) const
-    {
-      const int iEntryBegin = m_A.graph.row_map[iRow];
-      const int iEntryEnd   = m_A.graph.row_map[iRow+1];
-
-      double sum = 0 ;
-
-      for ( int iEntry = iEntryBegin ; iEntry < iEntryEnd ; ++iEntry ) {
-        sum += m_A.coeff(iEntry) * m_x( m_A.graph.entries(iEntry) );
-      }
-
-      m_y(iRow) = sum ;
-    }
-
-  Multiply( const View<       VScalar * , Space > & y 
-          , const CrsMatrix< MScalar , Space >    & A 
-          , const View< const VScalar * , Space > & x 
-          )
-  : m_A( A ), m_x( x ), m_y( y )
-  {}
-};
-
-template< typename MScalar
-        , typename VScalar
-        , class Space >
-inline
-void multiply( const int nrow
-             , const Kokkos::View< VScalar * , Space >    & y
-             , const Example::CrsMatrix< MScalar , Space > & A
-             , const Kokkos::View< VScalar * , Space >    & x
-             )
-{
-  Kokkos::parallel_for( Kokkos::RangePolicy<Space>(0,nrow), Multiply<MScalar,VScalar,Space>( y , A , x ) );
-}
-
-template< typename ValueType , class Space >
-struct WAXPBY {
-  const Kokkos::View< const ValueType * , Space >  m_x ;
-  const Kokkos::View< const ValueType * , Space >  m_y ;
-  const Kokkos::View<       ValueType * , Space >  m_w ;
-  const double m_alpha ;
-  const double m_beta ;
-
-  KOKKOS_INLINE_FUNCTION
-  void operator()( const int i ) const
-    { m_w(i) = m_alpha * m_x(i) + m_beta * m_y(i); }
-
-  WAXPBY( const View< ValueType * , Space >  & arg_w
-        , const double arg_alpha
-        , const View< ValueType * , Space >  & arg_x
-        , const double arg_beta
-        , const View< ValueType * , Space >  & arg_y
-        )
-    : m_x( arg_x )
-    , m_y( arg_y )
-    , m_w( arg_w )
-    , m_alpha( arg_alpha )
-    , m_beta( arg_beta )
-    {}
-};
-
-template< typename VScalar , class Space >
-void waxpby( const int n
-           , const Kokkos::View< VScalar * , Space > & arg_w
-           , const double                      arg_alpha
-           , const Kokkos::View< VScalar * , Space > & arg_x
-           , const double                      arg_beta
-           , const Kokkos::View< VScalar * , Space > & arg_y
-           )
-{
-  Kokkos::parallel_for( Kokkos::RangePolicy<Space>(0,n), WAXPBY<VScalar,Space>(arg_w,arg_alpha,arg_x,arg_beta,arg_y) );
-}
-
-template< typename VScalar , class Space >
-struct Dot {
-  typedef double value_type ;
-
-  const Kokkos::View< const VScalar * , Space >  m_x ;
-  const Kokkos::View< const VScalar * , Space >  m_y ;
-
-  KOKKOS_INLINE_FUNCTION
-  void operator()( const int i , value_type & update ) const
-    { update += m_x(i) * m_y(i); }
-
-  Dot( const Kokkos::View< VScalar * , Space >  & arg_x
-     , const Kokkos::View< VScalar * , Space >  & arg_y
-     )
-    : m_x(arg_x), m_y(arg_y) {}
-};
-
-template< typename VScalar , class Space >
-double dot( const int n
-          , const Kokkos::View< VScalar * , Space > & arg_x
-          , const Kokkos::View< VScalar * , Space > & arg_y
-          )
-{
-  double result = 0 ;
-  Kokkos::parallel_reduce( Kokkos::RangePolicy<Space>(0,n) , Dot<VScalar,Space>( arg_x , arg_y ) , result );
-  return result ;
-}
-
-} // namespace Example
-} // namespace Kokkos
-
-//----------------------------------------------------------------------------
-//----------------------------------------------------------------------------
-
-namespace Kokkos {
-namespace Example {
-
-struct CGSolveResult {
-  size_t  iteration ;
-  double  iter_time ;
-  double  matvec_time ;
-  double  norm_res ;
-};
-
-template< class ImportType
-        , typename MScalar
-        , typename VScalar
-        , class Space
-        >
-inline
-void cgsolve( const ImportType & import
-            , const CrsMatrix< MScalar , Space >      & A
-            , const Kokkos::View< VScalar * , Space > & b
-            , const Kokkos::View< VScalar * , Space > & x
-            , const size_t  maximum_iteration = 200
-            , const double  tolerance = std::numeric_limits<double>::epsilon()
-            , CGSolveResult * result = 0
-            )
-{
-  typedef View< VScalar * , Space >  VectorType ;
-
-  const size_t count_owned = import.count_owned ;
-  const size_t count_total = import.count_owned + import.count_receive;
-
-  size_t  iteration = 0 ;
-  double  iter_time = 0 ;
-  double  matvec_time = 0 ;
-  double  norm_res = 0 ;
-
-  // Need input vector to matvec to be owned + received
-  VectorType pAll ( "cg::p" , count_total );
-
-  VectorType p = Kokkos::subview( pAll , std::pair<size_t,size_t>(0,count_owned) );
-  VectorType r ( "cg::r" , count_owned );
-  VectorType Ap( "cg::Ap", count_owned );
-
-  /* r = b - A * x ; */
-
-  /* p  = x       */  Kokkos::deep_copy( p , x );
-  /* import p     */  import( pAll );
-  /* Ap = A * p   */  multiply( count_owned , Ap , A , pAll );
-  /* r = b - Ap   */  waxpby( count_owned , r , 1.0 , b , -1.0 , Ap );
-  /* p  = r       */  Kokkos::deep_copy( p , r );
-
-  double old_rdot = Kokkos::Example::all_reduce( dot( count_owned , r , r ) , import.comm );
-
-  norm_res  = std::sqrt( old_rdot );
-  iteration = 0 ;
-
-  Kokkos::Timer wall_clock ;
-  Kokkos::Timer timer;
-
-  while ( tolerance < norm_res && iteration < maximum_iteration ) {
-
-    /* pAp_dot = dot( p , Ap = A * p ) */
-
-    timer.reset();
-    /* import p    */  import( pAll );
-    /* Ap = A * p  */  multiply( count_owned , Ap , A , pAll );
-    Space().fence();
-    matvec_time += timer.seconds();
-
-    const double pAp_dot = Kokkos::Example::all_reduce( dot( count_owned , p , Ap ) , import.comm );
-    const double alpha   = old_rdot / pAp_dot ;
-
-    /* x +=  alpha * p ;  */ waxpby( count_owned , x ,  alpha, p  , 1.0 , x );
-    /* r += -alpha * Ap ; */ waxpby( count_owned , r , -alpha, Ap , 1.0 , r );
-
-    const double r_dot = Kokkos::Example::all_reduce( dot( count_owned , r , r ) , import.comm );
-    const double beta  = r_dot / old_rdot ;
-
-    /* p = r + beta * p ; */ waxpby( count_owned , p , 1.0 , r , beta , p );
-
-    norm_res = std::sqrt( old_rdot = r_dot );
-
-    ++iteration ;
-  }
-
-  Space().fence();
-  iter_time = wall_clock.seconds();
-
-  if ( 0 != result ) {
-    result->iteration   = iteration ;
-    result->iter_time   = iter_time ;
-    result->matvec_time = matvec_time ;
-    result->norm_res    = norm_res ;
-  }
-}
-
-} // namespace Example
-} // namespace Kokkos
-
-//----------------------------------------------------------------------------
-//----------------------------------------------------------------------------
-
-#endif /* #ifndef KOKKOS_EXAMPLE_CG_SOLVE */
-
-
diff --git a/lib/kokkos/example/fenl/CMakeLists.txt b/lib/kokkos/example/fenl/CMakeLists.txt
deleted file mode 100644
index 150656b16e..0000000000
--- a/lib/kokkos/example/fenl/CMakeLists.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-
-INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR})
-INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR})
-INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../common)
-INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../fixture)
-
-SET(SOURCES "")
-
-FILE( GLOB SOURCES *.cpp )
-
-LIST( APPEND SOURCES ../fixture/BoxElemPart.cpp )
-
-TRIBITS_ADD_EXECUTABLE(
-  fenl
-  SOURCES ${SOURCES}
-  COMM serial mpi
-  )
diff --git a/lib/kokkos/example/fenl/Makefile b/lib/kokkos/example/fenl/Makefile
deleted file mode 100644
index 24a0e61c18..0000000000
--- a/lib/kokkos/example/fenl/Makefile
+++ /dev/null
@@ -1,50 +0,0 @@
-KOKKOS_PATH ?= ../..
-
-MAKEFILE_PATH := $(abspath $(lastword $(MAKEFILE_LIST)))
-SRC_DIR := $(dir $(MAKEFILE_PATH))
-
-vpath %.cpp ${SRC_DIR}/../fixture ${SRC_DIR}
-
-EXAMPLE_HEADERS = $(wildcard $(SRC_DIR)/../common/*.hpp ${SRC_DIR}/../fixture/*.hpp ${SRC_DIR}/*.hpp)
-
-default: build_all
-	echo "End Build"
-
-ifneq (,$(findstring Cuda,$(KOKKOS_DEVICES)))
-  CXX = $(KOKKOS_PATH)/bin/nvcc_wrapper
-else
-  CXX = g++
-endif
-
-CXXFLAGS = -O3
-LINK ?= $(CXX)
-LDFLAGS ?=
-
-include $(KOKKOS_PATH)/Makefile.kokkos
-
-KOKKOS_CXXFLAGS +=	\
-	-I${SRC_DIR}/../common	\
-	-I${SRC_DIR}/../fixture	\
-	-I${SRC_DIR}
-
-EXE_EXAMPLE_FENL = KokkosExample_Fenl
-OBJ_EXAMPLE_FENL = BoxElemPart.o main.o fenl.o
-
-TARGETS = $(EXE_EXAMPLE_FENL)
-
-#TEST_TARGETS =
-
-$(EXE_EXAMPLE_FENL) : $(OBJ_EXAMPLE_FENL) $(KOKKOS_LINK_DEPENDS)
-	$(LINK) $(KOKKOS_LDFLAGS) $(LDFLAGS) $(EXTRA_PATH) $(OBJ_EXAMPLE_FENL) $(KOKKOS_LIBS) $(LIB) -o $(EXE_EXAMPLE_FENL)
-
-build_all : $(TARGETS)
-
-test : build_all
-
-clean: kokkos-clean
-	rm -f *.o $(TARGETS)
-
-# Compilation rules
-
-%.o:%.cpp $(KOKKOS_CPP_DEPENDS) $(EXAMPLE_HEADERS)
-	$(CXX) $(KOKKOS_CPPFLAGS) $(KOKKOS_CXXFLAGS) $(CXXFLAGS) $(EXTRA_INC) -c $<
diff --git a/lib/kokkos/example/fenl/fenl.cpp b/lib/kokkos/example/fenl/fenl.cpp
deleted file mode 100644
index 77c51ab551..0000000000
--- a/lib/kokkos/example/fenl/fenl.cpp
+++ /dev/null
@@ -1,181 +0,0 @@
-/*
-// ************************************************************************
-//
-//   Kokkos: Manycore Performance-Portable Multidimensional Arrays
-//              Copyright (2012) Sandia Corporation
-//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
-// the U.S. Government retains certain rights in this software.
-//
-// 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 Corporation nor the names of the
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "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 SANDIA CORPORATION OR THE
-// 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.
-//
-// Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-//
-// ************************************************************************
-*/
-
-#include <HexElement.hpp>
-#include <fenl_impl.hpp>
-
-namespace Kokkos {
-namespace Example {
-namespace FENL {
-
-#if defined( KOKKOS_ENABLE_THREADS )
-
-template
-Perf fenl< Kokkos::Threads , Kokkos::Example::BoxElemPart::ElemLinear >(
-  MPI_Comm comm ,
-  const int use_print ,
-  const int use_trials ,
-  const int use_atomic ,
-  const int global_elems[] );
-
-
-template
-Perf fenl< Kokkos::Threads , Kokkos::Example::BoxElemPart::ElemQuadratic >(
-  MPI_Comm comm ,
-  const int use_print ,
-  const int use_trials ,
-  const int use_atomic ,
-  const int global_elems[] );
-
-#endif
-
-
-#if defined (KOKKOS_ENABLE_OPENMP)
-
-template
-Perf fenl< Kokkos::OpenMP , Kokkos::Example::BoxElemPart::ElemLinear >(
-  MPI_Comm comm ,
-  const int use_print ,
-  const int use_trials ,
-  const int use_atomic ,
-  const int global_elems[] );
-
-
-template
-Perf fenl< Kokkos::OpenMP , Kokkos::Example::BoxElemPart::ElemQuadratic >(
-  MPI_Comm comm ,
-  const int use_print ,
-  const int use_trials ,
-  const int use_atomic ,
-  const int global_elems[] );
-
-#endif
-
-
-#if defined (KOKKOS_ENABLE_HPX)
-
-template
-Perf fenl< Kokkos::Experimental::HPX , Kokkos::Example::BoxElemPart::ElemLinear >(
-  MPI_Comm comm ,
-  const int use_print ,
-  const int use_trials ,
-  const int use_atomic ,
-  const int global_elems[] );
-
-
-template
-Perf fenl< Kokkos::Experimental::HPX , Kokkos::Example::BoxElemPart::ElemQuadratic >(
-  MPI_Comm comm ,
-  const int use_print ,
-  const int use_trials ,
-  const int use_atomic ,
-  const int global_elems[] );
-
-#endif
-
-#if defined (KOKKOS_ENABLE_SERIAL)
-
-template
-Perf fenl< Kokkos::Serial , Kokkos::Example::BoxElemPart::ElemLinear >(
-  MPI_Comm comm ,
-  const int use_print ,
-  const int use_trials ,
-  const int use_atomic ,
-  const int global_elems[] );
-
-
-template
-Perf fenl< Kokkos::Serial , Kokkos::Example::BoxElemPart::ElemQuadratic >(
-  MPI_Comm comm ,
-  const int use_print ,
-  const int use_trials ,
-  const int use_atomic ,
-  const int global_elems[] );
-
-#endif
-
-#if defined( KOKKOS_ENABLE_CUDA )
-
-template
-Perf fenl< Kokkos::Cuda , Kokkos::Example::BoxElemPart::ElemLinear >(
-  MPI_Comm comm ,
-  const int use_print ,
-  const int use_trials ,
-  const int use_atomic ,
-  const int global_elems[] );
-
-
-template
-Perf fenl< Kokkos::Cuda , Kokkos::Example::BoxElemPart::ElemQuadratic >(
-  MPI_Comm comm ,
-  const int use_print ,
-  const int use_trials ,
-  const int use_atomic ,
-  const int global_elems[] );
-
-#endif
-
-#if defined( KOKKOS_ENABLE_ROCM )
-
-template
-Perf fenl< Kokkos::Experimental::ROCm , Kokkos::Example::BoxElemPart::ElemLinear >(
-  MPI_Comm comm ,
-  const int use_print ,
-  const int use_trials ,
-  const int use_atomic ,
-  const int global_elems[] );
-
-
-template
-Perf fenl< Kokkos::Experimental::ROCm , Kokkos::Example::BoxElemPart::ElemQuadratic >(
-  MPI_Comm comm ,
-  const int use_print ,
-  const int use_trials ,
-  const int use_atomic ,
-  const int global_elems[] );
-
-#endif
-
-
-} /* namespace FENL */
-} /* namespace Example */
-} /* namespace Kokkos */
-
diff --git a/lib/kokkos/example/fenl/fenl.hpp b/lib/kokkos/example/fenl/fenl.hpp
deleted file mode 100644
index f97a4c76b3..0000000000
--- a/lib/kokkos/example/fenl/fenl.hpp
+++ /dev/null
@@ -1,89 +0,0 @@
-/*
-//@HEADER
-// ************************************************************************
-//
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
-// the U.S. Government retains certain rights in this software.
-//
-// 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 Corporation nor the names of the
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "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 SANDIA CORPORATION OR THE
-// 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.
-//
-// Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-//
-// ************************************************************************
-//@HEADER
-*/
-
-#ifndef KOKKOS_EXAMPLE_FENL_HPP
-#define KOKKOS_EXAMPLE_FENL_HPP
-
-#include <cstdlib>
-#include <BoxElemPart.hpp>
-#include <WrapMPI.hpp>
-
-namespace Kokkos {
-namespace Example {
-namespace FENL {
-
-struct Perf {
-  size_t global_elem_count ;
-  size_t global_node_count ;
-  size_t newton_iter_count ;
-  size_t cg_iter_count ;
-  double map_ratio ;
-  double fill_node_set ;
-  double scan_node_count ;
-  double fill_graph_entries ;
-  double sort_graph_entries ;
-  double fill_element_graph ;
-  double create_sparse_matrix ;
-  double fill_time ;
-  double bc_time ;
-  double matvec_time ;
-  double cg_time ;
-  double newton_residual ;
-  double error_max ;
-
-};
-
-template < class Device , BoxElemPart::ElemOrder ElemOrder >
-Perf fenl(
-  MPI_Comm comm ,
-  const int use_print ,
-  const int use_trials ,
-  const int use_atomic ,
-  const int global_elems[] );
-
-} /* namespace FENL */
-} /* namespace Example */
-} /* namespace Kokkos */
-
-#endif /* #ifndef KOKKOS_EXAMPLE_FENL_HPP */
-
diff --git a/lib/kokkos/example/fenl/fenl_functors.hpp b/lib/kokkos/example/fenl/fenl_functors.hpp
deleted file mode 100644
index 96c89de29b..0000000000
--- a/lib/kokkos/example/fenl/fenl_functors.hpp
+++ /dev/null
@@ -1,1173 +0,0 @@
-/*
-//@HEADER
-// ************************************************************************
-//
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
-// the U.S. Government retains certain rights in this software.
-//
-// 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 Corporation nor the names of the
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "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 SANDIA CORPORATION OR THE
-// 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.
-//
-// Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-//
-// ************************************************************************
-//@HEADER
-*/
-
-#ifndef KOKKOS_EXAMPLE_FENLFUNCTORS_HPP
-#define KOKKOS_EXAMPLE_FENLFUNCTORS_HPP
-
-#include <cstdio>
-
-#include <iostream>
-#include <fstream>
-#include <iomanip>
-#include <cstdlib>
-#include <cmath>
-#include <limits>
-
-#include <Kokkos_Pair.hpp>
-#include <Kokkos_UnorderedMap.hpp>
-
-#include <impl/Kokkos_Timer.hpp>
-
-#include <BoxElemFixture.hpp>
-#include <HexElement.hpp>
-#include <CGSolve.hpp>
-
-//----------------------------------------------------------------------------
-//----------------------------------------------------------------------------
-
-namespace Kokkos {
-namespace Example {
-namespace FENL {
-
-template< class ElemNodeIdView , class CrsGraphType , unsigned ElemNode >
-class NodeNodeGraph {
-public:
-
-  typedef typename ElemNodeIdView::execution_space  execution_space ;
-  typedef pair<unsigned,unsigned> key_type ;
-
-  typedef Kokkos::UnorderedMap< key_type, void , execution_space >  SetType ;
-  typedef typename CrsGraphType::row_map_type::non_const_type       RowMapType ;
-  typedef Kokkos::View< unsigned ,  execution_space >               UnsignedValue ;
-
-  // Static dimensions of 0 generate compiler warnings or errors.
-  typedef Kokkos::View< unsigned*[ElemNode][ElemNode] , execution_space >
-    ElemGraphType ;
-
-  struct TagFillNodeSet {};
-  struct TagScanNodeCount {};
-  struct TagFillGraphEntries {};
-  struct TagSortGraphEntries {};
-  struct TagFillElementGraph {};
-
-private:
-
-  enum PhaseType { FILL_NODE_SET ,
-                   SCAN_NODE_COUNT ,
-                   FILL_GRAPH_ENTRIES ,
-                   SORT_GRAPH_ENTRIES ,
-                   FILL_ELEMENT_GRAPH };
-
-  const unsigned        node_count ;
-  const ElemNodeIdView  elem_node_id ;
-  UnsignedValue         row_total ;
-  RowMapType            row_count ;
-  RowMapType            row_map ;
-  SetType               node_node_set ;
-  PhaseType             phase ;
-
-public:
-
-  CrsGraphType          graph ;
-  ElemGraphType         elem_graph ;
-
-  struct Times
-  {
-    double ratio;
-    double fill_node_set;
-    double scan_node_count;
-    double fill_graph_entries;
-    double sort_graph_entries;
-    double fill_element_graph;
-  };
-
-  NodeNodeGraph( const ElemNodeIdView & arg_elem_node_id ,
-                 const unsigned         arg_node_count,
-                 Times & results
-               )
-    : node_count(arg_node_count)
-    , elem_node_id( arg_elem_node_id )
-    , row_total( "row_total" )
-    , row_count(Kokkos::ViewAllocateWithoutInitializing("row_count") , node_count ) // will deep_copy to 0 inside loop
-    , row_map( "graph_row_map" , node_count + 1 )
-    , node_node_set()
-    , phase( FILL_NODE_SET )
-    , graph()
-    , elem_graph()
-   {
-      //--------------------------------
-      // Guess at capacity required for the map:
-
-      Kokkos::Timer wall_clock ;
-
-      wall_clock.reset();
-      phase = FILL_NODE_SET ;
-
-      // upper bound on the capacity
-      size_t set_capacity = (28ull * node_count) / 2;
-      unsigned failed_insert_count = 0 ;
-
-      do {
-        // Zero the row count to restart the fill
-        Kokkos::deep_copy( row_count , 0u );
-
-        node_node_set = SetType( ( set_capacity += failed_insert_count ) );
-
-        // May be larger that requested:
-        set_capacity = node_node_set.capacity();
-
-        Kokkos::parallel_reduce( Kokkos::RangePolicy<execution_space,TagFillNodeSet>(0,elem_node_id.extent(0))
-                               , *this
-                               , failed_insert_count );
-
-      } while ( failed_insert_count );
-
-      execution_space().fence();
-      results.ratio = (double)node_node_set.size() / (double)node_node_set.capacity();
-      results.fill_node_set = wall_clock.seconds();
-      //--------------------------------
-
-      wall_clock.reset();
-      phase = SCAN_NODE_COUNT ;
-
-      // Exclusive scan of row_count into row_map
-      // including the final total in the 'node_count + 1' position.
-      // Zero the 'row_count' values.
-      Kokkos::parallel_scan( node_count , *this );
-
-      // Zero the row count for the fill:
-      Kokkos::deep_copy( row_count , 0u );
-
-      unsigned graph_entry_count = 0 ;
-
-      Kokkos::deep_copy( graph_entry_count , row_total );
-
-      // Assign graph's row_map and allocate graph's entries
-      graph.row_map = row_map ;
-      graph.entries = typename CrsGraphType::entries_type( "graph_entries" , graph_entry_count );
-
-      //--------------------------------
-      // Fill graph's entries from the (node,node) set.
-
-      execution_space().fence();
-      results.scan_node_count = wall_clock.seconds();
-
-      wall_clock.reset();
-      phase = FILL_GRAPH_ENTRIES ;
-      Kokkos::parallel_for( node_node_set.capacity() , *this );
-
-      execution_space().fence();
-      results.fill_graph_entries = wall_clock.seconds();
-
-      //--------------------------------
-      // Done with the temporary sets and arrays
-      wall_clock.reset();
-      phase = SORT_GRAPH_ENTRIES ;
-
-      row_total = UnsignedValue();
-      row_count = RowMapType();
-      row_map   = RowMapType();
-      node_node_set.clear();
-
-      //--------------------------------
-
-      Kokkos::parallel_for( node_count , *this );
-
-      execution_space().fence();
-      results.sort_graph_entries = wall_clock.seconds();
-
-      //--------------------------------
-      // Element-to-graph mapping:
-      wall_clock.reset();
-      phase = FILL_ELEMENT_GRAPH ;
-      elem_graph = ElemGraphType("elem_graph", elem_node_id.extent(0) );
-      Kokkos::parallel_for( elem_node_id.extent(0) , *this );
-
-      execution_space().fence();
-      results.fill_element_graph = wall_clock.seconds();
-    }
-
-  //------------------------------------
-  // parallel_for: create map and count row length
-
-  KOKKOS_INLINE_FUNCTION
-  void operator()( const TagFillNodeSet & , unsigned ielem , unsigned & count ) const
-  {
-    // Loop over element's (row_local_node,col_local_node) pairs:
-    for ( unsigned row_local_node = 0 ; row_local_node < elem_node_id.extent(1) ; ++row_local_node ) {
-
-      const unsigned row_node = elem_node_id( ielem , row_local_node );
-
-      for ( unsigned col_local_node = row_local_node ; col_local_node < elem_node_id.extent(1) ; ++col_local_node ) {
-
-        const unsigned col_node = elem_node_id( ielem , col_local_node );
-
-        // If either node is locally owned then insert the pair into the unordered map:
-
-        if ( row_node < row_count.extent(0) || col_node < row_count.extent(0) ) {
-
-          const key_type key = (row_node < col_node) ? make_pair( row_node, col_node ) : make_pair( col_node, row_node ) ;
-
-          const typename SetType::insert_result result = node_node_set.insert( key );
-
-          // A successfull insert: the first time this pair was added
-          if ( result.success() ) {
-
-            // If row node is owned then increment count
-            if ( row_node < row_count.extent(0) ) { atomic_fetch_add( & row_count( row_node ) , 1 ); }
-
-            // If column node is owned and not equal to row node then increment count
-            if ( col_node < row_count.extent(0) && col_node != row_node ) { atomic_fetch_add( & row_count( col_node ) , 1 ); }
-          }
-          else if ( result.failed() ) {
-            ++count ;
-          }
-        }
-      }
-    }
-  }
-
-  KOKKOS_INLINE_FUNCTION
-  void fill_graph_entries( const unsigned iset ) const
-  {
-    if ( node_node_set.valid_at(iset) ) {
-      // Add each entry to the graph entries.
-
-      const key_type key = node_node_set.key_at(iset) ;
-      const unsigned row_node = key.first ;
-      const unsigned col_node = key.second ;
-
-      if ( row_node < row_count.extent(0) ) {
-        const unsigned offset = graph.row_map( row_node ) + atomic_fetch_add( & row_count( row_node ) , 1 );
-        graph.entries( offset ) = col_node ;
-      }
-
-      if ( col_node < row_count.extent(0) && col_node != row_node ) {
-        const unsigned offset = graph.row_map( col_node ) + atomic_fetch_add( & row_count( col_node ) , 1 );
-        graph.entries( offset ) = row_node ;
-      }
-    }
-  }
-
-  KOKKOS_INLINE_FUNCTION
-  void sort_graph_entries( const unsigned irow ) const
-  {
-    const unsigned row_beg = graph.row_map( irow );
-    const unsigned row_end = graph.row_map( irow + 1 );
-    for ( unsigned i = row_beg + 1 ; i < row_end ; ++i ) {
-      const unsigned col = graph.entries(i);
-      unsigned j = i ;
-      for ( ; row_beg < j && col < graph.entries(j-1) ; --j ) {
-        graph.entries(j) = graph.entries(j-1);
-      }
-      graph.entries(j) = col ;
-    }
-  }
-
-  KOKKOS_INLINE_FUNCTION
-  void fill_elem_graph_map( const unsigned ielem ) const
-  {
-    for ( unsigned row_local_node = 0 ; row_local_node < elem_node_id.extent(1) ; ++row_local_node ) {
-
-      const unsigned row_node = elem_node_id( ielem , row_local_node );
-
-      for ( unsigned col_local_node = 0 ; col_local_node < elem_node_id.extent(1) ; ++col_local_node ) {
-
-        const unsigned col_node = elem_node_id( ielem , col_local_node );
-
-        unsigned entry = ~0u ;
-
-        if ( row_node + 1 < graph.row_map.extent(0) ) {
-
-          const unsigned entry_end = graph.row_map( row_node + 1 );
-
-          entry = graph.row_map( row_node );
-
-          for ( ; entry < entry_end && graph.entries(entry) != col_node ; ++entry );
-
-          if ( entry == entry_end ) entry = ~0u ;
-        }
-
-        elem_graph( ielem , row_local_node , col_local_node ) = entry ;
-      }
-    }
-  }
-
-  KOKKOS_INLINE_FUNCTION
-  void operator()( const unsigned iwork ) const
-  {
-/*
-    if ( phase == FILL_NODE_SET ) {
-      operator()( TagFillNodeSet() , iwork );
-    }
-    else */
-    if ( phase == FILL_GRAPH_ENTRIES ) {
-      fill_graph_entries( iwork );
-    }
-    else if ( phase == SORT_GRAPH_ENTRIES ) {
-      sort_graph_entries( iwork );
-    }
-    else if ( phase == FILL_ELEMENT_GRAPH ) {
-      fill_elem_graph_map( iwork );
-    }
-  }
-
-  //------------------------------------
-  // parallel_scan: row offsets
-
-  typedef unsigned value_type ;
-
-  KOKKOS_INLINE_FUNCTION
-  void operator()( const unsigned irow , unsigned & update , const bool final ) const
-  {
-    // exclusive scan
-    if ( final ) { row_map( irow ) = update ; }
-
-    update += row_count( irow );
-
-    if ( final ) {
-      if ( irow + 1 == row_count.extent(0) ) {
-        row_map( irow + 1 ) = update ;
-        row_total()         = update ;
-      }
-    }
-  }
-
-  // For the reduce phase:
-  KOKKOS_INLINE_FUNCTION
-  void init( const TagFillNodeSet & , unsigned & update ) const { update = 0 ; }
-
-  KOKKOS_INLINE_FUNCTION
-  void join( const TagFillNodeSet &
-           , volatile       unsigned & update
-           , volatile const unsigned & input ) const { update += input ; }
-
-  // For the scan phase::
-  KOKKOS_INLINE_FUNCTION
-  void init( unsigned & update ) const { update = 0 ; }
-
-  KOKKOS_INLINE_FUNCTION
-  void join( volatile       unsigned & update
-           , volatile const unsigned & input ) const { update += input ; }
-
-  //------------------------------------
-};
-
-} /* namespace FENL */
-} /* namespace Example */
-} /* namespace Kokkos  */
-
-//----------------------------------------------------------------------------
-
-namespace Kokkos {
-namespace Example {
-namespace FENL {
-
-template< class ElemCompType >
-class NodeElemGatherFill {
-public:
-
-  typedef typename ElemCompType::execution_space         execution_space ;
-  typedef typename ElemCompType::vector_type         vector_type ;
-  typedef typename ElemCompType::sparse_matrix_type  sparse_matrix_type ;
-  typedef typename ElemCompType::elem_node_type      elem_node_type ;
-  typedef typename ElemCompType::elem_vectors_type   elem_vectors_type ;
-  typedef typename ElemCompType::elem_matrices_type  elem_matrices_type ;
-  typedef typename ElemCompType::elem_graph_type     elem_graph_type ;
-
-  static const unsigned ElemNodeCount = ElemCompType::ElemNodeCount ;
-
-  //------------------------------------
-
-private:
-
-  typedef Kokkos::StaticCrsGraph< unsigned[2] , execution_space >  CrsGraphType ;
-  typedef typename CrsGraphType::row_map_type::non_const_type  RowMapType ;
-  typedef Kokkos::View< unsigned ,  execution_space >              UnsignedValue ;
-
-  enum PhaseType { FILL_NODE_COUNT ,
-                   SCAN_NODE_COUNT ,
-                   FILL_GRAPH_ENTRIES ,
-                   SORT_GRAPH_ENTRIES ,
-                   GATHER_FILL };
-
-  const elem_node_type  elem_node_id ;
-  const elem_graph_type elem_graph ;
-  UnsignedValue         row_total ;
-  RowMapType            row_count ;
-  RowMapType            row_map ;
-  CrsGraphType          graph ;
-  vector_type           residual ;
-  sparse_matrix_type    jacobian ;
-  elem_vectors_type     elem_residual ;
-  elem_matrices_type    elem_jacobian ;
-  PhaseType             phase ;
-
-public:
-
-  NodeElemGatherFill()
-    : elem_node_id()
-    , elem_graph()
-    , row_total()
-    , row_count()
-    , row_map()
-    , graph()
-    , residual()
-    , jacobian()
-    , elem_residual()
-    , elem_jacobian()
-    , phase( FILL_NODE_COUNT )
-    {}
-
-  NodeElemGatherFill( const NodeElemGatherFill & rhs )
-    : elem_node_id(  rhs.elem_node_id )
-    , elem_graph(    rhs.elem_graph )
-    , row_total(     rhs.row_total )
-    , row_count(     rhs.row_count )
-    , row_map(       rhs.row_map )
-    , graph(         rhs.graph )
-    , residual(      rhs.residual )
-    , jacobian(      rhs.jacobian )
-    , elem_residual( rhs.elem_residual )
-    , elem_jacobian( rhs.elem_jacobian )
-    , phase(         rhs.phase )
-    {}
-
-  NodeElemGatherFill( const elem_node_type     & arg_elem_node_id ,
-                      const elem_graph_type    & arg_elem_graph ,
-                      const vector_type        & arg_residual ,
-                      const sparse_matrix_type & arg_jacobian ,
-                      const elem_vectors_type  & arg_elem_residual ,
-                      const elem_matrices_type & arg_elem_jacobian )
-    : elem_node_id( arg_elem_node_id )
-    , elem_graph( arg_elem_graph )
-    , row_total( "row_total" )
-    , row_count( "row_count" , arg_residual.extent(0) )
-    , row_map( "graph_row_map" , arg_residual.extent(0) + 1 )
-    , graph()
-    , residual( arg_residual )
-    , jacobian( arg_jacobian )
-    , elem_residual( arg_elem_residual )
-    , elem_jacobian( arg_elem_jacobian )
-    , phase( FILL_NODE_COUNT )
-    {
-      //--------------------------------
-      // Count node->element relations
-
-      phase = FILL_NODE_COUNT ;
-
-      Kokkos::parallel_for( elem_node_id.extent(0) , *this );
-
-      //--------------------------------
-
-      phase = SCAN_NODE_COUNT ;
-
-      // Exclusive scan of row_count into row_map
-      // including the final total in the 'node_count + 1' position.
-      // Zero the 'row_count' values.
-      Kokkos::parallel_scan( residual.extent(0) , *this );
-
-      // Zero the row count for the fill:
-      Kokkos::deep_copy( row_count , typename RowMapType::value_type(0) );
-
-      unsigned graph_entry_count = 0 ;
-
-      Kokkos::deep_copy( graph_entry_count , row_total );
-
-      // Assign graph's row_map and allocate graph's entries
-      graph.row_map = row_map ;
-
-      typedef typename CrsGraphType::entries_type graph_entries_type ;
-
-      graph.entries = graph_entries_type( "graph_entries" , graph_entry_count );
-
-      //--------------------------------
-      // Fill graph's entries from the (node,node) set.
-
-      phase = FILL_GRAPH_ENTRIES ;
-
-      Kokkos::deep_copy( row_count , 0u );
-      Kokkos::parallel_for( elem_node_id.extent(0) , *this );
-
-      execution_space().fence();
-
-      //--------------------------------
-      // Done with the temporary sets and arrays
-
-      row_total = UnsignedValue();
-      row_count = RowMapType();
-      row_map   = RowMapType();
-
-      //--------------------------------
-
-      phase = SORT_GRAPH_ENTRIES ;
-      Kokkos::parallel_for( residual.extent(0) , *this );
-
-      execution_space().fence();
-
-      phase = GATHER_FILL ;
-    }
-
-  void apply() const
-  {
-    Kokkos::parallel_for( residual.extent(0) , *this );
-  }
-
-  //------------------------------------
-  //------------------------------------
-  // parallel_for: Count node->element pairs
-
-  KOKKOS_INLINE_FUNCTION
-  void fill_node_count( const unsigned ielem ) const
-  {
-    for ( unsigned row_local_node = 0 ; row_local_node < elem_node_id.extent(1) ; ++row_local_node ) {
-
-      const unsigned row_node = elem_node_id( ielem , row_local_node );
-
-      if ( row_node < row_count.extent(0) ) {
-        atomic_fetch_add( & row_count( row_node ) , 1 );
-      }
-    }
-  }
-
-  KOKKOS_INLINE_FUNCTION
-  void fill_graph_entries( const unsigned ielem ) const
-  {
-    for ( unsigned row_local_node = 0 ; row_local_node < elem_node_id.extent(1) ; ++row_local_node ) {
-
-      const unsigned row_node = elem_node_id( ielem , row_local_node );
-
-      if ( row_node < row_count.extent(0) ) {
-
-        const unsigned offset = graph.row_map( row_node ) + atomic_fetch_add( & row_count( row_node ) , 1 );
-
-        graph.entries( offset , 0 ) = ielem ;
-        graph.entries( offset , 1 ) = row_local_node ;
-      }
-    }
-  }
-
-  KOKKOS_INLINE_FUNCTION
-  void sort_graph_entries( const unsigned irow ) const
-  {
-    const unsigned row_beg = graph.row_map( irow );
-    const unsigned row_end = graph.row_map( irow + 1 );
-    for ( unsigned i = row_beg + 1 ; i < row_end ; ++i ) {
-      const unsigned elem  = graph.entries(i,0);
-      const unsigned local = graph.entries(i,1);
-      unsigned j = i ;
-      for ( ; row_beg < j && elem < graph.entries(j-1,0) ; --j ) {
-        graph.entries(j,0) = graph.entries(j-1,0);
-        graph.entries(j,1) = graph.entries(j-1,1);
-      }
-      graph.entries(j,0) = elem ;
-      graph.entries(j,1) = local ;
-    }
-  }
-
-  //------------------------------------
-
-  KOKKOS_INLINE_FUNCTION
-  void gather_fill( const unsigned irow ) const
-  {
-    const unsigned node_elem_begin = graph.row_map(irow);
-    const unsigned node_elem_end   = graph.row_map(irow+1);
-
-    //  for each element that a node belongs to
-
-    for ( unsigned i = node_elem_begin ; i < node_elem_end ; i++ ) {
-
-      const unsigned elem_id   = graph.entries( i, 0);
-      const unsigned row_index = graph.entries( i, 1);
-
-      residual(irow) += elem_residual(elem_id, row_index);
-
-      //  for each node in a particular related element
-      //  gather the contents of the element stiffness
-      //  matrix that belong in irow
-
-      for ( unsigned j = 0 ; j < ElemNodeCount ; ++j ) {
-        const unsigned A_index = elem_graph( elem_id , row_index , j );
-
-        jacobian.coeff( A_index ) += elem_jacobian( elem_id, row_index, j );
-      }
-    }
-  }
-
-  //------------------------------------
-
-  KOKKOS_INLINE_FUNCTION
-  void operator()( const unsigned iwork ) const
-  {
-    if ( phase == FILL_NODE_COUNT ) {
-      fill_node_count( iwork );
-    }
-    else if ( phase == FILL_GRAPH_ENTRIES ) {
-      fill_graph_entries( iwork );
-    }
-    else if ( phase == SORT_GRAPH_ENTRIES ) {
-      sort_graph_entries( iwork );
-    }
-    else if ( phase == GATHER_FILL ) {
-      gather_fill( iwork );
-    }
-  }
-
-  //------------------------------------
-  // parallel_scan: row offsets
-
-  typedef unsigned value_type ;
-
-  KOKKOS_INLINE_FUNCTION
-  void operator()( const unsigned irow , unsigned & update , const bool final ) const
-  {
-    // exclusive scan
-    if ( final ) { row_map( irow ) = update ; }
-
-    update += row_count( irow );
-
-    if ( final ) {
-      if ( irow + 1 == row_count.extent(0) ) {
-        row_map( irow + 1 ) = update ;
-        row_total()         = update ;
-      }
-    }
-  }
-
-  KOKKOS_INLINE_FUNCTION
-  void init( unsigned & update ) const { update = 0 ; }
-
-  KOKKOS_INLINE_FUNCTION
-  void join( volatile unsigned & update , const volatile unsigned & input ) const { update += input ; }
-};
-
-} /* namespace FENL */
-} /* namespace Example */
-} /* namespace Kokkos  */
-
-//----------------------------------------------------------------------------
-
-namespace Kokkos {
-namespace Example {
-namespace FENL {
-
-template< class FiniteElementMeshType , class SparseMatrixType >
-class ElementComputation ;
-
-
-template< class ExecSpace , BoxElemPart::ElemOrder Order , class CoordinateMap , typename ScalarType >
-class ElementComputation<
-  Kokkos::Example::BoxElemFixture< ExecSpace , Order , CoordinateMap > ,
-  Kokkos::Example::CrsMatrix< ScalarType , ExecSpace > >
-{
-public:
-
-  typedef Kokkos::Example::BoxElemFixture< ExecSpace, Order, CoordinateMap >  mesh_type ;
-  typedef Kokkos::Example::HexElement_Data< mesh_type::ElemNode >             element_data_type ;
-
-  typedef Kokkos::Example::CrsMatrix< ScalarType , ExecSpace >  sparse_matrix_type ;
-  typedef typename sparse_matrix_type::StaticCrsGraphType       sparse_graph_type ;
-
-  typedef ExecSpace   execution_space ;
-  typedef ScalarType  scalar_type ;
-
-  static const unsigned SpatialDim       = element_data_type::spatial_dimension ;
-  static const unsigned TensorDim        = SpatialDim * SpatialDim ;
-  static const unsigned ElemNodeCount    = element_data_type::element_node_count ;
-  static const unsigned FunctionCount    = element_data_type::function_count ;
-  static const unsigned IntegrationCount = element_data_type::integration_count ;
-
-  //------------------------------------
-
-  typedef typename mesh_type::node_coord_type                                      node_coord_type ;
-  typedef typename mesh_type::elem_node_type                                       elem_node_type ;
-  typedef Kokkos::View< scalar_type*[FunctionCount][FunctionCount] , execution_space > elem_matrices_type ;
-  typedef Kokkos::View< scalar_type*[FunctionCount] ,                execution_space > elem_vectors_type ;
-  typedef Kokkos::View< scalar_type* ,                               execution_space > vector_type ;
-
-  typedef typename NodeNodeGraph< elem_node_type , sparse_graph_type , ElemNodeCount >::ElemGraphType elem_graph_type ;
-
-  //------------------------------------
-
-
-  //------------------------------------
-  // Computational data:
-
-  const element_data_type   elem_data ;
-  const elem_node_type      elem_node_ids ;
-  const node_coord_type     node_coords ;
-  const elem_graph_type     elem_graph ;
-  const elem_matrices_type  elem_jacobians ;
-  const elem_vectors_type   elem_residuals ;
-  const vector_type         solution ;
-  const vector_type         residual ;
-  const sparse_matrix_type  jacobian ;
-  const scalar_type         coeff_K ;
-
-  ElementComputation( const ElementComputation & rhs )
-    : elem_data()
-    , elem_node_ids( rhs.elem_node_ids )
-    , node_coords(   rhs.node_coords )
-    , elem_graph(    rhs.elem_graph )
-    , elem_jacobians( rhs.elem_jacobians )
-    , elem_residuals( rhs.elem_residuals )
-    , solution( rhs.solution )
-    , residual( rhs.residual )
-    , jacobian( rhs.jacobian )
-    , coeff_K( rhs.coeff_K )
-    {}
-
-  // If the element->sparse_matrix graph is provided then perform atomic updates
-  // Otherwise fill per-element contributions for subequent gather-add into a residual and jacobian.
-  ElementComputation( const mesh_type          & arg_mesh ,
-	              const scalar_type          arg_coeff_K ,
-                      const vector_type        & arg_solution ,
-                      const elem_graph_type    & arg_elem_graph ,
-                      const sparse_matrix_type & arg_jacobian ,
-                      const vector_type        & arg_residual )
-    : elem_data()
-    , elem_node_ids( arg_mesh.elem_node() )
-    , node_coords(   arg_mesh.node_coord() )
-    , elem_graph(    arg_elem_graph )
-    , elem_jacobians()
-    , elem_residuals()
-    , solution( arg_solution )
-    , residual( arg_residual )
-    , jacobian( arg_jacobian )
-    , coeff_K( arg_coeff_K )
-    {}
-
-  ElementComputation( const mesh_type    & arg_mesh ,
-	              const scalar_type    arg_coeff_K ,
-                      const vector_type  & arg_solution )
-    : elem_data()
-    , elem_node_ids( arg_mesh.elem_node() )
-    , node_coords(   arg_mesh.node_coord() )
-    , elem_graph()
-    , elem_jacobians( "elem_jacobians" , arg_mesh.elem_count() )
-    , elem_residuals( "elem_residuals" , arg_mesh.elem_count() )
-    , solution( arg_solution )
-    , residual()
-    , jacobian()
-    , coeff_K( arg_coeff_K )
-    {}
-
-  //------------------------------------
-
-  void apply() const
-  {
-    parallel_for( elem_node_ids.extent(0) , *this );
-  }
-
-  //------------------------------------
-
-  static const unsigned FLOPS_transform_gradients =
-     /* Jacobian */           FunctionCount * TensorDim * 2 +
-     /* Inverse jacobian */   TensorDim * 6 + 6 +
-     /* Gradient transform */ FunctionCount * 15 ;
-
-  KOKKOS_INLINE_FUNCTION
-  float transform_gradients(
-    const float grad[][ FunctionCount ] , // Gradient of bases master element
-    const double x[] ,
-    const double y[] ,
-    const double z[] ,
-    float dpsidx[] ,
-    float dpsidy[] ,
-    float dpsidz[] ) const
-  {
-    enum { j11 = 0 , j12 = 1 , j13 = 2 ,
-           j21 = 3 , j22 = 4 , j23 = 5 ,
-           j31 = 6 , j32 = 7 , j33 = 8 };
-
-    // Jacobian accumulation:
-
-    double J[ TensorDim ] = { 0, 0, 0,  0, 0, 0,  0, 0, 0 };
-
-    for( unsigned i = 0; i < FunctionCount ; ++i ) {
-      const double x1 = x[i] ;
-      const double x2 = y[i] ;
-      const double x3 = z[i] ;
-
-      const float g1 = grad[0][i] ;
-      const float g2 = grad[1][i] ;
-      const float g3 = grad[2][i] ;
-
-      J[j11] += g1 * x1 ;
-      J[j12] += g1 * x2 ;
-      J[j13] += g1 * x3 ;
-
-      J[j21] += g2 * x1 ;
-      J[j22] += g2 * x2 ;
-      J[j23] += g2 * x3 ;
-
-      J[j31] += g3 * x1 ;
-      J[j32] += g3 * x2 ;
-      J[j33] += g3 * x3 ;
-    }
-
-    // Inverse jacobian:
-
-    float invJ[ TensorDim ] = {
-      static_cast<float>( J[j22] * J[j33] - J[j23] * J[j32] ) ,
-      static_cast<float>( J[j13] * J[j32] - J[j12] * J[j33] ) ,
-      static_cast<float>( J[j12] * J[j23] - J[j13] * J[j22] ) ,
-
-      static_cast<float>( J[j23] * J[j31] - J[j21] * J[j33] ) ,
-      static_cast<float>( J[j11] * J[j33] - J[j13] * J[j31] ) ,
-      static_cast<float>( J[j13] * J[j21] - J[j11] * J[j23] ) ,
-
-      static_cast<float>( J[j21] * J[j32] - J[j22] * J[j31] ) ,
-      static_cast<float>( J[j12] * J[j31] - J[j11] * J[j32] ) ,
-      static_cast<float>( J[j11] * J[j22] - J[j12] * J[j21] ) };
-
-    const float detJ = J[j11] * invJ[j11] +
-                       J[j21] * invJ[j12] +
-                       J[j31] * invJ[j13] ;
-
-    const float detJinv = 1.0 / detJ ;
-
-    for ( unsigned i = 0 ; i < TensorDim ; ++i ) { invJ[i] *= detJinv ; }
-
-    // Transform gradients:
-
-    for( unsigned i = 0; i < FunctionCount ; ++i ) {
-      const float g0 = grad[0][i];
-      const float g1 = grad[1][i];
-      const float g2 = grad[2][i];
-
-      dpsidx[i] = g0 * invJ[j11] + g1 * invJ[j12] + g2 * invJ[j13];
-      dpsidy[i] = g0 * invJ[j21] + g1 * invJ[j22] + g2 * invJ[j23];
-      dpsidz[i] = g0 * invJ[j31] + g1 * invJ[j32] + g2 * invJ[j33];
-    }
-
-    return detJ ;
-  }
-
-  KOKKOS_INLINE_FUNCTION
-  void contributeResidualJacobian(
-    const float coeff_k ,
-    const double dof_values[] ,
-    const float dpsidx[] ,
-    const float dpsidy[] ,
-    const float dpsidz[] ,
-    const float detJ ,
-    const float integ_weight ,
-    const float bases_vals[] ,
-    double elem_res[] ,
-    double elem_mat[][ FunctionCount ] ) const
-  {
-    double value_at_pt = 0 ;
-    double gradx_at_pt = 0 ;
-    double grady_at_pt = 0 ;
-    double gradz_at_pt = 0 ;
-
-    for ( unsigned m = 0 ; m < FunctionCount ; m++ ) {
-      value_at_pt += dof_values[m] * bases_vals[m] ;
-      gradx_at_pt += dof_values[m] * dpsidx[m] ;
-      grady_at_pt += dof_values[m] * dpsidy[m] ;
-      gradz_at_pt += dof_values[m] * dpsidz[m] ;
-    }
-
-    const scalar_type k_detJ_weight = coeff_k        * detJ * integ_weight ;
-    const double res_val = value_at_pt * value_at_pt * detJ * integ_weight ;
-    const double mat_val = 2.0 * value_at_pt         * detJ * integ_weight ;
-
-    // $$ R_i = \int_{\Omega} \nabla \phi_i \cdot (k \nabla T) + \phi_i T^2 d \Omega $$
-    // $$ J_{i,j} = \frac{\partial R_i}{\partial T_j} = \int_{\Omega} k \nabla \phi_i \cdot \nabla \phi_j + 2 \phi_i \phi_j T d \Omega $$
-
-    for ( unsigned m = 0; m < FunctionCount; ++m) {
-      double * const mat = elem_mat[m] ;
-      const float bases_val_m = bases_vals[m];
-      const float dpsidx_m    = dpsidx[m] ;
-      const float dpsidy_m    = dpsidy[m] ;
-      const float dpsidz_m    = dpsidz[m] ;
-
-      elem_res[m] += k_detJ_weight * ( dpsidx_m * gradx_at_pt +
-                                       dpsidy_m * grady_at_pt +
-                                       dpsidz_m * gradz_at_pt ) +
-                     res_val * bases_val_m ;
-
-      for( unsigned n = 0; n < FunctionCount; n++) {
-
-        mat[n] += k_detJ_weight * ( dpsidx_m * dpsidx[n] +
-                                    dpsidy_m * dpsidy[n] +
-                                    dpsidz_m * dpsidz[n] ) +
-                  mat_val * bases_val_m * bases_vals[n];
-      }
-    }
-  }
-
-  KOKKOS_INLINE_FUNCTION
-  void operator()( const unsigned ielem ) const
-  {
-    // Gather nodal coordinates and solution vector:
-
-    double x[ FunctionCount ] ;
-    double y[ FunctionCount ] ;
-    double z[ FunctionCount ] ;
-    double val[ FunctionCount ] ;
-    unsigned node_index[ ElemNodeCount ];
-
-    for ( unsigned i = 0 ; i < ElemNodeCount ; ++i ) {
-      const unsigned ni = elem_node_ids( ielem , i );
-
-      node_index[i] = ni ;
-
-      x[i] = node_coords( ni , 0 );
-      y[i] = node_coords( ni , 1 );
-      z[i] = node_coords( ni , 2 );
-
-      val[i] = solution( ni );
-    }
-
-
-    double elem_vec[ FunctionCount ] ;
-    double elem_mat[ FunctionCount ][ FunctionCount ] ;
-
-    for( unsigned i = 0; i < FunctionCount ; i++ ) {
-      elem_vec[i] = 0 ;
-      for( unsigned j = 0; j < FunctionCount ; j++){
-        elem_mat[i][j] = 0 ;
-      }
-    }
-
-
-    for ( unsigned i = 0 ; i < IntegrationCount ; ++i ) {
-      float dpsidx[ FunctionCount ] ;
-      float dpsidy[ FunctionCount ] ;
-      float dpsidz[ FunctionCount ] ;
-
-      const float detJ =
-        transform_gradients( elem_data.gradients[i] , x , y , z ,
-                             dpsidx , dpsidy , dpsidz );
-
-      contributeResidualJacobian( coeff_K ,
-                                  val , dpsidx , dpsidy , dpsidz ,
-                                  detJ ,
-                                  elem_data.weights[i] ,
-                                  elem_data.values[i] ,
-                                  elem_vec , elem_mat );
-    }
-
-#if 0
-
-if ( 1 == ielem ) {
-  printf("ElemResidual { %f %f %f %f %f %f %f %f }\n",
-         elem_vec[0], elem_vec[1], elem_vec[2], elem_vec[3],
-         elem_vec[4], elem_vec[5], elem_vec[6], elem_vec[7]);
-
-  printf("ElemJacobian {\n");
-
-  for ( unsigned j = 0 ; j < FunctionCount ; ++j ) {
-  printf("  { %f %f %f %f %f %f %f %f }\n",
-         elem_mat[j][0], elem_mat[j][1], elem_mat[j][2], elem_mat[j][3],
-         elem_mat[j][4], elem_mat[j][5], elem_mat[j][6], elem_mat[j][7]);
-  }
-  printf("}\n");
-}
-
-#endif
-
-    if ( ! residual.extent(0) ) {
-      for( unsigned i = 0; i < FunctionCount ; i++){
-        elem_residuals(ielem, i) = elem_vec[i] ;
-        for( unsigned j = 0; j < FunctionCount ; j++){
-          elem_jacobians(ielem, i, j) = elem_mat[i][j] ;
-        }
-      }
-    }
-    else {
-      for( unsigned i = 0 ; i < FunctionCount ; i++ ) {
-        const unsigned row = node_index[i] ;
-        if ( row < residual.extent(0) ) {
-          atomic_fetch_add( & residual( row ) , elem_vec[i] );
-
-          for( unsigned j = 0 ; j < FunctionCount ; j++ ) {
-            const unsigned entry = elem_graph( ielem , i , j );
-            if ( entry != ~0u ) {
-              atomic_fetch_add( & jacobian.coeff( entry ) , elem_mat[i][j] );
-            }
-          }
-        }
-      }
-    }
-  }
-}; /* ElementComputation */
-
-//----------------------------------------------------------------------------
-
-template< class FixtureType , class SparseMatrixType >
-class DirichletComputation ;
-
-template< class ExecSpace , BoxElemPart::ElemOrder Order , class CoordinateMap , typename ScalarType >
-class DirichletComputation<
-  Kokkos::Example::BoxElemFixture< ExecSpace , Order , CoordinateMap > ,
-  Kokkos::Example::CrsMatrix< ScalarType , ExecSpace > >
-{
-public:
-
-  typedef Kokkos::Example::BoxElemFixture< ExecSpace, Order, CoordinateMap >  mesh_type ;
-  typedef typename mesh_type::node_coord_type                                 node_coord_type ;
-  typedef typename node_coord_type::value_type                                scalar_coord_type ;
-
-  typedef Kokkos::Example::CrsMatrix< ScalarType , ExecSpace >  sparse_matrix_type ;
-  typedef typename sparse_matrix_type::StaticCrsGraphType       sparse_graph_type ;
-
-  typedef ExecSpace   execution_space ;
-  typedef ScalarType  scalar_type ;
-
-  //------------------------------------
-
-  typedef Kokkos::View< scalar_type* , execution_space > vector_type ;
-
-  //------------------------------------
-  // Computational data:
-
-  const node_coord_type     node_coords ;
-  const vector_type         solution ;
-  const sparse_matrix_type  jacobian ;
-  const vector_type         residual ;
-  const scalar_type         bc_lower_value ;
-  const scalar_type         bc_upper_value ;
-  const scalar_coord_type   bc_lower_limit ;
-  const scalar_coord_type   bc_upper_limit ;
-  const unsigned            bc_plane ;
-  const unsigned            node_count ;
-        bool                init ;
-
-
-  DirichletComputation( const mesh_type          & arg_mesh ,
-                        const vector_type        & arg_solution ,
-                        const sparse_matrix_type & arg_jacobian ,
-                        const vector_type        & arg_residual ,
-                        const unsigned             arg_bc_plane ,
-                        const scalar_type          arg_bc_lower_value ,
-                        const scalar_type          arg_bc_upper_value )
-    : node_coords( arg_mesh.node_coord() )
-    , solution(    arg_solution )
-    , jacobian(    arg_jacobian )
-    , residual(    arg_residual )
-    , bc_lower_value( arg_bc_lower_value )
-    , bc_upper_value( arg_bc_upper_value )
-    , bc_lower_limit( std::numeric_limits<scalar_coord_type>::epsilon() )
-    , bc_upper_limit( scalar_coord_type(1) - std::numeric_limits<scalar_coord_type>::epsilon() )
-    , bc_plane(       arg_bc_plane )
-    , node_count( arg_mesh.node_count_owned() )
-    , init( false )
-    {
-      parallel_for( node_count , *this );
-      init = true ;
-    }
-
-  void apply() const
-  {
-    parallel_for( node_count , *this );
-  }
-
-  //------------------------------------
-
-  KOKKOS_INLINE_FUNCTION
-  void operator()( const unsigned inode ) const
-  {
-    //  Apply dirichlet boundary condition on the Solution and Residual vectors.
-    //  To maintain the symmetry of the original global stiffness matrix,
-    //  zero out the columns that correspond to boundary conditions, and
-    //  update the residual vector accordingly
-
-    const unsigned iBeg = jacobian.graph.row_map[inode];
-    const unsigned iEnd = jacobian.graph.row_map[inode+1];
-
-    const scalar_coord_type c = node_coords(inode,bc_plane);
-    const bool bc_lower = c <= bc_lower_limit ;
-    const bool bc_upper = bc_upper_limit <= c ;
-
-    if ( ! init ) {
-      solution(inode) = bc_lower ? bc_lower_value : (
-                        bc_upper ? bc_upper_value : 0 );
-    }
-    else {
-      if ( bc_lower || bc_upper ) {
-
-        residual(inode) = 0 ;
-
-        //  zero each value on the row, and leave a one
-        //  on the diagonal
-
-        for( unsigned i = iBeg ; i < iEnd ; ++i ) {
-          jacobian.coeff(i) = int(inode) == int(jacobian.graph.entries(i)) ? 1 : 0 ;
-        }
-      }
-      else {
-
-        //  Find any columns that are boundary conditions.
-        //  Clear them and adjust the residual vector
-
-        for( unsigned i = iBeg ; i < iEnd ; ++i ) {
-          const unsigned       cnode = jacobian.graph.entries(i) ;
-          const scalar_coord_type cc = node_coords(cnode,bc_plane);
-
-          if ( ( cc <= bc_lower_limit ) || ( bc_upper_limit <= cc ) ) {
-            jacobian.coeff(i) = 0 ;
-          }
-        }
-      }
-    }
-  }
-};
-
-} /* namespace FENL */
-} /* namespace Example */
-} /* namespace Kokkos  */
-
-//----------------------------------------------------------------------------
-
-/* A Cuda-specific specialization for the element computation functor. */
-#if defined( __CUDACC__ )
-// #include <NonlinearElement_Cuda.hpp>
-#endif
-
-//----------------------------------------------------------------------------
-
-#endif /* #ifndef KOKKOS_EXAMPLE_FENLFUNCTORS_HPP */
-
diff --git a/lib/kokkos/example/fenl/fenl_impl.hpp b/lib/kokkos/example/fenl/fenl_impl.hpp
deleted file mode 100644
index 4f756435c1..0000000000
--- a/lib/kokkos/example/fenl/fenl_impl.hpp
+++ /dev/null
@@ -1,598 +0,0 @@
-/*
-//@HEADER
-// ************************************************************************
-//
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
-// the U.S. Government retains certain rights in this software.
-//
-// 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 Corporation nor the names of the
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "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 SANDIA CORPORATION OR THE
-// 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.
-//
-// Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-//
-// ************************************************************************
-//@HEADER
-*/
-
-#ifndef KOKKOS_EXAMPLE_FENL_IMPL_HPP
-#define KOKKOS_EXAMPLE_FENL_IMPL_HPP
-
-#include <cmath>
-
-// Kokkos libraries' headers:
-
-#include <Kokkos_UnorderedMap.hpp>
-#include <Kokkos_StaticCrsGraph.hpp>
-#include <impl/Kokkos_Timer.hpp>
-
-// Examples headers:
-
-#include <BoxElemFixture.hpp>
-#include <VectorImport.hpp>
-#include <CGSolve.hpp>
-
-#include <fenl.hpp>
-#include <fenl_functors.hpp>
-
-//----------------------------------------------------------------------------
-
-namespace Kokkos {
-namespace Example {
-namespace FENL {
-
-inline
-double maximum( MPI_Comm comm , double local )
-{
-  double global = local ;
-#if defined( KOKKOS_ENABLE_MPI )
-  MPI_Allreduce( & local , & global , 1 , MPI_DOUBLE , MPI_MAX , comm );
-#endif
-  return global ;
-}
-
-} /* namespace FENL */
-} /* namespace Example */
-} /* namespace Kokkos */
-
-//----------------------------------------------------------------------------
-
-namespace Kokkos {
-namespace Example {
-namespace FENL {
-
-class ManufacturedSolution {
-public:
-
-  // Manufactured solution for one dimensional nonlinear PDE
-  //
-  //  -K T_zz + T^2 = 0 ; T(zmin) = T_zmin ; T(zmax) = T_zmax
-  //
-  //  Has an analytic solution of the form:
-  //
-  //    T(z) = ( a ( z - zmin ) + b )^(-2) where K = 1 / ( 6 a^2 )
-  //
-  //  Given T_0 and T_L compute K for this analytic solution.
-  //
-  //  Two analytic solutions:
-  //
-  //    Solution with singularity:
-  //    , a( ( 1.0 / sqrt(T_zmax) + 1.0 / sqrt(T_zmin) ) / ( zmax - zmin ) )
-  //    , b( -1.0 / sqrt(T_zmin) )
-  //
-  //    Solution without singularity:
-  //    , a( ( 1.0 / sqrt(T_zmax) - 1.0 / sqrt(T_zmin) ) / ( zmax - zmin ) )
-  //    , b( 1.0 / sqrt(T_zmin) )
-
-  const double zmin ;
-  const double zmax ;
-  const double T_zmin ;
-  const double T_zmax ;
-  const double a ;
-  const double b ;
-  const double K ;
-
-  ManufacturedSolution( const double arg_zmin ,
-                        const double arg_zmax ,
-                        const double arg_T_zmin ,
-                        const double arg_T_zmax )
-    : zmin( arg_zmin )
-    , zmax( arg_zmax )
-    , T_zmin( arg_T_zmin )
-    , T_zmax( arg_T_zmax )
-    , a( ( 1.0 / std::sqrt(T_zmax) - 1.0 / std::sqrt(T_zmin) ) / ( zmax - zmin ) )
-    , b( 1.0 / std::sqrt(T_zmin) )
-    , K( 1.0 / ( 6.0 * a * a ) )
-    {}
-
-  double operator()( const double z ) const
-  {
-    const double tmp = a * ( z - zmin ) + b ;
-    return 1.0 / ( tmp * tmp );
-  }
-};
-
-} /* namespace FENL */
-} /* namespace Example */
-} /* namespace Kokkos */
-
-//----------------------------------------------------------------------------
-
-namespace Kokkos {
-namespace Example {
-namespace FENL {
-
-template < class Space , BoxElemPart::ElemOrder ElemOrder >
-Perf fenl(
-  MPI_Comm comm ,
-  const int use_print ,
-  const int use_trials ,
-  const int use_atomic ,
-  const int use_elems[] )
-{
-  typedef Kokkos::Example::BoxElemFixture< Space , ElemOrder > FixtureType ;
-
-  typedef Kokkos::Example::CrsMatrix< double , Space >
-    SparseMatrixType ;
-
-  typedef typename SparseMatrixType::StaticCrsGraphType
-    SparseGraphType ;
-
-  typedef Kokkos::Example::FENL::NodeNodeGraph< typename FixtureType::elem_node_type , SparseGraphType , FixtureType::ElemNode >
-     NodeNodeGraphType ;
-
-  typedef Kokkos::Example::FENL::ElementComputation< FixtureType , SparseMatrixType >
-    ElementComputationType ;
-
-  typedef Kokkos::Example::FENL::DirichletComputation< FixtureType , SparseMatrixType >
-    DirichletComputationType ;
-
-  typedef NodeElemGatherFill< ElementComputationType >
-    NodeElemGatherFillType ;
-
-  typedef typename ElementComputationType::vector_type VectorType ;
-
-  typedef Kokkos::Example::VectorImport<
-     typename FixtureType::comm_list_type ,
-     typename FixtureType::send_nodeid_type ,
-     VectorType > ImportType ;
-
-  //------------------------------------
-
-  const unsigned newton_iteration_limit     = 10 ;
-  const double   newton_iteration_tolerance = 1e-7 ;
-  const unsigned cg_iteration_limit         = 200 ;
-  const double   cg_iteration_tolerance     = 1e-7 ;
-
-  //------------------------------------
-
-  const int print_flag = use_print && std::is_same< Kokkos::HostSpace , typename Space::memory_space >::value ;
-
-  int comm_rank ;
-  int comm_size ;
-
-  MPI_Comm_rank( comm , & comm_rank );
-  MPI_Comm_size( comm , & comm_size );
-
-  // Decompose by node to avoid mpi-communication for assembly
-
-  const float bubble_x = 1.0 ;
-  const float bubble_y = 1.0 ;
-  const float bubble_z = 1.0 ;
-
-  const FixtureType fixture( BoxElemPart::DecomposeNode , comm_size , comm_rank ,
-                             use_elems[0] , use_elems[1] , use_elems[2] ,
-                             bubble_x , bubble_y , bubble_z );
-
-
-  {
-    int global_error = ! fixture.ok();
-
-#if defined( KOKKOS_ENABLE_MPI )
-    int local_error = global_error ;
-    global_error = 0 ;
-    MPI_Allreduce( & local_error , & global_error , 1 , MPI_INT , MPI_SUM , comm );
-#endif
-
-    if ( global_error ) {
-      throw std::runtime_error(std::string("Error generating finite element fixture"));
-    }
-  }
-
-  //------------------------------------
-
-  const ImportType comm_nodal_import(
-    comm ,
-    fixture.recv_node() ,
-    fixture.send_node() ,
-    fixture.send_nodeid() ,
-    fixture.node_count_owned() ,
-    fixture.node_count() - fixture.node_count_owned() );
-
-  //------------------------------------
-
-  const double bc_lower_value = 1 ;
-  const double bc_upper_value = 2 ;
-
-  const Kokkos::Example::FENL::ManufacturedSolution
-    manufactured_solution( 0 , 1 , bc_lower_value , bc_upper_value  );
-
-  //------------------------------------
-
-  for ( int k = 0 ; k < comm_size && use_print ; ++k ) {
-    if ( k == comm_rank ) {
-      typename FixtureType::node_grid_type::HostMirror
-        h_node_grid = Kokkos::create_mirror_view( fixture.node_grid() );
-
-      typename FixtureType::node_coord_type::HostMirror
-        h_node_coord = Kokkos::create_mirror_view( fixture.node_coord() );
-
-      typename FixtureType::elem_node_type::HostMirror
-        h_elem_node = Kokkos::create_mirror_view( fixture.elem_node() );
-
-      Kokkos::deep_copy( h_node_grid , fixture.node_grid() );
-      Kokkos::deep_copy( h_node_coord , fixture.node_coord() );
-      Kokkos::deep_copy( h_elem_node , fixture.elem_node() );
-
-      std::cout << "MPI[" << comm_rank << "]" << std::endl ;
-      std::cout << "Node grid {" ;
-      for ( unsigned inode = 0 ; inode < fixture.node_count() ; ++inode ) {
-        std::cout << " (" << h_node_grid(inode,0)
-                  << "," << h_node_grid(inode,1)
-                  << "," << h_node_grid(inode,2)
-                  << ")" ;
-      }
-      std::cout << " }" << std::endl ;
-
-      std::cout << "Node coord {" ;
-      for ( unsigned inode = 0 ; inode < fixture.node_count() ; ++inode ) {
-        std::cout << " (" << h_node_coord(inode,0)
-                  << "," << h_node_coord(inode,1)
-                  << "," << h_node_coord(inode,2)
-                  << ")" ;
-      }
-      std::cout << " }" << std::endl ;
-
-      std::cout << "Manufactured solution"
-                << " a[" << manufactured_solution.a << "]"
-                << " b[" << manufactured_solution.b << "]"
-                << " K[" << manufactured_solution.K << "]"
-                << " {" ;
-      for ( unsigned inode = 0 ; inode < fixture.node_count() ; ++inode ) {
-        std::cout << " " << manufactured_solution( h_node_coord( inode , 2 ) );
-      }
-      std::cout << " }" << std::endl ;
-
-      std::cout << "ElemNode {" << std::endl ;
-      for ( unsigned ielem = 0 ; ielem < fixture.elem_count() ; ++ielem ) {
-        std::cout << "  elem[" << ielem << "]{" ;
-        for ( unsigned inode = 0 ; inode < FixtureType::ElemNode ; ++inode ) {
-          std::cout << " " << h_elem_node(ielem,inode);
-        }
-        std::cout << " }{" ;
-        for ( unsigned inode = 0 ; inode < FixtureType::ElemNode ; ++inode ) {
-          std::cout << " (" << h_node_grid(h_elem_node(ielem,inode),0)
-                    << "," << h_node_grid(h_elem_node(ielem,inode),1)
-                    << "," << h_node_grid(h_elem_node(ielem,inode),2)
-                    << ")" ;
-        }
-        std::cout << " }" << std::endl ;
-      }
-      std::cout << "}" << std::endl ;
-    }
-    std::cout.flush();
-    MPI_Barrier( comm );
-  }
-
-  //------------------------------------
-
-  Kokkos::Timer wall_clock ;
-
-  Perf perf_stats = Perf() ;
-
-  for ( int itrial = 0 ; itrial < use_trials ; ++itrial ) {
-
-    Perf perf = Perf() ;
-
-    perf.global_elem_count = fixture.elem_count_global();
-    perf.global_node_count = fixture.node_count_global();
-
-    //----------------------------------
-    // Create the sparse matrix graph and element-to-graph map
-    // from the element->to->node identifier array.
-    // The graph only has rows for the owned nodes.
-
-    typename NodeNodeGraphType::Times graph_times;
-
-    const NodeNodeGraphType
-      mesh_to_graph( fixture.elem_node() , fixture.node_count_owned(), graph_times );
-
-    perf.map_ratio          = maximum(comm, graph_times.ratio);
-    perf.fill_node_set      = maximum(comm, graph_times.fill_node_set);
-    perf.scan_node_count    = maximum(comm, graph_times.scan_node_count);
-    perf.fill_graph_entries = maximum(comm, graph_times.fill_graph_entries);
-    perf.sort_graph_entries = maximum(comm, graph_times.sort_graph_entries);
-    perf.fill_element_graph = maximum(comm, graph_times.fill_element_graph);
-
-    wall_clock.reset();
-    // Create the sparse matrix from the graph:
-
-    SparseMatrixType jacobian( mesh_to_graph.graph );
-
-    Space().fence();
-
-    perf.create_sparse_matrix = maximum( comm , wall_clock.seconds() );
-
-    //----------------------------------
-
-    for ( int k = 0 ; k < comm_size && print_flag ; ++k ) {
-      if ( k == comm_rank ) {
-        const unsigned nrow = jacobian.graph.numRows();
-        std::cout << "MPI[" << comm_rank << "]" << std::endl ;
-        std::cout << "JacobianGraph {" << std::endl ;
-        for ( unsigned irow = 0 ; irow < nrow ; ++irow ) {
-          std::cout << "  row[" << irow << "]{" ;
-          const unsigned entry_end = jacobian.graph.row_map(irow+1);
-          for ( unsigned entry = jacobian.graph.row_map(irow) ; entry < entry_end ; ++entry ) {
-            std::cout << " " << jacobian.graph.entries(entry);
-          }
-          std::cout << " }" << std::endl ;
-        }
-        std::cout << "}" << std::endl ;
-
-        std::cout << "ElemGraph {" << std::endl ;
-        for ( unsigned ielem = 0 ; ielem < mesh_to_graph.elem_graph.extent(0) ; ++ielem ) {
-          std::cout << "  elem[" << ielem << "]{" ;
-          for ( unsigned irow = 0 ; irow < mesh_to_graph.elem_graph.extent(1) ; ++irow ) {
-            std::cout << " {" ;
-            for ( unsigned icol = 0 ; icol < mesh_to_graph.elem_graph.extent(2) ; ++icol ) {
-              std::cout << " " << mesh_to_graph.elem_graph(ielem,irow,icol);
-            }
-            std::cout << " }" ;
-          }
-          std::cout << " }" << std::endl ;
-        }
-        std::cout << "}" << std::endl ;
-      }
-      std::cout.flush();
-      MPI_Barrier( comm );
-    }
-
-    //----------------------------------
-
-    // Allocate solution vector for each node in the mesh and residual vector for each owned node
-    const VectorType nodal_solution( "nodal_solution" , fixture.node_count() );
-    const VectorType nodal_residual( "nodal_residual" , fixture.node_count_owned() );
-    const VectorType nodal_delta(    "nodal_delta" ,    fixture.node_count_owned() );
-
-    // Create element computation functor
-    const ElementComputationType elemcomp(
-      use_atomic ? ElementComputationType( fixture , manufactured_solution.K , nodal_solution ,
-                                           mesh_to_graph.elem_graph , jacobian , nodal_residual )
-                 : ElementComputationType( fixture , manufactured_solution.K , nodal_solution ) );
-
-    const NodeElemGatherFillType gatherfill(
-      use_atomic ? NodeElemGatherFillType()
-                 : NodeElemGatherFillType( fixture.elem_node() ,
-                                           mesh_to_graph.elem_graph ,
-                                           nodal_residual ,
-                                           jacobian ,
-                                           elemcomp.elem_residuals ,
-                                           elemcomp.elem_jacobians ) );
-
-    // Create boundary condition functor
-    const DirichletComputationType dirichlet(
-      fixture , nodal_solution , jacobian , nodal_residual ,
-      2 /* apply at 'z' ends */ ,
-      manufactured_solution.T_zmin ,
-      manufactured_solution.T_zmax );
-
-    //----------------------------------
-    // Nonlinear Newton iteration:
-
-    double residual_norm_init = 0 ;
-
-    for ( perf.newton_iter_count = 0 ;
-          perf.newton_iter_count < newton_iteration_limit ;
-          ++perf.newton_iter_count ) {
-
-      //--------------------------------
-
-      comm_nodal_import( nodal_solution );
-
-      //--------------------------------
-      // Element contributions to residual and jacobian
-
-      wall_clock.reset();
-
-      Kokkos::deep_copy( nodal_residual , double(0) );
-      Kokkos::deep_copy( jacobian.coeff , double(0) );
-
-      elemcomp.apply();
-
-      if ( ! use_atomic ) {
-        gatherfill.apply();
-      }
-
-      Space().fence();
-      perf.fill_time = maximum( comm , wall_clock.seconds() );
-
-      //--------------------------------
-      // Apply boundary conditions
-
-      wall_clock.reset();
-
-      dirichlet.apply();
-
-      Space().fence();
-      perf.bc_time = maximum( comm , wall_clock.seconds() );
-
-      //--------------------------------
-      // Evaluate convergence
-
-      const double residual_norm =
-        std::sqrt(
-          Kokkos::Example::all_reduce(
-            Kokkos::Example::dot( fixture.node_count_owned() , nodal_residual, nodal_residual ) , comm ) );
-
-      perf.newton_residual = residual_norm ;
-
-      if ( 0 == perf.newton_iter_count ) { residual_norm_init = residual_norm ; }
-
-      if ( residual_norm < residual_norm_init * newton_iteration_tolerance ) { break ; }
-
-      //--------------------------------
-      // Solve for nonlinear update
-
-      CGSolveResult cg_result ;
-
-      Kokkos::Example::cgsolve( comm_nodal_import
-                              , jacobian
-                              , nodal_residual
-                              , nodal_delta
-                              , cg_iteration_limit
-                              , cg_iteration_tolerance
-                              , & cg_result
-                              );
-
-      // Update solution vector
-
-      Kokkos::Example::waxpby( fixture.node_count_owned() , nodal_solution , -1.0 , nodal_delta , 1.0 , nodal_solution );
-
-      perf.cg_iter_count += cg_result.iteration ;
-      perf.matvec_time   += cg_result.matvec_time ;
-      perf.cg_time       += cg_result.iter_time ;
-
-      //--------------------------------
-
-      if ( print_flag ) {
-        const double delta_norm =
-          std::sqrt(
-            Kokkos::Example::all_reduce(
-              Kokkos::Example::dot( fixture.node_count_owned() , nodal_delta, nodal_delta ) , comm ) );
-
-        if ( 0 == comm_rank ) {
-          std::cout << "Newton iteration[" << perf.newton_iter_count << "]"
-                    << " residual[" << perf.newton_residual << "]"
-                    << " update[" << delta_norm << "]"
-                    << " cg_iteration[" << cg_result.iteration << "]"
-                    << " cg_residual[" << cg_result.norm_res << "]"
-                    << std::endl ;
-        }
-
-        for ( int k = 0 ; k < comm_size ; ++k ) {
-          if ( k == comm_rank ) {
-            const unsigned nrow = jacobian.graph.numRows();
-
-            std::cout << "MPI[" << comm_rank << "]" << std::endl ;
-            std::cout << "Residual {" ;
-            for ( unsigned irow = 0 ; irow < nrow ; ++irow ) {
-              std::cout << " " << nodal_residual(irow);
-            }
-            std::cout << " }" << std::endl ;
-
-            std::cout << "Delta {" ;
-            for ( unsigned irow = 0 ; irow < nrow ; ++irow ) {
-              std::cout << " " << nodal_delta(irow);
-            }
-            std::cout << " }" << std::endl ;
-
-            std::cout << "Solution {" ;
-            for ( unsigned irow = 0 ; irow < nrow ; ++irow ) {
-              std::cout << " " << nodal_solution(irow);
-            }
-            std::cout << " }" << std::endl ;
-
-            std::cout << "Jacobian[ "
-                      << jacobian.graph.numRows() << " x " << Kokkos::maximum_entry( jacobian.graph )
-                      << " ] {" << std::endl ;
-            for ( unsigned irow = 0 ; irow < nrow ; ++irow ) {
-              std::cout << "  {" ;
-              const unsigned entry_end = jacobian.graph.row_map(irow+1);
-              for ( unsigned entry = jacobian.graph.row_map(irow) ; entry < entry_end ; ++entry ) {
-                std::cout << " (" << jacobian.graph.entries(entry)
-                          << "," << jacobian.coeff(entry)
-                          << ")" ;
-              }
-              std::cout << " }" << std::endl ;
-            }
-            std::cout << "}" << std::endl ;
-          }
-          std::cout.flush();
-          MPI_Barrier( comm );
-        }
-      }
-      //--------------------------------
-    }
-
-    // Evaluate solution error
-
-    if ( 0 == itrial ) {
-      const typename FixtureType::node_coord_type::HostMirror
-        h_node_coord = Kokkos::create_mirror_view( fixture.node_coord() );
-
-      const typename VectorType::HostMirror
-        h_nodal_solution = Kokkos::create_mirror_view( nodal_solution );
-
-      Kokkos::deep_copy( h_node_coord , fixture.node_coord() );
-      Kokkos::deep_copy( h_nodal_solution , nodal_solution );
-
-      double error_max = 0 ;
-      for ( unsigned inode = 0 ; inode < fixture.node_count_owned() ; ++inode ) {
-        const double answer = manufactured_solution( h_node_coord( inode , 2 ) );
-        const double error = ( h_nodal_solution(inode) - answer ) / answer ;
-        if ( error_max < fabs( error ) ) { error_max = fabs( error ); }
-      }
-
-      perf.error_max = std::sqrt( Kokkos::Example::all_reduce_max( error_max , comm ) );
-
-      perf_stats = perf ;
-    }
-    else {
-      perf_stats.fill_node_set = std::min( perf_stats.fill_node_set , perf.fill_node_set );
-      perf_stats.scan_node_count = std::min( perf_stats.scan_node_count , perf.scan_node_count );
-      perf_stats.fill_graph_entries = std::min( perf_stats.fill_graph_entries , perf.fill_graph_entries );
-      perf_stats.sort_graph_entries = std::min( perf_stats.sort_graph_entries , perf.sort_graph_entries );
-      perf_stats.fill_element_graph = std::min( perf_stats.fill_element_graph , perf.fill_element_graph );
-      perf_stats.create_sparse_matrix = std::min( perf_stats.create_sparse_matrix , perf.create_sparse_matrix );
-      perf_stats.fill_time = std::min( perf_stats.fill_time , perf.fill_time );
-      perf_stats.bc_time = std::min( perf_stats.bc_time , perf.bc_time );
-      perf_stats.cg_time = std::min( perf_stats.cg_time , perf.cg_time );
-    }
-  }
-
-  return perf_stats ;
-}
-
-} /* namespace FENL */
-} /* namespace Example */
-} /* namespace Kokkos */
-
-#endif /* #ifndef KOKKOS_EXAMPLE_FENL_IMPL_HPP */
-
diff --git a/lib/kokkos/example/fenl/main.cpp b/lib/kokkos/example/fenl/main.cpp
deleted file mode 100644
index bd65e7683a..0000000000
--- a/lib/kokkos/example/fenl/main.cpp
+++ /dev/null
@@ -1,367 +0,0 @@
-//@HEADER
-// ************************************************************************
-//
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
-// the U.S. Government retains certain rights in this software.
-//
-// 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 Corporation nor the names of the
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "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 SANDIA CORPORATION OR THE
-// 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.
-//
-// Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-//
-// ************************************************************************
-//@HEADER
-
-#include <cmath>
-
-#include <cstdio>
-#include <cstdlib>
-#include <cstring>
-
-#include <utility>
-#include <string>
-#include <vector>
-#include <sstream>
-#include <iostream>
-#include <iomanip>
-
-#include <Kokkos_Core.hpp>
-
-#include <WrapMPI.hpp>
-#include <fenl.hpp>
-
-// For vtune
-#include <sys/types.h>
-#include <unistd.h>
-
-//----------------------------------------------------------------------------
-
-enum { CMD_USE_THREADS = 0
-     , CMD_USE_NUMA
-     , CMD_USE_CORE_PER_NUMA
-     , CMD_USE_CUDA
-     , CMD_USE_ROCM
-     , CMD_USE_OPENMP
-     , CMD_USE_HPX
-     , CMD_USE_CUDA_DEV
-     , CMD_USE_FIXTURE_X
-     , CMD_USE_FIXTURE_Y
-     , CMD_USE_FIXTURE_Z
-     , CMD_USE_FIXTURE_BEGIN
-     , CMD_USE_FIXTURE_END
-     , CMD_USE_FIXTURE_QUADRATIC
-     , CMD_USE_ATOMIC
-     , CMD_USE_TRIALS
-     , CMD_VTUNE
-     , CMD_PRINT
-     , CMD_ECHO
-     , CMD_ERROR
-     , CMD_COUNT };
-
-void print_cmdline( std::ostream & s , const int cmd[] )
-{
-  if ( cmd[ CMD_USE_THREADS ] ) {
-    s << " Threads(" << cmd[ CMD_USE_THREADS ]
-      << ") NUMA(" << cmd[ CMD_USE_NUMA ]
-      << ") CORE_PER_NUMA(" << cmd[ CMD_USE_CORE_PER_NUMA ]
-      << ")" ;
-  }
-  if ( cmd[ CMD_USE_OPENMP ] ) {
-    s << " OpenMP(" << cmd[ CMD_USE_OPENMP ]
-      << ") NUMA(" << cmd[ CMD_USE_NUMA ]
-      << ") CORE_PER_NUMA(" << cmd[ CMD_USE_CORE_PER_NUMA ]
-      << ")" ;
-  }
-  if ( cmd[ CMD_USE_HPX ] ) {
-    s << " HPX(" << cmd[ CMD_USE_HPX ]
-      << ")" ;
-  }
-  if ( cmd[ CMD_USE_FIXTURE_X ] ) {
-    s << " Fixture(" << cmd[ CMD_USE_FIXTURE_X ]
-      << "x" << cmd[ CMD_USE_FIXTURE_Y ]
-      << "x" << cmd[ CMD_USE_FIXTURE_Z ]
-      << ")" ;
-  }
-  if ( cmd[ CMD_USE_FIXTURE_BEGIN ] ) {
-    s << " Fixture( " << cmd[ CMD_USE_FIXTURE_BEGIN ]
-      << " .. " << cmd[ CMD_USE_FIXTURE_END ]
-      << " )" ;
-  }
-  if ( cmd[ CMD_USE_FIXTURE_QUADRATIC ] ) {
-    s << " Quadratic-Element" ;
-  }
-  if ( cmd[ CMD_USE_CUDA ] ) {
-    s << " CUDA(" << cmd[ CMD_USE_CUDA_DEV ] << ")" ;
-  }
-  if ( cmd[ CMD_USE_ROCM ] ) {
-    s << " ROCM" ;
-  }
-  if ( cmd[ CMD_USE_ATOMIC ] ) {
-    s << " ATOMIC" ;
-  }
-  if ( cmd[ CMD_USE_TRIALS ] ) {
-    s << " TRIALS(" << cmd[ CMD_USE_TRIALS ] << ")" ;
-  }
-  if ( cmd[ CMD_VTUNE ] ) {
-    s << " VTUNE" ;
-  }
-  if ( cmd[ CMD_PRINT ] ) {
-    s << " PRINT" ;
-  }
-  s << std::endl ;
-}
-
-void print_perf_value( std::ostream & s , const std::vector<size_t> & widths,  const Kokkos::Example::FENL::Perf & perf )
-{
-  int i=0;
-  s << std::setw(widths[i++]) << perf.global_elem_count << " ,";
-  s << std::setw(widths[i++]) << perf.global_node_count << " ,";
-  s << std::setw(widths[i++]) << perf.newton_iter_count << " ,";
-  s << std::setw(widths[i++]) << perf.cg_iter_count << " ,";
-  s << std::setw(widths[i++]) << perf.map_ratio << " ,";
-  s << std::setw(widths[i++]) << ( perf.fill_node_set * 1000.0 ) / perf.global_node_count << " ,";
-  s << std::setw(widths[i++]) << ( perf.scan_node_count * 1000.0 ) / perf.global_node_count << " ,";
-  s << std::setw(widths[i++]) << ( perf.fill_graph_entries * 1000.0 ) / perf.global_node_count << " ,";
-  s << std::setw(widths[i++]) << ( perf.sort_graph_entries * 1000.0 ) / perf.global_node_count << " ,";
-  s << std::setw(widths[i++]) << ( perf.fill_element_graph * 1000.0 ) / perf.global_node_count << " ,";
-  s << std::setw(widths[i++]) << ( perf.create_sparse_matrix * 1000.0 ) / perf.global_node_count << " ,";
-  s << std::setw(widths[i++]) << ( perf.fill_time * 1000.0 ) / perf.global_node_count << " ,";
-  s << std::setw(widths[i++]) << ( perf.bc_time * 1000.0 ) / perf.global_node_count << " ,";
-  s << std::setw(widths[i++]) << ( ( perf.matvec_time * 1000.0 ) / perf.cg_iter_count ) / perf.global_node_count << " ,";
-  s << std::setw(widths[i++]) << ( ( perf.cg_time * 1000.0 ) / perf.cg_iter_count ) / perf.global_node_count << " ,";
-  s << std::setw(widths[i])   << perf.error_max;
-  s << std::endl ;
-}
-
-template< class Device , Kokkos::Example::BoxElemPart::ElemOrder ElemOrder >
-void run( MPI_Comm comm , const int cmd[] )
-{
-  int comm_rank = 0 ;
-
-#if defined( KOKKOS_ENABLE_MPI )
-  MPI_Comm_rank( comm , & comm_rank );
-#else
-  comm = 0 ;
-#endif
-
-
-  if ( 0 == comm_rank ) {
-    if ( cmd[ CMD_USE_THREADS ] ) { std::cout << "THREADS , " << cmd[ CMD_USE_THREADS ] ; }
-    else if ( cmd[ CMD_USE_OPENMP ] ) { std::cout << "OPENMP , " << cmd[ CMD_USE_OPENMP ] ; }
-    else if ( cmd[ CMD_USE_HPX ] ) { std::cout << "HPX , " << cmd[ CMD_USE_HPX ] ; }
-    else if ( cmd[ CMD_USE_CUDA ] ) { std::cout << "CUDA" ; }
-    else if ( cmd[ CMD_USE_ROCM ] ) { std::cout << "ROCM" ; }
-
-    if ( cmd[ CMD_USE_FIXTURE_QUADRATIC ] ) { std::cout << " , QUADRATIC-ELEMENT" ; }
-    else { std::cout << " , LINEAR-ELEMENT" ; }
-
-    if ( cmd[ CMD_USE_ATOMIC ] ) { std::cout << " , USING ATOMICS" ; }
-  }
-
-  std::vector< std::pair<std::string,std::string> > headers;
-
-
-  headers.push_back(std::make_pair("ELEMS","count"));
-  headers.push_back(std::make_pair("NODES","count"));
-  headers.push_back(std::make_pair("NEWTON","iter"));
-  headers.push_back(std::make_pair("CG","iter"));
-  headers.push_back(std::make_pair("MAP_RATIO","ratio"));
-  headers.push_back(std::make_pair("SET_FILL/NODE","millisec"));
-  headers.push_back(std::make_pair("SCAN/NODE","millisec"));
-  headers.push_back(std::make_pair("GRAPH_FILL/NODE","millisec"));
-  headers.push_back(std::make_pair("SORT/NODE","millisec"));
-  headers.push_back(std::make_pair("ELEM_GRAPH_FILL/NODE","millisec"));
-  headers.push_back(std::make_pair("MATRIX_CREATE/NODE","millisec"));
-  headers.push_back(std::make_pair("MATRIX_FILL/NODE","millisec"));
-  headers.push_back(std::make_pair("BOUNDARY/NODE","millisec"));
-  headers.push_back(std::make_pair("MAT_VEC/ITER/ROW","millisec"));
-  headers.push_back(std::make_pair("CG/ITER/ROW","millisec"));
-  headers.push_back(std::make_pair("ERROR","ratio"));
-
-  // find print widths
-  size_t min_width = 10;
-  std::vector< size_t > widths(headers.size());
-  for (size_t i=0, ie=headers.size(); i<ie; ++i)
-    widths[i] = std::max(min_width, headers[i].first.size()+1);
-
-  // print column headers
-  if ( 0 == comm_rank ) {
-    std::cout << std::endl ;
-    for (size_t i=0; i<headers.size(); ++i)
-      std::cout << std::setw(widths[i]) << headers[i].first << " ,";
-    std::cout << "\b\b  " << std::endl;
-    for (size_t i=0; i<headers.size(); ++i)
-      std::cout << std::setw(widths[i]) << headers[i].second << " ,";
-    std::cout << "\b\b  " << std::endl;
-
-    std::cout << std::scientific;
-    std::cout.precision(3);
-  }
-
-  if ( cmd[ CMD_USE_FIXTURE_BEGIN ] ) {
-    for ( int i = cmd[CMD_USE_FIXTURE_BEGIN] ; i < cmd[CMD_USE_FIXTURE_END] * 2 ; i *= 2 ) {
-      int nelem[3] ;
-      nelem[0] = std::max( 1 , (int) cbrt( ((double) i) / 2.0 ) );
-      nelem[1] = 1 + nelem[0] ;
-      nelem[2] = 2 * nelem[0] ;
-
-      const Kokkos::Example::FENL::Perf perf =
-        cmd[ CMD_USE_FIXTURE_QUADRATIC ]
-        ? Kokkos::Example::FENL::fenl< Device , Kokkos::Example::BoxElemPart::ElemQuadratic >
-            ( comm , cmd[CMD_PRINT], cmd[CMD_USE_TRIALS], cmd[CMD_USE_ATOMIC], nelem )
-        : Kokkos::Example::FENL::fenl< Device , Kokkos::Example::BoxElemPart::ElemLinear >
-            ( comm , cmd[CMD_PRINT], cmd[CMD_USE_TRIALS], cmd[CMD_USE_ATOMIC], nelem )
-        ;
-
-      if ( 0 == comm_rank ) print_perf_value( std::cout , widths, perf );
-    }
-  }
-  else {
-    int nelem[3] = { cmd[ CMD_USE_FIXTURE_X ] ,
-                     cmd[ CMD_USE_FIXTURE_Y ] ,
-                     cmd[ CMD_USE_FIXTURE_Z ] };
-
-    const Kokkos::Example::FENL::Perf perf =
-      cmd[ CMD_USE_FIXTURE_QUADRATIC ]
-      ? Kokkos::Example::FENL::fenl< Device , Kokkos::Example::BoxElemPart::ElemQuadratic >
-          ( comm , cmd[CMD_PRINT], cmd[CMD_USE_TRIALS], cmd[CMD_USE_ATOMIC], nelem )
-      : Kokkos::Example::FENL::fenl< Device , Kokkos::Example::BoxElemPart::ElemLinear >
-          ( comm , cmd[CMD_PRINT], cmd[CMD_USE_TRIALS], cmd[CMD_USE_ATOMIC], nelem )
-      ;
-
-    if ( 0 == comm_rank ) print_perf_value( std::cout , widths, perf );
-  }
-}
-
-//----------------------------------------------------------------------------
-
-int main( int argc , char ** argv )
-{
-  int comm_rank = 0 ;
-
-#if defined( KOKKOS_ENABLE_MPI )
-  MPI_Init( & argc , & argv );
-  MPI_Comm comm = MPI_COMM_WORLD ;
-  MPI_Comm_rank( comm , & comm_rank );
-#else
-  MPI_Comm comm = 0 ;
-  (void) comm ; // suppress warning
-#endif
-
-  Kokkos::initialize(argc,argv);
-  int cmdline[ CMD_COUNT ] ;
-
-  for ( int i = 0 ; i < CMD_COUNT ; ++i ) cmdline[i] = 0 ;
-
-  if ( 0 == comm_rank ) {
-    for ( int i = 1 ; i < argc ; ++i ) {
-      if ( 0 == strcasecmp( argv[i] , "fixture" ) ) {
-        sscanf( argv[++i] , "%dx%dx%d" ,
-                cmdline + CMD_USE_FIXTURE_X ,
-                cmdline + CMD_USE_FIXTURE_Y ,
-                cmdline + CMD_USE_FIXTURE_Z );
-      }
-      else if ( 0 == strcasecmp( argv[i] , "fixture-range" ) ) {
-        sscanf( argv[++i] , "%d..%d" ,
-                cmdline + CMD_USE_FIXTURE_BEGIN ,
-                cmdline + CMD_USE_FIXTURE_END );
-      }
-      else if ( 0 == strcasecmp( argv[i] , "fixture-quadratic" ) ) {
-        cmdline[ CMD_USE_FIXTURE_QUADRATIC ] = 1 ;
-      }
-      else if ( 0 == strcasecmp( argv[i] , "atomic" ) ) {
-        cmdline[ CMD_USE_ATOMIC ] = 1 ;
-      }
-      else if ( 0 == strcasecmp( argv[i] , "trials" ) ) {
-        cmdline[ CMD_USE_TRIALS ] = atoi( argv[++i] ) ;
-      }
-      else if ( 0 == strcasecmp( argv[i] , "vtune" ) ) {
-        cmdline[ CMD_VTUNE ] = 1 ;
-      }
-      else if ( 0 == strcasecmp( argv[i] , "print" ) ) {
-        cmdline[ CMD_PRINT ] = 1 ;
-      }
-      else if ( 0 == strcasecmp( argv[i] , "echo" ) ) {
-        cmdline[ CMD_ECHO ] = 1 ;
-      }
-      else {
-        cmdline[ CMD_ERROR ] = 1 ;
-
-        std::cerr << "Unrecognized command line argument #" << i << ": " << argv[i] << std::endl ;
-      }
-    }
-
-    if ( cmdline[ CMD_ECHO ] && 0 == comm_rank ) { print_cmdline( std::cout , cmdline ); }
-  }
-
-#if defined( KOKKOS_ENABLE_MPI )
-  MPI_Bcast( cmdline , CMD_COUNT , MPI_INT , 0 , comm );
-#endif
-
-  if ( cmdline[ CMD_VTUNE ] ) {
-    std::stringstream cmd;
-    pid_t my_os_pid=getpid();
-    const std::string vtune_loc =
-      "/usr/local/intel/vtune_amplifier_xe_2013/bin64/amplxe-cl";
-    const std::string output_dir = "./vtune/vtune.";
-    const int p_rank = comm_rank;
-    cmd << vtune_loc
-        << " -collect hotspots -result-dir " << output_dir << p_rank
-        << " -target-pid " << my_os_pid << " &";
-    if (p_rank == 0)
-      std::cout << cmd.str() << std::endl;
-    int error = system(cmd.str().c_str());
-    if(error) printf("System Call Result: %i\n",error);
-    error = system("sleep 10");
-    if(error) printf("System Call Result: %i\n",error);
-  }
-
-  if ( ! cmdline[ CMD_ERROR ] && ! cmdline[ CMD_ECHO ] ) {
-
-    if ( ! cmdline[ CMD_USE_TRIALS ] ) { cmdline[ CMD_USE_TRIALS ] = 1 ; }
-
-    if ( ! cmdline[ CMD_USE_FIXTURE_X ] && ! cmdline[ CMD_USE_FIXTURE_BEGIN ] ) {
-      cmdline[ CMD_USE_FIXTURE_X ] = 2 ;
-      cmdline[ CMD_USE_FIXTURE_Y ] = 2 ;
-      cmdline[ CMD_USE_FIXTURE_Z ] = 2 ;
-    }
-
-    run< Kokkos::DefaultExecutionSpace , Kokkos::Example::BoxElemPart::ElemLinear >( comm , cmdline );
-
-  }
-
-  Kokkos::finalize();
-#if defined( KOKKOS_ENABLE_MPI )
-  MPI_Finalize();
-#endif
-
-  return cmdline[ CMD_ERROR ] ? -1 : 0 ;
-}
-
diff --git a/lib/kokkos/example/fixture/BoxElemFixture.hpp b/lib/kokkos/example/fixture/BoxElemFixture.hpp
deleted file mode 100644
index be2f03a27d..0000000000
--- a/lib/kokkos/example/fixture/BoxElemFixture.hpp
+++ /dev/null
@@ -1,355 +0,0 @@
-/*
-//@HEADER
-// ************************************************************************
-//
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
-// the U.S. Government retains certain rights in this software.
-//
-// 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 Corporation nor the names of the
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "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 SANDIA CORPORATION OR THE
-// 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.
-//
-// Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-//
-// ************************************************************************
-//@HEADER
-*/
-
-#ifndef KOKKOS_EXAMPLE_BOXELEMFIXTURE_HPP
-#define KOKKOS_EXAMPLE_BOXELEMFIXTURE_HPP
-
-#include <cstdio>
-#include <utility>
-
-#include <Kokkos_Core.hpp>
-
-#include <HexElement.hpp>
-#include <BoxElemPart.hpp>
-
-//----------------------------------------------------------------------------
-
-namespace Kokkos {
-namespace Example {
-
-/** \brief  Map a grid onto a unit cube with smooth nonlinear grading
- *          of the map.
- */
-struct MapGridUnitCube {
-
-  const float m_a ;
-  const float m_b ;
-  const float m_c ;
-  const size_t m_max_x ;
-  const size_t m_max_y ;
-  const size_t m_max_z ;
-
-  MapGridUnitCube( const size_t grid_max_x ,
-                   const size_t grid_max_y ,
-                   const size_t grid_max_z ,
-                   const float bubble_x ,
-                   const float bubble_y ,
-                   const float bubble_z )
-    : m_a( bubble_x )
-    , m_b( bubble_y )
-    , m_c( bubble_z )
-    , m_max_x( grid_max_x )
-    , m_max_y( grid_max_y )
-    , m_max_z( grid_max_z )
-    {}
-
-  template< typename Scalar >
-  KOKKOS_INLINE_FUNCTION
-  void operator()( int grid_x ,
-                   int grid_y ,
-                   int grid_z ,
-                   Scalar & coord_x ,
-                   Scalar & coord_y ,
-                   Scalar & coord_z ) const
-    {
-      // Map to a unit cube [0,1]^3
-
-      const double x = double(grid_x) / double(m_max_x);
-      const double y = double(grid_y) / double(m_max_y);
-      const double z = double(grid_z) / double(m_max_z);
-
-      coord_x = x + x * x * ( x - 1 ) * ( x - 1 ) * m_a ;
-      coord_y = y + y * y * ( y - 1 ) * ( y - 1 ) * m_b ;
-      coord_z = z + z * z * ( z - 1 ) * ( z - 1 ) * m_c ;
-    }
-};
-
-} // namespace Example
-} // namespace Kokkos
-
-//----------------------------------------------------------------------------
-
-namespace Kokkos {
-namespace Example {
-
-/** \brief  Generate a distributed unstructured finite element mesh
- *          from a partitioned NX*NY*NZ box of elements.
- *
- *  Order owned nodes first followed by off-process nodes
- *  grouped by owning process.
- */
-template< class Device ,
-          BoxElemPart::ElemOrder Order ,
-          class CoordinateMap = MapGridUnitCube >
-class BoxElemFixture {
-public:
-
-  typedef Device execution_space ;
-
-  enum { SpaceDim = 3 };
-  enum { ElemNode = Order == BoxElemPart::ElemLinear ? 8 :
-                    Order == BoxElemPart::ElemQuadratic ? 27 : 0 };
-
-private:
-
-  typedef Kokkos::Example::HexElement_TensorData< ElemNode > hex_data ;
-
-  Kokkos::Example::BoxElemPart m_box_part ;
-  CoordinateMap                m_coord_map ;
-
-  Kokkos::View< double *[SpaceDim] , Device > m_node_coord ;
-  Kokkos::View< size_t *[SpaceDim] , Device > m_node_grid ;
-  Kokkos::View< size_t *[ElemNode] , Device > m_elem_node ;
-  Kokkos::View< size_t *[2] ,        Device > m_recv_node ;
-  Kokkos::View< size_t *[2] ,        Device > m_send_node ;
-  Kokkos::View< size_t * ,           Device > m_send_node_id ;
-
-  unsigned char m_elem_node_local[ ElemNode ][4] ;
-
-public:
-
-  typedef Kokkos::View< const size_t  * [ElemNode], Device > elem_node_type ;
-  typedef Kokkos::View< const double  * [SpaceDim], Device > node_coord_type ;
-  typedef Kokkos::View< const size_t  * [SpaceDim], Device > node_grid_type ;
-  typedef Kokkos::View< const size_t  * [2] , Device > comm_list_type ;
-  typedef Kokkos::View< const size_t  *     , Device > send_nodeid_type ;
-
-  inline bool ok() const { return m_box_part.ok(); }
-
-  KOKKOS_INLINE_FUNCTION
-  size_t node_count() const { return m_node_grid.extent(0); }
-
-  KOKKOS_INLINE_FUNCTION
-  size_t node_count_owned() const { return m_box_part.owns_node_count(); }
-
-  KOKKOS_INLINE_FUNCTION
-  size_t node_count_global() const { return m_box_part.global_node_count(); }
-
-  KOKKOS_INLINE_FUNCTION
-  size_t elem_count() const { return m_elem_node.extent(0); }
-
-  KOKKOS_INLINE_FUNCTION
-  size_t elem_count_global() const { return m_box_part.global_elem_count(); }
-
-  KOKKOS_INLINE_FUNCTION
-  size_t elem_node_local( size_t inode , int k ) const
-    { return m_elem_node_local[inode][k] ; }
-
-  KOKKOS_INLINE_FUNCTION
-  size_t node_grid( size_t inode , int iaxis ) const
-    { return m_node_grid(inode,iaxis); }
-
-  KOKKOS_INLINE_FUNCTION
-  size_t node_global_index( size_t local ) const
-    {
-      const size_t tmp_node_grid[SpaceDim] =
-        { m_node_grid(local,0) , m_node_grid(local,1) , m_node_grid(local,2) };
-      return m_box_part.global_node_id( tmp_node_grid );
-    }
-
-  KOKKOS_INLINE_FUNCTION
-  double node_coord( size_t inode , int iaxis ) const
-    { return m_node_coord(inode,iaxis); }
-
-  KOKKOS_INLINE_FUNCTION
-  size_t node_grid_max( int iaxis ) const
-    { return m_box_part.global_coord_max(iaxis); }
-
-  KOKKOS_INLINE_FUNCTION
-  size_t elem_node( size_t ielem , size_t inode ) const
-    { return m_elem_node(ielem,inode); }
-
-  elem_node_type   elem_node()   const { return m_elem_node ; }
-  node_coord_type  node_coord()  const { return m_node_coord ; }
-  node_grid_type   node_grid()   const { return m_node_grid ; }
-  comm_list_type   recv_node()   const { return m_recv_node ; }
-  comm_list_type   send_node()   const { return m_send_node ; }
-  send_nodeid_type send_nodeid() const { return m_send_node_id ; }
-
-  KOKKOS_INLINE_FUNCTION
-  BoxElemFixture( const BoxElemFixture & rhs )
-    : m_box_part(   rhs.m_box_part )
-    , m_coord_map(  rhs.m_coord_map )
-    , m_node_coord( rhs.m_node_coord )
-    , m_node_grid(  rhs.m_node_grid )
-    , m_elem_node(  rhs.m_elem_node )
-    , m_recv_node(  rhs.m_recv_node )
-    , m_send_node(  rhs.m_send_node )
-    , m_send_node_id( rhs.m_send_node_id )
-    {
-      for ( int i = 0 ; i < ElemNode ; ++i ) {
-        m_elem_node_local[i][0] = rhs.m_elem_node_local[i][0] ;
-        m_elem_node_local[i][1] = rhs.m_elem_node_local[i][1] ;
-        m_elem_node_local[i][2] = rhs.m_elem_node_local[i][2] ;
-        m_elem_node_local[i][3] = 0 ;
-      }
-    }
-
-  BoxElemFixture & operator = ( const BoxElemFixture & rhs )
-    {
-      m_box_part      = rhs.m_box_part ;
-      m_coord_map     = rhs.m_coord_map ;
-      m_node_coord    = rhs.m_node_coord ;
-      m_node_grid     = rhs.m_node_grid ;
-      m_elem_node     = rhs.m_elem_node ;
-      m_recv_node     = rhs.m_recv_node ;
-      m_send_node     = rhs.m_send_node ;
-      m_send_node_id  = rhs.m_send_node_id ;
-
-      for ( int i = 0 ; i < ElemNode ; ++i ) {
-        m_elem_node_local[i][0] = rhs.m_elem_node_local[i][0] ;
-        m_elem_node_local[i][1] = rhs.m_elem_node_local[i][1] ;
-        m_elem_node_local[i][2] = rhs.m_elem_node_local[i][2] ;
-        m_elem_node_local[i][3] = 0 ;
-      }
-      return *this ;
-    }
-
-  BoxElemFixture( const BoxElemPart::Decompose decompose ,
-                  const size_t global_size ,
-                  const size_t global_rank ,
-                  const size_t elem_nx ,
-                  const size_t elem_ny ,
-                  const size_t elem_nz ,
-                  const float bubble_x = 1.1f ,
-                  const float bubble_y = 1.2f ,
-                  const float bubble_z = 1.3f )
-  : m_box_part( Order , decompose , global_size , global_rank , elem_nx , elem_ny , elem_nz )
-  , m_coord_map( m_box_part.global_coord_max(0) ,
-                 m_box_part.global_coord_max(1) ,
-                 m_box_part.global_coord_max(2) ,
-                 bubble_x ,
-                 bubble_y ,
-                 bubble_z )
-  , m_node_coord( "fixture_node_coord" , m_box_part.uses_node_count() )
-  , m_node_grid(  "fixture_node_grid" , m_box_part.uses_node_count() )
-  , m_elem_node(  "fixture_elem_node" , m_box_part.uses_elem_count() )
-  , m_recv_node(  "fixture_recv_node" , m_box_part.recv_node_msg_count() )
-  , m_send_node(  "fixture_send_node" , m_box_part.send_node_msg_count() )
-  , m_send_node_id( "fixture_send_node_id" , m_box_part.send_node_id_count() )
-  {
-    {
-      const hex_data elem_data ;
-
-      for ( int i = 0 ; i < ElemNode ; ++i ) {
-        m_elem_node_local[i][0] = elem_data.eval_map[i][0] ;
-        m_elem_node_local[i][1] = elem_data.eval_map[i][1] ;
-        m_elem_node_local[i][2] = elem_data.eval_map[i][2] ;
-        m_elem_node_local[i][3] = 0 ;
-      }
-    }
-
-    const size_t nwork =
-      std::max( m_recv_node.extent(0) ,
-      std::max( m_send_node.extent(0) ,
-      std::max( m_send_node_id.extent(0) ,
-      std::max( m_node_grid.extent(0) ,
-                m_elem_node.extent(0) * m_elem_node.extent(1) ))));
-
-    Kokkos::parallel_for( nwork , *this );
-  }
-
-
-  // Initialization:
-
-  KOKKOS_INLINE_FUNCTION
-  void operator()( size_t i ) const
-  {
-    if ( i < m_elem_node.extent(0) * m_elem_node.extent(1) ) {
-
-      const size_t ielem = i / ElemNode ;
-      const size_t inode = i % ElemNode ;
-
-      size_t elem_grid[SpaceDim] ;
-      size_t tmp_node_grid[SpaceDim] ;
-
-      m_box_part.uses_elem_coord( ielem , elem_grid );
-
-      enum { elem_node_scale = Order == BoxElemPart::ElemLinear ? 1 :
-                               Order == BoxElemPart::ElemQuadratic ? 2 : 0 };
-
-      tmp_node_grid[0] = elem_node_scale * elem_grid[0] + m_elem_node_local[inode][0] ;
-      tmp_node_grid[1] = elem_node_scale * elem_grid[1] + m_elem_node_local[inode][1] ;
-      tmp_node_grid[2] = elem_node_scale * elem_grid[2] + m_elem_node_local[inode][2] ;
-
-      m_elem_node(ielem,inode) = m_box_part.local_node_id( tmp_node_grid );
-    }
-
-    if ( i < m_node_grid.extent(0) ) {
-      size_t tmp_node_grid[SpaceDim] ;
-      m_box_part.local_node_coord( i , tmp_node_grid );
-      m_node_grid(i,0) = tmp_node_grid[0] ;
-      m_node_grid(i,1) = tmp_node_grid[1] ;
-      m_node_grid(i,2) = tmp_node_grid[2] ;
-
-      m_coord_map( tmp_node_grid[0] ,
-                   tmp_node_grid[1] ,
-                   tmp_node_grid[2] ,
-                   m_node_coord(i,0) ,
-                   m_node_coord(i,1) ,
-                   m_node_coord(i,2) );
-    }
-
-    if ( i < m_recv_node.extent(0) ) {
-      m_recv_node(i,0) = m_box_part.recv_node_rank(i);
-      m_recv_node(i,1) = m_box_part.recv_node_count(i);
-    }
-
-    if ( i < m_send_node.extent(0) ) {
-      m_send_node(i,0) = m_box_part.send_node_rank(i);
-      m_send_node(i,1) = m_box_part.send_node_count(i);
-    }
-
-    if ( i < m_send_node_id.extent(0) ) {
-      m_send_node_id(i) = m_box_part.send_node_id(i);
-    }
-  }
-};
-
-} // namespace Example
-} // namespace Kokkos
-
-//----------------------------------------------------------------------------
-
-#endif /* #ifndef KOKKOS_EXAMPLE_BOXELEMFIXTURE_HPP */
-
diff --git a/lib/kokkos/example/fixture/BoxElemPart.cpp b/lib/kokkos/example/fixture/BoxElemPart.cpp
deleted file mode 100644
index 7b85936da7..0000000000
--- a/lib/kokkos/example/fixture/BoxElemPart.cpp
+++ /dev/null
@@ -1,413 +0,0 @@
-/*
-//@HEADER
-// ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
-// the U.S. Government retains certain rights in this software.
-// 
-// 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 Corporation nor the names of the
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "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 SANDIA CORPORATION OR THE
-// 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.
-//
-// Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
-// ************************************************************************
-//@HEADER
-*/
-
-#include <utility>
-#include <iostream>
-#include <sstream>
-#include <stdexcept>
-#include <limits>
-#include <BoxElemPart.hpp>
-
-//----------------------------------------------------------------------------
-
-namespace Kokkos {
-namespace Example {
-
-void box_partition( const size_t global_size ,
-                    const size_t global_rank ,
-                    const size_t global_box[][2] ,
-                          size_t box[][2] )
-{
-  box[0][0] = global_box[0][0] ; box[0][1] = global_box[0][1] ;
-  box[1][0] = global_box[1][0] ; box[1][1] = global_box[1][1] ;
-  box[2][0] = global_box[2][0] ; box[2][1] = global_box[2][1] ;
-
-  size_t ip = 0 ;
-  size_t np = global_size ;
-
-  while ( 1 < np ) {
-
-    // P = [ ip + j * portion , ip + ( j + 1 ) * portion )
-
-    size_t jip , jup ;
-
-    {
-      const size_t part = ( 0 == ( np % 5 ) ) ? 5 : (
-                          ( 0 == ( np % 3 ) ) ? 3 : 2 );
-
-      const size_t portion = np / part ;
-
-      if ( 2 < part || global_rank < ip + portion ) {
-        jip = portion * size_t( double( global_rank - ip ) / double(portion) );
-        jup = jip + portion ;
-      }
-      else {
-        jip = portion ;
-        jup = np ;
-      }
-    }
-
-    // Choose axis with largest count:
-
-    const size_t nb[3] = {
-      box[0][1] - box[0][0] ,
-      box[1][1] - box[1][0] ,
-      box[2][1] - box[2][0] };
-
-    const int axis = nb[2] > nb[1] ? ( nb[2] > nb[0] ? 2 : 0 )
-                                        : ( nb[1] > nb[0] ? 1 : 0 );
-
-    box[ axis ][1] = box[ axis ][0] + size_t( double(nb[axis]) * ( double(jup) / double(np) ));
-    box[ axis ][0] = box[ axis ][0] + size_t( double(nb[axis]) * ( double(jip) / double(np) ));
-
-    np = jup - jip ;
-    ip = ip + jip ;
-  }
-}
-
-} /* namespace Example */
-} /* namespace Kokkos */
-
-//----------------------------------------------------------------------------
-
-namespace Kokkos {
-namespace Example {
-
-void BoxElemPart::local( const size_t  rank ,
-                               size_t  uses_elem[][2] ,
-                               size_t  owns_node[][2] ,
-                               size_t  uses_node[][2] ) const
-{
-  if ( BoxElemPart::DecomposeElem == m_decompose ) {
-
-    Kokkos::Example::box_partition( m_global_size , rank , m_global_elem_box , uses_elem );
-
-    for ( int i = 0 ; i < 3 ; ++i ) {
-      owns_node[i][0] = uses_elem[i][0] ;
-      owns_node[i][1] = uses_elem[i][1] + ( m_global_elem_box[i][1] == uses_elem[i][1] ? 1 : 0 );
-    }
-  }
-  else {
-
-    const size_t global_vert[3][2] =
-      { { 0 , m_global_elem_box[0][1] + 1 },
-        { 0 , m_global_elem_box[1][1] + 1 },
-        { 0 , m_global_elem_box[2][1] + 1 } };
-
-    Kokkos::Example::box_partition( m_global_size , rank , global_vert , owns_node );
-
-    for ( int i = 0 ; i < 3 ; ++i ) {
-      uses_elem[i][0] = global_vert[i][0] == owns_node[i][0] ? owns_node[i][0] : owns_node[i][0] - 1 ;
-      uses_elem[i][1] = global_vert[i][1] == owns_node[i][1] ? owns_node[i][1] - 1 : owns_node[i][1] ;
-    }
-  }
-
-  for ( int i = 0 ; i < 3 ; ++i ) {
-    uses_node[i][0] = uses_elem[i][0] ;
-    uses_node[i][1] = uses_elem[i][1] + 1 ;
-  }
-
-  if ( BoxElemPart::ElemQuadratic == m_elem_order ) {
-    for ( int i = 0 ; i < 3 ; ++i ) {
-      owns_node[i][0] = 2 * owns_node[i][0] ;
-      uses_node[i][0] = 2 * uses_node[i][0] ;
-      owns_node[i][1] = 2 * owns_node[i][1] - 1 ;
-      uses_node[i][1] = 2 * uses_node[i][1] - 1 ;
-    }
-  }
-}
-
-BoxElemPart::BoxElemPart(
-  const BoxElemPart::ElemOrder elem_order ,
-  const BoxElemPart::Decompose decompose ,
-  const size_t global_size ,
-  const size_t global_rank ,
-  const size_t elem_nx ,
-  const size_t elem_ny ,
-  const size_t elem_nz )
-{
-  m_global_size = global_size ;
-  m_global_rank = global_rank ;
-  m_decompose   = decompose ;
-  m_elem_order  = elem_order ;
-
-  m_global_elem_box[0][0] = 0 ; m_global_elem_box[0][1] = elem_nx ;
-  m_global_elem_box[1][0] = 0 ; m_global_elem_box[1][1] = elem_ny ;
-  m_global_elem_box[2][0] = 0 ; m_global_elem_box[2][1] = elem_nz ;
-
-  m_global_node_box[0][0] = 0 ; m_global_node_box[0][1] = 0 ;
-  m_global_node_box[1][0] = 0 ; m_global_node_box[1][1] = 0 ;
-  m_global_node_box[2][0] = 0 ; m_global_node_box[2][1] = 0 ;
-
-  m_owns_node_count = 0 ;
-  m_send_node_count = 0 ;
-
-  m_ok = true ;
-
-  //----------------------------------------
-
-  if ( ElemLinear == elem_order ) {
-    m_global_node_box[0][1] = elem_nx + 1 ;
-    m_global_node_box[1][1] = elem_ny + 1 ;
-    m_global_node_box[2][1] = elem_nz + 1 ;
-  }
-  else if ( ElemQuadratic == elem_order ) {
-    m_global_node_box[0][1] = 2 * elem_nx + 1 ;
-    m_global_node_box[1][1] = 2 * elem_ny + 1 ;
-    m_global_node_box[2][1] = 2 * elem_nz + 1 ;
-  }
-
-  //----------------------------------------
-
-  local( m_global_rank , m_uses_elem_box , m_owns_node_box[0] , m_uses_node_box );
-
-  const size_t global_node_count_ = Kokkos::Example::box_count( m_global_node_box );
-  const size_t global_elem_count_ = Kokkos::Example::box_count( m_global_elem_box );
-
-  //----------------------------------------
-
-  size_t elem_count = Kokkos::Example::box_count( m_uses_elem_box );
-  size_t node_count = Kokkos::Example::box_count( m_owns_node_box[0] );
-
-  m_owns_node[0][0] = global_rank ;
-  m_owns_node[0][1] = node_count ;
-  m_owns_node_count = 1 ;
-  m_send_node_count = 0 ;
-
-  for ( size_t rr = 1 ; rr < m_global_size && m_ok ; ++rr ) {
-
-    const size_t rank = ( m_global_rank + rr ) % m_global_size ;
-
-    size_t elem_box[3][2] , o_node_box[3][2] , u_node_box[3][2] ;
-
-    // Boxes for process 'rank'
-    local( rank , elem_box , o_node_box , u_node_box );
-
-    // Box that this process uses but is owned by process 'rank'
-    Kokkos::Example::box_intersect( m_owns_node_box[ m_owns_node_count ] , m_uses_node_box , o_node_box );
-
-    m_owns_node[ m_owns_node_count ][1] = Kokkos::Example::box_count( m_owns_node_box[ m_owns_node_count ] );
-
-    if ( m_owns_node[ m_owns_node_count ][1] ) {
-
-      if ( ( PROC_NEIGH_MAX - 1 ) <= m_owns_node_count ) {
-        std::cout << "BoxElemPart exceeded maximum neighbor count" << std::endl ;
-        m_ok = false ;
-        break ;
-      }
-
-      m_owns_node[ m_owns_node_count ][0] = rank ;
-
-      ++m_owns_node_count ;
-    }
-
-    // Box that this process owns and is used by process 'rank'
-    Kokkos::Example::box_intersect( m_send_node_box[ m_send_node_count ] , m_owns_node_box[0] , u_node_box );
-
-    m_send_node[ m_send_node_count ][1] = Kokkos::Example::box_count( m_send_node_box[ m_send_node_count ] );
-
-    if ( m_send_node[ m_send_node_count ][1] ) {
-
-      if ( ( PROC_NEIGH_MAX - 1 ) <= m_send_node_count ) {
-        std::cout << "BoxElemPart exceeded maximum neighbor count" << std::endl ;
-        m_ok = false ;
-        break ;
-      }
-
-      m_send_node[ m_send_node_count ][0] = rank ;
-      ++m_send_node_count ;
-    }
-
-    // Error checking:
-
-    size_t test_box[3][2] ;
-
-    elem_count += Kokkos::Example::box_count( elem_box );
-    node_count += Kokkos::Example::box_count( o_node_box );
-
-    {
-      Kokkos::Example::box_intersect( test_box , m_owns_node_box[0] , o_node_box );
-
-      if ( Kokkos::Example::box_count( test_box ) ) {
-        std::cout << "Box partitioning error" << std::endl ;
-        std::cout << "owns_node[" << m_global_rank << "]{"
-                  << " [" << m_owns_node_box[0][0][0] << "," << m_owns_node_box[0][0][1] << ")"
-                  << " [" << m_owns_node_box[0][1][0] << "," << m_owns_node_box[0][1][1] << ")"
-                  << " [" << m_owns_node_box[0][2][0] << "," << m_owns_node_box[0][2][1] << ")"
-                  << "} intersects"
-                  << " owns_node[" << rank << "]{"
-                  << " [" << o_node_box[0][0] << "," << o_node_box[0][1] << ")"
-                  << " [" << o_node_box[1][0] << "," << o_node_box[1][1] << ")"
-                  << " [" << o_node_box[2][0] << "," << o_node_box[2][1] << ")"
-                  << "}" << std::endl ;
-        m_ok = false ;
-        break ;
-      }
-    }
-
-    if ( DecomposeElem == decompose ) {
-
-      Kokkos::Example::box_intersect( test_box , m_uses_elem_box , elem_box );
-
-      if ( Kokkos::Example::box_count( test_box ) ) {
-        std::cout << "Box partitioning error" << std::endl ;
-        std::cout << "ElemBox[" << m_global_rank << "]{"
-                  << " [" << m_uses_elem_box[0][0] << "," << m_uses_elem_box[0][1] << ")"
-                  << " [" << m_uses_elem_box[1][0] << "," << m_uses_elem_box[1][1] << ")"
-                  << " [" << m_uses_elem_box[2][0] << "," << m_uses_elem_box[2][1] << ")"
-                  << "} intersects"
-                  << " ElemBox[" << rank << "]{"
-                  << " [" << elem_box[0][0] << "," << elem_box[0][1] << ")"
-                  << " [" << elem_box[1][0] << "," << elem_box[1][1] << ")"
-                  << " [" << elem_box[2][0] << "," << elem_box[2][1] << ")"
-                  << "}" << std::endl ;
-        m_ok = false ;
-        break ;
-      }
-    }
-  }
-
-  // Sentinal values at the end of the owns and send lists:
-
-  m_owns_node[ m_owns_node_count ][0] = ~0u ;
-  m_owns_node[ m_owns_node_count ][1] = ~0u ;
-  m_owns_node_box[ m_owns_node_count ][0][0] = 0u ; m_owns_node_box[ m_owns_node_count ][0][0] = ~0u ;
-  m_owns_node_box[ m_owns_node_count ][1][0] = 0u ; m_owns_node_box[ m_owns_node_count ][1][0] = ~0u ;
-  m_owns_node_box[ m_owns_node_count ][2][0] = 0u ; m_owns_node_box[ m_owns_node_count ][2][0] = ~0u ;
-
-  m_send_node[ m_send_node_count ][0] = ~0u ;
-  m_send_node[ m_send_node_count ][1] = ~0u ;
-  m_send_node_box[ m_send_node_count ][0][0] = 0u ; m_send_node_box[ m_send_node_count ][0][0] = ~0u ;
-  m_send_node_box[ m_send_node_count ][1][0] = 0u ; m_send_node_box[ m_send_node_count ][1][0] = ~0u ;
-  m_send_node_box[ m_send_node_count ][2][0] = 0u ; m_send_node_box[ m_send_node_count ][2][0] = ~0u ;
-
-  {
-    size_t count = 0 ;
-    for ( size_t i = 0 ; i < m_owns_node_count ; ++i ) {
-      count += m_owns_node[i][1] ;
-    }
-    if ( count != Kokkos::Example::box_count( m_uses_node_box ) ) {
-      std::cout << "Node uses count = " << Kokkos::Example::box_count( m_uses_node_box )
-                << " error count = " << count << std::endl ;
-      m_ok = false ;
-    }
-  }
-
-  if ( global_node_count_ != node_count ) {
-    std::cout << "Node count = " << global_node_count_ << " overlap error count = " << node_count << std::endl ;
-    m_ok = false ;
-  }
-
-  if ( DecomposeElem == decompose && global_elem_count_ != elem_count ) {
-    std::cout << "Elem count = " << global_elem_count_ << " overlap error count = " << elem_count << std::endl ;
-    m_ok = false ;
-  }
-
-  if ( ! m_ok ) {
-    for ( int i = 0 ; i < 3 ; ++i ) { for ( int j = 0 ; j < 2 ; ++j ) {
-      m_global_elem_box[i][j] = 0 ;
-      m_global_node_box[i][j] = 0 ;
-      m_uses_elem_box[i][j] = 0 ;
-      m_uses_node_box[i][j] = 0 ;
-    }}
-    m_owns_node_count = 0 ;
-    m_send_node_count = 0 ;
-  }
-}
-
-void BoxElemPart::print( std::ostream & s ) const
-{
-  s << "BoxElemPart P[" << m_global_rank << ":" << m_global_size << "]"
-    << std::endl
-    << "  elem_box {"
-    << " [" << m_uses_elem_box[0][0] << "," << m_uses_elem_box[0][1] << ")"
-    << " [" << m_uses_elem_box[1][0] << "," << m_uses_elem_box[1][1] << ")"
-    << " [" << m_uses_elem_box[2][0] << "," << m_uses_elem_box[2][1] << ")"
-    << " } / {"
-    << " [" << m_global_elem_box[0][0] << "," << m_global_elem_box[0][1] << ")"
-    << " [" << m_global_elem_box[1][0] << "," << m_global_elem_box[1][1] << ")"
-    << " [" << m_global_elem_box[2][0] << "," << m_global_elem_box[2][1] << ")"
-    << " }"
-    << std::endl
-    << "  node_box {"
-    << " [" << m_owns_node_box[0][0][0] << "," << m_owns_node_box[0][0][1] << ")"
-    << " [" << m_owns_node_box[0][1][0] << "," << m_owns_node_box[0][1][1] << ")"
-    << " [" << m_owns_node_box[0][2][0] << "," << m_owns_node_box[0][2][1] << ")"
-    << " } / {"
-    << " [" << m_uses_node_box[0][0] << "," << m_uses_node_box[0][1] << ")"
-    << " [" << m_uses_node_box[1][0] << "," << m_uses_node_box[1][1] << ")"
-    << " [" << m_uses_node_box[2][0] << "," << m_uses_node_box[2][1] << ")"
-    << " } / {"
-    << " [" << m_global_node_box[0][0] << "," << m_global_node_box[0][1] << ")"
-    << " [" << m_global_node_box[1][0] << "," << m_global_node_box[1][1] << ")"
-    << " [" << m_global_node_box[2][0] << "," << m_global_node_box[2][1] << ")"
-    << " }"
-    << std::endl ;
-
-  for ( size_t i = 1 ; i < m_owns_node_count ; ++i ) {
-    s << "  P[" << m_owns_node[i][0] << "]"
-      << " recv node_box {"
-      << " [" << m_owns_node_box[i][0][0] << "," << m_owns_node_box[i][0][1] << ")"
-      << " [" << m_owns_node_box[i][1][0] << "," << m_owns_node_box[i][1][1] << ")"
-      << " [" << m_owns_node_box[i][2][0] << "," << m_owns_node_box[i][2][1] << ")"
-      << " }"
-      << std::endl ;
-  }
-
-  for ( size_t i = 0 ; i < m_send_node_count ; ++i ) {
-    s << "  P[" << m_send_node[i][0] << "]"
-      << " send node_box {"
-      << " [" << m_send_node_box[i][0][0] << "," << m_send_node_box[i][0][1] << ")"
-      << " [" << m_send_node_box[i][1][0] << "," << m_send_node_box[i][1][1] << ")"
-      << " [" << m_send_node_box[i][2][0] << "," << m_send_node_box[i][2][1] << ")"
-      << " }"
-      << std::endl ;
-  }
-}
-
-} /* namespace Example */
-} /* namespace Kokkos */
-
-//----------------------------------------------------------------------------
-
-
diff --git a/lib/kokkos/example/fixture/BoxElemPart.hpp b/lib/kokkos/example/fixture/BoxElemPart.hpp
deleted file mode 100644
index 6cd91c6f6f..0000000000
--- a/lib/kokkos/example/fixture/BoxElemPart.hpp
+++ /dev/null
@@ -1,320 +0,0 @@
-/*
-//@HEADER
-// ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
-// the U.S. Government retains certain rights in this software.
-// 
-// 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 Corporation nor the names of the
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "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 SANDIA CORPORATION OR THE
-// 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.
-//
-// Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
-// ************************************************************************
-//@HEADER
-*/
-
-#ifndef KOKKOS_BOXELEMPART_HPP
-#define KOKKOS_BOXELEMPART_HPP
-
-#include <utility>
-#include <ostream>
-#include <Kokkos_Macros.hpp>
-
-//----------------------------------------------------------------------------
-
-namespace Kokkos {
-namespace Example {
-
-KOKKOS_INLINE_FUNCTION
-void box_intersect( size_t box[][2] ,
-                    const size_t boxA[][2] ,
-                    const size_t boxB[][2] )
-{
-  for ( int i = 0 ; i < 3 ; ++i ) {
-    box[i][0] = boxA[i][0] > boxB[i][0] ? boxA[i][0] : boxB[i][0] ;
-    box[i][1] = boxA[i][1] < boxB[i][1] ? boxA[i][1] : boxB[i][1] ;
-    if ( box[i][0] > box[i][1] ) box[i][1] = box[i][0] ;
-  }
-}
-
-KOKKOS_INLINE_FUNCTION
-size_t box_count( const size_t box[][2] )
-{
-  return size_t( box[0][1] - box[0][0] ) *
-         size_t( box[1][1] - box[1][0] ) *
-         size_t( box[2][1] - box[2][0] );
-}
-
-KOKKOS_INLINE_FUNCTION
-void box_ghost_layer( const size_t global_box[][2] ,
-                      const size_t local_box[][2] ,
-                      const size_t ghost_layer ,
-                            size_t ghost_box[][2] )
-{
-  for ( int i = 0 ; i < 3 ; ++i ) {
-    ghost_box[i][0] = global_box[i][0] + ghost_layer > local_box[i][0] ? global_box[i][0] : local_box[i][0] - ghost_layer ;
-    ghost_box[i][1] = global_box[i][1] < local_box[i][1] + ghost_layer ? global_box[i][1] : local_box[i][1] + ghost_layer ;
-  }
-}
-
-void box_partition( const size_t global_size ,
-                    const size_t global_rank ,
-                    const size_t global_box[][2] ,
-                          size_t box[][2] );
-
-} // namespace Example
-} // namespace Kokkos
-
-//----------------------------------------------------------------------------
-
-namespace Kokkos {
-namespace Example {
-
-/** \brief Partition a box of hexahedral elements among subdomains.
- *
- *  Nodes are ordered locally as follows:
- *    { owned_by[ this_process ] ,
- *      owned_by[ neighbor_process[0] ] ,
- *      owned_by[ neighbor_process[1] ] ,
- *      owned_by[ neighbor_process[2] ] ,
- *      ... };
- */
-class BoxElemPart {
-public:
-
-  enum Decompose { DecomposeNode , DecomposeElem };
-  enum ElemOrder { ElemLinear , ElemQuadratic };
-
-  bool ok() const { return m_ok ; }
-
-  BoxElemPart( const ElemOrder elem_order ,
-               const Decompose decompose ,
-               const size_t global_size ,
-               const size_t global_rank ,
-               const size_t elem_nx ,
-               const size_t elem_ny ,
-               const size_t elem_nz );
-
-  KOKKOS_INLINE_FUNCTION
-  size_t global_elem_count() const
-    { return Kokkos::Example::box_count( m_global_elem_box ); }
-
-  KOKKOS_INLINE_FUNCTION
-  size_t global_node_count() const
-    { return Kokkos::Example::box_count( m_global_node_box ); }
-
-  KOKKOS_INLINE_FUNCTION
-  size_t uses_elem_count() const
-    { return Kokkos::Example::box_count( m_uses_elem_box ); }
-
-  KOKKOS_INLINE_FUNCTION
-  size_t owns_node_count() const
-    { return Kokkos::Example::box_count( m_owns_node_box[0] ); }
-
-  KOKKOS_INLINE_FUNCTION
-  size_t uses_node_count() const
-    { return Kokkos::Example::box_count( m_uses_node_box ); }
-
-  //----------------------------------------
-
-  KOKKOS_INLINE_FUNCTION
-  size_t uses_elem_offset( const size_t ix ,
-                           const size_t iy ,
-                           const size_t iz ) const
-  {
-    return size_t( ix - m_uses_elem_box[0][0] ) + size_t( m_uses_elem_box[0][1] - m_uses_elem_box[0][0] ) * (
-           size_t( iy - m_uses_elem_box[1][0] ) + size_t( m_uses_elem_box[1][1] - m_uses_elem_box[1][0] ) * (
-           size_t( iz - m_uses_elem_box[2][0] ) ) );
-  }
-
-  KOKKOS_INLINE_FUNCTION
-  void uses_elem_coord( size_t lid , size_t c[] ) const
-  {
-    const size_t nx = m_uses_elem_box[0][1] - m_uses_elem_box[0][0] ;
-    const size_t ny = m_uses_elem_box[1][1] - m_uses_elem_box[1][0] ;
-
-    c[0] = m_uses_elem_box[0][0] + lid % nx ; lid /= nx ;
-    c[1] = m_uses_elem_box[1][0] + lid % ny ; lid /= ny ;
-    c[2] = m_uses_elem_box[2][0] + lid ;
-  }
-
-  //----------------------------------------
-
-  KOKKOS_INLINE_FUNCTION
-  size_t global_coord_max( size_t axis ) const
-  { return m_global_node_box[axis][1] - 1 ; }
-
-  //----------------------------------------
-
-  KOKKOS_INLINE_FUNCTION
-  void local_node_coord( size_t lid , size_t coord[] ) const
-  {
-    // Local id within an 'owns' block (has sentinal)
-    size_t j = 0 ;
-    while ( m_owns_node[j][1] <= lid ) { lid -= m_owns_node[j][1] ; ++j ; }
-
-    // Map to global coordinates:
-    const size_t nx = m_owns_node_box[j][0][1] - m_owns_node_box[j][0][0] ;
-    const size_t ny = m_owns_node_box[j][1][1] - m_owns_node_box[j][1][0] ;
-
-    coord[0] = m_owns_node_box[j][0][0] + lid % nx ; lid /= nx ;
-    coord[1] = m_owns_node_box[j][1][0] + lid % ny ; lid /= ny ;
-    coord[2] = m_owns_node_box[j][2][0] + lid ;
-  }
-
-  KOKKOS_INLINE_FUNCTION
-  size_t local_node_id( const size_t c[] ) const
-  {
-    // Find which 'owns' block and accumulate the offset of this block:
-    size_t lid = 0 ;
-    size_t j = 0 ;
-    while ( ! ( m_owns_node_box[j][0][0] <= c[0] && c[0] < m_owns_node_box[j][0][1] &&
-                m_owns_node_box[j][1][0] <= c[1] && c[1] < m_owns_node_box[j][1][1] &&
-                m_owns_node_box[j][2][0] <= c[2] && c[2] < m_owns_node_box[j][2][1] ) ) {
-      
-      lid += m_owns_node[j][1] ;
-      ++j ;
-    }
-
-    // Map offset to the block plus offset within the block:
-    return lid +
-           size_t( c[0] - m_owns_node_box[j][0][0] ) + size_t( m_owns_node_box[j][0][1] - m_owns_node_box[j][0][0] ) * (
-           size_t( c[1] - m_owns_node_box[j][1][0] ) + size_t( m_owns_node_box[j][1][1] - m_owns_node_box[j][1][0] ) * (
-           size_t( c[2] - m_owns_node_box[j][2][0] ) ) );
-  }
-
-  KOKKOS_INLINE_FUNCTION
-  size_t global_node_id( const size_t c[] ) const
-  {
-    return size_t( c[0] - m_global_node_box[0][0] ) + size_t( m_global_node_box[0][1] - m_global_node_box[0][0] ) * (
-           size_t( c[1] - m_global_node_box[1][0] ) + size_t( m_global_node_box[1][1] - m_global_node_box[1][0] ) * (
-           size_t( c[2] - m_global_node_box[2][0] ) ) );
-  }
-
-  //----------------------------------------
-
-  KOKKOS_INLINE_FUNCTION
-  size_t recv_node_msg_count() const { return m_owns_node_count - 1 ; }
-
-  KOKKOS_INLINE_FUNCTION
-  size_t recv_node_rank(  size_t msg ) const { return m_owns_node[msg+1][0] ; }
-
-  KOKKOS_INLINE_FUNCTION
-  size_t recv_node_count( size_t msg ) const { return m_owns_node[msg+1][1] ; }
-
-  //----------------------------------------
-
-  KOKKOS_INLINE_FUNCTION
-  size_t send_node_msg_count() const { return m_send_node_count ; }
-
-  KOKKOS_INLINE_FUNCTION
-  size_t send_node_rank(  size_t msg ) const { return m_send_node[msg][0] ; }
-
-  KOKKOS_INLINE_FUNCTION
-  size_t send_node_count( size_t msg ) const { return m_send_node[msg][1] ; }
-
-  KOKKOS_INLINE_FUNCTION
-  size_t send_node_id_count() const
-  {
-    size_t count = 0 ;
-    for ( size_t i = 0 ; i < m_send_node_count ; ++i ) {
-      count += m_send_node[i][1] ;
-    }
-    return count ;
-  }
-
-  KOKKOS_INLINE_FUNCTION
-  size_t send_node_id( size_t item ) const
-  {
-    // Find which send list this send item is in:
-    size_t j = 0 ;
-    while ( m_send_node[j][1] <= item ) { item -= m_send_node[j][1] ; ++j ; }
-
-    // Map to global coordinate:
-    const size_t nx = m_send_node_box[j][0][1] - m_send_node_box[j][0][0] ;
-    const size_t ny = m_send_node_box[j][1][1] - m_send_node_box[j][1][0] ;
-
-    size_t c[3] ;
-
-    c[0] = m_send_node_box[j][0][0] + item % nx ; item /= nx ;
-    c[1] = m_send_node_box[j][1][0] + item % ny ; item /= ny ;
-    c[2] = m_send_node_box[j][2][0] + item ;
-
-    // Map to local id:
-    return size_t( c[0] - m_owns_node_box[0][0][0] ) + size_t( m_owns_node_box[0][0][1] - m_owns_node_box[0][0][0] ) * (
-           size_t( c[1] - m_owns_node_box[0][1][0] ) + size_t( m_owns_node_box[0][1][1] - m_owns_node_box[0][1][0] ) * (
-           size_t( c[2] - m_owns_node_box[0][2][0] ) ) );
-  }
-
-  //----------------------------------------
-
-  void print( std::ostream & s ) const ;
-
-private:
-
-  // Maximum number of processes in a neighborhood, including this process
-  enum { PROC_NEIGH_MAX = 64 };
-
-  void local( const size_t  rank ,
-                    size_t  uses_elem[][2] ,
-                    size_t  owns_node[][2] ,
-                    size_t  uses_node[][2] ) const ;
-
-  size_t  m_global_size ;
-  size_t  m_global_rank ;
-
-  Decompose m_decompose ;
-  ElemOrder m_elem_order ;
-
-  size_t m_global_elem_box[3][2] ;
-  size_t m_global_node_box[3][2] ;
-  size_t m_uses_elem_box[3][2] ;
-  size_t m_uses_node_box[3][2] ;
-
-  // [ processor rank , count ]
-  size_t m_owns_node_box[ PROC_NEIGH_MAX ][3][2] ;
-  size_t m_owns_node[     PROC_NEIGH_MAX ][2] ;
-  size_t m_owns_node_count ;
-
-  size_t m_send_node_box[ PROC_NEIGH_MAX ][3][2] ;
-  size_t m_send_node[     PROC_NEIGH_MAX ][2] ;
-  size_t m_send_node_count ;
-
-  bool   m_ok ;
-};
-
-} // namespace Example
-} // namespace Kokkos
-
-//----------------------------------------------------------------------------
-
-#endif /* #ifndef KOKKOS_BOXELEMPART_HPP */
-
diff --git a/lib/kokkos/example/fixture/CMakeLists.txt b/lib/kokkos/example/fixture/CMakeLists.txt
deleted file mode 100644
index 298c54c5bb..0000000000
--- a/lib/kokkos/example/fixture/CMakeLists.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-
-INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR})
-INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR})
-INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../common)
-
-SET(SOURCES_TEST Main.cpp TestFixture.cpp BoxElemPart.cpp )
-
-# Automatically picks up 'kokkosexample_fixture'
-TRIBITS_ADD_EXECUTABLE_AND_TEST(
-  TestFixture
-  SOURCES ${SOURCES_TEST}
-  )
-
diff --git a/lib/kokkos/example/fixture/HexElement.hpp b/lib/kokkos/example/fixture/HexElement.hpp
deleted file mode 100644
index 72bc45fd21..0000000000
--- a/lib/kokkos/example/fixture/HexElement.hpp
+++ /dev/null
@@ -1,270 +0,0 @@
-/*
-//@HEADER
-// ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
-// the U.S. Government retains certain rights in this software.
-// 
-// 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 Corporation nor the names of the
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "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 SANDIA CORPORATION OR THE
-// 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.
-//
-// Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
-// ************************************************************************
-//@HEADER
-*/
-
-#ifndef KOKKOS_HEXELEMENT_HPP
-#define KOKKOS_HEXELEMENT_HPP
-
-namespace Kokkos {
-namespace Example {
-
-template< unsigned NodeCount >
-class HexElement_TensorData ;
-
-template< unsigned NodeCount , class Device >
-class HexElement_TensorEval ;
-
-//----------------------------------------------------------------------------
-/** \brief  Evaluate Hex element on interval [-1,1]^3 */
-template<>
-class HexElement_TensorData< 8 > {
-public:
-
-  static const unsigned element_node_count    = 8 ;
-  static const unsigned spatial_dimension     = 3 ;
-  static const unsigned integration_count_1d  = 2 ;
-  static const unsigned function_count_1d     = 2 ;
-
-  float values_1d [ function_count_1d ][ integration_count_1d ];
-  float derivs_1d [ function_count_1d ][ integration_count_1d ];
-  float weights_1d[ integration_count_1d ];
-
-  unsigned char eval_map[ element_node_count ][4] ;
-
-  static float eval_value_1d( const unsigned jf , const float x )
-  {
-    return 0 == jf ? 0.5 * ( 1.0 - x ) : (
-           1 == jf ? 0.5 * ( 1.0 + x ) : 0 );
-  }
-
-  static float eval_deriv_1d( const unsigned jf , const float )
-  {
-    return 0 == jf ? -0.5 : (
-           1 == jf ?  0.5 : 0 );
-  }
-
-  HexElement_TensorData()
-  {
-    const unsigned char tmp_map[ element_node_count ][ spatial_dimension ] =
-      { { 0 , 0 , 0 },
-        { 1 , 0 , 0 },
-        { 1 , 1 , 0 },
-        { 0 , 1 , 0 },
-        { 0 , 0 , 1 },
-        { 1 , 0 , 1 },
-        { 1 , 1 , 1 },
-        { 0 , 1 , 1 } };
-
-    weights_1d[0] = 1 ;
-    weights_1d[1] = 1 ;
-
-    const float points_1d[ integration_count_1d ] =
-      { -0.577350269 , 0.577350269 };
-
-    for ( unsigned i = 0 ; i < element_node_count ; ++i ) {
-      eval_map[i][0] = tmp_map[i][0];
-      eval_map[i][1] = tmp_map[i][1];
-      eval_map[i][2] = tmp_map[i][2];
-    }
-
-    for ( unsigned xp = 0 ; xp < integration_count_1d ; ++xp ) {
-    for ( unsigned xf = 0 ; xf < function_count_1d ; ++xf ) {
-      values_1d[xp][xf] = eval_value_1d( xf , points_1d[xp] );
-      derivs_1d[xp][xf] = eval_deriv_1d( xf , points_1d[xp] );
-    }}
-  }
-};
-
-//----------------------------------------------------------------------------
-
-template<>
-class HexElement_TensorData< 27 > {
-public:
-
-  static const unsigned element_node_count    = 27 ;
-  static const unsigned spatial_dimension     = 3 ;
-  static const unsigned integration_count_1d  = 3 ;
-  static const unsigned function_count_1d     = 3 ;
-
-  float values_1d [ function_count_1d ][ integration_count_1d ];
-  float derivs_1d [ function_count_1d ][ integration_count_1d ];
-  float weights_1d[ integration_count_1d ];
-
-  unsigned char eval_map[ element_node_count ][4] ;
-
-  // sizeof(EvaluateElementHex) = 111 bytes =
-  //   sizeof(float) * 9 +
-  //   sizeof(float) * 9 +
-  //   sizeof(float) * 3 +
-  //   sizeof(char) * 27 
-
-  static float eval_value_1d( const unsigned jf , const float p )
-  {
-    return 0 == jf ? 0.5 * p * ( p - 1 ) : (
-           1 == jf ? 1.0 - p * p : (
-           2 == jf ? 0.5 * p * ( p + 1 ) : 0 ));
-  }
-
-  static float eval_deriv_1d( const unsigned jf , const float p )
-  {
-    return 0 == jf ? p - 0.5 : (
-           1 == jf ? -2.0 * p : (
-           2 == jf ? p + 0.5 : 0 ));
-  }
-
-  HexElement_TensorData()
-  {
-    const unsigned char tmp_map[ element_node_count ][ spatial_dimension ] =
-      { { 0 , 0 , 0 },
-        { 2 , 0 , 0 },
-        { 2 , 2 , 0 },
-        { 0 , 2 , 0 },
-        { 0 , 0 , 2 },
-        { 2 , 0 , 2 },
-        { 2 , 2 , 2 },
-        { 0 , 2 , 2 },
-        { 1 , 0 , 0 },
-        { 2 , 1 , 0 },
-        { 1 , 2 , 0 },
-        { 0 , 1 , 0 },
-        { 0 , 0 , 1 },
-        { 2 , 0 , 1 },
-        { 2 , 2 , 1 },
-        { 0 , 2 , 1 },
-        { 1 , 0 , 2 },
-        { 2 , 1 , 2 },
-        { 1 , 2 , 2 },
-        { 0 , 1 , 2 },
-        { 1 , 1 , 1 },
-        { 1 , 1 , 0 },
-        { 1 , 1 , 2 },
-        { 0 , 1 , 1 },
-        { 2 , 1 , 1 },
-        { 1 , 0 , 1 },
-        { 1 , 2 , 1 } };
-
-    // Interval [-1,1]
-
-    weights_1d[0] = 0.555555556 ;
-    weights_1d[1] = 0.888888889 ;
-    weights_1d[2] = 0.555555556 ;
-
-    const float points_1d[3] = { -0.774596669 ,
-                                  0.000000000 ,
-                                  0.774596669 };
-
-    for ( unsigned i = 0 ; i < element_node_count ; ++i ) {
-      eval_map[i][0] = tmp_map[i][0];
-      eval_map[i][1] = tmp_map[i][1];
-      eval_map[i][2] = tmp_map[i][2];
-    }
-
-    for ( unsigned xp = 0 ; xp < integration_count_1d ; ++xp ) {
-    for ( unsigned xf = 0 ; xf < function_count_1d ; ++xf ) {
-      values_1d[xp][xf] = eval_value_1d( xf , points_1d[xp] );
-      derivs_1d[xp][xf] = eval_deriv_1d( xf , points_1d[xp] );
-    }}
-  }
-};
-
-//----------------------------------------------------------------------------
-
-template< unsigned NodeCount >
-class HexElement_Data {
-public:
-  static const unsigned spatial_dimension   = 3 ;
-  static const unsigned element_node_count  = NodeCount ;
-  static const unsigned integration_count   = NodeCount ;
-  static const unsigned function_count      = NodeCount ;
-
-  float weights[   integration_count ] ;
-  float values[    integration_count ][ function_count ];
-  float gradients[ integration_count ][ spatial_dimension ][ function_count ];
-
-  HexElement_Data()
-  {
-    HexElement_TensorData< NodeCount > tensor_data ;
-
-    for ( unsigned ip = 0 ; ip < integration_count ; ++ip ) {
-
-      const unsigned ipx = tensor_data.eval_map[ip][0] ;
-      const unsigned ipy = tensor_data.eval_map[ip][1] ;
-      const unsigned ipz = tensor_data.eval_map[ip][2] ;
-
-      weights[ip] = tensor_data.weights_1d[ ipx ] *
-                    tensor_data.weights_1d[ ipy ] *
-                    tensor_data.weights_1d[ ipz ] ;
-
-      for ( unsigned jf = 0 ; jf < function_count ; ++jf ) {
-
-        const unsigned jfx = tensor_data.eval_map[jf][0] ;
-        const unsigned jfy = tensor_data.eval_map[jf][1] ;
-        const unsigned jfz = tensor_data.eval_map[jf][2] ;
-
-        values[ip][jf] = tensor_data.values_1d[ ipx ][ jfx ] *
-                         tensor_data.values_1d[ ipy ][ jfy ] *
-                         tensor_data.values_1d[ ipz ][ jfz ] ;
-
-        gradients[ip][0][jf] = tensor_data.derivs_1d[ ipx ][ jfx ] *
-                               tensor_data.values_1d[ ipy ][ jfy ] *
-                               tensor_data.values_1d[ ipz ][ jfz ] ;
-
-        gradients[ip][1][jf] = tensor_data.values_1d[ ipx ][ jfx ] *
-                               tensor_data.derivs_1d[ ipy ][ jfy ] *
-                               tensor_data.values_1d[ ipz ][ jfz ] ;
-
-        gradients[ip][2][jf] = tensor_data.values_1d[ ipx ][ jfx ] *
-                               tensor_data.values_1d[ ipy ][ jfy ] *
-                               tensor_data.derivs_1d[ ipz ][ jfz ] ;
-      }
-    }
-  }
-};
-
-//----------------------------------------------------------------------------
-
-} /* namespace Example */
-} /* namespace Kokkos */
-
-#endif /* #ifndef KOKKOS_HEXELEMENT_HPP */
-
-
diff --git a/lib/kokkos/example/fixture/Main.cpp b/lib/kokkos/example/fixture/Main.cpp
deleted file mode 100644
index 0979366f67..0000000000
--- a/lib/kokkos/example/fixture/Main.cpp
+++ /dev/null
@@ -1,307 +0,0 @@
-//@HEADER
-// ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
-// the U.S. Government retains certain rights in this software.
-// 
-// 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 Corporation nor the names of the
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "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 SANDIA CORPORATION OR THE
-// 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.
-//
-// Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
-// ************************************************************************
-//@HEADER
-
-#include <utility>
-#include <iostream>
-
-#include <Kokkos_Core.hpp>
-
-#include <BoxElemPart.hpp>
-
-namespace Kokkos {
-namespace Example {
-template< class > void test_fixture();
-}
-}
-
-int test_box( const size_t global_size
-            , const size_t global_box[][2]
-            , const bool print_verbose )
-{
-  size_t global_count = 0 ;
-  size_t global_max = 0 ;
-  size_t global_min = Kokkos::Example::box_count( global_box );
-  size_t global_box_max[3][2] = { { 0 , 0 } , { 0 , 0 } , { 0 , 0 } };
-  size_t global_box_min[3][2] = { { 0 , global_box[0][1] } , { 0 , global_box[1][1] } , { 0 , global_box[2][1] } };
-  size_t intersect_error = 0 ;
-  size_t neighbor_max = 0 ;
-
-  for ( size_t global_rank = 0 ; global_rank < global_size ; ++global_rank ) {
-    size_t box[3][2] = { { 0 , global_box[0][1] } , { 0 , global_box[1][1] } , { 0 , global_box[2][1] } };
-    size_t ghost_box[3][2] ;
-    size_t neighbor_count = 0 ;
-
-    Kokkos::Example::box_partition( global_size , global_rank , global_box , box );
-
-    Kokkos::Example::box_ghost_layer( global_box , box , 1 , ghost_box );
-
-    {
-      const size_t n = Kokkos::Example::box_count( box );
-
-      for ( int i = 0 ; i < 3 ; ++i ) {
-        if ( ( box[i][1] - box[i][0] ) < ( global_box_min[i][1] - global_box_min[i][0] ) ) {
-          global_box_min[i][0] = box[i][0] ;
-          global_box_min[i][1] = box[i][1] ;
-        }
-        if ( ( box[i][1] - box[i][0] ) > ( global_box_max[i][1] - global_box_max[i][0] ) ) {
-          global_box_max[i][0] = box[i][0] ;
-          global_box_max[i][1] = box[i][1] ;
-        }
-      }
-
-      global_max = std::max( global_max , n );
-      global_min = std::min( global_min , n );
-      global_count += n ;
-    }
-
-    for ( size_t other_rank = 0 ; other_rank  < global_size ; ++other_rank ) {
-
-      if ( other_rank == global_rank ) continue ;
-
-      size_t other_box[3][2] = { { 0 , global_box[0][1] } , { 0 , global_box[1][1] } , { 0 , global_box[2][1] } };
-      size_t intersect_box[3][2] ;
-
-      Kokkos::Example::box_partition( global_size , other_rank , global_box , other_box );
-
-      Kokkos::Example::box_intersect( intersect_box , box , other_box );
-
-      const size_t n = Kokkos::Example::box_count( intersect_box );
-
-      intersect_error += n ;
-
-      Kokkos::Example::box_intersect( intersect_box , ghost_box , other_box );
-
-      neighbor_count += Kokkos::Example::box_count( intersect_box ) ? 1 : 0 ;
-
-      if ( n ) {
-        std::cout << "box partition intersection error" << std::endl ;
-        std::cout << "box = {"
-                  << " [ " << box[0][0] << " , " << box[0][1] << " )"
-                  << " [ " << box[1][0] << " , " << box[1][1] << " )"
-                  << " [ " << box[2][0] << " , " << box[2][1] << " )"
-                  << " }" << std::endl ;
-        std::cout << "other_box = {"
-                  << " [ " << other_box[0][0] << " , " << other_box[0][1] << " )"
-                  << " [ " << other_box[1][0] << " , " << other_box[1][1] << " )"
-                  << " [ " << other_box[2][0] << " , " << other_box[2][1] << " )"
-                  << " }" << std::endl ;
-        return 0 ;
-      }
-    }
-
-    neighbor_max = std::max( neighbor_max , neighbor_count );
-  }
-
-  if ( print_verbose ) {
-
-    std::cout << "global_part = " << global_size << std::endl ;
-    std::cout << "global_box  = { "
-              << " [ " << global_box[0][0] << " .. " << global_box[0][1] << " ) X"
-              << " [ " << global_box[1][0] << " .. " << global_box[1][1] << " ) X"
-              << " [ " << global_box[2][0] << " .. " << global_box[2][1] << " )"
-              << " }" << std::endl ;
-    std::cout << "count( global_box ) = " << Kokkos::Example::box_count( global_box ) << std::endl ;
-    std::cout << "sum partition( global_box ) = " << global_count << std::endl ;
-    std::cout << "avg partition( global_box ) = " << size_t( double(global_count) / double(global_size)) << std::endl ;
-    std::cout << "min partition( global_box ) = " << global_min << std::endl ;
-    std::cout << "min part X   ( global_box ) = [ " << global_box_min[0][0] << " .. " << global_box_min[0][1] << " )" << std::endl ;
-    std::cout << "min part Y   ( global_box ) = [ " << global_box_min[1][0] << " .. " << global_box_min[1][1] << " )" << std::endl ;
-    std::cout << "min part Z   ( global_box ) = [ " << global_box_min[2][0] << " .. " << global_box_min[2][1] << " )" << std::endl ;
-    std::cout << "max partition( global_box ) = " << global_max << std::endl ;
-    std::cout << "max part X   ( global_box ) = [ " << global_box_max[0][0] << " .. " << global_box_max[0][1] << " )" << std::endl ;
-    std::cout << "max part Y   ( global_box ) = [ " << global_box_max[1][0] << " .. " << global_box_max[1][1] << " )" << std::endl ;
-    std::cout << "max part Z   ( global_box ) = [ " << global_box_max[2][0] << " .. " << global_box_max[2][1] << " )" << std::endl ;
-    std::cout << "sum intersect( global_box ) = " << intersect_error << std::endl ;
-    std::cout << "max neighbor = " << neighbor_max << std::endl ;
-  }
-
-  return neighbor_max ;
-}
-
-void test_elem()
-{
-  const Kokkos::Example::BoxElemPart::Decompose
-    decompose = Kokkos::Example::BoxElemPart:: DecomposeElem ; // DecomposeElem | DecomposeNode ;
-  const size_t global_size = 256 ;
-  const size_t global_nx = 100 ;
-  const size_t global_ny = 120 ;
-  const size_t global_nz = 140 ;
-
-  double node_count_avg = 0 ;
-  size_t node_count_max = 0 ;
-  size_t node_count_min = ( global_nx + 1 ) * ( global_ny + 1 ) * ( global_nz + 1 );
-  double elem_count_avg = 0 ;
-  size_t elem_count_max = 0 ;
-  size_t elem_count_min = global_nx * global_ny * global_nz ;
-  double recv_count_avg = 0 ;
-  size_t recv_count_max = 0 ;
-  size_t recv_count_min = global_size ;
-  double send_count_avg = 0 ;
-  size_t send_count_max = 0 ;
-  size_t send_count_min = global_size ;
-
-  for ( size_t r = 0 ; r < global_size ; ++r ) {
-    const Kokkos::Example::BoxElemPart
-       fixture( Kokkos::Example::BoxElemPart::ElemLinear ,
-                decompose , global_size , r , global_nx , global_ny , global_nz );
-
-    // Print a sample:
-
-    // if ( r == global_size * 2 / 3 ) fixture.print( std::cout );
-
-    // Verify recv/send alignment:
-
-    {
-      size_t recv_lid = fixture.owns_node_count();
-
-      for ( size_t i = 0 ; i < fixture.recv_node_msg_count() ; ++i ) {
-        const size_t recv_rank  = fixture.recv_node_rank( i );
-        const size_t recv_count = fixture.recv_node_count( i );
-
-        const Kokkos::Example::BoxElemPart other_fixture(
-           Kokkos::Example::BoxElemPart::ElemLinear ,
-           decompose , global_size , recv_rank , global_nx , global_ny , global_nz );
-
-        size_t send_item = 0 ;
-
-        size_t j = 0 ;
-        while ( j < other_fixture.send_node_msg_count() && other_fixture.send_node_rank(j) != r ) {
-          send_item += other_fixture.send_node_count( j );
-           ++j ;
-        }
-
-        if ( recv_count != other_fixture.send_node_count(j) ) {
-          std::cout << "Error P[" << r << "].recv(" << recv_count << ") != "
-                    << "P[" << recv_rank << "].send(" << other_fixture.send_node_count(j) << ")"
-                    << std::endl ;
-        }
-        else {
-
-          for ( size_t k = 0 ; k < recv_count ; ++k , ++send_item , ++recv_lid ) {
-
-            const size_t send_lid = other_fixture.send_node_id( send_item );
-
-            size_t recv_coord[3] , send_coord[3] ;
-
-            fixture.local_node_coord( recv_lid , recv_coord );
-
-            other_fixture.local_node_coord( send_lid , send_coord );
-
-            if ( recv_coord[0] != send_coord[0] ||
-                 recv_coord[1] != send_coord[1] ||
-                 recv_coord[2] != send_coord[2] ) {
-              std::cout << "Error P[" << r << "].recv[" << recv_lid << "]{ "
-                        << recv_coord[0] << " , "
-                        << recv_coord[1] << " , "
-                        << recv_coord[2] << " } != "
-                        << "P[" << recv_rank << "].send[" << send_lid << "]{ "
-                        << send_coord[0] << " , "
-                        << send_coord[1] << " , "
-                        << send_coord[2] << " }"
-                        << std::endl ;
-            }
-          }
-        }
-      }
-    }
-
-    node_count_avg += fixture.owns_node_count();
-    elem_count_avg += fixture.uses_elem_count();
-    recv_count_avg += fixture.recv_node_msg_count();
-    send_count_avg += fixture.send_node_msg_count();
-
-    elem_count_min = std::min( (size_t) fixture.uses_elem_count() , elem_count_min );
-    elem_count_max = std::max( (size_t) fixture.uses_elem_count() , elem_count_max );
-    node_count_min = std::min( (size_t) fixture.owns_node_count() , node_count_min );
-    node_count_max = std::max( (size_t) fixture.owns_node_count() , node_count_max );
-
-    recv_count_max = std::max( (size_t) fixture.recv_node_msg_count() , recv_count_max );
-    recv_count_min = std::min( (size_t) fixture.recv_node_msg_count() , recv_count_min );
-    send_count_max = std::max( (size_t) fixture.send_node_msg_count() , send_count_max );
-    send_count_min = std::min( (size_t) fixture.send_node_msg_count() , send_count_min );
-  }
-
-  node_count_avg /= double(global_size);
-  elem_count_avg /= double(global_size);
-  recv_count_avg /= double(global_size);
-  send_count_avg /= double(global_size);
-
-  std::cout << "Elem min(" << elem_count_min << ") avg(" << elem_count_avg << ") max(" << elem_count_max << ") " << std::endl
-            << "Node min(" << node_count_min << ") avg(" << node_count_avg << ") max(" << node_count_max << ") " << std::endl
-            << "Recv min(" << recv_count_min << ") avg(" << recv_count_avg << ") max(" << recv_count_max << ") " << std::endl
-            << "Send min(" << send_count_min << ") avg(" << send_count_avg << ") max(" << send_count_max << ") " << std::endl
-            ;
-}
-
-int main(int argc, char* argv[])
-{
-  Kokkos::initialize(argc,argv);
-  for ( int i = 1 ; i <= 32 ; ++i ) {
-    const size_t global_size = 16 * i ;
-    const size_t global_box[3][2] = { { 0 , 65 } , { 0 , 65 } , { 0 , 65 } };
-    if ( 30 < test_box( global_size , global_box , false ) ) {
-      test_box( global_size , global_box , true );
-    }
-  }
-
-//  test_elem();
-
-  {
-    std::cout << "test_fixture< Host >" << std::endl ;
-    Kokkos::Example::test_fixture< Kokkos::DefaultHostExecutionSpace >();
-  }
-
-#if defined( KOKKOS_ENABLE_CUDA )
-  {
-    std::cout << "test_fixture< Cuda >" << std::endl ;
-    Kokkos::Example::test_fixture< Kokkos::Cuda >();
-  }
-#endif
-
-#if defined( KOKKOS_ENABLE_ROCM )
-  {
-    std::cout << "test_fixture< ROCm >" << std::endl ;
-    Kokkos::Example::test_fixture< Kokkos::Experimental::ROCm >();
-  }
-#endif
-  Kokkos::finalize();
-}
-
diff --git a/lib/kokkos/example/fixture/Makefile b/lib/kokkos/example/fixture/Makefile
deleted file mode 100644
index 5e684e3440..0000000000
--- a/lib/kokkos/example/fixture/Makefile
+++ /dev/null
@@ -1,46 +0,0 @@
-KOKKOS_PATH = ../..
-KOKKOS_SRC_PATH = ${KOKKOS_PATH}
-vpath %.cpp ${KOKKOS_SRC_PATH}/example/fixture
-
-EXAMPLE_HEADERS = $(wildcard $(KOKKOS_SRC_PATH)/example/common/*.hpp ${KOKKOS_SRC_PATH}/example/fixture/*.hpp )
-
-default: build_all
-	echo "End Build"
-
-ifneq (,$(findstring Cuda,$(KOKKOS_DEVICES)))
-  CXX = $(KOKKOS_PATH)/bin/nvcc_wrapper
-else
-  CXX = g++
-endif
-
-CXXFLAGS = -O3
-LINK ?= $(CXX)
-LDFLAGS ?=
-
-include $(KOKKOS_PATH)/Makefile.kokkos        
-
-KOKKOS_CXXFLAGS +=	\
-	-I${KOKKOS_SRC_PATH}/example/common	\
-	-I${KOKKOS_SRC_PATH}/example/fixture
-
-EXE_EXAMPLE_FIXTURE = KokkosExample_Fixture
-OBJ_EXAMPLE_FIXTURE = Main.o TestFixture.o BoxElemPart.o
-
-TARGETS = $(EXE_EXAMPLE_FIXTURE)
-
-#TEST_TARGETS =
-
-$(EXE_EXAMPLE_FIXTURE) : $(OBJ_EXAMPLE_FIXTURE) $(KOKKOS_LINK_DEPENDS)
-	$(LINK) $(KOKKOS_LDFLAGS) $(LDFLAGS) $(EXTRA_PATH) $(OBJ_EXAMPLE_FIXTURE) $(KOKKOS_LIBS) $(LIB) -o $(EXE_EXAMPLE_FIXTURE)
-
-build_all : $(TARGETS)
-
-test : build_all
-
-clean: kokkos-clean
-	rm -f *.o $(TARGETS)
-
-# Compilation rules
-
-%.o:%.cpp $(KOKKOS_CPP_DEPENDS) $(EXAMPLE_HEADERS)
-	$(CXX) $(KOKKOS_CPPFLAGS) $(KOKKOS_CXXFLAGS) $(CXXFLAGS) $(EXTRA_INC) -c $<
diff --git a/lib/kokkos/example/fixture/TestFixture.hpp b/lib/kokkos/example/fixture/TestFixture.hpp
deleted file mode 100644
index 12297a2aaa..0000000000
--- a/lib/kokkos/example/fixture/TestFixture.hpp
+++ /dev/null
@@ -1,156 +0,0 @@
-/*
-//@HEADER
-// ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
-// the U.S. Government retains certain rights in this software.
-// 
-// 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 Corporation nor the names of the
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "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 SANDIA CORPORATION OR THE
-// 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.
-//
-// Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
-// ************************************************************************
-//@HEADER
-*/
-
-#ifndef KOKKOS_EXAMPLE_TESTFIXTURE_HPP
-#define KOKKOS_EXAMPLE_TESTFIXTURE_HPP
-
-#include <utility>
-#include <iostream>
-
-#include <Kokkos_Core.hpp>
-
-#include <BoxElemPart.hpp>
-#include <BoxElemFixture.hpp>
-
-namespace Kokkos {
-namespace Example {
-
-template< class Device >
-struct FixtureVerifyElemNodeCoord
-{
-  typedef Device execution_space ;
-
-  typedef struct { size_t success , error ; } value_type ;
-
-  typedef Kokkos::Example::BoxElemFixture< Device , Kokkos::Example::BoxElemPart::ElemLinear > FixtureType ;
-
-  FixtureType m_fixture ;
-
-  KOKKOS_INLINE_FUNCTION
-  void init( value_type & update ) const { update.success = update.error = 0 ; }
-
-  KOKKOS_INLINE_FUNCTION
-  void join( volatile       value_type & update ,
-             volatile const value_type & input ) const
-    {
-      update.success += input.success ;
-      update.error += input.error ;
-    }
-  
-
-  KOKKOS_INLINE_FUNCTION
-  void operator()( size_t ielem , value_type & update ) const
-  {
-    unsigned node_coord[ FixtureType::ElemNode ][3] ;
-
-    for ( unsigned i = 0 ; i < FixtureType::ElemNode ; ++i ) {
-      const unsigned node_id = m_fixture.elem_node(ielem,i);
-      node_coord[i][0] = m_fixture.node_grid(node_id,0);
-      node_coord[i][1] = m_fixture.node_grid(node_id,1);
-      node_coord[i][2] = m_fixture.node_grid(node_id,2);
-    }
-
-    int error = 0 ;
-    for ( unsigned i = 1 ; i < FixtureType::ElemNode ; ++i ) {
-      if ( node_coord[0][0] + m_fixture.elem_node_local(i,0) != node_coord[i][0] ||
-           node_coord[0][1] + m_fixture.elem_node_local(i,1) != node_coord[i][1] ||
-           node_coord[0][2] + m_fixture.elem_node_local(i,2) != node_coord[i][2] ) {
-        error = 1 ;
-      }
-    }
-
-    if ( error ) {
-      ++update.error ;
-    }
-    else {
-      ++update.success ;
-    }
-  }
-
-  FixtureVerifyElemNodeCoord( const FixtureType & f ) : m_fixture(f) {}
-};
-
-
-template< class Device >
-void test_fixture()
-{
-  typedef Kokkos::Example::BoxElemFixture< Device , Kokkos::Example::BoxElemPart::ElemLinear > FixtureType ;
-
-  const Kokkos::Example::BoxElemPart::Decompose
-    decompose = Kokkos::Example::BoxElemPart:: DecomposeElem ; // DecomposeElem | DecomposeNode ;
-
-  const unsigned global_size = 256 ;
-  const unsigned global_nx = 400 ;
-  const unsigned global_ny = 400 ;
-  const unsigned global_nz = 400 ;
-
-  for ( unsigned my_rank = 0 ; my_rank < global_size ; ++my_rank ) {
-
-    const FixtureType fixture( decompose , global_size , my_rank , global_nx , global_ny , global_nz );
-
-    // Verify grid coordinates of element's nodes
-    
-    typename FixtureVerifyElemNodeCoord<Device>::value_type result = { 0 , 0 };
-
-    Kokkos::parallel_reduce( fixture.elem_node().extent(0) , FixtureVerifyElemNodeCoord<Device>( fixture ) , result );
-
-    if ( result.error ) {
-      std::cout << "P[" << my_rank << ":" << global_size
-                << "] Fixture elem_node_coord"
-                << " success(" << result.success << ")"
-                << " error(" << result.error << ")"
-                << std::endl ;
-    }
-
-    // Check send/recv alignment
-
-
-  }
-}
-
-
-} /* namespace Example */
-} /* namespace Kokkos */
-
-#endif /* #ifndef KOKKOS_EXAMPLE_TESTFIXTURE_HPP */
-
diff --git a/lib/kokkos/example/global_2_local_ids/CMakeLists.txt b/lib/kokkos/example/global_2_local_ids/CMakeLists.txt
deleted file mode 100644
index 9f32fe5802..0000000000
--- a/lib/kokkos/example/global_2_local_ids/CMakeLists.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-
-INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR})
-INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR})
-
-SET(SOURCES "")
-
-SET(SOURCES
-  G2L_Main.cpp 
-  )
-
-TRIBITS_ADD_EXECUTABLE(
-  global_2_local_ids
-  SOURCES ${SOURCES}
-  COMM serial mpi
-  )
-
-
diff --git a/lib/kokkos/example/global_2_local_ids/G2L.hpp b/lib/kokkos/example/global_2_local_ids/G2L.hpp
deleted file mode 100644
index 9d40bd7628..0000000000
--- a/lib/kokkos/example/global_2_local_ids/G2L.hpp
+++ /dev/null
@@ -1,266 +0,0 @@
-//@HEADER
-// ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
-// the U.S. Government retains certain rights in this software.
-// 
-// 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 Corporation nor the names of the
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "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 SANDIA CORPORATION OR THE
-// 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.
-//
-// Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
-// ************************************************************************
-//@HEADER
-
-#ifndef KOKKOS_GLOBAL_TO_LOCAL_IDS_HPP
-#define KOKKOS_GLOBAL_TO_LOCAL_IDS_HPP
-
-#include <Kokkos_Core.hpp>
-
-#include <Kokkos_UnorderedMap.hpp>
-
-#include <vector>
-#include <algorithm>
-#include <iomanip>
-
-#include <impl/Kokkos_Timer.hpp>
-
-// This test will simulate global ids
-
-namespace G2L {
-
-static const unsigned begin_id_size = 256u;
-static const unsigned end_id_size = 1u << 25;
-static const unsigned id_step = 2u;
-
-//use to help generate global ids
-union helper
-{
-  uint32_t word;
-  uint8_t byte[4];
-};
-
-
-//generate a unique global id from the local id
-template <typename Device>
-struct generate_ids
-{
-  typedef Device execution_space;
-  typedef typename execution_space::size_type size_type;
-  typedef Kokkos::View<uint32_t*,execution_space> local_id_view;
-
-  local_id_view local_2_global;
-
-  generate_ids( local_id_view & ids)
-    : local_2_global(ids)
-  {
-    Kokkos::parallel_for(local_2_global.size(), *this);
-  }
-
-
-  KOKKOS_INLINE_FUNCTION
-  void operator()(size_type i) const
-  {
-
-    helper x = {static_cast<uint32_t>(i)};
-
-    // shuffle the bytes of i to create a unique, semi-random global_id
-    x.word = ~x.word;
-
-    uint8_t tmp = x.byte[3];
-    x.byte[3] = x.byte[1];
-    x.byte[1] = tmp;
-
-    tmp = x.byte[2];
-    x.byte[2] = x.byte[0];
-    x.byte[0] = tmp;
-
-    local_2_global[i] = x.word;
-  }
-
-};
-
-// fill a map of global_id -> local_id
-template <typename Device>
-struct fill_map
-{
-  typedef Device execution_space;
-  typedef typename execution_space::size_type size_type;
-  typedef Kokkos::View<const uint32_t*,execution_space, Kokkos::MemoryRandomAccess> local_id_view;
-  typedef Kokkos::UnorderedMap<uint32_t,size_type,execution_space> global_id_view;
-
-  global_id_view global_2_local;
-  local_id_view local_2_global;
-
-  fill_map( global_id_view gIds, local_id_view lIds)
-    : global_2_local(gIds) , local_2_global(lIds)
-  {
-    Kokkos::parallel_for(local_2_global.size(), *this);
-  }
-
-  KOKKOS_INLINE_FUNCTION
-  void operator()(size_type i) const
-  {
-    global_2_local.insert( local_2_global[i], i);
-  }
-
-};
-
-// check that the global id is found and that it maps to the local id
-template <typename Device>
-struct find_test
-{
-  typedef Device execution_space;
-  typedef typename execution_space::size_type size_type;
-  typedef Kokkos::View<const uint32_t*,execution_space, Kokkos::MemoryRandomAccess> local_id_view;
-  typedef Kokkos::UnorderedMap<const uint32_t, const size_type,execution_space> global_id_view;
-
-  global_id_view global_2_local;
-  local_id_view local_2_global;
-
-  typedef size_t value_type;
-
-  find_test( global_id_view gIds, local_id_view lIds, value_type & num_errors)
-    : global_2_local(gIds) , local_2_global(lIds)
-  {
-    Kokkos::parallel_reduce(local_2_global.size(), *this, num_errors);
-  }
-
-  KOKKOS_INLINE_FUNCTION
-  void init(value_type & v) const
-  { v = 0; }
-
-  KOKKOS_INLINE_FUNCTION
-  void join(volatile value_type & dst, volatile value_type const & src) const
-  { dst += src; }
-
-  KOKKOS_INLINE_FUNCTION
-  void operator()(size_type i, value_type & num_errors) const
-  {
-    uint32_t index = global_2_local.find( local_2_global[i] );
-
-    if (  !global_2_local.valid_at(index)
-        || global_2_local.key_at(index) != local_2_global[i]
-        || global_2_local.value_at(index) != i)
-      ++num_errors;
-  }
-
-};
-
-// run test
-template <typename Device>
-size_t test_global_to_local_ids(unsigned num_ids, unsigned capacity, unsigned num_find_iterations)
-{
-
-  typedef Device execution_space;
-  typedef typename execution_space::size_type size_type;
-
-  typedef Kokkos::View<uint32_t*,execution_space> local_id_view;
-  typedef Kokkos::UnorderedMap<uint32_t,size_type,execution_space> global_id_view;
-
-  double elasped_time = 0;
-  Kokkos::Timer timer;
-
-  local_id_view local_2_global("local_ids", num_ids);
-  global_id_view global_2_local(capacity);
-
-  int shiftw = 15;
-
-  //create
-  elasped_time = timer.seconds();
-  std::cout << std::setw(shiftw) <<  "allocate: " <<  elasped_time << std::endl;
-  timer.reset();
-
-  // generate unique ids
-  {
-    generate_ids<Device> gen(local_2_global);
-  }
-
-  // generate
-  elasped_time = timer.seconds();
-  std::cout << std::setw(shiftw) << "generate: " <<  elasped_time << std::endl;
-  timer.reset();
-
-  {
-    fill_map<Device> fill(global_2_local, local_2_global);
-  }
-
-  // fill
-  elasped_time = timer.seconds();
-  std::cout << std::setw(shiftw) << "fill: " <<  elasped_time << std::endl;
-  timer.reset();
-
-
-  size_t num_errors = global_2_local.failed_insert();
-
-  if (num_errors == 0u) {
-    for (unsigned i=0; i<num_find_iterations; ++i)
-    {
-      find_test<Device> find(global_2_local, local_2_global,num_errors);
-    }
-
-    // find
-    elasped_time = timer.seconds();
-    std::cout << std::setw(shiftw) << "lookup: " <<  elasped_time << std::endl;
-  }
-  else {
-    std::cout << "    !!! Fill Failed !!!" << std::endl;
-  }
-
-  return num_errors;
-}
-
-template <typename Device>
-size_t run_test(unsigned num_ids, unsigned num_find_iterations)
-{
-  // expect to fail
-  unsigned capacity = (num_ids*2u)/3u;
-  std::cout << " 66% of needed capacity (should fail)" << std::endl;
-  test_global_to_local_ids<Device>(num_ids, capacity, num_find_iterations);
-
-  //should not fail
-  std::cout << " 100% of needed capacity" << std::endl;
-  capacity = num_ids;
-  size_t num_errors = test_global_to_local_ids<Device>(num_ids, capacity, num_find_iterations);
-
-  //should not fail
-  std::cout << " 150% of needed capacity" << std::endl;
-  capacity = (num_ids*3u)/2u;
-  num_errors += test_global_to_local_ids<Device>(num_ids, capacity, num_find_iterations);
-
-  return num_errors;
-}
-
-
-} // namespace G2L
-
-
-#endif //KOKKOS_GLOBAL_TO_LOCAL_IDS_HPP
-
diff --git a/lib/kokkos/example/global_2_local_ids/G2L_Main.cpp b/lib/kokkos/example/global_2_local_ids/G2L_Main.cpp
deleted file mode 100644
index c8318be9fc..0000000000
--- a/lib/kokkos/example/global_2_local_ids/G2L_Main.cpp
+++ /dev/null
@@ -1,158 +0,0 @@
-/*
-//@HEADER
-// ************************************************************************
-//
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
-// the U.S. Government retains certain rights in this software.
-//
-// 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 Corporation nor the names of the
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "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 SANDIA CORPORATION OR THE
-// 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.
-//
-// Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-//
-// ************************************************************************
-//@HEADER
-*/
-
-#include <Kokkos_Core.hpp>
-
-#include <G2L.hpp>
-
-namespace G2L {
-
-size_t run_serial(unsigned num_ids, unsigned num_find_iterations)
-{
-#ifdef KOKKOS_ENABLE_SERIAL
-  std::cout << "Serial" << std::endl;
-  return run_test<Kokkos::Serial>(num_ids,num_find_iterations);
-#else
-  return 0;
-#endif // KOKKOS_ENABLE_SERIAL
-}
-
-size_t run_threads(unsigned num_ids, unsigned num_find_iterations)
-{
-#ifdef KOKKOS_ENABLE_THREADS
-  std::cout << "Threads" << std::endl;
-  return run_test<Kokkos::Threads>(num_ids,num_find_iterations);
-#else
-  return 0;
-#endif
-}
-
-size_t run_openmp(unsigned num_ids, unsigned num_find_iterations)
-{
-#ifdef KOKKOS_ENABLE_OPENMP
-  std::cout << "OpenMP" << std::endl;
-  return run_test<Kokkos::OpenMP>(num_ids,num_find_iterations);
-#else
-  return 0;
-#endif
-}
-
-size_t run_cuda(unsigned num_ids, unsigned num_find_iterations)
-{
-#ifdef KOKKOS_ENABLE_CUDA
-  std::cout << "Cuda" << std::endl;
-  return run_test<Kokkos::Cuda>(num_ids,num_find_iterations);
-#else
-  return 0;
-#endif
-}
-
-} // namespace G2L
-
-
-int main(int argc, char *argv[])
-{
-  unsigned num_ids = 100000;
-  unsigned num_find_iterations = 1000;
-
-  if (argc == 3) {
-    num_ids = atoi(argv[1]);
-    num_find_iterations = atoi(argv[2]);
-  }
-  else if (argc != 1) {
-    std::cout << argv[0] << " num_ids num_find_iterations" << std::endl;
-    return 0;
-  }
-
-
-  // query the topology of the host
-  unsigned threads_count = 4 ;
-
-  if (Kokkos::hwloc::available()) {
-    threads_count = Kokkos::hwloc::get_available_numa_count() *
-                    Kokkos::hwloc::get_available_cores_per_numa() *
-                    Kokkos::hwloc::get_available_threads_per_core();
-
-  }
-
-  std::cout << "Threads: " << threads_count << std::endl;
-  std::cout << "Number of ids: " << num_ids << std::endl;
-  std::cout << "Number of find iterations: " << num_find_iterations << std::endl;
-
-  size_t num_errors = 0;
-
-  num_errors += G2L::run_serial(num_ids,num_find_iterations);
-
-#ifdef KOKKOS_ENABLE_CUDA
-  Kokkos::HostSpace::execution_space::initialize(threads_count);
-  Kokkos::Cuda::initialize( Kokkos::Cuda::SelectDevice(0) );
-  num_errors += G2L::run_cuda(num_ids,num_find_iterations);
-  Kokkos::Cuda::finalize();
-  Kokkos::HostSpace::execution_space::finalize();
-#endif
-
-#ifdef KOKKOS_ENABLE_THREADS
-  Kokkos::Threads::initialize( threads_count );
-  num_errors += G2L::run_threads(num_ids,num_find_iterations);
-  Kokkos::Threads::finalize();
-#endif
-
-#ifdef KOKKOS_ENABLE_OPENMP
-  int num_threads = 0;
-  #pragma omp parallel
-  {
-    #pragma omp atomic
-    ++num_threads;
-  }
-  if( num_threads > 3 ) {
-    num_threads = std::max(4, num_threads/4);
-  }
-  Kokkos::OpenMP::initialize( num_threads );
-  num_errors += G2L::run_openmp(num_ids,num_find_iterations);
-  Kokkos::OpenMP::finalize();
-#endif
-
-
-  return num_errors;
-}
-
diff --git a/lib/kokkos/example/global_2_local_ids/Makefile b/lib/kokkos/example/global_2_local_ids/Makefile
deleted file mode 100644
index 42b376ec7c..0000000000
--- a/lib/kokkos/example/global_2_local_ids/Makefile
+++ /dev/null
@@ -1,46 +0,0 @@
-KOKKOS_PATH ?= ../..
-
-MAKEFILE_PATH := $(abspath $(lastword $(MAKEFILE_LIST)))
-SRC_DIR := $(dir $(MAKEFILE_PATH))
-
-SRC = $(wildcard $(SRC_DIR)/*.cpp)
-OBJ = $(SRC:$(SRC_DIR)/%.cpp=%.o)
-
-#SRC = $(wildcard *.cpp)
-#OBJ = $(SRC:%.cpp=%.o)
-
-default: build
-	echo "Start Build"
-
-ifneq (,$(findstring Cuda,$(KOKKOS_DEVICES)))
-  CXX = $(KOKKOS_PATH)/bin/nvcc_wrapper
-  EXE = $(addsuffix .cuda, $(shell basename $(SRC_DIR)))
-else
-  CXX = g++
-  EXE = $(addsuffix .host, $(shell basename $(SRC_DIR)))
-endif
-
-CXXFLAGS = -O3 -I$(SRC_DIR)
-LINK ?= $(CXX)
-LDFLAGS ?=
-
-include $(KOKKOS_PATH)/Makefile.kokkos
-
-DEPFLAGS = -M
-
-LIB =
-
-
-build: $(EXE)
-
-$(EXE): $(OBJ) $(KOKKOS_LINK_DEPENDS)
-	$(LINK) $(KOKKOS_LDFLAGS) $(LINKFLAGS) $(EXTRA_PATH) $(OBJ) $(KOKKOS_LIBS) $(LIB) -o $(EXE)
-
-clean: 
-	rm -f *.a *.o *.cuda *.host
-
-# Compilation rules
-
-%.o:$(SRC_DIR)/%.cpp $(KOKKOS_CPP_DEPENDS)
-	$(CXX) $(KOKKOS_CPPFLAGS) $(KOKKOS_CXXFLAGS) $(CXXFLAGS) $(EXTRA_INC) -c $<
-
diff --git a/lib/kokkos/example/grow_array/CMakeLists.txt b/lib/kokkos/example/grow_array/CMakeLists.txt
deleted file mode 100644
index d9ff170492..0000000000
--- a/lib/kokkos/example/grow_array/CMakeLists.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-
-INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR})
-INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR})
-
-SET(SOURCES "")
-
-FILE(GLOB SOURCES *.cpp)
-
-TRIBITS_ADD_EXECUTABLE(
-  grow_array
-  SOURCES ${SOURCES}
-  COMM serial mpi
-  )
-
diff --git a/lib/kokkos/example/grow_array/Makefile b/lib/kokkos/example/grow_array/Makefile
deleted file mode 100644
index 42b376ec7c..0000000000
--- a/lib/kokkos/example/grow_array/Makefile
+++ /dev/null
@@ -1,46 +0,0 @@
-KOKKOS_PATH ?= ../..
-
-MAKEFILE_PATH := $(abspath $(lastword $(MAKEFILE_LIST)))
-SRC_DIR := $(dir $(MAKEFILE_PATH))
-
-SRC = $(wildcard $(SRC_DIR)/*.cpp)
-OBJ = $(SRC:$(SRC_DIR)/%.cpp=%.o)
-
-#SRC = $(wildcard *.cpp)
-#OBJ = $(SRC:%.cpp=%.o)
-
-default: build
-	echo "Start Build"
-
-ifneq (,$(findstring Cuda,$(KOKKOS_DEVICES)))
-  CXX = $(KOKKOS_PATH)/bin/nvcc_wrapper
-  EXE = $(addsuffix .cuda, $(shell basename $(SRC_DIR)))
-else
-  CXX = g++
-  EXE = $(addsuffix .host, $(shell basename $(SRC_DIR)))
-endif
-
-CXXFLAGS = -O3 -I$(SRC_DIR)
-LINK ?= $(CXX)
-LDFLAGS ?=
-
-include $(KOKKOS_PATH)/Makefile.kokkos
-
-DEPFLAGS = -M
-
-LIB =
-
-
-build: $(EXE)
-
-$(EXE): $(OBJ) $(KOKKOS_LINK_DEPENDS)
-	$(LINK) $(KOKKOS_LDFLAGS) $(LINKFLAGS) $(EXTRA_PATH) $(OBJ) $(KOKKOS_LIBS) $(LIB) -o $(EXE)
-
-clean: 
-	rm -f *.a *.o *.cuda *.host
-
-# Compilation rules
-
-%.o:$(SRC_DIR)/%.cpp $(KOKKOS_CPP_DEPENDS)
-	$(CXX) $(KOKKOS_CPPFLAGS) $(KOKKOS_CXXFLAGS) $(CXXFLAGS) $(EXTRA_INC) -c $<
-
diff --git a/lib/kokkos/example/grow_array/grow_array.hpp b/lib/kokkos/example/grow_array/grow_array.hpp
deleted file mode 100644
index f5d0698d82..0000000000
--- a/lib/kokkos/example/grow_array/grow_array.hpp
+++ /dev/null
@@ -1,257 +0,0 @@
-/*
-//@HEADER
-// ************************************************************************
-//
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
-// the U.S. Government retains certain rights in this software.
-//
-// 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 Corporation nor the names of the
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "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 SANDIA CORPORATION OR THE
-// 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.
-//
-// Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-//
-// ************************************************************************
-//@HEADER
-*/
-
-#ifndef EXAMPLE_GROW_ARRAY
-#define EXAMPLE_GROW_ARRAY
-
-#include <cstdlib>
-
-#include <Kokkos_Core.hpp>
-
-#include <algorithm>
-
-#if defined(KOKKOS_ENABLE_CUDA)
-#include <thrust/device_ptr.h>
-#include <thrust/sort.h>
-#endif
-
-namespace Example {
-
-//----------------------------------------------------------------------------
-
-template< class ExecSpace >
-struct SortView {
-
-  template< typename ValueType >
-  SortView( const Kokkos::View<ValueType*,ExecSpace> v , int begin , int end )
-    {
-      std::sort( v.ptr_on_device() + begin , v.ptr_on_device() + end );
-    }
-};
-
-#if defined(KOKKOS_ENABLE_CUDA)
-template<>
-struct SortView< Kokkos::Cuda > {
-  template< typename ValueType >
-  SortView( const Kokkos::View<ValueType*,Kokkos::Cuda> v , int begin , int end )
-    {
-      thrust::sort( thrust::device_ptr<ValueType>( v.ptr_on_device() + begin )
-                  , thrust::device_ptr<ValueType>( v.ptr_on_device() + end ) );
-    }
-};
-#endif
-
-
-
-//----------------------------------------------------------------------------
-
-template< class ExecSpace >
-struct GrowArrayFunctor {
-
-  typedef ExecSpace  execution_space ;
-
-  enum { SHIFT = sizeof(int) == 8 ? 6 : 5 }; // 8 or 4 byte int
-  enum { MASK  = ( 1 << SHIFT ) - 1 };
-
-  const Kokkos::View<int*,ExecSpace>  m_search_flags ; // bit flags for values to append
-  const Kokkos::View<int*,ExecSpace>  m_search_array ; // array to append values
-  const Kokkos::View<int,ExecSpace>   m_search_count ; // offset
-  const int m_search_total ;
-  const int m_search_team_chunk ;
-
-  GrowArrayFunctor( int array_length , int search_length , int print = 1 )
-    : m_search_flags( "flags" , ( search_length + MASK ) >> SHIFT ) // One bit per search entry
-    , m_search_array( "array" , array_length )
-    , m_search_count( "count" )
-    , m_search_total( search_length )
-    , m_search_team_chunk( 2048 )
-    {}
-
-  KOKKOS_INLINE_FUNCTION
-  bool flag_is_set( const int index ) const
-    {
-      // 64 or 32 bit integer:
-
-      const int j = index >> SHIFT ; // which integer flag
-      const int k = 1 << ( index & MASK ); // which bit in that integer
-      const int s = ( j < int(m_search_flags.dimension_0()) ) && ( 0 != ( m_search_flags(j) & k ) );
-
-      return s ;
-    }
-
-  typedef typename Kokkos::TeamPolicy<ExecSpace>::member_type team_member ;
-
-  KOKKOS_INLINE_FUNCTION
-  void operator()( const team_member & member ) const
-    {
-      enum { LOCAL_BUFFER_LENGTH = 16 };
-
-      int local_buffer[ LOCAL_BUFFER_LENGTH ] ;
-      int local_count = 0 ;
-
-      // Each team searches 'm_search_team_chunk' indices.
-      // The threads of a team must iterate together because all
-      // threads in the team must call 'team_scan' to prevent deadlock in the team.
-
-            int search_team_begin = member.league_rank() * m_search_team_chunk ;
-      const int search_team_end   = search_team_begin + m_search_team_chunk ;
-
-      int k = 0 ;
-
-      while ( search_team_begin < search_team_end ) {
-
-        // This iteration searches [ search_team_begin .. search_team_begin + member.team_size() ]
-        const int thread_search_index = search_team_begin + member.team_rank();
-
-        // If this thread's search index is in the range
-        // and the flag is set, push into this thread's local buffer.
-        if ( thread_search_index < m_search_total && flag_is_set(thread_search_index) ) {
-          local_buffer[ local_count ] = thread_search_index ;
-          ++local_count ;
-        }
-
-        // Move the team's search range forward
-        search_team_begin += member.team_size(); // Striding team by team size
-
-        // Count number of times a thread's buffer might have grown:
-        ++k ;
-
-        // Write buffer if end of search or a thread might have filled its buffer.
-        if ( k == LOCAL_BUFFER_LENGTH /* A thread in my team might have filled its buffer */ ||
-             ! ( search_team_begin < search_team_end ) /* Team is at the end of its search */ ) {
-
-          // Team's exclusive scan of threads' contributions, with global offset.
-          // This thread writes its buffer into [ team_offset .. team_offset + local_count )
-          const int team_offset = member.team_scan( local_count , & *m_search_count );
-
-          // Copy locally buffered entries into global array:
-          for ( int i = 0 ; i < local_count ; ++i ) {
-            m_search_array( team_offset + i ) = local_buffer[i] ;
-          }
-
-          k = 0 ;
-          local_count = 0 ;
-        }
-      }
-    }
-};
-
-
-template< class ExecSpace >
-void grow_array( int array_length , int search_length , int print = 1 )
-{
-  typedef GrowArrayFunctor< ExecSpace > FunctorType ;
-
-  FunctorType functor( array_length , search_length , print );
-
-  typename Kokkos::View<int,ExecSpace>::HostMirror  count = Kokkos::create_mirror_view( functor.m_search_count );
-  typename Kokkos::View<int*,ExecSpace>::HostMirror flags = Kokkos::create_mirror_view( functor.m_search_flags );
-
-  // Set at most 'array_length' random bits over the search length.
-  for ( int i = 0 ; i < array_length ; ++i ) {
-    // 'lrand48()' generates random number between [0..2^31]
-    // index = ( lrand48() * search_length ) / ( 2^31 )
-    const long int index = ( lrand48() * search_length ) >> 31 ;
-    // set the bit within the flags:
-    flags( index >> FunctorType::SHIFT ) |= ( 1 << ( index & FunctorType::MASK ) );
-  }
-
-  Kokkos::deep_copy( functor.m_search_flags , flags );
-
-  // Each team works on 'functor.m_search_team_chunk' span of the search_length
-  Kokkos::TeamPolicy< ExecSpace >
-    work( /* #teams */ ( search_length + functor.m_search_team_chunk - 1 ) / functor.m_search_team_chunk
-        , /* threads/team */ Kokkos::TeamPolicy< ExecSpace >::team_size_max( functor ) );
-
-  // Fill array:
-  Kokkos::parallel_for( work , functor );
-
-  // How much was filled:
-  Kokkos::deep_copy( count , functor.m_search_count );
-
-  // Sort array:
-  SortView< ExecSpace >( functor.m_search_array , 0 , *count );
-
-  // Mirror the results:
-  typename Kokkos::View<int*,ExecSpace>::HostMirror results = Kokkos::create_mirror_view( functor.m_search_array );
-  Kokkos::deep_copy( results , functor.m_search_array );
-
-  // Verify results:
-  int result_error_count = 0 ;
-  int flags_error_count = 0 ;
-  for ( int i = 0 ; i < *count ; ++i ) {
-    const int index = results(i);
-    const int entry = index >> FunctorType::SHIFT ;
-    const int bit   = 1 << ( index & FunctorType::MASK );
-    const bool flag = 0 != ( flags( entry ) & bit );
-    if ( ! flag ) {
-      if ( print ) std::cerr << "result( " << i << " : " << index << " )";
-      ++result_error_count ;
-    }
-    flags( entry ) &= ~bit ; // Clear that verified bit
-  }
-
-  for ( int i = 0 ; i < int(flags.dimension_0()) ; ++i ) {
-    // If any uncleared bits then an error
-    if ( flags(i) ) {
-      if ( print ) std::cerr << "flags( " << i << " : " << flags(i) << " )" ;
-      ++flags_error_count ;
-    }
-  }
-
-  if ( result_error_count || flags_error_count ) {
-    std::cerr << std::endl << "Example::GrowArrayFunctor( " << array_length
-              << " , " << search_length
-              << " ) result_error_count( " << result_error_count << " )"
-              << " ) flags_error_count( " << flags_error_count << " )"
-              << std::endl ;
-  }
-}
-
-
-} // namespace Example
-
-//----------------------------------------------------------------------------
-
-#endif /* #ifndef EXAMPLE_GROW_ARRAY */
-
diff --git a/lib/kokkos/example/grow_array/main.cpp b/lib/kokkos/example/grow_array/main.cpp
deleted file mode 100644
index 598729459a..0000000000
--- a/lib/kokkos/example/grow_array/main.cpp
+++ /dev/null
@@ -1,110 +0,0 @@
-/*
-//@HEADER
-// ************************************************************************
-//
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
-// the U.S. Government retains certain rights in this software.
-//
-// 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 Corporation nor the names of the
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "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 SANDIA CORPORATION OR THE
-// 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.
-//
-// Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-//
-// ************************************************************************
-//@HEADER
-*/
-
-#include <iostream>
-#include <sstream>
-
-#include <Kokkos_Core.hpp>
-
-#include <grow_array.hpp>
-
-//----------------------------------------------------------------------------
-//----------------------------------------------------------------------------
-
-int main( int argc , char ** argv )
-{
-  int num_threads = 4 ;
-  int use_numa = 1 ;
-  int use_core = 1 ;
-  int length_array  = 1000000 ;
-  int span_values = 100000000 ;
-
-
-  if ( Kokkos::hwloc::available() ) {
-    use_numa = Kokkos::hwloc::get_available_numa_count();
-    use_core = Kokkos::hwloc::get_available_cores_per_numa() - 1 ;
-    num_threads = use_numa * use_core * Kokkos::hwloc::get_available_threads_per_core();
-  }
-
-#if defined( KOKKOS_ENABLE_SERIAL )
-  {
-    std::cout << "Kokkos::Serial" << std::endl ;
-    // The Serial device accepts these arguments, though it may ignore them.
-    Kokkos::Serial::initialize( num_threads , use_numa , use_core );
-    Example::grow_array< Kokkos::Serial >( length_array , span_values );
-    Kokkos::Serial::finalize ();
-  }
-#endif // defined( KOKKOS_ENABLE_SERIAL )
-
-#if defined( KOKKOS_ENABLE_THREADS )
-  {
-    std::cout << "Kokkos::Threads" << std::endl ;
-    Kokkos::Threads::initialize( num_threads , use_numa , use_core );
-    Example::grow_array< Kokkos::Threads >( length_array , span_values );
-    Kokkos::Threads::finalize();
-  }
-#endif
-
-#if defined( KOKKOS_ENABLE_OPENMP )
-  {
-    std::cout << "Kokkos::OpenMP" << std::endl ;
-    Kokkos::OpenMP::initialize();
-    Example::grow_array< Kokkos::OpenMP >( length_array , span_values );
-    Kokkos::OpenMP::finalize();
-  }
-#endif
-
-#if defined( KOKKOS_ENABLE_CUDA )
-  {
-    std::cout << "Kokkos::Cuda" << std::endl ;
-    Kokkos::HostSpace::execution_space::initialize(1);
-    Kokkos::Cuda::initialize();
-    Example::grow_array< Kokkos::Cuda >( length_array , span_values );
-    Kokkos::Cuda::finalize();
-    Kokkos::HostSpace::execution_space::finalize();
-  }
-#endif
-
-  return 0 ;
-}
-
diff --git a/lib/kokkos/example/make_buildlink/main.cpp b/lib/kokkos/example/make_buildlink/main.cpp
index c90def8d4f..d963002034 100644
--- a/lib/kokkos/example/make_buildlink/main.cpp
+++ b/lib/kokkos/example/make_buildlink/main.cpp
@@ -1,14 +1,13 @@
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 
 int main(int argc, char* argv[]) {
-  Kokkos::initialize(argc,argv);
+  Kokkos::initialize(argc, argv);
   {
-     int N = (argc>1) ? atoi(argv[1]) : 10000;
-     int M = (argc>2) ? atoi(argv[2]) : 10000;
-     int R = (argc>3) ? atoi(argv[3]) : 10;
-     
-     printf("Called with: %i %i %i\n",N,M,R);    
+    int N = (argc > 1) ? atoi(argv[1]) : 10000;
+    int M = (argc > 2) ? atoi(argv[2]) : 10000;
+    int R = (argc > 3) ? atoi(argv[3]) : 10;
 
+    printf("Called with: %i %i %i\n", N, M, R);
   }
   Kokkos::finalize();
 }
diff --git a/lib/kokkos/example/md_skeleton/CMakeLists.txt b/lib/kokkos/example/md_skeleton/CMakeLists.txt
deleted file mode 100644
index 28412c3784..0000000000
--- a/lib/kokkos/example/md_skeleton/CMakeLists.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-
-INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR})
-INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR})
-
-SET(SOURCES "")
-SET(LIBRARIES "")
-
-FILE(GLOB SOURCES *.cpp )
-
-TRIBITS_ADD_EXECUTABLE(
-  md_skeleton 
-  SOURCES ${SOURCES}
-  COMM serial mpi
-  DEPLIBS ${LIBRARIES}
-  )
-
diff --git a/lib/kokkos/example/md_skeleton/Makefile b/lib/kokkos/example/md_skeleton/Makefile
deleted file mode 100644
index 42b376ec7c..0000000000
--- a/lib/kokkos/example/md_skeleton/Makefile
+++ /dev/null
@@ -1,46 +0,0 @@
-KOKKOS_PATH ?= ../..
-
-MAKEFILE_PATH := $(abspath $(lastword $(MAKEFILE_LIST)))
-SRC_DIR := $(dir $(MAKEFILE_PATH))
-
-SRC = $(wildcard $(SRC_DIR)/*.cpp)
-OBJ = $(SRC:$(SRC_DIR)/%.cpp=%.o)
-
-#SRC = $(wildcard *.cpp)
-#OBJ = $(SRC:%.cpp=%.o)
-
-default: build
-	echo "Start Build"
-
-ifneq (,$(findstring Cuda,$(KOKKOS_DEVICES)))
-  CXX = $(KOKKOS_PATH)/bin/nvcc_wrapper
-  EXE = $(addsuffix .cuda, $(shell basename $(SRC_DIR)))
-else
-  CXX = g++
-  EXE = $(addsuffix .host, $(shell basename $(SRC_DIR)))
-endif
-
-CXXFLAGS = -O3 -I$(SRC_DIR)
-LINK ?= $(CXX)
-LDFLAGS ?=
-
-include $(KOKKOS_PATH)/Makefile.kokkos
-
-DEPFLAGS = -M
-
-LIB =
-
-
-build: $(EXE)
-
-$(EXE): $(OBJ) $(KOKKOS_LINK_DEPENDS)
-	$(LINK) $(KOKKOS_LDFLAGS) $(LINKFLAGS) $(EXTRA_PATH) $(OBJ) $(KOKKOS_LIBS) $(LIB) -o $(EXE)
-
-clean: 
-	rm -f *.a *.o *.cuda *.host
-
-# Compilation rules
-
-%.o:$(SRC_DIR)/%.cpp $(KOKKOS_CPP_DEPENDS)
-	$(CXX) $(KOKKOS_CPPFLAGS) $(KOKKOS_CXXFLAGS) $(CXXFLAGS) $(EXTRA_INC) -c $<
-
diff --git a/lib/kokkos/example/md_skeleton/README b/lib/kokkos/example/md_skeleton/README
deleted file mode 100644
index 1ce682b0a6..0000000000
--- a/lib/kokkos/example/md_skeleton/README
+++ /dev/null
@@ -1,3 +0,0 @@
-To build this example on a 2012-model Macbook Pro with NVIDIA Kepler GPU:
-
-./build.cuda_std g++_osx cuda_osx 30 opt
diff --git a/lib/kokkos/example/md_skeleton/force.cpp b/lib/kokkos/example/md_skeleton/force.cpp
deleted file mode 100644
index beb2dc8929..0000000000
--- a/lib/kokkos/example/md_skeleton/force.cpp
+++ /dev/null
@@ -1,184 +0,0 @@
-/*
-//@HEADER
-// ************************************************************************
-//
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
-// the U.S. Government retains certain rights in this software.
-//
-// 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 Corporation nor the names of the
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "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 SANDIA CORPORATION OR THE
-// 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.
-//
-// Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-//
-// ************************************************************************
-//@HEADER
-*/
-
-#include <system.h>
-#include <cstdio>
-
-
-/* Simple Lennard Jones Force Kernel using neighborlists
- * Calculates for every pair of atoms (i,j) with distance smaller r_cut
- * f_ij = 4*epsilon * ( (sigma/r_ij)^12 - (sigma/r_ij)^6 )
- * where r_ij is the distance of atoms (i,j).
- * The force on atom i is the sum over f_ij:
- * f_i = sum_j (f_ij)
- * Neighborlists are used in order to pre calculate which atoms j are
- * close enough to i to be able to contribute. By choosing a larger neighbor
- * cutoff then the force cutoff, the neighbor list can be reused several times
- * (typically 10 - 100).
- */
-
-struct ForceFunctor {
-
-  typedef t_x_array::execution_space execution_space; //Device Type for running the kernel
-  typedef double2 value_type; // When energy calculation is requested return energy, and virial
-
-  t_x_array_randomread x;       //atom positions
-  t_f_array f;                  //atom forces
-  t_int_1d_const numneigh;      //number of neighbors per atom
-  t_neighbors_const neighbors;  //neighborlist
-  double cutforcesq;            //force cutoff
-  double epsilon;               //Potential parameter
-  double sigma6;                //Potential parameter
-
-
-  ForceFunctor(System s) {
-    x = s.d_x;
-    f = s.f;
-    numneigh = s.numneigh;
-    neighbors = s.neighbors;
-    cutforcesq = s.force_cutsq;
-    epsilon = 1.0;
-    sigma6 = 1.0;
-  }
-
-  /* Operator for not calculating energy and virial */
-
-  KOKKOS_INLINE_FUNCTION
-  void operator() (const int &i) const {
-    force<0>(i);
-  }
-
-  /* Operator for calculating energy and virial */
-
-  KOKKOS_INLINE_FUNCTION
-  void operator() (const int &i, double2 &energy_virial) const {
-    double2 ev = force<1>(i);
-    energy_virial.x += ev.x;
-    energy_virial.y += ev.y;
-  }
-
-  template<int EVFLAG>
-  KOKKOS_INLINE_FUNCTION
-  double2 force(const int &i) const
-  {
-    const int numneighs = numneigh[i];
-    const double xtmp = x(i, 0);
-    const double ytmp = x(i, 1);
-    const double ztmp = x(i, 2);
-    double fix = 0;
-    double fiy = 0;
-    double fiz = 0;
-    double energy = 0;
-    double virial = 0;
-
-    //pragma simd forces vectorization (ignoring the performance objections of the compiler)
-    //give hint to compiler that fix, fiy and fiz are used for reduction only
-
-  #ifdef USE_SIMD
-    #pragma simd reduction (+: fix,fiy,fiz,energy,virial)
-  #endif
-    for(int k = 0; k < numneighs; k++) {
-      const int j = neighbors(i, k);
-      const double delx = xtmp - x(j, 0);
-      const double dely = ytmp - x(j, 1);
-      const double delz = ztmp - x(j, 2);
-      const double rsq = delx * delx + dely * dely + delz * delz;
-
-      //if(i==0) printf("%i %i %lf %lf\n",i,j,rsq,cutforcesq);
-      if(rsq < cutforcesq) {
-        const double sr2 = 1.0 / rsq;
-        const double sr6 = sr2 * sr2 * sr2  * sigma6;
-        const double force = 48.0 * sr6 * (sr6 - 0.5) * sr2 * epsilon;
-        fix += delx * force;
-        fiy += dely * force;
-        fiz += delz * force;
-
-        if(EVFLAG) {
-          energy += sr6 * (sr6 - 1.0) * epsilon;
-          virial += delx * delx * force + dely * dely * force + delz * delz * force;
-        }
-      }
-    }
-
-    f(i, 0) += fix;
-    f(i, 1) += fiy;
-    f(i, 2) += fiz;
-
-    double2 energy_virial ;
-    energy_virial.x = 4.0 * energy ;
-    energy_virial.y = 0.5 * virial ;
-    return energy_virial;
-  }
-
-  /* init and join functions when doing the reduction to obtain energy and virial */
-
-  KOKKOS_FUNCTION
-  static void init(volatile value_type &update) {
-    update.x = update.y = 0;
-  }
-  KOKKOS_FUNCTION
-  static void join(volatile value_type &update ,
-                   const volatile value_type &source) {
-    update.x += source.x ;
-    update.y += source.y ;
-  }
-
-};
-
-
-/* Calling function */
-
-double2 force(System &s,int evflag) {
-
-  ForceFunctor f(s);
-
-  double2 ev ; ev.x = 0 ; ev.y = 0 ;
-  if(!evflag)
-    Kokkos::parallel_for(s.nlocal,f);
-  else
-    Kokkos::parallel_reduce(s.nlocal,f,ev);
-
-  execution_space().fence();
-  return ev;
-}
-
diff --git a/lib/kokkos/example/md_skeleton/main.cpp b/lib/kokkos/example/md_skeleton/main.cpp
deleted file mode 100644
index fe783b39cb..0000000000
--- a/lib/kokkos/example/md_skeleton/main.cpp
+++ /dev/null
@@ -1,205 +0,0 @@
-/*
-//@HEADER
-// ************************************************************************
-//
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
-// the U.S. Government retains certain rights in this software.
-//
-// 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 Corporation nor the names of the
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "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 SANDIA CORPORATION OR THE
-// 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.
-//
-// Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-//
-// ************************************************************************
-//@HEADER
-*/
-
-#include <cstdio>
-#include <cstring>
-#include <cstdlib>
-#include "system.h"
-
-int create_system(System &system, int nx, int ny, int nz, double rho);
-int neigh_setup(System &system);
-int neigh_build(System &system);
-double2 force(System &system,int evflag);
-
-/* simple MD Skeleton which
- *   - constructs a simple FCC lattice,
- *   - computes a neighborlist
- *   - compute LJ-Force kernel a number of times
- */
-
-int main(int argc, char** argv) {
-
-  printf("Running MD Skeleton\n");
-  /* Thread numbers for Host */
-
-  int num_threads = 1;
-  int teams = 1;
-  int device = 0; // Default device for GPU runs
-
-  /* avoid unused variable warnings */
-  (void)num_threads;
-  (void)teams;
-  (void)device;
-
-  /* Default value for number of force calculations */
-
-  int iter = 100;
-
-  /* Default value for system size (4*nx*ny*nz atoms)
-   * nx, ny and nz are set to system_size if not specified on commandline */
-
-  int system_size = 20;
-  int nx = -1;
-  int ny = -1;
-  int nz = -1;
-
-  int neighbor_size = 1; // Default bin size for neighbor list construction
-
-  double rho = 0.8442; // Number density of the system
-  double delta = 0; // Scaling factor for random offsets of atom positions
-
-
-  /* read in command-line arguments */
-
-  for(int i = 0; i < argc; i++) {
-    if((strcmp(argv[i], "-t") == 0) || (strcmp(argv[i], "--num_threads") == 0)) {
-      num_threads = atoi(argv[++i]);
-      continue;
-    }
-
-    if((strcmp(argv[i], "--teams") == 0)) {
-      teams = atoi(argv[++i]);
-      continue;
-    }
-
-    if((strcmp(argv[i], "-d") == 0) || (strcmp(argv[i], "--device") == 0))  {
-      device = atoi(argv[++i]);
-      continue;
-    }
-
-    if((strcmp(argv[i], "--delta") == 0)) {
-      delta = atof(argv[++i]);
-      continue;
-    }
-
-    if((strcmp(argv[i], "-i") == 0) || (strcmp(argv[i], "--iter") == 0))  {
-      iter = atoi(argv[++i]);
-      continue;
-    }
-
-    if((strcmp(argv[i], "-rho") == 0)) {
-      rho = atoi(argv[++i]);
-      continue;
-    }
-
-    if((strcmp(argv[i], "-s") == 0) || (strcmp(argv[i], "--size") == 0)) {
-      system_size = atoi(argv[++i]);
-      continue;
-    }
-
-    if((strcmp(argv[i], "-nx") == 0)) {
-      nx = atoi(argv[++i]);
-      continue;
-    }
-
-    if((strcmp(argv[i], "-ny") == 0)) {
-      ny = atoi(argv[++i]);
-      continue;
-    }
-
-    if((strcmp(argv[i], "-nz") == 0)) {
-      nz = atoi(argv[++i]);
-      continue;
-    }
-
-    if((strcmp(argv[i], "-b") == 0) || (strcmp(argv[i], "--neigh_bins") == 0))  {
-      neighbor_size = atoi(argv[++i]);
-      continue;
-    }
-  }
-
-  if( nx < 0 ) nx = system_size;
-  if( ny < 0 ) ny = system_size;
-  if( nz < 0 ) nz = system_size;
-
-  printf("-> Init Device\n");
-
-#if defined( KOKKOS_ENABLE_CUDA )
-  Kokkos::HostSpace::execution_space::initialize(teams*num_threads);
-  Kokkos::Cuda::SelectDevice select_device(device);
-  Kokkos::Cuda::initialize(select_device);
-#elif defined( KOKKOS_ENABLE_OPENMP )
-  Kokkos::OpenMP::initialize(teams*num_threads);
-#elif defined( KOKKOS_ENABLE_THREADS )
-  Kokkos::Threads::initialize(teams*num_threads);
-#endif
-
-  System system;
-  system.neigh_cut = 2.8;
-  system.force_cut = 2.5;
-  system.force_cutsq = system.force_cut*system.force_cut;
-  system.delta = delta;
-
-  printf("-> Build system\n");
-  create_system(system,nx,ny,nz,rho);
-
-  printf("-> Created %i atoms and %i ghost atoms\n",system.nlocal,system.nghost);
-
-  system.nbinx = system.box.xprd/neighbor_size+1;
-  system.nbiny = system.box.yprd/neighbor_size+1;
-  system.nbinz = system.box.zprd/neighbor_size+1;
-
-
-  printf("-> Building Neighborlist\n");
-
-  neigh_setup(system);
-  neigh_build(system);
-
-  double2 ev = force(system,1);
-
-  printf("-> Calculate Energy: %f Virial: %f\n",ev.x,ev.y);
-
-  printf("-> Running %i force calculations\n",iter);
-
-  Kokkos::Timer timer;
-
-  for(int i=0;i<iter;i++) {
-    force(system,0);
-  }
-
-
-  double time = timer.seconds();
-  printf("Time: %e s for %i iterations with %i atoms\n",time,iter,system.nlocal);
-
-  execution_space::finalize();
-}
diff --git a/lib/kokkos/example/md_skeleton/neighbor.cpp b/lib/kokkos/example/md_skeleton/neighbor.cpp
deleted file mode 100644
index 60e33d31f7..0000000000
--- a/lib/kokkos/example/md_skeleton/neighbor.cpp
+++ /dev/null
@@ -1,430 +0,0 @@
-/*
-//@HEADER
-// ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
-// the U.S. Government retains certain rights in this software.
-// 
-// 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 Corporation nor the names of the
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "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 SANDIA CORPORATION OR THE
-// 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.
-//
-// Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
-// ************************************************************************
-//@HEADER
-*/
-
-#include <system.h>
-#include <cstdio>
-#include <Kokkos_Core.hpp>
-
-#define SMALL 1.0e-6
-#define FACTOR 0.999
-
-/* BinningFunctor puts atoms into bins of the simulation box
- * Neighborlists are then created by checking only distances of atoms
- * in adjacent bins. That makes neighborlist construction a O(N) operation.
- */
-
-struct BinningFunctor {
-  typedef t_int_2d::execution_space execution_space;
-
-  System s;
-
-  int atoms_per_bin;
-
-  BinningFunctor(System _s): s(_s) {
-    atoms_per_bin = s.bins.dimension_1();
-  }
-
-  KOKKOS_INLINE_FUNCTION
-  void operator() (const int &i) const
-  {
-    const int ibin = coord2bin(s.d_x(i, 0), s.d_x(i, 1), s.d_x(i, 2));
-
-    const int ac = Kokkos::atomic_fetch_add(&s.bincount[ibin], 1);
-
-    if(ac < atoms_per_bin) {
-      s.bins(ibin, ac) = i;
-    } else if(s.d_resize(0) < ac) {
-      s.d_resize(0) = ac;
-    }
-  }
-
-  KOKKOS_INLINE_FUNCTION
-  int coord2bin(double x, double y, double z) const
-  {
-    int ix, iy, iz;
-
-    if(x >= s.box.xprd)
-      ix = (int)((x - s.box.xprd) * s.bininvx) + s.nbinx - s.mbinxlo;
-    else if(x >= 0.0)
-      ix = (int)(x * s.bininvx) - s.mbinxlo;
-    else
-      ix = (int)(x * s.bininvx) - s.mbinxlo - 1;
-
-    if(y >= s.box.yprd)
-      iy = (int)((y - s.box.yprd) * s.bininvy) + s.nbiny - s.mbinylo;
-    else if(y >= 0.0)
-      iy = (int)(y * s.bininvy) - s.mbinylo;
-    else
-      iy = (int)(y * s.bininvy) - s.mbinylo - 1;
-
-    if(z >= s.box.zprd)
-      iz = (int)((z - s.box.zprd) * s.bininvz) + s.nbinz - s.mbinzlo;
-    else if(z >= 0.0)
-      iz = (int)(z * s.bininvz) - s.mbinzlo;
-    else
-      iz = (int)(z * s.bininvz) - s.mbinzlo - 1;
-
-    return (iz * s.mbiny * s.mbinx + iy * s.mbinx + ix + 1);
-  }
-};
-
-/* Build the actual neighborlist*/
-
-struct BuildFunctor {
-
-  typedef t_int_2d::execution_space execution_space;
-
-  System s;
-
-  int maxneighs;
-  BuildFunctor(System _s): s(_s) {
-    maxneighs = s.neighbors.dimension_1();
-  }
-
-  KOKKOS_INLINE_FUNCTION
-  void operator() (const int &i) const
-  {
-    int n = 0;
-
-    const t_int_1d_const_um bincount_c = s.bincount;
-
-    const double xtmp = s.d_x(i, 0);
-    const double ytmp = s.d_x(i, 1);
-    const double ztmp = s.d_x(i, 2);
-
-    const int ibin = coord2bin(xtmp, ytmp, ztmp);
-
-    // loop over all bins in neighborhood (includes ibin)
-    for(int k = 0; k < s.nstencil; k++) {
-      const int jbin = ibin + s.d_stencil[k];
-
-      // get subview of jbin
-      const t_int_1d_const_um loc_bin =
-          Kokkos::subview(s.bins,jbin,Kokkos::ALL());
-
-      if(ibin == jbin)
-        for(int m = 0; m < bincount_c[jbin]; m++) {
-          const int j = loc_bin[m];
-
-          //for same bin as atom i skip j if i==j
-          if (j == i) continue;
-
-          const double delx = xtmp - s.d_x(j, 0);
-          const double dely = ytmp - s.d_x(j, 1);
-          const double delz = ztmp - s.d_x(j, 2);
-          const double rsq = delx * delx + dely * dely + delz * delz;
-
-          if(rsq <= s.neigh_cutsq && n<maxneighs) s.neighbors(i,n++) = j;
-        }
-      else {
-        for(int m = 0; m < bincount_c[jbin]; m++) {
-          const int j = loc_bin[m];
-
-          const double delx = xtmp - s.d_x(j, 0);
-          const double dely = ytmp - s.d_x(j, 1);
-          const double delz = ztmp - s.d_x(j, 2);
-          const double rsq = delx * delx + dely * dely + delz * delz;
-
-          if(rsq <= s.neigh_cutsq && n<maxneighs) s.neighbors(i,n++) = j;
-        }
-      }
-    }
-
-    s.numneigh[i] = n;
-
-    if(n >= maxneighs) {
-      if(n >= s.d_resize(0)) s.d_resize(0) = n;
-    }
-  }
-
-  KOKKOS_INLINE_FUNCTION
-  int coord2bin(double x, double y, double z) const
-  {
-    int ix, iy, iz;
-
-    if(x >= s.box.xprd)
-      ix = (int)((x - s.box.xprd) * s.bininvx) + s.nbinx - s.mbinxlo;
-    else if(x >= 0.0)
-      ix = (int)(x * s.bininvx) - s.mbinxlo;
-    else
-      ix = (int)(x * s.bininvx) - s.mbinxlo - 1;
-
-    if(y >= s.box.yprd)
-      iy = (int)((y - s.box.yprd) * s.bininvy) + s.nbiny - s.mbinylo;
-    else if(y >= 0.0)
-      iy = (int)(y * s.bininvy) - s.mbinylo;
-    else
-      iy = (int)(y * s.bininvy) - s.mbinylo - 1;
-
-    if(z >= s.box.zprd)
-      iz = (int)((z - s.box.zprd) * s.bininvz) + s.nbinz - s.mbinzlo;
-    else if(z >= 0.0)
-      iz = (int)(z * s.bininvz) - s.mbinzlo;
-    else
-      iz = (int)(z * s.bininvz) - s.mbinzlo - 1;
-
-    return (iz * s.mbiny * s.mbinx + iy * s.mbinx + ix + 1);
-  }
-};
-
-/* Reset an array to zero */
-
-struct MemsetZeroFunctor {
-  typedef t_x_array::execution_space  execution_space ;
-  void* ptr;
-  KOKKOS_INLINE_FUNCTION void operator()(const int i) const {
-    ((int*)ptr)[i] = 0;
-  }
-};
-
-/* Calculate distance of two bins */
-
-double bindist(System &s, int i, int j, int k)
-{
-  double delx, dely, delz;
-
-  if(i > 0)
-    delx = (i - 1) * s.binsizex;
-  else if(i == 0)
-    delx = 0.0;
-  else
-    delx = (i + 1) * s.binsizex;
-
-  if(j > 0)
-    dely = (j - 1) * s.binsizey;
-  else if(j == 0)
-    dely = 0.0;
-  else
-    dely = (j + 1) * s.binsizey;
-
-  if(k > 0)
-    delz = (k - 1) * s.binsizez;
-  else if(k == 0)
-    delz = 0.0;
-  else
-    delz = (k + 1) * s.binsizez;
-
-  return (delx * delx + dely * dely + delz * delz);
-}
-
-/* Setup the neighborlist construction
- * Determine binsizes, a stencil for defining adjacency, etc.
- */
-
-void neigh_setup(System &s) {
-
-  s.neigh_cutsq = s.neigh_cut * s.neigh_cut;
-
-  /*
-  c bins must evenly divide into box size,
-  c   becoming larger than cutneigh if necessary
-  c binsize = 1/2 of cutoff is near optimal
-
-  if (flag == 0) {
-    nbinx = 2.0 * xprd / cutneigh;
-    nbiny = 2.0 * yprd / cutneigh;
-    nbinz = 2.0 * zprd / cutneigh;
-    if (nbinx == 0) nbinx = 1;
-    if (nbiny == 0) nbiny = 1;
-    if (nbinz == 0) nbinz = 1;
-  }
-  */
-
-  s.binsizex = s.box.xprd / s.nbinx;
-  s.binsizey = s.box.yprd / s.nbiny;
-  s.binsizez = s.box.zprd / s.nbinz;
-  s.bininvx = 1.0 / s.binsizex;
-  s.bininvy = 1.0 / s.binsizey;
-  s.bininvz = 1.0 / s.binsizez;
-
-  double coord = s.box.xlo - s.neigh_cut - SMALL * s.box.xprd;
-  s.mbinxlo = static_cast<int>(coord * s.bininvx);
-
-  if(coord < 0.0) s.mbinxlo = s.mbinxlo - 1;
-
-  coord = s.box.xhi + s.neigh_cut + SMALL * s.box.xprd;
-  int mbinxhi = static_cast<int>(coord * s.bininvx);
-
-  coord = s.box.ylo - s.neigh_cut - SMALL * s.box.yprd;
-  s.mbinylo = static_cast<int>(coord * s.bininvy);
-
-  if(coord < 0.0) s.mbinylo = s.mbinylo - 1;
-
-  coord = s.box.yhi + s.neigh_cut + SMALL * s.box.yprd;
-  int mbinyhi = static_cast<int>(coord * s.bininvy);
-
-  coord = s.box.zlo - s.neigh_cut - SMALL * s.box.zprd;
-  s.mbinzlo = static_cast<int>(coord * s.bininvz);
-
-  if(coord < 0.0) s.mbinzlo = s.mbinzlo - 1;
-
-  coord = s.box.zhi + s.neigh_cut + SMALL * s.box.zprd;
-  int mbinzhi = static_cast<int>(coord * s.bininvz);
-
-  /* extend bins by 1 in each direction to insure stencil coverage */
-
-  s.mbinxlo = s.mbinxlo - 1;
-  mbinxhi = mbinxhi + 1;
-  s.mbinx = mbinxhi - s.mbinxlo + 1;
-
-  s.mbinylo = s.mbinylo - 1;
-  mbinyhi = mbinyhi + 1;
-  s.mbiny = mbinyhi - s.mbinylo + 1;
-
-  s.mbinzlo = s.mbinzlo - 1;
-  mbinzhi = mbinzhi + 1;
-  s.mbinz = mbinzhi - s.mbinzlo + 1;
-
-  /*
-  compute bin stencil of all bins whose closest corner to central bin
-  is within neighbor cutoff
-  for partial Newton (newton = 0),
-  stencil is all surrounding bins including self
-  for full Newton (newton = 1),
-  stencil is bins to the "upper right" of central bin, does NOT include self
-  next(xyz) = how far the stencil could possibly extend
-  factor < 1.0 for special case of LJ benchmark so code will create
-  correct-size stencil when there are 3 bins for every 5 lattice spacings
-  */
-
-  int nextx = static_cast<int>(s.neigh_cut * s.bininvx);
-
-  if(nextx * s.binsizex < FACTOR * s.neigh_cut) nextx++;
-
-  int nexty = static_cast<int>(s.neigh_cut * s.bininvy);
-
-  if(nexty * s.binsizey < FACTOR * s.neigh_cut) nexty++;
-
-  int nextz = static_cast<int>(s.neigh_cut * s.bininvz);
-
-  if(nextz * s.binsizez < FACTOR * s.neigh_cut) nextz++;
-
-  int nmax = (2 * nextz + 1) * (2 * nexty + 1) * (2 * nextx + 1);
-  s.d_stencil = t_int_1d("stencil", nmax);
-  s.h_stencil = Kokkos::create_mirror_view(s.d_stencil);
-  s.nstencil = 0;
-  int kstart = -nextz;
-
-  for(int k = kstart; k <= nextz; k++) {
-    for(int j = -nexty; j <= nexty; j++) {
-      for(int i = -nextx; i <= nextx; i++) {
-        if(bindist(s,i, j, k) < s.neigh_cutsq) {
-          s.h_stencil(s.nstencil++) = k * s.mbiny * s.mbinx + j * s.mbinx + i;
-        }
-      }
-    }
-  }
-
-  /* Allocate neighbor arrays */
-
-  Kokkos::deep_copy(s.d_stencil, s.h_stencil);
-  s.mbins = s.mbinx * s.mbiny * s.mbinz;
-  s.bincount = t_int_1d("bincount", s.mbins);
-  s.bins = t_int_2d("bins", s.mbins, 8);
-
-  s.neighbors = t_neighbors("neighbors",s.natoms,80);
-  s.numneigh = t_int_1d("numneigh",s.natoms);
-  s.d_resize = t_int_scalar("resize");
-  s.h_resize = Kokkos::create_mirror_view(s.d_resize);
-}
-
-
-/* Build the neighborlist
- * This is a try and rerun algorithm for handling the case where the bins array
- * and the neighbors array are not big enough. So if one is too small, it will
- * reallocate and rerun the binnind algorithm or the neighborlist construction.
- */
-
-void neigh_build(System &s) {
-
-  /* Binning of atoms */
-
-  s.h_resize(0) = 1;
-
-  while(s.h_resize(0) > 0) {
-    s.h_resize(0) = 0;
-    Kokkos::deep_copy(s.d_resize, s.h_resize);
-
-    MemsetZeroFunctor f_zero;
-    f_zero.ptr = (void*) s.bincount.ptr_on_device();
-    Kokkos::parallel_for(s.mbins, f_zero);
-    execution_space().fence();
-
-    BinningFunctor f(s);
-    Kokkos::parallel_for(s.natoms, f);
-    execution_space().fence();
-
-    /* Check if bins was large enough, if nor reallocated and rerun */
-
-    deep_copy(s.h_resize, s.d_resize);
-
-    if(s.h_resize(0)) {
-      int atoms_per_bin = s.h_resize(0)+2;
-      s.bins = t_int_2d("bins", s.mbins, atoms_per_bin);
-    }
-  }
-
-  /* Neighborlist construction */
-
-  s.h_resize(0) = 1;
-
-  while(s.h_resize(0)) {
-    s.h_resize(0) = 0;
-
-    Kokkos::deep_copy(s.d_resize, s.h_resize);
-
-    BuildFunctor f(s);
-    Kokkos::parallel_for(s.nlocal, f);
-
-    execution_space().fence();
-
-    /* Check if neighbors was large enough, if nor reallocated and rerun */
-
-    deep_copy(s.h_resize, s.d_resize);
-
-    if(s.h_resize(0)) {
-      int maxneighs = s.h_resize(0) * 1.2;
-      s.neighbors = t_neighbors("neighbors", s.natoms, maxneighs);
-    }
-  }
-}
diff --git a/lib/kokkos/example/md_skeleton/setup.cpp b/lib/kokkos/example/md_skeleton/setup.cpp
deleted file mode 100644
index 52defbc469..0000000000
--- a/lib/kokkos/example/md_skeleton/setup.cpp
+++ /dev/null
@@ -1,271 +0,0 @@
-/*
-//@HEADER
-// ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
-// the U.S. Government retains certain rights in this software.
-// 
-// 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 Corporation nor the names of the
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "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 SANDIA CORPORATION OR THE
-// 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.
-//
-// Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
-// ************************************************************************
-//@HEADER
-*/
-
-#include <system.h>
-#include <cmath>
-#include <cstdio>
-#include <cstdlib>
-/* initialize atoms on fcc lattice in parallel fashion */
-
-#define MAX(a,b) (a>b?a:b)
-#define MIN(a,b) (a<b?a:b)
-
-
-int create_system(System &system, int nx, int ny, int nz, double rho)
-{
-  /* Box Setup */
-
-  double lattice = pow((4.0 / rho), (1.0 / 3.0));
-  system.box.xprd = nx * lattice;
-  system.box.yprd = ny * lattice;
-  system.box.zprd = nz * lattice;
-  system.box.xlo = 0;
-  system.box.ylo = 0;
-  system.box.zlo = 0;
-  system.box.xhi = system.box.xprd;
-  system.box.yhi = system.box.yprd;
-  system.box.zhi = system.box.zprd;
-
-
-  int ghost_dist = int(system.neigh_cut/lattice) + 1;
-
-  /* total # of atoms */
-
-  system.nlocal = 4 * nx * ny * nz;
-  system.nghost = 4 * (nx + 2 * ghost_dist) *
-                      (ny + 2 * ghost_dist) *
-                      (nz + 2 * ghost_dist) -
-                      system.nlocal;
-  system.natoms = system.nlocal + system.nghost;
-
-  system.d_x = t_x_array("X",system.natoms);
-  system.h_x = Kokkos::create_mirror_view(system.d_x);
-  system.f = t_f_array("F",system.natoms);
-
-  /* determine loop bounds of lattice subsection that overlaps my sub-box
-     insure loop bounds do not exceed nx,ny,nz */
-
-  double alat = pow((4.0 / rho), (1.0 / 3.0));
-  int ilo = static_cast<int>(system.box.xlo / (0.5 * alat) - 1);
-  int ihi = static_cast<int>(system.box.xhi / (0.5 * alat) + 1);
-  int jlo = static_cast<int>(system.box.ylo / (0.5 * alat) - 1);
-  int jhi = static_cast<int>(system.box.yhi / (0.5 * alat) + 1);
-  int klo = static_cast<int>(system.box.zlo / (0.5 * alat) - 1);
-  int khi = static_cast<int>(system.box.zhi / (0.5 * alat) + 1);
-
-  ilo = MAX(ilo, 0);
-  ihi = MIN(ihi, 2 * nx - 1);
-  jlo = MAX(jlo, 0);
-  jhi = MIN(jhi, 2 * ny - 1);
-  klo = MAX(klo, 0);
-  khi = MIN(khi, 2 * nz - 1);
-
-
-
-  /* generates positions of atoms on fcc sublattice*/
-
-  srand(3718273);
-  /* create non-ghost atoms */
-  {
-    double xtmp, ytmp, ztmp;
-    int sx = 0;
-    int sy = 0;
-    int sz = 0;
-    int ox = 0;
-    int oy = 0;
-    int oz = 0;
-    int subboxdim = 8;
-
-    int n = 0;
-    int iflag = 0;
-
-    while(oz * subboxdim <= khi) {
-      const int k = oz * subboxdim + sz;
-      const int j = oy * subboxdim + sy;
-      const int i = ox * subboxdim + sx;
-
-      if(iflag) continue;
-
-      if(((i + j + k) % 2 == 0) &&
-          (i >= ilo) && (i <= ihi) &&
-          (j >= jlo) && (j <= jhi) &&
-          (k >= klo) && (k <= khi)) {
-
-        const int nold = n;
-        while(nold == n) {
-          xtmp = 0.5 * alat * i + system.delta/1000*(rand()%1000-500);
-          ytmp = 0.5 * alat * j + system.delta/1000*(rand()%1000-500);
-          ztmp = 0.5 * alat * k + system.delta/1000*(rand()%1000-500);
-
-          if(xtmp >= system.box.xlo && xtmp < system.box.xhi &&
-              ytmp >= system.box.ylo && ytmp < system.box.yhi &&
-              ztmp >= system.box.zlo && ztmp < system.box.zhi) {
-            system.h_x(n,0) = xtmp;
-            system.h_x(n,1) = ytmp;
-            system.h_x(n,2) = ztmp;
-            n++;
-          }
-        }
-      }
-
-      sx++;
-
-      if(sx == subboxdim) {
-        sx = 0;
-        sy++;
-      }
-
-      if(sy == subboxdim) {
-        sy = 0;
-        sz++;
-      }
-
-      if(sz == subboxdim) {
-        sz = 0;
-        ox++;
-      }
-
-      if(ox * subboxdim > ihi) {
-        ox = 0;
-        oy++;
-      }
-
-      if(oy * subboxdim > jhi) {
-        oy = 0;
-        oz++;
-      }
-    }
-
-    /* check that correct # of atoms were created */
-
-    if(system.nlocal != n) {
-      printf("Created incorrect # of atoms\n");
-
-      return 1;
-    }
-  }
-
-  /* create ghost atoms */
-
-  {
-    double xtmp, ytmp, ztmp;
-
-    int ilo_g = ilo - 2 * ghost_dist;
-    int jlo_g = jlo - 2 * ghost_dist;
-    int klo_g = klo - 2 * ghost_dist;
-    int ihi_g = ihi + 2 * ghost_dist;
-    int jhi_g = jhi + 2 * ghost_dist;
-    int khi_g = khi + 2 * ghost_dist;
-
-    int subboxdim = 8;
-    int sx = 0;
-    int sy = 0;
-    int sz = 0;
-    int ox = subboxdim * ilo_g;
-    int oy = subboxdim * jlo_g;
-    int oz = subboxdim * klo_g;
-
-    int n = system.nlocal;
-    int iflag = 0;
-
-
-    while(oz * subboxdim <= khi_g) {
-      const int k = oz * subboxdim + sz;
-      const int j = oy * subboxdim + sy;
-      const int i = ox * subboxdim + sx;
-
-      if(iflag) continue;
-
-      if(((i + j + k) % 2 == 0) &&
-          (i >= ilo_g) && (i <= ihi_g) &&
-          (j >= jlo_g) && (j <= jhi_g) &&
-          (k >= klo_g) && (k <= khi_g) &&
-          ((i < ilo) || (i > ihi) ||
-           (j < jlo) || (j > jhi) ||
-           (k < klo) || (k > khi))
-          ) {
-
-        xtmp = 0.5 * alat * i;
-        ytmp = 0.5 * alat * j;
-        ztmp = 0.5 * alat * k;
-
-        system.h_x(n,0) = xtmp + system.delta/1000*(rand()%1000-500);;
-        system.h_x(n,1) = ytmp + system.delta/1000*(rand()%1000-500);;
-        system.h_x(n,2) = ztmp + system.delta/1000*(rand()%1000-500);;
-        n++;
-      }
-
-      sx++;
-
-      if(sx == subboxdim) {
-        sx = 0;
-        sy++;
-      }
-
-      if(sy == subboxdim) {
-        sy = 0;
-        sz++;
-      }
-
-      if(sz == subboxdim) {
-        sz = 0;
-        ox++;
-        //printf("%i %i %i // %i %i %i\n",ox,oy,oz,i,j,k);
-      }
-
-      if(ox * subboxdim > ihi_g) {
-        ox = subboxdim * ilo_g;
-        oy++;
-      }
-
-      if(oy * subboxdim > jhi_g) {
-        oy = subboxdim * jlo_g;
-        oz++;
-      }
-    }
-  }
-
-  Kokkos::deep_copy(system.d_x,system.h_x);
-  return 0;
-}
-
diff --git a/lib/kokkos/example/md_skeleton/system.h b/lib/kokkos/example/md_skeleton/system.h
deleted file mode 100644
index 4a0708ed34..0000000000
--- a/lib/kokkos/example/md_skeleton/system.h
+++ /dev/null
@@ -1,92 +0,0 @@
-/*
-//@HEADER
-// ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
-// the U.S. Government retains certain rights in this software.
-// 
-// 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 Corporation nor the names of the
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "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 SANDIA CORPORATION OR THE
-// 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.
-//
-// Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
-// ************************************************************************
-//@HEADER
-*/
-
-#ifndef SYSTEM_H_
-#define SYSTEM_H_
-
-#include <types.h>
-
-struct Box {
-  double xprd, yprd, zprd;
-  double xlo, xhi;
-  double ylo, yhi;
-  double zlo, zhi;
-};
-
-struct System {
-  Box box;
-
-  int natoms;
-  int nlocal;
-  int nghost;
-
-  t_x_array d_x;
-  t_x_array_host h_x;
-
-  t_f_array f;
-
-  t_neighbors neighbors;
-  t_int_1d numneigh;
-
-  double delta;
-
-  double neigh_cut,neigh_cutsq;
-
-  int mbins;
-  int nbinx,nbiny,nbinz;
-  int mbinx,mbiny,mbinz;
-  int mbinxlo,mbinylo,mbinzlo;
-  double binsizex,binsizey,binsizez;
-  double bininvx,bininvy,bininvz;
-
-  t_int_1d bincount;
-  t_int_2d bins;
-  t_int_scalar d_resize;
-  t_int_scalar_host h_resize;
-  t_int_1d d_stencil;
-  t_int_1d_host h_stencil;
-  int nstencil;
-
-  double force_cut,force_cutsq;
-};
-#endif
diff --git a/lib/kokkos/example/md_skeleton/types.h b/lib/kokkos/example/md_skeleton/types.h
deleted file mode 100644
index 71d8c9bca0..0000000000
--- a/lib/kokkos/example/md_skeleton/types.h
+++ /dev/null
@@ -1,118 +0,0 @@
-/*
-//@HEADER
-// ************************************************************************
-//
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
-// the U.S. Government retains certain rights in this software.
-//
-// 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 Corporation nor the names of the
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "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 SANDIA CORPORATION OR THE
-// 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.
-//
-// Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-//
-// ************************************************************************
-//@HEADER
-*/
-
-#ifndef TYPES_H_
-#define TYPES_H_
-
-/* Determine default device type and necessary includes */
-
-#include <Kokkos_Core.hpp>
-
-typedef Kokkos::DefaultExecutionSpace execution_space ;
-
-#if ! defined( KOKKOS_ENABLE_CUDA )
-  struct double2 {
-    double x, y;
-    KOKKOS_INLINE_FUNCTION
-    double2(double xinit, double yinit) {
-      x = xinit;
-      y = yinit;
-    }
-    KOKKOS_INLINE_FUNCTION
-    double2() {
-      x = 0.0;
-      y = 0.0;
-    }
-    KOKKOS_INLINE_FUNCTION
-    double2& operator += (const double2& src) {
-      x+=src.x;
-      y+=src.y;
-      return *this;
-    }
-
-    KOKKOS_INLINE_FUNCTION
-    volatile double2& operator += (const volatile double2& src) volatile {
-      x+=src.x;
-      y+=src.y;
-      return *this;
-    }
-
-  };
-#endif
-
-#include <impl/Kokkos_Timer.hpp>
-
-/* Define types used throughout the code */
-
-//Position arrays
-typedef Kokkos::View<double*[3], Kokkos::LayoutRight, execution_space>                                   t_x_array ;
-typedef t_x_array::HostMirror                                                                        t_x_array_host ;
-typedef Kokkos::View<const double*[3], Kokkos::LayoutRight, execution_space>                             t_x_array_const ;
-typedef Kokkos::View<const double*[3], Kokkos::LayoutRight, execution_space, Kokkos::MemoryRandomAccess >  t_x_array_randomread ;
-
-//Force array
-typedef Kokkos::View<double*[3],  execution_space>                                                       t_f_array ;
-
-
-//Neighborlist
-typedef Kokkos::View<int**, execution_space >                                                            t_neighbors ;
-typedef Kokkos::View<const int**, execution_space >                                                      t_neighbors_const ;
-typedef Kokkos::View<int*, execution_space, Kokkos::MemoryUnmanaged >                                    t_neighbors_sub ;
-typedef Kokkos::View<const int*, execution_space, Kokkos::MemoryUnmanaged >                              t_neighbors_const_sub ;
-
-//1d int array
-typedef Kokkos::View<int*, execution_space >                                                             t_int_1d ;
-typedef t_int_1d::HostMirror                                                                         t_int_1d_host ;
-typedef Kokkos::View<const int*, execution_space >                                                       t_int_1d_const ;
-typedef Kokkos::View<int*, execution_space , Kokkos::MemoryUnmanaged>                                    t_int_1d_um ;
-typedef Kokkos::View<const int* , execution_space , Kokkos::MemoryUnmanaged>                             t_int_1d_const_um ;
-
-//2d int array
-typedef Kokkos::View<int**, Kokkos::LayoutRight, execution_space >                                       t_int_2d ;
-typedef t_int_2d::HostMirror                                                                         t_int_2d_host ;
-
-//Scalar ints
-typedef Kokkos::View<int[1], Kokkos::LayoutLeft, execution_space>                                        t_int_scalar ;
-typedef t_int_scalar::HostMirror                                                                     t_int_scalar_host ;
-
-#endif /* TYPES_H_ */
diff --git a/lib/kokkos/example/multi_fem/BoxMeshFixture.hpp b/lib/kokkos/example/multi_fem/BoxMeshFixture.hpp
deleted file mode 100644
index 6fbf1d5a0a..0000000000
--- a/lib/kokkos/example/multi_fem/BoxMeshFixture.hpp
+++ /dev/null
@@ -1,610 +0,0 @@
-/*
-//@HEADER
-// ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
-// the U.S. Government retains certain rights in this software.
-// 
-// 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 Corporation nor the names of the
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "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 SANDIA CORPORATION OR THE
-// 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.
-//
-// Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
-// ************************************************************************
-//@HEADER
-*/
-
-#ifndef KOKKOS_BOXMESHFIXTURE_HPP
-#define KOKKOS_BOXMESHFIXTURE_HPP
-
-#include <cmath>
-#include <stdexcept>
-#include <sstream>
-
-#include <Kokkos_Core.hpp>
-#include <BoxMeshPartition.hpp>
-#include <FEMesh.hpp>
-#include <HexElement.hpp>
-
-//----------------------------------------------------------------------------
-
-struct FixtureElementHex8 {
-
-  static const unsigned element_node_count = 8 ;
-
-  HybridFEM::HexElement_TensorData< element_node_count > elem_data ;
-  BoxBoundsLinear box_bounds ;
-
-  FixtureElementHex8() : elem_data(), box_bounds() {}
-
-  static void create_node_boxes_from_vertex_boxes(
-    const BoxType                & vertex_box_global ,
-    const std::vector< BoxType > & vertex_box_parts ,
-          BoxType                & node_box_global ,
-          std::vector< BoxType > & node_box_parts )
-  {
-    node_box_global = vertex_box_global ;
-    node_box_parts  = vertex_box_parts  ;
-  }
-
-  void elem_to_node( const unsigned node_local , unsigned coord[] ) const
-  {
-    coord[0] += elem_data.eval_map[ node_local ][0] ;
-    coord[1] += elem_data.eval_map[ node_local ][1] ;
-    coord[2] += elem_data.eval_map[ node_local ][2] ;
-  }
-};
-
-struct FixtureElementHex27 {
-  static const unsigned element_node_count = 27 ;
-
-  HybridFEM::HexElement_TensorData< element_node_count > elem_data ;
-  BoxBoundsQuadratic box_bounds ;
-
-  FixtureElementHex27() : elem_data(), box_bounds() {}
-
-  static void create_node_boxes_from_vertex_boxes(
-    const BoxType                & vertex_box_global ,
-    const std::vector< BoxType > & vertex_box_parts ,
-          BoxType                & node_box_global ,
-          std::vector< BoxType > & node_box_parts )
-  {
-    node_box_global = vertex_box_global ;
-    node_box_parts  = vertex_box_parts  ;
-
-    node_box_global[0][1] = 2 * node_box_global[0][1] - 1 ;
-    node_box_global[1][1] = 2 * node_box_global[1][1] - 1 ;
-    node_box_global[2][1] = 2 * node_box_global[2][1] - 1 ;
-
-    for ( unsigned i = 0 ; i < vertex_box_parts.size() ; ++i ) {
-      node_box_parts[i][0][0] = 2 * node_box_parts[i][0][0] ;
-      node_box_parts[i][1][0] = 2 * node_box_parts[i][1][0] ;
-      node_box_parts[i][2][0] = 2 * node_box_parts[i][2][0] ;
-
-      node_box_parts[i][0][1] =
-        std::min( node_box_global[0][1] , 2 * node_box_parts[i][0][1] );
-      node_box_parts[i][1][1] =
-        std::min( node_box_global[1][1] , 2 * node_box_parts[i][1][1] );
-      node_box_parts[i][2][1] =
-        std::min( node_box_global[2][1] , 2 * node_box_parts[i][2][1] );
-    }
-  }
-
-  void elem_to_node( const unsigned node_local , unsigned coord[] ) const
-  {
-    coord[0] = 2 * coord[0] + elem_data.eval_map[ node_local ][0] ;
-    coord[1] = 2 * coord[1] + elem_data.eval_map[ node_local ][1] ;
-    coord[2] = 2 * coord[2] + elem_data.eval_map[ node_local ][2] ;
-  }
-};
-
-//----------------------------------------------------------------------------
-
-template< typename Scalar , class Device , class ElementSpec >
-struct BoxMeshFixture {
-
-  typedef Scalar  coordinate_scalar_type ;
-  typedef Device  execution_space ;
-
-  static const unsigned element_node_count = ElementSpec::element_node_count ;
-
-  typedef HybridFEM::FEMesh< coordinate_scalar_type ,
-                             element_node_count ,
-                             execution_space > FEMeshType ;
-
-  typedef typename FEMeshType::node_coords_type    node_coords_type ;
-  typedef typename FEMeshType::elem_node_ids_type  elem_node_ids_type ;
-  typedef typename FEMeshType::node_elem_ids_type  node_elem_ids_type ;
-
-
-  static void verify(
-    const typename FEMeshType::node_coords_type::HostMirror   & node_coords ,
-    const typename FEMeshType::elem_node_ids_type::HostMirror & elem_node_ids ,
-    const typename FEMeshType::node_elem_ids_type::HostMirror & node_elem_ids )
-  {
-    typedef typename FEMeshType::size_type         size_type ;
-    //typedef typename node_coords_type::value_type  coords_type ; // unused
-
-    const size_type node_count_total = node_coords.dimension_0();
-    const size_type elem_count_total = elem_node_ids.dimension_0();
-
-    const ElementSpec element ;
-
-    for ( size_type node_index = 0 ;
-                    node_index < node_count_total ; ++node_index ) {
-
-      for ( size_type
-              j = node_elem_ids.row_map[ node_index ] ;
-              j < node_elem_ids.row_map[ node_index + 1 ] ; ++j ) {
-
-        const size_type elem_index = node_elem_ids.entries(j,0);
-        const size_type node_local = node_elem_ids.entries(j,1);
-        const size_type en_id      = elem_node_ids(elem_index,node_local);
-
-        if ( node_index != en_id ) {
-          std::ostringstream msg ;
-          msg << "BoxMeshFixture node_elem_ids error"
-              << " : node_index(" << node_index
-              << ") entry(" << j
-              << ") elem_index(" << elem_index
-              << ") node_local(" << node_local
-              << ") elem_node_id(" << en_id
-              << ")" ;
-          throw std::runtime_error( msg.str() );
-        }
-      }
-    }
-
-    for ( size_type elem_index = 0 ;
-                    elem_index < elem_count_total; ++elem_index ) {
-
-      coordinate_scalar_type elem_node_coord[ element_node_count ][3] ;
-
-      for ( size_type nn = 0 ; nn < element_node_count ; ++nn ) {
-        const size_type node_index = elem_node_ids( elem_index , nn );
-
-        for ( size_type nc = 0 ; nc < 3 ; ++nc ) {
-          elem_node_coord[nn][nc] = node_coords( node_index , nc );
-        }
-      }
-
-
-      for ( size_type nn = 0 ; nn < element_node_count ; ++nn ) {
-
-        const unsigned ix = element.elem_data.eval_map[nn][0] ;
-        const unsigned iy = element.elem_data.eval_map[nn][1] ;
-        const unsigned iz = element.elem_data.eval_map[nn][2] ;
-
-        if ( elem_node_coord[nn][0] != elem_node_coord[0][0] + ix ||
-             elem_node_coord[nn][1] != elem_node_coord[0][1] + iy ||
-             elem_node_coord[nn][2] != elem_node_coord[0][2] + iz ) {
-
-          std::ostringstream msg ;
-          msg << "BoxMeshFixture elem_node_coord mapping failure { "
-              << elem_node_coord[nn][0] << " "
-              << elem_node_coord[nn][1] << " "
-              << elem_node_coord[nn][2] << " } != { "
-              << elem_node_coord[ 0][0] + ix << " "
-              << elem_node_coord[ 0][1] + iy << " "
-              << elem_node_coord[ 0][2] + iz
-              << " }" ;
-          throw std::runtime_error( msg.str() );
-        }
-      }
-    }
-  }
-
-  //------------------------------------
-  // Initialize element-node connectivity:
-  // Order elements that only depend on owned nodes first.
-  // These elements could be computed while waiting for
-  // received node data.
-
-  static void layout_elements_interior_exterior(
-    const BoxType                vertex_box_local_used ,
-    const BoxType                vertex_box_local_owned ,
-    const BoxType                node_box_local_used ,
-    const std::vector<size_t> &  node_used_id_map ,
-    const ElementSpec            element_fixture ,
-    const size_t                 elem_count_interior ,
-    const typename elem_node_ids_type::HostMirror elem_node_ids )
-  {
-    size_t elem_index_interior = 0 ;
-    size_t elem_index_boundary = elem_count_interior ;
-
-    for ( size_t iz = vertex_box_local_used[2][0] ;
-                 iz < vertex_box_local_used[2][1] - 1 ; ++iz ) {
-    for ( size_t iy = vertex_box_local_used[1][0] ;
-                 iy < vertex_box_local_used[1][1] - 1 ; ++iy ) {
-    for ( size_t ix = vertex_box_local_used[0][0] ;
-                 ix < vertex_box_local_used[0][1] - 1 ; ++ix ) {
-
-      size_t elem_index ;
-
-      // If lower and upper vertices are owned then element is interior
-      if ( contain( vertex_box_local_owned, ix,   iy,   iz ) &&
-           contain( vertex_box_local_owned, ix+1, iy+1, iz+1 ) ) {
-        elem_index = elem_index_interior++ ;
-      }
-      else {
-        elem_index = elem_index_boundary++ ;
-      }
-
-      for ( size_t nn = 0 ; nn < element_node_count ; ++nn ) {
-        unsigned coord[3] = { static_cast<unsigned>(ix) , static_cast<unsigned>(iy) , static_cast<unsigned>(iz) };
-
-        element_fixture.elem_to_node( nn , coord );
-
-        const size_t node_local_id =
-          box_map_id( node_box_local_used ,
-                      node_used_id_map ,
-                      coord[0] , coord[1] , coord[2] );
-
-        elem_node_ids( elem_index , nn ) = node_local_id ;
-      }
-    }}}
-  }
-
-  //------------------------------------
-  // Nested partitioning of elements by number of thread 'gangs'
-
-  static void layout_elements_partitioned(
-    const BoxType                vertex_box_local_used ,
-    const BoxType                /*vertex_box_local_owned*/ ,
-    const BoxType                node_box_local_used ,
-    const std::vector<size_t> &  node_used_id_map ,
-    const ElementSpec            element_fixture ,
-    const size_t                 thread_gang_count ,
-    const typename elem_node_ids_type::HostMirror elem_node_ids )
-  {
-    std::vector< BoxType > element_box_gangs( thread_gang_count );
-
-    BoxType element_box_local_used = vertex_box_local_used ;
-
-    element_box_local_used[0][1] -= 1 ;
-    element_box_local_used[1][1] -= 1 ;
-    element_box_local_used[2][1] -= 1 ;
-
-    box_partition_rcb( element_box_local_used , element_box_gangs );
-
-    size_t elem_index = 0 ;
-
-    for ( size_t ig = 0 ; ig < thread_gang_count ; ++ig ) {
-
-      const BoxType box = element_box_gangs[ig] ;
-
-      for ( size_t iz = box[2][0] ; iz < box[2][1] ; ++iz ) {
-      for ( size_t iy = box[1][0] ; iy < box[1][1] ; ++iy ) {
-      for ( size_t ix = box[0][0] ; ix < box[0][1] ; ++ix , ++elem_index ) {
-
-        for ( size_t nn = 0 ; nn < element_node_count ; ++nn ) {
-          unsigned coord[3] = { static_cast<unsigned>(ix) , static_cast<unsigned>(iy) , static_cast<unsigned>(iz) };
-
-          element_fixture.elem_to_node( nn , coord );
-
-          const size_t node_local_id =
-            box_map_id( node_box_local_used ,
-                        node_used_id_map ,
-                        coord[0] , coord[1] , coord[2] );
-
-          elem_node_ids( elem_index , nn ) = node_local_id ;
-        }
-      }}}
-    }
-  }
-
-  //------------------------------------
-
-  static FEMeshType create( const size_t proc_count ,
-                            const size_t proc_local ,
-                            const size_t gang_count ,
-                            const size_t elems_x ,
-                            const size_t elems_y ,
-                            const size_t elems_z ,
-                            const double x_coord_curve = 1 ,
-                            const double y_coord_curve = 1 ,
-                            const double z_coord_curve = 1 )
-  {
-    const size_t vertices_x = elems_x + 1 ;
-    const size_t vertices_y = elems_y + 1 ;
-    const size_t vertices_z = elems_z + 1 ;
-
-    const BoxBoundsLinear vertex_box_bounds ;
-    const ElementSpec element ;
-
-    // Partition based upon vertices:
-
-    BoxType vertex_box_global ;
-    std::vector< BoxType > vertex_box_parts( proc_count );
-
-    vertex_box_global[0][0] = 0 ; vertex_box_global[0][1] = vertices_x ;
-    vertex_box_global[1][0] = 0 ; vertex_box_global[1][1] = vertices_y ;
-    vertex_box_global[2][0] = 0 ; vertex_box_global[2][1] = vertices_z ;
-
-    box_partition_rcb( vertex_box_global , vertex_box_parts );
-
-    const BoxType vertex_box_local_owned = vertex_box_parts[ proc_local ];
-
-    // Determine interior and used vertices:
-
-    BoxType vertex_box_local_interior ;
-    BoxType vertex_box_local_used ;
-
-    vertex_box_bounds.apply( vertex_box_global ,
-                             vertex_box_local_owned ,
-                             vertex_box_local_interior ,
-                             vertex_box_local_used );
-
-    // Element counts:
-
-    const long local_elems_x =
-      ( vertex_box_local_used[0][1] - vertex_box_local_used[0][0] ) - 1 ;
-    const long local_elems_y =
-      ( vertex_box_local_used[1][1] - vertex_box_local_used[1][0] ) - 1 ;
-    const long local_elems_z =
-      ( vertex_box_local_used[2][1] - vertex_box_local_used[2][0] ) - 1 ;
-
-    const size_t elem_count_total = std::max( long(0) , local_elems_x ) *
-                                    std::max( long(0) , local_elems_y ) *
-                                    std::max( long(0) , local_elems_z );
-
-    const long interior_elems_x =
-      ( vertex_box_local_owned[0][1] - vertex_box_local_owned[0][0] ) - 1 ;
-    const long interior_elems_y =
-      ( vertex_box_local_owned[1][1] - vertex_box_local_owned[1][0] ) - 1 ;
-    const long interior_elems_z =
-      ( vertex_box_local_owned[2][1] - vertex_box_local_owned[2][0] ) - 1 ;
-
-    const size_t elem_count_interior = std::max( long(0) , interior_elems_x ) *
-                                       std::max( long(0) , interior_elems_y ) *
-                                       std::max( long(0) , interior_elems_z );
-
-    // Expand vertex boxes to node boxes:
-
-    BoxType node_box_global ;
-    BoxType node_box_local_used ;
-    std::vector< BoxType > node_box_parts ;
-
-    element.create_node_boxes_from_vertex_boxes(
-      vertex_box_global , vertex_box_parts ,
-      node_box_global , node_box_parts );
-
-    // Node communication maps:
-
-    size_t node_count_interior = 0 ;
-    size_t node_count_owned    = 0 ;
-    size_t node_count_total    = 0 ;
-    std::vector<size_t>                 node_used_id_map ;
-    std::vector<size_t>                 node_part_counts ;
-    std::vector< std::vector<size_t> >  node_send_map ;
-
-    box_partition_maps( node_box_global ,
-                        node_box_parts ,
-                        element.box_bounds ,
-                        proc_local ,
-                        node_box_local_used ,
-                        node_used_id_map ,
-                        node_count_interior ,
-                        node_count_owned ,
-                        node_count_total ,
-                        node_part_counts ,
-                        node_send_map );
-
-    size_t node_count_send = 0 ;
-    for ( size_t i = 0 ; i < node_send_map.size() ; ++i ) {
-      node_count_send += node_send_map[i].size();
-    }
-
-    size_t recv_msg_count = 0 ;
-    size_t send_msg_count = 0 ;
-    size_t send_count = 0 ;
-
-    for ( size_t i = 1 ; i < proc_count ; ++i ) {
-      if ( node_part_counts[i] ) ++recv_msg_count ;
-      if ( node_send_map[i].size() ) {
-        ++send_msg_count ;
-        send_count += node_send_map[i].size();
-      }
-    }
-
-    // Finite element mesh:
-
-    FEMeshType mesh ;
-
-    if ( node_count_total ) {
-      mesh.node_coords = node_coords_type( "node_coords", node_count_total );
-    }
-
-    if ( elem_count_total ) {
-      mesh.elem_node_ids =
-        elem_node_ids_type( "elem_node_ids", elem_count_total );
-    }
-
-    mesh.parallel_data_map.assign( node_count_interior ,
-                                   node_count_owned ,
-                                   node_count_total ,
-                                   recv_msg_count ,
-                                   send_msg_count ,
-                                   send_count );
-
-    typename node_coords_type::HostMirror node_coords =
-      Kokkos::create_mirror( mesh.node_coords );
-
-    typename elem_node_ids_type::HostMirror elem_node_ids =
-      Kokkos::create_mirror( mesh.elem_node_ids );
-
-    //------------------------------------
-    // set node coordinates to grid location for subsequent verification
-
-    for ( size_t iz = node_box_local_used[2][0] ;
-                 iz < node_box_local_used[2][1] ; ++iz ) {
-
-    for ( size_t iy = node_box_local_used[1][0] ;
-                 iy < node_box_local_used[1][1] ; ++iy ) {
-
-    for ( size_t ix = node_box_local_used[0][0] ;
-                 ix < node_box_local_used[0][1] ; ++ix ) {
-
-      const size_t node_local_id =
-        box_map_id( node_box_local_used , node_used_id_map , ix , iy , iz );
-
-      node_coords( node_local_id , 0 ) = ix ;
-      node_coords( node_local_id , 1 ) = iy ;
-      node_coords( node_local_id , 2 ) = iz ;
-    }}}
-
-    //------------------------------------
-    // Initialize element-node connectivity:
-
-    if ( 1 < gang_count ) {
-      layout_elements_partitioned( vertex_box_local_used ,
-                                   vertex_box_local_owned ,
-                                   node_box_local_used ,
-                                   node_used_id_map ,
-                                   element ,
-                                   gang_count ,
-                                   elem_node_ids );
-    }
-    else {
-      layout_elements_interior_exterior( vertex_box_local_used ,
-                                         vertex_box_local_owned ,
-                                         node_box_local_used ,
-                                         node_used_id_map ,
-                                         element ,
-                                         elem_count_interior ,
-                                         elem_node_ids );
-    }
-
-    //------------------------------------
-    // Populate node->element connectivity:
-
-    std::vector<size_t> node_elem_work( node_count_total , (size_t) 0 );
-
-    for ( size_t i = 0 ; i < elem_count_total ; ++i ) {
-      for ( size_t n = 0 ; n < element_node_count  ; ++n ) {
-        ++node_elem_work[ elem_node_ids(i,n) ];
-      }
-    }
-
-    mesh.node_elem_ids =
-      Kokkos::create_staticcrsgraph< node_elem_ids_type >( "node_elem_ids" , node_elem_work );
-
-    typename node_elem_ids_type::HostMirror
-      node_elem_ids = Kokkos::create_mirror( mesh.node_elem_ids );
-
-    for ( size_t i = 0 ; i < node_count_total ; ++i ) {
-      node_elem_work[i] = node_elem_ids.row_map[i];
-    }
-
-    // Looping in element order insures the list of elements
-    // is sorted by element index.
-
-    for ( size_t i = 0 ; i < elem_count_total ; ++i ) {
-      for ( size_t n = 0 ; n < element_node_count ; ++n ) {
-        const unsigned nid = elem_node_ids(i, n);
-        const unsigned j = node_elem_work[nid] ; ++node_elem_work[nid] ;
-
-        node_elem_ids.entries( j , 0 ) = i ;
-        node_elem_ids.entries( j , 1 ) = n ;
-      }
-    }
-    //------------------------------------
-    // Verify setup with node coordinates matching grid indices.
-    verify( node_coords , elem_node_ids , node_elem_ids );
-
-    //------------------------------------
-    // Scale node coordinates to problem extent with
-    // nonlinear mapping.
-    {
-      const double problem_extent[3] =
-        { static_cast<double>( vertex_box_global[0][1] - 1 ) ,
-          static_cast<double>( vertex_box_global[1][1] - 1 ) ,
-          static_cast<double>( vertex_box_global[2][1] - 1 ) };
-
-      const double grid_extent[3] =
-        { static_cast<double>( node_box_global[0][1] - 1 ) ,
-          static_cast<double>( node_box_global[1][1] - 1 ) ,
-          static_cast<double>( node_box_global[2][1] - 1 ) };
-
-      for ( size_t i = 0 ; i < node_count_total ; ++i ) {
-        const double x_unit = node_coords(i,0) / grid_extent[0] ;
-        const double y_unit = node_coords(i,1) / grid_extent[1] ;
-        const double z_unit = node_coords(i,2) / grid_extent[2] ;
-
-        node_coords(i,0) = coordinate_scalar_type( problem_extent[0] * std::pow( x_unit , x_coord_curve ) );
-        node_coords(i,1) = coordinate_scalar_type( problem_extent[1] * std::pow( y_unit , y_coord_curve ) );
-        node_coords(i,2) = coordinate_scalar_type( problem_extent[2] * std::pow( z_unit , z_coord_curve ) );
-      }
-    }
-
-    Kokkos::deep_copy( mesh.node_coords ,   node_coords );
-    Kokkos::deep_copy( mesh.elem_node_ids , elem_node_ids );
-    Kokkos::deep_copy( mesh.node_elem_ids.entries , node_elem_ids.entries );
-
-    //------------------------------------
-    // Communication lists:
-    {
-      recv_msg_count = 0 ;
-      send_msg_count = 0 ;
-      send_count = 0 ;
-
-      for ( size_t i = 1 ; i < proc_count ; ++i ) {
-
-        // Order sending starting with the local processor rank
-        // to try to smooth out the amount of messages simultaneously
-        // send to a particular processor.
-
-        const int proc = ( proc_local + i ) % proc_count ;
-        if ( node_part_counts[i] ) {
-          mesh.parallel_data_map.host_recv(recv_msg_count,0) = proc ;
-          mesh.parallel_data_map.host_recv(recv_msg_count,1) = node_part_counts[i] ;
-          ++recv_msg_count ;
-        }
-        if ( node_send_map[i].size() ) {
-          mesh.parallel_data_map.host_send(send_msg_count,0) = proc ;
-          mesh.parallel_data_map.host_send(send_msg_count,1) = node_send_map[i].size() ;
-          for ( size_t j = 0 ; j < node_send_map[i].size() ; ++j , ++send_count ) {
-            mesh.parallel_data_map.host_send_item(send_count) = node_send_map[i][j] - node_count_interior ;
-          }
-          ++send_msg_count ;
-        }
-      }
-    }
-
-    return mesh ;
-  }
-};
-
-//----------------------------------------------------------------------------
-//----------------------------------------------------------------------------
-
-#endif /* #ifndef KOKKOS_BOXMESHFIXTURE_HPP */
-
-
diff --git a/lib/kokkos/example/multi_fem/BoxMeshPartition.cpp b/lib/kokkos/example/multi_fem/BoxMeshPartition.cpp
deleted file mode 100644
index 99c93e5eb1..0000000000
--- a/lib/kokkos/example/multi_fem/BoxMeshPartition.cpp
+++ /dev/null
@@ -1,381 +0,0 @@
-/*
-//@HEADER
-// ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
-// the U.S. Government retains certain rights in this software.
-// 
-// 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 Corporation nor the names of the
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "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 SANDIA CORPORATION OR THE
-// 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.
-//
-// Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
-// ************************************************************************
-//@HEADER
-*/
-
-#include <iostream>
-#include <sstream>
-#include <stdexcept>
-#include <limits>
-#include <BoxMeshPartition.hpp>
-
-//----------------------------------------------------------------------------
-
-namespace {
-
-void box_partition( size_t ip , size_t up ,
-                    const BoxType & box ,
-                    BoxType * const p_box )
-{
-  const size_t np = up - ip ;
-
-  if ( 1 == np ) {
-    p_box[ip] = box ;
-  }
-  else {
-    // Choose axis with largest count:
-
-    const size_t n0 = box[0][1] - box[0][0] ;
-    const size_t n1 = box[1][1] - box[1][0] ;
-    const size_t n2 = box[2][1] - box[2][0] ;
-
-    const size_t axis = n2 > n1 ? ( n2 > n0 ? 2 : ( n1 > n0 ? 1 : 0 ) ) :
-                                  ( n1 > n0 ? 1 : 0 );
-
-    const size_t n = box[ axis ][1] - box[ axis ][0] ;
-
-    if ( 0 == np % 3 ) {
-      const size_t np_part = np / 3 ; // exact
-
-      const size_t nbox_low = (size_t)(( (double) n ) * ( 1.0 / 3.0 ));
-      const size_t nbox_mid = (size_t)(( (double) n ) * ( 2.0 / 3.0 ));
-
-      BoxType dbox_low = box ; // P = [ip,ip+np/3) 
-      BoxType dbox_mid = box ; // P = [ip+np/3,ip+2*np/3) 
-      BoxType dbox_upp = box ; // P = [ip+2*np/3,ip+np) 
-
-      dbox_low[ axis ][1] = box[ axis ][0] + nbox_low ;
-      dbox_mid[ axis ][1] = box[ axis ][0] + nbox_mid ;
-
-      dbox_mid[ axis ][0] = dbox_low[ axis ][1];
-      dbox_upp[ axis ][0] = dbox_mid[ axis ][1];
-
-      box_partition( ip,           ip +   np_part, dbox_low , p_box );
-      box_partition( ip+  np_part, ip + 2*np_part, dbox_mid , p_box );
-      box_partition( ip+2*np_part, up,             dbox_upp , p_box );
-    }
-    else {
-      const size_t np_low = np / 2 ; /* Rounded down */
-      const size_t nbox_low = (size_t)
-        (((double)n) * ( ((double) np_low ) / ((double) np ) ));
-
-      BoxType dbox_low = box ;
-      BoxType dbox_upp = box ;
-
-      dbox_low[ axis ][1] = dbox_low[ axis ][0] + nbox_low ; 
-      dbox_upp[ axis ][0] = dbox_low[ axis ][1];
-
-      box_partition( ip, ip + np_low, dbox_low , p_box );
-      box_partition( ip + np_low, up, dbox_upp , p_box );
-    }
-  }
-}
-
-size_t box_map_offset( const BoxType & local_use ,
-                       const size_t global_i ,
-                       const size_t global_j ,
-                       const size_t global_k )
-
-{
-  const size_t max = std::numeric_limits<size_t>::max();
-
-  const size_t n[3] =
-    { local_use[0][1] - local_use[0][0] ,
-      local_use[1][1] - local_use[1][0] ,
-      local_use[2][1] - local_use[2][0] };
-
-  const size_t use[3] = {
-    ( global_i >= local_use[0][0] ? global_i - local_use[0][0] : max ) ,
-    ( global_j >= local_use[1][0] ? global_j - local_use[1][0] : max ) ,
-    ( global_k >= local_use[2][0] ? global_k - local_use[2][0] : max ) };
-
-  const size_t offset =
-    ( use[0] < n[0] && use[1] < n[1] && use[2] < n[2] ) ?
-    ( use[0] + n[0] * ( use[1] + n[1] * use[2] ) ) : max ;
-
-  if ( offset == max ) {
-    std::ostringstream msg ;
-    msg << "box_map_offset ERROR: "
-        << " use " << local_use
-        << " ( " << global_i
-        << " , " << global_j
-        << " , " << global_k
-        << " )" ;
-    throw std::runtime_error( msg.str() );
-  }
-
-  return offset ;
-}
-
-} // namespace
-
-//----------------------------------------------------------------------------
-
-void BoxBoundsLinear::apply(  const BoxType & box_global ,
-                              const BoxType & box_part ,
-                                    BoxType & box_interior ,
-                                    BoxType & box_use ) const
-{
-  const unsigned ghost = 1 ;
-
-  if ( 0 == count( box_part ) ) {
-    box_interior = box_part ;
-    box_use      = box_part ;
-  }
-  else {
-    for ( size_t i = 0 ; i < 3 ; ++i ) {
-
-      box_interior[i][0] =
-        ( box_part[i][0] == box_global[i][0] )      ? box_part[i][0] : (
-        ( box_part[i][0] + ghost < box_part[i][1] ) ? box_part[i][0] + ghost : 
-                                                      box_part[i][1] );
-
-      box_interior[i][1] =
-        ( box_part[i][1] == box_global[i][1] )      ? box_part[i][1] : (
-        ( box_part[i][0] + ghost < box_part[i][1] ) ? box_part[i][1] - ghost :
-                                                      box_part[i][0] );
-
-      box_use[i][0] = 
-        ( box_part[i][0] > ghost + box_global[i][0] ) ? box_part[i][0] - ghost :
-                                                        box_global[i][0] ;
-      box_use[i][1] = 
-        ( box_part[i][1] + ghost < box_global[i][1] ) ? box_part[i][1] + ghost :
-                                                        box_global[i][1] ;
-    }
-  }
-}
-
-void BoxBoundsQuadratic::apply( const BoxType & box_global ,
-                                const BoxType & box_part ,
-                                      BoxType & box_interior ,
-                                      BoxType & box_use ) const
-{
-  if ( 0 == count( box_part ) ) {
-    box_interior = box_part ;
-    box_use      = box_part ;
-  }
-  else {
-    for ( size_t i = 0 ; i < 3 ; ++i ) {
-      const bool odd = ( box_part[i][0] - box_global[i][0] ) & 01 ;
-
-      const unsigned ghost = odd ? 1 : 2 ;
-
-      box_interior[i][0] =
-        ( box_part[i][0] == box_global[i][0] )      ? box_part[i][0] : (
-        ( box_part[i][0] + ghost < box_part[i][1] ) ? box_part[i][0] + ghost : 
-                                                      box_part[i][1] );
-
-      box_interior[i][1] =
-        ( box_part[i][1] == box_global[i][1] )      ? box_part[i][1] : (
-        ( box_part[i][0] + ghost < box_part[i][1] ) ? box_part[i][1] - ghost :
-                                                      box_part[i][0] );
-
-      box_use[i][0] = 
-        ( box_part[i][0] > ghost + box_global[i][0] ) ? box_part[i][0] - ghost :
-                                                        box_global[i][0] ;
-      box_use[i][1] = 
-        ( box_part[i][1] + ghost < box_global[i][1] ) ? box_part[i][1] + ghost :
-                                                        box_global[i][1] ;
-    }
-  }
-}
-
-//----------------------------------------------------------------------------
-
-void box_partition_rcb( const BoxType        & root_box ,
-                        std::vector<BoxType> & part_boxes )
-{
-  const BoxBoundsLinear use_boxes ;
-
-  const size_t part_count = part_boxes.size();
-
-  box_partition( 0 , part_count , root_box , & part_boxes[0] );
-
-  // Verify partitioning
-
-  size_t total_cell = 0 ;
-
-  for ( size_t i = 0 ; i < part_count ; ++i ) {
-
-    total_cell += count( part_boxes[i] );
-
-    BoxType box_interior , box_use ;
-
-    use_boxes.apply( root_box , part_boxes[i] , box_interior , box_use );
-
-    if ( count( box_use ) < count( part_boxes[i] ) ||
-         count( part_boxes[i] ) < count( box_interior ) ||
-         part_boxes[i] != intersect( part_boxes[i] , box_use ) ||
-         box_interior  != intersect( part_boxes[i] , box_interior )) {
-
-      std::ostringstream msg ;
-
-      msg << "box_partition_rcb ERROR : "
-          << "part_boxes[" << i << "] = "
-          << part_boxes[i]
-          << " use " << box_use
-          << " interior " << box_interior
-          << std::endl 
-          << "  part ^ use " << intersect( part_boxes[i] , box_use )
-          << "  part ^ interior " << intersect( part_boxes[i] , box_interior );
-
-      throw std::runtime_error( msg.str() );
-    }
-
-    for ( size_t j = i + 1 ; j < part_count ; ++j ) {
-      const BoxType tmp = intersect( part_boxes[i] , part_boxes[j] );
-
-      if ( count( tmp ) ) {
-        throw std::runtime_error( std::string("box partition intersection") );
-      }
-    }
-  }
-
-  if ( total_cell != count( root_box ) ) {
-    throw std::runtime_error( std::string("box partition count") );
-  }
-}
-
-//----------------------------------------------------------------------------
-         
-size_t box_map_id( const BoxType & local_use ,
-                   const std::vector<size_t> & local_use_id_map ,
-                   const size_t global_i ,
-                   const size_t global_j ,
-                   const size_t global_k )
-
-{
-  const size_t offset =
-    box_map_offset( local_use , global_i , global_j , global_k );
-  return local_use_id_map[ offset ];
-}
-         
-//----------------------------------------------------------------------------
-
-void box_partition_maps( const BoxType              & root_box ,
-                         const std::vector<BoxType> & part_boxes ,
-                         const BoxBounds            & use_boxes ,
-                         const size_t          my_part ,
-                         BoxType             & my_use_box ,
-                         std::vector<size_t> & my_use_id_map ,
-                         size_t              & my_count_interior ,
-                         size_t              & my_count_owned ,
-                         size_t              & my_count_uses ,
-                         std::vector<size_t> & my_part_counts ,
-                         std::vector<std::vector<size_t> > & my_send_map )
-{
-  const size_t np = part_boxes.size();
-
-  if ( np <= my_part ) {
-    std::ostringstream msg ;
-    msg << "box_partition_maps ERROR : "
-        << " np(" << np << ") <= my_part(" << my_part << ")" ;
-    throw std::runtime_error( msg.str() );
-  }
-
-  const BoxType my_owned_box = part_boxes[my_part];
-  BoxType my_interior_box ;
-
-
-  use_boxes.apply( root_box, my_owned_box, my_interior_box, my_use_box );
-
-  my_count_interior = count( my_interior_box );
-  my_count_owned    = count( my_owned_box );
-  my_count_uses     = count( my_use_box );
-
-  my_use_id_map.assign( my_count_uses , std::numeric_limits<size_t>::max() );
-
-  // Order ids as { owned-interior , owned-parallel , received_{(p+i)%np} }
-
-  size_t offset_interior = 0 ;
-  size_t offset_parallel = my_count_interior ;
-
-  for ( size_t iz = my_owned_box[2][0] ; iz < my_owned_box[2][1] ; ++iz ) {
-  for ( size_t iy = my_owned_box[1][0] ; iy < my_owned_box[1][1] ; ++iy ) {
-  for ( size_t ix = my_owned_box[0][0] ; ix < my_owned_box[0][1] ; ++ix ) {
-    const size_t offset = box_map_offset( my_use_box , ix , iy , iz );
-    if ( contain( my_interior_box , ix , iy , iz ) ) {
-      my_use_id_map[ offset ] = offset_interior++ ;
-    }
-    else {
-      my_use_id_map[ offset ] = offset_parallel++ ;
-    }
-  }}}
-
-
-  my_part_counts.assign( np , (size_t) 0 );
-  my_send_map.assign( np , std::vector<size_t>() );
-
-  my_part_counts[0] = my_count_owned ;
-
-  for ( size_t i = 1 ; i < np ; ++i ) {
-
-    const size_t ip = ( my_part + i ) % np ;
-
-    const BoxType p_owned_box = part_boxes[ip];
-    BoxType p_use_box , p_interior_box ;
-    use_boxes.apply( root_box, p_owned_box, p_interior_box, p_use_box );
-
-    const BoxType recv_box = intersect( my_use_box , p_owned_box );
-    const BoxType send_box = intersect( my_owned_box , p_use_box );
-
-    if ( 0 != ( my_part_counts[i] = count( recv_box ) ) ) {
-      for ( size_t iz = recv_box[2][0] ; iz < recv_box[2][1] ; ++iz ) {
-      for ( size_t iy = recv_box[1][0] ; iy < recv_box[1][1] ; ++iy ) {
-      for ( size_t ix = recv_box[0][0] ; ix < recv_box[0][1] ; ++ix ) {
-        const size_t offset = box_map_offset( my_use_box , ix , iy , iz );
-        my_use_id_map[ offset ] = offset_parallel++ ;
-      }}}
-    }
-
-    if ( 0 != count( send_box ) ) {
-      for ( size_t iz = send_box[2][0] ; iz < send_box[2][1] ; ++iz ) {
-      for ( size_t iy = send_box[1][0] ; iy < send_box[1][1] ; ++iy ) {
-      for ( size_t ix = send_box[0][0] ; ix < send_box[0][1] ; ++ix ) {
-        const size_t offset = box_map_offset( my_use_box , ix , iy , iz );
-
-        my_send_map[ i ].push_back( my_use_id_map[ offset ] );
-      }}}
-    }
-  }
-}
-
-
diff --git a/lib/kokkos/example/multi_fem/BoxMeshPartition.hpp b/lib/kokkos/example/multi_fem/BoxMeshPartition.hpp
deleted file mode 100644
index b8f43d2a22..0000000000
--- a/lib/kokkos/example/multi_fem/BoxMeshPartition.hpp
+++ /dev/null
@@ -1,210 +0,0 @@
-/*
-//@HEADER
-// ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
-// the U.S. Government retains certain rights in this software.
-// 
-// 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 Corporation nor the names of the
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "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 SANDIA CORPORATION OR THE
-// 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.
-//
-// Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
-// ************************************************************************
-//@HEADER
-*/
-
-#ifndef BOXMESHPARTITION_HPP
-#define BOXMESHPARTITION_HPP
-
-#include <cstddef>
-#include <utility>
-#include <vector>
-#include <iostream>
-
-//----------------------------------------------------------------------------
-
-struct BoxType {
-  size_t data[3][2] ;
-
-  typedef size_t range_type[2] ;
-
-  inline
-  const range_type & operator[]( size_t i ) const { return data[i]; }
-
-  inline
-  range_type & operator[]( size_t i ) { return data[i]; }
-
-  inline
-  bool operator == ( const BoxType & rhs ) const
-  {
-    return data[0][0] == rhs.data[0][0] && data[0][1] == rhs.data[0][1] &&
-           data[1][0] == rhs.data[1][0] && data[1][1] == rhs.data[2][1] &&
-           data[2][0] == rhs.data[2][0] && data[2][1] == rhs.data[2][1] ;
-  }
-
-  inline
-  bool operator != ( const BoxType & rhs ) const
-  {
-    return data[0][0] != rhs.data[0][0] || data[0][1] != rhs.data[0][1] ||
-           data[1][0] != rhs.data[1][0] || data[1][1] != rhs.data[1][1] ||
-           data[2][0] != rhs.data[2][0] || data[2][1] != rhs.data[2][1] ;
-  }
-};
-
-inline
-size_t count( const BoxType & b )
-{
-  size_t n = 1 ;
-  for ( size_t i = 0 ; i < 3 ; ++i ) {
-    n *= b[i][1] > b[i][0] ? b[i][1] - b[i][0] : 0 ;
-  }
-  return n ;
-}
-
-inline
-bool contain( const BoxType & b , size_t i , size_t j , size_t k )
-{
-  return b[0][0] <= i && i < b[0][1] &&
-         b[1][0] <= j && j < b[1][1] &&
-         b[2][0] <= k && k < b[2][1] ;
-}
-
-inline
-BoxType intersect( const BoxType & x , const BoxType & y )
-{
-  BoxType z ;
-  for ( size_t i = 0 ; i < 3 ; ++i ) {
-    z[i][0] = std::max( x[i][0] , y[i][0] );    
-    z[i][1] = std::min( x[i][1] , y[i][1] );    
-  }
-
-  return z ;
-}
-
-inline
-std::ostream & operator << ( std::ostream & s , const BoxType & box )
-{
-  s << "{ "
-    << box[0][0] << " " << box[0][1] << " , "
-    << box[1][0] << " " << box[1][1] << " , "
-    << box[2][0] << " " << box[2][1] << " }" ;
-  return s ;
-}
-
-//----------------------------------------------------------------------------
-
-class BoxBounds {
-public:
-  /** \brief  Default bounds to one layer of ghosting */
-  virtual
-  void apply( const BoxType & box_global ,
-              const BoxType & box_part ,
-                    BoxType & box_interior ,
-                    BoxType & box_use ) const = 0 ;
-
-  virtual ~BoxBounds() {}
-  BoxBounds() {}
-};
-
-class BoxBoundsLinear : public BoxBounds
-{
-public:
-  /** \brief  Default bounds to one layer of ghosting */
-  virtual
-  void apply( const BoxType & box_global ,
-              const BoxType & box_part ,
-                    BoxType & box_interior ,
-                    BoxType & box_use ) const ;
-
-  virtual ~BoxBoundsLinear() {}
-  BoxBoundsLinear() {}
-};
-
-class BoxBoundsQuadratic : public BoxBounds {
-public:
-  /** \brief  Quadratic mesh: even ordinates have two layers,
-   *          odd ordinates have one layer.
-   */
-  virtual
-  void apply( const BoxType & box_global ,
-              const BoxType & box_part ,
-                    BoxType & box_interior ,
-                    BoxType & box_use ) const ;
-
-  virtual ~BoxBoundsQuadratic() {}
-  BoxBoundsQuadratic() {}
-};
-
-//----------------------------------------------------------------------------
-/* Partition box into part_boxes.size() sub-boxes */
-
-void box_partition_rcb( const BoxType        & root_box ,
-                        std::vector<BoxType> & part_boxes );
-
-//----------------------------------------------------------------------------
-/* Determine local id layout and communication maps for partitioned boxes.
- *
- *  Local ids are layed out as follows:
- *    { [ owned-interior ids not sent ] ,
- *      [ owned-boundary ids to be sent to other processes ] ,
- *      [ received ids from processor ( my_part + 1 ) % part_count ]
- *      [ received ids from processor ( my_part + 2 ) % part_count ]
- *      [ received ids from processor ( my_part + 3 ) % part_count ]
- *      ... };
- *
- *  This layout allows
- *  (1) received data to be copied into a contiguous block of memory
- *  (2) send data to be extracted from a contiguous block of memory.
- */
-void box_partition_maps(
-  const BoxType              & root_box ,   // [in] Global box
-  const std::vector<BoxType> & part_boxes , // [in] Partitioned boxes
-  const BoxBounds            & use_boxes ,  // [in] Ghost boundaries
-  const size_t          my_part ,           // [in] My local part
-  BoxType             & my_use_box ,        // [out] My used box with ghost
-  std::vector<size_t> & my_use_id_map ,     // [out] Local ordering map
-  size_t              & my_count_interior , // [out] How many interior
-  size_t              & my_count_owned ,    // [out] How many owned
-  size_t              & my_count_uses ,     // [out] How may used
-  std::vector<size_t> & my_part_counts ,    // [out] Partitioning of my_use_id_map
-  std::vector<std::vector<size_t> > & my_send_map ); // [out] Send id map
-
-/*  Mapping of cartesian coordinate to local id */
-size_t box_map_id( const BoxType             & my_use_box ,
-                   const std::vector<size_t> & my_use_id_map ,
-                   const size_t global_i ,
-                   const size_t global_j ,
-                   const size_t global_k );
-
-//----------------------------------------------------------------------------
-
-#endif /* #ifndef BOXMESHPARTITION_HPP */
-
diff --git a/lib/kokkos/example/multi_fem/CMakeLists.txt b/lib/kokkos/example/multi_fem/CMakeLists.txt
deleted file mode 100644
index e3a40bc26f..0000000000
--- a/lib/kokkos/example/multi_fem/CMakeLists.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-
-INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR})
-INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR})
-
-SET(SOURCES "")
-
-FILE(GLOB SOURCES *.cpp)
-
-SET(LIBRARIES kokkoscore)
-
-TRIBITS_ADD_EXECUTABLE(
-  multi_fem
-  SOURCES ${SOURCES}
-  COMM serial mpi
-  )
-
diff --git a/lib/kokkos/example/multi_fem/Explicit.hpp b/lib/kokkos/example/multi_fem/Explicit.hpp
deleted file mode 100644
index d3a7f159c0..0000000000
--- a/lib/kokkos/example/multi_fem/Explicit.hpp
+++ /dev/null
@@ -1,452 +0,0 @@
-/*
-//@HEADER
-// ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
-// the U.S. Government retains certain rights in this software.
-// 
-// 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 Corporation nor the names of the
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "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 SANDIA CORPORATION OR THE
-// 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.
-//
-// Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
-// ************************************************************************
-//@HEADER
-*/
-
-#ifndef EXPLICIT_DRIVER_HPP
-#define EXPLICIT_DRIVER_HPP
-
-#include <sys/time.h>
-#include <iostream>
-#include <iomanip>
-#include <cstdlib>
-#include <cmath>
-
-#include <impl/Kokkos_Timer.hpp>
-
-#include <ExplicitFunctors.hpp>
-
-//----------------------------------------------------------------------------
-
-namespace Explicit {
-
-struct PerformanceData {
-  double mesh_time ;
-  double init_time ;
-  double internal_force_time ;
-  double central_diff ;
-  double comm_time ;
-  size_t number_of_steps ;
-
-  PerformanceData()
-  : mesh_time(0)
-  , init_time(0)
-  , internal_force_time(0)
-  , central_diff(0)
-  , comm_time(0)
-  , number_of_steps(0)
-  {}
-
-  void best( const PerformanceData & rhs )
-  {
-    if ( rhs.mesh_time < mesh_time ) mesh_time = rhs.mesh_time ;
-    if ( rhs.init_time < init_time ) init_time = rhs.init_time ;
-    if ( rhs.internal_force_time < internal_force_time ) internal_force_time = rhs.internal_force_time ;
-    if ( rhs.central_diff < central_diff ) central_diff = rhs.central_diff ;
-    if ( rhs.comm_time < comm_time ) comm_time = rhs.comm_time ;
-  }
-};
-
-template< typename Scalar , class FixtureType >
-PerformanceData run( const typename FixtureType::FEMeshType & mesh ,
-                     const int global_max_x ,
-                     const int global_max_y ,
-                     const int global_max_z ,
-                     const int steps ,
-                     const int print_sample )
-{
-  typedef Scalar                              scalar_type ;
-  typedef FixtureType                         fixture_type ;
-  typedef typename fixture_type::execution_space  execution_space ;
-  //typedef typename fixture_type::FEMeshType   mesh_type ; // unused
-
-  enum { ElementNodeCount = fixture_type::element_node_count };
-
-  const int NumStates = 2;
-
-  const int total_num_steps = steps ;
-
-  const Scalar user_dt = 5.0e-6;
-  //const Scalar  end_time = 0.0050;
-
-  // element block parameters
-  const Scalar  lin_bulk_visc = 0.0;
-  const Scalar  quad_bulk_visc = 0.0;
-
-  // const Scalar  lin_bulk_visc = 0.06;
-  // const Scalar  quad_bulk_visc = 1.2;
-  // const Scalar  hg_stiffness = 0.0;
-  // const Scalar  hg_viscosity = 0.0;
-  // const Scalar  hg_stiffness = 0.03;
-  // const Scalar  hg_viscosity = 0.001;
-
-  // material properties
-  const Scalar youngs_modulus=1.0e6;
-  const Scalar poissons_ratio=0.0;
-  const Scalar  density = 8.0e-4;
-
-  const comm::Machine machine = mesh.parallel_data_map.machine ;
-
-  PerformanceData perf_data ;
-
-  Kokkos::Timer wall_clock ;
-
-  //------------------------------------
-  // Generate fields
-
-  typedef Fields< scalar_type , execution_space > fields_type ;
-
-  fields_type mesh_fields( mesh ,
-                           lin_bulk_visc ,
-                           quad_bulk_visc ,
-                           youngs_modulus ,
-                           poissons_ratio ,
-                           density );
-
-  typename fields_type::node_coords_type::HostMirror
-    model_coords_h = Kokkos::create_mirror( mesh_fields.model_coords );
-
-  typename fields_type::geom_state_array_type::HostMirror
-    displacement_h = Kokkos::create_mirror( mesh_fields.displacement );
-
-  typename fields_type::geom_state_array_type::HostMirror
-    velocity_h = Kokkos::create_mirror( mesh_fields.velocity );
-
-  Kokkos::deep_copy( model_coords_h , mesh_fields.model_coords );
-
-  //------------------------------------
-  // Initialization
-
-  initialize_element<Scalar,execution_space>::apply( mesh_fields );
-  initialize_node<   Scalar,execution_space>::apply( mesh_fields );
-
-  const Scalar x_bc = global_max_x ;
-
-  // Initial condition on velocity to initiate a pulse along the X axis
-  {
-    const unsigned X = 0;
-    for (int inode = 0; inode< mesh_fields.num_nodes; ++inode) {
-      if ( model_coords_h(inode,X) == 0) {
-        velocity_h(inode,X,0) = 1.0e3;
-        velocity_h(inode,X,1) = 1.0e3;
-      }
-    }
-  }
-
-  Kokkos::deep_copy( mesh_fields.velocity , velocity_h );
-
-  //--------------------------------------------------------------------------
-  // We will call a sequence of functions.  These functions have been
-  // grouped into several functors to balance the number of global memory
-  // accesses versus requiring too many registers or too much L1 cache.
-  // Global memory accees have read/write cost and memory subsystem contention cost.
-  //--------------------------------------------------------------------------
-
-  perf_data.init_time = comm::max( machine , wall_clock.seconds() );
-
-  // Parameters required for the internal force computations.
-
-  int current_state = 0;
-  int previous_state = 0;
-  int next_state = 0;
-
-  perf_data.number_of_steps = total_num_steps ;
-
-#if defined( KOKKOS_ENABLE_MPI )
-
-  typedef typename
-    fields_type::geom_state_array_type::value_type  comm_value_type ;
-
-  const unsigned comm_value_count = 6 ;
-
-  Kokkos::AsyncExchange< comm_value_type , execution_space ,
-                              Kokkos::ParallelDataMap >
-    comm_exchange( mesh.parallel_data_map , comm_value_count );
-
-#endif
-
-  for (int step = 0; step < total_num_steps; ++step) {
-
-    wall_clock.reset();
-
-    //------------------------------------------------------------------------
-#if defined( KOKKOS_ENABLE_MPI )
-    {
-      // Communicate "send" nodes' displacement and velocity next_state
-      // to the ghosted nodes.
-      // buffer packages: { { dx , dy , dz , vx , vy , vz }_node }
-
-      pack_state< Scalar , execution_space >
-        ::apply( comm_exchange.buffer() ,
-                 mesh.parallel_data_map.count_interior ,
-                 mesh.parallel_data_map.count_send ,
-                 mesh_fields , next_state );
-
-      comm_exchange.setup();
-
-      comm_exchange.send_receive();
-
-      unpack_state< Scalar , execution_space >
-        ::apply( mesh_fields , next_state ,
-                 comm_exchange.buffer() ,
-                 mesh.parallel_data_map.count_owned ,
-                 mesh.parallel_data_map.count_receive );
-
-      execution_space().fence();
-    }
-#endif
-
-    perf_data.comm_time += comm::max( machine , wall_clock.seconds() );
-
-    //------------------------------------------------------------------------
-    // rotate the states
-
-    previous_state = current_state;
-    current_state = next_state;
-    ++next_state;
-    next_state %= NumStates;
-
-    wall_clock.reset();
-
-    // First kernel 'grad_hgop' combines two functions:
-    // gradient, velocity gradient
-    grad< Scalar , execution_space >::apply( mesh_fields ,
-                                         current_state ,
-                                         previous_state );
-
-    // Combine tensor decomposition and rotation functions.
-    decomp_rotate< Scalar , execution_space >::apply( mesh_fields ,
-                                                  current_state ,
-                                                  previous_state );
-
-    internal_force< Scalar , execution_space >::apply( mesh_fields ,
-                                                   user_dt ,
-                                                   current_state );
-
-    execution_space().fence();
-
-    perf_data.internal_force_time +=
-      comm::max( machine , wall_clock.seconds() );
-
-    wall_clock.reset();
-
-    // Assembly of elements' contributions to nodal force into
-    // a nodal force vector.  Update the accelerations, velocities,
-    // displacements.
-    // The same pattern can be used for matrix-free residual computations.
-    nodal_step< Scalar , execution_space >::apply( mesh_fields ,
-                                               x_bc ,
-                                               current_state,
-                                               next_state );
-    execution_space().fence();
-
-    perf_data.central_diff +=
-      comm::max( machine , wall_clock.seconds() );
-
-    if ( print_sample && 0 == step % 100 ) {
-      Kokkos::deep_copy( displacement_h , mesh_fields.displacement );
-      Kokkos::deep_copy( velocity_h ,     mesh_fields.velocity );
-
-      if ( 1 == print_sample ) {
-
-        std::cout << "step " << step
-                  << " : displacement(*,0,0) =" ;
-        for ( int i = 0 ; i < mesh_fields.num_nodes_owned ; ++i ) {
-          if ( model_coords_h(i,1) == 0 && model_coords_h(i,2) == 0 ) {
-            std::cout << " " << displacement_h(i,0,next_state);
-          }
-        }
-        std::cout << std::endl ;
-
-        const float tol = 1.0e-6 ;
-        const int yb = global_max_y ;
-        const int zb = global_max_z ;
-        std::cout << "step " << step
-                  << " : displacement(*," << yb << "," << zb << ") =" ;
-        for ( int i = 0 ; i < mesh_fields.num_nodes_owned ; ++i ) {
-          if ( fabs( model_coords_h(i,1) - yb ) < tol &&
-               fabs( model_coords_h(i,2) - zb ) < tol ) {
-            std::cout << " " << displacement_h(i,0,next_state);
-          }
-        }
-        std::cout << std::endl ;
-      }
-      else if ( 2 == print_sample ) {
-
-        const float tol = 1.0e-6 ;
-        const int xb = global_max_x / 2 ;
-        const int yb = global_max_y / 2 ;
-        const int zb = global_max_z / 2 ;
-
-        for ( int i = 0 ; i < mesh_fields.num_nodes_owned ; ++i ) {
-          if ( fabs( model_coords_h(i,0) - xb ) < tol &&
-               fabs( model_coords_h(i,1) - yb ) < tol &&
-               fabs( model_coords_h(i,2) - zb ) < tol ) {
-            std::cout << "step " << step
-                      << " : displacement("
-                      << xb << "," << yb << "," << zb << ") = {"
-                      << std::setprecision(6)
-                      << " " << displacement_h(i,0,next_state)
-                      << std::setprecision(2)
-                      << " " << displacement_h(i,1,next_state)
-                      << std::setprecision(2)
-                      << " " << displacement_h(i,2,next_state)
-                      << " }" << std::endl ;
-          }
-        }
-      }
-    }
-  }
-
-  return perf_data ;
-}
-
-
-template <typename Scalar, typename Device>
-static void driver( const char * const label ,
-                    comm::Machine machine ,
-                    const int gang_count ,
-                    const int elem_count_beg ,
-                    const int elem_count_end ,
-                    const int runs )
-{
-  typedef Scalar              scalar_type ;
-  typedef Device              execution_space ;
-  typedef double              coordinate_scalar_type ;
-  typedef FixtureElementHex8  fixture_element_type ;
-
-  typedef BoxMeshFixture< coordinate_scalar_type ,
-                          execution_space ,
-                          fixture_element_type > fixture_type ;
-
-  typedef typename fixture_type::FEMeshType mesh_type ;
-
-  const size_t proc_count = comm::size( machine );
-  const size_t proc_rank  = comm::rank( machine );
-
-  const int space = 15 ;
-  const int steps = 1000 ;
-  const int print_sample = 0 ;
-
-  if ( comm::rank( machine ) == 0 ) {
-
-    std::cout << std::endl ;
-    std::cout << "\"MiniExplicitDynamics with Kokkos " << label
-              << " time_steps(" << steps << ")"
-              << "\"" << std::endl;
-    std::cout << std::left << std::setw(space) << "\"Element\" , ";
-    std::cout << std::left << std::setw(space) << "\"Node\" , ";
-    std::cout << std::left << std::setw(space) << "\"Initialize\" , ";
-    std::cout << std::left << std::setw(space) << "\"ElemForce\" , ";
-    std::cout << std::left << std::setw(space) << "\"NodeUpdate\" , ";
-    std::cout << std::left << std::setw(space) << "\"NodeComm\" , ";
-    std::cout << std::left << std::setw(space) << "\"Time/Elem\" , ";
-    std::cout << std::left << std::setw(space) << "\"Time/Node\"";
-
-    std::cout << std::endl;
-
-    std::cout << std::left << std::setw(space) << "\"count\" , ";
-    std::cout << std::left << std::setw(space) << "\"count\" , ";
-    std::cout << std::left << std::setw(space) << "\"microsec\" , ";
-    std::cout << std::left << std::setw(space) << "\"microsec\" , ";
-    std::cout << std::left << std::setw(space) << "\"microsec\" , ";
-    std::cout << std::left << std::setw(space) << "\"microsec\" , ";
-    std::cout << std::left << std::setw(space) << "\"microsec\" , ";
-    std::cout << std::left << std::setw(space) << "\"microsec\"";
-
-    std::cout << std::endl;
-  }
-
-  for(int i = elem_count_beg ; i < elem_count_end ; i *= 2 )
-  {
-    const int iz = std::max( 1 , (int) cbrt( ((double) i) / 2.0 ) );
-    const int iy = iz + 1 ;
-    const int ix = 2 * iy ;
-    const int nelem = ix * iy * iz ;
-    const int nnode = ( ix + 1 ) * ( iy + 1 ) * ( iz + 1 );
-
-    mesh_type mesh =
-      fixture_type::create( proc_count , proc_rank , gang_count ,
-                            ix , iy , iz );
-
-    mesh.parallel_data_map.machine = machine ;
-
-    PerformanceData perf , best ;
-
-    for(int j = 0; j < runs; j++){
-
-     perf = run<scalar_type,fixture_type>(mesh,ix,iy,iz,steps,print_sample);
-
-     if( j == 0 ) {
-       best = perf ;
-     }
-     else {
-       best.best( perf );
-     }
-   }
-
-   if ( comm::rank( machine ) == 0 ) {
-     double time_per_element =
-       ( best.internal_force_time ) / ( nelem * perf.number_of_steps );
-     double time_per_node =
-       ( best.comm_time + best.central_diff ) / ( nnode * perf.number_of_steps );
-
-   std::cout << std::setw(space-3) << nelem << " , "
-             << std::setw(space-3) << nnode << " , "
-             << std::setw(space-3) << best.number_of_steps << " , "
-             << std::setw(space-3) << best.init_time * 1000000 << " , "
-             << std::setw(space-3)
-             << ( best.internal_force_time * 1000000 ) / best.number_of_steps << " , "
-             << std::setw(space-3)
-             << ( best.central_diff * 1000000 ) / best.number_of_steps << " , "
-             << std::setw(space-3)
-             << ( best.comm_time * 1000000 ) / best.number_of_steps << " , "
-             << std::setw(space-3) << time_per_element * 1000000 << " , "
-             << std::setw(space-3) << time_per_node * 1000000
-             << std::endl ;
-    }
-  }
-}
-
-
-} // namespace Explicit
-
-#endif /* #ifndef EXPLICIT_DRIVER_HPP */
diff --git a/lib/kokkos/example/multi_fem/ExplicitFunctors.hpp b/lib/kokkos/example/multi_fem/ExplicitFunctors.hpp
deleted file mode 100644
index 764dca38dc..0000000000
--- a/lib/kokkos/example/multi_fem/ExplicitFunctors.hpp
+++ /dev/null
@@ -1,1471 +0,0 @@
-/*
-//@HEADER
-// ************************************************************************
-//
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
-// the U.S. Government retains certain rights in this software.
-//
-// 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 Corporation nor the names of the
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "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 SANDIA CORPORATION OR THE
-// 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.
-//
-// Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-//
-// ************************************************************************
-//@HEADER
-*/
-
-#ifndef KOKKOS_EXPLICITFUNCTORS_HPP
-#define KOKKOS_EXPLICITFUNCTORS_HPP
-
-#include <cmath>
-#include <Kokkos_Core.hpp>
-#include <FEMesh.hpp>
-
-namespace Explicit {
-
-template<typename Scalar , class Device >
-struct Fields {
-
-  static const int NumStates     = 2 ;
-  static const int SpatialDim    = 3 ;
-  static const int ElemNodeCount = 8 ;
-
-  // Indices for full 3x3 tensor:
-
-  static const int K_F_XX = 0 ;
-  static const int K_F_YY = 1 ;
-  static const int K_F_ZZ = 2 ;
-  static const int K_F_XY = 3 ;
-  static const int K_F_YZ = 4 ;
-  static const int K_F_ZX = 5 ;
-  static const int K_F_YX = 6 ;
-  static const int K_F_ZY = 7 ;
-  static const int K_F_XZ = 8 ;
-
-  //  Indexes into a 3 by 3 symmetric tensor stored as a length 6 vector
-
-  static const int K_S_XX = 0 ;
-  static const int K_S_YY = 1 ;
-  static const int K_S_ZZ = 2 ;
-  static const int K_S_XY = 3 ;
-  static const int K_S_YZ = 4 ;
-  static const int K_S_ZX = 5 ;
-  static const int K_S_YX = 3 ;
-  static const int K_S_ZY = 4 ;
-  static const int K_S_XZ = 5 ;
-
-  //  Indexes into a 3 by 3 skew symmetric tensor stored as a length 3 vector
-
-  static const int K_V_XY = 0 ;
-  static const int K_V_YZ = 1 ;
-  static const int K_V_ZX = 2 ;
-
-
-  typedef Device                           execution_space ;
-  typedef typename execution_space::size_type  size_type ;
-
-  typedef HybridFEM::FEMesh<double,ElemNodeCount,execution_space>  FEMesh ;
-
-  typedef typename FEMesh::node_coords_type    node_coords_type ;
-  typedef typename FEMesh::elem_node_ids_type  elem_node_ids_type ;
-  typedef typename FEMesh::node_elem_ids_type  node_elem_ids_type ;
-  typedef typename Kokkos::ParallelDataMap   parallel_data_map ;
-
-  typedef Kokkos::View< double[][ SpatialDim ][ NumStates ] , execution_space > geom_state_array_type ;
-  typedef Kokkos::View< Scalar[][ SpatialDim ] , execution_space > geom_array_type ;
-  typedef Kokkos::View< Scalar[] ,               execution_space > array_type ;
-  typedef Kokkos::View< Scalar ,                 execution_space >  scalar_type ;
-
-  typedef Kokkos::View< Scalar[][  6 ] ,    execution_space >  elem_sym_tensor_type ;
-  typedef Kokkos::View< Scalar[][  9 ] ,    execution_space >  elem_tensor_type ;
-  typedef Kokkos::View< Scalar[][  9 ][ NumStates ] , execution_space >  elem_tensor_state_type ;
-  typedef Kokkos::View< Scalar[][ SpatialDim ][ ElemNodeCount ] , execution_space > elem_node_geom_type ;
-
-  // Parameters:
-  const int num_nodes ;
-  const int num_nodes_owned ;
-  const int num_elements ;
-
-  const Scalar  lin_bulk_visc;
-  const Scalar  quad_bulk_visc;
-  const Scalar  two_mu;
-  const Scalar  bulk_modulus;
-  const Scalar  density;
-
-  // Mesh:
-  const elem_node_ids_type  elem_node_connectivity ;
-  const node_elem_ids_type  node_elem_connectivity ;
-  const node_coords_type    model_coords ;
-
-  // Compute:
-  const scalar_type                dt ;
-  const scalar_type                prev_dt ;
-  const geom_state_array_type      displacement ;
-  const geom_state_array_type      velocity ;
-  const geom_array_type            acceleration ;
-  const geom_array_type            internal_force ;
-  const array_type                 nodal_mass ;
-  const array_type                 elem_mass ;
-  const array_type                 internal_energy ;
-  const elem_sym_tensor_type       stress_new ;
-  const elem_tensor_state_type     rotation ;
-  const elem_node_geom_type        element_force ;
-  const elem_tensor_type           vel_grad ;
-  const elem_sym_tensor_type       stretch ;
-  const elem_sym_tensor_type       rot_stretch ;
-
-  Fields(
-      const FEMesh & mesh,
-      Scalar arg_lin_bulk_visc,
-      Scalar arg_quad_bulk_visc,
-      Scalar youngs_modulus,
-      Scalar poissons_ratio,
-      Scalar arg_density )
-    : num_nodes(       mesh.parallel_data_map.count_owned +
-                       mesh.parallel_data_map.count_receive )
-    , num_nodes_owned( mesh.parallel_data_map.count_owned )
-    , num_elements(    mesh.elem_node_ids.dimension_0() )
-    , lin_bulk_visc(  arg_lin_bulk_visc )
-    , quad_bulk_visc( arg_quad_bulk_visc )
-    , two_mu(youngs_modulus/(1.0+poissons_ratio))
-    , bulk_modulus(youngs_modulus/(3*(1.0-2.0*poissons_ratio)))
-    , density(arg_density)
-
-    // mesh
-
-    , elem_node_connectivity( mesh.elem_node_ids ) // ( num_elements , ElemNodeCount )
-    , node_elem_connectivity( mesh.node_elem_ids ) // ( num_nodes , ... )
-    , model_coords(  mesh.node_coords )            // ( num_nodes , 3 )
-
-    // compute with input/output
-
-    , dt(              "dt" )
-    , prev_dt(         "prev_dt" )
-    , displacement(    "displacement" ,   num_nodes )
-    , velocity(        "velocity" ,       num_nodes )
-    , acceleration(    "acceleration" ,   num_nodes_owned )
-    , internal_force(  "internal_force" , num_nodes_owned )
-    , nodal_mass(      "nodal_mass" ,     num_nodes_owned )
-    , elem_mass(       "elem_mass" ,       num_elements )
-    , internal_energy( "internal_energy" , num_elements )
-    , stress_new(      "stress_new" ,      num_elements )
-
-    // temporary arrays
-
-    , rotation(      "rotation" ,  num_elements )
-    , element_force( "element_force" ,  num_elements )
-    , vel_grad(      "vel_grad" , num_elements )
-    , stretch(       "stretch" , num_elements )
-    , rot_stretch(   "rot_stretch" , num_elements )
-  { }
-};
-
-
-//----------------------------------------------------------------------------
-
-template< typename Scalar , class DeviceType >
-KOKKOS_INLINE_FUNCTION
-Scalar dot8( const Scalar * a , const Scalar * b )
-{ return a[0] * b[0] + a[1] * b[1] + a[2] * b[2] + a[3] * b[3] +
-         a[4] * b[4] + a[5] * b[5] + a[6] * b[6] + a[7] * b[7] ; }
-
-template< typename Scalar , class DeviceType >
-KOKKOS_INLINE_FUNCTION
-void comp_grad( const Scalar * const x ,
-                const Scalar * const y ,
-                const Scalar * const z,
-                Scalar * const grad_x ,
-                Scalar * const grad_y ,
-                Scalar * const grad_z )
-{
-  //  calc X difference vectors
-
-  Scalar R42=(x[3] - x[1]);
-  Scalar R52=(x[4] - x[1]);
-  Scalar R54=(x[4] - x[3]);
-
-  Scalar R63=(x[5] - x[2]);
-  Scalar R83=(x[7] - x[2]);
-  Scalar R86=(x[7] - x[5]);
-
-  Scalar R31=(x[2] - x[0]);
-  Scalar R61=(x[5] - x[0]);
-  Scalar R74=(x[6] - x[3]);
-
-  Scalar R72=(x[6] - x[1]);
-  Scalar R75=(x[6] - x[4]);
-  Scalar R81=(x[7] - x[0]);
-
-  Scalar t1=(R63 + R54);
-  Scalar t2=(R61 + R74);
-  Scalar t3=(R72 + R81);
-
-  Scalar t4 =(R86 + R42);
-  Scalar t5 =(R83 + R52);
-  Scalar t6 =(R75 + R31);
-
-  //  Calculate Y gradient from X and Z data
-
-  grad_y[0] = (z[1] *  t1) - (z[2] * R42) - (z[3] *  t5)  + (z[4] *  t4) + (z[5] * R52) - (z[7] * R54);
-  grad_y[1] = (z[2] *  t2) + (z[3] * R31) - (z[0] *  t1)  - (z[5] *  t6) + (z[6] * R63) - (z[4] * R61);
-  grad_y[2] = (z[3] *  t3) + (z[0] * R42) - (z[1] *  t2)  - (z[6] *  t4) + (z[7] * R74) - (z[5] * R72);
-  grad_y[3] = (z[0] *  t5) - (z[1] * R31) - (z[2] *  t3)  + (z[7] *  t6) + (z[4] * R81) - (z[6] * R83);
-  grad_y[4] = (z[5] *  t3) + (z[6] * R86) - (z[7] *  t2)  - (z[0] *  t4) - (z[3] * R81) + (z[1] * R61);
-  grad_y[5] = (z[6] *  t5) - (z[4] *  t3)  - (z[7] * R75) + (z[1] *  t6) - (z[0] * R52) + (z[2] * R72);
-  grad_y[6] = (z[7] *  t1) - (z[5] *  t5)  - (z[4] * R86) + (z[2] *  t4) - (z[1] * R63) + (z[3] * R83);
-  grad_y[7] = (z[4] *  t2) - (z[6] *  t1)  + (z[5] * R75) - (z[3] *  t6) - (z[2] * R74) + (z[0] * R54);
-
-  //   calc Z difference vectors
-
-  R42=(z[3] - z[1]);
-  R52=(z[4] - z[1]);
-  R54=(z[4] - z[3]);
-
-  R63=(z[5] - z[2]);
-  R83=(z[7] - z[2]);
-  R86=(z[7] - z[5]);
-
-  R31=(z[2] - z[0]);
-  R61=(z[5] - z[0]);
-  R74=(z[6] - z[3]);
-
-  R72=(z[6] - z[1]);
-  R75=(z[6] - z[4]);
-  R81=(z[7] - z[0]);
-
-  t1=(R63 + R54);
-  t2=(R61 + R74);
-  t3=(R72 + R81);
-
-  t4 =(R86 + R42);
-  t5 =(R83 + R52);
-  t6 =(R75 + R31);
-
-  //  Calculate X gradient from Y and Z data
-
-  grad_x[0] = (y[1] *  t1) - (y[2] * R42) - (y[3] *  t5) + (y[4] *  t4) + (y[5] * R52) - (y[7] * R54);
-  grad_x[1] = (y[2] *  t2) + (y[3] * R31) - (y[0] *  t1) - (y[5] *  t6) + (y[6] * R63) - (y[4] * R61);
-  grad_x[2] = (y[3] *  t3) + (y[0] * R42) - (y[1] *  t2) - (y[6] *  t4) + (y[7] * R74) - (y[5] * R72);
-  grad_x[3] = (y[0] *  t5) - (y[1] * R31) - (y[2] *  t3) + (y[7] *  t6) + (y[4] * R81) - (y[6] * R83);
-  grad_x[4] = (y[5] *  t3) + (y[6] * R86) - (y[7] *  t2) - (y[0] *  t4) - (y[3] * R81) + (y[1] * R61);
-  grad_x[5] = (y[6] *  t5) - (y[4] *  t3) - (y[7] * R75) + (y[1] *  t6) - (y[0] * R52) + (y[2] * R72);
-  grad_x[6] = (y[7] *  t1) - (y[5] *  t5) - (y[4] * R86) + (y[2] *  t4) - (y[1] * R63) + (y[3] * R83);
-  grad_x[7] = (y[4] *  t2) - (y[6] *  t1) + (y[5] * R75) - (y[3] *  t6) - (y[2] * R74) + (y[0] * R54);
-
-  //  calc Y difference vectors
-
-  R42=(y[3] - y[1]);
-  R52=(y[4] - y[1]);
-  R54=(y[4] - y[3]);
-
-  R63=(y[5] - y[2]);
-  R83=(y[7] - y[2]);
-  R86=(y[7] - y[5]);
-
-  R31=(y[2] - y[0]);
-  R61=(y[5] - y[0]);
-  R74=(y[6] - y[3]);
-
-  R72=(y[6] - y[1]);
-  R75=(y[6] - y[4]);
-  R81=(y[7] - y[0]);
-
-  t1=(R63 + R54);
-  t2=(R61 + R74);
-  t3=(R72 + R81);
-
-  t4 =(R86 + R42);
-  t5 =(R83 + R52);
-  t6 =(R75 + R31);
-
-  //  Calculate Z gradient from X and Y data
-
-  grad_z[0] = (x[1] *  t1) - (x[2] * R42) - (x[3] *  t5)  + (x[4] *  t4) + (x[5] * R52) - (x[7] * R54);
-  grad_z[1] = (x[2] *  t2) + (x[3] * R31) - (x[0] *  t1)  - (x[5] *  t6) + (x[6] * R63) - (x[4] * R61);
-  grad_z[2] = (x[3] *  t3) + (x[0] * R42) - (x[1] *  t2)  - (x[6] *  t4) + (x[7] * R74) - (x[5] * R72);
-  grad_z[3] = (x[0] *  t5) - (x[1] * R31) - (x[2] *  t3)  + (x[7] *  t6) + (x[4] * R81) - (x[6] * R83);
-  grad_z[4] = (x[5] *  t3) + (x[6] * R86) - (x[7] *  t2)  - (x[0] *  t4) - (x[3] * R81) + (x[1] * R61);
-  grad_z[5] = (x[6] *  t5) - (x[4] *  t3)  - (x[7] * R75) + (x[1] *  t6) - (x[0] * R52) + (x[2] * R72);
-  grad_z[6] = (x[7] *  t1) - (x[5] *  t5)  - (x[4] * R86) + (x[2] *  t4) - (x[1] * R63) + (x[3] * R83);
-  grad_z[7] = (x[4] *  t2) - (x[6] *  t1)  + (x[5] * R75) - (x[3] *  t6) - (x[2] * R74) + (x[0] * R54);
-}
-
-//----------------------------------------------------------------------------
-
-template< typename Scalar , class DeviceType >
-struct initialize_element
-{
-  typedef DeviceType     execution_space ;
-
-  typedef Explicit::Fields< Scalar , execution_space > Fields ;
-
-  typename Fields::elem_node_ids_type      elem_node_connectivity ;
-  typename Fields::node_coords_type        model_coords ;
-  typename Fields::elem_sym_tensor_type    stretch ;
-  typename Fields::elem_tensor_state_type  rotation ;
-  typename Fields::array_type              elem_mass ;
-
-  const Scalar density ;
-
-  initialize_element( const Fields & mesh_fields )
-    : elem_node_connectivity( mesh_fields.elem_node_connectivity )
-    , model_coords(           mesh_fields.model_coords )
-    , stretch(                mesh_fields.stretch )
-    , rotation(               mesh_fields.rotation )
-    , elem_mass(              mesh_fields.elem_mass )
-    , density(                mesh_fields.density )
-    {}
-
-  KOKKOS_INLINE_FUNCTION
-  void operator()( int ielem )const
-  {
-    const int K_XX = 0 ;
-    const int K_YY = 1 ;
-    const int K_ZZ = 2 ;
-    const Scalar ONE12TH = 1.0 / 12.0 ;
-
-    Scalar x[ Fields::ElemNodeCount ];
-    Scalar y[ Fields::ElemNodeCount ];
-    Scalar z[ Fields::ElemNodeCount ];
-    Scalar grad_x[ Fields::ElemNodeCount ];
-    Scalar grad_y[ Fields::ElemNodeCount ];
-    Scalar grad_z[ Fields::ElemNodeCount ];
-
-    for ( int i = 0 ; i < Fields::ElemNodeCount ; ++i ) {
-      const int n = elem_node_connectivity( ielem , i );
-
-      x[i]  = model_coords( n , 0 );
-      y[i]  = model_coords( n , 1 );
-      z[i]  = model_coords( n , 2 );
-    }
-
-    comp_grad<Scalar,execution_space>( x, y, z, grad_x, grad_y, grad_z);
-
-    stretch(ielem,K_XX) = 1 ;
-    stretch(ielem,K_YY) = 1 ;
-    stretch(ielem,K_ZZ) = 1 ;
-
-    rotation(ielem,K_XX,0) = 1 ;
-    rotation(ielem,K_YY,0) = 1 ;
-    rotation(ielem,K_ZZ,0) = 1 ;
-
-    rotation(ielem,K_XX,1) = 1 ;
-    rotation(ielem,K_YY,1) = 1 ;
-    rotation(ielem,K_ZZ,1) = 1 ;
-
-    elem_mass(ielem) = ONE12TH * density *
-                                 dot8<Scalar,execution_space>( x , grad_x );
-  }
-
-  static void apply( const Fields & mesh_fields )
-  {
-    initialize_element op( mesh_fields );
-    Kokkos::parallel_for( mesh_fields.num_elements , op );
-  }
-};
-
-
-template<typename Scalar , class DeviceType >
-struct initialize_node
-{
-  typedef DeviceType     execution_space ;
-
-  typedef Explicit::Fields< Scalar , execution_space > Fields ;
-
-  typename Fields::node_elem_ids_type      node_elem_connectivity ;
-  typename Fields::array_type              nodal_mass ;
-  typename Fields::array_type              elem_mass ;
-
-  static const int ElemNodeCount = Fields::ElemNodeCount ;
-
-  initialize_node( const Fields & mesh_fields )
-    : node_elem_connectivity( mesh_fields.node_elem_connectivity )
-    , nodal_mass(             mesh_fields.nodal_mass )
-    , elem_mass(              mesh_fields.elem_mass )
-    {}
-
-
-  KOKKOS_INLINE_FUNCTION
-  void operator()( int inode )const
-  {
-    const int begin = node_elem_connectivity.row_map[inode];
-    const int end   = node_elem_connectivity.row_map[inode+1];
-
-    Scalar node_mass = 0;
-
-    for(int i = begin; i != end; ++i) {
-      const int elem_id = node_elem_connectivity.entries( i , 0 );
-      node_mass += elem_mass(elem_id);
-    }
-
-    nodal_mass(inode) = node_mass / ElemNodeCount ;
-  }
-
-  static void apply( const Fields & mesh_fields )
-  {
-    initialize_node op( mesh_fields );
-    Kokkos::parallel_for( mesh_fields.num_nodes_owned , op );
-  }
-};
-
-//----------------------------------------------------------------------------
-
-
-template<typename Scalar, class DeviceType >
-struct grad
-{
-  typedef DeviceType execution_space ;
-
-  typedef Explicit::Fields< Scalar , execution_space >  Fields ;
-
-  static const int ElemNodeCount = Fields::ElemNodeCount ;
-
-  static const int K_F_XX = Fields::K_F_XX ;
-  static const int K_F_YY = Fields::K_F_YY ;
-  static const int K_F_ZZ = Fields::K_F_ZZ ;
-  static const int K_F_XY = Fields::K_F_XY ;
-  static const int K_F_YZ = Fields::K_F_YZ ;
-  static const int K_F_ZX = Fields::K_F_ZX ;
-  static const int K_F_YX = Fields::K_F_YX ;
-  static const int K_F_ZY = Fields::K_F_ZY ;
-  static const int K_F_XZ = Fields::K_F_XZ ;
-
-  // Global arrays used by this functor.
-
-  const typename Fields::elem_node_ids_type     elem_node_connectivity ;
-  const typename Fields::node_coords_type       model_coords ;
-  const typename Fields::geom_state_array_type  displacement ;
-  const typename Fields::geom_state_array_type  velocity ;
-  const typename Fields::elem_tensor_type       vel_grad ;
-  const typename Fields::scalar_type            dt ;
-
-  const int  current_state;
-  const int  previous_state;
-
-  // Constructor on the Host to populate this device functor.
-  // All array view copies are shallow.
-  grad( const Fields &  fields,
-        const int arg_current_state,
-        const int arg_previous_state)
-    : elem_node_connectivity( fields.elem_node_connectivity)
-    , model_coords( fields.model_coords)
-    , displacement( fields.displacement)
-    , velocity( fields.velocity)
-    , vel_grad( fields.vel_grad)
-    , dt(  fields.dt)
-    , current_state(arg_current_state)
-    , previous_state(arg_previous_state)
-    { }
-
-  //--------------------------------------------------------------------------
-
-    //   Calculate Velocity Gradients
-    KOKKOS_INLINE_FUNCTION
-    void v_grad(  int ielem,
-      Scalar * vx,       Scalar * vy,       Scalar * vz,
-      Scalar * grad_x,     Scalar * grad_y,     Scalar * grad_z,
-      Scalar inv_vol) const
-    {
-      const int K_F_XX = Fields::K_F_XX ;
-      const int K_F_YY = Fields::K_F_YY ;
-      const int K_F_ZZ = Fields::K_F_ZZ ;
-      const int K_F_XY = Fields::K_F_XY ;
-      const int K_F_YZ = Fields::K_F_YZ ;
-      const int K_F_ZX = Fields::K_F_ZX ;
-      const int K_F_YX = Fields::K_F_YX ;
-      const int K_F_ZY = Fields::K_F_ZY ;
-      const int K_F_XZ = Fields::K_F_XZ ;
-
-      vel_grad(ielem, K_F_XX) = inv_vol * dot8<Scalar,execution_space>( vx , grad_x );
-      vel_grad(ielem, K_F_YX) = inv_vol * dot8<Scalar,execution_space>( vy , grad_x );
-      vel_grad(ielem, K_F_ZX) = inv_vol * dot8<Scalar,execution_space>( vz , grad_x );
-
-      vel_grad(ielem, K_F_XY) = inv_vol * dot8<Scalar,execution_space>( vx , grad_y );
-      vel_grad(ielem, K_F_YY) = inv_vol * dot8<Scalar,execution_space>( vy , grad_y );
-      vel_grad(ielem, K_F_ZY) = inv_vol * dot8<Scalar,execution_space>( vz , grad_y );
-
-      vel_grad(ielem, K_F_XZ) = inv_vol * dot8<Scalar,execution_space>( vx , grad_z );
-      vel_grad(ielem, K_F_YZ) = inv_vol * dot8<Scalar,execution_space>( vy , grad_z );
-      vel_grad(ielem, K_F_ZZ) = inv_vol * dot8<Scalar,execution_space>( vz , grad_z );
-    }
-
-  //--------------------------------------------------------------------------
-  // Functor operator() which calls the three member functions.
-
-
-  KOKKOS_INLINE_FUNCTION
-  void operator()( int ielem )const
-  {
-    const int X = 0 ;
-    const int Y = 1 ;
-    const int Z = 2 ;
-    const Scalar dt_scale = -0.5 * dt();
-
-    //  declare and reuse local data for frequently accessed data to
-    //  reduce global memory reads and writes.
-
-    Scalar      x[8],      y[8],      z[8];
-    Scalar     vx[8],     vy[8],     vz[8];
-    Scalar grad_x[8], grad_y[8], grad_z[8];
-
-    // Read global velocity once and use many times
-    // via local registers / L1 cache.
-    //  store the velocity information in local memory before using,
-    //  so it can be returned for other functions to use
-
-    // Read global coordinates and velocity once and use many times
-    // via local registers / L1 cache.
-    // load X coordinate information and move by half time step
-
-    for ( int i = 0 ; i < ElemNodeCount ; ++i ) {
-      const int n = elem_node_connectivity( ielem , i );
-
-      vx[i] = velocity( n , X , current_state );
-      vy[i] = velocity( n , Y , current_state );
-      vz[i] = velocity( n , Z , current_state );
-
-      x[i]  = model_coords( n , X ) +
-              displacement( n , X , current_state ) +
-              dt_scale * vx[i];
-
-      y[i]  = model_coords( n , Y ) +
-              displacement( n , Y , current_state ) +
-              dt_scale * vy[i];
-
-      z[i]  = model_coords( n , Z ) +
-              displacement( n , Z , current_state ) +
-              dt_scale * vz[i];
-    }
-
-    comp_grad<Scalar,execution_space>( x, y, z, grad_x, grad_y, grad_z);
-
-    //  Calculate hexahedral volume from x model_coords and gradient information
-
-    const Scalar inv_vol = 1.0 / dot8<Scalar,execution_space>( x , grad_x );
-
-    v_grad(ielem, vx, vy, vz, grad_x, grad_y, grad_z, inv_vol);
-  }
-
-  static void apply( const Fields & fields ,
-                     const int arg_current_state ,
-                     const int arg_previous_state )
-  {
-    grad op( fields, arg_current_state , arg_previous_state );
-    Kokkos::parallel_for( fields.num_elements , op );
-  }
-};
-
-//----------------------------------------------------------------------------
-
-template<typename Scalar, class DeviceType >
-struct decomp_rotate
-{
-  typedef DeviceType execution_space ;
-
-  typedef Explicit::Fields< Scalar , execution_space >  Fields ;
-
-  static const int ElemNodeCount = Fields::ElemNodeCount ;
-
-  static const int K_F_XX = Fields::K_F_XX ;
-  static const int K_F_YY = Fields::K_F_YY ;
-  static const int K_F_ZZ = Fields::K_F_ZZ ;
-  static const int K_F_XY = Fields::K_F_XY ;
-  static const int K_F_YZ = Fields::K_F_YZ ;
-  static const int K_F_ZX = Fields::K_F_ZX ;
-  static const int K_F_YX = Fields::K_F_YX ;
-  static const int K_F_ZY = Fields::K_F_ZY ;
-  static const int K_F_XZ = Fields::K_F_XZ ;
-
-  static const int K_S_XX = Fields::K_S_XX ;
-  static const int K_S_YY = Fields::K_S_YY ;
-  static const int K_S_ZZ = Fields::K_S_ZZ ;
-  static const int K_S_XY = Fields::K_S_XY ;
-  static const int K_S_YZ = Fields::K_S_YZ ;
-  static const int K_S_ZX = Fields::K_S_ZX ;
-  static const int K_S_YX = Fields::K_S_YX ;
-  static const int K_S_ZY = Fields::K_S_ZY ;
-  static const int K_S_XZ = Fields::K_S_XZ ;
-
-  static const int K_V_XY = Fields::K_V_XY ;
-  static const int K_V_YZ = Fields::K_V_YZ ;
-  static const int K_V_ZX = Fields::K_V_ZX ;
-
-  // Global arrays used by this functor.
-
-  const typename Fields::elem_tensor_state_type     rotation ;
-  const typename Fields::elem_tensor_type           vel_grad ;
-  const typename Fields::elem_sym_tensor_type       stretch ;
-  const typename Fields::elem_sym_tensor_type       rot_stretch ;
-  const typename Fields::scalar_type                dt_value ;
-
-  const int  current_state;
-  const int  previous_state;
-
-  decomp_rotate( const Fields & mesh_fields ,
-                 const int arg_current_state,
-                 const int arg_previous_state)
-    : rotation(    mesh_fields.rotation )
-    , vel_grad(    mesh_fields.vel_grad )
-    , stretch(     mesh_fields.stretch )
-    , rot_stretch( mesh_fields.rot_stretch )
-    , dt_value(    mesh_fields.dt)
-    , current_state( arg_current_state)
-    , previous_state(arg_previous_state)
-    {}
-
-  static void apply( const Fields & mesh_fields ,
-                     const int arg_current_state ,
-                     const int arg_previous_state )
-  {
-    decomp_rotate op( mesh_fields , arg_current_state , arg_previous_state );
-    Kokkos::parallel_for( mesh_fields.num_elements , op );
-  }
-
-
-  KOKKOS_INLINE_FUNCTION
-  void additive_decomp(int ielem, Scalar * v_gr, Scalar * str_ten) const
-  {
-    //  In addition to calculating stretching_tensor,
-    //  use this as an opportunity to load global
-    //  variables into a local space
-
-    for ( int i = 0 ; i < 9 ; ++i ) {
-      v_gr[i] = vel_grad( ielem , i );
-    }
-
-    //
-    //  Symmetric part
-    //
-    str_ten[K_S_XX] = v_gr[K_F_XX];
-    str_ten[K_S_YY] = v_gr[K_F_YY];
-    str_ten[K_S_ZZ] = v_gr[K_F_ZZ];
-    str_ten[K_S_XY] = 0.5*(v_gr[K_F_XY] + v_gr[K_F_YX]);
-    str_ten[K_S_YZ] = 0.5*(v_gr[K_F_YZ] + v_gr[K_F_ZY]);
-    str_ten[K_S_ZX] = 0.5*(v_gr[K_F_ZX] + v_gr[K_F_XZ]);
-  }
-
-  KOKKOS_INLINE_FUNCTION
-  void polar_decomp(int ielem, Scalar * v_gr, Scalar * str_ten, Scalar * str, Scalar * vort, Scalar * rot_old, Scalar * rot_new)const
-  {
-    const Scalar dt = dt_value();
-    const Scalar dt_half = 0.5 * dt;
-
-    //  Skew Symmetric part
-    vort[K_V_XY] = 0.5*(v_gr[K_F_XY] - v_gr[K_F_YX]);
-    vort[K_V_YZ] = 0.5*(v_gr[K_F_YZ] - v_gr[K_F_ZY]);
-    vort[K_V_ZX] = 0.5*(v_gr[K_F_ZX] - v_gr[K_F_XZ]);
-
-    //   calculate the rates of rotation via gauss elimination.
-    for ( int i = 0 ; i < 6 ; ++i ) {
-      str[i] = stretch(ielem, i);
-    }
-
-    Scalar z1 = str_ten[K_S_XY] * str[K_S_ZX] -
-                str_ten[K_S_ZX] * str[K_S_XY] +
-                str_ten[K_S_YY] * str[K_S_YZ] -
-                str_ten[K_S_YZ] * str[K_S_YY] +
-                str_ten[K_S_YZ] * str[K_S_ZZ] -
-                str_ten[K_S_ZZ] * str[K_S_YZ];
-
-    Scalar z2 = str_ten[K_S_ZX] * str[K_S_XX] -
-                str_ten[K_S_XX] * str[K_S_ZX] +
-                str_ten[K_S_YZ] * str[K_S_XY] -
-                str_ten[K_S_XY] * str[K_S_YZ] +
-                str_ten[K_S_ZZ] * str[K_S_ZX] -
-                str_ten[K_S_ZX] * str[K_S_ZZ];
-
-    Scalar z3 = str_ten[K_S_XX] * str[K_S_XY] -
-                str_ten[K_S_XY] * str[K_S_XX] +
-                str_ten[K_S_XY] * str[K_S_YY] -
-                str_ten[K_S_YY] * str[K_S_XY] +
-                str_ten[K_S_ZX] * str[K_S_YZ] -
-                str_ten[K_S_YZ] * str[K_S_ZX];
-
-  //   forward elimination
-    const Scalar a1inv = 1.0 / (str[K_S_YY] + str[K_S_ZZ]);
-
-    const Scalar a4BYa1 = -1 * str[K_S_XY] * a1inv;
-
-    const Scalar a2inv = 1.0 / (str[K_S_ZZ] + str[K_S_XX] + str[K_S_XY] * a4BYa1);
-
-    const Scalar a5 =  -str[K_S_YZ] + str[K_S_ZX] * a4BYa1;
-
-    z2 -= z1 * a4BYa1;
-    Scalar a6BYa1 = -1 * str[K_S_ZX] * a1inv;
-    const Scalar a5BYa2 = a5 * a2inv;
-    z3 -= z1 * a6BYa1 - z2 * a5BYa2;
-
-  //   backward substitution -
-    z3 /= (str[K_S_XX] + str[K_S_YY] + str[K_S_ZX] * a6BYa1 + a5 * a5BYa2);
-    z2 = (z2 - a5 * z3) * a2inv;
-    z1 = (z1*a1inv - a6BYa1 * z3 -a4BYa1 * z2);
-
-  //   calculate rotation rates - recall that spin_rate is an asymmetric tensor,
-  //   so compute spin rate vector as dual of spin rate tensor,
-  //   i.e   w_i = e_ijk * spin_rate_jk
-    z1 += vort[K_V_YZ];
-    z2 += vort[K_V_ZX];
-    z3 += vort[K_V_XY];
-
-  //   update rotation tensor:
-  //  1) premultiply old rotation tensor to get right-hand side.
-
-    for ( int i = 0 ; i < 9 ; ++i ) {
-      rot_old[i] = rotation(ielem, i, previous_state);
-    }
-
-    Scalar r_XX = rot_old[K_F_XX] + dt_half*( z3 * rot_old[K_F_YX] - z2 * rot_old[K_F_ZX] );
-    Scalar r_YX = rot_old[K_F_YX] + dt_half*( z1 * rot_old[K_F_ZX] - z3 * rot_old[K_F_XX] );
-    Scalar r_ZX = rot_old[K_F_ZX] + dt_half*( z2 * rot_old[K_F_XX] - z1 * rot_old[K_F_YX] );
-    Scalar r_XY = rot_old[K_F_XY] + dt_half*( z3 * rot_old[K_F_YY] - z2 * rot_old[K_F_ZY] );
-    Scalar r_YY = rot_old[K_F_YY] + dt_half*( z1 * rot_old[K_F_ZY] - z3 * rot_old[K_F_XY] );
-    Scalar r_ZY = rot_old[K_F_ZY] + dt_half*( z2 * rot_old[K_F_XY] - z1 * rot_old[K_F_YY] );
-    Scalar r_XZ = rot_old[K_F_XZ] + dt_half*( z3 * rot_old[K_F_YZ] - z2 * rot_old[K_F_ZZ] );
-    Scalar r_YZ = rot_old[K_F_YZ] + dt_half*( z1 * rot_old[K_F_ZZ] - z3 * rot_old[K_F_XZ] );
-    Scalar r_ZZ = rot_old[K_F_ZZ] + dt_half*( z2 * rot_old[K_F_XZ] - z1 * rot_old[K_F_YZ] );
-
-
-  //  2) solve for new rotation tensor via gauss elimination.
-  //   forward elimination -
-    Scalar a12 = - dt_half * z3;
-    Scalar a13 =   dt_half * z2;
-    Scalar b32 = - dt_half * z1;
-    Scalar a22inv = 1.0 / (1.0 + a12 * a12);
-
-    Scalar a13a12 = a13*a12;
-    Scalar a23 = b32 + a13a12;
-    r_YX += r_XX * a12;
-    r_YY += r_XY * a12;
-    r_YZ += r_XZ * a12;
-
-
-    b32 = (b32 - a13a12) * a22inv;
-    r_ZX += r_XX * a13 + r_YX * b32;
-    r_ZY += r_XY * a13 + r_YY * b32;
-    r_ZZ += r_XZ * a13 + r_YZ * b32;
-
-
-  //   backward substitution -
-    const Scalar a33inv = 1.0 / (1.0 + a13 * a13 + a23 * b32);
-
-    rot_new[K_F_ZX] = r_ZX * a33inv;
-    rot_new[K_F_ZY] = r_ZY * a33inv;
-    rot_new[K_F_ZZ] = r_ZZ * a33inv;
-    rot_new[K_F_YX] = ( r_YX - rot_new[K_F_ZX] * a23 ) * a22inv;
-    rot_new[K_F_YY] = ( r_YY - rot_new[K_F_ZY] * a23 ) * a22inv;
-    rot_new[K_F_YZ] = ( r_YZ - rot_new[K_F_ZZ] * a23 ) * a22inv;
-    rot_new[K_F_XX] = r_XX - rot_new[K_F_ZX] * a13 - rot_new[K_F_YX] * a12;
-    rot_new[K_F_XY] = r_XY - rot_new[K_F_ZY] * a13 - rot_new[K_F_YY] * a12;
-    rot_new[K_F_XZ] = r_XZ - rot_new[K_F_ZZ] * a13 - rot_new[K_F_YZ] * a12;
-
-    for ( int i = 0 ; i < 9 ; ++i ) {
-      rotation(ielem, i, current_state) = rot_new[i] ;
-    }
-
-  //   update stretch tensor in the new configuration -
-    const Scalar a1 = str_ten[K_S_XY] + vort[K_V_XY];
-    const Scalar a2 = str_ten[K_S_YZ] + vort[K_V_YZ];
-    const Scalar a3 = str_ten[K_S_ZX] + vort[K_V_ZX];
-    const Scalar b1 = str_ten[K_S_ZX] - vort[K_V_ZX];
-    const Scalar b2 = str_ten[K_S_XY] - vort[K_V_XY];
-    const Scalar b3 = str_ten[K_S_YZ] - vort[K_V_YZ];
-
-    const Scalar s_XX = str[K_S_XX];
-    const Scalar s_YY = str[K_S_YY];
-    const Scalar s_ZZ = str[K_S_ZZ];
-    const Scalar s_XY = str[K_S_XY];
-    const Scalar s_YZ = str[K_S_YZ];
-    const Scalar s_ZX = str[K_S_ZX];
-
-    str[K_S_XX] += dt * (str_ten[K_S_XX] * s_XX + ( a1 + z3 ) * s_XY + ( b1 - z2 ) * s_ZX);
-    str[K_S_YY] += dt * (str_ten[K_S_YY] * s_YY + ( a2 + z1 ) * s_YZ + ( b2 - z3 ) * s_XY);
-    str[K_S_ZZ] += dt * (str_ten[K_S_ZZ] * s_ZZ + ( a3 + z2 ) * s_ZX + ( b3 - z1 ) * s_YZ);
-    str[K_S_XY] += dt * (str_ten[K_S_XX] * s_XY + ( a1 )      * s_YY + ( b1      ) * s_YZ - z3 * s_XX + z1 * s_ZX);
-    str[K_S_YZ] += dt * (str_ten[K_S_YY] * s_YZ + ( a2 )      * s_ZZ + ( b2      ) * s_ZX - z1 * s_YY + z2 * s_XY);
-    str[K_S_ZX] += dt * (str_ten[K_S_ZZ] * s_ZX + ( a3 )      * s_XX + ( b3      ) * s_XY - z2 * s_ZZ + z3 * s_YZ);
-
-  }
-
-
-  KOKKOS_INLINE_FUNCTION
-  void rotate_tensor(int ielem, Scalar * str_ten, Scalar * str, Scalar * rot_new)const {
-
-    Scalar t[9];
-    Scalar rot_str[6]; // Rotated stretch
-
-    t[0] = str_ten[K_S_XX]*rot_new[K_F_XX] +
-           str_ten[K_S_XY]*rot_new[K_F_YX] +
-           str_ten[K_S_XZ]*rot_new[K_F_ZX];
-
-    t[1] = str_ten[K_S_YX]*rot_new[K_F_XX] +
-           str_ten[K_S_YY]*rot_new[K_F_YX] +
-           str_ten[K_S_YZ]*rot_new[K_F_ZX];
-
-    t[2] = str_ten[K_S_ZX]*rot_new[K_F_XX] +
-           str_ten[K_S_ZY]*rot_new[K_F_YX] +
-           str_ten[K_S_ZZ]*rot_new[K_F_ZX];
-
-    t[3] = str_ten[K_S_XX]*rot_new[K_F_XY] +
-           str_ten[K_S_XY]*rot_new[K_F_YY] +
-           str_ten[K_S_XZ]*rot_new[K_F_ZY];
-
-    t[4] = str_ten[K_S_YX]*rot_new[K_F_XY] +
-           str_ten[K_S_YY]*rot_new[K_F_YY] +
-           str_ten[K_S_YZ]*rot_new[K_F_ZY];
-
-    t[5] = str_ten[K_S_ZX]*rot_new[K_F_XY] +
-           str_ten[K_S_ZY]*rot_new[K_F_YY] +
-           str_ten[K_S_ZZ]*rot_new[K_F_ZY];
-
-    t[6] = str_ten[K_S_XX]*rot_new[K_F_XZ] +
-           str_ten[K_S_XY]*rot_new[K_F_YZ] +
-           str_ten[K_S_XZ]*rot_new[K_F_ZZ];
-
-    t[7] = str_ten[K_S_YX]*rot_new[K_F_XZ] +
-           str_ten[K_S_YY]*rot_new[K_F_YZ] +
-           str_ten[K_S_YZ]*rot_new[K_F_ZZ];
-
-    t[8] = str_ten[K_S_ZX]*rot_new[K_F_XZ] +
-           str_ten[K_S_ZY]*rot_new[K_F_YZ] +
-           str_ten[K_S_ZZ]*rot_new[K_F_ZZ];
-
-
-    rot_str[ K_S_XX ] = rot_new[K_F_XX] * t[0] +
-                        rot_new[K_F_YX] * t[1] +
-                        rot_new[K_F_ZX] * t[2];
-    rot_str[ K_S_YY ] = rot_new[K_F_XY] * t[3] +
-                        rot_new[K_F_YY] * t[4] +
-                        rot_new[K_F_ZY] * t[5];
-    rot_str[ K_S_ZZ ] = rot_new[K_F_XZ] * t[6] +
-                        rot_new[K_F_YZ] * t[7] +
-                        rot_new[K_F_ZZ] * t[8];
-
-    rot_str[ K_S_XY ] = rot_new[K_F_XX] * t[3] +
-                        rot_new[K_F_YX] * t[4] +
-                        rot_new[K_F_ZX] * t[5];
-    rot_str[ K_S_YZ ] = rot_new[K_F_XY] * t[6] +
-                        rot_new[K_F_YY] * t[7] +
-                        rot_new[K_F_ZY] * t[8];
-    rot_str[ K_S_ZX ] = rot_new[K_F_XZ] * t[0] +
-                        rot_new[K_F_YZ] * t[1] +
-                        rot_new[K_F_ZZ] * t[2];
-
-    for ( int i = 0 ; i < 6 ; ++i ) {
-      rot_stretch(ielem, i) = rot_str[i] ;
-    }
-
-    for ( int i = 0 ; i < 6 ; ++i ) {
-      stretch(ielem, i) = str[i] ;
-    }
-  }
-
-  KOKKOS_INLINE_FUNCTION
-  void operator()( int ielem )const {
-
-    //   Local scratch space to avoid multiple
-    //   accesses to global memory.
-    Scalar str_ten[6]; // Stretching tensor
-    Scalar str[6];     // Stretch
-    Scalar rot_old[9]; // Rotation old
-    Scalar rot_new[9]; // Rotation new
-    Scalar vort[3];    // Vorticity
-    Scalar v_gr[9];    // Velocity gradient
-
-    additive_decomp(ielem, v_gr, str_ten);
-
-    polar_decomp(ielem, v_gr, str_ten, str, vort, rot_old, rot_new);
-
-    rotate_tensor(ielem, str_ten, str, rot_new);
-  }
-};
-
-//----------------------------------------------------------------------------
-
-template<typename Scalar, class DeviceType >
-struct internal_force
-{
-  typedef DeviceType execution_space ;
-
-  typedef Explicit::Fields< Scalar , execution_space >  Fields ;
-
-  static const int ElemNodeCount = Fields::ElemNodeCount ;
-
-  static const int K_F_XX = Fields::K_F_XX ;
-  static const int K_F_YY = Fields::K_F_YY ;
-  static const int K_F_ZZ = Fields::K_F_ZZ ;
-  static const int K_F_XY = Fields::K_F_XY ;
-  static const int K_F_YZ = Fields::K_F_YZ ;
-  static const int K_F_ZX = Fields::K_F_ZX ;
-  static const int K_F_YX = Fields::K_F_YX ;
-  static const int K_F_ZY = Fields::K_F_ZY ;
-  static const int K_F_XZ = Fields::K_F_XZ ;
-
-  static const int K_S_XX = Fields::K_S_XX ;
-  static const int K_S_YY = Fields::K_S_YY ;
-  static const int K_S_ZZ = Fields::K_S_ZZ ;
-  static const int K_S_XY = Fields::K_S_XY ;
-  static const int K_S_YZ = Fields::K_S_YZ ;
-  static const int K_S_ZX = Fields::K_S_ZX ;
-  static const int K_S_YX = Fields::K_S_YX ;
-  static const int K_S_ZY = Fields::K_S_ZY ;
-  static const int K_S_XZ = Fields::K_S_XZ ;
-
-  //--------------------------------------------------------------------------
-  // Reduction:
-
-  typedef Scalar value_type;
-
-  KOKKOS_INLINE_FUNCTION
-  static void init(value_type &update) {
-    update = 1.0e32;
-  }
-
-  KOKKOS_INLINE_FUNCTION
-  static void join( volatile value_type & update,
-                    const volatile value_type & source )
-  {
-    update = update < source ? update : source;
-  }
-
-  // Final serial processing of reduction value:
-  KOKKOS_INLINE_FUNCTION
-  void final( value_type & result ) const
-  {
-    prev_dt() = dt() ;
-    dt() = result ;
-  };
-
-  //--------------------------------------------------------------------------
-
-  // Global arrays used by this functor.
-
-  const typename Fields::elem_node_ids_type      elem_node_connectivity ;
-  const typename Fields::node_coords_type        model_coords ;
-  const typename Fields::scalar_type             dt ;
-  const typename Fields::scalar_type             prev_dt ;
-  const typename Fields::geom_state_array_type   displacement ;
-  const typename Fields::geom_state_array_type   velocity ;
-  const typename Fields::array_type              elem_mass ;
-  const typename Fields::array_type              internal_energy ;
-  const typename Fields::elem_sym_tensor_type    stress_new ;
-  const typename Fields::elem_node_geom_type     element_force ;
-  const typename Fields::elem_tensor_state_type  rotation ;
-  const typename Fields::elem_sym_tensor_type    rot_stretch ;
-
-  const Scalar     two_mu;
-  const Scalar     bulk_modulus;
-  const Scalar     lin_bulk_visc;
-  const Scalar     quad_bulk_visc;
-  const Scalar     user_dt;
-  const int        current_state;
-
-  internal_force( const Fields & mesh_fields,
-                  const Scalar arg_user_dt,
-                  const int arg_current_state )
-    : elem_node_connectivity( mesh_fields.elem_node_connectivity )
-    , model_coords(           mesh_fields.model_coords )
-    , dt(                     mesh_fields.dt )
-    , prev_dt(                mesh_fields.prev_dt )
-    , displacement(           mesh_fields.displacement )
-    , velocity(               mesh_fields.velocity )
-    , elem_mass(              mesh_fields.elem_mass )
-    , internal_energy(        mesh_fields.internal_energy )
-    , stress_new(             mesh_fields.stress_new )
-    , element_force(          mesh_fields.element_force )
-    , rotation(               mesh_fields.rotation )
-    , rot_stretch(            mesh_fields.rot_stretch )
-    , two_mu(                 mesh_fields.two_mu )
-    , bulk_modulus(           mesh_fields.bulk_modulus )
-    , lin_bulk_visc(          mesh_fields.lin_bulk_visc )
-    , quad_bulk_visc(         mesh_fields.quad_bulk_visc )
-    , user_dt(       arg_user_dt )
-    , current_state( arg_current_state )
-  {}
-
-  static void apply( const Fields & mesh_fields ,
-                     const Scalar arg_user_dt,
-                     const int arg_current_state )
-  {
-    internal_force  op_force( mesh_fields , arg_user_dt , arg_current_state );
-
-    Kokkos::parallel_reduce( mesh_fields.num_elements, op_force );
-  }
-
-  //--------------------------------------------------------------------------
-
-  KOKKOS_INLINE_FUNCTION
-  void rotate_tensor_backward(int ielem ,
-    const Scalar * const s_n ,
-    Scalar * const rot_stress )const
-  {
-    const int rot_state = current_state ; // 1 ;
-
-    //   t : temporary variables
-    //   s_n : stress_new in local memory space
-    //   r_n : rotation_new in local memory space
-    Scalar t[9], r_n[9];
-
-    r_n[0] = rotation(ielem, 0, rot_state );
-    r_n[1] = rotation(ielem, 1, rot_state );
-    r_n[2] = rotation(ielem, 2, rot_state );
-    r_n[3] = rotation(ielem, 3, rot_state );
-    r_n[4] = rotation(ielem, 4, rot_state );
-    r_n[5] = rotation(ielem, 5, rot_state );
-    r_n[6] = rotation(ielem, 6, rot_state );
-    r_n[7] = rotation(ielem, 7, rot_state );
-    r_n[8] = rotation(ielem, 8, rot_state );
-
-    t[0] = s_n[K_S_XX]*r_n[K_F_XX]+ s_n[K_S_XY]*r_n[K_F_XY]+ s_n[K_S_XZ]*r_n[K_F_XZ];
-    t[1] = s_n[K_S_YX]*r_n[K_F_XX]+ s_n[K_S_YY]*r_n[K_F_XY]+ s_n[K_S_YZ]*r_n[K_F_XZ];
-    t[2] = s_n[K_S_ZX]*r_n[K_F_XX]+ s_n[K_S_ZY]*r_n[K_F_XY]+ s_n[K_S_ZZ]*r_n[K_F_XZ];
-    t[3] = s_n[K_S_XX]*r_n[K_F_YX]+ s_n[K_S_XY]*r_n[K_F_YY]+ s_n[K_S_XZ]*r_n[K_F_YZ];
-    t[4] = s_n[K_S_YX]*r_n[K_F_YX]+ s_n[K_S_YY]*r_n[K_F_YY]+ s_n[K_S_YZ]*r_n[K_F_YZ];
-    t[5] = s_n[K_S_ZX]*r_n[K_F_YX]+ s_n[K_S_ZY]*r_n[K_F_YY]+ s_n[K_S_ZZ]*r_n[K_F_YZ];
-    t[6] = s_n[K_S_XX]*r_n[K_F_ZX]+ s_n[K_S_XY]*r_n[K_F_ZY]+ s_n[K_S_XZ]*r_n[K_F_ZZ];
-    t[7] = s_n[K_S_YX]*r_n[K_F_ZX]+ s_n[K_S_YY]*r_n[K_F_ZY]+ s_n[K_S_YZ]*r_n[K_F_ZZ];
-    t[8] = s_n[K_S_ZX]*r_n[K_F_ZX]+ s_n[K_S_ZY]*r_n[K_F_ZY]+ s_n[K_S_ZZ]*r_n[K_F_ZZ];
-
-    rot_stress[ K_S_XX ] = r_n[K_F_XX]*t[0] + r_n[K_F_XY]*t[1] + r_n[K_F_XZ]*t[2];
-    rot_stress[ K_S_YY ] = r_n[K_F_YX]*t[3] + r_n[K_F_YY]*t[4] + r_n[K_F_YZ]*t[5];
-    rot_stress[ K_S_ZZ ] = r_n[K_F_ZX]*t[6] + r_n[K_F_ZY]*t[7] + r_n[K_F_ZZ]*t[8];
-
-    rot_stress[ K_S_XY ] = r_n[K_F_XX]*t[3] + r_n[K_F_XY]*t[4] + r_n[K_F_XZ]*t[5];
-    rot_stress[ K_S_YZ ] = r_n[K_F_YX]*t[6] + r_n[K_F_YY]*t[7] + r_n[K_F_YZ]*t[8];
-    rot_stress[ K_S_ZX ] = r_n[K_F_ZX]*t[0] + r_n[K_F_ZY]*t[1] + r_n[K_F_ZZ]*t[2];
-  }
-
-  //--------------------------------------------------------------------------
-
-  KOKKOS_INLINE_FUNCTION
-  void comp_force(int ielem,
-     const Scalar * const vx ,
-     const Scalar * const vy ,
-     const Scalar * const vz ,
-     const Scalar * const grad_x ,
-     const Scalar * const grad_y ,
-     const Scalar * const grad_z ,
-     Scalar * total_stress12th ) const
-  {
-    Scalar internal_energy_inc = 0 ;
-
-    for(int inode = 0; inode < 8; ++inode) {
-
-      const Scalar fx =
-        total_stress12th[K_S_XX] * grad_x[inode] +
-        total_stress12th[K_S_XY] * grad_y[inode] +
-        total_stress12th[K_S_XZ] * grad_z[inode] ;
-
-      element_force(ielem, 0, inode) = fx ;
-
-      const Scalar fy =
-        total_stress12th[K_S_YX] * grad_x[inode] +
-        total_stress12th[K_S_YY] * grad_y[inode] +
-        total_stress12th[K_S_YZ] * grad_z[inode] ;
-
-      element_force(ielem, 1, inode) = fy ;
-
-      const Scalar fz =
-        total_stress12th[K_S_ZX] * grad_x[inode] +
-        total_stress12th[K_S_ZY] * grad_y[inode] +
-        total_stress12th[K_S_ZZ] * grad_z[inode] ;
-
-      element_force(ielem, 2, inode) = fz ;
-
-      internal_energy_inc +=
-        fx * vx[inode] +
-        fy * vy[inode] +
-        fz * vz[inode] ;
-    }
-
-    internal_energy(ielem) = internal_energy_inc ;
-  }
-
-  //----------------------------------------------------------------------------
-
-  KOKKOS_INLINE_FUNCTION
-  void get_stress(int ielem , Scalar * const s_n ) const
-    {
-      const int kxx = 0;
-      const int kyy = 1;
-      const int kzz = 2;
-      const int kxy = 3;
-      const int kyz = 4;
-      const int kzx = 5;
-
-      const Scalar e = (rot_stretch(ielem,kxx)+rot_stretch(ielem,kyy)+rot_stretch(ielem,kzz))/3.0;
-
-      s_n[kxx] = stress_new(ielem,kxx) += dt() * (two_mu * (rot_stretch(ielem,kxx)-e)+3*bulk_modulus*e);
-      s_n[kyy] = stress_new(ielem,kyy) += dt() * (two_mu * (rot_stretch(ielem,kyy)-e)+3*bulk_modulus*e);
-      s_n[kzz] = stress_new(ielem,kzz) += dt() * (two_mu * (rot_stretch(ielem,kzz)-e)+3*bulk_modulus*e);
-
-      s_n[kxy] = stress_new(ielem,kxy) += dt() * two_mu * rot_stretch(ielem,kxy);
-      s_n[kyz] = stress_new(ielem,kyz) += dt() * two_mu * rot_stretch(ielem,kyz);
-      s_n[kzx] = stress_new(ielem,kzx) += dt() * two_mu * rot_stretch(ielem,kzx);
-    }
-
-  //----------------------------------------------------------------------------
-
-
-  KOKKOS_INLINE_FUNCTION
-  void operator()( int ielem, value_type & update )const
-  {
-    const Scalar ONE12TH = 1.0 / 12.0 ;
-
-    Scalar x[8], y[8], z[8] ;
-    Scalar vx[8], vy[8], vz[8];
-    Scalar grad_x[8], grad_y[8], grad_z[8];
-
-    // Position and velocity:
-
-    for ( int i = 0 ; i < ElemNodeCount ; ++i ) {
-      const int n = elem_node_connectivity(ielem,i);
-
-      x[i] = model_coords(n, 0) + displacement(n, 0, current_state) ;
-      y[i] = model_coords(n, 1) + displacement(n, 1, current_state) ;
-      z[i] = model_coords(n, 2) + displacement(n, 2, current_state) ;
-
-      vx[i] = velocity(n, 0, current_state);
-      vy[i] = velocity(n, 1, current_state);
-      vz[i] = velocity(n, 2, current_state);
-    }
-
-    // Gradient:
-
-    comp_grad<Scalar,execution_space>( x , y , z , grad_x , grad_y , grad_z );
-
-
-    const Scalar mid_vol = dot8<Scalar,execution_space>( x , grad_x );
-
-    const Scalar shr = two_mu ;
-    const Scalar dil = bulk_modulus + ((2.0*shr)/3.0);
-
-    const Scalar aspect = 6.0 * mid_vol /
-                          ( dot8<Scalar,execution_space>( grad_x , grad_x ) +
-                            dot8<Scalar,execution_space>( grad_y , grad_y ) +
-                            dot8<Scalar,execution_space>( grad_z , grad_z ) );
-
-    const Scalar dtrial = std::sqrt(elem_mass(ielem) * aspect / dil);
-    const Scalar traced = (rot_stretch(ielem, 0) + rot_stretch(ielem, 1) + rot_stretch(ielem, 2));
-
-    const Scalar eps = traced < 0 ? (lin_bulk_visc - quad_bulk_visc * traced * dtrial) : lin_bulk_visc ;
-
-    const Scalar bulkq = eps * dil * dtrial * traced;
-
-    Scalar cur_time_step = dtrial * ( std::sqrt( 1.0 + eps * eps) - eps);
-
-    // force fixed time step if input
-
-    cur_time_step = user_dt > 0 ? user_dt : cur_time_step;
-
-    update = update < cur_time_step ? update : cur_time_step;
-
-
-    Scalar s_n[ 6 ];
-
-    get_stress( ielem, s_n );
-
-    Scalar total_stress12th[6];
-
-    // Get rotated stress:
-
-    rotate_tensor_backward(ielem, s_n , total_stress12th );
-
-    total_stress12th[0] = ONE12TH*( total_stress12th[ 0 ] + bulkq );
-    total_stress12th[1] = ONE12TH*( total_stress12th[ 1 ] + bulkq );
-    total_stress12th[2] = ONE12TH*( total_stress12th[ 2 ] + bulkq );
-    total_stress12th[3] = ONE12TH*( total_stress12th[ 3 ] );
-    total_stress12th[4] = ONE12TH*( total_stress12th[ 4 ] );
-    total_stress12th[5] = ONE12TH*( total_stress12th[ 5 ] );
-
-    comp_force(ielem, vx, vy, vz,
-                      grad_x, grad_y, grad_z, total_stress12th);
-  }
-};
-
-//----------------------------------------------------------------------------
-
-template<typename Scalar, class DeviceType >
-struct nodal_step
-{
-  typedef DeviceType     execution_space ;
-  typedef typename execution_space::size_type  size_type;
-
-  typedef Explicit::Fields< Scalar , execution_space >  Fields ;
-
-  const typename Fields::scalar_type            dt ;
-  const typename Fields::scalar_type            prev_dt ;
-  const typename Fields::node_elem_ids_type     node_elem_connectivity ;
-  const typename Fields::node_coords_type       model_coords ;
-  const typename Fields::array_type             nodal_mass ;
-  const typename Fields::geom_state_array_type  displacement ;
-  const typename Fields::geom_state_array_type  velocity ;
-  const typename Fields::geom_array_type        acceleration ;
-  const typename Fields::geom_array_type        internal_force ;
-  const typename Fields::elem_node_geom_type    element_force ;
-
-  const Scalar   x_bc;
-  const int      current_state;
-  const int      next_state;
-
-
-  nodal_step( const Fields  & mesh_fields ,
-              const Scalar    arg_x_bc,
-              const int       arg_current_state,
-              const int       arg_next_state)
-   : dt(       mesh_fields.dt )
-   , prev_dt(  mesh_fields.prev_dt )
-   , node_elem_connectivity( mesh_fields.node_elem_connectivity )
-   , model_coords(   mesh_fields.model_coords )
-   , nodal_mass(     mesh_fields.nodal_mass )
-   , displacement(   mesh_fields.displacement )
-   , velocity(       mesh_fields.velocity )
-   , acceleration(   mesh_fields.acceleration )
-   , internal_force( mesh_fields.internal_force )
-   , element_force(  mesh_fields.element_force )
-   , x_bc(          arg_x_bc )
-   , current_state( arg_current_state )
-   , next_state(    arg_next_state )
-   {
-        //std::cout << "finish_step dt: " << dt << std::endl;
-        //std::cout << "finish_step prev_dt: " << prev_dt << std::endl;
-   }
-
-  static void apply( const Fields  & mesh_fields ,
-                     const Scalar    arg_x_bc ,
-                     const int       arg_current_state ,
-                     const int       arg_next_state )
-  {
-    nodal_step op( mesh_fields, arg_x_bc, arg_current_state, arg_next_state );
-
-    // Only update the owned nodes:
-
-    Kokkos::parallel_for( mesh_fields.num_nodes_owned , op );
-  }
-
-  KOKKOS_INLINE_FUNCTION
-  void operator()(int inode) const
-    {
-      // Getting count as per 'CSR-like' data structure
-      const int begin = node_elem_connectivity.row_map[inode];
-      const int end   = node_elem_connectivity.row_map[inode+1];
-
-      double local_force[] = {0.0, 0.0, 0.0};
-
-      // Gather-sum internal force from
-      // each element that a node is attached to.
-
-      for ( int i = begin; i < end ; ++i ){
-
-        //  node_elem_offset is a cumulative structure, so
-        //  node_elem_offset(inode) should be the index where
-        //  a particular row's elem_IDs begin
-        const int nelem = node_elem_connectivity.entries( i, 0);
-
-        //  find the row in an element's stiffness matrix
-        //  that corresponds to inode
-        const int elem_node_index = node_elem_connectivity.entries( i, 1);
-
-        local_force[0] += element_force(nelem, 0, elem_node_index);
-        local_force[1] += element_force(nelem, 1, elem_node_index);
-        local_force[2] += element_force(nelem, 2, elem_node_index);
-      }
-
-      internal_force(inode, 0) = local_force[0];
-      internal_force(inode, 1) = local_force[1];
-      internal_force(inode, 2) = local_force[2];
-
-      // Acceleration:
-
-      Scalar v_new[3];
-      Scalar a_current[3];
-
-      const Scalar tol = 1.0e-7;
-
-      // If not on the boundary then: a = F / m
-      if ( tol < fabs(model_coords(inode,0)-x_bc) ) {
-
-        const Scalar m = nodal_mass( inode );
-
-        acceleration(inode,0) = a_current[0] = -local_force[0] / m ;
-        acceleration(inode,1) = a_current[1] = -local_force[1] / m ;
-        acceleration(inode,2) = a_current[2] = -local_force[2] / m ;
-      }
-      else { //enforce fixed BC
-        acceleration(inode,0) = a_current[0] = 0;
-        acceleration(inode,1) = a_current[1] = 0;
-        acceleration(inode,2) = a_current[2] = 0;
-      }
-
-      // Central difference time integration:
-
-      const Scalar dt_disp = dt() ;
-      const Scalar dt_vel = ( dt() + prev_dt() ) / 2.0 ;
-
-      velocity(inode,0,next_state) = v_new[0] =
-        velocity(inode,0,current_state) + dt_vel * a_current[0];
-
-      velocity(inode,1,next_state) = v_new[1] =
-        velocity(inode,1,current_state) + dt_vel * a_current[1];
-
-      velocity(inode,2,next_state) = v_new[2] =
-        velocity(inode,2,current_state) + dt_vel * a_current[2];
-
-      displacement(inode,0,next_state) =
-        displacement(inode,0,current_state) + dt_disp * v_new[0];
-
-      displacement(inode,1,next_state) =
-        displacement(inode,1,current_state) + dt_disp * v_new[1];
-
-      displacement(inode,2,next_state) =
-        displacement(inode,2,current_state) + dt_disp * v_new[2];
-    }
-};
-
-//----------------------------------------------------------------------------
-
-template< typename Scalar , class DeviceType >
-struct pack_state
-{
-  typedef DeviceType     execution_space ;
-  typedef typename execution_space::size_type  size_type ;
-
-  typedef Explicit::Fields< Scalar , execution_space >  Fields ;
-
-  typedef typename Fields::geom_state_array_type::value_type  value_type ;
-  typedef Kokkos::View< value_type* , execution_space >     buffer_type ;
-
-  static const unsigned value_count = 6 ;
-
-  const typename Fields::geom_state_array_type  displacement ;
-  const typename Fields::geom_state_array_type  velocity ;
-  const buffer_type  output ;
-  const size_type    inode_base ;
-  const size_type    state_next ;
-
-  pack_state( const buffer_type & arg_output ,
-              const Fields      & mesh_fields ,
-              const size_type     arg_begin ,
-              const size_type     arg_state )
-   : displacement( mesh_fields.displacement )
-   , velocity(     mesh_fields.velocity )
-   , output(       arg_output )
-   , inode_base(   arg_begin )
-   , state_next(   arg_state )
-   {}
-
-  static void apply( const buffer_type & arg_output ,
-                     const size_type     arg_begin ,
-                     const size_type     arg_count ,
-                     const Fields      & mesh_fields ,
-                     const size_type     arg_state )
-  {
-    pack_state op( arg_output , mesh_fields , arg_begin , arg_state );
-
-    Kokkos::parallel_for( arg_count , op );
-  }
-
-  KOKKOS_INLINE_FUNCTION
-  void operator()( const size_type i ) const
-  {
-    const size_type inode = inode_base + i ;
-
-    size_type j = i * value_count ;
-
-    output[j++] = displacement( inode , 0 , state_next );
-    output[j++] = displacement( inode , 1 , state_next );
-    output[j++] = displacement( inode , 2 , state_next );
-    output[j++] = velocity( inode , 0 , state_next );
-    output[j++] = velocity( inode , 1 , state_next );
-    output[j++] = velocity( inode , 2 , state_next );
-  }
-};
-
-template< typename Scalar , class DeviceType >
-struct unpack_state
-{
-  typedef DeviceType     execution_space ;
-  typedef typename execution_space::size_type  size_type ;
-
-  typedef Explicit::Fields< Scalar , execution_space >  Fields ;
-
-  typedef typename Fields::geom_state_array_type::value_type  value_type ;
-  typedef Kokkos::View< value_type* , execution_space >     buffer_type ;
-
-  static const unsigned value_count = 6 ;
-
-  const typename Fields::geom_state_array_type  displacement ;
-  const typename Fields::geom_state_array_type  velocity ;
-  const buffer_type  input ;
-  const size_type    inode_base ;
-  const size_type    state_next ;
-
-  unpack_state( const buffer_type & arg_input ,
-                const Fields      & mesh_fields ,
-                const size_type     arg_begin ,
-                const size_type     arg_state )
-   : displacement( mesh_fields.displacement )
-   , velocity(     mesh_fields.velocity )
-   , input(        arg_input )
-   , inode_base(   arg_begin )
-   , state_next(   arg_state )
-   {}
-
-  static void apply( const Fields      & mesh_fields ,
-                     const size_type     arg_state ,
-                     const buffer_type & arg_input ,
-                     const size_type     arg_begin ,
-                     const size_type     arg_count )
-  {
-    unpack_state op( arg_input , mesh_fields , arg_begin , arg_state );
-
-    Kokkos::parallel_for( arg_count , op );
-  }
-
-  KOKKOS_INLINE_FUNCTION
-  void operator()( const size_type i ) const
-  {
-    const size_type inode = inode_base + i ;
-
-    size_type j = i * value_count ;
-
-    displacement( inode , 0 , state_next ) = input[j++] ;
-    displacement( inode , 1 , state_next ) = input[j++] ;
-    displacement( inode , 2 , state_next ) = input[j++] ;
-    velocity( inode , 0 , state_next ) = input[j++] ;
-    velocity( inode , 1 , state_next ) = input[j++] ;
-    velocity( inode , 2 , state_next ) = input[j++] ;
-  }
-};
-
-} /* namespace Explicit */
-
-#endif /* #ifndef KOKKOS_EXPLICITFUNCTORS_HPP */
-
-
diff --git a/lib/kokkos/example/multi_fem/FEMesh.hpp b/lib/kokkos/example/multi_fem/FEMesh.hpp
deleted file mode 100644
index e836cac43f..0000000000
--- a/lib/kokkos/example/multi_fem/FEMesh.hpp
+++ /dev/null
@@ -1,86 +0,0 @@
-/*
-//@HEADER
-// ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
-// the U.S. Government retains certain rights in this software.
-// 
-// 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 Corporation nor the names of the
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "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 SANDIA CORPORATION OR THE
-// 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.
-//
-// Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
-// ************************************************************************
-//@HEADER
-*/
-
-#ifndef KOKKOS_FEMESH_HPP
-#define KOKKOS_FEMESH_HPP
-
-#include <utility>
-#include <limits>
-#include <iostream>
-#include <sstream>
-#include <stdexcept>
-
-#include <Kokkos_Core.hpp>
-#include <Kokkos_StaticCrsGraph.hpp>
-
-#include <ParallelComm.hpp>
-#include <ParallelDataMap.hpp>
-
-namespace HybridFEM {
-
-//----------------------------------------------------------------------------
-/** \brief  Finite element mesh fixture for hybrid parallel performance tests.
- */
-template< typename CoordScalarType , unsigned ElemNodeCount , class Device >
-struct FEMesh {
-
-  typedef typename Device::size_type size_type ;
-
-  static const size_type element_node_count = ElemNodeCount ;
-
-  typedef Kokkos::View< CoordScalarType*[3] , Device >       node_coords_type ;
-  typedef Kokkos::View< size_type*[ElemNodeCount], Device >  elem_node_ids_type ;
-  typedef Kokkos::StaticCrsGraph< size_type[2] ,  Device >   node_elem_ids_type ;
-
-  node_coords_type         node_coords ;
-  elem_node_ids_type       elem_node_ids ;
-  node_elem_ids_type       node_elem_ids ;
-  Kokkos::ParallelDataMap  parallel_data_map ;
-};
-
-//----------------------------------------------------------------------------
-
-} /* namespace HybridFEM */
-
-#endif /* #ifndef KOKKOS_FEMESH_HPP */
-
diff --git a/lib/kokkos/example/multi_fem/HexElement.hpp b/lib/kokkos/example/multi_fem/HexElement.hpp
deleted file mode 100644
index c1c045a29b..0000000000
--- a/lib/kokkos/example/multi_fem/HexElement.hpp
+++ /dev/null
@@ -1,268 +0,0 @@
-/*
-//@HEADER
-// ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
-// the U.S. Government retains certain rights in this software.
-// 
-// 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 Corporation nor the names of the
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "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 SANDIA CORPORATION OR THE
-// 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.
-//
-// Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
-// ************************************************************************
-//@HEADER
-*/
-
-#ifndef ELEMENTHEX_HPP
-#define ELEMENTHEX_HPP
-
-namespace HybridFEM {
-
-template< unsigned NodeCount >
-class HexElement_TensorData ;
-
-template< unsigned NodeCount , class Device >
-class HexElement_TensorEval ;
-
-//----------------------------------------------------------------------------
-/** \brief  Evaluate Hex element on interval [-1,1]^3 */
-template<>
-class HexElement_TensorData< 8 > {
-public:
-
-  static const unsigned element_node_count    = 8 ;
-  static const unsigned spatial_dimension     = 3 ;
-  static const unsigned integration_count_1d  = 2 ;
-  static const unsigned function_count_1d     = 2 ;
-
-  float values_1d [ function_count_1d ][ integration_count_1d ];
-  float derivs_1d [ function_count_1d ][ integration_count_1d ];
-  float weights_1d[ integration_count_1d ];
-
-  unsigned char eval_map[ element_node_count ][4] ;
-
-  static float eval_value_1d( const unsigned jf , const float x )
-  {
-    return 0 == jf ? 0.5 * ( 1.0 - x ) : (
-           1 == jf ? 0.5 * ( 1.0 + x ) : 0 );
-  }
-
-  static float eval_deriv_1d( const unsigned jf , const float )
-  {
-    return 0 == jf ? -0.5 : (
-           1 == jf ?  0.5 : 0 );
-  }
-
-  HexElement_TensorData()
-  {
-    const unsigned char tmp_map[ element_node_count ][ spatial_dimension ] =
-      { { 0 , 0 , 0 },
-        { 1 , 0 , 0 },
-        { 1 , 1 , 0 },
-        { 0 , 1 , 0 },
-        { 0 , 0 , 1 },
-        { 1 , 0 , 1 },
-        { 1 , 1 , 1 },
-        { 0 , 1 , 1 } };
-
-    weights_1d[0] = 1 ;
-    weights_1d[1] = 1 ;
-
-    const float points_1d[ integration_count_1d ] =
-      { -0.577350269 , 0.577350269 };
-
-    for ( unsigned i = 0 ; i < element_node_count ; ++i ) {
-      eval_map[i][0] = tmp_map[i][0];
-      eval_map[i][1] = tmp_map[i][1];
-      eval_map[i][2] = tmp_map[i][2];
-    }
-
-    for ( unsigned xp = 0 ; xp < integration_count_1d ; ++xp ) {
-    for ( unsigned xf = 0 ; xf < function_count_1d ; ++xf ) {
-      values_1d[xp][xf] = eval_value_1d( xf , points_1d[xp] );
-      derivs_1d[xp][xf] = eval_deriv_1d( xf , points_1d[xp] );
-    }}
-  }
-};
-
-//----------------------------------------------------------------------------
-
-template<>
-class HexElement_TensorData< 27 > {
-public:
-
-  static const unsigned element_node_count    = 27 ;
-  static const unsigned spatial_dimension     = 3 ;
-  static const unsigned integration_count_1d  = 3 ;
-  static const unsigned function_count_1d     = 3 ;
-
-  float values_1d [ function_count_1d ][ integration_count_1d ];
-  float derivs_1d [ function_count_1d ][ integration_count_1d ];
-  float weights_1d[ integration_count_1d ];
-
-  unsigned char eval_map[ element_node_count ][4] ;
-
-  // sizeof(EvaluateElementHex) = 111 bytes =
-  //   sizeof(float) * 9 +
-  //   sizeof(float) * 9 +
-  //   sizeof(float) * 3 +
-  //   sizeof(char) * 27 
-
-  static float eval_value_1d( const unsigned jf , const float p )
-  {
-    return 0 == jf ? 0.5 * p * ( p - 1 ) : (
-           1 == jf ? 1.0 - p * p : (
-           2 == jf ? 0.5 * p * ( p + 1 ) : 0 ));
-  }
-
-  static float eval_deriv_1d( const unsigned jf , const float p )
-  {
-    return 0 == jf ? p - 0.5 : (
-           1 == jf ? -2.0 * p : (
-           2 == jf ? p + 0.5 : 0 ));
-  }
-
-  HexElement_TensorData()
-  {
-    const unsigned char tmp_map[ element_node_count ][ spatial_dimension ] =
-      { { 0 , 0 , 0 },
-        { 2 , 0 , 0 },
-        { 2 , 2 , 0 },
-        { 0 , 2 , 0 },
-        { 0 , 0 , 2 },
-        { 2 , 0 , 2 },
-        { 2 , 2 , 2 },
-        { 0 , 2 , 2 },
-        { 1 , 0 , 0 },
-        { 2 , 1 , 0 },
-        { 1 , 2 , 0 },
-        { 0 , 1 , 0 },
-        { 0 , 0 , 1 },
-        { 2 , 0 , 1 },
-        { 2 , 2 , 1 },
-        { 0 , 2 , 1 },
-        { 1 , 0 , 2 },
-        { 2 , 1 , 2 },
-        { 1 , 2 , 2 },
-        { 0 , 1 , 2 },
-        { 1 , 1 , 1 },
-        { 1 , 1 , 0 },
-        { 1 , 1 , 2 },
-        { 0 , 1 , 1 },
-        { 2 , 1 , 1 },
-        { 1 , 0 , 1 },
-        { 1 , 2 , 1 } };
-
-    // Interval [-1,1]
-
-    weights_1d[0] = 0.555555556 ;
-    weights_1d[1] = 0.888888889 ;
-    weights_1d[2] = 0.555555556 ;
-
-    const float points_1d[3] = { -0.774596669 ,
-                                  0.000000000 ,
-                                  0.774596669 };
-
-    for ( unsigned i = 0 ; i < element_node_count ; ++i ) {
-      eval_map[i][0] = tmp_map[i][0];
-      eval_map[i][1] = tmp_map[i][1];
-      eval_map[i][2] = tmp_map[i][2];
-    }
-
-    for ( unsigned xp = 0 ; xp < integration_count_1d ; ++xp ) {
-    for ( unsigned xf = 0 ; xf < function_count_1d ; ++xf ) {
-      values_1d[xp][xf] = eval_value_1d( xf , points_1d[xp] );
-      derivs_1d[xp][xf] = eval_deriv_1d( xf , points_1d[xp] );
-    }}
-  }
-};
-
-//----------------------------------------------------------------------------
-
-template< unsigned NodeCount >
-class HexElement_Data {
-public:
-  static const unsigned spatial_dimension   = 3 ;
-  static const unsigned element_node_count  = NodeCount ;
-  static const unsigned integration_count   = NodeCount ;
-  static const unsigned function_count      = NodeCount ;
-
-  float weights[   integration_count ] ;
-  float values[    integration_count ][ function_count ];
-  float gradients[ integration_count ][ spatial_dimension ][ function_count ];
-
-  HexElement_Data()
-  {
-    HexElement_TensorData< NodeCount > tensor_data ;
-
-    for ( unsigned ip = 0 ; ip < integration_count ; ++ip ) {
-
-      const unsigned ipx = tensor_data.eval_map[ip][0] ;
-      const unsigned ipy = tensor_data.eval_map[ip][1] ;
-      const unsigned ipz = tensor_data.eval_map[ip][2] ;
-
-      weights[ip] = tensor_data.weights_1d[ ipx ] *
-                    tensor_data.weights_1d[ ipy ] *
-                    tensor_data.weights_1d[ ipz ] ;
-
-      for ( unsigned jf = 0 ; jf < function_count ; ++jf ) {
-
-        const unsigned jfx = tensor_data.eval_map[jf][0] ;
-        const unsigned jfy = tensor_data.eval_map[jf][1] ;
-        const unsigned jfz = tensor_data.eval_map[jf][2] ;
-
-        values[ip][jf] = tensor_data.values_1d[ ipx ][ jfx ] *
-                         tensor_data.values_1d[ ipy ][ jfy ] *
-                         tensor_data.values_1d[ ipz ][ jfz ] ;
-
-        gradients[ip][0][jf] = tensor_data.derivs_1d[ ipx ][ jfx ] *
-                               tensor_data.values_1d[ ipy ][ jfy ] *
-                               tensor_data.values_1d[ ipz ][ jfz ] ;
-
-        gradients[ip][1][jf] = tensor_data.values_1d[ ipx ][ jfx ] *
-                               tensor_data.derivs_1d[ ipy ][ jfy ] *
-                               tensor_data.values_1d[ ipz ][ jfz ] ;
-
-        gradients[ip][2][jf] = tensor_data.values_1d[ ipx ][ jfx ] *
-                               tensor_data.values_1d[ ipy ][ jfy ] *
-                               tensor_data.derivs_1d[ ipz ][ jfz ] ;
-      }
-    }
-  }
-};
-
-//----------------------------------------------------------------------------
-
-} /* namespace HybridFEM */
-
-#endif /* #ifndef ELEMENTHEX_HPP */
-
-
diff --git a/lib/kokkos/example/multi_fem/HexExplicitFunctions.hpp b/lib/kokkos/example/multi_fem/HexExplicitFunctions.hpp
deleted file mode 100644
index 48f535f35b..0000000000
--- a/lib/kokkos/example/multi_fem/HexExplicitFunctions.hpp
+++ /dev/null
@@ -1,443 +0,0 @@
-/*
-//@HEADER
-// ************************************************************************
-//
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
-// the U.S. Government retains certain rights in this software.
-//
-// 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 Corporation nor the names of the
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "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 SANDIA CORPORATION OR THE
-// 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.
-//
-// Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-//
-// ************************************************************************
-//@HEADER
-*/
-
-#ifndef KOKKOS_HEXEXPLICITFUNCTIONS_HPP
-#define KOKKOS_HEXEXPLICITFUNCTIONS_HPP
-
-#include <cmath>
-
-namespace Explicit {
-
-struct Hex8Functions
-{
-  static const unsigned SpatialDim    = 3 ;
-  static const unsigned ElemNodeCount = 8 ;
-
-  // Indices for full 3x3 tensor:
-
-  static const unsigned K_F_XX = 0 ;
-  static const unsigned K_F_YY = 1 ;
-  static const unsigned K_F_ZZ = 2 ;
-  static const unsigned K_F_XY = 3 ;
-  static const unsigned K_F_YZ = 4 ;
-  static const unsigned K_F_ZX = 5 ;
-  static const unsigned K_F_YX = 6 ;
-  static const unsigned K_F_ZY = 7 ;
-  static const unsigned K_F_XZ = 8 ;
-  static const unsigned K_F_SIZE = 9 ;
-
-  //  Indexes into a 3 by 3 symmetric tensor stored as a length 6 vector
-
-  static const unsigned K_S_XX = 0 ;
-  static const unsigned K_S_YY = 1 ;
-  static const unsigned K_S_ZZ = 2 ;
-  static const unsigned K_S_XY = 3 ;
-  static const unsigned K_S_YZ = 4 ;
-  static const unsigned K_S_ZX = 5 ;
-  static const unsigned K_S_YX = 3 ;
-  static const unsigned K_S_ZY = 4 ;
-  static const unsigned K_S_XZ = 5 ;
-  static const unsigned K_S_SIZE = 6 ;
-
-  //  Indexes into a 3 by 3 skew symmetric tensor stored as a length 3 vector
-
-  static const unsigned K_V_XY = 0 ;
-  static const unsigned K_V_YZ = 1 ;
-  static const unsigned K_V_ZX = 2 ;
-  static const unsigned K_V_SIZE = 3 ;
-
-  //--------------------------------------------------------------------------
-
-  template< typename ScalarA , typename ScalarB >
-  KOKKOS_INLINE_FUNCTION static
-  double dot8( const ScalarA * const a , const ScalarB * const b )
-  { return a[0] * b[0] + a[1] * b[1] + a[2] * b[2] + a[3] * b[3] +
-           a[4] * b[4] + a[5] * b[5] + a[6] * b[6] + a[7] * b[7] ; }
-
-  //--------------------------------------------------------------------------
-
-  template< class ScalarPrecise ,
-            class ScalarCompact >
-  KOKKOS_INLINE_FUNCTION static
-  void grad( const ScalarPrecise x[] ,
-             const ScalarPrecise z[] ,
-                   ScalarCompact grad_y[] )
-  {
-    const ScalarCompact R42=(x[3] - x[1]);
-    const ScalarCompact R52=(x[4] - x[1]);
-    const ScalarCompact R54=(x[4] - x[3]);
-
-    const ScalarCompact R63=(x[5] - x[2]);
-    const ScalarCompact R83=(x[7] - x[2]);
-    const ScalarCompact R86=(x[7] - x[5]);
-
-    const ScalarCompact R31=(x[2] - x[0]);
-    const ScalarCompact R61=(x[5] - x[0]);
-    const ScalarCompact R74=(x[6] - x[3]);
-
-    const ScalarCompact R72=(x[6] - x[1]);
-    const ScalarCompact R75=(x[6] - x[4]);
-    const ScalarCompact R81=(x[7] - x[0]);
-
-    const ScalarCompact t1=(R63 + R54);
-    const ScalarCompact t2=(R61 + R74);
-    const ScalarCompact t3=(R72 + R81);
-
-    const ScalarCompact t4 =(R86 + R42);
-    const ScalarCompact t5 =(R83 + R52);
-    const ScalarCompact t6 =(R75 + R31);
-
-    //  Calculate Y gradient from X and Z data
-
-    grad_y[0] = (z[1] *  t1) - (z[2] * R42) - (z[3] *  t5)  + (z[4] *  t4) + (z[5] * R52) - (z[7] * R54);
-    grad_y[1] = (z[2] *  t2) + (z[3] * R31) - (z[0] *  t1)  - (z[5] *  t6) + (z[6] * R63) - (z[4] * R61);
-    grad_y[2] = (z[3] *  t3) + (z[0] * R42) - (z[1] *  t2)  - (z[6] *  t4) + (z[7] * R74) - (z[5] * R72);
-    grad_y[3] = (z[0] *  t5) - (z[1] * R31) - (z[2] *  t3)  + (z[7] *  t6) + (z[4] * R81) - (z[6] * R83);
-    grad_y[4] = (z[5] *  t3) + (z[6] * R86) - (z[7] *  t2)  - (z[0] *  t4) - (z[3] * R81) + (z[1] * R61);
-    grad_y[5] = (z[6] *  t5) - (z[4] *  t3)  - (z[7] * R75) + (z[1] *  t6) - (z[0] * R52) + (z[2] * R72);
-    grad_y[6] = (z[7] *  t1) - (z[5] *  t5)  - (z[4] * R86) + (z[2] *  t4) - (z[1] * R63) + (z[3] * R83);
-    grad_y[7] = (z[4] *  t2) - (z[6] *  t1)  + (z[5] * R75) - (z[3] *  t6) - (z[2] * R74) + (z[0] * R54);
-  }
-
-  template< class ScalarPrecise ,
-            class ScalarCompact >
-  static KOKKOS_INLINE_FUNCTION
-  void grad( const ScalarPrecise x[] ,
-             const ScalarPrecise y[] ,
-             const ScalarPrecise z[] ,
-                   ScalarCompact grad_x[] ,
-                   ScalarCompact grad_y[] ,
-                   ScalarCompact grad_z[] )
-  {
-    grad( x , z , grad_y );
-    grad( z , y , grad_x );
-    grad( y , x , grad_z );
-  }
-
-  //--------------------------------------------------------------------------
-
-  template< class ScalarPrecise ,
-            class ScalarCompact >
-  KOKKOS_INLINE_FUNCTION static
-  void polar_decomp( const float dt ,
-                     const ScalarCompact v_gr[] ,
-                           ScalarPrecise stretch[] /* INOUT */ ,
-                           ScalarCompact str_ten[] /* OUT */ ,
-                           ScalarCompact rot[]     /* OUT */ )
-  {
-    const float dt_half = 0.5 * dt;
-
-    ScalarCompact vort[ K_V_SIZE ];  // Vorticity
-
-    //  Symmetric part
-    str_ten[K_S_XX] = v_gr[K_F_XX];
-    str_ten[K_S_YY] = v_gr[K_F_YY];
-    str_ten[K_S_ZZ] = v_gr[K_F_ZZ];
-    str_ten[K_S_XY] = 0.5 * ( v_gr[K_F_XY] + v_gr[K_F_YX] );
-    str_ten[K_S_YZ] = 0.5 * ( v_gr[K_F_YZ] + v_gr[K_F_ZY] );
-    str_ten[K_S_ZX] = 0.5 * ( v_gr[K_F_ZX] + v_gr[K_F_XZ] );
-
-    //  Skew Symmetric part
-    vort[K_V_XY] = 0.5 * ( v_gr[K_F_XY] - v_gr[K_F_YX] );
-    vort[K_V_YZ] = 0.5 * ( v_gr[K_F_YZ] - v_gr[K_F_ZY] );
-    vort[K_V_ZX] = 0.5 * ( v_gr[K_F_ZX] - v_gr[K_F_XZ] );
-
-    //   calculate the rates of rotation via gauss elimination.
-
-    ScalarCompact z1 = str_ten[K_S_XY] * stretch[K_S_ZX] -
-                       str_ten[K_S_ZX] * stretch[K_S_XY] +
-                       str_ten[K_S_YY] * stretch[K_S_YZ] -
-                       str_ten[K_S_YZ] * stretch[K_S_YY] +
-                       str_ten[K_S_YZ] * stretch[K_S_ZZ] -
-                       str_ten[K_S_ZZ] * stretch[K_S_YZ];
-
-    ScalarCompact z2 = str_ten[K_S_ZX] * stretch[K_S_XX] -
-                       str_ten[K_S_XX] * stretch[K_S_ZX] +
-                       str_ten[K_S_YZ] * stretch[K_S_XY] -
-                       str_ten[K_S_XY] * stretch[K_S_YZ] +
-                       str_ten[K_S_ZZ] * stretch[K_S_ZX] -
-                       str_ten[K_S_ZX] * stretch[K_S_ZZ];
-
-    ScalarCompact z3 = str_ten[K_S_XX] * stretch[K_S_XY] -
-                       str_ten[K_S_XY] * stretch[K_S_XX] +
-                       str_ten[K_S_XY] * stretch[K_S_YY] -
-                       str_ten[K_S_YY] * stretch[K_S_XY] +
-                       str_ten[K_S_ZX] * stretch[K_S_YZ] -
-                       str_ten[K_S_YZ] * stretch[K_S_ZX];
-
-    {
-      //   forward elimination
-
-      const ScalarCompact a1inv  = 1.0 / (stretch[K_S_YY] + stretch[K_S_ZZ]);
-      const ScalarCompact a4BYa1 = -1 * stretch[K_S_XY] * a1inv;
-      const ScalarCompact a2inv  = 1.0 / (stretch[K_S_ZZ] + stretch[K_S_XX] + stretch[K_S_XY] * a4BYa1);
-
-     const ScalarCompact a5 =  -stretch[K_S_YZ] + stretch[K_S_ZX] * a4BYa1;
-
-      z2 -= z1 * a4BYa1;
-      const ScalarCompact a6BYa1 = -1 * stretch[K_S_ZX] * a1inv;
-      const ScalarCompact a5BYa2 = a5 * a2inv;
-      z3 -= z1 * a6BYa1 - z2 * a5BYa2;
-
-      //   backward substitution -
-
-      z3 /= (stretch[K_S_XX] + stretch[K_S_YY] + stretch[K_S_ZX] * a6BYa1 + a5 * a5BYa2);
-      z2 = (z2 - a5 * z3) * a2inv;
-      z1 = (z1*a1inv - a6BYa1 * z3 -a4BYa1 * z2);
-    }
-
-    //   calculate rotation rates - recall that spin_rate is an asymmetric tensor,
-    //   so compute spin rate vector as dual of spin rate tensor,
-    //   i.e   w_i = e_ijk * spin_rate_jk
-
-    z1 += vort[K_V_YZ];
-    z2 += vort[K_V_ZX];
-    z3 += vort[K_V_XY];
-
-    {
-      //   update rotation tensor:
-      //  1) premultiply old rotation tensor to get right-hand side.
-
-      ScalarCompact r_XX = rot[K_F_XX] + dt_half*( z3 * rot[K_F_YX] - z2 * rot[K_F_ZX] );
-      ScalarCompact r_YX = rot[K_F_YX] + dt_half*( z1 * rot[K_F_ZX] - z3 * rot[K_F_XX] );
-      ScalarCompact r_ZX = rot[K_F_ZX] + dt_half*( z2 * rot[K_F_XX] - z1 * rot[K_F_YX] );
-      ScalarCompact r_XY = rot[K_F_XY] + dt_half*( z3 * rot[K_F_YY] - z2 * rot[K_F_ZY] );
-      ScalarCompact r_YY = rot[K_F_YY] + dt_half*( z1 * rot[K_F_ZY] - z3 * rot[K_F_XY] );
-      ScalarCompact r_ZY = rot[K_F_ZY] + dt_half*( z2 * rot[K_F_XY] - z1 * rot[K_F_YY] );
-      ScalarCompact r_XZ = rot[K_F_XZ] + dt_half*( z3 * rot[K_F_YZ] - z2 * rot[K_F_ZZ] );
-      ScalarCompact r_YZ = rot[K_F_YZ] + dt_half*( z1 * rot[K_F_ZZ] - z3 * rot[K_F_XZ] );
-      ScalarCompact r_ZZ = rot[K_F_ZZ] + dt_half*( z2 * rot[K_F_XZ] - z1 * rot[K_F_YZ] );
-
-
-      //  2) solve for new rotation tensor via gauss elimination.
-      //   forward elimination -
-
-      const ScalarCompact a12 = - dt_half * z3;
-      const ScalarCompact a13 =   dt_half * z2;
-            ScalarCompact b32 = - dt_half * z1;
-      const ScalarCompact a22inv = 1.0 / (1.0 + a12 * a12);
-
-      const ScalarCompact a13a12 = a13*a12;
-      const ScalarCompact a23 = b32 + a13a12;
-
-      r_YX += r_XX * a12;
-      r_YY += r_XY * a12;
-      r_YZ += r_XZ * a12;
-
-      b32 = (b32 - a13a12) * a22inv;
-
-      r_ZX += r_XX * a13 + r_YX * b32;
-      r_ZY += r_XY * a13 + r_YY * b32;
-      r_ZZ += r_XZ * a13 + r_YZ * b32;
-
-      //   backward substitution -
-
-      const ScalarCompact a33inv = 1.0 / (1.0 + a13 * a13 + a23 * b32);
-
-      rot[K_F_ZX] = r_ZX * a33inv;
-      rot[K_F_ZY] = r_ZY * a33inv;
-      rot[K_F_ZZ] = r_ZZ * a33inv;
-      rot[K_F_YX] = ( r_YX - rot[K_F_ZX] * a23 ) * a22inv;
-      rot[K_F_YY] = ( r_YY - rot[K_F_ZY] * a23 ) * a22inv;
-      rot[K_F_YZ] = ( r_YZ - rot[K_F_ZZ] * a23 ) * a22inv;
-      rot[K_F_XX] = r_XX - rot[K_F_ZX] * a13 - rot[K_F_YX] * a12;
-      rot[K_F_XY] = r_XY - rot[K_F_ZY] * a13 - rot[K_F_YY] * a12;
-      rot[K_F_XZ] = r_XZ - rot[K_F_ZZ] * a13 - rot[K_F_YZ] * a12;
-    }
-
-    //   update stretch tensor in the new configuration -
-
-    const ScalarCompact a1 = str_ten[K_S_XY] + vort[K_V_XY];
-    const ScalarCompact a2 = str_ten[K_S_YZ] + vort[K_V_YZ];
-    const ScalarCompact a3 = str_ten[K_S_ZX] + vort[K_V_ZX];
-    const ScalarCompact b1 = str_ten[K_S_ZX] - vort[K_V_ZX];
-    const ScalarCompact b2 = str_ten[K_S_XY] - vort[K_V_XY];
-    const ScalarCompact b3 = str_ten[K_S_YZ] - vort[K_V_YZ];
-
-    const ScalarCompact s_XX = stretch[K_S_XX];
-    const ScalarCompact s_YY = stretch[K_S_YY];
-    const ScalarCompact s_ZZ = stretch[K_S_ZZ];
-    const ScalarCompact s_XY = stretch[K_S_XY];
-    const ScalarCompact s_YZ = stretch[K_S_YZ];
-    const ScalarCompact s_ZX = stretch[K_S_ZX];
-
-    stretch[K_S_XX] += dt * (str_ten[K_S_XX] * s_XX + ( a1 + z3 ) * s_XY + ( b1 - z2 ) * s_ZX);
-    stretch[K_S_YY] += dt * (str_ten[K_S_YY] * s_YY + ( a2 + z1 ) * s_YZ + ( b2 - z3 ) * s_XY);
-    stretch[K_S_ZZ] += dt * (str_ten[K_S_ZZ] * s_ZZ + ( a3 + z2 ) * s_ZX + ( b3 - z1 ) * s_YZ);
-    stretch[K_S_XY] += dt * (str_ten[K_S_XX] * s_XY + ( a1 )      * s_YY + ( b1      ) * s_YZ - z3 * s_XX + z1 * s_ZX);
-    stretch[K_S_YZ] += dt * (str_ten[K_S_YY] * s_YZ + ( a2 )      * s_ZZ + ( b2      ) * s_ZX - z1 * s_YY + z2 * s_XY);
-    stretch[K_S_ZX] += dt * (str_ten[K_S_ZZ] * s_ZX + ( a3 )      * s_XX + ( b3      ) * s_XY - z2 * s_ZZ + z3 * s_YZ);
-  }
-
-  //--------------------------------------------------------------------------
-
-  template< typename ScalarCompact >
-  static KOKKOS_INLINE_FUNCTION
-  void rotate_tensor( const ScalarCompact str_ten[] ,
-                      const ScalarCompact rot[] ,
-                            ScalarCompact rot_str[] )
-  {
-    ScalarCompact t[9];
-
-    t[0] = str_ten[K_S_XX]*rot[K_F_XX] + str_ten[K_S_XY]*rot[K_F_YX] + str_ten[K_S_XZ]*rot[K_F_ZX];
-    t[1] = str_ten[K_S_YX]*rot[K_F_XX] + str_ten[K_S_YY]*rot[K_F_YX] + str_ten[K_S_YZ]*rot[K_F_ZX];
-    t[2] = str_ten[K_S_ZX]*rot[K_F_XX] + str_ten[K_S_ZY]*rot[K_F_YX] + str_ten[K_S_ZZ]*rot[K_F_ZX];
-
-    t[3] = str_ten[K_S_XX]*rot[K_F_XY] + str_ten[K_S_XY]*rot[K_F_YY] + str_ten[K_S_XZ]*rot[K_F_ZY];
-    t[4] = str_ten[K_S_YX]*rot[K_F_XY] + str_ten[K_S_YY]*rot[K_F_YY] + str_ten[K_S_YZ]*rot[K_F_ZY];
-    t[5] = str_ten[K_S_ZX]*rot[K_F_XY] + str_ten[K_S_ZY]*rot[K_F_YY] + str_ten[K_S_ZZ]*rot[K_F_ZY];
-
-    t[6] = str_ten[K_S_XX]*rot[K_F_XZ] + str_ten[K_S_XY]*rot[K_F_YZ] + str_ten[K_S_XZ]*rot[K_F_ZZ];
-    t[7] = str_ten[K_S_YX]*rot[K_F_XZ] + str_ten[K_S_YY]*rot[K_F_YZ] + str_ten[K_S_YZ]*rot[K_F_ZZ];
-    t[8] = str_ten[K_S_ZX]*rot[K_F_XZ] + str_ten[K_S_ZY]*rot[K_F_YZ] + str_ten[K_S_ZZ]*rot[K_F_ZZ];
-
-
-    rot_str[ K_S_XX ] = rot[K_F_XX] * t[0] + rot[K_F_YX] * t[1] + rot[K_F_ZX] * t[2];
-    rot_str[ K_S_YY ] = rot[K_F_XY] * t[3] + rot[K_F_YY] * t[4] + rot[K_F_ZY] * t[5];
-    rot_str[ K_S_ZZ ] = rot[K_F_XZ] * t[6] + rot[K_F_YZ] * t[7] + rot[K_F_ZZ] * t[8];
-
-    rot_str[ K_S_XY ] = rot[K_F_XX] * t[3] + rot[K_F_YX] * t[4] + rot[K_F_ZX] * t[5];
-    rot_str[ K_S_YZ ] = rot[K_F_XY] * t[6] + rot[K_F_YY] * t[7] + rot[K_F_ZY] * t[8];
-    rot_str[ K_S_ZX ] = rot[K_F_XZ] * t[0] + rot[K_F_YZ] * t[1] + rot[K_F_ZZ] * t[2];
-  }
-
-  //--------------------------------------------------------------------------
-
-  template< class ScalarPrecise ,
-            class ScalarCompact >
-  static KOKKOS_INLINE_FUNCTION
-  void rotate_tensor_backward( const ScalarPrecise stress[] ,
-                               const ScalarCompact rot[] ,
-                                     ScalarCompact rot_stress[] )
-  {
-    ScalarCompact t[9] ;
-
-    t[0] = stress[K_S_XX]*rot[K_F_XX]+ stress[K_S_XY]*rot[K_F_XY]+ stress[K_S_XZ]*rot[K_F_XZ];
-    t[1] = stress[K_S_YX]*rot[K_F_XX]+ stress[K_S_YY]*rot[K_F_XY]+ stress[K_S_YZ]*rot[K_F_XZ];
-    t[2] = stress[K_S_ZX]*rot[K_F_XX]+ stress[K_S_ZY]*rot[K_F_XY]+ stress[K_S_ZZ]*rot[K_F_XZ];
-    t[3] = stress[K_S_XX]*rot[K_F_YX]+ stress[K_S_XY]*rot[K_F_YY]+ stress[K_S_XZ]*rot[K_F_YZ];
-    t[4] = stress[K_S_YX]*rot[K_F_YX]+ stress[K_S_YY]*rot[K_F_YY]+ stress[K_S_YZ]*rot[K_F_YZ];
-    t[5] = stress[K_S_ZX]*rot[K_F_YX]+ stress[K_S_ZY]*rot[K_F_YY]+ stress[K_S_ZZ]*rot[K_F_YZ];
-    t[6] = stress[K_S_XX]*rot[K_F_ZX]+ stress[K_S_XY]*rot[K_F_ZY]+ stress[K_S_XZ]*rot[K_F_ZZ];
-    t[7] = stress[K_S_YX]*rot[K_F_ZX]+ stress[K_S_YY]*rot[K_F_ZY]+ stress[K_S_YZ]*rot[K_F_ZZ];
-    t[8] = stress[K_S_ZX]*rot[K_F_ZX]+ stress[K_S_ZY]*rot[K_F_ZY]+ stress[K_S_ZZ]*rot[K_F_ZZ];
-
-    rot_stress[ K_S_XX ] = rot[K_F_XX]*t[0] + rot[K_F_XY]*t[1] + rot[K_F_XZ]*t[2];
-    rot_stress[ K_S_YY ] = rot[K_F_YX]*t[3] + rot[K_F_YY]*t[4] + rot[K_F_YZ]*t[5];
-    rot_stress[ K_S_ZZ ] = rot[K_F_ZX]*t[6] + rot[K_F_ZY]*t[7] + rot[K_F_ZZ]*t[8];
-
-    rot_stress[ K_S_XY ] = rot[K_F_XX]*t[3] + rot[K_F_XY]*t[4] + rot[K_F_XZ]*t[5];
-    rot_stress[ K_S_YZ ] = rot[K_F_YX]*t[6] + rot[K_F_YY]*t[7] + rot[K_F_YZ]*t[8];
-    rot_stress[ K_S_ZX ] = rot[K_F_ZX]*t[0] + rot[K_F_ZY]*t[1] + rot[K_F_ZZ]*t[2];
-  }
-
-  //--------------------------------------------------------------------------
-
-  template< class ScalarPrecise ,
-            class ScalarCompact >
-  KOKKOS_INLINE_FUNCTION static
-  void update_stress( const float dt ,
-                      const float two_mu ,
-                      const float bulk_modulus ,
-                      const ScalarCompact rot_str[] ,
-                            ScalarPrecise stress[] )
-  {
-    const ScalarCompact e = rot_str[ K_S_XX ] + rot_str[ K_S_YY ] + rot_str[ K_S_ZZ ] ;
-    const ScalarCompact eb = e * bulk_modulus ;
-    const ScalarCompact e3 = e / 3.0 ;
-
-    stress[K_S_XX] += dt * ( two_mu * ( rot_str[K_S_XX] - e3 ) + eb );
-    stress[K_S_YY] += dt * ( two_mu * ( rot_str[K_S_YY] - e3 ) + eb );
-    stress[K_S_ZZ] += dt * ( two_mu * ( rot_str[K_S_ZZ] - e3 ) + eb );
-
-    stress[K_S_XY] += dt * two_mu * rot_str[K_S_XY];
-    stress[K_S_YZ] += dt * two_mu * rot_str[K_S_YZ];
-    stress[K_S_ZX] += dt * two_mu * rot_str[K_S_ZX];
-  }
-
-  //--------------------------------------------------------------------------
-
-  template< class ScalarPrecise ,
-            class ScalarCompact >
-  static KOKKOS_INLINE_FUNCTION
-  void comp_force( const ScalarPrecise vx[] ,
-                   const ScalarPrecise vy[] ,
-                   const ScalarPrecise vz[] ,
-                   const ScalarCompact grad_x[] ,
-                   const ScalarCompact grad_y[] ,
-                   const ScalarCompact grad_z[] ,
-                   const ScalarCompact total_stress12th[] ,
-                         ScalarCompact force[][ SpatialDim ] ,
-                         ScalarCompact & energy )
-  {
-    ScalarPrecise internal_energy = 0 ;
-
-    for ( unsigned inode = 0; inode < ElemNodeCount ; ++inode ) {
-
-      force[inode][0] = total_stress12th[K_S_XX] * grad_x[inode] +
-                        total_stress12th[K_S_XY] * grad_y[inode] +
-                        total_stress12th[K_S_XZ] * grad_z[inode] ;
-
-      force[inode][1] = total_stress12th[K_S_YX] * grad_x[inode] +
-                        total_stress12th[K_S_YY] * grad_y[inode] +
-                        total_stress12th[K_S_YZ] * grad_z[inode] ;
-
-      force[inode][2] = total_stress12th[K_S_ZX] * grad_x[inode] +
-                        total_stress12th[K_S_ZY] * grad_y[inode] +
-                        total_stress12th[K_S_ZZ] * grad_z[inode] ;
-
-      internal_energy += force[inode][0] * vx[inode] +
-                         force[inode][1] * vy[inode] +
-                         force[inode][2] * vz[inode] ;
-    }
-
-    energy = internal_energy ;
-  }
-
-  //--------------------------------------------------------------------------
-};
-
-} // namespace Explicit
-
-#endif /* #ifndef KOKKOS_HEXEXPLICITFUNCTIONS_HPP */
-
diff --git a/lib/kokkos/example/multi_fem/Implicit.hpp b/lib/kokkos/example/multi_fem/Implicit.hpp
deleted file mode 100644
index f129c59546..0000000000
--- a/lib/kokkos/example/multi_fem/Implicit.hpp
+++ /dev/null
@@ -1,341 +0,0 @@
-/*
-//@HEADER
-// ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
-// the U.S. Government retains certain rights in this software.
-// 
-// 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 Corporation nor the names of the
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "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 SANDIA CORPORATION OR THE
-// 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.
-//
-// Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
-// ************************************************************************
-//@HEADER
-*/
-
-#ifndef HYBRIDFEM_IMPLICIT_HPP
-#define HYBRIDFEM_IMPLICIT_HPP
-
-#include <utility>
-#include <iostream>
-#include <iomanip>
-
-#include <Kokkos_Core.hpp>
-#include <SparseLinearSystem.hpp>
-#include <SparseLinearSystemFill.hpp>
-#include <ImplicitFunctors.hpp>
-#include <FEMesh.hpp>
-
-//----------------------------------------------------------------------------
-//----------------------------------------------------------------------------
-
-namespace HybridFEM {
-namespace Implicit {
-
-struct PerformanceData {
-  double mesh_time ;
-  double graph_time ;
-  double elem_time ;
-  double matrix_gather_fill_time ;
-  double matrix_boundary_condition_time ;
-  double cg_iteration_time ;
-
-  PerformanceData()
-    : mesh_time(0)
-    , graph_time(0)
-    , elem_time(0)
-    , matrix_gather_fill_time(0)
-    , matrix_boundary_condition_time(0)
-    , cg_iteration_time(0)
-    {}
-
-  void best( const PerformanceData & rhs )
-  {
-    mesh_time = std::min( mesh_time , rhs.mesh_time );
-    graph_time = std::min( graph_time , rhs.graph_time );
-    elem_time = std::min( elem_time , rhs.elem_time );
-    matrix_gather_fill_time = std::min( matrix_gather_fill_time , rhs.matrix_gather_fill_time );
-    matrix_boundary_condition_time = std::min( matrix_boundary_condition_time , rhs.matrix_boundary_condition_time );
-    cg_iteration_time = std::min( cg_iteration_time , rhs.cg_iteration_time );
-  }
-};
-
-//----------------------------------------------------------------------------
-
-template< typename Scalar , class FixtureType >
-PerformanceData run( const typename FixtureType::FEMeshType & mesh ,
-                     const int , // global_max_x ,
-                     const int , // global_max_y ,
-                     const int global_max_z ,
-                     const bool print_sample )
-{
-  typedef Scalar                              scalar_type ;
-  typedef FixtureType                         fixture_type ;
-  typedef typename fixture_type::execution_space  execution_space;
-  //typedef typename execution_space::size_type     size_type ; // unused
-
-  typedef typename fixture_type::FEMeshType mesh_type ;
-  typedef typename fixture_type::coordinate_scalar_type coordinate_scalar_type ;
-
-  enum { ElementNodeCount = fixture_type::element_node_count };
-
-  const comm::Machine machine = mesh.parallel_data_map.machine ;
-
-  const size_t element_count = mesh.elem_node_ids.dimension_0();
-
-  const size_t iteration_limit = 200 ;
-  const double residual_tolerance = 1e-14 ;
-
-  size_t iteration_count = 0 ;
-  double residual_norm = 0 ;
-
-  PerformanceData perf_data ;
-
-  //------------------------------------
-  // Sparse linear system types:
-
-  typedef Kokkos::View< scalar_type* , execution_space >   vector_type ;
-  typedef Kokkos::CrsMatrix< scalar_type , execution_space >     matrix_type ;
-  typedef typename matrix_type::graph_type         matrix_graph_type ;
-  typedef typename matrix_type::coefficients_type  matrix_coefficients_type ;
-
-  typedef GraphFactory< matrix_graph_type , mesh_type > graph_factory ;
-
-  //------------------------------------
-  // Problem setup types:
-
-  typedef ElementComputation< scalar_type , scalar_type , execution_space > ElementFunctor ;
-  typedef DirichletBoundary< scalar_type , scalar_type , execution_space > BoundaryFunctor ;
-
-  typedef typename ElementFunctor::elem_matrices_type elem_matrices_type ;
-  typedef typename ElementFunctor::elem_vectors_type  elem_vectors_type ;
-
-  typedef GatherFill< matrix_type ,
-                      mesh_type ,
-                      elem_matrices_type ,
-                      elem_vectors_type > GatherFillFunctor ;
-
-  //------------------------------------
-
-  const scalar_type elem_coeff_K = 2 ;
-  const scalar_type elem_load_Q  = 1 ;
-
-  matrix_type linsys_matrix ;
-  vector_type linsys_rhs ;
-  vector_type linsys_solution ;
-
-  typename graph_factory::element_map_type element_map ;
-
-  Kokkos::Timer wall_clock ;
-
-  //------------------------------------
-  // Generate sparse matrix graph and element->graph map.
-
-  graph_factory::create( mesh , linsys_matrix.graph , element_map );
-
-  execution_space().fence();
-  perf_data.graph_time = comm::max( machine , wall_clock.seconds() );
-
-  //------------------------------------
-  // Allocate linear system coefficients and rhs:
-
-  const size_t local_owned_length =
-    linsys_matrix.graph.row_map.dimension_0() - 1 ;
-
-  linsys_matrix.coefficients =
-    matrix_coefficients_type( "coeff" , linsys_matrix.graph.entries.dimension_0() );
-
-  linsys_rhs      = vector_type( "rhs" , local_owned_length );
-  linsys_solution = vector_type( "solution" , local_owned_length );
-
-  //------------------------------------
-  // Fill linear system
-  {
-    elem_matrices_type elem_matrices ;
-    elem_vectors_type  elem_vectors ;
-
-    if ( element_count ) {
-      elem_matrices = elem_matrices_type( std::string("elem_matrices"), element_count );
-      elem_vectors  = elem_vectors_type ( std::string("elem_vectors"), element_count );
-    }
-
-    //------------------------------------
-    // Compute element matrices and vectors:
-
-    wall_clock.reset();
-
-    ElementFunctor::apply( mesh ,
-                           elem_matrices , elem_vectors ,
-                           elem_coeff_K , elem_load_Q );
-
-    execution_space().fence();
-    perf_data.elem_time = comm::max( machine , wall_clock.seconds() );
-
-    //------------------------------------
-    // Fill linear system coefficients:
-
-    wall_clock.reset();
-
-    GatherFillFunctor::apply( linsys_matrix , linsys_rhs ,
-               mesh , element_map , elem_matrices , elem_vectors );
-
-    execution_space().fence();
-    perf_data.matrix_gather_fill_time = comm::max( machine , wall_clock.seconds() );
-
-    // Apply boundary conditions:
-
-    wall_clock.reset();
-
-    BoundaryFunctor::apply( linsys_matrix , linsys_rhs , mesh ,
-                            0 , global_max_z , 0 , global_max_z );
-
-    execution_space().fence();
-    perf_data.matrix_boundary_condition_time = comm::max( machine , wall_clock.seconds() );
-  }
-
-  //------------------------------------
-  // Solve linear sytem
-
-  cgsolve( mesh.parallel_data_map ,
-           linsys_matrix , linsys_rhs , linsys_solution ,
-           iteration_count , residual_norm ,
-           perf_data.cg_iteration_time ,
-           iteration_limit , residual_tolerance );
-
-  //------------------------------------
-
-  if ( print_sample ) {
-
-    typename mesh_type::node_coords_type::HostMirror coords_h =
-      Kokkos::create_mirror( mesh.node_coords );
-
-    typename vector_type::HostMirror X_h =
-      Kokkos::create_mirror( linsys_solution );
-
-    Kokkos::deep_copy( coords_h , mesh.node_coords );
-    Kokkos::deep_copy( X_h , linsys_solution );
-
-    for ( size_t i = 0 ; i < mesh.parallel_data_map.count_owned ; ++i ) {
-      const coordinate_scalar_type x = coords_h(i,0);
-      const coordinate_scalar_type y = coords_h(i,1);
-      const coordinate_scalar_type z = coords_h(i,2);
-
-      if ( x <= 0 && y <= 0 ) {
-        std::cout << "  node( " << x << " " << y << " " << z << " ) = "
-                  << X_h(i) << std::endl ;
-      }
-    }
-  }
-
-  return perf_data ;
-}
-
-//----------------------------------------------------------------------------
-
-template< typename Scalar , class Device >
-void driver( const char * const label ,
-             comm::Machine machine ,
-             const int gang_count ,
-             const int elem_count_beg ,
-             const int elem_count_end ,
-             const int runs )
-{
-  typedef Scalar              scalar_type ;
-  typedef Device              execution_space ;
-  typedef double              coordinate_scalar_type ;
-  typedef FixtureElementHex8  fixture_element_type ;
-
-  typedef BoxMeshFixture< coordinate_scalar_type ,
-                          execution_space ,
-                          fixture_element_type > fixture_type ;
-
-  typedef typename fixture_type::FEMeshType mesh_type ;
-
-  const size_t proc_count = comm::size( machine );
-  const size_t proc_rank  = comm::rank( machine );
-
-  if ( elem_count_beg == 0 || elem_count_end == 0 || runs == 0 ) return ;
-
-  if ( comm::rank( machine ) == 0 ) {
-    std::cout << std::endl ;
-    std::cout << "\"Kokkos::HybridFE::Implicit " << label << "\"" << std::endl;
-    std::cout << "\"Size\" ,  \"Graphing\" , \"Element\" , \"Fill\" ,   \"Boundary\" ,  \"CG-Iter\"" << std::endl
-              << "\"elems\" , \"millisec\" , \"millisec\" , \"millisec\" , \"millisec\" , \"millisec\"" << std::endl ;
-  }
-
-  for(int i = elem_count_beg ; i < elem_count_end ; i *= 2 )
-  {
-    const int ix = std::max( 1 , (int) cbrt( ((double) i) / 2.0 ) );
-    const int iy = ix + 1 ;
-    const int iz = 2 * iy ;
-    const int n  = ix * iy * iz ;
-
-    mesh_type mesh =
-      fixture_type::create( proc_count , proc_rank , gang_count ,
-                            ix , iy , iz );
-
-    mesh.parallel_data_map.machine = machine ;
-
-    PerformanceData perf_data , perf_best ;
-
-    for(int j = 0; j < runs; j++){
-
-     perf_data = run<scalar_type,fixture_type>(mesh,ix,iy,iz, false );
-
-     if( j == 0 ) {
-       perf_best = perf_data ;
-     }
-     else {
-       perf_best.best( perf_data );
-     }
-   }
-
-  if ( comm::rank( machine ) == 0 ) {
-
-     std::cout << std::setw(8) << n << " , "
-               << std::setw(10) << perf_best.graph_time * 1000 << " , "
-               << std::setw(10) << perf_best.elem_time * 1000 << " , "
-               << std::setw(10) << perf_best.matrix_gather_fill_time * 1000 << " , "
-               << std::setw(10) << perf_best.matrix_boundary_condition_time * 1000 << " , "
-               << std::setw(10) << perf_best.cg_iteration_time * 1000
-               << std::endl ;
-    }
-  }
-}
-
-//----------------------------------------------------------------------------
-
-} /* namespace Implicit */
-} /* namespace HybridFEM */
-
-
-#endif /* #ifndef HYBRIDFEM_IMPLICIT_HPP */
-
diff --git a/lib/kokkos/example/multi_fem/ImplicitFunctors.hpp b/lib/kokkos/example/multi_fem/ImplicitFunctors.hpp
deleted file mode 100644
index 4855939bb8..0000000000
--- a/lib/kokkos/example/multi_fem/ImplicitFunctors.hpp
+++ /dev/null
@@ -1,585 +0,0 @@
-/*
-//@HEADER
-// ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
-// the U.S. Government retains certain rights in this software.
-// 
-// 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 Corporation nor the names of the
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "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 SANDIA CORPORATION OR THE
-// 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.
-//
-// Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
-// ************************************************************************
-//@HEADER
-*/
-
-#include <iostream>
-#include <fstream>
-#include <iomanip>
-#include <cstdlib>
-#include <cmath>
-
-namespace HybridFEM {
-namespace Implicit {
-
-//----------------------------------------------------------------------------
-
-template< typename Scalar , unsigned Dim , unsigned N >
-struct TensorIntegration ;
-
-template<typename Scalar >
-struct TensorIntegration<Scalar,1,1> {
-  Scalar pts[1] ;
-  Scalar wts[1] ;
-
-  TensorIntegration() { pts[0] = 0 ; wts[0] = 2 ; }
-};
-
-template<typename Scalar >
-struct TensorIntegration<Scalar,1,2>
-{
-  Scalar pts[2] ;
-  Scalar wts[2] ;
-
-  TensorIntegration()
-  {
-    const Scalar x2 = 0.577350269 ;
-    pts[0] = -x2; wts[0] = 1.0;
-    pts[1] =  x2; wts[1] = 1.0;
-  }
-};
-
-template<typename Scalar >
-struct TensorIntegration<Scalar,1,3>
-{
-  Scalar pts[3] ;
-  Scalar wts[3] ;
-
-  TensorIntegration()
-  {
-    const Scalar x3 = 0.774596669 ;
-    const Scalar w1 = 0.555555556 ;
-    const Scalar w2 = 0.888888889 ;
-    pts[0] =  -x3 ;  wts[0] = w1 ;
-    pts[1] =    0 ;  wts[1] = w2 ;
-    pts[2] =   x3 ;  wts[2] = w1 ;
-  }
-};
-
-template< typename Scalar , unsigned Order >
-struct TensorIntegration<Scalar,3,Order>
-{
-  static const unsigned N = Order * Order * Order ;
-
-  Scalar pts[N][3] ;
-  Scalar wts[N];
-
-  TensorIntegration()
-  {
-    TensorIntegration<Scalar,1,Order> oneD ;
-
-    unsigned n = 0 ;
-    for ( unsigned k = 0 ; k < Order ; ++k ) {
-    for ( unsigned j = 0 ; j < Order ; ++j ) {
-    for ( unsigned i = 0 ; i < Order ; ++i , ++n ) {
-      pts[n][0] = oneD.pts[i] ;
-      pts[n][1] = oneD.pts[j] ;
-      pts[n][2] = oneD.pts[k] ;
-      wts[n] = oneD.wts[i] * oneD.wts[j] * oneD.wts[k] ;
-    }}}
-  }
-};
-
-//----------------------------------------------------------------------------
-
-template< typename Scalar >
-struct ShapeFunctionEvaluation {
-
-  static const unsigned FunctionCount = 8 ;
-  static const unsigned SpatialDimension = 3 ;
-  static const unsigned IntegrationOrder = 2 ;
-
-  typedef TensorIntegration< Scalar , SpatialDimension , IntegrationOrder > 
-    TensorIntegrationType ;
-
-  static const unsigned PointCount = TensorIntegrationType::N ;
-
-  Scalar value   [ PointCount ][ FunctionCount ] ;
-  Scalar gradient[ PointCount ][ FunctionCount * SpatialDimension ];
-  Scalar weight  [ PointCount ];
-
-  ShapeFunctionEvaluation()
-  {
-    const TensorIntegration< Scalar , SpatialDimension , IntegrationOrder > 
-      integration ;
-
-    const Scalar ONE8TH = 0.125 ;
-
-    for ( unsigned i = 0 ; i < PointCount ; ++i ) {
-
-      const Scalar u = 1.0 - integration.pts[i][0];
-      const Scalar v = 1.0 - integration.pts[i][1];
-      const Scalar w = 1.0 - integration.pts[i][2];
-
-      const Scalar up1 = 1.0 + integration.pts[i][0];
-      const Scalar vp1 = 1.0 + integration.pts[i][1];
-      const Scalar wp1 = 1.0 + integration.pts[i][2];
-
-      weight[i] = integration.wts[i] ;
-
-      // Vaues:
-      value[i][0] = ONE8TH *   u *   v *  w ;
-      value[i][1] = ONE8TH * up1 *   v *  w ;
-      value[i][2] = ONE8TH * up1 * vp1 *  w ;
-      value[i][3] = ONE8TH *   u * vp1 *  w ;
-
-      value[i][4] = ONE8TH *   u *   v *  wp1 ;
-      value[i][5] = ONE8TH * up1 *   v *  wp1 ;
-      value[i][6] = ONE8TH * up1 * vp1 *  wp1 ;
-      value[i][7] = ONE8TH *   u * vp1 *  wp1 ;
-
-      //fn 0 = u * v * w
-      gradient[i][ 0] = ONE8TH * -1  *  v  *  w  ;
-      gradient[i][ 1] = ONE8TH *  u  * -1  *  w  ;
-      gradient[i][ 2] = ONE8TH *  u  *  v  * -1  ;
-
-      //fn 1 = up1 * v * w
-      gradient[i][ 3] = ONE8TH *  1  *  v  *  w  ;
-      gradient[i][ 4] = ONE8TH * up1 * -1  *  w  ;
-      gradient[i][ 5] = ONE8TH * up1 *  v  * -1  ;
-
-      //fn 2 = up1 * vp1 * w
-      gradient[i][ 6] = ONE8TH *  1  * vp1 *  w ;
-      gradient[i][ 7] = ONE8TH * up1 *  1  *  w ;
-      gradient[i][ 8] = ONE8TH * up1 * vp1 * -1 ;
-
-      //fn 3 = u * vp1 * w
-      gradient[i][ 9] = ONE8TH * -1 * vp1 *  w ;
-      gradient[i][10] = ONE8TH *  u *  1  *  w ;
-      gradient[i][11] = ONE8TH *  u * vp1 * -1 ;
-
-      //fn 4 = u * v * wp1
-      gradient[i][12] = ONE8TH * -1  *  v  * wp1 ;
-      gradient[i][13] = ONE8TH *  u  * -1  * wp1 ;
-      gradient[i][14] = ONE8TH *  u  *  v  *  1  ;
-
-      //fn 5 = up1 * v * wp1
-      gradient[i][15] = ONE8TH *  1  *  v  * wp1 ;
-      gradient[i][16] = ONE8TH * up1 * -1  * wp1 ;
-      gradient[i][17] = ONE8TH * up1 *  v  *  1  ;
-
-      //fn 6 = up1 * vp1 * wp1
-      gradient[i][18] = ONE8TH *  1  * vp1 * wp1 ;
-      gradient[i][19] = ONE8TH * up1 *  1  * wp1 ;
-      gradient[i][20] = ONE8TH * up1 * vp1 *  1 ;
-
-      //fn 7 = u * vp1 * wp1
-      gradient[i][21] = ONE8TH * -1 * vp1 * wp1 ;
-      gradient[i][22] = ONE8TH *  u *  1  * wp1 ;
-      gradient[i][23] = ONE8TH *  u * vp1 *  1 ;
-    }
-  }
-};
-
-//----------------------------------------------------------------------------
-
-template< typename ScalarType , typename ScalarCoordType , class DeviceType >
-struct ElementComputation
-{
-  typedef DeviceType     execution_space;
-  typedef ScalarType              scalar_type ;
-  typedef typename execution_space::size_type  size_type ;
-
-  static const size_type ElementNodeCount = 8 ;
-
-  typedef FEMesh< ScalarCoordType , ElementNodeCount , execution_space > mesh_type ;
-  typedef Kokkos::View< scalar_type[][ElementNodeCount][ElementNodeCount] , execution_space > elem_matrices_type ;
-  typedef Kokkos::View< scalar_type[][ElementNodeCount] , execution_space > elem_vectors_type ;
-
-  typedef ShapeFunctionEvaluation< scalar_type > shape_function_data ;
-
-  static const unsigned SpatialDim    = shape_function_data::SpatialDimension ;
-  static const unsigned FunctionCount = shape_function_data::FunctionCount ;
-
-private:
-
-  const shape_function_data               shape_eval ;
-  typename mesh_type::elem_node_ids_type  elem_node_ids ;
-  typename mesh_type::node_coords_type    node_coords ;
-  elem_matrices_type                      element_matrices ;
-  elem_vectors_type                       element_vectors ;
-  scalar_type                             coeff_K ;
-  scalar_type                             coeff_Q ;
-
-  ElementComputation( const mesh_type   & arg_mesh ,
-                      const elem_matrices_type  & arg_element_matrices , 
-                      const elem_vectors_type   & arg_element_vectors ,
-                      const scalar_type   arg_coeff_K ,
-                      const scalar_type   arg_coeff_Q )
-  : shape_eval()
-  , elem_node_ids( arg_mesh.elem_node_ids )
-  , node_coords(   arg_mesh.node_coords )
-  , element_matrices( arg_element_matrices )
-  , element_vectors( arg_element_vectors )
-  , coeff_K( arg_coeff_K )
-  , coeff_Q( arg_coeff_Q )
-  {}
-
-public:
-
-  static void apply( const mesh_type  & mesh ,
-                     const elem_matrices_type & elem_matrices ,
-                     const elem_vectors_type  & elem_vectors ,
-                     const scalar_type  elem_coeff_K ,
-                     const scalar_type  elem_coeff_Q )
-  {
-    ElementComputation comp( mesh , elem_matrices , elem_vectors , elem_coeff_K , elem_coeff_Q );
-    const size_t elem_count = mesh.elem_node_ids.dimension_0();
-
-    parallel_for( elem_count , comp );
-  }
-
-  //------------------------------------
-
-  static const unsigned FLOPS_jacobian =
-    FunctionCount * SpatialDim * SpatialDim * 2 ;
-
-  KOKKOS_INLINE_FUNCTION
-  void jacobian( const ScalarCoordType * x, 
-                 const ScalarCoordType * y, 
-                 const ScalarCoordType * z, 
-                 const scalar_type * grad_vals, 
-                 scalar_type * J) const
-  {
-    int i_grad = 0 ;
-
-    for( unsigned i = 0; i < ElementNodeCount ; ++i , i_grad += SpatialDim ) {
-      const scalar_type g0 = grad_vals[ i_grad ];
-      const scalar_type g1 = grad_vals[ i_grad + 1 ];
-      const scalar_type g2 = grad_vals[ i_grad + 2 ];
-      const scalar_type x0 = x[i] ;
-      const scalar_type x1 = y[i] ;
-      const scalar_type x2 = z[i] ;
-
-      J[0] += g0 * x0 ;
-      J[1] += g0 * x1 ;
-      J[2] += g0 * x2 ;
-
-      J[3] += g1 * x0 ;
-      J[4] += g1 * x1 ;
-      J[5] += g1 * x2 ;
-
-      J[6] += g2 * x0 ;
-      J[7] += g2 * x1 ;
-      J[8] += g2 * x2 ;
-    }
-  }
-
-  //------------------------------------
-
-  static const unsigned FLOPS_inverse_and_det = 46 ;
-
-  KOKKOS_INLINE_FUNCTION
-  scalar_type inverse_and_determinant3x3( scalar_type * const J ) const
-  {
-    const scalar_type J00 = J[0];
-    const scalar_type J01 = J[1];
-    const scalar_type J02 = J[2];
-
-    const scalar_type J10 = J[3];
-    const scalar_type J11 = J[4];
-    const scalar_type J12 = J[5];
-
-    const scalar_type J20 = J[6];
-    const scalar_type J21 = J[7];
-    const scalar_type J22 = J[8];
-
-    const scalar_type term0 = J22*J11 - J21*J12;
-    const scalar_type term1 = J22*J01 - J21*J02;
-    const scalar_type term2 = J12*J01 - J11*J02;
-
-    const scalar_type detJ = J00*term0 - J10*term1 + J20*term2;
-    const scalar_type inv_detJ = 1.0/detJ;
-
-    J[0] =  term0*inv_detJ;
-    J[1] = -term1*inv_detJ;
-    J[2] =  term2*inv_detJ;
-
-    J[3] = -(J22*J10 - J20*J12)*inv_detJ;
-    J[4] =  (J22*J00 - J20*J02)*inv_detJ;
-    J[5] = -(J12*J00 - J10*J02)*inv_detJ;
-
-    J[6] =  (J21*J10 - J20*J11)*inv_detJ;
-    J[7] = -(J21*J00 - J20*J01)*inv_detJ;
-    J[8] =  (J11*J00 - J10*J01)*inv_detJ;
-
-    return detJ ;
-  }
-
-  //------------------------------------
-
-  KOKKOS_INLINE_FUNCTION
-  void matTransMat3x3_X_3xn( const scalar_type * A, int n,
-                             const scalar_type * B,
-                             scalar_type * C ) const
-  {
-    //A is 3x3, B is 3xn. So C is also 3xn.
-    //A,B,C are all assumed to be ordered such that columns are contiguous.
-
-    scalar_type * Cj = C;
-    const scalar_type * Bj = B;
-
-    for(int j=0; j<n; ++j) {
-      Cj[0] = A[0]*Bj[0] + A[1]*Bj[1] + A[2]*Bj[2];
-      Cj[1] = A[3]*Bj[0] + A[4]*Bj[1] + A[5]*Bj[2];
-      Cj[2] = A[6]*Bj[0] + A[7]*Bj[1] + A[8]*Bj[2];
-      Bj += 3;
-      Cj += 3;
-    }
-
-  }
-  //------------------------------------
-
-  static const unsigned FLOPS_contributeDiffusionMatrix = FunctionCount * ( 3 * 5 + FunctionCount * 7 ) ;
-
-  KOKKOS_INLINE_FUNCTION
-  void contributeDiffusionMatrix(
-    const scalar_type weight ,
-    const scalar_type grad_vals[] ,
-    const scalar_type invJ[] ,
-    scalar_type elem_mat[][8] ) const
-  {
-    scalar_type dpsidx[8], dpsidy[8], dpsidz[8];
-
-    int i_grad = 0 ;
-    for( unsigned i = 0; i < FunctionCount ; ++i , i_grad += 3 ) {
-      const scalar_type g0 = grad_vals[i_grad+0];
-      const scalar_type g1 = grad_vals[i_grad+1];
-      const scalar_type g2 = grad_vals[i_grad+2];
-
-      dpsidx[i] = g0 * invJ[0] + g1 * invJ[1] + g2 * invJ[2];
-      dpsidy[i] = g0 * invJ[3] + g1 * invJ[4] + g2 * invJ[5];
-      dpsidz[i] = g0 * invJ[6] + g1 * invJ[7] + g2 * invJ[8];
-    }
-
-    for( unsigned m = 0; m < FunctionCount; m++) {
-      for( unsigned n = 0; n < FunctionCount; n++) {
-
-        elem_mat[m][n] += weight * 
-          ((dpsidx[m] * dpsidx[n]) + 
-           (dpsidy[m] * dpsidy[n]) +
-           (dpsidz[m] * dpsidz[n]));            
-      }
-    }
-  }
-
-  //------------------------------------
-
-  static const unsigned FLOPS_contributeSourceVector = FunctionCount * 2 ;
-
-  KOKKOS_INLINE_FUNCTION
-  void contributeSourceVector( const scalar_type term ,
-                               const scalar_type psi[] ,
-                               scalar_type elem_vec[] ) const
-  {
-     for( unsigned i=0; i< FunctionCount ; ++i) {
-       elem_vec[i] += psi[i] * term ;
-     }
-  }
-
-
-  static const unsigned FLOPS_operator =
-           shape_function_data::PointCount * ( 3
-             + FLOPS_jacobian
-             + FLOPS_inverse_and_det
-             + FLOPS_contributeDiffusionMatrix
-             + FLOPS_contributeSourceVector ) ;
-
-  KOKKOS_INLINE_FUNCTION
-  void operator()( int ielem )const {
-
-    scalar_type elem_vec[8] = { 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 };
-    scalar_type elem_mat[8][8] =
-      { { 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 , 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 , 0 , 0 , 0 , 0 , 0 , 0 } };
-
-    ScalarCoordType x[8], y[8], z[8];
-
-    for ( int i = 0 ; i < 8 ; ++i ) {
-      const int node_index = elem_node_ids( ielem , i );
-      x[i] = node_coords( node_index , 0 );
-      y[i] = node_coords( node_index , 1 );
-      z[i] = node_coords( node_index , 2 );
-    }
-
-    // This loop could be parallelized; however,
-    // it would require additional per-thread temporaries
-    // of 'elem_vec' and 'elem_mat' which would
-    // consume more local memory and have to be reduced.
-
-    for ( unsigned i = 0 ; i < shape_function_data::PointCount ; ++i ) {
-
-      scalar_type J[SpatialDim*SpatialDim] = { 0, 0, 0,  0, 0, 0,  0, 0, 0 };
-
-      jacobian( x, y, z, shape_eval.gradient[i] , J );
-
-      // Overwrite J with its inverse to save scratch memory space.
-      const scalar_type detJ_w   = shape_eval.weight[i] * inverse_and_determinant3x3(J);
-      const scalar_type k_detJ_w = coeff_K * detJ_w ;
-      const scalar_type Q_detJ_w = coeff_Q * detJ_w ;
-
-      contributeDiffusionMatrix( k_detJ_w , shape_eval.gradient[i] , J , elem_mat );
-
-      contributeSourceVector( Q_detJ_w , shape_eval.value[i] , elem_vec );
-    }
-
-    for( size_type i=0; i< ElementNodeCount ; ++i) {
-      element_vectors(ielem, i) = elem_vec[i] ;
-    }
-
-    for( size_type i = 0; i < ElementNodeCount ; i++){
-      for( size_type j = 0; j < ElementNodeCount ; j++){
-        element_matrices(ielem, i, j) = elem_mat[i][j] ;
-      }
-    }
-  }
-}; /* ElementComputation */
-
-//----------------------------------------------------------------------------
-
-template< typename ScalarType , typename ScalarCoordType , class DeviceType >
-struct DirichletBoundary
-{
-  typedef DeviceType     execution_space;
-  typedef typename execution_space::size_type  size_type ;
-
-  static const size_type ElementNodeCount = 8 ;
-
-  typedef Kokkos::CrsMatrix< ScalarType , execution_space >    matrix_type ;
-  typedef Kokkos::View< ScalarType[] , execution_space >  vector_type ;
-
-  typedef FEMesh< ScalarCoordType , ElementNodeCount , execution_space > mesh_type ;
-
-  typename mesh_type::node_coords_type node_coords ;
-  matrix_type     matrix ;
-  vector_type     rhs ;
-  ScalarCoordType bc_lower_z ;
-  ScalarCoordType bc_upper_z ;
-  ScalarType      bc_lower_value ;
-  ScalarType      bc_upper_value ;
-
-  KOKKOS_INLINE_FUNCTION
-  void operator()( size_type inode ) const
-  {
-    //  Apply a dirichlet boundary condition to 'irow'
-    //  to maintain the symmetry of the original 
-    //  global stiffness matrix, zero out the columns
-    //  that correspond to boundary conditions, and
-    //  adjust the load vector accordingly
-
-    const size_type iBeg = matrix.graph.row_map[inode];
-    const size_type iEnd = matrix.graph.row_map[inode+1];
-
-    const ScalarCoordType z = node_coords(inode,2);
-    const bool bc_lower = z <= bc_lower_z ;
-    const bool bc_upper = bc_upper_z <= z ;
-
-    if ( bc_lower || bc_upper ) {
-      const ScalarType bc_value = bc_lower ? bc_lower_value
-                                           : bc_upper_value ;
-
-      rhs(inode) = bc_value ; //  set the rhs vector
-
-      //  zero each value on the row, and leave a one
-      //  on the diagonal
-
-      for( size_type i = iBeg ; i < iEnd ; i++) {
-        matrix.coefficients(i) =
-          (int) inode == matrix.graph.entries(i) ? 1 : 0 ;
-      }
-    }
-    else {
-      //  Find any columns that are boundary conditions.
-      //  Clear them and adjust the load vector
-
-      for( size_type i = iBeg ; i < iEnd ; i++ ) {
-        const size_type cnode = matrix.graph.entries(i) ;
-
-        const ScalarCoordType zc = node_coords(cnode,2);
-        const bool c_bc_lower = zc <= bc_lower_z ;
-        const bool c_bc_upper = bc_upper_z <= zc ;
-
-        if ( c_bc_lower || c_bc_upper ) {
-
-          const ScalarType c_bc_value = c_bc_lower ? bc_lower_value
-                                                   : bc_upper_value ;
-
-          rhs( inode ) -= c_bc_value * matrix.coefficients(i);
-
-          matrix.coefficients(i) = 0 ;
-        }
-      }
-    }
-  }
-
-
-  static void apply( const matrix_type & linsys_matrix ,
-                     const vector_type & linsys_rhs ,
-                     const mesh_type   & mesh ,
-                     const ScalarCoordType  bc_lower_z ,
-                     const ScalarCoordType  bc_upper_z ,
-                     const ScalarType       bc_lower_value ,
-                     const ScalarType       bc_upper_value )
-  {
-    const size_t row_count = linsys_matrix.graph.row_map.dimension_0() - 1 ;
-    DirichletBoundary op ;
-    op.node_coords    = mesh.node_coords ;
-    op.matrix         = linsys_matrix ;
-    op.rhs            = linsys_rhs ;
-    op.bc_lower_z     = bc_lower_z ;
-    op.bc_upper_z     = bc_upper_z ;
-    op.bc_lower_value = bc_lower_value ;
-    op.bc_upper_value = bc_upper_value ;
-    parallel_for( row_count , op );
-  }
-};
-
-//----------------------------------------------------------------------------
-
-} /* namespace Implicit */
-} /* namespace HybridFEM */
-
diff --git a/lib/kokkos/example/multi_fem/LinAlgBLAS.hpp b/lib/kokkos/example/multi_fem/LinAlgBLAS.hpp
deleted file mode 100644
index 5e2292b32a..0000000000
--- a/lib/kokkos/example/multi_fem/LinAlgBLAS.hpp
+++ /dev/null
@@ -1,567 +0,0 @@
-/*
-//@HEADER
-// ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
-// the U.S. Government retains certain rights in this software.
-// 
-// 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 Corporation nor the names of the
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "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 SANDIA CORPORATION OR THE
-// 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.
-//
-// Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
-// ************************************************************************
-//@HEADER
-*/
-
-#ifndef USESCASES_LINALG_BLAS_HPP
-#define USESCASES_LINALG_BLAS_HPP
-
-#include <cmath>
-#include <utility>
-#include <ParallelComm.hpp>
-#include <Kokkos_Core.hpp>
-
-//----------------------------------------------------------------------------
-//----------------------------------------------------------------------------
-
-namespace Kokkos {
-namespace Impl {
-
-template< class Scalar , class Layout , class DeviceType > struct Dot ;
-
-template< class Scalar , class Layout , class DeviceType > struct Dot1 ;
-
-template< typename ScalarA ,
-          typename ScalarY ,
-          class Layout , class Device >
-struct Scale ;
-
-template< typename ScalarA ,
-          typename ScalarY ,
-          class Layout , class Device >
-struct Fill ;
-
-template< typename ScalarA ,
-          typename ScalarX ,
-          typename ScalarY ,
-          class Layout , class Device >
-struct AXPY ;
-
-template< typename ScalarX ,
-          typename ScalarB ,
-          typename ScalarY ,
-          class Layout , class Device >
-struct XPBY ;
-
-template< typename ScalarA ,
-          typename ScalarX ,
-          typename ScalarB ,
-          typename ScalarY ,
-          typename ScalarW ,
-          class Layout , class Device >
-struct WAXPBY ;
-
-}
-}
-
-//----------------------------------------------------------------------------
-//----------------------------------------------------------------------------
-
-namespace Kokkos {
-
-//----------------------------------------------------------------------------
-
-#if defined( KOKKOS_ENABLE_MPI )
-
-template< typename ScalarX /* Allow mix of const and non-const */ ,
-          typename ScalarY /* Allow mix of const and non-const */ ,
-          class D>
-inline
-double dot( const size_t n ,
-            const View< ScalarX * , D > & x ,
-            const View< ScalarY * , D > & y ,
-            comm::Machine machine )
-{
-  double global_result = 0 ;
-  double local_result = 0 ;
-  using x_type = View<ScalarX*, D>;
-  using L = typename x_type::array_layout;
-
-  Impl::Dot< ScalarX , L , D >( n , x , y , local_result );
-
-  MPI_Allreduce( & local_result , & global_result , 1 ,
-                 MPI_DOUBLE , MPI_SUM , machine.mpi_comm );
-
-  return global_result ;
-}
-
-#else
-
-template< typename ScalarX /* Allow mix of const and non-const */ ,
-          typename ScalarY /* Allow mix of const and non-const */ ,
-          class D >
-inline
-double dot( const size_t n ,
-            const View< ScalarX * , D > & x ,
-            const View< ScalarY * , D > & y ,
-            comm::Machine )
-{
-  double global_result = 0 ;
-  using x_type = View<ScalarX*, D>;
-  using L = typename x_type::array_layout;
-
-  Impl::Dot< ScalarX , L , D >( n , x , y , global_result );
-
-  return global_result ;
-}
-
-#endif
-
-//----------------------------------------------------------------------------
-
-#if defined( KOKKOS_ENABLE_MPI )
-
-template< typename ScalarX /* Allow mix of const and non-const */ ,
-          class L , class D ,
-          class MX /* Allow any management type */ >
-inline
-double dot( const size_t n ,
-            const View< ScalarX * , L , D , MX > & x ,
-            comm::Machine machine )
-{
-  double global_result = 0 ;
-  double local_result = 0 ;
-
-  Impl::Dot1< ScalarX , L , D >( n , x , local_result );
-
-  MPI_Allreduce( & local_result , & global_result , 1 ,
-                 MPI_DOUBLE , MPI_SUM , machine.mpi_comm );
-
-  return global_result ;
-}
-
-#else
-
-template< typename ScalarX /* Allow mix of const and non-const */ ,
-          class D>
-inline
-double dot( const size_t n ,
-            const View< ScalarX * , D> & x ,
-            comm::Machine )
-{
-  double global_result = 0 ;
-  using x_type = View<ScalarX*, D>;
-  using L = typename x_type::array_layout;
-
-  Impl::Dot1< ScalarX , L , D >( n , x , global_result );
-
-  return global_result ;
-}
-
-#endif
-
-//----------------------------------------------------------------------------
-
-template< typename ScalarX /* Allow mix of const and non-const */ ,
-          class D >
-inline
-double norm2( const size_t n ,
-              const View< ScalarX * , D > & x ,
-              comm::Machine machine )
-{
-  return std::sqrt( dot( n , x , machine ) );
-}
-
-//----------------------------------------------------------------------------
-
-template< typename ScalarA ,
-          typename ScalarX ,
-          class L ,
-          class D ,
-          class MX >
-void scale( const size_t n ,
-            const ScalarA & alpha ,
-            const View< ScalarX * , L , D , MX > & x )
-{
-  Impl::Scale< ScalarA , ScalarX , L , D >( n , alpha , x );
-}
-
-template< typename ScalarA ,
-          typename ScalarX ,
-          class D >
-void fill( const size_t n ,
-           const ScalarA & alpha ,
-           const View< ScalarX * , D > & x )
-{
-  using x_type = View<ScalarX*, D>;
-  using L = typename x_type::array_layout;
-  Impl::Fill< ScalarA , ScalarX , L , D >( n , alpha , x );
-}
-
-//----------------------------------------------------------------------------
-
-template< typename ScalarA ,
-          typename ScalarX ,
-          typename ScalarY ,
-          class D >
-void axpy( const size_t n ,
-           const ScalarA & alpha ,
-           const View< ScalarX *, D > & x ,
-           const View< ScalarY *, D > & y )
-{
-  using x_type = View<ScalarX*, D>;
-  using L = typename x_type::array_layout;
-  Impl::AXPY< ScalarA, ScalarX, ScalarY , L , D >( n, alpha, x, y );
-}
-
-//----------------------------------------------------------------------------
-
-template< typename ScalarX ,
-          typename ScalarB ,
-          typename ScalarY ,
-          class D >
-void xpby( const size_t n ,
-           const View< ScalarX *, D > & x ,
-           const ScalarB & beta ,
-           const View< ScalarY *, D > & y )
-{
-  using x_type = View<ScalarX*, D>;
-  using L = typename x_type::array_layout;
-  Impl::XPBY< ScalarX, ScalarB, ScalarY , L , D >( n, x, beta, y );
-}
-
-//----------------------------------------------------------------------------
-// w = alpha * x + beta * y
-
-template< typename ScalarA ,
-          typename ScalarX ,
-          typename ScalarB ,
-          typename ScalarY ,
-          typename ScalarW ,
-          class D
-          >
-void waxpby( const size_t n ,
-             const ScalarA & alpha ,
-             const View< ScalarX * , D > & x ,
-             const ScalarB & beta ,
-             const View< ScalarY * , D > & y ,
-             const View< ScalarW * , D > & w )
-{
-  using x_type = typename std::decay<decltype(x)>::type;
-  using L = typename x_type::array_layout;
-  Impl::WAXPBY<ScalarA,ScalarX,ScalarB,ScalarY,ScalarW,L,D>
-    ( n , alpha , x , beta , y , w );
-}
-
-}
-
-//----------------------------------------------------------------------------
-//----------------------------------------------------------------------------
-
-namespace Kokkos {
-namespace Impl {
-
-template< typename Scalar , class L , class D >
-struct Dot
-{
-private:
-
-  typedef View< const Scalar*, L, D, MemoryUnmanaged >  vector_const_type ;
-
-  const vector_const_type x ;
-  const vector_const_type y ;
-
-public:
-
-  typedef typename vector_const_type::execution_space  execution_space ; // Manycore device
-  typedef double      value_type ;  // Reduction value
-
-  template< class ArgX , class ArgY >
-  inline
-  Dot( const size_t n , const ArgX & arg_x , const ArgY & arg_y , double & result )
-    : x( arg_x ), y( arg_y )
-  {
-    parallel_reduce( n , *this , result );
-  }
-
-  template< typename iType >
-  KOKKOS_INLINE_FUNCTION
-  void operator()( const iType & i , value_type & update ) const
-  { update += x(i) * y(i); }
-
-  KOKKOS_INLINE_FUNCTION
-  static void join( volatile value_type & update ,
-                    const volatile value_type & source )
-  { update += source;    }
-
-  KOKKOS_INLINE_FUNCTION
-  static void init( value_type & update )
-  { update = 0 ; }
-}; // Dot
-
-//----------------------------------------------------------------------------
-
-template< typename Scalar , class L , class D >
-struct Dot1
-{
-private:
-
-  typedef View< const Scalar*, L, D , MemoryUnmanaged >  vector_const_type ;
-
-  const vector_const_type x ;
-
-public:
-
-  typedef typename vector_const_type::execution_space  execution_space ; // Manycore device
-  typedef double      value_type ;  // Reduction value
-
-  template< class ArgX >
-  inline
-  Dot1( const size_t n , const ArgX & arg_x , double & result )
-    : x( arg_x )
-  {
-    parallel_reduce( n , *this , result );
-  }
-
-  template< typename iType >
-  KOKKOS_INLINE_FUNCTION
-  void operator()( const iType & i , value_type & update ) const
-  { update += x(i) * x(i) ; }
-
-  KOKKOS_INLINE_FUNCTION
-  static void join( volatile value_type & update ,
-                    const volatile value_type & source )
-  { update += source ; }
-
-  KOKKOS_INLINE_FUNCTION
-  static void init( value_type & update )
-  { update = 0 ; }
-}; // Dot
-
-//----------------------------------------------------------------------------
-//----------------------------------------------------------------------------
-
-template < typename ScalarA ,
-           typename ScalarX ,
-           typename ScalarB ,
-           typename ScalarY ,
-           typename ScalarW ,
-           class L , class D >
-struct WAXPBY
-{
-private:
-
-  typedef View<       ScalarW *, L , D , MemoryUnmanaged > ViewW ;
-  typedef View< const ScalarX *, L , D , MemoryUnmanaged > ViewX ;
-  typedef View< const ScalarY *, L , D , MemoryUnmanaged > ViewY ;
-
-  const ViewW    w ;
-  const ViewX    x ;
-  const ViewY    y ;
-  const ScalarA  alpha ;
-  const ScalarB  beta ;
-
-public:
-
-  typedef typename ViewW::execution_space  execution_space ;
-
-  template< typename iType >
-  KOKKOS_INLINE_FUNCTION
-  void operator()( const iType inode ) const
-  {
-    w(inode) = alpha * x(inode) + beta * y(inode);
-  }
-
-  template< class ArgX , class ArgY , class ArgW >
-  inline
-  WAXPBY( const size_t  n ,
-          const ScalarA & arg_alpha ,
-          const ArgX    & arg_x ,
-          const ScalarB & arg_beta ,
-          const ArgY    & arg_y ,
-          const ArgW    & arg_w )
-    : w( arg_w ), x( arg_x ), y( arg_y )
-    , alpha( arg_alpha ), beta( arg_beta )
-  {
-    parallel_for( n , *this );
-  }
-}; // WAXPBY
-
-//----------------------------------------------------------------------------
-
-template < typename ScalarB ,
-           typename ScalarW ,
-           class L , class D >
-struct Scale
-{
-private:
-
-  typedef View< ScalarW *, L , D , MemoryUnmanaged >  ViewW ;
-  const ViewW    w ;
-  const ScalarB  beta ;
-
-public:
-
-  typedef typename ViewW::execution_space  execution_space ;
-
-  template< typename iType >
-  KOKKOS_INLINE_FUNCTION
-  void operator()( const iType & i ) const
-  { w(i) *= beta ; }
-
-  template< class ArgW >
-  inline
-  Scale( const size_t n , const ScalarB & arg_beta , const ArgW & arg_w )
-    : w( arg_w )
-    , beta( arg_beta )
-  {
-    parallel_for( n , *this );
-  }
-};
-
-template < typename ScalarB ,
-           typename ScalarW ,
-           class L , class D >
-struct Fill
-{
-private:
-
-  typedef View< ScalarW *, L , D , MemoryUnmanaged >  ViewW ;
-  const ViewW    w ;
-  const ScalarB  beta ;
-
-public:
-
-  typedef typename ViewW::execution_space  execution_space ;
-
-  template< typename iType >
-  KOKKOS_INLINE_FUNCTION
-  void operator()( const iType & i ) const
-  { w(i) = beta ; }
-
-  template< class ArgW >
-  inline
-  Fill( const size_t n , const ScalarB & arg_beta , const ArgW & arg_w )
-    : w( arg_w )
-    , beta( arg_beta )
-  {
-    parallel_for( n , *this );
-  }
-};
-
-//----------------------------------------------------------------------------
-
-template < typename ScalarA ,
-           typename ScalarX ,
-           typename ScalarW ,
-           class L , class D >
-struct AXPY
-{
-private:
-
-  typedef View<       ScalarW *, L , D , MemoryUnmanaged >  ViewW ;
-  typedef View< const ScalarX *, L , D , MemoryUnmanaged >  ViewX ;
-
-  const ViewW    w ;
-  const ViewX    x ;
-  const ScalarA  alpha ;
-
-public:
-
-  typedef typename ViewW::execution_space  execution_space ;
-
-  template< typename iType >
-  KOKKOS_INLINE_FUNCTION
-  void operator()( const iType & i ) const
-  { w(i) += alpha * x(i); }
-
-  template< class ArgX , class ArgW >
-  inline
-  AXPY( const size_t  n ,
-        const ScalarA & arg_alpha ,
-        const ArgX    & arg_x ,
-        const ArgW    & arg_w )
-    : w( arg_w ), x( arg_x )
-    , alpha( arg_alpha )
-  {
-    parallel_for( n , *this );
-  }
-}; // AXPY
-
-template< typename ScalarX ,
-          typename ScalarB ,
-          typename ScalarW ,
-          class L , class D >
-struct XPBY
-{
-private:
-
-  typedef View<       ScalarW *, L , D , MemoryUnmanaged >  ViewW ;
-  typedef View< const ScalarX *, L , D , MemoryUnmanaged >  ViewX ;
-
-  const ViewW    w ;
-  const ViewX    x ;
-  const ScalarB  beta ;
-
-public:
-
-  typedef typename ViewW::execution_space  execution_space ;
-
-  template< typename iType >
-  KOKKOS_INLINE_FUNCTION
-  void operator()( const iType & i ) const
-  { w(i) = x(i) + beta * w(i); }
-
-  template< class ArgX , class ArgW >
-  inline
-  XPBY( const size_t  n ,
-        const ArgX    & arg_x ,
-        const ScalarB & arg_beta ,
-        const ArgW    & arg_w )
-    : w( arg_w ), x( arg_x )
-    , beta( arg_beta )
-  {
-    parallel_for( n , *this );
-  }
-}; // XPBY
-
-//----------------------------------------------------------------------------
-//----------------------------------------------------------------------------
-
-} // namespace Impl
-} // namespace Kokkos
-
-//----------------------------------------------------------------------------
-//----------------------------------------------------------------------------
-
-#endif /* #ifndef USESCASES_LINALG_BLAS_HPP */
-
-
diff --git a/lib/kokkos/example/multi_fem/Makefile b/lib/kokkos/example/multi_fem/Makefile
deleted file mode 100644
index 4b114b5625..0000000000
--- a/lib/kokkos/example/multi_fem/Makefile
+++ /dev/null
@@ -1,49 +0,0 @@
-KOKKOS_PATH ?= ../..
-
-MAKEFILE_PATH := $(abspath $(lastword $(MAKEFILE_LIST)))
-SRC_DIR := $(dir $(MAKEFILE_PATH))
-
-SRC = $(wildcard $(SRC_DIR)/*.cpp)
-OBJ = $(SRC:$(SRC_DIR)/%.cpp=%.o)
-
-#SRC = $(wildcard *.cpp)
-#OBJ = $(SRC:%.cpp=%.o)
-
-default: build
-	echo "Start Build"
-
-CXXFLAGS = -O3 -I$(SRC_DIR)
-LDFLAGS ?=
-
-ifneq (,$(findstring Cuda,$(KOKKOS_DEVICES)))
-  CXX = $(KOKKOS_PATH)/bin/nvcc_wrapper
-  EXE = $(addsuffix .cuda, $(shell basename $(SRC_DIR)))
-  CXXFLAGS += -I$(SRC_DIR) -I$(CUDA_PATH) -O3
-  LDFLAGS += -L$(CUDA_PATH)/lib64 -lcusparse
-else
-  CXX = g++
-  EXE = $(addsuffix .host, $(shell basename $(SRC_DIR)))
-endif
-
-LINK ?= $(CXX)
-
-include $(KOKKOS_PATH)/Makefile.kokkos
-
-DEPFLAGS = -M
-
-LIB =
-
-
-build: $(EXE)
-
-$(EXE): $(OBJ) $(KOKKOS_LINK_DEPENDS)
-	$(LINK) $(KOKKOS_LDFLAGS) $(LINKFLAGS) $(EXTRA_PATH) $(OBJ) $(KOKKOS_LIBS) $(LIB) -o $(EXE)
-
-clean: 
-	rm -f *.a *.o *.cuda *.host
-
-# Compilation rules
-
-%.o:$(SRC_DIR)/%.cpp $(KOKKOS_CPP_DEPENDS)
-	$(CXX) $(KOKKOS_CPPFLAGS) $(KOKKOS_CXXFLAGS) $(CXXFLAGS) $(EXTRA_INC) -c $<
-
diff --git a/lib/kokkos/example/multi_fem/Nonlinear.hpp b/lib/kokkos/example/multi_fem/Nonlinear.hpp
deleted file mode 100644
index b9585c7582..0000000000
--- a/lib/kokkos/example/multi_fem/Nonlinear.hpp
+++ /dev/null
@@ -1,573 +0,0 @@
-/*
-//@HEADER
-// ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
-// the U.S. Government retains certain rights in this software.
-// 
-// 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 Corporation nor the names of the
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "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 SANDIA CORPORATION OR THE
-// 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.
-//
-// Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
-// ************************************************************************
-//@HEADER
-*/
-
-#ifndef HYBRIDFEM_NONLINEAR_HPP
-#define HYBRIDFEM_NONLINEAR_HPP
-
-#include <utility>
-#include <iostream>
-#include <iomanip>
-
-#include <Kokkos_Core.hpp>
-#include <SparseLinearSystem.hpp>
-#include <SparseLinearSystemFill.hpp>
-#include <NonlinearFunctors.hpp>
-
-#include <FEMesh.hpp>
-#include <HexElement.hpp>
-
-//----------------------------------------------------------------------------
-//----------------------------------------------------------------------------
-
-namespace HybridFEM {
-namespace Nonlinear {
-
-struct PerformanceData {
-  double mesh_time ;
-  double graph_time ;
-  double elem_time ;
-  double matrix_gather_fill_time ;
-  double matrix_boundary_condition_time ;
-  double cg_iteration_time ;
-  size_t cg_iteration_count ;
-  size_t newton_iteration_count ;
-  double error_max ;
-
-  PerformanceData()
-    : mesh_time(0)
-    , graph_time(0)
-    , elem_time(0)
-    , matrix_gather_fill_time(0)
-    , matrix_boundary_condition_time(0)
-    , cg_iteration_time(0)
-    , cg_iteration_count(0)
-    , newton_iteration_count(0)
-    , error_max(0)
-    {}
-
-  void best( const PerformanceData & rhs )
-  {
-    mesh_time = std::min( mesh_time , rhs.mesh_time );
-    graph_time = std::min( graph_time , rhs.graph_time );
-    elem_time = std::min( elem_time , rhs.elem_time );
-    matrix_gather_fill_time = std::min( matrix_gather_fill_time , rhs.matrix_gather_fill_time );
-    matrix_boundary_condition_time = std::min( matrix_boundary_condition_time , rhs.matrix_boundary_condition_time );
-    cg_iteration_time = std::min( cg_iteration_time , rhs.cg_iteration_time );
-    cg_iteration_count = std::min( cg_iteration_count , rhs.cg_iteration_count );
-    newton_iteration_count = std::min( newton_iteration_count , rhs.newton_iteration_count );
-    error_max = std::min( error_max , rhs.error_max );
-  }
-};
-
-//----------------------------------------------------------------------------
-//----------------------------------------------------------------------------
-
-class ManufacturedSolution {
-public:
-
-  // Manufactured solution for one dimensional nonlinear PDE
-  //
-  //  -K T_zz + T^2 = 0 ; T(zmin) = T_zmin ; T(zmax) = T_zmax
-  //
-  //  Has an analytic solution of the form:
-  //
-  //    T(z) = ( a ( z - zmin ) + b )^(-2) where K = 1 / ( 6 a^2 )
-  //
-  //  Given T_0 and T_L compute K for this analytic solution.
-  //
-  //  Two analytic solutions:
-  //
-  //    Solution with singularity:
-  //    , a( ( 1.0 / sqrt(T_zmax) + 1.0 / sqrt(T_zmin) ) / ( zmax - zmin ) )
-  //    , b( -1.0 / sqrt(T_zmin) )
-  //
-  //    Solution without singularity:
-  //    , a( ( 1.0 / sqrt(T_zmax) - 1.0 / sqrt(T_zmin) ) / ( zmax - zmin ) )
-  //    , b( 1.0 / sqrt(T_zmin) )
-
-  const double zmin ;
-  const double zmax ;
-  const double T_zmin ;
-  const double T_zmax ;
-  const double a ;
-  const double b ;
-  const double K ;
-
-  ManufacturedSolution( const double arg_zmin ,
-                        const double arg_zmax ,
-                        const double arg_T_zmin ,
-                        const double arg_T_zmax )
-    : zmin( arg_zmin )
-    , zmax( arg_zmax )
-    , T_zmin( arg_T_zmin )
-    , T_zmax( arg_T_zmax )
-    , a( ( 1.0 / std::sqrt(T_zmax) - 1.0 / std::sqrt(T_zmin) ) / ( zmax - zmin ) )
-    , b( 1.0 / std::sqrt(T_zmin) )
-    , K( 1.0 / ( 6.0 * a * a ) )
-    {}
-
-  double operator()( const double z ) const
-  {
-    const double tmp = a * ( z - zmin ) + b ;
-    return 1.0 / ( tmp * tmp );
-  }
-};
-
-//----------------------------------------------------------------------------
-//----------------------------------------------------------------------------
-
-template< typename Scalar , class FixtureType >
-PerformanceData run( const typename FixtureType::FEMeshType & mesh ,
-                     const int , // global_max_x ,
-                     const int , // global_max_y ,
-                     const int global_max_z ,
-                     const bool print_error )
-{
-  typedef Scalar                              scalar_type ;
-  typedef FixtureType                         fixture_type ;
-  typedef typename fixture_type::execution_space  execution_space;
-  //typedef typename execution_space::size_type     size_type ; // unused
-
-  typedef typename fixture_type::FEMeshType mesh_type ;
-  typedef typename fixture_type::coordinate_scalar_type coordinate_scalar_type ;
-
-  enum { ElementNodeCount = fixture_type::element_node_count };
-
-  const comm::Machine machine = mesh.parallel_data_map.machine ;
-
-  const size_t element_count = mesh.elem_node_ids.dimension_0();
-
-  //------------------------------------
-  // The amount of nonlinearity is proportional to the ratio
-  // between T(zmax) and T(zmin).  For the manufactured solution
-  // 0 < T(zmin) and 0 < T(zmax)
-
-  const ManufacturedSolution
-    exact_solution( /* zmin */ 0 ,
-                    /* zmax */ global_max_z ,
-                    /* T(zmin) */ 1 ,
-                    /* T(zmax) */ 20 );
-
-  //-----------------------------------
-  // Convergence Criteria and perf data:
-
-  const size_t cg_iteration_limit = 200 ;
-  const double cg_tolerance = 1e-14 ;
-
-  const size_t newton_iteration_limit = 150 ;
-  const double newton_tolerance = 1e-14 ;
-
-  size_t cg_iteration_count_total = 0 ;
-  double cg_iteration_time = 0 ;
-
-  size_t newton_iteration_count = 0 ;
-  double residual_norm_init = 0 ;
-  double residual_norm = 0 ;
-
-  PerformanceData perf_data ;
-
-  //------------------------------------
-  // Sparse linear system types:
-
-  typedef Kokkos::View< scalar_type* , execution_space >     vector_type ;
-  typedef Kokkos::CrsMatrix< scalar_type , execution_space >  matrix_type ;
-  typedef typename matrix_type::graph_type                matrix_graph_type ;
-  typedef typename matrix_type::coefficients_type         matrix_coefficients_type ;
-
-  typedef GraphFactory< matrix_graph_type , mesh_type > graph_factory ;
-
-  //------------------------------------
-  // Problem setup types:
-
-  typedef ElementComputation < mesh_type , scalar_type > ElementFunctor ;
-  typedef DirichletSolution  < mesh_type , scalar_type > DirichletSolutionFunctor ;
-  typedef DirichletResidual  < mesh_type , scalar_type > DirichletResidualFunctor ;
-
-  typedef typename ElementFunctor::elem_matrices_type elem_matrices_type ;
-  typedef typename ElementFunctor::elem_vectors_type  elem_vectors_type ;
-
-  typedef GatherFill< matrix_type ,
-                      mesh_type ,
-                      elem_matrices_type ,
-                      elem_vectors_type > GatherFillFunctor ;
-
-  //------------------------------------
-
-  matrix_type jacobian ;
-  vector_type residual ;
-  vector_type delta ;
-  vector_type nodal_solution ;
-
-  typename graph_factory::element_map_type element_map ;
-
-  //------------------------------------
-  // Generate mesh and corresponding sparse matrix graph
-
-  Kokkos::Timer wall_clock ;
-
-  //------------------------------------
-  // Generate sparse matrix graph and element->graph map.
-
-  wall_clock.reset();
-
-  graph_factory::create( mesh , jacobian.graph , element_map );
-
-  execution_space().fence();
-
-  perf_data.graph_time = comm::max( machine , wall_clock.seconds() );
-
-  //------------------------------------
-  // Allocate linear system coefficients and rhs:
-
-  const size_t local_owned_length = jacobian.graph.row_map.dimension_0() - 1 ;
-  const size_t local_total_length = mesh.node_coords.dimension_0();
-
-  jacobian.coefficients =
-    matrix_coefficients_type( "jacobian_coeff" , jacobian.graph.entries.dimension_0() );
-
-  // Nonlinear residual for owned nodes:
-  residual = vector_type( "residual" , local_owned_length );
-
-  // Nonlinear solution for owned and ghosted nodes:
-  nodal_solution = vector_type( "solution" , local_total_length );
-
-  // Nonlinear solution update for owned nodes:
-  delta = vector_type( "delta" , local_owned_length );
-
-  //------------------------------------
-  // Allocation of arrays to fill the linear system
-
-  elem_matrices_type elem_matrices ; // Jacobian matrices
-  elem_vectors_type  elem_vectors ;  // Residual vectors
-
-  if ( element_count ) {
-    elem_matrices = elem_matrices_type( std::string("elem_matrices"), element_count );
-    elem_vectors = elem_vectors_type( std::string("elem_vectors"), element_count );
-  }
-
-  //------------------------------------
-  // For boundary condition set the correct values in the solution vector
-  //   The 'zmin' face is assigned to 'T_zmin'.
-  //   The 'zmax' face is assigned to 'T_zmax'.
-  //   The resulting solution is one dimensional along the 'Z' axis.
-
-  DirichletSolutionFunctor::apply( nodal_solution , mesh ,
-                                   exact_solution.zmin ,
-                                   exact_solution.zmax ,
-                                   exact_solution.T_zmin ,
-                                   exact_solution.T_zmax );
-
-  for(;;) { // Nonlinear loop
-
-#if defined( KOKKOS_ENABLE_MPI )
-
-    { //------------------------------------
-      // Import off-processor nodal solution values
-      // for residual and jacobian computations
-
-      Kokkos::AsyncExchange< typename vector_type::value_type , execution_space ,
-                                  Kokkos::ParallelDataMap >
-        exchange( mesh.parallel_data_map , 1 );
-
-      Kokkos::PackArray< vector_type >
-        ::pack( exchange.buffer() ,
-                mesh.parallel_data_map.count_interior ,
-                mesh.parallel_data_map.count_send ,
-                nodal_solution );
-
-      exchange.setup();
-
-      exchange.send_receive();
-
-      Kokkos::UnpackArray< vector_type >
-        ::unpack( nodal_solution , exchange.buffer() ,
-                  mesh.parallel_data_map.count_owned ,
-                  mesh.parallel_data_map.count_receive );
-    }
-
-#endif
-
-    //------------------------------------
-    // Compute element matrices and vectors:
-
-    wall_clock.reset();
-
-    ElementFunctor( mesh ,
-                    elem_matrices ,
-                    elem_vectors ,
-                    nodal_solution ,
-                    exact_solution.K );
-
-    execution_space().fence();
-    perf_data.elem_time += comm::max( machine , wall_clock.seconds() );
-
-    //------------------------------------
-    // Fill linear system coefficients:
-
-    wall_clock.reset();
-
-    fill( jacobian.coefficients.dimension_0(), 0 , jacobian.coefficients );
-    fill( residual.dimension_0() , 0 , residual );
-
-    GatherFillFunctor::apply( jacobian ,
-                              residual ,
-                              mesh ,
-                              element_map ,
-                              elem_matrices ,
-                              elem_vectors );
-
-    execution_space().fence();
-    perf_data.matrix_gather_fill_time += comm::max( machine , wall_clock.seconds() );
-
-    // Apply boundary conditions:
-
-    wall_clock.reset();
-
-    // Updates jacobian matrix to 1 on the diagonal, zero elsewhere,
-    // and 0 in the residual due to the solution vector having the correct value
-    DirichletResidualFunctor::apply( jacobian, residual, mesh ,
-                                     exact_solution.zmin ,
-                                     exact_solution.zmax );
-
-    execution_space().fence();
-    perf_data.matrix_boundary_condition_time +=
-      comm::max( machine , wall_clock.seconds() );
-
-    //------------------------------------
-    // Has the residual converged?
-
-    residual_norm = norm2( mesh.parallel_data_map.count_owned,
-                           residual,
-                           mesh.parallel_data_map.machine );
-
-    if ( 0 == newton_iteration_count ) {
-      residual_norm_init = residual_norm ;
-    }
-
-    if ( residual_norm / residual_norm_init < newton_tolerance ) {
-      break ;
-    }
-
-    //------------------------------------
-    // Solve linear sytem
-
-    size_t cg_iteration_count = 0 ;
-    double cg_residual_norm = 0 ;
-
-    cgsolve( mesh.parallel_data_map ,
-             jacobian , residual , delta ,
-             cg_iteration_count ,
-             cg_residual_norm ,
-             cg_iteration_time ,
-             cg_iteration_limit , cg_tolerance ) ;
-
-    perf_data.cg_iteration_time += cg_iteration_time ;
-    cg_iteration_count_total += cg_iteration_count ;
-
-    // Update non-linear solution with delta...
-    // delta is : - Dx = [Jacobian]^1 * Residual which is the negative update
-    // LaTeX:
-    // \vec {x}_{n+1} = \vec {x}_{n} - ( - \Delta \vec{x}_{n} )
-    // text:
-    // x[n+1] = x[n] + Dx
-
-    axpy( mesh.parallel_data_map.count_owned ,
-          -1.0, delta, nodal_solution);
-
-    ++newton_iteration_count ;
-
-    if ( newton_iteration_limit < newton_iteration_count ) {
-      break ;
-    }
-  };
-
-  if ( newton_iteration_count ) {
-    perf_data.elem_time /= newton_iteration_count ;
-    perf_data.matrix_gather_fill_time /= newton_iteration_count ;
-    perf_data.matrix_boundary_condition_time /= newton_iteration_count ;
-  }
-
-  if ( cg_iteration_count_total ) {
-    perf_data.cg_iteration_time /= cg_iteration_count_total ;
-  }
-
-  perf_data.newton_iteration_count = newton_iteration_count ;
-  perf_data.cg_iteration_count = cg_iteration_count_total ;
-
-  //------------------------------------
-
-  {
-    // For extracting the nodal solution and its coordinates:
-
-    typename mesh_type::node_coords_type::HostMirror node_coords_host =
-      Kokkos::create_mirror( mesh.node_coords );
-
-    typename vector_type::HostMirror nodal_solution_host =
-      Kokkos::create_mirror( nodal_solution );
-
-    Kokkos::deep_copy( node_coords_host , mesh.node_coords );
-    Kokkos::deep_copy( nodal_solution_host , nodal_solution );
-
-    double tmp = 0 ;
-
-    for ( size_t i = 0 ; i < mesh.parallel_data_map.count_owned ; ++i ) {
-      const coordinate_scalar_type x = node_coords_host(i,0);
-      const coordinate_scalar_type y = node_coords_host(i,1);
-      const coordinate_scalar_type z = node_coords_host(i,2);
-
-      const double Tx = exact_solution(z);
-      const double Ts = nodal_solution_host(i);
-      const double Te = std::abs( Tx - Ts ) / std::abs( Tx );
-
-      tmp = std::max( tmp , Te );
-
-      if ( print_error && 0.02 < Te ) {
-        std::cout << "  node( " << x << " " << y << " " << z << " ) = "
-                  << Ts << " != exact_solution " << Tx
-                  << std::endl ;
-      }
-    }
-    perf_data.error_max = comm::max( machine , tmp );
-  }
-
-  return perf_data ;
-}
-
-//----------------------------------------------------------------------------
-
-template< typename Scalar , class Device , class FixtureElement >
-void driver( const char * const label ,
-             comm::Machine machine ,
-             const int gang_count ,
-             const int elem_count_beg ,
-             const int elem_count_end ,
-             const int runs )
-{
-  typedef Scalar          scalar_type ;
-  typedef Device          execution_space ;
-  typedef double          coordinate_scalar_type ;
-  typedef FixtureElement  fixture_element_type ;
-
-  typedef BoxMeshFixture< coordinate_scalar_type ,
-                          execution_space ,
-                          fixture_element_type > fixture_type ;
-
-  typedef typename fixture_type::FEMeshType mesh_type ;
-
-  const size_t proc_count = comm::size( machine );
-  const size_t proc_rank  = comm::rank( machine );
-
-  if ( elem_count_beg == 0 || elem_count_end == 0 || runs == 0 ) return ;
-
-  if ( comm::rank( machine ) == 0 ) {
-    std::cout << std::endl ;
-    std::cout << "\"Kokkos::HybridFE::Nonlinear " << label << "\"" << std::endl;
-    std::cout
-      << "\"Size\" ,  \"Size\" ,  \"Graphing\" , \"Element\" ,  \"Fill\" ,     \"Boundary\" , \"CG-Iter\" , \"CG-Iter\" ,      \"Newton-Iter\" , \"Max-node-error\""
-      << std::endl
-      << "\"elems\" , \"nodes\" , \"millisec\" , \"millisec\" , \"millisec\" , \"millisec\" , \"millisec\" , \"total-count\" , \"total-count\" , \"ratio\""
-      << std::endl ;
-  }
-
-  const bool print_sample = 0 ;
-  const double x_curve = 1.0 ;
-  const double y_curve = 1.0 ;
-  const double z_curve = 0.8 ;
-
-  for(int i = elem_count_beg ; i < elem_count_end ; i *= 2 )
-  {
-    const int ix = std::max( 1 , (int) cbrt( ((double) i) / 2.0 ) );
-    const int iy = 1 + ix ;
-    const int iz = 2 * iy ;
-    const int global_elem_count = ix * iy * iz ;
-    const int global_node_count = ( 2 * ix + 1 ) *
-                                  ( 2 * iy + 1 ) *
-                                  ( 2 * iz + 1 );
-
-    mesh_type mesh =
-      fixture_type::create( proc_count , proc_rank , gang_count ,
-                            ix , iy , iz ,
-                            x_curve , y_curve , z_curve );
-
-    mesh.parallel_data_map.machine = machine ;
-
-
-    PerformanceData perf_data , perf_best ;
-
-    for(int j = 0; j < runs; j++){
-
-      perf_data = run<scalar_type,fixture_type>(mesh,ix,iy,iz, print_sample );
-
-      if( j == 0 ) {
-        perf_best = perf_data ;
-      }
-      else {
-        perf_best.best( perf_data );
-      }
-    }
-
-    if ( comm::rank( machine ) == 0 ) {
-
-      std::cout << std::setw(8) << global_elem_count << " , "
-                << std::setw(8) << global_node_count << " , "
-                << std::setw(10) << perf_best.graph_time * 1000 << " , "
-                << std::setw(10) << perf_best.elem_time * 1000 << " , "
-                << std::setw(10) << perf_best.matrix_gather_fill_time * 1000 << " , "
-                << std::setw(10) << perf_best.matrix_boundary_condition_time * 1000 << " , "
-                << std::setw(10) << perf_best.cg_iteration_time * 1000 << " , "
-                << std::setw(7) << perf_best.cg_iteration_count << " , "
-                << std::setw(3) << perf_best.newton_iteration_count << " , "
-                << std::setw(10) << perf_best.error_max
-                << std::endl ;
-    }
-  }
-}
-
-//----------------------------------------------------------------------------
-
-} /* namespace Nonlinear */
-} /* namespace HybridFEM */
-
-
-#endif /* #ifndef HYBRIDFEM_IMPLICIT_HPP */
-
diff --git a/lib/kokkos/example/multi_fem/NonlinearElement_Cuda.hpp b/lib/kokkos/example/multi_fem/NonlinearElement_Cuda.hpp
deleted file mode 100644
index 2f6e945204..0000000000
--- a/lib/kokkos/example/multi_fem/NonlinearElement_Cuda.hpp
+++ /dev/null
@@ -1,390 +0,0 @@
-//@HEADER
-// ************************************************************************
-//
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
-// the U.S. Government retains certain rights in this software.
-//
-// 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 Corporation nor the names of the
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "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 SANDIA CORPORATION OR THE
-// 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.
-//
-// Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-//
-// ************************************************************************
-//@HEADER
-
-#include <cstdio>
-
-#include <iostream>
-#include <fstream>
-#include <iomanip>
-#include <cstdlib>
-#include <cmath>
-
-#include <Kokkos_Core.hpp>
-#include <HexElement.hpp>
-#include <FEMesh.hpp>
-
-namespace HybridFEM {
-namespace Nonlinear {
-
-template< class MeshType , typename ScalarType > struct ElementComputation ;
-
-//----------------------------------------------------------------------------
-
-template<>
-struct ElementComputation< FEMesh< double , 27 , Kokkos::Cuda > , double >
-{
-  typedef Kokkos::Cuda    execution_space ;
-
-  static const unsigned ElementNodeCount = 27 ;
-
-  typedef HexElement_Data< ElementNodeCount >                element_data_type ;
-  typedef FEMesh< double , ElementNodeCount , execution_space >  mesh_type ;
-
-  static const unsigned SpatialDim       = element_data_type::spatial_dimension ;
-  static const unsigned FunctionCount    = element_data_type::function_count ;
-  static const unsigned IntegrationCount = element_data_type::integration_count ;
-  static const unsigned TensorDim        = SpatialDim * SpatialDim ;
-
-  typedef Kokkos::View< double[][FunctionCount][FunctionCount] , execution_space > elem_matrices_type ;
-  typedef Kokkos::View< double[][FunctionCount] , execution_space > elem_vectors_type ;
-  typedef Kokkos::View< double[] , execution_space > value_vector_type ;
-
-private:
-
-  const element_data_type                       elem_data ;
-  const typename mesh_type::elem_node_ids_type  elem_node_ids ;
-  const typename mesh_type::node_coords_type    node_coords ;
-  const value_vector_type                       nodal_values ;
-  const elem_matrices_type                      element_matrices ;
-  const elem_vectors_type                       element_vectors ;
-  const float                                   coeff_K ;
-  const unsigned                                elem_count ;
-        unsigned                                invJacIndex[9][4] ;
-
-  static const unsigned j11 = 0 , j12 = 1 , j13 = 2 ,
-                        j21 = 3 , j22 = 4 , j23 = 5 ,
-                        j31 = 6 , j32 = 7 , j33 = 8 ;
-
-  // Can only handle up to 16 warps:
-  static const unsigned BlockDimX = 32 ;
-  static const unsigned BlockDimY = 7 ;
-
-  struct WorkSpace {
-    double sum[ BlockDimY ][ BlockDimX ];
-
-    double  value_at_integ[ IntegrationCount ];
-    double  gradx_at_integ[ IntegrationCount ];
-    double  grady_at_integ[ IntegrationCount ];
-    double  gradz_at_integ[ IntegrationCount ];
-
-    float  spaceJac[    BlockDimY ][ 9 ];
-    float  spaceInvJac[ BlockDimY ][ 9 ];
-
-    float  detJweight[ IntegrationCount ];
-
-    float  dpsidx[ FunctionCount ][ IntegrationCount ];
-    float  dpsidy[ FunctionCount ][ IntegrationCount ];
-    float  dpsidz[ FunctionCount ][ IntegrationCount ];
-  };
-
-public:
-
-  ElementComputation ( const mesh_type          & arg_mesh ,
-                       const elem_matrices_type & arg_element_matrices ,
-                       const elem_vectors_type  & arg_element_vectors ,
-                       const value_vector_type  & arg_nodal_values ,
-                       const float                arg_coeff_K )
-  : elem_data()
-  , elem_node_ids(    arg_mesh.elem_node_ids )
-  , node_coords(      arg_mesh.node_coords )
-  , nodal_values(     arg_nodal_values )
-  , element_matrices( arg_element_matrices )
-  , element_vectors(  arg_element_vectors )
-  , coeff_K(          arg_coeff_K )
-  , elem_count(       arg_mesh.elem_node_ids.dimension_0() )
-  {
-    const unsigned jInvJ[9][4] =
-     { { j22 , j33 , j23 , j32 } ,
-       { j13 , j32 , j12 , j33 } ,
-       { j12 , j23 , j13 , j22 } ,
-
-       { j23 , j31 , j21 , j33 } ,
-       { j11 , j33 , j13 , j31 } ,
-       { j13 , j21 , j11 , j23 } ,
-
-       { j21 , j32 , j22 , j31 } ,
-       { j12 , j31 , j11 , j32 } ,
-       { j11 , j22 , j12 , j21 } };
-
-    for ( unsigned i = 0 ; i < 9 ; ++i ) {
-    for ( unsigned j = 0 ; j < 4 ; ++j ) {
-      invJacIndex[i][j] = jInvJ[i][j] ;
-    }
-    }
-
-    const unsigned shmem = sizeof(WorkSpace);
-    const unsigned grid_max = 65535 ;
-    const unsigned grid_count = std::min( grid_max , elem_count );
-
-    // For compute capability 2.x up to 1024 threads per block
-    const dim3 block( BlockDimX , BlockDimY , 1 );
-    const dim3 grid( grid_count , 1 , 1 );
-
-    Kokkos::Impl::CudaParallelLaunch< ElementComputation >( *this , grid , block , shmem );
-  }
-
-public:
-
-  //------------------------------------
-  // Sum among the threadIdx.x
-
-  template< typename Type >
-  __device__ inline static
-  void sum_x( Type & result , const double value )
-  {
-    extern __shared__ WorkSpace work_data[] ;
-
-    volatile double * const base_sum =
-      & work_data->sum[ threadIdx.y ][ threadIdx.x ] ;
-
-    base_sum[ 0] = value ;
-
-    if ( threadIdx.x < 16 ) {
-      base_sum[0] += base_sum[16];
-      base_sum[0] += base_sum[ 8];
-      base_sum[0] += base_sum[ 4];
-      base_sum[0] += base_sum[ 2];
-      base_sum[0] += base_sum[ 1];
-    }
-
-    if ( 0 == threadIdx.x ) {
-      result = base_sum[0] ;
-    }
-  }
-
-  __device__ inline static
-  void sum_x_clear()
-  {
-    extern __shared__ WorkSpace work_data[] ;
-
-    work_data->sum[ threadIdx.y ][ threadIdx.x ] = 0 ;
-  }
-
-  //------------------------------------
-  //------------------------------------
-
-  __device__ inline
-  void evaluateFunctions( const unsigned ielem ) const
-  {
-    extern __shared__ WorkSpace work_data[] ;
-
-    // Each warp (threadIdx.y) computes an integration point
-    // Each thread is responsible for a node / function.
-
-    const unsigned iFunc = threadIdx.x ;
-    const bool     hasFunc = iFunc < FunctionCount ;
-
-    //------------------------------------
-    // Each warp gathers a different variable into 'elem_mat' shared memory.
-
-    if ( hasFunc ) {
-
-      const unsigned node = elem_node_ids( ielem , iFunc );
-
-      for ( unsigned iy = threadIdx.y ; iy < 4 ; iy += blockDim.y ) {
-      switch( iy ) {
-      case 0 : work_data->sum[0][iFunc] = node_coords(node,0); break ;
-      case 1 : work_data->sum[1][iFunc] = node_coords(node,1); break ;
-      case 2 : work_data->sum[2][iFunc] = node_coords(node,2); break ;
-      case 3 : work_data->sum[3][iFunc] = nodal_values(node); break ;
-      default: break ;
-      }
-      }
-    }
-
-    __syncthreads(); // Wait for all warps to finish gathering
-
-    // now get local 'const' copies in register space:
-
-    const double x       = work_data->sum[0][ iFunc ];
-    const double y       = work_data->sum[1][ iFunc ];
-    const double z       = work_data->sum[2][ iFunc ];
-    const double dof_val = work_data->sum[3][ iFunc ];
-
-    __syncthreads(); // Wait for all warps to finish extracting
-
-    sum_x_clear(); // Make sure summation scratch is zero
-
-    //------------------------------------
-    // Each warp is now on its own computing an integration point
-    // so no further explicit synchronizations are required.
-
-    if ( hasFunc ) {
-
-      float * const J    = work_data->spaceJac[    threadIdx.y ];
-      float * const invJ = work_data->spaceInvJac[ threadIdx.y ];
-
-      for ( unsigned iInt = threadIdx.y ;
-                     iInt < IntegrationCount ; iInt += blockDim.y ) {
-
-        const float val = elem_data.values[iInt][iFunc] ;
-        const float gx  = elem_data.gradients[iInt][0][iFunc] ;
-        const float gy  = elem_data.gradients[iInt][1][iFunc] ;
-        const float gz  = elem_data.gradients[iInt][2][iFunc] ;
-
-        sum_x( J[j11], gx * x );
-        sum_x( J[j12], gx * y );
-        sum_x( J[j13], gx * z );
-
-        sum_x( J[j21], gy * x );
-        sum_x( J[j22], gy * y );
-        sum_x( J[j23], gy * z );
-
-        sum_x( J[j31], gz * x );
-        sum_x( J[j32], gz * y );
-        sum_x( J[j33], gz * z );
-
-        // Inverse jacobian, only enough parallel work for 9 threads in the warp
-
-        if ( iFunc < TensorDim ) {
-
-          invJ[ iFunc ] =
-            J[ invJacIndex[iFunc][0] ] * J[ invJacIndex[iFunc][1] ] -
-            J[ invJacIndex[iFunc][2] ] * J[ invJacIndex[iFunc][3] ] ;
-
-          // Let all threads in the warp compute determinant into a register
-
-          const float detJ = J[j11] * invJ[j11] +
-                             J[j21] * invJ[j12] +
-                             J[j31] * invJ[j13] ;
-
-          invJ[ iFunc ] /= detJ ;
-
-          if ( 0 == iFunc ) {
-            work_data->detJweight[ iInt ] = detJ * elem_data.weights[ iInt ] ;
-          }
-        }
-
-        // Transform bases gradients and compute value and gradient
-
-        const float dx = gx * invJ[j11] + gy * invJ[j12] + gz * invJ[j13];
-        const float dy = gx * invJ[j21] + gy * invJ[j22] + gz * invJ[j23];
-        const float dz = gx * invJ[j31] + gy * invJ[j32] + gz * invJ[j33];
-
-        work_data->dpsidx[iFunc][iInt] = dx ;
-        work_data->dpsidy[iFunc][iInt] = dy ;
-        work_data->dpsidz[iFunc][iInt] = dz ;
-
-        sum_x( work_data->gradx_at_integ[iInt] , dof_val * dx );
-        sum_x( work_data->grady_at_integ[iInt] , dof_val * dy );
-        sum_x( work_data->gradz_at_integ[iInt] , dof_val * dz );
-        sum_x( work_data->value_at_integ[iInt] , dof_val * val );
-      }
-    }
-
-    __syncthreads(); // All shared data must be populated at return.
-  }
-
-  __device__ inline
-  void contributeResidualJacobian( const unsigned ielem ) const
-  {
-    extern __shared__ WorkSpace work_data[] ;
-
-    sum_x_clear(); // Make sure summation scratch is zero
-
-    // $$ R_i = \int_{\Omega} \nabla \phi_i \cdot (k \nabla T) + \phi_i T^2 d \Omega $$
-    // $$ J_{i,j} = \frac{\partial R_i}{\partial T_j} = \int_{\Omega} k \nabla \phi_i \cdot \nabla \phi_j + 2 \phi_i \phi_j T d \Omega $$
-
-    const unsigned iInt = threadIdx.x ;
-
-    if ( iInt < IntegrationCount ) {
-
-      const double value_at_integ = work_data->value_at_integ[ iInt ] ;
-      const double gradx_at_integ = work_data->gradx_at_integ[ iInt ] ;
-      const double grady_at_integ = work_data->grady_at_integ[ iInt ] ;
-      const double gradz_at_integ = work_data->gradz_at_integ[ iInt ] ;
-
-      const float detJweight     = work_data->detJweight[ iInt ] ;
-      const float coeff_K_detJweight = coeff_K * detJweight ;
-
-      for ( unsigned iRow = threadIdx.y ;
-                     iRow < FunctionCount ; iRow += blockDim.y ) {
-
-        const float value_row  = elem_data.values[ iInt ][ iRow ] * detJweight ;
-        const float dpsidx_row = work_data->dpsidx[ iRow ][ iInt ] * coeff_K_detJweight ;
-        const float dpsidy_row = work_data->dpsidy[ iRow ][ iInt ] * coeff_K_detJweight ;
-        const float dpsidz_row = work_data->dpsidz[ iRow ][ iInt ] * coeff_K_detJweight ;
-
-        const double res_del = dpsidx_row * gradx_at_integ +
-                               dpsidy_row * grady_at_integ +
-                               dpsidz_row * gradz_at_integ ;
-
-        const double res_val = value_at_integ * value_at_integ * value_row ;
-        const double jac_val_row = 2 * value_at_integ * value_row ;
-
-        sum_x( element_vectors( ielem , iRow ) , res_del + res_val );
-
-        for ( unsigned iCol = 0 ; iCol < FunctionCount ; ++iCol ) {
-
-          const float jac_del =
-            dpsidx_row * work_data->dpsidx[iCol][iInt] +
-            dpsidy_row * work_data->dpsidy[iCol][iInt] +
-            dpsidz_row * work_data->dpsidz[iCol][iInt] ;
-
-          const double jac_val =
-            jac_val_row * elem_data.values[ iInt ][ iCol ] ;
-
-          sum_x( element_matrices( ielem , iRow , iCol ) , jac_del + jac_val );
-        }
-      }
-    }
-
-    __syncthreads(); // All warps finish before refilling shared data
-  }
-
-  __device__ inline
-  void operator()(void) const
-  {
-    extern __shared__ WorkSpace work_data[] ;
-
-    for ( unsigned ielem = blockIdx.x ; ielem < elem_count ; ielem += gridDim.x ) {
-
-      evaluateFunctions( ielem );
-
-      contributeResidualJacobian( ielem );
-    }
-  }
-
-}; /* ElementComputation */
-
-} /* namespace Nonlinear */
-} /* namespace HybridFEM */
-
diff --git a/lib/kokkos/example/multi_fem/NonlinearFunctors.hpp b/lib/kokkos/example/multi_fem/NonlinearFunctors.hpp
deleted file mode 100644
index ef831a5698..0000000000
--- a/lib/kokkos/example/multi_fem/NonlinearFunctors.hpp
+++ /dev/null
@@ -1,482 +0,0 @@
-/*
-//@HEADER
-// ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
-// the U.S. Government retains certain rights in this software.
-// 
-// 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 Corporation nor the names of the
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "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 SANDIA CORPORATION OR THE
-// 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.
-//
-// Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
-// ************************************************************************
-//@HEADER
-*/
-
-#ifndef KOKKOS_NONLINEARFUNCTORS_HPP
-#define KOKKOS_NONLINEARFUNCTORS_HPP
-
-#include <iostream>
-#include <fstream>
-#include <iomanip>
-#include <cstdlib>
-#include <cmath>
-
-namespace HybridFEM {
-namespace Nonlinear {
-
-template< class MeshType , typename ScalarType > struct ElementComputation ;
-template< class MeshType , typename ScalarType > struct DirichletSolution ;
-template< class MeshType , typename ScalarType > struct DirichletResidual ;
-
-}
-}
-
-/* A Cuda-specific specialization for the element computation functor. */
-#if defined( __CUDACC__ )
-#include <NonlinearElement_Cuda.hpp>
-#endif
-
-//----------------------------------------------------------------------------
-//----------------------------------------------------------------------------
-
-namespace HybridFEM {
-namespace Nonlinear {
-
-template< typename ScalarCoordType , unsigned ElemNode , class DeviceType ,
-          typename ScalarType >
-struct ElementComputation<
-  FEMesh< ScalarCoordType , ElemNode , DeviceType > , ScalarType >
-{
-  typedef DeviceType  execution_space;
-  typedef ScalarType           scalar_type ;
-
-  static const unsigned ElementNodeCount = ElemNode ;
-
-  typedef FEMesh< ScalarCoordType , ElementNodeCount , execution_space > mesh_type ;
-
-  typedef HexElement_Data< ElementNodeCount > element_data_type ;
-
-  static const unsigned SpatialDim       = element_data_type::spatial_dimension ;
-  static const unsigned FunctionCount    = element_data_type::function_count ;
-  static const unsigned IntegrationCount = element_data_type::integration_count ;
-  static const unsigned TensorDim        = SpatialDim * SpatialDim ;
-
-  typedef Kokkos::View< scalar_type[][FunctionCount][FunctionCount] , execution_space > elem_matrices_type ;
-  typedef Kokkos::View< scalar_type[][FunctionCount] , execution_space > elem_vectors_type ;
-  typedef Kokkos::View< scalar_type[] , execution_space > value_vector_type ;
-
-
-private:
-
-  const element_data_type                 elem_data ;
-  typename mesh_type::elem_node_ids_type  elem_node_ids ;
-  typename mesh_type::node_coords_type    node_coords ;
-  value_vector_type                       nodal_values ;
-  elem_matrices_type                      element_matrices ;
-  elem_vectors_type                       element_vectors ;
-  scalar_type                             coeff_K ;
-
-public:
-
-  ElementComputation( const mesh_type   & arg_mesh ,
-                      const elem_matrices_type  & arg_element_matrices ,
-                      const elem_vectors_type   & arg_element_vectors ,
-                      const value_vector_type   & arg_nodal_values ,
-	              const scalar_type   arg_coeff_K )
-  : elem_data()
-  , elem_node_ids( arg_mesh.elem_node_ids )
-  , node_coords(   arg_mesh.node_coords )
-  , nodal_values(   arg_nodal_values )
-  , element_matrices( arg_element_matrices )
-  , element_vectors( arg_element_vectors )
-  , coeff_K( arg_coeff_K )
-  {
-    const size_t elem_count = arg_mesh.elem_node_ids.dimension_0();
-
-    parallel_for( elem_count , *this );
-  }
-
-  //------------------------------------
-
-  static const unsigned FLOPS_transform_gradients =
-     /* Jacobian */           FunctionCount * TensorDim * 2 +
-     /* Inverse jacobian */   TensorDim * 6 + 6 +
-     /* Gradient transform */ FunctionCount * 15 ;
-
-  KOKKOS_INLINE_FUNCTION
-  float transform_gradients(
-    const float grad[][ FunctionCount ] , // Gradient of bases master element
-    const double x[] ,
-    const double y[] ,
-    const double z[] ,
-    float dpsidx[] ,
-    float dpsidy[] ,
-    float dpsidz[] ) const
-  {
-    enum { j11 = 0 , j12 = 1 , j13 = 2 ,
-           j21 = 3 , j22 = 4 , j23 = 5 ,
-           j31 = 6 , j32 = 7 , j33 = 8 };
-
-    // Jacobian accumulation:
-
-    double J[ TensorDim ] = { 0, 0, 0,  0, 0, 0,  0, 0, 0 };
-
-    for( unsigned i = 0; i < FunctionCount ; ++i ) {
-      const double x1 = x[i] ;
-      const double x2 = y[i] ;
-      const double x3 = z[i] ;
-
-      const float g1 = grad[0][i] ;
-      const float g2 = grad[1][i] ;
-      const float g3 = grad[2][i] ;
-
-      J[j11] += g1 * x1 ;
-      J[j12] += g1 * x2 ;
-      J[j13] += g1 * x3 ;
-
-      J[j21] += g2 * x1 ;
-      J[j22] += g2 * x2 ;
-      J[j23] += g2 * x3 ;
-
-      J[j31] += g3 * x1 ;
-      J[j32] += g3 * x2 ;
-      J[j33] += g3 * x3 ;
-    }
-
-    // Inverse jacobian:
-
-    float invJ[ TensorDim ] = {
-      static_cast<float>( J[j22] * J[j33] - J[j23] * J[j32] ) ,
-      static_cast<float>( J[j13] * J[j32] - J[j12] * J[j33] ) ,
-      static_cast<float>( J[j12] * J[j23] - J[j13] * J[j22] ) ,
-
-      static_cast<float>( J[j23] * J[j31] - J[j21] * J[j33] ) ,
-      static_cast<float>( J[j11] * J[j33] - J[j13] * J[j31] ) ,
-      static_cast<float>( J[j13] * J[j21] - J[j11] * J[j23] ) ,
-
-      static_cast<float>( J[j21] * J[j32] - J[j22] * J[j31] ) ,
-      static_cast<float>( J[j12] * J[j31] - J[j11] * J[j32] ) ,
-      static_cast<float>( J[j11] * J[j22] - J[j12] * J[j21] ) };
-
-    const float detJ = J[j11] * invJ[j11] +
-                       J[j21] * invJ[j12] +
-                       J[j31] * invJ[j13] ;
-
-    const float detJinv = 1.0 / detJ ;
-
-    for ( unsigned i = 0 ; i < TensorDim ; ++i ) { invJ[i] *= detJinv ; }
-
-    // Transform gradients:
-
-    for( unsigned i = 0; i < FunctionCount ; ++i ) {
-      const float g0 = grad[0][i];
-      const float g1 = grad[1][i];
-      const float g2 = grad[2][i];
-
-      dpsidx[i] = g0 * invJ[j11] + g1 * invJ[j12] + g2 * invJ[j13];
-      dpsidy[i] = g0 * invJ[j21] + g1 * invJ[j22] + g2 * invJ[j23];
-      dpsidz[i] = g0 * invJ[j31] + g1 * invJ[j32] + g2 * invJ[j33];
-    }
-
-    return detJ ;
-  }
-
-  KOKKOS_INLINE_FUNCTION
-  void contributeResidualJacobian(
-    const float coeff_k ,
-    const double dof_values[] ,
-    const float dpsidx[] ,
-    const float dpsidy[] ,
-    const float dpsidz[] ,
-    const float detJ ,
-    const float integ_weight ,
-    const float bases_vals[] ,
-    double elem_res[] ,
-    double elem_mat[][ FunctionCount ] ) const
-  {
-    double value_at_pt = 0 ;
-    double gradx_at_pt = 0 ;
-    double grady_at_pt = 0 ;
-    double gradz_at_pt = 0 ;
-
-    for ( unsigned m = 0 ; m < FunctionCount ; m++ ) {
-      value_at_pt += dof_values[m] * bases_vals[m] ;
-      gradx_at_pt += dof_values[m] * dpsidx[m] ;
-      grady_at_pt += dof_values[m] * dpsidy[m] ;
-      gradz_at_pt += dof_values[m] * dpsidz[m] ;
-    }
-
-    const scalar_type k_detJ_weight = coeff_k        * detJ * integ_weight ;
-    const double res_val = value_at_pt * value_at_pt * detJ * integ_weight ;
-    const double mat_val = 2.0 * value_at_pt         * detJ * integ_weight ;
-
-    // $$ R_i = \int_{\Omega} \nabla \phi_i \cdot (k \nabla T) + \phi_i T^2 d \Omega $$
-    // $$ J_{i,j} = \frac{\partial R_i}{\partial T_j} = \int_{\Omega} k \nabla \phi_i \cdot \nabla \phi_j + 2 \phi_i \phi_j T d \Omega $$
-
-    for ( unsigned m = 0; m < FunctionCount; m++) {
-      double * const mat = elem_mat[m] ;
-      const float bases_val_m = bases_vals[m];
-      const float dpsidx_m    = dpsidx[m] ;
-      const float dpsidy_m    = dpsidy[m] ;
-      const float dpsidz_m    = dpsidz[m] ;
-
-      elem_res[m] += k_detJ_weight * ( dpsidx_m * gradx_at_pt +
-                                       dpsidy_m * grady_at_pt +
-                                       dpsidz_m * gradz_at_pt ) +
-                     res_val * bases_val_m ;
-
-      for( unsigned n = 0; n < FunctionCount; n++) {
-
-        mat[n] += k_detJ_weight * ( dpsidx_m * dpsidx[n] +
-                                    dpsidy_m * dpsidy[n] +
-                                    dpsidz_m * dpsidz[n] ) +
-                  mat_val * bases_val_m * bases_vals[n];
-      }
-    }
-  }
-
-  KOKKOS_INLINE_FUNCTION
-  void operator()( const unsigned ielem ) const
-  {
-    // Gather nodal coordinates and solution vector:
-
-    double x[ FunctionCount ] ;
-    double y[ FunctionCount ] ;
-    double z[ FunctionCount ] ;
-    double val[ FunctionCount ] ;
-
-    for ( unsigned i = 0 ; i < ElementNodeCount ; ++i ) {
-      const unsigned node_index = elem_node_ids( ielem , i );
-
-      x[i] = node_coords( node_index , 0 );
-      y[i] = node_coords( node_index , 1 );
-      z[i] = node_coords( node_index , 2 );
-
-      val[i] = nodal_values( node_index );
-    }
-
-    double elem_vec[ FunctionCount ] ;
-    double elem_mat[ FunctionCount ][ FunctionCount ] ;
-
-    for( unsigned i = 0; i < FunctionCount ; i++ ) {
-      elem_vec[i] = 0 ;
-      for( unsigned j = 0; j < FunctionCount ; j++){
-        elem_mat[i][j] = 0 ;
-      }
-    }
-
-    for ( unsigned i = 0 ; i < IntegrationCount ; ++i ) {
-      float dpsidx[ FunctionCount ] ;
-      float dpsidy[ FunctionCount ] ;
-      float dpsidz[ FunctionCount ] ;
-
-      const float detJ =
-        transform_gradients( elem_data.gradients[i] , x , y , z ,
-                             dpsidx , dpsidy , dpsidz );
-
-      contributeResidualJacobian( coeff_K ,
-                                  val , dpsidx , dpsidy , dpsidz ,
-                                  detJ ,
-                                  elem_data.weights[i] ,
-                                  elem_data.values[i] ,
-                                  elem_vec , elem_mat );
-    }
-
-    for( unsigned i = 0; i < FunctionCount ; i++){
-      element_vectors(ielem, i) = elem_vec[i] ;
-      for( unsigned j = 0; j < FunctionCount ; j++){
-        element_matrices(ielem, i, j) = elem_mat[i][j] ;
-      }
-    }
-  }
-
-}; /* ElementComputation */
-
-//----------------------------------------------------------------------------
-
-template< typename ScalarCoordType , unsigned ElemNode , class DeviceType ,
-          typename ScalarType >
-struct DirichletSolution<
-  FEMesh< ScalarCoordType , ElemNode , DeviceType > ,
-  ScalarType >
-{
-  typedef DeviceType  execution_space;
-
-  static const unsigned ElementNodeCount = ElemNode ;
-
-  typedef Kokkos::View< ScalarType[] , execution_space >  vector_type ;
-
-  typedef FEMesh< ScalarCoordType , ElementNodeCount , execution_space > mesh_type ;
-
-  typename mesh_type::node_coords_type node_coords ;
-
-  vector_type     solution ;
-  ScalarCoordType bc_lower_z ;
-  ScalarCoordType bc_upper_z ;
-  ScalarType      bc_lower_value ;
-  ScalarType      bc_upper_value ;
-
-  KOKKOS_INLINE_FUNCTION
-  void operator()( const unsigned inode ) const
-  {
-
-  // Apply dirichlet boundary condition on the Solution vector.
-  // Define boundary node values to be either bc_lower_value or
-  // bc_upper_value, depending on which boundary face they lie on.
-  // Non-boundary terms will be left at their previous value.
-
-    const ScalarCoordType z = node_coords(inode,2);
-    const bool bc_lower = z <= bc_lower_z ;
-    const bool bc_upper = bc_upper_z <= z ;
-
-    if ( bc_lower || bc_upper ) {
-      const ScalarType bc_value = bc_lower ? bc_lower_value
-                                           : bc_upper_value ;
-
-      solution(inode) = bc_value ; //  set the solution vector
-    }
-  }
-
-  static void apply( const vector_type    & solution ,
-                     const mesh_type      & mesh ,
-                     const ScalarCoordType  bc_lower_z ,
-                     const ScalarCoordType  bc_upper_z ,
-                     const ScalarType       bc_lower_value ,
-                     const ScalarType       bc_upper_value )
-  {
-    DirichletSolution op ;
-    op.node_coords    = mesh.node_coords ;
-    op.solution       = solution ;
-    op.bc_lower_z     = bc_lower_z ;
-    op.bc_upper_z     = bc_upper_z ;
-    op.bc_lower_value = bc_lower_value ;
-    op.bc_upper_value = bc_upper_value ;
-    parallel_for( solution.dimension_0() , op );
-  }
-};
-
-//----------------------------------------------------------------------------
-
-template< typename ScalarCoordType , unsigned ElemNode , class DeviceType ,
-          typename ScalarType >
-struct DirichletResidual<
-  FEMesh< ScalarCoordType , ElemNode , DeviceType > , ScalarType >
-{
-  typedef DeviceType     execution_space;
-  typedef typename execution_space::size_type  size_type ;
-
-  static const unsigned ElementNodeCount = ElemNode ;
-
-  typedef Kokkos::CrsMatrix< ScalarType , execution_space >    matrix_type ;
-  typedef Kokkos::View< ScalarType[] , execution_space >  vector_type ;
-
-  typedef FEMesh< ScalarCoordType , ElementNodeCount , execution_space > mesh_type ;
-
-  typename mesh_type::node_coords_type node_coords ;
-  matrix_type     matrix ;
-  vector_type     rhs ;
-  ScalarCoordType bc_lower_z ;
-  ScalarCoordType bc_upper_z ;
-
-  KOKKOS_INLINE_FUNCTION
-  void operator()( const unsigned inode ) const
-  {
-    //  Apply a dirichlet boundary condition to 'irow'
-    //  to maintain the symmetry of the original
-    //  global stiffness matrix, zero out the columns
-    //  that correspond to boundary conditions, and
-    //  adjust the load vector accordingly
-
-    const size_type iBeg = matrix.graph.row_map[inode];
-    const size_type iEnd = matrix.graph.row_map[inode+1];
-
-    const ScalarCoordType z = node_coords(inode,2);
-    const bool bc_lower = z <= bc_lower_z ;
-    const bool bc_upper = bc_upper_z <= z ;
-
-    if ( bc_lower || bc_upper ) {
-      rhs(inode) = 0 ; //  set the residual vector
-
-      //  zero each value on the row, and leave a one
-      //  on the diagonal
-
-      for( size_type i = iBeg ; i < iEnd ; i++) {
-        matrix.coefficients(i) =
-          (int) inode == matrix.graph.entries(i) ? 1 : 0 ;
-      }
-    }
-    else {
-
-      //  Find any columns that are boundary conditions.
-      //  Clear them and adjust the load vector
-
-      for( size_type i = iBeg ; i < iEnd ; i++ ) {
-        const size_type cnode = matrix.graph.entries(i) ;
-
-        const ScalarCoordType zc = node_coords(cnode,2);
-        const bool c_bc_lower = zc <= bc_lower_z ;
-        const bool c_bc_upper = bc_upper_z <= zc ;
-
-        if ( c_bc_lower || c_bc_upper ) {
-
-	   matrix.coefficients(i) = 0 ;
-        }
-      }
-    }
-  }
-
-
-  static void apply( const matrix_type & linsys_matrix ,
-                     const vector_type & linsys_rhs ,
-                     const mesh_type   & mesh ,
-                     const ScalarCoordType  bc_lower_z ,
-                     const ScalarCoordType  bc_upper_z)
-  {
-    const size_t row_count = linsys_matrix.graph.row_map.dimension_0() - 1 ;
-
-    DirichletResidual op ;
-    op.node_coords    = mesh.node_coords ;
-    op.matrix         = linsys_matrix ;
-    op.rhs            = linsys_rhs ;
-    op.bc_lower_z     = bc_lower_z ;
-    op.bc_upper_z     = bc_upper_z ;
-    parallel_for( row_count , op );
-  }
-};
-
-//----------------------------------------------------------------------------
-
-} /* namespace Nonlinear */
-} /* namespace HybridFEM */
-
-#endif /* #ifndef KOKKOS_NONLINEARFUNCTORS_HPP */
-
diff --git a/lib/kokkos/example/multi_fem/ParallelComm.hpp b/lib/kokkos/example/multi_fem/ParallelComm.hpp
deleted file mode 100644
index 37fa6243c9..0000000000
--- a/lib/kokkos/example/multi_fem/ParallelComm.hpp
+++ /dev/null
@@ -1,167 +0,0 @@
-/*
-//@HEADER
-// ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
-// the U.S. Government retains certain rights in this software.
-// 
-// 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 Corporation nor the names of the
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "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 SANDIA CORPORATION OR THE
-// 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.
-//
-// Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
-// ************************************************************************
-//@HEADER
-*/
-
-#ifndef PARALLELCOMM_HPP
-#define PARALLELCOMM_HPP
-
-//------------------------------------------------------------------------
-
-#include <Kokkos_Macros.hpp>
-
-//------------------------------------------------------------------------
-
-#if defined( KOKKOS_ENABLE_MPI )
-
-#include <mpi.h>
-#include <string>
-
-namespace comm {
-
-struct Machine {
-  MPI_Comm mpi_comm ;
-
-  Machine() : mpi_comm( MPI_COMM_NULL ) {}
-
-  Machine( const Machine & rhs )
-    : mpi_comm( rhs.mpi_comm ) {}
-
-  Machine( MPI_Comm c ) : mpi_comm( c ) {}
-
-  static Machine init( int * argc , char *** argv )
-  {
-    MPI_Init( argc , argv );
-    return Machine( MPI_COMM_WORLD );
-  }
-
-  static void finalize() { MPI_Finalize(); }
-};
-
-inline
-unsigned  size( Machine machine )
-{
-  int np ; MPI_Comm_size( machine.mpi_comm , & np ); return np ;
-}
-
-inline
-unsigned  rank( Machine machine )
-{
-  int ip ; MPI_Comm_rank( machine.mpi_comm , & ip ); return ip ;
-}
-
-inline
-double max( Machine machine , double local )
-{
-  double global = 0;
-  MPI_Allreduce( & local , & global , 1 , MPI_DOUBLE , MPI_MAX , machine.mpi_comm );
-  return global ;
-}
-
-inline
-std::string command_line( Machine machine , const int argc , const char * const * const argv )
-{
-  std::string argline ;
-
-  if ( 0 == rank( machine ) ) {
-    for ( int i = 1 ; i < argc ; ++i ) {
-      argline.append(" ").append( argv[i] );
-    }
-  }
-
-  int length = argline.length();
-  MPI_Bcast( & length , 1 , MPI_INT , 0 , machine.mpi_comm );
-  argline.resize( length , ' ' );
-  MPI_Bcast( (void*) argline.data() , length , MPI_CHAR , 0 , machine.mpi_comm );
-
-  return argline ;
-}
-
-}
-
-#else /* ! defined( KOKKOS_ENABLE_MPI ) */
-
-#include <string>
-
-namespace comm {
-
-// Stub for non-parallel
-
-struct Machine {
-  static Machine init( int * , char *** )
-  { return Machine(); }
-
-  static void finalize() {}
-};
-
-inline
-unsigned  size( Machine ) { return 1 ; }
-
-inline
-unsigned  rank( Machine ) { return 0 ; }
-
-inline
-double max( Machine , double local )
-{ return local ; }
-
-inline
-std::string command_line( Machine machine , const int argc , const char * const * const argv )
-{
-  std::string argline ;
-
-  if ( 0 == rank( machine ) ) {
-    for ( int i = 1 ; i < argc ; ++i ) {
-      argline.append(" ").append( argv[i] );
-    }
-  }
-
-  return argline ;
-}
-
-}
-
-#endif /* ! defined( KOKKOS_ENABLE_MPI ) */
-
-//------------------------------------------------------------------------
-
-#endif /* #ifndef PARALLELCOMM_HPP */
-
-
diff --git a/lib/kokkos/example/multi_fem/ParallelDataMap.hpp b/lib/kokkos/example/multi_fem/ParallelDataMap.hpp
deleted file mode 100644
index 12d7add5a5..0000000000
--- a/lib/kokkos/example/multi_fem/ParallelDataMap.hpp
+++ /dev/null
@@ -1,517 +0,0 @@
-/*
-//@HEADER
-// ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
-// the U.S. Government retains certain rights in this software.
-// 
-// 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 Corporation nor the names of the
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "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 SANDIA CORPORATION OR THE
-// 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.
-//
-// Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
-// ************************************************************************
-//@HEADER
-*/
-
-#ifndef KOKKOS_PARALLELDATAMAP_HPP
-#define KOKKOS_PARALLELDATAMAP_HPP
-
-#include <utility>
-#include <limits>
-#include <iostream>
-#include <sstream>
-#include <stdexcept>
-
-#include <Kokkos_Core.hpp>
-#include <ParallelComm.hpp>
-
-namespace Kokkos {
-
-//----------------------------------------------------------------------------
-/** \brief  Parallel distributed data mapping
- *
- *  ordering { interior : { owned items not sent elsewhere }
- *             send     : { owned items sent }
- *             receive  : { not-owned items received } }
- *
- *  recv { { N ghosted items from process P : ( P , N ) } }
- *
- *  send { { N send items to process P : ( P , N ) } }
- *
- *  send_item { send item offsets within 'send' range }
- */
-struct ParallelDataMap {
-  typedef View< unsigned*[2], HostSpace >  host_recv_type ;
-  typedef View< unsigned*[2], HostSpace >  host_send_type ;
-  typedef View< unsigned* ,   HostSpace >  host_send_item_type ;
-
-  comm::Machine        machine ;
-  host_recv_type       host_recv ;
-  host_send_type       host_send ;
-  host_send_item_type  host_send_item ;
-  unsigned             count_interior ;
-  unsigned             count_send ;
-  unsigned             count_owned ; // = count_interior + count_send
-  unsigned             count_receive ;
-
-  void assign( const unsigned arg_count_interior ,
-               const unsigned arg_count_owned ,
-               const unsigned arg_count_total ,
-               const unsigned arg_recv_msg ,
-               const unsigned arg_send_msg ,
-               const unsigned arg_send_count )
-  {
-    const std::string label("Kokkos::ParallelDataMap buffer");
-
-    count_interior = arg_count_interior ;
-    count_owned    = arg_count_owned ;
-    count_send     = arg_count_owned - arg_count_interior ;
-    count_receive  = arg_count_total - arg_count_owned ;
-
-    host_recv = host_recv_type( label , arg_recv_msg );
-    host_send = host_send_type( label , arg_send_msg );
-    host_send_item = host_send_item_type( label , arg_send_count );
-  }
-};
-
-//----------------------------------------------------------------------------
-//PackArray
-//----------------------------------------------------------------------------
-template< class ArrayType , class Rank = void >
-struct PackArray ;
-
-template< typename DeviceType, typename ValueType >
-struct PackArray< View< ValueType* , DeviceType > , void >
-{
-  typedef DeviceType                         execution_space ;
-  typedef typename DeviceType::size_type     size_type ;
-  typedef View< ValueType* , execution_space >  array_type ;
-  typedef View< ValueType* , execution_space >  buffer_type ;
-
-private:
-
-  buffer_type  output ;
-  array_type   input ;
-  size_type    base ;
-
-public:
-
-  KOKKOS_INLINE_FUNCTION
-  void operator()( const size_type i ) const
-  { output[i] = input(base+i); }
-
-  inline
-  static
-  void pack( const buffer_type & arg_output ,
-             const size_type     arg_begin ,
-             const size_type     arg_count ,
-             const array_type  & arg_input )
-  {
-    PackArray op ;
-    op.output = arg_output ;
-    op.input  = arg_input ;
-    op.base   = arg_begin ;
-    parallel_for( arg_count , op );
-  }
-};
-
-template< typename DeviceType, typename ValueType , unsigned N1 >
-struct PackArray< View< ValueType*[N1] , DeviceType > , void >
-{
-  typedef DeviceType                                  execution_space ;
-  typedef typename DeviceType::size_type              size_type ;
-  typedef View< ValueType*[N1] , execution_space >       array_type ;
-  typedef View< ValueType* , execution_space >           buffer_type ;
-
-private:
-
-  buffer_type  output ;
-  array_type   input ;
-  size_type    base ;
-
-public:
-
-  KOKKOS_INLINE_FUNCTION
-  void operator()( const size_type i ) const
-  {
-    for ( size_type j = 0 , k = i * N1 ; j < N1 ; ++j , ++k ) {
-      output[k] = input(base+i,j);
-    }
-  }
-
-  inline static
-  void pack( const buffer_type & arg_output ,
-             const size_type     arg_begin ,
-             const size_type     arg_count ,
-             const array_type  & arg_input )
-  {
-    if ( arg_count ) {
-      PackArray op ;
-      op.output = arg_output ;
-      op.input  = arg_input ;
-      op.base   = arg_begin ;
-      parallel_for( arg_count , op );
-    }
-  }
-};
-
-//----------------------------------------------------------------------------
-//UnpackArray
-//----------------------------------------------------------------------------
-template< class ArrayType , class Rank = void > struct UnpackArray ;
-
-template< typename DeviceType, typename ValueType >
-struct UnpackArray< View< ValueType* , DeviceType > , void >
-{
-  typedef DeviceType                         execution_space ;
-  typedef typename DeviceType::size_type     size_type ;
-  typedef View< ValueType* , execution_space >  array_type ;
-  typedef View< ValueType* , execution_space >  buffer_type ;
-
-private:
-
-  array_type   output ;
-  buffer_type  input ;
-  size_type    base ;
-
-public:
-
-  KOKKOS_INLINE_FUNCTION
-  void operator()( const size_type i ) const
-  { output(base+i) = input[i]; }
-
-  inline
-  static
-  void unpack( const array_type  & arg_output ,
-               const buffer_type & arg_input ,
-               const size_type     arg_begin ,
-               const size_type     arg_count )
-  {
-    UnpackArray op ;
-    op.output = arg_output ;
-    op.input  = arg_input ;
-    op.base   = arg_begin ;
-    parallel_for( arg_count , op );
-  }
-};
-
-template< typename DeviceType, typename ValueType , unsigned N1 >
-struct UnpackArray< View< ValueType*[N1] , DeviceType > , void >
-{
-  typedef DeviceType                                  execution_space ;
-  typedef typename DeviceType::size_type              size_type ;
-  typedef View< ValueType* , execution_space >           buffer_type ;
-  typedef View< ValueType*[N1] , execution_space >       array_type ;
-
-private:
-
-  array_type   output ;
-  buffer_type  input ;
-  size_type    base ;
-
-public:
-
-  KOKKOS_INLINE_FUNCTION
-  void operator()( const size_type i ) const
-  {
-    for ( size_type j = 0 , k = i * N1 ; j < N1 ; ++j , ++k ) {
-      output(base+i,j) = input(k);
-    }
-  }
-
-  inline
-  static
-  void unpack( const array_type  & arg_output ,
-               const buffer_type & arg_input ,
-               const size_type     arg_begin ,
-               const size_type     arg_count )
-  {
-    if ( arg_count ) {
-      UnpackArray op ;
-      op.output = arg_output ;
-      op.input  = arg_input ;
-      op.base   = arg_begin ;
-      parallel_for( arg_count , op );
-    }
-  }
-};
-//----------------------------------------------------------------------------
-template< class ValueType , class Device , class DataMap >
-class AsyncExchange ;
-
-} // namespace Kokkos
-
-//----------------------------------------------------------------------------
-// Application call procedure:
-//
-// construct: AsyncExchange object
-// * pack send buffer on device
-// initiate: copy send buffer from device to host
-// * dispatch asynchronous local work
-// complete: send/receive on host, copy receive buffer to device
-// * unpack receive buffer on device
-// destroy: AsyncExchange object
-//
-//----------------------------------------------------------------------------
-
-#ifdef KOKKOS_ENABLE_MPI
-
-namespace Kokkos {
-
-template< class ValueType , class Device >
-class AsyncExchange< ValueType, Device , Kokkos::ParallelDataMap > {
-public:
-
-  typedef Device                                    execution_space ;
-  typedef Kokkos::ParallelDataMap                   data_map_type ;
-  typedef Kokkos::View< ValueType* , execution_space >  buffer_dev_type ;
-  typedef typename buffer_dev_type::HostMirror      buffer_host_type ;
-
-private:
-
-  static const int mpi_tag = 11 ;
-
-  const data_map_type  data_map ;
-  unsigned             chunk_size ;
-  unsigned             send_count_max ;
-  buffer_host_type     host_recv_buffer ;
-  buffer_host_type     host_send_buffer ;
-  buffer_host_type     send_msg_buffer ;
-  buffer_dev_type      dev_buffer ;
-  buffer_dev_type      dev_send_buffer ; // Subview for send
-  buffer_dev_type      dev_recv_buffer ; // Subview for receive
-  std::vector< MPI_Request > recv_request ;
-
-public:
-
-  const buffer_dev_type & buffer() const { return dev_buffer ; }
-
-  AsyncExchange( const data_map_type & arg_data_map ,
-                 const size_t          arg_chunk )
-  : data_map( arg_data_map )
-  , chunk_size( arg_chunk )
-  , send_count_max( 0 )
-  , host_recv_buffer()
-  , host_send_buffer()
-  , send_msg_buffer()
-  , dev_buffer()
-  , dev_send_buffer()
-  , dev_recv_buffer()
-  , recv_request()
-  {
-    const size_t send_msg_count = arg_data_map.host_send.dimension_0();
-    const size_t recv_msg_count = arg_data_map.host_recv.dimension_0();
-
-    const size_t send_msg_length = arg_chunk * arg_data_map.count_send ;
-    const size_t recv_msg_length = arg_chunk * arg_data_map.count_receive ;
-
-    for ( size_t i = 0 ; i < send_msg_count ; ++i ) {
-      send_count_max = std::max( send_count_max ,
-                                 (unsigned) arg_data_map.host_send(i,1) );
-    }
-
-    // A single shared buffer on the device can be used for
-    // send and receive message buffers.
-    dev_buffer = buffer_dev_type(
-                     std::string("AsyncExchange dev_buffer") ,
-                     std::max( send_msg_length , recv_msg_length ) );
-
-    // Total send subview of the device buffer
-    dev_send_buffer =
-      Kokkos::subview( dev_buffer , std::pair<size_t,size_t>( 0 , send_msg_length ) );
-
-    // Total receive subview of the device buffer
-    dev_recv_buffer =
-      Kokkos::subview( dev_buffer , std::pair<size_t,size_t>( 0 , recv_msg_length ) );
-
-    // Total receive message buffer on the host:
-    host_recv_buffer = buffer_host_type(
-                           std::string("AsyncExchange host_recv_buffer") ,
-                           recv_msg_length );
-
-    // Total send message buffer on the host:
-    host_send_buffer = buffer_host_type(
-                           std::string("AsyncExchange host_send_buffer") ,
-                           send_msg_length );
-
-    // Individual send message buffer on the host:
-    send_msg_buffer = buffer_host_type(
-                          std::string("AsyncExchange send_msg_buffer") ,
-                          arg_chunk * send_count_max );
-
-    // MPI asynchronous receive request handles:
-    recv_request.assign( recv_msg_count , MPI_REQUEST_NULL );
-  }
-
-  //------------------------------------------------------------------------
-
-  void setup()
-  {
-    { // Post receives:
-      const size_t recv_msg_count = data_map.host_recv.dimension_0();
-
-      ValueType * ptr = host_recv_buffer.ptr_on_device();
-
-      for ( size_t i = 0 ; i < recv_msg_count ; ++i ) {
-        const int proc  = data_map.host_recv(i,0);
-        const int count = data_map.host_recv(i,1) * chunk_size ;
-
-        MPI_Irecv( ptr , count * sizeof(ValueType) , MPI_BYTE ,
-                   proc , mpi_tag , data_map.machine.mpi_comm ,
-                   & recv_request[i] );
-
-        ptr += count ;
-      }
-    }
-
-    // Copy send buffer from the device to host memory for sending
-
-    Kokkos::deep_copy( host_send_buffer , dev_send_buffer );
-
-    // Done with the device until communication is complete.
-    // Application can dispatch asynchronous work on the device.
-  }
-
-  // Application can dispatch local work to device ...
-  // No communication progress until main thread calls 'send_receive'
-
-  void send_receive()
-  {
-    const size_t recv_msg_count = data_map.host_recv.dimension_0();
-    const size_t send_msg_count = data_map.host_send.dimension_0();
-
-    // Pack and send:
-
-    for ( size_t i = 0 , j = 0 ; i < send_msg_count ; ++i ) {
-      const int proc  = data_map.host_send(i,0);
-      const int count = data_map.host_send(i,1);
-
-      for ( int k = 0 , km = 0 ; k < count ; ++k , ++j ) {
-        const int km_end = km + chunk_size ;
-        int ki = chunk_size * data_map.host_send_item(j);
-
-        for ( ; km < km_end ; ++km , ++ki ) {
-          send_msg_buffer[km] = host_send_buffer[ki];
-        }
-      }
-
-      // MPI_Ssend blocks until
-      // (1) a receive is matched for the message and
-      // (2) the send buffer can be re-used.
-      //
-      // It is suggested that MPI_Ssend will have the best performance:
-      // http://www.mcs.anl.gov/research/projects/mpi/sendmode.html .
-
-      MPI_Ssend( send_msg_buffer.ptr_on_device(),
-                 count * chunk_size * sizeof(ValueType) , MPI_BYTE ,
-                 proc , mpi_tag , data_map.machine.mpi_comm );
-    }
-
-    // Wait for receives and verify:
-
-    for ( size_t i = 0 ; i < recv_msg_count ; ++i ) {
-      MPI_Status recv_status ;
-      int recv_which = 0 ;
-      int recv_size  = 0 ;
-
-      MPI_Waitany( recv_msg_count , & recv_request[0] ,
-                   & recv_which , & recv_status );
-
-      const int recv_proc = recv_status.MPI_SOURCE ;
-
-      MPI_Get_count( & recv_status , MPI_BYTE , & recv_size );
-
-      // Verify message properly received:
-
-      const int  expected_proc = data_map.host_recv(recv_which,0);
-      const int  expected_size = data_map.host_recv(recv_which,1) *
-                                 chunk_size * sizeof(ValueType);
-
-      if ( ( expected_proc != recv_proc ) ||
-           ( expected_size != recv_size ) ) {
-        std::ostringstream msg ;
-        msg << "AsyncExchange error:"
-            << " P" << comm::rank( data_map.machine )
-            << " received from P" << recv_proc
-            << " size "     << recv_size
-            << " expected " << expected_size
-            << " from P"    << expected_proc ;
-        throw std::runtime_error( msg.str() );
-      }
-    }
-
-    // Copy received data to device memory.
-
-    Kokkos::deep_copy( dev_recv_buffer , host_recv_buffer );
-  }
-};
-
-} // namespace Kokkos
-
-#else /* ! #ifdef KOKKOS_ENABLE_MPI */
-
-namespace Kokkos {
-
-template< class ValueType , class Device >
-class AsyncExchange< ValueType, Device , Kokkos::ParallelDataMap > {
-public:
-
-  typedef Device                                    execution_space ;
-  typedef Kokkos::ParallelDataMap                   data_map_type ;
-  typedef Kokkos::View< ValueType* , execution_space >  buffer_dev_type ;
-  typedef typename buffer_dev_type::HostMirror      buffer_host_type ;
-
-  buffer_dev_type      dev_buffer ;
-
-public:
-
-  const buffer_dev_type & buffer() const { return dev_buffer ; }
-
-  AsyncExchange( const data_map_type & , const size_t )
-  : dev_buffer()
-  { }
-
-  //------------------------------------------------------------------------
-
-  void setup() { }
-
-  void send_receive() { }
-};
-
-} // namespace Kokkos
-
-#endif /* ! #ifdef KOKKOS_ENABLE_MPI */
-
-//----------------------------------------------------------------------------
-
-#endif /* #ifndef KOKKOS_PARALLELDATAMAP_HPP */
-
-
diff --git a/lib/kokkos/example/multi_fem/ParallelMachine.cpp b/lib/kokkos/example/multi_fem/ParallelMachine.cpp
deleted file mode 100644
index 49545e6a57..0000000000
--- a/lib/kokkos/example/multi_fem/ParallelMachine.cpp
+++ /dev/null
@@ -1,178 +0,0 @@
-/*
-//@HEADER
-// ************************************************************************
-//
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
-// the U.S. Government retains certain rights in this software.
-//
-// 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 Corporation nor the names of the
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "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 SANDIA CORPORATION OR THE
-// 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.
-//
-// Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-//
-// ************************************************************************
-//@HEADER
-*/
-
-#if 0
-
-#include <cstdlib>
-#include <cstring>
-
-#include <ParallelMachine.hpp>
-
-#include <Kokkos_Core.hpp>
-
-#if ! defined( KOKKOS_ENABLE_MPI )
-#define MPI_COMM_NULL 0
-#endif
-
-//------------------------------------------------------------------------
-
-namespace Parallel {
-
-Machine::Machine( int * argc , char *** argv )
-  : m_mpi_comm( MPI_COMM_NULL )
-  , m_mpi_size(0)
-  , m_mpi_rank(0)
-  , m_mpi_gpu(0)
-{
-
-#if defined( KOKKOS_ENABLE_CUDA )
-  //------------------------------------
-  // Might be using a Cuda aware version of MPI.
-  // Must select Cuda device before initializing MPI.
-  {
-    int i = 1 ;
-    for ( ; i < *argc && strcmp((*argv)[i],"mpi_cuda") ; ++i );
-
-    if ( i < *argc ) {
-      // Determine, if possible, what will be the node-local
-      // rank of the MPI process once MPI has been initialized.
-      // This rank is needed to set the Cuda device before 'mvapich'
-      // is initialized.
-
-      const char * const mvapich_local_rank = getenv("MV2_COMM_WORLD_LOCAL_RANK");
-      const char * const slurm_local_rank   = getenv("SLURM_LOCALID");
-
-      const int pre_mpi_local_rank =
-        0 != mvapich_local_rank ? atoi( mvapich_local_rank ) : (
-        0 != slurm_local_rank   ? atoi( slurm_local_rank ) : (
-        -1 ) );
-
-      if ( 0 <= pre_mpi_local_rank ) {
-
-        const int ngpu = Kokkos::Cuda::detect_device_count();
-
-        const int cuda_device_rank = pre_mpi_local_rank % ngpu ;
-
-        Kokkos::Cuda::initialize( Kokkos::Cuda::SelectDevice( cuda_device_rank ) );
-
-        m_mpi_gpu = 1 ;
-      }
-    }
-  }
-#endif
-
-  //------------------------------------
-
-#if defined( KOKKOS_ENABLE_MPI )
-  MPI_Init( argc , argv );
-  m_mpi_comm = MPI_COMM_WORLD ;
-  MPI_Comm_size( m_mpi_comm , & m_mpi_size );
-  MPI_Comm_rank( m_mpi_comm , & m_mpi_rank );
-#endif
-
-  // Query hwloc after MPI initialization to allow MPI binding:
-  //------------------------------------
-  // Request to use host device:
-  {
-    int i = 1 ;
-    for ( ; i < *argc && strcmp((*argv)[i],"host") ; ++i );
-
-    if ( i < *argc ) {
-
-      unsigned team_count       = Kokkos::hwloc::get_available_numa_count();
-      unsigned threads_per_team = Kokkos::hwloc::get_available_cores_per_numa() *
-                                  Kokkos::hwloc::get_available_threads_per_core();
-
-      if ( i + 2 < *argc ) {
-        team_count       = atoi( (*argv)[i+1] );
-        threads_per_team = atoi( (*argv)[i+2] );
-      }
-
-      Kokkos::Threads::initialize( team_count * threads_per_team );
-    }
-  }
-
-#if defined( KOKKOS_ENABLE_CUDA )
-  //------------------------------------
-  // Request to use Cuda device and not already initialized.
-  if ( ! m_mpi_gpu ) {
-    int i = 1 ;
-    for ( ; i < *argc && strcmp((*argv)[i],"mpi_cuda") && strcmp((*argv)[i],"cuda") ; ++i );
-
-    if ( i < *argc ) {
-
-      const int ngpu = Kokkos::Cuda::detect_device_count();
-
-      const int cuda_device_rank = m_mpi_rank % ngpu ;
-
-      Kokkos::Cuda::initialize( Kokkos::Cuda::SelectDevice( cuda_device_rank ) );
-    }
-  }
-#endif
-
-}
-
-Machine::~Machine()
-{
-  Kokkos::Threads::finalize();
-#if defined( KOKKOS_ENABLE_CUDA )
-  Kokkos::Cuda::finalize();
-#endif
-#if defined( KOKKOS_ENABLE_MPI )
-  MPI_Finalize();
-#endif
-}
-
-void Machine::print_configuration( std::ostream & msg ) const
-{
-  msg << "MPI [ " << m_mpi_rank << " / " << m_mpi_size << " ]" << std::endl ;
-  Kokkos::Threads::print_configuration( msg );
-#if defined( KOKKOS_ENABLE_CUDA )
-  Kokkos::Cuda::print_configuration( msg );
-#endif
-}
-
-}
-
-#endif /* #if 0 */
-
diff --git a/lib/kokkos/example/multi_fem/ParallelMachine.hpp b/lib/kokkos/example/multi_fem/ParallelMachine.hpp
deleted file mode 100644
index 14894f3213..0000000000
--- a/lib/kokkos/example/multi_fem/ParallelMachine.hpp
+++ /dev/null
@@ -1,118 +0,0 @@
-/*
-//@HEADER
-// ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
-// the U.S. Government retains certain rights in this software.
-// 
-// 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 Corporation nor the names of the
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "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 SANDIA CORPORATION OR THE
-// 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.
-//
-// Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
-// ************************************************************************
-//@HEADER
-*/
-
-#error "ParallelMachine"
-
-#ifndef PARALLELMACHINE_HPP
-#define PARALLELMACHINE_HPP
-
-//------------------------------------------------------------------------
-
-#include <iosfwd>
-
-#include <Kokkos_Core.hpp>
-
-//------------------------------------------------------------------------
-
-#if defined( KOKKOS_ENABLE_MPI )
-#include <mpi.h>
-#else
-  typedef int MPI_Comm ;
-#endif
-
-//------------------------------------------------------------------------
-//------------------------------------------------------------------------
-
-namespace Parallel {
-
-/** \brief  Hybrid parallel machine with MPI+Kokkos::Threads or MPI+Kokkos::Cuda.
- *
- *  Initialization of MPI and Kokkos device has interdependencies which this
- *  class manages.  The command line and environment variables are queried to initialize
- *  the Threads or Cuda device:
- *
- *    1)  cuda               : initializes Cuda device
- *    2)  host               : initializes Threads device with all hwloc detected cores.
- *    3)  host #gang #worker : initializes Threads with specified
- */
-class Machine {
-private:
-
-  MPI_Comm m_mpi_comm ;
-  int      m_mpi_size ;
-  int      m_mpi_rank ;
-  unsigned m_mpi_gpu ;
-  unsigned m_gpu_arch ;
-
-  Machine();
-  Machine( const Machine & );
-  Machine & operator = ( const Machine & );
-
-public:
-
-  /** \brief  Coordinated initialize MPI, Cuda, or Threads devices from 'main'.  */
-  Machine( int * argc , char *** argv );
-
-  ~Machine();
-
-  MPI_Comm mpi_comm() const { return m_mpi_comm ; }
-
-  int mpi_size() const { return m_mpi_size ; }
-  int mpi_rank() const { return m_mpi_rank ; }
-
-  /** \brief  If using MPI that can directly operate on GPU memory */
-  bool mpi_gpu() const { return m_mpi_gpu ; }
-
-  /** \brief  If using GPU then what architecture */
-  unsigned gpu_arch() const { return m_gpu_arch ; }
-
-  void print_configuration( std::ostream & ) const ;
-};
-
-}
-
-//------------------------------------------------------------------------
-
-#endif /* #ifndef PARALLELMACHINE_HPP */
-
-
diff --git a/lib/kokkos/example/multi_fem/SparseLinearSystem.hpp b/lib/kokkos/example/multi_fem/SparseLinearSystem.hpp
deleted file mode 100644
index c07ae21b7e..0000000000
--- a/lib/kokkos/example/multi_fem/SparseLinearSystem.hpp
+++ /dev/null
@@ -1,404 +0,0 @@
-/*
-//@HEADER
-// ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
-// the U.S. Government retains certain rights in this software.
-// 
-// 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 Corporation nor the names of the
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "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 SANDIA CORPORATION OR THE
-// 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.
-//
-// Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
-// ************************************************************************
-//@HEADER
-*/
-
-#ifndef SPARSELINEARSYSTEM_HPP
-#define SPARSELINEARSYSTEM_HPP
-
-#include <cmath>
-#include <impl/Kokkos_Timer.hpp>
-
-#include <Kokkos_Core.hpp>
-#include <Kokkos_StaticCrsGraph.hpp>
-
-#include <LinAlgBLAS.hpp>
-
-namespace Kokkos {
-
-template< typename ScalarType , class Device >
-struct CrsMatrix {
-  typedef Device      execution_space ;
-  typedef ScalarType  value_type ;
-
-#ifdef KOKKOS_ENABLE_DEPRECATED_CODE
-  typedef StaticCrsGraph< int , execution_space , void , int , void >  graph_type ;
-#else
-  typedef StaticCrsGraph< int , execution_space , void , void , int >  graph_type ;
-#endif
-  typedef View< value_type* , execution_space >   coefficients_type ;
-
-  graph_type         graph ;
-  coefficients_type  coefficients ;
-};
-
-//----------------------------------------------------------------------------
-
-namespace Impl {
-
-template< class Matrix , class OutputVector , class InputVector >
-struct Multiply ;
-
-}
-}
-
-//----------------------------------------------------------------------------
-//----------------------------------------------------------------------------
-
-namespace Kokkos {
-namespace Impl {
-
-template< typename AScalarType ,
-          typename VScalarType ,
-          class DeviceType >
-struct Multiply< CrsMatrix<AScalarType,DeviceType> ,
-                 View<VScalarType*,DeviceType > ,
-                 View<VScalarType*,DeviceType > >
-{
-  typedef DeviceType                       execution_space ;
-  typedef typename execution_space::size_type  size_type ;
-
-  typedef View<       VScalarType*, execution_space, MemoryUnmanaged >  vector_type ;
-  typedef View< const VScalarType*, execution_space, MemoryUnmanaged >  vector_const_type ;
-
-  typedef CrsMatrix< AScalarType , execution_space >    matrix_type ;
-
-private:
-
-  matrix_type        m_A ;
-  vector_const_type  m_x ;
-  vector_type        m_y ;
-
-public:
-
-  //--------------------------------------------------------------------------
-
-  KOKKOS_INLINE_FUNCTION
-  void operator()( const size_type iRow ) const
-  {
-    const size_type iEntryBegin = m_A.graph.row_map[iRow];
-    const size_type iEntryEnd   = m_A.graph.row_map[iRow+1];
-
-    double sum = 0 ;
-
-#if defined( __INTEL_COMPILER )
-#pragma simd reduction(+:sum)
-#pragma ivdep
-    for ( size_type iEntry = iEntryBegin ; iEntry < iEntryEnd ; ++iEntry ) {
-      sum += m_A.coefficients(iEntry) * m_x( m_A.graph.entries(iEntry) );
-    }
-#else
-    for ( size_type iEntry = iEntryBegin ; iEntry < iEntryEnd ; ++iEntry ) {
-      sum += m_A.coefficients(iEntry) * m_x( m_A.graph.entries(iEntry) );
-    }
-#endif
-
-    m_y(iRow) = sum ;
-  }
-
-  Multiply( const matrix_type & A ,
-            const size_type nrow ,
-            const size_type , // ncol ,
-            const vector_type & x ,
-            const vector_type & y )
-    : m_A( A ), m_x( x ), m_y( y )
-  {
-    parallel_for( nrow , *this );
-  }
-};
-
-//----------------------------------------------------------------------------
-
-} // namespace Impl
-} // namespace Kokkos
-
-//----------------------------------------------------------------------------
-//----------------------------------------------------------------------------
-
-namespace Kokkos {
-
-//----------------------------------------------------------------------------
-
-template< typename AScalarType ,
-          typename VScalarType ,
-          class Device >
-class Operator {
-  typedef CrsMatrix<AScalarType,Device>  matrix_type ;
-  typedef View<VScalarType*,Device>     vector_type ;
-
-private:
-  const CrsMatrix<AScalarType,Device> A ;
-
-  ParallelDataMap                                         data_map ;
-  AsyncExchange< VScalarType , Device , ParallelDataMap > exchange ;
-
-public:
-
-  Operator( const ParallelDataMap                  & arg_data_map ,
-            const CrsMatrix<AScalarType,Device>    & arg_A )
-    : A( arg_A )
-    , data_map( arg_data_map )
-    , exchange( arg_data_map , 1 )
-    {}
-
-  void apply( const View<VScalarType*,Device>  & x ,
-              const View<VScalarType*,Device>  & y )
-  {
-    // Gather off-processor data for 'x'
-
-    PackArray< vector_type >::pack( exchange.buffer() ,
-                                    data_map.count_interior ,
-                                    data_map.count_send , x );
-
-    exchange.setup();
-
-    // If interior & boundary matrices then could launch interior multiply
-
-    exchange.send_receive();
-
-    UnpackArray< vector_type >::unpack( x , exchange.buffer() ,
-                                        data_map.count_owned ,
-                                        data_map.count_receive );
-
-    const typename Device::size_type nrow = data_map.count_owned ;
-    const typename Device::size_type ncol = data_map.count_owned +
-                                            data_map.count_receive ;
-
-    Impl::Multiply<matrix_type,vector_type,vector_type>( A, nrow, ncol, x, y);
-  }
-};
-
-//----------------------------------------------------------------------------
-
-template< typename AScalarType , typename VScalarType , class Device >
-void cgsolve(
-  const ParallelDataMap                 data_map ,
-  const CrsMatrix<AScalarType,Device>   A ,
-  const View<VScalarType*,Device> b ,
-  const View<VScalarType*,Device> x ,
-  size_t & iteration ,
-  double & normr ,
-  double & iter_time ,
-  const size_t maximum_iteration = 200 ,
-  const double tolerance = std::numeric_limits<VScalarType>::epsilon() )
-{
-  typedef View<VScalarType*,Device> vector_type ;
-  //typedef View<VScalarType,  Device> value_type ; // unused
-
-  const size_t count_owned = data_map.count_owned ;
-  const size_t count_total = data_map.count_owned + data_map.count_receive ;
-
-  Operator<AScalarType,VScalarType,Device> matrix_operator( data_map , A );
-
-  // Need input vector to matvec to be owned + received
-  vector_type pAll ( "cg::p" , count_total );
-
-  vector_type p = Kokkos::subview( pAll , std::pair<size_t,size_t>(0,count_owned) );
-  vector_type r ( "cg::r" , count_owned );
-  vector_type Ap( "cg::Ap", count_owned );
-
-  /* r = b - A * x ; */
-
-  /* p  = x      */ deep_copy( p , x );
-  /* Ap = A * p  */ matrix_operator.apply( pAll , Ap );
-  /* r  = b - Ap */ waxpby( count_owned , 1.0 , b , -1.0 , Ap , r );
-  /* p  = r      */ deep_copy( p , r );
-
-  double old_rdot = dot( count_owned , r , data_map.machine );
-
-  normr     = std::sqrt( old_rdot );
-  iteration = 0 ;
-
-  Kokkos::Timer wall_clock ;
-
-  while ( tolerance < normr && iteration < maximum_iteration ) {
-
-    /* pAp_dot = dot( p , Ap = A * p ) */
-
-    /* Ap = A * p  */ matrix_operator.apply( pAll , Ap );
-
-    const double pAp_dot = dot( count_owned , p , Ap , data_map.machine );
-    const double alpha   = old_rdot / pAp_dot ;
-
-    /* x += alpha * p ;  */ axpy( count_owned,  alpha, p , x );
-    /* r -= alpha * Ap ; */ axpy( count_owned, -alpha, Ap, r );
-
-    const double r_dot = dot( count_owned , r , data_map.machine );
-    const double beta  = r_dot / old_rdot ;
-
-    /* p = r + beta * p ; */ xpby( count_owned , r , beta , p );
-
-    normr = std::sqrt( old_rdot = r_dot );
-    ++iteration ;
-  }
-
-  iter_time = wall_clock.seconds();
-}
-
-//----------------------------------------------------------------------------
-
-} // namespace Kokkos
-
-//----------------------------------------------------------------------------
-//----------------------------------------------------------------------------
-
-#if defined( KOKKOS_ENABLE_CUDA )
-
-#if ( CUDA_VERSION < 6000 )
-#pragma message "cusparse_v2.h"
-#include <cusparse_v2.h>
-#else
-#pragma message "cusparse.h"
-#include <cusparse.h>
-#endif
-
-namespace Kokkos {
-namespace Impl {
-
-struct CudaSparseSingleton {
-  cusparseHandle_t   handle;
-  cusparseMatDescr_t descra;
-
-  CudaSparseSingleton()
-  {
-    cusparseCreate( & handle );
-    cusparseCreateMatDescr( & descra );
-    cusparseSetMatType(       descra , CUSPARSE_MATRIX_TYPE_GENERAL );
-    cusparseSetMatIndexBase(  descra , CUSPARSE_INDEX_BASE_ZERO );
-  }
-
-  static CudaSparseSingleton & singleton();
-
-};
-
-template<>
-struct Multiply< CrsMatrix<double,Cuda> ,
-                 View<double*,Cuda > ,
-                 View<double*,Cuda > >
-{
-  typedef Cuda                                      execution_space ;
-  typedef execution_space::size_type                    size_type ;
-  typedef double                                    scalar_type ;
-  typedef View< scalar_type* , execution_space >        vector_type ;
-  typedef CrsMatrix< scalar_type , execution_space >    matrix_type ;
-
-public:
-
-  Multiply( const matrix_type & A ,
-            const size_type nrow ,
-            const size_type ncol ,
-            const vector_type & x ,
-            const vector_type & y )
-  {
-    CudaSparseSingleton & s = CudaSparseSingleton::singleton();
-    const scalar_type alpha = 1 , beta = 0 ;
-
-    cusparseStatus_t status =
-      cusparseDcsrmv( s.handle ,
-                      CUSPARSE_OPERATION_NON_TRANSPOSE ,
-                      nrow , ncol , A.coefficients.dimension_0() ,
-                      &alpha ,
-                      s.descra ,
-                      A.coefficients.ptr_on_device() ,
-                      A.graph.row_map.ptr_on_device() ,
-                      A.graph.entries.ptr_on_device() ,
-                      x.ptr_on_device() ,
-                      &beta ,
-                      y.ptr_on_device() );
-
-    if ( CUSPARSE_STATUS_SUCCESS != status ) {
-      throw std::runtime_error( std::string("ERROR - cusparseDcsrmv " ) );
-    }
-  }
-};
-
-
-template<>
-struct Multiply< CrsMatrix<float,Cuda> ,
-                 View<float*,Cuda > ,
-                 View<float*,Cuda > >
-{
-  typedef Cuda                                      execution_space ;
-  typedef execution_space::size_type                    size_type ;
-  typedef float                                     scalar_type ;
-  typedef View< scalar_type* , execution_space >        vector_type ;
-  typedef CrsMatrix< scalar_type , execution_space >    matrix_type ;
-
-public:
-
-  Multiply( const matrix_type & A ,
-            const size_type nrow ,
-            const size_type ncol ,
-            const vector_type & x ,
-            const vector_type & y )
-  {
-    CudaSparseSingleton & s = CudaSparseSingleton::singleton();
-    const scalar_type alpha = 1 , beta = 0 ;
-
-    cusparseStatus_t status =
-      cusparseScsrmv( s.handle ,
-                      CUSPARSE_OPERATION_NON_TRANSPOSE ,
-                      nrow , ncol , A.coefficients.dimension_0() ,
-                      &alpha ,
-                      s.descra ,
-                      A.coefficients.ptr_on_device() ,
-                      A.graph.row_map.ptr_on_device() ,
-                      A.graph.entries.ptr_on_device() ,
-                      x.ptr_on_device() ,
-                      &beta ,
-                      y.ptr_on_device() );
-
-    if ( CUSPARSE_STATUS_SUCCESS != status ) {
-      throw std::runtime_error( std::string("ERROR - cusparseDcsrmv " ) );
-    }
-  }
-};
-
-} /* namespace Impl */
-} /* namespace Kokkos */
-
-#endif /* #if defined( KOKKOS_ENABLE_CUDA ) */
-
-//----------------------------------------------------------------------------
-//----------------------------------------------------------------------------
-
-#endif /* #ifndef SPARSELINEARSYSTEM_HPP */
-
diff --git a/lib/kokkos/example/multi_fem/SparseLinearSystemFill.hpp b/lib/kokkos/example/multi_fem/SparseLinearSystemFill.hpp
deleted file mode 100644
index 980f14ac1b..0000000000
--- a/lib/kokkos/example/multi_fem/SparseLinearSystemFill.hpp
+++ /dev/null
@@ -1,276 +0,0 @@
-/*
-//@HEADER
-// ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
-// the U.S. Government retains certain rights in this software.
-// 
-// 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 Corporation nor the names of the
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "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 SANDIA CORPORATION OR THE
-// 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.
-//
-// Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
-// ************************************************************************
-//@HEADER
-*/
-
-#ifndef SPARSELINEARSYSTEMFILL_HPP
-#define SPARSELINEARSYSTEMFILL_HPP
-
-#include <vector>
-#include <algorithm>
-#include <limits>
-
-#include <FEMesh.hpp>
-#include <SparseLinearSystem.hpp>
-
-//----------------------------------------------------------------------------
-
-namespace HybridFEM {
-
-template< class MatrixType , class MeshType ,
-          class elem_matrices_type ,
-          class elem_vectors_type > struct GatherFill ;
-
-
-template< typename ScalarType ,
-          class    DeviceType ,
-          unsigned ElemNode ,
-          typename CoordScalarType ,
-          class elem_matrices_type ,
-          class elem_vectors_type >
-struct GatherFill< 
-  Kokkos::CrsMatrix< ScalarType , DeviceType > ,
-  FEMesh< CoordScalarType , ElemNode , DeviceType > ,
-  elem_matrices_type , elem_vectors_type >
-{
-  typedef DeviceType     execution_space ;
-  typedef typename execution_space::size_type  size_type ;
-
-  static const size_type ElemNodeCount = ElemNode ;
-
-  typedef Kokkos::CrsMatrix< ScalarType , execution_space >    matrix_type ;
-  typedef typename matrix_type::coefficients_type   coefficients_type ;
-  typedef Kokkos::View< ScalarType[] , execution_space >  vector_type ;
-  typedef Kokkos::View< size_type[][ElemNodeCount][ElemNodeCount] , execution_space >       elem_graph_type ;
-
-  typedef FEMesh< CoordScalarType , ElemNodeCount , execution_space > mesh_type ;
-  typedef typename mesh_type::node_elem_ids_type node_elem_ids_type ;
-
-private:
-
-  node_elem_ids_type  node_elem_ids ;
-  elem_graph_type     elem_graph ;
-  elem_matrices_type  elem_matrices ;
-  elem_vectors_type   elem_vectors ;
-  coefficients_type   system_coeff ;
-  vector_type         system_rhs ;
-
-public:
-
-  KOKKOS_INLINE_FUNCTION
-  void operator()( size_type irow ) const
-  {
-    const size_type node_elem_begin = node_elem_ids.row_map[irow];
-    const size_type node_elem_end   = node_elem_ids.row_map[irow+1];
-
-    //  for each element that a node belongs to 
-
-    for ( size_type i = node_elem_begin ; i < node_elem_end ; i++ ) {
-
-      const size_type elem_id   = node_elem_ids.entries( i, 0);
-      const size_type row_index = node_elem_ids.entries( i, 1);
-
-      system_rhs(irow) += elem_vectors(elem_id, row_index);
-
-      //  for each node in a particular related element  
-      //  gather the contents of the element stiffness
-      //  matrix that belong in irow
-
-      for ( size_type j = 0 ; j < ElemNodeCount ; ++j ){
-        const size_type A_index = elem_graph( elem_id , row_index , j );
-
-        system_coeff( A_index ) += elem_matrices( elem_id, row_index, j );
-      }
-    }
-  }
-
-
-  static void apply( const matrix_type & matrix ,
-                     const vector_type & rhs ,
-                     const mesh_type   & mesh ,
-                     const elem_graph_type    & elem_graph ,
-                     const elem_matrices_type & elem_matrices ,
-                     const elem_vectors_type  & elem_vectors )
-  {
-    const size_t row_count = matrix.graph.row_map.dimension_0() - 1 ;
-    GatherFill op ;
-    op.node_elem_ids = mesh.node_elem_ids ;
-    op.elem_graph    = elem_graph ;
-    op.elem_matrices = elem_matrices ;
-    op.elem_vectors  = elem_vectors ;
-    op.system_coeff  = matrix.coefficients ;
-    op.system_rhs    = rhs ;
-
-    parallel_for( row_count , op );
-  }
-};
-
-} /* namespace HybridFEM */
-
-//----------------------------------------------------------------------------
-//----------------------------------------------------------------------------
-
-namespace HybridFEM {
-
-template< class GraphType , class MeshType >
-struct GraphFactory {
-  typedef GraphType                         graph_type ;
-  typedef MeshType                          mesh_type ;
-  typedef typename graph_type::execution_space  execution_space ;
-  typedef typename execution_space::size_type   size_type  ;
-
-  static const unsigned ElemNodeCount = mesh_type::element_node_count ;
-
-  typedef Kokkos::View< size_type[][ElemNodeCount][ElemNodeCount] , execution_space >         element_map_type ;
-
-  static
-  void
-  create( const mesh_type & mesh ,
-          graph_type & graph ,
-          element_map_type & elem_map )
-  {
-    typename mesh_type::node_elem_ids_type::HostMirror
-      node_elem_ids = create_mirror( mesh.node_elem_ids );
-
-    typename mesh_type::elem_node_ids_type::HostMirror
-      elem_node_ids = create_mirror( mesh.elem_node_ids );
-
-    typedef typename element_map_type::HostMirror element_map_host_type ;
-
-    deep_copy( elem_node_ids , mesh.elem_node_ids );
-    deep_copy( node_elem_ids.entries , mesh.node_elem_ids.entries );
-
-    const size_t owned_node = mesh.parallel_data_map.count_owned ;
-    const size_t total_elem = mesh.elem_node_ids.dimension_0();
-
-    if ( total_elem ) {
-      elem_map = element_map_type( std::string("element_map"), total_elem );
-    }
-
-    element_map_host_type elem_map_host = create_mirror( elem_map );
-
-    //------------------------------------
-    //  Node->node mapping for the CrsMatrix graph
-
-    std::vector< std::vector< unsigned > > node_node_ids( owned_node );
-    std::vector< unsigned > node_node_begin( owned_node );
-
-    size_t offset = 0 ;
-    for ( size_t i = 0 ; i < owned_node ; ++i ) {
-      const size_t j_end = node_elem_ids.row_map[i+1];
-            size_t j     = node_elem_ids.row_map[i];
-
-      node_node_begin[i] = offset ;
-
-      std::vector< unsigned > & work = node_node_ids[i] ;
-
-      for ( ; j < j_end ; ++j ) {
-        const size_t elem_id = node_elem_ids.entries(j,0);
-        for ( size_t k = 0 ; k < ElemNodeCount ; ++k ) {
-          work.push_back( elem_node_ids( elem_id , k ) );
-        }
-      }
-
-      std::sort( work.begin() , work.end() );
-
-      work.erase( std::unique( work.begin() , work.end() ) , work.end() );
-
-      offset += work.size();
-    }
-
-    graph = Kokkos::create_staticcrsgraph< graph_type >( "node_node_ids" , node_node_ids );
-
-    //------------------------------------
-    // ( element , node_row , node_column ) -> matrix_crs_column
-
-    for ( size_t elem_id = 0 ; elem_id < total_elem ; ++elem_id ) {
-      for ( size_t i = 0 ; i < ElemNodeCount ; ++i ) {
-
-        const size_t node_row = elem_node_ids( elem_id , i );
-        const size_t node_row_begin = node_node_begin[ node_row ];
-        const std::vector< unsigned > & column = node_node_ids[ node_row ] ;
-
-        if ( owned_node <= node_row ) {
-          for ( unsigned j = 0 ; j < ElemNodeCount ; ++j ) {
-            elem_map_host( elem_id , i , j ) = std::numeric_limits<size_type>::max();
-          }
-        }
-        else {
-
-          for ( unsigned j = 0 ; j < ElemNodeCount ; ++j ) {
-            const size_type node_col = elem_node_ids( elem_id , j );
-
-            int col_search = 0 ;
-
-            for ( int len = column.size() ; 0 < len ; ) {
-
-              const int half = len >> 1;
-              const int middle = col_search + half ;
-
-              if ( column[middle] < node_col ){
-                col_search = middle + 1 ;
-                len -= half + 1 ;
-              }
-              else {
-                len = half ;
-              }
-            }
-if ( node_col != column[col_search] ) {
-  throw std::runtime_error(std::string("Failed"));
-}
-            elem_map_host( elem_id , i , j ) = col_search + node_row_begin ;
-          }
-        }
-      }
-    }
-
-    deep_copy( elem_map , elem_map_host );
-  }
-};
-
-} // namespace HybridFEM
-
-
-//----------------------------------------------------------------------------
-//----------------------------------------------------------------------------
-
-#endif /* #ifndef SPARSELINEARSYSTEMFILL_HPP */
-
diff --git a/lib/kokkos/example/multi_fem/SparseLinearSystem_Cuda.hpp b/lib/kokkos/example/multi_fem/SparseLinearSystem_Cuda.hpp
deleted file mode 100644
index 8dfae4758d..0000000000
--- a/lib/kokkos/example/multi_fem/SparseLinearSystem_Cuda.hpp
+++ /dev/null
@@ -1,164 +0,0 @@
-/*
-//@HEADER
-// ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
-// the U.S. Government retains certain rights in this software.
-// 
-// 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 Corporation nor the names of the
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "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 SANDIA CORPORATION OR THE
-// 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.
-//
-// Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
-// ************************************************************************
-//@HEADER
-*/
-
-#ifndef SPARSELINEARSYSTEM_CUDA_HPP
-#define SPARSELINEARSYSTEM_CUDA_HPP
-
-#if defined( BUILD_FROM_CU_FILE )
-
-#include <cusparse_v2.h>
-#include <Kokkos_Core.hpp>
-
-namespace Kokkos {
-namespace Impl {
-
-
-struct CudaSparseSingleton {
-  cusparseHandle_t   handle;
-  cusparseMatDescr_t descra;
-
-  CudaSparseSingleton()
-  {
-    cusparseCreate( & handle );
-    cusparseCreateMatDescr( & descra );
-    cusparseSetMatType(       descra , CUSPARSE_MATRIX_TYPE_GENERAL );
-    cusparseSetMatIndexBase(  descra , CUSPARSE_INDEX_BASE_ZERO );
-  }
-
-  static CudaSparseSingleton & singleton();
-
-};
-
-CudaSparseSingleton & CudaSparseSingleton::singleton()
-{ static CudaSparseSingleton s ; return s ; }
-
-
-template<>
-struct Multiply< CrsMatrix<double,Cuda> ,
-                 View<double*,Cuda > ,
-                 View<double*,Cuda > >
-{
-  typedef Cuda                                      execution_space ;
-  typedef execution_space::size_type                    size_type ;
-  typedef double                                    scalar_type ;
-  typedef View< scalar_type* , execution_space >        vector_type ;
-  typedef CrsMatrix< scalar_type , execution_space >    matrix_type ;
-
-public:
-
-  Multiply( const matrix_type & A ,
-            const size_type nrow ,
-            const size_type ncol ,
-            const vector_type & x ,
-            const vector_type & y )
-  {
-    CudaSparseSingleton & s = CudaSparseSingleton::singleton();
-    const scalar_type alpha = 1 , beta = 0 ;
-
-    cusparseStatus_t status =
-      cusparseDcsrmv( s.handle ,
-                      CUSPARSE_OPERATION_NON_TRANSPOSE ,
-                      nrow , ncol , A.coefficients.dimension_0() ,
-                      &alpha ,
-                      s.descra ,
-                      A.coefficients.ptr_on_device() ,
-                      A.graph.row_map.ptr_on_device() ,
-                      A.graph.entries.ptr_on_device() ,
-                      x.ptr_on_device() ,
-                      &beta ,
-                      y.ptr_on_device() );
-
-    if ( CUSPARSE_STATUS_SUCCESS != status ) {
-      throw std::runtime_error( std::string("ERROR - cusparseDcsrmv " ) );
-    }
-  }
-};
-
-
-template<>
-struct Multiply< CrsMatrix<float,Cuda> ,
-                 View<float*,Cuda > ,
-                 View<float*,Cuda > >
-{
-  typedef Cuda                                      execution_space ;
-  typedef execution_space::size_type                    size_type ;
-  typedef float                                     scalar_type ;
-  typedef View< scalar_type* , execution_space >        vector_type ;
-  typedef CrsMatrix< scalar_type , execution_space >    matrix_type ;
-
-public:
-
-  Multiply( const matrix_type & A ,
-            const size_type nrow ,
-            const size_type ncol ,
-            const vector_type & x ,
-            const vector_type & y )
-  {
-    CudaSparseSingleton & s = CudaSparseSingleton::singleton();
-    const scalar_type alpha = 1 , beta = 0 ;
-
-    cusparseStatus_t status =
-      cusparseScsrmv( s.handle ,
-                      CUSPARSE_OPERATION_NON_TRANSPOSE ,
-                      nrow , ncol , A.coefficients.dimension_0() ,
-                      &alpha ,
-                      s.descra ,
-                      A.coefficients.ptr_on_device() ,
-                      A.graph.row_map.ptr_on_device() ,
-                      A.graph.entries.ptr_on_device() ,
-                      x.ptr_on_device() ,
-                      &beta ,
-                      y.ptr_on_device() );
-
-    if ( CUSPARSE_STATUS_SUCCESS != status ) {
-      throw std::runtime_error( std::string("ERROR - cusparseDcsrmv " ) );
-    }
-  }
-};
-
-} /* namespace Impl */
-} /* namespace Kokkos */
-
-#endif /* #if defined( __CUDACC__ ) */
-#endif /* #ifndef SPARSELINEARSYSTEM_CUDA_HPP */
-
diff --git a/lib/kokkos/example/multi_fem/TestBoxMeshFixture.hpp b/lib/kokkos/example/multi_fem/TestBoxMeshFixture.hpp
deleted file mode 100644
index 9903c998fe..0000000000
--- a/lib/kokkos/example/multi_fem/TestBoxMeshFixture.hpp
+++ /dev/null
@@ -1,242 +0,0 @@
-/*
-//@HEADER
-// ************************************************************************
-//
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
-// the U.S. Government retains certain rights in this software.
-//
-// 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 Corporation nor the names of the
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "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 SANDIA CORPORATION OR THE
-// 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.
-//
-// Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-//
-// ************************************************************************
-//@HEADER
-*/
-
-#ifndef TESTFEMESHBOXFIXTURE_HPP
-#define TESTFEMESHBOXFIXTURE_HPP
-
-#include <cstdio>
-#include <iostream>
-#include <stdexcept>
-#include <limits>
-#include <utility>
-#include <BoxMeshFixture.hpp>
-
-#include <ParallelComm.hpp>
-
-//----------------------------------------------------------------------------
-
-namespace TestFEMesh {
-
-template< class ViewType >
-struct VerifyUnpack  ;
-
-template< typename DeviceType, typename T >
-struct VerifyUnpack< Kokkos::View< T*[3] , DeviceType > >
-{
-  typedef DeviceType     execution_space ;
-  typedef typename execution_space::size_type  size_type ;
-  typedef size_type               value_type ;
-
-  typedef Kokkos::View< T* ,    execution_space > buffer_type ;
-  typedef Kokkos::View< T*[3] , execution_space > array_type ;
-
-private:
-
-  array_type  node_coords ;
-  buffer_type buffer ;
-  size_type   node_begin ;
-
-public:
-
-  KOKKOS_INLINE_FUNCTION
-  static void init( value_type & update )
-  { update = 0 ; }
-
-  KOKKOS_INLINE_FUNCTION
-  static void join( volatile value_type & update ,
-                    const volatile value_type & source )
-  { update += source ; }
-
-  KOKKOS_INLINE_FUNCTION
-  void operator()( const size_type i , value_type & update ) const
-  {
-    const size_type node_id = i + node_begin ;
-    const size_type k = i * 3 ;
-
-    const long xb = buffer[k];
-    const long yb = buffer[k+1];
-    const long zb = buffer[k+2];
-    const long xn = node_coords(node_id,0);
-    const long yn = node_coords(node_id,1);
-    const long zn = node_coords(node_id,2);
-
-    if ( xb != xn || yb != yn || zb != zn ) {
-      printf("TestFEMesh::VerifyUnpack failed at %d : node %d : { %ld %ld %ld } != { %ld %ld %ld }\n",
-             (int)i,(int)node_id, xb,yb,zb, xn, yn, zn );
-      ++update ;
-    }
-  }
-
-  static inline
-  size_type unpack( const array_type  & arg_node_coords ,
-                    const size_type     arg_node_begin ,
-                    const size_type     arg_node_count ,
-                    const buffer_type & arg_buffer )
-  {
-    VerifyUnpack op ;
-    op.node_coords = arg_node_coords ;
-    op.buffer      = arg_buffer ;
-    op.node_begin  = arg_node_begin ;
-    size_type count = 0 ;
-    Kokkos::parallel_reduce( arg_node_count , op , count );
-    return count ;
-  }
-};
-
-}
-
-//----------------------------------------------------------------------------
-
-#ifdef KOKKOS_ENABLE_MPI
-
-namespace TestFEMesh {
-
-template< typename coordinate_scalar_type ,
-          unsigned ElemNodeCount ,
-          class Device >
-void verify_parallel(
-  const HybridFEM::FEMesh< coordinate_scalar_type ,
-                           ElemNodeCount ,
-                           Device > & mesh )
-{
-  typedef HybridFEM::FEMesh< coordinate_scalar_type, ElemNodeCount, Device > femesh_type ;
-  typedef typename femesh_type::node_coords_type node_coords_type ;
-
-  comm::Machine machine = mesh.parallel_data_map.machine ;
-
-  // Communicate node coordinates to verify communication and setup.
-
-  const size_t chunk_size = 3 ;
-
-  Kokkos::AsyncExchange< coordinate_scalar_type, Device, Kokkos::ParallelDataMap >
-    exchange( mesh.parallel_data_map , chunk_size );
-
-  const size_t send_begin = mesh.parallel_data_map.count_interior ;
-  const size_t send_count = mesh.parallel_data_map.count_send ;
-
-  const size_t recv_begin = mesh.parallel_data_map.count_owned ;
-  const size_t recv_count = mesh.parallel_data_map.count_receive ;
-
-  typedef Kokkos::PackArray< node_coords_type > pack_type ;
-
-  pack_type::pack( exchange.buffer(), send_begin, send_count, mesh.node_coords );
-
-  exchange.setup();
-
-  // Launch local-action device kernels
-
-  exchange.send_receive();
-
-  unsigned long local[3] ;
-  local[0] = mesh.parallel_data_map.count_owned ;
-  local[1] = mesh.parallel_data_map.count_receive ;
-  local[2] = TestFEMesh::VerifyUnpack< node_coords_type >::unpack( mesh.node_coords, recv_begin, recv_count, exchange.buffer() );
-
-  unsigned long global[3] = { 0 , 0 , 0 };
-
-  MPI_Allreduce( local , global ,
-                 3 , MPI_UNSIGNED_LONG , MPI_SUM , machine.mpi_comm );
-
-  if ( 0 == comm::rank( machine ) ) {
-    std::cout << ( global[2] ? "FAILED" : "PASSED" )
-              << ": TestFEMesh::verify_parallel "
-              << "NP(" << comm::size( machine )
-              << ") total_node(" << global[0]
-              << ") verified_nodes(" << global[1]
-              << ") failed_nodes(" << global[2]
-              << ")" << std::endl ;
-  }
-}
-
-} // namespace TestFEMesh
-
-#else /* ! #ifdef KOKKOS_ENABLE_MPI */
-
-namespace TestFEMesh {
-
-template< typename coordinate_scalar_type ,
-          unsigned ElemNodeCount ,
-          class Device >
-void verify_parallel(
-  const HybridFEM::FEMesh< coordinate_scalar_type ,
-                           ElemNodeCount ,
-                           Device > & )
-{}
-
-} // namespace TestFEMesh
-
-#endif /* ! #ifdef KOKKOS_ENABLE_MPI */
-
-//----------------------------------------------------------------------------
-
-template< class Device >
-void test_box_fixture( comm::Machine machine ,
-                       const size_t gang_count ,
-                       const size_t nodes_nx ,
-                       const size_t nodes_ny ,
-                       const size_t nodes_nz )
-{
-  typedef long                coordinate_scalar_type ;
-  typedef FixtureElementHex8  fixture_element_type ;
-
-  typedef BoxMeshFixture< coordinate_scalar_type ,
-                          Device ,
-                          fixture_element_type > fixture_type ;
-
-  typedef typename fixture_type::FEMeshType  mesh_type ;
-
-  const size_t proc_count = comm::size( machine );
-  const size_t proc_local = comm::rank( machine ) ;
-
-  mesh_type mesh =
-    fixture_type::create( proc_count , proc_local , gang_count ,
-                          nodes_nx - 1 , nodes_ny - 1 , nodes_nz - 1 );
-
-  mesh.parallel_data_map.machine = machine ;
-
-  TestFEMesh::verify_parallel( mesh );
-}
-
-#endif /* #ifndef TESTFEMESHBOXFIXTURE_HPP */
-
-
diff --git a/lib/kokkos/example/multi_fem/TestBoxMeshPartition.cpp b/lib/kokkos/example/multi_fem/TestBoxMeshPartition.cpp
deleted file mode 100644
index 93778c8584..0000000000
--- a/lib/kokkos/example/multi_fem/TestBoxMeshPartition.cpp
+++ /dev/null
@@ -1,172 +0,0 @@
-//@HEADER
-// ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
-// the U.S. Government retains certain rights in this software.
-// 
-// 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 Corporation nor the names of the
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "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 SANDIA CORPORATION OR THE
-// 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.
-//
-// Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
-// ************************************************************************
-//@HEADER
-
-#include <iostream>
-#include <stdexcept>
-#include <limits>
-#include <utility>
-#include <BoxMeshPartition.hpp>
-
-//----------------------------------------------------------------------------
-
-void test_box_partition( bool print )
-{
-  const size_t np_max = 10000 ;
-
-  const BoxBoundsLinear use_box ;
-
-  BoxType root_box ;
-
-  root_box[0][0] = 0 ; root_box[0][1] = 100 ;
-  root_box[1][0] = 0 ; root_box[1][1] = 200 ;
-  root_box[2][0] = 0 ; root_box[2][1] = 300 ;
-
-  const size_t cell_total =
-    ( root_box[0][1] - root_box[0][0] ) *
-    ( root_box[1][1] - root_box[1][0] ) *
-    ( root_box[2][1] - root_box[2][0] );
-
-  for ( size_t np = 2 ; np < np_max ; np = 2 * ( np + 1 ) ) {
-
-    std::vector<BoxType> part_boxes( np );
-
-    box_partition_rcb( root_box , part_boxes );
-
-    size_t cell_goal = ( cell_total + np - 1 ) / np ;
-    size_t cell_max = 0 ;
-
-    for ( size_t i = 0 ; i < np ; ++i ) {
-      cell_max = std::max( cell_max , count( part_boxes[i] ) );
-    }
-
-    if ( print ) {
-      std::cout << std::endl
-                << "box_part( " << np 
-                << " ) max( " << cell_max
-                << " ) goal( " << cell_goal
-                << " ) ratio( " << double(cell_max) / double(cell_goal)
-                << " )" << std::endl ;
-    }
-
-    const size_t nsample = std::min(np,(size_t)4);
-    const size_t stride = ( np + nsample - 1 ) / nsample ;
-
-    for ( size_t my_part = 0 ; my_part < np ; my_part += stride ) {
-      BoxType             my_use_box ;
-      std::vector<size_t> my_use_id_map ;
-      size_t              my_count_interior ;
-      size_t              my_count_owned ;
-      size_t              my_count_uses ;
-      std::vector<size_t> my_recv_counts ;
-      std::vector<std::vector<size_t> > my_send_map ;
-
-      size_t count_verify = 0 ;
-
-      box_partition_maps( root_box , part_boxes ,
-                          use_box , my_part ,
-                          my_use_box , my_use_id_map ,
-                          my_count_interior ,
-                          my_count_owned ,
-                          my_count_uses ,
-                          my_recv_counts ,
-                          my_send_map );
-
-      count_verify = my_count_owned ;
-
-      if ( print ) {
-        std::cout << "  my_part(" << my_part << ") layout { "
-                  << "P" << my_part
-                  << "(" << my_count_interior
-                  << "," << ( my_count_owned - my_count_interior )
-                  << ")" ;
-      }
-
-      for ( size_t i = 1 ; i < np ; ++i ) {
-        if ( my_recv_counts[i] ) {
-          count_verify += my_recv_counts[i] ;
-          const size_t ip = ( my_part + i ) % np ;
-
-          if ( print ) {
-            std::cout << " P" << ip << "(" << my_recv_counts[i] << ")" ;
-          }
-
-          // Compare recv & send lists
-
-          BoxType             ip_use_box ;
-          std::vector<size_t> ip_use_id_map ;
-          size_t              ip_count_interior ;
-          size_t              ip_count_owned ;
-          size_t              ip_count_uses ;
-          std::vector<size_t> ip_recv_counts ;
-          std::vector<std::vector<size_t> > ip_send_map ;
-
-          box_partition_maps( root_box , part_boxes ,
-                              use_box , ip ,
-                              ip_use_box , ip_use_id_map ,
-                              ip_count_interior ,
-                              ip_count_owned ,
-                              ip_count_uses ,
-                              ip_recv_counts ,
-                              ip_send_map );
-
-          // Sent by ip, received by my_part:
-
-          const BoxType recv_send = intersect( part_boxes[ip] , my_use_box );
-          const size_t recv_send_count = count( recv_send );
-
-          const size_t j = ( my_part + np - ip ) % np ;
-
-          if ( recv_send_count != my_recv_counts[i] ||
-               recv_send_count != ip_send_map[j].size() ) {
-            throw std::runtime_error( std::string("bad recv/send map") );
-          }
-        }
-      }
-      if ( print ) { std::cout << " }" << std::endl ; }
-
-      if ( count_verify != my_count_uses ) {
-        throw std::runtime_error( std::string("bad partition map") );
-      }
-    }
-  }
-}
-
-
diff --git a/lib/kokkos/example/multi_fem/TestCuda.cpp b/lib/kokkos/example/multi_fem/TestCuda.cpp
deleted file mode 100644
index d0e53283f3..0000000000
--- a/lib/kokkos/example/multi_fem/TestCuda.cpp
+++ /dev/null
@@ -1,188 +0,0 @@
-/*
-//@HEADER
-// ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
-// the U.S. Government retains certain rights in this software.
-// 
-// 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 Corporation nor the names of the
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "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 SANDIA CORPORATION OR THE
-// 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.
-//
-// Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
-// ************************************************************************
-//@HEADER
-*/
-
-#include <Kokkos_Core.hpp>
-
-#include <TestBoxMeshFixture.hpp>
-#include <Implicit.hpp>
-#include <Nonlinear.hpp>
-#include <Explicit.hpp>
-
-#include <SparseLinearSystem.hpp>
-
-#if defined( KOKKOS_ENABLE_CUDA )
-
-//----------------------------------------------------------------------------
-
-namespace Kokkos {
-namespace Impl {
-
-CudaSparseSingleton & CudaSparseSingleton::singleton()
-{ static CudaSparseSingleton s ; return s ; }
-
-}
-}
-
-//----------------------------------------------------------------------------
-
-void test_cuda_query( comm::Machine machine )
-{
-  const size_t comm_rank = comm::rank( machine );
-  std::cout << "P" << comm_rank
-            << ": Cuda device_count = "
-            << Kokkos::Cuda::detect_device_count()
-            << std::endl ;
-}
-
-//----------------------------------------------------------------------------
-
-void test_cuda_fixture( comm::Machine machine ,
-                        size_t nx , size_t ny , size_t nz )
-{
-  const size_t comm_rank = comm::rank( machine );
-  const size_t comm_size = comm::size( machine );
-  const size_t dev_count = Kokkos::Cuda::detect_device_count();
-  const size_t dev_rank =
-    dev_count && dev_count <= comm_size ? comm_rank % dev_count : 0 ;
-  const size_t gang_count = 0 ;
-
-  Kokkos::InitArguments args;
-  args.device_id = dev_rank;
-  Kokkos::initialize(args);
-
-  test_box_fixture<Kokkos::Cuda>( machine , gang_count , nx , ny , nz );
-  Kokkos::finalize();
-}
-
-//----------------------------------------------------------------------------
-
-void test_cuda_implicit( comm::Machine machine , 
-                         size_t elem_count_begin ,
-                         size_t elem_count_end ,
-                         size_t count_run )
-{
-  const size_t comm_rank = comm::rank( machine );
-  const size_t comm_size = comm::size( machine );
-  const size_t dev_count = Kokkos::Cuda::detect_device_count();
-  const size_t dev_rank =
-    dev_count && dev_count <= comm_size ? comm_rank % dev_count : 0 ;
-  const size_t gang_count = 0 ;
-
-  Kokkos::InitArguments args;
-  args.device_id = dev_rank;
-  Kokkos::initialize(args);
-  HybridFEM::Implicit::driver<double,Kokkos::Cuda>( "Cuda" , machine , gang_count , elem_count_begin , elem_count_end , count_run );
-  Kokkos::finalize();
-}
-
-//----------------------------------------------------------------------------
-
-void test_cuda_explicit( comm::Machine machine , 
-                         size_t elem_count_begin ,
-                         size_t elem_count_end ,
-                         size_t count_run )
-{
-  const size_t comm_rank = comm::rank( machine );
-  const size_t comm_size = comm::size( machine );
-  const size_t dev_count = Kokkos::Cuda::detect_device_count();
-  const size_t dev_rank =
-    dev_count && dev_count <= comm_size ? comm_rank % dev_count : 0 ;
-  const size_t gang_count = 0 ;
-
-  Kokkos::InitArguments args;
-  args.device_id = dev_rank;
-  Kokkos::initialize(args);
-  Explicit::driver<double,Kokkos::Cuda>( "Cuda" , machine , gang_count , elem_count_begin , elem_count_end , count_run );
-  Kokkos::finalize();
-}
-
-//----------------------------------------------------------------------------
-
-void test_cuda_nonlinear( comm::Machine machine , 
-                          size_t elem_count_begin ,
-                          size_t elem_count_end ,
-                          size_t count_run )
-{
-  const size_t comm_rank = comm::rank( machine );
-  const size_t comm_size = comm::size( machine );
-  const size_t dev_count = Kokkos::Cuda::detect_device_count();
-  const size_t dev_rank =
-    dev_count && dev_count <= comm_size ? comm_rank % dev_count : 0 ;
-  const size_t gang_count = 0 ;
-
-  Kokkos::InitArguments args;
-  args.device_id = dev_rank;
-  Kokkos::initialize(args);
-
-  typedef Kokkos::Cuda device ;
-  typedef FixtureElementHex8 hex8 ;
-  HybridFEM::Nonlinear::driver<double,device,hex8>( "Cuda" , machine , gang_count , elem_count_begin , elem_count_end , count_run );
-  Kokkos::finalize();
-}
-
-void test_cuda_nonlinear_quadratic( comm::Machine machine , 
-                                    size_t elem_count_begin ,
-                                    size_t elem_count_end ,
-                                    size_t count_run )
-{
-  const size_t comm_rank = comm::rank( machine );
-  const size_t comm_size = comm::size( machine );
-  const size_t dev_count = Kokkos::Cuda::detect_device_count();
-  const size_t dev_rank =
-    dev_count && dev_count <= comm_size ? comm_rank % dev_count : 0 ;
-  const size_t gang_count = 0 ;
-
-  Kokkos::InitArguments args;
-  args.device_id = dev_rank;
-  Kokkos::initialize(args);
-
-  typedef Kokkos::Cuda device ;
-  typedef FixtureElementHex27 hex27 ;
-  HybridFEM::Nonlinear::driver<double,device,hex27>( "Cuda" , machine , gang_count , elem_count_begin , elem_count_end , count_run );
-  Kokkos::finalize();
-}
-
-//----------------------------------------------------------------------------
-
-#endif  /* #if defined( KOKKOS_ENABLE_CUDA ) */
-
diff --git a/lib/kokkos/example/multi_fem/TestHost.cpp b/lib/kokkos/example/multi_fem/TestHost.cpp
deleted file mode 100644
index f0f0844812..0000000000
--- a/lib/kokkos/example/multi_fem/TestHost.cpp
+++ /dev/null
@@ -1,142 +0,0 @@
-//@HEADER
-// ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
-// the U.S. Government retains certain rights in this software.
-// 
-// 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 Corporation nor the names of the
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "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 SANDIA CORPORATION OR THE
-// 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.
-//
-// Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
-// ************************************************************************
-//@HEADER
-
-// Must be included first on Intel-Phi systems due to
-// redefinition of SEEK_SET in <mpi.h>.
-
-#include <ParallelComm.hpp>
-
-#include <iostream>
-#include <stdexcept>
-#include <limits>
-#include <utility>
-
-//----------------------------------------------------------------------------
-
-#include <Kokkos_Core.hpp>
-
-#include <BoxMeshFixture.hpp>
-#include <TestBoxMeshFixture.hpp>
-#include <Implicit.hpp>
-#include <Nonlinear.hpp>
-#include <Explicit.hpp>
-#include <SparseLinearSystem.hpp>
-
-//----------------------------------------------------------------------------
-//----------------------------------------------------------------------------
-
-void test_host_fixture( comm::Machine machine ,
-                        size_t gang_count ,
-                        size_t gang_worker_count ,
-                        size_t nx , size_t ny , size_t nz )
-{
-  Kokkos::InitArguments args(gang_count * gang_worker_count);
-  Kokkos::initialize( args );
-  test_box_fixture<Kokkos::HostSpace::execution_space>( machine , gang_count , nx , ny , nz );
-  Kokkos::finalize();
-}
-
-//----------------------------------------------------------------------------
-
-void test_host_implicit( comm::Machine machine ,
-                         size_t gang_count ,
-                         size_t gang_worker_count ,
-                         size_t elem_count_begin ,
-                         size_t elem_count_end ,
-                         size_t count_run )
-{
-  Kokkos::InitArguments args(gang_count * gang_worker_count);
-  Kokkos::initialize( args );
-  HybridFEM::Implicit::driver<double,Kokkos::HostSpace::execution_space>( "Threads" , machine , gang_count , elem_count_begin , elem_count_end , count_run );
-  Kokkos::finalize();
-}
-
-//----------------------------------------------------------------------------
-
-void test_host_explicit( comm::Machine machine ,
-                         size_t gang_count ,
-                         size_t gang_worker_count ,
-                         size_t elem_count_begin ,
-                         size_t elem_count_end ,
-                         size_t count_run )
-{
-  Kokkos::InitArguments args(gang_count * gang_worker_count);
-  Kokkos::initialize( args );
-  Explicit::driver<double,Kokkos::HostSpace::execution_space>( "Threads" , machine , gang_count , elem_count_begin , elem_count_end , count_run );
-  Kokkos::finalize();
-}
-
-//----------------------------------------------------------------------------
-//----------------------------------------------------------------------------
-
-void test_host_nonlinear( comm::Machine machine ,
-                          size_t gang_count ,
-                          size_t gang_worker_count ,
-                          size_t elem_count_begin ,
-                          size_t elem_count_end ,
-                          size_t count_run )
-{
-  Kokkos::InitArguments args(gang_count * gang_worker_count);
-  Kokkos::initialize( args );
-  typedef FixtureElementHex8 hex8 ;
-  typedef Kokkos::HostSpace::execution_space             device ;
-  HybridFEM::Nonlinear::driver<double,device,hex8>( "Threads" , machine , gang_count , elem_count_begin , elem_count_end , count_run );
-  Kokkos::finalize();
-}
-
-void test_host_nonlinear_quadratic( comm::Machine machine ,
-                                    size_t gang_count ,
-                                    size_t gang_worker_count ,
-                                    size_t elem_count_begin ,
-                                    size_t elem_count_end ,
-                                    size_t count_run )
-{
-  Kokkos::InitArguments args(gang_count * gang_worker_count);
-  Kokkos::initialize( args );
-  typedef FixtureElementHex27 hex27 ;
-  typedef Kokkos::HostSpace::execution_space              device ;
-  HybridFEM::Nonlinear::driver<double,device,hex27>( "Threads" , machine , gang_count , elem_count_begin , elem_count_end , count_run );
-  Kokkos::finalize();
-}
-
-//----------------------------------------------------------------------------
-
-
diff --git a/lib/kokkos/example/multi_fem/TestHybridFEM.cpp b/lib/kokkos/example/multi_fem/TestHybridFEM.cpp
deleted file mode 100644
index 0be4e69973..0000000000
--- a/lib/kokkos/example/multi_fem/TestHybridFEM.cpp
+++ /dev/null
@@ -1,348 +0,0 @@
-//@HEADER
-// ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
-// the U.S. Government retains certain rights in this software.
-// 
-// 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 Corporation nor the names of the
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "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 SANDIA CORPORATION OR THE
-// 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.
-//
-// Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
-// ************************************************************************
-//@HEADER
-
-// Must be included first on Intel-Phi systems due to
-// redefinition of SEEK_SET in <mpi.h>.
-
-#include <ParallelComm.hpp>
-
-#include <string>
-#include <sstream>
-#include <iostream>
-#include <Kokkos_hwloc.hpp>
-
-//----------------------------------------------------------------------------
-
-void test_box_partition( bool print );
-
-//----------------------------------------------------------------------------
-
-void test_host_fixture( comm::Machine machine ,
-                        size_t gang_count ,
-                        size_t gang_worker_count ,
-                        size_t nx , size_t ny , size_t nz );
-
-void test_host_implicit( comm::Machine machine ,
-                         size_t gang_count ,
-                         size_t gang_worker_count ,
-                         size_t elem_count_begin ,
-                         size_t elem_count_end ,
-                         size_t count_run );
-
-void test_host_explicit( comm::Machine machine ,
-                         size_t gang_count ,
-                         size_t gang_worker_count ,
-                         size_t elem_count_begin ,
-                         size_t elem_count_end ,
-                         size_t count_run );
-
-void test_host_nonlinear( comm::Machine machine ,
-                          size_t gang_count ,
-                          size_t gang_worker_count ,
-                          size_t elem_count_begin ,
-                          size_t elem_count_end ,
-                          size_t count_run );
-
-void test_host_nonlinear_quadratic( comm::Machine machine ,
-                                    size_t gang_count ,
-                                    size_t gang_worker_count ,
-                                    size_t elem_count_begin ,
-                                    size_t elem_count_end ,
-                                    size_t count_run );
-
-
-//----------------------------------------------------------------------------
-
-void test_cuda_query( comm::Machine );
-
-void test_cuda_fixture( comm::Machine machine ,
-                        size_t nx , size_t ny , size_t nz );
-
-void test_cuda_implicit( comm::Machine machine ,
-                         size_t elem_count_begin ,
-                         size_t elem_count_end ,
-                         size_t count_run );
-
-void test_cuda_explicit( comm::Machine machine ,
-                         size_t elem_count_begin ,
-                         size_t elem_count_end ,
-                         size_t count_run );
-
-void test_cuda_nonlinear( comm:: Machine machine ,
-                          size_t elem_count_begin ,
-                          size_t elem_count_end ,
-                          size_t count_run );
-
-void test_cuda_nonlinear_quadratic( comm::Machine machine ,
-                                    size_t elem_count_begin ,
-                                    size_t elem_count_end ,
-                                    size_t count_run );
-
-
-//----------------------------------------------------------------------------
-
-//----------------------------------------------------------------------------
-//----------------------------------------------------------------------------
-
-namespace {
-
-bool run_host( std::istream & input ,
-               comm::Machine machine ,
-               const size_t host_gang_count ,
-               const size_t host_gang_worker_count )
-{
-  bool cmd_error = false ;
-
-  std::string which ; input >> which ;
-
-  if ( which == std::string("fixture") ) {
-
-    size_t nx = 0 , ny = 0 , nz = 0 ;
-    input >> nx >> ny >> nz ;
-    test_host_fixture( machine , host_gang_count , host_gang_worker_count , nx , ny , nz );
-
-  }
-  else if ( which == std::string("explicit") ) {
-
-    size_t mesh_node_begin = 100 ;
-    size_t mesh_node_end   = 300 ;
-    size_t run             =   1 ;
-    input >> mesh_node_begin >> mesh_node_end >> run ;
-    test_host_explicit( machine , host_gang_count , host_gang_worker_count , mesh_node_begin , mesh_node_end , run );
-
-  }
-  else if ( which == std::string("implicit") ) {
-
-    size_t mesh_node_begin = 100 ;
-    size_t mesh_node_end   = 300 ;
-    size_t run             =   1 ;
-    input >> mesh_node_begin >> mesh_node_end >> run ;
-    test_host_implicit( machine , host_gang_count , host_gang_worker_count , mesh_node_begin , mesh_node_end , run );
-
-  }
-  else if ( which == std::string("nonlinear") ) {
-
-    size_t mesh_node_begin = 100 ;
-    size_t mesh_node_end   = 300 ;
-    size_t run             =   1 ;
-    input >> mesh_node_begin >> mesh_node_end >> run ;
-    test_host_nonlinear( machine , host_gang_count , host_gang_worker_count , mesh_node_begin , mesh_node_end , run );
-
-  }
-  else if ( which == std::string("nonlinear_quadratic") ) {
-
-    size_t mesh_node_begin = 100 ;
-    size_t mesh_node_end   = 300 ;
-    size_t run             =   1 ;
-    input >> mesh_node_begin >> mesh_node_end >> run ;
-    test_host_nonlinear_quadratic( machine , host_gang_count , host_gang_worker_count , mesh_node_begin , mesh_node_end , run );
-
-  }
-  else {
-    cmd_error = true ;
-  }
-
-  return cmd_error ;
-}
-
-#if defined( KOKKOS_ENABLE_CUDA )
-bool run_cuda( std::istream & input , comm::Machine machine )
-{
-  bool cmd_error = false ;
-
-  std::string which ; input >> which ;
-
-  if ( which == std::string("fixture") ) {
-
-    size_t nx = 0 , ny = 0 , nz = 0 ;
-    input >> nx >> ny >> nz ;
-    test_cuda_fixture( machine , nx , ny , nz );
-
-  }
-  else if ( which == std::string("explicit") ) {
-
-    size_t mesh_node_begin = 100 ;
-    size_t mesh_node_end   = 300 ;
-    size_t run             =   1 ;
-    input >> mesh_node_begin >> mesh_node_end >> run ;
-    test_cuda_explicit( machine , mesh_node_begin , mesh_node_end , run );
-
-  }
-  else if ( which == std::string("implicit") ) {
-
-    size_t mesh_node_begin = 100 ;
-    size_t mesh_node_end   = 300 ;
-    size_t run             =   1 ;
-    input >> mesh_node_begin >> mesh_node_end >> run ;
-    test_cuda_implicit( machine , mesh_node_begin , mesh_node_end , run );
-
-  }
-  else if ( which == std::string("nonlinear") ) {
-
-    size_t mesh_node_begin = 100 ;
-    size_t mesh_node_end   = 300 ;
-    size_t run             =   1 ;
-    input >> mesh_node_begin >> mesh_node_end >> run ;
-    test_cuda_nonlinear( machine , mesh_node_begin , mesh_node_end , run );
-
-  }
-  else if ( which == std::string("nonlinear_quadratic") ) {
-
-    size_t mesh_node_begin = 100 ;
-    size_t mesh_node_end   = 300 ;
-    size_t run             =   1 ;
-    input >> mesh_node_begin >> mesh_node_end >> run ;
-    test_cuda_nonlinear_quadratic( machine , mesh_node_begin , mesh_node_end , run );
-
-  }
-  else {
-    cmd_error = true ;
-  }
-
-  return cmd_error ;
-}
-#endif
-
-void run( const std::string & argline , comm::Machine machine )
-{
-  const unsigned numa_count       = Kokkos::hwloc::get_available_numa_count();
-  const unsigned cores_per_numa   = Kokkos::hwloc::get_available_cores_per_numa();
-  const unsigned threads_per_core = Kokkos::hwloc::get_available_threads_per_core();
-
-  std::istringstream input( argline );
-
-  bool cmd_error = false ;
-
-  std::string which ; input >> which ;
-
-  if ( which == std::string("query") ) {
-    std::cout << "P" << comm::rank( machine )
-              << ": hwloc { NUMA[" << numa_count << "]"
-              << " CORE[" << cores_per_numa << "]"
-              << " PU[" << threads_per_core << "] }"
-              << std::endl ;
-#if defined( KOKKOS_ENABLE_CUDA )
-    test_cuda_query( machine );
-#endif
-  }
-  else if ( which == std::string("partition") ) {
-    if ( 0 == comm::rank( machine ) ) {
-      test_box_partition( false /* print flag */ );
-    }
-  }
-  else {
-    if ( which == std::string("host") ) {
-      size_t host_gang_count = 0 ;
-      size_t host_gang_worker_count = 1 ;
-
-      input >> host_gang_count ;
-      input >> host_gang_worker_count ;
-
-      cmd_error = run_host( input , machine , host_gang_count , host_gang_worker_count );
-    }
-    else if ( which == std::string("host-all") ) {
-      size_t host_gang_count        = numa_count ;
-      size_t host_gang_worker_count = cores_per_numa * threads_per_core ;
-
-      cmd_error = run_host( input , machine , host_gang_count , host_gang_worker_count );
-    }
-    else if ( which == std::string("host-most") ) {
-      size_t host_gang_count        = numa_count ;
-      size_t host_gang_worker_count = ( cores_per_numa - 1 ) * threads_per_core ;
-
-      cmd_error = run_host( input , machine , host_gang_count , host_gang_worker_count );
-    }
-#if defined( KOKKOS_ENABLE_CUDA )
-    else if ( which == std::string("cuda") ) {
-      cmd_error = run_cuda( input , machine );
-    }
-#endif
-    else {
-      cmd_error = true ;
-    }
-  }
-
-  if ( cmd_error && 0 == comm::rank( machine ) ) {
-    std::cout << "Expecting command line with" << std::endl
-              << "    query" << std::endl
-              << "    partition" << std::endl
-              << "    host NumNumaNode NumThreadPerNode <test>" << std::endl
-              << "    host-all <test>" << std::endl
-              << "    host-most <test>" << std::endl
-              << "    cuda <test>" << std::endl
-              << "where <test> is" << std::endl
-              << "    fixture   NumElemX NumElemY NumElemZ" << std::endl
-              << "    implicit  NumElemBegin NumElemEnd NumRun" << std::endl
-              << "    explicit  NumElemBegin NumElemEnd NumRun" << std::endl
-              << "    nonlinear NumElemBegin NumElemEnd NumRun" << std::endl
-              << "    nonlinear_quadratic NumElemBegin NumElemEnd NumRun" << std::endl ;
-
-  }
-}
-
-} // namespace
-
-//----------------------------------------------------------------------------
-//----------------------------------------------------------------------------
-
-int main( int argc , char ** argv )
-{
-  comm::Machine machine = comm::Machine::init( & argc , & argv );
-
-  const unsigned comm_rank = comm::rank( machine );
-
-  const std::string argline = comm::command_line( machine , argc , argv );
-
-  try {
-    run( argline , machine );
-  }
-  catch( const std::exception & x ) {
-    std::cerr << "P" << comm_rank << " throw: " << x.what() << std::endl ;
-  }
-  catch( ... ) {
-    std::cerr << "P" << comm_rank << " throw: unknown exception" << std::endl ;
-  }
-
-  comm::Machine::finalize();
-
-  return 0 ;
-}
-
diff --git a/lib/kokkos/example/query_device/CMakeLists.txt b/lib/kokkos/example/query_device/CMakeLists.txt
index dade7f01fe..86956ba3ba 100644
--- a/lib/kokkos/example/query_device/CMakeLists.txt
+++ b/lib/kokkos/example/query_device/CMakeLists.txt
@@ -1,14 +1,12 @@
 
-INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR})
-INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR})
+KOKKOS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR})
+KOKKOS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR})
 
 SET(SOURCES "")
-
 FILE(GLOB SOURCES *.cpp)
 
-TRIBITS_ADD_EXECUTABLE(
+KOKKOS_ADD_EXECUTABLE(
   query_device
   SOURCES ${SOURCES}
-  COMM serial mpi
-  )
+)
 
diff --git a/lib/kokkos/example/query_device/query_device.cpp b/lib/kokkos/example/query_device/query_device.cpp
index 7dd2e0c7eb..0ce7fc9eca 100644
--- a/lib/kokkos/example/query_device/query_device.cpp
+++ b/lib/kokkos/example/query_device/query_device.cpp
@@ -1,13 +1,14 @@
 /*
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -36,7 +37,7 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 */
@@ -46,7 +47,7 @@
 
 #include <Kokkos_Macros.hpp>
 
-#if defined( KOKKOS_ENABLE_MPI )
+#if defined(KOKKOS_ENABLE_MPI)
 #include <mpi.h>
 #endif
 
@@ -55,46 +56,43 @@
 //----------------------------------------------------------------------------
 //----------------------------------------------------------------------------
 
-int main( int argc , char ** argv )
-{
-  std::ostringstream msg ;
+int main(int argc, char** argv) {
+  std::ostringstream msg;
 
-#if defined( KOKKOS_ENABLE_MPI )
+#if defined(KOKKOS_ENABLE_MPI)
 
-  MPI_Init( & argc , & argv );
+  MPI_Init(&argc, &argv);
 
-  int mpi_rank = 0 ;
+  int mpi_rank = 0;
 
-  MPI_Comm_rank( MPI_COMM_WORLD , & mpi_rank );
+  MPI_Comm_rank(MPI_COMM_WORLD, &mpi_rank);
 
-  msg << "MPI rank(" << mpi_rank << ") " ;
+  msg << "MPI rank(" << mpi_rank << ") ";
 
 #endif
 
-  msg << "{" << std::endl ;
+  msg << "{" << std::endl;
 
-  if ( Kokkos::hwloc::available() ) {
+  if (Kokkos::hwloc::available()) {
     msg << "hwloc( NUMA[" << Kokkos::hwloc::get_available_numa_count()
-        << "] x CORE["    << Kokkos::hwloc::get_available_cores_per_numa()
-        << "] x HT["      << Kokkos::hwloc::get_available_threads_per_core()
-        << "] )"
-        << std::endl ;
+        << "] x CORE[" << Kokkos::hwloc::get_available_cores_per_numa()
+        << "] x HT[" << Kokkos::hwloc::get_available_threads_per_core() << "] )"
+        << std::endl;
   }
 
-#if defined( KOKKOS_ENABLE_CUDA )
-  Kokkos::Cuda::print_configuration( msg );
+#if defined(KOKKOS_ENABLE_CUDA)
+  Kokkos::Cuda::print_configuration(msg);
 #endif
 
-  msg << "}" << std::endl ;
+  msg << "}" << std::endl;
 
   std::cout << msg.str();
 
-#if defined( KOKKOS_ENABLE_MPI )
+#if defined(KOKKOS_ENABLE_MPI)
 
   MPI_Finalize();
 
 #endif
 
-  return 0 ;
+  return 0;
 }
-
diff --git a/lib/kokkos/example/sort_array/CMakeLists.txt b/lib/kokkos/example/sort_array/CMakeLists.txt
deleted file mode 100644
index 0c7da74f4a..0000000000
--- a/lib/kokkos/example/sort_array/CMakeLists.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-
-INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR})
-INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR})
-
-SET(SOURCES "")
-
-FILE(GLOB SOURCES *.cpp)
-
-TRIBITS_ADD_EXECUTABLE(
-  sort_array
-  SOURCES ${SOURCES}
-  COMM serial mpi
-  )
-
diff --git a/lib/kokkos/example/sort_array/Makefile b/lib/kokkos/example/sort_array/Makefile
deleted file mode 100644
index 42b376ec7c..0000000000
--- a/lib/kokkos/example/sort_array/Makefile
+++ /dev/null
@@ -1,46 +0,0 @@
-KOKKOS_PATH ?= ../..
-
-MAKEFILE_PATH := $(abspath $(lastword $(MAKEFILE_LIST)))
-SRC_DIR := $(dir $(MAKEFILE_PATH))
-
-SRC = $(wildcard $(SRC_DIR)/*.cpp)
-OBJ = $(SRC:$(SRC_DIR)/%.cpp=%.o)
-
-#SRC = $(wildcard *.cpp)
-#OBJ = $(SRC:%.cpp=%.o)
-
-default: build
-	echo "Start Build"
-
-ifneq (,$(findstring Cuda,$(KOKKOS_DEVICES)))
-  CXX = $(KOKKOS_PATH)/bin/nvcc_wrapper
-  EXE = $(addsuffix .cuda, $(shell basename $(SRC_DIR)))
-else
-  CXX = g++
-  EXE = $(addsuffix .host, $(shell basename $(SRC_DIR)))
-endif
-
-CXXFLAGS = -O3 -I$(SRC_DIR)
-LINK ?= $(CXX)
-LDFLAGS ?=
-
-include $(KOKKOS_PATH)/Makefile.kokkos
-
-DEPFLAGS = -M
-
-LIB =
-
-
-build: $(EXE)
-
-$(EXE): $(OBJ) $(KOKKOS_LINK_DEPENDS)
-	$(LINK) $(KOKKOS_LDFLAGS) $(LINKFLAGS) $(EXTRA_PATH) $(OBJ) $(KOKKOS_LIBS) $(LIB) -o $(EXE)
-
-clean: 
-	rm -f *.a *.o *.cuda *.host
-
-# Compilation rules
-
-%.o:$(SRC_DIR)/%.cpp $(KOKKOS_CPP_DEPENDS)
-	$(CXX) $(KOKKOS_CPPFLAGS) $(KOKKOS_CXXFLAGS) $(CXXFLAGS) $(EXTRA_INC) -c $<
-
diff --git a/lib/kokkos/example/sort_array/main.cpp b/lib/kokkos/example/sort_array/main.cpp
deleted file mode 100644
index 331b2ef62d..0000000000
--- a/lib/kokkos/example/sort_array/main.cpp
+++ /dev/null
@@ -1,95 +0,0 @@
-/*
-//@HEADER
-// ************************************************************************
-//
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
-// the U.S. Government retains certain rights in this software.
-//
-// 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 Corporation nor the names of the
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "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 SANDIA CORPORATION OR THE
-// 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.
-//
-// Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-//
-// ************************************************************************
-//@HEADER
-*/
-
-#include <cstring>
-#include <cstdlib>
-#include <iostream>
-#include <sstream>
-
-#include <Kokkos_Core.hpp>
-
-#include <sort_array.hpp>
-
-
-int main( int argc , char ** argv )
-{
-#if defined( KOKKOS_ENABLE_CUDA ) || defined( KOKKOS_ENABLE_THREADS ) || defined( KOKKOS_ENABLE_OPENMP )
-  Kokkos::initialize( argc , argv );
-
-  int length_array = 100000 ;
-
-  for ( int i = 0 ; i < argc ; ++i ) {
-    if ( 0 == strcmp( argv[i] , "length_array" ) ) {
-      length_array = atoi( argv[i+1] );
-    }
-  }
-
-  int length_total_array  = length_array * 100;
-
-#if defined( KOKKOS_ENABLE_CUDA )
-  if ( Kokkos::Cuda::is_initialized() ) {
-    std::cout << "Kokkos::Cuda" << std::endl ;
-    Example::sort_array< Kokkos::Cuda >( length_array , length_total_array );
-  }
-#endif
-
-#if defined( KOKKOS_ENABLE_THREADS )
-  if ( Kokkos::Threads::is_initialized() ) {
-    std::cout << "Kokkos::Threads" << std::endl ;
-    Example::sort_array< Kokkos::Threads >( length_array , length_total_array );
-  }
-#endif
-
-#if defined( KOKKOS_ENABLE_OPENMP )
-  if ( Kokkos::OpenMP::is_initialized() ) {
-    std::cout << "Kokkos::OpenMP" << std::endl ;
-    Example::sort_array< Kokkos::OpenMP >( length_array , length_total_array );
-  }
-#endif
-
-  Kokkos::finalize();
-#endif
-
-  return 0 ;
-}
-
diff --git a/lib/kokkos/example/sort_array/sort_array.hpp b/lib/kokkos/example/sort_array/sort_array.hpp
deleted file mode 100644
index ae045b61af..0000000000
--- a/lib/kokkos/example/sort_array/sort_array.hpp
+++ /dev/null
@@ -1,190 +0,0 @@
-/*
-//@HEADER
-// ************************************************************************
-//
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
-// the U.S. Government retains certain rights in this software.
-//
-// 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 Corporation nor the names of the
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "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 SANDIA CORPORATION OR THE
-// 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.
-//
-// Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-//
-// ************************************************************************
-//@HEADER
-*/
-
-#ifndef EXAMPLE_SORT_ARRAY
-#define EXAMPLE_SORT_ARRAY
-
-#include <cstdlib>
-#include <algorithm>
-
-#include <Kokkos_Core.hpp>
-
-#include <impl/Kokkos_Timer.hpp>
-
-//----------------------------------------------------------------------------
-//----------------------------------------------------------------------------
-
-namespace Example {
-
-template< class Device >
-struct SortView {
-
-  template< typename ValueType >
-  SortView( const Kokkos::View<ValueType*,Device> v , int begin , int end )
-    {
-      std::sort( v.ptr_on_device() + begin , v.ptr_on_device() + end );
-    }
-};
-
-}
-
-#if defined(KOKKOS_ENABLE_CUDA)
-
-#include <thrust/device_ptr.h>
-#include <thrust/sort.h>
-
-namespace Example {
-
-template<>
-struct SortView< Kokkos::Cuda > {
-  template< typename ValueType >
-  SortView( const Kokkos::View<ValueType*,Kokkos::Cuda> v , int begin , int end )
-    {
-      thrust::sort( thrust::device_ptr<ValueType>( v.ptr_on_device() + begin )
-                  , thrust::device_ptr<ValueType>( v.ptr_on_device() + end ) );
-    }
-};
-
-}
-
-#endif
-
-//----------------------------------------------------------------------------
-//----------------------------------------------------------------------------
-
-namespace Example {
-
-template< class Device >
-void sort_array( const size_t array_length /* length of spans of array to sort */
-               , const size_t total_length /* total length of array */
-               , const int print = 1 )
-{
-  typedef Device execution_space ;
-  typedef Kokkos::View<int*,Device>  device_array_type ;
-
-#if defined( KOKKOS_ENABLE_CUDA )
-
-  typedef typename
-    Kokkos::Impl::if_c< std::is_same< Device , Kokkos::Cuda >::value
-                      , Kokkos::View<int*,Kokkos::Cuda::array_layout,Kokkos::CudaHostPinnedSpace>
-                      , typename device_array_type::HostMirror
-                      >::type  host_array_type ;
-
-#else
-
-  typedef typename device_array_type::HostMirror  host_array_type ;
-
-#endif
-
-  Kokkos::Timer timer;
-
-  const device_array_type  work_array("work_array" , array_length );
-  const host_array_type    host_array("host_array" , total_length );
-
-  std::cout << "sort_array length( " << total_length << " )"
-            << " in chunks( " << array_length << " )"
-            << std::endl ;
-
-  double sec = timer.seconds();
-  std::cout << "declaring Views took "
-            << sec << " seconds" << std::endl;
-  timer.reset();
-
-  for ( size_t i = 0 ; i < total_length ; ++i ) {
-    host_array(i) = ( lrand48() * total_length ) >> 31 ;
-  }
-
-  sec = timer.seconds();
-  std::cout << "initializing " << total_length << " elements on host took "
-            << sec << " seconds" << std::endl;
-  timer.reset();
-
-  double sec_copy_in  = 0 ;
-  double sec_sort     = 0 ;
-  double sec_copy_out = 0 ;
-  double sec_error    = 0 ;
-  size_t error_count  = 0 ;
-
-  for ( size_t begin = 0 ; begin < total_length ; begin += array_length ) {
-
-    const size_t end = begin + array_length < total_length
-                     ? begin + array_length : total_length ;
-
-    const std::pair<size_t,size_t> host_range(begin,end);
-
-    const host_array_type host_subarray = Kokkos::subview( host_array , host_range );
-
-    timer.reset();
-
-    Kokkos::deep_copy( work_array , host_subarray );
-
-    sec_copy_in += timer.seconds(); timer.reset();
-
-    SortView< execution_space >( work_array , 0 , end - begin );
-
-    sec_sort += timer.seconds(); timer.reset();
-
-    Kokkos::deep_copy( host_subarray , work_array );
-
-    sec_copy_out += timer.seconds(); timer.reset();
-
-    for ( size_t i = begin + 1 ; i < end ; ++i ) {
-      if ( host_array(i) < host_array(i-1) ) ++error_count ;
-    }
-
-    sec_error += timer.seconds(); timer.reset();
-  }
-
-  std::cout << "copy to   device " << sec_copy_in  << " seconds" << std::endl
-            << "sort on   device " << sec_sort     << " seconds" << std::endl
-            << "copy from device " << sec_copy_out << " seconds" << std::endl
-            << "errors " << error_count << " took " << sec_error << " seconds" << std::endl
-            ;
-}
-
-} // namespace Example
-
-//----------------------------------------------------------------------------
-
-#endif /* #ifndef EXAMPLE_SORT_ARRAY */
-
diff --git a/lib/kokkos/example/tutorial/01_hello_world/CMakeLists.txt b/lib/kokkos/example/tutorial/01_hello_world/CMakeLists.txt
index 5e5b1fcb46..e1b90b133d 100644
--- a/lib/kokkos/example/tutorial/01_hello_world/CMakeLists.txt
+++ b/lib/kokkos/example/tutorial/01_hello_world/CMakeLists.txt
@@ -1,11 +1,10 @@
 
-INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR})
-INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR})
+KOKKOS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR})
+KOKKOS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR})
 
 # This is a tutorial, not a test, so we don't ask CTest to run it.
-TRIBITS_ADD_EXECUTABLE(
+KOKKOS_ADD_EXECUTABLE(
   tutorial_01_hello_world
   SOURCES hello_world.cpp
-  COMM serial mpi
-  )
+)
 
diff --git a/lib/kokkos/example/tutorial/01_hello_world/hello_world.cpp b/lib/kokkos/example/tutorial/01_hello_world/hello_world.cpp
index 3092b5a574..00adbc78bc 100644
--- a/lib/kokkos/example/tutorial/01_hello_world/hello_world.cpp
+++ b/lib/kokkos/example/tutorial/01_hello_world/hello_world.cpp
@@ -1,13 +1,14 @@
 /*
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -36,7 +37,7 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 */
@@ -84,12 +85,10 @@ struct hello_world {
   // (as well as on the host).  If not building with CUDA, the macro
   // is unnecessary but harmless.
   KOKKOS_INLINE_FUNCTION
-  void operator() (const int i) const {
-    printf ("Hello from i = %i\n", i);
-  }
+  void operator()(const int i) const { printf("Hello from i = %i\n", i); }
 };
 
-int main (int argc, char* argv[]) {
+int main(int argc, char* argv[]) {
   // You must call initialize() before you may call Kokkos.
   //
   // With no arguments, this initializes the default execution space
@@ -97,13 +96,13 @@ int main (int argc, char* argv[]) {
   // parameters.  You may also pass in argc and argv, analogously to
   // MPI_Init().  It reads and removes command-line arguments that
   // start with "--kokkos-".
-  Kokkos::initialize (argc, argv);
+  Kokkos::initialize(argc, argv);
 
   // Print the name of Kokkos' default execution space.  We're using
   // typeid here, so the name might get a bit mangled by the linker,
   // but you should still be able to figure out what it is.
-  printf ("Hello World on Kokkos execution space %s\n",
-          typeid (Kokkos::DefaultExecutionSpace).name ());
+  printf("Hello World on Kokkos execution space %s\n",
+         typeid(Kokkos::DefaultExecutionSpace).name());
 
   // Run the above functor on the default Kokkos execution space in
   // parallel, with a parallel for loop count of 15.
@@ -122,9 +121,8 @@ int main (int argc, char* argv[]) {
   //
   // You may notice that the printed numbers do not print out in
   // order.  Parallel for loops may execute in any order.
-  Kokkos::parallel_for ("HelloWorld",15, hello_world ());
+  Kokkos::parallel_for("HelloWorld", 15, hello_world());
 
   // You must call finalize() after you are done using Kokkos.
-  Kokkos::finalize ();
+  Kokkos::finalize();
 }
-
diff --git a/lib/kokkos/example/tutorial/01_hello_world_lambda/CMakeLists.txt b/lib/kokkos/example/tutorial/01_hello_world_lambda/CMakeLists.txt
index 3fcca4bceb..a939a5f0de 100644
--- a/lib/kokkos/example/tutorial/01_hello_world_lambda/CMakeLists.txt
+++ b/lib/kokkos/example/tutorial/01_hello_world_lambda/CMakeLists.txt
@@ -1,13 +1,10 @@
 
-INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR})
-INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR})
+KOKKOS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR})
+KOKKOS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR})
 
-IF (Kokkos_ENABLE_CXX11)
-  # This is a tutorial, not a test, so we don't ask CTest to run it.
-  TRIBITS_ADD_EXECUTABLE(
-    tutorial_01_hello_world_lambda
-    SOURCES hello_world_lambda.cpp
-    COMM serial mpi
-    )
-ENDIF ()
+# This is a tutorial, not a test, so we don't ask CTest to run it.
+KOKKOS_ADD_EXECUTABLE(
+  tutorial_01_hello_world_lambda
+  SOURCES hello_world_lambda.cpp
+)
 
diff --git a/lib/kokkos/example/tutorial/01_hello_world_lambda/hello_world_lambda.cpp b/lib/kokkos/example/tutorial/01_hello_world_lambda/hello_world_lambda.cpp
index a304a0f3ab..c3bd00e7d4 100644
--- a/lib/kokkos/example/tutorial/01_hello_world_lambda/hello_world_lambda.cpp
+++ b/lib/kokkos/example/tutorial/01_hello_world_lambda/hello_world_lambda.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -58,7 +59,7 @@
 // lambdas have their places.
 //
 
-int main (int argc, char* argv[]) {
+int main(int argc, char* argv[]) {
   // You must call initialize() before you may call Kokkos.
   //
   // With no arguments, this initializes the default execution space
@@ -66,13 +67,13 @@ int main (int argc, char* argv[]) {
   // parameters.  You may also pass in argc and argv, analogously to
   // MPI_Init().  It reads and removes command-line arguments that
   // start with "--kokkos-".
-  Kokkos::initialize (argc, argv);
+  Kokkos::initialize(argc, argv);
 
   // Print the name of Kokkos' default execution space.  We're using
   // typeid here, so the name might get a bit mangled by the linker,
   // but you should still be able to figure out what it is.
-  printf ("Hello World on Kokkos execution space %s\n",
-          typeid (Kokkos::DefaultExecutionSpace).name ());
+  printf("Hello World on Kokkos execution space %s\n",
+         typeid(Kokkos::DefaultExecutionSpace).name());
 
   // Run lambda on the default Kokkos execution space in parallel,
   // with a parallel for loop count of 15.  The lambda's argument is
@@ -101,12 +102,12 @@ int main (int argc, char* argv[]) {
   // We also need to protect the usage of a lambda against compiling
   // with a backend which doesn't support it (i.e. Cuda 6.5/7.0).
 #if defined(KOKKOS_ENABLE_CXX11_DISPATCH_LAMBDA)
-  Kokkos::parallel_for (15, KOKKOS_LAMBDA (const int i) {
-      // printf works in a CUDA parallel kernel; std::ostream does not.
-      printf ("Hello from i = %i\n", i);
-    });
+  Kokkos::parallel_for(
+      15, KOKKOS_LAMBDA(const int i) {
+        // printf works in a CUDA parallel kernel; std::ostream does not.
+        printf("Hello from i = %i\n", i);
+      });
 #endif
   // You must call finalize() after you are done using Kokkos.
-  Kokkos::finalize ();
+  Kokkos::finalize();
 }
-
diff --git a/lib/kokkos/example/tutorial/02_simple_reduce/CMakeLists.txt b/lib/kokkos/example/tutorial/02_simple_reduce/CMakeLists.txt
index 7c78db840f..21b0c38014 100644
--- a/lib/kokkos/example/tutorial/02_simple_reduce/CMakeLists.txt
+++ b/lib/kokkos/example/tutorial/02_simple_reduce/CMakeLists.txt
@@ -1,10 +1,9 @@
 
-INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR})
-INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR})
+KOKKOS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR})
+KOKKOS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR})
 
 # This is a tutorial, not a test, so we don't ask CTest to run it.
-TRIBITS_ADD_EXECUTABLE(
+KOKKOS_ADD_EXECUTABLE(
   tutorial_02_simple_reduce
   SOURCES simple_reduce.cpp
-  COMM serial mpi
-  )
+)
diff --git a/lib/kokkos/example/tutorial/02_simple_reduce/simple_reduce.cpp b/lib/kokkos/example/tutorial/02_simple_reduce/simple_reduce.cpp
index 04a3cfb9a0..01abd3d3bf 100644
--- a/lib/kokkos/example/tutorial/02_simple_reduce/simple_reduce.cpp
+++ b/lib/kokkos/example/tutorial/02_simple_reduce/simple_reduce.cpp
@@ -1,13 +1,14 @@
 /*
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -36,7 +37,7 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 */
@@ -72,30 +73,33 @@ struct squaresum {
   // (If the reduction type is an array like int[], indicating an
   // array reduction result, then the second argument is just int[].)
   KOKKOS_INLINE_FUNCTION
-  void operator () (const int i, int& lsum) const {
-    lsum += i*i; // compute the sum of squares
+  void operator()(const int i, int& lsum) const {
+    lsum += i * i;  // compute the sum of squares
   }
 };
 
-int main (int argc, char* argv[]) {
-  Kokkos::initialize (argc, argv);
+int main(int argc, char* argv[]) {
+  Kokkos::initialize(argc, argv);
   const int n = 10;
 
   // Compute the sum of squares of integers from 0 to n-1, in
   // parallel, using Kokkos.
   int sum = 0;
-  Kokkos::parallel_reduce (n, squaresum (), sum);
-  printf ("Sum of squares of integers from 0 to %i, "
-          "computed in parallel, is %i\n", n - 1, sum);
+  Kokkos::parallel_reduce(n, squaresum(), sum);
+  printf(
+      "Sum of squares of integers from 0 to %i, "
+      "computed in parallel, is %i\n",
+      n - 1, sum);
 
   // Compare to a sequential loop.
   int seqSum = 0;
   for (int i = 0; i < n; ++i) {
-    seqSum += i*i;
+    seqSum += i * i;
   }
-  printf ("Sum of squares of integers from 0 to %i, "
-          "computed sequentially, is %i\n", n - 1, seqSum);
-  Kokkos::finalize ();
+  printf(
+      "Sum of squares of integers from 0 to %i, "
+      "computed sequentially, is %i\n",
+      n - 1, seqSum);
+  Kokkos::finalize();
   return (sum == seqSum) ? 0 : -1;
 }
-
diff --git a/lib/kokkos/example/tutorial/02_simple_reduce_lambda/CMakeLists.txt b/lib/kokkos/example/tutorial/02_simple_reduce_lambda/CMakeLists.txt
index e2e3a929f1..82a87be4bd 100644
--- a/lib/kokkos/example/tutorial/02_simple_reduce_lambda/CMakeLists.txt
+++ b/lib/kokkos/example/tutorial/02_simple_reduce_lambda/CMakeLists.txt
@@ -1,12 +1,9 @@
 
-INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR})
-INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR})
+KOKKOS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR})
+KOKKOS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR})
+
+KOKKOS_ADD_EXECUTABLE(
+  tutorial_02_simple_reduce_lambda
+  SOURCES simple_reduce_lambda.cpp
+)
 
-IF (Kokkos_ENABLE_CXX11)
-  # This is a tutorial, not a test, so we don't ask CTest to run it.
-  TRIBITS_ADD_EXECUTABLE(
-    tutorial_02_simple_reduce_lambda
-    SOURCES simple_reduce_lambda.cpp
-    COMM serial mpi
-    )
-ENDIF ()
diff --git a/lib/kokkos/example/tutorial/02_simple_reduce_lambda/simple_reduce_lambda.cpp b/lib/kokkos/example/tutorial/02_simple_reduce_lambda/simple_reduce_lambda.cpp
index 8ed5d8f62d..7f4c356e0c 100644
--- a/lib/kokkos/example/tutorial/02_simple_reduce_lambda/simple_reduce_lambda.cpp
+++ b/lib/kokkos/example/tutorial/02_simple_reduce_lambda/simple_reduce_lambda.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -56,8 +57,8 @@
 // of the parallel_reduce.
 //
 
-int main (int argc, char* argv[]) {
-  Kokkos::initialize (argc, argv);
+int main(int argc, char* argv[]) {
+  Kokkos::initialize(argc, argv);
   const int n = 10;
 
   // Compute the sum of squares of integers from 0 to n-1, in
@@ -65,30 +66,32 @@ int main (int argc, char* argv[]) {
   // functor.  The lambda takes the same arguments as the functor's
   // operator().
   int sum = 0;
-  // The KOKKOS_LAMBDA macro replaces the capture-by-value clause [=].
-  // It also handles any other syntax needed for CUDA.
-  // We also need to protect the usage of a lambda against compiling
-  // with a backend which doesn't support it (i.e. Cuda 6.5/7.0).
-  #if defined(KOKKOS_ENABLE_CXX11_DISPATCH_LAMBDA)
-  Kokkos::parallel_reduce (n, KOKKOS_LAMBDA (const int i, int& lsum) {
-      lsum += i*i;
-    }, sum);
-  #endif
-  printf ("Sum of squares of integers from 0 to %i, "
-          "computed in parallel, is %i\n", n - 1, sum);
+// The KOKKOS_LAMBDA macro replaces the capture-by-value clause [=].
+// It also handles any other syntax needed for CUDA.
+// We also need to protect the usage of a lambda against compiling
+// with a backend which doesn't support it (i.e. Cuda 6.5/7.0).
+#if defined(KOKKOS_ENABLE_CXX11_DISPATCH_LAMBDA)
+  Kokkos::parallel_reduce(
+      n, KOKKOS_LAMBDA(const int i, int& lsum) { lsum += i * i; }, sum);
+#endif
+  printf(
+      "Sum of squares of integers from 0 to %i, "
+      "computed in parallel, is %i\n",
+      n - 1, sum);
 
   // Compare to a sequential loop.
   int seqSum = 0;
   for (int i = 0; i < n; ++i) {
-    seqSum += i*i;
+    seqSum += i * i;
   }
-  printf ("Sum of squares of integers from 0 to %i, "
-          "computed sequentially, is %i\n", n - 1, seqSum);
-  Kokkos::finalize ();
+  printf(
+      "Sum of squares of integers from 0 to %i, "
+      "computed sequentially, is %i\n",
+      n - 1, seqSum);
+  Kokkos::finalize();
 #if defined(KOKKOS_ENABLE_CXX11_DISPATCH_LAMBDA)
   return (sum == seqSum) ? 0 : -1;
 #else
   return 0;
 #endif
 }
-
diff --git a/lib/kokkos/example/tutorial/03_simple_view/CMakeLists.txt b/lib/kokkos/example/tutorial/03_simple_view/CMakeLists.txt
index 7475a99e49..99a7d39c17 100644
--- a/lib/kokkos/example/tutorial/03_simple_view/CMakeLists.txt
+++ b/lib/kokkos/example/tutorial/03_simple_view/CMakeLists.txt
@@ -1,10 +1,9 @@
 
-INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR})
-INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR})
+KOKKOS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR})
+KOKKOS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR})
 
 # This is a tutorial, not a test, so we don't ask CTest to run it.
-TRIBITS_ADD_EXECUTABLE(
+KOKKOS_ADD_EXECUTABLE(
   tutorial_03_simple_view
   SOURCES simple_view.cpp
-  COMM serial mpi
-  )
+)
diff --git a/lib/kokkos/example/tutorial/03_simple_view/Makefile b/lib/kokkos/example/tutorial/03_simple_view/Makefile
index de994a8df9..c9dc3a0fd0 100644
--- a/lib/kokkos/example/tutorial/03_simple_view/Makefile
+++ b/lib/kokkos/example/tutorial/03_simple_view/Makefile
@@ -43,7 +43,7 @@ include $(KOKKOS_PATH)/Makefile.kokkos
 
 build: $(EXE)
 
-#for unit testing only, for best preformance with OpenMP 4.0 or better
+#for unit testing only, for best performance with OpenMP 4.0 or better
 test: $(EXE)
 	./$(EXE)
 
diff --git a/lib/kokkos/example/tutorial/03_simple_view/simple_view.cpp b/lib/kokkos/example/tutorial/03_simple_view/simple_view.cpp
index de4b4ffd58..f4924c71fa 100644
--- a/lib/kokkos/example/tutorial/03_simple_view/simple_view.cpp
+++ b/lib/kokkos/example/tutorial/03_simple_view/simple_view.cpp
@@ -1,13 +1,14 @@
 /*
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -36,7 +37,7 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 */
@@ -66,7 +67,7 @@
 //
 // The first dimension of the View is the dimension over which it is
 // efficient for Kokkos to parallelize.
-typedef Kokkos::View<double*[3]> view_type;
+typedef Kokkos::View<double * [3]> view_type;
 
 // parallel_for functor that fills the View given to its constructor.
 // The View must already have been allocated.
@@ -78,20 +79,18 @@ struct InitView {
   // operator= only do shallow copies.  Thus, you can pass View
   // objects around by "value"; they won't do a deep copy unless you
   // explicitly ask for a deep copy.
-  InitView (view_type a_) :
-    a (a_)
-  {}
+  InitView(view_type a_) : a(a_) {}
 
   // Fill the View with some data.  The parallel_for loop will iterate
   // over the View's first dimension N.
   KOKKOS_INLINE_FUNCTION
-  void operator () (const int i) const {
+  void operator()(const int i) const {
     // Acesss the View just like a Fortran array.  The layout depends
     // on the View's memory space, so don't rely on the View's
     // physical memory layout unless you know what you're doing.
-    a(i,0) = 1.0*i;
-    a(i,1) = 1.0*i*i;
-    a(i,2) = 1.0*i*i*i;
+    a(i, 0) = 1.0 * i;
+    a(i, 1) = 1.0 * i * i;
+    a(i, 2) = 1.0 * i * i * i;
   }
 };
 
@@ -100,20 +99,20 @@ struct ReduceFunctor {
   view_type a;
 
   // Constructor takes View by "value"; this does a shallow copy.
-  ReduceFunctor (view_type a_) : a (a_) {}
+  ReduceFunctor(view_type a_) : a(a_) {}
 
   // If you write a functor to do a reduction, you must specify the
   // type of the reduction result via a public 'value_type' typedef.
   typedef double value_type;
 
   KOKKOS_INLINE_FUNCTION
-  void operator() (int i, double &lsum) const {
-    lsum += a(i,0)*a(i,1)/(a(i,2)+0.1);
+  void operator()(int i, double& lsum) const {
+    lsum += a(i, 0) * a(i, 1) / (a(i, 2) + 0.1);
   }
 };
 
-int main (int argc, char* argv[]) {
-  Kokkos::initialize (argc, argv);
+int main(int argc, char* argv[]) {
+  Kokkos::initialize(argc, argv);
   {
     const int N = 10;
 
@@ -132,13 +131,12 @@ int main (int argc, char* argv[]) {
     //
     // The string "A" is just the label; it only matters for debugging.
     // Different Views may have the same label.
-    view_type a ("A", N);
+    view_type a("A", N);
 
-    Kokkos::parallel_for (N, InitView (a));
+    Kokkos::parallel_for(N, InitView(a));
     double sum = 0;
-    Kokkos::parallel_reduce (N, ReduceFunctor (a), sum);
-    printf ("Result: %f\n", sum);
-  } // use this scope to ensure the lifetime of "A" ends before finalize
-  Kokkos::finalize ();
+    Kokkos::parallel_reduce(N, ReduceFunctor(a), sum);
+    printf("Result: %f\n", sum);
+  }  // use this scope to ensure the lifetime of "A" ends before finalize
+  Kokkos::finalize();
 }
-
diff --git a/lib/kokkos/example/tutorial/03_simple_view_lambda/CMakeLists.txt b/lib/kokkos/example/tutorial/03_simple_view_lambda/CMakeLists.txt
index 601fe452a4..c0f33a61b9 100644
--- a/lib/kokkos/example/tutorial/03_simple_view_lambda/CMakeLists.txt
+++ b/lib/kokkos/example/tutorial/03_simple_view_lambda/CMakeLists.txt
@@ -1,10 +1,10 @@
 
-INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR})
-INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR})
+KOKKOS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR})
+KOKKOS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR})
 
 IF (Kokkos_ENABLE_CXX11)
   # This is a tutorial, not a test, so we don't ask CTest to run it.
-  TRIBITS_ADD_EXECUTABLE(
+  KOKKOS_ADD_EXECUTABLE(
     tutorial_03_simple_view_lambda
     SOURCES simple_view_lambda.cpp
     COMM serial mpi
diff --git a/lib/kokkos/example/tutorial/03_simple_view_lambda/simple_view_lambda.cpp b/lib/kokkos/example/tutorial/03_simple_view_lambda/simple_view_lambda.cpp
index 3faf73a65d..d5590e5ccd 100644
--- a/lib/kokkos/example/tutorial/03_simple_view_lambda/simple_view_lambda.cpp
+++ b/lib/kokkos/example/tutorial/03_simple_view_lambda/simple_view_lambda.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -65,10 +66,10 @@
 //
 // The first dimension of the View is the dimension over which it is
 // efficient for Kokkos to parallelize.
-typedef Kokkos::View<double*[3]> view_type;
+typedef Kokkos::View<double * [3]> view_type;
 
-int main (int argc, char* argv[]) {
-  Kokkos::initialize (argc, argv);
+int main(int argc, char* argv[]) {
+  Kokkos::initialize(argc, argv);
 
   {
     // Allocate the View.  The first dimension is a run-time parameter
@@ -86,37 +87,40 @@ int main (int argc, char* argv[]) {
     //
     // The string "A" is just the label; it only matters for debugging.
     // Different Views may have the same label.
-    view_type a ("A", 10);
+    view_type a("A", 10);
 
-    // Fill the View with some data.  The parallel_for loop will iterate
-    // over the View's first dimension N.
-    //
-    // Note that the View is passed by value into the lambda.  The macro
-    // KOKKOS_LAMBDA includes the "capture by value" clause [=].  This
-    // tells the lambda to "capture all variables in the enclosing scope
-    // by value."  Views have "view semantics"; they behave like
-    // pointers, not like std::vector.  Passing them by value does a
-    // shallow copy.  A deep copy never happens unless you explicitly
-    // ask for one.
-    // We also need to protect the usage of a lambda against compiling
-    // with a backend which doesn't support it (i.e. Cuda 6.5/7.0).
-    #if defined(KOKKOS_ENABLE_CXX11_DISPATCH_LAMBDA)
-    Kokkos::parallel_for (10, KOKKOS_LAMBDA (const int i) {
-      // Acesss the View just like a Fortran array.  The layout depends
-      // on the View's memory space, so don't rely on the View's
-      // physical memory layout unless you know what you're doing.
-      a(i,0) = 1.0*i;
-      a(i,1) = 1.0*i*i;
-      a(i,2) = 1.0*i*i*i;
-    });
+// Fill the View with some data.  The parallel_for loop will iterate
+// over the View's first dimension N.
+//
+// Note that the View is passed by value into the lambda.  The macro
+// KOKKOS_LAMBDA includes the "capture by value" clause [=].  This
+// tells the lambda to "capture all variables in the enclosing scope
+// by value."  Views have "view semantics"; they behave like
+// pointers, not like std::vector.  Passing them by value does a
+// shallow copy.  A deep copy never happens unless you explicitly
+// ask for one.
+// We also need to protect the usage of a lambda against compiling
+// with a backend which doesn't support it (i.e. Cuda 6.5/7.0).
+#if defined(KOKKOS_ENABLE_CXX11_DISPATCH_LAMBDA)
+    Kokkos::parallel_for(
+        10, KOKKOS_LAMBDA(const int i) {
+          // Acesss the View just like a Fortran array.  The layout depends
+          // on the View's memory space, so don't rely on the View's
+          // physical memory layout unless you know what you're doing.
+          a(i, 0) = 1.0 * i;
+          a(i, 1) = 1.0 * i * i;
+          a(i, 2) = 1.0 * i * i * i;
+        });
     // Reduction functor that reads the View given to its constructor.
     double sum = 0;
-    Kokkos::parallel_reduce (10, KOKKOS_LAMBDA (const int i, double& lsum) {
-      lsum += a(i,0)*a(i,1)/(a(i,2)+0.1);
-    }, sum);
-    printf ("Result: %f\n", sum);
-    #endif
+    Kokkos::parallel_reduce(
+        10,
+        KOKKOS_LAMBDA(const int i, double& lsum) {
+          lsum += a(i, 0) * a(i, 1) / (a(i, 2) + 0.1);
+        },
+        sum);
+    printf("Result: %f\n", sum);
+#endif
   }
-  Kokkos::finalize ();
+  Kokkos::finalize();
 }
-
diff --git a/lib/kokkos/example/tutorial/04_simple_memoryspaces/CMakeLists.txt b/lib/kokkos/example/tutorial/04_simple_memoryspaces/CMakeLists.txt
index 09f209077a..03fb97a133 100644
--- a/lib/kokkos/example/tutorial/04_simple_memoryspaces/CMakeLists.txt
+++ b/lib/kokkos/example/tutorial/04_simple_memoryspaces/CMakeLists.txt
@@ -3,8 +3,7 @@ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR})
 INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR})
 
 # This is a tutorial, not a test, so we don't ask CTest to run it.
-TRIBITS_ADD_EXECUTABLE(
+KOKKOS_ADD_EXECUTABLE(
   tutorial_04_simple_memoryspaces
   SOURCES simple_memoryspaces.cpp
-  COMM serial mpi
-  )
+)
diff --git a/lib/kokkos/example/tutorial/04_simple_memoryspaces/simple_memoryspaces.cpp b/lib/kokkos/example/tutorial/04_simple_memoryspaces/simple_memoryspaces.cpp
index c909fbc232..603d139df9 100644
--- a/lib/kokkos/example/tutorial/04_simple_memoryspaces/simple_memoryspaces.cpp
+++ b/lib/kokkos/example/tutorial/04_simple_memoryspaces/simple_memoryspaces.cpp
@@ -1,13 +1,14 @@
 /*
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -36,7 +37,7 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 */
@@ -46,7 +47,7 @@
 
 // The type of a two-dimensional N x 3 array of double.
 // It lives in Kokkos' default memory space.
-typedef Kokkos::View<double*[3]> view_type;
+typedef Kokkos::View<double * [3]> view_type;
 
 // The "HostMirror" type corresponding to view_type above is also a
 // two-dimensional N x 3 array of double.  However, it lives in the
@@ -64,12 +65,12 @@ typedef view_type::HostMirror host_view_type;
 
 struct ReduceFunctor {
   view_type a;
-  ReduceFunctor (view_type a_) : a (a_) {}
-  typedef int value_type; //Specify type for reduction value, lsum
+  ReduceFunctor(view_type a_) : a(a_) {}
+  typedef int value_type;  // Specify type for reduction value, lsum
 
   KOKKOS_INLINE_FUNCTION
-  void operator() (int i, int &lsum) const {
-    lsum += a(i,0)-a(i,1)+a(i,2);
+  void operator()(int i, int &lsum) const {
+    lsum += a(i, 0) - a(i, 1) + a(i, 2);
   }
 };
 
@@ -77,27 +78,26 @@ int main() {
   Kokkos::initialize();
 
   {
-    view_type a ("A", 10);
+    view_type a("A", 10);
     // If view_type and host_mirror_type live in the same memory space,
     // a "mirror view" is just an alias, and deep_copy does nothing.
     // Otherwise, a mirror view of a device View lives in host memory,
     // and deep_copy does a deep copy.
-    host_view_type h_a = Kokkos::create_mirror_view (a);
+    host_view_type h_a = Kokkos::create_mirror_view(a);
 
     // The View h_a lives in host (CPU) memory, so it's legal to fill
     // the view sequentially using ordinary code, like this.
     for (int i = 0; i < 10; i++) {
       for (int j = 0; j < 3; j++) {
-        h_a(i,j) = i*10 + j;
+        h_a(i, j) = i * 10 + j;
       }
     }
-    Kokkos::deep_copy (a, h_a); // Copy from host to device.
+    Kokkos::deep_copy(a, h_a);  // Copy from host to device.
 
     int sum = 0;
-    Kokkos::parallel_reduce (10, ReduceFunctor (a), sum);
-    printf ("Result is %i\n",sum);
+    Kokkos::parallel_reduce(10, ReduceFunctor(a), sum);
+    printf("Result is %i\n", sum);
   }
 
-  Kokkos::finalize ();
+  Kokkos::finalize();
 }
-
diff --git a/lib/kokkos/example/tutorial/05_simple_atomics/CMakeLists.txt b/lib/kokkos/example/tutorial/05_simple_atomics/CMakeLists.txt
index 5a5790fb04..85870e5e50 100644
--- a/lib/kokkos/example/tutorial/05_simple_atomics/CMakeLists.txt
+++ b/lib/kokkos/example/tutorial/05_simple_atomics/CMakeLists.txt
@@ -3,8 +3,8 @@ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR})
 INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR})
 
 # This is a tutorial, not a test, so we don't ask CTest to run it.
-TRIBITS_ADD_EXECUTABLE(
+KOKKOS_ADD_EXECUTABLE(
   tutorial_05_simple_atomics
   SOURCES simple_atomics.cpp
-  COMM serial mpi
-  )
+)
+
diff --git a/lib/kokkos/example/tutorial/05_simple_atomics/simple_atomics.cpp b/lib/kokkos/example/tutorial/05_simple_atomics/simple_atomics.cpp
index 8dd2be5800..396b396879 100644
--- a/lib/kokkos/example/tutorial/05_simple_atomics/simple_atomics.cpp
+++ b/lib/kokkos/example/tutorial/05_simple_atomics/simple_atomics.cpp
@@ -1,13 +1,14 @@
 /*
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -36,7 +37,7 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 */
@@ -59,7 +60,6 @@ typedef view_type::HostMirror host_view_type;
 typedef Kokkos::View<int> count_type;
 typedef count_type::HostMirror host_count_type;
 
-
 // Functor for finding a list of primes in a given set of numbers.  If
 // run in parallel, the order of results is nondeterministic, because
 // hardware atomic updates do not guarantee an order of execution.
@@ -68,26 +68,25 @@ struct findprimes {
   view_type result;
   count_type count;
 
-  findprimes (view_type data_, view_type result_, count_type count_) :
-    data (data_), result (result_), count (count_)
-  {}
+  findprimes(view_type data_, view_type result_, count_type count_)
+      : data(data_), result(result_), count(count_) {}
 
   // Test if data(i) is prime.  If it is, increment the count of
   // primes (stored in the zero-dimensional View 'count') and add the
   // value to the current list of primes 'result'.
   KOKKOS_INLINE_FUNCTION
-  void operator() (const int i) const {
-    const int number = data(i); // the current number
+  void operator()(const int i) const {
+    const int number = data(i);  // the current number
 
     // Test all numbers from 3 to ceiling(sqrt(data(i))), to see if
     // they are factors of data(i).  It's not the most efficient prime
     // test, but it works.
-    const int upper_bound = std::sqrt(1.0*number)+1;
-    bool is_prime = !(number%2 == 0);
-    int k = 3;
+    const int upper_bound = std::sqrt(1.0 * number) + 1;
+    bool is_prime         = !(number % 2 == 0);
+    int k                 = 3;
     while (k < upper_bound && is_prime) {
-      is_prime = !(number%k == 0);
-      k += 2; // don't have to test even numbers
+      is_prime = !(number % k == 0);
+      k += 2;  // don't have to test even numbers
     }
 
     if (is_prime) {
@@ -98,42 +97,41 @@ struct findprimes {
       // atomic_fetch_add results the _current_ count, but increments
       // it (by 1 in this case).  The current count of primes indexes
       // into the first unoccupied position of the 'result' array.
-      const int idx = Kokkos::atomic_fetch_add (&count(), 1);
-      result(idx) = number;
+      const int idx = Kokkos::atomic_fetch_add(&count(), 1);
+      result(idx)   = number;
     }
   }
-
 };
 
-int main () {
-  Kokkos::initialize ();
+int main() {
+  Kokkos::initialize();
 
   {
-    srand (61391); // Set the random seed
+    srand(61391);  // Set the random seed
 
     int nnumbers = 100000;
-    view_type data ("RND", nnumbers);
-    view_type result ("Prime", nnumbers);
-    count_type count ("Count");
+    view_type data("RND", nnumbers);
+    view_type result("Prime", nnumbers);
+    count_type count("Count");
 
-    host_view_type h_data = Kokkos::create_mirror_view (data);
-    host_view_type h_result = Kokkos::create_mirror_view (result);
-    host_count_type h_count = Kokkos::create_mirror_view (count);
+    host_view_type h_data   = Kokkos::create_mirror_view(data);
+    host_view_type h_result = Kokkos::create_mirror_view(result);
+    host_count_type h_count = Kokkos::create_mirror_view(count);
 
     typedef view_type::size_type size_type;
     // Fill the 'data' array on the host with random numbers.  We assume
     // that they come from some process which is only implemented on the
     // host, via some library.  (That's true in this case.)
     for (size_type i = 0; i < data.extent(0); ++i) {
-      h_data(i) = rand () % nnumbers;
+      h_data(i) = rand() % nnumbers;
     }
-    Kokkos::deep_copy (data, h_data); // copy from host to device
+    Kokkos::deep_copy(data, h_data);  // copy from host to device
 
-    Kokkos::parallel_for (data.extent(0), findprimes (data, result, count));
-    Kokkos::deep_copy (h_count, count); // copy from device to host
+    Kokkos::parallel_for(data.extent(0), findprimes(data, result, count));
+    Kokkos::deep_copy(h_count, count);  // copy from device to host
 
-    printf ("Found %i prime numbers in %i random numbers\n", h_count(), nnumbers);
+    printf("Found %i prime numbers in %i random numbers\n", h_count(),
+           nnumbers);
   }
-  Kokkos::finalize ();
+  Kokkos::finalize();
 }
-
diff --git a/lib/kokkos/example/tutorial/06_simple_mdrangepolicy/CMakeLists.txt b/lib/kokkos/example/tutorial/06_simple_mdrangepolicy/CMakeLists.txt
index d18938a61f..ca9f0bf8da 100644
--- a/lib/kokkos/example/tutorial/06_simple_mdrangepolicy/CMakeLists.txt
+++ b/lib/kokkos/example/tutorial/06_simple_mdrangepolicy/CMakeLists.txt
@@ -3,8 +3,8 @@ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR})
 INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR})
 
 # This is a tutorial, not a test, so we don't ask CTest to run it.
-TRIBITS_ADD_EXECUTABLE(
+KOKKOS_ADD_EXECUTABLE(
   tutorial_06_simple_mdrangepolicy
   SOURCES simple_mdrangepolicy.cpp
-  COMM serial mpi
-  )
+)
+
diff --git a/lib/kokkos/example/tutorial/06_simple_mdrangepolicy/simple_mdrangepolicy.cpp b/lib/kokkos/example/tutorial/06_simple_mdrangepolicy/simple_mdrangepolicy.cpp
index 38cf00dd19..62c087c32c 100644
--- a/lib/kokkos/example/tutorial/06_simple_mdrangepolicy/simple_mdrangepolicy.cpp
+++ b/lib/kokkos/example/tutorial/06_simple_mdrangepolicy/simple_mdrangepolicy.cpp
@@ -1,13 +1,14 @@
 /*
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -36,7 +37,7 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 */
@@ -52,150 +53,163 @@
 //   3. Shut down Kokkos
 //
 // Two examples are provided:
-// Example 1: Rank 2 case with minimal default parameters and arguments used 
+// Example 1: Rank 2 case with minimal default parameters and arguments used
 //            in the MDRangePolicy
 //
 // Example 2: Rank 3 case with additional outer/inner iterate pattern parameters
 //            and tile dims passed to the ctor
 
-
 // Simple functor for computing/storing the product of indices in a View v
-template < class ViewType >
+template <class ViewType>
 struct MDFunctor {
-
   typedef long value_type;
 
   ViewType v;
-  size_t   size;
+  size_t size;
 
-  MDFunctor( const ViewType & v_, const size_t size_ )
-    : v(v_), size(size_) {}
+  MDFunctor(const ViewType& v_, const size_t size_) : v(v_), size(size_) {}
 
   // 2D case - used by parallel_for
   KOKKOS_INLINE_FUNCTION
-  void operator () (const int i, const int j) const {
-    v(i,j) = i*j; // compute the product of indices
+  void operator()(const int i, const int j) const {
+    v(i, j) = i * j;  // compute the product of indices
   }
 
   // 3D case - used by parallel_for
   KOKKOS_INLINE_FUNCTION
-  void operator () (const int i, const int j, const int k) const {
-    v(i,j,k) = i*j*k; // compute the product of indices
+  void operator()(const int i, const int j, const int k) const {
+    v(i, j, k) = i * j * k;  // compute the product of indices
   }
 
   // 2D case - reduction
   KOKKOS_INLINE_FUNCTION
-  void operator () (const int i, const int j, value_type & incorrect_count) const {
-    if ( v(i,j) != i*j ) {
+  void operator()(const int i, const int j, value_type& incorrect_count) const {
+    if (v(i, j) != i * j) {
       incorrect_count += 1;
     }
   }
 
   // 3D case - reduction
   KOKKOS_INLINE_FUNCTION
-  void operator () (const int i, const int j, const int k, value_type & incorrect_count) const {
-    if ( v(i,j,k) != i*j*k ) {
+  void operator()(const int i, const int j, const int k,
+                  value_type& incorrect_count) const {
+    if (v(i, j, k) != i * j * k) {
       incorrect_count += 1;
     }
   }
-
 };
 
-int main (int argc, char* argv[]) {
-  Kokkos::initialize (argc, argv);
+int main(int argc, char* argv[]) {
+  Kokkos::initialize(argc, argv);
 
-  // Bound(s) for MDRangePolicy 
+  // Bound(s) for MDRangePolicy
   const int n = 100;
 
   // ViewType typedefs for Rank<2>, Rank<3> for example usage
   typedef double ScalarType;
-  typedef typename Kokkos::View<ScalarType**>   ViewType_2D;
-  typedef typename Kokkos::View<ScalarType***>  ViewType_3D;
+  typedef typename Kokkos::View<ScalarType**> ViewType_2D;
+  typedef typename Kokkos::View<ScalarType***> ViewType_3D;
 
   /////////////////////////////////////////////////////////////////////////////
-  // Explanation of MDRangePolicy usage, template parameters, constructor arguments
+  // Explanation of MDRangePolicy usage, template parameters, constructor
+  // arguments
   //
   // MDRangePolicy typedefs for Rank<2>, Rank<3> cases
-  // Required template parameters: 
+  // Required template parameters:
   //   Kokkos::Rank<N>: where N=rank
   //
   // Optional template parameters to Rank<...>:
-  //   Kokkos::Iterate::{Default,Left,Right}: Outer iteration pattern across tiles; 
+  //   Kokkos::Iterate::{Default,Left,Right}: Outer iteration pattern across
+  //   tiles;
   //     defaults based on the execution space similar to Kokkos::Layout
-  //   Kokkos::Iterate::{Default,Left,Right}: Inner iteration pattern within tiles; 
+  //   Kokkos::Iterate::{Default,Left,Right}: Inner iteration pattern within
+  //   tiles;
   //     defaults based on the execution space similar to Kokkos::Layout
   //
   //   e.g. typedef Rank<2, Iterate::Left, Iterate::Left> rank2ll;
   //
   //
   // Optional template parameters to MDRangePolicy:
-  //   ExecutionSpace: Kokkos::Serial, Kokkos::OpenMP, Kokkos::Cuda, etc. 
+  //   ExecutionSpace: Kokkos::Serial, Kokkos::OpenMP, Kokkos::Cuda, etc.
   //
   //   Kokkos::IndexType< T >: where T = int, long, unsigned int, etc.
   //
   //   struct Tag{}: A user-provided tag for tagging functor operators
   //
-  //   e.g. 1:  MDRangePolicy< Kokkos::Serial, Rank<2, Iterate::Left, Iterate::Left>, IndexType<int>, Tag > mdpolicy;
-  //   e.g. 2:  MDRangePolicy< Kokkos::Serial, rank2ll, IndexType<int>, Tag > mdpolicy;
+  //   e.g. 1:  MDRangePolicy< Kokkos::Serial, Rank<2, Iterate::Left,
+  //   Iterate::Left>, IndexType<int>, Tag > mdpolicy; e.g. 2:  MDRangePolicy<
+  //   Kokkos::Serial, rank2ll, IndexType<int>, Tag > mdpolicy;
   //
   //
   // Required arguments to ctor:
-  //   {{ l0, l1, ... }}: Lower bounds, provided as Kokkos::Array or std::initializer_list
-  //   {{ u0, u1, ... }}: Upper bounds, provided as Kokkos::Array or std::initializer_list
+  //   {{ l0, l1, ... }}: Lower bounds, provided as Kokkos::Array or
+  //   std::initializer_list
+  //   {{ u0, u1, ... }}: Upper bounds, provided as Kokkos::Array or
+  //   std::initializer_list
   //
   // Optional arguments to ctor:
-  //   {{ t0, t1, ... }}: Tile dimensions, provided as Kokkos::Array or std::initializer_list
+  //   {{ t0, t1, ... }}: Tile dimensions, provided as Kokkos::Array or
+  //   std::initializer_list
   //                      defaults based on the execution space
   //
   //  e.g. mdpolicy( {{0,0}}, {{u0,u1}}, {{t0,t1}};
-  //   
+  //
   /////////////////////////////////////////////////////////////////////////////
 
-  // Example 1: 
+  // Example 1:
   long incorrect_count_2d = 0;
   {
     // Rank<2> Case: Rank is provided, all other parameters are default
-    typedef typename Kokkos::Experimental::MDRangePolicy< Kokkos::Experimental::Rank<2> > MDPolicyType_2D;
+    typedef typename Kokkos::Experimental::MDRangePolicy<
+        Kokkos::Experimental::Rank<2> >
+        MDPolicyType_2D;
 
-    // Construct 2D MDRangePolicy: lower and upper bounds provided, tile dims defaulted
-    MDPolicyType_2D mdpolicy_2d( {{0,0}}, {{n,n}} );
+    // Construct 2D MDRangePolicy: lower and upper bounds provided, tile dims
+    // defaulted
+    MDPolicyType_2D mdpolicy_2d({{0, 0}}, {{n, n}});
 
     // Construct a 2D view to store result of product of indices
     ViewType_2D v2("v2", n, n);
 
     // Execute parallel_for with rank 2 MDRangePolicy
-    Kokkos::parallel_for( "md2d", mdpolicy_2d, MDFunctor<ViewType_2D>(v2, n) );
+    Kokkos::parallel_for("md2d", mdpolicy_2d, MDFunctor<ViewType_2D>(v2, n));
 
     // Check results with a parallel_reduce using the MDRangePolicy
-    Kokkos::parallel_reduce( "md2dredux", mdpolicy_2d, MDFunctor<ViewType_2D>(v2, n), incorrect_count_2d );
+    Kokkos::parallel_reduce("md2dredux", mdpolicy_2d,
+                            MDFunctor<ViewType_2D>(v2, n), incorrect_count_2d);
 
-    printf("Rank 2 MDRangePolicy incorrect count: %ld\n", incorrect_count_2d); // should be 0
+    printf("Rank 2 MDRangePolicy incorrect count: %ld\n",
+           incorrect_count_2d);  // should be 0
   }
 
-
-  // Example 2: 
+  // Example 2:
   long incorrect_count_3d = 0;
   {
     // Rank<3> Case: Rank, inner iterate pattern, outer iterate pattern provided
-    typedef typename Kokkos::Experimental::MDRangePolicy< Kokkos::Experimental::Rank<3, Kokkos::Experimental::Iterate::Left, Kokkos::Experimental::Iterate::Left> > MDPolicyType_3D;
+    typedef typename Kokkos::Experimental::MDRangePolicy<
+        Kokkos::Experimental::Rank<3, Kokkos::Experimental::Iterate::Left,
+                                   Kokkos::Experimental::Iterate::Left> >
+        MDPolicyType_3D;
 
     // Construct 3D MDRangePolicy: lower, upper bounds, tile dims provided
-    MDPolicyType_3D mdpolicy_3d( {{0,0,0}}, {{n,n,n}}, {{4,4,4}} );
+    MDPolicyType_3D mdpolicy_3d({{0, 0, 0}}, {{n, n, n}}, {{4, 4, 4}});
 
     // Construct a 3D view to store result of product of indices
     ViewType_3D v3("v3", n, n, n);
 
     // Execute parallel_for with rank 3 MDRangePolicy
-    Kokkos::parallel_for( "md3d", mdpolicy_3d, MDFunctor<ViewType_3D>(v3, n) );
+    Kokkos::parallel_for("md3d", mdpolicy_3d, MDFunctor<ViewType_3D>(v3, n));
 
     // Check results with a parallel_reduce using the MDRangePolicy
-    Kokkos::parallel_reduce( "md3dredux", mdpolicy_3d, MDFunctor<ViewType_3D>(v3, n), incorrect_count_3d );
+    Kokkos::parallel_reduce("md3dredux", mdpolicy_3d,
+                            MDFunctor<ViewType_3D>(v3, n), incorrect_count_3d);
 
-    printf("Rank 3 MDRangePolicy incorrect count: %ld\n", incorrect_count_3d); // should be 0
+    printf("Rank 3 MDRangePolicy incorrect count: %ld\n",
+           incorrect_count_3d);  // should be 0
   }
 
-  Kokkos::finalize ();
+  Kokkos::finalize();
 
-  return (incorrect_count_2d == long(0) && incorrect_count_3d == long(0)) ? 0 : -1;
+  return (incorrect_count_2d == long(0) && incorrect_count_3d == long(0)) ? 0
+                                                                          : -1;
 }
-
diff --git a/lib/kokkos/example/tutorial/Advanced_Views/01_data_layouts/CMakeLists.txt b/lib/kokkos/example/tutorial/Advanced_Views/01_data_layouts/CMakeLists.txt
index 2eb3a8f6c9..b0db41bf45 100644
--- a/lib/kokkos/example/tutorial/Advanced_Views/01_data_layouts/CMakeLists.txt
+++ b/lib/kokkos/example/tutorial/Advanced_Views/01_data_layouts/CMakeLists.txt
@@ -3,8 +3,7 @@ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR})
 INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR})
 
 # This is a tutorial, not a test, so we don't ask CTest to run it.
-TRIBITS_ADD_EXECUTABLE(
+KOKKOS_ADD_EXECUTABLE(
   tutorial_advancedviews_01_data_layouts
   SOURCES data_layouts.cpp
-  COMM serial mpi
-  )
+)
diff --git a/lib/kokkos/example/tutorial/Advanced_Views/01_data_layouts/data_layouts.cpp b/lib/kokkos/example/tutorial/Advanced_Views/01_data_layouts/data_layouts.cpp
index 3aacad2035..9bfa49456a 100644
--- a/lib/kokkos/example/tutorial/Advanced_Views/01_data_layouts/data_layouts.cpp
+++ b/lib/kokkos/example/tutorial/Advanced_Views/01_data_layouts/data_layouts.cpp
@@ -1,13 +1,14 @@
 /*
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -36,7 +37,7 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 */
@@ -62,19 +63,19 @@ typedef Kokkos::View<double*> view_type;
 // parallel_for functor that fills the given View with some data.  It
 // expects to access the View by rows in parallel: each call i of
 // operator() accesses a row.
-template<class ViewType>
+template <class ViewType>
 struct init_view {
   ViewType a;
-  init_view (ViewType a_) : a (a_) {}
+  init_view(ViewType a_) : a(a_) {}
 
   KOKKOS_INLINE_FUNCTION
-  void operator() (const typename ViewType::size_type i) const {
+  void operator()(const typename ViewType::size_type i) const {
     // On CPUs this loop could be vectorized so j should do stride 1
     // access on a for optimal performance. I.e. a should be LayoutRight.
     // On GPUs threads should do coalesced loads and stores. That means
     // that i should be the stride one access for optimal performance.
     for (typename ViewType::size_type j = 0; j < a.extent(1); ++j) {
-      a(i,j) = 1.0*a.extent(0)*i + 1.0*j;
+      a(i, j) = 1.0 * a.extent(0) * i + 1.0 * j;
     }
   }
 };
@@ -86,14 +87,13 @@ struct init_view {
 // Since the functor is templated on the ViewTypes itself it doesn't matter what
 // there layouts are. That means you can use different layouts on different
 // architectures.
-template<class ViewType1, class ViewType2>
+template <class ViewType1, class ViewType2>
 struct contraction {
   view_type a;
   typename ViewType1::const_type v1;
   typename ViewType2::const_type v2;
-  contraction (view_type a_, ViewType1 v1_, ViewType2 v2_) :
-    a (a_), v1 (v1_), v2 (v2_)
-  {}
+  contraction(view_type a_, ViewType1 v1_, ViewType2 v2_)
+      : a(a_), v1(v1_), v2(v2_) {}
 
   // As with the initialization functor the performance of this operator
   // depends on the architecture and the chosen data layouts.
@@ -103,9 +103,9 @@ struct contraction {
   // the thread Index, i must be the stride 1 dimension. That means v1 should be
   // LayoutLeft and v2 LayoutRight.
   KOKKOS_INLINE_FUNCTION
-  void operator() (const view_type::size_type i) const {
+  void operator()(const view_type::size_type i) const {
     for (view_type::size_type j = 0; j < v1.extent(1); ++j) {
-      a(i) = v1(i,j)*v2(j,i);
+      a(i) = v1(i, j) * v2(j, i);
     }
   }
 };
@@ -113,61 +113,61 @@ struct contraction {
 // Compute a dot product. This is used for result verification.
 struct dot {
   view_type a;
-  dot (view_type a_) : a (a_) {}
-  typedef double value_type; //Specify type for reduction target, lsum
+  dot(view_type a_) : a(a_) {}
+  typedef double value_type;  // Specify type for reduction target, lsum
   KOKKOS_INLINE_FUNCTION
-  void operator() (const view_type::size_type i, double &lsum) const {
-    lsum += a(i)*a(i);
+  void operator()(const view_type::size_type i, double& lsum) const {
+    lsum += a(i) * a(i);
   }
 };
 
-int main (int narg, char* arg[]) {
+int main(int narg, char* arg[]) {
   // When initializing Kokkos, you may pass in command-line arguments,
   // just like with MPI_Init().  Kokkos reserves the right to remove
   // arguments from the list that start with '--kokkos-'.
-  Kokkos::initialize (narg, arg);
+  Kokkos::initialize(narg, arg);
 
   {
     int size = 10000;
-    view_type a("A",size);
+    view_type a("A", size);
 
     // Define two views with LayoutLeft and LayoutRight.
-    left_type l("L",size,10000);
-    right_type r("R",size,10000);
+    left_type l("L", size, 10000);
+    right_type r("R", size, 10000);
 
     // Initialize the data in the views.
-    Kokkos::parallel_for(size,init_view<left_type>(l));
-    Kokkos::parallel_for(size,init_view<right_type>(r));
+    Kokkos::parallel_for(size, init_view<left_type>(l));
+    Kokkos::parallel_for(size, init_view<right_type>(r));
     Kokkos::fence();
 
     // Measure time to execute the contraction kernel when giving it a
     // LayoutLeft view for v1 and a LayoutRight view for v2. This should be
     // fast on GPUs and slow on CPUs
     Kokkos::Timer time1;
-    Kokkos::parallel_for(size,contraction<left_type,right_type>(a,l,r));
+    Kokkos::parallel_for(size, contraction<left_type, right_type>(a, l, r));
     Kokkos::fence();
     double sec1 = time1.seconds();
 
     double sum1 = 0;
-    Kokkos::parallel_reduce(size,dot(a),sum1);
+    Kokkos::parallel_reduce(size, dot(a), sum1);
     Kokkos::fence();
 
     // Measure time to execute the contraction kernel when giving it a
     // LayoutRight view for v1 and a LayoutLeft view for v2. This should be
     // fast on CPUs and slow on GPUs
     Kokkos::Timer time2;
-    Kokkos::parallel_for(size,contraction<right_type,left_type>(a,r,l));
+    Kokkos::parallel_for(size, contraction<right_type, left_type>(a, r, l));
     Kokkos::fence();
     double sec2 = time2.seconds();
 
     double sum2 = 0;
-    Kokkos::parallel_reduce(size,dot(a),sum2);
+    Kokkos::parallel_reduce(size, dot(a), sum2);
 
     // Kokkos' reductions are deterministic.
     // The results should always be equal.
-    printf("Result Left/Right %f Right/Left %f (equal result: %i)\n",sec1,sec2,sum2==sum1);
+    printf("Result Left/Right %f Right/Left %f (equal result: %i)\n", sec1,
+           sec2, sum2 == sum1);
   }
 
   Kokkos::finalize();
 }
-
diff --git a/lib/kokkos/example/tutorial/Advanced_Views/02_memory_traits/CMakeLists.txt b/lib/kokkos/example/tutorial/Advanced_Views/02_memory_traits/CMakeLists.txt
index 1963e544d7..0e50968b4b 100644
--- a/lib/kokkos/example/tutorial/Advanced_Views/02_memory_traits/CMakeLists.txt
+++ b/lib/kokkos/example/tutorial/Advanced_Views/02_memory_traits/CMakeLists.txt
@@ -3,8 +3,7 @@ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR})
 INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR})
 
 # This is a tutorial, not a test, so we don't ask CTest to run it.
-TRIBITS_ADD_EXECUTABLE(
+KOKKOS_ADD_EXECUTABLE(
   tutorial_advancedviews_02_memory_traits
   SOURCES memory_traits.cpp
-  COMM serial mpi
-  )
+)
diff --git a/lib/kokkos/example/tutorial/Advanced_Views/02_memory_traits/memory_traits.cpp b/lib/kokkos/example/tutorial/Advanced_Views/02_memory_traits/memory_traits.cpp
index 84ddac4bae..da6478a02e 100644
--- a/lib/kokkos/example/tutorial/Advanced_Views/02_memory_traits/memory_traits.cpp
+++ b/lib/kokkos/example/tutorial/Advanced_Views/02_memory_traits/memory_traits.cpp
@@ -1,13 +1,14 @@
 /*
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -36,7 +37,7 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 */
@@ -62,82 +63,85 @@ typedef Kokkos::View<double*> view_type;
 // cache.  This only works if the View is read-only, which we enforce
 // through the first template parameter.
 //
-// Note that we are still talking about views of the data, its not a new allocation.
-// For example you can have an atomic view of a default view. While you even
-// could use both in the same kernel, this could lead to undefined behaviour because
-// one of your access paths is not atomic. Think of it in the same way as you think of
-// pointers to const data and pointers to non-const data (i.e. const double* and double*).
-// While these pointers can point to the same data you should not use them together if that
-// brakes the const guarantee of the first pointer.
-typedef Kokkos::View<const double*, Kokkos::MemoryTraits<Kokkos::RandomAccess> > view_type_rnd;
+// Note that we are still talking about views of the data, its not a new
+// allocation. For example you can have an atomic view of a default view. While
+// you even could use both in the same kernel, this could lead to undefined
+// behaviour because one of your access paths is not atomic. Think of it in the
+// same way as you think of pointers to const data and pointers to non-const
+// data (i.e. const double* and double*). While these pointers can point to the
+// same data you should not use them together if that brakes the const guarantee
+// of the first pointer.
+typedef Kokkos::View<const double*, Kokkos::MemoryTraits<Kokkos::RandomAccess> >
+    view_type_rnd;
 typedef Kokkos::View<int**> idx_type;
 typedef idx_type::HostMirror idx_type_host;
 
-// We template this functor on the ViewTypes to show the effect of the RandomAccess trait.
-template<class DestType, class SrcType>
+// We template this functor on the ViewTypes to show the effect of the
+// RandomAccess trait.
+template <class DestType, class SrcType>
 struct localsum {
   idx_type::const_type idx;
   DestType dest;
   SrcType src;
-  localsum (idx_type idx_, DestType dest_, SrcType src_) :
-    idx (idx_), dest (dest_), src (src_)
-  {}
+  localsum(idx_type idx_, DestType dest_, SrcType src_)
+      : idx(idx_), dest(dest_), src(src_) {}
 
   // Calculate a local sum of values
   KOKKOS_INLINE_FUNCTION
-  void operator() (const int i) const {
+  void operator()(const int i) const {
     double tmp = 0.0;
-    for (int j = 0; j < (int) idx.extent(1); ++j) {
+    for (int j = 0; j < (int)idx.extent(1); ++j) {
       // This is an indirect access on src
-      const double val = src(idx(i,j));
-      tmp += val*val + 0.5*(idx.extent(0)*val -idx.extent(1)*val);
+      const double val = src(idx(i, j));
+      tmp += val * val + 0.5 * (idx.extent(0) * val - idx.extent(1) * val);
     }
     dest(i) = tmp;
   }
 };
 
 int main(int narg, char* arg[]) {
-  Kokkos::initialize (narg, arg);
+  Kokkos::initialize(narg, arg);
 
   {
     int size = 1000000;
 
-    idx_type idx("Idx",size,64);
-    idx_type_host h_idx = Kokkos::create_mirror_view (idx);
+    idx_type idx("Idx", size, 64);
+    idx_type_host h_idx = Kokkos::create_mirror_view(idx);
 
-    view_type dest ("Dest", size);
-    view_type src ("Src", size);
+    view_type dest("Dest", size);
+    view_type src("Src", size);
 
     srand(134231);
 
     for (int i = 0; i < size; i++) {
       for (view_type::size_type j = 0; j < h_idx.extent(1); ++j) {
-        h_idx(i,j) = (size + i + (rand () % 500 - 250)) % size;
+        h_idx(i, j) = (size + i + (rand() % 500 - 250)) % size;
       }
     }
 
     // Deep copy the initial data to the device
-    Kokkos::deep_copy(idx,h_idx);
+    Kokkos::deep_copy(idx, h_idx);
     // Run the first kernel to warmup caches
-    Kokkos::parallel_for(size,localsum<view_type,view_type_rnd>(idx,dest,src));
+    Kokkos::parallel_for(size,
+                         localsum<view_type, view_type_rnd>(idx, dest, src));
     Kokkos::fence();
 
-    // Run the localsum functor using the RandomAccess trait. On CPUs there should
-    // not be any different in performance to not using the RandomAccess trait.
-    // On GPUs where can be a dramatic difference
+    // Run the localsum functor using the RandomAccess trait. On CPUs there
+    // should not be any different in performance to not using the RandomAccess
+    // trait. On GPUs where can be a dramatic difference
     Kokkos::Timer time1;
-    Kokkos::parallel_for(size,localsum<view_type,view_type_rnd>(idx,dest,src));
+    Kokkos::parallel_for(size,
+                         localsum<view_type, view_type_rnd>(idx, dest, src));
     Kokkos::fence();
     double sec1 = time1.seconds();
 
     Kokkos::Timer time2;
-    Kokkos::parallel_for(size,localsum<view_type,view_type>(idx,dest,src));
+    Kokkos::parallel_for(size, localsum<view_type, view_type>(idx, dest, src));
     Kokkos::fence();
     double sec2 = time2.seconds();
 
-    printf("Time with Trait RandomAccess: %f with Plain: %f \n",sec1,sec2);
+    printf("Time with Trait RandomAccess: %f with Plain: %f \n", sec1, sec2);
   }
 
   Kokkos::finalize();
 }
-
diff --git a/lib/kokkos/example/tutorial/Advanced_Views/03_subviews/CMakeLists.txt b/lib/kokkos/example/tutorial/Advanced_Views/03_subviews/CMakeLists.txt
index cbe394c78b..90270740c3 100644
--- a/lib/kokkos/example/tutorial/Advanced_Views/03_subviews/CMakeLists.txt
+++ b/lib/kokkos/example/tutorial/Advanced_Views/03_subviews/CMakeLists.txt
@@ -3,8 +3,7 @@ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR})
 INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR})
 
 # This is a tutorial, not a test, so we don't ask CTest to run it.
-TRIBITS_ADD_EXECUTABLE(
+KOKKOS_ADD_EXECUTABLE(
   tutorial_advancedviews_03_subviews
   SOURCES subviews.cpp
-  COMM serial mpi
-  )
+)
diff --git a/lib/kokkos/example/tutorial/Advanced_Views/03_subviews/subviews.cpp b/lib/kokkos/example/tutorial/Advanced_Views/03_subviews/subviews.cpp
index d2472a1910..df6a09f828 100644
--- a/lib/kokkos/example/tutorial/Advanced_Views/03_subviews/subviews.cpp
+++ b/lib/kokkos/example/tutorial/Advanced_Views/03_subviews/subviews.cpp
@@ -1,13 +1,14 @@
 /*
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -36,7 +37,7 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 */
@@ -70,19 +71,17 @@ typedef Kokkos::View<double***, Kokkos::LayoutStride> inner_mesh_type;
 // Functor to set all entries of a boundary of the mesh to a constant
 // value.  The functor is templated on ViewType because different
 // boundaries may have different layouts.
-template<class ViewType>
+template <class ViewType>
 struct set_boundary {
   ViewType a;
   double value;
 
-  set_boundary (ViewType a_, double value_) :
-    a (a_), value (value_)
-  {}
+  set_boundary(ViewType a_, double value_) : a(a_), value(value_) {}
 
   KOKKOS_INLINE_FUNCTION
-  void operator() (const typename ViewType::size_type i) const {
+  void operator()(const typename ViewType::size_type i) const {
     for (typename ViewType::size_type j = 0; j < a.extent(1); ++j) {
-      a(i,j) = value;
+      a(i, j) = value;
     }
   }
 };
@@ -90,21 +89,19 @@ struct set_boundary {
 // Functor to set all entries of a boundary of the mesh to a constant
 // value.  The functor is templated on ViewType because different
 // boundaries may have different layouts.
-template<class ViewType>
+template <class ViewType>
 struct set_inner {
   ViewType a;
   double value;
 
-  set_inner (ViewType a_, double value_) :
-    a (a_), value (value_)
-  {}
+  set_inner(ViewType a_, double value_) : a(a_), value(value_) {}
 
   KOKKOS_INLINE_FUNCTION
-  void operator () (const typename ViewType::size_type i) const {
+  void operator()(const typename ViewType::size_type i) const {
     typedef typename ViewType::size_type size_type;
     for (size_type j = 0; j < a.extent(1); ++j) {
       for (size_type k = 0; k < a.extent(2); ++k) {
-        a(i,j,k) = value;
+        a(i, j, k) = value;
       }
     }
   }
@@ -112,38 +109,34 @@ struct set_inner {
 
 // Update the interior of the mesh.  This simulates one timestep of a
 // finite-difference method.
-template<class ViewType>
+template <class ViewType>
 struct update {
   ViewType a;
   const double dt;
 
-  update (ViewType a_, const double dt_) :
-    a (a_), dt (dt_)
-  {}
+  update(ViewType a_, const double dt_) : a(a_), dt(dt_) {}
 
   KOKKOS_INLINE_FUNCTION
-  void operator() (typename ViewType::size_type i) const {
+  void operator()(typename ViewType::size_type i) const {
     typedef typename ViewType::size_type size_type;
     i++;
-    for (size_type j = 1; j < a.extent(1)-1; j++) {
-      for (size_type k = 1; k < a.extent(2)-1; k++) {
-        a(i,j,k) += dt* (a(i,j,k+1) - a(i,j,k-1) +
-                         a(i,j+1,k) - a(i,j-1,k) +
-                         a(i+1,j,k) - a(i-1,j,k));
+    for (size_type j = 1; j < a.extent(1) - 1; j++) {
+      for (size_type k = 1; k < a.extent(2) - 1; k++) {
+        a(i, j, k) += dt * (a(i, j, k + 1) - a(i, j, k - 1) + a(i, j + 1, k) -
+                            a(i, j - 1, k) + a(i + 1, j, k) - a(i - 1, j, k));
       }
     }
   }
 };
 
-
-int main (int narg, char* arg[]) {
+int main(int narg, char* arg[]) {
   using Kokkos::ALL;
   using Kokkos::pair;
   using Kokkos::parallel_for;
   using Kokkos::subview;
   typedef mesh_type::size_type size_type;
 
-  Kokkos::initialize (narg, arg);
+  Kokkos::initialize(narg, arg);
 
   {
     // The number of mesh points along each dimension of the mesh, not
@@ -151,43 +144,48 @@ int main (int narg, char* arg[]) {
     const size_type size = 100;
 
     // A is the full cubic 3-D mesh, including the boundaries.
-    mesh_type A ("A", size+2, size+2, size+2);
+    mesh_type A("A", size + 2, size + 2, size + 2);
     // Ai is the "inner" part of A, _not_ including the boundaries.
     //
     // A pair of indices in a particular dimension means the contiguous
     // zero-based index range in that dimension, including the first
     // entry of the pair but _not_ including the second entry.
-    inner_mesh_type Ai = subview(A, pair<size_type, size_type> (1, size+1),
-                                    pair<size_type, size_type> (1, size+1),
-                                    pair<size_type, size_type> (1, size+1));
+    inner_mesh_type Ai = subview(A, pair<size_type, size_type>(1, size + 1),
+                                 pair<size_type, size_type>(1, size + 1),
+                                 pair<size_type, size_type>(1, size + 1));
     // A has six boundaries, one for each face of the cube.
     // Create a View of each of these boundaries.
     // ALL() means "select all indices in that dimension."
-    xy_plane_type Zneg_halo = subview(A, ALL (), ALL (), 0);
-    xy_plane_type Zpos_halo = subview(A, ALL (), ALL (), 101);
-    xz_plane_type Yneg_halo = subview(A, ALL (), 0, ALL ());
-    xz_plane_type Ypos_halo = subview(A, ALL (), 101, ALL ());
-    yz_plane_type Xneg_halo = subview(A, 0, ALL (), ALL ());
-    yz_plane_type Xpos_halo = subview(A, 101, ALL (), ALL ());
+    xy_plane_type Zneg_halo = subview(A, ALL(), ALL(), 0);
+    xy_plane_type Zpos_halo = subview(A, ALL(), ALL(), 101);
+    xz_plane_type Yneg_halo = subview(A, ALL(), 0, ALL());
+    xz_plane_type Ypos_halo = subview(A, ALL(), 101, ALL());
+    yz_plane_type Xneg_halo = subview(A, 0, ALL(), ALL());
+    yz_plane_type Xpos_halo = subview(A, 101, ALL(), ALL());
 
     // Set the boundaries to their initial conditions.
-    parallel_for (Zneg_halo.extent(0), set_boundary<xy_plane_type> (Zneg_halo,  1));
-    parallel_for (Zpos_halo.extent(0), set_boundary<xy_plane_type> (Zpos_halo, -1));
-    parallel_for (Yneg_halo.extent(0), set_boundary<xz_plane_type> (Yneg_halo,  2));
-    parallel_for (Ypos_halo.extent(0), set_boundary<xz_plane_type> (Ypos_halo, -2));
-    parallel_for (Xneg_halo.extent(0), set_boundary<yz_plane_type> (Xneg_halo,  3));
-    parallel_for (Xpos_halo.extent(0), set_boundary<yz_plane_type> (Xpos_halo, -3));
+    parallel_for(Zneg_halo.extent(0),
+                 set_boundary<xy_plane_type>(Zneg_halo, 1));
+    parallel_for(Zpos_halo.extent(0),
+                 set_boundary<xy_plane_type>(Zpos_halo, -1));
+    parallel_for(Yneg_halo.extent(0),
+                 set_boundary<xz_plane_type>(Yneg_halo, 2));
+    parallel_for(Ypos_halo.extent(0),
+                 set_boundary<xz_plane_type>(Ypos_halo, -2));
+    parallel_for(Xneg_halo.extent(0),
+                 set_boundary<yz_plane_type>(Xneg_halo, 3));
+    parallel_for(Xpos_halo.extent(0),
+                 set_boundary<yz_plane_type>(Xpos_halo, -3));
 
     // Set the interior of the mesh to its initial condition.
-    parallel_for (Ai.extent(0), set_inner<inner_mesh_type> (Ai, 0));
+    parallel_for(Ai.extent(0), set_inner<inner_mesh_type>(Ai, 0));
 
     // Update the interior of the mesh.
     // This simulates one timestep with dt = 0.1.
-    parallel_for (Ai.extent(0), update<mesh_type> (A, 0.1));
+    parallel_for(Ai.extent(0), update<mesh_type>(A, 0.1));
 
     Kokkos::fence();
-    printf ("Done\n");
+    printf("Done\n");
   }
-  Kokkos::finalize ();
+  Kokkos::finalize();
 }
-
diff --git a/lib/kokkos/example/tutorial/Advanced_Views/04_dualviews/CMakeLists.txt b/lib/kokkos/example/tutorial/Advanced_Views/04_dualviews/CMakeLists.txt
index 300dab128e..4f9b9225d2 100644
--- a/lib/kokkos/example/tutorial/Advanced_Views/04_dualviews/CMakeLists.txt
+++ b/lib/kokkos/example/tutorial/Advanced_Views/04_dualviews/CMakeLists.txt
@@ -3,8 +3,7 @@ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR})
 INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR})
 
 # This is a tutorial, not a test, so we don't ask CTest to run it.
-TRIBITS_ADD_EXECUTABLE(
+KOKKOS_ADD_EXECUTABLE(
   tutorial_advancedviews_04_dualviews
   SOURCES dual_view.cpp
-  COMM serial mpi
-  )
+)
diff --git a/lib/kokkos/example/tutorial/Advanced_Views/04_dualviews/dual_view.cpp b/lib/kokkos/example/tutorial/Advanced_Views/04_dualviews/dual_view.cpp
index e0fa559587..86fe016203 100644
--- a/lib/kokkos/example/tutorial/Advanced_Views/04_dualviews/dual_view.cpp
+++ b/lib/kokkos/example/tutorial/Advanced_Views/04_dualviews/dual_view.cpp
@@ -1,13 +1,14 @@
 /*
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -36,7 +37,7 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 */
@@ -68,16 +69,16 @@
 typedef Kokkos::DualView<double*> view_type;
 typedef Kokkos::DualView<int**> idx_type;
 
-
-template<class ExecutionSpace>
+template <class ExecutionSpace>
 struct localsum {
   // If the functor has a public 'execution_space' typedef, that defines
   // the functor's execution space (where it runs in parallel).  This
   // overrides Kokkos' default execution space.
   typedef ExecutionSpace execution_space;
 
-  typedef typename Kokkos::Impl::if_c<std::is_same<ExecutionSpace,Kokkos::DefaultExecutionSpace>::value ,
-     idx_type::memory_space, idx_type::host_mirror_space>::type memory_space;
+  typedef typename Kokkos::Impl::if_c<
+      std::is_same<ExecutionSpace, Kokkos::DefaultExecutionSpace>::value,
+      idx_type::memory_space, idx_type::host_mirror_space>::type memory_space;
 
   // Get the view types on the particular device for which the functor
   // is instantiated.
@@ -86,25 +87,28 @@ struct localsum {
   // the const version of the first template parameter of the View.
   // For example, the const_data_type version of double** is const
   // double**.
-  Kokkos::View<idx_type::const_data_type, idx_type::array_layout, memory_space> idx;
+  Kokkos::View<idx_type::const_data_type, idx_type::array_layout, memory_space>
+      idx;
   // "scalar_array_type" is a typedef in ViewTraits (and DualView) which is the
   // array version of the value(s) stored in the View.
-  Kokkos::View<view_type::scalar_array_type, view_type::array_layout, memory_space> dest;
+  Kokkos::View<view_type::scalar_array_type, view_type::array_layout,
+               memory_space>
+      dest;
   Kokkos::View<view_type::const_data_type, view_type::array_layout,
-               memory_space, Kokkos::MemoryRandomAccess> src;
+               memory_space, Kokkos::MemoryRandomAccess>
+      src;
 
   // Constructor takes DualViews, synchronizes them to the device,
   // then marks them as modified on the device.
-  localsum (idx_type dv_idx, view_type dv_dest, view_type dv_src)
-  {
+  localsum(idx_type dv_idx, view_type dv_dest, view_type dv_src) {
     // Extract the view on the correct Device (i.e., the correct
     // memory space) from the DualView.  DualView has a template
     // method, view(), which is templated on the memory space.  If the
     // DualView has a View from that memory space, view() returns the
     // View in that space.
-    idx = dv_idx.view<memory_space> ();
-    dest = dv_dest.template view<memory_space> ();
-    src = dv_src.template view<memory_space> ();
+    idx  = dv_idx.view<memory_space>();
+    dest = dv_dest.template view<memory_space>();
+    src  = dv_src.template view<memory_space>();
 
     // Synchronize the DualView to the correct Device.
     //
@@ -116,103 +120,106 @@ struct localsum {
     // determines this by the user manually marking one side or the
     // other as modified; see the modify() call below.
 
-    dv_idx.sync<memory_space> ();
-    dv_dest.template sync<memory_space> ();
-    dv_src.template sync<memory_space> ();
+    dv_idx.sync<memory_space>();
+    dv_dest.template sync<memory_space>();
+    dv_src.template sync<memory_space>();
 
     // Mark dest as modified on Device.
-    dv_dest.template modify<memory_space> ();
+    dv_dest.template modify<memory_space>();
   }
 
   KOKKOS_INLINE_FUNCTION
-  void operator() (const int i) const {
+  void operator()(const int i) const {
     double tmp = 0.0;
-    for (int j = 0; j < (int) idx.extent(1); ++j) {
-      const double val = src(idx(i,j));
-      tmp += val*val + 0.5*(idx.extent(0)*val -idx.extent(1)*val);
+    for (int j = 0; j < (int)idx.extent(1); ++j) {
+      const double val = src(idx(i, j));
+      tmp += val * val + 0.5 * (idx.extent(0) * val - idx.extent(1) * val);
     }
     dest(i) += tmp;
   }
 };
 
 class ParticleType {
-  public:
-    double q;
-    double m;
-    double q_over_m;
-    KOKKOS_INLINE_FUNCTION
-    ParticleType(double q_ = -1, double m_ = 1):
-     q(q_), m(m_), q_over_m(q/m) {}
-protected:
+ public:
+  double q;
+  double m;
+  double q_over_m;
+  KOKKOS_INLINE_FUNCTION
+  ParticleType(double q_ = -1, double m_ = 1) : q(q_), m(m_), q_over_m(q / m) {}
+
+ protected:
 };
 
-  typedef Kokkos::DualView<ParticleType[10]> ParticleTypes;
-int main (int narg, char* arg[]) {
-  Kokkos::initialize (narg, arg);
+typedef Kokkos::DualView<ParticleType[10]> ParticleTypes;
+int main(int narg, char* arg[]) {
+  Kokkos::initialize(narg, arg);
 
-// If View is non-trivial constructible type then add braces so it is out of scope
-// before Kokkos::finalize() call
-{
-  ParticleTypes test("Test");
-  Kokkos::fence();
-  test.h_view(0) = ParticleType(-1e4,1);
-  Kokkos::fence();
+  // If View is non-trivial constructible type then add braces so it is out of
+  // scope before Kokkos::finalize() call
+  {
+    ParticleTypes test("Test");
+    Kokkos::fence();
+    test.h_view(0) = ParticleType(-1e4, 1);
+    Kokkos::fence();
 
-  int size = 1000000;
+    int size = 1000000;
 
-  // Create DualViews. This will allocate on both the device and its
-  // host_mirror_device.
-  idx_type idx ("Idx",size,64);
-  view_type dest ("Dest",size);
-  view_type src ("Src",size);
+    // Create DualViews. This will allocate on both the device and its
+    // host_mirror_device.
+    idx_type idx("Idx", size, 64);
+    view_type dest("Dest", size);
+    view_type src("Src", size);
 
+    srand(134231);
 
-  srand (134231);
-
-  // Get a reference to the host view of idx directly (equivalent to
-  // idx.view<idx_type::host_mirror_space>() )
-  idx_type::t_host h_idx = idx.h_view;
-  for (int i = 0; i < size; ++i) {
-    for (view_type::size_type j = 0; j < h_idx.extent(1); ++j) {
-      h_idx(i,j) = (size + i + (rand () % 500 - 250)) % size;
+    // Get a reference to the host view of idx directly (equivalent to
+    // idx.view<idx_type::host_mirror_space>() )
+    idx_type::t_host h_idx = idx.h_view;
+    for (int i = 0; i < size; ++i) {
+      for (view_type::size_type j = 0; j < h_idx.extent(1); ++j) {
+        h_idx(i, j) = (size + i + (rand() % 500 - 250)) % size;
+      }
     }
+
+    // Mark idx as modified on the host_mirror_space so that a
+    // sync to the device will actually move data.  The sync happens in
+    // the functor's constructor.
+    idx.modify<idx_type::host_mirror_space>();
+
+    // Run on the device.  This will cause a sync of idx to the device,
+    // since it was marked as modified on the host.
+    Kokkos::Timer timer;
+    Kokkos::parallel_for(size,
+                         localsum<view_type::execution_space>(idx, dest, src));
+    Kokkos::fence();
+    double sec1_dev = timer.seconds();
+
+    timer.reset();
+    Kokkos::parallel_for(size,
+                         localsum<view_type::execution_space>(idx, dest, src));
+    Kokkos::fence();
+    double sec2_dev = timer.seconds();
+
+    // Run on the host's default execution space (could be the same as device).
+    // This will cause a sync back to the host of dest.  Note that if the Device
+    // is CUDA, the data layout will not be optimal on host, so performance is
+    // lower than what it would be for a pure host compilation.
+    timer.reset();
+    Kokkos::parallel_for(
+        size, localsum<Kokkos::HostSpace::execution_space>(idx, dest, src));
+    Kokkos::fence();
+    double sec1_host = timer.seconds();
+
+    timer.reset();
+    Kokkos::parallel_for(
+        size, localsum<Kokkos::HostSpace::execution_space>(idx, dest, src));
+    Kokkos::fence();
+    double sec2_host = timer.seconds();
+
+    printf("Device Time with Sync: %f without Sync: %f \n", sec1_dev, sec2_dev);
+    printf("Host   Time with Sync: %f without Sync: %f \n", sec1_host,
+           sec2_host);
   }
 
-  // Mark idx as modified on the host_mirror_space so that a
-  // sync to the device will actually move data.  The sync happens in
-  // the functor's constructor.
-  idx.modify<idx_type::host_mirror_space> ();
-
-  // Run on the device.  This will cause a sync of idx to the device,
-  // since it was marked as modified on the host.
-  Kokkos::Timer timer;
-  Kokkos::parallel_for(size,localsum<view_type::execution_space>(idx,dest,src));
-  Kokkos::fence();
-  double sec1_dev = timer.seconds();
-
-  timer.reset();
-  Kokkos::parallel_for(size,localsum<view_type::execution_space>(idx,dest,src));
-  Kokkos::fence();
-  double sec2_dev = timer.seconds();
-
-  // Run on the host's default execution space (could be the same as device).
-  // This will cause a sync back to the host of dest.  Note that if the Device is CUDA,
-  // the data layout will not be optimal on host, so performance is
-  // lower than what it would be for a pure host compilation.
-  timer.reset();
-  Kokkos::parallel_for(size,localsum<Kokkos::HostSpace::execution_space>(idx,dest,src));
-  Kokkos::fence();
-  double sec1_host = timer.seconds();
-
-  timer.reset();
-  Kokkos::parallel_for(size,localsum<Kokkos::HostSpace::execution_space>(idx,dest,src));
-  Kokkos::fence();
-  double sec2_host = timer.seconds();
-
-  printf("Device Time with Sync: %f without Sync: %f \n",sec1_dev,sec2_dev);
-  printf("Host   Time with Sync: %f without Sync: %f \n",sec1_host,sec2_host);
-}
-
   Kokkos::finalize();
 }
-
diff --git a/lib/kokkos/example/tutorial/Advanced_Views/05_NVIDIA_UVM/CMakeLists.txt b/lib/kokkos/example/tutorial/Advanced_Views/05_NVIDIA_UVM/CMakeLists.txt
index f0ed569f9f..9e9af9872c 100644
--- a/lib/kokkos/example/tutorial/Advanced_Views/05_NVIDIA_UVM/CMakeLists.txt
+++ b/lib/kokkos/example/tutorial/Advanced_Views/05_NVIDIA_UVM/CMakeLists.txt
@@ -2,12 +2,10 @@
 INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR})
 INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR})
 
-IF (Kokkos_ENABLE_Cuda_UVM)
-  # This is a tutorial, not a test, so we don't ask CTest to run it.
-  TRIBITS_ADD_EXECUTABLE(
-    tutorial_advancedviews_05_nvidia_uvm
-    SOURCES uvm_example.cpp
-    COMM serial mpi
-    DEPLIBS kokkoscontainers kokkoscore
-    )
+IF (Kokkos_ENABLE_CUDA_UVM)
+# This is a tutorial, not a test, so we don't ask CTest to run it.
+KOKKOS_ADD_EXECUTABLE(
+  tutorial_advancedviews_05_nvidia_uvm
+  SOURCES uvm_example.cpp
+)
 ENDIF ()
diff --git a/lib/kokkos/example/tutorial/Advanced_Views/05_NVIDIA_UVM/uvm_example.cpp b/lib/kokkos/example/tutorial/Advanced_Views/05_NVIDIA_UVM/uvm_example.cpp
index d83077630c..51b84cf184 100644
--- a/lib/kokkos/example/tutorial/Advanced_Views/05_NVIDIA_UVM/uvm_example.cpp
+++ b/lib/kokkos/example/tutorial/Advanced_Views/05_NVIDIA_UVM/uvm_example.cpp
@@ -1,13 +1,14 @@
 /*
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -36,7 +37,7 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 */
@@ -51,92 +52,98 @@
 typedef Kokkos::View<double*, Kokkos::CudaUVMSpace> view_type;
 typedef Kokkos::View<int**, Kokkos::CudaUVMSpace> idx_type;
 #else
-typedef Kokkos::View<double*,Kokkos::HostSpace> view_type;
-typedef Kokkos::View<int**,Kokkos::HostSpace> idx_type;
+typedef Kokkos::View<double*, Kokkos::HostSpace> view_type;
+typedef Kokkos::View<int**, Kokkos::HostSpace> idx_type;
 #endif
 
-template<class Device>
+template <class Device>
 struct localsum {
-  // Define the execution space for the functor (overrides the DefaultExecutionSpace)
+  // Define the execution space for the functor (overrides the
+  // DefaultExecutionSpace)
   typedef Device execution_space;
 
   // Get the view types on the particular device the functor is instantiated for
   idx_type::const_type idx;
   view_type dest;
-  Kokkos::View<view_type::const_data_type, view_type::array_layout, view_type::device_type, Kokkos::MemoryRandomAccess > src;
+  Kokkos::View<view_type::const_data_type, view_type::array_layout,
+               view_type::device_type, Kokkos::MemoryRandomAccess>
+      src;
 
-  localsum(idx_type idx_, view_type dest_,
-      view_type src_):idx(idx_),dest(dest_),src(src_) {
-  }
+  localsum(idx_type idx_, view_type dest_, view_type src_)
+      : idx(idx_), dest(dest_), src(src_) {}
 
   KOKKOS_INLINE_FUNCTION
-  void operator() (int i) const {
+  void operator()(int i) const {
     double tmp = 0.0;
-    for(int j = 0; j < int(idx.extent(1)); j++) {
-      const double val = src(idx(i,j));
-      tmp += val*val + 0.5*(idx.extent(0)*val -idx.extent(1)*val);
+    for (int j = 0; j < int(idx.extent(1)); j++) {
+      const double val = src(idx(i, j));
+      tmp += val * val + 0.5 * (idx.extent(0) * val - idx.extent(1) * val);
     }
     dest(i) += tmp;
   }
 };
 
 int main(int narg, char* arg[]) {
-  Kokkos::initialize(narg,arg);
+  Kokkos::initialize(narg, arg);
 
   {
     int size = 1000000;
 
     // Create Views
-    idx_type idx("Idx",size,64);
-    view_type dest("Dest",size);
-    view_type src("Src",size);
+    idx_type idx("Idx", size, 64);
+    view_type dest("Dest", size);
+    view_type src("Src", size);
 
     srand(134231);
 
     Kokkos::fence();
 
     // When using UVM Cuda views can be accessed on the Host directly
-    for(int i=0; i<size; i++) {
-      for(int j=0; j<int(idx.extent(1)); j++)
-        idx(i,j) = (size + i + (rand()%500 - 250))%size;
+    for (int i = 0; i < size; i++) {
+      for (int j = 0; j < int(idx.extent(1)); j++)
+        idx(i, j) = (size + i + (rand() % 500 - 250)) % size;
     }
 
     Kokkos::fence();
     // Run on the device
-    // This will cause a sync of idx to the device since it was modified on the host
+    // This will cause a sync of idx to the device since it was modified on the
+    // host
     Kokkos::Timer timer;
-    Kokkos::parallel_for(size,localsum<view_type::execution_space>(idx,dest,src));
+    Kokkos::parallel_for(size,
+                         localsum<view_type::execution_space>(idx, dest, src));
     Kokkos::fence();
     double sec1_dev = timer.seconds();
 
     // No data transfer will happen now, since nothing is accessed on the host
     timer.reset();
-    Kokkos::parallel_for(size,localsum<view_type::execution_space>(idx,dest,src));
+    Kokkos::parallel_for(size,
+                         localsum<view_type::execution_space>(idx, dest, src));
     Kokkos::fence();
     double sec2_dev = timer.seconds();
 
     // Run on the host
-    // This will cause a sync back to the host of dest which was changed on the device
-    // Compare runtime here with the dual_view example: dest will be copied back in 4k blocks
-    // when they are accessed the first time during the parallel_for. Due to the latency of a memcpy
-    // this gives lower effective bandwidth when doing a manual copy via dual views
+    // This will cause a sync back to the host of dest which was changed on the
+    // device Compare runtime here with the dual_view example: dest will be
+    // copied back in 4k blocks when they are accessed the first time during the
+    // parallel_for. Due to the latency of a memcpy this gives lower effective
+    // bandwidth when doing a manual copy via dual views
     timer.reset();
-    Kokkos::parallel_for(size,localsum<Kokkos::HostSpace::execution_space>(idx,dest,src));
+    Kokkos::parallel_for(
+        size, localsum<Kokkos::HostSpace::execution_space>(idx, dest, src));
     Kokkos::fence();
     double sec1_host = timer.seconds();
 
     // No data transfers will happen now
     timer.reset();
-    Kokkos::parallel_for(size,localsum<Kokkos::HostSpace::execution_space>(idx,dest,src));
+    Kokkos::parallel_for(
+        size, localsum<Kokkos::HostSpace::execution_space>(idx, dest, src));
     Kokkos::fence();
     double sec2_host = timer.seconds();
 
-
-
-    printf("Device Time with Sync: %e without Sync: %e \n",sec1_dev,sec2_dev);
-    printf("Host   Time with Sync: %e without Sync: %e \n",sec1_host,sec2_host);
+    printf("Device Time with Sync: %e without Sync: %e \n", sec1_dev, sec2_dev);
+    printf("Host   Time with Sync: %e without Sync: %e \n", sec1_host,
+           sec2_host);
   }
 
   Kokkos::finalize();
 }
-
diff --git a/lib/kokkos/example/tutorial/Advanced_Views/07_Overlapping_DeepCopy/overlapping_deepcopy.cpp b/lib/kokkos/example/tutorial/Advanced_Views/07_Overlapping_DeepCopy/overlapping_deepcopy.cpp
index e115dcbabd..4dac1c26e0 100644
--- a/lib/kokkos/example/tutorial/Advanced_Views/07_Overlapping_DeepCopy/overlapping_deepcopy.cpp
+++ b/lib/kokkos/example/tutorial/Advanced_Views/07_Overlapping_DeepCopy/overlapping_deepcopy.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -49,100 +50,100 @@
 
 struct FillDevice {
   double value;
-  Kokkos::View<double*,Kokkos::LayoutLeft,Kokkos::CudaSpace> a;
-  FillDevice(const double& val, const Kokkos::View<double*,Kokkos::LayoutLeft,Kokkos::CudaSpace>& d_a):
-     value(val),a(d_a){}
+  Kokkos::View<double*, Kokkos::LayoutLeft, Kokkos::CudaSpace> a;
+  FillDevice(
+      const double& val,
+      const Kokkos::View<double*, Kokkos::LayoutLeft, Kokkos::CudaSpace>& d_a)
+      : value(val), a(d_a) {}
 
   KOKKOS_INLINE_FUNCTION
-  void operator() (const int& i) const {
-    a(i) = value;
-  }
+  void operator()(const int& i) const { a(i) = value; }
 };
 
 struct ComputeADevice {
   int iter;
-  Kokkos::View<double*,Kokkos::LayoutLeft,Kokkos::CudaSpace> a;
-  Kokkos::View<double*,Kokkos::LayoutLeft,Kokkos::CudaSpace> b;
-  ComputeADevice(const int& iter_,
-                 const Kokkos::View<double*,Kokkos::LayoutLeft,Kokkos::CudaSpace>& d_a,
-                 const Kokkos::View<double*,Kokkos::LayoutLeft,Kokkos::CudaSpace>& d_b):
-     iter(iter_),a(d_a),b(d_b){}
+  Kokkos::View<double*, Kokkos::LayoutLeft, Kokkos::CudaSpace> a;
+  Kokkos::View<double*, Kokkos::LayoutLeft, Kokkos::CudaSpace> b;
+  ComputeADevice(
+      const int& iter_,
+      const Kokkos::View<double*, Kokkos::LayoutLeft, Kokkos::CudaSpace>& d_a,
+      const Kokkos::View<double*, Kokkos::LayoutLeft, Kokkos::CudaSpace>& d_b)
+      : iter(iter_), a(d_a), b(d_b) {}
 
   KOKKOS_INLINE_FUNCTION
-  void operator() (const int& i) const {
-    for(int j=1;j<iter;j++) {
-      a(i) += std::pow(b(i),1.0+1.0/iter);
+  void operator()(const int& i) const {
+    for (int j = 1; j < iter; j++) {
+      a(i) += std::pow(b(i), 1.0 + 1.0 / iter);
     }
   }
 };
 
 struct ComputeAHost {
-  Kokkos::View<double*,Kokkos::LayoutLeft,Kokkos::CudaHostPinnedSpace> a;
-  Kokkos::View<double*,Kokkos::LayoutLeft,Kokkos::CudaHostPinnedSpace> b;
-  ComputeAHost(  const Kokkos::View<double*,Kokkos::LayoutLeft,Kokkos::CudaHostPinnedSpace>& d_a,
-                 const Kokkos::View<double*,Kokkos::LayoutLeft,Kokkos::CudaHostPinnedSpace>& d_b):
-     a(d_a),b(d_b){}
+  Kokkos::View<double*, Kokkos::LayoutLeft, Kokkos::CudaHostPinnedSpace> a;
+  Kokkos::View<double*, Kokkos::LayoutLeft, Kokkos::CudaHostPinnedSpace> b;
+  ComputeAHost(const Kokkos::View<double*, Kokkos::LayoutLeft,
+                                  Kokkos::CudaHostPinnedSpace>& d_a,
+               const Kokkos::View<double*, Kokkos::LayoutLeft,
+                                  Kokkos::CudaHostPinnedSpace>& d_b)
+      : a(d_a), b(d_b) {}
 
   KOKKOS_INLINE_FUNCTION
-  void operator() (const int& i) const {
-    a(i) += b(i);
-  }
+  void operator()(const int& i) const { a(i) += b(i); }
 };
 
 struct MergeDevice {
-  Kokkos::View<double*,Kokkos::LayoutLeft,Kokkos::CudaSpace> a;
-  Kokkos::View<double*,Kokkos::LayoutLeft,Kokkos::CudaSpace> b;
+  Kokkos::View<double*, Kokkos::LayoutLeft, Kokkos::CudaSpace> a;
+  Kokkos::View<double*, Kokkos::LayoutLeft, Kokkos::CudaSpace> b;
   MergeDevice(
-                 const Kokkos::View<double*,Kokkos::LayoutLeft,Kokkos::CudaSpace>& d_a,
-                 const Kokkos::View<double*,Kokkos::LayoutLeft,Kokkos::CudaSpace>& d_b):
-     a(d_a),b(d_b){}
+      const Kokkos::View<double*, Kokkos::LayoutLeft, Kokkos::CudaSpace>& d_a,
+      const Kokkos::View<double*, Kokkos::LayoutLeft, Kokkos::CudaSpace>& d_b)
+      : a(d_a), b(d_b) {}
 
   KOKKOS_INLINE_FUNCTION
-  void operator() (const int& i) const {
-    a(i) += b(i);
-  }
+  void operator()(const int& i) const { a(i) += b(i); }
 };
 
-int main(int argc, char * argv[]) {
+int main(int argc, char* argv[]) {
   int size = 100000000;
   Kokkos::initialize();
   int synch = atoi(argv[1]);
-  Kokkos::View<double*,Kokkos::LayoutLeft,Kokkos::CudaSpace> d_a("Device A",size);
-  Kokkos::View<double*,Kokkos::LayoutLeft,Kokkos::CudaSpace> d_b("Device B",size);
-  Kokkos::View<double*,Kokkos::LayoutLeft,Kokkos::CudaSpace> d_tmp("Device tmp",size);
-  Kokkos::View<double*,Kokkos::LayoutLeft,Kokkos::CudaHostPinnedSpace> h_a("Host A",size);
-  Kokkos::View<double*,Kokkos::LayoutLeft,Kokkos::CudaHostPinnedSpace> h_b("Host B",size);
+  Kokkos::View<double*, Kokkos::LayoutLeft, Kokkos::CudaSpace> d_a("Device A",
+                                                                   size);
+  Kokkos::View<double*, Kokkos::LayoutLeft, Kokkos::CudaSpace> d_b("Device B",
+                                                                   size);
+  Kokkos::View<double*, Kokkos::LayoutLeft, Kokkos::CudaSpace> d_tmp(
+      "Device tmp", size);
+  Kokkos::View<double*, Kokkos::LayoutLeft, Kokkos::CudaHostPinnedSpace> h_a(
+      "Host A", size);
+  Kokkos::View<double*, Kokkos::LayoutLeft, Kokkos::CudaHostPinnedSpace> h_b(
+      "Host B", size);
 
-  Kokkos::parallel_for(Kokkos::RangePolicy<Kokkos::Cuda>(0,size),FillDevice(0.0,d_a));
-  Kokkos::parallel_for(Kokkos::RangePolicy<Kokkos::Cuda>(0,size),FillDevice(1.3513,d_b));
+  Kokkos::parallel_for(Kokkos::RangePolicy<Kokkos::Cuda>(0, size),
+                       FillDevice(0.0, d_a));
+  Kokkos::parallel_for(Kokkos::RangePolicy<Kokkos::Cuda>(0, size),
+                       FillDevice(1.3513, d_b));
   Kokkos::fence();
   Kokkos::Timer timer;
-  Kokkos::parallel_for(Kokkos::RangePolicy<Kokkos::Cuda>(0,size),ComputeADevice(20,d_a,d_b));
+  Kokkos::parallel_for(Kokkos::RangePolicy<Kokkos::Cuda>(0, size),
+                       ComputeADevice(20, d_a, d_b));
 
-  if(synch==1)
-    Kokkos::deep_copy(Kokkos::OpenMP(),h_b,d_b);
-  if(synch==2)
-    Kokkos::deep_copy(h_b,d_b);
+  if (synch == 1) Kokkos::deep_copy(Kokkos::OpenMP(), h_b, d_b);
+  if (synch == 2) Kokkos::deep_copy(h_b, d_b);
 
-
-  Kokkos::parallel_for(Kokkos::RangePolicy<Kokkos::OpenMP>(0,size),[=] (const int& i) {
-    h_a(i) = 0.0;
-  });
-  Kokkos::parallel_for(Kokkos::RangePolicy<Kokkos::OpenMP>(0,size),ComputeAHost(h_a,h_b));
+  Kokkos::parallel_for(Kokkos::RangePolicy<Kokkos::OpenMP>(0, size),
+                       [=](const int& i) { h_a(i) = 0.0; });
+  Kokkos::parallel_for(Kokkos::RangePolicy<Kokkos::OpenMP>(0, size),
+                       ComputeAHost(h_a, h_b));
   Kokkos::OpenMP().fence();
-  if(synch==1)
-    Kokkos::deep_copy(Kokkos::OpenMP(), d_tmp,h_a);
-  if(synch==2)
-    Kokkos::deep_copy(d_tmp,h_a);
+  if (synch == 1) Kokkos::deep_copy(Kokkos::OpenMP(), d_tmp, h_a);
+  if (synch == 2) Kokkos::deep_copy(d_tmp, h_a);
   Kokkos::fence();
 
   std::cout << "Time " << timer.seconds() << std::endl;
-  Kokkos::parallel_for(Kokkos::RangePolicy<Kokkos::Cuda>(0,size),MergeDevice(d_a,d_tmp));
+  Kokkos::parallel_for(Kokkos::RangePolicy<Kokkos::Cuda>(0, size),
+                       MergeDevice(d_a, d_tmp));
 
-  Kokkos::deep_copy(h_a,d_a);
+  Kokkos::deep_copy(h_a, d_a);
   std::cout << "h_a(0): " << h_a(0) << " ( Correct: 27.4154 )" << std::endl;
   Kokkos::finalize();
 }
-
-
-
diff --git a/lib/kokkos/example/tutorial/Advanced_Views/CMakeLists.txt b/lib/kokkos/example/tutorial/Advanced_Views/CMakeLists.txt
index f4f1addc55..11da617b8f 100644
--- a/lib/kokkos/example/tutorial/Advanced_Views/CMakeLists.txt
+++ b/lib/kokkos/example/tutorial/Advanced_Views/CMakeLists.txt
@@ -1,9 +1,9 @@
 
-TRIBITS_ADD_EXAMPLE_DIRECTORIES(01_data_layouts)
-TRIBITS_ADD_EXAMPLE_DIRECTORIES(02_memory_traits)
-TRIBITS_ADD_EXAMPLE_DIRECTORIES(03_subviews)
-TRIBITS_ADD_EXAMPLE_DIRECTORIES(04_dualviews)
+KOKKOS_ADD_EXAMPLE_DIRECTORIES(01_data_layouts)
+KOKKOS_ADD_EXAMPLE_DIRECTORIES(02_memory_traits)
+KOKKOS_ADD_EXAMPLE_DIRECTORIES(03_subviews)
+KOKKOS_ADD_EXAMPLE_DIRECTORIES(04_dualviews)
 
-IF (Kokkos_ENABLE_Cuda_UVM)
-  TRIBITS_ADD_EXAMPLE_DIRECTORIES(05_NVIDIA_UVM)
+IF (Kokkos_ENABLE_CUDA_UVM)
+  KOKKOS_ADD_EXAMPLE_DIRECTORIES(05_NVIDIA_UVM)
 ENDIF ()
diff --git a/lib/kokkos/example/tutorial/Algorithms/01_random_numbers/random_numbers.cpp b/lib/kokkos/example/tutorial/Algorithms/01_random_numbers/random_numbers.cpp
index 48b0d86cb8..a0771c4fca 100644
--- a/lib/kokkos/example/tutorial/Algorithms/01_random_numbers/random_numbers.cpp
+++ b/lib/kokkos/example/tutorial/Algorithms/01_random_numbers/random_numbers.cpp
@@ -1,13 +1,14 @@
 /*
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -36,7 +37,7 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 */
@@ -49,106 +50,109 @@
 
 typedef Kokkos::HostSpace::execution_space DefaultHostType;
 
-// Kokkos provides two different random number generators with a 64 bit and a 1024 bit state.
-// These generators are based on Vigna, Sebastiano (2014). "An experimental exploration of Marsaglia's xorshift generators, scrambled"
-// See: http://arxiv.org/abs/1402.6246
-// The generators can be used fully independently on each thread and have been tested to
-// produce good statistics for both inter and intra thread numbers.
-// Note that within a kernel NO random number operations are (team) collective operations.
-// Everything can be called within branches. This is a difference to the curand library where
-// certain operations are required to be called by all threads in a block.
+// Kokkos provides two different random number generators with a 64 bit and a
+// 1024 bit state. These generators are based on Vigna, Sebastiano (2014). "An
+// experimental exploration of Marsaglia's xorshift generators, scrambled" See:
+// http://arxiv.org/abs/1402.6246 The generators can be used fully independently
+// on each thread and have been tested to produce good statistics for both inter
+// and intra thread numbers. Note that within a kernel NO random number
+// operations are (team) collective operations. Everything can be called within
+// branches. This is a difference to the curand library where certain operations
+// are required to be called by all threads in a block.
 //
-// In Kokkos you are required to create a pool of generator states, so that threads can
-// grep their own. On CPU architectures the pool size is equal to the thread number,
-// on CUDA about 128k states are generated (enough to give every potentially simultaneously
-// running thread its own state). With a kernel a thread is required to aquire a state from the
-// pool and later return it.
-// On CPUs the Random number generator is deterministic if using the same number of threads.
-// On GPUs (i.e. using the CUDA backend it is not deterministic because threads aquire states via
-// atomics.
+// In Kokkos you are required to create a pool of generator states, so that
+// threads can grep their own. On CPU architectures the pool size is equal to
+// the thread number, on CUDA about 128k states are generated (enough to give
+// every potentially simultaneously running thread its own state). With a kernel
+// a thread is required to acquire a state from the pool and later return it. On
+// CPUs the Random number generator is deterministic if using the same number of
+// threads. On GPUs (i.e. using the CUDA backend it is not deterministic because
+// threads acquire states via atomics.
 
-// A Functor for generating uint64_t random numbers templated on the GeneratorPool type
-template<class GeneratorPool>
+// A Functor for generating uint64_t random numbers templated on the
+// GeneratorPool type
+template <class GeneratorPool>
 struct generate_random {
-
-
   // Output View for the random numbers
   Kokkos::View<uint64_t*> vals;
-  
+
   // The GeneratorPool
   GeneratorPool rand_pool;
-  
+
   int samples;
 
   // Initialize all members
-  generate_random(Kokkos::View<uint64_t*> vals_,
-                       GeneratorPool rand_pool_,
-                       int samples_):
-                       vals(vals_),rand_pool(rand_pool_),samples(samples_) {}
+  generate_random(Kokkos::View<uint64_t*> vals_, GeneratorPool rand_pool_,
+                  int samples_)
+      : vals(vals_), rand_pool(rand_pool_), samples(samples_) {}
 
   KOKKOS_INLINE_FUNCTION
-  void operator() (int i) const {
+  void operator()(int i) const {
     // Get a random number state from the pool for the active thread
     typename GeneratorPool::generator_type rand_gen = rand_pool.get_state();
 
-    // Draw samples numbers from the pool as urand64 between 0 and rand_pool.MAX_URAND64
-    // Note there are function calls to get other type of scalars, and also to specify
-    // Ranges or get a normal distributed float.
-    for(int k = 0;k<samples;k++)
-      vals(i*samples+k) = rand_gen.urand64();
+    // Draw samples numbers from the pool as urand64 between 0 and
+    // rand_pool.MAX_URAND64 Note there are function calls to get other type of
+    // scalars, and also to specify Ranges or get a normal distributed float.
+    for (int k = 0; k < samples; k++)
+      vals(i * samples + k) = rand_gen.urand64();
 
-    // Give the state back, which will allow another thread to aquire it
+    // Give the state back, which will allow another thread to acquire it
     rand_pool.free_state(rand_gen);
   }
 };
 
-
-
-
 int main(int argc, char* args[]) {
-  if (argc != 3){
-	printf("Please pass two integers on the command line\n");
-  }
-  else {
+  if (argc != 3) {
+    printf("Please pass two integers on the command line\n");
+  } else {
+    // Initialize Kokkos
+    Kokkos::initialize(argc, args);
+    int size    = atoi(args[1]);
+    int samples = atoi(args[2]);
 
-  // Initialize Kokkos
-  Kokkos::initialize(argc,args);
-  int size = atoi(args[1]);
-  int samples = atoi(args[2]);
+    // Create two random number generator pools one for 64bit states and one for
+    // 1024 bit states Both take an 64 bit unsigned integer seed to initialize a
+    // Random_XorShift64 generator which is used to fill the generators of the
+    // pool.
+    Kokkos::Random_XorShift64_Pool<> rand_pool64(5374857);
+    Kokkos::Random_XorShift1024_Pool<> rand_pool1024(5374857);
+    Kokkos::DualView<uint64_t*> vals("Vals", size * samples);
 
-  // Create two random number generator pools one for 64bit states and one for 1024 bit states
-  // Both take an 64 bit unsigned integer seed to initialize a Random_XorShift64 generator which
-  // is used to fill the generators of the pool.
-  Kokkos::Random_XorShift64_Pool<> rand_pool64(5374857);
-  Kokkos::Random_XorShift1024_Pool<> rand_pool1024(5374857);
-  Kokkos::DualView<uint64_t*> vals("Vals",size*samples);
+    // Run some performance comparisons
+    Kokkos::Timer timer;
+    Kokkos::parallel_for(size,
+                         generate_random<Kokkos::Random_XorShift64_Pool<> >(
+                             vals.d_view, rand_pool64, samples));
+    Kokkos::fence();
 
-  // Run some performance comparisons
-  Kokkos::Timer timer;
-  Kokkos::parallel_for(size,generate_random<Kokkos::Random_XorShift64_Pool<> >(vals.d_view,rand_pool64,samples));
-  Kokkos::fence();
+    timer.reset();
+    Kokkos::parallel_for(size,
+                         generate_random<Kokkos::Random_XorShift64_Pool<> >(
+                             vals.d_view, rand_pool64, samples));
+    Kokkos::fence();
+    double time_64 = timer.seconds();
 
-  timer.reset();
-  Kokkos::parallel_for(size,generate_random<Kokkos::Random_XorShift64_Pool<> >(vals.d_view,rand_pool64,samples));
-  Kokkos::fence();
-  double time_64 = timer.seconds();
+    Kokkos::parallel_for(size,
+                         generate_random<Kokkos::Random_XorShift1024_Pool<> >(
+                             vals.d_view, rand_pool1024, samples));
+    Kokkos::fence();
 
-  Kokkos::parallel_for(size,generate_random<Kokkos::Random_XorShift1024_Pool<> >(vals.d_view,rand_pool1024,samples));
-  Kokkos::fence();
+    timer.reset();
+    Kokkos::parallel_for(size,
+                         generate_random<Kokkos::Random_XorShift1024_Pool<> >(
+                             vals.d_view, rand_pool1024, samples));
+    Kokkos::fence();
+    double time_1024 = timer.seconds();
 
-  timer.reset();
-  Kokkos::parallel_for(size,generate_random<Kokkos::Random_XorShift1024_Pool<> >(vals.d_view,rand_pool1024,samples));
-  Kokkos::fence();
-  double time_1024 = timer.seconds();
+    printf("#Time XorShift64*:   %e %e\n", time_64,
+           1.0e-9 * samples * size / time_64);
+    printf("#Time XorShift1024*: %e %e\n", time_1024,
+           1.0e-9 * samples * size / time_1024);
 
-  printf("#Time XorShift64*:   %e %e\n",time_64,1.0e-9*samples*size/time_64 );
-  printf("#Time XorShift1024*: %e %e\n",time_1024,1.0e-9*samples*size/time_1024 );
+    Kokkos::deep_copy(vals.h_view, vals.d_view);
 
-  Kokkos::deep_copy(vals.h_view,vals.d_view);
-
-  Kokkos::finalize();
+    Kokkos::finalize();
   }
   return 0;
 }
-
-
diff --git a/lib/kokkos/example/tutorial/CMakeLists.txt b/lib/kokkos/example/tutorial/CMakeLists.txt
index 613e460cad..2d8259506a 100644
--- a/lib/kokkos/example/tutorial/CMakeLists.txt
+++ b/lib/kokkos/example/tutorial/CMakeLists.txt
@@ -1,17 +1,17 @@
 
-TRIBITS_ADD_EXAMPLE_DIRECTORIES(01_hello_world)
-TRIBITS_ADD_EXAMPLE_DIRECTORIES(02_simple_reduce)
-TRIBITS_ADD_EXAMPLE_DIRECTORIES(03_simple_view)
-TRIBITS_ADD_EXAMPLE_DIRECTORIES(04_simple_memoryspaces)
-TRIBITS_ADD_EXAMPLE_DIRECTORIES(05_simple_atomics)
-TRIBITS_ADD_EXAMPLE_DIRECTORIES(06_simple_mdrangepolicy)
-TRIBITS_ADD_EXAMPLE_DIRECTORIES(Advanced_Views)
-TRIBITS_ADD_EXAMPLE_DIRECTORIES(Hierarchical_Parallelism)
+KOKKOS_ADD_EXAMPLE_DIRECTORIES(01_hello_world)
+KOKKOS_ADD_EXAMPLE_DIRECTORIES(02_simple_reduce)
+KOKKOS_ADD_EXAMPLE_DIRECTORIES(03_simple_view)
+KOKKOS_ADD_EXAMPLE_DIRECTORIES(04_simple_memoryspaces)
+KOKKOS_ADD_EXAMPLE_DIRECTORIES(05_simple_atomics)
+KOKKOS_ADD_EXAMPLE_DIRECTORIES(06_simple_mdrangepolicy)
+KOKKOS_ADD_EXAMPLE_DIRECTORIES(Advanced_Views)
+KOKKOS_ADD_EXAMPLE_DIRECTORIES(Hierarchical_Parallelism)
 
 IF (Kokkos_ENABLE_CXX11)
-  TRIBITS_ADD_EXAMPLE_DIRECTORIES(01_hello_world_lambda)
-  TRIBITS_ADD_EXAMPLE_DIRECTORIES(02_simple_reduce_lambda)
-  TRIBITS_ADD_EXAMPLE_DIRECTORIES(03_simple_view_lambda)
+  KOKKOS_ADD_EXAMPLE_DIRECTORIES(01_hello_world_lambda)
+  KOKKOS_ADD_EXAMPLE_DIRECTORIES(02_simple_reduce_lambda)
+  KOKKOS_ADD_EXAMPLE_DIRECTORIES(03_simple_view_lambda)
 ENDIF ()
 
 
diff --git a/lib/kokkos/example/tutorial/Hierarchical_Parallelism/01_thread_teams/CMakeLists.txt b/lib/kokkos/example/tutorial/Hierarchical_Parallelism/01_thread_teams/CMakeLists.txt
index 2d8a514a45..e7cd6dea07 100644
--- a/lib/kokkos/example/tutorial/Hierarchical_Parallelism/01_thread_teams/CMakeLists.txt
+++ b/lib/kokkos/example/tutorial/Hierarchical_Parallelism/01_thread_teams/CMakeLists.txt
@@ -3,8 +3,7 @@ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR})
 INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR})
 
 # This is a tutorial, not a test, so we don't ask CTest to run it.
-TRIBITS_ADD_EXECUTABLE(
+KOKKOS_ADD_EXECUTABLE(
   tutorial_hierarchicalparallelism_01_thread_teams
   SOURCES thread_teams.cpp
-  COMM serial mpi
-  )
+)
diff --git a/lib/kokkos/example/tutorial/Hierarchical_Parallelism/01_thread_teams/thread_teams.cpp b/lib/kokkos/example/tutorial/Hierarchical_Parallelism/01_thread_teams/thread_teams.cpp
index e8c1550fc6..77a5b4ce91 100644
--- a/lib/kokkos/example/tutorial/Hierarchical_Parallelism/01_thread_teams/thread_teams.cpp
+++ b/lib/kokkos/example/tutorial/Hierarchical_Parallelism/01_thread_teams/thread_teams.cpp
@@ -1,13 +1,14 @@
 /*
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -36,7 +37,7 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 */
@@ -51,16 +52,17 @@
 // to identify a thread uniquely and some team related function calls such as a
 // barrier (which will be used in a subsequent example).
 // A ThreadTeam consists of 1 to n threads where the maxmimum value of n is
-// determined by the hardware. On a dual socket CPU machine with 8 cores per socket
-// the maximum size of a team is 8. The number of teams (i.e. the league_size) is
-// not limited by physical constraints. Its a pure logical number.
+// determined by the hardware. On a dual socket CPU machine with 8 cores per
+// socket the maximum size of a team is 8. The number of teams (i.e. the
+// league_size) is not limited by physical constraints. Its a pure logical
+// number.
 
-typedef Kokkos::TeamPolicy<>              team_policy ;
-typedef team_policy::member_type team_member ;
+typedef Kokkos::TeamPolicy<> team_policy;
+typedef team_policy::member_type team_member;
 
 // Define a functor which can be launched using the TeamPolicy
 struct hello_world {
-  typedef int value_type; //Specify value type for reduction target, sum
+  typedef int value_type;  // Specify value type for reduction target, sum
 
   // This is a reduction operator which now takes as first argument the
   // TeamPolicy member_type. Every member of the team contributes to the
@@ -68,36 +70,39 @@ struct hello_world {
   // It is helpful to think of this operator as a parallel region for a team
   // (i.e. every team member is active and will execute the code).
   KOKKOS_INLINE_FUNCTION
-  void operator() ( const team_member & thread, int& sum) const {
-    sum+=1;
+  void operator()(const team_member& thread, int& sum) const {
+    sum += 1;
     // The TeamPolicy<>::member_type provides functions to query the multi
-    // dimensional index of a thread as well as the number of thread-teams and the size
-    // of each team.
-    printf("Hello World: %i %i // %i %i\n",thread.league_rank(),thread.team_rank(),thread.league_size(),thread.team_size());
+    // dimensional index of a thread as well as the number of thread-teams and
+    // the size of each team.
+    printf("Hello World: %i %i // %i %i\n", thread.league_rank(),
+           thread.team_rank(), thread.league_size(), thread.team_size());
   }
 };
 
 int main(int narg, char* args[]) {
-  Kokkos::initialize(narg,args);
+  Kokkos::initialize(narg, args);
 
   // Launch 12 teams of the maximum number of threads per team
-  const int team_size_max = team_policy(1,1).team_size_max(hello_world(), Kokkos::ParallelReduceTag());
-  const team_policy policy_a( 12 , team_size_max );
+  const int team_size_max = team_policy(1, 1).team_size_max(
+      hello_world(), Kokkos::ParallelReduceTag());
+  const team_policy policy_a(12, team_size_max);
 
   int sum = 0;
-  Kokkos::parallel_reduce( policy_a , hello_world() , sum );
+  Kokkos::parallel_reduce(policy_a, hello_world(), sum);
 
   // The result will be 12*team_size_max
-  printf("Result A: %i == %i\n",sum, team_size_max*12);
+  printf("Result A: %i == %i\n", sum, team_size_max * 12);
 
   // In practice it is often better to let Kokkos decide on the team_size
-  const team_policy policy_b( 12 , Kokkos::AUTO );
+  const team_policy policy_b(12, Kokkos::AUTO);
 
-  Kokkos::parallel_reduce( policy_b , hello_world() , sum );
-  // The result will be 12*policy_b.team_size_recommended( hello_world(),  Kokkos::ParallelReduceTag())
-  const int team_size_recommended = policy_b.team_size_recommended( hello_world(),  Kokkos::ParallelReduceTag());
-  printf("Result B: %i %i\n",sum, team_size_recommended*12);
+  Kokkos::parallel_reduce(policy_b, hello_world(), sum);
+  // The result will be 12*policy_b.team_size_recommended( hello_world(),
+  // Kokkos::ParallelReduceTag())
+  const int team_size_recommended = policy_b.team_size_recommended(
+      hello_world(), Kokkos::ParallelReduceTag());
+  printf("Result B: %i %i\n", sum, team_size_recommended * 12);
 
   Kokkos::finalize();
 }
-
diff --git a/lib/kokkos/example/tutorial/Hierarchical_Parallelism/01_thread_teams_lambda/CMakeLists.txt b/lib/kokkos/example/tutorial/Hierarchical_Parallelism/01_thread_teams_lambda/CMakeLists.txt
index ec7f1e1159..8c7f3853a0 100644
--- a/lib/kokkos/example/tutorial/Hierarchical_Parallelism/01_thread_teams_lambda/CMakeLists.txt
+++ b/lib/kokkos/example/tutorial/Hierarchical_Parallelism/01_thread_teams_lambda/CMakeLists.txt
@@ -2,12 +2,9 @@
 INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR})
 INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR})
 
-IF (Kokkos_ENABLE_CXX11)
-  # This is a tutorial, not a test, so we don't ask CTest to run it.
-  TRIBITS_ADD_EXECUTABLE(
-    tutorial_hierarchical_01_thread_teams_lambda
-    SOURCES thread_teams_lambda.cpp
-    COMM serial mpi
-    )
-ENDIF ()
+# This is a tutorial, not a test, so we don't ask CTest to run it.
+KOKKOS_ADD_EXECUTABLE(
+  tutorial_hierarchical_01_thread_teams_lambda
+  SOURCES thread_teams_lambda.cpp
+)
 
diff --git a/lib/kokkos/example/tutorial/Hierarchical_Parallelism/01_thread_teams_lambda/thread_teams_lambda.cpp b/lib/kokkos/example/tutorial/Hierarchical_Parallelism/01_thread_teams_lambda/thread_teams_lambda.cpp
index d936699a5f..6e29d5c3d6 100644
--- a/lib/kokkos/example/tutorial/Hierarchical_Parallelism/01_thread_teams_lambda/thread_teams_lambda.cpp
+++ b/lib/kokkos/example/tutorial/Hierarchical_Parallelism/01_thread_teams_lambda/thread_teams_lambda.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -53,17 +54,17 @@
 // some reasonable bound, which eventually depends upon the hardware
 // and programming model implementation).
 
-int main (int narg, char* args[]) {
+int main(int narg, char* args[]) {
   using Kokkos::parallel_reduce;
-  typedef Kokkos::TeamPolicy<>               team_policy;
-  typedef typename team_policy::member_type  team_member;
+  typedef Kokkos::TeamPolicy<> team_policy;
+  typedef typename team_policy::member_type team_member;
 
-  Kokkos::initialize (narg, args);
+  Kokkos::initialize(narg, args);
 
   // Set up a policy that launches 12 teams, with the maximum number
   // of threads per team.
 
-  const team_policy policy (12, Kokkos::AUTO);
+  const team_policy policy(12, Kokkos::AUTO);
 
   // This is a reduction with a team policy.  The team policy changes
   // the first argument of the lambda.  Rather than an integer index
@@ -77,21 +78,23 @@ int main (int narg, char* args[]) {
   // region."  That is, every team member is active and will execute
   // the body of the lambda.
   int sum = 0;
-  // We also need to protect the usage of a lambda against compiling
-  // with a backend which doesn't support it (i.e. Cuda 6.5/7.0).
-  #if defined(KOKKOS_ENABLE_CXX11_DISPATCH_LAMBDA)
-  parallel_reduce (policy, KOKKOS_LAMBDA (const team_member& thread, int& lsum) {
-      lsum += 1;
-      // TeamPolicy<>::member_type provides functions to query the
-      // multidimensional index of a thread, as well as the number of
-      // thread teams and the size of each team.
-      printf ("Hello World: %i %i // %i %i\n", thread.league_rank (),
-              thread.team_rank (), thread.league_size (), thread.team_size ());
-    }, sum);
-  #endif
+// We also need to protect the usage of a lambda against compiling
+// with a backend which doesn't support it (i.e. Cuda 6.5/7.0).
+#if defined(KOKKOS_ENABLE_CXX11_DISPATCH_LAMBDA)
+  parallel_reduce(
+      policy,
+      KOKKOS_LAMBDA(const team_member& thread, int& lsum) {
+        lsum += 1;
+        // TeamPolicy<>::member_type provides functions to query the
+        // multidimensional index of a thread, as well as the number of
+        // thread teams and the size of each team.
+        printf("Hello World: %i %i // %i %i\n", thread.league_rank(),
+               thread.team_rank(), thread.league_size(), thread.team_size());
+      },
+      sum);
+#endif
   // The result will be 12*team_policy::team_size_max([=]{})
-  printf ("Result %i\n",sum);
+  printf("Result %i\n", sum);
 
-  Kokkos::finalize ();
+  Kokkos::finalize();
 }
-
diff --git a/lib/kokkos/example/tutorial/Hierarchical_Parallelism/02_nested_parallel_for/CMakeLists.txt b/lib/kokkos/example/tutorial/Hierarchical_Parallelism/02_nested_parallel_for/CMakeLists.txt
index e660405345..92b701e4f4 100644
--- a/lib/kokkos/example/tutorial/Hierarchical_Parallelism/02_nested_parallel_for/CMakeLists.txt
+++ b/lib/kokkos/example/tutorial/Hierarchical_Parallelism/02_nested_parallel_for/CMakeLists.txt
@@ -3,8 +3,7 @@ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR})
 INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR})
 
 # This is a tutorial, not a test, so we don't ask CTest to run it.
-TRIBITS_ADD_EXECUTABLE(
+KOKKOS_ADD_EXECUTABLE(
   tutorial_hierarchicalparallelism_02_nested_parallel_for
   SOURCES nested_parallel_for.cpp
-  COMM serial mpi
-  )
+)
diff --git a/lib/kokkos/example/tutorial/Hierarchical_Parallelism/02_nested_parallel_for/nested_parallel_for.cpp b/lib/kokkos/example/tutorial/Hierarchical_Parallelism/02_nested_parallel_for/nested_parallel_for.cpp
index bbb1000e90..1c0b531c5c 100644
--- a/lib/kokkos/example/tutorial/Hierarchical_Parallelism/02_nested_parallel_for/nested_parallel_for.cpp
+++ b/lib/kokkos/example/tutorial/Hierarchical_Parallelism/02_nested_parallel_for/nested_parallel_for.cpp
@@ -1,13 +1,14 @@
 /*
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -36,7 +37,7 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 */
@@ -45,46 +46,50 @@
 #include <cstdio>
 
 // See 01_thread_teams for an explanation of a basic TeamPolicy
-typedef Kokkos::TeamPolicy<>              team_policy ;
-typedef typename team_policy::member_type team_member ;
+typedef Kokkos::TeamPolicy<> team_policy;
+typedef typename team_policy::member_type team_member;
 
 struct hello_world {
-  typedef int value_type; //Specify value type for reduction target, sum
+  typedef int value_type;  // Specify value type for reduction target, sum
   KOKKOS_INLINE_FUNCTION
-  void operator() ( const team_member & thread, int& sum) const {
-    sum+=1;
+  void operator()(const team_member& thread, int& sum) const {
+    sum += 1;
     // When using the TeamPolicy Kokkos allows for nested parallel loops.
-    // All three Kokkos parallel patterns are allowed (for, reduce, scan) and they
-    // largely follow the same syntax as on the global level.
-    // The execution policy for the Thread level nesting (the Vector level is in the next
-    // tutorial example) is Kokkos::TeamThreadRange. This means the loop will be executed
-    // by all members of the team and the loop count will be split between threads of the
-    // team. Its arguments are the team_member, and a loop count.
-    // Not every thread will do the same amount of iterations. On a GPU for example with
-    // a team_size() larger than 31 only the first 31 threads would actually do anything.
-    // On a CPU with 8 threads 7 would execute 4 loop iterations, and 1 thread would do
-    // 3. Note also that the mode of splitting the count is architecture dependent similar
-    // to what the RangePolicy on a global level does.
-    // The call itself is not guaranteed to be synchronous. Also keep in mind that the
-    // operator using a team_policy acts like a parallel region for the team. That means
-    // that everything outside of the nested parallel_for is also executed by all threads
-    // of the team.
-    Kokkos::parallel_for(Kokkos::TeamThreadRange(thread,31), [&] (const int& i) {
-       printf("Hello World: (%i , %i) executed loop %i \n",thread.league_rank(),thread.team_rank(),i);
-    });
+    // All three Kokkos parallel patterns are allowed (for, reduce, scan) and
+    // they largely follow the same syntax as on the global level. The execution
+    // policy for the Thread level nesting (the Vector level is in the next
+    // tutorial example) is Kokkos::TeamThreadRange. This means the loop will be
+    // executed by all members of the team and the loop count will be split
+    // between threads of the team. Its arguments are the team_member, and a
+    // loop count. Not every thread will do the same amount of iterations. On a
+    // GPU for example with a team_size() larger than 31 only the first 31
+    // threads would actually do anything. On a CPU with 8 threads 7 would
+    // execute 4 loop iterations, and 1 thread would do
+    // 3. Note also that the mode of splitting the count is architecture
+    // dependent similar to what the RangePolicy on a global level does. The
+    // call itself is not guaranteed to be synchronous. Also keep in mind that
+    // the operator using a team_policy acts like a parallel region for the
+    // team. That means that everything outside of the nested parallel_for is
+    // also executed by all threads of the team.
+    Kokkos::parallel_for(Kokkos::TeamThreadRange(thread, 31),
+                         [&](const int& i) {
+                           printf("Hello World: (%i , %i) executed loop %i \n",
+                                  thread.league_rank(), thread.team_rank(), i);
+                         });
   }
 };
 
 int main(int narg, char* args[]) {
-  Kokkos::initialize(narg,args);
+  Kokkos::initialize(narg, args);
 
   // Launch 3 teams of the maximum number of threads per team
-  const int team_size_max = team_policy(3,1).team_size_max( hello_world(), Kokkos::ParallelReduceTag());
-  const team_policy policy( 3 , team_size_max );
-  
+  const int team_size_max = team_policy(3, 1).team_size_max(
+      hello_world(), Kokkos::ParallelReduceTag());
+  const team_policy policy(3, team_size_max);
+
   int sum = 0;
-  Kokkos::parallel_reduce( policy , hello_world() , sum );
-  printf("Result %i\n",sum);
+  Kokkos::parallel_reduce(policy, hello_world(), sum);
+  printf("Result %i\n", sum);
 
   Kokkos::finalize();
 }
diff --git a/lib/kokkos/example/tutorial/Hierarchical_Parallelism/03_vectorization/CMakeLists.txt b/lib/kokkos/example/tutorial/Hierarchical_Parallelism/03_vectorization/CMakeLists.txt
index ea6b0b1e42..3907d16664 100644
--- a/lib/kokkos/example/tutorial/Hierarchical_Parallelism/03_vectorization/CMakeLists.txt
+++ b/lib/kokkos/example/tutorial/Hierarchical_Parallelism/03_vectorization/CMakeLists.txt
@@ -3,14 +3,8 @@ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR})
 INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR})
 
 # This is a tutorial, not a test, so we don't ask CTest to run it.
-
-IF(Kokkos_ENABLE_CXX11)
-
-TRIBITS_ADD_EXECUTABLE(
+KOKKOS_ADD_EXECUTABLE(
   tutorial_hierarchicalparallelism_03_vectorization
   SOURCES vectorization.cpp
-  COMM serial mpi
-  )
-
-ENDIF()
+)
 
diff --git a/lib/kokkos/example/tutorial/Hierarchical_Parallelism/03_vectorization/vectorization.cpp b/lib/kokkos/example/tutorial/Hierarchical_Parallelism/03_vectorization/vectorization.cpp
index b97da0fe87..cb679f7f5a 100644
--- a/lib/kokkos/example/tutorial/Hierarchical_Parallelism/03_vectorization/vectorization.cpp
+++ b/lib/kokkos/example/tutorial/Hierarchical_Parallelism/03_vectorization/vectorization.cpp
@@ -2,10 +2,11 @@
 //@HEADER
 // ************************************************************************
 //
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
 //
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -45,118 +46,131 @@
 #include <Kokkos_Random.hpp>
 #include <cstdio>
 
-
 // The TeamPolicy actually supports 3D parallelism: Teams, Threads, Vector
 // Kokkos::parallel_{for/reduce/scan} calls can be completely free nested.
 // The execution policies for the nested layers are TeamThreadRange and
 // ThreadVectorRange.
 // The only restriction on nesting is that a given level can only be nested in a
-// higher one. e.g. a ThreadVectorRange can be nested inside a TeamPolicy operator
-// and inside a TeamThreadRange, but you can not nest a ThreadVectorRange or a
-// TeamThreadRange inside another ThreadVectorRange.
-// As with the 2D execution of TeamPolicy the operator has to be considered as
-// a parallel region even with respect to VectorLanes. That means even outside
-// a TeamThread or VectorThread loop all threads of a team and all vector lanes
-// of a thread execute every line of the operator as long as there are no restricitons
-// on them.
-// Code lines can be restricted using Kokkos::single to either execute once PerThread
-// or execute once PerTeam.
-typedef typename Kokkos::TeamPolicy<>::member_type team_member ;
+// higher one. e.g. a ThreadVectorRange can be nested inside a TeamPolicy
+// operator and inside a TeamThreadRange, but you can not nest a
+// ThreadVectorRange or a TeamThreadRange inside another ThreadVectorRange. As
+// with the 2D execution of TeamPolicy the operator has to be considered as a
+// parallel region even with respect to VectorLanes. That means even outside a
+// TeamThread or VectorThread loop all threads of a team and all vector lanes of
+// a thread execute every line of the operator as long as there are no
+// restricitons on them. Code lines can be restricted using Kokkos::single to
+// either execute once PerThread or execute once PerTeam.
+typedef typename Kokkos::TeamPolicy<>::member_type team_member;
 
 struct SomeCorrelation {
-  typedef int value_type; //Specify value type for reduction target, sum
+  typedef int value_type;  // Specify value type for reduction target, sum
   typedef Kokkos::DefaultExecutionSpace::scratch_memory_space shared_space;
-  typedef Kokkos::View<int*,shared_space,Kokkos::MemoryUnmanaged> shared_1d_int;
+  typedef Kokkos::View<int*, shared_space, Kokkos::MemoryUnmanaged>
+      shared_1d_int;
 
-  Kokkos::View<const int***,Kokkos::LayoutRight> data;
+  Kokkos::View<const int***, Kokkos::LayoutRight> data;
   Kokkos::View<int> gsum;
 
-  SomeCorrelation(Kokkos::View<int***,Kokkos::LayoutRight> data_in,
-                  Kokkos::View<int> sum):data(data_in),gsum(sum){}
+  SomeCorrelation(Kokkos::View<int***, Kokkos::LayoutRight> data_in,
+                  Kokkos::View<int> sum)
+      : data(data_in), gsum(sum) {}
 
   KOKKOS_INLINE_FUNCTION
-  void operator() ( const team_member & thread) const {
+  void operator()(const team_member& thread) const {
     int i = thread.league_rank();
 
     // Allocate a shared array for the team.
-    shared_1d_int count(thread.team_shmem(),data.extent(1));
+    shared_1d_int count(thread.team_shmem(), data.extent(1));
 
     // With each team run a parallel_for with its threads
-    Kokkos::parallel_for(Kokkos::TeamThreadRange(thread,data.extent(1)), [=] (const int& j) {
-      int tsum;
-      // Run a vector loop reduction over the inner dimension of data
-      // Count how many values are multiples of 4
-      // Every vector lane gets the same reduction value (tsum) back, it is broadcast to all vector lanes
-      Kokkos::parallel_reduce(Kokkos::ThreadVectorRange(thread,data.extent(2)), [=] (const int& k, int & vsum) {
-        vsum+= (data(i,j,k) % 4 == 0)?1:0;
-      },tsum);
+    Kokkos::parallel_for(
+        Kokkos::TeamThreadRange(thread, data.extent(1)), [=](const int& j) {
+          int tsum;
+          // Run a vector loop reduction over the inner dimension of data
+          // Count how many values are multiples of 4
+          // Every vector lane gets the same reduction value (tsum) back, it is
+          // broadcast to all vector lanes
+          Kokkos::parallel_reduce(
+              Kokkos::ThreadVectorRange(thread, data.extent(2)),
+              [=](const int& k, int& vsum) {
+                vsum += (data(i, j, k) % 4 == 0) ? 1 : 0;
+              },
+              tsum);
 
-      // Make sure only one vector lane adds the reduction value to the shared array, i.e. execute
-      // the next line only once PerThread
-      Kokkos::single(Kokkos::PerThread(thread),[=] () {
-        count(j) = tsum;
-      });
-    });
+          // Make sure only one vector lane adds the reduction value to the
+          // shared array, i.e. execute the next line only once PerThread
+          Kokkos::single(Kokkos::PerThread(thread), [=]() { count(j) = tsum; });
+        });
 
-    // Wait for all threads to finish the parallel_for so that all shared memory writes are done
+    // Wait for all threads to finish the parallel_for so that all shared memory
+    // writes are done
     thread.team_barrier();
 
     // Check with one vector lane from each thread how many consecutive
     // data segments have the same number of values divisible by 4
-    // The team reduction value is again broadcast to every team member (and every vector lane)
+    // The team reduction value is again broadcast to every team member (and
+    // every vector lane)
     int team_sum = 0;
-    Kokkos::parallel_reduce(Kokkos::TeamThreadRange(thread, data.extent(1)-1), [=] (const int& j, int& thread_sum) {
-      // It is not valid to directly add to thread_sum
-      // Use a single function with broadcast instead
-      // team_sum will be used as input to the operator (i.e. it is used to initialize sum)
-      // the end value of sum will be broadcast to all vector lanes in the thread.
-      Kokkos::single(Kokkos::PerThread(thread),[=] (int& sum) {
-        if(count(j)==count(j+1)) sum++;
-      },thread_sum);
-    },team_sum);
+    Kokkos::parallel_reduce(
+        Kokkos::TeamThreadRange(thread, data.extent(1) - 1),
+        [=](const int& j, int& thread_sum) {
+          // It is not valid to directly add to thread_sum
+          // Use a single function with broadcast instead
+          // team_sum will be used as input to the operator (i.e. it is used to
+          // initialize sum) the end value of sum will be broadcast to all
+          // vector lanes in the thread.
+          Kokkos::single(
+              Kokkos::PerThread(thread),
+              [=](int& sum) {
+                if (count(j) == count(j + 1)) sum++;
+              },
+              thread_sum);
+        },
+        team_sum);
 
-    // Add with one thread and vectorlane of the team the team_sum to the global value
-    Kokkos::single(Kokkos::PerTeam(thread),[=] () {
-      Kokkos::atomic_add(&gsum(),team_sum);
-    });
+    // Add with one thread and vectorlane of the team the team_sum to the global
+    // value
+    Kokkos::single(Kokkos::PerTeam(thread),
+                   [=]() { Kokkos::atomic_add(&gsum(), team_sum); });
   }
 
-  // The functor needs to define how much shared memory it requests given a team_size.
-  size_t team_shmem_size( int team_size ) const {
+  // The functor needs to define how much shared memory it requests given a
+  // team_size.
+  size_t team_shmem_size(int team_size) const {
     return shared_1d_int::shmem_size(data.extent(1));
   }
 };
 
 int main(int narg, char* args[]) {
-  Kokkos::initialize(narg,args);
+  Kokkos::initialize(narg, args);
 
   {
-    // Produce some 3D random data (see Algorithms/01_random_numbers for more info)
-    Kokkos::View<int***,Kokkos::LayoutRight> data("Data",512,512,32);
+    // Produce some 3D random data (see Algorithms/01_random_numbers for more
+    // info)
+    Kokkos::View<int***, Kokkos::LayoutRight> data("Data", 512, 512, 32);
     Kokkos::Random_XorShift64_Pool<> rand_pool64(5374857);
-    Kokkos::fill_random(data,rand_pool64,100);
+    Kokkos::fill_random(data, rand_pool64, 100);
 
     // A global value to put the result in
     Kokkos::View<int> gsum("Sum");
 
     // Each team handles a slice of the data
-    // Set up TeamPolicy with 512 teams with maximum number of threads per team and 16 vector lanes.
-    // Kokkos::AUTO will determine the number of threads
-    // The maximum vector length is hardware dependent but can always be smaller than the hardware allows.
-    // The vector length must be a power of 2.
+    // Set up TeamPolicy with 512 teams with maximum number of threads per team
+    // and 16 vector lanes. Kokkos::AUTO will determine the number of threads
+    // The maximum vector length is hardware dependent but can always be smaller
+    // than the hardware allows. The vector length must be a power of 2.
 
-    const Kokkos::TeamPolicy<> policy( 512 , Kokkos::AUTO , 16);
+    const Kokkos::TeamPolicy<> policy(512, Kokkos::AUTO, 16);
 
-    Kokkos::parallel_for( policy , SomeCorrelation(data,gsum) );
+    Kokkos::parallel_for(policy, SomeCorrelation(data, gsum));
 
     Kokkos::fence();
 
     // Copy result value back
     int sum = 0;
-    Kokkos::deep_copy(sum,gsum);
-    printf("Result %i\n",sum);
+    Kokkos::deep_copy(sum, gsum);
+    printf("Result %i\n", sum);
   }
 
   Kokkos::finalize();
 }
-
diff --git a/lib/kokkos/example/tutorial/Hierarchical_Parallelism/04_team_scan/CMakeLists.txt b/lib/kokkos/example/tutorial/Hierarchical_Parallelism/04_team_scan/CMakeLists.txt
index 15ad5d7803..d2f83a25ea 100644
--- a/lib/kokkos/example/tutorial/Hierarchical_Parallelism/04_team_scan/CMakeLists.txt
+++ b/lib/kokkos/example/tutorial/Hierarchical_Parallelism/04_team_scan/CMakeLists.txt
@@ -3,8 +3,8 @@ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR})
 INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR})
 
 # This is a tutorial, not a test, so we don't ask CTest to run it.
-TRIBITS_ADD_EXECUTABLE(
+KOKKOS_ADD_EXECUTABLE(
   tutorial_hierarchicalparallelism_04_team_scan
   SOURCES team_scan.cpp
-  COMM serial mpi
-  )
+)
+
diff --git a/lib/kokkos/example/tutorial/Hierarchical_Parallelism/04_team_scan/team_scan.cpp b/lib/kokkos/example/tutorial/Hierarchical_Parallelism/04_team_scan/team_scan.cpp
index 92ef10ec76..10c8971e5a 100644
--- a/lib/kokkos/example/tutorial/Hierarchical_Parallelism/04_team_scan/team_scan.cpp
+++ b/lib/kokkos/example/tutorial/Hierarchical_Parallelism/04_team_scan/team_scan.cpp
@@ -1,13 +1,14 @@
 /*
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -36,7 +37,7 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 */
@@ -47,13 +48,13 @@
 #include <cstdio>
 #include <cstdlib>
 
-typedef Kokkos::DefaultExecutionSpace       Device ;
-typedef Kokkos::HostSpace::execution_space  Host ;
+typedef Kokkos::DefaultExecutionSpace Device;
+typedef Kokkos::HostSpace::execution_space Host;
 
-typedef Kokkos::TeamPolicy< Device >      team_policy ;
-typedef team_policy::member_type team_member ;
+typedef Kokkos::TeamPolicy<Device> team_policy;
+typedef team_policy::member_type team_member;
 
-static const int TEAM_SIZE = 16 ;
+static const int TEAM_SIZE = 16;
 
 struct find_2_tuples {
   int chunk_size;
@@ -61,89 +62,91 @@ struct find_2_tuples {
   Kokkos::View<int**> histogram;
 
   find_2_tuples(int chunk_size_, Kokkos::DualView<int*> data_,
-                Kokkos::DualView<int**> histogram_):chunk_size(chunk_size_),
-                data(data_.d_view),histogram(histogram_.d_view) {
-      data_.sync<Device>();
-      histogram_.sync<Device>();
-      histogram_.modify<Device>();
+                Kokkos::DualView<int**> histogram_)
+      : chunk_size(chunk_size_),
+        data(data_.d_view),
+        histogram(histogram_.d_view) {
+    data_.sync<Device>();
+    histogram_.sync<Device>();
+    histogram_.modify<Device>();
   }
 
   KOKKOS_INLINE_FUNCTION
-  void operator() ( const team_member & dev) const {
-    Kokkos::View<int**,Kokkos::MemoryUnmanaged> l_histogram(dev.team_shmem(),TEAM_SIZE,TEAM_SIZE);
-    Kokkos::View<int*,Kokkos::MemoryUnmanaged> l_data(dev.team_shmem(),chunk_size+1);
+  void operator()(const team_member& dev) const {
+    Kokkos::View<int**, Kokkos::MemoryUnmanaged> l_histogram(
+        dev.team_shmem(), TEAM_SIZE, TEAM_SIZE);
+    Kokkos::View<int*, Kokkos::MemoryUnmanaged> l_data(dev.team_shmem(),
+                                                       chunk_size + 1);
 
     const int i = dev.league_rank() * chunk_size;
-    for(int j = dev.team_rank(); j<chunk_size+1; j+=dev.team_size())
-      l_data(j) = data(i+j);
+    for (int j = dev.team_rank(); j < chunk_size + 1; j += dev.team_size())
+      l_data(j) = data(i + j);
 
-    for(int k = dev.team_rank(); k < TEAM_SIZE; k+=dev.team_size())
-      for(int l = 0; l < TEAM_SIZE; l++)
-        l_histogram(k,l) = 0;
+    for (int k = dev.team_rank(); k < TEAM_SIZE; k += dev.team_size())
+      for (int l = 0; l < TEAM_SIZE; l++) l_histogram(k, l) = 0;
     dev.team_barrier();
 
-    for(int j = 0; j<chunk_size; j++) {
-      for(int k = dev.team_rank(); k < TEAM_SIZE; k+=dev.team_size())
-        for(int l = 0; l < TEAM_SIZE; l++) {
-          if((l_data(j) == k) && (l_data(j+1)==l))
-            l_histogram(k,l)++;
+    for (int j = 0; j < chunk_size; j++) {
+      for (int k = dev.team_rank(); k < TEAM_SIZE; k += dev.team_size())
+        for (int l = 0; l < TEAM_SIZE; l++) {
+          if ((l_data(j) == k) && (l_data(j + 1) == l)) l_histogram(k, l)++;
         }
     }
 
-    for(int k = dev.team_rank(); k < TEAM_SIZE; k+=dev.team_size())
-      for(int l = 0; l < TEAM_SIZE; l++) {
-        Kokkos::atomic_fetch_add(&histogram(k,l),l_histogram(k,l));
+    for (int k = dev.team_rank(); k < TEAM_SIZE; k += dev.team_size())
+      for (int l = 0; l < TEAM_SIZE; l++) {
+        Kokkos::atomic_fetch_add(&histogram(k, l), l_histogram(k, l));
       }
     dev.team_barrier();
   }
-  size_t team_shmem_size( int team_size ) const { 
-    return Kokkos::View<int**,Kokkos::MemoryUnmanaged>::shmem_size(TEAM_SIZE,TEAM_SIZE) +
-           Kokkos::View<int*,Kokkos::MemoryUnmanaged>::shmem_size(chunk_size+1);
+  size_t team_shmem_size(int team_size) const {
+    return Kokkos::View<int**, Kokkos::MemoryUnmanaged>::shmem_size(TEAM_SIZE,
+                                                                    TEAM_SIZE) +
+           Kokkos::View<int*, Kokkos::MemoryUnmanaged>::shmem_size(chunk_size +
+                                                                   1);
   }
 };
 
 int main(int narg, char* args[]) {
-  Kokkos::initialize(narg,args);
+  Kokkos::initialize(narg, args);
 
   {
-  int chunk_size = 1024;
-  int nchunks = 100000; //1024*1024;
-  Kokkos::DualView<int*> data("data",nchunks*chunk_size+1);
+    int chunk_size = 1024;
+    int nchunks    = 100000;  // 1024*1024;
+    Kokkos::DualView<int*> data("data", nchunks * chunk_size + 1);
 
-  srand(1231093);
+    srand(1231093);
 
-  for(int i = 0; i < (int) data.extent(0); i++) {
-    data.h_view(i) = rand()%TEAM_SIZE;
-  }
-  data.modify<Host>();
-  data.sync<Device>();
-
-  Kokkos::DualView<int**> histogram("histogram",TEAM_SIZE,TEAM_SIZE);
-
-
-  Kokkos::Timer timer;
-  // threads/team is automatically limited to maximum supported by the device.
-  int team_size = TEAM_SIZE;
-  if( team_size > Device::execution_space::concurrency() )
-    team_size = Device::execution_space::concurrency();
-  Kokkos::parallel_for( team_policy( nchunks , team_size )
-                      , find_2_tuples(chunk_size,data,histogram) );
-  Kokkos::fence();
-  double time = timer.seconds();
-
-  histogram.sync<Host>();
-
-  printf("Time: %f \n\n",time);
-  int sum = 0;
-  for(int k=0; k<TEAM_SIZE; k++) {
-    for(int l=0; l<TEAM_SIZE; l++) {
-      printf("%i ",histogram.h_view(k,l));
-      sum += histogram.h_view(k,l);
+    for (int i = 0; i < (int)data.extent(0); i++) {
+      data.h_view(i) = rand() % TEAM_SIZE;
     }
-    printf("\n");
-  }
-  printf("Result: %i %i\n",sum,chunk_size*nchunks);
+    data.modify<Host>();
+    data.sync<Device>();
+
+    Kokkos::DualView<int**> histogram("histogram", TEAM_SIZE, TEAM_SIZE);
+
+    Kokkos::Timer timer;
+    // threads/team is automatically limited to maximum supported by the device.
+    int team_size = TEAM_SIZE;
+    if (team_size > Device::execution_space::concurrency())
+      team_size = Device::execution_space::concurrency();
+    Kokkos::parallel_for(team_policy(nchunks, team_size),
+                         find_2_tuples(chunk_size, data, histogram));
+    Kokkos::fence();
+    double time = timer.seconds();
+
+    histogram.sync<Host>();
+
+    printf("Time: %f \n\n", time);
+    int sum = 0;
+    for (int k = 0; k < TEAM_SIZE; k++) {
+      for (int l = 0; l < TEAM_SIZE; l++) {
+        printf("%i ", histogram.h_view(k, l));
+        sum += histogram.h_view(k, l);
+      }
+      printf("\n");
+    }
+    printf("Result: %i %i\n", sum, chunk_size * nchunks);
   }
   Kokkos::finalize();
 }
-
diff --git a/lib/kokkos/example/tutorial/Hierarchical_Parallelism/CMakeLists.txt b/lib/kokkos/example/tutorial/Hierarchical_Parallelism/CMakeLists.txt
index e03d7aeb90..c892df34cd 100644
--- a/lib/kokkos/example/tutorial/Hierarchical_Parallelism/CMakeLists.txt
+++ b/lib/kokkos/example/tutorial/Hierarchical_Parallelism/CMakeLists.txt
@@ -1,8 +1,6 @@
 
-TRIBITS_ADD_EXAMPLE_DIRECTORIES(01_thread_teams)
+KOKKOS_ADD_EXAMPLE_DIRECTORIES(01_thread_teams)
+KOKKOS_ADD_EXAMPLE_DIRECTORIES(01_thread_teams_lambda)
+KOKKOS_ADD_EXAMPLE_DIRECTORIES(02_nested_parallel_for)
+KOKKOS_ADD_EXAMPLE_DIRECTORIES(03_vectorization)
 
-IF (Kokkos_ENABLE_CXX11)
-  TRIBITS_ADD_EXAMPLE_DIRECTORIES(01_thread_teams_lambda)
-  TRIBITS_ADD_EXAMPLE_DIRECTORIES(02_nested_parallel_for)
-  TRIBITS_ADD_EXAMPLE_DIRECTORIES(03_vectorization)
-ENDIF ()
diff --git a/lib/kokkos/example/tutorial/launch_bounds/CMakeLists.txt b/lib/kokkos/example/tutorial/launch_bounds/CMakeLists.txt
index 7c78db840f..3d9683500d 100644
--- a/lib/kokkos/example/tutorial/launch_bounds/CMakeLists.txt
+++ b/lib/kokkos/example/tutorial/launch_bounds/CMakeLists.txt
@@ -3,8 +3,7 @@ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR})
 INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR})
 
 # This is a tutorial, not a test, so we don't ask CTest to run it.
-TRIBITS_ADD_EXECUTABLE(
+KOKKOS_ADD_EXECUTABLE(
   tutorial_02_simple_reduce
   SOURCES simple_reduce.cpp
-  COMM serial mpi
-  )
+)
diff --git a/lib/kokkos/example/tutorial/launch_bounds/launch_bounds_reduce.cpp b/lib/kokkos/example/tutorial/launch_bounds/launch_bounds_reduce.cpp
index 5ff979e86e..800904dbce 100644
--- a/lib/kokkos/example/tutorial/launch_bounds/launch_bounds_reduce.cpp
+++ b/lib/kokkos/example/tutorial/launch_bounds/launch_bounds_reduce.cpp
@@ -1,13 +1,14 @@
 /*
 //@HEADER
 // ************************************************************************
-// 
-//                        Kokkos v. 2.0
-//              Copyright (2014) Sandia Corporation
-// 
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+//
+//                        Kokkos v. 3.0
+//       Copyright (2020) National Technology & Engineering
+//               Solutions of Sandia, LLC (NTESS).
+//
+// Under the terms of Contract DE-NA0003525 with NTESS,
 // the U.S. Government retains certain rights in this software.
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
@@ -23,10 +24,10 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
+// THIS SOFTWARE IS PROVIDED BY NTESS "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 SANDIA CORPORATION OR THE
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
 // 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
@@ -36,7 +37,7 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
 */
@@ -52,96 +53,92 @@
 //   3. Shut down Kokkos
 //
 struct collision {
-// Reduction functor
-// For each i, we generate 10 hashes, look for and count collisions
-// We use parallel_reduce to count the total collisions
-// Note that we're just counting collisions within the 10 generated
-// one i.
-// This function was chosen as one that very simply can increase the
-// register count.
+  // Reduction functor
+  // For each i, we generate 10 hashes, look for and count collisions
+  // We use parallel_reduce to count the total collisions
+  // Note that we're just counting collisions within the 10 generated
+  // one i.
+  // This function was chosen as one that very simply can increase the
+  // register count.
   typedef int value_type;
 
   KOKKOS_INLINE_FUNCTION
   int hash(int q) const {
-	  // A simple hash by Justin Sobel
-	  // Thanks to Arash Partow (partow.net)
-	  char* fourchars = (char*)&q;
-	  int hash = 1315423911;
-	  for (int i=0; i<4; fourchars++, i++) {
-		  hash ^= ((hash<<5) + *fourchars + (hash >> 2));
-	  }
-	  return hash;
+    // A simple hash by Justin Sobel
+    // Thanks to Arash Partow (partow.net)
+    char* fourchars = (char*)&q;
+    int hash        = 1315423911;
+    for (int i = 0; i < 4; fourchars++, i++) {
+      hash ^= ((hash << 5) + *fourchars + (hash >> 2));
+    }
+    return hash;
   }
 
   KOKKOS_INLINE_FUNCTION
-  void operator () (const int i, int& lsum) const {
-	  //This is a silly function which generates 10 hashes
-	  // then checks for collisions
-	  int a = hash(i)%64;
-	  int b = hash(i*3)%64;
-	  int c = hash(i*5)%64;
-	  int d = hash(i*7)%64;
-	  int e = hash(i*11)%64;
-	  int f = hash(i*17)%64;
-	  int g = hash(i*23)%64;
-	  int h = hash(i*29)%64;
-	  int j = hash(i*31)%64;
-	  int k = hash(i*37)%64;
+  void operator()(const int i, int& lsum) const {
+    // This is a silly function which generates 10 hashes
+    // then checks for collisions
+    int a = hash(i) % 64;
+    int b = hash(i * 3) % 64;
+    int c = hash(i * 5) % 64;
+    int d = hash(i * 7) % 64;
+    int e = hash(i * 11) % 64;
+    int f = hash(i * 17) % 64;
+    int g = hash(i * 23) % 64;
+    int h = hash(i * 29) % 64;
+    int j = hash(i * 31) % 64;
+    int k = hash(i * 37) % 64;
 
-
-	  if (a==b) lsum++;
-	  if (a==c) lsum++;
-	  if (a==d) lsum++;
-	  if (a==e) lsum++;
-	  if (a==f) lsum++;
-	  if (a==g) lsum++;
-	  if (a==h) lsum++;
-	  if (a==j) lsum++;
-	  if (a==k) lsum++;
-	  if (b==c) lsum++;
-	  if (b==d) lsum++;
-	  if (b==e) lsum++;
-	  if (b==f) lsum++;
-	  if (b==g) lsum++;
-	  if (b==h) lsum++;
-	  if (b==j) lsum++;
-	  if (b==k) lsum++;
-	  if (c==d) lsum++;
-	  if (c==e) lsum++;
-	  if (c==f) lsum++;
-	  if (c==g) lsum++;
-	  if (c==h) lsum++;
-	  if (c==j) lsum++;
-	  if (c==k) lsum++;
-	  if (d==e) lsum++;
-	  if (d==f) lsum++;
-	  if (d==g) lsum++;
-	  if (d==h) lsum++;
-	  if (d==j) lsum++;
-	  if (d==k) lsum++;
-	  if (e==f) lsum++;
-	  if (e==g) lsum++;
-	  if (e==h) lsum++;
-	  if (e==j) lsum++;
-	  if (e==k) lsum++;
-	  if (f==g) lsum++;
-	  if (f==h) lsum++;
-	  if (f==j) lsum++;
-	  if (f==k) lsum++;
-	  if (g==h) lsum++;
-	  if (g==j) lsum++;
-	  if (g==k) lsum++;
-	  if (h==j) lsum++;
-	  if (h==k) lsum++;
-	  if (j==k) lsum++;
+    if (a == b) lsum++;
+    if (a == c) lsum++;
+    if (a == d) lsum++;
+    if (a == e) lsum++;
+    if (a == f) lsum++;
+    if (a == g) lsum++;
+    if (a == h) lsum++;
+    if (a == j) lsum++;
+    if (a == k) lsum++;
+    if (b == c) lsum++;
+    if (b == d) lsum++;
+    if (b == e) lsum++;
+    if (b == f) lsum++;
+    if (b == g) lsum++;
+    if (b == h) lsum++;
+    if (b == j) lsum++;
+    if (b == k) lsum++;
+    if (c == d) lsum++;
+    if (c == e) lsum++;
+    if (c == f) lsum++;
+    if (c == g) lsum++;
+    if (c == h) lsum++;
+    if (c == j) lsum++;
+    if (c == k) lsum++;
+    if (d == e) lsum++;
+    if (d == f) lsum++;
+    if (d == g) lsum++;
+    if (d == h) lsum++;
+    if (d == j) lsum++;
+    if (d == k) lsum++;
+    if (e == f) lsum++;
+    if (e == g) lsum++;
+    if (e == h) lsum++;
+    if (e == j) lsum++;
+    if (e == k) lsum++;
+    if (f == g) lsum++;
+    if (f == h) lsum++;
+    if (f == j) lsum++;
+    if (f == k) lsum++;
+    if (g == h) lsum++;
+    if (g == j) lsum++;
+    if (g == k) lsum++;
+    if (h == j) lsum++;
+    if (h == k) lsum++;
+    if (j == k) lsum++;
   }
-
-
-
 };
 
-int main (int argc, char* argv[]) {
-  Kokkos::initialize (argc, argv);
+int main(int argc, char* argv[]) {
+  Kokkos::initialize(argc, argv);
   const int n = 10000;
 
   // Compute and count hash collisions in
@@ -150,24 +147,26 @@ int main (int argc, char* argv[]) {
   // LaunchBounds functionality
   int sum1 = 0;
   int sum2 = 0;
-  
-  //Without LaunchBounds, the kernel uses 56 registers
-  Kokkos::parallel_reduce (n, collision (), sum1);
 
-  //With LaunchBounds, we can reduce the register usage to 32
-  Kokkos::parallel_reduce (Kokkos::RangePolicy<Kokkos::LaunchBounds<512,4>>(0,n), collision (), sum2);
+  // Without LaunchBounds, the kernel uses 56 registers
+  Kokkos::parallel_reduce(n, collision(), sum1);
 
-  printf ("Number of collisions, "
-          "computed in parallel, is %i\n", sum1);
+  // With LaunchBounds, we can reduce the register usage to 32
+  Kokkos::parallel_reduce(
+      Kokkos::RangePolicy<Kokkos::LaunchBounds<512, 4>>(0, n), collision(),
+      sum2);
+
+  printf(
+      "Number of collisions, "
+      "computed in parallel, is %i\n",
+      sum1);
 
   if (sum1 != sum2) {
-	  printf( "Uh-oh! Results do not match\n");
-	  return -1;
+    printf("Uh-oh! Results do not match\n");
+    return -1;
   }
 
   Kokkos::finalize();
-  
 
   return 0;
 }
-
diff --git a/lib/kokkos/example/virtual_functions/classes.cpp b/lib/kokkos/example/virtual_functions/classes.cpp
index 1b9d7cb385..9041f980ed 100644
--- a/lib/kokkos/example/virtual_functions/classes.cpp
+++ b/lib/kokkos/example/virtual_functions/classes.cpp
@@ -1,26 +1,16 @@
-#include<classes.hpp>
+#include <classes.hpp>
 
 KOKKOS_FUNCTION
-Foo::Foo() {
-  val = 0;
-} 
+Foo::Foo() { val = 0; }
 
 KOKKOS_FUNCTION
-Foo_1::Foo_1() {
-  val = 1;
-}
+Foo_1::Foo_1() { val = 1; }
 
 KOKKOS_FUNCTION
-int Foo_1::value() {
-  return val;  
-}
+int Foo_1::value() { return val; }
 
 KOKKOS_FUNCTION
-Foo_2::Foo_2() {
-  val = 2;
-}
+Foo_2::Foo_2() { val = 2; }
 
 KOKKOS_FUNCTION
-int Foo_2::value() {
-  return val;  
-}
+int Foo_2::value() { return val; }
diff --git a/lib/kokkos/example/virtual_functions/classes.hpp b/lib/kokkos/example/virtual_functions/classes.hpp
index 362c473ce6..4fa9f59502 100644
--- a/lib/kokkos/example/virtual_functions/classes.hpp
+++ b/lib/kokkos/example/virtual_functions/classes.hpp
@@ -1,39 +1,39 @@
 #ifndef KOKKOS_EXAMPLE_VIRTUAL_FUNCTIONS_CLASSES_HPP
 #define KOKKOS_EXAMPLE_VIRTUAL_FUNCTIONS_CLASSES_HPP
 
-#include<Kokkos_Core.hpp>
+#include <Kokkos_Core.hpp>
 
 class Foo {
-  protected:
-    int val;
-  public:
-    KOKKOS_FUNCTION
-    Foo();
+ protected:
+  int val;
 
-    KOKKOS_FUNCTION
-    virtual int value() { return 0; };
+ public:
+  KOKKOS_FUNCTION
+  Foo();
 
-    KOKKOS_FUNCTION
-    virtual ~Foo() {}
+  KOKKOS_FUNCTION
+  virtual int value() { return 0; };
+
+  KOKKOS_FUNCTION
+  virtual ~Foo() {}
 };
 
-class Foo_1: public Foo {
-  public:
-    KOKKOS_FUNCTION
-    Foo_1();
+class Foo_1 : public Foo {
+ public:
+  KOKKOS_FUNCTION
+  Foo_1();
 
-    KOKKOS_FUNCTION
-    int value();
+  KOKKOS_FUNCTION
+  int value();
 };
 
-class Foo_2: public Foo {
-  public:
-    KOKKOS_FUNCTION
-    Foo_2();
+class Foo_2 : public Foo {
+ public:
+  KOKKOS_FUNCTION
+  Foo_2();
 
-    KOKKOS_FUNCTION
-    int value();
+  KOKKOS_FUNCTION
+  int value();
 };
 
-#endif //KOKKOS_EXAMPLE_VIRTUAL_FUNCTIONS_CLASSES_HPP
-
+#endif  // KOKKOS_EXAMPLE_VIRTUAL_FUNCTIONS_CLASSES_HPP
diff --git a/lib/kokkos/example/virtual_functions/main.cpp b/lib/kokkos/example/virtual_functions/main.cpp
index a16e0cf73f..aaa7afb034 100644
--- a/lib/kokkos/example/virtual_functions/main.cpp
+++ b/lib/kokkos/example/virtual_functions/main.cpp
@@ -1,32 +1,34 @@
-#include<classes.hpp>
+#include <classes.hpp>
 
 int main(int argc, char* argv[]) {
-  Kokkos::initialize(argc,argv);
+  Kokkos::initialize(argc, argv);
 
   {
-    Foo* f_1 = (Foo*) Kokkos::kokkos_malloc(sizeof(Foo_1));
-    Foo* f_2 = (Foo*) Kokkos::kokkos_malloc(sizeof(Foo_2));
+    Foo* f_1 = (Foo*)Kokkos::kokkos_malloc(sizeof(Foo_1));
+    Foo* f_2 = (Foo*)Kokkos::kokkos_malloc(sizeof(Foo_2));
 
-    Kokkos::parallel_for("CreateObjects",1, KOKKOS_LAMBDA (const int&) {
-      new ((Foo_1*)f_1) Foo_1();
-      new ((Foo_2*)f_2) Foo_2();
-    });
+    Kokkos::parallel_for(
+        "CreateObjects", 1, KOKKOS_LAMBDA(const int&) {
+          new ((Foo_1*)f_1) Foo_1();
+          new ((Foo_2*)f_2) Foo_2();
+        });
 
-    int value_1,value_2;
-    Kokkos::parallel_reduce("CheckValues",1, KOKKOS_LAMBDA (const int&, int& lsum) {
-      lsum = f_1->value();
-    },value_1);
+    int value_1, value_2;
+    Kokkos::parallel_reduce(
+        "CheckValues", 1,
+        KOKKOS_LAMBDA(const int&, int& lsum) { lsum = f_1->value(); }, value_1);
 
-    Kokkos::parallel_reduce("CheckValues",1, KOKKOS_LAMBDA (const int&, int& lsum) {
-      lsum = f_2->value();
-    },value_2);
+    Kokkos::parallel_reduce(
+        "CheckValues", 1,
+        KOKKOS_LAMBDA(const int&, int& lsum) { lsum = f_2->value(); }, value_2);
 
-    printf("Values: %i %i\n",value_1,value_2);
+    printf("Values: %i %i\n", value_1, value_2);
 
-    Kokkos::parallel_for("DestroyObjects",1, KOKKOS_LAMBDA (const int&) {
-      f_1->~Foo();
-      f_2->~Foo();
-    });
+    Kokkos::parallel_for(
+        "DestroyObjects", 1, KOKKOS_LAMBDA(const int&) {
+          f_1->~Foo();
+          f_2->~Foo();
+        });
 
     Kokkos::kokkos_free(f_1);
     Kokkos::kokkos_free(f_2);
diff --git a/lib/kokkos/generate_makefile.bash b/lib/kokkos/generate_makefile.bash
index d401998a7d..7ef477b9f2 100755
--- a/lib/kokkos/generate_makefile.bash
+++ b/lib/kokkos/generate_makefile.bash
@@ -2,8 +2,6 @@
 
 KOKKOS_DEVICES=""
 
-KOKKOS_DO_EXAMPLES="1"
-
 while [[ $# > 0 ]]
 do
   key="$1"
@@ -12,9 +10,6 @@ do
     --kokkos-path*)
       KOKKOS_PATH="${key#*=}"
       ;;
-    --qthreads-path*)
-      QTHREADS_PATH="${key#*=}"
-      ;;
     --hpx-path*)
       HPX_PATH="${key#*=}"
       ;;
@@ -34,9 +29,6 @@ do
       KOKKOS_DEVICES="${KOKKOS_DEVICES},Cuda"
       CUDA_PATH="${key#*=}"
       ;;
-    --with-rocm)
-      KOKKOS_DEVICES="${KOKKOS_DEVICES},ROCm"
-      ;;
     --with-openmp)
       KOKKOS_DEVICES="${KOKKOS_DEVICES},OpenMP"
       ;;
@@ -46,12 +38,6 @@ do
     --with-serial)
       KOKKOS_DEVICES="${KOKKOS_DEVICES},Serial"
       ;;
-    --with-qthreads*)
-      KOKKOS_DEVICES="${KOKKOS_DEVICES},Qthreads"
-      if [ -z "$QTHREADS_PATH" ]; then
-        QTHREADS_PATH="${key#*=}"
-      fi
-      ;;
     --with-hpx-options*)
       KOKKOS_HPX_OPT="${key#*=}"
       ;;
@@ -93,9 +79,6 @@ do
       echo "Warning: ${key} is deprecated"
       echo "Call make with appropriate -j flag"
       ;;
-    --no-examples)
-      KOKKOS_DO_EXAMPLES="0"
-      ;;
     --compiler*)
       COMPILER="${key#*=}"
       CNUM=$(command -v ${COMPILER} 2>&1 >/dev/null | grep "no ${COMPILER}" | wc -l)
@@ -128,15 +111,12 @@ do
       echo "Kokkos configure options:"
       echo ""
       echo "--kokkos-path=/Path/To/Kokkos:        Path to the Kokkos root directory."
-      echo "--qthreads-path=/Path/To/Qthreads:    Path to Qthreads install directory."
-      echo "                                        Overrides path given by --with-qthreads."
       echo "--prefix=/Install/Path:               Path to install the Kokkos library."
       echo ""
       echo "--with-cuda[=/Path/To/Cuda]:          Enable Cuda and set path to Cuda Toolkit."
       echo "--with-openmp:                        Enable OpenMP backend."
       echo "--with-pthread:                       Enable Pthreads backend."
       echo "--with-serial:                        Enable Serial backend."
-      echo "--with-qthreads[=/Path/To/Qthreads]:  Enable Qthreads backend."
       echo "--with-devices:                       Explicitly add a set of backends."
       echo ""
       echo "--arch=[OPT]:  Set target architectures. Options are:"
@@ -197,7 +177,7 @@ do
       echo "                                disable_profiling = do not compile with profiling hooks"
       echo "                                "
       echo "--with-cuda-options=[OPT]:    Additional options to CUDA:"
-      echo "                                force_uvm, use_ldg, enable_lambda, rdc"
+      echo "                                force_uvm, use_ldg, enable_lambda, rdc, enable_constexpr"
       echo "--with-hpx-options=[OPT]:     Additional options to HPX:"
       echo "                                enable_async_dispatch"
       echo "--gcc-toolchain=/Path/To/GccRoot:  Set the gcc toolchain to use with clang (e.g. /usr)" 
@@ -232,7 +212,6 @@ fi
 KOKKOS_SRC_PATH=${KOKKOS_PATH}
 
 KOKKOS_SETTINGS="KOKKOS_SRC_PATH=${KOKKOS_SRC_PATH}"
-#KOKKOS_SETTINGS="KOKKOS_PATH=${KOKKOS_PATH}"
 
 # The double [[  ]] in the elif branch is not a typo
 if [ ${#COMPILER} -gt 0 ]; then
@@ -292,10 +271,6 @@ if [ ${#KOKKOS_USE_TPLS} -gt 0 ]; then
   KOKKOS_SETTINGS="${KOKKOS_SETTINGS} KOKKOS_USE_TPLS=${KOKKOS_USE_TPLS}"
 fi
 
-if [ ${#QTHREADS_PATH} -gt 0 ]; then
-  KOKKOS_SETTINGS="${KOKKOS_SETTINGS} QTHREADS_PATH=${QTHREADS_PATH}"
-fi
-
 if [ ${#HPX_PATH} -gt 0 ]; then
     KOKKOS_SETTINGS="${KOKKOS_SETTINGS} HPX_PATH=${HPX_PATH}"
 fi
@@ -318,18 +293,8 @@ fi
 
 KOKKOS_SETTINGS_NO_KOKKOS_PATH="${KOKKOS_SETTINGS}"
 
-KOKKOS_TEST_INSTALL_PATH="${PWD}/install"
-if [ ${#PREFIX} -gt 0 ]; then
-  KOKKOS_INSTALL_PATH="${PREFIX}"
-else
-  KOKKOS_INSTALL_PATH=${KOKKOS_TEST_INSTALL_PATH}
-fi
 
-mkdir -p install
 gen_makefile=Makefile.kokkos
-echo "#Makefile to satisfy existence of target kokkos-clean before installing the library" > install/${gen_makefile}
-echo "kokkos-clean:" >> install/${gen_makefile}
-echo "" >> install/${gen_makefile}
 mkdir -p core
 mkdir -p core/unit_test
 mkdir -p core/perf_test
@@ -346,10 +311,6 @@ mkdir -p example/fenl
 mkdir -p example/make_buildlink
 mkdir -p example/tutorial
 
-if [ ${#KOKKOS_ENABLE_EXAMPLE_ICHOL} -gt 0 ]; then
-  mkdir -p example/ichol
-fi
-
 KOKKOS_SETTINGS="${KOKKOS_SETTINGS_NO_KOKKOS_PATH} KOKKOS_PATH=${KOKKOS_PATH}"
 
 # Generate subdirectory makefiles.
@@ -408,8 +369,6 @@ echo "" >> algorithms/unit_tests/Makefile
 echo "clean:" >> algorithms/unit_tests/Makefile
 echo -e "\t\$(MAKE) -f ${KOKKOS_PATH}/algorithms/unit_tests/Makefile ${KOKKOS_SETTINGS} clean" >> algorithms/unit_tests/Makefile
 
-KOKKOS_SETTINGS="${KOKKOS_SETTINGS_NO_KOKKOS_PATH} KOKKOS_PATH=${KOKKOS_TEST_INSTALL_PATH}"
-
 echo "KOKKOS_SETTINGS=${KOKKOS_SETTINGS}" > example/fixture/Makefile
 echo "" >> example/fixture/Makefile
 echo "all:" >> example/fixture/Makefile
@@ -465,55 +424,16 @@ echo "" >> example/tutorial/Makefile
 echo "clean:" >> example/tutorial/Makefile
 echo -e "\t\$(MAKE) -f ${KOKKOS_PATH}/example/tutorial/Makefile KOKKOS_SETTINGS='${KOKKOS_SETTINGS}' KOKKOS_PATH=${KOKKOS_PATH} clean" >> example/tutorial/Makefile
 
-if [ ${#KOKKOS_ENABLE_EXAMPLE_ICHOL} -gt 0 ]; then
-echo "KOKKOS_SETTINGS=${KOKKOS_SETTINGS}" > example/ichol/Makefile
-echo "" >> example/ichol/Makefile
-echo "all:" >> example/ichol/Makefile
-echo -e "\t\$(MAKE) -f ${KOKKOS_PATH}/example/ichol/Makefile ${KOKKOS_SETTINGS}" >> example/ichol/Makefile
-echo "" >> example/ichol/Makefile
-echo "test: all" >> example/ichol/Makefile
-echo -e "\t\$(MAKE) -f ${KOKKOS_PATH}/example/ichol/Makefile ${KOKKOS_SETTINGS} test" >> example/ichol/Makefile
-echo "" >> example/ichol/Makefile
-echo "clean:" >> example/ichol/Makefile
-echo -e "\t\$(MAKE) -f ${KOKKOS_PATH}/example/ichol/Makefile ${KOKKOS_SETTINGS} clean" >> example/ichol/Makefile
-fi
-
-KOKKOS_SETTINGS="${KOKKOS_SETTINGS_NO_KOKKOS_PATH} KOKKOS_PATH=${KOKKOS_PATH}"
-
 # Generate top level directory makefile.
 echo "Generating Makefiles with options " ${KOKKOS_SETTINGS}
 echo "KOKKOS_SETTINGS=${KOKKOS_SETTINGS}" > Makefile
 echo "" >> Makefile
-echo "kokkoslib:" >> Makefile
-echo -e "\tcd core; \\" >> Makefile
-echo -e "\t\$(MAKE) -f ${KOKKOS_PATH}/core/src/Makefile ${KOKKOS_SETTINGS} PREFIX=${KOKKOS_INSTALL_PATH} build-lib" >> Makefile
-echo "" >> Makefile
-echo "install: kokkoslib" >> Makefile
-echo -e "\tcd core; \\" >> Makefile
-echo -e "\t\$(MAKE) -f ${KOKKOS_PATH}/core/src/Makefile ${KOKKOS_SETTINGS} PREFIX=${KOKKOS_INSTALL_PATH} install" >> Makefile
-echo "" >> Makefile
-echo "kokkoslib-test:" >> Makefile
-echo -e "\tcd core; \\" >> Makefile
-echo -e "\t\$(MAKE) -f ${KOKKOS_PATH}/core/src/Makefile ${KOKKOS_SETTINGS} PREFIX=${KOKKOS_TEST_INSTALL_PATH} build-lib" >> Makefile
-echo "" >> Makefile
-echo "install-test: kokkoslib-test" >> Makefile
-echo -e "\tcd core; \\" >> Makefile
-echo -e "\t\$(MAKE) -f ${KOKKOS_PATH}/core/src/Makefile ${KOKKOS_SETTINGS} PREFIX=${KOKKOS_TEST_INSTALL_PATH} install" >> Makefile
-echo "" >> Makefile
-echo "build-test: install-test" >> Makefile
+echo "build-test:" >> Makefile
 echo -e "\t\$(MAKE) -C core/unit_test" >> Makefile
 echo -e "\t\$(MAKE) -C core/perf_test" >> Makefile
 echo -e "\t\$(MAKE) -C containers/unit_tests" >> Makefile
 echo -e "\t\$(MAKE) -C containers/performance_tests" >> Makefile
 echo -e "\t\$(MAKE) -C algorithms/unit_tests" >> Makefile
-if [ ${KOKKOS_DO_EXAMPLES} -gt 0 ]; then
-$()
-echo -e "\t\$(MAKE) -C example/fixture" >> Makefile
-echo -e "\t\$(MAKE) -C example/feint" >> Makefile
-echo -e "\t\$(MAKE) -C example/fenl" >> Makefile
-echo -e "\t\$(MAKE) -C example/make_buildlink build" >> Makefile
-echo -e "\t\$(MAKE) -C example/tutorial build" >> Makefile
-fi
 echo "" >> Makefile
 echo "test: build-test" >> Makefile
 echo -e "\t\$(MAKE) -C core/unit_test test" >> Makefile
@@ -521,13 +441,6 @@ echo -e "\t\$(MAKE) -C core/perf_test test" >> Makefile
 echo -e "\t\$(MAKE) -C containers/unit_tests test" >> Makefile
 echo -e "\t\$(MAKE) -C containers/performance_tests test" >> Makefile
 echo -e "\t\$(MAKE) -C algorithms/unit_tests test" >> Makefile
-if [ ${KOKKOS_DO_EXAMPLES} -gt 0 ]; then
-echo -e "\t\$(MAKE) -C example/fixture test" >> Makefile
-echo -e "\t\$(MAKE) -C example/feint test" >> Makefile
-echo -e "\t\$(MAKE) -C example/fenl test" >> Makefile
-echo -e "\t\$(MAKE) -C example/make_buildlink test" >> Makefile
-echo -e "\t\$(MAKE) -C example/tutorial test" >> Makefile
-fi
 echo "" >> Makefile
 echo "unit-tests-only:" >> Makefile
 echo -e "\t\$(MAKE) -C core/unit_test test" >> Makefile
@@ -541,13 +454,4 @@ echo -e "\t\$(MAKE) -C core/perf_test clean" >> Makefile
 echo -e "\t\$(MAKE) -C containers/unit_tests clean" >> Makefile
 echo -e "\t\$(MAKE) -C containers/performance_tests clean" >> Makefile
 echo -e "\t\$(MAKE) -C algorithms/unit_tests clean" >> Makefile
-if [ ${KOKKOS_DO_EXAMPLES} -gt 0 ]; then
-echo -e "\t\$(MAKE) -C example/fixture clean" >> Makefile
-echo -e "\t\$(MAKE) -C example/feint clean" >> Makefile
-echo -e "\t\$(MAKE) -C example/fenl clean" >> Makefile
-echo -e "\t\$(MAKE) -C example/make_buildlink clean" >> Makefile
-echo -e "\t\$(MAKE) -C example/tutorial clean" >> Makefile
-fi
-echo -e "\tcd core; \\" >> Makefile
-echo -e "\t\$(MAKE) -f ${KOKKOS_PATH}/core/src/Makefile ${KOKKOS_SETTINGS} clean" >> Makefile
 
diff --git a/lib/kokkos/master_history.txt b/lib/kokkos/master_history.txt
index 3ec4306a9f..ee5238be8c 100644
--- a/lib/kokkos/master_history.txt
+++ b/lib/kokkos/master_history.txt
@@ -17,3 +17,4 @@ tag:  2.7.00     date: 05:24:2018    master: e01945d0    develop: 2d13f608
 tag:  2.7.24     date: 11:04:2018    master: d3a94192    develop: 7a06fc81
 tag:  2.8.00     date: 02:05:2019    master: 34931a36    develop: d1659d1d
 tag:  2.9.00     date: 06:24:2019    master: 5d6e7fb3    develop: 4c6cb80a
+tag:  3.0.00     date: 01:31:2020    master: 2983b80d    release-candidate-3.0: fdc904a6
diff --git a/lib/linalg/dlaed8.f b/lib/linalg/dlaed8.f
index c053347b10..f64679dc05 100644
--- a/lib/linalg/dlaed8.f
+++ b/lib/linalg/dlaed8.f
@@ -353,7 +353,7 @@
          Z( I ) = W( INDX( I ) )
    40 CONTINUE
 *
-*     Calculate the allowable deflation tolerence
+*     Calculate the allowable deflation tolerance
 *
       IMAX = IDAMAX( N, Z, 1 )
       JMAX = IDAMAX( N, D, 1 )
diff --git a/lib/linalg/dlalsa.f b/lib/linalg/dlalsa.f
index b643f11c0b..478ee24b0e 100644
--- a/lib/linalg/dlalsa.f
+++ b/lib/linalg/dlalsa.f
@@ -43,7 +43,7 @@
 *>
 *> \verbatim
 *>
-*> DLALSA is an itermediate step in solving the least squares problem
+*> DLALSA is an intermediate step in solving the least squares problem
 *> by computing the SVD of the coefficient matrix in compact form (The
 *> singular vectors are computed as products of simple orthorgonal
 *> matrices.).
diff --git a/lib/linalg/dlasd7.f b/lib/linalg/dlasd7.f
index e0ddedeb57..66f665cf88 100644
--- a/lib/linalg/dlasd7.f
+++ b/lib/linalg/dlasd7.f
@@ -400,7 +400,7 @@
          VL( I ) = VLW( IDXI )
    50 CONTINUE
 *
-*     Calculate the allowable deflation tolerence
+*     Calculate the allowable deflation tolerance
 *
       EPS = DLAMCH( 'Epsilon' )
       TOL = MAX( ABS( ALPHA ), ABS( BETA ) )
diff --git a/lib/linalg/iparam2stage.F b/lib/linalg/iparam2stage.F
index 60bd0b696b..ecf30dbea8 100644
--- a/lib/linalg/iparam2stage.F
+++ b/lib/linalg/iparam2stage.F
@@ -87,14 +87,14 @@
 *>
 *> \param[in] NBI
 *> \verbatim
-*>          NBI is INTEGER which is the used in the reduciton, 
+*>          NBI is INTEGER which is the used in the reduction,
 *           (e.g., the size of the band), needed to compute workspace
 *           and LHOUS2.
 *> \endverbatim
 *>
 *> \param[in] IBI
 *> \verbatim
-*>          IBI is INTEGER which represent the IB of the reduciton,
+*>          IBI is INTEGER which represent the IB of the reduction,
 *           needed to compute workspace and LHOUS2.
 *> \endverbatim
 *>
@@ -130,7 +130,7 @@
 *>  of 2011 International Conference for High Performance Computing,
 *>  Networking, Storage and Analysis (SC '11), New York, NY, USA,
 *>  Article 8 , 11 pages.
-*>  http://doi.acm.org/10.1145/2063384.2063394
+*>  https://doi.acm.org/10.1145/2063384.2063394
 *>
 *>  A. Haidar, J. Kurzak, P. Luszczek, 2013.
 *>  An improved parallel singular value algorithm and its implementation 
@@ -138,7 +138,7 @@
 *>  for High Performance Computing, Networking, Storage and Analysis (SC '13).
 *>  Denver, Colorado, USA, 2013.
 *>  Article 90, 12 pages.
-*>  http://doi.acm.org/10.1145/2503210.2503292
+*>  https://doi.acm.org/10.1145/2503210.2503292
 *>
 *>  A. Haidar, R. Solca, S. Tomov, T. Schulthess and J. Dongarra.
 *>  A novel hybrid CPU-GPU generalized eigensolver for electronic structure 
diff --git a/lib/message/README b/lib/message/README
index dafb94e9ef..e6e7d2103d 100644
--- a/lib/message/README
+++ b/lib/message/README
@@ -2,7 +2,7 @@ This directory contains the CSlib library which is required
 to use the MESSAGE package and its client/server commands
 in a LAMMPS input script.
 
-The CSlib libary is included in the LAMMPS distribution.  A fuller
+The CSlib library is included in the LAMMPS distribution.  A fuller
 version including documentation and test programs is available at
 http://cslib.sandia.gov.  It was developed by Steve Plimpton at Sandia
 National Laboratories.
diff --git a/lib/molfile/molfile_plugin.h b/lib/molfile/molfile_plugin.h
index c79e7a5abf..057c403369 100644
--- a/lib/molfile/molfile_plugin.h
+++ b/lib/molfile/molfile_plugin.h
@@ -662,7 +662,7 @@ typedef struct {
                     int **bondtype, int *nbondtypes, char ***bondtypename);
 
   /**
-   * XXX this function will be augmented and possibly superceded by a
+   * XXX this function will be augmented and possibly superseded by a
    *     new QM-capable version named read_timestep(), when finished.
    *
    * Read the next timestep from the file.  Return MOLFILE_SUCCESS, or
diff --git a/lib/plumed/Install.py b/lib/plumed/Install.py
index 668e681b3c..b6b00d1511 100644
--- a/lib/plumed/Install.py
+++ b/lib/plumed/Install.py
@@ -17,7 +17,7 @@ parser = ArgumentParser(prog='Install.py',
 
 # settings
 
-version = "2.5.3"
+version = "2.6.0"
 mode = "static"
 
 # help message
@@ -46,6 +46,8 @@ checksums = { \
         '2.5.1' : 'c2a7b519e32197a120cdf47e0f194f81', \
         '2.5.2' : 'bd2f18346c788eb54e1e52f4f6acf41a', \
         '2.5.3' : 'de30d6e7c2dcc0973298e24a6da24286', \
+        '2.5.4' : 'f31b7d16a4be2e30aa7d5c19c3d37853', \
+        '2.6.0' : '204d2edae58d9b10ba3ad460cad64191', \
         }
 
 # parse and process arguments
diff --git a/lib/plumed/README b/lib/plumed/README
index 0d5f52f6b2..6b9b22bbce 100644
--- a/lib/plumed/README
+++ b/lib/plumed/README
@@ -3,7 +3,7 @@ to use the PLUMED package and its fix plumed command in a
 LAMMPS input script.  PLUMED should only be downloaded into this directory if
 you wish to statically link the library.  If you wish to link PLUMED as
 a dynamic library (as we recommend) then you can compile and build PLUMED
-separately to LAMMPS.  To use PLUMED in conjuction with LAMMPS you then simply
+separately to LAMMPS.  To use PLUMED in conjunction with LAMMPS you then simply
 need to ensure that the PLUMED library is in your path at runtime.
 
 More info about the PLUMED library can be found at http://www.plumed.org.
diff --git a/lib/poems/SystemProcessor.h b/lib/poems/SystemProcessor.h
index 3be168c34d..f376890e99 100644
--- a/lib/poems/SystemProcessor.h
+++ b/lib/poems/SystemProcessor.h
@@ -124,7 +124,7 @@ POEMSChain * SystemProcessor::AddNewChain(POEMSNode * currentNode){
 		return NULL;
 	}
 	int * tmp;
-	POEMSNode * nextNode = NULL;	//nextNode stores the proposed next node to add to the chain.  this will be checked to make sure no backtracking is occuring before being assigned as the current node.
+	POEMSNode * nextNode = NULL;	//nextNode stores the proposed next node to add to the chain.  this will be checked to make sure no backtracking is occurring before being assigned as the current node.
 	POEMSChain * newChain = new POEMSChain;	//make a new POEMSChain object.  This will be the object returned
 
 	if(currentNode->links.GetNumElements() == 0)	//if we have no links from this node, then the whole chain is only one node.  Add this node to the chain and return it; mark node as visited for future reference
@@ -226,7 +226,7 @@ bool SystemProcessor::setLinkVisited(POEMSNode * firstNode, POEMSNode * secondNo
 	//cout << "Checking link between nodes " << firstNode->idNumber << " and " << secondNode->idNumber << "... ";
 	ListElement<POEMSNode> * tmp = firstNode->links.GetHeadElement();	//get the head element of the list of pointers for node 1
 	ListElement<bool> * tmp2 = firstNode->taken.GetHeadElement();		//get the head element of the list of bool isVisited flags for node 1
-	while(tmp->value != NULL || tmp2->value != NULL)					//go through untill we reach the end of the lists
+	while(tmp->value != NULL || tmp2->value != NULL)					//go through until we reach the end of the lists
 	{
 		if(tmp->value == secondNode)							//if we find the link to the other node
 		{
diff --git a/lib/poems/fastmatrixops.h b/lib/poems/fastmatrixops.h
index e7ccdbd0ca..c7e29f8903 100644
--- a/lib/poems/fastmatrixops.h
+++ b/lib/poems/fastmatrixops.h
@@ -38,7 +38,7 @@ void FastLUSubs(Mat3x3& LU, Matrix& B, Matrix& C, int *indx); // Appropriate For
 void FastLUSubs(Mat4x4& LU, Matrix& B, Matrix& C, int *indx); // Appropriate Forward and Back Substitution
 void FastLUSubs(Mat6x6& LU, Matrix& B, Matrix& C, int *indx); // Appropriate Forward and Back Substitution
 // The following LUSubsLH routine is incomplete at the moment.
-void FastLUSubsLH(Matrix& B, Matrix& LU, Matrix& C, int *indx); // Appropriate Forward and Back Subsitution
+void FastLUSubsLH(Matrix& B, Matrix& LU, Matrix& C, int *indx); // Appropriate Forward and Back Substitution
 void FastTripleSum(Vect3& a, Vect3& b, Vect3& c, Vect3& d); // d = a+b+c
 void FastTripleSumPPM(Vect3& a, Vect3& b, Vect3& c, Vect3& d); // d = a+b-c
 
diff --git a/lib/poems/joint.cpp b/lib/poems/joint.cpp
index 3bdd7b5fcd..3477c7e336 100644
--- a/lib/poems/joint.cpp
+++ b/lib/poems/joint.cpp
@@ -186,12 +186,12 @@ Mat3x3* Joint::Get_kCpk(){
 }
 
 Matrix Joint::GetForward_sP(){
-  cerr << "ERROR: Forward Spatial Partial Velocity is not suported for joint type " << GetType() << endl;
+  cerr << "ERROR: Forward Spatial Partial Velocity is not supported for joint type " << GetType() << endl;
   exit(0);
 }
 
 Matrix Joint::GetBackward_sP(){
-  cerr << "ERROR: Backward Spatial Partial Velocity is not suported for joint type " << GetType() << endl;
+  cerr << "ERROR: Backward Spatial Partial Velocity is not supported for joint type " << GetType() << endl;
   exit(0);
 }
 
diff --git a/lib/poems/matrixfun.cpp b/lib/poems/matrixfun.cpp
index d193114679..9aa2818555 100644
--- a/lib/poems/matrixfun.cpp
+++ b/lib/poems/matrixfun.cpp
@@ -209,7 +209,7 @@ Matrix operator+ (const VirtualMatrix &A, const VirtualMatrix &B){      // addit
 	Bcols = B.GetNumCols();
 
 	if( !((Arows == Brows) && (Acols == Bcols)) ){
-		cerr << "Dimesion mismatch in matrix addition" << endl;
+		cerr << "Dimension mismatch in matrix addition" << endl;
 		exit(1);
 	}
 
@@ -234,7 +234,7 @@ Matrix operator- (const VirtualMatrix &A, const VirtualMatrix &B){      // subtr
 	Bcols = B.GetNumCols();
 
 	if( !((Arows == Brows) && (Acols == Bcols)) ){
-		cerr << "Dimesion mismatch in matrix addition" << endl;
+		cerr << "Dimension mismatch in matrix addition" << endl;
 		exit(1);
 	}
 
@@ -259,7 +259,7 @@ Matrix operator* (const VirtualMatrix &A, const VirtualMatrix &B){      // multi
 	Bcols = B.GetNumCols();
 
 	if(Acols != Brows){
-		cerr << "Dimesion mismatch in matrix multiplication" << endl;
+		cerr << "Dimension mismatch in matrix multiplication" << endl;
 		exit(1);
 	}
 
diff --git a/lib/poems/poemstree.h b/lib/poems/poemstree.h
index 8f8e80ab66..70750d4019 100644
--- a/lib/poems/poemstree.h
+++ b/lib/poems/poemstree.h
@@ -455,7 +455,7 @@ void Tree::Delete(const int& item)
 	TreeNode *DNodePtr, *PNodePtr, *RNodePtr;
 
 	// search for a node containing data value item. obtain its
-	// node adress and that of its parent
+	// node address and that of its parent
 	if ((DNodePtr = FindNode (item, PNodePtr)) == NULL)
 		return;
 
@@ -575,8 +575,8 @@ TreeNode *Tree::CopyTree(TreeNode *t)
 }
 
 
-// us the postorder scanning algorithm to traverse the nodes in
-// the tree and delete each node as the vist operation
+// use the postorder scanning algorithm to traverse the nodes in
+// the tree and delete each node at the visit operation
 void Tree::DeleteTree(TreeNode *t)
 {
   if (t != NULL) {
diff --git a/lib/qmmm/Makefile.gfortran b/lib/qmmm/Makefile.gfortran
index 717922b4b6..9b43d2eaa0 100644
--- a/lib/qmmm/Makefile.gfortran
+++ b/lib/qmmm/Makefile.gfortran
@@ -7,9 +7,9 @@ EXTRAMAKE = Makefile.lammps.empty
 QETOPDIR=$(HOME)/compile/espresso
 
 # import compiler settings from Quantum ESPRESSO
-sinclude $(QETOPDIR)/make.sys
+sinclude $(QETOPDIR)/make.inc
 
-# FLAGS for c++ OpenMPI 1.8.8 or later when QE was compiled with GNU Fortran 4.x
+# FLAGS for c++ OpenMPI 3.x.x or later when QE was compiled with GNU Fortran 6.x or 7.x
 MPICXX=mpicxx
 MPICXXFLAGS=-DOMPI_SKIP_MPICXX=1 -O2 -Wall -g -fPIC\
 	-I../../src -I$(QETOPDIR)/COUPLE/include
@@ -24,13 +24,21 @@ $(QETOPDIR)/Modules/libqemod.a
 # part 2: lo-level libraries for all of Q-E
 LIBOBJS = \
 $(QETOPDIR)/FFTXlib/libqefft.a \
+$(QETOPDIR)/dft-d3/libdftd3qe.a  \
+$(QETOPDIR)/KS_Solvers/PPCG/libppcg.a  \
+$(QETOPDIR)/KS_Solvers/CG/libcg.a  \
+$(QETOPDIR)/KS_Solvers/Davidson/libdavid.a  \
+$(QETOPDIR)/UtilXlib/libutil.a   \
 $(QETOPDIR)/LAXlib/libqela.a   \
 $(QETOPDIR)/clib/clib.a   \
 $(QETOPDIR)/iotk/src/libiotk.a
+# foxlibs
+
+LIBS += -L${QETOPDIR}/FoX/lib -lFoX_dom -lFoX_sax -lFoX_wxml -lFoX_common -lFoX_utils -lFoX_fsys -L${LAPACK_LIB} -L${BLAS_LIB} -llapack -lblas 
 
 # part 3: add-on libraries and main library for LAMMPS
 sinclude ../../src/Makefile.package
-LAMMPSCFG = openmpi-omp
+LAMMPSCFG = mpi
 LAMMPSLIB = ../../src/liblammps_$(LAMMPSCFG).a
 
 # part 4: local QM/MM library and progams
diff --git a/lib/qmmm/Makefile.gfortran-cmake b/lib/qmmm/Makefile.gfortran-cmake
new file mode 100644
index 0000000000..7a467a5e1c
--- /dev/null
+++ b/lib/qmmm/Makefile.gfortran-cmake
@@ -0,0 +1,82 @@
+# -*- Makefile -*- for coupling LAMMPS to PWscf for QM/MM molecular dynamics
+# adapted for the case of compiling LAMMPS with CMake. This assumes that
+# LAMMPS was configured to build a shared library and installed with "make install"
+# as it used the PKG config configuration file. You may need to extend
+# the PKG_CONFIG_PATH environment variable to have pkgconf find the liblammps.pc file.
+# This is set up for using GNU Fortran and OpenMPI to compile both LAMMPS and QE
+
+# this file will be copied to Makefile.lammps
+EXTRAMAKE = Makefile.lammps.empty
+
+# top level directory of Quantum ESPRESSO 6.3 or later (tested up to QE 6.5)
+QETOPDIR=$(HOME)/compile/espresso
+
+# import compiler settings from Quantum ESPRESSO
+sinclude $(QETOPDIR)/make.inc
+
+# FLAGS for compiling and linking the pwqmmm.x executable
+MPICXX=mpicxx
+MPICXXFLAGS=-DOMPI_SKIP_MPICXX=1 -O2 -Wall -g -fPIC\
+	-I../../src -I$(QETOPDIR)/COUPLE/include
+
+# location of required libraries
+# part 1: hi-level libraries for building pw.x
+PWOBJS = \
+$(QETOPDIR)/COUPLE/src/libqecouple.a \
+$(QETOPDIR)/PW/src/libpw.a \
+$(QETOPDIR)/Modules/libqemod.a
+# part 2: lo-level libraries for all of Q-E
+LIBOBJS = \
+$(QETOPDIR)/FFTXlib/libqefft.a \
+$(QETOPDIR)/dft-d3/libdftd3qe.a  \
+$(QETOPDIR)/KS_Solvers/PPCG/libppcg.a  \
+$(QETOPDIR)/KS_Solvers/CG/libcg.a  \
+$(QETOPDIR)/KS_Solvers/Davidson/libdavid.a  \
+$(QETOPDIR)/UtilXlib/libutil.a   \
+$(QETOPDIR)/LAXlib/libqela.a   \
+$(QETOPDIR)/clib/clib.a   \
+$(QETOPDIR)/iotk/src/libiotk.a
+
+# add support for fortran runtimes for compiler and MPI library
+# those are automatically included when linking QE executables,
+# since they use mpifort/mpif90 to link, but we are using the
+# C++ MPI compiler wrapper instead, so those need to be added
+# as a dependency for QE objects and libraries
+QELIBS +=  -lgfortran -lmpi_mpifh
+
+# part 3: add-on libraries and main library for LAMMPS
+sinclude ../../src/Makefile.package
+LAMMPSFLAGS = $(shell pkgconf liblammps --cflags)
+LAMMPSLIB   = $(shell pkgconf liblammps --libs)
+
+# part 4: local QM/MM library and progams
+SRC=pwqmmm.c libqmmm.c
+OBJ=$(SRC:%.c=%.o)
+
+
+default: libqmmm.a
+
+all : tldeps libqmmm.a pwqmmm.x
+
+pwqmmm.x : pwqmmm.o $(PWOBJS) $(LIBOBJS)
+	$(MPICXX) $(LDFLAGS) -o $@ $^ $(LAMMPSLIB) $(QELIBS) $(LIBS) 
+
+libqmmm.a: libqmmm.o
+	$(AR) $(ARFLAGS) $@ $^
+	@cp $(EXTRAMAKE) Makefile.lammps
+
+%.o: %.c
+	$(MPICXX) -c $(LAMMPSFLAGS) $(MPICXXFLAGS) $< -o $@
+
+tldeps:
+	( cd $(QETOPDIR) ; $(MAKE) $(MFLAGS) couple || exit 1)
+	$(MAKE) -C ../../src $(MFLAGS) $(LAMMPSCFG)
+	$(MAKE) -C ../../src $(MFLAGS) mode=lib $(LAMMPSCFG)
+
+clean :
+	-rm -f *.x *.o *.a *~ *.F90 *.d *.mod *.i *.L
+
+# explicit dependencies
+
+pwqmmm.o: pwqmmm.c libqmmm.h
+libqmmm.o: libqmmm.c libqmmm.h
diff --git a/lib/qmmm/Makefile.ifort b/lib/qmmm/Makefile.ifort
index d03e67b8a0..1a4f4b600e 100644
--- a/lib/qmmm/Makefile.ifort
+++ b/lib/qmmm/Makefile.ifort
@@ -3,17 +3,20 @@
 # this file will be copied to Makefile.lammps
 EXTRAMAKE = Makefile.lammps.empty
 
-# top level directory of Quantum ESPRESSO 5.4.1 or later
+# top level directory of Quantum ESPRESSO 6.4 or later
 QETOPDIR=$(HOME)/compile/espresso
 
 # import compiler settings from Quantum ESPRESSO
-sinclude $(QETOPDIR)/make.sys
+sinclude $(QETOPDIR)/make.inc
 
 # FLAGS for c++ with IntelMPI when QE was compiled with Intel Fortran
-MPICXX=icpc
-MPICXXFLAGS=-DOMPI_SKIP_MPICXX=1 -O2 -Wall -g -fPIC\
-        -I../../src -I$(QETOPDIR)/COUPLE/include -I${INTELMPI_HOME}/include64
-MPILIBS=-openmp  -L${INTELMPI_HOME}/lib64  -lz  -lifcore -L$(I_MPI_ROOT)/lib64 -lmpi -lmpiif
+
+MPICXX=mpiicpc
+MPICXXFLAGS=-DOMPI_SKIP_MPICXX=1 -DFC_ABORT_ARG -O2 -Wall -g -fPIC -I${INTEL_HOME}/include -I${INTELMPI_HOME}/include64 \
+        -I../../src -I$(QETOPDIR)/COUPLE/include   -I$(QETOPDIR)/LAXlib -I$(QETOPDIR)/UtilXlib -I$(QETOPDIR)/FoX/finclude -tbb
+
+MPILIBS=-qopenmp  -L${INTELMPI_HOME}/lib64  -lz  -lifcore -lifport -L$(I_MPI_ROOT)/lib64 -lmpi -lmpifort
+
 
 # location of required libraries
 # part 1: hi-level libraries for building pw.x
@@ -24,13 +27,20 @@ $(QETOPDIR)/Modules/libqemod.a
 # part 2: lo-level libraries for all of Q-E
 LIBOBJS = \
 $(QETOPDIR)/FFTXlib/libqefft.a \
+$(QETOPDIR)/dft-d3/libdftd3qe.a  \
+$(QETOPDIR)/KS_Solvers/PPCG/libppcg.a  \
+$(QETOPDIR)/KS_Solvers/CG/libcg.a  \
+$(QETOPDIR)/KS_Solvers/Davidson/libdavid.a  \
+$(QETOPDIR)/UtilXlib/libutil.a   \
 $(QETOPDIR)/LAXlib/libqela.a   \
 $(QETOPDIR)/clib/clib.a   \
 $(QETOPDIR)/iotk/src/libiotk.a
+# foxlibs
 
+LIBS += -L${QETOPDIR}/FoX/lib -lFoX_dom -lFoX_sax -lFoX_wxml -lFoX_common -lFoX_utils -lFoX_fsys  -mkl  -ltbbmalloc
 # part 3: add-on libraries and main library for LAMMPS
 sinclude ../../src/Makefile.package
-LAMMPSCFG = galileo-omp
+LAMMPSCFG =intel_cpu
 LAMMPSLIB = ../../src/liblammps_$(LAMMPSCFG).a
 
 # part 4: local QM/MM library and progams
diff --git a/lib/qmmm/README b/lib/qmmm/README
index 2746c9e86e..196aa4d7e0 100644
--- a/lib/qmmm/README
+++ b/lib/qmmm/README
@@ -1,10 +1,11 @@
 QM/MM support library
+=====================
 
 Axel Kohlmeyer, akohlmey@gmail.com
 Temple University, Philadelphia and ICTP, Trieste
 
 with contributions by
-Carlo Cavazzoni & Mariella Ippolito
+Mariella Ippolito & Carlo Cavazzoni
 Cineca, Italy
 
 This library provides  the basic glue code to combine LAMMPS with the
@@ -13,28 +14,27 @@ performing QM/MM molecular dynamics simulations.  More information on
 Quantum ESPRESSO can be found at: http://www.quantum-espresso.org
 
 The interface code itself is designed so it can also be combined with
-other QM codes, however only support for Quantum ESPRESSO is currently
-the only option. Adding support for a different QM code will require
-to write a new version of the top-level wrapper code, pwqmmm.c, and
-also an interface layer into the QM code similar to the one in QE.
+other QM codes, however coupling to Quantum ESPRESSO is currently the
+only available option. Adding support for a different QM code will
+require to write a new version of the top-level wrapper code, pwqmmm.c,
+and also an interface layer into the QM code similar to the one in QE.
 
-You can type "make lib-qmmm" from the src directory to see help on how
-to build this library (steps 1 and 2 below) via make commands, or you
-can do the same thing by typing "python Install.py" from within this
-directory, or you can do it manually by following the instructions
-below.
+LAMMPS has support for two build systems, the traditional make based
+one and a newer one based on CMake.  You have to build LAMMPS as a
+library with the USER-QMMM package included and for that you need to
+also build the libqmmm.a library in this folder.
 
-However you perform steps 1 and 2, you will need to perform steps 3
-and 4 manually, as outlined below.
+Below you will find some description of the steps needed in either case.
+However you build LAMMPS and the liblammps and libqmmm libraries, you
+will need to perform the remaining steps manually, as outlined below.
 
 -------------------------------------------------
 
-WARNING: This is experimental code under developement and is provided
-at this early stage to encourage others to write interfaces to other
-QM codes. Please test *very* carefully before using this software for
-production calculations. At the time of the last update of this README
-(July 2016) you have to download a QE snapshot (revision 12611) from
-the QE subversion repository.
+WARNING: This is code depending on two software packages that are
+independently maitained and are under continuous active development.
+It is thus much easier to break the QM/MM interface without noticing.
+Thus please test *very* carefully before using this software for
+production calculations. 
 
 At this point, both mechanical and multipole based electrostatic
 coupling have been successfully tested on a cluster of water
@@ -42,17 +42,92 @@ molecules as included in the two example folders.
 
 -------------------------------------------------
 
-Building the QM/MM executable has to be done in multiple stages.
+Building the QM/MM executable has to be done in multiple stages
+
+Building with CMake for LAMMPS
+==============================
+
+Step 1)
+
+Go to the top-level folder of the LAMMPS source code and create
+a custom build folder (e.g. build-qmmm) and create a suitable
+build configuration with CMake:
+
+  mkdir build-qmmm
+  cd build-qmmm
+  cmake -C ../cmake/presets/minimal.cmake -D PKG_USER-QMMM=yes \
+           -D BUILD_LIB=yes -DBUILD_SHARED_LIBS=yes ../cmake
+  make
+  make install
+
+This will build a LAMMPS executable "lmp" and a shared library
+"liblammps.so" and install them and additional configuration and
+supporting files into the ${HOME}/.local directory tree (unless
+you set -D CMAKE_INSTALL_PREFIX to a different location).  If the
+installation is not into a system folder, you need to update
+the LD_LIBRARY_PATH and PKG_CONFIG_PATH environment variables.
+
+  LD_LIBRARY_PATH=${LD_LIBRARY_PATH-/usr/lib64}:${HOME}/.local/lib64
+  PKG_CONFIG_PATH=${PKG_CONFIG_PATH-/usr/lib64/pkgconfig}:${HOME}/.local/lib64/pkgconfig
+  export LD_LIBRARY_PATH PKG_CONFIG_PATH
+
+The standalone LAMMPS executable is not capable of doing QM/MM
+calculations itself, but it will be needed to run all MM calculations
+for equilibration and testing and also to confirm that the classical
+part of the code is set up correctly.
+
+Step 2)
+
+Build a standalone pw.x executable from source code in the Quantum
+ESPRESSO directory and also make the "couple" target. This is typically
+done with:
+
+  ./configure
+  make pw couple
+
+You may need to review and edit the make.inc file created by configure.
+Make certain, that both LAMMPS and QE use the same MPI library and
+compatible compilers. In the examples here we assume GNU compilers
+(gfortran, gcc, g++) and OpenMPI.
+
+Building the standalone pw.x binary is needed to confirm that
+corresponding QM input is working correctly and to run test calculations
+on the QM atoms only.
+
+Step 3)
+
+Go back to this folder (lib/qmmm) and now review the file
+Makefile.gfortran-cmake and make adjustments to the makefile variables
+according to the comments in the file.  You probably need to adjust
+the QETOPDIR variable to point to the location of your QE
+compilation/installation.
+Please also check that the command "pkgconf liblammps --libs" works.
+Then you should be able to compile the QM/MM executable with:
+
+  make -f Makefile.gfortran-cmake pwqmmm.x
+
+If this is successful, you should be able to run a QM/MM calculation
+and can try the examples in the example-mc and example-ec folders:
+
+  mpirun -np 4 ../pwqmmm.x qmmm.inp 2
+
+
+Building with traditional make for LAMMPS
+=========================================
+
 
 Step 1) 
-Build the qmmm coupling library in this directory using one of the
-provided Makefile.<compiler> files or create your own, specific to
-your compiler and system.  For example with:
 
-make -f Makefile.gfortran
+Go to src folder under the top-level folder of the LAMMPS source code
+and build the qmmm coupling library in this directory using one of
+the provided Makefile.<compiler> files. E.g. for use with GNU fortran:
 
+  make lib-qmmm args="-m gfortran"
+
+This file is specific to your compiler and system. You may need to
+create a specific one for your choice of compilers, MPI, and OS.
 When you are done building this library, two new files should
-exist in this directory:
+exist in this directory (lib/qmmm):
 
 libqmmm.a		the library LAMMPS will link against
 Makefile.lammps		settings the LAMMPS Makefile will import
@@ -62,26 +137,42 @@ Makefile.lammps.empty file. Currently no additional dependencies for
 this library exist.
 
 Step 2)
+
 Build a standalone LAMMPS executable as described in the LAMMPS 
 documentation and include the USER-QMMM package. This executable
 is not functional for QM/MM, but it will usually be needed to
 run all MM calculations for equilibration and testing and also
 to confirm that the classical part of the code is set up correctly.
+Also build a the LAMMPS library.  This can be a static library
+or a shared library.  For example for a static library with the
+minimum set of packages required for the examples here:
+
+  make yes-molecule yes-kspace yes-rigid yes-user-qmmm
+  make mpi
+  make mode=lib mpi
 
 Step 3)
-Build a standalone pw.x executable in the Quantum ESPRESSO directory
-and also make the "couple" target. At the time of this writing 
-(July 2016) you have to download a QE snapshot (revision 12611)
-from the SVN repository, since no official release with the
-completed QM/MM support code has been made available yet. The current
-plan is to have a usable QM/MM interface released with the next
-Quantum ESPRESSO release version 6.0. Building the standalone pw.x
-binary is also needed to confirm that corresponding QM input is
-working correctly and to run test calculations on QM atoms only.
+
+Build a standalone pw.x executable from source code in the Quantum
+ESPRESSO directory and also make the "couple" target. This is typically
+done with:
+
+  ./configure
+  make pw couple
+
+You may need to review and edit the make.inc file created by configure.
+Make certain, that both LAMMPS and QE use the same MPI library and
+compatible compilers. In the examples here we assume GNU compilers
+(gfortran, gcc, g++) and OpenMPI.
+
+Building the standalone pw.x binary is needed to confirm that
+corresponding QM input is working correctly and to run test calculations
+on the QM atoms only.
 
 Step 4)
+
 To compile and link the final QM/MM executable, which combines the
-compiled sources from both packages, you have to return to the lib/qmmm
+compiled code from both packages, you have to return to the lib/qmmm
 directory and now edit the Makefile.<compiler> for the Makefile 
 configuration used to compile LAMMPS and also update the directory
 and library settings for the Quantum ESPRESSO installation.
diff --git a/lib/scafacos/README b/lib/scafacos/README
index e5f1ecd92c..86335d9f98 100644
--- a/lib/scafacos/README
+++ b/lib/scafacos/README
@@ -3,7 +3,7 @@ is required to use the KSPACE scafacos and its kspace_style
 scafacos command in a LAMMPS input script.
 
 The ScaFaCoS library is available at http://scafacos.de or
-on github at https://github.com/scafacos, the libary was
+on github at https://github.com/scafacos, the library was
 developed by a consortium of different universities in
 Germany (Bonn, Chemnitz, Stuttgart, Wuppertal) and
 the Research Centre Juelich (Juelich Supercomputing Centre).
@@ -47,17 +47,17 @@ Instructions:
                                     are: direct, ewald, fmm, p2nfft
                                     The other solvers might work, but support
                                     is purely experimental at the moment. To
-                                    give a list of solvers, use a comma seperated
+                                    give a list of solvers, use a comma separated
                                     list.
       --fcs-disable-doc:            disables the compilation of the documentation,
                                     e.g. if no Latex is available on the system.
 
 4.) To build the library after configuration, run 'make' from the base folder.
 
-5.) To install the libray in the designated installation folder, run 'make install'.
+5.) To install the library in the designated installation folder, run 'make install'.
     Installation is required, as ScaFaCoS does not support an in-source build!
 
-6.) Create two soft links to this directory (lib/scafacos) to where the libary
+6.) Create two soft links to this directory (lib/scafacos) to where the library
     is installed. E.g. if you built ScaFaCoS in the default install directory:
       % ln -s /usr/local/include includelink
       % ln -s /usr/local/lib liblink
diff --git a/potentials/AlSiMgCuFe.meam b/potentials/AlSiMgCuFe.meam
index 30f1c78df8..bbc8894a04 100644
--- a/potentials/AlSiMgCuFe.meam
+++ b/potentials/AlSiMgCuFe.meam
@@ -1,7 +1,7 @@
 # DATE: 2012-06-29 CONTRIBUTOR: Greg Wagner, gjwagne@sandia.gov CITATION: Jelinek, Groh, Horstemeyer, Houze, Kim, Wagner, Moitra and Baskes, Phys Rev B, 85, 245102 (2012) 
 # MEAM Al, Si, Mg, Cu, Fe alloy potential
 # use with AlS SiS MgS CuS FeS from library.meam
-# http://dx.doi.org/10.1103/PhysRevB.85.245102
+# https://doi.org/10.1103/PhysRevB.85.245102
 
   Cmin(1,1,1) = 0.8
   repuls(1,1) = 0.1
diff --git a/potentials/BNCH-old.ILP b/potentials/BNCH-old.ILP
index 30219e2a1e..2830172a86 100644
--- a/potentials/BNCH-old.ILP
+++ b/potentials/BNCH-old.ILP
@@ -1,5 +1,5 @@
 # Interlayer Potential (ILP) for bilayer graphene/graphene, graphene/hBN and hBN/hBN junctions
-# The parameters below are fitted against the HSE + MBD DFT referece data from 3.1 A to 15 A.
+# The parameters below are fitted against the HSE + MBD DFT reference data from 3.1 A to 15 A.
 # Cite J. Chem.Theory Comput. 2016, 12, 2896-905 and J. Phys. Chem. C 2017, 121, 22826-22835. 
 
 #     beta  alpha  delta  epsilon   C      d      sR      reff     C6            S            rcut
diff --git a/potentials/BNCH.ILP b/potentials/BNCH.ILP
index ed58adf946..eb15c35e0b 100644
--- a/potentials/BNCH.ILP
+++ b/potentials/BNCH.ILP
@@ -1,5 +1,5 @@
 # Interlayer Potential (ILP) for bilayer graphene/graphene, graphene/hBN and hBN/hBN junctions
-# The parameters below are fitted against the HSE + MBD DFT referece data from 2.5 A to 15 A.
+# The parameters below are fitted against the HSE + MBD DFT reference data from 2.5 A to 15 A.
 # Cite as W. Ouyang, D. Mandelli, M. Urbakh and O. Hod, Nano Letters 18, 6009-6016 (2018).
 #
 # ----------------- Repulsion Potential ------------------++++++++++++++ Vdw Potential ++++++++++++++++************  
diff --git a/potentials/BNC_MBD_bulk.ILP b/potentials/BNC_MBD_bulk.ILP
index 9502e0a89a..9093f01447 100644
--- a/potentials/BNC_MBD_bulk.ILP
+++ b/potentials/BNC_MBD_bulk.ILP
@@ -1,5 +1,5 @@
 # Interlayer Potential (ILP) for graphite, bulk-hBN and their heterojunctions
-# The parameters below are fitted against the HSE + MBD DFT referece data from 2 A to 10 A.
+# The parameters below are fitted against the HSE + MBD DFT reference data from 2 A to 10 A.
 # Cite as W. Ouyang et al., J. Chem. Theory Comput. 16(1), 666-676 (2020).
 #
 # ------------------------------ Repulsion Potential --------------------++++++++++++++ Vdw Potential ++++++++++++++++************  
diff --git a/potentials/BNC_TS_bulk.ILP b/potentials/BNC_TS_bulk.ILP
index 1baca2ace0..13de8b25fc 100644
--- a/potentials/BNC_TS_bulk.ILP
+++ b/potentials/BNC_TS_bulk.ILP
@@ -1,5 +1,5 @@
 # Interlayer Potential (ILP) for graphite, bulk-hBN and their heterojunctions
-# The parameters below are fitted against the HSE + TS DFT referece data from 2 A to 10 A.
+# The parameters below are fitted against the HSE + TS DFT reference data from 2 A to 10 A.
 # Cite as W. Ouyang et al., J. Chem. Theory Comput. 16(1), 666-676 (2020).
 #
 # ------------------------------ Repulsion Potential ------------------++++++++++++++ Vdw Potential ++++++++++++++++************
diff --git a/potentials/CH.airebo-m b/potentials/CH.airebo-m
index fb543dd58f..3a0299c161 100644
--- a/potentials/CH.airebo-m
+++ b/potentials/CH.airebo-m
@@ -1,8 +1,8 @@
 # DATE: 2016-03-15 CONTRIBUTOR: T.C. O'Connor CITATION: O'Connor, Andzelm, Robbins,  J. Chem. Phys. 142, 024903 (2015)
 # AIREBO-M of T.C. O'Connor, J.W. Andzelm, M.O. Robbins (2015)
-# Citation: J. Chem. Phys. 142, 024903 (2015); http://dx.doi.org/10.1063/1.4905549 
+# Citation: J. Chem. Phys. 142, 024903 (2015); https://doi.org/10.1063/1.4905549
 # Based on AIREBO of S.J. Stuart, A.B. Tutein, J.A. Harrison (2000) 
-# Citation: J. Chem. Phys. 112, 6472 (2000); http://dx.doi.org/10.1063/1.481208 
+# Citation: J. Chem. Phys. 112, 6472 (2000); https://doi.org/10.1063/1.481208
 
 1.7      rcmin_CC 
 1.3      rcmin_CH 
diff --git a/potentials/Cu_Zuo_JPCA2020.quadratic.snap b/potentials/Cu_Zuo_JPCA2020.quadratic.snap
new file mode 100644
index 0000000000..a47314a316
--- /dev/null
+++ b/potentials/Cu_Zuo_JPCA2020.quadratic.snap
@@ -0,0 +1,5 @@
+# DATE: 2020-01-31 CONTRIBUTOR: Yunxing Zuo <y9zuo@eng.ucsd.edu> CITATION: Y. Zuo, C. Chen, X, Li, Z. Deng, Y. Chen, J. Behler, G. Csányi, A. V. Shapeev, A. P. Thompson, M. A. Wood, S. P. Ong, "Performance and Cost Assessment of Machine Learning Interatomic Potentials" J. Phys. Chem. A 124, 4, 731-745 (2020)
+# Generated by Materials Virtual Lab
+
+pair_style snap
+pair_coeff * * Cu_Zuo_JPCA2020.quadratic.snapcoeff Cu_Zuo_JPCA2020.quadratic.snapparam Cu
diff --git a/potentials/Cu_Zuo_JPCA2020.quadratic.snapcoeff b/potentials/Cu_Zuo_JPCA2020.quadratic.snapcoeff
new file mode 100644
index 0000000000..27ee33eb41
--- /dev/null
+++ b/potentials/Cu_Zuo_JPCA2020.quadratic.snapcoeff
@@ -0,0 +1,501 @@
+# DATE: 2020-01-31 CONTRIBUTOR: Yunxing Zuo <y9zuo@eng.ucsd.edu> CITATION: Y. Zuo, C. Chen, X, Li, Z. Deng, Y. Chen, J. Behler, G. Csányi, A. V. Shapeev, A. P. Thompson, M. A. Wood, S. P. Ong, "Performance and Cost Assessment of Machine Learning Interatomic Potentials" J. Phys. Chem. A 124, 4, 731-745 (2020)
+# Generated by Materials Virtual Lab
+
+1 496
+Cu 0.5 1
+13.471977397937613
+0.1036211859818506
+0.10363841757551885
+0.621033030987932
+-0.21185789372622277
+-0.2570659984917341
+-0.5467785425939466
+-0.5365464723688037
+-0.2494295358403523
+-0.4802162154483056
+-1.1082500553759274
+-0.4630919024325791
+-0.6651549284588344
+-0.0029251074026806173
+-0.19260375829027657
+-0.21857190710698032
+-0.19829154688152476
+-0.3157112168631522
+-0.1631919758279015
+-0.12110110303187388
+0.16380996794933228
+-0.061209983872419285
+0.1201519782661597
+0.26321586469489083
+-0.05846647009686243
+-0.04813333274153896
+0.018675175078407078
+-0.09164487341728099
+0.28859657359189794
+0.14185864296773137
+0.0803200720841282
+-0.00014401841073222177
+0.0003285477814888027
+-0.004138649344589254
+0.003151849972706053
+-0.0009779498543849435
+-0.0015148327721482488
+-0.0016594731517730818
+0.00033748073832527703
+-0.0018225406615418327
+-0.004567786292018747
+-0.0029136636313592534
+-0.0020006698128240685
+-0.0002524708620035565
+-0.00013557486337845148
+-0.0028422449888521606
+-0.005677197343759918
+-0.001015010035775506
+-0.0009765207919150351
+0.0006683886841801351
+0.0002045741417952343
+-0.0005332810347389444
+0.00041885875493113955
+-0.002375255278458936
+0.001188156979012589
+0.0017462110820191806
+0.0007349993839032287
+-0.0003346303002194212
+-0.00035326714369901535
+0.0010356316809578547
+-1.55120504609918e-05
+-0.0025881954476935755
+-0.036366384607490254
+0.0012886008122195685
+-0.02145234316193358
+0.002646075132213576
+-0.012775985639350328
+-0.0017761174795594727
+-0.003689689399879216
+0.0008999178669914843
+-0.0035452341045603217
+0.003765777083888081
+-1.473939150533482e-05
+-0.0006115952041365613
+0.011333099429680688
+0.0046027588513758745
+-0.004636638051493164
+0.00026952037324009387
+-0.0013766586872288938
+-0.001520876680556801
+7.056404549078688e-05
+-0.0019230157952529092
+0.001314108363954286
+-0.0020808404489751453
+-0.0031977910665247893
+-0.001542358169115726
+0.0003811678238141089
+-0.003238282187663669
+-0.001743739878018213
+0.00023977817699438395
+0.10504167820006623
+0.01565576249809622
+-0.01128816712782536
+0.03088216543968068
+-0.0020781110683259544
+0.01219442725760888
+0.009111342026832718
+0.020927139446711825
+-0.035118796930951275
+-0.01698520427856124
+-0.002057982469727739
+0.005717736909593713
+0.03639307567651677
+-0.012446451740382863
+0.010166610097971499
+-0.03429833533696867
+-0.004192043565899942
+-0.003325956992955699
+-0.0022088137861783
+0.02568557895373312
+-0.01595970525044252
+-0.00613974647313658
+0.006179508508503243
+0.002592776878543116
+0.0007697618567966968
+-0.017822670822463936
+-0.013271672183902416
+-0.0017838108815779966
+-0.003946961047224043
+0.01446212507390721
+-0.003813482406923892
+0.012230677632561752
+-0.004438298291119518
+0.01670632393618289
+0.0041006085165118545
+0.01071903549512731
+0.007728535696666235
+0.0030549772513752474
+-0.0018748708146282822
+0.0012442258952583573
+0.0024835836566738795
+0.0020378527552769206
+0.006317036250023143
+0.00038765717694164495
+7.371556847105692e-05
+-0.00022663838890443766
+0.002242116106992608
+0.0019276281623740246
+0.00020070127075288817
+-0.0017929278357251867
+-0.0009693695988643031
+-0.0005052334926042845
+0.003236933680150114
+0.0010070685663443454
+0.0001653778736567732
+0.03142555747655504
+0.03515092008066848
+0.0019570441540856234
+0.005854647349221503
+0.017645224138683982
+0.027306542959461378
+0.0010288151573773687
+0.004099299746087042
+0.0006165078943043759
+0.005776765438825264
+0.028396330961895276
+-0.005521765957043647
+0.012932388070792123
+-0.014527541597969065
+0.004214333515239452
+-0.0054602280376573826
+-0.00035211862823674583
+-0.003917030117315662
+-0.019089342317763998
+-0.0007912182453706888
+0.007529455451748433
+0.0015964992834498048
+0.0012740872215644683
+-0.015357513398770183
+-0.004620781959173616
+-0.001061966694708219
+0.008615389580837504
+0.01797711820294831
+0.0022647592953603923
+0.017161753336943645
+0.019561527742143207
+0.009386331452771034
+0.011059654339434911
+0.0003040999809367194
+0.005480211320984781
+-0.001656616524513104
+7.637608677613615e-05
+0.01114937863061043
+0.0034970895362819165
+-0.000976564073550571
+-0.005096013857662213
+0.0013478827891899876
+-0.010753955737982948
+-0.001115257544720737
+0.00020837414296478226
+0.0016306341973385602
+0.0009997102882259796
+0.002544216312632845
+-0.0028872457627613706
+-0.0042926087293599985
+-0.0012273588518469485
+0.005105654844991719
+0.00286690430360286
+0.014707711785593904
+0.027903911330169152
+0.012097018417586564
+0.011242631245172025
+0.0033808585722144534
+0.003832413851557283
+0.017242287862610502
+0.00035444830690358614
+0.0006830108628291653
+-0.007222494149578734
+0.0013704542429452075
+-0.0024641507407898626
+0.001236848494439051
+0.007041409688837192
+-0.015102162825574063
+-0.003323826075508055
+0.0007504170812515729
+-0.001887801079988682
+0.002100459472063096
+-0.015894788154420372
+-0.0022826934325144693
+-0.0021837479366668628
+0.0010196042372125
+0.0024957403425112865
+0.0067453675822293085
+0.0016160583715086885
+0.0021545307260518454
+-0.0008780244190034897
+0.0005778773271021553
+0.004792429249446527
+0.010343992246806183
+0.005132090167117669
+0.00503829519623716
+-0.0005077102699887273
+0.00021673712078062318
+0.00024996217355388595
+0.0011968486200680806
+0.006195765382004757
+0.001401799813052912
+-0.0007441075428899838
+-0.0004879670876805492
+0.0004958137002131213
+0.0026020376596135875
+-0.002302340492001176
+-7.320298090576771e-05
+0.01902259325712566
+0.016592016684083048
+0.008213970166425466
+0.009977940332591508
+0.008039145481936329
+0.00477427234675026
+-0.004948393059373954
+-0.017382362689451144
+0.00554113155716162
+-0.00564723443157669
+0.004384157287183723
+-0.003956601172828604
+0.0004278536576873618
+0.0025083285778915295
+-0.0223154509681441
+9.15423575060352e-05
+0.006961883425661801
+0.001845906222467877
+0.0011410477650942163
+-0.01012243688668419
+-0.0018632374958809008
+-0.0029556570208925485
+0.04815814933298078
+0.017030579605299526
+0.02440392513042448
+0.0004982078610425086
+0.008954119794618555
+-0.0029277678782309168
+0.0001755825139188906
+0.009323779167840298
+-0.0007967635518621699
+0.003867131604720863
+-0.00990162234761872
+0.001700032518527718
+-0.012143076871425443
+-0.012965596989248223
+-0.0006203177207952382
+0.004532769258802493
+0.0007064962445740893
+0.0042206371213529895
+-0.014383696068459288
+-0.008332859233400903
+-0.0033687367709378767
+0.01658056764725773
+0.009943751106203803
+0.007570654021760562
+0.003877200954828096
+0.006254547765682025
+-0.004155804254951528
+0.001295092347350509
+-0.011058074299801313
+0.002342815857768594
+-0.0010123503582973384
+0.0030227697905579817
+-0.0010202857258300602
+-0.019150883287858557
+-0.004665886259739679
+-0.0012587715504318395
+-0.0005547019913281041
+0.002220532925660379
+-0.01310928173045062
+-0.0031904613763394686
+-0.0029303065765419745
+0.019837573236620797
+0.0015762203297667171
+0.002838134767035941
+-0.00492254489119677
+-0.002842774228957644
+-0.001109646954610563
+0.004254925478236304
+0.0037857697841531847
+-0.004356578885375318
+0.0007163471310605296
+-0.008501207617652959
+-0.012023924911957515
+-0.0003763348181699596
+0.0036409238677795573
+0.0011259000610578255
+0.0020201020615790433
+-0.009568064263607394
+-0.0012507726281483361
+-0.002062885990280011
+0.003030640692100784
+0.0004420343198657771
+0.0011569302016920793
+-0.005154676675180811
+-0.002049780774463522
+-0.0050641459702046015
+0.00044211712858544666
+-0.000769478735353356
+0.0007326127941010563
+0.0013609016647913655
+-0.007043700015253205
+-0.0028338123678346913
+-0.002150267059832926
+-0.0010103451670680358
+0.00015716156793793568
+-0.003833241756322117
+0.0010000049500485941
+-0.0004778772005968532
+0.0002299136309848182
+0.0027986858519796647
+0.0062201997147673105
+0.0022427258223073065
+0.0006443099018657583
+0.00018828506204809914
+0.000608358682584173
+0.001006675043583205
+-0.0009783030477633452
+0.0006015975749693522
+-0.0016149164621501871
+-0.0010838543756041957
+-0.0011895705495639716
+0.0002491367073072237
+-0.0005431288729794564
+-1.2898562465335495e-05
+6.63924593430551e-05
+-0.0116287906681794
+-0.01360634282636993
+0.009931357711211028
+0.0012671626508730758
+0.0005532387441839078
+0.0015820411202739932
+0.0018192018795640946
+-0.0043615415264174106
+-0.006603413088579372
+0.0002235127529610541
+0.006245275548337015
+-0.0013105084837221792
+0.0016196844728256117
+-0.0012645938197640393
+-0.0005182349228787736
+-0.0018040589755111995
+-0.008796273229758718
+0.007258149817404181
+-0.003115678578138166
+0.0005914832750685897
+-0.002965142778844656
+0.001250760957074326
+-0.0077370952131558205
+-0.0008655779206234639
+0.0003173110424567263
+0.005831115689167676
+0.000770580375453276
+0.0021206008641296986
+-0.0042918456381082215
+-0.0046239183986485945
+-0.000667534224316339
+0.002876720989070311
+0.0013542026649650436
+0.00031475235948687057
+-0.0011212027308584536
+0.0010150656076447634
+0.0009056925761129712
+-0.0018017038570959949
+-2.1595501043815933e-05
+-0.002150034540495241
+-0.0006505939581563651
+0.0009202486636438276
+0.0003559090349818826
+-0.001873162446508321
+-0.00038653366805686644
+0.004634195919263732
+0.0029483502954694915
+-0.0021515118007506863
+-0.001154054432233556
+0.002285603402778903
+0.0010825199157812257
+0.005515749806649864
+0.0036974739375012396
+0.0032505374090823734
+0.00013706970548559363
+0.0007932275424739326
+1.4658553601942792e-05
+-0.0003268879015274114
+0.000736941642511953
+-0.0010856140618703061
+-0.0008072851739592962
+0.00040168485355200146
+0.0004418011738512853
+0.0014466872383136625
+0.0009466887253085192
+0.0010760763899273738
+0.00031067764763077765
+-0.0009864955510058664
+-0.001586409020994278
+-0.00042896581565341103
+-0.0012044001838638872
+-0.0005845530633939999
+0.0028071926796219403
+0.0021845338129501245
+0.002545756190168804
+-0.001803222278307065
+0.00011499307410103334
+-0.0002253916181577248
+0.0006910416069063931
+-4.341054807764644e-05
+-0.00012009183009360248
+0.0005622986015070275
+-0.0007617834093005121
+-0.0007734741446193856
+-0.0010379859215141445
+-0.0010846458032108125
+-0.0005846557915516852
+0.0004951771979587738
+-0.000619355800314067
+-0.0012628003039104017
+-0.0003419446121181724
+0.008854641904114901
+0.00011376175867310045
+0.0008904565828735458
+0.002055414543970676
+-0.0007868107651520222
+-0.0006411186045178763
+0.0011144073154358454
+0.001430223775922338
+0.0003296430468924527
+0.006929976872128343
+0.004952676876649621
+0.003984187714671928
+0.0007237174169831169
+-0.00030272919784780916
+0.002610646656647969
+0.0012336143555509143
+0.0008710465884436656
+0.0032113386351846837
+0.0027940742057973103
+0.000370567979090599
+-0.0011560710256176415
+0.0018115111808705078
+0.00370271015011296
+0.0012313772226941397
+-0.0010915803571591616
+0.00024100126135388408
+-0.0003238607492457371
+0.002681757073708566
+0.0004815672979827275
+4.7972090804825757e-05
+0.00019677216963326447
+-0.00031133935453994677
+0.0002934570722083144
+0.0008032622418568877
+0.00032466863813352537
+0.00019127151978956536
+-0.0007383505273949043
+-0.00016437059156705625
+2.1277621449239392e-05
+0.004030855892415611
+0.0014373143365751344
+0.0006751204783949499
+-0.0014956186996378483
+-0.0005246319923461144
+-0.00013958417608329193
diff --git a/potentials/Cu_Zuo_JPCA2020.quadratic.snapparam b/potentials/Cu_Zuo_JPCA2020.quadratic.snapparam
new file mode 100644
index 0000000000..45e8081518
--- /dev/null
+++ b/potentials/Cu_Zuo_JPCA2020.quadratic.snapparam
@@ -0,0 +1,9 @@
+# DATE: 2020-01-31 CONTRIBUTOR: Yunxing Zuo <y9zuo@eng.ucsd.edu> CITATION: Y. Zuo, C. Chen, X, Li, Z. Deng, Y. Chen, J. Behler, G. Csányi, A. V. Shapeev, A. P. Thompson, M. A. Wood, S. P. Ong, "Performance and Cost Assessment of Machine Learning Interatomic Potentials" J. Phys. Chem. A 124, 4, 731-745 (2020)
+# Generated by Materials Virtual Lab
+
+rcutfac 3.9
+twojmax 6
+rfac0 0.99363
+rmin0 0
+quadraticflag 1
+bzeroflag 0
diff --git a/potentials/Cu_Zuo_JPCA2020.snap b/potentials/Cu_Zuo_JPCA2020.snap
new file mode 100644
index 0000000000..77fa97c05b
--- /dev/null
+++ b/potentials/Cu_Zuo_JPCA2020.snap
@@ -0,0 +1,5 @@
+# DATE: 2020-01-31 CONTRIBUTOR: Yunxing Zuo <y9zuo@eng.ucsd.edu> CITATION: Y. Zuo, C. Chen, X, Li, Z. Deng, Y. Chen, J. Behler, G. Csányi, A. V. Shapeev, A. P. Thompson, M. A. Wood, S. P. Ong, "Performance and Cost Assessment of Machine Learning Interatomic Potentials" J. Phys. Chem. A 124, 4, 731-745 (2020)
+# Generated by Materials Virtual Lab
+
+pair_style snap
+pair_coeff * * Cu_Zuo_JPCA2020.snapcoeff Cu_Zuo_JPCA2020.snapparam Cu
diff --git a/potentials/Cu_Zuo_JPCA2020.snapcoeff b/potentials/Cu_Zuo_JPCA2020.snapcoeff
new file mode 100644
index 0000000000..f0b987cfc9
--- /dev/null
+++ b/potentials/Cu_Zuo_JPCA2020.snapcoeff
@@ -0,0 +1,61 @@
+# DATE: 2020-01-31 CONTRIBUTOR: Yunxing Zuo <y9zuo@eng.ucsd.edu> CITATION: Y. Zuo, C. Chen, X, Li, Z. Deng, Y. Chen, J. Behler, G. Csányi, A. V. Shapeev, A. P. Thompson, M. A. Wood, S. P. Ong, "Performance and Cost Assessment of Machine Learning Interatomic Potentials" J. Phys. Chem. A 124, 4, 731-745 (2020)
+# Generated by Materials Virtual Lab
+
+1 56
+Cu 0.5 1
+-12.559674308193694
+0.008593898227798338
+0.013673289984609718
+0.06393914675613394
+-0.00938080439749897
+0.19064400881977597
+0.09753232271855786
+0.08099824635372653
+0.007145123624140076
+0.09290210440877074
+0.0880190669861532
+0.1192830725749653
+0.06527049820983855
+0.031413864437182484
+0.0027738405275973543
+0.09192674870264071
+0.05320931150968683
+0.09883922626911948
+0.08375319117498556
+0.019016869593934897
+0.028411907572350095
+0.03866932412785962
+0.004342301636475969
+0.0018982900821655022
+0.0541948726045012
+0.04856452232995496
+0.050754423617382534
+0.06674845036606598
+0.004412438551730208
+0.044792107275286236
+0.025289716758114707
+0.022196449531340784
+0.0039030958858326317
+-0.0058835986209963
+0.0337280161999949
+0.039241910216947416
+0.01906508559478233
+0.03036951121581222
+0.025041486753492357
+0.004417989749957392
+0.017529728714520857
+0.008591996145570893
+0.0010550495739926474
+0.0015925920262541832
+-0.009461637124847912
+0.007715985306991011
+0.005317265968847962
+0.0038030355779348976
+0.000863611802402537
+0.0016815884134270126
+-0.0033443140272306285
+0.0014842353373478168
+-0.008112696937181432
+0.0019470800109651284
+-0.0022623725036069603
+0.002010751092649435
diff --git a/potentials/Cu_Zuo_JPCA2020.snapparam b/potentials/Cu_Zuo_JPCA2020.snapparam
new file mode 100644
index 0000000000..9e9ac1b176
--- /dev/null
+++ b/potentials/Cu_Zuo_JPCA2020.snapparam
@@ -0,0 +1,9 @@
+# DATE: 2020-01-31 CONTRIBUTOR: Yunxing Zuo <y9zuo@eng.ucsd.edu> CITATION: Y. Zuo, C. Chen, X, Li, Z. Deng, Y. Chen, J. Behler, G. Csányi, A. V. Shapeev, A. P. Thompson, M. A. Wood, S. P. Ong, "Performance and Cost Assessment of Machine Learning Interatomic Potentials" J. Phys. Chem. A 124, 4, 731-745 (2020)
+# Generated by Materials Virtual Lab
+
+rcutfac 4.1
+twojmax 8
+rfac0 0.99363
+rmin0 0
+quadraticflag 0
+bzeroflag 0
diff --git a/potentials/Ge_Zuo_JPCA2020.quadratic.snap b/potentials/Ge_Zuo_JPCA2020.quadratic.snap
new file mode 100644
index 0000000000..853ec9ea6c
--- /dev/null
+++ b/potentials/Ge_Zuo_JPCA2020.quadratic.snap
@@ -0,0 +1,5 @@
+# DATE: 2020-01-31 CONTRIBUTOR: Yunxing Zuo <y9zuo@eng.ucsd.edu> CITATION: Y. Zuo, C. Chen, X, Li, Z. Deng, Y. Chen, J. Behler, G. Csányi, A. V. Shapeev, A. P. Thompson, M. A. Wood, S. P. Ong, "Performance and Cost Assessment of Machine Learning Interatomic Potentials" J. Phys. Chem. A 124, 4, 731-745 (2020)
+# Generated by Materials Virtual Lab
+
+pair_style snap
+pair_coeff * * Ge_Zuo_JPCA2020.quadratic.snapcoeff Ge_Zuo_JPCA2020.quadratic.snapparam Ge
diff --git a/potentials/Ge_Zuo_JPCA2020.quadratic.snapcoeff b/potentials/Ge_Zuo_JPCA2020.quadratic.snapcoeff
new file mode 100644
index 0000000000..3ef5aebd58
--- /dev/null
+++ b/potentials/Ge_Zuo_JPCA2020.quadratic.snapcoeff
@@ -0,0 +1,501 @@
+# DATE: 2020-01-31 CONTRIBUTOR: Yunxing Zuo <y9zuo@eng.ucsd.edu> CITATION: Y. Zuo, C. Chen, X, Li, Z. Deng, Y. Chen, J. Behler, G. Csányi, A. V. Shapeev, A. P. Thompson, M. A. Wood, S. P. Ong, "Performance and Cost Assessment of Machine Learning Interatomic Potentials" J. Phys. Chem. A 124, 4, 731-745 (2020)
+# Generated by Materials Virtual Lab
+
+1 496
+Ge 0.5 1
+-10.757581648444233
+-0.024800951499255663
+-0.04790863128750136
+-0.15065385740988213
+0.10641538959515846
+0.2528612262586376
+0.13882787112000922
+0.2891190080060111
+0.045187924317016424
+0.007386606356579594
+0.18208755300126037
+0.09920319028080607
+0.025295347309843817
+0.0580263974735978
+0.06953567464408789
+-0.07242580159025874
+0.02279106310103585
+-0.04745128927683246
+-0.0643350349649635
+0.0022332998389175134
+-0.004071289929355024
+0.04726490110684014
+0.1940299272058684
+-0.021269746972592464
+0.00035080469473021045
+-0.0713918512390207
+0.0007508347768014905
+0.011814960678455704
+-0.03002427076201976
+-0.028067052886352143
+0.01064155417639073
+-0.0008165151985268446
+0.0010468203410148036
+-0.004144147095604499
+0.0006838631090390068
+0.002345816491396856
+0.002015313456995106
+0.0037007918538314137
+0.0013068932277664619
+-0.0024962984771183076
+0.0012418251849510356
+0.00014445673000377298
+-0.0005646679464868204
+-0.0003313241087984295
+0.0006958887369873101
+-0.0020925467445989075
+0.00016249970492995813
+-0.00033836983573086454
+-0.0023523893356478705
+0.00017819760005600982
+-0.00016801678508043816
+0.0005891667118925054
+0.0008071867261005769
+-7.289555577660867e-06
+-0.0002493445103244813
+-0.0005386258876703964
+0.00017929483507725733
+0.00019054860798047024
+-0.0006891231567835096
+1.3881139776614204e-05
+-0.00016380444530132536
+0.00014138480500639953
+-0.0023183563475678453
+-0.0018965216601592454
+-0.01242848516827851
+-0.0017369656480891978
+-0.004908763181846984
+-0.0023422699662869403
+0.0012581320409894294
+0.0014171026611652115
+0.0012964707445369227
+0.0033021973396421085
+0.001106794729735153
+-0.0006817370911437488
+0.0015546270322690978
+0.0043321942066847875
+-0.0009455980916234803
+0.004623772559651816
+0.0004619012570547948
+-0.0006213909401897213
+-0.0009715198698834818
+0.0004604262197514357
+0.0011441071924363768
+0.0001205036789220645
+0.0017804319383710352
+-0.0004025145943787798
+0.000252218760945065
+0.0011430398732483298
+-0.000325883100798236
+-0.00020217372239744041
+-0.00376762949670866
+0.007972748269595025
+-0.015062919019317281
+0.005889902042628309
+-0.0031237987777757124
+0.0022485228323380346
+-0.0015447611722819439
+0.013735060148382792
+-0.002359400905661013
+0.0013648266059837284
+0.006034908257574298
+0.00426475971156382
+-0.010790821690724726
+0.0031940841065105337
+-0.009587213804818012
+-0.0012782984272445425
+0.003346319354533914
+-0.0025073086356975456
+0.0030759736862005066
+0.01675633798475319
+-0.005451379334225701
+-0.0033602953235012164
+9.751241383496208e-07
+0.0018922120763558295
+0.0012143739392038713
+0.0017620083951508055
+0.0001621147328760425
+-0.00011293458843786904
+-0.002931649114651127
+0.00691606745266061
+0.004501479981402852
+-0.0017477075146973258
+-0.0002877545566970091
+0.0031887174433488288
+0.001695950146245101
+-0.00211210235684442
+-0.004256332054203584
+-0.0009084757590726439
+0.0003752496243043385
+0.000580665938621905
+-0.0010027294261207662
+0.00033475191926756603
+-0.0024850728528000438
+-0.0016122163930828992
+-0.0012208428354880015
+-0.0003217555774302494
+-5.382822286752881e-05
+-0.0013316084386135185
+0.0002927745558167485
+-0.00020909240641422272
+0.0002753783176927399
+6.907820131366038e-06
+5.483766662963546e-05
+-0.0007660495543077642
+-0.0003089497743588585
+-0.004872611888379133
+0.0030511344129422555
+0.006574229284590597
+-0.004684907746781131
+0.01175393759975525
+-0.00940472213229881
+0.0034744258954247376
+-0.001164847507807685
+0.00659673030174018
+0.0008951788303598433
+0.005035091126833181
+-0.0035080717876991427
+0.0037809572867488024
+0.0018548632921340244
+-0.0017248387927316852
+-0.0008092229789498631
+0.0011317793765820592
+0.011999156382971653
+-0.009464559545059151
+-0.002868413047348772
+-0.006035322066239262
+-0.002340366789673505
+0.0002676013532629893
+-0.00034131580989511063
+-0.005907735939147985
+0.0015211542291111001
+-0.0023695281648304116
+0.00104974099798522
+-0.0032563446858894056
+0.004811133753610277
+-0.01491732160359059
+-0.0059014534233321645
+-0.001299827618234977
+0.0057613115270763494
+-0.0004349049209508814
+0.0015312577797848338
+-0.0056525501503031155
+0.0010967639747552216
+0.0023522794739946062
+-0.0017729998791394964
+0.00010743737529697768
+-0.0008382281826011286
+0.0019011190928847979
+-2.550453320634559e-05
+0.004113506801601295
+-0.0011296631735263764
+-0.0009527378600855656
+-0.0010894926471876794
+-0.0014104263586545924
+-0.001289503057024115
+0.0003137768145592025
+-0.0015146771229692848
+-0.00513650526342406
+0.01084461276236099
+-0.001177383725901
+0.005824708141755277
+0.0009404032557861416
+0.0019943501591934004
+-0.002012646079212463
+0.0004349665731461505
+-0.0009969751494477309
+0.0012244042694509634
+0.002673806727766799
+-0.0013339893617548455
+-0.00022501634728373798
+-0.002016625633803726
+0.002897529787495319
+-0.004725895702120371
+-0.0010632649042272048
+0.0004444910040903912
+0.0022920492127603276
+-0.0007224585112833859
+0.00024564986935174133
+-0.0013672014471411715
+0.00031193587692755894
+-0.001946463521372354
+0.004219583802849086
+-0.004247201344226568
+-0.0014824835277559758
+0.0006843441190154988
+0.0010071403044244393
+-0.0006021630307656255
+0.003484093089394711
+0.0003344695697135511
+0.0001759949767750086
+0.004083466529245728
+-0.0008969142156414183
+0.0002199102461119839
+-0.0009271935681109574
+0.0003673046197020585
+0.0001374144457528398
+0.0017969273527425177
+0.00011859479905437786
+-0.00010351795485271167
+-0.00045558274408652455
+0.002242331655247889
+-0.0004650181047334938
+0.0004616119053671621
+-0.0017093184461507234
+0.0006877459827303151
+0.00388390261711255
+-0.0013843908651735397
+-0.00036834308308806825
+0.0025464496870320243
+-0.004499802731966035
+-0.005168806533787486
+0.0035342664403057267
+-0.007870426818186557
+0.0004365293988093273
+-0.0007330110683512366
+0.002845829924796083
+0.0011742514408362328
+-0.002863992755930959
+-0.0026757619056017403
+-0.0038648523739527037
+0.0007668280934939602
+0.0007348013205715903
+-0.003190294396245908
+-0.000807220000509667
+-0.0006218003598493669
+-0.008983106459118132
+0.0005634110011100996
+0.008772463544722883
+0.0021630545822611336
+-0.002576346489162388
+0.006817624002883823
+-0.001953998808413925
+0.0033969828129994314
+0.006678035791386488
+0.0015822665567002056
+0.00019991297928763363
+0.00035594040758041984
+-0.0013807437637343655
+0.00481021047252057
+-9.053166824493641e-05
+-0.0017772865460897389
+-0.005225215704020374
+-0.0005126287685370892
+0.0002769341615851302
+0.00042639656242217557
+0.0008008772105154369
+0.013233580492792565
+0.0018706046919704945
+0.0005974400381629995
+0.0003871128646546207
+-0.0014951790484952817
+-0.002117437712919071
+0.0037215315653759155
+0.0006688869699134087
+-0.0014016080558611546
+0.000756751495969819
+2.4592033407551395e-05
+-0.002585533004547451
+-0.002579863839195117
+-0.0020244575545606833
+-0.0006613951333338678
+0.0003316043832544222
+0.0007636467427795876
+-6.605782133488163e-05
+-0.0015353332471388136
+-0.0009070221671259922
+0.0028621160783502994
+-0.0019628865219340954
+-0.0008750724986292362
+-0.0012259303374875467
+0.004667370344395462
+4.4105983019565934e-05
+-0.000364369913151006
+0.0020533075498211234
+-0.00102453084407415
+0.0004905377733481972
+-0.003668810880590422
+0.0032449868968047572
+-0.002686120919941119
+0.0008648420613803637
+-0.0009801119446783157
+0.0005341643891428518
+0.00015990420931785406
+0.001151724918818691
+-0.0007684976649317398
+-0.0013075905314497288
+0.0003027916228957733
+-0.002594674791311922
+-0.001188479510626195
+0.00103203001969817
+-0.00310845705127066
+-0.0004393993132923747
+-4.6861830042306193e-05
+-0.00016779096673717395
+-0.0005130875175124944
+-0.001973586718591271
+-0.00028053780216026137
+0.0010705751712491484
+0.0011620970780713029
+0.00021808418747894243
+-0.0021560846957260262
+-5.833476322100392e-05
+-0.0006843831641451434
+-0.0008104516877449897
+0.002548574659467194
+-0.0010369740001240357
+0.00047984265907496937
+0.0016950617207754995
+-1.4429151461721468e-05
+0.0004414032584603208
+-0.00048600725602133965
+-0.0005733616538491706
+-0.00078536865038345
+-5.74154661281967e-05
+0.00018413607110398522
+-0.0004492215097215563
+-0.0003236088425570341
+-6.959629896779486e-05
+0.0001187563494385313
+0.0004721470496258026
+-0.005606209458453816
+-0.0009958673110260453
+-0.0012498775267590482
+-0.0021075869891969915
+-0.0014190918596041942
+0.00025343462176177084
+0.00042669576338181907
+0.0021603751123067394
+0.0014205367475380593
+0.002794244293093001
+0.0018427656826787656
+0.0004670991668751555
+0.0005842278846749996
+0.0016231859368327209
+0.00011494579366611891
+-0.0009891209277962058
+0.0006231670509752527
+0.0027771414190289005
+0.002082190888182296
+0.0006359830502579468
+0.0014304063439266462
+-0.0005123295690726802
+-0.00363071690064257
+0.005103216651558546
+0.0014824414141849911
+0.0019259810878066302
+-0.0006311357428772047
+-0.0008617262139802651
+0.0009350168837389417
+0.002089734737141403
+0.00021216987965360506
+-0.0013844054049149562
+9.404439765715519e-05
+0.00037745887187395216
+0.00010412689488487233
+0.0005272396353373605
+-0.0014525938109415468
+-0.0013483618042193929
+0.0013483264264643902
+-0.0010059304703320658
+-7.998744862324283e-05
+0.0006362956591087036
+0.00027220035676191797
+-0.0006976607832971079
+-0.001015433998870538
+-0.007205698187993433
+0.0008076030078976934
+-0.0015590274371628174
+0.001155005536139217
+-0.0013550939720305133
+0.00489648360729979
+-0.0009330096557365365
+-0.0005528024396283214
+-0.0005059713093375062
+0.0005604488133193024
+-0.00019010437035929702
+0.0012109524176744345
+-0.00061274269590371
+0.00014123251523768523
+-0.0008855909096407051
+-0.00039024672636910063
+-0.0013971217784093555
+0.0015042884566056347
+0.000891668056199453
+0.0010026469777467996
+0.0004927663787650041
+9.673492505579695e-05
+0.00094909126553374
+1.2760709492680433e-05
+-0.000428508155584862
+-7.762605280227201e-05
+-6.907742043731936e-05
+0.001226590137538638
+-2.073240468573878e-06
+-0.00025984775383608785
+-0.0005648414882338804
+0.00042736942147755894
+0.00019423038048259345
+0.0002864476582583927
+-0.00021055747588141077
+-0.0007520382497741528
+-0.0005213582885633811
+-0.00063017401259737
+-0.0008782447569518348
+-0.00035001879777402534
+0.0008157077794999565
+0.000656944276534413
+-7.342206978833837e-05
+0.0004973008105238277
+-0.00013825933171914342
+7.965503130149057e-06
+-0.0009291847789592738
+-0.001293851944459497
+0.002107787595179102
+-0.0001811356462406849
+0.0010473654671182952
+-0.001233954521826914
+-0.0020358508644468098
+0.0011704543885648726
+0.0017922840272523756
+0.0038957649840886633
+0.00018019890139057255
+0.0028127670102061336
+0.00026605295278589024
+1.5995407402213946e-06
+0.0016915851672800897
+0.0009679871858384688
+0.0006849308310620979
+0.0002791907770766048
+-0.00011765125643835089
+-8.173752233178559e-05
+-0.00016131001616071297
+-0.0011754891774727692
+0.0004041469164416042
+-0.0005473809639270528
+-0.0011351349846232617
+-0.002486737898571777
+0.0002885947299102361
+0.0001599910725277546
+8.333413374979424e-05
+-8.372639960728227e-05
+-0.0015083044502300887
+-0.00029028192595788316
+0.0004162435095111331
+0.0003592487680914372
+-3.062122008758855e-05
+-3.42712983623511e-05
+6.20039391443783e-05
+8.344123983213513e-05
+1.5129678397726026e-05
+0.0012709529665946122
+0.0012641992251416143
+0.0006276265138256062
+-0.00011077916685596229
+-0.00020241449415232642
+0.00041961208128792234
diff --git a/potentials/Ge_Zuo_JPCA2020.quadratic.snapparam b/potentials/Ge_Zuo_JPCA2020.quadratic.snapparam
new file mode 100644
index 0000000000..739094c207
--- /dev/null
+++ b/potentials/Ge_Zuo_JPCA2020.quadratic.snapparam
@@ -0,0 +1,9 @@
+# DATE: 2020-01-31 CONTRIBUTOR: Yunxing Zuo <y9zuo@eng.ucsd.edu> CITATION: Y. Zuo, C. Chen, X, Li, Z. Deng, Y. Chen, J. Behler, G. Csányi, A. V. Shapeev, A. P. Thompson, M. A. Wood, S. P. Ong, "Performance and Cost Assessment of Machine Learning Interatomic Potentials" J. Phys. Chem. A 124, 4, 731-745 (2020)
+# Generated by Materials Virtual Lab
+
+rcutfac 4.9
+twojmax 6
+rfac0 0.99363
+rmin0 0
+quadraticflag 1
+bzeroflag 0
diff --git a/potentials/Ge_Zuo_JPCA2020.snap b/potentials/Ge_Zuo_JPCA2020.snap
new file mode 100644
index 0000000000..47e86ef0e3
--- /dev/null
+++ b/potentials/Ge_Zuo_JPCA2020.snap
@@ -0,0 +1,5 @@
+# DATE: 2020-01-31 CONTRIBUTOR: Yunxing Zuo <y9zuo@eng.ucsd.edu> CITATION: Y. Zuo, C. Chen, X, Li, Z. Deng, Y. Chen, J. Behler, G. Csányi, A. V. Shapeev, A. P. Thompson, M. A. Wood, S. P. Ong, "Performance and Cost Assessment of Machine Learning Interatomic Potentials" J. Phys. Chem. A 124, 4, 731-745 (2020)
+# Generated by Materials Virtual Lab
+
+pair_style snap
+pair_coeff * * Ge_Zuo_JPCA2020.snapcoeff Ge_Zuo_JPCA2020.snapparam Ge
diff --git a/potentials/Ge_Zuo_JPCA2020.snapcoeff b/potentials/Ge_Zuo_JPCA2020.snapcoeff
new file mode 100644
index 0000000000..b6812ff501
--- /dev/null
+++ b/potentials/Ge_Zuo_JPCA2020.snapcoeff
@@ -0,0 +1,61 @@
+# DATE: 2020-01-31 CONTRIBUTOR: Yunxing Zuo <y9zuo@eng.ucsd.edu> CITATION: Y. Zuo, C. Chen, X, Li, Z. Deng, Y. Chen, J. Behler, G. Csányi, A. V. Shapeev, A. P. Thompson, M. A. Wood, S. P. Ong, "Performance and Cost Assessment of Machine Learning Interatomic Potentials" J. Phys. Chem. A 124, 4, 731-745 (2020)
+# Generated by Materials Virtual Lab
+
+1 56
+Ge 0.5 1
+-8.032066300549554
+0.003565791809418569
+-0.001313597046042017
+-0.07462745407442176
+-0.014786137043355007
+-0.004547048196045851
+0.02488771161234962
+0.023889664030502872
+0.011618255121329538
+0.07268214634594428
+0.1424082353362679
+0.03669049060404052
+0.08899491668302591
+0.004571562947588176
+0.004618618969225219
+-0.004015852529580795
+0.07204626947465491
+0.022871379291570793
+0.03700807116876949
+-0.0023911510319317014
+-0.006031447480361413
+0.01504204377284714
+0.0006027639284569286
+0.006266016058921679
+0.020768942616172105
+0.05323608972149088
+0.011452908102818495
+-0.014019172103151272
+0.005598313577240544
+-0.03430011572646586
+0.017831083358623667
+-0.011844098900143967
+0.009224695294560395
+0.0027933453269500946
+0.015130109948961003
+0.035948918260853835
+0.008103158781149472
+-0.020495605137959824
+-0.0007229632684928296
+0.008287366772403234
+-0.024128827790224107
+-0.0001718697764776997
+-0.0035187441131207184
+0.0007875809229304087
+0.0023536388595360273
+0.043595376854706186
+-0.004761469043878728
+-0.0015459241229365504
+-0.004712008459887404
+-0.0074534578152035
+0.005495525843218926
+-0.0008661429408343274
+0.017019971756727818
+-0.01235361965547509
+0.003758786684845958
+-0.001448257166448844
diff --git a/potentials/Ge_Zuo_JPCA2020.snapparam b/potentials/Ge_Zuo_JPCA2020.snapparam
new file mode 100644
index 0000000000..2bd0a2c8cb
--- /dev/null
+++ b/potentials/Ge_Zuo_JPCA2020.snapparam
@@ -0,0 +1,9 @@
+# DATE: 2020-01-31 CONTRIBUTOR: Yunxing Zuo <y9zuo@eng.ucsd.edu> CITATION: Y. Zuo, C. Chen, X, Li, Z. Deng, Y. Chen, J. Behler, G. Csányi, A. V. Shapeev, A. P. Thompson, M. A. Wood, S. P. Ong, "Performance and Cost Assessment of Machine Learning Interatomic Potentials" J. Phys. Chem. A 124, 4, 731-745 (2020)
+# Generated by Materials Virtual Lab
+
+rcutfac 5.5
+twojmax 8
+rfac0 0.99363
+rmin0 0
+quadraticflag 0
+bzeroflag 0
diff --git a/potentials/Li_Zuo_JPCA2020.quadratic.snap b/potentials/Li_Zuo_JPCA2020.quadratic.snap
new file mode 100644
index 0000000000..3907f9b52f
--- /dev/null
+++ b/potentials/Li_Zuo_JPCA2020.quadratic.snap
@@ -0,0 +1,5 @@
+# DATE: 2020-01-31 CONTRIBUTOR: Yunxing Zuo <y9zuo@eng.ucsd.edu> CITATION: Y. Zuo, C. Chen, X, Li, Z. Deng, Y. Chen, J. Behler, G. Csányi, A. V. Shapeev, A. P. Thompson, M. A. Wood, S. P. Ong, "Performance and Cost Assessment of Machine Learning Interatomic Potentials" J. Phys. Chem. A 124, 4, 731-745 (2020)
+# Generated by Materials Virtual Lab
+
+pair_style snap
+pair_coeff * * Li_Zuo_JPCA2020.quadratic.snapcoeff Li_Zuo_JPCA2020.quadratic.snapparam Li
diff --git a/potentials/Li_Zuo_JPCA2020.quadratic.snapcoeff b/potentials/Li_Zuo_JPCA2020.quadratic.snapcoeff
new file mode 100644
index 0000000000..be6c2cb03d
--- /dev/null
+++ b/potentials/Li_Zuo_JPCA2020.quadratic.snapcoeff
@@ -0,0 +1,501 @@
+# DATE: 2020-01-31 CONTRIBUTOR: Yunxing Zuo <y9zuo@eng.ucsd.edu> CITATION: Y. Zuo, C. Chen, X, Li, Z. Deng, Y. Chen, J. Behler, G. Csányi, A. V. Shapeev, A. P. Thompson, M. A. Wood, S. P. Ong, "Performance and Cost Assessment of Machine Learning Interatomic Potentials" J. Phys. Chem. A 124, 4, 731-745 (2020)
+# Generated by Materials Virtual Lab
+
+1 496
+Li 0.5 1
+-2.1412240789313617
+-0.0009231555538458846
+-0.007661299068972888
+-0.00834332243696876
+0.009676563611348906
+0.09160437718453437
+0.013098575408597497
+0.004394894580070823
+0.002074653367731459
+0.022047953144192983
+0.02488179879859288
+-0.013743531201294977
+-0.0029595908679397073
+-0.003800244032814118
+-0.001575857356328943
+0.006133013397458346
+-0.005760440597981321
+0.0018604884099176437
+0.015439121754361384
+0.0007671476341472011
+0.010976904001820446
+-0.0006862120521443027
+-0.01527570567767355
+0.004099719196321517
+0.012468336495706734
+0.011003386548234805
+-0.0004457853327389625
+-0.0014698077425459547
+0.0015661519999420322
+0.003675314685878377
+0.0013547707395554225
+1.6059793954902877e-05
+-2.0690257087080476e-06
+0.00023918652998682435
+1.7387586862435816e-05
+-0.00010956561849543768
+-8.58947481695223e-05
+-2.1694161473068158e-05
+-2.4996449559027228e-05
+0.0001558831125431055
+3.671057085392114e-05
+6.79138355890313e-05
+1.6456869419683555e-05
+3.444357764532815e-05
+-2.9465167023334264e-05
+-6.774380631549649e-05
+-5.078775557045969e-05
+-1.7806925388484782e-05
+7.0469001842314976e-06
+2.210304678359812e-05
+1.9072198735119225e-05
+5.38497233379579e-07
+-4.2750335036158554e-05
+-6.13923971682868e-05
+-4.513908586537613e-05
+5.545067863541657e-06
+-2.988053875100616e-05
+-3.90791144788411e-06
+-4.2027648007753464e-05
+2.4004174493009498e-05
+4.389650212868209e-06
+0.00019994132443323326
+-0.0008257695803735019
+0.00015456640663769896
+0.0002442618733735491
+-0.0006095603146564489
+-0.00020761230945534853
+-3.6030849557142855e-05
+-0.00027191548195370645
+-7.899984834834831e-05
+-0.00044497301174238385
+0.00037984411768524025
+0.00011007365051239534
+7.648531579580698e-05
+0.0005033645635113761
+-0.0002605686289848443
+4.3110346408105704e-05
+0.00025347268940708207
+-8.282308069322647e-06
+-0.00017272537243811988
+-1.4262281448210403e-05
+0.000322271347777112
+0.0001821697656989701
+0.00016823647762681277
+5.786825518465558e-05
+4.4823212536460254e-05
+3.205002091024034e-05
+3.352201485531044e-05
+-0.00010358718629705439
+-5.0715807026244685e-05
+-0.0013319148181126117
+0.000972030384478281
+-0.0002476799277089418
+0.002329265879471674
+-0.0034093105376934918
+-0.00011820226513704268
+0.0013425441170395788
+0.0022079598536845755
+-0.001829066880627336
+0.0016414757502981885
+-0.0005945765249523567
+-0.0001370900675828496
+-0.0007076521354336618
+-0.000605664916739653
+-0.0015754584702457478
+0.001196876052034379
+-0.00010176802471163478
+0.0005977680307153918
+-0.00021610684525758428
+-0.0010730988770069295
+-0.00029741322748487545
+0.0010963880426812164
+0.0005118058870796731
+0.00042554023259319397
+-0.00023724777296840673
+-0.00026758137396028664
+0.0003670973214941757
+0.0003445712209688253
+3.269506735299249e-05
+0.0005101250839258585
+-0.00014834373728293875
+-3.112862183676996e-05
+7.170215786907294e-05
+0.0001456254005982088
+-0.0002940472721590921
+-7.527396257767417e-05
+-0.00025399519246354724
+-4.827847250662522e-05
+-8.956582740120233e-06
+-9.760455940837656e-05
+-0.00016144595115304692
+2.0103282281235056e-05
+-0.00019405685666744972
+2.0537004132252274e-06
+3.357290664757216e-05
+-2.304887965800405e-05
+9.311438363853534e-05
+-8.053530316363574e-05
+-2.7561246662097407e-06
+0.00013685762943279348
+7.766609760133328e-05
+-1.961828640961381e-05
+-8.749099256381905e-05
+6.13329893782444e-05
+4.736541092166059e-06
+0.002931945410035946
+-0.001024683738516553
+-0.0008309260685524421
+6.210710499744502e-05
+-0.0017889301344619756
+-0.0014671450044332936
+-0.0029931687168037067
+-0.001072301002403191
+-0.00013676573115981952
+-9.90148751179879e-06
+0.001551668548942669
+-0.0010538402363663827
+0.0003159593587843749
+0.0005550994021965564
+-0.00014820982726320965
+0.0003504456202206434
+-0.0001538342941720429
+-0.00017865480082050153
+0.0007983492969464872
+0.00138132404975013
+0.00021799744832404113
+0.00020297232943218728
+-0.00011465880568103434
+0.0003890729188889889
+9.895099866630969e-05
+-3.434263966097327e-05
+-0.000851102087270158
+-0.000556024749195277
+0.0004384594932178084
+-0.0015148589511070145
+-0.00016284037557689357
+-0.0022171461372615417
+-0.0010638133578684016
+-0.0003687131634153438
+5.411001845572084e-05
+0.00042689492192495465
+0.0002512568765298352
+0.00019730303742772904
+0.00023654202306856785
+7.70500612588116e-05
+0.0001574909751282805
+-0.00016525814201626658
+0.00017590470105136665
+0.0012459305398878615
+0.0006394798817971307
+0.0005023552361222442
+0.00011948039902327457
+5.013673153317365e-07
+0.0003033663937229021
+2.462092277945443e-05
+-0.00016036870874291828
+-0.0013429545483129661
+-0.0002482399473908289
+0.0005115860392256346
+0.00043381341056637665
+0.0003374284895109973
+0.0006902592237780365
+0.00022428041149110523
+3.9074808410894317e-05
+0.0005031935198987236
+0.000614411341951122
+-0.0006923836743303698
+0.00036344680675747963
+-0.0004258490404859001
+-6.269113430322106e-05
+6.483857759396568e-05
+0.0003789364580273417
+0.0005388540520513687
+-0.00016787579448257283
+-0.00043285978723906995
+-2.9832483885554487e-05
+0.00016168723288313542
+5.039482707902878e-06
+-0.0004706170790862433
+-0.00011497891019349747
+8.651307773026221e-05
+-0.00033982611401776045
+-0.00017193796501189157
+-0.0004560679798133605
+-0.00011884452713185679
+-0.00012869057544404706
+7.18312634905562e-05
+0.00018980912852285792
+0.00011915639204287442
+8.679284816290175e-05
+1.6531292649257062e-06
+-8.17329671029727e-05
+-4.900555832353852e-05
+-9.25080459560415e-06
+6.954877420742723e-05
+0.00013382486753658448
+0.00015812380460028733
+-1.5852420144975423e-06
+5.04699259471341e-05
+1.9491042952427355e-05
+0.0001481541131313622
+-6.36228012715316e-05
+-4.8838337378253734e-05
+0.001441788602208205
+4.406881338758142e-05
+0.000796193264720557
+0.0004943724029044831
+0.0004623905919188462
+-0.0002679646835012705
+-0.0005054323733602711
+-0.000553651909241632
+0.00045000654729431585
+0.0003027497224886417
+0.000187766285008011
+0.0002785184412618931
+-2.7822718345276108e-05
+-0.0003829270593299004
+-0.00056089812161026
+-0.0004975812250968114
+0.00039586765321396404
+-9.133189121224652e-05
+-6.158865650595222e-05
+-0.0005735691509450511
+0.00012739569013209216
+2.6438654165791123e-05
+-0.001278281720933766
+0.0003256062264459796
+-0.0002554839578393963
+0.00041463873880888234
+-2.8799090117582115e-05
+0.0006187371703944389
+-0.0005579331696903862
+0.0010113648832426137
+2.75885324798809e-05
+0.00021933342119202583
+-0.0002779495740316995
+-7.710532111821011e-05
+-1.3524586069184051e-05
+-8.412766152879701e-05
+1.6552525680130356e-05
+0.00017629642434473765
+-0.0001384263413412454
+-1.2880340789650607e-05
+-0.0001518135092762628
+9.562577580673634e-05
+-7.357116023457347e-05
+0.0008032397087854466
+0.0015489083800610344
+0.00045090019254601175
+-0.0001000489703777192
+0.00040495805270715507
+0.0004570484840169622
+-0.0002617938095824416
+0.0004386145391635341
+-5.54884208760822e-06
+0.00022119239650977582
+0.00010848949610253032
+9.33083627399187e-05
+-0.0004838267894987159
+-0.0002472948310516105
+-0.00026955568510039286
+-6.246679177664773e-05
+5.476318478973106e-05
+-9.317839138213481e-05
+-0.00016896588722344733
+-2.891189070500237e-05
+0.00047587848020688126
+0.0003792757050299604
+2.1807786155343294e-05
+-0.00031572293875171796
+-0.00028085973495744544
+0.0002335950967282466
+-0.00016188174632396701
+3.395362667052528e-05
+-0.00013988593913412753
+8.253277556312035e-05
+0.00031129772926024094
+-0.0002624658366646051
+-0.0005357581289388576
+-0.00020780332599070527
+-0.000280382796926588
+2.6382833593728437e-05
+-0.00019803978278796697
+-3.836240074516929e-05
+2.52199969199963e-05
+0.0001755949966139284
+-6.319846371456512e-05
+-0.00014177125815702864
+0.00011372626020554034
+-0.0002455249065191294
+4.847904507351463e-05
+5.677758514661485e-05
+3.0005162906912344e-05
+3.4551304339986536e-05
+5.625589262735177e-06
+-0.0001661246810686982
+-0.00025196907735790307
+-2.338467826349885e-05
+-4.949081304533806e-05
+4.418200919252631e-07
+-0.0001386621740744733
+3.087153842625511e-05
+3.313460022500447e-05
+7.448446869253392e-05
+3.7051011940367696e-05
+0.0001161397889396386
+-1.2594997247816293e-05
+-4.4125778431849337e-05
+-5.428845088953675e-05
+-4.574466821663063e-05
+1.723877701217235e-05
+8.74336529963266e-05
+0.00015141973401443275
+7.231575739971423e-06
+-3.682771605552807e-05
+2.969865866386144e-05
+1.5387612965842645e-05
+6.753535564709428e-05
+-4.334801396192797e-05
+-1.7534134425931773e-05
+-0.0005136759836186642
+0.00017607248026867972
+-0.00028269567619830825
+-0.00021727306569819494
+5.5565698983942125e-05
+4.80972042587268e-05
+7.425087155919899e-05
+-0.0004096710386710902
+-0.00016764516093941212
+-0.00027545774822200747
+1.0898840567778227e-05
+6.902810796352574e-05
+-2.761602670925889e-05
+-3.9407191540427e-05
+0.00028087558413431333
+0.00012684134036569915
+1.179869241397249e-05
+0.0003690398125957319
+-0.00010883422953150801
+4.1501225212773755e-06
+-0.00010304391938581659
+9.632869481488289e-05
+0.000133073253708549
+-5.498293803452558e-05
+-3.368124976636306e-05
+-0.0003346041155738474
+-0.00015107665568999147
+-2.2649998114166815e-06
+0.0001618854801546201
+-5.813273453735355e-06
+1.2792304483556038e-05
+-0.00032298758055197515
+4.8590067382891585e-05
+-0.00011036183742814574
+2.9592359698026668e-05
+2.2316364541521546e-05
+-0.00029895018605530005
+0.0003322854516357027
+-0.00014086579323246572
+-3.782322666874295e-05
+3.518792123979381e-05
+2.510724248878993e-05
+8.888692851518335e-05
+6.677330172388448e-05
+-4.0314076998428155e-05
+-0.00018457801709823558
+0.00022412735252329567
+-0.00011511481698820258
+3.525203396105099e-05
+0.00018767161952404484
+-6.264206762659092e-05
+-0.0004106897749111341
+-4.5843499641616954e-05
+-8.303806533371317e-05
+-2.4217251861603966e-05
+4.8181388440447036e-05
+0.00012967810908954774
+8.39179529210102e-05
+5.812294768883187e-05
+-1.4534885510923565e-06
+-1.2080439720917475e-05
+5.296700685807484e-05
+-3.927109616971857e-05
+7.419368075179074e-05
+2.065682196878164e-05
+-3.242543658028595e-05
+9.039710612358053e-06
+-5.870816541934664e-06
+-3.349356162432634e-06
+-2.2667463109640555e-06
+-1.1412109905015556e-05
+-2.2154456738053796e-05
+-8.126627062326725e-05
+-0.00025025699880465793
+1.9349098988870033e-05
+-1.2935207525527337e-05
+-8.469310044831229e-06
+-1.3830951869204185e-05
+-9.430317984216039e-05
+3.91047195674899e-05
+7.915186078716358e-07
+-1.717662521204781e-06
+2.1022303172932996e-05
+-1.8386097576231955e-05
+3.785502799511454e-05
+-2.9153427058423584e-05
+3.0340670463156925e-05
+2.3855630830594614e-06
+3.363646405352777e-05
+-2.5721931740086344e-05
+-5.939648332150995e-06
+0.0001109561698106193
+-3.919165896753001e-07
+-6.256738764599541e-05
+0.00019289656601981933
+-3.2462128854297175e-05
+2.0499453403125054e-05
+0.00036217216378710645
+1.2331021876771377e-06
+2.1510338370513608e-05
+0.00019883214496827263
+0.00016523439077175192
+8.337496468570917e-05
+4.51419434831287e-05
+3.0238532058046737e-05
+0.0002772650322719416
+-9.382825285147343e-05
+-3.424018260450939e-05
+-0.00010484901191525162
+-5.414367671485117e-05
+-1.8108290929005675e-05
+-2.727980835353352e-05
+3.1276779826336416e-05
+9.811899104402588e-05
+0.0001087732118202894
+0.0001161064042663474
+-8.699626344806719e-05
+-8.389563445866245e-06
+-4.080006823045966e-05
+2.68392518119246e-05
+1.319735436191107e-05
+-0.00013630204049762103
+3.663554617394765e-05
+-4.737732551772256e-05
+-6.670431359704589e-05
+-5.4269127119263065e-05
+-4.32982499607689e-06
+9.341788094848339e-06
+2.883469739498435e-07
+1.7874864002477404e-05
+0.00033917224623550453
+-4.014948520301642e-05
+-1.8878659141880476e-06
+9.373973478063064e-06
+-4.837079079751623e-05
+-4.7348451196593835e-05
diff --git a/potentials/Li_Zuo_JPCA2020.quadratic.snapparam b/potentials/Li_Zuo_JPCA2020.quadratic.snapparam
new file mode 100644
index 0000000000..3a3f0a8087
--- /dev/null
+++ b/potentials/Li_Zuo_JPCA2020.quadratic.snapparam
@@ -0,0 +1,9 @@
+# DATE: 2020-01-31 CONTRIBUTOR: Yunxing Zuo <y9zuo@eng.ucsd.edu> CITATION: Y. Zuo, C. Chen, X, Li, Z. Deng, Y. Chen, J. Behler, G. Csányi, A. V. Shapeev, A. P. Thompson, M. A. Wood, S. P. Ong, "Performance and Cost Assessment of Machine Learning Interatomic Potentials" J. Phys. Chem. A 124, 4, 731-745 (2020)
+# Generated by Materials Virtual Lab
+
+rcutfac 5.1
+twojmax 6
+rfac0 0.99363
+rmin0 0
+quadraticflag 1
+bzeroflag 0
diff --git a/potentials/Li_Zuo_JPCA2020.snap b/potentials/Li_Zuo_JPCA2020.snap
new file mode 100644
index 0000000000..f214175974
--- /dev/null
+++ b/potentials/Li_Zuo_JPCA2020.snap
@@ -0,0 +1,5 @@
+# DATE: 2020-01-31 CONTRIBUTOR: Yunxing Zuo <y9zuo@eng.ucsd.edu> CITATION: Y. Zuo, C. Chen, X, Li, Z. Deng, Y. Chen, J. Behler, G. Csányi, A. V. Shapeev, A. P. Thompson, M. A. Wood, S. P. Ong, "Performance and Cost Assessment of Machine Learning Interatomic Potentials" J. Phys. Chem. A 124, 4, 731-745 (2020)
+# Generated by Materials Virtual Lab
+
+pair_style snap
+pair_coeff * * Li_Zuo_JPCA2020.snapcoeff Li_Zuo_JPCA2020.snapparam Li
diff --git a/potentials/Li_Zuo_JPCA2020.snapcoeff b/potentials/Li_Zuo_JPCA2020.snapcoeff
new file mode 100644
index 0000000000..94e390d494
--- /dev/null
+++ b/potentials/Li_Zuo_JPCA2020.snapcoeff
@@ -0,0 +1,61 @@
+# DATE: 2020-01-31 CONTRIBUTOR: Yunxing Zuo <y9zuo@eng.ucsd.edu> CITATION: Y. Zuo, C. Chen, X, Li, Z. Deng, Y. Chen, J. Behler, G. Csányi, A. V. Shapeev, A. P. Thompson, M. A. Wood, S. P. Ong, "Performance and Cost Assessment of Machine Learning Interatomic Potentials" J. Phys. Chem. A 124, 4, 731-745 (2020)
+# Generated by Materials Virtual Lab
+
+1 56
+Li 0.5 1
+-3.442655383555455
+0.002861973941007705
+0.004079224321860258
+0.018372219281925357
+0.006266714658779952
+0.05618612237239306
+0.006520835666452365
+0.021827129976114024
+-0.001962995177823815
+0.02813335855613673
+0.01773107340112854
+0.03496164804388563
+0.017843132187232384
+0.011780475836380925
+0.00101257736816995
+0.018060843507619457
+0.0035595399079857894
+0.027284801481953426
+0.020388928571015014
+0.009421863028676985
+0.0030028032539420654
+0.0036825485649799004
+0.0030454642536342546
+-0.0004393726087160519
+0.010163380126075311
+0.003392641868555307
+0.009824913673020763
+0.011470421699338951
+0.0029596154637689994
+0.006519822857684111
+0.004250563868727875
+0.0008264411531733965
+-0.0004981577948131363
+-0.0015196499400890514
+0.004916595803865858
+0.00018592836139429483
+0.0013054776042889598
+0.006039878353203354
+0.0024351853950736213
+0.00011609194446605964
+-0.000863127422455777
+0.0006783840924705024
+8.411131855335329e-05
+-0.0011263789721868075
+0.0029001479714427306
+-0.0015453105505531712
+0.0029405862510894568
+0.00048098035310471104
+-7.617563227253765e-05
+0.0006160452246642837
+-3.2291338390346824e-05
+-0.00041312136845354785
+-0.0004771451237961964
+0.0004825319898070328
+-0.00029563689133977385
+0.0002943500410651674
diff --git a/potentials/Li_Zuo_JPCA2020.snapparam b/potentials/Li_Zuo_JPCA2020.snapparam
new file mode 100644
index 0000000000..a44c0f23d1
--- /dev/null
+++ b/potentials/Li_Zuo_JPCA2020.snapparam
@@ -0,0 +1,9 @@
+# DATE: 2020-01-31 CONTRIBUTOR: Yunxing Zuo <y9zuo@eng.ucsd.edu> CITATION: Y. Zuo, C. Chen, X, Li, Z. Deng, Y. Chen, J. Behler, G. Csányi, A. V. Shapeev, A. P. Thompson, M. A. Wood, S. P. Ong, "Performance and Cost Assessment of Machine Learning Interatomic Potentials" J. Phys. Chem. A 124, 4, 731-745 (2020)
+# Generated by Materials Virtual Lab
+
+rcutfac 5.1
+twojmax 8
+rfac0 0.99363
+rmin0 0
+quadraticflag 0
+bzeroflag 0
diff --git a/potentials/Mo_Zuo_JPCA2020.quadratic.snap b/potentials/Mo_Zuo_JPCA2020.quadratic.snap
new file mode 100644
index 0000000000..ab75bbdef0
--- /dev/null
+++ b/potentials/Mo_Zuo_JPCA2020.quadratic.snap
@@ -0,0 +1,5 @@
+# DATE: 2020-01-31 CONTRIBUTOR: Yunxing Zuo <y9zuo@eng.ucsd.edu> CITATION: Y. Zuo, C. Chen, X, Li, Z. Deng, Y. Chen, J. Behler, G. Csányi, A. V. Shapeev, A. P. Thompson, M. A. Wood, S. P. Ong, "Performance and Cost Assessment of Machine Learning Interatomic Potentials" J. Phys. Chem. A 124, 4, 731-745 (2020)
+# Generated by Materials Virtual Lab
+
+pair_style snap
+pair_coeff * * Mo_Zuo_JPCA2020.quadratic.snapcoeff Mo_Zuo_JPCA2020.quadratic.snapparam Mo
diff --git a/potentials/Mo_Zuo_JPCA2020.quadratic.snapcoeff b/potentials/Mo_Zuo_JPCA2020.quadratic.snapcoeff
new file mode 100644
index 0000000000..9635aaf4c6
--- /dev/null
+++ b/potentials/Mo_Zuo_JPCA2020.quadratic.snapcoeff
@@ -0,0 +1,501 @@
+# DATE: 2020-01-31 CONTRIBUTOR: Yunxing Zuo <y9zuo@eng.ucsd.edu> CITATION: Y. Zuo, C. Chen, X, Li, Z. Deng, Y. Chen, J. Behler, G. Csányi, A. V. Shapeev, A. P. Thompson, M. A. Wood, S. P. Ong, "Performance and Cost Assessment of Machine Learning Interatomic Potentials" J. Phys. Chem. A 124, 4, 731-745 (2020)
+# Generated by Materials Virtual Lab
+
+1 496
+Mo 0.5 1
+-8.138991753441568
+0.043384508746688054
+-0.047996260002755683
+-0.21325240787723881
+0.09837081626080132
+0.5830991543998562
+0.4820795605286178
+0.060839068035529784
+0.017339854523614494
+0.4111159401122883
+0.5264606662229518
+-0.06564022630320393
+-0.18213278181337542
+-0.12444055260628212
+-0.10733357067913704
+-0.16076348497137302
+0.3346022357550442
+-0.13715823100621918
+-0.13475443109850377
+0.06129979514763583
+0.07913687972063524
+-0.04048593659362227
+-0.024360155561520554
+-0.1864591255661114
+-0.08766991512160359
+0.13043204793899052
+0.011718902640366586
+-0.02513537098151072
+0.08173069176648773
+0.1128467751142765
+-0.012292342467836769
+5.168203453451285e-05
+1.9916096600808214e-05
+0.0010125587214311403
+-9.273742046920657e-05
+0.0022604115297687054
+0.0009381964828896608
+-0.0002755255042528086
+-0.0001823083852853721
+-0.0003157240419700573
+0.0008075294545561683
+0.00015118434236242997
+-0.0006431738438380568
+-0.00022364170510090603
+-0.00014985309153199222
+-0.000313390190676426
+-0.0004927307931872224
+-0.0005012866975809415
+-0.0004133385661715067
+-0.00010167762603137241
+2.5945658881376298e-05
+-0.00011815124842285131
+-0.00013732515625951432
+2.5441126684935995e-05
+-0.0001593702499906981
+0.0001357458709888407
+0.000269078544083378
+-2.348534815216869e-05
+6.334072274748815e-05
+-9.350104435094598e-05
+-1.831356007812812e-05
+-0.002740875522213565
+-0.004531291089425373
+0.0012547864950854916
+-0.00939797598765904
+-0.000842016752561608
+0.003025582761330424
+-0.0002770205059348859
+-0.007266884659423379
+-0.00901796547572012
+-0.004318544933713991
+-0.0007879844836948788
+0.0017335858676584732
+-0.00020232926884287107
+0.004473392694959386
+0.0004920504037107997
+0.0025027712902135207
+0.004350225796257925
+0.0008622892795490419
+0.0013165136068852236
+-4.870901846135327e-05
+0.0042084586192978595
+-0.0010532438871923345
+0.0022743623986088714
+0.001461798311095006
+-0.001488835344484064
+-0.0002796907812519418
+-0.0019765673964826282
+0.0011692242538979148
+4.673546364238873e-05
+0.030043832558364673
+0.014734804212749275
+-0.03743017584146662
+-0.040542834819475994
+0.018549063011873437
+0.007091356687521607
+0.00012090051808519978
+-0.051039746303528526
+-0.003964776924101225
+-0.0025460389261230966
+-0.01570288965359407
+-0.003687796261764903
+0.010000119376750641
+0.012105703780737997
+0.024742012130191948
+-8.309785745314441e-05
+0.0003523226505628087
+0.005908832332045182
+-0.0029626619944401987
+0.020941747679821987
+-0.03310130704238045
+9.339932805223341e-05
+0.014693021422348558
+0.00660671100914414
+-0.0010414508986295453
+-0.010313371174714462
+0.005592994926023745
+-0.0003260979311863145
+-0.0005231222538829356
+0.0008421564296140866
+-0.0003689799922705557
+-0.0006979747949588604
+-0.0002852101161481683
+0.0017244598289560176
+-0.00268403354879522
+0.0016510201776320224
+-0.0018809180092166373
+0.0019056524816780055
+0.0008758545622144465
+-0.0011541296884733944
+-0.0038192458388907175
+-0.0015024057194541042
+-0.0038609526965407313
+-0.0018483509930703182
+-0.0017071766028803556
+-3.0680711084301506e-05
+0.0014059444657129334
+0.003201111288430791
+0.001382208677925798
+-0.00043170685643154197
+-0.00028542168588460785
+4.359688888790206e-05
+-0.0018070150739171013
+-0.0008714133665482657
+3.0356018752503646e-06
+-0.031723328015284546
+0.05218171892700164
+0.023624098006844584
+-0.00035542807142118827
+0.0056534990030143424
+-0.013928261090089855
+-0.026213636425198385
+-0.01703802548327037
+-0.003624848162458129
+-0.006608448375416679
+0.012954692125048056
+0.026030813751087314
+-0.003197892511784207
+-0.010413872764665546
+0.006901282020939892
+0.007823606994214595
+-0.0012093685936647508
+-0.004194024491793641
+0.0004900836364774567
+0.0036271919472599117
+0.00450470146037197
+-0.006128494987361423
+-0.0027651138453105325
+0.004216327952406651
+0.012752709066886213
+-0.0005953545586108017
+0.045453028137860924
+-0.0034836438197160817
+-0.001388450719569136
+0.00125225358877311
+0.022047218590065157
+0.02214152351820228
+-0.009418583020159358
+0.00482844688876188
+-0.0003873221638957754
+-0.026704357129102175
+-0.005348148198515291
+-0.020263177156264495
+-0.010379854032287585
+-0.004753658733919222
+-0.0017923966179530845
+-0.00013720725639612647
+0.00384633678699258
+0.0026986386008604948
+-0.00962113993648937
+-0.00579690016629239
+-0.002127540859960777
+-0.0015869503838477335
+0.01045484183324804
+0.0029977160435196784
+0.002853453349393122
+6.805589010995881e-05
+0.0011947028289136534
+0.0041617778225144664
+0.008978291399443178
+-0.0016246999475701958
+-0.004658229959642826
+0.0028109327984521407
+0.0024346540263274702
+-0.009368908243296914
+-0.0052915220583809736
+-0.0019320802509412986
+-0.009933943584471711
+-0.006719510186115919
+-0.0027486856239499827
+0.00034991315257437374
+-0.0007834636732880383
+0.0019274057823678986
+0.0031801082602047324
+-0.0012237221252534914
+-0.0019109520501813893
+0.00025037075438579957
+-0.0030955202463385863
+-0.0020123884895001773
+0.00044201788887241264
+0.0009931238024801416
+0.0006270468026688679
+-0.00354952370340649
+-0.0002835772052207178
+-0.0011506827211536774
+-0.0015533485676542222
+0.000529502165692271
+0.0010822007034342867
+0.0002646861684351726
+0.0026456938210940644
+-0.0020303236918554858
+-0.0008369354944912611
+-0.00043876032646989767
+0.00013813215037517432
+0.0001916875593597152
+-0.0006965824342630978
+0.00026346253076360007
+-0.00043434009534921704
+-0.0001348434984332917
+0.0001310694972658307
+0.00015543654035622323
+-0.0003715809810155002
+-0.00013576570442584804
+-0.0022647333504122466
+0.022341828225511354
+-0.006205136274909991
+-0.006066889689962213
+-0.005470051550577403
+0.00029260538675353386
+0.004475729737275435
+-0.004841096212913104
+-0.0038106691203649095
+-0.005662750362950582
+-0.003368981874227167
+-0.001836720660769856
+-0.0007729370637885716
+0.0061995265548513276
+0.0033591206219055173
+-0.0011782431106539257
+0.0019318430076235408
+0.0011039178261619772
+0.0010370816166496383
+-0.0019098730422093925
+-0.004257466815341621
+-0.0013918855642565029
+0.04550831537555661
+-0.010991925804103027
+0.008743791080236275
+0.0010859632984481125
+-0.0007286705670636669
+-0.0004921556704186323
+-9.49998438838776e-05
+-0.008349844225226116
+-0.006516331005689712
+-0.0030756113075126345
+-0.0009755466399345294
+-0.0009784155132997192
+-0.010907844635984827
+0.008112399484844855
+0.0021402653041987956
+-0.005729283325787883
+0.004988562428219325
+-0.0006431373703333818
+0.00032051679837073196
+0.0002094310388391499
+0.00020513184578761765
+-0.0018596314894194087
+-0.002287183239877805
+-0.0032709663103351583
+-0.001064081517525392
+0.008585275789595968
+0.003585743924153775
+-0.004256175192059854
+0.00849266017472649
+0.0035143824516370593
+0.0011943881788082293
+-0.0003804254461869532
+0.0013999289086634096
+0.0032116817258315564
+0.0026101409873510797
+0.003645947866137159
+-0.005292061114623796
+0.001001091848654026
+0.0029947648702228708
+-0.004355654858623979
+-0.0009123006871873891
+0.009909763597441525
+0.003123599856936215
+0.001609570629590827
+0.0014407490768560758
+-0.0037593046491876426
+-0.0018599641966802463
+0.005691837284388049
+-0.0001510197176087444
+-0.0024611620093862134
+0.0006413074433243471
+0.0019360017863451551
+0.005924860587068085
+0.00014338078509152567
+-0.0029043990697536918
+0.00037869198952044574
+0.0005314485305646517
+-0.002954254988162472
+-0.0024558727090604362
+0.00015172143081083837
+0.004032450679425271
+0.00039358684472068974
+-0.0014852461366664823
+-0.002078028255243636
+-0.004344479718123
+0.0038612620062380104
+0.0007507206351707442
+0.0002164779392235719
+0.0003704843132959377
+-0.00012881502891281749
+0.002963846646572681
+0.0014430750514233131
+0.0007677977590249816
+-0.000551237615319674
+0.00014368525153145168
+-0.00035649636174449144
+-0.00024595334885017903
+-0.00019198199783422446
+0.0005631647280434516
+0.00041387862919760917
+0.00049658115944942
+0.0006835961047099554
+0.0005975118652315885
+-0.00024594789700606496
+-0.00021821237719689656
+0.00028362107371726863
+0.0006185641527762518
+-0.00044411282633300103
+0.0005562589134658759
+-0.000404994776220183
+-0.00021810580003653974
+8.829472891013419e-05
+-0.0006796699322054896
+-1.402150048335565e-05
+0.00010110510514033839
+-0.002620634935298386
+-0.0023654654725177617
+0.004627951427232762
+-0.0007392139402325516
+0.0003582294505198363
+-0.00023974278407371444
+0.0005123386200833549
+-0.001865171117512186
+-0.003953247857941306
+-0.001361912177193327
+-0.0007530705020349742
+0.0014248353139677957
+0.0006173402162106201
+-0.001808893437319689
+-0.0006193169024632379
+-0.0006914433571719881
+-0.0032503525323959244
+0.0018582687998393878
+-0.0047030055672821975
+-0.0020317609261675976
+-0.0011518344937899684
+0.00016183352514699157
+0.0013353839088337592
+-0.002220561906665887
+-0.004800833614188147
+-0.0035744872895007206
+0.0020555647444771533
+5.6143231433116074e-05
+0.003300509850594326
+-0.0005530146552798123
+-0.00021656062715533095
+0.009775470449955508
+0.00029056442687873895
+-0.00013963011031780168
+0.001788295016573429
+0.0010467370049577387
+0.0019790330953067536
+-0.003661156034874619
+0.00021495007612469942
+-0.0011655414466003667
+-0.0029417753962148485
+0.00021372981579840706
+0.0010104002391253546
+-0.0002715249820228884
+0.0004401425892943739
+0.0047352625789872085
+0.0023401164415047483
+-0.0002815733562203963
+0.000699146075523123
+-0.002383269522097874
+0.0074218088155191975
+0.0012850787238422939
+-0.0021118941168366216
+-0.0009613002600870781
+5.864309148121324e-05
+-0.000506007986640435
+-0.0002983755274646727
+0.0005903089711529376
+0.0011111176501449854
+0.00013352005988996127
+-0.00016367534962229063
+-0.0005017348531242773
+0.001929465605276709
+1.0333932872210561e-05
+0.0007166223237095169
+0.00022579029609651394
+2.588892212268369e-05
+0.0011835540594136626
+-0.00040319636858848166
+-0.0002553234369394281
+0.00038352448657665933
+3.386144296988702e-05
+-0.001836528136091292
+0.00021409525698569642
+-0.00032171860198724036
+-0.000622273888670325
+-0.0003343567520720101
+-9.182755473380859e-05
+0.0011933054664371768
+3.763164350444565e-05
+5.203144128701167e-05
+0.00020829534235537492
+8.440226601600742e-05
+0.0001810479058329711
+-0.0001485917605475064
+-0.0005020493225437182
+-0.00032810546567428763
+6.166660653270683e-05
+0.00015795839274900615
+-7.699352330007406e-05
+1.0184656982393807e-05
+-0.0019715138472229687
+-0.0020073968210085158
+-0.0004176441316029867
+0.00043307221312676337
+0.001064992944994761
+0.00014722510109121349
+-0.002364257563542085
+-0.0004987727532629713
+0.000634123828754501
+-0.0037731261938282155
+-0.002036883790473753
+0.00016437050043094037
+0.0025043822392641054
+-5.794714580143734e-05
+-0.0022074039468362996
+0.0020086983879189935
+3.6624170339024163e-06
+0.0011245753564837013
+0.0012106264256998148
+0.0015078422809317116
+-7.523370215046021e-06
+-0.0034601446350195045
+-0.00013781040095016555
+0.0002642077577331552
+0.0011177346639295138
+0.0006911956929363105
+-6.032812233619523e-05
+-0.0006935975314753891
+-0.0001403308206133063
+-0.00019637883413635944
+0.0007621905728841977
+-0.00027228774140544086
+6.827287698978965e-05
+0.0006085621970632685
+3.3428366760204596e-05
+5.8148971768074205e-05
+-0.0002512448153702301
+-0.00011201655478792101
+1.5843865220278162e-05
+0.006296864680729187
+0.0009286096888887845
+0.0002548584717626181
+9.368549135708728e-05
+-1.1722666095177873e-05
+-0.00014445599719675858
diff --git a/potentials/Mo_Zuo_JPCA2020.quadratic.snapparam b/potentials/Mo_Zuo_JPCA2020.quadratic.snapparam
new file mode 100644
index 0000000000..1d5c28b2eb
--- /dev/null
+++ b/potentials/Mo_Zuo_JPCA2020.quadratic.snapparam
@@ -0,0 +1,9 @@
+# DATE: 2020-01-31 CONTRIBUTOR: Yunxing Zuo <y9zuo@eng.ucsd.edu> CITATION: Y. Zuo, C. Chen, X, Li, Z. Deng, Y. Chen, J. Behler, G. Csányi, A. V. Shapeev, A. P. Thompson, M. A. Wood, S. P. Ong, "Performance and Cost Assessment of Machine Learning Interatomic Potentials" J. Phys. Chem. A 124, 4, 731-745 (2020)
+# Generated by Materials Virtual Lab
+
+rcutfac 5.2
+twojmax 6
+rfac0 0.99363
+rmin0 0
+quadraticflag 1
+bzeroflag 0
diff --git a/potentials/Mo_Zuo_JPCA2020.snap b/potentials/Mo_Zuo_JPCA2020.snap
new file mode 100644
index 0000000000..81fe9c24ae
--- /dev/null
+++ b/potentials/Mo_Zuo_JPCA2020.snap
@@ -0,0 +1,5 @@
+# DATE: 2020-01-31 CONTRIBUTOR: Yunxing Zuo <y9zuo@eng.ucsd.edu> CITATION: Y. Zuo, C. Chen, X, Li, Z. Deng, Y. Chen, J. Behler, G. Csányi, A. V. Shapeev, A. P. Thompson, M. A. Wood, S. P. Ong, "Performance and Cost Assessment of Machine Learning Interatomic Potentials" J. Phys. Chem. A 124, 4, 731-745 (2020)
+# Generated by Materials Virtual Lab
+
+pair_style snap
+pair_coeff * * Mo_Zuo_JPCA2020.snapcoeff Mo_Zuo_JPCA2020.snapparam Mo
diff --git a/potentials/Mo_Zuo_JPCA2020.snapcoeff b/potentials/Mo_Zuo_JPCA2020.snapcoeff
new file mode 100644
index 0000000000..839db6792c
--- /dev/null
+++ b/potentials/Mo_Zuo_JPCA2020.snapcoeff
@@ -0,0 +1,36 @@
+# DATE: 2020-01-31 CONTRIBUTOR: Yunxing Zuo <y9zuo@eng.ucsd.edu> CITATION: Y. Zuo, C. Chen, X, Li, Z. Deng, Y. Chen, J. Behler, G. Csányi, A. V. Shapeev, A. P. Thompson, M. A. Wood, S. P. Ong, "Performance and Cost Assessment of Machine Learning Interatomic Potentials" J. Phys. Chem. A 124, 4, 731-745 (2020)
+# Generated by Materials Virtual Lab
+
+1 31
+Mo 0.5 1
+-17.762702673549285
+0.02178925465143394
+0.0034745701647209758
+0.30915622205909093
+0.02899432432314361
+0.6209839107774174
+0.26114917061057
+0.19006433764250869
+0.017254172264534122
+0.27785227586454786
+0.28879256134802844
+0.10086566742884026
+0.09395419349167436
+0.011563742687598653
+0.018074432449994685
+0.1318986782245502
+0.09473608457162533
+0.09697249346594379
+0.06796804957852472
+0.009058281101362966
+-0.017251248829005406
+0.0033493610548456947
+0.06883283837405953
+0.06276174257928209
+-0.007960716239306791
+0.016230577837509374
+-0.041246164097147035
+-0.0032769754000261603
+0.058385382001993454
+-0.0016932115732663107
+0.0008444839877686181
diff --git a/potentials/Mo_Zuo_JPCA2020.snapparam b/potentials/Mo_Zuo_JPCA2020.snapparam
new file mode 100644
index 0000000000..4c09580a14
--- /dev/null
+++ b/potentials/Mo_Zuo_JPCA2020.snapparam
@@ -0,0 +1,9 @@
+# DATE: 2020-01-31 CONTRIBUTOR: Yunxing Zuo <y9zuo@eng.ucsd.edu> CITATION: Y. Zuo, C. Chen, X, Li, Z. Deng, Y. Chen, J. Behler, G. Csányi, A. V. Shapeev, A. P. Thompson, M. A. Wood, S. P. Ong, "Performance and Cost Assessment of Machine Learning Interatomic Potentials" J. Phys. Chem. A 124, 4, 731-745 (2020)
+# Generated by Materials Virtual Lab
+
+rcutfac 4.6
+twojmax 6
+rfac0 0.99363
+rmin0 0
+quadraticflag 0
+bzeroflag 0
diff --git a/potentials/Ni_Zuo_JPCA2020.quadratic.snap b/potentials/Ni_Zuo_JPCA2020.quadratic.snap
new file mode 100644
index 0000000000..263eb00492
--- /dev/null
+++ b/potentials/Ni_Zuo_JPCA2020.quadratic.snap
@@ -0,0 +1,5 @@
+# DATE: 2020-01-31 CONTRIBUTOR: Yunxing Zuo <y9zuo@eng.ucsd.edu> CITATION: Y. Zuo, C. Chen, X, Li, Z. Deng, Y. Chen, J. Behler, G. Csányi, A. V. Shapeev, A. P. Thompson, M. A. Wood, S. P. Ong, "Performance and Cost Assessment of Machine Learning Interatomic Potentials" J. Phys. Chem. A 124, 4, 731-745 (2020)
+# Generated by Materials Virtual Lab
+
+pair_style snap
+pair_coeff * * Ni_Zuo_JPCA2020.quadratic.snapcoeff Ni_Zuo_JPCA2020.quadratic.snapparam Ni
diff --git a/potentials/Ni_Zuo_JPCA2020.quadratic.snapcoeff b/potentials/Ni_Zuo_JPCA2020.quadratic.snapcoeff
new file mode 100644
index 0000000000..54456b95e9
--- /dev/null
+++ b/potentials/Ni_Zuo_JPCA2020.quadratic.snapcoeff
@@ -0,0 +1,501 @@
+# DATE: 2020-01-31 CONTRIBUTOR: Yunxing Zuo <y9zuo@eng.ucsd.edu> CITATION: Y. Zuo, C. Chen, X, Li, Z. Deng, Y. Chen, J. Behler, G. Csányi, A. V. Shapeev, A. P. Thompson, M. A. Wood, S. P. Ong, "Performance and Cost Assessment of Machine Learning Interatomic Potentials" J. Phys. Chem. A 124, 4, 731-745 (2020)
+# Generated by Materials Virtual Lab
+
+1 496
+Ni 0.5 1
+10.356343450183674
+0.11285514870052679
+0.9274095140066043
+0.07374085611284704
+-0.03762640327861091
+0.5229413785343182
+-2.078612041780932
+1.2071495991852963
+-0.4671999567607938
+-0.5995481419268094
+-2.1514182588022948
+0.35009807122951564
+-0.3820784708801409
+0.35833945255729777
+0.057165603344637814
+-0.5295246422142617
+-1.3283024150787217
+-0.20543311892763128
+-0.850282189828648
+-0.14742987699512713
+-0.11777066147130788
+-0.08282441791473201
+0.19288963818184274
+0.45023114102732564
+0.4629007146856834
+-0.28578193623848513
+-0.12329657750071922
+-0.021653659576176036
+0.20677575989515198
+-0.214705010183548
+-0.06699754710623217
+0.0010490049323940986
+-0.006168114640355271
+0.008067212419163867
+-0.0011030910911700165
+0.0005994933841398931
+0.005716575524086172
+-0.008406370344080007
+0.0003852844986020343
+0.005271888415372926
+0.0017449977421995534
+-0.002462237158467162
+-0.002274350881051268
+-0.001822179448588257
+-0.003099396465033988
+0.0035066918931879187
+0.003112581277164732
+0.0012513791181766876
+0.0011393905249604264
+0.002375443369489638
+0.002701345855483761
+0.000483930511227193
+-0.004155093314785363
+-0.00277588339115592
+-0.004197909720586257
+0.0010917830087771585
+-0.0009784502365698389
+-0.0011932553036097526
+0.0005711356321667083
+0.0032328302628335803
+0.0014684486431447707
+-0.0021185204109687526
+-0.07943777262183052
+0.005787494089779317
+-0.067779055525252
+-0.022186760548394725
+-0.025991937077610633
+-0.0003599563854197324
+-0.04365491915404268
+-0.02454369221686112
+-0.022921266764835427
+-0.009766407550341
+-0.004230163362609708
+0.009550233386118233
+-0.01767981801333133
+-0.0294865773655346
+-0.020199076798239915
+-0.010339615854554287
+-0.010743711324784244
+-0.014821316745393949
+-0.0021862051041535435
+0.009792324334288676
+0.006024421285798565
+-0.0007967732992836818
+0.0047376975486344165
+0.0012450576046151044
+0.0028180742431499484
+0.004093403956813072
+-0.0032382222845371567
+-0.0008814166456505707
+-0.03485858993981602
+-0.009702754827562322
+-0.007407501018857015
+0.027506788257423465
+-0.015754927767368608
+0.017122275332912773
+0.08871026067901236
+0.11723125979961196
+-0.020306447928976835
+-0.010390420652763691
+-0.026641453005539217
+-0.01125547442325546
+0.04282589817257829
+0.021926165529211755
+0.02594901316199998
+-0.0694221838315221
+0.014677365446048033
+0.027348594452072876
+0.00823821004923752
+-0.011555112804893939
+-0.028261754546953274
+-0.04841611737854069
+-0.029924159201091337
+0.009537137273924818
+-0.006538301753995376
+0.0060980678637218046
+-0.0006631782984074224
+0.00955674838938158
+0.0031254156777456576
+0.004167450579135531
+0.00149022465083902
+0.0025842005483934904
+-0.0017211645525154334
+-0.01663467347244394
+0.002926022454963536
+-0.007447368863892981
+0.0037096679865115355
+0.0004586509992300647
+0.004172275787886676
+-0.005605297584632723
+-0.0024450998962981044
+-0.013127900910770686
+0.002965245923123843
+-0.0034208471312272837
+-0.004982347881437095
+-0.0007838700552988964
+0.01761585636029113
+0.010757506459215659
+0.0045147386850326945
+-0.0012374494373584323
+0.0009717112790320892
+0.0014684532116287785
+0.003414647583984076
+-0.0033174178783450872
+-0.0005560601259608083
+-0.07885721073822803
+0.06689268744630027
+-0.09774780566333842
+0.0158079328051004
+0.04597370315706318
+0.06464642643877996
+-0.03336859432705273
+-0.002540354252708543
+-0.02944169944965777
+-0.0051663828566425145
+0.08008449132499999
+0.013176585647365896
+0.0223823853360507
+0.014485498680166166
+0.00910517696265692
+-0.009271292352902426
+-0.004351748093255135
+0.013763358425560207
+-0.017015001248872574
+-0.03627594694628519
+0.0210995038687364
+-0.005408278557766544
+-0.002528201770993166
+0.003827214818729885
+0.002710974143157314
+0.008532397295622544
+0.03433676134977772
+0.041881803584699506
+-0.004910703948876681
+0.07418187646669822
+0.08569575581751998
+0.03083248989248409
+0.04995176457917469
+0.008139283440940902
+-0.000658557526262064
+0.019819844505725073
+0.0282057104627595
+0.006754321509859343
+0.030723595102822052
+0.007187657408111756
+-0.00102458592777439
+0.0007207429517628178
+-0.00830648545870933
+-0.0033209992514436574
+-0.0002492064696736976
+0.006770967245181575
+0.003982408848650698
+0.001058208868727907
+-0.011393406360556139
+0.0016014090686503682
+0.001175194333940987
+-0.08536565528610686
+0.016252517781834848
+-0.03174765589100795
+0.007485209652313231
+-0.052923966275135695
+-0.025405307577116825
+-0.02240995597524039
+0.0017477230880338715
+0.02867918062933422
+0.013499916387379506
+-0.005607524355613186
+-0.010131379353610487
+-0.004987327586060365
+-0.005353904813528916
+-7.227686782386444e-06
+0.0056901508178682815
+-0.011811267626707051
+-0.02273355527224015
+0.00689517337508364
+0.00015654899851488303
+0.0006521992616960112
+0.003755133577654982
+-4.7924336153191624e-05
+0.0017674364424168296
+0.002573140569709864
+0.01288815212293809
+0.0077669298168438
+0.006370469572102022
+0.004089929875661286
+-0.0002524968271828687
+0.0023331510533081967
+0.0005138567116430848
+0.006024020461197918
+0.011089431523267523
+0.0027361388316190782
+-0.0012092522218419902
+-0.0006150057333795672
+-0.0006568328330393836
+0.0016514543606173104
+0.005730998179096836
+0.0061333101844434496
+0.00045609981511063324
+0.00010897494637768235
+0.0011704121406372892
+0.0006895921445150832
+-0.0046327708759480585
+-0.001978299214165369
+0.057798910858945396
+0.08160709875199346
+-0.009248094113261725
+0.00015220468744222854
+-0.015051941196011887
+-0.01585966105008821
+0.02004473668523898
+0.05086531075293372
+0.029060459295313396
+0.005820944102771846
+0.011557668256036598
+0.023823771280129427
+0.007322909321767348
+-0.02740632872328317
+-0.01951202619214691
+-0.02848125856023879
+0.003224006478675128
+-0.0026127113067893754
+-0.007254547031873726
+-0.0018929384485002268
+0.021413772206212135
+0.008525567005747067
+0.11958045969386633
+0.024183636059517205
+0.03525435418621041
+0.0026129184995645136
+-0.0029526652741079518
+0.03434268788746694
+0.041061277657030756
+0.021480379642858555
+0.03783384790610266
+0.006384682298040967
+0.007764651279532575
+0.002747604196680589
+-0.0008933067957662758
+-0.027106243382828354
+-0.01714576785349475
+0.007062135307844438
+0.002071101440600853
+0.0005730475559648507
+-0.02253785625098763
+0.0012918802490516253
+0.0011560319676114997
+-0.01313672124289508
+-0.004073355623464989
+-0.01219797917853263
+-0.006935555869745785
+0.011379814337436345
+0.02908221816758577
+-0.004710249096430908
+0.006921246894545055
+0.0094456248158746
+0.0033442849075802673
+0.001916231650224448
+-0.013403101445624288
+-0.014129697727882091
+-0.01944970816982947
+0.007976146245271681
+-0.0007321506149844878
+-0.001065495028795771
+0.002939907123918742
+0.008940460670005573
+0.003810939786104521
+0.0064386426222424326
+-0.00021595693859499665
+-0.0011453107195982526
+-0.001369234564349616
+0.015306575814270107
+-0.006979542487875613
+0.01354119590367061
+0.0023034032118149153
+0.0014999829971070987
+0.0015031719132850146
+-0.0031638040834948873
+-0.019097682065914216
+-0.011055449651782512
+0.006885453367379758
+0.004658747499442603
+4.144283382023772e-06
+-0.008766399138849648
+0.005604438061358422
+0.0017230796305286455
+-0.0030003741093973524
+-0.0011944811459572435
+0.0005128436621485988
+0.0032391286865135066
+-0.014725783507084804
+-0.002109165687645083
+0.0003179415643299287
+-0.00015587605804290305
+0.001448663223253016
+-0.0019323126201333807
+-0.002917039787748224
+-0.008603546494606422
+-0.0009011283096209983
+0.0015919726664343492
+-0.0006271909162907097
+0.0008559071190318845
+0.005774135411819849
+0.002219266189036964
+0.004909664093469324
+-0.0021021405649874064
+-0.0062586542473045265
+-0.0041325243935032285
+-0.00508972249713327
+-0.0025420778029945357
+-0.004610506165407868
+-0.0004304642433176076
+0.00654073707707372
+0.0026744881214183086
+0.0011674887327947775
+0.00029350041266351656
+0.002724748438278801
+0.001751144652147263
+0.00031824677768703055
+-0.004425789637109032
+-0.0007116977451438466
+-0.005398291266006237
+0.00925150027331332
+0.004204959289523218
+0.012666415607438659
+0.0009759266540746931
+0.009358928328404986
+0.0008110782598237318
+-0.009362614611872055
+-0.007947771258531295
+-0.0028742534910043555
+0.0014290023593389483
+0.0036815111555434646
+-0.0008720691922483315
+-0.0054952332748573335
+0.003766816783128242
+0.0018483043668045887
+0.026806486267460735
+0.024081734343988557
+0.023381537806904416
+0.009239665706034954
+0.01098050561471908
+0.0020319213386238086
+-0.021466032977739295
+-0.02087293786358894
+-0.003627785017762543
+0.0035837917920516233
+0.0012456865090610773
+-0.001466970086554692
+-0.013791081676043485
+0.007349221622778127
+-0.0009073606009937923
+0.020026390018866115
+1.7645186505071964e-05
+-0.000645696493857646
+0.007124570031684287
+0.0030014742465431926
+-0.02821506609749587
+0.003108592927598613
+-0.011643052758699406
+-0.0009367211723152191
+0.0003286480170214129
+-0.0021467065304053012
+0.007464160152785795
+0.007423722335587319
+0.004298938941106785
+0.022972342937271885
+0.01097847944415329
+0.0046584217637678504
+0.001039075756955235
+-0.010352390185044177
+-0.007424674338292241
+0.00013611082039862409
+0.0028874903368086846
+0.0026218970379646017
+0.0001241484377495182
+-0.005594491518577391
+0.0059670045875896745
+0.0009897548839400139
+0.0014598821381248267
+0.00046038065493921726
+-0.0015689460575785408
+0.003412801097719638
+-0.00420024899318243
+-0.0007158372914741577
+0.002752764000210302
+0.00046388687458916167
+-0.00019443840265627454
+0.0013545305636312038
+0.0008896050369491572
+-0.0007452517708710048
+0.005118026784602967
+0.0020865486856176396
+-0.00870716067385956
+0.0010763435213221352
+-0.002783564782065276
+-0.002724807267172294
+-0.00481405420142534
+-0.0021042204010641163
+-0.0009278000907149697
+0.007010320800915041
+0.0014057225530113224
+0.0005281615786202898
+-0.0012354889502706537
+-0.0007876582262306697
+0.0005094599531176996
+-0.0009291381001668431
+-0.0016090022752804356
+-0.0003966450442366154
+-0.001512170295391739
+0.0011913517430552079
+-0.00038827942852798225
+0.019397247007001624
+-0.0018494902344606823
+-0.002754547287999509
+0.0018388338209735918
+0.012141620260526877
+0.004239197883857626
+0.0008144101513924418
+-0.008039035164525886
+-0.00029238030866039766
+-0.006878786465980039
+0.004516233912781824
+0.0004921100652847859
+0.003173179162615114
+0.00030506542852948293
+-0.004336385846769104
+-0.0004732647100172162
+-0.0016329308939515494
+-0.0009618891990548564
+-0.00011707594868689934
+-0.0003910037913128217
+0.0006910874093864622
+0.003999268445077725
+0.003572664106524251
+0.0008943460943900694
+0.0026039717367661447
+0.004246025582946306
+0.0004731921176533149
+0.003529727562944524
+-0.0018285657006552047
+0.000660266111630288
+0.0037295165265255753
+0.0014090040055322328
+0.0005391916371809274
+-0.006425068797073941
+-0.00044727871618421844
+0.0005906371965740953
+-0.00019355990042069227
+-0.0011566183965259352
+-0.00019156800417580166
+0.0005014915867621317
+-0.0013753769517430708
+-0.0010297995066643612
+0.0017389392843440293
+-0.001502483116572792
+-0.000273051878340938
diff --git a/potentials/Ni_Zuo_JPCA2020.quadratic.snapparam b/potentials/Ni_Zuo_JPCA2020.quadratic.snapparam
new file mode 100644
index 0000000000..5f01150fff
--- /dev/null
+++ b/potentials/Ni_Zuo_JPCA2020.quadratic.snapparam
@@ -0,0 +1,9 @@
+# DATE: 2020-01-31 CONTRIBUTOR: Yunxing Zuo <y9zuo@eng.ucsd.edu> CITATION: Y. Zuo, C. Chen, X, Li, Z. Deng, Y. Chen, J. Behler, G. Csányi, A. V. Shapeev, A. P. Thompson, M. A. Wood, S. P. Ong, "Performance and Cost Assessment of Machine Learning Interatomic Potentials" J. Phys. Chem. A 124, 4, 731-745 (2020)
+# Generated by Materials Virtual Lab
+
+rcutfac 3.8
+twojmax 6
+rfac0 0.99363
+rmin0 0
+quadraticflag 1
+bzeroflag 0
diff --git a/potentials/Ni_Zuo_JPCA2020.snap b/potentials/Ni_Zuo_JPCA2020.snap
new file mode 100644
index 0000000000..1e627f4c09
--- /dev/null
+++ b/potentials/Ni_Zuo_JPCA2020.snap
@@ -0,0 +1,5 @@
+# DATE: 2020-01-31 CONTRIBUTOR: Yunxing Zuo <y9zuo@eng.ucsd.edu> CITATION: Y. Zuo, C. Chen, X, Li, Z. Deng, Y. Chen, J. Behler, G. Csányi, A. V. Shapeev, A. P. Thompson, M. A. Wood, S. P. Ong, "Performance and Cost Assessment of Machine Learning Interatomic Potentials" J. Phys. Chem. A 124, 4, 731-745 (2020)
+# Generated by Materials Virtual Lab
+
+pair_style snap
+pair_coeff * * Ni_Zuo_JPCA2020.snapcoeff Ni_Zuo_JPCA2020.snapparam Ni
diff --git a/potentials/Ni_Zuo_JPCA2020.snapcoeff b/potentials/Ni_Zuo_JPCA2020.snapcoeff
new file mode 100644
index 0000000000..e8948f0ffd
--- /dev/null
+++ b/potentials/Ni_Zuo_JPCA2020.snapcoeff
@@ -0,0 +1,61 @@
+# DATE: 2020-01-31 CONTRIBUTOR: Yunxing Zuo <y9zuo@eng.ucsd.edu> CITATION: Y. Zuo, C. Chen, X, Li, Z. Deng, Y. Chen, J. Behler, G. Csányi, A. V. Shapeev, A. P. Thompson, M. A. Wood, S. P. Ong, "Performance and Cost Assessment of Machine Learning Interatomic Potentials" J. Phys. Chem. A 124, 4, 731-745 (2020)
+# Generated by Materials Virtual Lab
+
+1 56
+Ni 0.5 1
+-13.981410261722266
+0.014498298295814536
+0.01009901609878365
+0.12054695725330583
+-0.006889616925370962
+0.2776408812983965
+0.11092253195422327
+0.11050083502221106
+0.010313578861053413
+0.12340040989449619
+0.13039135510234542
+0.1352821529381515
+0.061399614328409104
+0.02477626778018876
+0.005134285723997267
+0.09622793751539735
+0.048797107907248935
+0.099150739352655
+0.08182747420199402
+0.020030009874751214
+0.022720360502777287
+0.0316253340060541
+0.0015374207047660696
+-0.0004492196418074551
+0.05837912394391745
+0.041884387551950654
+0.05650849600714676
+0.05599900218342105
+0.0004479044912328832
+0.03278488848430462
+0.028915949720689595
+0.013706496643580618
+0.00490725689107064
+-0.007009295051790751
+0.03158298910258939
+0.03669162053334976
+0.02309349791553273
+0.031709528269101145
+0.0170053035722206
+0.007918753870603402
+0.01374372143122009
+0.004859557404579148
+0.005663710130194816
+-0.003706838361900361
+0.007243319266009754
+0.016766602962023897
+0.008563185376256069
+0.0024990411637851664
+0.000733392821839908
+0.0043099402533140554
+0.0007772409882662451
+-0.0007573338114589823
+0.002526539410172261
+-0.0008004751079078755
+-0.0009174591208531259
+0.0008135791723930669
diff --git a/potentials/Ni_Zuo_JPCA2020.snapparam b/potentials/Ni_Zuo_JPCA2020.snapparam
new file mode 100644
index 0000000000..9e9ac1b176
--- /dev/null
+++ b/potentials/Ni_Zuo_JPCA2020.snapparam
@@ -0,0 +1,9 @@
+# DATE: 2020-01-31 CONTRIBUTOR: Yunxing Zuo <y9zuo@eng.ucsd.edu> CITATION: Y. Zuo, C. Chen, X, Li, Z. Deng, Y. Chen, J. Behler, G. Csányi, A. V. Shapeev, A. P. Thompson, M. A. Wood, S. P. Ong, "Performance and Cost Assessment of Machine Learning Interatomic Potentials" J. Phys. Chem. A 124, 4, 731-745 (2020)
+# Generated by Materials Virtual Lab
+
+rcutfac 4.1
+twojmax 8
+rfac0 0.99363
+rmin0 0
+quadraticflag 0
+bzeroflag 0
diff --git a/potentials/Si_Zuo_JPCA2020.quadratic.snap b/potentials/Si_Zuo_JPCA2020.quadratic.snap
new file mode 100644
index 0000000000..e2e1615dcd
--- /dev/null
+++ b/potentials/Si_Zuo_JPCA2020.quadratic.snap
@@ -0,0 +1,5 @@
+# DATE: 2020-01-31 CONTRIBUTOR: Yunxing Zuo <y9zuo@eng.ucsd.edu> CITATION: Y. Zuo, C. Chen, X, Li, Z. Deng, Y. Chen, J. Behler, G. Csányi, A. V. Shapeev, A. P. Thompson, M. A. Wood, S. P. Ong, "Performance and Cost Assessment of Machine Learning Interatomic Potentials" J. Phys. Chem. A 124, 4, 731-745 (2020)
+# Generated by Materials Virtual Lab
+
+pair_style snap
+pair_coeff * * Si_Zuo_JPCA2020.quadratic.snapcoeff Si_Zuo_JPCA2020.quadratic.snapparam Si
diff --git a/potentials/Si_Zuo_JPCA2020.quadratic.snapcoeff b/potentials/Si_Zuo_JPCA2020.quadratic.snapcoeff
new file mode 100644
index 0000000000..7518c6743d
--- /dev/null
+++ b/potentials/Si_Zuo_JPCA2020.quadratic.snapcoeff
@@ -0,0 +1,1601 @@
+# DATE: 2020-01-31 CONTRIBUTOR: Yunxing Zuo <y9zuo@eng.ucsd.edu> CITATION: Y. Zuo, C. Chen, X, Li, Z. Deng, Y. Chen, J. Behler, G. Csányi, A. V. Shapeev, A. P. Thompson, M. A. Wood, S. P. Ong, "Performance and Cost Assessment of Machine Learning Interatomic Potentials" J. Phys. Chem. A 124, 4, 731-745 (2020)
+# Generated by Materials Virtual Lab
+
+1 1596
+Si 0.5 1
+-8.60381343941101
+0.02724279089430306
+0.0382978639449218
+-0.059135611941763734
+-0.022469268145230988
+0.31078070914968964
+0.028250370524602924
+0.15884510964654874
+-0.0018818228289777877
+0.1104075519879815
+0.16600415543120833
+0.17854131431858453
+0.019884034431182564
+-0.010582078003950673
+0.002919209915460911
+0.031951880278949824
+0.0284734901695315
+-0.0027463790748705626
+0.034568235179297295
+0.05581179363320642
+-0.04213151013256595
+0.0155195709312579
+0.0027627025118226443
+-0.010270359005253587
+-0.004056562172971866
+0.013228379125830773
+0.04006505615063854
+-0.01077053709901137
+-0.01870496907580156
+-0.008359601446913747
+0.004670754321945049
+0.009369362401843061
+-0.008456890940705846
+-0.015940580658889193
+-0.005639278643285845
+0.017388857152686652
+0.012803238364164934
+0.001412789663510868
+0.005278950579174187
+0.030185901245440107
+-0.010340464945514372
+0.007093441244430586
+0.020229599963893955
+0.0034835589598915203
+0.008347589386899083
+0.00947983975269158
+-0.00015657060688975064
+-0.018876295438747123
+-0.02570406556759939
+-0.0034270361336047207
+0.002746422458795987
+0.0034366045464033694
+0.0005261176390100831
+-0.020677258204760275
+-0.0002064880730051535
+0.008645913324792406
+-0.00010210547945324737
+0.0006217018884858203
+2.419627948491256e-05
+-4.2306821395859584e-05
+0.002684443032344462
+0.000821254732767729
+0.001069816009411805
+0.0002187632896116409
+0.00038505713815236646
+0.0004551451056643268
+0.000373312244618836
+-0.0007699706281051147
+-0.00022098833966362034
+0.00011887128143738697
+-0.00020157373452982824
+-0.0001404155605364245
+-0.0006965528592313201
+-0.0007812061663256975
+0.0001431771843555047
+-0.000139656729922648
+-8.192015345425309e-05
+-6.0047351199788445e-05
+3.9074750722565376e-05
+-0.00023028318003983286
+-5.1113258911165595e-05
+2.5899201273732897e-05
+-0.00045928667710620075
+0.00010779138193265056
+7.168971586662237e-05
+-9.052868873681675e-05
+-6.842104730468374e-05
+-2.840632315661998e-06
+3.0188922898302556e-05
+-0.0005287838257987534
+-8.350768145737017e-05
+-9.117414316602559e-06
+-0.0003637395990636218
+0.00012507997795971514
+1.095728190866077e-05
+-7.958951170375615e-05
+6.768455512576914e-05
+0.0001977989151520111
+0.00011466532508880328
+-0.00018712509750793451
+6.697589206695595e-07
+-0.00012321654059126446
+-0.00022565471771289066
+-0.00022340842851595536
+2.1097397851914358e-05
+0.00010644146865836326
+-4.773356586701389e-05
+-8.432185127163873e-05
+-2.134858791341665e-05
+8.790988171328561e-05
+0.00014997884312737875
+-0.0007691577704898309
+-0.0022260493994538696
+-0.0007339199933411134
+-0.0015860887466535038
+0.00033086784997736837
+-0.00208066681775156
+-0.001374148821827741
+0.00045934634346426133
+-0.0010571036877817714
+-6.482490492749602e-05
+0.0001473091757385153
+0.0020729079054001877
+-0.0007930329343419169
+0.0010201267315194098
+-0.0009616338851502219
+0.00278498395362424
+-0.0005417249935857731
+0.0013325934877987235
+4.7982414809808914e-05
+9.542182728612904e-05
+6.315336612505549e-07
+-0.00011776773008583216
+0.0003554284862292288
+0.0004875048647266445
+0.001470893741297409
+0.0008179090759421001
+-0.0002169087798779289
+-0.0002364417692602614
+5.673763889642477e-05
+-0.0009192519321614765
+0.00044184228391746437
+9.57947488506238e-05
+0.0010957876325566865
+-0.00014087748334287706
+0.00032286403075778035
+-0.0010964008018763103
+3.5856701869119556e-05
+-0.0004896556337959829
+-0.0020006275800317267
+-0.0006614236312838659
+-0.00016789281491668865
+-0.00014405945519627223
+-0.0014562642886722461
+-0.0003592737069641204
+-0.00040809658078896606
+0.0003359777686405451
+0.00010799473834431042
+-0.000604693094783504
+0.0004613358451474725
+-0.0001920724736413314
+-0.0001705064222435641
+0.00027288853745711705
+0.00033480174846841856
+-5.223720867938839e-05
+-0.000686009845765804
+0.004910119025363127
+-0.005441758514968992
+-0.00011255534848273621
+-0.001969829991747434
+-0.0020520073840167414
+0.00042379952410387823
+0.004002549842709792
+0.006817837205176565
+0.0030944722691274903
+0.001825507611969286
+-0.0013888452008599837
+-0.0030703812334626143
+-0.004340919435218329
+0.0032326664374713195
+0.005507326237080978
+0.002292572310415082
+0.0005991706920305731
+0.0018978044746738823
+0.00019911445330389569
+0.0002914737551535627
+0.003152237194123432
+-0.004626615715004749
+0.003322578465856539
+0.0014768312267399324
+-0.0022406632986848272
+0.0022777853574340533
+0.0005396692891744167
+-0.000489423396040125
+-0.0016015497365638976
+-0.0003145694358587105
+0.00530541250524904
+-0.006479144512423571
+0.0007278439277212691
+-3.851398500198904e-06
+0.001233721483332692
+0.002064174998649613
+-0.00492545171624991
+-0.0021724576291618828
+-0.0004494865914962693
+0.0004823732716281559
+0.001076258746321941
+-0.004410520974589717
+0.0008442616598843361
+-0.0006807139453720816
+-0.004366825758906846
+-0.0006114342631710725
+-0.00035649187760256447
+0.0011071507870007399
+-0.002271523580550652
+-0.0015632553973864314
+-0.0008384895558516778
+-0.0004435024754672675
+-0.0005803306271334848
+-8.139659888253993e-05
+-0.0003238397013901128
+-0.0018183638003376216
+-0.0005504804911472294
+0.0010809833472193605
+0.0006681638810909252
+0.0005053420139598167
+0.0008067007157844704
+0.000228878743548799
+0.0005204291772441382
+-0.0010851821041940324
+-0.0006028714627716425
+0.0007622816180973391
+-0.0009694218862703249
+5.368494600277498e-05
+1.1693346944563748e-06
+-0.0007288221004294388
+-0.00013429342091701848
+0.00012116248039519013
+0.0015261802221595917
+-0.000512089351141719
+0.0020735835441354216
+0.0008011705238293513
+-0.0002685142147330064
+0.00013339339587298342
+-0.00019900858371627256
+5.7164815435592256e-05
+-0.0002680209309034069
+0.0003672536934981119
+0.0011379984270592507
+-0.0011668439661583357
+0.001254434268559705
+0.0004601570672266763
+-0.0008905861733601078
+-0.0006207373023202971
+-0.0003323121980682229
+-0.0005593802128230937
+-0.00043025246105757607
+1.2015342962413556e-05
+1.1804837929770492e-05
+-0.001064446094651807
+5.206406824273308e-05
+-0.0005827763300880539
+-0.0008971106222182203
+-3.938615488584882e-05
+7.019400391963816e-05
+0.0002690912937514957
+-0.00047484082496707645
+-0.0004240321022934778
+-0.00016598985191146117
+-2.8996098152315257e-05
+-0.0021841947941134564
+-0.0075622105132339915
+-0.0005410934435793342
+-0.007328062910906491
+0.005859006558602652
+-0.006346392528799435
+0.0037516600567560933
+0.00077427574031905
+0.005089163376061933
+-0.0035729565302529704
+0.00011395316473565108
+-0.0068821311781138645
+0.010003642484653097
+0.0035595436947352182
+0.009818030860727215
+-0.0031492732400055633
+0.003178334561434584
+0.0004936325359482213
+-0.0008827750407069518
+-0.0018942186004675613
+-0.0037505807001579376
+0.00539350280287668
+0.002380848081129637
+-0.0023300221794323077
+-0.0013095609983222267
+0.003952750544665411
+-0.001358958258582438
+0.000554783266551297
+-2.4891101688034454e-05
+0.002647970005504131
+-0.004201350599193123
+0.002753102736217411
+0.0010205339205574618
+-0.0006601629108276129
+0.0016747990102448746
+-0.004334053368893573
+-0.0024015808937842102
+-0.0011799980338583426
+-0.0008265915906627389
+-0.00035545056314788867
+-0.0029913884641984884
+6.75901787989975e-05
+0.00047364497384839175
+-0.001380591030525701
+-0.0033563755951270887
+0.00013593060776516532
+0.0007526946499951016
+-0.0009804054248074
+-0.0011347776811553789
+-0.0010912645235563925
+-0.0008963715948037883
+-0.003328449508107545
+-0.003283464114293376
+-0.0032741091566250596
+0.0010813319043689754
+-0.006208812508097653
+-0.0021376052489646474
+-1.2055356980599138e-05
+0.0015523115812792572
+-0.001588981360864896
+-0.001989812031761735
+0.00011270141699442218
+0.0012360891016972902
+0.00547872699720951
+0.0028549266849685457
+-0.0005349106241922806
+0.002432548792648568
+-2.5767492036559424e-06
+-0.001379280944517463
+-4.32891108317371e-05
+0.0014385594988800565
+0.0017295573170493714
+0.004678066396129904
+-0.0001501684453130943
+1.7042661320520867e-05
+0.0016764412316835136
+0.0015730362952639425
+-0.00031093065797898006
+-2.242649985220524e-05
+7.691528186534238e-05
+-0.0007685437978216627
+0.000649547909566353
+0.0020181627047349206
+-0.00043743386798658445
+0.00014410685624782722
+-0.00034948348112798385
+-0.0005927971602164035
+-0.0018948301305918836
+-6.37857198231733e-05
+0.0012719677514693314
+0.00018327951273057393
+0.0007093970171894467
+0.0005816829659172079
+-0.0008799217890254918
+-0.0012917211342404664
+-0.001358975360250094
+0.001140405666646001
+0.00036195931155816053
+-0.0006985488779375616
+-0.0016985939555499913
+-0.000688805970808694
+-0.001912606513184795
+-0.0026709896674244624
+0.0010833090525097515
+0.0005110816253117138
+0.004885800704548187
+0.0007121282937784229
+0.0019335177694074423
+-0.001791081553790217
+-0.002488804140417709
+0.0006611710245727647
+0.00618141569285743
+-0.00046721483987085453
+0.0047189159196154105
+-0.0008476483215329564
+0.00031982456125710337
+0.001343092908737355
+-0.001036792412446729
+0.00040602065881578827
+-0.0004848738164133946
+0.0024640431066427475
+-0.0006867020345443848
+0.00020997212085916374
+0.0006306182883969353
+0.0002707845339803715
+0.000493223500749336
+0.0006267194586149
+0.00047763080953133047
+0.0016946198911297146
+-0.0009231698889782756
+6.279339516766485e-05
+-0.0013814943187118308
+-0.00042372246290584204
+0.0007877359174596319
+-0.00027423199899512403
+-0.001919749372994212
+-0.0011198473112442543
+-0.00024234422047180886
+0.0005223534619795307
+-0.0022437479774772054
+-0.0009041479364414283
+-0.00033306839122255555
+0.0003201686521521834
+-0.0014663027782773213
+4.970726276531456e-05
+0.0005220956329500387
+-0.0011260200161170122
+-0.0006312344367498446
+-0.0014694621601823157
+-0.0007520690221137324
+-0.0004988272417355043
+-0.0032094435622324604
+-0.004523478491525614
+-0.002801005898232112
+-0.0006170438251497072
+0.00039541929401525555
+-0.0001127725026517445
+0.00014598053698303056
+-0.0012204705325109763
+0.0008219655491935685
+0.0008655966029033896
+0.00015315999836119782
+-0.0003304176003580713
+0.0005603588991340586
+0.00018588052309453793
+7.244677999755446e-05
+0.0013460969775243783
+0.0010564777302092749
+0.00014451440442490138
+0.002136851804419613
+-0.00011828580366499855
+-0.0002674532109417445
+0.0004601764236311203
+-0.00035908544948664586
+0.0001421688128115707
+-0.00017360731665618762
+0.001892324724487091
+0.0021020532914738377
+0.0009572181734478584
+0.0016336927997411984
+0.0001988474032470676
+0.00018057366778086685
+-0.0007542288694000432
+-0.00029280732501716164
+-0.00022644688822038168
+-0.0002671427287952304
+0.0009918558632558074
+0.0015350581388776441
+0.001047737542811114
+0.0007237498172806985
+0.00022721646502996937
+-0.0005307229879806234
+-0.0002919765541510624
+-0.00010004090718883917
+0.0007901145828649334
+0.00016082944705743776
+-0.000227991014132833
+-0.0001023389945889853
+0.0005660890923936387
+0.0021161263423049863
+0.003387675748325301
+-0.00022595283659259757
+0.002611574311006322
+-0.0018973857507760925
+5.201157301910665e-05
+-0.0004429303320836687
+0.0021380130432999238
+0.0002042033088592022
+0.005792409233200425
+-0.002610571956076379
+0.0026489374237845913
+0.002531661705031143
+9.80557515271989e-05
+-0.0011731582165437737
+0.001419291284954609
+-0.0021659318579138934
+0.0008608972067553695
+0.0013454613185237834
+-0.001341030462324529
+0.000137975379053833
+0.00037994582977147394
+0.0001796054501207122
+0.00032625325269021666
+-0.0011389532980774241
+-0.0009886220509680924
+-0.003788846553276648
+-0.0014889697057346122
+0.0019578942555439306
+0.0002512142088883487
+-0.0029951115662649416
+-0.0006763473947679119
+-0.0013154207391101753
+0.0005623920658935619
+-0.0014770127863449802
+-0.0030114409701376458
+8.172029391503788e-05
+0.00022375108388983817
+-0.0011030697637784428
+-0.0025493846603116634
+0.00015660550932852132
+0.00011326204811559701
+-0.0017971008602853417
+-0.00016850415505311841
+-0.0007879497484252055
+0.0003276564304069892
+-0.007474909754420043
+0.0018606082573971237
+0.003971373579729838
+0.003783488042827631
+-0.0026680289765572953
+0.0013906389771228028
+-0.0010601125781236652
+0.007128499799276819
+0.006011433499065937
+0.003940027021693762
+-0.0007762258233957005
+0.0020034778593450613
+0.0015754457379207982
+1.2732320315668364e-05
+0.0009321717413980002
+0.0013660637730736043
+0.0008314311247226149
+0.0017629331432575319
+0.0010697318982756466
+-0.00230858604744491
+0.0009448018980394592
+-0.002257179016133743
+0.0007727982349034818
+0.0007241528925751396
+-0.0015072005236904853
+-0.0020680429081684514
+-0.001584712195253469
+0.0003858763555885453
+-0.0006234456040373064
+0.000531802477088773
+-0.0024140023282261205
+-0.0014289814587513053
+-0.001860858718603089
+0.00031489812920041516
+0.0016309809259648846
+-0.0005006835599394207
+0.0004929071111643859
+0.0009968459680567655
+-0.0011965694827467265
+-0.0031284828136916637
+-0.002047037285224604
+0.0004296360268512827
+-0.0007886670852997783
+0.0004970081421416612
+-0.0014689439070766142
+-0.0009150210565800932
+0.009378297865165116
+0.0021931803105449095
+0.0033783498873327074
+-0.0017560574154304796
+0.0006700383667191094
+0.0009795895441962106
+0.005939522091509196
+0.0021698173668401747
+0.006380374383369935
+-0.00046324667421983415
+-0.0003569804728980949
+0.002340594434014069
+-0.0004934338518102128
+-0.0017693294130575743
+-0.0017557094367263194
+-0.002649227422559362
+-0.004875020586358581
+0.001818638080979831
+-0.0012038209978061365
+-0.0008816375860025978
+0.0002785206090779292
+0.0002842484588261064
+0.0006455299365442192
+-0.00028699944808364844
+-0.001683470221021833
+-0.0021467035313104312
+-0.003346150672398233
+-0.0005128486804717021
+-0.00031754602514441003
+-0.0006087287978714754
+-0.0002302010630206211
+-0.000995029164513377
+0.00039837351771161814
+-0.000995430434420058
+-0.003522760550764061
+-0.0013080820168789864
+-0.000889629325156566
+0.0007589499624496527
+-0.0018166863188090875
+-0.0006346725132770817
+0.0002039075161856513
+-0.0016377612569889236
+-0.0007242671037801784
+-0.0008732412730356193
+-0.00025119782903493124
+0.0015360819897664243
+0.002221513750085643
+-9.438609805146612e-05
+6.655939432760053e-05
+0.0004432634281943671
+0.0022172809811581806
+-0.001476967404399024
+0.0022623013500700138
+-0.000119645619269114
+-0.0009306184453535774
+0.0012996999043850678
+0.0005671024901268624
+-0.0006418209861986796
+7.975091590708817e-05
+0.0001657725573254309
+-0.0008115553300579476
+0.0017056956184061298
+-5.8145416400839577e-05
+-0.00032746138885659463
+-0.0011757802030432616
+0.0001372100131687116
+0.0007847014656794538
+0.0005152008365809359
+-0.002131110771933302
+-0.00018427683565376657
+-0.0016768756361066018
+-0.0007078929325908788
+0.0003848858922492757
+-0.0003021976473532934
+-0.0011476056358778839
+-0.00048264984159878993
+0.00029857517835037573
+-0.00015651551859749714
+-0.002134414677716256
+-0.0009132263142521044
+-0.0004595395348098171
+-0.0017710912809674384
+-0.0008766207696754708
+-0.0001109852528821425
+0.0003346297021189162
+-0.0012000459638181126
+-0.0003238904841879502
+-0.0011698362552377177
+-0.000321785435316869
+-0.0008900459678557306
+-0.00011088692897728489
+-0.0009309018972879895
+0.0029213734767940046
+-0.0016387191570529187
+0.0016705693702592816
+-0.0009455953155370541
+0.0011788129561980112
+-0.00021813193811921473
+-0.00039801374876252823
+-0.00016770295218974883
+-0.0013909363194963855
+-0.0006310703690943185
+-0.0004818788887763803
+-0.002082052157099313
+-0.00031744466677399957
+0.0008319788128025699
+-0.0010911325434473946
+0.0012217721483056595
+-0.0006652249815575917
+6.356715458459607e-05
+-0.0025654024383720826
+-0.0016727517733250252
+-0.0012165954441106697
+-0.0015159595287313496
+3.965959918968204e-05
+-0.0003612145212704583
+0.0006758617886615438
+0.0009118959096435109
+0.00013089426661339463
+0.0002944174180990066
+-0.0009218728843297121
+-0.0016443640365290486
+-0.000786759062524652
+-0.0006057434707251285
+0.0005620109870855206
+0.0013170682687952968
+9.719994685797972e-05
+0.00010780157344507125
+-0.0009235807492433939
+-0.0001522173218229284
+0.0007434747751228657
+0.00016920764523324245
+0.00037589762704835186
+-6.071664761209439e-05
+-0.001402271802080536
+-6.367932012075603e-05
+0.00014170362347473532
+-0.0003701993327087562
+-4.601560343307226e-05
+-1.997746946156269e-05
+-0.00012409372740875357
+-8.95146607407815e-05
+0.0014723902374106893
+-0.0004373760835580326
+0.001267912340667104
+0.001586964743847941
+0.00028586942835198654
+-0.00011447059076739353
+0.00018472445441907693
+-0.0001746526602132715
+0.0001717721174435789
+-0.0002297931738707033
+0.0013257802162546775
+0.0006622551468028803
+0.000867359166367874
+0.001544647337994565
+-0.0001848874149745028
+-2.51831622405653e-05
+-0.000489474663856294
+6.579678073975563e-05
+-7.371314553313427e-05
+-0.0001894870189393752
+0.0007418713977157534
+0.0005230877017823461
+0.00046090353900481797
+0.0001300567667596631
+-2.2408273738208844e-05
+-0.0004608114399002855
+2.312164277238051e-05
+-0.00014816959758869982
+0.0003361195748688196
+-0.00014147608051782976
+0.00015665535287070963
+6.50612673177179e-05
+-0.0009109850383718281
+0.0007023452625002267
+-0.0008540710972711576
+0.0001282428691644641
+0.0008069264066642434
+-0.0005658159606681828
+0.0008827652408465271
+0.000621540695216341
+0.00021071667210139416
+-0.0008972856774434086
+0.0016644939303423515
+0.0003620132815204873
+0.00047370117012309317
+0.000643880127253201
+-0.0001291736335975991
+0.0002652117704344635
+-0.0005955452376266069
+0.000341363730255354
+0.00023827354316055711
+0.00013010893542622564
+0.001168950879877636
+6.807782295844017e-05
+-0.0004369186195486241
+3.217332139701921e-05
+-0.00012274026978571437
+-0.0008750125003755278
+0.00016163791891364145
+-0.0004056807931776212
+3.764280951517899e-05
+-0.00011908908403837703
+0.0008181733022577023
+9.058756673617651e-05
+0.0002873393346741023
+-0.0009846666803860538
+-0.0005161232799177423
+0.00017788427608070594
+-3.265697968084073e-05
+0.00032256356152251284
+-0.00014830072036187082
+-0.00032434754655808173
+0.00011271304931498206
+0.0022609962299729503
+0.001362223710675304
+0.0021127809527413054
+0.0018294939011181193
+0.00010909846251613178
+0.0014941261843500217
+0.0014553581081007765
+-0.00032649176604548344
+0.00011883022271545566
+0.002208473186632463
+-0.00046531417583665284
+0.00044379197157503697
+0.002559350506490641
+-0.0001547742048117627
+0.0006063516466795359
+-0.00015412374623834002
+0.00018243309223339797
+0.0002439536572065437
+-0.0006837472602974888
+-0.0007361096029683749
+-0.0011548038798254872
+-0.001283220958752532
+0.0001922056521174429
+0.00043327694434753785
+-0.001073513578835591
+-0.00018951403316887601
+-0.0011482362248262498
+0.000627790751134473
+0.0008995697777064861
+0.0013733210907411718
+-0.0005532341227620769
+9.190474475723033e-05
+-0.001573010573715575
+-0.001083156095315833
+-0.0011515597140908235
+0.00038604621868744486
+3.0026825933570248e-05
+-6.33277368004531e-05
+-0.0010734556108837575
+-0.00036528892205649075
+0.0009037878981630452
+0.0009141540865680571
+-0.0023146012003948165
+0.0005707876911542391
+-0.00043846578480426267
+-0.001155859708055406
+0.0010041976699666877
+-0.002996330062855431
+-0.0009634116845888107
+-0.002699036358615359
+-0.001839015362529766
+-0.0014338599275138025
+0.001067800482871509
+-0.0006994787913546818
+-0.0005597076535748055
+-0.0008972503819641003
+0.0007769355248316782
+-0.0028536886161114475
+-0.0002480111264987214
+-0.0016389751885293716
+-0.0007976958659154091
+0.0014915737844493871
+-0.0006267414949632455
+-0.002101804944478783
+6.97184588845339e-05
+7.265403880949096e-07
+0.0003282657561032986
+-0.00230096812060066
+-0.0024887897941002785
+0.00018433500338706433
+0.0021735564353589235
+0.001212729343558166
+-0.0005955873862235519
+0.00011234251198441099
+-0.00013781242704787982
+-0.0009013583531000855
+0.0009577879695032304
+0.0006839385119211289
+0.0004814724793699241
+-0.0030354432607809885
+0.0014366568354613782
+-9.714073653653397e-05
+-0.0006550371039694633
+0.0010210897580216645
+0.0007125720239386298
+-0.0007239235645677362
+0.0008591610301365081
+-0.0004937947879920264
+-0.0028448693198946866
+0.0011784705746229161
+-0.0005720514049078088
+-0.0004778357457294928
+-0.0012208156986138953
+-0.0006701876878984497
+0.0009214606137126888
+0.0009111187921803862
+-0.00045855644130036403
+-0.0007982763174361786
+-0.002342658177761429
+-0.0012690696053579858
+-0.0002908350266274005
+-0.00015822752104503317
+-0.0009871958773025582
+-0.0012497323495144382
+0.00035052449927632813
+0.0008782704628730052
+-0.0003162475224927628
+-0.001252178182527935
+-0.0008707224454530216
+-0.002032190460858331
+-0.0012169218994668419
+-8.665157972733055e-05
+0.0003003232075479559
+-0.0004331363295685354
+-0.00011966698694015225
+-0.0008898364883454372
+-6.585577752725433e-05
+-0.0016917470628497208
+0.0018409625598137286
+-0.00102857909433694
+-0.0015916136922529847
+-0.00011740047190450445
+-0.0008590641470095945
+-0.0017379671611414934
+-0.001359964661942268
+-0.0035552133830690927
+-0.0010731753377540502
+0.0011992557958173267
+-0.0017697179517281497
+0.0006437325737983204
+-0.0008367636236010536
+-3.0065065643770436e-05
+-0.0031981369082549793
+-0.001821132943986699
+-0.0016178355613048134
+-0.0017115201319574983
+0.00019275675164722838
+-0.0005975570217072329
+0.0003726117832263392
+0.0011391920425688781
+0.0005374570576864982
+0.00019963652916660498
+-0.00218905226613505
+-0.0019108852539133226
+-0.0012683303355469362
+5.29941923464995e-05
+0.001132937196749453
+0.0016769126880848207
+0.0004608406805533674
+1.5828404058692417e-05
+-0.0005184179719177737
+0.0003119094026231686
+0.001363804016999182
+0.00017800671879166606
+-0.000353622782927081
+0.0002001585916961227
+0.0007381243604233398
+-1.4909380360278581e-05
+-7.873087415224297e-05
+0.0007670231843432215
+0.00029066480915848896
+0.0004589408950564608
+0.0012545026075230698
+0.00031277522821551604
+0.0003772881079369698
+-0.00015057907243332846
+1.624416731089792e-05
+5.3258169451909356e-05
+0.0008700279545722323
+-2.8801364073958844e-05
+5.4909220152287173e-05
+-0.00046834058897048434
+0.00023519805106600347
+1.526534964066427e-05
+-1.6638576730261786e-05
+-0.00017940761350155584
+-0.00043514846495758074
+7.956378913910259e-05
+0.0006961419226297556
+-0.00041634669208341234
+-0.00038621489043863994
+-0.0002904102839964853
+-0.0007796623291619353
+4.162134355154619e-05
+-0.0002839399457963158
+0.00021110206617201019
+-0.0003248611541552583
+-0.0002551725989894259
+-0.0006247112262115743
+-7.223162632514144e-05
+-0.00017069112329969895
+-0.000357680848125896
+0.00021012892368766685
+-0.0005171165632335762
+0.001013007173342134
+-0.0010402604128743858
+-0.0007563447233828713
+-0.0010216893262299863
+-0.00013259859676304498
+-0.000736246797752631
+4.972676497759752e-07
+-0.000389187429800159
+0.00018028907802737022
+-0.0008995106477995171
+0.0001930820310948556
+-0.0010133179462766967
+-0.00041139338829647133
+8.215297586713842e-05
+-5.329837643536935e-05
+0.00018961492740203982
+-0.0003817561661361289
+-0.00014117238117551824
+5.663728855047213e-07
+-0.0009284160987575627
+0.0006040480028078305
+0.0001151152571800703
+0.0002187376764517438
+0.0003226251180098815
+0.00027700528353816
+-1.9871869209500946e-06
+0.00011716734348723742
+0.00048001963716989376
+0.00037276994410018026
+-0.00018261399269788262
+-5.886022035212819e-05
+-0.00045081862304319507
+2.627967642877176e-05
+-2.0539220824646032e-05
+0.00047980165790601257
+-0.0023774711591284577
+-0.0015146389326082146
+-0.0010538591960612862
+7.841119688731731e-05
+-0.00035295935879445803
+0.0001710782182763589
+-0.00012720659584127258
+0.00013096643839980305
+-0.001092770462157454
+0.0004454880402730287
+-0.00080225360653316
+-0.0008969130016908146
+-7.535666849765243e-05
+-0.0007362837552177088
+0.00043541346544518977
+0.0005669125717409137
+0.0005984612510723763
+0.000116168379980032
+-0.0010526329636790816
+8.555108757521189e-05
+1.1597289120612757e-05
+0.00021589948024965238
+0.0010975565688915315
+0.0006734258617660087
+0.0001099584362494515
+-7.409682463902421e-05
+-0.00013804937927199332
+0.00012320249737392069
+0.0007936803489969433
+4.3701404849299016e-07
+6.200685621855252e-05
+-0.0003783609725742569
+-4.021869983740504e-05
+1.7339025303755132e-05
+-3.618656506132436e-05
+-0.00018513441320556175
+-0.00020449023712352816
+5.1457698073571e-05
+3.288993382176525e-06
+8.678436678658598e-05
+-3.7876882030590114e-05
+2.4689214379778876e-05
+-5.1055938122705974e-05
+-3.4523602047085336e-05
+-7.782116353585825e-05
+0.00010481552909866572
+0.0001324860159191855
+0.0001460444684880797
+-3.0867659935340805e-05
+-2.5226305008295522e-05
+-0.00015190129413202515
+7.714753704887004e-05
+2.240331408034112e-05
+6.832442505309612e-05
+0.00032482251718532777
+0.00032012309793587535
+0.0001261726224137438
+1.2515124795264788e-05
+-2.360110819822575e-05
+8.664869340551374e-05
+1.7710097858360685e-05
+-0.00013434682162711663
+-8.267007655232045e-05
+-0.0005110412537888845
+-0.0018658700558271042
+-9.116649372178581e-05
+-0.00039550782729904727
+0.0007059069880328705
+0.0005083919618973118
+-0.00040577387770515997
+0.0016857321312172416
+0.00014304451260309273
+-0.0007560085127337374
+0.0008019637747724498
+-0.0005048589334826492
+-2.3891918331828237e-05
+0.002155370141018549
+0.0005173710724181368
+0.0005830199789295292
+0.002339707010701855
+0.0010756916368468293
+0.0004579582514960242
+4.3424860268066394e-05
+0.001337262160102289
+0.00044152820641662127
+0.0008255487703030589
+-0.0008226948160729813
+0.001050251281620871
+-0.0001476643602560961
+-0.0006178652286309233
+-0.00021740234350656301
+-6.568377928653155e-05
+-0.0005974779097152843
+0.00018906996602390192
+0.00021166888918985806
+0.0015262342197360488
+-0.0010883250425785668
+-0.0002916013722708125
+0.0006180072278734378
+0.0001517221701351236
+-0.00016283029864411268
+-0.0002564566279116691
+0.0004577154785659455
+-0.000476510496436869
+-0.001778412844760237
+0.0005795212152310894
+-1.9068952861019828e-05
+-0.000643145948144895
+0.00034144257293635625
+0.0005373896896325456
+0.0008814170236589928
+0.0009220708605734222
+0.00047106292097550653
+0.00019426736641908938
+-0.00036969249886131827
+0.002290937320169754
+-0.00010024011087975774
+-4.584464465702442e-05
+0.00010311103285822007
+0.0009147064168502959
+4.4955859915579335e-05
+-0.000248896656368266
+-4.056160360644445e-06
+8.389506078471883e-06
+0.0005069395285563226
+-0.00010138091967812632
+-0.0010111234079539788
+0.0005838634753560028
+-0.00010694108836737474
+0.0006449385719092042
+-0.0011285651276367028
+0.00017251151802895597
+-0.00032170656063035177
+-0.0004925507543160519
+0.00023768017027232083
+0.0006056362873602188
+-0.002113850873904023
+0.002004466347423627
+0.0012241108343659572
+-0.00017508734110459977
+0.00035395926520653527
+9.367965057220674e-05
+0.0005211487048377992
+-0.00017940943472826332
+-0.000566943618060213
+-0.00037037287617447347
+0.00046103625133770207
+0.00028046309559776836
+0.0009447736985788294
+-0.0003312293314547861
+0.0003093271771740826
+-0.0003066014466827148
+0.0011715015323971588
+0.0011408646437219734
+0.0005247267802165882
+0.00032742361601234283
+0.00015544427428306335
+5.502452561741209e-06
+0.000553742533829221
+-0.00014374274594760412
+-6.415431567443892e-05
+0.00015548916123360711
+0.00010569767904225572
+0.0006980763764774649
+0.0006340349689468596
+0.0005045605917156137
+0.0010805174398807243
+-0.0009738597600720214
+7.348331619611424e-05
+0.00129821627509183
+-3.972005698533147e-05
+0.00020690647550854319
+-8.199074707693947e-05
+-0.0008706297035343754
+0.0009627646812434996
+0.0006785195451063371
+-0.0007362982085459728
+0.00043760845915949886
+0.0004686543338159784
+7.095524990738395e-05
+-0.00017679424364946413
+0.000888103867803775
+0.000470247221858162
+0.00011854388218101695
+-0.00016939544713432214
+-0.0004359935387132084
+0.0011003880753274573
+-0.001250168941549424
+0.0008955394022336681
+-0.0005545022695772873
+-0.00023028318290719435
+-0.0011822213161071687
+-0.00031145970727405235
+-0.0009553784944485905
+-1.3802291948091504e-06
+0.0009614004438326245
+-0.0006292314197304242
+0.0007771075895390123
+0.0005568503260443355
+0.0002883154162398922
+-8.958446039499172e-06
+-0.00037353394761063124
+-0.0001953423013499408
+-8.067255640984564e-05
+7.901034963460404e-05
+0.0006092187560085349
+0.0007950964400227704
+0.0002791852893084737
+-5.9106212167822185e-06
+-0.0004118566516260754
+0.000495301146304043
+0.00027668234514508704
+0.00013058218302167555
+7.430163844973892e-05
+0.0004208232130782243
+-0.0005403464992275422
+0.0001234986749906898
+9.15725167913526e-05
+0.0007297841569531801
+-0.0004378912650333105
+0.0006065894115171256
+-0.0004893874998545374
+-0.0007327478709054442
+-0.0003164168102610592
+-3.5587188684969135e-05
+-0.0001831517301895593
+-0.0005559529652978115
+4.1387633358263185e-06
+0.0005771571256557594
+-0.0005655780730404408
+-0.0008812045978341746
+-0.0007162790593080947
+-0.000886658002278798
+0.0003280143138625585
+0.0001637724706558464
+0.00014319433723451237
+-0.0007147134033047781
+-0.0002757470327840144
+6.682434070426166e-05
+-1.1318201935892702e-06
+-0.0008637890134540219
+0.0005921073329007805
+-9.012042326785975e-05
+0.0003722582280496418
+-4.4805190459818146e-05
+5.282879701618193e-05
+-0.0005795236204970197
+0.0007754512974170274
+-0.00044898772476475524
+-0.0002354865666488276
+0.0012762180878142335
+-0.0006170606050151697
+-5.873327368664228e-05
+-0.0001579112841665743
+-0.0004808339863560775
+0.00032134506302293264
+0.0011529368128647896
+0.0003837907599831759
+0.001045798014520386
+0.0003415595153950766
+-0.00021320388495805348
+-2.8182349754222e-05
+0.0004399510808404907
+0.0007683601125377379
+-0.00013882538550977227
+-0.0002027298261764757
+-0.0009148870008554443
+0.00018678051110326466
+7.747309782538898e-05
+0.0004924084130141281
+0.0007886884741105996
+0.00015058866528734713
+0.00014832944027825032
+-0.0005669938120216909
+0.0004095216253129523
+-0.0006692382703692238
+-0.000334319162622831
+-1.4726202143954881e-05
+0.0002579977753045424
+-0.00021306750411861428
+-0.0002620773712729129
+-0.0009024498855812964
+-0.0005911910856341423
+-0.0005379812997041088
+-0.00021386230483616572
+-6.408611808949708e-05
+5.940604950311242e-05
+-0.0003293514039641162
+-0.00023341625015674654
+0.00040446773451026586
+-7.314551800511801e-05
+-3.491195570165407e-06
+8.228577043518413e-06
+-0.0007599346816389509
+-0.00019541880215440298
+1.3767104212837275e-05
+0.00019279059049886715
+0.00023841060169176102
+-0.0002702889945745233
+0.00012752278958400137
+0.00017157790612645966
+0.0005372479424684123
+-6.227919937314927e-05
+-0.00042392118875791984
+-3.001491447869211e-05
+0.0007042643664350362
+0.00031816764974775756
+0.00036266564218994334
+0.0003467013207490492
+-8.740436350581471e-05
+-7.838475105871682e-05
+0.00012787614854531032
+0.00015693289070964033
+0.00013938623770088103
+3.3049052813498835e-05
+1.5354658731488355e-05
+-6.546890084384486e-05
+-0.0006925214140038972
+-0.0001601173680356353
+2.981786625228949e-05
+8.395419969529085e-05
+-0.00013674755079108402
+0.00018296839531797292
+5.474613845004842e-05
+-0.00019259790611493425
+-7.622024269426342e-05
+-7.915933498814778e-05
+-0.0006158417743044854
+7.328430155741689e-06
+0.00021095867307408239
+5.177911516480171e-05
+8.478107118669003e-05
+3.078793741777167e-05
+0.00010401315523332845
+-3.080619993899111e-05
+4.06801103208628e-05
+-0.00011044639314246953
+-0.0001473618111623684
+-0.0003408237170486159
+-0.0007817097611307671
+0.0009482849131922571
+0.001518115525201999
+-0.0006956559898582979
+-0.0007626836327530542
+0.0017144148748411954
+0.0005303018181734929
+7.807255787154164e-05
+-0.0003517242255826406
+0.0012119678495187863
+0.0005071496593615838
+0.0005604017697078421
+-0.00019345975723131315
+-0.0007686694470648875
+0.0018231062420311448
+-0.00014445189241385752
+0.00035438541231255235
+0.0013339561883015114
+6.80305394998119e-05
+-0.00047127684836986933
+-6.771418360585294e-05
+0.0007662470475541711
+0.0018297612748354993
+4.6387898967445855e-05
+-0.00034670762238654
+1.451375070328278e-06
+0.0012995053269782796
+0.0011719018865367385
+0.00047908943437058836
+-0.0003194267538926202
+0.0007556348497324147
+0.0022946601391133103
+7.729937331452893e-05
+-0.0001369588156453313
+0.0007372616671673046
+0.001577816342397201
+0.00028353886698152136
+-0.00023394931833007894
+0.00026913380465832935
+-0.0002699468165955716
+0.0004901899371344392
+5.6141057680994634e-05
+-0.000984471912084066
+0.0011809290285296728
+0.0007412910388172859
+-0.0010581367379393837
+0.0007678133261263094
+8.359328307078527e-05
+-9.249500079483607e-05
+-0.0005623465569285205
+0.0006668768640604305
+0.0004596799563941448
+0.0004566701934806668
+0.0006576180405152842
+0.001137778194582845
+0.0008882255256025414
+0.0007649210100480798
+-0.00018080329188055472
+0.001385625053939308
+0.0007017610088167008
+3.817570775802985e-05
+0.00019825563730970674
+0.00122500662316976
+-0.0010112490799806255
+-0.0005001155296740138
+0.0008580916187925555
+-4.0564115263279e-05
+-7.023740369336568e-05
+-0.00010574926523962007
+0.0006638885075878868
+0.0007219794945298118
+0.00018735750667504193
+-0.0005534569330392316
+4.3099464582911125e-05
+-0.0002271527940014863
+-2.238265207542897e-05
+-6.482596610782321e-05
+0.0008968616593651236
+-3.072693969922574e-05
+0.00020789449446645587
+0.0001695521056437905
+-0.00022488115358650174
+0.0006265478437020992
+0.0001861545316988526
+-0.0003102929008020959
+-0.0001896913566696973
+-1.5772825292567637e-05
+-0.0004883392337391428
+6.412543908338124e-06
+-0.00013915176991634494
+-0.00034949143729790964
+0.0002097080273424765
+0.0006865355477645361
+-0.00020080772629757889
+2.9726083046114954e-05
+-0.00028511405534747736
+0.00025285391367016376
+-0.00048218431352771315
+-0.0005613721301851115
+0.00020006479752142405
+-0.00017455119532247868
+-1.347074996042782e-05
+0.00037686151352106284
+0.00014106798769206405
+0.00045046621807908133
+0.0003864540984179459
+-0.0004920767675140837
+-1.167594346386354e-05
+0.0002193094223625532
+-8.13445155184512e-05
+7.529532626539398e-05
+-0.00011126605870151065
+0.00023941754772655567
+0.0005717023876269879
+0.00034643603132056955
+0.00021986285838508982
+-0.0020405254109719505
+9.753880647103587e-05
+-0.000291663120326079
+0.0002978386727779464
+0.000994369566265843
+0.0009001084200991064
+0.00019074409217722244
+8.797015046488744e-05
+-0.0013340124750256814
+-0.0006714331320446991
+-0.0003078664555902423
+2.3142037387942897e-05
+-0.0002046617665264899
+-2.1444193435564787e-05
+0.00044172369047599787
+-1.2390346051470953e-05
+-0.00033488417554187246
+6.787019267488485e-05
+-6.033752344132869e-05
+4.682889241057749e-05
+0.0006515095981344377
+-0.00018767403916638862
+-0.0001840766602810837
+3.500989363826061e-05
+-0.0001353298160454908
+0.00015284800909264452
+-6.569720302286523e-05
+-2.7820244553059086e-05
+-0.0002358114490116334
+-0.00011929521576912208
+4.0715120416284995e-05
+0.0005397777504220716
+4.2448637355118624e-05
+0.0004892664737978563
+0.0006458509656507649
+0.0003184298318903383
+8.84618514628638e-06
+5.778016230085476e-05
+-0.0001966596991294811
+-0.00022874763670389006
+-0.00033730260645483545
+-0.00011962435867349202
+-0.00023351561119318239
+0.0004372315412128043
+0.00019762164672729594
+9.178508222331036e-06
+1.1911537644550305e-05
+-0.00019181730734108262
+-0.00012035788037463299
+-5.5503759914901174e-05
+0.00028058593525008866
+-4.1813508359206186e-05
+-8.34895344841914e-05
+1.1832185110999803e-05
+-0.00023043556642872253
+-1.4448715699587427e-05
+-3.0122060607364244e-05
+-2.6692228925446604e-05
+0.0021639906572268916
+0.0012581183651063212
+-1.4542715330875164e-05
+-0.00024003669761570953
+0.0001344595161526852
+0.0005296394787426339
+-6.112815592990044e-05
+4.728554343525165e-05
+0.0006633327464266453
+6.523194560846586e-05
+0.0001193468853029833
+-0.00012158393149644787
+0.002947868088811095
+0.0005191003953801769
+0.00017166999871788018
+7.541044130212307e-05
+0.0006892697578304208
+-9.572141357188412e-05
+-0.00013251544304235873
+0.0012221714861065124
+-0.00016518537362301917
+0.0002146452291570687
+-0.00010964277518652874
+-0.0005221875624354694
+1.0545600553463208e-05
+-0.00014863570324976015
+0.0002557228539280135
+0.00046660826423251036
+-3.271325454700852e-05
+0.0004227343835805587
+-0.0002341377938826894
+0.00017608228500968126
+-1.997266186902621e-05
+-8.453144813079694e-07
+-0.00013225993492845502
+0.0002879941247070291
+-5.608720343596803e-05
+3.281071988200748e-05
+0.0003710573141296993
+-0.00011800651282902216
+-0.00019181474526811388
+-0.00011549269628126357
+-0.0006007342264075933
+-0.0007809688532408458
+2.916438088656474e-05
+-0.00011418535507973886
+6.326940050956916e-05
+-0.0004267010267609353
+0.0001346260424249322
+0.0002686455358731712
+-0.0004514025254493109
+5.958339154274788e-05
+-1.7450860347651625e-05
+-0.0002949113836301544
+-7.735884711224168e-05
+-0.0004588624961774933
+3.5086076497419784e-05
+-4.272772587123704e-05
+-0.00011739141542908324
+-0.000385913084044783
+7.507447153095539e-05
+7.172712134582647e-05
+-9.082542518337497e-05
+0.0001600855877557372
+8.563914894429755e-05
+6.300099016522675e-05
+-0.0002595347554353848
+-0.00016660347813887428
+0.0007850309092508302
+-0.00018784163063916828
+-0.0004253268327699361
+-0.00020228253447422727
+0.0001993851692865515
+-0.0005425017644179271
+-0.0001917819513148643
+0.00023058588154046785
+0.0004989162836213166
+0.00013034736830759574
diff --git a/potentials/Si_Zuo_JPCA2020.quadratic.snapparam b/potentials/Si_Zuo_JPCA2020.quadratic.snapparam
new file mode 100644
index 0000000000..e21a7f65ef
--- /dev/null
+++ b/potentials/Si_Zuo_JPCA2020.quadratic.snapparam
@@ -0,0 +1,9 @@
+# DATE: 2020-01-31 CONTRIBUTOR: Yunxing Zuo <y9zuo@eng.ucsd.edu> CITATION: Y. Zuo, C. Chen, X, Li, Z. Deng, Y. Chen, J. Behler, G. Csányi, A. V. Shapeev, A. P. Thompson, M. A. Wood, S. P. Ong, "Performance and Cost Assessment of Machine Learning Interatomic Potentials" J. Phys. Chem. A 124, 4, 731-745 (2020)
+# Generated by Materials Virtual Lab
+
+rcutfac 4.8
+twojmax 8
+rfac0 0.99363
+rmin0 0
+quadraticflag 1
+bzeroflag 0
diff --git a/potentials/Si_Zuo_JPCA2020.snap b/potentials/Si_Zuo_JPCA2020.snap
new file mode 100644
index 0000000000..7c55eca302
--- /dev/null
+++ b/potentials/Si_Zuo_JPCA2020.snap
@@ -0,0 +1,5 @@
+# DATE: 2020-01-31 CONTRIBUTOR: Yunxing Zuo <y9zuo@eng.ucsd.edu> CITATION: Y. Zuo, C. Chen, X, Li, Z. Deng, Y. Chen, J. Behler, G. Csányi, A. V. Shapeev, A. P. Thompson, M. A. Wood, S. P. Ong, "Performance and Cost Assessment of Machine Learning Interatomic Potentials" J. Phys. Chem. A 124, 4, 731-745 (2020)
+# Generated by Materials Virtual Lab
+
+pair_style snap
+pair_coeff * * Si_Zuo_JPCA2020.snapcoeff Si_Zuo_JPCA2020.snapparam Si
diff --git a/potentials/Si_Zuo_JPCA2020.snapcoeff b/potentials/Si_Zuo_JPCA2020.snapcoeff
new file mode 100644
index 0000000000..7032b29ee2
--- /dev/null
+++ b/potentials/Si_Zuo_JPCA2020.snapcoeff
@@ -0,0 +1,61 @@
+# DATE: 2020-01-31 CONTRIBUTOR: Yunxing Zuo <y9zuo@eng.ucsd.edu> CITATION: Y. Zuo, C. Chen, X, Li, Z. Deng, Y. Chen, J. Behler, G. Csányi, A. V. Shapeev, A. P. Thompson, M. A. Wood, S. P. Ong, "Performance and Cost Assessment of Machine Learning Interatomic Potentials" J. Phys. Chem. A 124, 4, 731-745 (2020)
+# Generated by Materials Virtual Lab
+
+1 56
+Si 0.5 1
+-5.663990890722773
+2.135204505942156e-05
+0.01812688733288438
+0.05890084411385875
+-0.016040522397783287
+0.2494122937439849
+0.030685603182186407
+0.07897074613855619
+0.03775626980109443
+0.08012875460906028
+0.11447594456727353
+0.08770261320757494
+-0.014534999402703207
+-0.016756593957058016
+0.011119293334051157
+0.015633833128521908
+0.026807206079160067
+0.04870622354746678
+-0.06492810262901873
+0.002910199026683352
+-0.019908133833638274
+-0.017872613445740447
+0.0031311465759044123
+0.011978920186307855
+0.0036899231853172246
+0.03006578350372085
+0.021354421560243725
+-0.03643908247119505
+-0.00831639295486291
+-0.04990225691971903
+-0.0010633320986013165
+-0.03193409548541607
+-0.003055748773152782
+0.002573793612554956
+0.0044391007289529515
+0.0325144360034856
+0.005840334419032887
+-0.004912536969652485
+-0.016370550877355387
+0.002140265199864603
+-0.027229855984721617
+-0.008278354893853326
+-0.006191386043061048
+0.0006411177578441998
+0.00552251715009933
+0.021112108349453373
+-0.0072983636775871275
+-0.002894532519792062
+-0.011272781710144501
+-0.008790720107990663
+-0.0069330757563178524
+0.0012142867357010229
+0.007119555811982486
+0.0010458619432982784
+0.006896454998006431
+-0.0034341539192112164
diff --git a/potentials/Si_Zuo_JPCA2020.snapparam b/potentials/Si_Zuo_JPCA2020.snapparam
new file mode 100644
index 0000000000..a3d645e75e
--- /dev/null
+++ b/potentials/Si_Zuo_JPCA2020.snapparam
@@ -0,0 +1,9 @@
+# DATE: 2020-01-31 CONTRIBUTOR: Yunxing Zuo <y9zuo@eng.ucsd.edu> CITATION: Y. Zuo, C. Chen, X, Li, Z. Deng, Y. Chen, J. Behler, G. Csányi, A. V. Shapeev, A. P. Thompson, M. A. Wood, S. P. Ong, "Performance and Cost Assessment of Machine Learning Interatomic Potentials" J. Phys. Chem. A 124, 4, 731-745 (2020)
+# Generated by Materials Virtual Lab
+
+rcutfac 4.9
+twojmax 8
+rfac0 0.99363
+rmin0 0
+quadraticflag 0
+bzeroflag 0
diff --git a/python/examples/pylammps/montecarlo/mc.ipynb b/python/examples/pylammps/montecarlo/mc.ipynb
index 86a2a8bc95..0275171bdd 100644
--- a/python/examples/pylammps/montecarlo/mc.ipynb
+++ b/python/examples/pylammps/montecarlo/mc.ipynb
@@ -822,7 +822,7 @@
        "}\n",
        "\n",
        "mpl.figure.prototype._key_event_extra = function(event, name) {\n",
-       "    // Handle any extra behaviour associated with a key event\n",
+       "    // Handle any extra behavior associated with a key event\n",
        "}\n",
        "\n",
        "mpl.figure.prototype.key_event = function(event, name) {\n",
@@ -887,7 +887,7 @@
        "    // Register the callback with on_msg.\n",
        "    comm.on_msg(function(msg) {\n",
        "        //console.log('receiving', msg['content']['data'], msg);\n",
-       "        // Pass the mpl event to the overriden (by mpl) onmessage function.\n",
+       "        // Pass the mpl event to the overridden (by mpl) onmessage function.\n",
        "        ws.onmessage(msg['content']['data'])\n",
        "    });\n",
        "    return ws;\n",
@@ -1053,7 +1053,7 @@
        "mpl.find_output_cell = function(html_output) {\n",
        "    // Return the cell and output element which can be found *uniquely* in the notebook.\n",
        "    // Note - this is a bit hacky, but it is done because the \"notebook_saving.Notebook\"\n",
-       "    // IPython event is triggered only after the cells have been serialised, which for\n",
+       "    // IPython event is triggered only after the cells have been serialized, which for\n",
        "    // our purposes (turning an active figure into a static one), is too late.\n",
        "    var cells = IPython.notebook.get_cells();\n",
        "    var ncells = cells.length;\n",
diff --git a/python/lammps.py b/python/lammps.py
index 2e597f9e18..ffcdbac456 100644
--- a/python/lammps.py
+++ b/python/lammps.py
@@ -290,6 +290,7 @@ class lammps(object):
     self.c_tagint = get_ctypes_int(self.extract_setting("tagint"))
     self.c_imageint = get_ctypes_int(self.extract_setting("imageint"))
     self._installed_packages = None
+    self._available_styles = None
 
     # add way to insert Python callback for fix external
     self.callback = {}
@@ -486,6 +487,7 @@ class lammps(object):
         return None
       elif style == 2:
         self.lib.lammps_extract_compute.restype = POINTER(c_int)
+        ptr = self.lib.lammps_extract_compute(self.lmp,id,style,type)
         return ptr[0]
     if type == 1:
       self.lib.lammps_extract_compute.restype = POINTER(c_double)
@@ -509,6 +511,10 @@ class lammps(object):
       result = ptr[0]
       self.lib.lammps_free(ptr)
       return result
+    elif (style == 2) and (type == 0):
+      self.lib.lammps_extract_fix.restype = POINTER(c_int)
+      ptr = self.lib.lammps_extract_fix(self.lmp,id,style,type,i,j)
+      return ptr[0]
     elif (style == 1) or (style == 2):
       if type == 1:
         self.lib.lammps_extract_fix.restype = POINTER(c_double)
@@ -696,6 +702,38 @@ class lammps(object):
         self._installed_packages.append(sb.value.decode())
     return self._installed_packages
 
+  def has_style(self, category, name):
+    """Returns whether a given style name is available in a given category
+
+    :param category: name of category
+    :type  category: string
+    :param name: name of the style
+    :type  name: string
+    :return: true if style is available in given category
+    :rtype:  bool
+    """
+    return self.lib.lammps_has_style(self.lmp, category.encode(), name.encode()) != 0
+
+  def available_styles(self, category):
+    """Returns a list of styles available for a given category
+
+    :param category: name of category
+    :type  category: string
+    :return: list of style names in given category
+    :rtype:  list
+    """
+    if self._available_styles is None:
+      self._available_styles = {}
+
+    if category not in self._available_styles:
+      self._available_styles[category] = []
+      nstyles = self.lib.lammps_style_count(self.lmp, category.encode())
+      sb = create_string_buffer(100)
+      for idx in range(nstyles):
+        self.lib.lammps_style_name(self.lmp, category.encode(), idx, sb, 100)
+        self._available_styles[category].append(sb.value.decode())
+    return self._available_styles[category]
+
   def set_fix_external_callback(self, fix_name, callback, caller=None):
     import numpy as np
     def _ctype_to_numpy_int(ctype_int):
@@ -1032,7 +1070,7 @@ def get_thermo_data(output):
             items = line.split()
             # Convert thermo output and store it.
             # It must have the same number of columns and
-            # all of them must be convertable to floats.
+            # all of them must be convertible to floats.
             # Otherwise we ignore the line
             if len(items) == len(columns):
                 try:
diff --git a/src/COLLOID/pair_lubricateU.cpp b/src/COLLOID/pair_lubricateU.cpp
index e8715cec36..b0e21256ac 100644
--- a/src/COLLOID/pair_lubricateU.cpp
+++ b/src/COLLOID/pair_lubricateU.cpp
@@ -988,7 +988,7 @@ void PairLubricateU::compute_RU()
         fy = vxmu2f*fy;
         fz = vxmu2f*fz;
 
-        // Add to the total forc
+        // Add to the total force
 
         f[i][0] -= fx;
         f[i][1] -= fy;
@@ -1449,7 +1449,7 @@ void PairLubricateU::compute_RE()
         fy = vxmu2f*fy;
         fz = vxmu2f*fz;
 
-        // Add to the total forc
+        // Add to the total force
 
         f[i][0] -= fx;
         f[i][1] -= fy;
@@ -1614,7 +1614,7 @@ void PairLubricateU::compute_RE(double **x)
         fy = vxmu2f*fy;
         fz = vxmu2f*fz;
 
-        // Add to the total forc
+        // Add to the total force
 
         f[i][0] -= fx;
         f[i][1] -= fy;
diff --git a/src/COLLOID/pair_lubricateU_poly.cpp b/src/COLLOID/pair_lubricateU_poly.cpp
index 0f16d94300..6b6727172d 100644
--- a/src/COLLOID/pair_lubricateU_poly.cpp
+++ b/src/COLLOID/pair_lubricateU_poly.cpp
@@ -849,7 +849,7 @@ void PairLubricateUPoly::compute_RU(double **x)
         fy = vxmu2f*fy;
         fz = vxmu2f*fz;
 
-        // Add to the total forc
+        // Add to the total force
 
         f[i][0] -= fx;
         f[i][1] -= fy;
@@ -1044,7 +1044,7 @@ void PairLubricateUPoly::compute_RE(double **x)
         fy = vxmu2f*fy;
         fz = vxmu2f*fz;
 
-        // Add to the total forc
+        // Add to the total force
 
         f[i][0] -= fx;
         f[i][1] -= fy;
diff --git a/src/CORESHELL/pair_born_coul_wolf_cs.cpp b/src/CORESHELL/pair_born_coul_wolf_cs.cpp
index 398c2ba1ee..870a776a22 100644
--- a/src/CORESHELL/pair_born_coul_wolf_cs.cpp
+++ b/src/CORESHELL/pair_born_coul_wolf_cs.cpp
@@ -98,7 +98,7 @@ void PairBornCoulWolfCS::compute(int eflag, int vflag)
 
       if (rsq < cutsq[itype][jtype]) {
                 rsq += EPSILON;
-                // Add EPISLON for case: r = 0; Interaction must be removed
+                // Add EPSILON for case: r = 0; Interaction must be removed
                 // by special bond
         r2inv = 1.0/rsq;
 
diff --git a/src/CORESHELL/pair_coul_wolf_cs.cpp b/src/CORESHELL/pair_coul_wolf_cs.cpp
index 20b7339480..997a202e00 100644
--- a/src/CORESHELL/pair_coul_wolf_cs.cpp
+++ b/src/CORESHELL/pair_coul_wolf_cs.cpp
@@ -93,7 +93,7 @@ void PairCoulWolfCS::compute(int eflag, int vflag)
 
       if (rsq < cut_coulsq) {
         rsq += EPSILON;
-        // Add EPISLON for case: r = 0; Interaction must be removed
+        // Add EPSILON for case: r = 0; Interaction must be removed
         // by special bond
         r = sqrt(rsq);
         prefactor = qqrd2e*qtmp*q[j]/r;
diff --git a/src/GPU/pair_born_coul_long_gpu.cpp b/src/GPU/pair_born_coul_long_gpu.cpp
index 39d34420a8..1b548edab6 100644
--- a/src/GPU/pair_born_coul_long_gpu.cpp
+++ b/src/GPU/pair_born_coul_long_gpu.cpp
@@ -177,6 +177,10 @@ void PairBornCoulLongGPU::init_style()
     error->all(FLERR,"Pair style requires a KSpace style");
   g_ewald = force->kspace->g_ewald;
 
+  // setup force tables
+
+  if (ncoultablebits) init_tables(cut_coul,cut_respa);
+
   int maxspecial=0;
   if (atom->molecular)
     maxspecial=atom->maxspecial;
diff --git a/src/GPU/pair_born_coul_wolf_cs_gpu.cpp b/src/GPU/pair_born_coul_wolf_cs_gpu.cpp
index b00b5a0b56..4e488abc15 100644
--- a/src/GPU/pair_born_coul_wolf_cs_gpu.cpp
+++ b/src/GPU/pair_born_coul_wolf_cs_gpu.cpp
@@ -249,7 +249,7 @@ void PairBornCoulWolfCSGPU::cpu_compute(int start, int inum, int eflag,
       jtype = type[j];
 
       if (rsq < cutsq[itype][jtype]) {
-        rsq += EPSILON; // Add EPISLON for case: r = 0; Interaction must be removed by special bond
+        rsq += EPSILON; // Add EPSILON for case: r = 0; Interaction must be removed by special bond
         r2inv = 1.0/rsq;
 
         if (rsq < cut_coulsq) {
diff --git a/src/GPU/pair_buck_coul_long_gpu.cpp b/src/GPU/pair_buck_coul_long_gpu.cpp
index e30230d5a0..7e59562ebf 100644
--- a/src/GPU/pair_buck_coul_long_gpu.cpp
+++ b/src/GPU/pair_buck_coul_long_gpu.cpp
@@ -173,6 +173,10 @@ void PairBuckCoulLongGPU::init_style()
     error->all(FLERR,"Pair style requires a KSpace style");
   g_ewald = force->kspace->g_ewald;
 
+  // setup force tables
+
+  if (ncoultablebits) init_tables(cut_coul,cut_respa);
+
   int maxspecial=0;
   if (atom->molecular)
     maxspecial=atom->maxspecial;
diff --git a/src/GPU/pair_lj_class2_coul_long_gpu.cpp b/src/GPU/pair_lj_class2_coul_long_gpu.cpp
index 4ee776b4ff..96ba4e0a09 100644
--- a/src/GPU/pair_lj_class2_coul_long_gpu.cpp
+++ b/src/GPU/pair_lj_class2_coul_long_gpu.cpp
@@ -170,6 +170,10 @@ void PairLJClass2CoulLongGPU::init_style()
     error->all(FLERR,"Pair style requires a KSpace style");
   g_ewald = force->kspace->g_ewald;
 
+  // setup force tables
+
+  if (ncoultablebits) init_tables(cut_coul,cut_respa);
+
   int maxspecial=0;
   if (atom->molecular)
     maxspecial=atom->maxspecial;
diff --git a/src/GRANULAR/fix_pour.cpp b/src/GRANULAR/fix_pour.cpp
index 2255f64eb2..25806a1ac8 100644
--- a/src/GRANULAR/fix_pour.cpp
+++ b/src/GRANULAR/fix_pour.cpp
@@ -632,7 +632,13 @@ void FixPour::pre_exchange()
         int n = atom->nlocal - 1;
         atom->tag[n] = maxtag_all + m+1;
         if (mode == MOLECULE) {
-          if (atom->molecule_flag) atom->molecule[n] = maxmol_all+1;
+          if (atom->molecule_flag) {
+            if (onemols[imol]->moleculeflag) {
+              atom->molecule[n] = maxmol_all + onemols[imol]->molecule[m];
+            } else {
+              atom->molecule[n] = maxmol_all+1;
+            }
+          }
           if (atom->molecular == 2) {
             atom->molindex[n] = 0;
             atom->molatom[n] = m;
@@ -666,7 +672,13 @@ void FixPour::pre_exchange()
       fixshake->set_molecule(nlocalprev,maxtag_all,imol,coord,vnew,quat);
 
     maxtag_all += natom;
-    if (mode == MOLECULE && atom->molecule_flag) maxmol_all++;
+    if (mode == MOLECULE && atom->molecule_flag) {
+      if (onemols[imol]->moleculeflag) {
+        maxmol_all += onemols[imol]->nmolecules;
+      } else {
+        maxmol_all++;
+      }
+    }
   }
 
   // warn if not successful with all insertions b/c too many attempts
diff --git a/src/KIM/README b/src/KIM/README
index e61f47426f..d01ea42a7c 100644
--- a/src/KIM/README
+++ b/src/KIM/README
@@ -11,7 +11,7 @@ maintains the code that implements these commands.
 Using this package requires the KIM-API library and its models
 (interatomic potentials) to be downloaded and installed on your
 system.  The library can be downloaded and built in lib/kim or
-elsewhere on your system, which must be done before bulding LAMMPS
+elsewhere on your system, which must be done before building LAMMPS
 with this package.  Details of the download, build, and install
 process for the KIM-API are given in the lib/kim/README file, and
 scripts are provided to help automate the process.  Also see the
diff --git a/src/KIM/kim_init.h b/src/KIM/kim_init.h
index 62c404212b..7d06896215 100644
--- a/src/KIM/kim_init.h
+++ b/src/KIM/kim_init.h
@@ -69,7 +69,7 @@ CommandStyle(kim_init,KimInit)
 #include <string>
 
 // Forward declaration.
-class KIM_Model;
+typedef struct KIM_Model KIM_Model;
 
 namespace LAMMPS_NS {
 
diff --git a/src/KIM/kim_property.cpp b/src/KIM/kim_property.cpp
new file mode 100644
index 0000000000..d2f1d145c9
--- /dev/null
+++ b/src/KIM/kim_property.cpp
@@ -0,0 +1,483 @@
+/* ----------------------------------------------------------------------
+   LAMMPS - Large-scale Atomic/Molecular Massively Parallel Simulator
+   http://lammps.sandia.gov, Sandia National Laboratories
+   Steve Plimpton, sjplimp@sandia.gov
+
+   Copyright (2003) Sandia Corporation.  Under the terms of Contract
+   DE-AC04-94AL85000 with Sandia Corporation, the U.S. Government retains
+   certain rights in this software.  This software is distributed under
+   the GNU General Public License.
+
+   See the README file in the top-level LAMMPS directory.
+------------------------------------------------------------------------- */
+
+/* ----------------------------------------------------------------------
+   Contributing author: Yaser Afshar (UMN)
+------------------------------------------------------------------------- */
+
+/* ----------------------------------------------------------------------
+   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 2 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>.
+
+   Linking LAMMPS statically or dynamically with other modules is making a
+   combined work based on LAMMPS. Thus, the terms and conditions of the GNU
+   General Public License cover the whole combination.
+
+   In addition, as a special exception, the copyright holders of LAMMPS give
+   you permission to combine LAMMPS with free software programs or libraries
+   that are released under the GNU LGPL and with code included in the standard
+   release of the "kim-api" under the CDDL (or modified versions of such code,
+   with unchanged license). You may copy and distribute such a system following
+   the terms of the GNU GPL for LAMMPS and the licenses of the other code
+   concerned, provided that you include the source code of that other code
+   when and as the GNU GPL requires distribution of source code.
+
+   Note that people who make modified versions of LAMMPS are not obligated to
+   grant this special exception for their modified versions; it is their choice
+   whether to do so. The GNU General Public License gives permission to release
+   a modified version without this exception; this exception also makes it
+   possible to release a modified version which carries forward this exception.
+------------------------------------------------------------------------- */
+
+/* ----------------------------------------------------------------------
+   Designed for use with the kim-api-2.1.0 (and newer) package
+------------------------------------------------------------------------- */
+
+#if LMP_PYTHON
+#define PY_SSIZE_T_CLEAN
+#include <Python.h>
+#endif
+
+#include "kim_property.h"
+
+#include "comm.h"
+#include "input.h"
+#include "variable.h"
+#include "utils.h"
+#include "error.h"
+#include "lmppython.h"
+
+#include <string>
+
+using namespace LAMMPS_NS;
+
+/* ---------------------------------------------------------------------- */
+
+kimProperty::kimProperty(LAMMPS *lmp) : Pointers(lmp)
+{
+  // one-time initialization of Python interpreter
+  python->init();
+
+  if (!python->has_minimum_version(3, 6)) {
+    error->all(FLERR, "Invalid Python version.\n"
+                      "The kim-property Python package requires Python "
+                      "3 >= 3.6 support.");
+  }
+}
+
+void kimProperty::command(int narg, char **arg)
+{
+#if LMP_PYTHON
+#if PY_MAJOR_VERSION >= 3
+  if (narg < 2)
+    error->all(FLERR, "Invalid `kim_property` command.");
+
+  if (!(strcmp(arg[0], "create") == 0) &&
+      !(strcmp(arg[0], "destroy") == 0) &&
+      !(strcmp(arg[0], "modify") == 0) &&
+      !(strcmp(arg[0], "remove") == 0) &&
+      !(strcmp(arg[0], "dump") == 0)) {
+    std::string msg("Error incorrect arguments in kim_property command.\n");
+    msg += "`kim_property create/destroy/modify/remove/dump` ";
+    msg += "is mandatory.";
+    error->all(FLERR, msg.c_str());
+  }
+
+  if (comm->me == 0) {
+    std::string msg;
+    msg = "#=== kim-property ===========================================\n";
+    input->write_echo(msg.c_str());
+  }
+
+  // Get the kim_str ptr to the data associated with a kim_property_str
+  // variable
+  char *kim_str =
+    input->variable->retrieve(const_cast<char *>("kim_property_str"));
+
+  char **kim_str_cmd = new char *[3];
+  kim_str_cmd[0] = const_cast<char *>("kim_property_str");
+
+  PyGILState_STATE gstate = PyGILState_Ensure();
+
+  // kim_property module
+  PyObject *kim_property = NULL;
+
+  // import kim_property
+  {
+    PyObject *obj = PyUnicode_FromString("kim_property");
+    if (!obj) {
+      PyGILState_Release(gstate);
+      error->all(FLERR, "Error creating a `PyObject`!");
+    }
+
+    kim_property = PyImport_Import(obj);
+    if (!kim_property) {
+      PyGILState_Release(gstate);
+      error->all(FLERR, "Error unable to import Python `kim_property` module!"
+                        "\nkim-property Python package can be installed "
+                        "with pip:\n`pip install kim-property`\n"
+                        "See the installation instructions at\n"
+                        "https://github.com/openkim/kim-property#installing-kim-property\n"
+                        "for detailed information.");
+    }
+
+    // Decrementing of the reference count
+    Py_XDECREF(obj);
+  }
+
+  // kim_property create 1 cohesive-potential-energy-cubic-crystal
+  if (strcmp(arg[0], "create") == 0) {
+    if (narg != 3) {
+      PyGILState_Release(gstate);
+      error->all(FLERR, "Error invalid `kim_property create` command.");
+    }
+
+    int const ID = utils::inumeric(FLERR, arg[1], true, lmp);
+
+    Py_ssize_t const nSize = (kim_str ? 3 : 2);
+
+    // Python function
+    // This is the equivalent of the Python expression:
+    // kim_property.kim_property_create.
+    PyObject *pFunc =
+      PyObject_GetAttrString(kim_property, "kim_property_create");
+    if (!pFunc) {
+      PyGILState_Release(gstate);
+      error->all(FLERR, "Error unable to get an attribute named "
+                        "`kim_property_create` from a kim_property object!");
+    }
+
+    // Decrementing of the reference count
+    Py_XDECREF(kim_property);
+
+    // create Python tuple of input arguments
+    PyObject *pArgs = PyTuple_New(nSize);
+    if (!pArgs) {
+      PyGILState_Release(gstate);
+      error->all(FLERR, "Error could not create Python function arguments.");
+    }
+
+    // Python object to set the tuple
+    // Property ID
+    PyObject *pValue = PyLong_FromLong(ID);
+    PyTuple_SetItem(pArgs, 0, pValue);
+
+    // Property name
+    pValue = PyUnicode_FromString(arg[2]);
+    PyTuple_SetItem(pArgs, 1, pValue);
+
+    if (nSize == 3) {
+      pValue = PyUnicode_FromString(kim_str);
+      PyTuple_SetItem(pArgs, 2, pValue);
+    }
+
+    // call the Python kim_property_create function
+    // error check with one() since only some procs may fail
+    pValue = PyObject_CallObject(pFunc, pArgs);
+    if (!pValue) {
+      PyErr_Print();
+      PyGILState_Release(gstate);
+      error->one(FLERR, "Error Python `kim_property_create` function "
+                        "evaluation failed!");
+    }
+
+    // Python function returned a string value
+    const char *pystr = PyUnicode_AsUTF8(pValue);
+
+    kim_str_cmd[2] = const_cast<char *>(pystr);
+
+    if (kim_str) {
+      input->variable->set_string(kim_str_cmd[0], kim_str_cmd[2]);
+    } else {
+      kim_str_cmd[1] = const_cast<char *>("string");
+      input->variable->set(3, kim_str_cmd);
+    }
+
+    Py_XDECREF(pArgs);
+    Py_XDECREF(pFunc);
+    Py_XDECREF(pValue);
+  }
+  else if (strcmp(arg[0], "destroy") == 0) {
+    if (narg != 2) {
+      PyGILState_Release(gstate);
+      error->all(FLERR, "Error invalid `kim_property destroy` command.");
+    }
+
+    if (!kim_str) {
+      PyGILState_Release(gstate);
+      return;
+    }
+
+    int const ID = utils::inumeric(FLERR, arg[1], true, lmp);
+
+    // Python function
+    // This is the equivalent of the Python expression kim_property.kim_property_destroy
+    PyObject *pFunc =
+      PyObject_GetAttrString(kim_property, "kim_property_destroy");
+    if (!pFunc) {
+      PyGILState_Release(gstate);
+      error->all(FLERR, "Error unable to get an attribute named "
+                        "`kim_property_destroy` from a kim_property object!");
+    }
+
+    // Decrementing of the reference count
+    Py_XDECREF(kim_property);
+
+    // create Python tuple of input arguments
+    PyObject *pArgs = PyTuple_New(2);
+    if (!pArgs) {
+      PyGILState_Release(gstate);
+      error->all(FLERR, "Error could not create Python function arguments.");
+    }
+
+    // Python object to set the tuple
+    PyObject *pValue = PyUnicode_FromString(kim_str);
+    PyTuple_SetItem(pArgs, 0, pValue);
+
+    pValue = PyLong_FromLong(ID);
+    PyTuple_SetItem(pArgs, 1, pValue);
+
+    // call the Python kim_property_destroy function
+    // error check with one() since only some procs may fail
+    pValue = PyObject_CallObject(pFunc, pArgs);
+    if (!pValue) {
+      PyErr_Print();
+      PyGILState_Release(gstate);
+      error->one(FLERR, "Error Python `kim_property_destroy` function "
+                        "evaluation failed!");
+    }
+
+    // Python function returned a string value
+    const char *pystr = PyUnicode_AsUTF8(pValue);
+
+    kim_str_cmd[2] = const_cast<char *>(pystr);
+
+    input->variable->set_string(kim_str_cmd[0], kim_str_cmd[2]);
+
+    Py_XDECREF(pArgs);
+    Py_XDECREF(pFunc);
+    Py_XDECREF(pValue);
+  }
+  else if (strcmp(arg[0], "modify") == 0) {
+    if (narg < 6) {
+      PyGILState_Release(gstate);
+      error->all(FLERR, "Error invalid `kim_property modify` command.");
+    }
+
+    if (!kim_str) {
+      PyGILState_Release(gstate);
+      error->all(FLERR, "Error There is no property instance to modify "
+                        "the content.");
+    }
+
+    int const ID = utils::inumeric(FLERR, arg[1], true, lmp);
+
+    // Python function
+    // This is the equivalent of the Python expression
+    // kim_property.kim_property_modify
+    PyObject *pFunc =
+      PyObject_GetAttrString(kim_property, "kim_property_modify");
+    if (!pFunc) {
+      PyGILState_Release(gstate);
+      error->all(FLERR, "Error unable to get an attribute named "
+                        "`kim_property_modify` from a kim_property object!");
+    }
+
+    // Decrementing of the reference count
+    Py_XDECREF(kim_property);
+
+    // create Python tuple of input arguments
+    PyObject *pArgs = PyTuple_New(static_cast<Py_ssize_t>(narg));
+    if (!pArgs) {
+      PyGILState_Release(gstate);
+      error->all(FLERR, "Error could not create Python function arguments.");
+    }
+
+    // Python object to set the tuple
+    PyObject *pValue = PyUnicode_FromString(kim_str);
+    PyTuple_SetItem(pArgs, 0, pValue);
+
+    pValue = PyLong_FromLong(ID);
+    PyTuple_SetItem(pArgs, 1, pValue);
+
+    for (Py_ssize_t i = 2; i < static_cast<Py_ssize_t>(narg); ++i) {
+      pValue = PyUnicode_FromString(arg[i]);
+      PyTuple_SetItem(pArgs, i, pValue);
+    }
+
+    // call the Python kim_property_modify function
+    // error check with one() since only some procs may fail
+    pValue = PyObject_CallObject(pFunc, pArgs);
+    if (!pValue) {
+      PyErr_Print();
+      PyGILState_Release(gstate);
+      error->one(FLERR, "Error Python `kim_property_modify` function "
+                        "evaluation failed!");
+    }
+
+    // Python function returned a string value
+    const char *pystr = PyUnicode_AsUTF8(pValue);
+
+    kim_str_cmd[2] = const_cast<char *>(pystr);
+
+    input->variable->set_string(kim_str_cmd[0], kim_str_cmd[2]);
+
+    Py_XDECREF(pArgs);
+    Py_XDECREF(pFunc);
+    Py_XDECREF(pValue);
+  }
+  else if (strcmp(arg[0], "remove") == 0) {
+    if (narg < 4) {
+      PyGILState_Release(gstate);
+      error->all(FLERR, "Error invalid `kim_property remove` command.");
+    }
+
+    if (!kim_str) {
+      PyGILState_Release(gstate);
+      error->all(FLERR, "Error There is no property instance to remove "
+                        "the content.");
+    }
+
+    int const ID = utils::inumeric(FLERR, arg[1], true, lmp);
+
+    // Python function
+    // This is the equivalent of the Python expression
+    // kim_property.kim_property_remove
+    PyObject *pFunc =
+      PyObject_GetAttrString(kim_property, "kim_property_remove");
+    if (!pFunc) {
+      PyGILState_Release(gstate);
+      error->all(FLERR, "Error unable to get an attribute named "
+                        "`kim_property_remove` from a kim_property object!");
+    }
+
+    // Decrementing of the reference count
+    Py_XDECREF(kim_property);
+
+    // create Python tuple of input arguments
+    PyObject *pArgs = PyTuple_New(static_cast<Py_ssize_t>(narg));
+    if (!pArgs) {
+      PyGILState_Release(gstate);
+      error->all(FLERR, "Error could not create Python function arguments.");
+    }
+
+    // Python object to set the tuple
+    PyObject *pValue = PyUnicode_FromString(kim_str);
+    PyTuple_SetItem(pArgs, 0, pValue);
+
+    pValue = PyLong_FromLong(ID);
+    PyTuple_SetItem(pArgs, 1, pValue);
+
+    for (Py_ssize_t i = 2; i < static_cast<Py_ssize_t>(narg); ++i) {
+      pValue = PyUnicode_FromString(arg[i]);
+      PyTuple_SetItem(pArgs, i, pValue);
+    }
+
+    // call the Python kim_property_remove function
+    // error check with one() since only some procs may fail
+    pValue = PyObject_CallObject(pFunc, pArgs);
+    if (!pValue) {
+      PyErr_Print();
+      PyGILState_Release(gstate);
+      error->one(FLERR, "Error Python `kim_property_remove` function "
+                        "evaluation failed!");
+    }
+
+    // Python function returned a string value
+    const char *pystr = PyUnicode_AsUTF8(pValue);
+
+    kim_str_cmd[2] = const_cast<char *>(pystr);
+
+    input->variable->set_string(kim_str_cmd[0], kim_str_cmd[2]);
+
+    Py_XDECREF(pArgs);
+    Py_XDECREF(pFunc);
+    Py_XDECREF(pValue);
+  }
+  else if (strcmp(arg[0], "dump") == 0) {
+    if (narg != 2) {
+      PyGILState_Release(gstate);
+      error->all(FLERR, "Error invalid `kim_property dump` command.");
+    }
+
+    if (!kim_str) {
+      PyGILState_Release(gstate);
+      error->all(FLERR, "Error There is no property instance to dump "
+                        "the content.");
+    }
+
+    // Python function
+    // This is the equivalent of the Python expression
+    // kim_property.kim_property_dump
+    PyObject *pFunc =
+      PyObject_GetAttrString(kim_property, "kim_property_dump");
+    if (!pFunc) {
+      PyGILState_Release(gstate);
+      error->all(FLERR, "Error unable to get an attribute named "
+                        "`kim_property_dump` from a kim_property object!");
+    }
+
+    // Decrementing of the reference count
+    Py_XDECREF(kim_property);
+
+    // create Python tuple of input arguments
+    PyObject *pArgs = PyTuple_New(2);
+    if (!pArgs) {
+      PyGILState_Release(gstate);
+      error->all(FLERR, "Could not create Python function arguments.");
+    }
+
+    // Python object to set the tuple
+    PyObject *pValue = PyUnicode_FromString(kim_str);
+    PyTuple_SetItem(pArgs, 0, pValue);
+
+    pValue = PyUnicode_FromString(arg[1]);
+    PyTuple_SetItem(pArgs, 1, pValue);
+
+    if (comm->me == 0) {
+      // call the Python kim_property_dump function
+      // error check with one() since only some procs may fail
+      pValue = PyObject_CallObject(pFunc, pArgs);
+      if (!pValue) {
+        PyErr_Print();
+        PyGILState_Release(gstate);
+        error->one(FLERR, "Error Python `kim_property_dump` function "
+                          "evaluation failed!");
+      }
+    }
+
+    // Destroy the variable
+    kim_str_cmd[1] = const_cast<char *>("delete");
+    input->variable->set(2, kim_str_cmd);
+
+    Py_XDECREF(pArgs);
+    Py_XDECREF(pFunc);
+    Py_XDECREF(pValue);
+  }
+
+  PyGILState_Release(gstate);
+
+  delete[] kim_str_cmd;
+#endif // PY_MAJOR_VERSION
+#endif // LMP_PYTHON
+}
diff --git a/src/KIM/kim_property.h b/src/KIM/kim_property.h
new file mode 100644
index 0000000000..ff5faa6781
--- /dev/null
+++ b/src/KIM/kim_property.h
@@ -0,0 +1,85 @@
+/* -*- c++ -*- ----------------------------------------------------------
+   LAMMPS - Large-scale Atomic/Molecular Massively Parallel Simulator
+   http://lammps.sandia.gov, Sandia National Laboratories
+   Steve Plimpton, sjplimp@sandia.gov
+
+   Copyright (2003) Sandia Corporation.  Under the terms of Contract
+   DE-AC04-94AL85000 with Sandia Corporation, the U.S. Government retains
+   certain rights in this software.  This software is distributed under
+   the GNU General Public License.
+
+   See the README file in the top-level LAMMPS directory.
+------------------------------------------------------------------------- */
+
+/* ----------------------------------------------------------------------
+   Contributing author: Yaser Afshar (UMN)
+------------------------------------------------------------------------- */
+
+/* ----------------------------------------------------------------------
+   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 2 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>.
+
+   Linking LAMMPS statically or dynamically with other modules is making a
+   combined work based on LAMMPS. Thus, the terms and conditions of the GNU
+   General Public License cover the whole combination.
+
+   In addition, as a special exception, the copyright holders of LAMMPS give
+   you permission to combine LAMMPS with free software programs or libraries
+   that are released under the GNU LGPL and with code included in the standard
+   release of the "kim-api" under the CDDL (or modified versions of such code,
+   with unchanged license). You may copy and distribute such a system following
+   the terms of the GNU GPL for LAMMPS and the licenses of the other code
+   concerned, provided that you include the source code of that other code
+   when and as the GNU GPL requires distribution of source code.
+
+   Note that people who make modified versions of LAMMPS are not obligated to
+   grant this special exception for their modified versions; it is their choice
+   whether to do so. The GNU General Public License gives permission to release
+   a modified version without this exception; this exception also makes it
+   possible to release a modified version which carries forward this exception.
+------------------------------------------------------------------------- */
+
+/* ----------------------------------------------------------------------
+   Designed for use with the kim-api-2.1.0 (and newer) package
+------------------------------------------------------------------------- */
+
+#ifdef COMMAND_CLASS
+
+CommandStyle(kim_property, kimProperty)
+
+#else
+
+#ifndef LMP_KIM_PROPERTY_H
+#define LMP_KIM_PROPERTY_H
+
+#include "pointers.h"
+
+namespace LAMMPS_NS
+{
+
+class kimProperty : protected Pointers
+{
+public:
+  kimProperty(class LAMMPS *lmp);
+
+  void command(int, char **);
+};
+
+} // namespace LAMMPS_NS
+
+#endif // LMP_KIM_PROPERTY_H
+#endif // COMMAND_CLASS
+
+/* ERROR/WARNING messages:
+
+*/
diff --git a/src/KIM/kim_units.cpp b/src/KIM/kim_units.cpp
index 45f9b81a35..b059ec0d73 100644
--- a/src/KIM/kim_units.cpp
+++ b/src/KIM/kim_units.cpp
@@ -140,7 +140,7 @@ double const kcal_si = 4184.0;              // [J] kilocalorie (heat energy
                                             //   involved in warming up one
                                             //   kilogram of water by one
                                             //   degree Kelvin)
-double const ev_si = 1.6021766208e-19;      // [J] electon volt (amount of
+double const ev_si = 1.6021766208e-19;      // [J] electron volt (amount of
                                             //   energy gained or lost by the
                                             //   charge of a single electron
                                             //   moving across an electric
diff --git a/src/KOKKOS/Install.sh b/src/KOKKOS/Install.sh
index 3ae04384fd..e0b1c92821 100755
--- a/src/KOKKOS/Install.sh
+++ b/src/KOKKOS/Install.sh
@@ -160,6 +160,7 @@ action kissfft_kokkos.h kissfft.h
 action kokkos.cpp
 action kokkos.h
 action kokkos_base.h
+action kokkos_base_fft.h fft3d.h
 action kokkos_few.h
 action kokkos_type.h
 action memory_kokkos.h
diff --git a/src/KOKKOS/angle_charmm_kokkos.cpp b/src/KOKKOS/angle_charmm_kokkos.cpp
index fd9757aab3..245aead73e 100644
--- a/src/KOKKOS/angle_charmm_kokkos.cpp
+++ b/src/KOKKOS/angle_charmm_kokkos.cpp
@@ -78,7 +78,7 @@ void AngleCharmmKokkos<DeviceType>::compute(int eflag_in, int vflag_in)
   if (vflag_atom) {
     //if(k_vatom.extent(0)<maxvatom) { // won't work without adding zero functor
       memoryKK->destroy_kokkos(k_vatom,vatom);
-      memoryKK->create_kokkos(k_vatom,vatom,maxvatom,6,"improper:vatom");
+      memoryKK->create_kokkos(k_vatom,vatom,maxvatom,"improper:vatom");
       d_vatom = k_vatom.template view<DeviceType>();
     //}
   }
diff --git a/src/KOKKOS/angle_charmm_kokkos.h b/src/KOKKOS/angle_charmm_kokkos.h
index e168160562..865439b83a 100644
--- a/src/KOKKOS/angle_charmm_kokkos.h
+++ b/src/KOKKOS/angle_charmm_kokkos.h
@@ -63,13 +63,13 @@ class AngleCharmmKokkos : public AngleCharmm {
 
   typedef ArrayTypes<DeviceType> AT;
   typename AT::t_x_array_randomread x;
-  typename Kokkos::View<double*[3],typename AT::t_f_array::array_layout,DeviceType,Kokkos::MemoryTraits<Kokkos::Atomic> > f;
+  typename Kokkos::View<double*[3],typename AT::t_f_array::array_layout,typename KKDevice<DeviceType>::value,Kokkos::MemoryTraits<Kokkos::Atomic> > f;
   typename AT::t_int_2d anglelist;
 
   Kokkos::DualView<E_FLOAT*,Kokkos::LayoutRight,DeviceType> k_eatom;
   Kokkos::DualView<F_FLOAT*[6],Kokkos::LayoutRight,DeviceType> k_vatom;
-  Kokkos::View<E_FLOAT*,Kokkos::LayoutRight,DeviceType,Kokkos::MemoryTraits<Kokkos::Atomic> > d_eatom;
-  Kokkos::View<F_FLOAT*[6],Kokkos::LayoutRight,DeviceType,Kokkos::MemoryTraits<Kokkos::Atomic> > d_vatom;
+  Kokkos::View<E_FLOAT*,Kokkos::LayoutRight,typename KKDevice<DeviceType>::value,Kokkos::MemoryTraits<Kokkos::Atomic> > d_eatom;
+  Kokkos::View<F_FLOAT*[6],Kokkos::LayoutRight,typename KKDevice<DeviceType>::value,Kokkos::MemoryTraits<Kokkos::Atomic> > d_vatom;
 
   int nlocal,newton_bond;
   int eflag,vflag;
diff --git a/src/KOKKOS/angle_class2_kokkos.cpp b/src/KOKKOS/angle_class2_kokkos.cpp
index 809ce7e7dd..50d7391ec5 100644
--- a/src/KOKKOS/angle_class2_kokkos.cpp
+++ b/src/KOKKOS/angle_class2_kokkos.cpp
@@ -75,7 +75,7 @@ void AngleClass2Kokkos<DeviceType>::compute(int eflag_in, int vflag_in)
   }
   if (vflag_atom) {
     memoryKK->destroy_kokkos(k_vatom,vatom);
-    memoryKK->create_kokkos(k_vatom,vatom,maxvatom,6,"angle:vatom");
+    memoryKK->create_kokkos(k_vatom,vatom,maxvatom,"angle:vatom");
     d_vatom = k_vatom.template view<DeviceType>();
   }
 
@@ -158,7 +158,7 @@ KOKKOS_INLINE_FUNCTION
 void AngleClass2Kokkos<DeviceType>::operator()(TagAngleClass2Compute<NEWTON_BOND,EVFLAG>, const int &n, EV_FLOAT& ev) const {
 
   // The f array is atomic
-  Kokkos::View<F_FLOAT*[3], typename DAT::t_f_array::array_layout,DeviceType,Kokkos::MemoryTraits<Kokkos::Atomic|Kokkos::Unmanaged> > a_f = f;
+  Kokkos::View<F_FLOAT*[3], typename DAT::t_f_array::array_layout,typename KKDevice<DeviceType>::value,Kokkos::MemoryTraits<Kokkos::Atomic|Kokkos::Unmanaged> > a_f = f;
 
   const int i1 = anglelist(n,0);
   const int i2 = anglelist(n,1);
@@ -495,8 +495,8 @@ void AngleClass2Kokkos<DeviceType>::ev_tally(EV_FLOAT &ev, const int i, const in
   F_FLOAT v[6];
 
   // The eatom and vatom arrays are atomic
-  Kokkos::View<E_FLOAT*, typename DAT::t_efloat_1d::array_layout,DeviceType,Kokkos::MemoryTraits<Kokkos::Atomic|Kokkos::Unmanaged> > v_eatom = k_eatom.template view<DeviceType>();
-  Kokkos::View<F_FLOAT*[6], typename DAT::t_virial_array::array_layout,DeviceType,Kokkos::MemoryTraits<Kokkos::Atomic|Kokkos::Unmanaged> > v_vatom = k_vatom.template view<DeviceType>();
+  Kokkos::View<E_FLOAT*, typename DAT::t_efloat_1d::array_layout,typename KKDevice<DeviceType>::value,Kokkos::MemoryTraits<Kokkos::Atomic|Kokkos::Unmanaged> > v_eatom = k_eatom.template view<DeviceType>();
+  Kokkos::View<F_FLOAT*[6], typename DAT::t_virial_array::array_layout,typename KKDevice<DeviceType>::value,Kokkos::MemoryTraits<Kokkos::Atomic|Kokkos::Unmanaged> > v_vatom = k_vatom.template view<DeviceType>();
 
   if (eflag_either) {
     if (eflag_global) {
diff --git a/src/KOKKOS/angle_cosine_kokkos.cpp b/src/KOKKOS/angle_cosine_kokkos.cpp
index da0ff398f1..afb955694d 100644
--- a/src/KOKKOS/angle_cosine_kokkos.cpp
+++ b/src/KOKKOS/angle_cosine_kokkos.cpp
@@ -75,7 +75,7 @@ void AngleCosineKokkos<DeviceType>::compute(int eflag_in, int vflag_in)
   }
   if (vflag_atom) {
     memoryKK->destroy_kokkos(k_vatom,vatom);
-    memoryKK->create_kokkos(k_vatom,vatom,maxvatom,6,"angle:vatom");
+    memoryKK->create_kokkos(k_vatom,vatom,maxvatom,"angle:vatom");
     d_vatom = k_vatom.template view<DeviceType>();
   }
 
@@ -141,7 +141,7 @@ KOKKOS_INLINE_FUNCTION
 void AngleCosineKokkos<DeviceType>::operator()(TagAngleCosineCompute<NEWTON_BOND,EVFLAG>, const int &n, EV_FLOAT& ev) const {
 
   // The f array is atomic
-  Kokkos::View<F_FLOAT*[3], typename DAT::t_f_array::array_layout,DeviceType,Kokkos::MemoryTraits<Kokkos::Atomic|Kokkos::Unmanaged> > a_f = f;
+  Kokkos::View<F_FLOAT*[3], typename DAT::t_f_array::array_layout,typename KKDevice<DeviceType>::value,Kokkos::MemoryTraits<Kokkos::Atomic|Kokkos::Unmanaged> > a_f = f;
 
   const int i1 = anglelist(n,0);
   const int i2 = anglelist(n,1);
@@ -284,8 +284,8 @@ void AngleCosineKokkos<DeviceType>::ev_tally(EV_FLOAT &ev, const int i, const in
   F_FLOAT v[6];
 
   // The eatom and vatom arrays are atomic
-  Kokkos::View<E_FLOAT*, typename DAT::t_efloat_1d::array_layout,DeviceType,Kokkos::MemoryTraits<Kokkos::Atomic|Kokkos::Unmanaged> > v_eatom = k_eatom.template view<DeviceType>();
-  Kokkos::View<F_FLOAT*[6], typename DAT::t_virial_array::array_layout,DeviceType,Kokkos::MemoryTraits<Kokkos::Atomic|Kokkos::Unmanaged> > v_vatom = k_vatom.template view<DeviceType>();
+  Kokkos::View<E_FLOAT*, typename DAT::t_efloat_1d::array_layout,typename KKDevice<DeviceType>::value,Kokkos::MemoryTraits<Kokkos::Atomic|Kokkos::Unmanaged> > v_eatom = k_eatom.template view<DeviceType>();
+  Kokkos::View<F_FLOAT*[6], typename DAT::t_virial_array::array_layout,typename KKDevice<DeviceType>::value,Kokkos::MemoryTraits<Kokkos::Atomic|Kokkos::Unmanaged> > v_vatom = k_vatom.template view<DeviceType>();
 
   if (eflag_either) {
     if (eflag_global) {
diff --git a/src/KOKKOS/angle_harmonic_kokkos.cpp b/src/KOKKOS/angle_harmonic_kokkos.cpp
index fc274bb894..4500e9b313 100644
--- a/src/KOKKOS/angle_harmonic_kokkos.cpp
+++ b/src/KOKKOS/angle_harmonic_kokkos.cpp
@@ -75,7 +75,7 @@ void AngleHarmonicKokkos<DeviceType>::compute(int eflag_in, int vflag_in)
   }
   if (vflag_atom) {
     memoryKK->destroy_kokkos(k_vatom,vatom);
-    memoryKK->create_kokkos(k_vatom,vatom,maxvatom,6,"angle:vatom");
+    memoryKK->create_kokkos(k_vatom,vatom,maxvatom,"angle:vatom");
     d_vatom = k_vatom.template view<DeviceType>();
   }
 
@@ -142,7 +142,7 @@ KOKKOS_INLINE_FUNCTION
 void AngleHarmonicKokkos<DeviceType>::operator()(TagAngleHarmonicCompute<NEWTON_BOND,EVFLAG>, const int &n, EV_FLOAT& ev) const {
 
   // The f array is atomic
-  Kokkos::View<F_FLOAT*[3], typename DAT::t_f_array::array_layout,DeviceType,Kokkos::MemoryTraits<Kokkos::Atomic|Kokkos::Unmanaged> > a_f = f;
+  Kokkos::View<F_FLOAT*[3], typename DAT::t_f_array::array_layout,typename KKDevice<DeviceType>::value,Kokkos::MemoryTraits<Kokkos::Atomic|Kokkos::Unmanaged> > a_f = f;
 
   const int i1 = anglelist(n,0);
   const int i2 = anglelist(n,1);
@@ -302,8 +302,8 @@ void AngleHarmonicKokkos<DeviceType>::ev_tally(EV_FLOAT &ev, const int i, const
   F_FLOAT v[6];
 
   // The eatom and vatom arrays are atomic
-  Kokkos::View<E_FLOAT*, typename DAT::t_efloat_1d::array_layout,DeviceType,Kokkos::MemoryTraits<Kokkos::Atomic|Kokkos::Unmanaged> > v_eatom = k_eatom.template view<DeviceType>();
-  Kokkos::View<F_FLOAT*[6], typename DAT::t_virial_array::array_layout,DeviceType,Kokkos::MemoryTraits<Kokkos::Atomic|Kokkos::Unmanaged> > v_vatom = k_vatom.template view<DeviceType>();
+  Kokkos::View<E_FLOAT*, typename DAT::t_efloat_1d::array_layout,typename KKDevice<DeviceType>::value,Kokkos::MemoryTraits<Kokkos::Atomic|Kokkos::Unmanaged> > v_eatom = k_eatom.template view<DeviceType>();
+  Kokkos::View<F_FLOAT*[6], typename DAT::t_virial_array::array_layout,typename KKDevice<DeviceType>::value,Kokkos::MemoryTraits<Kokkos::Atomic|Kokkos::Unmanaged> > v_vatom = k_vatom.template view<DeviceType>();
 
   if (eflag_either) {
     if (eflag_global) {
diff --git a/src/KOKKOS/atom_kokkos.h b/src/KOKKOS/atom_kokkos.h
index a83b299ebd..0ae032032a 100644
--- a/src/KOKKOS/atom_kokkos.h
+++ b/src/KOKKOS/atom_kokkos.h
@@ -83,32 +83,32 @@ class SortFunctor {
   ViewType source;
   Kokkos::View<typename ViewType::non_const_data_type,typename ViewType::array_type,device_type> dest;
   IndexView index;
-  SortFunctor(ViewType src, typename Kokkos::Impl::enable_if<ViewType::dynamic_rank==1,IndexView>::type ind):source(src),index(ind){
+  SortFunctor(ViewType src, typename std::enable_if<ViewType::dynamic_rank==1,IndexView>::type ind):source(src),index(ind){
     dest = Kokkos::View<typename ViewType::non_const_data_type,typename ViewType::array_type,device_type>("",src.extent(0));
   }
-  SortFunctor(ViewType src, typename Kokkos::Impl::enable_if<ViewType::dynamic_rank==2,IndexView>::type ind):source(src),index(ind){
+  SortFunctor(ViewType src, typename std::enable_if<ViewType::dynamic_rank==2,IndexView>::type ind):source(src),index(ind){
     dest = Kokkos::View<typename ViewType::non_const_data_type,typename ViewType::array_type,device_type>("",src.extent(0),src.extent(1));
   }
-  SortFunctor(ViewType src, typename Kokkos::Impl::enable_if<ViewType::dynamic_rank==3,IndexView>::type ind):source(src),index(ind){
+  SortFunctor(ViewType src, typename std::enable_if<ViewType::dynamic_rank==3,IndexView>::type ind):source(src),index(ind){
     dest = Kokkos::View<typename ViewType::non_const_data_type,typename ViewType::array_type,device_type>("",src.extent(0),src.extent(1),src.extent(2));
   }
-  SortFunctor(ViewType src, typename Kokkos::Impl::enable_if<ViewType::dynamic_rank==4,IndexView>::type ind):source(src),index(ind){
+  SortFunctor(ViewType src, typename std::enable_if<ViewType::dynamic_rank==4,IndexView>::type ind):source(src),index(ind){
     dest = Kokkos::View<typename ViewType::non_const_data_type,typename ViewType::array_type,device_type>("",src.extent(0),src.extent(1),src.extent(2),src.extent(3));
   }
   KOKKOS_INLINE_FUNCTION
-  void operator()(const typename Kokkos::Impl::enable_if<ViewType::rank==1, int>::type& i) {
+  void operator()(const typename std::enable_if<ViewType::rank==1, int>::type& i) {
     dest(i) = source(index(i));
   }
-  void operator()(const typename Kokkos::Impl::enable_if<ViewType::rank==2, int>::type& i) {
+  void operator()(const typename std::enable_if<ViewType::rank==2, int>::type& i) {
     for(int j=0;j<source.extent(1);j++)
       dest(i,j) = source(index(i),j);
   }
-  void operator()(const typename Kokkos::Impl::enable_if<ViewType::rank==3, int>::type& i) {
+  void operator()(const typename std::enable_if<ViewType::rank==3, int>::type& i) {
     for(int j=0;j<source.extent(1);j++)
     for(int k=0;k<source.extent(2);k++)
       dest(i,j,k) = source(index(i),j,k);
   }
-  void operator()(const typename Kokkos::Impl::enable_if<ViewType::rank==4, int>::type& i) {
+  void operator()(const typename std::enable_if<ViewType::rank==4, int>::type& i) {
     for(int j=0;j<source.extent(1);j++)
     for(int k=0;k<source.extent(2);k++)
     for(int l=0;l<source.extent(3);l++)
diff --git a/src/KOKKOS/atom_vec_angle_kokkos.cpp b/src/KOKKOS/atom_vec_angle_kokkos.cpp
index 736e1c1fca..5b934e2434 100644
--- a/src/KOKKOS/atom_vec_angle_kokkos.cpp
+++ b/src/KOKKOS/atom_vec_angle_kokkos.cpp
@@ -74,9 +74,9 @@ void AtomVecAngleKokkos::grow(int n)
   memoryKK->grow_kokkos(atomKK->k_mask,atomKK->mask,nmax,"atom:mask");
   memoryKK->grow_kokkos(atomKK->k_image,atomKK->image,nmax,"atom:image");
 
-  memoryKK->grow_kokkos(atomKK->k_x,atomKK->x,nmax,3,"atom:x");
-  memoryKK->grow_kokkos(atomKK->k_v,atomKK->v,nmax,3,"atom:v");
-  memoryKK->grow_kokkos(atomKK->k_f,atomKK->f,nmax,3,"atom:f");
+  memoryKK->grow_kokkos(atomKK->k_x,atomKK->x,nmax,"atom:x");
+  memoryKK->grow_kokkos(atomKK->k_v,atomKK->v,nmax,"atom:v");
+  memoryKK->grow_kokkos(atomKK->k_f,atomKK->f,nmax,"atom:f");
 
   memoryKK->grow_kokkos(atomKK->k_molecule,atomKK->molecule,nmax,"atom:molecule");
   memoryKK->grow_kokkos(atomKK->k_nspecial,atomKK->nspecial,nmax,3,"atom:nspecial");
diff --git a/src/KOKKOS/atom_vec_atomic_kokkos.cpp b/src/KOKKOS/atom_vec_atomic_kokkos.cpp
index 4fec5740d6..df30b50dd0 100644
--- a/src/KOKKOS/atom_vec_atomic_kokkos.cpp
+++ b/src/KOKKOS/atom_vec_atomic_kokkos.cpp
@@ -70,9 +70,9 @@ void AtomVecAtomicKokkos::grow(int n)
   memoryKK->grow_kokkos(atomKK->k_mask,atomKK->mask,nmax,"atom:mask");
   memoryKK->grow_kokkos(atomKK->k_image,atomKK->image,nmax,"atom:image");
 
-  memoryKK->grow_kokkos(atomKK->k_x,atomKK->x,nmax,3,"atom:x");
-  memoryKK->grow_kokkos(atomKK->k_v,atomKK->v,nmax,3,"atom:v");
-  memoryKK->grow_kokkos(atomKK->k_f,atomKK->f,nmax,3,"atom:f");
+  memoryKK->grow_kokkos(atomKK->k_x,atomKK->x,nmax,"atom:x");
+  memoryKK->grow_kokkos(atomKK->k_v,atomKK->v,nmax,"atom:v");
+  memoryKK->grow_kokkos(atomKK->k_f,atomKK->f,nmax,"atom:f");
 
   grow_reset();
   atomKK->sync(Host,ALL_MASK);
diff --git a/src/KOKKOS/atom_vec_bond_kokkos.cpp b/src/KOKKOS/atom_vec_bond_kokkos.cpp
index 74c05a506c..b614d94bce 100644
--- a/src/KOKKOS/atom_vec_bond_kokkos.cpp
+++ b/src/KOKKOS/atom_vec_bond_kokkos.cpp
@@ -73,9 +73,9 @@ void AtomVecBondKokkos::grow(int n)
   memoryKK->grow_kokkos(atomKK->k_mask,atomKK->mask,nmax,"atom:mask");
   memoryKK->grow_kokkos(atomKK->k_image,atomKK->image,nmax,"atom:image");
 
-  memoryKK->grow_kokkos(atomKK->k_x,atomKK->x,nmax,3,"atom:x");
-  memoryKK->grow_kokkos(atomKK->k_v,atomKK->v,nmax,3,"atom:v");
-  memoryKK->grow_kokkos(atomKK->k_f,atomKK->f,nmax,3,"atom:f");
+  memoryKK->grow_kokkos(atomKK->k_x,atomKK->x,nmax,"atom:x");
+  memoryKK->grow_kokkos(atomKK->k_v,atomKK->v,nmax,"atom:v");
+  memoryKK->grow_kokkos(atomKK->k_f,atomKK->f,nmax,"atom:f");
 
   memoryKK->grow_kokkos(atomKK->k_molecule,atomKK->molecule,nmax,"atom:molecule");
   memoryKK->grow_kokkos(atomKK->k_nspecial,atomKK->nspecial,nmax,3,"atom:nspecial");
@@ -625,7 +625,7 @@ struct AtomVecBondKokkos_PackExchangeFunctor {
     _lo(lo),_hi(hi){
     // 3 comp of x, 3 comp of v, 1 tag, 1 type, 1 mask, 1 image, 1 molecule, 3 nspecial,
     // maxspecial special, 1 num_bond, bond_per_atom bond_type, bond_per_atom bond_atom,
-    // 1 to store buffer lenght
+    // 1 to store buffer length
     elements = 16+atom->maxspecial+atom->bond_per_atom+atom->bond_per_atom;
     const int maxsendlist = (buf.template view<DeviceType>().extent(0)*
                              buf.template view<DeviceType>().extent(1))/elements;
diff --git a/src/KOKKOS/atom_vec_charge_kokkos.cpp b/src/KOKKOS/atom_vec_charge_kokkos.cpp
index 3f26b1e9ea..a9cee3aca8 100644
--- a/src/KOKKOS/atom_vec_charge_kokkos.cpp
+++ b/src/KOKKOS/atom_vec_charge_kokkos.cpp
@@ -73,9 +73,9 @@ void AtomVecChargeKokkos::grow(int n)
   memoryKK->grow_kokkos(atomKK->k_mask,atomKK->mask,nmax,"atom:mask");
   memoryKK->grow_kokkos(atomKK->k_image,atomKK->image,nmax,"atom:image");
 
-  memoryKK->grow_kokkos(atomKK->k_x,atomKK->x,nmax,3,"atom:x");
-  memoryKK->grow_kokkos(atomKK->k_v,atomKK->v,nmax,3,"atom:v");
-  memoryKK->grow_kokkos(atomKK->k_f,atomKK->f,nmax,3,"atom:f");
+  memoryKK->grow_kokkos(atomKK->k_x,atomKK->x,nmax,"atom:x");
+  memoryKK->grow_kokkos(atomKK->k_v,atomKK->v,nmax,"atom:v");
+  memoryKK->grow_kokkos(atomKK->k_f,atomKK->f,nmax,"atom:f");
 
   memoryKK->grow_kokkos(atomKK->k_q,atomKK->q,nmax,"atom:q");
 
diff --git a/src/KOKKOS/atom_vec_dpd_kokkos.cpp b/src/KOKKOS/atom_vec_dpd_kokkos.cpp
index 144ef26f19..dfc122b1ef 100644
--- a/src/KOKKOS/atom_vec_dpd_kokkos.cpp
+++ b/src/KOKKOS/atom_vec_dpd_kokkos.cpp
@@ -75,9 +75,9 @@ void AtomVecDPDKokkos::grow(int n)
   memoryKK->grow_kokkos(atomKK->k_mask,atomKK->mask,nmax,"atom:mask");
   memoryKK->grow_kokkos(atomKK->k_image,atomKK->image,nmax,"atom:image");
 
-  memoryKK->grow_kokkos(atomKK->k_x,atomKK->x,nmax,3,"atom:x");
-  memoryKK->grow_kokkos(atomKK->k_v,atomKK->v,nmax,3,"atom:v");
-  memoryKK->grow_kokkos(atomKK->k_f,atomKK->f,nmax,3,"atom:f");
+  memoryKK->grow_kokkos(atomKK->k_x,atomKK->x,nmax,"atom:x");
+  memoryKK->grow_kokkos(atomKK->k_v,atomKK->v,nmax,"atom:v");
+  memoryKK->grow_kokkos(atomKK->k_f,atomKK->f,nmax,"atom:f");
 
 
   memoryKK->grow_kokkos(atomKK->k_rho,atomKK->rho,nmax,"atom:rho");
diff --git a/src/KOKKOS/atom_vec_full_kokkos.cpp b/src/KOKKOS/atom_vec_full_kokkos.cpp
index 1fdbcbec8c..b5239867fb 100644
--- a/src/KOKKOS/atom_vec_full_kokkos.cpp
+++ b/src/KOKKOS/atom_vec_full_kokkos.cpp
@@ -73,9 +73,9 @@ void AtomVecFullKokkos::grow(int n)
   memoryKK->grow_kokkos(atomKK->k_mask,atomKK->mask,nmax,"atom:mask");
   memoryKK->grow_kokkos(atomKK->k_image,atomKK->image,nmax,"atom:image");
 
-  memoryKK->grow_kokkos(atomKK->k_x,atomKK->x,nmax,3,"atom:x");
-  memoryKK->grow_kokkos(atomKK->k_v,atomKK->v,nmax,3,"atom:v");
-  memoryKK->grow_kokkos(atomKK->k_f,atomKK->f,nmax,3,"atom:f");
+  memoryKK->grow_kokkos(atomKK->k_x,atomKK->x,nmax,"atom:x");
+  memoryKK->grow_kokkos(atomKK->k_v,atomKK->v,nmax,"atom:v");
+  memoryKK->grow_kokkos(atomKK->k_f,atomKK->f,nmax,"atom:f");
 
   memoryKK->grow_kokkos(atomKK->k_q,atomKK->q,nmax,"atom:q");
   memoryKK->grow_kokkos(atomKK->k_molecule,atomKK->molecule,nmax,"atom:molecule");
diff --git a/src/KOKKOS/atom_vec_molecular_kokkos.cpp b/src/KOKKOS/atom_vec_molecular_kokkos.cpp
index f3b4ae98ca..fec0183971 100644
--- a/src/KOKKOS/atom_vec_molecular_kokkos.cpp
+++ b/src/KOKKOS/atom_vec_molecular_kokkos.cpp
@@ -73,9 +73,9 @@ void AtomVecMolecularKokkos::grow(int n)
   memoryKK->grow_kokkos(atomKK->k_mask,atomKK->mask,nmax,"atom:mask");
   memoryKK->grow_kokkos(atomKK->k_image,atomKK->image,nmax,"atom:image");
 
-  memoryKK->grow_kokkos(atomKK->k_x,atomKK->x,nmax,3,"atom:x");
-  memoryKK->grow_kokkos(atomKK->k_v,atomKK->v,nmax,3,"atom:v");
-  memoryKK->grow_kokkos(atomKK->k_f,atomKK->f,nmax,3,"atom:f");
+  memoryKK->grow_kokkos(atomKK->k_x,atomKK->x,nmax,"atom:x");
+  memoryKK->grow_kokkos(atomKK->k_v,atomKK->v,nmax,"atom:v");
+  memoryKK->grow_kokkos(atomKK->k_f,atomKK->f,nmax,"atom:f");
 
   memoryKK->grow_kokkos(atomKK->k_molecule,atomKK->molecule,nmax,"atom:molecule");
   memoryKK->grow_kokkos(atomKK->k_nspecial,atomKK->nspecial,nmax,3,"atom:nspecial");
diff --git a/src/KOKKOS/atom_vec_sphere_kokkos.cpp b/src/KOKKOS/atom_vec_sphere_kokkos.cpp
index 67aaa32c21..27a4bd0274 100644
--- a/src/KOKKOS/atom_vec_sphere_kokkos.cpp
+++ b/src/KOKKOS/atom_vec_sphere_kokkos.cpp
@@ -107,13 +107,13 @@ void AtomVecSphereKokkos::grow(int n)
   memoryKK->grow_kokkos(atomKK->k_mask,atomKK->mask,nmax,"atom:mask");
   memoryKK->grow_kokkos(atomKK->k_image,atomKK->image,nmax,"atom:image");
 
-  memoryKK->grow_kokkos(atomKK->k_x,atomKK->x,nmax,3,"atom:x");
-  memoryKK->grow_kokkos(atomKK->k_v,atomKK->v,nmax,3,"atom:v");
-  memoryKK->grow_kokkos(atomKK->k_f,atomKK->f,nmax,3,"atom:f");
+  memoryKK->grow_kokkos(atomKK->k_x,atomKK->x,nmax,"atom:x");
+  memoryKK->grow_kokkos(atomKK->k_v,atomKK->v,nmax,"atom:v");
+  memoryKK->grow_kokkos(atomKK->k_f,atomKK->f,nmax,"atom:f");
   memoryKK->grow_kokkos(atomKK->k_radius,atomKK->radius,nmax,"atom:radius");
   memoryKK->grow_kokkos(atomKK->k_rmass,atomKK->rmass,nmax,"atom:rmass");
-  memoryKK->grow_kokkos(atomKK->k_omega,atomKK->omega,nmax,3,"atom:omega");
-  memoryKK->grow_kokkos(atomKK->k_torque,atomKK->torque,nmax,3,"atom:torque");
+  memoryKK->grow_kokkos(atomKK->k_omega,atomKK->omega,nmax,"atom:omega");
+  memoryKK->grow_kokkos(atomKK->k_torque,atomKK->torque,nmax,"atom:torque");
 
   if (atom->nextra_grow)
     for (int iextra = 0; iextra < atom->nextra_grow; iextra++)
diff --git a/src/KOKKOS/bond_class2_kokkos.cpp b/src/KOKKOS/bond_class2_kokkos.cpp
index 04281bfdd2..514c80ddfb 100644
--- a/src/KOKKOS/bond_class2_kokkos.cpp
+++ b/src/KOKKOS/bond_class2_kokkos.cpp
@@ -74,7 +74,7 @@ void BondClass2Kokkos<DeviceType>::compute(int eflag_in, int vflag_in)
   if (vflag_atom) {
     //if(k_vatom.extent(0)<maxvatom) { // won't work without adding zero functor
       memoryKK->destroy_kokkos(k_vatom,vatom);
-      memoryKK->create_kokkos(k_vatom,vatom,maxvatom,6,"improper:vatom");
+      memoryKK->create_kokkos(k_vatom,vatom,maxvatom,"improper:vatom");
       d_vatom = k_vatom.template view<DeviceType>();
     //}
   }
diff --git a/src/KOKKOS/bond_class2_kokkos.h b/src/KOKKOS/bond_class2_kokkos.h
index a31ae4b8ae..b3c1d5f682 100644
--- a/src/KOKKOS/bond_class2_kokkos.h
+++ b/src/KOKKOS/bond_class2_kokkos.h
@@ -63,13 +63,13 @@ class BondClass2Kokkos : public BondClass2 {
   class NeighborKokkos *neighborKK;
 
   typename AT::t_x_array_randomread x;
-  typename Kokkos::View<double*[3],typename AT::t_f_array::array_layout,DeviceType,Kokkos::MemoryTraits<Kokkos::Atomic> > f;
+  typename Kokkos::View<double*[3],typename AT::t_f_array::array_layout,typename KKDevice<DeviceType>::value,Kokkos::MemoryTraits<Kokkos::Atomic> > f;
   typename AT::t_int_2d bondlist;
 
   Kokkos::DualView<E_FLOAT*,Kokkos::LayoutRight,DeviceType> k_eatom;
   Kokkos::DualView<F_FLOAT*[6],Kokkos::LayoutRight,DeviceType> k_vatom;
-  Kokkos::View<E_FLOAT*,Kokkos::LayoutRight,DeviceType,Kokkos::MemoryTraits<Kokkos::Atomic> > d_eatom;
-  Kokkos::View<F_FLOAT*[6],Kokkos::LayoutRight,DeviceType,Kokkos::MemoryTraits<Kokkos::Atomic> > d_vatom;
+  Kokkos::View<E_FLOAT*,Kokkos::LayoutRight,typename KKDevice<DeviceType>::value,Kokkos::MemoryTraits<Kokkos::Atomic> > d_eatom;
+  Kokkos::View<F_FLOAT*[6],Kokkos::LayoutRight,typename KKDevice<DeviceType>::value,Kokkos::MemoryTraits<Kokkos::Atomic> > d_vatom;
 
   int nlocal,newton_bond;
   int eflag,vflag;
diff --git a/src/KOKKOS/bond_fene_kokkos.cpp b/src/KOKKOS/bond_fene_kokkos.cpp
index 361bb61f7e..864873343d 100644
--- a/src/KOKKOS/bond_fene_kokkos.cpp
+++ b/src/KOKKOS/bond_fene_kokkos.cpp
@@ -80,7 +80,7 @@ void BondFENEKokkos<DeviceType>::compute(int eflag_in, int vflag_in)
   }
   if (vflag_atom) {
     memoryKK->destroy_kokkos(k_vatom,vatom);
-    memoryKK->create_kokkos(k_vatom,vatom,maxvatom,6,"bond:vatom");
+    memoryKK->create_kokkos(k_vatom,vatom,maxvatom,"bond:vatom");
     d_vatom = k_vatom.view<DeviceType>();
   }
 
@@ -166,7 +166,7 @@ void BondFENEKokkos<DeviceType>::operator()(TagBondFENECompute<NEWTON_BOND,EVFLA
   if (d_error_flag()) return;
 
   // The f array is atomic
-  Kokkos::View<F_FLOAT*[3], typename DAT::t_f_array::array_layout,DeviceType,Kokkos::MemoryTraits<Kokkos::Atomic|Kokkos::Unmanaged> > a_f = f;
+  Kokkos::View<F_FLOAT*[3], typename DAT::t_f_array::array_layout,typename KKDevice<DeviceType>::value,Kokkos::MemoryTraits<Kokkos::Atomic|Kokkos::Unmanaged> > a_f = f;
 
   const int i1 = bondlist(n,0);
   const int i2 = bondlist(n,1);
@@ -320,8 +320,8 @@ void BondFENEKokkos<DeviceType>::ev_tally(EV_FLOAT &ev, const int &i, const int
   F_FLOAT v[6];
 
   // The eatom and vatom arrays are atomic
-  Kokkos::View<E_FLOAT*, typename DAT::t_efloat_1d::array_layout,DeviceType,Kokkos::MemoryTraits<Kokkos::Atomic|Kokkos::Unmanaged> > v_eatom = k_eatom.view<DeviceType>();
-  Kokkos::View<F_FLOAT*[6], typename DAT::t_virial_array::array_layout,DeviceType,Kokkos::MemoryTraits<Kokkos::Atomic|Kokkos::Unmanaged> > v_vatom = k_vatom.view<DeviceType>();
+  Kokkos::View<E_FLOAT*, typename DAT::t_efloat_1d::array_layout,typename KKDevice<DeviceType>::value,Kokkos::MemoryTraits<Kokkos::Atomic|Kokkos::Unmanaged> > v_eatom = k_eatom.view<DeviceType>();
+  Kokkos::View<F_FLOAT*[6], typename DAT::t_virial_array::array_layout,typename KKDevice<DeviceType>::value,Kokkos::MemoryTraits<Kokkos::Atomic|Kokkos::Unmanaged> > v_vatom = k_vatom.view<DeviceType>();
 
   if (eflag_either) {
     if (eflag_global) {
diff --git a/src/KOKKOS/bond_harmonic_kokkos.cpp b/src/KOKKOS/bond_harmonic_kokkos.cpp
index 792d98fe88..e0d75dcd9a 100644
--- a/src/KOKKOS/bond_harmonic_kokkos.cpp
+++ b/src/KOKKOS/bond_harmonic_kokkos.cpp
@@ -75,7 +75,7 @@ void BondHarmonicKokkos<DeviceType>::compute(int eflag_in, int vflag_in)
   if (vflag_atom) {
     //if(k_vatom.extent(0)<maxvatom) { // won't work without adding zero functor
       memoryKK->destroy_kokkos(k_vatom,vatom);
-      memoryKK->create_kokkos(k_vatom,vatom,maxvatom,6,"improper:vatom");
+      memoryKK->create_kokkos(k_vatom,vatom,maxvatom,"improper:vatom");
       d_vatom = k_vatom.template view<DeviceType>();
     //}
   }
diff --git a/src/KOKKOS/bond_harmonic_kokkos.h b/src/KOKKOS/bond_harmonic_kokkos.h
index 2bf12f3766..b5bee7e909 100644
--- a/src/KOKKOS/bond_harmonic_kokkos.h
+++ b/src/KOKKOS/bond_harmonic_kokkos.h
@@ -63,13 +63,13 @@ class BondHarmonicKokkos : public BondHarmonic {
 
   typedef ArrayTypes<DeviceType> AT;
   typename AT::t_x_array_randomread x;
-  typename Kokkos::View<double*[3],typename AT::t_f_array::array_layout,DeviceType,Kokkos::MemoryTraits<Kokkos::Atomic> > f;
+  typename Kokkos::View<double*[3],typename AT::t_f_array::array_layout,typename KKDevice<DeviceType>::value,Kokkos::MemoryTraits<Kokkos::Atomic> > f;
   typename AT::t_int_2d bondlist;
 
   Kokkos::DualView<E_FLOAT*,Kokkos::LayoutRight,DeviceType> k_eatom;
   Kokkos::DualView<F_FLOAT*[6],Kokkos::LayoutRight,DeviceType> k_vatom;
-  Kokkos::View<E_FLOAT*,Kokkos::LayoutRight,DeviceType,Kokkos::MemoryTraits<Kokkos::Atomic> > d_eatom;
-  Kokkos::View<F_FLOAT*[6],Kokkos::LayoutRight,DeviceType,Kokkos::MemoryTraits<Kokkos::Atomic> > d_vatom;
+  Kokkos::View<E_FLOAT*,Kokkos::LayoutRight,typename KKDevice<DeviceType>::value,Kokkos::MemoryTraits<Kokkos::Atomic> > d_eatom;
+  Kokkos::View<F_FLOAT*[6],Kokkos::LayoutRight,typename KKDevice<DeviceType>::value,Kokkos::MemoryTraits<Kokkos::Atomic> > d_vatom;
 
   int nlocal,newton_bond;
   int eflag,vflag;
diff --git a/src/KOKKOS/comm_kokkos.cpp b/src/KOKKOS/comm_kokkos.cpp
index 774d7040cc..3b9eeaf583 100644
--- a/src/KOKKOS/comm_kokkos.cpp
+++ b/src/KOKKOS/comm_kokkos.cpp
@@ -205,7 +205,7 @@ void CommKokkos::forward_comm_device(int dummy)
           }
           n = avec->pack_comm_kokkos(sendnum[iswap],k_sendlist,
                                      iswap,k_buf_send,pbc_flag[iswap],pbc[iswap]);
-          DeviceType::fence();
+          DeviceType().fence();
           if (n) {
             MPI_Send(k_buf_send.view<DeviceType>().data(),
                      n,MPI_DOUBLE,sendproc[iswap],0,world);
@@ -224,14 +224,14 @@ void CommKokkos::forward_comm_device(int dummy)
           }
           n = avec->pack_comm_vel_kokkos(sendnum[iswap],k_sendlist,iswap,
                                          k_buf_send,pbc_flag[iswap],pbc[iswap]);
-          DeviceType::fence();
+          DeviceType().fence();
           if (n) {
             MPI_Send(k_buf_send.view<DeviceType>().data(),n,
                      MPI_DOUBLE,sendproc[iswap],0,world);
           }
           if (size_forward_recv[iswap]) MPI_Wait(&request,MPI_STATUS_IGNORE);
           avec->unpack_comm_vel_kokkos(recvnum[iswap],firstrecv[iswap],k_buf_recv);
-          DeviceType::fence();
+          DeviceType().fence();
         } else {
           if (size_forward_recv[iswap])
             MPI_Irecv(k_buf_recv.view<DeviceType>().data(),
@@ -239,26 +239,26 @@ void CommKokkos::forward_comm_device(int dummy)
                       recvproc[iswap],0,world,&request);
           n = avec->pack_comm_kokkos(sendnum[iswap],k_sendlist,iswap,
                                      k_buf_send,pbc_flag[iswap],pbc[iswap]);
-          DeviceType::fence();
+          DeviceType().fence();
           if (n)
             MPI_Send(k_buf_send.view<DeviceType>().data(),n,
                      MPI_DOUBLE,sendproc[iswap],0,world);
           if (size_forward_recv[iswap]) MPI_Wait(&request,MPI_STATUS_IGNORE);
           avec->unpack_comm_kokkos(recvnum[iswap],firstrecv[iswap],k_buf_recv);
-          DeviceType::fence();
+          DeviceType().fence();
         }
       } else {
         if (!ghost_velocity) {
           if (sendnum[iswap])
             n = avec->pack_comm_self(sendnum[iswap],k_sendlist,iswap,
                                      firstrecv[iswap],pbc_flag[iswap],pbc[iswap]);
-          DeviceType::fence();
+          DeviceType().fence();
         } else {
           n = avec->pack_comm_vel_kokkos(sendnum[iswap],k_sendlist,iswap,
                                          k_buf_send,pbc_flag[iswap],pbc[iswap]);
-          DeviceType::fence();
+          DeviceType().fence();
           avec->unpack_comm_vel_kokkos(recvnum[iswap],firstrecv[iswap],k_buf_send);
-          DeviceType::fence();
+          DeviceType().fence();
         }
       }
     }
@@ -334,7 +334,7 @@ void CommKokkos::reverse_comm_device()
                     size_reverse_recv[iswap],MPI_DOUBLE,
                     sendproc[iswap],0,world,&request);
         n = avec->pack_reverse_kokkos(recvnum[iswap],firstrecv[iswap],k_buf_send);
-        DeviceType::fence();
+        DeviceType().fence();
         if (n)
           MPI_Send(k_buf_send.view<DeviceType>().data(),n,
                    MPI_DOUBLE,recvproc[iswap],0,world);
@@ -342,7 +342,7 @@ void CommKokkos::reverse_comm_device()
       }
       avec->unpack_reverse_kokkos(sendnum[iswap],k_sendlist,iswap,
                                 k_buf_recv);
-      DeviceType::fence();
+      DeviceType().fence();
     } else {
       if (sendnum[iswap])
         n = avec->unpack_reverse_self(sendnum[iswap],k_sendlist,iswap,
@@ -410,7 +410,7 @@ void CommKokkos::forward_comm_pair_device(Pair *pair)
 
     n = pairKKBase->pack_forward_comm_kokkos(sendnum[iswap],k_sendlist,
                                        iswap,k_buf_send_pair,pbc_flag[iswap],pbc[iswap]);
-    DeviceType::fence();
+    DeviceType().fence();
 
     // exchange with another proc
     // if self, set recv buffer to send buffer
@@ -445,7 +445,7 @@ void CommKokkos::forward_comm_pair_device(Pair *pair)
     // unpack buffer
 
     pairKKBase->unpack_forward_comm_kokkos(recvnum[iswap],firstrecv[iswap],k_buf_recv_pair);
-    DeviceType::fence();
+    DeviceType().fence();
   }
 }
 
@@ -478,7 +478,7 @@ void CommKokkos::reverse_comm_dump(Dump *dump)
    atoms exchanged with all 6 stencil neighbors
    send out atoms that have left my box, receive ones entering my box
    atoms will be lost if not inside some proc's box
-     can happen if atom moves outside of non-periodic bounary
+     can happen if atom moves outside of non-periodic boundary
      or if atom moves more than one proc away
    this routine called before every reneighboring
    for triclinic, atoms must be in lamda coords (0-1) before exchange is called
@@ -647,7 +647,7 @@ void CommKokkos::exchange_device()
                                      k_exchange_sendlist,k_exchange_copylist,
                                      ExecutionSpaceFromDevice<DeviceType>::space,
                                      dim,lo,hi);
-        DeviceType::fence();
+        DeviceType().fence();
       } else {
         while (i < nlocal) {
           if (x[i][dim] < lo || x[i][dim] >= hi) {
@@ -671,7 +671,7 @@ void CommKokkos::exchange_device()
           atom->nlocal=avec->
             unpack_exchange_kokkos(k_buf_send,nrecv,atom->nlocal,dim,lo,hi,
                                    ExecutionSpaceFromDevice<DeviceType>::space);
-          DeviceType::fence();
+          DeviceType().fence();
         }
       } else {
         MPI_Sendrecv(&nsend,1,MPI_INT,procneigh[dim][0],0,
@@ -704,7 +704,7 @@ void CommKokkos::exchange_device()
           atom->nlocal = avec->
             unpack_exchange_kokkos(k_buf_recv,nrecv,atom->nlocal,dim,lo,hi,
                                    ExecutionSpaceFromDevice<DeviceType>::space);
-          DeviceType::fence();
+          DeviceType().fence();
         }
       }
 
@@ -830,6 +830,10 @@ void CommKokkos::borders_device() {
   ExecutionSpace exec_space = ExecutionSpaceFromDevice<DeviceType>::space;
   atomKK->sync(exec_space,ALL_MASK);
 
+  int team_size = 1;
+  if (exec_space == Device)
+    team_size = 128;
+
   // do swaps over all 3 dimensions
 
   iswap = 0;
@@ -883,7 +887,7 @@ void CommKokkos::borders_device() {
 
             BuildBorderListFunctor<DeviceType> f(atomKK->k_x,k_sendlist,
                 k_total_send,nfirst,nlast,dim,lo,hi,iswap,maxsendlist[iswap]);
-            Kokkos::TeamPolicy<DeviceType> config((nlast-nfirst+127)/128,128);
+            Kokkos::TeamPolicy<DeviceType> config((nlast-nfirst+team_size-1)/team_size,team_size);
             Kokkos::parallel_for(config,f);
 
             k_total_send.template modify<DeviceType>();
@@ -900,7 +904,7 @@ void CommKokkos::borders_device() {
 
               BuildBorderListFunctor<DeviceType> f(atomKK->k_x,k_sendlist,
                   k_total_send,nfirst,nlast,dim,lo,hi,iswap,maxsendlist[iswap]);
-              Kokkos::TeamPolicy<DeviceType> config((nlast-nfirst+127)/128,128);
+              Kokkos::TeamPolicy<DeviceType> config((nlast-nfirst+team_size-1)/team_size,team_size);
               Kokkos::parallel_for(config,f);
 
               k_total_send.template modify<DeviceType>();
@@ -964,13 +968,13 @@ void CommKokkos::borders_device() {
         n = avec->
           pack_border_vel_kokkos(nsend,k_sendlist,k_buf_send,iswap,
                                  pbc_flag[iswap],pbc[iswap],exec_space);
-        DeviceType::fence();
+        DeviceType().fence();
       }
       else {
         n = avec->
           pack_border_kokkos(nsend,k_sendlist,k_buf_send,iswap,
                              pbc_flag[iswap],pbc[iswap],exec_space);
-        DeviceType::fence();
+        DeviceType().fence();
       }
 
       // swap atoms with other proc
@@ -1000,21 +1004,21 @@ void CommKokkos::borders_device() {
         if (sendproc[iswap] != me) {
           avec->unpack_border_vel_kokkos(nrecv,atom->nlocal+atom->nghost,
                                          k_buf_recv,exec_space);
-          DeviceType::fence();
+          DeviceType().fence();
         } else {
           avec->unpack_border_vel_kokkos(nrecv,atom->nlocal+atom->nghost,
                                          k_buf_send,exec_space);
-          DeviceType::fence();
+          DeviceType().fence();
         }
       } else {
         if (sendproc[iswap] != me) {
           avec->unpack_border_kokkos(nrecv,atom->nlocal+atom->nghost,
                                      k_buf_recv,exec_space);
-          DeviceType::fence();
+          DeviceType().fence();
         } else {
           avec->unpack_border_kokkos(nrecv,atom->nlocal+atom->nghost,
                                      k_buf_send,exec_space);
-          DeviceType::fence();
+          DeviceType().fence();
         }
       }
       // set all pointers & counters
diff --git a/src/KOKKOS/comm_tiled_kokkos.cpp b/src/KOKKOS/comm_tiled_kokkos.cpp
index fc6de0a0d7..a29d9f63b3 100644
--- a/src/KOKKOS/comm_tiled_kokkos.cpp
+++ b/src/KOKKOS/comm_tiled_kokkos.cpp
@@ -113,7 +113,7 @@ void CommTiledKokkos::reverse_comm()
    atoms exchanged with procs that touch sub-box in each of 3 dims
    send out atoms that have left my box, receive ones entering my box
    atoms will be lost if not inside a touching proc's box
-     can happen if atom moves outside of non-periodic bounary
+     can happen if atom moves outside of non-periodic boundary
      or if atom moves more than one proc away
    this routine called before every reneighboring
    for triclinic, atoms must be in lamda coords (0-1) before exchange is called
diff --git a/src/KOKKOS/dihedral_charmm_kokkos.cpp b/src/KOKKOS/dihedral_charmm_kokkos.cpp
index 94fd0b9bb7..06f25ee0a2 100644
--- a/src/KOKKOS/dihedral_charmm_kokkos.cpp
+++ b/src/KOKKOS/dihedral_charmm_kokkos.cpp
@@ -90,7 +90,7 @@ void DihedralCharmmKokkos<DeviceType>::compute(int eflag_in, int vflag_in)
   if (vflag_atom) {
     //if(k_vatom.extent(0)<maxvatom) { // won't work without adding zero functor
       memoryKK->destroy_kokkos(k_vatom,vatom);
-      memoryKK->create_kokkos(k_vatom,vatom,maxvatom,6,"dihedral:vatom");
+      memoryKK->create_kokkos(k_vatom,vatom,maxvatom,"dihedral:vatom");
       d_vatom = k_vatom.template view<DeviceType>();
       k_vatom_pair = Kokkos::DualView<F_FLOAT*[6],Kokkos::LayoutRight,DeviceType>("dihedral:vatom_pair",maxvatom);
       d_vatom_pair = k_vatom.template view<DeviceType>();
@@ -201,7 +201,7 @@ KOKKOS_INLINE_FUNCTION
 void DihedralCharmmKokkos<DeviceType>::operator()(TagDihedralCharmmCompute<NEWTON_BOND,EVFLAG>, const int &n, EVM_FLOAT& evm) const {
 
   // The f array is atomic
-  Kokkos::View<F_FLOAT*[3], typename DAT::t_f_array::array_layout,DeviceType,Kokkos::MemoryTraits<Kokkos::Atomic|Kokkos::Unmanaged> > a_f = f;
+  Kokkos::View<F_FLOAT*[3], typename DAT::t_f_array::array_layout,typename KKDevice<DeviceType>::value,Kokkos::MemoryTraits<Kokkos::Atomic|Kokkos::Unmanaged> > a_f = f;
 
   const int i1 = dihedrallist(n,0);
   const int i2 = dihedrallist(n,1);
diff --git a/src/KOKKOS/dihedral_charmm_kokkos.h b/src/KOKKOS/dihedral_charmm_kokkos.h
index 449f934533..21bb6fd2e1 100644
--- a/src/KOKKOS/dihedral_charmm_kokkos.h
+++ b/src/KOKKOS/dihedral_charmm_kokkos.h
@@ -134,13 +134,13 @@ class DihedralCharmmKokkos : public DihedralCharmm {
 
   Kokkos::DualView<E_FLOAT*,Kokkos::LayoutRight,DeviceType> k_eatom;
   Kokkos::DualView<F_FLOAT*[6],Kokkos::LayoutRight,DeviceType> k_vatom;
-  Kokkos::View<E_FLOAT*,Kokkos::LayoutRight,DeviceType,Kokkos::MemoryTraits<Kokkos::Atomic> > d_eatom;
-  Kokkos::View<F_FLOAT*[6],Kokkos::LayoutRight,DeviceType,Kokkos::MemoryTraits<Kokkos::Atomic> > d_vatom;
+  Kokkos::View<E_FLOAT*,Kokkos::LayoutRight,typename KKDevice<DeviceType>::value,Kokkos::MemoryTraits<Kokkos::Atomic> > d_eatom;
+  Kokkos::View<F_FLOAT*[6],Kokkos::LayoutRight,typename KKDevice<DeviceType>::value,Kokkos::MemoryTraits<Kokkos::Atomic> > d_vatom;
 
   Kokkos::DualView<E_FLOAT*,Kokkos::LayoutRight,DeviceType> k_eatom_pair;
   Kokkos::DualView<F_FLOAT*[6],Kokkos::LayoutRight,DeviceType> k_vatom_pair;
-  Kokkos::View<E_FLOAT*,Kokkos::LayoutRight,DeviceType,Kokkos::MemoryTraits<Kokkos::Atomic> > d_eatom_pair;
-  Kokkos::View<F_FLOAT*[6],Kokkos::LayoutRight,DeviceType,Kokkos::MemoryTraits<Kokkos::Atomic> > d_vatom_pair;
+  Kokkos::View<E_FLOAT*,Kokkos::LayoutRight,typename KKDevice<DeviceType>::value,Kokkos::MemoryTraits<Kokkos::Atomic> > d_eatom_pair;
+  Kokkos::View<F_FLOAT*[6],Kokkos::LayoutRight,typename KKDevice<DeviceType>::value,Kokkos::MemoryTraits<Kokkos::Atomic> > d_vatom_pair;
 
   int nlocal,newton_bond;
   int eflag,vflag;
diff --git a/src/KOKKOS/dihedral_class2_kokkos.cpp b/src/KOKKOS/dihedral_class2_kokkos.cpp
index 0310053b5e..adda9c56a9 100644
--- a/src/KOKKOS/dihedral_class2_kokkos.cpp
+++ b/src/KOKKOS/dihedral_class2_kokkos.cpp
@@ -80,7 +80,7 @@ void DihedralClass2Kokkos<DeviceType>::compute(int eflag_in, int vflag_in)
   }
   if (vflag_atom) {
     memoryKK->destroy_kokkos(k_vatom,vatom);
-    memoryKK->create_kokkos(k_vatom,vatom,maxvatom,6,"dihedral:vatom");
+    memoryKK->create_kokkos(k_vatom,vatom,maxvatom,"dihedral:vatom");
     d_vatom = k_vatom.template view<DeviceType>();
   }
 
@@ -197,7 +197,7 @@ KOKKOS_INLINE_FUNCTION
 void DihedralClass2Kokkos<DeviceType>::operator()(TagDihedralClass2Compute<NEWTON_BOND,EVFLAG>, const int &n, EV_FLOAT& ev) const {
 
   // The f array is atomic
-  Kokkos::View<F_FLOAT*[3], typename DAT::t_f_array::array_layout,DeviceType,Kokkos::MemoryTraits<Kokkos::Atomic|Kokkos::Unmanaged> > a_f = f;
+  Kokkos::View<F_FLOAT*[3], typename DAT::t_f_array::array_layout,typename KKDevice<DeviceType>::value,Kokkos::MemoryTraits<Kokkos::Atomic|Kokkos::Unmanaged> > a_f = f;
 
   const int i1 = dihedrallist(n,0);
   const int i2 = dihedrallist(n,1);
@@ -1015,8 +1015,8 @@ void DihedralClass2Kokkos<DeviceType>::ev_tally(EV_FLOAT &ev, const int i1, cons
   F_FLOAT v[6];
 
   // The eatom and vatom arrays are atomic
-  Kokkos::View<E_FLOAT*, typename DAT::t_efloat_1d::array_layout,DeviceType,Kokkos::MemoryTraits<Kokkos::Atomic|Kokkos::Unmanaged> > v_eatom = k_eatom.view<DeviceType>();
-  Kokkos::View<F_FLOAT*[6], typename DAT::t_virial_array::array_layout,DeviceType,Kokkos::MemoryTraits<Kokkos::Atomic|Kokkos::Unmanaged> > v_vatom = k_vatom.view<DeviceType>();
+  Kokkos::View<E_FLOAT*, typename DAT::t_efloat_1d::array_layout,typename KKDevice<DeviceType>::value,Kokkos::MemoryTraits<Kokkos::Atomic|Kokkos::Unmanaged> > v_eatom = k_eatom.view<DeviceType>();
+  Kokkos::View<F_FLOAT*[6], typename DAT::t_virial_array::array_layout,typename KKDevice<DeviceType>::value,Kokkos::MemoryTraits<Kokkos::Atomic|Kokkos::Unmanaged> > v_vatom = k_vatom.view<DeviceType>();
 
   if (eflag_either) {
     if (eflag_global) {
diff --git a/src/KOKKOS/dihedral_harmonic_kokkos.cpp b/src/KOKKOS/dihedral_harmonic_kokkos.cpp
index dd77bc605b..15e459f0d5 100644
--- a/src/KOKKOS/dihedral_harmonic_kokkos.cpp
+++ b/src/KOKKOS/dihedral_harmonic_kokkos.cpp
@@ -80,7 +80,7 @@ void DihedralHarmonicKokkos<DeviceType>::compute(int eflag_in, int vflag_in)
   }
   if (vflag_atom) {
     memoryKK->destroy_kokkos(k_vatom,vatom);
-    memoryKK->create_kokkos(k_vatom,vatom,maxvatom,6,"dihedral:vatom");
+    memoryKK->create_kokkos(k_vatom,vatom,maxvatom,"dihedral:vatom");
     d_vatom = k_vatom.view<DeviceType>();
   }
 
@@ -158,7 +158,7 @@ KOKKOS_INLINE_FUNCTION
 void DihedralHarmonicKokkos<DeviceType>::operator()(TagDihedralHarmonicCompute<NEWTON_BOND,EVFLAG>, const int &n, EV_FLOAT& ev) const {
 
   // The f array is atomic
-  Kokkos::View<F_FLOAT*[3], typename DAT::t_f_array::array_layout,DeviceType,Kokkos::MemoryTraits<Kokkos::Atomic|Kokkos::Unmanaged> > a_f = f;
+  Kokkos::View<F_FLOAT*[3], typename DAT::t_f_array::array_layout,typename KKDevice<DeviceType>::value,Kokkos::MemoryTraits<Kokkos::Atomic|Kokkos::Unmanaged> > a_f = f;
 
   const int i1 = dihedrallist(n,0);
   const int i2 = dihedrallist(n,1);
@@ -414,8 +414,8 @@ void DihedralHarmonicKokkos<DeviceType>::ev_tally(EV_FLOAT &ev, const int i1, co
   F_FLOAT v[6];
 
   // The eatom and vatom arrays are atomic
-  Kokkos::View<E_FLOAT*, typename DAT::t_efloat_1d::array_layout,DeviceType,Kokkos::MemoryTraits<Kokkos::Atomic|Kokkos::Unmanaged> > v_eatom = k_eatom.view<DeviceType>();
-  Kokkos::View<F_FLOAT*[6], typename DAT::t_virial_array::array_layout,DeviceType,Kokkos::MemoryTraits<Kokkos::Atomic|Kokkos::Unmanaged> > v_vatom = k_vatom.view<DeviceType>();
+  Kokkos::View<E_FLOAT*, typename DAT::t_efloat_1d::array_layout,typename KKDevice<DeviceType>::value,Kokkos::MemoryTraits<Kokkos::Atomic|Kokkos::Unmanaged> > v_eatom = k_eatom.view<DeviceType>();
+  Kokkos::View<F_FLOAT*[6], typename DAT::t_virial_array::array_layout,typename KKDevice<DeviceType>::value,Kokkos::MemoryTraits<Kokkos::Atomic|Kokkos::Unmanaged> > v_vatom = k_vatom.view<DeviceType>();
 
   if (eflag_either) {
     if (eflag_global) {
diff --git a/src/KOKKOS/dihedral_opls_kokkos.cpp b/src/KOKKOS/dihedral_opls_kokkos.cpp
index 825d106e04..cc3cb321c0 100644
--- a/src/KOKKOS/dihedral_opls_kokkos.cpp
+++ b/src/KOKKOS/dihedral_opls_kokkos.cpp
@@ -80,7 +80,7 @@ void DihedralOPLSKokkos<DeviceType>::compute(int eflag_in, int vflag_in)
   }
   if (vflag_atom) {
     memoryKK->destroy_kokkos(k_vatom,vatom);
-    memoryKK->create_kokkos(k_vatom,vatom,maxvatom,6,"dihedral:vatom");
+    memoryKK->create_kokkos(k_vatom,vatom,maxvatom,"dihedral:vatom");
     d_vatom = k_vatom.view<DeviceType>();
   }
 
@@ -157,7 +157,7 @@ KOKKOS_INLINE_FUNCTION
 void DihedralOPLSKokkos<DeviceType>::operator()(TagDihedralOPLSCompute<NEWTON_BOND,EVFLAG>, const int &n, EV_FLOAT& ev) const {
 
   // The f array is atomic
-  Kokkos::View<F_FLOAT*[3], typename DAT::t_f_array::array_layout,DeviceType,Kokkos::MemoryTraits<Kokkos::Atomic|Kokkos::Unmanaged> > a_f = f;
+  Kokkos::View<F_FLOAT*[3], typename DAT::t_f_array::array_layout,typename KKDevice<DeviceType>::value,Kokkos::MemoryTraits<Kokkos::Atomic|Kokkos::Unmanaged> > a_f = f;
 
   const int i1 = dihedrallist(n,0);
   const int i2 = dihedrallist(n,1);
@@ -419,8 +419,8 @@ void DihedralOPLSKokkos<DeviceType>::ev_tally(EV_FLOAT &ev, const int i1, const
   F_FLOAT v[6];
 
   // The eatom and vatom arrays are atomic
-  Kokkos::View<E_FLOAT*, typename DAT::t_efloat_1d::array_layout,DeviceType,Kokkos::MemoryTraits<Kokkos::Atomic|Kokkos::Unmanaged> > v_eatom = k_eatom.view<DeviceType>();
-  Kokkos::View<F_FLOAT*[6], typename DAT::t_virial_array::array_layout,DeviceType,Kokkos::MemoryTraits<Kokkos::Atomic|Kokkos::Unmanaged> > v_vatom = k_vatom.view<DeviceType>();
+  Kokkos::View<E_FLOAT*, typename DAT::t_efloat_1d::array_layout,typename KKDevice<DeviceType>::value,Kokkos::MemoryTraits<Kokkos::Atomic|Kokkos::Unmanaged> > v_eatom = k_eatom.view<DeviceType>();
+  Kokkos::View<F_FLOAT*[6], typename DAT::t_virial_array::array_layout,typename KKDevice<DeviceType>::value,Kokkos::MemoryTraits<Kokkos::Atomic|Kokkos::Unmanaged> > v_vatom = k_vatom.view<DeviceType>();
 
   if (eflag_either) {
     if (eflag_global) {
diff --git a/src/KOKKOS/fft3d_kokkos.cpp b/src/KOKKOS/fft3d_kokkos.cpp
index 9a67ca81f0..fc88136e8c 100644
--- a/src/KOKKOS/fft3d_kokkos.cpp
+++ b/src/KOKKOS/fft3d_kokkos.cpp
@@ -21,7 +21,6 @@
 #include <math.h>
 #include "fft3d_kokkos.h"
 #include "remap_kokkos.h"
-#include "kokkos_type.h"
 #include "error.h"
 #include "kokkos.h"
 
@@ -86,10 +85,10 @@ FFT3dKokkos<DeviceType>::~FFT3dKokkos()
 /* ---------------------------------------------------------------------- */
 
 template<class DeviceType>
-void FFT3dKokkos<DeviceType>::compute(typename AT::t_FFT_SCALAR_1d d_in, typename AT::t_FFT_SCALAR_1d d_out, int flag)
+void FFT3dKokkos<DeviceType>::compute(typename FFT_AT::t_FFT_SCALAR_1d d_in, typename FFT_AT::t_FFT_SCALAR_1d d_out, int flag)
 {
-  typename AT::t_FFT_DATA_1d d_in_data(d_in.data(),d_in.size()/2);
-  typename AT::t_FFT_DATA_1d d_out_data(d_out.data(),d_out.size()/2);
+  typename FFT_AT::t_FFT_DATA_1d d_in_data((FFT_DATA_POINTER)d_in.data(),d_in.size()/2);
+  typename FFT_AT::t_FFT_DATA_1d d_out_data((FFT_DATA_POINTER)d_out.data(),d_out.size()/2);
 
   fft_3d_kokkos(d_in_data,d_out_data,flag,plan);
 }
@@ -97,9 +96,9 @@ void FFT3dKokkos<DeviceType>::compute(typename AT::t_FFT_SCALAR_1d d_in, typenam
 /* ---------------------------------------------------------------------- */
 
 template<class DeviceType>
-void FFT3dKokkos<DeviceType>::timing1d(typename AT::t_FFT_SCALAR_1d d_in, int nsize, int flag)
+void FFT3dKokkos<DeviceType>::timing1d(typename FFT_AT::t_FFT_SCALAR_1d d_in, int nsize, int flag)
 {
-  typename AT::t_FFT_DATA_1d d_in_data(d_in.data(),d_in.size());
+  typename FFT_AT::t_FFT_DATA_1d d_in_data((FFT_DATA_POINTER)d_in.data(),d_in.size()/2);
 
   fft_3d_1d_only_kokkos(d_in_data,nsize,flag,plan);
 }
@@ -138,11 +137,11 @@ template<class DeviceType>
 struct norm_functor {
 public:
   typedef DeviceType device_type;
-  typedef ArrayTypes<DeviceType> AT;
-  typename AT::t_FFT_DATA_1d_um d_out;
+  typedef FFTArrayTypes<DeviceType> FFT_AT;
+  typename FFT_AT::t_FFT_DATA_1d_um d_out;
   int norm;
 
-  norm_functor(typename AT::t_FFT_DATA_1d &d_out_, int norm_):
+  norm_functor(typename FFT_AT::t_FFT_DATA_1d &d_out_, int norm_):
     d_out(d_out_),norm(norm_) {}
 
   KOKKOS_INLINE_FUNCTION
@@ -153,9 +152,9 @@ public:
     *(out_ptr++) *= norm;
 #elif defined(FFT_MKL)
     d_out(i) *= norm;
-#else
-    d_out(i,0) *= norm;
-    d_out(i,1) *= norm;
+#else // FFT_KISS
+    d_out(i).re *= norm;
+    d_out(i).im *= norm;
 #endif
   }
 };
@@ -165,14 +164,14 @@ template<class DeviceType>
 struct kiss_fft_functor {
 public:
   typedef DeviceType device_type;
-  typedef ArrayTypes<DeviceType> AT;
-  typename AT::t_FFT_DATA_1d_um d_data,d_tmp;
+  typedef FFTArrayTypes<DeviceType> FFT_AT;
+  typename FFT_AT::t_FFT_DATA_1d_um d_data,d_tmp;
   kiss_fft_state_kokkos<DeviceType> st;
   int length;
 
   kiss_fft_functor() {}
 
-  kiss_fft_functor(typename AT::t_FFT_DATA_1d &d_data_,typename AT::t_FFT_DATA_1d &d_tmp_, kiss_fft_state_kokkos<DeviceType> &st_, int length_):
+  kiss_fft_functor(typename FFT_AT::t_FFT_DATA_1d &d_data_,typename FFT_AT::t_FFT_DATA_1d &d_tmp_, kiss_fft_state_kokkos<DeviceType> &st_, int length_):
     d_data(d_data_),
     d_tmp(d_tmp_),
     st(st_)
@@ -189,11 +188,11 @@ public:
 #endif
 
 template<class DeviceType>
-void FFT3dKokkos<DeviceType>::fft_3d_kokkos(typename AT::t_FFT_DATA_1d d_in, typename AT::t_FFT_DATA_1d d_out, int flag, struct fft_plan_3d_kokkos<DeviceType> *plan)
+void FFT3dKokkos<DeviceType>::fft_3d_kokkos(typename FFT_AT::t_FFT_DATA_1d d_in, typename FFT_AT::t_FFT_DATA_1d d_out, int flag, struct fft_plan_3d_kokkos<DeviceType> *plan)
 {
   int total,length;
-  typename AT::t_FFT_DATA_1d d_data,d_copy;
-  typename AT::t_FFT_SCALAR_1d d_in_scalar,d_data_scalar,d_out_scalar,d_copy_scalar,d_scratch_scalar;
+  typename FFT_AT::t_FFT_DATA_1d d_data,d_copy;
+  typename FFT_AT::t_FFT_SCALAR_1d d_in_scalar,d_data_scalar,d_out_scalar,d_copy_scalar,d_scratch_scalar;
 
   // pre-remap to prepare for 1st FFTs if needed
   // copy = loc for remap result
@@ -202,9 +201,9 @@ void FFT3dKokkos<DeviceType>::fft_3d_kokkos(typename AT::t_FFT_DATA_1d d_in, typ
     if (plan->pre_target == 0) d_copy = d_out;
     else d_copy = plan->d_copy;
 
-     d_in_scalar = typename AT::t_FFT_SCALAR_1d(d_in.data(),d_in.size());
-     d_copy_scalar = typename AT::t_FFT_SCALAR_1d(d_copy.data(),d_copy.size());
-     d_scratch_scalar = typename AT::t_FFT_SCALAR_1d(plan->d_scratch.data(),plan->d_scratch.size());
+     d_in_scalar = typename FFT_AT::t_FFT_SCALAR_1d((FFT_SCALAR*)d_in.data(),d_in.size()*2);
+     d_copy_scalar = typename FFT_AT::t_FFT_SCALAR_1d((FFT_SCALAR*)d_copy.data(),d_copy.size()*2);
+     d_scratch_scalar = typename FFT_AT::t_FFT_SCALAR_1d((FFT_SCALAR*)plan->d_scratch.data(),plan->d_scratch.size()*2);
 
     remapKK->remap_3d_kokkos(d_in_scalar, d_copy_scalar,
              d_scratch_scalar, plan->pre_plan);
@@ -219,19 +218,19 @@ void FFT3dKokkos<DeviceType>::fft_3d_kokkos(typename AT::t_FFT_DATA_1d d_in, typ
 
   #if defined(FFT_MKL)
     if (flag == -1)
-      DftiComputeForward(plan->handle_fast,(FFT_DATA *)d_data.data());
+      DftiComputeForward(plan->handle_fast,d_data.data());
     else
-      DftiComputeBackward(plan->handle_fast,(FFT_DATA *)d_data.data());
+      DftiComputeBackward(plan->handle_fast,d_data.data());
   #elif defined(FFT_FFTW3)
     if (flag == -1)
-      FFTW_API(execute_dft)(plan->plan_fast_forward,(FFT_DATA *)d_data.data(),(FFT_DATA *)d_data.data());
+      FFTW_API(execute_dft)(plan->plan_fast_forward,(FFT_DATA*)d_data.data(),(FFT_DATA*)d_data.data());
     else
-      FFTW_API(execute_dft)(plan->plan_fast_backward,(FFT_DATA *)d_data.data(),(FFT_DATA *)d_data.data());
+      FFTW_API(execute_dft)(plan->plan_fast_backward,(FFT_DATA*)d_data.data(),(FFT_DATA*)d_data.data());
   #elif defined(FFT_CUFFT)
-    cufftExec(plan->plan_fast,(FFT_DATA *)d_data.data(),(FFT_DATA *)d_data.data(),flag);
+    cufftExec(plan->plan_fast,d_data.data(),d_data.data(),flag);
   #else
-    typename AT::t_FFT_DATA_1d d_tmp =
-     typename AT::t_FFT_DATA_1d(Kokkos::view_alloc("fft_3d:tmp",Kokkos::WithoutInitializing),d_in.dimension_0());
+    typename FFT_AT::t_FFT_DATA_1d d_tmp =
+     typename FFT_AT::t_FFT_DATA_1d(Kokkos::view_alloc("fft_3d:tmp",Kokkos::WithoutInitializing),d_in.extent(0));
     kiss_fft_functor<DeviceType> f;
     if (flag == -1)
       f = kiss_fft_functor<DeviceType>(d_data,d_tmp,plan->cfg_fast_forward,length);
@@ -239,7 +238,7 @@ void FFT3dKokkos<DeviceType>::fft_3d_kokkos(typename AT::t_FFT_DATA_1d d_in, typ
       f = kiss_fft_functor<DeviceType>(d_data,d_tmp,plan->cfg_fast_backward,length);
     Kokkos::parallel_for(total/length,f);
     d_data = d_tmp;
-    d_tmp = typename AT::t_FFT_DATA_1d(Kokkos::view_alloc("fft_3d:tmp",Kokkos::WithoutInitializing),d_in.dimension_0());
+    d_tmp = typename FFT_AT::t_FFT_DATA_1d(Kokkos::view_alloc("fft_3d:tmp",Kokkos::WithoutInitializing),d_in.extent(0));
   #endif
 
 
@@ -249,9 +248,9 @@ void FFT3dKokkos<DeviceType>::fft_3d_kokkos(typename AT::t_FFT_DATA_1d d_in, typ
   if (plan->mid1_target == 0) d_copy = d_out;
   else d_copy = plan->d_copy;
 
-  d_data_scalar = typename AT::t_FFT_SCALAR_1d(d_data.data(),d_data.size()*2);
-  d_copy_scalar = typename AT::t_FFT_SCALAR_1d(d_copy.data(),d_copy.size()*2);
-  d_scratch_scalar = typename AT::t_FFT_SCALAR_1d(plan->d_scratch.data(),plan->d_scratch.size()*2);
+  d_data_scalar = typename FFT_AT::t_FFT_SCALAR_1d((FFT_SCALAR*)d_data.data(),d_data.size()*2);
+  d_copy_scalar = typename FFT_AT::t_FFT_SCALAR_1d((FFT_SCALAR*)d_copy.data(),d_copy.size()*2);
+  d_scratch_scalar = typename FFT_AT::t_FFT_SCALAR_1d((FFT_SCALAR*)plan->d_scratch.data(),plan->d_scratch.size()*2);
 
   remapKK->remap_3d_kokkos(d_data_scalar, d_copy_scalar,
            d_scratch_scalar, plan->mid1_plan);
@@ -265,16 +264,16 @@ void FFT3dKokkos<DeviceType>::fft_3d_kokkos(typename AT::t_FFT_DATA_1d d_in, typ
 
   #if defined(FFT_MKL)
     if (flag == -1)
-      DftiComputeForward(plan->handle_mid,(FFT_DATA *)d_data.data());
+      DftiComputeForward(plan->handle_mid,d_data.data());
     else
-      DftiComputeBackward(plan->handle_mid,(FFT_DATA *)d_data.data());
+      DftiComputeBackward(plan->handle_mid,d_data.data());
   #elif defined(FFT_FFTW3)
     if (flag == -1)
-      FFTW_API(execute_dft)(plan->plan_mid_forward,(FFT_DATA *)d_data.data(),(FFT_DATA *)d_data.data());
+      FFTW_API(execute_dft)(plan->plan_mid_forward,(FFT_DATA*)d_data.data(),(FFT_DATA*)d_data.data());
     else
-      FFTW_API(execute_dft)(plan->plan_mid_backward,(FFT_DATA *)d_data.data(),(FFT_DATA *)d_data.data());
+      FFTW_API(execute_dft)(plan->plan_mid_backward,(FFT_DATA*)d_data.data(),(FFT_DATA*)d_data.data());
   #elif defined(FFT_CUFFT)
-    cufftExec(plan->plan_mid,(FFT_DATA *)d_data.data(),(FFT_DATA *)d_data.data(),flag);
+    cufftExec(plan->plan_mid,d_data.data(),d_data.data(),flag);
   #else
     if (flag == -1)
       f = kiss_fft_functor<DeviceType>(d_data,d_tmp,plan->cfg_mid_forward,length);
@@ -282,7 +281,7 @@ void FFT3dKokkos<DeviceType>::fft_3d_kokkos(typename AT::t_FFT_DATA_1d d_in, typ
       f = kiss_fft_functor<DeviceType>(d_data,d_tmp,plan->cfg_mid_backward,length);
     Kokkos::parallel_for(total/length,f);
     d_data = d_tmp;
-    d_tmp = typename AT::t_FFT_DATA_1d(Kokkos::view_alloc("fft_3d:tmp",Kokkos::WithoutInitializing),d_in.dimension_0());
+    d_tmp = typename FFT_AT::t_FFT_DATA_1d(Kokkos::view_alloc("fft_3d:tmp",Kokkos::WithoutInitializing),d_in.extent(0));
   #endif
 
   // 2nd mid-remap to prepare for 3rd FFTs
@@ -291,9 +290,9 @@ void FFT3dKokkos<DeviceType>::fft_3d_kokkos(typename AT::t_FFT_DATA_1d d_in, typ
   if (plan->mid2_target == 0) d_copy = d_out;
   else d_copy = plan->d_copy;
 
-  d_data_scalar = typename AT::t_FFT_SCALAR_1d(d_data.data(),d_data.size());
-  d_copy_scalar = typename AT::t_FFT_SCALAR_1d(d_copy.data(),d_copy.size());
-  d_scratch_scalar = typename AT::t_FFT_SCALAR_1d(plan->d_scratch.data(),plan->d_scratch.size());
+  d_data_scalar = typename FFT_AT::t_FFT_SCALAR_1d((FFT_SCALAR*)d_data.data(),d_data.size()*2);
+  d_copy_scalar = typename FFT_AT::t_FFT_SCALAR_1d((FFT_SCALAR*)d_copy.data(),d_copy.size()*2);
+  d_scratch_scalar = typename FFT_AT::t_FFT_SCALAR_1d((FFT_SCALAR*)plan->d_scratch.data(),plan->d_scratch.size()*2);
 
   remapKK->remap_3d_kokkos(d_data_scalar, d_copy_scalar,
            d_scratch_scalar, plan->mid2_plan);
@@ -307,16 +306,16 @@ void FFT3dKokkos<DeviceType>::fft_3d_kokkos(typename AT::t_FFT_DATA_1d d_in, typ
 
   #if defined(FFT_MKL)
     if (flag == -1)
-      DftiComputeForward(plan->handle_slow,(FFT_DATA *)d_data.data());
+      DftiComputeForward(plan->handle_slow,d_data.data());
     else
-      DftiComputeBackward(plan->handle_slow,(FFT_DATA *)d_data.data());
+      DftiComputeBackward(plan->handle_slow,d_data.data());
   #elif defined(FFT_FFTW3)
     if (flag == -1)
-      FFTW_API(execute_dft)(plan->plan_slow_forward,(FFT_DATA *)d_data.data(),(FFT_DATA *)d_data.data());
+      FFTW_API(execute_dft)(plan->plan_slow_forward,(FFT_DATA*)d_data.data(),(FFT_DATA*)d_data.data());
     else
-      FFTW_API(execute_dft)(plan->plan_slow_backward,(FFT_DATA *)d_data.data(),(FFT_DATA *)d_data.data());
+      FFTW_API(execute_dft)(plan->plan_slow_backward,(FFT_DATA*)d_data.data(),(FFT_DATA*)d_data.data());
   #elif defined(FFT_CUFFT)
-    cufftExec(plan->plan_slow,(FFT_DATA *)d_data.data(),(FFT_DATA *)d_data.data(),flag);
+    cufftExec(plan->plan_slow,d_data.data(),d_data.data(),flag);
   #else
     if (flag == -1)
       f = kiss_fft_functor<DeviceType>(d_data,d_tmp,plan->cfg_slow_forward,length);
@@ -331,9 +330,9 @@ void FFT3dKokkos<DeviceType>::fft_3d_kokkos(typename AT::t_FFT_DATA_1d d_in, typ
   // destination is always out
 
   if (plan->post_plan) {
-    d_data_scalar = typename AT::t_FFT_SCALAR_1d(d_data.data(),d_data.size());
-    d_out_scalar = typename AT::t_FFT_SCALAR_1d(d_out.data(),d_out.size());
-    d_scratch_scalar = typename AT::t_FFT_SCALAR_1d(plan->d_scratch.data(),plan->d_scratch.size());
+    d_data_scalar = typename FFT_AT::t_FFT_SCALAR_1d((FFT_SCALAR*)d_data.data(),d_data.size()*2);
+    d_out_scalar = typename FFT_AT::t_FFT_SCALAR_1d((FFT_SCALAR*)d_out.data(),d_out.size()*2);
+    d_scratch_scalar = typename FFT_AT::t_FFT_SCALAR_1d((FFT_SCALAR*)plan->d_scratch.data(),plan->d_scratch.size()*2);
 
     remapKK->remap_3d_kokkos(d_data_scalar, d_out_scalar,
              d_scratch_scalar, plan->post_plan);
@@ -589,11 +588,11 @@ struct fft_plan_3d_kokkos<DeviceType>* FFT3dKokkos<DeviceType>::fft_3d_create_pl
   *nbuf = copy_size + scratch_size;
 
   if (copy_size) {
-    plan->d_copy = typename AT::t_FFT_DATA_1d("fft3d:copy",copy_size);
+    plan->d_copy = typename FFT_AT::t_FFT_DATA_1d("fft3d:copy",copy_size);
   }
 
   if (scratch_size) {
-    plan->d_scratch = typename AT::t_FFT_DATA_1d("fft3d:scratch",scratch_size);
+    plan->d_scratch = typename FFT_AT::t_FFT_DATA_1d("fft3d:scratch",scratch_size);
   }
 
   // system specific pre-computation of 1d FFT coeffs
@@ -607,7 +606,9 @@ struct fft_plan_3d_kokkos<DeviceType>* FFT3dKokkos<DeviceType>::fft_3d_create_pl
   DftiSetValue(plan->handle_fast, DFTI_PLACEMENT,DFTI_INPLACE);
   DftiSetValue(plan->handle_fast, DFTI_INPUT_DISTANCE, (MKL_LONG)nfast);
   DftiSetValue(plan->handle_fast, DFTI_OUTPUT_DISTANCE, (MKL_LONG)nfast);
-  //DftiSetValue(plan->handle_fast, DFTI_NUMBER_OF_USER_THREADS, nthreads);
+#if defined(FFT_MKL_THREADS)
+  DftiSetValue(plan->handle_fast, DFTI_NUMBER_OF_USER_THREADS, nthreads);
+#endif
   DftiCommitDescriptor(plan->handle_fast);
 
   DftiCreateDescriptor( &(plan->handle_mid), FFT_MKL_PREC, DFTI_COMPLEX, 1,
@@ -617,7 +618,9 @@ struct fft_plan_3d_kokkos<DeviceType>* FFT3dKokkos<DeviceType>::fft_3d_create_pl
   DftiSetValue(plan->handle_mid, DFTI_PLACEMENT,DFTI_INPLACE);
   DftiSetValue(plan->handle_mid, DFTI_INPUT_DISTANCE, (MKL_LONG)nmid);
   DftiSetValue(plan->handle_mid, DFTI_OUTPUT_DISTANCE, (MKL_LONG)nmid);
-  //DftiSetValue(plan->handle_mid, DFTI_NUMBER_OF_USER_THREADS, nthreads);
+#if defined(FFT_MKL_THREADS)
+  DftiSetValue(plan->handle_mid, DFTI_NUMBER_OF_USER_THREADS, nthreads);
+#endif
   DftiCommitDescriptor(plan->handle_mid);
 
   DftiCreateDescriptor( &(plan->handle_slow), FFT_MKL_PREC, DFTI_COMPLEX, 1,
@@ -627,18 +630,11 @@ struct fft_plan_3d_kokkos<DeviceType>* FFT3dKokkos<DeviceType>::fft_3d_create_pl
   DftiSetValue(plan->handle_slow, DFTI_PLACEMENT,DFTI_INPLACE);
   DftiSetValue(plan->handle_slow, DFTI_INPUT_DISTANCE, (MKL_LONG)nslow);
   DftiSetValue(plan->handle_slow, DFTI_OUTPUT_DISTANCE, (MKL_LONG)nslow);
-  //DftiSetValue(plan->handle_slow, DFTI_NUMBER_OF_USER_THREADS, nthreads);
+#if defined(FFT_MKL_THREADS)
+  DftiSetValue(plan->handle_slow, DFTI_NUMBER_OF_USER_THREADS, nthreads);
+#endif
   DftiCommitDescriptor(plan->handle_slow);
 
-  if (scaled == 0)
-    plan->scaled = 0;
-  else {
-    plan->scaled = 1;
-    plan->norm = 1.0/(nfast*nmid*nslow);
-    plan->normnum = (out_ihi-out_ilo+1) * (out_jhi-out_jlo+1) *
-      (out_khi-out_klo+1);
-  }
-
 #elif defined(FFT_FFTW3)
 
 #if defined (FFT_FFTW_THREADS)
@@ -684,7 +680,9 @@ struct fft_plan_3d_kokkos<DeviceType>* FFT3dKokkos<DeviceType>::fft_3d_create_pl
                        NULL,&nslow,1,plan->length3,
                        NULL,&nslow,1,plan->length3,
                        FFTW_BACKWARD,FFTW_ESTIMATE);
+
 #elif defined(FFT_CUFFT)
+
   cufftPlanMany(&(plan->plan_fast), 1, &nfast,
     &nfast,1,plan->length1,
     &nfast,1,plan->length1,
@@ -699,7 +697,9 @@ struct fft_plan_3d_kokkos<DeviceType>* FFT3dKokkos<DeviceType>::fft_3d_create_pl
     &nslow,1,plan->length3,
     &nslow,1,plan->length3,
     CUFFT_TYPE,plan->total3/plan->length3);
-#else
+
+#else  /* FFT_KISS */
+
   kissfftKK = new KissFFTKokkos<DeviceType>();
 
   plan->cfg_fast_forward = KissFFTKokkos<DeviceType>::kiss_fft_alloc_kokkos(nfast,0,NULL,NULL);
@@ -726,6 +726,7 @@ struct fft_plan_3d_kokkos<DeviceType>* FFT3dKokkos<DeviceType>::fft_3d_create_pl
     plan->cfg_slow_forward = KissFFTKokkos<DeviceType>::kiss_fft_alloc_kokkos(nslow,0,NULL,NULL);
     plan->cfg_slow_backward = KissFFTKokkos<DeviceType>::kiss_fft_alloc_kokkos(nslow,1,NULL,NULL);
   }
+
 #endif
 
   if (scaled == 0)
@@ -809,7 +810,7 @@ void FFT3dKokkos<DeviceType>::bifactor(int n, int *factor1, int *factor2)
 ------------------------------------------------------------------------- */
 
 template<class DeviceType>
-void FFT3dKokkos<DeviceType>::fft_3d_1d_only_kokkos(typename AT::t_FFT_DATA_1d d_data, int nsize, int flag,
+void FFT3dKokkos<DeviceType>::fft_3d_1d_only_kokkos(typename FFT_AT::t_FFT_DATA_1d d_data, int nsize, int flag,
                     struct fft_plan_3d_kokkos<DeviceType> *plan)
 {
   // total = size of data needed in each dim
@@ -839,13 +840,13 @@ void FFT3dKokkos<DeviceType>::fft_3d_1d_only_kokkos(typename AT::t_FFT_DATA_1d d
 
 #if defined(FFT_MKL)
   if (flag == -1) {
-    DftiComputeForward(plan->handle_fast,data);
-    DftiComputeForward(plan->handle_mid,data);
-    DftiComputeForward(plan->handle_slow,data);
+    DftiComputeForward(plan->handle_fast,d_data.data());
+    DftiComputeForward(plan->handle_mid,d_data.data());
+    DftiComputeForward(plan->handle_slow,d_data.data());
   } else {
-    DftiComputeBackward(plan->handle_fast,data);
-    DftiComputeBackward(plan->handle_mid,data);
-    DftiComputeBackward(plan->handle_slow,data);
+    DftiComputeBackward(plan->handle_fast,d_data.data());
+    DftiComputeBackward(plan->handle_mid,d_data.data());
+    DftiComputeBackward(plan->handle_slow,d_data.data());
   }
 #elif defined(FFT_FFTW3)
   if (flag == -1) {
@@ -858,12 +859,12 @@ void FFT3dKokkos<DeviceType>::fft_3d_1d_only_kokkos(typename AT::t_FFT_DATA_1d d
     FFTW_API(execute_dft)(plan->plan_slow_backward,(FFT_DATA*)d_data.data(),(FFT_DATA*)d_data.data());
   }
 #elif defined(FFT_CUFFT)
-  cufftExec(plan->plan_fast,(FFT_DATA*)d_data.data(),(FFT_DATA*)d_data.data(),flag);
-  cufftExec(plan->plan_mid,(FFT_DATA*)d_data.data(),(FFT_DATA*)d_data.data(),flag);
-  cufftExec(plan->plan_slow,(FFT_DATA*)d_data.data(),(FFT_DATA*)d_data.data(),flag);
+  cufftExec(plan->plan_fast,d_data.data(),d_data.data(),flag);
+  cufftExec(plan->plan_mid,d_data.data(),d_data.data(),flag);
+  cufftExec(plan->plan_slow,d_data.data(),d_data.data(),flag);
 #else
   kiss_fft_functor<DeviceType> f;
-  typename AT::t_FFT_DATA_1d d_tmp = typename AT::t_FFT_DATA_1d("fft_3d:tmp",d_data.dimension_0());
+  typename FFT_AT::t_FFT_DATA_1d d_tmp = typename FFT_AT::t_FFT_DATA_1d("fft_3d:tmp",d_data.extent(0));
   if (flag == -1) {
     f = kiss_fft_functor<DeviceType>(d_data,d_tmp,plan->cfg_fast_forward,length1);
     Kokkos::parallel_for(total1/length1,f);
@@ -899,7 +900,7 @@ void FFT3dKokkos<DeviceType>::fft_3d_1d_only_kokkos(typename AT::t_FFT_DATA_1d d
 
 namespace LAMMPS_NS {
 template class FFT3dKokkos<LMPDeviceType>;
-#ifdef KOKKOS_HAVE_CUDA
+#ifdef KOKKOS_ENABLE_CUDA
 template class FFT3dKokkos<LMPHostType>;
 #endif
 }
diff --git a/src/KOKKOS/fft3d_kokkos.h b/src/KOKKOS/fft3d_kokkos.h
index 2de3b641ea..ffdd2a38ce 100644
--- a/src/KOKKOS/fft3d_kokkos.h
+++ b/src/KOKKOS/fft3d_kokkos.h
@@ -15,78 +15,9 @@
 #define LMP_FFT3D_KOKKOS_H
 
 #include "pointers.h"
-#include "kokkos_type.h"
 #include "remap_kokkos.h"
 #include "fftdata_kokkos.h"
 
-// with KOKKOS in CUDA mode we can only have
-// CUFFT or KISSFFT, thus undefine all other
-// FFTs here, since they may be valid in fft3d.cpp
-
-#if defined(KOKKOS_ENABLE_CUDA)
-# if defined(FFT_FFTW)
-#  undef FFT_FFTW
-# endif
-# if defined(FFT_FFTW3)
-#  undef FFT_FFTW3
-# endif
-# if defined(FFT_MKL)
-#  undef FFT_MKL
-# endif
-# if !defined(FFT_CUFFT) && !defined(FFT_KISSFFT)
-#  define FFT_KISSFFT
-# endif
-#else
-# if defined(FFT_CUFFT)
-#  error "Must enable CUDA with KOKKOS to use -DFFT_CUFFT"
-# endif
-// if user set FFTW, it means FFTW3
-# ifdef FFT_FFTW
-#  define FFT_FFTW3
-# endif
-# ifdef FFT_FFTW_THREADS
-#  if !defined(FFT_FFTW3)
-#   error "Must use -DFFT_FFTW3 with -DFFT_FFTW_THREADS"
-#  endif
-# endif
-#endif
-
-#if defined(FFT_MKL)
-  #include "mkl_dfti.h"
-  #if defined(FFT_SINGLE)
-    typedef float _Complex FFT_DATA;
-    #define FFT_MKL_PREC DFTI_SINGLE
-  #else
-    typedef double _Complex FFT_DATA;
-    #define FFT_MKL_PREC DFTI_DOUBLE
-  #endif
-#elif defined(FFT_FFTW3)
-  #include "fftw3.h"
-  #if defined(FFT_SINGLE)
-    typedef fftwf_complex FFT_DATA;
-    #define FFTW_API(function)  fftwf_ ## function
-  #else
-    typedef fftw_complex FFT_DATA;
-    #define FFTW_API(function) fftw_ ## function
-  #endif
-#elif defined(FFT_CUFFT)
-  #include "cufft.h"
-  #if defined(FFT_SINGLE)
-    #define cufftExec cufftExecC2C
-    #define CUFFT_TYPE CUFFT_C2C
-    typedef cufftComplex FFT_DATA;
-  #else
-    #define cufftExec cufftExecZ2Z
-    #define CUFFT_TYPE CUFFT_Z2Z
-    typedef cufftDoubleComplex FFT_DATA;
-  #endif
-#else
-  #include "kissfft_kokkos.h"
-  #ifndef FFT_KISSFFT
-  #define FFT_KISSFFT
-  #endif
-#endif
-
 namespace LAMMPS_NS {
 
 // -------------------------------------------------------------------------
@@ -96,14 +27,14 @@ namespace LAMMPS_NS {
 template<class DeviceType>
 struct fft_plan_3d_kokkos {
   typedef DeviceType device_type;
-  typedef ArrayTypes<DeviceType> AT;
+  typedef FFTArrayTypes<DeviceType> FFT_AT;
 
   struct remap_plan_3d_kokkos<DeviceType> *pre_plan;       // remap from input -> 1st FFTs
   struct remap_plan_3d_kokkos<DeviceType> *mid1_plan;      // remap from 1st -> 2nd FFTs
   struct remap_plan_3d_kokkos<DeviceType> *mid2_plan;      // remap from 2nd -> 3rd FFTs
   struct remap_plan_3d_kokkos<DeviceType> *post_plan;      // remap from 3rd FFTs -> output
-  typename AT::t_FFT_DATA_1d d_copy;                   // memory for remap results (if needed)
-  typename AT::t_FFT_DATA_1d d_scratch;                // scratch space for remaps
+  typename FFT_AT::t_FFT_DATA_1d d_copy;                   // memory for remap results (if needed)
+  typename FFT_AT::t_FFT_DATA_1d d_scratch;                // scratch space for remaps
   int total1,total2,total3;         // # of 1st,2nd,3rd FFTs (times length)
   int length1,length2,length3;      // length of 1st,2nd,3rd FFTs
   int pre_target;                   // where to put remap results
@@ -142,14 +73,14 @@ template<class DeviceType>
 class FFT3dKokkos : protected Pointers {
  public:
   typedef DeviceType device_type;
-  typedef ArrayTypes<DeviceType> AT;
+  typedef FFTArrayTypes<DeviceType> FFT_AT;
 
   FFT3dKokkos(class LAMMPS *, MPI_Comm,
         int,int,int,int,int,int,int,int,int,int,int,int,int,int,int,
         int,int,int *,int);
   ~FFT3dKokkos();
-  void compute(typename AT::t_FFT_SCALAR_1d, typename AT::t_FFT_SCALAR_1d, int);
-  void timing1d(typename AT::t_FFT_SCALAR_1d, int, int);
+  void compute(typename FFT_AT::t_FFT_SCALAR_1d, typename FFT_AT::t_FFT_SCALAR_1d, int);
+  void timing1d(typename FFT_AT::t_FFT_SCALAR_1d, int, int);
 
  private:
   struct fft_plan_3d_kokkos<DeviceType> *plan;
@@ -159,7 +90,7 @@ class FFT3dKokkos : protected Pointers {
   KissFFTKokkos<DeviceType> *kissfftKK;
 #endif
 
-  void fft_3d_kokkos(typename AT::t_FFT_DATA_1d, typename AT::t_FFT_DATA_1d, int, struct fft_plan_3d_kokkos<DeviceType> *);
+  void fft_3d_kokkos(typename FFT_AT::t_FFT_DATA_1d, typename FFT_AT::t_FFT_DATA_1d, int, struct fft_plan_3d_kokkos<DeviceType> *);
 
   struct fft_plan_3d_kokkos<DeviceType> *fft_3d_create_plan_kokkos(MPI_Comm, int, int, int,
                                          int, int, int, int, int,
@@ -168,7 +99,7 @@ class FFT3dKokkos : protected Pointers {
 
   void fft_3d_destroy_plan_kokkos(struct fft_plan_3d_kokkos<DeviceType> *);
 
-  void fft_3d_1d_only_kokkos(typename AT::t_FFT_DATA_1d, int, int, struct fft_plan_3d_kokkos<DeviceType> *);
+  void fft_3d_1d_only_kokkos(typename FFT_AT::t_FFT_DATA_1d, int, int, struct fft_plan_3d_kokkos<DeviceType> *);
 
   void bifactor(int, int *, int *);
 };
diff --git a/src/KOKKOS/fftdata_kokkos.h b/src/KOKKOS/fftdata_kokkos.h
index 262b963802..cd12753170 100644
--- a/src/KOKKOS/fftdata_kokkos.h
+++ b/src/KOKKOS/fftdata_kokkos.h
@@ -11,12 +11,16 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
+#include "kokkos_type.h"
+
+#ifndef MAX
 #define MAX(A,B) ((A) > (B) ? (A) : (B))
+#endif
 
 // data types for 2d/3d FFTs
 
-#ifndef FFT_DATA_KOKKOS_H
-#define FFT_DATA_KOKKOS_H
+#ifndef LMP_FFT_DATA_KOKKOS_H
+#define LMP_FFT_DATA_KOKKOS_H
 
 // User-settable FFT precision
 
@@ -43,4 +47,163 @@ typedef double FFT_SCALAR;
 #error "FFT_PRECISION needs to be either 1 (=single) or 2 (=double)"
 #endif
 
+
+// with KOKKOS in CUDA mode we can only have
+// CUFFT or KISSFFT, thus undefine all other
+// FFTs here, since they may be valid in fft3d.cpp
+
+#if defined(KOKKOS_ENABLE_CUDA)
+# if defined(FFT_FFTW)
+#  undef FFT_FFTW
+# endif
+# if defined(FFT_FFTW3)
+#  undef FFT_FFTW3
+# endif
+# if defined(FFT_MKL)
+#  undef FFT_MKL
+# endif
+# if !defined(FFT_CUFFT) && !defined(FFT_KISSFFT)
+#  define FFT_KISSFFT
+# endif
+#else
+# if defined(FFT_CUFFT)
+#  error "Must enable CUDA with KOKKOS to use -DFFT_CUFFT"
+# endif
+// if user set FFTW, it means FFTW3
+# ifdef FFT_FFTW
+#  define FFT_FFTW3
+# endif
+# ifdef FFT_FFTW_THREADS
+#  if !defined(FFT_FFTW3)
+#   error "Must use -DFFT_FFTW3 with -DFFT_FFTW_THREADS"
+#  endif
+# endif
+#endif
+
+#if defined(FFT_MKL)
+  #include "mkl_dfti.h"
+  #if defined(FFT_SINGLE)
+    typedef float _Complex FFT_DATA;
+    #define FFT_MKL_PREC DFTI_SINGLE
+  #else
+    typedef double _Complex FFT_DATA;
+    #define FFT_MKL_PREC DFTI_DOUBLE
+  #endif
+#elif defined(FFT_FFTW3)
+  #include "fftw3.h"
+  #if defined(FFT_SINGLE)
+    typedef fftwf_complex FFT_DATA;
+    #define FFTW_API(function)  fftwf_ ## function
+  #else
+    typedef fftw_complex FFT_DATA;
+    #define FFTW_API(function) fftw_ ## function
+  #endif
+#elif defined(FFT_CUFFT)
+  #include "cufft.h"
+  #if defined(FFT_SINGLE)
+    #define cufftExec cufftExecC2C
+    #define CUFFT_TYPE CUFFT_C2C
+    typedef cufftComplex FFT_DATA;
+  #else
+    #define cufftExec cufftExecZ2Z
+    #define CUFFT_TYPE CUFFT_Z2Z
+    typedef cufftDoubleComplex FFT_DATA;
+  #endif
+#else
+  #if defined(FFT_SINGLE)
+    #define kiss_fft_scalar float
+  #else
+    #define kiss_fft_scalar double
+    typedef struct {
+        kiss_fft_scalar re;
+        kiss_fft_scalar im;
+    } FFT_DATA;
+  #endif
+  #ifndef FFT_KISSFFT
+  #define FFT_KISSFFT
+  #endif
+#endif
+
+// (double[2]*) is not a 1D pointer
+#if defined(FFT_FFTW3)
+  typedef FFT_SCALAR* FFT_DATA_POINTER;
+#else
+  typedef FFT_DATA* FFT_DATA_POINTER;
+#endif
+
+
+template <class DeviceType>
+struct FFTArrayTypes;
+
+template <>
+struct FFTArrayTypes<LMPDeviceType> {
+
+typedef Kokkos::
+  DualView<FFT_SCALAR*, Kokkos::LayoutRight, LMPDeviceType> tdual_FFT_SCALAR_1d;
+typedef tdual_FFT_SCALAR_1d::t_dev t_FFT_SCALAR_1d;
+typedef tdual_FFT_SCALAR_1d::t_dev_um t_FFT_SCALAR_1d_um;
+
+typedef Kokkos::DualView<FFT_SCALAR**,Kokkos::LayoutRight,LMPDeviceType> tdual_FFT_SCALAR_2d;
+typedef tdual_FFT_SCALAR_2d::t_dev t_FFT_SCALAR_2d;
+
+typedef Kokkos::DualView<FFT_SCALAR**[3],Kokkos::LayoutRight,LMPDeviceType> tdual_FFT_SCALAR_2d_3;
+typedef tdual_FFT_SCALAR_2d_3::t_dev t_FFT_SCALAR_2d_3;
+
+typedef Kokkos::DualView<FFT_SCALAR***,Kokkos::LayoutRight,LMPDeviceType> tdual_FFT_SCALAR_3d;
+typedef tdual_FFT_SCALAR_3d::t_dev t_FFT_SCALAR_3d;
+
+typedef Kokkos::
+  DualView<FFT_DATA*, Kokkos::LayoutRight, LMPDeviceType> tdual_FFT_DATA_1d;
+typedef tdual_FFT_DATA_1d::t_dev t_FFT_DATA_1d;
+typedef tdual_FFT_DATA_1d::t_dev_um t_FFT_DATA_1d_um;
+
+typedef Kokkos::
+  DualView<int*, LMPDeviceType::array_layout, LMPDeviceType> tdual_int_64;
+typedef tdual_int_64::t_dev t_int_64;
+typedef tdual_int_64::t_dev_um t_int_64_um;
+
+};
+
+#ifdef KOKKOS_ENABLE_CUDA
+template <>
+struct FFTArrayTypes<LMPHostType> {
+
+//Kspace
+
+typedef Kokkos::
+  DualView<FFT_SCALAR*, Kokkos::LayoutRight, LMPDeviceType> tdual_FFT_SCALAR_1d;
+typedef tdual_FFT_SCALAR_1d::t_host t_FFT_SCALAR_1d;
+typedef tdual_FFT_SCALAR_1d::t_host_um t_FFT_SCALAR_1d_um;
+
+typedef Kokkos::DualView<FFT_SCALAR**,Kokkos::LayoutRight,LMPDeviceType> tdual_FFT_SCALAR_2d;
+typedef tdual_FFT_SCALAR_2d::t_host t_FFT_SCALAR_2d;
+
+typedef Kokkos::DualView<FFT_SCALAR**[3],Kokkos::LayoutRight,LMPDeviceType> tdual_FFT_SCALAR_2d_3;
+typedef tdual_FFT_SCALAR_2d_3::t_host t_FFT_SCALAR_2d_3;
+
+typedef Kokkos::DualView<FFT_SCALAR***,Kokkos::LayoutRight,LMPDeviceType> tdual_FFT_SCALAR_3d;
+typedef tdual_FFT_SCALAR_3d::t_host t_FFT_SCALAR_3d;
+
+typedef Kokkos::
+  DualView<FFT_DATA*, Kokkos::LayoutRight, LMPDeviceType> tdual_FFT_DATA_1d;
+typedef tdual_FFT_DATA_1d::t_host t_FFT_DATA_1d;
+typedef tdual_FFT_DATA_1d::t_host_um t_FFT_DATA_1d_um;
+
+typedef Kokkos::
+  DualView<int*, LMPDeviceType::array_layout, LMPDeviceType> tdual_int_64;
+typedef tdual_int_64::t_host t_int_64;
+typedef tdual_int_64::t_host_um t_int_64_um;
+
+};
+#endif
+
+typedef struct FFTArrayTypes<LMPDeviceType> FFT_DAT;
+typedef struct FFTArrayTypes<LMPHostType> FFT_HAT;
+
+
+#if defined(FFT_KISSFFT)
+#include "kissfft_kokkos.h" // uses t_FFT_DATA_1d, needs to come last
+#endif
+
+
 #endif
diff --git a/src/KOKKOS/fix_eos_table_rx_kokkos.h b/src/KOKKOS/fix_eos_table_rx_kokkos.h
index 91d73f1036..21ec3d203b 100644
--- a/src/KOKKOS/fix_eos_table_rx_kokkos.h
+++ b/src/KOKKOS/fix_eos_table_rx_kokkos.h
@@ -207,6 +207,6 @@ Self-explanatory.
 
 E: Maxit exceeded in secant solver
 
-The maximum number of interations was exceeded in the secant solver
+The maximum number of iterations was exceeded in the secant solver
 
 */
diff --git a/src/KOKKOS/fix_qeq_reax_kokkos.cpp b/src/KOKKOS/fix_qeq_reax_kokkos.cpp
index e51fbacaaf..a0f4f3ec28 100644
--- a/src/KOKKOS/fix_qeq_reax_kokkos.cpp
+++ b/src/KOKKOS/fix_qeq_reax_kokkos.cpp
@@ -91,10 +91,10 @@ void FixQEqReaxKokkos<DeviceType>::init()
   int irequest = neighbor->nrequest - 1;
 
   neighbor->requests[irequest]->
-    kokkos_host = Kokkos::Impl::is_same<DeviceType,LMPHostType>::value &&
-    !Kokkos::Impl::is_same<DeviceType,LMPDeviceType>::value;
+    kokkos_host = std::is_same<DeviceType,LMPHostType>::value &&
+    !std::is_same<DeviceType,LMPDeviceType>::value;
   neighbor->requests[irequest]->
-    kokkos_device = Kokkos::Impl::is_same<DeviceType,LMPDeviceType>::value;
+    kokkos_device = std::is_same<DeviceType,LMPDeviceType>::value;
 
   if (neighflag == FULL) {
     neighbor->requests[irequest]->fix = 1;
@@ -223,7 +223,7 @@ void FixQEqReaxKokkos<DeviceType>::pre_force(int vflag)
 
   // compute_H
 
-  if (lmp->kokkos->ngpus == 0) { // CPU
+  if (execution_space == Host) { // CPU
     if (neighflag == FULL) {
       FixQEqReaxKokkosComputeHFunctor<DeviceType, FULL> computeH_functor(this);
       Kokkos::parallel_scan(inum,computeH_functor);
diff --git a/src/KOKKOS/fix_qeq_reax_kokkos.h b/src/KOKKOS/fix_qeq_reax_kokkos.h
index cd69aa9283..55dec64d33 100644
--- a/src/KOKKOS/fix_qeq_reax_kokkos.h
+++ b/src/KOKKOS/fix_qeq_reax_kokkos.h
@@ -200,8 +200,8 @@ class FixQEqReaxKokkos : public FixQEqReax {
   HAT::t_ffloat_2d h_s_hist, h_t_hist;
   typename AT::t_ffloat_2d_randomread r_s_hist, r_t_hist;
 
-  Kokkos::Experimental::ScatterView<F_FLOAT*, typename AT::t_ffloat_1d::array_layout, DeviceType, Kokkos::Experimental::ScatterSum, Kokkos::Experimental::ScatterDuplicated> dup_o;
-  Kokkos::Experimental::ScatterView<F_FLOAT*, typename AT::t_ffloat_1d::array_layout, DeviceType, Kokkos::Experimental::ScatterSum, Kokkos::Experimental::ScatterNonDuplicated> ndup_o;
+  Kokkos::Experimental::ScatterView<F_FLOAT*, typename AT::t_ffloat_1d::array_layout, typename KKDevice<DeviceType>::value, Kokkos::Experimental::ScatterSum, Kokkos::Experimental::ScatterDuplicated> dup_o;
+  Kokkos::Experimental::ScatterView<F_FLOAT*, typename AT::t_ffloat_1d::array_layout, typename KKDevice<DeviceType>::value, Kokkos::Experimental::ScatterSum, Kokkos::Experimental::ScatterNonDuplicated> ndup_o;
 
   void init_shielding_k();
   void init_hist();
diff --git a/src/KOKKOS/fix_rx_kokkos.cpp b/src/KOKKOS/fix_rx_kokkos.cpp
index e06fc14585..9271cf1b88 100644
--- a/src/KOKKOS/fix_rx_kokkos.cpp
+++ b/src/KOKKOS/fix_rx_kokkos.cpp
@@ -146,10 +146,10 @@ void FixRxKokkos<DeviceType>::init()
   int neighflag = lmp->kokkos->neighflag;
 
   neighbor->requests[irequest]->
-    kokkos_host = Kokkos::Impl::is_same<DeviceType,LMPHostType>::value &&
-    !Kokkos::Impl::is_same<DeviceType,LMPDeviceType>::value;
+    kokkos_host = std::is_same<DeviceType,LMPHostType>::value &&
+    !std::is_same<DeviceType,LMPDeviceType>::value;
   neighbor->requests[irequest]->
-    kokkos_device = Kokkos::Impl::is_same<DeviceType,LMPDeviceType>::value;
+    kokkos_device = std::is_same<DeviceType,LMPDeviceType>::value;
 
   if (neighflag == FULL) {
     neighbor->requests[irequest]->full = 1;
@@ -1908,7 +1908,7 @@ void FixRxKokkos<DeviceType>::operator()(Tag_FixRxKokkos_firstPairOperator<WT_FL
 {
   // Create an atomic view of sumWeights and dpdThetaLocal. Only needed
   // for Half/thread scenarios.
-  typedef Kokkos::View< E_FLOAT*, typename DAT::t_efloat_1d::array_layout, DeviceType, Kokkos::MemoryTraits< AtomicF< NEIGHFLAG >::value> > AtomicViewType;
+  typedef Kokkos::View< E_FLOAT*, typename DAT::t_efloat_1d::array_layout, typename KKDevice<DeviceType>::value, Kokkos::MemoryTraits< AtomicF< NEIGHFLAG >::value> > AtomicViewType;
 
   AtomicViewType a_dpdThetaLocal = d_dpdThetaLocal;
   AtomicViewType a_sumWeights    = d_sumWeights;
@@ -2083,8 +2083,8 @@ void FixRxKokkos<DeviceType>::computeLocalTemperature()
         {
           // Create an atomic view of sumWeights and dpdThetaLocal. Only needed
           // for Half/thread scenarios.
-          //typedef Kokkos::View< E_FLOAT*, typename DAT::t_efloat_1d::array_layout, DeviceType, Kokkos::MemoryTraits< AtomicF< NEIGHFLAG >::value> > AtomicViewType;
-          typedef Kokkos::View< E_FLOAT*, typename DAT::t_efloat_1d::array_layout, DeviceType, Kokkos::MemoryTraits< AtomicF< NEIGHFLAG >::value> > AtomicViewType;
+          //typedef Kokkos::View< E_FLOAT*, typename DAT::t_efloat_1d::array_layout, typename KKDevice<DeviceType>::value, Kokkos::MemoryTraits< AtomicF< NEIGHFLAG >::value> > AtomicViewType;
+          typedef Kokkos::View< E_FLOAT*, typename DAT::t_efloat_1d::array_layout, typename KKDevice<DeviceType>::value, Kokkos::MemoryTraits< AtomicF< NEIGHFLAG >::value> > AtomicViewType;
 
           AtomicViewType a_dpdThetaLocal = d_dpdThetaLocal;
           AtomicViewType a_sumWeights    = d_sumWeights;
diff --git a/src/KOKKOS/fix_shardlow_kokkos.cpp b/src/KOKKOS/fix_shardlow_kokkos.cpp
index 9bd8594341..c6ad47501a 100644
--- a/src/KOKKOS/fix_shardlow_kokkos.cpp
+++ b/src/KOKKOS/fix_shardlow_kokkos.cpp
@@ -132,10 +132,10 @@ void FixShardlowKokkos<DeviceType>::init()
   int irequest = neighbor->nrequest - 1;
 
   neighbor->requests[irequest]->
-    kokkos_host = Kokkos::Impl::is_same<DeviceType,LMPHostType>::value &&
-    !Kokkos::Impl::is_same<DeviceType,LMPDeviceType>::value;
+    kokkos_host = std::is_same<DeviceType,LMPHostType>::value &&
+    !std::is_same<DeviceType,LMPDeviceType>::value;
   neighbor->requests[irequest]->
-    kokkos_device = Kokkos::Impl::is_same<DeviceType,LMPDeviceType>::value;
+    kokkos_device = std::is_same<DeviceType,LMPDeviceType>::value;
 
 //  neighbor->requests[irequest]->pair = 0;
 //  neighbor->requests[irequest]->fix  = 1;
diff --git a/src/KOKKOS/gridcomm_kokkos.cpp b/src/KOKKOS/gridcomm_kokkos.cpp
index ac33b15d73..bdf816b647 100644
--- a/src/KOKKOS/gridcomm_kokkos.cpp
+++ b/src/KOKKOS/gridcomm_kokkos.cpp
@@ -17,7 +17,7 @@
 #include "kspace.h"
 #include "memory_kokkos.h"
 #include "error.h"
-#include "kokkos_base.h"
+#include "kokkos_base_fft.h"
 #include "kokkos.h"
 
 using namespace LAMMPS_NS;
@@ -502,9 +502,9 @@ void GridCommKokkos<DeviceType>::setup()
   }
   nbuf *= MAX(nforward,nreverse);
   //memory->create(buf1,nbuf,"Commgrid:buf1");
-  k_buf1 = DAT::tdual_FFT_SCALAR_1d("Commgrid:buf1",nbuf);
+  k_buf1 = FFT_DAT::tdual_FFT_SCALAR_1d("Commgrid:buf1",nbuf);
   //memory->create(buf2,nbuf,"Commgrid:buf2");
-  k_buf2 = DAT::tdual_FFT_SCALAR_1d("Commgrid:buf2",nbuf);
+  k_buf2 = FFT_DAT::tdual_FFT_SCALAR_1d("Commgrid:buf2",nbuf);
 }
 
 /* ----------------------------------------------------------------------
@@ -517,14 +517,14 @@ void GridCommKokkos<DeviceType>::forward_comm(KSpace *kspace, int which)
   k_packlist.sync<DeviceType>();
   k_unpacklist.sync<DeviceType>();
 
-  KokkosBase* kspaceKKBase = dynamic_cast<KokkosBase*>(kspace);
+  KokkosBaseFFT* kspaceKKBase = dynamic_cast<KokkosBaseFFT*>(kspace);
 
   for (int m = 0; m < nswap; m++) {
     if (swap[m].sendproc == me)
       kspaceKKBase->pack_forward_kspace_kokkos(which,k_buf2,swap[m].npack,k_packlist,m);
     else
       kspaceKKBase->pack_forward_kspace_kokkos(which,k_buf1,swap[m].npack,k_packlist,m);
-    DeviceType::fence();
+    DeviceType().fence();
 
     if (swap[m].sendproc != me) {
       FFT_SCALAR* buf1;
@@ -552,7 +552,7 @@ void GridCommKokkos<DeviceType>::forward_comm(KSpace *kspace, int which)
     }
 
     kspaceKKBase->unpack_forward_kspace_kokkos(which,k_buf2,swap[m].nunpack,k_unpacklist,m);
-    DeviceType::fence();
+    DeviceType().fence();
   }
 }
 
@@ -567,14 +567,14 @@ void GridCommKokkos<DeviceType>::reverse_comm(KSpace *kspace, int which)
   k_packlist.sync<DeviceType>();
   k_unpacklist.sync<DeviceType>();
 
-  KokkosBase* kspaceKKBase = dynamic_cast<KokkosBase*>(kspace);
+  KokkosBaseFFT* kspaceKKBase = dynamic_cast<KokkosBaseFFT*>(kspace);
 
   for (int m = nswap-1; m >= 0; m--) {
     if (swap[m].recvproc == me)
       kspaceKKBase->pack_reverse_kspace_kokkos(which,k_buf2,swap[m].nunpack,k_unpacklist,m);
     else
       kspaceKKBase->pack_reverse_kspace_kokkos(which,k_buf1,swap[m].nunpack,k_unpacklist,m);
-    DeviceType::fence();
+    DeviceType().fence();
 
     if (swap[m].recvproc != me) {
       FFT_SCALAR* buf1;
@@ -602,7 +602,7 @@ void GridCommKokkos<DeviceType>::reverse_comm(KSpace *kspace, int which)
     }
 
     kspaceKKBase->unpack_reverse_kspace_kokkos(which,k_buf2,swap[m].npack,k_packlist,m);
-    DeviceType::fence();
+    DeviceType().fence();
   }
 }
 
diff --git a/src/KOKKOS/gridcomm_kokkos.h b/src/KOKKOS/gridcomm_kokkos.h
index b220220d74..086834b467 100644
--- a/src/KOKKOS/gridcomm_kokkos.h
+++ b/src/KOKKOS/gridcomm_kokkos.h
@@ -16,6 +16,7 @@
 
 #include "pointers.h"
 #include "kokkos_type.h"
+#include "fftdata_kokkos.h"
 
 #ifdef FFT_SINGLE
 typedef float FFT_SCALAR;
@@ -32,6 +33,7 @@ class GridCommKokkos : protected Pointers {
  public:
   typedef DeviceType device_type;
   typedef ArrayTypes<DeviceType> AT;
+  typedef FFTArrayTypes<DeviceType> FFT_AT;
 
   GridCommKokkos(class LAMMPS *, MPI_Comm, int, int,
            int, int, int, int, int, int,
@@ -70,8 +72,8 @@ class GridCommKokkos : protected Pointers {
 
   int nbuf;
   //FFT_SCALAR *buf1,*buf2;
-  DAT::tdual_FFT_SCALAR_1d k_buf1;
-  DAT::tdual_FFT_SCALAR_1d k_buf2;
+  FFT_DAT::tdual_FFT_SCALAR_1d k_buf1;
+  FFT_DAT::tdual_FFT_SCALAR_1d k_buf2;
 
   struct Swap {
     int sendproc;       // proc to send to for forward comm
diff --git a/src/KOKKOS/improper_class2_kokkos.cpp b/src/KOKKOS/improper_class2_kokkos.cpp
index defd5e16f5..fcc9592b19 100644
--- a/src/KOKKOS/improper_class2_kokkos.cpp
+++ b/src/KOKKOS/improper_class2_kokkos.cpp
@@ -78,7 +78,7 @@ void ImproperClass2Kokkos<DeviceType>::compute(int eflag_in, int vflag_in)
   if (vflag_atom) {
     //if(k_vatom.extent(0)<maxvatom) { // won't work without adding zero functor
       memoryKK->destroy_kokkos(k_vatom,vatom);
-      memoryKK->create_kokkos(k_vatom,vatom,maxvatom,6,"improper:vatom");
+      memoryKK->create_kokkos(k_vatom,vatom,maxvatom,"improper:vatom");
       d_vatom = k_vatom.template view<DeviceType>();
     //}
   }
@@ -188,7 +188,7 @@ KOKKOS_INLINE_FUNCTION
 void ImproperClass2Kokkos<DeviceType>::operator()(TagImproperClass2Compute<NEWTON_BOND,EVFLAG>, const int &n, EV_FLOAT& ev) const {
 
   // The f array is atomic
-  Kokkos::View<F_FLOAT*[3], typename DAT::t_f_array::array_layout,DeviceType,Kokkos::MemoryTraits<Kokkos::Atomic|Kokkos::Unmanaged> > a_f = f;
+  Kokkos::View<F_FLOAT*[3], typename DAT::t_f_array::array_layout,typename KKDevice<DeviceType>::value,Kokkos::MemoryTraits<Kokkos::Atomic|Kokkos::Unmanaged> > a_f = f;
 
   int i, j, k;
   F_FLOAT delr[3][3],rmag[3],rinvmag[3],rmag2[3];
@@ -660,7 +660,7 @@ KOKKOS_INLINE_FUNCTION
 void ImproperClass2Kokkos<DeviceType>::operator()(TagImproperClass2AngleAngle<NEWTON_BOND,EVFLAG>, const int &n, EV_FLOAT& ev) const {
 
   // The f array is atomic
-  Kokkos::View<F_FLOAT*[3], typename DAT::t_f_array::array_layout,DeviceType,Kokkos::MemoryTraits<Kokkos::Atomic|Kokkos::Unmanaged> > a_f = f;
+  Kokkos::View<F_FLOAT*[3], typename DAT::t_f_array::array_layout,typename KKDevice<DeviceType>::value,Kokkos::MemoryTraits<Kokkos::Atomic|Kokkos::Unmanaged> > a_f = f;
 
   int i,j,k;
   F_FLOAT eimproper;
@@ -1010,8 +1010,8 @@ void ImproperClass2Kokkos<DeviceType>::ev_tally(EV_FLOAT &ev, const int i1, cons
   F_FLOAT v[6];
 
   // The eatom and vatom arrays are atomic
-  Kokkos::View<E_FLOAT*, typename DAT::t_efloat_1d::array_layout,DeviceType,Kokkos::MemoryTraits<Kokkos::Atomic|Kokkos::Unmanaged> > v_eatom = k_eatom.view<DeviceType>();
-  Kokkos::View<F_FLOAT*[6], typename DAT::t_virial_array::array_layout,DeviceType,Kokkos::MemoryTraits<Kokkos::Atomic|Kokkos::Unmanaged> > v_vatom = k_vatom.view<DeviceType>();
+  Kokkos::View<E_FLOAT*, typename DAT::t_efloat_1d::array_layout,typename KKDevice<DeviceType>::value,Kokkos::MemoryTraits<Kokkos::Atomic|Kokkos::Unmanaged> > v_eatom = k_eatom.view<DeviceType>();
+  Kokkos::View<F_FLOAT*[6], typename DAT::t_virial_array::array_layout,typename KKDevice<DeviceType>::value,Kokkos::MemoryTraits<Kokkos::Atomic|Kokkos::Unmanaged> > v_vatom = k_vatom.view<DeviceType>();
 
   if (eflag_either) {
     if (eflag_global) {
diff --git a/src/KOKKOS/improper_class2_kokkos.h b/src/KOKKOS/improper_class2_kokkos.h
index 0fbfab2beb..11212249e7 100644
--- a/src/KOKKOS/improper_class2_kokkos.h
+++ b/src/KOKKOS/improper_class2_kokkos.h
@@ -75,7 +75,7 @@ class ImproperClass2Kokkos : public ImproperClass2 {
   class NeighborKokkos *neighborKK;
 
   typename AT::t_x_array_randomread x;
-  typename Kokkos::View<double*[3],typename AT::t_f_array::array_layout,DeviceType,Kokkos::MemoryTraits<Kokkos::Atomic> > f;
+  typename Kokkos::View<double*[3],typename AT::t_f_array::array_layout,typename KKDevice<DeviceType>::value,Kokkos::MemoryTraits<Kokkos::Atomic> > f;
   typename AT::t_int_2d improperlist;
 
   DAT::tdual_efloat_1d k_eatom;
diff --git a/src/KOKKOS/improper_harmonic_kokkos.cpp b/src/KOKKOS/improper_harmonic_kokkos.cpp
index 7d6437dbf5..6a32e8af47 100644
--- a/src/KOKKOS/improper_harmonic_kokkos.cpp
+++ b/src/KOKKOS/improper_harmonic_kokkos.cpp
@@ -79,7 +79,7 @@ void ImproperHarmonicKokkos<DeviceType>::compute(int eflag_in, int vflag_in)
   if (vflag_atom) {
     //if(k_vatom.extent(0)<maxvatom) { // won't work without adding zero functor
       memoryKK->destroy_kokkos(k_vatom,vatom);
-      memoryKK->create_kokkos(k_vatom,vatom,maxvatom,6,"improper:vatom");
+      memoryKK->create_kokkos(k_vatom,vatom,maxvatom,"improper:vatom");
       d_vatom = k_vatom.template view<DeviceType>();
     //}
   }
diff --git a/src/KOKKOS/improper_harmonic_kokkos.h b/src/KOKKOS/improper_harmonic_kokkos.h
index 23ae0c7110..fb44081928 100644
--- a/src/KOKKOS/improper_harmonic_kokkos.h
+++ b/src/KOKKOS/improper_harmonic_kokkos.h
@@ -64,13 +64,13 @@ class ImproperHarmonicKokkos : public ImproperHarmonic {
   class NeighborKokkos *neighborKK;
 
   typename AT::t_x_array_randomread x;
-  typename Kokkos::View<double*[3],typename AT::t_f_array::array_layout,DeviceType,Kokkos::MemoryTraits<Kokkos::Atomic> > f;
+  typename Kokkos::View<double*[3],typename AT::t_f_array::array_layout,typename KKDevice<DeviceType>::value,Kokkos::MemoryTraits<Kokkos::Atomic> > f;
   typename AT::t_int_2d improperlist;
 
   Kokkos::DualView<E_FLOAT*,Kokkos::LayoutRight,DeviceType> k_eatom;
   Kokkos::DualView<F_FLOAT*[6],Kokkos::LayoutRight,DeviceType> k_vatom;
-  Kokkos::View<E_FLOAT*,Kokkos::LayoutRight,DeviceType,Kokkos::MemoryTraits<Kokkos::Atomic> > d_eatom;
-  Kokkos::View<F_FLOAT*[6],Kokkos::LayoutRight,DeviceType,Kokkos::MemoryTraits<Kokkos::Atomic> > d_vatom;
+  Kokkos::View<E_FLOAT*,Kokkos::LayoutRight,typename KKDevice<DeviceType>::value,Kokkos::MemoryTraits<Kokkos::Atomic> > d_eatom;
+  Kokkos::View<F_FLOAT*[6],Kokkos::LayoutRight,typename KKDevice<DeviceType>::value,Kokkos::MemoryTraits<Kokkos::Atomic> > d_vatom;
 
   int nlocal,newton_bond;
   int eflag,vflag;
diff --git a/src/KOKKOS/kissfft_kokkos.cpp b/src/KOKKOS/kissfft_kokkos.cpp
index a9e68fe723..5cfb3aa64c 100644
--- a/src/KOKKOS/kissfft_kokkos.cpp
+++ b/src/KOKKOS/kissfft_kokkos.cpp
@@ -14,7 +14,7 @@
 
 namespace LAMMPS_NS {
 template class KissFFTKokkos<LMPDeviceType>;
-#ifdef KOKKOS_HAVE_CUDA
+#ifdef KOKKOS_ENABLE_CUDA
 template class KissFFTKokkos<LMPHostType>;
 #endif
 }
diff --git a/src/KOKKOS/kissfft_kokkos.h b/src/KOKKOS/kissfft_kokkos.h
index ca11c6e6a5..9163366cb9 100644
--- a/src/KOKKOS/kissfft_kokkos.h
+++ b/src/KOKKOS/kissfft_kokkos.h
@@ -62,9 +62,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <math.h>
-#include "kissfft_kokkos.h"
 #include "fftdata_kokkos.h"
-#include "kokkos_type.h"
 
 #ifndef M_PI
 #define M_PI 3.141592653589793238462643383279502884197169399375105820974944
@@ -84,8 +82,8 @@
 #define S_MUL(a,b) ( (a)*(b) )
 
 #define C_MUL(m,a,a_index,b,b_index) \
-    do{ (m)[0] = (a)(a_index,0)*(b)(b_index,0) - (a)(a_index,1)*(b)(b_index,1);\
-        (m)[1] = (a)(a_index,0)*(b)(b_index,1) + (a)(a_index,1)*(b)(b_index,0); }while(0)
+    do{ (m)[0] = (a)(a_index).re*(b)(b_index).re - (a)(a_index).im*(b)(b_index).im;\
+        (m)[1] = (a)(a_index).re*(b)(b_index).im + (a)(a_index).im*(b)(b_index).re; }while(0)
 
 /*
 #define C_FIXDIV(c,div) // NOOP
@@ -126,8 +124,8 @@
 
 #define  kf_cexp(x,x_index,phase) \
         do{ \
-                (x)(x_index,0) = KISS_FFT_COS(phase);\
-                (x)(x_index,1) = KISS_FFT_SIN(phase);\
+                (x)(x_index).re = KISS_FFT_COS(phase);\
+                (x)(x_index).im = KISS_FFT_SIN(phase);\
         }while(0)
 
 
@@ -139,25 +137,25 @@ namespace LAMMPS_NS {
 template<class DeviceType>
 struct kiss_fft_state_kokkos {
   typedef DeviceType device_type;
-  typedef ArrayTypes<DeviceType> AT;
+  typedef FFTArrayTypes<DeviceType> FFT_AT;
   int nfft;
   int inverse;
-  typename AT::t_int_64 d_factors;
-  typename AT::t_FFT_DATA_1d d_twiddles;
-  typename AT::t_FFT_DATA_1d d_scratch;
+  typename FFT_AT::t_int_64 d_factors;
+  typename FFT_AT::t_FFT_DATA_1d d_twiddles;
+  typename FFT_AT::t_FFT_DATA_1d d_scratch;
 };
 
 template<class DeviceType>
 class KissFFTKokkos {
  public:
   typedef DeviceType device_type;
-  typedef ArrayTypes<DeviceType> AT;
+  typedef FFTArrayTypes<DeviceType> FFT_AT;
 
   KOKKOS_INLINE_FUNCTION
-  static void kf_bfly2(typename AT::t_FFT_DATA_1d_um &d_Fout, const size_t fstride,
+  static void kf_bfly2(typename FFT_AT::t_FFT_DATA_1d_um &d_Fout, const size_t fstride,
                        const kiss_fft_state_kokkos<DeviceType> &st, int m, int Fout_count)
   {
-      typename AT::t_FFT_DATA_1d_um d_twiddles = st.d_twiddles;
+      typename FFT_AT::t_FFT_DATA_1d_um d_twiddles = st.d_twiddles;
       FFT_SCALAR t[2];
       int Fout2_count;
       int tw1_count = 0;
@@ -169,21 +167,21 @@ class KissFFTKokkos {
           C_MUL(t,d_Fout,Fout2_count,d_twiddles,tw1_count);
           tw1_count += fstride;
           //C_SUB(*Fout2,*Fout,t);
-          d_Fout(Fout2_count,0) = d_Fout(Fout_count,0) - t[0];
-          d_Fout(Fout2_count,1) = d_Fout(Fout_count,1) - t[1];
+          d_Fout(Fout2_count).re = d_Fout(Fout_count).re - t[0];
+          d_Fout(Fout2_count).im = d_Fout(Fout_count).im - t[1];
           //C_ADDTO(d_Fout[Fout_count],t);
-          d_Fout(Fout_count,0) += t[0];
-          d_Fout(Fout_count,1) += t[1];
+          d_Fout(Fout_count).re += t[0];
+          d_Fout(Fout_count).im += t[1];
           ++Fout2_count;
           ++Fout_count;
       } while(--m);
   }
 
   KOKKOS_INLINE_FUNCTION
-  static void kf_bfly4(typename AT::t_FFT_DATA_1d_um &d_Fout, const size_t fstride,
+  static void kf_bfly4(typename FFT_AT::t_FFT_DATA_1d_um &d_Fout, const size_t fstride,
                        const kiss_fft_state_kokkos<DeviceType> &st, const size_t m, int Fout_count)
   {
-      typename AT::t_FFT_DATA_1d_um d_twiddles = st.d_twiddles;
+      typename FFT_AT::t_FFT_DATA_1d_um d_twiddles = st.d_twiddles;
       FFT_SCALAR scratch[6][2];
       size_t k=m;
       const size_t m2=2*m;
@@ -200,11 +198,11 @@ class KissFFTKokkos {
           C_MUL(scratch[2],d_Fout,Fout_count + m3,d_twiddles,tw3_count);
 
           //C_SUB(scratch[5],d_Fout[Fout_count],scratch[1] );
-          scratch[5][0] = d_Fout(Fout_count,0) - scratch[1][0];
-          scratch[5][1] = d_Fout(Fout_count,1) - scratch[1][1];
+          scratch[5][0] = d_Fout(Fout_count).re - scratch[1][0];
+          scratch[5][1] = d_Fout(Fout_count).im - scratch[1][1];
           //C_ADDTO(d_Fout[Fout_count], scratch[1]);
-          d_Fout(Fout_count,0) += scratch[1][0];
-          d_Fout(Fout_count,1) += scratch[1][1];
+          d_Fout(Fout_count).re += scratch[1][0];
+          d_Fout(Fout_count).im += scratch[1][1];
           //C_ADD(scratch[3],scratch[0],scratch[2]);
           scratch[3][0] = scratch[0][0] + scratch[2][0];
           scratch[3][1] = scratch[0][1] + scratch[2][1];
@@ -212,43 +210,43 @@ class KissFFTKokkos {
           scratch[4][0] = scratch[0][0] - scratch[2][0];
           scratch[4][1] = scratch[0][1] - scratch[2][1];
           //C_SUB(d_Fout[m2],d_Fout[Fout_count],scratch[3]);
-          d_Fout(Fout_count + m2,0) = d_Fout(Fout_count,0) - scratch[3][0];
-          d_Fout(Fout_count + m2,1) = d_Fout(Fout_count,1) - scratch[3][1];
+          d_Fout(Fout_count + m2).re = d_Fout(Fout_count).re - scratch[3][0];
+          d_Fout(Fout_count + m2).im = d_Fout(Fout_count).im - scratch[3][1];
 
           tw1_count += fstride;
           tw2_count += fstride*2;
           tw3_count += fstride*3;
           //C_ADDTO(d_Fout[Fout_count],scratch[3]);
-          d_Fout(Fout_count,0) += scratch[3][0];
-          d_Fout(Fout_count,1) += scratch[3][1];
+          d_Fout(Fout_count).re += scratch[3][0];
+          d_Fout(Fout_count).im += scratch[3][1];
 
           if (st.inverse) {
-              d_Fout(Fout_count + m,0) = scratch[5][0] - scratch[4][1];
-              d_Fout(Fout_count + m,1) = scratch[5][1] + scratch[4][0];
-              d_Fout(Fout_count + m3,0) = scratch[5][0] + scratch[4][1];
-              d_Fout(Fout_count + m3,1) = scratch[5][1] - scratch[4][0];
+              d_Fout(Fout_count + m).re = scratch[5][0] - scratch[4][1];
+              d_Fout(Fout_count + m).im = scratch[5][1] + scratch[4][0];
+              d_Fout(Fout_count + m3).re = scratch[5][0] + scratch[4][1];
+              d_Fout(Fout_count + m3).im = scratch[5][1] - scratch[4][0];
           } else{
-              d_Fout(Fout_count + m,0) = scratch[5][0] + scratch[4][1];
-              d_Fout(Fout_count + m,1) = scratch[5][1] - scratch[4][0];
-              d_Fout(Fout_count + m3,0) = scratch[5][0] - scratch[4][1];
-              d_Fout(Fout_count + m3,1) = scratch[5][1] + scratch[4][0];
+              d_Fout(Fout_count + m).re = scratch[5][0] + scratch[4][1];
+              d_Fout(Fout_count + m).im = scratch[5][1] - scratch[4][0];
+              d_Fout(Fout_count + m3).re = scratch[5][0] - scratch[4][1];
+              d_Fout(Fout_count + m3).im = scratch[5][1] + scratch[4][0];
           }
           ++Fout_count;
       } while(--k);
   }
 
   KOKKOS_INLINE_FUNCTION
-  static void kf_bfly3(typename AT::t_FFT_DATA_1d_um &d_Fout, const size_t fstride,
+  static void kf_bfly3(typename FFT_AT::t_FFT_DATA_1d_um &d_Fout, const size_t fstride,
                        const kiss_fft_state_kokkos<DeviceType> &st, size_t m, int Fout_count)
   {
       size_t k=m;
       const size_t m2 = 2*m;
-      typename AT::t_FFT_DATA_1d_um d_twiddles = st.d_twiddles;
+      typename FFT_AT::t_FFT_DATA_1d_um d_twiddles = st.d_twiddles;
       FFT_SCALAR scratch[5][2];
       FFT_SCALAR epi3[2];
       //C_EQ(epi3,d_twiddles[fstride*m]);
-      epi3[0] = d_twiddles(fstride*m,0);
-      epi3[1] = d_twiddles(fstride*m,1);
+      epi3[0] = d_twiddles(fstride*m).re;
+      epi3[1] = d_twiddles(fstride*m).im;
 
       int tw1_count,tw2_count;
       tw1_count = tw2_count = 0;
@@ -268,41 +266,41 @@ class KissFFTKokkos {
           tw1_count += fstride;
           tw2_count += fstride*2;
 
-          d_Fout(Fout_count + m,0) = d_Fout(Fout_count,0) - HALF_OF(scratch[3][0]);
-          d_Fout(Fout_count + m,1) = d_Fout(Fout_count,1) - HALF_OF(scratch[3][1]);
+          d_Fout(Fout_count + m).re = d_Fout(Fout_count).re - HALF_OF(scratch[3][0]);
+          d_Fout(Fout_count + m).im = d_Fout(Fout_count).im - HALF_OF(scratch[3][1]);
 
           //C_MULBYSCALAR(scratch[0],epi3[1]);
           scratch[0][0] *= epi3[1];
           scratch[0][1] *= epi3[1];
 
           //C_ADDTO(d_Fout[Fout_count],scratch[3]);
-          d_Fout(Fout_count,0) += scratch[3][0];
-          d_Fout(Fout_count,1) += scratch[3][1];
+          d_Fout(Fout_count).re += scratch[3][0];
+          d_Fout(Fout_count).im += scratch[3][1];
 
-          d_Fout(Fout_count + m2,0) = d_Fout(Fout_count + m,0) + scratch[0][1];
-          d_Fout(Fout_count + m2,1) = d_Fout(Fout_count + m,1) - scratch[0][0];
+          d_Fout(Fout_count + m2).re = d_Fout(Fout_count + m).re + scratch[0][1];
+          d_Fout(Fout_count + m2).im = d_Fout(Fout_count + m).im - scratch[0][0];
 
-          d_Fout(Fout_count + m,0) -= scratch[0][1];
-          d_Fout(Fout_count + m,1) += scratch[0][0];
+          d_Fout(Fout_count + m).re -= scratch[0][1];
+          d_Fout(Fout_count + m).im += scratch[0][0];
 
           ++Fout_count;
       } while(--k);
   }
 
   KOKKOS_INLINE_FUNCTION
-  static void kf_bfly5(typename AT::t_FFT_DATA_1d_um &d_Fout, const size_t fstride,
+  static void kf_bfly5(typename FFT_AT::t_FFT_DATA_1d_um &d_Fout, const size_t fstride,
                        const kiss_fft_state_kokkos<DeviceType> &st, int m, int Fout_count)
   {
       int u;
       FFT_SCALAR scratch[13][2];
-      typename AT::t_FFT_DATA_1d_um d_twiddles = st.d_twiddles;
+      typename FFT_AT::t_FFT_DATA_1d_um d_twiddles = st.d_twiddles;
       FFT_SCALAR ya[2],yb[2];
       //C_EQ(ya,d_twiddles[fstride*m]);
-      ya[1] = d_twiddles(fstride*m,1);
-      ya[0] = d_twiddles(fstride*m,0);
+      ya[1] = d_twiddles(fstride*m).im;
+      ya[0] = d_twiddles(fstride*m).re;
       //C_EQ(yb,d_twiddles[fstride*2*m]);
-      yb[1] = d_twiddles(fstride*2*m,1);
-      yb[0] = d_twiddles(fstride*2*m,0);
+      yb[1] = d_twiddles(fstride*2*m).im;
+      yb[0] = d_twiddles(fstride*2*m).re;
 
       int Fout0_count=Fout_count;
       int Fout1_count=Fout0_count+m;
@@ -314,8 +312,8 @@ class KissFFTKokkos {
           //C_FIXDIV( d_Fout[Fout0_count],5); C_FIXDIV( d_Fout[Fout1_count],5); C_FIXDIV( d_Fout[Fout2_count],5);
           //C_FIXDIV( d_Fout[Fout3_count],5); C_FIXDIV( d_Fout[Fout4_count],5);
           //C_EQ(scratch[0],d_Fout[Fout0_count]);
-          scratch[0][0] = d_Fout(Fout0_count,0);
-          scratch[0][1] = d_Fout(Fout0_count,1);
+          scratch[0][0] = d_Fout(Fout0_count).re;
+          scratch[0][1] = d_Fout(Fout0_count).im;
 
           C_MUL(scratch[1],d_Fout,Fout1_count,d_twiddles,u*fstride  );
           C_MUL(scratch[2],d_Fout,Fout2_count,d_twiddles,2*u*fstride);
@@ -335,8 +333,8 @@ class KissFFTKokkos {
           scratch[9][0] = scratch[2][0] - scratch[3][0];
           scratch[9][1] = scratch[2][1] - scratch[3][1];
 
-          d_Fout(Fout0_count,0) += scratch[7][0] + scratch[8][0];
-          d_Fout(Fout0_count,1) += scratch[7][1] + scratch[8][1];
+          d_Fout(Fout0_count).re += scratch[7][0] + scratch[8][0];
+          d_Fout(Fout0_count).im += scratch[7][1] + scratch[8][1];
 
           scratch[5][0] = scratch[0][0] + S_MUL(scratch[7][0],ya[0]) + S_MUL(scratch[8][0],yb[0]);
           scratch[5][1] = scratch[0][1] + S_MUL(scratch[7][1],ya[0]) + S_MUL(scratch[8][1],yb[0]);
@@ -345,11 +343,11 @@ class KissFFTKokkos {
           scratch[6][1] = -S_MUL(scratch[10][0],ya[1]) - S_MUL(scratch[9][0],yb[1]);
 
           //C_SUB(d_Fout[Fout1_count],scratch[5],scratch[6]);
-          d_Fout(Fout1_count,0) = scratch[5][0] - scratch[6][0];
-          d_Fout(Fout1_count,1) = scratch[5][1] - scratch[6][1];
+          d_Fout(Fout1_count).re = scratch[5][0] - scratch[6][0];
+          d_Fout(Fout1_count).im = scratch[5][1] - scratch[6][1];
           //C_ADD(d_Fout[Fout4_count],scratch[5],scratch[6]);
-          d_Fout(Fout4_count,0) = scratch[5][0] + scratch[6][0];
-          d_Fout(Fout4_count,1) = scratch[5][1] + scratch[6][1];
+          d_Fout(Fout4_count).re = scratch[5][0] + scratch[6][0];
+          d_Fout(Fout4_count).im = scratch[5][1] + scratch[6][1];
 
           scratch[11][0] = scratch[0][0] + S_MUL(scratch[7][0],yb[0]) + S_MUL(scratch[8][0],ya[0]);
           scratch[11][1] = scratch[0][1] + S_MUL(scratch[7][1],yb[0]) + S_MUL(scratch[8][1],ya[0]);
@@ -357,11 +355,11 @@ class KissFFTKokkos {
           scratch[12][1] = S_MUL(scratch[10][0],yb[1]) - S_MUL(scratch[9][0],ya[1]);
 
           //C_ADD(d_Fout[Fout2_count],scratch[11],scratch[12]);
-          d_Fout(Fout2_count,0) = scratch[11][0] + scratch[12][0];
-          d_Fout(Fout2_count,1) = scratch[11][1] + scratch[12][1];
+          d_Fout(Fout2_count).re = scratch[11][0] + scratch[12][0];
+          d_Fout(Fout2_count).im = scratch[11][1] + scratch[12][1];
           //C_SUB(d_Fout3[Fout3_count],scratch[11],scratch[12]);
-          d_Fout(Fout3_count,0) = scratch[11][0] - scratch[12][0];
-          d_Fout(Fout3_count,1) = scratch[11][1] - scratch[12][1];
+          d_Fout(Fout3_count).re = scratch[11][0] - scratch[12][0];
+          d_Fout(Fout3_count).im = scratch[11][1] - scratch[12][1];
 
           ++Fout0_count;++Fout1_count;++Fout2_count;++Fout3_count;++Fout4_count;
       }
@@ -370,21 +368,21 @@ class KissFFTKokkos {
   /* perform the butterfly for one stage of a mixed radix FFT */
 
   KOKKOS_INLINE_FUNCTION
-  static void kf_bfly_generic(typename AT::t_FFT_DATA_1d_um &d_Fout, const size_t fstride,
+  static void kf_bfly_generic(typename FFT_AT::t_FFT_DATA_1d_um &d_Fout, const size_t fstride,
                               const kiss_fft_state_kokkos<DeviceType> &st, int m, int p, int Fout_count)
   {
       int u,k,q1,q;
-      typename AT::t_FFT_DATA_1d_um d_twiddles = st.d_twiddles;
+      typename FFT_AT::t_FFT_DATA_1d_um d_twiddles = st.d_twiddles;
       FFT_SCALAR t[2];
       int Norig = st.nfft;
 
-      typename AT::t_FFT_DATA_1d_um d_scratch = st.d_scratch;
+      typename FFT_AT::t_FFT_DATA_1d_um d_scratch = st.d_scratch;
       for ( u=0; u<m; ++u ) {
           k=u;
           for ( q1=0 ; q1<p ; ++q1 ) {
               //C_EQ(d_scratch[q1],d_Fout[k]);
-              d_scratch(q1,0) = d_Fout(Fout_count + k,0);
-              d_scratch(q1,1) = d_Fout(Fout_count + k,1);
+              d_scratch(q1).re = d_Fout(Fout_count + k).re;
+              d_scratch(q1).im = d_Fout(Fout_count + k).im;
               //C_FIXDIV(d_scratch[q1],p);
               k += m;
           }
@@ -393,15 +391,15 @@ class KissFFTKokkos {
           for ( q1=0 ; q1<p ; ++q1 ) {
               int twidx=0;
               //C_EQ(d_Fout[k],d_scratch[0]);
-              d_Fout(Fout_count + k,0) = d_scratch(0,0);
-              d_Fout(Fout_count + k,1) = d_scratch(0,1);
+              d_Fout(Fout_count + k).re = d_scratch(0).re;
+              d_Fout(Fout_count + k).im = d_scratch(0).im;
               for (q=1;q<p;++q ) {
                   twidx += fstride * k;
                   if (twidx>=Norig) twidx-=Norig;
                   C_MUL(t,d_scratch,q,d_twiddles,twidx);
                   //C_ADDTO(d_Fout[k],t);
-                  d_Fout(Fout_count + k,0) += t[0];
-                  d_Fout(Fout_count + k,1) += t[1];
+                  d_Fout(Fout_count + k).re += t[0];
+                  d_Fout(Fout_count + k).im += t[1];
               }
               k += m;
           }
@@ -409,9 +407,9 @@ class KissFFTKokkos {
   }
 
   KOKKOS_INLINE_FUNCTION
-  static void kf_work(typename AT::t_FFT_DATA_1d_um &d_Fout, const typename AT::t_FFT_DATA_1d_um &d_f,
+  static void kf_work(typename FFT_AT::t_FFT_DATA_1d_um &d_Fout, const typename FFT_AT::t_FFT_DATA_1d_um &d_f,
                       const size_t fstride, int in_stride,
-                      const typename AT::t_int_64_um &d_factors, const kiss_fft_state_kokkos<DeviceType> &st, int Fout_count, int f_count, int factors_count)
+                      const typename FFT_AT::t_int_64_um &d_factors, const kiss_fft_state_kokkos<DeviceType> &st, int Fout_count, int f_count, int factors_count)
   {
       const int beg = Fout_count;
       const int p = d_factors[factors_count++]; /* the radix  */
@@ -421,8 +419,8 @@ class KissFFTKokkos {
       if (m == 1) {
           do {
               //C_EQ(d_Fout[Fout_count],d_f[f_count]);
-              d_Fout(Fout_count,0) = d_f(f_count,0);
-              d_Fout(Fout_count,1) = d_f(f_count,1);
+              d_Fout(Fout_count).re = d_f(f_count).re;
+              d_Fout(Fout_count).im = d_f(f_count).im;
               f_count += fstride*in_stride;
           } while (++Fout_count != end);
       } else {
@@ -453,7 +451,7 @@ class KissFFTKokkos {
       p[i] * m[i] = m[i-1]
       m0 = n                  */
 
-  static int kf_factor(int n, HAT::t_int_64 h_facbuf)
+  static int kf_factor(int n, FFT_HAT::t_int_64 h_facbuf)
   {
       int p=4, nf=0;
       double floor_sqrt;
@@ -497,12 +495,12 @@ class KissFFTKokkos {
       st.nfft = nfft;
       st.inverse = inverse_fft;
 
-      typename AT::tdual_int_64 k_factors = typename AT::tdual_int_64();
-      typename AT::tdual_FFT_DATA_1d k_twiddles = typename AT::tdual_FFT_DATA_1d();
+      typename FFT_AT::tdual_int_64 k_factors = typename FFT_AT::tdual_int_64();
+      typename FFT_AT::tdual_FFT_DATA_1d k_twiddles = typename FFT_AT::tdual_FFT_DATA_1d();
 
       if (nfft > 0) {
-          k_factors = typename AT::tdual_int_64("kissfft:factors",MAXFACTORS*2);
-          k_twiddles = typename AT::tdual_FFT_DATA_1d("kissfft:twiddles",nfft);
+          k_factors = typename FFT_AT::tdual_int_64("kissfft:factors",MAXFACTORS*2);
+          k_twiddles = typename FFT_AT::tdual_FFT_DATA_1d("kissfft:twiddles",nfft);
 
           for (i=0;i<nfft;++i) {
               const double phase = (st.inverse ? 2.0*M_PI:-2.0*M_PI)*i / nfft;
@@ -510,7 +508,7 @@ class KissFFTKokkos {
           }
 
           int p_max = kf_factor(nfft,k_factors.h_view);
-          st.d_scratch = typename AT::t_FFT_DATA_1d("kissfft:scratch",p_max);
+          st.d_scratch = typename FFT_AT::t_FFT_DATA_1d("kissfft:scratch",p_max);
       }
 
       k_factors.template modify<LMPHostType>();
@@ -525,13 +523,13 @@ class KissFFTKokkos {
   }
 
   KOKKOS_INLINE_FUNCTION
-  static void kiss_fft_stride(const kiss_fft_state_kokkos<DeviceType> &st, const typename AT::t_FFT_DATA_1d_um &d_fin, typename AT::t_FFT_DATA_1d_um &d_fout, int in_stride, int offset)
+  static void kiss_fft_stride(const kiss_fft_state_kokkos<DeviceType> &st, const typename FFT_AT::t_FFT_DATA_1d_um &d_fin, typename FFT_AT::t_FFT_DATA_1d_um &d_fout, int in_stride, int offset)
   {
       //if (d_fin.data() == d_fout.data()) {
       //    // NOTE: this is not really an in-place FFT algorithm.
       //    // It just performs an out-of-place FFT into a temp buffer
-      //    typename AT::t_FFT_DATA_1d_um d_tmpbuf = typename AT::t_FFT_DATA_1d("kissfft:tmpbuf",d_fin.extent(1));
-      //    kf_work(d_tmpbuf,d_fin,1,in_stride,st.d_factors,st,offset,offset,0);
+      //    typename FFT_AT::t_FFT_DATA_1d_um d_tmpbuf = typename FFT_AT::t_FFT_DATA_1d("kissfft:tmpbuf",d_fin.extent(1));
+      //    kf_work(d_tmpbuf,d_fin,1,in_stride,st.d_factors,st,offset,offset).re;
       //    Kokkos::deep_copy(d_fout,d_tmpbuf);
       //} else {
         kf_work(d_fout,d_fin,1,in_stride,st.d_factors,st,offset,offset,0);
@@ -539,7 +537,7 @@ class KissFFTKokkos {
   }
 
   KOKKOS_INLINE_FUNCTION
-  static void kiss_fft_kokkos(const kiss_fft_state_kokkos<DeviceType> &cfg, const typename AT::t_FFT_DATA_1d_um d_fin, typename AT::t_FFT_DATA_1d_um d_fout, int offset)
+  static void kiss_fft_kokkos(const kiss_fft_state_kokkos<DeviceType> &cfg, const typename FFT_AT::t_FFT_DATA_1d_um d_fin, typename FFT_AT::t_FFT_DATA_1d_um d_fout, int offset)
   {
       kiss_fft_stride(cfg,d_fin,d_fout,1,offset);
   }
diff --git a/src/KOKKOS/kokkos_base.h b/src/KOKKOS/kokkos_base.h
index 1c7a862f11..1d8f1e93e2 100644
--- a/src/KOKKOS/kokkos_base.h
+++ b/src/KOKKOS/kokkos_base.h
@@ -22,12 +22,6 @@ class KokkosBase {
  public:
   KokkosBase() {}
 
-  //Kspace
-  virtual void pack_forward_kspace_kokkos(int, DAT::tdual_FFT_SCALAR_1d &, int, DAT::tdual_int_2d &, int) {};
-  virtual void unpack_forward_kspace_kokkos(int, DAT::tdual_FFT_SCALAR_1d &, int, DAT::tdual_int_2d &, int) {};
-  virtual void pack_reverse_kspace_kokkos(int, DAT::tdual_FFT_SCALAR_1d &, int, DAT::tdual_int_2d &, int) {};
-  virtual void unpack_reverse_kspace_kokkos(int, DAT::tdual_FFT_SCALAR_1d &, int, DAT::tdual_int_2d &, int) {};
-
   // Pair
   virtual int pack_forward_comm_kokkos(int, DAT::tdual_int_2d,
                                        int, DAT::tdual_xfloat_1d &,
diff --git a/src/KOKKOS/kokkos_base_fft.h b/src/KOKKOS/kokkos_base_fft.h
new file mode 100644
index 0000000000..7d0829e4d6
--- /dev/null
+++ b/src/KOKKOS/kokkos_base_fft.h
@@ -0,0 +1,38 @@
+/* ----------------------------------------------------------------------
+   LAMMPS - Large-scale Atomic/Molecular Massively Parallel Simulator
+   http://lammps.sandia.gov, Sandia National Laboratories
+   Steve Plimpton, sjplimp@sandia.gov
+
+   Copyright (2003) Sandia Corporation.  Under the terms of Contract
+   DE-AC04-94AL85000 with Sandia Corporation, the U.S. Government retains
+   certain rights in this software.  This software is distributed under
+   the GNU General Public License.
+
+   See the README file in the top-level LAMMPS directory.
+------------------------------------------------------------------------- */
+
+#ifndef LMP_KOKKOS_BASE_FFT_H
+#define LMP_KOKKOS_BASE_FFT_H
+
+#include "fftdata_kokkos.h"
+
+namespace LAMMPS_NS {
+
+class KokkosBaseFFT {
+ public:
+  KokkosBaseFFT() {}
+
+  //Kspace
+  virtual void pack_forward_kspace_kokkos(int, FFT_DAT::tdual_FFT_SCALAR_1d &, int, DAT::tdual_int_2d &, int) {};
+  virtual void unpack_forward_kspace_kokkos(int, FFT_DAT::tdual_FFT_SCALAR_1d &, int, DAT::tdual_int_2d &, int) {};
+  virtual void pack_reverse_kspace_kokkos(int, FFT_DAT::tdual_FFT_SCALAR_1d &, int, DAT::tdual_int_2d &, int) {};
+  virtual void unpack_reverse_kspace_kokkos(int, FFT_DAT::tdual_FFT_SCALAR_1d &, int, DAT::tdual_int_2d &, int) {};
+};
+
+}
+
+#endif
+
+/* ERROR/WARNING messages:
+
+*/
diff --git a/src/KOKKOS/kokkos_type.h b/src/KOKKOS/kokkos_type.h
index 3ead8417b9..b1d17b45c3 100644
--- a/src/KOKKOS/kokkos_type.h
+++ b/src/KOKKOS/kokkos_type.h
@@ -29,21 +29,6 @@ enum{FULL=1u,HALFTHREAD=2u,HALF=4u,N2=8u};
 #define ISFINITE(x) std::isfinite(x)
 #endif
 
-// User-settable FFT precision
-
-// FFT_PRECISION = 1 is single-precision complex (4-byte real, 4-byte imag)
-// FFT_PRECISION = 2 is double-precision complex (8-byte real, 8-byte imag)
-
-#ifdef FFT_SINGLE
-#define FFT_PRECISION 1
-#define MPI_FFT_SCALAR MPI_FLOAT
-typedef float FFT_SCALAR;
-#else
-#define FFT_PRECISION 2
-#define MPI_FFT_SCALAR MPI_DOUBLE
-typedef double FFT_SCALAR;
-#endif
-
 #define MAX_TYPES_STACKPARAMS 12
 #define NeighClusterSize 8
 
@@ -178,6 +163,20 @@ t_scalar3<Scalar> operator *
 typedef Kokkos::DefaultExecutionSpace LMPDeviceType;
 typedef Kokkos::HostSpace::execution_space LMPHostType;
 
+
+// Need to use Cuda UVM memory space for Host execution space
+
+template<class DeviceType>
+class KKDevice {
+public:
+#if defined(KOKKOS_ENABLE_CUDA) && defined(KOKKOS_ENABLE_CUDA_UVM)
+  typedef Kokkos::Device<DeviceType,LMPDeviceType::memory_space> value;
+#else
+  typedef Kokkos::Device<DeviceType,typename DeviceType::memory_space> value;
+#endif
+};
+
+
 // set ExecutionSpace stuct with variable "space"
 
 template<class Device>
@@ -752,32 +751,6 @@ typedef tdual_neighbors_2d::t_dev_um t_neighbors_2d_um;
 typedef tdual_neighbors_2d::t_dev_const_um t_neighbors_2d_const_um;
 typedef tdual_neighbors_2d::t_dev_const_randomread t_neighbors_2d_randomread;
 
-//Kspace
-
-typedef Kokkos::
-  DualView<FFT_SCALAR*, Kokkos::LayoutRight, LMPDeviceType> tdual_FFT_SCALAR_1d;
-typedef tdual_FFT_SCALAR_1d::t_dev t_FFT_SCALAR_1d;
-typedef tdual_FFT_SCALAR_1d::t_dev_um t_FFT_SCALAR_1d_um;
-
-typedef Kokkos::DualView<FFT_SCALAR**,Kokkos::LayoutRight,LMPDeviceType> tdual_FFT_SCALAR_2d;
-typedef tdual_FFT_SCALAR_2d::t_dev t_FFT_SCALAR_2d;
-
-typedef Kokkos::DualView<FFT_SCALAR**[3],Kokkos::LayoutRight,LMPDeviceType> tdual_FFT_SCALAR_2d_3;
-typedef tdual_FFT_SCALAR_2d_3::t_dev t_FFT_SCALAR_2d_3;
-
-typedef Kokkos::DualView<FFT_SCALAR***,Kokkos::LayoutRight,LMPDeviceType> tdual_FFT_SCALAR_3d;
-typedef tdual_FFT_SCALAR_3d::t_dev t_FFT_SCALAR_3d;
-
-typedef Kokkos::
-  DualView<FFT_SCALAR*[2], Kokkos::LayoutRight, LMPDeviceType> tdual_FFT_DATA_1d;
-typedef tdual_FFT_DATA_1d::t_dev t_FFT_DATA_1d;
-typedef tdual_FFT_DATA_1d::t_dev_um t_FFT_DATA_1d_um;
-
-typedef Kokkos::
-  DualView<int*, LMPDeviceType::array_layout, LMPDeviceType> tdual_int_64;
-typedef tdual_int_64::t_dev t_int_64;
-typedef tdual_int_64::t_dev_um t_int_64_um;
-
 };
 
 #ifdef KOKKOS_ENABLE_CUDA
@@ -1012,33 +985,6 @@ typedef tdual_neighbors_2d::t_host_um t_neighbors_2d_um;
 typedef tdual_neighbors_2d::t_host_const_um t_neighbors_2d_const_um;
 typedef tdual_neighbors_2d::t_host_const_randomread t_neighbors_2d_randomread;
 
-
-//Kspace
-
-typedef Kokkos::
-  DualView<FFT_SCALAR*, Kokkos::LayoutRight, LMPDeviceType> tdual_FFT_SCALAR_1d;
-typedef tdual_FFT_SCALAR_1d::t_host t_FFT_SCALAR_1d;
-typedef tdual_FFT_SCALAR_1d::t_host_um t_FFT_SCALAR_1d_um;
-
-typedef Kokkos::DualView<FFT_SCALAR**,Kokkos::LayoutRight,LMPDeviceType> tdual_FFT_SCALAR_2d;
-typedef tdual_FFT_SCALAR_2d::t_host t_FFT_SCALAR_2d;
-
-typedef Kokkos::DualView<FFT_SCALAR**[3],Kokkos::LayoutRight,LMPDeviceType> tdual_FFT_SCALAR_2d_3;
-typedef tdual_FFT_SCALAR_2d_3::t_host t_FFT_SCALAR_2d_3;
-
-typedef Kokkos::DualView<FFT_SCALAR***,Kokkos::LayoutRight,LMPDeviceType> tdual_FFT_SCALAR_3d;
-typedef tdual_FFT_SCALAR_3d::t_host t_FFT_SCALAR_3d;
-
-typedef Kokkos::
-  DualView<FFT_SCALAR*[2], Kokkos::LayoutRight, LMPDeviceType> tdual_FFT_DATA_1d;
-typedef tdual_FFT_DATA_1d::t_host t_FFT_DATA_1d;
-typedef tdual_FFT_DATA_1d::t_host_um t_FFT_DATA_1d_um;
-
-typedef Kokkos::
-  DualView<int*, LMPDeviceType::array_layout, LMPDeviceType> tdual_int_64;
-typedef tdual_int_64::t_host t_int_64;
-typedef tdual_int_64::t_host_um t_int_64_um;
-
 };
 #endif
 //default LAMMPS Types
@@ -1048,17 +994,9 @@ typedef struct ArrayTypes<LMPHostType> HAT;
 template<class DeviceType, class BufferView, class DualView>
 void buffer_view(BufferView &buf, DualView &view,
                  const size_t n0,
-                 const size_t n1 = 0,
-                 const size_t n2 = 0,
-                 const size_t n3 = 0,
-                 const size_t n4 = 0,
-                 const size_t n5 = 0,
-                 const size_t n6 = 0,
-                 const size_t n7 = 0) {
+                 const size_t n1) {
 
-  buf = BufferView(
-          view.template view<DeviceType>().data(),
-          n0,n1,n2,n3,n4,n5,n6,n7);
+  buf = BufferView(view.template view<DeviceType>().data(),n0,n1);
 
 }
 
@@ -1080,7 +1018,7 @@ void memset_kokkos (ViewType &view) {
   #else
   Kokkos::parallel_for(view.span()*sizeof(typename ViewType::value_type)/4, f);
   #endif
-  ViewType::execution_space::fence();
+  ViewType::execution_space().fence();
 }
 
 struct params_lj_coul {
diff --git a/src/KOKKOS/npair_ssa_kokkos.cpp b/src/KOKKOS/npair_ssa_kokkos.cpp
index 5234c4e6d2..f9708e5fe8 100644
--- a/src/KOKKOS/npair_ssa_kokkos.cpp
+++ b/src/KOKKOS/npair_ssa_kokkos.cpp
@@ -234,7 +234,7 @@ int NPairSSAKokkosExecute<DeviceType>::exclusion(const int &i,const int &j,
 
 /* ----------------------------------------------------------------------
    binned neighbor list construction with full Newton's 3rd law
-   for use by Shardlow Spliting Algorithm
+   for use by Shardlow Splitting Algorithm
    each owned atom i checks its own bin and other bins in Newton stencil
    every pair stored exactly once by some processor
 ------------------------------------------------------------------------- */
diff --git a/src/KOKKOS/pack_kokkos.h b/src/KOKKOS/pack_kokkos.h
index e0a11ff4e0..400048b1f0 100644
--- a/src/KOKKOS/pack_kokkos.h
+++ b/src/KOKKOS/pack_kokkos.h
@@ -29,7 +29,7 @@
    pack from data -> buf
 ------------------------------------------------------------------------- */
 
-#include "kokkos_type.h"
+#include "fftdata_kokkos.h"
 
 namespace LAMMPS_NS {
 
@@ -37,13 +37,13 @@ template<class DeviceType>
 class PackKokkos {
  public:
   typedef DeviceType device_type;
-  typedef ArrayTypes<DeviceType> AT;
+  typedef FFTArrayTypes<DeviceType> FFT_AT;
 
 struct pack_3d_functor {
 public:
   typedef DeviceType device_type;
-  typedef ArrayTypes<DeviceType> AT;
-  typename AT::t_FFT_SCALAR_1d_um d_buf,d_data;
+  typedef FFTArrayTypes<DeviceType> FFT_AT;
+  typename FFT_AT::t_FFT_SCALAR_1d_um d_buf,d_data;
   int buf_offset,data_offset;
   int nfast;                 // # of elements in fast index
   int nmid;                  // # of elements in mid index
@@ -51,7 +51,7 @@ public:
   int nstride_line;          // stride between successive mid indices
   int nstride_plane;         // stride between successive slow indices
 
-  pack_3d_functor(typename AT::t_FFT_SCALAR_1d_um d_buf_, int buf_offset_, typename AT::t_FFT_SCALAR_1d_um d_data_, int data_offset_, struct pack_plan_3d *plan):
+  pack_3d_functor(typename FFT_AT::t_FFT_SCALAR_1d_um d_buf_, int buf_offset_, typename FFT_AT::t_FFT_SCALAR_1d_um d_data_, int data_offset_, struct pack_plan_3d *plan):
     d_buf(d_buf_),
     d_data(d_data_)
     {
@@ -79,14 +79,14 @@ public:
   }
 };
 
-static void pack_3d(typename AT::t_FFT_SCALAR_1d_um d_data, int data_offset, typename AT::t_FFT_SCALAR_1d_um d_buf, int buf_offset, struct pack_plan_3d *plan)
+static void pack_3d(typename FFT_AT::t_FFT_SCALAR_1d_um d_data, int data_offset, typename FFT_AT::t_FFT_SCALAR_1d_um d_buf, int buf_offset, struct pack_plan_3d *plan)
 {
   const int nslow = plan->nslow;
   const int nmid = plan->nmid;
   const int nfast = plan->nfast;
   pack_3d_functor f(d_buf,buf_offset,d_data,data_offset,plan);
   Kokkos::parallel_for(nslow*nmid*nfast,f);
-  DeviceType::fence();
+  DeviceType().fence();
 }
 
 /* ----------------------------------------------------------------------
@@ -97,7 +97,7 @@ struct unpack_3d_functor {
 public:
   typedef DeviceType device_type;
   typedef ArrayTypes<DeviceType> AT;
-  typename AT::t_FFT_SCALAR_1d_um d_buf,d_data;
+  typename FFT_AT::t_FFT_SCALAR_1d_um d_buf,d_data;
   int buf_offset,data_offset;
   int nfast;                 // # of elements in fast index
   int nmid;                  // # of elements in mid index
@@ -105,7 +105,7 @@ public:
   int nstride_line;          // stride between successive mid indices
   int nstride_plane;         // stride between successive slow indices
 
-  unpack_3d_functor(typename AT::t_FFT_SCALAR_1d_um d_buf_, int buf_offset_, typename AT::t_FFT_SCALAR_1d_um d_data_, int data_offset_, struct pack_plan_3d *plan):
+  unpack_3d_functor(typename FFT_AT::t_FFT_SCALAR_1d_um d_buf_, int buf_offset_, typename FFT_AT::t_FFT_SCALAR_1d_um d_data_, int data_offset_, struct pack_plan_3d *plan):
     d_buf(d_buf_),
     d_data(d_data_)
     {
@@ -133,14 +133,14 @@ public:
   }
 };
 
-static void unpack_3d(typename AT::t_FFT_SCALAR_1d_um d_buf, int buf_offset, typename AT::t_FFT_SCALAR_1d_um d_data, int data_offset, struct pack_plan_3d *plan)
+static void unpack_3d(typename FFT_AT::t_FFT_SCALAR_1d_um d_buf, int buf_offset, typename FFT_AT::t_FFT_SCALAR_1d_um d_data, int data_offset, struct pack_plan_3d *plan)
 {
   const int nslow = plan->nslow;
   const int nmid = plan->nmid;
   const int nfast = plan->nfast;
   unpack_3d_functor f(d_buf,buf_offset,d_data,data_offset,plan);
   Kokkos::parallel_for(nslow*nmid*nfast,f);
-  DeviceType::fence();
+  DeviceType().fence();
 }
 
 /* ----------------------------------------------------------------------
@@ -152,7 +152,7 @@ struct unpack_3d_permute1_1_functor {
 public:
   typedef DeviceType device_type;
   typedef ArrayTypes<DeviceType> AT;
-  typename AT::t_FFT_SCALAR_1d_um d_buf,d_data;
+  typename FFT_AT::t_FFT_SCALAR_1d_um d_buf,d_data;
   int buf_offset,data_offset;
   int nfast;                 // # of elements in fast index
   int nmid;                  // # of elements in mid index
@@ -160,7 +160,7 @@ public:
   int nstride_line;          // stride between successive mid indices
   int nstride_plane;         // stride between successive slow indices
 
-  unpack_3d_permute1_1_functor(typename AT::t_FFT_SCALAR_1d_um d_buf_, int buf_offset_, typename AT::t_FFT_SCALAR_1d_um d_data_, int data_offset_, struct pack_plan_3d *plan):
+  unpack_3d_permute1_1_functor(typename FFT_AT::t_FFT_SCALAR_1d_um d_buf_, int buf_offset_, typename FFT_AT::t_FFT_SCALAR_1d_um d_data_, int data_offset_, struct pack_plan_3d *plan):
     d_buf(d_buf_),
     d_data(d_data_)
     {
@@ -188,14 +188,14 @@ public:
   }
 };
 
-static void unpack_3d_permute1_1(typename AT::t_FFT_SCALAR_1d_um d_buf, int buf_offset, typename AT::t_FFT_SCALAR_1d_um d_data, int data_offset, struct pack_plan_3d *plan)
+static void unpack_3d_permute1_1(typename FFT_AT::t_FFT_SCALAR_1d_um d_buf, int buf_offset, typename FFT_AT::t_FFT_SCALAR_1d_um d_data, int data_offset, struct pack_plan_3d *plan)
 {
   const int nslow = plan->nslow;
   const int nmid = plan->nmid;
   const int nfast = plan->nfast;
   unpack_3d_permute1_1_functor f(d_buf,buf_offset,d_data,data_offset,plan);
   Kokkos::parallel_for(nslow*nmid*nfast,f);
-  DeviceType::fence();
+  DeviceType().fence();
 }
 /* ----------------------------------------------------------------------
    unpack from buf -> data, one axis permutation, 2 values/element
@@ -205,7 +205,7 @@ struct unpack_3d_permute1_2_functor {
 public:
   typedef DeviceType device_type;
   typedef ArrayTypes<DeviceType> AT;
-  typename AT::t_FFT_SCALAR_1d_um d_buf,d_data;
+  typename FFT_AT::t_FFT_SCALAR_1d_um d_buf,d_data;
   int buf_offset,data_offset;
   int nfast;                 // # of elements in fast index
   int nmid;                  // # of elements in mid index
@@ -213,7 +213,7 @@ public:
   int nstride_line;          // stride between successive mid indices
   int nstride_plane;         // stride between successive slow indices
 
-  unpack_3d_permute1_2_functor(typename AT::t_FFT_SCALAR_1d_um d_buf_, int buf_offset_, typename AT::t_FFT_SCALAR_1d_um d_data_, int data_offset_, struct pack_plan_3d *plan):
+  unpack_3d_permute1_2_functor(typename FFT_AT::t_FFT_SCALAR_1d_um d_buf_, int buf_offset_, typename FFT_AT::t_FFT_SCALAR_1d_um d_data_, int data_offset_, struct pack_plan_3d *plan):
     d_buf(d_buf_),
     d_data(d_data_)
     {
@@ -242,14 +242,14 @@ public:
   }
 };
 
-static void unpack_3d_permute1_2(typename AT::t_FFT_SCALAR_1d_um d_buf, int buf_offset, typename AT::t_FFT_SCALAR_1d_um d_data, int data_offset, struct pack_plan_3d *plan)
+static void unpack_3d_permute1_2(typename FFT_AT::t_FFT_SCALAR_1d_um d_buf, int buf_offset, typename FFT_AT::t_FFT_SCALAR_1d_um d_data, int data_offset, struct pack_plan_3d *plan)
 {
   const int nslow = plan->nslow;
   const int nmid = plan->nmid;
   const int nfast = plan->nfast;
   unpack_3d_permute1_2_functor f(d_buf,buf_offset,d_data,data_offset,plan);
   Kokkos::parallel_for(nslow*nmid*nfast,f);
-  DeviceType::fence();
+  DeviceType().fence();
 }
 
 /* ----------------------------------------------------------------------
@@ -260,7 +260,7 @@ struct unpack_3d_permute1_n_functor {
 public:
   typedef DeviceType device_type;
   typedef ArrayTypes<DeviceType> AT;
-  typename AT::t_FFT_SCALAR_1d_um d_buf,d_data;
+  typename FFT_AT::t_FFT_SCALAR_1d_um d_buf,d_data;
   int buf_offset,data_offset;
   int nfast;                 // # of elements in fast index
   int nmid;                  // # of elements in mid index
@@ -269,7 +269,7 @@ public:
   int nstride_plane;         // stride between successive slow indices
   int nqty;                  // # of values/element
 
-  unpack_3d_permute1_n_functor(typename AT::t_FFT_SCALAR_1d_um d_buf_, int buf_offset_, typename AT::t_FFT_SCALAR_1d_um d_data_, int data_offset_, struct pack_plan_3d *plan):
+  unpack_3d_permute1_n_functor(typename FFT_AT::t_FFT_SCALAR_1d_um d_buf_, int buf_offset_, typename FFT_AT::t_FFT_SCALAR_1d_um d_data_, int data_offset_, struct pack_plan_3d *plan):
     d_buf(d_buf_),
     d_data(d_data_)
     {
@@ -298,14 +298,14 @@ public:
   }
 };
 
-static void unpack_3d_permute1_n(typename AT::t_FFT_SCALAR_1d_um d_buf, int buf_offset, typename AT::t_FFT_SCALAR_1d_um d_data, int data_offset, struct pack_plan_3d *plan)
+static void unpack_3d_permute1_n(typename FFT_AT::t_FFT_SCALAR_1d_um d_buf, int buf_offset, typename FFT_AT::t_FFT_SCALAR_1d_um d_data, int data_offset, struct pack_plan_3d *plan)
 {
   const int nslow = plan->nslow;
   const int nmid = plan->nmid;
   const int nfast = plan->nfast;
   unpack_3d_permute1_n_functor f(d_buf,buf_offset,d_data,data_offset,plan);
   Kokkos::parallel_for(nslow*nmid*nfast,f);
-  DeviceType::fence();
+  DeviceType().fence();
 }
 
 /* ----------------------------------------------------------------------
@@ -316,7 +316,7 @@ struct unpack_3d_permute2_1_functor {
 public:
   typedef DeviceType device_type;
   typedef ArrayTypes<DeviceType> AT;
-  typename AT::t_FFT_SCALAR_1d_um d_buf,d_data;
+  typename FFT_AT::t_FFT_SCALAR_1d_um d_buf,d_data;
   int buf_offset,data_offset;
   int nfast;                 // # of elements in fast index
   int nmid;                  // # of elements in mid index
@@ -324,7 +324,7 @@ public:
   int nstride_line;          // stride between successive mid indices
   int nstride_plane;         // stride between successive slow indices
 
-  unpack_3d_permute2_1_functor(typename AT::t_FFT_SCALAR_1d_um d_buf_, int buf_offset_, typename AT::t_FFT_SCALAR_1d_um d_data_, int data_offset_, struct pack_plan_3d *plan):
+  unpack_3d_permute2_1_functor(typename FFT_AT::t_FFT_SCALAR_1d_um d_buf_, int buf_offset_, typename FFT_AT::t_FFT_SCALAR_1d_um d_data_, int data_offset_, struct pack_plan_3d *plan):
     d_buf(d_buf_),
     d_data(d_data_)
     {
@@ -351,14 +351,14 @@ public:
   }
 };
 
-static void unpack_3d_permute2_1(typename AT::t_FFT_SCALAR_1d_um d_buf, int buf_offset, typename AT::t_FFT_SCALAR_1d_um d_data, int data_offset, struct pack_plan_3d *plan)
+static void unpack_3d_permute2_1(typename FFT_AT::t_FFT_SCALAR_1d_um d_buf, int buf_offset, typename FFT_AT::t_FFT_SCALAR_1d_um d_data, int data_offset, struct pack_plan_3d *plan)
 {
   const int nslow = plan->nslow;
   const int nmid = plan->nmid;
   const int nfast = plan->nfast;
   unpack_3d_permute2_1_functor f(d_buf,buf_offset,d_data,data_offset,plan);
   Kokkos::parallel_for(nslow*nmid*nfast,f);
-  DeviceType::fence();
+  DeviceType().fence();
 }
 
 /* ----------------------------------------------------------------------
@@ -369,7 +369,7 @@ struct unpack_3d_permute2_2_functor {
 public:
   typedef DeviceType device_type;
   typedef ArrayTypes<DeviceType> AT;
-  typename AT::t_FFT_SCALAR_1d_um d_buf,d_data;
+  typename FFT_AT::t_FFT_SCALAR_1d_um d_buf,d_data;
   int buf_offset,data_offset;
   int nfast;                 // # of elements in fast index
   int nmid;                  // # of elements in mid index
@@ -377,7 +377,7 @@ public:
   int nstride_line;          // stride between successive mid indices
   int nstride_plane;         // stride between successive slow indices
 
-  unpack_3d_permute2_2_functor(typename AT::t_FFT_SCALAR_1d_um d_buf_, int buf_offset_, typename AT::t_FFT_SCALAR_1d_um d_data_, int data_offset_, struct pack_plan_3d *plan):
+  unpack_3d_permute2_2_functor(typename FFT_AT::t_FFT_SCALAR_1d_um d_buf_, int buf_offset_, typename FFT_AT::t_FFT_SCALAR_1d_um d_data_, int data_offset_, struct pack_plan_3d *plan):
     d_buf(d_buf_),
     d_data(d_data_)
     {
@@ -405,14 +405,14 @@ public:
   }
 };
 
-static void unpack_3d_permute2_2(typename AT::t_FFT_SCALAR_1d_um d_buf, int buf_offset, typename AT::t_FFT_SCALAR_1d_um d_data, int data_offset, struct pack_plan_3d *plan)
+static void unpack_3d_permute2_2(typename FFT_AT::t_FFT_SCALAR_1d_um d_buf, int buf_offset, typename FFT_AT::t_FFT_SCALAR_1d_um d_data, int data_offset, struct pack_plan_3d *plan)
 {
   const int nslow = plan->nslow;
   const int nmid = plan->nmid;
   const int nfast = plan->nfast;
   unpack_3d_permute2_2_functor f(d_buf,buf_offset,d_data,data_offset,plan);
   Kokkos::parallel_for(nslow*nmid*nfast,f);
-  DeviceType::fence();
+  DeviceType().fence();
 }
 /* ----------------------------------------------------------------------
    unpack from buf -> data, two axis permutation, nqty values/element
@@ -422,7 +422,7 @@ struct unpack_3d_permute2_n_functor {
 public:
   typedef DeviceType device_type;
   typedef ArrayTypes<DeviceType> AT;
-  typename AT::t_FFT_SCALAR_1d_um d_buf,d_data;
+  typename FFT_AT::t_FFT_SCALAR_1d_um d_buf,d_data;
   int buf_offset,data_offset;
   int nfast;                 // # of elements in fast index
   int nmid;                  // # of elements in mid index
@@ -431,7 +431,7 @@ public:
   int nstride_plane;         // stride between successive slow indices
   int nqty;                  // # of values/element
 
-  unpack_3d_permute2_n_functor(typename AT::t_FFT_SCALAR_1d_um d_buf_, int buf_offset_, typename AT::t_FFT_SCALAR_1d_um d_data_, int data_offset_, struct pack_plan_3d *plan):
+  unpack_3d_permute2_n_functor(typename FFT_AT::t_FFT_SCALAR_1d_um d_buf_, int buf_offset_, typename FFT_AT::t_FFT_SCALAR_1d_um d_data_, int data_offset_, struct pack_plan_3d *plan):
     d_buf(d_buf_),
     d_data(d_data_)
     {
@@ -459,14 +459,14 @@ public:
   }
 };
 
-static void unpack_3d_permute2_n(typename AT::t_FFT_SCALAR_1d_um d_buf, int buf_offset, typename AT::t_FFT_SCALAR_1d_um d_data, int data_offset, struct pack_plan_3d *plan)
+static void unpack_3d_permute2_n(typename FFT_AT::t_FFT_SCALAR_1d_um d_buf, int buf_offset, typename FFT_AT::t_FFT_SCALAR_1d_um d_data, int data_offset, struct pack_plan_3d *plan)
 {
   const int nslow = plan->nslow;
   const int nmid = plan->nmid;
   const int nfast = plan->nfast;
   unpack_3d_permute2_n_functor f(d_buf,buf_offset,d_data,data_offset,plan);
   Kokkos::parallel_for(nslow*nmid*nfast,f);
-  DeviceType::fence();
+  DeviceType().fence();
 }
 
 };
diff --git a/src/KOKKOS/pair_buck_coul_cut_kokkos.cpp b/src/KOKKOS/pair_buck_coul_cut_kokkos.cpp
index 2a72617525..b28bbebbeb 100644
--- a/src/KOKKOS/pair_buck_coul_cut_kokkos.cpp
+++ b/src/KOKKOS/pair_buck_coul_cut_kokkos.cpp
@@ -99,7 +99,7 @@ void PairBuckCoulCutKokkos<DeviceType>::compute(int eflag_in, int vflag_in)
   }
   if (vflag_atom) {
     memoryKK->destroy_kokkos(k_vatom,vatom);
-    memoryKK->create_kokkos(k_vatom,vatom,maxvatom,6,"pair:vatom");
+    memoryKK->create_kokkos(k_vatom,vatom,maxvatom,"pair:vatom");
     d_vatom = k_vatom.view<DeviceType>();
   }
 
@@ -296,10 +296,10 @@ void PairBuckCoulCutKokkos<DeviceType>::init_style()
   int irequest = neighbor->nrequest - 1;
 
   neighbor->requests[irequest]->
-    kokkos_host = Kokkos::Impl::is_same<DeviceType,LMPHostType>::value &&
-    !Kokkos::Impl::is_same<DeviceType,LMPDeviceType>::value;
+    kokkos_host = std::is_same<DeviceType,LMPHostType>::value &&
+    !std::is_same<DeviceType,LMPDeviceType>::value;
   neighbor->requests[irequest]->
-    kokkos_device = Kokkos::Impl::is_same<DeviceType,LMPDeviceType>::value;
+    kokkos_device = std::is_same<DeviceType,LMPDeviceType>::value;
 
   if (neighflag == FULL) {
     neighbor->requests[irequest]->full = 1;
diff --git a/src/KOKKOS/pair_buck_coul_long_kokkos.cpp b/src/KOKKOS/pair_buck_coul_long_kokkos.cpp
index fdf395684a..29aca38a77 100644
--- a/src/KOKKOS/pair_buck_coul_long_kokkos.cpp
+++ b/src/KOKKOS/pair_buck_coul_long_kokkos.cpp
@@ -116,7 +116,7 @@ void PairBuckCoulLongKokkos<DeviceType>::compute(int eflag_in, int vflag_in)
   }
   if (vflag_atom) {
     memoryKK->destroy_kokkos(k_vatom,vatom);
-    memoryKK->create_kokkos(k_vatom,vatom,maxvatom,6,"pair:vatom");
+    memoryKK->create_kokkos(k_vatom,vatom,maxvatom,"pair:vatom");
     d_vatom = k_vatom.view<DeviceType>();
   }
 
@@ -456,10 +456,10 @@ void PairBuckCoulLongKokkos<DeviceType>::init_style()
   int irequest = neighbor->nrequest - 1;
 
   neighbor->requests[irequest]->
-    kokkos_host = Kokkos::Impl::is_same<DeviceType,LMPHostType>::value &&
-    !Kokkos::Impl::is_same<DeviceType,LMPDeviceType>::value;
+    kokkos_host = std::is_same<DeviceType,LMPHostType>::value &&
+    !std::is_same<DeviceType,LMPDeviceType>::value;
   neighbor->requests[irequest]->
-    kokkos_device = Kokkos::Impl::is_same<DeviceType,LMPDeviceType>::value;
+    kokkos_device = std::is_same<DeviceType,LMPDeviceType>::value;
 
   if (neighflag == FULL) {
     neighbor->requests[irequest]->full = 1;
diff --git a/src/KOKKOS/pair_buck_kokkos.cpp b/src/KOKKOS/pair_buck_kokkos.cpp
index 375d0dc1ea..990c9e94a6 100644
--- a/src/KOKKOS/pair_buck_kokkos.cpp
+++ b/src/KOKKOS/pair_buck_kokkos.cpp
@@ -86,7 +86,7 @@ void PairBuckKokkos<DeviceType>::compute(int eflag_in, int vflag_in)
   }
   if (vflag_atom) {
     memoryKK->destroy_kokkos(k_vatom,vatom);
-    memoryKK->create_kokkos(k_vatom,vatom,maxvatom,6,"pair:vatom");
+    memoryKK->create_kokkos(k_vatom,vatom,maxvatom,"pair:vatom");
     d_vatom = k_vatom.view<DeviceType>();
   }
 
@@ -218,10 +218,10 @@ void PairBuckKokkos<DeviceType>::init_style()
   int irequest = neighbor->nrequest - 1;
 
   neighbor->requests[irequest]->
-    kokkos_host = Kokkos::Impl::is_same<DeviceType,LMPHostType>::value &&
-    !Kokkos::Impl::is_same<DeviceType,LMPDeviceType>::value;
+    kokkos_host = std::is_same<DeviceType,LMPHostType>::value &&
+    !std::is_same<DeviceType,LMPDeviceType>::value;
   neighbor->requests[irequest]->
-    kokkos_device = Kokkos::Impl::is_same<DeviceType,LMPDeviceType>::value;
+    kokkos_device = std::is_same<DeviceType,LMPDeviceType>::value;
 
   if (neighflag == FULL) {
     neighbor->requests[irequest]->full = 1;
diff --git a/src/KOKKOS/pair_coul_cut_kokkos.cpp b/src/KOKKOS/pair_coul_cut_kokkos.cpp
index 5a1a6eefac..2e3f76463d 100644
--- a/src/KOKKOS/pair_coul_cut_kokkos.cpp
+++ b/src/KOKKOS/pair_coul_cut_kokkos.cpp
@@ -82,7 +82,7 @@ void PairCoulCutKokkos<DeviceType>::compute(int eflag_in, int vflag_in)
   }
   if (vflag_atom) {
     memoryKK->destroy_kokkos(k_vatom,vatom);
-    memoryKK->create_kokkos(k_vatom,vatom,maxvatom,6,"pair:vatom");
+    memoryKK->create_kokkos(k_vatom,vatom,maxvatom,"pair:vatom");
     d_vatom = k_vatom.view<DeviceType>();
   }
 
@@ -220,10 +220,10 @@ void PairCoulCutKokkos<DeviceType>::init_style()
   int irequest = neighbor->nrequest - 1;
 
   neighbor->requests[irequest]->
-    kokkos_host = Kokkos::Impl::is_same<DeviceType,LMPHostType>::value &&
-    !Kokkos::Impl::is_same<DeviceType,LMPDeviceType>::value;
+    kokkos_host = std::is_same<DeviceType,LMPHostType>::value &&
+    !std::is_same<DeviceType,LMPDeviceType>::value;
   neighbor->requests[irequest]->
-    kokkos_device = Kokkos::Impl::is_same<DeviceType,LMPDeviceType>::value;
+    kokkos_device = std::is_same<DeviceType,LMPDeviceType>::value;
 
   if (neighflag == FULL) {
     neighbor->requests[irequest]->full = 1;
diff --git a/src/KOKKOS/pair_coul_debye_kokkos.cpp b/src/KOKKOS/pair_coul_debye_kokkos.cpp
index 8dd7e4f3d2..b212bdc53a 100644
--- a/src/KOKKOS/pair_coul_debye_kokkos.cpp
+++ b/src/KOKKOS/pair_coul_debye_kokkos.cpp
@@ -92,7 +92,7 @@ void PairCoulDebyeKokkos<DeviceType>::compute(int eflag_in, int vflag_in)
   }
   if (vflag_atom) {
     memoryKK->destroy_kokkos(k_vatom,vatom);
-    memoryKK->create_kokkos(k_vatom,vatom,maxvatom,6,"pair:vatom");
+    memoryKK->create_kokkos(k_vatom,vatom,maxvatom,"pair:vatom");
     d_vatom = k_vatom.view<DeviceType>();
   }
 
@@ -265,10 +265,10 @@ void PairCoulDebyeKokkos<DeviceType>::init_style()
   int irequest = neighbor->nrequest - 1;
 
   neighbor->requests[irequest]->
-    kokkos_host = Kokkos::Impl::is_same<DeviceType,LMPHostType>::value &&
-    !Kokkos::Impl::is_same<DeviceType,LMPDeviceType>::value;
+    kokkos_host = std::is_same<DeviceType,LMPHostType>::value &&
+    !std::is_same<DeviceType,LMPDeviceType>::value;
   neighbor->requests[irequest]->
-    kokkos_device = Kokkos::Impl::is_same<DeviceType,LMPDeviceType>::value;
+    kokkos_device = std::is_same<DeviceType,LMPDeviceType>::value;
 
   if (neighflag == FULL) {
     neighbor->requests[irequest]->full = 1;
diff --git a/src/KOKKOS/pair_coul_dsf_kokkos.cpp b/src/KOKKOS/pair_coul_dsf_kokkos.cpp
index 836b12ba39..62e205d8fd 100644
--- a/src/KOKKOS/pair_coul_dsf_kokkos.cpp
+++ b/src/KOKKOS/pair_coul_dsf_kokkos.cpp
@@ -84,7 +84,7 @@ void PairCoulDSFKokkos<DeviceType>::compute(int eflag_in, int vflag_in)
   }
   if (vflag_atom) {
     memoryKK->destroy_kokkos(k_vatom,vatom);
-    memoryKK->create_kokkos(k_vatom,vatom,maxvatom,6,"pair:vatom");
+    memoryKK->create_kokkos(k_vatom,vatom,maxvatom,"pair:vatom");
     d_vatom = k_vatom.view<DeviceType>();
   }
 
@@ -202,10 +202,10 @@ void PairCoulDSFKokkos<DeviceType>::init_style()
   int irequest = neighbor->nrequest - 1;
 
   neighbor->requests[irequest]->
-    kokkos_host = Kokkos::Impl::is_same<DeviceType,LMPHostType>::value &&
-    !Kokkos::Impl::is_same<DeviceType,LMPDeviceType>::value;
+    kokkos_host = std::is_same<DeviceType,LMPHostType>::value &&
+    !std::is_same<DeviceType,LMPDeviceType>::value;
   neighbor->requests[irequest]->
-    kokkos_device = Kokkos::Impl::is_same<DeviceType,LMPDeviceType>::value;
+    kokkos_device = std::is_same<DeviceType,LMPDeviceType>::value;
 
   if (neighflag == FULL) {
     neighbor->requests[irequest]->full = 1;
@@ -227,8 +227,8 @@ KOKKOS_INLINE_FUNCTION
 void PairCoulDSFKokkos<DeviceType>::operator()(TagPairCoulDSFKernelA<NEIGHFLAG,NEWTON_PAIR,EVFLAG>, const int &ii, EV_FLOAT& ev) const {
 
   // The f array is atomic for Half/Thread neighbor style
-  Kokkos::View<F_FLOAT*[3], typename DAT::t_f_array::array_layout,DeviceType,Kokkos::MemoryTraits<AtomicF<NEIGHFLAG>::value> > a_f = f;
-  Kokkos::View<E_FLOAT*, typename DAT::t_efloat_1d::array_layout,DeviceType,Kokkos::MemoryTraits<AtomicF<NEIGHFLAG>::value> > v_eatom = k_eatom.view<DeviceType>();
+  Kokkos::View<F_FLOAT*[3], typename DAT::t_f_array::array_layout,typename KKDevice<DeviceType>::value,Kokkos::MemoryTraits<AtomicF<NEIGHFLAG>::value> > a_f = f;
+  Kokkos::View<E_FLOAT*, typename DAT::t_efloat_1d::array_layout,typename KKDevice<DeviceType>::value,Kokkos::MemoryTraits<AtomicF<NEIGHFLAG>::value> > v_eatom = k_eatom.view<DeviceType>();
 
   const int i = d_ilist[ii];
   const X_FLOAT xtmp = x(i,0);
@@ -323,8 +323,8 @@ void PairCoulDSFKokkos<DeviceType>::ev_tally(EV_FLOAT &ev, const int &i, const i
   const int VFLAG = vflag_either;
 
   // The eatom and vatom arrays are atomic for Half/Thread neighbor style
-  Kokkos::View<E_FLOAT*, typename DAT::t_efloat_1d::array_layout,DeviceType,Kokkos::MemoryTraits<AtomicF<NEIGHFLAG>::value> > v_eatom = k_eatom.view<DeviceType>();
-  Kokkos::View<F_FLOAT*[6], typename DAT::t_virial_array::array_layout,DeviceType,Kokkos::MemoryTraits<AtomicF<NEIGHFLAG>::value> > v_vatom = k_vatom.view<DeviceType>();
+  Kokkos::View<E_FLOAT*, typename DAT::t_efloat_1d::array_layout,typename KKDevice<DeviceType>::value,Kokkos::MemoryTraits<AtomicF<NEIGHFLAG>::value> > v_eatom = k_eatom.view<DeviceType>();
+  Kokkos::View<F_FLOAT*[6], typename DAT::t_virial_array::array_layout,typename KKDevice<DeviceType>::value,Kokkos::MemoryTraits<AtomicF<NEIGHFLAG>::value> > v_vatom = k_vatom.view<DeviceType>();
 
   if (EFLAG) {
     if (eflag_atom) {
diff --git a/src/KOKKOS/pair_coul_long_kokkos.cpp b/src/KOKKOS/pair_coul_long_kokkos.cpp
index 84b89c6373..c1f630a7a1 100644
--- a/src/KOKKOS/pair_coul_long_kokkos.cpp
+++ b/src/KOKKOS/pair_coul_long_kokkos.cpp
@@ -109,7 +109,7 @@ void PairCoulLongKokkos<DeviceType>::compute(int eflag_in, int vflag_in)
   }
   if (vflag_atom) {
     memoryKK->destroy_kokkos(k_vatom,vatom);
-    memoryKK->create_kokkos(k_vatom,vatom,maxvatom,6,"pair:vatom");
+    memoryKK->create_kokkos(k_vatom,vatom,maxvatom,"pair:vatom");
     d_vatom = k_vatom.view<DeviceType>();
   }
 
@@ -416,10 +416,10 @@ void PairCoulLongKokkos<DeviceType>::init_style()
   int irequest = neighbor->nrequest - 1;
 
   neighbor->requests[irequest]->
-    kokkos_host = Kokkos::Impl::is_same<DeviceType,LMPHostType>::value &&
-    !Kokkos::Impl::is_same<DeviceType,LMPDeviceType>::value;
+    kokkos_host = std::is_same<DeviceType,LMPHostType>::value &&
+    !std::is_same<DeviceType,LMPDeviceType>::value;
   neighbor->requests[irequest]->
-    kokkos_device = Kokkos::Impl::is_same<DeviceType,LMPDeviceType>::value;
+    kokkos_device = std::is_same<DeviceType,LMPDeviceType>::value;
 
   if (neighflag == FULL) {
     neighbor->requests[irequest]->full = 1;
diff --git a/src/KOKKOS/pair_coul_wolf_kokkos.cpp b/src/KOKKOS/pair_coul_wolf_kokkos.cpp
index 3ca8f16a79..907d088348 100644
--- a/src/KOKKOS/pair_coul_wolf_kokkos.cpp
+++ b/src/KOKKOS/pair_coul_wolf_kokkos.cpp
@@ -79,7 +79,7 @@ void PairCoulWolfKokkos<DeviceType>::compute(int eflag_in, int vflag_in)
   }
   if (vflag_atom) {
     memoryKK->destroy_kokkos(k_vatom,vatom);
-    memoryKK->create_kokkos(k_vatom,vatom,maxvatom,6,"pair:vatom");
+    memoryKK->create_kokkos(k_vatom,vatom,maxvatom,"pair:vatom");
     d_vatom = k_vatom.view<DeviceType>();
   }
 
@@ -203,10 +203,10 @@ void PairCoulWolfKokkos<DeviceType>::init_style()
   int irequest = neighbor->nrequest - 1;
 
   neighbor->requests[irequest]->
-    kokkos_host = Kokkos::Impl::is_same<DeviceType,LMPHostType>::value &&
-    !Kokkos::Impl::is_same<DeviceType,LMPDeviceType>::value;
+    kokkos_host = std::is_same<DeviceType,LMPHostType>::value &&
+    !std::is_same<DeviceType,LMPDeviceType>::value;
   neighbor->requests[irequest]->
-    kokkos_device = Kokkos::Impl::is_same<DeviceType,LMPDeviceType>::value;
+    kokkos_device = std::is_same<DeviceType,LMPDeviceType>::value;
 
   if (neighflag == FULL) {
     neighbor->requests[irequest]->full = 1;
@@ -228,8 +228,8 @@ KOKKOS_INLINE_FUNCTION
 void PairCoulWolfKokkos<DeviceType>::operator()(TagPairCoulWolfKernelA<NEIGHFLAG,NEWTON_PAIR,EVFLAG>, const int &ii, EV_FLOAT& ev) const {
 
   // The f array is atomic for Half/Thread neighbor style
-  Kokkos::View<F_FLOAT*[3], typename DAT::t_f_array::array_layout,DeviceType,Kokkos::MemoryTraits<AtomicF<NEIGHFLAG>::value> > a_f = f;
-  Kokkos::View<E_FLOAT*, typename DAT::t_efloat_1d::array_layout,DeviceType,Kokkos::MemoryTraits<AtomicF<NEIGHFLAG>::value> > v_eatom = k_eatom.view<DeviceType>();
+  Kokkos::View<F_FLOAT*[3], typename DAT::t_f_array::array_layout,typename KKDevice<DeviceType>::value,Kokkos::MemoryTraits<AtomicF<NEIGHFLAG>::value> > a_f = f;
+  Kokkos::View<E_FLOAT*, typename DAT::t_efloat_1d::array_layout,typename KKDevice<DeviceType>::value,Kokkos::MemoryTraits<AtomicF<NEIGHFLAG>::value> > v_eatom = k_eatom.view<DeviceType>();
 
   const int i = d_ilist[ii];
   const X_FLOAT xtmp = x(i,0);
@@ -325,8 +325,8 @@ void PairCoulWolfKokkos<DeviceType>::ev_tally(EV_FLOAT &ev, const int &i, const
   const int VFLAG = vflag_either;
 
   // The eatom and vatom arrays are atomic for Half/Thread neighbor style
-  Kokkos::View<E_FLOAT*, typename DAT::t_efloat_1d::array_layout,DeviceType,Kokkos::MemoryTraits<AtomicF<NEIGHFLAG>::value> > v_eatom = k_eatom.view<DeviceType>();
-  Kokkos::View<F_FLOAT*[6], typename DAT::t_virial_array::array_layout,DeviceType,Kokkos::MemoryTraits<AtomicF<NEIGHFLAG>::value> > v_vatom = k_vatom.view<DeviceType>();
+  Kokkos::View<E_FLOAT*, typename DAT::t_efloat_1d::array_layout,typename KKDevice<DeviceType>::value,Kokkos::MemoryTraits<AtomicF<NEIGHFLAG>::value> > v_eatom = k_eatom.view<DeviceType>();
+  Kokkos::View<F_FLOAT*[6], typename DAT::t_virial_array::array_layout,typename KKDevice<DeviceType>::value,Kokkos::MemoryTraits<AtomicF<NEIGHFLAG>::value> > v_vatom = k_vatom.view<DeviceType>();
 
   if (EFLAG) {
     if (eflag_atom) {
diff --git a/src/KOKKOS/pair_dpd_fdt_energy_kokkos.cpp b/src/KOKKOS/pair_dpd_fdt_energy_kokkos.cpp
index 21fd32a2c8..61d2707888 100644
--- a/src/KOKKOS/pair_dpd_fdt_energy_kokkos.cpp
+++ b/src/KOKKOS/pair_dpd_fdt_energy_kokkos.cpp
@@ -87,10 +87,10 @@ void PairDPDfdtEnergyKokkos<DeviceType>::init_style()
   int irequest = neighbor->nrequest - 1;
 
   neighbor->requests[irequest]->
-    kokkos_host = Kokkos::Impl::is_same<DeviceType,LMPHostType>::value &&
-    !Kokkos::Impl::is_same<DeviceType,LMPDeviceType>::value;
+    kokkos_host = std::is_same<DeviceType,LMPHostType>::value &&
+    !std::is_same<DeviceType,LMPDeviceType>::value;
   neighbor->requests[irequest]->
-    kokkos_device = Kokkos::Impl::is_same<DeviceType,LMPDeviceType>::value;
+    kokkos_device = std::is_same<DeviceType,LMPDeviceType>::value;
 
   if (neighflag == FULL) {
     neighbor->requests[irequest]->full = 1;
@@ -125,10 +125,10 @@ void PairDPDfdtEnergyKokkos<Kokkos::Cuda>::init_style()
   int irequest = neighbor->nrequest - 1;
 
   neighbor->requests[irequest]->
-    kokkos_host = Kokkos::Impl::is_same<Kokkos::Cuda,LMPHostType>::value &&
-    !Kokkos::Impl::is_same<Kokkos::Cuda,LMPDeviceType>::value;
+    kokkos_host = std::is_same<Kokkos::Cuda,LMPHostType>::value &&
+    !std::is_same<Kokkos::Cuda,LMPDeviceType>::value;
   neighbor->requests[irequest]->
-    kokkos_device = Kokkos::Impl::is_same<Kokkos::Cuda,LMPDeviceType>::value;
+    kokkos_device = std::is_same<Kokkos::Cuda,LMPDeviceType>::value;
 
   if (neighflag == FULL) {
     neighbor->requests[irequest]->full = 1;
@@ -170,7 +170,7 @@ void PairDPDfdtEnergyKokkos<DeviceType>::compute(int eflag_in, int vflag_in)
   }
   if (vflag_atom) {
     memoryKK->destroy_kokkos(k_vatom,vatom);
-    memoryKK->create_kokkos(k_vatom,vatom,maxvatom,6,"pair:vatom");
+    memoryKK->create_kokkos(k_vatom,vatom,maxvatom,"pair:vatom");
     d_vatom = k_vatom.template view<DeviceType>();
   }
 
@@ -389,7 +389,7 @@ KOKKOS_INLINE_FUNCTION
 void PairDPDfdtEnergyKokkos<DeviceType>::operator()(TagPairDPDfdtEnergyComputeSplit<NEIGHFLAG,NEWTON_PAIR,EVFLAG,STACKPARAMS>, const int &ii, EV_FLOAT& ev) const {
 
   // The f array is atomic for Half/Thread neighbor style
-  Kokkos::View<F_FLOAT*[3], typename DAT::t_f_array::array_layout,DeviceType,Kokkos::MemoryTraits<AtomicF<NEIGHFLAG>::value> > a_f = f;
+  Kokkos::View<F_FLOAT*[3], typename DAT::t_f_array::array_layout,typename KKDevice<DeviceType>::value,Kokkos::MemoryTraits<AtomicF<NEIGHFLAG>::value> > a_f = f;
 
   int i,j,jj,jnum,itype,jtype;
   double xtmp,ytmp,ztmp,delx,dely,delz,evdwl,fpair;
@@ -473,9 +473,9 @@ KOKKOS_INLINE_FUNCTION
 void PairDPDfdtEnergyKokkos<DeviceType>::operator()(TagPairDPDfdtEnergyComputeNoSplit<NEIGHFLAG,NEWTON_PAIR,EVFLAG,STACKPARAMS>, const int &ii, EV_FLOAT& ev) const {
 
   // These array are atomic for Half/Thread neighbor style
-  Kokkos::View<F_FLOAT*[3], typename DAT::t_f_array::array_layout,DeviceType,Kokkos::MemoryTraits<AtomicF<NEIGHFLAG>::value> > a_f = f;
-  Kokkos::View<E_FLOAT*, typename DAT::t_efloat_1d::array_layout,DeviceType,Kokkos::MemoryTraits<AtomicF<NEIGHFLAG>::value> > a_duCond = d_duCond;
-  Kokkos::View<E_FLOAT*, typename DAT::t_efloat_1d::array_layout,DeviceType,Kokkos::MemoryTraits<AtomicF<NEIGHFLAG>::value> > a_duMech = d_duMech;
+  Kokkos::View<F_FLOAT*[3], typename DAT::t_f_array::array_layout,typename KKDevice<DeviceType>::value,Kokkos::MemoryTraits<AtomicF<NEIGHFLAG>::value> > a_f = f;
+  Kokkos::View<E_FLOAT*, typename DAT::t_efloat_1d::array_layout,typename KKDevice<DeviceType>::value,Kokkos::MemoryTraits<AtomicF<NEIGHFLAG>::value> > a_duCond = d_duCond;
+  Kokkos::View<E_FLOAT*, typename DAT::t_efloat_1d::array_layout,typename KKDevice<DeviceType>::value,Kokkos::MemoryTraits<AtomicF<NEIGHFLAG>::value> > a_duMech = d_duMech;
 
   int i,j,jj,jnum,itype,jtype;
   double xtmp,ytmp,ztmp,delx,dely,delz,evdwl,fpair;
@@ -697,8 +697,8 @@ void PairDPDfdtEnergyKokkos<DeviceType>::ev_tally(EV_FLOAT &ev, const int &i, co
   const int VFLAG = vflag_either;
 
   // The eatom and vatom arrays are atomic for Half/Thread neighbor style
-  Kokkos::View<E_FLOAT*, typename DAT::t_efloat_1d::array_layout,DeviceType,Kokkos::MemoryTraits<AtomicF<NEIGHFLAG>::value> > v_eatom = k_eatom.view<DeviceType>();
-  Kokkos::View<F_FLOAT*[6], typename DAT::t_virial_array::array_layout,DeviceType,Kokkos::MemoryTraits<AtomicF<NEIGHFLAG>::value> > v_vatom = k_vatom.view<DeviceType>();
+  Kokkos::View<E_FLOAT*, typename DAT::t_efloat_1d::array_layout,typename KKDevice<DeviceType>::value,Kokkos::MemoryTraits<AtomicF<NEIGHFLAG>::value> > v_eatom = k_eatom.view<DeviceType>();
+  Kokkos::View<F_FLOAT*[6], typename DAT::t_virial_array::array_layout,typename KKDevice<DeviceType>::value,Kokkos::MemoryTraits<AtomicF<NEIGHFLAG>::value> > v_vatom = k_vatom.view<DeviceType>();
 
   if (EFLAG) {
     if (eflag_atom) {
diff --git a/src/KOKKOS/pair_eam_alloy_kokkos.cpp b/src/KOKKOS/pair_eam_alloy_kokkos.cpp
index 48bf63386a..1963722d86 100644
--- a/src/KOKKOS/pair_eam_alloy_kokkos.cpp
+++ b/src/KOKKOS/pair_eam_alloy_kokkos.cpp
@@ -83,7 +83,7 @@ void PairEAMAlloyKokkos<DeviceType>::compute(int eflag_in, int vflag_in)
   }
   if (vflag_atom) {
     memoryKK->destroy_kokkos(k_vatom,vatom);
-    memoryKK->create_kokkos(k_vatom,vatom,maxvatom,6,"pair:vatom");
+    memoryKK->create_kokkos(k_vatom,vatom,maxvatom,"pair:vatom");
     d_vatom = k_vatom.view<DeviceType>();
   }
 
@@ -302,10 +302,10 @@ void PairEAMAlloyKokkos<DeviceType>::init_style()
   int irequest = neighbor->nrequest - 1;
 
   neighbor->requests[irequest]->
-    kokkos_host = Kokkos::Impl::is_same<DeviceType,LMPHostType>::value &&
-    !Kokkos::Impl::is_same<DeviceType,LMPDeviceType>::value;
+    kokkos_host = std::is_same<DeviceType,LMPHostType>::value &&
+    !std::is_same<DeviceType,LMPDeviceType>::value;
   neighbor->requests[irequest]->
-    kokkos_device = Kokkos::Impl::is_same<DeviceType,LMPDeviceType>::value;
+    kokkos_device = std::is_same<DeviceType,LMPDeviceType>::value;
 
   if (neighflag == FULL) {
     neighbor->requests[irequest]->full = 1;
diff --git a/src/KOKKOS/pair_eam_alloy_kokkos.h b/src/KOKKOS/pair_eam_alloy_kokkos.h
index e1dd9ab47d..5796bdd1d4 100644
--- a/src/KOKKOS/pair_eam_alloy_kokkos.h
+++ b/src/KOKKOS/pair_eam_alloy_kokkos.h
@@ -129,14 +129,14 @@ class PairEAMAlloyKokkos : public PairEAM, public KokkosBase {
   typename ArrayTypes<DeviceType>::t_virial_array d_vatom;
 
   int need_dup;
-  Kokkos::Experimental::ScatterView<F_FLOAT*, typename DAT::t_ffloat_1d::array_layout,DeviceType,Kokkos::Experimental::ScatterSum,Kokkos::Experimental::ScatterDuplicated> dup_rho;
-  Kokkos::Experimental::ScatterView<F_FLOAT*[3], typename DAT::t_f_array::array_layout,DeviceType,Kokkos::Experimental::ScatterSum,Kokkos::Experimental::ScatterDuplicated> dup_f;
-  Kokkos::Experimental::ScatterView<E_FLOAT*, typename DAT::t_efloat_1d::array_layout,DeviceType,Kokkos::Experimental::ScatterSum,Kokkos::Experimental::ScatterDuplicated> dup_eatom;
-  Kokkos::Experimental::ScatterView<F_FLOAT*[6], typename DAT::t_virial_array::array_layout,DeviceType,Kokkos::Experimental::ScatterSum,Kokkos::Experimental::ScatterDuplicated> dup_vatom;
-  Kokkos::Experimental::ScatterView<F_FLOAT*, typename DAT::t_ffloat_1d::array_layout,DeviceType,Kokkos::Experimental::ScatterSum,Kokkos::Experimental::ScatterNonDuplicated> ndup_rho;
-  Kokkos::Experimental::ScatterView<F_FLOAT*[3], typename DAT::t_f_array::array_layout,DeviceType,Kokkos::Experimental::ScatterSum,Kokkos::Experimental::ScatterNonDuplicated> ndup_f;
-  Kokkos::Experimental::ScatterView<E_FLOAT*, typename DAT::t_efloat_1d::array_layout,DeviceType,Kokkos::Experimental::ScatterSum,Kokkos::Experimental::ScatterNonDuplicated> ndup_eatom;
-  Kokkos::Experimental::ScatterView<F_FLOAT*[6], typename DAT::t_virial_array::array_layout,DeviceType,Kokkos::Experimental::ScatterSum,Kokkos::Experimental::ScatterNonDuplicated> ndup_vatom;
+  Kokkos::Experimental::ScatterView<F_FLOAT*, typename DAT::t_ffloat_1d::array_layout,typename KKDevice<DeviceType>::value,Kokkos::Experimental::ScatterSum,Kokkos::Experimental::ScatterDuplicated> dup_rho;
+  Kokkos::Experimental::ScatterView<F_FLOAT*[3], typename DAT::t_f_array::array_layout,typename KKDevice<DeviceType>::value,Kokkos::Experimental::ScatterSum,Kokkos::Experimental::ScatterDuplicated> dup_f;
+  Kokkos::Experimental::ScatterView<E_FLOAT*, typename DAT::t_efloat_1d::array_layout,typename KKDevice<DeviceType>::value,Kokkos::Experimental::ScatterSum,Kokkos::Experimental::ScatterDuplicated> dup_eatom;
+  Kokkos::Experimental::ScatterView<F_FLOAT*[6], typename DAT::t_virial_array::array_layout,typename KKDevice<DeviceType>::value,Kokkos::Experimental::ScatterSum,Kokkos::Experimental::ScatterDuplicated> dup_vatom;
+  Kokkos::Experimental::ScatterView<F_FLOAT*, typename DAT::t_ffloat_1d::array_layout,typename KKDevice<DeviceType>::value,Kokkos::Experimental::ScatterSum,Kokkos::Experimental::ScatterNonDuplicated> ndup_rho;
+  Kokkos::Experimental::ScatterView<F_FLOAT*[3], typename DAT::t_f_array::array_layout,typename KKDevice<DeviceType>::value,Kokkos::Experimental::ScatterSum,Kokkos::Experimental::ScatterNonDuplicated> ndup_f;
+  Kokkos::Experimental::ScatterView<E_FLOAT*, typename DAT::t_efloat_1d::array_layout,typename KKDevice<DeviceType>::value,Kokkos::Experimental::ScatterSum,Kokkos::Experimental::ScatterNonDuplicated> ndup_eatom;
+  Kokkos::Experimental::ScatterView<F_FLOAT*[6], typename DAT::t_virial_array::array_layout,typename KKDevice<DeviceType>::value,Kokkos::Experimental::ScatterSum,Kokkos::Experimental::ScatterNonDuplicated> ndup_vatom;
 
   DAT::tdual_ffloat_1d k_rho;
   DAT::tdual_ffloat_1d k_fp;
diff --git a/src/KOKKOS/pair_eam_fs_kokkos.cpp b/src/KOKKOS/pair_eam_fs_kokkos.cpp
index 6536dd745a..a33923887b 100644
--- a/src/KOKKOS/pair_eam_fs_kokkos.cpp
+++ b/src/KOKKOS/pair_eam_fs_kokkos.cpp
@@ -83,7 +83,7 @@ void PairEAMFSKokkos<DeviceType>::compute(int eflag_in, int vflag_in)
   }
   if (vflag_atom) {
     memoryKK->destroy_kokkos(k_vatom,vatom);
-    memoryKK->create_kokkos(k_vatom,vatom,maxvatom,6,"pair:vatom");
+    memoryKK->create_kokkos(k_vatom,vatom,maxvatom,"pair:vatom");
     d_vatom = k_vatom.view<DeviceType>();
   }
 
@@ -302,10 +302,10 @@ void PairEAMFSKokkos<DeviceType>::init_style()
   int irequest = neighbor->nrequest - 1;
 
   neighbor->requests[irequest]->
-    kokkos_host = Kokkos::Impl::is_same<DeviceType,LMPHostType>::value &&
-    !Kokkos::Impl::is_same<DeviceType,LMPDeviceType>::value;
+    kokkos_host = std::is_same<DeviceType,LMPHostType>::value &&
+    !std::is_same<DeviceType,LMPDeviceType>::value;
   neighbor->requests[irequest]->
-    kokkos_device = Kokkos::Impl::is_same<DeviceType,LMPDeviceType>::value;
+    kokkos_device = std::is_same<DeviceType,LMPDeviceType>::value;
 
   if (neighflag == FULL) {
     neighbor->requests[irequest]->full = 1;
diff --git a/src/KOKKOS/pair_eam_fs_kokkos.h b/src/KOKKOS/pair_eam_fs_kokkos.h
index e93977869e..64e1c78d56 100644
--- a/src/KOKKOS/pair_eam_fs_kokkos.h
+++ b/src/KOKKOS/pair_eam_fs_kokkos.h
@@ -129,14 +129,14 @@ class PairEAMFSKokkos : public PairEAM, public KokkosBase {
   typename ArrayTypes<DeviceType>::t_virial_array d_vatom;
 
   int need_dup;
-  Kokkos::Experimental::ScatterView<F_FLOAT*, typename DAT::t_ffloat_1d::array_layout,DeviceType,Kokkos::Experimental::ScatterSum,Kokkos::Experimental::ScatterDuplicated> dup_rho;
-  Kokkos::Experimental::ScatterView<F_FLOAT*[3], typename DAT::t_f_array::array_layout,DeviceType,Kokkos::Experimental::ScatterSum,Kokkos::Experimental::ScatterDuplicated> dup_f;
-  Kokkos::Experimental::ScatterView<E_FLOAT*, typename DAT::t_efloat_1d::array_layout,DeviceType,Kokkos::Experimental::ScatterSum,Kokkos::Experimental::ScatterDuplicated> dup_eatom;
-  Kokkos::Experimental::ScatterView<F_FLOAT*[6], typename DAT::t_virial_array::array_layout,DeviceType,Kokkos::Experimental::ScatterSum,Kokkos::Experimental::ScatterDuplicated> dup_vatom;
-  Kokkos::Experimental::ScatterView<F_FLOAT*, typename DAT::t_ffloat_1d::array_layout,DeviceType,Kokkos::Experimental::ScatterSum,Kokkos::Experimental::ScatterNonDuplicated> ndup_rho;
-  Kokkos::Experimental::ScatterView<F_FLOAT*[3], typename DAT::t_f_array::array_layout,DeviceType,Kokkos::Experimental::ScatterSum,Kokkos::Experimental::ScatterNonDuplicated> ndup_f;
-  Kokkos::Experimental::ScatterView<E_FLOAT*, typename DAT::t_efloat_1d::array_layout,DeviceType,Kokkos::Experimental::ScatterSum,Kokkos::Experimental::ScatterNonDuplicated> ndup_eatom;
-  Kokkos::Experimental::ScatterView<F_FLOAT*[6], typename DAT::t_virial_array::array_layout,DeviceType,Kokkos::Experimental::ScatterSum,Kokkos::Experimental::ScatterNonDuplicated> ndup_vatom;
+  Kokkos::Experimental::ScatterView<F_FLOAT*, typename DAT::t_ffloat_1d::array_layout,typename KKDevice<DeviceType>::value,Kokkos::Experimental::ScatterSum,Kokkos::Experimental::ScatterDuplicated> dup_rho;
+  Kokkos::Experimental::ScatterView<F_FLOAT*[3], typename DAT::t_f_array::array_layout,typename KKDevice<DeviceType>::value,Kokkos::Experimental::ScatterSum,Kokkos::Experimental::ScatterDuplicated> dup_f;
+  Kokkos::Experimental::ScatterView<E_FLOAT*, typename DAT::t_efloat_1d::array_layout,typename KKDevice<DeviceType>::value,Kokkos::Experimental::ScatterSum,Kokkos::Experimental::ScatterDuplicated> dup_eatom;
+  Kokkos::Experimental::ScatterView<F_FLOAT*[6], typename DAT::t_virial_array::array_layout,typename KKDevice<DeviceType>::value,Kokkos::Experimental::ScatterSum,Kokkos::Experimental::ScatterDuplicated> dup_vatom;
+  Kokkos::Experimental::ScatterView<F_FLOAT*, typename DAT::t_ffloat_1d::array_layout,typename KKDevice<DeviceType>::value,Kokkos::Experimental::ScatterSum,Kokkos::Experimental::ScatterNonDuplicated> ndup_rho;
+  Kokkos::Experimental::ScatterView<F_FLOAT*[3], typename DAT::t_f_array::array_layout,typename KKDevice<DeviceType>::value,Kokkos::Experimental::ScatterSum,Kokkos::Experimental::ScatterNonDuplicated> ndup_f;
+  Kokkos::Experimental::ScatterView<E_FLOAT*, typename DAT::t_efloat_1d::array_layout,typename KKDevice<DeviceType>::value,Kokkos::Experimental::ScatterSum,Kokkos::Experimental::ScatterNonDuplicated> ndup_eatom;
+  Kokkos::Experimental::ScatterView<F_FLOAT*[6], typename DAT::t_virial_array::array_layout,typename KKDevice<DeviceType>::value,Kokkos::Experimental::ScatterSum,Kokkos::Experimental::ScatterNonDuplicated> ndup_vatom;
 
   DAT::tdual_ffloat_1d k_rho;
   DAT::tdual_ffloat_1d k_fp;
diff --git a/src/KOKKOS/pair_eam_kokkos.cpp b/src/KOKKOS/pair_eam_kokkos.cpp
index 3358fe709c..99a0756610 100644
--- a/src/KOKKOS/pair_eam_kokkos.cpp
+++ b/src/KOKKOS/pair_eam_kokkos.cpp
@@ -77,7 +77,7 @@ void PairEAMKokkos<DeviceType>::compute(int eflag_in, int vflag_in)
   }
   if (vflag_atom) {
     memoryKK->destroy_kokkos(k_vatom,vatom);
-    memoryKK->create_kokkos(k_vatom,vatom,maxvatom,6,"pair:vatom");
+    memoryKK->create_kokkos(k_vatom,vatom,maxvatom,"pair:vatom");
     d_vatom = k_vatom.view<DeviceType>();
   }
 
@@ -296,10 +296,10 @@ void PairEAMKokkos<DeviceType>::init_style()
   int irequest = neighbor->nrequest - 1;
 
   neighbor->requests[irequest]->
-    kokkos_host = Kokkos::Impl::is_same<DeviceType,LMPHostType>::value &&
-    !Kokkos::Impl::is_same<DeviceType,LMPDeviceType>::value;
+    kokkos_host = std::is_same<DeviceType,LMPHostType>::value &&
+    !std::is_same<DeviceType,LMPDeviceType>::value;
   neighbor->requests[irequest]->
-    kokkos_device = Kokkos::Impl::is_same<DeviceType,LMPDeviceType>::value;
+    kokkos_device = std::is_same<DeviceType,LMPDeviceType>::value;
 
   if (neighflag == FULL) {
     neighbor->requests[irequest]->full = 1;
diff --git a/src/KOKKOS/pair_eam_kokkos.h b/src/KOKKOS/pair_eam_kokkos.h
index 3bf89c549a..20bac4ed16 100644
--- a/src/KOKKOS/pair_eam_kokkos.h
+++ b/src/KOKKOS/pair_eam_kokkos.h
@@ -126,14 +126,14 @@ class PairEAMKokkos : public PairEAM, public KokkosBase {
   typename ArrayTypes<DeviceType>::t_virial_array d_vatom;
 
   int need_dup;
-  Kokkos::Experimental::ScatterView<F_FLOAT*, typename DAT::t_ffloat_1d::array_layout,DeviceType,Kokkos::Experimental::ScatterSum,Kokkos::Experimental::ScatterDuplicated> dup_rho;
-  Kokkos::Experimental::ScatterView<F_FLOAT*[3], typename DAT::t_f_array::array_layout,DeviceType,Kokkos::Experimental::ScatterSum,Kokkos::Experimental::ScatterDuplicated> dup_f;
-  Kokkos::Experimental::ScatterView<E_FLOAT*, typename DAT::t_efloat_1d::array_layout,DeviceType,Kokkos::Experimental::ScatterSum,Kokkos::Experimental::ScatterDuplicated> dup_eatom;
-  Kokkos::Experimental::ScatterView<F_FLOAT*[6], typename DAT::t_virial_array::array_layout,DeviceType,Kokkos::Experimental::ScatterSum,Kokkos::Experimental::ScatterDuplicated> dup_vatom;
-  Kokkos::Experimental::ScatterView<F_FLOAT*, typename DAT::t_ffloat_1d::array_layout,DeviceType,Kokkos::Experimental::ScatterSum,Kokkos::Experimental::ScatterNonDuplicated> ndup_rho;
-  Kokkos::Experimental::ScatterView<F_FLOAT*[3], typename DAT::t_f_array::array_layout,DeviceType,Kokkos::Experimental::ScatterSum,Kokkos::Experimental::ScatterNonDuplicated> ndup_f;
-  Kokkos::Experimental::ScatterView<E_FLOAT*, typename DAT::t_efloat_1d::array_layout,DeviceType,Kokkos::Experimental::ScatterSum,Kokkos::Experimental::ScatterNonDuplicated> ndup_eatom;
-  Kokkos::Experimental::ScatterView<F_FLOAT*[6], typename DAT::t_virial_array::array_layout,DeviceType,Kokkos::Experimental::ScatterSum,Kokkos::Experimental::ScatterNonDuplicated> ndup_vatom;
+  Kokkos::Experimental::ScatterView<F_FLOAT*, typename DAT::t_ffloat_1d::array_layout,typename KKDevice<DeviceType>::value,Kokkos::Experimental::ScatterSum,Kokkos::Experimental::ScatterDuplicated> dup_rho;
+  Kokkos::Experimental::ScatterView<F_FLOAT*[3], typename DAT::t_f_array::array_layout,typename KKDevice<DeviceType>::value,Kokkos::Experimental::ScatterSum,Kokkos::Experimental::ScatterDuplicated> dup_f;
+  Kokkos::Experimental::ScatterView<E_FLOAT*, typename DAT::t_efloat_1d::array_layout,typename KKDevice<DeviceType>::value,Kokkos::Experimental::ScatterSum,Kokkos::Experimental::ScatterDuplicated> dup_eatom;
+  Kokkos::Experimental::ScatterView<F_FLOAT*[6], typename DAT::t_virial_array::array_layout,typename KKDevice<DeviceType>::value,Kokkos::Experimental::ScatterSum,Kokkos::Experimental::ScatterDuplicated> dup_vatom;
+  Kokkos::Experimental::ScatterView<F_FLOAT*, typename DAT::t_ffloat_1d::array_layout,typename KKDevice<DeviceType>::value,Kokkos::Experimental::ScatterSum,Kokkos::Experimental::ScatterNonDuplicated> ndup_rho;
+  Kokkos::Experimental::ScatterView<F_FLOAT*[3], typename DAT::t_f_array::array_layout,typename KKDevice<DeviceType>::value,Kokkos::Experimental::ScatterSum,Kokkos::Experimental::ScatterNonDuplicated> ndup_f;
+  Kokkos::Experimental::ScatterView<E_FLOAT*, typename DAT::t_efloat_1d::array_layout,typename KKDevice<DeviceType>::value,Kokkos::Experimental::ScatterSum,Kokkos::Experimental::ScatterNonDuplicated> ndup_eatom;
+  Kokkos::Experimental::ScatterView<F_FLOAT*[6], typename DAT::t_virial_array::array_layout,typename KKDevice<DeviceType>::value,Kokkos::Experimental::ScatterSum,Kokkos::Experimental::ScatterNonDuplicated> ndup_vatom;
 
   DAT::tdual_ffloat_1d k_rho;
   DAT::tdual_ffloat_1d k_fp;
diff --git a/src/KOKKOS/pair_exp6_rx_kokkos.cpp b/src/KOKKOS/pair_exp6_rx_kokkos.cpp
index 8698687377..a64df08127 100644
--- a/src/KOKKOS/pair_exp6_rx_kokkos.cpp
+++ b/src/KOKKOS/pair_exp6_rx_kokkos.cpp
@@ -118,10 +118,10 @@ void PairExp6rxKokkos<DeviceType>::init_style()
   int irequest = neighbor->nrequest - 1;
 
   neighbor->requests[irequest]->
-    kokkos_host = Kokkos::Impl::is_same<DeviceType,LMPHostType>::value &&
-    !Kokkos::Impl::is_same<DeviceType,LMPDeviceType>::value;
+    kokkos_host = std::is_same<DeviceType,LMPHostType>::value &&
+    !std::is_same<DeviceType,LMPDeviceType>::value;
   neighbor->requests[irequest]->
-    kokkos_device = Kokkos::Impl::is_same<DeviceType,LMPDeviceType>::value;
+    kokkos_device = std::is_same<DeviceType,LMPDeviceType>::value;
 
   if (neighflag == FULL) {
     neighbor->requests[irequest]->full = 1;
@@ -158,7 +158,7 @@ void PairExp6rxKokkos<DeviceType>::compute(int eflag_in, int vflag_in)
   }
   if (vflag_atom) {
     memoryKK->destroy_kokkos(k_vatom,vatom);
-    memoryKK->create_kokkos(k_vatom,vatom,maxvatom,6,"pair:vatom");
+    memoryKK->create_kokkos(k_vatom,vatom,maxvatom,"pair:vatom");
     d_vatom = k_vatom.template view<DeviceType>();
   }
 
@@ -442,9 +442,9 @@ void PairExp6rxKokkos<DeviceType>::operator()(TagPairExp6rxCompute<NEIGHFLAG,NEW
   }
 
   // These arrays are atomic for Half/Thread neighbor style
-  Kokkos::View<F_FLOAT*[3], typename DAT::t_f_array::array_layout,DeviceType,Kokkos::MemoryTraits<AtomicF<NEIGHFLAG>::value> > a_f = f;
-  Kokkos::View<E_FLOAT*, typename DAT::t_efloat_1d::array_layout,DeviceType,Kokkos::MemoryTraits<AtomicF<NEIGHFLAG>::value> > a_uCG = uCG;
-  Kokkos::View<E_FLOAT*, typename DAT::t_efloat_1d::array_layout,DeviceType,Kokkos::MemoryTraits<AtomicF<NEIGHFLAG>::value> > a_uCGnew = uCGnew;
+  Kokkos::View<F_FLOAT*[3], typename DAT::t_f_array::array_layout,typename KKDevice<DeviceType>::value,Kokkos::MemoryTraits<AtomicF<NEIGHFLAG>::value> > a_f = f;
+  Kokkos::View<E_FLOAT*, typename DAT::t_efloat_1d::array_layout,typename KKDevice<DeviceType>::value,Kokkos::MemoryTraits<AtomicF<NEIGHFLAG>::value> > a_uCG = uCG;
+  Kokkos::View<E_FLOAT*, typename DAT::t_efloat_1d::array_layout,typename KKDevice<DeviceType>::value,Kokkos::MemoryTraits<AtomicF<NEIGHFLAG>::value> > a_uCGnew = uCGnew;
 
   int i,jj,jnum,itype,jtype;
   double xtmp,ytmp,ztmp,delx,dely,delz,evdwl,evdwlOld,fpair;
@@ -1183,9 +1183,9 @@ KOKKOS_INLINE_FUNCTION
 void PairExp6rxKokkos<DeviceType>::vectorized_operator(const int &ii, EV_FLOAT& ev) const
 {
   // These arrays are atomic for Half/Thread neighbor style
-  Kokkos::View<F_FLOAT*[3], typename DAT::t_f_array::array_layout,DeviceType,Kokkos::MemoryTraits<AtomicF<NEIGHFLAG>::value> > a_f = f;
-  Kokkos::View<E_FLOAT*, typename DAT::t_efloat_1d::array_layout,DeviceType,Kokkos::MemoryTraits<AtomicF<NEIGHFLAG>::value> > a_uCG = uCG;
-  Kokkos::View<E_FLOAT*, typename DAT::t_efloat_1d::array_layout,DeviceType,Kokkos::MemoryTraits<AtomicF<NEIGHFLAG>::value> > a_uCGnew = uCGnew;
+  Kokkos::View<F_FLOAT*[3], typename DAT::t_f_array::array_layout,typename KKDevice<DeviceType>::value,Kokkos::MemoryTraits<AtomicF<NEIGHFLAG>::value> > a_f = f;
+  Kokkos::View<E_FLOAT*, typename DAT::t_efloat_1d::array_layout,typename KKDevice<DeviceType>::value,Kokkos::MemoryTraits<AtomicF<NEIGHFLAG>::value> > a_uCG = uCG;
+  Kokkos::View<E_FLOAT*, typename DAT::t_efloat_1d::array_layout,typename KKDevice<DeviceType>::value,Kokkos::MemoryTraits<AtomicF<NEIGHFLAG>::value> > a_uCGnew = uCGnew;
 
   int tid = 0;
 #ifndef KOKKOS_ENABLE_CUDA
@@ -1944,7 +1944,7 @@ void PairExp6rxKokkos<DeviceType>::getMixingWeights(int id,double &epsilon1,doub
       fraction2 = nMolecules2/nTotal;
     }
 
-    // If Site1 or Site2 matches is a fluid, then compute the paramters
+    // If Site1 or Site2 matches is a fluid, then compute the parameters
     if (isOneFluidApprox(isite1) || isOneFluidApprox(isite2)) {
       if (isite1 == d_params[iparam].ispecies || isite2 == d_params[iparam].ispecies) continue;
       rmi = d_params[iparam].rm;
@@ -2271,7 +2271,7 @@ void PairExp6rxKokkos<DeviceType>::getMixingWeightsVect(const int np_total, int
       }
     }
 
-    // If Site1 or Site2 matches is a fluid, then compute the paramters
+    // If Site1 or Site2 matches is a fluid, then compute the parameters
     if (isOneFluidApprox(isite1) || isOneFluidApprox(isite2)) {
       if (isite1 == d_params[iparam].ispecies || isite2 == d_params[iparam].ispecies) continue;
 
@@ -2562,8 +2562,8 @@ void PairExp6rxKokkos<DeviceType>::ev_tally(EV_FLOAT &ev, const int &i, const in
   const int VFLAG = vflag_either;
 
   // The eatom and vatom arrays are atomic for Half/Thread neighbor style
-  Kokkos::View<E_FLOAT*, typename DAT::t_efloat_1d::array_layout,DeviceType,Kokkos::MemoryTraits<AtomicF<NEIGHFLAG>::value> > v_eatom = k_eatom.view<DeviceType>();
-  Kokkos::View<F_FLOAT*[6], typename DAT::t_virial_array::array_layout,DeviceType,Kokkos::MemoryTraits<AtomicF<NEIGHFLAG>::value> > v_vatom = k_vatom.view<DeviceType>();
+  Kokkos::View<E_FLOAT*, typename DAT::t_efloat_1d::array_layout,typename KKDevice<DeviceType>::value,Kokkos::MemoryTraits<AtomicF<NEIGHFLAG>::value> > v_eatom = k_eatom.view<DeviceType>();
+  Kokkos::View<F_FLOAT*[6], typename DAT::t_virial_array::array_layout,typename KKDevice<DeviceType>::value,Kokkos::MemoryTraits<AtomicF<NEIGHFLAG>::value> > v_vatom = k_vatom.view<DeviceType>();
 
   if (EFLAG) {
     if (eflag_atom) {
diff --git a/src/KOKKOS/pair_exp6_rx_kokkos.h b/src/KOKKOS/pair_exp6_rx_kokkos.h
index f3801db631..406353dd7c 100644
--- a/src/KOKKOS/pair_exp6_rx_kokkos.h
+++ b/src/KOKKOS/pair_exp6_rx_kokkos.h
@@ -45,10 +45,7 @@ struct PairExp6ParamDataTypeKokkos
 
    // Default constructor -- nullify everything.
    PairExp6ParamDataTypeKokkos<DeviceType>(void)
-      : n(0), epsilon1(NULL), alpha1(NULL), rm1(NULL), mixWtSite1(NULL),
-              epsilon2(NULL), alpha2(NULL), rm2(NULL), mixWtSite2(NULL),
-              epsilonOld1(NULL), alphaOld1(NULL), rmOld1(NULL), mixWtSite1old(NULL),
-              epsilonOld2(NULL), alphaOld2(NULL), rmOld2(NULL), mixWtSite2old(NULL)
+      : n(0)
    {}
 };
 
@@ -66,12 +63,6 @@ struct PairExp6ParamDataTypeKokkosVect
 
    // Default constructor -- nullify everything.
    PairExp6ParamDataTypeKokkosVect<DeviceType>(void)
-      : epsilon(NULL), rm3(NULL), alpha(NULL), xMolei(NULL), epsilon_old(NULL), rm3_old(NULL),
-        alpha_old(NULL), xMolei_old(NULL), fractionOFA(NULL), fraction1(NULL),
-        fraction2(NULL), nMoleculesOFA(NULL), nMolecules1(NULL), nMolecules2(NULL),
-        nTotal(NULL), fractionOFAold(NULL), fractionOld1(NULL), fractionOld2(NULL),
-        nMoleculesOFAold(NULL), nMoleculesOld1(NULL), nMoleculesOld2(NULL),
-        nTotalold(NULL)
    {}
 };
 
diff --git a/src/KOKKOS/pair_gran_hooke_history_kokkos.cpp b/src/KOKKOS/pair_gran_hooke_history_kokkos.cpp
index 5071bae32f..1acfc0d6a6 100644
--- a/src/KOKKOS/pair_gran_hooke_history_kokkos.cpp
+++ b/src/KOKKOS/pair_gran_hooke_history_kokkos.cpp
@@ -86,10 +86,10 @@ void PairGranHookeHistoryKokkos<DeviceType>::init_style()
   int irequest = neighbor->nrequest - 1;
 
   neighbor->requests[irequest]->
-    kokkos_host = Kokkos::Impl::is_same<DeviceType,LMPHostType>::value &&
-    !Kokkos::Impl::is_same<DeviceType,LMPDeviceType>::value;
+    kokkos_host = std::is_same<DeviceType,LMPHostType>::value &&
+    !std::is_same<DeviceType,LMPDeviceType>::value;
   neighbor->requests[irequest]->
-    kokkos_device = Kokkos::Impl::is_same<DeviceType,LMPDeviceType>::value;
+    kokkos_device = std::is_same<DeviceType,LMPDeviceType>::value;
 
   if (neighflag == HALF || neighflag == HALFTHREAD) {
     neighbor->requests[irequest]->full = 0;
@@ -125,7 +125,7 @@ void PairGranHookeHistoryKokkos<DeviceType>::compute(int eflag_in, int vflag_in)
   }
   if (vflag_atom) {
     memoryKK->destroy_kokkos(k_vatom,vatom);
-    memoryKK->create_kokkos(k_vatom,vatom,maxvatom,6,"pair:vatom");
+    memoryKK->create_kokkos(k_vatom,vatom,maxvatom,"pair:vatom");
     d_vatom = k_vatom.view<DeviceType>();
   }
 
@@ -320,8 +320,8 @@ KOKKOS_INLINE_FUNCTION
 void PairGranHookeHistoryKokkos<DeviceType>::operator()(TagPairGranHookeHistoryCompute<NEIGHFLAG,NEWTON_PAIR,EVFLAG,SHEARUPDATE>, const int ii, EV_FLOAT &ev) const {
 
   // The f and torque arrays are atomic for Half/Thread neighbor style
-  Kokkos::View<F_FLOAT*[3], typename DAT::t_f_array::array_layout,DeviceType,Kokkos::MemoryTraits<AtomicF<NEIGHFLAG>::value> > a_f = f;
-  Kokkos::View<F_FLOAT*[3], typename DAT::t_f_array::array_layout,DeviceType,Kokkos::MemoryTraits<AtomicF<NEIGHFLAG>::value> > a_torque = torque;
+  Kokkos::View<F_FLOAT*[3], typename DAT::t_f_array::array_layout,typename KKDevice<DeviceType>::value,Kokkos::MemoryTraits<AtomicF<NEIGHFLAG>::value> > a_f = f;
+  Kokkos::View<F_FLOAT*[3], typename DAT::t_f_array::array_layout,typename KKDevice<DeviceType>::value,Kokkos::MemoryTraits<AtomicF<NEIGHFLAG>::value> > a_torque = torque;
 
   const int i = d_ilist[ii];
   const X_FLOAT xtmp = x(i,0);
@@ -549,7 +549,7 @@ void PairGranHookeHistoryKokkos<DeviceType>::ev_tally_xyz_atom(EV_FLOAT &ev, int
                                                                F_FLOAT fx, F_FLOAT fy, F_FLOAT fz,
                                                                X_FLOAT delx, X_FLOAT dely, X_FLOAT delz) const
 {
-  Kokkos::View<F_FLOAT*[6], typename DAT::t_virial_array::array_layout,DeviceType,Kokkos::MemoryTraits<AtomicF<NEIGHFLAG>::value> > v_vatom = k_vatom.view<DeviceType>();
+  Kokkos::View<F_FLOAT*[6], typename DAT::t_virial_array::array_layout,typename KKDevice<DeviceType>::value,Kokkos::MemoryTraits<AtomicF<NEIGHFLAG>::value> > v_vatom = k_vatom.view<DeviceType>();
 
   F_FLOAT v[6];
 
diff --git a/src/KOKKOS/pair_kokkos.h b/src/KOKKOS/pair_kokkos.h
index 52a05b3991..54035c54eb 100644
--- a/src/KOKKOS/pair_kokkos.h
+++ b/src/KOKKOS/pair_kokkos.h
@@ -66,17 +66,17 @@ struct PairComputeFunctor  {
 
   // The force array is atomic for Half/Thread neighbor style
   //Kokkos::View<F_FLOAT*[3], typename DAT::t_f_array::array_layout,
-  //             device_type,Kokkos::MemoryTraits<AtomicF<NEIGHFLAG>::value> > f;
-  Kokkos::Experimental::ScatterView<F_FLOAT*[3], typename DAT::t_f_array::array_layout,device_type,Kokkos::Experimental::ScatterSum,NeedDup<NEIGHFLAG,device_type>::value > dup_f;
+  //             typename KKDevice<device_type>::value,Kokkos::MemoryTraits<AtomicF<NEIGHFLAG>::value> > f;
+  Kokkos::Experimental::ScatterView<F_FLOAT*[3], typename DAT::t_f_array::array_layout,typename KKDevice<device_type>::value,Kokkos::Experimental::ScatterSum,NeedDup<NEIGHFLAG,device_type>::value > dup_f;
 
   // The eatom and vatom arrays are atomic for Half/Thread neighbor style
   //Kokkos::View<E_FLOAT*, typename DAT::t_efloat_1d::array_layout,
-  //             device_type,Kokkos::MemoryTraits<AtomicF<NEIGHFLAG>::value> > eatom;
-  Kokkos::Experimental::ScatterView<E_FLOAT*, typename DAT::t_efloat_1d::array_layout,device_type,Kokkos::Experimental::ScatterSum,NeedDup<NEIGHFLAG,device_type>::value > dup_eatom;
+  //             typename KKDevice<device_type>::value,Kokkos::MemoryTraits<AtomicF<NEIGHFLAG>::value> > eatom;
+  Kokkos::Experimental::ScatterView<E_FLOAT*, typename DAT::t_efloat_1d::array_layout,typename KKDevice<device_type>::value,Kokkos::Experimental::ScatterSum,NeedDup<NEIGHFLAG,device_type>::value > dup_eatom;
 
   //Kokkos::View<F_FLOAT*[6], typename DAT::t_virial_array::array_layout,
-  //             device_type,Kokkos::MemoryTraits<AtomicF<NEIGHFLAG>::value> > vatom;
-  Kokkos::Experimental::ScatterView<F_FLOAT*[6], typename DAT::t_virial_array::array_layout,device_type,Kokkos::Experimental::ScatterSum,NeedDup<NEIGHFLAG,device_type>::value > dup_vatom;
+  //             typename KKDevice<device_type>::value,Kokkos::MemoryTraits<AtomicF<NEIGHFLAG>::value> > vatom;
+  Kokkos::Experimental::ScatterView<F_FLOAT*[6], typename DAT::t_virial_array::array_layout,typename KKDevice<device_type>::value,Kokkos::Experimental::ScatterSum,NeedDup<NEIGHFLAG,device_type>::value > dup_vatom;
 
 
 
@@ -444,7 +444,7 @@ struct PairComputeFunctor  {
           ev.evdwl += fev.evdwl;
 
         if (c.eflag_atom)
-          d_eatom(i,0) += fev.evdwl;
+          d_eatom(i) += fev.evdwl;
 
         if (c.vflag_global) {
           ev.v[0] += fev.v[0];
@@ -554,7 +554,7 @@ struct PairComputeFunctor  {
         }
 
         if (c.eflag_atom)
-          d_eatom(i,0) += fev.evdwl + fev.ecoul;
+          d_eatom(i) += fev.evdwl + fev.ecoul;
 
         if (c.vflag_global) {
           ev.v[0] += fev.v[0];
@@ -841,7 +841,7 @@ struct PairComputeFunctor<PairStyle,N2,STACKPARAMS,Specialisation>  {
 // pair_compute_neighlist will match - either the dummy version
 // or the real one further below.
 template<class PairStyle, unsigned NEIGHFLAG, class Specialisation>
-EV_FLOAT pair_compute_neighlist (PairStyle* fpair, typename Kokkos::Impl::enable_if<!((NEIGHFLAG&PairStyle::EnabledNeighFlags) != 0), NeighListKokkos<typename PairStyle::device_type>*>::type list) {
+EV_FLOAT pair_compute_neighlist (PairStyle* fpair, typename std::enable_if<!((NEIGHFLAG&PairStyle::EnabledNeighFlags) != 0), NeighListKokkos<typename PairStyle::device_type>*>::type list) {
   EV_FLOAT ev;
   (void) fpair;
   (void) list;
@@ -850,8 +850,13 @@ EV_FLOAT pair_compute_neighlist (PairStyle* fpair, typename Kokkos::Impl::enable
 }
 
 template<class FunctorStyle>
-int GetTeamSize(FunctorStyle& functor, int team_size, int vector_length) {
-    int team_size_max = Kokkos::TeamPolicy<>::team_size_max(functor);
+int GetTeamSize(FunctorStyle& functor, int inum, int reduce_flag, int team_size, int vector_length) {
+    int team_size_max;
+
+    if (reduce_flag)
+      team_size_max = Kokkos::TeamPolicy<>(inum,Kokkos::AUTO).team_size_max(functor,Kokkos::ParallelReduceTag());
+    else
+      team_size_max = Kokkos::TeamPolicy<>(inum,Kokkos::AUTO).team_size_max(functor,Kokkos::ParallelForTag());
 
 #ifdef KOKKOS_ENABLE_CUDA
     if(team_size*vector_length > team_size_max)
@@ -864,7 +869,7 @@ int GetTeamSize(FunctorStyle& functor, int team_size, int vector_length) {
 
 // Submit ParallelFor for NEIGHFLAG=HALF,HALFTHREAD,FULL,N2
 template<class PairStyle, unsigned NEIGHFLAG, class Specialisation>
-EV_FLOAT pair_compute_neighlist (PairStyle* fpair, typename Kokkos::Impl::enable_if<(NEIGHFLAG&PairStyle::EnabledNeighFlags) != 0, NeighListKokkos<typename PairStyle::device_type>*>::type list) {
+EV_FLOAT pair_compute_neighlist (PairStyle* fpair, typename std::enable_if<(NEIGHFLAG&PairStyle::EnabledNeighFlags) != 0, NeighListKokkos<typename PairStyle::device_type>*>::type list) {
   EV_FLOAT ev;
 
   if (!fpair->lmp->kokkos->neigh_thread_set)
@@ -877,13 +882,13 @@ EV_FLOAT pair_compute_neighlist (PairStyle* fpair, typename Kokkos::Impl::enable
 
     if(fpair->atom->ntypes > MAX_TYPES_STACKPARAMS) {
       PairComputeFunctor<PairStyle,NEIGHFLAG,false,Specialisation > ff(fpair,list);
-      atoms_per_team = GetTeamSize(ff, atoms_per_team, vector_length);
+      atoms_per_team = GetTeamSize(ff, list->inum, (fpair->eflag || fpair->vflag), atoms_per_team, vector_length);
       Kokkos::TeamPolicy<Kokkos::IndexType<int> > policy(list->inum,atoms_per_team,vector_length);
       if (fpair->eflag || fpair->vflag) Kokkos::parallel_reduce(policy,ff,ev);
       else                              Kokkos::parallel_for(policy,ff);
     } else {
       PairComputeFunctor<PairStyle,NEIGHFLAG,true,Specialisation > ff(fpair,list);
-      atoms_per_team = GetTeamSize(ff, atoms_per_team, vector_length);
+      atoms_per_team = GetTeamSize(ff, list->inum, (fpair->eflag || fpair->vflag), atoms_per_team, vector_length);
       Kokkos::TeamPolicy<Kokkos::IndexType<int> > policy(list->inum,atoms_per_team,vector_length);
       if (fpair->eflag || fpair->vflag) Kokkos::parallel_reduce(policy,ff,ev);
       else                              Kokkos::parallel_for(policy,ff);
diff --git a/src/KOKKOS/pair_lj_charmm_coul_charmm_implicit_kokkos.cpp b/src/KOKKOS/pair_lj_charmm_coul_charmm_implicit_kokkos.cpp
index ae6cb61b60..3996f49c29 100644
--- a/src/KOKKOS/pair_lj_charmm_coul_charmm_implicit_kokkos.cpp
+++ b/src/KOKKOS/pair_lj_charmm_coul_charmm_implicit_kokkos.cpp
@@ -116,7 +116,7 @@ void PairLJCharmmCoulCharmmImplicitKokkos<DeviceType>::compute(int eflag_in, int
   }
   if (vflag_atom) {
     memoryKK->destroy_kokkos(k_vatom,vatom);
-    memoryKK->create_kokkos(k_vatom,vatom,maxvatom,6,"pair:vatom");
+    memoryKK->create_kokkos(k_vatom,vatom,maxvatom,"pair:vatom");
     d_vatom = k_vatom.view<DeviceType>();
   }
 
@@ -462,10 +462,10 @@ void PairLJCharmmCoulCharmmImplicitKokkos<DeviceType>::init_style()
   int irequest = neighbor->nrequest - 1;
 
   neighbor->requests[irequest]->
-    kokkos_host = Kokkos::Impl::is_same<DeviceType,LMPHostType>::value &&
-    !Kokkos::Impl::is_same<DeviceType,LMPDeviceType>::value;
+    kokkos_host = std::is_same<DeviceType,LMPHostType>::value &&
+    !std::is_same<DeviceType,LMPDeviceType>::value;
   neighbor->requests[irequest]->
-    kokkos_device = Kokkos::Impl::is_same<DeviceType,LMPDeviceType>::value;
+    kokkos_device = std::is_same<DeviceType,LMPDeviceType>::value;
 
   if (neighflag == FULL) {
     neighbor->requests[irequest]->full = 1;
diff --git a/src/KOKKOS/pair_lj_charmm_coul_charmm_kokkos.cpp b/src/KOKKOS/pair_lj_charmm_coul_charmm_kokkos.cpp
index 9cdef267e2..44ba78fa7d 100644
--- a/src/KOKKOS/pair_lj_charmm_coul_charmm_kokkos.cpp
+++ b/src/KOKKOS/pair_lj_charmm_coul_charmm_kokkos.cpp
@@ -117,7 +117,7 @@ void PairLJCharmmCoulCharmmKokkos<DeviceType>::compute(int eflag_in, int vflag_i
   }
   if (vflag_atom) {
     memoryKK->destroy_kokkos(k_vatom,vatom);
-    memoryKK->create_kokkos(k_vatom,vatom,maxvatom,6,"pair:vatom");
+    memoryKK->create_kokkos(k_vatom,vatom,maxvatom,"pair:vatom");
     d_vatom = k_vatom.view<DeviceType>();
   }
 
@@ -464,10 +464,10 @@ void PairLJCharmmCoulCharmmKokkos<DeviceType>::init_style()
   int irequest = neighbor->nrequest - 1;
 
   neighbor->requests[irequest]->
-    kokkos_host = Kokkos::Impl::is_same<DeviceType,LMPHostType>::value &&
-    !Kokkos::Impl::is_same<DeviceType,LMPDeviceType>::value;
+    kokkos_host = std::is_same<DeviceType,LMPHostType>::value &&
+    !std::is_same<DeviceType,LMPDeviceType>::value;
   neighbor->requests[irequest]->
-    kokkos_device = Kokkos::Impl::is_same<DeviceType,LMPDeviceType>::value;
+    kokkos_device = std::is_same<DeviceType,LMPDeviceType>::value;
 
   if (neighflag == FULL) {
     neighbor->requests[irequest]->full = 1;
diff --git a/src/KOKKOS/pair_lj_charmm_coul_long_kokkos.cpp b/src/KOKKOS/pair_lj_charmm_coul_long_kokkos.cpp
index 441070248d..35724c7061 100644
--- a/src/KOKKOS/pair_lj_charmm_coul_long_kokkos.cpp
+++ b/src/KOKKOS/pair_lj_charmm_coul_long_kokkos.cpp
@@ -117,7 +117,7 @@ void PairLJCharmmCoulLongKokkos<DeviceType>::compute(int eflag_in, int vflag_in)
   }
   if (vflag_atom) {
     memoryKK->destroy_kokkos(k_vatom,vatom);
-    memoryKK->create_kokkos(k_vatom,vatom,maxvatom,6,"pair:vatom");
+    memoryKK->create_kokkos(k_vatom,vatom,maxvatom,"pair:vatom");
     d_vatom = k_vatom.view<DeviceType>();
   }
 
@@ -471,10 +471,10 @@ void PairLJCharmmCoulLongKokkos<DeviceType>::init_style()
   int irequest = neighbor->nrequest - 1;
 
   neighbor->requests[irequest]->
-    kokkos_host = Kokkos::Impl::is_same<DeviceType,LMPHostType>::value &&
-    !Kokkos::Impl::is_same<DeviceType,LMPDeviceType>::value;
+    kokkos_host = std::is_same<DeviceType,LMPHostType>::value &&
+    !std::is_same<DeviceType,LMPDeviceType>::value;
   neighbor->requests[irequest]->
-    kokkos_device = Kokkos::Impl::is_same<DeviceType,LMPDeviceType>::value;
+    kokkos_device = std::is_same<DeviceType,LMPDeviceType>::value;
 
   if (neighflag == FULL) {
     neighbor->requests[irequest]->full = 1;
diff --git a/src/KOKKOS/pair_lj_class2_coul_cut_kokkos.cpp b/src/KOKKOS/pair_lj_class2_coul_cut_kokkos.cpp
index 1f7642e965..37485c77f0 100644
--- a/src/KOKKOS/pair_lj_class2_coul_cut_kokkos.cpp
+++ b/src/KOKKOS/pair_lj_class2_coul_cut_kokkos.cpp
@@ -95,7 +95,7 @@ void PairLJClass2CoulCutKokkos<DeviceType>::compute(int eflag_in, int vflag_in)
   }
   if (vflag_atom) {
     memoryKK->destroy_kokkos(k_vatom,vatom);
-    memoryKK->create_kokkos(k_vatom,vatom,maxvatom,6,"pair:vatom");
+    memoryKK->create_kokkos(k_vatom,vatom,maxvatom,"pair:vatom");
     d_vatom = k_vatom.view<DeviceType>();
   }
 
@@ -298,10 +298,10 @@ void PairLJClass2CoulCutKokkos<DeviceType>::init_style()
   int irequest = neighbor->nrequest - 1;
 
   neighbor->requests[irequest]->
-    kokkos_host = Kokkos::Impl::is_same<DeviceType,LMPHostType>::value &&
-    !Kokkos::Impl::is_same<DeviceType,LMPDeviceType>::value;
+    kokkos_host = std::is_same<DeviceType,LMPHostType>::value &&
+    !std::is_same<DeviceType,LMPDeviceType>::value;
   neighbor->requests[irequest]->
-    kokkos_device = Kokkos::Impl::is_same<DeviceType,LMPDeviceType>::value;
+    kokkos_device = std::is_same<DeviceType,LMPDeviceType>::value;
 
   if (neighflag == FULL) {
     neighbor->requests[irequest]->full = 1;
diff --git a/src/KOKKOS/pair_lj_class2_coul_long_kokkos.cpp b/src/KOKKOS/pair_lj_class2_coul_long_kokkos.cpp
index c88ff9378e..1e01a275a4 100644
--- a/src/KOKKOS/pair_lj_class2_coul_long_kokkos.cpp
+++ b/src/KOKKOS/pair_lj_class2_coul_long_kokkos.cpp
@@ -102,7 +102,7 @@ void PairLJClass2CoulLongKokkos<DeviceType>::compute(int eflag_in, int vflag_in)
   }
   if (vflag_atom) {
     memoryKK->destroy_kokkos(k_vatom,vatom);
-    memoryKK->create_kokkos(k_vatom,vatom,maxvatom,6,"pair:vatom");
+    memoryKK->create_kokkos(k_vatom,vatom,maxvatom,"pair:vatom");
     d_vatom = k_vatom.view<DeviceType>();
   }
 
@@ -453,10 +453,10 @@ void PairLJClass2CoulLongKokkos<DeviceType>::init_style()
   int irequest = neighbor->nrequest - 1;
 
   neighbor->requests[irequest]->
-    kokkos_host = Kokkos::Impl::is_same<DeviceType,LMPHostType>::value &&
-    !Kokkos::Impl::is_same<DeviceType,LMPDeviceType>::value;
+    kokkos_host = std::is_same<DeviceType,LMPHostType>::value &&
+    !std::is_same<DeviceType,LMPDeviceType>::value;
   neighbor->requests[irequest]->
-    kokkos_device = Kokkos::Impl::is_same<DeviceType,LMPDeviceType>::value;
+    kokkos_device = std::is_same<DeviceType,LMPDeviceType>::value;
 
   if (neighflag == FULL) {
     neighbor->requests[irequest]->full = 1;
diff --git a/src/KOKKOS/pair_lj_class2_kokkos.cpp b/src/KOKKOS/pair_lj_class2_kokkos.cpp
index 9900e7361f..dd99ea9ab5 100644
--- a/src/KOKKOS/pair_lj_class2_kokkos.cpp
+++ b/src/KOKKOS/pair_lj_class2_kokkos.cpp
@@ -94,7 +94,7 @@ void PairLJClass2Kokkos<DeviceType>::compute(int eflag_in, int vflag_in)
   }
   if (vflag_atom) {
     memoryKK->destroy_kokkos(k_vatom,vatom);
-    memoryKK->create_kokkos(k_vatom,vatom,maxvatom,6,"pair:vatom");
+    memoryKK->create_kokkos(k_vatom,vatom,maxvatom,"pair:vatom");
     d_vatom = k_vatom.view<DeviceType>();
   }
 
@@ -236,10 +236,10 @@ void PairLJClass2Kokkos<DeviceType>::init_style()
   int irequest = neighbor->nrequest - 1;
 
   neighbor->requests[irequest]->
-    kokkos_host = Kokkos::Impl::is_same<DeviceType,LMPHostType>::value &&
-    !Kokkos::Impl::is_same<DeviceType,LMPDeviceType>::value;
+    kokkos_host = std::is_same<DeviceType,LMPHostType>::value &&
+    !std::is_same<DeviceType,LMPDeviceType>::value;
   neighbor->requests[irequest]->
-    kokkos_device = Kokkos::Impl::is_same<DeviceType,LMPDeviceType>::value;
+    kokkos_device = std::is_same<DeviceType,LMPDeviceType>::value;
 
   if (neighflag == FULL) {
     neighbor->requests[irequest]->full = 1;
diff --git a/src/KOKKOS/pair_lj_cut_coul_cut_kokkos.cpp b/src/KOKKOS/pair_lj_cut_coul_cut_kokkos.cpp
index 1601e4a4b2..36fd960c98 100644
--- a/src/KOKKOS/pair_lj_cut_coul_cut_kokkos.cpp
+++ b/src/KOKKOS/pair_lj_cut_coul_cut_kokkos.cpp
@@ -94,7 +94,7 @@ void PairLJCutCoulCutKokkos<DeviceType>::compute(int eflag_in, int vflag_in)
   }
   if (vflag_atom) {
     memoryKK->destroy_kokkos(k_vatom,vatom);
-    memoryKK->create_kokkos(k_vatom,vatom,maxvatom,6,"pair:vatom");
+    memoryKK->create_kokkos(k_vatom,vatom,maxvatom,"pair:vatom");
     d_vatom = k_vatom.view<DeviceType>();
   }
 
@@ -289,10 +289,10 @@ void PairLJCutCoulCutKokkos<DeviceType>::init_style()
   int irequest = neighbor->nrequest - 1;
 
   neighbor->requests[irequest]->
-    kokkos_host = Kokkos::Impl::is_same<DeviceType,LMPHostType>::value &&
-    !Kokkos::Impl::is_same<DeviceType,LMPDeviceType>::value;
+    kokkos_host = std::is_same<DeviceType,LMPHostType>::value &&
+    !std::is_same<DeviceType,LMPDeviceType>::value;
   neighbor->requests[irequest]->
-    kokkos_device = Kokkos::Impl::is_same<DeviceType,LMPDeviceType>::value;
+    kokkos_device = std::is_same<DeviceType,LMPDeviceType>::value;
 
   if (neighflag == FULL) {
     neighbor->requests[irequest]->full = 1;
diff --git a/src/KOKKOS/pair_lj_cut_coul_debye_kokkos.cpp b/src/KOKKOS/pair_lj_cut_coul_debye_kokkos.cpp
index 6e7d1eeb8b..3810a0140b 100644
--- a/src/KOKKOS/pair_lj_cut_coul_debye_kokkos.cpp
+++ b/src/KOKKOS/pair_lj_cut_coul_debye_kokkos.cpp
@@ -98,7 +98,7 @@ void PairLJCutCoulDebyeKokkos<DeviceType>::compute(int eflag_in, int vflag_in)
   }
   if (vflag_atom) {
     memoryKK->destroy_kokkos(k_vatom,vatom);
-    memoryKK->create_kokkos(k_vatom,vatom,maxvatom,6,"pair:vatom");
+    memoryKK->create_kokkos(k_vatom,vatom,maxvatom,"pair:vatom");
     d_vatom = k_vatom.view<DeviceType>();
   }
 
@@ -318,10 +318,10 @@ void PairLJCutCoulDebyeKokkos<DeviceType>::init_style()
   int irequest = neighbor->nrequest - 1;
 
   neighbor->requests[irequest]->
-    kokkos_host = Kokkos::Impl::is_same<DeviceType,LMPHostType>::value &&
-    !Kokkos::Impl::is_same<DeviceType,LMPDeviceType>::value;
+    kokkos_host = std::is_same<DeviceType,LMPHostType>::value &&
+    !std::is_same<DeviceType,LMPDeviceType>::value;
   neighbor->requests[irequest]->
-    kokkos_device = Kokkos::Impl::is_same<DeviceType,LMPDeviceType>::value;
+    kokkos_device = std::is_same<DeviceType,LMPDeviceType>::value;
 
   if (neighflag == FULL) {
     neighbor->requests[irequest]->full = 1;
diff --git a/src/KOKKOS/pair_lj_cut_coul_dsf_kokkos.cpp b/src/KOKKOS/pair_lj_cut_coul_dsf_kokkos.cpp
index b7dc7cc26d..b8818b1098 100644
--- a/src/KOKKOS/pair_lj_cut_coul_dsf_kokkos.cpp
+++ b/src/KOKKOS/pair_lj_cut_coul_dsf_kokkos.cpp
@@ -108,7 +108,7 @@ void PairLJCutCoulDSFKokkos<DeviceType>::compute(int eflag_in, int vflag_in)
   }
   if (vflag_atom) {
     memoryKK->destroy_kokkos(k_vatom,vatom);
-    memoryKK->create_kokkos(k_vatom,vatom,maxvatom,6,"pair:vatom");
+    memoryKK->create_kokkos(k_vatom,vatom,maxvatom,"pair:vatom");
     d_vatom = k_vatom.view<DeviceType>();
   }
 
@@ -311,10 +311,10 @@ void PairLJCutCoulDSFKokkos<DeviceType>::init_style()
   int irequest = neighbor->nrequest - 1;
 
   neighbor->requests[irequest]->
-    kokkos_host = Kokkos::Impl::is_same<DeviceType,LMPHostType>::value &&
-    !Kokkos::Impl::is_same<DeviceType,LMPDeviceType>::value;
+    kokkos_host = std::is_same<DeviceType,LMPHostType>::value &&
+    !std::is_same<DeviceType,LMPDeviceType>::value;
   neighbor->requests[irequest]->
-    kokkos_device = Kokkos::Impl::is_same<DeviceType,LMPDeviceType>::value;
+    kokkos_device = std::is_same<DeviceType,LMPDeviceType>::value;
 
   if (neighflag == FULL) {
     neighbor->requests[irequest]->full = 1;
diff --git a/src/KOKKOS/pair_lj_cut_coul_long_kokkos.cpp b/src/KOKKOS/pair_lj_cut_coul_long_kokkos.cpp
index 122d59af82..595f018857 100644
--- a/src/KOKKOS/pair_lj_cut_coul_long_kokkos.cpp
+++ b/src/KOKKOS/pair_lj_cut_coul_long_kokkos.cpp
@@ -109,7 +109,7 @@ void PairLJCutCoulLongKokkos<DeviceType>::compute(int eflag_in, int vflag_in)
   }
   if (vflag_atom) {
     memoryKK->destroy_kokkos(k_vatom,vatom);
-    memoryKK->create_kokkos(k_vatom,vatom,maxvatom,6,"pair:vatom");
+    memoryKK->create_kokkos(k_vatom,vatom,maxvatom,"pair:vatom");
     d_vatom = k_vatom.view<DeviceType>();
   }
 
@@ -452,10 +452,10 @@ void PairLJCutCoulLongKokkos<DeviceType>::init_style()
   int irequest = neighbor->nrequest - 1;
 
   neighbor->requests[irequest]->
-    kokkos_host = Kokkos::Impl::is_same<DeviceType,LMPHostType>::value &&
-    !Kokkos::Impl::is_same<DeviceType,LMPDeviceType>::value;
+    kokkos_host = std::is_same<DeviceType,LMPHostType>::value &&
+    !std::is_same<DeviceType,LMPDeviceType>::value;
   neighbor->requests[irequest]->
-    kokkos_device = Kokkos::Impl::is_same<DeviceType,LMPDeviceType>::value;
+    kokkos_device = std::is_same<DeviceType,LMPDeviceType>::value;
 
   if (neighflag == FULL) {
     neighbor->requests[irequest]->full = 1;
diff --git a/src/KOKKOS/pair_lj_cut_kokkos.cpp b/src/KOKKOS/pair_lj_cut_kokkos.cpp
index df750b7524..a4b2e90e07 100644
--- a/src/KOKKOS/pair_lj_cut_kokkos.cpp
+++ b/src/KOKKOS/pair_lj_cut_kokkos.cpp
@@ -93,7 +93,7 @@ void PairLJCutKokkos<DeviceType>::compute(int eflag_in, int vflag_in)
   }
   if (vflag_atom) {
     memoryKK->destroy_kokkos(k_vatom,vatom);
-    memoryKK->create_kokkos(k_vatom,vatom,maxvatom,6,"pair:vatom");
+    memoryKK->create_kokkos(k_vatom,vatom,maxvatom,"pair:vatom");
     d_vatom = k_vatom.view<DeviceType>();
   }
 
@@ -230,10 +230,10 @@ void PairLJCutKokkos<DeviceType>::init_style()
   int irequest = neighbor->nrequest - 1;
 
   neighbor->requests[irequest]->
-    kokkos_host = Kokkos::Impl::is_same<DeviceType,LMPHostType>::value &&
-    !Kokkos::Impl::is_same<DeviceType,LMPDeviceType>::value;
+    kokkos_host = std::is_same<DeviceType,LMPHostType>::value &&
+    !std::is_same<DeviceType,LMPDeviceType>::value;
   neighbor->requests[irequest]->
-    kokkos_device = Kokkos::Impl::is_same<DeviceType,LMPDeviceType>::value;
+    kokkos_device = std::is_same<DeviceType,LMPDeviceType>::value;
 
   if (neighflag == FULL) {
     neighbor->requests[irequest]->full = 1;
diff --git a/src/KOKKOS/pair_lj_expand_kokkos.cpp b/src/KOKKOS/pair_lj_expand_kokkos.cpp
index 38bebc364f..496a7a76ac 100644
--- a/src/KOKKOS/pair_lj_expand_kokkos.cpp
+++ b/src/KOKKOS/pair_lj_expand_kokkos.cpp
@@ -93,7 +93,7 @@ void PairLJExpandKokkos<DeviceType>::compute(int eflag_in, int vflag_in)
   }
   if (vflag_atom) {
     memoryKK->destroy_kokkos(k_vatom,vatom);
-    memoryKK->create_kokkos(k_vatom,vatom,maxvatom,6,"pair:vatom");
+    memoryKK->create_kokkos(k_vatom,vatom,maxvatom,"pair:vatom");
     d_vatom = k_vatom.view<DeviceType>();
   }
 
@@ -238,10 +238,10 @@ void PairLJExpandKokkos<DeviceType>::init_style()
   int irequest = neighbor->nrequest - 1;
 
   neighbor->requests[irequest]->
-    kokkos_host = Kokkos::Impl::is_same<DeviceType,LMPHostType>::value &&
-    !Kokkos::Impl::is_same<DeviceType,LMPDeviceType>::value;
+    kokkos_host = std::is_same<DeviceType,LMPHostType>::value &&
+    !std::is_same<DeviceType,LMPDeviceType>::value;
   neighbor->requests[irequest]->
-    kokkos_device = Kokkos::Impl::is_same<DeviceType,LMPDeviceType>::value;
+    kokkos_device = std::is_same<DeviceType,LMPDeviceType>::value;
 
   if (neighflag == FULL) {
     neighbor->requests[irequest]->full = 1;
diff --git a/src/KOKKOS/pair_lj_gromacs_coul_gromacs_kokkos.cpp b/src/KOKKOS/pair_lj_gromacs_coul_gromacs_kokkos.cpp
index a46a5c0441..de475fbc99 100644
--- a/src/KOKKOS/pair_lj_gromacs_coul_gromacs_kokkos.cpp
+++ b/src/KOKKOS/pair_lj_gromacs_coul_gromacs_kokkos.cpp
@@ -108,7 +108,7 @@ void PairLJGromacsCoulGromacsKokkos<DeviceType>::compute(int eflag_in, int vflag
   }
   if (vflag_atom) {
     memoryKK->destroy_kokkos(k_vatom,vatom);
-    memoryKK->create_kokkos(k_vatom,vatom,maxvatom,6,"pair:vatom");
+    memoryKK->create_kokkos(k_vatom,vatom,maxvatom,"pair:vatom");
     d_vatom = k_vatom.view<DeviceType>();
   }
 
@@ -447,10 +447,10 @@ void PairLJGromacsCoulGromacsKokkos<DeviceType>::init_style()
   int irequest = neighbor->nrequest - 1;
 
   neighbor->requests[irequest]->
-    kokkos_host = Kokkos::Impl::is_same<DeviceType,LMPHostType>::value &&
-    !Kokkos::Impl::is_same<DeviceType,LMPDeviceType>::value;
+    kokkos_host = std::is_same<DeviceType,LMPHostType>::value &&
+    !std::is_same<DeviceType,LMPDeviceType>::value;
   neighbor->requests[irequest]->
-    kokkos_device = Kokkos::Impl::is_same<DeviceType,LMPDeviceType>::value;
+    kokkos_device = std::is_same<DeviceType,LMPDeviceType>::value;
 
   if (neighflag == FULL) {
     neighbor->requests[irequest]->full = 1;
diff --git a/src/KOKKOS/pair_lj_gromacs_kokkos.cpp b/src/KOKKOS/pair_lj_gromacs_kokkos.cpp
index 23ed5e5595..fa2ab64ece 100644
--- a/src/KOKKOS/pair_lj_gromacs_kokkos.cpp
+++ b/src/KOKKOS/pair_lj_gromacs_kokkos.cpp
@@ -105,7 +105,7 @@ void PairLJGromacsKokkos<DeviceType>::compute(int eflag_in, int vflag_in)
   }
   if (vflag_atom) {
     memoryKK->destroy_kokkos(k_vatom,vatom);
-    memoryKK->create_kokkos(k_vatom,vatom,maxvatom,6,"pair:vatom");
+    memoryKK->create_kokkos(k_vatom,vatom,maxvatom,"pair:vatom");
     d_vatom = k_vatom.view<DeviceType>();
   }
 
@@ -285,10 +285,10 @@ void PairLJGromacsKokkos<DeviceType>::init_style()
   int irequest = neighbor->nrequest - 1;
 
   neighbor->requests[irequest]->
-    kokkos_host = Kokkos::Impl::is_same<DeviceType,LMPHostType>::value &&
-    !Kokkos::Impl::is_same<DeviceType,LMPDeviceType>::value;
+    kokkos_host = std::is_same<DeviceType,LMPHostType>::value &&
+    !std::is_same<DeviceType,LMPDeviceType>::value;
   neighbor->requests[irequest]->
-    kokkos_device = Kokkos::Impl::is_same<DeviceType,LMPDeviceType>::value;
+    kokkos_device = std::is_same<DeviceType,LMPDeviceType>::value;
 
   if (neighflag == FULL) {
     neighbor->requests[irequest]->full = 1;
diff --git a/src/KOKKOS/pair_lj_sdk_kokkos.cpp b/src/KOKKOS/pair_lj_sdk_kokkos.cpp
index 25f081d255..645f8a9159 100644
--- a/src/KOKKOS/pair_lj_sdk_kokkos.cpp
+++ b/src/KOKKOS/pair_lj_sdk_kokkos.cpp
@@ -94,7 +94,7 @@ void PairLJSDKKokkos<DeviceType>::compute(int eflag_in, int vflag_in)
   }
   if (vflag_atom) {
     memoryKK->destroy_kokkos(k_vatom,vatom);
-    memoryKK->create_kokkos(k_vatom,vatom,maxvatom,6,"pair:vatom");
+    memoryKK->create_kokkos(k_vatom,vatom,maxvatom,"pair:vatom");
     d_vatom = k_vatom.view<DeviceType>();
   }
 
@@ -268,10 +268,10 @@ void PairLJSDKKokkos<DeviceType>::init_style()
   int irequest = neighbor->nrequest - 1;
 
   neighbor->requests[irequest]->
-    kokkos_host = Kokkos::Impl::is_same<DeviceType,LMPHostType>::value &&
-    !Kokkos::Impl::is_same<DeviceType,LMPDeviceType>::value;
+    kokkos_host = std::is_same<DeviceType,LMPHostType>::value &&
+    !std::is_same<DeviceType,LMPDeviceType>::value;
   neighbor->requests[irequest]->
-    kokkos_device = Kokkos::Impl::is_same<DeviceType,LMPDeviceType>::value;
+    kokkos_device = std::is_same<DeviceType,LMPDeviceType>::value;
 
   if (neighflag == FULL) {
     neighbor->requests[irequest]->full = 1;
diff --git a/src/KOKKOS/pair_morse_kokkos.cpp b/src/KOKKOS/pair_morse_kokkos.cpp
index d3e3042a34..4e88c72518 100644
--- a/src/KOKKOS/pair_morse_kokkos.cpp
+++ b/src/KOKKOS/pair_morse_kokkos.cpp
@@ -100,7 +100,7 @@ void PairMorseKokkos<DeviceType>::compute(int eflag_in, int vflag_in)
   }
   if (vflag_atom) {
     memoryKK->destroy_kokkos(k_vatom,vatom);
-    memoryKK->create_kokkos(k_vatom,vatom,maxvatom,6,"pair:vatom");
+    memoryKK->create_kokkos(k_vatom,vatom,maxvatom,"pair:vatom");
     d_vatom = k_vatom.view<DeviceType>();
   }
 
@@ -247,10 +247,10 @@ void PairMorseKokkos<DeviceType>::init_style()
   int irequest = neighbor->nrequest - 1;
 
   neighbor->requests[irequest]->
-    kokkos_host = Kokkos::Impl::is_same<DeviceType,LMPHostType>::value &&
-    !Kokkos::Impl::is_same<DeviceType,LMPDeviceType>::value;
+    kokkos_host = std::is_same<DeviceType,LMPHostType>::value &&
+    !std::is_same<DeviceType,LMPDeviceType>::value;
   neighbor->requests[irequest]->
-    kokkos_device = Kokkos::Impl::is_same<DeviceType,LMPDeviceType>::value;
+    kokkos_device = std::is_same<DeviceType,LMPDeviceType>::value;
 
   if (neighflag == FULL) {
     neighbor->requests[irequest]->full = 1;
diff --git a/src/KOKKOS/pair_multi_lucy_rx_kokkos.cpp b/src/KOKKOS/pair_multi_lucy_rx_kokkos.cpp
index 75247859ed..edf8bb38ae 100644
--- a/src/KOKKOS/pair_multi_lucy_rx_kokkos.cpp
+++ b/src/KOKKOS/pair_multi_lucy_rx_kokkos.cpp
@@ -99,10 +99,10 @@ void PairMultiLucyRXKokkos<DeviceType>::init_style()
   int irequest = neighbor->nrequest - 1;
 
   neighbor->requests[irequest]->
-    kokkos_host = Kokkos::Impl::is_same<DeviceType,LMPHostType>::value &&
-    !Kokkos::Impl::is_same<DeviceType,LMPDeviceType>::value;
+    kokkos_host = std::is_same<DeviceType,LMPHostType>::value &&
+    !std::is_same<DeviceType,LMPDeviceType>::value;
   neighbor->requests[irequest]->
-    kokkos_device = Kokkos::Impl::is_same<DeviceType,LMPDeviceType>::value;
+    kokkos_device = std::is_same<DeviceType,LMPDeviceType>::value;
 
   if (neighflag == FULL) {
     neighbor->requests[irequest]->full = 1;
@@ -154,7 +154,7 @@ void PairMultiLucyRXKokkos<DeviceType>::compute_style(int eflag_in, int vflag_in
   }
   if (vflag_atom) {
     memoryKK->destroy_kokkos(k_vatom,vatom);
-    memoryKK->create_kokkos(k_vatom,vatom,maxvatom,6,"pair:vatom");
+    memoryKK->create_kokkos(k_vatom,vatom,maxvatom,"pair:vatom");
     d_vatom = k_vatom.template view<DeviceType>();
   }
 
@@ -270,7 +270,7 @@ KOKKOS_INLINE_FUNCTION
 void PairMultiLucyRXKokkos<DeviceType>::operator()(TagPairMultiLucyRXCompute<NEIGHFLAG,NEWTON_PAIR,EVFLAG,TABSTYLE>, const int &ii, EV_FLOAT& ev) const {
 
   // The f array is atomic for Half/Thread neighbor style
-  Kokkos::View<F_FLOAT*[3], typename DAT::t_f_array::array_layout,DeviceType,Kokkos::MemoryTraits<AtomicF<NEIGHFLAG>::value> > a_f = f;
+  Kokkos::View<F_FLOAT*[3], typename DAT::t_f_array::array_layout,typename KKDevice<DeviceType>::value,Kokkos::MemoryTraits<AtomicF<NEIGHFLAG>::value> > a_f = f;
 
   int i,jj,jnum,itype,jtype,itable;
   double xtmp,ytmp,ztmp,delx,dely,delz,evdwl,evdwlOld,fpair;
@@ -532,7 +532,7 @@ void PairMultiLucyRXKokkos<DeviceType>::operator()(TagPairMultiLucyRXComputeLoca
 
 
   // The rho array is atomic for Half/Thread neighbor style
-  Kokkos::View<E_FLOAT*, typename DAT::t_efloat_1d::array_layout,DeviceType,Kokkos::MemoryTraits<AtomicF<NEIGHFLAG>::value> > a_rho = rho;
+  Kokkos::View<E_FLOAT*, typename DAT::t_efloat_1d::array_layout,typename KKDevice<DeviceType>::value,Kokkos::MemoryTraits<AtomicF<NEIGHFLAG>::value> > a_rho = rho;
 
   const int i = d_ilist[ii];
 
@@ -771,8 +771,8 @@ void PairMultiLucyRXKokkos<DeviceType>::ev_tally(EV_FLOAT &ev, const int &i, con
   const int VFLAG = vflag_either;
 
   // The eatom and vatom arrays are atomic for Half/Thread neighbor style
-  Kokkos::View<E_FLOAT*, typename DAT::t_efloat_1d::array_layout,DeviceType,Kokkos::MemoryTraits<AtomicF<NEIGHFLAG>::value> > v_eatom = k_eatom.view<DeviceType>();
-  Kokkos::View<F_FLOAT*[6], typename DAT::t_virial_array::array_layout,DeviceType,Kokkos::MemoryTraits<AtomicF<NEIGHFLAG>::value> > v_vatom = k_vatom.view<DeviceType>();
+  Kokkos::View<E_FLOAT*, typename DAT::t_efloat_1d::array_layout,typename KKDevice<DeviceType>::value,Kokkos::MemoryTraits<AtomicF<NEIGHFLAG>::value> > v_eatom = k_eatom.view<DeviceType>();
+  Kokkos::View<F_FLOAT*[6], typename DAT::t_virial_array::array_layout,typename KKDevice<DeviceType>::value,Kokkos::MemoryTraits<AtomicF<NEIGHFLAG>::value> > v_vatom = k_vatom.view<DeviceType>();
 
   if (EFLAG) {
     if (eflag_atom) {
diff --git a/src/KOKKOS/pair_reaxc_kokkos.cpp b/src/KOKKOS/pair_reaxc_kokkos.cpp
index d0ad1f1b09..bec3f2e655 100644
--- a/src/KOKKOS/pair_reaxc_kokkos.cpp
+++ b/src/KOKKOS/pair_reaxc_kokkos.cpp
@@ -147,10 +147,10 @@ void PairReaxCKokkos<DeviceType>::init_style()
   int irequest = neighbor->nrequest - 1;
 
   neighbor->requests[irequest]->
-    kokkos_host = Kokkos::Impl::is_same<DeviceType,LMPHostType>::value &&
-    !Kokkos::Impl::is_same<DeviceType,LMPDeviceType>::value;
+    kokkos_host = std::is_same<DeviceType,LMPHostType>::value &&
+    !std::is_same<DeviceType,LMPDeviceType>::value;
   neighbor->requests[irequest]->
-    kokkos_device = Kokkos::Impl::is_same<DeviceType,LMPDeviceType>::value;
+    kokkos_device = std::is_same<DeviceType,LMPDeviceType>::value;
 
   if (neighflag == FULL) {
     neighbor->requests[irequest]->full = 1;
@@ -2477,7 +2477,7 @@ void PairReaxCKokkos<DeviceType>::operator()(PairReaxComputeAngular<NEIGHFLAG,EV
 
   auto v_f = ScatterViewHelper<NeedDup<NEIGHFLAG,DeviceType>::value,decltype(dup_f),decltype(ndup_f)>::get(dup_f,ndup_f);
   auto a_f = v_f.template access<AtomicDup<NEIGHFLAG,DeviceType>::value>();
-  Kokkos::View<F_FLOAT**, typename DAT::t_ffloat_2d_dl::array_layout,DeviceType,Kokkos::MemoryTraits<AtomicF<NEIGHFLAG>::value> > a_Cdbo = d_Cdbo;
+  Kokkos::View<F_FLOAT**, typename DAT::t_ffloat_2d_dl::array_layout,typename KKDevice<DeviceType>::value,Kokkos::MemoryTraits<AtomicF<NEIGHFLAG>::value> > a_Cdbo = d_Cdbo;
 
   auto v_CdDelta = ScatterViewHelper<NeedDup<NEIGHFLAG,DeviceType>::value,decltype(dup_CdDelta),decltype(ndup_CdDelta)>::get(dup_CdDelta,ndup_CdDelta);
   auto a_CdDelta = v_CdDelta.template access<AtomicDup<NEIGHFLAG,DeviceType>::value>();
@@ -2792,7 +2792,7 @@ void PairReaxCKokkos<DeviceType>::operator()(PairReaxComputeTorsion<NEIGHFLAG,EV
 
   auto v_CdDelta = ScatterViewHelper<NeedDup<NEIGHFLAG,DeviceType>::value,decltype(dup_CdDelta),decltype(ndup_CdDelta)>::get(dup_CdDelta,ndup_CdDelta);
   auto a_CdDelta = v_CdDelta.template access<AtomicDup<NEIGHFLAG,DeviceType>::value>();
-  Kokkos::View<F_FLOAT**, typename DAT::t_ffloat_2d_dl::array_layout,DeviceType,Kokkos::MemoryTraits<AtomicF<NEIGHFLAG>::value> > a_Cdbo = d_Cdbo;
+  Kokkos::View<F_FLOAT**, typename DAT::t_ffloat_2d_dl::array_layout,typename KKDevice<DeviceType>::value,Kokkos::MemoryTraits<AtomicF<NEIGHFLAG>::value> > a_Cdbo = d_Cdbo;
   //auto a_Cdbo = dup_Cdbo.template access<AtomicDup<NEIGHFLAG,DeviceType>::value>();
 
   // in reaxc_torsion_angles: j = i, k = j, i = k;
@@ -3311,9 +3311,9 @@ template<int NEIGHFLAG>
 KOKKOS_INLINE_FUNCTION
 void PairReaxCKokkos<DeviceType>::operator()(PairReaxUpdateBond<NEIGHFLAG>, const int &ii) const {
 
-  Kokkos::View<F_FLOAT**, typename DAT::t_ffloat_2d_dl::array_layout,DeviceType,Kokkos::MemoryTraits<AtomicF<NEIGHFLAG>::value> > a_Cdbo = d_Cdbo;
-  Kokkos::View<F_FLOAT**, typename DAT::t_ffloat_2d_dl::array_layout,DeviceType,Kokkos::MemoryTraits<AtomicF<NEIGHFLAG>::value> > a_Cdbopi = d_Cdbopi;
-  Kokkos::View<F_FLOAT**, typename DAT::t_ffloat_2d_dl::array_layout,DeviceType,Kokkos::MemoryTraits<AtomicF<NEIGHFLAG>::value> > a_Cdbopi2 = d_Cdbopi2;
+  Kokkos::View<F_FLOAT**, typename DAT::t_ffloat_2d_dl::array_layout,typename KKDevice<DeviceType>::value,Kokkos::MemoryTraits<AtomicF<NEIGHFLAG>::value> > a_Cdbo = d_Cdbo;
+  Kokkos::View<F_FLOAT**, typename DAT::t_ffloat_2d_dl::array_layout,typename KKDevice<DeviceType>::value,Kokkos::MemoryTraits<AtomicF<NEIGHFLAG>::value> > a_Cdbopi = d_Cdbopi;
+  Kokkos::View<F_FLOAT**, typename DAT::t_ffloat_2d_dl::array_layout,typename KKDevice<DeviceType>::value,Kokkos::MemoryTraits<AtomicF<NEIGHFLAG>::value> > a_Cdbopi2 = d_Cdbopi2;
   //auto a_Cdbo = dup_Cdbo.template access<AtomicDup<NEIGHFLAG,DeviceType>::value>();
   //auto a_Cdbopi = dup_Cdbopi.template access<AtomicDup<NEIGHFLAG,DeviceType>::value>();
   //auto a_Cdbopi2 = dup_Cdbopi2.template access<AtomicDup<NEIGHFLAG,DeviceType>::value>();
@@ -4026,7 +4026,7 @@ void PairReaxCKokkos<DeviceType>::ev_setup(int eflag, int vflag, int)
   if (vflag_atom && atom->nmax > maxvatom) {
     maxvatom = atom->nmax;
     memoryKK->destroy_kokkos(k_vatom,vatom);
-    memoryKK->create_kokkos(k_vatom,vatom,maxvatom,6,"pair:vatom");
+    memoryKK->create_kokkos(k_vatom,vatom,maxvatom,"pair:vatom");
     d_vatom = k_vatom.view<DeviceType>();
   }
 
diff --git a/src/KOKKOS/pair_reaxc_kokkos.h b/src/KOKKOS/pair_reaxc_kokkos.h
index 783ea33c4e..93ca4468ec 100644
--- a/src/KOKKOS/pair_reaxc_kokkos.h
+++ b/src/KOKKOS/pair_reaxc_kokkos.h
@@ -399,25 +399,25 @@ class PairReaxCKokkos : public PairReaxC {
   typename AT::t_ffloat_2d_dl d_C1dbopi2, d_C2dbopi2, d_C3dbopi2, d_C4dbopi2;
   typename AT::t_ffloat_2d_dl d_Cdbo, d_Cdbopi, d_Cdbopi2, d_dDeltap_self;
 
-  Kokkos::Experimental::ScatterView<F_FLOAT*, typename DAT::t_float_1d::array_layout,DeviceType,Kokkos::Experimental::ScatterSum,Kokkos::Experimental::ScatterDuplicated> dup_total_bo;
-  Kokkos::Experimental::ScatterView<F_FLOAT*, typename DAT::t_float_1d::array_layout,DeviceType,Kokkos::Experimental::ScatterSum,Kokkos::Experimental::ScatterDuplicated> dup_CdDelta;
-  Kokkos::Experimental::ScatterView<E_FLOAT*, typename DAT::t_efloat_1d::array_layout,DeviceType,Kokkos::Experimental::ScatterSum,Kokkos::Experimental::ScatterDuplicated> dup_eatom;
-  Kokkos::Experimental::ScatterView<F_FLOAT*[3], typename DAT::t_f_array::array_layout,DeviceType,Kokkos::Experimental::ScatterSum,Kokkos::Experimental::ScatterDuplicated> dup_f;
-  Kokkos::Experimental::ScatterView<F_FLOAT*[6], typename DAT::t_virial_array::array_layout,DeviceType,Kokkos::Experimental::ScatterSum,Kokkos::Experimental::ScatterDuplicated> dup_vatom;
-  Kokkos::Experimental::ScatterView<F_FLOAT**, typename DAT::t_ffloat_2d_dl::array_layout,DeviceType,Kokkos::Experimental::ScatterSum,Kokkos::Experimental::ScatterDuplicated> dup_dDeltap_self;
-  Kokkos::Experimental::ScatterView<F_FLOAT**, typename DAT::t_ffloat_2d_dl::array_layout,DeviceType,Kokkos::Experimental::ScatterSum,Kokkos::Experimental::ScatterDuplicated> dup_Cdbo;
-  Kokkos::Experimental::ScatterView<F_FLOAT**, typename DAT::t_ffloat_2d_dl::array_layout,DeviceType,Kokkos::Experimental::ScatterSum,Kokkos::Experimental::ScatterDuplicated> dup_Cdbopi;
-  Kokkos::Experimental::ScatterView<F_FLOAT**, typename DAT::t_ffloat_2d_dl::array_layout,DeviceType,Kokkos::Experimental::ScatterSum,Kokkos::Experimental::ScatterDuplicated> dup_Cdbopi2;
+  Kokkos::Experimental::ScatterView<F_FLOAT*, typename DAT::t_float_1d::array_layout,typename KKDevice<DeviceType>::value,Kokkos::Experimental::ScatterSum,Kokkos::Experimental::ScatterDuplicated> dup_total_bo;
+  Kokkos::Experimental::ScatterView<F_FLOAT*, typename DAT::t_float_1d::array_layout,typename KKDevice<DeviceType>::value,Kokkos::Experimental::ScatterSum,Kokkos::Experimental::ScatterDuplicated> dup_CdDelta;
+  Kokkos::Experimental::ScatterView<E_FLOAT*, typename DAT::t_efloat_1d::array_layout,typename KKDevice<DeviceType>::value,Kokkos::Experimental::ScatterSum,Kokkos::Experimental::ScatterDuplicated> dup_eatom;
+  Kokkos::Experimental::ScatterView<F_FLOAT*[3], typename DAT::t_f_array::array_layout,typename KKDevice<DeviceType>::value,Kokkos::Experimental::ScatterSum,Kokkos::Experimental::ScatterDuplicated> dup_f;
+  Kokkos::Experimental::ScatterView<F_FLOAT*[6], typename DAT::t_virial_array::array_layout,typename KKDevice<DeviceType>::value,Kokkos::Experimental::ScatterSum,Kokkos::Experimental::ScatterDuplicated> dup_vatom;
+  Kokkos::Experimental::ScatterView<F_FLOAT**, typename DAT::t_ffloat_2d_dl::array_layout,typename KKDevice<DeviceType>::value,Kokkos::Experimental::ScatterSum,Kokkos::Experimental::ScatterDuplicated> dup_dDeltap_self;
+  Kokkos::Experimental::ScatterView<F_FLOAT**, typename DAT::t_ffloat_2d_dl::array_layout,typename KKDevice<DeviceType>::value,Kokkos::Experimental::ScatterSum,Kokkos::Experimental::ScatterDuplicated> dup_Cdbo;
+  Kokkos::Experimental::ScatterView<F_FLOAT**, typename DAT::t_ffloat_2d_dl::array_layout,typename KKDevice<DeviceType>::value,Kokkos::Experimental::ScatterSum,Kokkos::Experimental::ScatterDuplicated> dup_Cdbopi;
+  Kokkos::Experimental::ScatterView<F_FLOAT**, typename DAT::t_ffloat_2d_dl::array_layout,typename KKDevice<DeviceType>::value,Kokkos::Experimental::ScatterSum,Kokkos::Experimental::ScatterDuplicated> dup_Cdbopi2;
 
-  Kokkos::Experimental::ScatterView<F_FLOAT*, typename DAT::t_float_1d::array_layout,DeviceType,Kokkos::Experimental::ScatterSum,Kokkos::Experimental::ScatterNonDuplicated> ndup_total_bo;
-  Kokkos::Experimental::ScatterView<F_FLOAT*, typename DAT::t_float_1d::array_layout,DeviceType,Kokkos::Experimental::ScatterSum,Kokkos::Experimental::ScatterNonDuplicated> ndup_CdDelta;
-  Kokkos::Experimental::ScatterView<E_FLOAT*, typename DAT::t_efloat_1d::array_layout,DeviceType,Kokkos::Experimental::ScatterSum,Kokkos::Experimental::ScatterNonDuplicated> ndup_eatom;
-  Kokkos::Experimental::ScatterView<F_FLOAT*[3], typename DAT::t_f_array::array_layout,DeviceType,Kokkos::Experimental::ScatterSum,Kokkos::Experimental::ScatterNonDuplicated> ndup_f;
-  Kokkos::Experimental::ScatterView<F_FLOAT*[6], typename DAT::t_virial_array::array_layout,DeviceType,Kokkos::Experimental::ScatterSum,Kokkos::Experimental::ScatterNonDuplicated> ndup_vatom;
-  Kokkos::Experimental::ScatterView<F_FLOAT**, typename DAT::t_ffloat_2d_dl::array_layout,DeviceType,Kokkos::Experimental::ScatterSum,Kokkos::Experimental::ScatterNonDuplicated> ndup_dDeltap_self;
-  Kokkos::Experimental::ScatterView<F_FLOAT**, typename DAT::t_ffloat_2d_dl::array_layout,DeviceType,Kokkos::Experimental::ScatterSum,Kokkos::Experimental::ScatterNonDuplicated> ndup_Cdbo;
-  Kokkos::Experimental::ScatterView<F_FLOAT**, typename DAT::t_ffloat_2d_dl::array_layout,DeviceType,Kokkos::Experimental::ScatterSum,Kokkos::Experimental::ScatterNonDuplicated> ndup_Cdbopi;
-  Kokkos::Experimental::ScatterView<F_FLOAT**, typename DAT::t_ffloat_2d_dl::array_layout,DeviceType,Kokkos::Experimental::ScatterSum,Kokkos::Experimental::ScatterNonDuplicated> ndup_Cdbopi2;
+  Kokkos::Experimental::ScatterView<F_FLOAT*, typename DAT::t_float_1d::array_layout,typename KKDevice<DeviceType>::value,Kokkos::Experimental::ScatterSum,Kokkos::Experimental::ScatterNonDuplicated> ndup_total_bo;
+  Kokkos::Experimental::ScatterView<F_FLOAT*, typename DAT::t_float_1d::array_layout,typename KKDevice<DeviceType>::value,Kokkos::Experimental::ScatterSum,Kokkos::Experimental::ScatterNonDuplicated> ndup_CdDelta;
+  Kokkos::Experimental::ScatterView<E_FLOAT*, typename DAT::t_efloat_1d::array_layout,typename KKDevice<DeviceType>::value,Kokkos::Experimental::ScatterSum,Kokkos::Experimental::ScatterNonDuplicated> ndup_eatom;
+  Kokkos::Experimental::ScatterView<F_FLOAT*[3], typename DAT::t_f_array::array_layout,typename KKDevice<DeviceType>::value,Kokkos::Experimental::ScatterSum,Kokkos::Experimental::ScatterNonDuplicated> ndup_f;
+  Kokkos::Experimental::ScatterView<F_FLOAT*[6], typename DAT::t_virial_array::array_layout,typename KKDevice<DeviceType>::value,Kokkos::Experimental::ScatterSum,Kokkos::Experimental::ScatterNonDuplicated> ndup_vatom;
+  Kokkos::Experimental::ScatterView<F_FLOAT**, typename DAT::t_ffloat_2d_dl::array_layout,typename KKDevice<DeviceType>::value,Kokkos::Experimental::ScatterSum,Kokkos::Experimental::ScatterNonDuplicated> ndup_dDeltap_self;
+  Kokkos::Experimental::ScatterView<F_FLOAT**, typename DAT::t_ffloat_2d_dl::array_layout,typename KKDevice<DeviceType>::value,Kokkos::Experimental::ScatterSum,Kokkos::Experimental::ScatterNonDuplicated> ndup_Cdbo;
+  Kokkos::Experimental::ScatterView<F_FLOAT**, typename DAT::t_ffloat_2d_dl::array_layout,typename KKDevice<DeviceType>::value,Kokkos::Experimental::ScatterSum,Kokkos::Experimental::ScatterNonDuplicated> ndup_Cdbopi;
+  Kokkos::Experimental::ScatterView<F_FLOAT**, typename DAT::t_ffloat_2d_dl::array_layout,typename KKDevice<DeviceType>::value,Kokkos::Experimental::ScatterSum,Kokkos::Experimental::ScatterNonDuplicated> ndup_Cdbopi2;
 
   int need_dup;
 
diff --git a/src/KOKKOS/pair_snap_kokkos.h b/src/KOKKOS/pair_snap_kokkos.h
index 8586c4bdab..f5e5c63454 100644
--- a/src/KOKKOS/pair_snap_kokkos.h
+++ b/src/KOKKOS/pair_snap_kokkos.h
@@ -37,12 +37,14 @@ struct TagPairSNAPBeta{};
 struct TagPairSNAPComputeNeigh{};
 struct TagPairSNAPPreUi{};
 struct TagPairSNAPComputeUi{};
+struct TagPairSNAPComputeUiCPU{};
 struct TagPairSNAPComputeZi{};
 struct TagPairSNAPComputeBi{};
 struct TagPairSNAPZeroYi{};
 struct TagPairSNAPComputeYi{};
-struct TagPairSNAPComputeDuidrj{};
-struct TagPairSNAPComputeDeidrj{};
+struct TagPairSNAPComputeFusedDeidrj{};
+struct TagPairSNAPComputeDuidrjCPU{};
+struct TagPairSNAPComputeDeidrjCPU{};
 
 template<class DeviceType>
 class PairSNAPKokkos : public PairSNAP {
@@ -62,6 +64,12 @@ public:
   void compute(int, int);
   double memory_usage();
 
+  template<class TagStyle>
+  void check_team_size_for(int, int&, int);
+
+  template<class TagStyle>
+  void check_team_size_reduce(int, int&, int);
+
   template<int NEIGHFLAG, int EVFLAG>
   KOKKOS_INLINE_FUNCTION
   void operator() (TagPairSNAPComputeForce<NEIGHFLAG,EVFLAG>,const typename Kokkos::TeamPolicy<DeviceType, TagPairSNAPComputeForce<NEIGHFLAG,EVFLAG> >::member_type& team) const;
@@ -74,11 +82,14 @@ public:
   void operator() (TagPairSNAPComputeNeigh,const typename Kokkos::TeamPolicy<DeviceType, TagPairSNAPComputeNeigh>::member_type& team) const;
 
   KOKKOS_INLINE_FUNCTION
-  void operator() (TagPairSNAPPreUi,const int& ii) const;
+  void operator() (TagPairSNAPPreUi,const typename Kokkos::TeamPolicy<DeviceType, TagPairSNAPPreUi>::member_type& team) const;
 
   KOKKOS_INLINE_FUNCTION
   void operator() (TagPairSNAPComputeUi,const typename Kokkos::TeamPolicy<DeviceType, TagPairSNAPComputeUi>::member_type& team) const;
 
+  KOKKOS_INLINE_FUNCTION
+  void operator() (TagPairSNAPComputeUiCPU,const typename Kokkos::TeamPolicy<DeviceType, TagPairSNAPComputeUiCPU>::member_type& team) const;
+
   KOKKOS_INLINE_FUNCTION
   void operator() (TagPairSNAPComputeZi,const int& ii) const;
 
@@ -86,16 +97,19 @@ public:
   void operator() (TagPairSNAPComputeBi,const typename Kokkos::TeamPolicy<DeviceType, TagPairSNAPComputeBi>::member_type& team) const;
 
   KOKKOS_INLINE_FUNCTION
-  void operator() (TagPairSNAPZeroYi,const int& ii) const;
+  void operator() (TagPairSNAPZeroYi,const typename Kokkos::TeamPolicy<DeviceType, TagPairSNAPZeroYi>::member_type& team) const;
 
   KOKKOS_INLINE_FUNCTION
   void operator() (TagPairSNAPComputeYi,const int& ii) const;
 
   KOKKOS_INLINE_FUNCTION
-  void operator() (TagPairSNAPComputeDuidrj,const typename Kokkos::TeamPolicy<DeviceType, TagPairSNAPComputeDuidrj>::member_type& team) const;
+  void operator() (TagPairSNAPComputeFusedDeidrj,const typename Kokkos::TeamPolicy<DeviceType, TagPairSNAPComputeFusedDeidrj>::member_type& team) const;
 
   KOKKOS_INLINE_FUNCTION
-  void operator() (TagPairSNAPComputeDeidrj,const typename Kokkos::TeamPolicy<DeviceType, TagPairSNAPComputeDeidrj>::member_type& team) const;
+  void operator() (TagPairSNAPComputeDuidrjCPU,const typename Kokkos::TeamPolicy<DeviceType, TagPairSNAPComputeDuidrjCPU>::member_type& team) const;
+
+  KOKKOS_INLINE_FUNCTION
+  void operator() (TagPairSNAPComputeDeidrjCPU,const typename Kokkos::TeamPolicy<DeviceType, TagPairSNAPComputeDeidrjCPU>::member_type& team) const;
 
   KOKKOS_INLINE_FUNCTION
   void operator() (TagPairSNAPBeta,const typename Kokkos::TeamPolicy<DeviceType, TagPairSNAPBeta>::member_type& team) const;
@@ -122,7 +136,8 @@ protected:
   t_dbvec dbvec;
   SNAKokkos<DeviceType> snaKK;
 
-  int inum,max_neighs,chunk_offset;
+  int inum,max_neighs,chunk_size,chunk_offset;
+  int host_flag;
 
   int eflag,vflag;
 
@@ -173,10 +188,10 @@ inline double dist2(double* x,double* y);
   typename AT::t_int_1d_randomread type;
 
   int need_dup;
-  Kokkos::Experimental::ScatterView<F_FLOAT*[3], typename DAT::t_f_array::array_layout,DeviceType,Kokkos::Experimental::ScatterSum,Kokkos::Experimental::ScatterDuplicated> dup_f;
-  Kokkos::Experimental::ScatterView<F_FLOAT*[6], typename DAT::t_virial_array::array_layout,DeviceType,Kokkos::Experimental::ScatterSum,Kokkos::Experimental::ScatterDuplicated> dup_vatom;
-  Kokkos::Experimental::ScatterView<F_FLOAT*[3], typename DAT::t_f_array::array_layout,DeviceType,Kokkos::Experimental::ScatterSum,Kokkos::Experimental::ScatterNonDuplicated> ndup_f;
-  Kokkos::Experimental::ScatterView<F_FLOAT*[6], typename DAT::t_virial_array::array_layout,DeviceType,Kokkos::Experimental::ScatterSum,Kokkos::Experimental::ScatterNonDuplicated> ndup_vatom;
+  Kokkos::Experimental::ScatterView<F_FLOAT*[3], typename DAT::t_f_array::array_layout,typename KKDevice<DeviceType>::value,Kokkos::Experimental::ScatterSum,Kokkos::Experimental::ScatterDuplicated> dup_f;
+  Kokkos::Experimental::ScatterView<F_FLOAT*[6], typename DAT::t_virial_array::array_layout,typename KKDevice<DeviceType>::value,Kokkos::Experimental::ScatterSum,Kokkos::Experimental::ScatterDuplicated> dup_vatom;
+  Kokkos::Experimental::ScatterView<F_FLOAT*[3], typename DAT::t_f_array::array_layout,typename KKDevice<DeviceType>::value,Kokkos::Experimental::ScatterSum,Kokkos::Experimental::ScatterNonDuplicated> ndup_f;
+  Kokkos::Experimental::ScatterView<F_FLOAT*[6], typename DAT::t_virial_array::array_layout,typename KKDevice<DeviceType>::value,Kokkos::Experimental::ScatterSum,Kokkos::Experimental::ScatterNonDuplicated> ndup_vatom;
 
   friend void pair_virial_fdotr_compute<PairSNAPKokkos>(PairSNAPKokkos*);
 
diff --git a/src/KOKKOS/pair_snap_kokkos_impl.h b/src/KOKKOS/pair_snap_kokkos_impl.h
index ef01ec5ea3..e838b6a070 100644
--- a/src/KOKKOS/pair_snap_kokkos_impl.h
+++ b/src/KOKKOS/pair_snap_kokkos_impl.h
@@ -12,7 +12,8 @@
 ------------------------------------------------------------------------- */
 
 /* ----------------------------------------------------------------------
-   Contributing authors: Christian Trott (SNL), Stan Moore (SNL)
+   Contributing authors: Christian Trott (SNL), Stan Moore (SNL),
+                         Evan Weinberg (NVIDIA)
 ------------------------------------------------------------------------- */
 
 #include <cmath>
@@ -60,6 +61,8 @@ PairSNAPKokkos<DeviceType>::PairSNAPKokkos(LAMMPS *lmp) : PairSNAP(lmp)
   k_cutsq = tdual_fparams("PairSNAPKokkos::cutsq",atom->ntypes+1,atom->ntypes+1);
   auto d_cutsq = k_cutsq.template view<DeviceType>();
   rnd_cutsq = d_cutsq;
+
+  host_flag = (execution_space == Host);
 }
 
 /* ---------------------------------------------------------------------- */
@@ -90,10 +93,10 @@ void PairSNAPKokkos<DeviceType>::init_style()
   int irequest = neighbor->request(this,instance_me);
 
   neighbor->requests[irequest]->
-    kokkos_host = Kokkos::Impl::is_same<DeviceType,LMPHostType>::value &&
-    !Kokkos::Impl::is_same<DeviceType,LMPDeviceType>::value;
+    kokkos_host = std::is_same<DeviceType,LMPHostType>::value &&
+    !std::is_same<DeviceType,LMPDeviceType>::value;
   neighbor->requests[irequest]->
-    kokkos_device = Kokkos::Impl::is_same<DeviceType,LMPDeviceType>::value;
+    kokkos_device = std::is_same<DeviceType,LMPDeviceType>::value;
 
   if (neighflag == HALF || neighflag == HALFTHREAD) { // still need atomics, even though using a full neigh list
     neighbor->requests[irequest]->full = 1;
@@ -144,7 +147,7 @@ void PairSNAPKokkos<DeviceType>::compute(int eflag_in, int vflag_in)
   }
   if (vflag_atom) {
     memoryKK->destroy_kokkos(k_vatom,vatom);
-    memoryKK->create_kokkos(k_vatom,vatom,maxvatom,6,"pair:vatom");
+    memoryKK->create_kokkos(k_vatom,vatom,maxvatom,"pair:vatom");
     d_vatom = k_vatom.view<DeviceType>();
   }
 
@@ -181,30 +184,28 @@ void PairSNAPKokkos<DeviceType>::compute(int eflag_in, int vflag_in)
     if (max_neighs<num_neighs) max_neighs = num_neighs;
   }*/
   max_neighs = 0;
-  Kokkos::parallel_reduce("PairSNAPKokkos::find_max_neighs",inum, FindMaxNumNeighs<DeviceType>(k_list), Kokkos::Experimental::Max<int>(max_neighs));
+  Kokkos::parallel_reduce("PairSNAPKokkos::find_max_neighs",inum, FindMaxNumNeighs<DeviceType>(k_list), Kokkos::Max<int>(max_neighs));
 
-  int vector_length = 1;
-  int team_size = 1;
-  int team_size_max = Kokkos::TeamPolicy<DeviceType>::team_size_max(*this);
-#ifdef KOKKOS_ENABLE_CUDA
-  team_size = 32;//max_neighs;
-  if (team_size*vector_length > team_size_max)
-    team_size = team_size_max/vector_length;
-#endif
+  int vector_length_default = 1;
+  int team_size_default = 1;
+  if (!host_flag)
+    team_size_default = 32;//max_neighs;
 
   if (beta_max < inum) {
     beta_max = inum;
-    d_beta = Kokkos::View<F_FLOAT**, DeviceType>("PairSNAPKokkos:beta",inum,ncoeff);
+    d_beta = Kokkos::View<F_FLOAT**, DeviceType>("PairSNAPKokkos:beta",ncoeff,inum);
     d_ninside = Kokkos::View<int*, DeviceType>("PairSNAPKokkos:ninside",inum);
   }
 
-  int chunk_size = MIN(2000,inum);
+  chunk_size = MIN(chunksize,inum); // "chunksize" variable is set by user
   chunk_offset = 0;
 
   snaKK.grow_rij(chunk_size,max_neighs);
 
   EV_FLOAT ev;
 
+  int idxu_max = snaKK.idxu_max;
+
   while (chunk_offset < inum) { // chunk up loop to prevent running out of memory
 
     EV_FLOAT ev_tmp;
@@ -213,77 +214,172 @@ void PairSNAPKokkos<DeviceType>::compute(int eflag_in, int vflag_in)
       chunk_size = inum - chunk_offset;
 
     //ComputeNeigh
-    typename Kokkos::TeamPolicy<DeviceType, TagPairSNAPComputeNeigh> policy_neigh(chunk_size,team_size,vector_length);
-    Kokkos::parallel_for("ComputeNeigh",policy_neigh,*this);
+    {
+      int vector_length = vector_length_default;
+      int team_size = team_size_default;
+      check_team_size_for<TagPairSNAPComputeNeigh>(chunk_size,team_size,vector_length);
+      typename Kokkos::TeamPolicy<DeviceType,TagPairSNAPComputeNeigh> policy_neigh(chunk_size,team_size,vector_length);
+      Kokkos::parallel_for("ComputeNeigh",policy_neigh,*this);
+    }
 
     //PreUi
-    typename Kokkos::RangePolicy<DeviceType, TagPairSNAPPreUi> policy_preui(0,chunk_size);
-    Kokkos::parallel_for("PreUi",policy_preui,*this);
+    {
+      int vector_length = vector_length_default;
+      int team_size = team_size_default;
+      if (!host_flag)
+        vector_length = 32;
+      check_team_size_for<TagPairSNAPPreUi>(chunk_size,team_size,vector_length);
+      typename Kokkos::TeamPolicy<DeviceType,TagPairSNAPPreUi> policy_preui((chunk_size+team_size-1)/team_size,team_size,vector_length);
+      Kokkos::parallel_for("PreUi",policy_preui,*this);
+    }
 
-    //ComputeUi
-    typename Kokkos::TeamPolicy<DeviceType, TagPairSNAPComputeUi> policy_ui(((inum+team_size-1)/team_size)*max_neighs,team_size,vector_length);
-    Kokkos::parallel_for("ComputeUi",policy_ui,*this);
+    // ComputeUI
+    {
+      int vector_length = vector_length_default;
+      int team_size = team_size_default;
+      if (host_flag) { // CPU
+        // Run a fused calculation of ulist and accumulation into ulisttot using atomics
+
+        typename Kokkos::TeamPolicy<DeviceType,TagPairSNAPComputeUiCPU> policy_ui_cpu(((chunk_size+team_size-1)/team_size)*max_neighs,team_size,vector_length);
+
+        Kokkos::parallel_for("ComputeUiCPU",policy_ui_cpu,*this);
+      } else { // GPU, vector parallelism, shared memory, separate ulist and ulisttot to avoid atomics
+
+        vector_length = 32;
+        team_size = 4; // need to cap b/c of shared memory reqs
+        check_team_size_for<TagPairSNAPComputeUi>(chunk_size,team_size,vector_length);
+
+        // scratch size: 2 * team_size * (twojmax+1)^2, to cover all `m1`,`m2` values
+        //   2 is for double buffer
+
+        const int tile_size = (twojmax+1)*(twojmax+1);
+        typedef Kokkos::View< SNAcomplex*,
+                              Kokkos::DefaultExecutionSpace::scratch_memory_space,
+                              Kokkos::MemoryTraits<Kokkos::Unmanaged> >
+                ScratchViewType;
+        int scratch_size = ScratchViewType::shmem_size( 2 * team_size * tile_size );
+
+        typename Kokkos::TeamPolicy<DeviceType,TagPairSNAPComputeUi> policy_ui(((chunk_size+team_size-1)/team_size)*max_neighs,team_size,vector_length);
+        policy_ui = policy_ui.set_scratch_size(0, Kokkos::PerTeam( scratch_size ));
+
+        Kokkos::parallel_for("ComputeUi",policy_ui,*this);
+
+      }
+    }
 
-    //Ulisttot transpose
-    snaKK.transpose_ulisttot();
 
     //Compute bispectrum
     if (quadraticflag || eflag) {
       //ComputeZi
       int idxz_max = snaKK.idxz_max;
-      typename Kokkos::RangePolicy<DeviceType, TagPairSNAPComputeZi> policy_zi(0,chunk_size*idxz_max);
+      typename Kokkos::RangePolicy<DeviceType,TagPairSNAPComputeZi> policy_zi(0,chunk_size*idxz_max);
       Kokkos::parallel_for("ComputeZi",policy_zi,*this);
 
       //ComputeBi
-      typename Kokkos::TeamPolicy<DeviceType, TagPairSNAPComputeBi> policy_bi(chunk_size,team_size,vector_length);
+      int vector_length = vector_length_default;
+      int team_size = team_size_default;
+      check_team_size_for<TagPairSNAPComputeBi>(chunk_size,team_size,vector_length);
+      typename Kokkos::TeamPolicy<DeviceType,TagPairSNAPComputeBi> policy_bi(chunk_size,team_size,vector_length);
       Kokkos::parallel_for("ComputeBi",policy_bi,*this);
     }
 
     //Compute beta = dE_i/dB_i for all i in list
-    typename Kokkos::TeamPolicy<DeviceType, TagPairSNAPBeta> policy_beta(chunk_size,team_size,vector_length);
-    Kokkos::parallel_for("ComputeBeta",policy_beta,*this);
+    {
+      int vector_length = vector_length_default;
+      int team_size = team_size_default;
+      check_team_size_for<TagPairSNAPBeta>(chunk_size,team_size,vector_length);
+      typename Kokkos::TeamPolicy<DeviceType,TagPairSNAPBeta> policy_beta(chunk_size,team_size,vector_length);
+      Kokkos::parallel_for("ComputeBeta",policy_beta,*this);
+    }
 
-    //ComputeYi
-    typename Kokkos::RangePolicy<DeviceType, TagPairSNAPZeroYi> policy_zero_yi(0,chunk_size);
-    Kokkos::parallel_for("ZeroYi",policy_zero_yi,*this);
+    //ZeroYi
+    {
+      int vector_length = vector_length_default;
+      int team_size = team_size_default;
+      if (!host_flag)
+        team_size = 128;
+      check_team_size_for<TagPairSNAPZeroYi>(chunk_size,team_size,vector_length);
+      typename Kokkos::TeamPolicy<DeviceType,TagPairSNAPZeroYi> policy_zero_yi(((idxu_max+team_size-1)/team_size)*chunk_size,team_size,vector_length);
+      Kokkos::parallel_for("ZeroYi",policy_zero_yi,*this);
+    }
 
     //ComputeYi
     int idxz_max = snaKK.idxz_max;
-    typename Kokkos::RangePolicy<DeviceType, TagPairSNAPComputeYi> policy_yi(0,chunk_size*idxz_max);
+    typename Kokkos::RangePolicy<DeviceType,TagPairSNAPComputeYi> policy_yi(0,chunk_size*idxz_max);
     Kokkos::parallel_for("ComputeYi",policy_yi,*this);
 
-    //ComputeDuidrj
-    typename Kokkos::TeamPolicy<DeviceType, TagPairSNAPComputeDuidrj> policy_duidrj(((inum+team_size-1)/team_size)*max_neighs,team_size,vector_length);
-    Kokkos::parallel_for("ComputeDuidrj",policy_duidrj,*this);
+    //ComputeDuidrj and Deidrj
+    {
+      int team_size = team_size_default;
+      int vector_length = vector_length_default;
+      if (host_flag) { // CPU
 
-    //ComputeDeidrj
-    typename Kokkos::TeamPolicy<DeviceType, TagPairSNAPComputeDeidrj> policy_deidrj(((inum+team_size-1)/team_size)*max_neighs,team_size,vector_length);
-    Kokkos::parallel_for("ComputeDeidrj",policy_deidrj,*this);
+        typename Kokkos::TeamPolicy<DeviceType,TagPairSNAPComputeDuidrjCPU> policy_duidrj_cpu(((chunk_size+team_size-1)/team_size)*max_neighs,team_size,vector_length);
+        snaKK.set_dir(-1); // technically doesn't do anything
+        Kokkos::parallel_for("ComputeDuidrjCPU",policy_duidrj_cpu,*this);
+
+        typename Kokkos::TeamPolicy<DeviceType,TagPairSNAPComputeDeidrjCPU> policy_deidrj_cpu(((chunk_size+team_size-1)/team_size)*max_neighs,team_size,vector_length);
+
+        Kokkos::parallel_for("ComputeDeidrjCPU",policy_deidrj_cpu,*this);
+      } else { // GPU, utilize scratch memory and splitting over dimensions, fused dui and dei
+
+        vector_length = 32;
+        team_size = 2; // need to cap b/c of shared memory reqs
+        check_team_size_for<TagPairSNAPComputeFusedDeidrj>(chunk_size,team_size,vector_length);
+
+        // scratch size: 2 * 2 * team_size * (twojmax+1)*(twojmax/2+1), to cover half `m1`,`m2` values due to symmetry
+        // 2 is for double buffer
+        const int tile_size = (twojmax+1)*(twojmax/2+1);
+
+        typedef Kokkos::View< SNAcomplex*,
+                              Kokkos::DefaultExecutionSpace::scratch_memory_space,
+                              Kokkos::MemoryTraits<Kokkos::Unmanaged> >
+                ScratchViewType;
+        int scratch_size = ScratchViewType::shmem_size( 4 * team_size * tile_size);
+
+        typename Kokkos::TeamPolicy<DeviceType,TagPairSNAPComputeFusedDeidrj> policy_fused_deidrj(((chunk_size+team_size-1)/team_size)*max_neighs,team_size,vector_length);
+        policy_fused_deidrj = policy_fused_deidrj.set_scratch_size(0, Kokkos::PerTeam( scratch_size ));
+
+        for (int k = 0; k < 3; k++) {
+          snaKK.set_dir(k);
+          Kokkos::parallel_for("ComputeFusedDeidrj",policy_fused_deidrj,*this);
+        }
+      }
+    }
 
     //ComputeForce
-    if (eflag) {
-      if (neighflag == HALF) {
-        typename Kokkos::TeamPolicy<DeviceType, TagPairSNAPComputeForce<HALF,1> > policy_force(chunk_size,team_size,vector_length);
-        Kokkos::parallel_reduce(policy_force
-          ,*this,ev_tmp);
-      } else if (neighflag == HALFTHREAD) {
-        typename Kokkos::TeamPolicy<DeviceType, TagPairSNAPComputeForce<HALFTHREAD,1> > policy_force(chunk_size,team_size,vector_length);
-        Kokkos::parallel_reduce(policy_force
-          ,*this,ev_tmp);
-      }
-    } else {
-      if (neighflag == HALF) {
-        typename Kokkos::TeamPolicy<DeviceType, TagPairSNAPComputeForce<HALF,0> > policy_force(chunk_size,team_size,vector_length);
-        Kokkos::parallel_for(policy_force
-          ,*this);
-      } else if (neighflag == HALFTHREAD) {
-        typename Kokkos::TeamPolicy<DeviceType, TagPairSNAPComputeForce<HALFTHREAD,0> > policy_force(chunk_size,team_size,vector_length);
-        Kokkos::parallel_for(policy_force
-          ,*this);
+    {
+      int team_size = team_size_default;
+      int vector_length = vector_length_default;
+      if (eflag) {
+        if (neighflag == HALF) {
+          check_team_size_reduce<TagPairSNAPComputeForce<HALF,1> >(chunk_size,team_size,vector_length);
+          typename Kokkos::TeamPolicy<DeviceType,TagPairSNAPComputeForce<HALF,1> > policy_force(chunk_size,team_size,vector_length);
+          Kokkos::parallel_reduce(policy_force
+            ,*this,ev_tmp);
+        } else if (neighflag == HALFTHREAD) {
+          check_team_size_reduce<TagPairSNAPComputeForce<HALFTHREAD,1> >(chunk_size,team_size,vector_length);
+          typename Kokkos::TeamPolicy<DeviceType,TagPairSNAPComputeForce<HALFTHREAD,1> > policy_force(chunk_size,team_size,vector_length);
+          Kokkos::parallel_reduce(policy_force
+            ,*this,ev_tmp);
+        }
+      } else {
+        if (neighflag == HALF) {
+          check_team_size_for<TagPairSNAPComputeForce<HALF,0> >(chunk_size,team_size,vector_length);
+          typename Kokkos::TeamPolicy<DeviceType,TagPairSNAPComputeForce<HALF,0> > policy_force(chunk_size,team_size,vector_length);
+          Kokkos::parallel_for(policy_force
+            ,*this);
+        } else if (neighflag == HALFTHREAD) {
+          check_team_size_for<TagPairSNAPComputeForce<HALFTHREAD,0> >(chunk_size,team_size,vector_length);
+          typename Kokkos::TeamPolicy<DeviceType,TagPairSNAPComputeForce<HALFTHREAD,0> > policy_force(chunk_size,team_size,vector_length);
+          Kokkos::parallel_for(policy_force
+            ,*this);
+        }
       }
     }
     ev += ev_tmp;
     chunk_offset += chunk_size;
+
   } // end while
 
   if (need_dup)
@@ -328,7 +424,7 @@ void PairSNAPKokkos<DeviceType>::compute(int eflag_in, int vflag_in)
 
 template<class DeviceType>
 KOKKOS_INLINE_FUNCTION
-void PairSNAPKokkos<DeviceType>::operator() (TagPairSNAPBeta,const typename Kokkos::TeamPolicy<DeviceType, TagPairSNAPBeta>::member_type& team) const {
+void PairSNAPKokkos<DeviceType>::operator() (TagPairSNAPBeta,const typename Kokkos::TeamPolicy<DeviceType,TagPairSNAPBeta>::member_type& team) const {
 
   // TODO: use RangePolicy instead, or thread over ncoeff?
   int ii = team.league_rank();
@@ -341,18 +437,18 @@ void PairSNAPKokkos<DeviceType>::operator() (TagPairSNAPBeta,const typename Kokk
     d_coeffi(d_coeffelem,ielem,Kokkos::ALL);
 
   for (int icoeff = 0; icoeff < ncoeff; icoeff++)
-    d_beta(ii,icoeff) = d_coeffi[icoeff+1];
+    d_beta(icoeff,ii) = d_coeffi[icoeff+1];
 
   if (quadraticflag) {
     int k = ncoeff+1;
     for (int icoeff = 0; icoeff < ncoeff; icoeff++) {
-      double bveci = my_sna.blist(ii,icoeff);
-      d_beta(ii,icoeff) += d_coeffi[k]*bveci;
+      double bveci = my_sna.blist(icoeff,ii);
+      d_beta(icoeff,ii) += d_coeffi[k]*bveci;
       k++;
       for (int jcoeff = icoeff+1; jcoeff < ncoeff; jcoeff++) {
-        double bvecj = my_sna.blist(ii,jcoeff);
-        d_beta(ii,icoeff) += d_coeffi[k]*bvecj;
-        d_beta(ii,jcoeff) += d_coeffi[k]*bveci;
+        double bvecj = my_sna.blist(jcoeff,ii);
+        d_beta(icoeff,ii) += d_coeffi[k]*bvecj;
+        d_beta(jcoeff,ii) += d_coeffi[k]*bveci;
         k++;
       }
     }
@@ -434,7 +530,7 @@ void PairSNAPKokkos<DeviceType>::coeff(int narg, char **arg)
 
 template<class DeviceType>
 KOKKOS_INLINE_FUNCTION
-void PairSNAPKokkos<DeviceType>::operator() (TagPairSNAPComputeNeigh,const typename Kokkos::TeamPolicy<DeviceType, TagPairSNAPComputeNeigh>::member_type& team) const {
+void PairSNAPKokkos<DeviceType>::operator() (TagPairSNAPComputeNeigh,const typename Kokkos::TeamPolicy<DeviceType,TagPairSNAPComputeNeigh>::member_type& team) const {
 
   int ii = team.league_rank();
   const int i = d_ilist[ii + chunk_offset];
@@ -503,22 +599,27 @@ void PairSNAPKokkos<DeviceType>::operator() (TagPairSNAPComputeNeigh,const typen
 
 template<class DeviceType>
 KOKKOS_INLINE_FUNCTION
-void PairSNAPKokkos<DeviceType>::operator() (TagPairSNAPPreUi,const int& ii) const {
+void PairSNAPKokkos<DeviceType>::operator() (TagPairSNAPPreUi,const typename Kokkos::TeamPolicy<DeviceType,TagPairSNAPPreUi>::member_type& team) const {
   SNAKokkos<DeviceType> my_sna = snaKK;
-  my_sna.pre_ui(ii);
+
+  // Extract the atom number
+  const int ii = team.team_rank() + team.team_size() * (team.league_rank() % ((chunk_size+team.team_size()-1)/team.team_size()));
+  if (ii >= chunk_size) return;
+
+  my_sna.pre_ui(team,ii);
 }
 
 template<class DeviceType>
 KOKKOS_INLINE_FUNCTION
-void PairSNAPKokkos<DeviceType>::operator() (TagPairSNAPComputeUi,const typename Kokkos::TeamPolicy<DeviceType, TagPairSNAPComputeUi>::member_type& team) const {
+void PairSNAPKokkos<DeviceType>::operator() (TagPairSNAPComputeUi,const typename Kokkos::TeamPolicy<DeviceType,TagPairSNAPComputeUi>::member_type& team) const {
   SNAKokkos<DeviceType> my_sna = snaKK;
 
   // Extract the atom number
-  int ii = team.team_rank() + team.team_size() * (team.league_rank() % ((inum+team.team_size()-1)/team.team_size()));
-  if (ii >= inum) return;
+  int ii = team.team_rank() + team.team_size() * (team.league_rank() % ((chunk_size+team.team_size()-1)/team.team_size()));
+  if (ii >= chunk_size) return;
 
   // Extract the neighbor number
-  const int jj = team.league_rank() / ((inum+team.team_size()-1)/team.team_size());
+  const int jj = team.league_rank() / ((chunk_size+team.team_size()-1)/team.team_size());
   const int ninside = d_ninside(ii);
   if (jj >= ninside) return;
 
@@ -527,9 +628,35 @@ void PairSNAPKokkos<DeviceType>::operator() (TagPairSNAPComputeUi,const typename
 
 template<class DeviceType>
 KOKKOS_INLINE_FUNCTION
-void PairSNAPKokkos<DeviceType>::operator() (TagPairSNAPZeroYi,const int& ii) const {
+void PairSNAPKokkos<DeviceType>::operator() (TagPairSNAPComputeUiCPU,const typename Kokkos::TeamPolicy<DeviceType,TagPairSNAPComputeUiCPU>::member_type& team) const {
   SNAKokkos<DeviceType> my_sna = snaKK;
-  my_sna.zero_yi(ii);
+
+  // Extract the atom number
+  int ii = team.team_rank() + team.team_size() * (team.league_rank() % ((chunk_size+team.team_size()-1)/team.team_size()));
+  if (ii >= chunk_size) return;
+
+  // Extract the neighbor number
+  const int jj = team.league_rank() / ((chunk_size+team.team_size()-1)/team.team_size());
+  const int ninside = d_ninside(ii);
+  if (jj >= ninside) return;
+
+  my_sna.compute_ui_cpu(team,ii,jj);
+}
+
+template<class DeviceType>
+KOKKOS_INLINE_FUNCTION
+void PairSNAPKokkos<DeviceType>::operator() (TagPairSNAPZeroYi,const typename Kokkos::TeamPolicy<DeviceType,TagPairSNAPZeroYi>::member_type& team) const {
+  SNAKokkos<DeviceType> my_sna = snaKK;
+
+  // Extract the quantum number
+  const int idx = team.team_rank() + team.team_size() * (team.league_rank() % ((my_sna.idxu_max+team.team_size()-1)/team.team_size()));
+  if (idx >= my_sna.idxu_max) return;
+
+  // Extract the atomic index
+  const int ii = team.league_rank() / ((my_sna.idxu_max+team.team_size()-1)/team.team_size());
+  if (ii >= chunk_size) return;
+
+  my_sna.zero_yi(idx,ii);
 }
 
 template<class DeviceType>
@@ -548,7 +675,7 @@ void PairSNAPKokkos<DeviceType>::operator() (TagPairSNAPComputeZi,const int& ii)
 
 template<class DeviceType>
 KOKKOS_INLINE_FUNCTION
-void PairSNAPKokkos<DeviceType>::operator() (TagPairSNAPComputeBi,const typename Kokkos::TeamPolicy<DeviceType, TagPairSNAPComputeBi>::member_type& team) const {
+void PairSNAPKokkos<DeviceType>::operator() (TagPairSNAPComputeBi,const typename Kokkos::TeamPolicy<DeviceType,TagPairSNAPComputeBi>::member_type& team) const {
   int ii = team.league_rank();
   SNAKokkos<DeviceType> my_sna = snaKK;
   my_sna.compute_bi(team,ii);
@@ -556,42 +683,59 @@ void PairSNAPKokkos<DeviceType>::operator() (TagPairSNAPComputeBi,const typename
 
 template<class DeviceType>
 KOKKOS_INLINE_FUNCTION
-void PairSNAPKokkos<DeviceType>::operator() (TagPairSNAPComputeDuidrj,const typename Kokkos::TeamPolicy<DeviceType, TagPairSNAPComputeDuidrj>::member_type& team) const {
+void PairSNAPKokkos<DeviceType>::operator() (TagPairSNAPComputeFusedDeidrj,const typename Kokkos::TeamPolicy<DeviceType,TagPairSNAPComputeFusedDeidrj>::member_type& team) const {
   SNAKokkos<DeviceType> my_sna = snaKK;
 
   // Extract the atom number
-  int ii = team.team_rank() + team.team_size() * (team.league_rank() % ((inum+team.team_size()-1)/team.team_size()));
-  if (ii >= inum) return;
+  int ii = team.team_rank() + team.team_size() * (team.league_rank() % ((chunk_size+team.team_size()-1)/team.team_size()));
+  if (ii >= chunk_size) return;
 
   // Extract the neighbor number
-  const int jj = team.league_rank() / ((inum+team.team_size()-1)/team.team_size());
+  const int jj = team.league_rank() / ((chunk_size+team.team_size()-1)/team.team_size());
   const int ninside = d_ninside(ii);
   if (jj >= ninside) return;
 
-  my_sna.compute_duidrj(team,ii,jj);
+  my_sna.compute_fused_deidrj(team,ii,jj);
 }
 
 template<class DeviceType>
 KOKKOS_INLINE_FUNCTION
-void PairSNAPKokkos<DeviceType>::operator() (TagPairSNAPComputeDeidrj,const typename Kokkos::TeamPolicy<DeviceType, TagPairSNAPComputeDeidrj>::member_type& team) const {
+void PairSNAPKokkos<DeviceType>::operator() (TagPairSNAPComputeDuidrjCPU,const typename Kokkos::TeamPolicy<DeviceType,TagPairSNAPComputeDuidrjCPU>::member_type& team) const {
   SNAKokkos<DeviceType> my_sna = snaKK;
 
   // Extract the atom number
-  int ii = team.team_rank() + team.team_size() * (team.league_rank() % ((inum+team.team_size()-1)/team.team_size()));
-  if (ii >= inum) return;
+  int ii = team.team_rank() + team.team_size() * (team.league_rank() % ((chunk_size+team.team_size()-1)/team.team_size()));
+  if (ii >= chunk_size) return;
 
   // Extract the neighbor number
-  const int jj = team.league_rank() / ((inum+team.team_size()-1)/team.team_size());
+  const int jj = team.league_rank() / ((chunk_size+team.team_size()-1)/team.team_size());
   const int ninside = d_ninside(ii);
   if (jj >= ninside) return;
 
-  my_sna.compute_deidrj(team,ii,jj);
+  my_sna.compute_duidrj_cpu(team,ii,jj);
+}
+
+template<class DeviceType>
+KOKKOS_INLINE_FUNCTION
+void PairSNAPKokkos<DeviceType>::operator() (TagPairSNAPComputeDeidrjCPU,const typename Kokkos::TeamPolicy<DeviceType,TagPairSNAPComputeDeidrjCPU>::member_type& team) const {
+  SNAKokkos<DeviceType> my_sna = snaKK;
+
+  // Extract the atom number
+  int ii = team.team_rank() + team.team_size() * (team.league_rank() % ((chunk_size+team.team_size()-1)/team.team_size()));
+  if (ii >= chunk_size) return;
+
+  // Extract the neighbor number
+  const int jj = team.league_rank() / ((chunk_size+team.team_size()-1)/team.team_size());
+  const int ninside = d_ninside(ii);
+  if (jj >= ninside) return;
+
+  my_sna.compute_deidrj_cpu(team,ii,jj);
 }
 
 template<class DeviceType>
 template<int NEIGHFLAG, int EVFLAG>
 KOKKOS_INLINE_FUNCTION
-void PairSNAPKokkos<DeviceType>::operator() (TagPairSNAPComputeForce<NEIGHFLAG,EVFLAG>,const typename Kokkos::TeamPolicy<DeviceType, TagPairSNAPComputeForce<NEIGHFLAG,EVFLAG> >::member_type& team, EV_FLOAT& ev) const {
+void PairSNAPKokkos<DeviceType>::operator() (TagPairSNAPComputeForce<NEIGHFLAG,EVFLAG>,const typename Kokkos::TeamPolicy<DeviceType,TagPairSNAPComputeForce<NEIGHFLAG,EVFLAG> >::member_type& team, EV_FLOAT& ev) const {
 
   // The f array is duplicated for OpenMP, atomic for CUDA, and neither for Serial
 
@@ -655,17 +799,17 @@ void PairSNAPKokkos<DeviceType>::operator() (TagPairSNAPComputeForce<NEIGHFLAG,E
         // linear contributions
 
         for (int icoeff = 0; icoeff < ncoeff; icoeff++)
-          evdwl += d_coeffi[icoeff+1]*my_sna.blist(ii,icoeff);
+          evdwl += d_coeffi[icoeff+1]*my_sna.blist(icoeff,ii);
 
         // quadratic contributions
 
         if (quadraticflag) {
           int k = ncoeff+1;
           for (int icoeff = 0; icoeff < ncoeff; icoeff++) {
-            double bveci = my_sna.blist(ii,icoeff);
+            double bveci = my_sna.blist(icoeff,ii);
             evdwl += 0.5*d_coeffi[k++]*bveci*bveci;
             for (int jcoeff = icoeff+1; jcoeff < ncoeff; jcoeff++) {
-              double bvecj = my_sna.blist(ii,jcoeff);
+              double bvecj = my_sna.blist(jcoeff,ii);
               evdwl += d_coeffi[k++]*bveci*bvecj;
             }
           }
@@ -750,4 +894,28 @@ double PairSNAPKokkos<DeviceType>::memory_usage()
   return bytes;
 }
 
+/* ---------------------------------------------------------------------- */
+
+template<class DeviceType>
+template<class TagStyle>
+void PairSNAPKokkos<DeviceType>::check_team_size_for(int inum, int &team_size, int vector_length) {
+  int team_size_max;
+
+  team_size_max = Kokkos::TeamPolicy<DeviceType,TagStyle>(inum,Kokkos::AUTO).team_size_max(*this,Kokkos::ParallelForTag());
+
+  if(team_size*vector_length > team_size_max)
+    team_size = team_size_max/vector_length;
+}
+
+template<class DeviceType>
+template<class TagStyle>
+void PairSNAPKokkos<DeviceType>::check_team_size_reduce(int inum, int &team_size, int vector_length) {
+  int team_size_max;
+
+  team_size_max = Kokkos::TeamPolicy<DeviceType,TagStyle>(inum,Kokkos::AUTO).team_size_max(*this,Kokkos::ParallelReduceTag());
+
+  if(team_size*vector_length > team_size_max)
+    team_size = team_size_max/vector_length;
+}
+
 }
diff --git a/src/KOKKOS/pair_sw_kokkos.cpp b/src/KOKKOS/pair_sw_kokkos.cpp
index e85afa362f..4ca75ebd2e 100644
--- a/src/KOKKOS/pair_sw_kokkos.cpp
+++ b/src/KOKKOS/pair_sw_kokkos.cpp
@@ -87,7 +87,7 @@ void PairSWKokkos<DeviceType>::compute(int eflag_in, int vflag_in)
   }
   if (vflag_atom) {
     memoryKK->destroy_kokkos(k_vatom,vatom);
-    memoryKK->create_kokkos(k_vatom,vatom,maxvatom,6,"pair:vatom");
+    memoryKK->create_kokkos(k_vatom,vatom,maxvatom,"pair:vatom");
     d_vatom = k_vatom.view<DeviceType>();
   }
 
@@ -610,10 +610,10 @@ void PairSWKokkos<DeviceType>::init_style()
   int irequest = neighbor->nrequest - 1;
 
   neighbor->requests[irequest]->
-    kokkos_host = Kokkos::Impl::is_same<DeviceType,LMPHostType>::value &&
-    !Kokkos::Impl::is_same<DeviceType,LMPDeviceType>::value;
+    kokkos_host = std::is_same<DeviceType,LMPHostType>::value &&
+    !std::is_same<DeviceType,LMPDeviceType>::value;
   neighbor->requests[irequest]->
-    kokkos_device = Kokkos::Impl::is_same<DeviceType,LMPDeviceType>::value;
+    kokkos_device = std::is_same<DeviceType,LMPDeviceType>::value;
 
   // always request a full neighbor list
 
diff --git a/src/KOKKOS/pair_sw_kokkos.h b/src/KOKKOS/pair_sw_kokkos.h
index 1a3f0b862f..2fc7f93c12 100644
--- a/src/KOKKOS/pair_sw_kokkos.h
+++ b/src/KOKKOS/pair_sw_kokkos.h
@@ -135,12 +135,12 @@ class PairSWKokkos : public PairSW {
   typename AT::t_virial_array d_vatom;
 
   int need_dup;
-  Kokkos::Experimental::ScatterView<F_FLOAT*[3], typename DAT::t_f_array::array_layout,DeviceType,Kokkos::Experimental::ScatterSum,Kokkos::Experimental::ScatterDuplicated> dup_f;
-  Kokkos::Experimental::ScatterView<E_FLOAT*, typename DAT::t_efloat_1d::array_layout,DeviceType,Kokkos::Experimental::ScatterSum,Kokkos::Experimental::ScatterDuplicated> dup_eatom;
-  Kokkos::Experimental::ScatterView<F_FLOAT*[6], typename DAT::t_virial_array::array_layout,DeviceType,Kokkos::Experimental::ScatterSum,Kokkos::Experimental::ScatterDuplicated> dup_vatom;
-  Kokkos::Experimental::ScatterView<F_FLOAT*[3], typename DAT::t_f_array::array_layout,DeviceType,Kokkos::Experimental::ScatterSum,Kokkos::Experimental::ScatterNonDuplicated> ndup_f;
-  Kokkos::Experimental::ScatterView<E_FLOAT*, typename DAT::t_efloat_1d::array_layout,DeviceType,Kokkos::Experimental::ScatterSum,Kokkos::Experimental::ScatterNonDuplicated> ndup_eatom;
-  Kokkos::Experimental::ScatterView<F_FLOAT*[6], typename DAT::t_virial_array::array_layout,DeviceType,Kokkos::Experimental::ScatterSum,Kokkos::Experimental::ScatterNonDuplicated> ndup_vatom;
+  Kokkos::Experimental::ScatterView<F_FLOAT*[3], typename DAT::t_f_array::array_layout,typename KKDevice<DeviceType>::value,Kokkos::Experimental::ScatterSum,Kokkos::Experimental::ScatterDuplicated> dup_f;
+  Kokkos::Experimental::ScatterView<E_FLOAT*, typename DAT::t_efloat_1d::array_layout,typename KKDevice<DeviceType>::value,Kokkos::Experimental::ScatterSum,Kokkos::Experimental::ScatterDuplicated> dup_eatom;
+  Kokkos::Experimental::ScatterView<F_FLOAT*[6], typename DAT::t_virial_array::array_layout,typename KKDevice<DeviceType>::value,Kokkos::Experimental::ScatterSum,Kokkos::Experimental::ScatterDuplicated> dup_vatom;
+  Kokkos::Experimental::ScatterView<F_FLOAT*[3], typename DAT::t_f_array::array_layout,typename KKDevice<DeviceType>::value,Kokkos::Experimental::ScatterSum,Kokkos::Experimental::ScatterNonDuplicated> ndup_f;
+  Kokkos::Experimental::ScatterView<E_FLOAT*, typename DAT::t_efloat_1d::array_layout,typename KKDevice<DeviceType>::value,Kokkos::Experimental::ScatterSum,Kokkos::Experimental::ScatterNonDuplicated> ndup_eatom;
+  Kokkos::Experimental::ScatterView<F_FLOAT*[6], typename DAT::t_virial_array::array_layout,typename KKDevice<DeviceType>::value,Kokkos::Experimental::ScatterSum,Kokkos::Experimental::ScatterNonDuplicated> ndup_vatom;
 
   typename AT::t_int_1d_randomread d_type2frho;
   typename AT::t_int_2d_randomread d_type2rhor;
diff --git a/src/KOKKOS/pair_table_kokkos.cpp b/src/KOKKOS/pair_table_kokkos.cpp
index 5ee24ad479..a86db70d4d 100644
--- a/src/KOKKOS/pair_table_kokkos.cpp
+++ b/src/KOKKOS/pair_table_kokkos.cpp
@@ -93,7 +93,7 @@ void PairTableKokkos<DeviceType>::compute_style(int eflag_in, int vflag_in)
   }
   if (vflag_atom) {
     memoryKK->destroy_kokkos(k_vatom,vatom);
-    memoryKK->create_kokkos(k_vatom,vatom,maxvatom,6,"pair:vatom");
+    memoryKK->create_kokkos(k_vatom,vatom,maxvatom,"pair:vatom");
     d_vatom = k_vatom.view<DeviceType>();
   }
 
@@ -514,10 +514,10 @@ void PairTableKokkos<DeviceType>::init_style()
   int irequest = neighbor->nrequest - 1;
 
   neighbor->requests[irequest]->
-    kokkos_host = Kokkos::Impl::is_same<DeviceType,LMPHostType>::value &&
-    !Kokkos::Impl::is_same<DeviceType,LMPDeviceType>::value;
+    kokkos_host = std::is_same<DeviceType,LMPHostType>::value &&
+    !std::is_same<DeviceType,LMPDeviceType>::value;
   neighbor->requests[irequest]->
-    kokkos_device = Kokkos::Impl::is_same<DeviceType,LMPDeviceType>::value;
+    kokkos_device = std::is_same<DeviceType,LMPDeviceType>::value;
 
   if (neighflag == FULL) {
     neighbor->requests[irequest]->full = 1;
diff --git a/src/KOKKOS/pair_table_rx_kokkos.cpp b/src/KOKKOS/pair_table_rx_kokkos.cpp
index daebeda8db..d65ea8bf1f 100644
--- a/src/KOKKOS/pair_table_rx_kokkos.cpp
+++ b/src/KOKKOS/pair_table_rx_kokkos.cpp
@@ -284,11 +284,11 @@ ev_tally(
     F_FLOAT delx, F_FLOAT dely, F_FLOAT delz,
     Kokkos::View<F_FLOAT*[6],
                  typename ArrayTypes<DeviceType>::t_virial_array::array_layout,
-                 DeviceType,
+                 typename KKDevice<DeviceType>::value,
                  Kokkos::MemoryTraits<AtomicF<NEIGHFLAG>::value> > const& v_vatom,
     Kokkos::View<E_FLOAT*,
                  typename ArrayTypes<DeviceType>::t_efloat_1d::array_layout,
-                 DeviceType,
+                 typename KKDevice<DeviceType>::value,
                  Kokkos::MemoryTraits<AtomicF<NEIGHFLAG>::value> > const& v_eatom)
 {
   if (eflag) {
@@ -399,15 +399,15 @@ compute_item(
     typename ArrayTypes<DeviceType>::t_ffloat_2d const& d_cutsq,
     Kokkos::View<F_FLOAT*[3],
       typename ArrayTypes<DeviceType>::t_f_array::array_layout,
-      DeviceType,
+      typename KKDevice<DeviceType>::value,
       Kokkos::MemoryTraits<AtomicF<NEIGHFLAG>::value> > const& f,
     Kokkos::View<E_FLOAT*,
                  typename ArrayTypes<DeviceType>::t_efloat_1d::array_layout,
-                 DeviceType,
+                 typename KKDevice<DeviceType>::value,
                  Kokkos::MemoryTraits<AtomicF<NEIGHFLAG>::value> > const& uCG,
     Kokkos::View<E_FLOAT*,
                  typename ArrayTypes<DeviceType>::t_efloat_1d::array_layout,
-                 DeviceType,
+                 typename KKDevice<DeviceType>::value,
                  Kokkos::MemoryTraits<AtomicF<NEIGHFLAG>::value> > const& uCGnew,
     int isite1, int isite2,
     typename PairTableRXKokkos<DeviceType>::TableDeviceConst const& d_table_const,
@@ -418,11 +418,11 @@ compute_item(
     int vflag_atom,
     Kokkos::View<F_FLOAT*[6],
                  typename ArrayTypes<DeviceType>::t_virial_array::array_layout,
-                 DeviceType,
+                 typename KKDevice<DeviceType>::value,
                  Kokkos::MemoryTraits<AtomicF<NEIGHFLAG>::value> > const& v_vatom,
     Kokkos::View<E_FLOAT*,
                  typename ArrayTypes<DeviceType>::t_efloat_1d::array_layout,
-                 DeviceType,
+                 typename KKDevice<DeviceType>::value,
                  Kokkos::MemoryTraits<AtomicF<NEIGHFLAG>::value> > const& v_eatom) {
   EV_FLOAT ev;
   auto i = d_ilist(ii);
@@ -544,14 +544,16 @@ static void compute_all_items(
     typename ArrayTypes<DeviceType>::t_ffloat_2d d_cutsq,
     Kokkos::View<F_FLOAT*[3],
       typename ArrayTypes<DeviceType>::t_f_array::array_layout,
-      DeviceType,
+      typename KKDevice<DeviceType>::value,
       Kokkos::MemoryTraits<AtomicF<NEIGHFLAG>::value> > f,
     Kokkos::View<E_FLOAT*,
                  typename ArrayTypes<DeviceType>::t_efloat_1d::array_layout,
-                 DeviceType,Kokkos::MemoryTraits<AtomicF<NEIGHFLAG>::value> > uCG,
+                 typename KKDevice<DeviceType>::value,
+                 Kokkos::MemoryTraits<AtomicF<NEIGHFLAG>::value> > uCG,
     Kokkos::View<E_FLOAT*,
                  typename ArrayTypes<DeviceType>::t_efloat_1d::array_layout,
-                 DeviceType,Kokkos::MemoryTraits<AtomicF<NEIGHFLAG>::value> > uCGnew,
+                 typename KKDevice<DeviceType>::value,
+                 Kokkos::MemoryTraits<AtomicF<NEIGHFLAG>::value> > uCGnew,
     int isite1, int isite2,
     typename PairTableRXKokkos<DeviceType>::TableDeviceConst d_table_const,
     int eflag,
@@ -561,11 +563,11 @@ static void compute_all_items(
     int vflag_atom,
     Kokkos::View<F_FLOAT*[6],
                  typename ArrayTypes<DeviceType>::t_virial_array::array_layout,
-                 DeviceType,
+                 typename KKDevice<DeviceType>::value,
                  Kokkos::MemoryTraits<AtomicF<NEIGHFLAG>::value> > v_vatom,
     Kokkos::View<E_FLOAT*,
                  typename ArrayTypes<DeviceType>::t_efloat_1d::array_layout,
-                 DeviceType,
+                 typename KKDevice<DeviceType>::value,
                  Kokkos::MemoryTraits<AtomicF<NEIGHFLAG>::value> > v_eatom) {
   if (eflag || vflag) {
     Kokkos::parallel_reduce(inum,
@@ -627,7 +629,7 @@ void PairTableRXKokkos<DeviceType>::compute_style(int eflag_in, int vflag_in)
   }
   if (vflag_atom) {
     memoryKK->destroy_kokkos(k_vatom,vatom);
-    memoryKK->create_kokkos(k_vatom,vatom,maxvatom,6,"pair:vatom");
+    memoryKK->create_kokkos(k_vatom,vatom,maxvatom,"pair:vatom");
     d_vatom = k_vatom.template view<DeviceType>();
   }
 
@@ -1268,10 +1270,10 @@ void PairTableRXKokkos<DeviceType>::init_style()
   int irequest = neighbor->nrequest - 1;
 
   neighbor->requests[irequest]->
-    kokkos_host = Kokkos::Impl::is_same<DeviceType,LMPHostType>::value &&
-    !Kokkos::Impl::is_same<DeviceType,LMPDeviceType>::value;
+    kokkos_host = std::is_same<DeviceType,LMPHostType>::value &&
+    !std::is_same<DeviceType,LMPDeviceType>::value;
   neighbor->requests[irequest]->
-    kokkos_device = Kokkos::Impl::is_same<DeviceType,LMPDeviceType>::value;
+    kokkos_device = std::is_same<DeviceType,LMPDeviceType>::value;
 
   if (neighflag == FULL) {
     neighbor->requests[irequest]->full = 1;
diff --git a/src/KOKKOS/pair_tersoff_kokkos.cpp b/src/KOKKOS/pair_tersoff_kokkos.cpp
index b360b20ef3..134431aa44 100644
--- a/src/KOKKOS/pair_tersoff_kokkos.cpp
+++ b/src/KOKKOS/pair_tersoff_kokkos.cpp
@@ -88,10 +88,10 @@ void PairTersoffKokkos<DeviceType>::init_style()
   int irequest = neighbor->nrequest - 1;
 
   neighbor->requests[irequest]->
-    kokkos_host = Kokkos::Impl::is_same<DeviceType,LMPHostType>::value &&
-    !Kokkos::Impl::is_same<DeviceType,LMPDeviceType>::value;
+    kokkos_host = std::is_same<DeviceType,LMPHostType>::value &&
+    !std::is_same<DeviceType,LMPDeviceType>::value;
   neighbor->requests[irequest]->
-    kokkos_device = Kokkos::Impl::is_same<DeviceType,LMPDeviceType>::value;
+    kokkos_device = std::is_same<DeviceType,LMPDeviceType>::value;
 
   if (neighflag == FULL)
     error->all(FLERR,"Cannot (yet) use full neighbor list style with tersoff/kk");
@@ -169,7 +169,7 @@ void PairTersoffKokkos<DeviceType>::compute(int eflag_in, int vflag_in)
   }
   if (vflag_atom) {
     memoryKK->destroy_kokkos(k_vatom,vatom);
-    memoryKK->create_kokkos(k_vatom,vatom,maxvatom,6,"pair:vatom");
+    memoryKK->create_kokkos(k_vatom,vatom,maxvatom,"pair:vatom");
     d_vatom = k_vatom.view<DeviceType>();
   }
 
diff --git a/src/KOKKOS/pair_tersoff_kokkos.h b/src/KOKKOS/pair_tersoff_kokkos.h
index 7d41fe2346..0c57e21a6c 100644
--- a/src/KOKKOS/pair_tersoff_kokkos.h
+++ b/src/KOKKOS/pair_tersoff_kokkos.h
@@ -202,12 +202,12 @@ class PairTersoffKokkos : public PairTersoff {
   typename ArrayTypes<DeviceType>::t_virial_array d_vatom;
 
   int need_dup;
-  Kokkos::Experimental::ScatterView<F_FLOAT*[3], typename DAT::t_f_array::array_layout,DeviceType,Kokkos::Experimental::ScatterSum,Kokkos::Experimental::ScatterDuplicated> dup_f;
-  Kokkos::Experimental::ScatterView<E_FLOAT*, typename DAT::t_efloat_1d::array_layout,DeviceType,Kokkos::Experimental::ScatterSum,Kokkos::Experimental::ScatterDuplicated> dup_eatom;
-  Kokkos::Experimental::ScatterView<F_FLOAT*[6], typename DAT::t_virial_array::array_layout,DeviceType,Kokkos::Experimental::ScatterSum,Kokkos::Experimental::ScatterDuplicated> dup_vatom;
-  Kokkos::Experimental::ScatterView<F_FLOAT*[3], typename DAT::t_f_array::array_layout,DeviceType,Kokkos::Experimental::ScatterSum,Kokkos::Experimental::ScatterNonDuplicated> ndup_f;
-  Kokkos::Experimental::ScatterView<E_FLOAT*, typename DAT::t_efloat_1d::array_layout,DeviceType,Kokkos::Experimental::ScatterSum,Kokkos::Experimental::ScatterNonDuplicated> ndup_eatom;
-  Kokkos::Experimental::ScatterView<F_FLOAT*[6], typename DAT::t_virial_array::array_layout,DeviceType,Kokkos::Experimental::ScatterSum,Kokkos::Experimental::ScatterNonDuplicated> ndup_vatom;
+  Kokkos::Experimental::ScatterView<F_FLOAT*[3], typename DAT::t_f_array::array_layout,typename KKDevice<DeviceType>::value,Kokkos::Experimental::ScatterSum,Kokkos::Experimental::ScatterDuplicated> dup_f;
+  Kokkos::Experimental::ScatterView<E_FLOAT*, typename DAT::t_efloat_1d::array_layout,typename KKDevice<DeviceType>::value,Kokkos::Experimental::ScatterSum,Kokkos::Experimental::ScatterDuplicated> dup_eatom;
+  Kokkos::Experimental::ScatterView<F_FLOAT*[6], typename DAT::t_virial_array::array_layout,typename KKDevice<DeviceType>::value,Kokkos::Experimental::ScatterSum,Kokkos::Experimental::ScatterDuplicated> dup_vatom;
+  Kokkos::Experimental::ScatterView<F_FLOAT*[3], typename DAT::t_f_array::array_layout,typename KKDevice<DeviceType>::value,Kokkos::Experimental::ScatterSum,Kokkos::Experimental::ScatterNonDuplicated> ndup_f;
+  Kokkos::Experimental::ScatterView<E_FLOAT*, typename DAT::t_efloat_1d::array_layout,typename KKDevice<DeviceType>::value,Kokkos::Experimental::ScatterSum,Kokkos::Experimental::ScatterNonDuplicated> ndup_eatom;
+  Kokkos::Experimental::ScatterView<F_FLOAT*[6], typename DAT::t_virial_array::array_layout,typename KKDevice<DeviceType>::value,Kokkos::Experimental::ScatterSum,Kokkos::Experimental::ScatterNonDuplicated> ndup_vatom;
 
   typedef Kokkos::DualView<F_FLOAT**[7],Kokkos::LayoutRight,DeviceType> tdual_ffloat_2d_n7;
   typedef typename tdual_ffloat_2d_n7::t_dev_const_randomread t_ffloat_2d_n7_randomread;
diff --git a/src/KOKKOS/pair_tersoff_mod_kokkos.cpp b/src/KOKKOS/pair_tersoff_mod_kokkos.cpp
index 81ef486999..ceb1ed1383 100644
--- a/src/KOKKOS/pair_tersoff_mod_kokkos.cpp
+++ b/src/KOKKOS/pair_tersoff_mod_kokkos.cpp
@@ -88,10 +88,10 @@ void PairTersoffMODKokkos<DeviceType>::init_style()
   int irequest = neighbor->nrequest - 1;
 
   neighbor->requests[irequest]->
-    kokkos_host = Kokkos::Impl::is_same<DeviceType,LMPHostType>::value &&
-    !Kokkos::Impl::is_same<DeviceType,LMPDeviceType>::value;
+    kokkos_host = std::is_same<DeviceType,LMPHostType>::value &&
+    !std::is_same<DeviceType,LMPDeviceType>::value;
   neighbor->requests[irequest]->
-    kokkos_device = Kokkos::Impl::is_same<DeviceType,LMPDeviceType>::value;
+    kokkos_device = std::is_same<DeviceType,LMPDeviceType>::value;
 
   if (neighflag == FULL)
     error->all(FLERR,"Cannot (yet) use full neighbor list style with tersoff/mod/kk");
@@ -169,7 +169,7 @@ void PairTersoffMODKokkos<DeviceType>::compute(int eflag_in, int vflag_in)
   }
   if (vflag_atom) {
     memoryKK->destroy_kokkos(k_vatom,vatom);
-    memoryKK->create_kokkos(k_vatom,vatom,maxvatom,6,"pair:vatom");
+    memoryKK->create_kokkos(k_vatom,vatom,maxvatom,"pair:vatom");
     d_vatom = k_vatom.view<DeviceType>();
   }
 
diff --git a/src/KOKKOS/pair_tersoff_mod_kokkos.h b/src/KOKKOS/pair_tersoff_mod_kokkos.h
index 889e1eadfa..b47f11e029 100644
--- a/src/KOKKOS/pair_tersoff_mod_kokkos.h
+++ b/src/KOKKOS/pair_tersoff_mod_kokkos.h
@@ -202,12 +202,12 @@ class PairTersoffMODKokkos : public PairTersoffMOD {
   typename ArrayTypes<DeviceType>::t_virial_array d_vatom;
 
   int need_dup;
-  Kokkos::Experimental::ScatterView<F_FLOAT*[3], typename DAT::t_f_array::array_layout,DeviceType,Kokkos::Experimental::ScatterSum,Kokkos::Experimental::ScatterDuplicated> dup_f;
-  Kokkos::Experimental::ScatterView<E_FLOAT*, typename DAT::t_efloat_1d::array_layout,DeviceType,Kokkos::Experimental::ScatterSum,Kokkos::Experimental::ScatterDuplicated> dup_eatom;
-  Kokkos::Experimental::ScatterView<F_FLOAT*[6], typename DAT::t_virial_array::array_layout,DeviceType,Kokkos::Experimental::ScatterSum,Kokkos::Experimental::ScatterDuplicated> dup_vatom;
-  Kokkos::Experimental::ScatterView<F_FLOAT*[3], typename DAT::t_f_array::array_layout,DeviceType,Kokkos::Experimental::ScatterSum,Kokkos::Experimental::ScatterNonDuplicated> ndup_f;
-  Kokkos::Experimental::ScatterView<E_FLOAT*, typename DAT::t_efloat_1d::array_layout,DeviceType,Kokkos::Experimental::ScatterSum,Kokkos::Experimental::ScatterNonDuplicated> ndup_eatom;
-  Kokkos::Experimental::ScatterView<F_FLOAT*[6], typename DAT::t_virial_array::array_layout,DeviceType,Kokkos::Experimental::ScatterSum,Kokkos::Experimental::ScatterNonDuplicated> ndup_vatom;
+  Kokkos::Experimental::ScatterView<F_FLOAT*[3], typename DAT::t_f_array::array_layout,typename KKDevice<DeviceType>::value,Kokkos::Experimental::ScatterSum,Kokkos::Experimental::ScatterDuplicated> dup_f;
+  Kokkos::Experimental::ScatterView<E_FLOAT*, typename DAT::t_efloat_1d::array_layout,typename KKDevice<DeviceType>::value,Kokkos::Experimental::ScatterSum,Kokkos::Experimental::ScatterDuplicated> dup_eatom;
+  Kokkos::Experimental::ScatterView<F_FLOAT*[6], typename DAT::t_virial_array::array_layout,typename KKDevice<DeviceType>::value,Kokkos::Experimental::ScatterSum,Kokkos::Experimental::ScatterDuplicated> dup_vatom;
+  Kokkos::Experimental::ScatterView<F_FLOAT*[3], typename DAT::t_f_array::array_layout,typename KKDevice<DeviceType>::value,Kokkos::Experimental::ScatterSum,Kokkos::Experimental::ScatterNonDuplicated> ndup_f;
+  Kokkos::Experimental::ScatterView<E_FLOAT*, typename DAT::t_efloat_1d::array_layout,typename KKDevice<DeviceType>::value,Kokkos::Experimental::ScatterSum,Kokkos::Experimental::ScatterNonDuplicated> ndup_eatom;
+  Kokkos::Experimental::ScatterView<F_FLOAT*[6], typename DAT::t_virial_array::array_layout,typename KKDevice<DeviceType>::value,Kokkos::Experimental::ScatterSum,Kokkos::Experimental::ScatterNonDuplicated> ndup_vatom;
 
   typedef Kokkos::DualView<F_FLOAT**[7],Kokkos::LayoutRight,DeviceType> tdual_ffloat_2d_n7;
   typedef typename tdual_ffloat_2d_n7::t_dev_const_randomread t_ffloat_2d_n7_randomread;
diff --git a/src/KOKKOS/pair_tersoff_zbl_kokkos.cpp b/src/KOKKOS/pair_tersoff_zbl_kokkos.cpp
index 4593f32e36..c7a08772c8 100644
--- a/src/KOKKOS/pair_tersoff_zbl_kokkos.cpp
+++ b/src/KOKKOS/pair_tersoff_zbl_kokkos.cpp
@@ -101,10 +101,10 @@ void PairTersoffZBLKokkos<DeviceType>::init_style()
   int irequest = neighbor->nrequest - 1;
 
   neighbor->requests[irequest]->
-    kokkos_host = Kokkos::Impl::is_same<DeviceType,LMPHostType>::value &&
-    !Kokkos::Impl::is_same<DeviceType,LMPDeviceType>::value;
+    kokkos_host = std::is_same<DeviceType,LMPHostType>::value &&
+    !std::is_same<DeviceType,LMPDeviceType>::value;
   neighbor->requests[irequest]->
-    kokkos_device = Kokkos::Impl::is_same<DeviceType,LMPDeviceType>::value;
+    kokkos_device = std::is_same<DeviceType,LMPDeviceType>::value;
 
   if (neighflag == FULL)
     error->all(FLERR,"Cannot (yet) use full neighbor list style with tersoff/zbl/kk");
@@ -185,7 +185,7 @@ void PairTersoffZBLKokkos<DeviceType>::compute(int eflag_in, int vflag_in)
   }
   if (vflag_atom) {
     memoryKK->destroy_kokkos(k_vatom,vatom);
-    memoryKK->create_kokkos(k_vatom,vatom,maxvatom,6,"pair:vatom");
+    memoryKK->create_kokkos(k_vatom,vatom,maxvatom,"pair:vatom");
     d_vatom = k_vatom.view<DeviceType>();
   }
 
diff --git a/src/KOKKOS/pair_tersoff_zbl_kokkos.h b/src/KOKKOS/pair_tersoff_zbl_kokkos.h
index 0c7fa2e963..bed2564da5 100644
--- a/src/KOKKOS/pair_tersoff_zbl_kokkos.h
+++ b/src/KOKKOS/pair_tersoff_zbl_kokkos.h
@@ -207,12 +207,12 @@ class PairTersoffZBLKokkos : public PairTersoffZBL {
   typename ArrayTypes<DeviceType>::t_virial_array d_vatom;
 
   int need_dup;
-  Kokkos::Experimental::ScatterView<F_FLOAT*[3], typename DAT::t_f_array::array_layout,DeviceType,Kokkos::Experimental::ScatterSum,Kokkos::Experimental::ScatterDuplicated> dup_f;
-  Kokkos::Experimental::ScatterView<E_FLOAT*, typename DAT::t_efloat_1d::array_layout,DeviceType,Kokkos::Experimental::ScatterSum,Kokkos::Experimental::ScatterDuplicated> dup_eatom;
-  Kokkos::Experimental::ScatterView<F_FLOAT*[6], typename DAT::t_virial_array::array_layout,DeviceType,Kokkos::Experimental::ScatterSum,Kokkos::Experimental::ScatterDuplicated> dup_vatom;
-  Kokkos::Experimental::ScatterView<F_FLOAT*[3], typename DAT::t_f_array::array_layout,DeviceType,Kokkos::Experimental::ScatterSum,Kokkos::Experimental::ScatterNonDuplicated> ndup_f;
-  Kokkos::Experimental::ScatterView<E_FLOAT*, typename DAT::t_efloat_1d::array_layout,DeviceType,Kokkos::Experimental::ScatterSum,Kokkos::Experimental::ScatterNonDuplicated> ndup_eatom;
-  Kokkos::Experimental::ScatterView<F_FLOAT*[6], typename DAT::t_virial_array::array_layout,DeviceType,Kokkos::Experimental::ScatterSum,Kokkos::Experimental::ScatterNonDuplicated> ndup_vatom;
+  Kokkos::Experimental::ScatterView<F_FLOAT*[3], typename DAT::t_f_array::array_layout,typename KKDevice<DeviceType>::value,Kokkos::Experimental::ScatterSum,Kokkos::Experimental::ScatterDuplicated> dup_f;
+  Kokkos::Experimental::ScatterView<E_FLOAT*, typename DAT::t_efloat_1d::array_layout,typename KKDevice<DeviceType>::value,Kokkos::Experimental::ScatterSum,Kokkos::Experimental::ScatterDuplicated> dup_eatom;
+  Kokkos::Experimental::ScatterView<F_FLOAT*[6], typename DAT::t_virial_array::array_layout,typename KKDevice<DeviceType>::value,Kokkos::Experimental::ScatterSum,Kokkos::Experimental::ScatterDuplicated> dup_vatom;
+  Kokkos::Experimental::ScatterView<F_FLOAT*[3], typename DAT::t_f_array::array_layout,typename KKDevice<DeviceType>::value,Kokkos::Experimental::ScatterSum,Kokkos::Experimental::ScatterNonDuplicated> ndup_f;
+  Kokkos::Experimental::ScatterView<E_FLOAT*, typename DAT::t_efloat_1d::array_layout,typename KKDevice<DeviceType>::value,Kokkos::Experimental::ScatterSum,Kokkos::Experimental::ScatterNonDuplicated> ndup_eatom;
+  Kokkos::Experimental::ScatterView<F_FLOAT*[6], typename DAT::t_virial_array::array_layout,typename KKDevice<DeviceType>::value,Kokkos::Experimental::ScatterSum,Kokkos::Experimental::ScatterNonDuplicated> ndup_vatom;
 
   typedef Kokkos::DualView<F_FLOAT**[7],Kokkos::LayoutRight,DeviceType> tdual_ffloat_2d_n7;
   typedef typename tdual_ffloat_2d_n7::t_dev_const_randomread t_ffloat_2d_n7_randomread;
diff --git a/src/KOKKOS/pair_vashishta_kokkos.cpp b/src/KOKKOS/pair_vashishta_kokkos.cpp
index 614d3334d5..1d46fe3cd2 100644
--- a/src/KOKKOS/pair_vashishta_kokkos.cpp
+++ b/src/KOKKOS/pair_vashishta_kokkos.cpp
@@ -86,7 +86,7 @@ void PairVashishtaKokkos<DeviceType>::compute(int eflag_in, int vflag_in)
   }
   if (vflag_atom) {
     memoryKK->destroy_kokkos(k_vatom,vatom);
-    memoryKK->create_kokkos(k_vatom,vatom,maxvatom,6,"pair:vatom");
+    memoryKK->create_kokkos(k_vatom,vatom,maxvatom,"pair:vatom");
     d_vatom = k_vatom.view<DeviceType>();
   }
 
@@ -234,7 +234,7 @@ void PairVashishtaKokkos<DeviceType>::operator()(TagPairVashishtaComputeHalf<NEI
 
   // The f array is atomic
 
-  Kokkos::View<F_FLOAT*[3], typename DAT::t_f_array::array_layout,DeviceType,Kokkos::MemoryTraits<AtomicF<NEIGHFLAG>::value> > a_f = f;
+  Kokkos::View<F_FLOAT*[3], typename DAT::t_f_array::array_layout,typename KKDevice<DeviceType>::value,Kokkos::MemoryTraits<AtomicF<NEIGHFLAG>::value> > a_f = f;
 
   F_FLOAT delr1[3],delr2[3],fj[3],fk[3];
   F_FLOAT evdwl = 0.0;
@@ -585,10 +585,10 @@ void PairVashishtaKokkos<DeviceType>::init_style()
   int irequest = neighbor->nrequest - 1;
 
   neighbor->requests[irequest]->
-    kokkos_host = Kokkos::Impl::is_same<DeviceType,LMPHostType>::value &&
-    !Kokkos::Impl::is_same<DeviceType,LMPDeviceType>::value;
+    kokkos_host = std::is_same<DeviceType,LMPHostType>::value &&
+    !std::is_same<DeviceType,LMPDeviceType>::value;
   neighbor->requests[irequest]->
-    kokkos_device = Kokkos::Impl::is_same<DeviceType,LMPDeviceType>::value;
+    kokkos_device = std::is_same<DeviceType,LMPDeviceType>::value;
 
   // always request a full neighbor list
 
@@ -780,8 +780,8 @@ void PairVashishtaKokkos<DeviceType>::ev_tally(EV_FLOAT &ev, const int &i, const
 
   // The eatom and vatom arrays are atomic for half/thread neighbor list
 
-  Kokkos::View<E_FLOAT*, typename DAT::t_efloat_1d::array_layout,DeviceType,Kokkos::MemoryTraits<AtomicF<NEIGHFLAG>::value> > v_eatom = k_eatom.view<DeviceType>();
-  Kokkos::View<F_FLOAT*[6], typename DAT::t_virial_array::array_layout,DeviceType,Kokkos::MemoryTraits<AtomicF<NEIGHFLAG>::value> > v_vatom = k_vatom.view<DeviceType>();
+  Kokkos::View<E_FLOAT*, typename DAT::t_efloat_1d::array_layout,typename KKDevice<DeviceType>::value,Kokkos::MemoryTraits<AtomicF<NEIGHFLAG>::value> > v_eatom = k_eatom.view<DeviceType>();
+  Kokkos::View<F_FLOAT*[6], typename DAT::t_virial_array::array_layout,typename KKDevice<DeviceType>::value,Kokkos::MemoryTraits<AtomicF<NEIGHFLAG>::value> > v_vatom = k_vatom.view<DeviceType>();
 
 
   if (eflag_atom) {
@@ -856,8 +856,8 @@ void PairVashishtaKokkos<DeviceType>::ev_tally3(EV_FLOAT &ev, const int &i, cons
 
 // The eatom and vatom arrays are atomic for half/thread neighbor list
 
-  Kokkos::View<E_FLOAT*, typename DAT::t_efloat_1d::array_layout,DeviceType,Kokkos::MemoryTraits<AtomicF<NEIGHFLAG>::value> > v_eatom = k_eatom.view<DeviceType>();
-  Kokkos::View<F_FLOAT*[6], typename DAT::t_virial_array::array_layout,DeviceType,Kokkos::MemoryTraits<AtomicF<NEIGHFLAG>::value> > v_vatom = k_vatom.view<DeviceType>();
+  Kokkos::View<E_FLOAT*, typename DAT::t_efloat_1d::array_layout,typename KKDevice<DeviceType>::value,Kokkos::MemoryTraits<AtomicF<NEIGHFLAG>::value> > v_eatom = k_eatom.view<DeviceType>();
+  Kokkos::View<F_FLOAT*[6], typename DAT::t_virial_array::array_layout,typename KKDevice<DeviceType>::value,Kokkos::MemoryTraits<AtomicF<NEIGHFLAG>::value> > v_vatom = k_vatom.view<DeviceType>();
 
   if (eflag_atom) {
     epairthird = THIRD * (evdwl + ecoul);
diff --git a/src/KOKKOS/pair_yukawa_kokkos.cpp b/src/KOKKOS/pair_yukawa_kokkos.cpp
index 6dfffd4a54..5b641791d3 100644
--- a/src/KOKKOS/pair_yukawa_kokkos.cpp
+++ b/src/KOKKOS/pair_yukawa_kokkos.cpp
@@ -120,10 +120,10 @@ void PairYukawaKokkos<DeviceType>::init_style()
   int irequest = neighbor->nrequest - 1;
 
   neighbor->requests[irequest]->
-    kokkos_host = Kokkos::Impl::is_same<DeviceType,LMPHostType>::value &&
-    !Kokkos::Impl::is_same<DeviceType,LMPDeviceType>::value;
+    kokkos_host = std::is_same<DeviceType,LMPHostType>::value &&
+    !std::is_same<DeviceType,LMPDeviceType>::value;
   neighbor->requests[irequest]->
-    kokkos_device = Kokkos::Impl::is_same<DeviceType,LMPDeviceType>::value;
+    kokkos_device = std::is_same<DeviceType,LMPDeviceType>::value;
 
   if (neighflag == FULL) {
     neighbor->requests[irequest]->full = 1;
@@ -184,7 +184,7 @@ void PairYukawaKokkos<DeviceType>::compute(int eflag_in, int vflag_in)
   }
   if (vflag_atom) {
     memoryKK->destroy_kokkos(k_vatom,vatom);
-    memoryKK->create_kokkos(k_vatom,vatom,maxvatom,6,"pair:vatom");
+    memoryKK->create_kokkos(k_vatom,vatom,maxvatom,"pair:vatom");
     d_vatom = k_vatom.view<DeviceType>();
   }
 
diff --git a/src/KOKKOS/pair_zbl_kokkos.cpp b/src/KOKKOS/pair_zbl_kokkos.cpp
index 5697dd5b00..fe34f58fa6 100644
--- a/src/KOKKOS/pair_zbl_kokkos.cpp
+++ b/src/KOKKOS/pair_zbl_kokkos.cpp
@@ -92,10 +92,10 @@ void PairZBLKokkos<DeviceType>::init_style()
   int irequest = neighbor->nrequest - 1;
 
   neighbor->requests[irequest]->
-    kokkos_host = Kokkos::Impl::is_same<DeviceType,LMPHostType>::value &&
-    !Kokkos::Impl::is_same<DeviceType,LMPDeviceType>::value;
+    kokkos_host = std::is_same<DeviceType,LMPHostType>::value &&
+    !std::is_same<DeviceType,LMPDeviceType>::value;
   neighbor->requests[irequest]->
-    kokkos_device = Kokkos::Impl::is_same<DeviceType,LMPDeviceType>::value;
+    kokkos_device = std::is_same<DeviceType,LMPDeviceType>::value;
 
   if (neighflag == FULL) {
     neighbor->requests[irequest]->full = 1;
@@ -134,7 +134,7 @@ void PairZBLKokkos<DeviceType>::compute(int eflag_in, int vflag_in)
   }
   if (vflag_atom) {
     memoryKK->destroy_kokkos(k_vatom,vatom);
-    memoryKK->create_kokkos(k_vatom,vatom,maxvatom,6,"pair:vatom");
+    memoryKK->create_kokkos(k_vatom,vatom,maxvatom,"pair:vatom");
     d_vatom = k_vatom.view<DeviceType>();
   }
 
diff --git a/src/KOKKOS/pppm_kokkos.cpp b/src/KOKKOS/pppm_kokkos.cpp
index 36e48febe8..62d7ccc3cd 100644
--- a/src/KOKKOS/pppm_kokkos.cpp
+++ b/src/KOKKOS/pppm_kokkos.cpp
@@ -620,7 +620,7 @@ void PPPMKokkos<DeviceType>::compute(int eflag, int vflag)
   }
   if (vflag_atom) {
     memoryKK->destroy_kokkos(k_vatom,vatom);
-    memoryKK->create_kokkos(k_vatom,vatom,maxvatom,6,"pair:vatom");
+    memoryKK->create_kokkos(k_vatom,vatom,maxvatom,"pair:vatom");
     d_vatom = k_vatom.view<DeviceType>();
   }
 
@@ -669,7 +669,7 @@ void PPPMKokkos<DeviceType>::compute(int eflag, int vflag)
     nmax = atomKK->nmax;
     //memory->create(part2grid,nmax,3,"pppm:part2grid");
     d_part2grid = typename AT::t_int_1d_3("pppm:part2grid",nmax);
-    d_rho1d = typename AT::t_FFT_SCALAR_2d_3("pppm:rho1d",nmax,order/2+order/2+1);
+    d_rho1d = typename FFT_AT::t_FFT_SCALAR_2d_3("pppm:rho1d",nmax,order/2+order/2+1);
   }
 
   // find grid points for all my particles
@@ -799,7 +799,7 @@ void PPPMKokkos<DeviceType>::operator()(TagPPPM_self2, const int &i) const
 template<class DeviceType>
 void PPPMKokkos<DeviceType>::allocate()
 {
-  d_density_brick = typename AT::t_FFT_SCALAR_3d("pppm:density_brick",nzhi_out-nzlo_out+1,nyhi_out-nylo_out+1,nxhi_out-nxlo_out+1);
+  d_density_brick = typename FFT_AT::t_FFT_SCALAR_3d("pppm:density_brick",nzhi_out-nzlo_out+1,nyhi_out-nylo_out+1,nxhi_out-nxlo_out+1);
 
   memoryKK->create_kokkos(k_density_fft,density_fft,nfft_both,"pppm:d_density_fft");
   d_density_fft = k_density_fft.view<DeviceType>();
@@ -821,22 +821,22 @@ void PPPMKokkos<DeviceType>::allocate()
     d_fkz = typename AT::t_float_1d("pppm:d_fkz",nfft_both);
   }
 
-  d_vdx_brick = typename AT::t_FFT_SCALAR_3d("pppm:d_vdx_brick",nzhi_out-nzlo_out+1,nyhi_out-nylo_out+1,nxhi_out-nxlo_out+1);
-  d_vdy_brick = typename AT::t_FFT_SCALAR_3d("pppm:d_vdy_brick",nzhi_out-nzlo_out+1,nyhi_out-nylo_out+1,nxhi_out-nxlo_out+1);
-  d_vdz_brick = typename AT::t_FFT_SCALAR_3d("pppm:d_vdz_brick",nzhi_out-nzlo_out+1,nyhi_out-nylo_out+1,nxhi_out-nxlo_out+1);
+  d_vdx_brick = typename FFT_AT::t_FFT_SCALAR_3d("pppm:d_vdx_brick",nzhi_out-nzlo_out+1,nyhi_out-nylo_out+1,nxhi_out-nxlo_out+1);
+  d_vdy_brick = typename FFT_AT::t_FFT_SCALAR_3d("pppm:d_vdy_brick",nzhi_out-nzlo_out+1,nyhi_out-nylo_out+1,nxhi_out-nxlo_out+1);
+  d_vdz_brick = typename FFT_AT::t_FFT_SCALAR_3d("pppm:d_vdz_brick",nzhi_out-nzlo_out+1,nyhi_out-nylo_out+1,nxhi_out-nxlo_out+1);
 
   // summation coeffs
 
   order_allocated = order;
   k_gf_b = typename DAT::tdual_float_1d("pppm:gf_b",order);
   d_gf_b = k_gf_b.view<DeviceType>();
-  d_rho1d = typename AT::t_FFT_SCALAR_2d_3("pppm:rho1d",nmax,order/2+order/2+1);
-  k_rho_coeff = DAT::tdual_FFT_SCALAR_2d("pppm:rho_coeff",order,order/2-(1-order)/2+1);
+  d_rho1d = typename FFT_AT::t_FFT_SCALAR_2d_3("pppm:rho1d",nmax,order/2+order/2+1);
+  k_rho_coeff = FFT_DAT::tdual_FFT_SCALAR_2d("pppm:rho_coeff",order,order/2-(1-order)/2+1);
   d_rho_coeff = k_rho_coeff.view<DeviceType>();
   h_rho_coeff = k_rho_coeff.h_view;
 
   // create 2 FFTs and a Remap
-  // 1st FFT keeps data in FFT decompostion
+  // 1st FFT keeps data in FFT decomposition
   // 2nd FFT returns data in 3d brick decomposition
   // remap takes data from 3d brick to FFT decomposition
 
@@ -902,14 +902,14 @@ void PPPMKokkos<DeviceType>::allocate_peratom()
 {
   peratom_allocate_flag = 1;
 
-  d_u_brick = typename AT::t_FFT_SCALAR_3d("pppm:u_brick",nzhi_out-nzlo_out+1,nyhi_out-nylo_out+1,nxhi_out-nxlo_out+1);
+  d_u_brick = typename FFT_AT::t_FFT_SCALAR_3d("pppm:u_brick",nzhi_out-nzlo_out+1,nyhi_out-nylo_out+1,nxhi_out-nxlo_out+1);
 
-  d_v0_brick = typename AT::t_FFT_SCALAR_3d("pppm:d_v0_brick",nzhi_out-nzlo_out+1,nyhi_out-nylo_out+1,nxhi_out-nxlo_out+1);
-  d_v1_brick = typename AT::t_FFT_SCALAR_3d("pppm:d_v1_brick",nzhi_out-nzlo_out+1,nyhi_out-nylo_out+1,nxhi_out-nxlo_out+1);
-  d_v2_brick = typename AT::t_FFT_SCALAR_3d("pppm:d_v2_brick",nzhi_out-nzlo_out+1,nyhi_out-nylo_out+1,nxhi_out-nxlo_out+1);
-  d_v3_brick = typename AT::t_FFT_SCALAR_3d("pppm:d_v3_brick",nzhi_out-nzlo_out+1,nyhi_out-nylo_out+1,nxhi_out-nxlo_out+1);
-  d_v4_brick = typename AT::t_FFT_SCALAR_3d("pppm:d_v4_brick",nzhi_out-nzlo_out+1,nyhi_out-nylo_out+1,nxhi_out-nxlo_out+1);
-  d_v5_brick = typename AT::t_FFT_SCALAR_3d("pppm:d_v5_brick",nzhi_out-nzlo_out+1,nyhi_out-nylo_out+1,nxhi_out-nxlo_out+1);
+  d_v0_brick = typename FFT_AT::t_FFT_SCALAR_3d("pppm:d_v0_brick",nzhi_out-nzlo_out+1,nyhi_out-nylo_out+1,nxhi_out-nxlo_out+1);
+  d_v1_brick = typename FFT_AT::t_FFT_SCALAR_3d("pppm:d_v1_brick",nzhi_out-nzlo_out+1,nyhi_out-nylo_out+1,nxhi_out-nxlo_out+1);
+  d_v2_brick = typename FFT_AT::t_FFT_SCALAR_3d("pppm:d_v2_brick",nzhi_out-nzlo_out+1,nyhi_out-nylo_out+1,nxhi_out-nxlo_out+1);
+  d_v3_brick = typename FFT_AT::t_FFT_SCALAR_3d("pppm:d_v3_brick",nzhi_out-nzlo_out+1,nyhi_out-nylo_out+1,nxhi_out-nxlo_out+1);
+  d_v4_brick = typename FFT_AT::t_FFT_SCALAR_3d("pppm:d_v4_brick",nzhi_out-nzlo_out+1,nyhi_out-nylo_out+1,nxhi_out-nxlo_out+1);
+  d_v5_brick = typename FFT_AT::t_FFT_SCALAR_3d("pppm:d_v5_brick",nzhi_out-nzlo_out+1,nyhi_out-nylo_out+1,nxhi_out-nxlo_out+1);
 
 
   // create ghost grid object for rho and electric field communication
@@ -1670,7 +1670,7 @@ KOKKOS_INLINE_FUNCTION
 void PPPMKokkos<DeviceType>::operator()(TagPPPM_make_rho_atomic, const int &i) const
 {
   // The density_brick array is atomic for Half/Thread neighbor style
-  Kokkos::View<FFT_SCALAR***,Kokkos::LayoutRight,DeviceType,Kokkos::MemoryTraits<Kokkos::Atomic|Kokkos::Unmanaged> > a_density_brick = d_density_brick;
+  Kokkos::View<FFT_SCALAR***,Kokkos::LayoutRight,typename KKDevice<DeviceType>::value,Kokkos::MemoryTraits<Kokkos::Atomic|Kokkos::Unmanaged> > a_density_brick = d_density_brick;
 
   int nx = d_part2grid(i,0);
   int ny = d_part2grid(i,1);
diff --git a/src/KOKKOS/pppm_kokkos.h b/src/KOKKOS/pppm_kokkos.h
index c855b1bda8..a07ed7d7c4 100644
--- a/src/KOKKOS/pppm_kokkos.h
+++ b/src/KOKKOS/pppm_kokkos.h
@@ -25,7 +25,8 @@ KSpaceStyle(pppm/kk/host,PPPMKokkos<LMPHostType>)
 #include "gridcomm_kokkos.h"
 #include "remap_kokkos.h"
 #include "fft3d_kokkos.h"
-#include "kokkos_base.h"
+#include "kokkos_base_fft.h"
+#include "fftdata_kokkos.h"
 #include "kokkos_type.h"
 
 // fix up FFT defines for KOKKOS with CUDA
@@ -107,10 +108,11 @@ struct TagPPPM_slabcorr4{};
 struct TagPPPM_timing_zero{};
 
 template<class DeviceType>
-class PPPMKokkos : public PPPM, public KokkosBase {
+class PPPMKokkos : public PPPM, public KokkosBaseFFT {
  public:
   typedef DeviceType device_type;
   typedef ArrayTypes<DeviceType> AT;
+  typedef FFTArrayTypes<DeviceType> FFT_AT;
 
   PPPMKokkos(class LAMMPS *);
   virtual ~PPPMKokkos();
@@ -308,7 +310,7 @@ class PPPMKokkos : public PPPM, public KokkosBase {
 
   int nx,ny,nz;
   typename AT::t_int_1d_um d_list_index;
-  typename AT::t_FFT_SCALAR_1d_um d_buf;
+  typename FFT_AT::t_FFT_SCALAR_1d_um d_buf;
 
   DAT::tdual_int_scalar k_flag;
 
@@ -323,31 +325,31 @@ class PPPMKokkos : public PPPM, public KokkosBase {
 
   int factors[3];
 
-  typename AT::t_FFT_SCALAR_3d d_density_brick;
-  typename AT::t_FFT_SCALAR_3d d_vdx_brick,d_vdy_brick,d_vdz_brick;
-  typename AT::t_FFT_SCALAR_3d d_u_brick;
-  typename AT::t_FFT_SCALAR_3d d_v0_brick,d_v1_brick,d_v2_brick;
-  typename AT::t_FFT_SCALAR_3d d_v3_brick,d_v4_brick,d_v5_brick;
+  typename FFT_AT::t_FFT_SCALAR_3d d_density_brick;
+  typename FFT_AT::t_FFT_SCALAR_3d d_vdx_brick,d_vdy_brick,d_vdz_brick;
+  typename FFT_AT::t_FFT_SCALAR_3d d_u_brick;
+  typename FFT_AT::t_FFT_SCALAR_3d d_v0_brick,d_v1_brick,d_v2_brick;
+  typename FFT_AT::t_FFT_SCALAR_3d d_v3_brick,d_v4_brick,d_v5_brick;
   typename AT::t_float_1d d_greensfn;
   typename AT::t_virial_array d_vg;
   typename AT::t_float_1d d_fkx;
   typename AT::t_float_1d d_fky;
   typename AT::t_float_1d d_fkz;
-  DAT::tdual_FFT_SCALAR_1d k_density_fft;
-  DAT::tdual_FFT_SCALAR_1d k_work1;
-  DAT::tdual_FFT_SCALAR_1d k_work2;
-  typename AT::t_FFT_SCALAR_1d d_density_fft;
-  typename AT::t_FFT_SCALAR_1d d_work1;
-  typename AT::t_FFT_SCALAR_1d d_work2;
+  FFT_DAT::tdual_FFT_SCALAR_1d k_density_fft;
+  FFT_DAT::tdual_FFT_SCALAR_1d k_work1;
+  FFT_DAT::tdual_FFT_SCALAR_1d k_work2;
+  typename FFT_AT::t_FFT_SCALAR_1d d_density_fft;
+  typename FFT_AT::t_FFT_SCALAR_1d d_work1;
+  typename FFT_AT::t_FFT_SCALAR_1d d_work2;
 
   DAT::tdual_float_1d k_gf_b;
   typename AT::t_float_1d d_gf_b;
 
   //FFT_SCALAR **rho1d,**rho_coeff,**drho1d,**drho_coeff;
-  typename AT::t_FFT_SCALAR_2d_3 d_rho1d;
-  DAT::tdual_FFT_SCALAR_2d k_rho_coeff;
-  typename AT::t_FFT_SCALAR_2d d_rho_coeff;
-  HAT::t_FFT_SCALAR_2d h_rho_coeff;
+  typename FFT_AT::t_FFT_SCALAR_2d_3 d_rho1d;
+  FFT_DAT::tdual_FFT_SCALAR_2d k_rho_coeff;
+  typename FFT_AT::t_FFT_SCALAR_2d d_rho_coeff;
+  FFT_HAT::t_FFT_SCALAR_2d h_rho_coeff;
   //double **acons;
   typename Kokkos::DualView<F_FLOAT[8][7],Kokkos::LayoutRight,DeviceType>::t_host acons;
 
diff --git a/src/KOKKOS/remap_kokkos.cpp b/src/KOKKOS/remap_kokkos.cpp
index 4d4300daf0..e94a4ddd9f 100644
--- a/src/KOKKOS/remap_kokkos.cpp
+++ b/src/KOKKOS/remap_kokkos.cpp
@@ -58,7 +58,7 @@ RemapKokkos<DeviceType>::~RemapKokkos()
 /* ---------------------------------------------------------------------- */
 
 template<class DeviceType>
-void RemapKokkos<DeviceType>::perform(typename AT::t_FFT_SCALAR_1d d_in, typename AT::t_FFT_SCALAR_1d d_out, typename AT::t_FFT_SCALAR_1d d_buf)
+void RemapKokkos<DeviceType>::perform(typename FFT_AT::t_FFT_SCALAR_1d d_in, typename FFT_AT::t_FFT_SCALAR_1d d_out, typename FFT_AT::t_FFT_SCALAR_1d d_buf)
 {
   remap_3d_kokkos(d_in,d_out,d_buf,plan);
 }
@@ -102,7 +102,7 @@ void RemapKokkos<DeviceType>::perform(typename AT::t_FFT_SCALAR_1d d_in, typenam
 ------------------------------------------------------------------------- */
 
 template<class DeviceType>
-void RemapKokkos<DeviceType>::remap_3d_kokkos(typename AT::t_FFT_SCALAR_1d d_in, typename AT::t_FFT_SCALAR_1d d_out, typename AT::t_FFT_SCALAR_1d d_buf,
+void RemapKokkos<DeviceType>::remap_3d_kokkos(typename FFT_AT::t_FFT_SCALAR_1d d_in, typename FFT_AT::t_FFT_SCALAR_1d d_out, typename FFT_AT::t_FFT_SCALAR_1d d_buf,
               struct remap_plan_3d_kokkos<DeviceType> *plan)
 {
   // collective flag not yet supported
@@ -110,7 +110,7 @@ void RemapKokkos<DeviceType>::remap_3d_kokkos(typename AT::t_FFT_SCALAR_1d d_in,
   // use point-to-point communication
 
   int i,isend,irecv;
-  typename AT::t_FFT_SCALAR_1d d_scratch;
+  typename FFT_AT::t_FFT_SCALAR_1d d_scratch;
 
   if (plan->memory == 0)
     d_scratch = d_buf;
@@ -120,7 +120,7 @@ void RemapKokkos<DeviceType>::remap_3d_kokkos(typename AT::t_FFT_SCALAR_1d d_in,
   // post all recvs into scratch space
 
   for (irecv = 0; irecv < plan->nrecv; irecv++) {
-    FFT_SCALAR* scratch = d_scratch.ptr_on_device() + plan->recv_bufloc[irecv];
+    FFT_SCALAR* scratch = d_scratch.data() + plan->recv_bufloc[irecv];
     MPI_Irecv(scratch,plan->recv_size[irecv],
               MPI_FFT_SCALAR,plan->recv_proc[irecv],0,
               plan->comm,&plan->request[irecv]);
@@ -132,7 +132,7 @@ void RemapKokkos<DeviceType>::remap_3d_kokkos(typename AT::t_FFT_SCALAR_1d d_in,
     int in_offset = plan->send_offset[isend];
     plan->pack(d_in,in_offset,
                plan->d_sendbuf,0,&plan->packplan[isend]);
-    MPI_Send(plan->d_sendbuf.ptr_on_device(),plan->send_size[isend],MPI_FFT_SCALAR,
+    MPI_Send(plan->d_sendbuf.data(),plan->send_size[isend],MPI_FFT_SCALAR,
              plan->send_proc[isend],0,plan->comm);
   }
 
@@ -442,7 +442,7 @@ struct remap_plan_3d_kokkos<DeviceType>* RemapKokkos<DeviceType>::remap_3d_creat
     size = MAX(size,plan->send_size[nsend]);
 
   if (size) {
-    plan->d_sendbuf = typename AT::t_FFT_SCALAR_1d("remap3d:sendbuf",size);
+    plan->d_sendbuf = typename FFT_AT::t_FFT_SCALAR_1d("remap3d:sendbuf",size);
     if (!plan->d_sendbuf.data()) return NULL;
   }
 
@@ -452,7 +452,7 @@ struct remap_plan_3d_kokkos<DeviceType>* RemapKokkos<DeviceType>::remap_3d_creat
   if (memory == 1) {
     if (nrecv > 0) {
       plan->d_scratch =
-        typename AT::t_FFT_SCALAR_1d("remap3d:scratch",nqty*out.isize*out.jsize*out.ksize);
+        typename FFT_AT::t_FFT_SCALAR_1d("remap3d:scratch",nqty*out.isize*out.jsize*out.ksize);
       if (!plan->d_scratch.data()) return NULL;
     }
   }
@@ -505,7 +505,7 @@ void RemapKokkos<DeviceType>::remap_3d_destroy_plan_kokkos(struct remap_plan_3d_
 
 namespace LAMMPS_NS {
 template class RemapKokkos<LMPDeviceType>;
-#ifdef KOKKOS_HAVE_CUDA
+#ifdef KOKKOS_ENABLE_CUDA
 template class RemapKokkos<LMPHostType>;
 #endif
 }
diff --git a/src/KOKKOS/remap_kokkos.h b/src/KOKKOS/remap_kokkos.h
index f77ce9fb72..9f1334be26 100644
--- a/src/KOKKOS/remap_kokkos.h
+++ b/src/KOKKOS/remap_kokkos.h
@@ -18,7 +18,6 @@
 #include <mpi.h>
 #include "fftdata_kokkos.h"
 #include "remap.h"
-#include "kokkos_type.h"
 
 namespace LAMMPS_NS {
 
@@ -27,12 +26,12 @@ namespace LAMMPS_NS {
 template<class DeviceType>
 struct remap_plan_3d_kokkos {
   typedef DeviceType device_type;
-  typedef ArrayTypes<DeviceType> AT;
-  typename AT::t_FFT_SCALAR_1d d_sendbuf;                  // buffer for MPI sends
-  typename AT::t_FFT_SCALAR_1d d_scratch;                  // scratch buffer for MPI recvs
-  void (*pack)(typename AT::t_FFT_SCALAR_1d_um, int, typename AT::t_FFT_SCALAR_1d_um, int, struct pack_plan_3d *);
+  typedef FFTArrayTypes<DeviceType> FFT_AT;
+  typename FFT_AT::t_FFT_SCALAR_1d d_sendbuf;                  // buffer for MPI sends
+  typename FFT_AT::t_FFT_SCALAR_1d d_scratch;                  // scratch buffer for MPI recvs
+  void (*pack)(typename FFT_AT::t_FFT_SCALAR_1d_um, int, typename FFT_AT::t_FFT_SCALAR_1d_um, int, struct pack_plan_3d *);
                                     // which pack function to use
-  void (*unpack)(typename AT::t_FFT_SCALAR_1d_um, int, typename AT::t_FFT_SCALAR_1d_um, int, struct pack_plan_3d *);
+  void (*unpack)(typename FFT_AT::t_FFT_SCALAR_1d_um, int, typename FFT_AT::t_FFT_SCALAR_1d_um, int, struct pack_plan_3d *);
                                     // which unpack function to use
   int *send_offset;                 // extraction loc for each send
   int *send_size;                   // size of each send message
@@ -58,16 +57,16 @@ template<class DeviceType>
 class RemapKokkos : protected Pointers {
  public:
   typedef DeviceType device_type;
-  typedef ArrayTypes<DeviceType> AT;
+  typedef FFTArrayTypes<DeviceType> FFT_AT;
   RemapKokkos(class LAMMPS *);
   RemapKokkos(class LAMMPS *, MPI_Comm,int,int,int,int,int,int,
         int,int,int,int,int,int,int,int,int,int,int);
   ~RemapKokkos();
-  void perform(typename AT::t_FFT_SCALAR_1d, typename AT::t_FFT_SCALAR_1d, typename AT::t_FFT_SCALAR_1d);
+  void perform(typename FFT_AT::t_FFT_SCALAR_1d, typename FFT_AT::t_FFT_SCALAR_1d, typename FFT_AT::t_FFT_SCALAR_1d);
 
   struct remap_plan_3d_kokkos<DeviceType> *plan;
 
-  void remap_3d_kokkos(typename AT::t_FFT_SCALAR_1d, typename AT::t_FFT_SCALAR_1d, typename AT::t_FFT_SCALAR_1d, struct remap_plan_3d_kokkos<DeviceType> *);
+  void remap_3d_kokkos(typename FFT_AT::t_FFT_SCALAR_1d, typename FFT_AT::t_FFT_SCALAR_1d, typename FFT_AT::t_FFT_SCALAR_1d, struct remap_plan_3d_kokkos<DeviceType> *);
   struct remap_plan_3d_kokkos<DeviceType> *remap_3d_create_plan_kokkos(MPI_Comm,
                                              int, int, int, int, int, int,
                                              int, int, int, int, int, int,
diff --git a/src/KOKKOS/sna_kokkos.h b/src/KOKKOS/sna_kokkos.h
index 775c8eead4..b7162cf8d6 100644
--- a/src/KOKKOS/sna_kokkos.h
+++ b/src/KOKKOS/sna_kokkos.h
@@ -28,19 +28,53 @@ namespace LAMMPS_NS {
 typedef double SNAreal;
 
 //typedef struct { SNAreal re, im; } SNAcomplex;
-struct alignas(2*sizeof(SNAreal)) SNAcomplex{
-  SNAreal re, im;
+template <typename real>
+struct alignas(2*sizeof(real)) SNAComplex
+{
+  real re,im;
 
-  KOKKOS_INLINE_FUNCTION
-  SNAcomplex() : re(0),im(0)
-  {}
+  KOKKOS_FORCEINLINE_FUNCTION SNAComplex() = default;
+
+  KOKKOS_FORCEINLINE_FUNCTION SNAComplex(real re)
+   : re(re), im(static_cast<real>(0.)) { ; }
+
+  KOKKOS_FORCEINLINE_FUNCTION SNAComplex(real re, real im)
+   : re(re), im(im) { ; }
+
+  KOKKOS_FORCEINLINE_FUNCTION SNAComplex(const SNAComplex& other)
+   : re(other.re), im(other.im) { ; }
+
+  KOKKOS_FORCEINLINE_FUNCTION SNAComplex& operator=(const SNAComplex& other) {
+    re = other.re; im = other.im;
+    return *this;
+  }
+
+  KOKKOS_FORCEINLINE_FUNCTION SNAComplex(SNAComplex&& other)
+   : re(other.re), im(other.im) { ; }
+
+  KOKKOS_FORCEINLINE_FUNCTION SNAComplex& operator=(SNAComplex&& other) {
+    re = other.re; im = other.im;
+    return *this;
+  }
+
+  KOKKOS_FORCEINLINE_FUNCTION SNAComplex operator+(SNAComplex const& other) {
+    return SNAComplex(re + other.re, im + other.im);
+  }
+
+  KOKKOS_FORCEINLINE_FUNCTION SNAComplex& operator+=(SNAComplex const& other) {
+    re += other.re; im += other.im;
+    return *this;
+  }
 
-  KOKKOS_INLINE_FUNCTION
-  SNAcomplex(SNAreal real_in, SNAreal imag_in)
-      :re(real_in),im(imag_in)
-  {}
 };
 
+template <typename real>
+KOKKOS_FORCEINLINE_FUNCTION SNAComplex<real> operator*(const real& r, const SNAComplex<real>& self) {
+  return SNAComplex<real>(r*self.re, r*self.im);
+}
+
+typedef SNAComplex<SNAreal> SNAcomplex;
+
 //struct SNAKK_ZINDICES {
 //  int j1, j2, j, ma1min, ma2max, mb1min, mb2max, na, nb, jju;
 //};
@@ -55,43 +89,27 @@ class SNAKokkos {
 public:
   typedef Kokkos::View<int*, DeviceType> t_sna_1i;
   typedef Kokkos::View<double*, DeviceType> t_sna_1d;
-  typedef Kokkos::View<double*, DeviceType, Kokkos::MemoryTraits<Kokkos::Atomic> > t_sna_1d_atomic;
+  typedef Kokkos::View<double*, typename KKDevice<DeviceType>::value, Kokkos::MemoryTraits<Kokkos::Atomic> > t_sna_1d_atomic;
   typedef Kokkos::View<int**, DeviceType> t_sna_2i;
   typedef Kokkos::View<double**, DeviceType> t_sna_2d;
+  typedef Kokkos::View<double**, Kokkos::LayoutLeft, DeviceType> t_sna_2d_ll;
   typedef Kokkos::View<double***, DeviceType> t_sna_3d;
   typedef Kokkos::View<double***[3], DeviceType> t_sna_4d;
   typedef Kokkos::View<double**[3], DeviceType> t_sna_3d3;
   typedef Kokkos::View<double*****, DeviceType> t_sna_5d;
 
   typedef Kokkos::View<SNAcomplex*, DeviceType> t_sna_1c;
-  typedef Kokkos::View<SNAcomplex*, DeviceType, Kokkos::MemoryTraits<Kokkos::Atomic> > t_sna_1c_atomic;
+  typedef Kokkos::View<SNAcomplex*, typename KKDevice<DeviceType>::value, Kokkos::MemoryTraits<Kokkos::Atomic> > t_sna_1c_atomic;
   typedef Kokkos::View<SNAcomplex**, DeviceType> t_sna_2c;
+  typedef Kokkos::View<SNAcomplex**, Kokkos::LayoutLeft, DeviceType> t_sna_2c_ll;
   typedef Kokkos::View<SNAcomplex**, Kokkos::LayoutRight, DeviceType> t_sna_2c_lr;
   typedef Kokkos::View<SNAcomplex***, DeviceType> t_sna_3c;
+  typedef Kokkos::View<SNAcomplex***, Kokkos::LayoutLeft, DeviceType> t_sna_3c_ll;
   typedef Kokkos::View<SNAcomplex***[3], DeviceType> t_sna_4c;
+  typedef Kokkos::View<SNAcomplex***[3], Kokkos::LayoutLeft, DeviceType> t_sna_4c_ll;
   typedef Kokkos::View<SNAcomplex**[3], DeviceType> t_sna_3c3;
   typedef Kokkos::View<SNAcomplex*****, DeviceType> t_sna_5c;
 
-// Helper class to get ulisttot_r
-
-template<typename DeviceLayout, typename T1, typename T2>
-class UlisttotHelper {
-public:
-  inline
-  static void transpose(T1 &ulisttot_lr, const T2 &ulisttot) {
-    Kokkos::deep_copy(ulisttot_lr,ulisttot);
-  }
-};
-
-template<typename T1, typename T2>
-class UlisttotHelper<Kokkos::LayoutRight,T1,T2> {
-public:
-  inline
-  static void transpose(T1 &ulisttot_lr, const T2 &ulisttot) {
-    ulisttot_lr = ulisttot;
-  }
-};
-
 inline
   SNAKokkos() {};
   KOKKOS_INLINE_FUNCTION
@@ -113,20 +131,17 @@ inline
 
   int ncoeff;
 
-inline
-  void transpose_ulisttot();
-
   // functions for bispectrum coefficients
   KOKKOS_INLINE_FUNCTION
-  void pre_ui(const int&); // ForceSNAP
+  void pre_ui(const typename Kokkos::TeamPolicy<DeviceType>::member_type& team,const int&); // ForceSNAP
   KOKKOS_INLINE_FUNCTION
-  void compute_ui(const typename Kokkos::TeamPolicy<DeviceType>::member_type& team, int, int); // ForceSNAP
+  void compute_ui(const typename Kokkos::TeamPolicy<DeviceType>::member_type& team, const int, const int); // ForceSNAP
   KOKKOS_INLINE_FUNCTION
-  void compute_ui_orig(const typename Kokkos::TeamPolicy<DeviceType>::member_type& team, int, int); // ForceSNAP
+  void compute_ui_cpu(const typename Kokkos::TeamPolicy<DeviceType>::member_type& team, int, int); // ForceSNAP
   KOKKOS_INLINE_FUNCTION
   void compute_zi(const int&);    // ForceSNAP
   KOKKOS_INLINE_FUNCTION
-  void zero_yi(const int&);
+  void zero_yi(const int&,const int&); // ForceSNAP
   KOKKOS_INLINE_FUNCTION
   void compute_yi(int,
    const Kokkos::View<F_FLOAT**, DeviceType> &beta); // ForceSNAP
@@ -136,14 +151,29 @@ inline
   // functions for derivatives
 
   KOKKOS_INLINE_FUNCTION
-  void compute_duidrj(const typename Kokkos::TeamPolicy<DeviceType>::member_type& team, int, int); //ForceSNAP
+  void compute_fused_deidrj(const typename Kokkos::TeamPolicy<DeviceType>::member_type& team, const int, const int); //ForceSNAP
   KOKKOS_INLINE_FUNCTION
-  void compute_deidrj(const typename Kokkos::TeamPolicy<DeviceType>::member_type& team, int, int); // ForceSNAP
+  void compute_duidrj_cpu(const typename Kokkos::TeamPolicy<DeviceType>::member_type& team, int, int); //ForceSNAP
+  KOKKOS_INLINE_FUNCTION
+  void compute_deidrj_cpu(const typename Kokkos::TeamPolicy<DeviceType>::member_type& team, int, int); // ForceSNAP
   KOKKOS_INLINE_FUNCTION
   double compute_sfac(double, double); // add_uarraytot, compute_duarray
   KOKKOS_INLINE_FUNCTION
   double compute_dsfac(double, double); // compute_duarray
 
+  // efficient complex FMA
+  // efficient caxpy (i.e., y += a x)
+  static KOKKOS_FORCEINLINE_FUNCTION
+  void caxpy(const SNAcomplex& a, const SNAcomplex& x, SNAcomplex& y);
+
+  // efficient complex FMA, conjugate of scalar
+  static KOKKOS_FORCEINLINE_FUNCTION
+  void caconjxpy(const SNAcomplex& a, const SNAcomplex& x, SNAcomplex& y);
+
+  // Set the direction for split ComputeDuidrj
+  KOKKOS_INLINE_FUNCTION
+  void set_dir(int);
+
 #ifdef TIMING_INFO
   double* timers;
   timespec starttime, endtime;
@@ -166,16 +196,15 @@ inline
 
   int twojmax, diagonalstyle;
 
-  t_sna_2d blist;
-  t_sna_2c ulisttot;
-  t_sna_2c_lr ulisttot_lr;
-  t_sna_2c zlist;
+  t_sna_2d_ll blist;
+  t_sna_2c_ll ulisttot;
+  t_sna_2c_ll zlist;
 
-  t_sna_3c ulist;
-  t_sna_2c_lr ylist;
+  t_sna_3c_ll ulist;
+  t_sna_2c_ll ylist;
 
   // derivatives of data
-  t_sna_4c dulist;
+  t_sna_4c_ll dulist;
 
   int idxcg_max, idxu_max, idxz_max, idxb_max;
 
@@ -193,7 +222,7 @@ private:
 
   // data for bispectrum coefficients
 
-  // Same accross all SNAKokkos
+  // Same across all SNAKokkos
   t_sna_1d cglist;
   t_sna_2d rootpqarray;
 
@@ -212,25 +241,24 @@ inline
 
 inline
   void init_rootpqarray();    // init()
-  KOKKOS_INLINE_FUNCTION
-  void zero_uarraytot(const int&);      // compute_ui
-  KOKKOS_INLINE_FUNCTION
-  void addself_uarraytot(const int&, const double&); // compute_ui
+
   KOKKOS_INLINE_FUNCTION
   void add_uarraytot(const typename Kokkos::TeamPolicy<DeviceType>::member_type& team, int, int, double, double, double); // compute_ui
 
   KOKKOS_INLINE_FUNCTION
-  void compute_uarray(const typename Kokkos::TeamPolicy<DeviceType>::member_type& team, int, int,
+  void compute_uarray_cpu(const typename Kokkos::TeamPolicy<DeviceType>::member_type& team, int, int,
                       double, double, double,
-                      double, double); // compute_ui
+                      double, double); // compute_ui_cpu
+
+
   inline
   double deltacg(int, int, int);  // init_clebsch_gordan
 
 inline
   int compute_ncoeff();           // SNAKokkos()
   KOKKOS_INLINE_FUNCTION
-  void compute_duarray(const typename Kokkos::TeamPolicy<DeviceType>::member_type& team, int, int,
-                       double, double, double, // compute_duidrj
+  void compute_duarray_cpu(const typename Kokkos::TeamPolicy<DeviceType>::member_type& team, int, int,
+                       double, double, double, // compute_duidrj_cpu
                        double, double, double, double, double);
 
   // Sets the style for the switching function
@@ -243,6 +271,9 @@ inline
 
   int bzero_flag; // 1 if bzero subtracted from barray
   Kokkos::View<double*, DeviceType> bzero; // array of B values for isolated atoms
+
+  // for per-direction dulist calculation, specify the direction.
+  int dir;
 };
 
 }
diff --git a/src/KOKKOS/sna_kokkos_impl.h b/src/KOKKOS/sna_kokkos_impl.h
index 8d5a4a21be..4ed385ccc1 100644
--- a/src/KOKKOS/sna_kokkos_impl.h
+++ b/src/KOKKOS/sna_kokkos_impl.h
@@ -19,6 +19,7 @@
 #include <cmath>
 #include <cstring>
 #include <cstdlib>
+#include <type_traits>
 
 namespace LAMMPS_NS {
 
@@ -224,16 +225,30 @@ void SNAKokkos<DeviceType>::grow_rij(int newnatom, int newnmax)
   rcutij = t_sna_2d("sna:rcutij",natom,nmax);
   dedr = t_sna_3d("sna:dedr",natom,nmax,3);
 
-  blist = t_sna_2d("sna:blist",natom,idxb_max);
-  ulisttot = t_sna_2c("sna:ulisttot",natom,idxu_max);
-  if (!Kokkos::Impl::is_same<typename DeviceType::array_layout,Kokkos::LayoutRight>::value)
-    ulisttot_lr = t_sna_2c_lr("sna:ulisttot_lr",natom,idxu_max);
-  zlist = t_sna_2c("sna:zlist",natom,idxz_max);
+  blist = t_sna_2d_ll("sna:blist",idxb_max,natom);
+  //ulisttot = t_sna_2c("sna:ulisttot",natom,idxu_max);
+  ulisttot = t_sna_2c_ll("sna:ulisttot",idxu_max,natom);
 
-  ulist = t_sna_3c("sna:ulist",natom,nmax,idxu_max);
-  ylist = t_sna_2c_lr("sna:ylist",natom,idxu_max);
+  zlist = t_sna_2c_ll("sna:zlist",idxz_max,natom);
 
-  dulist = t_sna_4c("sna:dulist",natom,nmax,idxu_max);
+  //ulist = t_sna_3c("sna:ulist",natom,nmax,idxu_max);
+#ifdef KOKKOS_ENABLE_CUDA
+  if (std::is_same<DeviceType,Kokkos::Cuda>::value) {
+    // dummy allocation
+    ulist = t_sna_3c_ll("sna:ulist",1,1,1);
+    dulist = t_sna_4c_ll("sna:dulist",1,1,1);
+  } else {
+#endif
+    ulist = t_sna_3c_ll("sna:ulist",idxu_max,natom,nmax);
+    dulist = t_sna_4c_ll("sna:dulist",idxu_max,natom,nmax);
+#ifdef KOKKOS_ENABLE_CUDA
+  }
+#endif
+
+  //ylist = t_sna_2c_lr("sna:ylist",natom,idxu_max);
+  ylist = t_sna_2c_ll("sna:ylist",idxu_max,natom);
+
+  dulist = t_sna_4c_ll("sna:dulist",idxu_max,natom,nmax);
 }
 
 /* ----------------------------------------------------------------------
@@ -242,24 +257,185 @@ void SNAKokkos<DeviceType>::grow_rij(int newnatom, int newnmax)
 
 template<class DeviceType>
 KOKKOS_INLINE_FUNCTION
-void SNAKokkos<DeviceType>::pre_ui(const int& iatom)
+void SNAKokkos<DeviceType>::pre_ui(const typename Kokkos::TeamPolicy<DeviceType>::member_type& team, const int& iatom)
 {
-  //if(team.team_rank() == 0) {
-    zero_uarraytot(iatom);
-    //Kokkos::single(Kokkos::PerThread(team), [&] (){
-    addself_uarraytot(iatom,wself);
-    //});
-  //}
-  //team.team_barrier();
+  for (int j = 0; j <= twojmax; j++) {
+    const int jju = idxu_block(j);
+
+    // Only diagonal elements get initialized
+    // for (int m = 0; m < (j+1)*(j+1); m++)
+    Kokkos::parallel_for(Kokkos::ThreadVectorRange(team, (j+1)*(j+1)),
+      [&] (const int m) {
+
+      const int jjup = jju + m;
+
+      // if m is on the "diagonal", initialize it with the self energy.
+      // Otherwise zero it out
+      SNAcomplex init = {0., 0.};
+      if (m % (j+2) == 0) { init = {wself, 0.0}; }
+
+      ulisttot(jjup, iatom) = init;
+    });
+  }
+
 }
 
 /* ----------------------------------------------------------------------
-   compute Ui by summing over neighbors j
+   compute Ui by computing Wigner U-functions for one neighbor and
+   accumulating to the total. GPU only.
 ------------------------------------------------------------------------- */
 
 template<class DeviceType>
 KOKKOS_INLINE_FUNCTION
-void SNAKokkos<DeviceType>::compute_ui(const typename Kokkos::TeamPolicy<DeviceType>::member_type& team, int iatom, int jnbor)
+void SNAKokkos<DeviceType>::compute_ui(const typename Kokkos::TeamPolicy<DeviceType>::member_type& team, const int iatom, const int jnbor)
+{
+
+  // utot(j,ma,mb) = 0 for all j,ma,ma
+  // utot(j,ma,ma) = 1 for all j,ma
+  // for j in neighbors of i:
+  //   compute r0 = (x,y,z,z0)
+  //   utot(j,ma,mb) += u(r0;j,ma,mb) for all j,ma,mb
+
+  // get shared memory offset
+  const int max_m_tile = (twojmax+1)*(twojmax+1);
+  const int team_rank = team.team_rank();
+  const int scratch_shift = team_rank * max_m_tile;
+
+  // double buffer
+  SNAcomplex* buf1 = (SNAcomplex*)team.team_shmem( ).get_shmem(team.team_size()*max_m_tile*sizeof(SNAcomplex), 0) + scratch_shift;
+  SNAcomplex* buf2 = (SNAcomplex*)team.team_shmem( ).get_shmem(team.team_size()*max_m_tile*sizeof(SNAcomplex), 0) + scratch_shift;
+
+  const double x = rij(iatom,jnbor,0);
+  const double y = rij(iatom,jnbor,1);
+  const double z = rij(iatom,jnbor,2);
+
+  const double wj_local = wj(iatom, jnbor);
+  const double rcut = rcutij(iatom, jnbor);
+
+  const double rsq = x * x + y * y + z * z;
+  const double r = sqrt(rsq);
+
+  const double theta0 = (r - rmin0) * rfac0 * MY_PI / (rcutij(iatom,jnbor) - rmin0);
+  //    theta0 = (r - rmin0) * rscale0;
+  const double cs = cos(theta0);
+  const double sn = sin(theta0);
+  const double z0 = r * cs / sn; // r / tan(theta0)
+
+  // Compute cutoff function
+  const double sfac = compute_sfac(r, rcut) * wj_local;
+
+  // compute Cayley-Klein parameters for unit quaternion,
+  // pack into complex number
+  const double r0inv = 1.0 / sqrt(r * r + z0 * z0);
+  const SNAcomplex a = { r0inv * z0, -r0inv * z };
+  const SNAcomplex b = { r0inv * y, -r0inv * x };
+
+  // VMK Section 4.8.2
+
+  // All writes go to global memory and shared memory
+  // so we can avoid all global memory reads
+  Kokkos::single(Kokkos::PerThread(team), [=]() {
+    //ulist(0,iatom,jnbor) = { 1.0, 0.0 };
+    buf1[0] = {1.,0.};
+    Kokkos::atomic_add(&(ulisttot(0,iatom).re), sfac);
+  });
+
+  for (int j = 1; j <= twojmax; j++) {
+    const int jju = idxu_block[j];
+    const int jjup = idxu_block[j-1];
+
+    // fill in left side of matrix layer from previous layer
+
+    // Flatten loop over ma, mb, need to figure out total
+    // number of iterations
+
+    // for (int ma = 0; ma <= j; ma++)
+    const int n_ma = j+1;
+    // for (int mb = 0; 2*mb <= j; mb++)
+    const int n_mb = j/2+1;
+
+    // the last (j / 2) can be avoided due to symmetry
+    const int total_iters = n_ma * n_mb - (j % 2 == 0 ? (j / 2) : 0);
+
+    //for (int m = 0; m < total_iters; m++) {
+    Kokkos::parallel_for(Kokkos::ThreadVectorRange(team, total_iters),
+      [&] (const int m) {
+
+      // ma fast, mb slow
+      int ma = m % n_ma;
+      int mb = m / n_ma;
+
+      // index into global memory array
+      const int jju_index = jju+m;
+      //const int jjup_index = jjup+mb*j+ma;
+
+      // index into shared memory buffer for this level
+      const int jju_shared_idx = m;
+
+      // index into shared memory buffer for next level
+      const int jjup_shared_idx = jju_shared_idx - mb;
+
+      SNAcomplex u_accum = {0., 0.};
+
+      // VMK recursion relation: grab contribution which is multiplied by b*
+      const double rootpq2 = -rootpqarray(ma, j - mb);
+      const SNAcomplex u_up2 = (ma > 0)?rootpq2*buf1[jjup_shared_idx-1]:SNAcomplex(0.,0.);
+      //const SNAcomplex u_up2 = (ma > 0)?rootpq2*ulist(jjup_index-1,iatom,jnbor):SNAcomplex(0.,0.);
+      caconjxpy(b, u_up2, u_accum);
+
+      // VMK recursion relation: grab contribution which is multiplied by a*
+      const double rootpq1 = rootpqarray(j - ma, j - mb);
+      const SNAcomplex u_up1 = (ma < j)?rootpq1*buf1[jjup_shared_idx]:SNAcomplex(0.,0.);
+      //const SNAcomplex u_up1 = (ma < j)?rootpq1*ulist(jjup_index,iatom,jnbor):SNAcomplex(0.,0.);
+      caconjxpy(a, u_up1, u_accum);
+
+      //ulist(jju_index,iatom,jnbor) = u_accum;
+      // back up into shared memory for next iter
+      buf2[jju_shared_idx] = u_accum;
+
+      Kokkos::atomic_add(&(ulisttot(jju_index,iatom).re), sfac * u_accum.re);
+      Kokkos::atomic_add(&(ulisttot(jju_index,iatom).im), sfac * u_accum.im);
+
+      // copy left side to right side with inversion symmetry VMK 4.4(2)
+      // u[ma-j,mb-j] = (-1)^(ma-mb)*Conj([u[ma,mb))
+      // if j is even (-> physical j integer), last element maps to self, skip
+      //if (!(m == total_iters - 1 && j % 2 == 0)) {
+      if (m < total_iters - 1 || j % 2 == 1) {
+        const int sign_factor = (((ma+mb)%2==0)?1:-1);
+        const int jju_shared_flip = (j+1-mb)*(j+1)-(ma+1);
+        const int jjup_flip = jju + jju_shared_flip; // jju+(j+1-mb)*(j+1)-(ma+1);
+
+
+        if (sign_factor == 1) {
+          u_accum.im = -u_accum.im;
+        } else {
+          u_accum.re = -u_accum.re;
+        }
+        //ulist(jjup_flip,iatom,jnbor) = u_accum;
+        buf2[jju_shared_flip] = u_accum;
+
+        Kokkos::atomic_add(&(ulisttot(jjup_flip,iatom).re), sfac * u_accum.re);
+        Kokkos::atomic_add(&(ulisttot(jjup_flip,iatom).im), sfac * u_accum.im);
+      }
+    });
+    // In CUDA backend,
+    // ThreadVectorRange has a __syncwarp (appropriately masked for
+    // vector lengths < 32) implict at the end
+
+    // swap double buffers
+    auto tmp = buf1; buf1 = buf2; buf2 = tmp;
+
+
+  }
+}
+
+/* ----------------------------------------------------------------------
+   compute Ui by summing over bispectrum components. CPU only.
+------------------------------------------------------------------------- */
+
+template<class DeviceType>
+KOKKOS_INLINE_FUNCTION
+void SNAKokkos<DeviceType>::compute_ui_cpu(const typename Kokkos::TeamPolicy<DeviceType>::member_type& team, int iatom, int jnbor)
 {
   double rsq, r, x, y, z, z0, theta0;
 
@@ -279,8 +455,9 @@ void SNAKokkos<DeviceType>::compute_ui(const typename Kokkos::TeamPolicy<DeviceT
   //    theta0 = (r - rmin0) * rscale0;
   z0 = r / tan(theta0);
 
-  compute_uarray(team, iatom, jnbor, x, y, z, z0, r);
+  compute_uarray_cpu(team, iatom, jnbor, x, y, z, z0, r);
   add_uarraytot(team, iatom, jnbor, r, wj(iatom,jnbor), rcutij(iatom,jnbor));
+
 }
 
 /* ----------------------------------------------------------------------
@@ -306,8 +483,8 @@ void SNAKokkos<DeviceType>::compute_zi(const int& iter)
 
   const double* cgblock = cglist.data() + idxcg_block(j1,j2,j);
 
-  zlist(iatom,jjz).re = 0.0;
-  zlist(iatom,jjz).im = 0.0;
+  zlist(jjz,iatom).re = 0.0;
+  zlist(jjz,iatom).im = 0.0;
 
   int jju1 = idxu_block[j1] + (j1+1)*mb1min;
   int jju2 = idxu_block[j2] + (j2+1)*mb2max;
@@ -321,15 +498,15 @@ void SNAKokkos<DeviceType>::compute_zi(const int& iter)
     int ma2 = ma2max;
     int icga = ma1min*(j2+1) + ma2max;
     for(int ia = 0; ia < na; ia++) {
-      suma1_r += cgblock[icga] * (ulisttot(iatom,jju1+ma1).re * ulisttot(iatom,jju2+ma2).re - ulisttot(iatom,jju1+ma1).im * ulisttot(iatom,jju2+ma2).im);
-      suma1_i += cgblock[icga] * (ulisttot(iatom,jju1+ma1).re * ulisttot(iatom,jju2+ma2).im + ulisttot(iatom,jju1+ma1).im * ulisttot(iatom,jju2+ma2).re);
+      suma1_r += cgblock[icga] * (ulisttot(jju1+ma1,iatom).re * ulisttot(jju2+ma2,iatom).re - ulisttot(jju1+ma1,iatom).im * ulisttot(jju2+ma2,iatom).im);
+      suma1_i += cgblock[icga] * (ulisttot(jju1+ma1,iatom).re * ulisttot(jju2+ma2,iatom).im + ulisttot(jju1+ma1,iatom).im * ulisttot(jju2+ma2,iatom).re);
       ma1++;
       ma2--;
       icga += j2;
     } // end loop over ia
 
-    zlist(iatom,jjz).re += cgblock[icgb] * suma1_r;
-    zlist(iatom,jjz).im += cgblock[icgb] * suma1_i;
+    zlist(jjz,iatom).re += cgblock[icgb] * suma1_r;
+    zlist(jjz,iatom).im += cgblock[icgb] * suma1_i;
 
     jju1 += j1+1;
     jju2 -= j2+1;
@@ -343,10 +520,9 @@ void SNAKokkos<DeviceType>::compute_zi(const int& iter)
 
 template<class DeviceType>
 KOKKOS_INLINE_FUNCTION
-void SNAKokkos<DeviceType>::zero_yi(const int& iatom)
+void SNAKokkos<DeviceType>::zero_yi(const int& idx, const int& iatom)
 {
-    for (int j = 0; j < idxu_max; j++)
-      ylist(iatom,j) = {0.0,0.0};
+  ylist(idx,iatom) = {0.0, 0.0};
 }
 
 /* ----------------------------------------------------------------------
@@ -393,8 +569,8 @@ void SNAKokkos<DeviceType>::compute_yi(int iter,
     int icga = ma1min*(j2+1) + ma2max;
 
     for(int ia = 0; ia < na; ia++) {
-      suma1_r += cgblock[icga] * (ulisttot_lr(iatom,jju1+ma1).re * ulisttot_lr(iatom,jju2+ma2).re - ulisttot_lr(iatom,jju1+ma1).im * ulisttot_lr(iatom,jju2+ma2).im);
-      suma1_i += cgblock[icga] * (ulisttot_lr(iatom,jju1+ma1).re * ulisttot_lr(iatom,jju2+ma2).im + ulisttot_lr(iatom,jju1+ma1).im * ulisttot_lr(iatom,jju2+ma2).re);
+      suma1_r += cgblock[icga] * (ulisttot(jju1+ma1,iatom).re * ulisttot(jju2+ma2,iatom).re - ulisttot(jju1+ma1,iatom).im * ulisttot(jju2+ma2,iatom).im);
+      suma1_i += cgblock[icga] * (ulisttot(jju1+ma1,iatom).re * ulisttot(jju2+ma2,iatom).im + ulisttot(jju1+ma1,iatom).im * ulisttot(jju2+ma2,iatom).re);
       ma1++;
       ma2--;
       icga += j2;
@@ -417,42 +593,236 @@ void SNAKokkos<DeviceType>::compute_yi(int iter,
   if (j >= j1) {
     const int jjb = idxb_block(j1,j2,j);
     if (j1 == j) {
-      if (j2 == j) betaj = 3*beta(iatom,jjb);
-      else betaj = 2*beta(iatom,jjb);
-    } else betaj = beta(iatom,jjb);
+      if (j2 == j) betaj = 3*beta(jjb,iatom);
+      else betaj = 2*beta(jjb,iatom);
+    } else betaj = beta(jjb,iatom);
   } else if (j >= j2) {
     const int jjb = idxb_block(j,j2,j1);
-    if (j2 == j) betaj = 2*beta(iatom,jjb)*(j1+1)/(j+1.0);
-    else betaj = beta(iatom,jjb)*(j1+1)/(j+1.0);
+    if (j2 == j) betaj = 2*beta(jjb,iatom)*(j1+1)/(j+1.0);
+    else betaj = beta(jjb,iatom)*(j1+1)/(j+1.0);
   } else {
     const int jjb = idxb_block(j2,j,j1);
-    betaj = beta(iatom,jjb)*(j1+1)/(j+1.0);
+    betaj = beta(jjb,iatom)*(j1+1)/(j+1.0);
   }
 
-  Kokkos::atomic_add(&(ylist(iatom,jju).re), betaj*ztmp_r);
-  Kokkos::atomic_add(&(ylist(iatom,jju).im), betaj*ztmp_i);
+  Kokkos::atomic_add(&(ylist(jju,iatom).re), betaj*ztmp_r);
+  Kokkos::atomic_add(&(ylist(jju,iatom).im), betaj*ztmp_i);
 }
 
 /* ----------------------------------------------------------------------
-   compute dEidRj
+   Fused calculation of the derivative of Ui w.r.t. atom j
+   and of dEidRj. GPU only.
 ------------------------------------------------------------------------- */
 
 template<class DeviceType>
 KOKKOS_INLINE_FUNCTION
-void SNAKokkos<DeviceType>::compute_deidrj(const typename Kokkos::TeamPolicy<DeviceType>::member_type& team, int iatom, int jnbor)
+void SNAKokkos<DeviceType>::compute_fused_deidrj(const typename Kokkos::TeamPolicy<DeviceType>::member_type& team, const int iatom, const int jnbor)
 {
-  t_scalar3<double> sum;
+  // get shared memory offset
+  const int max_m_tile = (twojmax+1)*(twojmax/2+1);
+  const int team_rank = team.team_rank();
+  const int scratch_shift = team_rank * max_m_tile;
 
+  // double buffer for ulist
+  SNAcomplex* ulist_buf1 = (SNAcomplex*)team.team_shmem( ).get_shmem(team.team_size()*max_m_tile*sizeof(SNAcomplex), 0) + scratch_shift;
+  SNAcomplex* ulist_buf2 = (SNAcomplex*)team.team_shmem( ).get_shmem(team.team_size()*max_m_tile*sizeof(SNAcomplex), 0) + scratch_shift;
+
+  // double buffer for dulist
+  SNAcomplex* dulist_buf1 = (SNAcomplex*)team.team_shmem( ).get_shmem(team.team_size()*max_m_tile*sizeof(SNAcomplex), 0) + scratch_shift;
+  SNAcomplex* dulist_buf2 = (SNAcomplex*)team.team_shmem( ).get_shmem(team.team_size()*max_m_tile*sizeof(SNAcomplex), 0) + scratch_shift;
+
+  const double x = rij(iatom,jnbor,0);
+  const double y = rij(iatom,jnbor,1);
+  const double z = rij(iatom,jnbor,2);
+  const double rsq = x * x + y * y + z * z;
+  const double r = sqrt(rsq);
+  const double rcut = rcutij(iatom, jnbor);
+  const double rscale0 = rfac0 * MY_PI / (rcut - rmin0);
+  const double theta0 = (r - rmin0) * rscale0;
+  const double cs = cos(theta0);
+  const double sn = sin(theta0);
+  const double z0 = r * cs / sn;
+  const double dz0dr = z0 / r - (r*rscale0) * (rsq + z0 * z0) / rsq;
+
+  const double wj_local = wj(iatom, jnbor);
+  const double sfac = wj_local * compute_sfac(r, rcut);
+  const double dsfac = wj_local * compute_dsfac(r, rcut);
+
+  const double rinv = 1.0 / r;
+
+  // extract a single unit vector
+  const double u = (dir == 0 ? x * rinv : dir == 1 ? y * rinv : z * rinv);
+
+  // Compute Cayley-Klein parameters for unit quaternion
+  const double r0inv = 1.0 / sqrt(r * r + z0 * z0);
+
+  const SNAcomplex a = { r0inv * z0, -r0inv * z };
+  const SNAcomplex b = { r0inv * y, -r0inv * x };
+
+  const double dr0invdr = -r0inv * r0inv * r0inv * (r + z0 * dz0dr);
+  const double dr0inv = dr0invdr * u;
+  const double dz0 = dz0dr * u;
+
+  const SNAcomplex da = { dz0 * r0inv + z0 * dr0inv,
+                              - z * dr0inv + (dir == 2 ? - r0inv : 0.) };
+
+  const SNAcomplex db = { y * dr0inv + (dir==1?r0inv:0.),
+                              -x * dr0inv + (dir==0?-r0inv:0.) };
+
+  // Accumulate the full contribution to dedr on the fly
+  const double du_prod = dsfac * u; // chain rule
+  const SNAcomplex y_local = ylist(0, iatom);
+
+  // Symmetry factor of 0.5 b/c 0 element is on diagonal for even j==0
+  double dedr_full_sum = 0.5 * du_prod * y_local.re;
+
+  // single has a warp barrier at the end
+  Kokkos::single(Kokkos::PerThread(team), [=]() {
+    //dulist(0,iatom,jnbor,dir) = { dsfac * u, 0. }; // fold in chain rule here
+    ulist_buf1[0] = {1., 0.};
+    dulist_buf1[0] = {0., 0.};
+  });
+
+  for (int j = 1; j <= twojmax; j++) {
+    int jju = idxu_block[j];
+    int jjup = idxu_block[j-1];
+
+    // flatten the loop over ma,mb
+
+    // for (int ma = 0; ma <= j; ma++)
+    const int n_ma = j+1;
+    // for (int mb = 0; 2*mb <= j; mb++)
+    const int n_mb = j/2+1;
+
+    const int total_iters = n_ma * n_mb;
+
+    double dedr_sum = 0.; // j-local sum
+
+    //for (int m = 0; m < total_iters; m++) {
+    Kokkos::parallel_reduce(Kokkos::ThreadVectorRange(team, total_iters),
+      [&] (const int m, double& sum_tmp) {
+
+      // ma fast, mb slow
+      int ma = m % n_ma;
+      int mb = m / n_ma;
+
+      const int jju_index = jju+m;
+
+      // Load y_local, apply the symmetry scaling factor
+      // The "secret" of the shared memory optimization is it eliminates
+      // all global memory reads to duidrj in lieu of caching values in
+      // shared memory and otherwise always writing, making the kernel
+      // ultimately compute bound. We take advantage of that by adding
+      // some reads back in.
+      auto y_local = ylist(jju_index,iatom);
+      if (j % 2 == 0 && 2*mb == j) {
+        if (ma == mb) { y_local = 0.5*y_local; }
+        else if (ma > mb) { y_local = { 0., 0. }; } // can probably avoid this outright
+        // else the ma < mb gets "double counted", cancelling the 0.5.
+      }
+
+      // index into shared memory
+      const int jju_shared_idx = m;
+      const int jjup_shared_idx = jju_shared_idx - mb;
+
+      // Need to compute and accumulate both u and du (mayhaps, we could probably
+      // balance some read and compute by reading u each time).
+      SNAcomplex u_accum = { 0., 0. };
+      SNAcomplex du_accum = { 0., 0. };
+
+      const double rootpq2 = -rootpqarray(ma, j - mb);
+      const SNAcomplex u_up2 = (ma > 0)?rootpq2*ulist_buf1[jjup_shared_idx-1]:SNAcomplex(0.,0.);
+      caconjxpy(b, u_up2, u_accum);
+
+      const double rootpq1 = rootpqarray(j - ma, j - mb);
+      const SNAcomplex u_up1 = (ma < j)?rootpq1*ulist_buf1[jjup_shared_idx]:SNAcomplex(0.,0.);
+      caconjxpy(a, u_up1, u_accum);
+
+      // Next, spin up du_accum
+      const SNAcomplex du_up1 = (ma < j) ? rootpq1*dulist_buf1[jjup_shared_idx] : SNAcomplex(0.,0.);
+      caconjxpy(da, u_up1, du_accum);
+      caconjxpy(a, du_up1, du_accum);
+
+      const SNAcomplex du_up2 = (ma > 0) ? rootpq2*dulist_buf1[jjup_shared_idx-1] : SNAcomplex(0.,0.);
+      caconjxpy(db, u_up2, du_accum);
+      caconjxpy(b, du_up2, du_accum);
+
+      // No need to save u_accum to global memory
+      // Cache u_accum, du_accum to scratch memory.
+      ulist_buf2[jju_shared_idx] = u_accum;
+      dulist_buf2[jju_shared_idx] = du_accum;
+
+      // Directly accumulate deidrj into sum_tmp
+      //dulist(jju_index,iatom,jnbor,dir) = ((dsfac * u)*u_accum) + (sfac*du_accum);
+      const SNAcomplex du_prod = ((dsfac * u)*u_accum) + (sfac*du_accum);
+      sum_tmp += du_prod.re * y_local.re + du_prod.im * y_local.im;
+
+      // copy left side to right side with inversion symmetry VMK 4.4(2)
+      // u[ma-j][mb-j] = (-1)^(ma-mb)*Conj([u[ma][mb])
+      if (j%2==1 && mb+1==n_mb) {
+        int sign_factor = (((ma+mb)%2==0)?1:-1);
+        //const int jjup_flip = jju+(j+1-mb)*(j+1)-(ma+1); // no longer needed b/c we don't update dulist
+        const int jju_shared_flip = (j+1-mb)*(j+1)-(ma+1);
+
+        if (sign_factor == 1) {
+          u_accum.im = -u_accum.im;
+          du_accum.im = -du_accum.im;
+        } else {
+          u_accum.re = -u_accum.re;
+          du_accum.re = -du_accum.re;
+        }
+
+        // We don't need the second half of the tile for the deidrj accumulation.
+        // That's taken care of by the symmetry factor above.
+        //dulist(jjup_flip,iatom,jnbor,dir) = ((dsfac * u)*u_accum) + (sfac*du_accum);
+
+        // We do need it for ortho polynomial generation, though
+        ulist_buf2[jju_shared_flip] = u_accum;
+        dulist_buf2[jju_shared_flip] = du_accum;
+      }
+
+    }, dedr_sum);
+
+    // swap buffers
+    auto tmp = ulist_buf1; ulist_buf1 = ulist_buf2; ulist_buf2 = tmp;
+    tmp = dulist_buf1; dulist_buf1 = dulist_buf2; dulist_buf2 = tmp;
+
+    // Accumulate dedr. This "should" be in a single, but
+    // a Kokkos::single call implies a warp sync, and we may
+    // as well avoid that. This does no harm as long as the
+    // final assignment is in a single block.
+    //Kokkos::single(Kokkos::PerThread(team), [=]() {
+    dedr_full_sum += dedr_sum;
+    //});
+  }
+
+  // Store the accumulated dedr.
+  Kokkos::single(Kokkos::PerThread(team), [&] () {
+    dedr(iatom,jnbor,dir) = dedr_full_sum*2.0;
+  });
+}
+
+/* ----------------------------------------------------------------------
+   compute dEidRj, CPU path only.
+------------------------------------------------------------------------- */
+
+
+template<class DeviceType>
+KOKKOS_INLINE_FUNCTION
+void SNAKokkos<DeviceType>::compute_deidrj_cpu(const typename Kokkos::TeamPolicy<DeviceType>::member_type& team, int iatom, int jnbor)
+{
+  t_scalar3<double> final_sum;
+
+  //for(int j = 0; j <= twojmax; j++) {
   Kokkos::parallel_reduce(Kokkos::ThreadVectorRange(team,twojmax+1),
       [&] (const int& j, t_scalar3<double>& sum_tmp) {
-  //for(int j = 0; j <= twojmax; j++) {
     int jju = idxu_block[j];
 
     for(int mb = 0; 2*mb < j; mb++)
       for(int ma = 0; ma <= j; ma++) {
-        sum_tmp.x += dulist(iatom,jnbor,jju,0).re * ylist(iatom,jju).re + dulist(iatom,jnbor,jju,0).im * ylist(iatom,jju).im;
-        sum_tmp.y += dulist(iatom,jnbor,jju,1).re * ylist(iatom,jju).re + dulist(iatom,jnbor,jju,1).im * ylist(iatom,jju).im;
-        sum_tmp.z += dulist(iatom,jnbor,jju,2).re * ylist(iatom,jju).re + dulist(iatom,jnbor,jju,2).im * ylist(iatom,jju).im;
+        sum_tmp.x += dulist(jju,iatom,jnbor,0).re * ylist(jju,iatom).re + dulist(jju,iatom,jnbor,0).im * ylist(jju,iatom).im;
+        sum_tmp.y += dulist(jju,iatom,jnbor,1).re * ylist(jju,iatom).re + dulist(jju,iatom,jnbor,1).im * ylist(jju,iatom).im;
+        sum_tmp.z += dulist(jju,iatom,jnbor,2).re * ylist(jju,iatom).re + dulist(jju,iatom,jnbor,2).im * ylist(jju,iatom).im;
         jju++;
       } //end loop over ma mb
 
@@ -462,25 +832,24 @@ void SNAKokkos<DeviceType>::compute_deidrj(const typename Kokkos::TeamPolicy<Dev
 
       int mb = j/2;
       for(int ma = 0; ma < mb; ma++) {
-        sum_tmp.x += dulist(iatom,jnbor,jju,0).re * ylist(iatom,jju).re + dulist(iatom,jnbor,jju,0).im * ylist(iatom,jju).im;
-        sum_tmp.y += dulist(iatom,jnbor,jju,1).re * ylist(iatom,jju).re + dulist(iatom,jnbor,jju,1).im * ylist(iatom,jju).im;
-        sum_tmp.z += dulist(iatom,jnbor,jju,2).re * ylist(iatom,jju).re + dulist(iatom,jnbor,jju,2).im * ylist(iatom,jju).im;
+        sum_tmp.x += dulist(jju,iatom,jnbor,0).re * ylist(jju,iatom).re + dulist(jju,iatom,jnbor,0).im * ylist(jju,iatom).im;
+        sum_tmp.y += dulist(jju,iatom,jnbor,1).re * ylist(jju,iatom).re + dulist(jju,iatom,jnbor,1).im * ylist(jju,iatom).im;
+        sum_tmp.z += dulist(jju,iatom,jnbor,2).re * ylist(jju,iatom).re + dulist(jju,iatom,jnbor,2).im * ylist(jju,iatom).im;
         jju++;
       }
 
       //int ma = mb;
-      sum_tmp.x += (dulist(iatom,jnbor,jju,0).re * ylist(iatom,jju).re + dulist(iatom,jnbor,jju,0).im * ylist(iatom,jju).im)*0.5;
-      sum_tmp.y += (dulist(iatom,jnbor,jju,1).re * ylist(iatom,jju).re + dulist(iatom,jnbor,jju,1).im * ylist(iatom,jju).im)*0.5;
-      sum_tmp.z += (dulist(iatom,jnbor,jju,2).re * ylist(iatom,jju).re + dulist(iatom,jnbor,jju,2).im * ylist(iatom,jju).im)*0.5;
+      sum_tmp.x += (dulist(jju,iatom,jnbor,0).re * ylist(jju,iatom).re + dulist(jju,iatom,jnbor,0).im * ylist(jju,iatom).im)*0.5;
+      sum_tmp.y += (dulist(jju,iatom,jnbor,1).re * ylist(jju,iatom).re + dulist(jju,iatom,jnbor,1).im * ylist(jju,iatom).im)*0.5;
+      sum_tmp.z += (dulist(jju,iatom,jnbor,2).re * ylist(jju,iatom).re + dulist(jju,iatom,jnbor,2).im * ylist(jju,iatom).im)*0.5;
     } // end if jeven
 
-  },sum); // end loop over j
-  //}
+  },final_sum); // end loop over j
 
   Kokkos::single(Kokkos::PerThread(team), [&] () {
-    dedr(iatom,jnbor,0) = sum.x*2.0;
-    dedr(iatom,jnbor,1) = sum.y*2.0;
-    dedr(iatom,jnbor,2) = sum.z*2.0;
+    dedr(iatom,jnbor,0) = final_sum.x*2.0;
+    dedr(iatom,jnbor,1) = final_sum.y*2.0;
+    dedr(iatom,jnbor,2) = final_sum.z*2.0;
   });
 
 }
@@ -524,8 +893,8 @@ void SNAKokkos<DeviceType>::compute_bi(const typename Kokkos::TeamPolicy<DeviceT
         const int jjz_index = jjz+mb*(j+1)+ma;
         if (2*mb == j) return;
         sum +=
-          ulisttot(iatom,jju_index).re * zlist(iatom,jjz_index).re +
-          ulisttot(iatom,jju_index).im * zlist(iatom,jjz_index).im;
+          ulisttot(jju_index,iatom).re * zlist(jjz_index,iatom).re +
+          ulisttot(jju_index,iatom).im * zlist(jjz_index,iatom).im;
       },sumzu_temp); // end loop over ma, mb
       sumzu += sumzu_temp;
 
@@ -539,8 +908,8 @@ void SNAKokkos<DeviceType>::compute_bi(const typename Kokkos::TeamPolicy<DeviceT
         const int jju_index = jju+(mb-1)*(j+1)+(j+1)+ma;
         const int jjz_index = jjz+(mb-1)*(j+1)+(j+1)+ma;
         sum +=
-          ulisttot(iatom,jju_index).re * zlist(iatom,jjz_index).re +
-          ulisttot(iatom,jju_index).im * zlist(iatom,jjz_index).im;
+          ulisttot(jju_index,iatom).re * zlist(jjz_index,iatom).re +
+          ulisttot(jju_index,iatom).im * zlist(jjz_index,iatom).im;
       },sumzu_temp); // end loop over ma
       sumzu += sumzu_temp;
 
@@ -548,8 +917,8 @@ void SNAKokkos<DeviceType>::compute_bi(const typename Kokkos::TeamPolicy<DeviceT
       const int jju_index = jju+(mb-1)*(j+1)+(j+1)+ma;
       const int jjz_index = jjz+(mb-1)*(j+1)+(j+1)+ma;
       sumzu += 0.5*
-        (ulisttot(iatom,jju_index).re * zlist(iatom,jjz_index).re +
-         ulisttot(iatom,jju_index).im * zlist(iatom,jjz_index).im);
+        (ulisttot(jju_index,iatom).re * zlist(jjz_index,iatom).re +
+         ulisttot(jju_index,iatom).im * zlist(jjz_index,iatom).im);
     } // end if jeven
 
     Kokkos::single(Kokkos::PerThread(team), [&] () {
@@ -560,7 +929,7 @@ void SNAKokkos<DeviceType>::compute_bi(const typename Kokkos::TeamPolicy<DeviceT
       if (bzero_flag)
         sumzu -= bzero[j];
 
-      blist(iatom,jjb) = sumzu;
+      blist(jjb,iatom) = sumzu;
     });
   });
       //} // end loop over j
@@ -573,7 +942,7 @@ void SNAKokkos<DeviceType>::compute_bi(const typename Kokkos::TeamPolicy<DeviceT
 
 template<class DeviceType>
 KOKKOS_INLINE_FUNCTION
-void SNAKokkos<DeviceType>::compute_duidrj(const typename Kokkos::TeamPolicy<DeviceType>::member_type& team, int iatom, int jnbor)
+void SNAKokkos<DeviceType>::compute_duidrj_cpu(const typename Kokkos::TeamPolicy<DeviceType>::member_type& team, int iatom, int jnbor)
 {
   double rsq, r, x, y, z, z0, theta0, cs, sn;
   double dz0dr;
@@ -590,42 +959,7 @@ void SNAKokkos<DeviceType>::compute_duidrj(const typename Kokkos::TeamPolicy<Dev
   z0 = r * cs / sn;
   dz0dr = z0 / r - (r*rscale0) * (rsq + z0 * z0) / rsq;
 
-  compute_duarray(team, iatom, jnbor, x, y, z, z0, r, dz0dr, wj(iatom,jnbor), rcutij(iatom,jnbor));
-}
-
-/* ---------------------------------------------------------------------- */
-
-template<class DeviceType>
-KOKKOS_INLINE_FUNCTION
-void SNAKokkos<DeviceType>::zero_uarraytot(const int& iatom)
-{
-  {
-    //Kokkos::parallel_for(Kokkos::ThreadVectorRange(team,ulisttot.extent(1)),
-    //    [&] (const int& i) {
-    for (int i = 0; i < ulisttot.extent(1); i++) {
-      ulisttot(iatom,i).re = 0.0;
-      ulisttot(iatom,i).im = 0.0;
-    }
-    //});
-  }
-}
-
-/* ---------------------------------------------------------------------- */
-
-template<class DeviceType>
-KOKKOS_INLINE_FUNCTION
-void SNAKokkos<DeviceType>::addself_uarraytot(const int& iatom, const double& wself_in)
-{
-  //Kokkos::parallel_for(Kokkos::ThreadVectorRange(team,twojmax+1),
-  //  [&] (const int& j) {
-  for (int j = 0; j <= twojmax; j++) {
-    int jju = idxu_block[j];
-    for (int ma = 0; ma <= j; ma++) {
-      ulisttot(iatom,jju).re = wself_in;
-      ulisttot(iatom,jju).im = 0.0;
-      jju += j+2;
-    }
-  }//});
+  compute_duarray_cpu(team, iatom, jnbor, x, y, z, z0, r, dz0dr, wj(iatom,jnbor), rcutij(iatom,jnbor));
 }
 
 /* ----------------------------------------------------------------------
@@ -639,10 +973,10 @@ void SNAKokkos<DeviceType>::add_uarraytot(const typename Kokkos::TeamPolicy<Devi
 {
   const double sfac = compute_sfac(r, rcut) * wj;
 
-  Kokkos::parallel_for(Kokkos::ThreadVectorRange(team,ulisttot.extent(1)),
+  Kokkos::parallel_for(Kokkos::ThreadVectorRange(team,ulisttot.extent(0)),
       [&] (const int& i) {
-    Kokkos::atomic_add(&(ulisttot(iatom,i).re), sfac * ulist(iatom,jnbor,i).re);
-    Kokkos::atomic_add(&(ulisttot(iatom,i).im), sfac * ulist(iatom,jnbor,i).im);
+    Kokkos::atomic_add(&(ulisttot(i,iatom).re), sfac * ulist(i,iatom,jnbor).re);
+    Kokkos::atomic_add(&(ulisttot(i,iatom).im), sfac * ulist(i,iatom,jnbor).im);
   });
 }
 
@@ -652,7 +986,7 @@ void SNAKokkos<DeviceType>::add_uarraytot(const typename Kokkos::TeamPolicy<Devi
 
 template<class DeviceType>
 KOKKOS_INLINE_FUNCTION
-void SNAKokkos<DeviceType>::compute_uarray(const typename Kokkos::TeamPolicy<DeviceType>::member_type& team, int iatom, int jnbor,
+void SNAKokkos<DeviceType>::compute_uarray_cpu(const typename Kokkos::TeamPolicy<DeviceType>::member_type& team, int iatom, int jnbor,
                          double x, double y, double z,
                          double z0, double r)
 {
@@ -670,8 +1004,8 @@ void SNAKokkos<DeviceType>::compute_uarray(const typename Kokkos::TeamPolicy<Dev
 
   // VMK Section 4.8.2
 
-  ulist(iatom,jnbor,0).re = 1.0;
-  ulist(iatom,jnbor,0).im = 0.0;
+  ulist(0,iatom,jnbor).re = 1.0;
+  ulist(0,iatom,jnbor).im = 0.0;
 
   for (int j = 1; j <= twojmax; j++) {
     int jju = idxu_block[j];
@@ -683,31 +1017,31 @@ void SNAKokkos<DeviceType>::compute_uarray(const typename Kokkos::TeamPolicy<Dev
         [&] (const int& mb) {
     //for (int mb = 0; 2*mb <= j; mb++) {
       const int jju_index = jju+mb+mb*j;
-      ulist(iatom,jnbor,jju_index).re = 0.0;
-      ulist(iatom,jnbor,jju_index).im = 0.0;
+      ulist(jju_index,iatom,jnbor).re = 0.0;
+      ulist(jju_index,iatom,jnbor).im = 0.0;
 
       for (int ma = 0; ma < j; ma++) {
         const int jju_index = jju+mb+mb*j+ma;
         const int jjup_index = jjup+mb*j+ma;
         rootpq = rootpqarray(j - ma,j - mb);
-        ulist(iatom,jnbor,jju_index).re +=
+        ulist(jju_index,iatom,jnbor).re +=
           rootpq *
-          (a_r * ulist(iatom,jnbor,jjup_index).re +
-           a_i * ulist(iatom,jnbor,jjup_index).im);
-        ulist(iatom,jnbor,jju_index).im +=
+          (a_r * ulist(jjup_index,iatom,jnbor).re +
+           a_i * ulist(jjup_index,iatom,jnbor).im);
+        ulist(jju_index,iatom,jnbor).im +=
           rootpq *
-          (a_r * ulist(iatom,jnbor,jjup_index).im -
-           a_i * ulist(iatom,jnbor,jjup_index).re);
+          (a_r * ulist(jjup_index,iatom,jnbor).im -
+           a_i * ulist(jjup_index,iatom,jnbor).re);
 
         rootpq = rootpqarray(ma + 1,j - mb);
-        ulist(iatom,jnbor,jju_index+1).re =
+        ulist(jju_index+1,iatom,jnbor).re =
           -rootpq *
-          (b_r * ulist(iatom,jnbor,jjup_index).re +
-           b_i * ulist(iatom,jnbor,jjup_index).im);
-        ulist(iatom,jnbor,jju_index+1).im =
+          (b_r * ulist(jjup_index,iatom,jnbor).re +
+           b_i * ulist(jjup_index,iatom,jnbor).im);
+        ulist(jju_index+1,iatom,jnbor).im =
           -rootpq *
-          (b_r * ulist(iatom,jnbor,jjup_index).im -
-           b_i * ulist(iatom,jnbor,jjup_index).re);
+          (b_r * ulist(jjup_index,iatom,jnbor).im -
+           b_i * ulist(jjup_index,iatom,jnbor).re);
       }
     });
 
@@ -725,11 +1059,11 @@ void SNAKokkos<DeviceType>::compute_uarray(const typename Kokkos::TeamPolicy<Dev
         const int jju_index = jju+mb*(j+1)+ma;
         const int jjup_index = jjup-mb*(j+1)-ma;
         if (mapar == 1) {
-          ulist(iatom,jnbor,jjup_index).re = ulist(iatom,jnbor,jju_index).re;
-          ulist(iatom,jnbor,jjup_index).im = -ulist(iatom,jnbor,jju_index).im;
+          ulist(jjup_index,iatom,jnbor).re = ulist(jju_index,iatom,jnbor).re;
+          ulist(jjup_index,iatom,jnbor).im = -ulist(jju_index,iatom,jnbor).im;
         } else {
-          ulist(iatom,jnbor,jjup_index).re = -ulist(iatom,jnbor,jju_index).re;
-          ulist(iatom,jnbor,jjup_index).im = ulist(iatom,jnbor,jju_index).im;
+          ulist(jjup_index,iatom,jnbor).re = -ulist(jju_index,iatom,jnbor).re;
+          ulist(jjup_index,iatom,jnbor).im = ulist(jju_index,iatom,jnbor).im;
         }
         mapar = -mapar;
       }
@@ -737,25 +1071,19 @@ void SNAKokkos<DeviceType>::compute_uarray(const typename Kokkos::TeamPolicy<Dev
   }
 }
 
-template<class DeviceType>
-void SNAKokkos<DeviceType>::transpose_ulisttot()
-{
-  UlisttotHelper<typename DeviceType::array_layout,decltype(ulisttot_lr),decltype(ulisttot)>::transpose(ulisttot_lr,ulisttot);
-}
-
 /* ----------------------------------------------------------------------
    compute derivatives of Wigner U-functions for one neighbor
-   see comments in compute_uarray()
+   see comments in compute_uarray_cpu()
 ------------------------------------------------------------------------- */
 
 template<class DeviceType>
 KOKKOS_INLINE_FUNCTION
-void SNAKokkos<DeviceType>::compute_duarray(const typename Kokkos::TeamPolicy<DeviceType>::member_type& team, int iatom, int jnbor,
+void SNAKokkos<DeviceType>::compute_duarray_cpu(const typename Kokkos::TeamPolicy<DeviceType>::member_type& team, int iatom, int jnbor,
                           double x, double y, double z,
                           double z0, double r, double dz0dr,
                           double wj, double rcut)
 {
-  double r0inv;
+double r0inv;
   double a_r, a_i, b_r, b_i;
   double da_r[3], da_i[3], db_r[3], db_i[3];
   double dz0[3], dr0inv[3], dr0invdr;
@@ -772,7 +1100,7 @@ void SNAKokkos<DeviceType>::compute_duarray(const typename Kokkos::TeamPolicy<De
   b_r = y * r0inv;
   b_i = -x * r0inv;
 
-  dr0invdr = -pow(r0inv, 3.0) * (r + z0 * dz0dr);
+  dr0invdr = -r0inv * r0inv * r0inv * (r + z0 * dz0dr);
 
   dr0inv[0] = dr0invdr * ux;
   dr0inv[1] = dr0invdr * uy;
@@ -797,12 +1125,12 @@ void SNAKokkos<DeviceType>::compute_duarray(const typename Kokkos::TeamPolicy<De
   db_i[0] += -r0inv;
   db_r[1] += r0inv;
 
-  dulist(iatom,jnbor,0,0).re = 0.0;
-  dulist(iatom,jnbor,0,1).re = 0.0;
-  dulist(iatom,jnbor,0,2).re = 0.0;
-  dulist(iatom,jnbor,0,0).im = 0.0;
-  dulist(iatom,jnbor,0,1).im = 0.0;
-  dulist(iatom,jnbor,0,2).im = 0.0;
+  dulist(0,iatom,jnbor,0).re = 0.0;
+  dulist(0,iatom,jnbor,1).re = 0.0;
+  dulist(0,iatom,jnbor,2).re = 0.0;
+  dulist(0,iatom,jnbor,0).im = 0.0;
+  dulist(0,iatom,jnbor,1).im = 0.0;
+  dulist(0,iatom,jnbor,2).im = 0.0;
 
   for (int j = 1; j <= twojmax; j++) {
     int jju = idxu_block[j];
@@ -811,42 +1139,42 @@ void SNAKokkos<DeviceType>::compute_duarray(const typename Kokkos::TeamPolicy<De
         [&] (const int& mb) {
     //for (int mb = 0; 2*mb <= j; mb++) {
       const int jju_index = jju+mb+mb*j;
-      dulist(iatom,jnbor,jju_index,0).re = 0.0;
-      dulist(iatom,jnbor,jju_index,1).re = 0.0;
-      dulist(iatom,jnbor,jju_index,2).re = 0.0;
-      dulist(iatom,jnbor,jju_index,0).im = 0.0;
-      dulist(iatom,jnbor,jju_index,1).im = 0.0;
-      dulist(iatom,jnbor,jju_index,2).im = 0.0;
+      dulist(jju_index,iatom,jnbor,0).re = 0.0;
+      dulist(jju_index,iatom,jnbor,1).re = 0.0;
+      dulist(jju_index,iatom,jnbor,2).re = 0.0;
+      dulist(jju_index,iatom,jnbor,0).im = 0.0;
+      dulist(jju_index,iatom,jnbor,1).im = 0.0;
+      dulist(jju_index,iatom,jnbor,2).im = 0.0;
 
       for (int ma = 0; ma < j; ma++) {
         const int jju_index = jju+mb+mb*j+ma;
         const int jjup_index = jjup+mb*j+ma;
         rootpq = rootpqarray(j - ma,j - mb);
         for (int k = 0; k < 3; k++) {
-          dulist(iatom,jnbor,jju_index,k).re +=
-            rootpq * (da_r[k] * ulist(iatom,jnbor,jjup_index).re +
-                      da_i[k] * ulist(iatom,jnbor,jjup_index).im +
-                      a_r * dulist(iatom,jnbor,jjup_index,k).re +
-                      a_i * dulist(iatom,jnbor,jjup_index,k).im);
-          dulist(iatom,jnbor,jju_index,k).im +=
-            rootpq * (da_r[k] * ulist(iatom,jnbor,jjup_index).im -
-                      da_i[k] * ulist(iatom,jnbor,jjup_index).re +
-                      a_r * dulist(iatom,jnbor,jjup_index,k).im -
-                      a_i * dulist(iatom,jnbor,jjup_index,k).re);
+          dulist(jju_index,iatom,jnbor,k).re +=
+            rootpq * (da_r[k] * ulist(jjup_index,iatom,jnbor).re +
+                      da_i[k] * ulist(jjup_index,iatom,jnbor).im +
+                      a_r * dulist(jjup_index,iatom,jnbor,k).re +
+                      a_i * dulist(jjup_index,iatom,jnbor,k).im);
+          dulist(jju_index,iatom,jnbor,k).im +=
+            rootpq * (da_r[k] * ulist(jjup_index,iatom,jnbor).im -
+                      da_i[k] * ulist(jjup_index,iatom,jnbor).re +
+                      a_r * dulist(jjup_index,iatom,jnbor,k).im -
+                      a_i * dulist(jjup_index,iatom,jnbor,k).re);
         }
 
         rootpq = rootpqarray(ma + 1,j - mb);
         for (int k = 0; k < 3; k++) {
-          dulist(iatom,jnbor,jju_index+1,k).re =
-            -rootpq * (db_r[k] * ulist(iatom,jnbor,jjup_index).re +
-                       db_i[k] * ulist(iatom,jnbor,jjup_index).im +
-                       b_r * dulist(iatom,jnbor,jjup_index,k).re +
-                       b_i * dulist(iatom,jnbor,jjup_index,k).im);
-          dulist(iatom,jnbor,jju_index+1,k).im =
-            -rootpq * (db_r[k] * ulist(iatom,jnbor,jjup_index).im -
-                       db_i[k] * ulist(iatom,jnbor,jjup_index).re +
-                       b_r * dulist(iatom,jnbor,jjup_index,k).im -
-                       b_i * dulist(iatom,jnbor,jjup_index,k).re);
+          dulist(jju_index+1,iatom,jnbor,k).re =
+            -rootpq * (db_r[k] * ulist(jjup_index,iatom,jnbor).re +
+                       db_i[k] * ulist(jjup_index,iatom,jnbor).im +
+                       b_r * dulist(jjup_index,iatom,jnbor,k).re +
+                       b_i * dulist(jjup_index,iatom,jnbor,k).im);
+          dulist(jju_index+1,iatom,jnbor,k).im =
+            -rootpq * (db_r[k] * ulist(jjup_index,iatom,jnbor).im -
+                       db_i[k] * ulist(jjup_index,iatom,jnbor).re +
+                       b_r * dulist(jjup_index,iatom,jnbor,k).im -
+                       b_i * dulist(jjup_index,iatom,jnbor,k).re);
         }
       }
     });
@@ -866,13 +1194,13 @@ void SNAKokkos<DeviceType>::compute_duarray(const typename Kokkos::TeamPolicy<De
         const int jjup_index = jjup-mb*(j+1)-ma;
         if (mapar == 1) {
           for (int k = 0; k < 3; k++) {
-            dulist(iatom,jnbor,jjup_index,k).re = dulist(iatom,jnbor,jju_index,k).re;
-            dulist(iatom,jnbor,jjup_index,k).im = -dulist(iatom,jnbor,jju_index,k).im;
+            dulist(jjup_index,iatom,jnbor,k).re = dulist(jju_index,iatom,jnbor,k).re;
+            dulist(jjup_index,iatom,jnbor,k).im = -dulist(jju_index,iatom,jnbor,k).im;
           }
         } else {
           for (int k = 0; k < 3; k++) {
-            dulist(iatom,jnbor,jjup_index,k).re = -dulist(iatom,jnbor,jju_index,k).re;
-            dulist(iatom,jnbor,jjup_index,k).im = dulist(iatom,jnbor,jju_index,k).im;
+            dulist(jjup_index,iatom,jnbor,k).re = -dulist(jju_index,iatom,jnbor,k).re;
+            dulist(jjup_index,iatom,jnbor,k).im = dulist(jju_index,iatom,jnbor,k).im;
           }
         }
         mapar = -mapar;
@@ -890,18 +1218,18 @@ void SNAKokkos<DeviceType>::compute_duarray(const typename Kokkos::TeamPolicy<De
     int jju = idxu_block[j];
     for (int mb = 0; 2*mb <= j; mb++)
       for (int ma = 0; ma <= j; ma++) {
-        dulist(iatom,jnbor,jju,0).re = dsfac * ulist(iatom,jnbor,jju).re * ux +
-                                  sfac * dulist(iatom,jnbor,jju,0).re;
-        dulist(iatom,jnbor,jju,0).im = dsfac * ulist(iatom,jnbor,jju).im * ux +
-                                  sfac * dulist(iatom,jnbor,jju,0).im;
-        dulist(iatom,jnbor,jju,1).re = dsfac * ulist(iatom,jnbor,jju).re * uy +
-                                  sfac * dulist(iatom,jnbor,jju,1).re;
-        dulist(iatom,jnbor,jju,1).im = dsfac * ulist(iatom,jnbor,jju).im * uy +
-                                  sfac * dulist(iatom,jnbor,jju,1).im;
-        dulist(iatom,jnbor,jju,2).re = dsfac * ulist(iatom,jnbor,jju).re * uz +
-                                  sfac * dulist(iatom,jnbor,jju,2).re;
-        dulist(iatom,jnbor,jju,2).im = dsfac * ulist(iatom,jnbor,jju).im * uz +
-                                  sfac * dulist(iatom,jnbor,jju,2).im;
+        dulist(jju,iatom,jnbor,0).re = dsfac * ulist(jju,iatom,jnbor).re * ux +
+                                  sfac * dulist(jju,iatom,jnbor,0).re;
+        dulist(jju,iatom,jnbor,0).im = dsfac * ulist(jju,iatom,jnbor).im * ux +
+                                  sfac * dulist(jju,iatom,jnbor,0).im;
+        dulist(jju,iatom,jnbor,1).re = dsfac * ulist(jju,iatom,jnbor).re * uy +
+                                  sfac * dulist(jju,iatom,jnbor,1).re;
+        dulist(jju,iatom,jnbor,1).im = dsfac * ulist(jju,iatom,jnbor).im * uy +
+                                  sfac * dulist(jju,iatom,jnbor,1).im;
+        dulist(jju,iatom,jnbor,2).re = dsfac * ulist(jju,iatom,jnbor).re * uz +
+                                  sfac * dulist(jju,iatom,jnbor,2).re;
+        dulist(jju,iatom,jnbor,2).im = dsfac * ulist(jju,iatom,jnbor).im * uz +
+                                  sfac * dulist(jju,iatom,jnbor,2).im;
 
         jju++;
       }
@@ -1257,6 +1585,39 @@ double SNAKokkos<DeviceType>::compute_dsfac(double r, double rcut)
   return 0.0;
 }
 
+/* ---------------------------------------------------------------------- */
+
+// efficient complex FMA (i.e., y += a x)
+template<class DeviceType>
+KOKKOS_FORCEINLINE_FUNCTION
+void SNAKokkos<DeviceType>::caxpy(const SNAcomplex& a, const SNAcomplex& x, SNAcomplex& y) {
+  y.re += a.re * x.re;
+  y.re -= a.im * x.im;
+  y.im += a.im * x.re;
+  y.im += a.re * x.im;
+}
+
+/* ---------------------------------------------------------------------- */
+
+// efficient complex FMA, conjugate of scalar (i.e.) y += (a.re - i a.im) x)
+template<class DeviceType>
+KOKKOS_FORCEINLINE_FUNCTION
+void SNAKokkos<DeviceType>::caconjxpy(const SNAcomplex& a, const SNAcomplex& x, SNAcomplex& y) {
+  y.re += a.re * x.re;
+  y.re += a.im * x.im;
+  y.im -= a.im * x.re;
+  y.im += a.re * x.im;
+}
+
+/* ---------------------------------------------------------------------- */
+
+// set direction of batched Duidrj
+template<class DeviceType>
+KOKKOS_FORCEINLINE_FUNCTION
+void SNAKokkos<DeviceType>::set_dir(int dir_) {
+  dir = dir_;
+}
+
 /* ----------------------------------------------------------------------
    memory usage of arrays
 ------------------------------------------------------------------------- */
@@ -1273,11 +1634,17 @@ double SNAKokkos<DeviceType>::memory_usage()
   bytes += jdimpq*jdimpq * sizeof(double);               // pqarray
   bytes += idxcg_max * sizeof(double);                   // cglist
 
-  bytes += natom * idxu_max * sizeof(double) * 2;        // ulist
+#ifdef KOKKOS_ENABLE_CUDA
+  if (!std::is_same<DeviceType,Kokkos::Cuda>::value) {
+#endif
+    bytes += natom * idxu_max * sizeof(double) * 2;        // ulist
+    bytes += natom * idxu_max * 3 * sizeof(double) * 2;    // dulist
+#ifdef KOKKOS_ENABLE_CUDA
+  }
+#endif
   bytes += natom * idxu_max * sizeof(double) * 2;        // ulisttot
-  if (!Kokkos::Impl::is_same<typename DeviceType::array_layout,Kokkos::LayoutRight>::value)
+  if (!std::is_same<typename DeviceType::array_layout,Kokkos::LayoutRight>::value)
     bytes += natom * idxu_max * sizeof(double) * 2;        // ulisttot_lr
-  bytes += natom * idxu_max * 3 * sizeof(double) * 2;    // dulist
 
   bytes += natom * idxz_max * sizeof(double) * 2;        // zlist
   bytes += natom * idxb_max * sizeof(double);            // blist
diff --git a/src/KSPACE/ewald_dipole.cpp b/src/KSPACE/ewald_dipole.cpp
index d6a8aef9e3..c8267b461d 100644
--- a/src/KSPACE/ewald_dipole.cpp
+++ b/src/KSPACE/ewald_dipole.cpp
@@ -493,7 +493,7 @@ void EwaldDipole::compute(int eflag, int vflag)
 
   // sum global energy across Kspace vevs and add in volume-dependent term
   // taking the re-part of struct_fact_i x struct_fact_j
-  // substracting self energy and scaling
+  // subtracting self energy and scaling
 
   if (eflag_global) {
     for (k = 0; k < kcount; k++) {
diff --git a/src/KSPACE/ewald_dipole_spin.cpp b/src/KSPACE/ewald_dipole_spin.cpp
index f9a2a3f08d..4f19c2580f 100644
--- a/src/KSPACE/ewald_dipole_spin.cpp
+++ b/src/KSPACE/ewald_dipole_spin.cpp
@@ -472,7 +472,7 @@ void EwaldDipoleSpin::compute(int eflag, int vflag)
 
   // sum global energy across Kspace vevs and add in volume-dependent term
   // taking the re-part of struct_fact_i x struct_fact_j
-  // substracting self energy and scaling
+  // subtracting self energy and scaling
 
   if (eflag_global) {
     for (k = 0; k < kcount; k++) {
diff --git a/src/KSPACE/fft3d.cpp b/src/KSPACE/fft3d.cpp
index c9cf8df172..3e4d131d3a 100644
--- a/src/KSPACE/fft3d.cpp
+++ b/src/KSPACE/fft3d.cpp
@@ -107,13 +107,6 @@ void fft_3d(FFT_DATA *in, FFT_DATA *out, int flag, struct fft_plan_3d *plan)
     DftiComputeForward(plan->handle_fast,data);
   else
     DftiComputeBackward(plan->handle_fast,data);
-  /*
-#elif defined(FFT_FFTW2)
-  if (flag == -1)
-    fftw(plan->plan_fast_forward,total/length,data,1,length,NULL,0,0);
-  else
-   fftw(plan->plan_fast_backward,total/length,data,1,length,NULL,0,0);
-  */
 #elif defined(FFT_FFTW3)
   if (flag == -1)
     theplan=plan->plan_fast_forward;
@@ -148,13 +141,6 @@ void fft_3d(FFT_DATA *in, FFT_DATA *out, int flag, struct fft_plan_3d *plan)
     DftiComputeForward(plan->handle_mid,data);
   else
     DftiComputeBackward(plan->handle_mid,data);
-  /*
-#elif defined(FFT_FFTW2)
-  if (flag == -1)
-    fftw(plan->plan_mid_forward,total/length,data,1,length,NULL,0,0);
-  else
-    fftw(plan->plan_mid_backward,total/length,data,1,length,NULL,0,0);
-  */
 #elif defined(FFT_FFTW3)
   if (flag == -1)
     theplan=plan->plan_mid_forward;
@@ -189,13 +175,6 @@ void fft_3d(FFT_DATA *in, FFT_DATA *out, int flag, struct fft_plan_3d *plan)
     DftiComputeForward(plan->handle_slow,data);
   else
     DftiComputeBackward(plan->handle_slow,data);
-  /*
-#elif defined(FFT_FFTW2)
-  if (flag == -1)
-    fftw(plan->plan_slow_forward,total/length,data,1,length,NULL,0,0);
-  else
-    fftw(plan->plan_slow_backward,total/length,data,1,length,NULL,0,0);
-  */
 #elif defined(FFT_FFTW3)
   if (flag == -1)
     theplan=plan->plan_slow_forward;
@@ -231,7 +210,7 @@ void fft_3d(FFT_DATA *in, FFT_DATA *out, int flag, struct fft_plan_3d *plan)
       *(out_ptr++) *= norm;
 #elif defined(FFT_MKL)
       out[i] *= norm;
-#else
+#else  /* FFT_KISS */
       out[i].re *= norm;
       out[i].im *= norm;
 #endif
@@ -508,6 +487,9 @@ struct fft_plan_3d *fft_3d_create_plan(
   DftiSetValue(plan->handle_fast, DFTI_PLACEMENT,DFTI_INPLACE);
   DftiSetValue(plan->handle_fast, DFTI_INPUT_DISTANCE, (MKL_LONG)nfast);
   DftiSetValue(plan->handle_fast, DFTI_OUTPUT_DISTANCE, (MKL_LONG)nfast);
+#if defined(FFT_MKL_THREADS)
+  DftiSetValue(plan->handle_fast, DFTI_NUMBER_OF_USER_THREADS, nthreads);
+#endif
   DftiCommitDescriptor(plan->handle_fast);
 
   DftiCreateDescriptor( &(plan->handle_mid), FFT_MKL_PREC, DFTI_COMPLEX, 1,
@@ -517,6 +499,9 @@ struct fft_plan_3d *fft_3d_create_plan(
   DftiSetValue(plan->handle_mid, DFTI_PLACEMENT,DFTI_INPLACE);
   DftiSetValue(plan->handle_mid, DFTI_INPUT_DISTANCE, (MKL_LONG)nmid);
   DftiSetValue(plan->handle_mid, DFTI_OUTPUT_DISTANCE, (MKL_LONG)nmid);
+#if defined(FFT_MKL_THREADS)
+  DftiSetValue(plan->handle_mid, DFTI_NUMBER_OF_USER_THREADS, nthreads);
+#endif
   DftiCommitDescriptor(plan->handle_mid);
 
   DftiCreateDescriptor( &(plan->handle_slow), FFT_MKL_PREC, DFTI_COMPLEX, 1,
@@ -526,61 +511,11 @@ struct fft_plan_3d *fft_3d_create_plan(
   DftiSetValue(plan->handle_slow, DFTI_PLACEMENT,DFTI_INPLACE);
   DftiSetValue(plan->handle_slow, DFTI_INPUT_DISTANCE, (MKL_LONG)nslow);
   DftiSetValue(plan->handle_slow, DFTI_OUTPUT_DISTANCE, (MKL_LONG)nslow);
+#if defined(FFT_MKL_THREADS)
+  DftiSetValue(plan->handle_slow, DFTI_NUMBER_OF_USER_THREADS, nthreads);
+#endif
   DftiCommitDescriptor(plan->handle_slow);
 
-  if (scaled == 0)
-    plan->scaled = 0;
-  else {
-    plan->scaled = 1;
-    plan->norm = 1.0/(nfast*nmid*nslow);
-    plan->normnum = (out_ihi-out_ilo+1) * (out_jhi-out_jlo+1) *
-      (out_khi-out_klo+1);
-  }
-
-  /*
-#elif defined(FFT_FFTW2)
-
-  plan->plan_fast_forward =
-    fftw_create_plan(nfast,FFTW_FORWARD,FFTW_ESTIMATE | FFTW_IN_PLACE);
-  plan->plan_fast_backward =
-    fftw_create_plan(nfast,FFTW_BACKWARD,FFTW_ESTIMATE | FFTW_IN_PLACE);
-
-  if (nmid == nfast) {
-    plan->plan_mid_forward = plan->plan_fast_forward;
-    plan->plan_mid_backward = plan->plan_fast_backward;
-  }
-  else {
-    plan->plan_mid_forward =
-      fftw_create_plan(nmid,FFTW_FORWARD,FFTW_ESTIMATE | FFTW_IN_PLACE);
-    plan->plan_mid_backward =
-      fftw_create_plan(nmid,FFTW_BACKWARD,FFTW_ESTIMATE | FFTW_IN_PLACE);
-  }
-
-  if (nslow == nfast) {
-    plan->plan_slow_forward = plan->plan_fast_forward;
-    plan->plan_slow_backward = plan->plan_fast_backward;
-  }
-  else if (nslow == nmid) {
-    plan->plan_slow_forward = plan->plan_mid_forward;
-    plan->plan_slow_backward = plan->plan_mid_backward;
-  }
-  else {
-    plan->plan_slow_forward =
-      fftw_create_plan(nslow,FFTW_FORWARD,FFTW_ESTIMATE | FFTW_IN_PLACE);
-    plan->plan_slow_backward =
-      fftw_create_plan(nslow,FFTW_BACKWARD,FFTW_ESTIMATE | FFTW_IN_PLACE);
-  }
-
-  if (scaled == 0)
-    plan->scaled = 0;
-  else {
-    plan->scaled = 1;
-    plan->norm = 1.0/(nfast*nmid*nslow);
-    plan->normnum = (out_ihi-out_ilo+1) * (out_jhi-out_jlo+1) *
-      (out_khi-out_klo+1);
-  }
-  */
-
 #elif defined(FFT_FFTW3)
 #if defined(FFT_FFTW_THREADS)
   if (nthreads > 1) {
@@ -620,15 +555,8 @@ struct fft_plan_3d *fft_3d_create_plan(
                             NULL,&nslow,1,plan->length3,
                             FFTW_BACKWARD,FFTW_ESTIMATE);
 
-  if (scaled == 0)
-    plan->scaled = 0;
-  else {
-    plan->scaled = 1;
-    plan->norm = 1.0/(nfast*nmid*nslow);
-    plan->normnum = (out_ihi-out_ilo+1) * (out_jhi-out_jlo+1) *
-      (out_khi-out_klo+1);
-  }
-#else
+#else /* FFT_KISS */
+
   plan->cfg_fast_forward = kiss_fft_alloc(nfast,0,NULL,NULL);
   plan->cfg_fast_backward = kiss_fft_alloc(nfast,1,NULL,NULL);
 
@@ -654,6 +582,8 @@ struct fft_plan_3d *fft_3d_create_plan(
     plan->cfg_slow_backward = kiss_fft_alloc(nslow,1,NULL,NULL);
   }
 
+#endif
+
   if (scaled == 0)
     plan->scaled = 0;
   else {
@@ -663,8 +593,6 @@ struct fft_plan_3d *fft_3d_create_plan(
       (out_khi-out_klo+1);
   }
 
-#endif
-
   return plan;
 }
 
@@ -686,20 +614,6 @@ void fft_3d_destroy_plan(struct fft_plan_3d *plan)
   DftiFreeDescriptor(&(plan->handle_fast));
   DftiFreeDescriptor(&(plan->handle_mid));
   DftiFreeDescriptor(&(plan->handle_slow));
-  /*
-#elif defined(FFT_FFTW2)
-  if (plan->plan_slow_forward != plan->plan_fast_forward &&
-      plan->plan_slow_forward != plan->plan_mid_forward) {
-    fftw_destroy_plan(plan->plan_slow_forward);
-    fftw_destroy_plan(plan->plan_slow_backward);
-  }
-  if (plan->plan_mid_forward != plan->plan_fast_forward) {
-    fftw_destroy_plan(plan->plan_mid_forward);
-    fftw_destroy_plan(plan->plan_mid_backward);
-  }
-  fftw_destroy_plan(plan->plan_fast_forward);
-  fftw_destroy_plan(plan->plan_fast_backward);
-  */
 #elif defined(FFT_FFTW3)
   FFTW_API(destroy_plan)(plan->plan_slow_forward);
   FFTW_API(destroy_plan)(plan->plan_slow_backward);
@@ -840,18 +754,6 @@ void fft_1d_only(FFT_DATA *data, int nsize, int flag, struct fft_plan_3d *plan)
     DftiComputeBackward(plan->handle_mid,data);
     DftiComputeBackward(plan->handle_slow,data);
   }
-  /*
-#elif defined(FFT_FFTW2)
-  if (flag == -1) {
-    fftw(plan->plan_fast_forward,total1/length1,data,1,0,NULL,0,0);
-    fftw(plan->plan_mid_forward,total2/length2,data,1,0,NULL,0,0);
-    fftw(plan->plan_slow_forward,total3/length3,data,1,0,NULL,0,0);
-  } else {
-    fftw(plan->plan_fast_backward,total1/length1,data,1,0,NULL,0,0);
-    fftw(plan->plan_mid_backward,total2/length2,data,1,0,NULL,0,0);
-    fftw(plan->plan_slow_backward,total3/length3,data,1,0,NULL,0,0);
-  }
-  */
 #elif defined(FFT_FFTW3)
   FFTW_API(plan) theplan;
   if (flag == -1)
diff --git a/src/KSPACE/fft3d.h b/src/KSPACE/fft3d.h
index 8c3d2f27ad..4b5f36716f 100644
--- a/src/KSPACE/fft3d.h
+++ b/src/KSPACE/fft3d.h
@@ -43,14 +43,6 @@ typedef double FFT_SCALAR;
 typedef float _Complex FFT_DATA;
 #define FFT_MKL_PREC DFTI_SINGLE
 
-//#elif defined(FFT_FFTW2)
-//#if defined(FFTW_SIZE)
-//#include "sfftw.h"
-//#else
-//#include "fftw.h"
-//#endif
-//typedef FFTW_COMPLEX FFT_DATA;
-
 #elif defined(FFT_FFTW3)
 #include "fftw3.h"
 typedef fftwf_complex FFT_DATA;
@@ -84,14 +76,6 @@ typedef struct kiss_fft_state* kiss_fft_cfg;
 typedef double _Complex FFT_DATA;
 #define FFT_MKL_PREC DFTI_DOUBLE
 
-//#elif defined(FFT_FFTW2)
-//#if defined(FFTW_SIZE)
-//#include "dfftw.h"
-//#else
-//#include "fftw.h"
-//#endif
-//typedef FFTW_COMPLEX FFT_DATA;
-
 #elif defined(FFT_FFTW3)
 #include "fftw3.h"
 typedef fftw_complex FFT_DATA;
@@ -141,13 +125,6 @@ struct fft_plan_3d {
   DFTI_DESCRIPTOR *handle_fast;
   DFTI_DESCRIPTOR *handle_mid;
   DFTI_DESCRIPTOR *handle_slow;
-//#elif defined(FFT_FFTW2)
-//  fftw_plan plan_fast_forward;
-//  fftw_plan plan_fast_backward;
-//  fftw_plan plan_mid_forward;
-//  fftw_plan plan_mid_backward;
-//fftw_plan plan_slow_forward;
-//fftw_plan plan_slow_backward;
 #elif defined(FFT_FFTW3)
   FFTW_API(plan) plan_fast_forward;
   FFTW_API(plan) plan_fast_backward;
diff --git a/src/KSPACE/msm.cpp b/src/KSPACE/msm.cpp
index 126236a328..1520c2c607 100644
--- a/src/KSPACE/msm.cpp
+++ b/src/KSPACE/msm.cpp
@@ -2920,7 +2920,7 @@ void MSM::compute_phis_and_dphis(const double &dx, const double &dy,
 
 /* ----------------------------------------------------------------------
    compute phi using interpolating polynomial
-   see Eq 7 from Parallel Computing 35 (2009) 164�177
+   see Eq 7 from Parallel Computing 35 (2009) 164-177
    and Hardy's thesis
 ------------------------------------------------------------------------- */
 
@@ -2999,7 +2999,7 @@ inline double MSM::compute_phi(const double &xi)
 /* ----------------------------------------------------------------------
    compute the derivative of phi
    phi is an interpolating polynomial
-   see Eq 7 from Parallel Computing 35 (2009) 164�177
+   see Eq 7 from Parallel Computing 35 (2009) 164-177
    and Hardy's thesis
 ------------------------------------------------------------------------- */
 
diff --git a/src/KSPACE/msm_cg.cpp b/src/KSPACE/msm_cg.cpp
index 9119d51878..97e423a6e9 100644
--- a/src/KSPACE/msm_cg.cpp
+++ b/src/KSPACE/msm_cg.cpp
@@ -192,7 +192,7 @@ void MSMCG::compute(int eflag, int vflag)
   }
 
 
-  // compute direct interation for top grid level for non-periodic
+  // compute direct interaction for top grid level for non-periodic
   //   and for second from top grid level for periodic
 
   if (active_flag[levels-1]) {
diff --git a/src/KSPACE/pair_born_coul_long.cpp b/src/KSPACE/pair_born_coul_long.cpp
index b5b3eda64f..b4d050412a 100644
--- a/src/KSPACE/pair_born_coul_long.cpp
+++ b/src/KSPACE/pair_born_coul_long.cpp
@@ -47,6 +47,7 @@ PairBornCoulLong::PairBornCoulLong(LAMMPS *lmp) : Pair(lmp)
   ewaldflag = pppmflag = 1;
   ftable = NULL;
   writedata = 1;
+  cut_respa = NULL;
 }
 
 /* ---------------------------------------------------------------------- */
diff --git a/src/KSPACE/pair_buck_long_coul_long.cpp b/src/KSPACE/pair_buck_long_coul_long.cpp
index 7f369045c3..6c731b73b3 100644
--- a/src/KSPACE/pair_buck_long_coul_long.cpp
+++ b/src/KSPACE/pair_buck_long_coul_long.cpp
@@ -52,6 +52,7 @@ PairBuckLongCoulLong::PairBuckLongCoulLong(LAMMPS *lmp) : Pair(lmp)
   writedata = 1;
   ftable = NULL;
   fdisptable = NULL;
+  cut_respa = NULL;
 }
 
 /* ----------------------------------------------------------------------
diff --git a/src/KSPACE/pair_coul_long.cpp b/src/KSPACE/pair_coul_long.cpp
index 004835007d..9a9f2f3783 100644
--- a/src/KSPACE/pair_coul_long.cpp
+++ b/src/KSPACE/pair_coul_long.cpp
@@ -46,6 +46,7 @@ PairCoulLong::PairCoulLong(LAMMPS *lmp) : Pair(lmp)
   ewaldflag = pppmflag = 1;
   ftable = NULL;
   qdist = 0.0;
+  cut_respa = NULL;
 }
 
 /* ---------------------------------------------------------------------- */
diff --git a/src/KSPACE/pair_lj_charmm_coul_long.cpp b/src/KSPACE/pair_lj_charmm_coul_long.cpp
index 22ed923b49..390005d80e 100644
--- a/src/KSPACE/pair_lj_charmm_coul_long.cpp
+++ b/src/KSPACE/pair_lj_charmm_coul_long.cpp
@@ -51,6 +51,7 @@ PairLJCharmmCoulLong::PairLJCharmmCoulLong(LAMMPS *lmp) : Pair(lmp)
   implicit = 0;
   mix_flag = ARITHMETIC;
   writedata = 1;
+  cut_respa = NULL;
 }
 
 /* ---------------------------------------------------------------------- */
diff --git a/src/KSPACE/pair_lj_charmmfsw_coul_long.cpp b/src/KSPACE/pair_lj_charmmfsw_coul_long.cpp
index ce7fda5f18..0371ac42c5 100644
--- a/src/KSPACE/pair_lj_charmmfsw_coul_long.cpp
+++ b/src/KSPACE/pair_lj_charmmfsw_coul_long.cpp
@@ -55,6 +55,7 @@ PairLJCharmmfswCoulLong::PairLJCharmmfswCoulLong(LAMMPS *lmp) : Pair(lmp)
   implicit = 0;
   mix_flag = ARITHMETIC;
   writedata = 1;
+  cut_respa = NULL;
 
   // short-range/long-range flag accessed by DihedralCharmmfsw
 
diff --git a/src/KSPACE/pair_lj_cut_coul_long.cpp b/src/KSPACE/pair_lj_cut_coul_long.cpp
index 23e182435d..ff20dc2570 100644
--- a/src/KSPACE/pair_lj_cut_coul_long.cpp
+++ b/src/KSPACE/pair_lj_cut_coul_long.cpp
@@ -53,6 +53,7 @@ PairLJCutCoulLong::PairLJCutCoulLong(LAMMPS *lmp) : Pair(lmp)
   writedata = 1;
   ftable = NULL;
   qdist = 0.0;
+  cut_respa = NULL;
 }
 
 /* ---------------------------------------------------------------------- */
diff --git a/src/KSPACE/pair_lj_long_coul_long.cpp b/src/KSPACE/pair_lj_long_coul_long.cpp
index 4af3cdeecd..94955d2d6d 100644
--- a/src/KSPACE/pair_lj_long_coul_long.cpp
+++ b/src/KSPACE/pair_lj_long_coul_long.cpp
@@ -55,6 +55,7 @@ PairLJLongCoulLong::PairLJLongCoulLong(LAMMPS *lmp) : Pair(lmp)
   ftable = NULL;
   fdisptable = NULL;
   qdist = 0.0;
+  cut_respa = NULL;
 }
 
 /* ----------------------------------------------------------------------
diff --git a/src/KSPACE/pppm.cpp b/src/KSPACE/pppm.cpp
index cd0a1bf47a..f7ed168395 100644
--- a/src/KSPACE/pppm.cpp
+++ b/src/KSPACE/pppm.cpp
@@ -818,7 +818,7 @@ void PPPM::allocate()
                           "pppm:drho_coeff");
 
   // create 2 FFTs and a Remap
-  // 1st FFT keeps data in FFT decompostion
+  // 1st FFT keeps data in FFT decomposition
   // 2nd FFT returns data in 3d brick decomposition
   // remap takes data from 3d brick to FFT decomposition
 
@@ -2565,7 +2565,7 @@ void PPPM::fieldforce_ad()
     eky *= hy_inv;
     ekz *= hz_inv;
 
-    // convert E-field to force and substract self forces
+    // convert E-field to force and subtract self forces
 
     const double qfactor = qqrd2e * scale;
 
diff --git a/src/KSPACE/pppm_cg.cpp b/src/KSPACE/pppm_cg.cpp
index bd23dedef1..25609f70fd 100644
--- a/src/KSPACE/pppm_cg.cpp
+++ b/src/KSPACE/pppm_cg.cpp
@@ -493,7 +493,7 @@ void PPPMCG::fieldforce_ad()
     eky *= hy_inv;
     ekz *= hz_inv;
 
-    // convert E-field to force and substract self forces
+    // convert E-field to force and subtract self forces
 
     const double qfactor = qqrd2e * scale;
 
diff --git a/src/KSPACE/pppm_dipole.cpp b/src/KSPACE/pppm_dipole.cpp
index 2d5f6ad981..f1151aee1d 100644
--- a/src/KSPACE/pppm_dipole.cpp
+++ b/src/KSPACE/pppm_dipole.cpp
@@ -619,7 +619,7 @@ void PPPMDipole::allocate()
                           "pppm_dipole:drho_coeff");
 
   // create 2 FFTs and a Remap
-  // 1st FFT keeps data in FFT decompostion
+  // 1st FFT keeps data in FFT decomposition
   // 2nd FFT returns data in 3d brick decomposition
   // remap takes data from 3d brick to FFT decomposition
 
diff --git a/src/KSPACE/pppm_disp.cpp b/src/KSPACE/pppm_disp.cpp
index 0bb81f125e..00615c740e 100644
--- a/src/KSPACE/pppm_disp.cpp
+++ b/src/KSPACE/pppm_disp.cpp
@@ -976,7 +976,7 @@ void PPPMDisp::compute(int eflag, int vflag)
 
   if (function[0]) {
 
-    //perfrom calculations for coulomb interactions only
+    //perform calculations for coulomb interactions only
 
     particle_map_c(delxinv, delyinv, delzinv, shift, part2grid, nupper, nlower,
                  nxlo_out, nylo_out, nzlo_out, nxhi_out, nyhi_out, nzhi_out);
@@ -1024,7 +1024,7 @@ void PPPMDisp::compute(int eflag, int vflag)
   }
 
   if (function[1]) {
-    //perfrom calculations for geometric mixing
+    //perform calculations for geometric mixing
     particle_map(delxinv_6, delyinv_6, delzinv_6, shift_6, part2grid_6, nupper_6, nlower_6,
                  nxlo_out_6, nylo_out_6, nzlo_out_6, nxhi_out_6, nyhi_out_6, nzhi_out_6);
     make_rho_g();
@@ -1142,7 +1142,7 @@ void PPPMDisp::compute(int eflag, int vflag)
   }
 
   if (function[3]) {
-    //perfrom calculations if no mixing rule applies
+    //perform calculations if no mixing rule applies
     particle_map(delxinv_6, delyinv_6, delzinv_6, shift_6, part2grid_6, nupper_6, nlower_6,
                  nxlo_out_6, nylo_out_6, nzlo_out_6, nxhi_out_6, nyhi_out_6, nzhi_out_6);
 
@@ -1308,7 +1308,7 @@ void PPPMDisp::init_coeffs()                            // local pair coeffs
           Q[i][j] = 0.0;
       for (int i = 0; i < n; i++)
         Q[i][i] = 1.0;
-      // perfrom eigenvalue decomposition with QR algorithm
+      // perform eigenvalue decomposition with QR algorithm
       converged = qr_alg(A,Q,n);
       if (function[3] && !converged) {
         error->all(FLERR,"Matrix factorization to split dispersion coefficients failed");
@@ -1454,7 +1454,7 @@ int PPPMDisp::qr_alg(double **A, double **Q, int n)
   // allocate an auxiliary matrix Qi
   memory->create(Qi,n,n,"pppm/disp:Qi");
 
-  // alllocate an auxillary matrices for the matrix multiplication
+  // alllocate an auxiliary matrices for the matrix multiplication
   memory->create(C,n,n,"pppm/disp:C");
   memory->create(D,n,n,"pppm/disp:D");
   memory->create(E,n,n,"pppm/disp:E");
@@ -1659,7 +1659,7 @@ int PPPMDisp::check_convergence(double** A,double** Q,double** A0,
    allocate memory that depends on # of K-vectors and order
 ------------------------------------------------------------------------- */
 
-void PPPMDisp::allocate()
+void _noopt PPPMDisp::allocate()
 {
 
   int (*procneigh)[2] = comm->procneigh;
@@ -3657,7 +3657,7 @@ void PPPMDisp::set_n_pppm_6()
 
   // initial value for the grid spacing
   h = h_x = h_y = h_z = 4.0/g_ewald_6;
-  // decrease grid spacing untill required precision is obtained
+  // decrease grid spacing until required precision is obtained
   int count = 0;
   while(1) {
 
@@ -5760,7 +5760,7 @@ void PPPMDisp::fieldforce_c_ad()
     ekx *= hx_inv;
     eky *= hy_inv;
     ekz *= hz_inv;
-    // convert E-field to force and substract self forces
+    // convert E-field to force and subtract self forces
     const double qfactor = force->qqrd2e * scale;
 
     s1 = x[i][0]*hx_inv;
diff --git a/src/KSPACE/pppm_disp_tip4p.cpp b/src/KSPACE/pppm_disp_tip4p.cpp
index bc46152e2b..45217eb7a5 100644
--- a/src/KSPACE/pppm_disp_tip4p.cpp
+++ b/src/KSPACE/pppm_disp_tip4p.cpp
@@ -335,7 +335,7 @@ void PPPMDispTIP4P::fieldforce_c_ad()
     eky *= hy_inv;
     ekz *= hz_inv;
 
-    // convert E-field to force and substract self forces
+    // convert E-field to force and subtract self forces
     const double qfactor = force->qqrd2e * scale;
 
     s1 = x[i][0]*hx_inv;
diff --git a/src/KSPACE/pppm_stagger.cpp b/src/KSPACE/pppm_stagger.cpp
index 7b708d0355..d7466ee0d4 100644
--- a/src/KSPACE/pppm_stagger.cpp
+++ b/src/KSPACE/pppm_stagger.cpp
@@ -876,7 +876,7 @@ void PPPMStagger::fieldforce_ad()
     eky *= hy_inv;
     ekz *= hz_inv;
 
-    // convert E-field to force and substract self forces
+    // convert E-field to force and subtract self forces
 
     const double qfactor = qqrd2e * scale / float(nstagger);
 
diff --git a/src/KSPACE/pppm_tip4p.cpp b/src/KSPACE/pppm_tip4p.cpp
index 5a0ced3674..e2019d3f83 100644
--- a/src/KSPACE/pppm_tip4p.cpp
+++ b/src/KSPACE/pppm_tip4p.cpp
@@ -327,7 +327,7 @@ void PPPMTIP4P::fieldforce_ad()
     eky *= hy_inv;
     ekz *= hz_inv;
 
-    // convert E-field to force and substract self forces
+    // convert E-field to force and subtract self forces
 
     const double qfactor = qqrd2e * scale;
 
diff --git a/src/MAKE/MACHINES/Makefile.redsky b/src/MAKE/MACHINES/Makefile.redsky
index 551952181e..8e943bbb78 100644
--- a/src/MAKE/MACHINES/Makefile.redsky
+++ b/src/MAKE/MACHINES/Makefile.redsky
@@ -16,7 +16,7 @@ SHELL = /bin/sh
 
 # IMPORTANT NOTE:
 # to run efficiently on RedSky, use the "numa_wrapper" mpiexec option,
-#   to insure proceses and their memory are locked to specific cores
+#   to insure processes and their memory are locked to specific cores
 # e.g. in your batch script:
 #   nodes=$SLURM_JOB_NUM_NODES
 #   cores=8
diff --git a/src/MANYBODY/pair_adp.cpp b/src/MANYBODY/pair_adp.cpp
index 64c778659c..e730466fcb 100644
--- a/src/MANYBODY/pair_adp.cpp
+++ b/src/MANYBODY/pair_adp.cpp
@@ -927,7 +927,7 @@ void PairADP::grab(FILE *fp, char *filename, int n, double *list)
   while (i < n) {
     utils::sfgets(FLERR,line,MAXLINE,fp,filename,error);
     ptr = strtok(line," \t\n\r\f");
-    list[i++] = atof(ptr);
+    if (ptr) list[i++] = atof(ptr);
     while ((ptr = strtok(NULL," \t\n\r\f"))) list[i++] = atof(ptr);
   }
 }
diff --git a/src/MANYBODY/pair_airebo.cpp b/src/MANYBODY/pair_airebo.cpp
index 1d9dd18887..84565a2e50 100644
--- a/src/MANYBODY/pair_airebo.cpp
+++ b/src/MANYBODY/pair_airebo.cpp
@@ -2081,9 +2081,9 @@ double PairAIREBO::bondorder(int i, int j, double rij[3],
 
 This function calculates S(t_b(b_ij*)) as specified in the AIREBO paper.
 To do so, it needs to compute b_ij*, i.e. the bondorder given that the
-atoms i and j are placed a ficticious distance rijmag_mod apart.
+atoms i and j are placed a fictitious distance rijmag_mod apart.
 Now there are two approaches to calculate the resulting forces:
-1. Carry through the ficticious distance and corresponding vector
+1. Carry through the fictitious distance and corresponding vector
    rij_mod, correcting afterwards using the derivative of r/|r|.
 2. Perform all the calculations using the real distance, and do not
    use a correction, only using rijmag_mod where necessary.
diff --git a/src/MANYBODY/pair_bop.cpp b/src/MANYBODY/pair_bop.cpp
index 2763c561d6..10ab1d7080 100644
--- a/src/MANYBODY/pair_bop.cpp
+++ b/src/MANYBODY/pair_bop.cpp
@@ -5017,7 +5017,7 @@ double PairBOP::PiBo(int itmp, int jtmp)
 
 /* ---------------------------------------------------------------------- */
 
-void PairBOP::read_table(char *filename)
+void _noopt PairBOP::read_table(char *filename)
 {
   int i,j,k,n,m;
   int buf1,pass;
diff --git a/src/MANYBODY/pair_bop.h b/src/MANYBODY/pair_bop.h
index eca0ec52b8..ea8da2844e 100644
--- a/src/MANYBODY/pair_bop.h
+++ b/src/MANYBODY/pair_bop.h
@@ -48,12 +48,12 @@ class PairBOP : public Pair {
   int maxbopn;                  // maximum size of bop neighbor list for allocation
   int maxnall;                  // maximum size of bop neighbor list for allocation
   int *map;                     // mapping from atom types to elements
-  int nelements;                // # of unique elments
+  int nelements;                // # of unique elements
   int nr;                       // increments for the BOP pair potential
   int ntheta;                   // increments for the angle function
   int npower;                   // power of the angular function
   int nBOt;                     // second BO increments
-  int bop_types;                // number of elments in potential
+  int bop_types;                // number of elements in potential
   int npairs;                   // number of element pairs
   char **elements;              // names of unique elements
   int ***elem2param;
diff --git a/src/MANYBODY/pair_eam.cpp b/src/MANYBODY/pair_eam.cpp
index d1b864d9e4..a1bc6e1eb4 100644
--- a/src/MANYBODY/pair_eam.cpp
+++ b/src/MANYBODY/pair_eam.cpp
@@ -797,7 +797,7 @@ void PairEAM::grab(FILE *fptr, int n, double *list)
   while (i < n) {
     utils::sfgets(FLERR,line,MAXLINE,fptr,NULL,error);
     ptr = strtok(line," \t\n\r\f");
-    list[i++] = atof(ptr);
+    if (ptr) list[i++] = atof(ptr);
     while ((ptr = strtok(NULL," \t\n\r\f"))) list[i++] = atof(ptr);
   }
 }
diff --git a/src/MANYBODY/pair_lcbop.cpp b/src/MANYBODY/pair_lcbop.cpp
index cc97fd9e9b..7c29f44afc 100644
--- a/src/MANYBODY/pair_lcbop.cpp
+++ b/src/MANYBODY/pair_lcbop.cpp
@@ -256,7 +256,7 @@ void PairLCBOP::SR_neigh()
 
   double **x = atom->x;
 
-  if (atom->nmax > maxlocal) {  // ensure ther is enough space
+  if (atom->nmax > maxlocal) {  // ensure there is enough space
     maxlocal = atom->nmax;      // for atoms and ghosts allocated
     memory->destroy(SR_numneigh);
     memory->sfree(SR_firstneigh);
diff --git a/src/MESSAGE/fix_client_md.cpp b/src/MESSAGE/fix_client_md.cpp
index 1a9437ebe2..1cbce3a7f9 100644
--- a/src/MESSAGE/fix_client_md.cpp
+++ b/src/MESSAGE/fix_client_md.cpp
@@ -45,7 +45,7 @@ FixClientMD::FixClientMD(LAMMPS *lmp, int narg, char **arg) :
   if (!atom->map_style) error->all(FLERR,"Fix client/md requires atom map");
 
   if (sizeof(tagint) != 4)
-    error->all(FLERR,"Fix client/md requires 4-byte atom IDs");
+    error->all(FLERR,"Fix client/md only supports 32-bit atom IDs");
 
   if (strcmp(update->unit_style,"real") == 0) units = REAL;
   else if (strcmp(update->unit_style,"metal") == 0) units = METAL;
diff --git a/src/MESSAGE/server_mc.cpp b/src/MESSAGE/server_mc.cpp
index 8152b1f772..af7850a0e9 100644
--- a/src/MESSAGE/server_mc.cpp
+++ b/src/MESSAGE/server_mc.cpp
@@ -13,6 +13,7 @@
 
 #include "server_mc.h"
 #include "atom.h"
+#include "domain.h"
 #include "update.h"
 #include "integrate.h"
 #include "input.h"
@@ -43,17 +44,17 @@ void ServerMC::loop()
 
   CSlib *cs = (CSlib *) lmp->cslib;
 
-  // require atom map
+  if (domain->box_exist == 0)
+    error->all(FLERR,"Server command before simulation box is defined");
 
-  if (!atom->map_style) error->all(FLERR,"Server mode requires atom map");
+  if (!atom->map_style) error->all(FLERR,"Server mc requires atom map");
+  if (atom->tag_enable == 0) error->all(FLERR,"Server mc requires atom IDs");
+  if (sizeof(tagint) != 4) error->all(FLERR,"Server mc requires 32-bit atom IDs");
 
   // initialize LAMMPS for dynamics
 
   input->one("run 0");
 
-  //update->whichflag = 1;
-  //lmp->init();
-
   // loop on messages
   // receive a message, process it, send return message if necessary
 
@@ -123,8 +124,6 @@ void ServerMC::loop()
 
       int nsteps = cs->unpack_int(1);
 
-      //input->one("run 100");
-
       update->nsteps = nsteps;
       update->firststep = update->ntimestep;
       update->laststep = update->ntimestep + nsteps;
diff --git a/src/MESSAGE/server_md.cpp b/src/MESSAGE/server_md.cpp
index e16095ad4c..418162e5d9 100644
--- a/src/MESSAGE/server_md.cpp
+++ b/src/MESSAGE/server_md.cpp
@@ -48,7 +48,7 @@ ServerMD::ServerMD(LAMMPS *lmp) : Pointers(lmp)
 
   if (!atom->map_style) error->all(FLERR,"Server md requires atom map");
   if (atom->tag_enable == 0) error->all(FLERR,"Server md requires atom IDs");
-  if (sizeof(tagint) != 4) error->all(FLERR,"Server md requires 4-byte atom IDs");
+  if (sizeof(tagint) != 4) error->all(FLERR,"Server md requires 32-bit atom IDs");
 
   if (strcmp(update->unit_style,"real") == 0) units = REAL;
   else if (strcmp(update->unit_style,"metal") == 0) units = METAL;
diff --git a/src/MISC/dump_xtc.cpp b/src/MISC/dump_xtc.cpp
index 1a2b71ab6d..a28d6acdfa 100644
--- a/src/MISC/dump_xtc.cpp
+++ b/src/MISC/dump_xtc.cpp
@@ -439,7 +439,7 @@ int xdropen(XDR *xdrs, const char *filename, const char *type)
   }
   xdrmodes[xdrid] = *type;
 
-  /* next test isn't usefull in the case of C language
+  /* next test isn't useful in the case of C language
    * but is used for the Fortran interface
    * (C users are expected to pass the address of an already allocated
    * XDR staructure)
@@ -610,7 +610,7 @@ static int sizeofints( const int num_of_ints, unsigned int sizes[])
  | this routine is used internally by xdr3dfcoord, to send a set of
  | small integers to the buffer.
  | Multiplication with fixed (specified maximum ) sizes is used to get
- | to one big, multibyte integer. Allthough the routine could be
+ | to one big, multibyte integer. Although the routine could be
  | modified to handle sizes bigger than 16777216, or more than just
  | a few integers, this is not done, because the gain in compression
  | isn't worth the effort. Note that overflowing the multiplication
@@ -758,7 +758,7 @@ static void receiveints(int buf[], const int num_of_ints, int num_of_bits,
  | using multiplication by *precision and rounding to the nearest integer.
  | Then the minimum and maximum value are calculated to determine the range.
  | The limited range of integers so found, is used to compress the coordinates.
- | In addition the differences between succesive coordinates is calculated.
+ | In addition the differences between successive coordinates is calculated.
  | If the difference happens to be 'small' then only the difference is saved,
  | compressing the data even more. The notion of 'small' is changed dynamically
  | and is enlarged or reduced whenever needed or possible.
diff --git a/src/MISC/fix_deposit.cpp b/src/MISC/fix_deposit.cpp
index 5279b2df36..a15a359881 100644
--- a/src/MISC/fix_deposit.cpp
+++ b/src/MISC/fix_deposit.cpp
@@ -539,7 +539,13 @@ void FixDeposit::pre_exchange()
         n = atom->nlocal - 1;
         atom->tag[n] = maxtag_all + m+1;
         if (mode == MOLECULE) {
-          if (atom->molecule_flag) atom->molecule[n] = maxmol_all+1;
+          if (atom->molecule_flag) {
+            if (onemols[imol]->moleculeflag) {
+              atom->molecule[n] = maxmol_all + onemols[imol]->molecule[m];
+            } else {
+              atom->molecule[n] = maxmol_all+1;
+            }
+          }
           if (atom->molecular == 2) {
             atom->molindex[n] = 0;
             atom->molatom[n] = m;
@@ -569,7 +575,7 @@ void FixDeposit::pre_exchange()
 
     // old code: unsuccessful if no proc performed insertion of an atom
     // don't think that check is necessary
-    // if get this far, should always be succesful
+    // if get this far, should always be successful
     // would be hard to undo partial insertion for a molecule
     // better to check how many atoms could be inserted (w/out inserting)
     //   then sum to insure all are inserted, before doing actual insertion
@@ -603,7 +609,13 @@ void FixDeposit::pre_exchange()
     maxtag_all += natom;
     if (maxtag_all >= MAXTAGINT)
       error->all(FLERR,"New atom IDs exceed maximum allowed ID");
-    if (mode == MOLECULE && atom->molecule_flag) maxmol_all++;
+    if (mode == MOLECULE && atom->molecule_flag) {
+      if (onemols[imol]->moleculeflag) {
+        maxmol_all += onemols[imol]->nmolecules;
+      } else {
+        maxmol_all++;
+      }
+    }
     if (atom->map_style) {
       atom->map_init();
       atom->map_set();
diff --git a/src/MISC/fix_orient_bcc.cpp b/src/MISC/fix_orient_bcc.cpp
index 1453ceb317..f93c7f8a6a 100644
--- a/src/MISC/fix_orient_bcc.cpp
+++ b/src/MISC/fix_orient_bcc.cpp
@@ -15,7 +15,7 @@
    Contributing authors: Koenraad Janssens and David Olmsted (SNL)
    Modification for bcc provided by: Tegar Wicaksono (UBC)
    For a tutorial, please see "Order parameters of crystals in LAMMPS"
-            (https://dx.doi.org/10.6084/m9.figshare.1488628.v1
+            (https://doi.org/10.6084/m9.figshare.1488628.v1
 ------------------------------------------------------------------------- */
 
 #include "fix_orient_bcc.h"
diff --git a/src/MPIIO/restart_mpiio.cpp b/src/MPIIO/restart_mpiio.cpp
index e8ef5c6c4e..db511c7bc0 100644
--- a/src/MPIIO/restart_mpiio.cpp
+++ b/src/MPIIO/restart_mpiio.cpp
@@ -120,7 +120,7 @@ void RestartMPIIO::write(MPI_Offset headerOffset, int send_size, double *buf)
    if the consolidated chunksize is greater than INT_MAX
      can only happen in extreme situation of reading restart file on
      much fewer ranks than written and with relatively large data sizes
-   follow the collective IO call with rank independant IO to read remaining data
+   follow the collective IO call with rank independent IO to read remaining data
 ------------------------------------------------------------------------- */
 
 void RestartMPIIO::read(MPI_Offset chunkOffset, bigint chunkSize, double *buf)
diff --git a/src/MSCG/README b/src/MSCG/README
index ed0ef37452..ab64c26792 100644
--- a/src/MSCG/README
+++ b/src/MSCG/README
@@ -8,7 +8,7 @@ developed by Jacob Wagner in Greg Voth's group at the University of
 Chicago.
 
 The library can be downloaded and built in lib/mscg or elsewhere on
-your system, which must be done before bulding LAMMPS with this
+your system, which must be done before building LAMMPS with this
 package.  Details of the download, build, and install process for MSCG
 are given in the lib/mscg/README file.  Also see the LAMMPS manual for
 general information on building LAMMPS with external libraries. The
diff --git a/src/Makefile b/src/Makefile
index 5db09db65a..bce5089500 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -60,10 +60,10 @@ PACKAGE = asphere body class2 colloid compress coreshell dipole gpu \
 
 PACKUSER = user-adios user-atc user-awpmd user-bocs user-cgdna user-cgsdk user-colvars \
 	   user-diffraction user-dpd user-drude user-eff user-fep user-h5md \
-	   user-intel user-lb user-manifold user-meamc user-meso \
+	   user-intel user-lb user-manifold user-meamc user-mesodpd \
 	   user-mgpt user-misc user-mofff user-molfile \
 	   user-netcdf user-omp user-phonon user-plumed user-ptm user-qmmm \
-	   user-qtb user-quip user-reaxc user-scafacos user-smd user-smtbq \
+	   user-qtb user-quip user-reaction user-reaxc user-scafacos user-smd user-smtbq \
 	   user-sdpd user-sph user-tally user-uef user-vtk user-yaff
 
 PACKLIB = compress gpu kim kokkos latte message mpiio mscg poems \
@@ -247,6 +247,11 @@ ifeq ($(mode),shlib)
 	@rm -f $(SHLINK)
 	@ln -s $(SHLIB) $(SHLINK)
 endif
+ifeq ($(mode),print)
+	@cd $(objdir); \
+	$(MAKE) $(MFLAGS) "OBJ = $(OBJLIB)" "INC = $(INC)" \
+	  "EXE = ../$(SHLIB)" -f ../Makefile.print
+endif
 
 # Remove machine-specific object files
 
diff --git a/src/Makefile.print b/src/Makefile.print
new file mode 100644
index 0000000000..8398eb2589
--- /dev/null
+++ b/src/Makefile.print
@@ -0,0 +1,22 @@
+# Makefile to allow printing current COMPILER/LINKER flags and settings
+
+print: do-print
+
+include Makefile
+
+# get location of the LAMMPS tree
+LMPDIR=$(shell echo $${PWD} | sed -e 's,/src/Obj_[+0-9a-z_-]\+$$,,')
+
+do-print:
+	@echo '# LAMMPS source tree is in:' $(LMPDIR)
+	@echo '# Compiler: '
+	@echo CXX=$(CC)
+	@echo '# Linker: '
+	@echo LD=$(LINK)
+	@echo '# Compilation: '
+	@echo CXXFLAGS=$(CCFLAGS) $(EXTRA_INC) | sed -e s,-I\\.\\./\\.\\./,-I${LMPDIR}/,g -e s,-I\\.\\./,-I${LMPDIR}/src/,g -e s,$(HOME),\\$$\\{HOME\\},g
+	@echo '# Linking: '
+	@echo LDFLAGS=$(LINKFLAGS)
+	@echo '# Libraries: '
+	@echo LDLIBS=$(EXTRA_PATH) $(EXTRA_LIB) $(LIB) | sed -e s,-L\\.\\./\\.\\./,-L${LMPDIR}/,g -e s,-L\\.\\./,-L${LMPDIR}/src/,g -e s,$(HOME),\\$$\\{HOME\\},g
+
diff --git a/src/PERI/fix_peri_neigh.h b/src/PERI/fix_peri_neigh.h
index 79006ab541..247ceaaa43 100644
--- a/src/PERI/fix_peri_neigh.h
+++ b/src/PERI/fix_peri_neigh.h
@@ -63,8 +63,8 @@ class FixPeriNeigh : public Fix {
   int maxpartner;            // max # of peridynamic neighs for any atom
   int *npartner;             // # of neighbors for each atom
   tagint **partner;          // neighs for each atom, stored as global IDs
-  double **deviatorextention; // Deviatoric extention
-  double **deviatorBackextention; // Deviatoric back extention
+  double **deviatorextention; // Deviatoric extension
+  double **deviatorBackextention; // Deviatoric back extension
   double **deviatorPlasticextension; // Deviatoric plastic extension
   double *lambdaValue;
   double **r0;               // initial distance to partners
diff --git a/src/PERI/pair_peri_ves.cpp b/src/PERI/pair_peri_ves.cpp
index 1cef9635a9..1d9f3819ff 100644
--- a/src/PERI/pair_peri_ves.cpp
+++ b/src/PERI/pair_peri_ves.cpp
@@ -317,7 +317,7 @@ void PairPeriVES::compute(int eflag, int vflag)
         dr - (theta[i]* r0[i][jj] / 3.0);
       deltaed = deviatoric_extension-deviatorextention[i][jj];
 
-      // back extention at current step
+      // back extension at current step
 
       edbNp1 = deviatorextention[i][jj]*(1-decay) +
         deviatorBackextention[i][jj]*decay+betai*deltaed;
@@ -357,7 +357,7 @@ void PairPeriVES::compute(int eflag, int vflag)
       // find stretch in bond I-J and break if necessary
       // use s0 from previous timestep
 
-      // store current deviatoric extention
+      // store current deviatoric extension
 
       deviatorextention[i][jj]=deviatoric_extension;
       deviatorBackextention[i][jj]=edbNp1;
diff --git a/src/PYTHON/fix_python_move.h b/src/PYTHON/fix_python_move.h
index 7b830a3d20..2220709970 100644
--- a/src/PYTHON/fix_python_move.h
+++ b/src/PYTHON/fix_python_move.h
@@ -11,7 +11,7 @@
    See the README file in the top-level LAMMPS directory.
 
    Pair zero is a dummy pair interaction useful for requiring a
-   force cutoff distance in the absense of pair-interactions or
+   force cutoff distance in the absence of pair-interactions or
    with hybrid/overlay if a larger force cutoff distance is required.
 
    This can be used in conjunction with bond/create to create bonds
diff --git a/src/PYTHON/pair_python.h b/src/PYTHON/pair_python.h
index 69671f7322..4c3c00a70d 100644
--- a/src/PYTHON/pair_python.h
+++ b/src/PYTHON/pair_python.h
@@ -11,7 +11,7 @@
    See the README file in the top-level LAMMPS directory.
 
    Pair zero is a dummy pair interaction useful for requiring a
-   force cutoff distance in the absense of pair-interactions or
+   force cutoff distance in the absence of pair-interactions or
    with hybrid/overlay if a larger force cutoff distance is required.
 
    This can be used in conjunction with bond/create to create bonds
diff --git a/src/PYTHON/python_impl.cpp b/src/PYTHON/python_impl.cpp
index 1188942e75..e027079f1f 100644
--- a/src/PYTHON/python_impl.cpp
+++ b/src/PYTHON/python_impl.cpp
@@ -535,3 +535,10 @@ void PythonImpl::deallocate(int i)
   delete [] pfuncs[i].ovarname;
   delete [] pfuncs[i].longstr;
 }
+
+/* ------------------------------------------------------------------ */
+
+bool PythonImpl::has_minimum_version(int major, int minor)
+{
+    return (PY_MAJOR_VERSION == major && PY_MINOR_VERSION >= minor) || (PY_MAJOR_VERSION > major);
+}
diff --git a/src/PYTHON/python_impl.h b/src/PYTHON/python_impl.h
index f890f54f3b..2fd52b8ead 100644
--- a/src/PYTHON/python_impl.h
+++ b/src/PYTHON/python_impl.h
@@ -32,6 +32,7 @@ class PythonImpl : protected Pointers, public PythonInterface {
   char *long_string(int);
   int execute_string(char *);
   int execute_file(char *);
+  bool has_minimum_version(int major, int minor);
 
  private:
   int ninput,noutput,length_longstr;
diff --git a/src/REPLICA/fix_event_hyper.h b/src/REPLICA/fix_event_hyper.h
index 4c5d4a93ee..af685ee539 100644
--- a/src/REPLICA/fix_event_hyper.h
+++ b/src/REPLICA/fix_event_hyper.h
@@ -29,7 +29,7 @@ class FixEventHyper : public FixEvent {
   int event_number;      // event counter
   bigint event_timestep; // timestep of last event on any replica
   bigint clock;          // total elapsed timesteps across all replicas
-  int replica_number;    // replica where last event occured
+  int replica_number;    // replica where last event occurred
   int correlated_event;  // 1 if last event was correlated, 0 otherwise
   int ncoincident;       // # of simultaneous events on different replicas
 
diff --git a/src/REPLICA/fix_event_prd.h b/src/REPLICA/fix_event_prd.h
index 0924fb2bdc..363de31e9d 100644
--- a/src/REPLICA/fix_event_prd.h
+++ b/src/REPLICA/fix_event_prd.h
@@ -29,7 +29,7 @@ class FixEventPRD : public FixEvent {
   int event_number;      // event counter
   bigint event_timestep; // timestep of last event on any replica
   bigint clock;          // total elapsed timesteps across all replicas
-  int replica_number;    // replica where last event occured
+  int replica_number;    // replica where last event occurred
   int correlated_event;  // 1 if last event was correlated, 0 otherwise
   int ncoincident;       // # of simultaneous events on different replicas
 
diff --git a/src/REPLICA/fix_hyper_global.cpp b/src/REPLICA/fix_hyper_global.cpp
index 62ba35abfc..bc5df921c6 100644
--- a/src/REPLICA/fix_hyper_global.cpp
+++ b/src/REPLICA/fix_hyper_global.cpp
@@ -189,7 +189,7 @@ void FixHyperGlobal::pre_neighbor()
   //   closest current I or J atoms to old I may now be ghost atoms
   //   closest_image() returns the ghost atom index in that case
   // also compute max drift of any atom in a bond
-  //   drift = displacement from quenched coord while event has not yet occured
+  //   drift = displacement from quenched coord while event has not yet occurred
   // NOTE: drift calc is now done in bond_build(), between 2 quenched states
 
   for (i = 0; i < nall_old; i++) old2now[i] = -1;
diff --git a/src/REPLICA/fix_hyper_local.cpp b/src/REPLICA/fix_hyper_local.cpp
index dc02432751..eebcd08bdd 100644
--- a/src/REPLICA/fix_hyper_local.cpp
+++ b/src/REPLICA/fix_hyper_local.cpp
@@ -379,7 +379,7 @@ void FixHyperLocal::pre_neighbor()
   //   closest current I or J atoms to old I may now be ghost atoms
   //   closest_image() returns the ghost atom index in that case
   // also compute max drift of any atom in a bond
-  //   drift = displacement from quenched coord while event has not yet occured
+  //   drift = displacement from quenched coord while event has not yet occurred
   // NOTE: drift calc is now done in bond_build(), between 2 quenched states
 
   for (i = 0; i < nall_old; i++) old2now[i] = -1;
@@ -796,7 +796,7 @@ void FixHyperLocal::pre_reverse(int /* eflag */, int /* vflag */)
     rmaxeverbig = rmax2all[1];
   }
 
-  // if requsted, check for any biased bonds that are too close to each other
+  // if requested, check for any biased bonds that are too close to each other
   // keep a running count for output
   // requires 2 additional local comm operations
 
@@ -887,7 +887,7 @@ void FixHyperLocal::build_bond_list(int natom)
 
   // reset Vmax to current bias coeff average
   // only if requested and elapsed time >= resetfreq
-  // ave = curent ave of all bias coeffs
+  // ave = current ave of all bias coeffs
   // if reset, adjust all Cij to keep Cij*Vmax unchanged
 
   if (resetfreq >= 0) {
diff --git a/src/REPLICA/prd.cpp b/src/REPLICA/prd.cpp
index f631cc6a0a..63e569d0c2 100644
--- a/src/REPLICA/prd.cpp
+++ b/src/REPLICA/prd.cpp
@@ -608,7 +608,7 @@ void PRD::quench()
    if replica_num is non-negative only check for event on replica_num
    if multiple events, choose one at random
    return -1 if no event
-   else return ireplica = world in which event occured
+   else return ireplica = world in which event occurred
 ------------------------------------------------------------------------- */
 
 int PRD::check_event(int replica_num)
diff --git a/src/REPLICA/temper.cpp b/src/REPLICA/temper.cpp
index 00ca062ecc..a4c67108d3 100644
--- a/src/REPLICA/temper.cpp
+++ b/src/REPLICA/temper.cpp
@@ -219,7 +219,17 @@ void Temper::command(int narg, char **arg)
 
     timer->init_timeout();
     update->integrate->run(nevery);
-    if (timer->is_timeout()) break;
+
+    // check for timeout across all procs
+
+    int my_timeout=0;
+    int any_timeout=0;
+    if (timer->is_timeout()) my_timeout=1;
+    MPI_Allreduce(&my_timeout, &any_timeout, 1, MPI_INT, MPI_SUM, universe->uworld);
+    if (any_timeout) {
+      timer->force_timeout();
+      break;
+    }
 
     // compute PE
     // notify compute it will be called at next swap
diff --git a/src/RIGID/fix_rattle.cpp b/src/RIGID/fix_rattle.cpp
index 93bf610e94..ff31ab9755 100644
--- a/src/RIGID/fix_rattle.cpp
+++ b/src/RIGID/fix_rattle.cpp
@@ -119,7 +119,7 @@ int FixRattle::setmask()
 
 void FixRattle::init() {
 
-  // initialise SHAKE first
+  // initialize SHAKE first
 
   FixShake::init();
 
diff --git a/src/RIGID/fix_rigid.cpp b/src/RIGID/fix_rigid.cpp
index 9f6a1e5d46..d77bf988a6 100644
--- a/src/RIGID/fix_rigid.cpp
+++ b/src/RIGID/fix_rigid.cpp
@@ -2185,7 +2185,7 @@ void FixRigid::setup_bodies_static()
 /* ----------------------------------------------------------------------
    one-time initialization of dynamic rigid body attributes
    set vcm and angmom, computed explicitly from constituent particles
-   not done if body properites read from file, e.g. for overlapping particles
+   not done if body properties read from file, e.g. for overlapping particles
 ------------------------------------------------------------------------- */
 
 void FixRigid::setup_bodies_dynamic()
@@ -2279,7 +2279,7 @@ void FixRigid::setup_bodies_dynamic()
 
 /* ----------------------------------------------------------------------
    read per rigid body info from user-provided file
-   which = 0 to read everthing except 6 moments of inertia
+   which = 0 to read everything except 6 moments of inertia
    which = 1 to read 6 moments of inertia
    flag inbody = 0 for bodies whose info is read from file
    nlines = # of lines of rigid body info
diff --git a/src/RIGID/fix_rigid_nh.h b/src/RIGID/fix_rigid_nh.h
index 08208e5aac..1126e7bb50 100644
--- a/src/RIGID/fix_rigid_nh.h
+++ b/src/RIGID/fix_rigid_nh.h
@@ -54,7 +54,7 @@ class FixRigidNH : public FixRigid {
 
   int kspace_flag;                    // 1 if KSpace invoked, 0 if not
   int nrigidfix;                      // number of rigid fixes
-  int *rfix;                          // indicies of rigid fixes
+  int *rfix;                          // indices of rigid fixes
 
   double vol0;                        // reference volume
   double t0;                          // reference temperature
diff --git a/src/RIGID/fix_rigid_nh_small.h b/src/RIGID/fix_rigid_nh_small.h
index 207c2d0a11..e04290aee8 100644
--- a/src/RIGID/fix_rigid_nh_small.h
+++ b/src/RIGID/fix_rigid_nh_small.h
@@ -53,7 +53,7 @@ class FixRigidNHSmall : public FixRigidSmall {
 
   int kspace_flag;                    // 1 if KSpace invoked, 0 if not
   int nrigidfix;                      // number of rigid fixes
-  int *rfix;                          // indicies of rigid fixes
+  int *rfix;                          // indices of rigid fixes
 
   double vol0;                        // reference volume
   double t0;                          // reference temperature
diff --git a/src/RIGID/fix_rigid_small.cpp b/src/RIGID/fix_rigid_small.cpp
index 0b2c2d967f..9974a7f888 100644
--- a/src/RIGID/fix_rigid_small.cpp
+++ b/src/RIGID/fix_rigid_small.cpp
@@ -1091,7 +1091,7 @@ void FixRigidSmall::final_integrate_respa(int ilevel, int /*iloop*/)
      when unwrapped by true image flags
    then set_xv() will compute huge displacements every step to reset coords of
      all the body atoms to be back inside the box, ditto for triclinic box flip
-     note: so just want to avoid that numeric probem?
+     note: so just want to avoid that numeric problem?
 ------------------------------------------------------------------------- */
 
 void FixRigidSmall::pre_neighbor()
@@ -2320,7 +2320,7 @@ void FixRigidSmall::setup_bodies_static()
 /* ----------------------------------------------------------------------
    one-time initialization of dynamic rigid body attributes
    vcm and angmom, computed explicitly from constituent particles
-   not done if body properites read from file, e.g. for overlapping particles
+   not done if body properties read from file, e.g. for overlapping particles
 ------------------------------------------------------------------------- */
 
 void FixRigidSmall::setup_bodies_dynamic()
@@ -2426,7 +2426,7 @@ void FixRigidSmall::setup_bodies_dynamic()
 
 /* ----------------------------------------------------------------------
    read per rigid body info from user-provided file
-   which = 0 to read everthing except 6 moments of inertia
+   which = 0 to read everything except 6 moments of inertia
    which = 1 to read just 6 moments of inertia
    flag inbody = 0 for local bodies this proc initializes from file
    nlines = # of lines of rigid body info, 0 is OK
diff --git a/src/RIGID/fix_shake.cpp b/src/RIGID/fix_shake.cpp
index 054985ba72..b1ce975005 100644
--- a/src/RIGID/fix_shake.cpp
+++ b/src/RIGID/fix_shake.cpp
@@ -3059,7 +3059,7 @@ void FixShake::correct_velocities() {}
 void FixShake::correct_coordinates(int vflag) {
 
   // save current forces and velocities so that you
-  // initialise them to zero such that FixShake::unconstrained_coordinate_update has no effect
+  // initialize them to zero such that FixShake::unconstrained_coordinate_update has no effect
 
   for (int j=0; j<nlocal; j++) {
     for (int k=0; k<3; k++) {
@@ -3082,7 +3082,7 @@ void FixShake::correct_coordinates(int vflag) {
   dtfsq   = 0.5 * update->dt * update->dt * force->ftm2v;
   FixShake::post_force(vflag);
 
-  // integrate coordiantes: x' = xnp1 + dt^2/2m_i * f, where f is the constraining force
+  // integrate coordinates: x' = xnp1 + dt^2/2m_i * f, where f is the constraining force
   // NOTE: After this command, the coordinates geometry of the molecules will be correct!
 
   double dtfmsq;
diff --git a/src/SNAP/pair_snap.cpp b/src/SNAP/pair_snap.cpp
index 6f7cf54659..8c252cca1d 100644
--- a/src/SNAP/pair_snap.cpp
+++ b/src/SNAP/pair_snap.cpp
@@ -635,6 +635,7 @@ void PairSNAP::read_files(char *coefffilename, char *paramfilename)
   switchflag = 1;
   bzeroflag = 1;
   quadraticflag = 0;
+  chunksize = 2000;
 
   // open SNAP parameter file on proc 0
 
@@ -698,6 +699,8 @@ void PairSNAP::read_files(char *coefffilename, char *paramfilename)
       bzeroflag = atoi(keyval);
     else if (strcmp(keywd,"quadraticflag") == 0)
       quadraticflag = atoi(keyval);
+    else if (strcmp(keywd,"chunksize") == 0)
+      chunksize = atoi(keyval);
     else
       error->all(FLERR,"Incorrect SNAP parameter file");
   }
diff --git a/src/SNAP/pair_snap.h b/src/SNAP/pair_snap.h
index c64eaa5d4e..cec2d85df1 100644
--- a/src/SNAP/pair_snap.h
+++ b/src/SNAP/pair_snap.h
@@ -59,6 +59,7 @@ protected:
   double** bispectrum;          // bispectrum components for all atoms in list
   int *map;                     // mapping from atom types to elements
   int twojmax, switchflag, bzeroflag;
+  int chunksize;
   double rfac0, rmin0, wj1, wj2;
   int rcutfacflag, twojmaxflag; // flags for required parameters
   int beta_max;                 // length of beta
diff --git a/src/SPIN/README b/src/SPIN/README
index ad296c69b7..6dbad91d8d 100644
--- a/src/SPIN/README
+++ b/src/SPIN/README
@@ -9,7 +9,7 @@ atom in the system
 * implementing magnetic pair interactions and magnetic forces
 * thermostating and applying a transverse damping to the magnetic spins
 * performing geodesic NEB calculations
-* computing and outputing magnetic quantities
+* computing and outputting magnetic quantities
 * minimizing the energy or total torque of a magnetic system
 
 The different options provided by this package are explained in the 
diff --git a/src/SPIN/min_spin.cpp b/src/SPIN/min_spin.cpp
index e39eb18744..f6a6b90891 100644
--- a/src/SPIN/min_spin.cpp
+++ b/src/SPIN/min_spin.cpp
@@ -127,7 +127,7 @@ int MinSpin::iterate(int maxiter)
     ntimestep = ++update->ntimestep;
     niter++;
 
-    // optimize timestep accross processes / replicas
+    // optimize timestep across processes / replicas
     // need a force calculation for timestep optimization
 
     if (iter == 0) energy_force(0);
diff --git a/src/SPIN/min_spin_cg.cpp b/src/SPIN/min_spin_cg.cpp
index 8815ad89db..de1ef39f66 100644
--- a/src/SPIN/min_spin_cg.cpp
+++ b/src/SPIN/min_spin_cg.cpp
@@ -205,7 +205,7 @@ int MinSpinCG::iterate(int maxiter)
     ntimestep = ++update->ntimestep;
     niter++;
 
-    // optimize timestep accross processes / replicas
+    // optimize timestep across processes / replicas
     // need a force calculation for timestep optimization
 
     if (use_line_search) {
diff --git a/src/SPIN/min_spin_lbfgs.cpp b/src/SPIN/min_spin_lbfgs.cpp
index 7f6d7692cd..df12782528 100644
--- a/src/SPIN/min_spin_lbfgs.cpp
+++ b/src/SPIN/min_spin_lbfgs.cpp
@@ -217,7 +217,7 @@ int MinSpinLBFGS::iterate(int maxiter)
     ntimestep = ++update->ntimestep;
     niter++;
 
-    // optimize timestep accross processes / replicas
+    // optimize timestep across processes / replicas
     // need a force calculation for timestep optimization
 
     if (use_line_search) {
diff --git a/src/SRD/fix_srd.cpp b/src/SRD/fix_srd.cpp
index d5eec91f50..c57975ad4c 100644
--- a/src/SRD/fix_srd.cpp
+++ b/src/SRD/fix_srd.cpp
@@ -454,7 +454,7 @@ void FixSRD::setup(int /*vflag*/)
     setup_search_stencil();
   } else nbins2 = 0;
 
-  // perform first bining of SRD and big particles and walls
+  // perform first binning of SRD and big particles and walls
   // set reneighflag to turn off SRD rotation
   // don't do SRD rotation in setup, only during timestepping
 
@@ -1067,7 +1067,7 @@ void FixSRD::vbin_comm(int ishift)
 
   // send/recv bins in both directions in each dimension
   // don't send if nsend = 0
-  //   due to static bins aliging with proc boundary
+  //   due to static bins aligning with proc boundary
   //   due to dynamic bins across non-periodic global boundary
   // copy to self if sendproc = me
   // MPI send to another proc if sendproc != me
@@ -1169,7 +1169,7 @@ void FixSRD::xbin_comm(int ishift, int nval)
 
   // send/recv bins in both directions in each dimension
   // don't send if nsend = 0
-  //   due to static bins aliging with proc boundary
+  //   due to static bins aligning with proc boundary
   //   due to dynamic bins across non-periodic global boundary
   // copy to self if sendproc = me
   // MPI send to another proc if sendproc != me
diff --git a/src/USER-ATC/fix_atc.cpp b/src/USER-ATC/fix_atc.cpp
index 0e9cd02ad6..2165132856 100644
--- a/src/USER-ATC/fix_atc.cpp
+++ b/src/USER-ATC/fix_atc.cpp
@@ -123,7 +123,7 @@ FixATC::FixATC(LAMMPS *lmp, int narg, char **arg) : Fix(lmp, narg, arg),
      # be used as a localization function \n
      fix         AtC kernel quartic_sphere 10.0 \n \n
      # create a uniform 1 x 1 x 1 mesh that covers region contain the group \n
-     # with periodicity this effectively creats a system average \n
+     # with periodicity this effectively creates a system average \n
      fix_modify  AtC mesh create 1 1 1 box p p p \n\n
      # change from default lagrangian map to eulerian \n
      #   refreshed every 100 steps \n
diff --git a/src/USER-CGDNA/bond_oxdna_fene.cpp b/src/USER-CGDNA/bond_oxdna_fene.cpp
index 1cb332df8f..834b53a5c7 100644
--- a/src/USER-CGDNA/bond_oxdna_fene.cpp
+++ b/src/USER-CGDNA/bond_oxdna_fene.cpp
@@ -221,7 +221,7 @@ void BondOxdnaFene::compute(int eflag, int vflag)
               TAGINT_FORMAT " " TAGINT_FORMAT " %g",
               update->ntimestep,atom->tag[a],atom->tag[b],r);
       error->warning(FLERR,str,0);
-      if (rlogarg <= -3.0) error->one(FLERR,"Bad FENE bond");
+      if (rlogarg <= -8.0) error->one(FLERR,"Bad FENE bond");
     }
 
     fbond = -k[type]*rr0/rlogarg/Deltasq/r;
@@ -421,7 +421,7 @@ double BondOxdnaFene::single(int type, double rsq, int /*i*/, int /*j*/,
     sprintf(str,"FENE bond too long: " BIGINT_FORMAT " %g",
             update->ntimestep,sqrt(rsq));
     error->warning(FLERR,str,0);
-    if (rlogarg <= -3.0) error->one(FLERR,"Bad FENE bond");
+    if (rlogarg <= -8.0) error->one(FLERR,"Bad FENE bond");
   }
 
   double eng = -0.5 * k[type]*log(rlogarg);
diff --git a/src/USER-COLVARS/README b/src/USER-COLVARS/README
index 9090a07ead..6627bc9ec4 100644
--- a/src/USER-COLVARS/README
+++ b/src/USER-COLVARS/README
@@ -27,7 +27,7 @@ and in the reference article:
 Using collective variables to drive molecular dynamics simulations,
 G. Fiorin, M. L. Klein, and J. Henin,
 Molecular Physics 111, 3345 (2013)
-http://dx.doi.org/10.1080/00268976.2013.813594
+https://doi.org/10.1080/00268976.2013.813594
 
 A reference manual for the package and library is included with the
 LAMMPS doc pages:
diff --git a/src/USER-COLVARS/colvarproxy_lammps.cpp b/src/USER-COLVARS/colvarproxy_lammps.cpp
index 2c43a3fb26..dabb0bf923 100644
--- a/src/USER-COLVARS/colvarproxy_lammps.cpp
+++ b/src/USER-COLVARS/colvarproxy_lammps.cpp
@@ -2,7 +2,7 @@
 
 // This file is part of the Collective Variables module (Colvars).
 // The original version of Colvars and its updates are located at:
-// https://github.com/colvars/colvars
+// https://github.com/Colvars/colvars
 // Please update all Colvars source files before making any changes.
 // If you wish to distribute your changes, please submit them to the
 // Colvars repository at GitHub.
@@ -110,7 +110,7 @@ colvarproxy_lammps::colvarproxy_lammps(LAMMPS_NS::LAMMPS *lmp,
     restart_output_prefix_str.erase(restart_output_prefix_str.rfind(".*"),2);
 
   // initialize multi-replica support, if available
-  if (replica_enabled()) {
+  if (replica_enabled() == COLVARS_OK) {
     MPI_Comm_rank(inter_comm, &inter_me);
     MPI_Comm_size(inter_comm, &inter_num);
   }
@@ -131,6 +131,11 @@ void colvarproxy_lammps::init(const char *conf_file)
            cvm::to_str(COLVARPROXY_VERSION)+".\n");
 
   my_angstrom  = _lmp->force->angstrom;
+  // Front-end unit is the same as back-end
+  angstrom_value = my_angstrom;
+
+  // my_kcal_mol  = _lmp->force->qe2f / 23.060549;
+  // force->qe2f is 1eV expressed in LAMMPS' energy unit (1 if unit is eV, 23 if kcal/mol)
   my_boltzmann = _lmp->force->boltz;
   my_timestep  = _lmp->update->dt * _lmp->force->femtosecond;
 
@@ -155,14 +160,20 @@ void colvarproxy_lammps::init(const char *conf_file)
   }
 }
 
-void colvarproxy_lammps::add_config_file(const char *conf_file)
+int colvarproxy_lammps::add_config_file(const char *conf_file)
 {
-  colvars->read_config_file(conf_file);
+  return colvars->read_config_file(conf_file);
 }
 
-void colvarproxy_lammps::add_config_string(const std::string &conf)
+int colvarproxy_lammps::add_config_string(const std::string &conf)
 {
-  colvars->read_config_string(conf);
+  return colvars->read_config_string(conf);
+}
+
+int colvarproxy_lammps::read_state_file(char const *state_filename)
+{
+  input_prefix() = std::string(state_filename);
+  return colvars->setup_input();
 }
 
 colvarproxy_lammps::~colvarproxy_lammps()
@@ -325,6 +336,17 @@ void colvarproxy_lammps::fatal_error(std::string const &message)
 }
 
 
+int colvarproxy_lammps::set_unit_system(std::string const &units_in, bool /*check_only*/)
+{
+  std::string lmp_units = _lmp->update->unit_style;
+  if (units_in != lmp_units) {
+    cvm::error("Error: Specified unit system for Colvars \"" + units_in + "\" is incompatible with LAMMPS internal units (" + lmp_units + ").\n");
+    return COLVARS_ERROR;
+  }
+  return COLVARS_OK;
+}
+
+
 int colvarproxy_lammps::backup_file(char const *filename)
 {
   if (std::string(filename).rfind(std::string(".colvars.state"))
@@ -338,6 +360,24 @@ int colvarproxy_lammps::backup_file(char const *filename)
 
 // multi-replica support
 
+int colvarproxy_lammps::replica_enabled()
+{
+  return (inter_comm != MPI_COMM_NULL) ? COLVARS_OK : COLVARS_NOT_IMPLEMENTED;
+}
+
+
+int colvarproxy_lammps::replica_index()
+{
+  return inter_me;
+}
+
+
+int colvarproxy_lammps::num_replicas()
+{
+  return inter_num;
+}
+
+
 void colvarproxy_lammps::replica_comm_barrier()
 {
   MPI_Barrier(inter_comm);
diff --git a/src/USER-COLVARS/colvarproxy_lammps.h b/src/USER-COLVARS/colvarproxy_lammps.h
index 8ed03309a3..95e7d4fb32 100644
--- a/src/USER-COLVARS/colvarproxy_lammps.h
+++ b/src/USER-COLVARS/colvarproxy_lammps.h
@@ -2,7 +2,7 @@
 
 // This file is part of the Collective Variables module (Colvars).
 // The original version of Colvars and its updates are located at:
-// https://github.com/colvars/colvars
+// https://github.com/Colvars/colvars
 // Please update all Colvars source files before making any changes.
 // If you wish to distribute your changes, please submit them to the
 // Colvars repository at GitHub.
@@ -48,13 +48,6 @@ class colvarproxy_lammps : public colvarproxy {
   bool total_force_requested;
   bool do_exit;
 
-  // std::vector<int>          colvars_atoms;
-  // std::vector<size_t>       colvars_atoms_ncopies;
-  // std::vector<struct commdata> positions;
-  // std::vector<struct commdata> total_forces;
-  // std::vector<struct commdata> applied_forces;
-  // std::vector<struct commdata> previous_applied_forces;
-
   std::vector<int>          atoms_types;
 
   MPI_Comm inter_comm;     // MPI comm with 1 root proc from each world
@@ -93,15 +86,19 @@ class colvarproxy_lammps : public colvarproxy {
   void write_output_files();
 
   // read additional config from file
-  void add_config_file(char const *config_filename);
+  int add_config_file(char const *config_filename);
 
   // read additional config from string
-  void add_config_string(const std::string &config);
+  int add_config_string(const std::string &config);
 
-  // implementation of pure methods from base class
- public:
+  // load a state file
+  int read_state_file(char const *state_filename);
+
+  // Request to set the units used internally by Colvars
+  int set_unit_system(std::string const &units_in, bool check_only);
+
+  inline cvm::real backend_angstrom_value() { return my_angstrom; };
 
-  inline cvm::real unit_angstrom() { return my_angstrom; };
   inline cvm::real boltzmann() { return my_boltzmann; };
   inline cvm::real temperature() { return t_target; };
   inline cvm::real dt() { return my_timestep; }; // return _lmp->update->dt * _lmp->force->femtosecond; };
@@ -127,26 +124,12 @@ class colvarproxy_lammps : public colvarproxy {
 
   inline std::vector<int> *modify_atom_types() { return &atoms_types; }
 
-  // implementation of optional methods from base class
- public:
+  virtual int replica_enabled();
+  virtual int replica_index();
+  virtual int num_replicas();
 
-  // Multi-replica support
-  // Indicate if multi-replica support is available and active
-  virtual bool replica_enabled() { return (inter_comm != MPI_COMM_NULL); }
-
-  // Index of this replica
-  virtual int replica_index() { return inter_me; }
-
-  // Total number of replica
-  virtual int replica_num() { return inter_num; }
-
-  // Synchronize replica
   virtual void replica_comm_barrier();
-
-  // Receive data from other replica
   virtual int replica_comm_recv(char* msg_data, int buf_len, int src_rep);
-
-  // Send data to other replica
   virtual int replica_comm_send(char* msg_data, int msg_len, int dest_rep);
 };
 
diff --git a/src/USER-COLVARS/colvarproxy_lammps_version.h b/src/USER-COLVARS/colvarproxy_lammps_version.h
index d976f40510..7f52fa5e01 100644
--- a/src/USER-COLVARS/colvarproxy_lammps_version.h
+++ b/src/USER-COLVARS/colvarproxy_lammps_version.h
@@ -1,10 +1,3 @@
 #ifndef COLVARPROXY_VERSION
-#define COLVARPROXY_VERSION "2019-08-01"
-// This file is part of the Collective Variables module (Colvars).
-// The original version of Colvars and its updates are located at:
-// https://github.com/colvars/colvars
-// Please update all Colvars source files before making any changes.
-// If you wish to distribute your changes, please submit them to the
-// Colvars repository at GitHub.
-
+#define COLVARPROXY_VERSION "2019-12-04"
 #endif
diff --git a/src/USER-COLVARS/fix_colvars.cpp b/src/USER-COLVARS/fix_colvars.cpp
index 4a57e59fbd..7ce2a93680 100644
--- a/src/USER-COLVARS/fix_colvars.cpp
+++ b/src/USER-COLVARS/fix_colvars.cpp
@@ -2,7 +2,7 @@
 
 // This file is part of the Collective Variables module (Colvars).
 // The original version of Colvars and its updates are located at:
-// https://github.com/colvars/colvars
+// https://github.com/Colvars/colvars
 // Please update all Colvars source files before making any changes.
 // If you wish to distribute your changes, please submit them to the
 // Colvars repository at GitHub.
@@ -502,7 +502,7 @@ int FixColvars::modify_param(int narg, char **arg)
     if (me == 0) {
       if (! proxy)
         error->one(FLERR,"Cannot use fix_modify before initialization");
-      proxy->add_config_file(arg[1]);
+      return proxy->add_config_file(arg[1]) == COLVARS_OK ? 0 : 2;
     }
     return 2;
   } else if (strcmp(arg[0],"config") == 0) {
@@ -510,8 +510,16 @@ int FixColvars::modify_param(int narg, char **arg)
     if (me == 0) {
       if (! proxy)
         error->one(FLERR,"Cannot use fix_modify before initialization");
-      std::string conf(arg[1]);
-      proxy->add_config_string(conf);
+      std::string const conf(arg[1]);
+      return proxy->add_config_string(conf) == COLVARS_OK ? 0 : 2;
+    }
+    return 2;
+  } else if (strcmp(arg[0],"load") == 0) {
+    if (narg < 2) error->all(FLERR,"Illegal fix_modify command");
+    if (me == 0) {
+      if (! proxy)
+        error->one(FLERR,"Cannot use fix_modify before initialization");
+      return proxy->read_state_file(arg[1]) == COLVARS_OK ? 0 : 2;
     }
     return 2;
   }
diff --git a/src/USER-COLVARS/fix_colvars.h b/src/USER-COLVARS/fix_colvars.h
index 985457e746..2486446f35 100644
--- a/src/USER-COLVARS/fix_colvars.h
+++ b/src/USER-COLVARS/fix_colvars.h
@@ -2,7 +2,7 @@
 
 // This file is part of the Collective Variables module (Colvars).
 // The original version of Colvars and its updates are located at:
-// https://github.com/colvars/colvars
+// https://github.com/Colvars/colvars
 // Please update all Colvars source files before making any changes.
 // If you wish to distribute your changes, please submit them to the
 // Colvars repository at GitHub.
diff --git a/src/USER-DIFFRACTION/README b/src/USER-DIFFRACTION/README
index 5488cd3416..00203aeae2 100644
--- a/src/USER-DIFFRACTION/README
+++ b/src/USER-DIFFRACTION/README
@@ -1,4 +1,4 @@
-This package contains the commands neeed to calculate x-ray and
+This package contains the commands needed to calculate x-ray and
 electron diffraction intensities based on kinematic diffraction 
 theory. Detailed discription of the computation can be found in the
 following works:
diff --git a/src/USER-DIFFRACTION/compute_saed.cpp b/src/USER-DIFFRACTION/compute_saed.cpp
index 3ae25f223c..7b5b2f4f5b 100644
--- a/src/USER-DIFFRACTION/compute_saed.cpp
+++ b/src/USER-DIFFRACTION/compute_saed.cpp
@@ -75,7 +75,7 @@ ComputeSAED::ComputeSAED(LAMMPS *lmp, int narg, char **arg) :
   if (lambda < 0)
     error->all(FLERR,"Compute SAED: Wavelength must be greater than zero");
 
-  // Define atom types for atomic scattering factor coefficents
+  // Define atom types for atomic scattering factor coefficients
   int iarg = 4;
   ztype = new int[ntypes];
   for (int i = 0; i < ntypes; i++){
@@ -394,7 +394,7 @@ void ComputeSAED::compute_vector()
 */
 
 
- // determining paramater set to use based on maximum S = sin(theta)/lambda
+ // determining parameter set to use based on maximum S = sin(theta)/lambda
   double Smax = Kmax / 2;
 
   int offset = 0;                 // offset the ASFSAED matrix for appropriate value
@@ -449,8 +449,8 @@ void ComputeSAED::compute_vector()
       Fatom1 = 0.0;
       Fatom2 = 0.0;
 
-      // Calculate the atomic structre factor by type
-      // determining paramater set to use based on S = sin(theta)/lambda <> 2
+      // Calculate the atomic structure factor by type
+      // determining parameter set to use based on S = sin(theta)/lambda <> 2
       for (int ii = 0; ii < ntypes; ii++){
         f[ii] = 0;
         for (int C = 0; C < 5; C++){
diff --git a/src/USER-DIFFRACTION/fix_saed_vtk.cpp b/src/USER-DIFFRACTION/fix_saed_vtk.cpp
index c3a72e494b..b6c00c2374 100644
--- a/src/USER-DIFFRACTION/fix_saed_vtk.cpp
+++ b/src/USER-DIFFRACTION/fix_saed_vtk.cpp
@@ -98,7 +98,7 @@ FixSAEDVTK::FixSAEDVTK(LAMMPS *lmp, int narg, char **arg) :
       if (strcmp(compute_saed->style,"saed") != 0)
         error->all(FLERR,"Fix saed/vtk has invalid compute assigned");
 
-      // Gather varialbes from specified compute_saed
+      // Gather variables from specified compute_saed
       double *saed_var = compute_saed->saed_var;
       lambda   = saed_var[0];
       Kmax     = saed_var[1];
diff --git a/src/USER-DPD/fix_rx.h b/src/USER-DPD/fix_rx.h
index ca87fc51fd..e2f9f5b88b 100644
--- a/src/USER-DPD/fix_rx.h
+++ b/src/USER-DPD/fix_rx.h
@@ -124,7 +124,7 @@ class FixRX : public Fix {
 
   // ODE Diagnostics
   //int nSteps; //!< # of accepted steps taken over all atoms.
-  //int nIters; //!< # of attemped steps for all atoms.
+  //int nIters; //!< # of attempted steps for all atoms.
   //int nFuncs; //!< # of RHS evaluations for all atoms.
   //int nFails; //!< # of ODE systems that failed (for some reason).
 
diff --git a/src/USER-DPD/npair_half_bin_newton_ssa.cpp b/src/USER-DPD/npair_half_bin_newton_ssa.cpp
index 2139173d47..4fb5714d11 100644
--- a/src/USER-DPD/npair_half_bin_newton_ssa.cpp
+++ b/src/USER-DPD/npair_half_bin_newton_ssa.cpp
@@ -64,7 +64,7 @@ NPairHalfBinNewtonSSA::~NPairHalfBinNewtonSSA()
 
 /* ----------------------------------------------------------------------
    binned neighbor list construction with full Newton's 3rd law
-   for use by Shardlow Spliting Algorithm
+   for use by Shardlow Splitting Algorithm
    each owned atom i checks its own bin and other bins in Newton stencil
    every pair stored exactly once by some processor
 ------------------------------------------------------------------------- */
diff --git a/src/USER-DRUDE/pair_lj_cut_thole_long.cpp b/src/USER-DRUDE/pair_lj_cut_thole_long.cpp
index 98c2ff196a..fa4f761663 100644
--- a/src/USER-DRUDE/pair_lj_cut_thole_long.cpp
+++ b/src/USER-DRUDE/pair_lj_cut_thole_long.cpp
@@ -45,11 +45,16 @@ using namespace MathConst;
 #define B4       -5.80844129e-3
 #define B5        1.14652755e-1
 
+#define EPSILON 1.0e-20
+#define EPS_EWALD 1.0e-6
+#define EPS_EWALD_SQR 1.0e-12
+
 /* ---------------------------------------------------------------------- */
 
 PairLJCutTholeLong::PairLJCutTholeLong(LAMMPS *lmp) : Pair(lmp)
 {
   ewaldflag = pppmflag = 1;
+  single_enable = 0;
   writedata = 1;
   ftable = NULL;
   qdist = 0.0;
@@ -149,21 +154,23 @@ void PairLJCutTholeLong::compute(int eflag, int vflag)
       jtype = type[j];
 
       if (rsq < cutsq[itype][jtype]) {
-        r2inv = 1.0/rsq;
+         rsq += EPSILON; // Add Epsilon for case: r = 0; DC-DP 1-1 interaction must be removed by special bond;
+         r2inv = 1.0/rsq;
 
         if (rsq < cut_coulsq) {
           qj = q[j];
           r = sqrt(rsq);
 
           if (!ncoultablebits || rsq <= tabinnersq) {
-            grij = g_ewald * r;
+            grij = g_ewald * (r + EPS_EWALD);
             expm2 = exp(-grij*grij);
             t = 1.0 / (1.0 + EWALD_P*grij);
             u = 1. - t;
             erfc = t * (1.+u*(B0+u*(B1+u*(B2+u*(B3+u*(B4+u*B5)))))) * expm2;
-            prefactor = qqrd2e * qi*qj/r;
+            prefactor = qqrd2e * qi*qj/(r + EPS_EWALD);
             forcecoul = prefactor * (erfc + EWALD_F*grij*expm2);
             if (factor_coul < 1.0) forcecoul -= (1.0-factor_coul)*prefactor;
+            r2inv = 1.0/(rsq + EPS_EWALD_SQR);
           } else {
             union_int_float_t rsq_lookup;
             rsq_lookup.f = rsq;
@@ -579,100 +586,8 @@ void PairLJCutTholeLong::write_data_all(FILE *fp)
 
 /* ---------------------------------------------------------------------- */
 
-double PairLJCutTholeLong::single(int i, int j, int itype, int jtype,
-                                 double rsq, double factor_coul,
-                                 double factor_lj, double &fforce)
-{
-  double r2inv,r6inv,r,grij,expm2,t,erfc,prefactor,u;
-  double fraction,table,forcecoul,forcelj,phicoul,philj;
-  int itable;
-  double factor_f,factor_e;
-  double dqi,dqj,dcoul,asr,exp_asr;
-  int di, dj, di_closest;
-
-  int *drudetype = fix_drude->drudetype;
-  tagint *drudeid = fix_drude->drudeid;
-  int *type = atom->type;
-
-  r2inv = 1.0/rsq;
-  if (rsq < cut_coulsq) {
-    r = sqrt(rsq);
-    if (!ncoultablebits || rsq <= tabinnersq) {
-      grij = g_ewald * r;
-      expm2 = exp(-grij*grij);
-      t = 1.0 / (1.0 + EWALD_P*grij);
-      u = 1. - t;
-      erfc = t * (1.+u*(B0+u*(B1+u*(B2+u*(B3+u*(B4+u*B5)))))) * expm2;
-      prefactor = force->qqrd2e * atom->q[i]*atom->q[j]/r;
-      forcecoul = prefactor * (erfc + EWALD_F*grij*expm2);
-      if (factor_coul < 1.0) forcecoul -= (1.0-factor_coul)*prefactor;
-    } else {
-      union_int_float_t rsq_lookup_single;
-      rsq_lookup_single.f = rsq;
-      itable = rsq_lookup_single.i & ncoulmask;
-      itable >>= ncoulshiftbits;
-      fraction = (rsq_lookup_single.f - rtable[itable]) * drtable[itable];
-      table = ftable[itable] + fraction*dftable[itable];
-      forcecoul = atom->q[i]*atom->q[j] * table;
-      if (factor_coul < 1.0) {
-        table = ctable[itable] + fraction*dctable[itable];
-        prefactor = atom->q[i]*atom->q[j] * table;
-        forcecoul -= (1.0-factor_coul)*prefactor;
-      }
-    }
-    if (drudetype[type[i]] != NOPOL_TYPE && drudetype[type[j]] != NOPOL_TYPE) {
-      di = atom->map(drudeid[i]);
-      di_closest = domain->closest_image(i, di);
-      if (j != di_closest){
-        if (drudetype[i] == CORE_TYPE) dqi = -atom->q[di];
-        else if (drudetype[i] == DRUDE_TYPE) dqi = atom->q[i];
-        else dqi = 0.0;
-        if (drudetype[j] == CORE_TYPE) {
-          dj = atom->map(drudeid[j]);
-          dqj = -atom->q[dj];
-        } else if (drudetype[j] == DRUDE_TYPE) dqj = atom->q[j];
-        else dqj = 0.0;
-        asr = ascreen[itype][jtype] * r;
-        exp_asr = exp(-asr);
-        dcoul = force->qqrd2e * dqi * dqj / r;
-        factor_f = 0.5*(2. + (exp_asr * (-2. - asr * (2. + asr))))
-            - factor_coul;
-        forcecoul += factor_f * dcoul;
-        factor_e = 0.5*(2. - (exp_asr * (2. + asr))) - factor_coul;
-      }
-    }
-  } else forcecoul = 0.0;
-
-  if (rsq < cut_ljsq[itype][jtype]) {
-    r6inv = r2inv*r2inv*r2inv;
-    forcelj = r6inv * (lj1[itype][jtype]*r6inv - lj2[itype][jtype]);
-  } else forcelj = 0.0;
-
-  fforce = (forcecoul + factor_lj*forcelj) * r2inv;
-
-  double eng = 0.0;
-  if (rsq < cut_coulsq) {
-    if (!ncoultablebits || rsq <= tabinnersq)
-      phicoul = prefactor*erfc;
-    else {
-      table = etable[itable] + fraction*detable[itable];
-      phicoul = atom->q[i]*atom->q[j] * table;
-    }
-    if (factor_coul < 1.0) phicoul -= (1.0-factor_coul)*prefactor;
-    if (drudetype[type[i]] != NOPOL_TYPE && drudetype[type[j]] != NOPOL_TYPE &&
-        di_closest != j)
-      phicoul += factor_e * dcoul;
-    eng += phicoul;
-  }
-
-  if (rsq < cut_ljsq[itype][jtype]) {
-    philj = r6inv*(lj3[itype][jtype]*r6inv-lj4[itype][jtype]) -
-      offset[itype][jtype];
-    eng += factor_lj*philj;
-  }
-
-  return eng;
-}
+// No point in having single() since it  has no information about topology or Drude particles.
+// Charges qi and qj are defined by the user (or 1.0 by default)
 
 /* ---------------------------------------------------------------------- */
 
diff --git a/src/USER-DRUDE/pair_lj_cut_thole_long.h b/src/USER-DRUDE/pair_lj_cut_thole_long.h
index 4c3a883064..8dbfe0240c 100644
--- a/src/USER-DRUDE/pair_lj_cut_thole_long.h
+++ b/src/USER-DRUDE/pair_lj_cut_thole_long.h
@@ -40,8 +40,6 @@ class PairLJCutTholeLong : public Pair {
   virtual void read_restart_settings(FILE *);
   void write_data(FILE *);
   void write_data_all(FILE *);
-  virtual double single(int, int, int, int, double, double, double, double &);
-
   virtual void *extract(const char *, int &);
 
  protected:
diff --git a/src/USER-DRUDE/pair_thole.cpp b/src/USER-DRUDE/pair_thole.cpp
index 6eadfa8bf6..4dd6cb12c0 100644
--- a/src/USER-DRUDE/pair_thole.cpp
+++ b/src/USER-DRUDE/pair_thole.cpp
@@ -367,30 +367,12 @@ double PairThole::single(int i, int j, int itype, int jtype,
 {
   double r2inv,rinv,r,phicoul;
   double qi,qj,factor_f,factor_e,dcoul,asr,exp_asr;
-  int di, dj;
 
-  int *drudetype = fix_drude->drudetype;
-  tagint *drudeid = fix_drude->drudeid;
-  int *type = atom->type;
+  // single() has no information about topology or Drude particles.
+  // Charges qi and qj are defined by the user (or 1.0 by default)
 
-  // only on core-drude pair, but not on the same pair
-  if (drudetype[type[i]] == NOPOL_TYPE || drudetype[type[j]] == NOPOL_TYPE ||
-      j == i)
-    return 0.0;
-
-  // get dq of the core via the drude charge
-  if (drudetype[type[i]] == DRUDE_TYPE)
-    qi = atom->q[i];
-  else {
-    di = domain->closest_image(i, atom->map(drudeid[i]));
-    qi = -atom->q[di];
-  }
-  if (drudetype[type[j]] == DRUDE_TYPE)
-    qj = atom->q[j];
-  else {
-    dj = domain->closest_image(j, atom->map(drudeid[j]));
-    qj = -atom->q[dj];
-  }
+  qi = atom->q[i];
+  qj = atom->q[j];
 
   r2inv = 1.0/rsq;
   fforce = phicoul = 0.0;
diff --git a/src/USER-INTEL/README b/src/USER-INTEL/README
index 786033ca85..650e2c3a2d 100644
--- a/src/USER-INTEL/README
+++ b/src/USER-INTEL/README
@@ -36,7 +36,7 @@ be added or changed in the Makefile depending on the version:
 
 2017 update 2         - No changes needed
 2017 updates 3 or 4   - Use -xCOMMON-AVX512 and not -xHost or -xCORE-AVX512
-2018 inital release   - Use -xCOMMON-AVX512 and not -xHost or -xCORE-AVX512
+2018 initial release  - Use -xCOMMON-AVX512 and not -xHost or -xCORE-AVX512
 2018u1 or newer       - Use -xHost or -xCORE-AVX512 and -qopt-zmm-usage=high
 
 -----------------------------------------------------------------------------
diff --git a/src/USER-INTEL/pair_airebo_intel.cpp b/src/USER-INTEL/pair_airebo_intel.cpp
index eedf45d75e..e6e8503bb0 100644
--- a/src/USER-INTEL/pair_airebo_intel.cpp
+++ b/src/USER-INTEL/pair_airebo_intel.cpp
@@ -4480,7 +4480,7 @@ exceed_limits:
  * Calculate the lennard-jones interaction.
  * Uses the above hash-map, and outlines the calculation if the bondorder is
  *  needed.
- * Agressively compresses to get the most values calculated.
+ * Aggressively compresses to get the most values calculated.
  */
 template<int MORSEFLAG>
 static void aut_lennard_jones(KernelArgsAIREBOT<flt_t,acc_t> * ka) {
diff --git a/src/USER-INTEL/pair_lj_charmm_coul_charmm_intel.cpp b/src/USER-INTEL/pair_lj_charmm_coul_charmm_intel.cpp
index f3f81651fc..ff8a9869b7 100644
--- a/src/USER-INTEL/pair_lj_charmm_coul_charmm_intel.cpp
+++ b/src/USER-INTEL/pair_lj_charmm_coul_charmm_intel.cpp
@@ -487,7 +487,7 @@ void PairLJCharmmCoulCharmmIntel::pack_force_const(ForceConst<flt_t> &fc,
   // Repeat cutsq calculation because done after call to init_style
   if (cut_lj > cut_coul)
     error->all(FLERR,
-         "Intel varient of lj/charmm/coul/long expects lj cutoff<=coulombic");
+         "Intel variant of lj/charmm/coul/long expects lj cutoff<=coulombic");
   for (int i = 1; i <= atom->ntypes; i++) {
     for (int j = i; j <= atom->ntypes; j++) {
       double cut;
diff --git a/src/USER-INTEL/pair_lj_charmm_coul_charmm_intel.h b/src/USER-INTEL/pair_lj_charmm_coul_charmm_intel.h
index 64d6077477..a48a84b5ce 100644
--- a/src/USER-INTEL/pair_lj_charmm_coul_charmm_intel.h
+++ b/src/USER-INTEL/pair_lj_charmm_coul_charmm_intel.h
@@ -92,7 +92,7 @@ E: The 'package intel' command is required for /intel styles
 
 Self-explanatory.
 
-E: Intel varient of lj/charmm/coul/charmm expects lj cutoff<=coulombic
+E: Intel variant of lj/charmm/coul/charmm expects lj cutoff<=coulombic
 
 The intel accelerated version of the CHARMM style requires that the
 Lennard-Jones cutoff is not greater than the coulombic cutoff.
diff --git a/src/USER-INTEL/pair_lj_charmm_coul_long_intel.cpp b/src/USER-INTEL/pair_lj_charmm_coul_long_intel.cpp
index b4697ad122..5a4069e199 100644
--- a/src/USER-INTEL/pair_lj_charmm_coul_long_intel.cpp
+++ b/src/USER-INTEL/pair_lj_charmm_coul_long_intel.cpp
@@ -557,7 +557,7 @@ void PairLJCharmmCoulLongIntel::pack_force_const(ForceConst<flt_t> &fc,
   // Repeat cutsq calculation because done after call to init_style
   if (cut_lj > cut_coul)
     error->all(FLERR,
-         "Intel varient of lj/charmm/coul/long expects lj cutoff<=coulombic");
+         "Intel variant of lj/charmm/coul/long expects lj cutoff<=coulombic");
   for (int i = 1; i <= atom->ntypes; i++) {
     for (int j = i; j <= atom->ntypes; j++) {
       double cut;
diff --git a/src/USER-INTEL/pair_lj_charmm_coul_long_intel.h b/src/USER-INTEL/pair_lj_charmm_coul_long_intel.h
index 0066745078..31b2182cb5 100644
--- a/src/USER-INTEL/pair_lj_charmm_coul_long_intel.h
+++ b/src/USER-INTEL/pair_lj_charmm_coul_long_intel.h
@@ -96,7 +96,7 @@ E: The 'package intel' command is required for /intel styles
 
 Self-explanatory.
 
-E: Intel varient of lj/charmm/coul/long expects lj cutoff<=coulombic
+E: Intel variant of lj/charmm/coul/long expects lj cutoff<=coulombic
 
 The intel accelerated version of the CHARMM style requires that the
 Lennard-Jones cutoff is not greater than the coulombic cutoff.
diff --git a/src/USER-INTEL/pair_tersoff_intel.cpp b/src/USER-INTEL/pair_tersoff_intel.cpp
index 76d06b02dd..8784029320 100644
--- a/src/USER-INTEL/pair_tersoff_intel.cpp
+++ b/src/USER-INTEL/pair_tersoff_intel.cpp
@@ -12,7 +12,7 @@
 ------------------------------------------------------------------------- */
 
 /* ----------------------------------------------------------------------
-   Contributing author: Markus H�hnerbach (RWTH)
+   Contributing author: Markus Höhnerbach (RWTH)
 ------------------------------------------------------------------------- */
 
 #include <cmath>
diff --git a/src/USER-INTEL/pppm_disp_intel.cpp b/src/USER-INTEL/pppm_disp_intel.cpp
index 9d075c78a1..fd1302da98 100644
--- a/src/USER-INTEL/pppm_disp_intel.cpp
+++ b/src/USER-INTEL/pppm_disp_intel.cpp
@@ -62,6 +62,7 @@ enum{FORWARD_IK, FORWARD_AD, FORWARD_IK_PERATOM, FORWARD_AD_PERATOM,
 PPPMDispIntel::PPPMDispIntel(LAMMPS *lmp) : PPPMDisp(lmp)
 {
   suffix_flag |= Suffix::INTEL;
+  triclinic_support = 0;
 
   order = 7;
   order_6 = 7; //sets default stencil sizes to 7
@@ -348,7 +349,7 @@ void PPPMDispIntel::compute(int eflag, int vflag)
   }
 
   if (function[1]) {
-    //perfrom calculations for geometric mixing
+    //perform calculations for geometric mixing
 
     if (fix->precision() == FixIntel::PREC_MODE_MIXED) {
       particle_map<float,double>(delxinv_6, delyinv_6, delzinv_6, shift_6,
diff --git a/src/USER-INTEL/pppm_intel.cpp b/src/USER-INTEL/pppm_intel.cpp
index e3d1e7d4aa..e3bf779cc1 100644
--- a/src/USER-INTEL/pppm_intel.cpp
+++ b/src/USER-INTEL/pppm_intel.cpp
@@ -208,16 +208,23 @@ void PPPMIntel::compute_first(int eflag, int vflag)
 
   // find grid points for all my particles
   // map my particle charge onto my local 3d density grid
+  // optimized versions can only be used for orthogonal boxes
 
-  if (fix->precision() == FixIntel::PREC_MODE_MIXED) {
-    particle_map<float,double>(fix->get_mixed_buffers());
-    make_rho<float,double>(fix->get_mixed_buffers());
-  } else if (fix->precision() == FixIntel::PREC_MODE_DOUBLE) {
-    particle_map<double,double>(fix->get_double_buffers());
-    make_rho<double,double>(fix->get_double_buffers());
+  if (triclinic) {
+    PPPM::particle_map();
+    PPPM::make_rho();
   } else {
-    particle_map<float,float>(fix->get_single_buffers());
-    make_rho<float,float>(fix->get_single_buffers());
+
+    if (fix->precision() == FixIntel::PREC_MODE_MIXED) {
+      particle_map<float,double>(fix->get_mixed_buffers());
+      make_rho<float,double>(fix->get_mixed_buffers());
+    } else if (fix->precision() == FixIntel::PREC_MODE_DOUBLE) {
+      particle_map<double,double>(fix->get_double_buffers());
+      make_rho<double,double>(fix->get_double_buffers());
+    } else {
+      particle_map<float,float>(fix->get_single_buffers());
+      make_rho<float,float>(fix->get_single_buffers());
+    }
   }
 
   // all procs communicate density values from their ghost cells
@@ -258,21 +265,26 @@ void PPPMIntel::compute_second(int /*eflag*/, int /*vflag*/)
   int i,j;
 
   // calculate the force on my particles
+  // optimized versions can only be used for orthogonal boxes
 
-  if (differentiation_flag == 1) {
-    if (fix->precision() == FixIntel::PREC_MODE_MIXED)
-      fieldforce_ad<float,double>(fix->get_mixed_buffers());
-    else if (fix->precision() == FixIntel::PREC_MODE_DOUBLE)
-      fieldforce_ad<double,double>(fix->get_double_buffers());
-    else
-      fieldforce_ad<float,float>(fix->get_single_buffers());
+  if (triclinic) {
+    PPPM::fieldforce();
   } else {
-    if (fix->precision() == FixIntel::PREC_MODE_MIXED)
-      fieldforce_ik<float,double>(fix->get_mixed_buffers());
-    else if (fix->precision() == FixIntel::PREC_MODE_DOUBLE)
-      fieldforce_ik<double,double>(fix->get_double_buffers());
-    else
-      fieldforce_ik<float,float>(fix->get_single_buffers());
+    if (differentiation_flag == 1) {
+      if (fix->precision() == FixIntel::PREC_MODE_MIXED)
+        fieldforce_ad<float,double>(fix->get_mixed_buffers());
+      else if (fix->precision() == FixIntel::PREC_MODE_DOUBLE)
+        fieldforce_ad<double,double>(fix->get_double_buffers());
+      else
+        fieldforce_ad<float,float>(fix->get_single_buffers());
+    } else {
+      if (fix->precision() == FixIntel::PREC_MODE_MIXED)
+        fieldforce_ik<float,double>(fix->get_mixed_buffers());
+      else if (fix->precision() == FixIntel::PREC_MODE_DOUBLE)
+        fieldforce_ik<double,double>(fix->get_double_buffers());
+      else
+        fieldforce_ik<float,float>(fix->get_single_buffers());
+    }
   }
 
   // extra per-atom energy/virial communication
diff --git a/src/USER-INTEL/verlet_lrt_intel.cpp b/src/USER-INTEL/verlet_lrt_intel.cpp
index a3c05c46bc..bd143c4c94 100644
--- a/src/USER-INTEL/verlet_lrt_intel.cpp
+++ b/src/USER-INTEL/verlet_lrt_intel.cpp
@@ -185,7 +185,7 @@ void VerletLRTIntel::setup(int flag)
   _kspace_done = 0;
   pthread_mutex_unlock(&_kmutex);
   #elif defined(_LMP_INTEL_LRT_11)
-  kspace_thread.join();
+  _kspace_thread.join();
   #endif
 
   if (kspace_compute_flag) _intel_kspace->compute_second(eflag,vflag);
@@ -298,9 +298,9 @@ void VerletLRTIntel::run(int n)
     pthread_cond_signal(&_kcond);
     pthread_mutex_unlock(&_kmutex);
     #elif defined(_LMP_INTEL_LRT_11)
-    std::thread kspace_thread;
+    std::thread _kspace_thread;
     if (kspace_compute_flag)
-      kspace_thread=std::thread([=] {
+      _kspace_thread=std::thread([=] {
         _intel_kspace->compute_first(eflag, vflag);
         timer->stamp(Timer::KSPACE);
       } );
@@ -332,7 +332,7 @@ void VerletLRTIntel::run(int n)
     pthread_mutex_unlock(&_kmutex);
     #elif defined(_LMP_INTEL_LRT_11)
     if (kspace_compute_flag)
-      kspace_thread.join();
+      _kspace_thread.join();
     #endif
 
     if (kspace_compute_flag) {
diff --git a/src/USER-MANIFOLD/README b/src/USER-MANIFOLD/README
index eb83cfc5ab..24c645232d 100644
--- a/src/USER-MANIFOLD/README
+++ b/src/USER-MANIFOLD/README
@@ -31,7 +31,7 @@ To add a new manifold, do the following in the "USER-MANIFOLD" directory:
    c. In namespace LAMMPS_NS, add a new class that inherits publicly from manifold
      and protectedly from Pointers.
    d. The constructor has to take ( LAMMPS*, int, char ** ) as arguments,
-     and should initialise Pointers.
+     and should initialize Pointers.
    e. The header file has to contain somewhere the macro ManifoldStyle with as
      first argument the name of the manifold and as second argument the name
      of the class implementing this manifold. The macro expands into some code
@@ -45,7 +45,7 @@ To add a new manifold, do the following in the "USER-MANIFOLD" directory:
 +====================================+=========================================+
 |  destructor                        | Free space (can be empty)               |
 |  constructor                       | Has to take (LAMMPS *lmp, int, char **) |
-|                                    | as arguments and has to initialise      |
+|                                    | as arguments and has to initialize      |
 |                                    | Pointers with lmp.                      |
 |  double g( double *x )             | A function that is 0 if the 3-vector    |
 |                                    | x is on the manifold.                   |
diff --git a/src/USER-MANIFOLD/fix_manifoldforce.h b/src/USER-MANIFOLD/fix_manifoldforce.h
index 1d5afc7afc..64a5011780 100644
--- a/src/USER-MANIFOLD/fix_manifoldforce.h
+++ b/src/USER-MANIFOLD/fix_manifoldforce.h
@@ -21,7 +21,7 @@
    This file is part of the user-manifold package written by
    Stefan Paquay at the Eindhoven University of Technology.
    This module makes it possible to do MD with particles constrained
-   to pretty arbitrary manifolds characterised by some constraint function
+   to pretty arbitrary manifolds characterized by some constraint function
    g(x,y,z) = 0 and its normal grad(g). The number of manifolds available
    right now is limited but can be extended straightforwardly by making
    a new class that inherits from manifold and implements all pure virtual
diff --git a/src/USER-MANIFOLD/fix_nve_manifold_rattle.cpp b/src/USER-MANIFOLD/fix_nve_manifold_rattle.cpp
index 7f8d9d5675..312db1c411 100644
--- a/src/USER-MANIFOLD/fix_nve_manifold_rattle.cpp
+++ b/src/USER-MANIFOLD/fix_nve_manifold_rattle.cpp
@@ -21,7 +21,7 @@
    This file is part of the user-manifold package written by
    Stefan Paquay at the Eindhoven University of Technology.
    This module makes it possible to do MD with particles constrained
-   to pretty arbitrary manifolds characterised by some constraint function
+   to pretty arbitrary manifolds characterized by some constraint function
    g(x,y,z) = 0 and its normal grad(g). The number of manifolds available
    right now is limited but can be extended straightforwardly by making
    a new class that inherits from manifold and implements all pure virtual
@@ -149,7 +149,7 @@ FixNVEManifoldRattle::FixNVEManifoldRattle( LAMMPS *lmp, int &narg, char **arg,
       nevery = force->inumeric(FLERR,arg[argi+1]);
       next_output = update->ntimestep + nevery;
       if (comm->me == 0) {
-        fprintf(screen,"Outputing every %d steps, next is %d\n",
+        fprintf(screen,"Outputting every %d steps, next is %d\n",
                         nevery, next_output);
       }
       argi += 2;
diff --git a/src/USER-MANIFOLD/fix_nve_manifold_rattle.h b/src/USER-MANIFOLD/fix_nve_manifold_rattle.h
index 581ecf36d3..42da240abc 100644
--- a/src/USER-MANIFOLD/fix_nve_manifold_rattle.h
+++ b/src/USER-MANIFOLD/fix_nve_manifold_rattle.h
@@ -21,7 +21,7 @@
    This file is part of the user-manifold package written by
    Stefan Paquay at the Eindhoven University of Technology.
    This module makes it possible to do MD with particles constrained
-   to pretty arbitrary manifolds characterised by some constraint function
+   to pretty arbitrary manifolds characterized by some constraint function
    g(x,y,z) = 0 and its normal grad(g). The number of manifolds available
    right now is limited but can be extended straightforwardly by making
    a new class that inherits from manifold and implements all pure virtual
diff --git a/src/USER-MANIFOLD/fix_nvt_manifold_rattle.cpp b/src/USER-MANIFOLD/fix_nvt_manifold_rattle.cpp
index 2789f8738a..db3267db28 100644
--- a/src/USER-MANIFOLD/fix_nvt_manifold_rattle.cpp
+++ b/src/USER-MANIFOLD/fix_nvt_manifold_rattle.cpp
@@ -21,7 +21,7 @@
    This file is part of the user-manifold package written by
    Stefan Paquay at the Eindhoven University of Technology.
    This module makes it possible to do MD with particles constrained
-   to pretty arbitrary manifolds characterised by some constraint function
+   to pretty arbitrary manifolds characterized by some constraint function
    g(x,y,z) = 0 and its normal grad(g). The number of manifolds available
    right now is limited but can be extended straightforwardly by making
    a new class that inherits from manifold and implements all pure virtual
diff --git a/src/USER-MANIFOLD/fix_nvt_manifold_rattle.h b/src/USER-MANIFOLD/fix_nvt_manifold_rattle.h
index 144cda3799..f42902f721 100644
--- a/src/USER-MANIFOLD/fix_nvt_manifold_rattle.h
+++ b/src/USER-MANIFOLD/fix_nvt_manifold_rattle.h
@@ -21,7 +21,7 @@
    This file is part of the user-manifold package written by
    Stefan Paquay at the Eindhoven University of Technology.
    This module makes it possible to do MD with particles constrained
-   to pretty arbitrary manifolds characterised by some constraint function
+   to pretty arbitrary manifolds characterized by some constraint function
    g(x,y,z) = 0 and its normal grad(g). The number of manifolds available
    right now is limited but can be extended straightforwardly by making
    a new class that inherits from manifold and implements all pure virtual
diff --git a/src/USER-MANIFOLD/manifold_factory.cpp b/src/USER-MANIFOLD/manifold_factory.cpp
index f98180ddb6..7df3e52ed7 100644
--- a/src/USER-MANIFOLD/manifold_factory.cpp
+++ b/src/USER-MANIFOLD/manifold_factory.cpp
@@ -21,7 +21,7 @@
    This file is part of the user-manifold package written by
    Stefan Paquay at the Eindhoven University of Technology.
    This module makes it possible to do MD with particles constrained
-   to pretty arbitrary manifolds characterised by some constraint function
+   to pretty arbitrary manifolds characterized by some constraint function
    g(x,y,z) = 0 and its normal grad(g). The number of manifolds available
    right now is limited but can be extended straightforwardly by making
    a new class that inherits from manifold and implements all pure virtual
diff --git a/src/USER-MANIFOLD/manifold_factory.h b/src/USER-MANIFOLD/manifold_factory.h
index ac2aee8a26..85ee4011be 100644
--- a/src/USER-MANIFOLD/manifold_factory.h
+++ b/src/USER-MANIFOLD/manifold_factory.h
@@ -21,7 +21,7 @@
    This file is part of the user-manifold package written by
    Stefan Paquay at the Eindhoven University of Technology.
    This module makes it possible to do MD with particles constrained
-   to pretty arbitrary manifolds characterised by some constraint function
+   to pretty arbitrary manifolds characterized by some constraint function
    g(x,y,z) = 0 and its normal grad(g). The number of manifolds available
    right now is limited but can be extended straightforwardly by making
    a new class that inherits from manifold and implements all pure virtual
diff --git a/src/USER-MANIFOLD/manifold_thylakoid.cpp b/src/USER-MANIFOLD/manifold_thylakoid.cpp
index e4ef039832..e473f00a03 100644
--- a/src/USER-MANIFOLD/manifold_thylakoid.cpp
+++ b/src/USER-MANIFOLD/manifold_thylakoid.cpp
@@ -142,7 +142,7 @@ void manifold_thylakoid::init_domains()
 {
   if (wB + 2*lB > LT) {
     char msg[2048];
-    sprintf(msg,"LT = %f not large enough to accomodate bridge with "
+    sprintf(msg,"LT = %f not large enough to accommodate bridge with "
             "wB = %f and lB = %f! %f > %f\n", LT, wB, lB, wB + 2*lB, LT);
     error->one(FLERR,msg);
   }
diff --git a/src/USER-MEAMC/README b/src/USER-MEAMC/README
index c1faf7c0c4..dcb70d670c 100644
--- a/src/USER-MEAMC/README
+++ b/src/USER-MEAMC/README
@@ -19,7 +19,7 @@ The original Fortran implementation was created by
 
 Use "make yes-user-meamc" to enable this package when building LAMMPS.
 
-In your LAMMPS input script, specifiy
+In your LAMMPS input script, specify
   pair_style meam/c
 to enable the use of this implementation. All parameters, input files and
 outputs are exactly identical to these used with pair_style meam.
diff --git a/src/USER-MEAMC/meam.h b/src/USER-MEAMC/meam.h
index 719e1af6f0..b4f8fd341b 100644
--- a/src/USER-MEAMC/meam.h
+++ b/src/USER-MEAMC/meam.h
@@ -214,7 +214,7 @@ protected:
   void alloyparams();
   void compute_pair_meam();
   double phi_meam(double, int, int);
-  const double phi_meam_series(const double scrn, const int Z1, const int Z2, const int a, const int b, const double r, const double arat);
+  double phi_meam_series(const double scrn, const int Z1, const int Z2, const int a, const int b, const double r, const double arat);
   void compute_reference_density();
   void get_tavref(double*, double*, double*, double*, double*, double*, double, double, double, double,
                   double, double, double, int, int, lattice_t);
diff --git a/src/USER-MEAMC/meam_funcs.cpp b/src/USER-MEAMC/meam_funcs.cpp
index a67cbf2833..706075ffd0 100644
--- a/src/USER-MEAMC/meam_funcs.cpp
+++ b/src/USER-MEAMC/meam_funcs.cpp
@@ -271,7 +271,7 @@ MEAM::get_Zij(const lattice_t latt)
       return 12;
     case B2:
       return 8;
-    case CH4: // DYNAMO currenly implemented this way while it needs two Z values, 4 and 1
+    case CH4: // DYNAMO currently implemented this way while it needs two Z values, 4 and 1
       return 4;
     case LIN:
     case ZIG:
diff --git a/src/USER-MEAMC/meam_setup_done.cpp b/src/USER-MEAMC/meam_setup_done.cpp
index 8dfebe8ed5..25f1bb9e81 100644
--- a/src/USER-MEAMC/meam_setup_done.cpp
+++ b/src/USER-MEAMC/meam_setup_done.cpp
@@ -95,7 +95,7 @@ MEAM::alloyparams(void)
   for (i = 0; i < this->neltypes; i++) {
     for (j = 0; j < this->neltypes; j++) {
       // Treat off-diagonal pairs
-      // If i>j, set all equal to i<j case (which has aready been set,
+      // If i>j, set all equal to i<j case (which has already been set,
       // here or in the input file)
       if (i > j) {
         this->re_meam[i][j] = this->re_meam[j][i];
@@ -163,11 +163,10 @@ MEAM::alloyparams(void)
 void
 MEAM::compute_pair_meam(void)
 {
-
-  double r, b2nn, phi_val;
+  double r;
   int j, a, b, nv2;
   double astar, frac, phizbl;
-  int n, Z1, Z2;
+  int Z1, Z2;
   double arat, rarat, scrn, scrn2;
   double phiaa, phibb /*unused:,phitmp*/;
   double C, s111, s112, s221, S11, S22;
@@ -320,7 +319,7 @@ MEAM::phi_meam(double r, int a, int b)
   double Eu;
   double arat, scrn, scrn2;
   int Z12, errorflag;
-  int n, Z1nn, Z2nn;
+  int Z1nn, Z2nn;
   lattice_t latta /*unused:,lattb*/;
   double rho_bkgd1, rho_bkgd2;
   double b11s, b22s;
@@ -519,7 +518,7 @@ MEAM::phi_meam(double r, int a, int b)
 //   To avoid nan values of phir due to rapid decrease of b2nn^n or/and
 //   argument of phi_meam, i.e. r*arat^n, in some cases (3NN dia with low Cmin value)
 //
-const double
+double
 MEAM::phi_meam_series(const double scrn, const int Z1, const int Z2, const int a, const int b, const double r, const double arat)
 {
   double phi_sum = 0.0;
diff --git a/src/USER-MEAMC/meam_setup_param.cpp b/src/USER-MEAMC/meam_setup_param.cpp
index 70d8b63598..f0e04ff1c0 100644
--- a/src/USER-MEAMC/meam_setup_param.cpp
+++ b/src/USER-MEAMC/meam_setup_param.cpp
@@ -49,6 +49,12 @@ MEAM::meam_checkindex(int num, int lim, int nidx, int* idx /*idx(3)*/, int* ierr
 //     20 = bkgd_dyn
 //     21 = theta
 
+//     The returned errorflag has the following meanings:
+
+//     0 = no error
+//     1 = "which" out of range / invalid keyword
+//     2 = not enough indices given
+//     3 = an element index is out of range
 
 void
 MEAM::meam_setup_param(int which, double value, int nindex, int* index /*index(3)*/, int* errorflag)
diff --git a/src/USER-MEAMC/pair_meamc.cpp b/src/USER-MEAMC/pair_meamc.cpp
index 3d7d0b2a17..3e87c6b284 100644
--- a/src/USER-MEAMC/pair_meamc.cpp
+++ b/src/USER-MEAMC/pair_meamc.cpp
@@ -32,6 +32,7 @@
 using namespace LAMMPS_NS;
 
 #define MAXLINE 1024
+#define ERRFMT(errfn,format,...) do { char _strbuf[128]; snprintf(_strbuf,sizeof(_strbuf),format,__VA_ARGS__); errfn(FLERR,_strbuf); } while (0)
 
 static const int nkeywords = 22;
 static const char *keywords[] = {
@@ -147,9 +148,7 @@ void PairMEAMC::compute(int eflag, int vflag)
   meam_inst->meam_dens_final(nlocal,eflag_either,eflag_global,eflag_atom,
                    &eng_vdwl,eatom,ntype,type,map,scale,errorflag);
   if (errorflag) {
-    char str[128];
-    sprintf(str,"MEAM library error %d",errorflag);
-    error->one(FLERR,str);
+    ERRFMT(error->one,"MEAM library error %d",errorflag);
   }
 
   comm->forward_comm_pair(this);
@@ -228,8 +227,8 @@ void PairMEAMC::coeff(int narg, char **arg)
   nelements = narg - 4 - atom->ntypes;
   if (nelements < 1) error->all(FLERR,"Incorrect args for pair coefficients");
   if (nelements > maxelt)
-    error->all(FLERR,"Too many elements extracted from MEAM library. "
-                      "Increase 'maxelt' in meam.h and recompile.");
+    ERRFMT(error->all, "Too many elements extracted from MEAM library (current limit: %d)."
+                       " Increase 'maxelt' in meam.h and recompile.", maxelt);
   elements = new char*[nelements];
   mass = new double[nelements];
 
@@ -334,11 +333,8 @@ void PairMEAMC::read_files(char *globalfile, char *userfile)
   FILE *fp;
   if (comm->me == 0) {
     fp = force->open_potential(globalfile);
-    if (fp == NULL) {
-      char str[128];
-      snprintf(str,128,"Cannot open MEAM potential file %s",globalfile);
-      error->one(FLERR,str);
-    }
+    if (fp == NULL)
+      ERRFMT(error->one, "Cannot open MEAM potential file %s", globalfile);
   }
 
   // allocate parameter arrays
@@ -372,110 +368,128 @@ void PairMEAMC::read_files(char *globalfile, char *userfile)
   // store params if element name is in element list
   // if element name appears multiple times, only store 1st entry
 
-  int i,n,nwords;
-  char **words = new char*[params_per_line+1];
-  char line[MAXLINE],*ptr;
-  int eof = 0;
-
-  int nset = 0;
-  while (1) {
-    if (comm->me == 0) {
+  if (comm->me == 0) {
+    int nset = 0;
+    char **words = new char*[params_per_line+1];
+    char line[MAXLINE];
+    while (1) {
+      char *ptr;
       ptr = fgets(line,MAXLINE,fp);
       if (ptr == NULL) {
-        eof = 1;
         fclose(fp);
-      } else n = strlen(line) + 1;
-    }
-    MPI_Bcast(&eof,1,MPI_INT,0,world);
-    if (eof) break;
-    MPI_Bcast(&n,1,MPI_INT,0,world);
-    MPI_Bcast(line,n,MPI_CHAR,0,world);
+        break;
+      }
 
-    // strip comment, skip line if blank
+      // strip comment, skip line if blank
 
-    if ((ptr = strchr(line,'#'))) *ptr = '\0';
-    nwords = atom->count_words(line);
-    if (nwords == 0) continue;
+      if ((ptr = strchr(line,'#'))) *ptr = '\0';
+      int nwords = atom->count_words(line);
+      if (nwords == 0) continue;
 
-    // concatenate additional lines until have params_per_line words
+      // concatenate additional lines until have params_per_line words
 
-    while (nwords < params_per_line) {
-      n = strlen(line);
-      if (comm->me == 0) {
+      while (nwords < params_per_line) {
+        int n = strlen(line);
         ptr = fgets(&line[n],MAXLINE-n,fp);
         if (ptr == NULL) {
-          eof = 1;
           fclose(fp);
-        } else n = strlen(line) + 1;
+          break;
+        }
+        if ((ptr = strchr(line,'#'))) *ptr = '\0';
+        nwords = atom->count_words(line);
       }
-      MPI_Bcast(&eof,1,MPI_INT,0,world);
-      if (eof) break;
-      MPI_Bcast(&n,1,MPI_INT,0,world);
-      MPI_Bcast(line,n,MPI_CHAR,0,world);
-      if ((ptr = strchr(line,'#'))) *ptr = '\0';
-      nwords = atom->count_words(line);
+
+      if (nwords != params_per_line)
+        error->one(FLERR,"Incorrect format in MEAM library file");
+
+      // words = ptrs to all words in line
+      // strip single and double quotes from words
+
+      nwords = 0;
+      words[nwords++] = strtok(line,"' \t\n\r\f");
+      while ((words[nwords++] = strtok(NULL,"' \t\n\r\f"))) continue;
+
+      // skip if element name isn't in element list
+
+      int index;
+      for (index = 0; index < nelements; index++)
+        if (strcmp(words[0],elements[index]) == 0) break;
+      if (index == nelements) continue;
+
+      // skip if element already appeared (technically error in library file, but always ignored)
+
+      if (found[index] == true) continue;
+      found[index] = true;
+
+      // map lat string to an integer
+
+      if (!MEAM::str_to_lat(words[1], true, lat[index]))
+        ERRFMT(error->one, "Unrecognized lattice type in MEAM library file: %s", words[1]);
+
+      // store parameters
+
+      z[index] = atof(words[2]);
+      ielement[index] = atoi(words[3]);
+      atwt[index] = atof(words[4]);
+      alpha[index] = atof(words[5]);
+      b0[index] = atof(words[6]);
+      b1[index] = atof(words[7]);
+      b2[index] = atof(words[8]);
+      b3[index] = atof(words[9]);
+      alat[index] = atof(words[10]);
+      esub[index] = atof(words[11]);
+      asub[index] = atof(words[12]);
+      t0[index] = atof(words[13]);
+      t1[index] = atof(words[14]);
+      t2[index] = atof(words[15]);
+      t3[index] = atof(words[16]);
+      rozero[index] = atof(words[17]);
+      ibar[index] = atoi(words[18]);
+
+      if (!isone(t0[index]))
+        error->one(FLERR,"Unsupported parameter in MEAM library file: t0!=1");
+
+      // z given is ignored: if this is mismatched, we definitely won't do what the user said -> fatal error
+      if (z[index] != MEAM::get_Zij(lat[index]))
+        error->one(FLERR,"Mismatched parameter in MEAM library file: z!=lat");
+
+      nset++;
+    }
+      
+    // error if didn't find all elements in file
+
+    if (nset != nelements) {
+      char str[128] = "Did not find all elements in MEAM library file, missing:";
+      for (int i = 0; i < nelements; i++)
+        if (!found[i]) {
+          strcat(str," ");
+          strcat(str,elements[i]);
+        }
+      error->one(FLERR,str);
     }
 
-    if (nwords != params_per_line)
-      error->all(FLERR,"Incorrect format in MEAM potential file");
-
-    // words = ptrs to all words in line
-    // strip single and double quotes from words
-
-    nwords = 0;
-    words[nwords++] = strtok(line,"' \t\n\r\f");
-    while ((words[nwords++] = strtok(NULL,"' \t\n\r\f"))) continue;
-
-    // skip if element name isn't in element list
-
-    for (i = 0; i < nelements; i++)
-      if (strcmp(words[0],elements[i]) == 0) break;
-    if (i >= nelements) continue;
-
-    // skip if element already appeared
-
-    if (found[i] == true) continue;
-    found[i] = true;
-
-    // map lat string to an integer
-
-    if (!MEAM::str_to_lat(words[1], true, lat[i]))
-      error->all(FLERR,"Unrecognized lattice type in MEAM file 1");
-
-    // store parameters
-
-    z[i] = atof(words[2]);
-    ielement[i] = atoi(words[3]);
-    atwt[i] = atof(words[4]);
-    alpha[i] = atof(words[5]);
-    b0[i] = atof(words[6]);
-    b1[i] = atof(words[7]);
-    b2[i] = atof(words[8]);
-    b3[i] = atof(words[9]);
-    alat[i] = atof(words[10]);
-    esub[i] = atof(words[11]);
-    asub[i] = atof(words[12]);
-    t0[i] = atof(words[13]);
-    t1[i] = atof(words[14]);
-    t2[i] = atof(words[15]);
-    t3[i] = atof(words[16]);
-    rozero[i] = atof(words[17]);
-    ibar[i] = atoi(words[18]);
-
-    if (!isone(t0[i]))
-      error->all(FLERR,"Unsupported parameter in MEAM potential file: t0!=1");
-
-    // z given is ignored: if this is mismatched, we definitely won't do what the user said -> fatal error
-    if (z[i] != MEAM::get_Zij(lat[i]))
-      error->all(FLERR,"Mismatched parameter in MEAM potential file: z!=lat");
-
-    nset++;
+    delete [] words;
   }
 
-  // error if didn't find all elements in file
-
-  if (nset != nelements)
-    error->all(FLERR,"Did not find all elements in MEAM library file");
+  // distribute complete parameter sets
+  MPI_Bcast(lat, nelements, MPI_INT, 0, world);
+  MPI_Bcast(ielement, nelements, MPI_INT, 0, world);
+  MPI_Bcast(ibar, nelements, MPI_INT, 0, world);
+  MPI_Bcast(z, nelements, MPI_DOUBLE, 0, world);
+  MPI_Bcast(atwt, nelements, MPI_DOUBLE, 0, world);
+  MPI_Bcast(alpha, nelements, MPI_DOUBLE, 0, world);
+  MPI_Bcast(b0, nelements, MPI_DOUBLE, 0, world);
+  MPI_Bcast(b1, nelements, MPI_DOUBLE, 0, world);
+  MPI_Bcast(b2, nelements, MPI_DOUBLE, 0, world);
+  MPI_Bcast(b3, nelements, MPI_DOUBLE, 0, world);
+  MPI_Bcast(alat, nelements, MPI_DOUBLE, 0, world);
+  MPI_Bcast(esub, nelements, MPI_DOUBLE, 0, world);
+  MPI_Bcast(asub, nelements, MPI_DOUBLE, 0, world);
+  MPI_Bcast(t0, nelements, MPI_DOUBLE, 0, world);
+  MPI_Bcast(t1, nelements, MPI_DOUBLE, 0, world);
+  MPI_Bcast(t2, nelements, MPI_DOUBLE, 0, world);
+  MPI_Bcast(t3, nelements, MPI_DOUBLE, 0, world);
+  MPI_Bcast(rozero, nelements, MPI_DOUBLE, 0, world);
 
   // pass element parameters to MEAM package
 
@@ -484,12 +498,10 @@ void PairMEAMC::read_files(char *globalfile, char *userfile)
 
   // set element masses
 
-  for (i = 0; i < nelements; i++) mass[i] = atwt[i];
+  for (int i = 0; i < nelements; i++) mass[i] = atwt[i];
 
   // clean-up memory
 
-  delete [] words;
-
   delete [] lat;
   delete [] ielement;
   delete [] ibar;
@@ -518,48 +530,42 @@ void PairMEAMC::read_files(char *globalfile, char *userfile)
 
   if (comm->me == 0) {
     fp = force->open_potential(userfile);
-    if (fp == NULL) {
-      char str[128];
-      snprintf(str,128,"Cannot open MEAM potential file %s",userfile);
-      error->one(FLERR,str);
-    }
+    if (fp == NULL)
+      ERRFMT(error->one, "Cannot open MEAM potential file %s", userfile);
   }
 
   // read settings
   // pass them one at a time to MEAM package
   // match strings to list of corresponding ints
-
-  int which;
-  double value;
-  lattice_t latt;
-  int nindex,index[3];
+  
   int maxparams = 6;
   char **params = new char*[maxparams];
-  int nparams;
-
-  eof = 0;
   while (1) {
+    int which;
+    int nindex, index[3];
+    double value;
+    char line[MAXLINE];
+    int nline;
+    char *ptr;
     if (comm->me == 0) {
       ptr = fgets(line,MAXLINE,fp);
       if (ptr == NULL) {
-        eof = 1;
         fclose(fp);
-      } else n = strlen(line) + 1;
+        nline = -1;
+      } else nline = strlen(line) + 1;
     }
-    MPI_Bcast(&eof,1,MPI_INT,0,world);
-    if (eof) break;
-    MPI_Bcast(&n,1,MPI_INT,0,world);
-    MPI_Bcast(line,n,MPI_CHAR,0,world);
+    MPI_Bcast(&nline,1,MPI_INT,0,world);
+    if (nline<0) break;
+    MPI_Bcast(line,nline,MPI_CHAR,0,world);
 
     // strip comment, skip line if blank
 
     if ((ptr = strchr(line,'#'))) *ptr = '\0';
-    nparams = atom->count_words(line);
-    if (nparams == 0) continue;
+    if (atom->count_words(line) == 0) continue;
 
-    // words = ptrs to all words in line
-
-    nparams = 0;
+    // params = ptrs to all fields in line
+    
+    int nparams = 0;
     params[nparams++] = strtok(line,"=(), '\t\n\r\f");
     while (nparams < maxparams &&
            (params[nparams++] = strtok(NULL,"=(), '\t\n\r\f")))
@@ -568,20 +574,18 @@ void PairMEAMC::read_files(char *globalfile, char *userfile)
 
     for (which = 0; which < nkeywords; which++)
       if (strcmp(params[0],keywords[which]) == 0) break;
-    if (which == nkeywords) {
-      char str[128];
-      snprintf(str,128,"Keyword %s in MEAM parameter file not recognized",
-               params[0]);
-      error->all(FLERR,str);
-    }
+    if (which == nkeywords)
+      ERRFMT(error->all, "Keyword %s in MEAM parameter file not recognized", params[0]);
+    
     nindex = nparams - 2;
-    for (i = 0; i < nindex; i++) index[i] = atoi(params[i+1]) - 1;
+    for (int i = 0; i < nindex; i++) index[i] = atoi(params[i+1]) - 1;
 
     // map lattce_meam value to an integer
 
     if (which == 4) {
+      lattice_t latt;
       if (!MEAM::str_to_lat(params[nparams-1], false, latt))
-        error->all(FLERR,"Unrecognized lattice type in MEAM file 2");
+        ERRFMT(error->all, "Unrecognized lattice type in MEAM parameter file: %s", params[nparams-1]);
       value = latt;
     }
     else value = atof(params[nparams-1]);
@@ -592,11 +596,16 @@ void PairMEAMC::read_files(char *globalfile, char *userfile)
     meam_inst->meam_setup_param(which,value,nindex,index,&errorflag);
     if (errorflag) {
       char str[128];
-      sprintf(str,"MEAM library error %d",errorflag);
+      snprintf(str,80,"Error in MEAM parameter file: keyword %s",params[0]);
+      switch(errorflag) {
+        case 1: strcat(str, " is out of range (please report a bug)"); break;
+        case 2: strcat(str, " expected more indices"); break;
+        case 3: strcat(str, " has out of range element index"); break;
+      }
       error->all(FLERR,str);
     }
+    
   }
-
   delete [] params;
 }
 
diff --git a/src/USER-MEAMC/pair_meamc.h b/src/USER-MEAMC/pair_meamc.h
index 102985f0ca..315fd2230b 100644
--- a/src/USER-MEAMC/pair_meamc.h
+++ b/src/USER-MEAMC/pair_meamc.h
@@ -89,26 +89,37 @@ E: Cannot open MEAM potential file %s
 The specified MEAM potential file cannot be opened.  Check that the
 path and name are correct.
 
-E: Incorrect format in MEAM potential file
+E: Incorrect format in MEAM library file
 
 Incorrect number of words per line in the potential file.
 
-E: Unrecognized lattice type in MEAM file 1
+E: Too many elements extracted from MEAM library.
 
-The lattice type in an entry of the MEAM library file is not
+Increase 'maxelt' in meam.h and recompile.
+
+E: Unrecognized lattice type in MEAM library/parameter file
+
+The lattice type in an entry of the MEAM library/parameter file is not
 valid.
 
+E: Unsupported parameter in MEAM library file: ...
+
+Self-explanatory.
+
+E: Mismatched parameter in MEAM library file: z!=lat
+
+The coordination number and lattice do not match, check that consistent values are given.
+
 E: Did not find all elements in MEAM library file
 
-The requested elements were not found in the MEAM file.
+Some requested elements were not found in the MEAM file. Check spelling etc.
 
 E: Keyword %s in MEAM parameter file not recognized
 
 Self-explanatory.
 
-E: Unrecognized lattice type in MEAM file 2
+E: Error in MEAM parameter file: keyword %s (further information)
 
-The lattice type in an entry of the MEAM parameter file is not
-valid.
+Self-explanatory. Check the parameter file.
 
 */
diff --git a/src/USER-MESO/README b/src/USER-MESODPD/README
similarity index 100%
rename from src/USER-MESO/README
rename to src/USER-MESODPD/README
diff --git a/src/USER-MESO/atom_vec_edpd.cpp b/src/USER-MESODPD/atom_vec_edpd.cpp
similarity index 100%
rename from src/USER-MESO/atom_vec_edpd.cpp
rename to src/USER-MESODPD/atom_vec_edpd.cpp
diff --git a/src/USER-MESO/atom_vec_edpd.h b/src/USER-MESODPD/atom_vec_edpd.h
similarity index 100%
rename from src/USER-MESO/atom_vec_edpd.h
rename to src/USER-MESODPD/atom_vec_edpd.h
diff --git a/src/USER-MESO/atom_vec_mdpd.cpp b/src/USER-MESODPD/atom_vec_mdpd.cpp
similarity index 100%
rename from src/USER-MESO/atom_vec_mdpd.cpp
rename to src/USER-MESODPD/atom_vec_mdpd.cpp
diff --git a/src/USER-MESO/atom_vec_mdpd.h b/src/USER-MESODPD/atom_vec_mdpd.h
similarity index 100%
rename from src/USER-MESO/atom_vec_mdpd.h
rename to src/USER-MESODPD/atom_vec_mdpd.h
diff --git a/src/USER-MESO/atom_vec_tdpd.cpp b/src/USER-MESODPD/atom_vec_tdpd.cpp
similarity index 100%
rename from src/USER-MESO/atom_vec_tdpd.cpp
rename to src/USER-MESODPD/atom_vec_tdpd.cpp
diff --git a/src/USER-MESO/atom_vec_tdpd.h b/src/USER-MESODPD/atom_vec_tdpd.h
similarity index 100%
rename from src/USER-MESO/atom_vec_tdpd.h
rename to src/USER-MESODPD/atom_vec_tdpd.h
diff --git a/src/USER-MESO/compute_edpd_temp_atom.cpp b/src/USER-MESODPD/compute_edpd_temp_atom.cpp
similarity index 100%
rename from src/USER-MESO/compute_edpd_temp_atom.cpp
rename to src/USER-MESODPD/compute_edpd_temp_atom.cpp
diff --git a/src/USER-MESO/compute_edpd_temp_atom.h b/src/USER-MESODPD/compute_edpd_temp_atom.h
similarity index 100%
rename from src/USER-MESO/compute_edpd_temp_atom.h
rename to src/USER-MESODPD/compute_edpd_temp_atom.h
diff --git a/src/USER-MESO/compute_tdpd_cc_atom.cpp b/src/USER-MESODPD/compute_tdpd_cc_atom.cpp
similarity index 100%
rename from src/USER-MESO/compute_tdpd_cc_atom.cpp
rename to src/USER-MESODPD/compute_tdpd_cc_atom.cpp
diff --git a/src/USER-MESO/compute_tdpd_cc_atom.h b/src/USER-MESODPD/compute_tdpd_cc_atom.h
similarity index 100%
rename from src/USER-MESO/compute_tdpd_cc_atom.h
rename to src/USER-MESODPD/compute_tdpd_cc_atom.h
diff --git a/src/USER-MESO/fix_edpd_source.cpp b/src/USER-MESODPD/fix_edpd_source.cpp
similarity index 100%
rename from src/USER-MESO/fix_edpd_source.cpp
rename to src/USER-MESODPD/fix_edpd_source.cpp
diff --git a/src/USER-MESO/fix_edpd_source.h b/src/USER-MESODPD/fix_edpd_source.h
similarity index 100%
rename from src/USER-MESO/fix_edpd_source.h
rename to src/USER-MESODPD/fix_edpd_source.h
diff --git a/src/USER-MESO/fix_mvv_dpd.cpp b/src/USER-MESODPD/fix_mvv_dpd.cpp
similarity index 100%
rename from src/USER-MESO/fix_mvv_dpd.cpp
rename to src/USER-MESODPD/fix_mvv_dpd.cpp
diff --git a/src/USER-MESO/fix_mvv_dpd.h b/src/USER-MESODPD/fix_mvv_dpd.h
similarity index 100%
rename from src/USER-MESO/fix_mvv_dpd.h
rename to src/USER-MESODPD/fix_mvv_dpd.h
diff --git a/src/USER-MESO/fix_mvv_edpd.cpp b/src/USER-MESODPD/fix_mvv_edpd.cpp
similarity index 100%
rename from src/USER-MESO/fix_mvv_edpd.cpp
rename to src/USER-MESODPD/fix_mvv_edpd.cpp
diff --git a/src/USER-MESO/fix_mvv_edpd.h b/src/USER-MESODPD/fix_mvv_edpd.h
similarity index 100%
rename from src/USER-MESO/fix_mvv_edpd.h
rename to src/USER-MESODPD/fix_mvv_edpd.h
diff --git a/src/USER-MESO/fix_mvv_tdpd.cpp b/src/USER-MESODPD/fix_mvv_tdpd.cpp
similarity index 100%
rename from src/USER-MESO/fix_mvv_tdpd.cpp
rename to src/USER-MESODPD/fix_mvv_tdpd.cpp
diff --git a/src/USER-MESO/fix_mvv_tdpd.h b/src/USER-MESODPD/fix_mvv_tdpd.h
similarity index 100%
rename from src/USER-MESO/fix_mvv_tdpd.h
rename to src/USER-MESODPD/fix_mvv_tdpd.h
diff --git a/src/USER-MESO/fix_tdpd_source.cpp b/src/USER-MESODPD/fix_tdpd_source.cpp
similarity index 100%
rename from src/USER-MESO/fix_tdpd_source.cpp
rename to src/USER-MESODPD/fix_tdpd_source.cpp
diff --git a/src/USER-MESO/fix_tdpd_source.h b/src/USER-MESODPD/fix_tdpd_source.h
similarity index 100%
rename from src/USER-MESO/fix_tdpd_source.h
rename to src/USER-MESODPD/fix_tdpd_source.h
diff --git a/src/USER-MESO/pair_edpd.cpp b/src/USER-MESODPD/pair_edpd.cpp
similarity index 100%
rename from src/USER-MESO/pair_edpd.cpp
rename to src/USER-MESODPD/pair_edpd.cpp
diff --git a/src/USER-MESO/pair_edpd.h b/src/USER-MESODPD/pair_edpd.h
similarity index 100%
rename from src/USER-MESO/pair_edpd.h
rename to src/USER-MESODPD/pair_edpd.h
diff --git a/src/USER-MESO/pair_mdpd.cpp b/src/USER-MESODPD/pair_mdpd.cpp
similarity index 100%
rename from src/USER-MESO/pair_mdpd.cpp
rename to src/USER-MESODPD/pair_mdpd.cpp
diff --git a/src/USER-MESO/pair_mdpd.h b/src/USER-MESODPD/pair_mdpd.h
similarity index 100%
rename from src/USER-MESO/pair_mdpd.h
rename to src/USER-MESODPD/pair_mdpd.h
diff --git a/src/USER-MESO/pair_mdpd_rhosum.cpp b/src/USER-MESODPD/pair_mdpd_rhosum.cpp
similarity index 100%
rename from src/USER-MESO/pair_mdpd_rhosum.cpp
rename to src/USER-MESODPD/pair_mdpd_rhosum.cpp
diff --git a/src/USER-MESO/pair_mdpd_rhosum.h b/src/USER-MESODPD/pair_mdpd_rhosum.h
similarity index 100%
rename from src/USER-MESO/pair_mdpd_rhosum.h
rename to src/USER-MESODPD/pair_mdpd_rhosum.h
diff --git a/src/USER-MESO/pair_tdpd.cpp b/src/USER-MESODPD/pair_tdpd.cpp
similarity index 100%
rename from src/USER-MESO/pair_tdpd.cpp
rename to src/USER-MESODPD/pair_tdpd.cpp
diff --git a/src/USER-MESO/pair_tdpd.h b/src/USER-MESODPD/pair_tdpd.h
similarity index 100%
rename from src/USER-MESO/pair_tdpd.h
rename to src/USER-MESODPD/pair_tdpd.h
diff --git a/src/USER-MGPT/pair_mgpt.cpp b/src/USER-MGPT/pair_mgpt.cpp
index 0634872c70..213f73f05a 100644
--- a/src/USER-MGPT/pair_mgpt.cpp
+++ b/src/USER-MGPT/pair_mgpt.cpp
@@ -118,7 +118,7 @@ void PairMGPT::make_bond(const double xx[][3],int i,int j,bond_data *bptr) {
 
   double t0,t1;
 
-  /* Check that alignment requirements for SIMD code are fullfilled */
+  /* Check that alignment requirements for SIMD code are fulfilled */
   assert( (((unsigned long long int) (bptr->H.m )) & 31) == 0 );
   assert( (((unsigned long long int) (bptr->Hx.m)) & 31) == 0 );
   assert( (((unsigned long long int) (bptr->Hy.m)) & 31) == 0 );
diff --git a/src/USER-MISC/README b/src/USER-MISC/README
index 9fdc18fbe5..91d630e560 100644
--- a/src/USER-MISC/README
+++ b/src/USER-MISC/README
@@ -48,7 +48,6 @@ dihedral_style table, Andrew Jewett, jewett.aij@gmail.com, 10 Jan 12
 dihedral_style table/cut, Mike Salerno, ksalerno@pha.jhu.edu, 11 May 18
 fix addtorque, Laurent Joly (U Lyon), ljoly.ulyon at gmail.com, 8 Aug 11
 fix ave/correlate/long, Jorge Ramirez (UPM Madrid), jorge.ramirez at upm.es, 21 Oct 2015
-fix bond/react, Jacob Gissinger (CU Boulder), info at disarmmd.org, 24 Feb 2018
 fix electron/stopping, Konstantin Avchaciov, k.avchachov at gmail.com, 26 Feb 2019
 fix ffl, David Wilkins (EPFL Lausanne), david.wilkins @ epfl.ch, 28 Sep 2018
 fix filter/corotate, Lukas Fath (KIT), lukas.fath at kit.edu, 15 Mar 2017
@@ -77,6 +76,8 @@ pair_style buck/mdf, Paolo Raiteri, p.raiteri at curtin.edu.au, 2 Dec 15
 pair_style cosine/squared, Eugen Rozic, eugen.rozic.17 at ucl.ac.uk, 9 Aug 19
 pair_style coul/diel, Axel Kohlmeyer, akohlmey at gmail.com, 1 Dec 11
 pair_style coul/shield, Wengen Ouyang (Tel Aviv University), w.g.ouyang at gmail dot com, 30 Mar 18
+pair_style coul/slater/cut, Evangelos Voyiatzis, evoyiatzis at gmail.com, 26 February 2020
+pair_style coul/slater/long, Evangelos Voyiatzis, evoyiatzis at gmail.com, 26 February 2020
 pair_style dipole/sf, Mario Orsi, orsimario at gmail.com, 8 Aug 11
 pair_style e3b, Steven Strong (U Chicago), stevene.strong at gmail dot com, 16 Apr 19
 pair_style drip, Mingjian Wen, University of Minnesota, wenxx151 at umn.edu, 17 Apr 19
diff --git a/src/USER-MISC/compute_cnp_atom.cpp b/src/USER-MISC/compute_cnp_atom.cpp
index ba97be25d4..34882b0272 100644
--- a/src/USER-MISC/compute_cnp_atom.cpp
+++ b/src/USER-MISC/compute_cnp_atom.cpp
@@ -12,7 +12,7 @@
 
    Common Neighbor Parameter as proposed in:
    Tsuzuki, Branicio, Rino, Comput Phys Comm, 177, 518 (2007)
-   Cite: http://dx.doi.org/10.1063/1.2197987
+   Cite: https://doi.org/10.1063/1.2197987
 
 ------------------------------------------------------------------------- */
 
@@ -161,7 +161,7 @@ void ComputeCNPAtom::compute_peratom()
   numneigh = list->numneigh;
   firstneigh = list->firstneigh;
 
-  // find the neigbors of each atom within cutoff using full neighbor list
+  // find the neighbors of each atom within cutoff using full neighbor list
   // nearest[] = atom indices of nearest neighbors, up to MAXNEAR
   // do this for all atoms, not just compute group
   // since CNP calculation requires neighbors of neighbors
diff --git a/src/USER-MISC/compute_entropy_atom.cpp b/src/USER-MISC/compute_entropy_atom.cpp
index 00f7e6dc8b..2641ec9313 100644
--- a/src/USER-MISC/compute_entropy_atom.cpp
+++ b/src/USER-MISC/compute_entropy_atom.cpp
@@ -141,12 +141,14 @@ void ComputeEntropyAtom::init()
   neighbor->requests[irequest]->compute = 1;
   neighbor->requests[irequest]->half = 0;
   neighbor->requests[irequest]->full = 1;
-  neighbor->requests[irequest]->occasional = 0;
   if (avg_flag) {
     // need a full neighbor list with neighbors of the ghost atoms
+    neighbor->requests[irequest]->occasional = 0;
     neighbor->requests[irequest]->ghost = 1;
   } else {
-    // need a full neighbor list
+    // need a regular full neighbor list
+    // can build it occasionally
+    neighbor->requests[irequest]->occasional = 1;
     neighbor->requests[irequest]->ghost = 0;
   }
 
@@ -196,7 +198,11 @@ void ComputeEntropyAtom::compute_peratom()
     }
   }
 
-  inum = list->inum +  list->gnum;
+  // invoke occasional neighbor list build (if not perpetual)
+
+  if (!avg_flag) neighbor->build_one(list);
+
+  inum = list->inum + list->gnum;
   ilist = list->ilist;
   numneigh = list->numneigh;
   firstneigh = list->firstneigh;
diff --git a/src/USER-MISC/compute_hma.cpp b/src/USER-MISC/compute_hma.cpp
index f552126f4f..d1f3e6b6f8 100644
--- a/src/USER-MISC/compute_hma.cpp
+++ b/src/USER-MISC/compute_hma.cpp
@@ -31,16 +31,16 @@ More information about HMA is available in these publications:
 A. J. Schultz, D. A. Kofke, “Comprehensive high-precision high-accuracy
 equation of state and coexistence properties for classical Lennard-Jones
 crystals and low-temperature fluid phases”, J. Chem. Phys. 149, 204508 (2018)
-https://dx.doi.org/10.1063/1.5053714
+https://doi.org/10.1063/1.5053714
 
 S. G. Moustafa, A. J. Schultz, D. A. Kofke, “Harmonically Assisted Methods for
 Computing the Free Energy of Classical Crystals by Molecular Simulation: A
 Comparative Study”, J. Chem. Theory Comput. 13, 825-834 (2017)
-https://dx.doi.org/10.1021/acs.jctc.6b01082
+https://doi.org/10.1021/acs.jctc.6b01082
 
 S. G. Moustafa, A. J. Schultz, D. A. Kofke, “Very fast averaging of thermal
 properties of crystals by molecular simulation”, Phys. Rev. E 92, 043303 (2015)
-https://dx.doi.org/10.1103/PhysRevE.92.043303
+https://doi.org/10.1103/PhysRevE.92.043303
 ------------------------------------------------------------------------- */
 
 #include <cmath>
diff --git a/src/USER-MISC/compute_stress_mop.cpp b/src/USER-MISC/compute_stress_mop.cpp
index 2f932321e1..c403ed3247 100644
--- a/src/USER-MISC/compute_stress_mop.cpp
+++ b/src/USER-MISC/compute_stress_mop.cpp
@@ -318,7 +318,7 @@ void ComputeStressMop::compute_pairs()
 
           if (newton_pair || j < nlocal) {
 
-            //check if ij pair is accross plane, add contribution to pressure
+            //check if ij pair is across plane, add contribution to pressure
             if ( ((xi[dir]>pos) && (xj[dir]<pos)) || ((xi[dir]>pos1) && (xj[dir]<pos1)) ) {
 
               pair->single(i,j,itype,jtype,rsq,factor_coul,factor_lj,fpair);
diff --git a/src/USER-MISC/compute_stress_mop_profile.cpp b/src/USER-MISC/compute_stress_mop_profile.cpp
index 5f6d0a36b2..9649a61090 100644
--- a/src/USER-MISC/compute_stress_mop_profile.cpp
+++ b/src/USER-MISC/compute_stress_mop_profile.cpp
@@ -333,7 +333,7 @@ void ComputeStressMopProfile::compute_pairs()
               pos = coord[ibin][0];
               pos1 = coordp[ibin][0];
 
-              //check if ij pair is accross plane, add contribution to pressure
+              //check if ij pair is across plane, add contribution to pressure
 
               if ( ((xi[dir]>pos) && (xj[dir]<pos))
                    || ((xi[dir]>pos1) && (xj[dir]<pos1)) ) {
@@ -360,7 +360,7 @@ void ComputeStressMopProfile::compute_pairs()
               pos = coord[ibin][0];
               pos1 = coordp[ibin][0];
 
-              //check if ij pair is accross plane, add contribution to pressure
+              //check if ij pair is across plane, add contribution to pressure
 
               if ( ((xi[dir]>pos) && (xj[dir]<pos))
                    || ((xi[dir]>pos1) && (xj[dir]<pos1)) ) {
diff --git a/src/USER-MISC/dihedral_table.cpp b/src/USER-MISC/dihedral_table.cpp
index a14c3d9d79..7478f70aa9 100644
--- a/src/USER-MISC/dihedral_table.cpp
+++ b/src/USER-MISC/dihedral_table.cpp
@@ -1152,7 +1152,7 @@ void DihedralTable::read_table(Table *tb, char *file, char *keyword)
       if (! line_ss) {
         stringstream err_msg;
         err_msg << "Read error in table "<< keyword<<", near line "<<i+1<<"\n"
-                << "   (Check to make sure the number of colums is correct.)";
+                << "   (Check to make sure the number of columns is correct.)";
         if ((! tb->f_unspecified) && (i==0))
           err_msg << "\n   (This sometimes occurs if users forget to specify the \"NOF\" option.)\n";
         error->one(FLERR, err_msg.str().c_str());
diff --git a/src/USER-MISC/dihedral_table_cut.cpp b/src/USER-MISC/dihedral_table_cut.cpp
index 8d530253c2..194c25f536 100644
--- a/src/USER-MISC/dihedral_table_cut.cpp
+++ b/src/USER-MISC/dihedral_table_cut.cpp
@@ -1140,7 +1140,7 @@ void DihedralTableCut::read_table(Table *tb, char *file, char *keyword)
       if (! line_ss) {
         stringstream err_msg;
         err_msg << "Read error in table "<< keyword<<", near line "<<i+1<<"\n"
-                << "   (Check to make sure the number of colums is correct.)";
+                << "   (Check to make sure the number of columns is correct.)";
         if ((! tb->f_unspecified) && (i==0))
           err_msg << "\n   (This sometimes occurs if users forget to specify the \"NOF\" option.)\n";
         error->one(FLERR, err_msg.str().c_str());
diff --git a/src/USER-MISC/fix_filter_corotate.cpp b/src/USER-MISC/fix_filter_corotate.cpp
index bfc5f58f93..52e979d32c 100644
--- a/src/USER-MISC/fix_filter_corotate.cpp
+++ b/src/USER-MISC/fix_filter_corotate.cpp
@@ -54,7 +54,7 @@ static const char cite_filter_corotate[] =
   " Year = {2017},\n"
   " Pages = {180 - 198},\n"
   " Volume = {333},\n\n"
-  " Doi = {http://dx.doi.org/10.1016/j.jcp.2016.12.024},\n"
+  " Doi = {https://doi.org/10.1016/j.jcp.2016.12.024},\n"
   " ISSN = {0021-9991},\n"
   " Keywords = {Mollified impulse method},\n"
   " Url = {http://www.sciencedirect.com/science/article/pii/S0021999116306787}\n"
diff --git a/src/USER-MISC/fix_flow_gauss.cpp b/src/USER-MISC/fix_flow_gauss.cpp
index 70be1f1e45..c7b7f86d37 100644
--- a/src/USER-MISC/fix_flow_gauss.cpp
+++ b/src/USER-MISC/fix_flow_gauss.cpp
@@ -37,7 +37,7 @@ static const char cite_flow_gauss[] =
   "title = {The Dynamics of Water in Porous Two-Dimensional Crystals},\n"
   "volume = {121},\n"
   "number = {1},\n"
-  "url = {http://dx.doi.org/10.1021/acs.jpcb.6b09387},\n"
+  "url = {https://doi.org/10.1021/acs.jpcb.6b09387},\n"
   "doi = {10.1021/acs.jpcb.6b09387},\n"
   "urldate = {2016-12-07},\n"
   "journal = {J. Phys. Chem. B},\n"
@@ -188,7 +188,7 @@ void FixFlowGauss::post_force(int /*vflag*/)
   for (ii=0; ii<3; ii++)
     a_app[ii] = -f_tot[ii] / mTot;
 
-  //apply added accelleration to each atom
+  //apply added acceleration to each atom
   double f_app[3];
   double peAdded=0.0;
   for( ii = 0; ii<nlocal; ii++)
diff --git a/src/USER-MISC/fix_grem.cpp b/src/USER-MISC/fix_grem.cpp
index 4272740068..9600cce90e 100644
--- a/src/USER-MISC/fix_grem.cpp
+++ b/src/USER-MISC/fix_grem.cpp
@@ -11,8 +11,8 @@
    See the README file in the top-level LAMMPS directory.
 
    Force scaling fix for gREM.
-   Cite: http://dx.doi.org/10.1063/1.3432176
-   Cite: http://dx.doi.org/10.1021/acs.jpcb.5b07614
+   Cite: https://doi.org/10.1063/1.3432176
+   Cite: https://doi.org/10.1021/acs.jpcb.5b07614
 
 ------------------------------------------------------------------------- */
 
diff --git a/src/USER-MISC/fix_ipi.cpp b/src/USER-MISC/fix_ipi.cpp
index 08b39ee89b..74e757c2e9 100644
--- a/src/USER-MISC/fix_ipi.cpp
+++ b/src/USER-MISC/fix_ipi.cpp
@@ -107,7 +107,7 @@ static void open_socket(int &sockfd, int inet, int port, char* host,
   } else {  // creates a unix socket
     struct sockaddr_un serv_addr;
 
-    // fills up details of the socket addres
+    // fills up details of the socket address
     memset(&serv_addr, 0, sizeof(serv_addr));
     serv_addr.sun_family = AF_UNIX;
     strcpy(serv_addr.sun_path, "/tmp/ipi_");
diff --git a/src/USER-MISC/fix_pimd.cpp b/src/USER-MISC/fix_pimd.cpp
index 8f790f0a59..73e1ff434c 100644
--- a/src/USER-MISC/fix_pimd.cpp
+++ b/src/USER-MISC/fix_pimd.cpp
@@ -57,7 +57,7 @@ FixPIMD::FixPIMD(LAMMPS *lmp, int narg, char **arg) : Fix(lmp, narg, arg)
       if(strcmp(arg[i+1],"pimd")==0) method=PIMD;
       else if(strcmp(arg[i+1],"nmpimd")==0) method=NMPIMD;
       else if(strcmp(arg[i+1],"cmd")==0) method=CMD;
-      else error->universe_all(FLERR,"Unkown method parameter for fix pimd");
+      else error->universe_all(FLERR,"Unknown method parameter for fix pimd");
     }
     else if(strcmp(arg[i],"fmass")==0)
     {
@@ -79,7 +79,7 @@ FixPIMD::FixPIMD(LAMMPS *lmp, int narg, char **arg) : Fix(lmp, narg, arg)
       nhc_nchain = atoi(arg[i+1]);
       if(nhc_nchain<2) error->universe_all(FLERR,"Invalid nhc value for fix pimd");
     }
-    else error->universe_all(arg[i],i+1,"Unkown keyword for fix pimd");
+    else error->universe_all(arg[i],i+1,"Unknown keyword for fix pimd");
   }
 
   /* Initiation */
diff --git a/src/USER-MISC/fix_pimd.h b/src/USER-MISC/fix_pimd.h
index c298af0b69..bed5b0a256 100644
--- a/src/USER-MISC/fix_pimd.h
+++ b/src/USER-MISC/fix_pimd.h
@@ -61,7 +61,7 @@ class FixPIMD : public Fix {
 
   void spring_force();
 
-  /* fictious mass */
+  /* fictitious mass */
 
   double fmass, *mass;
 
diff --git a/src/USER-MISC/fix_wall_reflect_stochastic.cpp b/src/USER-MISC/fix_wall_reflect_stochastic.cpp
index bb6ffd7698..18bb7ec011 100644
--- a/src/USER-MISC/fix_wall_reflect_stochastic.cpp
+++ b/src/USER-MISC/fix_wall_reflect_stochastic.cpp
@@ -71,7 +71,7 @@ FixWallReflectStochastic(LAMMPS *lmp, int narg, char **arg) :
 
 
   seedfix = force->inumeric(FLERR,arg[4]);
-  if (seedfix <= 0) error->all(FLERR,"Random seed must be a postive number");
+  if (seedfix <= 0) error->all(FLERR,"Random seed must be a positive number");
 
   int iarg = 5;
   while (iarg < narg) {
@@ -114,7 +114,7 @@ FixWallReflectStochastic(LAMMPS *lmp, int narg, char **arg) :
         if ((wallvel[nwall][dir] !=0) & (dir == dim))
           error->all(FLERR,"The wall velocity must be tangential");
 
-        // DIFFUSIVE = no accomodation coeffs
+        // DIFFUSIVE = no accommodation coeffs
         // MAXWELL = one for all dimensions
         // CCL = one for each dimension
 
diff --git a/src/USER-MISC/pair_cosine_squared.cpp b/src/USER-MISC/pair_cosine_squared.cpp
index 7c0cb3372d..7f3f6259d4 100644
--- a/src/USER-MISC/pair_cosine_squared.cpp
+++ b/src/USER-MISC/pair_cosine_squared.cpp
@@ -180,7 +180,7 @@ void PairCosineSquared::coeff(int narg, char **arg)
 }
 
 /* ----------------------------------------------------------------------
-   init specific to this pair style (unneccesary)
+   init specific to this pair style (unnecessary)
 ------------------------------------------------------------------------- */
 
 /*
diff --git a/src/USER-MISC/pair_coul_shield.cpp b/src/USER-MISC/pair_coul_shield.cpp
index 980b4a71d5..e6916f0d22 100644
--- a/src/USER-MISC/pair_coul_shield.cpp
+++ b/src/USER-MISC/pair_coul_shield.cpp
@@ -102,7 +102,7 @@ void PairCoulShield::compute(int eflag, int vflag)
       rsq = delx*delx + dely*dely + delz*delz;
       jtype = type[j];
 
-      // only include the interation between different layers
+      // only include the interaction between different layers
       if (rsq < cutsq[itype][jtype] && atom->molecule[i] != atom->molecule[j]) {
         r = sqrt(rsq);
         r3 = rsq*r;
diff --git a/src/USER-MISC/pair_coul_slater_cut.cpp b/src/USER-MISC/pair_coul_slater_cut.cpp
new file mode 100644
index 0000000000..33363b869a
--- /dev/null
+++ b/src/USER-MISC/pair_coul_slater_cut.cpp
@@ -0,0 +1,187 @@
+/* ----------------------------------------------------------------------
+   LAMMPS - Large-scale Atomic/Molecular Massively Parallel Simulator
+   http://lammps.sandia.gov, Sandia National Laboratories
+   Steve Plimpton, sjplimp@sandia.gov
+
+   Copyright (2003) Sandia Corporation.  Under the terms of Contract
+   DE-AC04-94AL85000 with Sandia Corporation, the U.S. Government retains
+   certain rights in this software.  This software is distributed under
+   the GNU General Public License.
+
+   See the README file in the top-level LAMMPS directory.
+------------------------------------------------------------------------- */
+
+/* ----------------------------------------------------------------------
+ *     Contributing author:  Evangelos Voyiatzis (Royal DSM)
+ * ------------------------------------------------------------------------- */
+
+#include <cmath>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
+#include "pair_coul_slater_cut.h"
+#include "atom.h"
+#include "comm.h"
+#include "force.h"
+#include "neighbor.h"
+#include "neigh_list.h"
+#include "memory.h"
+#include "error.h"
+
+using namespace LAMMPS_NS;
+
+/* ---------------------------------------------------------------------- */
+
+PairCoulSlaterCut::PairCoulSlaterCut(LAMMPS *lmp) : PairCoulCut(lmp) {}
+
+/* ---------------------------------------------------------------------- */
+
+void PairCoulSlaterCut::compute(int eflag, int vflag)
+{
+  int i,j,ii,jj,inum,jnum,itype,jtype;
+  double qtmp,xtmp,ytmp,ztmp,delx,dely,delz,ecoul,fpair;
+  double rsq,r2inv,r,rinv,forcecoul,factor_coul,bracket_term;
+  int *ilist,*jlist,*numneigh,**firstneigh;
+
+  ecoul = 0.0;
+  if (eflag || vflag) ev_setup(eflag,vflag);
+  else evflag = vflag_fdotr = 0;
+
+  double **x = atom->x;
+  double **f = atom->f;
+  double *q = atom->q;
+  int *type = atom->type;
+  int nlocal = atom->nlocal;
+  double *special_coul = force->special_coul;
+  int newton_pair = force->newton_pair;
+  double qqrd2e = force->qqrd2e;
+
+  inum = list->inum;
+  ilist = list->ilist;
+  numneigh = list->numneigh;
+  firstneigh = list->firstneigh;
+
+  // loop over neighbors of my atoms
+
+  for (ii = 0; ii < inum; ii++) {
+    i = ilist[ii];
+    qtmp = q[i];
+    xtmp = x[i][0];
+    ytmp = x[i][1];
+    ztmp = x[i][2];
+    itype = type[i];
+    jlist = firstneigh[i];
+    jnum = numneigh[i];
+
+    for (jj = 0; jj < jnum; jj++) {
+      j = jlist[jj];
+      factor_coul = special_coul[sbmask(j)];
+      j &= NEIGHMASK;
+
+      delx = xtmp - x[j][0];
+      dely = ytmp - x[j][1];
+      delz = ztmp - x[j][2];
+      rsq = delx*delx + dely*dely + delz*delz;
+      jtype = type[j];
+
+      if (rsq < cutsq[itype][jtype]) {
+        r2inv = 1.0/rsq;
+        r = sqrt(rsq);
+        rinv = 1.0/r;
+        bracket_term = 1 - exp(-2*r/lamda)*(1 + (2*r/lamda*(1+r/lamda)));
+        forcecoul = qqrd2e * scale[itype][jtype] *
+          qtmp*q[j] * bracket_term * rinv;
+        fpair = factor_coul*forcecoul * r2inv;
+
+        f[i][0] += delx*fpair;
+        f[i][1] += dely*fpair;
+        f[i][2] += delz*fpair;
+        if (newton_pair || j < nlocal) {
+          f[j][0] -= delx*fpair;
+          f[j][1] -= dely*fpair;
+          f[j][2] -= delz*fpair;
+        }
+
+        if (eflag) ecoul = factor_coul * qqrd2e *
+            scale[itype][jtype] * qtmp*q[j] * rinv *
+            (1 - (1 + r/lamda)*exp(-2*r/lamda));
+
+        if (evflag) ev_tally(i,j,nlocal,newton_pair,
+                             0.0,ecoul,fpair,delx,dely,delz);
+      }
+    }
+  }
+
+  if (vflag_fdotr) virial_fdotr_compute();
+}
+
+/* ----------------------------------------------------------------------
+   global settings
+------------------------------------------------------------------------- */
+
+void PairCoulSlaterCut::settings(int narg, char **arg)
+{
+  if (narg != 2) error->all(FLERR,"Illegal pair_style command");
+
+  lamda = force->numeric(FLERR,arg[0]);
+  cut_global = force->numeric(FLERR,arg[1]);
+
+  // reset cutoffs that have been explicitly set
+
+  if (allocated) {
+    int i,j;
+    for (i = 1; i <= atom->ntypes; i++)
+      for (j = i; j <= atom->ntypes; j++)
+        if (setflag[i][j]) cut[i][j] = cut_global;
+  }
+}
+
+/* ----------------------------------------------------------------------
+  proc 0 writes to restart file
+------------------------------------------------------------------------- */
+
+void PairCoulSlaterCut::write_restart_settings(FILE *fp)
+{
+  fwrite(&cut_global,sizeof(double),1,fp);
+  fwrite(&lamda,sizeof(double),1,fp);
+  fwrite(&offset_flag,sizeof(int),1,fp);
+  fwrite(&mix_flag,sizeof(int),1,fp);
+}
+
+/* ----------------------------------------------------------------------
+  proc 0 reads from restart file, bcasts
+------------------------------------------------------------------------- */
+
+void PairCoulSlaterCut::read_restart_settings(FILE *fp)
+{
+  if (comm->me == 0) {
+    fread(&cut_global,sizeof(double),1,fp);
+    fread(&lamda,sizeof(double),1,fp);
+    fread(&offset_flag,sizeof(int),1,fp);
+    fread(&mix_flag,sizeof(int),1,fp);
+  }
+  MPI_Bcast(&cut_global,1,MPI_DOUBLE,0,world);
+  MPI_Bcast(&lamda,1,MPI_DOUBLE,0,world);
+  MPI_Bcast(&offset_flag,1,MPI_INT,0,world);
+  MPI_Bcast(&mix_flag,1,MPI_INT,0,world);
+}
+
+/* ---------------------------------------------------------------------- */
+
+double PairCoulSlaterCut::single(int i, int j, int /*itype*/, int /*jtype*/,
+                           double rsq, double factor_coul, double /*factor_lj*/,
+                           double &fforce)
+{
+  double r2inv,r,rinv,forcecoul,phicoul,bracket_term;
+
+  r2inv = 1.0/rsq;
+  r = sqrt(rsq);
+  rinv = 1.0/r;
+  bracket_term = 1 - exp(-2*r/lamda)*(1 + (2*r/lamda*(1+r/lamda)));
+  forcecoul = force->qqrd2e * atom->q[i]*atom->q[j] *
+     bracket_term * rinv;
+  fforce = factor_coul*forcecoul * r2inv;
+
+  phicoul = force->qqrd2e * atom->q[i]*atom->q[j] * rinv * (1 - (1 + r/lamda)*exp(-2*r/lamda));
+  return factor_coul*phicoul;
+}
diff --git a/src/USER-MISC/pair_coul_slater_cut.h b/src/USER-MISC/pair_coul_slater_cut.h
new file mode 100644
index 0000000000..fbf5f61f0f
--- /dev/null
+++ b/src/USER-MISC/pair_coul_slater_cut.h
@@ -0,0 +1,53 @@
+/* -*- c++ -*- ----------------------------------------------------------
+   LAMMPS - Large-scale Atomic/Molecular Massively Parallel Simulator
+   http://lammps.sandia.gov, Sandia National Laboratories
+   Steve Plimpton, sjplimp@sandia.gov
+
+   Copyright (2003) Sandia Corporation.  Under the terms of Contract
+   DE-AC04-94AL85000 with Sandia Corporation, the U.S. Government retains
+   certain rights in this software.  This software is distributed under
+   the GNU General Public License.
+
+   See the README file in the top-level LAMMPS directory.
+------------------------------------------------------------------------- */
+
+#ifdef PAIR_CLASS
+
+PairStyle(coul/slater/cut,PairCoulSlaterCut)
+
+#else
+
+#ifndef LMP_PAIR_COUL_SLATER_CUT_H
+#define LMP_PAIR_COUL_SLATER_CUT_H
+
+#include "pair_coul_cut.h"
+
+namespace LAMMPS_NS {
+
+class PairCoulSlaterCut : public PairCoulCut {
+ public:
+  PairCoulSlaterCut(class LAMMPS *);
+  virtual void compute(int, int);
+  void settings(int, char **);
+  void write_restart_settings(FILE *);
+  void read_restart_settings(FILE *);
+  double single(int, int, int, int, double, double, double, double &);
+
+ protected:
+  double lamda;
+};
+
+}
+
+#endif
+#endif
+
+/* ERROR/WARNING messages:
+
+E: Illegal ... command
+
+Self-explanatory.  Check the input script syntax and compare to the
+documentation for the command.  You can use -echo screen as a
+command-line option when running LAMMPS to see the offending line.
+
+*/
diff --git a/src/USER-MISC/pair_coul_slater_long.cpp b/src/USER-MISC/pair_coul_slater_long.cpp
new file mode 100644
index 0000000000..f5b7461db7
--- /dev/null
+++ b/src/USER-MISC/pair_coul_slater_long.cpp
@@ -0,0 +1,422 @@
+/* ----------------------------------------------------------------------
+   LAMMPS - Large-scale Atomic/Molecular Massively Parallel Simulator
+   http://lammps.sandia.gov, Sandia National Laboratories
+   Steve Plimpton, sjplimp@sandia.gov
+
+   Copyright (2003) Sandia Corporation.  Under the terms of Contract
+   DE-AC04-94AL85000 with Sandia Corporation, the U.S. Government retains
+   certain rights in this software.  This software is distributed under
+   the GNU General Public License.
+
+   See the README file in the top-level LAMMPS directory.
+------------------------------------------------------------------------- */
+
+/* ----------------------------------------------------------------------
+ *     Contributing author:  Evangelos Voyiatzis (Royal DSM)
+ * ------------------------------------------------------------------------- */
+
+#include <cmath>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
+#include "pair_coul_slater_long.h"
+#include "atom.h"
+#include "comm.h"
+#include "force.h"
+#include "kspace.h"
+#include "neighbor.h"
+#include "neigh_list.h"
+#include "update.h"
+#include "integrate.h"
+#include "respa.h"
+#include "memory.h"
+#include "error.h"
+
+using namespace LAMMPS_NS;
+
+#define EWALD_F   1.12837917
+#define EWALD_P   0.3275911
+#define A1        0.254829592
+#define A2       -0.284496736
+#define A3        1.421413741
+#define A4       -1.453152027
+#define A5        1.061405429
+
+/* ---------------------------------------------------------------------- */
+
+PairCoulSlaterLong::PairCoulSlaterLong(LAMMPS *lmp) : Pair(lmp)
+{
+  ewaldflag = pppmflag = 1;
+  //ftable = NULL;
+  qdist = 0.0;
+}
+
+/* ---------------------------------------------------------------------- */
+
+PairCoulSlaterLong::~PairCoulSlaterLong()
+{
+  if (!copymode) {
+    if (allocated) {
+      memory->destroy(setflag);
+      memory->destroy(cutsq);
+
+      memory->destroy(scale);
+    }
+    //if (ftable) free_tables();
+  }
+}
+
+/* ---------------------------------------------------------------------- */
+
+void PairCoulSlaterLong::compute(int eflag, int vflag)
+{
+  int i,j,ii,jj,inum,jnum,itype,jtype;
+  double qtmp,xtmp,ytmp,ztmp,delx,dely,delz,ecoul,fpair;
+//  double fraction,table;
+  double r,r2inv,forcecoul,factor_coul;
+  double grij,expm2,prefactor,t,erfc;
+  int *ilist,*jlist,*numneigh,**firstneigh;
+  double rsq;
+  double slater_term;
+//  int itable;
+
+  ecoul = 0.0;
+  if (eflag || vflag) ev_setup(eflag,vflag);
+  else evflag = vflag_fdotr = 0;
+
+  double **x = atom->x;
+  double **f = atom->f;
+  double *q = atom->q;
+  int *type = atom->type;
+  int nlocal = atom->nlocal;
+  double *special_coul = force->special_coul;
+  int newton_pair = force->newton_pair;
+  double qqrd2e = force->qqrd2e;
+
+  inum = list->inum;
+  ilist = list->ilist;
+  numneigh = list->numneigh;
+  firstneigh = list->firstneigh;
+
+  // loop over neighbors of my atoms
+
+  for (ii = 0; ii < inum; ii++) {
+    i = ilist[ii];
+    qtmp = q[i];
+    xtmp = x[i][0];
+    ytmp = x[i][1];
+    ztmp = x[i][2];
+    itype = type[i];
+    jlist = firstneigh[i];
+    jnum = numneigh[i];
+
+    for (jj = 0; jj < jnum; jj++) {
+      j = jlist[jj];
+      factor_coul = special_coul[sbmask(j)];
+      j &= NEIGHMASK;
+
+      delx = xtmp - x[j][0];
+      dely = ytmp - x[j][1];
+      delz = ztmp - x[j][2];
+      rsq = delx*delx + dely*dely + delz*delz;
+      jtype = type[j];
+
+      if (rsq < cut_coulsq) {
+        r2inv = 1.0/rsq;
+//        if (!ncoultablebits || rsq <= tabinnersq) {
+          r = sqrt(rsq);
+          grij = g_ewald * r;
+          expm2 = exp(-grij*grij);
+          t = 1.0 / (1.0 + EWALD_P*grij);
+          erfc = t * (A1+t*(A2+t*(A3+t*(A4+t*A5)))) * expm2;
+          slater_term = exp(-2*r/lamda)*(1 + (2*r/lamda*(1+r/lamda)));
+          prefactor = qqrd2e * scale[itype][jtype] * qtmp*q[j]/r;
+          forcecoul = prefactor * (erfc + EWALD_F*grij*expm2 - slater_term);
+          if (factor_coul < 1.0) forcecoul -= (1.0-factor_coul)*prefactor;
+/*
+        } else {
+          union_int_float_t rsq_lookup;
+          rsq_lookup.f = rsq;
+          itable = rsq_lookup.i & ncoulmask;
+          itable >>= ncoulshiftbits;
+          fraction = (rsq_lookup.f - rtable[itable]) * drtable[itable];
+          table = ftable[itable] + fraction*dftable[itable];
+          forcecoul = scale[itype][jtype] * qtmp*q[j] * table;
+          if (factor_coul < 1.0) {
+            table = ctable[itable] + fraction*dctable[itable];
+            prefactor = scale[itype][jtype] * qtmp*q[j] * table;
+            forcecoul -= (1.0-factor_coul)*prefactor;
+          }
+        }
+*/
+
+        fpair = forcecoul * r2inv;
+
+        f[i][0] += delx*fpair;
+        f[i][1] += dely*fpair;
+        f[i][2] += delz*fpair;
+        if (newton_pair || j < nlocal) {
+          f[j][0] -= delx*fpair;
+          f[j][1] -= dely*fpair;
+          f[j][2] -= delz*fpair;
+        }
+
+        if (eflag) {
+//          if (!ncoultablebits || rsq <= tabinnersq)
+            ecoul = prefactor*(erfc - (1 + r/lamda)*exp(-2*r/lamda));
+/*
+          else {
+            table = etable[itable] + fraction*detable[itable];
+            ecoul = scale[itype][jtype] * qtmp*q[j] * table;
+          }
+*/
+          if (factor_coul < 1.0) ecoul -= (1.0-factor_coul)*prefactor;
+        }
+
+        if (evflag) ev_tally(i,j,nlocal,newton_pair,
+                             0.0,ecoul,fpair,delx,dely,delz);
+      }
+    }
+  }
+
+  if (vflag_fdotr) virial_fdotr_compute();
+}
+
+/* ----------------------------------------------------------------------
+   allocate all arrays
+------------------------------------------------------------------------- */
+
+void PairCoulSlaterLong::allocate()
+{
+  allocated = 1;
+  int n = atom->ntypes;
+
+  memory->create(setflag,n+1,n+1,"pair:setflag");
+  for (int i = 1; i <= n; i++)
+    for (int j = i; j <= n; j++)
+      setflag[i][j] = 0;
+
+  memory->create(cutsq,n+1,n+1,"pair:cutsq");
+
+  memory->create(scale,n+1,n+1,"pair:scale");
+}
+
+/* ----------------------------------------------------------------------
+   global settings
+------------------------------------------------------------------------- */
+
+void PairCoulSlaterLong::settings(int narg, char **arg)
+{
+  if (narg != 2) error->all(FLERR,"Illegal pair_style command");
+
+  lamda = force->numeric(FLERR,arg[0]);
+  cut_coul = force->numeric(FLERR,arg[1]);
+}
+
+/* ----------------------------------------------------------------------
+   set coeffs for one or more type pairs
+------------------------------------------------------------------------- */
+
+void PairCoulSlaterLong::coeff(int narg, char **arg)
+{
+  if (narg != 2) error->all(FLERR,"Incorrect args for pair coefficients");
+  if (!allocated) allocate();
+
+  int ilo,ihi,jlo,jhi;
+  force->bounds(FLERR,arg[0],atom->ntypes,ilo,ihi);
+  force->bounds(FLERR,arg[1],atom->ntypes,jlo,jhi);
+
+  int count = 0;
+  for (int i = ilo; i <= ihi; i++) {
+    for (int j = MAX(jlo,i); j <= jhi; j++) {
+      scale[i][j] = 1.0;
+      setflag[i][j] = 1;
+      count++;
+    }
+  }
+
+  if (count == 0) error->all(FLERR,"Incorrect args for pair coefficients");
+}
+
+/* ----------------------------------------------------------------------
+   init specific to this pair style
+------------------------------------------------------------------------- */
+
+void PairCoulSlaterLong::init_style()
+{
+  if (!atom->q_flag)
+    error->all(FLERR,"Pair style coul/slater/long requires atom attribute q");
+
+  neighbor->request(this,instance_me);
+
+  cut_coulsq = cut_coul * cut_coul;
+
+  // insure use of KSpace long-range solver, set g_ewald
+
+ if (force->kspace == NULL)
+    error->all(FLERR,"Pair style requires a KSpace style");
+  g_ewald = force->kspace->g_ewald;
+
+  // setup force tables
+
+  // if (ncoultablebits) init_tables(cut_coul,NULL);
+}
+
+/* ----------------------------------------------------------------------
+   init for one type pair i,j and corresponding j,i
+------------------------------------------------------------------------- */
+
+double PairCoulSlaterLong::init_one(int i, int j)
+{
+  scale[j][i] = scale[i][j];
+  return cut_coul+2.0*qdist;
+}
+
+/* ----------------------------------------------------------------------
+  proc 0 writes to restart file
+------------------------------------------------------------------------- */
+
+void PairCoulSlaterLong::write_restart(FILE *fp)
+{
+  write_restart_settings(fp);
+
+  for (int i = 1; i <= atom->ntypes; i++)
+    for (int j = i; j <= atom->ntypes; j++) {
+      fwrite(&setflag[i][j],sizeof(int),1,fp);
+      if (setflag[i][j])
+        fwrite(&scale[i][j],sizeof(double),1,fp);
+    }
+}
+
+/* ----------------------------------------------------------------------
+  proc 0 reads from restart file, bcasts
+------------------------------------------------------------------------- */
+
+void PairCoulSlaterLong::read_restart(FILE *fp)
+{
+  read_restart_settings(fp);
+
+  allocate();
+
+  int i,j;
+  int me = comm->me;
+  for (i = 1; i <= atom->ntypes; i++)
+    for (j = i; j <= atom->ntypes; j++) {
+      if (me == 0) fread(&setflag[i][j],sizeof(int),1,fp);
+      MPI_Bcast(&setflag[i][j],1,MPI_INT,0,world);
+      if (setflag[i][j]) {
+        if (me == 0) fread(&scale[i][j],sizeof(double),1,fp);
+        MPI_Bcast(&scale[i][j],1,MPI_DOUBLE,0,world);
+      }
+    }
+}
+
+/* ----------------------------------------------------------------------
+  proc 0 writes to restart file
+------------------------------------------------------------------------- */
+
+void PairCoulSlaterLong::write_restart_settings(FILE *fp)
+{
+  fwrite(&cut_coul,sizeof(double),1,fp);
+  fwrite(&lamda,sizeof(double),1,fp);
+  fwrite(&offset_flag,sizeof(int),1,fp);
+  fwrite(&mix_flag,sizeof(int),1,fp);
+  //fwrite(&ncoultablebits,sizeof(int),1,fp);
+  //fwrite(&tabinner,sizeof(double),1,fp);
+}
+
+/* ----------------------------------------------------------------------
+  proc 0 reads from restart file, bcasts
+------------------------------------------------------------------------- */
+
+void PairCoulSlaterLong::read_restart_settings(FILE *fp)
+{
+  if (comm->me == 0) {
+    fread(&cut_coul,sizeof(double),1,fp);
+    fread(&lamda,sizeof(double),1,fp);
+    fread(&offset_flag,sizeof(int),1,fp);
+    fread(&mix_flag,sizeof(int),1,fp);
+    //fread(&ncoultablebits,sizeof(int),1,fp);
+    //fread(&tabinner,sizeof(double),1,fp);
+  }
+  MPI_Bcast(&cut_coul,1,MPI_DOUBLE,0,world);
+  MPI_Bcast(&lamda,1,MPI_DOUBLE,0,world);
+  MPI_Bcast(&offset_flag,1,MPI_INT,0,world);
+  MPI_Bcast(&mix_flag,1,MPI_INT,0,world);
+  //MPI_Bcast(&ncoultablebits,1,MPI_INT,0,world);
+  //MPI_Bcast(&tabinner,1,MPI_DOUBLE,0,world);
+}
+
+/* ---------------------------------------------------------------------- */
+
+double PairCoulSlaterLong::single(int i, int j, int /*itype*/, int /*jtype*/,
+                            double rsq,
+                            double factor_coul, double /*factor_lj*/,
+                            double &fforce)
+{
+  double r2inv,r,grij,expm2,t,erfc,prefactor;
+  double slater_term;
+//  double fraction,table;
+  double forcecoul,phicoul;
+//  int itable;
+
+  r2inv = 1.0/rsq;
+//  if (!ncoultablebits || rsq <= tabinnersq) {
+    r = sqrt(rsq);
+    grij = g_ewald * r;
+    expm2 = exp(-grij*grij);
+    t = 1.0 / (1.0 + EWALD_P*grij);
+    erfc = t * (A1+t*(A2+t*(A3+t*(A4+t*A5)))) * expm2;
+    slater_term = exp(-2*r/lamda)*(1 + (2*r/lamda*(1+r/lamda)));
+    prefactor = force->qqrd2e * atom->q[i]*atom->q[j]/r;
+    forcecoul = prefactor * (erfc + EWALD_F*grij*expm2 - slater_term);
+    if (factor_coul < 1.0) forcecoul -= (1.0-factor_coul)*prefactor;
+/*
+  } else {
+    union_int_float_t rsq_lookup;
+    rsq_lookup.f = rsq;
+    itable = rsq_lookup.i & ncoulmask;
+    itable >>= ncoulshiftbits;
+    fraction = (rsq_lookup.f - rtable[itable]) * drtable[itable];
+    table = ftable[itable] + fraction*dftable[itable];
+    forcecoul = atom->q[i]*atom->q[j] * table;
+    if (factor_coul < 1.0) {
+      table = ctable[itable] + fraction*dctable[itable];
+      prefactor = atom->q[i]*atom->q[j] * table;
+      forcecoul -= (1.0-factor_coul)*prefactor;
+    }
+  }
+*/
+  fforce = forcecoul * r2inv;
+
+//  if (!ncoultablebits || rsq <= tabinnersq)
+    phicoul = prefactor*(erfc - (1 + r/lamda)*exp(-2*r/lamda));
+/*
+  else {
+    table = etable[itable] + fraction*detable[itable];
+    phicoul = atom->q[i]*atom->q[j] * table;
+  }
+*/
+  if (factor_coul < 1.0) phicoul -= (1.0-factor_coul)*prefactor;
+
+  return phicoul;
+}
+
+/* ---------------------------------------------------------------------- */
+
+void *PairCoulSlaterLong::extract(const char *str, int &dim)
+{
+  if (strcmp(str,"cut_coul") == 0) {
+    dim = 0;
+    return (void *) &cut_coul;
+  }
+  if (strcmp(str,"lamda") == 0) {
+    dim = 0;
+    return (void *) &lamda;
+  }
+  if (strcmp(str,"scale") == 0) {
+    dim = 2;
+    return (void *) scale;
+  }
+  return NULL;
+}
diff --git a/src/USER-MISC/pair_coul_slater_long.h b/src/USER-MISC/pair_coul_slater_long.h
new file mode 100644
index 0000000000..267a10862e
--- /dev/null
+++ b/src/USER-MISC/pair_coul_slater_long.h
@@ -0,0 +1,78 @@
+/* -*- c++ -*- ----------------------------------------------------------
+   LAMMPS - Large-scale Atomic/Molecular Massively Parallel Simulator
+   http://lammps.sandia.gov, Sandia National Laboratories
+   Steve Plimpton, sjplimp@sandia.gov
+
+   Copyright (2003) Sandia Corporation.  Under the terms of Contract
+   DE-AC04-94AL85000 with Sandia Corporation, the U.S. Government retains
+   certain rights in this software.  This software is distributed under
+   the GNU General Public License.
+
+   See the README file in the top-level LAMMPS directory.
+------------------------------------------------------------------------- */
+
+#ifdef PAIR_CLASS
+
+PairStyle(coul/slater/long,PairCoulSlaterLong)
+
+#else
+
+#ifndef LMP_PAIR_COUL_SLATER_LONG_H
+#define LMP_PAIR_COUL_SLATER_LONG_H
+
+#include "pair.h"
+
+namespace LAMMPS_NS {
+
+class PairCoulSlaterLong : public Pair {
+ public:
+  PairCoulSlaterLong(class LAMMPS *);
+  ~PairCoulSlaterLong();
+  virtual void compute(int, int);
+  virtual void settings(int, char **);
+  void coeff(int, char **);
+  virtual void init_style();
+  virtual double init_one(int, int);
+  void write_restart(FILE *);
+  void read_restart(FILE *);
+  virtual void write_restart_settings(FILE *);
+  virtual void read_restart_settings(FILE *);
+  virtual double single(int, int, int, int, double, double, double, double &);
+  virtual void *extract(const char *, int &);
+
+ protected:
+  double cut_coul,cut_coulsq,qdist;
+  double lamda;
+  //double *cut_respa;
+  double g_ewald;
+  double **scale;
+
+  virtual void allocate();
+};
+
+}
+
+#endif
+#endif
+
+/* ERROR/WARNING messages:
+
+E: Illegal ... command
+
+Self-explanatory.  Check the input script syntax and compare to the
+documentation for the command.  You can use -echo screen as a
+command-line option when running LAMMPS to see the offending line.
+
+E: Incorrect args for pair coefficients
+
+Self-explanatory.  Check the input script or data file.
+
+E: Pair style coul/slater/long requires atom attribute q
+
+The atom style defined does not have this attribute.
+
+E: Pair style requires a KSpace style
+
+No kspace style is defined.
+
+*/
diff --git a/src/USER-MISC/pair_drip.cpp b/src/USER-MISC/pair_drip.cpp
index 20ec3abcf9..020216f503 100644
--- a/src/USER-MISC/pair_drip.cpp
+++ b/src/USER-MISC/pair_drip.cpp
@@ -405,7 +405,7 @@ void PairDRIP::compute(int eflag, int vflag)
       Param& p = params[iparam_ij];
       double rcutsq = p.rcutsq;
 
-      // only include the interation between different layers
+      // only include the interaction between different layers
       if (rsq < rcutsq && atom->molecule[i] != atom->molecule[j]) {
 
         double fj[DIM] = {0., 0., 0.};
diff --git a/src/USER-MISC/pair_e3b.cpp b/src/USER-MISC/pair_e3b.cpp
index ae324e0a4a..46f22e714d 100644
--- a/src/USER-MISC/pair_e3b.cpp
+++ b/src/USER-MISC/pair_e3b.cpp
@@ -31,7 +31,7 @@
 #include "domain.h"
 #include "citeme.h"
 
-//these are defined here to avoid confusing hardcoded indicies, but
+//these are defined here to avoid confusing hardcoded indices, but
 //they do not allow flexibility. If they are changed the code will break
 #define DIM 3
 #define NUMH 2  //number of hydrogen atoms per water molecule
diff --git a/src/USER-MISC/pair_extep.cpp b/src/USER-MISC/pair_extep.cpp
index df232e029c..62ef24da85 100644
--- a/src/USER-MISC/pair_extep.cpp
+++ b/src/USER-MISC/pair_extep.cpp
@@ -718,7 +718,7 @@ void PairExTeP::read_file(char *file)
   // reallocate with new size
   words = new char*[params_per_line+1];
 
-  // intialize F_corr_data to all zeros
+  // initialize F_corr_data to all zeros
   for (int iel=0;iel<nelements;iel++)
     for (int jel=0;jel<nelements;jel++)
       for (int in=0;in<4;in++)
diff --git a/src/USER-MISC/pair_ilp_graphene_hbn.cpp b/src/USER-MISC/pair_ilp_graphene_hbn.cpp
index 27cbd97f2d..cf77f7e1ee 100644
--- a/src/USER-MISC/pair_ilp_graphene_hbn.cpp
+++ b/src/USER-MISC/pair_ilp_graphene_hbn.cpp
@@ -500,7 +500,7 @@ void PairILPGrapheneHBN::calc_FvdW(int eflag, int /* vflag */)
       delz = ztmp - x[j][2];
       rsq = delx*delx + dely*dely + delz*delz;
 
-      // only include the interation between different layers
+      // only include the interaction between different layers
       if (rsq < cutsq[itype][jtype] && atom->molecule[i] != atom->molecule[j]) {
 
         int iparam_ij = elem2param[map[itype]][map[jtype]];
@@ -593,7 +593,7 @@ void PairILPGrapheneHBN::calc_FRep(int eflag, int /* vflag */)
       delz = ztmp - x[j][2];
       rsq = delx*delx + dely*dely + delz*delz;
 
-      // only include the interation between different layers
+      // only include the interaction between different layers
       if (rsq < cutsq[itype][jtype] && atom->molecule[i] != atom->molecule[j]) {
 
         int iparam_ij = elem2param[map[itype]][map[jtype]];
@@ -675,7 +675,7 @@ void PairILPGrapheneHBN::calc_FRep(int eflag, int /* vflag */)
 }
 
 /* ----------------------------------------------------------------------
-   create ILP neighbor list from main neighbor list to calcualte normals
+   create ILP neighbor list from main neighbor list to calculate normals
 ------------------------------------------------------------------------- */
 
 void PairILPGrapheneHBN::ILP_neigh()
diff --git a/src/USER-MISC/pair_kolmogorov_crespi_full.cpp b/src/USER-MISC/pair_kolmogorov_crespi_full.cpp
index 92fbc4e9c0..3f624fc785 100644
--- a/src/USER-MISC/pair_kolmogorov_crespi_full.cpp
+++ b/src/USER-MISC/pair_kolmogorov_crespi_full.cpp
@@ -502,7 +502,7 @@ void PairKolmogorovCrespiFull::calc_FvdW(int eflag, int /* vflag */)
       delz = ztmp - x[j][2];
       rsq = delx*delx + dely*dely + delz*delz;
 
-      // only include the interation between different layers
+      // only include the interaction between different layers
       if (rsq < cutsq[itype][jtype] && atom->molecule[i] != atom->molecule[j]) {
 
         int iparam_ij = elem2param[map[itype]][map[jtype]];
@@ -593,7 +593,7 @@ void PairKolmogorovCrespiFull::calc_FRep(int eflag, int /* vflag */)
       delz = ztmp - x[j][2];
       rsq = delx*delx + dely*dely + delz*delz;
 
-      // only include the interation between different layers
+      // only include the interaction between different layers
       if (rsq < cutsq[itype][jtype] && atom->molecule[i] != atom->molecule[j]) {
 
         int iparam_ij = elem2param[map[itype]][map[jtype]];
diff --git a/src/USER-MISC/pair_mesocnt.cpp b/src/USER-MISC/pair_mesocnt.cpp
index b073705dda..4864dab950 100644
--- a/src/USER-MISC/pair_mesocnt.cpp
+++ b/src/USER-MISC/pair_mesocnt.cpp
@@ -866,7 +866,7 @@ void PairMesoCNT::read_data(FILE *fp, double *data,
     }
   }
 
-  // warn if data was read incompletely, e.g. colums were missing
+  // warn if data was read incompletely, e.g. columns were missing
 
   if (cerror) {
     char str[128];
@@ -934,7 +934,7 @@ void PairMesoCNT::read_data(FILE *fp, double **data,
     }
   }
 
-  // warn if data was read incompletely, e.g. colums were missing
+  // warn if data was read incompletely, e.g. columns were missing
 
   if (cerror) {
     char str[128];
diff --git a/src/USER-MISC/pair_momb.cpp b/src/USER-MISC/pair_momb.cpp
index 8786394221..010aa1e5fd 100644
--- a/src/USER-MISC/pair_momb.cpp
+++ b/src/USER-MISC/pair_momb.cpp
@@ -37,7 +37,7 @@ static const char cite_momb[] =
        " solution-phase synthesis of shape-selective Ag nanoparticles.},\n"
   "volume = {118},\n"
   "number = {6},\n"
-  "url = {http://dx.doi.org/10.1021/jp412098n},\n"
+  "url = {https://doi.org/10.1021/jp412098n},\n"
   "doi = {10.1021/jp412098n},\n"
   "journal = {J. Phys. Chem. C},\n"
   "author = {Zhou, Ya, Wissam A. Saidi, and Kristen A. Fichthorn},\n"
diff --git a/src/USER-MISC/temper_grem.cpp b/src/USER-MISC/temper_grem.cpp
index 692f78cf9f..866f923fb9 100644
--- a/src/USER-MISC/temper_grem.cpp
+++ b/src/USER-MISC/temper_grem.cpp
@@ -241,7 +241,17 @@ void TemperGrem::command(int narg, char **arg)
 
     timer->init_timeout();
     update->integrate->run(nevery);
-    if (timer->is_timeout()) break;
+
+    // check for timeout across all procs
+
+    int my_timeout=0;
+    int any_timeout=0;
+    if (timer->is_timeout()) my_timeout=1;
+    MPI_Allreduce(&my_timeout, &any_timeout, 1, MPI_INT, MPI_SUM, universe->uworld);
+    if (any_timeout) {
+      timer->force_timeout();
+      break;
+    }
 
     // compute PE
     // notify compute it will be called at next swap
diff --git a/src/USER-MISC/temper_npt.cpp b/src/USER-MISC/temper_npt.cpp
index 55c9aadc6f..d0a14d8e4d 100644
--- a/src/USER-MISC/temper_npt.cpp
+++ b/src/USER-MISC/temper_npt.cpp
@@ -220,7 +220,17 @@ void TemperNPT::command(int narg, char **arg)
 
     timer->init_timeout();
     update->integrate->run(nevery);
-    if (timer->is_timeout()) break;
+
+    // check for timeout across all procs
+
+    int my_timeout=0;
+    int any_timeout=0;
+    if (timer->is_timeout()) my_timeout=1;
+    MPI_Allreduce(&my_timeout, &any_timeout, 1, MPI_INT, MPI_SUM, universe->uworld);
+    if (any_timeout) {
+      timer->force_timeout();
+      break;
+    }
 
     // compute PE
     // notify compute it will be called at next swap
diff --git a/src/USER-OMP/msm_cg_omp.cpp b/src/USER-OMP/msm_cg_omp.cpp
index 3c5439db5d..7ca01dbd6a 100644
--- a/src/USER-OMP/msm_cg_omp.cpp
+++ b/src/USER-OMP/msm_cg_omp.cpp
@@ -199,7 +199,7 @@ void MSMCGOMP::compute(int eflag, int vflag)
   }
 
 
-  // compute direct interation for top grid level for non-periodic
+  // compute direct interaction for top grid level for non-periodic
   //   and for second from top grid level for periodic
 
   if (active_flag[levels-1]) {
diff --git a/src/USER-OMP/pair_airebo_omp.cpp b/src/USER-OMP/pair_airebo_omp.cpp
index 7890c8aed3..aedf5056a6 100644
--- a/src/USER-OMP/pair_airebo_omp.cpp
+++ b/src/USER-OMP/pair_airebo_omp.cpp
@@ -1848,9 +1848,9 @@ double PairAIREBOOMP::bondorder_thr(int i, int j, double rij[3], double rijmag,
 
 This function calculates S(t_b(b_ij*)) as specified in the AIREBO paper.
 To do so, it needs to compute b_ij*, i.e. the bondorder given that the
-atoms i and j are placed a ficticious distance rijmag_mod apart.
+atoms i and j are placed a fictitious distance rijmag_mod apart.
 Now there are two approaches to calculate the resulting forces:
-1. Carry through the ficticious distance and corresponding vector
+1. Carry through the fictitious distance and corresponding vector
    rij_mod, correcting afterwards using the derivative of r/|r|.
 2. Perform all the calculations using the real distance, and do not
    use a correction, only using rijmag_mod where necessary.
diff --git a/src/USER-OMP/pair_lj_cut_thole_long_omp.cpp b/src/USER-OMP/pair_lj_cut_thole_long_omp.cpp
index 63c5d9601a..a8f2d2a081 100644
--- a/src/USER-OMP/pair_lj_cut_thole_long_omp.cpp
+++ b/src/USER-OMP/pair_lj_cut_thole_long_omp.cpp
@@ -45,6 +45,10 @@ using namespace MathConst;
 #define B4       -5.80844129e-3
 #define B5        1.14652755e-1
 
+#define EPSILON 1.0e-20
+#define EPS_EWALD 1.0e-6
+#define EPS_EWALD_SQR 1.0e-12
+
 /* ---------------------------------------------------------------------- */
 
 PairLJCutTholeLongOMP::PairLJCutTholeLongOMP(LAMMPS *lmp) :
@@ -168,6 +172,7 @@ void PairLJCutTholeLongOMP::eval(int iifrom, int iito, ThrData * const thr)
       jtype = type[j];
 
       if (rsq < cutsqi[jtype]) {
+        rsq += EPSILON; // Add Epsilon for case: r = 0; DC-DP 1-1 interaction must be removed by special bond;
         r2inv = 1.0/rsq;
 
         if (rsq < cut_coulsq) {
@@ -175,14 +180,15 @@ void PairLJCutTholeLongOMP::eval(int iifrom, int iito, ThrData * const thr)
           r = sqrt(rsq);
 
           if (!ncoultablebits || rsq <= tabinnersq) {
-            grij = g_ewald * r;
+            grij = g_ewald * (r + EPS_EWALD);
             expm2 = exp(-grij*grij);
             t = 1.0 / (1.0 + EWALD_P*grij);
             u = 1. - t;
             erfc = t * (1.+u*(B0+u*(B1+u*(B2+u*(B3+u*(B4+u*B5)))))) * expm2;
-            prefactor = qqrd2e * qi*qj/r;
+            prefactor = qqrd2e * qi*qj/(r + EPS_EWALD);
             forcecoul = prefactor * (erfc + EWALD_F*grij*expm2);
             if (factor_coul < 1.0) forcecoul -= (1.0-factor_coul)*prefactor;
+            r2inv = 1.0/(rsq + EPS_EWALD_SQR);
           } else {
             union_int_float_t rsq_lookup;
             rsq_lookup.f = rsq;
diff --git a/src/USER-OMP/pair_lj_long_tip4p_long_omp.cpp b/src/USER-OMP/pair_lj_long_tip4p_long_omp.cpp
index 7735d6fde4..d8eedc6c0b 100644
--- a/src/USER-OMP/pair_lj_long_tip4p_long_omp.cpp
+++ b/src/USER-OMP/pair_lj_long_tip4p_long_omp.cpp
@@ -66,7 +66,7 @@ void PairLJLongTIP4PLongOMP::compute(int eflag, int vflag)
   ev_init(eflag,vflag);
 
   // reallocate hneigh_thr & newsite_thr if necessary
-  // initialize hneigh_thr[0] to -1 on steps when reneighboring occured
+  // initialize hneigh_thr[0] to -1 on steps when reneighboring occurred
   // initialize hneigh_thr[2] to 0 every step
   const int nlocal = atom->nlocal;
   const int nall = nlocal + atom->nghost;
@@ -354,7 +354,7 @@ void PairLJLongTIP4PLongOMP::compute(int eflag, int vflag)
 void PairLJLongTIP4PLongOMP::compute_inner()
 {
    // reallocate hneigh_thr & newsite_thr if necessary
-  // initialize hneigh_thr[0] to -1 on steps when reneighboring occured
+  // initialize hneigh_thr[0] to -1 on steps when reneighboring occurred
   // initialize hneigh_thr[2] to 0 every step
   const int nall = atom->nlocal + atom->nghost;
 
@@ -432,7 +432,7 @@ void PairLJLongTIP4PLongOMP::compute_outer(int eflag, int vflag)
   const int nall = atom->nlocal + atom->nghost;
 
   // reallocate hneigh_thr & newsite_thr if necessary
-  // initialize hneigh_thr[0] to -1 on steps when reneighboring occured
+  // initialize hneigh_thr[0] to -1 on steps when reneighboring occurred
   // initialize hneigh_thr[2] to 0 every step
 
   if (atom->nmax > nmax) {
diff --git a/src/USER-OMP/pppm_cg_omp.cpp b/src/USER-OMP/pppm_cg_omp.cpp
index 1117979f1f..f9967bf52a 100644
--- a/src/USER-OMP/pppm_cg_omp.cpp
+++ b/src/USER-OMP/pppm_cg_omp.cpp
@@ -281,7 +281,7 @@ void PPPMCGOMP::compute_gf_ad()
       }
     }
     thr->timer(Timer::KSPACE);
-  } // end of paralle region
+  } // end of parallel region
 
   // compute the coefficients for the self-force correction
 
@@ -570,7 +570,7 @@ void PPPMCGOMP::fieldforce_ad()
       eky *= hy_inv;
       ekz *= hz_inv;
 
-      // convert E-field to force and substract self forces
+      // convert E-field to force and subtract self forces
 
       const double qi = q[i];
       const double qfactor = qqrd2e * scale * qi;
diff --git a/src/USER-OMP/pppm_disp_tip4p_omp.cpp b/src/USER-OMP/pppm_disp_tip4p_omp.cpp
index bdd8f23ee4..ec294cd56d 100644
--- a/src/USER-OMP/pppm_disp_tip4p_omp.cpp
+++ b/src/USER-OMP/pppm_disp_tip4p_omp.cpp
@@ -951,7 +951,7 @@ void PPPMDispTIP4POMP::fieldforce_c_ad()
       eky *= hy_inv;
       ekz *= hz_inv;
 
-      // convert E-field to force and substract self forces
+      // convert E-field to force and subtract self forces
 
       const double qi = q[i];
       const double qfactor = qqrd2e * scale * qi;
diff --git a/src/USER-OMP/pppm_omp.cpp b/src/USER-OMP/pppm_omp.cpp
index c6aaafaa31..b9b39826ff 100644
--- a/src/USER-OMP/pppm_omp.cpp
+++ b/src/USER-OMP/pppm_omp.cpp
@@ -281,7 +281,7 @@ void PPPMOMP::compute_gf_ad()
       }
     }
     thr->timer(Timer::KSPACE);
-  } // end of paralle region
+  } // end of parallel region
 
   // compute the coefficients for the self-force correction
 
@@ -578,7 +578,7 @@ void PPPMOMP::fieldforce_ad()
       eky *= hy_inv;
       ekz *= hz_inv;
 
-      // convert E-field to force and substract self forces
+      // convert E-field to force and subtract self forces
 
       const double qi = q[i];
       const double qfactor = qqrd2e * scale * qi;
diff --git a/src/USER-OMP/pppm_tip4p_omp.cpp b/src/USER-OMP/pppm_tip4p_omp.cpp
index 322730b573..359b5dcc8d 100644
--- a/src/USER-OMP/pppm_tip4p_omp.cpp
+++ b/src/USER-OMP/pppm_tip4p_omp.cpp
@@ -283,7 +283,7 @@ void PPPMTIP4POMP::compute_gf_ad()
       }
     }
     thr->timer(Timer::KSPACE);
-  } // end of paralle region
+  } // end of parallel region
 
   // compute the coefficients for the self-force correction
 
@@ -681,7 +681,7 @@ void PPPMTIP4POMP::fieldforce_ad()
       eky *= hy_inv;
       ekz *= hz_inv;
 
-      // convert E-field to force and substract self forces
+      // convert E-field to force and subtract self forces
 
       const double qi = q[i];
       const double qfactor = qqrd2e * scale * qi;
diff --git a/src/USER-OMP/thr_data.h b/src/USER-OMP/thr_data.h
index 2c1e42a3a3..4853d6dbbf 100644
--- a/src/USER-OMP/thr_data.h
+++ b/src/USER-OMP/thr_data.h
@@ -146,7 +146,7 @@ class ThrData {
 ////////////////////////////////////////////////////////////////////////
 //  helper functions operating on data replicated for thread support  //
 ////////////////////////////////////////////////////////////////////////
-// generic per thread data reduction for continous arrays of nthreads*nmax size
+// generic per thread data reduction for continuous arrays of nthreads*nmax size
 void data_reduce_thr(double *, int, int, int, int);
 }
 #endif
diff --git a/src/USER-PHONON/fix_phonon.h b/src/USER-PHONON/fix_phonon.h
index 91a380247a..f75139ce42 100644
--- a/src/USER-PHONON/fix_phonon.h
+++ b/src/USER-PHONON/fix_phonon.h
@@ -73,7 +73,7 @@ class FixPhonon : public Fix {
 
   double *M_inv_sqrt;
 
-  class FFT3d *fft;                             // to do fft via the fft3d wraper
+  class FFT3d *fft;                             // to do fft via the fft3d wrapper
   int nxlo,nxhi,mysize;                         // size info for local MPI_FFTW
   int mynpt,mynq,fft_nsend;
   int *fft_cnts, *fft_disp;
diff --git a/src/USER-PLUMED/fix_plumed.cpp b/src/USER-PLUMED/fix_plumed.cpp
index b02de2af0d..e1f0ea0bfe 100644
--- a/src/USER-PLUMED/fix_plumed.cpp
+++ b/src/USER-PLUMED/fix_plumed.cpp
@@ -78,8 +78,9 @@ FixPlumed::FixPlumed(LAMMPS *lmp, int narg, char **arg) :
 
   int api_version;
   p->cmd("getApiVersion",&api_version);
-  if (api_version > 6)
-    error->all(FLERR,"Incompatible API version for PLUMED in fix plumed");
+  if ((api_version < 5) || (api_version > 7))
+    error->all(FLERR,"Incompatible API version for PLUMED in fix plumed. "
+               "Only Plumed 2.4.x, 2.5.x, and 2.6.x are tested and supported.");
 
   // If the -partition option is activated then enable
   // inter-partition communication
diff --git a/src/USER-PTM/compute_ptm_atom.cpp b/src/USER-PTM/compute_ptm_atom.cpp
index 3a2c8daac4..df6a01e6c6 100644
--- a/src/USER-PTM/compute_ptm_atom.cpp
+++ b/src/USER-PTM/compute_ptm_atom.cpp
@@ -33,6 +33,7 @@ under
 #include "neigh_request.h"
 #include "neighbor.h"
 #include "update.h"
+#include "group.h"
 
 #include "ptm_functions.h"
 
@@ -61,7 +62,7 @@ static const char cite_user_ptm_package[] =
 
 ComputePTMAtom::ComputePTMAtom(LAMMPS *lmp, int narg, char **arg)
     : Compute(lmp, narg, arg), list(NULL), output(NULL) {
-  if (narg != 5)
+  if (narg < 5 || narg > 6)
     error->all(FLERR, "Illegal compute ptm/atom command");
 
   char *structures = arg[3];
@@ -122,6 +123,14 @@ ComputePTMAtom::ComputePTMAtom(LAMMPS *lmp, int narg, char **arg)
   if (rmsd_threshold == 0)
     rmsd_threshold = INFINITY;
 
+  char* group_name = (char *)"all";
+  if (narg > 5) {
+    group_name = arg[5];
+  }
+  int igroup = group->find(group_name);
+  if (igroup == -1) error->all(FLERR,"Could not find fix group ID");
+  group2bit = group->bitmask[igroup];
+
   peratom_flag = 1;
   size_peratom_cols = NUM_COLUMNS;
   create_attribute = 1;
@@ -168,6 +177,8 @@ typedef struct
   int **firstneigh;
   int *ilist;
   int nlocal;
+  int *mask;
+  int group2bit;
 
 } ptmnbrdata_t;
 
@@ -184,6 +195,8 @@ static bool sorthelper_compare(ptmnbr_t const &a, ptmnbr_t const &b) {
 static int get_neighbours(void* vdata, size_t central_index, size_t atom_index, int num, size_t* nbr_indices, int32_t* numbers, double (*nbr_pos)[3])
 {
   ptmnbrdata_t* data = (ptmnbrdata_t*)vdata;
+  int *mask = data->mask;
+  int group2bit = data->group2bit;
 
   double **x = data->x;
   double *pos = x[atom_index];
@@ -203,6 +216,9 @@ static int get_neighbours(void* vdata, size_t central_index, size_t atom_index,
 
   for (int jj = 0; jj < jnum; jj++) {
     int j = jlist[jj];
+    if (!(mask[j] & group2bit))
+      continue;
+
     j &= NEIGHMASK;
     if (j == atom_index)
       continue;
@@ -265,7 +281,11 @@ void ComputePTMAtom::compute_peratom() {
 
   double **x = atom->x;
   int *mask = atom->mask;
-  ptmnbrdata_t nbrlist = {x, numneigh, firstneigh, ilist, atom->nlocal};
+  ptmnbrdata_t nbrlist = {x, numneigh, firstneigh, ilist, atom->nlocal, mask, group2bit};
+
+  // zero output
+
+  memset(output,0,nmax*NUM_COLUMNS*sizeof(double));
 
   for (int ii = 0; ii < inum; ii++) {
 
diff --git a/src/USER-PTM/compute_ptm_atom.h b/src/USER-PTM/compute_ptm_atom.h
index 586d7a44cd..d7373a0763 100644
--- a/src/USER-PTM/compute_ptm_atom.h
+++ b/src/USER-PTM/compute_ptm_atom.h
@@ -39,6 +39,7 @@ class ComputePTMAtom : public Compute {
   double rmsd_threshold;
   class NeighList *list;
   double **output;
+  int group2bit;
 };
 
 }
diff --git a/src/USER-QUIP/pair_quip.cpp b/src/USER-QUIP/pair_quip.cpp
index ffc6ac1c70..7c762208b7 100644
--- a/src/USER-QUIP/pair_quip.cpp
+++ b/src/USER-QUIP/pair_quip.cpp
@@ -298,8 +298,8 @@ void PairQUIP::coeff(int narg, char **arg)
   if (count == 0) error->all(FLERR,"Incorrect args for pair coefficients");
 
   // Initialise potential
-  // First call initialises potential via the fortran code in memory, and returns the necessary size
-  // of quip_potential. This behaviour is invoked by setting n_potential_quip to 0.
+  // First call initializes potential via the fortran code in memory, and returns the necessary size
+  // of quip_potential. This behavior is invoked by setting n_potential_quip to 0.
   n_quip_potential = 0;
   quip_potential = new int[0];
   quip_lammps_potential_initialise(quip_potential,&n_quip_potential,&cutoff,quip_file,&n_quip_file,quip_string,&n_quip_string);
diff --git a/src/USER-REACTION/README b/src/USER-REACTION/README
new file mode 100644
index 0000000000..f099ace103
--- /dev/null
+++ b/src/USER-REACTION/README
@@ -0,0 +1,23 @@
+This package implements the DisARMMD protocol (disarmmd.org) as
+"fix bond/react." This fix allows for complex topology changes
+during a running MD simulation, when using classical force fields.
+Topology changes are defined in pre- and post-reaction molecule
+templates and can include creation and deletion of bonds, angles,
+dihedrals, impropers, atom types, bond types, angle types,
+dihedral types, improper types, and/or atomic charges.
+
+The DisARMMD protocol is a method for modeling chemical reactions in
+classical molecular dynamics simulations. It was developed to build
+physically-realistic initial configurations for amorphous or
+crosslinked materials. Any number of competing or reversible reaction
+pathways can be specified, and reacting sites can be stabilized. Other
+advanced options currently available include reaction constraints
+(e.g. angle and Arrhenius constraints), deletion of reaction
+byproducts or other small molecules, and chiral-sensitive reactions.
+
+The DisARMMD methodology is detailed in:
+    Gissinger et al., Polymer 128, 211-217 (2017)
+    https://doi.org/10.1016/j.polymer.2017.09.038
+
+This package was created by Jacob Gissinger (info@disarmmd.org),
+while at the NASA Langley Research Center.
diff --git a/src/USER-MISC/fix_bond_react.cpp b/src/USER-REACTION/fix_bond_react.cpp
similarity index 97%
rename from src/USER-MISC/fix_bond_react.cpp
rename to src/USER-REACTION/fix_bond_react.cpp
index b14139afff..44e2bd172e 100644
--- a/src/USER-MISC/fix_bond_react.cpp
+++ b/src/USER-REACTION/fix_bond_react.cpp
@@ -60,7 +60,7 @@ static const char cite_fix_bond_react[] =
 #define BIG 1.0e20
 #define DELTA 16
 #define MAXGUESS 20 // max # of guesses allowed by superimpose algorithm
-#define MAXCONARGS 7 // max # of arguments for any type of constraint + rxnID
+#define MAXCONARGS 10 // max # of arguments for any type of constraint + rxnID
 
 // various statuses of superimpose algorithm:
 // ACCEPT: site successfully matched to pre-reacted template
@@ -72,7 +72,7 @@ static const char cite_fix_bond_react[] =
 enum{ACCEPT,REJECT,PROCEED,CONTINUE,GUESSFAIL,RESTORE};
 
 // types of available reaction constraints
-enum{DISTANCE,ANGLE,ARRHENIUS};
+enum{DISTANCE,ANGLE,DIHEDRAL,ARRHENIUS};
 
 /* ---------------------------------------------------------------------- */
 
@@ -617,7 +617,7 @@ void FixBondReact::post_constructor()
       delete [] exclude_PARENT_group;
 
       // on to statted_tags (system-wide thermostat)
-      // intialize per-atom statted_flags to 1
+      // initialize per-atom statted_flags to 1
       // (only if not already initialized by restart)
       if (fix3->restart_reset != 1) {
         int flag;
@@ -650,7 +650,7 @@ void FixBondReact::post_constructor()
         statted_id = new char[len];
         strcpy(statted_id,idprop);
 
-        // intialize per-atom statted_tags to 1
+        // initialize per-atom statted_tags to 1
         // need to correct for smooth restarts
         //int flag;
         //int index = atom->find_custom(statted_id,flag);
@@ -1325,7 +1325,7 @@ void FixBondReact::make_a_guess()
   //  if so, this constitutes a fail
   //  because still undergoing a previous reaction!
   //  could technically fail unnecessarily during a wrong guess if near edge atoms
-  //  we accept this temporary and infrequent decrease in reaction occurences
+  //  we accept this temporary and infrequent decrease in reaction occurrences
 
   for (int i = 0; i < nxspecial[atom->map(glove[pion][1])][0]; i++) {
     if (atom->map(xspecial[atom->map(glove[pion][1])][i]) < 0) {
@@ -1654,10 +1654,15 @@ evaluate constraints: return 0 if any aren't satisfied
 
 int FixBondReact::check_constraints()
 {
-  tagint atom1,atom2,atom3;
+  tagint atom1,atom2,atom3,atom4;
   double delx,dely,delz,rsq;
   double delx1,dely1,delz1,delx2,dely2,delz2;
   double rsq1,rsq2,r1,r2,c,t,prrhob;
+  // for computation of dihedrals
+  double vb1x,vb1y,vb1z,vb2x,vb2y,vb2z,vb3x,vb3y,vb3z,vb2xm,vb2ym,vb2zm;
+  double ax,ay,az,bx,by,bz,rasq,rbsq,rgsq,rg,ra2inv,rb2inv,rabinv;
+  double s,phi;
+  int ANDgate;
 
   double **x = atom->x;
 
@@ -1699,6 +1704,69 @@ int FixBondReact::check_constraints()
         if (c > 1.0) c = 1.0;
         if (c < -1.0) c = -1.0;
         if (acos(c) < constraints[i][5] || acos(c) > constraints[i][6]) return 0;
+      } else if (constraints[i][1] == DIHEDRAL) {
+        // phi calculation from dihedral style harmonic
+        atom1 = atom->map(glove[(int) constraints[i][2]-1][1]);
+        atom2 = atom->map(glove[(int) constraints[i][3]-1][1]);
+        atom3 = atom->map(glove[(int) constraints[i][4]-1][1]);
+        atom4 = atom->map(glove[(int) constraints[i][5]-1][1]);
+
+        vb1x = x[atom1][0] - x[atom2][0];
+        vb1y = x[atom1][1] - x[atom2][1];
+        vb1z = x[atom1][2] - x[atom2][2];
+        domain->minimum_image(vb1x,vb1y,vb1z);
+
+        vb2x = x[atom3][0] - x[atom2][0];
+        vb2y = x[atom3][1] - x[atom2][1];
+        vb2z = x[atom3][2] - x[atom2][2];
+        domain->minimum_image(vb2x,vb2y,vb2z);
+
+        vb2xm = -vb2x;
+        vb2ym = -vb2y;
+        vb2zm = -vb2z;
+        domain->minimum_image(vb2xm,vb2ym,vb2zm);
+
+        vb3x = x[atom4][0] - x[atom3][0];
+        vb3y = x[atom4][1] - x[atom3][1];
+        vb3z = x[atom4][2] - x[atom3][2];
+        domain->minimum_image(vb3x,vb3y,vb3z);
+
+        ax = vb1y*vb2zm - vb1z*vb2ym;
+        ay = vb1z*vb2xm - vb1x*vb2zm;
+        az = vb1x*vb2ym - vb1y*vb2xm;
+        bx = vb3y*vb2zm - vb3z*vb2ym;
+        by = vb3z*vb2xm - vb3x*vb2zm;
+        bz = vb3x*vb2ym - vb3y*vb2xm;
+
+        rasq = ax*ax + ay*ay + az*az;
+        rbsq = bx*bx + by*by + bz*bz;
+        rgsq = vb2xm*vb2xm + vb2ym*vb2ym + vb2zm*vb2zm;
+        rg = sqrt(rgsq);
+
+        ra2inv = rb2inv = 0.0;
+        if (rasq > 0) ra2inv = 1.0/rasq;
+        if (rbsq > 0) rb2inv = 1.0/rbsq;
+        rabinv = sqrt(ra2inv*rb2inv);
+
+        c = (ax*bx + ay*by + az*bz)*rabinv;
+        s = rg*rabinv*(ax*vb3x + ay*vb3y + az*vb3z);
+
+        if (c > 1.0) c = 1.0;
+        if (c < -1.0) c = -1.0;
+        phi = atan2(s,c);
+
+        ANDgate = 0;
+        if (constraints[i][6] < constraints[i][7]) {
+          if (phi > constraints[i][6] && phi < constraints[i][7]) ANDgate = 1;
+        } else {
+          if (phi > constraints[i][6] || phi < constraints[i][7]) ANDgate = 1;
+        }
+        if (constraints[i][8] < constraints[i][9]) {
+          if (phi > constraints[i][8] && phi < constraints[i][9]) ANDgate = 1;
+        } else {
+          if (phi > constraints[i][8] || phi < constraints[i][9]) ANDgate = 1;
+        }
+        if (ANDgate != 1) return 0;
       } else if (constraints[i][1] == ARRHENIUS) {
         t = get_temperature();
         prrhob = constraints[i][3]*pow(t,constraints[i][4])*
@@ -1854,7 +1922,7 @@ void FixBondReact::find_landlocked_atoms(int myrxn)
 {
   // landlocked_atoms are atoms for which all topology is contained in reacted template
   // if dihedrals/impropers exist: this means that edge atoms are not in their 1-3 neighbor list
-  //   note: due to various usage/defintions of impropers, treated same as dihedrals
+  //   note: due to various usage/definitions of impropers, treated same as dihedrals
   // if angles exist: this means edge atoms not in their 1-2 neighbors list
   // if just bonds: this just means that edge atoms are not landlocked
   // Note: landlocked defined in terms of reacted template
@@ -3110,6 +3178,23 @@ void FixBondReact::Constraints(char *line, int myrxn)
       constraints[nconstraints][4] = tmp[2];
       constraints[nconstraints][5] = tmp[3]/180.0 * MY_PI;
       constraints[nconstraints][6] = tmp[4]/180.0 * MY_PI;
+    } else if (strcmp(constraint_type,"dihedral") == 0) {
+      constraints[nconstraints][1] = DIHEDRAL;
+      tmp[6] = 181.0; // impossible range
+      tmp[7] = 182.0;
+      sscanf(line,"%*s %lg %lg %lg %lg %lg %lg %lg %lg",&tmp[0],&tmp[1],
+                        &tmp[2],&tmp[3],&tmp[4],&tmp[5],&tmp[6],&tmp[7]);
+      if (tmp[0] > onemol->natoms || tmp[1] > onemol->natoms ||
+          tmp[2] > onemol->natoms || tmp[3] > onemol->natoms)
+        error->one(FLERR,"Bond/react: Invalid template atom ID in map file");
+      constraints[nconstraints][2] = tmp[0];
+      constraints[nconstraints][3] = tmp[1];
+      constraints[nconstraints][4] = tmp[2];
+      constraints[nconstraints][5] = tmp[3];
+      constraints[nconstraints][6] = tmp[4]/180.0 * MY_PI;
+      constraints[nconstraints][7] = tmp[5]/180.0 * MY_PI;
+      constraints[nconstraints][8] = tmp[6]/180.0 * MY_PI;
+      constraints[nconstraints][9] = tmp[7]/180.0 * MY_PI;
     } else if (strcmp(constraint_type,"arrhenius") == 0) {
       constraints[nconstraints][1] = ARRHENIUS;
       constraints[nconstraints][2] = narrhenius++;
diff --git a/src/USER-MISC/fix_bond_react.h b/src/USER-REACTION/fix_bond_react.h
similarity index 94%
rename from src/USER-MISC/fix_bond_react.h
rename to src/USER-REACTION/fix_bond_react.h
index 1dba13283b..84cb9401f8 100644
--- a/src/USER-MISC/fix_bond_react.h
+++ b/src/USER-REACTION/fix_bond_react.h
@@ -239,18 +239,17 @@ Atom IDs in molecule templates range from 1 to the number of atoms in the templa
 E or W: Bond/react: Atom affected by reaction %s too close to template edge
 
 This means an atom which changes type or connectivity during the
-reaction is too close to an 'edge' atom defined in the superimpose
-file. This could cause incorrect assignment of bonds, angle, etc.
-Generally, this means you must include more atoms in your templates,
-such that there are at least two atoms between each atom involved in
-the reaction and an edge atom.
+reaction is too close to an 'edge' atom defined in the map file. This
+could cause incorrect assignment of bonds, angle, etc. Generally, this
+means you must include more atoms in your templates, such that there
+are at least two atoms between each atom involved in the reaction and
+an edge atom.
 
 E: Bond/react: Fix bond/react needs ghost atoms from farther away
 
-This is because a processor needs to superimpose the entire unreacted
-molecule template onto simulation atoms it knows about. The
-comm_modify cutoff command can be used to extend the communication
-range.
+This is because a processor needs to map the entire unreacted molecule
+template onto simulation atoms it knows about. The comm_modify cutoff
+command can be used to extend the communication range.
 
 E: Bond/react: A deleted atom cannot remain bonded to an atom that is not deleted
 
diff --git a/src/USER-SDPD/pair_sdpd_taitwater_isothermal.cpp b/src/USER-SDPD/pair_sdpd_taitwater_isothermal.cpp
index d799869db3..b6f0c63546 100644
--- a/src/USER-SDPD/pair_sdpd_taitwater_isothermal.cpp
+++ b/src/USER-SDPD/pair_sdpd_taitwater_isothermal.cpp
@@ -23,7 +23,9 @@
 #include "atom.h"
 #include "force.h"
 #include "comm.h"
+#include "neighbor.h"
 #include "neigh_list.h"
+#include "neigh_request.h"
 #include "memory.h"
 #include "error.h"
 #include "domain.h"
@@ -238,7 +240,7 @@ void PairSDPDTaitwaterIsothermal::allocate () {
 void PairSDPDTaitwaterIsothermal::settings (int narg, char **arg) {
   if (narg != 2 && narg != 3)
     error->all (FLERR, "Illegal number of arguments for "
-                "pair_style sdpd/taitwater/morris/isothermal");
+                "pair_style sdpd/taitwater/isothermal");
 
   temperature = force->numeric (FLERR, arg[0]);
   viscosity = force->numeric (FLERR, arg[1]);
@@ -297,13 +299,26 @@ void PairSDPDTaitwaterIsothermal::coeff (int narg, char **arg) {
     error->all(FLERR,"Incorrect args for pair coefficients");
 }
 
+/* ----------------------------------------------------------------------
+ init specific to this pair style
+------------------------------------------------------------------------- */
+
+void PairSDPDTaitwaterIsothermal::init_style()
+{
+  if ((!atom->rho_flag) || (atom->drho == NULL))
+    error->all(FLERR,"Pair style dpd/taitwater/isothermal requires atom "
+               "attributes rho and drho");
+
+  neighbor->request(this,instance_me);
+}
+
 /* ----------------------------------------------------------------------
  init for one type pair i,j and corresponding j,i
  ------------------------------------------------------------------------- */
 
 double PairSDPDTaitwaterIsothermal::init_one (int i, int j) {
   if (setflag[i][j] == 0)
-    error->all(FLERR,"Not all pair sph/taitwater/morris coeffs are set");
+    error->all(FLERR,"Not all pair sdpd/taitwater/isothermal coeffs are set");
 
   cut[j][i] = cut[i][j];
 
diff --git a/src/USER-SDPD/pair_sdpd_taitwater_isothermal.h b/src/USER-SDPD/pair_sdpd_taitwater_isothermal.h
index caaa0759d0..2d3d06297b 100644
--- a/src/USER-SDPD/pair_sdpd_taitwater_isothermal.h
+++ b/src/USER-SDPD/pair_sdpd_taitwater_isothermal.h
@@ -36,6 +36,7 @@ class PairSDPDTaitwaterIsothermal : public Pair {
   void settings (int, char **);
   void coeff (int, char **);
   virtual double init_one (int, int);
+  virtual void init_style();
 
  protected:
   double viscosity, temperature;
diff --git a/src/USER-SMD/atom_vec_smd.cpp b/src/USER-SMD/atom_vec_smd.cpp
index 604504c5a7..ef14eacdc2 100644
--- a/src/USER-SMD/atom_vec_smd.cpp
+++ b/src/USER-SMD/atom_vec_smd.cpp
@@ -219,7 +219,7 @@ int AtomVecSMD::pack_comm_vel(int n, int *list, double *buf, int pbc_flag, int *
 
         // no need to communicate x0 here, as it is not changed by time integration
         // if x0 is changed when the ref config is updated, this communication is performed in the fix_integrate/tlsph
-        // similarily, rmass could be removed here.
+        // similarly, rmass could be removed here.
         // radius should be communicated here for future time-integration of the radius with ulsph (not implemented yet)
         int i, j, m;
         double dx, dy, dz, dvx, dvy, dvz;
diff --git a/src/USER-SMD/pair_smd_tlsph.cpp b/src/USER-SMD/pair_smd_tlsph.cpp
index 82b7c8ff9d..cad9923054 100644
--- a/src/USER-SMD/pair_smd_tlsph.cpp
+++ b/src/USER-SMD/pair_smd_tlsph.cpp
@@ -913,7 +913,7 @@ void PairTlsph::settings(int narg, char **arg) {
         /*
          * default value for update_threshold for updates of reference configuration:
          * The maximum relative displacement which is tracked by the construction of LAMMPS' neighborlists
-         * is the folowing.
+         * is the following.
          */
 
         cut_comm = MAX(neighbor->cutneighmax, comm->cutghostuser); // cutoff radius within which ghost atoms are communicated.
diff --git a/src/USER-SMD/pair_smd_tlsph.h b/src/USER-SMD/pair_smd_tlsph.h
index 62e7ce2295..31a238d564 100644
--- a/src/USER-SMD/pair_smd_tlsph.h
+++ b/src/USER-SMD/pair_smd_tlsph.h
@@ -195,7 +195,7 @@ protected:
 
 private:
         double **Lookup; // holds per-type material parameters for the quantities defined in enum statement above.
-        bool first; // if first is true, do not perform any computations, beacuse reference configuration is not ready yet.
+        bool first; // if first is true, do not perform any computations, because reference configuration is not ready yet.
 };
 
 }
diff --git a/src/USER-SMD/pair_smd_triangulated_surface.cpp b/src/USER-SMD/pair_smd_triangulated_surface.cpp
index f9052be087..53a93df7f7 100644
--- a/src/USER-SMD/pair_smd_triangulated_surface.cpp
+++ b/src/USER-SMD/pair_smd_triangulated_surface.cpp
@@ -481,7 +481,7 @@ double PairTriSurf::memory_usage() {
  % Release: 1.2 Fixed Bug because of typo in region 5 20101013
  % Release: 1.3 Fixed Bug because of typo in region 2 20101014
 
- % Possible extention could be a version tailored not to return the distance
+ % Possible extension could be a version tailored not to return the distance
  % and additionally the closest point, but instead return only the closest
  % point. Could lead to a small speed gain.
 
diff --git a/src/USER-SMD/smd_material_models.cpp b/src/USER-SMD/smd_material_models.cpp
index 5ee67fbb4e..096600df52 100644
--- a/src/USER-SMD/smd_material_models.cpp
+++ b/src/USER-SMD/smd_material_models.cpp
@@ -263,7 +263,7 @@ void LinearPlasticStrength(const double G, const double yieldStress, const Matri
 
         if (J2 < yieldStress) {
                 /*
-                 * no yielding has occured.
+                 * no yielding has occurred.
                  * final deviatoric stress is trial deviatoric stress
                  */
                 sigma_dev_rate__ = dev_rate;
@@ -274,7 +274,7 @@ void LinearPlasticStrength(const double G, const double yieldStress, const Matri
         } else {
                 //printf("yiedl\n");
                 /*
-                 * yielding has occured
+                 * yielding has occurred
                  */
                 plastic_strain_increment = (J2 - yieldStress) / (3.0 * G);
 
@@ -288,7 +288,7 @@ void LinearPlasticStrength(const double G, const double yieldStress, const Matri
                  * new deviatoric stress rate
                  */
                 sigma_dev_rate__ = sigmaFinal_dev__ - sigmaInitial_dev;
-                //printf("yielding has occured.\n");
+                //printf("yielding has occurred.\n");
         }
 }
 
@@ -344,7 +344,7 @@ void JohnsonCookStrength(const double G, const double cp, const double espec, co
 
         if (J2 < yieldStress) {
                 /*
-                 * no yielding has occured.
+                 * no yielding has occurred.
                  * final deviatoric stress is trial deviatoric stress
                  */
                 sigma_dev_rate__ = dev_rate;
@@ -355,7 +355,7 @@ void JohnsonCookStrength(const double G, const double cp, const double espec, co
         } else {
                 //printf("yiedl\n");
                 /*
-                 * yielding has occured
+                 * yielding has occurred
                  */
                 plastic_strain_increment = (J2 - yieldStress) / (3.0 * G);
 
@@ -369,7 +369,7 @@ void JohnsonCookStrength(const double G, const double cp, const double espec, co
                  * new deviatoric stress rate
                  */
                 sigma_dev_rate__ = sigmaFinal_dev__ - sigmaInitial_dev;
-                //printf("yielding has occured.\n");
+                //printf("yielding has occurred.\n");
         }
 }
 
@@ -452,7 +452,7 @@ double JohnsonCookFailureStrain(const double p, const Matrix3d Sdev, const doubl
         }
 
         // determine stress triaxiality
-        double triax = p / (vm + 0.01 * fabs(p)); // have softening in denominator to avoid divison by zero
+        double triax = p / (vm + 0.01 * fabs(p)); // have softening in denominator to avoid division by zero
         if (triax < 0.0) {
                 triax = 0.0;
         } else if (triax > 3.0) {
diff --git a/src/USER-SMTBQ/pair_smtbq.cpp b/src/USER-SMTBQ/pair_smtbq.cpp
index f61fc1a72e..fcf6d141f2 100644
--- a/src/USER-SMTBQ/pair_smtbq.cpp
+++ b/src/USER-SMTBQ/pair_smtbq.cpp
@@ -13,7 +13,7 @@
 
 /* ----------------------------------------------------------------------
    The SMTBQ code has been developed with the financial support of  CNRS and
-   of the Regional Council of Burgundy (Convention n� 2010-9201AAO037S03129)
+   of the Regional Council of Burgundy (Convention n¡ 2010-9201AAO037S03129)
 
    Copyright (2015)
    Universite de Bourgogne : Nicolas SALLES, Olivier POLITANO
@@ -943,7 +943,7 @@ void PairSMTBQ::compute(int eflag, int vflag)
      3 -> Short int. Ox-Ox
      4 -> Short int. SMTB (repulsion)
      5 -> Covalent energy SMTB
-     6 -> Somme des Q(i)�
+     6 -> Somme des Q(i)²
      ------------------------------------------------------------------------- */
 
   /* -------------- N-body forces Calcul --------------- */
@@ -3022,7 +3022,7 @@ void PairSMTBQ::groupQEqAllParallel_QEq()
 
   ngp = igp = 0; nelt[ngp] = 0;
 
-  // On prend un oxyg�ne
+  // On prend un oxygène
   //   printf ("[me %d] On prend un oxygene\n",me);
 
   for (ii = 0; ii < inum; ii++) {
diff --git a/src/USER-SMTBQ/pair_smtbq.h b/src/USER-SMTBQ/pair_smtbq.h
index 05e4b67242..c83e1b5cf1 100644
--- a/src/USER-SMTBQ/pair_smtbq.h
+++ b/src/USER-SMTBQ/pair_smtbq.h
@@ -56,8 +56,8 @@ protected:
   double rmin,dr,ds;            // table parameter
   int kmax;
   bigint Qstep;                 // Frequency of charge resolution
-  double precision;             // acuracy of convergence
-  int loopmax;                  // max of interation
+  double precision;             // accuracy of convergence
+  int loopmax;                  // max of iteration
 
   double cutmax;                // max cutoff for all elements
   int nelements;                // # of unique elements
diff --git a/src/USER-UEF/fix_nh_uef.cpp b/src/USER-UEF/fix_nh_uef.cpp
index 8873688eb7..a3a2dc476c 100644
--- a/src/USER-UEF/fix_nh_uef.cpp
+++ b/src/USER-UEF/fix_nh_uef.cpp
@@ -53,7 +53,7 @@ static const char cite_user_uef_package[] =
   "}\n\n";
 
 /* ----------------------------------------------------------------------
- * Parse fix specific keywords, do some error checking, and initalize
+ * Parse fix specific keywords, do some error checking, and initialize
  * temp/pressure fixes
  ---------------------------------------------------------------------- */
 FixNHUef::FixNHUef(LAMMPS *lmp, int narg, char **arg) :
diff --git a/src/USER-VTK/dump_vtk.h b/src/USER-VTK/dump_vtk.h
index 8df14c7f34..e8de87f11c 100644
--- a/src/USER-VTK/dump_vtk.h
+++ b/src/USER-VTK/dump_vtk.h
@@ -185,7 +185,7 @@ E: Compute used in dump between runs is not current
 The compute was not invoked on the current timestep, therefore it
 cannot be used in a dump between runs.
 
-E: Threshhold for an atom property that isn't allocated
+E: Threshold for an atom property that isn't allocated
 
 A dump threshold has been requested on a quantity that is
 not defined by the atom style used in this simulation.
diff --git a/src/USER-YAFF/README b/src/USER-YAFF/README
index 4fabe67390..9d095b8216 100644
--- a/src/USER-YAFF/README
+++ b/src/USER-YAFF/README
@@ -1,8 +1,8 @@
 This package implements the styles that are needed to use typical force fields
 generated by QuickFF for the simulation of metal-organic frameworks. The
 QuickFF methodology is detailed in following papers:
-    Vanduyfhuys et al., J. Comput. Chem., 36 (13), 1015-1027 (2015) http://dx.doi.org/10.1002/jcc.23877
-    Vanduyfhuys et al., J. Comput. Chem., 39 (16), 999-1011 (2018) http://dx.doi.org/10.1002/jcc.25173
+    Vanduyfhuys et al., J. Comput. Chem., 36 (13), 1015-1027 (2015) https://doi.org/10.1002/jcc.23877
+    Vanduyfhuys et al., J. Comput. Chem., 39 (16), 999-1011 (2018) https://doi.org/10.1002/jcc.25173
 The corresponding software package can be found on http://molmod.github.io/QuickFF
 
 
diff --git a/src/USER-YAFF/pair_lj_switch3_coulgauss_long.cpp b/src/USER-YAFF/pair_lj_switch3_coulgauss_long.cpp
index 022b93a0d2..37fc143e8b 100644
--- a/src/USER-YAFF/pair_lj_switch3_coulgauss_long.cpp
+++ b/src/USER-YAFF/pair_lj_switch3_coulgauss_long.cpp
@@ -166,7 +166,7 @@ void PairLJSwitch3CoulGaussLong::compute(int eflag, int vflag)
           forcelj = r6inv*(12.0*lj3[itype][jtype]*r6inv - 6.0*lj4[itype][jtype]);
           // Correction for Gaussian radii
           if (lj2[itype][jtype]==0.0) {
-            // This means a point charge is considerd, so the correction is zero
+            // This means a point charge is considered, so the correction is zero
             expn2 = 0.0;
             erfc2 = 0.0;
             forcecoul2 = 0.0;
diff --git a/src/VORONOI/README b/src/VORONOI/README
index 9a83c95a8d..ede104a678 100644
--- a/src/VORONOI/README
+++ b/src/VORONOI/README
@@ -7,7 +7,7 @@ developed by Chris H. Rycroft while at UC Berkeley / Lawrence Berkeley
 Laboratory.
 
 That library can be downloaded and built in lib/voronoi or elsewhere
-on your system, which must be done before bulding LAMMPS with this
+on your system, which must be done before building LAMMPS with this
 package.  Details of the download, build, and install process for
 Voro++ are given in the lib/voronoi/README file, and scripts are
 provided to help automate the process.  Also see the LAMMPS manual for
diff --git a/src/accelerator_kokkos.h b/src/accelerator_kokkos.h
index a3fff2fe16..9fb9cf3690 100644
--- a/src/accelerator_kokkos.h
+++ b/src/accelerator_kokkos.h
@@ -61,6 +61,11 @@ class KokkosLMP {
   int neigh_count(int) {return 0;}
 };
 
+class Kokkos {
+ public:
+  static void finalize() {}
+};
+
 class AtomKokkos : public Atom {
  public:
   tagint **k_special;
diff --git a/src/atom.cpp b/src/atom.cpp
index de5d30930a..f2ee14291a 100644
--- a/src/atom.cpp
+++ b/src/atom.cpp
@@ -175,6 +175,8 @@ Atom::Atom(LAMMPS *lmp) : Pointers(lmp)
   spin_flag = eradius_flag = ervel_flag = erforce_flag = ervelforce_flag = 0;
   cs_flag = csforce_flag = vforce_flag = etag_flag = 0;
 
+  // USER-SPH, USER-MESO, and USER-DPD flags
+
   rho_flag = e_flag = cv_flag = vest_flag = 0;
   dpd_flag = edpd_flag = tdpd_flag = 0;
 
@@ -971,16 +973,23 @@ void Atom::data_atoms(int n, char *buf, tagint id_offset, tagint mol_offset,
         error->all(FLERR,"Incorrect atom format in data file");
     }
 
-    if (imageflag)
-      imagedata = ((imageint) (atoi(values[iptr]) + IMGMAX) & IMGMASK) |
-        (((imageint) (atoi(values[iptr+1]) + IMGMAX) & IMGMASK) << IMGBITS) |
-        (((imageint) (atoi(values[iptr+2]) + IMGMAX) & IMGMASK) << IMG2BITS);
-    else imagedata = ((imageint) IMGMAX << IMG2BITS) |
-           ((imageint) IMGMAX << IMGBITS) | IMGMAX;
+    int imx = 0;
+    int imy = 0;
+    int imz = 0;
+    if (imageflag) {
+      imx = utils::inumeric(FLERR,values[iptr],false,lmp);
+      imy = utils::inumeric(FLERR,values[iptr+1],false,lmp);
+      imz = utils::inumeric(FLERR,values[iptr+2],false,lmp);
+      if ((domain->dimension == 2) && (imz != 0))
+        error->all(FLERR,"Z-direction image flag must be 0 for 2d-systems");
+    }
+    imagedata = ((imageint) (imx + IMGMAX) & IMGMASK) |
+        (((imageint) (imy + IMGMAX) & IMGMASK) << IMGBITS) |
+        (((imageint) (imz + IMGMAX) & IMGMASK) << IMG2BITS);
 
-    xdata[0] = atof(values[xptr]);
-    xdata[1] = atof(values[xptr+1]);
-    xdata[2] = atof(values[xptr+2]);
+    xdata[0] = utils::numeric(FLERR,values[xptr],false,lmp);
+    xdata[1] = utils::numeric(FLERR,values[xptr+1],false,lmp);
+    xdata[2] = utils::numeric(FLERR,values[xptr+2],false,lmp);
     if (shiftflag) {
       xdata[0] += shift[0];
       xdata[1] += shift[1];
diff --git a/src/atom_vec.cpp b/src/atom_vec.cpp
index 7b89c2fd79..c4dd53ad18 100644
--- a/src/atom_vec.cpp
+++ b/src/atom_vec.cpp
@@ -36,6 +36,7 @@ AtomVec::AtomVec(LAMMPS *lmp) : Pointers(lmp)
   forceclearflag = 0;
   size_data_bonus = 0;
   maxexchange = 0;
+  molecular = 0;
 
   kokkosable = 0;
 
diff --git a/src/comm.cpp b/src/comm.cpp
index f5b1c0246b..6a762036d1 100644
--- a/src/comm.cpp
+++ b/src/comm.cpp
@@ -845,7 +845,7 @@ void Comm::ring(int n, int nper, void *inbuf, int messtag,
    rendezvous communication operation
    three stages:
      first comm sends inbuf from caller decomp to rvous decomp
-     callback operates on data in rendevous decomp
+     callback operates on data in rendezvous decomp
      second comm sends outbuf from rvous decomp back to caller decomp
    inputs:
      which = perform (0) irregular or (1) MPI_All2allv communication
@@ -977,7 +977,7 @@ rendezvous_all2all(int n, char *inbuf, int insize, int inorder, int *procs,
   bigint *offsets;
   char *inbuf_a2a,*outbuf_a2a;
 
-  // create procs and inbuf for All2all if necesary
+  // create procs and inbuf for All2all if necessary
 
   if (!inorder) {
     memory->create(procs_a2a,nprocs,"rendezvous:procs");
@@ -1080,7 +1080,7 @@ rendezvous_all2all(int n, char *inbuf, int insize, int inorder, int *procs,
     return 0;    // all nout_rvous are 0, no 2nd irregular
   }
 
-  // create procs and outbuf for All2all if necesary
+  // create procs and outbuf for All2all if necessary
 
   if (!outorder) {
     memory->create(procs_a2a,nprocs,"rendezvous_a2a:procs");
diff --git a/src/comm_brick.cpp b/src/comm_brick.cpp
index ecf382ab03..c5ec8b35f4 100644
--- a/src/comm_brick.cpp
+++ b/src/comm_brick.cpp
@@ -567,7 +567,7 @@ void CommBrick::reverse_comm()
    atoms exchanged with all 6 stencil neighbors
    send out atoms that have left my box, receive ones entering my box
    atoms will be lost if not inside a stencil proc's box
-     can happen if atom moves outside of non-periodic bounary
+     can happen if atom moves outside of non-periodic boundary
      or if atom moves more than one proc away
    this routine called before every reneighboring
    for triclinic, atoms must be in lamda coords (0-1) before exchange is called
diff --git a/src/comm_tiled.cpp b/src/comm_tiled.cpp
index 57b7f7e91e..a7eb6dfe80 100644
--- a/src/comm_tiled.cpp
+++ b/src/comm_tiled.cpp
@@ -618,7 +618,7 @@ void CommTiled::reverse_comm()
    atoms exchanged with procs that touch sub-box in each of 3 dims
    send out atoms that have left my box, receive ones entering my box
    atoms will be lost if not inside a touching proc's box
-     can happen if atom moves outside of non-periodic bounary
+     can happen if atom moves outside of non-periodic boundary
      or if atom moves more than one proc away
    this routine called before every reneighboring
    for triclinic, atoms must be in lamda coords (0-1) before exchange is called
diff --git a/src/compute_cna_atom.cpp b/src/compute_cna_atom.cpp
index 054798f637..5f0f047958 100644
--- a/src/compute_cna_atom.cpp
+++ b/src/compute_cna_atom.cpp
@@ -142,7 +142,7 @@ void ComputeCNAAtom::compute_peratom()
   numneigh = list->numneigh;
   firstneigh = list->firstneigh;
 
-  // find the neigbours of each atom within cutoff using full neighbor list
+  // find the neighbors of each atom within cutoff using full neighbor list
   // nearest[] = atom indices of nearest neighbors, up to MAXNEAR
   // do this for all atoms, not just compute group
   // since CNA calculation requires neighbors of neighbors
diff --git a/src/compute_orientorder_atom.cpp b/src/compute_orientorder_atom.cpp
index dcb104fc3a..3dafd08a0f 100644
--- a/src/compute_orientorder_atom.cpp
+++ b/src/compute_orientorder_atom.cpp
@@ -508,7 +508,7 @@ void ComputeOrientOrderAtom::calc_boop(double **rlist,
   // TODO:
   // 1. [done]Need to allocate extra memory in qnarray[] for this option
   // 2. [done]Need to add keyword option
-  // 3. [done]Need to caclulate Clebsch-Gordan/Wigner 3j coefficients
+  // 3. [done]Need to calculate Clebsch-Gordan/Wigner 3j coefficients
   //     (Can try getting them from boop.py first)
   // 5. [done]Compare to bcc values in /Users/athomps/netapp/codes/MatMiner/matminer/matminer/featurizers/boop.py
   // 6. [done]I get the right answer for W_l, but need to make sure that factor of 1/sqrt(l+1) is right for cglist
diff --git a/src/create_atoms.cpp b/src/create_atoms.cpp
index 212a70f80a..5325b8b9b1 100644
--- a/src/create_atoms.cpp
+++ b/src/create_atoms.cpp
@@ -490,7 +490,13 @@ void CreateAtoms::command(int narg, char **arg)
     for (int i = 0; i < molcreate; i++) {
       if (tag) offset = tag[ilocal]-1;
       for (int m = 0; m < natoms; m++) {
-        if (molecule_flag) molecule[ilocal] = moloffset + i+1;
+        if (molecule_flag) {
+          if (onemol->moleculeflag) {
+            molecule[ilocal] = moloffset + onemol->molecule[m];
+          } else {
+            molecule[ilocal] = moloffset + 1;
+          }
+        }
         if (molecular == 2) {
           atom->molindex[ilocal] = 0;
           atom->molatom[ilocal] = m;
@@ -524,6 +530,13 @@ void CreateAtoms::command(int narg, char **arg)
         }
         ilocal++;
       }
+      if (molecule_flag) {
+        if (onemol->moleculeflag) {
+          moloffset += onemol->nmolecules;
+        } else {
+          moloffset++;
+        }
+      }
     }
 
     // perform irregular comm to migrate atoms to new owning procs
diff --git a/src/dump_image.cpp b/src/dump_image.cpp
index 7e6bc0c44c..a78c214e08 100644
--- a/src/dump_image.cpp
+++ b/src/dump_image.cpp
@@ -403,7 +403,7 @@ DumpImage::DumpImage(LAMMPS *lmp, int narg, char **arg) :
 
   image->buffers();
 
-  // communication neede for bonds colored by atoms
+  // communication needed for bonds colored by atoms
 
   if (bondflag) {
     if (bcolor == ATOM || bdiam == ATOM) comm_forward = 3;
diff --git a/src/error.cpp b/src/error.cpp
index e5e9179fda..0883387f4d 100644
--- a/src/error.cpp
+++ b/src/error.cpp
@@ -18,6 +18,7 @@
 #include "universe.h"
 #include "output.h"
 #include "input.h"
+#include "accelerator_kokkos.h"
 
 #if defined(LAMMPS_EXCEPTIONS)
 #include "update.h"
@@ -83,6 +84,7 @@ void Error::universe_all(const char *file, int line, const char *str)
   snprintf(msg, 100, "ERROR: %s (%s:%d)\n", str, truncpath(file), line);
   throw LAMMPSException(msg);
 #else
+  if (lmp->kokkos) Kokkos::finalize();
   MPI_Finalize();
   exit(1);
 #endif
@@ -173,6 +175,7 @@ void Error::all(const char *file, int line, const char *str)
   if (logfile) fclose(logfile);
 
   if (universe->nworlds > 1) MPI_Abort(universe->uworld,1);
+  if (lmp->kokkos) Kokkos::finalize();
   MPI_Finalize();
   exit(1);
 #endif
@@ -259,6 +262,7 @@ void Error::done(int status)
   if (screen && screen != stdout) fclose(screen);
   if (logfile) fclose(logfile);
 
+  if (lmp->kokkos) Kokkos::finalize();
   MPI_Finalize();
   exit(status);
 }
diff --git a/src/fix_balance.cpp b/src/fix_balance.cpp
index 5ca1ec124a..83973efab7 100644
--- a/src/fix_balance.cpp
+++ b/src/fix_balance.cpp
@@ -239,7 +239,7 @@ void FixBalance::pre_exchange()
 
 /* ----------------------------------------------------------------------
    compute final imbalance factor based on nlocal after comm->exchange()
-   only do this if rebalancing just occured
+   only do this if rebalancing just occurred
 ------------------------------------------------------------------------- */
 
 void FixBalance::pre_neighbor()
diff --git a/src/fix_deform.cpp b/src/fix_deform.cpp
index 9d84c4bb62..727065dafb 100644
--- a/src/fix_deform.cpp
+++ b/src/fix_deform.cpp
@@ -971,7 +971,7 @@ void FixDeform::restart(char *buf)
     set[i].hi_initial = set_restart[i].hi_initial;
     set[i].vol_initial = set_restart[i].vol_initial;
     set[i].tilt_initial = set_restart[i].tilt_initial;
-    // check if style settings are consitent (should do the whole set?)
+    // check if style settings are consistent (should do the whole set?)
     if (set[i].style != set_restart[i].style)
       samestyle = 0;
     if (set[i].substyle != set_restart[i].substyle)
diff --git a/src/fix_halt.cpp b/src/fix_halt.cpp
index 8ebb39f0e9..409bfbe8a1 100644
--- a/src/fix_halt.cpp
+++ b/src/fix_halt.cpp
@@ -29,7 +29,7 @@
 using namespace LAMMPS_NS;
 using namespace FixConst;
 
-enum{BONDMAX,TLIMIT,VARIABLE};
+enum{BONDMAX,TLIMIT,DISKFREE,VARIABLE};
 enum{LT,LE,GT,GE,EQ,NEQ,XOR};
 enum{HARD,SOFT,CONTINUE};
 enum{NOMSG,YESMSG};
@@ -37,7 +37,7 @@ enum{NOMSG,YESMSG};
 /* ---------------------------------------------------------------------- */
 
 FixHalt::FixHalt(LAMMPS *lmp, int narg, char **arg) :
-  Fix(lmp, narg, arg), idvar(NULL)
+  Fix(lmp, narg, arg), idvar(NULL), dlimit_path(NULL)
 {
   if (narg < 7) error->all(FLERR,"Illegal fix halt command");
   nevery = force->inumeric(FLERR,arg[3]);
@@ -46,37 +46,45 @@ FixHalt::FixHalt(LAMMPS *lmp, int narg, char **arg) :
   // comparison args
 
   idvar = NULL;
+  int iarg = 4;
 
-  if (strcmp(arg[4],"tlimit") == 0) attribute = TLIMIT;
-  else if (strcmp(arg[4],"bondmax") == 0) attribute = BONDMAX;
-  else if (strncmp(arg[4],"v_",2) == 0) {
+  if (strcmp(arg[iarg],"tlimit") == 0) {
+    attribute = TLIMIT;
+  } else if (strcmp(arg[iarg],"diskfree") == 0) {
+    attribute = DISKFREE;
+    dlimit_path = new char[2];
+    strcpy(dlimit_path,".");
+  } else if (strcmp(arg[iarg],"bondmax") == 0) {
+    attribute = BONDMAX;
+  } else if (strncmp(arg[iarg],"v_",2) == 0) {
     attribute = VARIABLE;
-    int n = strlen(arg[4]);
+    int n = strlen(arg[iarg]);
     idvar = new char[n];
-    strcpy(idvar,&arg[4][2]);
+    strcpy(idvar,&arg[iarg][2]);
     ivar = input->variable->find(idvar);
     if (ivar < 0) error->all(FLERR,"Could not find fix halt variable name");
     if (input->variable->equalstyle(ivar) == 0)
       error->all(FLERR,"Fix halt variable is not equal-style variable");
   } else error->all(FLERR,"Invalid fix halt attribute");
 
-  if (strcmp(arg[5],"<") == 0) operation = LT;
-  else if (strcmp(arg[5],"<=") == 0) operation = LE;
-  else if (strcmp(arg[5],">") == 0) operation = GT;
-  else if (strcmp(arg[5],">=") == 0) operation = GE;
-  else if (strcmp(arg[5],"==") == 0) operation = EQ;
-  else if (strcmp(arg[5],"!=") == 0) operation = NEQ;
-  else if (strcmp(arg[5],"|^") == 0) operation = XOR;
+  ++iarg;
+  if (strcmp(arg[iarg],"<") == 0) operation = LT;
+  else if (strcmp(arg[iarg],"<=") == 0) operation = LE;
+  else if (strcmp(arg[iarg],">") == 0) operation = GT;
+  else if (strcmp(arg[iarg],">=") == 0) operation = GE;
+  else if (strcmp(arg[iarg],"==") == 0) operation = EQ;
+  else if (strcmp(arg[iarg],"!=") == 0) operation = NEQ;
+  else if (strcmp(arg[iarg],"|^") == 0) operation = XOR;
   else error->all(FLERR,"Invalid fix halt operator");
 
-  value = force->numeric(FLERR,arg[6]);
+  ++iarg;
+  value = force->numeric(FLERR,arg[iarg]);
 
   // parse optional args
 
   eflag = SOFT;
   msgflag = YESMSG;
-
-  int iarg = 7;
+  ++iarg;
   while (iarg < narg) {
     if (strcmp(arg[iarg],"error") == 0) {
       if (iarg+2 > narg) error->all(FLERR,"Illegal fix halt command");
@@ -91,6 +99,19 @@ FixHalt::FixHalt(LAMMPS *lmp, int narg, char **arg) :
       else if (strcmp(arg[iarg+1],"yes") == 0) msgflag = YESMSG;
       else error->all(FLERR,"Illegal fix halt command");
       iarg += 2;
+    } else if (strcmp(arg[iarg],"path") == 0) {
+      if (iarg+2 > narg) error->all(FLERR,"Illegal fix halt command");
+      ++iarg;
+      int len = strlen(arg[iarg])+1;
+      delete[] dlimit_path;
+      dlimit_path = new char[len];
+      // strip off quotes, if present
+      if ( ((arg[iarg][0] == '"') || (arg[iarg][0] == '\''))
+           && (arg[iarg][0] == arg[iarg][len-2]) ) {
+        strcpy(dlimit_path,&arg[iarg][1]);
+        dlimit_path[len-3] = '\0';
+      } else strcpy(dlimit_path,arg[iarg]);
+      ++iarg;
     } else error->all(FLERR,"Illegal fix halt command");
   }
 
@@ -109,6 +130,7 @@ FixHalt::FixHalt(LAMMPS *lmp, int narg, char **arg) :
 FixHalt::~FixHalt()
 {
   delete [] idvar;
+  delete [] dlimit_path;
 }
 
 /* ---------------------------------------------------------------------- */
@@ -140,6 +162,13 @@ void FixHalt::init()
   nextstep = (update->ntimestep/nevery)*nevery + nevery;
   thisstep = -1;
   tratio = 0.5;
+
+  // check if disk limit is supported
+
+  if (attribute == DISKFREE) {
+    if (diskfree() < 0.0)
+      error->all(FLERR,"Disk limit not supported by OS or illegal path");
+  }
 }
 
 /* ---------------------------------------------------------------------- */
@@ -162,6 +191,8 @@ void FixHalt::end_of_step()
   if (attribute == TLIMIT) {
     if (update->ntimestep != nextstep) return;
     attvalue = tlimit();
+  } else if (attribute == DISKFREE) {
+    attvalue = diskfree();
   } else if (attribute == BONDMAX) {
     attvalue = bondmax();
   } else {
@@ -194,8 +225,9 @@ void FixHalt::end_of_step()
   // print message with ID of fix halt in case multiple instances
 
   char str[128];
-  sprintf(str,"Fix halt %s condition met on step " BIGINT_FORMAT " with value %g",
-          id,update->ntimestep,attvalue);
+  sprintf(str,"Fix halt condition for fix-id %s met on step "
+          BIGINT_FORMAT " with value %g",
+          id, update->ntimestep, attvalue);
 
   if (eflag == HARD) {
     error->all(FLERR,str);
@@ -270,3 +302,35 @@ double FixHalt::tlimit()
 
   return cpu;
 }
+
+/* ----------------------------------------------------------------------
+   determine available disk space, if supported. Return -1 if not.
+------------------------------------------------------------------------- */
+#if defined(__linux) || defined(__APPLE__)
+#include <sys/statvfs.h>
+#endif
+double FixHalt::diskfree()
+{
+#if defined(__linux) || defined(__APPLE__)
+  struct statvfs fs;
+  double disk_free = -1.0;
+
+  if (dlimit_path) {
+    disk_free = 1.0e100;
+    int rv = statvfs(dlimit_path,&fs);
+    if (rv == 0) {
+#if defined(__linux)
+      disk_free = fs.f_bavail*fs.f_bsize/1048576.0;
+#elif defined(__APPLE__)
+      disk_free = fs.f_bavail*fs.f_frsize/1048576.0;
+#endif
+    } else
+      disk_free = -1.0;
+
+    MPI_Bcast(&disk_free,1,MPI_DOUBLE,0,world);
+  }
+  return disk_free;
+#else
+  return -1.0;
+#endif
+}
diff --git a/src/fix_halt.h b/src/fix_halt.h
index 93c5e95078..ae1b8aeda7 100644
--- a/src/fix_halt.h
+++ b/src/fix_halt.h
@@ -39,9 +39,11 @@ class FixHalt : public Fix {
   bigint nextstep,thisstep;
   double value,tratio;
   char *idvar;
+  char *dlimit_path;
 
   double bondmax();
   double tlimit();
+  double diskfree();
 };
 
 }
@@ -59,26 +61,26 @@ command-line option when running LAMMPS to see the offending line.
 
 E: Could not find fix halt variable name
 
-UNDOCUMENTED
+Self-explanatory.
 
 E: Fix halt variable is not equal-style variable
 
-UNDOCUMENTED
+Self-explanatory.
 
 E: Invalid fix halt attribute
 
-UNDOCUMENTED
+Self-explanatory.
 
 E: Invalid fix halt operator
 
-UNDOCUMENTED
+Self-explanatory.
 
-E: Fix halt %s condition met on step %ld with value %g
+E: Disk limit not supported by OS or illegal path
 
-UNDOCUMENTED
+Self-explanatory.
 
-U: Cannot open fix print file %s
+W: Fix halt condition for fix-id %s met on step %ld with value %g
 
-The output file generated by the fix print command cannot be opened
+Self explanatory.
 
 */
diff --git a/src/fix_numdiff.cpp b/src/fix_numdiff.cpp
new file mode 100644
index 0000000000..0fc5b4ada0
--- /dev/null
+++ b/src/fix_numdiff.cpp
@@ -0,0 +1,349 @@
+/* ----------------------------------------------------------------------
+   LAMMPS - Large-scale Atomic/Molecular Massively Parallel Simulator
+   http://lammps.sandia.gov, Sandia National Laboratories
+   Steve Plimpton, sjplimp@sandia.gov
+
+   Copyright (2003) Sandia Corporation.  Under the terms of Contract
+   DE-AC04-94AL85000 with Sandia Corporation, the U.S. Government retains
+   certain rights in this software.  This software is distributed under
+   the GNU General Public License.
+
+   See the README file in the top-level LAMMPS directory.
+------------------------------------------------------------------------- */
+
+/* ----------------------------------------------------------------------
+   Contributing author: Charles Sievers (UC Davis)
+------------------------------------------------------------------------- */
+
+#include "fix_numdiff.h"
+#include <mpi.h>
+#include <cstring>
+#include "atom.h"
+#include "domain.h"
+#include "update.h"
+#include "modify.h"
+#include "compute.h"
+#include "respa.h"
+#include "force.h"
+#include "pair.h"
+#include "bond.h"
+#include "angle.h"
+#include "dihedral.h"
+#include "improper.h"
+#include "kspace.h"
+#include "memory.h"
+#include "error.h"
+
+using namespace LAMMPS_NS;
+using namespace FixConst;
+
+/* ---------------------------------------------------------------------- */
+
+FixNumDiff::FixNumDiff(LAMMPS *lmp, int narg, char **arg) :
+  Fix(lmp, narg, arg), id_pe(NULL), numdiff_forces(NULL),
+  temp_x(NULL), temp_f(NULL)
+{
+  if (narg < 5) error->all(FLERR,"Illegal fix numdiff command");
+
+  peratom_flag = 1;
+  peratom_freq = nevery;
+  size_peratom_cols = 3;
+  respa_level_support = 1;
+
+  nevery = force->inumeric(FLERR,arg[3]);
+  delta = force->numeric(FLERR,arg[4]);
+  if (nevery <= 0 || delta <= 0.0)
+    error->all(FLERR,"Illegal fix numdiff command");
+
+  int n = strlen(id) + 6;
+  id_pe = new char[n];
+  strcpy(id_pe,id);
+  strcat(id_pe,"_pe");
+
+  char **newarg = new char*[3];
+  newarg[0] = id_pe;
+  newarg[1] = (char *) "all";
+  newarg[2] = (char *) "pe";
+  modify->add_compute(3,newarg);
+  delete [] newarg;
+
+  maxatom = 0;
+
+  if (atom->map_style == 0)
+    error->all(FLERR,"Fix numdiff requires an atom map, see atom_modify");
+
+  // perform initial allocation of atom-based arrays
+  // zero numdiff_forces since dump may access it on timestep 0
+  // zero numdiff_forces since a variable may access it before first run
+
+  reallocate();
+  force_clear(numdiff_forces);
+}
+
+/* ---------------------------------------------------------------------- */
+
+FixNumDiff::~FixNumDiff()
+{
+  memory->destroy(numdiff_forces);
+  memory->destroy(temp_x);
+  memory->destroy(temp_f);
+
+  modify->delete_compute(id_pe);
+  delete [] id_pe;
+}
+
+/* ---------------------------------------------------------------------- */
+
+int FixNumDiff::setmask()
+{
+  datamask_read = datamask_modify = 0;
+
+  int mask = 0;
+  mask |= POST_FORCE;
+  mask |= POST_FORCE_RESPA;
+  mask |= MIN_POST_FORCE;
+  return mask;
+}
+
+/* ---------------------------------------------------------------------- */
+
+void FixNumDiff::init()
+{
+  // require consecutive atom IDs
+
+  if (!atom->tag_enable || !atom->tag_consecutive())
+    error->all(FLERR,"Fix numdiff requires consecutive atom IDs");
+
+  // check for PE compute
+
+  int icompute = modify->find_compute(id_pe);
+  if (icompute < 0) error->all(FLERR,"Compute ID for fix numdiff does not exist");
+  pe = modify->compute[icompute];
+
+  if (force->pair && force->pair->compute_flag) pair_compute_flag = 1;
+  else pair_compute_flag = 0;
+  if (force->kspace && force->kspace->compute_flag) kspace_compute_flag = 1;
+  else kspace_compute_flag = 0;
+
+  if (strstr(update->integrate_style,"respa")) {
+    ilevel_respa = ((Respa *) update->integrate)->nlevels-1;
+    if (respa_level >= 0) ilevel_respa = MIN(respa_level,ilevel_respa);
+  }
+}
+
+/* ---------------------------------------------------------------------- */
+
+void FixNumDiff::setup(int vflag)
+{
+  if (strstr(update->integrate_style,"verlet"))
+    post_force(vflag);
+  else {
+    ((Respa *) update->integrate)->copy_flevel_f(ilevel_respa);
+    post_force_respa(vflag,ilevel_respa,0);
+    ((Respa *) update->integrate)->copy_f_flevel(ilevel_respa);
+  }
+}
+
+/* ---------------------------------------------------------------------- */
+
+void FixNumDiff::min_setup(int vflag)
+{
+  post_force(vflag);
+}
+
+/* ---------------------------------------------------------------------- */
+
+void FixNumDiff::post_force(int /* vflag */)
+{
+  if (update->ntimestep % nevery) return;
+
+  calculate_forces();
+}
+
+/* ---------------------------------------------------------------------- */
+
+void FixNumDiff::post_force_respa(int vflag, int ilevel, int /*iloop*/)
+{
+  if (ilevel == ilevel_respa) post_force(vflag);
+}
+
+/* ---------------------------------------------------------------------- */
+
+void FixNumDiff::min_post_force(int vflag)
+{
+  post_force(vflag);
+}
+
+/* ----------------------------------------------------------------------
+   compute finite difference forces
+------------------------------------------------------------------------- */
+
+void FixNumDiff::calculate_forces()
+{
+  int i,j,ilocal;
+  double energy;
+
+  // grow arrays if necessary
+
+  if (atom->nlocal + atom->nghost > maxatom) reallocate();
+
+  // store copy of current forces for owned and ghost atoms
+
+  double **x = atom->x;
+  double **f = atom->f;
+  int nlocal = atom->nlocal;
+  int nall = nlocal + atom->nghost;
+
+  for (i = 0; i < nall; i++)
+    for (j = 0; j < 3; j++) {
+      temp_x[i][j] = x[i][j];
+      temp_f[i][j] = f[i][j];
+    }
+
+  // initialize numerical forces to zero
+
+  force_clear(numdiff_forces);
+
+  // loop over all atoms in system
+  // compute a finite difference force in each dimension
+
+  int flag,allflag;
+  double denominator = 0.5 / delta;
+
+  int *mask = atom->mask;
+  int ntotal = static_cast<tagint> (atom->natoms);
+  int dimension = domain->dimension;
+
+  for (tagint m = 1; m <= ntotal; m++) {
+    ilocal = atom->map(m);
+    flag = 0;
+    if ((ilocal >= 0 && ilocal < nlocal) && (mask[ilocal] & groupbit)) flag = 1;
+    MPI_Allreduce(&flag,&allflag,1,MPI_INT,MPI_SUM,world);
+    if (!allflag) continue;
+
+    for (int idim = 0; idim < dimension; idim++) {
+      displace_atoms(ilocal,idim,1);
+      energy = update_energy();
+      if (ilocal >= 0 && ilocal < nlocal)
+        numdiff_forces[ilocal][idim] -= energy;
+
+      displace_atoms(ilocal,idim,-2);
+      energy = update_energy();
+      if (ilocal >= 0 && ilocal < nlocal) {
+        numdiff_forces[ilocal][idim] += energy;
+        numdiff_forces[ilocal][idim] *= denominator;
+      }
+
+      restore_atoms(ilocal,idim);
+    }
+  }
+
+  // restore original forces for owned and ghost atoms
+
+  for (i = 0; i < nall; i++)
+    for (j = 0; j < 3; j++) {
+      f[i][j] = temp_f[i][j];
+    }
+}
+
+/* ----------------------------------------------------------------------
+   displace position of all owned and ghost copies of ilocal
+---------------------------------------------------------------------- */
+
+void FixNumDiff::displace_atoms(int ilocal, int idim, int magnitude)
+{
+  if (ilocal < 0) return;
+
+  double **x = atom->x;
+  int *sametag = atom->sametag;
+  int j = ilocal;
+  x[ilocal][idim] += delta*magnitude;
+
+  while (sametag[j] >= 0) {
+    j = sametag[j];
+    x[j][idim] += delta*magnitude;
+  }
+}
+
+/* ----------------------------------------------------------------------
+   restore position of all owned and ghost copies of ilocal
+---------------------------------------------------------------------- */
+
+void FixNumDiff::restore_atoms(int ilocal, int idim)
+{
+  if (ilocal < 0) return;
+
+  double **x = atom->x;
+  int *sametag = atom->sametag;
+  int j = ilocal;
+  x[ilocal][idim] = temp_x[ilocal][idim];
+
+  while (sametag[j] >= 0) {
+    j = sametag[j];
+    x[j][idim] = temp_x[j][idim];
+  }
+}
+
+/* ----------------------------------------------------------------------
+   evaluate potential energy and forces
+   same logic as in Verlet
+------------------------------------------------------------------------- */
+
+double FixNumDiff::update_energy()
+{
+  force_clear(atom->f);
+
+  int eflag = 1;
+
+  if (pair_compute_flag) force->pair->compute(eflag,0);
+
+  if (atom->molecular) {
+    if (force->bond) force->bond->compute(eflag,0);
+    if (force->angle) force->angle->compute(eflag,0);
+    if (force->dihedral) force->dihedral->compute(eflag,0);
+    if (force->improper) force->improper->compute(eflag,0);
+  }
+
+  if (kspace_compute_flag) force->kspace->compute(eflag,0);
+
+  double energy = pe->compute_scalar();
+  return energy;
+}
+
+/* ----------------------------------------------------------------------
+   clear forces needed
+------------------------------------------------------------------------- */
+
+void FixNumDiff::force_clear(double **forces)
+{
+  size_t nbytes = sizeof(double) * atom->nlocal;
+  if (force->newton) nbytes += sizeof(double) * atom->nghost;
+  if (nbytes) memset(&forces[0][0],0,3*nbytes);
+}
+
+/* ----------------------------------------------------------------------
+   reallocated local per-atoms arrays
+------------------------------------------------------------------------- */
+
+void FixNumDiff::reallocate()
+{
+  memory->destroy(numdiff_forces);
+  memory->destroy(temp_x);
+  memory->destroy(temp_f);
+  maxatom = atom->nmax;
+  memory->create(numdiff_forces,maxatom,3,"numdiff:numdiff_force");
+  memory->create(temp_x,maxatom,3,"numdiff:temp_x");
+  memory->create(temp_f,maxatom,3,"numdiff:temp_f");
+  array_atom = numdiff_forces;
+}
+
+/* ----------------------------------------------------------------------
+   memory usage of local atom-based arrays
+------------------------------------------------------------------------- */
+
+double FixNumDiff::memory_usage()
+{
+  bigint bytes = 0.0;
+  bytes += 3 * maxatom*3 * sizeof(double);
+  return bytes;
+}
diff --git a/src/fix_numdiff.h b/src/fix_numdiff.h
new file mode 100644
index 0000000000..e4a2d06afd
--- /dev/null
+++ b/src/fix_numdiff.h
@@ -0,0 +1,90 @@
+/* -*- c++ -*- ----------------------------------------------------------
+   LAMMPS - Large-scale Atomic/Molecular Massively Parallel Simulator
+   http://lammps.sandia.gov, Sandia National Laboratories
+   Steve Plimpton, sjplimp@sandia.gov
+
+   Copyright (2003) Sandia Corporation.  Under the terms of Contract
+   DE-AC04-94AL85000 with Sandia Corporation, the U.S. Government retains
+   certain rights in this software.  This software is distributed under
+   the GNU General Public License.
+
+   See the README file in the top-level LAMMPS directory.
+------------------------------------------------------------------------- */
+
+#ifdef FIX_CLASS
+
+FixStyle(numdiff,FixNumDiff)
+
+#else
+
+#ifndef LMP_FIX_NUMDIFF_H
+#define LMP_FIX_NUMDIFF_H
+
+#include "fix.h"
+
+namespace LAMMPS_NS {
+
+class FixNumDiff : public Fix {
+ public:
+  FixNumDiff(class LAMMPS *, int, char **);
+  ~FixNumDiff();
+  int setmask();
+  void init();
+  void setup(int);
+  void min_setup(int);
+  void post_force(int);
+  void post_force_respa(int, int, int);
+  void min_post_force(int);
+  double memory_usage();
+
+private:
+  double delta;
+  int maxatom;
+  int ilevel_respa;
+
+  int pair_compute_flag;            // 0 if pair->compute is skipped
+  int kspace_compute_flag;          // 0 if kspace->compute is skipped
+
+  char *id_pe;
+  class Compute *pe;
+
+  double **numdiff_forces;          // finite diff forces
+  double **temp_x;                  // original coords
+  double **temp_f;                  // original forces
+
+  void calculate_forces();
+  void displace_atoms(int, int, int);
+  void restore_atoms(int, int);
+  double update_energy();
+  void force_clear(double **);
+  void reallocate();
+};
+
+}
+
+#endif
+#endif
+
+/* ERROR/WARNING messages:
+
+E: Illegal ... command
+
+Self-explanatory.  Check the input script syntax and compare to the
+documentation for the command.  You can use -echo screen as a
+command-line option when running LAMMPS to see the offending line.
+
+E: Fix numdiff requires an atom map, see atom_modify
+
+Self-explanatory. Efficient loop over all atoms for numerical difference
+requires an atom map.
+
+E: Fix numdiff requires consecutive atom IDs
+
+Self-explanatory. Efficient loop over all atoms for numerical difference
+requires consecutive atom IDs.
+
+E: Compute ID for fix numdiff does not exist
+
+Self-explanatory.
+
+*/
diff --git a/src/fix_tmd.cpp b/src/fix_tmd.cpp
index cfe9a9572e..604660e7c4 100644
--- a/src/fix_tmd.cpp
+++ b/src/fix_tmd.cpp
@@ -13,7 +13,7 @@
 
 /* ----------------------------------------------------------------------
    Contributing authors: Paul Crozier (SNL)
-                         Christian Burisch (Bochum Univeristy, Germany)
+                         Christian Burisch (Bochum University, Germany)
 ------------------------------------------------------------------------- */
 
 #include "fix_tmd.h"
diff --git a/src/hashlittle.cpp b/src/hashlittle.cpp
index c3824b71fe..5c336c2082 100644
--- a/src/hashlittle.cpp
+++ b/src/hashlittle.cpp
@@ -173,7 +173,7 @@ uint32_t LAMMPS_NS::hashlittle(const void *key, size_t length, uint32_t initval)
      * rest of the string.  Every machine with memory protection I've seen
      * does it on word boundaries, so is OK with this.  But VALGRIND will
      * still catch it and complain.  The masking trick does make the hash
-     * noticably faster for short strings (like English words).
+     * noticeably faster for short strings (like English words).
      */
 #ifndef VALGRIND
 
diff --git a/src/info.cpp b/src/info.cpp
index ca90a6cc2f..d6b5c508aa 100644
--- a/src/info.cpp
+++ b/src/info.cpp
@@ -121,6 +121,12 @@ using namespace std;
 template<typename ValueType>
 static void print_columns(FILE* fp, map<string, ValueType> * styles);
 
+template<typename ValueType>
+static bool find_style(const LAMMPS * lmp, map<string, ValueType> * styles, const string & name, bool suffix_check);
+
+template<typename ValueType>
+static vector<string> get_style_names(map<string, ValueType> * styles);
+
 /* ---------------------------------------------------------------------- */
 
 void Info::command(int narg, char **arg)
@@ -868,73 +874,9 @@ bool Info::is_active(const char *category, const char *name)
 bool Info::is_available(const char *category, const char *name)
 {
   if ((category == NULL) || (name == NULL)) return false;
-  const int len = strlen(name);
-  int match = 0;
 
-  if (strcmp(category,"command") == 0) {
-    if (input->command_map->find(name) != input->command_map->end())
-      match = 1;
-
-  } else if (strcmp(category,"compute") == 0) {
-    if (modify->compute_map->find(name) != modify->compute_map->end())
-      match = 1;
-
-    if (!match && lmp->suffix_enable) {
-      if (lmp->suffix) {
-        char *name_w_suffix = new char [len + 2 + strlen(lmp->suffix)];
-        sprintf(name_w_suffix,"%s/%s",name,lmp->suffix);
-        if (modify->compute_map->find(name_w_suffix) != modify->compute_map->end())
-          match = 1;
-        delete[] name_w_suffix;
-      }
-      if (!match && lmp->suffix2) {
-        char *name_w_suffix = new char [len + 2 + strlen(lmp->suffix2)];
-        sprintf(name_w_suffix,"%s/%s",name,lmp->suffix2);
-        if (modify->compute_map->find(name_w_suffix) != modify->compute_map->end())
-          match = 1;
-        delete[] name_w_suffix;
-      }
-    }
-  } else if (strcmp(category,"fix") == 0) {
-    if (modify->fix_map->find(name) != modify->fix_map->end())
-      match = 1;
-
-    if (!match && lmp->suffix_enable) {
-      if (lmp->suffix) {
-        char *name_w_suffix = new char [len + 2 + strlen(lmp->suffix)];
-        sprintf(name_w_suffix,"%s/%s",name,lmp->suffix);
-        if (modify->fix_map->find(name_w_suffix) != modify->fix_map->end())
-          match = 1;
-        delete[] name_w_suffix;
-      }
-      if (!match && lmp->suffix2) {
-        char *name_w_suffix = new char [len + 2 + strlen(lmp->suffix2)];
-        sprintf(name_w_suffix,"%s/%s",name,lmp->suffix2);
-        if (modify->fix_map->find(name_w_suffix) != modify->fix_map->end())
-          match = 1;
-        delete[] name_w_suffix;
-      }
-    }
-  } else if (strcmp(category,"pair_style") == 0) {
-    if (force->pair_map->find(name) != force->pair_map->end())
-      match = 1;
-
-    if (!match && lmp->suffix_enable) {
-      if (lmp->suffix) {
-        char *name_w_suffix = new char [len + 2 + strlen(lmp->suffix)];
-        sprintf(name_w_suffix,"%s/%s",name,lmp->suffix);
-        if (force->pair_map->find(name_w_suffix) != force->pair_map->end())
-          match = 1;
-        delete[] name_w_suffix;
-      }
-      if (!match && lmp->suffix2) {
-        char *name_w_suffix = new char [len + 2 + strlen(lmp->suffix2)];
-        sprintf(name_w_suffix,"%s/%s",name,lmp->suffix2);
-        if (force->pair_map->find(name_w_suffix) != force->pair_map->end())
-          match = 1;
-        delete[] name_w_suffix;
-      }
-    }
+  if (has_style(category, name)) {
+    return true;
   } else if (strcmp(category,"feature") == 0) {
     if (strcmp(name,"gzip") == 0) {
       return has_gzip_support();
@@ -949,7 +891,7 @@ bool Info::is_available(const char *category, const char *name)
     }
   } else error->all(FLERR,"Unknown category for info is_available()");
 
-  return match ? true : false;
+  return false;
 }
 
 /* ---------------------------------------------------------------------- */
@@ -1001,6 +943,7 @@ bool Info::is_defined(const char *category, const char *name)
   } else if (strcmp(category,"variable") == 0) {
     int nvar = input->variable->nvar;
     char **names = input->variable->names;
+
     for (int i=0; i < nvar; ++i) {
       if (strcmp(names[i],name) == 0)
         return true;
@@ -1010,6 +953,113 @@ bool Info::is_defined(const char *category, const char *name)
   return false;
 }
 
+bool Info::has_style(const string & category, const string & name)
+{
+  if ( category == "atom" ) {
+    return find_style(lmp, atom->avec_map, name, false);
+  } else if( category == "integrate" ) {
+    return find_style(lmp, update->integrate_map, name, true);
+  } else if( category == "minimize" ) {
+    return find_style(lmp, update->minimize_map, name, true);
+  } else if( category == "pair" ) {
+    return find_style(lmp, force->pair_map, name, true);
+  } else if( category == "bond" ) {
+    return find_style(lmp, force->bond_map, name, true);
+  } else if( category == "angle" ) {
+    return find_style(lmp, force->angle_map, name, true);
+  } else if( category == "dihedral" ) {
+    return find_style(lmp, force->dihedral_map, name, true);
+  } else if( category == "improper" ) {
+    return find_style(lmp, force->improper_map, name, true);
+  } else if( category == "kspace" ) {
+    return find_style(lmp, force->kspace_map, name, true);
+  } else if( category == "fix" ) {
+    return find_style(lmp, modify->fix_map, name, true);
+  } else if( category == "compute" ) {
+    return find_style(lmp, modify->compute_map, name, true);
+  } else if( category == "region" ) {
+    return find_style(lmp, domain->region_map, name, false);
+  } else if( category == "dump" ) {
+    return find_style(lmp, output->dump_map, name, false);
+  } else if( category == "command" ) {
+    return find_style(lmp, input->command_map, name, false);
+  }
+  return false;
+}
+
+vector<std::string> Info::get_available_styles(const string & category)
+{
+  if ( category == "atom" ) {
+    return get_style_names(atom->avec_map);
+  } else if( category == "integrate" ) {
+    return get_style_names(update->integrate_map);
+  } else if( category == "minimize" ) {
+    return get_style_names(update->minimize_map);
+  } else if( category == "pair" ) {
+    return get_style_names(force->pair_map);
+  } else if( category == "bond" ) {
+    return get_style_names(force->bond_map);
+  } else if( category == "angle" ) {
+    return get_style_names(force->angle_map);
+  } else if( category == "dihedral" ) {
+    return get_style_names(force->dihedral_map);
+  } else if( category == "improper" ) {
+    return get_style_names(force->improper_map);
+  } else if( category == "kspace" ) {
+    return get_style_names(force->kspace_map);
+  } else if( category == "fix" ) {
+    return get_style_names(modify->fix_map);
+  } else if( category == "compute" ) {
+    return get_style_names(modify->compute_map);
+  } else if( category == "region" ) {
+    return get_style_names(domain->region_map);
+  } else if( category == "dump" ) {
+    return get_style_names(output->dump_map);
+  } else if( category == "command" ) {
+    return get_style_names(input->command_map);
+  }
+  return vector<string>();
+}
+
+template<typename ValueType>
+static vector<string> get_style_names(map<string, ValueType> * styles)
+{
+  vector<string> names;
+
+  names.reserve(styles->size());
+  for(auto const& kv : *styles) {
+    // skip "secret" styles
+    if (isupper(kv.first[0])) continue;
+    names.push_back(kv.first);
+  }
+
+  return names;
+}
+
+template<typename ValueType>
+static bool find_style(const LAMMPS* lmp, map<string, ValueType> * styles, const string & name, bool suffix_check)
+{
+  if (styles->find(name) != styles->end()) {
+    return true;
+  }
+
+  if (suffix_check && lmp->suffix_enable) {
+    if (lmp->suffix) {
+      string name_w_suffix = name + "/" + lmp->suffix;
+      if (find_style(lmp, styles, name_w_suffix, false)) {
+        return true;
+      }
+    }
+    if (lmp->suffix2) {
+      string name_w_suffix = name + "/" + lmp->suffix2;
+      if (find_style(lmp, styles, name_w_suffix, false)) {
+        return true;
+      }
+    }
+  }
+  return false;
+}
+
 template<typename ValueType>
 static void print_columns(FILE* fp, map<string, ValueType> * styles)
 {
diff --git a/src/info.h b/src/info.h
index 01d6105ff2..14e4afcc19 100644
--- a/src/info.h
+++ b/src/info.h
@@ -21,6 +21,8 @@ CommandStyle(info,Info)
 #define LMP_INFO_H
 
 #include "pointers.h"
+#include <string>
+#include <vector>
 
 namespace LAMMPS_NS {
 
@@ -33,6 +35,9 @@ class Info : protected Pointers {
   bool is_defined(const char *, const char *);
   bool is_available(const char *, const char *);
 
+  bool has_style(const std::string & category, const std::string & name);
+  std::vector<std::string> get_available_styles(const std::string & category);
+
   static bool has_gzip_support();
   static bool has_png_support();
   static bool has_jpeg_support();
diff --git a/src/input.cpp b/src/input.cpp
index 6adf37e847..7024814896 100644
--- a/src/input.cpp
+++ b/src/input.cpp
@@ -1177,7 +1177,7 @@ void Input::print()
   if (narg < 1) error->all(FLERR,"Illegal print command");
 
   // copy 1st arg back into line (copy is being used)
-  // check maxline since arg[0] could have been exanded by variables
+  // check maxline since arg[0] could have been expanded by variables
   // substitute for $ variables (no printing) and print arg
 
   int n = strlen(arg[0]) + 1;
diff --git a/src/kspace.cpp b/src/kspace.cpp
index 2399c10e2b..a9356a39f1 100644
--- a/src/kspace.cpp
+++ b/src/kspace.cpp
@@ -286,7 +286,7 @@ void KSpace::qsum_qsq(int warning_flag)
   double qsum_local(0.0), qsqsum_local(0.0);
 
 #if defined(_OPENMP)
-#pragma omp parallel for default(none) reduction(+:qsum_local,qsqsum_local)
+#pragma omp parallel for default(shared) reduction(+:qsum_local,qsqsum_local)
 #endif
   for (int i = 0; i < nlocal; i++) {
     qsum_local += q[i];
diff --git a/src/kspace.h b/src/kspace.h
index 4bae983364..5a0790b63d 100644
--- a/src/kspace.h
+++ b/src/kspace.h
@@ -64,7 +64,7 @@ class KSpace : protected Pointers {
   double accuracy;                  // accuracy of KSpace solver (force units)
   double accuracy_absolute;         // user-specified accuracy in force units
   double accuracy_relative;         // user-specified dimensionless accuracy
-                                    // accurary = acc_rel * two_charge_force
+                                    // accuracy = acc_rel * two_charge_force
   double accuracy_real_6;           // real space accuracy for
                                     // dispersion solver (force units)
   double accuracy_kspace_6;         // reciprocal space accuracy for
diff --git a/src/lammps.cpp b/src/lammps.cpp
index 4b09429b52..0e3ec7d062 100644
--- a/src/lammps.cpp
+++ b/src/lammps.cpp
@@ -785,7 +785,7 @@ void LAMMPS::create()
 
 /* ----------------------------------------------------------------------
    check suffix consistency with installed packages
-   invoke package-specific deafult package commands
+   invoke package-specific default package commands
      only invoke if suffix is set and enabled
      also check if suffix2 is set
    called from LAMMPS constructor and after clear() command
diff --git a/src/library.cpp b/src/library.cpp
index ee98e47aaa..ee3a847030 100644
--- a/src/library.cpp
+++ b/src/library.cpp
@@ -537,35 +537,19 @@ void *lammps_extract_compute(void *ptr, char *id, int style, int type)
 
     if (style == 1) {
       if (!compute->peratom_flag) return NULL;
-      if (type == 1) {
-        if (compute->invoked_peratom != lmp->update->ntimestep)
-          compute->compute_peratom();
-        return (void *) compute->vector_atom;
-      }
-      if (type == 2) {
-        if (compute->invoked_peratom != lmp->update->ntimestep)
-          compute->compute_peratom();
-        return (void *) compute->array_atom;
-      }
+      if (compute->invoked_peratom != lmp->update->ntimestep)
+        compute->compute_peratom();
+      if (type == 1) return (void *) compute->vector_atom;
+      if (type == 2) return (void *) compute->array_atom;
     }
 
     if (style == 2) {
       if (!compute->local_flag) return NULL;
-      if (type == 0) {
-        if (compute->invoked_local != lmp->update->ntimestep)
-          compute->compute_local();
-        return (void *) &compute->size_local_rows;
-      }
-      if (type == 1) {
-        if (compute->invoked_local != lmp->update->ntimestep)
-          compute->compute_local();
-        return (void *) compute->vector_local;
-      }
-      if (type == 2) {
-        if (compute->invoked_local != lmp->update->ntimestep)
-          compute->compute_local();
-        return (void *) compute->array_local;
-      }
+      if (compute->invoked_local != lmp->update->ntimestep)
+        compute->compute_local();
+      if (type == 0) return (void *) &compute->size_local_rows;
+      if (type == 1) return (void *) compute->vector_local;
+      if (type == 2) return (void *) compute->array_local;
     }
   }
   END_CAPTURE
@@ -637,6 +621,7 @@ void *lammps_extract_fix(void *ptr, char *id, int style, int type,
 
     if (style == 2) {
       if (!fix->local_flag) return NULL;
+      if (type == 0) return (void *) &fix->size_local_rows;
       if (type == 1) return (void *) fix->vector_local;
       if (type == 2) return (void *) fix->array_local;
     }
@@ -1673,6 +1658,31 @@ int lammps_config_package_name(int index, char * buffer, int max_size) {
   return false;
 }
 
+int lammps_has_style(void * ptr, char * category, char * name) {
+  LAMMPS *lmp = (LAMMPS *) ptr;
+  Info info(lmp);
+  return info.has_style(category, name);
+}
+
+int lammps_style_count(void * ptr, char * category) {
+  LAMMPS *lmp = (LAMMPS *) ptr;
+  Info info(lmp);
+  return info.get_available_styles(category).size();
+}
+
+int lammps_style_name(void* ptr, char * category, int index, char * buffer, int max_size) {
+  LAMMPS *lmp = (LAMMPS *) ptr;
+  Info info(lmp);
+  auto styles = info.get_available_styles(category);
+
+  if (index < styles.size()) {
+    strncpy(buffer, styles[index].c_str(), max_size);
+    return true;
+  }
+
+  return false;
+}
+
 int lammps_config_has_gzip_support() {
   return Info::has_gzip_support();
 }
diff --git a/src/library.h b/src/library.h
index 9e6c4f45f8..d078474454 100644
--- a/src/library.h
+++ b/src/library.h
@@ -11,6 +11,9 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
+#ifndef LAMMPS_LIBRARY_H
+#define LAMMPS_LIBRARY_H
+
 /*
    C or Fortran style library interface to LAMMPS
    new LAMMPS-specific functions can be added
@@ -86,6 +89,10 @@ int lammps_config_has_jpeg_support();
 int lammps_config_has_ffmpeg_support();
 int lammps_config_has_exceptions();
 
+int lammps_has_style(void* ptr, char * category, char * name);
+int lammps_style_count(void* ptr, char * category);
+int lammps_style_name(void*ptr, char * category, int index, char * buffer, int max_size);
+
 int lammps_find_pair_neighlist(void* ptr, char * style, int exact, int nsub, int request);
 int lammps_find_fix_neighlist(void* ptr, char * id, int request);
 int lammps_find_compute_neighlist(void* ptr, char * id, int request);
@@ -114,6 +121,7 @@ int lammps_get_last_error_message(void *, char *, int);
 }
 #endif
 
+#endif /* LAMMPS_LIBRARY_H */
 /* ERROR/WARNING messages:
 
 E: Library error: issuing LAMMPS command during run
diff --git a/src/lmppython.cpp b/src/lmppython.cpp
index 52abd93f10..132790bdbe 100644
--- a/src/lmppython.cpp
+++ b/src/lmppython.cpp
@@ -117,3 +117,11 @@ int Python::execute_file(char *fname)
   init();
   return impl->execute_file(fname);
 }
+
+/* ------------------------------------------------------------------ */
+
+bool Python::has_minimum_version(int major, int minor)
+{
+  init();
+  return impl->has_minimum_version(major, minor);
+}
diff --git a/src/lmppython.h b/src/lmppython.h
index 3d55c4827b..fab307d9e6 100644
--- a/src/lmppython.h
+++ b/src/lmppython.h
@@ -28,6 +28,7 @@ public:
   virtual char * long_string(int ifunc) = 0;
   virtual int execute_string(char *) = 0;
   virtual int execute_file(char *) = 0;
+  virtual bool has_minimum_version(int major, int minor) = 0;
 };
 
 class Python : protected Pointers {
@@ -42,6 +43,7 @@ public:
   char * long_string(int ifunc);
   int execute_string(char *);
   int execute_file(char *);
+  bool has_minimum_version(int major, int minor);
 
   bool is_enabled() const;
   void init();
diff --git a/src/lmprestart.h b/src/lmprestart.h
new file mode 100644
index 0000000000..f0d43e70a5
--- /dev/null
+++ b/src/lmprestart.h
@@ -0,0 +1,43 @@
+/* ----------------------------------------------------------------------
+   LAMMPS - Large-scale Atomic/Molecular Massively Parallel Simulator
+   http://lammps.sandia.gov, Sandia National Laboratories
+   Steve Plimpton, sjplimp@sandia.gov
+
+   Copyright (2003) Sandia Corporation.  Under the terms of Contract
+   DE-AC04-94AL85000 with Sandia Corporation, the U.S. Government retains
+   certain rights in this software.  This software is distributed under
+   the GNU General Public License.
+
+   See the README file in the top-level LAMMPS directory.
+------------------------------------------------------------------------- */
+
+#ifndef LMP_RESTART_H
+#define LMP_RESTART_H
+
+#define MAGIC_STRING "LammpS RestartT"
+#define ENDIAN 0x0001
+#define ENDIANSWAP 0x1000
+#define FORMAT_REVISION 1
+
+enum{VERSION,SMALLINT,TAGINT,BIGINT,
+     UNITS,NTIMESTEP,DIMENSION,NPROCS,PROCGRID,
+     NEWTON_PAIR,NEWTON_BOND,
+     XPERIODIC,YPERIODIC,ZPERIODIC,BOUNDARY,
+     ATOM_STYLE,NATOMS,NTYPES,
+     NBONDS,NBONDTYPES,BOND_PER_ATOM,
+     NANGLES,NANGLETYPES,ANGLE_PER_ATOM,
+     NDIHEDRALS,NDIHEDRALTYPES,DIHEDRAL_PER_ATOM,
+     NIMPROPERS,NIMPROPERTYPES,IMPROPER_PER_ATOM,
+     TRICLINIC,BOXLO,BOXHI,XY,XZ,YZ,
+     SPECIAL_LJ,SPECIAL_COUL,
+     MASS,PAIR,BOND,ANGLE,DIHEDRAL,IMPROPER,
+     MULTIPROC,MPIIO,PROCSPERFILE,PERPROC,
+     IMAGEINT,BOUNDMIN,TIMESTEP,
+     ATOM_ID,ATOM_MAP_STYLE,ATOM_MAP_USER,ATOM_SORTFREQ,ATOM_SORTBIN,
+     COMM_MODE,COMM_CUTOFF,COMM_VEL,NO_PAIR,
+     EXTRA_BOND_PER_ATOM,EXTRA_ANGLE_PER_ATOM,EXTRA_DIHEDRAL_PER_ATOM,
+     EXTRA_IMPROPER_PER_ATOM,EXTRA_SPECIAL_PER_ATOM,ATOM_MAXSPECIAL};
+
+#define LB_FACTOR 1.1
+
+#endif
diff --git a/src/lmptype.h b/src/lmptype.h
index c1902e7ebe..5c19ab7483 100644
--- a/src/lmptype.h
+++ b/src/lmptype.h
@@ -29,10 +29,9 @@
 #define LMP_LMPTYPE_H
 
 // C++11 check
-#ifndef LAMMPS_CXX98
-#if __cplusplus <= 199711L
-  #error LAMMPS is planning to transition to C++11. To disable this error please use a C++11 compliant compiler, enable C++11 (or later) compliance, or define LAMMPS_CXX98 in your makefile
-#endif
+
+#if __cplusplus < 201103L
+#error LAMMPS requires a C++11 (or later) compliant compiler. Enable C++11 compatibility or upgrade the compiler.
 #endif
 
 #ifndef __STDC_LIMIT_MACROS
@@ -45,8 +44,8 @@
 
 #include <climits>
 #include <cstdlib>
-#include <stdint.h>   // <cstdint> requires C++-11
-#include <inttypes.h> // <cinttypes> requires C++-11
+#include <cstdint>
+#include <cinttypes>
 
 // grrr - IBM Power6 does not provide this def in their system header files
 
diff --git a/src/min.cpp b/src/min.cpp
index 003fd18b81..f8ed11375c 100644
--- a/src/min.cpp
+++ b/src/min.cpp
@@ -58,6 +58,18 @@ Min::Min(LAMMPS *lmp) : Pointers(lmp)
   linestyle = 1;
   normstyle = TWO;
 
+  delaystep = 20;
+  dtgrow = 1.1;
+  dtshrink = 0.5;
+  alpha0 = 0.25;
+  alphashrink = 0.99;
+  tmax = 10.0;
+  tmin = 0.02;
+  integrator = 0;
+  halfstepback_flag = 1;
+  delaystep_start_flag = 1;
+  max_vdotf_negatif = 2000;
+
   elist_global = elist_atom = NULL;
   vlist_global = vlist_atom = cvlist_atom = NULL;
 
@@ -184,6 +196,10 @@ void Min::init()
   neighbor->dist_check = 1;
 
   niter = neval = 0;
+
+  // store timestep size (important for variable timestep minimizer)
+
+  dtinit = update->dt;
 }
 
 /* ----------------------------------------------------------------------
@@ -473,6 +489,10 @@ void Min::cleanup()
 
   modify->delete_fix("MINIMIZE");
   domain->box_too_small_check();
+
+  // reset timestep size (important for variable timestep minimizer)
+
+  update->dt = dtinit;
 }
 
 /* ----------------------------------------------------------------------
@@ -658,6 +678,58 @@ void Min::modify_params(int narg, char **arg)
       if (iarg+2 > narg) error->all(FLERR,"Illegal min_modify command");
       dmax = force->numeric(FLERR,arg[iarg+1]);
       iarg += 2;
+    } else if (strcmp(arg[iarg],"delaystep") == 0) {
+      if (iarg+2 > narg) error->all(FLERR,"Illegal min_modify command");
+      delaystep = force->numeric(FLERR,arg[iarg+1]);
+      iarg += 2;
+    } else if (strcmp(arg[iarg],"dtgrow") == 0) {
+      if (iarg+2 > narg) error->all(FLERR,"Illegal min_modify command");
+      dtgrow = force->numeric(FLERR,arg[iarg+1]);
+      iarg += 2;
+    } else if (strcmp(arg[iarg],"dtshrink") == 0) {
+      if (iarg+2 > narg) error->all(FLERR,"Illegal min_modify command");
+      dtshrink = force->numeric(FLERR,arg[iarg+1]);
+      iarg += 2;
+    } else if (strcmp(arg[iarg],"alpha0") == 0) {
+      if (iarg+2 > narg) error->all(FLERR,"Illegal min_modify command");
+      alpha0 = force->numeric(FLERR,arg[iarg+1]);
+      iarg += 2;
+    } else if (strcmp(arg[iarg],"alphashrink") == 0) {
+      if (iarg+2 > narg) error->all(FLERR,"Illegal min_modify command");
+      alphashrink = force->numeric(FLERR,arg[iarg+1]);
+      iarg += 2;
+    } else if (strcmp(arg[iarg],"tmax") == 0) {
+      if (iarg+2 > narg) error->all(FLERR,"Illegal min_modify command");
+      tmax = force->numeric(FLERR,arg[iarg+1]);
+      iarg += 2;
+    } else if (strcmp(arg[iarg],"tmin") == 0) {
+      if (iarg+2 > narg) error->all(FLERR,"Illegal min_modify command");
+      tmin = force->numeric(FLERR,arg[iarg+1]);
+      iarg += 2;
+    } else if (strcmp(arg[iarg],"halfstepback") == 0) {
+      if (iarg+2 > narg) error->all(FLERR,"Illegal min_modify command");
+      if (strcmp(arg[iarg+1],"yes") == 0) halfstepback_flag = 1;
+      else if (strcmp(arg[iarg+1],"no") == 0) halfstepback_flag = 0;
+      else error->all(FLERR,"Illegal min_modify command");
+      iarg += 2;
+    } else if (strcmp(arg[iarg],"initialdelay") == 0) {
+      if (iarg+2 > narg) error->all(FLERR,"Illegal min_modify command");
+      if (strcmp(arg[iarg+1],"yes") == 0) delaystep_start_flag = 1;
+      else if (strcmp(arg[iarg+1],"no") == 0) delaystep_start_flag = 0;
+      else error->all(FLERR,"Illegal min_modify command");
+      iarg += 2;
+    } else if (strcmp(arg[iarg],"vdfmax") == 0) {
+      if (iarg+2 > narg) error->all(FLERR,"Illegal min_modify command");
+      max_vdotf_negatif = force->numeric(FLERR,arg[iarg+1]);
+      iarg += 2;
+    } else if (strcmp(arg[iarg],"integrator") == 0) {
+      if (iarg+2 > narg) error->all(FLERR,"Illegal min_modify command");
+      if (strcmp(arg[iarg+1],"eulerimplicit") == 0) integrator = 0;
+      else if (strcmp(arg[iarg+1],"verlet") == 0) integrator = 1;
+      else if (strcmp(arg[iarg+1],"leapfrog") == 0) integrator = 2;
+      else if (strcmp(arg[iarg+1],"eulerexplicit") == 0) integrator = 3;
+      else error->all(FLERR,"Illegal min_modify command");
+      iarg += 2;
     } else if (strcmp(arg[iarg],"line") == 0) {
       if (iarg+2 > narg) error->all(FLERR,"Illegal min_modify command");
       if (strcmp(arg[iarg+1],"backtrack") == 0) linestyle = 0;
@@ -999,6 +1071,7 @@ char *Min::stopstrings(int n)
                            "quadratic factors are zero",
                            "trust region too small",
                            "HFTN minimizer error",
-                           "walltime limit reached"};
+                           "walltime limit reached",
+                           "max iterations with v.f negative"};
   return (char *) strings[n];
 }
diff --git a/src/min.h b/src/min.h
index ba47f95410..b23c9b6670 100644
--- a/src/min.h
+++ b/src/min.h
@@ -57,7 +57,7 @@ class Min : protected Pointers {
 
   // possible return values of iterate() method
   enum{MAXITER,MAXEVAL,ETOL,FTOL,DOWNHILL,ZEROALPHA,ZEROFORCE,
-       ZEROQUAD,TRSMALL,INTERROR,TIMEOUT};
+       ZEROQUAD,TRSMALL,INTERROR,TIMEOUT,MAXVDOTF};
 
  protected:
   int eflag,vflag;            // flags for energy/virial computation
@@ -70,6 +70,18 @@ class Min : protected Pointers {
 
   int normstyle;                // TWO, MAX or INF flag for force norm evaluation
 
+  double dtinit;              // store the default timestep
+
+  // only for minimize style fire2
+  int delaystep;              // minium steps of dynamics
+  double dtgrow,dtshrink;     // timestep increase, decrease
+  double alpha0,alphashrink;  // mixing velocities+forces coefficient
+  double tmax,tmin;           // timestep multiplicators max, min
+  int integrator;             // Newton integration: euler, leapfrog, verlet...
+  int halfstepback_flag;      // half step backward when v.f <= 0.0
+  int delaystep_start_flag;   // delay the initial dt_shrink
+  int max_vdotf_negatif;      // maximum iteration with v.f > 0.0
+
   int nelist_global,nelist_atom;    // # of PE,virial computes to check
   int nvlist_global,nvlist_atom,ncvlist_atom;
   class Compute **elist_global;     // lists of PE,virial Computes
diff --git a/src/min_cg.cpp b/src/min_cg.cpp
index 9db1fd9799..46da4bfa5b 100644
--- a/src/min_cg.cpp
+++ b/src/min_cg.cpp
@@ -113,7 +113,7 @@ int MinCG::iterate(int maxiter)
     if (update->ftol > 0.0) {
       if (normstyle == MAX) fdotf = fnorm_max();        // max force norm
       else if (normstyle == INF) fdotf = fnorm_inf();   // infinite force norm
-      else if (normstyle == TWO) fdotf = fnorm_sqr();   // Euclidean force 2-norm
+      else if (normstyle == TWO) fdotf = dotall[0];     // same as fnorm_sqr(), Euclidean force 2-norm
       else error->all(FLERR,"Illegal min_modify command");
       if (fdotf < update->ftol*update->ftol) return FTOL;
     }
diff --git a/src/min_fire.cpp b/src/min_fire.cpp
index ca37e410b8..53bedfbb6c 100644
--- a/src/min_fire.cpp
+++ b/src/min_fire.cpp
@@ -11,16 +11,26 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
-#include "min_fire.h"
-#include <mpi.h>
+/* ----------------------------------------------------------------------
+   Contributing authors: Julien Guénolé, CNRS and
+                         Erik Bitzek, FAU Erlangen-Nuernberg
+------------------------------------------------------------------------- */
+
 #include <cmath>
+#include "min_fire.h"
 #include "universe.h"
 #include "atom.h"
-#include "error.h"
 #include "force.h"
 #include "update.h"
 #include "output.h"
 #include "timer.h"
+#include "error.h"
+#include "variable.h"
+#include "modify.h"
+#include "compute.h"
+#include "domain.h"
+#include "neighbor.h"
+#include "comm.h"
 
 using namespace LAMMPS_NS;
 
@@ -28,13 +38,6 @@ using namespace LAMMPS_NS;
 
 #define EPS_ENERGY 1.0e-8
 
-#define DELAYSTEP 5
-#define DT_GROW 1.1
-#define DT_SHRINK 0.5
-#define ALPHA0 0.1
-#define ALPHA_SHRINK 0.99
-#define TMAX 10.0
-
 /* ---------------------------------------------------------------------- */
 
 MinFire::MinFire(LAMMPS *lmp) : Min(lmp) {}
@@ -45,10 +48,18 @@ void MinFire::init()
 {
   Min::init();
 
+  // simple parameters validation
+
+  if (tmax < tmin) error->all(FLERR,"tmax has to be larger than tmin");
+  if (dtgrow < 1.0) error->all(FLERR,"dtgrow has to be larger than 1.0");
+  if (dtshrink > 1.0) error->all(FLERR,"dtshrink has to be smaller than 1.0");
+
   dt = update->dt;
-  dtmax = TMAX * dt;
-  alpha = ALPHA0;
-  last_negative = update->ntimestep;
+  dtmax = tmax * dt;
+  dtmin = tmin * dt;
+  alpha = alpha0;
+  last_negative = ntimestep_start = update->ntimestep;
+  vdotf_negatif = 0;
 }
 
 /* ---------------------------------------------------------------------- */
@@ -58,8 +69,25 @@ void MinFire::setup_style()
   double **v = atom->v;
   int nlocal = atom->nlocal;
 
+  // print the parameters used within fire into the log
+
+  const char *s1[] = {"eulerimplicit","verlet","leapfrog","eulerexplicit"};
+  const char *s2[] = {"no","yes"};
+
+  if (comm->me == 0 && logfile) {
+      fprintf(logfile,"  Parameters for fire: \n"
+      "    dmax delaystep dtgrow dtshrink alpha0 alphashrink tmax tmin "
+      "   integrator halfstepback \n"
+      "    %4g %9i %6g %8g %6g %11g %4g %4g %13s %12s \n",
+      dmax, delaystep, dtgrow, dtshrink, alpha0, alphashrink, tmax, tmin,
+      s1[integrator], s2[halfstepback_flag]);
+  }
+
+  // initialize the velocities
+
   for (int i = 0; i < nlocal; i++)
     v[i][0] = v[i][1] = v[i][2] = 0.0;
+  flagv0 = 1;
 }
 
 /* ----------------------------------------------------------------------
@@ -88,6 +116,39 @@ int MinFire::iterate(int maxiter)
 
   alpha_final = 0.0;
 
+  // Leap Frog integration initialization
+
+  if (integrator == 2) {
+
+    double **f = atom->f;
+    double **v = atom->v;
+    double *rmass = atom->rmass;
+    double *mass = atom->mass;
+    int *type = atom->type;
+    int nlocal = atom->nlocal;
+
+    energy_force(0);
+    neval++;
+
+    dtf = -0.5 * dt * force->ftm2v;
+
+    if (rmass) {
+      for (int i = 0; i < nlocal; i++) {
+        dtfm = dtf / rmass[i];
+        v[i][0] = dtfm * f[i][0];
+        v[i][1] = dtfm * f[i][1];
+        v[i][2] = dtfm * f[i][2];
+      }
+    } else {
+      for (int i = 0; i < nlocal; i++) {
+        dtfm = dtf / mass[type[i]];
+        v[i][0] = dtfm * f[i][0];
+        v[i][1] = dtfm * f[i][1];
+        v[i][2] = dtfm * f[i][2];
+      }
+    }
+  }
+
   for (int iter = 0; iter < maxiter; iter++) {
 
     if (timer->check_timeout(niter))
@@ -96,11 +157,17 @@ int MinFire::iterate(int maxiter)
     ntimestep = ++update->ntimestep;
     niter++;
 
-    // vdotfall = v dot f
+    // pointers
 
+    int nlocal = atom->nlocal;
     double **v = atom->v;
     double **f = atom->f;
-    int nlocal = atom->nlocal;
+    double **x = atom->x;
+    double *rmass = atom->rmass;
+    double *mass = atom->mass;
+    int *type = atom->type;
+
+   // vdotfall = v dot f
 
     vdotf = 0.0;
     for (int i = 0; i < nlocal; i++)
@@ -118,11 +185,14 @@ int MinFire::iterate(int maxiter)
     // if (v dot f) > 0:
     // v = (1-alpha) v + alpha |v| Fhat
     // |v| = length of v, Fhat = unit f
-    // if more than DELAYSTEP since v dot f was negative:
-    // increase timestep and decrease alpha
+    // Only: (1-alpha) and alpha |v| Fhat is calculated here
+    // the modificatin of v is made wihtin the integration, after v update
+    // if more than delaystep since v dot f was negative:
+    // increase timestep, update global timestep and decrease alpha
 
     if (vdotfall > 0.0) {
       vdotv = 0.0;
+      vdotf_negatif = 0;
       for (int i = 0; i < nlocal; i++)
         vdotv += v[i][0]*v[i][0] + v[i][1]*v[i][1] + v[i][2]*v[i][2];
       MPI_Allreduce(&vdotv,&vdotvall,1,MPI_DOUBLE,MPI_SUM,world);
@@ -149,36 +219,85 @@ int MinFire::iterate(int maxiter)
       }
 
       scale1 = 1.0 - alpha;
-      if (fdotfall == 0.0) scale2 = 0.0;
+      if (fdotfall <= 1e-20) scale2 = 0.0;
       else scale2 = alpha * sqrt(vdotvall/fdotfall);
-      for (int i = 0; i < nlocal; i++) {
-        v[i][0] = scale1*v[i][0] + scale2*f[i][0];
-        v[i][1] = scale1*v[i][1] + scale2*f[i][1];
-        v[i][2] = scale1*v[i][2] + scale2*f[i][2];
+
+      if (ntimestep - last_negative > delaystep) {
+        dt = MIN(dt*dtgrow,dtmax);
+        update->dt = dt;
+        alpha *= alphashrink;
       }
 
-      if (ntimestep - last_negative > DELAYSTEP) {
-        dt = MIN(dt*DT_GROW,dtmax);
-        alpha *= ALPHA_SHRINK;
-      }
-
-    // else (v dot f) <= 0:
-    // decrease timestep, reset alpha, set v = 0
+    // else (v dot f) <= 0
+    // if more than delaystep since starting the relaxation:
+    // reset alpha
+    //    if dt*dtshrink > dtmin:
+    //    decrease timestep
+    //    update global timestep (for thermo output)
+    // half step back within the dynamics: x(t) = x(t-0.5*dt)
+    // reset velocities: v = 0
 
     } else {
       last_negative = ntimestep;
-      dt *= DT_SHRINK;
-      alpha = ALPHA0;
+      int delayflag = 1;
+      if (ntimestep - ntimestep_start < delaystep && delaystep_start_flag)
+        delayflag = 0;
+      if (delayflag) {
+        alpha = alpha0;
+        if (dt*dtshrink >= dtmin) {
+          dt *= dtshrink;
+          update->dt = dt;
+        }
+      }
+
+      // stopping criterion while stuck in a local bassin of the PES
+
+      vdotf_negatif++;
+      if (max_vdotf_negatif > 0 && vdotf_negatif > max_vdotf_negatif)
+        return MAXVDOTF;
+
+      // inertia correction
+
+      if (halfstepback_flag) {
+        for (int i = 0; i < nlocal; i++) {
+          x[i][0] -= 0.5 * dt * v[i][0];
+          x[i][1] -= 0.5 * dt * v[i][1];
+          x[i][2] -= 0.5 * dt * v[i][2];
+        }
+      }
+
       for (int i = 0; i < nlocal; i++)
         v[i][0] = v[i][1] = v[i][2] = 0.0;
+      flagv0 = 1;
+    }
+
+    // evaluates velocties to estimate wether dtv has to be limited
+    // required when v have been reset
+
+    if (flagv0) {
+      dtf = dt * force->ftm2v;
+      energy_force(0);
+      neval++;
+
+      if (rmass) {
+        for (int i = 0; i < nlocal; i++) {
+          dtfm = dtf / rmass[i];
+          v[i][0] = dtfm * f[i][0];
+          v[i][1] = dtfm * f[i][1];
+          v[i][2] = dtfm * f[i][2];
+        }
+      } else {
+        for (int i = 0; i < nlocal; i++) {
+          dtfm = dtf / mass[type[i]];
+          v[i][0] = dtfm * f[i][0];
+          v[i][1] = dtfm * f[i][1];
+          v[i][2] = dtfm * f[i][2];
+        }
+      }
     }
 
     // limit timestep so no particle moves further than dmax
 
-    double *rmass = atom->rmass;
-    double *mass = atom->mass;
-    int *type = atom->type;
-
     dtvone = dt;
 
     for (int i = 0; i < nlocal; i++) {
@@ -186,8 +305,16 @@ int MinFire::iterate(int maxiter)
       vmax = MAX(vmax,fabs(v[i][2]));
       if (dtvone*vmax > dmax) dtvone = dmax/vmax;
     }
+
     MPI_Allreduce(&dtvone,&dtv,1,MPI_DOUBLE,MPI_MIN,world);
 
+    // reset velocities when necessary
+
+    if (flagv0) {
+      for (int i = 0; i < nlocal; i++)
+        v[i][0] = v[i][1] = v[i][2] = 0.0;
+    }
+
     // min dtv over replicas, if necessary
     // this communicator would be invalid for multiprocess replicas
 
@@ -196,43 +323,165 @@ int MinFire::iterate(int maxiter)
       MPI_Allreduce(&dtvone,&dtv,1,MPI_DOUBLE,MPI_MIN,universe->uworld);
     }
 
-    dtf = dtv * force->ftm2v;
+    // Dynamic integration scheme:
+    // 0: semi-implicit Euler
+    // 1: velocity Verlet
+    // 2: leapfrog (initial half step before the iteration loop)
+    // 3: explicit Euler
 
-    // Euler integration step
+    // Semi-implicit Euler OR Leap Frog integration
 
-    double **x = atom->x;
+    if (integrator == 0 || integrator == 2) {
 
-    if (rmass) {
-      for (int i = 0; i < nlocal; i++) {
-        dtfm = dtf / rmass[i];
-        x[i][0] += dtv * v[i][0];
-        x[i][1] += dtv * v[i][1];
-        x[i][2] += dtv * v[i][2];
-        v[i][0] += dtfm * f[i][0];
-        v[i][1] += dtfm * f[i][1];
-        v[i][2] += dtfm * f[i][2];
+      dtf = dtv * force->ftm2v;
+
+      if (rmass) {
+        for (int i = 0; i < nlocal; i++) {
+          dtfm = dtf / rmass[i];
+          v[i][0] += dtfm * f[i][0];
+          v[i][1] += dtfm * f[i][1];
+          v[i][2] += dtfm * f[i][2];
+          if (vdotfall > 0.0) {
+            v[i][0] = scale1*v[i][0] + scale2*f[i][0];
+            v[i][1] = scale1*v[i][1] + scale2*f[i][1];
+            v[i][2] = scale1*v[i][2] + scale2*f[i][2];
+          }
+          x[i][0] += dtv * v[i][0];
+          x[i][1] += dtv * v[i][1];
+          x[i][2] += dtv * v[i][2];
+        }
+      } else {
+        for (int i = 0; i < nlocal; i++) {
+          dtfm = dtf / mass[type[i]];
+          v[i][0] += dtfm * f[i][0];
+          v[i][1] += dtfm * f[i][1];
+          v[i][2] += dtfm * f[i][2];
+          if (vdotfall > 0.0) {
+            v[i][0] = scale1*v[i][0] + scale2*f[i][0];
+            v[i][1] = scale1*v[i][1] + scale2*f[i][1];
+            v[i][2] = scale1*v[i][2] + scale2*f[i][2];
+          }
+          x[i][0] += dtv * v[i][0];
+          x[i][1] += dtv * v[i][1];
+          x[i][2] += dtv * v[i][2];
+        }
       }
-    } else {
-      for (int i = 0; i < nlocal; i++) {
-        dtfm = dtf / mass[type[i]];
-        x[i][0] += dtv * v[i][0];
-        x[i][1] += dtv * v[i][1];
-        x[i][2] += dtv * v[i][2];
-        v[i][0] += dtfm * f[i][0];
-        v[i][1] += dtfm * f[i][1];
-        v[i][2] += dtfm * f[i][2];
+
+      eprevious = ecurrent;
+      ecurrent = energy_force(0);
+      neval++;
+
+    // Velocity Verlet integration
+
+    } else if (integrator == 1) {
+
+      dtf = 0.5 * dtv * force->ftm2v;
+
+      if (rmass) {
+        for (int i = 0; i < nlocal; i++) {
+          dtfm = dtf / rmass[i];
+          v[i][0] += dtfm * f[i][0];
+          v[i][1] += dtfm * f[i][1];
+          v[i][2] += dtfm * f[i][2];
+          if (vdotfall > 0.0) {
+            v[i][0] = scale1*v[i][0] + scale2*f[i][0];
+            v[i][1] = scale1*v[i][1] + scale2*f[i][1];
+            v[i][2] = scale1*v[i][2] + scale2*f[i][2];
+          }
+          x[i][0] += dtv * v[i][0];
+          x[i][1] += dtv * v[i][1];
+          x[i][2] += dtv * v[i][2];
+        }
+      } else {
+        for (int i = 0; i < nlocal; i++) {
+          dtfm = dtf / mass[type[i]];
+          v[i][0] += dtfm * f[i][0];
+          v[i][1] += dtfm * f[i][1];
+          v[i][2] += dtfm * f[i][2];
+          if (vdotfall > 0.0) {
+            v[i][0] = scale1*v[i][0] + scale2*f[i][0];
+            v[i][1] = scale1*v[i][1] + scale2*f[i][1];
+            v[i][2] = scale1*v[i][2] + scale2*f[i][2];
+          }
+          x[i][0] += dtv * v[i][0];
+          x[i][1] += dtv * v[i][1];
+          x[i][2] += dtv * v[i][2];
+        }
       }
+
+      eprevious = ecurrent;
+      ecurrent = energy_force(0);
+      neval++;
+
+      if (rmass) {
+        for (int i = 0; i < nlocal; i++) {
+          dtfm = dtf / rmass[i];
+          v[i][0] += dtfm * f[i][0];
+          v[i][1] += dtfm * f[i][1];
+          v[i][2] += dtfm * f[i][2];
+          }
+      } else {
+        for (int i = 0; i < nlocal; i++) {
+          dtfm = dtf / mass[type[i]];
+          v[i][0] += dtfm * f[i][0];
+          v[i][1] += dtfm * f[i][1];
+          v[i][2] += dtfm * f[i][2];
+        }
+      }
+
+    // Standard Euler integration
+
+    } else if (integrator == 3) {
+
+      dtf = dtv * force->ftm2v;
+
+      if (rmass) {
+        for (int i = 0; i < nlocal; i++) {
+          dtfm = dtf / rmass[i];
+          if (vdotfall > 0.0) {
+            v[i][0] = scale1*v[i][0] + scale2*f[i][0];
+            v[i][1] = scale1*v[i][1] + scale2*f[i][1];
+            v[i][2] = scale1*v[i][2] + scale2*f[i][2];
+          }
+          x[i][0] += dtv * v[i][0];
+          x[i][1] += dtv * v[i][1];
+          x[i][2] += dtv * v[i][2];
+          v[i][0] += dtfm * f[i][0];
+          v[i][1] += dtfm * f[i][1];
+          v[i][2] += dtfm * f[i][2];
+        }
+      } else {
+        for (int i = 0; i < nlocal; i++) {
+          dtfm = dtf / mass[type[i]];
+          if (vdotfall > 0.0) {
+            v[i][0] = scale1*v[i][0] + scale2*f[i][0];
+            v[i][1] = scale1*v[i][1] + scale2*f[i][1];
+            v[i][2] = scale1*v[i][2] + scale2*f[i][2];
+          }
+          x[i][0] += dtv * v[i][0];
+          x[i][1] += dtv * v[i][1];
+          x[i][2] += dtv * v[i][2];
+          v[i][0] += dtfm * f[i][0];
+          v[i][1] += dtfm * f[i][1];
+          v[i][2] += dtfm * f[i][2];
+        }
+      }
+
+      eprevious = ecurrent;
+      ecurrent = energy_force(0);
+      neval++;
     }
 
-    eprevious = ecurrent;
-    ecurrent = energy_force(0);
-    neval++;
+    // velocities have been evaluated
+
+    flagv0 = 0;
 
     // energy tolerance criterion
-    // only check after DELAYSTEP elapsed since velocties reset to 0
+    // only check after delaystep elapsed since velocties reset to 0
     // sync across replicas if running multi-replica minimization
+    // reset the timestep to the initial value
 
-    if (update->etol > 0.0 && ntimestep-last_negative > DELAYSTEP) {
+    if (update->etol > 0.0 && ntimestep-last_negative > delaystep) {
       if (update->multireplica == 0) {
         if (fabs(ecurrent-eprevious) <
             update->etol * 0.5*(fabs(ecurrent) + fabs(eprevious) + EPS_ENERGY))
@@ -243,12 +492,14 @@ int MinFire::iterate(int maxiter)
           flag = 0;
         else flag = 1;
         MPI_Allreduce(&flag,&flagall,1,MPI_INT,MPI_SUM,universe->uworld);
-        if (flagall == 0) return ETOL;
+        if (flagall == 0)
+          return ETOL;
       }
     }
 
     // force tolerance criterion
     // sync across replicas if running multi-replica minimization
+    // reset the timestep to the initial value
 
     fdotf = 0.0;
     if (update->ftol > 0.0) {
diff --git a/src/min_fire.h b/src/min_fire.h
index 3cb375163e..79e5cb7c14 100644
--- a/src/min_fire.h
+++ b/src/min_fire.h
@@ -34,9 +34,10 @@ class MinFire : public Min {
   int iterate(int);
 
  private:
-  double dt,dtmax;
+  double dt,dtmax,dtmin;
   double alpha;
-  bigint last_negative;
+  bigint last_negative,ntimestep_start;
+  int vdotf_negatif,flagv0;
 };
 
 }
diff --git a/src/min_fire_old.cpp b/src/min_fire_old.cpp
new file mode 100644
index 0000000000..bd76b2d1fc
--- /dev/null
+++ b/src/min_fire_old.cpp
@@ -0,0 +1,279 @@
+/* ----------------------------------------------------------------------
+   LAMMPS - Large-scale Atomic/Molecular Massively Parallel Simulator
+   http://lammps.sandia.gov, Sandia National Laboratories
+   Steve Plimpton, sjplimp@sandia.gov
+
+   Copyright (2003) Sandia Corporation.  Under the terms of Contract
+   DE-AC04-94AL85000 with Sandia Corporation, the U.S. Government retains
+   certain rights in this software.  This software is distributed under
+   the GNU General Public License.
+
+   See the README file in the top-level LAMMPS directory.
+------------------------------------------------------------------------- */
+
+#include "min_fire_old.h"
+#include <mpi.h>
+#include <cmath>
+#include "universe.h"
+#include "atom.h"
+#include "error.h"
+#include "force.h"
+#include "update.h"
+#include "output.h"
+#include "timer.h"
+
+using namespace LAMMPS_NS;
+
+// EPS_ENERGY = minimum normalization for energy tolerance
+
+#define EPS_ENERGY 1.0e-8
+
+#define DELAYSTEP 5
+#define DT_GROW 1.1
+#define DT_SHRINK 0.5
+#define ALPHA0 0.1
+#define ALPHA_SHRINK 0.99
+#define TMAX 10.0
+
+/* ---------------------------------------------------------------------- */
+
+MinFireOld::MinFireOld(LAMMPS *lmp) : Min(lmp) {}
+
+/* ---------------------------------------------------------------------- */
+
+void MinFireOld::init()
+{
+  Min::init();
+
+  dt = update->dt;
+  dtmax = TMAX * dt;
+  alpha = ALPHA0;
+  last_negative = update->ntimestep;
+}
+
+/* ---------------------------------------------------------------------- */
+
+void MinFireOld::setup_style()
+{
+  double **v = atom->v;
+  int nlocal = atom->nlocal;
+
+  for (int i = 0; i < nlocal; i++)
+    v[i][0] = v[i][1] = v[i][2] = 0.0;
+}
+
+/* ----------------------------------------------------------------------
+   set current vector lengths and pointers
+   called after atoms have migrated
+------------------------------------------------------------------------- */
+
+void MinFireOld::reset_vectors()
+{
+  // atomic dof
+
+  nvec = 3 * atom->nlocal;
+  if (nvec) xvec = atom->x[0];
+  if (nvec) fvec = atom->f[0];
+}
+
+/* ---------------------------------------------------------------------- */
+
+int MinFireOld::iterate(int maxiter)
+{
+  bigint ntimestep;
+  double vmax,vdotf,vdotfall,vdotv,vdotvall,fdotf,fdotfall;
+  double scale1,scale2;
+  double dtvone,dtv,dtf,dtfm;
+  int flag,flagall;
+
+  alpha_final = 0.0;
+
+  for (int iter = 0; iter < maxiter; iter++) {
+
+    if (timer->check_timeout(niter))
+      return TIMEOUT;
+
+    ntimestep = ++update->ntimestep;
+    niter++;
+
+    // vdotfall = v dot f
+
+    double **v = atom->v;
+    double **f = atom->f;
+    int nlocal = atom->nlocal;
+
+    vdotf = 0.0;
+    for (int i = 0; i < nlocal; i++)
+      vdotf += v[i][0]*f[i][0] + v[i][1]*f[i][1] + v[i][2]*f[i][2];
+    MPI_Allreduce(&vdotf,&vdotfall,1,MPI_DOUBLE,MPI_SUM,world);
+
+    // sum vdotf over replicas, if necessary
+    // this communicator would be invalid for multiprocess replicas
+
+    if (update->multireplica == 1) {
+      vdotf = vdotfall;
+      MPI_Allreduce(&vdotf,&vdotfall,1,MPI_DOUBLE,MPI_SUM,universe->uworld);
+    }
+
+    // if (v dot f) > 0:
+    // v = (1-alpha) v + alpha |v| Fhat
+    // |v| = length of v, Fhat = unit f
+    // if more than DELAYSTEP since v dot f was negative:
+    // increase timestep and decrease alpha
+
+    if (vdotfall > 0.0) {
+      vdotv = 0.0;
+      for (int i = 0; i < nlocal; i++)
+        vdotv += v[i][0]*v[i][0] + v[i][1]*v[i][1] + v[i][2]*v[i][2];
+      MPI_Allreduce(&vdotv,&vdotvall,1,MPI_DOUBLE,MPI_SUM,world);
+
+      // sum vdotv over replicas, if necessary
+      // this communicator would be invalid for multiprocess replicas
+
+      if (update->multireplica == 1) {
+        vdotv = vdotvall;
+        MPI_Allreduce(&vdotv,&vdotvall,1,MPI_DOUBLE,MPI_SUM,universe->uworld);
+      }
+
+      fdotf = 0.0;
+      for (int i = 0; i < nlocal; i++)
+        fdotf += f[i][0]*f[i][0] + f[i][1]*f[i][1] + f[i][2]*f[i][2];
+      MPI_Allreduce(&fdotf,&fdotfall,1,MPI_DOUBLE,MPI_SUM,world);
+
+      // sum fdotf over replicas, if necessary
+      // this communicator would be invalid for multiprocess replicas
+
+      if (update->multireplica == 1) {
+        fdotf = fdotfall;
+        MPI_Allreduce(&fdotf,&fdotfall,1,MPI_DOUBLE,MPI_SUM,universe->uworld);
+      }
+
+      scale1 = 1.0 - alpha;
+      if (fdotfall == 0.0) scale2 = 0.0;
+      else scale2 = alpha * sqrt(vdotvall/fdotfall);
+      for (int i = 0; i < nlocal; i++) {
+        v[i][0] = scale1*v[i][0] + scale2*f[i][0];
+        v[i][1] = scale1*v[i][1] + scale2*f[i][1];
+        v[i][2] = scale1*v[i][2] + scale2*f[i][2];
+      }
+
+      if (ntimestep - last_negative > DELAYSTEP) {
+        dt = MIN(dt*DT_GROW,dtmax);
+        alpha *= ALPHA_SHRINK;
+      }
+
+    // else (v dot f) <= 0:
+    // decrease timestep, reset alpha, set v = 0
+
+    } else {
+      last_negative = ntimestep;
+      dt *= DT_SHRINK;
+      alpha = ALPHA0;
+      for (int i = 0; i < nlocal; i++)
+        v[i][0] = v[i][1] = v[i][2] = 0.0;
+    }
+
+    // limit timestep so no particle moves further than dmax
+
+    double *rmass = atom->rmass;
+    double *mass = atom->mass;
+    int *type = atom->type;
+
+    dtvone = dt;
+
+    for (int i = 0; i < nlocal; i++) {
+      vmax = MAX(fabs(v[i][0]),fabs(v[i][1]));
+      vmax = MAX(vmax,fabs(v[i][2]));
+      if (dtvone*vmax > dmax) dtvone = dmax/vmax;
+    }
+    MPI_Allreduce(&dtvone,&dtv,1,MPI_DOUBLE,MPI_MIN,world);
+
+    // min dtv over replicas, if necessary
+    // this communicator would be invalid for multiprocess replicas
+
+    if (update->multireplica == 1) {
+      dtvone = dtv;
+      MPI_Allreduce(&dtvone,&dtv,1,MPI_DOUBLE,MPI_MIN,universe->uworld);
+    }
+
+    dtf = dtv * force->ftm2v;
+
+    // Euler integration step
+
+    double **x = atom->x;
+
+    if (rmass) {
+      for (int i = 0; i < nlocal; i++) {
+        dtfm = dtf / rmass[i];
+        x[i][0] += dtv * v[i][0];
+        x[i][1] += dtv * v[i][1];
+        x[i][2] += dtv * v[i][2];
+        v[i][0] += dtfm * f[i][0];
+        v[i][1] += dtfm * f[i][1];
+        v[i][2] += dtfm * f[i][2];
+      }
+    } else {
+      for (int i = 0; i < nlocal; i++) {
+        dtfm = dtf / mass[type[i]];
+        x[i][0] += dtv * v[i][0];
+        x[i][1] += dtv * v[i][1];
+        x[i][2] += dtv * v[i][2];
+        v[i][0] += dtfm * f[i][0];
+        v[i][1] += dtfm * f[i][1];
+        v[i][2] += dtfm * f[i][2];
+      }
+    }
+
+    eprevious = ecurrent;
+    ecurrent = energy_force(0);
+    neval++;
+
+    // energy tolerance criterion
+    // only check after DELAYSTEP elapsed since velocties reset to 0
+    // sync across replicas if running multi-replica minimization
+
+    if (update->etol > 0.0 && ntimestep-last_negative > DELAYSTEP) {
+      if (update->multireplica == 0) {
+        if (fabs(ecurrent-eprevious) <
+            update->etol * 0.5*(fabs(ecurrent) + fabs(eprevious) + EPS_ENERGY))
+          return ETOL;
+      } else {
+        if (fabs(ecurrent-eprevious) <
+            update->etol * 0.5*(fabs(ecurrent) + fabs(eprevious) + EPS_ENERGY))
+          flag = 0;
+        else flag = 1;
+        MPI_Allreduce(&flag,&flagall,1,MPI_INT,MPI_SUM,universe->uworld);
+        if (flagall == 0) return ETOL;
+      }
+    }
+
+    // force tolerance criterion
+    // sync across replicas if running multi-replica minimization
+
+    fdotf = 0.0;
+    if (update->ftol > 0.0) {
+      if (normstyle == MAX) fdotf = fnorm_max();        // max force norm
+      else if (normstyle == INF) fdotf = fnorm_inf();   // inf force norm
+      else if (normstyle == TWO) fdotf = fnorm_sqr();   // Euclidean force 2-norm
+      else error->all(FLERR,"Illegal min_modify command");
+      if (update->multireplica == 0) {
+        if (fdotf < update->ftol*update->ftol) return FTOL;
+      } else {
+        if (fdotf < update->ftol*update->ftol) flag = 0;
+        else flag = 1;
+        MPI_Allreduce(&flag,&flagall,1,MPI_INT,MPI_SUM,universe->uworld);
+        if (flagall == 0) return FTOL;
+      }
+    }
+
+    // output for thermo, dump, restart files
+
+    if (output->next == ntimestep) {
+      timer->stamp();
+      output->write(ntimestep);
+      timer->stamp(Timer::OUTPUT);
+    }
+  }
+
+  return MAXITER;
+}
diff --git a/src/min_fire_old.h b/src/min_fire_old.h
new file mode 100644
index 0000000000..5d7afaa627
--- /dev/null
+++ b/src/min_fire_old.h
@@ -0,0 +1,45 @@
+/* -*- c++ -*- ----------------------------------------------------------
+   LAMMPS - Large-scale Atomic/Molecular Massively Parallel Simulator
+   http://lammps.sandia.gov, Sandia National Laboratories
+   Steve Plimpton, sjplimp@sandia.gov
+
+   Copyright (2003) Sandia Corporation.  Under the terms of Contract
+   DE-AC04-94AL85000 with Sandia Corporation, the U.S. Government retains
+   certain rights in this software.  This software is distributed under
+   the GNU General Public License.
+
+   See the README file in the top-level LAMMPS directory.
+------------------------------------------------------------------------- */
+
+#ifdef MINIMIZE_CLASS
+
+MinimizeStyle(fire/old,MinFireOld)
+
+#else
+
+#ifndef LMP_MIN_FIRE_OLD_H
+#define LMP_MIN_FIRE_OLD_H
+
+#include "min.h"
+
+namespace LAMMPS_NS {
+
+class MinFireOld : public Min {
+ public:
+  MinFireOld(class LAMMPS *);
+  ~MinFireOld() {}
+  void init();
+  void setup_style();
+  void reset_vectors();
+  int iterate(int);
+
+ private:
+  double dt,dtmax;
+  double alpha;
+  bigint last_negative;
+};
+
+}
+
+#endif
+#endif
diff --git a/src/modify.cpp b/src/modify.cpp
index 101540f786..864bc8f2b4 100644
--- a/src/modify.cpp
+++ b/src/modify.cpp
@@ -50,6 +50,7 @@ Modify::Modify(LAMMPS *lmp) : Pointers(lmp)
   n_pre_force_respa = n_post_force_respa = n_final_integrate_respa = 0;
   n_min_pre_exchange = n_min_pre_force = n_min_pre_reverse = 0;
   n_min_post_force = n_min_energy = 0;
+  n_timeflag = -1;
 
   fix = NULL;
   fmask = NULL;
@@ -526,6 +527,11 @@ void Modify::thermo_energy_atom(int nlocal, double *energy)
 void Modify::post_run()
 {
   for (int i = 0; i < nfix; i++) fix[i]->post_run();
+
+  // must reset this to its default value, since computes may be added
+  // or removed between runs and with this change we will redirect any
+  // calls to addstep_compute() to addstep_compute_all() instead.
+  n_timeflag = -1;
 }
 
 /* ----------------------------------------------------------------------
@@ -1283,6 +1289,14 @@ void Modify::clearstep_compute()
 
 void Modify::addstep_compute(bigint newstep)
 {
+  // If we are called before the first run init, n_timeflag is not yet
+  // initialized, thus defer to addstep_compute_all() instead
+
+  if (n_timeflag < 0) {
+     addstep_compute_all(newstep);
+     return;
+  }
+
   for (int icompute = 0; icompute < n_timeflag; icompute++)
     if (compute[list_timeflag[icompute]]->invoked_flag)
       compute[list_timeflag[icompute]]->addstep(newstep);
diff --git a/src/molecule.cpp b/src/molecule.cpp
index 38887ebb0c..15b2385436 100644
--- a/src/molecule.cpp
+++ b/src/molecule.cpp
@@ -37,7 +37,7 @@ using namespace LAMMPS_NS;
 /* ---------------------------------------------------------------------- */
 
 Molecule::Molecule(LAMMPS *lmp, int narg, char **arg, int &index) :
-  Pointers(lmp), id(NULL), x(NULL), type(NULL), q(NULL), radius(NULL),
+  Pointers(lmp), id(NULL), x(NULL), type(NULL), molecule(NULL), q(NULL), radius(NULL),
   rmass(NULL), num_bond(NULL), bond_type(NULL), bond_atom(NULL),
   num_angle(NULL), angle_type(NULL), angle_atom1(NULL), angle_atom2(NULL),
   angle_atom3(NULL), num_dihedral(NULL), dihedral_type(NULL), dihedral_atom1(NULL),
@@ -45,8 +45,8 @@ Molecule::Molecule(LAMMPS *lmp, int narg, char **arg, int &index) :
   improper_type(NULL), improper_atom1(NULL), improper_atom2(NULL),
   improper_atom3(NULL), improper_atom4(NULL), nspecial(NULL), special(NULL),
   shake_flag(NULL), shake_atom(NULL), shake_type(NULL), avec_body(NULL), ibodyparams(NULL),
-  dbodyparams(NULL), dx(NULL), dxcom(NULL), dxbody(NULL), quat_external(NULL),
-  fp(NULL), count(NULL)
+  dbodyparams(NULL), fragmentmask(NULL), fragmentnames(NULL),
+  dx(NULL), dxcom(NULL), dxbody(NULL), quat_external(NULL), fp(NULL), count(NULL)
 {
   me = comm->me;
 
@@ -146,19 +146,19 @@ Molecule::Molecule(LAMMPS *lmp, int narg, char **arg, int &index) :
 
   if (me == 0) {
     if (screen)
-      fprintf(screen,"Read molecule %s:\n"
+      fprintf(screen,"Read molecule template %s:\n  %d molecules\n"
               "  %d atoms with max type %d\n  %d bonds with max type %d\n"
               "  %d angles with max type %d\n  %d dihedrals with max type %d\n"
               "  %d impropers with max type %d\n",
-              id,natoms,ntypes,
+              id,nmolecules,natoms,ntypes,
               nbonds,nbondtypes,nangles,nangletypes,
               ndihedrals,ndihedraltypes,nimpropers,nimpropertypes);
     if (logfile)
-      fprintf(logfile,"Read molecule %s:\n"
+      fprintf(logfile,"Read molecule template %s:\n  %d molecules\n"
               "  %d atoms with max type %d\n  %d bonds with max type %d\n"
               "  %d angles with max type %d\n  %d dihedrals with max type %d\n"
               "  %d impropers with max type %d\n",
-              id,natoms,ntypes,
+              id,nmolecules,natoms,ntypes,
               nbonds,nbondtypes,nangles,nangletypes,
               ndihedrals,ndihedraltypes,nimpropers,nimpropertypes);
   }
@@ -447,6 +447,9 @@ void Molecule::read(int flag)
     } else if (strstr(line,"impropers")) {
       nmatch = sscanf(line,"%d",&nimpropers);
       nwant = 1;
+    } else if (strstr(line,"fragments")) {
+      nmatch = sscanf(line,"%d",&nfragments);
+      nwant = 1;
     } else if (strstr(line,"mass")) {
       massflag = 1;
       nmatch = sscanf(line,"%lg",&masstotal);
@@ -519,6 +522,14 @@ void Molecule::read(int flag)
       typeflag = 1;
       if (flag) types(line);
       else skip_lines(natoms,line);
+    } else if (strcmp(keyword,"Molecules") == 0) {
+      moleculeflag = 1;
+      if (flag) molecules(line);
+      else skip_lines(natoms,line);
+    } else if (strcmp(keyword,"Fragments") == 0) {
+      fragmentflag = 1;
+      if (flag) fragments(line);
+      else skip_lines(nfragments,line);
     } else if (strcmp(keyword,"Charges") == 0) {
       qflag = 1;
       if (flag) charges(line);
@@ -694,6 +705,58 @@ void Molecule::types(char *line)
     ntypes = MAX(ntypes,type[i]);
 }
 
+/* ----------------------------------------------------------------------
+   read molecules from file
+   set nmolecules = max of any molecule type
+------------------------------------------------------------------------- */
+
+void Molecule::molecules(char *line)
+{
+  int tmp;
+  for (int i = 0; i < natoms; i++) {
+    readline(line);
+    if (2 != sscanf(line,"%d %d",&tmp,&molecule[i]))
+      error->all(FLERR,"Invalid Molecules section in molecule file");
+    // molecule[i] += moffset; // placeholder for possible molecule offset
+  }
+
+  for (int i = 0; i < natoms; i++)
+    if (molecule[i] <= 0)
+      error->all(FLERR,"Invalid molecule ID in molecule file");
+
+  for (int i = 0; i < natoms; i++)
+    nmolecules = MAX(nmolecules,molecule[i]);
+}
+
+/* ----------------------------------------------------------------------
+   read fragments from file
+------------------------------------------------------------------------- */
+
+void Molecule::fragments(char *line)
+{
+  int n,m,atomID,nwords;
+  char **words = new char*[natoms+1];
+
+  for (int i = 0; i < nfragments; i++) {
+    readline(line);
+    nwords = parse(line,words,natoms+1);
+    if (nwords > natoms+1)
+      error->all(FLERR,"Invalid atom ID in Fragments section of molecule file");
+    n = strlen(words[0]) + 1;
+    fragmentnames[i] = new char[n];
+    strcpy(fragmentnames[i],words[0]);
+
+    for (m = 1; m < nwords; m++) {
+      atomID = atoi(words[m]);
+      if (atomID <= 0 || atomID > natoms)
+        error->all(FLERR,"Invalid atom ID in Fragments section of molecule file");
+      fragmentmask[i][atomID-1] = 1;
+    }
+  }
+
+  delete [] words;
+}
+
 /* ----------------------------------------------------------------------
    read charges from file
 ------------------------------------------------------------------------- */
@@ -1359,6 +1422,17 @@ void Molecule::body(int flag, int pflag, char *line)
   }
 }
 
+/* ----------------------------------------------------------------------
+   return fragment index if name matches existing fragment, -1 if no such fragment
+------------------------------------------------------------------------- */
+
+int Molecule::findfragment(const char *name)
+{
+  for (int i = 0; i < nfragments; i++)
+    if (fragmentnames[i] && strcmp(name,fragmentnames[i]) == 0) return i;
+  return -1;
+}
+
 /* ----------------------------------------------------------------------
    error check molecule attributes and topology against system settings
    flag = 0, just check this molecule
@@ -1432,13 +1506,14 @@ void Molecule::initialize()
   natoms = 0;
   nbonds = nangles = ndihedrals = nimpropers = 0;
   ntypes = 0;
+  nmolecules = 1;
   nbondtypes = nangletypes = ndihedraltypes = nimpropertypes = 0;
   nibody = ndbody = 0;
 
   bond_per_atom = angle_per_atom = dihedral_per_atom = improper_per_atom = 0;
   maxspecial = 0;
 
-  xflag = typeflag = qflag = radiusflag = rmassflag = 0;
+  xflag = typeflag = moleculeflag = fragmentflag = qflag = radiusflag = rmassflag = 0;
   bondflag = angleflag = dihedralflag = improperflag = 0;
   nspecialflag = specialflag = 0;
   shakeflag = shakeflagflag = shakeatomflag = shaketypeflag = 0;
@@ -1493,6 +1568,13 @@ void Molecule::allocate()
 {
   if (xflag) memory->create(x,natoms,3,"molecule:x");
   if (typeflag) memory->create(type,natoms,"molecule:type");
+  if (moleculeflag) memory->create(molecule,natoms,"molecule:molecule");
+  if (fragmentflag) {
+     fragmentnames = new char*[nfragments];
+     memory->create(fragmentmask,nfragments,natoms,"molecule:fragmentmask");
+     for (int i = 0; i < nfragments; i++)
+       for (int j = 0; j < natoms; j++) fragmentmask[i][j] = 0;
+  }
   if (qflag) memory->create(q,natoms,"molecule:q");
   if (radiusflag) memory->create(radius,natoms,"molecule:radius");
   if (rmassflag) memory->create(rmass,natoms,"molecule:rmass");
@@ -1580,10 +1662,18 @@ void Molecule::deallocate()
 {
   memory->destroy(x);
   memory->destroy(type);
+  memory->destroy(molecule);
   memory->destroy(q);
   memory->destroy(radius);
   memory->destroy(rmass);
 
+  memory->destroy(molecule);
+  memory->destroy(fragmentmask);
+  if (fragmentflag) {
+    for (int i = 0; i < nfragments; i++) delete [] fragmentnames[i];
+    delete [] fragmentnames;
+  }
+
   memory->destroy(num_bond);
   memory->destroy(bond_type);
   memory->destroy(bond_atom);
diff --git a/src/molecule.h b/src/molecule.h
index 064e58aabd..49d0cd1ef0 100644
--- a/src/molecule.h
+++ b/src/molecule.h
@@ -30,7 +30,7 @@ class Molecule : protected Pointers {
 
   int natoms;
   int nbonds,nangles,ndihedrals,nimpropers;
-  int ntypes;
+  int ntypes,nmolecules,nfragments;
   int nbondtypes,nangletypes,ndihedraltypes,nimpropertypes;
   int nibody,ndbody;
 
@@ -41,7 +41,7 @@ class Molecule : protected Pointers {
 
   // 1 if attribute defined in file, 0 if not
 
-  int xflag,typeflag,qflag,radiusflag,rmassflag;
+  int xflag,typeflag,moleculeflag,fragmentflag,qflag,radiusflag,rmassflag;
   int bondflag,angleflag,dihedralflag,improperflag;
   int nspecialflag,specialflag;
   int shakeflag,shakeflagflag,shakeatomflag,shaketypeflag;
@@ -59,6 +59,7 @@ class Molecule : protected Pointers {
 
   double **x;          // displacement of each atom from origin
   int *type;           // type of each atom
+  tagint *molecule;    // molecule of each atom
   double *q;           // charge on each atom
   double *radius;      // radius of each atom
   double *rmass;       // mass of each atom
@@ -90,6 +91,11 @@ class Molecule : protected Pointers {
   int *ibodyparams;         // integer and double body params
   double *dbodyparams;
 
+  // fragment info
+
+  int **fragmentmask;       // nfragments by natoms
+  char **fragmentnames;
+
   double center[3];         // geometric center of molecule
   double masstotal;         // total mass of molecule
   double com[3];            // center of mass of molecule
@@ -118,6 +124,7 @@ class Molecule : protected Pointers {
   void compute_mass();
   void compute_com();
   void compute_inertia();
+  int findfragment(const char *);
   void check_attributes(int);
 
  private:
@@ -131,6 +138,8 @@ class Molecule : protected Pointers {
   void read(int);
   void coords(char *);
   void types(char *);
+  void molecules(char *);
+  void fragments(char *);
   void charges(char *);
   void diameters(char *);
   void masses(char *);
@@ -363,6 +372,18 @@ E: Invalid improper type in impropers section of molecule file
 
 Self-explanatory.
 
+E: Invalid molecule ID in molecule file
+
+Molecule ID must be a non-zero positive integer.
+
+E: Invalid Molecules section in molecule file
+
+Self-explanatory.
+
+E: Invalid atom ID in Fragments section of molecule file
+
+Self-explanatory.
+
 E: Invalid Special Bond Counts section in molecule file
 
 Self-explanatory.
diff --git a/src/my_pool_chunk.h b/src/my_pool_chunk.h
index a313e45f05..da196f5ec9 100644
--- a/src/my_pool_chunk.h
+++ b/src/my_pool_chunk.h
@@ -18,7 +18,7 @@ MyPoolChunk = templated class for storing chunks of datums in pages
   replaces many small mallocs with a few large mallocs
   pages are never freed, so can reuse w/out reallocs
 usage:
-  continously get() and put() chunks as needed
+  continuously get() and put() chunks as needed
   NOTE: could add a clear() if retain info on mapping of pages to bins
 inputs:
    template T = one datum, e.g. int, double, struct
diff --git a/src/neigh_request.cpp b/src/neigh_request.cpp
index 1ad111d9c5..006ff5e87b 100644
--- a/src/neigh_request.cpp
+++ b/src/neigh_request.cpp
@@ -37,7 +37,7 @@ NeighRequest::NeighRequest(LAMMPS *lmp) : Pointers(lmp)
   half = 1;
   full = 0;
 
-  // attribute flags, mutiple can be set to 1
+  // attribute flags, multiple can be set to 1
   // default is every reneighboring, not occasional
   // default is use newton_pair setting in force
   // default is no neighbors of ghosts
diff --git a/src/neighbor.cpp b/src/neighbor.cpp
index b62945f116..3d1f37a03b 100644
--- a/src/neighbor.cpp
+++ b/src/neighbor.cpp
@@ -402,13 +402,6 @@ void Neighbor::init()
     }
   }
 
-  // maxwt = max multiplicative factor on atom indices stored in neigh list
-
-  maxwt = 0;
-  if (special_flag[1] == 2) maxwt = 2;
-  if (special_flag[2] == 2) maxwt = 3;
-  if (special_flag[3] == 2) maxwt = 4;
-
   // ------------------------------------------------------------------
   // xhold array
 
diff --git a/src/neighbor.h b/src/neighbor.h
index 50de4b4c98..8fe423c60c 100644
--- a/src/neighbor.h
+++ b/src/neighbor.h
@@ -166,7 +166,6 @@ class Neighbor : protected Pointers {
 
   int maxatom;                     // max size of atom-based NeighList arrays
   int maxrequest;                  // max size of NeighRequest list
-  int maxwt;                       // max weighting factor applied + 1
 
   // info for other Neigh classes: NBin,NStencil,NPair,NTopo
 
diff --git a/src/pair_coul_streitz.h b/src/pair_coul_streitz.h
index c304365270..0f23c111c7 100644
--- a/src/pair_coul_streitz.h
+++ b/src/pair_coul_streitz.h
@@ -55,7 +55,6 @@ class PairCoulStreitz : public Pair {
   // Kspace parameters
   int kspacetype;
   double cut_coul, cut_coulsq;
-  double *cut_respa;
   double **scale;
 
   // Wolf
diff --git a/src/pair_hybrid.cpp b/src/pair_hybrid.cpp
index b88fa49a85..4d8d6f6902 100644
--- a/src/pair_hybrid.cpp
+++ b/src/pair_hybrid.cpp
@@ -742,7 +742,7 @@ void PairHybrid::read_restart(FILE *fp)
     keywords[m] = new char[n];
     if (me == 0) utils::sfread(FLERR,keywords[m],sizeof(char),n,fp,NULL,error);
     MPI_Bcast(keywords[m],n,MPI_CHAR,0,world);
-    styles[m] = force->new_pair(keywords[m],0,dummy);
+    styles[m] = force->new_pair(keywords[m],1,dummy);
     styles[m]->read_restart_settings(fp);
     // read back per style special settings, if present
     special_lj[m] = special_coul[m] = NULL;
@@ -859,14 +859,17 @@ void PairHybrid::modify_params(int narg, char **arg)
       iarg = 3;
     }
 
-    // if 2nd keyword (after pair) is special:
-    // invoke modify_special() for the sub-style
+    // keywords "special" and "compute/tally" have to be listed directly
+    // after "pair" but can be given multiple times
+
+again:
 
     if (iarg < narg && strcmp(arg[iarg],"special") == 0) {
       if (narg < iarg+5)
         error->all(FLERR,"Illegal pair_modify special command");
       modify_special(m,narg-iarg,&arg[iarg+1]);
       iarg += 5;
+      goto again;
     }
 
     // if 2nd keyword (after pair) is compute/tally:
@@ -881,11 +884,13 @@ void PairHybrid::modify_params(int narg, char **arg)
         compute_tally[m] = 0;
       } else error->all(FLERR,"Illegal pair_modify compute/tally command");
       iarg += 2;
+      goto again;
     }
 
-    // apply the remaining keywords to the base pair style itself and the
-    // sub-style except for "pair" and "special".
-    // the former is important for some keywords like "tail" or "compute"
+    // apply the remaining keywords to the base pair style itself and
+    // the sub-style except for "pair" and "special" or "compute/tally"
+    // and their arguments. the former is important for some keywords
+    // like "tail" or "compute"
 
     if (narg-iarg > 0) {
       Pair::modify_params(narg-iarg,&arg[iarg]);
diff --git a/src/pair_lj96_cut.cpp b/src/pair_lj96_cut.cpp
index f554872965..8be6fefa44 100644
--- a/src/pair_lj96_cut.cpp
+++ b/src/pair_lj96_cut.cpp
@@ -41,6 +41,7 @@ PairLJ96Cut::PairLJ96Cut(LAMMPS *lmp) : Pair(lmp)
 {
   respa_enable = 1;
   writedata = 1;
+  cut_respa = NULL;
 }
 
 /* ---------------------------------------------------------------------- */
diff --git a/src/pair_mie_cut.cpp b/src/pair_mie_cut.cpp
index 4ce82381f3..f031401a00 100644
--- a/src/pair_mie_cut.cpp
+++ b/src/pair_mie_cut.cpp
@@ -40,6 +40,7 @@ using namespace MathConst;
 PairMIECut::PairMIECut(LAMMPS *lmp) : Pair(lmp)
 {
   respa_enable = 1;
+  cut_respa = NULL;
 }
 
 /* ---------------------------------------------------------------------- */
diff --git a/src/pair_zero.h b/src/pair_zero.h
index 058edbd053..3af37aedb4 100644
--- a/src/pair_zero.h
+++ b/src/pair_zero.h
@@ -11,7 +11,7 @@
    See the README file in the top-level LAMMPS directory.
 
    Pair zero is a dummy pair interaction useful for requiring a
-   force cutoff distance in the absense of pair-interactions or
+   force cutoff distance in the absence of pair-interactions or
    with hybrid/overlay if a larger force cutoff distance is required.
 
    This can be used in conjunction with bond/create to create bonds
diff --git a/src/random_mars.cpp b/src/random_mars.cpp
index e4330b772f..36fd2b4bc8 100644
--- a/src/random_mars.cpp
+++ b/src/random_mars.cpp
@@ -183,7 +183,7 @@ void RanMars::select_subset(bigint ntarget, int nmine, int *mark, int *next)
   int mode,index,oldindex,newvalue,nflip,which,niter;
   int active[2],first[2],last[2];
   int newactive[2],newfirst[2],newlast[2];
-  bigint nmark,nactive,nactiveall,nflipall,bnflip;
+  bigint nmark,nflipall;
   bigint activeall[2],bsum[3],bsumall[3];
   double thresh;
 
@@ -210,15 +210,12 @@ void RanMars::select_subset(bigint ntarget, int nmine, int *mark, int *next)
 
     // choose to ADD or SUBTRACT from current nmark
     // thresh = desired flips / size of active set
-    // nactive = size of current active set, only for debug output below
 
     if (ntarget-nmark > 0) {
       mode = ADD;
-      // nactive = active[mode];
       thresh = 1.0 * (ntarget-nmark) / activeall[mode];
     } else {
       mode = SUBTRACT;
-      // nactive = active[mode];
       thresh = 1.0 * (nmark-ntarget) / activeall[mode];
     }
 
@@ -278,12 +275,10 @@ void RanMars::select_subset(bigint ntarget, int nmine, int *mark, int *next)
     bsum[0] = nflip;
     bsum[1] = active[0];
     bsum[2] = active[1];
-    bsum[3] = nactive;
-    MPI_Allreduce(&bsum,&bsumall,4,MPI_LMP_BIGINT,MPI_SUM,world);
+    MPI_Allreduce(&bsum,&bsumall,3,MPI_LMP_BIGINT,MPI_SUM,world);
     nflipall = bsumall[0];
     activeall[0] = bsumall[1];
     activeall[1] = bsumall[2];
-    nactiveall = bsumall[3];
 
     if (mode == ADD) nmark += nflipall;
     else if (mode == SUBTRACT) nmark -= nflipall;
diff --git a/src/read_restart.cpp b/src/read_restart.cpp
index 6469a5ec76..c05f9c78f2 100644
--- a/src/read_restart.cpp
+++ b/src/read_restart.cpp
@@ -37,36 +37,10 @@
 #include "error.h"
 #include "utils.h"
 
+#include "lmprestart.h"
+
 using namespace LAMMPS_NS;
 
-// same as write_restart.cpp
-
-#define MAGIC_STRING "LammpS RestartT"
-#define ENDIAN 0x0001
-#define ENDIANSWAP 0x1000
-#define VERSION_NUMERIC 0
-
-enum{VERSION,SMALLINT,TAGINT,BIGINT,
-     UNITS,NTIMESTEP,DIMENSION,NPROCS,PROCGRID,
-     NEWTON_PAIR,NEWTON_BOND,
-     XPERIODIC,YPERIODIC,ZPERIODIC,BOUNDARY,
-     ATOM_STYLE,NATOMS,NTYPES,
-     NBONDS,NBONDTYPES,BOND_PER_ATOM,
-     NANGLES,NANGLETYPES,ANGLE_PER_ATOM,
-     NDIHEDRALS,NDIHEDRALTYPES,DIHEDRAL_PER_ATOM,
-     NIMPROPERS,NIMPROPERTYPES,IMPROPER_PER_ATOM,
-     TRICLINIC,BOXLO,BOXHI,XY,XZ,YZ,
-     SPECIAL_LJ,SPECIAL_COUL,
-     MASS,PAIR,BOND,ANGLE,DIHEDRAL,IMPROPER,
-     MULTIPROC,MPIIO,PROCSPERFILE,PERPROC,
-     IMAGEINT,BOUNDMIN,TIMESTEP,
-     ATOM_ID,ATOM_MAP_STYLE,ATOM_MAP_USER,ATOM_SORTFREQ,ATOM_SORTBIN,
-     COMM_MODE,COMM_CUTOFF,COMM_VEL,NO_PAIR,
-     EXTRA_BOND_PER_ATOM,EXTRA_ANGLE_PER_ATOM,EXTRA_DIHEDRAL_PER_ATOM,
-     EXTRA_IMPROPER_PER_ATOM,EXTRA_SPECIAL_PER_ATOM,ATOM_MAXSPECIAL};
-
-#define LB_FACTOR 1.1
-
 /* ---------------------------------------------------------------------- */
 
 ReadRestart::ReadRestart(LAMMPS *lmp) : Pointers(lmp) {}
@@ -146,15 +120,15 @@ void ReadRestart::command(int narg, char **arg)
     if (multiproc) delete [] hfile;
   }
 
-  // read magic string, endian flag, numeric version
+  // read magic string, endian flag, format revision
 
   magic_string();
   endian();
-  int incompatible = version_numeric();
+  format_revision();
 
   // read header info which creates simulation box
 
-  header(incompatible);
+  header();
   domain->box_exist = 1;
 
   // problem setup using info from header
@@ -681,7 +655,7 @@ void ReadRestart::file_search(char *inpfile, char *outfile)
    read header of restart file
 ------------------------------------------------------------------------- */
 
-void ReadRestart::header(int incompatible)
+void ReadRestart::header()
 {
   int xperiodic(-1),yperiodic(-1),zperiodic(-1);
 
@@ -698,10 +672,20 @@ void ReadRestart::header(int incompatible)
         if (screen) fprintf(screen,"  restart file = %s, LAMMPS = %s\n",
                             version,universe->version);
       }
-      if (incompatible)
-        error->all(FLERR,"Restart file incompatible with current version");
       delete [] version;
 
+      // we have no forward compatibility, thus exit with error
+
+      if (revision > FORMAT_REVISION)
+        error->all(FLERR,"Restart file format revision incompatible "
+                   "with current LAMMPS version");
+
+      // warn when attempting to read older format revision
+
+      if ((me == 0) && (revision < FORMAT_REVISION))
+        error->warning(FLERR,"Old restart file format revision. "
+                       "Switching to compatibility mode.");
+
     // check lmptype.h sizes, error if different
 
     } else if (flag == SMALLINT) {
@@ -1242,11 +1226,36 @@ void ReadRestart::endian()
 /* ----------------------------------------------------------------------
 ------------------------------------------------------------------------- */
 
-int ReadRestart::version_numeric()
+void ReadRestart::format_revision()
 {
-  int vn = read_int();
-  if (vn != VERSION_NUMERIC) return 1;
-  return 0;
+  revision = read_int();
+}
+
+/* ----------------------------------------------------------------------
+------------------------------------------------------------------------- */
+
+void ReadRestart::check_eof_magic()
+{
+  // no check for revision 0 restart files
+  if (revision < 1) return;
+
+  int n = strlen(MAGIC_STRING) + 1;
+  char *str = new char[n];
+
+  // read magic string at end of file and restore file pointer
+
+  if (me == 0) {
+    long curpos = ftell(fp);
+    fseek(fp,(long)-n,SEEK_END);
+    fread(str,sizeof(char),n,fp);
+    fseek(fp,curpos,SEEK_SET);
+  }
+
+  MPI_Bcast(str,n,MPI_CHAR,0,world);
+  if (strcmp(str,MAGIC_STRING) != 0)
+    error->all(FLERR,"Incomplete or corrupted LAMMPS restart file");
+
+  delete [] str;
 }
 
 /* ----------------------------------------------------------------------
diff --git a/src/read_restart.h b/src/read_restart.h
index 63adf37b22..99b37cfa45 100644
--- a/src/read_restart.h
+++ b/src/read_restart.h
@@ -37,6 +37,7 @@ class ReadRestart : protected Pointers {
                              // 1 = restart file is parallel (multiple files)
   int multiproc_file;        // # of parallel files in restart
   int nprocs_file;           // total # of procs that wrote restart file
+  int revision;              // revision number of the restart file format
 
   // MPI-IO values
 
@@ -46,13 +47,14 @@ class ReadRestart : protected Pointers {
   MPI_Offset assignedChunkOffset,headerOffset;
 
   void file_search(char *, char *);
-  void header(int);
+  void header();
   void type_arrays();
   void force_fields();
 
   void magic_string();
   void endian();
-  int version_numeric();
+  void format_revision();
+  void check_eof_magic();
   void file_layout();
 
   int read_int();
diff --git a/src/reader_native.cpp b/src/reader_native.cpp
index da2c97bbe5..26cb45a686 100644
--- a/src/reader_native.cpp
+++ b/src/reader_native.cpp
@@ -17,6 +17,7 @@
 #include "atom.h"
 #include "memory.h"
 #include "error.h"
+#include "utils.h"
 
 using namespace LAMMPS_NS;
 
@@ -56,12 +57,15 @@ int ReaderNative::read_time(bigint &ntimestep)
   char *eof = fgets(line,MAXLINE,fp);
   if (eof == NULL) return 1;
 
-  // skip over unit information, if present.
+  // skip over unit and time information, if present.
 
-  if (strstr(line,"ITEM: UNITS") == line)
+  if (utils::strmatch(line,"^\\s*ITEM: UNITS\\s*$"))
     read_lines(2);
 
-  if (strstr(line,"ITEM: TIMESTEP") != line)
+  if (utils::strmatch(line,"^\\s*ITEM: TIME\\s*$"))
+    read_lines(2);
+
+  if (!utils::strmatch(line,"^\\s*ITEM: TIMESTEP\\s*$"))
     error->one(FLERR,"Dump file is incorrectly formatted");
 
   read_lines(1);
diff --git a/src/reset_ids.cpp b/src/reset_ids.cpp
index 857738e841..4f81abd3fd 100644
--- a/src/reset_ids.cpp
+++ b/src/reset_ids.cpp
@@ -86,7 +86,7 @@ void ResetIDs::command(int narg, char ** /* arg */)
     tag[i] = 0;
   }
 
-  // assign new contigous IDs to owned atoms via tag_extend()
+  // assign new contiguous IDs to owned atoms via tag_extend()
 
   atom->tag_extend();
 
diff --git a/src/set.cpp b/src/set.cpp
index 9807b07ea4..e3b1962d5d 100644
--- a/src/set.cpp
+++ b/src/set.cpp
@@ -1084,13 +1084,18 @@ void Set::setrandom(int keyword)
     ranmars->select_subset(nsubset,count,flag,work);
 
     // change types of selected atoms
+    // flag vector from select_subset() is only for eligible atoms
 
     count = 0;
-    for (i = 0; i < nlocal; i++)
-      if (select[i] && flag[i]) {
+    int eligible = 0;
+    for (i = 0; i < nlocal; i++) {
+      if (!select[i]) continue;
+      if (flag[eligible]) {
         atom->type[i] = newtype;
         count++;
       }
+      eligible++;
+    }
 
     // clean up
 
diff --git a/src/suffix.h b/src/suffix.h
index 88629aa796..177990eb68 100644
--- a/src/suffix.h
+++ b/src/suffix.h
@@ -16,15 +16,16 @@
 
 namespace LAMMPS_NS {
 
-enum Suffix {
-  NONE   = 0,
-  OPT    = 1<<0,
-  GPU    = 1<<1,
-  OMP    = 1<<2,
-  INTEL  = 1<<3,
-  KOKKOS = 1<<4
-};
-
+namespace Suffix {
+  enum {
+    NONE   = 0,
+    OPT    = 1<<0,
+    GPU    = 1<<1,
+    OMP    = 1<<2,
+    INTEL  = 1<<3,
+    KOKKOS = 1<<4
+  };
+}
 }
 
 #endif
diff --git a/src/utils.cpp b/src/utils.cpp
index f6556a3ac8..5e0db6afb9 100644
--- a/src/utils.cpp
+++ b/src/utils.cpp
@@ -84,29 +84,6 @@ bool utils::strmatch(std::string text, std::string pattern)
   return (pos >= 0);
 }
 
-/* utility function to avoid code repetition when parsing args */
-int utils::cfvarg(std::string mode, const char *arg, char *&cfv_id)
-{
-  int rv = utils::NONE;
-  cfv_id = NULL;
-
-  if (!arg) return rv;
-
-  if (utils::strmatch(arg,std::string("^[") + mode + "]_")) {
-    if (*arg == 'c') rv = utils::COMPUTE;
-    else if (*arg == 'f') rv = utils::FIX;
-    else if (*arg == 'v') rv = utils::VARIABLE;
-    else return rv;             // should not happen
-
-    arg += 2;
-    int n = strlen(arg)+1;
-    cfv_id = new char[n];
-    strcpy(cfv_id,arg);
-  }
-
-  return rv;
-}
-
 /** \brief try to detect pathname from FILE pointer. Currently only supported on Linux, otherwise will report "(unknown)".
  *
  *  \param buf  storage buffer for pathname. output will be truncated if not large enough
diff --git a/src/utils.h b/src/utils.h
index e87aa4bb91..45fb95aaac 100644
--- a/src/utils.h
+++ b/src/utils.h
@@ -36,25 +36,6 @@ namespace LAMMPS_NS {
      */
     bool strmatch(std::string text, std::string pattern);
 
-    /** Categories of special arguments for cfvarg() function
-     *
-     * Enum starts from 100 to avoid conflicts with other local define flags
-     */
-    enum {NONE=100,              /// does not match any category
-          COMPUTE,               /// processed a compute
-          FIX,                   /// processed a fix
-          VARIABLE               /// processed a variable
-    };
-
-    /** \brief Convenience function to process 'c_', 'f_', and 'v_' arguments
-     *
-     *  \param mode types to search for. 1-3 char string from 'c', 'f', or 'v'
-     *  \param arg  argument string to test against the prefixes
-     *  \param cfv_id name or ID of the compute, fix, or variable
-     *  \return utils::COMPUTE, utils::FIX, utils::VARIABLE or utils::NONE
-     */
-    int cfvarg(std::string mode, const char *arg, char *&cfv_id);
-
     /** \brief safe wrapper around fgets() which aborts on errors
      *  or EOF and prints a suitable error message to help debugging
      *
diff --git a/src/variable.cpp b/src/variable.cpp
index 1093ce9066..0fc53f8074 100644
--- a/src/variable.cpp
+++ b/src/variable.cpp
@@ -661,6 +661,8 @@ int Variable::next(int narg, char **arg)
 
   } else if (istyle == UNIVERSE || istyle == ULOOP) {
 
+    uloop_again:
+
     // wait until lock file can be created and owned by proc 0 of this world
     // rename() is not atomic in practice, but no known simple fix
     //   means multiple procs can read/write file at the same time (bad!)
@@ -669,7 +671,7 @@ int Variable::next(int narg, char **arg)
     // delay for random fraction of 1 second before subsequent tries
     // when successful, read next available index and Bcast it within my world
 
-    int nextindex;
+    int nextindex = -1;
     if (me == 0) {
       int seed = 12345 + universe->me + which[find(arg[0])];
       RanMars *random = new RanMars(lmp,seed);
@@ -682,10 +684,33 @@ int Variable::next(int narg, char **arg)
       }
       delete random;
 
-      FILE *fp = fopen("tmp.lammps.variable.lock","r");
-      fscanf(fp,"%d",&nextindex);
+      // if the file cannot be found, we may have a race with some
+      // other MPI rank that has called rename at the same time
+      // and we have to start over.
+      // if the read is short (we need at least one byte) we try reading again.
+
+      FILE *fp;
+      char buf[64];
+      for (int loopmax = 0; loopmax < 100; ++loopmax) {
+        fp = fopen("tmp.lammps.variable.lock","r");
+        if (fp == NULL) goto uloop_again;
+
+        buf[0] = buf[1] = '\0';
+        fread(buf,1,64,fp);
+        fclose(fp);
+
+        if (strlen(buf) > 0) {
+           nextindex = atoi(buf);
+           break;
+        }
+        delay = (int) (1000000*random->uniform());
+        usleep(delay);
+      }
+      if (nextindex < 0)
+        error->one(FLERR,"Unexpected error while incrementing uloop "
+                   "style variable. Please contact LAMMPS developers.");
+
       //printf("READ %d %d\n",universe->me,nextindex);
-      fclose(fp);
       fp = fopen("tmp.lammps.variable.lock","w");
       fprintf(fp,"%d\n",nextindex+1);
       //printf("WRITE %d %d\n",universe->me,nextindex+1);
diff --git a/src/version.h b/src/version.h
index a47eeef1c1..774a0a4b96 100644
--- a/src/version.h
+++ b/src/version.h
@@ -1 +1 @@
-#define LAMMPS_VERSION "24 Jan 2020"
+#define LAMMPS_VERSION "19 Mar 2020"
diff --git a/src/write_restart.cpp b/src/write_restart.cpp
index 4b84e790b8..b1602332e0 100644
--- a/src/write_restart.cpp
+++ b/src/write_restart.cpp
@@ -36,34 +36,10 @@
 #include "memory.h"
 #include "error.h"
 
+#include "lmprestart.h"
+
 using namespace LAMMPS_NS;
 
-// same as read_restart.cpp
-
-#define MAGIC_STRING "LammpS RestartT"
-#define ENDIAN 0x0001
-#define ENDIANSWAP 0x1000
-#define VERSION_NUMERIC 0
-
-enum{VERSION,SMALLINT,TAGINT,BIGINT,
-     UNITS,NTIMESTEP,DIMENSION,NPROCS,PROCGRID,
-     NEWTON_PAIR,NEWTON_BOND,
-     XPERIODIC,YPERIODIC,ZPERIODIC,BOUNDARY,
-     ATOM_STYLE,NATOMS,NTYPES,
-     NBONDS,NBONDTYPES,BOND_PER_ATOM,
-     NANGLES,NANGLETYPES,ANGLE_PER_ATOM,
-     NDIHEDRALS,NDIHEDRALTYPES,DIHEDRAL_PER_ATOM,
-     NIMPROPERS,NIMPROPERTYPES,IMPROPER_PER_ATOM,
-     TRICLINIC,BOXLO,BOXHI,XY,XZ,YZ,
-     SPECIAL_LJ,SPECIAL_COUL,
-     MASS,PAIR,BOND,ANGLE,DIHEDRAL,IMPROPER,
-     MULTIPROC,MPIIO,PROCSPERFILE,PERPROC,
-     IMAGEINT,BOUNDMIN,TIMESTEP,
-     ATOM_ID,ATOM_MAP_STYLE,ATOM_MAP_USER,ATOM_SORTFREQ,ATOM_SORTBIN,
-     COMM_MODE,COMM_CUTOFF,COMM_VEL,NO_PAIR,
-     EXTRA_BOND_PER_ATOM,EXTRA_ANGLE_PER_ATOM,EXTRA_DIHEDRAL_PER_ATOM,
-     EXTRA_IMPROPER_PER_ATOM,EXTRA_SPECIAL_PER_ATOM,ATOM_MAXSPECIAL};
-
 /* ---------------------------------------------------------------------- */
 
 WriteRestart::WriteRestart(LAMMPS *lmp) : Pointers(lmp)
@@ -299,7 +275,7 @@ void WriteRestart::write(char *file)
   // max_size = largest buffer needed by any proc
   // NOTE: are assuming size_restart() returns 32-bit int
   //   for a huge one-proc problem, nlocal could be 32-bit
-  //   but nlocal * doubles-peratom could oveflow
+  //   but nlocal * doubles-peratom could overflow
 
   int max_size;
   int send_size = atom->avec->size_restart();
@@ -317,8 +293,11 @@ void WriteRestart::write(char *file)
   //   close header file, open multiname file on each writing proc,
   //   write PROCSPERFILE into new file
 
+  int io_error = 0;
   if (multiproc) {
     if (me == 0 && fp) {
+      magic_string();
+      if (ferror(fp)) io_error = 1;
       fclose(fp);
       fp = NULL;
     }
@@ -401,20 +380,21 @@ void WriteRestart::write(char *file)
 
   if (mpiioflag) {
     if (me == 0 && fp) {
+      magic_string();
+      if (ferror(fp)) io_error = 1;
       fclose(fp);
       fp = NULL;
     }
     mpiio->openForWrite(file);
     mpiio->write(headerOffset,send_size,buf);
     mpiio->close();
-  }
+  } else {
 
-  // output of one or more native files
-  // filewriter = 1 = this proc writes to file
-  // ping each proc in my cluster, receive its data, write data to file
-  // else wait for ping from fileproc, send my data to fileproc
+    // output of one or more native files
+    // filewriter = 1 = this proc writes to file
+    // ping each proc in my cluster, receive its data, write data to file
+    // else wait for ping from fileproc, send my data to fileproc
 
-  else {
     int tmp,recv_size;
 
     if (filewriter) {
@@ -430,6 +410,8 @@ void WriteRestart::write(char *file)
 
         write_double_vec(PERPROC,recv_size,buf);
       }
+      magic_string();
+      if (ferror(fp)) io_error = 1;
       fclose(fp);
       fp = NULL;
 
@@ -439,6 +421,12 @@ void WriteRestart::write(char *file)
     }
   }
 
+  // Check for I/O error status
+
+  int io_all = 0;
+  MPI_Allreduce(&io_error,&io_all,1,MPI_INT,MPI_MAX,world);
+  if (io_all) error->all(FLERR,"I/O error while writing restart");
+
   // clean up
 
   memory->destroy(buf);
@@ -656,7 +644,7 @@ void WriteRestart::endian()
 
 void WriteRestart::version_numeric()
 {
-  int vn = VERSION_NUMERIC;
+  int vn = FORMAT_REVISION;
   fwrite(&vn,sizeof(int),1,fp);
 }
 
diff --git a/tools/README b/tools/README
index b20e82c53e..2a6f28caf0 100644
--- a/tools/README
+++ b/tools/README
@@ -12,36 +12,37 @@ at.
 
 These are the included tools:
 
-amber2lmp	       python scripts for using AMBER to setup LAMMPS input
-binary2txt	       convert a LAMMPS dump file from binary to ASCII text
-ch2lmp		       convert CHARMM files to LAMMPS input
-chain		       create a data file of bead-spring chains
-colvars		       post-process output of the fix colvars command        
-createatoms	       generate lattices of atoms within a geometry
+amber2lmp              python scripts for using AMBER to setup LAMMPS input
+binary2txt             convert a LAMMPS dump file from binary to ASCII text
+ch2lmp                 convert CHARMM files to LAMMPS input
+chain                  create a data file of bead-spring chains
+cmake                  tools and scripts for use with CMake
+colvars                post-process output of the fix colvars command
+createatoms            generate lattices of atoms within a geometry
 drude                  create Drude core/electron atom pairs in a data file
-eam_database	       one tool to generate EAM alloy potential files
-eam_generate	       2nd tool to generate EAM alloy potential files
-eff		       scripts for working with the eFF (electron force field)
-emacs		       add-ons to EMACS editor for editing LAMMPS input scripts
-fep		       scripts for free-energy perturbation with USER-FEP pkg
+eam_database           one tool to generate EAM alloy potential files
+eam_generate           2nd tool to generate EAM alloy potential files
+eff                    scripts for working with the eFF (electron force field)
+emacs                  add-ons to EMACS editor for editing LAMMPS input scripts
+fep                    scripts for free-energy perturbation with USER-FEP pkg
 i-pi                   Python wrapper for performing path-integral MD (PIMD)
-ipp		       input pre-processor Perl tool for creating input scripts
+ipp                    input pre-processor Perl tool for creating input scripts
 kate                   add-ons to Kate editor for editing LAMMPS input scripts
-lmp2arc		       convert LAMMPS output to Accelrys Insight format
-lmp2cfg		       convert LAMMPS output to CFG files for AtomEye viz
-matlab		       MatLab scripts for post-processing LAMMPS output
-micelle2d	       create a data file of small lipid chains in solvent
+lmp2arc                convert LAMMPS output to Accelrys Insight format
+lmp2cfg                convert LAMMPS output to CFG files for AtomEye viz
+matlab                 MatLab scripts for post-processing LAMMPS output
+micelle2d              create a data file of small lipid chains in solvent
 moltemplate            Instructions for installing the Moltemplate builder program
-msi2lmp		       use Accelrys Insight code to setup LAMMPS input
+msi2lmp                use Accelrys Insight code to setup LAMMPS input
 phonon                 post-process output of the fix phonon command
 polybond               Python tool for programmable polymer bonding
-pymol_asphere	       convert LAMMPS output of ellipsoids to PyMol format
-python		       Python scripts for post-processing LAMMPS output
-reax	       	       Tools for analyzing output of ReaxFF simulations
-replica        tool to reorder LAMMPS replica trajectories according to temperature
+pymol_asphere          convert LAMMPS output of ellipsoids to PyMol format
+python                 Python scripts for post-processing LAMMPS output
+reax                   Tools for analyzing output of ReaxFF simulations
+replica                tool to reorder LAMMPS replica trajectories according to temperature
 smd                    convert Smooth Mach Dynamics triangles to VTK
 spin                   perform a cubic polynomial interpolation of a GNEB MEP
-vim		       add-ons to VIM editor for editing LAMMPS input scripts
+vim                    add-ons to VIM editor for editing LAMMPS input scripts
 xmgrace                a collection of scripts to generate xmgrace plots
 
 For tools that are single C, C++, or Fortran files, a Makefile for
diff --git a/tools/amber2lmp/amber2lammps.py b/tools/amber2lmp/amber2lammps.py
index 16b8ded46a..5a2d17c53b 100644
--- a/tools/amber2lmp/amber2lammps.py
+++ b/tools/amber2lmp/amber2lammps.py
@@ -7,7 +7,7 @@
 # 
 # Modified by Vikas Varshney, U Akron, 5 July 2005, as described in README
 # Bug Fixed :Third argument in Dihedral Coeffs section is an integer - Ketan S Khare September 26, 2011
-# Modified by Vikas Varshney, Oct 8, 2013 to include additional flags (Atomic_Number, Coulombic and van der Waals 1-4 factors which are included in newer vesions of .top and .crd files in amber12. 
+# Modified by Vikas Varshney, Oct 8, 2013 to include additional flags (Atomic_Number, Coulombic and van der Waals 1-4 factors which are included in newer versions of .top and .crd files in amber12.
 
 #============================================================
 
@@ -175,7 +175,7 @@ class Lammps:
 
 class Amber:
     def __init__(self):
-        'Initialise the Amber class'
+        'Initialize the Amber class'
         self.CRD_is_read = 0
         self.TOP_is_read = 0
 
diff --git a/tools/amber2lmp/dump2trj.py b/tools/amber2lmp/dump2trj.py
index d406ae7eb9..0f0b936397 100644
--- a/tools/amber2lmp/dump2trj.py
+++ b/tools/amber2lmp/dump2trj.py
@@ -70,7 +70,7 @@ def Find_dump_files():
 
 class Snapshot:
     def __init__(self, The_trajectory):
-        'Initialise the Snapshot class'
+        'Initialize the Snapshot class'
         
         self.timestep = The_trajectory.timestep
         self.atoms = The_trajectory.atoms
diff --git a/tools/amber2lmp/dump2trj99.py b/tools/amber2lmp/dump2trj99.py
index 19e6064e7c..3cac42987c 100755
--- a/tools/amber2lmp/dump2trj99.py
+++ b/tools/amber2lmp/dump2trj99.py
@@ -68,7 +68,7 @@ def Find_dump_files():
 
 class Snapshot:
     def __init__(self, The_trajectory):
-        'Initialise the Snapshot class'
+        'Initialize the Snapshot class'
         
         self.atoms = The_trajectory.atoms
         self.xlo = The_trajectory.xlo
diff --git a/tools/ch2lmp/charmm2lammps.pl b/tools/ch2lmp/charmm2lammps.pl
index b53bd00541..c1ec8ad895 100755
--- a/tools/ch2lmp/charmm2lammps.pl
+++ b/tools/ch2lmp/charmm2lammps.pl
@@ -12,7 +12,7 @@
 #               - $project.psf          ; CHARMM configs
 #               - top_$forcefield.rtf   ;
 #               - par_$forcefield.prm   ;
-#               Ouput:
+#               Output:
 #               - $project.data         ; LAMMPS data file
 #               - $project.in           ; LAMMPS input file
 #               - $project_ctrl.pdb     ; PDB control file
@@ -329,7 +329,7 @@
   }
 
 
-  sub PSFDihedrals                                      # hack to accomodate
+  sub PSFDihedrals                                      # hack to accommodate
   {                                                     # LAMMPS' way of calc
     $idihedral          = 0;                            # LJ 1-4 interactions
     return $ndihedral if (($dihedral_flag = $ndihedral ? 1 : 0));
@@ -1785,7 +1785,7 @@
 		$C_flag = 0;
 	}
 
-	# Quit if one of the atom types dosen't exist
+	# Quit if one of the atom types doesn't exist
 	if ( $C_counter == 0 or
 	    ($CA_counter == 0 and $CA_GLY_counter == 0 and $CA_PRO_counter == 0) or
 	    ($N_counter == 0 and $N_PRO_counter == 0) ) {
diff --git a/tools/ch2lmp/example/par_all27_na.prm b/tools/ch2lmp/example/par_all27_na.prm
index b721c37393..542d30e917 100644
--- a/tools/ch2lmp/example/par_all27_na.prm
+++ b/tools/ch2lmp/example/par_all27_na.prm
@@ -124,7 +124,7 @@ ON2  P3     300.0       1.68    !PPI2, from nad/ppi, adm jr. 7/01
 ON3  P3     480.0       1.53    !PPI2, from nad/ppi, adm jr. 7/01
 ON4  P3     237.0       1.58    !PPI2, from MP_1, ADM Jr.
 NN5  HN1    460.0       1.01    !sugar model, adm jr.
-!@@@@@@@@@ Begining of endocyclic bonds for deoxy-ribose @@@@@@@@@
+!@@@@@@@@@ Beginning of endocyclic bonds for deoxy-ribose @@@@@@@@@
 CN7B ON6    260.0       1.420   ! From exp  
 CN7B CN8    200.0       1.518   ! From exp 
 CN7  ON6    240.0       1.446   ! Fom exp.
@@ -135,21 +135,21 @@ CN7  HN7    309.0       1.111   !Alkanes, sacred
 CN8  HN8    309.0       1.111   !Alkanes, sacred
 CN7B HN7    309.0       1.111   ! From CN8  HN7 (NF)
 !@@@@@@@@@ End of endocyclic bonds for deoxy-ribose @@@@@@@@@
-!@@@@@@@@@ Begining of endocyclic bonds for ribose @@@@@@@@@
+!@@@@@@@@@ Beginning of endocyclic bonds for ribose @@@@@@@@@
 CN7B ON6B   260.0       1.420   ! From CN7B ON6
 CN7  ON6B   240.0       1.480   ! From CN7  ON6
 CN7B CN7B   200.0       1.450   ! 
 CN7  CN7B   222.5       1.460   ! Specific to RNA 
 !@@@@@@@@@ End of endocyclic bonds for ribose @@@@@@@@@
 
-!@@@@@@@@@ Begining of endocyclic bonds for arabinose @@@@@@@@@
-! Transfered from DNA
+!@@@@@@@@@ Beginning of endocyclic bonds for arabinose @@@@@@@@@
+! Transferred from DNA
 CN7B CN7C   200.0       1.518   ! For arabinose, from CN7B CN8
 CN7  CN7C   222.5       1.516   ! For arabinose, from CN7  CN8
 CN7C HN7    309.0       1.111   ! From CN8  HN7
 !@@@@@@@@@ End of endocyclic bonds for arabinose @@@@@@@@@
 
-!@@@@@@@@@ Begining of exocyclic bonds for deoxy-ribose @@@@@@@@@
+!@@@@@@@@@ Beginning of exocyclic bonds for deoxy-ribose @@@@@@@@@
 CN7  CN8B   222.5       1.512   ! From exp. 
 CN8B ON2    320.0       1.44    ! From exp
 !CN8B ON5    250.0       1.44    ! From CN8B ON2
@@ -169,19 +169,19 @@ CN8B  HN8    309.0       1.111  !Alkanes, sacred
 ON5   HN5    545.0       0.960  !RIBOSE, MeOH
 !@@@@@@@@@ End of exocyclic bonds for deoxy-ribose @@@@@@@@@
 
-!@@@@@@@@@ Begining of exocyclic bonds for ribose @@@@@@@@@
+!@@@@@@@@@ Beginning of exocyclic bonds for ribose @@@@@@@@@
 !CN7B ON5    250.0       1.400   ! From CN7  ON5
 CN7B ON5    428.0       1.400   ! check adm jr., 
 !FC should be 428.000 based on Meoh
 !@@@@@@@@@ End of exocyclic bonds for ribose @@@@@@@@@
 
-!@@@@@@@@@ Begining of exocyclic bonds for arabinose @@@@@@@@@
+!@@@@@@@@@ Beginning of exocyclic bonds for arabinose @@@@@@@@@
 !CN7C ON5    250.0       1.400   ! From CN7  ON5
 CN7C ON5    428.0       1.400   ! check adm jr.,
 !FC should be 428.000 based on Meoh
 !@@@@@@@@@ End of exocyclic bonds for arabinose @@@@@@@@@
 
-!@@@@@@@@@ Begining of bonds for nucleotide analogue @@@@@@@@@
+!@@@@@@@@@ Beginning of bonds for nucleotide analogue @@@@@@@@@
 CN8  ON2    340.0       1.44    !
 !@@@@@@@@@ End of bonds for nucleotide analogue @@@@@@@@@
 
@@ -1075,9 +1075,9 @@ CN7  ON6  CN7B NR1      0.0     3     0.0
 CN7  ON6B CN7B NR1      0.0     3     0.0 ! RNUS
 NR1  CN7B CN8  CN7      0.0     3     0.0
 !%%%%%%% new terms for dna and the deoxyribose-based model compounds %%%%%%
-! The following is for: THF3P (model for espilon), THFM3P (model for puckering),
+! The following is for: THF3P (model for epsilon), THFM3P (model for puckering),
 ! THF5P (model for gamma and beta), THFCH3IM (model for chi), nucleotide analogue
-!@@@@@@ Begining of chi
+!@@@@@@ Beginning of chi
 !============= added for torsion about chi in adenine ============
 !For link from sugar to base:
 CN7B NN2  CN4  HN3       0.3     2       180.0 ! NF
@@ -1214,7 +1214,7 @@ HN7  CN7B CN7B NN2B      0.0     3         0.0
 HN7  CN7C CN7B NN2       0.0     3         0.0
 HN7  CN7C CN7B NN2B      0.0     3         0.0
 
-!@@@@@@ Begining of torsions involving exocyclic sugar atoms:
+!@@@@@@ Beginning of torsions involving exocyclic sugar atoms:
 !======= CN7  CN8B  ON2  P = C4'-C5'-O5'-P 
 CN7  CN8B ON2  P        0.2     1       120.0 !bet C4'-C5'-O5'-P, adm jr.
 ! the following differ significantly from the alcohols
@@ -1354,7 +1354,7 @@ HN7  CN7  CN7  ON5       0.195   3         0.0
 !======== CN7 CN7 ON2 P = C4'-C3'-O3'-P 
 CN7  CN7  ON2  P         0.6     5         0.0 !eps
 CN7  CN7  ON2  P         0.2     4         0.0 !eps, locat of 200 mimima
-CN7  CN7  ON2  P         0.0     3       180.0 !eps, barE beteen minima
+CN7  CN7  ON2  P         0.0     3       180.0 !eps, barE between minima
 CN7  CN7  ON2  P         0.4     2         0.0 !eps, relE of 200 vs 275 min
 CN7  CN7  ON2  P         1.9     1       180.0 !eps
 !======== CN8 CN7 ON2 P = C2'-C3'-O3'-P 
@@ -1378,20 +1378,20 @@ CN7B CN7  ON5  HN5       0.8     3         0.0 ! RNA
 CN7B CN7  ON5  HN5       0.5     1         0.0 ! RNA
 CN7C CN7  ON5  HN5       0.8     3         0.0 ! Arabinose (from DNA)
 CN7C CN7  ON5  HN5       0.5     1         0.0 ! Arabinose (from DNA)
-! Was simply transfered from HN7  CN7  ON2  P
+! Was simply transferred from HN7  CN7  ON2  P
 ! adm jr. should convert to alcohol term (see ribose etc)
 HN7  CN7  ON5  HN5       0.0     3         0.0
 HN7  CN7  CN8B HN8       0.195   3         0.0 !gam H-C4'-C5'-H
 HN7  CN7  CN7  CN8B      0.195   3         0.0 !gam H-C3'-C4'-C5'
 !@@@@@@ End of torsions involving exocyclic atoms:
-!@@@@@@ Begining of torsions for endocyclic atoms only:
+!@@@@@@ Beginning of torsions for endocyclic atoms only:
 CN8  CN7B ON6  CN7       0.6     6       180.0 !C2'-C1'-O4'-C4'
 CN8  CN7  CN7  ON6       0.0     3         0.0 !C2'-C3'-C4'-O4'
 CN7B CN7B ON6B CN7       0.0     6         0.0 ! RNA, Lowers barrier
 CN7B CN7  CN7  ON6B      0.0     3         0.0 ! RNA
 CN7C CN7B ON6  CN7       0.6     6       180.0 ! Arabinose (from DNA)
 CN7C CN7  CN7  ON6       0.0     3         0.0 ! Arabinose (from DNA)
-!======== CN7 CN8 CN7B ON6 for nucleosides, transfered from =========
+!======== CN7 CN8 CN7B ON6 for nucleosides, transferred from =========
 !======== CN7 CN8  CN8  ON6 from thfoh ==============================
 CN7  CN8  CN7B ON6       0.6     6         0.0 ! C3'-C2'-C1'-O4', adjust barrier
 CN7  CN7B CN7B ON6B      0.4     6         0.0 ! RNA
@@ -1402,7 +1402,7 @@ CN7B CN8  CN7  CN7       0.4      6        0.0 ! good for amplitudes
 CN7B CN7B CN7  CN7       0.0      6        0.0 ! RNA
 CN7B CN7B CN8  CN7       0.0      6        0.0 ! RNA, 25P1
 CN7B CN7C CN7  CN7       0.4      6        0.0 ! Arabinose (from DNA)
-!======== CN7 CN7 ON6 CN7B for nucleosides, transfered from ========
+!======== CN7 CN7 ON6 CN7B for nucleosides, transferred from ========
 !======== CN7 CN7 ON6 CN8 from thfohch3 ============================
 CN7  CN7  ON6  CN7B      0.6      6      180.0 ! C3'-C4'-O4'-C1'
 CN7  CN7  ON6B CN7B      0.0      6      180.0 ! RNA
@@ -1438,7 +1438,7 @@ HN7  CN7  CN7C HN7       0.195    3       0.0 !Arabinose (from DNA), H-C3'-C2'-H
 HN7  CN7C CN7  CN7       0.195    3       0.0 !Arabinose (from DNA), useful *cccc*
 !@@@@@@ End of torsions for endocyclic atoms only
 
-!@@@@@@ Begining of torsions specifically defined for RNA @@@@@@
+!@@@@@@ Beginning of torsions specifically defined for RNA @@@@@@
 ! N9-C1'-C2'-O2':
 NN2  CN7B CN7B ON5       0.000    3       0.0 ! Adenine and cytosine
 NN2B CN7B CN7B ON5       0.000    3       0.0 ! Guanine and uracil
@@ -1461,7 +1461,7 @@ HN5  ON5  CN7B CN7       0.300    3       0.0 ! 030298
 HN5  ON5  CN7B CN7       0.000    1       0.0 ! 030298
 !@@@@@@ End of torsions specifically defined for RNA @@@@@@
 
-!@@@@@@ Begining of torsions specifically defined for arabinose @@@@@@
+!@@@@@@ Beginning of torsions specifically defined for arabinose @@@@@@
 ON6  CN7B CN7C ON5       0.000   3       0.0
 ! the following differ significantly from the protein based
 ! alcohol parameters (based on ethanol, see above)
diff --git a/tools/cmake/cmbuild b/tools/cmake/cmbuild
new file mode 100755
index 0000000000..f9e0f87390
--- /dev/null
+++ b/tools/cmake/cmbuild
@@ -0,0 +1,69 @@
+#!/bin/bash
+# make like wrapper around "cmake --build"
+# (c) 2020 Axel Kohlmeyer <akohlmey@temple.edu>
+# This file is in the public domain
+
+WORKDIR="${PWD}"
+PARAMS=""
+MYARGS=""
+
+usage()
+{
+   echo "Usage: cmbuild [-v] [-h] [-C <dir>] [-j <num>] [<target>]" >&2
+}
+
+help()
+{
+   usage
+   cat >&2 <<EOF
+
+Options:
+  -h                print this message
+  -j <NUM>          allow processing of NUM concurrent tasks
+  -C DIRECTORY      execute build in folder DIRECTORY
+  -v                produce verbose output
+EOF
+}
+
+while (( "$#" )); do
+    case "$1" in
+      -C)
+        WORKDIR="$2"
+        shift 2
+        ;;
+      -v)
+        MYARGS="${MYARGS} -v"
+        shift
+        ;;
+      -h)
+        help
+        exit 2
+        ;;
+      -j)
+        MYARGS="${MYARGS} -j $2"
+        shift 2
+        ;;
+      --)
+        shift
+        break
+        ;;
+      -*)
+        echo "Error: Unsupported flag $1" >&2
+        echo
+        usage
+        exit 1
+        ;;
+      *)
+        PARAMS="${PARAMS} $1"
+        shift
+        ;;
+    esac
+done
+
+if [ ! -f "${WORKDIR}/CMakeCache.txt" ] ; then
+   echo "Must execute in a CMake build directory or use -C flag to select one" >&2
+   exit 3
+fi
+
+eval set -- "${PARAMS} $@"
+exec cmake --build "${WORKDIR}" ${MYARGS} --target "$@"
diff --git a/tools/colvars/abf_data.cpp b/tools/colvars/abf_data.cpp
index 8b1ebd0a96..2ce2b927eb 100644
--- a/tools/colvars/abf_data.cpp
+++ b/tools/colvars/abf_data.cpp
@@ -82,7 +82,7 @@ ABFdata::ABFdata(const char *gradFileName)
         pos[i] = 0;
 
     for (unsigned int i = 0; i < scalar_dim; i++) {
-        // Here we do the Euclidian division iteratively
+        // Here we do the Euclidean division iteratively
         for (int k = Nvars - 1; k > 0; k--) {
             if (pos[k] == sizes[k]) {
                 pos[k] = 0;
@@ -213,7 +213,7 @@ void ABFdata::write_histogram(const char *fileName)
         pos[i] = 0;
 
     for (index = 0; index < scalar_dim; index++) {
-        // Here we do the Euclidian division iteratively
+        // Here we do the Euclidean division iteratively
         for (i = Nvars - 1; i > 0; i--) {
             if (pos[i] == sizes[i]) {
                 pos[i] = 0;
@@ -271,7 +271,7 @@ void ABFdata::write_bias(const char *fileName)
     }
 
     for (index = 0; index < scalar_dim; index++) {
-        // Here we do the Euclidian division iteratively
+        // Here we do the Euclidean division iteratively
         for (i = Nvars - 1; i > 0; i--) {
             if (pos[i] == sizes[i]) {
                 pos[i] = 0;
@@ -316,7 +316,7 @@ void ABFdata::write_field(double *field, const char *fileName)
     f = field;
 
     for (index = 0; index < scalar_dim; index++) {
-        // Here we do the Euclidian division iteratively
+        // Here we do the Euclidean division iteratively
         for (i = Nvars - 1; i > 0; i--) {
             if (pos[i] == sizes[i]) {
                 pos[i] = 0;
diff --git a/tools/doxygen/README b/tools/doxygen/README
index c6a6229995..847acf2bb9 100644
--- a/tools/doxygen/README
+++ b/tools/doxygen/README
@@ -73,7 +73,7 @@ Results
 
 The doxygen documentation for LAMMPS is created in the following directories:
 
-  "tools/doxygen/doc" = LAMMPS documetation in "doxygen" html format.
+  "tools/doxygen/doc" = LAMMPS documentation in "doxygen" html format.
   In order to read the html documentation, start with loading the "index.html"
   file into an internet browser of choice from this directory. The generation
   of other formats (pdf, docbook, rtf or man) is disabled by default but can be
diff --git a/tools/eff/lmp2radii.c b/tools/eff/lmp2radii.c
index b62da070ba..f7ec790b1b 100644
--- a/tools/eff/lmp2radii.c
+++ b/tools/eff/lmp2radii.c
@@ -1759,7 +1759,7 @@ PyMODINIT_FUNC PyInit_lmp2radii(void)
   Py_ssize_t __pyx_5 = 0;
   PyObject *__pyx_6 = 0;
   __pyx_empty_tuple = PyTuple_New(0); if (unlikely(!__pyx_empty_tuple)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
-  /*--- Libary function declarations ---*/
+  /*--- Library function declarations ---*/
   __pyx_init_filenames();
   /*--- Initialize various global constants etc. ---*/
   if (unlikely(__Pyx_InitGlobals() < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
diff --git a/tools/i-pi/drivers/LJ.f90 b/tools/i-pi/drivers/LJ.f90
index 342425f29e..8341c64be7 100644
--- a/tools/i-pi/drivers/LJ.f90
+++ b/tools/i-pi/drivers/LJ.f90
@@ -182,7 +182,7 @@
             start = 1
 
             DO i = 1, natoms - 1
-               ! Only loops over the neigbour list, not all the atoms.
+               ! Only loops over the neighbour list, not all the atoms.
                DO j = start, index_list(i)
                   CALL vector_separation(cell_h, cell_ih, atoms(i,:), atoms(n_list(j),:), rij, r2)
                   IF (r2 < rc*rc) THEN ! Only calculates contributions between neighbouring particles.
diff --git a/tools/i-pi/drivers/SG.f90 b/tools/i-pi/drivers/SG.f90
index 42d3e4945d..bb243b3469 100644
--- a/tools/i-pi/drivers/SG.f90
+++ b/tools/i-pi/drivers/SG.f90
@@ -250,7 +250,7 @@
             start = 1
 
             DO i = 1, natoms - 1
-               ! Only loops over the neigbour list, not all the atoms.
+               ! Only loops over the neighbour list, not all the atoms.
                DO j = start, index_list(i)
                   CALL vector_separation(cell_h, cell_ih, atoms(i,:), atoms(n_list(j),:), rij, r2)
                   IF (r2 < rc*rc) THEN ! Only calculates contributions between neighbouring particles.
diff --git a/tools/i-pi/ipi/engine/atoms.py b/tools/i-pi/ipi/engine/atoms.py
index fd52ccf96b..9e6e2752f6 100644
--- a/tools/i-pi/ipi/engine/atoms.py
+++ b/tools/i-pi/ipi/engine/atoms.py
@@ -51,7 +51,7 @@ class Atom(dobject):
    """
 
    def __init__(self, system, index):
-      """Initialises Atom.
+      """Initializes Atom.
 
       Args:
          system: An Atoms object containing the required atom.
@@ -116,7 +116,7 @@ class Atoms(dobject):
 
 
    def __init__(self, natoms, _prebind=None):
-      """Initialises Atoms.
+      """Initializes Atoms.
 
       Each replica and the centroid coordinate are all held as Atoms objects,
       and so slices of the global position and momentum arrays must be used in
diff --git a/tools/i-pi/ipi/engine/barostats.py b/tools/i-pi/ipi/engine/barostats.py
index 5dbc6049d5..b65e62746c 100644
--- a/tools/i-pi/ipi/engine/barostats.py
+++ b/tools/i-pi/ipi/engine/barostats.py
@@ -70,7 +70,7 @@ class Barostat(dobject):
    """
 
    def __init__(self, dt=None, temp=None, pext=None, tau=None, ebaro=None, thermostat=None):
-      """Initialises base barostat class.
+      """Initializes base barostat class.
 
       Note that the external stress and the external pressure are synchronized.
       This makes most sense going from the stress to the pressure, but if you
diff --git a/tools/i-pi/ipi/engine/beads.py b/tools/i-pi/ipi/engine/beads.py
index ba4ddf1509..1a20574522 100644
--- a/tools/i-pi/ipi/engine/beads.py
+++ b/tools/i-pi/ipi/engine/beads.py
@@ -71,7 +71,7 @@ class Beads(dobject):
    """
 
    def __init__(self, natoms, nbeads):
-      """Initialises Beads.
+      """Initializes Beads.
 
       Args:
          natoms: Number of atoms.
diff --git a/tools/i-pi/ipi/engine/cell.py b/tools/i-pi/ipi/engine/cell.py
index e9bf813502..f800773a23 100644
--- a/tools/i-pi/ipi/engine/cell.py
+++ b/tools/i-pi/ipi/engine/cell.py
@@ -44,7 +44,7 @@ class Cell(dobject):
    """
 
    def __init__(self, h=None):
-      """Initialises base cell class.
+      """Initializes base cell class.
 
       Args:
          h: Optional array giving the initial lattice vector matrix. The
diff --git a/tools/i-pi/ipi/engine/ensembles.py b/tools/i-pi/ipi/engine/ensembles.py
index 9660ca983c..23d88e436b 100644
--- a/tools/i-pi/ipi/engine/ensembles.py
+++ b/tools/i-pi/ipi/engine/ensembles.py
@@ -78,7 +78,7 @@ class Ensemble(dobject):
    """
 
    def __init__(self, dt, temp, fixcom=False):
-      """Initialises Ensemble.
+      """Initializes Ensemble.
 
       Args:
          dt: The timestep of the simulation algorithms.
@@ -104,7 +104,7 @@ class Ensemble(dobject):
       conserved quantity the dependencies are defined in bind.
 
       Args:
-         beads: The beads object from whcih the bead positions are taken.
+         beads: The beads object from which the bead positions are taken.
          nm: A normal modes object used to do the normal modes transformation.
          cell: The cell object from which the system box is taken.
          bforce: The forcefield object from which the force and virial are
@@ -177,7 +177,7 @@ class NVEEnsemble(Ensemble):
    """
 
    def __init__(self, dt, temp, fixcom=False):
-      """Initialises NVEEnsemble.
+      """Initializes NVEEnsemble.
 
       Args:
          dt: The simulation timestep.
@@ -273,7 +273,7 @@ class NVTEnsemble(NVEEnsemble):
    """
 
    def __init__(self, dt, temp, thermostat=None, fixcom=False):
-      """Initialises NVTEnsemble.
+      """Initializes NVTEnsemble.
 
       Args:
          dt: The simulation timestep.
@@ -303,7 +303,7 @@ class NVTEnsemble(NVEEnsemble):
       higher simulation temperature, as is appropriate.
 
       Args:
-         beads: The beads object from whcih the bead positions are taken.
+         beads: The beads object from which the bead positions are taken.
          nm: A normal modes object used to do the normal modes transformation.
          cell: The cell object from which the system box is taken.
          bforce: The forcefield object from which the force and virial are
@@ -384,7 +384,7 @@ class NPTEnsemble(NVTEnsemble):
    """
 
    def __init__(self, dt, temp, pext, thermostat=None, barostat=None, fixcom=False):
-      """Initialises NPTEnsemble.
+      """Initializes NPTEnsemble.
 
       Args:
          dt: The simulation timestep.
@@ -422,7 +422,7 @@ class NPTEnsemble(NVTEnsemble):
       higher simulation temperature, as is appropriate.
 
       Args:
-         beads: The beads object from whcih the bead positions are taken.
+         beads: The beads object from which the bead positions are taken.
          nm: A normal modes object used to do the normal modes transformation.
          cell: The cell object from which the system box is taken.
          bforce: The forcefield object from which the force and virial are
@@ -508,7 +508,7 @@ class ReplayEnsemble(Ensemble):
    """
 
    def __init__(self, dt, temp, fixcom=False, intraj=None):
-      """Initialises ReplayEnsemble.
+      """Initializes ReplayEnsemble.
 
       Args:
          dt: The simulation timestep.
diff --git a/tools/i-pi/ipi/engine/forces.py b/tools/i-pi/ipi/engine/forces.py
index 58987f1e4d..5e3dabf8db 100644
--- a/tools/i-pi/ipi/engine/forces.py
+++ b/tools/i-pi/ipi/engine/forces.py
@@ -66,7 +66,7 @@ class ForceField(dobject):
    """
 
    def __init__(self):
-      """Initialises ForceField."""
+      """Initializes ForceField."""
 
       # ufvx is a list [ u, f, vir, extra ]  which stores the results of the force
       #calculation
@@ -217,7 +217,7 @@ class FFSocket(ForceField):
    """
 
    def __init__(self, pars=None, interface=None):
-      """Initialises FFSocket.
+      """Initializes FFSocket.
 
       Args:
          pars: Optional dictionary, giving the parameters needed by the driver.
diff --git a/tools/i-pi/ipi/engine/initializer.py b/tools/i-pi/ipi/engine/initializer.py
index de629c7f96..fd9bcfb9fa 100644
--- a/tools/i-pi/ipi/engine/initializer.py
+++ b/tools/i-pi/ipi/engine/initializer.py
@@ -493,7 +493,7 @@ class Initializer(dobject):
             rv *= np.sqrt(self.nbeads/nbeads)
             set_vector(v, simul.beads.p, rv)
             fmom = True
-         elif k == "thermostat": pass   # thermostats must be initialised in a second stage
+         elif k == "thermostat": pass   # thermostats must be initialized in a second stage
 
       if simul.beads.natoms == 0:
          raise ValueError("Initializer could not initialize the atomic positions")
diff --git a/tools/i-pi/ipi/engine/outputs.py b/tools/i-pi/ipi/engine/outputs.py
index fb5ebda96e..7d6e7587b5 100644
--- a/tools/i-pi/ipi/engine/outputs.py
+++ b/tools/i-pi/ipi/engine/outputs.py
@@ -85,7 +85,7 @@ class PropertyOutput(dobject):
       self.simul = simul
 
       # Checks as soon as possible if some asked-for properties are
-      # missing or mispelled
+      # missing or misspelled
       for what in self.outlist:
          key = getkey(what)
          if not key in self.simul.properties.property_dict.keys():
@@ -218,7 +218,7 @@ class TrajectoryOutput(dobject):
 
       self.simul = simul
 
-      # Checks as soon as possible if some asked-for trajs are missing or mispelled
+      # Checks as soon as possible if some asked-for trajs are missing or misspelled
       key = getkey(self.what)
       if not key in self.simul.trajs.traj_dict.keys():
          print "Computable trajectories list: ", self.simul.trajs.traj_dict.keys()
@@ -349,7 +349,7 @@ class CheckpointOutput(dobject):
       """Writes out the required trajectories.
 
       Used for both the checkpoint files and the soft-exit restart file.
-      We have slightly different behaviour for these two different types of
+      We have slightly different behavior for these two different types of
       checkpoint file, as the soft-exit files have their store() function
       called automatically, and we do not want this to be updated as the
       status of the simulation after a soft-exit call is unlikely to be in
diff --git a/tools/i-pi/ipi/engine/properties.py b/tools/i-pi/ipi/engine/properties.py
index a76aca1faf..48b0c00ecc 100644
--- a/tools/i-pi/ipi/engine/properties.py
+++ b/tools/i-pi/ipi/engine/properties.py
@@ -141,7 +141,7 @@ def help_latex(idict, standalone=True):
 }
 """
       rstr += "\n\\begin{document}\n"
-      rstr += "The following are the different allowable ouputs:\n\\par"
+      rstr += "The following are the different allowable outputs:\n\\par"
 
    for out in sorted(idict):
       rstr += "\\ipiitem{" + out + "}"
@@ -212,7 +212,7 @@ class Properties(dobject):
    _DEFAULT_MINFID = 1e-12
 
    def __init__(self):
-      """Initialises Properties."""
+      """Initializes Properties."""
 
       self.property_dict = {
       "step": {       "dimension" : "number",
@@ -1094,7 +1094,7 @@ class Trajectories(dobject):
    """
 
    def __init__(self):
-      """Initialises a Trajectories object."""
+      """Initializes a Trajectories object."""
 
       self.traj_dict = {
       # Note that here we want to return COPIES of the different arrays, so we make sure to make an operation in order not to return a reference.
diff --git a/tools/i-pi/ipi/engine/simulation.py b/tools/i-pi/ipi/engine/simulation.py
index 3c16a99621..b1483de576 100644
--- a/tools/i-pi/ipi/engine/simulation.py
+++ b/tools/i-pi/ipi/engine/simulation.py
@@ -20,7 +20,7 @@ along with this program. If not, see <http.//www.gnu.org/licenses/>.
 The root class for the whole simulation. Contains references to all the top
 level objects used in the simulation, and controls all the steps that are
 not inherently system dependent, like the running of each time step,
-choosing which properties to initialise, and which properties to output.
+choosing which properties to initialize, and which properties to output.
 
 Classes:
    Simulation: Deals with running the simulation and outputting the results.
@@ -81,7 +81,7 @@ class Simulation(dobject):
    """
 
    def __init__(self, beads, cell, forces, ensemble, prng, outputs, nm, init, step=0, tsteps=1000, ttime=0):
-      """Initialises Simulation class.
+      """Initializes Simulation class.
 
       Args:
          beads: A beads object giving the atom positions.
@@ -172,7 +172,7 @@ class Simulation(dobject):
 
       self.forces.run()
 
-      # prints inital configuration -- only if we are not restarting
+      # prints initial configuration -- only if we are not restarting
       if (self.step == 0):
          self.step = -1
          for o in self.outputs:
diff --git a/tools/i-pi/ipi/engine/thermostats.py b/tools/i-pi/ipi/engine/thermostats.py
index 1fb048ec27..7941f55916 100644
--- a/tools/i-pi/ipi/engine/thermostats.py
+++ b/tools/i-pi/ipi/engine/thermostats.py
@@ -31,11 +31,11 @@ Classes:
       the entire system.
    ThermoSVR: Holds the algorithms for a stochastic velocity rescaling
       thermostat.
-   ThermoGLE: Holds the algorithms for a generalised langevin equation
+   ThermoGLE: Holds the algorithms for a generalized langevin equation
       thermostat.
-   ThermoNMGLE: Holds the algorithms for a generalised langevin equation
+   ThermoNMGLE: Holds the algorithms for a generalized langevin equation
       thermostat in the normal mode representation.
-   ThermoNMGLEG: Holds the algorithms for a generalised langevin equation
+   ThermoNMGLEG: Holds the algorithms for a generalized langevin equation
       thermostat in the normal mode representation, with kinetic energy as
       well as potential energy sampling optimization.
 """
@@ -75,14 +75,14 @@ class Thermostat(dobject):
    """
 
    def __init__(self, temp = 1.0, dt = 1.0, ethermo=0.0):
-      """Initialises Thermostat.
+      """Initializes Thermostat.
 
       Args:
          temp: The simulation temperature. Defaults to 1.0.
          dt: The simulation time step. Defaults to 1.0.
          ethermo: The initial heat energy transferred to the bath.
             Defaults to 0.0. Will be non-zero if the thermostat is
-            initialised from a checkpoint file.
+            initialized from a checkpoint file.
       """
 
       dset(self,"temp",   depend_value(name='temp', value=temp))
@@ -181,7 +181,7 @@ class ThermoLangevin(Thermostat):
       return np.sqrt(Constants.kb*self.temp*(1 - self.T**2))
 
    def __init__(self, temp = 1.0, dt = 1.0, tau = 1.0, ethermo=0.0):
-      """Initialises ThermoLangevin.
+      """Initializes ThermoLangevin.
 
       Args:
          temp: The simulation temperature. Defaults to 1.0.
@@ -189,7 +189,7 @@ class ThermoLangevin(Thermostat):
          tau: The thermostat damping timescale. Defaults to 1.0.
          ethermo: The initial heat energy transferred to the bath.
             Defaults to 0.0. Will be non-zero if the thermostat is
-            initialised from a checkpoint file.
+            initialized from a checkpoint file.
       """
 
       super(ThermoLangevin,self).__init__(temp, dt, ethermo)
@@ -241,14 +241,14 @@ class ThermoPILE_L(Thermostat):
    """
 
    def __init__(self, temp = 1.0, dt = 1.0, tau = 1.0, ethermo=0.0, scale=1.0):
-      """Initialises ThermoPILE_L.
+      """Initializes ThermoPILE_L.
 
       Args:
          temp: The simulation temperature. Defaults to 1.0.
          dt: The simulation time step. Defaults to 1.0.
          tau: The centroid thermostat damping timescale. Defaults to 1.0.
          ethermo: The initial conserved energy quantity. Defaults to 0.0. Will
-            be non-zero if the thermostat is initialised from a checkpoint file.
+            be non-zero if the thermostat is initialized from a checkpoint file.
          scale: A float used to reduce the intensity of the PILE thermostat if
             required.
 
@@ -404,14 +404,14 @@ class ThermoSVR(Thermostat):
       return Constants.kb*self.temp*0.5
 
    def __init__(self, temp = 1.0, dt = 1.0, tau = 1.0, ethermo=0.0):
-      """Initialises ThermoSVR.
+      """Initializes ThermoSVR.
 
       Args:
          temp: The simulation temperature. Defaults to 1.0.
          dt: The simulation time step. Defaults to 1.0.
          tau: The thermostat damping timescale. Defaults to 1.0.
          ethermo: The initial conserved energy quantity. Defaults to 0.0. Will
-            be non-zero if the thermostat is initialised from a checkpoint file.
+            be non-zero if the thermostat is initialized from a checkpoint file.
       """
 
       super(ThermoSVR,self).__init__(temp,dt,ethermo)
@@ -459,14 +459,14 @@ class ThermoPILE_G(ThermoPILE_L):
    """
 
    def __init__(self, temp = 1.0, dt = 1.0, tau = 1.0, ethermo=0.0, scale = 1.0):
-      """Initialises ThermoPILE_G.
+      """Initializes ThermoPILE_G.
 
       Args:
          temp: The simulation temperature. Defaults to 1.0.
          dt: The simulation time step. Defaults to 1.0.
          tau: The centroid thermostat damping timescale. Defaults to 1.0.
          ethermo: The initial conserved energy quantity. Defaults to 0.0. Will
-            be non-zero if the thermostat is initialised from a checkpoint file.
+            be non-zero if the thermostat is initialized from a checkpoint file.
          scale: A float used to reduce the intensity of the PILE thermostat if
             required.
       """
@@ -532,9 +532,9 @@ class ThermoGLE(Thermostat):
    J. Chem. Phys. 134, 084104 (2011)).
 
    Attributes:
-      ns: The number of auxilliary degrees of freedom.
+      ns: The number of auxiliary degrees of freedom.
       s: An array holding all the momenta, including the ones for the
-         auxilliary degrees of freedom.
+         auxiliary degrees of freedom.
 
    Depend objects:
       A: Drift matrix giving the damping time scales for all the different
@@ -556,11 +556,11 @@ class ThermoGLE(Thermostat):
       return matrix_exp(-0.5*self.dt*self.A)
 
    def get_S(self):
-      """Calculates the matrix for the coloured noise."""
+      """Calculates the matrix for the colored noise."""
 
       SST = Constants.kb*(self.C - np.dot(self.T,np.dot(self.C,self.T.T)))
 
-      # Uses a symetric decomposition rather than Cholesky, since it is more stable
+      # Uses a symmetric decomposition rather than Cholesky, since it is more stable
       return root_herm(SST)
 
    def get_C(self):
@@ -570,7 +570,7 @@ class ThermoGLE(Thermostat):
       return rC[:]
 
    def __init__(self, temp = 1.0, dt = 1.0, A = None, C = None, ethermo=0.0):
-      """Initialises ThermoGLE.
+      """Initializes ThermoGLE.
 
       Args:
          temp: The simulation temperature. Defaults to 1.0.
@@ -582,7 +582,7 @@ class ThermoGLE(Thermostat):
             total number of degrees of freedom in the system.
          ethermo: The initial heat energy transferred to the bath.
             Defaults to 0.0. Will be non-zero if the thermostat is
-            initialised from a checkpoint file.
+            initialized from a checkpoint file.
       """
 
       super(ThermoGLE,self).__init__(temp,dt,ethermo)
@@ -643,15 +643,15 @@ class ThermoGLE(Thermostat):
       # allocates, initializes or restarts an array of s's
       if self.s.shape != (self.ns + 1, len(dget(self,"m"))):
          if len(self.s) > 0:
-            warning("Mismatch in GLE s array size on restart, will reinitialise to free particle.", verbosity.low)
+            warning("Mismatch in GLE s array size on restart, will reinitialize to free particle.", verbosity.low)
          self.s = np.zeros((self.ns + 1, len(dget(self,"m"))))
 
          # Initializes the s vector in the free-particle limit
-         info(" GLE additional DOFs initialised to the free-particle limit.", verbosity.low)
+         info(" GLE additional DOFs initialized to the free-particle limit.", verbosity.low)
          SC = stab_cholesky(self.C*Constants.kb)
          self.s[:] = np.dot(SC, self.prng.gvec(self.s.shape))
       else:
-         info("GLE additional DOFs initialised from input.", verbosity.medium)
+         info("GLE additional DOFs initialized from input.", verbosity.medium)
 
    def step(self):
       """Updates the bound momentum vector with a GLE thermostat"""
@@ -675,10 +675,10 @@ class ThermoNMGLE(Thermostat):
    GLE for each normal mode
 
    Attributes:
-      ns: The number of auxilliary degrees of freedom.
+      ns: The number of auxiliary degrees of freedom.
       nb: The number of beads.
       s: An array holding all the momenta, including the ones for the
-         auxilliary degrees of freedom.
+         auxiliary degrees of freedom.
 
    Depend objects:
       A: Drift matrix giving the damping time scales for all the different
@@ -699,7 +699,7 @@ class ThermoNMGLE(Thermostat):
       return rv[:]
 
    def __init__(self, temp = 1.0, dt = 1.0, A = None, C = None, ethermo=0.0):
-      """Initialises ThermoGLE.
+      """Initializes ThermoGLE.
 
       Args:
          temp: The simulation temperature. Defaults to 1.0.
@@ -711,7 +711,7 @@ class ThermoNMGLE(Thermostat):
             total number of degrees of freedom in the system.
          ethermo: The initial heat energy transferred to the bath.
             Defaults to 0.0. Will be non-zero if the thermostat is
-            initialised from a checkpoint file.
+            initialized from a checkpoint file.
       """
 
       super(ThermoNMGLE,self).__init__(temp,dt,ethermo)
@@ -767,16 +767,16 @@ class ThermoNMGLE(Thermostat):
       # allocates, initializes or restarts an array of s's
       if self.s.shape != (self.nb, self.ns + 1, nm.natoms *3) :
          if len(self.s) > 0:
-            warning("Mismatch in GLE s array size on restart, will reinitialise to free particle.", verbosity.low)
+            warning("Mismatch in GLE s array size on restart, will reinitialize to free particle.", verbosity.low)
          self.s = np.zeros((self.nb, self.ns + 1, nm.natoms*3))
 
          # Initializes the s vector in the free-particle limit
-         info(" GLE additional DOFs initialised to the free-particle limit.", verbosity.low)
+         info(" GLE additional DOFs initialized to the free-particle limit.", verbosity.low)
          for b in range(self.nb):
             SC = stab_cholesky(self.C[b]*Constants.kb)
             self.s[b] = np.dot(SC, self.prng.gvec(self.s[b].shape))
       else:
-         info("GLE additional DOFs initialised from input.", verbosity.medium)
+         info("GLE additional DOFs initialized from input.", verbosity.medium)
 
       prev_ethermo = self.ethermo
 
diff --git a/tools/i-pi/ipi/inputs/atoms.py b/tools/i-pi/ipi/inputs/atoms.py
index 6068be1961..4ae16bfdf5 100644
--- a/tools/i-pi/ipi/inputs/atoms.py
+++ b/tools/i-pi/ipi/inputs/atoms.py
@@ -78,7 +78,7 @@ class InputAtoms(Input):
       """Takes an Atoms instance and stores a minimal representation of it.
 
       Args:
-         atoms: An Atoms object from which to initialise from.
+         atoms: An Atoms object from which to initialize from.
          filename: An optional string giving a filename to take the atom
             positions from. Defaults to ''.
       """
diff --git a/tools/i-pi/ipi/inputs/beads.py b/tools/i-pi/ipi/inputs/beads.py
index f4caafcbb9..d889563d92 100644
--- a/tools/i-pi/ipi/inputs/beads.py
+++ b/tools/i-pi/ipi/inputs/beads.py
@@ -82,7 +82,7 @@ class InputBeads(Input):
       """Takes a Beads instance and stores a minimal representation of it.
 
       Args:
-         beads: A Beads object from which to initialise from.
+         beads: A Beads object from which to initialize from.
       """
 
       super(InputBeads,self).store()
diff --git a/tools/i-pi/ipi/inputs/prng.py b/tools/i-pi/ipi/inputs/prng.py
index 58faaca5f0..e3464ca791 100644
--- a/tools/i-pi/ipi/inputs/prng.py
+++ b/tools/i-pi/ipi/inputs/prng.py
@@ -38,7 +38,7 @@ class InputRandom(Input):
    instance of the object.
 
    Attributes:
-      seed: An optional integer giving a seed to initialise the random number
+      seed: An optional integer giving a seed to initialize the random number
          generator from. Defaults to 123456.
       state: An optional array giving the state of the random number generator.
          Defaults to an empty array.
@@ -74,7 +74,7 @@ class InputRandom(Input):
       representation of it.
 
       Args:
-         prng: A random number object from which to initialise from.
+         prng: A random number object from which to initialize from.
       """
 
       super(InputRandom,self).store(prng)
diff --git a/tools/i-pi/ipi/inputs/thermostats.py b/tools/i-pi/ipi/inputs/thermostats.py
index cbe2deefcf..5c1ec2d65b 100644
--- a/tools/i-pi/ipi/inputs/thermostats.py
+++ b/tools/i-pi/ipi/inputs/thermostats.py
@@ -56,7 +56,7 @@ class InputThermo(Input):
 
    attribs = { "mode": (InputAttribute, { "dtype"   : str,
                                       "options" : [ "", "langevin", "svr", "pile_l", "pile_g", "gle", "nm_gle", "nm_gle_g" ],
-                                      "help"    : "The style of thermostatting. 'langevin' specifies a white noise langevin equation to be attached to the cartesian representation of the momenta. 'svr' attaches a velocity rescaling thermostat to the cartesian representation of the momenta. Both 'pile_l' and 'pile_g' attaches a white noise langevin thermostat to the normal mode representation, with 'pile_l' attaching a local langevin thermostat to the centroid mode and 'pile_g' instead attaching a global velocity rescaling thermostat. 'gle' attaches a coloured noise langevin thermostat to the cartesian representation of the momenta, 'nm_gle' attaches a coloured noise langevin thermostat to the normal mode representation of the momenta and a langevin thermostat to the centroid and 'nm_gle_g' attaches a gle thermostat to the normal modes and a svr thermostat to the centroid."
+                                      "help"    : "The style of thermostatting. 'langevin' specifies a white noise langevin equation to be attached to the cartesian representation of the momenta. 'svr' attaches a velocity rescaling thermostat to the cartesian representation of the momenta. Both 'pile_l' and 'pile_g' attaches a white noise langevin thermostat to the normal mode representation, with 'pile_l' attaching a local langevin thermostat to the centroid mode and 'pile_g' instead attaching a global velocity rescaling thermostat. 'gle' attaches a colored noise langevin thermostat to the cartesian representation of the momenta, 'nm_gle' attaches a colored noise langevin thermostat to the normal mode representation of the momenta and a langevin thermostat to the centroid and 'nm_gle_g' attaches a gle thermostat to the normal modes and a svr thermostat to the centroid."
                                          }) }
    fields = { "ethermo" : (InputValue, {  "dtype"     : float,
                                           "default"   : 0.0,
diff --git a/tools/i-pi/ipi/interfaces/sockets.py b/tools/i-pi/ipi/interfaces/sockets.py
index 2783d31e06..f946cf3149 100644
--- a/tools/i-pi/ipi/interfaces/sockets.py
+++ b/tools/i-pi/ipi/interfaces/sockets.py
@@ -108,7 +108,7 @@ class DriverSocket(socket.socket):
    """Deals with communication between the client and driver code.
 
    Deals with sending and receiving the data from the driver code. Keeps track
-   of the status of the driver. Initialises the driver forcefield, sends the
+   of the status of the driver. Initializes the driver forcefield, sends the
    position and cell data, and receives the force data.
 
    Attributes:
@@ -119,7 +119,7 @@ class DriverSocket(socket.socket):
    """
 
    def __init__(self, socket):
-      """Initialises DriverSocket.
+      """Initializes DriverSocket.
 
       Args:
          socket: A socket through which the communication should be done.
@@ -378,7 +378,7 @@ class InterfaceSocket(object):
    """
 
    def __init__(self, address="localhost", port=31415, slots=4, mode="unix", latency=1e-3, timeout=1.0, dopbc=True):
-      """Initialises interface.
+      """Initializes interface.
 
       Args:
          address: An optional string giving the name of the host server.
@@ -556,7 +556,7 @@ class InterfaceSocket(object):
 
       Deals with maintaining the jobs list. Gets data from drivers that have
       finished their calculation and removes that job from the list of running
-      jobs, adds jobs to free clients and initialises the forcefields of new
+      jobs, adds jobs to free clients and initializes the forcefields of new
       clients.
       """
 
diff --git a/tools/i-pi/ipi/tests/README b/tools/i-pi/ipi/tests/README
index 17df9d7a7c..029c87a726 100644
--- a/tools/i-pi/ipi/tests/README
+++ b/tools/i-pi/ipi/tests/README
@@ -3,7 +3,7 @@
  * This is the directory containing the tests that can be run with nosetests.
 
  * Files:
-   - common.py: Common helper funtions for use in the tests.
+   - common.py: Common helper functions for use in the tests.
    - datest.py: Tests the dependency utility and some of the numpy
       facilities.
    - test_*.py: The actual tests for at least some of the code basis.
diff --git a/tools/i-pi/ipi/utils/depend.py b/tools/i-pi/ipi/utils/depend.py
index 4b87323533..a4da91b47b 100644
--- a/tools/i-pi/ipi/utils/depend.py
+++ b/tools/i-pi/ipi/utils/depend.py
@@ -73,7 +73,7 @@ class synchronizer(object):
    """
 
    def __init__(self, deps=None):
-      """Initialises synchronizer.
+      """Initializes synchronizer.
 
       Args:
          deps: Optional dictionary giving the synched objects of the form
@@ -113,7 +113,7 @@ class depend_base(object):
    """
 
    def __init__(self, name, synchro=None, func=None, dependants=None, dependencies=None, tainted=None):
-      """Initialises depend_base.
+      """Initializes depend_base.
 
       An unusual initialization routine, as it has to be able to deal with the
       depend array mechanism for returning slices as new depend arrays.
@@ -209,7 +209,7 @@ class depend_base(object):
       further down the dependency tree until either all objects have been
       tainted, or it reaches only objects that have already been tainted. Note
       that in the case of a dependency loop the initial setting of _tainted to
-      True prevents an infinite loop occuring.
+      True prevents an infinite loop occurring.
 
       Also, in the case of a synchro object, the manually set quantity is not
       tainted, as it is assumed that synchro objects only depend on each other.
@@ -291,7 +291,7 @@ class depend_value(depend_base):
    """
 
    def __init__(self, name, value=None, synchro=None, func=None, dependants=None, dependencies=None, tainted=None):
-      """Initialises depend_value.
+      """Initializes depend_value.
 
       Args:
          name: A string giving the name of self.
@@ -375,7 +375,7 @@ class depend_array(np.ndarray, depend_base):
       return obj
 
    def __init__(self, value, name, synchro=None, func=None, dependants=None, dependencies=None, tainted=None, base=None):
-      """Initialises depend_array.
+      """Initializes depend_array.
 
       Note that this is only called when a new array is created by an
       explicit constructor.
diff --git a/tools/i-pi/ipi/utils/inputvalue.py b/tools/i-pi/ipi/utils/inputvalue.py
index d1bbc631fd..35b2945910 100644
--- a/tools/i-pi/ipi/utils/inputvalue.py
+++ b/tools/i-pi/ipi/utils/inputvalue.py
@@ -22,7 +22,7 @@ attributes dictionary, which are filled with the tags and attributes that
 are allowed to be present, along with their default values and data type.
 
 These are then filled with the data from the xml file when the program
-is initialised, and are filled by the values calculated in the program which
+is initialized, and are filled by the values calculated in the program which
 are then output to the checkpoint file when a restart file is required.
 
 Also deals with checking for user input errors, of the form of misspelt tags,
@@ -65,14 +65,14 @@ class input_default(object):
    """
 
    def __init__(self, factory, args = None, kwargs = None):
-      """Initialises input_default.
+      """Initializes input_default.
 
       Args:
          type: The class or function to be used to create the default object.
-         args: A tuple giving the arguments to be used to initialise
+         args: A tuple giving the arguments to be used to initialize
             the default value.
          kwargs: A dictionary giving the key word arguments to be used
-            to initialise the default value.
+            to initialize the default value.
       """
 
       if args is None:
@@ -147,10 +147,10 @@ class Input(object):
                       #hyperlinks
 
    def __init__(self, help=None, default=None):
-      """Initialises Input.
+      """Initializes Input.
 
       Automatically adds all the fields and attribs names to the input object's
-      dictionary, then initialises all the appropriate input objects
+      dictionary, then initializes all the appropriate input objects
       as the corresponding values.
 
       Args:
@@ -252,7 +252,7 @@ class Input(object):
       called, so that their tags are written between the start and end tags
       of this object, as is required for the xml format.
 
-      This also adds an indent to the lower levels of the xml heirarchy,
+      This also adds an indent to the lower levels of the xml hierarchy,
       so that it is easy to see which tags contain other tags.
 
       Args:
@@ -676,7 +676,7 @@ class InputAttribute(Input):
    """
 
    def __init__(self,  help=None, default=None, dtype=None, options=None):
-      """Initialises InputAttribute.
+      """Initializes InputAttribute.
 
       Args:
          help: A help string.
@@ -773,7 +773,7 @@ class InputValue(InputAttribute):
    attribs= { "units" : ( InputAttribute, { "dtype" : str, "help" : "The units the input data is given in.", "default" : default_units } ) }
 
    def __init__(self,  help=None, default=None, dtype=None, options=None, dimension=None):
-      """Initialises InputValue.
+      """Initializes InputValue.
 
       Args:
          help: A help string.
@@ -874,7 +874,7 @@ class InputArray(InputValue):
    attribs["shape"] = (InputAttribute,  {"dtype": tuple,  "help": "The shape of the array.", "default": (0,)})
 
    def __init__(self,  help=None, default=None, dtype=None, dimension=None):
-      """Initialises InputArray.
+      """Initializes InputArray.
 
       Args:
          help: A help string.
diff --git a/tools/i-pi/ipi/utils/io/io_xml.py b/tools/i-pi/ipi/utils/io/io_xml.py
index 5e43854408..961a398848 100644
--- a/tools/i-pi/ipi/utils/io/io_xml.py
+++ b/tools/i-pi/ipi/utils/io/io_xml.py
@@ -63,7 +63,7 @@ class xml_node(object):
    """
 
    def __init__(self, attribs=None, name="", fields=None):
-      """Initialises xml_node.
+      """Initializes xml_node.
 
       Args:
          attribs: An optional dictionary giving attribute data. Defaults to {}.
@@ -101,7 +101,7 @@ class xml_handler(ContentHandler):
    """
 
    def __init__(self):
-      """Initialises xml_handler."""
+      """Initializes xml_handler."""
 
       #root xml node with all the data
       self.root = xml_node(name="root", fields=[])
@@ -119,7 +119,7 @@ class xml_handler(ContentHandler):
 
       Adds the opening tag to the list of open tags, adds a new space in the
       buffer, reads the appropriate attributes and adds a new level to the 
-      heirarchy.
+      hierarchy.
 
       Args:
          name: The tag_name.
@@ -139,7 +139,7 @@ class xml_handler(ContentHandler):
    def characters(self, data):
       """Reads data.
 
-      Adds the data to the buffer of the current level of the heirarchy.
+      Adds the data to the buffer of the current level of the hierarchy.
       Data is read as a string, and needs to be converted to the required
       type later.
 
diff --git a/tools/i-pi/ipi/utils/prng.py b/tools/i-pi/ipi/utils/prng.py
index c6626828a9..b6d9e6d21d 100644
--- a/tools/i-pi/ipi/utils/prng.py
+++ b/tools/i-pi/ipi/utils/prng.py
@@ -34,7 +34,7 @@ import math
 class Random(object):
    """Class to interface with the standard pseudo-random number generator.
 
-   Initialises the standard numpy pseudo-random number generator from a seed
+   Initializes the standard numpy pseudo-random number generator from a seed
    at the beginning of the simulation, and keeps track of the state so that
    it can be output to the checkpoint files throughout the simulation.
 
@@ -51,11 +51,11 @@ class Random(object):
    """
 
    def __init__(self, seed=12345, state=None):
-      """Initialises Random.
+      """Initializes Random.
 
       Args:
-         seed: An optional seed giving an integer to initialise the state with.
-         state: An optional state tuple to initialise the state with.
+         seed: An optional seed giving an integer to initialize the state with.
+         state: An optional state tuple to initialize the state with.
       """
 
       self.rng = np.random.mtrand.RandomState(seed=seed)
diff --git a/tools/ipp/ipp b/tools/ipp/ipp
index a7eac67247..081d19e243 100644
--- a/tools/ipp/ipp
+++ b/tools/ipp/ipp
@@ -2,7 +2,7 @@
 # ipp: a preprocessor script
 # author : Reese Jones rjones@sandia.gov (based on dprepro [Sandia])
 # to do :
-# priority (overide file defaults e.g. a=1 pfile a=2 -> a=2)
+# priority (override file defaults e.g. a=1 pfile a=2 -> a=2)
 #     also order precedence: a=10 -p p.file b=12
 # nested if/else/endif blocks
 
diff --git a/tools/lmp2cfg/lmp2cfg.f b/tools/lmp2cfg/lmp2cfg.f
index 80071f53db..14a5d5c56d 100644
--- a/tools/lmp2cfg/lmp2cfg.f
+++ b/tools/lmp2cfg/lmp2cfg.f
@@ -96,7 +96,7 @@ C clear data array.
           
 
 c--------------------------------------------------------------------
-c-------This section writes each ts to a seperate .cfg file----------
+c-------This section writes each ts to a separate .cfg file----------
       ciframe='.cfg'
       write(snapshot,'(i5.5,a4)')iframe,ciframe
       open(unit=iframe+20,file=snapshot,status='new',
diff --git a/tools/matlab/readdump_one.m b/tools/matlab/readdump_one.m
index 762ca9bb20..7be751c888 100644
--- a/tools/matlab/readdump_one.m
+++ b/tools/matlab/readdump_one.m
@@ -124,7 +124,7 @@ varargout{1}.x_bound = x_bound;
 varargout{1}.y_bound = y_bound;
 varargout{1}.z_bound = z_bound;
 varargout{1}.atom_data = atom_data;
-varargout{1}.position = p; %gives postion of ITEM: TIMESTEP line
+varargout{1}.position = p; %gives position of ITEM: TIMESTEP line
 %------------------------------
 
 fclose(dump);
diff --git a/tools/matlab/readlog.m b/tools/matlab/readlog.m
index 1fc88243ff..073b6c22ee 100644
--- a/tools/matlab/readlog.m
+++ b/tools/matlab/readlog.m
@@ -34,7 +34,7 @@ while feof(fid) == 0
     end
     %-------------------------------------------------------
     
-    %---------Seperate column headings----------------------
+    %---------Separate column headings----------------------
     j=1;
     k=1;
     Ch='';
diff --git a/tools/matlab/readrdf.m b/tools/matlab/readrdf.m
index 540bea7daf..4ec253942f 100644
--- a/tools/matlab/readrdf.m
+++ b/tools/matlab/readrdf.m
@@ -1,5 +1,5 @@
 function varargout = readrdf(varargin)
-% Function to read Radial Distribution Funtion output from LAMMPS
+% Function to read Radial Distribution Function output from LAMMPS
 % Input
 % 'bin'       --> number of bins in rdf histogram
 % 'runtime'   --> Run length of each of the run commands
diff --git a/tools/moltemplate/README.txt b/tools/moltemplate/README.txt
index ca6a013244..97f68a85de 100644
--- a/tools/moltemplate/README.txt
+++ b/tools/moltemplate/README.txt
@@ -51,7 +51,7 @@ e.g. via:
 
 Updates to this distribution method are less frequent, than others, so if
 you need a more recent version, you can download it as a .tar.gz or .zip
-archive from the moltemplate home page or GitHub (see linke above). After
+archive from the moltemplate home page or GitHub (see link above). After
 downloading an archive and unpacking it, you should have 3 folders.
 
     moltemplate/                  <-- source code and force fields
@@ -65,7 +65,7 @@ the unpacked source archive:
     pip install . --user
 
 If you want to install into a system folder, then you need to run pip with
-superuser priviledges. e.g. with:
+superuser privileges. e.g. with:
 
     sudo pip install .
 
diff --git a/tools/msi2lmp/frc_files/cvff.frc b/tools/msi2lmp/frc_files/cvff.frc
index e3791aa86d..ba27e305e4 100644
--- a/tools/msi2lmp/frc_files/cvff.frc
+++ b/tools/msi2lmp/frc_files/cvff.frc
@@ -15,7 +15,7 @@
 #version cvff.frc       2.4     01-Mar-02
 
 ! Currently Insight does not handle version numbers on lines correctly.
-! It uses the first occurence of a line, so when making changes you
+! It uses the first occurrence of a line, so when making changes you
 ! can either comment the original out temporarily or put the correct
 ! line first.
 
@@ -4624,7 +4624,7 @@ for silicate, copied directly from previous si and o parameters.
 @Date 07-Nov-91
 
 #reference 15
-Adding a  torsion parametr, cp cp o c = 1.8  so that the rotation barrier
+Adding a torsion parameter, cp cp o c = 1.8  so that the rotation barrier
 around bond cp-o in anisole  matches the experimental value ~3.0kcal/mole
 and the equilibrium geometry of anisole has torsion angle cp-cp-o-c =0
 @Author Shenghua Shi
diff --git a/tools/msi2lmp/frc_files/cvff_aug.frc b/tools/msi2lmp/frc_files/cvff_aug.frc
index 75af9ace24..c9e19624fd 100644
--- a/tools/msi2lmp/frc_files/cvff_aug.frc
+++ b/tools/msi2lmp/frc_files/cvff_aug.frc
@@ -123,7 +123,7 @@
 
 
 ! Currently Insight does not handle version numbers on lines correctly.
-! It uses the first occurence of a line, so when making changes you
+! It uses the first occurrence of a line, so when making changes you
 ! can either comment the original out temporarily or put the correct
 ! line first.
 
@@ -5080,7 +5080,7 @@ for silicate, copied directly from previous si and o parameters.
 @Date 07-Nov-91
 
 #reference 15
-Adding a  torsion parametr, cp cp o c = 1.8  so that the rotation barrier
+Adding a torsion parameter, cp cp o c = 1.8  so that the rotation barrier
 around bond cp-o in anisole  matches the experimental value ~3.0kcal/mole
 and the equilibrium geometry of anisole has torsion angle cp-cp-o-c =0
 @Author Shenghua Shi
diff --git a/tools/msi2lmp/frc_files/oplsaa.frc b/tools/msi2lmp/frc_files/oplsaa.frc
index fff69c819c..02a7dce867 100644
--- a/tools/msi2lmp/frc_files/oplsaa.frc
+++ b/tools/msi2lmp/frc_files/oplsaa.frc
@@ -1,6 +1,6 @@
 !BIOSYM forcefield          1
 
-! This is a modified version of msi2lmp for use specifically wtih the
+! This is a modified version of msi2lmp for use specifically with the
 ! OPLS force field. No out-of-plane or cross-terms are included.
 ! Atom types from SPC water and CLAYFF are also included.
 
diff --git a/tools/msi2lmp/src/ReadCarFile.c b/tools/msi2lmp/src/ReadCarFile.c
index 7932f7d6e2..7cde0914c4 100644
--- a/tools/msi2lmp/src/ReadCarFile.c
+++ b/tools/msi2lmp/src/ReadCarFile.c
@@ -227,7 +227,7 @@ void ReadCarFile(void)
   /* Search coordinates to find lowest and highest for x, y, and z */
 
   if (periodic == 0) {
-    /* Added if/else statment STLM Oct 5 2010 */
+    /* Added if/else statement STLM Oct 5 2010 */
     if (TriclinicFlag == 0) {
       /* no need to re-center the box, if we use min/max values */
       center[0] = center[1] = center[2] = 0.0;
diff --git a/tools/phonon/dynmat.cpp b/tools/phonon/dynmat.cpp
index 3b7bfe8268..36dcc97aba 100644
--- a/tools/phonon/dynmat.cpp
+++ b/tools/phonon/dynmat.cpp
@@ -408,7 +408,7 @@ void DynMat::EnforceASR()
   for (int i = 0; i < fftdim; ++i){
     printf("%lg ", egvs[i]);
     if (i%10 == 9) printf("\n");
-    if (i == 99){ printf("...... (%d more skiped)", fftdim-100); break;}
+    if (i == 99){ printf("...... (%d more skipped)", fftdim-100); break;}
   }
   printf("\n");
   for (int i = 0; i < 80; ++i) printf("=");
diff --git a/tools/phonon/green.cpp b/tools/phonon/green.cpp
index 35514c03fb..16b2588a41 100644
--- a/tools/phonon/green.cpp
+++ b/tools/phonon/green.cpp
@@ -140,7 +140,7 @@ return;
 }
 
 /*------------------------------------------------------------------------------
- * Private method to compute the LDOS via the recusive method for system with
+ * Private method to compute the LDOS via the recursive method for system with
  * many atoms
  *----------------------------------------------------------------------------*/
 void Green::Recursion()
@@ -217,7 +217,7 @@ return;
 }
 
 /*------------------------------------------------------------------------------
- * Private method to compute the LDOS via the recusive method for system with
+ * Private method to compute the LDOS via the recursive method for system with
  * a few atoms (less than NMAX)
  *----------------------------------------------------------------------------*/
 void Green::recursion()
diff --git a/tools/polybond/lmpsdata.py b/tools/polybond/lmpsdata.py
index 36cd6a0aa3..52bc749ca6 100644
--- a/tools/polybond/lmpsdata.py
+++ b/tools/polybond/lmpsdata.py
@@ -3,7 +3,7 @@
 #	lmpsdata.py
 #
 #	For reading, writing and manipulating lammps data files
-# 	For calculation of certain properities using lammps data files
+# 	For calculation of certain properties using lammps data files
 # 	For creating VMD input text files using lammps data files
 #	All x,y,z calculations assume the information includes image flags
 
@@ -328,7 +328,7 @@ class Lmpsdata:
 		if no modifications to any of the lammpsdata structures (modflag=0)
 			Use Keywords to write lammpsdata structures directly 
 		if modifications to any of the lammpsdata structures (modflag=1)
-			Key Lammpsdata structures like atom numbers, coeficient numbers
+			Key Lammpsdata structures like atom numbers, coefficient numbers
 			need to be modified to match the other modified lammpsdata structures
 			This section will still use the keywords to write lammpsdata structures.
 		For all modflags, the code will write data to the file until all of the
@@ -403,7 +403,7 @@ class Lmpsdata:
 				for line in self.atoms:
 					f.write('\n') #creates a new line for adding body data
 					for item in line:
-						f.write(' {0}'.format(item)) #adds in each peice of body data with space imbetween
+						f.write(' {0}'.format(item)) #adds in each piece of body data with space imbetween
 				f.write('\n') #allows space to be added between the end of body data and a new keyword
 			elif row=='Velocities':
 				f.write('\n{0}'.format(row)) #new line between header and body portion or two body keywords
@@ -411,7 +411,7 @@ class Lmpsdata:
 				for line in self.velocities:
 					f.write('\n') #creates a new line for adding body data
 					for item in line:
-						f.write(' {0}'.format(item)) #adds in each peice of body data with space imbetween
+						f.write(' {0}'.format(item)) #adds in each piece of body data with space imbetween
 				f.write('\n') #allows space to be added between the end of body data and a new keyword
 			elif row=='Masses':
 				f.write('\n{0}'.format(row)) #new line between header and body portion or two body keywords
@@ -419,7 +419,7 @@ class Lmpsdata:
 				for line in self.masses:
 					f.write('\n') #creates a new line for adding body data
 					for item in line:
-						f.write(' {0}'.format(item)) #adds in each peice of body data with space imbetween
+						f.write(' {0}'.format(item)) #adds in each piece of body data with space imbetween
 				f.write('\n') #allows space to be added between the end of body data and a new keyword
 			elif row=='Shapes':
 				f.write('\n{0}'.format(row)) #new line between header and body portion or two body keywords
@@ -427,7 +427,7 @@ class Lmpsdata:
 				for line in self.shapes:
 					f.write('\n') #creates a new line for adding body data
 					for item in line:
-						f.write(' {0}'.format(item)) #adds in each peice of body data with space imbetween
+						f.write(' {0}'.format(item)) #adds in each piece of body data with space imbetween
 				f.write('\n') #allows space to be added between the end of body data and a new keyword
 			elif row=='Dipoles':
 				f.write('\n{0}'.format(row)) #new line between header and body portion or two body keywords
@@ -435,7 +435,7 @@ class Lmpsdata:
 				for line in self.dipoles:
 					f.write('\n') #creates a new line for adding body data
 					for item in line:
-						f.write(' {0}'.format(item)) #adds in each peice of body data with space imbetween
+						f.write(' {0}'.format(item)) #adds in each piece of body data with space imbetween
 				f.write('\n') #allows space to be added between the end of body data and a new keyword
 			elif row=='Bonds':
 				f.write('\n{0}'.format(row)) #new line between header and body portion or two body keywords
@@ -443,7 +443,7 @@ class Lmpsdata:
 				for line in self.bonds:
 					f.write('\n') #creates a new line for adding body data
 					for item in line:
-						f.write(' {0}'.format(item)) #adds in each peice of body data with space imbetween
+						f.write(' {0}'.format(item)) #adds in each piece of body data with space imbetween
 				f.write('\n') #allows space to be added between the end of body data and a new keyword
 			elif row=='Angles':
 				f.write('\n{0}'.format(row)) #new line between header and body portion or two body keywords
@@ -451,7 +451,7 @@ class Lmpsdata:
 				for line in self.angles:
 					f.write('\n') #creates a new line for adding body data
 					for item in line:
-						f.write(' {0}'.format(item)) #adds in each peice of body data with space imbetween
+						f.write(' {0}'.format(item)) #adds in each piece of body data with space imbetween
 				f.write('\n') #allows space to be added between the end of body data and a new keyword
 			elif row=='Dihedrals':
 				f.write('\n{0}'.format(row)) #new line between header and body portion or two body keywords
@@ -459,14 +459,14 @@ class Lmpsdata:
 				for line in self.dihedrals:
 					f.write('\n') #creates a new line for adding body data
 					for item in line:
-						f.write(' {0}'.format(item)) #adds in each peice of body data with space imbetween
+						f.write(' {0}'.format(item)) #adds in each piece of body data with space imbetween
 			elif row=='Impropers':
 				f.write('\n{0}'.format(row)) #new line between header and body portion or two body keywords
 				f.write('\n')  #new line between body keyword and body data
 				for line in self.impropers:
 					f.write('\n') #creates a new line for adding body data
 					for item in line:
-						f.write(' {0}'.format(item)) #adds in each peice of body data with space imbetween
+						f.write(' {0}'.format(item)) #adds in each piece of body data with space imbetween
 				f.write('\n') #allows space to be added between the end of body data and a new keyword
 			elif row=='Pair Coeffs':
 				f.write('\n{0}'.format(row)) #new line between header and body portion or two body keywords
@@ -474,7 +474,7 @@ class Lmpsdata:
 				for line in self.paircoef:
 					f.write('\n') #creates a new line for adding body data
 					for item in line:
-						f.write(' {0}'.format(item)) #adds in each peice of body data with space imbetween
+						f.write(' {0}'.format(item)) #adds in each piece of body data with space imbetween
 				f.write('\n') #allows space to be added between the end of body data and a new keyword
 			elif row=='Bond Coeffs':
 				f.write('\n{0}'.format(row)) #new line between header and body portion or two body keywords
@@ -482,7 +482,7 @@ class Lmpsdata:
 				for line in self.bondcoef:
 					f.write('\n') #creates a new line for adding body data
 					for item in line:
-						f.write(' {0}'.format(item)) #adds in each peice of body data with space imbetween
+						f.write(' {0}'.format(item)) #adds in each piece of body data with space imbetween
 				f.write('\n') #allows space to be added between the end of body data and a new keyword
 			elif row=='Angle Coeffs':
 				f.write('\n{0}'.format(row)) #new line between header and body portion or two body keywords
@@ -490,7 +490,7 @@ class Lmpsdata:
 				for line in self.anglecoef:
 					f.write('\n') #creates a new line for adding body data
 					for item in line:
-						f.write(' {0}'.format(item)) #adds in each peice of body data with space imbetween
+						f.write(' {0}'.format(item)) #adds in each piece of body data with space imbetween
 				f.write('\n') #allows space to be added between the end of body data and a new keyword
 			elif row=='Dihedral Coeffs':
 				f.write('\n{0}'.format(row)) #new line between header and body portion or two body keywords
@@ -498,7 +498,7 @@ class Lmpsdata:
 				for line in self.dihedralcoef:
 					f.write('\n') #creates a new line for adding body data
 					for item in line:
-						f.write(' {0}'.format(item)) #adds in each peice of body data with space imbetween
+						f.write(' {0}'.format(item)) #adds in each piece of body data with space imbetween
 				f.write('\n') #allows space to be added between the end of body data and a new keyword
 			elif row=='Improper Coeffs':
 				f.write('\n{0}'.format(row)) #new line between header and body portion or two body keywords
@@ -506,7 +506,7 @@ class Lmpsdata:
 				for line in self.impropercoef:
 					f.write('\n') #creates a new line for adding body data
 					for item in line:
-						f.write(' {0}'.format(item)) #adds in each peice of body data with space imbetween
+						f.write(' {0}'.format(item)) #adds in each piece of body data with space imbetween
 				f.write('\n') #allows space to be added between the end of body data and a new keyword
 			else:
 				pass
@@ -514,7 +514,7 @@ class Lmpsdata:
 		
 	def atomorder(self):
 		"""Takes self.atoms and organizes the atom id from least to greatest.
-		If the atom ids are allready ordered this algorithm will do nothing."""
+		If the atom ids are already ordered this algorithm will do nothing."""
 		current=range(len(self.atoms[0])) # initialize current [assumes self.atoms coloumn #'s does not change]
 		for i in range(1,len(self.atoms)): #when i=0, self.atoms will not change; therefore its skipped 
 			for k in range(len(self.atoms[i])):
@@ -715,7 +715,7 @@ class Lmpsdata:
 		extracts the individual molecules' data back into lmpsdata.
 		This extraction takes place through a 4 step process.
 		Step 1: Use a molecule's keywords to alter the lmpsdata data structures to empty.
-				To acomplish this procedure use the lmpsdata method deletebodydata.
+				To accomplish this procedure use the lmpsdata method deletebodydata.
 		Step 2: Add the molecules' atoms to lmpsdata's atoms using the method addatoms.
 				Return a list of atom id changes for each molecule.
 		Step 3: Utilize each molecules list of atom id changes to change their data's atom id numbers.
@@ -881,7 +881,7 @@ class Lmpsdata:
 class booleanarray:
 	"""A class that stores boolean values in a list of lists."""	
 	def __init__(self,rownum, colnum, initval): 		
-		""" initialise a list of lists (array) with
+		""" initialize a list of lists (array) with
 		rownum correspondinig to the number of lists in the list and 
 		colnum corresponding to the number of elements in the list's list.
 		initval is the value the list of lists will be initialized with.
@@ -966,7 +966,7 @@ def distance(a,coord,atomtype):
 class particlesurface:
 	def __init__(self,particle,cutoff,atomid,atomtype,shape='sphere'):
 		"""Builds a particle surface with a specific shape from a particle
-		The atoms choosen from the surface will have the specific atomid
+		The atoms chosen from the surface will have the specific atomid
 		atomid will be given in terms of an integer and not a string."""
 		self.particle=particle.atoms
 		self.atomtype=atomtype
@@ -1026,7 +1026,7 @@ class particlesurface:
 	def deleteatoms(self,structure,rows):
 		"""delete atoms from particle and shifts the structure down"""
 		new=[]
-		#mulitple copying of b to the rows being replaced.
+		#multiple copying of b to the rows being replaced.
 		if rows==[]:
 			for line in structure:
 				new.append(line) #if no rows need replacing copy structure
@@ -1081,7 +1081,7 @@ class particlesurface:
 		self.particle.append([])
 		self.surface.append([])
 		
-		pposition=len(self.particle)-1 #particle postion
+		pposition=len(self.particle)-1 #particle position
 		sposition=len(self.surface)-1 #surface position
 		
 		# Adds the atom id number to the new row
@@ -1122,7 +1122,7 @@ class particlesurface:
 			
 		
 	def createxyz(self,file,data,routine='mass', values=None):
-		"""This shows the particle surface. To show the particle surface after bonding has occured,
+		"""This shows the particle surface. To show the particle surface after bonding has occurred,
 		you will need to extract the particle than reinsert the particle into the class and use createxyz.
 		Two possible routines one to use the masses from data and the other to use the atom type and values supplied by the user.
 		The mass version is assessed by setting the routine to 'mass' which is the default method.
@@ -1199,7 +1199,7 @@ def molecules(data,init,final,processors, method='all'):
 	p.join()
 	return molecule
 
-class Lmpsmolecule: #Technically should be a meta class but written as a seperate class for easier coding.
+class Lmpsmolecule: #Technically should be a meta class but written as a separate class for easier coding.
 	def __init__(self,moleculenum,data,method):
 		"""initiates lammps molecule structures
 		and than extract the appropriate molecular structures from the base class data"""
@@ -1510,7 +1510,7 @@ class Lmpsmolecule: #Technically should be a meta class but written as a seperat
 		"""delete rows in a structure and shifts the structure up
 		rows must be in increasing order for this algorithm to work correctly"""
 		new=[]
-		#mulitple copying of b to the rows being replaced.
+		#multiple copying of b to the rows being replaced.
 		if rows==[]:
 			for line in structure:
 				new.append(line) #if no rows need replacing copy structure
@@ -1598,7 +1598,7 @@ class Lmpsmolecule: #Technically should be a meta class but written as a seperat
 				if nextatoms[i]==atom: #checking if atom is in next atom
 					del nextatoms[i] #delete the atom at i
 					break
-			if nextatoms==[]: break #all bonds from find bonds have allready been added to bondedatoms
+			if nextatoms==[]: break #all bonds from find bonds have already been added to bondedatoms
 		
 		#append next atoms into bondedatoms
 		#copy next atoms into prevatoms
@@ -1607,7 +1607,7 @@ class Lmpsmolecule: #Technically should be a meta class but written as a seperat
 			bondedatoms.append(atom)
 			prevatoms.append(atom)
 
-		#iterative proccess for finding the rest of the atoms bonded to atomnumbers in the direction of atomid.
+		#iterative process for finding the rest of the atoms bonded to atomnumbers in the direction of atomid.
 		while prevatoms!=[]:
 			nextatoms=self.findbonds(prevatoms)
 			#need to remove atoms from nextatoms which are in the prevatoms
@@ -1616,7 +1616,7 @@ class Lmpsmolecule: #Technically should be a meta class but written as a seperat
 					if nextatoms[i]==atom: #checking if atom is in next atom
 						del nextatoms[i] #delete the atom at i
 						break
-				if nextatoms==[]: break #all bonds from find bonds have allready been added to bondedatoms 
+				if nextatoms==[]: break #all bonds from find bonds have already been added to bondedatoms
 			
 			#append next atoms into bondedatoms
 			#copy next atoms into prevatoms
@@ -1694,8 +1694,8 @@ class Lmpsmolecule: #Technically should be a meta class but written as a seperat
 
 	def listorder(self,struct):
 		"""Takes struct and organizes the list from least to greatest.
-		If the list is allready ordered this algorithm will do nothing."""
-		if len(struct)==1: return struct #with the length at 1; thier is only one element and theirfore nothing to order
+		If the list is already ordered this algorithm will do nothing."""
+		if len(struct)==1: return struct #with the length at 1; there is only one element and therefore nothing to order
 		for i in range(1,len(struct)): #when i=0, struct will not change; therefore its skipped
 			copy=struct[i]			
 			for j in range(i-1,-1,-1):
@@ -1756,8 +1756,8 @@ class Lmpsmolecule: #Technically should be a meta class but written as a seperat
 		The second index correspons with the molecule/particle combination
 		The third index corresponds with whether the value is the molecule or the particle
 		Always bonds the two ends of the molecule that meet cutoff requirement.
-		All other possible bonds are randomly choosen until the required bondnumbers are met.
-		After every bond is choosen, the particle object's boolean list is updated,	and possiblebonds is updated.
+		All other possible bonds are randomly chosen until the required bondnumbers are met.
+		After every bond is chosen, the particle object's boolean list is updated,	and possiblebonds is updated.
 		The update to possiblebonds involves removing the row from which the bonded molecule's atom is located
 		and also removing the particle atom and it's corresponding bonded atom from other rows of possiblebonds. 
 		The final bonds are all stored in self.bonding as a 2 dimensional list"""
@@ -1896,7 +1896,7 @@ class Lmpsmolecule: #Technically should be a meta class but written as a seperat
 				# Alters the charge of the molecule's atoms bonded to the particle to newcharge
 				self.modifyatom(self.bondinginformation[i][0]+1,3,newcharge)			
 
-		#This is a seperate loop so atom id's and row indexes for previous steps wont get out of sync		
+		#This is a separate loop so atom id's and row indexes for previous steps wont get out of sync		
 		#create atomnumbers to begin deletion process.
 		atomnumbers=[] 
 		for i in range(len(self.bondinginformation)):
@@ -1906,7 +1906,7 @@ class Lmpsmolecule: #Technically should be a meta class but written as a seperat
 		#Than delete those atoms and all molecule structures which contain those atoms.
 		self.deleteatoms(atomnumbers,atomid)
 		
-		print 'begining deletion process of the surface atoms for which the molecule atoms have replaced'
+		print 'beginning deletion process of the surface atoms for which the molecule atoms have replaced'
 		#Goes through the bondinginformation and superficially removes the surfaceatom
 		for i in range(len(self.bondinginformation)):
 			particle.removesurfatom(self.bondinginformation[i][1]) #uses the row number
diff --git a/tools/pymol_asphere/src/cartesian.cpp b/tools/pymol_asphere/src/cartesian.cpp
index a244d07dac..e137c51e7a 100644
--- a/tools/pymol_asphere/src/cartesian.cpp
+++ b/tools/pymol_asphere/src/cartesian.cpp
@@ -879,7 +879,7 @@ double c::closest_approach(const cPt &l1_1, const cPt &l1_2, const cPt &l2_1,
   double tc, tN, tD = D;      
 
   // compute the closest points between the two lines
-  if (D < 0.00000000001) { // parrallel lines
+  if (D < 0.00000000001) { // parallel lines
     sN = 0.0; sD = 1.0; tN = e; tD = c;
   } else {  // get the closest points on the infinite lines
     sN = (b*e - c*d);
@@ -936,7 +936,7 @@ void c::closest_approach_points(const cPt &l1_1, const cPt &l1_2,
   double tc, tN, tD = D;
 
   // compute the closest points between the two lines
-  if (D < 0.00000000001) { // parrallel lines
+  if (D < 0.00000000001) { // parallel lines
     sN = 0.0; sD = 1.0; tN = e; tD = c;
   } else {  // get the closest points on the infinite lines
     sN = (b*e - c*d);
diff --git a/tools/pymol_asphere/src/error.h b/tools/pymol_asphere/src/error.h
index f14af6f253..c0775d6506 100644
--- a/tools/pymol_asphere/src/error.h
+++ b/tools/pymol_asphere/src/error.h
@@ -112,7 +112,7 @@ class Notice {
   * to format it for the string. Forced newlines can be specified with \n
   *
   * Programs can check whether or not errors have been generated using the []
-  * operator and can 'handle' them by outputing the message or dismissing
+  * operator and can 'handle' them by outputting the message or dismissing
   * them without any output
   *
   * Notices are generated using the public Notice class (see Notice())
diff --git a/tools/reax/reaxc_bond.pl b/tools/reax/reaxc_bond.pl
index 9b0fa50672..cc0fd8f238 100755
--- a/tools/reax/reaxc_bond.pl
+++ b/tools/reax/reaxc_bond.pl
@@ -126,7 +126,7 @@ sub bonds {
   }
 
   close (OUTPUT2); #close the temp file as output
-  open INPUT3, "<temp_$frame.dat" or die "Cannot open temp file: $!"; # opne it as input
+  open INPUT3, "<temp_$frame.dat" or die "Cannot open temp file: $!"; # open it as input
   while(<INPUT3>) {
       next if(/Frame/);
       split;
diff --git a/tools/replica/reorder_remd_traj.py b/tools/replica/reorder_remd_traj.py
index 5f4f316b14..5033ae1e53 100644
--- a/tools/replica/reorder_remd_traj.py
+++ b/tools/replica/reorder_remd_traj.py
@@ -53,7 +53,7 @@ except ImportError:
 
 
 
-#### INITIALISE MPI ####
+#### INITIALIZE MPI ####
 # (note that all output on screen will be printed only on the ROOT proc)
 ROOT = 0
 comm = MPI.COMM_WORLD
@@ -160,7 +160,7 @@ def get_byte_index(rep_inds, byteindfns, intrajfns):
     :param intrajfns: list of (unordered) input traj filenames
     """
     for n in rep_inds:
-        # check if the byte indices for this traj has aleady been computed
+        # check if the byte indices for this traj has already been computed
         if os.path.isfile(byteindfns[n]): continue
 
         # extract bytes
diff --git a/tools/singularity/centos8.def b/tools/singularity/centos8.def
index b48979cab1..e0a14c4156 100644
--- a/tools/singularity/centos8.def
+++ b/tools/singularity/centos8.def
@@ -2,12 +2,12 @@ BootStrap: docker
 From: centos:8
 
 %post
-	dnf -y install epel-release dnf-utils
+        dnf -y install epel-release dnf-utils
         dnf config-manager --set-enabled PowerTools
         dnf -y update
-	dnf -y install vim-enhanced ccache gcc-c++ gcc-gfortran clang gdb make cmake patch which file git libpng-devel libjpeg-devel openmpi-devel mpich-devel fftw-devel voro++-devel gsl-devel enchant platform-python-devel python3-virtualenv valgrind openblas ninja-build eigen3-devel
+        dnf -y install vim-enhanced ccache gcc-c++ gcc-gfortran clang gdb make cmake patch which file git libpng-devel libjpeg-devel openmpi-devel mpich-devel fftw-devel voro++-devel gsl-devel enchant platform-python-devel python3-virtualenv valgrind openblas ninja-build eigen3-devel libubsan libasan libtsan
 
 #No match for argument: valgrind-openmpi
 
 %labels
-	Author akohlmey
+        Author akohlmey
diff --git a/tools/spin/interpolate_gneb/README b/tools/spin/interpolate_gneb/README
index ab30373249..cf52ccb274 100644
--- a/tools/spin/interpolate_gneb/README
+++ b/tools/spin/interpolate_gneb/README
@@ -20,7 +20,7 @@ geodesic dist to next replica
 All those information can be provided by the verbose output of
 a neb/spin calculation
 
-The progam outputs the interpolation result, and the
+The program outputs the interpolation result, and the
 interpolated MEP in "interpolation_result.dat". 
 
 This code is a courtesy of Aleksei Ivanov, University of
diff --git a/tools/xmgrace/lammpsplot.cpp b/tools/xmgrace/lammpsplot.cpp
index 7badb5652b..848c53a091 100644
--- a/tools/xmgrace/lammpsplot.cpp
+++ b/tools/xmgrace/lammpsplot.cpp
@@ -29,7 +29,7 @@ public:
 };
 
 
-/* This function splits the sentence into array of strings seperated by " "*/
+/* This function splits the sentence into array of strings separated by " "*/
 sentence split(const string& s) {
   sentence a;
   s_type i=0;